From fc45a6a844a5ea3a46e20f66c2592ad3bbd5998c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 27 Jul 2015 17:49:49 +0300
Subject: [PATCH 001/600] Disable PIE hardening flag

A quick fix for solving wheezy linking problem in perl's shared library.
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 34223d8..1fd85db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS)
 

From 64a08ca81c7e01ed606486be2b464ab8991cabd4 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 27 Jul 2015 17:15:57 +0300
Subject: [PATCH 002/600] Release 1.9.3-1~bpo7+1

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e64506..90f38ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.9.3-1~bpo7+1) wheezy-backports-sloppy; urgency=medium
+
+  * Rebuild for jessie-backports-sloppy.
+  * Drop PIE from hardening flags. Solves linking issue in wheezy.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Mon, 27 Jul 2015 17:15:27 +0300
+
 nginx (1.9.3-1) unstable; urgency=medium
 
   [ Christos Trochalakis]

From fba932f24fa105edaf3b928e82acc55a9759ed61 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 24 Aug 2015 15:17:09 +0300
Subject: [PATCH 003/600] Imported Upstream version 1.9.4

---
 CHANGES                                       |  34 +-
 CHANGES.ru                                    |  35 +-
 src/core/nginx.h                              |   4 +-
 src/core/ngx_connection.c                     |  46 +-
 src/core/ngx_connection.h                     |   1 +
 src/core/ngx_hash.c                           |  10 +-
 src/core/ngx_open_file_cache.c                |   2 +-
 src/http/modules/ngx_http_fastcgi_module.c    |   1 -
 src/http/modules/ngx_http_map_module.c        |  10 +-
 src/http/modules/ngx_http_sub_filter_module.c | 569 ++++++++++++------
 .../ngx_http_upstream_keepalive_module.c      |   4 +
 .../modules/ngx_http_upstream_zone_module.c   |   2 +-
 src/http/modules/perl/nginx.xs                |  18 +-
 src/http/ngx_http_core_module.c               |  10 +-
 src/mail/ngx_mail_core_module.c               |   3 +-
 src/os/unix/ngx_process_cycle.c               |  19 +-
 src/stream/ngx_stream.h                       |   1 +
 src/stream/ngx_stream_core_module.c           |  13 +-
 src/stream/ngx_stream_handler.c               |  23 +-
 src/stream/ngx_stream_proxy_module.c          |  92 ++-
 src/stream/ngx_stream_upstream_zone_module.c  |   2 +-
 21 files changed, 631 insertions(+), 268 deletions(-)

diff --git a/CHANGES b/CHANGES
index 01130f8..120c31d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,36 @@
 
+Changes with nginx 1.9.4                                         18 Aug 2015
+
+    *) Change: the "proxy_downstream_buffer" and "proxy_upstream_buffer"
+       directives of the stream module are replaced with the
+       "proxy_buffer_size" directive.
+
+    *) Feature: the "tcp_nodelay" directive in the stream module.
+
+    *) Feature: multiple "sub_filter" directives can be used simultaneously.
+
+    *) Feature: variables support in the search string of the "sub_filter"
+       directive.
+
+    *) Workaround: configuration testing might fail under Linux OpenVZ.
+       Thanks to Gena Makhomed.
+
+    *) Bugfix: old worker processes might hog CPU after reconfiguration with
+       a large number of worker_connections.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if the
+       "try_files" and "alias" directives were used inside a location given
+       by a regular expression; the bug had appeared in 1.7.1.
+
+    *) Bugfix: the "try_files" directive inside a nested location given by a
+       regular expression worked incorrectly if the "alias" directive was
+       used in the outer location.
+
+    *) Bugfix: in hash table initialization error handling.
+
+    *) Bugfix: nginx could not be built with Visual Studio 2015.
+
+
 Changes with nginx 1.9.3                                         14 Jul 2015
 
     *) Change: duplicate "http", "mail", and "stream" blocks are now
@@ -57,7 +89,7 @@ Changes with nginx 1.9.1                                         26 May 2015
     *) Change: some long deprecated directives are not supported anymore.
 
     *) Feature: the "reuseport" parameter of the "listen" directive.
-       Thanks to Sepherosa Ziehau and Yingqi Lu.
+       Thanks to Yingqi Lu at Intel and Sepherosa Ziehau.
 
     *) Feature: the $upstream_connect_time variable.
 
diff --git a/CHANGES.ru b/CHANGES.ru
index 25dfd22..09a0fe7 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,37 @@
 
+Изменения в nginx 1.9.4                                           18.08.2015
+
+    *) Изменение: директивы proxy_downstream_buffer и proxy_upstream_buffer
+       в модуле stream заменены директивой proxy_buffer_size.
+
+    *) Добавление: директива tcp_nodelay в модуле stream.
+
+    *) Добавление: теперь можно указать несколько директив sub_filter
+       одновременно.
+
+    *) Добавление: директива sub_filter поддерживает переменные в строке
+       поиска.
+
+    *) Изменение: тестирование конфигурации могло не работать под Linux
+       OpenVZ.
+       Спасибо Геннадию Махомеду.
+
+    *) Исправление: после переконфигурации старые рабочие процессы могли
+       сильно нагружать процессор при больших значениях worker_connections.
+
+    *) Исправление: при совместном использовании директив try_files и alias
+       внутри location'а, заданного регулярным выражением, в рабочем
+       процессе мог произойти segmentation fault; ошибка появилась в 1.7.1.
+
+    *) Исправление: директива try_files внутри вложенного location'а,
+       заданного регулярным выражением, работала неправильно, если во
+       внешнем location'е использовалась директива alias.
+
+    *) Исправление: в обработке ошибок при построении хэш-таблиц.
+
+    *) Исправление: nginx не собирался с Visual Studio 2015.
+
+
 Изменения в nginx 1.9.3                                           14.07.2015
 
     *) Изменение: дублирующиеся блоки http, mail и stream теперь запрещены.
@@ -56,7 +89,7 @@
        поддерживаются.
 
     *) Добавление: параметр reuseport директивы listen.
-       Спасибо Sepherosa Ziehau и Yingqi Lu.
+       Спасибо Yingqi Lu из Intel и Sepherosa Ziehau.
 
     *) Добавление: переменная $upstream_connect_time.
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index dfb90ea..a655f30 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009003
-#define NGINX_VERSION      "1.9.3"
+#define nginx_version      1009004
+#define NGINX_VERSION      "1.9.4"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 04a365a..9f2675b 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -567,9 +567,19 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
 #endif
 
             if (listen(s, ls[i].backlog) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
-                              "listen() to %V, backlog %d failed",
-                              &ls[i].addr_text, ls[i].backlog);
+                err = ngx_socket_errno;
+
+                /*
+                 * on OpenVZ after suspend/resume EADDRINUSE
+                 * may be returned by listen() instead of bind(), see
+                 * https://bugzilla.openvz.org/show_bug.cgi?id=2470
+                 */
+
+                if (err != NGX_EADDRINUSE || !ngx_test_config) {
+                    ngx_log_error(NGX_LOG_EMERG, log, err,
+                                  "listen() to %V, backlog %d failed",
+                                  &ls[i].addr_text, ls[i].backlog);
+                }
 
                 if (ngx_close_socket(s) == -1) {
                     ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
@@ -577,7 +587,15 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
                                   &ls[i].addr_text);
                 }
 
-                return NGX_ERROR;
+                if (err != NGX_EADDRINUSE) {
+                    return NGX_ERROR;
+                }
+
+                if (!ngx_test_config) {
+                    failed = 1;
+                }
+
+                continue;
             }
 
             ls[i].listen = 1;
@@ -1145,6 +1163,26 @@ ngx_drain_connections(void)
 }
 
 
+void
+ngx_close_idle_connections(ngx_cycle_t *cycle)
+{
+    ngx_uint_t         i;
+    ngx_connection_t  *c;
+
+    c = cycle->connections;
+
+    for (i = 0; i < cycle->connection_n; i++) {
+
+        /* THREAD: lock */
+
+        if (c[i].fd != -1 && c[i].idle) {
+            c[i].close = 1;
+            c[i].read->handler(c[i].read);
+        }
+    }
+}
+
+
 ngx_int_t
 ngx_connection_local_sockaddr(ngx_connection_t *c, ngx_str_t *s,
     ngx_uint_t port)
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index a49aa95..c3aca7f 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -215,6 +215,7 @@ ngx_int_t ngx_open_listening_sockets(ngx_cycle_t *cycle);
 void ngx_configure_listening_sockets(ngx_cycle_t *cycle);
 void ngx_close_listening_sockets(ngx_cycle_t *cycle);
 void ngx_close_connection(ngx_connection_t *c);
+void ngx_close_idle_connections(ngx_cycle_t *cycle);
 ngx_int_t ngx_connection_local_sockaddr(ngx_connection_t *c, ngx_str_t *s,
     ngx_uint_t port);
 ngx_int_t ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text);
diff --git a/src/core/ngx_hash.c b/src/core/ngx_hash.c
index e707c09..1a5d0be 100644
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -257,11 +257,19 @@ ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, ngx_uint_t nelts)
     ngx_uint_t       i, n, key, size, start, bucket_size;
     ngx_hash_elt_t  *elt, **buckets;
 
+    if (hinit->max_size == 0) {
+        ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0,
+                      "could not build %s, you should "
+                      "increase %s_max_size: %i",
+                      hinit->name, hinit->name, hinit->max_size);
+        return NGX_ERROR;
+    }
+
     for (n = 0; n < nelts; n++) {
         if (hinit->bucket_size < NGX_HASH_ELT_SIZE(&names[n]) + sizeof(void *))
         {
             ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0,
-                          "could not build the %s, you should "
+                          "could not build %s, you should "
                           "increase %s_bucket_size: %i",
                           hinit->name, hinit->name, hinit->bucket_size);
             return NGX_ERROR;
diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c
index 4df2134..f8bb2e3 100644
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -128,7 +128,7 @@ ngx_open_file_cache_cleanup(void *data)
 
     if (cache->current) {
         ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "%ui items still leave in open file cache",
+                      "%ui items still left in open file cache",
                       cache->current);
     }
 
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index f3f78e8..668719f 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -1770,7 +1770,6 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
 #if (NGX_HTTP_CACHE)
 
         if (f->large_stderr && r->cache) {
-            u_char                     *start;
             ssize_t                     len;
             ngx_http_fastcgi_header_t  *fh;
 
diff --git a/src/http/modules/ngx_http_map_module.c b/src/http/modules/ngx_http_map_module.c
index 3245e04..2b80d0f 100644
--- a/src/http/modules/ngx_http_map_module.c
+++ b/src/http/modules/ngx_http_map_module.c
@@ -375,7 +375,7 @@ ngx_http_map_cmp_dns_wildcards(const void *one, const void *two)
 static char *
 ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
 {
-    ngx_int_t                   rc, index;
+    ngx_int_t                   rv, index;
     ngx_str_t                  *value, name;
     ngx_uint_t                  i, key;
     ngx_http_map_conf_ctx_t    *ctx;
@@ -546,19 +546,19 @@ found:
         value[0].data++;
     }
 
-    rc = ngx_hash_add_key(&ctx->keys, &value[0], var,
+    rv = ngx_hash_add_key(&ctx->keys, &value[0], var,
                           (ctx->hostnames) ? NGX_HASH_WILDCARD_KEY : 0);
 
-    if (rc == NGX_OK) {
+    if (rv == NGX_OK) {
         return NGX_CONF_OK;
     }
 
-    if (rc == NGX_DECLINED) {
+    if (rv == NGX_DECLINED) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid hostname or wildcard \"%V\"", &value[0]);
     }
 
-    if (rc == NGX_BUSY) {
+    if (rv == NGX_BUSY) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "conflicting parameter \"%V\"", &value[0]);
     }
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index e6a34a7..0a4ff6d 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -11,8 +11,32 @@
 
 
 typedef struct {
-    ngx_str_t                  match;
+    ngx_http_complex_value_t   match;
     ngx_http_complex_value_t   value;
+} ngx_http_sub_pair_t;
+
+
+typedef struct {
+    ngx_str_t                  match;
+    ngx_http_complex_value_t  *value;
+} ngx_http_sub_match_t;
+
+
+typedef struct {
+    ngx_uint_t                 min_match_len;
+    ngx_uint_t                 max_match_len;
+
+    u_char                     index[257];
+    u_char                     shift[256];
+} ngx_http_sub_tables_t;
+
+
+typedef struct {
+    ngx_uint_t                 dynamic; /* unsigned dynamic:1; */
+
+    ngx_array_t               *pairs;
+
+    ngx_http_sub_tables_t     *tables;
 
     ngx_hash_t                 types;
 
@@ -20,17 +44,11 @@ typedef struct {
     ngx_flag_t                 last_modified;
 
     ngx_array_t               *types_keys;
+    ngx_array_t               *matches;
 } ngx_http_sub_loc_conf_t;
 
 
-typedef enum {
-    sub_start_state = 0,
-    sub_match_state,
-} ngx_http_sub_state_e;
-
-
 typedef struct {
-    ngx_str_t                  match;
     ngx_str_t                  saved;
     ngx_str_t                  looked;
 
@@ -48,12 +66,20 @@ typedef struct {
     ngx_chain_t               *busy;
     ngx_chain_t               *free;
 
-    ngx_str_t                  sub;
+    ngx_str_t                 *sub;
+    ngx_uint_t                 applied;
 
-    ngx_uint_t                 state;
+    ngx_int_t                  offset;
+    ngx_uint_t                 index;
+
+    ngx_http_sub_tables_t     *tables;
+    ngx_array_t               *matches;
 } ngx_http_sub_ctx_t;
 
 
+static ngx_uint_t ngx_http_sub_cmp_index;
+
+
 static ngx_int_t ngx_http_sub_output(ngx_http_request_t *r,
     ngx_http_sub_ctx_t *ctx);
 static ngx_int_t ngx_http_sub_parse(ngx_http_request_t *r,
@@ -64,6 +90,9 @@ static char * ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd,
 static void *ngx_http_sub_create_conf(ngx_conf_t *cf);
 static char *ngx_http_sub_merge_conf(ngx_conf_t *cf,
     void *parent, void *child);
+static void ngx_http_sub_init_tables(ngx_http_sub_tables_t *tables,
+    ngx_http_sub_match_t *match, ngx_uint_t n);
+static ngx_int_t ngx_http_sub_cmp_matches(const void *one, const void *two);
 static ngx_int_t ngx_http_sub_filter_init(ngx_conf_t *cf);
 
 
@@ -139,12 +168,16 @@ static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
 static ngx_int_t
 ngx_http_sub_header_filter(ngx_http_request_t *r)
 {
-    ngx_http_sub_ctx_t        *ctx;
+    ngx_str_t                *m;
+    ngx_uint_t                i, j, n;
+    ngx_http_sub_ctx_t       *ctx;
+    ngx_http_sub_pair_t      *pairs;
+    ngx_http_sub_match_t     *matches;
     ngx_http_sub_loc_conf_t  *slcf;
 
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_sub_filter_module);
 
-    if (slcf->match.len == 0
+    if (slcf->pairs == NULL
         || r->headers_out.content_length_n == 0
         || ngx_http_test_content_type(r, &slcf->types) == NULL)
     {
@@ -156,19 +189,76 @@ ngx_http_sub_header_filter(ngx_http_request_t *r)
         return NGX_ERROR;
     }
 
-    ctx->saved.data = ngx_pnalloc(r->pool, slcf->match.len);
-    if (ctx->saved.data == NULL) {
-        return NGX_ERROR;
-    }
+    if (slcf->dynamic == 0) {
+        ctx->tables = slcf->tables;
+        ctx->matches = slcf->matches;
 
-    ctx->looked.data = ngx_pnalloc(r->pool, slcf->match.len);
-    if (ctx->looked.data == NULL) {
-        return NGX_ERROR;
+    } else {
+        pairs = slcf->pairs->elts;
+        n = slcf->pairs->nelts;
+
+        matches = ngx_pcalloc(r->pool, sizeof(ngx_http_sub_match_t) * n);
+        if (matches == NULL) {
+            return NGX_ERROR;
+        }
+
+        j = 0;
+        for (i = 0; i < n; i++) {
+            matches[j].value = &pairs[i].value;
+
+            if (pairs[i].match.lengths == NULL) {
+                matches[j].match = pairs[i].match.value;
+                j++;
+                continue;
+            }
+
+            m = &matches[j].match;
+            if (ngx_http_complex_value(r, &pairs[i].match, m) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            if (m->len == 0) {
+                continue;
+            }
+
+            ngx_strlow(m->data, m->data, m->len);
+            j++;
+        }
+
+        if (j == 0) {
+            return ngx_http_next_header_filter(r);
+        }
+
+        ctx->matches = ngx_pnalloc(r->pool, sizeof(ngx_array_t));
+        if (ctx->matches == NULL) {
+            return NGX_ERROR;
+        }
+
+        ctx->matches->elts = matches;
+        ctx->matches->nelts = j;
+
+        ctx->tables = ngx_pnalloc(r->pool, sizeof(ngx_http_sub_tables_t));
+        if (ctx->tables == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_http_sub_init_tables(ctx->tables, ctx->matches->elts,
+                                 ctx->matches->nelts);
     }
 
     ngx_http_set_ctx(r, ctx, ngx_http_sub_filter_module);
 
-    ctx->match = slcf->match;
+    ctx->saved.data = ngx_pnalloc(r->pool, ctx->tables->max_match_len - 1);
+    if (ctx->saved.data == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->looked.data = ngx_pnalloc(r->pool, ctx->tables->max_match_len - 1);
+    if (ctx->looked.data == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->offset = ctx->tables->min_match_len - 1;
     ctx->last_out = &ctx->out;
 
     r->filter_need_in_memory = 1;
@@ -194,8 +284,10 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 {
     ngx_int_t                  rc;
     ngx_buf_t                 *b;
+    ngx_str_t                 *sub;
     ngx_chain_t               *cl;
     ngx_http_sub_ctx_t        *ctx;
+    ngx_http_sub_match_t      *match;
     ngx_http_sub_loc_conf_t   *slcf;
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_sub_filter_module);
@@ -242,18 +334,10 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
             ctx->pos = ctx->buf->pos;
         }
 
-        if (ctx->state == sub_start_state) {
-            ctx->copy_start = ctx->pos;
-            ctx->copy_end = ctx->pos;
-        }
-
         b = NULL;
 
         while (ctx->pos < ctx->buf->last) {
 
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "saved: \"%V\" state: %d", &ctx->saved, ctx->state);
-
             rc = ngx_http_sub_parse(r, ctx);
 
             ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -320,20 +404,6 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
                 ctx->last_out = &cl->next;
             }
 
-            if (ctx->state == sub_start_state) {
-                ctx->copy_start = ctx->pos;
-                ctx->copy_end = ctx->pos;
-
-            } else {
-                ctx->copy_start = NULL;
-                ctx->copy_end = NULL;
-            }
-
-            if (ctx->looked.len > (size_t) (ctx->pos - ctx->buf->pos)) {
-                ctx->saved.len = ctx->looked.len - (ctx->pos - ctx->buf->pos);
-                ngx_memcpy(ctx->saved.data, ctx->looked.data, ctx->saved.len);
-            }
-
             if (rc == NGX_AGAIN) {
                 continue;
             }
@@ -352,19 +422,30 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
             slcf = ngx_http_get_module_loc_conf(r, ngx_http_sub_filter_module);
 
-            if (ctx->sub.data == NULL) {
+            if (ctx->sub == NULL) {
+                ctx->sub = ngx_pcalloc(r->pool, sizeof(ngx_str_t)
+                                                * ctx->matches->nelts);
+                if (ctx->sub == NULL) {
+                    return NGX_ERROR;
+                }
+            }
 
-                if (ngx_http_complex_value(r, &slcf->value, &ctx->sub)
+            sub = &ctx->sub[ctx->index];
+
+            if (sub->data == NULL) {
+                match = ctx->matches->elts;
+
+                if (ngx_http_complex_value(r, match[ctx->index].value, sub)
                     != NGX_OK)
                 {
                     return NGX_ERROR;
                 }
             }
 
-            if (ctx->sub.len) {
+            if (sub->len) {
                 b->memory = 1;
-                b->pos = ctx->sub.data;
-                b->last = ctx->sub.data + ctx->sub.len;
+                b->pos = sub->data;
+                b->last = sub->data + sub->len;
 
             } else {
                 b->sync = 1;
@@ -373,7 +454,8 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
             *ctx->last_out = cl;
             ctx->last_out = &cl->next;
 
-            ctx->once = slcf->once;
+            ctx->index = 0;
+            ctx->once = slcf->once && (++ctx->applied == ctx->matches->nelts);
 
             continue;
         }
@@ -428,9 +510,6 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         }
 
         ctx->buf = NULL;
-
-        ctx->saved.len = ctx->looked.len;
-        ngx_memcpy(ctx->saved.data, ctx->looked.data, ctx->looked.len);
     }
 
     if (ctx->out == NULL && ctx->busy == NULL) {
@@ -513,158 +592,142 @@ ngx_http_sub_output(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
 static ngx_int_t
 ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
 {
-    u_char                *p, *last, *copy_end, ch, match;
-    size_t                 looked, i;
-    ngx_http_sub_state_e   state;
+    u_char                   *p, *last, *pat, *pat_end, c;
+    ngx_str_t                *m;
+    ngx_int_t                 offset, start, next, end, len, rc;
+    ngx_uint_t                shift, i, j;
+    ngx_http_sub_match_t     *match;
+    ngx_http_sub_tables_t    *tables;
+    ngx_http_sub_loc_conf_t  *slcf;
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_sub_filter_module);
+    tables = ctx->tables;
+
+    offset = ctx->offset;
+    end = ctx->buf->last - ctx->pos;
 
     if (ctx->once) {
-        ctx->copy_start = ctx->pos;
-        ctx->copy_end = ctx->buf->last;
-        ctx->pos = ctx->buf->last;
-        ctx->looked.len = 0;
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "once");
-
-        return NGX_AGAIN;
+        /* sets start and next to end */
+        offset = end + (ngx_int_t) tables->min_match_len - 1;
+        goto again;
     }
 
-    state = ctx->state;
-    looked = ctx->looked.len;
-    last = ctx->buf->last;
-    copy_end = ctx->copy_end;
+    while (offset < end) {
 
-    for (p = ctx->pos; p < last; p++) {
+        c = offset < 0 ? ctx->looked.data[ctx->looked.len + offset]
+                       : ctx->pos[offset];
 
-        ch = *p;
-        ch = ngx_tolower(ch);
-
-        if (state == sub_start_state) {
-
-            /* the tight loop */
-
-            match = ctx->match.data[0];
-
-            for ( ;; ) {
-                if (ch == match) {
-
-                    if (ctx->match.len == 1) {
-                        ctx->pos = p + 1;
-                        ctx->copy_end = p;
-
-                        return NGX_OK;
-                    }
-
-                    copy_end = p;
-                    ctx->looked.data[0] = *p;
-                    looked = 1;
-                    state = sub_match_state;
-
-                    goto match_started;
-                }
-
-                if (++p == last) {
-                    break;
-                }
-
-                ch = *p;
-                ch = ngx_tolower(ch);
-            }
-
-            ctx->state = state;
-            ctx->pos = p;
-            ctx->looked.len = looked;
-            ctx->copy_end = p;
-
-            if (ctx->copy_start == NULL) {
-                ctx->copy_start = ctx->buf->pos;
-            }
-
-            return NGX_AGAIN;
-
-        match_started:
+        c = ngx_tolower(c);
 
+        shift = tables->shift[c];
+        if (shift > 0) {
+            offset += shift;
             continue;
         }
 
-        /* state == sub_match_state */
+        /* a potential match */
 
-        if (ch == ctx->match.data[looked]) {
-            ctx->looked.data[looked] = *p;
-            looked++;
+        start = offset - (ngx_int_t) tables->min_match_len + 1;
+        match = ctx->matches->elts;
 
-            if (looked == ctx->match.len) {
+        i = ngx_max(tables->index[c], ctx->index);
+        j = tables->index[c + 1];
 
-                ctx->state = sub_start_state;
-                ctx->pos = p + 1;
-                ctx->looked.len = 0;
-                ctx->saved.len = 0;
-                ctx->copy_end = copy_end;
+        while (i != j) {
 
-                if (ctx->copy_start == NULL && copy_end) {
-                    ctx->copy_start = ctx->buf->pos;
-                }
-
-                return NGX_OK;
+            if (slcf->once && ctx->sub && ctx->sub[i].data) {
+                goto next;
             }
 
-        } else {
-            /*
-             * check if there is another partial match in previously
-             * matched substring to catch cases like "aab" in "aaab"
-             */
+            m = &match[i].match;
 
-            ctx->looked.data[looked] = *p;
-            looked++;
+            pat = m->data;
+            pat_end = m->data + m->len;
 
-            for (i = 1; i < looked; i++) {
-                if (ngx_strncasecmp(ctx->looked.data + i,
-                                    ctx->match.data, looked - i)
-                    == 0)
-                {
-                    break;
-                }
-            }
-
-            if (i < looked) {
-                if (ctx->saved.len > i) {
-                    ctx->saved.len = i;
-                }
-
-                if ((size_t) (p + 1 - ctx->buf->pos) >= looked - i) {
-                    copy_end = p + 1 - (looked - i);
-                }
-
-                ngx_memmove(ctx->looked.data, ctx->looked.data + i, looked - i);
-                looked = looked - i;
+            if (start >= 0) {
+                p = ctx->pos + start;
 
             } else {
-                copy_end = p;
-                looked = 0;
-                state = sub_start_state;
+                last = ctx->looked.data + ctx->looked.len;
+                p = last + start;
+
+                while (p < last && pat < pat_end) {
+                    if (ngx_tolower(*p) != *pat) {
+                        goto next;
+                    }
+
+                    p++;
+                    pat++;
+                }
+
+                p = ctx->pos;
             }
 
-            if (ctx->saved.len) {
+            while (p < ctx->buf->last && pat < pat_end) {
+                if (ngx_tolower(*p) != *pat) {
+                    goto next;
+                }
+
                 p++;
-                goto out;
+                pat++;
             }
+
+            ctx->index = i;
+
+            if (pat != pat_end) {
+                /* partial match */
+                goto again;
+            }
+
+            ctx->offset = offset + (ngx_int_t) m->len;
+            next = start + (ngx_int_t) m->len;
+            end = ngx_max(next, 0);
+            rc = NGX_OK;
+
+            goto done;
+
+        next:
+
+            i++;
         }
+
+        offset++;
+        ctx->index = 0;
     }
 
-    ctx->saved.len = 0;
+again:
 
-out:
+    ctx->offset = offset;
+    start = offset - (ngx_int_t) tables->min_match_len + 1;
+    next = start;
+    rc = NGX_AGAIN;
 
-    ctx->state = state;
-    ctx->pos = p;
-    ctx->looked.len = looked;
+done:
 
-    ctx->copy_end = (state == sub_start_state) ? p : copy_end;
+    /* send [ - looked.len, start ] to client */
 
-    if (ctx->copy_start == NULL && ctx->copy_end) {
-        ctx->copy_start = ctx->buf->pos;
-    }
+    ctx->saved.len = ctx->looked.len + ngx_min(start, 0);
+    ngx_memcpy(ctx->saved.data, ctx->looked.data, ctx->saved.len);
 
-    return NGX_AGAIN;
+    ctx->copy_start = ctx->pos;
+    ctx->copy_end = ctx->pos + ngx_max(start, 0);
+
+    /* save [ next, end ] in looked */
+
+    len = ngx_min(next, 0);
+    p = ctx->looked.data;
+    p = ngx_movemem(p, p + ctx->looked.len + len, - len);
+
+    len = ngx_max(next, 0);
+    p = ngx_cpymem(p, ctx->pos + len, end - len);
+    ctx->looked.len = p - ctx->looked.data;
+
+    /* update position */
+
+    ctx->pos += end;
+    ctx->offset -= end;
+
+    return rc;
 }
 
 
@@ -674,23 +737,60 @@ ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_sub_loc_conf_t *slcf = conf;
 
     ngx_str_t                         *value;
+    ngx_http_sub_pair_t               *pair;
     ngx_http_compile_complex_value_t   ccv;
 
-    if (slcf->match.data) {
-        return "is duplicate";
-    }
-
     value = cf->args->elts;
 
+    if (value[1].len == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "empty search pattern");
+        return NGX_CONF_ERROR;
+    }
+
+    if (slcf->pairs == NULL) {
+        slcf->pairs = ngx_array_create(cf->pool, 1,
+                                       sizeof(ngx_http_sub_pair_t));
+        if (slcf->pairs == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (slcf->pairs->nelts == 255) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "number of search patterns exceeds 255");
+        return NGX_CONF_ERROR;
+    }
+
     ngx_strlow(value[1].data, value[1].data, value[1].len);
 
-    slcf->match = value[1];
+    pair = ngx_array_push(slcf->pairs);
+    if (pair == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &pair->match;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (ccv.complex_value->lengths != NULL) {
+        slcf->dynamic = 1;
+
+    } else {
+        ngx_strlow(pair->match.value.data, pair->match.value.data,
+                   pair->match.value.len);
+    }
 
     ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
 
     ccv.cf = cf;
     ccv.value = &value[2];
-    ccv.complex_value = &slcf->value;
+    ccv.complex_value = &pair->value;
 
     if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
         return NGX_CONF_ERROR;
@@ -713,9 +813,12 @@ ngx_http_sub_create_conf(ngx_conf_t *cf)
     /*
      * set by ngx_pcalloc():
      *
-     *     conf->match = { 0, NULL };
+     *     conf->dynamic = 0;
+     *     conf->pairs = NULL;
+     *     conf->tables = NULL;
      *     conf->types = { NULL };
      *     conf->types_keys = NULL;
+     *     conf->matches = NULL;
      */
 
     slcf->once = NGX_CONF_UNSET;
@@ -728,17 +831,15 @@ ngx_http_sub_create_conf(ngx_conf_t *cf)
 static char *
 ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 {
-    ngx_http_sub_loc_conf_t *prev = parent;
-    ngx_http_sub_loc_conf_t *conf = child;
+    ngx_uint_t                i, n;
+    ngx_http_sub_pair_t      *pairs;
+    ngx_http_sub_match_t     *matches;
+    ngx_http_sub_loc_conf_t  *prev = parent;
+    ngx_http_sub_loc_conf_t  *conf = child;
 
     ngx_conf_merge_value(conf->once, prev->once, 1);
-    ngx_conf_merge_str_value(conf->match, prev->match, "");
     ngx_conf_merge_value(conf->last_modified, prev->last_modified, 0);
 
-    if (conf->value.value.data == NULL) {
-        conf->value = prev->value;
-    }
-
     if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
                              &prev->types_keys, &prev->types,
                              ngx_http_html_default_types)
@@ -747,10 +848,108 @@ ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
+    if (conf->pairs == NULL) {
+        conf->dynamic = prev->dynamic;
+        conf->pairs = prev->pairs;
+        conf->matches = prev->matches;
+        conf->tables = prev->tables;
+
+    } else if (conf->dynamic == 0){
+        pairs = conf->pairs->elts;
+        n = conf->pairs->nelts;
+
+        matches = ngx_pnalloc(cf->pool, sizeof(ngx_http_sub_match_t) * n);
+        if (matches == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        for (i = 0; i < n; i++) {
+            matches[i].match = pairs[i].match.value;
+            matches[i].value = &pairs[i].value;
+        }
+
+        conf->matches = ngx_pnalloc(cf->pool, sizeof(ngx_array_t));
+        if (conf->matches == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        conf->matches->elts = matches;
+        conf->matches->nelts = n;
+
+        conf->tables = ngx_palloc(cf->pool, sizeof(ngx_http_sub_tables_t));
+        if (conf->tables == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        ngx_http_sub_init_tables(conf->tables, conf->matches->elts,
+                                 conf->matches->nelts);
+    }
+
     return NGX_CONF_OK;
 }
 
 
+static void
+ngx_http_sub_init_tables(ngx_http_sub_tables_t *tables,
+    ngx_http_sub_match_t *match, ngx_uint_t n)
+{
+    u_char      c;
+    ngx_uint_t  i, j, min, max, ch;
+
+    min = match[0].match.len;
+    max = match[0].match.len;
+
+    for (i = 1; i < n; i++) {
+        min = ngx_min(min, match[i].match.len);
+        max = ngx_max(max, match[i].match.len);
+    }
+
+    tables->min_match_len = min;
+    tables->max_match_len = max;
+
+    ngx_http_sub_cmp_index = tables->min_match_len - 1;
+    ngx_sort(match, n, sizeof(ngx_http_sub_match_t), ngx_http_sub_cmp_matches);
+
+    min = ngx_min(min, 255);
+    ngx_memset(tables->shift, min, 256);
+
+    ch = 0;
+
+    for (i = 0; i < n; i++) {
+
+        for (j = 0; j < min; j++) {
+            c = match[i].match.data[tables->min_match_len - 1 - j];
+            tables->shift[c] = ngx_min(tables->shift[c], (u_char) j);
+        }
+
+        c = match[i].match.data[tables->min_match_len - 1];
+        while (ch <= c) {
+            tables->index[ch++] = (u_char) i;
+        }
+    }
+
+    while (ch < 257) {
+        tables->index[ch++] = (u_char) n;
+    }
+}
+
+
+static ngx_int_t
+ngx_http_sub_cmp_matches(const void *one, const void *two)
+{
+    ngx_int_t              c1, c2;
+    ngx_http_sub_match_t  *first, *second;
+
+    first = (ngx_http_sub_match_t *) one;
+    second = (ngx_http_sub_match_t *) two;
+
+    c1 = first->match.data[ngx_http_sub_cmp_index];
+    c2 = second->match.data[ngx_http_sub_cmp_index];
+
+    return c1 - c2;
+}
+
+
 static ngx_int_t
 ngx_http_sub_filter_init(ngx_conf_t *cf)
 {
diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index 768881e..51887b4 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -302,6 +302,10 @@ ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data,
         goto invalid;
     }
 
+    if (ngx_terminate || ngx_exiting) {
+        goto invalid;
+    }
+
     if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
         goto invalid;
     }
diff --git a/src/http/modules/ngx_http_upstream_zone_module.c b/src/http/modules/ngx_http_upstream_zone_module.c
index 7169c36..7e5bd74 100644
--- a/src/http/modules/ngx_http_upstream_zone_module.c
+++ b/src/http/modules/ngx_http_upstream_zone_module.c
@@ -159,7 +159,7 @@ ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
 
     /* copy peers to shared memory */
 
-    peersp = (ngx_http_upstream_rr_peers_t **) &shpool->data;
+    peersp = (ngx_http_upstream_rr_peers_t **) (void *) &shpool->data;
 
     for (i = 0; i < umcf->upstreams.nelts; i++) {
         uscf = uscfp[i];
diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs
index 71f17a8..6716620 100644
--- a/src/http/modules/perl/nginx.xs
+++ b/src/http/modules/perl/nginx.xs
@@ -98,6 +98,9 @@ ngx_http_perl_output(ngx_http_request_t *r, ngx_buf_t *b)
 MODULE = nginx    PACKAGE = nginx
 
 
+PROTOTYPES: DISABLE
+
+
 void
 status(r, code)
     CODE:
@@ -268,19 +271,16 @@ header_in(r, key)
         }
 #endif
 
-        if (hh->offset) {
+        ph = (ngx_table_elt_t **) ((char *) &r->headers_in + hh->offset);
 
-            ph = (ngx_table_elt_t **) ((char *) &r->headers_in + hh->offset);
+        if (*ph) {
+            ngx_http_perl_set_targ((*ph)->value.data, (*ph)->value.len);
 
-            if (*ph) {
-                ngx_http_perl_set_targ((*ph)->value.data, (*ph)->value.len);
-
-                goto done;
-            }
-
-            XSRETURN_UNDEF;
+            goto done;
         }
 
+        XSRETURN_UNDEF;
+
     multi:
 
         /* Cookie, X-Forwarded-For */
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index d423d8b..22400ca 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1239,7 +1239,9 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
 
             *e.pos = '\0';
 
-            if (alias && ngx_strncmp(name, clcf->name.data, alias) == 0) {
+            if (alias && alias != NGX_MAX_SIZE_T_VALUE
+                && ngx_strncmp(name, r->uri.data, alias) == 0)
+            {
                 ngx_memmove(name, name + alias, len - alias);
                 path.len -= alias;
             }
@@ -1322,6 +1324,8 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
             }
 
         } else {
+            name = r->uri.data;
+
             r->uri.len = alias + path.len;
             r->uri.data = ngx_pnalloc(r->pool, r->uri.len);
             if (r->uri.data == NULL) {
@@ -1329,8 +1333,8 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
                 return NGX_OK;
             }
 
-            p = ngx_copy(r->uri.data, clcf->name.data, alias);
-            ngx_memcpy(p, name, path.len);
+            p = ngx_copy(r->uri.data, name, alias);
+            ngx_memcpy(p, path.data, path.len);
         }
 
         ngx_http_set_exten(r);
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 271afc4..c219296 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -434,8 +434,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-            struct sockaddr  *sa;
-            u_char            buf[NGX_SOCKADDR_STRLEN];
+            u_char  buf[NGX_SOCKADDR_STRLEN];
 
             sa = &ls->u.sockaddr;
 
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index c69932e..5da0911 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -728,9 +728,6 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
 {
     ngx_int_t worker = (intptr_t) data;
 
-    ngx_uint_t         i;
-    ngx_connection_t  *c;
-
     ngx_process = NGX_PROCESS_WORKER;
     ngx_worker = worker;
 
@@ -741,19 +738,6 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
     for ( ;; ) {
 
         if (ngx_exiting) {
-
-            c = cycle->connections;
-
-            for (i = 0; i < cycle->connection_n; i++) {
-
-                /* THREAD: lock */
-
-                if (c[i].fd != -1 && c[i].idle) {
-                    c[i].close = 1;
-                    c[i].read->handler(c[i].read);
-                }
-            }
-
             ngx_event_cancel_timers();
 
             if (ngx_event_timer_rbtree.root == ngx_event_timer_rbtree.sentinel)
@@ -781,8 +765,9 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
             ngx_setproctitle("worker process is shutting down");
 
             if (!ngx_exiting) {
-                ngx_close_listening_sockets(cycle);
                 ngx_exiting = 1;
+                ngx_close_listening_sockets(cycle);
+                ngx_close_idle_connections(cycle);
             }
         }
 
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 266101c..21953e9 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -132,6 +132,7 @@ typedef struct {
     u_char                 *file_name;
     ngx_int_t               line;
     ngx_log_t              *error_log;
+    ngx_flag_t              tcp_nodelay;
 } ngx_stream_core_srv_conf_t;
 
 
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index 246f55c..4fe6818 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -45,6 +45,13 @@ static ngx_command_t  ngx_stream_core_commands[] = {
       0,
       NULL },
 
+    { ngx_string("tcp_nodelay"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_core_srv_conf_t, tcp_nodelay),
+      NULL },
+
       ngx_null_command
 };
 
@@ -122,6 +129,7 @@ ngx_stream_core_create_srv_conf(ngx_conf_t *cf)
 
     cscf->file_name = cf->conf_file->file.name.data;
     cscf->line = cf->conf_file->line;
+    cscf->tcp_nodelay = NGX_CONF_UNSET;
 
     return cscf;
 }
@@ -148,6 +156,8 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
+    ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);
+
     return NGX_CONF_OK;
 }
 
@@ -362,8 +372,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-            struct sockaddr  *sa;
-            u_char            buf[NGX_SOCKADDR_STRLEN];
+            u_char  buf[NGX_SOCKADDR_STRLEN];
 
             sa = &ls->u.sockaddr;
 
diff --git a/src/stream/ngx_stream_handler.c b/src/stream/ngx_stream_handler.c
index 7b635fa..b3edb68 100644
--- a/src/stream/ngx_stream_handler.c
+++ b/src/stream/ngx_stream_handler.c
@@ -23,6 +23,7 @@ static void ngx_stream_ssl_handshake_handler(ngx_connection_t *c);
 void
 ngx_stream_init_connection(ngx_connection_t *c)
 {
+    int                           tcp_nodelay;
     u_char                        text[NGX_SOCKADDR_STRLEN];
     size_t                        len;
     ngx_int_t                     rc;
@@ -165,6 +166,24 @@ ngx_stream_init_connection(ngx_connection_t *c)
         }
     }
 
+    if (cscf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
+        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0, "tcp_nodelay");
+
+        tcp_nodelay = 1;
+
+        if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
+                       (const void *) &tcp_nodelay, sizeof(int)) == -1)
+        {
+            ngx_connection_error(c, ngx_socket_errno,
+                                 "setsockopt(TCP_NODELAY) failed");
+            ngx_stream_close_connection(c);
+            return;
+        }
+
+        c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+    }
+
+
 #if (NGX_STREAM_SSL)
     {
     ngx_stream_ssl_conf_t  *sslcf;
@@ -309,9 +328,11 @@ ngx_stream_log_error(ngx_log_t *log, u_char *buf, size_t len)
     p = ngx_snprintf(buf, len, ", client: %V, server: %V",
                      &s->connection->addr_text,
                      &s->connection->listening->addr_text);
+    len -= p - buf;
+    buf = p;
 
     if (s->log_handler) {
-        return s->log_handler(log, p, len);
+        p = s->log_handler(log, buf, len);
     }
 
     return p;
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 68af5a8..ea142e7 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -17,9 +17,8 @@ typedef struct {
     ngx_msec_t                       connect_timeout;
     ngx_msec_t                       timeout;
     ngx_msec_t                       next_upstream_timeout;
-    size_t                           downstream_buf_size;
+    size_t                           buffer_size;
     size_t                           upload_rate;
-    size_t                           upstream_buf_size;
     size_t                           download_rate;
     ngx_uint_t                       next_upstream_tries;
     ngx_flag_t                       next_upstream;
@@ -97,6 +96,15 @@ static ngx_conf_bitmask_t  ngx_stream_proxy_ssl_protocols[] = {
 #endif
 
 
+static ngx_conf_deprecated_t  ngx_conf_deprecated_proxy_downstream_buffer = {
+    ngx_conf_deprecated, "proxy_downstream_buffer", "proxy_buffer_size"
+};
+
+static ngx_conf_deprecated_t  ngx_conf_deprecated_proxy_upstream_buffer = {
+    ngx_conf_deprecated, "proxy_upstream_buffer", "proxy_buffer_size"
+};
+
+
 static ngx_command_t  ngx_stream_proxy_commands[] = {
 
     { ngx_string("proxy_pass"),
@@ -127,12 +135,26 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
       offsetof(ngx_stream_proxy_srv_conf_t, timeout),
       NULL },
 
+    { ngx_string("proxy_buffer_size"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_proxy_srv_conf_t, buffer_size),
+      NULL },
+
     { ngx_string("proxy_downstream_buffer"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_size_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_proxy_srv_conf_t, downstream_buf_size),
-      NULL },
+      offsetof(ngx_stream_proxy_srv_conf_t, buffer_size),
+      &ngx_conf_deprecated_proxy_downstream_buffer },
+
+    { ngx_string("proxy_upstream_buffer"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_proxy_srv_conf_t, buffer_size),
+      &ngx_conf_deprecated_proxy_upstream_buffer },
 
     { ngx_string("proxy_upload_rate"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
@@ -141,13 +163,6 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
       offsetof(ngx_stream_proxy_srv_conf_t, upload_rate),
       NULL },
 
-    { ngx_string("proxy_upstream_buffer"),
-      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_proxy_srv_conf_t, upstream_buf_size),
-      NULL },
-
     { ngx_string("proxy_download_rate"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_size_slot,
@@ -358,14 +373,14 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
     u->proxy_protocol = pscf->proxy_protocol;
     u->start_sec = ngx_time();
 
-    p = ngx_pnalloc(c->pool, pscf->downstream_buf_size);
+    p = ngx_pnalloc(c->pool, pscf->buffer_size);
     if (p == NULL) {
         ngx_stream_proxy_finalize(s, NGX_ERROR);
         return;
     }
 
     u->downstream_buf.start = p;
-    u->downstream_buf.end = p + pscf->downstream_buf_size;
+    u->downstream_buf.end = p + pscf->buffer_size;
     u->downstream_buf.pos = p;
     u->downstream_buf.last = p;
 
@@ -376,8 +391,7 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
 #if (NGX_STREAM_SSL)
         && pscf->ssl == NULL
 #endif
-        && pscf->downstream_buf_size >= NGX_PROXY_PROTOCOL_MAX_HEADER
-       )
+        && pscf->buffer_size >= NGX_PROXY_PROTOCOL_MAX_HEADER)
     {
         /* optimization for a typical case */
 
@@ -464,13 +478,35 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
 static void
 ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 {
+    int                           tcp_nodelay;
     u_char                       *p;
     ngx_connection_t             *c, *pc;
     ngx_log_handler_pt            handler;
     ngx_stream_upstream_t        *u;
+    ngx_stream_core_srv_conf_t   *cscf;
     ngx_stream_proxy_srv_conf_t  *pscf;
 
     u = s->upstream;
+    pc = u->peer.connection;
+
+    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
+
+    if (cscf->tcp_nodelay && pc->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
+        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, pc->log, 0, "tcp_nodelay");
+
+        tcp_nodelay = 1;
+
+        if (setsockopt(pc->fd, IPPROTO_TCP, TCP_NODELAY,
+                       (const void *) &tcp_nodelay, sizeof(int)) == -1)
+        {
+            ngx_connection_error(pc, ngx_socket_errno,
+                                 "setsockopt(TCP_NODELAY) failed");
+            ngx_stream_proxy_next_upstream(s);
+            return;
+        }
+
+        pc->tcp_nodelay = NGX_TCP_NODELAY_SET;
+    }
 
     if (u->proxy_protocol) {
         if (ngx_stream_proxy_send_proxy_protocol(s) != NGX_OK) {
@@ -482,8 +518,6 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 
     pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
 
-    pc = u->peer.connection;
-
 #if (NGX_STREAM_SSL)
     if (pscf->ssl && pc->ssl == NULL) {
         ngx_stream_proxy_ssl_init_connection(s);
@@ -494,18 +528,18 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
     c = s->connection;
 
     if (c->log->log_level >= NGX_LOG_INFO) {
-        ngx_str_t  s;
+        ngx_str_t  str;
         u_char     addr[NGX_SOCKADDR_STRLEN];
 
-        s.len = NGX_SOCKADDR_STRLEN;
-        s.data = addr;
+        str.len = NGX_SOCKADDR_STRLEN;
+        str.data = addr;
 
-        if (ngx_connection_local_sockaddr(pc, &s, 1) == NGX_OK) {
+        if (ngx_connection_local_sockaddr(pc, &str, 1) == NGX_OK) {
             handler = c->log->handler;
             c->log->handler = NULL;
 
             ngx_log_error(NGX_LOG_INFO, c->log, 0, "proxy %V connected to %V",
-                          &s, u->peer.name);
+                          &str, u->peer.name);
 
             c->log->handler = handler;
         }
@@ -513,14 +547,14 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 
     c->log->action = "proxying connection";
 
-    p = ngx_pnalloc(c->pool, pscf->upstream_buf_size);
+    p = ngx_pnalloc(c->pool, pscf->buffer_size);
     if (p == NULL) {
         ngx_stream_proxy_finalize(s, NGX_ERROR);
         return;
     }
 
     u->upstream_buf.start = p;
-    u->upstream_buf.end = p + pscf->upstream_buf_size;
+    u->upstream_buf.end = p + pscf->buffer_size;
     u->upstream_buf.pos = p;
     u->upstream_buf.last = p;
 
@@ -1295,9 +1329,8 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
     conf->connect_timeout = NGX_CONF_UNSET_MSEC;
     conf->timeout = NGX_CONF_UNSET_MSEC;
     conf->next_upstream_timeout = NGX_CONF_UNSET_MSEC;
-    conf->downstream_buf_size = NGX_CONF_UNSET_SIZE;
+    conf->buffer_size = NGX_CONF_UNSET_SIZE;
     conf->upload_rate = NGX_CONF_UNSET_SIZE;
-    conf->upstream_buf_size = NGX_CONF_UNSET_SIZE;
     conf->download_rate = NGX_CONF_UNSET_SIZE;
     conf->next_upstream_tries = NGX_CONF_UNSET_UINT;
     conf->next_upstream = NGX_CONF_UNSET;
@@ -1332,15 +1365,12 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_msec_value(conf->next_upstream_timeout,
                               prev->next_upstream_timeout, 0);
 
-    ngx_conf_merge_size_value(conf->downstream_buf_size,
-                              prev->downstream_buf_size, 16384);
+    ngx_conf_merge_size_value(conf->buffer_size,
+                              prev->buffer_size, 16384);
 
     ngx_conf_merge_size_value(conf->upload_rate,
                               prev->upload_rate, 0);
 
-    ngx_conf_merge_size_value(conf->upstream_buf_size,
-                              prev->upstream_buf_size, 16384);
-
     ngx_conf_merge_size_value(conf->download_rate,
                               prev->download_rate, 0);
 
diff --git a/src/stream/ngx_stream_upstream_zone_module.c b/src/stream/ngx_stream_upstream_zone_module.c
index 87ddc03..ffc9e8a 100644
--- a/src/stream/ngx_stream_upstream_zone_module.c
+++ b/src/stream/ngx_stream_upstream_zone_module.c
@@ -155,7 +155,7 @@ ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
 
     /* copy peers to shared memory */
 
-    peersp = (ngx_stream_upstream_rr_peers_t **) &shpool->data;
+    peersp = (ngx_stream_upstream_rr_peers_t **) (void *) &shpool->data;
 
     for (i = 0; i < umcf->upstreams.nelts; i++) {
         uscf = uscfp[i];

From a26063750ff282f1ad214846d19d17326e06a0a8 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 24 Aug 2015 15:19:12 +0300
Subject: [PATCH 004/600] New upstream release (1.9.4)

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e64506..9cde120 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.9.4-1) UNRELEASED; urgency=medium
+
+  [ Christos Trochalakis]
+  * New upstream release.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Mon, 24 Aug 2015 15:19:01 +0300
+
 nginx (1.9.3-1) unstable; urgency=medium
 
   [ Christos Trochalakis]

From f539cc0a49a4a5046ff511ee9215efbe2f31f3cf Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 22 Jul 2015 10:46:53 +0300
Subject: [PATCH 005/600] Fix licence ordering

---
 debian/copyright | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9b123d1..a386770 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,6 +30,16 @@ Files: contrib/geo2nginx.pl
 Copyright: 2005, Andrei Nigmatulin
 License: BSD-2-clause
 
+Files: debian/*
+Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
+           2008,      Jose Parrella <joseparrella@cantv.net>
+           2009-2014, Kartik Mistry <kartik@debian.org>
+           2010-2014, Michael Lustfield <michael@lustfield.net>
+           2011       Dmitry E. Oboukhov <unera@debian.org>
+           2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
+           2013-2014, Christos Trochalakis <yatiohi@ideopolis.gr>
+License: BSD-2-clause
+
 Files: debian/modules/headers-more-nginx-module/*
 Copyright: Copyright (c) 2009-2014, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
            Copyright (c) 2010-2013, Bernd Dorn
@@ -89,16 +99,6 @@ Files: debian/modules/ngx_http_substitutions_filter_module/*
 Copyright: Copyright (C) 2014 by Weibin Yao <yaoweibin@gmail.com>
 License: BSD-2-clause
 
-Files: debian/*
-Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
-           2008,      Jose Parrella <joseparrella@cantv.net>
-           2009-2014, Kartik Mistry <kartik@debian.org>
-           2010-2014, Michael Lustfield <michael@lustfield.net>
-           2011       Dmitry E. Oboukhov <unera@debian.org>
-           2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
-           2013-2014, Christos Trochalakis <yatiohi@ideopolis.gr>
-License: BSD-2-clause
-
 License: BSD-2-clause
  All rights reserved.
  .

From a9600e2b4d49f207a36128797b30280a1d0f80ec Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 6 Aug 2015 15:40:05 +0300
Subject: [PATCH 006/600] Update debian/copyright for nginx source

---
 debian/copyright | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a386770..0edb73b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,23 +7,20 @@ Copyright: 2002-2014 Igor Sysoev
            2011-2014 Nginx, Inc.
                      Maxim Dounin
                      Valentin V. Bartenev
+                     Roman Arutyunyan
+                     Ruslan Ermilov
 License: BSD-2-clause
 
 Files: src/core/ngx_murmurhash.c
 Copyright: Copyright (C) Austin Appleby
 License: BSD-2-clause
 
-Files: src/core/ngx_proxy_protocol.h
-       src/core/ngx_proxy_protocol.c
-Copyright: Copyright (C) Roman Arutyunyan
-           Copyright (C) Nginx, Inc.
-License: BSD-2-clause
-
 Files: src/http/modules/ngx_http_scgi_module.c
        src/http/modules/ngx_http_uwsgi_module.c
 Copyright: Copyright (C) Igor Sysoev
            Copyright (C) Nginx, Inc.
-           Copyright (C) Manlio Perillo (manlio.perillo@gmail.com)
+           2009-2010 Unbit S.a.s.
+           2008      Manlio Perillo (manlio.perillo@gmail.com)
 License: BSD-2-clause
 
 Files: contrib/geo2nginx.pl

From a8ef8abc7b0ea981cd14705f39ed247e26f243dc Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 24 Aug 2015 15:57:08 +0300
Subject: [PATCH 007/600] Release 1.9.4-1

---
 debian/changelog | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cde120..004eaa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-nginx (1.9.4-1) UNRELEASED; urgency=medium
+nginx (1.9.4-1) unstable; urgency=medium
 
   [ Christos Trochalakis]
   * New upstream release.
+  * debian/copyright:
+    + Fix licence order.
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Mon, 24 Aug 2015 15:19:01 +0300
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Mon, 24 Aug 2015 16:23:20 +0300
 
 nginx (1.9.3-1) unstable; urgency=medium
 

From 3efc8819263ce2868b629fe53df139603bd614ee Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 25 Sep 2015 14:02:47 +0300
Subject: [PATCH 008/600] Imported Upstream version 1.9.5

---
 CHANGES                                       |   30 +
 CHANGES.ru                                    |   31 +
 auto/make                                     |    2 +-
 auto/modules                                  |   18 +-
 auto/options                                  |    6 +-
 auto/sources                                  |   18 +-
 src/core/nginx.h                              |    4 +-
 src/core/ngx_connection.h                     |    2 +-
 src/core/ngx_hash.c                           |    4 +
 src/http/modules/ngx_http_rewrite_module.c    |    2 +-
 src/http/modules/ngx_http_ssl_module.c        |   24 +-
 src/http/modules/ngx_http_sub_filter_module.c |    3 +-
 src/http/ngx_http.c                           |   31 +-
 src/http/ngx_http.h                           |    8 +-
 src/http/ngx_http_copy_filter_module.c        |    2 +-
 src/http/ngx_http_core_module.c               |   47 +-
 src/http/ngx_http_core_module.h               |    8 +-
 src/http/ngx_http_file_cache.c                |   21 +-
 src/http/ngx_http_request.c                   |   40 +-
 src/http/ngx_http_request.h                   |    9 +-
 src/http/ngx_http_request_body.c              |   12 +-
 src/http/ngx_http_spdy.c                      | 3701 ---------------
 src/http/ngx_http_spdy.h                      |  261 --
 src/http/ngx_http_spdy_filter_module.c        | 1222 -----
 src/http/ngx_http_spdy_module.c               |  408 --
 src/http/ngx_http_upstream.c                  |   33 +-
 src/http/v2/ngx_http_v2.c                     | 4036 +++++++++++++++++
 src/http/v2/ngx_http_v2.h                     |  333 ++
 src/http/v2/ngx_http_v2_filter_module.c       | 1291 ++++++
 src/http/v2/ngx_http_v2_huff_decode.c         | 2714 +++++++++++
 src/http/v2/ngx_http_v2_huff_encode.c         |   10 +
 src/http/v2/ngx_http_v2_module.c              |  469 ++
 .../ngx_http_v2_module.h}                     |   19 +-
 src/http/v2/ngx_http_v2_table.c               |  349 ++
 src/os/unix/ngx_files.c                       |   13 +-
 35 files changed, 9453 insertions(+), 5728 deletions(-)
 delete mode 100644 src/http/ngx_http_spdy.c
 delete mode 100644 src/http/ngx_http_spdy.h
 delete mode 100644 src/http/ngx_http_spdy_filter_module.c
 delete mode 100644 src/http/ngx_http_spdy_module.c
 create mode 100644 src/http/v2/ngx_http_v2.c
 create mode 100644 src/http/v2/ngx_http_v2.h
 create mode 100644 src/http/v2/ngx_http_v2_filter_module.c
 create mode 100644 src/http/v2/ngx_http_v2_huff_decode.c
 create mode 100644 src/http/v2/ngx_http_v2_huff_encode.c
 create mode 100644 src/http/v2/ngx_http_v2_module.c
 rename src/http/{ngx_http_spdy_module.h => v2/ngx_http_v2_module.h} (58%)
 create mode 100644 src/http/v2/ngx_http_v2_table.c

diff --git a/CHANGES b/CHANGES
index 120c31d..47d33a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,34 @@
 
+Changes with nginx 1.9.5                                         22 Sep 2015
+
+    *) Feature: the ngx_http_v2_module (replaces ngx_http_spdy_module).
+       Thanks to Dropbox and Automattic for sponsoring this work.
+
+    *) Change: now the "output_buffers" directive uses two buffers by
+       default.
+
+    *) Change: now nginx limits subrequests recursion, not simultaneous
+       subrequests.
+
+    *) Change: now nginx checks the whole cache key when returning a
+       response from cache.
+       Thanks to Gena Makhomed and Sergey Brester.
+
+    *) Bugfix: "header already sent" alerts might appear in logs when using
+       cache; the bug had appeared in 1.7.5.
+
+    *) Bugfix: "writev() failed (4: Interrupted system call)" errors might
+       appear in logs when using CephFS and the "timer_resolution" directive
+       on Linux.
+
+    *) Bugfix: in invalid configurations handling.
+       Thanks to Markus Linnala.
+
+    *) Bugfix: a segmentation fault occurred in a worker process if the
+       "sub_filter" directive was used at http level; the bug had appeared
+       in 1.9.4.
+
+
 Changes with nginx 1.9.4                                         18 Aug 2015
 
     *) Change: the "proxy_downstream_buffer" and "proxy_upstream_buffer"
diff --git a/CHANGES.ru b/CHANGES.ru
index 09a0fe7..b95c33d 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,35 @@
 
+Изменения в nginx 1.9.5                                           22.09.2015
+
+    *) Добавление: модуль ngx_http_v2_module (заменяет модуль
+       ngx_http_spdy_module).
+       Спасибо Dropbox и Automattic за спонсирование разработки.
+
+    *) Изменение: теперь по умолчанию директива output_buffers использует
+       два буфера.
+
+    *) Изменение: теперь nginx ограничивает максимальную вложенность
+       подзапросов, а не количество одновременных подзапросов.
+
+    *) Изменение: теперь при возврате ответов из кэша nginx проверяет ключ
+       полностью.
+       Спасибо Геннадию Махомеду и Сергею Брестеру.
+
+    *) Исправление: при использовании кэша в логах могли появляться
+       сообщения "header already sent"; ошибка появилась в 1.7.5.
+
+    *) Исправление: при использовании CephFS и директивы timer_resolution на
+       Linux в логах могли появляться сообщения "writev() failed (4:
+       Interrupted system call)".
+
+    *) Исправление: в обработке ошибок конфигурации.
+       Спасибо Markus Linnala.
+
+    *) Исправление: при использовании директивы sub_filter на уровне http в
+       рабочем процессе происходил segmentation fault; ошибка появилась в
+       1.9.4.
+
+
 Изменения в nginx 1.9.4                                           18.08.2015
 
     *) Изменение: директивы proxy_downstream_buffer и proxy_upstream_buffer
diff --git a/auto/make b/auto/make
index 78d0422..dca011c 100644
--- a/auto/make
+++ b/auto/make
@@ -7,7 +7,7 @@ echo "creating $NGX_MAKEFILE"
 
 mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \
          $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \
-         $NGX_OBJS/src/http $NGX_OBJS/src/http/modules \
+         $NGX_OBJS/src/http $NGX_OBJS/src/http/v2 $NGX_OBJS/src/http/modules \
          $NGX_OBJS/src/http/modules/perl \
          $NGX_OBJS/src/mail \
          $NGX_OBJS/src/stream \
diff --git a/auto/modules b/auto/modules
index 60a060d..5c734e1 100644
--- a/auto/modules
+++ b/auto/modules
@@ -94,7 +94,7 @@ fi
 #     ngx_http_write_filter
 #     ngx_http_header_filter
 #     ngx_http_chunked_filter
-#     ngx_http_spdy_filter
+#     ngx_http_v2_filter
 #     ngx_http_range_header_filter
 #     ngx_http_gzip_filter
 #     ngx_http_postpone_filter
@@ -115,8 +115,8 @@ HTTP_FILTER_MODULES="$HTTP_WRITE_FILTER_MODULE \
                      $HTTP_HEADER_FILTER_MODULE \
                      $HTTP_CHUNKED_FILTER_MODULE"
 
-if [ $HTTP_SPDY = YES ]; then
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SPDY_FILTER_MODULE"
+if [ $HTTP_V2 = YES ]; then
+    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_V2_FILTER_MODULE"
 fi
 
 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_RANGE_HEADER_FILTER_MODULE"
@@ -180,12 +180,12 @@ if [ $HTTP_USERID = YES ]; then
 fi
 
 
-if [ $HTTP_SPDY = YES ]; then
-    have=NGX_HTTP_SPDY . auto/have
-    USE_ZLIB=YES
-    HTTP_MODULES="$HTTP_MODULES $HTTP_SPDY_MODULE"
-    HTTP_DEPS="$HTTP_DEPS $HTTP_SPDY_DEPS"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_SPDY_SRCS"
+if [ $HTTP_V2 = YES ]; then
+    have=NGX_HTTP_V2 . auto/have
+    HTTP_MODULES="$HTTP_MODULES $HTTP_V2_MODULE"
+    HTTP_INCS="$HTTP_INCS $HTTP_V2_INCS"
+    HTTP_DEPS="$HTTP_DEPS $HTTP_V2_DEPS"
+    HTTP_SRCS="$HTTP_SRCS $HTTP_V2_SRCS"
 fi
 
 HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE"
diff --git a/auto/options b/auto/options
index e70d1a0..efc8943 100644
--- a/auto/options
+++ b/auto/options
@@ -58,7 +58,7 @@ HTTP_CACHE=YES
 HTTP_CHARSET=YES
 HTTP_GZIP=YES
 HTTP_SSL=NO
-HTTP_SPDY=NO
+HTTP_V2=NO
 HTTP_SSI=YES
 HTTP_POSTPONE=NO
 HTTP_REALIP=NO
@@ -210,7 +210,7 @@ do
         --http-scgi-temp-path=*)         NGX_HTTP_SCGI_TEMP_PATH="$value" ;;
 
         --with-http_ssl_module)          HTTP_SSL=YES               ;;
-        --with-http_spdy_module)         HTTP_SPDY=YES              ;;
+        --with-http_v2_module)           HTTP_V2=YES                ;;
         --with-http_realip_module)       HTTP_REALIP=YES            ;;
         --with-http_addition_module)     HTTP_ADDITION=YES          ;;
         --with-http_xslt_module)         HTTP_XSLT=YES              ;;
@@ -378,7 +378,7 @@ cat << END
   --with-ipv6                        enable IPv6 support
 
   --with-http_ssl_module             enable ngx_http_ssl_module
-  --with-http_spdy_module            enable ngx_http_spdy_module
+  --with-http_v2_module              enable ngx_http_v2_module
   --with-http_realip_module          enable ngx_http_realip_module
   --with-http_addition_module        enable ngx_http_addition_module
   --with-http_xslt_module            enable ngx_http_xslt_module
diff --git a/auto/sources b/auto/sources
index 3d89e2d..2abbc60 100644
--- a/auto/sources
+++ b/auto/sources
@@ -317,13 +317,17 @@ HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
 HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
 
 
-HTTP_SPDY_MODULE=ngx_http_spdy_module
-HTTP_SPDY_FILTER_MODULE=ngx_http_spdy_filter_module
-HTTP_SPDY_DEPS="src/http/ngx_http_spdy.h \
-                src/http/ngx_http_spdy_module.h"
-HTTP_SPDY_SRCS="src/http/ngx_http_spdy.c \
-                src/http/ngx_http_spdy_module.c \
-                src/http/ngx_http_spdy_filter_module.c"
+HTTP_V2_MODULE=ngx_http_v2_module
+HTTP_V2_FILTER_MODULE=ngx_http_v2_filter_module
+HTTP_V2_INCS="src/http/v2"
+HTTP_V2_DEPS="src/http/v2/ngx_http_v2.h \
+              src/http/v2/ngx_http_v2_module.h"
+HTTP_V2_SRCS="src/http/v2/ngx_http_v2.c \
+              src/http/v2/ngx_http_v2_table.c \
+              src/http/v2/ngx_http_v2_huff_decode.c \
+              src/http/v2/ngx_http_v2_huff_encode.c \
+              src/http/v2/ngx_http_v2_module.c \
+              src/http/v2/ngx_http_v2_filter_module.c"
 
 
 HTTP_CHARSET_FILTER_MODULE=ngx_http_charset_filter_module
diff --git a/src/core/nginx.h b/src/core/nginx.h
index a655f30..34a6a80 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009004
-#define NGINX_VERSION      "1.9.4"
+#define nginx_version      1009005
+#define NGINX_VERSION      "1.9.5"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index c3aca7f..977f028 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -118,7 +118,7 @@ typedef enum {
 
 #define NGX_LOWLEVEL_BUFFERED  0x0f
 #define NGX_SSL_BUFFERED       0x01
-#define NGX_SPDY_BUFFERED      0x02
+#define NGX_HTTP_V2_BUFFERED   0x02
 
 
 struct ngx_connection_s {
diff --git a/src/core/ngx_hash.c b/src/core/ngx_hash.c
index 1a5d0be..151e643 100644
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -743,6 +743,10 @@ ngx_hash_add_key(ngx_hash_keys_arrays_t *ha, ngx_str_t *key, void *value,
             if (key->data[i] == '.' && key->data[i + 1] == '.') {
                 return NGX_DECLINED;
             }
+
+            if (key->data[i] == '\0') {
+                return NGX_DECLINED;
+            }
         }
 
         if (key->len > 1 && key->data[0] == '.') {
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index f241196..754512f 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -612,7 +612,7 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     save = *cf;
     cf->ctx = ctx;
 
-    if (pclcf->name.len == 0) {
+    if (cf->cmd_type == NGX_HTTP_SRV_CONF) {
         if_code->loc_conf = NULL;
         cf->cmd_type = NGX_HTTP_SIF_CONF;
 
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index d6a1794..7b051ea 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -326,10 +326,10 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
 #if (NGX_DEBUG)
     unsigned int            i;
 #endif
-#if (NGX_HTTP_SPDY)
+#if (NGX_HTTP_V2)
     ngx_http_connection_t  *hc;
 #endif
-#if (NGX_HTTP_SPDY || NGX_DEBUG)
+#if (NGX_HTTP_V2 || NGX_DEBUG)
     ngx_connection_t       *c;
 
     c = ngx_ssl_get_connection(ssl_conn);
@@ -342,12 +342,13 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
     }
 #endif
 
-#if (NGX_HTTP_SPDY)
+#if (NGX_HTTP_V2)
     hc = c->data;
 
-    if (hc->addr_conf->spdy) {
-        srv = (unsigned char *) NGX_SPDY_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
-        srvlen = sizeof(NGX_SPDY_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE) - 1;
+    if (hc->addr_conf->http2) {
+        srv =
+           (unsigned char *) NGX_HTTP_V2_ALPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
+        srvlen = sizeof(NGX_HTTP_V2_ALPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE) - 1;
 
     } else
 #endif
@@ -378,22 +379,23 @@ static int
 ngx_http_ssl_npn_advertised(ngx_ssl_conn_t *ssl_conn,
     const unsigned char **out, unsigned int *outlen, void *arg)
 {
-#if (NGX_HTTP_SPDY || NGX_DEBUG)
+#if (NGX_HTTP_V2 || NGX_DEBUG)
     ngx_connection_t  *c;
 
     c = ngx_ssl_get_connection(ssl_conn);
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "SSL NPN advertised");
 #endif
 
-#if (NGX_HTTP_SPDY)
+#if (NGX_HTTP_V2)
     {
     ngx_http_connection_t  *hc;
 
     hc = c->data;
 
-    if (hc->addr_conf->spdy) {
-        *out = (unsigned char *) NGX_SPDY_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
-        *outlen = sizeof(NGX_SPDY_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE) - 1;
+    if (hc->addr_conf->http2) {
+        *out =
+            (unsigned char *) NGX_HTTP_V2_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
+        *outlen = sizeof(NGX_HTTP_V2_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE) - 1;
 
         return SSL_TLSEXT_ERR_OK;
     }
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index 0a4ff6d..8ba75ed 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -853,8 +853,9 @@ ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->pairs = prev->pairs;
         conf->matches = prev->matches;
         conf->tables = prev->tables;
+    }
 
-    } else if (conf->dynamic == 0){
+    if (conf->pairs && conf->dynamic == 0 && conf->tables == NULL) {
         pairs = conf->pairs->elts;
         n = conf->pairs->nelts;
 
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 6b0a48f..d09e3f0 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1233,8 +1233,8 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 #if (NGX_HTTP_SSL)
     ngx_uint_t             ssl;
 #endif
-#if (NGX_HTTP_SPDY)
-    ngx_uint_t             spdy;
+#if (NGX_HTTP_V2)
+    ngx_uint_t             http2;
 #endif
 
     /*
@@ -1290,8 +1290,8 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 #if (NGX_HTTP_SSL)
         ssl = lsopt->ssl || addr[i].opt.ssl;
 #endif
-#if (NGX_HTTP_SPDY)
-        spdy = lsopt->spdy || addr[i].opt.spdy;
+#if (NGX_HTTP_V2)
+        http2 = lsopt->http2 || addr[i].opt.http2;
 #endif
 
         if (lsopt->set) {
@@ -1324,8 +1324,8 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 #if (NGX_HTTP_SSL)
         addr[i].opt.ssl = ssl;
 #endif
-#if (NGX_HTTP_SPDY)
-        addr[i].opt.spdy = spdy;
+#if (NGX_HTTP_V2)
+        addr[i].opt.http2 = http2;
 #endif
 
         return NGX_OK;
@@ -1357,14 +1357,17 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
         }
     }
 
-#if (NGX_HTTP_SPDY && NGX_HTTP_SSL                                            \
+#if (NGX_HTTP_V2 && NGX_HTTP_SSL                                              \
      && !defined TLSEXT_TYPE_application_layer_protocol_negotiation           \
      && !defined TLSEXT_TYPE_next_proto_neg)
-    if (lsopt->spdy && lsopt->ssl) {
+
+    if (lsopt->http2 && lsopt->ssl) {
         ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                           "nginx was built without OpenSSL ALPN or NPN "
-                           "support, SPDY is not enabled for %s", lsopt->addr);
+                           "nginx was built with OpenSSL that lacks ALPN "
+                           "and NPN support, HTTP/2 is not enabled for %s",
+                           lsopt->addr);
     }
+
 #endif
 
     addr = ngx_array_push(&port->addrs);
@@ -1856,8 +1859,8 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport,
 #if (NGX_HTTP_SSL)
         addrs[i].conf.ssl = addr[i].opt.ssl;
 #endif
-#if (NGX_HTTP_SPDY)
-        addrs[i].conf.spdy = addr[i].opt.spdy;
+#if (NGX_HTTP_V2)
+        addrs[i].conf.http2 = addr[i].opt.http2;
 #endif
         addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
 
@@ -1921,8 +1924,8 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
 #if (NGX_HTTP_SSL)
         addrs6[i].conf.ssl = addr[i].opt.ssl;
 #endif
-#if (NGX_HTTP_SPDY)
-        addrs6[i].conf.spdy = addr[i].opt.spdy;
+#if (NGX_HTTP_V2)
+        addrs6[i].conf.http2 = addr[i].opt.http2;
 #endif
 
         if (addr[i].hash.buckets == NULL
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index 844f502..19cb680 100644
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -20,8 +20,8 @@ typedef struct ngx_http_file_cache_s  ngx_http_file_cache_t;
 typedef struct ngx_http_log_ctx_s     ngx_http_log_ctx_t;
 typedef struct ngx_http_chunked_s     ngx_http_chunked_t;
 
-#if (NGX_HTTP_SPDY)
-typedef struct ngx_http_spdy_stream_s  ngx_http_spdy_stream_t;
+#if (NGX_HTTP_V2)
+typedef struct ngx_http_v2_stream_s   ngx_http_v2_stream_t;
 #endif
 
 typedef ngx_int_t (*ngx_http_header_handler_pt)(ngx_http_request_t *r,
@@ -38,8 +38,8 @@ typedef u_char *(*ngx_http_log_handler_pt)(ngx_http_request_t *r,
 #include <ngx_http_upstream_round_robin.h>
 #include <ngx_http_core_module.h>
 
-#if (NGX_HTTP_SPDY)
-#include <ngx_http_spdy.h>
+#if (NGX_HTTP_V2)
+#include <ngx_http_v2.h>
 #endif
 #if (NGX_HTTP_CACHE)
 #include <ngx_http_cache.h>
diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c
index 0f908ad..c6d03ee 100644
--- a/src/http/ngx_http_copy_filter_module.c
+++ b/src/http/ngx_http_copy_filter_module.c
@@ -327,7 +327,7 @@ ngx_http_copy_filter_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_http_copy_filter_conf_t *prev = parent;
     ngx_http_copy_filter_conf_t *conf = child;
 
-    ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 1, 32768);
+    ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 2, 32768);
 
     return NULL;
 }
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 22400ca..36f00f6 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2132,13 +2132,6 @@ ngx_http_gzip_ok(ngx_http_request_t *r)
         return NGX_DECLINED;
     }
 
-#if (NGX_HTTP_SPDY)
-    if (r->spdy_stream) {
-        r->gzip_ok = 1;
-        return NGX_OK;
-    }
-#endif
-
     ae = r->headers_in.accept_encoding;
     if (ae == NULL) {
         return NGX_DECLINED;
@@ -2427,12 +2420,19 @@ ngx_http_subrequest(ngx_http_request_t *r,
     ngx_http_core_srv_conf_t      *cscf;
     ngx_http_postponed_request_t  *pr, *p;
 
-    r->main->subrequests--;
-
-    if (r->main->subrequests == 0) {
+    if (r->subrequests == 0) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "subrequests cycle while processing \"%V\"", uri);
-        r->main->subrequests = 1;
+        return NGX_ERROR;
+    }
+
+    /*
+     * 1000 is reserved for other purposes.
+     */
+    if (r->main->count >= 65535 - 1000) {
+        ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
+                      "request reference counter overflow "
+                      "while processing \"%V\"", uri);
         return NGX_ERROR;
     }
 
@@ -2473,8 +2473,8 @@ ngx_http_subrequest(ngx_http_request_t *r,
 
     sr->request_body = r->request_body;
 
-#if (NGX_HTTP_SPDY)
-    sr->spdy_stream = r->spdy_stream;
+#if (NGX_HTTP_V2)
+    sr->stream = r->stream;
 #endif
 
     sr->method = NGX_HTTP_GET;
@@ -2537,6 +2537,7 @@ ngx_http_subrequest(ngx_http_request_t *r,
     sr->main_filter_need_in_memory = r->main_filter_need_in_memory;
 
     sr->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
+    sr->subrequests = r->subrequests - 1;
 
     tp = ngx_timeofday();
     sr->start_sec = tp->sec;
@@ -3188,7 +3189,7 @@ ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
 
     pclcf = pctx->loc_conf[ngx_http_core_module.ctx_index];
 
-    if (pclcf->name.len) {
+    if (cf->cmd_type == NGX_HTTP_LOC_CONF) {
 
         /* nested location */
 
@@ -4195,18 +4196,26 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
         }
 
-        if (ngx_strcmp(value[n].data, "spdy") == 0) {
-#if (NGX_HTTP_SPDY)
-            lsopt.spdy = 1;
+        if (ngx_strcmp(value[n].data, "http2") == 0) {
+#if (NGX_HTTP_V2)
+            lsopt.http2 = 1;
             continue;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "the \"spdy\" parameter requires "
-                               "ngx_http_spdy_module");
+                               "the \"http2\" parameter requires "
+                               "ngx_http_v2_module");
             return NGX_CONF_ERROR;
 #endif
         }
 
+        if (ngx_strcmp(value[n].data, "spdy") == 0) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "invalid parameter \"spdy\": "
+                               "ngx_http_spdy_module was superseded "
+                               "by ngx_http_v2_module");
+            continue;
+        }
+
         if (ngx_strncmp(value[n].data, "so_keepalive=", 13) == 0) {
 
             if (ngx_strcmp(&value[n].data[13], "on") == 0) {
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index e6be5ac..7dec9e1 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -79,8 +79,8 @@ typedef struct {
 #if (NGX_HTTP_SSL)
     unsigned                   ssl:1;
 #endif
-#if (NGX_HTTP_SPDY)
-    unsigned                   spdy:1;
+#if (NGX_HTTP_V2)
+    unsigned                   http2:1;
 #endif
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
     unsigned                   ipv6only:1;
@@ -248,8 +248,8 @@ struct ngx_http_addr_conf_s {
 #if (NGX_HTTP_SSL)
     unsigned                   ssl:1;
 #endif
-#if (NGX_HTTP_SPDY)
-    unsigned                   spdy:1;
+#if (NGX_HTTP_V2)
+    unsigned                   http2:1;
 #endif
     unsigned                   proxy_protocol:1;
 };
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index fc14761..6633918 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -521,9 +521,12 @@ wakeup:
 static ngx_int_t
 ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c)
 {
+    u_char                        *p;
     time_t                         now;
     ssize_t                        n;
+    ngx_str_t                     *key;
     ngx_int_t                      rc;
+    ngx_uint_t                     i;
     ngx_http_file_cache_t         *cache;
     ngx_http_file_cache_header_t  *h;
 
@@ -547,12 +550,27 @@ ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c)
         return NGX_DECLINED;
     }
 
-    if (h->crc32 != c->crc32) {
+    if (h->crc32 != c->crc32 || h->header_start != c->header_start) {
         ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
                       "cache file \"%s\" has md5 collision", c->file.name.data);
         return NGX_DECLINED;
     }
 
+    p = c->buf->pos + sizeof(ngx_http_file_cache_header_t)
+        + sizeof(ngx_http_file_cache_key);
+
+    key = c->keys.elts;
+    for (i = 0; i < c->keys.nelts; i++) {
+        if (ngx_memcmp(p, key[i].data, key[i].len) != 0) {
+            ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
+                          "cache file \"%s\" has md5 collision",
+                          c->file.name.data);
+            return NGX_DECLINED;
+        }
+
+        p += key[i].len;
+    }
+
     if ((size_t) h->body_start > c->body_start) {
         ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
                       "cache file \"%s\" has too long header",
@@ -583,7 +601,6 @@ ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c)
     c->last_modified = h->last_modified;
     c->date = h->date;
     c->valid_msec = h->valid_msec;
-    c->header_start = h->header_start;
     c->body_start = h->body_start;
     c->etag.len = h->etag_len;
     c->etag.data = h->etag;
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index cd5f302..9da972e 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -312,9 +312,9 @@ ngx_http_init_connection(ngx_connection_t *c)
     rev->handler = ngx_http_wait_request_handler;
     c->write->handler = ngx_http_empty_handler;
 
-#if (NGX_HTTP_SPDY)
-    if (hc->addr_conf->spdy) {
-        rev->handler = ngx_http_spdy_init;
+#if (NGX_HTTP_V2)
+    if (hc->addr_conf->http2) {
+        rev->handler = ngx_http_v2_init;
     }
 #endif
 
@@ -764,13 +764,12 @@ ngx_http_ssl_handshake_handler(ngx_connection_t *c)
 
         c->ssl->no_wait_shutdown = 1;
 
-#if (NGX_HTTP_SPDY                                                            \
+#if (NGX_HTTP_V2                                                              \
      && (defined TLSEXT_TYPE_application_layer_protocol_negotiation           \
          || defined TLSEXT_TYPE_next_proto_neg))
         {
-        unsigned int             len;
-        const unsigned char     *data;
-        static const ngx_str_t   spdy = ngx_string(NGX_SPDY_NPN_NEGOTIATED);
+        unsigned int          len;
+        const unsigned char  *data;
 
 #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
         SSL_get0_alpn_selected(c->ssl->connection, &data, &len);
@@ -785,8 +784,8 @@ ngx_http_ssl_handshake_handler(ngx_connection_t *c)
         SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
 #endif
 
-        if (len == spdy.len && ngx_strncmp(data, spdy.data, spdy.len) == 0) {
-            ngx_http_spdy_init(c->read);
+        if (len == 2 && data[0] == 'h' && data[1] == '2') {
+            ngx_http_v2_init(c->read);
             return;
         }
         }
@@ -2338,7 +2337,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         if (r == c->data) {
 
             r->main->count--;
-            r->main->subrequests++;
 
             if (!r->logged) {
 
@@ -2500,8 +2498,8 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
 {
     ngx_http_core_loc_conf_t  *clcf;
 
-#if (NGX_HTTP_SPDY)
-    if (r->spdy_stream) {
+#if (NGX_HTTP_V2)
+    if (r->stream) {
         ngx_http_close_request(r, 0);
         return;
     }
@@ -2566,8 +2564,8 @@ ngx_http_set_write_handler(ngx_http_request_t *r)
                                 ngx_http_test_reading;
     r->write_event_handler = ngx_http_writer;
 
-#if (NGX_HTTP_SPDY)
-    if (r->spdy_stream) {
+#if (NGX_HTTP_V2)
+    if (r->stream) {
         return NGX_OK;
     }
 #endif
@@ -2657,8 +2655,8 @@ ngx_http_writer(ngx_http_request_t *r)
 
     if (r->buffered || r->postponed || (r == r->main && c->buffered)) {
 
-#if (NGX_HTTP_SPDY)
-        if (r->spdy_stream) {
+#if (NGX_HTTP_V2)
+        if (r->stream) {
             return;
         }
 #endif
@@ -2725,9 +2723,9 @@ ngx_http_test_reading(ngx_http_request_t *r)
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http test reading");
 
-#if (NGX_HTTP_SPDY)
+#if (NGX_HTTP_V2)
 
-    if (r->spdy_stream) {
+    if (r->stream) {
         if (c->error) {
             err = 0;
             goto closed;
@@ -3400,9 +3398,9 @@ ngx_http_close_request(ngx_http_request_t *r, ngx_int_t rc)
         return;
     }
 
-#if (NGX_HTTP_SPDY)
-    if (r->spdy_stream) {
-        ngx_http_spdy_close_stream(r->spdy_stream, rc);
+#if (NGX_HTTP_V2)
+    if (r->stream) {
+        ngx_http_v2_close_stream(r->stream, rc);
         return;
     }
 #endif
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 3954de3..967032a 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -10,7 +10,7 @@
 
 
 #define NGX_HTTP_MAX_URI_CHANGES           10
-#define NGX_HTTP_MAX_SUBREQUESTS           200
+#define NGX_HTTP_MAX_SUBREQUESTS           50
 
 /* must be 2^n */
 #define NGX_HTTP_LC_HEADER_LEN             32
@@ -23,6 +23,7 @@
 #define NGX_HTTP_VERSION_9                 9
 #define NGX_HTTP_VERSION_10                1000
 #define NGX_HTTP_VERSION_11                1001
+#define NGX_HTTP_VERSION_20                2000
 
 #define NGX_HTTP_UNKNOWN                   0x0001
 #define NGX_HTTP_GET                       0x0002
@@ -431,16 +432,16 @@ struct ngx_http_request_s {
     ngx_uint_t                        err_status;
 
     ngx_http_connection_t            *http_connection;
-#if (NGX_HTTP_SPDY)
-    ngx_http_spdy_stream_t           *spdy_stream;
+#if (NGX_HTTP_V2)
+    ngx_http_v2_stream_t             *stream;
 #endif
 
     ngx_http_log_handler_pt           log_handler;
 
     ngx_http_cleanup_t               *cleanup;
 
+    unsigned                          count:16;
     unsigned                          subrequests:8;
-    unsigned                          count:8;
     unsigned                          blocked:8;
 
     unsigned                          aio:1;
diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index 9c16984..77e92e3 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -40,10 +40,10 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
 
     r->main->count++;
 
-#if (NGX_HTTP_SPDY)
-    if (r->spdy_stream && r == r->main) {
+#if (NGX_HTTP_V2)
+    if (r->stream && r == r->main) {
         r->request_body_no_buffering = 0;
-        rc = ngx_http_spdy_read_request_body(r, post_handler);
+        rc = ngx_http_v2_read_request_body(r, post_handler);
         goto done;
     }
 #endif
@@ -570,9 +570,9 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
     ngx_int_t     rc;
     ngx_event_t  *rev;
 
-#if (NGX_HTTP_SPDY)
-    if (r->spdy_stream && r == r->main) {
-        r->spdy_stream->skip_data = NGX_SPDY_DATA_DISCARD;
+#if (NGX_HTTP_V2)
+    if (r->stream && r == r->main) {
+        r->stream->skip_data = NGX_HTTP_V2_DATA_DISCARD;
         return NGX_OK;
     }
 #endif
diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c
deleted file mode 100644
index 21c5217..0000000
--- a/src/http/ngx_http_spdy.c
+++ /dev/null
@@ -1,3701 +0,0 @@
-
-/*
- * Copyright (C) Nginx, Inc.
- * Copyright (C) Valentin V. Bartenev
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <ngx_http_spdy_module.h>
-
-#include <zlib.h>
-
-
-#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
-
-#define ngx_str5cmp(m, c0, c1, c2, c3, c4)                                    \
-    *(uint32_t *) m == (c3 << 24 | c2 << 16 | c1 << 8 | c0)                   \
-        && m[4] == c4
-
-#else
-
-#define ngx_str5cmp(m, c0, c1, c2, c3, c4)                                    \
-    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3 && m[4] == c4
-
-#endif
-
-
-#if (NGX_HAVE_NONALIGNED)
-
-#define ngx_spdy_frame_parse_uint16(p)  ntohs(*(uint16_t *) (p))
-#define ngx_spdy_frame_parse_uint32(p)  ntohl(*(uint32_t *) (p))
-
-#else
-
-#define ngx_spdy_frame_parse_uint16(p) ((p)[0] << 8 | (p)[1])
-#define ngx_spdy_frame_parse_uint32(p)                                        \
-    ((p)[0] << 24 | (p)[1] << 16 | (p)[2] << 8 | (p)[3])
-
-#endif
-
-#define ngx_spdy_frame_parse_sid(p)                                           \
-    (ngx_spdy_frame_parse_uint32(p) & 0x7fffffff)
-#define ngx_spdy_frame_parse_delta(p)                                         \
-    (ngx_spdy_frame_parse_uint32(p) & 0x7fffffff)
-
-
-#define ngx_spdy_ctl_frame_check(h)                                           \
-    (((h) & 0xffff0000) == ngx_spdy_ctl_frame_head(0))
-#define ngx_spdy_data_frame_check(h)                                          \
-    (!((h) & (uint32_t) NGX_SPDY_CTL_BIT << 31))
-
-#define ngx_spdy_ctl_frame_type(h)   ((h) & 0x0000ffff)
-#define ngx_spdy_frame_flags(p)      ((p) >> 24)
-#define ngx_spdy_frame_length(p)     ((p) & 0x00ffffff)
-#define ngx_spdy_frame_id(p)         ((p) & 0x00ffffff)
-
-
-#define NGX_SPDY_SKIP_HEADERS_BUFFER_SIZE  4096
-#define NGX_SPDY_CTL_FRAME_BUFFER_SIZE     16
-
-#define NGX_SPDY_PROTOCOL_ERROR            1
-#define NGX_SPDY_INVALID_STREAM            2
-#define NGX_SPDY_REFUSED_STREAM            3
-#define NGX_SPDY_UNSUPPORTED_VERSION       4
-#define NGX_SPDY_CANCEL                    5
-#define NGX_SPDY_INTERNAL_ERROR            6
-#define NGX_SPDY_FLOW_CONTROL_ERROR        7
-#define NGX_SPDY_STREAM_IN_USE             8
-#define NGX_SPDY_STREAM_ALREADY_CLOSED     9
-/* deprecated                              10 */
-#define NGX_SPDY_FRAME_TOO_LARGE           11
-
-#define NGX_SPDY_SETTINGS_MAX_STREAMS      4
-#define NGX_SPDY_SETTINGS_INIT_WINDOW      7
-
-#define NGX_SPDY_SETTINGS_FLAG_PERSIST     0x01
-#define NGX_SPDY_SETTINGS_FLAG_PERSISTED   0x02
-
-#define NGX_SPDY_MAX_WINDOW                NGX_MAX_INT32_VALUE
-#define NGX_SPDY_CONNECTION_WINDOW         65536
-#define NGX_SPDY_INIT_STREAM_WINDOW        65536
-#define NGX_SPDY_STREAM_WINDOW             NGX_SPDY_MAX_WINDOW
-
-typedef struct {
-    ngx_uint_t    hash;
-    u_char        len;
-    u_char        header[7];
-    ngx_int_t   (*handler)(ngx_http_request_t *r);
-} ngx_http_spdy_request_header_t;
-
-
-static void ngx_http_spdy_read_handler(ngx_event_t *rev);
-static void ngx_http_spdy_write_handler(ngx_event_t *wev);
-static void ngx_http_spdy_handle_connection(ngx_http_spdy_connection_t *sc);
-
-static u_char *ngx_http_spdy_proxy_protocol(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_head(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_syn_stream(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_headers_skip(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_headers_error(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_window_update(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_data(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_read_data(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_rst_stream(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_ping(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_skip(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_settings(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_complete(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-static u_char *ngx_http_spdy_state_save(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end, ngx_http_spdy_handler_pt handler);
-
-static u_char *ngx_http_spdy_state_inflate_error(
-    ngx_http_spdy_connection_t *sc, int rc);
-static u_char *ngx_http_spdy_state_protocol_error(
-    ngx_http_spdy_connection_t *sc);
-static u_char *ngx_http_spdy_state_internal_error(
-    ngx_http_spdy_connection_t *sc);
-
-static ngx_int_t ngx_http_spdy_send_window_update(
-    ngx_http_spdy_connection_t *sc, ngx_uint_t sid, ngx_uint_t delta);
-static ngx_int_t ngx_http_spdy_send_rst_stream(ngx_http_spdy_connection_t *sc,
-    ngx_uint_t sid, ngx_uint_t status, ngx_uint_t priority);
-static ngx_int_t ngx_http_spdy_send_settings(ngx_http_spdy_connection_t *sc);
-static ngx_int_t ngx_http_spdy_settings_frame_handler(
-    ngx_http_spdy_connection_t *sc, ngx_http_spdy_out_frame_t *frame);
-static ngx_http_spdy_out_frame_t *ngx_http_spdy_get_ctl_frame(
-    ngx_http_spdy_connection_t *sc, size_t size, ngx_uint_t priority);
-static ngx_int_t ngx_http_spdy_ctl_frame_handler(
-    ngx_http_spdy_connection_t *sc, ngx_http_spdy_out_frame_t *frame);
-
-static ngx_http_spdy_stream_t *ngx_http_spdy_create_stream(
-    ngx_http_spdy_connection_t *sc, ngx_uint_t id, ngx_uint_t priority);
-static ngx_http_spdy_stream_t *ngx_http_spdy_get_stream_by_id(
-    ngx_http_spdy_connection_t *sc, ngx_uint_t sid);
-#define ngx_http_spdy_streams_index_size(sscf)  (sscf->streams_index_mask + 1)
-#define ngx_http_spdy_stream_index(sscf, sid)                                 \
-    ((sid >> 1) & sscf->streams_index_mask)
-
-static ngx_int_t ngx_http_spdy_parse_header(ngx_http_request_t *r);
-static ngx_int_t ngx_http_spdy_alloc_large_header_buffer(ngx_http_request_t *r);
-
-static ngx_int_t ngx_http_spdy_handle_request_header(ngx_http_request_t *r);
-static ngx_int_t ngx_http_spdy_parse_method(ngx_http_request_t *r);
-static ngx_int_t ngx_http_spdy_parse_scheme(ngx_http_request_t *r);
-static ngx_int_t ngx_http_spdy_parse_host(ngx_http_request_t *r);
-static ngx_int_t ngx_http_spdy_parse_path(ngx_http_request_t *r);
-static ngx_int_t ngx_http_spdy_parse_version(ngx_http_request_t *r);
-
-static ngx_int_t ngx_http_spdy_construct_request_line(ngx_http_request_t *r);
-static void ngx_http_spdy_run_request(ngx_http_request_t *r);
-static ngx_int_t ngx_http_spdy_init_request_body(ngx_http_request_t *r);
-
-static ngx_int_t ngx_http_spdy_terminate_stream(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_stream_t *stream, ngx_uint_t status);
-
-static void ngx_http_spdy_close_stream_handler(ngx_event_t *ev);
-
-static void ngx_http_spdy_handle_connection_handler(ngx_event_t *rev);
-static void ngx_http_spdy_keepalive_handler(ngx_event_t *rev);
-static void ngx_http_spdy_finalize_connection(ngx_http_spdy_connection_t *sc,
-    ngx_int_t rc);
-
-static ngx_int_t ngx_http_spdy_adjust_windows(ngx_http_spdy_connection_t *sc,
-    ssize_t delta);
-
-static void ngx_http_spdy_pool_cleanup(void *data);
-
-static void *ngx_http_spdy_zalloc(void *opaque, u_int items, u_int size);
-static void ngx_http_spdy_zfree(void *opaque, void *address);
-
-
-static const u_char ngx_http_spdy_dict[] = {
-    0x00, 0x00, 0x00, 0x07, 0x6f, 0x70, 0x74, 0x69,   /* - - - - o p t i */
-    0x6f, 0x6e, 0x73, 0x00, 0x00, 0x00, 0x04, 0x68,   /* o n s - - - - h */
-    0x65, 0x61, 0x64, 0x00, 0x00, 0x00, 0x04, 0x70,   /* e a d - - - - p */
-    0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x03, 0x70,   /* o s t - - - - p */
-    0x75, 0x74, 0x00, 0x00, 0x00, 0x06, 0x64, 0x65,   /* u t - - - - d e */
-    0x6c, 0x65, 0x74, 0x65, 0x00, 0x00, 0x00, 0x05,   /* l e t e - - - - */
-    0x74, 0x72, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,   /* t r a c e - - - */
-    0x06, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x00,   /* - a c c e p t - */
-    0x00, 0x00, 0x0e, 0x61, 0x63, 0x63, 0x65, 0x70,   /* - - - a c c e p */
-    0x74, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65,   /* t - c h a r s e */
-    0x74, 0x00, 0x00, 0x00, 0x0f, 0x61, 0x63, 0x63,   /* t - - - - a c c */
-    0x65, 0x70, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f,   /* e p t - e n c o */
-    0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x0f,   /* d i n g - - - - */
-    0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x6c,   /* a c c e p t - l */
-    0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x00,   /* a n g u a g e - */
-    0x00, 0x00, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x70,   /* - - - a c c e p */
-    0x74, 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73,   /* t - r a n g e s */
-    0x00, 0x00, 0x00, 0x03, 0x61, 0x67, 0x65, 0x00,   /* - - - - a g e - */
-    0x00, 0x00, 0x05, 0x61, 0x6c, 0x6c, 0x6f, 0x77,   /* - - - a l l o w */
-    0x00, 0x00, 0x00, 0x0d, 0x61, 0x75, 0x74, 0x68,   /* - - - - a u t h */
-    0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,   /* o r i z a t i o */
-    0x6e, 0x00, 0x00, 0x00, 0x0d, 0x63, 0x61, 0x63,   /* n - - - - c a c */
-    0x68, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,   /* h e - c o n t r */
-    0x6f, 0x6c, 0x00, 0x00, 0x00, 0x0a, 0x63, 0x6f,   /* o l - - - - c o */
-    0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,   /* n n e c t i o n */
-    0x00, 0x00, 0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74,   /* - - - - c o n t */
-    0x65, 0x6e, 0x74, 0x2d, 0x62, 0x61, 0x73, 0x65,   /* e n t - b a s e */
-    0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, 0x6e, 0x74,   /* - - - - c o n t */
-    0x65, 0x6e, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f,   /* e n t - e n c o */
-    0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x10,   /* d i n g - - - - */
-    0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d,   /* c o n t e n t - */
-    0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65,   /* l a n g u a g e */
-    0x00, 0x00, 0x00, 0x0e, 0x63, 0x6f, 0x6e, 0x74,   /* - - - - c o n t */
-    0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x65, 0x6e, 0x67,   /* e n t - l e n g */
-    0x74, 0x68, 0x00, 0x00, 0x00, 0x10, 0x63, 0x6f,   /* t h - - - - c o */
-    0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x6f,   /* n t e n t - l o */
-    0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00,   /* c a t i o n - - */
-    0x00, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,   /* - - c o n t e n */
-    0x74, 0x2d, 0x6d, 0x64, 0x35, 0x00, 0x00, 0x00,   /* t - m d 5 - - - */
-    0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,   /* - c o n t e n t */
-    0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00,   /* - r a n g e - - */
-    0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,   /* - - c o n t e n */
-    0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x00, 0x00,   /* t - t y p e - - */
-    0x00, 0x04, 0x64, 0x61, 0x74, 0x65, 0x00, 0x00,   /* - - d a t e - - */
-    0x00, 0x04, 0x65, 0x74, 0x61, 0x67, 0x00, 0x00,   /* - - e t a g - - */
-    0x00, 0x06, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74,   /* - - e x p e c t */
-    0x00, 0x00, 0x00, 0x07, 0x65, 0x78, 0x70, 0x69,   /* - - - - e x p i */
-    0x72, 0x65, 0x73, 0x00, 0x00, 0x00, 0x04, 0x66,   /* r e s - - - - f */
-    0x72, 0x6f, 0x6d, 0x00, 0x00, 0x00, 0x04, 0x68,   /* r o m - - - - h */
-    0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x08, 0x69,   /* o s t - - - - i */
-    0x66, 0x2d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x00,   /* f - m a t c h - */
-    0x00, 0x00, 0x11, 0x69, 0x66, 0x2d, 0x6d, 0x6f,   /* - - - i f - m o */
-    0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2d, 0x73,   /* d i f i e d - s */
-    0x69, 0x6e, 0x63, 0x65, 0x00, 0x00, 0x00, 0x0d,   /* i n c e - - - - */
-    0x69, 0x66, 0x2d, 0x6e, 0x6f, 0x6e, 0x65, 0x2d,   /* i f - n o n e - */
-    0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, 0x00, 0x00,   /* m a t c h - - - */
-    0x08, 0x69, 0x66, 0x2d, 0x72, 0x61, 0x6e, 0x67,   /* - i f - r a n g */
-    0x65, 0x00, 0x00, 0x00, 0x13, 0x69, 0x66, 0x2d,   /* e - - - - i f - */
-    0x75, 0x6e, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69,   /* u n m o d i f i */
-    0x65, 0x64, 0x2d, 0x73, 0x69, 0x6e, 0x63, 0x65,   /* e d - s i n c e */
-    0x00, 0x00, 0x00, 0x0d, 0x6c, 0x61, 0x73, 0x74,   /* - - - - l a s t */
-    0x2d, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65,   /* - m o d i f i e */
-    0x64, 0x00, 0x00, 0x00, 0x08, 0x6c, 0x6f, 0x63,   /* d - - - - l o c */
-    0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00,   /* a t i o n - - - */
-    0x0c, 0x6d, 0x61, 0x78, 0x2d, 0x66, 0x6f, 0x72,   /* - m a x - f o r */
-    0x77, 0x61, 0x72, 0x64, 0x73, 0x00, 0x00, 0x00,   /* w a r d s - - - */
-    0x06, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x00,   /* - p r a g m a - */
-    0x00, 0x00, 0x12, 0x70, 0x72, 0x6f, 0x78, 0x79,   /* - - - p r o x y */
-    0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74,   /* - a u t h e n t */
-    0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00,   /* i c a t e - - - */
-    0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2d, 0x61,   /* - p r o x y - a */
-    0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61,   /* u t h o r i z a */
-    0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x05,   /* t i o n - - - - */
-    0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, 0x00,   /* r a n g e - - - */
-    0x07, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72,   /* - r e f e r e r */
-    0x00, 0x00, 0x00, 0x0b, 0x72, 0x65, 0x74, 0x72,   /* - - - - r e t r */
-    0x79, 0x2d, 0x61, 0x66, 0x74, 0x65, 0x72, 0x00,   /* y - a f t e r - */
-    0x00, 0x00, 0x06, 0x73, 0x65, 0x72, 0x76, 0x65,   /* - - - s e r v e */
-    0x72, 0x00, 0x00, 0x00, 0x02, 0x74, 0x65, 0x00,   /* r - - - - t e - */
-    0x00, 0x00, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c,   /* - - - t r a i l */
-    0x65, 0x72, 0x00, 0x00, 0x00, 0x11, 0x74, 0x72,   /* e r - - - - t r */
-    0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2d, 0x65,   /* a n s f e r - e */
-    0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x00,   /* n c o d i n g - */
-    0x00, 0x00, 0x07, 0x75, 0x70, 0x67, 0x72, 0x61,   /* - - - u p g r a */
-    0x64, 0x65, 0x00, 0x00, 0x00, 0x0a, 0x75, 0x73,   /* d e - - - - u s */
-    0x65, 0x72, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74,   /* e r - a g e n t */
-    0x00, 0x00, 0x00, 0x04, 0x76, 0x61, 0x72, 0x79,   /* - - - - v a r y */
-    0x00, 0x00, 0x00, 0x03, 0x76, 0x69, 0x61, 0x00,   /* - - - - v i a - */
-    0x00, 0x00, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69,   /* - - - w a r n i */
-    0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, 0x77, 0x77,   /* n g - - - - w w */
-    0x77, 0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e,   /* w - a u t h e n */
-    0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00,   /* t i c a t e - - */
-    0x00, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,   /* - - m e t h o d */
-    0x00, 0x00, 0x00, 0x03, 0x67, 0x65, 0x74, 0x00,   /* - - - - g e t - */
-    0x00, 0x00, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,   /* - - - s t a t u */
-    0x73, 0x00, 0x00, 0x00, 0x06, 0x32, 0x30, 0x30,   /* s - - - - 2 0 0 */
-    0x20, 0x4f, 0x4b, 0x00, 0x00, 0x00, 0x07, 0x76,   /* - O K - - - - v */
-    0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x00,   /* e r s i o n - - */
-    0x00, 0x08, 0x48, 0x54, 0x54, 0x50, 0x2f, 0x31,   /* - - H T T P - 1 */
-    0x2e, 0x31, 0x00, 0x00, 0x00, 0x03, 0x75, 0x72,   /* - 1 - - - - u r */
-    0x6c, 0x00, 0x00, 0x00, 0x06, 0x70, 0x75, 0x62,   /* l - - - - p u b */
-    0x6c, 0x69, 0x63, 0x00, 0x00, 0x00, 0x0a, 0x73,   /* l i c - - - - s */
-    0x65, 0x74, 0x2d, 0x63, 0x6f, 0x6f, 0x6b, 0x69,   /* e t - c o o k i */
-    0x65, 0x00, 0x00, 0x00, 0x0a, 0x6b, 0x65, 0x65,   /* e - - - - k e e */
-    0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x00,   /* p - a l i v e - */
-    0x00, 0x00, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69,   /* - - - o r i g i */
-    0x6e, 0x31, 0x30, 0x30, 0x31, 0x30, 0x31, 0x32,   /* n 1 0 0 1 0 1 2 */
-    0x30, 0x31, 0x32, 0x30, 0x32, 0x32, 0x30, 0x35,   /* 0 1 2 0 2 2 0 5 */
-    0x32, 0x30, 0x36, 0x33, 0x30, 0x30, 0x33, 0x30,   /* 2 0 6 3 0 0 3 0 */
-    0x32, 0x33, 0x30, 0x33, 0x33, 0x30, 0x34, 0x33,   /* 2 3 0 3 3 0 4 3 */
-    0x30, 0x35, 0x33, 0x30, 0x36, 0x33, 0x30, 0x37,   /* 0 5 3 0 6 3 0 7 */
-    0x34, 0x30, 0x32, 0x34, 0x30, 0x35, 0x34, 0x30,   /* 4 0 2 4 0 5 4 0 */
-    0x36, 0x34, 0x30, 0x37, 0x34, 0x30, 0x38, 0x34,   /* 6 4 0 7 4 0 8 4 */
-    0x30, 0x39, 0x34, 0x31, 0x30, 0x34, 0x31, 0x31,   /* 0 9 4 1 0 4 1 1 */
-    0x34, 0x31, 0x32, 0x34, 0x31, 0x33, 0x34, 0x31,   /* 4 1 2 4 1 3 4 1 */
-    0x34, 0x34, 0x31, 0x35, 0x34, 0x31, 0x36, 0x34,   /* 4 4 1 5 4 1 6 4 */
-    0x31, 0x37, 0x35, 0x30, 0x32, 0x35, 0x30, 0x34,   /* 1 7 5 0 2 5 0 4 */
-    0x35, 0x30, 0x35, 0x32, 0x30, 0x33, 0x20, 0x4e,   /* 5 0 5 2 0 3 - N */
-    0x6f, 0x6e, 0x2d, 0x41, 0x75, 0x74, 0x68, 0x6f,   /* o n - A u t h o */
-    0x72, 0x69, 0x74, 0x61, 0x74, 0x69, 0x76, 0x65,   /* r i t a t i v e */
-    0x20, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,   /* - I n f o r m a */
-    0x74, 0x69, 0x6f, 0x6e, 0x32, 0x30, 0x34, 0x20,   /* t i o n 2 0 4 - */
-    0x4e, 0x6f, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x65,   /* N o - C o n t e */
-    0x6e, 0x74, 0x33, 0x30, 0x31, 0x20, 0x4d, 0x6f,   /* n t 3 0 1 - M o */
-    0x76, 0x65, 0x64, 0x20, 0x50, 0x65, 0x72, 0x6d,   /* v e d - P e r m */
-    0x61, 0x6e, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x34,   /* a n e n t l y 4 */
-    0x30, 0x30, 0x20, 0x42, 0x61, 0x64, 0x20, 0x52,   /* 0 0 - B a d - R */
-    0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x34, 0x30,   /* e q u e s t 4 0 */
-    0x31, 0x20, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68,   /* 1 - U n a u t h */
-    0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x34, 0x30,   /* o r i z e d 4 0 */
-    0x33, 0x20, 0x46, 0x6f, 0x72, 0x62, 0x69, 0x64,   /* 3 - F o r b i d */
-    0x64, 0x65, 0x6e, 0x34, 0x30, 0x34, 0x20, 0x4e,   /* d e n 4 0 4 - N */
-    0x6f, 0x74, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64,   /* o t - F o u n d */
-    0x35, 0x30, 0x30, 0x20, 0x49, 0x6e, 0x74, 0x65,   /* 5 0 0 - I n t e */
-    0x72, 0x6e, 0x61, 0x6c, 0x20, 0x53, 0x65, 0x72,   /* r n a l - S e r */
-    0x76, 0x65, 0x72, 0x20, 0x45, 0x72, 0x72, 0x6f,   /* v e r - E r r o */
-    0x72, 0x35, 0x30, 0x31, 0x20, 0x4e, 0x6f, 0x74,   /* r 5 0 1 - N o t */
-    0x20, 0x49, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,   /* - I m p l e m e */
-    0x6e, 0x74, 0x65, 0x64, 0x35, 0x30, 0x33, 0x20,   /* n t e d 5 0 3 - */
-    0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20,   /* S e r v i c e - */
-    0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,   /* U n a v a i l a */
-    0x62, 0x6c, 0x65, 0x4a, 0x61, 0x6e, 0x20, 0x46,   /* b l e J a n - F */
-    0x65, 0x62, 0x20, 0x4d, 0x61, 0x72, 0x20, 0x41,   /* e b - M a r - A */
-    0x70, 0x72, 0x20, 0x4d, 0x61, 0x79, 0x20, 0x4a,   /* p r - M a y - J */
-    0x75, 0x6e, 0x20, 0x4a, 0x75, 0x6c, 0x20, 0x41,   /* u n - J u l - A */
-    0x75, 0x67, 0x20, 0x53, 0x65, 0x70, 0x74, 0x20,   /* u g - S e p t - */
-    0x4f, 0x63, 0x74, 0x20, 0x4e, 0x6f, 0x76, 0x20,   /* O c t - N o v - */
-    0x44, 0x65, 0x63, 0x20, 0x30, 0x30, 0x3a, 0x30,   /* D e c - 0 0 - 0 */
-    0x30, 0x3a, 0x30, 0x30, 0x20, 0x4d, 0x6f, 0x6e,   /* 0 - 0 0 - M o n */
-    0x2c, 0x20, 0x54, 0x75, 0x65, 0x2c, 0x20, 0x57,   /* - - T u e - - W */
-    0x65, 0x64, 0x2c, 0x20, 0x54, 0x68, 0x75, 0x2c,   /* e d - - T h u - */
-    0x20, 0x46, 0x72, 0x69, 0x2c, 0x20, 0x53, 0x61,   /* - F r i - - S a */
-    0x74, 0x2c, 0x20, 0x53, 0x75, 0x6e, 0x2c, 0x20,   /* t - - S u n - - */
-    0x47, 0x4d, 0x54, 0x63, 0x68, 0x75, 0x6e, 0x6b,   /* G M T c h u n k */
-    0x65, 0x64, 0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f,   /* e d - t e x t - */
-    0x68, 0x74, 0x6d, 0x6c, 0x2c, 0x69, 0x6d, 0x61,   /* h t m l - i m a */
-    0x67, 0x65, 0x2f, 0x70, 0x6e, 0x67, 0x2c, 0x69,   /* g e - p n g - i */
-    0x6d, 0x61, 0x67, 0x65, 0x2f, 0x6a, 0x70, 0x67,   /* m a g e - j p g */
-    0x2c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x67,   /* - i m a g e - g */
-    0x69, 0x66, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69,   /* i f - a p p l i */
-    0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78,   /* c a t i o n - x */
-    0x6d, 0x6c, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69,   /* m l - a p p l i */
-    0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78,   /* c a t i o n - x */
-    0x68, 0x74, 0x6d, 0x6c, 0x2b, 0x78, 0x6d, 0x6c,   /* h t m l - x m l */
-    0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c,   /* - t e x t - p l */
-    0x61, 0x69, 0x6e, 0x2c, 0x74, 0x65, 0x78, 0x74,   /* a i n - t e x t */
-    0x2f, 0x6a, 0x61, 0x76, 0x61, 0x73, 0x63, 0x72,   /* - j a v a s c r */
-    0x69, 0x70, 0x74, 0x2c, 0x70, 0x75, 0x62, 0x6c,   /* i p t - p u b l */
-    0x69, 0x63, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74,   /* i c p r i v a t */
-    0x65, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65,   /* e m a x - a g e */
-    0x3d, 0x67, 0x7a, 0x69, 0x70, 0x2c, 0x64, 0x65,   /* - g z i p - d e */
-    0x66, 0x6c, 0x61, 0x74, 0x65, 0x2c, 0x73, 0x64,   /* f l a t e - s d */
-    0x63, 0x68, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65,   /* c h c h a r s e */
-    0x74, 0x3d, 0x75, 0x74, 0x66, 0x2d, 0x38, 0x63,   /* t - u t f - 8 c */
-    0x68, 0x61, 0x72, 0x73, 0x65, 0x74, 0x3d, 0x69,   /* h a r s e t - i */
-    0x73, 0x6f, 0x2d, 0x38, 0x38, 0x35, 0x39, 0x2d,   /* s o - 8 8 5 9 - */
-    0x31, 0x2c, 0x75, 0x74, 0x66, 0x2d, 0x2c, 0x2a,   /* 1 - u t f - - - */
-    0x2c, 0x65, 0x6e, 0x71, 0x3d, 0x30, 0x2e          /* - e n q - 0 -   */
-};
-
-
-static ngx_http_spdy_request_header_t ngx_http_spdy_request_headers[] = {
-    { 0, 6, "method", ngx_http_spdy_parse_method },
-    { 0, 6, "scheme", ngx_http_spdy_parse_scheme },
-    { 0, 4, "host", ngx_http_spdy_parse_host },
-    { 0, 4, "path", ngx_http_spdy_parse_path },
-    { 0, 7, "version", ngx_http_spdy_parse_version },
-};
-
-#define NGX_SPDY_REQUEST_HEADERS                                              \
-    (sizeof(ngx_http_spdy_request_headers)                                    \
-     / sizeof(ngx_http_spdy_request_header_t))
-
-
-void
-ngx_http_spdy_init(ngx_event_t *rev)
-{
-    int                          rc;
-    ngx_connection_t            *c;
-    ngx_pool_cleanup_t          *cln;
-    ngx_http_connection_t       *hc;
-    ngx_http_spdy_srv_conf_t    *sscf;
-    ngx_http_spdy_main_conf_t   *smcf;
-    ngx_http_spdy_connection_t  *sc;
-
-    c = rev->data;
-    hc = c->data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "init spdy request");
-
-    c->log->action = "processing SPDY";
-
-    smcf = ngx_http_get_module_main_conf(hc->conf_ctx, ngx_http_spdy_module);
-
-    if (smcf->recv_buffer == NULL) {
-        smcf->recv_buffer = ngx_palloc(ngx_cycle->pool, smcf->recv_buffer_size);
-        if (smcf->recv_buffer == NULL) {
-            ngx_http_close_connection(c);
-            return;
-        }
-    }
-
-    sc = ngx_pcalloc(c->pool, sizeof(ngx_http_spdy_connection_t));
-    if (sc == NULL) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    sc->connection = c;
-    sc->http_connection = hc;
-
-    sc->send_window = NGX_SPDY_CONNECTION_WINDOW;
-    sc->recv_window = NGX_SPDY_CONNECTION_WINDOW;
-
-    sc->init_window = NGX_SPDY_INIT_STREAM_WINDOW;
-
-    sc->handler = hc->proxy_protocol ? ngx_http_spdy_proxy_protocol
-                                     : ngx_http_spdy_state_head;
-
-    sc->zstream_in.zalloc = ngx_http_spdy_zalloc;
-    sc->zstream_in.zfree = ngx_http_spdy_zfree;
-    sc->zstream_in.opaque = sc;
-
-    rc = inflateInit(&sc->zstream_in);
-    if (rc != Z_OK) {
-        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                      "inflateInit() failed: %d", rc);
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    sc->zstream_out.zalloc = ngx_http_spdy_zalloc;
-    sc->zstream_out.zfree = ngx_http_spdy_zfree;
-    sc->zstream_out.opaque = sc;
-
-    sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_spdy_module);
-
-    rc = deflateInit2(&sc->zstream_out, (int) sscf->headers_comp,
-                      Z_DEFLATED, 11, 4, Z_DEFAULT_STRATEGY);
-
-    if (rc != Z_OK) {
-        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                      "deflateInit2() failed: %d", rc);
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    rc = deflateSetDictionary(&sc->zstream_out, ngx_http_spdy_dict,
-                              sizeof(ngx_http_spdy_dict));
-    if (rc != Z_OK) {
-        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                      "deflateSetDictionary() failed: %d", rc);
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    sc->pool = ngx_create_pool(sscf->pool_size, sc->connection->log);
-    if (sc->pool == NULL) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    cln = ngx_pool_cleanup_add(c->pool, sizeof(ngx_pool_cleanup_file_t));
-    if (cln == NULL) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    cln->handler = ngx_http_spdy_pool_cleanup;
-    cln->data = sc;
-
-    sc->streams_index = ngx_pcalloc(sc->pool,
-                                    ngx_http_spdy_streams_index_size(sscf)
-                                    * sizeof(ngx_http_spdy_stream_t *));
-    if (sc->streams_index == NULL) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    if (ngx_http_spdy_send_settings(sc) == NGX_ERROR) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    if (ngx_http_spdy_send_window_update(sc, 0, NGX_SPDY_MAX_WINDOW
-                                                - sc->recv_window)
-        == NGX_ERROR)
-    {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    sc->recv_window = NGX_SPDY_MAX_WINDOW;
-
-    ngx_queue_init(&sc->waiting);
-    ngx_queue_init(&sc->posted);
-
-    c->data = sc;
-
-    rev->handler = ngx_http_spdy_read_handler;
-    c->write->handler = ngx_http_spdy_write_handler;
-
-    ngx_http_spdy_read_handler(rev);
-}
-
-
-static void
-ngx_http_spdy_read_handler(ngx_event_t *rev)
-{
-    u_char                      *p, *end;
-    size_t                       available;
-    ssize_t                      n;
-    ngx_connection_t            *c;
-    ngx_http_spdy_main_conf_t   *smcf;
-    ngx_http_spdy_connection_t  *sc;
-
-    c = rev->data;
-    sc = c->data;
-
-    if (rev->timedout) {
-        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
-        ngx_http_spdy_finalize_connection(sc, NGX_HTTP_REQUEST_TIME_OUT);
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "spdy read handler");
-
-    sc->blocked = 1;
-
-    smcf = ngx_http_get_module_main_conf(sc->http_connection->conf_ctx,
-                                         ngx_http_spdy_module);
-
-    available = smcf->recv_buffer_size - 2 * NGX_SPDY_STATE_BUFFER_SIZE;
-
-    do {
-        p = smcf->recv_buffer;
-
-        ngx_memcpy(p, sc->buffer, NGX_SPDY_STATE_BUFFER_SIZE);
-        end = p + sc->buffer_used;
-
-        n = c->recv(c, end, available);
-
-        if (n == NGX_AGAIN) {
-            break;
-        }
-
-        if (n == 0 && (sc->incomplete || sc->processing)) {
-            ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                          "client prematurely closed connection");
-        }
-
-        if (n == 0 || n == NGX_ERROR) {
-            ngx_http_spdy_finalize_connection(sc,
-                                              NGX_HTTP_CLIENT_CLOSED_REQUEST);
-            return;
-        }
-
-        end += n;
-
-        sc->buffer_used = 0;
-        sc->incomplete = 0;
-
-        do {
-            p = sc->handler(sc, p, end);
-
-            if (p == NULL) {
-                return;
-            }
-
-        } while (p != end);
-
-    } while (rev->ready);
-
-    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
-        ngx_http_spdy_finalize_connection(sc, NGX_HTTP_INTERNAL_SERVER_ERROR);
-        return;
-    }
-
-    if (sc->last_out && ngx_http_spdy_send_output_queue(sc) == NGX_ERROR) {
-        ngx_http_spdy_finalize_connection(sc, NGX_HTTP_CLIENT_CLOSED_REQUEST);
-        return;
-    }
-
-    sc->blocked = 0;
-
-    if (sc->processing) {
-        if (rev->timer_set) {
-            ngx_del_timer(rev);
-        }
-        return;
-    }
-
-    ngx_http_spdy_handle_connection(sc);
-}
-
-
-static void
-ngx_http_spdy_write_handler(ngx_event_t *wev)
-{
-    ngx_int_t                    rc;
-    ngx_queue_t                 *q;
-    ngx_connection_t            *c;
-    ngx_http_spdy_stream_t      *stream;
-    ngx_http_spdy_connection_t  *sc;
-
-    c = wev->data;
-    sc = c->data;
-
-    if (wev->timedout) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "spdy write event timed out");
-        ngx_http_spdy_finalize_connection(sc, NGX_HTTP_CLIENT_CLOSED_REQUEST);
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "spdy write handler");
-
-    sc->blocked = 1;
-
-    rc = ngx_http_spdy_send_output_queue(sc);
-
-    if (rc == NGX_ERROR) {
-        ngx_http_spdy_finalize_connection(sc, NGX_HTTP_CLIENT_CLOSED_REQUEST);
-        return;
-    }
-
-    while (!ngx_queue_empty(&sc->posted)) {
-        q = ngx_queue_head(&sc->posted);
-
-        ngx_queue_remove(q);
-
-        stream = ngx_queue_data(q, ngx_http_spdy_stream_t, queue);
-
-        stream->handled = 0;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "run spdy stream %ui", stream->id);
-
-        wev = stream->request->connection->write;
-        wev->handler(wev);
-    }
-
-    sc->blocked = 0;
-
-    if (rc == NGX_AGAIN) {
-        return;
-    }
-
-    ngx_http_spdy_handle_connection(sc);
-}
-
-
-ngx_int_t
-ngx_http_spdy_send_output_queue(ngx_http_spdy_connection_t *sc)
-{
-    int                         tcp_nodelay;
-    ngx_chain_t                *cl;
-    ngx_event_t                *wev;
-    ngx_connection_t           *c;
-    ngx_http_core_loc_conf_t   *clcf;
-    ngx_http_spdy_out_frame_t  *out, *frame, *fn;
-
-    c = sc->connection;
-
-    if (c->error) {
-        return NGX_ERROR;
-    }
-
-    wev = c->write;
-
-    if (!wev->ready) {
-        return NGX_OK;
-    }
-
-    cl = NULL;
-    out = NULL;
-
-    for (frame = sc->last_out; frame; frame = fn) {
-        frame->last->next = cl;
-        cl = frame->first;
-
-        fn = frame->next;
-        frame->next = out;
-        out = frame;
-
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "spdy frame out: %p sid:%ui prio:%ui bl:%d len:%uz",
-                       out, out->stream ? out->stream->id : 0, out->priority,
-                       out->blocked, out->length);
-    }
-
-    cl = c->send_chain(c, cl, 0);
-
-    if (cl == NGX_CHAIN_ERROR) {
-        goto error;
-    }
-
-    clcf = ngx_http_get_module_loc_conf(sc->http_connection->conf_ctx,
-                                        ngx_http_core_module);
-
-    if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-        goto error;
-    }
-
-    if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
-        if (ngx_tcp_push(c->fd) == -1) {
-            ngx_connection_error(c, ngx_socket_errno, ngx_tcp_push_n " failed");
-            goto error;
-        }
-
-        c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
-        tcp_nodelay = ngx_tcp_nodelay_and_tcp_nopush ? 1 : 0;
-
-    } else {
-        tcp_nodelay = 1;
-    }
-
-    if (tcp_nodelay
-        && clcf->tcp_nodelay
-        && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
-    {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
-        if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                       (const void *) &tcp_nodelay, sizeof(int))
-            == -1)
-        {
-#if (NGX_SOLARIS)
-            /* Solaris returns EINVAL if a socket has been shut down */
-            c->log_error = NGX_ERROR_IGNORE_EINVAL;
-#endif
-
-            ngx_connection_error(c, ngx_socket_errno,
-                                 "setsockopt(TCP_NODELAY) failed");
-
-            c->log_error = NGX_ERROR_INFO;
-            goto error;
-        }
-
-        c->tcp_nodelay = NGX_TCP_NODELAY_SET;
-    }
-
-    if (cl) {
-        ngx_add_timer(wev, clcf->send_timeout);
-
-    } else {
-        if (wev->timer_set) {
-            ngx_del_timer(wev);
-        }
-    }
-
-    for ( /* void */ ; out; out = fn) {
-        fn = out->next;
-
-        if (out->handler(sc, out) != NGX_OK) {
-            out->blocked = 1;
-            out->priority = NGX_SPDY_HIGHEST_PRIORITY;
-            break;
-        }
-
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "spdy frame sent: %p sid:%ui bl:%d len:%uz",
-                       out, out->stream ? out->stream->id : 0,
-                       out->blocked, out->length);
-    }
-
-    frame = NULL;
-
-    for ( /* void */ ; out; out = fn) {
-        fn = out->next;
-        out->next = frame;
-        frame = out;
-    }
-
-    sc->last_out = frame;
-
-    return NGX_OK;
-
-error:
-
-    c->error = 1;
-
-    if (!sc->blocked) {
-        ngx_post_event(wev, &ngx_posted_events);
-    }
-
-    return NGX_ERROR;
-}
-
-
-static void
-ngx_http_spdy_handle_connection(ngx_http_spdy_connection_t *sc)
-{
-    ngx_connection_t          *c;
-    ngx_http_spdy_srv_conf_t  *sscf;
-
-    if (sc->last_out || sc->processing) {
-        return;
-    }
-
-    c = sc->connection;
-
-    if (c->error) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    if (c->buffered) {
-        return;
-    }
-
-    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
-                                        ngx_http_spdy_module);
-    if (sc->incomplete) {
-        ngx_add_timer(c->read, sscf->recv_timeout);
-        return;
-    }
-
-    if (ngx_terminate || ngx_exiting) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    ngx_destroy_pool(sc->pool);
-
-    sc->pool = NULL;
-    sc->free_ctl_frames = NULL;
-    sc->free_fake_connections = NULL;
-
-#if (NGX_HTTP_SSL)
-    if (c->ssl) {
-        ngx_ssl_free_buffer(c);
-    }
-#endif
-
-    c->destroyed = 1;
-    c->idle = 1;
-    ngx_reusable_connection(c, 1);
-
-    c->write->handler = ngx_http_empty_handler;
-    c->read->handler = ngx_http_spdy_keepalive_handler;
-
-    if (c->write->timer_set) {
-        ngx_del_timer(c->write);
-    }
-
-    ngx_add_timer(c->read, sscf->keepalive_timeout);
-}
-
-
-static u_char *
-ngx_http_spdy_proxy_protocol(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    ngx_log_t  *log;
-
-    log = sc->connection->log;
-    log->action = "reading PROXY protocol";
-
-    pos = ngx_proxy_protocol_read(sc->connection, pos, end);
-
-    log->action = "processing SPDY";
-
-    if (pos == NULL) {
-        return ngx_http_spdy_state_protocol_error(sc);
-    }
-
-    return ngx_http_spdy_state_complete(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_head(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    uint32_t    head, flen;
-    ngx_uint_t  type;
-
-    if (end - pos < NGX_SPDY_FRAME_HEADER_SIZE) {
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_head);
-    }
-
-    head = ngx_spdy_frame_parse_uint32(pos);
-
-    pos += sizeof(uint32_t);
-
-    flen = ngx_spdy_frame_parse_uint32(pos);
-
-    sc->flags = ngx_spdy_frame_flags(flen);
-    sc->length = ngx_spdy_frame_length(flen);
-
-    pos += sizeof(uint32_t);
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "process spdy frame head:%08XD f:%Xd l:%uz",
-                   head, sc->flags, sc->length);
-
-    if (ngx_spdy_ctl_frame_check(head)) {
-        type = ngx_spdy_ctl_frame_type(head);
-
-        switch (type) {
-
-        case NGX_SPDY_SYN_STREAM:
-            return ngx_http_spdy_state_syn_stream(sc, pos, end);
-
-        case NGX_SPDY_SYN_REPLY:
-            ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                          "client sent unexpected SYN_REPLY frame");
-            return ngx_http_spdy_state_protocol_error(sc);
-
-        case NGX_SPDY_RST_STREAM:
-            return ngx_http_spdy_state_rst_stream(sc, pos, end);
-
-        case NGX_SPDY_SETTINGS:
-            return ngx_http_spdy_state_settings(sc, pos, end);
-
-        case NGX_SPDY_PING:
-            return ngx_http_spdy_state_ping(sc, pos, end);
-
-        case NGX_SPDY_GOAWAY:
-            return ngx_http_spdy_state_skip(sc, pos, end); /* TODO */
-
-        case NGX_SPDY_HEADERS:
-            ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                          "client sent unexpected HEADERS frame");
-            return ngx_http_spdy_state_protocol_error(sc);
-
-        case NGX_SPDY_WINDOW_UPDATE:
-            return ngx_http_spdy_state_window_update(sc, pos, end);
-
-        default:
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                           "spdy control frame with unknown type %ui", type);
-            return ngx_http_spdy_state_skip(sc, pos, end);
-        }
-    }
-
-    if (ngx_spdy_data_frame_check(head)) {
-        sc->stream = ngx_http_spdy_get_stream_by_id(sc, head);
-        return ngx_http_spdy_state_data(sc, pos, end);
-    }
-
-    ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                  "client sent invalid frame");
-
-    return ngx_http_spdy_state_protocol_error(sc);
-}
-
-
-static u_char *
-ngx_http_spdy_state_syn_stream(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    ngx_uint_t                 sid, prio;
-    ngx_http_spdy_stream_t    *stream;
-    ngx_http_spdy_srv_conf_t  *sscf;
-
-    if (end - pos < NGX_SPDY_SYN_STREAM_SIZE) {
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_syn_stream);
-    }
-
-    if (sc->length <= NGX_SPDY_SYN_STREAM_SIZE) {
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "client sent SYN_STREAM frame with incorrect length %uz",
-                      sc->length);
-
-        return ngx_http_spdy_state_protocol_error(sc);
-    }
-
-    sc->length -= NGX_SPDY_SYN_STREAM_SIZE;
-
-    sid = ngx_spdy_frame_parse_sid(pos);
-    prio = pos[8] >> 5;
-
-    pos += NGX_SPDY_SYN_STREAM_SIZE;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy SYN_STREAM frame sid:%ui prio:%ui", sid, prio);
-
-    if (sid % 2 == 0 || sid <= sc->last_sid) {
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "client sent SYN_STREAM frame "
-                      "with invalid Stream-ID %ui", sid);
-
-        stream = ngx_http_spdy_get_stream_by_id(sc, sid);
-
-        if (stream) {
-            if (ngx_http_spdy_terminate_stream(sc, stream,
-                                               NGX_SPDY_PROTOCOL_ERROR)
-                != NGX_OK)
-            {
-                return ngx_http_spdy_state_internal_error(sc);
-            }
-        }
-
-        return ngx_http_spdy_state_protocol_error(sc);
-    }
-
-    sc->last_sid = sid;
-
-    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
-                                        ngx_http_spdy_module);
-
-    if (sc->processing >= sscf->concurrent_streams) {
-
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "concurrent streams exceeded %ui", sc->processing);
-
-        if (ngx_http_spdy_send_rst_stream(sc, sid, NGX_SPDY_REFUSED_STREAM,
-                                          prio)
-            != NGX_OK)
-        {
-            return ngx_http_spdy_state_internal_error(sc);
-        }
-
-        return ngx_http_spdy_state_headers_skip(sc, pos, end);
-    }
-
-    stream = ngx_http_spdy_create_stream(sc, sid, prio);
-    if (stream == NULL) {
-        return ngx_http_spdy_state_internal_error(sc);
-    }
-
-    stream->in_closed = (sc->flags & NGX_SPDY_FLAG_FIN) ? 1 : 0;
-
-    stream->request->request_length = NGX_SPDY_FRAME_HEADER_SIZE
-                                      + NGX_SPDY_SYN_STREAM_SIZE
-                                      + sc->length;
-
-    sc->stream = stream;
-
-    return ngx_http_spdy_state_headers(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    int                  z;
-    size_t               size;
-    ngx_buf_t           *buf;
-    ngx_int_t            rc;
-    ngx_http_request_t  *r;
-
-    size = end - pos;
-
-    if (size == 0) {
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_headers);
-    }
-
-    if (size > sc->length) {
-        size = sc->length;
-    }
-
-    r = sc->stream->request;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "process spdy header block %uz of %uz", size, sc->length);
-
-    buf = r->header_in;
-
-    sc->zstream_in.next_in = pos;
-    sc->zstream_in.avail_in = size;
-    sc->zstream_in.next_out = buf->last;
-
-    /* one byte is reserved for null-termination of the last header value */
-    sc->zstream_in.avail_out = buf->end - buf->last - 1;
-
-    z = inflate(&sc->zstream_in, Z_NO_FLUSH);
-
-    if (z == Z_NEED_DICT) {
-        z = inflateSetDictionary(&sc->zstream_in, ngx_http_spdy_dict,
-                                 sizeof(ngx_http_spdy_dict));
-
-        if (z != Z_OK) {
-            if (z == Z_DATA_ERROR) {
-                ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                              "client sent SYN_STREAM frame with header "
-                              "block encoded using wrong dictionary: %ul",
-                              (u_long) sc->zstream_in.adler);
-
-                return ngx_http_spdy_state_protocol_error(sc);
-            }
-
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "inflateSetDictionary() failed: %d", z);
-
-            return ngx_http_spdy_state_internal_error(sc);
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "spdy inflateSetDictionary(): %d", z);
-
-        z = sc->zstream_in.avail_in ? inflate(&sc->zstream_in, Z_NO_FLUSH)
-                                    : Z_OK;
-    }
-
-    ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "spdy inflate out: ni:%p no:%p ai:%ud ao:%ud rc:%d",
-                   sc->zstream_in.next_in, sc->zstream_in.next_out,
-                   sc->zstream_in.avail_in, sc->zstream_in.avail_out,
-                   z);
-
-    if (z != Z_OK) {
-        return ngx_http_spdy_state_inflate_error(sc, z);
-    }
-
-    sc->length -= sc->zstream_in.next_in - pos;
-    pos = sc->zstream_in.next_in;
-
-    buf->last = sc->zstream_in.next_out;
-
-    if (r->headers_in.headers.part.elts == NULL) {
-
-        if (buf->last - buf->pos < NGX_SPDY_NV_NUM_SIZE) {
-
-            if (sc->length == 0) {
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "premature end of spdy header block");
-
-                return ngx_http_spdy_state_headers_error(sc, pos, end);
-            }
-
-            return ngx_http_spdy_state_save(sc, pos, end,
-                                            ngx_http_spdy_state_headers);
-        }
-
-        sc->entries = ngx_spdy_frame_parse_uint32(buf->pos);
-
-        buf->pos += NGX_SPDY_NV_NUM_SIZE;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "spdy header block has %ui entries",
-                       sc->entries);
-
-        if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
-                          sizeof(ngx_table_elt_t))
-            != NGX_OK)
-        {
-            ngx_http_spdy_close_stream(sc->stream,
-                                       NGX_HTTP_INTERNAL_SERVER_ERROR);
-            return ngx_http_spdy_state_headers_skip(sc, pos, end);
-        }
-
-        if (ngx_array_init(&r->headers_in.cookies, r->pool, 2,
-                           sizeof(ngx_table_elt_t *))
-            != NGX_OK)
-        {
-            ngx_http_spdy_close_stream(sc->stream,
-                                       NGX_HTTP_INTERNAL_SERVER_ERROR);
-            return ngx_http_spdy_state_headers_skip(sc, pos, end);
-        }
-    }
-
-    while (sc->entries) {
-
-        rc = ngx_http_spdy_parse_header(r);
-
-        switch (rc) {
-
-        case NGX_DONE:
-            sc->entries--;
-
-        case NGX_OK:
-            break;
-
-        case NGX_AGAIN:
-
-            if (sc->zstream_in.avail_in) {
-
-                rc = ngx_http_spdy_alloc_large_header_buffer(r);
-
-                if (rc == NGX_DECLINED) {
-                    ngx_http_finalize_request(r,
-                                            NGX_HTTP_REQUEST_HEADER_TOO_LARGE);
-                    return ngx_http_spdy_state_headers_skip(sc, pos, end);
-                }
-
-                if (rc != NGX_OK) {
-                    ngx_http_spdy_close_stream(sc->stream,
-                                               NGX_HTTP_INTERNAL_SERVER_ERROR);
-                    return ngx_http_spdy_state_headers_skip(sc, pos, end);
-                }
-
-                /* null-terminate the last processed header name or value */
-                *buf->pos = '\0';
-
-                buf = r->header_in;
-
-                sc->zstream_in.next_out = buf->last;
-
-                /* one byte is reserved for null-termination */
-                sc->zstream_in.avail_out = buf->end - buf->last - 1;
-
-                z = inflate(&sc->zstream_in, Z_NO_FLUSH);
-
-                ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "spdy inflate out: ni:%p no:%p ai:%ud ao:%ud rc:%d",
-                           sc->zstream_in.next_in, sc->zstream_in.next_out,
-                           sc->zstream_in.avail_in, sc->zstream_in.avail_out,
-                           z);
-
-                if (z != Z_OK) {
-                    return ngx_http_spdy_state_inflate_error(sc, z);
-                }
-
-                sc->length -= sc->zstream_in.next_in - pos;
-                pos = sc->zstream_in.next_in;
-
-                buf->last = sc->zstream_in.next_out;
-
-                continue;
-            }
-
-            if (sc->length == 0) {
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "premature end of spdy header block");
-
-                return ngx_http_spdy_state_headers_error(sc, pos, end);
-            }
-
-            return ngx_http_spdy_state_save(sc, pos, end,
-                                            ngx_http_spdy_state_headers);
-
-        case NGX_HTTP_PARSE_INVALID_HEADER:
-            ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-            return ngx_http_spdy_state_headers_skip(sc, pos, end);
-
-        default: /* NGX_ERROR */
-            return ngx_http_spdy_state_headers_error(sc, pos, end);
-        }
-
-        /* a header line has been parsed successfully */
-
-        rc = ngx_http_spdy_handle_request_header(r);
-
-        if (rc != NGX_OK) {
-            if (rc == NGX_HTTP_PARSE_INVALID_HEADER) {
-                ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-                return ngx_http_spdy_state_headers_skip(sc, pos, end);
-            }
-
-            if (rc != NGX_ABORT) {
-                ngx_http_spdy_close_stream(sc->stream,
-                                           NGX_HTTP_INTERNAL_SERVER_ERROR);
-            }
-
-            return ngx_http_spdy_state_headers_skip(sc, pos, end);
-        }
-    }
-
-    if (buf->pos != buf->last || sc->zstream_in.avail_in) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "incorrect number of spdy header block entries");
-
-        return ngx_http_spdy_state_headers_error(sc, pos, end);
-    }
-
-    if (sc->length) {
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_headers);
-    }
-
-    /* null-terminate the last header value */
-    *buf->pos = '\0';
-
-    ngx_http_spdy_run_request(r);
-
-    return ngx_http_spdy_state_complete(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_headers_skip(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    int     n;
-    size_t  size;
-    u_char  buffer[NGX_SPDY_SKIP_HEADERS_BUFFER_SIZE];
-
-    if (sc->length == 0) {
-        return ngx_http_spdy_state_complete(sc, pos, end);
-    }
-
-    size = end - pos;
-
-    if (size == 0) {
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_headers_skip);
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy header block skip %uz of %uz", size, sc->length);
-
-    sc->zstream_in.next_in = pos;
-    sc->zstream_in.avail_in = (size < sc->length) ? size : sc->length;
-
-    while (sc->zstream_in.avail_in) {
-        sc->zstream_in.next_out = buffer;
-        sc->zstream_in.avail_out = NGX_SPDY_SKIP_HEADERS_BUFFER_SIZE;
-
-        n = inflate(&sc->zstream_in, Z_NO_FLUSH);
-
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                       "spdy inflate out: ni:%p no:%p ai:%ud ao:%ud rc:%d",
-                       sc->zstream_in.next_in, sc->zstream_in.next_out,
-                       sc->zstream_in.avail_in, sc->zstream_in.avail_out,
-                       n);
-
-        if (n != Z_OK) {
-            return ngx_http_spdy_state_inflate_error(sc, n);
-        }
-    }
-
-    pos = sc->zstream_in.next_in;
-
-    if (size < sc->length) {
-        sc->length -= size;
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_headers_skip);
-    }
-
-    return ngx_http_spdy_state_complete(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_headers_error(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    ngx_http_spdy_stream_t  *stream;
-
-    stream = sc->stream;
-
-    ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                  "client sent SYN_STREAM frame for stream %ui "
-                  "with invalid header block", stream->id);
-
-    if (ngx_http_spdy_send_rst_stream(sc, stream->id, NGX_SPDY_PROTOCOL_ERROR,
-                                      stream->priority)
-        != NGX_OK)
-    {
-        return ngx_http_spdy_state_internal_error(sc);
-    }
-
-    stream->out_closed = 1;
-
-    ngx_http_spdy_close_stream(stream, NGX_HTTP_BAD_REQUEST);
-
-    return ngx_http_spdy_state_headers_skip(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_window_update(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    size_t                   delta;
-    ngx_uint_t               sid;
-    ngx_event_t             *wev;
-    ngx_queue_t             *q;
-    ngx_http_spdy_stream_t  *stream;
-
-    if (end - pos < NGX_SPDY_WINDOW_UPDATE_SIZE) {
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_window_update);
-    }
-
-    if (sc->length != NGX_SPDY_WINDOW_UPDATE_SIZE) {
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "client sent WINDOW_UPDATE frame "
-                      "with incorrect length %uz", sc->length);
-
-        return ngx_http_spdy_state_protocol_error(sc);
-    }
-
-    sid = ngx_spdy_frame_parse_sid(pos);
-
-    pos += NGX_SPDY_SID_SIZE;
-
-    delta = ngx_spdy_frame_parse_delta(pos);
-
-    pos += NGX_SPDY_DELTA_SIZE;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy WINDOW_UPDATE sid:%ui delta:%uz", sid, delta);
-
-    if (sid) {
-        stream = ngx_http_spdy_get_stream_by_id(sc, sid);
-
-        if (stream == NULL) {
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                           "unknown spdy stream");
-
-            return ngx_http_spdy_state_complete(sc, pos, end);
-        }
-
-        if (stream->send_window > (ssize_t) (NGX_SPDY_MAX_WINDOW - delta)) {
-
-            ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                          "client violated flow control for stream %ui: "
-                          "received WINDOW_UPDATE frame with delta %uz "
-                          "not allowed for window %z",
-                          sid, delta, stream->send_window);
-
-            if (ngx_http_spdy_terminate_stream(sc, stream,
-                                               NGX_SPDY_FLOW_CONTROL_ERROR)
-                == NGX_ERROR)
-            {
-                return ngx_http_spdy_state_internal_error(sc);
-            }
-
-            return ngx_http_spdy_state_complete(sc, pos, end);
-        }
-
-        stream->send_window += delta;
-
-        if (stream->exhausted) {
-            stream->exhausted = 0;
-
-            wev = stream->request->connection->write;
-
-            if (!wev->timer_set) {
-                wev->delayed = 0;
-                wev->handler(wev);
-            }
-        }
-
-    } else {
-        sc->send_window += delta;
-
-        if (sc->send_window > NGX_SPDY_MAX_WINDOW) {
-            ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                          "client violated connection flow control: "
-                          "received WINDOW_UPDATE frame with delta %uz "
-                          "not allowed for window %uz",
-                          delta, sc->send_window);
-
-            return ngx_http_spdy_state_protocol_error(sc);
-        }
-
-        while (!ngx_queue_empty(&sc->waiting)) {
-            q = ngx_queue_head(&sc->waiting);
-
-            ngx_queue_remove(q);
-
-            stream = ngx_queue_data(q, ngx_http_spdy_stream_t, queue);
-
-            stream->handled = 0;
-
-            wev = stream->request->connection->write;
-
-            if (!wev->timer_set) {
-                wev->delayed = 0;
-                wev->handler(wev);
-
-                if (sc->send_window == 0) {
-                    break;
-                }
-            }
-        }
-    }
-
-    return ngx_http_spdy_state_complete(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_data(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    ngx_http_spdy_stream_t  *stream;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy DATA frame");
-
-    if (sc->length > sc->recv_window) {
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "client violated connection flow control: "
-                      "received DATA frame length %uz, available window %uz",
-                      sc->length, sc->recv_window);
-
-        return ngx_http_spdy_state_protocol_error(sc);
-    }
-
-    sc->recv_window -= sc->length;
-
-    if (sc->recv_window < NGX_SPDY_MAX_WINDOW / 4) {
-
-        if (ngx_http_spdy_send_window_update(sc, 0,
-                                             NGX_SPDY_MAX_WINDOW
-                                             - sc->recv_window)
-            == NGX_ERROR)
-        {
-            return ngx_http_spdy_state_internal_error(sc);
-        }
-
-        sc->recv_window = NGX_SPDY_MAX_WINDOW;
-    }
-
-    stream = sc->stream;
-
-    if (stream == NULL) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                       "unknown spdy stream");
-
-        return ngx_http_spdy_state_skip(sc, pos, end);
-    }
-
-    if (sc->length > stream->recv_window) {
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "client violated flow control for stream %ui: "
-                      "received DATA frame length %uz, available window %uz",
-                      stream->id, sc->length, stream->recv_window);
-
-        if (ngx_http_spdy_terminate_stream(sc, stream,
-                                           NGX_SPDY_FLOW_CONTROL_ERROR)
-            == NGX_ERROR)
-        {
-            return ngx_http_spdy_state_internal_error(sc);
-        }
-
-        return ngx_http_spdy_state_skip(sc, pos, end);
-    }
-
-    stream->recv_window -= sc->length;
-
-    if (stream->recv_window < NGX_SPDY_STREAM_WINDOW / 4) {
-
-        if (ngx_http_spdy_send_window_update(sc, stream->id,
-                                             NGX_SPDY_STREAM_WINDOW
-                                             - stream->recv_window)
-            == NGX_ERROR)
-        {
-            return ngx_http_spdy_state_internal_error(sc);
-        }
-
-        stream->recv_window = NGX_SPDY_STREAM_WINDOW;
-    }
-
-    if (stream->in_closed) {
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "client sent DATA frame for half-closed stream %ui",
-                      stream->id);
-
-        if (ngx_http_spdy_terminate_stream(sc, stream,
-                                           NGX_SPDY_STREAM_ALREADY_CLOSED)
-            == NGX_ERROR)
-        {
-            return ngx_http_spdy_state_internal_error(sc);
-        }
-
-        return ngx_http_spdy_state_skip(sc, pos, end);
-    }
-
-    return ngx_http_spdy_state_read_data(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_read_data(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    size_t                     size;
-    ssize_t                    n;
-    ngx_buf_t                 *buf;
-    ngx_int_t                  rc;
-    ngx_temp_file_t           *tf;
-    ngx_http_request_t        *r;
-    ngx_http_spdy_stream_t    *stream;
-    ngx_http_request_body_t   *rb;
-    ngx_http_core_loc_conf_t  *clcf;
-
-    stream = sc->stream;
-
-    if (stream == NULL) {
-        return ngx_http_spdy_state_skip(sc, pos, end);
-    }
-
-    if (stream->skip_data) {
-
-        if (sc->flags & NGX_SPDY_FLAG_FIN) {
-            stream->in_closed = 1;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                       "skipping spdy DATA frame, reason: %d",
-                       stream->skip_data);
-
-        return ngx_http_spdy_state_skip(sc, pos, end);
-    }
-
-    size = end - pos;
-
-    if (size > sc->length) {
-        size = sc->length;
-    }
-
-    r = stream->request;
-
-    if (r->request_body == NULL
-        && ngx_http_spdy_init_request_body(r) != NGX_OK)
-    {
-        stream->skip_data = NGX_SPDY_DATA_INTERNAL_ERROR;
-        return ngx_http_spdy_state_skip(sc, pos, end);
-    }
-
-    rb = r->request_body;
-    tf = rb->temp_file;
-    buf = rb->buf;
-
-    if (size) {
-        rb->rest += size;
-
-        if (r->headers_in.content_length_n != -1
-            && r->headers_in.content_length_n < rb->rest)
-        {
-            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                          "client intended to send body data "
-                          "larger than declared");
-
-            stream->skip_data = NGX_SPDY_DATA_ERROR;
-            goto error;
-
-        } else {
-            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-            if (clcf->client_max_body_size
-                && clcf->client_max_body_size < rb->rest)
-            {
-                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                              "client intended to send "
-                              "too large chunked body: %O bytes", rb->rest);
-
-                stream->skip_data = NGX_SPDY_DATA_ERROR;
-                goto error;
-            }
-        }
-
-        sc->length -= size;
-
-        if (tf) {
-            buf->start = pos;
-            buf->pos = pos;
-
-            pos += size;
-
-            buf->end = pos;
-            buf->last = pos;
-
-            n = ngx_write_chain_to_temp_file(tf, rb->bufs);
-
-            /* TODO: n == 0 or not complete and level event */
-
-            if (n == NGX_ERROR) {
-                stream->skip_data = NGX_SPDY_DATA_INTERNAL_ERROR;
-                goto error;
-            }
-
-            tf->offset += n;
-
-        } else {
-            buf->last = ngx_cpymem(buf->last, pos, size);
-            pos += size;
-        }
-
-        r->request_length += size;
-    }
-
-    if (sc->length) {
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_read_data);
-    }
-
-    if (sc->flags & NGX_SPDY_FLAG_FIN) {
-
-        stream->in_closed = 1;
-
-        if (r->headers_in.content_length_n < 0) {
-            r->headers_in.content_length_n = rb->rest;
-
-        } else if (r->headers_in.content_length_n != rb->rest) {
-            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                          "client prematurely closed stream: "
-                          "only %O out of %O bytes of request body received",
-                          rb->rest, r->headers_in.content_length_n);
-
-            stream->skip_data = NGX_SPDY_DATA_ERROR;
-            goto error;
-        }
-
-        if (tf) {
-            ngx_memzero(buf, sizeof(ngx_buf_t));
-
-            buf->in_file = 1;
-            buf->file_last = tf->file.offset;
-            buf->file = &tf->file;
-
-            rb->buf = NULL;
-        }
-
-        if (rb->post_handler) {
-            r->read_event_handler = ngx_http_block_reading;
-            rb->post_handler(r);
-        }
-    }
-
-    return ngx_http_spdy_state_complete(sc, pos, end);
-
-error:
-
-    if (rb->post_handler) {
-
-        if (stream->skip_data == NGX_SPDY_DATA_ERROR) {
-            rc = (r->headers_in.content_length_n == -1)
-                 ? NGX_HTTP_REQUEST_ENTITY_TOO_LARGE
-                 : NGX_HTTP_BAD_REQUEST;
-
-        } else {
-            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        ngx_http_finalize_request(r, rc);
-    }
-
-    return ngx_http_spdy_state_skip(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_rst_stream(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    ngx_uint_t               sid, status;
-    ngx_event_t             *ev;
-    ngx_connection_t        *fc;
-    ngx_http_spdy_stream_t  *stream;
-
-    if (end - pos < NGX_SPDY_RST_STREAM_SIZE) {
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_rst_stream);
-    }
-
-    if (sc->length != NGX_SPDY_RST_STREAM_SIZE) {
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "client sent RST_STREAM frame with incorrect length %uz",
-                      sc->length);
-
-        return ngx_http_spdy_state_protocol_error(sc);
-    }
-
-    sid = ngx_spdy_frame_parse_sid(pos);
-
-    pos += NGX_SPDY_SID_SIZE;
-
-    status = ngx_spdy_frame_parse_uint32(pos);
-
-    pos += sizeof(uint32_t);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy RST_STREAM sid:%ui st:%ui", sid, status);
-
-    stream = ngx_http_spdy_get_stream_by_id(sc, sid);
-
-    if (stream == NULL) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                       "unknown spdy stream");
-
-        return ngx_http_spdy_state_complete(sc, pos, end);
-    }
-
-    stream->in_closed = 1;
-    stream->out_closed = 1;
-
-    fc = stream->request->connection;
-    fc->error = 1;
-
-    switch (status) {
-
-    case NGX_SPDY_CANCEL:
-        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
-                      "client canceled stream %ui", sid);
-        break;
-
-    case NGX_SPDY_INTERNAL_ERROR:
-        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
-                      "client terminated stream %ui due to internal error",
-                      sid);
-        break;
-
-    default:
-        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
-                      "client terminated stream %ui with status %ui",
-                      sid, status);
-        break;
-    }
-
-    ev = fc->read;
-    ev->handler(ev);
-
-    return ngx_http_spdy_state_complete(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_ping(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    u_char                     *p;
-    ngx_buf_t                  *buf;
-    ngx_http_spdy_out_frame_t  *frame;
-
-    if (end - pos < NGX_SPDY_PING_SIZE) {
-        return ngx_http_spdy_state_save(sc, pos, end,
-                                        ngx_http_spdy_state_ping);
-    }
-
-    if (sc->length != NGX_SPDY_PING_SIZE) {
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "client sent PING frame with incorrect length %uz",
-                      sc->length);
-
-        return ngx_http_spdy_state_protocol_error(sc);
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy PING frame");
-
-    frame = ngx_http_spdy_get_ctl_frame(sc, NGX_SPDY_PING_SIZE,
-                                        NGX_SPDY_HIGHEST_PRIORITY);
-    if (frame == NULL) {
-        return ngx_http_spdy_state_internal_error(sc);
-    }
-
-    buf = frame->first->buf;
-
-    p = buf->pos;
-
-    p = ngx_spdy_frame_write_head(p, NGX_SPDY_PING);
-    p = ngx_spdy_frame_write_flags_and_len(p, 0, NGX_SPDY_PING_SIZE);
-
-    p = ngx_cpymem(p, pos, NGX_SPDY_PING_SIZE);
-
-    buf->last = p;
-
-    ngx_http_spdy_queue_frame(sc, frame);
-
-    pos += NGX_SPDY_PING_SIZE;
-
-    return ngx_http_spdy_state_complete(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_skip(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    size_t  size;
-
-    size = end - pos;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy frame skip %uz of %uz", size, sc->length);
-
-    if (size < sc->length) {
-        sc->length -= size;
-        return ngx_http_spdy_state_save(sc, end, end,
-                                        ngx_http_spdy_state_skip);
-    }
-
-    return ngx_http_spdy_state_complete(sc, pos + sc->length, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_settings(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    ngx_uint_t  fid, val;
-
-    if (sc->entries == 0) {
-
-        if (end - pos < NGX_SPDY_SETTINGS_NUM_SIZE) {
-            return ngx_http_spdy_state_save(sc, pos, end,
-                                            ngx_http_spdy_state_settings);
-        }
-
-        sc->entries = ngx_spdy_frame_parse_uint32(pos);
-
-        pos += NGX_SPDY_SETTINGS_NUM_SIZE;
-        sc->length -= NGX_SPDY_SETTINGS_NUM_SIZE;
-
-        if (sc->length < sc->entries * NGX_SPDY_SETTINGS_PAIR_SIZE) {
-            ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                          "client sent SETTINGS frame with incorrect "
-                          "length %uz or number of entries %ui",
-                          sc->length, sc->entries);
-
-            return ngx_http_spdy_state_protocol_error(sc);
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                       "spdy SETTINGS frame has %ui entries", sc->entries);
-    }
-
-    while (sc->entries) {
-        if (end - pos < NGX_SPDY_SETTINGS_PAIR_SIZE) {
-            return ngx_http_spdy_state_save(sc, pos, end,
-                                            ngx_http_spdy_state_settings);
-        }
-
-        sc->entries--;
-        sc->length -= NGX_SPDY_SETTINGS_PAIR_SIZE;
-
-        fid = ngx_spdy_frame_parse_uint32(pos);
-
-        pos += NGX_SPDY_SETTINGS_FID_SIZE;
-
-        val = ngx_spdy_frame_parse_uint32(pos);
-
-        pos += NGX_SPDY_SETTINGS_VAL_SIZE;
-
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                       "spdy SETTINGS entry fl:%ui id:%ui val:%ui",
-                       ngx_spdy_frame_flags(fid), ngx_spdy_frame_id(fid), val);
-
-        if (ngx_spdy_frame_flags(fid) == NGX_SPDY_SETTINGS_FLAG_PERSISTED) {
-            continue;
-        }
-
-        switch (ngx_spdy_frame_id(fid)) {
-
-        case NGX_SPDY_SETTINGS_INIT_WINDOW:
-
-            if (val > NGX_SPDY_MAX_WINDOW) {
-                ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                              "client sent SETTINGS frame with "
-                              "incorrect INIT_WINDOW value: %ui", val);
-
-                return ngx_http_spdy_state_protocol_error(sc);
-            }
-
-            if (ngx_http_spdy_adjust_windows(sc, val - sc->init_window)
-                != NGX_OK)
-            {
-                return ngx_http_spdy_state_internal_error(sc);
-            }
-
-            sc->init_window = val;
-
-            continue;
-        }
-    }
-
-    return ngx_http_spdy_state_complete(sc, pos, end);
-}
-
-
-static u_char *
-ngx_http_spdy_state_complete(ngx_http_spdy_connection_t *sc, u_char *pos,
-    u_char *end)
-{
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy frame complete pos:%p end:%p", pos, end);
-
-    if (pos > end) {
-        ngx_log_error(NGX_LOG_ALERT, sc->connection->log, 0,
-                      "receive buffer overrun");
-
-        ngx_debug_point();
-        return ngx_http_spdy_state_internal_error(sc);
-    }
-
-    sc->handler = ngx_http_spdy_state_head;
-    sc->stream = NULL;
-
-    return pos;
-}
-
-
-static u_char *
-ngx_http_spdy_state_save(ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end, ngx_http_spdy_handler_pt handler)
-{
-    size_t  size;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy frame state save pos:%p end:%p handler:%p",
-                   pos, end, handler);
-
-    size = end - pos;
-
-    if (size > NGX_SPDY_STATE_BUFFER_SIZE) {
-        ngx_log_error(NGX_LOG_ALERT, sc->connection->log, 0,
-                      "state buffer overflow: %uz bytes required", size);
-
-        ngx_debug_point();
-        return ngx_http_spdy_state_internal_error(sc);
-    }
-
-    ngx_memcpy(sc->buffer, pos, NGX_SPDY_STATE_BUFFER_SIZE);
-
-    sc->buffer_used = size;
-    sc->handler = handler;
-    sc->incomplete = 1;
-
-    return end;
-}
-
-
-static u_char *
-ngx_http_spdy_state_inflate_error(ngx_http_spdy_connection_t *sc, int rc)
-{
-    if (rc == Z_DATA_ERROR || rc == Z_STREAM_END) {
-        ngx_log_error(NGX_LOG_INFO, sc->connection->log, 0,
-                      "client sent SYN_STREAM frame with "
-                      "corrupted header block, inflate() failed: %d", rc);
-
-        return ngx_http_spdy_state_protocol_error(sc);
-    }
-
-    ngx_log_error(NGX_LOG_ERR, sc->connection->log, 0,
-                  "inflate() failed: %d", rc);
-
-    return ngx_http_spdy_state_internal_error(sc);
-}
-
-
-static u_char *
-ngx_http_spdy_state_protocol_error(ngx_http_spdy_connection_t *sc)
-{
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy state protocol error");
-
-    if (sc->stream) {
-        sc->stream->out_closed = 1;
-        ngx_http_spdy_close_stream(sc->stream, NGX_HTTP_BAD_REQUEST);
-    }
-
-    ngx_http_spdy_finalize_connection(sc, NGX_HTTP_CLIENT_CLOSED_REQUEST);
-
-    return NULL;
-}
-
-
-static u_char *
-ngx_http_spdy_state_internal_error(ngx_http_spdy_connection_t *sc)
-{
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy state internal error");
-
-    if (sc->stream) {
-        sc->stream->out_closed = 1;
-        ngx_http_spdy_close_stream(sc->stream, NGX_HTTP_INTERNAL_SERVER_ERROR);
-    }
-
-    ngx_http_spdy_finalize_connection(sc, NGX_HTTP_INTERNAL_SERVER_ERROR);
-
-    return NULL;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_send_window_update(ngx_http_spdy_connection_t *sc, ngx_uint_t sid,
-    ngx_uint_t delta)
-{
-    u_char                     *p;
-    ngx_buf_t                  *buf;
-    ngx_http_spdy_out_frame_t  *frame;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy send WINDOW_UPDATE sid:%ui delta:%ui", sid, delta);
-
-    frame = ngx_http_spdy_get_ctl_frame(sc, NGX_SPDY_WINDOW_UPDATE_SIZE,
-                                        NGX_SPDY_HIGHEST_PRIORITY);
-    if (frame == NULL) {
-        return NGX_ERROR;
-    }
-
-    buf = frame->first->buf;
-
-    p = buf->pos;
-
-    p = ngx_spdy_frame_write_head(p, NGX_SPDY_WINDOW_UPDATE);
-    p = ngx_spdy_frame_write_flags_and_len(p, 0, NGX_SPDY_WINDOW_UPDATE_SIZE);
-
-    p = ngx_spdy_frame_write_sid(p, sid);
-    p = ngx_spdy_frame_aligned_write_uint32(p, delta);
-
-    buf->last = p;
-
-    ngx_http_spdy_queue_frame(sc, frame);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_send_rst_stream(ngx_http_spdy_connection_t *sc, ngx_uint_t sid,
-    ngx_uint_t status, ngx_uint_t priority)
-{
-    u_char                     *p;
-    ngx_buf_t                  *buf;
-    ngx_http_spdy_out_frame_t  *frame;
-
-    if (sc->connection->error) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy send RST_STREAM sid:%ui st:%ui", sid, status);
-
-    frame = ngx_http_spdy_get_ctl_frame(sc, NGX_SPDY_RST_STREAM_SIZE,
-                                        priority);
-    if (frame == NULL) {
-        return NGX_ERROR;
-    }
-
-    buf = frame->first->buf;
-
-    p = buf->pos;
-
-    p = ngx_spdy_frame_write_head(p, NGX_SPDY_RST_STREAM);
-    p = ngx_spdy_frame_write_flags_and_len(p, 0, NGX_SPDY_RST_STREAM_SIZE);
-
-    p = ngx_spdy_frame_write_sid(p, sid);
-    p = ngx_spdy_frame_aligned_write_uint32(p, status);
-
-    buf->last = p;
-
-    ngx_http_spdy_queue_frame(sc, frame);
-
-    return NGX_OK;
-}
-
-
-#if 0
-static ngx_int_t
-ngx_http_spdy_send_goaway(ngx_http_spdy_connection_t *sc)
-{
-    u_char                     *p;
-    ngx_buf_t                  *buf;
-    ngx_http_spdy_out_frame_t  *frame;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy send GOAWAY sid:%ui", sc->last_sid);
-
-    frame = ngx_http_spdy_get_ctl_frame(sc, NGX_SPDY_GOAWAY_SIZE,
-                                        NGX_SPDY_HIGHEST_PRIORITY);
-    if (frame == NULL) {
-        return NGX_ERROR;
-    }
-
-    buf = frame->first->buf;
-
-    p = buf->pos;
-
-    p = ngx_spdy_frame_write_head(p, NGX_SPDY_GOAWAY);
-    p = ngx_spdy_frame_write_flags_and_len(p, 0, NGX_SPDY_GOAWAY_SIZE);
-
-    p = ngx_spdy_frame_write_sid(p, sc->last_sid);
-
-    buf->last = p;
-
-    ngx_http_spdy_queue_frame(sc, frame);
-
-    return NGX_OK;
-}
-#endif
-
-
-static ngx_int_t
-ngx_http_spdy_send_settings(ngx_http_spdy_connection_t *sc)
-{
-    u_char                     *p;
-    ngx_buf_t                  *buf;
-    ngx_chain_t                *cl;
-    ngx_http_spdy_srv_conf_t   *sscf;
-    ngx_http_spdy_out_frame_t  *frame;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy send SETTINGS frame");
-
-    frame = ngx_palloc(sc->pool, sizeof(ngx_http_spdy_out_frame_t));
-    if (frame == NULL) {
-        return NGX_ERROR;
-    }
-
-    cl = ngx_alloc_chain_link(sc->pool);
-    if (cl == NULL) {
-        return NGX_ERROR;
-    }
-
-    buf = ngx_create_temp_buf(sc->pool, NGX_SPDY_FRAME_HEADER_SIZE
-                                        + NGX_SPDY_SETTINGS_NUM_SIZE
-                                        + 2 * NGX_SPDY_SETTINGS_PAIR_SIZE);
-    if (buf == NULL) {
-        return NGX_ERROR;
-    }
-
-    buf->last_buf = 1;
-
-    cl->buf = buf;
-    cl->next = NULL;
-
-    frame->first = cl;
-    frame->last = cl;
-    frame->handler = ngx_http_spdy_settings_frame_handler;
-    frame->stream = NULL;
-#if (NGX_DEBUG)
-    frame->length = NGX_SPDY_SETTINGS_NUM_SIZE
-                    + 2 * NGX_SPDY_SETTINGS_PAIR_SIZE;
-#endif
-    frame->priority = NGX_SPDY_HIGHEST_PRIORITY;
-    frame->blocked = 0;
-
-    p = buf->pos;
-
-    p = ngx_spdy_frame_write_head(p, NGX_SPDY_SETTINGS);
-    p = ngx_spdy_frame_write_flags_and_len(p, NGX_SPDY_FLAG_CLEAR_SETTINGS,
-                                           NGX_SPDY_SETTINGS_NUM_SIZE
-                                           + 2 * NGX_SPDY_SETTINGS_PAIR_SIZE);
-
-    p = ngx_spdy_frame_aligned_write_uint32(p, 2);
-
-    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
-                                        ngx_http_spdy_module);
-
-    p = ngx_spdy_frame_write_flags_and_id(p, 0, NGX_SPDY_SETTINGS_MAX_STREAMS);
-    p = ngx_spdy_frame_aligned_write_uint32(p, sscf->concurrent_streams);
-
-    p = ngx_spdy_frame_write_flags_and_id(p, 0, NGX_SPDY_SETTINGS_INIT_WINDOW);
-    p = ngx_spdy_frame_aligned_write_uint32(p, NGX_SPDY_STREAM_WINDOW);
-
-    buf->last = p;
-
-    ngx_http_spdy_queue_frame(sc, frame);
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_spdy_settings_frame_handler(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_out_frame_t *frame)
-{
-    ngx_buf_t  *buf;
-
-    buf = frame->first->buf;
-
-    if (buf->pos != buf->last) {
-        return NGX_AGAIN;
-    }
-
-    ngx_free_chain(sc->pool, frame->first);
-
-    return NGX_OK;
-}
-
-
-static ngx_http_spdy_out_frame_t *
-ngx_http_spdy_get_ctl_frame(ngx_http_spdy_connection_t *sc, size_t length,
-    ngx_uint_t priority)
-{
-    ngx_chain_t                *cl;
-    ngx_http_spdy_out_frame_t  *frame;
-
-    frame = sc->free_ctl_frames;
-
-    if (frame) {
-        sc->free_ctl_frames = frame->next;
-
-        cl = frame->first;
-        cl->buf->pos = cl->buf->start;
-
-    } else {
-        frame = ngx_palloc(sc->pool, sizeof(ngx_http_spdy_out_frame_t));
-        if (frame == NULL) {
-            return NULL;
-        }
-
-        cl = ngx_alloc_chain_link(sc->pool);
-        if (cl == NULL) {
-            return NULL;
-        }
-
-        cl->buf = ngx_create_temp_buf(sc->pool,
-                                      NGX_SPDY_CTL_FRAME_BUFFER_SIZE);
-        if (cl->buf == NULL) {
-            return NULL;
-        }
-
-        cl->buf->last_buf = 1;
-
-        frame->first = cl;
-        frame->last = cl;
-        frame->handler = ngx_http_spdy_ctl_frame_handler;
-        frame->stream = NULL;
-    }
-
-#if (NGX_DEBUG)
-    if (length > NGX_SPDY_CTL_FRAME_BUFFER_SIZE - NGX_SPDY_FRAME_HEADER_SIZE) {
-        ngx_log_error(NGX_LOG_ALERT, sc->pool->log, 0,
-                      "requested control frame is too large: %uz", length);
-        return NULL;
-    }
-
-    frame->length = length;
-#endif
-
-    frame->priority = priority;
-    frame->blocked = 0;
-
-    return frame;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_ctl_frame_handler(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_out_frame_t *frame)
-{
-    ngx_buf_t  *buf;
-
-    buf = frame->first->buf;
-
-    if (buf->pos != buf->last) {
-        return NGX_AGAIN;
-    }
-
-    frame->next = sc->free_ctl_frames;
-    sc->free_ctl_frames = frame;
-
-    return NGX_OK;
-}
-
-
-static ngx_http_spdy_stream_t *
-ngx_http_spdy_create_stream(ngx_http_spdy_connection_t *sc, ngx_uint_t id,
-    ngx_uint_t priority)
-{
-    ngx_log_t                 *log;
-    ngx_uint_t                 index;
-    ngx_event_t               *rev, *wev;
-    ngx_connection_t          *fc;
-    ngx_http_log_ctx_t        *ctx;
-    ngx_http_request_t        *r;
-    ngx_http_spdy_stream_t    *stream;
-    ngx_http_core_srv_conf_t  *cscf;
-    ngx_http_spdy_srv_conf_t  *sscf;
-
-    fc = sc->free_fake_connections;
-
-    if (fc) {
-        sc->free_fake_connections = fc->data;
-
-        rev = fc->read;
-        wev = fc->write;
-        log = fc->log;
-        ctx = log->data;
-
-    } else {
-        fc = ngx_palloc(sc->pool, sizeof(ngx_connection_t));
-        if (fc == NULL) {
-            return NULL;
-        }
-
-        rev = ngx_palloc(sc->pool, sizeof(ngx_event_t));
-        if (rev == NULL) {
-            return NULL;
-        }
-
-        wev = ngx_palloc(sc->pool, sizeof(ngx_event_t));
-        if (wev == NULL) {
-            return NULL;
-        }
-
-        log = ngx_palloc(sc->pool, sizeof(ngx_log_t));
-        if (log == NULL) {
-            return NULL;
-        }
-
-        ctx = ngx_palloc(sc->pool, sizeof(ngx_http_log_ctx_t));
-        if (ctx == NULL) {
-            return NULL;
-        }
-
-        ctx->connection = fc;
-        ctx->request = NULL;
-    }
-
-    ngx_memcpy(log, sc->connection->log, sizeof(ngx_log_t));
-
-    log->data = ctx;
-
-    ngx_memzero(rev, sizeof(ngx_event_t));
-
-    rev->data = fc;
-    rev->ready = 1;
-    rev->handler = ngx_http_spdy_close_stream_handler;
-    rev->log = log;
-
-    ngx_memcpy(wev, rev, sizeof(ngx_event_t));
-
-    wev->write = 1;
-
-    ngx_memcpy(fc, sc->connection, sizeof(ngx_connection_t));
-
-    fc->data = sc->http_connection;
-    fc->read = rev;
-    fc->write = wev;
-    fc->sent = 0;
-    fc->log = log;
-    fc->buffered = 0;
-    fc->sndlowat = 1;
-    fc->tcp_nodelay = NGX_TCP_NODELAY_DISABLED;
-
-    r = ngx_http_create_request(fc);
-    if (r == NULL) {
-        return NULL;
-    }
-
-    r->valid_location = 1;
-
-    fc->data = r;
-    sc->connection->requests++;
-
-    cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
-
-    r->header_in = ngx_create_temp_buf(r->pool,
-                                       cscf->client_header_buffer_size);
-    if (r->header_in == NULL) {
-        ngx_http_free_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-        return NULL;
-    }
-
-    r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE;
-
-    stream = ngx_pcalloc(r->pool, sizeof(ngx_http_spdy_stream_t));
-    if (stream == NULL) {
-        ngx_http_free_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-        return NULL;
-    }
-
-    r->spdy_stream = stream;
-
-    stream->id = id;
-    stream->request = r;
-    stream->connection = sc;
-
-    stream->send_window = sc->init_window;
-    stream->recv_window = NGX_SPDY_STREAM_WINDOW;
-
-    stream->priority = priority;
-
-    sscf = ngx_http_get_module_srv_conf(r, ngx_http_spdy_module);
-
-    index = ngx_http_spdy_stream_index(sscf, id);
-
-    stream->index = sc->streams_index[index];
-    sc->streams_index[index] = stream;
-
-    sc->processing++;
-
-    return stream;
-}
-
-
-static ngx_http_spdy_stream_t *
-ngx_http_spdy_get_stream_by_id(ngx_http_spdy_connection_t *sc,
-    ngx_uint_t sid)
-{
-    ngx_http_spdy_stream_t    *stream;
-    ngx_http_spdy_srv_conf_t  *sscf;
-
-    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
-                                        ngx_http_spdy_module);
-
-    stream = sc->streams_index[ngx_http_spdy_stream_index(sscf, sid)];
-
-    while (stream) {
-        if (stream->id == sid) {
-            return stream;
-        }
-
-        stream = stream->index;
-    }
-
-    return NULL;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_parse_header(ngx_http_request_t *r)
-{
-    u_char                     *p, *end, ch;
-    ngx_uint_t                  hash;
-    ngx_http_core_srv_conf_t   *cscf;
-
-    enum {
-        sw_name_len = 0,
-        sw_name,
-        sw_value_len,
-        sw_value
-    } state;
-
-    state = r->state;
-
-    p = r->header_in->pos;
-    end = r->header_in->last;
-
-    switch (state) {
-
-    case sw_name_len:
-
-        if (end - p < NGX_SPDY_NV_NLEN_SIZE) {
-            return NGX_AGAIN;
-        }
-
-        r->lowcase_index = ngx_spdy_frame_parse_uint32(p);
-
-        if (r->lowcase_index == 0) {
-            return NGX_ERROR;
-        }
-
-        /* null-terminate the previous header value */
-        *p = '\0';
-
-        p += NGX_SPDY_NV_NLEN_SIZE;
-
-        r->invalid_header = 0;
-
-        state = sw_name;
-
-        /* fall through */
-
-    case sw_name:
-
-        if ((ngx_uint_t) (end - p) < r->lowcase_index) {
-            break;
-        }
-
-        cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
-
-        r->header_name_start = p;
-        r->header_name_end = p + r->lowcase_index;
-
-        if (p[0] == ':') {
-            p++;
-        }
-
-        hash = 0;
-
-        for ( /* void */ ; p != r->header_name_end; p++) {
-
-            ch = *p;
-
-            hash = ngx_hash(hash, ch);
-
-            if ((ch >= 'a' && ch <= 'z')
-                || (ch == '-')
-                || (ch >= '0' && ch <= '9')
-                || (ch == '_' && cscf->underscores_in_headers))
-            {
-                continue;
-            }
-
-            switch (ch) {
-            case '\0':
-            case LF:
-            case CR:
-            case ':':
-                ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                              "client sent invalid header name: \"%*s\"",
-                              r->lowcase_index, r->header_name_start);
-
-                return NGX_HTTP_PARSE_INVALID_HEADER;
-            }
-
-            if (ch >= 'A' && ch <= 'Z') {
-                return NGX_ERROR;
-            }
-
-            r->invalid_header = 1;
-        }
-
-        r->header_hash = hash;
-
-        state = sw_value_len;
-
-        /* fall through */
-
-    case sw_value_len:
-
-        if (end - p < NGX_SPDY_NV_VLEN_SIZE) {
-            break;
-        }
-
-        r->lowcase_index = ngx_spdy_frame_parse_uint32(p);
-
-        /* null-terminate header name */
-        *p = '\0';
-
-        p += NGX_SPDY_NV_VLEN_SIZE;
-
-        state = sw_value;
-
-        /* fall through */
-
-    case sw_value:
-
-        if ((ngx_uint_t) (end - p) < r->lowcase_index) {
-            break;
-        }
-
-        r->header_start = p;
-
-        while (r->lowcase_index--) {
-            ch = *p;
-
-            if (ch == '\0') {
-
-                if (p == r->header_start) {
-                    return NGX_ERROR;
-                }
-
-                r->header_end = p;
-                r->header_in->pos = p + 1;
-
-                r->state = sw_value;
-
-                return NGX_OK;
-            }
-
-            if (ch == CR || ch == LF) {
-                ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                              "client sent header \"%*s\" with "
-                              "invalid value: \"%*s\\%c...\"",
-                              r->header_name_end - r->header_name_start,
-                              r->header_name_start,
-                              p - r->header_start,
-                              r->header_start,
-                              ch == CR ? 'r' : 'n');
-
-                return NGX_HTTP_PARSE_INVALID_HEADER;
-            }
-
-            p++;
-        }
-
-        r->header_end = p;
-        r->header_in->pos = p;
-
-        r->state = 0;
-
-        return NGX_DONE;
-    }
-
-    r->header_in->pos = p;
-    r->state = state;
-
-    return NGX_AGAIN;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_alloc_large_header_buffer(ngx_http_request_t *r)
-{
-    u_char                    *old, *new, *p;
-    size_t                     rest;
-    ngx_buf_t                 *buf;
-    ngx_http_spdy_stream_t    *stream;
-    ngx_http_core_srv_conf_t  *cscf;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "spdy alloc large header buffer");
-
-    stream = r->spdy_stream;
-
-    cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
-
-    if (stream->header_buffers
-        == (ngx_uint_t) cscf->large_client_header_buffers.num)
-    {
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent too large request");
-
-        return NGX_DECLINED;
-    }
-
-    rest = r->header_in->last - r->header_in->pos;
-
-    /*
-     * One more byte is needed for null-termination
-     * and another one for further progress.
-     */
-    if (rest > cscf->large_client_header_buffers.size - 2) {
-        p = r->header_in->pos;
-
-        if (rest > NGX_MAX_ERROR_STR - 300) {
-            rest = NGX_MAX_ERROR_STR - 300;
-        }
-
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent too long header name or value: \"%*s...\"",
-                      rest, p);
-
-        return NGX_DECLINED;
-    }
-
-    buf = ngx_create_temp_buf(r->pool, cscf->large_client_header_buffers.size);
-    if (buf == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "spdy large header alloc: %p %uz",
-                   buf->pos, buf->end - buf->last);
-
-    old = r->header_in->pos;
-    new = buf->pos;
-
-    if (rest) {
-        buf->last = ngx_cpymem(new, old, rest);
-    }
-
-    r->header_in = buf;
-
-    stream->header_buffers++;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_handle_request_header(ngx_http_request_t *r)
-{
-    ngx_uint_t                       i;
-    ngx_table_elt_t                 *h;
-    ngx_http_core_srv_conf_t        *cscf;
-    ngx_http_spdy_request_header_t  *sh;
-
-    if (r->invalid_header) {
-        cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
-
-        if (cscf->ignore_invalid_headers) {
-            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                          "client sent invalid header: \"%*s\"",
-                          r->header_end - r->header_name_start,
-                          r->header_name_start);
-            return NGX_OK;
-        }
-
-    }
-
-    if (r->header_name_start[0] == ':') {
-        r->header_name_start++;
-
-        for (i = 0; i < NGX_SPDY_REQUEST_HEADERS; i++) {
-            sh = &ngx_http_spdy_request_headers[i];
-
-            if (sh->hash != r->header_hash
-                || sh->len != r->header_name_end - r->header_name_start
-                || ngx_strncmp(sh->header, r->header_name_start, sh->len) != 0)
-            {
-                continue;
-            }
-
-            return sh->handler(r);
-        }
-
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent invalid header name: \":%*s\"",
-                      r->header_end - r->header_name_start,
-                      r->header_name_start);
-
-        return NGX_HTTP_PARSE_INVALID_HEADER;
-    }
-
-    h = ngx_list_push(&r->headers_in.headers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    h->hash = r->header_hash;
-
-    h->key.len = r->header_name_end - r->header_name_start;
-    h->key.data = r->header_name_start;
-
-    h->value.len = r->header_end - r->header_start;
-    h->value.data = r->header_start;
-
-    h->lowcase_key = h->key.data;
-
-    return NGX_OK;
-}
-
-
-void
-ngx_http_spdy_request_headers_init(void)
-{
-    ngx_uint_t                       i;
-    ngx_http_spdy_request_header_t  *h;
-
-    for (i = 0; i < NGX_SPDY_REQUEST_HEADERS; i++) {
-        h = &ngx_http_spdy_request_headers[i];
-        h->hash = ngx_hash_key(h->header, h->len);
-    }
-}
-
-
-static ngx_int_t
-ngx_http_spdy_parse_method(ngx_http_request_t *r)
-{
-    size_t         k, len;
-    ngx_uint_t     n;
-    const u_char  *p, *m;
-
-    /*
-     * This array takes less than 256 sequential bytes,
-     * and if typical CPU cache line size is 64 bytes,
-     * it is prefetched for 4 load operations.
-     */
-    static const struct {
-        u_char            len;
-        const u_char      method[11];
-        uint32_t          value;
-    } tests[] = {
-        { 3, "GET",       NGX_HTTP_GET },
-        { 4, "POST",      NGX_HTTP_POST },
-        { 4, "HEAD",      NGX_HTTP_HEAD },
-        { 7, "OPTIONS",   NGX_HTTP_OPTIONS },
-        { 8, "PROPFIND",  NGX_HTTP_PROPFIND },
-        { 3, "PUT",       NGX_HTTP_PUT },
-        { 5, "MKCOL",     NGX_HTTP_MKCOL },
-        { 6, "DELETE",    NGX_HTTP_DELETE },
-        { 4, "COPY",      NGX_HTTP_COPY },
-        { 4, "MOVE",      NGX_HTTP_MOVE },
-        { 9, "PROPPATCH", NGX_HTTP_PROPPATCH },
-        { 4, "LOCK",      NGX_HTTP_LOCK },
-        { 6, "UNLOCK",    NGX_HTTP_UNLOCK },
-        { 5, "PATCH",     NGX_HTTP_PATCH },
-        { 5, "TRACE",     NGX_HTTP_TRACE }
-    }, *test;
-
-    if (r->method_name.len) {
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent duplicate :method header");
-
-        return NGX_HTTP_PARSE_INVALID_HEADER;
-    }
-
-    len = r->header_end - r->header_start;
-
-    r->method_name.len = len;
-    r->method_name.data = r->header_start;
-
-    test = tests;
-    n = sizeof(tests) / sizeof(tests[0]);
-
-    do {
-        if (len == test->len) {
-            p = r->method_name.data;
-            m = test->method;
-            k = len;
-
-            do {
-                if (*p++ != *m++) {
-                    goto next;
-                }
-            } while (--k);
-
-            r->method = test->value;
-            return NGX_OK;
-        }
-
-    next:
-        test++;
-
-    } while (--n);
-
-    p = r->method_name.data;
-
-    do {
-        if ((*p < 'A' || *p > 'Z') && *p != '_') {
-            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                          "client sent invalid method: \"%V\"",
-                          &r->method_name);
-
-            return NGX_HTTP_PARSE_INVALID_HEADER;
-        }
-
-        p++;
-
-    } while (--len);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_parse_scheme(ngx_http_request_t *r)
-{
-    if (r->schema_start) {
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent duplicate :schema header");
-
-        return NGX_HTTP_PARSE_INVALID_HEADER;
-    }
-
-    r->schema_start = r->header_start;
-    r->schema_end = r->header_end;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_parse_host(ngx_http_request_t *r)
-{
-    ngx_table_elt_t  *h;
-
-    if (r->headers_in.host) {
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent duplicate :host header");
-
-        return NGX_HTTP_PARSE_INVALID_HEADER;
-    }
-
-    h = ngx_list_push(&r->headers_in.headers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    r->headers_in.host = h;
-
-    h->hash = r->header_hash;
-
-    h->key.len = r->header_name_end - r->header_name_start;
-    h->key.data = r->header_name_start;
-
-    h->value.len = r->header_end - r->header_start;
-    h->value.data = r->header_start;
-
-    h->lowcase_key = h->key.data;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_parse_path(ngx_http_request_t *r)
-{
-    if (r->unparsed_uri.len) {
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent duplicate :path header");
-
-        return NGX_HTTP_PARSE_INVALID_HEADER;
-    }
-
-    r->uri_start = r->header_start;
-    r->uri_end = r->header_end;
-
-    if (ngx_http_parse_uri(r) != NGX_OK) {
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent invalid URI: \"%*s\"",
-                      r->uri_end - r->uri_start, r->uri_start);
-
-        return NGX_HTTP_PARSE_INVALID_HEADER;
-    }
-
-    if (ngx_http_process_request_uri(r) != NGX_OK) {
-        /*
-         * request has been finalized already
-         * in ngx_http_process_request_uri()
-         */
-        return NGX_ABORT;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_parse_version(ngx_http_request_t *r)
-{
-    u_char  *p, ch;
-
-    if (r->http_protocol.len) {
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent duplicate :version header");
-
-        return NGX_HTTP_PARSE_INVALID_HEADER;
-    }
-
-    p = r->header_start;
-
-    if (r->header_end - p < 8 || !(ngx_str5cmp(p, 'H', 'T', 'T', 'P', '/'))) {
-        goto invalid;
-    }
-
-    ch = *(p + 5);
-
-    if (ch < '1' || ch > '9') {
-        goto invalid;
-    }
-
-    r->http_major = ch - '0';
-
-    for (p += 6; p != r->header_end - 2; p++) {
-
-        ch = *p;
-
-        if (ch == '.') {
-            break;
-        }
-
-        if (ch < '0' || ch > '9') {
-            goto invalid;
-        }
-
-        r->http_major = r->http_major * 10 + ch - '0';
-    }
-
-    if (*p != '.') {
-        goto invalid;
-    }
-
-    ch = *(p + 1);
-
-    if (ch < '0' || ch > '9') {
-        goto invalid;
-    }
-
-    r->http_minor = ch - '0';
-
-    for (p += 2; p != r->header_end; p++) {
-
-        ch = *p;
-
-        if (ch < '0' || ch > '9') {
-            goto invalid;
-        }
-
-        r->http_minor = r->http_minor * 10 + ch - '0';
-    }
-
-    r->http_protocol.len = r->header_end - r->header_start;
-    r->http_protocol.data = r->header_start;
-    r->http_version = r->http_major * 1000 + r->http_minor;
-
-    return NGX_OK;
-
-invalid:
-
-    ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                  "client sent invalid http version: \"%*s\"",
-                  r->header_end - r->header_start, r->header_start);
-
-    return NGX_HTTP_PARSE_INVALID_HEADER;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_construct_request_line(ngx_http_request_t *r)
-{
-    u_char  *p;
-
-    if (r->method_name.len == 0
-        || r->unparsed_uri.len == 0
-        || r->http_protocol.len == 0)
-    {
-        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-        return NGX_ERROR;
-    }
-
-    r->request_line.len = r->method_name.len + 1
-                          + r->unparsed_uri.len + 1
-                          + r->http_protocol.len;
-
-    p = ngx_pnalloc(r->pool, r->request_line.len + 1);
-    if (p == NULL) {
-        ngx_http_spdy_close_stream(r->spdy_stream,
-                                   NGX_HTTP_INTERNAL_SERVER_ERROR);
-        return NGX_ERROR;
-    }
-
-    r->request_line.data = p;
-
-    p = ngx_cpymem(p, r->method_name.data, r->method_name.len);
-
-    *p++ = ' ';
-
-    p = ngx_cpymem(p, r->unparsed_uri.data, r->unparsed_uri.len);
-
-    *p++ = ' ';
-
-    ngx_memcpy(p, r->http_protocol.data, r->http_protocol.len + 1);
-
-    /* some modules expect the space character after method name */
-    r->method_name.data = r->request_line.data;
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_spdy_run_request(ngx_http_request_t *r)
-{
-    ngx_uint_t                  i;
-    ngx_list_part_t            *part;
-    ngx_table_elt_t            *h;
-    ngx_http_header_t          *hh;
-    ngx_http_core_main_conf_t  *cmcf;
-
-    if (ngx_http_spdy_construct_request_line(r) != NGX_OK) {
-        return;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "spdy http request line: \"%V\"", &r->request_line);
-
-    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-    part = &r->headers_in.headers.part;
-    h = part->elts;
-
-    for (i = 0 ;; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            h = part->elts;
-            i = 0;
-        }
-
-        hh = ngx_hash_find(&cmcf->headers_in_hash, h[i].hash,
-                           h[i].lowcase_key, h[i].key.len);
-
-        if (hh && hh->handler(r, &h[i], hh->offset) != NGX_OK) {
-            return;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "spdy http header: \"%V: %V\"", &h[i].key, &h[i].value);
-    }
-
-    r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
-
-    if (ngx_http_process_request_header(r) != NGX_OK) {
-        return;
-    }
-
-    if (r->headers_in.content_length_n > 0 && r->spdy_stream->in_closed) {
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client prematurely closed stream");
-
-        r->spdy_stream->skip_data = NGX_SPDY_DATA_ERROR;
-
-        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-        return;
-    }
-
-    ngx_http_process_request(r);
-}
-
-
-static ngx_int_t
-ngx_http_spdy_init_request_body(ngx_http_request_t *r)
-{
-    ngx_buf_t                 *buf;
-    ngx_temp_file_t           *tf;
-    ngx_http_request_body_t   *rb;
-    ngx_http_core_loc_conf_t  *clcf;
-
-    rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
-    if (rb == NULL) {
-        return NGX_ERROR;
-    }
-
-    r->request_body = rb;
-
-    if (r->spdy_stream->in_closed) {
-        return NGX_OK;
-    }
-
-    rb->rest = r->headers_in.content_length_n;
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-    if (r->request_body_in_file_only
-        || rb->rest > (off_t) clcf->client_body_buffer_size
-        || rb->rest < 0)
-    {
-        tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
-        if (tf == NULL) {
-            return NGX_ERROR;
-        }
-
-        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 = r->request_body_in_persistent_file;
-        tf->clean = r->request_body_in_clean_file;
-
-        if (r->request_body_file_group_access) {
-            tf->access = 0660;
-        }
-
-        rb->temp_file = tf;
-
-        if (r->spdy_stream->in_closed
-            && ngx_create_temp_file(&tf->file, tf->path, tf->pool,
-                                    tf->persistent, tf->clean, tf->access)
-               != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        buf = ngx_calloc_buf(r->pool);
-        if (buf == NULL) {
-            return NGX_ERROR;
-        }
-
-    } else {
-
-        if (rb->rest == 0) {
-            return NGX_OK;
-        }
-
-        buf = ngx_create_temp_buf(r->pool, (size_t) rb->rest);
-        if (buf == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    rb->buf = buf;
-
-    rb->bufs = ngx_alloc_chain_link(r->pool);
-    if (rb->bufs == NULL) {
-        return NGX_ERROR;
-    }
-
-    rb->bufs->buf = buf;
-    rb->bufs->next = NULL;
-
-    rb->rest = 0;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_spdy_read_request_body(ngx_http_request_t *r,
-    ngx_http_client_body_handler_pt post_handler)
-{
-    ngx_http_spdy_stream_t  *stream;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "spdy read request body");
-
-    stream = r->spdy_stream;
-
-    switch (stream->skip_data) {
-
-    case NGX_SPDY_DATA_DISCARD:
-        post_handler(r);
-        return NGX_OK;
-
-    case NGX_SPDY_DATA_ERROR:
-        if (r->headers_in.content_length_n == -1) {
-            return NGX_HTTP_REQUEST_ENTITY_TOO_LARGE;
-        } else {
-            return NGX_HTTP_BAD_REQUEST;
-        }
-
-    case NGX_SPDY_DATA_INTERNAL_ERROR:
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    if (!r->request_body && ngx_http_spdy_init_request_body(r) != NGX_OK) {
-        stream->skip_data = NGX_SPDY_DATA_INTERNAL_ERROR;
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    if (stream->in_closed) {
-        post_handler(r);
-        return NGX_OK;
-    }
-
-    r->request_body->post_handler = post_handler;
-
-    r->read_event_handler = ngx_http_test_reading;
-    r->write_event_handler = ngx_http_request_empty_handler;
-
-    return NGX_AGAIN;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_terminate_stream(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_stream_t *stream, ngx_uint_t status)
-{
-    ngx_event_t       *rev;
-    ngx_connection_t  *fc;
-
-    if (ngx_http_spdy_send_rst_stream(sc, stream->id, status,
-                                      NGX_SPDY_HIGHEST_PRIORITY)
-        == NGX_ERROR)
-    {
-        return NGX_ERROR;
-    }
-
-    stream->out_closed = 1;
-
-    fc = stream->request->connection;
-    fc->error = 1;
-
-    rev = fc->read;
-    rev->handler(rev);
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_spdy_close_stream_handler(ngx_event_t *ev)
-{
-    ngx_connection_t    *fc;
-    ngx_http_request_t  *r;
-
-    fc = ev->data;
-    r = fc->data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "spdy close stream handler");
-
-    ngx_http_spdy_close_stream(r->spdy_stream, 0);
-}
-
-
-void
-ngx_http_spdy_close_stream(ngx_http_spdy_stream_t *stream, ngx_int_t rc)
-{
-    ngx_event_t                  *ev;
-    ngx_connection_t             *fc;
-    ngx_http_spdy_stream_t      **index, *s;
-    ngx_http_spdy_srv_conf_t     *sscf;
-    ngx_http_spdy_connection_t   *sc;
-
-    sc = stream->connection;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy close stream %ui, queued %ui, processing %ui",
-                   stream->id, stream->queued, sc->processing);
-
-    fc = stream->request->connection;
-
-    if (stream->queued) {
-        fc->write->handler = ngx_http_spdy_close_stream_handler;
-        return;
-    }
-
-    if (!stream->out_closed) {
-        if (ngx_http_spdy_send_rst_stream(sc, stream->id,
-                                          NGX_SPDY_INTERNAL_ERROR,
-                                          stream->priority)
-            != NGX_OK)
-        {
-            sc->connection->error = 1;
-        }
-    }
-
-    if (sc->stream == stream) {
-        sc->stream = NULL;
-    }
-
-    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
-                                        ngx_http_spdy_module);
-
-    index = sc->streams_index + ngx_http_spdy_stream_index(sscf, stream->id);
-
-    for ( ;; ) {
-        s = *index;
-
-        if (s == NULL) {
-            break;
-        }
-
-        if (s == stream) {
-            *index = s->index;
-            break;
-        }
-
-        index = &s->index;
-    }
-
-    ngx_http_free_request(stream->request, rc);
-
-    ev = fc->read;
-
-    if (ev->active || ev->disabled) {
-        ngx_log_error(NGX_LOG_ALERT, sc->connection->log, 0,
-                      "fake read event was activated");
-    }
-
-    if (ev->timer_set) {
-        ngx_del_timer(ev);
-    }
-
-    if (ev->posted) {
-        ngx_delete_posted_event(ev);
-    }
-
-    ev = fc->write;
-
-    if (ev->active || ev->disabled) {
-        ngx_log_error(NGX_LOG_ALERT, sc->connection->log, 0,
-                      "fake write event was activated");
-    }
-
-    if (ev->timer_set) {
-        ngx_del_timer(ev);
-    }
-
-    if (ev->posted) {
-        ngx_delete_posted_event(ev);
-    }
-
-    fc->data = sc->free_fake_connections;
-    sc->free_fake_connections = fc;
-
-    sc->processing--;
-
-    if (sc->processing || sc->blocked) {
-        return;
-    }
-
-    ev = sc->connection->read;
-
-    ev->handler = ngx_http_spdy_handle_connection_handler;
-    ngx_post_event(ev, &ngx_posted_events);
-}
-
-
-static void
-ngx_http_spdy_handle_connection_handler(ngx_event_t *rev)
-{
-    ngx_connection_t  *c;
-
-    rev->handler = ngx_http_spdy_read_handler;
-
-    if (rev->ready) {
-        ngx_http_spdy_read_handler(rev);
-        return;
-    }
-
-    c = rev->data;
-
-    ngx_http_spdy_handle_connection(c->data);
-}
-
-
-static void
-ngx_http_spdy_keepalive_handler(ngx_event_t *rev)
-{
-    ngx_connection_t            *c;
-    ngx_http_spdy_srv_conf_t    *sscf;
-    ngx_http_spdy_connection_t  *sc;
-
-    c = rev->data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "spdy keepalive handler");
-
-    if (rev->timedout || c->close) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-#if (NGX_HAVE_KQUEUE)
-
-    if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
-        if (rev->pending_eof) {
-            c->log->handler = NULL;
-            ngx_log_error(NGX_LOG_INFO, c->log, rev->kq_errno,
-                          "kevent() reported that client %V closed "
-                          "keepalive connection", &c->addr_text);
-#if (NGX_HTTP_SSL)
-            if (c->ssl) {
-                c->ssl->no_send_shutdown = 1;
-            }
-#endif
-            ngx_http_close_connection(c);
-            return;
-        }
-    }
-
-#endif
-
-    c->destroyed = 0;
-    c->idle = 0;
-    ngx_reusable_connection(c, 0);
-
-    sc = c->data;
-
-    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
-                                        ngx_http_spdy_module);
-
-    sc->pool = ngx_create_pool(sscf->pool_size, sc->connection->log);
-    if (sc->pool == NULL) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    sc->streams_index = ngx_pcalloc(sc->pool,
-                                    ngx_http_spdy_streams_index_size(sscf)
-                                    * sizeof(ngx_http_spdy_stream_t *));
-    if (sc->streams_index == NULL) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    c->write->handler = ngx_http_spdy_write_handler;
-
-    rev->handler = ngx_http_spdy_read_handler;
-    ngx_http_spdy_read_handler(rev);
-}
-
-
-static void
-ngx_http_spdy_finalize_connection(ngx_http_spdy_connection_t *sc,
-    ngx_int_t rc)
-{
-    ngx_uint_t                 i, size;
-    ngx_event_t               *ev;
-    ngx_connection_t          *c, *fc;
-    ngx_http_request_t        *r;
-    ngx_http_spdy_stream_t    *stream;
-    ngx_http_spdy_srv_conf_t  *sscf;
-
-    c = sc->connection;
-
-    if (!sc->processing) {
-        ngx_http_close_connection(c);
-        return;
-    }
-
-    c->error = 1;
-    c->read->handler = ngx_http_empty_handler;
-    c->write->handler = ngx_http_empty_handler;
-
-    sc->last_out = NULL;
-
-    sc->blocked = 1;
-
-    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
-                                        ngx_http_spdy_module);
-
-    size = ngx_http_spdy_streams_index_size(sscf);
-
-    for (i = 0; i < size; i++) {
-        stream = sc->streams_index[i];
-
-        while (stream) {
-            stream->handled = 0;
-
-            r = stream->request;
-            fc = r->connection;
-
-            fc->error = 1;
-
-            if (stream->queued) {
-                stream->queued = 0;
-
-                ev = fc->write;
-                ev->delayed = 0;
-
-            } else {
-                ev = fc->read;
-            }
-
-            stream = stream->index;
-
-            ev->eof = 1;
-            ev->handler(ev);
-        }
-    }
-
-    sc->blocked = 0;
-
-    if (sc->processing) {
-        return;
-    }
-
-    ngx_http_close_connection(c);
-}
-
-
-static ngx_int_t
-ngx_http_spdy_adjust_windows(ngx_http_spdy_connection_t *sc, ssize_t delta)
-{
-    ngx_uint_t                 i, size;
-    ngx_event_t               *wev;
-    ngx_http_spdy_stream_t    *stream, *sn;
-    ngx_http_spdy_srv_conf_t  *sscf;
-
-    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
-                                        ngx_http_spdy_module);
-
-    size = ngx_http_spdy_streams_index_size(sscf);
-
-    for (i = 0; i < size; i++) {
-
-        for (stream = sc->streams_index[i]; stream; stream = sn) {
-            sn = stream->index;
-
-            if (delta > 0
-                && stream->send_window
-                      > (ssize_t) (NGX_SPDY_MAX_WINDOW - delta))
-            {
-                if (ngx_http_spdy_terminate_stream(sc, stream,
-                                                   NGX_SPDY_FLOW_CONTROL_ERROR)
-                    == NGX_ERROR)
-                {
-                    return NGX_ERROR;
-                }
-
-                continue;
-            }
-
-            stream->send_window += delta;
-
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                           "spdy:%ui adjust window:%z",
-                           stream->id, stream->send_window);
-
-            if (stream->send_window > 0 && stream->exhausted) {
-                stream->exhausted = 0;
-
-                wev = stream->request->connection->write;
-
-                if (!wev->timer_set) {
-                    wev->delayed = 0;
-                    wev->handler(wev);
-                }
-            }
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_spdy_pool_cleanup(void *data)
-{
-    ngx_http_spdy_connection_t  *sc = data;
-
-    if (sc->pool) {
-        ngx_destroy_pool(sc->pool);
-    }
-}
-
-
-static void *
-ngx_http_spdy_zalloc(void *opaque, u_int items, u_int size)
-{
-    ngx_http_spdy_connection_t *sc = opaque;
-
-    return ngx_palloc(sc->connection->pool, items * size);
-}
-
-
-static void
-ngx_http_spdy_zfree(void *opaque, void *address)
-{
-#if 0
-    ngx_http_spdy_connection_t *sc = opaque;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy zfree: %p", address);
-#endif
-}
diff --git a/src/http/ngx_http_spdy.h b/src/http/ngx_http_spdy.h
deleted file mode 100644
index df24495..0000000
--- a/src/http/ngx_http_spdy.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (C) Nginx, Inc.
- * Copyright (C) Valentin V. Bartenev
- */
-
-
-#ifndef _NGX_HTTP_SPDY_H_INCLUDED_
-#define _NGX_HTTP_SPDY_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-
-#include <zlib.h>
-
-
-#define NGX_SPDY_VERSION              3
-
-#define NGX_SPDY_NPN_ADVERTISE        "\x08spdy/3.1"
-#define NGX_SPDY_NPN_NEGOTIATED       "spdy/3.1"
-
-#define NGX_SPDY_STATE_BUFFER_SIZE    16
-
-#define NGX_SPDY_CTL_BIT              1
-
-#define NGX_SPDY_SYN_STREAM           1
-#define NGX_SPDY_SYN_REPLY            2
-#define NGX_SPDY_RST_STREAM           3
-#define NGX_SPDY_SETTINGS             4
-#define NGX_SPDY_PING                 6
-#define NGX_SPDY_GOAWAY               7
-#define NGX_SPDY_HEADERS              8
-#define NGX_SPDY_WINDOW_UPDATE        9
-
-#define NGX_SPDY_FRAME_HEADER_SIZE    8
-
-#define NGX_SPDY_SID_SIZE             4
-#define NGX_SPDY_DELTA_SIZE           4
-
-#define NGX_SPDY_SYN_STREAM_SIZE      10
-#define NGX_SPDY_SYN_REPLY_SIZE       4
-#define NGX_SPDY_RST_STREAM_SIZE      8
-#define NGX_SPDY_PING_SIZE            4
-#define NGX_SPDY_GOAWAY_SIZE          8
-#define NGX_SPDY_WINDOW_UPDATE_SIZE   8
-#define NGX_SPDY_NV_NUM_SIZE          4
-#define NGX_SPDY_NV_NLEN_SIZE         4
-#define NGX_SPDY_NV_VLEN_SIZE         4
-#define NGX_SPDY_SETTINGS_NUM_SIZE    4
-#define NGX_SPDY_SETTINGS_FID_SIZE    4
-#define NGX_SPDY_SETTINGS_VAL_SIZE    4
-
-#define NGX_SPDY_SETTINGS_PAIR_SIZE                                           \
-    (NGX_SPDY_SETTINGS_FID_SIZE + NGX_SPDY_SETTINGS_VAL_SIZE)
-
-#define NGX_SPDY_HIGHEST_PRIORITY     0
-#define NGX_SPDY_LOWEST_PRIORITY      7
-
-#define NGX_SPDY_FLAG_FIN             0x01
-#define NGX_SPDY_FLAG_UNIDIRECTIONAL  0x02
-#define NGX_SPDY_FLAG_CLEAR_SETTINGS  0x01
-
-#define NGX_SPDY_MAX_FRAME_SIZE       ((1 << 24) - 1)
-
-#define NGX_SPDY_DATA_DISCARD         1
-#define NGX_SPDY_DATA_ERROR           2
-#define NGX_SPDY_DATA_INTERNAL_ERROR  3
-
-
-typedef struct ngx_http_spdy_connection_s   ngx_http_spdy_connection_t;
-typedef struct ngx_http_spdy_out_frame_s    ngx_http_spdy_out_frame_t;
-
-
-typedef u_char *(*ngx_http_spdy_handler_pt) (ngx_http_spdy_connection_t *sc,
-    u_char *pos, u_char *end);
-
-struct ngx_http_spdy_connection_s {
-    ngx_connection_t                *connection;
-    ngx_http_connection_t           *http_connection;
-
-    ngx_uint_t                       processing;
-
-    size_t                           send_window;
-    size_t                           recv_window;
-    size_t                           init_window;
-
-    ngx_queue_t                      waiting;
-
-    u_char                           buffer[NGX_SPDY_STATE_BUFFER_SIZE];
-    size_t                           buffer_used;
-    ngx_http_spdy_handler_pt         handler;
-
-    z_stream                         zstream_in;
-    z_stream                         zstream_out;
-
-    ngx_pool_t                      *pool;
-
-    ngx_http_spdy_out_frame_t       *free_ctl_frames;
-    ngx_connection_t                *free_fake_connections;
-
-    ngx_http_spdy_stream_t         **streams_index;
-
-    ngx_http_spdy_out_frame_t       *last_out;
-
-    ngx_queue_t                      posted;
-
-    ngx_http_spdy_stream_t          *stream;
-
-    ngx_uint_t                       entries;
-    size_t                           length;
-    u_char                           flags;
-
-    ngx_uint_t                       last_sid;
-
-    unsigned                         blocked:1;
-    unsigned                         incomplete:1;
-};
-
-
-struct ngx_http_spdy_stream_s {
-    ngx_uint_t                       id;
-    ngx_http_request_t              *request;
-    ngx_http_spdy_connection_t      *connection;
-    ngx_http_spdy_stream_t          *index;
-
-    ngx_uint_t                       header_buffers;
-    ngx_uint_t                       queued;
-
-    /*
-     * A change to SETTINGS_INITIAL_WINDOW_SIZE could cause the
-     * send_window to become negative, hence it's signed.
-     */
-    ssize_t                          send_window;
-    size_t                           recv_window;
-
-    ngx_http_spdy_out_frame_t       *free_frames;
-    ngx_chain_t                     *free_data_headers;
-    ngx_chain_t                     *free_bufs;
-
-    ngx_queue_t                      queue;
-
-    unsigned                         priority:3;
-    unsigned                         handled:1;
-    unsigned                         blocked:1;
-    unsigned                         exhausted:1;
-    unsigned                         in_closed:1;
-    unsigned                         out_closed:1;
-    unsigned                         skip_data:2;
-};
-
-
-struct ngx_http_spdy_out_frame_s {
-    ngx_http_spdy_out_frame_t       *next;
-    ngx_chain_t                     *first;
-    ngx_chain_t                     *last;
-    ngx_int_t                      (*handler)(ngx_http_spdy_connection_t *sc,
-                                        ngx_http_spdy_out_frame_t *frame);
-
-    ngx_http_spdy_stream_t          *stream;
-    size_t                           length;
-
-    ngx_uint_t                       priority;
-    unsigned                         blocked:1;
-    unsigned                         fin:1;
-};
-
-
-static ngx_inline void
-ngx_http_spdy_queue_frame(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_out_frame_t *frame)
-{
-    ngx_http_spdy_out_frame_t  **out;
-
-    for (out = &sc->last_out; *out; out = &(*out)->next)
-    {
-        /*
-         * NB: higher values represent lower priorities.
-         */
-        if (frame->priority >= (*out)->priority) {
-            break;
-        }
-    }
-
-    frame->next = *out;
-    *out = frame;
-}
-
-
-static ngx_inline void
-ngx_http_spdy_queue_blocked_frame(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_out_frame_t *frame)
-{
-    ngx_http_spdy_out_frame_t  **out;
-
-    for (out = &sc->last_out; *out; out = &(*out)->next)
-    {
-        if ((*out)->blocked) {
-            break;
-        }
-    }
-
-    frame->next = *out;
-    *out = frame;
-}
-
-
-void ngx_http_spdy_init(ngx_event_t *rev);
-void ngx_http_spdy_request_headers_init(void);
-
-ngx_int_t ngx_http_spdy_read_request_body(ngx_http_request_t *r,
-    ngx_http_client_body_handler_pt post_handler);
-
-void ngx_http_spdy_close_stream(ngx_http_spdy_stream_t *stream, ngx_int_t rc);
-
-ngx_int_t ngx_http_spdy_send_output_queue(ngx_http_spdy_connection_t *sc);
-
-
-#define ngx_spdy_frame_aligned_write_uint16(p, s)                             \
-    (*(uint16_t *) (p) = htons((uint16_t) (s)), (p) + sizeof(uint16_t))
-
-#define ngx_spdy_frame_aligned_write_uint32(p, s)                             \
-    (*(uint32_t *) (p) = htonl((uint32_t) (s)), (p) + sizeof(uint32_t))
-
-#if (NGX_HAVE_NONALIGNED)
-
-#define ngx_spdy_frame_write_uint16  ngx_spdy_frame_aligned_write_uint16
-#define ngx_spdy_frame_write_uint32  ngx_spdy_frame_aligned_write_uint32
-
-#else
-
-#define ngx_spdy_frame_write_uint16(p, s)                                     \
-    ((p)[0] = (u_char) ((s) >> 8),                                            \
-     (p)[1] = (u_char)  (s),                                                  \
-     (p) + sizeof(uint16_t))
-
-#define ngx_spdy_frame_write_uint32(p, s)                                     \
-    ((p)[0] = (u_char) ((s) >> 24),                                           \
-     (p)[1] = (u_char) ((s) >> 16),                                           \
-     (p)[2] = (u_char) ((s) >> 8),                                            \
-     (p)[3] = (u_char)  (s),                                                  \
-     (p) + sizeof(uint32_t))
-
-#endif
-
-
-#define ngx_spdy_ctl_frame_head(t)                                            \
-    ((uint32_t) NGX_SPDY_CTL_BIT << 31 | NGX_SPDY_VERSION << 16 | (t))
-
-#define ngx_spdy_frame_write_head(p, t)                                       \
-    ngx_spdy_frame_aligned_write_uint32(p, ngx_spdy_ctl_frame_head(t))
-
-#define ngx_spdy_frame_write_flags_and_len(p, f, l)                           \
-    ngx_spdy_frame_aligned_write_uint32(p, (f) << 24 | (l))
-#define ngx_spdy_frame_write_flags_and_id(p, f, i)                            \
-    ngx_spdy_frame_aligned_write_uint32(p, (f) << 24 | (i))
-
-#define ngx_spdy_frame_write_sid     ngx_spdy_frame_aligned_write_uint32
-#define ngx_spdy_frame_write_window  ngx_spdy_frame_aligned_write_uint32
-
-#endif /* _NGX_HTTP_SPDY_H_INCLUDED_ */
diff --git a/src/http/ngx_http_spdy_filter_module.c b/src/http/ngx_http_spdy_filter_module.c
deleted file mode 100644
index 377e935..0000000
--- a/src/http/ngx_http_spdy_filter_module.c
+++ /dev/null
@@ -1,1222 +0,0 @@
-
-/*
- * Copyright (C) Nginx, Inc.
- * Copyright (C) Valentin V. Bartenev
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <nginx.h>
-#include <ngx_http_spdy_module.h>
-
-#include <zlib.h>
-
-
-#define ngx_http_spdy_nv_nsize(h)  (NGX_SPDY_NV_NLEN_SIZE + sizeof(h) - 1)
-#define ngx_http_spdy_nv_vsize(h)  (NGX_SPDY_NV_VLEN_SIZE + sizeof(h) - 1)
-
-#define ngx_http_spdy_nv_write_num   ngx_spdy_frame_write_uint32
-#define ngx_http_spdy_nv_write_nlen  ngx_spdy_frame_write_uint32
-#define ngx_http_spdy_nv_write_vlen  ngx_spdy_frame_write_uint32
-
-#define ngx_http_spdy_nv_write_name(p, h)                                     \
-    ngx_cpymem(ngx_http_spdy_nv_write_nlen(p, sizeof(h) - 1), h, sizeof(h) - 1)
-
-#define ngx_http_spdy_nv_write_val(p, h)                                      \
-    ngx_cpymem(ngx_http_spdy_nv_write_vlen(p, sizeof(h) - 1), h, sizeof(h) - 1)
-
-
-static ngx_chain_t *ngx_http_spdy_send_chain(ngx_connection_t *fc,
-    ngx_chain_t *in, off_t limit);
-
-static ngx_inline ngx_int_t ngx_http_spdy_filter_send(
-    ngx_connection_t *fc, ngx_http_spdy_stream_t *stream);
-static ngx_inline ngx_int_t ngx_http_spdy_flow_control(
-    ngx_http_spdy_connection_t *sc, ngx_http_spdy_stream_t *stream);
-static void ngx_http_spdy_waiting_queue(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_stream_t *stream);
-
-static ngx_chain_t *ngx_http_spdy_filter_get_shadow(
-    ngx_http_spdy_stream_t *stream, ngx_buf_t *buf, off_t offset, off_t size);
-static ngx_http_spdy_out_frame_t *ngx_http_spdy_filter_get_data_frame(
-    ngx_http_spdy_stream_t *stream, size_t len, ngx_chain_t *first,
-    ngx_chain_t *last);
-
-static ngx_int_t ngx_http_spdy_syn_frame_handler(
-    ngx_http_spdy_connection_t *sc, ngx_http_spdy_out_frame_t *frame);
-static ngx_int_t ngx_http_spdy_data_frame_handler(
-    ngx_http_spdy_connection_t *sc, ngx_http_spdy_out_frame_t *frame);
-static ngx_inline void ngx_http_spdy_handle_frame(
-    ngx_http_spdy_stream_t *stream, ngx_http_spdy_out_frame_t *frame);
-static ngx_inline void ngx_http_spdy_handle_stream(
-    ngx_http_spdy_connection_t *sc, ngx_http_spdy_stream_t *stream);
-
-static void ngx_http_spdy_filter_cleanup(void *data);
-
-static ngx_int_t ngx_http_spdy_filter_init(ngx_conf_t *cf);
-
-
-static ngx_http_module_t  ngx_http_spdy_filter_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    ngx_http_spdy_filter_init,             /* postconfiguration */
-
-    NULL,                                  /* create main configuration */
-    NULL,                                  /* init main configuration */
-
-    NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
-
-    NULL,                                  /* create location configuration */
-    NULL                                   /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_http_spdy_filter_module = {
-    NGX_MODULE_V1,
-    &ngx_http_spdy_filter_module_ctx,      /* module context */
-    NULL,                                  /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
-
-
-static ngx_int_t
-ngx_http_spdy_header_filter(ngx_http_request_t *r)
-{
-    int                           rc;
-    size_t                        len;
-    u_char                       *p, *buf, *last;
-    ngx_buf_t                    *b;
-    ngx_str_t                     host;
-    ngx_uint_t                    i, j, count, port;
-    ngx_chain_t                  *cl;
-    ngx_list_part_t              *part, *pt;
-    ngx_table_elt_t              *header, *h;
-    ngx_connection_t             *c;
-    ngx_http_cleanup_t           *cln;
-    ngx_http_core_loc_conf_t     *clcf;
-    ngx_http_core_srv_conf_t     *cscf;
-    ngx_http_spdy_stream_t       *stream;
-    ngx_http_spdy_out_frame_t    *frame;
-    ngx_http_spdy_connection_t   *sc;
-    struct sockaddr_in           *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6          *sin6;
-#endif
-    u_char                        addr[NGX_SOCKADDR_STRLEN];
-
-    if (!r->spdy_stream) {
-        return ngx_http_next_header_filter(r);
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "spdy header filter");
-
-    if (r->header_sent) {
-        return NGX_OK;
-    }
-
-    r->header_sent = 1;
-
-    if (r != r->main) {
-        return NGX_OK;
-    }
-
-    c = r->connection;
-
-    if (r->method == NGX_HTTP_HEAD) {
-        r->header_only = 1;
-    }
-
-    switch (r->headers_out.status) {
-
-    case NGX_HTTP_OK:
-    case NGX_HTTP_PARTIAL_CONTENT:
-        break;
-
-    case NGX_HTTP_NOT_MODIFIED:
-        r->header_only = 1;
-        break;
-
-    case NGX_HTTP_NO_CONTENT:
-        r->header_only = 1;
-
-        ngx_str_null(&r->headers_out.content_type);
-
-        r->headers_out.content_length = NULL;
-        r->headers_out.content_length_n = -1;
-
-        /* fall through */
-
-    default:
-        r->headers_out.last_modified_time = -1;
-        r->headers_out.last_modified = NULL;
-    }
-
-    len = NGX_SPDY_NV_NUM_SIZE
-          + ngx_http_spdy_nv_nsize(":version")
-          + ngx_http_spdy_nv_vsize("HTTP/1.1")
-          + ngx_http_spdy_nv_nsize(":status")
-          + (r->headers_out.status_line.len
-             ? NGX_SPDY_NV_VLEN_SIZE + r->headers_out.status_line.len
-             : ngx_http_spdy_nv_vsize("418"));
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-    if (r->headers_out.server == NULL) {
-        len += ngx_http_spdy_nv_nsize("server");
-        len += clcf->server_tokens ? ngx_http_spdy_nv_vsize(NGINX_VER)
-                                   : ngx_http_spdy_nv_vsize("nginx");
-    }
-
-    if (r->headers_out.date == NULL) {
-        len += ngx_http_spdy_nv_nsize("date")
-               + ngx_http_spdy_nv_vsize("Wed, 31 Dec 1986 10:00:00 GMT");
-    }
-
-    if (r->headers_out.content_type.len) {
-        len += ngx_http_spdy_nv_nsize("content-type")
-               + NGX_SPDY_NV_VLEN_SIZE + r->headers_out.content_type.len;
-
-        if (r->headers_out.content_type_len == r->headers_out.content_type.len
-            && r->headers_out.charset.len)
-        {
-            len += sizeof("; charset=") - 1 + r->headers_out.charset.len;
-        }
-    }
-
-    if (r->headers_out.content_length == NULL
-        && r->headers_out.content_length_n >= 0)
-    {
-        len += ngx_http_spdy_nv_nsize("content-length")
-               + NGX_SPDY_NV_VLEN_SIZE + NGX_OFF_T_LEN;
-    }
-
-    if (r->headers_out.last_modified == NULL
-        && r->headers_out.last_modified_time != -1)
-    {
-        len += ngx_http_spdy_nv_nsize("last-modified")
-               + ngx_http_spdy_nv_vsize("Wed, 31 Dec 1986 10:00:00 GMT");
-    }
-
-    if (r->headers_out.location
-        && r->headers_out.location->value.len
-        && r->headers_out.location->value.data[0] == '/')
-    {
-        r->headers_out.location->hash = 0;
-
-        if (clcf->server_name_in_redirect) {
-            cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
-            host = cscf->server_name;
-
-        } else if (r->headers_in.server.len) {
-            host = r->headers_in.server;
-
-        } else {
-            host.len = NGX_SOCKADDR_STRLEN;
-            host.data = addr;
-
-            if (ngx_connection_local_sockaddr(c, &host, 0) != NGX_OK) {
-                return NGX_ERROR;
-            }
-        }
-
-        switch (c->local_sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            sin6 = (struct sockaddr_in6 *) c->local_sockaddr;
-            port = ntohs(sin6->sin6_port);
-            break;
-#endif
-#if (NGX_HAVE_UNIX_DOMAIN)
-        case AF_UNIX:
-            port = 0;
-            break;
-#endif
-        default: /* AF_INET */
-            sin = (struct sockaddr_in *) c->local_sockaddr;
-            port = ntohs(sin->sin_port);
-            break;
-        }
-
-        len += ngx_http_spdy_nv_nsize("location")
-               + ngx_http_spdy_nv_vsize("https://")
-               + host.len
-               + r->headers_out.location->value.len;
-
-        if (clcf->port_in_redirect) {
-
-#if (NGX_HTTP_SSL)
-            if (c->ssl)
-                port = (port == 443) ? 0 : port;
-            else
-#endif
-                port = (port == 80) ? 0 : port;
-
-        } else {
-            port = 0;
-        }
-
-        if (port) {
-            len += sizeof(":65535") - 1;
-        }
-
-    } else {
-        ngx_str_null(&host);
-        port = 0;
-    }
-
-    part = &r->headers_out.headers.part;
-    header = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        if (header[i].hash == 0) {
-            continue;
-        }
-
-        len += NGX_SPDY_NV_NLEN_SIZE + header[i].key.len
-               + NGX_SPDY_NV_VLEN_SIZE  + header[i].value.len;
-    }
-
-    buf = ngx_alloc(len, r->pool->log);
-    if (buf == NULL) {
-        return NGX_ERROR;
-    }
-
-    last = buf + NGX_SPDY_NV_NUM_SIZE;
-
-    last = ngx_http_spdy_nv_write_name(last, ":version");
-    last = ngx_http_spdy_nv_write_val(last, "HTTP/1.1");
-
-    last = ngx_http_spdy_nv_write_name(last, ":status");
-
-    if (r->headers_out.status_line.len) {
-        last = ngx_http_spdy_nv_write_vlen(last,
-                                           r->headers_out.status_line.len);
-        last = ngx_cpymem(last, r->headers_out.status_line.data,
-                          r->headers_out.status_line.len);
-    } else {
-        last = ngx_http_spdy_nv_write_vlen(last, 3);
-        last = ngx_sprintf(last, "%03ui", r->headers_out.status);
-    }
-
-    count = 2;
-
-    if (r->headers_out.server == NULL) {
-        last = ngx_http_spdy_nv_write_name(last, "server");
-        last = clcf->server_tokens
-               ? ngx_http_spdy_nv_write_val(last, NGINX_VER)
-               : ngx_http_spdy_nv_write_val(last, "nginx");
-
-        count++;
-    }
-
-    if (r->headers_out.date == NULL) {
-        last = ngx_http_spdy_nv_write_name(last, "date");
-
-        last = ngx_http_spdy_nv_write_vlen(last, ngx_cached_http_time.len);
-
-        last = ngx_cpymem(last, ngx_cached_http_time.data,
-                          ngx_cached_http_time.len);
-
-        count++;
-    }
-
-    if (r->headers_out.content_type.len) {
-
-        last = ngx_http_spdy_nv_write_name(last, "content-type");
-
-        p = last + NGX_SPDY_NV_VLEN_SIZE;
-
-        last = ngx_cpymem(p, r->headers_out.content_type.data,
-                          r->headers_out.content_type.len);
-
-        if (r->headers_out.content_type_len == r->headers_out.content_type.len
-            && r->headers_out.charset.len)
-        {
-            last = ngx_cpymem(last, "; charset=", sizeof("; charset=") - 1);
-
-            last = ngx_cpymem(last, r->headers_out.charset.data,
-                              r->headers_out.charset.len);
-
-            /* update r->headers_out.content_type for possible logging */
-
-            r->headers_out.content_type.len = last - p;
-            r->headers_out.content_type.data = p;
-        }
-
-        (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
-                                           r->headers_out.content_type.len);
-
-        count++;
-    }
-
-    if (r->headers_out.content_length == NULL
-        && r->headers_out.content_length_n >= 0)
-    {
-        last = ngx_http_spdy_nv_write_name(last, "content-length");
-
-        p = last + NGX_SPDY_NV_VLEN_SIZE;
-
-        last = ngx_sprintf(p, "%O", r->headers_out.content_length_n);
-
-        (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
-                                           last - p);
-
-        count++;
-    }
-
-    if (r->headers_out.last_modified == NULL
-        && r->headers_out.last_modified_time != -1)
-    {
-        last = ngx_http_spdy_nv_write_name(last, "last-modified");
-
-        p = last + NGX_SPDY_NV_VLEN_SIZE;
-
-        last = ngx_http_time(p, r->headers_out.last_modified_time);
-
-        (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
-                                           last - p);
-
-        count++;
-    }
-
-    if (host.data) {
-
-        last = ngx_http_spdy_nv_write_name(last, "location");
-
-        p = last + NGX_SPDY_NV_VLEN_SIZE;
-
-        last = ngx_cpymem(p, "http", sizeof("http") - 1);
-
-#if (NGX_HTTP_SSL)
-        if (c->ssl) {
-            *last++ ='s';
-        }
-#endif
-
-        *last++ = ':'; *last++ = '/'; *last++ = '/';
-
-        last = ngx_cpymem(last, host.data, host.len);
-
-        if (port) {
-            last = ngx_sprintf(last, ":%ui", port);
-        }
-
-        last = ngx_cpymem(last, r->headers_out.location->value.data,
-                          r->headers_out.location->value.len);
-
-        /* update r->headers_out.location->value for possible logging */
-
-        r->headers_out.location->value.len = last - p;
-        r->headers_out.location->value.data = p;
-        ngx_str_set(&r->headers_out.location->key, "location");
-
-        (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
-                                           r->headers_out.location->value.len);
-
-        count++;
-    }
-
-    part = &r->headers_out.headers.part;
-    header = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        if (header[i].hash == 0 || header[i].hash == 2) {
-            continue;
-        }
-
-        last = ngx_http_spdy_nv_write_nlen(last, header[i].key.len);
-
-        ngx_strlow(last, header[i].key.data, header[i].key.len);
-        last += header[i].key.len;
-
-        p = last + NGX_SPDY_NV_VLEN_SIZE;
-
-        last = ngx_cpymem(p, header[i].value.data, header[i].value.len);
-
-        pt = part;
-        h = header;
-
-        for (j = i + 1; /* void */; j++) {
-
-            if (j >= pt->nelts) {
-                if (pt->next == NULL) {
-                    break;
-                }
-
-                pt = pt->next;
-                h = pt->elts;
-                j = 0;
-            }
-
-            if (h[j].hash == 0 || h[j].hash == 2
-                || h[j].key.len != header[i].key.len
-                || ngx_strncasecmp(header[i].key.data, h[j].key.data,
-                                   header[i].key.len))
-            {
-                continue;
-            }
-
-            if (h[j].value.len) {
-                if (last != p) {
-                    *last++ = '\0';
-                }
-
-                last = ngx_cpymem(last, h[j].value.data, h[j].value.len);
-            }
-
-            h[j].hash = 2;
-        }
-
-        (void) ngx_http_spdy_nv_write_vlen(p - NGX_SPDY_NV_VLEN_SIZE,
-                                           last - p);
-
-        count++;
-    }
-
-    (void) ngx_http_spdy_nv_write_num(buf, count);
-
-    stream = r->spdy_stream;
-    sc = stream->connection;
-
-    len = last - buf;
-
-    b = ngx_create_temp_buf(r->pool, NGX_SPDY_FRAME_HEADER_SIZE
-                                     + NGX_SPDY_SYN_REPLY_SIZE
-                                     + deflateBound(&sc->zstream_out, len));
-    if (b == NULL) {
-        ngx_free(buf);
-        return NGX_ERROR;
-    }
-
-    b->last += NGX_SPDY_FRAME_HEADER_SIZE + NGX_SPDY_SYN_REPLY_SIZE;
-
-    sc->zstream_out.next_in = buf;
-    sc->zstream_out.avail_in = len;
-    sc->zstream_out.next_out = b->last;
-    sc->zstream_out.avail_out = b->end - b->last;
-
-    rc = deflate(&sc->zstream_out, Z_SYNC_FLUSH);
-
-    ngx_free(buf);
-
-    if (rc != Z_OK) {
-        ngx_log_error(NGX_LOG_ALERT, c->log, 0, "deflate() failed: %d", rc);
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "spdy deflate out: ni:%p no:%p ai:%ud ao:%ud rc:%d",
-                   sc->zstream_out.next_in, sc->zstream_out.next_out,
-                   sc->zstream_out.avail_in, sc->zstream_out.avail_out,
-                   rc);
-
-    b->last = sc->zstream_out.next_out;
-
-    p = b->pos;
-    p = ngx_spdy_frame_write_head(p, NGX_SPDY_SYN_REPLY);
-
-    len = b->last - b->pos;
-
-    r->header_size = len;
-
-    len -= NGX_SPDY_FRAME_HEADER_SIZE;
-
-    if (r->header_only) {
-        b->last_buf = 1;
-        p = ngx_spdy_frame_write_flags_and_len(p, NGX_SPDY_FLAG_FIN, len);
-
-    } else {
-        p = ngx_spdy_frame_write_flags_and_len(p, 0, len);
-    }
-
-    (void) ngx_spdy_frame_write_sid(p, stream->id);
-
-    cl = ngx_alloc_chain_link(r->pool);
-    if (cl == NULL) {
-        return NGX_ERROR;
-    }
-
-    cl->buf = b;
-    cl->next = NULL;
-
-    frame = ngx_palloc(r->pool, sizeof(ngx_http_spdy_out_frame_t));
-    if (frame == NULL) {
-        return NGX_ERROR;
-    }
-
-    frame->first = cl;
-    frame->last = cl;
-    frame->handler = ngx_http_spdy_syn_frame_handler;
-    frame->stream = stream;
-    frame->length = len;
-    frame->priority = stream->priority;
-    frame->blocked = 1;
-    frame->fin = r->header_only;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, stream->request->connection->log, 0,
-                   "spdy:%ui create SYN_REPLY frame %p: len:%uz",
-                   stream->id, frame, frame->length);
-
-    ngx_http_spdy_queue_blocked_frame(sc, frame);
-
-    cln = ngx_http_cleanup_add(r, 0);
-    if (cln == NULL) {
-        return NGX_ERROR;
-    }
-
-    cln->handler = ngx_http_spdy_filter_cleanup;
-    cln->data = stream;
-
-    stream->queued = 1;
-
-    c->send_chain = ngx_http_spdy_send_chain;
-    c->need_last_buf = 1;
-
-    return ngx_http_spdy_filter_send(c, stream);
-}
-
-
-static ngx_chain_t *
-ngx_http_spdy_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
-{
-    off_t                        size, offset;
-    size_t                       rest, frame_size;
-    ngx_chain_t                 *cl, *out, **ln;
-    ngx_http_request_t          *r;
-    ngx_http_spdy_stream_t      *stream;
-    ngx_http_spdy_loc_conf_t    *slcf;
-    ngx_http_spdy_out_frame_t   *frame;
-    ngx_http_spdy_connection_t  *sc;
-
-    r = fc->data;
-    stream = r->spdy_stream;
-
-#if (NGX_SUPPRESS_WARN)
-    size = 0;
-#endif
-
-    while (in) {
-        size = ngx_buf_size(in->buf);
-
-        if (size || in->buf->last_buf) {
-            break;
-        }
-
-        in = in->next;
-    }
-
-    if (in == NULL) {
-
-        if (stream->queued) {
-            fc->write->delayed = 1;
-        } else {
-            fc->buffered &= ~NGX_SPDY_BUFFERED;
-        }
-
-        return NULL;
-    }
-
-    sc = stream->connection;
-
-    if (size && ngx_http_spdy_flow_control(sc, stream) == NGX_DECLINED) {
-        fc->write->delayed = 1;
-        return in;
-    }
-
-    if (limit == 0 || limit > (off_t) sc->send_window) {
-        limit = sc->send_window;
-    }
-
-    if (limit > stream->send_window) {
-        limit = (stream->send_window > 0) ? stream->send_window : 0;
-    }
-
-    if (in->buf->tag == (ngx_buf_tag_t) &ngx_http_spdy_filter_get_shadow) {
-        cl = ngx_alloc_chain_link(r->pool);
-        if (cl == NULL) {
-            return NGX_CHAIN_ERROR;
-        }
-
-        cl->buf = in->buf;
-        in->buf = cl->buf->shadow;
-
-        offset = ngx_buf_in_memory(in->buf)
-                 ? (cl->buf->pos - in->buf->pos)
-                 : (cl->buf->file_pos - in->buf->file_pos);
-
-        cl->next = stream->free_bufs;
-        stream->free_bufs = cl;
-
-    } else {
-        offset = 0;
-    }
-
-#if (NGX_SUPPRESS_WARN)
-    cl = NULL;
-#endif
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_http_spdy_module);
-
-    frame_size = (limit <= (off_t) slcf->chunk_size) ? (size_t) limit
-                                                     : slcf->chunk_size;
-
-    for ( ;; ) {
-        ln = &out;
-        rest = frame_size;
-
-        while ((off_t) rest >= size) {
-
-            if (offset) {
-                cl = ngx_http_spdy_filter_get_shadow(stream, in->buf,
-                                                     offset, size);
-                if (cl == NULL) {
-                    return NGX_CHAIN_ERROR;
-                }
-
-                offset = 0;
-
-            } else {
-                cl = ngx_alloc_chain_link(r->pool);
-                if (cl == NULL) {
-                    return NGX_CHAIN_ERROR;
-                }
-
-                cl->buf = in->buf;
-            }
-
-            *ln = cl;
-            ln = &cl->next;
-
-            rest -= (size_t) size;
-            in = in->next;
-
-            if (in == NULL) {
-                frame_size -= rest;
-                rest = 0;
-                break;
-            }
-
-            size = ngx_buf_size(in->buf);
-        }
-
-        if (rest) {
-            cl = ngx_http_spdy_filter_get_shadow(stream, in->buf,
-                                                 offset, rest);
-            if (cl == NULL) {
-                return NGX_CHAIN_ERROR;
-            }
-
-            cl->buf->flush = 0;
-            cl->buf->last_buf = 0;
-
-            *ln = cl;
-
-            offset += rest;
-            size -= rest;
-        }
-
-        frame = ngx_http_spdy_filter_get_data_frame(stream, frame_size,
-                                                    out, cl);
-        if (frame == NULL) {
-            return NGX_CHAIN_ERROR;
-        }
-
-        ngx_http_spdy_queue_frame(sc, frame);
-
-        sc->send_window -= frame_size;
-
-        stream->send_window -= frame_size;
-        stream->queued++;
-
-        if (in == NULL) {
-            break;
-        }
-
-        limit -= frame_size;
-
-        if (limit == 0) {
-            break;
-        }
-
-        if (limit < (off_t) slcf->chunk_size) {
-            frame_size = (size_t) limit;
-        }
-    }
-
-    if (offset) {
-        cl = ngx_http_spdy_filter_get_shadow(stream, in->buf, offset, size);
-        if (cl == NULL) {
-            return NGX_CHAIN_ERROR;
-        }
-
-        in->buf = cl->buf;
-        ngx_free_chain(r->pool, cl);
-    }
-
-    if (ngx_http_spdy_filter_send(fc, stream) == NGX_ERROR) {
-        return NGX_CHAIN_ERROR;
-    }
-
-    if (in && ngx_http_spdy_flow_control(sc, stream) == NGX_DECLINED) {
-        fc->write->delayed = 1;
-    }
-
-    return in;
-}
-
-
-static ngx_chain_t *
-ngx_http_spdy_filter_get_shadow(ngx_http_spdy_stream_t *stream, ngx_buf_t *buf,
-    off_t offset, off_t size)
-{
-    ngx_buf_t    *chunk;
-    ngx_chain_t  *cl;
-
-    cl = ngx_chain_get_free_buf(stream->request->pool, &stream->free_bufs);
-    if (cl == NULL) {
-        return NULL;
-    }
-
-    chunk = cl->buf;
-
-    ngx_memcpy(chunk, buf, sizeof(ngx_buf_t));
-
-    chunk->tag = (ngx_buf_tag_t) &ngx_http_spdy_filter_get_shadow;
-    chunk->shadow = buf;
-
-    if (ngx_buf_in_memory(chunk)) {
-        chunk->pos += offset;
-        chunk->last = chunk->pos + size;
-    }
-
-    if (chunk->in_file) {
-        chunk->file_pos += offset;
-        chunk->file_last = chunk->file_pos + size;
-    }
-
-    return cl;
-}
-
-
-static ngx_http_spdy_out_frame_t *
-ngx_http_spdy_filter_get_data_frame(ngx_http_spdy_stream_t *stream,
-    size_t len, ngx_chain_t *first, ngx_chain_t *last)
-{
-    u_char                     *p;
-    ngx_buf_t                  *buf;
-    ngx_uint_t                  flags;
-    ngx_chain_t                *cl;
-    ngx_http_spdy_out_frame_t  *frame;
-
-
-    frame = stream->free_frames;
-
-    if (frame) {
-        stream->free_frames = frame->next;
-
-    } else {
-        frame = ngx_palloc(stream->request->pool,
-                           sizeof(ngx_http_spdy_out_frame_t));
-        if (frame == NULL) {
-            return NULL;
-        }
-    }
-
-    flags = last->buf->last_buf ? NGX_SPDY_FLAG_FIN : 0;
-
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, stream->request->connection->log, 0,
-                   "spdy:%ui create DATA frame %p: len:%uz flags:%ui",
-                   stream->id, frame, len, flags);
-
-    cl = ngx_chain_get_free_buf(stream->request->pool,
-                                &stream->free_data_headers);
-    if (cl == NULL) {
-        return NULL;
-    }
-
-    buf = cl->buf;
-
-    if (buf->start) {
-        p = buf->start;
-        buf->pos = p;
-
-        p += NGX_SPDY_SID_SIZE;
-
-        (void) ngx_spdy_frame_write_flags_and_len(p, flags, len);
-
-    } else {
-        p = ngx_palloc(stream->request->pool, NGX_SPDY_FRAME_HEADER_SIZE);
-        if (p == NULL) {
-            return NULL;
-        }
-
-        buf->pos = p;
-        buf->start = p;
-
-        p = ngx_spdy_frame_write_sid(p, stream->id);
-        p = ngx_spdy_frame_write_flags_and_len(p, flags, len);
-
-        buf->last = p;
-        buf->end = p;
-
-        buf->tag = (ngx_buf_tag_t) &ngx_http_spdy_filter_get_data_frame;
-        buf->memory = 1;
-    }
-
-    cl->next = first;
-    first = cl;
-
-    last->buf->flush = 1;
-
-    frame->first = first;
-    frame->last = last;
-    frame->handler = ngx_http_spdy_data_frame_handler;
-    frame->stream = stream;
-    frame->length = len;
-    frame->priority = stream->priority;
-    frame->blocked = 0;
-    frame->fin = last->buf->last_buf;
-
-    return frame;
-}
-
-
-static ngx_inline ngx_int_t
-ngx_http_spdy_filter_send(ngx_connection_t *fc, ngx_http_spdy_stream_t *stream)
-{
-    stream->blocked = 1;
-
-    if (ngx_http_spdy_send_output_queue(stream->connection) == NGX_ERROR) {
-        fc->error = 1;
-        return NGX_ERROR;
-    }
-
-    stream->blocked = 0;
-
-    if (stream->queued) {
-        fc->buffered |= NGX_SPDY_BUFFERED;
-        fc->write->delayed = 1;
-        return NGX_AGAIN;
-    }
-
-    fc->buffered &= ~NGX_SPDY_BUFFERED;
-
-    return NGX_OK;
-}
-
-
-static ngx_inline ngx_int_t
-ngx_http_spdy_flow_control(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_stream_t *stream)
-{
-    if (stream->send_window <= 0) {
-        stream->exhausted = 1;
-        return NGX_DECLINED;
-    }
-
-    if (sc->send_window == 0) {
-        ngx_http_spdy_waiting_queue(sc, stream);
-        return NGX_DECLINED;
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_spdy_waiting_queue(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_stream_t *stream)
-{
-    ngx_queue_t             *q;
-    ngx_http_spdy_stream_t  *s;
-
-    if (stream->handled) {
-        return;
-    }
-
-    stream->handled = 1;
-
-    for (q = ngx_queue_last(&sc->waiting);
-         q != ngx_queue_sentinel(&sc->waiting);
-         q = ngx_queue_prev(q))
-    {
-        s = ngx_queue_data(q, ngx_http_spdy_stream_t, queue);
-
-        /*
-         * NB: higher values represent lower priorities.
-         */
-        if (stream->priority >= s->priority) {
-            break;
-        }
-    }
-
-    ngx_queue_insert_after(q, &stream->queue);
-}
-
-
-static ngx_int_t
-ngx_http_spdy_syn_frame_handler(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_out_frame_t *frame)
-{
-    ngx_buf_t               *buf;
-    ngx_http_spdy_stream_t  *stream;
-
-    buf = frame->first->buf;
-
-    if (buf->pos != buf->last) {
-        return NGX_AGAIN;
-    }
-
-    stream = frame->stream;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy:%ui SYN_REPLY frame %p was sent", stream->id, frame);
-
-    ngx_free_chain(stream->request->pool, frame->first);
-
-    ngx_http_spdy_handle_frame(stream, frame);
-
-    ngx_http_spdy_handle_stream(sc, stream);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_data_frame_handler(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_out_frame_t *frame)
-{
-    ngx_buf_t               *buf;
-    ngx_chain_t             *cl, *ln;
-    ngx_http_spdy_stream_t  *stream;
-
-    stream = frame->stream;
-
-    cl = frame->first;
-
-    if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_spdy_filter_get_data_frame) {
-
-        if (cl->buf->pos != cl->buf->last) {
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                           "spdy:%ui DATA frame %p was sent partially",
-                           stream->id, frame);
-
-            return NGX_AGAIN;
-        }
-
-        ln = cl->next;
-
-        cl->next = stream->free_data_headers;
-        stream->free_data_headers = cl;
-
-        if (cl == frame->last) {
-            goto done;
-        }
-
-        cl = ln;
-    }
-
-    for ( ;; ) {
-        if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_spdy_filter_get_shadow) {
-            buf = cl->buf->shadow;
-
-            if (ngx_buf_in_memory(buf)) {
-                buf->pos = cl->buf->pos;
-            }
-
-            if (buf->in_file) {
-                buf->file_pos = cl->buf->file_pos;
-            }
-        }
-
-        if (ngx_buf_size(cl->buf) != 0) {
-
-            if (cl != frame->first) {
-                frame->first = cl;
-                ngx_http_spdy_handle_stream(sc, stream);
-            }
-
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                           "spdy:%ui DATA frame %p was sent partially",
-                           stream->id, frame);
-
-            return NGX_AGAIN;
-        }
-
-        ln = cl->next;
-
-        if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_spdy_filter_get_shadow) {
-            cl->next = stream->free_bufs;
-            stream->free_bufs = cl;
-
-        } else {
-            ngx_free_chain(stream->request->pool, cl);
-        }
-
-        if (cl == frame->last) {
-            goto done;
-        }
-
-        cl = ln;
-    }
-
-done:
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
-                   "spdy:%ui DATA frame %p was sent", stream->id, frame);
-
-    stream->request->header_size += NGX_SPDY_FRAME_HEADER_SIZE;
-
-    ngx_http_spdy_handle_frame(stream, frame);
-
-    ngx_http_spdy_handle_stream(sc, stream);
-
-    return NGX_OK;
-}
-
-
-static ngx_inline void
-ngx_http_spdy_handle_frame(ngx_http_spdy_stream_t *stream,
-    ngx_http_spdy_out_frame_t *frame)
-{
-    ngx_http_request_t  *r;
-
-    r = stream->request;
-
-    r->connection->sent += NGX_SPDY_FRAME_HEADER_SIZE + frame->length;
-
-    if (frame->fin) {
-        stream->out_closed = 1;
-    }
-
-    frame->next = stream->free_frames;
-    stream->free_frames = frame;
-
-    stream->queued--;
-}
-
-
-static ngx_inline void
-ngx_http_spdy_handle_stream(ngx_http_spdy_connection_t *sc,
-    ngx_http_spdy_stream_t *stream)
-{
-    ngx_event_t  *wev;
-
-    if (stream->handled || stream->blocked || stream->exhausted) {
-        return;
-    }
-
-    wev = stream->request->connection->write;
-
-    /*
-     * This timer can only be set if the stream was delayed because of rate
-     * limit.  In that case the event should be triggered by the timer.
-     */
-
-    if (!wev->timer_set) {
-        wev->delayed = 0;
-
-        stream->handled = 1;
-        ngx_queue_insert_tail(&sc->posted, &stream->queue);
-    }
-}
-
-
-static void
-ngx_http_spdy_filter_cleanup(void *data)
-{
-    ngx_http_spdy_stream_t *stream = data;
-
-    size_t                       delta;
-    ngx_http_spdy_out_frame_t   *frame, **fn;
-    ngx_http_spdy_connection_t  *sc;
-
-    if (stream->handled) {
-        stream->handled = 0;
-        ngx_queue_remove(&stream->queue);
-    }
-
-    if (stream->queued == 0) {
-        return;
-    }
-
-    delta = 0;
-    sc = stream->connection;
-    fn = &sc->last_out;
-
-    for ( ;; ) {
-        frame = *fn;
-
-        if (frame == NULL) {
-            break;
-        }
-
-        if (frame->stream == stream && !frame->blocked) {
-            *fn = frame->next;
-
-            delta += frame->length;
-
-            if (--stream->queued == 0) {
-                break;
-            }
-
-            continue;
-        }
-
-        fn = &frame->next;
-    }
-
-    if (sc->send_window == 0 && delta && !ngx_queue_empty(&sc->waiting)) {
-        ngx_queue_add(&sc->posted, &sc->waiting);
-        ngx_queue_init(&sc->waiting);
-    }
-
-    sc->send_window += delta;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_filter_init(ngx_conf_t *cf)
-{
-    ngx_http_next_header_filter = ngx_http_top_header_filter;
-    ngx_http_top_header_filter = ngx_http_spdy_header_filter;
-
-    return NGX_OK;
-}
diff --git a/src/http/ngx_http_spdy_module.c b/src/http/ngx_http_spdy_module.c
deleted file mode 100644
index 5178a36..0000000
--- a/src/http/ngx_http_spdy_module.c
+++ /dev/null
@@ -1,408 +0,0 @@
-
-/*
- * Copyright (C) Nginx, Inc.
- * Copyright (C) Valentin V. Bartenev
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <ngx_http_spdy_module.h>
-
-
-static ngx_int_t ngx_http_spdy_add_variables(ngx_conf_t *cf);
-
-static ngx_int_t ngx_http_spdy_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-static ngx_int_t ngx_http_spdy_request_priority_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-
-static ngx_int_t ngx_http_spdy_module_init(ngx_cycle_t *cycle);
-
-static void *ngx_http_spdy_create_main_conf(ngx_conf_t *cf);
-static char *ngx_http_spdy_init_main_conf(ngx_conf_t *cf, void *conf);
-static void *ngx_http_spdy_create_srv_conf(ngx_conf_t *cf);
-static char *ngx_http_spdy_merge_srv_conf(ngx_conf_t *cf, void *parent,
-    void *child);
-static void *ngx_http_spdy_create_loc_conf(ngx_conf_t *cf);
-static char *ngx_http_spdy_merge_loc_conf(ngx_conf_t *cf, void *parent,
-    void *child);
-
-static char *ngx_http_spdy_recv_buffer_size(ngx_conf_t *cf, void *post,
-    void *data);
-static char *ngx_http_spdy_pool_size(ngx_conf_t *cf, void *post, void *data);
-static char *ngx_http_spdy_streams_index_mask(ngx_conf_t *cf, void *post,
-    void *data);
-static char *ngx_http_spdy_chunk_size(ngx_conf_t *cf, void *post, void *data);
-
-
-static ngx_conf_num_bounds_t  ngx_http_spdy_headers_comp_bounds = {
-    ngx_conf_check_num_bounds, 0, 9
-};
-
-static ngx_conf_post_t  ngx_http_spdy_recv_buffer_size_post =
-    { ngx_http_spdy_recv_buffer_size };
-static ngx_conf_post_t  ngx_http_spdy_pool_size_post =
-    { ngx_http_spdy_pool_size };
-static ngx_conf_post_t  ngx_http_spdy_streams_index_mask_post =
-    { ngx_http_spdy_streams_index_mask };
-static ngx_conf_post_t  ngx_http_spdy_chunk_size_post =
-    { ngx_http_spdy_chunk_size };
-
-
-static ngx_command_t  ngx_http_spdy_commands[] = {
-
-    { ngx_string("spdy_recv_buffer_size"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_spdy_main_conf_t, recv_buffer_size),
-      &ngx_http_spdy_recv_buffer_size_post },
-
-    { ngx_string("spdy_pool_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_spdy_srv_conf_t, pool_size),
-      &ngx_http_spdy_pool_size_post },
-
-    { ngx_string("spdy_max_concurrent_streams"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_spdy_srv_conf_t, concurrent_streams),
-      NULL },
-
-    { ngx_string("spdy_streams_index_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_spdy_srv_conf_t, streams_index_mask),
-      &ngx_http_spdy_streams_index_mask_post },
-
-    { ngx_string("spdy_recv_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_spdy_srv_conf_t, recv_timeout),
-      NULL },
-
-    { ngx_string("spdy_keepalive_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_spdy_srv_conf_t, keepalive_timeout),
-      NULL },
-
-    { ngx_string("spdy_headers_comp"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_spdy_srv_conf_t, headers_comp),
-      &ngx_http_spdy_headers_comp_bounds },
-
-    { ngx_string("spdy_chunk_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_spdy_loc_conf_t, chunk_size),
-      &ngx_http_spdy_chunk_size_post },
-
-      ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_http_spdy_module_ctx = {
-    ngx_http_spdy_add_variables,           /* preconfiguration */
-    NULL,                                  /* postconfiguration */
-
-    ngx_http_spdy_create_main_conf,        /* create main configuration */
-    ngx_http_spdy_init_main_conf,          /* init main configuration */
-
-    ngx_http_spdy_create_srv_conf,         /* create server configuration */
-    ngx_http_spdy_merge_srv_conf,          /* merge server configuration */
-
-    ngx_http_spdy_create_loc_conf,         /* create location configuration */
-    ngx_http_spdy_merge_loc_conf           /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_http_spdy_module = {
-    NGX_MODULE_V1,
-    &ngx_http_spdy_module_ctx,             /* module context */
-    ngx_http_spdy_commands,                /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    ngx_http_spdy_module_init,             /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_http_variable_t  ngx_http_spdy_vars[] = {
-
-    { ngx_string("spdy"), NULL,
-      ngx_http_spdy_variable, 0, 0, 0 },
-
-    { ngx_string("spdy_request_priority"), NULL,
-      ngx_http_spdy_request_priority_variable, 0, 0, 0 },
-
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
-};
-
-
-static ngx_int_t
-ngx_http_spdy_add_variables(ngx_conf_t *cf)
-{
-   ngx_http_variable_t  *var, *v;
-
-    for (v = ngx_http_spdy_vars; v->name.len; v++) {
-        var = ngx_http_add_variable(cf, &v->name, v->flags);
-        if (var == NULL) {
-            return NGX_ERROR;
-        }
-
-        var->get_handler = v->get_handler;
-        var->data = v->data;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    if (r->spdy_stream) {
-        v->len = sizeof("3.1") - 1;
-        v->valid = 1;
-        v->no_cacheable = 0;
-        v->not_found = 0;
-        v->data = (u_char *) "3.1";
-
-        return NGX_OK;
-    }
-
-    *v = ngx_http_variable_null_value;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_request_priority_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    if (r->spdy_stream) {
-        v->len = 1;
-        v->valid = 1;
-        v->no_cacheable = 0;
-        v->not_found = 0;
-
-        v->data = ngx_pnalloc(r->pool, 1);
-        if (v->data == NULL) {
-            return NGX_ERROR;
-        }
-
-        v->data[0] = '0' + (u_char) r->spdy_stream->priority;
-
-        return NGX_OK;
-    }
-
-    *v = ngx_http_variable_null_value;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_spdy_module_init(ngx_cycle_t *cycle)
-{
-    ngx_http_spdy_request_headers_init();
-
-    return NGX_OK;
-}
-
-
-static void *
-ngx_http_spdy_create_main_conf(ngx_conf_t *cf)
-{
-    ngx_http_spdy_main_conf_t  *smcf;
-
-    smcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_spdy_main_conf_t));
-    if (smcf == NULL) {
-        return NULL;
-    }
-
-    smcf->recv_buffer_size = NGX_CONF_UNSET_SIZE;
-
-    return smcf;
-}
-
-
-static char *
-ngx_http_spdy_init_main_conf(ngx_conf_t *cf, void *conf)
-{
-    ngx_http_spdy_main_conf_t *smcf = conf;
-
-    ngx_conf_init_size_value(smcf->recv_buffer_size, 256 * 1024);
-
-    return NGX_CONF_OK;
-}
-
-
-static void *
-ngx_http_spdy_create_srv_conf(ngx_conf_t *cf)
-{
-    ngx_http_spdy_srv_conf_t  *sscf;
-
-    sscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_spdy_srv_conf_t));
-    if (sscf == NULL) {
-        return NULL;
-    }
-
-    sscf->pool_size = NGX_CONF_UNSET_SIZE;
-
-    sscf->concurrent_streams = NGX_CONF_UNSET_UINT;
-    sscf->streams_index_mask = NGX_CONF_UNSET_UINT;
-
-    sscf->recv_timeout = NGX_CONF_UNSET_MSEC;
-    sscf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
-
-    sscf->headers_comp = NGX_CONF_UNSET;
-
-    return sscf;
-}
-
-
-static char *
-ngx_http_spdy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_http_spdy_srv_conf_t *prev = parent;
-    ngx_http_spdy_srv_conf_t *conf = child;
-
-    ngx_conf_merge_size_value(conf->pool_size, prev->pool_size, 4096);
-
-    ngx_conf_merge_uint_value(conf->concurrent_streams,
-                              prev->concurrent_streams, 100);
-
-    ngx_conf_merge_uint_value(conf->streams_index_mask,
-                              prev->streams_index_mask, 32 - 1);
-
-    ngx_conf_merge_msec_value(conf->recv_timeout,
-                              prev->recv_timeout, 30000);
-    ngx_conf_merge_msec_value(conf->keepalive_timeout,
-                              prev->keepalive_timeout, 180000);
-
-    ngx_conf_merge_value(conf->headers_comp, prev->headers_comp, 0);
-
-    return NGX_CONF_OK;
-}
-
-
-static void *
-ngx_http_spdy_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_http_spdy_loc_conf_t  *slcf;
-
-    slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_spdy_loc_conf_t));
-    if (slcf == NULL) {
-        return NULL;
-    }
-
-    slcf->chunk_size = NGX_CONF_UNSET_SIZE;
-
-    return slcf;
-}
-
-
-static char *
-ngx_http_spdy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_http_spdy_loc_conf_t *prev = parent;
-    ngx_http_spdy_loc_conf_t *conf = child;
-
-    ngx_conf_merge_size_value(conf->chunk_size, prev->chunk_size, 8 * 1024);
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_spdy_recv_buffer_size(ngx_conf_t *cf, void *post, void *data)
-{
-    size_t *sp = data;
-
-    if (*sp <= 2 * NGX_SPDY_STATE_BUFFER_SIZE) {
-        return "value is too small";
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_spdy_pool_size(ngx_conf_t *cf, void *post, void *data)
-{
-    size_t *sp = data;
-
-    if (*sp < NGX_MIN_POOL_SIZE) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "the pool size must be no less than %uz",
-                           NGX_MIN_POOL_SIZE);
-        return NGX_CONF_ERROR;
-    }
-
-    if (*sp % NGX_POOL_ALIGNMENT) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "the pool size must be a multiple of %uz",
-                           NGX_POOL_ALIGNMENT);
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_spdy_streams_index_mask(ngx_conf_t *cf, void *post, void *data)
-{
-    ngx_uint_t *np = data;
-
-    ngx_uint_t  mask;
-
-    mask = *np - 1;
-
-    if (*np == 0 || (*np & mask)) {
-        return "must be a power of two";
-    }
-
-    *np = mask;
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_spdy_chunk_size(ngx_conf_t *cf, void *post, void *data)
-{
-    size_t *sp = data;
-
-    if (*sp == 0) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "the spdy chunk size cannot be zero");
-        return NGX_CONF_ERROR;
-    }
-
-    if (*sp > NGX_SPDY_MAX_FRAME_SIZE) {
-        *sp = NGX_SPDY_MAX_FRAME_SIZE;
-    }
-
-    return NGX_CONF_OK;
-}
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 4b0332a..1530596 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -475,8 +475,8 @@ ngx_http_upstream_init(ngx_http_request_t *r)
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http init upstream, client timer: %d", c->read->timer_set);
 
-#if (NGX_HTTP_SPDY)
-    if (r->spdy_stream) {
+#if (NGX_HTTP_V2)
+    if (r->stream) {
         ngx_http_upstream_init_request(r);
         return;
     }
@@ -534,15 +534,24 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
 
         r->write_event_handler = ngx_http_request_empty_handler;
 
-        if (rc == NGX_DONE) {
-            return;
-        }
-
         if (rc == NGX_ERROR) {
             ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
             return;
         }
 
+        if (rc == NGX_OK) {
+            rc = ngx_http_upstream_cache_send(r, u);
+
+            if (rc == NGX_DONE) {
+                return;
+            }
+
+            if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
+                rc = NGX_DECLINED;
+                r->cached = 0;
+            }
+        }
+
         if (rc != NGX_DECLINED) {
             ngx_http_finalize_request(r, rc);
             return;
@@ -837,13 +846,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     case NGX_OK:
 
-        rc = ngx_http_upstream_cache_send(r, u);
-
-        if (rc != NGX_HTTP_UPSTREAM_INVALID_HEADER) {
-            return rc;
-        }
-
-        break;
+        return NGX_OK;
 
     case NGX_HTTP_CACHE_STALE:
 
@@ -1148,8 +1151,8 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
         return;
     }
 
-#if (NGX_HTTP_SPDY)
-    if (r->spdy_stream) {
+#if (NGX_HTTP_V2)
+    if (r->stream) {
         return;
     }
 #endif
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
new file mode 100644
index 0000000..bf07997
--- /dev/null
+++ b/src/http/v2/ngx_http_v2.c
@@ -0,0 +1,4036 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Valentin V. Bartenev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <ngx_http_v2_module.h>
+
+
+/* errors */
+#define NGX_HTTP_V2_NO_ERROR                     0x0
+#define NGX_HTTP_V2_PROTOCOL_ERROR               0x1
+#define NGX_HTTP_V2_INTERNAL_ERROR               0x2
+#define NGX_HTTP_V2_FLOW_CTRL_ERROR              0x3
+#define NGX_HTTP_V2_SETTINGS_TIMEOUT             0x4
+#define NGX_HTTP_V2_STREAM_CLOSED                0x5
+#define NGX_HTTP_V2_SIZE_ERROR                   0x6
+#define NGX_HTTP_V2_REFUSED_STREAM               0x7
+#define NGX_HTTP_V2_CANCEL                       0x8
+#define NGX_HTTP_V2_COMP_ERROR                   0x9
+#define NGX_HTTP_V2_CONNECT_ERROR                0xa
+#define NGX_HTTP_V2_ENHANCE_YOUR_CALM            0xb
+#define NGX_HTTP_V2_INADEQUATE_SECURITY          0xc
+#define NGX_HTTP_V2_HTTP_1_1_REQUIRED            0xd
+
+/* frame sizes */
+#define NGX_HTTP_V2_RST_STREAM_SIZE              4
+#define NGX_HTTP_V2_PRIORITY_SIZE                5
+#define NGX_HTTP_V2_PING_SIZE                    8
+#define NGX_HTTP_V2_GOAWAY_SIZE                  8
+#define NGX_HTTP_V2_WINDOW_UPDATE_SIZE           4
+
+#define NGX_HTTP_V2_STREAM_ID_SIZE               4
+
+#define NGX_HTTP_V2_SETTINGS_PARAM_SIZE          6
+
+/* settings fields */
+#define NGX_HTTP_V2_HEADER_TABLE_SIZE_SETTING    0x1
+#define NGX_HTTP_V2_MAX_STREAMS_SETTING          0x3
+#define NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING     0x4
+#define NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING       0x5
+
+#define NGX_HTTP_V2_FRAME_BUFFER_SIZE            24
+
+#define NGX_HTTP_V2_DEFAULT_FRAME_SIZE           (1 << 14)
+
+#define NGX_HTTP_V2_MAX_WINDOW                   ((1U << 31) - 1)
+#define NGX_HTTP_V2_DEFAULT_WINDOW               65535
+
+#define NGX_HTTP_V2_ROOT                         (void *) -1
+
+
+static void ngx_http_v2_read_handler(ngx_event_t *rev);
+static void ngx_http_v2_write_handler(ngx_event_t *wev);
+static void ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c);
+
+static u_char *ngx_http_v2_state_proxy_protocol(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_preface(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_preface_end(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_head(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_header_block(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_field_huff(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_field_raw(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_field_skip(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_header_complete(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_handle_continuation(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end, ngx_http_v2_handler_pt handler);
+static u_char *ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_rst_stream(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_settings(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_push_promise(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_ping(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_goaway(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_window_update(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_continuation(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_complete(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_skip_padded(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_skip(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_skip_headers(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+static u_char *ngx_http_v2_state_save(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end, ngx_http_v2_handler_pt handler);
+static u_char *ngx_http_v2_connection_error(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t err);
+
+static ngx_int_t ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c,
+    u_char **pos, u_char *end, ngx_uint_t prefix);
+
+static ngx_http_v2_stream_t *ngx_http_v2_create_stream(
+    ngx_http_v2_connection_t *h2c);
+static ngx_http_v2_node_t *ngx_http_v2_get_node_by_id(
+    ngx_http_v2_connection_t *h2c, ngx_uint_t sid, ngx_uint_t alloc);
+static ngx_http_v2_node_t *ngx_http_v2_get_closed_node(
+    ngx_http_v2_connection_t *h2c);
+#define ngx_http_v2_index_size(h2scf)  (h2scf->streams_index_mask + 1)
+#define ngx_http_v2_index(h2scf, sid)  ((sid >> 1) & h2scf->streams_index_mask)
+
+static ngx_int_t ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t ack);
+static ngx_int_t ngx_http_v2_settings_frame_handler(
+    ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
+static ngx_int_t ngx_http_v2_send_window_update(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t sid, size_t window);
+static ngx_int_t ngx_http_v2_send_rst_stream(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t sid, ngx_uint_t status);
+
+static ngx_http_v2_out_frame_t *ngx_http_v2_get_frame(
+    ngx_http_v2_connection_t *h2c, size_t length, ngx_uint_t type,
+    u_char flags, ngx_uint_t sid);
+static ngx_int_t ngx_http_v2_frame_handler(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_out_frame_t *frame);
+
+static ngx_int_t ngx_http_v2_validate_header(ngx_http_request_t *r,
+    ngx_http_v2_header_t *header);
+static ngx_int_t ngx_http_v2_pseudo_header(ngx_http_request_t *r,
+    ngx_http_v2_header_t *header);
+static ngx_int_t ngx_http_v2_parse_path(ngx_http_request_t *r,
+    ngx_http_v2_header_t *header);
+static ngx_int_t ngx_http_v2_parse_method(ngx_http_request_t *r,
+    ngx_http_v2_header_t *header);
+static ngx_int_t ngx_http_v2_parse_scheme(ngx_http_request_t *r,
+    ngx_http_v2_header_t *header);
+static ngx_int_t ngx_http_v2_parse_authority(ngx_http_request_t *r,
+    ngx_http_v2_header_t *header);
+static ngx_int_t ngx_http_v2_construct_request_line(ngx_http_request_t *r);
+static ngx_int_t ngx_http_v2_cookie(ngx_http_request_t *r,
+    ngx_http_v2_header_t *header);
+static ngx_int_t ngx_http_v2_construct_cookie_header(ngx_http_request_t *r);
+static void ngx_http_v2_run_request(ngx_http_request_t *r);
+static ngx_int_t ngx_http_v2_init_request_body(ngx_http_request_t *r);
+
+static ngx_int_t ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_stream_t *stream, ngx_uint_t status);
+static void ngx_http_v2_close_stream_handler(ngx_event_t *ev);
+static void ngx_http_v2_handle_connection_handler(ngx_event_t *rev);
+static void ngx_http_v2_idle_handler(ngx_event_t *rev);
+static void ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t status);
+
+static ngx_int_t ngx_http_v2_adjust_windows(ngx_http_v2_connection_t *h2c,
+    ssize_t delta);
+static void ngx_http_v2_set_dependency(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_node_t *node, ngx_uint_t depend, ngx_uint_t exclusive);
+static void ngx_http_v2_node_children_update(ngx_http_v2_node_t *node);
+
+static void ngx_http_v2_pool_cleanup(void *data);
+
+
+static ngx_http_v2_handler_pt ngx_http_v2_frame_states[] = {
+    ngx_http_v2_state_data,
+    ngx_http_v2_state_headers,
+    ngx_http_v2_state_priority,
+    ngx_http_v2_state_rst_stream,
+    ngx_http_v2_state_settings,
+    ngx_http_v2_state_push_promise,
+    ngx_http_v2_state_ping,
+    ngx_http_v2_state_goaway,
+    ngx_http_v2_state_window_update,
+    ngx_http_v2_state_continuation
+};
+
+#define NGX_HTTP_V2_FRAME_STATES                                              \
+    (sizeof(ngx_http_v2_frame_states) / sizeof(ngx_http_v2_handler_pt))
+
+
+void
+ngx_http_v2_init(ngx_event_t *rev)
+{
+    ngx_connection_t          *c;
+    ngx_pool_cleanup_t        *cln;
+    ngx_http_connection_t     *hc;
+    ngx_http_v2_srv_conf_t    *h2scf;
+    ngx_http_v2_main_conf_t   *h2mcf;
+    ngx_http_v2_connection_t  *h2c;
+
+    c = rev->data;
+    hc = c->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "init http2 connection");
+
+    c->log->action = "processing HTTP/2 connection";
+
+    h2mcf = ngx_http_get_module_main_conf(hc->conf_ctx, ngx_http_v2_module);
+
+    if (h2mcf->recv_buffer == NULL) {
+        h2mcf->recv_buffer = ngx_palloc(ngx_cycle->pool,
+                                        h2mcf->recv_buffer_size);
+        if (h2mcf->recv_buffer == NULL) {
+            ngx_http_close_connection(c);
+            return;
+        }
+    }
+
+    h2c = ngx_pcalloc(c->pool, sizeof(ngx_http_v2_connection_t));
+    if (h2c == NULL) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    h2c->connection = c;
+    h2c->http_connection = hc;
+
+    h2c->send_window = NGX_HTTP_V2_DEFAULT_WINDOW;
+    h2c->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+
+    h2c->init_window = NGX_HTTP_V2_DEFAULT_WINDOW;
+
+    h2c->frame_size = NGX_HTTP_V2_DEFAULT_FRAME_SIZE;
+
+    h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
+
+    h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
+    if (h2c->pool == NULL) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    cln = ngx_pool_cleanup_add(c->pool, sizeof(ngx_pool_cleanup_file_t));
+    if (cln == NULL) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    cln->handler = ngx_http_v2_pool_cleanup;
+    cln->data = h2c;
+
+    h2c->streams_index = ngx_pcalloc(c->pool, ngx_http_v2_index_size(h2scf)
+                                              * sizeof(ngx_http_v2_node_t *));
+    if (h2c->streams_index == NULL) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    if (ngx_http_v2_send_settings(h2c, 0) == NGX_ERROR) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    if (ngx_http_v2_send_window_update(h2c, 0, NGX_HTTP_V2_MAX_WINDOW
+                                               - NGX_HTTP_V2_DEFAULT_WINDOW)
+        == NGX_ERROR)
+    {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    h2c->state.handler = hc->proxy_protocol ? ngx_http_v2_state_proxy_protocol
+                                            : ngx_http_v2_state_preface;
+
+    ngx_queue_init(&h2c->waiting);
+    ngx_queue_init(&h2c->posted);
+    ngx_queue_init(&h2c->dependencies);
+    ngx_queue_init(&h2c->closed);
+
+    c->data = h2c;
+
+    rev->handler = ngx_http_v2_read_handler;
+    c->write->handler = ngx_http_v2_write_handler;
+
+    ngx_http_v2_read_handler(rev);
+}
+
+
+static void
+ngx_http_v2_read_handler(ngx_event_t *rev)
+{
+    u_char                    *p, *end;
+    size_t                     available;
+    ssize_t                    n;
+    ngx_connection_t          *c;
+    ngx_http_v2_main_conf_t   *h2mcf;
+    ngx_http_v2_connection_t  *h2c;
+
+    c = rev->data;
+    h2c = c->data;
+
+    if (rev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
+        ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");
+
+    h2c->blocked = 1;
+
+    h2mcf = ngx_http_get_module_main_conf(h2c->http_connection->conf_ctx,
+                                          ngx_http_v2_module);
+
+    available = h2mcf->recv_buffer_size - 2 * NGX_HTTP_V2_STATE_BUFFER_SIZE;
+
+    do {
+        p = h2mcf->recv_buffer;
+
+        ngx_memcpy(p, h2c->state.buffer, NGX_HTTP_V2_STATE_BUFFER_SIZE);
+        end = p + h2c->state.buffer_used;
+
+        n = c->recv(c, end, available);
+
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
+        if (n == 0 && (h2c->state.incomplete || h2c->processing)) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "client prematurely closed connection");
+        }
+
+        if (n == 0 || n == NGX_ERROR) {
+            c->error = 1;
+            ngx_http_v2_finalize_connection(h2c, 0);
+            return;
+        }
+
+        end += n;
+
+        h2c->state.buffer_used = 0;
+        h2c->state.incomplete = 0;
+
+        do {
+            p = h2c->state.handler(h2c, p, end);
+
+            if (p == NULL) {
+                return;
+            }
+
+        } while (p != end);
+
+    } while (rev->ready);
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+        return;
+    }
+
+    if (h2c->last_out && ngx_http_v2_send_output_queue(h2c) == NGX_ERROR) {
+        ngx_http_v2_finalize_connection(h2c, 0);
+        return;
+    }
+
+    h2c->blocked = 0;
+
+    if (h2c->processing) {
+        if (rev->timer_set) {
+            ngx_del_timer(rev);
+        }
+
+        return;
+    }
+
+    ngx_http_v2_handle_connection(h2c);
+}
+
+
+static void
+ngx_http_v2_write_handler(ngx_event_t *wev)
+{
+    ngx_int_t                  rc;
+    ngx_queue_t               *q;
+    ngx_connection_t          *c;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_connection_t  *h2c;
+
+    c = wev->data;
+    h2c = c->data;
+
+    if (wev->timedout) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http2 write event timed out");
+        c->error = 1;
+        ngx_http_v2_finalize_connection(h2c, 0);
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 write handler");
+
+    h2c->blocked = 1;
+
+    rc = ngx_http_v2_send_output_queue(h2c);
+
+    if (rc == NGX_ERROR) {
+        ngx_http_v2_finalize_connection(h2c, 0);
+        return;
+    }
+
+    while (!ngx_queue_empty(&h2c->posted)) {
+        q = ngx_queue_head(&h2c->posted);
+
+        ngx_queue_remove(q);
+
+        stream = ngx_queue_data(q, ngx_http_v2_stream_t, queue);
+
+        stream->handled = 0;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "run http2 stream %ui", stream->node->id);
+
+        wev = stream->request->connection->write;
+        wev->handler(wev);
+    }
+
+    h2c->blocked = 0;
+
+    if (rc == NGX_AGAIN) {
+        return;
+    }
+
+    ngx_http_v2_handle_connection(h2c);
+}
+
+
+ngx_int_t
+ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
+{
+    int                        tcp_nodelay;
+    ngx_chain_t               *cl;
+    ngx_event_t               *wev;
+    ngx_connection_t          *c;
+    ngx_http_v2_out_frame_t   *out, *frame, *fn;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    c = h2c->connection;
+
+    if (c->error) {
+        return NGX_ERROR;
+    }
+
+    wev = c->write;
+
+    if (!wev->ready) {
+        return NGX_OK;
+    }
+
+    cl = NULL;
+    out = NULL;
+
+    for (frame = h2c->last_out; frame; frame = fn) {
+        frame->last->next = cl;
+        cl = frame->first;
+
+        fn = frame->next;
+        frame->next = out;
+        out = frame;
+
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http2 frame out: %p sid:%ui bl:%d len:%uz",
+                       out, out->stream ? out->stream->node->id : 0,
+                       out->blocked, out->length);
+    }
+
+    cl = c->send_chain(c, cl, 0);
+
+    if (cl == NGX_CHAIN_ERROR) {
+        goto error;
+    }
+
+    clcf = ngx_http_get_module_loc_conf(h2c->http_connection->conf_ctx,
+                                        ngx_http_core_module);
+
+    if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
+        goto error;
+    }
+
+    if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
+        if (ngx_tcp_push(c->fd) == -1) {
+            ngx_connection_error(c, ngx_socket_errno, ngx_tcp_push_n " failed");
+            goto error;
+        }
+
+        c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
+        tcp_nodelay = ngx_tcp_nodelay_and_tcp_nopush ? 1 : 0;
+
+    } else {
+        tcp_nodelay = 1;
+    }
+
+    if (tcp_nodelay
+        && clcf->tcp_nodelay
+        && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
+    {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
+
+        if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
+                       (const void *) &tcp_nodelay, sizeof(int))
+            == -1)
+        {
+#if (NGX_SOLARIS)
+            /* Solaris returns EINVAL if a socket has been shut down */
+            c->log_error = NGX_ERROR_IGNORE_EINVAL;
+#endif
+
+            ngx_connection_error(c, ngx_socket_errno,
+                                 "setsockopt(TCP_NODELAY) failed");
+
+            c->log_error = NGX_ERROR_INFO;
+            goto error;
+        }
+
+        c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+    }
+
+    if (cl) {
+        ngx_add_timer(wev, clcf->send_timeout);
+
+    } else {
+        if (wev->timer_set) {
+            ngx_del_timer(wev);
+        }
+    }
+
+    for ( /* void */ ; out; out = fn) {
+        fn = out->next;
+
+        if (out->handler(h2c, out) != NGX_OK) {
+            out->blocked = 1;
+            break;
+        }
+
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http2 frame sent: %p sid:%ui bl:%d len:%uz",
+                       out, out->stream ? out->stream->node->id : 0,
+                       out->blocked, out->length);
+    }
+
+    frame = NULL;
+
+    for ( /* void */ ; out; out = fn) {
+        fn = out->next;
+        out->next = frame;
+        frame = out;
+    }
+
+    h2c->last_out = frame;
+
+    return NGX_OK;
+
+error:
+
+    c->error = 1;
+
+    if (!h2c->blocked) {
+        ngx_post_event(wev, &ngx_posted_events);
+    }
+
+    return NGX_ERROR;
+}
+
+
+static void
+ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
+{
+    ngx_connection_t          *c;
+    ngx_http_v2_srv_conf_t  *h2scf;
+
+    if (h2c->last_out || h2c->processing) {
+        return;
+    }
+
+    c = h2c->connection;
+
+    if (c->error) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    if (c->buffered) {
+        return;
+    }
+
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+    if (h2c->state.incomplete) {
+        ngx_add_timer(c->read, h2scf->recv_timeout);
+        return;
+    }
+
+    if (ngx_terminate || ngx_exiting) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    ngx_destroy_pool(h2c->pool);
+
+    h2c->pool = NULL;
+    h2c->free_frames = NULL;
+    h2c->free_fake_connections = NULL;
+
+#if (NGX_HTTP_SSL)
+    if (c->ssl) {
+        ngx_ssl_free_buffer(c);
+    }
+#endif
+
+    c->destroyed = 1;
+    c->idle = 1;
+    ngx_reusable_connection(c, 1);
+
+    c->write->handler = ngx_http_empty_handler;
+    c->read->handler = ngx_http_v2_idle_handler;
+
+    if (c->write->timer_set) {
+        ngx_del_timer(c->write);
+    }
+
+    ngx_add_timer(c->read, h2scf->idle_timeout);
+}
+
+
+static u_char *
+ngx_http_v2_state_proxy_protocol(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    ngx_log_t  *log;
+
+    log = h2c->connection->log;
+    log->action = "reading PROXY protocol";
+
+    pos = ngx_proxy_protocol_read(h2c->connection, pos, end);
+
+    log->action = "processing HTTP/2 connection";
+
+    if (pos == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
+    return ngx_http_v2_state_preface(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_preface(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    static const u_char preface[] = "PRI * HTTP/2.0\r\n";
+
+    if ((size_t) (end - pos) < sizeof(preface) - 1) {
+        return ngx_http_v2_state_save(h2c, pos, end, ngx_http_v2_state_preface);
+    }
+
+    if (ngx_memcmp(pos, preface, sizeof(preface) - 1) != 0) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "invalid http2 connection preface \"%*s\"",
+                       sizeof(preface) - 1, pos);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
+    return ngx_http_v2_state_preface_end(h2c, pos + sizeof(preface) - 1, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_preface_end(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    static const u_char preface[] = "\r\nSM\r\n\r\n";
+
+    if ((size_t) (end - pos) < sizeof(preface) - 1) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_preface_end);
+    }
+
+    if (ngx_memcmp(pos, preface, sizeof(preface) - 1) != 0) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "invalid http2 connection preface \"%*s\"",
+                       sizeof(preface) - 1, pos);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 preface verified");
+
+    return ngx_http_v2_state_head(h2c, pos + sizeof(preface) - 1, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_head(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
+{
+    uint32_t    head;
+    ngx_uint_t  type;
+
+    if (end - pos < NGX_HTTP_V2_FRAME_HEADER_SIZE) {
+        return ngx_http_v2_state_save(h2c, pos, end, ngx_http_v2_state_head);
+    }
+
+    head = ngx_http_v2_parse_uint32(pos);
+
+    h2c->state.length = ngx_http_v2_parse_length(head);
+    h2c->state.flags = pos[4];
+
+    h2c->state.sid = ngx_http_v2_parse_sid(&pos[5]);
+
+    pos += NGX_HTTP_V2_FRAME_HEADER_SIZE;
+
+    type = ngx_http_v2_parse_type(head);
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "process http2 frame type:%ui f:%Xd l:%uz sid:%ui",
+                   type, h2c->state.flags, h2c->state.length, h2c->state.sid);
+
+    if (type >= NGX_HTTP_V2_FRAME_STATES) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "http2 frame with unknown type %ui", type);
+        return ngx_http_v2_state_skip(h2c, pos, end);
+    }
+
+    return ngx_http_v2_frame_states[type](h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
+{
+    ngx_http_v2_node_t    *node;
+    ngx_http_v2_stream_t  *stream;
+
+    if (h2c->state.flags & NGX_HTTP_V2_PADDED_FLAG) {
+
+        if (h2c->state.length == 0) {
+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                          "client sent padded DATA frame "
+                          "with incorrect length: %uz",
+                          h2c->state.length);
+
+            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+        }
+
+        if (end - pos == 0) {
+            return ngx_http_v2_state_save(h2c, pos, end,
+                                          ngx_http_v2_state_data);
+        }
+
+        h2c->state.padding = *pos++;
+        h2c->state.length--;
+
+        if (h2c->state.padding > h2c->state.length) {
+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                          "client sent padded DATA frame "
+                          "with incorrect length: %uz, padding: %uz",
+                          h2c->state.length, h2c->state.padding);
+
+            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+        }
+
+        h2c->state.length -= h2c->state.padding;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 DATA frame");
+
+    if (h2c->state.length > h2c->recv_window) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client violated connection flow control: "
+                      "received DATA frame length %uz, available window %uz",
+                      h2c->state.length, h2c->recv_window);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_FLOW_CTRL_ERROR);
+    }
+
+    h2c->recv_window -= h2c->state.length;
+
+    if (h2c->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4) {
+
+        if (ngx_http_v2_send_window_update(h2c, 0, NGX_HTTP_V2_MAX_WINDOW
+                                                   - h2c->recv_window)
+            == NGX_ERROR)
+        {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        h2c->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+    }
+
+    node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 0);
+
+    if (node == NULL || node->stream == NULL) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "unknown http2 stream");
+
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
+    stream = node->stream;
+
+    if (h2c->state.length > stream->recv_window) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client violated flow control for stream %ui: "
+                      "received DATA frame length %uz, available window %uz",
+                      node->id, h2c->state.length, stream->recv_window);
+
+        if (ngx_http_v2_terminate_stream(h2c, stream,
+                                         NGX_HTTP_V2_FLOW_CTRL_ERROR)
+            == NGX_ERROR)
+        {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
+    stream->recv_window -= h2c->state.length;
+
+    if (stream->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4) {
+
+        if (ngx_http_v2_send_window_update(h2c, node->id,
+                                           NGX_HTTP_V2_MAX_WINDOW
+                                           - stream->recv_window)
+            == NGX_ERROR)
+        {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+    }
+
+    if (stream->in_closed) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent DATA frame for half-closed stream %ui",
+                      node->id);
+
+        if (ngx_http_v2_terminate_stream(h2c, stream,
+                                         NGX_HTTP_V2_STREAM_CLOSED)
+            == NGX_ERROR)
+        {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
+    h2c->state.stream = stream;
+
+    return ngx_http_v2_state_read_data(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    size_t                     size;
+    ssize_t                    n;
+    ngx_buf_t                 *buf;
+    ngx_int_t                  rc;
+    ngx_temp_file_t           *tf;
+    ngx_http_request_t        *r;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_request_body_t   *rb;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    stream = h2c->state.stream;
+
+    if (stream == NULL) {
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
+    if (stream->skip_data) {
+        stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "skipping http2 DATA frame, reason: %d",
+                       stream->skip_data);
+
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
+    size = end - pos;
+
+    if (size > h2c->state.length) {
+        size = h2c->state.length;
+    }
+
+    r = stream->request;
+
+    if (r->request_body == NULL
+        && ngx_http_v2_init_request_body(r) != NGX_OK)
+    {
+        stream->skip_data = NGX_HTTP_V2_DATA_INTERNAL_ERROR;
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
+    rb = r->request_body;
+    tf = rb->temp_file;
+    buf = rb->buf;
+
+    if (size) {
+        rb->rest += size;
+
+        if (r->headers_in.content_length_n != -1
+            && r->headers_in.content_length_n < rb->rest)
+        {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client intended to send body data "
+                          "larger than declared");
+
+            stream->skip_data = NGX_HTTP_V2_DATA_ERROR;
+            goto error;
+
+        } else {
+            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+            if (clcf->client_max_body_size
+                && clcf->client_max_body_size < rb->rest)
+            {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "client intended to send "
+                              "too large chunked body: %O bytes", rb->rest);
+
+                stream->skip_data = NGX_HTTP_V2_DATA_ERROR;
+                goto error;
+            }
+        }
+
+        h2c->state.length -= size;
+
+        if (tf) {
+            buf->start = pos;
+            buf->pos = pos;
+
+            pos += size;
+
+            buf->end = pos;
+            buf->last = pos;
+
+            n = ngx_write_chain_to_temp_file(tf, rb->bufs);
+
+            /* TODO: n == 0 or not complete and level event */
+
+            if (n == NGX_ERROR) {
+                stream->skip_data = NGX_HTTP_V2_DATA_INTERNAL_ERROR;
+                goto error;
+            }
+
+            tf->offset += n;
+
+        } else {
+            buf->last = ngx_cpymem(buf->last, pos, size);
+            pos += size;
+        }
+
+        r->request_length += size;
+    }
+
+    if (h2c->state.length) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_read_data);
+    }
+
+    if (h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG) {
+        stream->in_closed = 1;
+
+        if (r->headers_in.content_length_n < 0) {
+            r->headers_in.content_length_n = rb->rest;
+
+        } else if (r->headers_in.content_length_n != rb->rest) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client prematurely closed stream: "
+                          "only %O out of %O bytes of request body received",
+                          rb->rest, r->headers_in.content_length_n);
+
+            stream->skip_data = NGX_HTTP_V2_DATA_ERROR;
+            goto error;
+        }
+
+        if (tf) {
+            ngx_memzero(buf, sizeof(ngx_buf_t));
+
+            buf->in_file = 1;
+            buf->file_last = tf->file.offset;
+            buf->file = &tf->file;
+
+            rb->buf = NULL;
+        }
+
+        if (rb->post_handler) {
+            r->read_event_handler = ngx_http_block_reading;
+            rb->post_handler(r);
+        }
+    }
+
+    if (h2c->state.padding) {
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
+    return ngx_http_v2_state_complete(h2c, pos, end);
+
+error:
+
+    if (rb->post_handler) {
+
+        if (stream->skip_data == NGX_HTTP_V2_DATA_ERROR) {
+            rc = (r->headers_in.content_length_n == -1)
+                 ? NGX_HTTP_REQUEST_ENTITY_TOO_LARGE : NGX_HTTP_BAD_REQUEST;
+
+        } else {
+            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        ngx_http_finalize_request(r, rc);
+    }
+
+    return ngx_http_v2_state_skip_padded(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    size_t                   size;
+    ngx_uint_t               padded, priority, depend, dependency, excl, weight;
+    ngx_http_v2_node_t      *node;
+    ngx_http_v2_stream_t    *stream;
+    ngx_http_v2_srv_conf_t  *h2scf;
+
+    padded = h2c->state.flags & NGX_HTTP_V2_PADDED_FLAG;
+    priority = h2c->state.flags & NGX_HTTP_V2_PRIORITY_FLAG;
+
+    size = 0;
+
+    if (padded) {
+        size++;
+    }
+
+    if (priority) {
+        size += sizeof(uint32_t) + 1;
+    }
+
+    if (h2c->state.length < size) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent HEADERS frame with incorrect length %uz",
+                      h2c->state.length);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    if (h2c->state.length == size) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent HEADERS frame with empty header block");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    if ((size_t) (end - pos) < size) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_headers);
+    }
+
+    h2c->state.length -= size;
+
+    if (padded) {
+        h2c->state.padding = *pos++;
+
+        if (h2c->state.padding > h2c->state.length) {
+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                          "client sent padded HEADERS frame "
+                          "with incorrect length: %uz, padding: %uz",
+                          h2c->state.length, h2c->state.padding);
+
+            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+        }
+
+        h2c->state.length -= h2c->state.padding;
+    }
+
+    depend = 0;
+    excl = 0;
+    weight = 16;
+
+    if (priority) {
+        dependency = ngx_http_v2_parse_uint32(pos);
+
+        depend = dependency & 0x7fffffff;
+        excl = dependency >> 31;
+        weight = pos[4] + 1;
+
+        pos += sizeof(uint32_t) + 1;
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 HEADERS frame sid:%ui on %ui excl:%ui weight:%ui",
+                   h2c->state.sid, depend, excl, weight);
+
+    if (h2c->state.sid % 2 == 0 || h2c->state.sid <= h2c->last_sid) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent HEADERS frame with incorrect identifier "
+                      "%ui, the last was %ui", h2c->state.sid, h2c->last_sid);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
+    h2c->last_sid = h2c->state.sid;
+
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+
+    h2c->state.header_limit = h2scf->max_header_size;
+
+    if (h2c->processing >= h2scf->concurrent_streams) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "concurrent streams exceeded %ui", h2c->processing);
+
+        if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid,
+                                        NGX_HTTP_V2_REFUSED_STREAM)
+            != NGX_OK)
+        {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        return ngx_http_v2_state_skip_headers(h2c, pos, end);
+    }
+
+    node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 1);
+
+    if (node == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    if (node->parent) {
+        ngx_queue_remove(&node->reuse);
+        h2c->closed_nodes--;
+    }
+
+    stream = ngx_http_v2_create_stream(h2c);
+    if (stream == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
+    stream->node = node;
+
+    node->stream = stream;
+
+    h2c->state.stream = stream;
+    h2c->state.pool = stream->request->pool;
+
+    if (priority || node->parent == NULL) {
+        node->weight = weight;
+        ngx_http_v2_set_dependency(h2c, node, depend, excl);
+    }
+
+    return ngx_http_v2_state_header_block(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_header_block(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    u_char                   ch;
+    ngx_int_t                value;
+    ngx_uint_t               indexed, size_update, prefix;
+    ngx_http_v2_srv_conf_t  *h2scf;
+
+    if (end - pos < 1) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_header_block);
+    }
+
+    if (!(h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG)
+        && h2c->state.length < NGX_HTTP_V2_INT_OCTETS)
+    {
+        return ngx_http_v2_handle_continuation(h2c, pos, end,
+                                               ngx_http_v2_state_header_block);
+    }
+
+    size_update = 0;
+    indexed = 0;
+
+    ch = *pos;
+
+    if (ch >= (1 << 7)) {
+        /* indexed header field */
+        indexed = 1;
+        prefix = ngx_http_v2_prefix(7);
+
+    } else if (ch >= (1 << 6)) {
+        /* literal header field with incremental indexing */
+        h2c->state.index = 1;
+        prefix = ngx_http_v2_prefix(6);
+
+    } else if (ch >= (1 << 5)) {
+        /* dynamic table size update */
+        size_update = 1;
+        prefix = ngx_http_v2_prefix(5);
+
+    } else if (ch >= (1 << 4)) {
+        /* literal header field never indexed */
+        prefix = ngx_http_v2_prefix(4);
+
+    } else {
+        /* literal header field without indexing */
+        prefix = ngx_http_v2_prefix(3);
+    }
+
+    value = ngx_http_v2_parse_int(h2c, &pos, end, prefix);
+
+    if (value < 0) {
+        if (value == NGX_AGAIN) {
+            return ngx_http_v2_state_save(h2c, pos, end,
+                                          ngx_http_v2_state_header_block);
+        }
+
+        if (value == NGX_DECLINED) {
+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                          "client sent header block with too long %s value",
+                          size_update ? "size update" : "header index");
+
+            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_COMP_ERROR);
+        }
+
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent header block with incorrect length");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    if (indexed) {
+        if (ngx_http_v2_get_indexed_header(h2c, value, 0) != NGX_OK) {
+            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_COMP_ERROR);
+        }
+
+        return ngx_http_v2_state_process_header(h2c, pos, end);
+    }
+
+    if (size_update) {
+        if (ngx_http_v2_table_size(h2c, value) != NGX_OK) {
+            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_COMP_ERROR);
+        }
+
+        return ngx_http_v2_state_header_complete(h2c, pos, end);
+    }
+
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+
+    h2c->state.field_limit = h2scf->max_field_size;
+
+    if (value == 0) {
+        h2c->state.parse_name = 1;
+
+    } else {
+        if (ngx_http_v2_get_indexed_header(h2c, value, 1) != NGX_OK) {
+            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_COMP_ERROR);
+        }
+
+        h2c->state.field_limit -= h2c->state.header.name.len;
+    }
+
+    h2c->state.parse_value = 1;
+
+    return ngx_http_v2_state_field_len(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    size_t      alloc;
+    ngx_int_t   len;
+    ngx_uint_t  huff;
+
+    if (!(h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG)
+        && h2c->state.length < NGX_HTTP_V2_INT_OCTETS)
+    {
+        return ngx_http_v2_handle_continuation(h2c, pos, end,
+                                               ngx_http_v2_state_field_len);
+    }
+
+    if (h2c->state.length < 1) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent header block with incorrect length");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    if (end - pos < 1) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_field_len);
+    }
+
+    huff = *pos >> 7;
+    len = ngx_http_v2_parse_int(h2c, &pos, end, ngx_http_v2_prefix(7));
+
+    if (len < 0) {
+        if (len == NGX_AGAIN) {
+            return ngx_http_v2_state_save(h2c, pos, end,
+                                          ngx_http_v2_state_field_len);
+        }
+
+        if (len == NGX_DECLINED) {
+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                        "client sent header field with too long length value");
+
+            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_COMP_ERROR);
+        }
+
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent header block with incorrect length");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 hpack %s string length: %i",
+                   huff ? "encoded" : "raw", len);
+
+    if ((size_t) len > h2c->state.field_limit) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client exceeded http2_max_field_size limit");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
+    }
+
+    h2c->state.field_limit -= len;
+    h2c->state.field_rest = len;
+
+    if (h2c->state.stream == NULL && !h2c->state.index) {
+        return ngx_http_v2_state_field_skip(h2c, pos, end);
+    }
+
+    alloc = (huff ? len * 8 / 5 : len) + 1;
+
+    h2c->state.field_start = ngx_pnalloc(h2c->state.pool, alloc);
+    if (h2c->state.field_start == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    h2c->state.field_end = h2c->state.field_start;
+
+    if (huff) {
+        return ngx_http_v2_state_field_huff(h2c, pos, end);
+    }
+
+    return ngx_http_v2_state_field_raw(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_field_huff(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    size_t  size;
+
+    size = end - pos;
+
+    if (size > h2c->state.field_rest) {
+        size = h2c->state.field_rest;
+    }
+
+    if (size > h2c->state.length) {
+        size = h2c->state.length;
+    }
+
+    h2c->state.length -= size;
+    h2c->state.field_rest -= size;
+
+    if (ngx_http_v2_huff_decode(&h2c->state.field_state, pos, size,
+                                &h2c->state.field_end,
+                                h2c->state.field_rest == 0,
+                                h2c->connection->log)
+        != NGX_OK)
+    {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent invalid encoded header field");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_COMP_ERROR);
+    }
+
+    pos += size;
+
+    if (h2c->state.field_rest == 0) {
+        *h2c->state.field_end = '\0';
+        return ngx_http_v2_state_process_header(h2c, pos, end);
+    }
+
+    if (h2c->state.length) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_field_huff);
+    }
+
+    if (h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent header field with incorrect length");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    return ngx_http_v2_handle_continuation(h2c, pos, end,
+                                           ngx_http_v2_state_field_huff);
+}
+
+
+static u_char *
+ngx_http_v2_state_field_raw(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    size_t  size;
+
+    size = end - pos;
+
+    if (size > h2c->state.field_rest) {
+        size = h2c->state.field_rest;
+    }
+
+    if (size > h2c->state.length) {
+        size = h2c->state.length;
+    }
+
+    h2c->state.length -= size;
+    h2c->state.field_rest -= size;
+
+    h2c->state.field_end = ngx_cpymem(h2c->state.field_end, pos, size);
+
+    pos += size;
+
+    if (h2c->state.field_rest == 0) {
+        *h2c->state.field_end = '\0';
+        return ngx_http_v2_state_process_header(h2c, pos, end);
+    }
+
+    if (h2c->state.length) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_field_raw);
+    }
+
+    if (h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent header field with incorrect length");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    return ngx_http_v2_handle_continuation(h2c, pos, end,
+                                           ngx_http_v2_state_field_raw);
+}
+
+
+static u_char *
+ngx_http_v2_state_field_skip(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    size_t  size;
+
+    size = end - pos;
+
+    if (size > h2c->state.field_rest) {
+        size = h2c->state.field_rest;
+    }
+
+    if (size > h2c->state.length) {
+        size = h2c->state.length;
+    }
+
+    h2c->state.length -= size;
+    h2c->state.field_rest -= size;
+
+    pos += size;
+
+    if (h2c->state.field_rest == 0) {
+        return ngx_http_v2_state_process_header(h2c, pos, end);
+    }
+
+    if (h2c->state.length) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_field_skip);
+    }
+
+    if (h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent header field with incorrect length");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    return ngx_http_v2_handle_continuation(h2c, pos, end,
+                                           ngx_http_v2_state_field_skip);
+}
+
+
+static u_char *
+ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    size_t                      len;
+    ngx_int_t                   rc;
+    ngx_table_elt_t            *h;
+    ngx_http_header_t          *hh;
+    ngx_http_request_t         *r;
+    ngx_http_v2_header_t       *header;
+    ngx_http_core_srv_conf_t   *cscf;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    static ngx_str_t cookie = ngx_string("cookie");
+
+    header = &h2c->state.header;
+
+    if (h2c->state.parse_name) {
+        h2c->state.parse_name = 0;
+
+        header->name.len = h2c->state.field_end - h2c->state.field_start;
+        header->name.data = h2c->state.field_start;
+
+        return ngx_http_v2_state_field_len(h2c, pos, end);
+    }
+
+    if (h2c->state.parse_value) {
+        h2c->state.parse_value = 0;
+
+        header->value.len = h2c->state.field_end - h2c->state.field_start;
+        header->value.data = h2c->state.field_start;
+    }
+
+    len = header->name.len + header->value.len;
+
+    if (len > h2c->state.header_limit) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client exceeded http2_max_header_size limit");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
+    }
+
+    h2c->state.header_limit -= len;
+
+    if (h2c->state.index) {
+        if (ngx_http_v2_add_header(h2c, header) != NGX_OK) {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        h2c->state.index = 0;
+    }
+
+    if (h2c->state.stream == NULL) {
+        return ngx_http_v2_state_header_complete(h2c, pos, end);
+    }
+
+    r = h2c->state.stream->request;
+
+    /* TODO Optimization: validate headers while parsing. */
+    if (ngx_http_v2_validate_header(r, header) != NGX_OK) {
+        if (ngx_http_v2_terminate_stream(h2c, h2c->state.stream,
+                                         NGX_HTTP_V2_PROTOCOL_ERROR)
+            == NGX_ERROR)
+        {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        goto error;
+    }
+
+    if (header->name.data[0] == ':') {
+        rc = ngx_http_v2_pseudo_header(r, header);
+
+        if (rc == NGX_OK) {
+            return ngx_http_v2_state_header_complete(h2c, pos, end);
+        }
+
+        if (rc == NGX_ABORT) {
+            goto error;
+        }
+
+        if (rc == NGX_DECLINED) {
+            if (ngx_http_v2_terminate_stream(h2c, h2c->state.stream,
+                                             NGX_HTTP_V2_PROTOCOL_ERROR)
+                == NGX_ERROR)
+            {
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_INTERNAL_ERROR);
+            }
+
+            goto error;
+        }
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    if (r->invalid_header) {
+        cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+        if (cscf->ignore_invalid_headers) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent invalid header: \"%V\"", &header->name);
+
+            return ngx_http_v2_state_header_complete(h2c, pos, end);
+        }
+    }
+
+    if (header->name.len == cookie.len
+        && ngx_memcmp(header->name.data, cookie.data, cookie.len) == 0)
+    {
+        if (ngx_http_v2_cookie(r, header) != NGX_OK) {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        return ngx_http_v2_state_header_complete(h2c, pos, end);
+    }
+
+    h = ngx_list_push(&r->headers_in.headers);
+    if (h == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    h->key.len = header->name.len;
+    h->key.data = header->name.data;
+
+    /* TODO Optimization: precalculate hash and hadnler for indexed headers. */
+    h->hash = ngx_hash_key(h->key.data, h->key.len);
+
+    h->value.len = header->value.len;
+    h->value.data = header->value.data;
+
+    h->lowcase_key = h->key.data;
+
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+    hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
+                       h->lowcase_key, h->key.len);
+
+    if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
+        goto error;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http2 http header: \"%V: %V\"", &h->key, &h->value);
+
+    return ngx_http_v2_state_header_complete(h2c, pos, end);
+
+error:
+
+    h2c->state.stream = NULL;
+    h2c->state.pool = NULL;
+
+    return ngx_http_v2_state_header_complete(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_header_complete(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    ngx_http_v2_stream_t  *stream;
+
+    if (h2c->state.length) {
+        h2c->state.handler = h2c->state.pool ? ngx_http_v2_state_header_block
+                                             : ngx_http_v2_state_skip_headers;
+        return pos;
+    }
+
+    if (!(h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG)) {
+        return ngx_http_v2_handle_continuation(h2c, pos, end,
+                                             ngx_http_v2_state_header_complete);
+    }
+
+    stream = h2c->state.stream;
+
+    if (stream) {
+        ngx_http_v2_run_request(stream->request);
+
+    } else if (h2c->state.pool) {
+        ngx_destroy_pool(h2c->state.pool);
+    }
+
+    h2c->state.pool = NULL;
+
+    if (h2c->state.padding) {
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
+    return ngx_http_v2_state_complete(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_handle_continuation(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end, ngx_http_v2_handler_pt handler)
+{
+    u_char    *p;
+    size_t     len;
+    uint32_t   head;
+
+    len = h2c->state.length;
+
+    if ((size_t) (end - pos) < len + NGX_HTTP_V2_FRAME_HEADER_SIZE) {
+        return ngx_http_v2_state_save(h2c, pos, end, handler);
+    }
+
+    p = pos + len;
+
+    head = ngx_http_v2_parse_uint32(p);
+
+    if (ngx_http_v2_parse_type(head) != NGX_HTTP_V2_CONTINUATION_FRAME) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+             "client sent inappropriate frame while CONTINUATION was expected");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
+    h2c->state.length += ngx_http_v2_parse_length(head);
+    h2c->state.flags |= p[4];
+
+    if (h2c->state.sid != ngx_http_v2_parse_sid(&p[5])) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                    "client sent CONTINUATION frame with incorrect identifier");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
+    p = pos;
+    pos += NGX_HTTP_V2_FRAME_HEADER_SIZE;
+
+    ngx_memcpy(pos, p, len);
+
+    h2c->state.handler = handler;
+    return pos;
+}
+
+
+static u_char *
+ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    ngx_uint_t           depend, dependency, excl, weight;
+    ngx_http_v2_node_t  *node;
+
+    if (h2c->state.length != NGX_HTTP_V2_PRIORITY_SIZE) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent PRIORITY frame with incorrect length %uz",
+                      h2c->state.length);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    if (end - pos < NGX_HTTP_V2_PRIORITY_SIZE) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_priority);
+    }
+
+    dependency = ngx_http_v2_parse_uint32(pos);
+
+    depend = dependency & 0x7fffffff;
+    excl = dependency >> 31;
+    weight = pos[4] + 1;
+
+    pos += NGX_HTTP_V2_PRIORITY_SIZE;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 PRIORITY frame sid:%ui on %ui excl:%ui weight:%ui",
+                   h2c->state.sid, depend, excl, weight);
+
+    if (h2c->state.sid == 0) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent PRIORITY frame with incorrect identifier");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
+    if (depend == h2c->state.sid) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent PRIORITY frame for stream %ui "
+                      "with incorrect dependancy", h2c->state.sid);
+
+        node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 0);
+
+        if (node && node->stream) {
+            if (ngx_http_v2_terminate_stream(h2c, node->stream,
+                                             NGX_HTTP_V2_PROTOCOL_ERROR)
+                == NGX_ERROR)
+            {
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_INTERNAL_ERROR);
+            }
+
+        } else {
+            if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid,
+                                            NGX_HTTP_V2_PROTOCOL_ERROR)
+                == NGX_ERROR)
+            {
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_INTERNAL_ERROR);
+            }
+        }
+
+        return ngx_http_v2_state_complete(h2c, pos, end);
+    }
+
+    node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 1);
+
+    if (node == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    node->weight = weight;
+
+    if (node->stream == NULL) {
+        if (node->parent == NULL) {
+            h2c->closed_nodes++;
+
+        } else {
+            ngx_queue_remove(&node->reuse);
+        }
+
+        ngx_queue_insert_tail(&h2c->closed, &node->reuse);
+    }
+
+    ngx_http_v2_set_dependency(h2c, node, depend, excl);
+
+    return ngx_http_v2_state_complete(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_rst_stream(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    ngx_uint_t             status;
+    ngx_event_t           *ev;
+    ngx_connection_t      *fc;
+    ngx_http_v2_node_t    *node;
+    ngx_http_v2_stream_t  *stream;
+
+    if (h2c->state.length != NGX_HTTP_V2_RST_STREAM_SIZE) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent RST_STREAM frame with incorrect length %uz",
+                      h2c->state.length);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    if (end - pos < NGX_HTTP_V2_RST_STREAM_SIZE) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_rst_stream);
+    }
+
+    status = ngx_http_v2_parse_uint32(pos);
+
+    pos += NGX_HTTP_V2_RST_STREAM_SIZE;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 RST_STREAM frame, sid:%ui status:%ui",
+                   h2c->state.sid, status);
+
+    if (h2c->state.sid == 0) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent RST_STREAM frame with incorrect identifier");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
+    node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 0);
+
+    if (node == NULL || node->stream == NULL) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                        "unknown http2 stream");
+
+        return ngx_http_v2_state_complete(h2c, pos, end);
+    }
+
+    stream = node->stream;
+
+    stream->in_closed = 1;
+    stream->out_closed = 1;
+
+    fc = stream->request->connection;
+    fc->error = 1;
+
+    switch (status) {
+
+    case NGX_HTTP_V2_CANCEL:
+        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
+                      "client canceled stream %ui", h2c->state.sid);
+        break;
+
+    case NGX_HTTP_V2_INTERNAL_ERROR:
+        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
+                      "client terminated stream %ui due to internal error",
+                      h2c->state.sid);
+        break;
+
+    default:
+        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
+                      "client terminated stream %ui with status %ui",
+                      h2c->state.sid, status);
+        break;
+    }
+
+    ev = fc->read;
+    ev->handler(ev);
+
+    return ngx_http_v2_state_complete(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_settings(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    if (h2c->state.flags == NGX_HTTP_V2_ACK_FLAG) {
+
+        if (h2c->state.length != 0) {
+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                          "client sent SETTINGS frame with the ACK flag "
+                          "and nonzero length");
+
+            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+        }
+
+        /* TODO settings acknowledged */
+
+        return ngx_http_v2_state_complete(h2c, pos, end);
+    }
+
+    if (h2c->state.length % NGX_HTTP_V2_SETTINGS_PARAM_SIZE) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent SETTINGS frame with incorrect length %uz",
+                      h2c->state.length);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    ngx_http_v2_send_settings(h2c, 1);
+
+    return ngx_http_v2_state_settings_params(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    ngx_uint_t  id, value;
+
+    while (h2c->state.length) {
+        if (end - pos < NGX_HTTP_V2_SETTINGS_PARAM_SIZE) {
+            return ngx_http_v2_state_save(h2c, pos, end,
+                                          ngx_http_v2_state_settings_params);
+        }
+
+        h2c->state.length -= NGX_HTTP_V2_SETTINGS_PARAM_SIZE;
+
+        id = ngx_http_v2_parse_uint16(pos);
+        value = ngx_http_v2_parse_uint32(&pos[2]);
+
+        switch (id) {
+
+        case NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING:
+
+            if (value > NGX_HTTP_V2_MAX_WINDOW) {
+                ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                              "client sent SETTINGS frame with incorrect "
+                              "INITIAL_WINDOW_SIZE value %ui", value);
+
+                return ngx_http_v2_connection_error(h2c,
+                                                  NGX_HTTP_V2_FLOW_CTRL_ERROR);
+            }
+
+            if (ngx_http_v2_adjust_windows(h2c, value - h2c->init_window)
+                != NGX_OK)
+            {
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_INTERNAL_ERROR);
+            }
+
+            h2c->init_window = value;
+            break;
+
+        case NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING:
+            if (value > NGX_HTTP_V2_MAX_FRAME_SIZE
+                || value < NGX_HTTP_V2_DEFAULT_FRAME_SIZE)
+            {
+                ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                              "client sent SETTINGS frame with incorrect "
+                              "MAX_FRAME_SIZE value %ui", value);
+
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_PROTOCOL_ERROR);
+            }
+
+            h2c->frame_size = value;
+            break;
+
+        default:
+            break;
+        }
+
+        pos += NGX_HTTP_V2_SETTINGS_PARAM_SIZE;
+    }
+
+    return ngx_http_v2_state_complete(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_push_promise(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                  "client sent PUSH_PROMISE frame");
+
+    return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+}
+
+
+static u_char *
+ngx_http_v2_state_ping(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
+{
+    ngx_buf_t                *buf;
+    ngx_http_v2_out_frame_t  *frame;
+
+    if (h2c->state.length != NGX_HTTP_V2_PING_SIZE) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent PING frame with incorrect length %uz",
+                      h2c->state.length);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    if (end - pos < NGX_HTTP_V2_PING_SIZE) {
+        return ngx_http_v2_state_save(h2c, pos, end, ngx_http_v2_state_ping);
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 PING frame, flags: %ui", h2c->state.flags);
+
+    if (h2c->state.flags & NGX_HTTP_V2_ACK_FLAG) {
+        return ngx_http_v2_state_skip(h2c, pos, end);
+    }
+
+    frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_PING_SIZE,
+                                  NGX_HTTP_V2_PING_FRAME,
+                                  NGX_HTTP_V2_ACK_FLAG, 0);
+    if (frame == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    buf = frame->first->buf;
+
+    buf->last = ngx_cpymem(buf->last, pos, NGX_HTTP_V2_PING_SIZE);
+
+    ngx_http_v2_queue_blocked_frame(h2c, frame);
+
+    return ngx_http_v2_state_complete(h2c, pos + NGX_HTTP_V2_PING_SIZE, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_goaway(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+#if (NGX_DEBUG)
+    ngx_uint_t  last_sid, error;
+#endif
+
+    if (h2c->state.length < NGX_HTTP_V2_GOAWAY_SIZE) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent GOAWAY frame "
+                      "with incorrect length %uz", h2c->state.length);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    if (end - pos < NGX_HTTP_V2_GOAWAY_SIZE) {
+        return ngx_http_v2_state_save(h2c, pos, end, ngx_http_v2_state_goaway);
+    }
+
+#if (NGX_DEBUG)
+    h2c->state.length -= NGX_HTTP_V2_GOAWAY_SIZE;
+
+    last_sid = ngx_http_v2_parse_sid(pos);
+    error = ngx_http_v2_parse_uint32(&pos[4]);
+
+    pos += NGX_HTTP_V2_GOAWAY_SIZE;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 GOAWAY frame: last sid %ui, error %ui",
+                   last_sid, error);
+#endif
+
+    return ngx_http_v2_state_skip(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_window_update(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    size_t                 window;
+    ngx_event_t           *wev;
+    ngx_queue_t           *q;
+    ngx_http_v2_node_t    *node;
+    ngx_http_v2_stream_t  *stream;
+
+    if (h2c->state.length != NGX_HTTP_V2_WINDOW_UPDATE_SIZE) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent WINDOW_UPDATE frame "
+                      "with incorrect length %uz", h2c->state.length);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+    }
+
+    if (end - pos < NGX_HTTP_V2_WINDOW_UPDATE_SIZE) {
+        return ngx_http_v2_state_save(h2c, pos, end,
+                                      ngx_http_v2_state_window_update);
+    }
+
+    window = ngx_http_v2_parse_window(pos);
+
+    pos += NGX_HTTP_V2_WINDOW_UPDATE_SIZE;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 WINDOW_UPDATE frame sid:%ui window:%uz",
+                   h2c->state.sid, window);
+
+    if (h2c->state.sid) {
+        node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 0);
+
+        if (node == NULL || node->stream == NULL) {
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                           "unknown http2 stream");
+
+            return ngx_http_v2_state_complete(h2c, pos, end);
+        }
+
+        stream = node->stream;
+
+        if (window > (size_t) (NGX_HTTP_V2_MAX_WINDOW - stream->send_window)) {
+
+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                          "client violated flow control for stream %ui: "
+                          "received WINDOW_UPDATE frame "
+                          "with window increment %uz "
+                          "not allowed for window %z",
+                          h2c->state.sid, window, stream->send_window);
+
+            if (ngx_http_v2_terminate_stream(h2c, stream,
+                                             NGX_HTTP_V2_FLOW_CTRL_ERROR)
+                == NGX_ERROR)
+            {
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_INTERNAL_ERROR);
+            }
+
+            return ngx_http_v2_state_complete(h2c, pos, end);
+        }
+
+        stream->send_window += window;
+
+        if (stream->exhausted) {
+            stream->exhausted = 0;
+
+            wev = stream->request->connection->write;
+
+            if (!wev->timer_set) {
+                wev->delayed = 0;
+                wev->handler(wev);
+            }
+        }
+
+        return ngx_http_v2_state_complete(h2c, pos, end);
+    }
+
+    if (window > NGX_HTTP_V2_MAX_WINDOW - h2c->send_window) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client violated connection flow control: "
+                      "received WINDOW_UPDATE frame "
+                      "with window increment %uz "
+                      "not allowed for window %uz",
+                      window, h2c->send_window);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_FLOW_CTRL_ERROR);
+    }
+
+    h2c->send_window += window;
+
+    while (!ngx_queue_empty(&h2c->waiting)) {
+        q = ngx_queue_head(&h2c->waiting);
+
+        ngx_queue_remove(q);
+
+        stream = ngx_queue_data(q, ngx_http_v2_stream_t, queue);
+
+        stream->handled = 0;
+
+        wev = stream->request->connection->write;
+
+        if (!wev->timer_set) {
+            wev->delayed = 0;
+            wev->handler(wev);
+
+            if (h2c->send_window == 0) {
+                break;
+            }
+        }
+    }
+
+    return ngx_http_v2_state_complete(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_continuation(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                  "client sent unexpected CONTINUATION frame");
+
+    return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+}
+
+
+static u_char *
+ngx_http_v2_state_complete(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 frame complete pos:%p end:%p", pos, end);
+
+    if (pos > end) {
+        ngx_log_error(NGX_LOG_ALERT, h2c->connection->log, 0,
+                      "receive buffer overrun");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    h2c->state.stream = NULL;
+    h2c->state.handler = ngx_http_v2_state_head;
+
+    return pos;
+}
+
+
+static u_char *
+ngx_http_v2_state_skip_padded(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    h2c->state.length += h2c->state.padding;
+    h2c->state.padding = 0;
+
+    return ngx_http_v2_state_skip(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_skip(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
+{
+    size_t  size;
+
+    size = end - pos;
+
+    if (size < h2c->state.length) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "http2 frame skip %uz of %uz", size, h2c->state.length);
+
+        h2c->state.length -= size;
+        return ngx_http_v2_state_save(h2c, end, end, ngx_http_v2_state_skip);
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 frame skip %uz", h2c->state.length);
+
+    return ngx_http_v2_state_complete(h2c, pos + h2c->state.length, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_skip_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end)
+{
+    h2c->state.pool = ngx_create_pool(1024, h2c->connection->log);
+    if (h2c->state.pool == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    return ngx_http_v2_state_header_block(h2c, pos, end);
+}
+
+
+static u_char *
+ngx_http_v2_state_save(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end,
+    ngx_http_v2_handler_pt handler)
+{
+    size_t  size;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 frame state save pos:%p end:%p handler:%p",
+                   pos, end, handler);
+
+    size = end - pos;
+
+    if (size > NGX_HTTP_V2_STATE_BUFFER_SIZE) {
+        ngx_log_error(NGX_LOG_ALERT, h2c->connection->log, 0,
+                      "state buffer overflow: %uz bytes required", size);
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    ngx_memcpy(h2c->state.buffer, pos, NGX_HTTP_V2_STATE_BUFFER_SIZE);
+
+    h2c->state.buffer_used = size;
+    h2c->state.handler = handler;
+    h2c->state.incomplete = 1;
+
+    return end;
+}
+
+
+static u_char *
+ngx_http_v2_connection_error(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t err)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 state connection error");
+
+    if (err == NGX_HTTP_V2_INTERNAL_ERROR) {
+        ngx_debug_point();
+    }
+
+    if (h2c->state.stream) {
+        h2c->state.stream->out_closed = 1;
+        h2c->state.pool = NULL;
+        ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST);
+    }
+
+    ngx_http_v2_finalize_connection(h2c, err);
+
+    return NULL;
+}
+
+
+static ngx_int_t
+ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c, u_char **pos, u_char *end,
+    ngx_uint_t prefix)
+{
+    u_char      *start, *p;
+    ngx_uint_t   value, octet, shift;
+
+    start = *pos;
+    p = start;
+
+    value = *p++ & prefix;
+
+    if (value != prefix) {
+        if (h2c->state.length == 0) {
+            return NGX_ERROR;
+        }
+
+        h2c->state.length--;
+
+        *pos = p;
+        return value;
+    }
+
+    if (end - p > NGX_HTTP_V2_INT_OCTETS - 1) {
+        end = p + NGX_HTTP_V2_INT_OCTETS - 1;
+    }
+
+    for (shift = 0; p != end; shift += 7) {
+        octet = *p++;
+
+        value += (octet & 0x7f) << shift;
+
+        if (octet < 128) {
+            if ((size_t) (p - start) > h2c->state.length) {
+                return NGX_ERROR;
+            }
+
+            h2c->state.length -= p - start;
+
+            *pos = p;
+            return value;
+        }
+    }
+
+    if ((size_t) (end - start) >= NGX_HTTP_V2_INT_OCTETS) {
+        return NGX_DECLINED;
+    }
+
+    if ((size_t) (end - start) >= h2c->state.length) {
+        return NGX_ERROR;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack)
+{
+    size_t                    len;
+    ngx_buf_t                *buf;
+    ngx_chain_t              *cl;
+    ngx_http_v2_srv_conf_t   *h2scf;
+    ngx_http_v2_out_frame_t  *frame;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 send SETTINGS frame");
+
+    frame = ngx_palloc(h2c->pool, sizeof(ngx_http_v2_out_frame_t));
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl = ngx_alloc_chain_link(h2c->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    len = ack ? 0 : (sizeof(uint16_t) + sizeof(uint32_t)) * 3;
+
+    buf = ngx_create_temp_buf(h2c->pool, NGX_HTTP_V2_FRAME_HEADER_SIZE + len);
+    if (buf == NULL) {
+        return NGX_ERROR;
+    }
+
+    buf->last_buf = 1;
+
+    cl->buf = buf;
+    cl->next = NULL;
+
+    frame->first = cl;
+    frame->last = cl;
+    frame->handler = ngx_http_v2_settings_frame_handler;
+    frame->stream = NULL;
+#if (NGX_DEBUG)
+    frame->length = len;
+#endif
+    frame->blocked = 0;
+
+    buf->last = ngx_http_v2_write_len_and_type(buf->last, len,
+                                               NGX_HTTP_V2_SETTINGS_FRAME);
+
+    *buf->last++ = ack ? NGX_HTTP_V2_ACK_FLAG : NGX_HTTP_V2_NO_FLAG;
+
+    buf->last = ngx_http_v2_write_sid(buf->last, 0);
+
+    if (!ack) {
+        h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                             ngx_http_v2_module);
+
+        buf->last = ngx_http_v2_write_uint16(buf->last,
+                                             NGX_HTTP_V2_MAX_STREAMS_SETTING);
+        buf->last = ngx_http_v2_write_uint32(buf->last,
+                                             h2scf->concurrent_streams);
+
+        buf->last = ngx_http_v2_write_uint16(buf->last,
+                                         NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING);
+        buf->last = ngx_http_v2_write_uint32(buf->last,
+                                             NGX_HTTP_V2_MAX_WINDOW);
+
+        buf->last = ngx_http_v2_write_uint16(buf->last,
+                                           NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING);
+        buf->last = ngx_http_v2_write_uint32(buf->last,
+                                             NGX_HTTP_V2_MAX_FRAME_SIZE);
+    }
+
+    ngx_http_v2_queue_blocked_frame(h2c, frame);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_settings_frame_handler(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_out_frame_t *frame)
+{
+    ngx_buf_t  *buf;
+
+    buf = frame->first->buf;
+
+    if (buf->pos != buf->last) {
+        return NGX_AGAIN;
+    }
+
+    ngx_free_chain(h2c->pool, frame->first);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_send_window_update(ngx_http_v2_connection_t *h2c, ngx_uint_t sid,
+    size_t window)
+{
+    ngx_buf_t                *buf;
+    ngx_http_v2_out_frame_t  *frame;
+
+    frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_WINDOW_UPDATE_SIZE,
+                                  NGX_HTTP_V2_WINDOW_UPDATE_FRAME,
+                                  NGX_HTTP_V2_NO_FLAG, sid);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    buf = frame->first->buf;
+
+    buf->last = ngx_http_v2_write_uint32(buf->last, window);
+
+    ngx_http_v2_queue_blocked_frame(h2c, frame);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_send_rst_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t sid,
+    ngx_uint_t status)
+{
+    ngx_buf_t                *buf;
+    ngx_http_v2_out_frame_t  *frame;
+
+    frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_RST_STREAM_SIZE,
+                                  NGX_HTTP_V2_RST_STREAM_FRAME,
+                                  NGX_HTTP_V2_NO_FLAG, sid);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    buf = frame->first->buf;
+
+    buf->last = ngx_http_v2_write_uint32(buf->last, status);
+
+    ngx_http_v2_queue_blocked_frame(h2c, frame);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_send_goaway(ngx_http_v2_connection_t *h2c, ngx_uint_t status)
+{
+    ngx_buf_t                *buf;
+    ngx_http_v2_out_frame_t  *frame;
+
+    frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_GOAWAY_SIZE,
+                                  NGX_HTTP_V2_GOAWAY_FRAME,
+                                  NGX_HTTP_V2_NO_FLAG, 0);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    buf = frame->first->buf;
+
+    buf->last = ngx_http_v2_write_sid(buf->last, h2c->last_sid);
+    buf->last = ngx_http_v2_write_uint32(buf->last, status);
+
+    ngx_http_v2_queue_blocked_frame(h2c, frame);
+
+    return NGX_OK;
+}
+
+
+static ngx_http_v2_out_frame_t *
+ngx_http_v2_get_frame(ngx_http_v2_connection_t *h2c, size_t length,
+    ngx_uint_t type, u_char flags, ngx_uint_t sid)
+{
+    ngx_buf_t                *buf;
+    ngx_pool_t               *pool;
+    ngx_http_v2_out_frame_t  *frame;
+
+    frame = h2c->free_frames;
+
+    if (frame) {
+        h2c->free_frames = frame->next;
+
+        buf = frame->first->buf;
+        buf->pos = buf->start;
+
+        frame->blocked = 0;
+
+    } else {
+        pool = h2c->pool ? h2c->pool : h2c->connection->pool;
+
+        frame = ngx_pcalloc(pool, sizeof(ngx_http_v2_out_frame_t));
+        if (frame == NULL) {
+            return NULL;
+        }
+
+        frame->first = ngx_alloc_chain_link(pool);
+        if (frame->first == NULL) {
+            return NULL;
+        }
+
+        buf = ngx_create_temp_buf(pool, NGX_HTTP_V2_FRAME_BUFFER_SIZE);
+        if (buf == NULL) {
+            return NULL;
+        }
+
+        buf->last_buf = 1;
+
+        frame->first->buf = buf;
+        frame->last = frame->first;
+
+        frame->handler = ngx_http_v2_frame_handler;
+    }
+
+#if (NGX_DEBUG)
+    if (length > NGX_HTTP_V2_FRAME_BUFFER_SIZE - NGX_HTTP_V2_FRAME_HEADER_SIZE)
+    {
+        ngx_log_error(NGX_LOG_ALERT, h2c->connection->log, 0,
+                      "requested control frame is too large: %uz", length);
+        return NULL;
+    }
+
+    frame->length = length;
+#endif
+
+    buf->last = ngx_http_v2_write_len_and_type(buf->pos, length, type);
+
+    *buf->last++ = flags;
+
+    buf->last = ngx_http_v2_write_sid(buf->last, sid);
+
+    return frame;
+}
+
+
+static ngx_int_t
+ngx_http_v2_frame_handler(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_out_frame_t *frame)
+{
+    ngx_buf_t  *buf;
+
+    buf = frame->first->buf;
+
+    if (buf->pos != buf->last) {
+        return NGX_AGAIN;
+    }
+
+    frame->next = h2c->free_frames;
+    h2c->free_frames = frame;
+
+    return NGX_OK;
+}
+
+
+static ngx_http_v2_stream_t *
+ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
+{
+    ngx_log_t                 *log;
+    ngx_event_t               *rev, *wev;
+    ngx_connection_t          *fc;
+    ngx_http_log_ctx_t        *ctx;
+    ngx_http_request_t        *r;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_core_srv_conf_t  *cscf;
+
+    fc = h2c->free_fake_connections;
+
+    if (fc) {
+        h2c->free_fake_connections = fc->data;
+
+        rev = fc->read;
+        wev = fc->write;
+        log = fc->log;
+        ctx = log->data;
+
+    } else {
+        fc = ngx_palloc(h2c->pool, sizeof(ngx_connection_t));
+        if (fc == NULL) {
+            return NULL;
+        }
+
+        rev = ngx_palloc(h2c->pool, sizeof(ngx_event_t));
+        if (rev == NULL) {
+            return NULL;
+        }
+
+        wev = ngx_palloc(h2c->pool, sizeof(ngx_event_t));
+        if (wev == NULL) {
+            return NULL;
+        }
+
+        log = ngx_palloc(h2c->pool, sizeof(ngx_log_t));
+        if (log == NULL) {
+            return NULL;
+        }
+
+        ctx = ngx_palloc(h2c->pool, sizeof(ngx_http_log_ctx_t));
+        if (ctx == NULL) {
+            return NULL;
+        }
+
+        ctx->connection = fc;
+        ctx->request = NULL;
+        ctx->current_request = NULL;
+    }
+
+    ngx_memcpy(log, h2c->connection->log, sizeof(ngx_log_t));
+
+    log->data = ctx;
+
+    ngx_memzero(rev, sizeof(ngx_event_t));
+
+    rev->data = fc;
+    rev->ready = 1;
+    rev->handler = ngx_http_v2_close_stream_handler;
+    rev->log = log;
+
+    ngx_memcpy(wev, rev, sizeof(ngx_event_t));
+
+    wev->write = 1;
+
+    ngx_memcpy(fc, h2c->connection, sizeof(ngx_connection_t));
+
+    fc->data = h2c->http_connection;
+    fc->read = rev;
+    fc->write = wev;
+    fc->sent = 0;
+    fc->log = log;
+    fc->buffered = 0;
+    fc->sndlowat = 1;
+    fc->tcp_nodelay = NGX_TCP_NODELAY_DISABLED;
+
+    r = ngx_http_create_request(fc);
+    if (r == NULL) {
+        return NULL;
+    }
+
+    r->http_version = NGX_HTTP_VERSION_20;
+    r->valid_location = 1;
+
+    fc->data = r;
+    h2c->connection->requests++;
+
+    cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+    r->header_in = ngx_create_temp_buf(r->pool,
+                                       cscf->client_header_buffer_size);
+    if (r->header_in == NULL) {
+        ngx_http_free_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NULL;
+    }
+
+    if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
+                      sizeof(ngx_table_elt_t))
+        != NGX_OK)
+    {
+        ngx_http_free_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NULL;
+    }
+
+    r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE;
+
+    stream = ngx_pcalloc(r->pool, sizeof(ngx_http_v2_stream_t));
+    if (stream == NULL) {
+        ngx_http_free_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NULL;
+    }
+
+    r->stream = stream;
+
+    stream->request = r;
+    stream->connection = h2c;
+
+    stream->send_window = h2c->init_window;
+    stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+
+    h2c->processing++;
+
+    return stream;
+}
+
+
+static ngx_http_v2_node_t *
+ngx_http_v2_get_node_by_id(ngx_http_v2_connection_t *h2c, ngx_uint_t sid,
+    ngx_uint_t alloc)
+{
+    ngx_uint_t               index;
+    ngx_http_v2_node_t      *node;
+    ngx_http_v2_srv_conf_t  *h2scf;
+
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+
+    index = ngx_http_v2_index(h2scf, sid);
+
+    for (node = h2c->streams_index[index]; node; node = node->index) {
+
+        if (node->id == sid) {
+            return node;
+        }
+    }
+
+    if (!alloc) {
+        return NULL;
+    }
+
+    if (h2c->closed_nodes < 32) {
+        node = ngx_pcalloc(h2c->connection->pool, sizeof(ngx_http_v2_node_t));
+        if (node == NULL) {
+            return NULL;
+        }
+
+    } else {
+        node = ngx_http_v2_get_closed_node(h2c);
+    }
+
+    node->id = sid;
+
+    ngx_queue_init(&node->children);
+
+    node->index = h2c->streams_index[index];
+    h2c->streams_index[index] = node;
+
+    return node;
+}
+
+
+static ngx_http_v2_node_t *
+ngx_http_v2_get_closed_node(ngx_http_v2_connection_t *h2c)
+{
+    ngx_uint_t               weight;
+    ngx_queue_t             *q, *children;
+    ngx_http_v2_node_t      *node, **next, *n, *parent, *child;
+    ngx_http_v2_srv_conf_t  *h2scf;
+
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+
+    h2c->closed_nodes--;
+
+    q = ngx_queue_head(&h2c->closed);
+
+    ngx_queue_remove(q);
+
+    node = ngx_queue_data(q, ngx_http_v2_node_t, reuse);
+
+    next = &h2c->streams_index[ngx_http_v2_index(h2scf, node->id)];
+
+    for ( ;; ) {
+        n = *next;
+
+        if (n == node) {
+            *next = n->index;
+            break;
+        }
+
+        next = &n->index;
+    }
+
+    ngx_queue_remove(&node->queue);
+
+    weight = 0;
+
+    for (q = ngx_queue_head(&node->children);
+         q != ngx_queue_sentinel(&node->children);
+         q = ngx_queue_next(q))
+    {
+        child = ngx_queue_data(q, ngx_http_v2_node_t, queue);
+        weight += child->weight;
+    }
+
+    for (q = ngx_queue_head(&node->children);
+         q != ngx_queue_sentinel(&node->children);
+         q = ngx_queue_next(q))
+    {
+        child = ngx_queue_data(q, ngx_http_v2_node_t, queue);
+        child->weight = node->weight * child->weight / weight;
+
+        if (child->weight == 0) {
+            child->weight = 1;
+        }
+    }
+
+    parent = node->parent;
+
+    if (parent == NGX_HTTP_V2_ROOT) {
+        node->rank = 0;
+        node->rel_weight = 1.0;
+
+        children = &h2c->dependencies;
+
+    } else {
+        node->rank = parent->rank;
+        node->rel_weight = parent->rel_weight;
+
+        children = &parent->children;
+    }
+
+    ngx_http_v2_node_children_update(node);
+    ngx_queue_add(children, &node->children);
+
+    ngx_memzero(node, sizeof(ngx_http_v2_node_t));
+
+    return node;
+}
+
+
+static ngx_int_t
+ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+{
+    u_char                     ch;
+    ngx_uint_t                 i;
+    ngx_http_core_srv_conf_t  *cscf;
+
+    if (header->name.len == 0) {
+        return NGX_ERROR;
+    }
+
+    cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+    for (i = (header->name.data[0] == ':'); i != header->name.len; i++) {
+        ch = header->name.data[i];
+
+        if ((ch >= 'a' && ch <= 'z')
+            || (ch == '-')
+            || (ch >= '0' && ch <= '9')
+            || (ch == '_' && cscf->underscores_in_headers))
+        {
+            continue;
+        }
+
+        switch (ch) {
+        case '\0':
+        case LF:
+        case CR:
+        case ':':
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent invalid header name: \"%V\"",
+                          &header->name);
+
+            return NGX_ERROR;
+        }
+
+        if (ch >= 'A' && ch <= 'Z') {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent invalid header name: \"%V\"",
+                          &header->name);
+
+            return NGX_ERROR;
+        }
+
+        r->invalid_header = 1;
+    }
+
+    for (i = 0; i != header->value.len; i++) {
+        ch = header->value.data[i];
+
+        switch (ch) {
+        case '\0':
+        case LF:
+        case CR:
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent header \"%V\" with "
+                          "invalid value: \"%V\"",
+                          &header->name, &header->value);
+
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_pseudo_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+{
+    header->name.len--;
+    header->name.data++;
+
+    switch (header->name.len) {
+    case 4:
+        if (ngx_memcmp(header->name.data, "path", sizeof("path") - 1)
+            == 0)
+        {
+            return ngx_http_v2_parse_path(r, header);
+        }
+
+        break;
+
+    case 6:
+        if (ngx_memcmp(header->name.data, "method", sizeof("method") - 1)
+            == 0)
+        {
+            return ngx_http_v2_parse_method(r, header);
+        }
+
+        if (ngx_memcmp(header->name.data, "scheme", sizeof("scheme") - 1)
+            == 0)
+        {
+            return ngx_http_v2_parse_scheme(r, header);
+        }
+
+        break;
+
+    case 9:
+        if (ngx_memcmp(header->name.data, "authority", sizeof("authority") - 1)
+            == 0)
+        {
+            return ngx_http_v2_parse_authority(r, header);
+        }
+
+        break;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                  "client sent unknown pseudo header \"%V\"",
+                  &header->name);
+
+    return NGX_DECLINED;
+}
+
+
+static ngx_int_t
+ngx_http_v2_parse_path(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+{
+    if (r->unparsed_uri.len) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent duplicate :path header");
+
+        return NGX_DECLINED;
+    }
+
+    if (header->value.len == 0) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent empty :path header");
+
+        return NGX_DECLINED;
+    }
+
+    r->uri_start = header->value.data;
+    r->uri_end = header->value.data + header->value.len;
+
+    if (ngx_http_parse_uri(r) != NGX_OK) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent invalid :path header: \"%V\"",
+                      &header->value);
+
+        return NGX_DECLINED;
+    }
+
+    if (ngx_http_process_request_uri(r) != NGX_OK) {
+        /*
+         * request has been finalized already
+         * in ngx_http_process_request_uri()
+         */
+        return NGX_ABORT;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_parse_method(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+{
+    size_t         k, len;
+    ngx_uint_t     n;
+    const u_char  *p, *m;
+
+    /*
+     * This array takes less than 256 sequential bytes,
+     * and if typical CPU cache line size is 64 bytes,
+     * it is prefetched for 4 load operations.
+     */
+    static const struct {
+        u_char            len;
+        const u_char      method[11];
+        uint32_t          value;
+    } tests[] = {
+        { 3, "GET",       NGX_HTTP_GET },
+        { 4, "POST",      NGX_HTTP_POST },
+        { 4, "HEAD",      NGX_HTTP_HEAD },
+        { 7, "OPTIONS",   NGX_HTTP_OPTIONS },
+        { 8, "PROPFIND",  NGX_HTTP_PROPFIND },
+        { 3, "PUT",       NGX_HTTP_PUT },
+        { 5, "MKCOL",     NGX_HTTP_MKCOL },
+        { 6, "DELETE",    NGX_HTTP_DELETE },
+        { 4, "COPY",      NGX_HTTP_COPY },
+        { 4, "MOVE",      NGX_HTTP_MOVE },
+        { 9, "PROPPATCH", NGX_HTTP_PROPPATCH },
+        { 4, "LOCK",      NGX_HTTP_LOCK },
+        { 6, "UNLOCK",    NGX_HTTP_UNLOCK },
+        { 5, "PATCH",     NGX_HTTP_PATCH },
+        { 5, "TRACE",     NGX_HTTP_TRACE }
+    }, *test;
+
+    if (r->method_name.len) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent duplicate :method header");
+
+        return NGX_DECLINED;
+    }
+
+    if (header->value.len == 0) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent empty :method header");
+
+        return NGX_DECLINED;
+    }
+
+    r->method_name.len = header->value.len;
+    r->method_name.data = header->value.data;
+
+    len = r->method_name.len;
+    n = sizeof(tests) / sizeof(tests[0]);
+    test = tests;
+
+    do {
+        if (len == test->len) {
+            p = r->method_name.data;
+            m = test->method;
+            k = len;
+
+            do {
+                if (*p++ != *m++) {
+                    goto next;
+                }
+            } while (--k);
+
+            r->method = test->value;
+            return NGX_OK;
+        }
+
+    next:
+        test++;
+
+    } while (--n);
+
+    p = r->method_name.data;
+
+    do {
+        if ((*p < 'A' || *p > 'Z') && *p != '_') {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent invalid method: \"%V\"",
+                          &r->method_name);
+
+            return NGX_DECLINED;
+        }
+
+        p++;
+
+    } while (--len);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+{
+    if (r->schema_start) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent duplicate :schema header");
+
+        return NGX_DECLINED;
+    }
+
+    if (header->value.len == 0) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent empty :schema header");
+
+        return NGX_DECLINED;
+    }
+
+    r->schema_start = header->value.data;
+    r->schema_end = header->value.data + header->value.len;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_parse_authority(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+{
+    ngx_table_elt_t            *h;
+    ngx_http_header_t          *hh;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    static ngx_str_t host = ngx_string("host");
+
+    h = ngx_list_push(&r->headers_in.headers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    h->hash = ngx_hash_key(host.data, host.len);
+
+    h->key.len = host.len;
+    h->key.data = host.data;
+
+    h->value.len = header->value.len;
+    h->value.data = header->value.data;
+
+    h->lowcase_key = host.data;
+
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+    hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
+                       h->lowcase_key, h->key.len);
+
+    if (hh == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (hh->handler(r, h, hh->offset) != NGX_OK) {
+        /*
+         * request has been finalized already
+         * in ngx_http_process_host()
+         */
+        return NGX_ABORT;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_construct_request_line(ngx_http_request_t *r)
+{
+    u_char  *p;
+
+    static const u_char ending[] = " HTTP/2.0";
+
+    if (r->method_name.len == 0
+        || r->unparsed_uri.len == 0)
+    {
+        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+        return NGX_ERROR;
+    }
+
+    r->request_line.len = r->method_name.len + 1
+                          + r->unparsed_uri.len
+                          + sizeof(ending) - 1;
+
+    p = ngx_pnalloc(r->pool, r->request_line.len + 1);
+    if (p == NULL) {
+        ngx_http_v2_close_stream(r->stream, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NGX_ERROR;
+    }
+
+    r->request_line.data = p;
+
+    p = ngx_cpymem(p, r->method_name.data, r->method_name.len);
+
+    *p++ = ' ';
+
+    p = ngx_cpymem(p, r->unparsed_uri.data, r->unparsed_uri.len);
+
+    ngx_memcpy(p, ending, sizeof(ending));
+
+    /* some modules expect the space character after method name */
+    r->method_name.data = r->request_line.data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http2 http request line: \"%V\"", &r->request_line);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_cookie(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+{
+    ngx_str_t    *val;
+    ngx_array_t  *cookies;
+
+    cookies = r->stream->cookies;
+
+    if (cookies == NULL) {
+        cookies = ngx_array_create(r->pool, 2, sizeof(ngx_str_t));
+        if (cookies == NULL) {
+            return NGX_ERROR;
+        }
+
+        r->stream->cookies = cookies;
+    }
+
+    val = ngx_array_push(cookies);
+    if (val == NULL) {
+        return NGX_ERROR;
+    }
+
+    val->len = header->value.len;
+    val->data = header->value.data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_construct_cookie_header(ngx_http_request_t *r)
+{
+    u_char                     *buf, *p, *end;
+    size_t                      len;
+    ngx_str_t                  *vals;
+    ngx_uint_t                  i;
+    ngx_array_t                *cookies;
+    ngx_table_elt_t            *h;
+    ngx_http_header_t          *hh;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    static ngx_str_t cookie = ngx_string("cookie");
+
+    cookies = r->stream->cookies;
+
+    if (cookies == NULL) {
+        return NGX_OK;
+    }
+
+    vals = cookies->elts;
+
+    i = 0;
+    len = 0;
+
+    do {
+        len += vals[i].len + 2;
+    } while (++i != cookies->nelts);
+
+    len -= 2;
+
+    buf = ngx_pnalloc(r->pool, len + 1);
+    if (buf == NULL) {
+        ngx_http_v2_close_stream(r->stream, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NGX_ERROR;
+    }
+
+    p = buf;
+    end = buf + len;
+
+    for (i = 0; /* void */ ; i++) {
+
+        p = ngx_cpymem(p, vals[i].data, vals[i].len);
+
+        if (p == end) {
+            *p = '\0';
+            break;
+        }
+
+        *p++ = ';'; *p++ = ' ';
+    }
+
+    h = ngx_list_push(&r->headers_in.headers);
+    if (h == NULL) {
+        ngx_http_v2_close_stream(r->stream, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NGX_ERROR;
+    }
+
+    h->hash = ngx_hash_key(cookie.data, cookie.len);
+
+    h->key.len = cookie.len;
+    h->key.data = cookie.data;
+
+    h->value.len = len;
+    h->value.data = buf;
+
+    h->lowcase_key = cookie.data;
+
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+    hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
+                       h->lowcase_key, h->key.len);
+
+    if (hh == NULL) {
+        ngx_http_v2_close_stream(r->stream, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NGX_ERROR;
+    }
+
+    if (hh->handler(r, h, hh->offset) != NGX_OK) {
+        /*
+         * request has been finalized already
+         * in ngx_http_process_multi_header_lines()
+         */
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_v2_run_request(ngx_http_request_t *r)
+{
+    if (ngx_http_v2_construct_request_line(r) != NGX_OK) {
+        return;
+    }
+
+    if (ngx_http_v2_construct_cookie_header(r) != NGX_OK) {
+        return;
+    }
+
+    r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
+
+    if (ngx_http_process_request_header(r) != NGX_OK) {
+        return;
+    }
+
+    if (r->headers_in.content_length_n > 0 && r->stream->in_closed) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client prematurely closed stream");
+
+        r->stream->skip_data = NGX_HTTP_V2_DATA_ERROR;
+
+        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+        return;
+    }
+
+    ngx_http_process_request(r);
+}
+
+
+static ngx_int_t
+ngx_http_v2_init_request_body(ngx_http_request_t *r)
+{
+    ngx_buf_t                 *buf;
+    ngx_temp_file_t           *tf;
+    ngx_http_request_body_t   *rb;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
+    if (rb == NULL) {
+        return NGX_ERROR;
+    }
+
+    r->request_body = rb;
+
+    if (r->stream->in_closed) {
+        return NGX_OK;
+    }
+
+    rb->rest = r->headers_in.content_length_n;
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    if (r->request_body_in_file_only
+        || rb->rest > (off_t) clcf->client_body_buffer_size
+        || rb->rest < 0)
+    {
+        tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
+        if (tf == NULL) {
+            return NGX_ERROR;
+        }
+
+        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 = r->request_body_in_persistent_file;
+        tf->clean = r->request_body_in_clean_file;
+
+        if (r->request_body_file_group_access) {
+            tf->access = 0660;
+        }
+
+        rb->temp_file = tf;
+
+        if (r->stream->in_closed
+            && ngx_create_temp_file(&tf->file, tf->path, tf->pool,
+                                    tf->persistent, tf->clean, tf->access)
+               != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        buf = ngx_calloc_buf(r->pool);
+        if (buf == NULL) {
+            return NGX_ERROR;
+        }
+
+    } else {
+
+        if (rb->rest == 0) {
+            return NGX_OK;
+        }
+
+        buf = ngx_create_temp_buf(r->pool, (size_t) rb->rest);
+        if (buf == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    rb->buf = buf;
+
+    rb->bufs = ngx_alloc_chain_link(r->pool);
+    if (rb->bufs == NULL) {
+        return NGX_ERROR;
+    }
+
+    rb->bufs->buf = buf;
+    rb->bufs->next = NULL;
+
+    rb->rest = 0;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_v2_read_request_body(ngx_http_request_t *r,
+    ngx_http_client_body_handler_pt post_handler)
+{
+    ngx_http_v2_stream_t  *stream;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http2 read request body");
+
+    stream = r->stream;
+
+    switch (stream->skip_data) {
+
+    case NGX_HTTP_V2_DATA_DISCARD:
+        post_handler(r);
+        return NGX_OK;
+
+    case NGX_HTTP_V2_DATA_ERROR:
+        if (r->headers_in.content_length_n == -1) {
+            return NGX_HTTP_REQUEST_ENTITY_TOO_LARGE;
+        } else {
+            return NGX_HTTP_BAD_REQUEST;
+        }
+
+    case NGX_HTTP_V2_DATA_INTERNAL_ERROR:
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    if (!r->request_body && ngx_http_v2_init_request_body(r) != NGX_OK) {
+        stream->skip_data = NGX_HTTP_V2_DATA_INTERNAL_ERROR;
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    if (stream->in_closed) {
+        post_handler(r);
+        return NGX_OK;
+    }
+
+    r->request_body->post_handler = post_handler;
+
+    r->read_event_handler = ngx_http_test_reading;
+    r->write_event_handler = ngx_http_request_empty_handler;
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_stream_t *stream, ngx_uint_t status)
+{
+    ngx_event_t       *rev;
+    ngx_connection_t  *fc;
+
+    if (ngx_http_v2_send_rst_stream(h2c, stream->node->id, status)
+        == NGX_ERROR)
+    {
+        return NGX_ERROR;
+    }
+
+    stream->out_closed = 1;
+
+    fc = stream->request->connection;
+    fc->error = 1;
+
+    rev = fc->read;
+    rev->handler(rev);
+
+    return NGX_OK;
+}
+
+
+void
+ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
+{
+    ngx_event_t               *ev;
+    ngx_connection_t          *fc;
+    ngx_http_v2_node_t        *node;
+    ngx_http_v2_connection_t  *h2c;
+
+    h2c = stream->connection;
+    node = stream->node;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 close stream %ui, queued %ui, processing %ui",
+                   node->id, stream->queued, h2c->processing);
+
+    fc = stream->request->connection;
+
+    if (stream->queued) {
+        fc->write->handler = ngx_http_v2_close_stream_handler;
+        return;
+    }
+
+    if (!stream->out_closed) {
+        if (ngx_http_v2_send_rst_stream(h2c, node->id,
+                                        NGX_HTTP_V2_INTERNAL_ERROR)
+            != NGX_OK)
+        {
+            h2c->connection->error = 1;
+        }
+    }
+
+    node->stream = NULL;
+
+    ngx_queue_insert_tail(&h2c->closed, &node->reuse);
+    h2c->closed_nodes++;
+
+    ngx_http_free_request(stream->request, rc);
+
+    ev = fc->read;
+
+    if (ev->active || ev->disabled) {
+        ngx_log_error(NGX_LOG_ALERT, h2c->connection->log, 0,
+                      "fake read event was activated");
+    }
+
+    if (ev->timer_set) {
+        ngx_del_timer(ev);
+    }
+
+    if (ev->posted) {
+        ngx_delete_posted_event(ev);
+    }
+
+    ev = fc->write;
+
+    if (ev->active || ev->disabled) {
+        ngx_log_error(NGX_LOG_ALERT, h2c->connection->log, 0,
+                      "fake write event was activated");
+    }
+
+    if (ev->timer_set) {
+        ngx_del_timer(ev);
+    }
+
+    if (ev->posted) {
+        ngx_delete_posted_event(ev);
+    }
+
+    fc->data = h2c->free_fake_connections;
+    h2c->free_fake_connections = fc;
+
+    h2c->processing--;
+
+    if (h2c->processing || h2c->blocked) {
+        return;
+    }
+
+    ev = h2c->connection->read;
+
+    ev->handler = ngx_http_v2_handle_connection_handler;
+    ngx_post_event(ev, &ngx_posted_events);
+}
+
+
+static void
+ngx_http_v2_close_stream_handler(ngx_event_t *ev)
+{
+    ngx_connection_t    *fc;
+    ngx_http_request_t  *r;
+
+    fc = ev->data;
+    r = fc->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http2 close stream handler");
+
+    ngx_http_v2_close_stream(r->stream, 0);
+}
+
+
+static void
+ngx_http_v2_handle_connection_handler(ngx_event_t *rev)
+{
+    ngx_connection_t  *c;
+
+    rev->handler = ngx_http_v2_read_handler;
+
+    if (rev->ready) {
+        ngx_http_v2_read_handler(rev);
+        return;
+    }
+
+    c = rev->data;
+
+    ngx_http_v2_handle_connection(c->data);
+}
+
+
+static void
+ngx_http_v2_idle_handler(ngx_event_t *rev)
+{
+    ngx_connection_t          *c;
+    ngx_http_v2_srv_conf_t    *h2scf;
+    ngx_http_v2_connection_t  *h2c;
+
+    c = rev->data;
+    h2c = c->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 idle handler");
+
+    if (rev->timedout || c->close) {
+        ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
+        return;
+    }
+
+#if (NGX_HAVE_KQUEUE)
+
+    if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
+        if (rev->pending_eof) {
+            c->log->handler = NULL;
+            ngx_log_error(NGX_LOG_INFO, c->log, rev->kq_errno,
+                          "kevent() reported that client %V closed "
+                          "idle connection", &c->addr_text);
+#if (NGX_HTTP_SSL)
+            if (c->ssl) {
+                c->ssl->no_send_shutdown = 1;
+            }
+#endif
+            ngx_http_close_connection(c);
+            return;
+        }
+    }
+
+#endif
+
+    c->destroyed = 0;
+    c->idle = 0;
+    ngx_reusable_connection(c, 0);
+
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+
+    h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
+    if (h2c->pool == NULL) {
+        ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+        return;
+    }
+
+    c->write->handler = ngx_http_v2_write_handler;
+
+    rev->handler = ngx_http_v2_read_handler;
+    ngx_http_v2_read_handler(rev);
+}
+
+
+static void
+ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t status)
+{
+    ngx_uint_t               i, size;
+    ngx_event_t             *ev;
+    ngx_connection_t        *c, *fc;
+    ngx_http_request_t      *r;
+    ngx_http_v2_node_t      *node;
+    ngx_http_v2_stream_t    *stream;
+    ngx_http_v2_srv_conf_t  *h2scf;
+
+    c = h2c->connection;
+
+    h2c->blocked = 1;
+
+    if (!c->error && ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) {
+        (void) ngx_http_v2_send_output_queue(h2c);
+    }
+
+    if (!h2c->processing) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    c->error = 1;
+    c->read->handler = ngx_http_empty_handler;
+    c->write->handler = ngx_http_empty_handler;
+
+    h2c->last_out = NULL;
+
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+
+    size = ngx_http_v2_index_size(h2scf);
+
+    for (i = 0; i < size; i++) {
+
+        for (node = h2c->streams_index[i]; node; node = node->index) {
+            stream = node->stream;
+
+            if (stream == NULL) {
+                continue;
+            }
+
+            stream->handled = 0;
+
+            r = stream->request;
+            fc = r->connection;
+
+            fc->error = 1;
+
+            if (stream->queued) {
+                stream->queued = 0;
+
+                ev = fc->write;
+                ev->delayed = 0;
+
+            } else {
+                ev = fc->read;
+            }
+
+            ev->eof = 1;
+            ev->handler(ev);
+        }
+    }
+
+    h2c->blocked = 0;
+
+    if (h2c->processing) {
+        return;
+    }
+
+    ngx_http_close_connection(c);
+}
+
+
+static ngx_int_t
+ngx_http_v2_adjust_windows(ngx_http_v2_connection_t *h2c, ssize_t delta)
+{
+    ngx_uint_t               i, size;
+    ngx_event_t             *wev;
+    ngx_http_v2_node_t      *node;
+    ngx_http_v2_stream_t    *stream;
+    ngx_http_v2_srv_conf_t  *h2scf;
+
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+
+    size = ngx_http_v2_index_size(h2scf);
+
+    for (i = 0; i < size; i++) {
+
+        for (node = h2c->streams_index[i]; node; node = node->index) {
+            stream = node->stream;
+
+            if (stream == NULL) {
+                continue;
+            }
+
+            if (delta > 0
+                && stream->send_window
+                      > (ssize_t) (NGX_HTTP_V2_MAX_WINDOW - delta))
+            {
+                if (ngx_http_v2_terminate_stream(h2c, stream,
+                                                 NGX_HTTP_V2_FLOW_CTRL_ERROR)
+                    == NGX_ERROR)
+                {
+                    return NGX_ERROR;
+                }
+
+                continue;
+            }
+
+            stream->send_window += delta;
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                           "http2:%ui adjusted window: %z",
+                           node->id, stream->send_window);
+
+            if (stream->send_window > 0 && stream->exhausted) {
+                stream->exhausted = 0;
+
+                wev = stream->request->connection->write;
+
+                if (!wev->timer_set) {
+                    wev->delayed = 0;
+                    wev->handler(wev);
+                }
+            }
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_v2_set_dependency(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_node_t *node, ngx_uint_t depend, ngx_uint_t exclusive)
+{
+    ngx_queue_t         *children;
+    ngx_http_v2_node_t  *parent, *next;
+
+    parent = depend ? ngx_http_v2_get_node_by_id(h2c, depend, 0) : NULL;
+
+    if (parent == NULL) {
+        parent = NGX_HTTP_V2_ROOT;
+
+        if (depend != 0) {
+            exclusive = 0;
+        }
+
+        node->rank = 1;
+        node->rel_weight = (1.0 / 256) * node->weight;
+
+        children = &h2c->dependencies;
+
+    } else {
+        if (node->parent != NULL) {
+
+            for (next = parent->parent;
+                 next != NGX_HTTP_V2_ROOT && next->rank >= node->rank;
+                 next = next->parent)
+            {
+                if (next != node) {
+                    continue;
+                }
+
+                ngx_queue_remove(&parent->queue);
+                ngx_queue_insert_after(&node->queue, &parent->queue);
+
+                parent->parent = node->parent;
+
+                if (node->parent == NGX_HTTP_V2_ROOT) {
+                    parent->rank = 1;
+                    parent->rel_weight = (1.0 / 256) * parent->weight;
+
+                } else {
+                    parent->rank = node->parent->rank + 1;
+                    parent->rel_weight = (node->parent->rel_weight / 256)
+                                         * parent->weight;
+                }
+
+                if (!exclusive) {
+                    ngx_http_v2_node_children_update(parent);
+                }
+
+                break;
+            }
+        }
+
+        node->rank = parent->rank + 1;
+        node->rel_weight = (parent->rel_weight / 256) * node->weight;
+
+        if (parent->stream == NULL) {
+            ngx_queue_remove(&parent->reuse);
+            ngx_queue_insert_tail(&h2c->closed, &parent->reuse);
+        }
+
+        children = &parent->children;
+    }
+
+    if (exclusive) {
+        ngx_queue_add(&node->children, children);
+        ngx_queue_init(children);
+    }
+
+    if (node->parent != NULL) {
+        ngx_queue_remove(&node->queue);
+    }
+
+    ngx_queue_insert_tail(children, &node->queue);
+
+    node->parent = parent;
+
+    ngx_http_v2_node_children_update(node);
+}
+
+
+static void
+ngx_http_v2_node_children_update(ngx_http_v2_node_t *node)
+{
+    ngx_queue_t         *q;
+    ngx_http_v2_node_t  *child;
+
+    for (q = ngx_queue_head(&node->children);
+         q != ngx_queue_sentinel(&node->children);
+         q = ngx_queue_next(q))
+    {
+        child = ngx_queue_data(q, ngx_http_v2_node_t, queue);
+
+        child->rank = node->rank + 1;
+        child->rel_weight = (node->rel_weight / 256) * child->weight;
+
+        ngx_http_v2_node_children_update(child);
+    }
+}
+
+
+static void
+ngx_http_v2_pool_cleanup(void *data)
+{
+    ngx_http_v2_connection_t  *h2c = data;
+
+    if (h2c->state.pool) {
+        ngx_destroy_pool(h2c->state.pool);
+    }
+
+    if (h2c->pool) {
+        ngx_destroy_pool(h2c->pool);
+    }
+}
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
new file mode 100644
index 0000000..b7e73c9
--- /dev/null
+++ b/src/http/v2/ngx_http_v2.h
@@ -0,0 +1,333 @@
+/*
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Valentin V. Bartenev
+ */
+
+
+#ifndef _NGX_HTTP_V2_H_INCLUDED_
+#define _NGX_HTTP_V2_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+#define NGX_HTTP_V2_ALPN_ADVERTISE       "\x02h2"
+#define NGX_HTTP_V2_NPN_ADVERTISE        NGX_HTTP_V2_ALPN_ADVERTISE
+
+#define NGX_HTTP_V2_STATE_BUFFER_SIZE    16
+
+#define NGX_HTTP_V2_MAX_FRAME_SIZE       ((1 << 24) - 1)
+
+#define NGX_HTTP_V2_INT_OCTETS           4
+#define NGX_HTTP_V2_MAX_FIELD            ((1 << NGX_HTTP_V2_INT_OCTETS * 7) - 1)
+
+#define NGX_HTTP_V2_DATA_DISCARD         1
+#define NGX_HTTP_V2_DATA_ERROR           2
+#define NGX_HTTP_V2_DATA_INTERNAL_ERROR  3
+
+#define NGX_HTTP_V2_FRAME_HEADER_SIZE    9
+
+/* frame types */
+#define NGX_HTTP_V2_DATA_FRAME           0x0
+#define NGX_HTTP_V2_HEADERS_FRAME        0x1
+#define NGX_HTTP_V2_PRIORITY_FRAME       0x2
+#define NGX_HTTP_V2_RST_STREAM_FRAME     0x3
+#define NGX_HTTP_V2_SETTINGS_FRAME       0x4
+#define NGX_HTTP_V2_PUSH_PROMISE_FRAME   0x5
+#define NGX_HTTP_V2_PING_FRAME           0x6
+#define NGX_HTTP_V2_GOAWAY_FRAME         0x7
+#define NGX_HTTP_V2_WINDOW_UPDATE_FRAME  0x8
+#define NGX_HTTP_V2_CONTINUATION_FRAME   0x9
+
+/* frame flags */
+#define NGX_HTTP_V2_NO_FLAG              0x00
+#define NGX_HTTP_V2_ACK_FLAG             0x01
+#define NGX_HTTP_V2_END_STREAM_FLAG      0x01
+#define NGX_HTTP_V2_END_HEADERS_FLAG     0x04
+#define NGX_HTTP_V2_PADDED_FLAG          0x08
+#define NGX_HTTP_V2_PRIORITY_FLAG        0x20
+
+
+typedef struct ngx_http_v2_connection_s   ngx_http_v2_connection_t;
+typedef struct ngx_http_v2_node_s         ngx_http_v2_node_t;
+typedef struct ngx_http_v2_out_frame_s    ngx_http_v2_out_frame_t;
+
+
+typedef u_char *(*ngx_http_v2_handler_pt) (ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end);
+
+
+typedef struct {
+    ngx_str_t                        name;
+    ngx_str_t                        value;
+} ngx_http_v2_header_t;
+
+
+typedef struct {
+    ngx_uint_t                       sid;
+    size_t                           length;
+    size_t                           padding;
+    unsigned                         flags:8;
+
+    unsigned                         incomplete:1;
+
+    /* HPACK */
+    unsigned                         parse_name:1;
+    unsigned                         parse_value:1;
+    unsigned                         index:1;
+    ngx_http_v2_header_t             header;
+    size_t                           header_limit;
+    size_t                           field_limit;
+    u_char                           field_state;
+    u_char                          *field_start;
+    u_char                          *field_end;
+    size_t                           field_rest;
+    ngx_pool_t                      *pool;
+
+    ngx_http_v2_stream_t            *stream;
+
+    u_char                           buffer[NGX_HTTP_V2_STATE_BUFFER_SIZE];
+    size_t                           buffer_used;
+    ngx_http_v2_handler_pt           handler;
+} ngx_http_v2_state_t;
+
+
+
+typedef struct {
+    ngx_http_v2_header_t           **entries;
+
+    ngx_uint_t                       added;
+    ngx_uint_t                       deleted;
+    ngx_uint_t                       reused;
+    ngx_uint_t                       allocated;
+
+    size_t                           size;
+    size_t                           free;
+    u_char                          *storage;
+    u_char                          *pos;
+} ngx_http_v2_hpack_t;
+
+
+struct ngx_http_v2_connection_s {
+    ngx_connection_t                *connection;
+    ngx_http_connection_t           *http_connection;
+
+    ngx_uint_t                       processing;
+
+    size_t                           send_window;
+    size_t                           recv_window;
+    size_t                           init_window;
+
+    size_t                           frame_size;
+
+    ngx_queue_t                      waiting;
+
+    ngx_http_v2_state_t              state;
+
+    ngx_http_v2_hpack_t              hpack;
+
+    ngx_pool_t                      *pool;
+
+    ngx_http_v2_out_frame_t         *free_frames;
+    ngx_connection_t                *free_fake_connections;
+
+    ngx_http_v2_node_t             **streams_index;
+
+    ngx_http_v2_out_frame_t         *last_out;
+
+    ngx_queue_t                      posted;
+    ngx_queue_t                      dependencies;
+    ngx_queue_t                      closed;
+
+    ngx_uint_t                       last_sid;
+
+    unsigned                         closed_nodes:8;
+    unsigned                         blocked:1;
+};
+
+
+struct ngx_http_v2_node_s {
+    ngx_uint_t                       id;
+    ngx_http_v2_node_t              *index;
+    ngx_http_v2_node_t              *parent;
+    ngx_queue_t                      queue;
+    ngx_queue_t                      children;
+    ngx_queue_t                      reuse;
+    ngx_uint_t                       rank;
+    ngx_uint_t                       weight;
+    double                           rel_weight;
+    ngx_http_v2_stream_t            *stream;
+};
+
+
+struct ngx_http_v2_stream_s {
+    ngx_http_request_t              *request;
+    ngx_http_v2_connection_t        *connection;
+    ngx_http_v2_node_t              *node;
+
+    ngx_uint_t                       header_buffers;
+    ngx_uint_t                       queued;
+
+    /*
+     * A change to SETTINGS_INITIAL_WINDOW_SIZE could cause the
+     * send_window to become negative, hence it's signed.
+     */
+    ssize_t                          send_window;
+    size_t                           recv_window;
+
+    ngx_http_v2_out_frame_t         *free_frames;
+    ngx_chain_t                     *free_data_headers;
+    ngx_chain_t                     *free_bufs;
+
+    ngx_queue_t                      queue;
+
+    ngx_array_t                     *cookies;
+
+    size_t                           header_limit;
+
+    unsigned                         handled:1;
+    unsigned                         blocked:1;
+    unsigned                         exhausted:1;
+    unsigned                         in_closed:1;
+    unsigned                         out_closed:1;
+    unsigned                         skip_data:2;
+};
+
+
+struct ngx_http_v2_out_frame_s {
+    ngx_http_v2_out_frame_t         *next;
+    ngx_chain_t                     *first;
+    ngx_chain_t                     *last;
+    ngx_int_t                      (*handler)(ngx_http_v2_connection_t *h2c,
+                                        ngx_http_v2_out_frame_t *frame);
+
+    ngx_http_v2_stream_t            *stream;
+    size_t                           length;
+
+    unsigned                         blocked:1;
+    unsigned                         fin:1;
+};
+
+
+static ngx_inline void
+ngx_http_v2_queue_frame(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_out_frame_t *frame)
+{
+    ngx_http_v2_out_frame_t  **out;
+
+    for (out = &h2c->last_out; *out; out = &(*out)->next) {
+
+        if ((*out)->blocked || (*out)->stream == NULL) {
+            break;
+        }
+
+        if ((*out)->stream->node->rank < frame->stream->node->rank
+            || ((*out)->stream->node->rank == frame->stream->node->rank
+                && (*out)->stream->node->rel_weight
+                   >= frame->stream->node->rel_weight))
+        {
+            break;
+        }
+    }
+
+    frame->next = *out;
+    *out = frame;
+}
+
+
+static ngx_inline void
+ngx_http_v2_queue_blocked_frame(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_out_frame_t *frame)
+{
+    ngx_http_v2_out_frame_t  **out;
+
+    for (out = &h2c->last_out; *out; out = &(*out)->next)
+    {
+        if ((*out)->blocked || (*out)->stream == NULL) {
+            break;
+        }
+    }
+
+    frame->next = *out;
+    *out = frame;
+}
+
+
+void ngx_http_v2_init(ngx_event_t *rev);
+void ngx_http_v2_request_headers_init(void);
+
+ngx_int_t ngx_http_v2_read_request_body(ngx_http_request_t *r,
+    ngx_http_client_body_handler_pt post_handler);
+
+void ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc);
+
+ngx_int_t ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c);
+
+
+ngx_int_t ngx_http_v2_get_indexed_header(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t index, ngx_uint_t name_only);
+ngx_int_t ngx_http_v2_add_header(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_header_t *header);
+ngx_int_t ngx_http_v2_table_size(ngx_http_v2_connection_t *h2c, size_t size);
+
+
+ngx_int_t ngx_http_v2_huff_decode(u_char *state, u_char *src, size_t len,
+    u_char **dst, ngx_uint_t last, ngx_log_t *log);
+
+
+#define ngx_http_v2_prefix(bits)  ((1 << (bits)) - 1)
+
+
+#if (NGX_HAVE_NONALIGNED)
+
+#define ngx_http_v2_parse_uint16(p)  ntohs(*(uint16_t *) (p))
+#define ngx_http_v2_parse_uint32(p)  ntohl(*(uint32_t *) (p))
+
+#else
+
+#define ngx_http_v2_parse_uint16(p)  ((p)[0] << 8 | (p)[1])
+#define ngx_http_v2_parse_uint32(p)                                           \
+    ((p)[0] << 24 | (p)[1] << 16 | (p)[2] << 8 | (p)[3])
+
+#endif
+
+#define ngx_http_v2_parse_length(p)  ((p) >> 8)
+#define ngx_http_v2_parse_type(p)    ((p) & 0xff)
+#define ngx_http_v2_parse_sid(p)     (ngx_http_v2_parse_uint32(p) & 0x7fffffff)
+#define ngx_http_v2_parse_window(p)  (ngx_http_v2_parse_uint32(p) & 0x7fffffff)
+
+
+#define ngx_http_v2_write_uint16_aligned(p, s)                                \
+    (*(uint16_t *) (p) = htons((uint16_t) (s)), (p) + sizeof(uint16_t))
+#define ngx_http_v2_write_uint32_aligned(p, s)                                \
+    (*(uint32_t *) (p) = htonl((uint32_t) (s)), (p) + sizeof(uint32_t))
+
+#if (NGX_HAVE_NONALIGNED)
+
+#define ngx_http_v2_write_uint16  ngx_http_v2_write_uint16_aligned
+#define ngx_http_v2_write_uint32  ngx_http_v2_write_uint32_aligned
+
+#else
+
+#define ngx_http_v2_write_uint16(p, s)                                        \
+    ((p)[0] = (u_char) ((s) >> 8),                                            \
+     (p)[1] = (u_char)  (s),                                                  \
+     (p) + sizeof(uint16_t))
+
+#define ngx_http_v2_write_uint32(p, s)                                        \
+    ((p)[0] = (u_char) ((s) >> 24),                                           \
+     (p)[1] = (u_char) ((s) >> 16),                                           \
+     (p)[2] = (u_char) ((s) >> 8),                                            \
+     (p)[3] = (u_char)  (s),                                                  \
+     (p) + sizeof(uint32_t))
+
+#endif
+
+#define ngx_http_v2_write_len_and_type(p, l, t)                               \
+    ngx_http_v2_write_uint32_aligned(p, (l) << 8 | (t))
+
+#define ngx_http_v2_write_sid  ngx_http_v2_write_uint32
+
+#endif /* _NGX_HTTP_V2_H_INCLUDED_ */
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
new file mode 100644
index 0000000..17cfcd8
--- /dev/null
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -0,0 +1,1291 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Valentin V. Bartenev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+#include <ngx_http_v2_module.h>
+
+
+#define ngx_http_v2_integer_octets(v)  (((v) + 127) / 128)
+
+#define ngx_http_v2_literal_size(h)                                           \
+    (ngx_http_v2_integer_octets(sizeof(h) - 1) + sizeof(h) - 1)
+
+#define ngx_http_v2_indexed(i)      (128 + (i))
+#define ngx_http_v2_inc_indexed(i)  (64 + (i))
+
+
+#define NGX_HTTP_V2_STATUS_INDEX          8
+#define NGX_HTTP_V2_STATUS_200_INDEX      8
+#define NGX_HTTP_V2_STATUS_204_INDEX      9
+#define NGX_HTTP_V2_STATUS_206_INDEX      10
+#define NGX_HTTP_V2_STATUS_304_INDEX      11
+#define NGX_HTTP_V2_STATUS_400_INDEX      12
+#define NGX_HTTP_V2_STATUS_404_INDEX      13
+#define NGX_HTTP_V2_STATUS_500_INDEX      14
+
+#define NGX_HTTP_V2_CONTENT_LENGTH_INDEX  28
+#define NGX_HTTP_V2_CONTENT_TYPE_INDEX    31
+#define NGX_HTTP_V2_DATE_INDEX            33
+#define NGX_HTTP_V2_LAST_MODIFIED_INDEX   44
+#define NGX_HTTP_V2_LOCATION_INDEX        46
+#define NGX_HTTP_V2_SERVER_INDEX          54
+#define NGX_HTTP_V2_VARY_INDEX            59
+
+
+static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix,
+    ngx_uint_t value);
+static void ngx_http_v2_write_headers_head(u_char *pos, size_t length,
+    ngx_uint_t sid, ngx_uint_t end_headers, ngx_uint_t end_stream);
+static void ngx_http_v2_write_continuation_head(u_char *pos, size_t length,
+    ngx_uint_t sid, ngx_uint_t end_headers);
+
+static ngx_chain_t *ngx_http_v2_send_chain(ngx_connection_t *fc,
+    ngx_chain_t *in, off_t limit);
+
+static ngx_chain_t *ngx_http_v2_filter_get_shadow(
+    ngx_http_v2_stream_t *stream, ngx_buf_t *buf, off_t offset, off_t size);
+static ngx_http_v2_out_frame_t *ngx_http_v2_filter_get_data_frame(
+    ngx_http_v2_stream_t *stream, size_t len, ngx_chain_t *first,
+    ngx_chain_t *last);
+
+static ngx_inline ngx_int_t ngx_http_v2_flow_control(
+    ngx_http_v2_connection_t *h2c, ngx_http_v2_stream_t *stream);
+static void ngx_http_v2_waiting_queue(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_stream_t *stream);
+
+static ngx_inline ngx_int_t ngx_http_v2_filter_send(
+    ngx_connection_t *fc, ngx_http_v2_stream_t *stream);
+
+static ngx_int_t ngx_http_v2_headers_frame_handler(
+    ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
+static ngx_int_t ngx_http_v2_data_frame_handler(
+    ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
+static ngx_inline void ngx_http_v2_handle_frame(
+    ngx_http_v2_stream_t *stream, ngx_http_v2_out_frame_t *frame);
+static ngx_inline void ngx_http_v2_handle_stream(
+    ngx_http_v2_connection_t *h2c, ngx_http_v2_stream_t *stream);
+
+static void ngx_http_v2_filter_cleanup(void *data);
+
+static ngx_int_t ngx_http_v2_filter_init(ngx_conf_t *cf);
+
+
+static ngx_http_module_t  ngx_http_v2_filter_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_http_v2_filter_init,               /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    NULL,                                  /* create location configuration */
+    NULL                                   /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_v2_filter_module = {
+    NGX_MODULE_V1,
+    &ngx_http_v2_filter_module_ctx,        /* module context */
+    NULL,                                  /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
+
+
+static ngx_int_t
+ngx_http_v2_header_filter(ngx_http_request_t *r)
+{
+    u_char                     status, *p, *head;
+    size_t                     len, rest, frame_size;
+    ngx_buf_t                 *b;
+    ngx_str_t                  host, location;
+    ngx_uint_t                 i, port, continuation;
+    ngx_chain_t               *cl;
+    ngx_list_part_t           *part;
+    ngx_table_elt_t           *header;
+    ngx_connection_t          *fc;
+    ngx_http_cleanup_t        *cln;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_out_frame_t   *frame;
+    ngx_http_core_loc_conf_t  *clcf;
+    ngx_http_core_srv_conf_t  *cscf;
+    struct sockaddr_in        *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6       *sin6;
+#endif
+    u_char                     addr[NGX_SOCKADDR_STRLEN];
+
+
+    if (!r->stream) {
+        return ngx_http_next_header_filter(r);
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http2 header filter");
+
+    if (r->header_sent) {
+        return NGX_OK;
+    }
+
+    r->header_sent = 1;
+
+    if (r != r->main) {
+        return NGX_OK;
+    }
+
+    if (r->method == NGX_HTTP_HEAD) {
+        r->header_only = 1;
+    }
+
+    switch (r->headers_out.status) {
+
+    case NGX_HTTP_OK:
+        status = ngx_http_v2_indexed(NGX_HTTP_V2_STATUS_200_INDEX);
+        break;
+
+    case NGX_HTTP_NO_CONTENT:
+        r->header_only = 1;
+
+        ngx_str_null(&r->headers_out.content_type);
+
+        r->headers_out.content_length = NULL;
+        r->headers_out.content_length_n = -1;
+
+        r->headers_out.last_modified_time = -1;
+        r->headers_out.last_modified = NULL;
+
+        status = ngx_http_v2_indexed(NGX_HTTP_V2_STATUS_204_INDEX);
+        break;
+
+    case NGX_HTTP_PARTIAL_CONTENT:
+        status = ngx_http_v2_indexed(NGX_HTTP_V2_STATUS_206_INDEX);
+        break;
+
+    case NGX_HTTP_NOT_MODIFIED:
+        r->header_only = 1;
+        status = ngx_http_v2_indexed(NGX_HTTP_V2_STATUS_304_INDEX);
+        break;
+
+    default:
+        r->headers_out.last_modified_time = -1;
+        r->headers_out.last_modified = NULL;
+
+        switch (r->headers_out.status) {
+
+        case NGX_HTTP_BAD_REQUEST:
+            status = ngx_http_v2_indexed(NGX_HTTP_V2_STATUS_400_INDEX);
+            break;
+
+        case NGX_HTTP_NOT_FOUND:
+            status = ngx_http_v2_indexed(NGX_HTTP_V2_STATUS_404_INDEX);
+            break;
+
+        case NGX_HTTP_INTERNAL_SERVER_ERROR:
+            status = ngx_http_v2_indexed(NGX_HTTP_V2_STATUS_500_INDEX);
+            break;
+
+        default:
+            status = 0;
+        }
+    }
+
+    len = status ? 1 : 1 + ngx_http_v2_literal_size("418");
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    if (r->headers_out.server == NULL) {
+        len += 1 + clcf->server_tokens ? ngx_http_v2_literal_size(NGINX_VER)
+                                       : ngx_http_v2_literal_size("nginx");
+    }
+
+    if (r->headers_out.date == NULL) {
+        len += 1 + ngx_http_v2_literal_size("Wed, 31 Dec 1986 18:00:00 GMT");
+    }
+
+    if (r->headers_out.content_type.len) {
+        len += NGX_HTTP_V2_INT_OCTETS + r->headers_out.content_type.len;
+
+        if (r->headers_out.content_type_len == r->headers_out.content_type.len
+            && r->headers_out.charset.len)
+        {
+            len += sizeof("; charset=") - 1 + r->headers_out.charset.len;
+        }
+    }
+
+    if (r->headers_out.content_length == NULL
+        && r->headers_out.content_length_n >= 0)
+    {
+        len += 1 + ngx_http_v2_integer_octets(NGX_OFF_T_LEN) + NGX_OFF_T_LEN;
+    }
+
+    if (r->headers_out.last_modified == NULL
+        && r->headers_out.last_modified_time != -1)
+    {
+        len += 1 + ngx_http_v2_literal_size("Wed, 31 Dec 1986 18:00:00 GMT");
+    }
+
+    fc = r->connection;
+
+    if (r->headers_out.location && r->headers_out.location->value.len) {
+
+        if (r->headers_out.location->value.data[0] == '/') {
+            if (clcf->server_name_in_redirect) {
+                cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+                host = cscf->server_name;
+
+            } else if (r->headers_in.server.len) {
+                host = r->headers_in.server;
+
+            } else {
+                host.len = NGX_SOCKADDR_STRLEN;
+                host.data = addr;
+
+                if (ngx_connection_local_sockaddr(fc, &host, 0) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+            }
+
+            switch (fc->local_sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+            case AF_INET6:
+                sin6 = (struct sockaddr_in6 *) fc->local_sockaddr;
+                port = ntohs(sin6->sin6_port);
+                break;
+#endif
+#if (NGX_HAVE_UNIX_DOMAIN)
+            case AF_UNIX:
+                port = 0;
+                break;
+#endif
+            default: /* AF_INET */
+                sin = (struct sockaddr_in *) fc->local_sockaddr;
+                port = ntohs(sin->sin_port);
+                break;
+            }
+
+            location.len = sizeof("https://") - 1 + host.len
+                           + r->headers_out.location->value.len;
+
+            if (clcf->port_in_redirect) {
+
+#if (NGX_HTTP_SSL)
+                if (fc->ssl)
+                    port = (port == 443) ? 0 : port;
+                else
+#endif
+                    port = (port == 80) ? 0 : port;
+
+            } else {
+                port = 0;
+            }
+
+            if (port) {
+                location.len += sizeof(":65535") - 1;
+            }
+
+            location.data = ngx_pnalloc(r->pool, location.len);
+            if (location.data == NULL) {
+                return NGX_ERROR;
+            }
+
+            p = ngx_cpymem(location.data, "http", sizeof("http") - 1);
+
+#if (NGX_HTTP_SSL)
+            if (fc->ssl) {
+                *p++ = 's';
+            }
+#endif
+
+            *p++ = ':'; *p++ = '/'; *p++ = '/';
+            p = ngx_cpymem(p, host.data, host.len);
+
+            if (port) {
+                p = ngx_sprintf(p, ":%ui", port);
+            }
+
+            p = ngx_cpymem(p, r->headers_out.location->value.data,
+                              r->headers_out.location->value.len);
+
+            /* update r->headers_out.location->value for possible logging */
+
+            r->headers_out.location->value.len = p - location.data;
+            r->headers_out.location->value.data = location.data;
+            ngx_str_set(&r->headers_out.location->key, "Location");
+        }
+
+        r->headers_out.location->hash = 0;
+
+        len += 1 + NGX_HTTP_V2_INT_OCTETS + r->headers_out.location->value.len;
+    }
+
+#if (NGX_HTTP_GZIP)
+    if (r->gzip_vary) {
+        if (clcf->gzip_vary) {
+            len += 1 + ngx_http_v2_literal_size("Accept-Encoding");
+
+        } else {
+            r->gzip_vary = 0;
+        }
+    }
+#endif
+
+    part = &r->headers_out.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        if (header[i].key.len > NGX_HTTP_V2_MAX_FIELD) {
+            ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
+                          "too long response header name: \"%V\"",
+                          &header[i].key);
+            return NGX_ERROR;
+        }
+
+        if (header[i].value.len > NGX_HTTP_V2_MAX_FIELD) {
+            ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
+                          "too long response header value: \"%V: %V\"",
+                          &header[i].key, &header[i].value);
+            return NGX_ERROR;
+        }
+
+        len += 1 + NGX_HTTP_V2_INT_OCTETS + header[i].key.len
+                 + NGX_HTTP_V2_INT_OCTETS + header[i].value.len;
+    }
+
+    stream = r->stream;
+    frame_size = stream->connection->frame_size;
+
+    len += NGX_HTTP_V2_FRAME_HEADER_SIZE
+           * ((len + frame_size - 1) / frame_size);
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    b->last_buf = r->header_only;
+
+    b->last += NGX_HTTP_V2_FRAME_HEADER_SIZE;
+
+    if (status) {
+        *b->last++ = status;
+
+    } else {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_STATUS_INDEX);
+        *b->last++ = 3;
+        b->last = ngx_sprintf(b->last, "%03ui", r->headers_out.status);
+    }
+
+    if (r->headers_out.server == NULL) {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
+
+        if (clcf->server_tokens) {
+            *b->last++ = sizeof(NGINX_VER) - 1;
+            b->last = ngx_cpymem(b->last, NGINX_VER, sizeof(NGINX_VER) - 1);
+
+        } else {
+            *b->last++ = sizeof("nginx") - 1;
+            b->last = ngx_cpymem(b->last, "nginx", sizeof("nginx") - 1);
+        }
+    }
+
+    if (r->headers_out.date == NULL) {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_DATE_INDEX);
+        *b->last++ = (u_char) ngx_cached_http_time.len;
+
+        b->last = ngx_cpymem(b->last, ngx_cached_http_time.data,
+                             ngx_cached_http_time.len);
+    }
+
+    if (r->headers_out.content_type.len) {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_TYPE_INDEX);
+
+        if (r->headers_out.content_type_len == r->headers_out.content_type.len
+            && r->headers_out.charset.len)
+        {
+            *b->last = 0;
+            b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7),
+                                            r->headers_out.content_type.len
+                                            + sizeof("; charset=") - 1
+                                            + r->headers_out.charset.len);
+
+            p = b->last;
+
+            b->last = ngx_cpymem(p, r->headers_out.content_type.data,
+                                 r->headers_out.content_type.len);
+
+            b->last = ngx_cpymem(b->last, "; charset=",
+                                 sizeof("; charset=") - 1);
+
+            b->last = ngx_cpymem(b->last, r->headers_out.charset.data,
+                                 r->headers_out.charset.len);
+
+            /* update r->headers_out.content_type for possible logging */
+
+            r->headers_out.content_type.len = b->last - p;
+            r->headers_out.content_type.data = p;
+
+        } else {
+            *b->last = 0;
+            b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7),
+                                            r->headers_out.content_type.len);
+            b->last = ngx_cpymem(b->last, r->headers_out.content_type.data,
+                                 r->headers_out.content_type.len);
+        }
+    }
+
+    if (r->headers_out.content_length == NULL
+        && r->headers_out.content_length_n >= 0)
+    {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_LENGTH_INDEX);
+
+        p = b->last;
+        b->last = ngx_sprintf(b->last + 1, "%O",
+                              r->headers_out.content_length_n);
+        *p = (u_char) (b->last - p - 1);
+    }
+
+    if (r->headers_out.last_modified == NULL
+        && r->headers_out.last_modified_time != -1)
+    {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LAST_MODIFIED_INDEX);
+
+        p = b->last;
+        b->last = ngx_http_time(b->last + 1, r->headers_out.last_modified_time);
+        *p = (u_char) (b->last - p - 1);
+    }
+
+    if (r->headers_out.location && r->headers_out.location->value.len) {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LOCATION_INDEX);
+
+        *b->last = 0;
+        b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7),
+                                        r->headers_out.location->value.len);
+        b->last = ngx_cpymem(b->last, r->headers_out.location->value.data,
+                                      r->headers_out.location->value.len);
+    }
+
+#if (NGX_HTTP_GZIP)
+    if (r->gzip_vary) {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_VARY_INDEX);
+        *b->last++ = sizeof("Accept-Encoding") - 1;
+        b->last = ngx_cpymem(b->last, "Accept-Encoding",
+                             sizeof("Accept-Encoding") - 1);
+    }
+#endif
+
+    continuation = 0;
+    head = b->pos;
+
+    len = b->last - head - NGX_HTTP_V2_FRAME_HEADER_SIZE;
+    rest = frame_size - len;
+
+    part = &r->headers_out.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        len = 1 + NGX_HTTP_V2_INT_OCTETS * 2
+              + header[i].key.len
+              + header[i].value.len;
+
+        if (len > rest) {
+            len = b->last - head - NGX_HTTP_V2_FRAME_HEADER_SIZE;
+
+            if (continuation) {
+                ngx_http_v2_write_continuation_head(head, len,
+                                                    stream->node->id, 0);
+            } else {
+                continuation = 1;
+                ngx_http_v2_write_headers_head(head, len, stream->node->id, 0,
+                                               r->header_only);
+            }
+
+            rest = frame_size;
+            head = b->last;
+
+            b->last += NGX_HTTP_V2_FRAME_HEADER_SIZE;
+        }
+
+        p = b->last;
+
+        *p++ = 0;
+
+        *p = 0;
+        p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7), header[i].key.len);
+        ngx_strlow(p, header[i].key.data, header[i].key.len);
+        p += header[i].key.len;
+
+        *p = 0;
+        p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7),
+                                  header[i].value.len);
+        p = ngx_cpymem(p, header[i].value.data, header[i].value.len);
+
+        rest -= p - b->last;
+        b->last = p;
+    }
+
+    len = b->last - head - NGX_HTTP_V2_FRAME_HEADER_SIZE;
+
+    if (continuation) {
+        ngx_http_v2_write_continuation_head(head, len, stream->node->id, 1);
+
+    } else {
+        ngx_http_v2_write_headers_head(head, len, stream->node->id, 1,
+                                       r->header_only);
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    frame = ngx_palloc(r->pool, sizeof(ngx_http_v2_out_frame_t));
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->first = cl;
+    frame->last = cl;
+    frame->handler = ngx_http_v2_headers_frame_handler;
+    frame->stream = stream;
+    frame->length = b->last - b->pos - NGX_HTTP_V2_FRAME_HEADER_SIZE;
+    frame->blocked = 1;
+    frame->fin = r->header_only;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, stream->request->connection->log, 0,
+                   "http2:%ui create HEADERS frame %p: len:%uz",
+                   stream->node->id, frame, frame->length);
+
+    ngx_http_v2_queue_blocked_frame(stream->connection, frame);
+
+    cln = ngx_http_cleanup_add(r, 0);
+    if (cln == NULL) {
+        return NGX_ERROR;
+    }
+
+    cln->handler = ngx_http_v2_filter_cleanup;
+    cln->data = stream;
+
+    stream->queued = 1;
+
+    fc->send_chain = ngx_http_v2_send_chain;
+    fc->need_last_buf = 1;
+
+    return ngx_http_v2_filter_send(fc, stream);
+}
+
+
+static u_char *
+ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value)
+{
+    if (value < prefix) {
+        *pos++ |= value;
+        return pos;
+    }
+
+    *pos++ |= prefix;
+    value -= prefix;
+
+    while (value >= 128) {
+        *pos++ = value % 128 + 128;
+        value /= 128;
+    }
+
+    *pos++ = (u_char) value;
+
+    return pos;
+}
+
+
+static void
+ngx_http_v2_write_headers_head(u_char *pos, size_t length, ngx_uint_t sid,
+    ngx_uint_t end_headers, ngx_uint_t end_stream)
+{
+    u_char  flags;
+
+    pos = ngx_http_v2_write_len_and_type(pos, length,
+                                         NGX_HTTP_V2_HEADERS_FRAME);
+
+    flags = NGX_HTTP_V2_NO_FLAG;
+
+    if (end_headers) {
+        flags |= NGX_HTTP_V2_END_HEADERS_FLAG;
+    }
+
+    if (end_stream) {
+        flags |= NGX_HTTP_V2_END_STREAM_FLAG;
+    }
+
+    *pos++ = flags;
+
+    (void) ngx_http_v2_write_sid(pos, sid);
+}
+
+
+static void
+ngx_http_v2_write_continuation_head(u_char *pos, size_t length, ngx_uint_t sid,
+    ngx_uint_t end_headers)
+{
+    pos = ngx_http_v2_write_len_and_type(pos, length,
+                                         NGX_HTTP_V2_CONTINUATION_FRAME);
+
+    *pos++ = end_headers ? NGX_HTTP_V2_END_HEADERS_FLAG : NGX_HTTP_V2_NO_FLAG;
+
+    (void) ngx_http_v2_write_sid(pos, sid);
+}
+
+
+static ngx_chain_t *
+ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
+{
+    off_t                      size, offset;
+    size_t                     rest, frame_size;
+    ngx_chain_t               *cl, *out, **ln;
+    ngx_http_request_t        *r;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_loc_conf_t    *h2lcf;
+    ngx_http_v2_out_frame_t   *frame;
+    ngx_http_v2_connection_t  *h2c;
+
+    r = fc->data;
+    stream = r->stream;
+
+#if (NGX_SUPPRESS_WARN)
+    size = 0;
+#endif
+
+    while (in) {
+        size = ngx_buf_size(in->buf);
+
+        if (size || in->buf->last_buf) {
+            break;
+        }
+
+        in = in->next;
+    }
+
+    if (in == NULL) {
+
+        if (stream->queued) {
+            fc->write->delayed = 1;
+        } else {
+            fc->buffered &= ~NGX_HTTP_V2_BUFFERED;
+        }
+
+        return NULL;
+    }
+
+    h2c = stream->connection;
+
+    if (size && ngx_http_v2_flow_control(h2c, stream) == NGX_DECLINED) {
+        fc->write->delayed = 1;
+        return in;
+    }
+
+    if (in->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_filter_get_shadow) {
+        cl = ngx_alloc_chain_link(r->pool);
+        if (cl == NULL) {
+            return NGX_CHAIN_ERROR;
+        }
+
+        cl->buf = in->buf;
+        in->buf = cl->buf->shadow;
+
+        offset = ngx_buf_in_memory(in->buf)
+                 ? (cl->buf->pos - in->buf->pos)
+                 : (cl->buf->file_pos - in->buf->file_pos);
+
+        cl->next = stream->free_bufs;
+        stream->free_bufs = cl;
+
+    } else {
+        offset = 0;
+    }
+
+    if (limit == 0 || limit > (off_t) h2c->send_window) {
+        limit = h2c->send_window;
+    }
+
+    if (limit > stream->send_window) {
+        limit = (stream->send_window > 0) ? stream->send_window : 0;
+    }
+
+    h2lcf = ngx_http_get_module_loc_conf(r, ngx_http_v2_module);
+
+    frame_size = (h2lcf->chunk_size < h2c->frame_size)
+                 ? h2lcf->chunk_size : h2c->frame_size;
+
+#if (NGX_SUPPRESS_WARN)
+    cl = NULL;
+#endif
+
+    for ( ;; ) {
+        if ((off_t) frame_size > limit) {
+            frame_size = (size_t) limit;
+        }
+
+        ln = &out;
+        rest = frame_size;
+
+        while ((off_t) rest >= size) {
+
+            if (offset) {
+                cl = ngx_http_v2_filter_get_shadow(stream, in->buf,
+                                                   offset, size);
+                if (cl == NULL) {
+                    return NGX_CHAIN_ERROR;
+                }
+
+                offset = 0;
+
+            } else {
+                cl = ngx_alloc_chain_link(r->pool);
+                if (cl == NULL) {
+                    return NGX_CHAIN_ERROR;
+                }
+
+                cl->buf = in->buf;
+            }
+
+            *ln = cl;
+            ln = &cl->next;
+
+            rest -= (size_t) size;
+            in = in->next;
+
+            if (in == NULL) {
+                frame_size -= rest;
+                rest = 0;
+                break;
+            }
+
+            size = ngx_buf_size(in->buf);
+        }
+
+        if (rest) {
+            cl = ngx_http_v2_filter_get_shadow(stream, in->buf, offset, rest);
+            if (cl == NULL) {
+                return NGX_CHAIN_ERROR;
+            }
+
+            cl->buf->flush = 0;
+            cl->buf->last_buf = 0;
+
+            *ln = cl;
+
+            offset += rest;
+            size -= rest;
+        }
+
+        frame = ngx_http_v2_filter_get_data_frame(stream, frame_size, out, cl);
+        if (frame == NULL) {
+            return NGX_CHAIN_ERROR;
+        }
+
+        ngx_http_v2_queue_frame(h2c, frame);
+
+        h2c->send_window -= frame_size;
+
+        stream->send_window -= frame_size;
+        stream->queued++;
+
+        if (in == NULL) {
+            break;
+        }
+
+        limit -= frame_size;
+
+        if (limit == 0) {
+            break;
+        }
+    }
+
+    if (offset) {
+        cl = ngx_http_v2_filter_get_shadow(stream, in->buf, offset, size);
+        if (cl == NULL) {
+            return NGX_CHAIN_ERROR;
+        }
+
+        in->buf = cl->buf;
+        ngx_free_chain(r->pool, cl);
+    }
+
+    if (ngx_http_v2_filter_send(fc, stream) == NGX_ERROR) {
+        return NGX_CHAIN_ERROR;
+    }
+
+    if (in && ngx_http_v2_flow_control(h2c, stream) == NGX_DECLINED) {
+        fc->write->delayed = 1;
+    }
+
+    return in;
+}
+
+
+static ngx_chain_t *
+ngx_http_v2_filter_get_shadow(ngx_http_v2_stream_t *stream, ngx_buf_t *buf,
+    off_t offset, off_t size)
+{
+    ngx_buf_t    *chunk;
+    ngx_chain_t  *cl;
+
+    cl = ngx_chain_get_free_buf(stream->request->pool, &stream->free_bufs);
+    if (cl == NULL) {
+        return NULL;
+    }
+
+    chunk = cl->buf;
+
+    ngx_memcpy(chunk, buf, sizeof(ngx_buf_t));
+
+    chunk->tag = (ngx_buf_tag_t) &ngx_http_v2_filter_get_shadow;
+    chunk->shadow = buf;
+
+    if (ngx_buf_in_memory(chunk)) {
+        chunk->pos += offset;
+        chunk->last = chunk->pos + size;
+    }
+
+    if (chunk->in_file) {
+        chunk->file_pos += offset;
+        chunk->file_last = chunk->file_pos + size;
+    }
+
+    return cl;
+}
+
+
+static ngx_http_v2_out_frame_t *
+ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
+    size_t len, ngx_chain_t *first, ngx_chain_t *last)
+{
+    u_char                      flags;
+    ngx_buf_t                  *buf;
+    ngx_chain_t                *cl;
+    ngx_http_v2_out_frame_t  *frame;
+
+
+    frame = stream->free_frames;
+
+    if (frame) {
+        stream->free_frames = frame->next;
+
+    } else {
+        frame = ngx_palloc(stream->request->pool,
+                           sizeof(ngx_http_v2_out_frame_t));
+        if (frame == NULL) {
+            return NULL;
+        }
+    }
+
+    flags = last->buf->last_buf ? NGX_HTTP_V2_END_STREAM_FLAG : 0;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, stream->request->connection->log, 0,
+                   "http2:%ui create DATA frame %p: len:%uz flags:%ui",
+                   stream->node->id, frame, len, (ngx_uint_t) flags);
+
+    cl = ngx_chain_get_free_buf(stream->request->pool,
+                                &stream->free_data_headers);
+    if (cl == NULL) {
+        return NULL;
+    }
+
+    buf = cl->buf;
+
+    if (!buf->start) {
+        buf->start = ngx_palloc(stream->request->pool,
+                                NGX_HTTP_V2_FRAME_HEADER_SIZE);
+        if (buf->start == NULL) {
+            return NULL;
+        }
+
+        buf->end = buf->start + NGX_HTTP_V2_FRAME_HEADER_SIZE;
+        buf->last = buf->end;
+
+        buf->tag = (ngx_buf_tag_t) &ngx_http_v2_filter_get_data_frame;
+        buf->memory = 1;
+    }
+
+    buf->pos = buf->start;
+    buf->last = buf->pos;
+
+    buf->last = ngx_http_v2_write_len_and_type(buf->last, len,
+                                               NGX_HTTP_V2_DATA_FRAME);
+    *buf->last++ = flags;
+
+    buf->last = ngx_http_v2_write_sid(buf->last, stream->node->id);
+
+    cl->next = first;
+    first = cl;
+
+    last->buf->flush = 1;
+
+    frame->first = first;
+    frame->last = last;
+    frame->handler = ngx_http_v2_data_frame_handler;
+    frame->stream = stream;
+    frame->length = len;
+    frame->blocked = 0;
+    frame->fin = last->buf->last_buf;
+
+    return frame;
+}
+
+
+static ngx_inline ngx_int_t
+ngx_http_v2_filter_send(ngx_connection_t *fc, ngx_http_v2_stream_t *stream)
+{
+    stream->blocked = 1;
+
+    if (ngx_http_v2_send_output_queue(stream->connection) == NGX_ERROR) {
+        fc->error = 1;
+        return NGX_ERROR;
+    }
+
+    stream->blocked = 0;
+
+    if (stream->queued) {
+        fc->buffered |= NGX_HTTP_V2_BUFFERED;
+        fc->write->delayed = 1;
+        return NGX_AGAIN;
+    }
+
+    fc->buffered &= ~NGX_HTTP_V2_BUFFERED;
+
+    return NGX_OK;
+}
+
+
+static ngx_inline ngx_int_t
+ngx_http_v2_flow_control(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_stream_t *stream)
+{
+    if (stream->send_window <= 0) {
+        stream->exhausted = 1;
+        return NGX_DECLINED;
+    }
+
+    if (h2c->send_window == 0) {
+        ngx_http_v2_waiting_queue(h2c, stream);
+        return NGX_DECLINED;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_v2_waiting_queue(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_stream_t *stream)
+{
+    ngx_queue_t           *q;
+    ngx_http_v2_stream_t  *s;
+
+    if (stream->handled) {
+        return;
+    }
+
+    stream->handled = 1;
+
+    for (q = ngx_queue_last(&h2c->waiting);
+         q != ngx_queue_sentinel(&h2c->waiting);
+         q = ngx_queue_prev(q))
+    {
+        s = ngx_queue_data(q, ngx_http_v2_stream_t, queue);
+
+        if (s->node->rank < stream->node->rank
+            || (s->node->rank == stream->node->rank
+                && s->node->rel_weight >= stream->node->rel_weight))
+        {
+            break;
+        }
+    }
+
+    ngx_queue_insert_after(q, &stream->queue);
+}
+
+
+
+static ngx_int_t
+ngx_http_v2_headers_frame_handler(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_out_frame_t *frame)
+{
+    ngx_buf_t             *buf;
+    ngx_http_v2_stream_t  *stream;
+
+    buf = frame->first->buf;
+
+    if (buf->pos != buf->last) {
+        return NGX_AGAIN;
+    }
+
+    stream = frame->stream;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2:%ui HEADERS frame %p was sent",
+                   stream->node->id, frame);
+
+    ngx_free_chain(stream->request->pool, frame->first);
+
+    ngx_http_v2_handle_frame(stream, frame);
+
+    ngx_http_v2_handle_stream(h2c, stream);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_data_frame_handler(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_out_frame_t *frame)
+{
+    ngx_buf_t             *buf;
+    ngx_chain_t           *cl, *ln;
+    ngx_http_v2_stream_t  *stream;
+
+    stream = frame->stream;
+
+    cl = frame->first;
+
+    if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_filter_get_data_frame) {
+
+        if (cl->buf->pos != cl->buf->last) {
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                           "http2:%ui DATA frame %p was sent partially",
+                           stream->node->id, frame);
+
+            return NGX_AGAIN;
+        }
+
+        ln = cl->next;
+
+        cl->next = stream->free_data_headers;
+        stream->free_data_headers = cl;
+
+        if (cl == frame->last) {
+            goto done;
+        }
+
+        cl = ln;
+    }
+
+    for ( ;; ) {
+        if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_filter_get_shadow) {
+            buf = cl->buf->shadow;
+
+            if (ngx_buf_in_memory(buf)) {
+                buf->pos = cl->buf->pos;
+            }
+
+            if (buf->in_file) {
+                buf->file_pos = cl->buf->file_pos;
+            }
+        }
+
+        if (ngx_buf_size(cl->buf) != 0) {
+
+            if (cl != frame->first) {
+                frame->first = cl;
+                ngx_http_v2_handle_stream(h2c, stream);
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                           "http2:%ui DATA frame %p was sent partially",
+                           stream->node->id, frame);
+
+            return NGX_AGAIN;
+        }
+
+        ln = cl->next;
+
+        if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_filter_get_shadow) {
+            cl->next = stream->free_bufs;
+            stream->free_bufs = cl;
+
+        } else {
+            ngx_free_chain(stream->request->pool, cl);
+        }
+
+        if (cl == frame->last) {
+            goto done;
+        }
+
+        cl = ln;
+    }
+
+done:
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2:%ui DATA frame %p was sent",
+                   stream->node->id, frame);
+
+    stream->request->header_size += NGX_HTTP_V2_FRAME_HEADER_SIZE;
+
+    ngx_http_v2_handle_frame(stream, frame);
+
+    ngx_http_v2_handle_stream(h2c, stream);
+
+    return NGX_OK;
+}
+
+
+static ngx_inline void
+ngx_http_v2_handle_frame(ngx_http_v2_stream_t *stream,
+    ngx_http_v2_out_frame_t *frame)
+{
+    ngx_http_request_t  *r;
+
+    r = stream->request;
+
+    r->connection->sent += NGX_HTTP_V2_FRAME_HEADER_SIZE + frame->length;
+
+    if (frame->fin) {
+        stream->out_closed = 1;
+    }
+
+    frame->next = stream->free_frames;
+    stream->free_frames = frame;
+
+    stream->queued--;
+}
+
+
+static ngx_inline void
+ngx_http_v2_handle_stream(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_stream_t *stream)
+{
+    ngx_event_t  *wev;
+
+    if (stream->handled || stream->blocked || stream->exhausted) {
+        return;
+    }
+
+    wev = stream->request->connection->write;
+
+    /*
+     * This timer can only be set if the stream was delayed because of rate
+     * limit.  In that case the event should be triggered by the timer.
+     */
+
+    if (!wev->timer_set) {
+        wev->delayed = 0;
+
+        stream->handled = 1;
+        ngx_queue_insert_tail(&h2c->posted, &stream->queue);
+    }
+}
+
+
+static void
+ngx_http_v2_filter_cleanup(void *data)
+{
+    ngx_http_v2_stream_t *stream = data;
+
+    size_t                     window;
+    ngx_http_v2_out_frame_t   *frame, **fn;
+    ngx_http_v2_connection_t  *h2c;
+
+    if (stream->handled) {
+        stream->handled = 0;
+        ngx_queue_remove(&stream->queue);
+    }
+
+    if (stream->queued == 0) {
+        return;
+    }
+
+    window = 0;
+    h2c = stream->connection;
+    fn = &h2c->last_out;
+
+    for ( ;; ) {
+        frame = *fn;
+
+        if (frame == NULL) {
+            break;
+        }
+
+        if (frame->stream == stream && !frame->blocked) {
+            *fn = frame->next;
+
+            window += frame->length;
+
+            if (--stream->queued == 0) {
+                break;
+            }
+
+            continue;
+        }
+
+        fn = &frame->next;
+    }
+
+    if (h2c->send_window == 0 && window && !ngx_queue_empty(&h2c->waiting)) {
+        ngx_queue_add(&h2c->posted, &h2c->waiting);
+        ngx_queue_init(&h2c->waiting);
+    }
+
+    h2c->send_window += window;
+}
+
+
+static ngx_int_t
+ngx_http_v2_filter_init(ngx_conf_t *cf)
+{
+    ngx_http_next_header_filter = ngx_http_top_header_filter;
+    ngx_http_top_header_filter = ngx_http_v2_header_filter;
+
+    return NGX_OK;
+}
diff --git a/src/http/v2/ngx_http_v2_huff_decode.c b/src/http/v2/ngx_http_v2_huff_decode.c
new file mode 100644
index 0000000..49ca576
--- /dev/null
+++ b/src/http/v2/ngx_http_v2_huff_decode.c
@@ -0,0 +1,2714 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Valentin V. Bartenev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    u_char  next;
+    u_char  emit;
+    u_char  sym;
+    u_char  ending;
+} ngx_http_v2_huff_decode_code_t;
+
+
+static ngx_inline ngx_int_t ngx_http_v2_huff_decode_bits(u_char *state,
+    u_char *ending, ngx_uint_t bits, u_char **dst);
+
+
+static ngx_http_v2_huff_decode_code_t  ngx_http_v2_huff_decode_codes[256][16] =
+{
+    /* 0 */
+    {
+        {0x04, 0x00, 0x00, 0x00}, {0x05, 0x00, 0x00, 0x00},
+        {0x07, 0x00, 0x00, 0x00}, {0x08, 0x00, 0x00, 0x00},
+        {0x0b, 0x00, 0x00, 0x00}, {0x0c, 0x00, 0x00, 0x00},
+        {0x10, 0x00, 0x00, 0x00}, {0x13, 0x00, 0x00, 0x00},
+        {0x19, 0x00, 0x00, 0x00}, {0x1c, 0x00, 0x00, 0x00},
+        {0x20, 0x00, 0x00, 0x00}, {0x23, 0x00, 0x00, 0x00},
+        {0x2a, 0x00, 0x00, 0x00}, {0x31, 0x00, 0x00, 0x00},
+        {0x39, 0x00, 0x00, 0x00}, {0x40, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x00, 0x01, 0x30, 0x01}, {0x00, 0x01, 0x31, 0x01},
+        {0x00, 0x01, 0x32, 0x01}, {0x00, 0x01, 0x61, 0x01},
+        {0x00, 0x01, 0x63, 0x01}, {0x00, 0x01, 0x65, 0x01},
+        {0x00, 0x01, 0x69, 0x01}, {0x00, 0x01, 0x6f, 0x01},
+        {0x00, 0x01, 0x73, 0x01}, {0x00, 0x01, 0x74, 0x01},
+        {0x0d, 0x00, 0x00, 0x00}, {0x0e, 0x00, 0x00, 0x00},
+        {0x11, 0x00, 0x00, 0x00}, {0x12, 0x00, 0x00, 0x00},
+        {0x14, 0x00, 0x00, 0x00}, {0x15, 0x00, 0x00, 0x00}
+    },
+    {
+        {0x01, 0x01, 0x30, 0x00}, {0x16, 0x01, 0x30, 0x01},
+        {0x01, 0x01, 0x31, 0x00}, {0x16, 0x01, 0x31, 0x01},
+        {0x01, 0x01, 0x32, 0x00}, {0x16, 0x01, 0x32, 0x01},
+        {0x01, 0x01, 0x61, 0x00}, {0x16, 0x01, 0x61, 0x01},
+        {0x01, 0x01, 0x63, 0x00}, {0x16, 0x01, 0x63, 0x01},
+        {0x01, 0x01, 0x65, 0x00}, {0x16, 0x01, 0x65, 0x01},
+        {0x01, 0x01, 0x69, 0x00}, {0x16, 0x01, 0x69, 0x01},
+        {0x01, 0x01, 0x6f, 0x00}, {0x16, 0x01, 0x6f, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x30, 0x00}, {0x09, 0x01, 0x30, 0x00},
+        {0x17, 0x01, 0x30, 0x00}, {0x28, 0x01, 0x30, 0x01},
+        {0x02, 0x01, 0x31, 0x00}, {0x09, 0x01, 0x31, 0x00},
+        {0x17, 0x01, 0x31, 0x00}, {0x28, 0x01, 0x31, 0x01},
+        {0x02, 0x01, 0x32, 0x00}, {0x09, 0x01, 0x32, 0x00},
+        {0x17, 0x01, 0x32, 0x00}, {0x28, 0x01, 0x32, 0x01},
+        {0x02, 0x01, 0x61, 0x00}, {0x09, 0x01, 0x61, 0x00},
+        {0x17, 0x01, 0x61, 0x00}, {0x28, 0x01, 0x61, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x30, 0x00}, {0x06, 0x01, 0x30, 0x00},
+        {0x0a, 0x01, 0x30, 0x00}, {0x0f, 0x01, 0x30, 0x00},
+        {0x18, 0x01, 0x30, 0x00}, {0x1f, 0x01, 0x30, 0x00},
+        {0x29, 0x01, 0x30, 0x00}, {0x38, 0x01, 0x30, 0x01},
+        {0x03, 0x01, 0x31, 0x00}, {0x06, 0x01, 0x31, 0x00},
+        {0x0a, 0x01, 0x31, 0x00}, {0x0f, 0x01, 0x31, 0x00},
+        {0x18, 0x01, 0x31, 0x00}, {0x1f, 0x01, 0x31, 0x00},
+        {0x29, 0x01, 0x31, 0x00}, {0x38, 0x01, 0x31, 0x01}
+    },
+    /* 5 */
+    {
+        {0x03, 0x01, 0x32, 0x00}, {0x06, 0x01, 0x32, 0x00},
+        {0x0a, 0x01, 0x32, 0x00}, {0x0f, 0x01, 0x32, 0x00},
+        {0x18, 0x01, 0x32, 0x00}, {0x1f, 0x01, 0x32, 0x00},
+        {0x29, 0x01, 0x32, 0x00}, {0x38, 0x01, 0x32, 0x01},
+        {0x03, 0x01, 0x61, 0x00}, {0x06, 0x01, 0x61, 0x00},
+        {0x0a, 0x01, 0x61, 0x00}, {0x0f, 0x01, 0x61, 0x00},
+        {0x18, 0x01, 0x61, 0x00}, {0x1f, 0x01, 0x61, 0x00},
+        {0x29, 0x01, 0x61, 0x00}, {0x38, 0x01, 0x61, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x63, 0x00}, {0x09, 0x01, 0x63, 0x00},
+        {0x17, 0x01, 0x63, 0x00}, {0x28, 0x01, 0x63, 0x01},
+        {0x02, 0x01, 0x65, 0x00}, {0x09, 0x01, 0x65, 0x00},
+        {0x17, 0x01, 0x65, 0x00}, {0x28, 0x01, 0x65, 0x01},
+        {0x02, 0x01, 0x69, 0x00}, {0x09, 0x01, 0x69, 0x00},
+        {0x17, 0x01, 0x69, 0x00}, {0x28, 0x01, 0x69, 0x01},
+        {0x02, 0x01, 0x6f, 0x00}, {0x09, 0x01, 0x6f, 0x00},
+        {0x17, 0x01, 0x6f, 0x00}, {0x28, 0x01, 0x6f, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x63, 0x00}, {0x06, 0x01, 0x63, 0x00},
+        {0x0a, 0x01, 0x63, 0x00}, {0x0f, 0x01, 0x63, 0x00},
+        {0x18, 0x01, 0x63, 0x00}, {0x1f, 0x01, 0x63, 0x00},
+        {0x29, 0x01, 0x63, 0x00}, {0x38, 0x01, 0x63, 0x01},
+        {0x03, 0x01, 0x65, 0x00}, {0x06, 0x01, 0x65, 0x00},
+        {0x0a, 0x01, 0x65, 0x00}, {0x0f, 0x01, 0x65, 0x00},
+        {0x18, 0x01, 0x65, 0x00}, {0x1f, 0x01, 0x65, 0x00},
+        {0x29, 0x01, 0x65, 0x00}, {0x38, 0x01, 0x65, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x69, 0x00}, {0x06, 0x01, 0x69, 0x00},
+        {0x0a, 0x01, 0x69, 0x00}, {0x0f, 0x01, 0x69, 0x00},
+        {0x18, 0x01, 0x69, 0x00}, {0x1f, 0x01, 0x69, 0x00},
+        {0x29, 0x01, 0x69, 0x00}, {0x38, 0x01, 0x69, 0x01},
+        {0x03, 0x01, 0x6f, 0x00}, {0x06, 0x01, 0x6f, 0x00},
+        {0x0a, 0x01, 0x6f, 0x00}, {0x0f, 0x01, 0x6f, 0x00},
+        {0x18, 0x01, 0x6f, 0x00}, {0x1f, 0x01, 0x6f, 0x00},
+        {0x29, 0x01, 0x6f, 0x00}, {0x38, 0x01, 0x6f, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x73, 0x00}, {0x16, 0x01, 0x73, 0x01},
+        {0x01, 0x01, 0x74, 0x00}, {0x16, 0x01, 0x74, 0x01},
+        {0x00, 0x01, 0x20, 0x01}, {0x00, 0x01, 0x25, 0x01},
+        {0x00, 0x01, 0x2d, 0x01}, {0x00, 0x01, 0x2e, 0x01},
+        {0x00, 0x01, 0x2f, 0x01}, {0x00, 0x01, 0x33, 0x01},
+        {0x00, 0x01, 0x34, 0x01}, {0x00, 0x01, 0x35, 0x01},
+        {0x00, 0x01, 0x36, 0x01}, {0x00, 0x01, 0x37, 0x01},
+        {0x00, 0x01, 0x38, 0x01}, {0x00, 0x01, 0x39, 0x01}
+    },
+    /* 10 */
+    {
+        {0x02, 0x01, 0x73, 0x00}, {0x09, 0x01, 0x73, 0x00},
+        {0x17, 0x01, 0x73, 0x00}, {0x28, 0x01, 0x73, 0x01},
+        {0x02, 0x01, 0x74, 0x00}, {0x09, 0x01, 0x74, 0x00},
+        {0x17, 0x01, 0x74, 0x00}, {0x28, 0x01, 0x74, 0x01},
+        {0x01, 0x01, 0x20, 0x00}, {0x16, 0x01, 0x20, 0x01},
+        {0x01, 0x01, 0x25, 0x00}, {0x16, 0x01, 0x25, 0x01},
+        {0x01, 0x01, 0x2d, 0x00}, {0x16, 0x01, 0x2d, 0x01},
+        {0x01, 0x01, 0x2e, 0x00}, {0x16, 0x01, 0x2e, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x73, 0x00}, {0x06, 0x01, 0x73, 0x00},
+        {0x0a, 0x01, 0x73, 0x00}, {0x0f, 0x01, 0x73, 0x00},
+        {0x18, 0x01, 0x73, 0x00}, {0x1f, 0x01, 0x73, 0x00},
+        {0x29, 0x01, 0x73, 0x00}, {0x38, 0x01, 0x73, 0x01},
+        {0x03, 0x01, 0x74, 0x00}, {0x06, 0x01, 0x74, 0x00},
+        {0x0a, 0x01, 0x74, 0x00}, {0x0f, 0x01, 0x74, 0x00},
+        {0x18, 0x01, 0x74, 0x00}, {0x1f, 0x01, 0x74, 0x00},
+        {0x29, 0x01, 0x74, 0x00}, {0x38, 0x01, 0x74, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x20, 0x00}, {0x09, 0x01, 0x20, 0x00},
+        {0x17, 0x01, 0x20, 0x00}, {0x28, 0x01, 0x20, 0x01},
+        {0x02, 0x01, 0x25, 0x00}, {0x09, 0x01, 0x25, 0x00},
+        {0x17, 0x01, 0x25, 0x00}, {0x28, 0x01, 0x25, 0x01},
+        {0x02, 0x01, 0x2d, 0x00}, {0x09, 0x01, 0x2d, 0x00},
+        {0x17, 0x01, 0x2d, 0x00}, {0x28, 0x01, 0x2d, 0x01},
+        {0x02, 0x01, 0x2e, 0x00}, {0x09, 0x01, 0x2e, 0x00},
+        {0x17, 0x01, 0x2e, 0x00}, {0x28, 0x01, 0x2e, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x20, 0x00}, {0x06, 0x01, 0x20, 0x00},
+        {0x0a, 0x01, 0x20, 0x00}, {0x0f, 0x01, 0x20, 0x00},
+        {0x18, 0x01, 0x20, 0x00}, {0x1f, 0x01, 0x20, 0x00},
+        {0x29, 0x01, 0x20, 0x00}, {0x38, 0x01, 0x20, 0x01},
+        {0x03, 0x01, 0x25, 0x00}, {0x06, 0x01, 0x25, 0x00},
+        {0x0a, 0x01, 0x25, 0x00}, {0x0f, 0x01, 0x25, 0x00},
+        {0x18, 0x01, 0x25, 0x00}, {0x1f, 0x01, 0x25, 0x00},
+        {0x29, 0x01, 0x25, 0x00}, {0x38, 0x01, 0x25, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x2d, 0x00}, {0x06, 0x01, 0x2d, 0x00},
+        {0x0a, 0x01, 0x2d, 0x00}, {0x0f, 0x01, 0x2d, 0x00},
+        {0x18, 0x01, 0x2d, 0x00}, {0x1f, 0x01, 0x2d, 0x00},
+        {0x29, 0x01, 0x2d, 0x00}, {0x38, 0x01, 0x2d, 0x01},
+        {0x03, 0x01, 0x2e, 0x00}, {0x06, 0x01, 0x2e, 0x00},
+        {0x0a, 0x01, 0x2e, 0x00}, {0x0f, 0x01, 0x2e, 0x00},
+        {0x18, 0x01, 0x2e, 0x00}, {0x1f, 0x01, 0x2e, 0x00},
+        {0x29, 0x01, 0x2e, 0x00}, {0x38, 0x01, 0x2e, 0x01}
+    },
+    /* 15 */
+    {
+        {0x01, 0x01, 0x2f, 0x00}, {0x16, 0x01, 0x2f, 0x01},
+        {0x01, 0x01, 0x33, 0x00}, {0x16, 0x01, 0x33, 0x01},
+        {0x01, 0x01, 0x34, 0x00}, {0x16, 0x01, 0x34, 0x01},
+        {0x01, 0x01, 0x35, 0x00}, {0x16, 0x01, 0x35, 0x01},
+        {0x01, 0x01, 0x36, 0x00}, {0x16, 0x01, 0x36, 0x01},
+        {0x01, 0x01, 0x37, 0x00}, {0x16, 0x01, 0x37, 0x01},
+        {0x01, 0x01, 0x38, 0x00}, {0x16, 0x01, 0x38, 0x01},
+        {0x01, 0x01, 0x39, 0x00}, {0x16, 0x01, 0x39, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x2f, 0x00}, {0x09, 0x01, 0x2f, 0x00},
+        {0x17, 0x01, 0x2f, 0x00}, {0x28, 0x01, 0x2f, 0x01},
+        {0x02, 0x01, 0x33, 0x00}, {0x09, 0x01, 0x33, 0x00},
+        {0x17, 0x01, 0x33, 0x00}, {0x28, 0x01, 0x33, 0x01},
+        {0x02, 0x01, 0x34, 0x00}, {0x09, 0x01, 0x34, 0x00},
+        {0x17, 0x01, 0x34, 0x00}, {0x28, 0x01, 0x34, 0x01},
+        {0x02, 0x01, 0x35, 0x00}, {0x09, 0x01, 0x35, 0x00},
+        {0x17, 0x01, 0x35, 0x00}, {0x28, 0x01, 0x35, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x2f, 0x00}, {0x06, 0x01, 0x2f, 0x00},
+        {0x0a, 0x01, 0x2f, 0x00}, {0x0f, 0x01, 0x2f, 0x00},
+        {0x18, 0x01, 0x2f, 0x00}, {0x1f, 0x01, 0x2f, 0x00},
+        {0x29, 0x01, 0x2f, 0x00}, {0x38, 0x01, 0x2f, 0x01},
+        {0x03, 0x01, 0x33, 0x00}, {0x06, 0x01, 0x33, 0x00},
+        {0x0a, 0x01, 0x33, 0x00}, {0x0f, 0x01, 0x33, 0x00},
+        {0x18, 0x01, 0x33, 0x00}, {0x1f, 0x01, 0x33, 0x00},
+        {0x29, 0x01, 0x33, 0x00}, {0x38, 0x01, 0x33, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x34, 0x00}, {0x06, 0x01, 0x34, 0x00},
+        {0x0a, 0x01, 0x34, 0x00}, {0x0f, 0x01, 0x34, 0x00},
+        {0x18, 0x01, 0x34, 0x00}, {0x1f, 0x01, 0x34, 0x00},
+        {0x29, 0x01, 0x34, 0x00}, {0x38, 0x01, 0x34, 0x01},
+        {0x03, 0x01, 0x35, 0x00}, {0x06, 0x01, 0x35, 0x00},
+        {0x0a, 0x01, 0x35, 0x00}, {0x0f, 0x01, 0x35, 0x00},
+        {0x18, 0x01, 0x35, 0x00}, {0x1f, 0x01, 0x35, 0x00},
+        {0x29, 0x01, 0x35, 0x00}, {0x38, 0x01, 0x35, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x36, 0x00}, {0x09, 0x01, 0x36, 0x00},
+        {0x17, 0x01, 0x36, 0x00}, {0x28, 0x01, 0x36, 0x01},
+        {0x02, 0x01, 0x37, 0x00}, {0x09, 0x01, 0x37, 0x00},
+        {0x17, 0x01, 0x37, 0x00}, {0x28, 0x01, 0x37, 0x01},
+        {0x02, 0x01, 0x38, 0x00}, {0x09, 0x01, 0x38, 0x00},
+        {0x17, 0x01, 0x38, 0x00}, {0x28, 0x01, 0x38, 0x01},
+        {0x02, 0x01, 0x39, 0x00}, {0x09, 0x01, 0x39, 0x00},
+        {0x17, 0x01, 0x39, 0x00}, {0x28, 0x01, 0x39, 0x01}
+    },
+    /* 20 */
+    {
+        {0x03, 0x01, 0x36, 0x00}, {0x06, 0x01, 0x36, 0x00},
+        {0x0a, 0x01, 0x36, 0x00}, {0x0f, 0x01, 0x36, 0x00},
+        {0x18, 0x01, 0x36, 0x00}, {0x1f, 0x01, 0x36, 0x00},
+        {0x29, 0x01, 0x36, 0x00}, {0x38, 0x01, 0x36, 0x01},
+        {0x03, 0x01, 0x37, 0x00}, {0x06, 0x01, 0x37, 0x00},
+        {0x0a, 0x01, 0x37, 0x00}, {0x0f, 0x01, 0x37, 0x00},
+        {0x18, 0x01, 0x37, 0x00}, {0x1f, 0x01, 0x37, 0x00},
+        {0x29, 0x01, 0x37, 0x00}, {0x38, 0x01, 0x37, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x38, 0x00}, {0x06, 0x01, 0x38, 0x00},
+        {0x0a, 0x01, 0x38, 0x00}, {0x0f, 0x01, 0x38, 0x00},
+        {0x18, 0x01, 0x38, 0x00}, {0x1f, 0x01, 0x38, 0x00},
+        {0x29, 0x01, 0x38, 0x00}, {0x38, 0x01, 0x38, 0x01},
+        {0x03, 0x01, 0x39, 0x00}, {0x06, 0x01, 0x39, 0x00},
+        {0x0a, 0x01, 0x39, 0x00}, {0x0f, 0x01, 0x39, 0x00},
+        {0x18, 0x01, 0x39, 0x00}, {0x1f, 0x01, 0x39, 0x00},
+        {0x29, 0x01, 0x39, 0x00}, {0x38, 0x01, 0x39, 0x01}
+    },
+    {
+        {0x1a, 0x00, 0x00, 0x00}, {0x1b, 0x00, 0x00, 0x00},
+        {0x1d, 0x00, 0x00, 0x00}, {0x1e, 0x00, 0x00, 0x00},
+        {0x21, 0x00, 0x00, 0x00}, {0x22, 0x00, 0x00, 0x00},
+        {0x24, 0x00, 0x00, 0x00}, {0x25, 0x00, 0x00, 0x00},
+        {0x2b, 0x00, 0x00, 0x00}, {0x2e, 0x00, 0x00, 0x00},
+        {0x32, 0x00, 0x00, 0x00}, {0x35, 0x00, 0x00, 0x00},
+        {0x3a, 0x00, 0x00, 0x00}, {0x3d, 0x00, 0x00, 0x00},
+        {0x41, 0x00, 0x00, 0x00}, {0x44, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x00, 0x01, 0x3d, 0x01}, {0x00, 0x01, 0x41, 0x01},
+        {0x00, 0x01, 0x5f, 0x01}, {0x00, 0x01, 0x62, 0x01},
+        {0x00, 0x01, 0x64, 0x01}, {0x00, 0x01, 0x66, 0x01},
+        {0x00, 0x01, 0x67, 0x01}, {0x00, 0x01, 0x68, 0x01},
+        {0x00, 0x01, 0x6c, 0x01}, {0x00, 0x01, 0x6d, 0x01},
+        {0x00, 0x01, 0x6e, 0x01}, {0x00, 0x01, 0x70, 0x01},
+        {0x00, 0x01, 0x72, 0x01}, {0x00, 0x01, 0x75, 0x01},
+        {0x26, 0x00, 0x00, 0x00}, {0x27, 0x00, 0x00, 0x00}
+    },
+    {
+        {0x01, 0x01, 0x3d, 0x00}, {0x16, 0x01, 0x3d, 0x01},
+        {0x01, 0x01, 0x41, 0x00}, {0x16, 0x01, 0x41, 0x01},
+        {0x01, 0x01, 0x5f, 0x00}, {0x16, 0x01, 0x5f, 0x01},
+        {0x01, 0x01, 0x62, 0x00}, {0x16, 0x01, 0x62, 0x01},
+        {0x01, 0x01, 0x64, 0x00}, {0x16, 0x01, 0x64, 0x01},
+        {0x01, 0x01, 0x66, 0x00}, {0x16, 0x01, 0x66, 0x01},
+        {0x01, 0x01, 0x67, 0x00}, {0x16, 0x01, 0x67, 0x01},
+        {0x01, 0x01, 0x68, 0x00}, {0x16, 0x01, 0x68, 0x01}
+    },
+    /* 25 */
+    {
+        {0x02, 0x01, 0x3d, 0x00}, {0x09, 0x01, 0x3d, 0x00},
+        {0x17, 0x01, 0x3d, 0x00}, {0x28, 0x01, 0x3d, 0x01},
+        {0x02, 0x01, 0x41, 0x00}, {0x09, 0x01, 0x41, 0x00},
+        {0x17, 0x01, 0x41, 0x00}, {0x28, 0x01, 0x41, 0x01},
+        {0x02, 0x01, 0x5f, 0x00}, {0x09, 0x01, 0x5f, 0x00},
+        {0x17, 0x01, 0x5f, 0x00}, {0x28, 0x01, 0x5f, 0x01},
+        {0x02, 0x01, 0x62, 0x00}, {0x09, 0x01, 0x62, 0x00},
+        {0x17, 0x01, 0x62, 0x00}, {0x28, 0x01, 0x62, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x3d, 0x00}, {0x06, 0x01, 0x3d, 0x00},
+        {0x0a, 0x01, 0x3d, 0x00}, {0x0f, 0x01, 0x3d, 0x00},
+        {0x18, 0x01, 0x3d, 0x00}, {0x1f, 0x01, 0x3d, 0x00},
+        {0x29, 0x01, 0x3d, 0x00}, {0x38, 0x01, 0x3d, 0x01},
+        {0x03, 0x01, 0x41, 0x00}, {0x06, 0x01, 0x41, 0x00},
+        {0x0a, 0x01, 0x41, 0x00}, {0x0f, 0x01, 0x41, 0x00},
+        {0x18, 0x01, 0x41, 0x00}, {0x1f, 0x01, 0x41, 0x00},
+        {0x29, 0x01, 0x41, 0x00}, {0x38, 0x01, 0x41, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x5f, 0x00}, {0x06, 0x01, 0x5f, 0x00},
+        {0x0a, 0x01, 0x5f, 0x00}, {0x0f, 0x01, 0x5f, 0x00},
+        {0x18, 0x01, 0x5f, 0x00}, {0x1f, 0x01, 0x5f, 0x00},
+        {0x29, 0x01, 0x5f, 0x00}, {0x38, 0x01, 0x5f, 0x01},
+        {0x03, 0x01, 0x62, 0x00}, {0x06, 0x01, 0x62, 0x00},
+        {0x0a, 0x01, 0x62, 0x00}, {0x0f, 0x01, 0x62, 0x00},
+        {0x18, 0x01, 0x62, 0x00}, {0x1f, 0x01, 0x62, 0x00},
+        {0x29, 0x01, 0x62, 0x00}, {0x38, 0x01, 0x62, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x64, 0x00}, {0x09, 0x01, 0x64, 0x00},
+        {0x17, 0x01, 0x64, 0x00}, {0x28, 0x01, 0x64, 0x01},
+        {0x02, 0x01, 0x66, 0x00}, {0x09, 0x01, 0x66, 0x00},
+        {0x17, 0x01, 0x66, 0x00}, {0x28, 0x01, 0x66, 0x01},
+        {0x02, 0x01, 0x67, 0x00}, {0x09, 0x01, 0x67, 0x00},
+        {0x17, 0x01, 0x67, 0x00}, {0x28, 0x01, 0x67, 0x01},
+        {0x02, 0x01, 0x68, 0x00}, {0x09, 0x01, 0x68, 0x00},
+        {0x17, 0x01, 0x68, 0x00}, {0x28, 0x01, 0x68, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x64, 0x00}, {0x06, 0x01, 0x64, 0x00},
+        {0x0a, 0x01, 0x64, 0x00}, {0x0f, 0x01, 0x64, 0x00},
+        {0x18, 0x01, 0x64, 0x00}, {0x1f, 0x01, 0x64, 0x00},
+        {0x29, 0x01, 0x64, 0x00}, {0x38, 0x01, 0x64, 0x01},
+        {0x03, 0x01, 0x66, 0x00}, {0x06, 0x01, 0x66, 0x00},
+        {0x0a, 0x01, 0x66, 0x00}, {0x0f, 0x01, 0x66, 0x00},
+        {0x18, 0x01, 0x66, 0x00}, {0x1f, 0x01, 0x66, 0x00},
+        {0x29, 0x01, 0x66, 0x00}, {0x38, 0x01, 0x66, 0x01}
+    },
+    /* 30 */
+    {
+        {0x03, 0x01, 0x67, 0x00}, {0x06, 0x01, 0x67, 0x00},
+        {0x0a, 0x01, 0x67, 0x00}, {0x0f, 0x01, 0x67, 0x00},
+        {0x18, 0x01, 0x67, 0x00}, {0x1f, 0x01, 0x67, 0x00},
+        {0x29, 0x01, 0x67, 0x00}, {0x38, 0x01, 0x67, 0x01},
+        {0x03, 0x01, 0x68, 0x00}, {0x06, 0x01, 0x68, 0x00},
+        {0x0a, 0x01, 0x68, 0x00}, {0x0f, 0x01, 0x68, 0x00},
+        {0x18, 0x01, 0x68, 0x00}, {0x1f, 0x01, 0x68, 0x00},
+        {0x29, 0x01, 0x68, 0x00}, {0x38, 0x01, 0x68, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x6c, 0x00}, {0x16, 0x01, 0x6c, 0x01},
+        {0x01, 0x01, 0x6d, 0x00}, {0x16, 0x01, 0x6d, 0x01},
+        {0x01, 0x01, 0x6e, 0x00}, {0x16, 0x01, 0x6e, 0x01},
+        {0x01, 0x01, 0x70, 0x00}, {0x16, 0x01, 0x70, 0x01},
+        {0x01, 0x01, 0x72, 0x00}, {0x16, 0x01, 0x72, 0x01},
+        {0x01, 0x01, 0x75, 0x00}, {0x16, 0x01, 0x75, 0x01},
+        {0x00, 0x01, 0x3a, 0x01}, {0x00, 0x01, 0x42, 0x01},
+        {0x00, 0x01, 0x43, 0x01}, {0x00, 0x01, 0x44, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x6c, 0x00}, {0x09, 0x01, 0x6c, 0x00},
+        {0x17, 0x01, 0x6c, 0x00}, {0x28, 0x01, 0x6c, 0x01},
+        {0x02, 0x01, 0x6d, 0x00}, {0x09, 0x01, 0x6d, 0x00},
+        {0x17, 0x01, 0x6d, 0x00}, {0x28, 0x01, 0x6d, 0x01},
+        {0x02, 0x01, 0x6e, 0x00}, {0x09, 0x01, 0x6e, 0x00},
+        {0x17, 0x01, 0x6e, 0x00}, {0x28, 0x01, 0x6e, 0x01},
+        {0x02, 0x01, 0x70, 0x00}, {0x09, 0x01, 0x70, 0x00},
+        {0x17, 0x01, 0x70, 0x00}, {0x28, 0x01, 0x70, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x6c, 0x00}, {0x06, 0x01, 0x6c, 0x00},
+        {0x0a, 0x01, 0x6c, 0x00}, {0x0f, 0x01, 0x6c, 0x00},
+        {0x18, 0x01, 0x6c, 0x00}, {0x1f, 0x01, 0x6c, 0x00},
+        {0x29, 0x01, 0x6c, 0x00}, {0x38, 0x01, 0x6c, 0x01},
+        {0x03, 0x01, 0x6d, 0x00}, {0x06, 0x01, 0x6d, 0x00},
+        {0x0a, 0x01, 0x6d, 0x00}, {0x0f, 0x01, 0x6d, 0x00},
+        {0x18, 0x01, 0x6d, 0x00}, {0x1f, 0x01, 0x6d, 0x00},
+        {0x29, 0x01, 0x6d, 0x00}, {0x38, 0x01, 0x6d, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x6e, 0x00}, {0x06, 0x01, 0x6e, 0x00},
+        {0x0a, 0x01, 0x6e, 0x00}, {0x0f, 0x01, 0x6e, 0x00},
+        {0x18, 0x01, 0x6e, 0x00}, {0x1f, 0x01, 0x6e, 0x00},
+        {0x29, 0x01, 0x6e, 0x00}, {0x38, 0x01, 0x6e, 0x01},
+        {0x03, 0x01, 0x70, 0x00}, {0x06, 0x01, 0x70, 0x00},
+        {0x0a, 0x01, 0x70, 0x00}, {0x0f, 0x01, 0x70, 0x00},
+        {0x18, 0x01, 0x70, 0x00}, {0x1f, 0x01, 0x70, 0x00},
+        {0x29, 0x01, 0x70, 0x00}, {0x38, 0x01, 0x70, 0x01}
+    },
+    /* 35 */
+    {
+        {0x02, 0x01, 0x72, 0x00}, {0x09, 0x01, 0x72, 0x00},
+        {0x17, 0x01, 0x72, 0x00}, {0x28, 0x01, 0x72, 0x01},
+        {0x02, 0x01, 0x75, 0x00}, {0x09, 0x01, 0x75, 0x00},
+        {0x17, 0x01, 0x75, 0x00}, {0x28, 0x01, 0x75, 0x01},
+        {0x01, 0x01, 0x3a, 0x00}, {0x16, 0x01, 0x3a, 0x01},
+        {0x01, 0x01, 0x42, 0x00}, {0x16, 0x01, 0x42, 0x01},
+        {0x01, 0x01, 0x43, 0x00}, {0x16, 0x01, 0x43, 0x01},
+        {0x01, 0x01, 0x44, 0x00}, {0x16, 0x01, 0x44, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x72, 0x00}, {0x06, 0x01, 0x72, 0x00},
+        {0x0a, 0x01, 0x72, 0x00}, {0x0f, 0x01, 0x72, 0x00},
+        {0x18, 0x01, 0x72, 0x00}, {0x1f, 0x01, 0x72, 0x00},
+        {0x29, 0x01, 0x72, 0x00}, {0x38, 0x01, 0x72, 0x01},
+        {0x03, 0x01, 0x75, 0x00}, {0x06, 0x01, 0x75, 0x00},
+        {0x0a, 0x01, 0x75, 0x00}, {0x0f, 0x01, 0x75, 0x00},
+        {0x18, 0x01, 0x75, 0x00}, {0x1f, 0x01, 0x75, 0x00},
+        {0x29, 0x01, 0x75, 0x00}, {0x38, 0x01, 0x75, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x3a, 0x00}, {0x09, 0x01, 0x3a, 0x00},
+        {0x17, 0x01, 0x3a, 0x00}, {0x28, 0x01, 0x3a, 0x01},
+        {0x02, 0x01, 0x42, 0x00}, {0x09, 0x01, 0x42, 0x00},
+        {0x17, 0x01, 0x42, 0x00}, {0x28, 0x01, 0x42, 0x01},
+        {0x02, 0x01, 0x43, 0x00}, {0x09, 0x01, 0x43, 0x00},
+        {0x17, 0x01, 0x43, 0x00}, {0x28, 0x01, 0x43, 0x01},
+        {0x02, 0x01, 0x44, 0x00}, {0x09, 0x01, 0x44, 0x00},
+        {0x17, 0x01, 0x44, 0x00}, {0x28, 0x01, 0x44, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x3a, 0x00}, {0x06, 0x01, 0x3a, 0x00},
+        {0x0a, 0x01, 0x3a, 0x00}, {0x0f, 0x01, 0x3a, 0x00},
+        {0x18, 0x01, 0x3a, 0x00}, {0x1f, 0x01, 0x3a, 0x00},
+        {0x29, 0x01, 0x3a, 0x00}, {0x38, 0x01, 0x3a, 0x01},
+        {0x03, 0x01, 0x42, 0x00}, {0x06, 0x01, 0x42, 0x00},
+        {0x0a, 0x01, 0x42, 0x00}, {0x0f, 0x01, 0x42, 0x00},
+        {0x18, 0x01, 0x42, 0x00}, {0x1f, 0x01, 0x42, 0x00},
+        {0x29, 0x01, 0x42, 0x00}, {0x38, 0x01, 0x42, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x43, 0x00}, {0x06, 0x01, 0x43, 0x00},
+        {0x0a, 0x01, 0x43, 0x00}, {0x0f, 0x01, 0x43, 0x00},
+        {0x18, 0x01, 0x43, 0x00}, {0x1f, 0x01, 0x43, 0x00},
+        {0x29, 0x01, 0x43, 0x00}, {0x38, 0x01, 0x43, 0x01},
+        {0x03, 0x01, 0x44, 0x00}, {0x06, 0x01, 0x44, 0x00},
+        {0x0a, 0x01, 0x44, 0x00}, {0x0f, 0x01, 0x44, 0x00},
+        {0x18, 0x01, 0x44, 0x00}, {0x1f, 0x01, 0x44, 0x00},
+        {0x29, 0x01, 0x44, 0x00}, {0x38, 0x01, 0x44, 0x01}
+    },
+    /* 40 */
+    {
+        {0x2c, 0x00, 0x00, 0x00}, {0x2d, 0x00, 0x00, 0x00},
+        {0x2f, 0x00, 0x00, 0x00}, {0x30, 0x00, 0x00, 0x00},
+        {0x33, 0x00, 0x00, 0x00}, {0x34, 0x00, 0x00, 0x00},
+        {0x36, 0x00, 0x00, 0x00}, {0x37, 0x00, 0x00, 0x00},
+        {0x3b, 0x00, 0x00, 0x00}, {0x3c, 0x00, 0x00, 0x00},
+        {0x3e, 0x00, 0x00, 0x00}, {0x3f, 0x00, 0x00, 0x00},
+        {0x42, 0x00, 0x00, 0x00}, {0x43, 0x00, 0x00, 0x00},
+        {0x45, 0x00, 0x00, 0x00}, {0x48, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x00, 0x01, 0x45, 0x01}, {0x00, 0x01, 0x46, 0x01},
+        {0x00, 0x01, 0x47, 0x01}, {0x00, 0x01, 0x48, 0x01},
+        {0x00, 0x01, 0x49, 0x01}, {0x00, 0x01, 0x4a, 0x01},
+        {0x00, 0x01, 0x4b, 0x01}, {0x00, 0x01, 0x4c, 0x01},
+        {0x00, 0x01, 0x4d, 0x01}, {0x00, 0x01, 0x4e, 0x01},
+        {0x00, 0x01, 0x4f, 0x01}, {0x00, 0x01, 0x50, 0x01},
+        {0x00, 0x01, 0x51, 0x01}, {0x00, 0x01, 0x52, 0x01},
+        {0x00, 0x01, 0x53, 0x01}, {0x00, 0x01, 0x54, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x45, 0x00}, {0x16, 0x01, 0x45, 0x01},
+        {0x01, 0x01, 0x46, 0x00}, {0x16, 0x01, 0x46, 0x01},
+        {0x01, 0x01, 0x47, 0x00}, {0x16, 0x01, 0x47, 0x01},
+        {0x01, 0x01, 0x48, 0x00}, {0x16, 0x01, 0x48, 0x01},
+        {0x01, 0x01, 0x49, 0x00}, {0x16, 0x01, 0x49, 0x01},
+        {0x01, 0x01, 0x4a, 0x00}, {0x16, 0x01, 0x4a, 0x01},
+        {0x01, 0x01, 0x4b, 0x00}, {0x16, 0x01, 0x4b, 0x01},
+        {0x01, 0x01, 0x4c, 0x00}, {0x16, 0x01, 0x4c, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x45, 0x00}, {0x09, 0x01, 0x45, 0x00},
+        {0x17, 0x01, 0x45, 0x00}, {0x28, 0x01, 0x45, 0x01},
+        {0x02, 0x01, 0x46, 0x00}, {0x09, 0x01, 0x46, 0x00},
+        {0x17, 0x01, 0x46, 0x00}, {0x28, 0x01, 0x46, 0x01},
+        {0x02, 0x01, 0x47, 0x00}, {0x09, 0x01, 0x47, 0x00},
+        {0x17, 0x01, 0x47, 0x00}, {0x28, 0x01, 0x47, 0x01},
+        {0x02, 0x01, 0x48, 0x00}, {0x09, 0x01, 0x48, 0x00},
+        {0x17, 0x01, 0x48, 0x00}, {0x28, 0x01, 0x48, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x45, 0x00}, {0x06, 0x01, 0x45, 0x00},
+        {0x0a, 0x01, 0x45, 0x00}, {0x0f, 0x01, 0x45, 0x00},
+        {0x18, 0x01, 0x45, 0x00}, {0x1f, 0x01, 0x45, 0x00},
+        {0x29, 0x01, 0x45, 0x00}, {0x38, 0x01, 0x45, 0x01},
+        {0x03, 0x01, 0x46, 0x00}, {0x06, 0x01, 0x46, 0x00},
+        {0x0a, 0x01, 0x46, 0x00}, {0x0f, 0x01, 0x46, 0x00},
+        {0x18, 0x01, 0x46, 0x00}, {0x1f, 0x01, 0x46, 0x00},
+        {0x29, 0x01, 0x46, 0x00}, {0x38, 0x01, 0x46, 0x01}
+    },
+    /* 45 */
+    {
+        {0x03, 0x01, 0x47, 0x00}, {0x06, 0x01, 0x47, 0x00},
+        {0x0a, 0x01, 0x47, 0x00}, {0x0f, 0x01, 0x47, 0x00},
+        {0x18, 0x01, 0x47, 0x00}, {0x1f, 0x01, 0x47, 0x00},
+        {0x29, 0x01, 0x47, 0x00}, {0x38, 0x01, 0x47, 0x01},
+        {0x03, 0x01, 0x48, 0x00}, {0x06, 0x01, 0x48, 0x00},
+        {0x0a, 0x01, 0x48, 0x00}, {0x0f, 0x01, 0x48, 0x00},
+        {0x18, 0x01, 0x48, 0x00}, {0x1f, 0x01, 0x48, 0x00},
+        {0x29, 0x01, 0x48, 0x00}, {0x38, 0x01, 0x48, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x49, 0x00}, {0x09, 0x01, 0x49, 0x00},
+        {0x17, 0x01, 0x49, 0x00}, {0x28, 0x01, 0x49, 0x01},
+        {0x02, 0x01, 0x4a, 0x00}, {0x09, 0x01, 0x4a, 0x00},
+        {0x17, 0x01, 0x4a, 0x00}, {0x28, 0x01, 0x4a, 0x01},
+        {0x02, 0x01, 0x4b, 0x00}, {0x09, 0x01, 0x4b, 0x00},
+        {0x17, 0x01, 0x4b, 0x00}, {0x28, 0x01, 0x4b, 0x01},
+        {0x02, 0x01, 0x4c, 0x00}, {0x09, 0x01, 0x4c, 0x00},
+        {0x17, 0x01, 0x4c, 0x00}, {0x28, 0x01, 0x4c, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x49, 0x00}, {0x06, 0x01, 0x49, 0x00},
+        {0x0a, 0x01, 0x49, 0x00}, {0x0f, 0x01, 0x49, 0x00},
+        {0x18, 0x01, 0x49, 0x00}, {0x1f, 0x01, 0x49, 0x00},
+        {0x29, 0x01, 0x49, 0x00}, {0x38, 0x01, 0x49, 0x01},
+        {0x03, 0x01, 0x4a, 0x00}, {0x06, 0x01, 0x4a, 0x00},
+        {0x0a, 0x01, 0x4a, 0x00}, {0x0f, 0x01, 0x4a, 0x00},
+        {0x18, 0x01, 0x4a, 0x00}, {0x1f, 0x01, 0x4a, 0x00},
+        {0x29, 0x01, 0x4a, 0x00}, {0x38, 0x01, 0x4a, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x4b, 0x00}, {0x06, 0x01, 0x4b, 0x00},
+        {0x0a, 0x01, 0x4b, 0x00}, {0x0f, 0x01, 0x4b, 0x00},
+        {0x18, 0x01, 0x4b, 0x00}, {0x1f, 0x01, 0x4b, 0x00},
+        {0x29, 0x01, 0x4b, 0x00}, {0x38, 0x01, 0x4b, 0x01},
+        {0x03, 0x01, 0x4c, 0x00}, {0x06, 0x01, 0x4c, 0x00},
+        {0x0a, 0x01, 0x4c, 0x00}, {0x0f, 0x01, 0x4c, 0x00},
+        {0x18, 0x01, 0x4c, 0x00}, {0x1f, 0x01, 0x4c, 0x00},
+        {0x29, 0x01, 0x4c, 0x00}, {0x38, 0x01, 0x4c, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x4d, 0x00}, {0x16, 0x01, 0x4d, 0x01},
+        {0x01, 0x01, 0x4e, 0x00}, {0x16, 0x01, 0x4e, 0x01},
+        {0x01, 0x01, 0x4f, 0x00}, {0x16, 0x01, 0x4f, 0x01},
+        {0x01, 0x01, 0x50, 0x00}, {0x16, 0x01, 0x50, 0x01},
+        {0x01, 0x01, 0x51, 0x00}, {0x16, 0x01, 0x51, 0x01},
+        {0x01, 0x01, 0x52, 0x00}, {0x16, 0x01, 0x52, 0x01},
+        {0x01, 0x01, 0x53, 0x00}, {0x16, 0x01, 0x53, 0x01},
+        {0x01, 0x01, 0x54, 0x00}, {0x16, 0x01, 0x54, 0x01}
+    },
+    /* 50 */
+    {
+        {0x02, 0x01, 0x4d, 0x00}, {0x09, 0x01, 0x4d, 0x00},
+        {0x17, 0x01, 0x4d, 0x00}, {0x28, 0x01, 0x4d, 0x01},
+        {0x02, 0x01, 0x4e, 0x00}, {0x09, 0x01, 0x4e, 0x00},
+        {0x17, 0x01, 0x4e, 0x00}, {0x28, 0x01, 0x4e, 0x01},
+        {0x02, 0x01, 0x4f, 0x00}, {0x09, 0x01, 0x4f, 0x00},
+        {0x17, 0x01, 0x4f, 0x00}, {0x28, 0x01, 0x4f, 0x01},
+        {0x02, 0x01, 0x50, 0x00}, {0x09, 0x01, 0x50, 0x00},
+        {0x17, 0x01, 0x50, 0x00}, {0x28, 0x01, 0x50, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x4d, 0x00}, {0x06, 0x01, 0x4d, 0x00},
+        {0x0a, 0x01, 0x4d, 0x00}, {0x0f, 0x01, 0x4d, 0x00},
+        {0x18, 0x01, 0x4d, 0x00}, {0x1f, 0x01, 0x4d, 0x00},
+        {0x29, 0x01, 0x4d, 0x00}, {0x38, 0x01, 0x4d, 0x01},
+        {0x03, 0x01, 0x4e, 0x00}, {0x06, 0x01, 0x4e, 0x00},
+        {0x0a, 0x01, 0x4e, 0x00}, {0x0f, 0x01, 0x4e, 0x00},
+        {0x18, 0x01, 0x4e, 0x00}, {0x1f, 0x01, 0x4e, 0x00},
+        {0x29, 0x01, 0x4e, 0x00}, {0x38, 0x01, 0x4e, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x4f, 0x00}, {0x06, 0x01, 0x4f, 0x00},
+        {0x0a, 0x01, 0x4f, 0x00}, {0x0f, 0x01, 0x4f, 0x00},
+        {0x18, 0x01, 0x4f, 0x00}, {0x1f, 0x01, 0x4f, 0x00},
+        {0x29, 0x01, 0x4f, 0x00}, {0x38, 0x01, 0x4f, 0x01},
+        {0x03, 0x01, 0x50, 0x00}, {0x06, 0x01, 0x50, 0x00},
+        {0x0a, 0x01, 0x50, 0x00}, {0x0f, 0x01, 0x50, 0x00},
+        {0x18, 0x01, 0x50, 0x00}, {0x1f, 0x01, 0x50, 0x00},
+        {0x29, 0x01, 0x50, 0x00}, {0x38, 0x01, 0x50, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x51, 0x00}, {0x09, 0x01, 0x51, 0x00},
+        {0x17, 0x01, 0x51, 0x00}, {0x28, 0x01, 0x51, 0x01},
+        {0x02, 0x01, 0x52, 0x00}, {0x09, 0x01, 0x52, 0x00},
+        {0x17, 0x01, 0x52, 0x00}, {0x28, 0x01, 0x52, 0x01},
+        {0x02, 0x01, 0x53, 0x00}, {0x09, 0x01, 0x53, 0x00},
+        {0x17, 0x01, 0x53, 0x00}, {0x28, 0x01, 0x53, 0x01},
+        {0x02, 0x01, 0x54, 0x00}, {0x09, 0x01, 0x54, 0x00},
+        {0x17, 0x01, 0x54, 0x00}, {0x28, 0x01, 0x54, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x51, 0x00}, {0x06, 0x01, 0x51, 0x00},
+        {0x0a, 0x01, 0x51, 0x00}, {0x0f, 0x01, 0x51, 0x00},
+        {0x18, 0x01, 0x51, 0x00}, {0x1f, 0x01, 0x51, 0x00},
+        {0x29, 0x01, 0x51, 0x00}, {0x38, 0x01, 0x51, 0x01},
+        {0x03, 0x01, 0x52, 0x00}, {0x06, 0x01, 0x52, 0x00},
+        {0x0a, 0x01, 0x52, 0x00}, {0x0f, 0x01, 0x52, 0x00},
+        {0x18, 0x01, 0x52, 0x00}, {0x1f, 0x01, 0x52, 0x00},
+        {0x29, 0x01, 0x52, 0x00}, {0x38, 0x01, 0x52, 0x01}
+    },
+    /* 55 */
+    {
+        {0x03, 0x01, 0x53, 0x00}, {0x06, 0x01, 0x53, 0x00},
+        {0x0a, 0x01, 0x53, 0x00}, {0x0f, 0x01, 0x53, 0x00},
+        {0x18, 0x01, 0x53, 0x00}, {0x1f, 0x01, 0x53, 0x00},
+        {0x29, 0x01, 0x53, 0x00}, {0x38, 0x01, 0x53, 0x01},
+        {0x03, 0x01, 0x54, 0x00}, {0x06, 0x01, 0x54, 0x00},
+        {0x0a, 0x01, 0x54, 0x00}, {0x0f, 0x01, 0x54, 0x00},
+        {0x18, 0x01, 0x54, 0x00}, {0x1f, 0x01, 0x54, 0x00},
+        {0x29, 0x01, 0x54, 0x00}, {0x38, 0x01, 0x54, 0x01}
+    },
+    {
+        {0x00, 0x01, 0x55, 0x01}, {0x00, 0x01, 0x56, 0x01},
+        {0x00, 0x01, 0x57, 0x01}, {0x00, 0x01, 0x59, 0x01},
+        {0x00, 0x01, 0x6a, 0x01}, {0x00, 0x01, 0x6b, 0x01},
+        {0x00, 0x01, 0x71, 0x01}, {0x00, 0x01, 0x76, 0x01},
+        {0x00, 0x01, 0x77, 0x01}, {0x00, 0x01, 0x78, 0x01},
+        {0x00, 0x01, 0x79, 0x01}, {0x00, 0x01, 0x7a, 0x01},
+        {0x46, 0x00, 0x00, 0x00}, {0x47, 0x00, 0x00, 0x00},
+        {0x49, 0x00, 0x00, 0x00}, {0x4a, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x55, 0x00}, {0x16, 0x01, 0x55, 0x01},
+        {0x01, 0x01, 0x56, 0x00}, {0x16, 0x01, 0x56, 0x01},
+        {0x01, 0x01, 0x57, 0x00}, {0x16, 0x01, 0x57, 0x01},
+        {0x01, 0x01, 0x59, 0x00}, {0x16, 0x01, 0x59, 0x01},
+        {0x01, 0x01, 0x6a, 0x00}, {0x16, 0x01, 0x6a, 0x01},
+        {0x01, 0x01, 0x6b, 0x00}, {0x16, 0x01, 0x6b, 0x01},
+        {0x01, 0x01, 0x71, 0x00}, {0x16, 0x01, 0x71, 0x01},
+        {0x01, 0x01, 0x76, 0x00}, {0x16, 0x01, 0x76, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x55, 0x00}, {0x09, 0x01, 0x55, 0x00},
+        {0x17, 0x01, 0x55, 0x00}, {0x28, 0x01, 0x55, 0x01},
+        {0x02, 0x01, 0x56, 0x00}, {0x09, 0x01, 0x56, 0x00},
+        {0x17, 0x01, 0x56, 0x00}, {0x28, 0x01, 0x56, 0x01},
+        {0x02, 0x01, 0x57, 0x00}, {0x09, 0x01, 0x57, 0x00},
+        {0x17, 0x01, 0x57, 0x00}, {0x28, 0x01, 0x57, 0x01},
+        {0x02, 0x01, 0x59, 0x00}, {0x09, 0x01, 0x59, 0x00},
+        {0x17, 0x01, 0x59, 0x00}, {0x28, 0x01, 0x59, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x55, 0x00}, {0x06, 0x01, 0x55, 0x00},
+        {0x0a, 0x01, 0x55, 0x00}, {0x0f, 0x01, 0x55, 0x00},
+        {0x18, 0x01, 0x55, 0x00}, {0x1f, 0x01, 0x55, 0x00},
+        {0x29, 0x01, 0x55, 0x00}, {0x38, 0x01, 0x55, 0x01},
+        {0x03, 0x01, 0x56, 0x00}, {0x06, 0x01, 0x56, 0x00},
+        {0x0a, 0x01, 0x56, 0x00}, {0x0f, 0x01, 0x56, 0x00},
+        {0x18, 0x01, 0x56, 0x00}, {0x1f, 0x01, 0x56, 0x00},
+        {0x29, 0x01, 0x56, 0x00}, {0x38, 0x01, 0x56, 0x01}
+    },
+    /* 60 */
+    {
+        {0x03, 0x01, 0x57, 0x00}, {0x06, 0x01, 0x57, 0x00},
+        {0x0a, 0x01, 0x57, 0x00}, {0x0f, 0x01, 0x57, 0x00},
+        {0x18, 0x01, 0x57, 0x00}, {0x1f, 0x01, 0x57, 0x00},
+        {0x29, 0x01, 0x57, 0x00}, {0x38, 0x01, 0x57, 0x01},
+        {0x03, 0x01, 0x59, 0x00}, {0x06, 0x01, 0x59, 0x00},
+        {0x0a, 0x01, 0x59, 0x00}, {0x0f, 0x01, 0x59, 0x00},
+        {0x18, 0x01, 0x59, 0x00}, {0x1f, 0x01, 0x59, 0x00},
+        {0x29, 0x01, 0x59, 0x00}, {0x38, 0x01, 0x59, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x6a, 0x00}, {0x09, 0x01, 0x6a, 0x00},
+        {0x17, 0x01, 0x6a, 0x00}, {0x28, 0x01, 0x6a, 0x01},
+        {0x02, 0x01, 0x6b, 0x00}, {0x09, 0x01, 0x6b, 0x00},
+        {0x17, 0x01, 0x6b, 0x00}, {0x28, 0x01, 0x6b, 0x01},
+        {0x02, 0x01, 0x71, 0x00}, {0x09, 0x01, 0x71, 0x00},
+        {0x17, 0x01, 0x71, 0x00}, {0x28, 0x01, 0x71, 0x01},
+        {0x02, 0x01, 0x76, 0x00}, {0x09, 0x01, 0x76, 0x00},
+        {0x17, 0x01, 0x76, 0x00}, {0x28, 0x01, 0x76, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x6a, 0x00}, {0x06, 0x01, 0x6a, 0x00},
+        {0x0a, 0x01, 0x6a, 0x00}, {0x0f, 0x01, 0x6a, 0x00},
+        {0x18, 0x01, 0x6a, 0x00}, {0x1f, 0x01, 0x6a, 0x00},
+        {0x29, 0x01, 0x6a, 0x00}, {0x38, 0x01, 0x6a, 0x01},
+        {0x03, 0x01, 0x6b, 0x00}, {0x06, 0x01, 0x6b, 0x00},
+        {0x0a, 0x01, 0x6b, 0x00}, {0x0f, 0x01, 0x6b, 0x00},
+        {0x18, 0x01, 0x6b, 0x00}, {0x1f, 0x01, 0x6b, 0x00},
+        {0x29, 0x01, 0x6b, 0x00}, {0x38, 0x01, 0x6b, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x71, 0x00}, {0x06, 0x01, 0x71, 0x00},
+        {0x0a, 0x01, 0x71, 0x00}, {0x0f, 0x01, 0x71, 0x00},
+        {0x18, 0x01, 0x71, 0x00}, {0x1f, 0x01, 0x71, 0x00},
+        {0x29, 0x01, 0x71, 0x00}, {0x38, 0x01, 0x71, 0x01},
+        {0x03, 0x01, 0x76, 0x00}, {0x06, 0x01, 0x76, 0x00},
+        {0x0a, 0x01, 0x76, 0x00}, {0x0f, 0x01, 0x76, 0x00},
+        {0x18, 0x01, 0x76, 0x00}, {0x1f, 0x01, 0x76, 0x00},
+        {0x29, 0x01, 0x76, 0x00}, {0x38, 0x01, 0x76, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x77, 0x00}, {0x16, 0x01, 0x77, 0x01},
+        {0x01, 0x01, 0x78, 0x00}, {0x16, 0x01, 0x78, 0x01},
+        {0x01, 0x01, 0x79, 0x00}, {0x16, 0x01, 0x79, 0x01},
+        {0x01, 0x01, 0x7a, 0x00}, {0x16, 0x01, 0x7a, 0x01},
+        {0x00, 0x01, 0x26, 0x01}, {0x00, 0x01, 0x2a, 0x01},
+        {0x00, 0x01, 0x2c, 0x01}, {0x00, 0x01, 0x3b, 0x01},
+        {0x00, 0x01, 0x58, 0x01}, {0x00, 0x01, 0x5a, 0x01},
+        {0x4b, 0x00, 0x00, 0x00}, {0x4e, 0x00, 0x00, 0x01}
+    },
+    /* 65 */
+    {
+        {0x02, 0x01, 0x77, 0x00}, {0x09, 0x01, 0x77, 0x00},
+        {0x17, 0x01, 0x77, 0x00}, {0x28, 0x01, 0x77, 0x01},
+        {0x02, 0x01, 0x78, 0x00}, {0x09, 0x01, 0x78, 0x00},
+        {0x17, 0x01, 0x78, 0x00}, {0x28, 0x01, 0x78, 0x01},
+        {0x02, 0x01, 0x79, 0x00}, {0x09, 0x01, 0x79, 0x00},
+        {0x17, 0x01, 0x79, 0x00}, {0x28, 0x01, 0x79, 0x01},
+        {0x02, 0x01, 0x7a, 0x00}, {0x09, 0x01, 0x7a, 0x00},
+        {0x17, 0x01, 0x7a, 0x00}, {0x28, 0x01, 0x7a, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x77, 0x00}, {0x06, 0x01, 0x77, 0x00},
+        {0x0a, 0x01, 0x77, 0x00}, {0x0f, 0x01, 0x77, 0x00},
+        {0x18, 0x01, 0x77, 0x00}, {0x1f, 0x01, 0x77, 0x00},
+        {0x29, 0x01, 0x77, 0x00}, {0x38, 0x01, 0x77, 0x01},
+        {0x03, 0x01, 0x78, 0x00}, {0x06, 0x01, 0x78, 0x00},
+        {0x0a, 0x01, 0x78, 0x00}, {0x0f, 0x01, 0x78, 0x00},
+        {0x18, 0x01, 0x78, 0x00}, {0x1f, 0x01, 0x78, 0x00},
+        {0x29, 0x01, 0x78, 0x00}, {0x38, 0x01, 0x78, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x79, 0x00}, {0x06, 0x01, 0x79, 0x00},
+        {0x0a, 0x01, 0x79, 0x00}, {0x0f, 0x01, 0x79, 0x00},
+        {0x18, 0x01, 0x79, 0x00}, {0x1f, 0x01, 0x79, 0x00},
+        {0x29, 0x01, 0x79, 0x00}, {0x38, 0x01, 0x79, 0x01},
+        {0x03, 0x01, 0x7a, 0x00}, {0x06, 0x01, 0x7a, 0x00},
+        {0x0a, 0x01, 0x7a, 0x00}, {0x0f, 0x01, 0x7a, 0x00},
+        {0x18, 0x01, 0x7a, 0x00}, {0x1f, 0x01, 0x7a, 0x00},
+        {0x29, 0x01, 0x7a, 0x00}, {0x38, 0x01, 0x7a, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x26, 0x00}, {0x16, 0x01, 0x26, 0x01},
+        {0x01, 0x01, 0x2a, 0x00}, {0x16, 0x01, 0x2a, 0x01},
+        {0x01, 0x01, 0x2c, 0x00}, {0x16, 0x01, 0x2c, 0x01},
+        {0x01, 0x01, 0x3b, 0x00}, {0x16, 0x01, 0x3b, 0x01},
+        {0x01, 0x01, 0x58, 0x00}, {0x16, 0x01, 0x58, 0x01},
+        {0x01, 0x01, 0x5a, 0x00}, {0x16, 0x01, 0x5a, 0x01},
+        {0x4c, 0x00, 0x00, 0x00}, {0x4d, 0x00, 0x00, 0x00},
+        {0x4f, 0x00, 0x00, 0x00}, {0x51, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x26, 0x00}, {0x09, 0x01, 0x26, 0x00},
+        {0x17, 0x01, 0x26, 0x00}, {0x28, 0x01, 0x26, 0x01},
+        {0x02, 0x01, 0x2a, 0x00}, {0x09, 0x01, 0x2a, 0x00},
+        {0x17, 0x01, 0x2a, 0x00}, {0x28, 0x01, 0x2a, 0x01},
+        {0x02, 0x01, 0x2c, 0x00}, {0x09, 0x01, 0x2c, 0x00},
+        {0x17, 0x01, 0x2c, 0x00}, {0x28, 0x01, 0x2c, 0x01},
+        {0x02, 0x01, 0x3b, 0x00}, {0x09, 0x01, 0x3b, 0x00},
+        {0x17, 0x01, 0x3b, 0x00}, {0x28, 0x01, 0x3b, 0x01}
+    },
+    /* 70 */
+    {
+        {0x03, 0x01, 0x26, 0x00}, {0x06, 0x01, 0x26, 0x00},
+        {0x0a, 0x01, 0x26, 0x00}, {0x0f, 0x01, 0x26, 0x00},
+        {0x18, 0x01, 0x26, 0x00}, {0x1f, 0x01, 0x26, 0x00},
+        {0x29, 0x01, 0x26, 0x00}, {0x38, 0x01, 0x26, 0x01},
+        {0x03, 0x01, 0x2a, 0x00}, {0x06, 0x01, 0x2a, 0x00},
+        {0x0a, 0x01, 0x2a, 0x00}, {0x0f, 0x01, 0x2a, 0x00},
+        {0x18, 0x01, 0x2a, 0x00}, {0x1f, 0x01, 0x2a, 0x00},
+        {0x29, 0x01, 0x2a, 0x00}, {0x38, 0x01, 0x2a, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x2c, 0x00}, {0x06, 0x01, 0x2c, 0x00},
+        {0x0a, 0x01, 0x2c, 0x00}, {0x0f, 0x01, 0x2c, 0x00},
+        {0x18, 0x01, 0x2c, 0x00}, {0x1f, 0x01, 0x2c, 0x00},
+        {0x29, 0x01, 0x2c, 0x00}, {0x38, 0x01, 0x2c, 0x01},
+        {0x03, 0x01, 0x3b, 0x00}, {0x06, 0x01, 0x3b, 0x00},
+        {0x0a, 0x01, 0x3b, 0x00}, {0x0f, 0x01, 0x3b, 0x00},
+        {0x18, 0x01, 0x3b, 0x00}, {0x1f, 0x01, 0x3b, 0x00},
+        {0x29, 0x01, 0x3b, 0x00}, {0x38, 0x01, 0x3b, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x58, 0x00}, {0x09, 0x01, 0x58, 0x00},
+        {0x17, 0x01, 0x58, 0x00}, {0x28, 0x01, 0x58, 0x01},
+        {0x02, 0x01, 0x5a, 0x00}, {0x09, 0x01, 0x5a, 0x00},
+        {0x17, 0x01, 0x5a, 0x00}, {0x28, 0x01, 0x5a, 0x01},
+        {0x00, 0x01, 0x21, 0x01}, {0x00, 0x01, 0x22, 0x01},
+        {0x00, 0x01, 0x28, 0x01}, {0x00, 0x01, 0x29, 0x01},
+        {0x00, 0x01, 0x3f, 0x01}, {0x50, 0x00, 0x00, 0x00},
+        {0x52, 0x00, 0x00, 0x00}, {0x54, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x58, 0x00}, {0x06, 0x01, 0x58, 0x00},
+        {0x0a, 0x01, 0x58, 0x00}, {0x0f, 0x01, 0x58, 0x00},
+        {0x18, 0x01, 0x58, 0x00}, {0x1f, 0x01, 0x58, 0x00},
+        {0x29, 0x01, 0x58, 0x00}, {0x38, 0x01, 0x58, 0x01},
+        {0x03, 0x01, 0x5a, 0x00}, {0x06, 0x01, 0x5a, 0x00},
+        {0x0a, 0x01, 0x5a, 0x00}, {0x0f, 0x01, 0x5a, 0x00},
+        {0x18, 0x01, 0x5a, 0x00}, {0x1f, 0x01, 0x5a, 0x00},
+        {0x29, 0x01, 0x5a, 0x00}, {0x38, 0x01, 0x5a, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x21, 0x00}, {0x16, 0x01, 0x21, 0x01},
+        {0x01, 0x01, 0x22, 0x00}, {0x16, 0x01, 0x22, 0x01},
+        {0x01, 0x01, 0x28, 0x00}, {0x16, 0x01, 0x28, 0x01},
+        {0x01, 0x01, 0x29, 0x00}, {0x16, 0x01, 0x29, 0x01},
+        {0x01, 0x01, 0x3f, 0x00}, {0x16, 0x01, 0x3f, 0x01},
+        {0x00, 0x01, 0x27, 0x01}, {0x00, 0x01, 0x2b, 0x01},
+        {0x00, 0x01, 0x7c, 0x01}, {0x53, 0x00, 0x00, 0x00},
+        {0x55, 0x00, 0x00, 0x00}, {0x58, 0x00, 0x00, 0x01}
+    },
+    /* 75 */
+    {
+        {0x02, 0x01, 0x21, 0x00}, {0x09, 0x01, 0x21, 0x00},
+        {0x17, 0x01, 0x21, 0x00}, {0x28, 0x01, 0x21, 0x01},
+        {0x02, 0x01, 0x22, 0x00}, {0x09, 0x01, 0x22, 0x00},
+        {0x17, 0x01, 0x22, 0x00}, {0x28, 0x01, 0x22, 0x01},
+        {0x02, 0x01, 0x28, 0x00}, {0x09, 0x01, 0x28, 0x00},
+        {0x17, 0x01, 0x28, 0x00}, {0x28, 0x01, 0x28, 0x01},
+        {0x02, 0x01, 0x29, 0x00}, {0x09, 0x01, 0x29, 0x00},
+        {0x17, 0x01, 0x29, 0x00}, {0x28, 0x01, 0x29, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x21, 0x00}, {0x06, 0x01, 0x21, 0x00},
+        {0x0a, 0x01, 0x21, 0x00}, {0x0f, 0x01, 0x21, 0x00},
+        {0x18, 0x01, 0x21, 0x00}, {0x1f, 0x01, 0x21, 0x00},
+        {0x29, 0x01, 0x21, 0x00}, {0x38, 0x01, 0x21, 0x01},
+        {0x03, 0x01, 0x22, 0x00}, {0x06, 0x01, 0x22, 0x00},
+        {0x0a, 0x01, 0x22, 0x00}, {0x0f, 0x01, 0x22, 0x00},
+        {0x18, 0x01, 0x22, 0x00}, {0x1f, 0x01, 0x22, 0x00},
+        {0x29, 0x01, 0x22, 0x00}, {0x38, 0x01, 0x22, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x28, 0x00}, {0x06, 0x01, 0x28, 0x00},
+        {0x0a, 0x01, 0x28, 0x00}, {0x0f, 0x01, 0x28, 0x00},
+        {0x18, 0x01, 0x28, 0x00}, {0x1f, 0x01, 0x28, 0x00},
+        {0x29, 0x01, 0x28, 0x00}, {0x38, 0x01, 0x28, 0x01},
+        {0x03, 0x01, 0x29, 0x00}, {0x06, 0x01, 0x29, 0x00},
+        {0x0a, 0x01, 0x29, 0x00}, {0x0f, 0x01, 0x29, 0x00},
+        {0x18, 0x01, 0x29, 0x00}, {0x1f, 0x01, 0x29, 0x00},
+        {0x29, 0x01, 0x29, 0x00}, {0x38, 0x01, 0x29, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x3f, 0x00}, {0x09, 0x01, 0x3f, 0x00},
+        {0x17, 0x01, 0x3f, 0x00}, {0x28, 0x01, 0x3f, 0x01},
+        {0x01, 0x01, 0x27, 0x00}, {0x16, 0x01, 0x27, 0x01},
+        {0x01, 0x01, 0x2b, 0x00}, {0x16, 0x01, 0x2b, 0x01},
+        {0x01, 0x01, 0x7c, 0x00}, {0x16, 0x01, 0x7c, 0x01},
+        {0x00, 0x01, 0x23, 0x01}, {0x00, 0x01, 0x3e, 0x01},
+        {0x56, 0x00, 0x00, 0x00}, {0x57, 0x00, 0x00, 0x00},
+        {0x59, 0x00, 0x00, 0x00}, {0x5a, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x3f, 0x00}, {0x06, 0x01, 0x3f, 0x00},
+        {0x0a, 0x01, 0x3f, 0x00}, {0x0f, 0x01, 0x3f, 0x00},
+        {0x18, 0x01, 0x3f, 0x00}, {0x1f, 0x01, 0x3f, 0x00},
+        {0x29, 0x01, 0x3f, 0x00}, {0x38, 0x01, 0x3f, 0x01},
+        {0x02, 0x01, 0x27, 0x00}, {0x09, 0x01, 0x27, 0x00},
+        {0x17, 0x01, 0x27, 0x00}, {0x28, 0x01, 0x27, 0x01},
+        {0x02, 0x01, 0x2b, 0x00}, {0x09, 0x01, 0x2b, 0x00},
+        {0x17, 0x01, 0x2b, 0x00}, {0x28, 0x01, 0x2b, 0x01}
+    },
+    /* 80 */
+    {
+        {0x03, 0x01, 0x27, 0x00}, {0x06, 0x01, 0x27, 0x00},
+        {0x0a, 0x01, 0x27, 0x00}, {0x0f, 0x01, 0x27, 0x00},
+        {0x18, 0x01, 0x27, 0x00}, {0x1f, 0x01, 0x27, 0x00},
+        {0x29, 0x01, 0x27, 0x00}, {0x38, 0x01, 0x27, 0x01},
+        {0x03, 0x01, 0x2b, 0x00}, {0x06, 0x01, 0x2b, 0x00},
+        {0x0a, 0x01, 0x2b, 0x00}, {0x0f, 0x01, 0x2b, 0x00},
+        {0x18, 0x01, 0x2b, 0x00}, {0x1f, 0x01, 0x2b, 0x00},
+        {0x29, 0x01, 0x2b, 0x00}, {0x38, 0x01, 0x2b, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x7c, 0x00}, {0x09, 0x01, 0x7c, 0x00},
+        {0x17, 0x01, 0x7c, 0x00}, {0x28, 0x01, 0x7c, 0x01},
+        {0x01, 0x01, 0x23, 0x00}, {0x16, 0x01, 0x23, 0x01},
+        {0x01, 0x01, 0x3e, 0x00}, {0x16, 0x01, 0x3e, 0x01},
+        {0x00, 0x01, 0x00, 0x01}, {0x00, 0x01, 0x24, 0x01},
+        {0x00, 0x01, 0x40, 0x01}, {0x00, 0x01, 0x5b, 0x01},
+        {0x00, 0x01, 0x5d, 0x01}, {0x00, 0x01, 0x7e, 0x01},
+        {0x5b, 0x00, 0x00, 0x00}, {0x5c, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x7c, 0x00}, {0x06, 0x01, 0x7c, 0x00},
+        {0x0a, 0x01, 0x7c, 0x00}, {0x0f, 0x01, 0x7c, 0x00},
+        {0x18, 0x01, 0x7c, 0x00}, {0x1f, 0x01, 0x7c, 0x00},
+        {0x29, 0x01, 0x7c, 0x00}, {0x38, 0x01, 0x7c, 0x01},
+        {0x02, 0x01, 0x23, 0x00}, {0x09, 0x01, 0x23, 0x00},
+        {0x17, 0x01, 0x23, 0x00}, {0x28, 0x01, 0x23, 0x01},
+        {0x02, 0x01, 0x3e, 0x00}, {0x09, 0x01, 0x3e, 0x00},
+        {0x17, 0x01, 0x3e, 0x00}, {0x28, 0x01, 0x3e, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x23, 0x00}, {0x06, 0x01, 0x23, 0x00},
+        {0x0a, 0x01, 0x23, 0x00}, {0x0f, 0x01, 0x23, 0x00},
+        {0x18, 0x01, 0x23, 0x00}, {0x1f, 0x01, 0x23, 0x00},
+        {0x29, 0x01, 0x23, 0x00}, {0x38, 0x01, 0x23, 0x01},
+        {0x03, 0x01, 0x3e, 0x00}, {0x06, 0x01, 0x3e, 0x00},
+        {0x0a, 0x01, 0x3e, 0x00}, {0x0f, 0x01, 0x3e, 0x00},
+        {0x18, 0x01, 0x3e, 0x00}, {0x1f, 0x01, 0x3e, 0x00},
+        {0x29, 0x01, 0x3e, 0x00}, {0x38, 0x01, 0x3e, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x00, 0x00}, {0x16, 0x01, 0x00, 0x01},
+        {0x01, 0x01, 0x24, 0x00}, {0x16, 0x01, 0x24, 0x01},
+        {0x01, 0x01, 0x40, 0x00}, {0x16, 0x01, 0x40, 0x01},
+        {0x01, 0x01, 0x5b, 0x00}, {0x16, 0x01, 0x5b, 0x01},
+        {0x01, 0x01, 0x5d, 0x00}, {0x16, 0x01, 0x5d, 0x01},
+        {0x01, 0x01, 0x7e, 0x00}, {0x16, 0x01, 0x7e, 0x01},
+        {0x00, 0x01, 0x5e, 0x01}, {0x00, 0x01, 0x7d, 0x01},
+        {0x5d, 0x00, 0x00, 0x00}, {0x5e, 0x00, 0x00, 0x01}
+    },
+    /* 85 */
+    {
+        {0x02, 0x01, 0x00, 0x00}, {0x09, 0x01, 0x00, 0x00},
+        {0x17, 0x01, 0x00, 0x00}, {0x28, 0x01, 0x00, 0x01},
+        {0x02, 0x01, 0x24, 0x00}, {0x09, 0x01, 0x24, 0x00},
+        {0x17, 0x01, 0x24, 0x00}, {0x28, 0x01, 0x24, 0x01},
+        {0x02, 0x01, 0x40, 0x00}, {0x09, 0x01, 0x40, 0x00},
+        {0x17, 0x01, 0x40, 0x00}, {0x28, 0x01, 0x40, 0x01},
+        {0x02, 0x01, 0x5b, 0x00}, {0x09, 0x01, 0x5b, 0x00},
+        {0x17, 0x01, 0x5b, 0x00}, {0x28, 0x01, 0x5b, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x00, 0x00}, {0x06, 0x01, 0x00, 0x00},
+        {0x0a, 0x01, 0x00, 0x00}, {0x0f, 0x01, 0x00, 0x00},
+        {0x18, 0x01, 0x00, 0x00}, {0x1f, 0x01, 0x00, 0x00},
+        {0x29, 0x01, 0x00, 0x00}, {0x38, 0x01, 0x00, 0x01},
+        {0x03, 0x01, 0x24, 0x00}, {0x06, 0x01, 0x24, 0x00},
+        {0x0a, 0x01, 0x24, 0x00}, {0x0f, 0x01, 0x24, 0x00},
+        {0x18, 0x01, 0x24, 0x00}, {0x1f, 0x01, 0x24, 0x00},
+        {0x29, 0x01, 0x24, 0x00}, {0x38, 0x01, 0x24, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x40, 0x00}, {0x06, 0x01, 0x40, 0x00},
+        {0x0a, 0x01, 0x40, 0x00}, {0x0f, 0x01, 0x40, 0x00},
+        {0x18, 0x01, 0x40, 0x00}, {0x1f, 0x01, 0x40, 0x00},
+        {0x29, 0x01, 0x40, 0x00}, {0x38, 0x01, 0x40, 0x01},
+        {0x03, 0x01, 0x5b, 0x00}, {0x06, 0x01, 0x5b, 0x00},
+        {0x0a, 0x01, 0x5b, 0x00}, {0x0f, 0x01, 0x5b, 0x00},
+        {0x18, 0x01, 0x5b, 0x00}, {0x1f, 0x01, 0x5b, 0x00},
+        {0x29, 0x01, 0x5b, 0x00}, {0x38, 0x01, 0x5b, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x5d, 0x00}, {0x09, 0x01, 0x5d, 0x00},
+        {0x17, 0x01, 0x5d, 0x00}, {0x28, 0x01, 0x5d, 0x01},
+        {0x02, 0x01, 0x7e, 0x00}, {0x09, 0x01, 0x7e, 0x00},
+        {0x17, 0x01, 0x7e, 0x00}, {0x28, 0x01, 0x7e, 0x01},
+        {0x01, 0x01, 0x5e, 0x00}, {0x16, 0x01, 0x5e, 0x01},
+        {0x01, 0x01, 0x7d, 0x00}, {0x16, 0x01, 0x7d, 0x01},
+        {0x00, 0x01, 0x3c, 0x01}, {0x00, 0x01, 0x60, 0x01},
+        {0x00, 0x01, 0x7b, 0x01}, {0x5f, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x5d, 0x00}, {0x06, 0x01, 0x5d, 0x00},
+        {0x0a, 0x01, 0x5d, 0x00}, {0x0f, 0x01, 0x5d, 0x00},
+        {0x18, 0x01, 0x5d, 0x00}, {0x1f, 0x01, 0x5d, 0x00},
+        {0x29, 0x01, 0x5d, 0x00}, {0x38, 0x01, 0x5d, 0x01},
+        {0x03, 0x01, 0x7e, 0x00}, {0x06, 0x01, 0x7e, 0x00},
+        {0x0a, 0x01, 0x7e, 0x00}, {0x0f, 0x01, 0x7e, 0x00},
+        {0x18, 0x01, 0x7e, 0x00}, {0x1f, 0x01, 0x7e, 0x00},
+        {0x29, 0x01, 0x7e, 0x00}, {0x38, 0x01, 0x7e, 0x01}
+    },
+    /* 90 */
+    {
+        {0x02, 0x01, 0x5e, 0x00}, {0x09, 0x01, 0x5e, 0x00},
+        {0x17, 0x01, 0x5e, 0x00}, {0x28, 0x01, 0x5e, 0x01},
+        {0x02, 0x01, 0x7d, 0x00}, {0x09, 0x01, 0x7d, 0x00},
+        {0x17, 0x01, 0x7d, 0x00}, {0x28, 0x01, 0x7d, 0x01},
+        {0x01, 0x01, 0x3c, 0x00}, {0x16, 0x01, 0x3c, 0x01},
+        {0x01, 0x01, 0x60, 0x00}, {0x16, 0x01, 0x60, 0x01},
+        {0x01, 0x01, 0x7b, 0x00}, {0x16, 0x01, 0x7b, 0x01},
+        {0x60, 0x00, 0x00, 0x00}, {0x6e, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x5e, 0x00}, {0x06, 0x01, 0x5e, 0x00},
+        {0x0a, 0x01, 0x5e, 0x00}, {0x0f, 0x01, 0x5e, 0x00},
+        {0x18, 0x01, 0x5e, 0x00}, {0x1f, 0x01, 0x5e, 0x00},
+        {0x29, 0x01, 0x5e, 0x00}, {0x38, 0x01, 0x5e, 0x01},
+        {0x03, 0x01, 0x7d, 0x00}, {0x06, 0x01, 0x7d, 0x00},
+        {0x0a, 0x01, 0x7d, 0x00}, {0x0f, 0x01, 0x7d, 0x00},
+        {0x18, 0x01, 0x7d, 0x00}, {0x1f, 0x01, 0x7d, 0x00},
+        {0x29, 0x01, 0x7d, 0x00}, {0x38, 0x01, 0x7d, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x3c, 0x00}, {0x09, 0x01, 0x3c, 0x00},
+        {0x17, 0x01, 0x3c, 0x00}, {0x28, 0x01, 0x3c, 0x01},
+        {0x02, 0x01, 0x60, 0x00}, {0x09, 0x01, 0x60, 0x00},
+        {0x17, 0x01, 0x60, 0x00}, {0x28, 0x01, 0x60, 0x01},
+        {0x02, 0x01, 0x7b, 0x00}, {0x09, 0x01, 0x7b, 0x00},
+        {0x17, 0x01, 0x7b, 0x00}, {0x28, 0x01, 0x7b, 0x01},
+        {0x61, 0x00, 0x00, 0x00}, {0x65, 0x00, 0x00, 0x00},
+        {0x6f, 0x00, 0x00, 0x00}, {0x85, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x3c, 0x00}, {0x06, 0x01, 0x3c, 0x00},
+        {0x0a, 0x01, 0x3c, 0x00}, {0x0f, 0x01, 0x3c, 0x00},
+        {0x18, 0x01, 0x3c, 0x00}, {0x1f, 0x01, 0x3c, 0x00},
+        {0x29, 0x01, 0x3c, 0x00}, {0x38, 0x01, 0x3c, 0x01},
+        {0x03, 0x01, 0x60, 0x00}, {0x06, 0x01, 0x60, 0x00},
+        {0x0a, 0x01, 0x60, 0x00}, {0x0f, 0x01, 0x60, 0x00},
+        {0x18, 0x01, 0x60, 0x00}, {0x1f, 0x01, 0x60, 0x00},
+        {0x29, 0x01, 0x60, 0x00}, {0x38, 0x01, 0x60, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x7b, 0x00}, {0x06, 0x01, 0x7b, 0x00},
+        {0x0a, 0x01, 0x7b, 0x00}, {0x0f, 0x01, 0x7b, 0x00},
+        {0x18, 0x01, 0x7b, 0x00}, {0x1f, 0x01, 0x7b, 0x00},
+        {0x29, 0x01, 0x7b, 0x00}, {0x38, 0x01, 0x7b, 0x01},
+        {0x62, 0x00, 0x00, 0x00}, {0x63, 0x00, 0x00, 0x00},
+        {0x66, 0x00, 0x00, 0x00}, {0x69, 0x00, 0x00, 0x00},
+        {0x70, 0x00, 0x00, 0x00}, {0x77, 0x00, 0x00, 0x00},
+        {0x86, 0x00, 0x00, 0x00}, {0x99, 0x00, 0x00, 0x01}
+    },
+    /* 95 */
+    {
+        {0x00, 0x01, 0x5c, 0x01}, {0x00, 0x01, 0xc3, 0x01},
+        {0x00, 0x01, 0xd0, 0x01}, {0x64, 0x00, 0x00, 0x00},
+        {0x67, 0x00, 0x00, 0x00}, {0x68, 0x00, 0x00, 0x00},
+        {0x6a, 0x00, 0x00, 0x00}, {0x6b, 0x00, 0x00, 0x00},
+        {0x71, 0x00, 0x00, 0x00}, {0x74, 0x00, 0x00, 0x00},
+        {0x78, 0x00, 0x00, 0x00}, {0x7e, 0x00, 0x00, 0x00},
+        {0x87, 0x00, 0x00, 0x00}, {0x8e, 0x00, 0x00, 0x00},
+        {0x9a, 0x00, 0x00, 0x00}, {0xa9, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x5c, 0x00}, {0x16, 0x01, 0x5c, 0x01},
+        {0x01, 0x01, 0xc3, 0x00}, {0x16, 0x01, 0xc3, 0x01},
+        {0x01, 0x01, 0xd0, 0x00}, {0x16, 0x01, 0xd0, 0x01},
+        {0x00, 0x01, 0x80, 0x01}, {0x00, 0x01, 0x82, 0x01},
+        {0x00, 0x01, 0x83, 0x01}, {0x00, 0x01, 0xa2, 0x01},
+        {0x00, 0x01, 0xb8, 0x01}, {0x00, 0x01, 0xc2, 0x01},
+        {0x00, 0x01, 0xe0, 0x01}, {0x00, 0x01, 0xe2, 0x01},
+        {0x6c, 0x00, 0x00, 0x00}, {0x6d, 0x00, 0x00, 0x00}
+    },
+    {
+        {0x02, 0x01, 0x5c, 0x00}, {0x09, 0x01, 0x5c, 0x00},
+        {0x17, 0x01, 0x5c, 0x00}, {0x28, 0x01, 0x5c, 0x01},
+        {0x02, 0x01, 0xc3, 0x00}, {0x09, 0x01, 0xc3, 0x00},
+        {0x17, 0x01, 0xc3, 0x00}, {0x28, 0x01, 0xc3, 0x01},
+        {0x02, 0x01, 0xd0, 0x00}, {0x09, 0x01, 0xd0, 0x00},
+        {0x17, 0x01, 0xd0, 0x00}, {0x28, 0x01, 0xd0, 0x01},
+        {0x01, 0x01, 0x80, 0x00}, {0x16, 0x01, 0x80, 0x01},
+        {0x01, 0x01, 0x82, 0x00}, {0x16, 0x01, 0x82, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x5c, 0x00}, {0x06, 0x01, 0x5c, 0x00},
+        {0x0a, 0x01, 0x5c, 0x00}, {0x0f, 0x01, 0x5c, 0x00},
+        {0x18, 0x01, 0x5c, 0x00}, {0x1f, 0x01, 0x5c, 0x00},
+        {0x29, 0x01, 0x5c, 0x00}, {0x38, 0x01, 0x5c, 0x01},
+        {0x03, 0x01, 0xc3, 0x00}, {0x06, 0x01, 0xc3, 0x00},
+        {0x0a, 0x01, 0xc3, 0x00}, {0x0f, 0x01, 0xc3, 0x00},
+        {0x18, 0x01, 0xc3, 0x00}, {0x1f, 0x01, 0xc3, 0x00},
+        {0x29, 0x01, 0xc3, 0x00}, {0x38, 0x01, 0xc3, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xd0, 0x00}, {0x06, 0x01, 0xd0, 0x00},
+        {0x0a, 0x01, 0xd0, 0x00}, {0x0f, 0x01, 0xd0, 0x00},
+        {0x18, 0x01, 0xd0, 0x00}, {0x1f, 0x01, 0xd0, 0x00},
+        {0x29, 0x01, 0xd0, 0x00}, {0x38, 0x01, 0xd0, 0x01},
+        {0x02, 0x01, 0x80, 0x00}, {0x09, 0x01, 0x80, 0x00},
+        {0x17, 0x01, 0x80, 0x00}, {0x28, 0x01, 0x80, 0x01},
+        {0x02, 0x01, 0x82, 0x00}, {0x09, 0x01, 0x82, 0x00},
+        {0x17, 0x01, 0x82, 0x00}, {0x28, 0x01, 0x82, 0x01}
+    },
+    /* 100 */
+    {
+        {0x03, 0x01, 0x80, 0x00}, {0x06, 0x01, 0x80, 0x00},
+        {0x0a, 0x01, 0x80, 0x00}, {0x0f, 0x01, 0x80, 0x00},
+        {0x18, 0x01, 0x80, 0x00}, {0x1f, 0x01, 0x80, 0x00},
+        {0x29, 0x01, 0x80, 0x00}, {0x38, 0x01, 0x80, 0x01},
+        {0x03, 0x01, 0x82, 0x00}, {0x06, 0x01, 0x82, 0x00},
+        {0x0a, 0x01, 0x82, 0x00}, {0x0f, 0x01, 0x82, 0x00},
+        {0x18, 0x01, 0x82, 0x00}, {0x1f, 0x01, 0x82, 0x00},
+        {0x29, 0x01, 0x82, 0x00}, {0x38, 0x01, 0x82, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x83, 0x00}, {0x16, 0x01, 0x83, 0x01},
+        {0x01, 0x01, 0xa2, 0x00}, {0x16, 0x01, 0xa2, 0x01},
+        {0x01, 0x01, 0xb8, 0x00}, {0x16, 0x01, 0xb8, 0x01},
+        {0x01, 0x01, 0xc2, 0x00}, {0x16, 0x01, 0xc2, 0x01},
+        {0x01, 0x01, 0xe0, 0x00}, {0x16, 0x01, 0xe0, 0x01},
+        {0x01, 0x01, 0xe2, 0x00}, {0x16, 0x01, 0xe2, 0x01},
+        {0x00, 0x01, 0x99, 0x01}, {0x00, 0x01, 0xa1, 0x01},
+        {0x00, 0x01, 0xa7, 0x01}, {0x00, 0x01, 0xac, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x83, 0x00}, {0x09, 0x01, 0x83, 0x00},
+        {0x17, 0x01, 0x83, 0x00}, {0x28, 0x01, 0x83, 0x01},
+        {0x02, 0x01, 0xa2, 0x00}, {0x09, 0x01, 0xa2, 0x00},
+        {0x17, 0x01, 0xa2, 0x00}, {0x28, 0x01, 0xa2, 0x01},
+        {0x02, 0x01, 0xb8, 0x00}, {0x09, 0x01, 0xb8, 0x00},
+        {0x17, 0x01, 0xb8, 0x00}, {0x28, 0x01, 0xb8, 0x01},
+        {0x02, 0x01, 0xc2, 0x00}, {0x09, 0x01, 0xc2, 0x00},
+        {0x17, 0x01, 0xc2, 0x00}, {0x28, 0x01, 0xc2, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x83, 0x00}, {0x06, 0x01, 0x83, 0x00},
+        {0x0a, 0x01, 0x83, 0x00}, {0x0f, 0x01, 0x83, 0x00},
+        {0x18, 0x01, 0x83, 0x00}, {0x1f, 0x01, 0x83, 0x00},
+        {0x29, 0x01, 0x83, 0x00}, {0x38, 0x01, 0x83, 0x01},
+        {0x03, 0x01, 0xa2, 0x00}, {0x06, 0x01, 0xa2, 0x00},
+        {0x0a, 0x01, 0xa2, 0x00}, {0x0f, 0x01, 0xa2, 0x00},
+        {0x18, 0x01, 0xa2, 0x00}, {0x1f, 0x01, 0xa2, 0x00},
+        {0x29, 0x01, 0xa2, 0x00}, {0x38, 0x01, 0xa2, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xb8, 0x00}, {0x06, 0x01, 0xb8, 0x00},
+        {0x0a, 0x01, 0xb8, 0x00}, {0x0f, 0x01, 0xb8, 0x00},
+        {0x18, 0x01, 0xb8, 0x00}, {0x1f, 0x01, 0xb8, 0x00},
+        {0x29, 0x01, 0xb8, 0x00}, {0x38, 0x01, 0xb8, 0x01},
+        {0x03, 0x01, 0xc2, 0x00}, {0x06, 0x01, 0xc2, 0x00},
+        {0x0a, 0x01, 0xc2, 0x00}, {0x0f, 0x01, 0xc2, 0x00},
+        {0x18, 0x01, 0xc2, 0x00}, {0x1f, 0x01, 0xc2, 0x00},
+        {0x29, 0x01, 0xc2, 0x00}, {0x38, 0x01, 0xc2, 0x01}
+    },
+    /* 105 */
+    {
+        {0x02, 0x01, 0xe0, 0x00}, {0x09, 0x01, 0xe0, 0x00},
+        {0x17, 0x01, 0xe0, 0x00}, {0x28, 0x01, 0xe0, 0x01},
+        {0x02, 0x01, 0xe2, 0x00}, {0x09, 0x01, 0xe2, 0x00},
+        {0x17, 0x01, 0xe2, 0x00}, {0x28, 0x01, 0xe2, 0x01},
+        {0x01, 0x01, 0x99, 0x00}, {0x16, 0x01, 0x99, 0x01},
+        {0x01, 0x01, 0xa1, 0x00}, {0x16, 0x01, 0xa1, 0x01},
+        {0x01, 0x01, 0xa7, 0x00}, {0x16, 0x01, 0xa7, 0x01},
+        {0x01, 0x01, 0xac, 0x00}, {0x16, 0x01, 0xac, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xe0, 0x00}, {0x06, 0x01, 0xe0, 0x00},
+        {0x0a, 0x01, 0xe0, 0x00}, {0x0f, 0x01, 0xe0, 0x00},
+        {0x18, 0x01, 0xe0, 0x00}, {0x1f, 0x01, 0xe0, 0x00},
+        {0x29, 0x01, 0xe0, 0x00}, {0x38, 0x01, 0xe0, 0x01},
+        {0x03, 0x01, 0xe2, 0x00}, {0x06, 0x01, 0xe2, 0x00},
+        {0x0a, 0x01, 0xe2, 0x00}, {0x0f, 0x01, 0xe2, 0x00},
+        {0x18, 0x01, 0xe2, 0x00}, {0x1f, 0x01, 0xe2, 0x00},
+        {0x29, 0x01, 0xe2, 0x00}, {0x38, 0x01, 0xe2, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x99, 0x00}, {0x09, 0x01, 0x99, 0x00},
+        {0x17, 0x01, 0x99, 0x00}, {0x28, 0x01, 0x99, 0x01},
+        {0x02, 0x01, 0xa1, 0x00}, {0x09, 0x01, 0xa1, 0x00},
+        {0x17, 0x01, 0xa1, 0x00}, {0x28, 0x01, 0xa1, 0x01},
+        {0x02, 0x01, 0xa7, 0x00}, {0x09, 0x01, 0xa7, 0x00},
+        {0x17, 0x01, 0xa7, 0x00}, {0x28, 0x01, 0xa7, 0x01},
+        {0x02, 0x01, 0xac, 0x00}, {0x09, 0x01, 0xac, 0x00},
+        {0x17, 0x01, 0xac, 0x00}, {0x28, 0x01, 0xac, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x99, 0x00}, {0x06, 0x01, 0x99, 0x00},
+        {0x0a, 0x01, 0x99, 0x00}, {0x0f, 0x01, 0x99, 0x00},
+        {0x18, 0x01, 0x99, 0x00}, {0x1f, 0x01, 0x99, 0x00},
+        {0x29, 0x01, 0x99, 0x00}, {0x38, 0x01, 0x99, 0x01},
+        {0x03, 0x01, 0xa1, 0x00}, {0x06, 0x01, 0xa1, 0x00},
+        {0x0a, 0x01, 0xa1, 0x00}, {0x0f, 0x01, 0xa1, 0x00},
+        {0x18, 0x01, 0xa1, 0x00}, {0x1f, 0x01, 0xa1, 0x00},
+        {0x29, 0x01, 0xa1, 0x00}, {0x38, 0x01, 0xa1, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xa7, 0x00}, {0x06, 0x01, 0xa7, 0x00},
+        {0x0a, 0x01, 0xa7, 0x00}, {0x0f, 0x01, 0xa7, 0x00},
+        {0x18, 0x01, 0xa7, 0x00}, {0x1f, 0x01, 0xa7, 0x00},
+        {0x29, 0x01, 0xa7, 0x00}, {0x38, 0x01, 0xa7, 0x01},
+        {0x03, 0x01, 0xac, 0x00}, {0x06, 0x01, 0xac, 0x00},
+        {0x0a, 0x01, 0xac, 0x00}, {0x0f, 0x01, 0xac, 0x00},
+        {0x18, 0x01, 0xac, 0x00}, {0x1f, 0x01, 0xac, 0x00},
+        {0x29, 0x01, 0xac, 0x00}, {0x38, 0x01, 0xac, 0x01}
+    },
+    /* 110 */
+    {
+        {0x72, 0x00, 0x00, 0x00}, {0x73, 0x00, 0x00, 0x00},
+        {0x75, 0x00, 0x00, 0x00}, {0x76, 0x00, 0x00, 0x00},
+        {0x79, 0x00, 0x00, 0x00}, {0x7b, 0x00, 0x00, 0x00},
+        {0x7f, 0x00, 0x00, 0x00}, {0x82, 0x00, 0x00, 0x00},
+        {0x88, 0x00, 0x00, 0x00}, {0x8b, 0x00, 0x00, 0x00},
+        {0x8f, 0x00, 0x00, 0x00}, {0x92, 0x00, 0x00, 0x00},
+        {0x9b, 0x00, 0x00, 0x00}, {0xa2, 0x00, 0x00, 0x00},
+        {0xaa, 0x00, 0x00, 0x00}, {0xb4, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x00, 0x01, 0xb0, 0x01}, {0x00, 0x01, 0xb1, 0x01},
+        {0x00, 0x01, 0xb3, 0x01}, {0x00, 0x01, 0xd1, 0x01},
+        {0x00, 0x01, 0xd8, 0x01}, {0x00, 0x01, 0xd9, 0x01},
+        {0x00, 0x01, 0xe3, 0x01}, {0x00, 0x01, 0xe5, 0x01},
+        {0x00, 0x01, 0xe6, 0x01}, {0x7a, 0x00, 0x00, 0x00},
+        {0x7c, 0x00, 0x00, 0x00}, {0x7d, 0x00, 0x00, 0x00},
+        {0x80, 0x00, 0x00, 0x00}, {0x81, 0x00, 0x00, 0x00},
+        {0x83, 0x00, 0x00, 0x00}, {0x84, 0x00, 0x00, 0x00}
+    },
+    {
+        {0x01, 0x01, 0xb0, 0x00}, {0x16, 0x01, 0xb0, 0x01},
+        {0x01, 0x01, 0xb1, 0x00}, {0x16, 0x01, 0xb1, 0x01},
+        {0x01, 0x01, 0xb3, 0x00}, {0x16, 0x01, 0xb3, 0x01},
+        {0x01, 0x01, 0xd1, 0x00}, {0x16, 0x01, 0xd1, 0x01},
+        {0x01, 0x01, 0xd8, 0x00}, {0x16, 0x01, 0xd8, 0x01},
+        {0x01, 0x01, 0xd9, 0x00}, {0x16, 0x01, 0xd9, 0x01},
+        {0x01, 0x01, 0xe3, 0x00}, {0x16, 0x01, 0xe3, 0x01},
+        {0x01, 0x01, 0xe5, 0x00}, {0x16, 0x01, 0xe5, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xb0, 0x00}, {0x09, 0x01, 0xb0, 0x00},
+        {0x17, 0x01, 0xb0, 0x00}, {0x28, 0x01, 0xb0, 0x01},
+        {0x02, 0x01, 0xb1, 0x00}, {0x09, 0x01, 0xb1, 0x00},
+        {0x17, 0x01, 0xb1, 0x00}, {0x28, 0x01, 0xb1, 0x01},
+        {0x02, 0x01, 0xb3, 0x00}, {0x09, 0x01, 0xb3, 0x00},
+        {0x17, 0x01, 0xb3, 0x00}, {0x28, 0x01, 0xb3, 0x01},
+        {0x02, 0x01, 0xd1, 0x00}, {0x09, 0x01, 0xd1, 0x00},
+        {0x17, 0x01, 0xd1, 0x00}, {0x28, 0x01, 0xd1, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xb0, 0x00}, {0x06, 0x01, 0xb0, 0x00},
+        {0x0a, 0x01, 0xb0, 0x00}, {0x0f, 0x01, 0xb0, 0x00},
+        {0x18, 0x01, 0xb0, 0x00}, {0x1f, 0x01, 0xb0, 0x00},
+        {0x29, 0x01, 0xb0, 0x00}, {0x38, 0x01, 0xb0, 0x01},
+        {0x03, 0x01, 0xb1, 0x00}, {0x06, 0x01, 0xb1, 0x00},
+        {0x0a, 0x01, 0xb1, 0x00}, {0x0f, 0x01, 0xb1, 0x00},
+        {0x18, 0x01, 0xb1, 0x00}, {0x1f, 0x01, 0xb1, 0x00},
+        {0x29, 0x01, 0xb1, 0x00}, {0x38, 0x01, 0xb1, 0x01}
+    },
+    /* 115 */
+    {
+        {0x03, 0x01, 0xb3, 0x00}, {0x06, 0x01, 0xb3, 0x00},
+        {0x0a, 0x01, 0xb3, 0x00}, {0x0f, 0x01, 0xb3, 0x00},
+        {0x18, 0x01, 0xb3, 0x00}, {0x1f, 0x01, 0xb3, 0x00},
+        {0x29, 0x01, 0xb3, 0x00}, {0x38, 0x01, 0xb3, 0x01},
+        {0x03, 0x01, 0xd1, 0x00}, {0x06, 0x01, 0xd1, 0x00},
+        {0x0a, 0x01, 0xd1, 0x00}, {0x0f, 0x01, 0xd1, 0x00},
+        {0x18, 0x01, 0xd1, 0x00}, {0x1f, 0x01, 0xd1, 0x00},
+        {0x29, 0x01, 0xd1, 0x00}, {0x38, 0x01, 0xd1, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xd8, 0x00}, {0x09, 0x01, 0xd8, 0x00},
+        {0x17, 0x01, 0xd8, 0x00}, {0x28, 0x01, 0xd8, 0x01},
+        {0x02, 0x01, 0xd9, 0x00}, {0x09, 0x01, 0xd9, 0x00},
+        {0x17, 0x01, 0xd9, 0x00}, {0x28, 0x01, 0xd9, 0x01},
+        {0x02, 0x01, 0xe3, 0x00}, {0x09, 0x01, 0xe3, 0x00},
+        {0x17, 0x01, 0xe3, 0x00}, {0x28, 0x01, 0xe3, 0x01},
+        {0x02, 0x01, 0xe5, 0x00}, {0x09, 0x01, 0xe5, 0x00},
+        {0x17, 0x01, 0xe5, 0x00}, {0x28, 0x01, 0xe5, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xd8, 0x00}, {0x06, 0x01, 0xd8, 0x00},
+        {0x0a, 0x01, 0xd8, 0x00}, {0x0f, 0x01, 0xd8, 0x00},
+        {0x18, 0x01, 0xd8, 0x00}, {0x1f, 0x01, 0xd8, 0x00},
+        {0x29, 0x01, 0xd8, 0x00}, {0x38, 0x01, 0xd8, 0x01},
+        {0x03, 0x01, 0xd9, 0x00}, {0x06, 0x01, 0xd9, 0x00},
+        {0x0a, 0x01, 0xd9, 0x00}, {0x0f, 0x01, 0xd9, 0x00},
+        {0x18, 0x01, 0xd9, 0x00}, {0x1f, 0x01, 0xd9, 0x00},
+        {0x29, 0x01, 0xd9, 0x00}, {0x38, 0x01, 0xd9, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xe3, 0x00}, {0x06, 0x01, 0xe3, 0x00},
+        {0x0a, 0x01, 0xe3, 0x00}, {0x0f, 0x01, 0xe3, 0x00},
+        {0x18, 0x01, 0xe3, 0x00}, {0x1f, 0x01, 0xe3, 0x00},
+        {0x29, 0x01, 0xe3, 0x00}, {0x38, 0x01, 0xe3, 0x01},
+        {0x03, 0x01, 0xe5, 0x00}, {0x06, 0x01, 0xe5, 0x00},
+        {0x0a, 0x01, 0xe5, 0x00}, {0x0f, 0x01, 0xe5, 0x00},
+        {0x18, 0x01, 0xe5, 0x00}, {0x1f, 0x01, 0xe5, 0x00},
+        {0x29, 0x01, 0xe5, 0x00}, {0x38, 0x01, 0xe5, 0x01}
+    },
+    {
+        {0x01, 0x01, 0xe6, 0x00}, {0x16, 0x01, 0xe6, 0x01},
+        {0x00, 0x01, 0x81, 0x01}, {0x00, 0x01, 0x84, 0x01},
+        {0x00, 0x01, 0x85, 0x01}, {0x00, 0x01, 0x86, 0x01},
+        {0x00, 0x01, 0x88, 0x01}, {0x00, 0x01, 0x92, 0x01},
+        {0x00, 0x01, 0x9a, 0x01}, {0x00, 0x01, 0x9c, 0x01},
+        {0x00, 0x01, 0xa0, 0x01}, {0x00, 0x01, 0xa3, 0x01},
+        {0x00, 0x01, 0xa4, 0x01}, {0x00, 0x01, 0xa9, 0x01},
+        {0x00, 0x01, 0xaa, 0x01}, {0x00, 0x01, 0xad, 0x01}
+    },
+    /* 120 */
+    {
+        {0x02, 0x01, 0xe6, 0x00}, {0x09, 0x01, 0xe6, 0x00},
+        {0x17, 0x01, 0xe6, 0x00}, {0x28, 0x01, 0xe6, 0x01},
+        {0x01, 0x01, 0x81, 0x00}, {0x16, 0x01, 0x81, 0x01},
+        {0x01, 0x01, 0x84, 0x00}, {0x16, 0x01, 0x84, 0x01},
+        {0x01, 0x01, 0x85, 0x00}, {0x16, 0x01, 0x85, 0x01},
+        {0x01, 0x01, 0x86, 0x00}, {0x16, 0x01, 0x86, 0x01},
+        {0x01, 0x01, 0x88, 0x00}, {0x16, 0x01, 0x88, 0x01},
+        {0x01, 0x01, 0x92, 0x00}, {0x16, 0x01, 0x92, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xe6, 0x00}, {0x06, 0x01, 0xe6, 0x00},
+        {0x0a, 0x01, 0xe6, 0x00}, {0x0f, 0x01, 0xe6, 0x00},
+        {0x18, 0x01, 0xe6, 0x00}, {0x1f, 0x01, 0xe6, 0x00},
+        {0x29, 0x01, 0xe6, 0x00}, {0x38, 0x01, 0xe6, 0x01},
+        {0x02, 0x01, 0x81, 0x00}, {0x09, 0x01, 0x81, 0x00},
+        {0x17, 0x01, 0x81, 0x00}, {0x28, 0x01, 0x81, 0x01},
+        {0x02, 0x01, 0x84, 0x00}, {0x09, 0x01, 0x84, 0x00},
+        {0x17, 0x01, 0x84, 0x00}, {0x28, 0x01, 0x84, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x81, 0x00}, {0x06, 0x01, 0x81, 0x00},
+        {0x0a, 0x01, 0x81, 0x00}, {0x0f, 0x01, 0x81, 0x00},
+        {0x18, 0x01, 0x81, 0x00}, {0x1f, 0x01, 0x81, 0x00},
+        {0x29, 0x01, 0x81, 0x00}, {0x38, 0x01, 0x81, 0x01},
+        {0x03, 0x01, 0x84, 0x00}, {0x06, 0x01, 0x84, 0x00},
+        {0x0a, 0x01, 0x84, 0x00}, {0x0f, 0x01, 0x84, 0x00},
+        {0x18, 0x01, 0x84, 0x00}, {0x1f, 0x01, 0x84, 0x00},
+        {0x29, 0x01, 0x84, 0x00}, {0x38, 0x01, 0x84, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x85, 0x00}, {0x09, 0x01, 0x85, 0x00},
+        {0x17, 0x01, 0x85, 0x00}, {0x28, 0x01, 0x85, 0x01},
+        {0x02, 0x01, 0x86, 0x00}, {0x09, 0x01, 0x86, 0x00},
+        {0x17, 0x01, 0x86, 0x00}, {0x28, 0x01, 0x86, 0x01},
+        {0x02, 0x01, 0x88, 0x00}, {0x09, 0x01, 0x88, 0x00},
+        {0x17, 0x01, 0x88, 0x00}, {0x28, 0x01, 0x88, 0x01},
+        {0x02, 0x01, 0x92, 0x00}, {0x09, 0x01, 0x92, 0x00},
+        {0x17, 0x01, 0x92, 0x00}, {0x28, 0x01, 0x92, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x85, 0x00}, {0x06, 0x01, 0x85, 0x00},
+        {0x0a, 0x01, 0x85, 0x00}, {0x0f, 0x01, 0x85, 0x00},
+        {0x18, 0x01, 0x85, 0x00}, {0x1f, 0x01, 0x85, 0x00},
+        {0x29, 0x01, 0x85, 0x00}, {0x38, 0x01, 0x85, 0x01},
+        {0x03, 0x01, 0x86, 0x00}, {0x06, 0x01, 0x86, 0x00},
+        {0x0a, 0x01, 0x86, 0x00}, {0x0f, 0x01, 0x86, 0x00},
+        {0x18, 0x01, 0x86, 0x00}, {0x1f, 0x01, 0x86, 0x00},
+        {0x29, 0x01, 0x86, 0x00}, {0x38, 0x01, 0x86, 0x01}
+    },
+    /* 125 */
+    {
+        {0x03, 0x01, 0x88, 0x00}, {0x06, 0x01, 0x88, 0x00},
+        {0x0a, 0x01, 0x88, 0x00}, {0x0f, 0x01, 0x88, 0x00},
+        {0x18, 0x01, 0x88, 0x00}, {0x1f, 0x01, 0x88, 0x00},
+        {0x29, 0x01, 0x88, 0x00}, {0x38, 0x01, 0x88, 0x01},
+        {0x03, 0x01, 0x92, 0x00}, {0x06, 0x01, 0x92, 0x00},
+        {0x0a, 0x01, 0x92, 0x00}, {0x0f, 0x01, 0x92, 0x00},
+        {0x18, 0x01, 0x92, 0x00}, {0x1f, 0x01, 0x92, 0x00},
+        {0x29, 0x01, 0x92, 0x00}, {0x38, 0x01, 0x92, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x9a, 0x00}, {0x16, 0x01, 0x9a, 0x01},
+        {0x01, 0x01, 0x9c, 0x00}, {0x16, 0x01, 0x9c, 0x01},
+        {0x01, 0x01, 0xa0, 0x00}, {0x16, 0x01, 0xa0, 0x01},
+        {0x01, 0x01, 0xa3, 0x00}, {0x16, 0x01, 0xa3, 0x01},
+        {0x01, 0x01, 0xa4, 0x00}, {0x16, 0x01, 0xa4, 0x01},
+        {0x01, 0x01, 0xa9, 0x00}, {0x16, 0x01, 0xa9, 0x01},
+        {0x01, 0x01, 0xaa, 0x00}, {0x16, 0x01, 0xaa, 0x01},
+        {0x01, 0x01, 0xad, 0x00}, {0x16, 0x01, 0xad, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x9a, 0x00}, {0x09, 0x01, 0x9a, 0x00},
+        {0x17, 0x01, 0x9a, 0x00}, {0x28, 0x01, 0x9a, 0x01},
+        {0x02, 0x01, 0x9c, 0x00}, {0x09, 0x01, 0x9c, 0x00},
+        {0x17, 0x01, 0x9c, 0x00}, {0x28, 0x01, 0x9c, 0x01},
+        {0x02, 0x01, 0xa0, 0x00}, {0x09, 0x01, 0xa0, 0x00},
+        {0x17, 0x01, 0xa0, 0x00}, {0x28, 0x01, 0xa0, 0x01},
+        {0x02, 0x01, 0xa3, 0x00}, {0x09, 0x01, 0xa3, 0x00},
+        {0x17, 0x01, 0xa3, 0x00}, {0x28, 0x01, 0xa3, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x9a, 0x00}, {0x06, 0x01, 0x9a, 0x00},
+        {0x0a, 0x01, 0x9a, 0x00}, {0x0f, 0x01, 0x9a, 0x00},
+        {0x18, 0x01, 0x9a, 0x00}, {0x1f, 0x01, 0x9a, 0x00},
+        {0x29, 0x01, 0x9a, 0x00}, {0x38, 0x01, 0x9a, 0x01},
+        {0x03, 0x01, 0x9c, 0x00}, {0x06, 0x01, 0x9c, 0x00},
+        {0x0a, 0x01, 0x9c, 0x00}, {0x0f, 0x01, 0x9c, 0x00},
+        {0x18, 0x01, 0x9c, 0x00}, {0x1f, 0x01, 0x9c, 0x00},
+        {0x29, 0x01, 0x9c, 0x00}, {0x38, 0x01, 0x9c, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xa0, 0x00}, {0x06, 0x01, 0xa0, 0x00},
+        {0x0a, 0x01, 0xa0, 0x00}, {0x0f, 0x01, 0xa0, 0x00},
+        {0x18, 0x01, 0xa0, 0x00}, {0x1f, 0x01, 0xa0, 0x00},
+        {0x29, 0x01, 0xa0, 0x00}, {0x38, 0x01, 0xa0, 0x01},
+        {0x03, 0x01, 0xa3, 0x00}, {0x06, 0x01, 0xa3, 0x00},
+        {0x0a, 0x01, 0xa3, 0x00}, {0x0f, 0x01, 0xa3, 0x00},
+        {0x18, 0x01, 0xa3, 0x00}, {0x1f, 0x01, 0xa3, 0x00},
+        {0x29, 0x01, 0xa3, 0x00}, {0x38, 0x01, 0xa3, 0x01}
+    },
+    /* 130 */
+    {
+        {0x02, 0x01, 0xa4, 0x00}, {0x09, 0x01, 0xa4, 0x00},
+        {0x17, 0x01, 0xa4, 0x00}, {0x28, 0x01, 0xa4, 0x01},
+        {0x02, 0x01, 0xa9, 0x00}, {0x09, 0x01, 0xa9, 0x00},
+        {0x17, 0x01, 0xa9, 0x00}, {0x28, 0x01, 0xa9, 0x01},
+        {0x02, 0x01, 0xaa, 0x00}, {0x09, 0x01, 0xaa, 0x00},
+        {0x17, 0x01, 0xaa, 0x00}, {0x28, 0x01, 0xaa, 0x01},
+        {0x02, 0x01, 0xad, 0x00}, {0x09, 0x01, 0xad, 0x00},
+        {0x17, 0x01, 0xad, 0x00}, {0x28, 0x01, 0xad, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xa4, 0x00}, {0x06, 0x01, 0xa4, 0x00},
+        {0x0a, 0x01, 0xa4, 0x00}, {0x0f, 0x01, 0xa4, 0x00},
+        {0x18, 0x01, 0xa4, 0x00}, {0x1f, 0x01, 0xa4, 0x00},
+        {0x29, 0x01, 0xa4, 0x00}, {0x38, 0x01, 0xa4, 0x01},
+        {0x03, 0x01, 0xa9, 0x00}, {0x06, 0x01, 0xa9, 0x00},
+        {0x0a, 0x01, 0xa9, 0x00}, {0x0f, 0x01, 0xa9, 0x00},
+        {0x18, 0x01, 0xa9, 0x00}, {0x1f, 0x01, 0xa9, 0x00},
+        {0x29, 0x01, 0xa9, 0x00}, {0x38, 0x01, 0xa9, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xaa, 0x00}, {0x06, 0x01, 0xaa, 0x00},
+        {0x0a, 0x01, 0xaa, 0x00}, {0x0f, 0x01, 0xaa, 0x00},
+        {0x18, 0x01, 0xaa, 0x00}, {0x1f, 0x01, 0xaa, 0x00},
+        {0x29, 0x01, 0xaa, 0x00}, {0x38, 0x01, 0xaa, 0x01},
+        {0x03, 0x01, 0xad, 0x00}, {0x06, 0x01, 0xad, 0x00},
+        {0x0a, 0x01, 0xad, 0x00}, {0x0f, 0x01, 0xad, 0x00},
+        {0x18, 0x01, 0xad, 0x00}, {0x1f, 0x01, 0xad, 0x00},
+        {0x29, 0x01, 0xad, 0x00}, {0x38, 0x01, 0xad, 0x01}
+    },
+    {
+        {0x89, 0x00, 0x00, 0x00}, {0x8a, 0x00, 0x00, 0x00},
+        {0x8c, 0x00, 0x00, 0x00}, {0x8d, 0x00, 0x00, 0x00},
+        {0x90, 0x00, 0x00, 0x00}, {0x91, 0x00, 0x00, 0x00},
+        {0x93, 0x00, 0x00, 0x00}, {0x96, 0x00, 0x00, 0x00},
+        {0x9c, 0x00, 0x00, 0x00}, {0x9f, 0x00, 0x00, 0x00},
+        {0xa3, 0x00, 0x00, 0x00}, {0xa6, 0x00, 0x00, 0x00},
+        {0xab, 0x00, 0x00, 0x00}, {0xae, 0x00, 0x00, 0x00},
+        {0xb5, 0x00, 0x00, 0x00}, {0xbe, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x00, 0x01, 0xb2, 0x01}, {0x00, 0x01, 0xb5, 0x01},
+        {0x00, 0x01, 0xb9, 0x01}, {0x00, 0x01, 0xba, 0x01},
+        {0x00, 0x01, 0xbb, 0x01}, {0x00, 0x01, 0xbd, 0x01},
+        {0x00, 0x01, 0xbe, 0x01}, {0x00, 0x01, 0xc4, 0x01},
+        {0x00, 0x01, 0xc6, 0x01}, {0x00, 0x01, 0xe4, 0x01},
+        {0x00, 0x01, 0xe8, 0x01}, {0x00, 0x01, 0xe9, 0x01},
+        {0x94, 0x00, 0x00, 0x00}, {0x95, 0x00, 0x00, 0x00},
+        {0x97, 0x00, 0x00, 0x00}, {0x98, 0x00, 0x00, 0x00}
+    },
+    /* 135 */
+    {
+        {0x01, 0x01, 0xb2, 0x00}, {0x16, 0x01, 0xb2, 0x01},
+        {0x01, 0x01, 0xb5, 0x00}, {0x16, 0x01, 0xb5, 0x01},
+        {0x01, 0x01, 0xb9, 0x00}, {0x16, 0x01, 0xb9, 0x01},
+        {0x01, 0x01, 0xba, 0x00}, {0x16, 0x01, 0xba, 0x01},
+        {0x01, 0x01, 0xbb, 0x00}, {0x16, 0x01, 0xbb, 0x01},
+        {0x01, 0x01, 0xbd, 0x00}, {0x16, 0x01, 0xbd, 0x01},
+        {0x01, 0x01, 0xbe, 0x00}, {0x16, 0x01, 0xbe, 0x01},
+        {0x01, 0x01, 0xc4, 0x00}, {0x16, 0x01, 0xc4, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xb2, 0x00}, {0x09, 0x01, 0xb2, 0x00},
+        {0x17, 0x01, 0xb2, 0x00}, {0x28, 0x01, 0xb2, 0x01},
+        {0x02, 0x01, 0xb5, 0x00}, {0x09, 0x01, 0xb5, 0x00},
+        {0x17, 0x01, 0xb5, 0x00}, {0x28, 0x01, 0xb5, 0x01},
+        {0x02, 0x01, 0xb9, 0x00}, {0x09, 0x01, 0xb9, 0x00},
+        {0x17, 0x01, 0xb9, 0x00}, {0x28, 0x01, 0xb9, 0x01},
+        {0x02, 0x01, 0xba, 0x00}, {0x09, 0x01, 0xba, 0x00},
+        {0x17, 0x01, 0xba, 0x00}, {0x28, 0x01, 0xba, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xb2, 0x00}, {0x06, 0x01, 0xb2, 0x00},
+        {0x0a, 0x01, 0xb2, 0x00}, {0x0f, 0x01, 0xb2, 0x00},
+        {0x18, 0x01, 0xb2, 0x00}, {0x1f, 0x01, 0xb2, 0x00},
+        {0x29, 0x01, 0xb2, 0x00}, {0x38, 0x01, 0xb2, 0x01},
+        {0x03, 0x01, 0xb5, 0x00}, {0x06, 0x01, 0xb5, 0x00},
+        {0x0a, 0x01, 0xb5, 0x00}, {0x0f, 0x01, 0xb5, 0x00},
+        {0x18, 0x01, 0xb5, 0x00}, {0x1f, 0x01, 0xb5, 0x00},
+        {0x29, 0x01, 0xb5, 0x00}, {0x38, 0x01, 0xb5, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xb9, 0x00}, {0x06, 0x01, 0xb9, 0x00},
+        {0x0a, 0x01, 0xb9, 0x00}, {0x0f, 0x01, 0xb9, 0x00},
+        {0x18, 0x01, 0xb9, 0x00}, {0x1f, 0x01, 0xb9, 0x00},
+        {0x29, 0x01, 0xb9, 0x00}, {0x38, 0x01, 0xb9, 0x01},
+        {0x03, 0x01, 0xba, 0x00}, {0x06, 0x01, 0xba, 0x00},
+        {0x0a, 0x01, 0xba, 0x00}, {0x0f, 0x01, 0xba, 0x00},
+        {0x18, 0x01, 0xba, 0x00}, {0x1f, 0x01, 0xba, 0x00},
+        {0x29, 0x01, 0xba, 0x00}, {0x38, 0x01, 0xba, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xbb, 0x00}, {0x09, 0x01, 0xbb, 0x00},
+        {0x17, 0x01, 0xbb, 0x00}, {0x28, 0x01, 0xbb, 0x01},
+        {0x02, 0x01, 0xbd, 0x00}, {0x09, 0x01, 0xbd, 0x00},
+        {0x17, 0x01, 0xbd, 0x00}, {0x28, 0x01, 0xbd, 0x01},
+        {0x02, 0x01, 0xbe, 0x00}, {0x09, 0x01, 0xbe, 0x00},
+        {0x17, 0x01, 0xbe, 0x00}, {0x28, 0x01, 0xbe, 0x01},
+        {0x02, 0x01, 0xc4, 0x00}, {0x09, 0x01, 0xc4, 0x00},
+        {0x17, 0x01, 0xc4, 0x00}, {0x28, 0x01, 0xc4, 0x01}
+    },
+    /* 140 */
+    {
+        {0x03, 0x01, 0xbb, 0x00}, {0x06, 0x01, 0xbb, 0x00},
+        {0x0a, 0x01, 0xbb, 0x00}, {0x0f, 0x01, 0xbb, 0x00},
+        {0x18, 0x01, 0xbb, 0x00}, {0x1f, 0x01, 0xbb, 0x00},
+        {0x29, 0x01, 0xbb, 0x00}, {0x38, 0x01, 0xbb, 0x01},
+        {0x03, 0x01, 0xbd, 0x00}, {0x06, 0x01, 0xbd, 0x00},
+        {0x0a, 0x01, 0xbd, 0x00}, {0x0f, 0x01, 0xbd, 0x00},
+        {0x18, 0x01, 0xbd, 0x00}, {0x1f, 0x01, 0xbd, 0x00},
+        {0x29, 0x01, 0xbd, 0x00}, {0x38, 0x01, 0xbd, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xbe, 0x00}, {0x06, 0x01, 0xbe, 0x00},
+        {0x0a, 0x01, 0xbe, 0x00}, {0x0f, 0x01, 0xbe, 0x00},
+        {0x18, 0x01, 0xbe, 0x00}, {0x1f, 0x01, 0xbe, 0x00},
+        {0x29, 0x01, 0xbe, 0x00}, {0x38, 0x01, 0xbe, 0x01},
+        {0x03, 0x01, 0xc4, 0x00}, {0x06, 0x01, 0xc4, 0x00},
+        {0x0a, 0x01, 0xc4, 0x00}, {0x0f, 0x01, 0xc4, 0x00},
+        {0x18, 0x01, 0xc4, 0x00}, {0x1f, 0x01, 0xc4, 0x00},
+        {0x29, 0x01, 0xc4, 0x00}, {0x38, 0x01, 0xc4, 0x01}
+    },
+    {
+        {0x01, 0x01, 0xc6, 0x00}, {0x16, 0x01, 0xc6, 0x01},
+        {0x01, 0x01, 0xe4, 0x00}, {0x16, 0x01, 0xe4, 0x01},
+        {0x01, 0x01, 0xe8, 0x00}, {0x16, 0x01, 0xe8, 0x01},
+        {0x01, 0x01, 0xe9, 0x00}, {0x16, 0x01, 0xe9, 0x01},
+        {0x00, 0x01, 0x01, 0x01}, {0x00, 0x01, 0x87, 0x01},
+        {0x00, 0x01, 0x89, 0x01}, {0x00, 0x01, 0x8a, 0x01},
+        {0x00, 0x01, 0x8b, 0x01}, {0x00, 0x01, 0x8c, 0x01},
+        {0x00, 0x01, 0x8d, 0x01}, {0x00, 0x01, 0x8f, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xc6, 0x00}, {0x09, 0x01, 0xc6, 0x00},
+        {0x17, 0x01, 0xc6, 0x00}, {0x28, 0x01, 0xc6, 0x01},
+        {0x02, 0x01, 0xe4, 0x00}, {0x09, 0x01, 0xe4, 0x00},
+        {0x17, 0x01, 0xe4, 0x00}, {0x28, 0x01, 0xe4, 0x01},
+        {0x02, 0x01, 0xe8, 0x00}, {0x09, 0x01, 0xe8, 0x00},
+        {0x17, 0x01, 0xe8, 0x00}, {0x28, 0x01, 0xe8, 0x01},
+        {0x02, 0x01, 0xe9, 0x00}, {0x09, 0x01, 0xe9, 0x00},
+        {0x17, 0x01, 0xe9, 0x00}, {0x28, 0x01, 0xe9, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xc6, 0x00}, {0x06, 0x01, 0xc6, 0x00},
+        {0x0a, 0x01, 0xc6, 0x00}, {0x0f, 0x01, 0xc6, 0x00},
+        {0x18, 0x01, 0xc6, 0x00}, {0x1f, 0x01, 0xc6, 0x00},
+        {0x29, 0x01, 0xc6, 0x00}, {0x38, 0x01, 0xc6, 0x01},
+        {0x03, 0x01, 0xe4, 0x00}, {0x06, 0x01, 0xe4, 0x00},
+        {0x0a, 0x01, 0xe4, 0x00}, {0x0f, 0x01, 0xe4, 0x00},
+        {0x18, 0x01, 0xe4, 0x00}, {0x1f, 0x01, 0xe4, 0x00},
+        {0x29, 0x01, 0xe4, 0x00}, {0x38, 0x01, 0xe4, 0x01}
+    },
+    /* 145 */
+    {
+        {0x03, 0x01, 0xe8, 0x00}, {0x06, 0x01, 0xe8, 0x00},
+        {0x0a, 0x01, 0xe8, 0x00}, {0x0f, 0x01, 0xe8, 0x00},
+        {0x18, 0x01, 0xe8, 0x00}, {0x1f, 0x01, 0xe8, 0x00},
+        {0x29, 0x01, 0xe8, 0x00}, {0x38, 0x01, 0xe8, 0x01},
+        {0x03, 0x01, 0xe9, 0x00}, {0x06, 0x01, 0xe9, 0x00},
+        {0x0a, 0x01, 0xe9, 0x00}, {0x0f, 0x01, 0xe9, 0x00},
+        {0x18, 0x01, 0xe9, 0x00}, {0x1f, 0x01, 0xe9, 0x00},
+        {0x29, 0x01, 0xe9, 0x00}, {0x38, 0x01, 0xe9, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x01, 0x00}, {0x16, 0x01, 0x01, 0x01},
+        {0x01, 0x01, 0x87, 0x00}, {0x16, 0x01, 0x87, 0x01},
+        {0x01, 0x01, 0x89, 0x00}, {0x16, 0x01, 0x89, 0x01},
+        {0x01, 0x01, 0x8a, 0x00}, {0x16, 0x01, 0x8a, 0x01},
+        {0x01, 0x01, 0x8b, 0x00}, {0x16, 0x01, 0x8b, 0x01},
+        {0x01, 0x01, 0x8c, 0x00}, {0x16, 0x01, 0x8c, 0x01},
+        {0x01, 0x01, 0x8d, 0x00}, {0x16, 0x01, 0x8d, 0x01},
+        {0x01, 0x01, 0x8f, 0x00}, {0x16, 0x01, 0x8f, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x01, 0x00}, {0x09, 0x01, 0x01, 0x00},
+        {0x17, 0x01, 0x01, 0x00}, {0x28, 0x01, 0x01, 0x01},
+        {0x02, 0x01, 0x87, 0x00}, {0x09, 0x01, 0x87, 0x00},
+        {0x17, 0x01, 0x87, 0x00}, {0x28, 0x01, 0x87, 0x01},
+        {0x02, 0x01, 0x89, 0x00}, {0x09, 0x01, 0x89, 0x00},
+        {0x17, 0x01, 0x89, 0x00}, {0x28, 0x01, 0x89, 0x01},
+        {0x02, 0x01, 0x8a, 0x00}, {0x09, 0x01, 0x8a, 0x00},
+        {0x17, 0x01, 0x8a, 0x00}, {0x28, 0x01, 0x8a, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x01, 0x00}, {0x06, 0x01, 0x01, 0x00},
+        {0x0a, 0x01, 0x01, 0x00}, {0x0f, 0x01, 0x01, 0x00},
+        {0x18, 0x01, 0x01, 0x00}, {0x1f, 0x01, 0x01, 0x00},
+        {0x29, 0x01, 0x01, 0x00}, {0x38, 0x01, 0x01, 0x01},
+        {0x03, 0x01, 0x87, 0x00}, {0x06, 0x01, 0x87, 0x00},
+        {0x0a, 0x01, 0x87, 0x00}, {0x0f, 0x01, 0x87, 0x00},
+        {0x18, 0x01, 0x87, 0x00}, {0x1f, 0x01, 0x87, 0x00},
+        {0x29, 0x01, 0x87, 0x00}, {0x38, 0x01, 0x87, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x89, 0x00}, {0x06, 0x01, 0x89, 0x00},
+        {0x0a, 0x01, 0x89, 0x00}, {0x0f, 0x01, 0x89, 0x00},
+        {0x18, 0x01, 0x89, 0x00}, {0x1f, 0x01, 0x89, 0x00},
+        {0x29, 0x01, 0x89, 0x00}, {0x38, 0x01, 0x89, 0x01},
+        {0x03, 0x01, 0x8a, 0x00}, {0x06, 0x01, 0x8a, 0x00},
+        {0x0a, 0x01, 0x8a, 0x00}, {0x0f, 0x01, 0x8a, 0x00},
+        {0x18, 0x01, 0x8a, 0x00}, {0x1f, 0x01, 0x8a, 0x00},
+        {0x29, 0x01, 0x8a, 0x00}, {0x38, 0x01, 0x8a, 0x01}
+    },
+    /* 150 */
+    {
+        {0x02, 0x01, 0x8b, 0x00}, {0x09, 0x01, 0x8b, 0x00},
+        {0x17, 0x01, 0x8b, 0x00}, {0x28, 0x01, 0x8b, 0x01},
+        {0x02, 0x01, 0x8c, 0x00}, {0x09, 0x01, 0x8c, 0x00},
+        {0x17, 0x01, 0x8c, 0x00}, {0x28, 0x01, 0x8c, 0x01},
+        {0x02, 0x01, 0x8d, 0x00}, {0x09, 0x01, 0x8d, 0x00},
+        {0x17, 0x01, 0x8d, 0x00}, {0x28, 0x01, 0x8d, 0x01},
+        {0x02, 0x01, 0x8f, 0x00}, {0x09, 0x01, 0x8f, 0x00},
+        {0x17, 0x01, 0x8f, 0x00}, {0x28, 0x01, 0x8f, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x8b, 0x00}, {0x06, 0x01, 0x8b, 0x00},
+        {0x0a, 0x01, 0x8b, 0x00}, {0x0f, 0x01, 0x8b, 0x00},
+        {0x18, 0x01, 0x8b, 0x00}, {0x1f, 0x01, 0x8b, 0x00},
+        {0x29, 0x01, 0x8b, 0x00}, {0x38, 0x01, 0x8b, 0x01},
+        {0x03, 0x01, 0x8c, 0x00}, {0x06, 0x01, 0x8c, 0x00},
+        {0x0a, 0x01, 0x8c, 0x00}, {0x0f, 0x01, 0x8c, 0x00},
+        {0x18, 0x01, 0x8c, 0x00}, {0x1f, 0x01, 0x8c, 0x00},
+        {0x29, 0x01, 0x8c, 0x00}, {0x38, 0x01, 0x8c, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x8d, 0x00}, {0x06, 0x01, 0x8d, 0x00},
+        {0x0a, 0x01, 0x8d, 0x00}, {0x0f, 0x01, 0x8d, 0x00},
+        {0x18, 0x01, 0x8d, 0x00}, {0x1f, 0x01, 0x8d, 0x00},
+        {0x29, 0x01, 0x8d, 0x00}, {0x38, 0x01, 0x8d, 0x01},
+        {0x03, 0x01, 0x8f, 0x00}, {0x06, 0x01, 0x8f, 0x00},
+        {0x0a, 0x01, 0x8f, 0x00}, {0x0f, 0x01, 0x8f, 0x00},
+        {0x18, 0x01, 0x8f, 0x00}, {0x1f, 0x01, 0x8f, 0x00},
+        {0x29, 0x01, 0x8f, 0x00}, {0x38, 0x01, 0x8f, 0x01}
+    },
+    {
+        {0x9d, 0x00, 0x00, 0x00}, {0x9e, 0x00, 0x00, 0x00},
+        {0xa0, 0x00, 0x00, 0x00}, {0xa1, 0x00, 0x00, 0x00},
+        {0xa4, 0x00, 0x00, 0x00}, {0xa5, 0x00, 0x00, 0x00},
+        {0xa7, 0x00, 0x00, 0x00}, {0xa8, 0x00, 0x00, 0x00},
+        {0xac, 0x00, 0x00, 0x00}, {0xad, 0x00, 0x00, 0x00},
+        {0xaf, 0x00, 0x00, 0x00}, {0xb1, 0x00, 0x00, 0x00},
+        {0xb6, 0x00, 0x00, 0x00}, {0xb9, 0x00, 0x00, 0x00},
+        {0xbf, 0x00, 0x00, 0x00}, {0xcf, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x00, 0x01, 0x93, 0x01}, {0x00, 0x01, 0x95, 0x01},
+        {0x00, 0x01, 0x96, 0x01}, {0x00, 0x01, 0x97, 0x01},
+        {0x00, 0x01, 0x98, 0x01}, {0x00, 0x01, 0x9b, 0x01},
+        {0x00, 0x01, 0x9d, 0x01}, {0x00, 0x01, 0x9e, 0x01},
+        {0x00, 0x01, 0xa5, 0x01}, {0x00, 0x01, 0xa6, 0x01},
+        {0x00, 0x01, 0xa8, 0x01}, {0x00, 0x01, 0xae, 0x01},
+        {0x00, 0x01, 0xaf, 0x01}, {0x00, 0x01, 0xb4, 0x01},
+        {0x00, 0x01, 0xb6, 0x01}, {0x00, 0x01, 0xb7, 0x01}
+    },
+    /* 155 */
+    {
+        {0x01, 0x01, 0x93, 0x00}, {0x16, 0x01, 0x93, 0x01},
+        {0x01, 0x01, 0x95, 0x00}, {0x16, 0x01, 0x95, 0x01},
+        {0x01, 0x01, 0x96, 0x00}, {0x16, 0x01, 0x96, 0x01},
+        {0x01, 0x01, 0x97, 0x00}, {0x16, 0x01, 0x97, 0x01},
+        {0x01, 0x01, 0x98, 0x00}, {0x16, 0x01, 0x98, 0x01},
+        {0x01, 0x01, 0x9b, 0x00}, {0x16, 0x01, 0x9b, 0x01},
+        {0x01, 0x01, 0x9d, 0x00}, {0x16, 0x01, 0x9d, 0x01},
+        {0x01, 0x01, 0x9e, 0x00}, {0x16, 0x01, 0x9e, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x93, 0x00}, {0x09, 0x01, 0x93, 0x00},
+        {0x17, 0x01, 0x93, 0x00}, {0x28, 0x01, 0x93, 0x01},
+        {0x02, 0x01, 0x95, 0x00}, {0x09, 0x01, 0x95, 0x00},
+        {0x17, 0x01, 0x95, 0x00}, {0x28, 0x01, 0x95, 0x01},
+        {0x02, 0x01, 0x96, 0x00}, {0x09, 0x01, 0x96, 0x00},
+        {0x17, 0x01, 0x96, 0x00}, {0x28, 0x01, 0x96, 0x01},
+        {0x02, 0x01, 0x97, 0x00}, {0x09, 0x01, 0x97, 0x00},
+        {0x17, 0x01, 0x97, 0x00}, {0x28, 0x01, 0x97, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x93, 0x00}, {0x06, 0x01, 0x93, 0x00},
+        {0x0a, 0x01, 0x93, 0x00}, {0x0f, 0x01, 0x93, 0x00},
+        {0x18, 0x01, 0x93, 0x00}, {0x1f, 0x01, 0x93, 0x00},
+        {0x29, 0x01, 0x93, 0x00}, {0x38, 0x01, 0x93, 0x01},
+        {0x03, 0x01, 0x95, 0x00}, {0x06, 0x01, 0x95, 0x00},
+        {0x0a, 0x01, 0x95, 0x00}, {0x0f, 0x01, 0x95, 0x00},
+        {0x18, 0x01, 0x95, 0x00}, {0x1f, 0x01, 0x95, 0x00},
+        {0x29, 0x01, 0x95, 0x00}, {0x38, 0x01, 0x95, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x96, 0x00}, {0x06, 0x01, 0x96, 0x00},
+        {0x0a, 0x01, 0x96, 0x00}, {0x0f, 0x01, 0x96, 0x00},
+        {0x18, 0x01, 0x96, 0x00}, {0x1f, 0x01, 0x96, 0x00},
+        {0x29, 0x01, 0x96, 0x00}, {0x38, 0x01, 0x96, 0x01},
+        {0x03, 0x01, 0x97, 0x00}, {0x06, 0x01, 0x97, 0x00},
+        {0x0a, 0x01, 0x97, 0x00}, {0x0f, 0x01, 0x97, 0x00},
+        {0x18, 0x01, 0x97, 0x00}, {0x1f, 0x01, 0x97, 0x00},
+        {0x29, 0x01, 0x97, 0x00}, {0x38, 0x01, 0x97, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x98, 0x00}, {0x09, 0x01, 0x98, 0x00},
+        {0x17, 0x01, 0x98, 0x00}, {0x28, 0x01, 0x98, 0x01},
+        {0x02, 0x01, 0x9b, 0x00}, {0x09, 0x01, 0x9b, 0x00},
+        {0x17, 0x01, 0x9b, 0x00}, {0x28, 0x01, 0x9b, 0x01},
+        {0x02, 0x01, 0x9d, 0x00}, {0x09, 0x01, 0x9d, 0x00},
+        {0x17, 0x01, 0x9d, 0x00}, {0x28, 0x01, 0x9d, 0x01},
+        {0x02, 0x01, 0x9e, 0x00}, {0x09, 0x01, 0x9e, 0x00},
+        {0x17, 0x01, 0x9e, 0x00}, {0x28, 0x01, 0x9e, 0x01}
+    },
+    /* 160 */
+    {
+        {0x03, 0x01, 0x98, 0x00}, {0x06, 0x01, 0x98, 0x00},
+        {0x0a, 0x01, 0x98, 0x00}, {0x0f, 0x01, 0x98, 0x00},
+        {0x18, 0x01, 0x98, 0x00}, {0x1f, 0x01, 0x98, 0x00},
+        {0x29, 0x01, 0x98, 0x00}, {0x38, 0x01, 0x98, 0x01},
+        {0x03, 0x01, 0x9b, 0x00}, {0x06, 0x01, 0x9b, 0x00},
+        {0x0a, 0x01, 0x9b, 0x00}, {0x0f, 0x01, 0x9b, 0x00},
+        {0x18, 0x01, 0x9b, 0x00}, {0x1f, 0x01, 0x9b, 0x00},
+        {0x29, 0x01, 0x9b, 0x00}, {0x38, 0x01, 0x9b, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x9d, 0x00}, {0x06, 0x01, 0x9d, 0x00},
+        {0x0a, 0x01, 0x9d, 0x00}, {0x0f, 0x01, 0x9d, 0x00},
+        {0x18, 0x01, 0x9d, 0x00}, {0x1f, 0x01, 0x9d, 0x00},
+        {0x29, 0x01, 0x9d, 0x00}, {0x38, 0x01, 0x9d, 0x01},
+        {0x03, 0x01, 0x9e, 0x00}, {0x06, 0x01, 0x9e, 0x00},
+        {0x0a, 0x01, 0x9e, 0x00}, {0x0f, 0x01, 0x9e, 0x00},
+        {0x18, 0x01, 0x9e, 0x00}, {0x1f, 0x01, 0x9e, 0x00},
+        {0x29, 0x01, 0x9e, 0x00}, {0x38, 0x01, 0x9e, 0x01}
+    },
+    {
+        {0x01, 0x01, 0xa5, 0x00}, {0x16, 0x01, 0xa5, 0x01},
+        {0x01, 0x01, 0xa6, 0x00}, {0x16, 0x01, 0xa6, 0x01},
+        {0x01, 0x01, 0xa8, 0x00}, {0x16, 0x01, 0xa8, 0x01},
+        {0x01, 0x01, 0xae, 0x00}, {0x16, 0x01, 0xae, 0x01},
+        {0x01, 0x01, 0xaf, 0x00}, {0x16, 0x01, 0xaf, 0x01},
+        {0x01, 0x01, 0xb4, 0x00}, {0x16, 0x01, 0xb4, 0x01},
+        {0x01, 0x01, 0xb6, 0x00}, {0x16, 0x01, 0xb6, 0x01},
+        {0x01, 0x01, 0xb7, 0x00}, {0x16, 0x01, 0xb7, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xa5, 0x00}, {0x09, 0x01, 0xa5, 0x00},
+        {0x17, 0x01, 0xa5, 0x00}, {0x28, 0x01, 0xa5, 0x01},
+        {0x02, 0x01, 0xa6, 0x00}, {0x09, 0x01, 0xa6, 0x00},
+        {0x17, 0x01, 0xa6, 0x00}, {0x28, 0x01, 0xa6, 0x01},
+        {0x02, 0x01, 0xa8, 0x00}, {0x09, 0x01, 0xa8, 0x00},
+        {0x17, 0x01, 0xa8, 0x00}, {0x28, 0x01, 0xa8, 0x01},
+        {0x02, 0x01, 0xae, 0x00}, {0x09, 0x01, 0xae, 0x00},
+        {0x17, 0x01, 0xae, 0x00}, {0x28, 0x01, 0xae, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xa5, 0x00}, {0x06, 0x01, 0xa5, 0x00},
+        {0x0a, 0x01, 0xa5, 0x00}, {0x0f, 0x01, 0xa5, 0x00},
+        {0x18, 0x01, 0xa5, 0x00}, {0x1f, 0x01, 0xa5, 0x00},
+        {0x29, 0x01, 0xa5, 0x00}, {0x38, 0x01, 0xa5, 0x01},
+        {0x03, 0x01, 0xa6, 0x00}, {0x06, 0x01, 0xa6, 0x00},
+        {0x0a, 0x01, 0xa6, 0x00}, {0x0f, 0x01, 0xa6, 0x00},
+        {0x18, 0x01, 0xa6, 0x00}, {0x1f, 0x01, 0xa6, 0x00},
+        {0x29, 0x01, 0xa6, 0x00}, {0x38, 0x01, 0xa6, 0x01}
+    },
+    /* 165 */
+    {
+        {0x03, 0x01, 0xa8, 0x00}, {0x06, 0x01, 0xa8, 0x00},
+        {0x0a, 0x01, 0xa8, 0x00}, {0x0f, 0x01, 0xa8, 0x00},
+        {0x18, 0x01, 0xa8, 0x00}, {0x1f, 0x01, 0xa8, 0x00},
+        {0x29, 0x01, 0xa8, 0x00}, {0x38, 0x01, 0xa8, 0x01},
+        {0x03, 0x01, 0xae, 0x00}, {0x06, 0x01, 0xae, 0x00},
+        {0x0a, 0x01, 0xae, 0x00}, {0x0f, 0x01, 0xae, 0x00},
+        {0x18, 0x01, 0xae, 0x00}, {0x1f, 0x01, 0xae, 0x00},
+        {0x29, 0x01, 0xae, 0x00}, {0x38, 0x01, 0xae, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xaf, 0x00}, {0x09, 0x01, 0xaf, 0x00},
+        {0x17, 0x01, 0xaf, 0x00}, {0x28, 0x01, 0xaf, 0x01},
+        {0x02, 0x01, 0xb4, 0x00}, {0x09, 0x01, 0xb4, 0x00},
+        {0x17, 0x01, 0xb4, 0x00}, {0x28, 0x01, 0xb4, 0x01},
+        {0x02, 0x01, 0xb6, 0x00}, {0x09, 0x01, 0xb6, 0x00},
+        {0x17, 0x01, 0xb6, 0x00}, {0x28, 0x01, 0xb6, 0x01},
+        {0x02, 0x01, 0xb7, 0x00}, {0x09, 0x01, 0xb7, 0x00},
+        {0x17, 0x01, 0xb7, 0x00}, {0x28, 0x01, 0xb7, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xaf, 0x00}, {0x06, 0x01, 0xaf, 0x00},
+        {0x0a, 0x01, 0xaf, 0x00}, {0x0f, 0x01, 0xaf, 0x00},
+        {0x18, 0x01, 0xaf, 0x00}, {0x1f, 0x01, 0xaf, 0x00},
+        {0x29, 0x01, 0xaf, 0x00}, {0x38, 0x01, 0xaf, 0x01},
+        {0x03, 0x01, 0xb4, 0x00}, {0x06, 0x01, 0xb4, 0x00},
+        {0x0a, 0x01, 0xb4, 0x00}, {0x0f, 0x01, 0xb4, 0x00},
+        {0x18, 0x01, 0xb4, 0x00}, {0x1f, 0x01, 0xb4, 0x00},
+        {0x29, 0x01, 0xb4, 0x00}, {0x38, 0x01, 0xb4, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xb6, 0x00}, {0x06, 0x01, 0xb6, 0x00},
+        {0x0a, 0x01, 0xb6, 0x00}, {0x0f, 0x01, 0xb6, 0x00},
+        {0x18, 0x01, 0xb6, 0x00}, {0x1f, 0x01, 0xb6, 0x00},
+        {0x29, 0x01, 0xb6, 0x00}, {0x38, 0x01, 0xb6, 0x01},
+        {0x03, 0x01, 0xb7, 0x00}, {0x06, 0x01, 0xb7, 0x00},
+        {0x0a, 0x01, 0xb7, 0x00}, {0x0f, 0x01, 0xb7, 0x00},
+        {0x18, 0x01, 0xb7, 0x00}, {0x1f, 0x01, 0xb7, 0x00},
+        {0x29, 0x01, 0xb7, 0x00}, {0x38, 0x01, 0xb7, 0x01}
+    },
+    {
+        {0x00, 0x01, 0xbc, 0x01}, {0x00, 0x01, 0xbf, 0x01},
+        {0x00, 0x01, 0xc5, 0x01}, {0x00, 0x01, 0xe7, 0x01},
+        {0x00, 0x01, 0xef, 0x01}, {0xb0, 0x00, 0x00, 0x00},
+        {0xb2, 0x00, 0x00, 0x00}, {0xb3, 0x00, 0x00, 0x00},
+        {0xb7, 0x00, 0x00, 0x00}, {0xb8, 0x00, 0x00, 0x00},
+        {0xba, 0x00, 0x00, 0x00}, {0xbb, 0x00, 0x00, 0x00},
+        {0xc0, 0x00, 0x00, 0x00}, {0xc7, 0x00, 0x00, 0x00},
+        {0xd0, 0x00, 0x00, 0x00}, {0xdf, 0x00, 0x00, 0x01}
+    },
+    /* 170 */
+    {
+        {0x01, 0x01, 0xbc, 0x00}, {0x16, 0x01, 0xbc, 0x01},
+        {0x01, 0x01, 0xbf, 0x00}, {0x16, 0x01, 0xbf, 0x01},
+        {0x01, 0x01, 0xc5, 0x00}, {0x16, 0x01, 0xc5, 0x01},
+        {0x01, 0x01, 0xe7, 0x00}, {0x16, 0x01, 0xe7, 0x01},
+        {0x01, 0x01, 0xef, 0x00}, {0x16, 0x01, 0xef, 0x01},
+        {0x00, 0x01, 0x09, 0x01}, {0x00, 0x01, 0x8e, 0x01},
+        {0x00, 0x01, 0x90, 0x01}, {0x00, 0x01, 0x91, 0x01},
+        {0x00, 0x01, 0x94, 0x01}, {0x00, 0x01, 0x9f, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xbc, 0x00}, {0x09, 0x01, 0xbc, 0x00},
+        {0x17, 0x01, 0xbc, 0x00}, {0x28, 0x01, 0xbc, 0x01},
+        {0x02, 0x01, 0xbf, 0x00}, {0x09, 0x01, 0xbf, 0x00},
+        {0x17, 0x01, 0xbf, 0x00}, {0x28, 0x01, 0xbf, 0x01},
+        {0x02, 0x01, 0xc5, 0x00}, {0x09, 0x01, 0xc5, 0x00},
+        {0x17, 0x01, 0xc5, 0x00}, {0x28, 0x01, 0xc5, 0x01},
+        {0x02, 0x01, 0xe7, 0x00}, {0x09, 0x01, 0xe7, 0x00},
+        {0x17, 0x01, 0xe7, 0x00}, {0x28, 0x01, 0xe7, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xbc, 0x00}, {0x06, 0x01, 0xbc, 0x00},
+        {0x0a, 0x01, 0xbc, 0x00}, {0x0f, 0x01, 0xbc, 0x00},
+        {0x18, 0x01, 0xbc, 0x00}, {0x1f, 0x01, 0xbc, 0x00},
+        {0x29, 0x01, 0xbc, 0x00}, {0x38, 0x01, 0xbc, 0x01},
+        {0x03, 0x01, 0xbf, 0x00}, {0x06, 0x01, 0xbf, 0x00},
+        {0x0a, 0x01, 0xbf, 0x00}, {0x0f, 0x01, 0xbf, 0x00},
+        {0x18, 0x01, 0xbf, 0x00}, {0x1f, 0x01, 0xbf, 0x00},
+        {0x29, 0x01, 0xbf, 0x00}, {0x38, 0x01, 0xbf, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xc5, 0x00}, {0x06, 0x01, 0xc5, 0x00},
+        {0x0a, 0x01, 0xc5, 0x00}, {0x0f, 0x01, 0xc5, 0x00},
+        {0x18, 0x01, 0xc5, 0x00}, {0x1f, 0x01, 0xc5, 0x00},
+        {0x29, 0x01, 0xc5, 0x00}, {0x38, 0x01, 0xc5, 0x01},
+        {0x03, 0x01, 0xe7, 0x00}, {0x06, 0x01, 0xe7, 0x00},
+        {0x0a, 0x01, 0xe7, 0x00}, {0x0f, 0x01, 0xe7, 0x00},
+        {0x18, 0x01, 0xe7, 0x00}, {0x1f, 0x01, 0xe7, 0x00},
+        {0x29, 0x01, 0xe7, 0x00}, {0x38, 0x01, 0xe7, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xef, 0x00}, {0x09, 0x01, 0xef, 0x00},
+        {0x17, 0x01, 0xef, 0x00}, {0x28, 0x01, 0xef, 0x01},
+        {0x01, 0x01, 0x09, 0x00}, {0x16, 0x01, 0x09, 0x01},
+        {0x01, 0x01, 0x8e, 0x00}, {0x16, 0x01, 0x8e, 0x01},
+        {0x01, 0x01, 0x90, 0x00}, {0x16, 0x01, 0x90, 0x01},
+        {0x01, 0x01, 0x91, 0x00}, {0x16, 0x01, 0x91, 0x01},
+        {0x01, 0x01, 0x94, 0x00}, {0x16, 0x01, 0x94, 0x01},
+        {0x01, 0x01, 0x9f, 0x00}, {0x16, 0x01, 0x9f, 0x01}
+    },
+    /* 175 */
+    {
+        {0x03, 0x01, 0xef, 0x00}, {0x06, 0x01, 0xef, 0x00},
+        {0x0a, 0x01, 0xef, 0x00}, {0x0f, 0x01, 0xef, 0x00},
+        {0x18, 0x01, 0xef, 0x00}, {0x1f, 0x01, 0xef, 0x00},
+        {0x29, 0x01, 0xef, 0x00}, {0x38, 0x01, 0xef, 0x01},
+        {0x02, 0x01, 0x09, 0x00}, {0x09, 0x01, 0x09, 0x00},
+        {0x17, 0x01, 0x09, 0x00}, {0x28, 0x01, 0x09, 0x01},
+        {0x02, 0x01, 0x8e, 0x00}, {0x09, 0x01, 0x8e, 0x00},
+        {0x17, 0x01, 0x8e, 0x00}, {0x28, 0x01, 0x8e, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x09, 0x00}, {0x06, 0x01, 0x09, 0x00},
+        {0x0a, 0x01, 0x09, 0x00}, {0x0f, 0x01, 0x09, 0x00},
+        {0x18, 0x01, 0x09, 0x00}, {0x1f, 0x01, 0x09, 0x00},
+        {0x29, 0x01, 0x09, 0x00}, {0x38, 0x01, 0x09, 0x01},
+        {0x03, 0x01, 0x8e, 0x00}, {0x06, 0x01, 0x8e, 0x00},
+        {0x0a, 0x01, 0x8e, 0x00}, {0x0f, 0x01, 0x8e, 0x00},
+        {0x18, 0x01, 0x8e, 0x00}, {0x1f, 0x01, 0x8e, 0x00},
+        {0x29, 0x01, 0x8e, 0x00}, {0x38, 0x01, 0x8e, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x90, 0x00}, {0x09, 0x01, 0x90, 0x00},
+        {0x17, 0x01, 0x90, 0x00}, {0x28, 0x01, 0x90, 0x01},
+        {0x02, 0x01, 0x91, 0x00}, {0x09, 0x01, 0x91, 0x00},
+        {0x17, 0x01, 0x91, 0x00}, {0x28, 0x01, 0x91, 0x01},
+        {0x02, 0x01, 0x94, 0x00}, {0x09, 0x01, 0x94, 0x00},
+        {0x17, 0x01, 0x94, 0x00}, {0x28, 0x01, 0x94, 0x01},
+        {0x02, 0x01, 0x9f, 0x00}, {0x09, 0x01, 0x9f, 0x00},
+        {0x17, 0x01, 0x9f, 0x00}, {0x28, 0x01, 0x9f, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x90, 0x00}, {0x06, 0x01, 0x90, 0x00},
+        {0x0a, 0x01, 0x90, 0x00}, {0x0f, 0x01, 0x90, 0x00},
+        {0x18, 0x01, 0x90, 0x00}, {0x1f, 0x01, 0x90, 0x00},
+        {0x29, 0x01, 0x90, 0x00}, {0x38, 0x01, 0x90, 0x01},
+        {0x03, 0x01, 0x91, 0x00}, {0x06, 0x01, 0x91, 0x00},
+        {0x0a, 0x01, 0x91, 0x00}, {0x0f, 0x01, 0x91, 0x00},
+        {0x18, 0x01, 0x91, 0x00}, {0x1f, 0x01, 0x91, 0x00},
+        {0x29, 0x01, 0x91, 0x00}, {0x38, 0x01, 0x91, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x94, 0x00}, {0x06, 0x01, 0x94, 0x00},
+        {0x0a, 0x01, 0x94, 0x00}, {0x0f, 0x01, 0x94, 0x00},
+        {0x18, 0x01, 0x94, 0x00}, {0x1f, 0x01, 0x94, 0x00},
+        {0x29, 0x01, 0x94, 0x00}, {0x38, 0x01, 0x94, 0x01},
+        {0x03, 0x01, 0x9f, 0x00}, {0x06, 0x01, 0x9f, 0x00},
+        {0x0a, 0x01, 0x9f, 0x00}, {0x0f, 0x01, 0x9f, 0x00},
+        {0x18, 0x01, 0x9f, 0x00}, {0x1f, 0x01, 0x9f, 0x00},
+        {0x29, 0x01, 0x9f, 0x00}, {0x38, 0x01, 0x9f, 0x01}
+    },
+    /* 180 */
+    {
+        {0x00, 0x01, 0xab, 0x01}, {0x00, 0x01, 0xce, 0x01},
+        {0x00, 0x01, 0xd7, 0x01}, {0x00, 0x01, 0xe1, 0x01},
+        {0x00, 0x01, 0xec, 0x01}, {0x00, 0x01, 0xed, 0x01},
+        {0xbc, 0x00, 0x00, 0x00}, {0xbd, 0x00, 0x00, 0x00},
+        {0xc1, 0x00, 0x00, 0x00}, {0xc4, 0x00, 0x00, 0x00},
+        {0xc8, 0x00, 0x00, 0x00}, {0xcb, 0x00, 0x00, 0x00},
+        {0xd1, 0x00, 0x00, 0x00}, {0xd8, 0x00, 0x00, 0x00},
+        {0xe0, 0x00, 0x00, 0x00}, {0xee, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x01, 0x01, 0xab, 0x00}, {0x16, 0x01, 0xab, 0x01},
+        {0x01, 0x01, 0xce, 0x00}, {0x16, 0x01, 0xce, 0x01},
+        {0x01, 0x01, 0xd7, 0x00}, {0x16, 0x01, 0xd7, 0x01},
+        {0x01, 0x01, 0xe1, 0x00}, {0x16, 0x01, 0xe1, 0x01},
+        {0x01, 0x01, 0xec, 0x00}, {0x16, 0x01, 0xec, 0x01},
+        {0x01, 0x01, 0xed, 0x00}, {0x16, 0x01, 0xed, 0x01},
+        {0x00, 0x01, 0xc7, 0x01}, {0x00, 0x01, 0xcf, 0x01},
+        {0x00, 0x01, 0xea, 0x01}, {0x00, 0x01, 0xeb, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xab, 0x00}, {0x09, 0x01, 0xab, 0x00},
+        {0x17, 0x01, 0xab, 0x00}, {0x28, 0x01, 0xab, 0x01},
+        {0x02, 0x01, 0xce, 0x00}, {0x09, 0x01, 0xce, 0x00},
+        {0x17, 0x01, 0xce, 0x00}, {0x28, 0x01, 0xce, 0x01},
+        {0x02, 0x01, 0xd7, 0x00}, {0x09, 0x01, 0xd7, 0x00},
+        {0x17, 0x01, 0xd7, 0x00}, {0x28, 0x01, 0xd7, 0x01},
+        {0x02, 0x01, 0xe1, 0x00}, {0x09, 0x01, 0xe1, 0x00},
+        {0x17, 0x01, 0xe1, 0x00}, {0x28, 0x01, 0xe1, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xab, 0x00}, {0x06, 0x01, 0xab, 0x00},
+        {0x0a, 0x01, 0xab, 0x00}, {0x0f, 0x01, 0xab, 0x00},
+        {0x18, 0x01, 0xab, 0x00}, {0x1f, 0x01, 0xab, 0x00},
+        {0x29, 0x01, 0xab, 0x00}, {0x38, 0x01, 0xab, 0x01},
+        {0x03, 0x01, 0xce, 0x00}, {0x06, 0x01, 0xce, 0x00},
+        {0x0a, 0x01, 0xce, 0x00}, {0x0f, 0x01, 0xce, 0x00},
+        {0x18, 0x01, 0xce, 0x00}, {0x1f, 0x01, 0xce, 0x00},
+        {0x29, 0x01, 0xce, 0x00}, {0x38, 0x01, 0xce, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xd7, 0x00}, {0x06, 0x01, 0xd7, 0x00},
+        {0x0a, 0x01, 0xd7, 0x00}, {0x0f, 0x01, 0xd7, 0x00},
+        {0x18, 0x01, 0xd7, 0x00}, {0x1f, 0x01, 0xd7, 0x00},
+        {0x29, 0x01, 0xd7, 0x00}, {0x38, 0x01, 0xd7, 0x01},
+        {0x03, 0x01, 0xe1, 0x00}, {0x06, 0x01, 0xe1, 0x00},
+        {0x0a, 0x01, 0xe1, 0x00}, {0x0f, 0x01, 0xe1, 0x00},
+        {0x18, 0x01, 0xe1, 0x00}, {0x1f, 0x01, 0xe1, 0x00},
+        {0x29, 0x01, 0xe1, 0x00}, {0x38, 0x01, 0xe1, 0x01}
+    },
+    /* 185 */
+    {
+        {0x02, 0x01, 0xec, 0x00}, {0x09, 0x01, 0xec, 0x00},
+        {0x17, 0x01, 0xec, 0x00}, {0x28, 0x01, 0xec, 0x01},
+        {0x02, 0x01, 0xed, 0x00}, {0x09, 0x01, 0xed, 0x00},
+        {0x17, 0x01, 0xed, 0x00}, {0x28, 0x01, 0xed, 0x01},
+        {0x01, 0x01, 0xc7, 0x00}, {0x16, 0x01, 0xc7, 0x01},
+        {0x01, 0x01, 0xcf, 0x00}, {0x16, 0x01, 0xcf, 0x01},
+        {0x01, 0x01, 0xea, 0x00}, {0x16, 0x01, 0xea, 0x01},
+        {0x01, 0x01, 0xeb, 0x00}, {0x16, 0x01, 0xeb, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xec, 0x00}, {0x06, 0x01, 0xec, 0x00},
+        {0x0a, 0x01, 0xec, 0x00}, {0x0f, 0x01, 0xec, 0x00},
+        {0x18, 0x01, 0xec, 0x00}, {0x1f, 0x01, 0xec, 0x00},
+        {0x29, 0x01, 0xec, 0x00}, {0x38, 0x01, 0xec, 0x01},
+        {0x03, 0x01, 0xed, 0x00}, {0x06, 0x01, 0xed, 0x00},
+        {0x0a, 0x01, 0xed, 0x00}, {0x0f, 0x01, 0xed, 0x00},
+        {0x18, 0x01, 0xed, 0x00}, {0x1f, 0x01, 0xed, 0x00},
+        {0x29, 0x01, 0xed, 0x00}, {0x38, 0x01, 0xed, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xc7, 0x00}, {0x09, 0x01, 0xc7, 0x00},
+        {0x17, 0x01, 0xc7, 0x00}, {0x28, 0x01, 0xc7, 0x01},
+        {0x02, 0x01, 0xcf, 0x00}, {0x09, 0x01, 0xcf, 0x00},
+        {0x17, 0x01, 0xcf, 0x00}, {0x28, 0x01, 0xcf, 0x01},
+        {0x02, 0x01, 0xea, 0x00}, {0x09, 0x01, 0xea, 0x00},
+        {0x17, 0x01, 0xea, 0x00}, {0x28, 0x01, 0xea, 0x01},
+        {0x02, 0x01, 0xeb, 0x00}, {0x09, 0x01, 0xeb, 0x00},
+        {0x17, 0x01, 0xeb, 0x00}, {0x28, 0x01, 0xeb, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xc7, 0x00}, {0x06, 0x01, 0xc7, 0x00},
+        {0x0a, 0x01, 0xc7, 0x00}, {0x0f, 0x01, 0xc7, 0x00},
+        {0x18, 0x01, 0xc7, 0x00}, {0x1f, 0x01, 0xc7, 0x00},
+        {0x29, 0x01, 0xc7, 0x00}, {0x38, 0x01, 0xc7, 0x01},
+        {0x03, 0x01, 0xcf, 0x00}, {0x06, 0x01, 0xcf, 0x00},
+        {0x0a, 0x01, 0xcf, 0x00}, {0x0f, 0x01, 0xcf, 0x00},
+        {0x18, 0x01, 0xcf, 0x00}, {0x1f, 0x01, 0xcf, 0x00},
+        {0x29, 0x01, 0xcf, 0x00}, {0x38, 0x01, 0xcf, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xea, 0x00}, {0x06, 0x01, 0xea, 0x00},
+        {0x0a, 0x01, 0xea, 0x00}, {0x0f, 0x01, 0xea, 0x00},
+        {0x18, 0x01, 0xea, 0x00}, {0x1f, 0x01, 0xea, 0x00},
+        {0x29, 0x01, 0xea, 0x00}, {0x38, 0x01, 0xea, 0x01},
+        {0x03, 0x01, 0xeb, 0x00}, {0x06, 0x01, 0xeb, 0x00},
+        {0x0a, 0x01, 0xeb, 0x00}, {0x0f, 0x01, 0xeb, 0x00},
+        {0x18, 0x01, 0xeb, 0x00}, {0x1f, 0x01, 0xeb, 0x00},
+        {0x29, 0x01, 0xeb, 0x00}, {0x38, 0x01, 0xeb, 0x01}
+    },
+    /* 190 */
+    {
+        {0xc2, 0x00, 0x00, 0x00}, {0xc3, 0x00, 0x00, 0x00},
+        {0xc5, 0x00, 0x00, 0x00}, {0xc6, 0x00, 0x00, 0x00},
+        {0xc9, 0x00, 0x00, 0x00}, {0xca, 0x00, 0x00, 0x00},
+        {0xcc, 0x00, 0x00, 0x00}, {0xcd, 0x00, 0x00, 0x00},
+        {0xd2, 0x00, 0x00, 0x00}, {0xd5, 0x00, 0x00, 0x00},
+        {0xd9, 0x00, 0x00, 0x00}, {0xdc, 0x00, 0x00, 0x00},
+        {0xe1, 0x00, 0x00, 0x00}, {0xe7, 0x00, 0x00, 0x00},
+        {0xef, 0x00, 0x00, 0x00}, {0xf6, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x00, 0x01, 0xc0, 0x01}, {0x00, 0x01, 0xc1, 0x01},
+        {0x00, 0x01, 0xc8, 0x01}, {0x00, 0x01, 0xc9, 0x01},
+        {0x00, 0x01, 0xca, 0x01}, {0x00, 0x01, 0xcd, 0x01},
+        {0x00, 0x01, 0xd2, 0x01}, {0x00, 0x01, 0xd5, 0x01},
+        {0x00, 0x01, 0xda, 0x01}, {0x00, 0x01, 0xdb, 0x01},
+        {0x00, 0x01, 0xee, 0x01}, {0x00, 0x01, 0xf0, 0x01},
+        {0x00, 0x01, 0xf2, 0x01}, {0x00, 0x01, 0xf3, 0x01},
+        {0x00, 0x01, 0xff, 0x01}, {0xce, 0x00, 0x00, 0x00}
+    },
+    {
+        {0x01, 0x01, 0xc0, 0x00}, {0x16, 0x01, 0xc0, 0x01},
+        {0x01, 0x01, 0xc1, 0x00}, {0x16, 0x01, 0xc1, 0x01},
+        {0x01, 0x01, 0xc8, 0x00}, {0x16, 0x01, 0xc8, 0x01},
+        {0x01, 0x01, 0xc9, 0x00}, {0x16, 0x01, 0xc9, 0x01},
+        {0x01, 0x01, 0xca, 0x00}, {0x16, 0x01, 0xca, 0x01},
+        {0x01, 0x01, 0xcd, 0x00}, {0x16, 0x01, 0xcd, 0x01},
+        {0x01, 0x01, 0xd2, 0x00}, {0x16, 0x01, 0xd2, 0x01},
+        {0x01, 0x01, 0xd5, 0x00}, {0x16, 0x01, 0xd5, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xc0, 0x00}, {0x09, 0x01, 0xc0, 0x00},
+        {0x17, 0x01, 0xc0, 0x00}, {0x28, 0x01, 0xc0, 0x01},
+        {0x02, 0x01, 0xc1, 0x00}, {0x09, 0x01, 0xc1, 0x00},
+        {0x17, 0x01, 0xc1, 0x00}, {0x28, 0x01, 0xc1, 0x01},
+        {0x02, 0x01, 0xc8, 0x00}, {0x09, 0x01, 0xc8, 0x00},
+        {0x17, 0x01, 0xc8, 0x00}, {0x28, 0x01, 0xc8, 0x01},
+        {0x02, 0x01, 0xc9, 0x00}, {0x09, 0x01, 0xc9, 0x00},
+        {0x17, 0x01, 0xc9, 0x00}, {0x28, 0x01, 0xc9, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xc0, 0x00}, {0x06, 0x01, 0xc0, 0x00},
+        {0x0a, 0x01, 0xc0, 0x00}, {0x0f, 0x01, 0xc0, 0x00},
+        {0x18, 0x01, 0xc0, 0x00}, {0x1f, 0x01, 0xc0, 0x00},
+        {0x29, 0x01, 0xc0, 0x00}, {0x38, 0x01, 0xc0, 0x01},
+        {0x03, 0x01, 0xc1, 0x00}, {0x06, 0x01, 0xc1, 0x00},
+        {0x0a, 0x01, 0xc1, 0x00}, {0x0f, 0x01, 0xc1, 0x00},
+        {0x18, 0x01, 0xc1, 0x00}, {0x1f, 0x01, 0xc1, 0x00},
+        {0x29, 0x01, 0xc1, 0x00}, {0x38, 0x01, 0xc1, 0x01}
+    },
+    /* 195 */
+    {
+        {0x03, 0x01, 0xc8, 0x00}, {0x06, 0x01, 0xc8, 0x00},
+        {0x0a, 0x01, 0xc8, 0x00}, {0x0f, 0x01, 0xc8, 0x00},
+        {0x18, 0x01, 0xc8, 0x00}, {0x1f, 0x01, 0xc8, 0x00},
+        {0x29, 0x01, 0xc8, 0x00}, {0x38, 0x01, 0xc8, 0x01},
+        {0x03, 0x01, 0xc9, 0x00}, {0x06, 0x01, 0xc9, 0x00},
+        {0x0a, 0x01, 0xc9, 0x00}, {0x0f, 0x01, 0xc9, 0x00},
+        {0x18, 0x01, 0xc9, 0x00}, {0x1f, 0x01, 0xc9, 0x00},
+        {0x29, 0x01, 0xc9, 0x00}, {0x38, 0x01, 0xc9, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xca, 0x00}, {0x09, 0x01, 0xca, 0x00},
+        {0x17, 0x01, 0xca, 0x00}, {0x28, 0x01, 0xca, 0x01},
+        {0x02, 0x01, 0xcd, 0x00}, {0x09, 0x01, 0xcd, 0x00},
+        {0x17, 0x01, 0xcd, 0x00}, {0x28, 0x01, 0xcd, 0x01},
+        {0x02, 0x01, 0xd2, 0x00}, {0x09, 0x01, 0xd2, 0x00},
+        {0x17, 0x01, 0xd2, 0x00}, {0x28, 0x01, 0xd2, 0x01},
+        {0x02, 0x01, 0xd5, 0x00}, {0x09, 0x01, 0xd5, 0x00},
+        {0x17, 0x01, 0xd5, 0x00}, {0x28, 0x01, 0xd5, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xca, 0x00}, {0x06, 0x01, 0xca, 0x00},
+        {0x0a, 0x01, 0xca, 0x00}, {0x0f, 0x01, 0xca, 0x00},
+        {0x18, 0x01, 0xca, 0x00}, {0x1f, 0x01, 0xca, 0x00},
+        {0x29, 0x01, 0xca, 0x00}, {0x38, 0x01, 0xca, 0x01},
+        {0x03, 0x01, 0xcd, 0x00}, {0x06, 0x01, 0xcd, 0x00},
+        {0x0a, 0x01, 0xcd, 0x00}, {0x0f, 0x01, 0xcd, 0x00},
+        {0x18, 0x01, 0xcd, 0x00}, {0x1f, 0x01, 0xcd, 0x00},
+        {0x29, 0x01, 0xcd, 0x00}, {0x38, 0x01, 0xcd, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xd2, 0x00}, {0x06, 0x01, 0xd2, 0x00},
+        {0x0a, 0x01, 0xd2, 0x00}, {0x0f, 0x01, 0xd2, 0x00},
+        {0x18, 0x01, 0xd2, 0x00}, {0x1f, 0x01, 0xd2, 0x00},
+        {0x29, 0x01, 0xd2, 0x00}, {0x38, 0x01, 0xd2, 0x01},
+        {0x03, 0x01, 0xd5, 0x00}, {0x06, 0x01, 0xd5, 0x00},
+        {0x0a, 0x01, 0xd5, 0x00}, {0x0f, 0x01, 0xd5, 0x00},
+        {0x18, 0x01, 0xd5, 0x00}, {0x1f, 0x01, 0xd5, 0x00},
+        {0x29, 0x01, 0xd5, 0x00}, {0x38, 0x01, 0xd5, 0x01}
+    },
+    {
+        {0x01, 0x01, 0xda, 0x00}, {0x16, 0x01, 0xda, 0x01},
+        {0x01, 0x01, 0xdb, 0x00}, {0x16, 0x01, 0xdb, 0x01},
+        {0x01, 0x01, 0xee, 0x00}, {0x16, 0x01, 0xee, 0x01},
+        {0x01, 0x01, 0xf0, 0x00}, {0x16, 0x01, 0xf0, 0x01},
+        {0x01, 0x01, 0xf2, 0x00}, {0x16, 0x01, 0xf2, 0x01},
+        {0x01, 0x01, 0xf3, 0x00}, {0x16, 0x01, 0xf3, 0x01},
+        {0x01, 0x01, 0xff, 0x00}, {0x16, 0x01, 0xff, 0x01},
+        {0x00, 0x01, 0xcb, 0x01}, {0x00, 0x01, 0xcc, 0x01}
+    },
+    /* 200 */
+    {
+        {0x02, 0x01, 0xda, 0x00}, {0x09, 0x01, 0xda, 0x00},
+        {0x17, 0x01, 0xda, 0x00}, {0x28, 0x01, 0xda, 0x01},
+        {0x02, 0x01, 0xdb, 0x00}, {0x09, 0x01, 0xdb, 0x00},
+        {0x17, 0x01, 0xdb, 0x00}, {0x28, 0x01, 0xdb, 0x01},
+        {0x02, 0x01, 0xee, 0x00}, {0x09, 0x01, 0xee, 0x00},
+        {0x17, 0x01, 0xee, 0x00}, {0x28, 0x01, 0xee, 0x01},
+        {0x02, 0x01, 0xf0, 0x00}, {0x09, 0x01, 0xf0, 0x00},
+        {0x17, 0x01, 0xf0, 0x00}, {0x28, 0x01, 0xf0, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xda, 0x00}, {0x06, 0x01, 0xda, 0x00},
+        {0x0a, 0x01, 0xda, 0x00}, {0x0f, 0x01, 0xda, 0x00},
+        {0x18, 0x01, 0xda, 0x00}, {0x1f, 0x01, 0xda, 0x00},
+        {0x29, 0x01, 0xda, 0x00}, {0x38, 0x01, 0xda, 0x01},
+        {0x03, 0x01, 0xdb, 0x00}, {0x06, 0x01, 0xdb, 0x00},
+        {0x0a, 0x01, 0xdb, 0x00}, {0x0f, 0x01, 0xdb, 0x00},
+        {0x18, 0x01, 0xdb, 0x00}, {0x1f, 0x01, 0xdb, 0x00},
+        {0x29, 0x01, 0xdb, 0x00}, {0x38, 0x01, 0xdb, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xee, 0x00}, {0x06, 0x01, 0xee, 0x00},
+        {0x0a, 0x01, 0xee, 0x00}, {0x0f, 0x01, 0xee, 0x00},
+        {0x18, 0x01, 0xee, 0x00}, {0x1f, 0x01, 0xee, 0x00},
+        {0x29, 0x01, 0xee, 0x00}, {0x38, 0x01, 0xee, 0x01},
+        {0x03, 0x01, 0xf0, 0x00}, {0x06, 0x01, 0xf0, 0x00},
+        {0x0a, 0x01, 0xf0, 0x00}, {0x0f, 0x01, 0xf0, 0x00},
+        {0x18, 0x01, 0xf0, 0x00}, {0x1f, 0x01, 0xf0, 0x00},
+        {0x29, 0x01, 0xf0, 0x00}, {0x38, 0x01, 0xf0, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xf2, 0x00}, {0x09, 0x01, 0xf2, 0x00},
+        {0x17, 0x01, 0xf2, 0x00}, {0x28, 0x01, 0xf2, 0x01},
+        {0x02, 0x01, 0xf3, 0x00}, {0x09, 0x01, 0xf3, 0x00},
+        {0x17, 0x01, 0xf3, 0x00}, {0x28, 0x01, 0xf3, 0x01},
+        {0x02, 0x01, 0xff, 0x00}, {0x09, 0x01, 0xff, 0x00},
+        {0x17, 0x01, 0xff, 0x00}, {0x28, 0x01, 0xff, 0x01},
+        {0x01, 0x01, 0xcb, 0x00}, {0x16, 0x01, 0xcb, 0x01},
+        {0x01, 0x01, 0xcc, 0x00}, {0x16, 0x01, 0xcc, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xf2, 0x00}, {0x06, 0x01, 0xf2, 0x00},
+        {0x0a, 0x01, 0xf2, 0x00}, {0x0f, 0x01, 0xf2, 0x00},
+        {0x18, 0x01, 0xf2, 0x00}, {0x1f, 0x01, 0xf2, 0x00},
+        {0x29, 0x01, 0xf2, 0x00}, {0x38, 0x01, 0xf2, 0x01},
+        {0x03, 0x01, 0xf3, 0x00}, {0x06, 0x01, 0xf3, 0x00},
+        {0x0a, 0x01, 0xf3, 0x00}, {0x0f, 0x01, 0xf3, 0x00},
+        {0x18, 0x01, 0xf3, 0x00}, {0x1f, 0x01, 0xf3, 0x00},
+        {0x29, 0x01, 0xf3, 0x00}, {0x38, 0x01, 0xf3, 0x01}
+    },
+    /* 205 */
+    {
+        {0x03, 0x01, 0xff, 0x00}, {0x06, 0x01, 0xff, 0x00},
+        {0x0a, 0x01, 0xff, 0x00}, {0x0f, 0x01, 0xff, 0x00},
+        {0x18, 0x01, 0xff, 0x00}, {0x1f, 0x01, 0xff, 0x00},
+        {0x29, 0x01, 0xff, 0x00}, {0x38, 0x01, 0xff, 0x01},
+        {0x02, 0x01, 0xcb, 0x00}, {0x09, 0x01, 0xcb, 0x00},
+        {0x17, 0x01, 0xcb, 0x00}, {0x28, 0x01, 0xcb, 0x01},
+        {0x02, 0x01, 0xcc, 0x00}, {0x09, 0x01, 0xcc, 0x00},
+        {0x17, 0x01, 0xcc, 0x00}, {0x28, 0x01, 0xcc, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xcb, 0x00}, {0x06, 0x01, 0xcb, 0x00},
+        {0x0a, 0x01, 0xcb, 0x00}, {0x0f, 0x01, 0xcb, 0x00},
+        {0x18, 0x01, 0xcb, 0x00}, {0x1f, 0x01, 0xcb, 0x00},
+        {0x29, 0x01, 0xcb, 0x00}, {0x38, 0x01, 0xcb, 0x01},
+        {0x03, 0x01, 0xcc, 0x00}, {0x06, 0x01, 0xcc, 0x00},
+        {0x0a, 0x01, 0xcc, 0x00}, {0x0f, 0x01, 0xcc, 0x00},
+        {0x18, 0x01, 0xcc, 0x00}, {0x1f, 0x01, 0xcc, 0x00},
+        {0x29, 0x01, 0xcc, 0x00}, {0x38, 0x01, 0xcc, 0x01}
+    },
+    {
+        {0xd3, 0x00, 0x00, 0x00}, {0xd4, 0x00, 0x00, 0x00},
+        {0xd6, 0x00, 0x00, 0x00}, {0xd7, 0x00, 0x00, 0x00},
+        {0xda, 0x00, 0x00, 0x00}, {0xdb, 0x00, 0x00, 0x00},
+        {0xdd, 0x00, 0x00, 0x00}, {0xde, 0x00, 0x00, 0x00},
+        {0xe2, 0x00, 0x00, 0x00}, {0xe4, 0x00, 0x00, 0x00},
+        {0xe8, 0x00, 0x00, 0x00}, {0xeb, 0x00, 0x00, 0x00},
+        {0xf0, 0x00, 0x00, 0x00}, {0xf3, 0x00, 0x00, 0x00},
+        {0xf7, 0x00, 0x00, 0x00}, {0xfa, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x00, 0x01, 0xd3, 0x01}, {0x00, 0x01, 0xd4, 0x01},
+        {0x00, 0x01, 0xd6, 0x01}, {0x00, 0x01, 0xdd, 0x01},
+        {0x00, 0x01, 0xde, 0x01}, {0x00, 0x01, 0xdf, 0x01},
+        {0x00, 0x01, 0xf1, 0x01}, {0x00, 0x01, 0xf4, 0x01},
+        {0x00, 0x01, 0xf5, 0x01}, {0x00, 0x01, 0xf6, 0x01},
+        {0x00, 0x01, 0xf7, 0x01}, {0x00, 0x01, 0xf8, 0x01},
+        {0x00, 0x01, 0xfa, 0x01}, {0x00, 0x01, 0xfb, 0x01},
+        {0x00, 0x01, 0xfc, 0x01}, {0x00, 0x01, 0xfd, 0x01}
+    },
+    {
+        {0x01, 0x01, 0xd3, 0x00}, {0x16, 0x01, 0xd3, 0x01},
+        {0x01, 0x01, 0xd4, 0x00}, {0x16, 0x01, 0xd4, 0x01},
+        {0x01, 0x01, 0xd6, 0x00}, {0x16, 0x01, 0xd6, 0x01},
+        {0x01, 0x01, 0xdd, 0x00}, {0x16, 0x01, 0xdd, 0x01},
+        {0x01, 0x01, 0xde, 0x00}, {0x16, 0x01, 0xde, 0x01},
+        {0x01, 0x01, 0xdf, 0x00}, {0x16, 0x01, 0xdf, 0x01},
+        {0x01, 0x01, 0xf1, 0x00}, {0x16, 0x01, 0xf1, 0x01},
+        {0x01, 0x01, 0xf4, 0x00}, {0x16, 0x01, 0xf4, 0x01}
+    },
+    /* 210 */
+    {
+        {0x02, 0x01, 0xd3, 0x00}, {0x09, 0x01, 0xd3, 0x00},
+        {0x17, 0x01, 0xd3, 0x00}, {0x28, 0x01, 0xd3, 0x01},
+        {0x02, 0x01, 0xd4, 0x00}, {0x09, 0x01, 0xd4, 0x00},
+        {0x17, 0x01, 0xd4, 0x00}, {0x28, 0x01, 0xd4, 0x01},
+        {0x02, 0x01, 0xd6, 0x00}, {0x09, 0x01, 0xd6, 0x00},
+        {0x17, 0x01, 0xd6, 0x00}, {0x28, 0x01, 0xd6, 0x01},
+        {0x02, 0x01, 0xdd, 0x00}, {0x09, 0x01, 0xdd, 0x00},
+        {0x17, 0x01, 0xdd, 0x00}, {0x28, 0x01, 0xdd, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xd3, 0x00}, {0x06, 0x01, 0xd3, 0x00},
+        {0x0a, 0x01, 0xd3, 0x00}, {0x0f, 0x01, 0xd3, 0x00},
+        {0x18, 0x01, 0xd3, 0x00}, {0x1f, 0x01, 0xd3, 0x00},
+        {0x29, 0x01, 0xd3, 0x00}, {0x38, 0x01, 0xd3, 0x01},
+        {0x03, 0x01, 0xd4, 0x00}, {0x06, 0x01, 0xd4, 0x00},
+        {0x0a, 0x01, 0xd4, 0x00}, {0x0f, 0x01, 0xd4, 0x00},
+        {0x18, 0x01, 0xd4, 0x00}, {0x1f, 0x01, 0xd4, 0x00},
+        {0x29, 0x01, 0xd4, 0x00}, {0x38, 0x01, 0xd4, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xd6, 0x00}, {0x06, 0x01, 0xd6, 0x00},
+        {0x0a, 0x01, 0xd6, 0x00}, {0x0f, 0x01, 0xd6, 0x00},
+        {0x18, 0x01, 0xd6, 0x00}, {0x1f, 0x01, 0xd6, 0x00},
+        {0x29, 0x01, 0xd6, 0x00}, {0x38, 0x01, 0xd6, 0x01},
+        {0x03, 0x01, 0xdd, 0x00}, {0x06, 0x01, 0xdd, 0x00},
+        {0x0a, 0x01, 0xdd, 0x00}, {0x0f, 0x01, 0xdd, 0x00},
+        {0x18, 0x01, 0xdd, 0x00}, {0x1f, 0x01, 0xdd, 0x00},
+        {0x29, 0x01, 0xdd, 0x00}, {0x38, 0x01, 0xdd, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xde, 0x00}, {0x09, 0x01, 0xde, 0x00},
+        {0x17, 0x01, 0xde, 0x00}, {0x28, 0x01, 0xde, 0x01},
+        {0x02, 0x01, 0xdf, 0x00}, {0x09, 0x01, 0xdf, 0x00},
+        {0x17, 0x01, 0xdf, 0x00}, {0x28, 0x01, 0xdf, 0x01},
+        {0x02, 0x01, 0xf1, 0x00}, {0x09, 0x01, 0xf1, 0x00},
+        {0x17, 0x01, 0xf1, 0x00}, {0x28, 0x01, 0xf1, 0x01},
+        {0x02, 0x01, 0xf4, 0x00}, {0x09, 0x01, 0xf4, 0x00},
+        {0x17, 0x01, 0xf4, 0x00}, {0x28, 0x01, 0xf4, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xde, 0x00}, {0x06, 0x01, 0xde, 0x00},
+        {0x0a, 0x01, 0xde, 0x00}, {0x0f, 0x01, 0xde, 0x00},
+        {0x18, 0x01, 0xde, 0x00}, {0x1f, 0x01, 0xde, 0x00},
+        {0x29, 0x01, 0xde, 0x00}, {0x38, 0x01, 0xde, 0x01},
+        {0x03, 0x01, 0xdf, 0x00}, {0x06, 0x01, 0xdf, 0x00},
+        {0x0a, 0x01, 0xdf, 0x00}, {0x0f, 0x01, 0xdf, 0x00},
+        {0x18, 0x01, 0xdf, 0x00}, {0x1f, 0x01, 0xdf, 0x00},
+        {0x29, 0x01, 0xdf, 0x00}, {0x38, 0x01, 0xdf, 0x01}
+    },
+    /* 215 */
+    {
+        {0x03, 0x01, 0xf1, 0x00}, {0x06, 0x01, 0xf1, 0x00},
+        {0x0a, 0x01, 0xf1, 0x00}, {0x0f, 0x01, 0xf1, 0x00},
+        {0x18, 0x01, 0xf1, 0x00}, {0x1f, 0x01, 0xf1, 0x00},
+        {0x29, 0x01, 0xf1, 0x00}, {0x38, 0x01, 0xf1, 0x01},
+        {0x03, 0x01, 0xf4, 0x00}, {0x06, 0x01, 0xf4, 0x00},
+        {0x0a, 0x01, 0xf4, 0x00}, {0x0f, 0x01, 0xf4, 0x00},
+        {0x18, 0x01, 0xf4, 0x00}, {0x1f, 0x01, 0xf4, 0x00},
+        {0x29, 0x01, 0xf4, 0x00}, {0x38, 0x01, 0xf4, 0x01}
+    },
+    {
+        {0x01, 0x01, 0xf5, 0x00}, {0x16, 0x01, 0xf5, 0x01},
+        {0x01, 0x01, 0xf6, 0x00}, {0x16, 0x01, 0xf6, 0x01},
+        {0x01, 0x01, 0xf7, 0x00}, {0x16, 0x01, 0xf7, 0x01},
+        {0x01, 0x01, 0xf8, 0x00}, {0x16, 0x01, 0xf8, 0x01},
+        {0x01, 0x01, 0xfa, 0x00}, {0x16, 0x01, 0xfa, 0x01},
+        {0x01, 0x01, 0xfb, 0x00}, {0x16, 0x01, 0xfb, 0x01},
+        {0x01, 0x01, 0xfc, 0x00}, {0x16, 0x01, 0xfc, 0x01},
+        {0x01, 0x01, 0xfd, 0x00}, {0x16, 0x01, 0xfd, 0x01}
+    },
+    {
+        {0x02, 0x01, 0xf5, 0x00}, {0x09, 0x01, 0xf5, 0x00},
+        {0x17, 0x01, 0xf5, 0x00}, {0x28, 0x01, 0xf5, 0x01},
+        {0x02, 0x01, 0xf6, 0x00}, {0x09, 0x01, 0xf6, 0x00},
+        {0x17, 0x01, 0xf6, 0x00}, {0x28, 0x01, 0xf6, 0x01},
+        {0x02, 0x01, 0xf7, 0x00}, {0x09, 0x01, 0xf7, 0x00},
+        {0x17, 0x01, 0xf7, 0x00}, {0x28, 0x01, 0xf7, 0x01},
+        {0x02, 0x01, 0xf8, 0x00}, {0x09, 0x01, 0xf8, 0x00},
+        {0x17, 0x01, 0xf8, 0x00}, {0x28, 0x01, 0xf8, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xf5, 0x00}, {0x06, 0x01, 0xf5, 0x00},
+        {0x0a, 0x01, 0xf5, 0x00}, {0x0f, 0x01, 0xf5, 0x00},
+        {0x18, 0x01, 0xf5, 0x00}, {0x1f, 0x01, 0xf5, 0x00},
+        {0x29, 0x01, 0xf5, 0x00}, {0x38, 0x01, 0xf5, 0x01},
+        {0x03, 0x01, 0xf6, 0x00}, {0x06, 0x01, 0xf6, 0x00},
+        {0x0a, 0x01, 0xf6, 0x00}, {0x0f, 0x01, 0xf6, 0x00},
+        {0x18, 0x01, 0xf6, 0x00}, {0x1f, 0x01, 0xf6, 0x00},
+        {0x29, 0x01, 0xf6, 0x00}, {0x38, 0x01, 0xf6, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xf7, 0x00}, {0x06, 0x01, 0xf7, 0x00},
+        {0x0a, 0x01, 0xf7, 0x00}, {0x0f, 0x01, 0xf7, 0x00},
+        {0x18, 0x01, 0xf7, 0x00}, {0x1f, 0x01, 0xf7, 0x00},
+        {0x29, 0x01, 0xf7, 0x00}, {0x38, 0x01, 0xf7, 0x01},
+        {0x03, 0x01, 0xf8, 0x00}, {0x06, 0x01, 0xf8, 0x00},
+        {0x0a, 0x01, 0xf8, 0x00}, {0x0f, 0x01, 0xf8, 0x00},
+        {0x18, 0x01, 0xf8, 0x00}, {0x1f, 0x01, 0xf8, 0x00},
+        {0x29, 0x01, 0xf8, 0x00}, {0x38, 0x01, 0xf8, 0x01}
+    },
+    /* 220 */
+    {
+        {0x02, 0x01, 0xfa, 0x00}, {0x09, 0x01, 0xfa, 0x00},
+        {0x17, 0x01, 0xfa, 0x00}, {0x28, 0x01, 0xfa, 0x01},
+        {0x02, 0x01, 0xfb, 0x00}, {0x09, 0x01, 0xfb, 0x00},
+        {0x17, 0x01, 0xfb, 0x00}, {0x28, 0x01, 0xfb, 0x01},
+        {0x02, 0x01, 0xfc, 0x00}, {0x09, 0x01, 0xfc, 0x00},
+        {0x17, 0x01, 0xfc, 0x00}, {0x28, 0x01, 0xfc, 0x01},
+        {0x02, 0x01, 0xfd, 0x00}, {0x09, 0x01, 0xfd, 0x00},
+        {0x17, 0x01, 0xfd, 0x00}, {0x28, 0x01, 0xfd, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xfa, 0x00}, {0x06, 0x01, 0xfa, 0x00},
+        {0x0a, 0x01, 0xfa, 0x00}, {0x0f, 0x01, 0xfa, 0x00},
+        {0x18, 0x01, 0xfa, 0x00}, {0x1f, 0x01, 0xfa, 0x00},
+        {0x29, 0x01, 0xfa, 0x00}, {0x38, 0x01, 0xfa, 0x01},
+        {0x03, 0x01, 0xfb, 0x00}, {0x06, 0x01, 0xfb, 0x00},
+        {0x0a, 0x01, 0xfb, 0x00}, {0x0f, 0x01, 0xfb, 0x00},
+        {0x18, 0x01, 0xfb, 0x00}, {0x1f, 0x01, 0xfb, 0x00},
+        {0x29, 0x01, 0xfb, 0x00}, {0x38, 0x01, 0xfb, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xfc, 0x00}, {0x06, 0x01, 0xfc, 0x00},
+        {0x0a, 0x01, 0xfc, 0x00}, {0x0f, 0x01, 0xfc, 0x00},
+        {0x18, 0x01, 0xfc, 0x00}, {0x1f, 0x01, 0xfc, 0x00},
+        {0x29, 0x01, 0xfc, 0x00}, {0x38, 0x01, 0xfc, 0x01},
+        {0x03, 0x01, 0xfd, 0x00}, {0x06, 0x01, 0xfd, 0x00},
+        {0x0a, 0x01, 0xfd, 0x00}, {0x0f, 0x01, 0xfd, 0x00},
+        {0x18, 0x01, 0xfd, 0x00}, {0x1f, 0x01, 0xfd, 0x00},
+        {0x29, 0x01, 0xfd, 0x00}, {0x38, 0x01, 0xfd, 0x01}
+    },
+    {
+        {0x00, 0x01, 0xfe, 0x01}, {0xe3, 0x00, 0x00, 0x00},
+        {0xe5, 0x00, 0x00, 0x00}, {0xe6, 0x00, 0x00, 0x00},
+        {0xe9, 0x00, 0x00, 0x00}, {0xea, 0x00, 0x00, 0x00},
+        {0xec, 0x00, 0x00, 0x00}, {0xed, 0x00, 0x00, 0x00},
+        {0xf1, 0x00, 0x00, 0x00}, {0xf2, 0x00, 0x00, 0x00},
+        {0xf4, 0x00, 0x00, 0x00}, {0xf5, 0x00, 0x00, 0x00},
+        {0xf8, 0x00, 0x00, 0x00}, {0xf9, 0x00, 0x00, 0x00},
+        {0xfb, 0x00, 0x00, 0x00}, {0xfc, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x01, 0x01, 0xfe, 0x00}, {0x16, 0x01, 0xfe, 0x01},
+        {0x00, 0x01, 0x02, 0x01}, {0x00, 0x01, 0x03, 0x01},
+        {0x00, 0x01, 0x04, 0x01}, {0x00, 0x01, 0x05, 0x01},
+        {0x00, 0x01, 0x06, 0x01}, {0x00, 0x01, 0x07, 0x01},
+        {0x00, 0x01, 0x08, 0x01}, {0x00, 0x01, 0x0b, 0x01},
+        {0x00, 0x01, 0x0c, 0x01}, {0x00, 0x01, 0x0e, 0x01},
+        {0x00, 0x01, 0x0f, 0x01}, {0x00, 0x01, 0x10, 0x01},
+        {0x00, 0x01, 0x11, 0x01}, {0x00, 0x01, 0x12, 0x01}
+    },
+    /* 225 */
+    {
+        {0x02, 0x01, 0xfe, 0x00}, {0x09, 0x01, 0xfe, 0x00},
+        {0x17, 0x01, 0xfe, 0x00}, {0x28, 0x01, 0xfe, 0x01},
+        {0x01, 0x01, 0x02, 0x00}, {0x16, 0x01, 0x02, 0x01},
+        {0x01, 0x01, 0x03, 0x00}, {0x16, 0x01, 0x03, 0x01},
+        {0x01, 0x01, 0x04, 0x00}, {0x16, 0x01, 0x04, 0x01},
+        {0x01, 0x01, 0x05, 0x00}, {0x16, 0x01, 0x05, 0x01},
+        {0x01, 0x01, 0x06, 0x00}, {0x16, 0x01, 0x06, 0x01},
+        {0x01, 0x01, 0x07, 0x00}, {0x16, 0x01, 0x07, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xfe, 0x00}, {0x06, 0x01, 0xfe, 0x00},
+        {0x0a, 0x01, 0xfe, 0x00}, {0x0f, 0x01, 0xfe, 0x00},
+        {0x18, 0x01, 0xfe, 0x00}, {0x1f, 0x01, 0xfe, 0x00},
+        {0x29, 0x01, 0xfe, 0x00}, {0x38, 0x01, 0xfe, 0x01},
+        {0x02, 0x01, 0x02, 0x00}, {0x09, 0x01, 0x02, 0x00},
+        {0x17, 0x01, 0x02, 0x00}, {0x28, 0x01, 0x02, 0x01},
+        {0x02, 0x01, 0x03, 0x00}, {0x09, 0x01, 0x03, 0x00},
+        {0x17, 0x01, 0x03, 0x00}, {0x28, 0x01, 0x03, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x02, 0x00}, {0x06, 0x01, 0x02, 0x00},
+        {0x0a, 0x01, 0x02, 0x00}, {0x0f, 0x01, 0x02, 0x00},
+        {0x18, 0x01, 0x02, 0x00}, {0x1f, 0x01, 0x02, 0x00},
+        {0x29, 0x01, 0x02, 0x00}, {0x38, 0x01, 0x02, 0x01},
+        {0x03, 0x01, 0x03, 0x00}, {0x06, 0x01, 0x03, 0x00},
+        {0x0a, 0x01, 0x03, 0x00}, {0x0f, 0x01, 0x03, 0x00},
+        {0x18, 0x01, 0x03, 0x00}, {0x1f, 0x01, 0x03, 0x00},
+        {0x29, 0x01, 0x03, 0x00}, {0x38, 0x01, 0x03, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x04, 0x00}, {0x09, 0x01, 0x04, 0x00},
+        {0x17, 0x01, 0x04, 0x00}, {0x28, 0x01, 0x04, 0x01},
+        {0x02, 0x01, 0x05, 0x00}, {0x09, 0x01, 0x05, 0x00},
+        {0x17, 0x01, 0x05, 0x00}, {0x28, 0x01, 0x05, 0x01},
+        {0x02, 0x01, 0x06, 0x00}, {0x09, 0x01, 0x06, 0x00},
+        {0x17, 0x01, 0x06, 0x00}, {0x28, 0x01, 0x06, 0x01},
+        {0x02, 0x01, 0x07, 0x00}, {0x09, 0x01, 0x07, 0x00},
+        {0x17, 0x01, 0x07, 0x00}, {0x28, 0x01, 0x07, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x04, 0x00}, {0x06, 0x01, 0x04, 0x00},
+        {0x0a, 0x01, 0x04, 0x00}, {0x0f, 0x01, 0x04, 0x00},
+        {0x18, 0x01, 0x04, 0x00}, {0x1f, 0x01, 0x04, 0x00},
+        {0x29, 0x01, 0x04, 0x00}, {0x38, 0x01, 0x04, 0x01},
+        {0x03, 0x01, 0x05, 0x00}, {0x06, 0x01, 0x05, 0x00},
+        {0x0a, 0x01, 0x05, 0x00}, {0x0f, 0x01, 0x05, 0x00},
+        {0x18, 0x01, 0x05, 0x00}, {0x1f, 0x01, 0x05, 0x00},
+        {0x29, 0x01, 0x05, 0x00}, {0x38, 0x01, 0x05, 0x01}
+    },
+    /* 230 */
+    {
+        {0x03, 0x01, 0x06, 0x00}, {0x06, 0x01, 0x06, 0x00},
+        {0x0a, 0x01, 0x06, 0x00}, {0x0f, 0x01, 0x06, 0x00},
+        {0x18, 0x01, 0x06, 0x00}, {0x1f, 0x01, 0x06, 0x00},
+        {0x29, 0x01, 0x06, 0x00}, {0x38, 0x01, 0x06, 0x01},
+        {0x03, 0x01, 0x07, 0x00}, {0x06, 0x01, 0x07, 0x00},
+        {0x0a, 0x01, 0x07, 0x00}, {0x0f, 0x01, 0x07, 0x00},
+        {0x18, 0x01, 0x07, 0x00}, {0x1f, 0x01, 0x07, 0x00},
+        {0x29, 0x01, 0x07, 0x00}, {0x38, 0x01, 0x07, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x08, 0x00}, {0x16, 0x01, 0x08, 0x01},
+        {0x01, 0x01, 0x0b, 0x00}, {0x16, 0x01, 0x0b, 0x01},
+        {0x01, 0x01, 0x0c, 0x00}, {0x16, 0x01, 0x0c, 0x01},
+        {0x01, 0x01, 0x0e, 0x00}, {0x16, 0x01, 0x0e, 0x01},
+        {0x01, 0x01, 0x0f, 0x00}, {0x16, 0x01, 0x0f, 0x01},
+        {0x01, 0x01, 0x10, 0x00}, {0x16, 0x01, 0x10, 0x01},
+        {0x01, 0x01, 0x11, 0x00}, {0x16, 0x01, 0x11, 0x01},
+        {0x01, 0x01, 0x12, 0x00}, {0x16, 0x01, 0x12, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x08, 0x00}, {0x09, 0x01, 0x08, 0x00},
+        {0x17, 0x01, 0x08, 0x00}, {0x28, 0x01, 0x08, 0x01},
+        {0x02, 0x01, 0x0b, 0x00}, {0x09, 0x01, 0x0b, 0x00},
+        {0x17, 0x01, 0x0b, 0x00}, {0x28, 0x01, 0x0b, 0x01},
+        {0x02, 0x01, 0x0c, 0x00}, {0x09, 0x01, 0x0c, 0x00},
+        {0x17, 0x01, 0x0c, 0x00}, {0x28, 0x01, 0x0c, 0x01},
+        {0x02, 0x01, 0x0e, 0x00}, {0x09, 0x01, 0x0e, 0x00},
+        {0x17, 0x01, 0x0e, 0x00}, {0x28, 0x01, 0x0e, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x08, 0x00}, {0x06, 0x01, 0x08, 0x00},
+        {0x0a, 0x01, 0x08, 0x00}, {0x0f, 0x01, 0x08, 0x00},
+        {0x18, 0x01, 0x08, 0x00}, {0x1f, 0x01, 0x08, 0x00},
+        {0x29, 0x01, 0x08, 0x00}, {0x38, 0x01, 0x08, 0x01},
+        {0x03, 0x01, 0x0b, 0x00}, {0x06, 0x01, 0x0b, 0x00},
+        {0x0a, 0x01, 0x0b, 0x00}, {0x0f, 0x01, 0x0b, 0x00},
+        {0x18, 0x01, 0x0b, 0x00}, {0x1f, 0x01, 0x0b, 0x00},
+        {0x29, 0x01, 0x0b, 0x00}, {0x38, 0x01, 0x0b, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x0c, 0x00}, {0x06, 0x01, 0x0c, 0x00},
+        {0x0a, 0x01, 0x0c, 0x00}, {0x0f, 0x01, 0x0c, 0x00},
+        {0x18, 0x01, 0x0c, 0x00}, {0x1f, 0x01, 0x0c, 0x00},
+        {0x29, 0x01, 0x0c, 0x00}, {0x38, 0x01, 0x0c, 0x01},
+        {0x03, 0x01, 0x0e, 0x00}, {0x06, 0x01, 0x0e, 0x00},
+        {0x0a, 0x01, 0x0e, 0x00}, {0x0f, 0x01, 0x0e, 0x00},
+        {0x18, 0x01, 0x0e, 0x00}, {0x1f, 0x01, 0x0e, 0x00},
+        {0x29, 0x01, 0x0e, 0x00}, {0x38, 0x01, 0x0e, 0x01}
+    },
+    /* 235 */
+    {
+        {0x02, 0x01, 0x0f, 0x00}, {0x09, 0x01, 0x0f, 0x00},
+        {0x17, 0x01, 0x0f, 0x00}, {0x28, 0x01, 0x0f, 0x01},
+        {0x02, 0x01, 0x10, 0x00}, {0x09, 0x01, 0x10, 0x00},
+        {0x17, 0x01, 0x10, 0x00}, {0x28, 0x01, 0x10, 0x01},
+        {0x02, 0x01, 0x11, 0x00}, {0x09, 0x01, 0x11, 0x00},
+        {0x17, 0x01, 0x11, 0x00}, {0x28, 0x01, 0x11, 0x01},
+        {0x02, 0x01, 0x12, 0x00}, {0x09, 0x01, 0x12, 0x00},
+        {0x17, 0x01, 0x12, 0x00}, {0x28, 0x01, 0x12, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x0f, 0x00}, {0x06, 0x01, 0x0f, 0x00},
+        {0x0a, 0x01, 0x0f, 0x00}, {0x0f, 0x01, 0x0f, 0x00},
+        {0x18, 0x01, 0x0f, 0x00}, {0x1f, 0x01, 0x0f, 0x00},
+        {0x29, 0x01, 0x0f, 0x00}, {0x38, 0x01, 0x0f, 0x01},
+        {0x03, 0x01, 0x10, 0x00}, {0x06, 0x01, 0x10, 0x00},
+        {0x0a, 0x01, 0x10, 0x00}, {0x0f, 0x01, 0x10, 0x00},
+        {0x18, 0x01, 0x10, 0x00}, {0x1f, 0x01, 0x10, 0x00},
+        {0x29, 0x01, 0x10, 0x00}, {0x38, 0x01, 0x10, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x11, 0x00}, {0x06, 0x01, 0x11, 0x00},
+        {0x0a, 0x01, 0x11, 0x00}, {0x0f, 0x01, 0x11, 0x00},
+        {0x18, 0x01, 0x11, 0x00}, {0x1f, 0x01, 0x11, 0x00},
+        {0x29, 0x01, 0x11, 0x00}, {0x38, 0x01, 0x11, 0x01},
+        {0x03, 0x01, 0x12, 0x00}, {0x06, 0x01, 0x12, 0x00},
+        {0x0a, 0x01, 0x12, 0x00}, {0x0f, 0x01, 0x12, 0x00},
+        {0x18, 0x01, 0x12, 0x00}, {0x1f, 0x01, 0x12, 0x00},
+        {0x29, 0x01, 0x12, 0x00}, {0x38, 0x01, 0x12, 0x01}
+    },
+    {
+        {0x00, 0x01, 0x13, 0x01}, {0x00, 0x01, 0x14, 0x01},
+        {0x00, 0x01, 0x15, 0x01}, {0x00, 0x01, 0x17, 0x01},
+        {0x00, 0x01, 0x18, 0x01}, {0x00, 0x01, 0x19, 0x01},
+        {0x00, 0x01, 0x1a, 0x01}, {0x00, 0x01, 0x1b, 0x01},
+        {0x00, 0x01, 0x1c, 0x01}, {0x00, 0x01, 0x1d, 0x01},
+        {0x00, 0x01, 0x1e, 0x01}, {0x00, 0x01, 0x1f, 0x01},
+        {0x00, 0x01, 0x7f, 0x01}, {0x00, 0x01, 0xdc, 0x01},
+        {0x00, 0x01, 0xf9, 0x01}, {0xfd, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x13, 0x00}, {0x16, 0x01, 0x13, 0x01},
+        {0x01, 0x01, 0x14, 0x00}, {0x16, 0x01, 0x14, 0x01},
+        {0x01, 0x01, 0x15, 0x00}, {0x16, 0x01, 0x15, 0x01},
+        {0x01, 0x01, 0x17, 0x00}, {0x16, 0x01, 0x17, 0x01},
+        {0x01, 0x01, 0x18, 0x00}, {0x16, 0x01, 0x18, 0x01},
+        {0x01, 0x01, 0x19, 0x00}, {0x16, 0x01, 0x19, 0x01},
+        {0x01, 0x01, 0x1a, 0x00}, {0x16, 0x01, 0x1a, 0x01},
+        {0x01, 0x01, 0x1b, 0x00}, {0x16, 0x01, 0x1b, 0x01}
+    },
+    /* 240 */
+    {
+        {0x02, 0x01, 0x13, 0x00}, {0x09, 0x01, 0x13, 0x00},
+        {0x17, 0x01, 0x13, 0x00}, {0x28, 0x01, 0x13, 0x01},
+        {0x02, 0x01, 0x14, 0x00}, {0x09, 0x01, 0x14, 0x00},
+        {0x17, 0x01, 0x14, 0x00}, {0x28, 0x01, 0x14, 0x01},
+        {0x02, 0x01, 0x15, 0x00}, {0x09, 0x01, 0x15, 0x00},
+        {0x17, 0x01, 0x15, 0x00}, {0x28, 0x01, 0x15, 0x01},
+        {0x02, 0x01, 0x17, 0x00}, {0x09, 0x01, 0x17, 0x00},
+        {0x17, 0x01, 0x17, 0x00}, {0x28, 0x01, 0x17, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x13, 0x00}, {0x06, 0x01, 0x13, 0x00},
+        {0x0a, 0x01, 0x13, 0x00}, {0x0f, 0x01, 0x13, 0x00},
+        {0x18, 0x01, 0x13, 0x00}, {0x1f, 0x01, 0x13, 0x00},
+        {0x29, 0x01, 0x13, 0x00}, {0x38, 0x01, 0x13, 0x01},
+        {0x03, 0x01, 0x14, 0x00}, {0x06, 0x01, 0x14, 0x00},
+        {0x0a, 0x01, 0x14, 0x00}, {0x0f, 0x01, 0x14, 0x00},
+        {0x18, 0x01, 0x14, 0x00}, {0x1f, 0x01, 0x14, 0x00},
+        {0x29, 0x01, 0x14, 0x00}, {0x38, 0x01, 0x14, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x15, 0x00}, {0x06, 0x01, 0x15, 0x00},
+        {0x0a, 0x01, 0x15, 0x00}, {0x0f, 0x01, 0x15, 0x00},
+        {0x18, 0x01, 0x15, 0x00}, {0x1f, 0x01, 0x15, 0x00},
+        {0x29, 0x01, 0x15, 0x00}, {0x38, 0x01, 0x15, 0x01},
+        {0x03, 0x01, 0x17, 0x00}, {0x06, 0x01, 0x17, 0x00},
+        {0x0a, 0x01, 0x17, 0x00}, {0x0f, 0x01, 0x17, 0x00},
+        {0x18, 0x01, 0x17, 0x00}, {0x1f, 0x01, 0x17, 0x00},
+        {0x29, 0x01, 0x17, 0x00}, {0x38, 0x01, 0x17, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x18, 0x00}, {0x09, 0x01, 0x18, 0x00},
+        {0x17, 0x01, 0x18, 0x00}, {0x28, 0x01, 0x18, 0x01},
+        {0x02, 0x01, 0x19, 0x00}, {0x09, 0x01, 0x19, 0x00},
+        {0x17, 0x01, 0x19, 0x00}, {0x28, 0x01, 0x19, 0x01},
+        {0x02, 0x01, 0x1a, 0x00}, {0x09, 0x01, 0x1a, 0x00},
+        {0x17, 0x01, 0x1a, 0x00}, {0x28, 0x01, 0x1a, 0x01},
+        {0x02, 0x01, 0x1b, 0x00}, {0x09, 0x01, 0x1b, 0x00},
+        {0x17, 0x01, 0x1b, 0x00}, {0x28, 0x01, 0x1b, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x18, 0x00}, {0x06, 0x01, 0x18, 0x00},
+        {0x0a, 0x01, 0x18, 0x00}, {0x0f, 0x01, 0x18, 0x00},
+        {0x18, 0x01, 0x18, 0x00}, {0x1f, 0x01, 0x18, 0x00},
+        {0x29, 0x01, 0x18, 0x00}, {0x38, 0x01, 0x18, 0x01},
+        {0x03, 0x01, 0x19, 0x00}, {0x06, 0x01, 0x19, 0x00},
+        {0x0a, 0x01, 0x19, 0x00}, {0x0f, 0x01, 0x19, 0x00},
+        {0x18, 0x01, 0x19, 0x00}, {0x1f, 0x01, 0x19, 0x00},
+        {0x29, 0x01, 0x19, 0x00}, {0x38, 0x01, 0x19, 0x01}
+    },
+    /* 245 */
+    {
+        {0x03, 0x01, 0x1a, 0x00}, {0x06, 0x01, 0x1a, 0x00},
+        {0x0a, 0x01, 0x1a, 0x00}, {0x0f, 0x01, 0x1a, 0x00},
+        {0x18, 0x01, 0x1a, 0x00}, {0x1f, 0x01, 0x1a, 0x00},
+        {0x29, 0x01, 0x1a, 0x00}, {0x38, 0x01, 0x1a, 0x01},
+        {0x03, 0x01, 0x1b, 0x00}, {0x06, 0x01, 0x1b, 0x00},
+        {0x0a, 0x01, 0x1b, 0x00}, {0x0f, 0x01, 0x1b, 0x00},
+        {0x18, 0x01, 0x1b, 0x00}, {0x1f, 0x01, 0x1b, 0x00},
+        {0x29, 0x01, 0x1b, 0x00}, {0x38, 0x01, 0x1b, 0x01}
+    },
+    {
+        {0x01, 0x01, 0x1c, 0x00}, {0x16, 0x01, 0x1c, 0x01},
+        {0x01, 0x01, 0x1d, 0x00}, {0x16, 0x01, 0x1d, 0x01},
+        {0x01, 0x01, 0x1e, 0x00}, {0x16, 0x01, 0x1e, 0x01},
+        {0x01, 0x01, 0x1f, 0x00}, {0x16, 0x01, 0x1f, 0x01},
+        {0x01, 0x01, 0x7f, 0x00}, {0x16, 0x01, 0x7f, 0x01},
+        {0x01, 0x01, 0xdc, 0x00}, {0x16, 0x01, 0xdc, 0x01},
+        {0x01, 0x01, 0xf9, 0x00}, {0x16, 0x01, 0xf9, 0x01},
+        {0xfe, 0x00, 0x00, 0x00}, {0xff, 0x00, 0x00, 0x01}
+    },
+    {
+        {0x02, 0x01, 0x1c, 0x00}, {0x09, 0x01, 0x1c, 0x00},
+        {0x17, 0x01, 0x1c, 0x00}, {0x28, 0x01, 0x1c, 0x01},
+        {0x02, 0x01, 0x1d, 0x00}, {0x09, 0x01, 0x1d, 0x00},
+        {0x17, 0x01, 0x1d, 0x00}, {0x28, 0x01, 0x1d, 0x01},
+        {0x02, 0x01, 0x1e, 0x00}, {0x09, 0x01, 0x1e, 0x00},
+        {0x17, 0x01, 0x1e, 0x00}, {0x28, 0x01, 0x1e, 0x01},
+        {0x02, 0x01, 0x1f, 0x00}, {0x09, 0x01, 0x1f, 0x00},
+        {0x17, 0x01, 0x1f, 0x00}, {0x28, 0x01, 0x1f, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x1c, 0x00}, {0x06, 0x01, 0x1c, 0x00},
+        {0x0a, 0x01, 0x1c, 0x00}, {0x0f, 0x01, 0x1c, 0x00},
+        {0x18, 0x01, 0x1c, 0x00}, {0x1f, 0x01, 0x1c, 0x00},
+        {0x29, 0x01, 0x1c, 0x00}, {0x38, 0x01, 0x1c, 0x01},
+        {0x03, 0x01, 0x1d, 0x00}, {0x06, 0x01, 0x1d, 0x00},
+        {0x0a, 0x01, 0x1d, 0x00}, {0x0f, 0x01, 0x1d, 0x00},
+        {0x18, 0x01, 0x1d, 0x00}, {0x1f, 0x01, 0x1d, 0x00},
+        {0x29, 0x01, 0x1d, 0x00}, {0x38, 0x01, 0x1d, 0x01}
+    },
+    {
+        {0x03, 0x01, 0x1e, 0x00}, {0x06, 0x01, 0x1e, 0x00},
+        {0x0a, 0x01, 0x1e, 0x00}, {0x0f, 0x01, 0x1e, 0x00},
+        {0x18, 0x01, 0x1e, 0x00}, {0x1f, 0x01, 0x1e, 0x00},
+        {0x29, 0x01, 0x1e, 0x00}, {0x38, 0x01, 0x1e, 0x01},
+        {0x03, 0x01, 0x1f, 0x00}, {0x06, 0x01, 0x1f, 0x00},
+        {0x0a, 0x01, 0x1f, 0x00}, {0x0f, 0x01, 0x1f, 0x00},
+        {0x18, 0x01, 0x1f, 0x00}, {0x1f, 0x01, 0x1f, 0x00},
+        {0x29, 0x01, 0x1f, 0x00}, {0x38, 0x01, 0x1f, 0x01}
+    },
+    /* 250 */
+    {
+        {0x02, 0x01, 0x7f, 0x00}, {0x09, 0x01, 0x7f, 0x00},
+        {0x17, 0x01, 0x7f, 0x00}, {0x28, 0x01, 0x7f, 0x01},
+        {0x02, 0x01, 0xdc, 0x00}, {0x09, 0x01, 0xdc, 0x00},
+        {0x17, 0x01, 0xdc, 0x00}, {0x28, 0x01, 0xdc, 0x01},
+        {0x02, 0x01, 0xf9, 0x00}, {0x09, 0x01, 0xf9, 0x00},
+        {0x17, 0x01, 0xf9, 0x00}, {0x28, 0x01, 0xf9, 0x01},
+        {0x00, 0x01, 0x0a, 0x01}, {0x00, 0x01, 0x0d, 0x01},
+        {0x00, 0x01, 0x16, 0x01}, {0xfa, 0x00, 0x00, 0x00}
+    },
+    {
+        {0x03, 0x01, 0x7f, 0x00}, {0x06, 0x01, 0x7f, 0x00},
+        {0x0a, 0x01, 0x7f, 0x00}, {0x0f, 0x01, 0x7f, 0x00},
+        {0x18, 0x01, 0x7f, 0x00}, {0x1f, 0x01, 0x7f, 0x00},
+        {0x29, 0x01, 0x7f, 0x00}, {0x38, 0x01, 0x7f, 0x01},
+        {0x03, 0x01, 0xdc, 0x00}, {0x06, 0x01, 0xdc, 0x00},
+        {0x0a, 0x01, 0xdc, 0x00}, {0x0f, 0x01, 0xdc, 0x00},
+        {0x18, 0x01, 0xdc, 0x00}, {0x1f, 0x01, 0xdc, 0x00},
+        {0x29, 0x01, 0xdc, 0x00}, {0x38, 0x01, 0xdc, 0x01}
+    },
+    {
+        {0x03, 0x01, 0xf9, 0x00}, {0x06, 0x01, 0xf9, 0x00},
+        {0x0a, 0x01, 0xf9, 0x00}, {0x0f, 0x01, 0xf9, 0x00},
+        {0x18, 0x01, 0xf9, 0x00}, {0x1f, 0x01, 0xf9, 0x00},
+        {0x29, 0x01, 0xf9, 0x00}, {0x38, 0x01, 0xf9, 0x01},
+        {0x01, 0x01, 0x0a, 0x00}, {0x16, 0x01, 0x0a, 0x01},
+        {0x01, 0x01, 0x0d, 0x00}, {0x16, 0x01, 0x0d, 0x01},
+        {0x01, 0x01, 0x16, 0x00}, {0x16, 0x01, 0x16, 0x01},
+        {0xfc, 0x00, 0x00, 0x00}, {0xfc, 0x00, 0x00, 0x00}
+    },
+    {
+        {0x02, 0x01, 0x0a, 0x00}, {0x09, 0x01, 0x0a, 0x00},
+        {0x17, 0x01, 0x0a, 0x00}, {0x28, 0x01, 0x0a, 0x01},
+        {0x02, 0x01, 0x0d, 0x00}, {0x09, 0x01, 0x0d, 0x00},
+        {0x17, 0x01, 0x0d, 0x00}, {0x28, 0x01, 0x0d, 0x01},
+        {0x02, 0x01, 0x16, 0x00}, {0x09, 0x01, 0x16, 0x00},
+        {0x17, 0x01, 0x16, 0x00}, {0x28, 0x01, 0x16, 0x01},
+        {0xfd, 0x00, 0x00, 0x00}, {0xfd, 0x00, 0x00, 0x00},
+        {0xfd, 0x00, 0x00, 0x00}, {0xfd, 0x00, 0x00, 0x00}
+    },
+    {
+        {0x03, 0x01, 0x0a, 0x00}, {0x06, 0x01, 0x0a, 0x00},
+        {0x0a, 0x01, 0x0a, 0x00}, {0x0f, 0x01, 0x0a, 0x00},
+        {0x18, 0x01, 0x0a, 0x00}, {0x1f, 0x01, 0x0a, 0x00},
+        {0x29, 0x01, 0x0a, 0x00}, {0x38, 0x01, 0x0a, 0x01},
+        {0x03, 0x01, 0x0d, 0x00}, {0x06, 0x01, 0x0d, 0x00},
+        {0x0a, 0x01, 0x0d, 0x00}, {0x0f, 0x01, 0x0d, 0x00},
+        {0x18, 0x01, 0x0d, 0x00}, {0x1f, 0x01, 0x0d, 0x00},
+        {0x29, 0x01, 0x0d, 0x00}, {0x38, 0x01, 0x0d, 0x01}
+    },
+    /* 255 */
+    {
+        {0x03, 0x01, 0x16, 0x00}, {0x06, 0x01, 0x16, 0x00},
+        {0x0a, 0x01, 0x16, 0x00}, {0x0f, 0x01, 0x16, 0x00},
+        {0x18, 0x01, 0x16, 0x00}, {0x1f, 0x01, 0x16, 0x00},
+        {0x29, 0x01, 0x16, 0x00}, {0x38, 0x01, 0x16, 0x01},
+        {0xff, 0x00, 0x00, 0x00}, {0xff, 0x00, 0x00, 0x00},
+        {0xff, 0x00, 0x00, 0x00}, {0xff, 0x00, 0x00, 0x00},
+        {0xff, 0x00, 0x00, 0x00}, {0xff, 0x00, 0x00, 0x00},
+        {0xff, 0x00, 0x00, 0x00}, {0xff, 0x00, 0x00, 0x00}
+    }
+};
+
+
+ngx_int_t
+ngx_http_v2_huff_decode(u_char *state, u_char *src, size_t len, u_char **dst,
+    ngx_uint_t last, ngx_log_t *log)
+{
+    u_char  *end, ch, ending;
+
+    ch = 0;
+    ending = 1;
+
+    end = src + len;
+
+    while (src != end) {
+        ch = *src++;
+
+        if (ngx_http_v2_huff_decode_bits(state, &ending, ch >> 4, dst)
+            != NGX_OK)
+        {
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
+                           "http2 huffman decoding error at state %d: "
+                           "bad code 0x%Xd", *state, ch >> 4);
+
+            return NGX_ERROR;
+        }
+
+        if (ngx_http_v2_huff_decode_bits(state, &ending, ch & 0xf, dst)
+            != NGX_OK)
+        {
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
+                           "http2 huffman decoding error at state %d: "
+                           "bad code 0x%Xd", *state, ch & 0xf);
+
+            return NGX_ERROR;
+        }
+    }
+
+    if (last) {
+        if (!ending) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
+                           "http2 huffman decoding error: "
+                           "incomplete code 0x%Xd", ch);
+
+            return NGX_ERROR;
+        }
+
+        *state = 0;
+    }
+
+    return NGX_OK;
+}
+
+
+
+static ngx_inline ngx_int_t
+ngx_http_v2_huff_decode_bits(u_char *state, u_char *ending, ngx_uint_t bits,
+    u_char **dst)
+{
+    ngx_http_v2_huff_decode_code_t  code;
+
+    code = ngx_http_v2_huff_decode_codes[*state][bits];
+
+    if (code.next == *state) {
+        return NGX_ERROR;
+    }
+
+    if (code.emit) {
+        *(*dst)++ = code.sym;
+    }
+
+    *ending = code.ending;
+    *state = code.next;
+
+    return NGX_OK;
+}
diff --git a/src/http/v2/ngx_http_v2_huff_encode.c b/src/http/v2/ngx_http_v2_huff_encode.c
new file mode 100644
index 0000000..6c412cf
--- /dev/null
+++ b/src/http/v2/ngx_http_v2_huff_encode.c
@@ -0,0 +1,10 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Valentin V. Bartenev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
new file mode 100644
index 0000000..d99ac30
--- /dev/null
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -0,0 +1,469 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Valentin V. Bartenev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <ngx_http_v2_module.h>
+
+
+static ngx_int_t ngx_http_v2_add_variables(ngx_conf_t *cf);
+
+static ngx_int_t ngx_http_v2_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+static ngx_int_t ngx_http_v2_module_init(ngx_cycle_t *cycle);
+
+static void *ngx_http_v2_create_main_conf(ngx_conf_t *cf);
+static char *ngx_http_v2_init_main_conf(ngx_conf_t *cf, void *conf);
+static void *ngx_http_v2_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_http_v2_merge_srv_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static void *ngx_http_v2_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_v2_merge_loc_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+
+static char *ngx_http_v2_recv_buffer_size(ngx_conf_t *cf, void *post,
+    void *data);
+static char *ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data);
+static char *ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post,
+    void *data);
+static char *ngx_http_v2_chunk_size(ngx_conf_t *cf, void *post, void *data);
+static char *ngx_http_v2_spdy_deprecated(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+
+static ngx_conf_post_t  ngx_http_v2_recv_buffer_size_post =
+    { ngx_http_v2_recv_buffer_size };
+static ngx_conf_post_t  ngx_http_v2_pool_size_post =
+    { ngx_http_v2_pool_size };
+static ngx_conf_post_t  ngx_http_v2_streams_index_mask_post =
+    { ngx_http_v2_streams_index_mask };
+static ngx_conf_post_t  ngx_http_v2_chunk_size_post =
+    { ngx_http_v2_chunk_size };
+
+
+static ngx_command_t  ngx_http_v2_commands[] = {
+
+    { ngx_string("http2_recv_buffer_size"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(ngx_http_v2_main_conf_t, recv_buffer_size),
+      &ngx_http_v2_recv_buffer_size_post },
+
+    { ngx_string("http2_pool_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, pool_size),
+      &ngx_http_v2_pool_size_post },
+
+    { ngx_string("http2_max_concurrent_streams"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, concurrent_streams),
+      NULL },
+
+    { ngx_string("http2_max_field_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, max_field_size),
+      NULL },
+
+    { ngx_string("http2_max_header_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, max_header_size),
+      NULL },
+
+    { ngx_string("http2_streams_index_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, streams_index_mask),
+      &ngx_http_v2_streams_index_mask_post },
+
+    { ngx_string("http2_recv_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, recv_timeout),
+      NULL },
+
+    { ngx_string("http2_idle_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, idle_timeout),
+      NULL },
+
+    { ngx_string("http2_chunk_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_v2_loc_conf_t, chunk_size),
+      &ngx_http_v2_chunk_size_post },
+
+    { ngx_string("spdy_recv_buffer_size"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_http_v2_spdy_deprecated,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("spdy_pool_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_v2_spdy_deprecated,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("spdy_max_concurrent_streams"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_v2_spdy_deprecated,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("spdy_streams_index_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_v2_spdy_deprecated,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("spdy_recv_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_v2_spdy_deprecated,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("spdy_keepalive_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_v2_spdy_deprecated,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("spdy_headers_comp"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_v2_spdy_deprecated,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("spdy_chunk_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_v2_spdy_deprecated,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_v2_module_ctx = {
+    ngx_http_v2_add_variables,             /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    ngx_http_v2_create_main_conf,          /* create main configuration */
+    ngx_http_v2_init_main_conf,            /* init main configuration */
+
+    ngx_http_v2_create_srv_conf,           /* create server configuration */
+    ngx_http_v2_merge_srv_conf,            /* merge server configuration */
+
+    ngx_http_v2_create_loc_conf,           /* create location configuration */
+    ngx_http_v2_merge_loc_conf             /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_v2_module = {
+    NGX_MODULE_V1,
+    &ngx_http_v2_module_ctx,               /* module context */
+    ngx_http_v2_commands,                  /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    ngx_http_v2_module_init,               /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_http_variable_t  ngx_http_v2_vars[] = {
+
+    { ngx_string("http2"), NULL,
+      ngx_http_v2_variable, 0, 0, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
+static ngx_int_t
+ngx_http_v2_add_variables(ngx_conf_t *cf)
+{
+   ngx_http_variable_t  *var, *v;
+
+    for (v = ngx_http_v2_vars; v->name.len; v++) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+
+    if (r->stream) {
+#if (NGX_HTTP_SSL)
+
+        if (r->connection->ssl) {
+            v->len = sizeof("h2") - 1;
+            v->valid = 1;
+            v->no_cacheable = 0;
+            v->not_found = 0;
+            v->data = (u_char *) "h2";
+
+            return NGX_OK;
+        }
+
+#endif
+        v->len = sizeof("h2c") - 1;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = (u_char *) "h2c";
+
+        return NGX_OK;
+    }
+
+    *v = ngx_http_variable_null_value;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_module_init(ngx_cycle_t *cycle)
+{
+    return NGX_OK;
+}
+
+
+static void *
+ngx_http_v2_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_http_v2_main_conf_t  *h2mcf;
+
+    h2mcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_v2_main_conf_t));
+    if (h2mcf == NULL) {
+        return NULL;
+    }
+
+    h2mcf->recv_buffer_size = NGX_CONF_UNSET_SIZE;
+
+    return h2mcf;
+}
+
+
+static char *
+ngx_http_v2_init_main_conf(ngx_conf_t *cf, void *conf)
+{
+    ngx_http_v2_main_conf_t *h2mcf = conf;
+
+    ngx_conf_init_size_value(h2mcf->recv_buffer_size, 256 * 1024);
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_http_v2_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_http_v2_srv_conf_t  *h2scf;
+
+    h2scf = ngx_pcalloc(cf->pool, sizeof(ngx_http_v2_srv_conf_t));
+    if (h2scf == NULL) {
+        return NULL;
+    }
+
+    h2scf->pool_size = NGX_CONF_UNSET_SIZE;
+
+    h2scf->concurrent_streams = NGX_CONF_UNSET_UINT;
+
+    h2scf->max_field_size = NGX_CONF_UNSET_SIZE;
+    h2scf->max_header_size = NGX_CONF_UNSET_SIZE;
+
+    h2scf->streams_index_mask = NGX_CONF_UNSET_UINT;
+
+    h2scf->recv_timeout = NGX_CONF_UNSET_MSEC;
+    h2scf->idle_timeout = NGX_CONF_UNSET_MSEC;
+
+    return h2scf;
+}
+
+
+static char *
+ngx_http_v2_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_v2_srv_conf_t *prev = parent;
+    ngx_http_v2_srv_conf_t *conf = child;
+
+    ngx_conf_merge_size_value(conf->pool_size, prev->pool_size, 4096);
+
+    ngx_conf_merge_uint_value(conf->concurrent_streams,
+                              prev->concurrent_streams, 128);
+
+    ngx_conf_merge_size_value(conf->max_field_size, prev->max_field_size,
+                              4096);
+    ngx_conf_merge_size_value(conf->max_header_size, prev->max_header_size,
+                              16384);
+
+    ngx_conf_merge_uint_value(conf->streams_index_mask,
+                              prev->streams_index_mask, 32 - 1);
+
+    ngx_conf_merge_msec_value(conf->recv_timeout,
+                              prev->recv_timeout, 30000);
+    ngx_conf_merge_msec_value(conf->idle_timeout,
+                              prev->idle_timeout, 180000);
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_http_v2_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_v2_loc_conf_t  *h2lcf;
+
+    h2lcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_v2_loc_conf_t));
+    if (h2lcf == NULL) {
+        return NULL;
+    }
+
+    h2lcf->chunk_size = NGX_CONF_UNSET_SIZE;
+
+    return h2lcf;
+}
+
+
+static char *
+ngx_http_v2_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_v2_loc_conf_t *prev = parent;
+    ngx_http_v2_loc_conf_t *conf = child;
+
+    ngx_conf_merge_size_value(conf->chunk_size, prev->chunk_size, 8 * 1024);
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_v2_recv_buffer_size(ngx_conf_t *cf, void *post, void *data)
+{
+    size_t *sp = data;
+
+    if (*sp <= 2 * NGX_HTTP_V2_STATE_BUFFER_SIZE) {
+        return "value is too small";
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data)
+{
+    size_t *sp = data;
+
+    if (*sp < NGX_MIN_POOL_SIZE) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "the pool size must be no less than %uz",
+                           NGX_MIN_POOL_SIZE);
+
+        return NGX_CONF_ERROR;
+    }
+
+    if (*sp % NGX_POOL_ALIGNMENT) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "the pool size must be a multiple of %uz",
+                           NGX_POOL_ALIGNMENT);
+
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post, void *data)
+{
+    ngx_uint_t *np = data;
+
+    ngx_uint_t  mask;
+
+    mask = *np - 1;
+
+    if (*np == 0 || (*np & mask)) {
+        return "must be a power of two";
+    }
+
+    *np = mask;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_v2_chunk_size(ngx_conf_t *cf, void *post, void *data)
+{
+    size_t *sp = data;
+
+    if (*sp == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "the http2 chunk size cannot be zero");
+
+        return NGX_CONF_ERROR;
+    }
+
+    if (*sp > NGX_HTTP_V2_MAX_FRAME_SIZE) {
+        *sp = NGX_HTTP_V2_MAX_FRAME_SIZE;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_v2_spdy_deprecated(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                       "invalid directive \"%V\": ngx_http_spdy_module "
+                       "was superseded by ngx_http_v2_module", &cmd->name);
+
+    return NGX_CONF_OK;
+}
diff --git a/src/http/ngx_http_spdy_module.h b/src/http/v2/ngx_http_v2_module.h
similarity index 58%
rename from src/http/ngx_http_spdy_module.h
rename to src/http/v2/ngx_http_v2_module.h
index 5242322..95cc7d8 100644
--- a/src/http/ngx_http_spdy_module.h
+++ b/src/http/v2/ngx_http_v2_module.h
@@ -5,8 +5,8 @@
  */
 
 
-#ifndef _NGX_HTTP_SPDY_MODULE_H_INCLUDED_
-#define _NGX_HTTP_SPDY_MODULE_H_INCLUDED_
+#ifndef _NGX_HTTP_V2_MODULE_H_INCLUDED_
+#define _NGX_HTTP_V2_MODULE_H_INCLUDED_
 
 
 #include <ngx_config.h>
@@ -17,25 +17,26 @@
 typedef struct {
     size_t                          recv_buffer_size;
     u_char                         *recv_buffer;
-} ngx_http_spdy_main_conf_t;
+} ngx_http_v2_main_conf_t;
 
 
 typedef struct {
     size_t                          pool_size;
     ngx_uint_t                      concurrent_streams;
+    size_t                          max_field_size;
+    size_t                          max_header_size;
     ngx_uint_t                      streams_index_mask;
     ngx_msec_t                      recv_timeout;
-    ngx_msec_t                      keepalive_timeout;
-    ngx_int_t                       headers_comp;
-} ngx_http_spdy_srv_conf_t;
+    ngx_msec_t                      idle_timeout;
+} ngx_http_v2_srv_conf_t;
 
 
 typedef struct {
     size_t                          chunk_size;
-} ngx_http_spdy_loc_conf_t;
+} ngx_http_v2_loc_conf_t;
 
 
-extern ngx_module_t  ngx_http_spdy_module;
+extern ngx_module_t  ngx_http_v2_module;
 
 
-#endif /* _NGX_HTTP_SPDY_MODULE_H_INCLUDED_ */
+#endif /* _NGX_HTTP_V2_MODULE_H_INCLUDED_ */
diff --git a/src/http/v2/ngx_http_v2_table.c b/src/http/v2/ngx_http_v2_table.c
new file mode 100644
index 0000000..a73748a
--- /dev/null
+++ b/src/http/v2/ngx_http_v2_table.c
@@ -0,0 +1,349 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Valentin V. Bartenev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+#define NGX_HTTP_V2_TABLE_SIZE  4096
+
+
+static ngx_int_t ngx_http_v2_table_account(ngx_http_v2_connection_t *h2c,
+    size_t size);
+
+
+static ngx_http_v2_header_t  ngx_http_v2_static_table[] = {
+    { ngx_string(":authority"), ngx_string("") },
+    { ngx_string(":method"), ngx_string("GET") },
+    { ngx_string(":method"), ngx_string("POST") },
+    { ngx_string(":path"), ngx_string("/") },
+    { ngx_string(":path"), ngx_string("/index.html") },
+    { ngx_string(":scheme"), ngx_string("http") },
+    { ngx_string(":scheme"), ngx_string("https") },
+    { ngx_string(":status"), ngx_string("200") },
+    { ngx_string(":status"), ngx_string("204") },
+    { ngx_string(":status"), ngx_string("206") },
+    { ngx_string(":status"), ngx_string("304") },
+    { ngx_string(":status"), ngx_string("400") },
+    { ngx_string(":status"), ngx_string("404") },
+    { ngx_string(":status"), ngx_string("500") },
+    { ngx_string("accept-charset"), ngx_string("") },
+    { ngx_string("accept-encoding"), ngx_string("gzip, deflate") },
+    { ngx_string("accept-language"), ngx_string("") },
+    { ngx_string("accept-ranges"), ngx_string("") },
+    { ngx_string("accept"), ngx_string("") },
+    { ngx_string("access-control-allow-origin"), ngx_string("") },
+    { ngx_string("age"), ngx_string("") },
+    { ngx_string("allow"), ngx_string("") },
+    { ngx_string("authorization"), ngx_string("") },
+    { ngx_string("cache-control"), ngx_string("") },
+    { ngx_string("content-disposition"), ngx_string("") },
+    { ngx_string("content-encoding"), ngx_string("") },
+    { ngx_string("content-language"), ngx_string("") },
+    { ngx_string("content-length"), ngx_string("") },
+    { ngx_string("content-location"), ngx_string("") },
+    { ngx_string("content-range"), ngx_string("") },
+    { ngx_string("content-type"), ngx_string("") },
+    { ngx_string("cookie"), ngx_string("") },
+    { ngx_string("date"), ngx_string("") },
+    { ngx_string("etag"), ngx_string("") },
+    { ngx_string("expect"), ngx_string("") },
+    { ngx_string("expires"), ngx_string("") },
+    { ngx_string("from"), ngx_string("") },
+    { ngx_string("host"), ngx_string("") },
+    { ngx_string("if-match"), ngx_string("") },
+    { ngx_string("if-modified-since"), ngx_string("") },
+    { ngx_string("if-none-match"), ngx_string("") },
+    { ngx_string("if-range"), ngx_string("") },
+    { ngx_string("if-unmodified-since"), ngx_string("") },
+    { ngx_string("last-modified"), ngx_string("") },
+    { ngx_string("link"), ngx_string("") },
+    { ngx_string("location"), ngx_string("") },
+    { ngx_string("max-forwards"), ngx_string("") },
+    { ngx_string("proxy-authenticate"), ngx_string("") },
+    { ngx_string("proxy-authorization"), ngx_string("") },
+    { ngx_string("range"), ngx_string("") },
+    { ngx_string("referer"), ngx_string("") },
+    { ngx_string("refresh"), ngx_string("") },
+    { ngx_string("retry-after"), ngx_string("") },
+    { ngx_string("server"), ngx_string("") },
+    { ngx_string("set-cookie"), ngx_string("") },
+    { ngx_string("strict-transport-security"), ngx_string("") },
+    { ngx_string("transfer-encoding"), ngx_string("") },
+    { ngx_string("user-agent"), ngx_string("") },
+    { ngx_string("vary"), ngx_string("") },
+    { ngx_string("via"), ngx_string("") },
+    { ngx_string("www-authenticate"), ngx_string("") },
+};
+
+#define NGX_HTTP_V2_STATIC_TABLE_ENTRIES                                      \
+    (sizeof(ngx_http_v2_static_table)                                         \
+     / sizeof(ngx_http_v2_header_t))
+
+
+ngx_int_t
+ngx_http_v2_get_indexed_header(ngx_http_v2_connection_t *h2c, ngx_uint_t index,
+    ngx_uint_t name_only)
+{
+    u_char                *p;
+    size_t                 rest;
+    ngx_http_v2_header_t  *entry;
+
+    if (index == 0) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent invalid hpack table index 0");
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 get indexed %s: %ui",
+                   name_only ? "header" : "header name", index);
+
+    index--;
+
+    if (index < NGX_HTTP_V2_STATIC_TABLE_ENTRIES) {
+        h2c->state.header = ngx_http_v2_static_table[index];
+        return NGX_OK;
+    }
+
+    index -= NGX_HTTP_V2_STATIC_TABLE_ENTRIES;
+
+    if (index < h2c->hpack.added - h2c->hpack.deleted) {
+        index = (h2c->hpack.added - index - 1) % h2c->hpack.allocated;
+        entry = h2c->hpack.entries[index];
+
+        p = ngx_pnalloc(h2c->state.pool, entry->name.len + 1);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        h2c->state.header.name.len = entry->name.len;
+        h2c->state.header.name.data = p;
+
+        rest = h2c->hpack.storage + NGX_HTTP_V2_TABLE_SIZE - entry->name.data;
+
+        if (entry->name.len > rest) {
+            p = ngx_cpymem(p, entry->name.data, rest);
+            p = ngx_cpymem(p, h2c->hpack.storage, entry->name.len - rest);
+
+        } else {
+            p = ngx_cpymem(p, entry->name.data, entry->name.len);
+        }
+
+        *p = '\0';
+
+        if (name_only) {
+            return NGX_OK;
+        }
+
+        p = ngx_pnalloc(h2c->state.pool, entry->value.len + 1);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        h2c->state.header.value.len = entry->value.len;
+        h2c->state.header.value.data = p;
+
+        rest = h2c->hpack.storage + NGX_HTTP_V2_TABLE_SIZE - entry->value.data;
+
+        if (entry->value.len > rest) {
+            p = ngx_cpymem(p, entry->value.data, rest);
+            p = ngx_cpymem(p, h2c->hpack.storage, entry->value.len - rest);
+
+        } else {
+            p = ngx_cpymem(p, entry->value.data, entry->value.len);
+        }
+
+        *p = '\0';
+
+        return NGX_OK;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                  "client sent out of bound hpack table index: %ui", index);
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_http_v2_add_header(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_header_t *header)
+{
+    size_t                 avail;
+    ngx_uint_t             index;
+    ngx_http_v2_header_t  *entry, **entries;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 add header to hpack table: \"%V: %V\"",
+                   &header->name, &header->value);
+
+    if (h2c->hpack.entries == NULL) {
+        h2c->hpack.allocated = 64;
+        h2c->hpack.size = NGX_HTTP_V2_TABLE_SIZE;
+        h2c->hpack.free = NGX_HTTP_V2_TABLE_SIZE;
+
+        h2c->hpack.entries = ngx_palloc(h2c->connection->pool,
+                                        sizeof(ngx_http_v2_header_t *)
+                                        * h2c->hpack.allocated);
+        if (h2c->hpack.entries == NULL) {
+            return NGX_ERROR;
+        }
+
+        h2c->hpack.storage = ngx_palloc(h2c->connection->pool,
+                                        h2c->hpack.free);
+        if (h2c->hpack.storage == NULL) {
+            return NGX_ERROR;
+        }
+
+        h2c->hpack.pos = h2c->hpack.storage;
+    }
+
+    if (ngx_http_v2_table_account(h2c, header->name.len + header->value.len)
+        != NGX_OK)
+    {
+        return NGX_OK;
+    }
+
+    if (h2c->hpack.reused == h2c->hpack.deleted) {
+        entry = ngx_palloc(h2c->connection->pool, sizeof(ngx_http_v2_header_t));
+        if (entry == NULL) {
+            return NGX_ERROR;
+        }
+
+    } else {
+        entry = h2c->hpack.entries[h2c->hpack.reused++ % h2c->hpack.allocated];
+    }
+
+    avail = h2c->hpack.storage + NGX_HTTP_V2_TABLE_SIZE - h2c->hpack.pos;
+
+    entry->name.len = header->name.len;
+    entry->name.data = h2c->hpack.pos;
+
+    if (avail >= header->name.len) {
+        h2c->hpack.pos = ngx_cpymem(h2c->hpack.pos, header->name.data,
+                                    header->name.len);
+    } else {
+        ngx_memcpy(h2c->hpack.pos, header->name.data, avail);
+        h2c->hpack.pos = ngx_cpymem(h2c->hpack.storage,
+                                    header->name.data + avail,
+                                    header->name.len - avail);
+        avail = NGX_HTTP_V2_TABLE_SIZE;
+    }
+
+    avail -= header->name.len;
+
+    entry->value.len = header->value.len;
+    entry->value.data = h2c->hpack.pos;
+
+    if (avail >= header->value.len) {
+        h2c->hpack.pos = ngx_cpymem(h2c->hpack.pos, header->value.data,
+                                    header->value.len);
+    } else {
+        ngx_memcpy(h2c->hpack.pos, header->value.data, avail);
+        h2c->hpack.pos = ngx_cpymem(h2c->hpack.storage,
+                                    header->value.data + avail,
+                                    header->value.len - avail);
+    }
+
+    if (h2c->hpack.allocated == h2c->hpack.added - h2c->hpack.deleted) {
+
+        entries = ngx_palloc(h2c->connection->pool,
+                             sizeof(ngx_http_v2_header_t *)
+                             * (h2c->hpack.allocated + 64));
+        if (entries == NULL) {
+            return NGX_ERROR;
+        }
+
+        index = h2c->hpack.deleted % h2c->hpack.allocated;
+
+        ngx_memcpy(entries, &h2c->hpack.entries[index],
+                   (h2c->hpack.allocated - index)
+                   * sizeof(ngx_http_v2_header_t *));
+
+        ngx_memcpy(&entries[h2c->hpack.allocated - index], h2c->hpack.entries,
+                   index * sizeof(ngx_http_v2_header_t *));
+
+        (void) ngx_pfree(h2c->connection->pool, h2c->hpack.entries);
+
+        h2c->hpack.entries = entries;
+
+        h2c->hpack.added = h2c->hpack.allocated;
+        h2c->hpack.deleted = 0;
+        h2c->hpack.reused = 0;
+        h2c->hpack.allocated += 64;
+    }
+
+    h2c->hpack.entries[h2c->hpack.added++ % h2c->hpack.allocated] = entry;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_table_account(ngx_http_v2_connection_t *h2c, size_t size)
+{
+    ngx_http_v2_header_t  *entry;
+
+    size += 32;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 hpack table account: %uz free:%uz",
+                   size, h2c->hpack.free);
+
+    if (size <= h2c->hpack.free) {
+        h2c->hpack.free -= size;
+        return NGX_OK;
+    }
+
+    if (size > h2c->hpack.size) {
+        h2c->hpack.deleted = h2c->hpack.added;
+        h2c->hpack.free = h2c->hpack.size;
+        return NGX_DECLINED;
+    }
+
+    do {
+        entry = h2c->hpack.entries[h2c->hpack.deleted++ % h2c->hpack.allocated];
+        h2c->hpack.free += 32 + entry->name.len + entry->value.len;
+    } while (size > h2c->hpack.free);
+
+    h2c->hpack.free -= size;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_v2_table_size(ngx_http_v2_connection_t *h2c, size_t size)
+{
+    ssize_t                needed;
+    ngx_http_v2_header_t  *entry;
+
+    if (size > NGX_HTTP_V2_TABLE_SIZE) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent invalid table size update: %uz", size);
+
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 new hpack table size: %uz was:%uz",
+                   size, h2c->hpack.size);
+
+    needed = h2c->hpack.size - size;
+
+    while (needed > (ssize_t) h2c->hpack.free) {
+        entry = h2c->hpack.entries[h2c->hpack.deleted++ % h2c->hpack.allocated];
+        h2c->hpack.free += 32 + entry->name.len + entry->value.len;
+    }
+
+    h2c->hpack.size = size;
+    h2c->hpack.free -= needed;
+
+    return NGX_OK;
+}
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 2a3ed2f..417b598 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -264,6 +264,7 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
     u_char        *prev;
     size_t         size;
     ssize_t        total, n;
+    ngx_err_t      err;
     ngx_array_t    vec;
     struct iovec  *iov, iovs[NGX_IOVS];
 
@@ -335,10 +336,20 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
             file->sys_offset = offset;
         }
 
+eintr:
+
         n = writev(file->fd, vec.elts, vec.nelts);
 
         if (n == -1) {
-            ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
+            err = ngx_errno;
+
+            if (err == NGX_EINTR) {
+                ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
+                               "writev() was interrupted");
+                goto eintr;
+            }
+
+            ngx_log_error(NGX_LOG_CRIT, file->log, err,
                           "writev() \"%s\" failed", file->name.data);
             return NGX_ERROR;
         }

From 4e0f0048066088f11656d5764ebe8ca2f4b4d539 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 25 Sep 2015 14:03:48 +0300
Subject: [PATCH 009/600] New upstream release (1.9.5)

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 004eaa2..1fb0f6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.9.5-1) UNRELEASED; urgency=medium
+
+  [ Christos Trochalakis]
+  * New upstream release.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 25 Sep 2015 14:03:10 +0300
+
 nginx (1.9.4-1) unstable; urgency=medium
 
   [ Christos Trochalakis]

From baf8feb207a5263be5260c2c5e2d70b958c9077a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Sep 2015 16:58:41 +0300
Subject: [PATCH 010/600] Enable http2 module

---
 debian/control | 6 +++---
 debian/rules   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index b3bfcc3..de705d4 100644
--- a/debian/control
+++ b/debian/control
@@ -98,7 +98,7 @@ Description: nginx web/proxy server (standard version)
  Referer, Rewrite, SCGI, Split Clients, UWSGI.
  .
  OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip,
- Gzip, Gzip Precompression, Headers, Image Filter, Index, Log, Real IP, Spdy,
+ Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP,
  SSI, SSL, Stream, Stub Status, Substitution, Thread Pool, Upstream, User ID,
  XSLT.
  .
@@ -185,8 +185,8 @@ Description: nginx web/proxy server (extended version)
  Referer, Rewrite, SCGI, Split Clients, UWSGI.
  .
  OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, FLV, GeoIP,
- Gunzip, Gzip, Gzip Precompression, Headers, Image Filter, Index, Log, MP4,
- Embedded Perl, Random Index, Real IP, Secure Link, Spdy, SSI, SSL, Stream,
+ Gunzip, Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log,
+ MP4, Embedded Perl, Random Index, Real IP, Secure Link, SSI, SSL, Stream,
  Stub Status, Substitution, Thread Pool, Upstream, User ID, XSLT.
  .
  MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
diff --git a/debian/rules b/debian/rules
index 34223d8..1cdef59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ full_configure_flags := \
 			--with-http_gunzip_module \
 			--with-http_gzip_static_module \
 			--with-http_image_filter_module \
-			--with-http_spdy_module \
+			--with-http_v2_module \
 			--with-http_sub_module \
 			--with-http_xslt_module \
 			--with-stream \
@@ -100,7 +100,7 @@ extras_configure_flags := \
 			--with-http_perl_module \
 			--with-http_random_index_module \
 			--with-http_secure_link_module \
-			--with-http_spdy_module \
+			--with-http_v2_module \
 			--with-http_sub_module \
 			--with-http_xslt_module \
 			--with-mail \

From efe7d922f49e133d66031b58fedbf308690080f6 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Sep 2015 16:50:59 +0300
Subject: [PATCH 011/600] Add a NEWS entry for http2

---
 debian/nginx-common.NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index edd750f..161d061 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,3 +1,10 @@
+nginx-common (1.9.5-1) UNRELEASED; urgency=medium
+
+  As of nginx 1.9.5 spdy has been replaced by the http2 module. Make sure to
+  replace "spdy" with "http2" in your config files.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 25 Sep 2015 14:06:28 +0300
+
 nginx-common (1.9.1-1) unstable; urgency=medium
 
   Starting with this release, we have enabled PIE build features which allows

From 6a711b5bd6566b3723657c8e14e5de56079f7c94 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 3 Nov 2015 08:58:01 +0200
Subject: [PATCH 012/600] Imported Upstream version 1.9.6

---
 CHANGES                                 |  26 ++
 CHANGES.ru                              |  27 ++
 auto/endianness                         |   9 +-
 auto/types/uintptr_t                    |   9 +-
 src/core/nginx.c                        | 127 +++++----
 src/core/nginx.h                        |   4 +-
 src/core/ngx_connection.c               |   2 +-
 src/core/ngx_rwlock.c                   |   2 +-
 src/event/ngx_event.c                   |   9 +
 src/event/ngx_event_openssl.c           |  25 +-
 src/event/ngx_event_openssl.h           |   1 +
 src/http/ngx_http_core_module.c         |   4 +-
 src/http/ngx_http_variables.c           |  38 ++-
 src/http/v2/ngx_http_v2.c               |  69 +++--
 src/http/v2/ngx_http_v2.h               |   3 +-
 src/http/v2/ngx_http_v2_filter_module.c | 352 ++++++++++++------------
 src/stream/ngx_stream_proxy_module.c    |   4 +
 17 files changed, 413 insertions(+), 298 deletions(-)

diff --git a/CHANGES b/CHANGES
index 47d33a4..2b9809c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,30 @@
 
+Changes with nginx 1.9.6                                         27 Oct 2015
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2.
+       Thanks to Piotr Sikora and Denis Andzakovic.
+
+    *) Bugfix: the $server_protocol variable was empty when using HTTP/2.
+
+    *) Bugfix: backend SSL connections in the stream module might be timed
+       out unexpectedly.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if
+       different ssl_session_cache settings were used in different virtual
+       servers.
+
+    *) Bugfix: nginx/Windows could not be built with MinGW gcc; the bug had
+       appeared in 1.9.4.
+       Thanks to Kouhei Sutou.
+
+    *) Bugfix: time was not updated when the timer_resolution directive was
+       used on Windows.
+
+    *) Miscellaneous minor fixes and improvements.
+       Thanks to Markus Linnala, Kurtis Nusbaum and Piotr Sikora.
+
+
 Changes with nginx 1.9.5                                         22 Sep 2015
 
     *) Feature: the ngx_http_v2_module (replaces ngx_http_spdy_module).
diff --git a/CHANGES.ru b/CHANGES.ru
index b95c33d..3e8c364 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,31 @@
 
+Изменения в nginx 1.9.6                                           27.10.2015
+
+    *) Исправление: при использовании HTTP/2 в рабочем процессе мог
+       произойти segmentation fault.
+       Спасибо Piotr Sikora и Denis Andzakovic.
+
+    *) Исправление: при использовании HTTP/2 переменная $server_protocol
+       была пустой.
+
+    *) Исправление: SSL-соединения к бэкендам в модуле stream могли
+       неожиданно завершаться по таймауту.
+
+    *) Исправление: при использовании различных настроек ssl_session_cache в
+       разных виртуальных серверах в рабочем процессе мог произойти
+       segmentation fault.
+
+    *) Исправление: nginx/Windows не собирался с MinGW gcc; ошибка появилась
+       в 1.9.4.
+       Спасибо Kouhei Sutou.
+
+    *) Исправление: при использовании директивы timer_resolution на Windows
+       время не обновлялось.
+
+    *) Незначительные исправления и улучшения.
+       Спасибо Markus Linnala, Kurtis Nusbaum и Piotr Sikora.
+
+
 Изменения в nginx 1.9.5                                           22.09.2015
 
     *) Добавление: модуль ngx_http_v2_module (заменяет модуль
diff --git a/auto/endianness b/auto/endianness
index 93da2f8..70b0a10 100644
--- a/auto/endianness
+++ b/auto/endianness
@@ -4,8 +4,13 @@
 
 
 echo $ngx_n "checking for system byte ordering ...$ngx_c"
-echo >> $NGX_ERR
-echo "checking for system byte ordering" >> $NGX_ERR
+
+cat << END >> $NGX_AUTOCONF_ERR
+
+----------------------------------------
+checking for system byte ordering
+
+END
 
 
 cat << END > $NGX_AUTOTEST.c
diff --git a/auto/types/uintptr_t b/auto/types/uintptr_t
index f3cdccb..2b7212e 100644
--- a/auto/types/uintptr_t
+++ b/auto/types/uintptr_t
@@ -4,8 +4,13 @@
 
 
 echo $ngx_n "checking for uintptr_t ...$ngx_c"
-echo >> $NGX_AUTOCONF_ERR
-echo "checking for uintptr_t" >> $NGX_AUTOCONF_ERR
+
+cat << END >> $NGX_AUTOCONF_ERR
+
+----------------------------------------
+checking for uintptr_t
+
+END
 
 found=no
 
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 3213527..3335587 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -10,6 +10,7 @@
 #include <nginx.h>
 
 
+static void ngx_show_version_info();
 static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle);
 static ngx_int_t ngx_get_options(int argc, char *const *argv);
 static ngx_int_t ngx_process_options(ngx_cycle_t *cycle);
@@ -194,64 +195,7 @@ main(int argc, char *const *argv)
     }
 
     if (ngx_show_version) {
-        ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED);
-
-        if (ngx_show_help) {
-            ngx_write_stderr(
-                "Usage: nginx [-?hvVtTq] [-s signal] [-c filename] "
-                             "[-p prefix] [-g directives]" NGX_LINEFEED
-                             NGX_LINEFEED
-                "Options:" NGX_LINEFEED
-                "  -?,-h         : this help" NGX_LINEFEED
-                "  -v            : show version and exit" NGX_LINEFEED
-                "  -V            : show version and configure options then exit"
-                                   NGX_LINEFEED
-                "  -t            : test configuration and exit" NGX_LINEFEED
-                "  -T            : test configuration, dump it and exit"
-                                   NGX_LINEFEED
-                "  -q            : suppress non-error messages "
-                                   "during configuration testing" NGX_LINEFEED
-                "  -s signal     : send signal to a master process: "
-                                   "stop, quit, reopen, reload" NGX_LINEFEED
-#ifdef NGX_PREFIX
-                "  -p prefix     : set prefix path (default: "
-                                   NGX_PREFIX ")" NGX_LINEFEED
-#else
-                "  -p prefix     : set prefix path (default: NONE)" NGX_LINEFEED
-#endif
-                "  -c filename   : set configuration file (default: "
-                                   NGX_CONF_PATH ")" NGX_LINEFEED
-                "  -g directives : set global directives out of configuration "
-                                   "file" NGX_LINEFEED NGX_LINEFEED
-                );
-        }
-
-        if (ngx_show_configure) {
-
-#ifdef NGX_COMPILER
-            ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED);
-#endif
-
-#if (NGX_SSL)
-            if (SSLeay() == SSLEAY_VERSION_NUMBER) {
-                ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
-                                 NGX_LINEFEED);
-            } else {
-                ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
-                                 " (running with ");
-                ngx_write_stderr((char *) (uintptr_t)
-                                 SSLeay_version(SSLEAY_VERSION));
-                ngx_write_stderr(")" NGX_LINEFEED);
-            }
-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-            ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED);
-#else
-            ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED);
-#endif
-#endif
-
-            ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED);
-        }
+        ngx_show_version_info();
 
         if (!ngx_test_config) {
             return 0;
@@ -419,6 +363,69 @@ main(int argc, char *const *argv)
 }
 
 
+static void
+ngx_show_version_info()
+{
+    ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED);
+
+    if (ngx_show_help) {
+        ngx_write_stderr(
+            "Usage: nginx [-?hvVtTq] [-s signal] [-c filename] "
+                         "[-p prefix] [-g directives]" NGX_LINEFEED
+                         NGX_LINEFEED
+            "Options:" NGX_LINEFEED
+            "  -?,-h         : this help" NGX_LINEFEED
+            "  -v            : show version and exit" NGX_LINEFEED
+            "  -V            : show version and configure options then exit"
+                               NGX_LINEFEED
+            "  -t            : test configuration and exit" NGX_LINEFEED
+            "  -T            : test configuration, dump it and exit"
+                               NGX_LINEFEED
+            "  -q            : suppress non-error messages "
+                               "during configuration testing" NGX_LINEFEED
+            "  -s signal     : send signal to a master process: "
+                               "stop, quit, reopen, reload" NGX_LINEFEED
+#ifdef NGX_PREFIX
+            "  -p prefix     : set prefix path (default: " NGX_PREFIX ")"
+                               NGX_LINEFEED
+#else
+            "  -p prefix     : set prefix path (default: NONE)" NGX_LINEFEED
+#endif
+            "  -c filename   : set configuration file (default: " NGX_CONF_PATH
+                               ")" NGX_LINEFEED
+            "  -g directives : set global directives out of configuration "
+                               "file" NGX_LINEFEED NGX_LINEFEED
+        );
+    }
+
+    if (ngx_show_configure) {
+
+#ifdef NGX_COMPILER
+        ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED);
+#endif
+
+#if (NGX_SSL)
+        if (SSLeay() == SSLEAY_VERSION_NUMBER) {
+            ngx_write_stderr("built with " OPENSSL_VERSION_TEXT NGX_LINEFEED);
+        } else {
+            ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
+                             " (running with ");
+            ngx_write_stderr((char *) (uintptr_t)
+                             SSLeay_version(SSLEAY_VERSION));
+            ngx_write_stderr(")" NGX_LINEFEED);
+        }
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+        ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED);
+#else
+        ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED);
+#endif
+#endif
+
+        ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED);
+    }
+}
+
+
 static ngx_int_t
 ngx_add_inherited_sockets(ngx_cycle_t *cycle)
 {
@@ -1139,7 +1146,7 @@ ngx_set_user(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_OK;
     }
 
-    value = (ngx_str_t *) cf->args->elts;
+    value = cf->args->elts;
 
     ccf->username = (char *) value[1].data;
 
@@ -1345,7 +1352,7 @@ ngx_set_worker_processes(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return "is duplicate";
     }
 
-    value = (ngx_str_t *) cf->args->elts;
+    value = cf->args->elts;
 
     if (ngx_strcmp(value[1].data, "auto") == 0) {
         ccf->worker_processes = ngx_ncpu;
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 34a6a80..56e9587 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009005
-#define NGINX_VERSION      "1.9.5"
+#define nginx_version      1009006
+#define NGINX_VERSION      "1.9.6"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 9f2675b..0c19d5d 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -1175,7 +1175,7 @@ ngx_close_idle_connections(ngx_cycle_t *cycle)
 
         /* THREAD: lock */
 
-        if (c[i].fd != -1 && c[i].idle) {
+        if (c[i].fd != (ngx_socket_t) -1 && c[i].idle) {
             c[i].close = 1;
             c[i].read->handler(c[i].read);
         }
diff --git a/src/core/ngx_rwlock.c b/src/core/ngx_rwlock.c
index 1404c6e..905de78 100644
--- a/src/core/ngx_rwlock.c
+++ b/src/core/ngx_rwlock.c
@@ -111,7 +111,7 @@ ngx_rwlock_unlock(ngx_atomic_t *lock)
 
 #else
 
-#if (NGX_HTTP_UPSTREAM_ZONE)
+#if (NGX_HTTP_UPSTREAM_ZONE || NGX_STREAM_UPSTREAM_ZONE)
 
 #error ngx_atomic_cmp_set() is not defined!
 
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index b8e0607..15da213 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -670,6 +670,15 @@ ngx_event_process_init(ngx_cycle_t *cycle)
         }
     }
 
+#else
+
+    if (ngx_timer_resolution && !(ngx_event_flags & NGX_USE_TIMER_EVENT)) {
+        ngx_log_error(NGX_LOG_WARN, cycle->log, 0,
+                      "the \"timer_resolution\" directive is not supported "
+                      "with the configured event method, ignored");
+        ngx_timer_resolution = 0;
+    }
+
 #endif
 
     cycle->connections =
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 1b789e6..57dfc6c 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1038,6 +1038,8 @@ ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags)
     sc->buffer = ((flags & NGX_SSL_BUFFER) != 0);
     sc->buffer_size = ssl->buffer_size;
 
+    sc->session_ctx = ssl->ctx;
+
     sc->connection = SSL_new(ssl->ctx);
 
     if (sc->connection == NULL) {
@@ -1158,6 +1160,7 @@ ngx_ssl_handshake(ngx_connection_t *c)
         c->recv_chain = ngx_ssl_recv_chain;
         c->send_chain = ngx_ssl_send_chain;
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 #ifdef SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
 
         /* initial handshake done, disable renegotiation (CVE-2009-3555) */
@@ -1165,6 +1168,7 @@ ngx_ssl_handshake(ngx_connection_t *c)
             c->ssl->connection->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;
         }
 
+#endif
 #endif
 
         return NGX_OK;
@@ -2043,7 +2047,7 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, char *fmt, ...)
         (void) ERR_get_error();
     }
 
-    ngx_log_error(level, log, err, "%s)", errstr);
+    ngx_log_error(level, log, err, "%*s)", p - errstr, errstr);
 }
 
 
@@ -2303,7 +2307,7 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
 
     c = ngx_ssl_get_connection(ssl_conn);
 
-    ssl_ctx = SSL_get_SSL_CTX(ssl_conn);
+    ssl_ctx = c->ssl->session_ctx;
     shm_zone = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_session_cache_index);
 
     cache = shm_zone->data;
@@ -2441,21 +2445,17 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn, u_char *id, int len,
     ngx_ssl_sess_id_t        *sess_id;
     ngx_ssl_session_cache_t  *cache;
     u_char                    buf[NGX_SSL_MAX_SESSION_SIZE];
-#if (NGX_DEBUG)
     ngx_connection_t         *c;
-#endif
 
     hash = ngx_crc32_short(id, (size_t) len);
     *copy = 0;
 
-#if (NGX_DEBUG)
     c = ngx_ssl_get_connection(ssl_conn);
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
                    "ssl get session: %08XD:%d", hash, len);
-#endif
 
-    shm_zone = SSL_CTX_get_ex_data(SSL_get_SSL_CTX(ssl_conn),
+    shm_zone = SSL_CTX_get_ex_data(c->ssl->session_ctx,
                                    ngx_ssl_session_cache_index);
 
     cache = shm_zone->data;
@@ -2834,13 +2834,14 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     SSL_CTX                       *ssl_ctx;
     ngx_uint_t                     i;
     ngx_array_t                   *keys;
+    ngx_connection_t              *c;
     ngx_ssl_session_ticket_key_t  *key;
 #if (NGX_DEBUG)
     u_char                         buf[32];
-    ngx_connection_t              *c;
 #endif
 
-    ssl_ctx = SSL_get_SSL_CTX(ssl_conn);
+    c = ngx_ssl_get_connection(ssl_conn);
+    ssl_ctx = c->ssl->session_ctx;
 
     keys = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_session_ticket_keys_index);
     if (keys == NULL) {
@@ -2849,10 +2850,6 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
 
     key = keys->elts;
 
-#if (NGX_DEBUG)
-    c = ngx_ssl_get_connection(ssl_conn);
-#endif
-
     if (enc == 1) {
         /* encrypt session ticket */
 
@@ -2861,7 +2858,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
                        ngx_hex_dump(buf, key[0].name, 16) - buf, buf,
                        SSL_session_reused(ssl_conn) ? "reused" : "new");
 
-        RAND_pseudo_bytes(iv, 16);
+        RAND_bytes(iv, 16);
         EVP_EncryptInit_ex(ectx, EVP_aes_128_cbc(), NULL, key[0].aes_key, iv);
         HMAC_Init_ex(hctx, key[0].hmac_key, 16,
                      ngx_ssl_session_ticket_md(), NULL);
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 08eff64..c86be2a 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -46,6 +46,7 @@ typedef struct {
 
 typedef struct {
     ngx_ssl_conn_t             *connection;
+    SSL_CTX                    *session_ctx;
 
     ngx_int_t                   last;
     ngx_buf_t                  *buf;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 36f00f6..7a29608 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -4489,7 +4489,9 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     clcf->alias = alias ? clcf->name.len : 0;
     clcf->root = value[1];
 
-    if (!alias && clcf->root.data[clcf->root.len - 1] == '/') {
+    if (!alias && clcf->root.len > 0
+        && clcf->root.data[clcf->root.len - 1] == '/')
+    {
         clcf->root.len--;
     }
 
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index c65de35..eaf294a 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -575,7 +575,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
         return NULL;
     }
 
-    if (ngx_strncmp(name->data, "http_", 5) == 0) {
+    if (name->len >= 5 && ngx_strncmp(name->data, "http_", 5) == 0) {
 
         if (ngx_http_variable_unknown_header_in(r, vv, (uintptr_t) name)
             == NGX_OK)
@@ -586,7 +586,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
         return NULL;
     }
 
-    if (ngx_strncmp(name->data, "sent_http_", 10) == 0) {
+    if (name->len >= 10 && ngx_strncmp(name->data, "sent_http_", 10) == 0) {
 
         if (ngx_http_variable_unknown_header_out(r, vv, (uintptr_t) name)
             == NGX_OK)
@@ -597,7 +597,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
         return NULL;
     }
 
-    if (ngx_strncmp(name->data, "upstream_http_", 14) == 0) {
+    if (name->len >= 14 && ngx_strncmp(name->data, "upstream_http_", 14) == 0) {
 
         if (ngx_http_upstream_header_variable(r, vv, (uintptr_t) name)
             == NGX_OK)
@@ -608,7 +608,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
         return NULL;
     }
 
-    if (ngx_strncmp(name->data, "cookie_", 7) == 0) {
+    if (name->len >= 7 && ngx_strncmp(name->data, "cookie_", 7) == 0) {
 
         if (ngx_http_variable_cookie(r, vv, (uintptr_t) name) == NGX_OK) {
             return vv;
@@ -617,7 +617,9 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
         return NULL;
     }
 
-    if (ngx_strncmp(name->data, "upstream_cookie_", 16) == 0) {
+    if (name->len >= 16
+        && ngx_strncmp(name->data, "upstream_cookie_", 16) == 0)
+    {
 
         if (ngx_http_upstream_cookie_variable(r, vv, (uintptr_t) name)
             == NGX_OK)
@@ -628,7 +630,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
         return NULL;
     }
 
-    if (ngx_strncmp(name->data, "arg_", 4) == 0) {
+    if (name->len >= 4 && ngx_strncmp(name->data, "arg_", 4) == 0) {
 
         if (ngx_http_variable_argument(r, vv, (uintptr_t) name) == NGX_OK) {
             return vv;
@@ -2535,21 +2537,27 @@ ngx_http_variables_init_vars(ngx_conf_t *cf)
             }
         }
 
-        if (ngx_strncmp(v[i].name.data, "http_", 5) == 0) {
+        if (v[i].name.len >= 5
+            && ngx_strncmp(v[i].name.data, "http_", 5) == 0)
+        {
             v[i].get_handler = ngx_http_variable_unknown_header_in;
             v[i].data = (uintptr_t) &v[i].name;
 
             continue;
         }
 
-        if (ngx_strncmp(v[i].name.data, "sent_http_", 10) == 0) {
+        if (v[i].name.len >= 10
+            && ngx_strncmp(v[i].name.data, "sent_http_", 10) == 0)
+        {
             v[i].get_handler = ngx_http_variable_unknown_header_out;
             v[i].data = (uintptr_t) &v[i].name;
 
             continue;
         }
 
-        if (ngx_strncmp(v[i].name.data, "upstream_http_", 14) == 0) {
+        if (v[i].name.len >= 14
+            && ngx_strncmp(v[i].name.data, "upstream_http_", 14) == 0)
+        {
             v[i].get_handler = ngx_http_upstream_header_variable;
             v[i].data = (uintptr_t) &v[i].name;
             v[i].flags = NGX_HTTP_VAR_NOCACHEABLE;
@@ -2557,14 +2565,18 @@ ngx_http_variables_init_vars(ngx_conf_t *cf)
             continue;
         }
 
-        if (ngx_strncmp(v[i].name.data, "cookie_", 7) == 0) {
+        if (v[i].name.len >= 7
+            && ngx_strncmp(v[i].name.data, "cookie_", 7) == 0)
+        {
             v[i].get_handler = ngx_http_variable_cookie;
             v[i].data = (uintptr_t) &v[i].name;
 
             continue;
         }
 
-        if (ngx_strncmp(v[i].name.data, "upstream_cookie_", 16) == 0) {
+        if (v[i].name.len >= 16
+            && ngx_strncmp(v[i].name.data, "upstream_cookie_", 16) == 0)
+        {
             v[i].get_handler = ngx_http_upstream_cookie_variable;
             v[i].data = (uintptr_t) &v[i].name;
             v[i].flags = NGX_HTTP_VAR_NOCACHEABLE;
@@ -2572,7 +2584,9 @@ ngx_http_variables_init_vars(ngx_conf_t *cf)
             continue;
         }
 
-        if (ngx_strncmp(v[i].name.data, "arg_", 4) == 0) {
+        if (v[i].name.len >= 4
+            && ngx_strncmp(v[i].name.data, "arg_", 4) == 0)
+        {
             v[i].get_handler = ngx_http_variable_argument;
             v[i].data = (uintptr_t) &v[i].name;
             v[i].flags = NGX_HTTP_VAR_NOCACHEABLE;
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index bf07997..10cb727 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -870,6 +870,8 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
+    stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
+
     h2c->state.stream = stream;
 
     return ngx_http_v2_state_read_data(h2c, pos, end);
@@ -897,8 +899,6 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (stream->skip_data) {
-        stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
-
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
                        "skipping http2 DATA frame, reason: %d",
                        stream->skip_data);
@@ -988,9 +988,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
                                       ngx_http_v2_state_read_data);
     }
 
-    if (h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG) {
-        stream->in_closed = 1;
-
+    if (stream->in_closed) {
         if (r->headers_in.content_length_n < 0) {
             r->headers_in.content_length_n = rb->rest;
 
@@ -1133,6 +1131,22 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     h2c->last_sid = h2c->state.sid;
 
+    if (depend == h2c->state.sid) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent HEADERS frame for stream %ui "
+                      "with incorrect dependency", h2c->state.sid);
+
+        if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid,
+                                        NGX_HTTP_V2_PROTOCOL_ERROR)
+            != NGX_OK)
+        {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        return ngx_http_v2_state_skip_headers(h2c, pos, end);
+    }
+
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
                                          ngx_http_v2_module);
 
@@ -1233,7 +1247,7 @@ ngx_http_v2_state_header_block(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     } else {
         /* literal header field without indexing */
-        prefix = ngx_http_v2_prefix(3);
+        prefix = ngx_http_v2_prefix(4);
     }
 
     value = ngx_http_v2_parse_int(h2c, &pos, end, prefix);
@@ -2361,12 +2375,6 @@ ngx_http_v2_connection_error(ngx_http_v2_connection_t *h2c,
         ngx_debug_point();
     }
 
-    if (h2c->state.stream) {
-        h2c->state.stream->out_closed = 1;
-        h2c->state.pool = NULL;
-        ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST);
-    }
-
     ngx_http_v2_finalize_connection(h2c, err);
 
     return NULL;
@@ -2396,8 +2404,8 @@ ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c, u_char **pos, u_char *end,
         return value;
     }
 
-    if (end - p > NGX_HTTP_V2_INT_OCTETS - 1) {
-        end = p + NGX_HTTP_V2_INT_OCTETS - 1;
+    if (end - start > NGX_HTTP_V2_INT_OCTETS) {
+        end = start + NGX_HTTP_V2_INT_OCTETS;
     }
 
     for (shift = 0; p != end; shift += 7) {
@@ -2417,14 +2425,14 @@ ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c, u_char **pos, u_char *end,
         }
     }
 
-    if ((size_t) (end - start) >= NGX_HTTP_V2_INT_OCTETS) {
-        return NGX_DECLINED;
-    }
-
     if ((size_t) (end - start) >= h2c->state.length) {
         return NGX_ERROR;
     }
 
+    if (end == start + NGX_HTTP_V2_INT_OCTETS) {
+        return NGX_DECLINED;
+    }
+
     return NGX_AGAIN;
 }
 
@@ -2762,6 +2770,8 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
         return NULL;
     }
 
+    ngx_str_set(&r->http_protocol, "HTTP/2.0");
+
     r->http_version = NGX_HTTP_VERSION_20;
     r->valid_location = 1;
 
@@ -2896,11 +2906,14 @@ ngx_http_v2_get_closed_node(ngx_http_v2_connection_t *h2c)
         weight += child->weight;
     }
 
+    parent = node->parent;
+
     for (q = ngx_queue_head(&node->children);
          q != ngx_queue_sentinel(&node->children);
          q = ngx_queue_next(q))
     {
         child = ngx_queue_data(q, ngx_http_v2_node_t, queue);
+        child->parent = parent;
         child->weight = node->weight * child->weight / weight;
 
         if (child->weight == 0) {
@@ -2908,8 +2921,6 @@ ngx_http_v2_get_closed_node(ngx_http_v2_connection_t *h2c)
         }
     }
 
-    parent = node->parent;
-
     if (parent == NGX_HTTP_V2_ROOT) {
         node->rank = 0;
         node->rel_weight = 1.0;
@@ -3795,6 +3806,12 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     c = h2c->connection;
 
+    if (h2c->state.stream) {
+        h2c->state.stream->out_closed = 1;
+        h2c->state.pool = NULL;
+        ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST);
+    }
+
     h2c->blocked = 1;
 
     if (!c->error && ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) {
@@ -3922,8 +3939,8 @@ static void
 ngx_http_v2_set_dependency(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_node_t *node, ngx_uint_t depend, ngx_uint_t exclusive)
 {
-    ngx_queue_t         *children;
-    ngx_http_v2_node_t  *parent, *next;
+    ngx_queue_t         *children, *q;
+    ngx_http_v2_node_t  *parent, *child, *next;
 
     parent = depend ? ngx_http_v2_get_node_by_id(h2c, depend, 0) : NULL;
 
@@ -3985,6 +4002,14 @@ ngx_http_v2_set_dependency(ngx_http_v2_connection_t *h2c,
     }
 
     if (exclusive) {
+        for (q = ngx_queue_head(children);
+             q != ngx_queue_sentinel(children);
+             q = ngx_queue_next(q))
+        {
+            child = ngx_queue_data(q, ngx_http_v2_node_t, queue);
+            child->parent = node;
+        }
+
         ngx_queue_add(&node->children, children);
         ngx_queue_init(children);
     }
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index b7e73c9..462d254 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -21,7 +21,8 @@
 #define NGX_HTTP_V2_MAX_FRAME_SIZE       ((1 << 24) - 1)
 
 #define NGX_HTTP_V2_INT_OCTETS           4
-#define NGX_HTTP_V2_MAX_FIELD            ((1 << NGX_HTTP_V2_INT_OCTETS * 7) - 1)
+#define NGX_HTTP_V2_MAX_FIELD                                                 \
+    (127 + (1 << (NGX_HTTP_V2_INT_OCTETS - 1) * 7) - 1)
 
 #define NGX_HTTP_V2_DATA_DISCARD         1
 #define NGX_HTTP_V2_DATA_ERROR           2
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 17cfcd8..a866cde 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -12,7 +12,12 @@
 #include <ngx_http_v2_module.h>
 
 
-#define ngx_http_v2_integer_octets(v)  (((v) + 127) / 128)
+/*
+ * This returns precise number of octets for values in range 0..253
+ * and estimate number for the rest, but not smaller than required.
+ */
+
+#define ngx_http_v2_integer_octets(v)  (1 + (v) / 127)
 
 #define ngx_http_v2_literal_size(h)                                           \
     (ngx_http_v2_integer_octets(sizeof(h) - 1) + sizeof(h) - 1)
@@ -20,6 +25,8 @@
 #define ngx_http_v2_indexed(i)      (128 + (i))
 #define ngx_http_v2_inc_indexed(i)  (64 + (i))
 
+#define NGX_HTTP_V2_ENCODE_RAW            0
+#define NGX_HTTP_V2_ENCODE_HUFF           0x80
 
 #define NGX_HTTP_V2_STATUS_INDEX          8
 #define NGX_HTTP_V2_STATUS_200_INDEX      8
@@ -41,10 +48,8 @@
 
 static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix,
     ngx_uint_t value);
-static void ngx_http_v2_write_headers_head(u_char *pos, size_t length,
-    ngx_uint_t sid, ngx_uint_t end_headers, ngx_uint_t end_stream);
-static void ngx_http_v2_write_continuation_head(u_char *pos, size_t length,
-    ngx_uint_t sid, ngx_uint_t end_headers);
+static ngx_http_v2_out_frame_t *ngx_http_v2_create_headers_frame(
+    ngx_http_request_t *r, u_char *pos, u_char *end);
 
 static ngx_chain_t *ngx_http_v2_send_chain(ngx_connection_t *fc,
     ngx_chain_t *in, off_t limit);
@@ -114,17 +119,14 @@ static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
 static ngx_int_t
 ngx_http_v2_header_filter(ngx_http_request_t *r)
 {
-    u_char                     status, *p, *head;
-    size_t                     len, rest, frame_size;
-    ngx_buf_t                 *b;
+    u_char                     status, *pos, *start, *p;
+    size_t                     len;
     ngx_str_t                  host, location;
-    ngx_uint_t                 i, port, continuation;
-    ngx_chain_t               *cl;
+    ngx_uint_t                 i, port;
     ngx_list_part_t           *part;
     ngx_table_elt_t           *header;
     ngx_connection_t          *fc;
     ngx_http_cleanup_t        *cln;
-    ngx_http_v2_stream_t      *stream;
     ngx_http_v2_out_frame_t   *frame;
     ngx_http_core_loc_conf_t  *clcf;
     ngx_http_core_srv_conf_t  *cscf;
@@ -222,7 +224,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     }
 
     if (r->headers_out.content_type.len) {
-        len += NGX_HTTP_V2_INT_OCTETS + r->headers_out.content_type.len;
+        len += 1 + NGX_HTTP_V2_INT_OCTETS + r->headers_out.content_type.len;
 
         if (r->headers_out.content_type_len == r->headers_out.content_type.len
             && r->headers_out.charset.len)
@@ -386,134 +388,117 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
                  + NGX_HTTP_V2_INT_OCTETS + header[i].value.len;
     }
 
-    stream = r->stream;
-    frame_size = stream->connection->frame_size;
-
-    len += NGX_HTTP_V2_FRAME_HEADER_SIZE
-           * ((len + frame_size - 1) / frame_size);
-
-    b = ngx_create_temp_buf(r->pool, len);
-    if (b == NULL) {
+    pos = ngx_palloc(r->pool, len);
+    if (pos == NULL) {
         return NGX_ERROR;
     }
 
-    b->last_buf = r->header_only;
-
-    b->last += NGX_HTTP_V2_FRAME_HEADER_SIZE;
+    start = pos;
 
     if (status) {
-        *b->last++ = status;
+        *pos++ = status;
 
     } else {
-        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_STATUS_INDEX);
-        *b->last++ = 3;
-        b->last = ngx_sprintf(b->last, "%03ui", r->headers_out.status);
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_STATUS_INDEX);
+        *pos++ = NGX_HTTP_V2_ENCODE_RAW | 3;
+        pos = ngx_sprintf(pos, "%03ui", r->headers_out.status);
     }
 
     if (r->headers_out.server == NULL) {
-        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
 
         if (clcf->server_tokens) {
-            *b->last++ = sizeof(NGINX_VER) - 1;
-            b->last = ngx_cpymem(b->last, NGINX_VER, sizeof(NGINX_VER) - 1);
+            *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof(NGINX_VER) - 1);
+            pos = ngx_cpymem(pos, NGINX_VER, sizeof(NGINX_VER) - 1);
 
         } else {
-            *b->last++ = sizeof("nginx") - 1;
-            b->last = ngx_cpymem(b->last, "nginx", sizeof("nginx") - 1);
+            *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("nginx") - 1);
+            pos = ngx_cpymem(pos, "nginx", sizeof("nginx") - 1);
         }
     }
 
     if (r->headers_out.date == NULL) {
-        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_DATE_INDEX);
-        *b->last++ = (u_char) ngx_cached_http_time.len;
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_DATE_INDEX);
+        *pos++ = (u_char) ngx_cached_http_time.len;
 
-        b->last = ngx_cpymem(b->last, ngx_cached_http_time.data,
-                             ngx_cached_http_time.len);
+        pos = ngx_cpymem(pos, ngx_cached_http_time.data,
+                         ngx_cached_http_time.len);
     }
 
     if (r->headers_out.content_type.len) {
-        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_TYPE_INDEX);
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_TYPE_INDEX);
 
         if (r->headers_out.content_type_len == r->headers_out.content_type.len
             && r->headers_out.charset.len)
         {
-            *b->last = 0;
-            b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7),
-                                            r->headers_out.content_type.len
-                                            + sizeof("; charset=") - 1
-                                            + r->headers_out.charset.len);
+            *pos = NGX_HTTP_V2_ENCODE_RAW;
+            pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
+                                        r->headers_out.content_type.len
+                                        + sizeof("; charset=") - 1
+                                        + r->headers_out.charset.len);
 
-            p = b->last;
+            p = pos;
 
-            b->last = ngx_cpymem(p, r->headers_out.content_type.data,
-                                 r->headers_out.content_type.len);
+            pos = ngx_cpymem(pos, r->headers_out.content_type.data,
+                             r->headers_out.content_type.len);
 
-            b->last = ngx_cpymem(b->last, "; charset=",
-                                 sizeof("; charset=") - 1);
+            pos = ngx_cpymem(pos, "; charset=", sizeof("; charset=") - 1);
 
-            b->last = ngx_cpymem(b->last, r->headers_out.charset.data,
-                                 r->headers_out.charset.len);
+            pos = ngx_cpymem(pos, r->headers_out.charset.data,
+                             r->headers_out.charset.len);
 
             /* update r->headers_out.content_type for possible logging */
 
-            r->headers_out.content_type.len = b->last - p;
+            r->headers_out.content_type.len = pos - p;
             r->headers_out.content_type.data = p;
 
         } else {
-            *b->last = 0;
-            b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7),
-                                            r->headers_out.content_type.len);
-            b->last = ngx_cpymem(b->last, r->headers_out.content_type.data,
-                                 r->headers_out.content_type.len);
+            *pos = NGX_HTTP_V2_ENCODE_RAW;
+            pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
+                                        r->headers_out.content_type.len);
+            pos = ngx_cpymem(pos, r->headers_out.content_type.data,
+                             r->headers_out.content_type.len);
         }
     }
 
     if (r->headers_out.content_length == NULL
         && r->headers_out.content_length_n >= 0)
     {
-        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_LENGTH_INDEX);
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_LENGTH_INDEX);
 
-        p = b->last;
-        b->last = ngx_sprintf(b->last + 1, "%O",
-                              r->headers_out.content_length_n);
-        *p = (u_char) (b->last - p - 1);
+        p = pos;
+        pos = ngx_sprintf(pos + 1, "%O", r->headers_out.content_length_n);
+        *p = NGX_HTTP_V2_ENCODE_RAW | (u_char) (pos - p - 1);
     }
 
     if (r->headers_out.last_modified == NULL
         && r->headers_out.last_modified_time != -1)
     {
-        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LAST_MODIFIED_INDEX);
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LAST_MODIFIED_INDEX);
 
-        p = b->last;
-        b->last = ngx_http_time(b->last + 1, r->headers_out.last_modified_time);
-        *p = (u_char) (b->last - p - 1);
+        *pos++ = NGX_HTTP_V2_ENCODE_RAW
+                 | (sizeof("Wed, 31 Dec 1986 18:00:00 GMT") - 1);
+        pos = ngx_http_time(pos, r->headers_out.last_modified_time);
     }
 
     if (r->headers_out.location && r->headers_out.location->value.len) {
-        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LOCATION_INDEX);
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LOCATION_INDEX);
 
-        *b->last = 0;
-        b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7),
-                                        r->headers_out.location->value.len);
-        b->last = ngx_cpymem(b->last, r->headers_out.location->value.data,
-                                      r->headers_out.location->value.len);
+        *pos = NGX_HTTP_V2_ENCODE_RAW;
+        pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
+                                    r->headers_out.location->value.len);
+        pos = ngx_cpymem(pos, r->headers_out.location->value.data,
+                              r->headers_out.location->value.len);
     }
 
 #if (NGX_HTTP_GZIP)
     if (r->gzip_vary) {
-        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_VARY_INDEX);
-        *b->last++ = sizeof("Accept-Encoding") - 1;
-        b->last = ngx_cpymem(b->last, "Accept-Encoding",
-                             sizeof("Accept-Encoding") - 1);
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_VARY_INDEX);
+        *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("Accept-Encoding") - 1);
+        pos = ngx_cpymem(pos, "Accept-Encoding", sizeof("Accept-Encoding") - 1);
     }
 #endif
 
-    continuation = 0;
-    head = b->pos;
-
-    len = b->last - head - NGX_HTTP_V2_FRAME_HEADER_SIZE;
-    rest = frame_size - len;
-
     part = &r->headers_out.headers.part;
     header = part->elts;
 
@@ -533,82 +518,26 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
             continue;
         }
 
-        len = 1 + NGX_HTTP_V2_INT_OCTETS * 2
-              + header[i].key.len
-              + header[i].value.len;
+        *pos++ = 0;
 
-        if (len > rest) {
-            len = b->last - head - NGX_HTTP_V2_FRAME_HEADER_SIZE;
+        *pos = NGX_HTTP_V2_ENCODE_RAW;
+        pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
+                                    header[i].key.len);
+        ngx_strlow(pos, header[i].key.data, header[i].key.len);
+        pos += header[i].key.len;
 
-            if (continuation) {
-                ngx_http_v2_write_continuation_head(head, len,
-                                                    stream->node->id, 0);
-            } else {
-                continuation = 1;
-                ngx_http_v2_write_headers_head(head, len, stream->node->id, 0,
-                                               r->header_only);
-            }
-
-            rest = frame_size;
-            head = b->last;
-
-            b->last += NGX_HTTP_V2_FRAME_HEADER_SIZE;
-        }
-
-        p = b->last;
-
-        *p++ = 0;
-
-        *p = 0;
-        p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7), header[i].key.len);
-        ngx_strlow(p, header[i].key.data, header[i].key.len);
-        p += header[i].key.len;
-
-        *p = 0;
-        p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7),
-                                  header[i].value.len);
-        p = ngx_cpymem(p, header[i].value.data, header[i].value.len);
-
-        rest -= p - b->last;
-        b->last = p;
+        *pos = NGX_HTTP_V2_ENCODE_RAW;
+        pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
+                                    header[i].value.len);
+        pos = ngx_cpymem(pos, header[i].value.data, header[i].value.len);
     }
 
-    len = b->last - head - NGX_HTTP_V2_FRAME_HEADER_SIZE;
-
-    if (continuation) {
-        ngx_http_v2_write_continuation_head(head, len, stream->node->id, 1);
-
-    } else {
-        ngx_http_v2_write_headers_head(head, len, stream->node->id, 1,
-                                       r->header_only);
-    }
-
-    cl = ngx_alloc_chain_link(r->pool);
-    if (cl == NULL) {
-        return NGX_ERROR;
-    }
-
-    cl->buf = b;
-    cl->next = NULL;
-
-    frame = ngx_palloc(r->pool, sizeof(ngx_http_v2_out_frame_t));
+    frame = ngx_http_v2_create_headers_frame(r, start, pos);
     if (frame == NULL) {
         return NGX_ERROR;
     }
 
-    frame->first = cl;
-    frame->last = cl;
-    frame->handler = ngx_http_v2_headers_frame_handler;
-    frame->stream = stream;
-    frame->length = b->last - b->pos - NGX_HTTP_V2_FRAME_HEADER_SIZE;
-    frame->blocked = 1;
-    frame->fin = r->header_only;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, stream->request->connection->log, 0,
-                   "http2:%ui create HEADERS frame %p: len:%uz",
-                   stream->node->id, frame, frame->length);
-
-    ngx_http_v2_queue_blocked_frame(stream->connection, frame);
+    ngx_http_v2_queue_blocked_frame(r->stream->connection, frame);
 
     cln = ngx_http_cleanup_add(r, 0);
     if (cln == NULL) {
@@ -616,14 +545,14 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     }
 
     cln->handler = ngx_http_v2_filter_cleanup;
-    cln->data = stream;
+    cln->data = r->stream;
 
-    stream->queued = 1;
+    r->stream->queued = 1;
 
     fc->send_chain = ngx_http_v2_send_chain;
     fc->need_last_buf = 1;
 
-    return ngx_http_v2_filter_send(fc, stream);
+    return ngx_http_v2_filter_send(fc, r->stream);
 }
 
 
@@ -649,41 +578,104 @@ ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value)
 }
 
 
-static void
-ngx_http_v2_write_headers_head(u_char *pos, size_t length, ngx_uint_t sid,
-    ngx_uint_t end_headers, ngx_uint_t end_stream)
+static ngx_http_v2_out_frame_t *
+ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
+    u_char *end)
 {
-    u_char  flags;
+    u_char                    type, flags;
+    size_t                    rest, frame_size;
+    ngx_buf_t                *b;
+    ngx_chain_t              *cl, **ll;
+    ngx_http_v2_stream_t     *stream;
+    ngx_http_v2_out_frame_t  *frame;
 
-    pos = ngx_http_v2_write_len_and_type(pos, length,
-                                         NGX_HTTP_V2_HEADERS_FRAME);
+    stream = r->stream;
+    rest = end - pos;
 
-    flags = NGX_HTTP_V2_NO_FLAG;
-
-    if (end_headers) {
-        flags |= NGX_HTTP_V2_END_HEADERS_FLAG;
+    frame = ngx_palloc(r->pool, sizeof(ngx_http_v2_out_frame_t));
+    if (frame == NULL) {
+        return NULL;
     }
 
-    if (end_stream) {
-        flags |= NGX_HTTP_V2_END_STREAM_FLAG;
+    frame->handler = ngx_http_v2_headers_frame_handler;
+    frame->stream = stream;
+    frame->length = rest;
+    frame->blocked = 1;
+    frame->fin = r->header_only;
+
+    ll = &frame->first;
+
+    type = NGX_HTTP_V2_HEADERS_FRAME;
+    flags = r->header_only ? NGX_HTTP_V2_END_STREAM_FLAG : NGX_HTTP_V2_NO_FLAG;
+    frame_size = stream->connection->frame_size;
+
+    for ( ;; ) {
+        if (rest <= frame_size) {
+            frame_size = rest;
+            flags |= NGX_HTTP_V2_END_HEADERS_FLAG;
+        }
+
+        b = ngx_create_temp_buf(r->pool, NGX_HTTP_V2_FRAME_HEADER_SIZE);
+        if (b == NULL) {
+            return NULL;
+        }
+
+        b->last = ngx_http_v2_write_len_and_type(b->last, frame_size, type);
+        *b->last++ = flags;
+        b->last = ngx_http_v2_write_sid(b->last, stream->node->id);
+
+        cl = ngx_alloc_chain_link(r->pool);
+        if (cl == NULL) {
+            return NULL;
+        }
+
+        cl->buf = b;
+
+        *ll = cl;
+        ll = &cl->next;
+
+        b = ngx_calloc_buf(r->pool);
+        if (b == NULL) {
+            return NULL;
+        }
+
+        b->pos = pos;
+
+        pos += frame_size;
+
+        b->last = pos;
+        b->start = b->pos;
+        b->end = b->last;
+        b->temporary = 1;
+
+        cl = ngx_alloc_chain_link(r->pool);
+        if (cl == NULL) {
+            return NULL;
+        }
+
+        cl->buf = b;
+
+        *ll = cl;
+        ll = &cl->next;
+
+        rest -= frame_size;
+
+        if (rest) {
+            type = NGX_HTTP_V2_CONTINUATION_FRAME;
+            flags = NGX_HTTP_V2_NO_FLAG;
+            continue;
+        }
+
+        b->last_buf = r->header_only;
+        cl->next = NULL;
+        frame->last = cl;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http2:%ui create HEADERS frame %p: len:%uz",
+                       stream->node->id, frame, frame->length);
+
+        return frame;
     }
-
-    *pos++ = flags;
-
-    (void) ngx_http_v2_write_sid(pos, sid);
-}
-
-
-static void
-ngx_http_v2_write_continuation_head(u_char *pos, size_t length, ngx_uint_t sid,
-    ngx_uint_t end_headers)
-{
-    pos = ngx_http_v2_write_len_and_type(pos, length,
-                                         NGX_HTTP_V2_CONTINUATION_FRAME);
-
-    *pos++ = end_headers ? NGX_HTTP_V2_END_HEADERS_FLAG : NGX_HTTP_V2_NO_FLAG;
-
-    (void) ngx_http_v2_write_sid(pos, sid);
 }
 
 
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index ea142e7..6800500 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -759,6 +759,10 @@ ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc)
             u->peer.save_session(&u->peer, u->peer.data);
         }
 
+        if (pc->write->timer_set) {
+            ngx_del_timer(pc->write);
+        }
+
         ngx_stream_proxy_init_upstream(s);
 
         return;

From b37dfd906aaea875b38630ee2383cd5a2e17cad8 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 3 Nov 2015 08:59:14 +0200
Subject: [PATCH 013/600] New upsteam release (1.9.6)

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1fb0f6e..10811de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.9.5-1) UNRELEASED; urgency=medium
+nginx (1.9.6-1) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis]
   * New upstream release.

From 6f5cefd11e961c884fcb0bea4cd9334c0f979007 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 3 Nov 2015 08:59:30 +0200
Subject: [PATCH 014/600] 1.9.6-1

---
 debian/changelog         | 5 +++--
 debian/nginx-common.NEWS | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10811de..d01c0c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-nginx (1.9.6-1) UNRELEASED; urgency=medium
+nginx (1.9.6-1) unstable; urgency=medium
 
   [ Christos Trochalakis]
   * New upstream release.
+  * Enable http2 module in nginx-full & nginx-extras
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 25 Sep 2015 14:03:10 +0300
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 03 Nov 2015 08:59:21 +0200
 
 nginx (1.9.4-1) unstable; urgency=medium
 
diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index 161d061..46a6f14 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,4 +1,4 @@
-nginx-common (1.9.5-1) UNRELEASED; urgency=medium
+nginx-common (1.9.6-1) unstable; urgency=medium
 
   As of nginx 1.9.5 spdy has been replaced by the http2 module. Make sure to
   replace "spdy" with "http2" in your config files.

From 7a486795eb9b1e2a441a4035cb8854f7d2e2d9cf Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 13 Nov 2015 16:07:02 +0200
Subject: [PATCH 015/600] Update nginx-lua 0.9.19

Fixes http/2 issues
  o https://github.com/openresty/lua-nginx-module/issues/566
---
 debian/changelog                              |    8 +
 debian/modules/README.Modules-versions        |    2 +-
 debian/modules/nginx-lua/.gitignore           |  164 -
 debian/modules/nginx-lua/README.markdown      |  484 +-
 debian/modules/nginx-lua/config               |  105 +-
 .../modules/nginx-lua/doc/HttpLuaModule.wiki  |  437 +-
 .../nginx-lua/src/api/ngx_http_lua_api.h      |    2 +-
 debian/modules/nginx-lua/src/ddebug.h         |    6 +-
 .../nginx-lua/src/ngx_http_lua_directive.c    |  612 ++
 .../nginx-lua/src/ngx_http_lua_directive.h    |   18 +
 .../nginx-lua/src/ngx_http_lua_headers_in.c   |   76 +-
 .../nginx-lua/src/ngx_http_lua_headers_out.c  |   12 +
 .../nginx-lua/src/ngx_http_lua_initworkerby.c |    8 +-
 .../modules/nginx-lua/src/ngx_http_lua_lex.c  | 8251 +++++++++++++++++
 .../modules/nginx-lua/src/ngx_http_lua_lex.h  |   17 +
 .../nginx-lua/src/ngx_http_lua_module.c       |   86 +-
 .../nginx-lua/src/ngx_http_lua_shdict.c       |   59 +-
 .../nginx-lua/src/ngx_http_lua_socket_tcp.c   |   10 +-
 .../nginx-lua/src/ngx_http_lua_socket_udp.c   |    2 +-
 .../nginx-lua/src/ngx_http_lua_subrequest.c   |    8 +-
 debian/modules/nginx-lua/t/000--init.t        |    1 -
 debian/modules/nginx-lua/t/000-sanity.t       |    1 -
 debian/modules/nginx-lua/t/001-set.t          |    1 -
 debian/modules/nginx-lua/t/002-content.t      |    2 +-
 debian/modules/nginx-lua/t/003-errors.t       |    1 -
 debian/modules/nginx-lua/t/004-require.t      |    2 +-
 debian/modules/nginx-lua/t/005-exit.t         |    1 -
 debian/modules/nginx-lua/t/006-escape.t       |    1 -
 debian/modules/nginx-lua/t/007-md5.t          |    2 +-
 debian/modules/nginx-lua/t/008-today.t        |    2 +-
 debian/modules/nginx-lua/t/009-log.t          |    2 +-
 debian/modules/nginx-lua/t/010-request_body.t |    2 +-
 debian/modules/nginx-lua/t/011-md5_bin.t      |    1 -
 debian/modules/nginx-lua/t/012-now.t          |    2 +-
 debian/modules/nginx-lua/t/013-base64.t       |    1 -
 debian/modules/nginx-lua/t/014-bugs.t         |    1 -
 debian/modules/nginx-lua/t/015-status.t       |    1 -
 debian/modules/nginx-lua/t/016-resp-header.t  |   46 +-
 debian/modules/nginx-lua/t/017-exec.t         |    1 -
 debian/modules/nginx-lua/t/018-ndk.t          |    1 -
 debian/modules/nginx-lua/t/019-const.t        |    1 -
 debian/modules/nginx-lua/t/020-subrequest.t   |   76 +-
 debian/modules/nginx-lua/t/021-cookie-time.t  |    2 +-
 debian/modules/nginx-lua/t/022-redirect.t     |    1 -
 .../nginx-lua/t/023-rewrite/client-abort.t    |    1 -
 debian/modules/nginx-lua/t/023-rewrite/exec.t |    1 -
 debian/modules/nginx-lua/t/023-rewrite/exit.t |    1 -
 .../modules/nginx-lua/t/023-rewrite/mixed.t   |    1 -
 .../nginx-lua/t/023-rewrite/multi-capture.t   |    1 -
 .../nginx-lua/t/023-rewrite/on-abort.t        |    1 -
 .../nginx-lua/t/023-rewrite/redirect.t        |    1 -
 .../nginx-lua/t/023-rewrite/req-body.t        |    2 +-
 .../nginx-lua/t/023-rewrite/req-socket.t      |    1 -
 .../nginx-lua/t/023-rewrite/request_body.t    |    1 -
 .../modules/nginx-lua/t/023-rewrite/sanity.t  |    1 -
 .../modules/nginx-lua/t/023-rewrite/sleep.t   |    1 -
 .../t/023-rewrite/socket-keepalive.t          |    1 -
 .../nginx-lua/t/023-rewrite/subrequest.t      |    1 -
 .../t/023-rewrite/tcp-socket-timeout.t        |    1 -
 .../nginx-lua/t/023-rewrite/tcp-socket.t      |    1 -
 .../nginx-lua/t/023-rewrite/unix-socket.t     |    1 -
 .../nginx-lua/t/023-rewrite/uthread-exec.t    |    1 -
 .../nginx-lua/t/023-rewrite/uthread-exit.t    |    1 -
 .../t/023-rewrite/uthread-redirect.t          |    1 -
 .../nginx-lua/t/023-rewrite/uthread-spawn.t   |    1 -
 debian/modules/nginx-lua/t/024-access/auth.t  |    1 -
 .../nginx-lua/t/024-access/client-abort.t     |    1 -
 debian/modules/nginx-lua/t/024-access/exec.t  |    1 -
 debian/modules/nginx-lua/t/024-access/exit.t  |    1 -
 debian/modules/nginx-lua/t/024-access/mixed.t |    1 -
 .../nginx-lua/t/024-access/multi-capture.t    |    1 -
 .../modules/nginx-lua/t/024-access/on-abort.t |    1 -
 .../modules/nginx-lua/t/024-access/redirect.t |    1 -
 .../modules/nginx-lua/t/024-access/req-body.t |    2 +-
 .../nginx-lua/t/024-access/request_body.t     |    1 -
 .../modules/nginx-lua/t/024-access/sanity.t   |    1 -
 .../modules/nginx-lua/t/024-access/satisfy.t  |    1 -
 debian/modules/nginx-lua/t/024-access/sleep.t |    1 -
 .../nginx-lua/t/024-access/subrequest.t       |    1 -
 .../nginx-lua/t/024-access/uthread-exec.t     |    1 -
 .../nginx-lua/t/024-access/uthread-exit.t     |    1 -
 .../nginx-lua/t/024-access/uthread-redirect.t |    1 -
 .../nginx-lua/t/024-access/uthread-spawn.t    |    1 -
 debian/modules/nginx-lua/t/025-codecache.t    |    1 -
 debian/modules/nginx-lua/t/026-mysql.t        |    1 -
 .../modules/nginx-lua/t/027-multi-capture.t   |    1 -
 debian/modules/nginx-lua/t/028-req-header.t   |   96 +-
 debian/modules/nginx-lua/t/029-http-time.t    |    1 -
 debian/modules/nginx-lua/t/030-uri-args.t     |    1 -
 debian/modules/nginx-lua/t/031-post-args.t    |    1 -
 debian/modules/nginx-lua/t/032-iolist.t       |    1 -
 debian/modules/nginx-lua/t/033-ctx.t          |    1 -
 debian/modules/nginx-lua/t/035-gmatch.t       |    1 -
 debian/modules/nginx-lua/t/036-sub.t          |    1 -
 debian/modules/nginx-lua/t/037-gsub.t         |    1 -
 debian/modules/nginx-lua/t/038-match-o.t      |    1 -
 debian/modules/nginx-lua/t/039-sub-o.t        |    1 -
 debian/modules/nginx-lua/t/040-gsub-o.t       |    1 -
 .../modules/nginx-lua/t/041-header-filter.t   |    1 -
 debian/modules/nginx-lua/t/042-crc32.t        |    1 -
 debian/modules/nginx-lua/t/043-shdict.t       |  135 +-
 debian/modules/nginx-lua/t/044-req-body.t     |    1 -
 debian/modules/nginx-lua/t/045-ngx-var.t      |    1 -
 debian/modules/nginx-lua/t/046-hmac.t         |    1 -
 debian/modules/nginx-lua/t/047-match-jit.t    |    1 -
 debian/modules/nginx-lua/t/048-match-dfa.t    |    1 -
 debian/modules/nginx-lua/t/049-gmatch-jit.t   |    1 -
 debian/modules/nginx-lua/t/050-gmatch-dfa.t   |    1 -
 debian/modules/nginx-lua/t/051-sub-jit.t      |    1 -
 debian/modules/nginx-lua/t/052-sub-dfa.t      |    1 -
 debian/modules/nginx-lua/t/053-gsub-jit.t     |    1 -
 debian/modules/nginx-lua/t/054-gsub-dfa.t     |    1 -
 debian/modules/nginx-lua/t/055-subreq-vars.t  |    1 -
 debian/modules/nginx-lua/t/056-flush.t        |    1 -
 .../modules/nginx-lua/t/057-flush-timeout.t   |    1 -
 debian/modules/nginx-lua/t/058-tcp-socket.t   |    1 -
 debian/modules/nginx-lua/t/059-unix-socket.t  |    1 -
 .../modules/nginx-lua/t/060-lua-memcached.t   |    1 -
 debian/modules/nginx-lua/t/061-lua-redis.t    |    1 -
 debian/modules/nginx-lua/t/062-count.t        |   66 +-
 debian/modules/nginx-lua/t/063-abort.t        |    1 -
 debian/modules/nginx-lua/t/064-pcall.t        |    1 -
 .../nginx-lua/t/065-tcp-socket-timeout.t      |    1 -
 .../nginx-lua/t/066-socket-receiveuntil.t     |    1 -
 debian/modules/nginx-lua/t/067-req-socket.t   |    1 -
 .../nginx-lua/t/068-socket-keepalive.t        |    1 -
 debian/modules/nginx-lua/t/069-null.t         |    1 -
 debian/modules/nginx-lua/t/070-sha1.t         |    1 -
 debian/modules/nginx-lua/t/071-idle-socket.t  |    1 -
 .../modules/nginx-lua/t/072-conditional-get.t |    1 -
 debian/modules/nginx-lua/t/073-backtrace.t    |    1 -
 debian/modules/nginx-lua/t/074-prefix-var.t   |    1 -
 debian/modules/nginx-lua/t/075-logby.t        |    1 -
 debian/modules/nginx-lua/t/076-no-postpone.t  |    1 -
 debian/modules/nginx-lua/t/077-sleep.t        |    1 -
 debian/modules/nginx-lua/t/078-hup-vars.t     |    1 -
 .../nginx-lua/t/079-unused-directives.t       |   12 +-
 debian/modules/nginx-lua/t/080-hup-shdict.t   |    1 -
 debian/modules/nginx-lua/t/081-bytecode.t     |    1 -
 debian/modules/nginx-lua/t/082-body-filter.t  |    1 -
 .../modules/nginx-lua/t/083-bad-sock-self.t   |    1 -
 .../nginx-lua/t/084-inclusive-receiveuntil.t  |    1 -
 debian/modules/nginx-lua/t/085-if.t           |    1 -
 debian/modules/nginx-lua/t/086-init-by.t      |    1 -
 debian/modules/nginx-lua/t/087-udp-socket.t   |    1 -
 debian/modules/nginx-lua/t/088-req-method.t   |    1 -
 .../nginx-lua/t/090-log-socket-errors.t       |    1 -
 debian/modules/nginx-lua/t/091-coroutine.t    |    1 -
 debian/modules/nginx-lua/t/092-eof.t          |    1 -
 .../modules/nginx-lua/t/093-uthread-spawn.t   |    1 -
 debian/modules/nginx-lua/t/094-uthread-exit.t |    1 -
 debian/modules/nginx-lua/t/095-uthread-exec.t |    1 -
 .../nginx-lua/t/096-uthread-redirect.t        |    1 -
 .../modules/nginx-lua/t/097-uthread-rewrite.t |    1 -
 debian/modules/nginx-lua/t/098-uthread-wait.t |    1 -
 debian/modules/nginx-lua/t/099-c-api.t        |   36 +-
 debian/modules/nginx-lua/t/100-client-abort.t |    1 -
 debian/modules/nginx-lua/t/101-on-abort.t     |    1 -
 .../modules/nginx-lua/t/102-req-start-time.t  |    1 -
 debian/modules/nginx-lua/t/103-req-http-ver.t |    1 -
 .../modules/nginx-lua/t/104-req-raw-header.t  |    1 -
 debian/modules/nginx-lua/t/105-pressure.t     |    1 -
 debian/modules/nginx-lua/t/106-timer.t        |    1 -
 debian/modules/nginx-lua/t/107-timer-errors.t |    1 -
 debian/modules/nginx-lua/t/108-timer-safe.t   |    1 -
 debian/modules/nginx-lua/t/109-timer-hup.t    |    1 -
 debian/modules/nginx-lua/t/110-etag.t         |    1 -
 .../modules/nginx-lua/t/111-req-header-ua.t   |    1 -
 .../modules/nginx-lua/t/112-req-header-conn.t |    1 -
 .../nginx-lua/t/113-req-header-cookie.t       |    1 -
 debian/modules/nginx-lua/t/114-config.t       |    1 -
 .../modules/nginx-lua/t/115-quote-sql-str.t   |    1 -
 .../modules/nginx-lua/t/116-raw-req-socket.t  |    1 -
 .../nginx-lua/t/117-raw-req-socket-timeout.t  |    1 -
 .../nginx-lua/t/118-use-default-type.t        |    1 -
 .../modules/nginx-lua/t/119-config-prefix.t   |    1 -
 debian/modules/nginx-lua/t/121-version.t      |    1 -
 debian/modules/nginx-lua/t/123-lua-path.t     |    1 -
 debian/modules/nginx-lua/t/124-init-worker.t  |   18 +-
 .../modules/nginx-lua/t/125-configure-args.t  |    1 -
 debian/modules/nginx-lua/t/126-shdict-frag.t  |    2 +-
 debian/modules/nginx-lua/t/127-uthread-kill.t |    1 -
 .../nginx-lua/t/128-duplex-tcp-socket.t       |    1 -
 debian/modules/nginx-lua/t/129-ssl-socket.t   |   17 +-
 debian/modules/nginx-lua/t/130-internal-api.t |    2 +-
 debian/modules/nginx-lua/t/132-lua-blocks.t   |  490 +
 .../nginx-lua/t/data/fake-module/config       |    3 +
 .../t/data/fake-module/ngx_http_fake_module.c |  121 +
 debian/modules/nginx-lua/util/build.sh        |   39 -
 debian/modules/nginx-lua/util/build2.sh       |    8 +-
 debian/modules/nginx-lua/util/gen-lexer-c     |   18 +
 debian/modules/nginx-lua/valgrind.suppress    |    7 +
 192 files changed, 11008 insertions(+), 715 deletions(-)
 delete mode 100644 debian/modules/nginx-lua/.gitignore
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_lex.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_lex.h
 create mode 100644 debian/modules/nginx-lua/t/132-lua-blocks.t
 create mode 100644 debian/modules/nginx-lua/t/data/fake-module/config
 create mode 100644 debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
 delete mode 100755 debian/modules/nginx-lua/util/build.sh
 create mode 100755 debian/modules/nginx-lua/util/gen-lexer-c

diff --git a/debian/changelog b/debian/changelog
index d01c0c2..08dd22b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.9.6-2) UNRELEASED; urgency=medium
+
+  [ Christos Trochalakis]
+  * debian/modules/nginx-lua:
+    + Update nginx-lua to v0.9.19 fixing HTTP/2 compatibility.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 13 Nov 2015 16:04:32 +0200
+
 nginx (1.9.6-1) unstable; urgency=medium
 
   [ Christos Trochalakis]
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 435eaab..3690858 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -22,7 +22,7 @@ README for Modules versions
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
-  Version: v0.9.16
+  Version: v0.9.19
 
  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
deleted file mode 100644
index 61613b2..0000000
--- a/debian/modules/nginx-lua/.gitignore
+++ /dev/null
@@ -1,164 +0,0 @@
-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-9]
-g
-buildroot/
-src/headerfilterby.[ch]
-*.patch
-analyze
-tsock
-a.c
-test.lua
-build12
-ERRORS
-src/bodyfilterby.[ch]
-src/tcp.[ch]
-src/initby.[ch]
-src/initworkerby.[ch]
-src/socket.[ch]
-src/udp.[ch]
-src/method.[ch]
-tre
-src/phase.[ch]
-src/probe.h
-src/uthread.[ch]
-src/timer.[ch]
-src/config.[ch]
-src/worker.[ch]
-*.plist
-lua
-ttimer
-Makefile
-tsubreq
-tthread
-addr2line
-hup
-theaders
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/nginx-lua/README.markdown
index 248c47f..da06da6 100644
--- a/debian/modules/nginx-lua/README.markdown
+++ b/debian/modules/nginx-lua/README.markdown
@@ -6,7 +6,7 @@ Don't edit this file manually! Instead you should generate it by using:
 Name
 ====
 
-ngx_lua - Embed the power of Lua into Nginx
+ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
 *This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
 
@@ -61,7 +61,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.9.16](https://github.com/openresty/lua-nginx-module/tags) released on 22 June 2015.
+This document describes ngx_lua [v0.9.19](https://github.com/openresty/lua-nginx-module/tags) released on 11 November 2015.
 
 Synopsis
 ========
@@ -74,42 +74,13 @@ Synopsis
  lua_package_cpath '/bar/baz/?.so;/blah/blah/?.so;;';
 
  server {
-     location /inline_concat {
-         # MIME type determined by default_type:
-         default_type 'text/plain';
-
-         set $a "hello";
-         set $b "world";
-         # inline Lua script
-         set_by_lua $res "return ngx.arg[1]..ngx.arg[2]" $a $b;
-         echo $res;
-     }
-
-     location /rel_file_concat {
-         set $a "foo";
-         set $b "bar";
-         # script path relative to nginx prefix
-         # $ngx_prefix/conf/concat.lua contents:
-         #
-         #    return ngx.arg[1]..ngx.arg[2]
-         #
-         set_by_lua_file $res conf/concat.lua $a $b;
-         echo $res;
-     }
-
-     location /abs_file_concat {
-         set $a "fee";
-         set $b "baz";
-         # absolute script path not modified
-         set_by_lua_file $res /usr/nginx/conf/concat.lua $a $b;
-         echo $res;
-     }
-
      location /lua_content {
          # MIME type determined by default_type:
          default_type 'text/plain';
 
-         content_by_lua "ngx.say('Hello,world!')";
+         content_by_lua_block {
+             ngx.say('Hello,world!')
+         }
      }
 
      location /nginx_var {
@@ -117,84 +88,61 @@ Synopsis
          default_type 'text/plain';
 
          # try access /nginx_var?a=hello,world
-         content_by_lua "ngx.print(ngx.var['arg_a'], '\\n')";
+         content_by_lua_block {
+             ngx.say(ngx.var.arg_a)
+         }
      }
 
-     location /request_body {
-          # force reading request body (default off)
-          lua_need_request_body on;
-          client_max_body_size 50k;
-          client_body_buffer_size 50k;
+     location = /request_body {
+         client_max_body_size 50k;
+         client_body_buffer_size 50k;
 
-          content_by_lua 'ngx.print(ngx.var.request_body)';
+         content_by_lua_block {
+             ngx.req.read_body()  -- explicitly read the req body
+             local data = ngx.req.get_body_data()
+             if data then
+                 ngx.say("body data:")
+                 ngx.print(data)
+                 return
+             end
+
+             -- body may get buffered in a temp file:
+             local file = ngx.req.get_body_file()
+             if file then
+                 ngx.say("body is in file ", file)
+             else
+                 ngx.say("no body found")
+             end
+         }
      }
 
      # transparent non-blocking I/O in Lua via subrequests
-     location /lua {
+     # (well, a better way is to use cosockets)
+     location = /lua {
          # MIME type determined by default_type:
          default_type 'text/plain';
 
-         content_by_lua '
+         content_by_lua_block {
              local res = ngx.location.capture("/some_other_location")
-             if res.status == 200 then
+             if res then
+                 ngx.say("status: ", res.status)
+                 ngx.say("body:")
                  ngx.print(res.body)
              end';
+         }
      }
 
-     # GET /recur?num=5
-     location /recur {
-         # MIME type determined by default_type:
-         default_type 'text/plain';
-
-         content_by_lua '
-            local num = tonumber(ngx.var.arg_num) or 0
-
-            if num > 50 then
-                ngx.say("num too big")
-                return
-            end
-
-            ngx.say("num is: ", num)
-
-            if num > 0 then
-                res = ngx.location.capture("/recur?num=" .. tostring(num - 1))
-                ngx.print("status=", res.status, " ")
-                ngx.print("body=", res.body)
-            else
-                ngx.say("end")
-            end
-            ';
-     }
-
-     location /foo {
-         rewrite_by_lua '
+     location = /foo {
+         rewrite_by_lua_block {
              res = ngx.location.capture("/memc",
                  { args = { cmd = "incr", key = ngx.var.uri } }
              )
-         ';
+         }
 
          proxy_pass http://blah.blah.com;
      }
 
-     location /blah {
-         access_by_lua '
-             local res = ngx.location.capture("/auth")
-
-             if res.status == ngx.HTTP_OK then
-                 return
-             end
-
-             if res.status == ngx.HTTP_FORBIDDEN then
-                 ngx.exit(res.status)
-             end
-
-             ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-         ';
-
-         # proxy_pass/fastcgi_pass/postgres_pass/...
-     }
-
-     location /mixed {
+     location = /mixed {
          rewrite_by_lua_file /path/to/rewrite.lua;
          access_by_lua_file /path/to/access.lua;
          content_by_lua_file /path/to/content.lua;
@@ -209,26 +157,24 @@ Synopsis
      }
 
      location / {
-        lua_need_request_body on;
-
         client_max_body_size 100k;
         client_body_buffer_size 100k;
 
-        access_by_lua '
+        access_by_lua_block {
             -- 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
 
-            -- check if the request body contains bad words
-            if ngx.var.request_body and
-                     string.match(ngx.var.request_body, "fsck")
+            -- check if the URI contains bad words
+            if ngx.var.uri and
+                   string.match(ngx.var.request_body, "evil")
             then
                 return ngx.redirect("/terms_of_use.html")
             end
 
             -- tests passed
-        ';
+        }
 
         # proxy_pass/fastcgi_pass/etc settings
      }
@@ -254,6 +200,8 @@ At least the following Lua libraries and Nginx modules can be used with this ngx
 * [lua-resty-upload](https://github.com/openresty/lua-resty-upload)
 * [lua-resty-websocket](https://github.com/openresty/lua-resty-websocket)
 * [lua-resty-lock](https://github.com/openresty/lua-resty-lock)
+* [lua-resty-logger-socket](https://github.com/cloudflare/lua-resty-logger-socket)
+* [lua-resty-lrucache](https://github.com/openresty/lua-resty-lrucache)
 * [lua-resty-string](https://github.com/openresty/lua-resty-string)
 * [ngx_memc](http://github.com/openresty/memc-nginx-module)
 * [ngx_postgres](https://github.com/FRiCKLE/ngx_postgres)
@@ -295,6 +243,7 @@ Nginx Compatibility
 ===================
 The latest module is compatible with the following versions of Nginx:
 
+* 1.9.x (last tested: 1.9.3)
 * 1.7.x (last tested: 1.7.10)
 * 1.6.x
 * 1.5.x (last tested: 1.5.12)
@@ -315,7 +264,7 @@ It is highly recommended to use the [ngx_openresty bundle](http://openresty.org)
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-1. Install LuaJIT 2.0 or 2.1 (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. Install LuaJIT 2.0 or 2.1 (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](https://github.com/simpl/ngx_devel_kit/tags).
 1. Download the latest version of ngx_lua [HERE](https://github.com/openresty/lua-nginx-module/tags).
 1. Download the latest version of Nginx [HERE](http://nginx.org/) (See [Nginx Compatibility](#nginx-compatibility))
@@ -324,9 +273,9 @@ Build the source with this module:
 
 ```bash
 
- wget 'http://nginx.org/download/nginx-1.7.10.tar.gz'
- tar -xzvf nginx-1.7.10.tar.gz
- cd nginx-1.7.10/
+ wget 'http://nginx.org/download/nginx-1.9.3.tar.gz'
+ tar -xzvf nginx-1.9.3.tar.gz
+ cd nginx-1.9.3/
 
  # tell nginx's build system where to find LuaJIT 2.0:
  export LUAJIT_LIB=/path/to/luajit/lib
@@ -342,7 +291,7 @@ Build the source with this module:
 
  # Here we assume Nginx is to be installed under /opt/nginx/.
  ./configure --prefix=/opt/nginx \
-         --with-ld-opt='-Wl,-rpath,/path/to/luajit-or-lua/lib" \
+         --with-ld-opt="-Wl,-rpath,/path/to/luajit-or-lua/lib" \
          --add-module=/path/to/ngx_devel_kit \
          --add-module=/path/to/lua-nginx-module
 
@@ -753,6 +702,10 @@ There exists a work-around, however, when the original context does *not* need t
 
 Special Escaping Sequences
 --------------------------
+
+**WARNING** We no longer suffer from this pitfall since the introduction of the
+`*_by_lua_block {}` configuration directives.
+
 PCRE sequences such as `\d`, `\s`, or `\w`, require special attention because in string literals, the backslash character, `\`, is stripped out by both the Lua language parser and by the Nginx config file parser before processing. So the following snippet will not work as expected:
 
 ```nginx
@@ -881,21 +834,6 @@ phases.
 TODO
 ====
 
-* add `*_by_lua_block` directives for existing `*_by_lua` directives so that we put literal Lua code directly in curly braces instead of an nginx literal string. For example,
-```nginx
-
- content_by_lua_block {
-     ngx.say("hello, world\r\n")
- }
-```
-	which is equivalent to
-```nginx
-
- content_by_lua '
-     ngx.say("hello, world\\r\\n")
- ';
-```
-	but the former is much cleaner and nicer.
 * cosocket: implement LuaSocket's unconnected UDP API.
 * add support for implementing general TCP servers instead of HTTP servers in Lua. For example,
 ```lua
@@ -1064,22 +1002,31 @@ Directives
 * [lua_package_path](#lua_package_path)
 * [lua_package_cpath](#lua_package_cpath)
 * [init_by_lua](#init_by_lua)
+* [init_by_lua_block](#init_by_lua_block)
 * [init_by_lua_file](#init_by_lua_file)
 * [init_worker_by_lua](#init_worker_by_lua)
+* [init_worker_by_lua_block](#init_worker_by_lua_block)
 * [init_worker_by_lua_file](#init_worker_by_lua_file)
 * [set_by_lua](#set_by_lua)
+* [set_by_lua_block](#set_by_lua_block)
 * [set_by_lua_file](#set_by_lua_file)
 * [content_by_lua](#content_by_lua)
+* [content_by_lua_block](#content_by_lua_block)
 * [content_by_lua_file](#content_by_lua_file)
 * [rewrite_by_lua](#rewrite_by_lua)
+* [rewrite_by_lua_block](#rewrite_by_lua_block)
 * [rewrite_by_lua_file](#rewrite_by_lua_file)
 * [access_by_lua](#access_by_lua)
+* [access_by_lua_block](#access_by_lua_block)
 * [access_by_lua_file](#access_by_lua_file)
 * [header_filter_by_lua](#header_filter_by_lua)
+* [header_filter_by_lua_block](#header_filter_by_lua_block)
 * [header_filter_by_lua_file](#header_filter_by_lua_file)
 * [body_filter_by_lua](#body_filter_by_lua)
+* [body_filter_by_lua_block](#body_filter_by_lua_block)
 * [body_filter_by_lua_file](#body_filter_by_lua_file)
 * [log_by_lua](#log_by_lua)
+* [log_by_lua_block](#log_by_lua_block)
 * [log_by_lua_file](#log_by_lua_file)
 * [lua_need_request_body](#lua_need_request_body)
 * [lua_shared_dict](#lua_shared_dict)
@@ -1241,6 +1188,9 @@ init_by_lua
 
 **phase:** *loading-config*
 
+**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
+use the new [init_by_lua_block](#init_by_lua_block) directive instead.
+
 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. In case that the [lua_code_cache](#lua_code_cache) directive is turned off (default on), the `init_by_lua` handler will run upon every request because in this special mode a standalone Lua VM is always created for each request.
@@ -1302,6 +1252,33 @@ This directive was first introduced in the `v0.5.5` release.
 
 [Back to TOC](#directives)
 
+init_by_lua_block
+-----------------
+
+**syntax:** *init_by_lua_block { lua-script }*
+
+**context:** *http*
+
+**phase:** *loading-config*
+
+Similar to the [init_by_lua](#init_by_lua) directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+```nginx
+
+ init_by_lua_block {
+     print("I need no extra escaping here, for example: \r\nblah")
+ }
+```
+
+This directive was first introduced in the `v0.9.17` release.
+
+[Back to TOC](#directives)
+
 init_by_lua_file
 ----------------
 
@@ -1328,9 +1305,11 @@ init_worker_by_lua
 
 **phase:** *starting-worker*
 
+**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*; use the new [init_worker_by_lua_block](#init_worker_by_lua_block) directive instead.
+
 Runs the specified Lua code upon every Nginx worker process's startup when the master process is enabled. When the master process is disabled, this hook will just run after [init_by_lua*](#init_by_lua).
 
-This hook is often used to create per-worker reoccurring timers (via the [ngx.timer.at](#ngxtimerat) Lua API), either for backend healthcheck or other timed routine work. Below is an example,
+This hook is often used to create per-worker reoccurring timers (via the [ngx.timer.at](#ngxtimerat) Lua API), either for backend health-check or other timed routine work. Below is an example,
 
 ```nginx
 
@@ -1364,6 +1343,33 @@ This directive was first introduced in the `v0.9.5` release.
 
 [Back to TOC](#directives)
 
+init_worker_by_lua_block
+------------------------
+
+**syntax:** *init_worker_by_lua_block { lua-script }*
+
+**context:** *http*
+
+**phase:** *starting-worker*
+
+Similar to the [init_worker_by_lua](#init_worker_by_lua) directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+```nginx
+
+ init_worker_by_lua_block {
+     print("I need no extra escaping here, for example: \r\nblah")
+ }
+```
+
+This directive was first introduced in the `v0.9.17` release.
+
+[Back to TOC](#directives)
+
 init_worker_by_lua_file
 -----------------------
 
@@ -1388,7 +1394,9 @@ set_by_lua
 
 **phase:** *rewrite*
 
-Executes code specified in `<lua-script-str>` with optional input arguments `$arg1 $arg2 ...`, and returns string output to `$res`. 
+**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*; use the new [set_by_lua_block](#set_by_lua_block) directive instead.
+
+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](#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.
@@ -1398,7 +1406,7 @@ This directive is implemented by injecting custom commands into the standard [ng
 At least the following API functions are currently disabled within the context of `set_by_lua`:
 
 * Output API functions (e.g., [ngx.say](#ngxsay) and [ngx.send_headers](#ngxsend_headers))
-* Control API functions (e.g., [ngx.exit](#ngxexit)) 
+* Control API functions (e.g., [ngx.exit](#ngxexit))
 * Subrequest API functions (e.g., [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi))
 * Cosocket API functions (e.g., [ngx.socket.tcp](#ngxsockettcp) and [ngx.req.socket](#ngxreqsocket)).
 * Sleeping API function [ngx.sleep](#ngxsleep).
@@ -1428,7 +1436,7 @@ This directive can be freely mixed with all directives of the [ngx_http_rewrite_
 ```nginx
 
  set $foo 32;
- set_by_lua $bar 'tonumber(ngx.var.foo) + 1';
+ set_by_lua $bar 'return tonumber(ngx.var.foo) + 1';
  set $baz "bar: $bar";  # $baz == "bar: 33"
 ```
 
@@ -1438,6 +1446,36 @@ This directive requires the [ngx_devel_kit](https://github.com/simpl/ngx_devel_k
 
 [Back to TOC](#directives)
 
+set_by_lua_block
+----------------
+
+**syntax:** *set_by_lua_block $res { lua-script }*
+
+**context:** *server, server if, location, location if*
+
+**phase:** *rewrite*
+
+Similar to the [set_by_lua](#set_by_lua) directive except that
+
+1. this directive inlines the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping), and
+1. this directive does not support extra arguments after the Lua script as in [set_by_lua](#set_by_lua).
+
+For example,
+
+```nginx
+
+ set_by_lua_block $res { return 32 + math.cos(32) }
+ # $res now has the value "32.834223360507" or alike.
+```
+
+No special escaping is required in the Lua code block.
+
+This directive was first introduced in the `v0.9.17` release.
+
+[Back to TOC](#directives)
+
 set_by_lua_file
 ---------------
 **syntax:** *set_by_lua_file $res &lt;path-to-lua-script-file&gt; [$arg1 $arg2 ...]*
@@ -1470,6 +1508,9 @@ content_by_lua
 
 **phase:** *content*
 
+**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
+use the new [content_by_lua_block](#content_by_lua_block) directive instead.
+
 Acts as a "content handler" and executes Lua code string specified in `<lua-script-str>` for every request. 
 The Lua code may make [API calls](#nginx-api-for-lua) and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
 
@@ -1477,6 +1518,33 @@ Do not use this directive and other content handler directives in the same locat
 
 [Back to TOC](#directives)
 
+content_by_lua_block
+--------------------
+
+**syntax:** *content_by_lua_block { lua-script }*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Similar to the [content_by_lua](#content_by_lua) directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+```nginx
+
+ content_by_lua_block {
+     ngx.say("I need no extra escaping here, for example: \r\nblah")
+ }
+```
+
+This directive was first introduced in the `v0.9.17` release.
+
+[Back to TOC](#directives)
+
 content_by_lua_file
 -------------------
 
@@ -1522,6 +1590,9 @@ rewrite_by_lua
 
 **phase:** *rewrite tail*
 
+**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
+use the new [rewrite_by_lua_block](#rewrite_by_lua_block) directive instead.
+
 Acts as a rewrite phase handler and executes Lua code string specified in `<lua-script-str>` for every request.
 The Lua code may make [API calls](#nginx-api-for-lua) and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
 
@@ -1637,6 +1708,33 @@ The `rewrite_by_lua` code will always run at the end of the `rewrite` request-pr
 
 [Back to TOC](#directives)
 
+rewrite_by_lua_block
+--------------------
+
+**syntax:** *rewrite_by_lua_block { lua-script }*
+
+**context:** *http, server, location, location if*
+
+**phase:** *rewrite tail*
+
+Similar to the [rewrite_by_lua](#rewrite_by_lua) directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+```nginx
+
+ rewrite_by_lua_block {
+     do_something("hello, world!\nhiya\n")
+ }
+```
+
+This directive was first introduced in the `v0.9.17` release.
+
+[Back to TOC](#directives)
+
 rewrite_by_lua_file
 -------------------
 
@@ -1669,6 +1767,9 @@ access_by_lua
 
 **phase:** *access tail*
 
+**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
+use the new [access_by_lua_block](#access_by_lua_block) directive instead.
+
 Acts as an access phase handler and executes Lua code string specified in `<lua-script-str>` for every request.
 The Lua code may make [API calls](#nginx-api-for-lua) and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
 
@@ -1733,6 +1834,33 @@ Note that when calling `ngx.exit(ngx.OK)` within a [access_by_lua](#access_by_lu
 
 [Back to TOC](#directives)
 
+access_by_lua_block
+-------------------
+
+**syntax:** *access_by_lua_block { lua-script }*
+
+**context:** *http, server, location, location if*
+
+**phase:** *access tail*
+
+Similar to the [access_by_lua](#access_by_lua) directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+```nginx
+
+ access_by_lua_block {
+     do_something("hello, world!\nhiya\n")
+ }
+```
+
+This directive was first introduced in the `v0.9.17` release.
+
+[Back to TOC](#directives)
+
 access_by_lua_file
 ------------------
 
@@ -1765,12 +1893,15 @@ header_filter_by_lua
 
 **phase:** *output-header-filter*
 
+**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
+use the new [header_filter_by_lua_block](#header_filter_by_lua_block) directive instead.
+
 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](#ngxsay) and [ngx.send_headers](#ngxsend_headers))
-* Control API functions (e.g., [ngx.exit](#ngxexit) and [ngx.exec](#ngxexec))
+* Control API functions (e.g., [ngx.redirect](#ngxredirect) and [ngx.exec](#ngxexec))
 * Subrequest API functions (e.g., [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi))
 * Cosocket API functions (e.g., [ngx.socket.tcp](#ngxsockettcp) and [ngx.req.socket](#ngxreqsocket)).
 
@@ -1788,6 +1919,33 @@ This directive was first introduced in the `v0.2.1rc20` release.
 
 [Back to TOC](#directives)
 
+header_filter_by_lua_block
+--------------------------
+
+**syntax:** *header_filter_by_lua_block { lua-script }*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+Similar to the [header_filter_by_lua](#header_filter_by_lua) directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+```nginx
+
+ header_filter_by_lua_block {
+     ngx.header["content-length"] = nil
+ }
+```
+
+This directive was first introduced in the `v0.9.17` release.
+
+[Back to TOC](#directives)
+
 header_filter_by_lua_file
 -------------------------
 
@@ -1814,6 +1972,9 @@ body_filter_by_lua
 
 **phase:** *output-body-filter*
 
+**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
+use the new [body_filter_by_lua_block](#body_filter_by_lua_block) directive instead.
+
 Uses Lua code specified in `<lua-script-str>` to define an output body filter.
 
 The input data chunk is passed via [ngx.arg](#ngxarg)\[1\] (as a Lua string value) and the "eof" flag indicating the end of the response body data stream is passed via [ngx.arg](#ngxarg)\[2\] (as a Lua boolean value).
@@ -1895,6 +2056,33 @@ This directive was first introduced in the `v0.5.0rc32` release.
 
 [Back to TOC](#directives)
 
+body_filter_by_lua_block
+------------------------
+
+**syntax:** *body_filter_by_lua_block { lua-script-str }*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-body-filter*
+
+Similar to the [body_filter_by_lua](#body_filter_by_lua) directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+```nginx
+
+ body_filter_by_lua_block {
+     local data, eof = ngx.arg[1], ngx.arg[2]
+ }
+```
+
+This directive was first introduced in the `v0.9.17` release.
+
+[Back to TOC](#directives)
+
 body_filter_by_lua_file
 -----------------------
 
@@ -1921,7 +2109,10 @@ log_by_lua
 
 **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.
+**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
+use the new [log_by_lua_block](#log_by_lua_block) directive instead.
+
+Runs 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:
 
@@ -1977,6 +2168,33 @@ This directive was first introduced in the `v0.5.0rc31` release.
 
 [Back to TOC](#directives)
 
+log_by_lua_block
+----------------
+
+**syntax:** *log_by_lua_block { lua-script }*
+
+**context:** *http, server, location, location if*
+
+**phase:** *log*
+
+Similar to the [log_by_lua](#log_by_lua) directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+```nginx
+
+ log_by_lua_block {
+     print("I need no extra escaping here, for example: \r\nblah")
+ }
+```
+
+This directive was first introduced in the `v0.9.17` release.
+
+[Back to TOC](#directives)
+
 log_by_lua_file
 ---------------
 
@@ -2637,7 +2855,7 @@ many others are not, like `$query_string`, `$arg_PARAMETER`, and `$http_NAME`.
 Nginx regex group capturing variables `$1`, `$2`, `$3`, and etc, can be read by this
 interface as well, by writing `ngx.var[1]`, `ngx.var[2]`, `ngx.var[3]`, and etc.
 
-Setting `ngx.var.Foo` to a `nil` value will unset the `$Foo` Nginx variable. 
+Setting `ngx.var.Foo` to a `nil` value will unset the `$Foo` Nginx variable.
 
 ```lua
 
@@ -2654,6 +2872,8 @@ Setting `ngx.var.Foo` to a `nil` value will unset the `$Foo` Nginx variable.
 
 to prevent (temporary) memory leaking within the current request's lifetime. Another way of caching the result is to use the [ngx.ctx](#ngxctx) table.
 
+Undefined NGINX variables are evaluated to `nil` while uninitialized (but defined) NGINX variables are evaluated to an empty Lua string.
+
 This API requires a relatively expensive metamethod call and it is recommended to avoid using it on hot code paths.
 
 [Back to TOC](#nginx-api-for-lua)
@@ -2912,7 +3132,7 @@ Here is a basic example:
  res = ngx.location.capture(uri)
 ```
 
-Returns a Lua table with three slots (`res.status`, `res.header`, `res.body`, and `res.truncated`).
+Returns a Lua table with 4 slots: `res.status`, `res.header`, `res.body`, and `res.truncated`.
 
 `res.status` holds the response status code for the subrequest response.
 
@@ -3502,7 +3722,7 @@ ngx.req.set_method
 
 **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-method-constants) are supported, like `ngx.HTTP_POST` and `ngx.HTTP_GET`.
+Overrides the current request's request method with the `method_id` argument. Currently only numerical [method constants](#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.
 
@@ -3559,7 +3779,7 @@ or equivalently,
  ngx.req.set_uri("/foo")
 ```
 
-The `jump` can only be set to `true` in [rewrite_by_lua](#rewrite_by_lua) and [rewrite_by_lua_file](#rewrite_by_lua_file). Use of jump in other contexts is prohibited and will throw out a Lua exception.
+The `jump` argument can only be set to `true` in [rewrite_by_lua](#rewrite_by_lua) and [rewrite_by_lua_file](#rewrite_by_lua_file). Use of jump in other contexts is prohibited and will throw out a Lua exception.
 
 A more sophisticated example involving regex substitutions is as follows
 
@@ -3567,7 +3787,7 @@ A more sophisticated example involving regex substitutions is as follows
 
  location /test {
      rewrite_by_lua '
-         local uri = ngx.re.sub(ngx.var.uri, "^/test/(.*)", "$1", "o")
+         local uri = ngx.re.sub(ngx.var.uri, "^/test/(.*)", "/$1", "o")
          ngx.req.set_uri(uri)
      ';
      proxy_pass http://my_backend;
@@ -3808,7 +4028,7 @@ will yield:
  a b: 1a 2
 ```
 
-Arguments without the `=<value>` parts are treated as boolean arguments. `GET /test?foo&bar` will yield:
+Arguments without the `=<value>` parts are treated as boolean arguments. `POST /test` with the request body `foo&bar` will yield:
 
 ```bash
 
@@ -3893,14 +4113,14 @@ However, the optional `max_headers` function argument can be used to override th
 
 ```lua
 
- local args = ngx.req.get_headers(10)
+ local headers = ngx.req.get_headers(10)
 ```
 
 This argument can be set to zero to remove the limit and to process all request headers received:
 
 ```lua
 
- local args = ngx.req.get_headers(0)
+ local headers = ngx.req.get_headers(0)
 ```
 
 Removing the `max_headers` cap is strongly discouraged.
diff --git a/debian/modules/nginx-lua/config b/debian/modules/nginx-lua/config
index 28b4078..4b770d7 100644
--- a/debian/modules/nginx-lua/config
+++ b/debian/modules/nginx-lua/config
@@ -14,32 +14,77 @@ ngx_lua_opt_L=
 if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
     # explicitly set LuaJIT paths
 
-    # attempt to link with -ldl, static linking on Linux requires it.
-    ngx_feature="LuaJIT library in $LUAJIT_LIB and $LUAJIT_INC (specified by the LUAJIT_LIB and LUAJIT_INC env, with -ldl)"
-    ngx_feature_path="$LUAJIT_INC"
-    ngx_lua_opt_I="-I$LUAJIT_INC"
-    ngx_lua_opt_L="-L$LUAJIT_LIB"
-    if [ $NGX_RPATH = YES ]; then
-        ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lm -ldl"
-    else
-        ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lm -ldl"
-    fi
-
-    . auto/feature
-
-    if [ $ngx_found = no ]; then
-        # retry without -ldl
-        ngx_feature="LuaJIT library in $LUAJIT_LIB and $LUAJIT_INC (specified by the LUAJIT_LIB and LUAJIT_INC env)"
+    if [ "$NGX_PLATFORM" = win32 ]; then
+        ngx_feature="LuaJIT library in $LUAJIT_LIB and $LUAJIT_INC (win32)"
         ngx_feature_path="$LUAJIT_INC"
         ngx_lua_opt_I="-I$LUAJIT_INC"
         ngx_lua_opt_L="-L$LUAJIT_LIB"
+
+        # ensure that our -I$LUAJIT_INC and -L$LUAJIT_LIB is at the first.
+        SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+        CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
+        SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
+        NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
+
+        # LuaJIT's win32 build uses the library file name lua51.dll.
+        ngx_feature_libs="$ngx_lua_opt_L -llua51"
+
+        . auto/feature
+
+        # clean up
+        CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+        NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
+    else
+
+        # attempt to link with -ldl, static linking on Linux requires it.
+        ngx_feature="LuaJIT library in $LUAJIT_LIB and $LUAJIT_INC (specified by the LUAJIT_LIB and LUAJIT_INC env, with -ldl)"
+        ngx_feature_path="$LUAJIT_INC"
+        ngx_lua_opt_I="-I$LUAJIT_INC"
+        ngx_lua_opt_L="-L$LUAJIT_LIB"
+
+        # ensure that our -I$LUAJIT_INC and -L$LUAJIT_LIB is at the first.
+        SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+        CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
+        SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
+        NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
+
         if [ $NGX_RPATH = YES ]; then
-            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lm"
+            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lm -ldl"
         else
-            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lm"
+            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lm -ldl"
         fi
 
         . auto/feature
+
+        # clean up
+        CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+        NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
+
+        if [ $ngx_found = no ]; then
+            # retry without -ldl
+            ngx_feature="LuaJIT library in $LUAJIT_LIB and $LUAJIT_INC (specified by the LUAJIT_LIB and LUAJIT_INC env)"
+            ngx_feature_path="$LUAJIT_INC"
+            ngx_lua_opt_I="-I$LUAJIT_INC"
+            ngx_lua_opt_L="-L$LUAJIT_LIB"
+
+            # ensure that our -I$LUAJIT_INC and -L$LUAJIT_LIB is at the first.
+            SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+            CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
+            SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
+            NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
+
+            if [ $NGX_RPATH = YES ]; then
+                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lm"
+            else
+                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lm"
+            fi
+
+            . auto/feature
+
+            # clean up
+            CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+            NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
+        fi
     fi
 
     if [ $ngx_found = no ]; then
@@ -72,6 +117,13 @@ else
         ngx_feature_path="$LUA_INC"
         ngx_lua_opt_I="-I$LUA_INC"
         ngx_lua_opt_L="-L$LUA_LIB"
+
+        # ensure that our -I$LUA_INC and -L$LUA_LIB is at the first.
+        SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+        CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
+        SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
+        NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
+
         if [ $NGX_RPATH = YES ]; then
             ngx_feature_libs="-R$LUA_LIB $ngx_lua_opt_L -llua -lm -ldl"
         else
@@ -80,12 +132,23 @@ else
 
         . auto/feature
 
+        # clean up
+        CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+        NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
+
         if [ $ngx_found = no ]; then
             # retry without -ldl
 
             ngx_feature_path="$LUA_INC"
             ngx_lua_opt_I="-I$LUA_INC"
             ngx_lua_opt_L="-L$LUA_LIB"
+
+            # ensure that our -I$LUA_INC and -L$LUA_LIB is at the first.
+            SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+            CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
+            SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
+            NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
+
             if [ $NGX_RPATH = YES ]; then
                 ngx_feature_libs="-R$LUA_LIB $ngx_lua_opt_L -llua -lm"
             else
@@ -93,6 +156,10 @@ else
             fi
 
             . auto/feature
+
+            # clean up
+            CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+            NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
         fi
 
         if [ $ngx_found = no ]; then
@@ -283,6 +350,7 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
                 $ngx_addon_dir/src/ngx_http_lua_timer.c \
                 $ngx_addon_dir/src/ngx_http_lua_config.c \
                 $ngx_addon_dir/src/ngx_http_lua_worker.c \
+                $ngx_addon_dir/src/ngx_http_lua_lex.c \
                 "
 
 NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
@@ -336,6 +404,7 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
                 $ngx_addon_dir/src/ngx_http_lua_timer.h \
                 $ngx_addon_dir/src/ngx_http_lua_config.h \
                 $ngx_addon_dir/src/ngx_http_lua_worker.h \
+                $ngx_addon_dir/src/ngx_http_lua_lex.h \
                 "
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
index 7e72449..3726509 100644
--- a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
@@ -1,6 +1,6 @@
 = Name =
 
-ngx_lua - Embed the power of Lua into Nginx
+ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
 ''This module is not distributed with the Nginx source.'' See [[#Installation|the installation instructions]].
 
@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.9.16] released on 22 June 2015.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.9.19] released on 11 November 2015.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -21,42 +21,13 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
     lua_package_cpath '/bar/baz/?.so;/blah/blah/?.so;;';
  
     server {
-        location /inline_concat {
-            # MIME type determined by default_type:
-            default_type 'text/plain';
- 
-            set $a "hello";
-            set $b "world";
-            # inline Lua script
-            set_by_lua $res "return ngx.arg[1]..ngx.arg[2]" $a $b;
-            echo $res;
-        }
- 
-        location /rel_file_concat {
-            set $a "foo";
-            set $b "bar";
-            # script path relative to nginx prefix
-            # $ngx_prefix/conf/concat.lua contents:
-            #
-            #    return ngx.arg[1]..ngx.arg[2]
-            #
-            set_by_lua_file $res conf/concat.lua $a $b;
-            echo $res;
-        }
- 
-        location /abs_file_concat {
-            set $a "fee";
-            set $b "baz";
-            # absolute script path not modified
-            set_by_lua_file $res /usr/nginx/conf/concat.lua $a $b;
-            echo $res;
-        }
- 
         location /lua_content {
             # MIME type determined by default_type:
             default_type 'text/plain';
  
-            content_by_lua "ngx.say('Hello,world!')";
+            content_by_lua_block {
+                ngx.say('Hello,world!')
+            }
         }
  
         location /nginx_var {
@@ -64,84 +35,61 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
             default_type 'text/plain';
  
             # try access /nginx_var?a=hello,world
-            content_by_lua "ngx.print(ngx.var['arg_a'], '\\n')";
+            content_by_lua_block {
+                ngx.say(ngx.var.arg_a)
+            }
         }
  
-        location /request_body {
-             # force reading request body (default off)
-             lua_need_request_body on;
-             client_max_body_size 50k;
-             client_body_buffer_size 50k;
+        location = /request_body {
+            client_max_body_size 50k;
+            client_body_buffer_size 50k;
  
-             content_by_lua 'ngx.print(ngx.var.request_body)';
+            content_by_lua_block {
+                ngx.req.read_body()  -- explicitly read the req body
+                local data = ngx.req.get_body_data()
+                if data then
+                    ngx.say("body data:")
+                    ngx.print(data)
+                    return
+                end
+
+                -- body may get buffered in a temp file:
+                local file = ngx.req.get_body_file()
+                if file then
+                    ngx.say("body is in file ", file)
+                else
+                    ngx.say("no body found")
+                end
+            }
         }
  
         # transparent non-blocking I/O in Lua via subrequests
-        location /lua {
+        # (well, a better way is to use cosockets)
+        location = /lua {
             # MIME type determined by default_type:
             default_type 'text/plain';
  
-            content_by_lua '
+            content_by_lua_block {
                 local res = ngx.location.capture("/some_other_location")
-                if res.status == 200 then
+                if res then
+                    ngx.say("status: ", res.status)
+                    ngx.say("body:")
                     ngx.print(res.body)
                 end';
+            }
         }
  
-        # GET /recur?num=5
-        location /recur {
-            # MIME type determined by default_type:
-            default_type 'text/plain';
- 
-            content_by_lua '
-               local num = tonumber(ngx.var.arg_num) or 0
-
-               if num > 50 then
-                   ngx.say("num too big")
-                   return
-               end
-
-               ngx.say("num is: ", num)
- 
-               if num > 0 then
-                   res = ngx.location.capture("/recur?num=" .. tostring(num - 1))
-                   ngx.print("status=", res.status, " ")
-                   ngx.print("body=", res.body)
-               else
-                   ngx.say("end")
-               end
-               ';
-        }
- 
-        location /foo {
-            rewrite_by_lua '
+        location = /foo {
+            rewrite_by_lua_block {
                 res = ngx.location.capture("/memc",
                     { args = { cmd = "incr", key = ngx.var.uri } }
                 )
-            ';
+            }
  
             proxy_pass http://blah.blah.com;
         }
  
-        location /blah {
-            access_by_lua '
-                local res = ngx.location.capture("/auth")
- 
-                if res.status == ngx.HTTP_OK then
-                    return
-                end
- 
-                if res.status == ngx.HTTP_FORBIDDEN then
-                    ngx.exit(res.status)
-                end
- 
-                ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-            ';
- 
-            # proxy_pass/fastcgi_pass/postgres_pass/...
-        }
- 
-        location /mixed {
+        location = /mixed {
             rewrite_by_lua_file /path/to/rewrite.lua;
             access_by_lua_file /path/to/access.lua;
             content_by_lua_file /path/to/content.lua;
@@ -156,26 +104,24 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
         }
  
         location / {
-           lua_need_request_body on;
- 
            client_max_body_size 100k;
            client_body_buffer_size 100k;
  
-           access_by_lua '
+           access_by_lua_block {
                -- 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
  
-               -- check if the request body contains bad words
-               if ngx.var.request_body and
-                        string.match(ngx.var.request_body, "fsck")
+               -- check if the URI contains bad words
+               if ngx.var.uri and
+                      string.match(ngx.var.request_body, "evil")
                then
                    return ngx.redirect("/terms_of_use.html")
                end
  
                -- tests passed
-           ';
+           }
  
            # proxy_pass/fastcgi_pass/etc settings
         }
@@ -198,6 +144,8 @@ At least the following Lua libraries and Nginx modules can be used with this ngx
 * [https://github.com/openresty/lua-resty-upload lua-resty-upload]
 * [https://github.com/openresty/lua-resty-websocket lua-resty-websocket]
 * [https://github.com/openresty/lua-resty-lock lua-resty-lock]
+* [https://github.com/cloudflare/lua-resty-logger-socket lua-resty-logger-socket]
+* [https://github.com/openresty/lua-resty-lrucache lua-resty-lrucache]
 * [https://github.com/openresty/lua-resty-string lua-resty-string]
 * [[HttpMemcModule|ngx_memc]]
 * [https://github.com/FRiCKLE/ngx_postgres ngx_postgres]
@@ -233,6 +181,7 @@ The Lua state (Lua VM instance) is shared across all the requests handled by a s
 = Nginx Compatibility =
 The latest module is compatible with the following versions of Nginx:
 
+* 1.9.x (last tested: 1.9.3)
 * 1.7.x (last tested: 1.7.10)
 * 1.6.x
 * 1.5.x (last tested: 1.5.12)
@@ -250,7 +199,7 @@ It is highly recommended to use the [http://openresty.org ngx_openresty bundle]
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-# Install LuaJIT 2.0 or 2.1 (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.
+# Install LuaJIT 2.0 or 2.1 (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 [https://github.com/simpl/ngx_devel_kit/tags HERE].
 # Download the latest version of ngx_lua [https://github.com/openresty/lua-nginx-module/tags HERE].
 # Download the latest version of Nginx [http://nginx.org/ HERE] (See [[#Nginx Compatibility|Nginx Compatibility]])
@@ -258,9 +207,9 @@ Alternatively, ngx_lua can be manually compiled into Nginx:
 Build the source with this module:
 
 <geshi lang="bash">
-    wget 'http://nginx.org/download/nginx-1.7.10.tar.gz'
-    tar -xzvf nginx-1.7.10.tar.gz
-    cd nginx-1.7.10/
+    wget 'http://nginx.org/download/nginx-1.9.3.tar.gz'
+    tar -xzvf nginx-1.9.3.tar.gz
+    cd nginx-1.9.3/
 
     # tell nginx's build system where to find LuaJIT 2.0:
     export LUAJIT_LIB=/path/to/luajit/lib
@@ -276,7 +225,7 @@ Build the source with this module:
  
     # Here we assume Nginx is to be installed under /opt/nginx/.
     ./configure --prefix=/opt/nginx \
-            --with-ld-opt='-Wl,-rpath,/path/to/luajit-or-lua/lib" \
+            --with-ld-opt="-Wl,-rpath,/path/to/luajit-or-lua/lib" \
             --add-module=/path/to/ngx_devel_kit \
             --add-module=/path/to/lua-nginx-module
  
@@ -610,6 +559,10 @@ The cosockets are currently also disabled in the [[#init_by_lua|init_by_lua*]] a
 There exists a work-around, however, when the original context does *not* need to wait for the cosocket results. That is, creating a 0-delay timer via the [[#ngx.timer.at|ngx.timer.at]] API and do the cosocket results in the timer handler, which runs asynchronously as to the original context creating the timer.
 
 == Special Escaping Sequences ==
+
+'''WARNING''' We no longer suffer from this pitfall since the introduction of the
+<code>*_by_lua_block {}</code> configuration directives.
+
 PCRE sequences such as <code>\d</code>, <code>\s</code>, or <code>\w</code>, require special attention because in string literals, the backslash character, <code>\</code>, is stripped out by both the Lua language parser and by the Nginx config file parser before processing. So the following snippet will not work as expected:
 
 <geshi lang="nginx">
@@ -720,19 +673,6 @@ phases.
 
 = TODO =
 
-* add <code>*_by_lua_block</code> directives for existing <code>*_by_lua</code> directives so that we put literal Lua code directly in curly braces instead of an nginx literal string. For example,
-<geshi lang="nginx">
-    content_by_lua_block {
-        ngx.say("hello, world\r\n")
-    }
-</geshi>
-: which is equivalent to
-<geshi lang="nginx">
-    content_by_lua '
-        ngx.say("hello, world\\r\\n")
-    ';
-</geshi>
-: but the former is much cleaner and nicer.
 * cosocket: implement LuaSocket's unconnected UDP API.
 * add support for implementing general TCP servers instead of HTTP servers in Lua. For example,
 <geshi lang="lua">
@@ -995,6 +935,9 @@ As from the <code>v0.5.0rc29</code> release, the special notation <code>$prefix<
 
 '''phase:''' ''loading-config''
 
+'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
+use the new [[#init_by_lua_block|init_by_lua_block]] directive instead.
+
 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. In case that the [[#lua_code_cache|lua_code_cache]] directive is turned off (default on), the <code>init_by_lua</code> handler will run upon every request because in this special mode a standalone Lua VM is always created for each request.
@@ -1052,6 +995,29 @@ You should be very careful about potential security vulnerabilities in your Lua
 
 This directive was first introduced in the <code>v0.5.5</code> release.
 
+== init_by_lua_block ==
+
+'''syntax:''' ''init_by_lua_block { lua-script }''
+
+'''context:''' ''http''
+
+'''phase:''' ''loading-config''
+
+Similar to the [[#init_by_lua|init_by_lua]] directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+<geshi lang="nginx">
+    init_by_lua_block {
+        print("I need no extra escaping here, for example: \r\nblah")
+    }
+</geshi>
+
+This directive was first introduced in the <code>v0.9.17</code> release.
+
 == init_by_lua_file ==
 
 '''syntax:''' ''init_by_lua_file <path-to-lua-script-file>''
@@ -1074,9 +1040,11 @@ This directive was first introduced in the <code>v0.5.5</code> release.
 
 '''phase:''' ''starting-worker''
 
+'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged''; use the new [[#init_worker_by_lua_block|init_worker_by_lua_block]] directive instead.
+
 Runs the specified Lua code upon every Nginx worker process's startup when the master process is enabled. When the master process is disabled, this hook will just run after [[#init_by_lua|init_by_lua*]].
 
-This hook is often used to create per-worker reoccurring timers (via the [[#ngx.timer.at|ngx.timer.at]] Lua API), either for backend healthcheck or other timed routine work. Below is an example,
+This hook is often used to create per-worker reoccurring timers (via the [[#ngx.timer.at|ngx.timer.at]] Lua API), either for backend health-check or other timed routine work. Below is an example,
 
 <geshi lang="nginx">
     init_worker_by_lua '
@@ -1107,6 +1075,29 @@ This hook is often used to create per-worker reoccurring timers (via the [[#ngx.
 
 This directive was first introduced in the <code>v0.9.5</code> release.
 
+== init_worker_by_lua_block ==
+
+'''syntax:''' ''init_worker_by_lua_block { lua-script }''
+
+'''context:''' ''http''
+
+'''phase:''' ''starting-worker''
+
+Similar to the [[#init_worker_by_lua|init_worker_by_lua]] directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+<geshi lang="nginx">
+    init_worker_by_lua_block {
+        print("I need no extra escaping here, for example: \r\nblah")
+    }
+</geshi>
+
+This directive was first introduced in the <code>v0.9.17</code> release.
+
 == init_worker_by_lua_file ==
 
 '''syntax:''' ''init_worker_by_lua_file <lua-file-path>''
@@ -1127,7 +1118,9 @@ This directive was first introduced in the <code>v0.9.5</code> release.
 
 '''phase:''' ''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>. 
+'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged''; use the new [[#set_by_lua_block|set_by_lua_block]] directive instead.
+
+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.
@@ -1137,7 +1130,7 @@ This directive is implemented by injecting custom commands into the standard [[H
 At least the following API functions are currently disabled within the context of <code>set_by_lua</code>:
 
 * 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]])
 * 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]]).
 * Sleeping API function [[#ngx.sleep|ngx.sleep]].
@@ -1165,7 +1158,7 @@ This directive can be freely mixed with all directives of the [[HttpRewriteModul
 
 <geshi lang="nginx">
     set $foo 32;
-    set_by_lua $bar 'tonumber(ngx.var.foo) + 1';
+    set_by_lua $bar 'return tonumber(ngx.var.foo) + 1';
     set $baz "bar: $bar";  # $baz == "bar: 33"
 </geshi>
 
@@ -1173,6 +1166,32 @@ As from the <code>v0.5.0rc29</code> release, Nginx variable interpolation is dis
 
 This directive requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_kit] module.
 
+== set_by_lua_block ==
+
+'''syntax:''' ''set_by_lua_block $res { lua-script }''
+
+'''context:''' ''server, server if, location, location if''
+
+'''phase:''' ''rewrite''
+
+Similar to the [[#set_by_lua|set_by_lua]] directive except that
+
+# this directive inlines the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping), and
+# this directive does not support extra arguments after the Lua script as in [[#set_by_lua|set_by_lua]].
+
+For example,
+
+<geshi lang="nginx">
+    set_by_lua_block $res { return 32 + math.cos(32) }
+    # $res now has the value "32.834223360507" or alike.
+</geshi>
+
+No special escaping is required in the Lua code block.
+
+This directive was first introduced in the <code>v0.9.17</code> release.
+
 == set_by_lua_file ==
 '''syntax:''' ''set_by_lua_file $res <path-to-lua-script-file> [$arg1 $arg2 ...]''
 
@@ -1201,11 +1220,37 @@ This directive requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_ki
 
 '''phase:''' ''content''
 
+'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
+use the new [[#content_by_lua_block|content_by_lua_block]] directive instead.
+
 Acts as a "content handler" and executes Lua code string specified in <code><lua-script-str></code> for every request. 
 The Lua code may make [[#Nginx API for Lua|API calls]] and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
 
 Do not use this directive and other content handler directives in the same location. For example, this directive and the [[HttpProxyModule#proxy_pass|proxy_pass]] directive should not be used in the same location.
 
+== content_by_lua_block ==
+
+'''syntax:''' ''content_by_lua_block { lua-script }''
+
+'''context:''' ''location, location if''
+
+'''phase:''' ''content''
+
+Similar to the [[#content_by_lua|content_by_lua]] directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+<geshi lang="nginx">
+    content_by_lua_block {
+        ngx.say("I need no extra escaping here, for example: \r\nblah")
+    }
+</geshi>
+
+This directive was first introduced in the <code>v0.9.17</code> release.
+
 == content_by_lua_file ==
 
 '''syntax:''' ''content_by_lua_file <path-to-lua-script-file>''
@@ -1246,6 +1291,9 @@ But be very careful about malicious user inputs and always carefully validate or
 
 '''phase:''' ''rewrite tail''
 
+'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
+use the new [[#rewrite_by_lua_block|rewrite_by_lua_block]] directive instead.
+
 Acts as a rewrite phase handler and executes Lua code string specified in <code><lua-script-str></code> for every request.
 The Lua code may make [[#Nginx API for Lua|API calls]] and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
 
@@ -1353,6 +1401,29 @@ Here the Lua code <code>ngx.exit(503)</code> will never run. This will be the ca
 
 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_block ==
+
+'''syntax:''' ''rewrite_by_lua_block { lua-script }''
+
+'''context:''' ''http, server, location, location if''
+
+'''phase:''' ''rewrite tail''
+
+Similar to the [[#rewrite_by_lua|rewrite_by_lua]] directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+<geshi lang="nginx">
+    rewrite_by_lua_block {
+        do_something("hello, world!\nhiya\n")
+    }
+</geshi>
+
+This directive was first introduced in the <code>v0.9.17</code> release.
+
 == rewrite_by_lua_file ==
 
 '''syntax:''' ''rewrite_by_lua_file <path-to-lua-script-file>''
@@ -1381,6 +1452,9 @@ Nginx variables are supported in the file path for dynamic dispatch just as in [
 
 '''phase:''' ''access tail''
 
+'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
+use the new [[#access_by_lua_block|access_by_lua_block]] directive instead.
+
 Acts as an access phase handler and executes Lua code string specified in <code><lua-script-str></code> for every request.
 The Lua code may make [[#Nginx API for Lua|API calls]] and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
 
@@ -1440,6 +1514,29 @@ As with other access phase handlers, [[#access_by_lua|access_by_lua]] will ''not
 
 Note that when calling <code>ngx.exit(ngx.OK)</code> within a [[#access_by_lua|access_by_lua]] handler, the nginx request processing control flow will still continue to the content handler. To terminate the current request from within a [[#access_by_lua|access_by_lua]] handler, calling [[#ngx.exit|ngx.exit]] with status >= 200 (<code>ngx.HTTP_OK</code>) and status < 300 (<code>ngx.HTTP_SPECIAL_RESPONSE</code>) for successful quits and <code>ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)</code> (or its friends) for failures.
 
+== access_by_lua_block ==
+
+'''syntax:''' ''access_by_lua_block { lua-script }''
+
+'''context:''' ''http, server, location, location if''
+
+'''phase:''' ''access tail''
+
+Similar to the [[#access_by_lua|access_by_lua]] directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+<geshi lang="nginx">
+    access_by_lua_block {
+        do_something("hello, world!\nhiya\n")
+    }
+</geshi>
+
+This directive was first introduced in the <code>v0.9.17</code> release.
+
 == access_by_lua_file ==
 
 '''syntax:''' ''access_by_lua_file <path-to-lua-script-file>''
@@ -1468,12 +1565,15 @@ Nginx variables are supported in the file path for dynamic dispatch just as in [
 
 '''phase:''' ''output-header-filter''
 
+'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
+use the new [[#header_filter_by_lua_block|header_filter_by_lua_block]] directive instead.
+
 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]] and [[#ngx.exec|ngx.exec]])
+* Control API functions (e.g., [[#ngx.redirect|ngx.redirect]] 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]]).
 
@@ -1488,6 +1588,29 @@ Here is an example of overriding a response header (or adding one if absent) in
 
 This directive was first introduced in the <code>v0.2.1rc20</code> release.
 
+== header_filter_by_lua_block ==
+
+'''syntax:''' ''header_filter_by_lua_block { lua-script }''
+
+'''context:''' ''http, server, location, location if''
+
+'''phase:''' ''output-header-filter''
+
+Similar to the [[#header_filter_by_lua|header_filter_by_lua]] directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+<geshi lang="nginx">
+    header_filter_by_lua_block {
+        ngx.header["content-length"] = nil
+    }
+</geshi>
+
+This directive was first introduced in the <code>v0.9.17</code> release.
+
 == header_filter_by_lua_file ==
 
 '''syntax:''' ''header_filter_by_lua_file <path-to-lua-script-file>''
@@ -1510,6 +1633,9 @@ This directive was first introduced in the <code>v0.2.1rc20</code> release.
 
 '''phase:''' ''output-body-filter''
 
+'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
+use the new [[#body_filter_by_lua_block|body_filter_by_lua_block]] directive instead.
+
 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).
@@ -1585,6 +1711,29 @@ Nginx output filters may be called multiple times for a single request because r
 
 This directive was first introduced in the <code>v0.5.0rc32</code> release.
 
+== body_filter_by_lua_block ==
+
+'''syntax:''' ''body_filter_by_lua_block { lua-script-str }''
+
+'''context:''' ''http, server, location, location if''
+
+'''phase:''' ''output-body-filter''
+
+Similar to the [[#body_filter_by_lua|body_filter_by_lua]] directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+<geshi lang="nginx">
+    body_filter_by_lua_block {
+        local data, eof = ngx.arg[1], ngx.arg[2]
+    }
+</geshi>
+
+This directive was first introduced in the <code>v0.9.17</code> release.
+
 == body_filter_by_lua_file ==
 
 '''syntax:''' ''body_filter_by_lua_file <path-to-lua-script-file>''
@@ -1607,7 +1756,10 @@ This directive was first introduced in the <code>v0.5.0rc32</code> release.
 
 '''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.
+'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
+use the new [[#log_by_lua_block|log_by_lua_block]] directive instead.
+
+Runs 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:
 
@@ -1660,6 +1812,29 @@ Here is an example of gathering average data for [[HttpUpstreamModule#$upstream_
 
 This directive was first introduced in the <code>v0.5.0rc31</code> release.
 
+== log_by_lua_block ==
+
+'''syntax:''' ''log_by_lua_block { lua-script }''
+
+'''context:''' ''http, server, location, location if''
+
+'''phase:''' ''log''
+
+Similar to the [[#log_by_lua|log_by_lua]] directive except that this directive inlines
+the Lua source directly
+inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+special character escaping).
+
+For instance,
+
+<geshi lang="nginx">
+    log_by_lua_block {
+        print("I need no extra escaping here, for example: \r\nblah")
+    }
+</geshi>
+
+This directive was first introduced in the <code>v0.9.17</code> release.
+
 == log_by_lua_file ==
 
 '''syntax:''' ''log_by_lua_file <path-to-lua-script-file>''
@@ -2110,7 +2285,7 @@ many others are not, like <code>$query_string</code>, <code>$arg_PARAMETER</code
 Nginx regex group capturing variables <code>$1</code>, <code>$2</code>, <code>$3</code>, and etc, can be read by this
 interface as well, by writing <code>ngx.var[1]</code>, <code>ngx.var[2]</code>, <code>ngx.var[3]</code>, and etc.
 
-Setting <code>ngx.var.Foo</code> to a <code>nil</code> value will unset the <code>$Foo</code> Nginx variable. 
+Setting <code>ngx.var.Foo</code> to a <code>nil</code> value will unset the <code>$Foo</code> Nginx variable.
 
 <geshi lang="lua">
     ngx.var.args = nil
@@ -2125,6 +2300,8 @@ Setting <code>ngx.var.Foo</code> to a <code>nil</code> value will unset the <cod
 
 to prevent (temporary) memory leaking within the current request's lifetime. Another way of caching the result is to use the [[#ngx.ctx|ngx.ctx]] table.
 
+Undefined NGINX variables are evaluated to `nil` while uninitialized (but defined) NGINX variables are evaluated to an empty Lua string.
+
 This API requires a relatively expensive metamethod call and it is recommended to avoid using it on hot code paths.
 
 == Core constants ==
@@ -2349,7 +2526,7 @@ Here is a basic example:
     res = ngx.location.capture(uri)
 </geshi>
 
-Returns a Lua table with three slots (<code>res.status</code>, <code>res.header</code>, <code>res.body</code>, and <code>res.truncated</code>).
+Returns a Lua table with 4 slots: <code>res.status</code>, <code>res.header</code>, <code>res.body</code>, and <code>res.truncated</code>.
 
 <code>res.status</code> holds the response status code for the subrequest response.
 
@@ -2884,7 +3061,7 @@ See also [[#ngx.req.set_method|ngx.req.set_method]].
 
 '''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>.
+Overrides the current request's request method with the <code>method_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.
 
@@ -2933,14 +3110,14 @@ or equivalently,
     ngx.req.set_uri("/foo")
 </geshi>
 
-The <code>jump</code> can only be set to <code>true</code> in [[#rewrite_by_lua|rewrite_by_lua]] and [[#rewrite_by_lua_file|rewrite_by_lua_file]]. Use of jump in other contexts is prohibited and will throw out a Lua exception.
+The <code>jump</code> argument can only be set to <code>true</code> in [[#rewrite_by_lua|rewrite_by_lua]] and [[#rewrite_by_lua_file|rewrite_by_lua_file]]. Use of jump in other contexts is prohibited and will throw out a Lua exception.
 
 A more sophisticated example involving regex substitutions is as follows
 
 <geshi lang="nginx">
     location /test {
         rewrite_by_lua '
-            local uri = ngx.re.sub(ngx.var.uri, "^/test/(.*)", "$1", "o")
+            local uri = ngx.re.sub(ngx.var.uri, "^/test/(.*)", "/$1", "o")
             ngx.req.set_uri(uri)
         ';
         proxy_pass http://my_backend;
@@ -3151,7 +3328,7 @@ will yield:
     a b: 1a 2
 </geshi>
 
-Arguments without the <code>=<value></code> parts are treated as boolean arguments. <code>GET /test?foo&bar</code> will yield:
+Arguments without the <code>=<value></code> parts are treated as boolean arguments. <code>POST /test</code> with the request body <code>foo&bar</code> will yield:
 
 <geshi lang="bash">
     foo: true
@@ -3224,13 +3401,13 @@ Note that a maximum of 100 request headers are parsed by default (including thos
 However, the optional <code>max_headers</code> function argument can be used to override this limit:
 
 <geshi lang="lua">
-    local args = ngx.req.get_headers(10)
+    local headers = ngx.req.get_headers(10)
 </geshi>
 
 This argument can be set to zero to remove the limit and to process all request headers received:
 
 <geshi lang="lua">
-    local args = ngx.req.get_headers(0)
+    local headers = ngx.req.get_headers(0)
 </geshi>
 
 Removing the <code>max_headers</code> cap is strongly discouraged.
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 c9e3e66..962c651 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
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  9016
+#define ngx_http_lua_version  9019
 
 
 typedef struct {
diff --git a/debian/modules/nginx-lua/src/ddebug.h b/debian/modules/nginx-lua/src/ddebug.h
index d0f3d1b..f2d4b73 100644
--- a/debian/modules/nginx-lua/src/ddebug.h
+++ b/debian/modules/nginx-lua/src/ddebug.h
@@ -28,7 +28,8 @@
 
 #include <stdarg.h>
 
-static void dd(const char *fmt, ...) {
+static ngx_inline void
+dd(const char *fmt, ...) {
 }
 
 #    endif
@@ -43,7 +44,8 @@ static void dd(const char *fmt, ...) {
 
 #include <stdarg.h>
 
-static void dd(const char *fmt, ...) {
+static ngx_inline void
+dd(const char *fmt, ...) {
 }
 
 #   endif
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 dc9a12c..ae8b09f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
@@ -24,6 +24,11 @@
 #include "ngx_http_lua_initby.h"
 #include "ngx_http_lua_initworkerby.h"
 #include "ngx_http_lua_shdict.h"
+#include "ngx_http_lua_lex.h"
+
+
+typedef struct ngx_http_lua_block_parser_ctx_s
+    ngx_http_lua_block_parser_ctx_t;
 
 
 #if defined(NDK) && NDK
@@ -35,6 +40,32 @@ static ngx_int_t ngx_http_lua_set_by_lua_init(ngx_http_request_t *r);
 
 static u_char *ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag,
     size_t tag_len);
+static char *ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf,
+    ngx_command_t *cmd);
+static ngx_int_t ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
+    ngx_http_lua_block_parser_ctx_t *ctx);
+static u_char *ngx_http_lua_strlstrn(u_char *s1, u_char *last, u_char *s2,
+    size_t n);
+
+
+struct ngx_http_lua_block_parser_ctx_s {
+    ngx_uint_t  start_line;
+    int         token_len;
+};
+
+
+enum {
+    FOUND_LEFT_CURLY = 0,
+    FOUND_RIGHT_CURLY,
+    FOUND_LEFT_LBRACKET_STR,
+    FOUND_LBRACKET_STR = FOUND_LEFT_LBRACKET_STR,
+    FOUND_LEFT_LBRACKET_CMT,
+    FOUND_LBRACKET_CMT = FOUND_LEFT_LBRACKET_CMT,
+    FOUND_RIGHT_LBRACKET,
+    FOUND_COMMENT_LINE,
+    FOUND_DOUBLE_QUOTED,
+    FOUND_SINGLE_QUOTED
+};
 
 
 char *
@@ -189,6 +220,25 @@ ngx_http_lua_package_path(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
 
 #if defined(NDK) && NDK
+char *
+ngx_http_lua_set_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_set_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_set_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -372,6 +422,25 @@ ngx_http_lua_filter_set_by_lua_file(ngx_http_request_t *r, ngx_str_t *val,
 #endif /* defined(NDK) && NDK */
 
 
+char *
+ngx_http_lua_rewrite_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_rewrite_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -467,6 +536,25 @@ ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+char *
+ngx_http_lua_access_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_access_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -558,6 +646,25 @@ ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+char *
+ngx_http_lua_content_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_content_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -583,6 +690,9 @@ ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     value = cf->args->elts;
 
+    dd("value[0]: %.*s", (int) value[0].len, value[0].data);
+    dd("value[1]: %.*s", (int) value[1].len, value[1].data);
+
     if (value[1].len == 0) {
         /*  Oops...Invalid location conf */
         ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
@@ -659,6 +769,25 @@ ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+char *
+ngx_http_lua_log_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_log_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -749,6 +878,25 @@ ngx_http_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+char *
+ngx_http_lua_header_filter_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_header_filter_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_header_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
@@ -830,6 +978,25 @@ ngx_http_lua_header_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 }
 
 
+char *
+ngx_http_lua_body_filter_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_body_filter_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_body_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
@@ -912,6 +1079,25 @@ ngx_http_lua_body_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 }
 
 
+char *
+ngx_http_lua_init_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_init_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_init_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
@@ -960,6 +1146,25 @@ ngx_http_lua_init_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 }
 
 
+char *
+ngx_http_lua_init_worker_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_init_worker_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_init_worker_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
@@ -1078,4 +1283,411 @@ found:
 }
 
 
+/* a specialized version of the standard ngx_conf_parse() function */
+static char *
+ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf, ngx_command_t *cmd)
+{
+    ngx_http_lua_block_parser_ctx_t     ctx;
+
+    int               level = 1;
+    char             *rv;
+    u_char           *p;
+    size_t            len;
+    ngx_str_t        *src, *dst;
+    ngx_int_t         rc;
+    ngx_uint_t        i, start_line;
+    ngx_array_t      *saved;
+    enum {
+        parse_block = 0,
+        parse_param
+    } type;
+
+    if (cf->conf_file->file.fd != NGX_INVALID_FILE) {
+
+        type = parse_block;
+
+    } else {
+        type = parse_param;
+    }
+
+    saved = cf->args;
+
+    cf->args = ngx_array_create(cf->temp_pool, 4, sizeof(ngx_str_t));
+    if (cf->args == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ctx.token_len = 0;
+    start_line = cf->conf_file->line;
+
+    dd("init start line: %d", (int) start_line);
+
+    ctx.start_line = start_line;
+
+    for ( ;; ) {
+        rc = ngx_http_lua_conf_read_lua_token(cf, &ctx);
+
+        dd("parser start line: %d", (int) start_line);
+
+        switch (rc) {
+
+        case NGX_ERROR:
+            goto done;
+
+        case FOUND_LEFT_CURLY:
+
+            ctx.start_line = cf->conf_file->line;
+
+            if (type == parse_param) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "block directives are not supported "
+                                   "in -g option");
+                goto failed;
+            }
+
+            level++;
+            dd("seen block start: level=%d", (int) level);
+            break;
+
+        case FOUND_RIGHT_CURLY:
+
+            level--;
+            dd("seen block done: level=%d", (int) level);
+
+            if (type != parse_block || level < 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "unexpected \"}\": level %d, "
+                                   "starting at line %ui", level,
+                                   start_line);
+                goto failed;
+            }
+
+            if (level == 0) {
+                ngx_http_lua_assert(cf->handler);
+
+                src = cf->args->elts;
+
+                for (len = 0, i = 0; i < cf->args->nelts; i++) {
+                    len += src[i].len;
+                }
+
+                dd("saved nelts: %d", (int) saved->nelts);
+                dd("temp nelts: %d", (int) cf->args->nelts);
+#if 0
+                ngx_http_lua_assert(saved->nelts == 1);
+#endif
+
+                dst = ngx_array_push(saved);
+                if (dst == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+                dst->len = len;
+                dst->len--;  /* skip the trailing '}' block terminator */
+
+                p = ngx_palloc(cf->pool, len);
+                if (p == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+                dst->data = p;
+
+                for (i = 0; i < cf->args->nelts; i++) {
+                    p = ngx_copy(p, src[i].data, src[i].len);
+                }
+
+                p[-1] = '\0';  /* override the last '}' char to null */
+
+                cf->args = saved;
+
+                rv = (*cf->handler)(cf, cmd, cf->handler_conf);
+                if (rv == NGX_CONF_OK) {
+                    goto done;
+                }
+
+                if (rv == NGX_CONF_ERROR) {
+                    goto failed;
+                }
+
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, rv);
+
+                goto failed;
+            }
+
+            break;
+
+        case FOUND_LBRACKET_STR:
+
+            break;
+
+        case FOUND_LBRACKET_CMT:
+
+            break;
+
+        case FOUND_RIGHT_LBRACKET:
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "unexpected lua closing long-bracket");
+            goto failed;
+
+            break;
+
+        case FOUND_COMMENT_LINE:
+        case FOUND_DOUBLE_QUOTED:
+        case FOUND_SINGLE_QUOTED:
+            break;
+
+        default:
+
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "unknown return value from the lexer: %i", rc);
+            goto failed;
+        }
+    }
+
+failed:
+
+    rc = NGX_ERROR;
+
+done:
+
+    if (rc == NGX_ERROR) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
+    ngx_http_lua_block_parser_ctx_t *ctx)
+{
+    enum {
+        OVEC_SIZE = 2
+    };
+    int          i, rc;
+    int          ovec[OVEC_SIZE];
+    u_char      *start, *p, *q, ch;
+    off_t        file_size;
+    size_t       len, buf_size;
+    ssize_t      n, size;
+    ngx_uint_t   start_line;
+    ngx_str_t   *word;
+    ngx_buf_t   *b;
+#if nginx_version >= 1009002
+    ngx_buf_t   *dump;
+#endif
+
+    b = cf->conf_file->buffer;
+#if nginx_version >= 1009002
+    dump = cf->conf_file->dump;
+#endif
+    start = b->pos;
+    start_line = cf->conf_file->line;
+    buf_size = b->end - b->start;
+
+    dd("lexer start line: %d", (int) start_line);
+
+    file_size = ngx_file_size(&cf->conf_file->file.info);
+
+    for ( ;; ) {
+
+        if (b->pos >= b->last) {
+
+            if (cf->conf_file->file.offset >= file_size) {
+
+                cf->conf_file->line = ctx->start_line;
+
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "unexpected end of file, expecting "
+                                   "terminating characters for lua code "
+                                   "block");
+                return NGX_ERROR;
+            }
+
+            len = b->pos - start;
+
+            if (len == buf_size) {
+
+                cf->conf_file->line = start_line;
+
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "too long lua code block, probably "
+                                   "missing terminating characters");
+
+                return NGX_ERROR;
+            }
+
+            if (len) {
+                ngx_memmove(b->start, start, len);
+            }
+
+            size = (ssize_t) (file_size - cf->conf_file->file.offset);
+
+            if (size > b->end - (b->start + len)) {
+                size = b->end - (b->start + len);
+            }
+
+            n = ngx_read_file(&cf->conf_file->file, b->start + len, size,
+                              cf->conf_file->file.offset);
+
+            if (n == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (n != size) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   ngx_read_file_n " returned "
+                                   "only %z bytes instead of %z",
+                                   n, size);
+                return NGX_ERROR;
+            }
+
+            b->pos = b->start + len;
+            b->last = b->pos + n;
+            start = b->start;
+
+#if nginx_version >= 1009002
+            if (dump) {
+                dump->last = ngx_cpymem(dump->last, b->pos, size);
+            }
+#endif
+        }
+
+        rc = ngx_http_lua_lex(b->pos, b->last - b->pos, ovec);
+
+        if (rc < 0) {  /* no match */
+            cf->conf_file->line = start_line;
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "Lua code block missing the \"}\" "
+                               "character");
+
+            return NGX_ERROR;
+        }
+
+        if (rc == FOUND_LEFT_LBRACKET_STR || rc == FOUND_LEFT_LBRACKET_CMT) {
+
+            /* we update the line numbers for best error messages when the
+             * closing long bracket is missing */
+
+            for (i = 0; i < ovec[0]; i++) {
+                ch = b->pos[i];
+                if (ch == LF) {
+                    cf->conf_file->line++;
+                }
+            }
+
+            b->pos += ovec[0];
+            ovec[1] -= ovec[0];
+            ovec[0] = 0;
+
+            if (rc == FOUND_LEFT_LBRACKET_CMT) {
+                p = &b->pos[2];     /* we skip the leading "--" prefix */
+                rc = FOUND_LBRACKET_CMT;
+
+            } else {
+                p = b->pos;
+                rc = FOUND_LBRACKET_STR;
+            }
+
+            /* we temporarily rewrite [=*[ in the input buffer to ]=*] to
+             * construct the pattern for the corresponding closing long
+             * bracket without additional buffers. */
+
+            ngx_http_lua_assert(p[0] == '[');
+            p[0] = ']';
+
+            ngx_http_lua_assert(b->pos[ovec[1] - 1] == '[');
+            b->pos[ovec[1] - 1] = ']';
+
+            /* search for the corresponding closing bracket */
+
+            dd("search pattern for the closing long bracket: \"%.*s\" (len=%d)",
+               (int) (b->pos + ovec[1] - p), p, (int) (b->pos + ovec[1] - p));
+
+            q = ngx_http_lua_strlstrn(b->pos + ovec[1], b->last, p,
+                                      b->pos + ovec[1] - p - 1);
+
+            if (q == NULL) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "Lua code block missing the closing "
+                                   "long bracket \"%*s\"",
+                                   b->pos + ovec[1] - p, p);
+                return NGX_ERROR;
+            }
+
+            /* restore the original opening long bracket */
+
+            p[0] = '[';
+            b->pos[ovec[1] - 1] = '[';
+
+            ovec[1] = q - b->pos + b->pos + ovec[1] - p;
+
+            dd("found long bracket token: \"%.*s\"",
+               (int) (ovec[1] - ovec[0]), b->pos + ovec[0]);
+        }
+
+        for (i = 0; i < ovec[1]; i++) {
+            ch = b->pos[i];
+            if (ch == LF) {
+                cf->conf_file->line++;
+            }
+        }
+
+        b->pos += ovec[1];
+        ctx->token_len = ovec[1] - ovec[0];
+
+        break;
+    }
+
+    word = ngx_array_push(cf->args);
+    if (word == NULL) {
+        return NGX_ERROR;
+    }
+
+    word->data = ngx_pnalloc(cf->temp_pool, b->pos - start);
+    if (word->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    len = b->pos - start;
+    ngx_memcpy(word->data, start, len);
+    word->len = len;
+
+    return rc;
+}
+
+
+/*
+ * ngx_http_lua_strlstrn() is intended to search for static substring
+ * with known length in string until the argument last. The argument n
+ * must be length of the second substring - 1.
+ */
+
+static u_char *
+ngx_http_lua_strlstrn(u_char *s1, u_char *last, u_char *s2, size_t n)
+{
+    ngx_uint_t  c1, c2;
+
+    c2 = (ngx_uint_t) *s2++;
+    last -= n;
+
+    do {
+        do {
+            if (s1 >= last) {
+                return NULL;
+            }
+
+            c1 = (ngx_uint_t) *s1++;
+
+            dd("testing char '%c' vs '%c'", (int) c1, (int) c2);
+
+        } while (c1 != c2);
+
+        dd("testing against pattern \"%.*s\"", (int) n, s2);
+
+    } while (ngx_strncmp(s1, s2, n) != 0);
+
+    return --s1;
+}
+
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
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 5d5540c..5a8d93b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.h
@@ -17,26 +17,44 @@ 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_block(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_block(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_block(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_block(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_block(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_block(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_block(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_init_worker_by_lua_block(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
 char *ngx_http_lua_init_worker_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_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 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);
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 f2f805c..abce458 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
@@ -44,17 +44,6 @@ static ngx_int_t ngx_http_lua_rm_header_helper(ngx_list_t *l,
 
 
 static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
-
-#if (NGX_HTTP_GZIP)
-    { ngx_string("Accept-Encoding"),
-                 offsetof(ngx_http_headers_in_t, accept_encoding),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Via"),
-                 offsetof(ngx_http_headers_in_t, via),
-                 ngx_http_set_builtin_header },
-#endif
-
     { ngx_string("Host"),
                  offsetof(ngx_http_headers_in_t, host),
                  ngx_http_set_host_header },
@@ -67,6 +56,22 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
                  offsetof(ngx_http_headers_in_t, if_modified_since),
                  ngx_http_set_builtin_header },
 
+#if defined(nginx_version) && nginx_version >= 9002
+    { ngx_string("If-Unmodified-Since"),
+                 offsetof(ngx_http_headers_in_t, if_unmodified_since),
+                 ngx_http_set_builtin_header },
+#endif
+
+#if defined(nginx_version) && nginx_version >= 1003003
+    { ngx_string("If-Match"),
+                 offsetof(ngx_http_headers_in_t, if_match),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("If-None-Match"),
+                 offsetof(ngx_http_headers_in_t, if_none_match),
+                 ngx_http_set_builtin_header },
+#endif
+
     { ngx_string("User-Agent"),
                  offsetof(ngx_http_headers_in_t, user_agent),
                  ngx_http_set_user_agent_header },
@@ -75,6 +80,10 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
                  offsetof(ngx_http_headers_in_t, referer),
                  ngx_http_set_builtin_header },
 
+    { ngx_string("Content-Length"),
+                 offsetof(ngx_http_headers_in_t, content_length),
+                 ngx_http_set_content_length_header },
+
     { ngx_string("Content-Type"),
                  offsetof(ngx_http_headers_in_t, content_type),
                  ngx_http_set_builtin_header },
@@ -95,6 +104,22 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
                  offsetof(ngx_http_headers_in_t, expect),
                  ngx_http_set_builtin_header },
 
+#if defined(nginx_version) && nginx_version >= 1003013
+    { ngx_string("Upgrade"),
+                 offsetof(ngx_http_headers_in_t, upgrade),
+                 ngx_http_set_builtin_header },
+#endif
+
+#if (NGX_HTTP_GZIP)
+    { ngx_string("Accept-Encoding"),
+                 offsetof(ngx_http_headers_in_t, accept_encoding),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Via"),
+                 offsetof(ngx_http_headers_in_t, via),
+                 ngx_http_set_builtin_header },
+#endif
+
     { ngx_string("Authorization"),
                  offsetof(ngx_http_headers_in_t, authorization),
                  ngx_http_set_builtin_header },
@@ -103,20 +128,33 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
                  offsetof(ngx_http_headers_in_t, keep_alive),
                  ngx_http_set_builtin_header },
 
-    { ngx_string("Content-Length"),
-                 offsetof(ngx_http_headers_in_t, content_length),
-                 ngx_http_set_content_length_header },
-
-    { ngx_string("Cookie"),
-                 0,
-                 ngx_http_set_cookie_header },
-
 #if (NGX_HTTP_REALIP)
     { ngx_string("X-Real-IP"),
                  offsetof(ngx_http_headers_in_t, x_real_ip),
                  ngx_http_set_builtin_header },
 #endif
 
+#if (NGX_HTTP_DAV)
+    { ngx_string("Depth"),
+                 offsetof(ngx_http_headers_in_t, depth),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Destination"),
+                 offsetof(ngx_http_headers_in_t, destination),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Overwrite"),
+                 offsetof(ngx_http_headers_in_t, overwrite),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Date"), offsetof(ngx_http_headers_in_t, date),
+                 ngx_http_set_builtin_header },
+#endif
+
+    { ngx_string("Cookie"),
+                 0,
+                 ngx_http_set_cookie_header },
+
     { ngx_null_string, 0, ngx_http_set_header }
 };
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c b/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c
index 5039c27..5fd077f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c
@@ -385,7 +385,19 @@ static ngx_int_t
 ngx_http_set_content_type_header(ngx_http_request_t *r,
     ngx_http_lua_header_val_t *hv, ngx_str_t *value)
 {
+    ngx_uint_t          i;
+
     r->headers_out.content_type_len = value->len;
+
+#if 1
+    for (i = 0; i < value->len; i++) {
+        if (value->data[i] == ';') {
+            r->headers_out.content_type_len = i;
+            break;
+        }
+    }
+#endif
+
     r->headers_out.content_type = *value;
     r->headers_out.content_type_hash = hv->hash;
     r->headers_out.content_type_lowcase = NULL;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
index 6aa1a33..0876f26 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
@@ -167,6 +167,8 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
                 return NGX_ERROR;
             }
 
+            http_ctx.srv_conf[ngx_modules[i]->ctx_index] = cur;
+
             if (module->merge_srv_conf) {
                 prev = module->create_srv_conf(&conf);
                 if (prev == NULL) {
@@ -178,8 +180,6 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
                     goto failed;
                 }
             }
-
-            http_ctx.srv_conf[ngx_modules[i]->ctx_index] = cur;
         }
 
         if (module->create_loc_conf) {
@@ -188,6 +188,8 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
                 return NGX_ERROR;
             }
 
+            http_ctx.loc_conf[ngx_modules[i]->ctx_index] = cur;
+
             if (module->merge_loc_conf) {
                 prev = module->create_loc_conf(&conf);
                 if (prev == NULL) {
@@ -199,8 +201,6 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
                     goto failed;
                 }
             }
-
-            http_ctx.loc_conf[ngx_modules[i]->ctx_index] = cur;
         }
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_lex.c b/debian/modules/nginx-lua/src/ngx_http_lua_lex.c
new file mode 100644
index 0000000..45cf754
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_lex.c
@@ -0,0 +1,8251 @@
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ *
+ * WARNING: DO NOT EVER EDIT THIS FILE!!
+ *
+ * This file was automatically generated by the re.pl script of sregex's
+ * "dfa-multi-re" git branch.
+ */
+
+
+#include "ngx_http_lua_lex.h"
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+
+
+#if __GNUC__ > 3
+#    define likely(x)       __builtin_expect((x),1)
+#    define unlikely(x)     __builtin_expect((x),0)
+#else
+#    define likely(x)      (x)
+#    define unlikely(x)    (x)
+#endif
+
+
+#ifndef u_char
+#define u_char          unsigned char
+#endif
+
+
+enum {
+    NO_MATCH = -1,
+};
+
+
+/*
+ * ngx_http_lua_lex: the "ovec" array should be allocated by the caller with at
+ * least 2 elements.
+ */
+int
+ngx_http_lua_lex(const u_char *const s, size_t len, int *const ovec)
+{
+    unsigned i = 0;
+    int matched_0 = -1;
+    int matched_1 = -1;
+    int matched_id = NO_MATCH;  /* (pending) matched regex ID */
+    int c;
+    int caps0_0 = -1;
+    int caps0_10 = -1;
+    int caps0_12 = -1;
+    int caps0_14 = -1;
+    int caps0_2 = -1;
+    int caps0_4 = -1;
+    int caps0_6 = -1;
+    int caps0_8 = -1;
+    int caps1_0 = -1;
+    int caps1_10 = -1;
+    int caps1_12 = -1;
+    int caps1_14 = -1;
+    int caps1_2 = -1;
+    int caps1_4 = -1;
+    int caps1_6 = -1;
+    int caps1_8 = -1;
+    int caps2_0 = -1;
+    int caps2_10 = -1;
+    int caps2_2 = -1;
+    int caps2_4 = -1;
+    int caps2_6 = -1;
+    int caps2_8 = -1;
+    int caps3_10 = -1;
+
+    {  /* DFA node {0} 0 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st0_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_12 = i - 1;
+        goto st2;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_14 = i - 1;
+        goto st3;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 0 to row 1 */
+        /* transfer caps from row 0 to row 2 */
+        /* capture stores */
+        caps0_6 = i - 1;
+        caps1_10 = i - 1;
+        goto st4;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_4 = i - 1;
+        goto st5;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_8 = i - 1;
+        goto st6;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_0 = i - 1;
+        goto st7;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_2 = i - 1;
+        goto st8;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st1;
+    }  /* end state */
+
+    goto st0_error;
+
+st1: {  /* DFA node {1} 1 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st1_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_12 = i - 1;
+        goto st2;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_14 = i - 1;
+        goto st3;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 0 to row 1 */
+        /* transfer caps from row 0 to row 2 */
+        /* capture stores */
+        caps0_6 = i - 1;
+        caps1_10 = i - 1;
+        goto st4;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_4 = i - 1;
+        goto st5;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_8 = i - 1;
+        goto st6;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_0 = i - 1;
+        goto st7;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 0 to row 1 */
+        /* capture stores */
+        caps0_2 = i - 1;
+        goto st8;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st1;
+    }  /* end state */
+
+    goto st1_error;
+
+st2: {  /* DFA node {59,1} 2 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st2_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 1 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 2 */
+        /* transfer caps from row 1 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st13;
+        break;
+        }
+    case 92: {
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st15;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st9;
+    }  /* end state */
+
+    goto st2_error;
+
+st3: {  /* DFA node {72,1} 3 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st3_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 1 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 2 */
+        /* transfer caps from row 1 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st22;
+        break;
+        }
+    case 92: {
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st24;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st18;
+    }  /* end state */
+
+    goto st3_error;
+
+st4: {  /* DFA node {30,50,1} 4 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st4_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        /* transfer caps from row 2 to row 0 */
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps0_12 = i - 1;
+        goto st2;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 0 */
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps0_14 = i - 1;
+        goto st3;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st27;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 0 */
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps0_4 = i - 1;
+        goto st5;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 0 */
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps0_8 = i - 1;
+        goto st6;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 0 */
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps0_0 = i - 1;
+        goto st7;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 0 */
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps0_2 = i - 1;
+        goto st8;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 0 */
+    goto st1;
+    }  /* end state */
+
+    goto st4_error;
+
+st5: {  /* DFA node {21,1} 5 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st5_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_12 = i - 1;
+        goto st2;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_14 = i - 1;
+        goto st3;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 0 */
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps0_6 = i - 1;
+        caps1_10 = i - 1;
+        goto st4;
+        break;
+        }
+    case 61: {
+        goto st28;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st29;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_8 = i - 1;
+        goto st6;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_0 = i - 1;
+        goto st7;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_2 = i - 1;
+        goto st8;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 1 to row 0 */
+    goto st1;
+    }  /* end state */
+
+    goto st5_error;
+
+st6: {  /* DFA node {41,1} 6 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st6_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_12 = i - 1;
+        goto st2;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_14 = i - 1;
+        goto st3;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 0 */
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps0_6 = i - 1;
+        caps1_10 = i - 1;
+        goto st4;
+        break;
+        }
+    case 61: {
+        goto st30;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_4 = i - 1;
+        goto st5;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st31;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_0 = i - 1;
+        goto st7;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_2 = i - 1;
+        goto st8;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 1 to row 0 */
+    goto st1;
+    }  /* end state */
+
+    goto st6_error;
+
+st7: {  /* DFA node {11,1} 7 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_0;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 0;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st8: {  /* DFA node {16,1} 8 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_2;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 1;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st9: {  /* DFA node {65,1} 9 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st9_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 1 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 2 */
+        /* transfer caps from row 1 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st13;
+        break;
+        }
+    case 92: {
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st15;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st9;
+    }  /* end state */
+
+    goto st9_error;
+
+st10: {  /* DFA node {67,59,1} 10 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_12;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 6;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st11: {  /* DFA node {65,72,1} 11 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st11_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st35;
+    }  /* end state */
+
+    goto st11_error;
+
+st12: {  /* DFA node {65,30,50,1} 12 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st12_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 4 */
+        /* transfer caps from row 3 to row 5 */
+        /* capture stores */
+        goto st44;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st13;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 1 */
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st15;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 1 */
+    goto st9;
+    }  /* end state */
+
+    goto st12_error;
+
+st13: {  /* DFA node {65,21,1} 13 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st13_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 61: {
+        goto st45;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st46;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st15;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st9;
+    }  /* end state */
+
+    goto st13_error;
+
+st14: {  /* DFA node {62,1} 14 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st14_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 1 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st48;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st49;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 2 */
+        /* transfer caps from row 1 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st50;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st51;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st52;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st53;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st54;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st47;
+    }  /* end state */
+
+    goto st14_error;
+
+st15: {  /* DFA node {65,41,1} 15 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st15_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 61: {
+        goto st55;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st13;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st56;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st9;
+    }  /* end state */
+
+    goto st15_error;
+
+st16: {  /* DFA node {65,11,1} 16 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_0;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 0;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st17: {  /* DFA node {65,16,1} 17 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_2;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 1;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st18: {  /* DFA node {78,1} 18 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st18_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 1 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 2 */
+        /* transfer caps from row 1 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st22;
+        break;
+        }
+    case 92: {
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st24;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st18;
+    }  /* end state */
+
+    goto st18_error;
+
+st19: {  /* DFA node {78,59,1} 19 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st19_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st60;
+    }  /* end state */
+
+    goto st19_error;
+
+st20: {  /* DFA node {80,72,1} 20 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_14;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 7;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st21: {  /* DFA node {78,30,50,1} 21 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st21_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 4 */
+        /* transfer caps from row 3 to row 5 */
+        /* capture stores */
+        goto st70;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st22;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 1 */
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st24;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 1 */
+    goto st18;
+    }  /* end state */
+
+    goto st21_error;
+
+st22: {  /* DFA node {78,21,1} 22 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st22_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 61: {
+        goto st71;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st72;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st24;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st18;
+    }  /* end state */
+
+    goto st22_error;
+
+st23: {  /* DFA node {75,1} 23 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st23_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 1 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st74;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st75;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 2 */
+        /* transfer caps from row 1 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st76;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st77;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st78;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st79;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st80;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st73;
+    }  /* end state */
+
+    goto st23_error;
+
+st24: {  /* DFA node {78,41,1} 24 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st24_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 61: {
+        goto st81;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st22;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st82;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st18;
+    }  /* end state */
+
+    goto st24_error;
+
+st25: {  /* DFA node {78,11,1} 25 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_0;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 0;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st26: {  /* DFA node {78,16,1} 26 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_2;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 1;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st27: {  /* DFA node {31,51,30,50,1} 27 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 91) {
+            goto st88;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 90)
+            || (c >= 92 && c <= 255))
+        {
+            /* transfer caps from row 1 to row 0 */
+            caps0_10 = caps1_10;
+            goto st87;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st28: {  /* DFA node {23,1} 28 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st28_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_12 = i - 1;
+        goto st2;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_14 = i - 1;
+        goto st3;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 0 */
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps0_6 = i - 1;
+        caps1_10 = i - 1;
+        goto st4;
+        break;
+        }
+    case 61: {
+        goto st28;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st29;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_8 = i - 1;
+        goto st6;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_0 = i - 1;
+        goto st7;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_2 = i - 1;
+        goto st8;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 1 to row 0 */
+    goto st1;
+    }  /* end state */
+
+    goto st28_error;
+
+st29: {  /* DFA node {25,21,1} 29 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_4;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 2;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st30: {  /* DFA node {43,1} 30 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st30_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_12 = i - 1;
+        goto st2;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_14 = i - 1;
+        goto st3;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 0 */
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps0_6 = i - 1;
+        caps1_10 = i - 1;
+        goto st4;
+        break;
+        }
+    case 61: {
+        goto st30;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_4 = i - 1;
+        goto st5;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st31;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_0 = i - 1;
+        goto st7;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 0 */
+        /* capture stores */
+        caps0_2 = i - 1;
+        goto st8;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 1 to row 0 */
+    goto st1;
+    }  /* end state */
+
+    goto st30_error;
+
+st31: {  /* DFA node {45,41,1} 31 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_8;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 4;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st35: {  /* DFA node {65,78,1} 35 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st35_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st35;
+    }  /* end state */
+
+    goto st35_error;
+
+st36: {  /* DFA node {67,78,59,1} 36 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_12;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 6;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st37: {  /* DFA node {65,80,72,1} 37 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_14;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 7;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st38: {  /* DFA node {65,78,30,50,1} 38 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st38_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 4 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 4 to row 5 */
+        /* transfer caps from row 4 to row 6 */
+        /* capture stores */
+        goto st91;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 4 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 4 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st38_error;
+
+st39: {  /* DFA node {65,78,21,1} 39 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st39_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 61: {
+        goto st92;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st93;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st39_error;
+
+st40: {  /* DFA node {62,75,1} 40 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st40_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st95;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st96;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st97;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st98;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st99;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st100;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st101;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st94;
+    }  /* end state */
+
+    goto st40_error;
+
+st41: {  /* DFA node {65,78,41,1} 41 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st41_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 61: {
+        goto st102;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st103;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st41_error;
+
+st42: {  /* DFA node {65,78,11,1} 42 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_0;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 0;
+    if (c != -1) {
+        if (c == 34) {
+            goto st105;
+        }
+        if (c == 39) {
+            goto st106;
+        }
+        if (c == 92) {
+            goto st107;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st104;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st43: {  /* DFA node {65,78,16,1} 43 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_2;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 1;
+    if (c != -1) {
+        if (c == 34) {
+            goto st105;
+        }
+        if (c == 39) {
+            goto st106;
+        }
+        if (c == 92) {
+            goto st107;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st104;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st44: {  /* DFA node {65,31,51,30,50,1} 44 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st109;
+        }
+        if (c == 91) {
+            goto st110;
+        }
+        if (c == 92) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st111;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st108;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st45: {  /* DFA node {65,23,1} 45 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st45_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 61: {
+        goto st45;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st46;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st15;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st9;
+    }  /* end state */
+
+    goto st45_error;
+
+st46: {  /* DFA node {65,25,21,1} 46 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_4;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 2;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st47: {  /* DFA node {63,1} 47 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st47_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 1 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 2 */
+        /* transfer caps from row 1 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st13;
+        break;
+        }
+    case 92: {
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st15;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st9;
+    }  /* end state */
+
+    goto st47_error;
+
+st48: {  /* DFA node {63,59,1} 48 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st48_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st13;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st15;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st9;
+    }  /* end state */
+
+    goto st48_error;
+
+st49: {  /* DFA node {63,72,1} 49 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st49_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st35;
+    }  /* end state */
+
+    goto st49_error;
+
+st50: {  /* DFA node {63,30,50,1} 50 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st50_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 4 */
+        /* transfer caps from row 3 to row 5 */
+        /* capture stores */
+        goto st44;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st13;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 1 */
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st15;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 1 */
+    goto st9;
+    }  /* end state */
+
+    goto st50_error;
+
+st51: {  /* DFA node {63,21,1} 51 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st51_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 61: {
+        goto st45;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st46;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st15;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st9;
+    }  /* end state */
+
+    goto st51_error;
+
+st52: {  /* DFA node {63,41,1} 52 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st52_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 61: {
+        goto st55;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st13;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st56;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st9;
+    }  /* end state */
+
+    goto st52_error;
+
+st53: {  /* DFA node {63,11,1} 53 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_0;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 0;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st54: {  /* DFA node {63,16,1} 54 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_2;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 1;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st55: {  /* DFA node {65,43,1} 55 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st55_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st10;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st11;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st12;
+        break;
+        }
+    case 61: {
+        goto st55;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st13;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st14;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st56;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st16;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st17;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st9;
+    }  /* end state */
+
+    goto st55_error;
+
+st56: {  /* DFA node {65,45,41,1} 56 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_8;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 4;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st57: {  /* DFA node {65} 57 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st57_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        goto st58;
+        break;
+        }
+    case 92: {
+        goto st59;
+        break;
+        }
+    default:
+        break;
+    }
+    if ((c >= 0 && c <= 9)
+        || (c >= 11 && c <= 33)
+        || (c >= 35 && c <= 91)
+        || (c >= 93 && c <= 255))
+    {
+        goto st57;
+    }
+    }  /* end state */
+
+    goto st57_error;
+
+st58: {  /* DFA node {67} 58 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_12;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 6;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st59: {  /* DFA node {62} 59 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st59_error;
+    }
+
+    c = s[i];
+    i++;
+    if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
+        goto st112;
+    }
+    }  /* end state */
+
+    goto st59_error;
+
+st60: {  /* DFA node {78,65,1} 60 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st60_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st60;
+    }  /* end state */
+
+    goto st60_error;
+
+st61: {  /* DFA node {78,67,59,1} 61 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_12;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 6;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st62: {  /* DFA node {80,65,72,1} 62 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_14;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 7;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st63: {  /* DFA node {78,65,30,50,1} 63 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st63_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 4 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 4 to row 5 */
+        /* transfer caps from row 4 to row 6 */
+        /* capture stores */
+        goto st113;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 4 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 4 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st63_error;
+
+st64: {  /* DFA node {78,65,21,1} 64 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st64_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 61: {
+        goto st114;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st115;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st64_error;
+
+st65: {  /* DFA node {75,62,1} 65 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st65_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st117;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st118;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st119;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st120;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st121;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st122;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st123;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c == 92)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st116;
+    }  /* end state */
+
+    goto st65_error;
+
+st66: {  /* DFA node {78,65,41,1} 66 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st66_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 61: {
+        goto st124;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st125;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st66_error;
+
+st67: {  /* DFA node {78,65,11,1} 67 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_0;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 0;
+    if (c != -1) {
+        if (c == 34) {
+            goto st127;
+        }
+        if (c == 39) {
+            goto st128;
+        }
+        if (c == 92) {
+            goto st129;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st126;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st68: {  /* DFA node {78,65,16,1} 68 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_2;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 1;
+    if (c != -1) {
+        if (c == 34) {
+            goto st127;
+        }
+        if (c == 39) {
+            goto st128;
+        }
+        if (c == 92) {
+            goto st129;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st126;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st70: {  /* DFA node {78,31,51,30,50,1} 70 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 39) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st131;
+        }
+        if (c == 91) {
+            goto st132;
+        }
+        if (c == 92) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st133;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st130;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st71: {  /* DFA node {78,23,1} 71 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st71_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 61: {
+        goto st71;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st72;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st24;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st18;
+    }  /* end state */
+
+    goto st71_error;
+
+st72: {  /* DFA node {78,25,21,1} 72 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_4;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 2;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st73: {  /* DFA node {76,1} 73 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st73_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 1 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 1 to row 2 */
+        /* transfer caps from row 1 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st22;
+        break;
+        }
+    case 92: {
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st24;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 1 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st18;
+    }  /* end state */
+
+    goto st73_error;
+
+st74: {  /* DFA node {76,59,1} 74 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st74_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st60;
+    }  /* end state */
+
+    goto st74_error;
+
+st75: {  /* DFA node {76,72,1} 75 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st75_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st22;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st24;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st18;
+    }  /* end state */
+
+    goto st75_error;
+
+st76: {  /* DFA node {76,30,50,1} 76 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st76_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 4 */
+        /* transfer caps from row 3 to row 5 */
+        /* capture stores */
+        goto st70;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st22;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 1 */
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st24;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 1 */
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 1 */
+    goto st18;
+    }  /* end state */
+
+    goto st76_error;
+
+st77: {  /* DFA node {76,21,1} 77 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st77_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 61: {
+        goto st71;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st72;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_8 = i - 1;
+        goto st24;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st18;
+    }  /* end state */
+
+    goto st77_error;
+
+st78: {  /* DFA node {76,41,1} 78 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st78_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 61: {
+        goto st81;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st22;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st82;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st18;
+    }  /* end state */
+
+    goto st78_error;
+
+st79: {  /* DFA node {76,11,1} 79 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_0;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 0;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st80: {  /* DFA node {76,16,1} 80 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_2;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 1;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st81: {  /* DFA node {78,43,1} 81 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st81_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_12 = i - 1;
+        goto st19;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_14 = i - 1;
+        goto st20;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 1 */
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps1_6 = i - 1;
+        caps2_10 = i - 1;
+        goto st21;
+        break;
+        }
+    case 61: {
+        goto st81;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_4 = i - 1;
+        goto st22;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 2 to row 1 */
+        goto st23;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st82;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_0 = i - 1;
+        goto st25;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 1 */
+        /* capture stores */
+        caps1_2 = i - 1;
+        goto st26;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 2 to row 1 */
+    goto st18;
+    }  /* end state */
+
+    goto st81_error;
+
+st82: {  /* DFA node {78,45,41,1} 82 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_8;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 4;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st83: {  /* DFA node {78} 83 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st83_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 39: {
+        goto st84;
+        break;
+        }
+    case 92: {
+        goto st85;
+        break;
+        }
+    default:
+        break;
+    }
+    if ((c >= 0 && c <= 9)
+        || (c >= 11 && c <= 38)
+        || (c >= 40 && c <= 91)
+        || (c >= 93 && c <= 255))
+    {
+        goto st83;
+    }
+    }  /* end state */
+
+    goto st83_error;
+
+st84: {  /* DFA node {80} 84 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_14;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 7;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st85: {  /* DFA node {75} 85 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st85_error;
+    }
+
+    c = s[i];
+    i++;
+    if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
+        goto st134;
+    }
+    }  /* end state */
+
+    goto st85_error;
+
+st87: {  /* DFA node {53} 87 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
+            goto st87;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st88: {  /* DFA node {32,53} 88 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 61) {
+            goto st135;
+        }
+        if (c == 91) {
+            goto st136;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 92 && c <= 255))
+        {
+            /* transfer caps from row 1 to row 0 */
+            caps0_10 = caps1_10;
+            goto st87;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st91: {  /* DFA node {65,78,31,51,30,50,1} 91 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 3 to matched */
+    matched_0 = caps3_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st138;
+        }
+        if (c == 39) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st139;
+        }
+        if (c == 91) {
+            goto st140;
+        }
+        if (c == 92) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st141;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st137;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st92: {  /* DFA node {65,78,23,1} 92 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st92_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 61: {
+        goto st92;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st93;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st92_error;
+
+st93: {  /* DFA node {65,78,25,21,1} 93 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_4;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 2;
+    if (c != -1) {
+        if (c == 34) {
+            goto st105;
+        }
+        if (c == 39) {
+            goto st106;
+        }
+        if (c == 92) {
+            goto st107;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st104;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st94: {  /* DFA node {63,76,1} 94 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st94_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st35;
+    }  /* end state */
+
+    goto st94_error;
+
+st95: {  /* DFA node {63,76,59,1} 95 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st95_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st95_error;
+
+st96: {  /* DFA node {63,76,72,1} 96 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st96_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st96_error;
+
+st97: {  /* DFA node {63,76,30,50,1} 97 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st97_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 4 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 4 to row 5 */
+        /* transfer caps from row 4 to row 6 */
+        /* capture stores */
+        goto st91;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 4 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 4 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st97_error;
+
+st98: {  /* DFA node {63,76,21,1} 98 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st98_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 61: {
+        goto st92;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st93;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st41;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st98_error;
+
+st99: {  /* DFA node {63,76,41,1} 99 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st99_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 61: {
+        goto st102;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st103;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st99_error;
+
+st100: {  /* DFA node {63,76,11,1} 100 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_0;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 0;
+    if (c != -1) {
+        if (c == 34) {
+            goto st105;
+        }
+        if (c == 39) {
+            goto st106;
+        }
+        if (c == 92) {
+            goto st107;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st104;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st101: {  /* DFA node {63,76,16,1} 101 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_2;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 1;
+    if (c != -1) {
+        if (c == 34) {
+            goto st105;
+        }
+        if (c == 39) {
+            goto st106;
+        }
+        if (c == 92) {
+            goto st107;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st104;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st102: {  /* DFA node {65,78,43,1} 102 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st102_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st36;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st37;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st38;
+        break;
+        }
+    case 61: {
+        goto st102;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st39;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st40;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st103;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st42;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st43;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st35;
+    }  /* end state */
+
+    goto st102_error;
+
+st103: {  /* DFA node {65,78,45,41,1} 103 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_8;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 4;
+    if (c != -1) {
+        if (c == 34) {
+            goto st105;
+        }
+        if (c == 39) {
+            goto st106;
+        }
+        if (c == 92) {
+            goto st107;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st104;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st104: {  /* DFA node {65,78} 104 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st104_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        goto st105;
+        break;
+        }
+    case 39: {
+        goto st106;
+        break;
+        }
+    case 92: {
+        goto st107;
+        break;
+        }
+    default:
+        break;
+    }
+    if ((c >= 0 && c <= 9)
+        || (c >= 11 && c <= 33)
+        || (c >= 35 && c <= 38)
+        || (c >= 40 && c <= 91)
+        || (c >= 93 && c <= 255))
+    {
+        goto st104;
+    }
+    }  /* end state */
+
+    goto st104_error;
+
+st105: {  /* DFA node {67,78} 105 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_12;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 6;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st106: {  /* DFA node {65,80} 106 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_14;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 7;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st107: {  /* DFA node {62,75} 107 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st107_error;
+    }
+
+    c = s[i];
+    i++;
+    if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
+        goto st142;
+    }
+    }  /* end state */
+
+    goto st107_error;
+
+st108: {  /* DFA node {65,53} 108 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            goto st109;
+        }
+        if (c == 92) {
+            goto st111;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st108;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st109: {  /* DFA node {67,53} 109 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_12;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 6;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st110: {  /* DFA node {65,32,53} 110 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st109;
+        }
+        if (c == 61) {
+            goto st143;
+        }
+        if (c == 91) {
+            goto st144;
+        }
+        if (c == 92) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st111;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st108;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st111: {  /* DFA node {62,53} 111 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
+            goto st145;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st112: {  /* DFA node {63} 112 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st112_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        goto st58;
+        break;
+        }
+    case 92: {
+        goto st59;
+        break;
+        }
+    default:
+        break;
+    }
+    if ((c >= 0 && c <= 9)
+        || (c >= 11 && c <= 33)
+        || (c >= 35 && c <= 91)
+        || (c >= 93 && c <= 255))
+    {
+        goto st57;
+    }
+    }  /* end state */
+
+    goto st112_error;
+
+st113: {  /* DFA node {78,65,31,51,30,50,1} 113 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 3 to matched */
+    matched_0 = caps3_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st147;
+        }
+        if (c == 39) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st148;
+        }
+        if (c == 91) {
+            goto st149;
+        }
+        if (c == 92) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st150;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st146;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st114: {  /* DFA node {78,65,23,1} 114 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st114_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 61: {
+        goto st114;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st115;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st114_error;
+
+st115: {  /* DFA node {78,65,25,21,1} 115 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_4;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 2;
+    if (c != -1) {
+        if (c == 34) {
+            goto st127;
+        }
+        if (c == 39) {
+            goto st128;
+        }
+        if (c == 92) {
+            goto st129;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st126;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st116: {  /* DFA node {76,63,1} 116 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st116_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 2 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 2 to row 3 */
+        /* transfer caps from row 2 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 2 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    goto st60;
+    }  /* end state */
+
+    goto st116_error;
+
+st117: {  /* DFA node {76,63,59,1} 117 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st117_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st117_error;
+
+st118: {  /* DFA node {76,63,72,1} 118 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st118_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st118_error;
+
+st119: {  /* DFA node {76,63,30,50,1} 119 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st119_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 4 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 4 to row 5 */
+        /* transfer caps from row 4 to row 6 */
+        /* capture stores */
+        goto st113;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 4 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 4 to row 2 */
+        /* transfer caps from row 4 to row 3 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 4 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st119_error;
+
+st120: {  /* DFA node {76,63,21,1} 120 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st120_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 61: {
+        goto st114;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st115;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_8 = i - 1;
+        goto st66;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st120_error;
+
+st121: {  /* DFA node {76,63,41,1} 121 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st121_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 61: {
+        goto st124;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st125;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st121_error;
+
+st122: {  /* DFA node {76,63,11,1} 122 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_0;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 0;
+    if (c != -1) {
+        if (c == 34) {
+            goto st127;
+        }
+        if (c == 39) {
+            goto st128;
+        }
+        if (c == 92) {
+            goto st129;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st126;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st123: {  /* DFA node {76,63,16,1} 123 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_2;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 1;
+    if (c != -1) {
+        if (c == 34) {
+            goto st127;
+        }
+        if (c == 39) {
+            goto st128;
+        }
+        if (c == 92) {
+            goto st129;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st126;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st124: {  /* DFA node {78,65,43,1} 124 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st124_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 10: {
+        /* transfer caps from row 3 to row 0 */
+        goto st1;
+        break;
+        }
+    case 34: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st61;
+        break;
+        }
+    case 39: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        goto st62;
+        break;
+        }
+    case 45: {
+        /* transfer caps from row 3 to row 2 */
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        caps2_6 = i - 1;
+        caps3_10 = i - 1;
+        goto st63;
+        break;
+        }
+    case 61: {
+        goto st124;
+        break;
+        }
+    case 91: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_4 = i - 1;
+        goto st64;
+        break;
+        }
+    case 92: {
+        /* transfer caps from row 3 to row 2 */
+        goto st65;
+        break;
+        }
+    case 93: {
+        /* transfer caps from row 3 to row 4 */
+        /* capture stores */
+        goto st125;
+        break;
+        }
+    case 123: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_0 = i - 1;
+        goto st67;
+        break;
+        }
+    case 125: {
+        /* transfer caps from row 3 to row 2 */
+        /* capture stores */
+        caps2_2 = i - 1;
+        goto st68;
+        break;
+        }
+    default:
+        break;
+    }
+    /* (c >= 0 && c <= 9)
+     * || (c >= 11 && c <= 33)
+     * || (c >= 35 && c <= 38)
+     * || (c >= 40 && c <= 44)
+     * || (c >= 46 && c <= 60)
+     * || (c >= 62 && c <= 90)
+     * || (c >= 94 && c <= 122)
+     * || (c == 124)
+     * || (c >= 126 && c <= 255)
+     */
+    /* transfer caps from row 3 to row 2 */
+    goto st60;
+    }  /* end state */
+
+    goto st124_error;
+
+st125: {  /* DFA node {78,65,45,41,1} 125 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_8;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 4;
+    if (c != -1) {
+        if (c == 34) {
+            goto st127;
+        }
+        if (c == 39) {
+            goto st128;
+        }
+        if (c == 92) {
+            goto st129;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st126;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st126: {  /* DFA node {78,65} 126 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st126_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        goto st127;
+        break;
+        }
+    case 39: {
+        goto st128;
+        break;
+        }
+    case 92: {
+        goto st129;
+        break;
+        }
+    default:
+        break;
+    }
+    if ((c >= 0 && c <= 9)
+        || (c >= 11 && c <= 33)
+        || (c >= 35 && c <= 38)
+        || (c >= 40 && c <= 91)
+        || (c >= 93 && c <= 255))
+    {
+        goto st126;
+    }
+    }  /* end state */
+
+    goto st126_error;
+
+st127: {  /* DFA node {78,67} 127 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_12;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 6;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st128: {  /* DFA node {80,65} 128 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_14;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 7;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st129: {  /* DFA node {75,62} 129 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st129_error;
+    }
+
+    c = s[i];
+    i++;
+    if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
+        goto st151;
+    }
+    }  /* end state */
+
+    goto st129_error;
+
+st130: {  /* DFA node {78,53} 130 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 39) {
+            goto st131;
+        }
+        if (c == 92) {
+            goto st133;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st130;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st131: {  /* DFA node {80,53} 131 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_14;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 7;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st132: {  /* DFA node {78,32,53} 132 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 39) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st131;
+        }
+        if (c == 61) {
+            goto st152;
+        }
+        if (c == 91) {
+            goto st153;
+        }
+        if (c == 92) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st133;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st130;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st133: {  /* DFA node {75,53} 133 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
+            goto st154;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st134: {  /* DFA node {76} 134 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st134_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 39: {
+        goto st84;
+        break;
+        }
+    case 92: {
+        goto st85;
+        break;
+        }
+    default:
+        break;
+    }
+    if ((c >= 0 && c <= 9)
+        || (c >= 11 && c <= 38)
+        || (c >= 40 && c <= 91)
+        || (c >= 93 && c <= 255))
+    {
+        goto st83;
+    }
+    }  /* end state */
+
+    goto st134_error;
+
+st135: {  /* DFA node {34,53} 135 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 61) {
+            goto st135;
+        }
+        if (c == 91) {
+            goto st136;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 92 && c <= 255))
+        {
+            /* transfer caps from row 1 to row 0 */
+            caps0_10 = caps1_10;
+            goto st87;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st136: {  /* DFA node {36,53} 136 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_6;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 3;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st137: {  /* DFA node {65,78,53} 137 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            goto st138;
+        }
+        if (c == 39) {
+            goto st139;
+        }
+        if (c == 92) {
+            goto st141;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st137;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st138: {  /* DFA node {67,78,53} 138 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_12;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 6;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st139: {  /* DFA node {65,80,53} 139 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_14;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 7;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st140: {  /* DFA node {65,78,32,53} 140 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 3 to matched */
+    matched_0 = caps3_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st138;
+        }
+        if (c == 39) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st139;
+        }
+        if (c == 61) {
+            goto st156;
+        }
+        if (c == 91) {
+            goto st157;
+        }
+        if (c == 92) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st141;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st137;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st141: {  /* DFA node {62,75,53} 141 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
+            goto st158;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st142: {  /* DFA node {63,76} 142 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st142_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        goto st105;
+        break;
+        }
+    case 39: {
+        goto st106;
+        break;
+        }
+    case 92: {
+        goto st107;
+        break;
+        }
+    default:
+        break;
+    }
+    if ((c >= 0 && c <= 9)
+        || (c >= 11 && c <= 33)
+        || (c >= 35 && c <= 38)
+        || (c >= 40 && c <= 91)
+        || (c >= 93 && c <= 255))
+    {
+        goto st104;
+    }
+    }  /* end state */
+
+    goto st142_error;
+
+st143: {  /* DFA node {65,34,53} 143 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st109;
+        }
+        if (c == 61) {
+            goto st143;
+        }
+        if (c == 91) {
+            goto st144;
+        }
+        if (c == 92) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st111;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st108;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st144: {  /* DFA node {65,36,53} 144 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_6;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 3;
+    if (c != -1) {
+        if (c == 34) {
+            goto st58;
+        }
+        if (c == 92) {
+            goto st59;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st57;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st145: {  /* DFA node {63,53} 145 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            goto st109;
+        }
+        if (c == 92) {
+            goto st111;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st108;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st146: {  /* DFA node {78,65,53} 146 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            goto st147;
+        }
+        if (c == 39) {
+            goto st148;
+        }
+        if (c == 92) {
+            goto st150;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st146;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st147: {  /* DFA node {78,67,53} 147 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_12;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 6;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st148: {  /* DFA node {80,65,53} 148 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 0 to matched */
+    matched_0 = caps0_14;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 7;
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st149: {  /* DFA node {78,65,32,53} 149 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 3 to matched */
+    matched_0 = caps3_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st147;
+        }
+        if (c == 39) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st148;
+        }
+        if (c == 61) {
+            goto st159;
+        }
+        if (c == 91) {
+            goto st160;
+        }
+        if (c == 92) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st150;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st146;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st150: {  /* DFA node {75,62,53} 150 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
+            goto st161;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st151: {  /* DFA node {76,63} 151 */
+    if (unlikely(i >= len)) {
+        i++;
+        goto st151_error;
+    }
+
+    c = s[i];
+    i++;
+    switch (c) {
+    case 34: {
+        goto st127;
+        break;
+        }
+    case 39: {
+        goto st128;
+        break;
+        }
+    case 92: {
+        goto st129;
+        break;
+        }
+    default:
+        break;
+    }
+    if ((c >= 0 && c <= 9)
+        || (c >= 11 && c <= 33)
+        || (c >= 35 && c <= 38)
+        || (c >= 40 && c <= 91)
+        || (c >= 93 && c <= 255))
+    {
+        goto st126;
+    }
+    }  /* end state */
+
+    goto st151_error;
+
+st152: {  /* DFA node {78,34,53} 152 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 39) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st131;
+        }
+        if (c == 61) {
+            goto st152;
+        }
+        if (c == 91) {
+            goto st153;
+        }
+        if (c == 92) {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st133;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 2 to row 1 */
+            caps1_10 = caps2_10;
+            goto st130;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st153: {  /* DFA node {78,36,53} 153 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_6;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 3;
+    if (c != -1) {
+        if (c == 39) {
+            goto st84;
+        }
+        if (c == 92) {
+            goto st85;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st83;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st154: {  /* DFA node {76,53} 154 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 1 to matched */
+    matched_0 = caps1_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 39) {
+            goto st131;
+        }
+        if (c == 92) {
+            goto st133;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st130;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st156: {  /* DFA node {65,78,34,53} 156 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 3 to matched */
+    matched_0 = caps3_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st138;
+        }
+        if (c == 39) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st139;
+        }
+        if (c == 61) {
+            goto st156;
+        }
+        if (c == 91) {
+            goto st157;
+        }
+        if (c == 92) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st141;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st137;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st157: {  /* DFA node {65,78,36,53} 157 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_6;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 3;
+    if (c != -1) {
+        if (c == 34) {
+            goto st105;
+        }
+        if (c == 39) {
+            goto st106;
+        }
+        if (c == 92) {
+            goto st107;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st104;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st158: {  /* DFA node {63,76,53} 158 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            goto st138;
+        }
+        if (c == 39) {
+            goto st139;
+        }
+        if (c == 92) {
+            goto st141;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st137;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st159: {  /* DFA node {78,65,34,53} 159 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 3 to matched */
+    matched_0 = caps3_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st147;
+        }
+        if (c == 39) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st148;
+        }
+        if (c == 61) {
+            goto st159;
+        }
+        if (c == 91) {
+            goto st160;
+        }
+        if (c == 92) {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st150;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 60)
+            || (c >= 62 && c <= 90)
+            || (c >= 93 && c <= 255))
+        {
+            /* transfer caps from row 3 to row 2 */
+            caps2_10 = caps3_10;
+            goto st146;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st160: {  /* DFA node {78,65,36,53} 160 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_6;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 3;
+    if (c != -1) {
+        if (c == 34) {
+            goto st127;
+        }
+        if (c == 39) {
+            goto st128;
+        }
+        if (c == 92) {
+            goto st129;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st126;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st161: {  /* DFA node {76,63,53} 161 */
+    c = i < len ? s[i] : -1;
+    i++;
+    /* transfer caps from row 2 to matched */
+    matched_0 = caps2_10;
+    /* capture stores */
+    matched_1 = i - 1;
+    matched_id = 5;
+    if (c != -1) {
+        if (c == 34) {
+            goto st147;
+        }
+        if (c == 39) {
+            goto st148;
+        }
+        if (c == 92) {
+            goto st150;
+        }
+        if ((c >= 0 && c <= 9)
+            || (c >= 11 && c <= 33)
+            || (c >= 35 && c <= 38)
+            || (c >= 40 && c <= 91)
+            || (c >= 93 && c <= 255))
+        {
+            goto st146;
+        }
+    }
+    }  /* end state */
+
+    ovec[0] = matched_0;
+    ovec[1] = matched_1;
+    return matched_id;  /* fallback */
+
+st0_error:
+st1_error:
+st2_error:
+st3_error:
+st4_error:
+st5_error:
+st6_error:
+st9_error:
+st11_error:
+st12_error:
+st13_error:
+st14_error:
+st15_error:
+st18_error:
+st19_error:
+st21_error:
+st22_error:
+st23_error:
+st24_error:
+st28_error:
+st30_error:
+st35_error:
+st38_error:
+st39_error:
+st40_error:
+st41_error:
+st45_error:
+st47_error:
+st48_error:
+st49_error:
+st50_error:
+st51_error:
+st52_error:
+st55_error:
+st57_error:
+st59_error:
+st60_error:
+st63_error:
+st64_error:
+st65_error:
+st66_error:
+st71_error:
+st73_error:
+st74_error:
+st75_error:
+st76_error:
+st77_error:
+st78_error:
+st81_error:
+st83_error:
+st85_error:
+st92_error:
+st94_error:
+st95_error:
+st96_error:
+st97_error:
+st98_error:
+st99_error:
+st102_error:
+st104_error:
+st107_error:
+st112_error:
+st114_error:
+st116_error:
+st117_error:
+st118_error:
+st119_error:
+st120_error:
+st121_error:
+st124_error:
+st126_error:
+st129_error:
+st134_error:
+st142_error:
+st151_error:
+
+    if (matched_0 != -1) {
+        ovec[0] = matched_0;
+        ovec[1] = matched_1;
+        return matched_id;  /* fallback */
+    }
+    return NO_MATCH;
+}
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_lex.h b/debian/modules/nginx-lua/src/ngx_http_lua_lex.h
new file mode 100644
index 0000000..11f102c
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_lex.h
@@ -0,0 +1,17 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_LUA_LEX_H_INCLUDED_
+#define _NGX_HTTP_LUA_LEX_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+int ngx_http_lua_lex(const u_char *const s, size_t len, int *const ovec);
+
+
+#endif
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 6f43b23..3bf50c2 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
@@ -149,6 +149,13 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       offsetof(ngx_http_lua_loc_conf_t, log_socket_errors),
       NULL },
 
+    { ngx_string("init_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_init_by_lua_block,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_init_by_inline },
+
     { ngx_string("init_by_lua"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_http_lua_init_by_lua,
@@ -163,6 +170,13 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_init_by_file },
 
+    { ngx_string("init_worker_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_init_worker_by_lua_block,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_init_worker_by_inline },
+
     { ngx_string("init_worker_by_lua"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_http_lua_init_worker_by_lua,
@@ -178,6 +192,15 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       (void *) ngx_http_lua_init_worker_by_file },
 
 #if defined(NDK) && NDK
+    /* set_by_lua $res { inline Lua code } [$arg1 [$arg2 [...]]] */
+    { ngx_string("set_by_lua_block"),
+      NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                       |NGX_CONF_1MORE|NGX_CONF_BLOCK,
+      ngx_http_lua_set_by_lua_block,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_filter_set_by_lua_inline },
+
     /* set_by_lua $res <inline script> [$arg1 [$arg2 [...]]] */
     { ngx_string("set_by_lua"),
       NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
@@ -197,7 +220,7 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       (void *) ngx_http_lua_filter_set_by_lua_file },
 #endif
 
-    /* rewrite_by_lua <inline script> */
+    /* rewrite_by_lua "<inline script>" */
     { ngx_string("rewrite_by_lua"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
                         |NGX_CONF_TAKE1,
@@ -206,7 +229,16 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_rewrite_handler_inline },
 
-    /* access_by_lua <inline script> */
+    /* rewrite_by_lua_block { <inline script> } */
+    { ngx_string("rewrite_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_rewrite_by_lua_block,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_rewrite_handler_inline },
+
+    /* access_by_lua "<inline script>" */
     { ngx_string("access_by_lua"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
                         |NGX_CONF_TAKE1,
@@ -215,7 +247,16 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_access_handler_inline },
 
-    /* content_by_lua <inline script> */
+    /* access_by_lua_block { <inline script> } */
+    { ngx_string("access_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_access_by_lua_block,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_access_handler_inline },
+
+    /* content_by_lua "<inline script>" */
     { ngx_string("content_by_lua"),
       NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
       ngx_http_lua_content_by_lua,
@@ -223,6 +264,14 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_content_handler_inline },
 
+    /* content_by_lua_block { <inline script> } */
+    { ngx_string("content_by_lua_block"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_content_by_lua_block,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_content_handler_inline },
+
     /* 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
@@ -232,6 +281,15 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_log_handler_inline },
 
+    /* log_by_lua_block { <inline script> } */
+    { ngx_string("log_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_log_by_lua_block,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      (void *) 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
                         |NGX_CONF_TAKE1,
@@ -280,6 +338,15 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_header_filter_inline },
 
+    /* header_filter_by_lua_block { <inline script> } */
+    { ngx_string("header_filter_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_header_filter_by_lua_block,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      (void *) 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,
@@ -296,6 +363,15 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_body_filter_inline },
 
+    /* body_filter_by_lua_block { <inline script> } */
+    { ngx_string("body_filter_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_body_filter_by_lua_block,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      (void *) 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,
@@ -582,7 +658,7 @@ ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data)
 
     if ((u_long) *np >= ngx_freebsd_net_inet_tcp_sendspace) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"fastcgi_send_lowat\" must be less than %d "
+                           "\"lua_send_lowat\" must be less than %d "
                            "(sysctl net.inet.tcp.sendspace)",
                            ngx_freebsd_net_inet_tcp_sendspace);
 
@@ -593,7 +669,7 @@ ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data)
     ssize_t *np = data;
 
     ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                       "\"fastcgi_send_lowat\" is not supported, ignored");
+                       "\"lua_send_lowat\" is not supported, ignored");
 
     *np = 0;
 
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 8c666f7..a72f9da 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
@@ -36,11 +36,20 @@ static int ngx_http_lua_shdict_flush_expired(lua_State *L);
 static int ngx_http_lua_shdict_get_keys(lua_State *L);
 
 
+static ngx_inline ngx_shm_zone_t *ngx_http_lua_shdict_get_zone(lua_State *L,
+                                                               int index);
+
+
 #define NGX_HTTP_LUA_SHDICT_ADD         0x0001
 #define NGX_HTTP_LUA_SHDICT_REPLACE     0x0002
 #define NGX_HTTP_LUA_SHDICT_SAFE_STORE  0x0004
 
 
+enum {
+    SHDICT_USERDATA_INDEX = 1,
+};
+
+
 ngx_int_t
 ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
 {
@@ -347,7 +356,10 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
             lua_pushlstring(L, (char *) ctx->name.data, ctx->name.len);
                 /* shared mt key */
 
+            lua_createtable(L, 1 /* narr */, 0 /* nrec */);
+                /* table of zone[i] */
             lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
+            lua_rawseti(L, -2, SHDICT_USERDATA_INDEX); /* {zone[i]} */
             lua_pushvalue(L, -3); /* shared mt key ud mt */
             lua_setmetatable(L, -2); /* shared mt key ud */
             lua_rawset(L, -4); /* shared mt */
@@ -377,6 +389,19 @@ ngx_http_lua_shdict_get_stale(lua_State *L)
 }
 
 
+static ngx_inline ngx_shm_zone_t *
+ngx_http_lua_shdict_get_zone(lua_State *L, int index)
+{
+    ngx_shm_zone_t      *zone;
+
+    lua_rawgeti(L, index, SHDICT_USERDATA_INDEX);
+    zone = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    return zone;
+}
+
+
 static int
 ngx_http_lua_shdict_get_helper(lua_State *L, int get_stale)
 {
@@ -401,7 +426,11 @@ ngx_http_lua_shdict_get_helper(lua_State *L, int get_stale)
                           "but only seen %d", n);
     }
 
-    zone = lua_touserdata(L, 1);
+    if (lua_type(L, 1) != LUA_TTABLE) {
+        return luaL_error(L, "bad \"zone\" argument");
+    }
+
+    zone = ngx_http_lua_shdict_get_zone(L, 1);
     if (zone == NULL) {
         return luaL_error(L, "bad \"zone\" argument");
     }
@@ -572,9 +601,9 @@ ngx_http_lua_shdict_flush_all(lua_State *L)
         return luaL_error(L, "expecting 1 argument, but seen %d", n);
     }
 
-    luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+    luaL_checktype(L, 1, LUA_TTABLE);
 
-    zone = lua_touserdata(L, 1);
+    zone = ngx_http_lua_shdict_get_zone(L, 1);
     if (zone == NULL) {
         return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
     }
@@ -619,9 +648,9 @@ ngx_http_lua_shdict_flush_expired(lua_State *L)
         return luaL_error(L, "expecting 1 or 2 argument(s), but saw %d", n);
     }
 
-    luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+    luaL_checktype(L, 1, LUA_TTABLE);
 
-    zone = lua_touserdata(L, 1);
+    zone = ngx_http_lua_shdict_get_zone(L, 1);
     if (zone == NULL) {
         return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
     }
@@ -700,9 +729,9 @@ ngx_http_lua_shdict_get_keys(lua_State *L)
                           "but saw %d", n);
     }
 
-    luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+    luaL_checktype(L, 1, LUA_TTABLE);
 
-    zone = lua_touserdata(L, 1);
+    zone = ngx_http_lua_shdict_get_zone(L, 1);
     if (zone == NULL) {
         return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
     }
@@ -840,7 +869,11 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
                           "but only seen %d", n);
     }
 
-    zone = lua_touserdata(L, 1);
+    if (lua_type(L, 1) != LUA_TTABLE) {
+        return luaL_error(L, "bad \"zone\" argument");
+    }
+
+    zone = ngx_http_lua_shdict_get_zone(L, 1);
     if (zone == NULL) {
         return luaL_error(L, "bad \"zone\" argument");
     }
@@ -1013,7 +1046,7 @@ replace:
         }
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict set: found old entry bug value size "
+                       "lua shared dict set: found old entry but value size "
                        "NOT matched, removing it first");
 
 remove:
@@ -1147,11 +1180,11 @@ ngx_http_lua_shdict_incr(lua_State *L)
         return luaL_error(L, "expecting 3 arguments, but only seen %d", n);
     }
 
-    if (lua_type(L, 1) != LUA_TLIGHTUSERDATA) {
+    if (lua_type(L, 1) != LUA_TTABLE) {
         return luaL_error(L, "bad \"zone\" argument");
     }
 
-    zone = lua_touserdata(L, 1);
+    zone = ngx_http_lua_shdict_get_zone(L, 1);
     if (zone == NULL) {
         return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
     }
@@ -1366,7 +1399,7 @@ ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
         if (name->len == name_len
             && ngx_strncmp(name->data, name_data, name_len) == 0)
         {
-            return zone;
+            return &zone[i];
         }
     }
 
@@ -1522,7 +1555,7 @@ replace:
         }
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict set: found old entry bug value size "
+                       "lua shared dict set: found old entry but value size "
                        "NOT matched, removing it first");
 
 remove:
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
index 804c854..4640f87 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
@@ -223,7 +223,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 
     /* {{{req socket object metatable */
     lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
-    lua_createtable(L, 0 /* narr */, 3 /* nrec */);
+    lua_createtable(L, 0 /* narr */, 4 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
     lua_setfield(L, -2, "receive");
@@ -242,7 +242,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 
     /* {{{raw req socket object metatable */
     lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
-    lua_createtable(L, 0 /* narr */, 4 /* nrec */);
+    lua_createtable(L, 0 /* narr */, 5 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
     lua_setfield(L, -2, "receive");
@@ -4084,6 +4084,12 @@ ngx_http_lua_req_socket(lua_State *L)
     }
 #endif
 
+#if (NGX_HTTP_V2)
+    if (r->stream) {
+        return luaL_error(L, "http v2 not supported yet");
+    }
+#endif
+
 #if nginx_version >= 1003009
     if (!raw && r->headers_in.chunked) {
         lua_pushnil(L);
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
index 6c846f5..23cc69a 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
@@ -82,7 +82,7 @@ ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
 
     /* udp socket object metatable */
     lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
-    lua_createtable(L, 0 /* narr */, 4 /* nrec */);
+    lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_udp_setpeername);
     lua_setfield(L, -2, "setpeername"); /* ngx socket mt */
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 87fc74c..4ac801b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
@@ -116,7 +116,7 @@ static int
 ngx_http_lua_ngx_location_capture_multi(lua_State *L)
 {
     ngx_http_request_t              *r;
-    ngx_http_request_t              *sr; /* subrequest object */
+    ngx_http_request_t              *sr = NULL; /* subrequest object */
     ngx_http_post_subrequest_t      *psr;
     ngx_http_lua_ctx_t              *sr_ctx;
     ngx_http_lua_ctx_t              *ctx;
@@ -1004,7 +1004,7 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
             rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
 
-        if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+        if (rc >= 100) {
             pr_coctx->sr_statuses[ctx->index] = rc;
         }
     }
@@ -1489,6 +1489,10 @@ ngx_http_lua_subrequest(ngx_http_request_t *r,
     sr->spdy_stream = r->spdy_stream;
 #endif
 
+#if (NGX_HTTP_V2)
+    sr->stream = r->stream;
+#endif
+
 #ifdef HAVE_ALLOW_REQUEST_BODY_UPDATING_PATCH
     sr->content_length_n = -1;
 #endif
diff --git a/debian/modules/nginx-lua/t/000--init.t b/debian/modules/nginx-lua/t/000--init.t
index bb57e81..364334f 100644
--- a/debian/modules/nginx-lua/t/000--init.t
+++ b/debian/modules/nginx-lua/t/000--init.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(1);
diff --git a/debian/modules/nginx-lua/t/000-sanity.t b/debian/modules/nginx-lua/t/000-sanity.t
index e390bf6..3f66752 100644
--- a/debian/modules/nginx-lua/t/000-sanity.t
+++ b/debian/modules/nginx-lua/t/000-sanity.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/001-set.t b/debian/modules/nginx-lua/t/001-set.t
index 73bc3a7..2295a2d 100644
--- a/debian/modules/nginx-lua/t/001-set.t
+++ b/debian/modules/nginx-lua/t/001-set.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/002-content.t b/debian/modules/nginx-lua/t/002-content.t
index 706083a..e6cb62d 100644
--- a/debian/modules/nginx-lua/t/002-content.t
+++ b/debian/modules/nginx-lua/t/002-content.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/003-errors.t b/debian/modules/nginx-lua/t/003-errors.t
index 1b92266..764300a 100644
--- a/debian/modules/nginx-lua/t/003-errors.t
+++ b/debian/modules/nginx-lua/t/003-errors.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(1);
diff --git a/debian/modules/nginx-lua/t/004-require.t b/debian/modules/nginx-lua/t/004-require.t
index 64b61be..3250b2f 100644
--- a/debian/modules/nginx-lua/t/004-require.t
+++ b/debian/modules/nginx-lua/t/004-require.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/005-exit.t b/debian/modules/nginx-lua/t/005-exit.t
index 3ba5c58..781531f 100644
--- a/debian/modules/nginx-lua/t/005-exit.t
+++ b/debian/modules/nginx-lua/t/005-exit.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #repeat_each(20000);
diff --git a/debian/modules/nginx-lua/t/006-escape.t b/debian/modules/nginx-lua/t/006-escape.t
index 5b801da..7b26bba 100644
--- a/debian/modules/nginx-lua/t/006-escape.t
+++ b/debian/modules/nginx-lua/t/006-escape.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/007-md5.t b/debian/modules/nginx-lua/t/007-md5.t
index 6d851e7..501e3af 100644
--- a/debian/modules/nginx-lua/t/007-md5.t
+++ b/debian/modules/nginx-lua/t/007-md5.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/008-today.t b/debian/modules/nginx-lua/t/008-today.t
index a8199df..02169c8 100644
--- a/debian/modules/nginx-lua/t/008-today.t
+++ b/debian/modules/nginx-lua/t/008-today.t
@@ -1,5 +1,5 @@
 # vim:set ft=perl ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/009-log.t b/debian/modules/nginx-lua/t/009-log.t
index 70202ee..e06c799 100644
--- a/debian/modules/nginx-lua/t/009-log.t
+++ b/debian/modules/nginx-lua/t/009-log.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/010-request_body.t b/debian/modules/nginx-lua/t/010-request_body.t
index 65f7ccb..d200495 100644
--- a/debian/modules/nginx-lua/t/010-request_body.t
+++ b/debian/modules/nginx-lua/t/010-request_body.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/011-md5_bin.t b/debian/modules/nginx-lua/t/011-md5_bin.t
index 50e0762..48b8c61 100644
--- a/debian/modules/nginx-lua/t/011-md5_bin.t
+++ b/debian/modules/nginx-lua/t/011-md5_bin.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/012-now.t b/debian/modules/nginx-lua/t/012-now.t
index ae14a12..abcb735 100644
--- a/debian/modules/nginx-lua/t/012-now.t
+++ b/debian/modules/nginx-lua/t/012-now.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/013-base64.t b/debian/modules/nginx-lua/t/013-base64.t
index 95db9a1..6903218 100644
--- a/debian/modules/nginx-lua/t/013-base64.t
+++ b/debian/modules/nginx-lua/t/013-base64.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/014-bugs.t b/debian/modules/nginx-lua/t/014-bugs.t
index 6461783..44337e3 100644
--- a/debian/modules/nginx-lua/t/014-bugs.t
+++ b/debian/modules/nginx-lua/t/014-bugs.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/015-status.t b/debian/modules/nginx-lua/t/015-status.t
index ba14e70..2e026f1 100644
--- a/debian/modules/nginx-lua/t/015-status.t
+++ b/debian/modules/nginx-lua/t/015-status.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/016-resp-header.t b/debian/modules/nginx-lua/t/016-resp-header.t
index 38765dc..e23b48f 100644
--- a/debian/modules/nginx-lua/t/016-resp-header.t
+++ b/debian/modules/nginx-lua/t/016-resp-header.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
@@ -9,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 34);
+plan tests => repeat_each() * (blocks() * 3 + 38);
 
 #no_diff();
 no_long_string();
@@ -1404,3 +1403,46 @@ Location: http://test.com/foo/bar
 --- no_error_log
 [error]
 
+
+
+=== TEST 67: ngx.header["Content-Type"] with ngx_gzip
+--- config
+    gzip             on;
+    gzip_min_length  1;
+    location = /test2 {
+        content_by_lua '
+            ngx.header["Content-Type"] = "text/html; charset=utf-8"
+            ngx.say("test")
+        ';
+    }
+--- request
+GET /test2
+--- more_headers
+Accept-Encoding: gzip
+--- response_headers
+Content-Encoding: gzip
+Content-Type: text/html; charset=utf-8
+--- response_body_like chomp
+[^[:ascii:]]+
+--- no_error_log
+[error]
+
+
+
+=== TEST 68: ngx.header["Content-Type"] with "; blah"
+--- config
+    location = /test2 {
+        content_by_lua '
+            ngx.header["Content-Type"] = "; blah"
+            ngx.say("test")
+        ';
+    }
+--- request
+GET /test2
+--- response_headers
+!Content-Encoding
+Content-Type: ; blah
+--- response_body
+test
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/017-exec.t b/debian/modules/nginx-lua/t/017-exec.t
index 94defa2..4c7a918 100644
--- a/debian/modules/nginx-lua/t/017-exec.t
+++ b/debian/modules/nginx-lua/t/017-exec.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/018-ndk.t b/debian/modules/nginx-lua/t/018-ndk.t
index 677e908..d68306b 100644
--- a/debian/modules/nginx-lua/t/018-ndk.t
+++ b/debian/modules/nginx-lua/t/018-ndk.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/019-const.t b/debian/modules/nginx-lua/t/019-const.t
index 9ac0ce9..fe79bfb 100644
--- a/debian/modules/nginx-lua/t/019-const.t
+++ b/debian/modules/nginx-lua/t/019-const.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/020-subrequest.t b/debian/modules/nginx-lua/t/020-subrequest.t
index e3357be..21e728d 100644
--- a/debian/modules/nginx-lua/t/020-subrequest.t
+++ b/debian/modules/nginx-lua/t/020-subrequest.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #master_on();
@@ -8,6 +8,7 @@ use Test::Nginx::Socket::Lua;
 #log_level('warn');
 #master_process_enabled(1);
 
+no_root_location;
 repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 3 + 22);
@@ -2797,3 +2798,76 @@ image header filter
 --- no_error_log
 [error]
 
+
+
+=== TEST 75: WebDAV + MOVE
+--- config
+    location = /t {
+        content_by_lua_block {
+            local file1 = "/file1.txt"
+            local file2 = "/file2.txt"
+            ngx.req.set_header( "Destination", file2 )
+            local res = ngx.location.capture(
+                file1, { method = ngx.HTTP_MOVE }
+            )
+
+            ngx.say(
+                "MOVE ", file1, " -> ", file2,
+                ", response status: ", res.status
+            )
+        }
+    }
+
+    location / {
+        dav_methods MOVE;
+    }
+
+--- user_files
+>>> file1.txt
+hello, world!
+
+--- request
+GET /t
+
+--- response_body
+MOVE /file1.txt -> /file2.txt, response status: 204
+
+--- no_error_log
+[error]
+--- error_code: 200
+
+
+
+=== TEST 76: WebDAV + DELETE
+--- config
+    location = /t {
+        content_by_lua_block {
+            local file = "/file.txt"
+            local res = ngx.location.capture(
+                file, { method = ngx.HTTP_DELETE }
+            )
+
+            ngx.say(
+                "DELETE ", file,
+                ", response status: ", res.status
+            )
+        }
+    }
+
+    location / {
+        dav_methods DELETE;
+    }
+
+--- user_files
+>>> file.txt
+hello, world!
+
+--- request
+GET /t
+
+--- response_body
+DELETE /file.txt, response status: 204
+
+--- no_error_log
+[error]
+--- error_code: 200
diff --git a/debian/modules/nginx-lua/t/021-cookie-time.t b/debian/modules/nginx-lua/t/021-cookie-time.t
index fb24d30..c00bbea 100644
--- a/debian/modules/nginx-lua/t/021-cookie-time.t
+++ b/debian/modules/nginx-lua/t/021-cookie-time.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/022-redirect.t b/debian/modules/nginx-lua/t/022-redirect.t
index 1f874ec..0e2a107 100644
--- a/debian/modules/nginx-lua/t/022-redirect.t
+++ b/debian/modules/nginx-lua/t/022-redirect.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/client-abort.t b/debian/modules/nginx-lua/t/023-rewrite/client-abort.t
index 3b3f242..e970802 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/client-abort.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/client-abort.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/023-rewrite/exec.t b/debian/modules/nginx-lua/t/023-rewrite/exec.t
index 1186c14..a063b5b 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/exec.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/exec.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/exit.t b/debian/modules/nginx-lua/t/023-rewrite/exit.t
index 280602b..9d292f7 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/exit.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/exit.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #repeat_each(20000);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/mixed.t b/debian/modules/nginx-lua/t/023-rewrite/mixed.t
index 17e38c7..1156567 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/mixed.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/mixed.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/multi-capture.t b/debian/modules/nginx-lua/t/023-rewrite/multi-capture.t
index 7f1a923..44629b0 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/multi-capture.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/multi-capture.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(10);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/on-abort.t b/debian/modules/nginx-lua/t/023-rewrite/on-abort.t
index f5a5ef8..aca2ab6 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/on-abort.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/on-abort.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/023-rewrite/redirect.t b/debian/modules/nginx-lua/t/023-rewrite/redirect.t
index e4a46cc..8843f1a 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/redirect.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/redirect.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
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 c085c0f..2f42e0a 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/req-body.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/req-body.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/req-socket.t b/debian/modules/nginx-lua/t/023-rewrite/req-socket.t
index 59dac5d..34aedaa 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/req-socket.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/req-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/request_body.t b/debian/modules/nginx-lua/t/023-rewrite/request_body.t
index db87e5f..665d6de 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/request_body.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/request_body.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/sanity.t b/debian/modules/nginx-lua/t/023-rewrite/sanity.t
index f213f53..20b00e2 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/sanity.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/sanity.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/sleep.t b/debian/modules/nginx-lua/t/023-rewrite/sleep.t
index e8d88f0..1719784 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/sleep.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/sleep.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t b/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t
index 85a9b53..50de0b3 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/subrequest.t b/debian/modules/nginx-lua/t/023-rewrite/subrequest.t
index 12321e6..3c206a8 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/subrequest.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/subrequest.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
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
index 129f711..79cd0b9 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t
@@ -20,7 +20,6 @@ BEGIN {
     $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'get helloworld';
 }
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
index fdac782..9b39ba1 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t b/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
index d19ba8c..098dd67 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t
index d929670..2bea7e7 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
index f17c9c3..266d5ab 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
index 6d4f0a1..0f125e0 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t
index b65e748..58af7d0 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/024-access/auth.t b/debian/modules/nginx-lua/t/024-access/auth.t
index 4b7927c..5da09cb 100644
--- a/debian/modules/nginx-lua/t/024-access/auth.t
+++ b/debian/modules/nginx-lua/t/024-access/auth.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/024-access/client-abort.t b/debian/modules/nginx-lua/t/024-access/client-abort.t
index 528838e..a94f822 100644
--- a/debian/modules/nginx-lua/t/024-access/client-abort.t
+++ b/debian/modules/nginx-lua/t/024-access/client-abort.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/024-access/exec.t b/debian/modules/nginx-lua/t/024-access/exec.t
index f6e3e76..8bf638f 100644
--- a/debian/modules/nginx-lua/t/024-access/exec.t
+++ b/debian/modules/nginx-lua/t/024-access/exec.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/024-access/exit.t b/debian/modules/nginx-lua/t/024-access/exit.t
index 39d39ea..8470ab9 100644
--- a/debian/modules/nginx-lua/t/024-access/exit.t
+++ b/debian/modules/nginx-lua/t/024-access/exit.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #repeat_each(20000);
diff --git a/debian/modules/nginx-lua/t/024-access/mixed.t b/debian/modules/nginx-lua/t/024-access/mixed.t
index 1644c6c..d801216 100644
--- a/debian/modules/nginx-lua/t/024-access/mixed.t
+++ b/debian/modules/nginx-lua/t/024-access/mixed.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/024-access/multi-capture.t b/debian/modules/nginx-lua/t/024-access/multi-capture.t
index caa6755..368d401 100644
--- a/debian/modules/nginx-lua/t/024-access/multi-capture.t
+++ b/debian/modules/nginx-lua/t/024-access/multi-capture.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(10);
diff --git a/debian/modules/nginx-lua/t/024-access/on-abort.t b/debian/modules/nginx-lua/t/024-access/on-abort.t
index 638c644..0c17b55 100644
--- a/debian/modules/nginx-lua/t/024-access/on-abort.t
+++ b/debian/modules/nginx-lua/t/024-access/on-abort.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/024-access/redirect.t b/debian/modules/nginx-lua/t/024-access/redirect.t
index b8c3519..c7ce512 100644
--- a/debian/modules/nginx-lua/t/024-access/redirect.t
+++ b/debian/modules/nginx-lua/t/024-access/redirect.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
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 4d8eb78..fd33aff 100644
--- a/debian/modules/nginx-lua/t/024-access/req-body.t
+++ b/debian/modules/nginx-lua/t/024-access/req-body.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/024-access/request_body.t b/debian/modules/nginx-lua/t/024-access/request_body.t
index 0e83801..e4ac161 100644
--- a/debian/modules/nginx-lua/t/024-access/request_body.t
+++ b/debian/modules/nginx-lua/t/024-access/request_body.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/024-access/sanity.t b/debian/modules/nginx-lua/t/024-access/sanity.t
index f5b9f70..de63a68 100644
--- a/debian/modules/nginx-lua/t/024-access/sanity.t
+++ b/debian/modules/nginx-lua/t/024-access/sanity.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/024-access/satisfy.t b/debian/modules/nginx-lua/t/024-access/satisfy.t
index 55724a6..10d3ece 100644
--- a/debian/modules/nginx-lua/t/024-access/satisfy.t
+++ b/debian/modules/nginx-lua/t/024-access/satisfy.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/024-access/sleep.t b/debian/modules/nginx-lua/t/024-access/sleep.t
index cbf2362..2eb0822 100644
--- a/debian/modules/nginx-lua/t/024-access/sleep.t
+++ b/debian/modules/nginx-lua/t/024-access/sleep.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/024-access/subrequest.t b/debian/modules/nginx-lua/t/024-access/subrequest.t
index 0347d51..00c56b8 100644
--- a/debian/modules/nginx-lua/t/024-access/subrequest.t
+++ b/debian/modules/nginx-lua/t/024-access/subrequest.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-exec.t b/debian/modules/nginx-lua/t/024-access/uthread-exec.t
index b8d01e0..d7c2321 100644
--- a/debian/modules/nginx-lua/t/024-access/uthread-exec.t
+++ b/debian/modules/nginx-lua/t/024-access/uthread-exec.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-exit.t b/debian/modules/nginx-lua/t/024-access/uthread-exit.t
index a843d3b..c08fefc 100644
--- a/debian/modules/nginx-lua/t/024-access/uthread-exit.t
+++ b/debian/modules/nginx-lua/t/024-access/uthread-exit.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-redirect.t b/debian/modules/nginx-lua/t/024-access/uthread-redirect.t
index 620fcc0..8b030ac 100644
--- a/debian/modules/nginx-lua/t/024-access/uthread-redirect.t
+++ b/debian/modules/nginx-lua/t/024-access/uthread-redirect.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-spawn.t b/debian/modules/nginx-lua/t/024-access/uthread-spawn.t
index 4f52019..415e4c0 100644
--- a/debian/modules/nginx-lua/t/024-access/uthread-spawn.t
+++ b/debian/modules/nginx-lua/t/024-access/uthread-spawn.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/025-codecache.t b/debian/modules/nginx-lua/t/025-codecache.t
index f708286..f33452a 100644
--- a/debian/modules/nginx-lua/t/025-codecache.t
+++ b/debian/modules/nginx-lua/t/025-codecache.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/026-mysql.t b/debian/modules/nginx-lua/t/026-mysql.t
index 72622c9..e14ffb6 100644
--- a/debian/modules/nginx-lua/t/026-mysql.t
+++ b/debian/modules/nginx-lua/t/026-mysql.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/027-multi-capture.t b/debian/modules/nginx-lua/t/027-multi-capture.t
index 06873c1..3588c69 100644
--- a/debian/modules/nginx-lua/t/027-multi-capture.t
+++ b/debian/modules/nginx-lua/t/027-multi-capture.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(10);
diff --git a/debian/modules/nginx-lua/t/028-req-header.t b/debian/modules/nginx-lua/t/028-req-header.t
index 1d18c39..77c0b06 100644
--- a/debian/modules/nginx-lua/t/028-req-header.t
+++ b/debian/modules/nginx-lua/t/028-req-header.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
@@ -9,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 21);
+plan tests => repeat_each() * (2 * blocks() + 26);
 
 #no_diff();
 #no_long_string();
@@ -1440,3 +1439,96 @@ AAA: 678
 --- no_error_log
 [error]
 
+
+
+=== TEST 46: clear If-Match req header
+--- config
+    location /t {
+        content_by_lua '
+            ngx.req.clear_header("if-match")
+            if not ngx.send_headers() then
+                return
+            end
+            ngx.say("test")
+        ';
+    }
+--- request
+GET /t
+--- more_headers
+If-Match: abc
+--- response_body
+test
+--- no_error_log
+[error]
+
+
+
+=== TEST 47: clear If-Unmodified-Since req header
+--- config
+    location /t {
+        content_by_lua '
+            ngx.req.clear_header("if-unmodified-since")
+            ngx.header["Last-Modified"] = "Tue, 30 Jun 2011 12:16:36 GMT"
+            if not ngx.send_headers() then
+                return
+            end
+            ngx.say("test")
+        ';
+    }
+--- request
+GET /t
+--- more_headers
+If-Unmodified-Since: Tue, 28 Jun 2011 12:16:36 GMT
+--- response_body
+test
+--- no_error_log
+[error]
+
+
+
+=== TEST 48: clear If-None-Match req header
+--- config
+    location /t {
+        content_by_lua '
+            ngx.req.clear_header("if-none-match")
+            -- ngx.header["etags"] = "abc"
+            if not ngx.send_headers() then
+                return
+            end
+            ngx.say("test")
+        ';
+    }
+--- request
+GET /t
+--- more_headers
+If-None-Match: *
+--- response_body
+test
+--- no_error_log
+[error]
+
+
+
+=== TEST 49: set the Destination request header for WebDav
+--- config
+    location = /a.txt {
+        rewrite_by_lua_block {
+            ngx.req.set_header("Destination", "/b.txt")
+        }
+        dav_methods MOVE;
+        dav_access            all:rw;
+        root                  html;
+    }
+
+--- user_files
+>>> a.txt
+hello, world!
+
+--- request
+MOVE /a.txt
+
+--- response_body
+--- no_error_log
+client sent no "Destination" header
+[error]
+--- error_code: 204
diff --git a/debian/modules/nginx-lua/t/029-http-time.t b/debian/modules/nginx-lua/t/029-http-time.t
index 8ac1725..71a7758 100644
--- a/debian/modules/nginx-lua/t/029-http-time.t
+++ b/debian/modules/nginx-lua/t/029-http-time.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/030-uri-args.t b/debian/modules/nginx-lua/t/030-uri-args.t
index 83b3842..2f18ba7 100644
--- a/debian/modules/nginx-lua/t/030-uri-args.t
+++ b/debian/modules/nginx-lua/t/030-uri-args.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/031-post-args.t b/debian/modules/nginx-lua/t/031-post-args.t
index 209af69..29d6057 100644
--- a/debian/modules/nginx-lua/t/031-post-args.t
+++ b/debian/modules/nginx-lua/t/031-post-args.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/032-iolist.t b/debian/modules/nginx-lua/t/032-iolist.t
index 12c9635..ddf3d7f 100644
--- a/debian/modules/nginx-lua/t/032-iolist.t
+++ b/debian/modules/nginx-lua/t/032-iolist.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/033-ctx.t b/debian/modules/nginx-lua/t/033-ctx.t
index 8301bac..eefb216 100644
--- a/debian/modules/nginx-lua/t/033-ctx.t
+++ b/debian/modules/nginx-lua/t/033-ctx.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/035-gmatch.t b/debian/modules/nginx-lua/t/035-gmatch.t
index b6e3110..04a06ed 100644
--- a/debian/modules/nginx-lua/t/035-gmatch.t
+++ b/debian/modules/nginx-lua/t/035-gmatch.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/036-sub.t b/debian/modules/nginx-lua/t/036-sub.t
index ad8638c..88dc8d6 100644
--- a/debian/modules/nginx-lua/t/036-sub.t
+++ b/debian/modules/nginx-lua/t/036-sub.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/037-gsub.t b/debian/modules/nginx-lua/t/037-gsub.t
index fb4a706..b3bb04e 100644
--- a/debian/modules/nginx-lua/t/037-gsub.t
+++ b/debian/modules/nginx-lua/t/037-gsub.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/038-match-o.t b/debian/modules/nginx-lua/t/038-match-o.t
index 7da2c72..4ccd73a 100644
--- a/debian/modules/nginx-lua/t/038-match-o.t
+++ b/debian/modules/nginx-lua/t/038-match-o.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/039-sub-o.t b/debian/modules/nginx-lua/t/039-sub-o.t
index 05fc0ba..a861b6c 100644
--- a/debian/modules/nginx-lua/t/039-sub-o.t
+++ b/debian/modules/nginx-lua/t/039-sub-o.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/040-gsub-o.t b/debian/modules/nginx-lua/t/040-gsub-o.t
index a371526..90619b0 100644
--- a/debian/modules/nginx-lua/t/040-gsub-o.t
+++ b/debian/modules/nginx-lua/t/040-gsub-o.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/041-header-filter.t b/debian/modules/nginx-lua/t/041-header-filter.t
index c3d495c..553ee43 100644
--- a/debian/modules/nginx-lua/t/041-header-filter.t
+++ b/debian/modules/nginx-lua/t/041-header-filter.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/042-crc32.t b/debian/modules/nginx-lua/t/042-crc32.t
index 1725435..86d9201 100644
--- a/debian/modules/nginx-lua/t/042-crc32.t
+++ b/debian/modules/nginx-lua/t/042-crc32.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/043-shdict.t b/debian/modules/nginx-lua/t/043-shdict.t
index 22ab0d8..4c4d121 100644
--- a/debian/modules/nginx-lua/t/043-shdict.t
+++ b/debian/modules/nginx-lua/t/043-shdict.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
@@ -8,7 +7,7 @@ use Test::Nginx::Socket::Lua;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 17);
+plan tests => repeat_each() * (blocks() * 3 + 18);
 
 #no_diff();
 no_long_string();
@@ -2298,3 +2297,135 @@ foo = nil
 --- no_error_log
 [error]
 
+
+
+=== TEST 86: the lightuserdata ngx.null has no methods of shared dicts.
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local lightuserdata = ngx.null
+            lightuserdata:set("foo", 1)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- grep_error_log chop
+attempt to index local 'lightuserdata' (a userdata value)
+--- grep_error_log_out
+attempt to index local 'lightuserdata' (a userdata value)
+--- error_log
+[error]
+--- no_error_log
+bad "zone" argument
+
+
+
+=== TEST 87: set bad zone table
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            dogs.set({1}, "foo", 1)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad "zone" argument
+
+
+
+=== TEST 88: get bad zone table
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            dogs.get({1}, "foo")
+        ';
+    }
+--- request
+GET /test
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad "zone" argument
+
+
+
+=== TEST 89: incr bad zone table
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            dogs.incr({1}, "foo", 32)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+
+
+
+=== TEST 90: check the type of the shdict object
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            ngx.say("type: ", type(ngx.shared.dogs))
+        ';
+    }
+--- request
+GET /test
+--- response_body
+type: table
+--- no_error_log
+[error]
+
+
+
+=== TEST 91: dogs, cat mixing
+--- http_config
+    lua_shared_dict dogs 1m;
+    lua_shared_dict cats 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))
+
+            local cats = ngx.shared.cats
+            val = cats:get("foo")
+            ngx.say(val or "nil")
+            val = cats:get("bah")
+            ngx.say(val or "nil")
+        ';
+    }
+--- request
+GET /test
+--- response_body
+32 number
+10502 number
+nil
+nil
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/044-req-body.t b/debian/modules/nginx-lua/t/044-req-body.t
index 0246265..f0d0a4d 100644
--- a/debian/modules/nginx-lua/t/044-req-body.t
+++ b/debian/modules/nginx-lua/t/044-req-body.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/045-ngx-var.t b/debian/modules/nginx-lua/t/045-ngx-var.t
index a909040..8f2dcb3 100644
--- a/debian/modules/nginx-lua/t/045-ngx-var.t
+++ b/debian/modules/nginx-lua/t/045-ngx-var.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/046-hmac.t b/debian/modules/nginx-lua/t/046-hmac.t
index d8280e4..686b479 100644
--- a/debian/modules/nginx-lua/t/046-hmac.t
+++ b/debian/modules/nginx-lua/t/046-hmac.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/047-match-jit.t b/debian/modules/nginx-lua/t/047-match-jit.t
index ef5970b..077ebb6 100644
--- a/debian/modules/nginx-lua/t/047-match-jit.t
+++ b/debian/modules/nginx-lua/t/047-match-jit.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/048-match-dfa.t b/debian/modules/nginx-lua/t/048-match-dfa.t
index 6860532..8350a73 100644
--- a/debian/modules/nginx-lua/t/048-match-dfa.t
+++ b/debian/modules/nginx-lua/t/048-match-dfa.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/049-gmatch-jit.t b/debian/modules/nginx-lua/t/049-gmatch-jit.t
index 51e268a..614c440 100644
--- a/debian/modules/nginx-lua/t/049-gmatch-jit.t
+++ b/debian/modules/nginx-lua/t/049-gmatch-jit.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/050-gmatch-dfa.t b/debian/modules/nginx-lua/t/050-gmatch-dfa.t
index 15295ba..c6b87e1 100644
--- a/debian/modules/nginx-lua/t/050-gmatch-dfa.t
+++ b/debian/modules/nginx-lua/t/050-gmatch-dfa.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/051-sub-jit.t b/debian/modules/nginx-lua/t/051-sub-jit.t
index 038fa83..789e897 100644
--- a/debian/modules/nginx-lua/t/051-sub-jit.t
+++ b/debian/modules/nginx-lua/t/051-sub-jit.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/052-sub-dfa.t b/debian/modules/nginx-lua/t/052-sub-dfa.t
index 93c29b6..f4de4d2 100644
--- a/debian/modules/nginx-lua/t/052-sub-dfa.t
+++ b/debian/modules/nginx-lua/t/052-sub-dfa.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/053-gsub-jit.t b/debian/modules/nginx-lua/t/053-gsub-jit.t
index e2c2e22..3a2a1aa 100644
--- a/debian/modules/nginx-lua/t/053-gsub-jit.t
+++ b/debian/modules/nginx-lua/t/053-gsub-jit.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/054-gsub-dfa.t b/debian/modules/nginx-lua/t/054-gsub-dfa.t
index 912fe3a..9c471a9 100644
--- a/debian/modules/nginx-lua/t/054-gsub-dfa.t
+++ b/debian/modules/nginx-lua/t/054-gsub-dfa.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/055-subreq-vars.t b/debian/modules/nginx-lua/t/055-subreq-vars.t
index e2b0658..2fc6960 100644
--- a/debian/modules/nginx-lua/t/055-subreq-vars.t
+++ b/debian/modules/nginx-lua/t/055-subreq-vars.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/056-flush.t b/debian/modules/nginx-lua/t/056-flush.t
index 8b8ee0d..260e39a 100644
--- a/debian/modules/nginx-lua/t/056-flush.t
+++ b/debian/modules/nginx-lua/t/056-flush.t
@@ -4,7 +4,6 @@ BEGIN {
     $ENV{TEST_NGINX_POSTPONE_OUTPUT} = 1;
 }
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/057-flush-timeout.t b/debian/modules/nginx-lua/t/057-flush-timeout.t
index 7420e8e..d6e0f86 100644
--- a/debian/modules/nginx-lua/t/057-flush-timeout.t
+++ b/debian/modules/nginx-lua/t/057-flush-timeout.t
@@ -21,7 +21,6 @@ BEGIN {
     $ENV{TEST_NGINX_POSTPONE_OUTPUT} = 1;
 }
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/058-tcp-socket.t b/debian/modules/nginx-lua/t/058-tcp-socket.t
index a4e6a56..145a07b 100644
--- a/debian/modules/nginx-lua/t/058-tcp-socket.t
+++ b/debian/modules/nginx-lua/t/058-tcp-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/059-unix-socket.t b/debian/modules/nginx-lua/t/059-unix-socket.t
index 3c5f93e..9e9e6df 100644
--- a/debian/modules/nginx-lua/t/059-unix-socket.t
+++ b/debian/modules/nginx-lua/t/059-unix-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/060-lua-memcached.t b/debian/modules/nginx-lua/t/060-lua-memcached.t
index d7fc68f..e1ebb92 100644
--- a/debian/modules/nginx-lua/t/060-lua-memcached.t
+++ b/debian/modules/nginx-lua/t/060-lua-memcached.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/061-lua-redis.t b/debian/modules/nginx-lua/t/061-lua-redis.t
index abde988..d7b1876 100644
--- a/debian/modules/nginx-lua/t/061-lua-redis.t
+++ b/debian/modules/nginx-lua/t/061-lua-redis.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/062-count.t b/debian/modules/nginx-lua/t/062-count.t
index 38c4faf..120d131 100644
--- a/debian/modules/nginx-lua/t/062-count.t
+++ b/debian/modules/nginx-lua/t/062-count.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
@@ -240,20 +239,25 @@ n = 10
 
 
 
-=== TEST 11: entries under ngx._reqsock_meta
---- SKIP
+=== TEST 11: entries under the metatable of req sockets
 --- config
         location = /test {
             content_by_lua '
                 local n = 0
-                for k, v in pairs(ngx._reqsock_meta) do
+                local sock, err = ngx.req.socket()
+                if not sock then
+                    ngx.say("failed to get the request socket: ", err)
+                end
+
+                for k, v in pairs(getmetatable(sock)) do
                     n = n + 1
                 end
                 ngx.say("n = ", n)
             ';
         }
 --- request
-GET /test
+POST /test
+hello world
 --- response_body
 n = 4
 --- no_error_log
@@ -438,3 +442,55 @@ worker: 2
 --- no_error_log
 [error]
 
+
+
+=== TEST 20: entries under the metatable of udp sockets
+--- config
+        location = /test {
+            content_by_lua '
+                local n = 0
+                local sock = ngx.socket.udp()
+                for k, v in pairs(getmetatable(sock)) do
+                    n = n + 1
+                end
+                ngx.say("n = ", n)
+            ';
+        }
+--- request
+GET /test
+--- response_body
+n = 6
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: entries under the metatable of req raw sockets
+--- config
+        location = /test {
+            content_by_lua '
+                local n = 0
+                ngx.req.read_body()
+                local sock, err = ngx.req.socket(true)
+                if not sock then
+                    ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
+                    return
+                end
+
+                for k, v in pairs(getmetatable(sock)) do
+                    n = n + 1
+                end
+
+                local ok, err = sock:send("HTTP/1.1 200 OK\\r\\nContent-Length: 6\\r\\n\\r\\nn = "..n.."\\n")
+                if not ok then
+                    ngx.log(ngx.ERR, "failed to send: ", err)
+                    return
+                end
+            ';
+        }
+--- request
+GET /test
+--- response_body
+n = 5
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/063-abort.t b/debian/modules/nginx-lua/t/063-abort.t
index 2019639..c112ee1 100644
--- a/debian/modules/nginx-lua/t/063-abort.t
+++ b/debian/modules/nginx-lua/t/063-abort.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/064-pcall.t b/debian/modules/nginx-lua/t/064-pcall.t
index cfa344d..cf90a07 100644
--- a/debian/modules/nginx-lua/t/064-pcall.t
+++ b/debian/modules/nginx-lua/t/064-pcall.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 worker_connections(1014);
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 b330019..ec79891 100644
--- a/debian/modules/nginx-lua/t/065-tcp-socket-timeout.t
+++ b/debian/modules/nginx-lua/t/065-tcp-socket-timeout.t
@@ -20,7 +20,6 @@ BEGIN {
     $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'get helloworld';
 }
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/066-socket-receiveuntil.t b/debian/modules/nginx-lua/t/066-socket-receiveuntil.t
index 23fe8a0..3bf5229 100644
--- a/debian/modules/nginx-lua/t/066-socket-receiveuntil.t
+++ b/debian/modules/nginx-lua/t/066-socket-receiveuntil.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/067-req-socket.t b/debian/modules/nginx-lua/t/067-req-socket.t
index 7797521..30a653a 100644
--- a/debian/modules/nginx-lua/t/067-req-socket.t
+++ b/debian/modules/nginx-lua/t/067-req-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/068-socket-keepalive.t b/debian/modules/nginx-lua/t/068-socket-keepalive.t
index 21f9631..a005620 100644
--- a/debian/modules/nginx-lua/t/068-socket-keepalive.t
+++ b/debian/modules/nginx-lua/t/068-socket-keepalive.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/069-null.t b/debian/modules/nginx-lua/t/069-null.t
index 6133545..7761c91 100644
--- a/debian/modules/nginx-lua/t/069-null.t
+++ b/debian/modules/nginx-lua/t/069-null.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/070-sha1.t b/debian/modules/nginx-lua/t/070-sha1.t
index e6fe687..8648a8c 100644
--- a/debian/modules/nginx-lua/t/070-sha1.t
+++ b/debian/modules/nginx-lua/t/070-sha1.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/071-idle-socket.t b/debian/modules/nginx-lua/t/071-idle-socket.t
index 049e291..55d25c6 100644
--- a/debian/modules/nginx-lua/t/071-idle-socket.t
+++ b/debian/modules/nginx-lua/t/071-idle-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/072-conditional-get.t b/debian/modules/nginx-lua/t/072-conditional-get.t
index 10a5370..4bb567a 100644
--- a/debian/modules/nginx-lua/t/072-conditional-get.t
+++ b/debian/modules/nginx-lua/t/072-conditional-get.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/073-backtrace.t b/debian/modules/nginx-lua/t/073-backtrace.t
index 914fa15..aae4bae 100644
--- a/debian/modules/nginx-lua/t/073-backtrace.t
+++ b/debian/modules/nginx-lua/t/073-backtrace.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/074-prefix-var.t b/debian/modules/nginx-lua/t/074-prefix-var.t
index c95517f..3cc4587 100644
--- a/debian/modules/nginx-lua/t/074-prefix-var.t
+++ b/debian/modules/nginx-lua/t/074-prefix-var.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/075-logby.t b/debian/modules/nginx-lua/t/075-logby.t
index 5dadb9f..f987c8e 100644
--- a/debian/modules/nginx-lua/t/075-logby.t
+++ b/debian/modules/nginx-lua/t/075-logby.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/076-no-postpone.t b/debian/modules/nginx-lua/t/076-no-postpone.t
index 655650e..d19bb77 100644
--- a/debian/modules/nginx-lua/t/076-no-postpone.t
+++ b/debian/modules/nginx-lua/t/076-no-postpone.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/077-sleep.t b/debian/modules/nginx-lua/t/077-sleep.t
index c4d7c0c..a7c251a 100644
--- a/debian/modules/nginx-lua/t/077-sleep.t
+++ b/debian/modules/nginx-lua/t/077-sleep.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/078-hup-vars.t b/debian/modules/nginx-lua/t/078-hup-vars.t
index d6667c7..8acc346 100644
--- a/debian/modules/nginx-lua/t/078-hup-vars.t
+++ b/debian/modules/nginx-lua/t/078-hup-vars.t
@@ -12,7 +12,6 @@ BEGIN {
     }
 }
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua $SkipReason ? (skip_all => $SkipReason) : ();
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/079-unused-directives.t b/debian/modules/nginx-lua/t/079-unused-directives.t
index c06d228..cba0e41 100644
--- a/debian/modules/nginx-lua/t/079-unused-directives.t
+++ b/debian/modules/nginx-lua/t/079-unused-directives.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
@@ -10,7 +9,7 @@ log_level('debug');
 
 repeat_each(2);
 
-plan tests => repeat_each() * 120;
+plan tests => repeat_each() * 110;
 
 #no_diff();
 #no_long_string();
@@ -264,6 +263,9 @@ lua log handler, uri:"/t"
 
 
 === TEST 11: header_filter_by_lua with multiple http blocks (github issue #294)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
 --- config
     location = /t {
         echo ok;
@@ -289,6 +291,9 @@ ok
 
 
 === TEST 12: body_filter_by_lua in multiple http blocks (github issue #294)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
 --- config
     location = /t {
         echo -n ok;
@@ -312,6 +317,9 @@ okay
 
 
 === TEST 13: capture filter with multiple http blocks (github issue #294)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
 --- config
     location = /t {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/080-hup-shdict.t b/debian/modules/nginx-lua/t/080-hup-shdict.t
index ac3ee00..f9a0278 100644
--- a/debian/modules/nginx-lua/t/080-hup-shdict.t
+++ b/debian/modules/nginx-lua/t/080-hup-shdict.t
@@ -12,7 +12,6 @@ BEGIN {
     }
 }
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua $SkipReason ? (skip_all => $SkipReason) : ();
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/081-bytecode.t b/debian/modules/nginx-lua/t/081-bytecode.t
index 6612235..93139e2 100644
--- a/debian/modules/nginx-lua/t/081-bytecode.t
+++ b/debian/modules/nginx-lua/t/081-bytecode.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/082-body-filter.t b/debian/modules/nginx-lua/t/082-body-filter.t
index 3f7b6da..c0a7c23 100644
--- a/debian/modules/nginx-lua/t/082-body-filter.t
+++ b/debian/modules/nginx-lua/t/082-body-filter.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/083-bad-sock-self.t b/debian/modules/nginx-lua/t/083-bad-sock-self.t
index eb4f215..b93849f 100644
--- a/debian/modules/nginx-lua/t/083-bad-sock-self.t
+++ b/debian/modules/nginx-lua/t/083-bad-sock-self.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t b/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t
index a86afd5..c966015 100644
--- a/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t
+++ b/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/085-if.t b/debian/modules/nginx-lua/t/085-if.t
index c82085f..e08b43c 100644
--- a/debian/modules/nginx-lua/t/085-if.t
+++ b/debian/modules/nginx-lua/t/085-if.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/086-init-by.t b/debian/modules/nginx-lua/t/086-init-by.t
index f9ed12c..3a474fe 100644
--- a/debian/modules/nginx-lua/t/086-init-by.t
+++ b/debian/modules/nginx-lua/t/086-init-by.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/087-udp-socket.t b/debian/modules/nginx-lua/t/087-udp-socket.t
index fd07ff9..39ff54f 100644
--- a/debian/modules/nginx-lua/t/087-udp-socket.t
+++ b/debian/modules/nginx-lua/t/087-udp-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/088-req-method.t b/debian/modules/nginx-lua/t/088-req-method.t
index aceb877..9ced40c 100644
--- a/debian/modules/nginx-lua/t/088-req-method.t
+++ b/debian/modules/nginx-lua/t/088-req-method.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/090-log-socket-errors.t b/debian/modules/nginx-lua/t/090-log-socket-errors.t
index 1e41491..a5943c2 100644
--- a/debian/modules/nginx-lua/t/090-log-socket-errors.t
+++ b/debian/modules/nginx-lua/t/090-log-socket-errors.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/091-coroutine.t b/debian/modules/nginx-lua/t/091-coroutine.t
index c7c5922..b047ccb 100644
--- a/debian/modules/nginx-lua/t/091-coroutine.t
+++ b/debian/modules/nginx-lua/t/091-coroutine.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/092-eof.t b/debian/modules/nginx-lua/t/092-eof.t
index 7b852b3..a75711f 100644
--- a/debian/modules/nginx-lua/t/092-eof.t
+++ b/debian/modules/nginx-lua/t/092-eof.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/093-uthread-spawn.t b/debian/modules/nginx-lua/t/093-uthread-spawn.t
index e6dba5f..772e866 100644
--- a/debian/modules/nginx-lua/t/093-uthread-spawn.t
+++ b/debian/modules/nginx-lua/t/093-uthread-spawn.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/094-uthread-exit.t b/debian/modules/nginx-lua/t/094-uthread-exit.t
index 1bd970c..4d1d316 100644
--- a/debian/modules/nginx-lua/t/094-uthread-exit.t
+++ b/debian/modules/nginx-lua/t/094-uthread-exit.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/095-uthread-exec.t b/debian/modules/nginx-lua/t/095-uthread-exec.t
index 2309fbe..4459360 100644
--- a/debian/modules/nginx-lua/t/095-uthread-exec.t
+++ b/debian/modules/nginx-lua/t/095-uthread-exec.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/096-uthread-redirect.t b/debian/modules/nginx-lua/t/096-uthread-redirect.t
index 177e071..b0258fb 100644
--- a/debian/modules/nginx-lua/t/096-uthread-redirect.t
+++ b/debian/modules/nginx-lua/t/096-uthread-redirect.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/097-uthread-rewrite.t b/debian/modules/nginx-lua/t/097-uthread-rewrite.t
index bf88864..178a374 100644
--- a/debian/modules/nginx-lua/t/097-uthread-rewrite.t
+++ b/debian/modules/nginx-lua/t/097-uthread-rewrite.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/098-uthread-wait.t b/debian/modules/nginx-lua/t/098-uthread-wait.t
index 1f064f3..aaf020a 100644
--- a/debian/modules/nginx-lua/t/098-uthread-wait.t
+++ b/debian/modules/nginx-lua/t/098-uthread-wait.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/099-c-api.t b/debian/modules/nginx-lua/t/099-c-api.t
index a61b8f4..a0b375c 100644
--- a/debian/modules/nginx-lua/t/099-c-api.t
+++ b/debian/modules/nginx-lua/t/099-c-api.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
@@ -361,3 +360,38 @@ foo: rc=-5
 --- no_error_log
 [error]
 
+
+
+=== TEST 7: find zone (multiple zones)
+--- http_config
+    lua_shared_dict dogs 1m;
+    lua_shared_dict cats 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, "cats", 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local cats = tostring(zone)
+
+            ffi.copy(buf, "dogs", 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local dogs = tostring(zone)
+
+            ngx.say("dogs == cats ? ", dogs == cats)
+            -- ngx.say("dogs: ", dogs)
+            -- ngx.say("cats ", cats)
+        ';
+    }
+--- request
+GET /test
+--- response_body
+dogs == cats ? false
+--- 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
index 2428388..cd46859 100644
--- a/debian/modules/nginx-lua/t/100-client-abort.t
+++ b/debian/modules/nginx-lua/t/100-client-abort.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/101-on-abort.t b/debian/modules/nginx-lua/t/101-on-abort.t
index 6eed29d..bb74204 100644
--- a/debian/modules/nginx-lua/t/101-on-abort.t
+++ b/debian/modules/nginx-lua/t/101-on-abort.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/102-req-start-time.t b/debian/modules/nginx-lua/t/102-req-start-time.t
index 6ce6196..1d5fe28 100644
--- a/debian/modules/nginx-lua/t/102-req-start-time.t
+++ b/debian/modules/nginx-lua/t/102-req-start-time.t
@@ -1,7 +1,6 @@
 # -*- mode: conf -*-
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/103-req-http-ver.t b/debian/modules/nginx-lua/t/103-req-http-ver.t
index 89b491f..6ded75a 100644
--- a/debian/modules/nginx-lua/t/103-req-http-ver.t
+++ b/debian/modules/nginx-lua/t/103-req-http-ver.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/104-req-raw-header.t b/debian/modules/nginx-lua/t/104-req-raw-header.t
index 5fe326b..439b9de 100644
--- a/debian/modules/nginx-lua/t/104-req-raw-header.t
+++ b/debian/modules/nginx-lua/t/104-req-raw-header.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/105-pressure.t b/debian/modules/nginx-lua/t/105-pressure.t
index ce9d8b4..10f495e 100644
--- a/debian/modules/nginx-lua/t/105-pressure.t
+++ b/debian/modules/nginx-lua/t/105-pressure.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/106-timer.t b/debian/modules/nginx-lua/t/106-timer.t
index 497ffa2..5cfc01b 100644
--- a/debian/modules/nginx-lua/t/106-timer.t
+++ b/debian/modules/nginx-lua/t/106-timer.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/107-timer-errors.t b/debian/modules/nginx-lua/t/107-timer-errors.t
index 5e9b664..9ed1334 100644
--- a/debian/modules/nginx-lua/t/107-timer-errors.t
+++ b/debian/modules/nginx-lua/t/107-timer-errors.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/108-timer-safe.t b/debian/modules/nginx-lua/t/108-timer-safe.t
index 94c322d..19c9f6d 100644
--- a/debian/modules/nginx-lua/t/108-timer-safe.t
+++ b/debian/modules/nginx-lua/t/108-timer-safe.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/109-timer-hup.t b/debian/modules/nginx-lua/t/109-timer-hup.t
index 5cdf75b..15aaa0e 100644
--- a/debian/modules/nginx-lua/t/109-timer-hup.t
+++ b/debian/modules/nginx-lua/t/109-timer-hup.t
@@ -12,7 +12,6 @@ BEGIN {
     }
 }
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua $SkipReason ? (skip_all => $SkipReason) : ();
 
 
diff --git a/debian/modules/nginx-lua/t/110-etag.t b/debian/modules/nginx-lua/t/110-etag.t
index d6f2864..351fec4 100644
--- a/debian/modules/nginx-lua/t/110-etag.t
+++ b/debian/modules/nginx-lua/t/110-etag.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/111-req-header-ua.t b/debian/modules/nginx-lua/t/111-req-header-ua.t
index 7d395c8..7c980d0 100644
--- a/debian/modules/nginx-lua/t/111-req-header-ua.t
+++ b/debian/modules/nginx-lua/t/111-req-header-ua.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/112-req-header-conn.t b/debian/modules/nginx-lua/t/112-req-header-conn.t
index 4926a01..51df730 100644
--- a/debian/modules/nginx-lua/t/112-req-header-conn.t
+++ b/debian/modules/nginx-lua/t/112-req-header-conn.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/113-req-header-cookie.t b/debian/modules/nginx-lua/t/113-req-header-cookie.t
index df08205..b26b709 100644
--- a/debian/modules/nginx-lua/t/113-req-header-cookie.t
+++ b/debian/modules/nginx-lua/t/113-req-header-cookie.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/114-config.t b/debian/modules/nginx-lua/t/114-config.t
index fa97eb1..e6d75fc 100644
--- a/debian/modules/nginx-lua/t/114-config.t
+++ b/debian/modules/nginx-lua/t/114-config.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/115-quote-sql-str.t b/debian/modules/nginx-lua/t/115-quote-sql-str.t
index e473b21..0c20dfb 100644
--- a/debian/modules/nginx-lua/t/115-quote-sql-str.t
+++ b/debian/modules/nginx-lua/t/115-quote-sql-str.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/116-raw-req-socket.t b/debian/modules/nginx-lua/t/116-raw-req-socket.t
index 81b84bd..c2ff8f7 100644
--- a/debian/modules/nginx-lua/t/116-raw-req-socket.t
+++ b/debian/modules/nginx-lua/t/116-raw-req-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t b/debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t
index 46e7d71..4e3929b 100644
--- a/debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t
+++ b/debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t
@@ -21,7 +21,6 @@ BEGIN {
     $ENV{TEST_NGINX_POSTPONE_OUTPUT} = 1;
 }
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/118-use-default-type.t b/debian/modules/nginx-lua/t/118-use-default-type.t
index fd77cff..6008d65 100644
--- a/debian/modules/nginx-lua/t/118-use-default-type.t
+++ b/debian/modules/nginx-lua/t/118-use-default-type.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/119-config-prefix.t b/debian/modules/nginx-lua/t/119-config-prefix.t
index 047c68e..4581aa1 100644
--- a/debian/modules/nginx-lua/t/119-config-prefix.t
+++ b/debian/modules/nginx-lua/t/119-config-prefix.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/121-version.t b/debian/modules/nginx-lua/t/121-version.t
index 4ddd263..2b7a306 100644
--- a/debian/modules/nginx-lua/t/121-version.t
+++ b/debian/modules/nginx-lua/t/121-version.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/123-lua-path.t b/debian/modules/nginx-lua/t/123-lua-path.t
index 964b48b..da97909 100644
--- a/debian/modules/nginx-lua/t/123-lua-path.t
+++ b/debian/modules/nginx-lua/t/123-lua-path.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/124-init-worker.t b/debian/modules/nginx-lua/t/124-init-worker.t
index ce86fee..d6ea675 100644
--- a/debian/modules/nginx-lua/t/124-init-worker.t
+++ b/debian/modules/nginx-lua/t/124-init-worker.t
@@ -9,7 +9,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 4 + 1);
+plan tests => repeat_each() * (blocks() * 4);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
@@ -740,3 +740,19 @@ ok
 Bad bad bad
 --- skip_nginx: 4: < 1.7.1
 
+
+
+=== TEST 19: fake module calls ngx_http_conf_get_module_srv_conf in its merge_srv_conf callback (GitHub issue #554)
+This also affects merge_loc_conf
+--- http_config
+    init_worker_by_lua return;
+--- config
+    location = /t {
+        return 200 ok;
+    }
+--- request
+GET /t
+--- response_body chomp
+ok
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/125-configure-args.t b/debian/modules/nginx-lua/t/125-configure-args.t
index d37a218..adec129 100644
--- a/debian/modules/nginx-lua/t/125-configure-args.t
+++ b/debian/modules/nginx-lua/t/125-configure-args.t
@@ -1,5 +1,4 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/126-shdict-frag.t b/debian/modules/nginx-lua/t/126-shdict-frag.t
index 8c1ad75..94422fb 100644
--- a/debian/modules/nginx-lua/t/126-shdict-frag.t
+++ b/debian/modules/nginx-lua/t/126-shdict-frag.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/127-uthread-kill.t b/debian/modules/nginx-lua/t/127-uthread-kill.t
index a5afc2b..2ab8abe 100644
--- a/debian/modules/nginx-lua/t/127-uthread-kill.t
+++ b/debian/modules/nginx-lua/t/127-uthread-kill.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 use t::StapThread;
 
diff --git a/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t b/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
index 571bdc8..0bf38d0 100644
--- a/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
+++ b/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
diff --git a/debian/modules/nginx-lua/t/129-ssl-socket.t b/debian/modules/nginx-lua/t/129-ssl-socket.t
index bb04110..45eaa82 100644
--- a/debian/modules/nginx-lua/t/129-ssl-socket.t
+++ b/debian/modules/nginx-lua/t/129-ssl-socket.t
@@ -1,6 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use lib 'lib';
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
@@ -102,13 +101,13 @@ __DATA__
 
 --- request
 GET /t
---- response_body
-connected: 1
+--- response_body_like chop
+\Aconnected: 1
 ssl handshake: userdata
 sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+received: HTTP/1.1 (?:200 OK|302 Found)
 close: 1 nil
-
+\z
 --- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 --- grep_error_log_out eval
 qr/^lua ssl save session: ([0-9A-F]+):2
@@ -920,13 +919,13 @@ $::EquifaxRootCertificate"
 
 --- request
 GET /t
---- response_body
-connected: 1
+--- response_body_like chop
+\Aconnected: 1
 ssl handshake: userdata
 sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+received: HTTP/1.1 (?:200 OK|302 Found)
 close: 1 nil
-
+\z
 --- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 --- grep_error_log_out eval
 qr/^lua ssl save session: ([0-9A-F]+):2
diff --git a/debian/modules/nginx-lua/t/130-internal-api.t b/debian/modules/nginx-lua/t/130-internal-api.t
index c40bf13..d641ab5 100644
--- a/debian/modules/nginx-lua/t/130-internal-api.t
+++ b/debian/modules/nginx-lua/t/130-internal-api.t
@@ -1,5 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
diff --git a/debian/modules/nginx-lua/t/132-lua-blocks.t b/debian/modules/nginx-lua/t/132-lua-blocks.t
new file mode 100644
index 0000000..874d017
--- /dev/null
+++ b/debian/modules/nginx-lua/t/132-lua-blocks.t
@@ -0,0 +1,490 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+#repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 3 + 4);
+
+#no_diff();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: content_by_lua_block (simplest)
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.say("hello, world")
+        }
+    }
+--- request
+GET /t
+--- response_body
+hello, world
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: content_by_lua_block (nested curly braces)
+--- config
+    location = /t {
+        content_by_lua_block {
+            local a = {
+                dogs = {32, 78, 96},
+                cat = "kitty",
+            }
+            ngx.say("a.dogs[1] = ", a.dogs[1])
+            ngx.say("a.dogs[2] = ", a.dogs[2])
+            ngx.say("a.dogs[3] = ", a.dogs[3])
+            ngx.say("a.cat = ", a.cat)
+        }
+    }
+--- request
+GET /t
+--- response_body
+a.dogs[1] = 32
+a.dogs[2] = 78
+a.dogs[3] = 96
+a.cat = kitty
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: content_by_lua_block (curly braces in strings)
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.say("}1, 2)")
+            ngx.say('{1, 2)')
+        }
+    }
+--- request
+GET /t
+--- response_body
+}1, 2)
+{1, 2)
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: content_by_lua_block (curly braces in strings, with escaped terminators)
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.say("\"}1, 2)")
+            ngx.say('\'{1, 2)')
+        }
+    }
+--- request
+GET /t
+--- response_body
+"}1, 2)
+'{1, 2)
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: content_by_lua_block (curly braces in long brackets)
+--- config
+    location = /t {
+        content_by_lua_block {
+            --[[
+                {{{
+
+                        }
+            ]]
+            --[==[
+                }}}
+
+                        {
+            ]==]
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: content_by_lua_block ("nested" long brackets)
+--- config
+    location = /t {
+        content_by_lua_block {
+            --[[
+                ]=]
+            '  "
+                        }
+            ]]
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: content_by_lua_block (curly braces in line comments)
+--- config
+    location = /t {
+        content_by_lua_block {
+            --}} {}
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: content_by_lua_block (cosockets)
+--- config
+    server_tokens off;
+    location = /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+            local ok, err = sock:connect('127.0.0.1', tonumber(ngx.var.server_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)
+        }
+    }
+
+    location /foo {
+        content_by_lua_block { 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: 1 nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: all in one
+--- http_config
+    init_by_lua_block {
+        glob = "init by lua }here{"
+    }
+
+    init_worker_by_lua_block {
+        glob = glob .. ", init worker }here{"
+    }
+--- config
+    location = /t {
+        set $a '';
+        rewrite_by_lua_block {
+            local s = ngx.var.a
+            s = s .. "}rewrite{\n"
+            ngx.var.a = s
+        }
+        access_by_lua_block {
+            local s = ngx.var.a
+            s = s .. '}access{\n'
+            ngx.var.a = s
+        }
+        content_by_lua_block {
+            local s = ngx.var.a
+            s = s .. [[}content{]]
+            ngx.say(s)
+            ngx.say("glob: ", glob)
+        }
+        log_by_lua_block {
+            print("log by lua running \"}{!\"")
+        }
+        header_filter_by_lua_block {
+            ngx.header["Foo"] = "\"Hello, world\""
+            ngx.header["Content-Length"] = nil
+        }
+        body_filter_by_lua_block {
+            local data, eof = ngx.arg[1], ngx.arg[2]
+            print("eof = ", eof)
+            if eof then
+                if not data then
+                    data = ""
+                end
+                data = data .. "}body filter{\n"
+                print("data: ", data)
+                ngx.arg[1] = data
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+}rewrite{
+}access{
+}content{
+glob: init by lua }here{, init worker }here{
+}body filter{
+
+--- response_headers
+Foo: "Hello, world"
+--- error_log
+log by lua running "}{!"
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: missing ]] (string)
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.say([[hello, world")
+        }
+    }
+--- request
+GET /t
+--- response_body
+hello, world
+--- no_error_log
+[error]
+--- must_die
+--- error_log eval
+qr/\[emerg\] .*? Lua code block missing the closing long bracket "]]" in .*?\bnginx\.conf:41/
+
+
+
+=== TEST 11: missing ]==] (string)
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.say([==[hello, world")
+        }
+    }
+--- request
+GET /t
+--- response_body
+hello, world
+--- no_error_log
+[error]
+--- must_die
+--- error_log eval
+qr/\[emerg\] .*? Lua code block missing the closing long bracket "]==]" in .*?\bnginx\.conf:41/
+
+
+
+=== TEST 12: missing ]] (comment)
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.say(--[[hello, world")
+        }
+    }
+--- request
+GET /t
+--- response_body
+hello, world
+--- no_error_log
+[error]
+--- must_die
+--- error_log eval
+qr/\[emerg\] .*? Lua code block missing the closing long bracket "]]" in .*?\bnginx\.conf:41/
+
+
+
+=== TEST 13: missing ]=] (comment)
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.say(--[=[hello, world")
+        }
+    }
+--- request
+GET /t
+--- response_body
+hello, world
+--- no_error_log
+[error]
+--- must_die
+--- error_log eval
+qr/\[emerg\] .*? Lua code block missing the closing long bracket "]=]" in .*?\bnginx\.conf:41/
+
+
+
+=== TEST 14: missing }
+FIXME: we need better diagnostics by actually loading the inlined Lua code while parsing
+the *_by_lua_block directive.
+
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.say("hello")
+--- request
+GET /t
+--- response_body
+hello, world
+--- no_error_log
+[error]
+--- error_log
+"events" directive is not allowed here
+--- must_die
+
+
+
+=== TEST 15: content_by_lua_block (compact)
+--- config
+    location = /t {
+        content_by_lua_block {ngx.say("hello, world", {"!"})}
+    }
+--- request
+GET /t
+--- response_body
+hello, world!
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: content_by_lua_block (unexpected closing long brackets)
+--- config
+    location = /t {
+        content_by_lua_block {
+            ]=]
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- error_log eval
+qr{\[emerg\] .*? unexpected lua closing long-bracket in .*?/nginx\.conf:41}
+--- must_die
+
+
+
+=== TEST 17: simple set_by_lua_block (integer)
+--- config
+    location /lua {
+        set_by_lua_block $res { return 1+1 }
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body
+2
+--- no_error_log
+[error]
+
+
+
+=== TEST 18: ambiguous line comments inside a long bracket string (GitHub #596)
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.say([[ok--]])
+            ngx.say([==[ok--]==])
+            ngx.say([==[ok-- ]==])
+            --[[ --]] ngx.say("done")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok--
+ok--
+ok-- 
+done
+--- no_error_log
+[error]
+
+
+
+=== TEST 19: double quotes in long brackets
+--- config
+    location = /t {
+        rewrite_by_lua_block { print([[Hey, it is "!]]) } content_by_lua_block { ngx.say([["]]) }
+    }
+--- request
+GET /t
+--- response_body
+"
+--- error_log
+Hey, it is "!
+--- no_error_log
+[error]
+
+
+
+=== TEST 20: single quotes in long brackets
+--- config
+    location = /t {
+        rewrite_by_lua_block { print([[Hey, it is '!]]) } content_by_lua_block { ngx.say([[']]) }
+    }
+--- request
+GET /t
+--- response_body
+'
+--- error_log
+Hey, it is '!
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/data/fake-module/config b/debian/modules/nginx-lua/t/data/fake-module/config
new file mode 100644
index 0000000..00cc8e8
--- /dev/null
+++ b/debian/modules/nginx-lua/t/data/fake-module/config
@@ -0,0 +1,3 @@
+ngx_addon_name=ngx_http_fake_module
+HTTP_MODULES="$HTTP_MODULES ngx_http_fake_module"
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fake_module.c"
diff --git a/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c b/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
new file mode 100644
index 0000000..ec74aa4
--- /dev/null
+++ b/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
@@ -0,0 +1,121 @@
+/* Copyright (C) ZHANG Heng (chiyouhen)
+ *
+ * This fake module was used to reproduce a bug in ngx_lua's
+ * init_worker_by_lua implementation.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+typedef struct {
+    ngx_int_t a;
+} ngx_http_fake_srv_conf_t;
+
+
+typedef struct {
+    ngx_int_t a;
+} ngx_http_fake_loc_conf_t;
+
+
+static void *ngx_http_fake_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_http_fake_merge_srv_conf(ngx_conf_t *cf, void *prev, void *conf);
+static void *ngx_http_fake_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_fake_merge_loc_conf(ngx_conf_t *cf, void *prev, void *conf);
+
+
+/* flow identify module configure struct */
+static ngx_http_module_t  ngx_http_fake_module_ctx = {
+    NULL,                           /* preconfiguration */
+    NULL,                           /* postconfiguration */
+
+    NULL,                           /* create main configuration */
+    NULL,                           /* init main configuration */
+
+    ngx_http_fake_create_srv_conf,  /* create server configuration */
+    ngx_http_fake_merge_srv_conf,   /* merge server configuration */
+
+    ngx_http_fake_create_loc_conf,  /* create location configuration */
+    ngx_http_fake_merge_loc_conf    /* merge location configuration */
+};
+
+/* flow identify module struct */
+ngx_module_t  ngx_http_fake_module = {
+    NGX_MODULE_V1,
+    &ngx_http_fake_module_ctx,      /* module context */
+    NULL,                           /* module directives */
+    NGX_HTTP_MODULE,                /* module type */
+    NULL,                           /* init master */
+    NULL,                           /* init module */
+    NULL,                           /* init process */
+    NULL,                           /* init thread */
+    NULL,                           /* exit thread */
+    NULL,                           /* exit process */
+    NULL,                           /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+/* create server configure */
+static void *ngx_http_fake_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_http_fake_srv_conf_t   *fscf;
+
+    fscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_fake_srv_conf_t));
+    if (fscf == NULL) {
+        return NULL;
+    }
+
+    return fscf;
+}
+
+
+/* merge server configure */
+static char *ngx_http_fake_merge_srv_conf(ngx_conf_t *cf, void *prev, void *conf)
+{
+    ngx_http_fake_srv_conf_t   *fscf;
+
+    fscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_fake_module);
+    if (fscf == NULL) {
+        ngx_conf_log_error(NGX_LOG_ALERT, cf, 0,
+                           "get module srv conf failed in merge srv conf");
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0, "merge srv conf ok");
+    return NGX_CONF_OK;
+}
+
+
+/* create location configure */
+static void *ngx_http_fake_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_fake_loc_conf_t   *flcf;
+
+    flcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_fake_loc_conf_t));
+    if (flcf == NULL) {
+        return NULL;
+    }
+
+    return flcf;
+}
+
+
+/* merge location configure */
+static char *ngx_http_fake_merge_loc_conf(ngx_conf_t *cf, void *prev, void *conf)
+{
+    ngx_http_fake_loc_conf_t   *flcf;
+
+    flcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_fake_module);
+    if (flcf == NULL) {
+        ngx_conf_log_error(NGX_LOG_ALERT, cf, 0,
+                           "get module loc conf failed in merge loc conf");
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0, "merge loc conf ok");
+    return NGX_CONF_OK;
+}
diff --git a/debian/modules/nginx-lua/util/build.sh b/debian/modules/nginx-lua/util/build.sh
deleted file mode 100755
index 6617817..0000000
--- a/debian/modules/nginx-lua/util/build.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# this file is mostly meant to be used by the author himself.
-
-version=${1:-0.8.54}
-opts=$2
-
-root=$(cd ${0%/*}/.. && echo $PWD)
-mkdir -p $root/{build,work}
-
-cd $root
-git submodule update --init
-
-cd $root/build
-if [ ! -s nginx-$version.tar.gz ]; then
-    wget "http://sysoev.ru/nginx/nginx-$version.tar.gz" -O nginx-$version.tar.gz
-fi
-tar -xzvf nginx-$version.tar.gz
-
-cd nginx-$version/
-if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
-	./configure --prefix=$root/work \
-				--add-module=$root \
-				--add-module=$root/deps/ngx_devel_kit \
-				$opts \
-                                --with-debug
-fi
-
-if [ -f $root/work/sbin/nginx ]; then
-    rm -f $root/work/sbin/nginx
-fi
-
-if [ -f $root/work/logs/nginx.pid ]; then
-    kill `cat $root/work/logs/nginx.pid`
-fi
-
-make -j2
-make install
-
diff --git a/debian/modules/nginx-lua/util/build2.sh b/debian/modules/nginx-lua/util/build2.sh
index 21caf1f..5a89c29 100755
--- a/debian/modules/nginx-lua/util/build2.sh
+++ b/debian/modules/nginx-lua/util/build2.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-# this file is mostly meant to be used by the author himself.
+# this script is for developers only.
+# dependent on the ngx-build script from the nginx-devel-utils repostory:
+#   https://github.com/openresty/nginx-devel-utils/blob/master/ngx-build
+# the resulting nginx is located at ./work/nginx/sbin/nginx
 
 root=`pwd`
 version=${1:-1.4.1}
@@ -17,6 +20,7 @@ force=$2
             #--with-cc=gcc46 \
             #--with-cc=clang \
             #--without-http_referer_module \
+            #--with-http_v2_module \
 
 time ngx-build $force $version \
             --with-ipv6 \
@@ -46,7 +50,9 @@ time ngx-build $force $version \
                 --add-module=$root/../rds-json-nginx-module \
                 --add-module=$root/../coolkit-nginx-module \
                 --add-module=$root/../redis2-nginx-module \
+                --add-module=$root/t/data/fake-module \
                 --with-http_gunzip_module \
+                --with-http_dav_module \
           --with-select_module \
           --with-poll_module \
                 $opts \
diff --git a/debian/modules/nginx-lua/util/gen-lexer-c b/debian/modules/nginx-lua/util/gen-lexer-c
new file mode 100755
index 0000000..dfed3fc
--- /dev/null
+++ b/debian/modules/nginx-lua/util/gen-lexer-c
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+if [ -z "$1" ]; then
+    level=0
+else
+    level="$1"
+fi
+
+#echo '{' '}' '\[=*\[' '--\[=*\[' '\]=*\]' '--[^\n]*' '"(?:\\[^\n]|[^"\n\\])*"' $'\'(?:\\\\[^\\n]|[^\'\\n\\\\])*\''
+
+# we need the re.pl script here:
+#   https://github.com/openresty/sregex/blob/dfa-multi-re/re.pl
+re.pl -W --no-main -c --cc="clang -O2" \
+    --func-name ngx_http_lua_lex \
+    --header ngx_http_lua_lex.h -o src/ngx_http_lua_lex.c \
+    --debug=$level -n 8 \
+    -- '{' '}' '\[=*\[' '--\[=*\[' '\]=*\]' '--[^\n]*' '"(?:\\[^\n]|[^"\n\\])*"' $'\'(?:\\\\[^\\n]|[^\'\\n\\\\])*\'' \
+    || exit 1
diff --git a/debian/modules/nginx-lua/valgrind.suppress b/debian/modules/nginx-lua/valgrind.suppress
index a69e606..fe161e8 100644
--- a/debian/modules/nginx-lua/valgrind.suppress
+++ b/debian/modules/nginx-lua/valgrind.suppress
@@ -103,6 +103,13 @@ fun:main
    fun:ngx_alloc
    fun:ngx_event_process_init
 }
+{
+    <insert_a_suppression_name_here>
+    Memcheck:Param
+    sendmsg(mmsg[0].msg_hdr)
+    fun:sendmmsg
+    fun:__libc_res_nsend
+}
 {
    <insert_a_suppression_name_here>
    Memcheck:Param

From b1928b468dcb842a0a989f108d89afa8d7b321d5 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 13 Nov 2015 16:08:16 +0200
Subject: [PATCH 016/600] Release 1.9.6-2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08dd22b..0a868c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-nginx (1.9.6-2) UNRELEASED; urgency=medium
+nginx (1.9.6-2) unstable; urgency=medium
 
   [ Christos Trochalakis]
   * debian/modules/nginx-lua:
     + Update nginx-lua to v0.9.19 fixing HTTP/2 compatibility.
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 13 Nov 2015 16:04:32 +0200
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 13 Nov 2015 16:08:01 +0200
 
 nginx (1.9.6-1) unstable; urgency=medium
 

From 255c62e0b5926e3d5517fe2331cd4f71400afff6 Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Thu, 10 Dec 2015 04:09:20 -0600
Subject: [PATCH 017/600] Changing logrotate from 52 days to 14 because of a
 typo and similar bug. Bug #805322

---
 debian/changelog                    | 7 +++++++
 debian/nginx-common.nginx.logrotate | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0a868c8..3000163 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.9.6-3) UNRELEASED; urgency=medium
+
+  * debian/nginx-common.nginx.logrotate:
+    + Switching logrotate to 14 days. (Closes: #805322)
+
+ -- Michael Lustfield <michael@lustfield.net>  Thu, 10 Dec 2015 04:07:29 -0600
+
 nginx (1.9.6-2) unstable; urgency=medium
 
   [ Christos Trochalakis]
diff --git a/debian/nginx-common.nginx.logrotate b/debian/nginx-common.nginx.logrotate
index 489c31b..1b25aad 100644
--- a/debian/nginx-common.nginx.logrotate
+++ b/debian/nginx-common.nginx.logrotate
@@ -1,7 +1,7 @@
 /var/log/nginx/*.log {
 	weekly
 	missingok
-	rotate 52
+	rotate 14
 	compress
 	delaycompress
 	notifempty

From 23c5f9380615637d6d33f1583d07487e1f138637 Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Tue, 15 Dec 2015 01:51:24 -0600
Subject: [PATCH 018/600] Adding some missing files

---
 .../nginx-lua/misc/recv-until-pm/Makefile     |  3 +
 debian/modules/nginx-lua/util/reindex         | 64 +++++++++++++++++++
 debian/modules/nginx-lua/util/releng          |  8 +++
 3 files changed, 75 insertions(+)
 create mode 100644 debian/modules/nginx-lua/misc/recv-until-pm/Makefile
 create mode 100755 debian/modules/nginx-lua/util/reindex
 create mode 100755 debian/modules/nginx-lua/util/releng

diff --git a/debian/modules/nginx-lua/misc/recv-until-pm/Makefile b/debian/modules/nginx-lua/misc/recv-until-pm/Makefile
new file mode 100644
index 0000000..eb4d937
--- /dev/null
+++ b/debian/modules/nginx-lua/misc/recv-until-pm/Makefile
@@ -0,0 +1,3 @@
+test:
+	prove -Ilib -r t
+
diff --git a/debian/modules/nginx-lua/util/reindex b/debian/modules/nginx-lua/util/reindex
new file mode 100755
index 0000000..bd54c9d
--- /dev/null
+++ b/debian/modules/nginx-lua/util/reindex
@@ -0,0 +1,64 @@
+#!/usr/bin/perl
+#: reindex.pl
+#: reindex .t files for Test::Base based test files
+#: Copyright (c) 2006 Agent Zhang
+#: 2006-04-27 2006-05-09
+
+use strict;
+use warnings;
+
+#use File::Copy;
+use Getopt::Std;
+
+my %opts;
+getopts('hb:', \%opts);
+if ($opts{h} or ! @ARGV) {
+    die "Usage: reindex [-b 0] t/*.t\n";
+}
+
+my $init = $opts{b};
+$init = 1 if not defined $init;
+
+my @files = map glob, @ARGV;
+for my $file (@files) {
+    next if -d $file or $file !~ /\.t_?$/;
+    reindex($file);
+}
+
+sub reindex {
+    my $file = $_[0];
+    open my $in, $file or
+        die "Can't open $file for reading: $!";
+    my @lines;
+    my $counter = $init;
+    my $changed;
+    while (<$in>) {
+        s/\r$//;
+        my $num;
+        s/ ^ === \s+ TEST \s+ (\d+)/$num=$1; "=== TEST " . $counter++/xie;
+        next if !defined $num;
+        if ($num != $counter-1) {
+            $changed++;
+        }
+    } continue {
+        push @lines, $_;
+    }
+    close $in;
+    my $text = join '', @lines;
+    $text =~ s/(?x) \n+ === \s+ TEST/\n\n\n\n=== TEST/ixsg;
+    $text =~ s/__(DATA|END)__\n+=== TEST/__${1}__\n\n=== TEST/;
+    #$text =~ s/\n+$/\n\n/s;
+    if (! $changed and $text eq join '', @lines) {
+        warn "reindex: $file:\tskipped.\n";
+        return;
+    }
+    #File::Copy::copy( $file, "$file.bak" );
+    open my $out, "> $file" or
+        die "Can't open $file for writing: $!";
+    binmode $out;
+    print $out $text;
+    close $out;
+
+    warn "reindex: $file:\tdone.\n";
+}
+
diff --git a/debian/modules/nginx-lua/util/releng b/debian/modules/nginx-lua/util/releng
new file mode 100755
index 0000000..adc2f4d
--- /dev/null
+++ b/debian/modules/nginx-lua/util/releng
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+./update-readme
+ack '(?<=\#define)\s*DDEBUG\s*1' src
+echo ====================================================
+ack '(?<=_version_string) "\d+\.\d+\.\d+"' src
+ack '(?<=This document describes rds-json-nginx-module v)\d+\.\d+' README
+

From 6771862784569cc570591459a9248cee2873dd89 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 14 Jan 2016 10:06:28 +0200
Subject: [PATCH 019/600] Imported Upstream version 1.9.9

---
 CHANGES                                       |  41 ++
 CHANGES.ru                                    |  42 ++
 auto/lib/openssl/conf                         |   1 +
 auto/lib/perl/conf                            |   2 +-
 auto/modules                                  |  15 +-
 auto/options                                  |   3 +
 auto/sources                                  |   7 +-
 auto/unix                                     |  16 +
 src/core/nginx.h                              |   4 +-
 src/core/ngx_conf_file.h                      |   2 +-
 src/core/ngx_parse.c                          |   2 +-
 src/core/ngx_string.c                         |   2 +-
 src/core/ngx_syslog.c                         |   8 +
 src/core/ngx_syslog.h                         |   3 +-
 .../modules/ngx_http_chunked_filter_module.c  |   2 +-
 src/http/modules/ngx_http_fastcgi_module.c    |   5 +-
 src/http/modules/ngx_http_proxy_module.c      |  33 +-
 .../modules/ngx_http_range_filter_module.c    |  28 +-
 src/http/modules/ngx_http_realip_module.c     |  72 ++-
 src/http/modules/ngx_http_scgi_module.c       |   5 +-
 .../modules/ngx_http_slice_filter_module.c    | 526 ++++++++++++++++++
 src/http/modules/ngx_http_static_module.c     |   2 +-
 .../modules/ngx_http_stub_status_module.c     |   2 +-
 src/http/modules/ngx_http_uwsgi_module.c      |   5 +-
 src/http/ngx_http_core_module.c               |   4 +-
 src/http/ngx_http_request.c                   |  32 +-
 src/http/ngx_http_request.h                   |   2 +
 src/http/ngx_http_special_response.c          |   5 +-
 src/http/ngx_http_upstream.c                  |  21 +-
 src/http/ngx_http_upstream.h                  |   1 +
 src/http/v2/ngx_http_v2.c                     |  50 +-
 src/http/v2/ngx_http_v2.h                     |   3 +-
 src/http/v2/ngx_http_v2_filter_module.c       |  52 +-
 src/os/unix/ngx_files.c                       | 151 +++--
 src/os/unix/ngx_posix_init.c                  |   2 +-
 35 files changed, 1005 insertions(+), 146 deletions(-)
 create mode 100644 src/http/modules/ngx_http_slice_filter_module.c

diff --git a/CHANGES b/CHANGES
index 2b9809c..267669b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,45 @@
 
+Changes with nginx 1.9.9                                         09 Dec 2015
+
+    *) Bugfix: proxying to unix domain sockets did not work when using
+       variables; the bug had appeared in 1.9.8.
+
+
+Changes with nginx 1.9.8                                         08 Dec 2015
+
+    *) Feature: pwritev() support.
+
+    *) Feature: the "include" directive inside the "upstream" block.
+
+    *) Feature: the ngx_http_slice_module.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using LibreSSL; the bug had appeared in 1.9.6.
+
+    *) Bugfix: nginx could not be built on OS X in some cases.
+
+
+Changes with nginx 1.9.7                                         17 Nov 2015
+
+    *) Feature: the "nohostname" parameter of logging to syslog.
+
+    *) Feature: the "proxy_cache_convert_head" directive.
+
+    *) Feature: the $realip_remote_addr variable in the
+       ngx_http_realip_module.
+
+    *) Bugfix: the "expires" directive might not work when using variables.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2; the bug had appeared in 1.9.6.
+
+    *) Bugfix: if nginx was built with the ngx_http_v2_module it was
+       possible to use the HTTP/2 protocol even if the "http2" parameter of
+       the "listen" directive was not specified.
+
+    *) Bugfix: in the ngx_http_v2_module.
+
+
 Changes with nginx 1.9.6                                         27 Oct 2015
 
     *) Bugfix: a segmentation fault might occur in a worker process when
diff --git a/CHANGES.ru b/CHANGES.ru
index 3e8c364..315013b 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,46 @@
 
+Изменения в nginx 1.9.9                                           09.12.2015
+
+    *) Исправление: проксирование в unix domain сокеты не работало при
+       использовании переменных; ошибка появилась в 1.9.8.
+
+
+Изменения в nginx 1.9.8                                           08.12.2015
+
+    *) Добавление: поддержка pwritev().
+
+    *) Добавление: директива include в блоке upstream.
+
+    *) Добавление: модуль ngx_http_slice_module.
+
+    *) Исправление: при использовании LibreSSL в рабочем процессе мог
+       произойти segmentation fault; ошибка появилась в 1.9.6.
+
+    *) Исправление: nginx мог не собираться на OS X.
+
+
+Изменения в nginx 1.9.7                                           17.11.2015
+
+    *) Добавление: параметр nohostname логгирования в syslog.
+
+    *) Добавление: директива proxy_cache_convert_head.
+
+    *) Добавление: переменная $realip_remote_addr в модуле
+       ngx_http_realip_module.
+
+    *) Исправление: директива expires могла не срабатывать при использовании
+       переменных.
+
+    *) Исправление: при использовании HTTP/2 в рабочем процессе мог
+       произойти segmentation fault; ошибка появилась в 1.9.6.
+
+    *) Исправление: если nginx был собран с модулем ngx_http_v2_module,
+       протокол HTTP/2 мог быть использован клиентом, даже если не был
+       указан параметр http2 директивы listen.
+
+    *) Исправление: в модуле ngx_http_v2_module.
+
+
 Изменения в nginx 1.9.6                                           27.10.2015
 
     *) Исправление: при использовании HTTP/2 в рабочем процессе мог
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index bca2050..28a99b2 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -105,6 +105,7 @@ else
 
         if [ $ngx_found = yes ]; then
             have=NGX_SSL . auto/have
+            CORE_INCS="$CORE_INCS $ngx_feature_path"
             CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL"
             OPENSSL=YES
         fi
diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf
index 2a1a3fe..4d1bcf1 100644
--- a/auto/lib/perl/conf
+++ b/auto/lib/perl/conf
@@ -57,7 +57,7 @@ if test -n "$NGX_PERL_VER"; then
     if [ "$NGX_SYSTEM" = "Darwin" ]; then
         # OS X system perl wants to link universal binaries
         ngx_perl_ldopts=`echo $ngx_perl_ldopts \
-                         | sed -e 's/-arch x86_64 -arch i386//'`
+                         | sed -e 's/-arch i386//' -e 's/-arch x86_64//'`
     fi
 
     CORE_LINK="$CORE_LINK $ngx_perl_ldopts"
diff --git a/auto/modules b/auto/modules
index 5c734e1..b2d2ee4 100644
--- a/auto/modules
+++ b/auto/modules
@@ -73,6 +73,11 @@ if [ $HTTP_SSI = YES ]; then
 fi
 
 
+if [ $HTTP_SLICE = YES ]; then
+    HTTP_POSTPONE=YES
+fi
+
+
 if [ $HTTP_ADDITION = YES ]; then
     HTTP_POSTPONE=YES
 fi
@@ -110,6 +115,7 @@ fi
 #     ngx_http_copy_filter
 #     ngx_http_range_body_filter
 #     ngx_http_not_modified_filter
+#     ngx_http_slice_filter
 
 HTTP_FILTER_MODULES="$HTTP_WRITE_FILTER_MODULE \
                      $HTTP_HEADER_FILTER_MODULE \
@@ -179,6 +185,12 @@ if [ $HTTP_USERID = YES ]; then
     HTTP_SRCS="$HTTP_SRCS $HTTP_USERID_SRCS"
 fi
 
+if [ $HTTP_SLICE = YES ]; then
+    HTTP_SRCS="$HTTP_SRCS $HTTP_SLICE_SRCS"
+else
+    HTTP_SLICE_FILTER_MODULE=""
+fi
+
 
 if [ $HTTP_V2 = YES ]; then
     have=NGX_HTTP_V2 . auto/have
@@ -461,7 +473,8 @@ if [ $HTTP = YES ]; then
              $HTTP_AUX_FILTER_MODULES \
              $HTTP_COPY_FILTER_MODULE \
              $HTTP_RANGE_BODY_FILTER_MODULE \
-             $HTTP_NOT_MODIFIED_FILTER_MODULE"
+             $HTTP_NOT_MODIFIED_FILTER_MODULE \
+             $HTTP_SLICE_FILTER_MODULE"
 
     NGX_ADDON_DEPS="$NGX_ADDON_DEPS \$(HTTP_DEPS)"
 fi
diff --git a/auto/options b/auto/options
index efc8943..931dabb 100644
--- a/auto/options
+++ b/auto/options
@@ -71,6 +71,7 @@ HTTP_ACCESS=YES
 HTTP_AUTH_BASIC=YES
 HTTP_AUTH_REQUEST=NO
 HTTP_USERID=YES
+HTTP_SLICE=NO
 HTTP_AUTOINDEX=YES
 HTTP_RANDOM_INDEX=NO
 HTTP_STATUS=NO
@@ -226,6 +227,7 @@ do
         --with-http_random_index_module) HTTP_RANDOM_INDEX=YES      ;;
         --with-http_secure_link_module)  HTTP_SECURE_LINK=YES       ;;
         --with-http_degradation_module)  HTTP_DEGRADATION=YES       ;;
+        --with-http_slice_module)        HTTP_SLICE=YES             ;;
 
         --without-http_charset_module)   HTTP_CHARSET=NO            ;;
         --without-http_gzip_module)      HTTP_GZIP=NO               ;;
@@ -394,6 +396,7 @@ cat << END
   --with-http_random_index_module    enable ngx_http_random_index_module
   --with-http_secure_link_module     enable ngx_http_secure_link_module
   --with-http_degradation_module     enable ngx_http_degradation_module
+  --with-http_slice_module           enable ngx_http_slice_module
   --with-http_stub_status_module     enable ngx_http_stub_status_module
 
   --without-http_charset_module      disable ngx_http_charset_module
diff --git a/auto/sources b/auto/sources
index 2abbc60..2e44ce1 100644
--- a/auto/sources
+++ b/auto/sources
@@ -254,9 +254,6 @@ NGX_WIN32_ICONS="src/os/win32/nginx.ico"
 NGX_WIN32_RC="src/os/win32/nginx.rc"
 
 
-# the http modules that have their logging formats
-# must be after ngx_http_log_module
-
 HTTP_MODULES="ngx_http_module \
               ngx_http_core_module \
               ngx_http_log_module \
@@ -363,6 +360,10 @@ HTTP_USERID_FILTER_MODULE=ngx_http_userid_filter_module
 HTTP_USERID_SRCS=src/http/modules/ngx_http_userid_filter_module.c
 
 
+HTTP_SLICE_FILTER_MODULE=ngx_http_slice_filter_module
+HTTP_SLICE_SRCS=src/http/modules/ngx_http_slice_filter_module.c
+
+
 HTTP_REALIP_MODULE=ngx_http_realip_module
 HTTP_REALIP_SRCS=src/http/modules/ngx_http_realip_module.c
 
diff --git a/auto/unix b/auto/unix
index b7b7a25..7bfca8f 100755
--- a/auto/unix
+++ b/auto/unix
@@ -589,6 +589,22 @@ ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0);
 . auto/feature
 
 
+# pwritev() was introduced in FreeBSD 6 and Linux 2.6.30, glibc 2.10
+
+ngx_feature="pwritev()"
+ngx_feature_name="NGX_HAVE_PWRITEV"
+ngx_feature_run=no
+ngx_feature_incs='#include <sys/uio.h>'
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n;
+                  vec[0].iov_base = buf;
+                  vec[0].iov_len = 1;
+                  n = pwritev(1, vec, 1, 0);
+                  if (n == -1) return 1"
+. auto/feature
+
+
 ngx_feature="sys_nerr"
 ngx_feature_name="NGX_SYS_NERR"
 ngx_feature_run=value
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 56e9587..87a984a 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009006
-#define NGINX_VERSION      "1.9.6"
+#define nginx_version      1009009
+#define NGINX_VERSION      "1.9.9"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index ee44306..2d03f43 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -50,7 +50,7 @@
 #define NGX_DIRECT_CONF      0x00010000
 
 #define NGX_MAIN_CONF        0x01000000
-#define NGX_ANY_CONF         0x0F000000
+#define NGX_ANY_CONF         0x1F000000
 
 
 
diff --git a/src/core/ngx_parse.c b/src/core/ngx_parse.c
index d7350d4..7b60c5f 100644
--- a/src/core/ngx_parse.c
+++ b/src/core/ngx_parse.c
@@ -188,7 +188,7 @@ ngx_parse_time(ngx_str_t *line, ngx_uint_t is_sec)
             break;
 
         case 'm':
-            if (*p == 's') {
+            if (p < last && *p == 's') {
                 if (is_sec || step >= st_msec) {
                     return NGX_ERROR;
                 }
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index d2a8d01..cf665a4 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -410,7 +410,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
                 hex = 2;
                 sign = 0;
                 zero = '0';
-                width = NGX_PTR_SIZE * 2;
+                width = 2 * sizeof(void *);
                 break;
 
             case 'c':
diff --git a/src/core/ngx_syslog.c b/src/core/ngx_syslog.c
index d4e79f6..08f4c04 100644
--- a/src/core/ngx_syslog.c
+++ b/src/core/ngx_syslog.c
@@ -194,6 +194,9 @@ ngx_syslog_parse_args(ngx_conf_t *cf, ngx_syslog_peer_t *peer)
             peer->tag.data = p + 4;
             peer->tag.len = len - 4;
 
+        } else if (len == 10 && ngx_strncmp(p, "nohostname", 10) == 0) {
+            peer->nohostname = 1;
+
         } else {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "unknown syslog parameter \"%s\"", p);
@@ -220,6 +223,11 @@ ngx_syslog_add_header(ngx_syslog_peer_t *peer, u_char *buf)
 
     pri = peer->facility * 8 + peer->severity;
 
+    if (peer->nohostname) {
+        return ngx_sprintf(buf, "<%ui>%V %V: ", pri, &ngx_cached_syslog_time,
+                           &peer->tag);
+    }
+
     return ngx_sprintf(buf, "<%ui>%V %V %V: ", pri, &ngx_cached_syslog_time,
                        &ngx_cycle->hostname, &peer->tag);
 }
diff --git a/src/core/ngx_syslog.h b/src/core/ngx_syslog.h
index a915051..cc4c842 100644
--- a/src/core/ngx_syslog.h
+++ b/src/core/ngx_syslog.h
@@ -16,7 +16,8 @@ typedef struct {
 
     ngx_addr_t        server;
     ngx_connection_t  conn;
-    ngx_uint_t        busy;  /* unsigned busy:1; */
+    unsigned          busy:1;
+    unsigned          nohostname:1;
 } ngx_syslog_peer_t;
 
 
diff --git a/src/http/modules/ngx_http_chunked_filter_module.c b/src/http/modules/ngx_http_chunked_filter_module.c
index a7dc5bf..0059a98 100644
--- a/src/http/modules/ngx_http_chunked_filter_module.c
+++ b/src/http/modules/ngx_http_chunked_filter_module.c
@@ -64,7 +64,7 @@ ngx_http_chunked_header_filter(ngx_http_request_t *r)
         || r->headers_out.status == NGX_HTTP_NO_CONTENT
         || r->headers_out.status < NGX_HTTP_OK
         || r != r->main
-        || (r->method & NGX_HTTP_HEAD))
+        || r->method == NGX_HTTP_HEAD)
     {
         return ngx_http_next_header_filter(r);
     }
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 668719f..dbd7767 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -773,10 +773,11 @@ ngx_http_fastcgi_eval(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf)
 
     } else {
         u->resolved->host = url.host;
-        u->resolved->port = url.port;
-        u->resolved->no_port = url.no_port;
     }
 
+    u->resolved->port = url.port;
+    u->resolved->no_port = url.no_port;
+
     return NGX_OK;
 }
 
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 514c23b..a869e74 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -533,6 +533,13 @@ static ngx_command_t  ngx_http_proxy_commands[] = {
       offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_revalidate),
       NULL },
 
+    { ngx_string("proxy_cache_convert_head"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_convert_head),
+      NULL },
+
 #endif
 
     { ngx_string("proxy_temp_path"),
@@ -1008,10 +1015,11 @@ ngx_http_proxy_eval(ngx_http_request_t *r, ngx_http_proxy_ctx_t *ctx,
 
     } else {
         u->resolved->host = url.host;
-        u->resolved->port = (in_port_t) (url.no_port ? port : url.port);
-        u->resolved->no_port = url.no_port;
     }
 
+    u->resolved->port = (in_port_t) (url.no_port ? port : url.port);
+    u->resolved->no_port = url.no_port;
+
     return NGX_OK;
 }
 
@@ -1149,25 +1157,24 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
     if (u->method.len) {
         /* HEAD was changed to GET to cache response */
         method = u->method;
-        method.len++;
 
     } else if (plcf->method.len) {
         method = plcf->method;
 
     } else {
         method = r->method_name;
-        method.len++;
     }
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
 
-    if (method.len == 5
-        && ngx_strncasecmp(method.data, (u_char *) "HEAD ", 5) == 0)
+    if (method.len == 4
+        && ngx_strncasecmp(method.data, (u_char *) "HEAD", 4) == 0)
     {
         ctx->head = 1;
     }
 
-    len = method.len + sizeof(ngx_http_proxy_version) - 1 + sizeof(CRLF) - 1;
+    len = method.len + 1 + sizeof(ngx_http_proxy_version) - 1
+          + sizeof(CRLF) - 1;
 
     escape = 0;
     loc_len = 0;
@@ -1286,6 +1293,7 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
     /* the request line */
 
     b->last = ngx_copy(b->last, method.data, method.len);
+    *b->last++ = ' ';
 
     u->uri.data = b->last;
 
@@ -2845,6 +2853,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
     conf->upstream.cache_revalidate = NGX_CONF_UNSET;
+    conf->upstream.cache_convert_head = NGX_CONF_UNSET;
 #endif
 
     conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
@@ -3143,17 +3152,13 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->upstream.cache_revalidate,
                               prev->upstream.cache_revalidate, 0);
 
+    ngx_conf_merge_value(conf->upstream.cache_convert_head,
+                              prev->upstream.cache_convert_head, 1);
+
 #endif
 
     ngx_conf_merge_str_value(conf->method, prev->method, "");
 
-    if (conf->method.len
-        && conf->method.data[conf->method.len - 1] != ' ')
-    {
-        conf->method.data[conf->method.len] = ' ';
-        conf->method.len++;
-    }
-
     ngx_conf_merge_value(conf->upstream.pass_request_headers,
                               prev->upstream.pass_request_headers, 1);
     ngx_conf_merge_value(conf->upstream.pass_request_body,
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index 952da75..b07b2e2 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -154,7 +154,7 @@ ngx_http_range_header_filter(ngx_http_request_t *r)
 
     if (r->http_version < NGX_HTTP_VERSION_10
         || r->headers_out.status != NGX_HTTP_OK
-        || r != r->main
+        || (r != r->main && !r->subrequest_ranges)
         || r->headers_out.content_length_n == -1
         || !r->allow_ranges)
     {
@@ -222,6 +222,8 @@ parse:
         return NGX_ERROR;
     }
 
+    ctx->offset = r->headers_out.content_offset;
+
     if (ngx_array_init(&ctx->ranges, r->pool, 1, sizeof(ngx_http_range_t))
         != NGX_OK)
     {
@@ -273,10 +275,21 @@ static ngx_int_t
 ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
     ngx_uint_t ranges)
 {
-    u_char            *p;
-    off_t              start, end, size, content_length, cutoff, cutlim;
-    ngx_uint_t         suffix;
-    ngx_http_range_t  *range;
+    u_char                       *p;
+    off_t                         start, end, size, content_length, cutoff,
+                                  cutlim;
+    ngx_uint_t                    suffix;
+    ngx_http_range_t             *range;
+    ngx_http_range_filter_ctx_t  *mctx;
+
+    if (r != r->main) {
+        mctx = ngx_http_get_module_ctx(r->main,
+                                       ngx_http_range_body_filter_module);
+        if (mctx) {
+            ctx->ranges = mctx->ranges;
+            return NGX_OK;
+        }
+    }
 
     p = r->headers_in.range->value.data + 6;
     size = 0;
@@ -395,6 +408,10 @@ ngx_http_range_singlepart_header(ngx_http_request_t *r,
     ngx_table_elt_t   *content_range;
     ngx_http_range_t  *range;
 
+    if (r != r->main) {
+        return ngx_http_next_header_filter(r);
+    }
+
     content_range = ngx_list_push(&r->headers_out.headers);
     if (content_range == NULL) {
         return NGX_ERROR;
@@ -422,6 +439,7 @@ ngx_http_range_singlepart_header(ngx_http_request_t *r,
                                - content_range->value.data;
 
     r->headers_out.content_length_n = range->end - range->start;
+    r->headers_out.content_offset = range->start;
 
     if (r->headers_out.content_length) {
         r->headers_out.content_length->hash = 0;
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index 7a62118..c3d7ebe 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -43,9 +43,14 @@ static char *ngx_http_realip(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 static void *ngx_http_realip_create_loc_conf(ngx_conf_t *cf);
 static char *ngx_http_realip_merge_loc_conf(ngx_conf_t *cf,
     void *parent, void *child);
+static ngx_int_t ngx_http_realip_add_variables(ngx_conf_t *cf);
 static ngx_int_t ngx_http_realip_init(ngx_conf_t *cf);
 
 
+static ngx_int_t ngx_http_realip_remote_addr_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+
 static ngx_command_t  ngx_http_realip_commands[] = {
 
     { ngx_string("set_real_ip_from"),
@@ -75,7 +80,7 @@ static ngx_command_t  ngx_http_realip_commands[] = {
 
 
 static ngx_http_module_t  ngx_http_realip_module_ctx = {
-    NULL,                                  /* preconfiguration */
+    ngx_http_realip_add_variables,         /* preconfiguration */
     ngx_http_realip_init,                  /* postconfiguration */
 
     NULL,                                  /* create main configuration */
@@ -105,6 +110,15 @@ ngx_module_t  ngx_http_realip_module = {
 };
 
 
+static ngx_http_variable_t  ngx_http_realip_vars[] = {
+
+    { ngx_string("realip_remote_addr"), NULL,
+      ngx_http_realip_remote_addr_variable, 0, 0, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
 static ngx_int_t
 ngx_http_realip_handler(ngx_http_request_t *r)
 {
@@ -416,6 +430,25 @@ ngx_http_realip_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 }
 
 
+static ngx_int_t
+ngx_http_realip_add_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t  *var, *v;
+
+    for (v = ngx_http_realip_vars; v->name.len; v++) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_realip_init(ngx_conf_t *cf)
 {
@@ -440,3 +473,40 @@ ngx_http_realip_init(ngx_conf_t *cf)
 
     return NGX_OK;
 }
+
+
+static ngx_int_t
+ngx_http_realip_remote_addr_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_str_t              *addr_text;
+    ngx_pool_cleanup_t     *cln;
+    ngx_http_realip_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_realip_module);
+
+    if (ctx == NULL && (r->internal || r->filter_finalize)) {
+
+        /*
+         * if module context was reset, the original address
+         * can still be found in the cleanup handler
+         */
+
+        for (cln = r->pool->cleanup; cln; cln = cln->next) {
+            if (cln->handler == ngx_http_realip_cleanup) {
+                ctx = cln->data;
+                break;
+            }
+        }
+    }
+
+    addr_text = ctx ? &ctx->addr_text : &r->connection->addr_text;
+
+    v->len = addr_text->len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = addr_text->data;
+
+    return NGX_OK;
+}
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 6e5b077..76c7786 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -569,10 +569,11 @@ ngx_http_scgi_eval(ngx_http_request_t *r, ngx_http_scgi_loc_conf_t * scf)
 
     } else {
         u->resolved->host = url.host;
-        u->resolved->port = url.port;
-        u->resolved->no_port = url.no_port;
     }
 
+    u->resolved->port = url.port;
+    u->resolved->no_port = url.no_port;
+
     return NGX_OK;
 }
 
diff --git a/src/http/modules/ngx_http_slice_filter_module.c b/src/http/modules/ngx_http_slice_filter_module.c
new file mode 100644
index 0000000..5e149b4
--- /dev/null
+++ b/src/http/modules/ngx_http_slice_filter_module.c
@@ -0,0 +1,526 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    size_t      size;
+} ngx_http_slice_loc_conf_t;
+
+
+typedef struct {
+    off_t       start;
+    off_t       end;
+    ngx_str_t   range;
+    ngx_str_t   etag;
+    ngx_uint_t  last;  /* unsigned  last:1; */
+} ngx_http_slice_ctx_t;
+
+
+typedef struct {
+    off_t       start;
+    off_t       end;
+    off_t       complete_length;
+} ngx_http_slice_content_range_t;
+
+
+static ngx_int_t ngx_http_slice_header_filter(ngx_http_request_t *r);
+static ngx_int_t ngx_http_slice_body_filter(ngx_http_request_t *r,
+    ngx_chain_t *in);
+static ngx_int_t ngx_http_slice_parse_content_range(ngx_http_request_t *r,
+    ngx_http_slice_content_range_t *cr);
+static ngx_int_t ngx_http_slice_range_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+static off_t ngx_http_slice_get_start(ngx_http_request_t *r);
+static void *ngx_http_slice_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_slice_merge_loc_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static ngx_int_t ngx_http_slice_add_variables(ngx_conf_t *cf);
+static ngx_int_t ngx_http_slice_init(ngx_conf_t *cf);
+
+
+static ngx_command_t  ngx_http_slice_filter_commands[] = {
+
+    { ngx_string("slice"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_slice_loc_conf_t, size),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_slice_filter_module_ctx = {
+    ngx_http_slice_add_variables,          /* preconfiguration */
+    ngx_http_slice_init,                   /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    ngx_http_slice_create_loc_conf,        /* create location configuration */
+    ngx_http_slice_merge_loc_conf          /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_slice_filter_module = {
+    NGX_MODULE_V1,
+    &ngx_http_slice_filter_module_ctx,     /* module context */
+    ngx_http_slice_filter_commands,        /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_str_t  ngx_http_slice_range_name = ngx_string("slice_range");
+
+static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
+static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
+
+
+static ngx_int_t
+ngx_http_slice_header_filter(ngx_http_request_t *r)
+{
+    off_t                            end;
+    ngx_int_t                        rc;
+    ngx_table_elt_t                 *h;
+    ngx_http_slice_ctx_t            *ctx;
+    ngx_http_slice_loc_conf_t       *slcf;
+    ngx_http_slice_content_range_t   cr;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module);
+    if (ctx == NULL) {
+        return ngx_http_next_header_filter(r);
+    }
+
+    if (r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT) {
+        if (r == r->main) {
+            ngx_http_set_ctx(r, NULL, ngx_http_slice_filter_module);
+            return ngx_http_next_header_filter(r);
+        }
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "unexpected status code %ui in slice response",
+                      r->headers_out.status);
+        return NGX_ERROR;
+    }
+
+    h = r->headers_out.etag;
+
+    if (ctx->etag.len) {
+        if (h == NULL
+            || h->value.len != ctx->etag.len
+            || ngx_strncmp(h->value.data, ctx->etag.data, ctx->etag.len)
+               != 0)
+        {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "etag mismatch in slice response");
+            return NGX_ERROR;
+        }
+    }
+
+    if (h) {
+        ctx->etag = h->value;
+    }
+
+    if (ngx_http_slice_parse_content_range(r, &cr) != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "invalid range in slice response");
+        return NGX_ERROR;
+    }
+
+    if (cr.complete_length == -1) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "no complete length in slice response");
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http slice response range: %O-%O/%O",
+                   cr.start, cr.end, cr.complete_length);
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module);
+
+    end = ngx_min(cr.start + (off_t) slcf->size, cr.complete_length);
+
+    if (cr.start != ctx->start || cr.end != end) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "unexpected range in slice response: %O-%O",
+                      cr.start, cr.end);
+        return NGX_ERROR;
+    }
+
+    ctx->start = end;
+
+    r->headers_out.status = NGX_HTTP_OK;
+    r->headers_out.status_line.len = 0;
+    r->headers_out.content_length_n = cr.complete_length;
+    r->headers_out.content_offset = cr.start;
+    r->headers_out.content_range->hash = 0;
+    r->headers_out.content_range = NULL;
+
+    r->allow_ranges = 1;
+    r->subrequest_ranges = 1;
+    r->single_range = 1;
+
+    rc = ngx_http_next_header_filter(r);
+
+    if (r != r->main) {
+        return rc;
+    }
+
+    if (r->headers_out.status == NGX_HTTP_PARTIAL_CONTENT) {
+        if (ctx->start + (off_t) slcf->size <= r->headers_out.content_offset) {
+            ctx->start = slcf->size
+                         * (r->headers_out.content_offset / slcf->size);
+        }
+
+        ctx->end = r->headers_out.content_offset
+                   + r->headers_out.content_length_n;
+
+    } else {
+        ctx->end = cr.complete_length;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    ngx_int_t                   rc;
+    ngx_chain_t                *cl;
+    ngx_http_request_t         *sr;
+    ngx_http_slice_ctx_t       *ctx;
+    ngx_http_slice_loc_conf_t  *slcf;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module);
+
+    if (ctx == NULL || r != r->main) {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    for (cl = in; cl; cl = cl->next) {
+        if (cl->buf->last_buf) {
+            cl->buf->last_buf = 0;
+            cl->buf->last_in_chain = 1;
+            cl->buf->sync = 1;
+            ctx->last = 1;
+        }
+    }
+
+    rc = ngx_http_next_body_filter(r, in);
+
+    if (rc == NGX_ERROR || !ctx->last) {
+        return rc;
+    }
+
+    if (ctx->start >= ctx->end) {
+        ngx_http_set_ctx(r, NULL, ngx_http_slice_filter_module);
+        ngx_http_send_special(r, NGX_HTTP_LAST);
+        return rc;
+    }
+
+    if (r->buffered) {
+        return rc;
+    }
+
+    if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL, 0) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ngx_http_set_ctx(sr, ctx, ngx_http_slice_filter_module);
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module);
+
+    ctx->range.len = ngx_sprintf(ctx->range.data, "bytes=%O-%O", ctx->start,
+                                 ctx->start + (off_t) slcf->size - 1)
+                     - ctx->range.data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http slice subrequest: \"%V\"", &ctx->range);
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_slice_parse_content_range(ngx_http_request_t *r,
+    ngx_http_slice_content_range_t *cr)
+{
+    off_t             start, end, complete_length, cutoff, cutlim;
+    u_char           *p;
+    ngx_table_elt_t  *h;
+
+    h = r->headers_out.content_range;
+
+    if (h == NULL
+        || h->value.len < 7
+        || ngx_strncmp(h->value.data, "bytes ", 6) != 0)
+    {
+        return NGX_ERROR;
+    }
+
+    p = h->value.data + 6;
+
+    cutoff = NGX_MAX_OFF_T_VALUE / 10;
+    cutlim = NGX_MAX_OFF_T_VALUE % 10;
+
+    start = 0;
+    end = 0;
+    complete_length = 0;
+
+    while (*p == ' ') { p++; }
+
+    if (*p < '0' || *p > '9') {
+        return NGX_ERROR;
+    }
+
+    while (*p >= '0' && *p <= '9') {
+        if (start >= cutoff && (start > cutoff || *p - '0' > cutlim)) {
+            return NGX_ERROR;
+        }
+
+        start = start * 10 + *p++ - '0';
+    }
+
+    while (*p == ' ') { p++; }
+
+    if (*p++ != '-') {
+        return NGX_ERROR;
+    }
+
+    while (*p == ' ') { p++; }
+
+    if (*p < '0' || *p > '9') {
+        return NGX_ERROR;
+    }
+
+    while (*p >= '0' && *p <= '9') {
+        if (end >= cutoff && (end > cutoff || *p - '0' > cutlim)) {
+            return NGX_ERROR;
+        }
+
+        end = end * 10 + *p++ - '0';
+    }
+
+    end++;
+
+    while (*p == ' ') { p++; }
+
+    if (*p++ != '/') {
+        return NGX_ERROR;
+    }
+
+    while (*p == ' ') { p++; }
+
+    if (*p != '*') {
+        if (*p < '0' || *p > '9') {
+            return NGX_ERROR;
+        }
+
+        while (*p >= '0' && *p <= '9') {
+            if (complete_length >= cutoff
+                && (complete_length > cutoff || *p - '0' > cutlim))
+            {
+                return NGX_ERROR;
+            }
+
+            complete_length = complete_length * 10 + *p++ - '0';
+        }
+
+    } else {
+        complete_length = -1;
+        p++;
+    }
+
+    while (*p == ' ') { p++; }
+
+    if (*p != '\0') {
+        return NGX_ERROR;
+    }
+
+    cr->start = start;
+    cr->end = end;
+    cr->complete_length = complete_length;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_slice_range_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    u_char                     *p;
+    ngx_http_slice_ctx_t       *ctx;
+    ngx_http_slice_loc_conf_t  *slcf;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module);
+
+    if (ctx == NULL) {
+        if (r != r->main || r->headers_out.status) {
+            v->not_found = 1;
+            return NGX_OK;
+        }
+
+        slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module);
+
+        if (slcf->size == 0) {
+            v->not_found = 1;
+            return NGX_OK;
+        }
+
+        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_slice_ctx_t));
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_http_set_ctx(r, ctx, ngx_http_slice_filter_module);
+
+        p = ngx_pnalloc(r->pool, sizeof("bytes=-") - 1 + 2 * NGX_OFF_T_LEN);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        ctx->start = slcf->size * (ngx_http_slice_get_start(r) / slcf->size);
+
+        ctx->range.data = p;
+        ctx->range.len = ngx_sprintf(p, "bytes=%O-%O", ctx->start,
+                                     ctx->start + (off_t) slcf->size - 1)
+                         - p;
+    }
+
+    v->data = ctx->range.data;
+    v->valid = 1;
+    v->not_found = 0;
+    v->no_cacheable = 1;
+    v->len = ctx->range.len;
+
+    return NGX_OK;
+}
+
+
+static off_t
+ngx_http_slice_get_start(ngx_http_request_t *r)
+{
+    off_t             start, cutoff, cutlim;
+    u_char           *p;
+    ngx_table_elt_t  *h;
+
+    if (r->headers_in.if_range) {
+        return 0;
+    }
+
+    h = r->headers_in.range;
+
+    if (h == NULL
+        || h->value.len < 7
+        || ngx_strncasecmp(h->value.data, (u_char *) "bytes=", 6) != 0)
+    {
+        return 0;
+    }
+
+    p = h->value.data + 6;
+
+    if (ngx_strchr(p, ',')) {
+        return 0;
+    }
+
+    while (*p == ' ') { p++; }
+
+    if (*p == '-') {
+        return 0;
+    }
+
+    cutoff = NGX_MAX_OFF_T_VALUE / 10;
+    cutlim = NGX_MAX_OFF_T_VALUE % 10;
+
+    start = 0;
+
+    while (*p >= '0' && *p <= '9') {
+        if (start >= cutoff && (start > cutoff || *p - '0' > cutlim)) {
+            return 0;
+        }
+
+        start = start * 10 + *p++ - '0';
+    }
+
+    return start;
+}
+
+
+static void *
+ngx_http_slice_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_slice_loc_conf_t  *slcf;
+
+    slcf = ngx_palloc(cf->pool, sizeof(ngx_http_slice_loc_conf_t));
+    if (slcf == NULL) {
+        return NULL;
+    }
+
+    slcf->size = NGX_CONF_UNSET_SIZE;
+
+    return slcf;
+}
+
+
+static char *
+ngx_http_slice_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_slice_loc_conf_t *prev = parent;
+    ngx_http_slice_loc_conf_t *conf = child;
+
+    ngx_conf_merge_size_value(conf->size, prev->size, 0);
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_slice_add_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t  *var;
+
+    var = ngx_http_add_variable(cf, &ngx_http_slice_range_name, 0);
+    if (var == NULL) {
+        return NGX_ERROR;
+    }
+
+    var->get_handler = ngx_http_slice_range_variable;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_slice_init(ngx_conf_t *cf)
+{
+    ngx_http_next_header_filter = ngx_http_top_header_filter;
+    ngx_http_top_header_filter = ngx_http_slice_header_filter;
+
+    ngx_http_next_body_filter = ngx_http_top_body_filter;
+    ngx_http_top_body_filter = ngx_http_slice_body_filter;
+
+    return NGX_OK;
+}
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index 631eb17..f79c4ae 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -204,7 +204,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
 
 #endif
 
-    if (r->method & NGX_HTTP_POST) {
+    if (r->method == NGX_HTTP_POST) {
         return NGX_HTTP_NOT_ALLOWED;
     }
 
diff --git a/src/http/modules/ngx_http_stub_status_module.c b/src/http/modules/ngx_http_stub_status_module.c
index dd68358..61199f2 100644
--- a/src/http/modules/ngx_http_stub_status_module.c
+++ b/src/http/modules/ngx_http_stub_status_module.c
@@ -89,7 +89,7 @@ ngx_http_stub_status_handler(ngx_http_request_t *r)
     ngx_chain_t        out;
     ngx_atomic_int_t   ap, hn, ac, rq, rd, wr, wa;
 
-    if (r->method != NGX_HTTP_GET && r->method != NGX_HTTP_HEAD) {
+    if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) {
         return NGX_HTTP_NOT_ALLOWED;
     }
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index a50c553..0313dfa 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -771,10 +771,11 @@ ngx_http_uwsgi_eval(ngx_http_request_t *r, ngx_http_uwsgi_loc_conf_t * uwcf)
 
     } else {
         u->resolved->host = url.host;
-        u->resolved->port = url.port;
-        u->resolved->no_port = url.no_port;
     }
 
+    u->resolved->port = url.port;
+    u->resolved->no_port = url.no_port;
+
     return NGX_OK;
 }
 
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 7a29608..4b8dd4c 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -776,7 +776,7 @@ ngx_module_t  ngx_http_core_module = {
 };
 
 
-ngx_str_t  ngx_http_core_get_method = { 3, (u_char *) "GET " };
+ngx_str_t  ngx_http_core_get_method = { 3, (u_char *) "GET" };
 
 
 void
@@ -3503,7 +3503,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     /* TODO: it does not merge, it inits only */
 
     ngx_conf_merge_size_value(conf->connection_pool_size,
-                              prev->connection_pool_size, 256);
+                              prev->connection_pool_size, 64 * sizeof(void *));
     ngx_conf_merge_size_value(conf->request_pool_size,
                               prev->request_pool_size, 4096);
     ngx_conf_merge_msec_value(conf->client_header_timeout,
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 9da972e..99e9325 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -768,25 +768,31 @@ ngx_http_ssl_handshake_handler(ngx_connection_t *c)
      && (defined TLSEXT_TYPE_application_layer_protocol_negotiation           \
          || defined TLSEXT_TYPE_next_proto_neg))
         {
-        unsigned int          len;
-        const unsigned char  *data;
+        unsigned int            len;
+        const unsigned char    *data;
+        ngx_http_connection_t  *hc;
+
+        hc = c->data;
+
+        if (hc->addr_conf->http2) {
 
 #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
-        SSL_get0_alpn_selected(c->ssl->connection, &data, &len);
+            SSL_get0_alpn_selected(c->ssl->connection, &data, &len);
 
 #ifdef TLSEXT_TYPE_next_proto_neg
-        if (len == 0) {
-            SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
-        }
+            if (len == 0) {
+                SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
+            }
 #endif
 
 #else /* TLSEXT_TYPE_next_proto_neg */
-        SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
+            SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
 #endif
 
-        if (len == 2 && data[0] == 'h' && data[1] == '2') {
-            ngx_http_v2_init(c->read);
-            return;
+            if (len == 2 && data[0] == 'h' && data[1] == '2') {
+                ngx_http_v2_init(c->read);
+                return;
+            }
         }
         }
 #endif
@@ -831,6 +837,10 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 
     c = ngx_ssl_get_connection(ssl_conn);
 
+    if (c->ssl->renegotiation) {
+        return SSL_TLSEXT_ERR_NOACK;
+    }
+
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "SSL server name: \"%s\"", servername);
 
@@ -1782,7 +1792,7 @@ ngx_http_process_request_header(ngx_http_request_t *r)
         }
     }
 
-    if (r->method & NGX_HTTP_TRACE) {
+    if (r->method == NGX_HTTP_TRACE) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                       "client sent TRACE method");
         ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 967032a..8b88139 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -271,6 +271,7 @@ typedef struct {
     ngx_array_t                       cache_control;
 
     off_t                             content_length_n;
+    off_t                             content_offset;
     time_t                            date_time;
     time_t                            last_modified_time;
 } ngx_http_headers_out_t;
@@ -530,6 +531,7 @@ struct ngx_http_request_s {
     unsigned                          filter_need_in_memory:1;
     unsigned                          filter_need_temporary:1;
     unsigned                          allow_ranges:1;
+    unsigned                          subrequest_ranges:1;
     unsigned                          single_range:1;
     unsigned                          disable_not_modified:1;
 
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index a97791e..2771e58 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -359,9 +359,6 @@ static ngx_str_t ngx_http_error_pages[] = {
 };
 
 
-static ngx_str_t  ngx_http_get_name = { 3, (u_char *) "GET " };
-
-
 ngx_int_t
 ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
 {
@@ -564,7 +561,7 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
 
         if (r->method != NGX_HTTP_HEAD) {
             r->method = NGX_HTTP_GET;
-            r->method_name = ngx_http_get_name;
+            r->method_name = ngx_http_core_get_method;
         }
 
         return ngx_http_internal_redirect(r, &uri, &args);
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 1530596..6c6ee80 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -250,6 +250,11 @@ ngx_http_upstream_header_t  ngx_http_upstream_headers_in[] = {
                  ngx_http_upstream_copy_allow_ranges,
                  offsetof(ngx_http_headers_out_t, accept_ranges), 1 },
 
+    { ngx_string("Content-Range"),
+                 ngx_http_upstream_ignore_header_line, 0,
+                 ngx_http_upstream_copy_header_line,
+                 offsetof(ngx_http_headers_out_t, content_range), 0 },
+
     { ngx_string("Connection"),
                  ngx_http_upstream_process_connection, 0,
                  ngx_http_upstream_ignore_header_line, 0, 0 },
@@ -633,8 +638,20 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
         u->ssl_name = u->resolved->host;
 #endif
 
+        host = &u->resolved->host;
+
         if (u->resolved->sockaddr) {
 
+            if (u->resolved->port == 0
+                && u->resolved->sockaddr->sa_family != AF_UNIX)
+            {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "no port in upstream \"%V\"", host);
+                ngx_http_upstream_finalize_request(r, u,
+                                               NGX_HTTP_INTERNAL_SERVER_ERROR);
+                return;
+            }
+
             if (ngx_http_upstream_create_round_robin_peer(r, u->resolved)
                 != NGX_OK)
             {
@@ -648,8 +665,6 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
             return;
         }
 
-        host = &u->resolved->host;
-
         umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
 
         uscfp = umcf->upstreams.elts;
@@ -764,7 +779,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
             return rc;
         }
 
-        if (r->method & NGX_HTTP_HEAD) {
+        if (r->method == NGX_HTTP_HEAD && u->conf->cache_convert_head) {
             u->method = ngx_http_core_get_method;
         }
 
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 64157e6..8404265 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -193,6 +193,7 @@ typedef struct {
     ngx_msec_t                       cache_lock_age;
 
     ngx_flag_t                       cache_revalidate;
+    ngx_flag_t                       cache_convert_head;
 
     ngx_array_t                     *cache_valid;
     ngx_array_t                     *cache_bypass;
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 10cb727..869ce08 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -870,8 +870,6 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
-    stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
-
     h2c->state.stream = stream;
 
     return ngx_http_v2_state_read_data(h2c, pos, end);
@@ -899,6 +897,8 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (stream->skip_data) {
+        stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
+
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
                        "skipping http2 DATA frame, reason: %d",
                        stream->skip_data);
@@ -988,7 +988,9 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
                                       ngx_http_v2_state_read_data);
     }
 
-    if (stream->in_closed) {
+    if (h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG) {
+        stream->in_closed = 1;
+
         if (r->headers_in.content_length_n < 0) {
             r->headers_in.content_length_n = rb->rest;
 
@@ -1204,10 +1206,9 @@ static u_char *
 ngx_http_v2_state_header_block(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    u_char                   ch;
-    ngx_int_t                value;
-    ngx_uint_t               indexed, size_update, prefix;
-    ngx_http_v2_srv_conf_t  *h2scf;
+    u_char      ch;
+    ngx_int_t   value;
+    ngx_uint_t  indexed, size_update, prefix;
 
     if (end - pos < 1) {
         return ngx_http_v2_state_save(h2c, pos, end,
@@ -1288,20 +1289,11 @@ ngx_http_v2_state_header_block(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_state_header_complete(h2c, pos, end);
     }
 
-    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
-                                         ngx_http_v2_module);
-
-    h2c->state.field_limit = h2scf->max_field_size;
-
     if (value == 0) {
         h2c->state.parse_name = 1;
 
-    } else {
-        if (ngx_http_v2_get_indexed_header(h2c, value, 1) != NGX_OK) {
-            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_COMP_ERROR);
-        }
-
-        h2c->state.field_limit -= h2c->state.header.name.len;
+    } else if (ngx_http_v2_get_indexed_header(h2c, value, 1) != NGX_OK) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_COMP_ERROR);
     }
 
     h2c->state.parse_value = 1;
@@ -1314,9 +1306,10 @@ static u_char *
 ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    size_t      alloc;
-    ngx_int_t   len;
-    ngx_uint_t  huff;
+    size_t                   alloc;
+    ngx_int_t                len;
+    ngx_uint_t               huff;
+    ngx_http_v2_srv_conf_t  *h2scf;
 
     if (!(h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG)
         && h2c->state.length < NGX_HTTP_V2_INT_OCTETS)
@@ -1363,14 +1356,16 @@ ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos,
                    "http2 hpack %s string length: %i",
                    huff ? "encoded" : "raw", len);
 
-    if ((size_t) len > h2c->state.field_limit) {
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+
+    if ((size_t) len > h2scf->max_field_size) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "client exceeded http2_max_field_size limit");
 
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
     }
 
-    h2c->state.field_limit -= len;
     h2c->state.field_rest = len;
 
     if (h2c->state.stream == NULL && !h2c->state.index) {
@@ -1664,7 +1659,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
     h->key.len = header->name.len;
     h->key.data = header->name.data;
 
-    /* TODO Optimization: precalculate hash and hadnler for indexed headers. */
+    /* TODO Optimization: precalculate hash and handler for indexed headers. */
     h->hash = ngx_hash_key(h->key.data, h->key.len);
 
     h->value.len = header->value.len;
@@ -1818,7 +1813,7 @@ ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c, u_char *pos,
     if (depend == h2c->state.sid) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "client sent PRIORITY frame for stream %ui "
-                      "with incorrect dependancy", h2c->state.sid);
+                      "with incorrect dependency", h2c->state.sid);
 
         node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 0);
 
@@ -2954,6 +2949,8 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
         return NGX_ERROR;
     }
 
+    r->invalid_header = 0;
+
     cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
 
     for (i = (header->name.data[0] == ':'); i != header->name.len; i++) {
@@ -3297,9 +3294,6 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r)
 
     ngx_memcpy(p, ending, sizeof(ending));
 
-    /* some modules expect the space character after method name */
-    r->method_name.data = r->request_line.data;
-
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http2 http request line: \"%V\"", &r->request_line);
 
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 462d254..4c63b21 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -80,7 +80,6 @@ typedef struct {
     unsigned                         index:1;
     ngx_http_v2_header_t             header;
     size_t                           header_limit;
-    size_t                           field_limit;
     u_char                           field_state;
     u_char                          *field_start;
     u_char                          *field_end;
@@ -179,7 +178,7 @@ struct ngx_http_v2_stream_s {
     size_t                           recv_window;
 
     ngx_http_v2_out_frame_t         *free_frames;
-    ngx_chain_t                     *free_data_headers;
+    ngx_chain_t                     *free_frame_headers;
     ngx_chain_t                     *free_bufs;
 
     ngx_queue_t                      queue;
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index a866cde..ed30fe5 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -624,6 +624,8 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
         *b->last++ = flags;
         b->last = ngx_http_v2_write_sid(b->last, stream->node->id);
 
+        b->tag = (ngx_buf_tag_t) &ngx_http_v2_module;
+
         cl = ngx_alloc_chain_link(r->pool);
         if (cl == NULL) {
             return NULL;
@@ -929,7 +931,7 @@ ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
                    stream->node->id, frame, len, (ngx_uint_t) flags);
 
     cl = ngx_chain_get_free_buf(stream->request->pool,
-                                &stream->free_data_headers);
+                                &stream->free_frame_headers);
     if (cl == NULL) {
         return NULL;
     }
@@ -946,7 +948,7 @@ ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
         buf->end = buf->start + NGX_HTTP_V2_FRAME_HEADER_SIZE;
         buf->last = buf->end;
 
-        buf->tag = (ngx_buf_tag_t) &ngx_http_v2_filter_get_data_frame;
+        buf->tag = (ngx_buf_tag_t) &ngx_http_v2_module;
         buf->memory = 1;
     }
 
@@ -1054,23 +1056,45 @@ static ngx_int_t
 ngx_http_v2_headers_frame_handler(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_out_frame_t *frame)
 {
-    ngx_buf_t             *buf;
+    ngx_chain_t           *cl, *ln;
     ngx_http_v2_stream_t  *stream;
 
-    buf = frame->first->buf;
-
-    if (buf->pos != buf->last) {
-        return NGX_AGAIN;
-    }
-
     stream = frame->stream;
+    cl = frame->first;
+
+    for ( ;; ) {
+        if (cl->buf->pos != cl->buf->last) {
+            frame->first = cl;
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                           "http2:%ui HEADERS frame %p was sent partially",
+                           stream->node->id, frame);
+
+            return NGX_AGAIN;
+        }
+
+        ln = cl->next;
+
+        if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_module) {
+            cl->next = stream->free_frame_headers;
+            stream->free_frame_headers = cl;
+
+        } else {
+            cl->next = stream->free_bufs;
+            stream->free_bufs = cl;
+        }
+
+        if (cl == frame->last) {
+            break;
+        }
+
+        cl = ln;
+    }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
                    "http2:%ui HEADERS frame %p was sent",
                    stream->node->id, frame);
 
-    ngx_free_chain(stream->request->pool, frame->first);
-
     ngx_http_v2_handle_frame(stream, frame);
 
     ngx_http_v2_handle_stream(h2c, stream);
@@ -1091,7 +1115,7 @@ ngx_http_v2_data_frame_handler(ngx_http_v2_connection_t *h2c,
 
     cl = frame->first;
 
-    if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_filter_get_data_frame) {
+    if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_module) {
 
         if (cl->buf->pos != cl->buf->last) {
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
@@ -1103,8 +1127,8 @@ ngx_http_v2_data_frame_handler(ngx_http_v2_connection_t *h2c,
 
         ln = cl->next;
 
-        cl->next = stream->free_data_headers;
-        stream->free_data_headers = cl;
+        cl->next = stream->free_frame_headers;
+        stream->free_frame_headers = cl;
 
         if (cl == frame->last) {
             goto done;
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 417b598..00a6a49 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -14,6 +14,9 @@
 static void ngx_thread_read_handler(void *data, ngx_log_t *log);
 #endif
 
+static ssize_t ngx_writev_file(ngx_file_t *file, ngx_array_t *vec, size_t size,
+    off_t offset);
+
 
 #if (NGX_HAVE_FILE_AIO)
 
@@ -176,7 +179,8 @@ ngx_thread_read_handler(void *data, ngx_log_t *log)
 ssize_t
 ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
 {
-    ssize_t  n, written;
+    ssize_t    n, written;
+    ngx_err_t  err;
 
     ngx_log_debug4(NGX_LOG_DEBUG_CORE, file->log, 0,
                    "write: %d, %p, %uz, %O", file->fd, buf, size, offset);
@@ -189,7 +193,15 @@ ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
         n = pwrite(file->fd, buf + written, size, offset);
 
         if (n == -1) {
-            ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
+            err = ngx_errno;
+
+            if (err == NGX_EINTR) {
+                ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
+                               "pwrite() was interrupted");
+                continue;
+            }
+
+            ngx_log_error(NGX_LOG_CRIT, file->log, err,
                           "pwrite() \"%s\" failed", file->name.data);
             return NGX_ERROR;
         }
@@ -221,11 +233,20 @@ ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
         n = write(file->fd, buf + written, size);
 
         if (n == -1) {
-            ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
+            err = ngx_errno;
+
+            if (err == NGX_EINTR) {
+                ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
+                               "write() was interrupted");
+                continue;
+            }
+
+            ngx_log_error(NGX_LOG_CRIT, file->log, err,
                           "write() \"%s\" failed", file->name.data);
             return NGX_ERROR;
         }
 
+        file->sys_offset += n;
         file->offset += n;
         written += n;
 
@@ -264,7 +285,6 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
     u_char        *prev;
     size_t         size;
     ssize_t        total, n;
-    ngx_err_t      err;
     ngx_array_t    vec;
     struct iovec  *iov, iovs[NGX_IOVS];
 
@@ -326,46 +346,12 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
             return total + n;
         }
 
-        if (file->sys_offset != offset) {
-            if (lseek(file->fd, offset, SEEK_SET) == -1) {
-                ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
-                              "lseek() \"%s\" failed", file->name.data);
-                return NGX_ERROR;
-            }
+        n = ngx_writev_file(file, &vec, size, offset);
 
-            file->sys_offset = offset;
+        if (n == NGX_ERROR) {
+            return n;
         }
 
-eintr:
-
-        n = writev(file->fd, vec.elts, vec.nelts);
-
-        if (n == -1) {
-            err = ngx_errno;
-
-            if (err == NGX_EINTR) {
-                ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
-                               "writev() was interrupted");
-                goto eintr;
-            }
-
-            ngx_log_error(NGX_LOG_CRIT, file->log, err,
-                          "writev() \"%s\" failed", file->name.data);
-            return NGX_ERROR;
-        }
-
-        if ((size_t) n != size) {
-            ngx_log_error(NGX_LOG_CRIT, file->log, 0,
-                          "writev() \"%s\" has written only %z of %uz",
-                          file->name.data, n, size);
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_CORE, file->log, 0,
-                       "writev: %d, %z", file->fd, n);
-
-        file->sys_offset += n;
-        file->offset += n;
         offset += n;
         total += n;
 
@@ -375,6 +361,89 @@ eintr:
 }
 
 
+static ssize_t
+ngx_writev_file(ngx_file_t *file, ngx_array_t *vec, size_t size, off_t offset)
+{
+    ssize_t    n;
+    ngx_err_t  err;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_CORE, file->log, 0,
+                   "writev: %d, %uz, %O", file->fd, size, offset);
+
+#if (NGX_HAVE_PWRITEV)
+
+eintr:
+
+    n = pwritev(file->fd, vec->elts, vec->nelts, offset);
+
+    if (n == -1) {
+        err = ngx_errno;
+
+        if (err == NGX_EINTR) {
+            ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
+                           "pwritev() was interrupted");
+            goto eintr;
+        }
+
+        ngx_log_error(NGX_LOG_CRIT, file->log, err,
+                      "pwritev() \"%s\" failed", file->name.data);
+        return NGX_ERROR;
+    }
+
+    if ((size_t) n != size) {
+        ngx_log_error(NGX_LOG_CRIT, file->log, 0,
+                      "pwritev() \"%s\" has written only %z of %uz",
+                      file->name.data, n, size);
+        return NGX_ERROR;
+    }
+
+#else
+
+    if (file->sys_offset != offset) {
+        if (lseek(file->fd, offset, SEEK_SET) == -1) {
+            ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
+                          "lseek() \"%s\" failed", file->name.data);
+            return NGX_ERROR;
+        }
+
+        file->sys_offset = offset;
+    }
+
+eintr:
+
+    n = writev(file->fd, vec->elts, vec->nelts);
+
+    if (n == -1) {
+        err = ngx_errno;
+
+        if (err == NGX_EINTR) {
+            ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
+                           "writev() was interrupted");
+            goto eintr;
+        }
+
+        ngx_log_error(NGX_LOG_CRIT, file->log, err,
+                      "writev() \"%s\" failed", file->name.data);
+        return NGX_ERROR;
+    }
+
+    if ((size_t) n != size) {
+        ngx_log_error(NGX_LOG_CRIT, file->log, 0,
+                      "writev() \"%s\" has written only %z of %uz",
+                      file->name.data, n, size);
+        return NGX_ERROR;
+    }
+
+    file->sys_offset += n;
+
+#endif
+
+    file->offset += n;
+
+    return n;
+}
+
+
 ngx_int_t
 ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s)
 {
diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c
index bf3a310..61cc8ca 100644
--- a/src/os/unix/ngx_posix_init.c
+++ b/src/os/unix/ngx_posix_init.c
@@ -63,7 +63,7 @@ ngx_os_init(ngx_log_t *log)
 
     if (getrlimit(RLIMIT_NOFILE, &rlmt) == -1) {
         ngx_log_error(NGX_LOG_ALERT, log, errno,
-                      "getrlimit(RLIMIT_NOFILE) failed)");
+                      "getrlimit(RLIMIT_NOFILE) failed");
         return NGX_ERROR;
     }
 

From 2de69eb4943511047b082b2b60699f5e8292a7f7 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 14 Jan 2016 10:12:18 +0200
Subject: [PATCH 020/600] New upstream release (1.9.9)

---
 debian/changelog | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3000163..897af34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-nginx (1.9.6-3) UNRELEASED; urgency=medium
+nginx (1.9.9-1) UNRELEASED; urgency=medium
 
+  [ Michael Lustfield ]
   * debian/nginx-common.nginx.logrotate:
     + Switching logrotate to 14 days. (Closes: #805322)
 
- -- Michael Lustfield <michael@lustfield.net>  Thu, 10 Dec 2015 04:07:29 -0600
+  [ Christos Trochalakis ]
+  * New upstream release (1.9.9).
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 14 Jan 2016 10:11:34 +0200
 
 nginx (1.9.6-2) unstable; urgency=medium
 

From 3ed34604605ae854620ec6b50acf942d7485190d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 14 Jan 2016 10:11:18 +0200
Subject: [PATCH 021/600] Update nginx-lua to v0.10.0

---
 debian/changelog                              |    2 +
 debian/modules/README.Modules-versions        |    2 +-
 debian/modules/nginx-lua/README.markdown      |  719 +++++++--
 debian/modules/nginx-lua/config               |    7 +
 .../modules/nginx-lua/doc/HttpLuaModule.wiki  |  477 +++++-
 .../nginx-lua/src/api/ngx_http_lua_api.h      |    2 +-
 .../nginx-lua/src/ngx_http_lua_accessby.c     |    6 +-
 .../modules/nginx-lua/src/ngx_http_lua_args.c |   12 +-
 .../nginx-lua/src/ngx_http_lua_balancer.c     |  607 ++++++++
 .../nginx-lua/src/ngx_http_lua_balancer.h     |   27 +
 .../nginx-lua/src/ngx_http_lua_bodyfilterby.c |    5 +-
 .../nginx-lua/src/ngx_http_lua_cache.c        |   16 +-
 .../nginx-lua/src/ngx_http_lua_cache.h        |    4 +-
 .../nginx-lua/src/ngx_http_lua_clfactory.c    |    4 +-
 .../nginx-lua/src/ngx_http_lua_common.h       |   70 +-
 .../nginx-lua/src/ngx_http_lua_consts.c       |   51 +
 .../nginx-lua/src/ngx_http_lua_contentby.c    |    7 +-
 .../nginx-lua/src/ngx_http_lua_contentby.h    |    2 +-
 .../nginx-lua/src/ngx_http_lua_control.c      |   71 +-
 .../nginx-lua/src/ngx_http_lua_coroutine.c    |   14 +-
 .../nginx-lua/src/ngx_http_lua_directive.c    |   77 +-
 .../nginx-lua/src/ngx_http_lua_directive.h    |    3 +
 .../src/ngx_http_lua_headerfilterby.c         |    4 +-
 .../nginx-lua/src/ngx_http_lua_headers.c      |   10 +-
 .../nginx-lua/src/ngx_http_lua_headers_in.c   |   42 +-
 .../nginx-lua/src/ngx_http_lua_headers_out.c  |    2 +-
 .../nginx-lua/src/ngx_http_lua_logby.c        |    6 +-
 .../modules/nginx-lua/src/ngx_http_lua_misc.c |   32 +-
 .../modules/nginx-lua/src/ngx_http_lua_misc.h |    2 +
 .../nginx-lua/src/ngx_http_lua_module.c       |  169 +-
 .../nginx-lua/src/ngx_http_lua_output.c       |    4 +-
 .../nginx-lua/src/ngx_http_lua_phase.c        |    8 +
 .../nginx-lua/src/ngx_http_lua_regex.c        |   20 +-
 .../nginx-lua/src/ngx_http_lua_req_body.c     |    4 +-
 .../nginx-lua/src/ngx_http_lua_req_method.c   |    6 +-
 .../nginx-lua/src/ngx_http_lua_rewriteby.c    |    8 +-
 .../nginx-lua/src/ngx_http_lua_script.c       |    2 +-
 .../nginx-lua/src/ngx_http_lua_semaphore.c    |  546 +++++++
 .../nginx-lua/src/ngx_http_lua_semaphore.h    |   51 +
 .../nginx-lua/src/ngx_http_lua_shdict.c       |   15 +-
 .../nginx-lua/src/ngx_http_lua_shdict.h       |    1 +
 .../nginx-lua/src/ngx_http_lua_sleep.c        |    5 +-
 .../nginx-lua/src/ngx_http_lua_socket_tcp.c   |  184 +--
 .../nginx-lua/src/ngx_http_lua_socket_tcp.h   |    6 +-
 .../nginx-lua/src/ngx_http_lua_socket_udp.c   |   10 +-
 .../nginx-lua/src/ngx_http_lua_socket_udp.h   |    4 +-
 .../nginx-lua/src/ngx_http_lua_ssl_certby.c   |  938 +++++++++++
 .../nginx-lua/src/ngx_http_lua_ssl_certby.h   |   47 +
 .../nginx-lua/src/ngx_http_lua_ssl_ocsp.c     |  497 ++++++
 .../nginx-lua/src/ngx_http_lua_string.c       |    2 +-
 .../nginx-lua/src/ngx_http_lua_subrequest.c   |   53 +-
 .../nginx-lua/src/ngx_http_lua_timer.c        |   50 +-
 .../nginx-lua/src/ngx_http_lua_uthread.c      |    6 +-
 .../modules/nginx-lua/src/ngx_http_lua_util.c |  166 +-
 .../modules/nginx-lua/src/ngx_http_lua_util.h |   22 +-
 .../nginx-lua/src/ngx_http_lua_variable.c     |    8 +-
 .../nginx-lua/src/ngx_http_lua_worker.c       |   58 +-
 debian/modules/nginx-lua/t/020-subrequest.t   |    6 +-
 debian/modules/nginx-lua/t/022-redirect.t     |   54 +-
 debian/modules/nginx-lua/t/028-req-header.t   |   52 +-
 debian/modules/nginx-lua/t/056-flush.t        |    2 +-
 debian/modules/nginx-lua/t/058-tcp-socket.t   |  297 +++-
 debian/modules/nginx-lua/t/062-count.t        |   18 +-
 debian/modules/nginx-lua/t/076-no-postpone.t  |   64 +-
 debian/modules/nginx-lua/t/082-body-filter.t  |   15 +-
 debian/modules/nginx-lua/t/129-ssl-socket.t   |   18 +-
 debian/modules/nginx-lua/t/132-lua-blocks.t   |   85 +
 debian/modules/nginx-lua/t/133-worker-count.t |   32 +
 .../modules/nginx-lua/t/134-worker-count-5.t  |   32 +
 debian/modules/nginx-lua/t/135-worker-id.t    |   33 +
 debian/modules/nginx-lua/t/136-timer-counts.t |  111 ++
 debian/modules/nginx-lua/t/137-req-misc.t     |   62 +
 debian/modules/nginx-lua/t/138-balancer.t     |  304 ++++
 debian/modules/nginx-lua/t/139-ssl-cert-by.t  | 1382 +++++++++++++++++
 debian/modules/nginx-lua/util/build2.sh       |    8 +-
 75 files changed, 7242 insertions(+), 506 deletions(-)
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_balancer.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
 create mode 100644 debian/modules/nginx-lua/t/133-worker-count.t
 create mode 100644 debian/modules/nginx-lua/t/134-worker-count-5.t
 create mode 100644 debian/modules/nginx-lua/t/135-worker-id.t
 create mode 100644 debian/modules/nginx-lua/t/136-timer-counts.t
 create mode 100644 debian/modules/nginx-lua/t/137-req-misc.t
 create mode 100644 debian/modules/nginx-lua/t/138-balancer.t
 create mode 100644 debian/modules/nginx-lua/t/139-ssl-cert-by.t

diff --git a/debian/changelog b/debian/changelog
index 897af34..bf298f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ nginx (1.9.9-1) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis ]
   * New upstream release (1.9.9).
+  * debian/modules/nginx-lua:
+    + Update nginx-lua to v0.10.0.
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 14 Jan 2016 10:11:34 +0200
 
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 3690858..eb35054 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -22,7 +22,7 @@ README for Modules versions
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
-  Version: v0.9.19
+  Version: v0.10.0
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/nginx-lua/README.markdown
index da06da6..64adc0e 100644
--- a/debian/modules/nginx-lua/README.markdown
+++ b/debian/modules/nginx-lua/README.markdown
@@ -61,7 +61,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.9.19](https://github.com/openresty/lua-nginx-module/tags) released on 11 November 2015.
+This document describes ngx_lua [v0.10.0](https://github.com/openresty/lua-nginx-module/tags) released on 11 January 2015.
 
 Synopsis
 ========
@@ -241,19 +241,15 @@ The Lua state (Lua VM instance) is shared across all the requests handled by a s
 
 Nginx Compatibility
 ===================
-The latest module is compatible with the following versions of Nginx:
 
-* 1.9.x (last tested: 1.9.3)
+The latest version of this module is compatible with the following versions of Nginx:
+
+* 1.9.x (last tested: 1.9.7)
+* 1.8.x
 * 1.7.x (last tested: 1.7.10)
 * 1.6.x
-* 1.5.x (last tested: 1.5.12)
-* 1.4.x (last tested: 1.4.4)
-* 1.3.x (last tested: 1.3.11)
-* 1.2.x (last tested: 1.2.9)
-* 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)
+
+Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 
 [Back to TOC](#table-of-contents)
 
@@ -273,9 +269,9 @@ Build the source with this module:
 
 ```bash
 
- wget 'http://nginx.org/download/nginx-1.9.3.tar.gz'
- tar -xzvf nginx-1.9.3.tar.gz
- cd nginx-1.9.3/
+ wget 'http://nginx.org/download/nginx-1.9.7.tar.gz'
+ tar -xzvf nginx-1.9.7.tar.gz
+ cd nginx-1.9.7/
 
  # tell nginx's build system where to find LuaJIT 2.0:
  export LUAJIT_LIB=/path/to/luajit/lib
@@ -859,7 +855,6 @@ TODO
      }
  }
 ```
-* ssl: implement directives `ssl_certificate_by_lua` and `ssl_certificate_by_lua_file` to allow using Lua to dynamically serve SSL certificates and keys for downstream SSL handshake. (already done in CloudFlare's private branch and powering CloudFlare's SSL gateway of its global network. expected to be opensourced in March 2015.)
 * shm: implement a "shared queue API" to complement the existing [shared dict](#lua_shared_dict) API.
 * cosocket: add support in the context of [init_by_lua*](#init_by_lua).
 * cosocket: implement the `bind()` method for stream-typed cosockets.
@@ -1028,7 +1023,11 @@ Directives
 * [log_by_lua](#log_by_lua)
 * [log_by_lua_block](#log_by_lua_block)
 * [log_by_lua_file](#log_by_lua_file)
+* [balancer_by_lua_block](#balancer_by_lua_block)
+* [balancer_by_lua_file](#balancer_by_lua_file)
 * [lua_need_request_body](#lua_need_request_body)
+* [ssl_certificate_by_lua_block](#ssl_certificate_by_lua_block)
+* [ssl_certificate_by_lua_file](#ssl_certificate_by_lua_file)
 * [lua_shared_dict](#lua_shared_dict)
 * [lua_socket_connect_timeout](#lua_socket_connect_timeout)
 * [lua_socket_send_timeout](#lua_socket_send_timeout)
@@ -1045,6 +1044,7 @@ Directives
 * [lua_ssl_verify_depth](#lua_ssl_verify_depth)
 * [lua_http10_buffering](#lua_http10_buffering)
 * [rewrite_by_lua_no_postpone](#rewrite_by_lua_no_postpone)
+* [access_by_lua_no_postpone](#access_by_lua_no_postpone)
 * [lua_transform_underscores_in_response_headers](#lua_transform_underscores_in_response_headers)
 * [lua_check_client_abort](#lua_check_client_abort)
 * [lua_max_pending_timers](#lua_max_pending_timers)
@@ -1832,6 +1832,10 @@ As with other access phase handlers, [access_by_lua](#access_by_lua) will *not*
 
 Note that when calling `ngx.exit(ngx.OK)` within a [access_by_lua](#access_by_lua) handler, the nginx request processing control flow will still continue to the content handler. To terminate the current request from within a [access_by_lua](#access_by_lua) handler, calling [ngx.exit](#ngxexit) with status >= 200 (`ngx.HTTP_OK`) and status < 300 (`ngx.HTTP_SPECIAL_RESPONSE`) for successful quits and `ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)` (or its friends) for failures.
 
+Starting from the `v0.9.20` release, you can use the [access_by_lua_no_postpone](#access_by_lua_no_postpone)
+directive to control when to run this handler inside the "access" request-processing phase
+of NGINX.
+
 [Back to TOC](#directives)
 
 access_by_lua_block
@@ -2212,6 +2216,83 @@ This directive was first introduced in the `v0.5.0rc31` release.
 
 [Back to TOC](#directives)
 
+balancer_by_lua_block
+---------------------
+
+**syntax:** *balancer_by_lua_block { lua-script }*
+
+**context:** *upstream*
+
+**phase:** *content*
+
+This directive runs Lua code as an upstream balancer for any upstream entities defined
+by the `upstream {}` configuration block.
+
+For instance,
+
+```nginx
+
+ upstream foo {
+     server 127.0.0.1;
+     balancer_by_lua_block {
+         -- use Lua to do something interesting here
+         -- as a dynamic balancer
+     }
+ }
+
+ server {
+     location / {
+         proxy_pass http://foo;
+     }
+ }
+```
+
+The resulting Lua load balancer can work with any existing nginx upstream modules
+like [ngx_proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and
+[ngx_fastcgi](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
+
+Also, the Lua load balancer can work with the standard upstream connection pool mechanism,
+i.e., the standard [keepalive](http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive) directive.
+Just ensure that the [keepalive](http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive) directive
+is used *after* this `balancer_by_lua_block` directive in a single `upstream {}` configuration block.
+
+The Lua load balancer can totally ignore the list of servers defined in the `upstream {}` block
+and select peer from a completely dynamic server list (even changing per request) via the
+[ngx.balancer](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/balancer.md) module
+from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
+
+The Lua code handler registered by this directive might get called more than once in a single
+downstream request when the nginx upstream mechanism retries the request on conditions
+specified by directives like the [proxy_next_upstream](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_next_upstream)
+directive.
+
+This Lua code execution context does not support yielding, so Lua APIs that may yield
+(like cosockets and "light threads") are disabled in this context. One can usually work
+around this limitation by doing such operations in an earlier phase handler (like
+[access_by_lua*](#access_by_lua)) and passing along the result into this context
+via the [ngx.ctx](#ngxctx) table.
+
+This directive was first introduced in the `v0.10.0` release.
+
+[Back to TOC](#directives)
+
+balancer_by_lua_file
+--------------------
+
+**syntax:** *balancer_by_lua_file &lt;path-to-lua-script-file&gt;*
+
+**context:** *upstream*
+
+**phase:** *content*
+
+Equivalent to [balancer_by_lua_block](#balancer_by_lua_block), 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](#lualuajit-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.10.0` release.
+
+[Back to TOC](#directives)
+
 lua_need_request_body
 ---------------------
 
@@ -2240,6 +2321,112 @@ This also applies to [access_by_lua](#access_by_lua) and [access_by_lua_file](#a
 
 [Back to TOC](#directives)
 
+ssl_certificate_by_lua_block
+----------------------------
+
+**syntax:** *ssl_certificate_by_lua_block { lua-script }*
+
+**context:** *server*
+
+**phase:** *right-before-SSL-handshake*
+
+This directive runs user Lua code when NGINX is about to start the SSL handshake for the downstream
+SSL (https) connections.
+
+It is particularly useful for setting the SSL certificate chain and the corresponding private key on a per-request
+basis. It is also useful to load such handshake configurations nonblockingly from the remote (for example,
+with the [cosocket](#ngxsockettcp) API). And one can also do per-request OCSP stapling handling in pure
+Lua here as well.
+
+Another typical use case is to do SSL handshake traffic control nonblockingly in this context,
+with the help of the [lua-resty-limit-traffic#readme](https://github.com/openresty/lua-resty-limit-traffic)
+library, for example.
+
+One can also do interesting things with the SSL handshake requests from the client side, like
+rejecting old SSL clients using the SSLv3 protocol or even below selectively.
+
+The [ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
+and [ngx.ocsp](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md) Lua modules
+provided by the [lua-resty-core](https://github.com/openresty/lua-resty-core/#readme)
+library are particularly useful in this context. You can use the Lua API offered by these two Lua modules
+to manipulate the SSL certificate chain and private key for the current SSL connection
+being initiated.
+
+This Lua handler does not run at all, however, when NGINX/OpenSSL successfully resumes
+the SSL session via SSL session IDs or TLS session tickets for the current SSL connection. In
+other words, this Lua handler only runs when NGINX has to initiate a full SSL handshake.
+
+Below is a trivial example using the
+[ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md) module
+at the same time:
+
+```nginx
+
+ server {
+     listen 443 ssl;
+     server_name   test.com;
+
+     ssl_certificate_by_lua_block {
+         print("About to initiate a new SSL handshake!")
+     }
+
+     location / {
+         root html;
+     }
+ }
+```
+
+See more complicated examples in the [ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
+and [ngx.ocsp](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md)
+Lua modules' official documentation.
+
+Uncaught Lua exceptions in the user Lua code immediately abort the current SSL session, so does the
+[ngx.exit](#ngxexit) call with an error code like `ngx.ERROR`.
+
+This Lua code execution context *does* support yielding, so Lua APIs that may yield
+(like cosockets, sleeping, and "light threads")
+are enabled in this context.
+
+Note, however, you still need to configure the [ssl_certificate](http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_certificate) and
+[ssl_certificate_key](http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_certificate_key)
+directives even though you will not use this static certificate and private key at all. This is
+because the NGINX core requires their appearance otherwise you are seeing the following error
+while starting NGINX:
+
+
+    nginx: [emerg] no ssl configured for the server
+
+
+This directive currently requires the following NGINX core patch to work correctly:
+
+<http://mailman.nginx.org/pipermail/nginx-devel/2016-January/007748.html>
+
+The bundled version of the NGINX core in OpenResty 1.9.7.2 (or above) already has this
+patch applied.
+
+Furthermore, one needs at least OpenSSL 1.0.2e for this directive to work.
+
+This directive was first introduced in the `v0.10.0` release.
+
+[Back to TOC](#directives)
+
+ssl_certificate_by_lua_file
+---------------------------
+
+**syntax:** *ssl_certificate_by_lua_file &lt;path-to-lua-script-file&gt;*
+
+**context:** *server*
+
+**phase:** *right-before-SSL-handshake*
+
+Equivalent to [ssl_certificate_by_lua_block](#ssl_certificate_by_lua_block), 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](#lualuajit-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.10.0` release.
+
+[Back to TOC](#directives)
+
 lua_shared_dict
 ---------------
 
@@ -2265,6 +2452,9 @@ The `<size>` argument accepts size units such as `k` and `m`:
  }
 ```
 
+The hard-coded minimum size is 8KB while the practical minimum size depends
+on actual user data set (some people start with 12KB).
+
 See [ngx.shared.DICT](#ngxshareddict) for details.
 
 This directive was first introduced in the `v0.3.1rc22` release.
@@ -2518,12 +2708,27 @@ rewrite_by_lua_no_postpone
 
 **context:** *http*
 
-Controls whether or not to disable postponing [rewrite_by_lua](#rewrite_by_lua) and [rewrite_by_lua_file](#rewrite_by_lua_file) directives to run at the end of the `rewrite` request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the `rewrite` phase.
+Controls whether or not to disable postponing [rewrite_by_lua](#rewrite_by_lua)* directives to run at the end of the `rewrite` request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the `rewrite` phase.
 
 This directive was first introduced in the `v0.5.0rc29` release.
 
 [Back to TOC](#directives)
 
+access_by_lua_no_postpone
+-------------------------
+
+**syntax:** *access_by_lua_no_postpone on|off*
+
+**default:** *access_by_lua_no_postpone off*
+
+**context:** *http*
+
+Controls whether or not to disable postponing [access_by_lua](#access_by_lua)* directives to run at the end of the `access` request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the `access` phase.
+
+This directive was first introduced in the `v0.9.20` release.
+
+[Back to TOC](#directives)
+
 lua_transform_underscores_in_response_headers
 ---------------------------------------------
 
@@ -2629,6 +2834,7 @@ Nginx API for Lua
 * [ngx.status](#ngxstatus)
 * [ngx.header.HEADER](#ngxheaderheader)
 * [ngx.resp.get_headers](#ngxrespget_headers)
+* [ngx.req.is_internal](#ngxreqis_internal)
 * [ngx.req.start_time](#ngxreqstart_time)
 * [ngx.req.http_version](#ngxreqhttp_version)
 * [ngx.req.raw_header](#ngxreqraw_header)
@@ -2727,6 +2933,8 @@ Nginx API for Lua
 * [ngx.thread.kill](#ngxthreadkill)
 * [ngx.on_abort](#ngxon_abort)
 * [ngx.timer.at](#ngxtimerat)
+* [ngx.timer.running_count](#ngxtimerrunning_count)
+* [ngx.timer.pending_count](#ngxtimerpending_count)
 * [ngx.config.debug](#ngxconfigdebug)
 * [ngx.config.prefix](#ngxconfigprefix)
 * [ngx.config.nginx_version](#ngxconfignginx_version)
@@ -2734,6 +2942,12 @@ Nginx API for Lua
 * [ngx.config.ngx_lua_version](#ngxconfigngx_lua_version)
 * [ngx.worker.exiting](#ngxworkerexiting)
 * [ngx.worker.pid](#ngxworkerpid)
+* [ngx.worker.count](#ngxworkercount)
+* [ngx.worker.id](#ngxworkerid)
+* [ngx.semaphore](#ngxsemaphore)
+* [ngx.balancer](#ngxbalancer)
+* [ngx.ssl](#ngxssl)
+* [ngx.ocsp](#ngxocsp)
 * [ndk.set_var.DIRECTIVE](#ndkset_vardirective)
 * [coroutine.create](#coroutinecreate)
 * [coroutine.resume](#coroutineresume)
@@ -2786,7 +3000,7 @@ ngx.arg
 -------
 **syntax:** *val = ngx.arg\[index\]*
 
-**context:** *set_by_lua*, body_filter_by_lua**
+**context:** *set_by_lua&#42;, body_filter_by_lua&#42;*
 
 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:
 
@@ -2823,7 +3037,7 @@ 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*, body_filter_by_lua*, log_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
 
 Read and write Nginx variable values.
 
@@ -2880,7 +3094,7 @@ This API requires a relatively expensive metamethod call and it is recommended t
 
 Core constants
 --------------
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, &#42;log_by_lua&#42;, ngx.timer.&#42;*
 
 ```lua
 
@@ -2906,7 +3120,7 @@ The `ngx.DECLINED` constant was first introduced in the `v0.5.0rc19` release.
 
 HTTP method constants
 ---------------------
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;*
 
 
       ngx.HTTP_GET
@@ -2932,34 +3146,51 @@ These constants are usually used in [ngx.location.capture](#ngxlocationcapture)
 
 HTTP status constants
 ---------------------
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;*
 
 ```nginx
 
+   value = ngx.HTTP_CONTINUE (100) (first added in the v0.9.20 release)
+   value = ngx.HTTP_SWITCHING_PROTOCOLS (101) (first added in the v0.9.20 release)
    value = ngx.HTTP_OK (200)
    value = ngx.HTTP_CREATED (201)
+   value = ngx.HTTP_ACCEPTED (202) (first added in the v0.9.20 release)
+   value = ngx.HTTP_NO_CONTENT (204) (first added in the v0.9.20 release)
+   value = ngx.HTTP_PARTIAL_CONTENT (206) (first added in the v0.9.20 release)
    value = ngx.HTTP_SPECIAL_RESPONSE (300)
    value = ngx.HTTP_MOVED_PERMANENTLY (301)
    value = ngx.HTTP_MOVED_TEMPORARILY (302)
    value = ngx.HTTP_SEE_OTHER (303)
    value = ngx.HTTP_NOT_MODIFIED (304)
+   value = ngx.HTTP_TEMPORARY_REDIRECT (307) (first added in the v0.9.20 release)
    value = ngx.HTTP_BAD_REQUEST (400)
    value = ngx.HTTP_UNAUTHORIZED (401)
+   value = ngx.HTTP_PAYMENT_REQUIRED (402) (first added in the v0.9.20 release)
    value = ngx.HTTP_FORBIDDEN (403)
    value = ngx.HTTP_NOT_FOUND (404)
    value = ngx.HTTP_NOT_ALLOWED (405)
+   value = ngx.HTTP_NOT_ACCEPTABLE (406) (first added in the v0.9.20 release)
+   value = ngx.HTTP_REQUEST_TIMEOUT (408) (first added in the v0.9.20 release)
+   value = ngx.HTTP_CONFLICT (409) (first added in the v0.9.20 release)
    value = ngx.HTTP_GONE (410)
+   value = ngx.HTTP_UPGRADE_REQUIRED (426) (first added in the v0.9.20 release)
+   value = ngx.HTTP_TOO_MANY_REQUESTS (429) (first added in the v0.9.20 release)
+   value = ngx.HTTP_CLOSE (444) (first added in the v0.9.20 release)
+   value = ngx.HTTP_ILLEGAL (451) (first added in the v0.9.20 release)
    value = ngx.HTTP_INTERNAL_SERVER_ERROR (500)
    value = ngx.HTTP_METHOD_NOT_IMPLEMENTED (501)
+   value = ngx.HTTP_BAD_GATEWAY (502) (first added in the v0.9.20 release)
    value = ngx.HTTP_SERVICE_UNAVAILABLE (503)
    value = ngx.HTTP_GATEWAY_TIMEOUT (504) (first added in the v0.3.1rc38 release)
+   value = ngx.HTTP_VERSION_NOT_SUPPORTED (505) (first added in the v0.9.20 release)
+   value = ngx.HTTP_INSUFFICIENT_STORAGE (507) (first added in the v0.9.20 release)
 ```
 
 [Back to TOC](#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*, body_filter_by_lua, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;*
 
 ```lua
 
@@ -2982,7 +3213,7 @@ print
 -----
 **syntax:** *print(...)*
 
-**context:** *init_by_lua*, init_worker_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.timer.**
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, certificate_by_lua&#42;*
 
 Writes argument values into the nginx `error.log` file with the `ngx.NOTICE` log level.
 
@@ -3001,7 +3232,7 @@ There is a hard coded `2048` byte limitation on error message lengths in the Ngi
 
 ngx.ctx
 -------
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;*
 
 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). 
 
@@ -3104,7 +3335,42 @@ Overriding `ngx.ctx` with a new Lua table is also supported, for example,
 
 When being used in the context of [init_worker_by_lua*](#init_worker_by_lua), this table just has the same lifetime of the current Lua handler.
 
-The `ngx.ctx` lookup requires relatively expensive metamethod calls and it is much slower than explicitly passing per-request data along by your own function arguments. So do not abuse this API for saving your own function arguments because it usually has quite some performance impact. And because of the metamethod magic, never "local" the `ngx.ctx` table outside your function scope.
+The `ngx.ctx` lookup requires relatively expensive metamethod calls and it is much slower than explicitly passing per-request data along by your own function arguments. So do not abuse this API for saving your own function arguments because it usually has quite some performance impact.
+
+Because of the metamethod magic, never "local" the `ngx.ctx` table outside your Lua function scope on the Lua module level level due to [worker-level data sharing](#data-sharing-within-an-nginx-worker). For example, the following is bad:
+
+```lua
+
+ -- mymodule.lua
+ local _M = {}
+
+ -- the following line is bad since ngx.ctx is a per-request
+ -- data while this `ctx` variable is on the Lua module level
+ -- and thus is per-nginx-worker.
+ local ctx = ngx.ctx
+
+ function _M.main()
+     ctx.foo = "bar"
+ end
+
+ return _M
+```
+
+Use the following instead:
+
+```lua
+
+ -- mymodule.lua
+ local _M = {}
+
+ function _M.main(ctx)
+     ctx.foo = "bar"
+ end
+
+ return _M
+```
+
+That is, let the caller pass the `ctx` table explicitly via a function argument.
 
 [Back to TOC](#nginx-api-for-lua)
 
@@ -3112,9 +3378,9 @@ ngx.location.capture
 --------------------
 **syntax:** *res = ngx.location.capture(uri, options?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
-Issue a synchronous but still non-blocking *Nginx Subrequest* using `uri`.
+Issues 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.
@@ -3125,6 +3391,9 @@ Subrequests are completely different from HTTP 301/302 redirection (via [ngx.red
 
 You should always read the request body (by either calling [ngx.req.read_body](#ngxreqread_body) or configuring [lua_need_request_body](#lua_need_request_body) on) before initiating a subrequest.
 
+This API function (as well as [ngx.location.capture_multi](#ngxlocationcapture_multi)) always buffers the whole response body of the subrequest in memory. Thus, you should use [cosockets](#ngxsockettcp)
+and streaming processing instead if you have to handle large subrequest responses.
+
 Here is a basic example:
 
 ```lua
@@ -3401,7 +3670,7 @@ ngx.location.capture_multi
 --------------------------
 **syntax:** *res1, res2, ... = ngx.location.capture_multi({ {uri, options?}, {uri, options?}, ... })*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Just like [ngx.location.capture](#ngxlocationcapture), but supports multiple subrequests running in parallel.
 
@@ -3464,7 +3733,7 @@ Please also refer to restrictions on capturing locations configured by [subreque
 
 ngx.status
 ----------
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;*
 
 Read and write the current request's response status. This should be called
 before sending out the response headers.
@@ -3489,7 +3758,7 @@ ngx.header.HEADER
 
 **syntax:** *value = ngx.header.HEADER*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;*
 
 Set, add to, or clear the current request's `HEADER` response header that is to be sent.
 
@@ -3601,7 +3870,7 @@ ngx.resp.get_headers
 --------------------
 **syntax:** *headers = ngx.resp.get_headers(max_headers?, raw?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, balancer_by_lua&#42;*
 
 Returns a Lua table holding all the current response headers for the current request.
 
@@ -3619,11 +3888,26 @@ This API was first introduced in the `v0.9.5` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+ngx.req.is_internal
+-------------------
+**syntax:** *is_internal = ngx.req.is_internal()*
+
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
+
+Returns a boolean indicating whether the current request is an "internal request", i.e.,
+a request initiated from inside the current nginx server instead of from the client side.
+
+Subrequests are all internal requests and so are requests after internal redirects.
+
+This API was first introduced in the `v0.9.20` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
 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**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
 
 Returns a floating-point number representing the timestamp (including milliseconds as the decimal part) when the current request was created.
 
@@ -3644,7 +3928,7 @@ ngx.req.http_version
 --------------------
 **syntax:** *num = ngx.req.http_version()*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;*
 
 Returns the HTTP version number for the current request as a Lua number.
 
@@ -3658,7 +3942,7 @@ ngx.req.raw_header
 ------------------
 **syntax:** *str = ngx.req.raw_header(no_request_line?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;*
 
 Returns the original raw HTTP protocol header received by the Nginx server.
 
@@ -3704,7 +3988,7 @@ 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**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, balancer_by_lua&#42;*
 
 Retrieves the current request's request method name. Strings like `"GET"` and `"POST"` are returned instead of numerical [method constants](#http-method-constants).
 
@@ -3720,7 +4004,7 @@ 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**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;*
 
 Overrides the current request's request method with the `method_id` argument. Currently only numerical [method constants](#http-method-constants) are supported, like `ngx.HTTP_POST` and `ngx.HTTP_GET`.
 
@@ -3736,7 +4020,7 @@ 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*, body_filter_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;*
 
 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.
 
@@ -3835,7 +4119,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*, body_filter_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;*
 
 Rewrite the current request's URI query arguments by the `args` argument. The `args` argument can be either a Lua string, as in
 
@@ -3872,7 +4156,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*, body_filter_by_lua, log_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, balancer_by_lua&#42;*
 
 Returns a Lua table holding all the current request URL query arguments.
 
@@ -3968,7 +4252,7 @@ ngx.req.get_post_args
 ---------------------
 **syntax:** *args, err = ngx.req.get_post_args(max_args?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;*
 
 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](#ngxreqread_body) to read the request body first or turn on the [lua_need_request_body](#lua_need_request_body) directive to avoid errors.
 
@@ -4070,7 +4354,7 @@ ngx.req.get_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*, body_filter_by_lua, log_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;*
 
 Returns a Lua table holding all the current request headers.
 
@@ -4144,7 +4428,7 @@ 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*, body_filter_by_lua*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua*
 
 Set the current request's request header named `header_name` to value `header_value`, overriding any existing ones.
 
@@ -4195,7 +4479,7 @@ 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**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;*
 
 Clears the current request's request header named `header_name`. None of the current request's existing subrequests will be affected but subsequently initiated subrequests will inherit the change by default.
 
@@ -4205,7 +4489,7 @@ ngx.req.read_body
 -----------------
 **syntax:** *ngx.req.read_body()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Reads the client request body synchronously without blocking the Nginx event loop.
 
@@ -4236,7 +4520,7 @@ ngx.req.discard_body
 --------------------
 **syntax:** *ngx.req.discard_body()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Explicitly discard the request body, i.e., read the data on the connection and throw it away immediately. Please note that ignoring request body is not the right way to discard it, and that this function must be called to avoid breaking things under HTTP 1.1 keepalive or HTTP 1.1 pipelining.
 
@@ -4254,7 +4538,7 @@ ngx.req.get_body_data
 ---------------------
 **syntax:** *data = ngx.req.get_body_data()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Retrieves in-memory request body data. It returns a Lua string rather than a Lua table holding all the parsed query arguments. Use the [ngx.req.get_post_args](#ngxreqget_post_args) function instead if a Lua table is required.
 
@@ -4282,7 +4566,7 @@ ngx.req.get_body_file
 ---------------------
 **syntax:** *file_name = ngx.req.get_body_file()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 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.
 
@@ -4304,7 +4588,7 @@ ngx.req.set_body_data
 ---------------------
 **syntax:** *ngx.req.set_body_data(data)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Set the current request's request body using the in-memory data specified by the `data` argument.
 
@@ -4320,7 +4604,7 @@ ngx.req.set_body_file
 ---------------------
 **syntax:** *ngx.req.set_body_file(file_name, auto_clean?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Set the current request's request body using the in-file data specified by the `file_name` argument.
 
@@ -4340,7 +4624,7 @@ ngx.req.init_body
 -----------------
 **syntax:** *ngx.req.init_body(buffer_size?)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 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](#ngxreqappend_body) and [ngx.req.finish_body](#ngxreqfinish_body) APIs.
 
@@ -4371,7 +4655,7 @@ ngx.req.append_body
 -------------------
 **syntax:** *ngx.req.append_body(data_chunk)*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Append new data chunk specified by the `data_chunk` argument onto the existing request body created by the [ngx.req.init_body](#ngxreqinit_body) call.
 
@@ -4391,7 +4675,7 @@ ngx.req.finish_body
 -------------------
 **syntax:** *ngx.req.finish_body()*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Completes the construction process of the new request body created by the [ngx.req.init_body](#ngxreqinit_body) and [ngx.req.append_body](#ngxreqappend_body) calls.
 
@@ -4409,7 +4693,7 @@ ngx.req.socket
 
 **syntax:** *tcpsock, err = ngx.req.socket(raw)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Returns a read-only cosocket object that wraps the downstream connection. Only [receive](#tcpsockreceive) and [receiveuntil](#tcpsockreceiveuntil) methods are supported on this object.
 
@@ -4434,7 +4718,7 @@ ngx.exec
 --------
 **syntax:** *ngx.exec(uri, args?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Does an internal redirect to `uri` with `args` and is similar to the [echo_exec](http://github.com/openresty/echo-nginx-module#echo_exec) directive of the [echo-nginx-module](http://github.com/openresty/echo-nginx-module).
 
@@ -4501,7 +4785,7 @@ ngx.redirect
 ------------
 **syntax:** *ngx.redirect(uri, status?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Issue an `HTTP 301` or `302` redirection to `uri`.
 
@@ -4583,7 +4867,7 @@ ngx.send_headers
 ----------------
 **syntax:** *ok, err = ngx.send_headers()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Explicitly send out the response headers.
 
@@ -4598,7 +4882,7 @@ ngx.headers_sent
 ----------------
 **syntax:** *value = ngx.headers_sent*
 
-**context:** *set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Returns `true` if the response headers have been sent (by ngx_lua), and `false` otherwise.
 
@@ -4610,7 +4894,7 @@ ngx.print
 ---------
 **syntax:** *ok, err = ngx.print(...)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Emits arguments concatenated to the HTTP client (as response body). If response headers have not been sent, this function will send headers out first and then output body data.
 
@@ -4651,7 +4935,7 @@ ngx.say
 -------
 **syntax:** *ok, err = ngx.say(...)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Just as [ngx.print](#ngxprint) but also emit a trailing newline.
 
@@ -4661,7 +4945,7 @@ ngx.log
 -------
 **syntax:** *ngx.log(log_level, ...)*
 
-**context:** *init_by_lua*, init_worker_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.timer.**
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Log arguments concatenated to error.log with the given logging level.
 
@@ -4677,7 +4961,7 @@ ngx.flush
 ---------
 **syntax:** *ok, err = ngx.flush(wait?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Flushes response output to the client. 
 
@@ -4697,7 +4981,7 @@ ngx.exit
 --------
 **syntax:** *ngx.exit(status)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 When `status >= 200` (i.e., `ngx.HTTP_OK` and above), it will interrupt the execution of the current request and return status code to nginx.
 
@@ -4750,7 +5034,7 @@ ngx.eof
 -------
 **syntax:** *ok, err = ngx.eof()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 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".
 
@@ -4785,7 +5069,7 @@ ngx.sleep
 ---------
 **syntax:** *ngx.sleep(seconds)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Sleeps for the specified seconds without blocking. One can specify time resolution up to 0.001 seconds (i.e., one milliseconds).
 
@@ -4801,7 +5085,7 @@ ngx.escape_uri
 --------------
 **syntax:** *newstr = ngx.escape_uri(str)*
 
-**context:** *init_by_lua*, init_worker_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.timer.**
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Escape `str` as a URI component.
 
@@ -4811,7 +5095,7 @@ ngx.unescape_uri
 ----------------
 **syntax:** *newstr = ngx.unescape_uri(str)*
 
-**context:** *init_by_lua*, init_worker_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.timer.**
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Unescape `str` as an escaped URI component.
 
@@ -4834,7 +5118,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Encode the Lua table to a query args string according to the URI encoded rules.
 
@@ -4891,7 +5175,7 @@ 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Decodes a URI encoded query-string into a Lua table. This is the inverse function of [ngx.encode_args](#ngxencode_args).
 
@@ -4914,7 +5198,7 @@ ngx.encode_base64
 -----------------
 **syntax:** *newstr = ngx.encode_base64(str, no_padding?)*
 
-**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.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Encodes `str` to a base64 digest.
 
@@ -4926,7 +5210,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Decodes the `str` argument as a base64 digest to the raw form. Returns `nil` if `str` is not well formed.
 
@@ -4936,7 +5220,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
 
@@ -4952,7 +5236,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
 
@@ -4968,7 +5252,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 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>`.
 
@@ -5000,7 +5284,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Returns the hexadecimal representation of the MD5 digest of the `str` argument.
 
@@ -5027,7 +5311,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Returns the binary form of the MD5 digest of the `str` argument.
 
@@ -5039,7 +5323,7 @@ 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Returns the binary form of the SHA-1 digest of the `str` argument.
 
@@ -5053,7 +5337,7 @@ ngx.quote_sql_str
 -----------------
 **syntax:** *quoted_value = ngx.quote_sql_str(raw_value)*
 
-**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.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Returns a quoted SQL string literal according to the MySQL quoting rules.
 
@@ -5063,7 +5347,7 @@ ngx.today
 ---------
 **syntax:** *str = ngx.today()*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Returns current date (in the format `yyyy-mm-dd`) from the nginx cached time (no syscall involved unlike Lua's date library).
 
@@ -5075,7 +5359,7 @@ ngx.time
 --------
 **syntax:** *secs = ngx.time()*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 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).
 
@@ -5087,7 +5371,7 @@ ngx.now
 -------
 **syntax:** *secs = ngx.now()*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 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).
 
@@ -5101,7 +5385,7 @@ ngx.update_time
 ---------------
 **syntax:** *ngx.update_time()*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Forcibly updates the Nginx current time cache. This call involves a syscall and thus has some overhead, so do not abuse it.
 
@@ -5113,7 +5397,7 @@ ngx.localtime
 -------------
 **syntax:** *str = ngx.localtime()*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 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).
 
@@ -5125,7 +5409,7 @@ ngx.utctime
 -----------
 **syntax:** *str = ngx.utctime()*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 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).
 
@@ -5137,7 +5421,7 @@ ngx.cookie_time
 ---------------
 **syntax:** *str = ngx.cookie_time(sec)*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Returns a formatted string can be used as the cookie expiration time. The parameter `sec` is the time stamp in seconds (like those returned from [ngx.time](#ngxtime)).
 
@@ -5153,7 +5437,7 @@ ngx.http_time
 -------------
 **syntax:** *str = ngx.http_time(sec)*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 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](#ngxtime)).
 
@@ -5169,7 +5453,7 @@ ngx.parse_http_time
 -------------------
 **syntax:** *sec = ngx.parse_http_time(str)*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Parse the http time string (as returned by [ngx.http_time](#ngxhttp_time)) into seconds. Returns the seconds or `nil` if the input string is in bad forms.
 
@@ -5187,7 +5471,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*, body_filter_by_lua*, log_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
 
 Returns `true` if the current request is an nginx subrequest, or `false` otherwise.
 
@@ -5197,7 +5481,7 @@ ngx.re.match
 ------------
 **syntax:** *captures, err = ngx.re.match(subject, regex, options?, ctx?, res_table?)*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Matches the `subject` string using the Perl compatible regular expression `regex` with the optional `options`.
 
@@ -5355,7 +5639,7 @@ ngx.re.find
 -----------
 **syntax:** *from, to, err = ngx.re.find(subject, regex, options?, ctx?, nth?)*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Similar to [ngx.re.match](#ngxrematch) but only returns the begining index (`from`) and end index (`to`) of the matched substring. The returned indexes are 1-based and can be fed directly into the [string.sub](http://www.lua.org/manual/5.1/manual.html#pdf-string.sub) API function to obtain the matched substring.
 
@@ -5409,7 +5693,7 @@ ngx.re.gmatch
 -------------
 **syntax:** *iterator, err = ngx.re.gmatch(subject, regex, options?)*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Similar to [ngx.re.match](#ngxrematch), 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`.
 
@@ -5487,7 +5771,7 @@ ngx.re.sub
 ----------
 **syntax:** *newstr, n, err = ngx.re.sub(subject, regex, replace, options?)*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 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](#ngxrematch).
 
@@ -5553,7 +5837,7 @@ ngx.re.gsub
 -----------
 **syntax:** *newstr, n, err = ngx.re.gsub(subject, regex, replace, options?)*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Just like [ngx.re.sub](#ngxresub), but does global substitution.
 
@@ -5593,7 +5877,7 @@ ngx.shared.DICT
 
 **syntax:** *dict = ngx.shared\[name_var\]*
 
-**context:** *init_by_lua*, init_worker_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.timer.**
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Fetching the shm-based Lua dictionary object for the shared memory zone named `DICT` defined by the [lua_shared_dict](#lua_shared_dict) directive.
 
@@ -5666,7 +5950,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Retrieving the value in the dictionary [ngx.shared.DICT](#ngxshareddict) for the key `key`. If the key does not exist or has been expired, then `nil` will be returned.
 
@@ -5704,7 +5988,7 @@ ngx.shared.DICT.get_stale
 -------------------------
 **syntax:** *value, flags, stale = ngx.shared.DICT:get_stale(key)*
 
-**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.timer.**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Similar to the [get](#ngxshareddictget) method but returns the value even if the key has already expired.
 
@@ -5722,7 +6006,7 @@ ngx.shared.DICT.set
 -------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:set(key, value, exptime?, flags?)*
 
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Unconditionally sets a key-value pair into the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns three values:
 
@@ -5732,7 +6016,7 @@ Unconditionally sets a key-value pair into the shm-based dictionary [ngx.shared.
 
 The `value` argument inserted can be Lua booleans, numbers, strings, or `nil`. Their value type will also be stored into the dictionary and the same data type can be retrieved later via the [get](#ngxshareddictget) method.
 
-The optional `exptime` argument specifies expiration time (in seconds) for the inserted key-value pair. The time resolution is `0.001` seconds. If the `exptime` takes the value `0` (which is the default), then the item will never be expired.
+The optional `exptime` argument specifies expiration time (in seconds) for the inserted key-value pair. The time resolution is `0.001` seconds. If the `exptime` takes the value `0` (which is the default), then the item will never expire.
 
 The optional `flags` argument specifies a user flags value associated with the entry to be stored. It can also be retrieved later with the value. The user flags is stored as an unsigned 32-bit integer internally. Defaults to `0`. The user flags argument was first introduced in the `v0.5.0rc2` release.
 
@@ -5770,7 +6054,7 @@ ngx.shared.DICT.safe_set
 ------------------------
 **syntax:** *ok, err = ngx.shared.DICT:safe_set(key, value, exptime?, flags?)*
 
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Similar to the [set](#ngxshareddictset) method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
 
@@ -5784,7 +6068,7 @@ ngx.shared.DICT.add
 -------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:add(key, value, exptime?, flags?)*
 
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Just like the [set](#ngxshareddictset) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](#ngxshareddict) if the key does *not* exist.
 
@@ -5800,7 +6084,7 @@ ngx.shared.DICT.safe_add
 ------------------------
 **syntax:** *ok, err = ngx.shared.DICT:safe_add(key, value, exptime?, flags?)*
 
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Similar to the [add](#ngxshareddictadd) method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
 
@@ -5814,7 +6098,7 @@ ngx.shared.DICT.replace
 -----------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:replace(key, value, exptime?, flags?)*
 
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Just like the [set](#ngxshareddictset) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](#ngxshareddict) if the key *does* exist.
 
@@ -5830,7 +6114,7 @@ ngx.shared.DICT.delete
 ----------------------
 **syntax:** *ngx.shared.DICT:delete(key)*
 
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Unconditionally removes the key-value pair from the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
 
@@ -5846,7 +6130,7 @@ ngx.shared.DICT.incr
 --------------------
 **syntax:** *newval, err = ngx.shared.DICT:incr(key, value)*
 
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Increments the (numerical) value for `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict) by the step value `value`. Returns the new resulting number if the operation is successfully completed or `nil` and an error message otherwise.
 
@@ -5866,7 +6150,7 @@ ngx.shared.DICT.flush_all
 -------------------------
 **syntax:** *ngx.shared.DICT:flush_all()*
 
-**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.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Flushes out all the items in the dictionary. This method does not actuall free up all the memory blocks in the dictionary but just marks all the existing items as expired.
 
@@ -5880,7 +6164,7 @@ 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*, ngx.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 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.
 
@@ -5896,7 +6180,7 @@ 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*, ngx.timer.**
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Fetch a list of the keys from the dictionary, up to `<max_count>`.
 
@@ -5912,7 +6196,7 @@ ngx.socket.udp
 --------------
 **syntax:** *udpsock = ngx.socket.udp()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 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:
 
@@ -5936,7 +6220,7 @@ udpsock:setpeername
 
 **syntax:** *ok, err = udpsock:setpeername("unix:/path/to/unix-domain.socket")*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 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.
 
@@ -5995,7 +6279,7 @@ udpsock:send
 ------------
 **syntax:** *ok, err = udpsock:send(data)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Sends data on the current UDP or datagram unix domain socket object.
 
@@ -6011,7 +6295,7 @@ udpsock:receive
 ---------------
 **syntax:** *data, err = udpsock:receive(size?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Receives data from the UDP or datagram unix domain socket object with an optional receive buffer size argument, `size`.
 
@@ -6046,7 +6330,7 @@ udpsock:close
 -------------
 **syntax:** *ok, err = udpsock:close()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 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.
 
@@ -6060,7 +6344,7 @@ udpsock:settimeout
 ------------------
 **syntax:** *udpsock:settimeout(time)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Set the timeout value in milliseconds for subsequent socket operations (like [receive](#udpsockreceive)).
 
@@ -6074,7 +6358,7 @@ ngx.socket.tcp
 --------------
 **syntax:** *tcpsock = ngx.socket.tcp()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 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:
 
@@ -6120,7 +6404,7 @@ tcpsock:connect
 
 **syntax:** *ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket", options_table?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Attempts to connect a TCP socket object to a remote server or to a stream unix domain socket file without blocking.
 
@@ -6197,9 +6481,9 @@ This method was first introduced in the `v0.5.0rc1` release.
 
 tcpsock:sslhandshake
 --------------------
-**syntax:** *session, err = tcpsock:sslhandshake(reused_session?, server_name?, ssl_verify?)*
+**syntax:** *session, err = tcpsock:sslhandshake(reused_session?, server_name?, ssl_verify?, send_status_req?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Does SSL/TLS handshake on the currently established connection.
 
@@ -6230,6 +6514,9 @@ Also, when the `ssl_verify` argument is true and the
 `server_name` argument is also specified, the latter will be used
 to validate the server name in the server certificate.
 
+The optional `send_status_req` argument takes a boolean that controls whether to send
+the OCSP status request in the SSL handshake request (which is for requesting OCSP stapling).
+
 For connections that have already done SSL/TLS handshake, this method returns
 immediately.
 
@@ -6241,7 +6528,7 @@ tcpsock:send
 ------------
 **syntax:** *bytes, err = tcpsock:send(data)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Sends data without blocking on the current TCP or Unix Domain Socket connection.
 
@@ -6273,7 +6560,7 @@ tcpsock:receive
 
 **syntax:** *data, err, partial = tcpsock:receive(pattern?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Receives data from the connected socket according to the reading pattern or size.
 
@@ -6315,7 +6602,7 @@ tcpsock:receiveuntil
 --------------------
 **syntax:** *iterator = tcpsock:receiveuntil(pattern, options?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 This method returns an iterator Lua function that can be called to read the data stream until it sees the specified pattern or an error occurs.
 
@@ -6414,7 +6701,7 @@ tcpsock:close
 -------------
 **syntax:** *ok, err = tcpsock:close()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 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.
 
@@ -6430,7 +6717,7 @@ tcpsock:settimeout
 ------------------
 **syntax:** *tcpsock:settimeout(time)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Set the timeout value in milliseconds for subsequent socket operations ([connect](#tcpsockconnect), [receive](#tcpsockreceive), and iterators returned from [receiveuntil](#tcpsockreceiveuntil)).
 
@@ -6446,7 +6733,7 @@ tcpsock:setoption
 -----------------
 **syntax:** *tcpsock:setoption(option, value?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 This function is added for [LuaSocket](http://w3.impa.br/~diego/software/luasocket/tcp.html) API compatibility and does nothing for now. Its functionality will be implemented in future.
 
@@ -6458,7 +6745,7 @@ tcpsock:setkeepalive
 --------------------
 **syntax:** *ok, err = tcpsock:setkeepalive(timeout?, size?)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 Puts the current socket's connection immediately into the cosocket built-in connection pool and keep it alive until other [connect](#tcpsockconnect) method calls request it or the associated maximal idle timeout is expired.
 
@@ -6486,7 +6773,7 @@ tcpsock:getreusedtimes
 ----------------------
 **syntax:** *count, err = tcpsock:getreusedtimes()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 This method returns the (successfully) reused times for the current connection. In case of error, it returns `nil` and a string describing the error.
 
@@ -6502,7 +6789,7 @@ ngx.socket.connect
 
 **syntax:** *tcpsock, err = ngx.socket.connect("unix:/path/to/unix-domain.socket")*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;*
 
 This function is a shortcut for combining [ngx.socket.tcp()](#ngxsockettcp) and the [connect()](#tcpsockconnect) method call in a single operation. It is actually implemented like this:
 
@@ -6526,7 +6813,7 @@ ngx.get_phase
 -------------
 **syntax:** *str = ngx.get_phase()*
 
-**context:** *init_by_lua*, init_worker_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.timer.**
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Retrieves the current running phase name. Possible return values are
 
@@ -6559,7 +6846,7 @@ ngx.thread.spawn
 ----------------
 **syntax:** *co = ngx.thread.spawn(func, arg1, arg2, ...)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 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".
 
@@ -6697,7 +6984,7 @@ ngx.thread.wait
 ---------------
 **syntax:** *ok, res1, res2, ... = ngx.thread.wait(thread1, thread2, ...)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
 
 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).
 
@@ -6800,7 +7087,7 @@ ngx.thread.kill
 ---------------
 **syntax:** *ok, err = ngx.thread.kill(thread)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;*
 
 Kills a running "light thread" created by [ngx.thread.spawn](#ngxthreadspawn). Returns a true value when successful or `nil` and a string describing the error otherwise.
 
@@ -6814,7 +7101,7 @@ ngx.on_abort
 ------------
 **syntax:** *ok, err = ngx.on_abort(callback)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
 Registers a user Lua function as the callback which gets called automatically when the client closes the (downstream) connection prematurely.
 
@@ -6854,7 +7141,7 @@ ngx.timer.at
 ------------
 **syntax:** *ok, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 Creates an Nginx timer with a user callback function as well as optional user arguments.
 
@@ -6976,11 +7263,35 @@ This API was first introduced in the `v0.8.0` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+ngx.timer.running_count
+-----------------------
+**syntax:** *count = ngx.timer.running_count()*
+
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+
+Returns the number of timers currently running.
+
+This directive was first introduced in the `v0.9.20` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.timer.pending_count
+-----------------------
+**syntax:** *count = ngx.timer.pending_count()*
+
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+
+Returns the number of pending timers.
+
+This directive was first introduced in the `v0.9.20` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
 ngx.config.debug
 ----------------
 **syntax:** *debug = ngx.config.debug*
 
-**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.timer.*, init_by_lua*, init_worker_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
 
 This boolean field indicates whether the current Nginx is a debug build, i.e., being built by the `./configure` option `--with-debug`.
 
@@ -6993,7 +7304,7 @@ ngx.config.prefix
 
 **syntax:** *prefix = ngx.config.prefix()*
 
-**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.timer.*, init_by_lua*, init_worker_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
 
 Returns the Nginx server "prefix" path, as determined by the `-p` command-line option when running the nginx executable, or the path specified by the `--prefix` command-line option when building Nginx with the `./configure` script.
 
@@ -7006,7 +7317,7 @@ ngx.config.nginx_version
 
 **syntax:** *ver = ngx.config.nginx_version*
 
-**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.timer.*, init_by_lua*, init_worker_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
 
 This field take an integral value indicating the version number of the current Nginx core being used. For example, the version number `1.4.3` results in the Lua number 1004003.
 
@@ -7019,7 +7330,7 @@ ngx.config.nginx_configure
 
 **syntax:** *str = ngx.config.nginx_configure()*
 
-**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.timer.*, init_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;*
 
 This function returns a string for the NGINX `./configure` command's arguments string.
 
@@ -7032,7 +7343,7 @@ ngx.config.ngx_lua_version
 
 **syntax:** *ver = ngx.config.ngx_lua_version*
 
-**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.timer.*, init_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;*
 
 This field take an integral value indicating the version number of the current `ngx_lua` module being used. For example, the version number `0.9.3` results in the Lua number 9003.
 
@@ -7045,7 +7356,7 @@ ngx.worker.exiting
 
 **syntax:** *exiting = ngx.worker.exiting()*
 
-**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.timer.*, init_by_lua*, init_worker_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
 
 This function returns a boolean value indicating whether the current Nginx worker process already starts exiting. Nginx worker process exiting happens on Nginx server quit or configuration reload (aka HUP reload).
 
@@ -7058,7 +7369,7 @@ ngx.worker.pid
 
 **syntax:** *pid = ngx.worker.pid()*
 
-**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.timer.*, init_by_lua*, init_worker_by_lua**
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
 
 This function returns a Lua number for the process ID (PID) of the current Nginx worker process. This API is more efficient than `ngx.var.pid` and can be used in contexts where the [ngx.var.VARIABLE](#ngxvarvariable) API cannot be used (like [init_worker_by_lua](#init_worker_by_lua)).
 
@@ -7066,11 +7377,127 @@ This API was first introduced in the `0.9.5` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+ngx.worker.count
+----------------
+
+**syntax:** *count = ngx.worker.count()*
+
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;*
+
+Returns the total number of the Nginx worker processes (i.e., the value configured
+by the [worker_processes](http://nginx.org/en/docs/ngx_core_module.html#worker_processes)
+directive in `nginx.conf`).
+
+This API was first introduced in the `0.9.20` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.worker.id
+-------------
+
+**syntax:** *count = ngx.worker.id()*
+
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_worker_by_lua&#42;*
+
+Returns the ordinal number of the current Nginx worker processes (starting from number 0).
+
+So if the total number of workers is `N`, then this method may return a number between 0
+and `N - 1` (inclusive).
+
+This function returns meaningful values only for NGINX 1.9.1+. With earlier versions of NGINX, it
+always returns `nil`.
+
+See also [ngx.worker.count](#ngxworkercount).
+
+This API was first introduced in the `0.9.20` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.semaphore
+-------------
+**syntax:** *local semaphore = require "ngx.semaphore"*
+
+This is a Lua module that implements a classic-style semaphore API for efficient synchronizations among
+different "light threads". Sharing the same semaphore among different "light threads" created in different (request)
+contexts are also supported as long as the "light threads" reside in the same NGINX worker process
+and the [lua_code_cache](#lua_code_cache) directive is turned on (which is the default).
+
+This Lua module does not ship with this ngx_lua module itself rather it is shipped with
+the
+[lua-resty-core](https://github.com/openresty/lua-resty-core) library.
+
+Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/semaphore.md)
+for this `ngx.semaphore` Lua module in [lua-resty-core](https://github.com/openresty/lua-resty-core)
+for more details.
+
+This feature requires at least ngx_lua `v0.10.0`.
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.balancer
+------------
+**syntax:** *local balancer = require "ngx.balancer"*
+
+This is a Lua module that provides a Lua API to allow defining completely dynamic load balancers
+in pure Lua.
+
+This Lua module does not ship with this ngx_lua module itself rather it is shipped with
+the
+[lua-resty-core](https://github.com/openresty/lua-resty-core) library.
+
+Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/balancer.md)
+for this `ngx.balancer` Lua module in [lua-resty-core](https://github.com/openresty/lua-resty-core)
+for more details.
+
+This feature requires at least ngx_lua `v0.10.0`.
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.ssl
+-------
+**syntax:** *local ssl = require "ngx.ssl"*
+
+This Lua module provides API functions to control the SSL handshake process in contexts like
+[ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
+
+This Lua module does not ship with this ngx_lua module itself rather it is shipped with
+the
+[lua-resty-core](https://github.com/openresty/lua-resty-core) library.
+
+Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
+for this `ngx.ssl` Lua module for more details.
+
+This feature requires at least ngx_lua `v0.10.0`.
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.ocsp
+--------
+**syntax:** *local ocsp = require "ngx.ocsp"*
+
+This Lua module provides API to perform OCSP queries, OCSP response validations, and
+OCSP stapling planting.
+
+Usually, this module is used together with the [ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
+module in the
+context of [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
+
+This Lua module does not ship with this ngx_lua module itself rather it is shipped with
+the
+[lua-resty-core](https://github.com/openresty/lua-resty-core) library.
+
+Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md)
+for this `ngx.ocsp` Lua module for more details.
+
+This feature requires at least ngx_lua `v0.10.0`.
+
+[Back to TOC](#nginx-api-for-lua)
+
 ndk.set_var.DIRECTIVE
 ---------------------
 **syntax:** *res = ndk.set_var.DIRECTIVE_NAME*
 
-**context:** *init_worker_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.timer.**
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
 
 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`.
 
@@ -7111,7 +7538,7 @@ coroutine.create
 ----------------
 **syntax:** *co = coroutine.create(f)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Creates a user Lua coroutines with a Lua function, and returns a coroutine object.
 
@@ -7127,7 +7554,7 @@ coroutine.resume
 ----------------
 **syntax:** *ok, ... = coroutine.resume(co, ...)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Resumes the executation of a user Lua coroutine object previously yielded or just created.
 
@@ -7143,9 +7570,9 @@ coroutine.yield
 ---------------
 **syntax:** *... = coroutine.yield(...)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
-Yields the executation of the current user Lua coroutine.
+Yields the execution 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.
 
@@ -7159,7 +7586,7 @@ coroutine.wrap
 --------------
 **syntax:** *co = coroutine.wrap(f)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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.
 
@@ -7173,7 +7600,7 @@ coroutine.running
 -----------------
 **syntax:** *co = coroutine.running()*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Identical to the standard Lua [coroutine.running](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.running) API.
 
@@ -7187,7 +7614,7 @@ coroutine.status
 ----------------
 **syntax:** *status = coroutine.status(co)*
 
-**context:** *rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua**
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Identical to the standard Lua [coroutine.status](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.status) API.
 
diff --git a/debian/modules/nginx-lua/config b/debian/modules/nginx-lua/config
index 4b770d7..030788c 100644
--- a/debian/modules/nginx-lua/config
+++ b/debian/modules/nginx-lua/config
@@ -339,6 +339,7 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
                 $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_semaphore.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 \
@@ -350,7 +351,10 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
                 $ngx_addon_dir/src/ngx_http_lua_timer.c \
                 $ngx_addon_dir/src/ngx_http_lua_config.c \
                 $ngx_addon_dir/src/ngx_http_lua_worker.c \
+                $ngx_addon_dir/src/ngx_http_lua_ssl_certby.c \
+                $ngx_addon_dir/src/ngx_http_lua_ssl_ocsp.c \
                 $ngx_addon_dir/src/ngx_http_lua_lex.c \
+                $ngx_addon_dir/src/ngx_http_lua_balancer.c \
                 "
 
 NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
@@ -392,6 +396,7 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
                 $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_semaphore.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 \
@@ -404,7 +409,9 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
                 $ngx_addon_dir/src/ngx_http_lua_timer.h \
                 $ngx_addon_dir/src/ngx_http_lua_config.h \
                 $ngx_addon_dir/src/ngx_http_lua_worker.h \
+                $ngx_addon_dir/src/ngx_http_lua_ssl_certby.h \
                 $ngx_addon_dir/src/ngx_http_lua_lex.h \
+                $ngx_addon_dir/src/ngx_http_lua_balancer.h \
                 "
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
index 3726509..f3bf06e 100644
--- a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.9.19] released on 11 November 2015.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.0] released on 11 January 2015.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -179,19 +179,15 @@ Other scripting language implementations typically struggle to match this perfor
 The Lua state (Lua VM instance) is shared across all the requests handled by a single nginx worker process to minimize memory use.
 
 = Nginx Compatibility =
-The latest module is compatible with the following versions of Nginx:
 
-* 1.9.x (last tested: 1.9.3)
+The latest version of this module is compatible with the following versions of Nginx:
+
+* 1.9.x (last tested: 1.9.7)
+* 1.8.x
 * 1.7.x (last tested: 1.7.10)
 * 1.6.x
-* 1.5.x (last tested: 1.5.12)
-* 1.4.x (last tested: 1.4.4)
-* 1.3.x (last tested: 1.3.11)
-* 1.2.x (last tested: 1.2.9)
-* 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)
+
+Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 
 = Installation =
 
@@ -207,9 +203,9 @@ Alternatively, ngx_lua can be manually compiled into Nginx:
 Build the source with this module:
 
 <geshi lang="bash">
-    wget 'http://nginx.org/download/nginx-1.9.3.tar.gz'
-    tar -xzvf nginx-1.9.3.tar.gz
-    cd nginx-1.9.3/
+    wget 'http://nginx.org/download/nginx-1.9.7.tar.gz'
+    tar -xzvf nginx-1.9.7.tar.gz
+    cd nginx-1.9.7/
 
     # tell nginx's build system where to find LuaJIT 2.0:
     export LUAJIT_LIB=/path/to/luajit/lib
@@ -696,7 +692,6 @@ phases.
         }
     }
 </geshi>
-* ssl: implement directives <code>ssl_certificate_by_lua</code> and <code>ssl_certificate_by_lua_file</code> to allow using Lua to dynamically serve SSL certificates and keys for downstream SSL handshake. (already done in CloudFlare's private branch and powering CloudFlare's SSL gateway of its global network. expected to be opensourced in March 2015.)
 * shm: implement a "shared queue API" to complement the existing [[#lua_shared_dict|shared dict]] API.
 * cosocket: add support in the context of [[#init_by_lua|init_by_lua*]].
 * cosocket: implement the <code>bind()</code> method for stream-typed cosockets.
@@ -1514,6 +1509,10 @@ As with other access phase handlers, [[#access_by_lua|access_by_lua]] will ''not
 
 Note that when calling <code>ngx.exit(ngx.OK)</code> within a [[#access_by_lua|access_by_lua]] handler, the nginx request processing control flow will still continue to the content handler. To terminate the current request from within a [[#access_by_lua|access_by_lua]] handler, calling [[#ngx.exit|ngx.exit]] with status >= 200 (<code>ngx.HTTP_OK</code>) and status < 300 (<code>ngx.HTTP_SPECIAL_RESPONSE</code>) for successful quits and <code>ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)</code> (or its friends) for failures.
 
+Starting from the <code>v0.9.20</code> release, you can use the [[#access_by_lua_no_postpone|access_by_lua_no_postpone]]
+directive to control when to run this handler inside the "access" request-processing phase
+of NGINX.
+
 == access_by_lua_block ==
 
 '''syntax:''' ''access_by_lua_block { lua-script }''
@@ -1849,6 +1848,76 @@ When a relative path like <code>foo/bar.lua</code> is given, they will be turned
 
 This directive was first introduced in the <code>v0.5.0rc31</code> release.
 
+== balancer_by_lua_block ==
+
+'''syntax:''' ''balancer_by_lua_block { lua-script }''
+
+'''context:''' ''upstream''
+
+'''phase:''' ''content''
+
+This directive runs Lua code as an upstream balancer for any upstream entities defined
+by the <code>upstream {}</code> configuration block.
+
+For instance,
+
+<geshi lang="nginx">
+    upstream foo {
+        server 127.0.0.1;
+        balancer_by_lua_block {
+            -- use Lua to do something interesting here
+            -- as a dynamic balancer
+        }
+    }
+
+    server {
+        location / {
+            proxy_pass http://foo;
+        }
+    }
+</geshi>
+
+The resulting Lua load balancer can work with any existing nginx upstream modules
+like [http://nginx.org/en/docs/http/ngx_http_proxy_module.html ngx_proxy] and
+[http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html ngx_fastcgi].
+
+Also, the Lua load balancer can work with the standard upstream connection pool mechanism,
+i.e., the standard [http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive keepalive] directive.
+Just ensure that the [http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive keepalive] directive
+is used *after* this <code>balancer_by_lua_block</code> directive in a single <code>upstream {}</code> configuration block.
+
+The Lua load balancer can totally ignore the list of servers defined in the <code>upstream {}</code> block
+and select peer from a completely dynamic server list (even changing per request) via the
+[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/balancer.md ngx.balancer] module
+from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
+
+The Lua code handler registered by this directive might get called more than once in a single
+downstream request when the nginx upstream mechanism retries the request on conditions
+specified by directives like the [http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_next_upstream proxy_next_upstream]
+directive.
+
+This Lua code execution context does not support yielding, so Lua APIs that may yield
+(like cosockets and "light threads") are disabled in this context. One can usually work
+around this limitation by doing such operations in an earlier phase handler (like
+[[#access_by_lua|access_by_lua*]]) and passing along the result into this context
+via the [[#ngx.ctx|ngx.ctx]] table.
+
+This directive was first introduced in the <code>v0.10.0</code> release.
+
+== balancer_by_lua_file ==
+
+'''syntax:''' ''balancer_by_lua_file <path-to-lua-script-file>''
+
+'''context:''' ''upstream''
+
+'''phase:''' ''content''
+
+Equivalent to [[#balancer_by_lua_block|balancer_by_lua_block]], 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.10.0</code> release.
+
 == lua_need_request_body ==
 
 '''syntax:''' ''lua_need_request_body <on|off>''
@@ -1874,6 +1943,105 @@ It is recommended however, to use the [[#ngx.req.read_body|ngx.req.read_body]] a
 
 This also applies to [[#access_by_lua|access_by_lua]] and [[#access_by_lua_file|access_by_lua_file]].
 
+== ssl_certificate_by_lua_block ==
+
+'''syntax:''' ''ssl_certificate_by_lua_block { lua-script }''
+
+'''context:''' ''server''
+
+'''phase:''' ''right-before-SSL-handshake''
+
+This directive runs user Lua code when NGINX is about to start the SSL handshake for the downstream
+SSL (https) connections.
+
+It is particularly useful for setting the SSL certificate chain and the corresponding private key on a per-request
+basis. It is also useful to load such handshake configurations nonblockingly from the remote (for example,
+with the [[#ngx.socket.tcp|cosocket]] API). And one can also do per-request OCSP stapling handling in pure
+Lua here as well.
+
+Another typical use case is to do SSL handshake traffic control nonblockingly in this context,
+with the help of the [https://github.com/openresty/lua-resty-limit-traffic lua-resty-limit-traffic#readme]
+library, for example.
+
+One can also do interesting things with the SSL handshake requests from the client side, like
+rejecting old SSL clients using the SSLv3 protocol or even below selectively.
+
+The [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md ngx.ssl]
+and [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md ngx.ocsp] Lua modules
+provided by the [https://github.com/openresty/lua-resty-core/#readme lua-resty-core]
+library are particularly useful in this context. You can use the Lua API offered by these two Lua modules
+to manipulate the SSL certificate chain and private key for the current SSL connection
+being initiated.
+
+This Lua handler does not run at all, however, when NGINX/OpenSSL successfully resumes
+the SSL session via SSL session IDs or TLS session tickets for the current SSL connection. In
+other words, this Lua handler only runs when NGINX has to initiate a full SSL handshake.
+
+Below is a trivial example using the
+[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md ngx.ssl] module
+at the same time:
+
+<geshi lang="nginx">
+    server {
+        listen 443 ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block {
+            print("About to initiate a new SSL handshake!")
+        }
+
+        location / {
+            root html;
+        }
+    }
+</geshi>
+
+See more complicated examples in the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md ngx.ssl]
+and [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md ngx.ocsp]
+Lua modules' official documentation.
+
+Uncaught Lua exceptions in the user Lua code immediately abort the current SSL session, so does the
+[[#ngx.exit|ngx.exit]] call with an error code like <code>ngx.ERROR</code>.
+
+This Lua code execution context *does* support yielding, so Lua APIs that may yield
+(like cosockets, sleeping, and "light threads")
+are enabled in this context.
+
+Note, however, you still need to configure the [http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_certificate ssl_certificate] and
+[http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_certificate_key ssl_certificate_key]
+directives even though you will not use this static certificate and private key at all. This is
+because the NGINX core requires their appearance otherwise you are seeing the following error
+while starting NGINX:
+
+<geshi>
+    nginx: [emerg] no ssl configured for the server
+</geshi>
+
+This directive currently requires the following NGINX core patch to work correctly:
+
+http://mailman.nginx.org/pipermail/nginx-devel/2016-January/007748.html
+
+The bundled version of the NGINX core in OpenResty 1.9.7.2 (or above) already has this
+patch applied.
+
+Furthermore, one needs at least OpenSSL 1.0.2e for this directive to work.
+
+This directive was first introduced in the <code>v0.10.0</code> release.
+
+== ssl_certificate_by_lua_file ==
+
+'''syntax:''' ''ssl_certificate_by_lua_file <path-to-lua-script-file>''
+
+'''context:''' ''server''
+
+'''phase:''' ''right-before-SSL-handshake''
+
+Equivalent to [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua_block]], 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.10.0</code> release.
+
 == lua_shared_dict ==
 
 '''syntax:''' ''lua_shared_dict <name> <size>''
@@ -1897,6 +2065,9 @@ The <code><size></code> argument accepts size units such as <code>k</code> and <
     }
 </geshi>
 
+The hard-coded minimum size is 8KB while the practical minimum size depends
+on actual user data set (some people start with 12KB).
+
 See [[#ngx.shared.DICT|ngx.shared.DICT]] for details.
 
 This directive was first introduced in the <code>v0.3.1rc22</code> release.
@@ -2105,10 +2276,22 @@ This directive was first introduced in the <code>v0.5.0rc19</code> release.
 
 '''context:''' ''http''
 
-Controls whether or not to disable postponing [[#rewrite_by_lua|rewrite_by_lua]] and [[#rewrite_by_lua_file|rewrite_by_lua_file]] directives to run at the end of the <code>rewrite</code> request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the <code>rewrite</code> phase.
+Controls whether or not to disable postponing [[#rewrite_by_lua|rewrite_by_lua]]* directives to run at the end of the <code>rewrite</code> request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the <code>rewrite</code> phase.
 
 This directive was first introduced in the <code>v0.5.0rc29</code> release.
 
+== access_by_lua_no_postpone ==
+
+'''syntax:''' ''access_by_lua_no_postpone on|off''
+
+'''default:''' ''access_by_lua_no_postpone off''
+
+'''context:''' ''http''
+
+Controls whether or not to disable postponing [[#access_by_lua|access_by_lua]]* directives to run at the end of the <code>access</code> request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the <code>access</code> phase.
+
+This directive was first introduced in the <code>v0.9.20</code> release.
+
 == lua_transform_underscores_in_response_headers ==
 
 '''syntax:''' ''lua_transform_underscores_in_response_headers on|off''
@@ -2352,23 +2535,40 @@ These constants are usually used in [[#ngx.location.capture|ngx.location.capture
 '''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.timer.*''
 
 <geshi lang="nginx">
+  value = ngx.HTTP_CONTINUE (100) (first added in the v0.9.20 release)
+  value = ngx.HTTP_SWITCHING_PROTOCOLS (101) (first added in the v0.9.20 release)
   value = ngx.HTTP_OK (200)
   value = ngx.HTTP_CREATED (201)
+  value = ngx.HTTP_ACCEPTED (202) (first added in the v0.9.20 release)
+  value = ngx.HTTP_NO_CONTENT (204) (first added in the v0.9.20 release)
+  value = ngx.HTTP_PARTIAL_CONTENT (206) (first added in the v0.9.20 release)
   value = ngx.HTTP_SPECIAL_RESPONSE (300)
   value = ngx.HTTP_MOVED_PERMANENTLY (301)
   value = ngx.HTTP_MOVED_TEMPORARILY (302)
   value = ngx.HTTP_SEE_OTHER (303)
   value = ngx.HTTP_NOT_MODIFIED (304)
+  value = ngx.HTTP_TEMPORARY_REDIRECT (307) (first added in the v0.9.20 release)
   value = ngx.HTTP_BAD_REQUEST (400)
   value = ngx.HTTP_UNAUTHORIZED (401)
+  value = ngx.HTTP_PAYMENT_REQUIRED (402) (first added in the v0.9.20 release)
   value = ngx.HTTP_FORBIDDEN (403)
   value = ngx.HTTP_NOT_FOUND (404)
   value = ngx.HTTP_NOT_ALLOWED (405)
+  value = ngx.HTTP_NOT_ACCEPTABLE (406) (first added in the v0.9.20 release)
+  value = ngx.HTTP_REQUEST_TIMEOUT (408) (first added in the v0.9.20 release)
+  value = ngx.HTTP_CONFLICT (409) (first added in the v0.9.20 release)
   value = ngx.HTTP_GONE (410)
+  value = ngx.HTTP_UPGRADE_REQUIRED (426) (first added in the v0.9.20 release)
+  value = ngx.HTTP_TOO_MANY_REQUESTS (429) (first added in the v0.9.20 release)
+  value = ngx.HTTP_CLOSE (444) (first added in the v0.9.20 release)
+  value = ngx.HTTP_ILLEGAL (451) (first added in the v0.9.20 release)
   value = ngx.HTTP_INTERNAL_SERVER_ERROR (500)
   value = ngx.HTTP_METHOD_NOT_IMPLEMENTED (501)
+  value = ngx.HTTP_BAD_GATEWAY (502) (first added in the v0.9.20 release)
   value = ngx.HTTP_SERVICE_UNAVAILABLE (503)
   value = ngx.HTTP_GATEWAY_TIMEOUT (504) (first added in the v0.3.1rc38 release)
+  value = ngx.HTTP_VERSION_NOT_SUPPORTED (505) (first added in the v0.9.20 release)
+  value = ngx.HTTP_INSUFFICIENT_STORAGE (507) (first added in the v0.9.20 release)
 </geshi>
 
 == Nginx log level constants ==
@@ -2391,7 +2591,7 @@ These constants are usually used by the [[#ngx.log|ngx.log]] method.
 == print ==
 '''syntax:''' ''print(...)''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, certificate_by_lua*''
 
 Writes argument values into the nginx <code>error.log</code> file with the <code>ngx.NOTICE</code> log level.
 
@@ -2406,7 +2606,7 @@ Lua <code>nil</code> arguments are accepted and result in literal <code>"nil"</c
 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:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_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). 
 
@@ -2502,14 +2702,47 @@ Overriding <code>ngx.ctx</code> with a new Lua table is also supported, for exam
 
 When being used in the context of [[#init_worker_by_lua|init_worker_by_lua*]], this table just has the same lifetime of the current Lua handler.
 
-The <code>ngx.ctx</code> lookup requires relatively expensive metamethod calls and it is much slower than explicitly passing per-request data along by your own function arguments. So do not abuse this API for saving your own function arguments because it usually has quite some performance impact. And because of the metamethod magic, never "local" the <code>ngx.ctx</code> table outside your function scope.
+The <code>ngx.ctx</code> lookup requires relatively expensive metamethod calls and it is much slower than explicitly passing per-request data along by your own function arguments. So do not abuse this API for saving your own function arguments because it usually has quite some performance impact.
+
+Because of the metamethod magic, never "local" the <code>ngx.ctx</code> table outside your Lua function scope on the Lua module level level due to [[#Data_Sharing_within_an_Nginx_Worker|worker-level data sharing]]. For example, the following is bad:
+
+<geshi lang="lua">
+-- mymodule.lua
+local _M = {}
+
+-- the following line is bad since ngx.ctx is a per-request
+-- data while this `ctx` variable is on the Lua module level
+-- and thus is per-nginx-worker.
+local ctx = ngx.ctx
+
+function _M.main()
+    ctx.foo = "bar"
+end
+
+return _M
+</geshi>
+
+Use the following instead:
+
+<geshi lang="lua">
+-- mymodule.lua
+local _M = {}
+
+function _M.main(ctx)
+    ctx.foo = "bar"
+end
+
+return _M
+</geshi>
+
+That is, let the caller pass the `ctx` table explicitly via a function argument.
 
 == ngx.location.capture ==
 '''syntax:''' ''res = ngx.location.capture(uri, options?)''
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
-Issue a synchronous but still non-blocking ''Nginx Subrequest'' using <code>uri</code>.
+Issues 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 ngx_lua itself and etc etc etc.
@@ -2520,6 +2753,9 @@ Subrequests are completely different from HTTP 301/302 redirection (via [[#ngx.r
 
 You should always read the request body (by either calling [[#ngx.req.read_body|ngx.req.read_body]] or configuring [[#lua_need_request_body|lua_need_request_body]] on) before initiating a subrequest.
 
+This API function (as well as [[#ngx.location.capture_multi|ngx.location.capture_multi]]) always buffers the whole response body of the subrequest in memory. Thus, you should use [[#ngx.socket.tcp|cosockets]]
+and streaming processing instead if you have to handle large subrequest responses.
+
 Here is a basic example:
 
 <geshi lang="lua">
@@ -2959,7 +3195,7 @@ For reading ''request'' headers, use the [[#ngx.req.get_headers|ngx.req.get_head
 == ngx.resp.get_headers ==
 '''syntax:''' ''headers = ngx.resp.get_headers(max_headers?, raw?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_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*, balancer_by_lua*''
 
 Returns a Lua table holding all the current response headers for the current request.
 
@@ -2974,6 +3210,18 @@ This function has the same signature as [[#ngx.req.get_headers|ngx.req.get_heade
 
 This API was first introduced in the <code>v0.9.5</code> release.
 
+== ngx.req.is_internal ==
+'''syntax:''' ''is_internal = ngx.req.is_internal()''
+
+'''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 boolean indicating whether the current request is an "internal request", i.e.,
+a request initiated from inside the current nginx server instead of from the client side.
+
+Subrequests are all internal requests and so are requests after internal redirects.
+
+This API was first introduced in the <code>v0.9.20</code> release.
+
 == ngx.req.start_time ==
 '''syntax:''' ''secs = ngx.req.start_time()''
 
@@ -3046,7 +3294,7 @@ This method was first introduced in the <code>v0.7.17</code> release.
 == 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*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, balancer_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]].
 
@@ -3189,7 +3437,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*, body_filter_by_lua, log_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*, balancer_by_lua*''
 
 Returns a Lua table holding all the current request URL query arguments.
 
@@ -3868,7 +4116,7 @@ Just as [[#ngx.print|ngx.print]] but also emit a trailing newline.
 == ngx.log ==
 '''syntax:''' ''ngx.log(log_level, ...)''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Log arguments concatenated to error.log with the given logging level.
 
@@ -3898,7 +4146,7 @@ Since <code>v0.8.3</code> this function returns <code>1</code> on success, or re
 == ngx.exit ==
 '''syntax:''' ''ngx.exit(status)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 When <code>status >= 200</code> (i.e., <code>ngx.HTTP_OK</code> and above), it will interrupt the execution of the current request and return status code to nginx.
 
@@ -3975,7 +4223,7 @@ Since <code>v0.8.3</code> this function returns <code>1</code> on success, or re
 == ngx.sleep ==
 '''syntax:''' ''ngx.sleep(seconds)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 Sleeps for the specified seconds without blocking. One can specify time resolution up to 0.001 seconds (i.e., one milliseconds).
 
@@ -4794,7 +5042,7 @@ Unconditionally sets a key-value pair into the shm-based dictionary [[#ngx.share
 
 The <code>value</code> argument inserted can be Lua booleans, numbers, strings, or <code>nil</code>. Their value type will also be stored into the dictionary and the same data type can be retrieved later via the [[#ngx.shared.DICT.get|get]] method.
 
-The optional <code>exptime</code> argument specifies expiration time (in seconds) for the inserted key-value pair. The time resolution is <code>0.001</code> seconds. If the <code>exptime</code> takes the value <code>0</code> (which is the default), then the item will never be expired.
+The optional <code>exptime</code> argument specifies expiration time (in seconds) for the inserted key-value pair. The time resolution is <code>0.001</code> seconds. If the <code>exptime</code> takes the value <code>0</code> (which is the default), then the item will never expire.
 
 The optional <code>flags</code> argument specifies a user flags value associated with the entry to be stored. It can also be retrieved later with the value. The user flags is stored as an unsigned 32-bit integer internally. Defaults to <code>0</code>. The user flags argument was first introduced in the <code>v0.5.0rc2</code> release.
 
@@ -4942,7 +5190,7 @@ 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*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_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:
 
@@ -4963,7 +5211,7 @@ See also [[#ngx.socket.tcp|ngx.socket.tcp]].
 
 '''syntax:''' ''ok, err = udpsock:setpeername("unix:/path/to/unix-domain.socket")''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_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.
 
@@ -5016,7 +5264,7 @@ 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*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 Sends data on the current UDP or datagram unix domain socket object.
 
@@ -5029,7 +5277,7 @@ 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*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 Receives data from the UDP or datagram unix domain socket object with an optional receive buffer size argument, <code>size</code>.
 
@@ -5060,7 +5308,7 @@ 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*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_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.
 
@@ -5071,7 +5319,7 @@ 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*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 Set the timeout value in milliseconds for subsequent socket operations (like [[#udpsock:receive|receive]]).
 
@@ -5082,7 +5330,7 @@ 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*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 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:
 
@@ -5125,7 +5373,7 @@ See also [[#ngx.socket.udp|ngx.socket.udp]].
 
 '''syntax:''' ''ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket", options_table?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 Attempts to connect a TCP socket object to a remote server or to a stream unix domain socket file without blocking.
 
@@ -5195,9 +5443,9 @@ The support for the options table argument was first introduced in the <code>v0.
 This method was first introduced in the <code>v0.5.0rc1</code> release.
 
 == tcpsock:sslhandshake ==
-'''syntax:''' ''session, err = tcpsock:sslhandshake(reused_session?, server_name?, ssl_verify?)''
+'''syntax:''' ''session, err = tcpsock:sslhandshake(reused_session?, server_name?, ssl_verify?, send_status_req?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 Does SSL/TLS handshake on the currently established connection.
 
@@ -5228,6 +5476,9 @@ Also, when the <code>ssl_verify</code> argument is true and the
 <code>server_name</code> argument is also specified, the latter will be used
 to validate the server name in the server certificate.
 
+The optional <code>send_status_req</code> argument takes a boolean that controls whether to send
+the OCSP status request in the SSL handshake request (which is for requesting OCSP stapling).
+
 For connections that have already done SSL/TLS handshake, this method returns
 immediately.
 
@@ -5236,7 +5487,7 @@ This method was first introduced in the <code>v0.9.11</code> release.
 == tcpsock:send ==
 '''syntax:''' ''bytes, err = tcpsock:send(data)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 Sends data without blocking on the current TCP or Unix Domain Socket connection.
 
@@ -5264,7 +5515,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
 '''syntax:''' ''data, err, partial = tcpsock:receive(pattern?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 Receives data from the connected socket according to the reading pattern or size.
 
@@ -5302,7 +5553,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:receiveuntil ==
 '''syntax:''' ''iterator = tcpsock:receiveuntil(pattern, options?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 This method returns an iterator Lua function that can be called to read the data stream until it sees the specified pattern or an error occurs.
 
@@ -5394,7 +5645,7 @@ 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*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 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.
 
@@ -5407,7 +5658,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:settimeout ==
 '''syntax:''' ''tcpsock:settimeout(time)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 Set the timeout value in milliseconds for subsequent socket operations ([[#tcpsock:connect|connect]], [[#tcpsock:receive|receive]], and iterators returned from [[#tcpsock:receiveuntil|receiveuntil]]).
 
@@ -5420,7 +5671,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:setoption ==
 '''syntax:''' ''tcpsock:setoption(option, value?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 This function is added for [http://w3.impa.br/~diego/software/luasocket/tcp.html LuaSocket] API compatibility and does nothing for now. Its functionality will be implemented in future.
 
@@ -5429,7 +5680,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:setkeepalive ==
 '''syntax:''' ''ok, err = tcpsock:setkeepalive(timeout?, size?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 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.
 
@@ -5454,7 +5705,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:getreusedtimes ==
 '''syntax:''' ''count, err = tcpsock:getreusedtimes()''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
 
 This method returns the (successfully) reused times for the current connection. In case of error, it returns <code>nil</code> and a string describing the error.
 
@@ -5487,7 +5738,7 @@ 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*, init_worker_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.timer.*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Retrieves the current running phase name. Possible return values are
 
@@ -5517,7 +5768,7 @@ This API was first introduced in the <code>v0.5.10</code> release.
 == ngx.thread.spawn ==
 '''syntax:''' ''co = ngx.thread.spawn(func, arg1, arg2, ...)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_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".
 
@@ -5650,7 +5901,7 @@ 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*, ngx.timer.*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_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).
 
@@ -5913,6 +6164,24 @@ You can pass most of the standard Lua values (nils, booleans, numbers, strings,
 
 This API was first introduced in the <code>v0.8.0</code> release.
 
+== ngx.timer.running_count ==
+'''syntax:''' ''count = ngx.timer.running_count()''
+
+'''context:''' ''init_worker_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.timer.*''
+
+Returns the number of timers currently running.
+
+This directive was first introduced in the <code>v0.9.20</code> release.
+
+== ngx.timer.pending_count ==
+'''syntax:''' ''count = ngx.timer.pending_count()''
+
+'''context:''' ''init_worker_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.timer.*''
+
+Returns the number of pending timers.
+
+This directive was first introduced in the <code>v0.9.20</code> release.
+
 == ngx.config.debug ==
 '''syntax:''' ''debug = ngx.config.debug''
 
@@ -5982,6 +6251,104 @@ This function returns a Lua number for the process ID (PID) of the current Nginx
 
 This API was first introduced in the <code>0.9.5</code> release.
 
+== ngx.worker.count ==
+
+'''syntax:''' ''count = ngx.worker.count()''
+
+'''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.timer.*, init_by_lua*''
+
+Returns the total number of the Nginx worker processes (i.e., the value configured
+by the [http://nginx.org/en/docs/ngx_core_module.html#worker_processes worker_processes]
+directive in `nginx.conf`).
+
+This API was first introduced in the <code>0.9.20</code> release.
+
+== ngx.worker.id ==
+
+'''syntax:''' ''count = ngx.worker.id()''
+
+'''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.timer.*, init_worker_by_lua*''
+
+Returns the ordinal number of the current Nginx worker processes (starting from number 0).
+
+So if the total number of workers is `N`, then this method may return a number between 0
+and `N - 1` (inclusive).
+
+This function returns meaningful values only for NGINX 1.9.1+. With earlier versions of NGINX, it
+always returns `nil`.
+
+See also [[#ngx.worker.count|ngx.worker.count]].
+
+This API was first introduced in the <code>0.9.20</code> release.
+
+== ngx.semaphore ==
+'''syntax:''' ''local semaphore = require "ngx.semaphore"''
+
+This is a Lua module that implements a classic-style semaphore API for efficient synchronizations among
+different "light threads". Sharing the same semaphore among different "light threads" created in different (request)
+contexts are also supported as long as the "light threads" reside in the same NGINX worker process
+and the [[#lua_code_cache|lua_code_cache]] directive is turned on (which is the default).
+
+This Lua module does not ship with this ngx_lua module itself rather it is shipped with
+the
+[https://github.com/openresty/lua-resty-core lua-resty-core] library.
+
+Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/semaphore.md documentation]
+for this <code>ngx.semaphore</code> Lua module in [https://github.com/openresty/lua-resty-core lua-resty-core]
+for more details.
+
+This feature requires at least ngx_lua <code>v0.10.0</code>.
+
+== ngx.balancer ==
+'''syntax:''' ''local balancer = require "ngx.balancer"''
+
+This is a Lua module that provides a Lua API to allow defining completely dynamic load balancers
+in pure Lua.
+
+This Lua module does not ship with this ngx_lua module itself rather it is shipped with
+the
+[https://github.com/openresty/lua-resty-core lua-resty-core] library.
+
+Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/balancer.md documentation]
+for this <code>ngx.balancer</code> Lua module in [https://github.com/openresty/lua-resty-core lua-resty-core]
+for more details.
+
+This feature requires at least ngx_lua <code>v0.10.0</code>.
+
+== ngx.ssl ==
+'''syntax:''' ''local ssl = require "ngx.ssl"''
+
+This Lua module provides API functions to control the SSL handshake process in contexts like
+[ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
+
+This Lua module does not ship with this ngx_lua module itself rather it is shipped with
+the
+[https://github.com/openresty/lua-resty-core lua-resty-core] library.
+
+Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md documentation]
+for this <code>ngx.ssl</code> Lua module for more details.
+
+This feature requires at least ngx_lua <code>v0.10.0</code>.
+
+== ngx.ocsp ==
+'''syntax:''' ''local ocsp = require "ngx.ocsp"''
+
+This Lua module provides API to perform OCSP queries, OCSP response validations, and
+OCSP stapling planting.
+
+Usually, this module is used together with the [ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
+module in the
+context of [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
+
+This Lua module does not ship with this ngx_lua module itself rather it is shipped with
+the
+[https://github.com/openresty/lua-resty-core lua-resty-core] library.
+
+Please refer to the [https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md documentation]
+for this <code>ngx.ocsp</code> Lua module for more details.
+
+This feature requires at least ngx_lua <code>v0.10.0</code>.
+
 == ndk.set_var.DIRECTIVE ==
 '''syntax:''' ''res = ndk.set_var.DIRECTIVE_NAME''
 
@@ -6022,7 +6389,7 @@ This feature requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_kit]
 == coroutine.create ==
 '''syntax:''' ''co = coroutine.create(f)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
 
 Creates a user Lua coroutines with a Lua function, and returns a coroutine object.
 
@@ -6035,7 +6402,7 @@ 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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
 
 Resumes the executation of a user Lua coroutine object previously yielded or just created.
 
@@ -6048,9 +6415,9 @@ This API was first introduced in the <code>v0.6.0</code> release.
 == coroutine.yield ==
 '''syntax:''' ''... = coroutine.yield(...)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
 
-Yields the executation of the current user Lua coroutine.
+Yields the execution 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.
 
@@ -6061,7 +6428,7 @@ 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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_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.
 
@@ -6072,7 +6439,7 @@ 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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
 
 Identical to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.running coroutine.running] API.
 
@@ -6083,7 +6450,7 @@ 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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
 
 Identical to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.status coroutine.status] API.
 
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 962c651..84a0579 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
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  9019
+#define ngx_http_lua_version  10000
 
 
 typedef struct {
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 8a82e07..14cc342 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
@@ -176,7 +176,8 @@ ngx_http_lua_access_handler_inline(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r, L, llcf->access_src.value.data,
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       llcf->access_src.value.data,
                                        llcf->access_src.value.len,
                                        llcf->access_src_key,
                                        (const char *) llcf->access_chunkname);
@@ -215,7 +216,8 @@ ngx_http_lua_access_handler_file(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r, L, script_path, llcf->access_src_key);
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
+                                     llcf->access_src_key);
     if (rc != NGX_OK) {
         if (rc < NGX_HTTP_SPECIAL_RESPONSE) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
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 d1376bd..dbc2ac6 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_args.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_args.c
@@ -113,6 +113,11 @@ ngx_http_lua_ngx_req_get_uri_args(lua_State *L)
 
     lua_createtable(L, 0, 4);
 
+    if (r->args.len == 0) {
+        lua_createtable(L, 0, 0);
+        return 1;
+    }
+
     /* we copy r->args over to buf to simplify
      * unescaping query arg keys and values */
 
@@ -197,6 +202,11 @@ ngx_http_lua_ngx_req_get_post_args(lua_State *L)
 
     dd("post body length: %d", (int) len);
 
+    if (len == 0) {
+        lua_createtable(L, 0, 0);
+        return 1;
+    }
+
     buf = ngx_palloc(r->pool, len);
     if (buf == NULL) {
         return luaL_error(L, "no memory");
@@ -379,7 +389,7 @@ ngx_http_lua_ffi_req_get_uri_args_count(ngx_http_request_t *r, int max)
     int                      count;
     u_char                  *p, *last;
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
new file mode 100644
index 0000000..4fa91fc
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
@@ -0,0 +1,607 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_cache.h"
+#include "ngx_http_lua_balancer.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_directive.h"
+
+
+struct ngx_http_lua_balancer_peer_data_s {
+    /* the round robin data must be first */
+    ngx_http_upstream_rr_peer_data_t    rrp;
+
+    ngx_http_lua_srv_conf_t            *conf;
+    ngx_http_request_t                 *request;
+
+    ngx_event_get_peer_pt               get_rr_peer;
+
+    ngx_uint_t                          more_tries;
+    ngx_uint_t                          total_tries;
+
+    struct sockaddr                    *sockaddr;
+    socklen_t                           socklen;
+
+    ngx_str_t                           host;
+    in_port_t                           port;
+
+    int                                 last_peer_state;
+};
+
+
+static ngx_int_t ngx_http_lua_balancer_init(ngx_conf_t *cf,
+    ngx_http_upstream_srv_conf_t *us);
+static ngx_int_t ngx_http_lua_balancer_init_peer(ngx_http_request_t *r,
+    ngx_http_upstream_srv_conf_t *us);
+static ngx_int_t ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc,
+    void *data);
+static ngx_int_t ngx_http_lua_balancer_by_chunk(lua_State *L,
+    ngx_http_request_t *r);
+void ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+    ngx_uint_t state);
+
+
+ngx_int_t
+ngx_http_lua_balancer_handler_file(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
+{
+    ngx_int_t           rc;
+
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
+                                     lscf->balancer.src.data,
+                                     lscf->balancer.src_key);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    /*  make sure we have a valid code chunk */
+    ngx_http_lua_assert(lua_isfunction(L, -1));
+
+    return ngx_http_lua_balancer_by_chunk(L, r);
+}
+
+
+ngx_int_t
+ngx_http_lua_balancer_handler_inline(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
+{
+    ngx_int_t           rc;
+
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       lscf->balancer.src.data,
+                                       lscf->balancer.src.len,
+                                       lscf->balancer.src_key,
+                                       "=balancer_by_lua");
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    /*  make sure we have a valid code chunk */
+    ngx_http_lua_assert(lua_isfunction(L, -1));
+
+    return ngx_http_lua_balancer_by_chunk(L, r);
+}
+
+
+char *
+ngx_http_lua_balancer_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_balancer_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
+char *
+ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    u_char                      *p;
+    u_char                      *name;
+    ngx_str_t                   *value;
+    ngx_http_lua_srv_conf_t     *lscf = conf;
+
+    ngx_http_upstream_srv_conf_t      *uscf;
+
+    dd("enter");
+
+    /*  must specifiy a content handler */
+    if (cmd->post == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (lscf->balancer.handler) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    lscf->balancer.handler = (ngx_http_lua_srv_conf_handler_pt) cmd->post;
+
+    if (cmd->post == ngx_http_lua_balancer_handler_file) {
+        /* Lua code in an external file */
+
+        name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
+                                        value[1].len);
+        if (name == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->balancer.src.data = name;
+        lscf->balancer.src.len = ngx_strlen(name);
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->balancer.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';
+
+    } else {
+        /* inlined Lua code */
+
+        lscf->balancer.src = value[1];
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->balancer.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';
+    }
+
+    uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);
+
+    if (uscf->peer.init_upstream) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "load balancing method redefined");
+    }
+
+    uscf->peer.init_upstream = ngx_http_lua_balancer_init;
+
+    uscf->flags = NGX_HTTP_UPSTREAM_CREATE
+                  |NGX_HTTP_UPSTREAM_WEIGHT
+                  |NGX_HTTP_UPSTREAM_MAX_FAILS
+                  |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
+                  |NGX_HTTP_UPSTREAM_DOWN;
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_balancer_init(ngx_conf_t *cf,
+    ngx_http_upstream_srv_conf_t *us)
+{
+    if (ngx_http_upstream_init_round_robin(cf, us) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    /* this callback is called upon individual requests */
+    us->peer.init = ngx_http_lua_balancer_init_peer;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_balancer_init_peer(ngx_http_request_t *r,
+    ngx_http_upstream_srv_conf_t *us)
+{
+    ngx_http_lua_srv_conf_t            *bcf;
+    ngx_http_lua_balancer_peer_data_t  *bp;
+
+    bp = ngx_pcalloc(r->pool, sizeof(ngx_http_lua_balancer_peer_data_t));
+    if (bp == NULL) {
+        return NGX_ERROR;
+    }
+
+    r->upstream->peer.data = &bp->rrp;
+
+    if (ngx_http_upstream_init_round_robin_peer(r, us) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    r->upstream->peer.get = ngx_http_lua_balancer_get_peer;
+    r->upstream->peer.free = ngx_http_lua_balancer_free_peer;
+
+    bcf = ngx_http_conf_upstream_srv_conf(us, ngx_http_lua_module);
+
+    bp->conf = bcf;
+    bp->get_rr_peer = ngx_http_upstream_get_round_robin_peer;
+    bp->request = r;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+{
+    lua_State                          *L;
+    ngx_int_t                           rc;
+    ngx_http_request_t                 *r;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_srv_conf_t            *lscf;
+    ngx_http_lua_main_conf_t           *lmcf;
+    ngx_http_lua_balancer_peer_data_t  *bp = data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                   "lua balancer peer, try: %ui", pc->tries);
+
+    lscf = bp->conf;
+
+    r = bp->request;
+
+    ngx_http_lua_assert(lscf->balancer.handler && r);
+
+    L = ngx_http_lua_get_lua_vm(r, NULL);
+
+    bp->sockaddr = NULL;
+    bp->socklen = 0;
+    bp->more_tries = 0;
+    bp->total_tries++;
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    /* balancer_by_lua does not support yielding and
+     * there cannot be any conflicts among concurrent requests,
+     * thus it is safe to store the peer data in the main conf.
+     */
+    lmcf->balancer_peer_data = bp;
+
+    rc = lscf->balancer.handler(r, lscf, L);
+
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (ctx->exited && ctx->exit_code != NGX_OK) {
+        rc = ctx->exit_code;
+        if (rc == NGX_ERROR || rc == NGX_BUSY || rc == NGX_DECLINED) {
+            return rc;
+        }
+
+        if (rc > NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (bp->sockaddr && bp->socklen) {
+        pc->sockaddr = bp->sockaddr;
+        pc->socklen = bp->socklen;
+        pc->name = &bp->host;
+        bp->rrp.peers->single = 0;
+
+        if (bp->more_tries) {
+            r->upstream->peer.tries += bp->more_tries;
+        }
+
+        dd("tries: %d", (int) r->upstream->peer.tries);
+
+        return NGX_OK;
+    }
+
+    return bp->get_rr_peer(pc, &bp->rrp);
+}
+
+
+static ngx_int_t
+ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
+{
+    u_char                  *err_msg;
+    size_t                   len;
+    ngx_int_t                rc;
+    ngx_http_lua_ctx_t      *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_http_lua_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+    } else {
+        dd("reset ctx");
+        ngx_http_lua_reset_ctx(r, L, ctx);
+    }
+
+    ctx->context = NGX_HTTP_LUA_CONTEXT_BALANCER;
+
+    /* init nginx context in Lua VM */
+    ngx_http_lua_set_req(L, r);
+    ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
+
+    /*  {{{ make new env inheriting main thread's globals table */
+    lua_createtable(L, 0, 1 /* nrec */);   /* the metatable for the new env */
+    ngx_http_lua_get_globals_table(L);
+    lua_setfield(L, -2, "__index");
+    lua_setmetatable(L, -2);    /*  setmetatable({}, {__index = _G}) */
+    /*  }}} */
+
+    lua_setfenv(L, -2);    /*  set new running env for the code closure */
+
+    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 */
+
+    dd("rc == %d", (int) rc);
+
+    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 balancer_by_lua*: %*s", len, err_msg);
+
+        lua_settop(L, 0); /*  clear remaining elems on stack */
+
+        return NGX_ERROR;
+    }
+
+    lua_settop(L, 0); /*  clear remaining elems on stack */
+    return rc;
+}
+
+
+void
+ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+    ngx_uint_t state)
+{
+    ngx_http_lua_balancer_peer_data_t  *bp = data;
+
+    if (bp->sockaddr && bp->socklen) {
+        bp->last_peer_state = (int) state;
+
+        if (pc->tries) {
+            pc->tries--;
+        }
+
+        return;
+    }
+
+    /* fallback */
+
+    ngx_http_upstream_free_round_robin_peer(pc, data, state);
+}
+
+
+#ifndef NGX_LUA_NO_FFI_API
+
+int
+ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
+    const u_char *addr, size_t addr_len, int port, char **err)
+{
+    ngx_url_t              url;
+    ngx_http_lua_ctx_t    *ctx;
+    ngx_http_upstream_t   *u;
+
+    ngx_http_lua_main_conf_t           *lmcf;
+    ngx_http_lua_balancer_peer_data_t  *bp;
+
+    if (r == NULL) {
+        *err = "no request found";
+        return NGX_ERROR;
+    }
+
+    u = r->upstream;
+
+    if (u == NULL) {
+        *err = "no upstream found";
+        return NGX_ERROR;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        *err = "no ctx found";
+        return NGX_ERROR;
+    }
+
+    if ((ctx->context & NGX_HTTP_LUA_CONTEXT_BALANCER) == 0) {
+        *err = "API disabled in the current context";
+        return NGX_ERROR;
+    }
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    /* we cannot read r->upstream->peer.data here directly because
+     * it could be overridden by other modules like
+     * ngx_http_upstream_keepalive_module.
+     */
+    bp = lmcf->balancer_peer_data;
+    if (bp == NULL) {
+        *err = "no upstream peer data found";
+        return NGX_ERROR;
+    }
+
+    ngx_memzero(&url, sizeof(ngx_url_t));
+
+    url.url.data = ngx_palloc(r->pool, addr_len);
+    if (url.url.data == NULL) {
+        *err = "no memory";
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(url.url.data, addr, addr_len);
+
+    url.url.len = addr_len;
+    url.default_port = (in_port_t) port;
+    url.uri_part = 0;
+    url.no_resolve = 1;
+
+    if (ngx_parse_url(r->pool, &url) != NGX_OK) {
+        if (url.err) {
+            *err = url.err;
+        }
+
+        return NGX_ERROR;
+    }
+
+    if (url.addrs && url.addrs[0].sockaddr) {
+        bp->sockaddr = url.addrs[0].sockaddr;
+        bp->socklen = url.addrs[0].socklen;
+        bp->host = url.addrs[0].name;
+
+    } else {
+        *err = "no host allowed";
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_balancer_set_more_tries(ngx_http_request_t *r,
+    int count, char **err)
+{
+    ngx_uint_t             max_tries;
+    ngx_http_lua_ctx_t    *ctx;
+    ngx_http_upstream_t   *u;
+
+    ngx_http_lua_main_conf_t           *lmcf;
+    ngx_http_lua_balancer_peer_data_t  *bp;
+
+    if (r == NULL) {
+        *err = "no request found";
+        return NGX_ERROR;
+    }
+
+    u = r->upstream;
+
+    if (u == NULL) {
+        *err = "no upstream found";
+        return NGX_ERROR;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        *err = "no ctx found";
+        return NGX_ERROR;
+    }
+
+    if ((ctx->context & NGX_HTTP_LUA_CONTEXT_BALANCER) == 0) {
+        *err = "API disabled in the current context";
+        return NGX_ERROR;
+    }
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    bp = lmcf->balancer_peer_data;
+    if (bp == NULL) {
+        *err = "no upstream peer data found";
+        return NGX_ERROR;
+    }
+
+#if (nginx_version >= 1007005)
+    max_tries = r->upstream->conf->next_upstream_tries;
+
+    if (bp->total_tries + count > max_tries) {
+        count = max_tries - bp->total_tries;
+        *err = "reduced tries due to limit";
+
+    } else {
+        *err = NULL;
+    }
+#else
+    *err = NULL;
+#endif
+
+    bp->more_tries = count;
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_balancer_get_last_failure(ngx_http_request_t *r,
+    int *status, char **err)
+{
+    ngx_http_lua_ctx_t         *ctx;
+    ngx_http_upstream_t        *u;
+    ngx_http_upstream_state_t  *state;
+
+    ngx_http_lua_balancer_peer_data_t  *bp;
+    ngx_http_lua_main_conf_t           *lmcf;
+
+    if (r == NULL) {
+        *err = "no request found";
+        return NGX_ERROR;
+    }
+
+    u = r->upstream;
+
+    if (u == NULL) {
+        *err = "no upstream found";
+        return NGX_ERROR;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        *err = "no ctx found";
+        return NGX_ERROR;
+    }
+
+    if ((ctx->context & NGX_HTTP_LUA_CONTEXT_BALANCER) == 0) {
+        *err = "API disabled in the current context";
+        return NGX_ERROR;
+    }
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    bp = lmcf->balancer_peer_data;
+    if (bp == NULL) {
+        *err = "no upstream peer data found";
+        return NGX_ERROR;
+    }
+
+    if (r->upstream_states && r->upstream_states->nelts > 1) {
+        state = r->upstream_states->elts;
+        *status = (int) state[r->upstream_states->nelts - 2].status;
+
+    } else {
+        *status = 0;
+    }
+
+    return bp->last_peer_state;
+}
+
+#endif  /* NGX_LUA_NO_FFI_API */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.h b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.h
new file mode 100644
index 0000000..bb49dc0
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.h
@@ -0,0 +1,27 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_LUA_BALANCER_H_INCLUDED_
+#define _NGX_HTTP_LUA_BALANCER_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+ngx_int_t ngx_http_lua_balancer_handler_inline(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
+
+ngx_int_t ngx_http_lua_balancer_handler_file(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
+
+char *ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+char *ngx_http_lua_balancer_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+
+#endif /* _NGX_HTTP_LUA_BALANCER_H_INCLUDED_ */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c b/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
index a07a0d9..86e347e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
@@ -160,7 +160,8 @@ ngx_http_lua_body_filter_inline(ngx_http_request_t *r, ngx_chain_t *in)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r, L, llcf->body_filter_src.value.data,
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       llcf->body_filter_src.value.data,
                                        llcf->body_filter_src.value.len,
                                        llcf->body_filter_src_key,
                                        "=body_filter_by_lua");
@@ -208,7 +209,7 @@ ngx_http_lua_body_filter_file(ngx_http_request_t *r, ngx_chain_t *in)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r, L, script_path,
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
                                      llcf->body_filter_src_key);
     if (rc != NGX_OK) {
         return NGX_ERROR;
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 6a1655f..e8a132e 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,7 @@
  *
  * */
 static ngx_int_t
-ngx_http_lua_cache_load_code(ngx_http_request_t *r, lua_State *L,
+ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
     const char *key)
 {
     int          rc;
@@ -68,7 +68,7 @@ ngx_http_lua_cache_load_code(ngx_http_request_t *r, lua_State *L,
             err = (u_char *) "unknown error";
         }
 
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+        ngx_log_error(NGX_LOG_ERR, log, 0,
                       "lua: failed to run factory at key \"%s\": %s",
                       key, err);
         lua_pop(L, 2);
@@ -133,7 +133,7 @@ ngx_http_lua_cache_store_code(lua_State *L, const char *key)
 
 
 ngx_int_t
-ngx_http_lua_cache_loadbuffer(ngx_http_request_t *r, lua_State *L,
+ngx_http_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
     const u_char *src, size_t src_len, const u_char *cache_key,
     const char *name)
 {
@@ -145,7 +145,7 @@ ngx_http_lua_cache_loadbuffer(ngx_http_request_t *r, lua_State *L,
 
     dd("XXX cache key: [%s]", cache_key);
 
-    rc = ngx_http_lua_cache_load_code(r, L, (char *) cache_key);
+    rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
         /*  code chunk loaded from cache, sp++ */
         dd("Code cache hit! cache key='%s', stack top=%d, script='%.*s'",
@@ -194,7 +194,7 @@ ngx_http_lua_cache_loadbuffer(ngx_http_request_t *r, lua_State *L,
 
 error:
 
-    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+    ngx_log_error(NGX_LOG_ERR, log, 0,
                   "failed to load inlined Lua code: %s", err);
     lua_settop(L, n);
     return NGX_ERROR;
@@ -202,7 +202,7 @@ error:
 
 
 ngx_int_t
-ngx_http_lua_cache_loadfile(ngx_http_request_t *r, lua_State *L,
+ngx_http_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
     const u_char *script, const u_char *cache_key)
 {
     int              n;
@@ -229,7 +229,7 @@ ngx_http_lua_cache_loadfile(ngx_http_request_t *r, lua_State *L,
 
     dd("XXX cache key for file: [%s]", cache_key);
 
-    rc = ngx_http_lua_cache_load_code(r, L, (char *) cache_key);
+    rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
         /*  code chunk loaded from cache, sp++ */
         dd("Code cache hit! cache key='%s', stack top=%d, file path='%s'",
@@ -286,7 +286,7 @@ ngx_http_lua_cache_loadfile(ngx_http_request_t *r, lua_State *L,
 
 error:
 
-    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+    ngx_log_error(NGX_LOG_ERR, log, 0,
                   "failed to load external Lua file \"%s\": %s", script, err);
 
     lua_settop(L, n);
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_cache.h b/debian/modules/nginx-lua/src/ngx_http_lua_cache.h
index 64c4aa2..52e6d2c 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_cache.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_cache.h
@@ -12,10 +12,10 @@
 #include "ngx_http_lua_common.h"
 
 
-ngx_int_t ngx_http_lua_cache_loadbuffer(ngx_http_request_t *r, lua_State *L,
+ngx_int_t ngx_http_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
     const u_char *src, size_t src_len, const u_char *cache_key,
     const char *name);
-ngx_int_t ngx_http_lua_cache_loadfile(ngx_http_request_t *r, lua_State *L,
+ngx_int_t ngx_http_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
     const u_char *script, const u_char *cache_key);
 
 
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 221f952..86885bb 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c
@@ -368,7 +368,7 @@ ngx_http_lua_clfactory_bytecode_prepare(lua_State *L,
         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("%ld: 0x%02X", i, (unsigned)(u_char) lf->begin_code.str[i]);
         }
         dd("==LJ_BT_HEADER_END==");
         }
@@ -471,7 +471,7 @@ ngx_http_lua_clfactory_bytecode_prepare(lua_State *L,
         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("%ld, 0x%02X", i, (unsigned)(u_char) lf->begin_code.str[i]);
         }
         dd("==LUA_BT_HEADER_END==");
         }
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 582815c..e7b9969 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_common.h
@@ -21,6 +21,12 @@
 #include <lualib.h>
 #include <lauxlib.h>
 
+
+#if !defined(nginx_version) || (nginx_version < 1006000)
+#error at least nginx 1.6.0 is required but found an older version
+#endif
+
+
 #if defined(NDK) && NDK
 #include <ndk.h>
 #endif
@@ -31,6 +37,11 @@
 #endif
 
 
+#if (!defined OPENSSL_NO_OCSP && defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB)
+#   define NGX_HTTP_LUA_USE_OCSP 1
+#endif
+
+
 #ifndef MD5_DIGEST_LENGTH
 #define MD5_DIGEST_LENGTH 16
 #endif
@@ -94,6 +105,8 @@ typedef struct {
 #define NGX_HTTP_LUA_CONTEXT_BODY_FILTER    0x040
 #define NGX_HTTP_LUA_CONTEXT_TIMER          0x080
 #define NGX_HTTP_LUA_CONTEXT_INIT_WORKER    0x100
+#define NGX_HTTP_LUA_CONTEXT_BALANCER       0x200
+#define NGX_HTTP_LUA_CONTEXT_SSL_CERT       0x400
 
 
 #ifndef NGX_LUA_NO_FFI_API
@@ -102,11 +115,21 @@ typedef struct {
 #endif
 
 
-typedef struct ngx_http_lua_main_conf_s ngx_http_lua_main_conf_t;
+typedef struct ngx_http_lua_main_conf_s  ngx_http_lua_main_conf_t;
+typedef union ngx_http_lua_srv_conf_u  ngx_http_lua_srv_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 ngx_http_lua_balancer_peer_data_s
+    ngx_http_lua_balancer_peer_data_t;
+
+
+typedef struct ngx_http_lua_semaphore_mm_s  ngx_http_lua_semaphore_mm_t;
+
+
+typedef ngx_int_t (*ngx_http_lua_main_conf_handler_pt)(ngx_log_t *log,
+    ngx_http_lua_main_conf_t *lmcf, lua_State *L);
+typedef ngx_int_t (*ngx_http_lua_srv_conf_handler_pt)(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lmcf, lua_State *L);
 
 
 typedef struct {
@@ -145,14 +168,22 @@ struct ngx_http_lua_main_conf_s {
     ngx_flag_t           postponed_to_rewrite_phase_end;
     ngx_flag_t           postponed_to_access_phase_end;
 
-    ngx_http_lua_conf_handler_pt    init_handler;
-    ngx_str_t                       init_src;
+    ngx_http_lua_main_conf_handler_pt    init_handler;
+    ngx_str_t                            init_src;
 
-    ngx_http_lua_conf_handler_pt    init_worker_handler;
-    ngx_str_t                       init_worker_src;
+    ngx_http_lua_main_conf_handler_pt    init_worker_handler;
+    ngx_str_t                            init_worker_src;
+
+    ngx_http_lua_balancer_peer_data_t      *balancer_peer_data;
+                    /* balancer_by_lua does not support yielding and
+                     * there cannot be any conflicts among concurrent requests,
+                     * thus it is safe to store the peer data in the main conf.
+                     */
 
     ngx_uint_t                      shm_zones_inited;
 
+    ngx_http_lua_semaphore_mm_t    *semaphore_mm;
+
     unsigned             requires_header_filter:1;
     unsigned             requires_body_filter:1;
     unsigned             requires_capture_filter:1;
@@ -163,6 +194,24 @@ struct ngx_http_lua_main_conf_s {
 };
 
 
+union ngx_http_lua_srv_conf_u {
+#if (NGX_HTTP_SSL)
+    struct {
+        ngx_http_lua_srv_conf_handler_pt     cert_handler;
+        ngx_str_t                            cert_src;
+        u_char                              *cert_src_key;
+    } ssl;
+#endif
+
+    struct {
+        ngx_str_t           src;
+        u_char             *src_key;
+
+        ngx_http_lua_srv_conf_handler_pt  handler;
+    } balancer;
+};
+
+
 typedef struct {
 #if (NGX_HTTP_SSL)
     ngx_ssl_t              *ssl;  /* shared by SSL cosockets */
@@ -303,6 +352,8 @@ struct ngx_http_lua_co_ctx_s {
 
     ngx_event_t              sleep;  /* used for ngx.sleep */
 
+    ngx_queue_t              sem_wait_queue;
+
 #ifdef NGX_LUA_USE_ASSERT
     int                      co_top; /* stack top after yielding/creation,
                                         only for sanity checks */
@@ -330,6 +381,7 @@ struct ngx_http_lua_co_ctx_s {
     unsigned                 thread_spawn_yielded:1; /* yielded from
                                                         the ngx.thread.spawn()
                                                         call */
+    unsigned                 sem_resume_status:1;
 };
 
 
@@ -372,6 +424,8 @@ typedef struct ngx_http_lua_ctx_s {
 
     ngx_http_cleanup_pt     *cleanup;
 
+    ngx_http_cleanup_t      *free_cleanup; /* free list of cleanup records */
+
     ngx_chain_t             *body; /* buffered subrequest response body
                                       chains */
 
@@ -451,7 +505,7 @@ typedef struct ngx_http_lua_ctx_s {
 } ngx_http_lua_ctx_t;
 
 
-typedef struct ngx_http_lua_header_val_s ngx_http_lua_header_val_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,
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_consts.c b/debian/modules/nginx-lua/src/ngx_http_lua_consts.c
index ebf8724..30a86f1 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_consts.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_consts.c
@@ -89,12 +89,27 @@ ngx_http_lua_inject_http_consts(lua_State *L)
     lua_setfield(L, -2, "HTTP_TRACE");
     /* }}} */
 
+    lua_pushinteger(L, NGX_HTTP_CONTINUE);
+    lua_setfield(L, -2, "HTTP_CONTINUE");
+
+    lua_pushinteger(L, NGX_HTTP_SWITCHING_PROTOCOLS);
+    lua_setfield(L, -2, "HTTP_SWITCHING_PROTOCOLS");
+
     lua_pushinteger(L, NGX_HTTP_OK);
     lua_setfield(L, -2, "HTTP_OK");
 
     lua_pushinteger(L, NGX_HTTP_CREATED);
     lua_setfield(L, -2, "HTTP_CREATED");
 
+    lua_pushinteger(L, NGX_HTTP_ACCEPTED);
+    lua_setfield(L, -2, "HTTP_ACCEPTED");
+
+    lua_pushinteger(L, NGX_HTTP_NO_CONTENT);
+    lua_setfield(L, -2, "HTTP_NO_CONTENT");
+
+    lua_pushinteger(L, NGX_HTTP_PARTIAL_CONTENT);
+    lua_setfield(L, -2, "HTTP_PARTIAL_CONTENT");
+
     lua_pushinteger(L, NGX_HTTP_SPECIAL_RESPONSE);
     lua_setfield(L, -2, "HTTP_SPECIAL_RESPONSE");
 
@@ -112,12 +127,17 @@ ngx_http_lua_inject_http_consts(lua_State *L)
     lua_pushinteger(L, NGX_HTTP_NOT_MODIFIED);
     lua_setfield(L, -2, "HTTP_NOT_MODIFIED");
 
+    lua_pushinteger(L, NGX_HTTP_TEMPORARY_REDIRECT);
+    lua_setfield(L, -2, "HTTP_TEMPORARY_REDIRECT");
+
     lua_pushinteger(L, NGX_HTTP_BAD_REQUEST);
     lua_setfield(L, -2, "HTTP_BAD_REQUEST");
 
     lua_pushinteger(L, NGX_HTTP_UNAUTHORIZED);
     lua_setfield(L, -2, "HTTP_UNAUTHORIZED");
 
+    lua_pushinteger(L, 402);
+    lua_setfield(L, -2, "HTTP_PAYMENT_REQUIRED");
 
     lua_pushinteger(L, NGX_HTTP_FORBIDDEN);
     lua_setfield(L, -2, "HTTP_FORBIDDEN");
@@ -128,20 +148,51 @@ ngx_http_lua_inject_http_consts(lua_State *L)
     lua_pushinteger(L, NGX_HTTP_NOT_ALLOWED);
     lua_setfield(L, -2, "HTTP_NOT_ALLOWED");
 
+    lua_pushinteger(L, 406);
+    lua_setfield(L, -2, "HTTP_NOT_ACCEPTABLE");
+
+    lua_pushinteger(L, NGX_HTTP_REQUEST_TIME_OUT);
+    lua_setfield(L, -2, "HTTP_REQUEST_TIMEOUT");
+
+    lua_pushinteger(L, NGX_HTTP_CONFLICT);
+    lua_setfield(L, -2, "HTTP_CONFLICT");
+
     lua_pushinteger(L, 410);
     lua_setfield(L, -2, "HTTP_GONE");
 
+    lua_pushinteger(L, 426);
+    lua_setfield(L, -2, "HTTP_UPGRADE_REQUIRED");
+
+    lua_pushinteger(L, 429);
+    lua_setfield(L, -2, "HTTP_TOO_MANY_REQUESTS");
+
+    lua_pushinteger(L, 451);
+    lua_setfield(L, -2, "HTTP_ILLEGAL");
+
+    lua_pushinteger(L, NGX_HTTP_CLOSE);
+    lua_setfield(L, -2, "HTTP_CLOSE");
+
     lua_pushinteger(L, NGX_HTTP_INTERNAL_SERVER_ERROR);
     lua_setfield(L, -2, "HTTP_INTERNAL_SERVER_ERROR");
 
     lua_pushinteger(L, NGX_HTTP_NOT_IMPLEMENTED);
     lua_setfield(L, -2, "HTTP_METHOD_NOT_IMPLEMENTED");
 
+    lua_pushinteger(L, NGX_HTTP_BAD_GATEWAY);
+    lua_setfield(L, -2, "HTTP_BAD_GATEWAY");
+
     lua_pushinteger(L, NGX_HTTP_SERVICE_UNAVAILABLE);
     lua_setfield(L, -2, "HTTP_SERVICE_UNAVAILABLE");
 
     lua_pushinteger(L, NGX_HTTP_GATEWAY_TIME_OUT);
     lua_setfield(L, -2, "HTTP_GATEWAY_TIMEOUT");
+
+    lua_pushinteger(L, 505);
+    lua_setfield(L, -2, "HTTP_VERSION_NOT_SUPPORTED");
+
+    lua_pushinteger(L, NGX_HTTP_INSUFFICIENT_STORAGE);
+    lua_setfield(L, -2, "HTTP_INSUFFICIENT_STORAGE");
+
     /* }}} */
 }
 
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 9234dd9..666b549 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
@@ -54,7 +54,7 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     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;
     }
@@ -251,7 +251,7 @@ ngx_http_lua_content_handler_file(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r, L, script_path,
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
                                      llcf->content_src_key);
     if (rc != NGX_OK) {
         if (rc < NGX_HTTP_SPECIAL_RESPONSE) {
@@ -280,7 +280,8 @@ ngx_http_lua_content_handler_inline(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r, L, llcf->content_src.value.data,
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       llcf->content_src.value.data,
                                        llcf->content_src.value.len,
                                        llcf->content_src_key,
                                        (const char *)
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_contentby.h b/debian/modules/nginx-lua/src/ngx_http_lua_contentby.h
index 766baa6..58ba8e1 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_contentby.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_contentby.h
@@ -12,7 +12,7 @@
 #include "ngx_http_lua_common.h"
 
 
-ngx_int_t ngx_http_lua_content_by_chunk(lua_State *l, ngx_http_request_t *r);
+ngx_int_t ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r);
 void ngx_http_lua_content_wev_handler(ngx_http_request_t *r);
 ngx_int_t ngx_http_lua_content_handler_file(ngx_http_request_t *r);
 ngx_int_t ngx_http_lua_content_handler_inline(ngx_http_request_t *r);
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 6105edd..0e1dd47 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_control.c
@@ -10,6 +10,7 @@
 #endif
 #include "ddebug.h"
 
+
 #include "ngx_http_lua_control.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_coroutine.h"
@@ -209,12 +210,15 @@ ngx_http_lua_ngx_redirect(lua_State *L)
     if (n == 2) {
         rc = (ngx_int_t) luaL_checknumber(L, 2);
 
-        if (rc != NGX_HTTP_MOVED_TEMPORARILY &&
-                rc != NGX_HTTP_MOVED_PERMANENTLY)
+        if (rc != NGX_HTTP_MOVED_TEMPORARILY
+            && rc != NGX_HTTP_MOVED_PERMANENTLY
+            && rc != NGX_HTTP_TEMPORARY_REDIRECT)
         {
-            return luaL_error(L, "only ngx.HTTP_MOVED_TEMPORARILY and "
-                              "ngx.HTTP_MOVED_PERMANENTLY are allowed");
+            return luaL_error(L, "only ngx.HTTP_MOVED_TEMPORARILY, "
+                              "ngx.HTTP_MOVED_PERMANENTLY, and "
+                              "ngx.HTTP_TEMPORARY_REDIRECT are allowed");
         }
+
     } else {
         rc = NGX_HTTP_MOVED_TEMPORARILY;
     }
@@ -256,9 +260,9 @@ ngx_http_lua_ngx_redirect(lua_State *L)
 
 #if 0
     dd("location hash: %lu == %lu",
-            (unsigned long) h->hash,
-            (unsigned long) ngx_hash_key_lc((u_char *) "Location",
-            sizeof("Location") - 1));
+       (unsigned long) h->hash,
+       (unsigned long) ngx_hash_key_lc((u_char *) "Location",
+                                       sizeof("Location") - 1));
 #endif
 
     h->value.len = len;
@@ -290,9 +294,9 @@ ngx_http_lua_ngx_redirect(lua_State *L)
 static int
 ngx_http_lua_ngx_exit(lua_State *L)
 {
+    ngx_int_t                    rc;
     ngx_http_request_t          *r;
     ngx_http_lua_ctx_t          *ctx;
-    ngx_int_t                    rc;
 
     if (lua_gettop(L) != 1) {
         return luaL_error(L, "expecting one argument");
@@ -312,10 +316,31 @@ ngx_http_lua_ngx_exit(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_ACCESS
                                | NGX_HTTP_LUA_CONTEXT_CONTENT
                                | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER);
+                               | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
+                               | NGX_HTTP_LUA_CONTEXT_BALANCER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     rc = (ngx_int_t) luaL_checkinteger(L, 1);
 
+    if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_CERT) {
+
+#if (NGX_HTTP_SSL)
+
+        ctx->exit_code = rc;
+        ctx->exited = 1;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua exit with code %i", rc);
+
+        return lua_yield(L, 0);
+
+#else
+
+        return luaL_error(L, "no SSL support");
+
+#endif
+    }
+
     if (ctx->no_abort
         && rc != NGX_ERROR
         && rc != NGX_HTTP_CLOSE
@@ -348,7 +373,9 @@ ngx_http_lua_ngx_exit(lua_State *L)
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua exit with code %i", ctx->exit_code);
 
-    if (ctx->context & NGX_HTTP_LUA_CONTEXT_HEADER_FILTER) {
+    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
+                        | NGX_HTTP_LUA_CONTEXT_BALANCER))
+    {
         return 0;
     }
 
@@ -431,13 +458,33 @@ ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
                                        | NGX_HTTP_LUA_CONTEXT_ACCESS
                                        | NGX_HTTP_LUA_CONTEXT_CONTENT
                                        | NGX_HTTP_LUA_CONTEXT_TIMER
-                                       | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER,
+                                       | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
+                                       | NGX_HTTP_LUA_CONTEXT_SSL_CERT,
                                        err, errlen)
         != NGX_OK)
     {
         return NGX_ERROR;
     }
 
+    if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_CERT) {
+
+#if (NGX_HTTP_SSL)
+
+        ctx->exit_code = status;
+        ctx->exited = 1;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua exit with code %d", status);
+
+        return NGX_OK;
+
+#else
+
+        return NGX_ERROR;
+
+#endif
+    }
+
     if (ctx->no_abort
         && status != NGX_ERROR
         && status != NGX_HTTP_CLOSE
@@ -458,7 +505,7 @@ ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
     {
         if (status != (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 "
+                          "set status %d via ngx.exit after sending out the "
                           "response status %ui", status,
                           r->headers_out.status);
         }
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c b/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
index 2bd9cb7..cb819c6 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
@@ -71,12 +71,13 @@ ngx_http_lua_coroutine_create_helper(lua_State *L, ngx_http_request_t *r,
     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");
+                  "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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     vm = ngx_http_lua_get_lua_vm(r, ctx);
 
@@ -151,7 +152,8 @@ ngx_http_lua_coroutine_resume(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     p_coctx = ctx->cur_co_ctx;
     if (p_coctx == NULL) {
@@ -210,7 +212,8 @@ ngx_http_lua_coroutine_yield(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     coctx = ctx->cur_co_ctx;
 
@@ -358,7 +361,8 @@ ngx_http_lua_coroutine_status(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     coctx = ngx_http_lua_get_co_ctx(co, ctx);
     if (coctx == NULL) {
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 ae8b09f..7ac8c28 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
@@ -24,6 +24,7 @@
 #include "ngx_http_lua_initby.h"
 #include "ngx_http_lua_initworkerby.h"
 #include "ngx_http_lua_shdict.h"
+#include "ngx_http_lua_ssl_certby.h"
 #include "ngx_http_lua_lex.h"
 
 
@@ -40,8 +41,6 @@ static ngx_int_t ngx_http_lua_set_by_lua_init(ngx_http_request_t *r);
 
 static u_char *ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag,
     size_t tag_len);
-static char *ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf,
-    ngx_command_t *cmd);
 static ngx_int_t ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
     ngx_http_lua_block_parser_ctx_t *ctx);
 static u_char *ngx_http_lua_strlstrn(u_char *s1, u_char *last, u_char *s2,
@@ -121,6 +120,7 @@ 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;
+    ctx->cycle = cf->cycle;
 
     zone = ngx_shared_memory_add(cf, &name, (size_t) size,
                                  &ngx_http_lua_module);
@@ -354,7 +354,8 @@ ngx_http_lua_filter_set_by_lua_inline(ngx_http_request_t *r, ngx_str_t *val,
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua inline script (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r, L, filter_data->script.data,
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       filter_data->script.data,
                                        filter_data->script.len,
                                        filter_data->key, "=set_by_lua");
     if (rc != NGX_OK) {
@@ -407,7 +408,8 @@ ngx_http_lua_filter_set_by_lua_file(ngx_http_request_t *r, ngx_str_t *val,
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r, L, script_path, filter_data->key);
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
+                                     filter_data->key);
     if (rc != NGX_OK) {
         return NGX_ERROR;
     }
@@ -1126,7 +1128,7 @@ ngx_http_lua_init_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
         return NGX_CONF_ERROR;
     }
 
-    lmcf->init_handler = (ngx_http_lua_conf_handler_pt) cmd->post;
+    lmcf->init_handler = (ngx_http_lua_main_conf_handler_pt) cmd->post;
 
     if (cmd->post == ngx_http_lua_init_by_file) {
         name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
@@ -1186,7 +1188,7 @@ ngx_http_lua_init_worker_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
     value = cf->args->elts;
 
-    lmcf->init_worker_handler = (ngx_http_lua_conf_handler_pt) cmd->post;
+    lmcf->init_worker_handler = (ngx_http_lua_main_conf_handler_pt) cmd->post;
 
     if (cmd->post == ngx_http_lua_init_worker_by_file) {
         name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
@@ -1284,7 +1286,7 @@ found:
 
 
 /* a specialized version of the standard ngx_conf_parse() function */
-static char *
+char *
 ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf, ngx_command_t *cmd)
 {
     ngx_http_lua_block_parser_ctx_t     ctx;
@@ -1555,12 +1557,63 @@ ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
         rc = ngx_http_lua_lex(b->pos, b->last - b->pos, ovec);
 
         if (rc < 0) {  /* no match */
-            cf->conf_file->line = start_line;
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "Lua code block missing the \"}\" "
-                               "character");
+            /* alas. the lexer does not yet support streaming processing. need
+             * more work below */
 
-            return NGX_ERROR;
+            if (cf->conf_file->file.offset >= file_size) {
+
+                cf->conf_file->line = ctx->start_line;
+
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "unexpected end of file, expecting "
+                                   "terminating characters for lua code "
+                                   "block");
+                return NGX_ERROR;
+            }
+
+            len = b->last - b->pos;
+
+            if (len == buf_size) {
+
+                cf->conf_file->line = start_line;
+
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "too long lua code block, probably "
+                                   "missing terminating characters");
+
+                return NGX_ERROR;
+            }
+
+            if (len) {
+                ngx_memcpy(b->start, b->pos, len);
+            }
+
+            size = (ssize_t) (file_size - cf->conf_file->file.offset);
+
+            if (size > b->end - (b->start + len)) {
+                size = b->end - (b->start + len);
+            }
+
+            n = ngx_read_file(&cf->conf_file->file, b->start + len, size,
+                              cf->conf_file->file.offset);
+
+            if (n == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (n != size) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   ngx_read_file_n " returned "
+                                   "only %z bytes instead of %z",
+                                   n, size);
+                return NGX_ERROR;
+            }
+
+            b->pos = b->start + len;
+            b->last = b->pos + n;
+            start = b->start;
+
+            continue;
         }
 
         if (rc == FOUND_LEFT_LBRACKET_STR || rc == FOUND_LEFT_LBRACKET_CMT) {
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 5a8d93b..be591f3 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.h
@@ -68,6 +68,9 @@ ngx_int_t ngx_http_lua_filter_set_by_lua_file(ngx_http_request_t *r,
 char *ngx_http_lua_rewrite_no_postpone(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
+char *ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf,
+    ngx_command_t *cmd);
+
 
 #endif /* _NGX_HTTP_LUA_DIRECTIVE_H_INCLUDED_ */
 
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 79bac65..75ce324 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c
@@ -168,7 +168,7 @@ ngx_http_lua_header_filter_inline(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r, L,
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
                                        llcf->header_filter_src.value.data,
                                        llcf->header_filter_src.value.len,
                                        llcf->header_filter_src_key,
@@ -211,7 +211,7 @@ ngx_http_lua_header_filter_file(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r, L, script_path,
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
                                      llcf->header_filter_src_key);
     if (rc != NGX_OK) {
         return NGX_ERROR;
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 5f8e59a..a9e45d3 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
@@ -608,7 +608,7 @@ ngx_http_lua_ngx_header_get(lua_State *L)
     if (llcf->transform_underscores_in_resp_headers
         && memchr(p, '_', len) != NULL)
     {
-        key.data = (u_char*) lua_newuserdata(L, len);
+        key.data = (u_char *) lua_newuserdata(L, len);
         if (key.data == NULL) {
             return luaL_error(L, "no memory");
         }
@@ -989,7 +989,7 @@ ngx_http_lua_ffi_req_get_headers_count(ngx_http_request_t *r, int max)
     int                           count;
     ngx_list_part_t              *part;
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -1082,7 +1082,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
         return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
     }
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -1198,7 +1198,7 @@ ngx_http_lua_ffi_req_header_set_single_value(ngx_http_request_t *r,
     ngx_str_t                    k;
     ngx_str_t                    v;
 
-    if (r->connection->fd == -1) {  /* fake request */
+    if (r->connection->fd == (ngx_socket_t) -1) {  /* fake request */
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -1253,7 +1253,7 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
 
     ngx_http_lua_loc_conf_t     *llcf;
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
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 abce458..82b4331 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
@@ -29,7 +29,7 @@ static ngx_int_t ngx_http_set_connection_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_set_cookie_header(ngx_http_request_t *r,
+static ngx_int_t ngx_http_set_builtin_multi_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);
@@ -128,6 +128,13 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
                  offsetof(ngx_http_headers_in_t, keep_alive),
                  ngx_http_set_builtin_header },
 
+#if (NGX_HTTP_X_FORWARDED_FOR)
+    { ngx_string("X-Forwarded-For"),
+                 offsetof(ngx_http_headers_in_t, x_forwarded_for),
+                 ngx_http_set_builtin_multi_header },
+
+#endif
+
 #if (NGX_HTTP_REALIP)
     { ngx_string("X-Real-IP"),
                  offsetof(ngx_http_headers_in_t, x_real_ip),
@@ -152,8 +159,8 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
 #endif
 
     { ngx_string("Cookie"),
-                 0,
-                 ngx_http_set_cookie_header },
+                 offsetof(ngx_http_headers_in_t, cookies),
+                 ngx_http_set_builtin_multi_header },
 
     { ngx_null_string, 0, ngx_http_set_header }
 };
@@ -558,7 +565,7 @@ ngx_http_set_content_length_header(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    dd("reset headers_in.content_length_n to %d", (int)len);
+    dd("reset headers_in.content_length_n to %d", (int) len);
 
     r->headers_in.content_length_n = len;
 
@@ -567,27 +574,30 @@ ngx_http_set_content_length_header(ngx_http_request_t *r,
 
 
 static ngx_int_t
-ngx_http_set_cookie_header(ngx_http_request_t *r,
+ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
     ngx_http_lua_header_val_t *hv, ngx_str_t *value)
 {
-    ngx_table_elt_t  **cookie, *h;
+    ngx_array_t       *headers;
+    ngx_table_elt_t  **v, *h;
 
-    if (!hv->no_override && r->headers_in.cookies.nelts > 0) {
-        ngx_array_destroy(&r->headers_in.cookies);
+    headers = (ngx_array_t *) ((char *) &r->headers_in + hv->offset);
 
-        if (ngx_array_init(&r->headers_in.cookies, r->pool, 2,
+    if (!hv->no_override && headers->nelts > 0) {
+        ngx_array_destroy(headers);
+
+        if (ngx_array_init(headers, r->pool, 2,
                            sizeof(ngx_table_elt_t *))
             != NGX_OK)
         {
             return NGX_ERROR;
         }
 
-        dd("clear headers in cookies: %d", (int) r->headers_in.cookies.nelts);
+        dd("clear multi-value headers: %d", (int) headers->nelts);
     }
 
 #if 1
-    if (r->headers_in.cookies.nalloc == 0) {
-        if (ngx_array_init(&r->headers_in.cookies, r->pool, 2,
+    if (headers->nalloc == 0) {
+        if (ngx_array_init(headers, r->pool, 2,
                            sizeof(ngx_table_elt_t *))
             != NGX_OK)
         {
@@ -604,14 +614,14 @@ ngx_http_set_cookie_header(ngx_http_request_t *r,
         return NGX_OK;
     }
 
-    dd("new cookie header: %p", h);
+    dd("new multi-value header: %p", h);
 
-    cookie = ngx_array_push(&r->headers_in.cookies);
-    if (cookie == NULL) {
+    v = ngx_array_push(headers);
+    if (v == NULL) {
         return NGX_ERROR;
     }
 
-    *cookie = h;
+    *v = h;
     return NGX_OK;
 }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c b/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c
index 5fd077f..b908eae 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c
@@ -179,7 +179,7 @@ ngx_http_set_header_helper(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
 
             } else {
                 dd("setting header to value %.*s", (int) value->len,
-                        value->data);
+                   value->data);
 
                 h[i].value = *value;
                 h[i].hash = hv->hash;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_logby.c b/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
index 9d06323..0a79acd 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
@@ -113,7 +113,8 @@ ngx_http_lua_log_handler_inline(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r, L, llcf->log_src.value.data,
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       llcf->log_src.value.data,
                                        llcf->log_src.value.len,
                                        llcf->log_src_key,
                                        (const char *) llcf->log_chunkname);
@@ -150,7 +151,8 @@ ngx_http_lua_log_handler_file(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r, L, script_path, llcf->log_src_key);
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
+                                     llcf->log_src_key);
     if (rc != NGX_OK) {
         return NGX_ERROR;
     }
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 4990e26..e3c7ec7 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_misc.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_misc.c
@@ -18,6 +18,7 @@
 
 static int ngx_http_lua_ngx_get(lua_State *L);
 static int ngx_http_lua_ngx_set(lua_State *L);
+static int ngx_http_lua_ngx_req_is_internal(lua_State *L);
 
 
 void
@@ -33,6 +34,29 @@ ngx_http_lua_inject_misc_api(lua_State *L)
 }
 
 
+void
+ngx_http_lua_inject_req_misc_api(lua_State *L)
+{
+    lua_pushcfunction(L, ngx_http_lua_ngx_req_is_internal);
+    lua_setfield(L, -2, "is_internal");
+}
+
+
+static int
+ngx_http_lua_ngx_req_is_internal(lua_State *L)
+{
+    ngx_http_request_t  *r;
+
+    r = ngx_http_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request object found");
+    }
+
+    lua_pushboolean(L, r->internal == 1);
+    return 1;
+}
+
+
 static int
 ngx_http_lua_ngx_get(lua_State *L)
 {
@@ -176,7 +200,7 @@ ngx_http_lua_ngx_set(lua_State *L)
 int
 ngx_http_lua_ffi_get_resp_status(ngx_http_request_t *r)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -198,7 +222,7 @@ ngx_http_lua_ffi_get_resp_status(ngx_http_request_t *r)
 int
 ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int status)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -230,7 +254,7 @@ ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int status)
 int
 ngx_http_lua_ffi_is_subrequest(ngx_http_request_t *r)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -248,7 +272,7 @@ ngx_http_lua_ffi_headers_sent(ngx_http_request_t *r)
         return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
     }
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_misc.h b/debian/modules/nginx-lua/src/ngx_http_lua_misc.h
index 8a79b92..c26d869 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_misc.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_misc.h
@@ -14,6 +14,8 @@
 
 void ngx_http_lua_inject_misc_api(lua_State *L);
 
+void ngx_http_lua_inject_req_misc_api(lua_State *L);
+
 
 #endif /* _NGX_HTTP_LUA_MISC_H_INCLUDED_ */
 
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 3bf50c2..c72a705 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
@@ -23,16 +23,18 @@
 #include "ngx_http_lua_initby.h"
 #include "ngx_http_lua_initworkerby.h"
 #include "ngx_http_lua_probe.h"
-
-
-#if !defined(nginx_version) || nginx_version < 8054
-#error "at least nginx 0.8.54 is required"
-#endif
+#include "ngx_http_lua_semaphore.h"
+#include "ngx_http_lua_balancer.h"
+#include "ngx_http_lua_ssl_certby.h"
 
 
 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_srv_conf(ngx_conf_t *cf);
+static char *ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent,
+    void *child);
 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 ngx_int_t ngx_http_lua_init(ngx_conf_t *cf);
@@ -313,6 +315,13 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_access_handler_file },
 
+    { ngx_string("access_by_lua_no_postpone"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(ngx_http_lua_main_conf_t, postponed_to_access_phase_end),
+      NULL },
+
     /* content_by_lua_file rel/or/abs/path/to/script */
     { ngx_string("content_by_lua_file"),
       NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -380,6 +389,20 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_body_filter_file },
 
+    { ngx_string("balancer_by_lua_block"),
+      NGX_HTTP_UPS_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_balancer_by_lua_block,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_balancer_handler_inline },
+
+    { ngx_string("balancer_by_lua_file"),
+      NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+      ngx_http_lua_balancer_by_lua,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_balancer_handler_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,
@@ -480,6 +503,24 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       offsetof(ngx_http_lua_loc_conf_t, ssl_ciphers),
       NULL },
 
+#if (NGX_HTTP_SSL)
+
+    { ngx_string("ssl_certificate_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_ssl_cert_by_lua_block,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_ssl_cert_handler_inline },
+
+    { ngx_string("ssl_certificate_by_lua_file"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_lua_ssl_cert_by_lua,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_ssl_cert_handler_file },
+
+#endif  /* NGX_HTTP_SSL */
+
     { ngx_string("lua_ssl_verify_depth"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -514,8 +555,8 @@ ngx_http_module_t ngx_http_lua_module_ctx = {
     ngx_http_lua_create_main_conf,    /*  create main configuration */
     ngx_http_lua_init_main_conf,      /*  init main configuration */
 
-    NULL,                             /*  create server configuration */
-    NULL,                             /*  merge server configuration */
+    ngx_http_lua_create_srv_conf,     /*  create server configuration */
+    ngx_http_lua_merge_srv_conf,      /*  merge server configuration */
 
     ngx_http_lua_create_loc_conf,     /*  create location configuration */
     ngx_http_lua_merge_loc_conf       /*  merge location configuration */
@@ -545,8 +586,12 @@ ngx_http_lua_init(ngx_conf_t *cf)
     ngx_int_t                   rc;
     ngx_array_t                *arr;
     ngx_http_handler_pt        *h;
+    volatile ngx_cycle_t       *saved_cycle;
     ngx_http_core_main_conf_t  *cmcf;
     ngx_http_lua_main_conf_t   *lmcf;
+#ifndef NGX_LUA_NO_FFI_API
+    ngx_pool_cleanup_t         *cln;
+#endif
 
     lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
 
@@ -569,6 +614,10 @@ ngx_http_lua_init(ngx_conf_t *cf)
         lmcf->postponed_to_rewrite_phase_end = 0;
     }
 
+    if (lmcf->postponed_to_access_phase_end == NGX_CONF_UNSET) {
+        lmcf->postponed_to_access_phase_end = 0;
+    }
+
     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
 
     if (lmcf->requires_rewrite) {
@@ -621,6 +670,19 @@ ngx_http_lua_init(ngx_conf_t *cf)
         }
     }
 
+#ifndef NGX_LUA_NO_FFI_API
+
+    /* add the cleanup of semaphores after the lua_close */
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NGX_ERROR;
+    }
+
+    cln->data = lmcf;
+    cln->handler = ngx_http_lua_cleanup_semaphore_mm;
+
+#endif
+
     if (lmcf->lua == NULL) {
         dd("initializing lua vm");
 
@@ -637,7 +699,14 @@ ngx_http_lua_init(ngx_conf_t *cf)
         }
 
         if (!lmcf->requires_shm && lmcf->init_handler) {
-            if (lmcf->init_handler(cf->log, lmcf, lmcf->lua) != NGX_OK) {
+            saved_cycle = ngx_cycle;
+            ngx_cycle = cf->cycle;
+
+            rc = lmcf->init_handler(cf->log, lmcf, lmcf->lua);
+
+            ngx_cycle = saved_cycle;
+
+            if (rc != NGX_OK) {
                 /* an error happened */
                 return NGX_ERROR;
             }
@@ -683,6 +752,7 @@ static void *
 ngx_http_lua_create_main_conf(ngx_conf_t *cf)
 {
     ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_semaphore_mm_t *mm;
 
     lmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_main_conf_t));
     if (lmcf == NULL) {
@@ -719,6 +789,25 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
     lmcf->regex_match_limit = NGX_CONF_UNSET;
 #endif
     lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
+    lmcf->postponed_to_access_phase_end = NGX_CONF_UNSET;
+
+    mm = ngx_palloc(cf->pool, sizeof(ngx_http_lua_semaphore_mm_t));
+    if (mm == NULL) {
+        return NULL;
+    }
+
+    lmcf->semaphore_mm = mm;
+    mm->lmcf = lmcf;
+
+    ngx_queue_init(&mm->free_queue);
+    mm->cur_epoch = 0;
+    mm->total = 0;
+    mm->used = 0;
+
+    /* it's better to be 4096, but it needs some space for
+     * ngx_http_lua_semaphore_mm_block_t, one is enough, so it is 4095
+     */
+    mm->num_per_block = 4095;
 
     dd("nginx Lua module main config structure initialized!");
 
@@ -755,6 +844,70 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
 }
 
 
+static void *
+ngx_http_lua_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_http_lua_srv_conf_t     *lscf;
+
+    lscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_srv_conf_t));
+    if (lscf == NULL) {
+        return NULL;
+    }
+
+    /* set by ngx_pcalloc:
+     *      lscf->ssl.cert_handler = NULL;
+     *      lscf->ssl.cert_src = { 0, NULL };
+     *      lscf->ssl.cert_src_key = NULL;
+     *      lscf->balancer.handler = NULL;
+     *      lscf->balancer.src = { 0, NULL };
+     *      lscf->balancer.src_key = NULL;
+     */
+
+    return lscf;
+}
+
+
+static char *
+ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+#if (NGX_HTTP_SSL)
+
+    ngx_http_lua_srv_conf_t *prev = parent;
+    ngx_http_lua_srv_conf_t *conf = child;
+    ngx_http_ssl_srv_conf_t *sscf;
+
+    dd("merge srv conf");
+
+    if (conf->ssl.cert_src.len == 0) {
+        conf->ssl.cert_src = prev->ssl.cert_src;
+        conf->ssl.cert_handler = prev->ssl.cert_handler;
+    }
+
+    if (conf->ssl.cert_src.len) {
+        sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
+        if (sscf == NULL || sscf->ssl.ctx == NULL) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no ssl configured for the server");
+
+            return NGX_CONF_ERROR;
+        }
+
+#if OPENSSL_VERSION_NUMBER >= 0x1000205fL
+
+        SSL_CTX_set_cert_cb(sscf->ssl.ctx, ngx_http_lua_ssl_cert_handler, NULL);
+
+#else
+
+        return NGX_CONF_ERROR;
+
+#endif
+    }
+
+#endif  /* NGX_HTTP_SSL */
+    return NGX_CONF_OK;
+}
+
+
 static void *
 ngx_http_lua_create_loc_conf(ngx_conf_t *cf)
 {
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 2062e5a..dca5fb9 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_output.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_output.c
@@ -345,7 +345,7 @@ ngx_http_lua_calc_strlen_in_table(lua_State *L, int index, int arg_i,
 bad_type:
 
                 msg = lua_pushfstring(L, "bad data type %s found",
-                        lua_typename(L, type));
+                                      lua_typename(L, type));
                 return luaL_argerror(L, arg_i, msg);
         }
 
@@ -458,7 +458,7 @@ ngx_http_lua_ngx_flush(lua_State *L)
     n = lua_gettop(L);
     if (n > 1) {
         return luaL_error(L, "attempt to pass %d arguments, but accepted 0 "
-                "or 1", n);
+                          "or 1", n);
     }
 
     r = ngx_http_lua_get_req(L);
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_phase.c b/debian/modules/nginx-lua/src/ngx_http_lua_phase.c
index 6053a39..b8e936a 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_phase.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_phase.c
@@ -76,6 +76,14 @@ ngx_http_lua_ngx_get_phase(lua_State *L)
         lua_pushliteral(L, "timer");
         break;
 
+    case NGX_HTTP_LUA_CONTEXT_BALANCER:
+        lua_pushliteral(L, "balancer");
+        break;
+
+    case NGX_HTTP_LUA_CONTEXT_SSL_CERT:
+        lua_pushliteral(L, "ssl_cert");
+        break;
+
     default:
         return luaL_error(L, "unknown phase: %d", (int) ctx->context);
     }
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 1ecfd70..8b4a668 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
@@ -449,7 +449,7 @@ ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
         }
 
         dd("saving regex %p, ncaptures %d,  captures %p", re_comp.regex,
-                re_comp.captures, cap);
+           re_comp.captures, cap);
 
         re->regex = re_comp.regex;
         re->regex_sd = sd;
@@ -681,7 +681,7 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
 
     if (nargs != 2 && nargs != 3) {
         return luaL_error(L, "expecting two or three arguments, but got %d",
-                nargs);
+                          nargs);
     }
 
     r = ngx_http_lua_get_req(L);
@@ -1321,7 +1321,7 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
 
     if (nargs != 3 && nargs != 4) {
         return luaL_error(L, "expecting three or four arguments, but got %d",
-                nargs);
+                          nargs);
     }
 
     r = ngx_http_lua_get_req(L);
@@ -1820,7 +1820,7 @@ exec:
         }
 
         rc = ngx_http_lua_complex_value(r, &subj, cp_offset, rc, cap, ctpl,
-                &luabuf);
+                                        &luabuf);
 
         if (rc != NGX_OK) {
             msg = lua_pushfstring(L, "failed to eval the template for "
@@ -1972,16 +1972,16 @@ ngx_http_lua_regex_compile(ngx_http_lua_regex_compile_t *rc)
 
     if (re == NULL) {
         if ((size_t) erroff == rc->pattern.len) {
-           rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
-                                      "pcre_compile() failed: %s in \"%V\"",
+            rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
+                                       "pcre_compile() failed: %s in \"%V\"",
                                       errstr, &rc->pattern)
                          - rc->err.data;
 
         } else {
-           rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
-                                      "pcre_compile() failed: %s in \"%V\" "
-                                      "at \"%s\"", errstr, &rc->pattern,
-                                      rc->pattern.data + erroff)
+            rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
+                                       "pcre_compile() failed: %s in \"%V\" "
+                                       "at \"%s\"", errstr, &rc->pattern,
+                                       rc->pattern.data + erroff)
                          - rc->err.data;
         }
 
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 af90245..a916396 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
@@ -110,7 +110,7 @@ ngx_http_lua_ngx_req_read_body(lua_State *L)
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "lua start to read buffered request body");
+                   "lua start to read buffered request body");
 
     rc = ngx_http_read_client_request_body(r, ngx_http_lua_req_body_post_read);
 
@@ -332,7 +332,7 @@ ngx_http_lua_ngx_req_get_body_file(lua_State *L)
        r->request_body->bufs->buf->memory,
        r->request_body->bufs->buf->temporary,
        (int) (r->request_body->bufs->buf->end -
-       r->request_body->bufs->buf->pos),
+              r->request_body->bufs->buf->pos),
        (int) ngx_buf_size(r->request_body->bufs->buf));
 
     lua_pushlstring(L, (char *) r->request_body->temp_file->file.name.data,
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
index 41736c3..0a2a154 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_req_method.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_req_method.c
@@ -149,7 +149,7 @@ ngx_http_lua_ngx_req_set_method(lua_State *L)
 int
 ngx_http_lua_ffi_req_get_method(ngx_http_request_t *r)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -161,7 +161,7 @@ int
 ngx_http_lua_ffi_req_get_method_name(ngx_http_request_t *r, char *buf,
     size_t *len)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -174,7 +174,7 @@ ngx_http_lua_ffi_req_get_method_name(ngx_http_request_t *r, char *buf,
 int
 ngx_http_lua_ffi_req_set_method(ngx_http_request_t *r, int method)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
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 af3b499..da30b8b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
@@ -67,7 +67,7 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
             tmp      = *cur_ph;
 
             memmove(cur_ph, cur_ph + 1,
-                (last_ph - cur_ph) * sizeof (ngx_http_phase_handler_t));
+                    (last_ph - cur_ph) * sizeof (ngx_http_phase_handler_t));
 
             *last_ph = tmp;
 
@@ -176,7 +176,8 @@ ngx_http_lua_rewrite_handler_inline(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r, L, llcf->rewrite_src.value.data,
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       llcf->rewrite_src.value.data,
                                        llcf->rewrite_src.value.len,
                                        llcf->rewrite_src_key,
                                        (const char *)
@@ -214,7 +215,8 @@ ngx_http_lua_rewrite_handler_file(ngx_http_request_t *r)
     L = ngx_http_lua_get_lua_vm(r, NULL);
 
     /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r, L, script_path, llcf->rewrite_src_key);
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
+                                     llcf->rewrite_src_key);
     if (rc != NGX_OK) {
         if (rc < NGX_HTTP_SPECIAL_RESPONSE) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
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 24be601..95ebadf 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_script.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_script.c
@@ -59,7 +59,7 @@ ngx_http_lua_compile_complex_value(ngx_http_lua_compile_complex_value_t *ccv)
     }
 
     n = nv * (2 * sizeof(ngx_http_lua_script_copy_code_t)
-                  + sizeof(ngx_http_lua_script_capture_code_t))
+              + sizeof(ngx_http_lua_script_capture_code_t))
         + sizeof(uintptr_t);
 
     if (ngx_array_init(&lengths, ccv->pool, n, 1) != NGX_OK) {
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
new file mode 100644
index 0000000..b022604
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
@@ -0,0 +1,546 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ * Copyright (C) cuiweixie
+ * I hereby assign copyright in this code to the lua-nginx-module project,
+ * to be licensed under the same terms as the rest of the code.
+ */
+
+
+#ifndef NGX_LUA_NO_FFI_API
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_semaphore.h"
+#include "ngx_http_lua_contentby.h"
+
+
+ngx_int_t ngx_http_lua_semaphore_init_mm(ngx_http_lua_semaphore_mm_t *mm);
+static ngx_http_lua_semaphore_t *ngx_http_lua_alloc_semaphore(void);
+void ngx_http_lua_cleanup_semaphore_mm(void *data);
+static void ngx_http_lua_free_semaphore(ngx_http_lua_semaphore_t *sem);
+static ngx_int_t ngx_http_lua_semaphore_resume(ngx_http_request_t *r);
+int ngx_http_lua_ffi_semaphore_new(ngx_http_lua_semaphore_t **psem,
+    int n, char **errmsg);
+int ngx_http_lua_ffi_semaphore_post(ngx_http_lua_semaphore_t *sem,
+    int n);
+int ngx_http_lua_ffi_semaphore_wait(ngx_http_request_t *r,
+    ngx_http_lua_semaphore_t *sem, int wait_ms, u_char *err, size_t *errlen);
+static void ngx_http_lua_semaphore_cleanup(void *data);
+static void ngx_http_lua_semaphore_handler(ngx_event_t *ev);
+static void ngx_http_lua_semaphore_timeout_handler(ngx_event_t *ev);
+void ngx_http_lua_ffi_semaphore_gc(ngx_http_lua_semaphore_t *sem);
+
+
+enum {
+    SEMAPHORE_WAIT_SUCC = 0,
+    SEMAPHORE_WAIT_TIMEOUT = 1
+};
+
+
+static ngx_http_lua_semaphore_t *
+ngx_http_lua_alloc_semaphore(void)
+{
+    ngx_http_lua_semaphore_t            *sem, *iter;
+    ngx_http_lua_main_conf_t            *lmcf;
+    ngx_queue_t                         *q;
+    ngx_uint_t                           i, n;
+    ngx_http_lua_semaphore_mm_block_t   *block;
+    ngx_http_lua_semaphore_mm_t         *mm;
+
+    ngx_http_lua_assert(ngx_cycle && ngx_cycle->conf_ctx);
+
+    lmcf = ngx_http_cycle_get_module_main_conf(ngx_cycle,
+                                               ngx_http_lua_module);
+
+    mm = lmcf->semaphore_mm;
+
+    if (!ngx_queue_empty(&mm->free_queue)) {
+        q = ngx_queue_head(&mm->free_queue);
+        ngx_queue_remove(q);
+
+        sem = ngx_queue_data(q, ngx_http_lua_semaphore_t, chain);
+
+        sem->block->used++;
+
+        ngx_memzero(&sem->sem_event, sizeof(ngx_event_t));
+
+        sem->sem_event.handler = ngx_http_lua_semaphore_handler;
+        sem->sem_event.data = sem;
+        sem->sem_event.log = ngx_cycle->log;
+
+        mm->used++;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "from head of free queue, alloc semaphore: %p", sem);
+
+        return sem;
+    }
+
+    /* free_queue is empty */
+
+    n = sizeof(ngx_http_lua_semaphore_mm_block_t)
+        + mm->num_per_block * sizeof(ngx_http_lua_semaphore_t);
+
+    dd("block size: %d, item size: %d",
+       (int) sizeof(ngx_http_lua_semaphore_mm_block_t),
+       (int) sizeof(ngx_http_lua_semaphore_t));
+
+    block = ngx_alloc(n, ngx_cycle->log);
+    if (block == NULL) {
+        return NULL;
+    }
+
+    mm->cur_epoch++;
+    mm->total += mm->num_per_block;
+    mm->used++;
+
+    block->mm = mm;
+    block->epoch = mm->cur_epoch;
+
+    sem = (ngx_http_lua_semaphore_t *) (block + 1);
+    sem->block = block;
+    sem->block->used = 1;
+
+    ngx_memzero(&sem->sem_event, sizeof(ngx_event_t));
+
+    sem->sem_event.handler = ngx_http_lua_semaphore_handler;
+    sem->sem_event.data = sem;
+    sem->sem_event.log = ngx_cycle->log;
+
+    for (iter = sem + 1, i = 1; i < mm->num_per_block; i++, iter++) {
+        iter->block = block;
+        ngx_queue_insert_tail(&mm->free_queue, &iter->chain);
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "new block, alloc semaphore: %p block: %p", sem, block);
+
+    return sem;
+}
+
+
+void
+ngx_http_lua_cleanup_semaphore_mm(void *data)
+{
+    ngx_http_lua_semaphore_t            *sem, *iter;
+    ngx_uint_t                           i;
+    ngx_http_lua_main_conf_t            *lmcf;
+    ngx_queue_t                         *q;
+    ngx_http_lua_semaphore_mm_block_t   *block;
+    ngx_http_lua_semaphore_mm_t         *mm;
+
+    lmcf = (ngx_http_lua_main_conf_t *) data;
+    mm = lmcf->semaphore_mm;
+
+    while (!ngx_queue_empty(&mm->free_queue)) {
+        q = ngx_queue_head(&mm->free_queue);
+
+        sem = ngx_queue_data(q, ngx_http_lua_semaphore_t, chain);
+        block = sem->block;
+
+        if (block->used == 0) {
+            iter = (ngx_http_lua_semaphore_t *) (block + 1);
+
+            for (i = 0; i < block->mm->num_per_block; i++, iter++) {
+                ngx_queue_remove(&iter->chain);
+            }
+
+            dd("free semaphore block: %p at final", block);
+
+            ngx_free(block);
+
+        } else {
+            /* just return directly when some thing goes wrong */
+
+            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                          "ngx_http_lua_cleanup_semaphore_mm when cleanup"
+                          " block %p is still used by someone", block);
+
+            return;
+        }
+    }
+
+    dd("ngx_http_lua_cleanup_semaphore_mm");
+}
+
+
+static void
+ngx_http_lua_free_semaphore(ngx_http_lua_semaphore_t *sem)
+{
+    ngx_http_lua_semaphore_t            *iter;
+    ngx_uint_t                           i, mid_epoch;
+    ngx_http_lua_semaphore_mm_block_t   *block;
+    ngx_http_lua_semaphore_mm_t         *mm;
+
+    block = sem->block;
+    block->used--;
+
+    mm = block->mm;
+    mm->used--;
+
+    mid_epoch = mm->cur_epoch - ((mm->total / mm->num_per_block) >> 1);
+
+    if (block->epoch < mid_epoch) {
+        ngx_queue_insert_tail(&mm->free_queue, &sem->chain);
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "add to free queue tail semaphore: %p epoch: %d"
+                       "mid_epoch: %d cur_epoch: %d", sem, (int) block->epoch,
+                       (int) mid_epoch, (int) mm->cur_epoch);
+
+    } else {
+        ngx_queue_insert_head(&mm->free_queue, &sem->chain);
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "add to free queue head semaphore: %p epoch: %d"
+                       "mid_epoch: %d cur_epoch: %d", sem, (int) block->epoch,
+                       (int) mid_epoch, (int) mm->cur_epoch);
+    }
+
+    dd("used: %d", (int) block->used);
+
+    if (block->used == 0
+        && mm->used <= (mm->total >> 1)
+        && block->epoch < mid_epoch)
+    {
+        /* load <= 50% and it's on the older side */
+        iter = (ngx_http_lua_semaphore_t *) (block + 1);
+
+        for (i = 0; i < mm->num_per_block; i++, iter++) {
+            ngx_queue_remove(&iter->chain);
+        }
+
+        mm->total -= mm->num_per_block;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "free semaphore block: %p", block);
+
+        ngx_free(block);
+    }
+}
+
+
+static ngx_int_t
+ngx_http_lua_semaphore_resume(ngx_http_request_t *r)
+{
+    lua_State                   *vm;
+    ngx_connection_t            *c;
+    ngx_int_t                    rc;
+    ngx_http_lua_ctx_t          *ctx;
+
+    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;
+
+    c = r->connection;
+    vm = ngx_http_lua_get_lua_vm(r, ctx);
+
+    if (ctx->cur_co_ctx->sem_resume_status == SEMAPHORE_WAIT_SUCC) {
+        lua_pushboolean(ctx->cur_co_ctx->co, 1);
+        lua_pushnil(ctx->cur_co_ctx->co);
+
+    } else {
+        lua_pushboolean(ctx->cur_co_ctx->co, 0);
+        lua_pushstring(ctx->cur_co_ctx->co, "timeout");
+    }
+
+    rc = ngx_http_lua_run_thread(vm, r, ctx, 2);
+
+    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, vm, r, ctx);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_lua_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+    }
+
+    /* rc == NGX_ERROR || rc >= NGX_OK */
+
+    if (ctx->entered_content_phase) {
+        ngx_http_lua_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+int
+ngx_http_lua_ffi_semaphore_new(ngx_http_lua_semaphore_t **psem,
+    int n, char **errmsg)
+{
+    ngx_http_lua_semaphore_t    *sem;
+
+    sem = ngx_http_lua_alloc_semaphore();
+    if (sem == NULL) {
+        *errmsg = "no memory";
+        return NGX_ERROR;
+    }
+
+    ngx_queue_init(&sem->wait_queue);
+
+    sem->resource_count = n;
+    sem->wait_count = 0;
+    *psem = sem;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "http lua semaphore new: %p, resources: %d",
+                   sem, sem->resource_count);
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_semaphore_post(ngx_http_lua_semaphore_t *sem, int n)
+{
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "http lua semaphore post: %p, n: %d, resources: %d",
+                   sem, n, sem->resource_count);
+
+    sem->resource_count += n;
+
+    if (!ngx_queue_empty(&sem->wait_queue)) {
+        /* we need the extra paranthese around the first argument of
+         * ngx_post_event() just to work around macro issues in nginx
+         * cores older than nginx 1.7.12 (exclusive).
+         */
+        ngx_post_event((&sem->sem_event), &ngx_posted_events);
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_semaphore_wait(ngx_http_request_t *r,
+    ngx_http_lua_semaphore_t *sem, int wait_ms, u_char *err, size_t *errlen)
+{
+    ngx_http_lua_ctx_t           *ctx;
+    ngx_http_lua_co_ctx_t        *wait_co_ctx;
+    ngx_int_t                     rc;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "http lua semaphore wait: %p, timeout: %d, "
+                   "resources: %d, event posted: %d",
+                   sem, wait_ms, sem->resource_count,
+#if (nginx_version >= 1007005)
+                   (int) sem->sem_event.posted
+#else
+                   sem->sem_event.prev ? 1 : 0
+#endif
+                   );
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        *errlen = ngx_snprintf(err, *errlen, "no request ctx found") - err;
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_lua_ffi_check_context(ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                                        | NGX_HTTP_LUA_CONTEXT_ACCESS
+                                        | NGX_HTTP_LUA_CONTEXT_CONTENT
+                                        | NGX_HTTP_LUA_CONTEXT_TIMER
+                                        | NGX_HTTP_LUA_CONTEXT_SSL_CERT,
+                                        err, errlen);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    /* we keep the order, will resume the older waited firtly
+     * in ngx_http_lua_semaphore_handler
+     */
+
+    if (ngx_queue_empty(&sem->wait_queue) && sem->resource_count > 0) {
+        sem->resource_count--;
+        return NGX_OK;
+    }
+
+    if (wait_ms == 0) {
+        return NGX_DECLINED;
+    }
+
+    sem->wait_count++;
+    wait_co_ctx = ctx->cur_co_ctx;
+
+    wait_co_ctx->sleep.handler = ngx_http_lua_semaphore_timeout_handler;
+    wait_co_ctx->sleep.data = ctx->cur_co_ctx;
+    wait_co_ctx->sleep.log = r->connection->log;
+
+    ngx_add_timer(&wait_co_ctx->sleep, (ngx_msec_t) wait_ms);
+
+    dd("ngx_http_lua_ffi_semaphore_wait add timer coctx:%p wait: %d(ms)",
+       wait_co_ctx, wait_ms);
+
+    ngx_queue_insert_tail(&sem->wait_queue, &wait_co_ctx->sem_wait_queue);
+
+    wait_co_ctx->data = sem;
+    wait_co_ctx->cleanup = ngx_http_lua_semaphore_cleanup;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "http lua semaphore wait yielding");
+
+    return NGX_AGAIN;
+}
+
+
+int
+ngx_http_lua_ffi_semaphore_count(ngx_http_lua_semaphore_t *sem)
+{
+    return sem->resource_count - sem->wait_count;
+}
+
+
+static void
+ngx_http_lua_semaphore_cleanup(void *data)
+{
+    ngx_http_lua_co_ctx_t          *coctx = data;
+    ngx_queue_t                    *q;
+    ngx_http_lua_semaphore_t       *sem;
+
+    sem = coctx->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "http lua semaphore cleanup");
+
+    if (coctx->sleep.timer_set) {
+        ngx_del_timer(&coctx->sleep);
+    }
+
+    q = &coctx->sem_wait_queue;
+
+    ngx_queue_remove(q);
+    sem->wait_count--;
+    coctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_semaphore_handler(ngx_event_t *ev)
+{
+    ngx_http_lua_semaphore_t    *sem;
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *wait_co_ctx;
+    ngx_connection_t            *c;
+    ngx_queue_t                 *q;
+
+    sem = ev->data;
+
+    while (!ngx_queue_empty(&sem->wait_queue) && sem->resource_count > 0) {
+
+        q = ngx_queue_head(&sem->wait_queue);
+        ngx_queue_remove(q);
+
+        sem->wait_count--;
+
+        wait_co_ctx = ngx_queue_data(q, ngx_http_lua_co_ctx_t, sem_wait_queue);
+        wait_co_ctx->cleanup = NULL;
+
+        if (wait_co_ctx->sleep.timer_set) {
+            ngx_del_timer(&wait_co_ctx->sleep);
+        }
+
+        r = ngx_http_lua_get_req(wait_co_ctx->co);
+        c = r->connection;
+
+        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+        ngx_http_lua_assert(ctx != NULL);
+
+        sem->resource_count--;
+
+        ctx->cur_co_ctx = wait_co_ctx;
+
+        wait_co_ctx->sem_resume_status = SEMAPHORE_WAIT_SUCC;
+
+        if (ctx->entered_content_phase) {
+            (void) ngx_http_lua_semaphore_resume(r);
+
+        } else {
+            ctx->resume_handler = ngx_http_lua_semaphore_resume;
+            ngx_http_core_run_phases(r);
+        }
+
+        ngx_http_run_posted_requests(c);
+    }
+}
+
+
+static void
+ngx_http_lua_semaphore_timeout_handler(ngx_event_t *ev)
+{
+    ngx_http_lua_co_ctx_t       *wait_co_ctx;
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_connection_t            *c;
+    ngx_http_lua_semaphore_t    *sem;
+
+    wait_co_ctx = ev->data;
+    wait_co_ctx->cleanup = NULL;
+
+    dd("ngx_http_lua_semaphore_timeout_handler timeout coctx:%p", wait_co_ctx);
+
+    sem = wait_co_ctx->data;
+
+    ngx_queue_remove(&wait_co_ctx->sem_wait_queue);
+    sem->wait_count--;
+
+    r = ngx_http_lua_get_req(wait_co_ctx->co);
+    c = r->connection;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    ngx_http_lua_assert(ctx != NULL);
+
+    ctx->cur_co_ctx = wait_co_ctx;
+
+    wait_co_ctx->sem_resume_status = SEMAPHORE_WAIT_TIMEOUT;
+
+    if (ctx->entered_content_phase) {
+        (void) ngx_http_lua_semaphore_resume(r);
+
+    } else {
+        ctx->resume_handler = ngx_http_lua_semaphore_resume;
+        ngx_http_core_run_phases(r);
+    }
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+void
+ngx_http_lua_ffi_semaphore_gc(ngx_http_lua_semaphore_t *sem)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "in lua gc, semaphore %p", sem);
+
+    if (sem == NULL) {
+        return;
+    }
+
+    if (!ngx_queue_empty(&sem->wait_queue)) {
+        ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, 0,
+                      "in lua semaphore gc wait queue is"
+                      " not empty while the semaphore %p is being "
+                      "destroyed", sem);
+    }
+
+    ngx_http_lua_free_semaphore(sem);
+}
+
+
+#endif /* NGX_LUA_NO_FFI_API */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h
new file mode 100644
index 0000000..a71cc23
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h
@@ -0,0 +1,51 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ * Copyright (C) cuiweixie
+ * I hereby assign copyright in this code to the lua-nginx-module project,
+ * to be licensed under the same terms as the rest of the code.
+ */
+
+
+#ifndef _NGX_HTTP_LUA_SEMAPHORE_H_INCLUDED_
+#define _NGX_HTTP_LUA_SEMAPHORE_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+typedef struct ngx_http_lua_semaphore_mm_block_s {
+    ngx_uint_t                       used;
+    ngx_http_lua_semaphore_mm_t     *mm;
+    ngx_uint_t                       epoch;
+} ngx_http_lua_semaphore_mm_block_t;
+
+
+struct ngx_http_lua_semaphore_mm_s {
+    ngx_queue_t                  free_queue;
+    ngx_uint_t                   total;
+    ngx_uint_t                   used;
+    ngx_uint_t                   num_per_block;
+    ngx_uint_t                   cur_epoch;
+    ngx_http_lua_main_conf_t    *lmcf;
+};
+
+
+typedef struct ngx_http_lua_semaphore_s {
+    ngx_queue_t                          wait_queue;
+    ngx_queue_t                          chain;
+    ngx_event_t                          sem_event;
+    ngx_http_lua_semaphore_mm_block_t   *block;
+    int                                  resource_count;
+    unsigned                             wait_count;
+} ngx_http_lua_semaphore_t;
+
+
+#ifndef NGX_LUA_NO_FFI_API
+void ngx_http_lua_cleanup_semaphore_mm(void *data);
+#endif
+
+
+#endif /* _NGX_HTTP_LUA_SEMAPHORE_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
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 a72f9da..d853382 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
@@ -56,6 +56,8 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     ngx_http_lua_shdict_ctx_t  *octx = data;
 
     size_t                      len;
+    ngx_int_t                   rc;
+    volatile ngx_cycle_t       *saved_cycle;
     ngx_http_lua_shdict_ctx_t  *ctx;
     ngx_http_lua_main_conf_t   *lmcf;
 
@@ -117,7 +119,14 @@ done:
     if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
         && lmcf->init_handler)
     {
-        if (lmcf->init_handler(ctx->log, lmcf, lmcf->lua) != NGX_OK) {
+        saved_cycle = ngx_cycle;
+        ngx_cycle = ctx->cycle;
+
+        rc = lmcf->init_handler(ctx->log, lmcf, lmcf->lua);
+
+        ngx_cycle = saved_cycle;
+
+        if (rc != NGX_OK) {
             /* an error happened */
             return NGX_ERROR;
         }
@@ -378,14 +387,14 @@ 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)
 {
-  return ngx_http_lua_shdict_get_helper(L, 0 /* stale */);
+    return ngx_http_lua_shdict_get_helper(L, 0 /* stale */);
 }
 
 
 static int
 ngx_http_lua_shdict_get_stale(lua_State *L)
 {
-  return ngx_http_lua_shdict_get_helper(L, 1 /* stale */);
+    return ngx_http_lua_shdict_get_helper(L, 1 /* stale */);
 }
 
 
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 29ea28f..aa1bb58 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
@@ -37,6 +37,7 @@ typedef struct {
     ngx_str_t                     name;
     ngx_http_lua_main_conf_t     *main_conf;
     ngx_log_t                    *log;
+    ngx_cycle_t                  *cycle;
 } 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
index b59b9e7..a887c3a 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
@@ -55,7 +55,8 @@ ngx_http_lua_ngx_sleep(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     coctx = ctx->cur_co_ctx;
     if (coctx == NULL) {
@@ -102,7 +103,7 @@ ngx_http_lua_sleep_handler(ngx_event_t *ev)
         return;
     }
 
-    if (c->fd != -1) {  /* not a fake connection */
+    if (c->fd != (ngx_socket_t) -1) {  /* not a fake connection */
         log_ctx = c->log->data;
         log_ctx->current_request = r;
     }
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
index 4640f87..98801f5 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
@@ -383,7 +383,8 @@ ngx_http_lua_socket_tcp(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     lua_createtable(L, 3 /* narr */, 1 /* nrec */);
     lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
@@ -440,22 +441,13 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     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, "no memory");
-    }
-
-    host.len = len;
-
-    ngx_memcpy(host.data, p, len);
-    host.data[len] = '\0';
-
     key_index = 2;
     custom_pool = 0;
 
@@ -610,6 +602,18 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     /* rc == NGX_DECLINED */
 
+    /* TODO: we should avoid this in-pool allocation */
+
+    host.data = ngx_palloc(r->pool, len + 1);
+    if (host.data == NULL) {
+        return luaL_error(L, "no memory");
+    }
+
+    host.len = len;
+
+    ngx_memcpy(host.data, p, len);
+    host.data[len] = '\0';
+
     ngx_memzero(&url, sizeof(ngx_url_t));
 
     url.url.len = host.len;
@@ -804,7 +808,7 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
         u->write_prepare_retvals =
                                 ngx_http_lua_socket_conn_error_retval_handler;
         ngx_http_lua_socket_handle_conn_error(r, u,
-                                             NGX_HTTP_LUA_SOCKET_FT_RESOLVER);
+                                              NGX_HTTP_LUA_SOCKET_FT_RESOLVER);
 
         if (waiting) {
             ngx_http_run_posted_requests(c);
@@ -1001,7 +1005,7 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
     }
 
     if (u->cleanup == NULL) {
-        cln = ngx_http_cleanup_add(r, 0);
+        cln = ngx_http_lua_cleanup_add(r, 0);
         if (cln == NULL) {
             u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
             lua_pushnil(L);
@@ -1089,7 +1093,7 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
 
         if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
             ngx_http_lua_socket_handle_conn_error(r, u,
-                                                NGX_HTTP_LUA_SOCKET_FT_ERROR);
+                                                  NGX_HTTP_LUA_SOCKET_FT_ERROR);
             lua_pushnil(L);
             lua_pushliteral(L, "failed to handle write event");
             return 2;
@@ -1097,7 +1101,7 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
 
         if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
             ngx_http_lua_socket_handle_conn_error(r, u,
-                                                NGX_HTTP_LUA_SOCKET_FT_ERROR);
+                                                  NGX_HTTP_LUA_SOCKET_FT_ERROR);
             lua_pushnil(L);
             lua_pushliteral(L, "failed to handle read event");
             return 2;
@@ -1310,6 +1314,17 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
 
             if (n >= 4) {
                 u->ssl_verify = lua_toboolean(L, 4);
+
+                if (n >= 5) {
+                    if (lua_toboolean(L, 5)) {
+#ifdef NGX_HTTP_LUA_USE_OCSP
+                        SSL_set_tlsext_status_type(c->ssl->connection,
+                                                   TLSEXT_STATUSTYPE_ocsp);
+#else
+                        return luaL_error(L, "no OCSP support");
+#endif
+                    }
+                }
             }
         }
     }
@@ -1353,6 +1368,12 @@ new_ssl_name:
 
     u->write_co_ctx = coctx;
 
+#if 0
+#ifdef NGX_HTTP_LUA_USE_OCSP
+    SSL_set_tlsext_status_type(c->ssl->connection, TLSEXT_STATUSTYPE_ocsp);
+#endif
+#endif
+
     rc = ngx_ssl_handshake(c);
 
     dd("ngx_ssl_handshake returned %d", (int) rc);
@@ -1513,7 +1534,7 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
         return 1;
     }
 
-    ud = lua_newuserdata(L, sizeof(ngx_ssl_session_t*));
+    ud = lua_newuserdata(L, sizeof(ngx_ssl_session_t *));
 
     c = u->peer.connection;
 
@@ -1525,8 +1546,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
         *ud = ssl_session;
 
        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "lua ssl save session: %p:%d", ssl_session,
-                       ssl_session->references);
+                      "lua ssl save session: %p:%d", ssl_session,
+                      ssl_session->references);
 
         /* set up the __gc metamethod */
         lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
@@ -1945,8 +1966,8 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
 #endif
 
     dd("already read: %p: %.*s", u->buf_in,
-            (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
-            u->buf_in->buf->pos);
+       (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
+       u->buf_in->buf->pos);
 
     dd("data read: %.*s", (int) bytes, b->pos);
 
@@ -1965,8 +1986,8 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
             u->buf_in->buf->last = dst;
 
             dd("read a line: %p: %.*s", u->buf_in,
-                    (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
-                    u->buf_in->buf->pos);
+               (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
+               u->buf_in->buf->pos);
 
             return NGX_OK;
 
@@ -2242,7 +2263,7 @@ success:
         if (n == NGX_ERROR) {
             u->socket_errno = ngx_socket_errno;
             ngx_http_lua_socket_handle_read_error(r, u,
-                                                NGX_HTTP_LUA_SOCKET_FT_ERROR);
+                                                  NGX_HTTP_LUA_SOCKET_FT_ERROR);
             return NGX_ERROR;
         }
 
@@ -2687,7 +2708,7 @@ ngx_http_lua_socket_tcp_handler(ngx_event_t *ev)
     r = u->request;
     c = r->connection;
 
-    if (c->fd != -1) {  /* not a fake connection */
+    if (c->fd != (ngx_socket_t) -1) {  /* not a fake connection */
         ctx = c->log->data;
         ctx->current_request = r;
     }
@@ -2775,7 +2796,7 @@ ngx_http_lua_socket_send_handler(ngx_http_request_t *r,
         }
 
         ngx_http_lua_socket_handle_write_error(r, u,
-                                              NGX_HTTP_LUA_SOCKET_FT_TIMEOUT);
+                                               NGX_HTTP_LUA_SOCKET_FT_TIMEOUT);
         return;
     }
 
@@ -2802,7 +2823,7 @@ ngx_http_lua_socket_send(ngx_http_request_t *r,
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
         ngx_http_lua_socket_handle_write_error(r, u,
-                                         NGX_HTTP_LUA_SOCKET_FT_ERROR);
+                                               NGX_HTTP_LUA_SOCKET_FT_ERROR);
         return NGX_ERROR;
     }
 
@@ -3332,6 +3353,7 @@ ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
 
     if (u->cleanup) {
         *u->cleanup = NULL;
+        ngx_http_lua_cleanup_free(r, u->cleanup);
         u->cleanup = NULL;
     }
 
@@ -3423,7 +3445,7 @@ ngx_http_lua_socket_test_connect(ngx_http_request_t *r, ngx_connection_t *c)
 
     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);
+           c->read, c->read->pending_eof);
 
         if (c->write->pending_eof) {
             ev = c->write;
@@ -4251,7 +4273,7 @@ ngx_http_lua_req_socket(lua_State *L)
     u->connect_timeout = u->conf->connect_timeout;
     u->send_timeout = u->conf->send_timeout;
 
-    cln = ngx_http_cleanup_add(r, 0);
+    cln = ngx_http_lua_cleanup_add(r, 0);
     if (cln == NULL) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
         lua_pushnil(L);
@@ -4347,7 +4369,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     ngx_http_lua_socket_tcp_upstream_t  *u;
     ngx_connection_t                    *c;
     ngx_http_lua_socket_pool_t          *spool;
-    size_t                               size;
+    size_t                               size, key_len;
     ngx_str_t                            key;
     ngx_uint_t                           i;
     ngx_queue_t                         *q;
@@ -4477,7 +4499,9 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "lua tcp socket connection pool size: %ui", pool_size);
 
-        size = sizeof(ngx_http_lua_socket_pool_t) + key.len
+        key_len = ngx_align(key.len + 1, sizeof(void *));
+
+        size = sizeof(ngx_http_lua_socket_pool_t) + key_len - 1
                + sizeof(ngx_http_lua_socket_pool_item_t)
                * pool_size;
 
@@ -4505,7 +4529,12 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         p = ngx_copy(spool->key, key.data, key.len);
         *p++ = '\0';
 
-        items = (ngx_http_lua_socket_pool_item_t *) p;
+        items = (ngx_http_lua_socket_pool_item_t *) (spool->key + key_len);
+
+        dd("items: %p", items);
+
+        ngx_http_lua_assert((void *) items == ngx_align_ptr(items,
+                                                            sizeof(void *)));
 
         for (i = 0; i < pool_size; i++) {
             ngx_queue_insert_head(&spool->free, &items[i].queue);
@@ -4688,7 +4717,7 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
 #endif
 
         if (u->cleanup == NULL) {
-            cln = ngx_http_cleanup_add(r, 0);
+            cln = ngx_http_lua_cleanup_add(r, 0);
             if (cln == NULL) {
                 u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
                 lua_settop(L, top);
@@ -4893,83 +4922,52 @@ ngx_http_lua_socket_push_input_data(ngx_http_request_t *r,
 {
     ngx_chain_t             *cl;
     ngx_chain_t            **ll;
-    size_t                   size;
+#if (DDEBUG) || (NGX_DTRACE)
+    size_t                   size = 0;
+#endif
+    size_t                   chunk_size;
     ngx_buf_t               *b;
     size_t                   nbufs;
-    u_char                  *p;
-    u_char                  *last;
-
-    if (!u->bufs_in) {
-        lua_pushliteral(L, "");
-        ngx_http_lua_probe_socket_tcp_receive_done(r, u, (u_char *) "", 0);
-        return NGX_OK;
-    }
+    luaL_Buffer              luabuf;
 
     dd("bufs_in: %p, buf_in: %p", u->bufs_in, u->buf_in);
 
-    size = 0;
     nbufs = 0;
     ll = NULL;
 
+    luaL_buffinit(L, &luabuf);
+
     for (cl = u->bufs_in; cl; cl = cl->next) {
         b = cl->buf;
-        size += b->last - b->pos;
+        chunk_size = b->last - b->pos;
+
+        dd("copying input data chunk from %p: \"%.*s\"", cl,
+           (int) chunk_size, b->pos);
+
+        luaL_addlstring(&luabuf, (char *) b->pos, chunk_size);
 
         if (cl->next) {
             ll = &cl->next;
         }
 
+#if (DDEBUG) || (NGX_DTRACE)
+        size += chunk_size;
+#endif
+
         nbufs++;
     }
 
+    luaL_pushresult(&luabuf);
+
+#if (DDEBUG)
     dd("size: %d, nbufs: %d", (int) size, (int) nbufs);
+#endif
 
-    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, 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;
-    }
-
-    /* nbufs > 1 */
-
-    dd("WARN: allocate a big memory: %d", (int) size);
-
-    p = ngx_palloc(r->pool, size);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    last = p;
-    for (cl = u->bufs_in; cl; cl = cl->next) {
-        b = cl->buf;
-        last = ngx_copy(last, b->pos, b->last - b->pos);
-
-        dd("copying input data chunk from %p: \"%.*s\"", cl,
-           (int) (b->last - b->pos), b->pos);
-    }
-
-    lua_pushlstring(L, (char *) p, size);
-
-    ngx_http_lua_probe_socket_tcp_receive_done(r, u, p, size);
-
-    ngx_pfree(r->pool, p);
-
-done:
+#if (NGX_DTRACE)
+    ngx_http_lua_probe_socket_tcp_receive_done(r, u,
+                                               (u_char *) lua_tostring(L, -1),
+                                               size);
+#endif
 
     if (nbufs > 1 && ll) {
         dd("recycle buffers: %d", (int) (nbufs - 1));
@@ -4985,8 +4983,10 @@ done:
         u->buffer.last = u->buffer.start;
     }
 
-    u->buf_in->buf->last = u->buffer.pos;
-    u->buf_in->buf->pos = u->buffer.pos;
+    if (u->bufs_in) {
+        u->buf_in->buf->last = u->buffer.pos;
+        u->buf_in->buf->pos = u->buffer.pos;
+    }
 
     return NGX_OK;
 }
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h
index 915d4f4..dbdee41 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h
@@ -31,8 +31,8 @@ typedef
         ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 
 
-typedef void (*ngx_http_lua_socket_tcp_upstream_handler_pt)(
-          ngx_http_request_t *r, ngx_http_lua_socket_tcp_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 {
@@ -111,7 +111,7 @@ struct ngx_http_lua_socket_tcp_upstream_s {
 };
 
 
-typedef struct ngx_http_lua_dfa_edge_s ngx_http_lua_dfa_edge_t;
+typedef struct ngx_http_lua_dfa_edge_s  ngx_http_lua_dfa_edge_t;
 
 
 struct ngx_http_lua_dfa_edge_s {
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
index 23cc69a..bfb122f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
@@ -140,7 +140,8 @@ ngx_http_lua_socket_udp(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     lua_createtable(L, 3 /* narr */, 1 /* nrec */);
     lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
@@ -200,7 +201,8 @@ ngx_http_lua_socket_udp_setpeername(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     luaL_checktype(L, 1, LUA_TTABLE);
 
@@ -1299,7 +1301,7 @@ ngx_http_lua_socket_udp_handler(ngx_event_t *ev)
     r = u->request;
     c = r->connection;
 
-    if (c->fd != -1) {  /* not a fake connection */
+    if (c->fd != (ngx_socket_t) -1) {  /* not a fake connection */
         ctx = c->log->data;
         ctx->current_request = r;
     }
@@ -1358,7 +1360,7 @@ ngx_http_lua_udp_connect(ngx_udp_connection_t *uc)
 
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &uc->log, 0, "UDP socket %d", s);
 
-    if (s == -1) {
+    if (s == (ngx_socket_t) -1) {
         ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
                       ngx_socket_n " failed");
 
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
index 819e36b..dd75b2d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h
@@ -20,8 +20,8 @@ typedef
         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);
+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 {
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
new file mode 100644
index 0000000..f8648a7
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
@@ -0,0 +1,938 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#if (NGX_HTTP_SSL)
+
+
+#include "ngx_http_lua_cache.h"
+#include "ngx_http_lua_initworkerby.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_ssl_module.h"
+#include "ngx_http_lua_contentby.h"
+#include "ngx_http_lua_ssl_certby.h"
+#include "ngx_http_lua_directive.h"
+
+
+enum {
+    NGX_HTTP_LUA_ADDR_TYPE_UNIX  = 0,
+    NGX_HTTP_LUA_ADDR_TYPE_INET  = 1,
+    NGX_HTTP_LUA_ADDR_TYPE_INET6 = 2
+};
+
+
+static void ngx_http_lua_ssl_cert_done(void *data);
+static void ngx_http_lua_ssl_cert_aborted(void *data);
+static u_char *ngx_http_lua_log_ssl_cert_error(ngx_log_t *log, u_char *buf,
+    size_t len);
+static ngx_int_t ngx_http_lua_ssl_cert_by_chunk(lua_State *L,
+    ngx_http_request_t *r);
+
+
+int  ngx_http_lua_ssl_ctx_index = -1;
+
+
+ngx_int_t
+ngx_http_lua_ssl_cert_handler_file(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
+{
+    ngx_int_t           rc;
+
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
+                                     lscf->ssl.cert_src.data,
+                                     lscf->ssl.cert_src_key);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    /*  make sure we have a valid code chunk */
+    ngx_http_lua_assert(lua_isfunction(L, -1));
+
+    return ngx_http_lua_ssl_cert_by_chunk(L, r);
+}
+
+
+ngx_int_t
+ngx_http_lua_ssl_cert_handler_inline(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
+{
+    ngx_int_t           rc;
+
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       lscf->ssl.cert_src.data,
+                                       lscf->ssl.cert_src.len,
+                                       lscf->ssl.cert_src_key,
+                                       "=ssl_certificate_by_lua");
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    /*  make sure we have a valid code chunk */
+    ngx_http_lua_assert(lua_isfunction(L, -1));
+
+    return ngx_http_lua_ssl_cert_by_chunk(L, r);
+}
+
+
+char *
+ngx_http_lua_ssl_cert_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_ssl_cert_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
+char *
+ngx_http_lua_ssl_cert_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+#if OPENSSL_VERSION_NUMBER < 0x1000205fL
+
+    ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                  "at least OpenSSL 1.0.2e required but found "
+                  OPENSSL_VERSION_TEXT);
+
+    return NGX_CONF_ERROR;
+
+#else
+
+    u_char                      *p;
+    u_char                      *name;
+    ngx_str_t                   *value;
+    ngx_http_lua_srv_conf_t    *lscf = conf;
+
+    /*  must specifiy a concrete handler */
+    if (cmd->post == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (lscf->ssl.cert_handler) {
+        return "is duplicate";
+    }
+
+    if (ngx_http_lua_ssl_ctx_index == -1) {
+        ngx_http_lua_ssl_ctx_index = SSL_get_ex_new_index(0, NULL, NULL,
+                                                          NULL, NULL);
+
+        if (ngx_ssl_connection_index == -1) {
+            ngx_ssl_error(NGX_LOG_ALERT, cf->log, 0,
+                          "lua: SSL_get_ex_new_index() failed");
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    value = cf->args->elts;
+
+    lscf->ssl.cert_handler = (ngx_http_lua_srv_conf_handler_pt) cmd->post;
+
+    if (cmd->post == ngx_http_lua_ssl_cert_handler_file) {
+        /* Lua code in an external file */
+
+        name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
+                                        value[1].len);
+        if (name == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->ssl.cert_src.data = name;
+        lscf->ssl.cert_src.len = ngx_strlen(name);
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->ssl.cert_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';
+
+    } else {
+        /* inlined Lua code */
+
+        lscf->ssl.cert_src = value[1];
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->ssl.cert_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';
+    }
+
+    return NGX_CONF_OK;
+
+#endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
+}
+
+
+int
+ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
+{
+    lua_State                       *L;
+    ngx_int_t                        rc;
+    ngx_connection_t                *c, *fc;
+    ngx_http_request_t              *r = NULL;
+    ngx_pool_cleanup_t              *cln;
+    ngx_http_connection_t           *hc;
+    ngx_http_lua_srv_conf_t         *lscf;
+    ngx_http_lua_ssl_cert_ctx_t     *cctx;
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    dd("c = %p", c);
+
+    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
+
+    dd("ssl cert handler, cert-ctx=%p", cctx);
+
+    if (cctx) {
+        /* not the first time */
+
+        if (cctx->done) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "lua_certificate_by_lua: cert cb exit code: %d",
+                           cctx->exit_code);
+
+            dd("lua ssl cert done, finally");
+            return cctx->exit_code;
+        }
+
+        return -1;
+    }
+
+    /* cctx == NULL */
+
+    dd("first time");
+
+    hc = c->data;
+
+    fc = ngx_http_lua_create_fake_connection(NULL);
+    if (fc == NULL) {
+        goto failed;
+    }
+
+    fc->log->handler = ngx_http_lua_log_ssl_cert_error;
+    fc->log->data = fc;
+
+    fc->addr_text = c->addr_text;
+    fc->listening = c->listening;
+
+    r = ngx_http_lua_create_fake_request(fc);
+    if (r == NULL) {
+        goto failed;
+    }
+
+    r->main_conf = hc->conf_ctx->main_conf;
+    r->srv_conf = hc->conf_ctx->srv_conf;
+    r->loc_conf = hc->conf_ctx->loc_conf;
+
+    fc->log->file = c->log->file;
+    fc->log->log_level = c->log->log_level;
+    fc->ssl = c->ssl;
+
+    cctx = ngx_pcalloc(c->pool, sizeof(ngx_http_lua_ssl_cert_ctx_t));
+    if (cctx == NULL) {
+        goto failed;  /* error */
+    }
+
+    cctx->exit_code = 1;  /* successful by default */
+    cctx->connection = c;
+    cctx->request = r;
+
+    dd("setting cctx");
+
+    if (SSL_set_ex_data(c->ssl->connection, ngx_http_lua_ssl_ctx_index, cctx)
+        == 0)
+    {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "SSL_set_ex_data() failed");
+        goto failed;
+    }
+
+    lscf = ngx_http_get_module_srv_conf(r, ngx_http_lua_module);
+
+    /* TODO honor lua_code_cache off */
+    L = ngx_http_lua_get_lua_vm(r, NULL);
+
+    c->log->action = "loading SSL certificate by lua";
+
+    rc = lscf->ssl.cert_handler(r, lscf, L);
+
+    if (rc >= NGX_OK || rc == NGX_ERROR) {
+        cctx->done = 1;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "lua_certificate_by_lua: handler return value: %i, "
+                       "cert cb exit code: %d", rc, cctx->exit_code);
+
+        c->log->action = "SSL handshaking";
+        return cctx->exit_code;
+    }
+
+    /* rc == NGX_DONE */
+
+    cln = ngx_pool_cleanup_add(fc->pool, 0);
+    if (cln == NULL) {
+        goto failed;
+    }
+
+    cln->handler = ngx_http_lua_ssl_cert_done;
+    cln->data = cctx;
+
+    cln = ngx_pool_cleanup_add(c->pool, 0);
+    if (cln == NULL) {
+        goto failed;
+    }
+
+    cln->handler = ngx_http_lua_ssl_cert_aborted;
+    cln->data = cctx;
+
+    return -1;
+
+#if 1
+failed:
+
+    if (r && r->pool) {
+        ngx_http_lua_free_fake_request(r);
+    }
+
+    if (fc) {
+        ngx_http_lua_close_fake_connection(fc);
+    }
+
+    return 0;
+#endif
+}
+
+
+static void
+ngx_http_lua_ssl_cert_done(void *data)
+{
+    ngx_connection_t                *c;
+    ngx_http_lua_ssl_cert_ctx_t     *cctx = data;
+
+    dd("lua ssl cert done");
+
+    if (cctx->aborted) {
+        return;
+    }
+
+    ngx_http_lua_assert(cctx->done == 0);
+
+    cctx->done = 1;
+
+    c = cctx->connection;
+
+    c->log->action = "SSL handshaking";
+
+    ngx_post_event(c->write, &ngx_posted_events);
+}
+
+
+static void
+ngx_http_lua_ssl_cert_aborted(void *data)
+{
+    ngx_http_lua_ssl_cert_ctx_t     *cctx = data;
+
+    dd("lua ssl cert done");
+
+    if (cctx->done) {
+        /* completed successfully already */
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cctx->connection->log, 0,
+                   "lua_certificate_by_lua: cert cb aborted");
+
+    cctx->aborted = 1;
+    cctx->request->connection->ssl = NULL;
+
+    ngx_http_lua_finalize_fake_request(cctx->request, NGX_ERROR);
+}
+
+
+static u_char *
+ngx_http_lua_log_ssl_cert_error(ngx_log_t *log, u_char *buf, size_t len)
+{
+    u_char              *p;
+    ngx_connection_t    *c;
+
+    if (log->action) {
+        p = ngx_snprintf(buf, len, " while %s", log->action);
+        len -= p - buf;
+        buf = p;
+    }
+
+    p = ngx_snprintf(buf, len, ", context: ssl_certificate_by_lua*");
+    len -= p - buf;
+    buf = p;
+
+    c = log->data;
+
+    if (c->addr_text.len) {
+        p = ngx_snprintf(buf, len, ", client: %V", &c->addr_text);
+        len -= p - buf;
+        buf = p;
+    }
+
+    if (c && c->listening && c->listening->addr_text.len) {
+        p = ngx_snprintf(buf, len, ", server: %V", &c->listening->addr_text);
+        /* len -= p - buf; */
+        buf = p;
+    }
+
+    return buf;
+}
+
+
+static ngx_int_t
+ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
+{
+    int                      co_ref;
+    ngx_int_t                rc;
+    lua_State               *co;
+    ngx_http_lua_ctx_t      *ctx;
+    ngx_http_cleanup_t      *cln;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_http_lua_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+    } else {
+        dd("reset ctx");
+        ngx_http_lua_reset_ctx(r, L, ctx);
+    }
+
+    ctx->entered_content_phase = 1;
+
+    /*  {{{ 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");
+
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    /*  move code closure to new coroutine */
+    lua_xmove(L, co, 1);
+
+    /*  set closure's env table to new coroutine's globals table */
+    ngx_http_lua_get_globals_table(co);
+    lua_setfenv(co, -2);
+
+    /* save nginx request in coroutine globals table */
+    ngx_http_lua_set_req(co, r);
+
+    ctx->cur_co_ctx = &ctx->entry_co_ctx;
+    ctx->cur_co_ctx->co = co;
+    ctx->cur_co_ctx->co_ref = co_ref;
+#ifdef NGX_LUA_USE_ASSERT
+    ctx->cur_co_ctx->co_top = 1;
+#endif
+
+    /* register request cleanup hooks */
+    if (ctx->cleanup == NULL) {
+        cln = ngx_http_cleanup_add(r, 0);
+        if (cln == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        cln->handler = ngx_http_lua_request_cleanup_handler;
+        cln->data = ctx;
+        ctx->cleanup = &cln->handler;
+    }
+
+    ctx->context = NGX_HTTP_LUA_CONTEXT_SSL_CERT;
+
+    rc = ngx_http_lua_run_thread(L, r, ctx, 0);
+
+    if (rc == NGX_ERROR || rc >= NGX_OK) {
+        /* do nothing */
+
+    } else if (rc == NGX_AGAIN) {
+        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 0);
+
+    } else if (rc == NGX_DONE) {
+        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 1);
+
+    } else {
+        rc = NGX_OK;
+    }
+
+    ngx_http_lua_finalize_request(r, rc);
+    return rc;
+}
+
+
+#ifndef NGX_LUA_NO_FFI_API
+
+int
+ngx_http_lua_ffi_ssl_get_tls1_version(ngx_http_request_t *r, char **err)
+{
+#ifndef TLS1_get_version
+
+    *err = "no TLS1 support";
+    return NGX_ERROR;
+
+#else
+
+    ngx_ssl_conn_t    *ssl_conn;
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    dd("tls1 ver: %d", (int) TLS1_get_version(ssl_conn));
+
+    return (int) TLS1_get_version(ssl_conn);
+
+#endif
+}
+
+
+int
+ngx_http_lua_ffi_ssl_clear_certs(ngx_http_request_t *r, char **err)
+{
+#if OPENSSL_VERSION_NUMBER < 0x1000205fL
+
+    *err = "at least OpenSSL 1.0.2e required but found " OPENSSL_VERSION_TEXT;
+    return NGX_ERROR;
+
+#else
+
+    ngx_ssl_conn_t    *ssl_conn;
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    SSL_certs_clear(ssl_conn);
+    return NGX_OK;
+
+#endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
+}
+
+
+int
+ngx_http_lua_ffi_ssl_set_der_certificate(ngx_http_request_t *r,
+    const char *data, size_t len, char **err)
+{
+#if OPENSSL_VERSION_NUMBER < 0x1000205fL
+
+    *err = "at least OpenSSL 1.0.2e required but found " OPENSSL_VERSION_TEXT;
+    return NGX_ERROR;
+
+#else
+
+    BIO               *bio = NULL;
+    X509              *x509 = NULL;
+    ngx_ssl_conn_t    *ssl_conn;
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    bio = BIO_new_mem_buf((char *) data, len);
+    if (bio == NULL) {
+        *err = " BIO_new_mem_buf() failed";
+        goto failed;
+    }
+
+    x509 = d2i_X509_bio(bio, NULL);
+    if (x509 == NULL) {
+        *err = " d2i_X509_bio() failed";
+        goto failed;
+    }
+
+    if (SSL_use_certificate(ssl_conn, x509) == 0) {
+        *err = " SSL_use_certificate() failed";
+        goto failed;
+    }
+
+#if 0
+    if (SSL_set_ex_data(ssl_conn, ngx_ssl_certificate_index, x509) == 0) {
+        *err = " SSL_set_ex_data() failed";
+        goto failed;
+    }
+#endif
+
+    X509_free(x509);
+    x509 = NULL;
+
+    /* read rest of the chain */
+
+    while (!BIO_eof(bio)) {
+
+        x509 = d2i_X509_bio(bio, NULL);
+        if (x509 == NULL) {
+            *err = "d2i_X509_bio() failed";
+            goto failed;
+        }
+
+        if (SSL_add0_chain_cert(ssl_conn, x509) == 0) {
+            *err = "SSL_add0_chain_cert() failed";
+            goto failed;
+        }
+    }
+
+    BIO_free(bio);
+
+    *err = NULL;
+    return NGX_OK;
+
+failed:
+
+    if (bio) {
+        BIO_free(bio);
+    }
+
+    if (x509) {
+        X509_free(x509);
+    }
+
+    return NGX_ERROR;
+
+#endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
+}
+
+
+int
+ngx_http_lua_ffi_ssl_set_der_private_key(ngx_http_request_t *r,
+    const char *data, size_t len, char **err)
+{
+    BIO               *bio = NULL;
+    EVP_PKEY          *pkey = NULL;
+    ngx_ssl_conn_t    *ssl_conn;
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    bio = BIO_new_mem_buf((char *) data, len);
+    if (bio == NULL) {
+        *err = "BIO_new_mem_buf() failed";
+        goto failed;
+    }
+
+    pkey = d2i_PrivateKey_bio(bio, NULL);
+    if (pkey == NULL) {
+        *err = "d2i_PrivateKey_bio() failed";
+        goto failed;
+    }
+
+    if (SSL_use_PrivateKey(ssl_conn, pkey) == 0) {
+        *err = "SSL_CTX_use_PrivateKey() failed";
+        goto failed;
+    }
+
+    EVP_PKEY_free(pkey);
+    BIO_free(bio);
+
+    return NGX_OK;
+
+failed:
+
+    if (pkey) {
+        EVP_PKEY_free(pkey);
+    }
+
+    if (bio) {
+        BIO_free(bio);
+    }
+
+    return NGX_ERROR;
+}
+
+
+int
+ngx_http_lua_ffi_ssl_raw_server_addr(ngx_http_request_t *r, char **addr,
+    size_t *addrlen, int *addrtype, char **err)
+{
+#if (NGX_HAVE_UNIX_DOMAIN)
+    struct sockaddr_un   *saun;
+#endif
+    ngx_ssl_conn_t       *ssl_conn;
+    ngx_connection_t     *c;
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    if (ngx_connection_local_sockaddr(c, NULL, 0) != NGX_OK) {
+        return 0;
+    }
+
+    switch (c->local_sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) c->local_sockaddr;
+        *addrlen = 16;
+        *addr = (char *) &sin6->sin6_addr.s6_addr;
+        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_INET6;
+
+        break;
+#endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+        saun = (struct sockaddr_un *) c->local_sockaddr;
+
+        /* on Linux sockaddr might not include sun_path at all */
+        if (c->local_socklen <= (socklen_t)
+            offsetof(struct sockaddr_un, sun_path))
+        {
+            *addr = "";
+            *addrlen = 0;
+
+        } else {
+            *addr = saun->sun_path;
+            *addrlen = ngx_strlen(saun->sun_path);
+        }
+
+        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_UNIX;
+        break;
+#endif
+
+    default: /* AF_INET */
+        sin = (struct sockaddr_in *) c->local_sockaddr;
+        *addr = (char *) &sin->sin_addr.s_addr;
+        *addrlen = 4;
+        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_INET;
+        break;
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_ssl_server_name(ngx_http_request_t *r, char **name,
+    size_t *namelen, char **err)
+{
+    ngx_ssl_conn_t          *ssl_conn;
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+
+    *name = (char *) SSL_get_servername(ssl_conn, TLSEXT_NAMETYPE_host_name);
+
+    if (*name) {
+        *namelen = ngx_strlen(*name);
+        return NGX_OK;
+    }
+
+    return NGX_DECLINED;
+
+#else
+
+    *err = "no TLS extension support";
+    return NGX_ERROR;
+
+#endif
+}
+
+
+int
+ngx_http_lua_ffi_cert_pem_to_der(const u_char *pem, size_t pem_len, u_char *der,
+    char **err)
+{
+    int       total, len;
+    BIO      *bio;
+    X509     *x509;
+    u_long    n;
+
+    bio = BIO_new_mem_buf((char *) pem, (int) pem_len);
+    if (bio == NULL) {
+        *err = "BIO_new_mem_buf() failed";
+        return NGX_ERROR;
+    }
+
+    x509 = PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL);
+    if (x509 == NULL) {
+        *err = "PEM_read_bio_X509_AUX() failed";
+        return NGX_ERROR;
+    }
+
+    total = i2d_X509(x509, &der);
+    if (total < 0) {
+        X509_free(x509);
+        BIO_free(bio);
+        return NGX_ERROR;
+    }
+
+    X509_free(x509);
+
+    /* read rest of the chain */
+
+    for ( ;; ) {
+
+        x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
+        if (x509 == NULL) {
+            n = ERR_peek_last_error();
+
+            if (ERR_GET_LIB(n) == ERR_LIB_PEM
+                && ERR_GET_REASON(n) == PEM_R_NO_START_LINE)
+            {
+                /* end of file */
+                ERR_clear_error();
+                break;
+            }
+
+            /* some real error */
+
+            *err = "PEM_read_bio_X509() failed";
+            BIO_free(bio);
+            return NGX_ERROR;
+        }
+
+        len = i2d_X509(x509, &der);
+        if (len < 0) {
+            *err = "i2d_X509() failed";
+            X509_free(x509);
+            BIO_free(bio);
+            return NGX_ERROR;
+        }
+
+        total += len;
+
+        X509_free(x509);
+    }
+
+    BIO_free(bio);
+
+    return total;
+}
+
+
+int
+ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
+    u_char *der, char **err)
+{
+    int          len;
+    BIO         *in;
+    RSA         *rsa;
+    EVP_PKEY    *pkey;
+
+    in = BIO_new_mem_buf((char *) pem, (int) pem_len);
+    if (in == NULL) {
+        *err = "BIO_new_mem_buf() failed";
+        return NGX_ERROR;
+    }
+
+    pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, NULL);
+    if (pkey == NULL) {
+        BIO_free(in);
+        *err = "PEM_read_bio_PrivateKey failed";
+        return NGX_ERROR;
+    }
+
+    BIO_free(in);
+
+    rsa = EVP_PKEY_get1_RSA(pkey);
+    if (rsa == NULL) {
+        EVP_PKEY_free(pkey);
+        *err = "EVP_PKEY_get1_RSA failed";
+        return NGX_ERROR;
+    }
+
+    EVP_PKEY_free(pkey);
+
+    len = i2d_RSAPrivateKey(rsa, &der);
+    if (len < 0) {
+        RSA_free(rsa);
+        *err = "i2d_RSAPrivateKey failed";
+        return NGX_ERROR;
+    }
+
+    RSA_free(rsa);
+
+    return len;
+}
+
+
+#endif  /* NGX_LUA_NO_FFI_API */
+
+
+#endif /* NGX_HTTP_SSL */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h
new file mode 100644
index 0000000..11cb963
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h
@@ -0,0 +1,47 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_LUA_SSL_CERTBY_H_INCLUDED_
+#define _NGX_HTTP_LUA_SSL_CERTBY_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+#if (NGX_HTTP_SSL)
+
+
+typedef struct {
+    ngx_connection_t        *connection; /* original true connection */
+    ngx_http_request_t      *request;    /* fake request */
+    int                      exit_code;  /* exit code for openssl's
+                                            set_cert_cb callback */
+    unsigned                 done;       /* :1 */
+    unsigned                 aborted;    /* :1 */
+} ngx_http_lua_ssl_cert_ctx_t;
+
+
+ngx_int_t ngx_http_lua_ssl_cert_handler_inline(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
+
+ngx_int_t ngx_http_lua_ssl_cert_handler_file(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
+
+char *ngx_http_lua_ssl_cert_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+char *ngx_http_lua_ssl_cert_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+int ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data);
+
+
+#endif  /* NGX_HTTP_SSL */
+
+
+#endif /* _NGX_HTTP_LUA_SSL_CERTBY_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
new file mode 100644
index 0000000..9f9e276
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
@@ -0,0 +1,497 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#if (NGX_HTTP_SSL)
+
+
+#include "ngx_http_lua_common.h"
+
+
+#ifndef NGX_LUA_NO_FFI_API
+
+#ifdef NGX_HTTP_LUA_USE_OCSP
+static int ngx_http_lua_ssl_empty_status_callback(ngx_ssl_conn_t *ssl_conn,
+    void *data);
+#endif
+
+
+int
+ngx_http_lua_ffi_ssl_get_ocsp_responder_from_der_chain(
+    const char *chain_data, size_t chain_len, unsigned char *out,
+    size_t *out_size, char **err)
+{
+#ifndef NGX_HTTP_LUA_USE_OCSP
+
+    *err = "no OCSP support";
+    return NGX_ERROR;
+
+#else
+
+    int                        rc = NGX_OK;
+    BIO                       *bio = NULL;
+    char                      *s;
+    X509                      *cert = NULL, *issuer = NULL;
+    size_t                     len;
+    STACK_OF(OPENSSL_STRING)  *aia = NULL;
+
+    /* certificate */
+
+    bio = BIO_new_mem_buf((char *) chain_data, chain_len);
+    if (bio == NULL) {
+        *err = "BIO_new_mem_buf() failed";
+        rc = NGX_ERROR;
+        goto done;
+    }
+
+    cert = d2i_X509_bio(bio, NULL);
+    if (cert == NULL) {
+        *err = "d2i_X509_bio() failed";
+        rc = NGX_ERROR;
+        goto done;
+    }
+
+    /* responder */
+
+    aia = X509_get1_ocsp(cert);
+    if (aia == NULL) {
+        rc = NGX_DECLINED;
+        goto done;
+    }
+
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    s = sk_OPENSSL_STRING_value(aia, 0);
+#else
+    s = sk_value(aia, 0);
+#endif
+    if (s == NULL) {
+        rc = NGX_DECLINED;
+        goto done;
+    }
+
+    len = ngx_strlen(s);
+    if (len > *out_size) {
+        len = *out_size;
+        rc = NGX_BUSY;
+
+    } else {
+        rc = NGX_OK;
+        *out_size = len;
+    }
+
+    ngx_memcpy(out, s, len);
+
+    X509_email_free(aia);
+    aia = NULL;
+
+    /* issuer */
+
+    if (BIO_eof(bio)) {
+        *err = "no issuer certificate in chain";
+        rc = NGX_ERROR;
+        goto done;
+    }
+
+    issuer = d2i_X509_bio(bio, NULL);
+    if (issuer == NULL) {
+        *err = "d2i_X509_bio() failed";
+        rc = NGX_ERROR;
+        goto done;
+    }
+
+    if (X509_check_issued(issuer, cert) != X509_V_OK) {
+        *err = "issuer certificate not next to leaf";
+        rc = NGX_ERROR;
+        goto done;
+    }
+
+    X509_free(issuer);
+    X509_free(cert);
+    BIO_free(bio);
+
+    return rc;
+
+done:
+
+    if (aia) {
+        X509_email_free(aia);
+    }
+
+    if (issuer) {
+        X509_free(issuer);
+    }
+
+    if (cert) {
+        X509_free(cert);
+    }
+
+    if (bio) {
+        BIO_free(bio);
+    }
+
+    return rc;
+
+#endif  /* NGX_HTTP_LUA_USE_OCSP */
+}
+
+
+int
+ngx_http_lua_ffi_ssl_create_ocsp_request(const char *chain_data,
+    size_t chain_len, unsigned char *out, size_t *out_size, char **err)
+{
+#ifndef NGX_HTTP_LUA_USE_OCSP
+
+    *err = "no OCSP support";
+    return NGX_ERROR;
+
+#else
+
+    int                        rc = NGX_ERROR;
+    BIO                       *bio = NULL;
+    X509                      *cert = NULL, *issuer = NULL;
+    size_t                     len;
+    OCSP_CERTID               *id;
+    OCSP_REQUEST              *ocsp = NULL;
+
+    /* certificate */
+
+    bio = BIO_new_mem_buf((char *) chain_data, chain_len);
+    if (bio == NULL) {
+        *err = "BIO_new_mem_buf() failed";
+        goto failed;
+    }
+
+    cert = d2i_X509_bio(bio, NULL);
+    if (cert == NULL) {
+        *err = "d2i_X509_bio() failed";
+        goto failed;
+    }
+
+    if (BIO_eof(bio)) {
+        *err = "no issuer certificate in chain";
+        goto failed;
+    }
+
+    issuer = d2i_X509_bio(bio, NULL);
+    if (issuer == NULL) {
+        *err = "d2i_X509_bio() failed";
+        goto failed;
+    }
+
+    ocsp = OCSP_REQUEST_new();
+    if (ocsp == NULL) {
+        *err = "OCSP_REQUEST_new() failed";
+        goto failed;
+    }
+
+    id = OCSP_cert_to_id(NULL, cert, issuer);
+    if (id == NULL) {
+        *err = "OCSP_cert_to_id() failed";
+        goto failed;
+    }
+
+    if (OCSP_request_add0_id(ocsp, id) == NULL) {
+        *err = "OCSP_request_add0_id() failed";
+        goto failed;
+    }
+
+    len = i2d_OCSP_REQUEST(ocsp, NULL);
+    if (len <= 0) {
+        *err = "i2d_OCSP_REQUEST() failed";
+        goto failed;
+    }
+
+    if (len > *out_size) {
+        *err = "output buffer too small";
+        *out_size = len;
+        rc = NGX_BUSY;
+        goto failed;
+    }
+
+    len = i2d_OCSP_REQUEST(ocsp, &out);
+    if (len <=  0) {
+        *err = "i2d_OCSP_REQUEST() failed";
+        goto failed;
+    }
+
+    *out_size = len;
+
+    OCSP_REQUEST_free(ocsp);
+    X509_free(issuer);
+    X509_free(cert);
+    BIO_free(bio);
+
+    return NGX_OK;
+
+failed:
+
+    if (ocsp) {
+        OCSP_REQUEST_free(ocsp);
+    }
+
+    if (issuer) {
+        X509_free(issuer);
+    }
+
+    if (cert) {
+        X509_free(cert);
+    }
+
+    if (bio) {
+        BIO_free(bio);
+    }
+
+    return rc;
+
+#endif  /* NGX_HTTP_LUA_USE_OCSP */
+}
+
+
+int
+ngx_http_lua_ffi_ssl_validate_ocsp_response(const u_char *resp,
+    size_t resp_len, const char *chain_data, size_t chain_len,
+    u_char *errbuf, size_t *errbuf_size)
+{
+#ifndef NGX_HTTP_LUA_USE_OCSP
+
+    *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                "no OCSP support") - errbuf;
+    return NGX_ERROR;
+
+#else
+
+    int                    n;
+    BIO                   *bio = NULL;
+    X509                  *cert = NULL, *issuer = NULL;
+    OCSP_CERTID           *id = NULL;
+    OCSP_RESPONSE         *ocsp = NULL;
+    OCSP_BASICRESP        *basic = NULL;
+    STACK_OF(X509)        *chain = NULL;
+    ASN1_GENERALIZEDTIME  *thisupdate, *nextupdate;
+
+    ocsp = d2i_OCSP_RESPONSE(NULL, &resp, resp_len);
+    if (ocsp == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "d2i_OCSP_RESPONSE() failed") - errbuf;
+        goto error;
+    }
+
+    n = OCSP_response_status(ocsp);
+
+    if (n != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "OCSP response not successful (%d: %s)",
+                                    n, OCSP_response_status_str(n)) - errbuf;
+        goto error;
+    }
+
+    basic = OCSP_response_get1_basic(ocsp);
+    if (basic == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "OCSP_response_get1_basic() failed")
+                       - errbuf;
+        goto error;
+    }
+
+    /* get issuer certificate from chain */
+
+    bio = BIO_new_mem_buf((char *) chain_data, chain_len);
+    if (bio == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "BIO_new_mem_buf() failed")
+                       - errbuf;
+        goto error;
+    }
+
+    cert = d2i_X509_bio(bio, NULL);
+    if (cert == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "d2i_X509_bio() failed")
+                       - errbuf;
+        goto error;
+    }
+
+    if (BIO_eof(bio)) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "no issuer certificate in chain")
+                       - errbuf;
+        goto error;
+    }
+
+    issuer = d2i_X509_bio(bio, NULL);
+    if (issuer == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "d2i_X509_bio() failed") - errbuf;
+        goto error;
+    }
+
+    chain = sk_X509_new_null();
+    if (chain == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "sk_X509_new_null() failed") - errbuf;
+        goto error;
+    }
+
+    (void) sk_X509_push(chain, issuer);
+
+    if (OCSP_basic_verify(basic, chain, NULL, OCSP_NOVERIFY) != 1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "OCSP_basic_verify() failed") - errbuf;
+        goto error;
+    }
+
+    id = OCSP_cert_to_id(NULL, cert, issuer);
+    if (id == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "OCSP_cert_to_id() failed") - errbuf;
+        goto error;
+    }
+
+    if (OCSP_resp_find_status(basic, id, &n, NULL, NULL,
+                              &thisupdate, &nextupdate)
+        != 1)
+    {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "certificate status not found in the "
+                                    "OCSP response") - errbuf;
+        goto error;
+    }
+
+    if (n != V_OCSP_CERTSTATUS_GOOD) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "certificate status \"%s\" in the OCSP "
+                                    "response", OCSP_cert_status_str(n))
+                       - errbuf;
+        goto error;
+    }
+
+    if (OCSP_check_validity(thisupdate, nextupdate, 300, -1) != 1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "OCSP_check_validity() failed") - errbuf;
+        goto error;
+    }
+
+    sk_X509_free(chain);
+    X509_free(cert);
+    X509_free(issuer);
+    BIO_free(bio);
+    OCSP_CERTID_free(id);
+    OCSP_BASICRESP_free(basic);
+    OCSP_RESPONSE_free(ocsp);
+
+    return NGX_OK;
+
+error:
+
+    if (chain) {
+        sk_X509_free(chain);
+    }
+
+    if (id) {
+        OCSP_CERTID_free(id);
+    }
+
+    if (basic) {
+        OCSP_BASICRESP_free(basic);
+    }
+
+    if (ocsp) {
+        OCSP_RESPONSE_free(ocsp);
+    }
+
+    if (cert) {
+        X509_free(cert);
+    }
+
+    if (issuer) {
+        X509_free(issuer);
+    }
+
+    if (bio) {
+        BIO_free(bio);
+    }
+
+    ERR_clear_error();
+
+    return NGX_ERROR;
+
+#endif  /* NGX_HTTP_LUA_USE_OCSP */
+}
+
+
+#ifdef NGX_HTTP_LUA_USE_OCSP
+static int
+ngx_http_lua_ssl_empty_status_callback(ngx_ssl_conn_t *ssl_conn, void *data)
+{
+    return SSL_TLSEXT_ERR_OK;
+}
+#endif
+
+
+int
+ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
+    const u_char *resp, size_t resp_len, char **err)
+{
+#ifndef NGX_HTTP_LUA_USE_OCSP
+
+    *err = "no OCSP support";
+    return NGX_ERROR;
+
+#else
+
+    u_char                  *p;
+    SSL_CTX                 *ctx;
+    ngx_ssl_conn_t          *ssl_conn;
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    if (ssl_conn->tlsext_status_type == -1) {
+        dd("no ocsp status req from client");
+        return NGX_DECLINED;
+    }
+
+    /* we have to register an empty status callback here otherwise
+     * OpenSSL won't send the response staple. */
+
+    ctx = SSL_get_SSL_CTX(ssl_conn);
+    SSL_CTX_set_tlsext_status_cb(ctx,
+                                 ngx_http_lua_ssl_empty_status_callback);
+
+    p = OPENSSL_malloc(resp_len);
+    if (p == NULL) {
+        *err = "OPENSSL_malloc() failed";
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(p, resp, resp_len);
+
+    dd("set ocsp resp: resp_len=%d", (int) resp_len);
+    (void) SSL_set_tlsext_status_ocsp_resp(ssl_conn, p, resp_len);
+    ssl_conn->tlsext_status_expected = 1;
+
+    return NGX_OK;
+
+#endif  /* NGX_HTTP_LUA_USE_OCSP */
+}
+
+#endif  /* NGX_LUA_NO_FFI_API */
+
+
+#endif  /* NGX_HTTP_SSL */
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 750d95e..241b969 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_string.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_string.c
@@ -548,7 +548,7 @@ ngx_http_lua_ngx_crc32_short(lua_State *L)
 
     if (lua_gettop(L) != 1) {
         return luaL_error(L, "expecting one argument, but got %d",
-                lua_gettop(L));
+                          lua_gettop(L));
     }
 
     p = (u_char *) luaL_checklstring(L, 1, &len);
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 4ac801b..4f8a753 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
@@ -143,6 +143,7 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
     size_t                           sr_headers_len;
     size_t                           sr_bodies_len;
     size_t                           sr_flags_len;
+    size_t                           ofs1, ofs2;
     unsigned                         custom_ctx;
     ngx_http_lua_co_ctx_t           *coctx;
 
@@ -527,23 +528,31 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
             args.len = len;
         }
 
-        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));
+        ofs1 = ngx_align(sizeof(ngx_http_post_subrequest_t), sizeof(void *));
+        ofs2 = ngx_align(sizeof(ngx_http_lua_ctx_t), sizeof(void *));
+
+        p = ngx_palloc(r->pool, ofs1 + ofs2
+                       + sizeof(ngx_http_lua_post_subrequest_data_t));
         if (p == NULL) {
             return luaL_error(L, "no memory");
         }
 
         psr = (ngx_http_post_subrequest_t *) p;
 
-        p += sizeof(ngx_http_post_subrequest_t);
+        p += ofs1;
 
         sr_ctx = (ngx_http_lua_ctx_t *) p;
 
-        p += sizeof(ngx_http_lua_ctx_t);
+        ngx_http_lua_assert((void *) sr_ctx == ngx_align_ptr(sr_ctx,
+                                                             sizeof(void *)));
+
+        p += ofs2;
 
         psr_data = (ngx_http_lua_post_subrequest_data_t *) p;
 
+        ngx_http_lua_assert((void *) psr_data == ngx_align_ptr(psr_data,
+                                                               sizeof(void *)));
+
         ngx_memzero(sr_ctx, sizeof(ngx_http_lua_ctx_t));
 
         /* set by ngx_memzero:
@@ -766,7 +775,7 @@ ngx_http_lua_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method,
 
 static ngx_int_t
 ngx_http_lua_subrequest_add_extra_vars(ngx_http_request_t *sr,
-   ngx_array_t *extra_vars)
+    ngx_array_t *extra_vars)
 {
     ngx_http_core_main_conf_t   *cmcf;
     ngx_http_variable_t         *v;
@@ -1155,11 +1164,11 @@ ngx_http_lua_set_content_length_header(ngx_http_request_t *r, off_t len)
 #if 0
     dd("content length hash: %lu == %lu", (unsigned long) h->hash,
        ngx_hash_key_lc((u_char *) "Content-Length",
-       sizeof("Content-Length") - 1));
+                       sizeof("Content-Length") - 1));
 #endif
 
     dd("r content length: %.*s",
-       (int)r->headers_in.content_length->value.len,
+       (int) r->headers_in.content_length->value.len,
        r->headers_in.content_length->value.data);
 
     pr = r->parent;
@@ -1293,7 +1302,7 @@ ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
             }
 
             dd("checking sr header %.*s", (int) header[i].key.len,
-                    header[i].key.data);
+               header[i].key.data);
 
 #if 1
             if (header[i].hash == 0) {
@@ -1304,7 +1313,7 @@ ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
             header[i].hash = 0;
 
             dd("pushing sr header %.*s", (int) header[i].key.len,
-                    header[i].key.data);
+               header[i].key.data);
 
             lua_pushlstring(co, (char *) header[i].key.data,
                             header[i].key.len); /* header key */
@@ -1434,6 +1443,20 @@ ngx_http_lua_subrequest(ngx_http_request_t *r,
     ngx_http_request_t            *sr;
     ngx_http_core_srv_conf_t      *cscf;
 
+#if nginx_version >= 1009005
+
+    if (r->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,
+                      "lua subrequests cycle while processing \"%V\"", uri);
+        return NGX_ERROR;
+    }
+
+#else  /* nginx_version <= 1009004 */
+
     r->main->subrequests--;
 
     if (r->main->subrequests == 0) {
@@ -1442,11 +1465,13 @@ ngx_http_lua_subrequest(ngx_http_request_t *r,
 #endif
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "subrequests cycle while processing \"%V\"", uri);
+                      "lua subrequests cycle while processing \"%V\"", uri);
         r->main->subrequests = 1;
         return NGX_ERROR;
     }
 
+#endif
+
     sr = ngx_pcalloc(r->pool, sizeof(ngx_http_request_t));
     if (sr == NULL) {
         return NGX_ERROR;
@@ -1508,7 +1533,7 @@ ngx_http_lua_subrequest(ngx_http_request_t *r,
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http subrequest \"%V?%V\"", uri, &sr->args);
+                   "lua 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;
@@ -1537,6 +1562,10 @@ ngx_http_lua_subrequest(ngx_http_request_t *r,
 
     sr->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
 
+#if nginx_version >= 1009005
+    sr->subrequests = r->subrequests - 1;
+#endif
+
     tp = ngx_timeofday();
     sr->start_sec = tp->sec;
     sr->start_msec = tp->msec;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
index 49230f4..393eac7 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
@@ -40,6 +40,8 @@ typedef struct {
 
 
 static int ngx_http_lua_ngx_timer_at(lua_State *L);
+static int ngx_http_lua_ngx_timer_running_count(lua_State *L);
+static int ngx_http_lua_ngx_timer_pending_count(lua_State *L);
 static void ngx_http_lua_timer_handler(ngx_event_t *ev);
 static u_char *ngx_http_lua_log_timer_error(ngx_log_t *log, u_char *buf,
     size_t len);
@@ -49,15 +51,59 @@ static void ngx_http_lua_abort_pending_timers(ngx_event_t *ev);
 void
 ngx_http_lua_inject_timer_api(lua_State *L)
 {
-    lua_createtable(L, 0 /* narr */, 1 /* nrec */);    /* ngx.timer. */
+    lua_createtable(L, 0 /* narr */, 3 /* nrec */);    /* ngx.timer. */
 
     lua_pushcfunction(L, ngx_http_lua_ngx_timer_at);
     lua_setfield(L, -2, "at");
 
+    lua_pushcfunction(L, ngx_http_lua_ngx_timer_running_count);
+    lua_setfield(L, -2, "running_count");
+
+    lua_pushcfunction(L, ngx_http_lua_ngx_timer_pending_count);
+    lua_setfield(L, -2, "pending_count");
+
     lua_setfield(L, -2, "timer");
 }
 
 
+static int
+ngx_http_lua_ngx_timer_running_count(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    r = ngx_http_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request");
+    }
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    lua_pushnumber(L, lmcf->running_timers);
+
+    return 1;
+}
+
+
+static int
+ngx_http_lua_ngx_timer_pending_count(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    r = ngx_http_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request");
+    }
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    lua_pushnumber(L, lmcf->pending_timers);
+
+    return 1;
+}
+
+
 static int
 ngx_http_lua_ngx_timer_at(lua_State *L)
 {
@@ -89,7 +135,7 @@ ngx_http_lua_ngx_timer_at(lua_State *L)
     delay = (ngx_msec_t) (luaL_checknumber(L, 1) * 1000);
 
     luaL_argcheck(L, lua_isfunction(L, 2) && !lua_iscfunction(L, 2), 2,
-                 "Lua function expected");
+                  "Lua function expected");
 
     r = ngx_http_lua_get_req(L);
     if (r == NULL) {
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_uthread.c b/debian/modules/nginx-lua/src/ngx_http_lua_uthread.c
index de7a72c..8195ec0 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_uthread.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_uthread.c
@@ -126,7 +126,8 @@ ngx_http_lua_uthread_wait(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     coctx = ctx->cur_co_ctx;
 
@@ -223,7 +224,8 @@ ngx_http_lua_uthread_kill(lua_State *L)
     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_CONTEXT_TIMER);
+                               | NGX_HTTP_LUA_CONTEXT_TIMER
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     coctx = ctx->cur_co_ctx;
 
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 65916be..afb7655 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_util.c
@@ -49,6 +49,7 @@
 #include "ngx_http_lua_config.h"
 #include "ngx_http_lua_worker.h"
 #include "ngx_http_lua_socket_tcp.h"
+#include "ngx_http_lua_ssl_certby.h"
 
 
 #if 1
@@ -111,7 +112,6 @@ 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);
 static void ngx_http_lua_close_fake_request(ngx_http_request_t *r);
-static void ngx_http_lua_free_fake_request(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_flush_pending_output(ngx_http_request_t *r,
     ngx_http_lua_ctx_t *ctx);
 static ngx_int_t
@@ -139,7 +139,7 @@ ngx_http_lua_set_path(ngx_cycle_t *cycle, lua_State *L, int tab_idx,
 
     /* XXX here we use some hack to simplify string manipulation */
     tmp_path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP,
-            LUA_PATH_SEP AUX_MARK LUA_PATH_SEP);
+                         LUA_PATH_SEP AUX_MARK LUA_PATH_SEP);
 
     lua_pushlstring(L, (char *) cycle->prefix.data, cycle->prefix.len);
     prefix = lua_tostring(L, -1);
@@ -719,7 +719,7 @@ static void
 ngx_http_lua_inject_ngx_api(lua_State *L, ngx_http_lua_main_conf_t *lmcf,
     ngx_log_t *log)
 {
-    lua_createtable(L, 0 /* narr */, 99 /* nrec */);    /* ngx.* */
+    lua_createtable(L, 0 /* narr */, 116 /* nrec */);    /* ngx.* */
 
     lua_pushcfunction(L, ngx_http_lua_get_raw_phase_context);
     lua_setfield(L, -2, "_phase_ctx");
@@ -926,7 +926,7 @@ ngx_http_lua_request_cleanup(ngx_http_lua_ctx_t *ctx, int forcible)
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
 #if 1
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         /* being a fake request */
         lmcf->running_timers--;
     }
@@ -1480,7 +1480,9 @@ no_parent:
 
 done:
 
-    if (ctx->entered_content_phase && r->connection->fd != -1) {
+    if (ctx->entered_content_phase
+        && r->connection->fd != (ngx_socket_t) -1)
+    {
         rc = ngx_http_lua_send_chain_link(r, ctx,
                                           NULL /* last_buf */);
 
@@ -2090,7 +2092,7 @@ ngx_http_lua_inject_req_api(ngx_log_t *log, lua_State *L)
 {
     /* ngx.req table */
 
-    lua_createtable(L, 0 /* narr */, 23 /* nrec */);    /* .req */
+    lua_createtable(L, 0 /* narr */, 24 /* nrec */);    /* .req */
 
     ngx_http_lua_inject_req_header_api(L);
     ngx_http_lua_inject_req_uri_api(log, L);
@@ -2099,6 +2101,7 @@ ngx_http_lua_inject_req_api(ngx_log_t *log, lua_State *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);
+    ngx_http_lua_inject_req_misc_api(L);
 
     lua_setfield(L, -2, "req");
 }
@@ -2169,7 +2172,7 @@ 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);
+       ctx->exec_uri.data);
 
     r->write_event_handler = ngx_http_request_empty_handler;
 
@@ -2182,7 +2185,7 @@ ngx_http_lua_handle_exec(lua_State *L, ngx_http_request_t *r,
     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);
+       "%d", (int) rc, ctx->entered_content_phase);
 
     if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
         return rc;
@@ -2212,16 +2215,6 @@ ngx_http_lua_handle_exit(lua_State *L, ngx_http_request_t *r,
                    "lua thread aborting request with status %d",
                    ctx->exit_code);
 
-#if 1
-    if (!r->header_sent
-        && !ctx->header_sent
-        && r->headers_out.status == 0
-        && ctx->exit_code >= NGX_HTTP_OK)
-    {
-        r->headers_out.status = ctx->exit_code;
-    }
-#endif
-
     ngx_http_lua_cleanup_pending_operation(ctx->cur_co_ctx);
 
     ngx_http_lua_probe_coroutine_done(r, ctx->cur_co_ctx->co, 1);
@@ -2234,6 +2227,20 @@ ngx_http_lua_handle_exit(lua_State *L, ngx_http_request_t *r,
 
     ngx_http_lua_request_cleanup(ctx, 0);
 
+    if (r->connection->fd == (ngx_socket_t) -1) {  /* fake request */
+        return ctx->exit_code;
+    }
+
+#if 1
+    if (!r->header_sent
+        && !ctx->header_sent
+        && r->headers_out.status == 0
+        && ctx->exit_code >= NGX_HTTP_OK)
+    {
+        r->headers_out.status = ctx->exit_code;
+    }
+#endif
+
     if (ctx->buffering
         && r->headers_out.status
         && ctx->exit_code != NGX_ERROR
@@ -2326,7 +2333,7 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
             value = (u_char *) lua_tolstring(L, -1, &value_len);
 
             total_escape += 2 * ngx_http_lua_escape_uri(NULL, value, value_len,
-                    NGX_ESCAPE_URI);
+                                                        NGX_ESCAPE_URI);
 
             len += key_len + value_len + (sizeof("=") - 1);
             n++;
@@ -2548,7 +2555,7 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
 
     if (p - args->data != (ssize_t) len) {
         luaL_error(L, "buffer error: %d != %d",
-                (int) (p - args->data), (int) len);
+                   (int) (p - args->data), (int) len);
         return;
     }
 }
@@ -3523,7 +3530,7 @@ ngx_http_lua_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         ngx_http_lua_cleanup_pending_operation(ctx->cur_co_ctx);
     }
 
-    if (r->connection->fd != -1) {
+    if (r->connection->fd != (ngx_socket_t) -1) {
         ngx_http_finalize_request(r, rc);
         return;
     }
@@ -3536,6 +3543,11 @@ void
 ngx_http_lua_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc)
 {
     ngx_connection_t          *c;
+#if (NGX_HTTP_SSL)
+    ngx_ssl_conn_t            *ssl_conn;
+
+    ngx_http_lua_ssl_cert_ctx_t     *cctx;
+#endif
 
     c = r->connection;
 
@@ -3549,6 +3561,25 @@ ngx_http_lua_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc)
     }
 
     if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+
+#if (NGX_HTTP_SSL)
+
+        if (r->connection->ssl) {
+            ssl_conn = r->connection->ssl->connection;
+            if (ssl_conn) {
+                c = ngx_ssl_get_connection(ssl_conn);
+
+                if (c && c->ssl) {
+                    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
+                    if (cctx != NULL) {
+                        cctx->exit_code = 0;
+                    }
+                }
+            }
+        }
+
+#endif
+
         ngx_http_lua_close_fake_request(r);
         return;
     }
@@ -3593,7 +3624,7 @@ ngx_http_lua_close_fake_request(ngx_http_request_t *r)
 }
 
 
-static void
+void
 ngx_http_lua_free_fake_request(ngx_http_request_t *r)
 {
     ngx_log_t                 *log;
@@ -3610,10 +3641,15 @@ ngx_http_lua_free_fake_request(ngx_http_request_t *r)
         return;
     }
 
-    for (cln = r->cleanup; cln; cln = cln->next) {
+    cln = r->cleanup;
+    r->cleanup = NULL;
+
+    while (cln) {
         if (cln->handler) {
             cln->handler(cln->data);
         }
+
+        cln = cln->next;
     }
 
     r->request_line.len = 0;
@@ -3628,8 +3664,8 @@ ngx_http_lua_close_fake_connection(ngx_connection_t *c)
     ngx_pool_t          *pool;
     ngx_connection_t    *saved_c = NULL;
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http lua close fake http connection");
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http lua close fake http connection %p", c);
 
     c->destroyed = 1;
 
@@ -3819,6 +3855,8 @@ ngx_http_lua_create_fake_connection(ngx_pool_t *pool)
 
     c->error = 1;
 
+    dd("created fake connection: %p", c);
+
     return c;
 
 failed:
@@ -3878,7 +3916,7 @@ ngx_http_lua_create_fake_request(ngx_connection_t *c)
     cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
 
     r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts
-                                        * sizeof(ngx_http_variable_value_t));
+                               * sizeof(ngx_http_variable_value_t));
     if (r->variables == NULL) {
         goto failed;
     }
@@ -3905,6 +3943,8 @@ ngx_http_lua_create_fake_request(ngx_connection_t *c)
     r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
     r->discard_body = 1;
 
+    dd("created fake request %p", r);
+
     return r;
 }
 
@@ -3980,4 +4020,78 @@ ngx_http_lua_get_raw_phase_context(lua_State *L)
     return 1;
 }
 
+
+ngx_http_cleanup_t *
+ngx_http_lua_cleanup_add(ngx_http_request_t *r, size_t size)
+{
+    ngx_http_cleanup_t  *cln;
+    ngx_http_lua_ctx_t  *ctx;
+
+    if (size == 0) {
+        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+        r = r->main;
+
+        if (ctx != NULL && ctx->free_cleanup) {
+            cln = ctx->free_cleanup;
+            ctx->free_cleanup = cln->next;
+
+            dd("reuse cleanup: %p", cln);
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua http cleanup reuse: %p", cln);
+
+            cln->handler = NULL;
+            cln->next = r->cleanup;
+
+            r->cleanup = cln;
+
+            return cln;
+        }
+    }
+
+    return ngx_http_cleanup_add(r, size);
+}
+
+
+void
+ngx_http_lua_cleanup_free(ngx_http_request_t *r, ngx_http_cleanup_pt *cleanup)
+{
+    ngx_http_cleanup_t  **last;
+    ngx_http_cleanup_t   *cln;
+    ngx_http_lua_ctx_t   *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    r = r->main;
+
+    cln = (ngx_http_cleanup_t *)
+              ((u_char *) cleanup - offsetof(ngx_http_cleanup_t, handler));
+
+    dd("cln: %p, cln->handler: %p, &cln->handler: %p",
+       cln, cln->handler, &cln->handler);
+
+    last = &r->cleanup;
+
+    while (*last) {
+        if (*last == cln) {
+            *last = cln->next;
+
+            cln->next = ctx->free_cleanup;
+            ctx->free_cleanup = cln;
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua http cleanup free: %p", cln);
+
+            return;
+        }
+
+        last = &(*last)->next;
+    }
+}
+
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
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 42ba07e..f0e8923 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_util.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_util.h
@@ -82,8 +82,11 @@ extern char ngx_http_lua_headers_metatable_key;
      : (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*"   \
+     : (c) == NGX_HTTP_LUA_CONTEXT_BODY_FILTER ? "body_filter_by_lua*"       \
      : (c) == NGX_HTTP_LUA_CONTEXT_TIMER ? "ngx.timer"                       \
      : (c) == NGX_HTTP_LUA_CONTEXT_INIT_WORKER ? "init_worker_by_lua*"       \
+     : (c) == NGX_HTTP_LUA_CONTEXT_BALANCER ? "balancer_by_lua*"             \
+     : (c) == NGX_HTTP_LUA_CONTEXT_SSL_CERT ? "ssl_certificate_by_lua*"      \
      : "(unknown)")
 
 
@@ -114,18 +117,22 @@ ngx_http_lua_ffi_check_context(ngx_http_lua_ctx_t *ctx, unsigned flags,
 
 
 #define ngx_http_lua_check_fake_request(L, r)                                \
-    if ((r)->connection->fd == -1) {                                         \
+    if ((r)->connection->fd == (ngx_socket_t) -1) {                          \
         return luaL_error(L, "API disabled in the current context");         \
     }
 
 
 #define ngx_http_lua_check_fake_request2(L, r, ctx)                          \
-    if ((r)->connection->fd == -1) {                                         \
+    if ((r)->connection->fd == (ngx_socket_t) -1) {                          \
         return luaL_error(L, "API disabled in the context of %s",            \
                           ngx_http_lua_context_name((ctx)->context));        \
     }
 
 
+#define ngx_http_lua_ssl_get_ctx(ssl_conn)                                   \
+    SSL_get_ex_data(ssl_conn, ngx_http_lua_ssl_ctx_index)
+
+
 lua_State *ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
     ngx_pool_t *pool, ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log,
     ngx_pool_cleanup_t **pcln);
@@ -216,6 +223,8 @@ void ngx_http_lua_finalize_fake_request(ngx_http_request_t *r,
 
 void ngx_http_lua_close_fake_connection(ngx_connection_t *c);
 
+void ngx_http_lua_free_fake_request(ngx_http_request_t *r);
+
 void ngx_http_lua_release_ngx_ctx_table(ngx_log_t *log, lua_State *L,
     ngx_http_lua_ctx_t *ctx);
 
@@ -230,6 +239,12 @@ ngx_int_t ngx_http_lua_report(ngx_log_t *log, lua_State *L, int status,
 
 int ngx_http_lua_do_call(ngx_log_t *log, lua_State *L);
 
+ngx_http_cleanup_t *ngx_http_lua_cleanup_add(ngx_http_request_t *r,
+    size_t size);
+
+void ngx_http_lua_cleanup_free(ngx_http_request_t *r,
+    ngx_http_cleanup_pt *cleanup);
+
 
 #define ngx_http_lua_check_if_abortable(L, ctx)                             \
     if ((ctx)->no_abort) {                                                  \
@@ -266,7 +281,7 @@ ngx_http_lua_create_ctx(ngx_http_request_t *r)
     ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
 
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-    if (!llcf->enable_code_cache && r->connection->fd != -1) {
+    if (!llcf->enable_code_cache && r->connection->fd != (ngx_socket_t) -1) {
         lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
         dd("lmcf: %p", lmcf);
@@ -418,6 +433,7 @@ ngx_http_lua_get_flush_chain(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 
 extern ngx_uint_t  ngx_http_lua_location_hash;
 extern ngx_uint_t  ngx_http_lua_content_length_hash;
+extern int         ngx_http_lua_ssl_ctx_index;
 
 
 #endif /* _NGX_HTTP_LUA_UTIL_H_INCLUDED_ */
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 67ba86d..0de9312 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_variable.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_variable.c
@@ -307,7 +307,7 @@ ngx_http_lua_ffi_var_get(ngx_http_request_t *r, u_char *name_data,
         return NGX_ERROR;
     }
 
-    if ((r)->connection->fd == -1) {
+    if ((r)->connection->fd == (ngx_socket_t) -1) {
         *err = "API disabled in the current context";
         return NGX_ERROR;
     }
@@ -377,7 +377,7 @@ ngx_http_lua_ffi_var_set(ngx_http_request_t *r, u_char *name_data,
         return NGX_ERROR;
     }
 
-    if ((r)->connection->fd == -1) {
+    if ((r)->connection->fd == (ngx_socket_t) -1) {
         ngx_snprintf(errbuf, errlen, "API disabled in the current context");
         return NGX_ERROR;
     }
@@ -405,8 +405,8 @@ ngx_http_lua_ffi_var_set(ngx_http_request_t *r, u_char *name_data,
             dd("set variables with set_handler");
 
             if (value != NULL && value_len) {
-                vv = ngx_pnalloc(r->pool, sizeof(ngx_http_variable_value_t)
-                                 + value_len);
+                vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t)
+                                + value_len);
                 if (vv == NULL) {
                     goto nomem;
                 }
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_worker.c b/debian/modules/nginx-lua/src/ngx_http_lua_worker.c
index f9c4a44..44faf48 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_worker.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_worker.c
@@ -15,12 +15,14 @@
 
 static int ngx_http_lua_ngx_worker_exiting(lua_State *L);
 static int ngx_http_lua_ngx_worker_pid(lua_State *L);
+static int ngx_http_lua_ngx_worker_id(lua_State *L);
+static int ngx_http_lua_ngx_worker_count(lua_State *L);
 
 
 void
 ngx_http_lua_inject_worker_api(lua_State *L)
 {
-    lua_createtable(L, 0 /* narr */, 2 /* nrec */);    /* ngx.worker. */
+    lua_createtable(L, 0 /* narr */, 4 /* nrec */);    /* ngx.worker. */
 
     lua_pushcfunction(L, ngx_http_lua_ngx_worker_exiting);
     lua_setfield(L, -2, "exiting");
@@ -28,6 +30,12 @@ ngx_http_lua_inject_worker_api(lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_ngx_worker_pid);
     lua_setfield(L, -2, "pid");
 
+    lua_pushcfunction(L, ngx_http_lua_ngx_worker_id);
+    lua_setfield(L, -2, "id");
+
+    lua_pushcfunction(L, ngx_http_lua_ngx_worker_count);
+    lua_setfield(L, -2, "count");
+
     lua_setfield(L, -2, "worker");
 }
 
@@ -48,6 +56,31 @@ ngx_http_lua_ngx_worker_pid(lua_State *L)
 }
 
 
+static int
+ngx_http_lua_ngx_worker_id(lua_State *L)
+{
+#if (nginx_version >= 1009001)
+    lua_pushinteger(L, (lua_Integer) ngx_worker);
+#else
+    lua_pushnil(L);
+#endif
+    return 1;
+}
+
+
+static int
+ngx_http_lua_ngx_worker_count(lua_State *L)
+{
+    ngx_core_conf_t   *ccf;
+
+    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                           ngx_core_module);
+
+    lua_pushinteger(L, (lua_Integer) ccf->worker_processes);
+    return 1;
+}
+
+
 #ifndef NGX_LUA_NO_FFI_API
 int
 ngx_http_lua_ffi_worker_pid(void)
@@ -56,9 +89,32 @@ ngx_http_lua_ffi_worker_pid(void)
 }
 
 
+int
+ngx_http_lua_ffi_worker_id(void)
+{
+#if (nginx_version >= 1009001)
+    return (int) ngx_worker;
+#else
+    return -1;
+#endif
+}
+
+
 int
 ngx_http_lua_ffi_worker_exiting(void)
 {
     return (int) ngx_exiting;
 }
+
+
+int
+ngx_http_lua_ffi_worker_count(void)
+{
+    ngx_core_conf_t   *ccf;
+
+    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                           ngx_core_module);
+
+    return (int) ccf->worker_processes;
+}
 #endif
diff --git a/debian/modules/nginx-lua/t/020-subrequest.t b/debian/modules/nginx-lua/t/020-subrequest.t
index 21e728d..88ac1b4 100644
--- a/debian/modules/nginx-lua/t/020-subrequest.t
+++ b/debian/modules/nginx-lua/t/020-subrequest.t
@@ -11,7 +11,7 @@ use Test::Nginx::Socket::Lua;
 no_root_location;
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 22);
+plan tests => repeat_each() * (blocks() * 3 + 23);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
@@ -42,6 +42,8 @@ __DATA__
 GET /lua
 --- response_body
 DELETE
+--- error_log
+lua http subrequest "/other?"
 --- no_error_log
 [error]
 
@@ -1059,7 +1061,7 @@ hello, world
     GET /t
 --- ignore_response
 --- error_log
-subrequests cycle while processing "/t"
+lua subrequests cycle while processing "/t"
 
 
 
diff --git a/debian/modules/nginx-lua/t/022-redirect.t b/debian/modules/nginx-lua/t/022-redirect.t
index 0e2a107..57c7add 100644
--- a/debian/modules/nginx-lua/t/022-redirect.t
+++ b/debian/modules/nginx-lua/t/022-redirect.t
@@ -9,7 +9,7 @@ use Test::Nginx::Socket::Lua;
 repeat_each(2);
 #repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 3 + 1);
+plan tests => repeat_each() * (blocks() * 3 + 2);
 
 #no_diff();
 #no_long_string();
@@ -83,6 +83,8 @@ GET /read
 !Location
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
+--- error_log
+only ngx.HTTP_MOVED_TEMPORARILY, ngx.HTTP_MOVED_PERMANENTLY, and ngx.HTTP_TEMPORARY_REDIRECT are allowed
 
 
 
@@ -166,3 +168,53 @@ Location: http://agentzh.org/foo?bar=3
 --- response_body eval
 [qr/302 Found/, qr/302 Found/]
 
+
+
+=== TEST 9: explicit 307
+--- config
+    location /read {
+        content_by_lua '
+            ngx.redirect("http://agentzh.org/foo", ngx.HTTP_TEMPORARY_REDIRECT);
+            ngx.say("hi")
+        ';
+    }
+--- request
+GET /read
+--- response_headers
+Location: http://agentzh.org/foo
+--- response_body_like: 307 Temporary Redirect
+--- error_code: 307
+
+
+
+=== TEST 10: explicit 307 with args
+--- config
+    location /read {
+        content_by_lua '
+            ngx.redirect("http://agentzh.org/foo?a=b&c=d", ngx.HTTP_TEMPORARY_REDIRECT);
+            ngx.say("hi")
+        ';
+    }
+--- request
+GET /read
+--- response_headers
+Location: http://agentzh.org/foo?a=b&c=d
+--- response_body_like: 307 Temporary Redirect
+--- error_code: 307
+
+
+
+=== TEST 11: explicit 307
+--- config
+    location /read {
+        content_by_lua '
+            ngx.redirect("http://agentzh.org/foo?a=b&c=d", 307);
+            ngx.say("hi")
+        ';
+    }
+--- request
+GET /read
+--- response_headers
+Location: http://agentzh.org/foo?a=b&c=d
+--- response_body_like: 307 Temporary Redirect
+--- error_code: 307
diff --git a/debian/modules/nginx-lua/t/028-req-header.t b/debian/modules/nginx-lua/t/028-req-header.t
index 77c0b06..fd13cba 100644
--- a/debian/modules/nginx-lua/t/028-req-header.t
+++ b/debian/modules/nginx-lua/t/028-req-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 26);
+plan tests => repeat_each() * (2 * blocks() + 28);
 
 #no_diff();
 #no_long_string();
@@ -1532,3 +1532,53 @@ MOVE /a.txt
 client sent no "Destination" header
 [error]
 --- error_code: 204
+
+
+
+=== TEST 50: X-Forwarded-For
+--- config
+    location = /t {
+        access_by_lua_block {
+            ngx.req.set_header("X-Forwarded-For", "8.8.8.8")
+        }
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Foo $proxy_add_x_forwarded_for;
+    }
+
+    location = /back {
+        echo "Foo: $http_foo";
+    }
+
+--- request
+GET /t
+
+--- response_body
+Foo: 8.8.8.8, 127.0.0.1
+--- no_error_log
+[error]
+
+
+
+=== TEST 51: X-Forwarded-For
+--- config
+    location = /t {
+        access_by_lua_block {
+            ngx.req.clear_header("X-Forwarded-For")
+        }
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Foo $proxy_add_x_forwarded_for;
+    }
+
+    location = /back {
+        echo "Foo: $http_foo";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+X-Forwarded-For: 8.8.8.8
+--- response_body
+Foo: 127.0.0.1
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/056-flush.t b/debian/modules/nginx-lua/t/056-flush.t
index 260e39a..d189cd5 100644
--- a/debian/modules/nginx-lua/t/056-flush.t
+++ b/debian/modules/nginx-lua/t/056-flush.t
@@ -42,7 +42,7 @@ hiya
 --- no_error_log
 [error]
 --- error_log
-lua reuse free buf memory 13 >= 5
+lua reuse free buf chain, but reallocate memory because 5 >= 0
 
 
 
diff --git a/debian/modules/nginx-lua/t/058-tcp-socket.t b/debian/modules/nginx-lua/t/058-tcp-socket.t
index 145a07b..3368589 100644
--- a/debian/modules/nginx-lua/t/058-tcp-socket.t
+++ b/debian/modules/nginx-lua/t/058-tcp-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 175;
+plan tests => repeat_each() * 187;
 
 our $HtmlDir = html_dir;
 
@@ -3343,3 +3343,298 @@ failed to setkeepalive: closed
 lua tcp socket connect timeout: 100
 --- timeout: 10
 
+
+
+=== TEST 56: reuse cleanup
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            for i = 1, 2 do
+                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)
+
+                while true do
+                    local line, err, part = sock:receive()
+                    if not line then
+                        ngx.say("failed to receive a line: ", err, " [", part, "]")
+                        break
+                    end
+                end
+
+                ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end
+        }
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+failed to receive a line: closed []
+close: 1 nil
+connected: 1
+request sent: 57
+failed to receive a line: closed []
+close: 1 nil
+--- error_log
+lua http cleanup reuse
+
+
+
+=== TEST 57: reuse cleanup in ngx.timer (fake_request)
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua_block {
+            local total_send_bytes = 0
+            local port = ngx.var.port
+
+            local function network()
+                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 = "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.log(ngx.ERR, "failed to send request: ", err)
+                    return
+                end
+
+                total_send_bytes = total_send_bytes + bytes
+
+                while true do
+                    local line, err, part = sock:receive()
+                    if not line then
+                        break
+                    end
+                end
+
+                ok, err = sock:close()
+            end
+
+            local done = false
+
+            local function double_network()
+                network()
+                network()
+                done = true
+            end
+
+            local ok, err = ngx.timer.at(0, double_network)
+            if not ok then
+                ngx.say("failed to create timer: ", err)
+            end
+
+            i = 1
+            while not done do
+                local time = 0.005 * i
+                if time > 0.1 then
+                    time = 0.1
+                end
+                ngx.sleep(time)
+                i = i + 1
+            end
+
+            collectgarbage("collect")
+
+            ngx.say("total_send_bytes: ", total_send_bytes)
+        }
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+
+--- request
+GET /t
+--- response_body
+total_send_bytes: 114
+--- error_log
+lua http cleanup reuse
+
+
+
+=== TEST 58: free cleanup in ngx.timer (without sock:close)
+--- config
+    server_tokens off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua_block {
+            local total_send_bytes = 0
+            local port = ngx.var.port
+
+            local function network()
+                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 = "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.log(ngx.ERR, "failed to send request: ", err)
+                    return
+                end
+
+                total_send_bytes = total_send_bytes + bytes
+
+                while true do
+                    local line, err, part = sock:receive()
+                    if not line then
+                        break
+                    end
+                end
+            end
+
+            local done = false
+
+            local function double_network()
+                network()
+                network()
+                done = true
+            end
+
+            local ok, err = ngx.timer.at(0, double_network)
+            if not ok then
+                ngx.say("failed to create timer: ", err)
+            end
+
+            i = 1
+            while not done do
+                local time = 0.005 * i
+                if time > 0.1 then
+                    time = 0.1
+                end
+                ngx.sleep(time)
+                i = i + 1
+            end
+
+            collectgarbage("collect")
+
+            ngx.say("total_send_bytes: ", total_send_bytes)
+        }
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+
+--- request
+GET /t
+--- response_body
+total_send_bytes: 114
+--- no_error_log
+[error]
+
+
+
+=== TEST 59: reuse cleanup in subrequest
+--- config
+    server_tokens off;
+    location /t {
+        echo_location /tt;
+    }
+
+    location /tt {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua '
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            for i = 1, 2 do
+                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)
+
+                while true do
+                    local line, err, part = sock:receive()
+                    if not line then
+                        ngx.say("failed to receive a line: ", err, " [", part, "]")
+                        break
+                    end
+                end
+
+                ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end
+        ';
+    }
+
+    location /foo {
+        content_by_lua 'ngx.say("foo")';
+        more_clear_headers Date;
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 57
+failed to receive a line: closed []
+close: 1 nil
+connected: 1
+request sent: 57
+failed to receive a line: closed []
+close: 1 nil
+--- error_log
+lua http cleanup reuse
diff --git a/debian/modules/nginx-lua/t/062-count.t b/debian/modules/nginx-lua/t/062-count.t
index 120d131..c94491c 100644
--- a/debian/modules/nginx-lua/t/062-count.t
+++ b/debian/modules/nginx-lua/t/062-count.t
@@ -34,7 +34,7 @@ __DATA__
 --- request
 GET /test
 --- response_body
-ngx: 99
+ngx: 116
 --- no_error_log
 [error]
 
@@ -55,7 +55,7 @@ ngx: 99
 --- request
 GET /test
 --- response_body
-99
+116
 --- no_error_log
 [error]
 
@@ -83,7 +83,7 @@ GET /test
 --- request
 GET /test
 --- response_body
-n = 99
+n = 116
 --- no_error_log
 [error]
 
@@ -123,7 +123,7 @@ n = 1
 --- request
 GET /test
 --- response_body
-n = 23
+n = 24
 --- no_error_log
 [error]
 
@@ -145,7 +145,7 @@ n = 23
 --- request
 GET /test
 --- response_body
-n = 23
+n = 24
 --- no_error_log
 [error]
 
@@ -172,7 +172,7 @@ n = 23
 --- request
 GET /test
 --- response_body
-n = 23
+n = 24
 --- no_error_log
 [error]
 
@@ -305,7 +305,7 @@ GET /t
 --- response_body_like: 404 Not Found
 --- error_code: 404
 --- error_log
-ngx. entry count: 99
+ngx. entry count: 116
 
 
 
@@ -323,7 +323,7 @@ ngx. entry count: 99
 --- request
 GET /test
 --- response_body
-n = 1
+n = 3
 --- no_error_log
 [error]
 
@@ -438,7 +438,7 @@ thread: 3
 --- request
 GET /test
 --- response_body
-worker: 2
+worker: 4
 --- no_error_log
 [error]
 
diff --git a/debian/modules/nginx-lua/t/076-no-postpone.t b/debian/modules/nginx-lua/t/076-no-postpone.t
index d19bb77..94da63a 100644
--- a/debian/modules/nginx-lua/t/076-no-postpone.t
+++ b/debian/modules/nginx-lua/t/076-no-postpone.t
@@ -9,7 +9,7 @@ use Test::Nginx::Socket::Lua;
 repeat_each(2);
 #repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 3);
+plan tests => repeat_each() * (blocks() * 3 + 1);
 
 #no_diff();
 #no_long_string();
@@ -82,3 +82,65 @@ no foo: 1
 --- no_error_log
 [error]
 
+
+
+=== TEST 4: access no postpone on
+--- http_config
+    access_by_lua_no_postpone on;
+--- config
+    location /t {
+        access_by_lua '
+            ngx.redirect("http://www.taobao.com/foo")
+            ngx.say("hi")
+        ';
+        content_by_lua 'return';
+        deny all;
+    }
+--- request
+GET /t
+--- response_headers
+Location: http://www.taobao.com/foo
+--- response_body_like: 302 Found
+--- error_code: 302
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: access no postpone explicitly off
+--- http_config
+    access_by_lua_no_postpone off;
+--- config
+    location /t {
+        access_by_lua '
+            ngx.redirect("http://www.taobao.com/foo")
+            ngx.say("hi")
+        ';
+        content_by_lua 'return';
+        deny all;
+    }
+--- request
+GET /t
+--- response_body_like: 403 Forbidden
+--- error_code: 403
+--- error_log
+access forbidden by rule
+
+
+
+=== TEST 6: access no postpone off by default
+--- config
+    location /t {
+        access_by_lua '
+            ngx.redirect("http://www.taobao.com/foo")
+            ngx.say("hi")
+        ';
+        content_by_lua 'return';
+        deny all;
+    }
+--- request
+GET /t
+--- response_body_like: 403 Forbidden
+--- error_code: 403
+--- error_log
+access forbidden by rule
diff --git a/debian/modules/nginx-lua/t/082-body-filter.t b/debian/modules/nginx-lua/t/082-body-filter.t
index c0a7c23..98efa84 100644
--- a/debian/modules/nginx-lua/t/082-body-filter.t
+++ b/debian/modules/nginx-lua/t/082-body-filter.t
@@ -10,7 +10,7 @@ log_level('debug');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 13);
+plan tests => repeat_each() * (blocks() * 3 + 11);
 
 #no_diff();
 no_long_string();
@@ -824,3 +824,16 @@ eof 2: true
 [error]
 [alert]
 
+
+
+=== TEST 26: no ngx.print
+--- config
+    location /lua {
+        echo ok;
+        body_filter_by_lua "ngx.print(32) return 1";
+    }
+--- request
+GET /lua
+--- ignore_response
+--- error_log
+API disabled in the context of body_filter_by_lua*
diff --git a/debian/modules/nginx-lua/t/129-ssl-socket.t b/debian/modules/nginx-lua/t/129-ssl-socket.t
index 45eaa82..446cfeb 100644
--- a/debian/modules/nginx-lua/t/129-ssl-socket.t
+++ b/debian/modules/nginx-lua/t/129-ssl-socket.t
@@ -371,11 +371,12 @@ lua ssl free session
 
 
 === TEST 5: certificate does not match host name (verify)
+The certificate for "blah.agentzh.org" does not contain the name "blah.agentzh.org".
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER;
     lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 2;
+    lua_ssl_verify_depth 5;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -393,14 +394,14 @@ lua ssl free session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "agentzh.org", true)
+                local session, err = sock:sslhandshake(nil, "blah.agentzh.org", true)
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                 else
                     ngx.say("ssl handshake: ", type(session))
                 end
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -439,8 +440,8 @@ failed to send http request: closed
 --- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 --- grep_error_log_out
 --- error_log
-lua ssl server name: "agentzh.org"
-lua ssl certificate does not match host "agentzh.org"
+lua ssl server name: "blah.agentzh.org"
+lua ssl certificate does not match host "blah.agentzh.org"
 --- no_error_log
 SSL reused session
 [alert]
@@ -449,6 +450,7 @@ SSL reused session
 
 
 === TEST 6: certificate does not match host name (verify, no log socket errors)
+The certificate for "blah.agentzh.org" does not contain the name "blah.agentzh.org".
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER;
@@ -472,14 +474,14 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "agentzh.org", true)
+                local session, err = sock:sslhandshake(nil, "blah.agentzh.org", true)
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                 else
                     ngx.say("ssl handshake: ", type(session))
                 end
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: blah.agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -518,7 +520,7 @@ failed to send http request: closed
 --- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 --- grep_error_log_out
 --- error_log
-lua ssl server name: "agentzh.org"
+lua ssl server name: "blah.agentzh.org"
 --- no_error_log
 lua ssl certificate does not match host
 SSL reused session
diff --git a/debian/modules/nginx-lua/t/132-lua-blocks.t b/debian/modules/nginx-lua/t/132-lua-blocks.t
index 874d017..d157d27 100644
--- a/debian/modules/nginx-lua/t/132-lua-blocks.t
+++ b/debian/modules/nginx-lua/t/132-lua-blocks.t
@@ -488,3 +488,88 @@ GET /t
 Hey, it is '!
 --- no_error_log
 [error]
+
+
+
+=== TEST 21: lexer no match due to incomplete data chunks in a fixed size buffer
+--- config
+        location /test1 {
+            content_by_lua_block {
+                ngx.say("1: this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error")
+            }
+        }
+        location /test2 {
+            content_by_lua_block {
+                ngx.say("2: this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error")
+            }
+        }
+
+        location /test3 {
+            content_by_lua_block {
+                ngx.say("3: this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error",
+                "this is just some random filler to cause an error")
+            }
+        }
+--- request
+GET /test3
+--- response_body eval
+"3: " . ("this is just some random filler to cause an error" x 20) . "\n"
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/133-worker-count.t b/debian/modules/nginx-lua/t/133-worker-count.t
new file mode 100644
index 0000000..a7bae65
--- /dev/null
+++ b/debian/modules/nginx-lua/t/133-worker-count.t
@@ -0,0 +1,32 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: content_by_lua
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say("workers: ", ngx.worker.count())
+        }
+    }
+--- request
+GET /lua
+--- response_body
+workers: 1
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/134-worker-count-5.t b/debian/modules/nginx-lua/t/134-worker-count-5.t
new file mode 100644
index 0000000..d6f16c2
--- /dev/null
+++ b/debian/modules/nginx-lua/t/134-worker-count-5.t
@@ -0,0 +1,32 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_on();
+workers(5);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say("worker count: ", ngx.worker.count())
+        }
+    }
+--- request
+GET /lua
+--- response_body
+worker count: 5
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/135-worker-id.t b/debian/modules/nginx-lua/t/135-worker-id.t
new file mode 100644
index 0000000..752b406
--- /dev/null
+++ b/debian/modules/nginx-lua/t/135-worker-id.t
@@ -0,0 +1,33 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_on();
+workers(2);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say("worker id: ", ngx.worker.id())
+        }
+    }
+--- request
+GET /lua
+--- response_body_like chop
+^worker id: [0-1]$
+--- no_error_log
+[error]
+--- skip_nginx: 3: <=1.9.0
diff --git a/debian/modules/nginx-lua/t/136-timer-counts.t b/debian/modules/nginx-lua/t/136-timer-counts.t
new file mode 100644
index 0000000..8f5329b
--- /dev/null
+++ b/debian/modules/nginx-lua/t/136-timer-counts.t
@@ -0,0 +1,111 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+repeat_each(1);
+
+plan tests => blocks() * (repeat_each() * 3);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: running count with no running timers
+--- config
+    location /timers {
+        content_by_lua_block { ngx.say(ngx.timer.running_count()) }
+    }
+--- request
+GET /timers
+--- response_body
+0
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: running count with no pending timers
+--- config
+    location /timers {
+        content_by_lua_block { ngx.say(ngx.timer.pending_count()) }
+    }
+--- request
+GET /timers
+--- response_body
+0
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: pending count with one pending timer
+--- config
+    location /timers {
+        content_by_lua_block {
+            ngx.timer.at(3, function() end)
+            ngx.say(ngx.timer.pending_count())
+        }
+    }
+--- request
+GET /timers
+--- response_body
+1
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: pending count with 3 pending timers
+--- config
+    location /timers {
+        content_by_lua_block {
+            ngx.timer.at(4, function() end)
+            ngx.timer.at(2, function() end)
+            ngx.timer.at(1, function() end)
+            ngx.say(ngx.timer.pending_count())
+        }
+    }
+--- request
+GET /timers
+--- response_body
+3
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: one running timer
+--- config
+    location /timers {
+        content_by_lua_block {
+            ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
+            ngx.sleep(0.2)
+            ngx.say(ngx.timer.running_count())
+        }
+    }
+--- request
+GET /timers
+--- response_body
+1
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: 3 running timers
+--- config
+    location /timers {
+        content_by_lua_block {
+            ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
+            ngx.timer.at(0.11, function() ngx.sleep(0.3) end)
+            ngx.timer.at(0.09, function() ngx.sleep(0.3) end)
+            ngx.sleep(0.2)
+            ngx.say(ngx.timer.running_count())
+        }
+    }
+--- request
+GET /timers
+--- response_body
+3
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/137-req-misc.t b/debian/modules/nginx-lua/t/137-req-misc.t
new file mode 100644
index 0000000..20ada3c
--- /dev/null
+++ b/debian/modules/nginx-lua/t/137-req-misc.t
@@ -0,0 +1,62 @@
+use Test::Nginx::Socket::Lua;
+
+#master_on();
+#workers(1);
+#worker_connections(1014);
+#log_level('warn');
+#master_process_enabled(1);
+
+repeat_each(2);
+
+plan tests => repeat_each() * blocks() * 2;
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff();
+no_long_string();
+#no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: not internal request
+--- config
+    location /test {
+        rewrite ^/test$ /lua last;
+    }
+    location /lua {
+        content_by_lua '
+            if ngx.req.is_internal() then
+                ngx.say("internal")
+            else
+                ngx.say("not internal")
+            end
+        ';
+    }
+--- request
+GET /lua
+--- response_body
+not internal
+
+
+
+=== TEST 2: internal request
+--- config
+    location /test {
+        rewrite ^/test$ /lua last;
+    }
+    location /lua {
+        content_by_lua '
+            if ngx.req.is_internal() then
+                ngx.say("internal")
+            else
+                ngx.say("not internal")
+            end
+        ';
+    }
+--- request
+GET /test
+--- response_body
+internal
+
diff --git a/debian/modules/nginx-lua/t/138-balancer.t b/debian/modules/nginx-lua/t/138-balancer.t
new file mode 100644
index 0000000..076465a
--- /dev/null
+++ b/debian/modules/nginx-lua/t/138-balancer.t
@@ -0,0 +1,304 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4 + 8);
+
+#no_diff();
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple logging
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            print("hello from balancer by lua!")
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+[
+'[lua] balancer_by_lua:2: hello from balancer by lua! while connecting to upstream,',
+qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
+]
+--- no_error_log
+[warn]
+
+
+
+=== TEST 2: exit 403
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            print("hello from balancer by lua!")
+            ngx.exit(403)
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+[lua] balancer_by_lua:2: hello from balancer by lua! while connecting to upstream,
+--- no_error_log eval
+[
+'[warn]',
+qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
+]
+
+
+
+=== TEST 3: exit OK
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            print("hello from balancer by lua!")
+            ngx.exit(ngx.OK)
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+[
+'[lua] balancer_by_lua:2: hello from balancer by lua! while connecting to upstream,',
+qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
+]
+--- no_error_log
+[warn]
+
+
+
+=== TEST 4: ngx.var works
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            print("1: variable foo = ", ngx.var.foo)
+            ngx.var.foo = tonumber(ngx.var.foo) + 1
+            print("2: variable foo = ", ngx.var.foo)
+        }
+    }
+--- config
+    location = /t {
+        set $foo 32;
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+[
+"1: variable foo = 32",
+"2: variable foo = 33",
+qr/\[crit\] .* connect\(\) .*? failed/,
+]
+--- no_error_log
+[warn]
+
+
+
+=== TEST 5: ngx.req.get_headers works
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            print("header foo: ", ngx.req.get_headers()["foo"])
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- more_headers
+Foo: bar
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+[
+"header foo: bar",
+qr/\[crit\] .* connect\(\) .*? failed/,
+]
+--- no_error_log
+[warn]
+
+
+
+=== TEST 6: ngx.req.get_uri_args() works
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            print("arg foo: ", ngx.req.get_uri_args()["foo"])
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t?baz=blah&foo=bar
+--- more_headers
+Foo: bar
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+["arg foo: bar",
+qr/\[crit\] .* connect\(\) .*? failed/,
+]
+--- no_error_log
+[warn]
+
+
+
+=== TEST 7: ngx.req.get_method() works
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            print("method: ", ngx.req.get_method())
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- more_headers
+Foo: bar
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+[
+"method: GET",
+qr/\[crit\] .* connect\(\) .*? failed/,
+]
+--- no_error_log
+[warn]
+
+
+
+=== TEST 8: simple logging (by_lua_file)
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_file html/a.lua;
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- user_files
+>>> a.lua
+print("hello from balancer by lua!")
+--- request
+    GET /t
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+[
+'[lua] a.lua:1: hello from balancer by lua! while connecting to upstream,',
+qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
+]
+--- no_error_log
+[warn]
+
+
+
+=== TEST 9: cosockets are disabled
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            local sock, err = ngx.socket.tcp()
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log eval
+qr/\[error\] .*? failed to run balancer_by_lua\*: balancer_by_lua:2: API disabled in the context of balancer_by_lua\*/
+
+
+
+=== TEST 10: ngx.sleep is disabled
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            ngx.sleep(0.1)
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log eval
+qr/\[error\] .*? failed to run balancer_by_lua\*: balancer_by_lua:2: API disabled in the context of balancer_by_lua\*/
+
+
+
+=== TEST 11: get_phase
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            print("I am in phase ", ngx.get_phase())
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- grep_error_log eval: qr/I am in phase \w+/
+--- grep_error_log_out
+I am in phase balancer
+--- error_log eval
+qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"}
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/139-ssl-cert-by.t b/debian/modules/nginx-lua/t/139-ssl-cert-by.t
new file mode 100644
index 0000000..e40fe85
--- /dev/null
+++ b/debian/modules/nginx-lua/t/139-ssl-cert-by.t
@@ -0,0 +1,1382 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+repeat_each(3);
+
+# All these tests need to have new openssl
+my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
+my $openssl_version = eval { `$NginxBinary -V 2>&1` };
+
+if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
+    plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
+} else {
+    plan tests => repeat_each() * (blocks() * 6 + 10);
+}
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#log_level 'warn';
+log_level 'debug';
+
+no_long_string();
+#no_diff();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple logging
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+ssl_certificate_by_lua:1: ssl cert by lua is running!
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 2: sleep
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            local begin = ngx.now()
+            ngx.sleep(0.1)
+            print("elapsed in ssl cert by lua: ", ngx.now() - begin)
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log eval
+[
+'lua ssl server name: "test.com"',
+qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
+]
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 3: timer
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            local function f()
+                print("my timer run!")
+            end
+            local ok, err = ngx.timer.at(0, f)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to create timer: ", err)
+                return
+            end
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+my timer run!
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 4: cosocket
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeout(2000)
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to connect to memc: ", err)
+                return
+            end
+
+            local bytes, err = sock:send("flush_all\r\n")
+            if not bytes then
+                ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
+                return
+            end
+
+            local res, err = sock:receive()
+            if not res then
+                ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
+                return
+            end
+
+            print("received memc reply: ", res)
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+received memc reply: OK
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 5: ngx.exit(0) - no yield
+--- http_config
+    server {
+        listen 127.0.0.2:8080 ssl;
+        server_name test.com;
+        ssl_certificate_by_lua_block {
+            ngx.exit(0)
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                local ok, err = sock:connect("127.0.0.2", 8080)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local sess, err = sock:sslhandshake(false, nil, true, false)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: boolean
+
+--- error_log
+lua exit with code 0
+
+--- no_error_log
+should never reached here
+[error]
+[alert]
+[emerg]
+
+
+
+=== TEST 6: ngx.exit(ngx.ERROR) - no yield
+--- http_config
+    server {
+        listen 127.0.0.2:8080 ssl;
+        server_name test.com;
+        ssl_certificate_by_lua_block {
+            ngx.exit(ngx.ERROR)
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                local ok, err = sock:connect("127.0.0.2", 8080)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local sess, err = sock:sslhandshake(false, nil, true, false)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to do SSL handshake: handshake failed
+
+--- error_log eval
+[
+'lua_certificate_by_lua: handler return value: -1, cert cb exit code: 0',
+qr/\[crit\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
+'lua exit with code -1',
+]
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 7: ngx.exit(0) -  yield
+--- http_config
+    server {
+        listen 127.0.0.2:8080 ssl;
+        server_name test.com;
+        ssl_certificate_by_lua_block {
+            ngx.sleep(0.001)
+            ngx.exit(0)
+
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                local ok, err = sock:connect("127.0.0.2", 8080)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local sess, err = sock:sslhandshake(false, nil, true, false)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: boolean
+
+--- error_log
+lua exit with code 0
+
+--- no_error_log
+should never reached here
+[error]
+[alert]
+[emerg]
+
+
+
+=== TEST 8: ngx.exit(ngx.ERROR) - yield
+--- http_config
+    server {
+        listen 127.0.0.2:8080 ssl;
+        server_name test.com;
+        ssl_certificate_by_lua_block {
+            ngx.sleep(0.001)
+            ngx.exit(ngx.ERROR)
+
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                local ok, err = sock:connect("127.0.0.2", 8080)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local sess, err = sock:sslhandshake(false, nil, true, false)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to do SSL handshake: handshake failed
+
+--- error_log eval
+[
+'lua_certificate_by_lua: cert cb exit code: 0',
+qr/\[crit\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
+'lua exit with code -1',
+]
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 9: lua exception - no yield
+--- http_config
+    server {
+        listen 127.0.0.2:8080 ssl;
+        server_name test.com;
+        ssl_certificate_by_lua_block {
+            error("bad bad bad")
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                local ok, err = sock:connect("127.0.0.2", 8080)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local sess, err = sock:sslhandshake(false, nil, true, false)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to do SSL handshake: handshake failed
+
+--- error_log eval
+[
+'runtime error: ssl_certificate_by_lua:2: bad bad bad',
+'lua_certificate_by_lua: handler return value: 500, cert cb exit code: 0',
+qr/\[crit\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
+qr/context: ssl_certificate_by_lua\*, client: \d+\.\d+\.\d+\.\d+, server: \d+\.\d+\.\d+\.\d+:\d+/,
+]
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 10: lua exception - yield
+--- http_config
+    server {
+        listen 127.0.0.2:8080 ssl;
+        server_name test.com;
+        ssl_certificate_by_lua_block {
+            ngx.sleep(0.001)
+            error("bad bad bad")
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                local ok, err = sock:connect("127.0.0.2", 8080)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local sess, err = sock:sslhandshake(false, nil, true, false)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to do SSL handshake: handshake failed
+
+--- error_log eval
+[
+'runtime error: ssl_certificate_by_lua:3: bad bad bad',
+'lua_certificate_by_lua: cert cb exit code: 0',
+qr/\[crit\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
+]
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 11: get phase
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {print("get_phase: ", ngx.get_phase())}
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+            end
+            collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+
+--- error_log
+lua ssl server name: "test.com"
+get_phase: ssl_cert
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 12: connection aborted prematurely
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            ngx.sleep(0.3)
+            -- local ssl = require "ngx.ssl"
+            -- ssl.clear_certs()
+            print("ssl-cert-by-lua: after sleeping")
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(150)
+
+                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 sess, err = sock:sslhandshake(false, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+
+--- response_body
+connected: 1
+failed to do SSL handshake: timeout
+
+--- error_log
+lua ssl server name: "test.com"
+ssl-cert-by-lua: after sleeping
+
+--- no_error_log
+[error]
+[alert]
+--- wait: 0.6
+
+
+
+=== TEST 13: subrequests disabled
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {ngx.location.capture("/foo")}
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to do SSL handshake: handshake failed
+
+--- error_log eval
+[
+'lua ssl server name: "test.com"',
+'ssl_certificate_by_lua:1: API disabled in the context of ssl_certificate_by_lua*',
+qr/\[crit\] .*?cert cb error/,
+]
+
+--- no_error_log
+[alert]
+
+
+
+=== TEST 14: simple logging (by_lua_file)
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_file html/a.lua;
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
+            more_clear_headers Date;
+        }
+    }
+
+--- user_files
+>>> a.lua
+print("ssl cert by lua is running!")
+
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+a.lua:1: ssl cert by lua is running!
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 15: coroutine API
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
+
+            local function f()
+                local cnt = 0
+                for i = 1, 20 do
+                    print("co yield: ", cnt)
+                    cy()
+                    cnt = cnt + 1
+                end
+            end
+
+            local c = cc(f)
+            for i = 1, 3 do
+                print("co resume, status: ", coroutine.status(c))
+                cr(c)
+            end
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- grep_error_log eval: qr/co (?:yield: \d+|resume, status: \w+)/
+--- grep_error_log_out
+co resume, status: suspended
+co yield: 0
+co resume, status: suspended
+co yield: 1
+co resume, status: suspended
+co yield: 2
+
+--- error_log
+lua ssl server name: "test.com"
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 16: simple user thread wait with yielding
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            function f()
+                ngx.sleep(0.01)
+                print("uthread: hello in thread")
+                return "done"
+            end
+
+            local t, err = ngx.thread.spawn(f)
+            if not t then
+                ngx.log(ngx.ERR, "uthread: failed to spawn thread: ", err)
+                return ngx.exit(ngx.ERROR)
+            end
+
+            print("uthread: thread created: ", coroutine.status(t))
+
+            local ok, res = ngx.thread.wait(t)
+            if not ok then
+                print("uthread: failed to wait thread: ", res)
+                return
+            end
+
+            print("uthread: ", res)
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- no_error_log
+[error]
+[alert]
+--- grep_error_log eval: qr/uthread: [^.,]+/
+--- grep_error_log_out
+uthread: thread created: running
+uthread: hello in thread
+uthread: done
diff --git a/debian/modules/nginx-lua/util/build2.sh b/debian/modules/nginx-lua/util/build2.sh
index 5a89c29..2aa79cc 100755
--- a/debian/modules/nginx-lua/util/build2.sh
+++ b/debian/modules/nginx-lua/util/build2.sh
@@ -21,16 +21,16 @@ force=$2
             #--with-cc=clang \
             #--without-http_referer_module \
             #--with-http_v2_module \
+            #--with-http_spdy_module \
 
 time ngx-build $force $version \
             --with-ipv6 \
-            --with-cc-opt="-I$PCRE_INC" \
+            --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" \
             --with-http_realip_module \
-        --with-http_ssl_module \
+            --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:$LIBDRIZZLE_LIB:/usr/local/lib" \
-            --with-http_spdy_module \
+            --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:$OPENSSL_LIB" \
             --without-mail_pop3_module \
             --without-mail_imap_module \
             --with-http_image_filter_module \

From 45aed60c9d102d2dd12030f05c318ed6e9ff0522 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 14 Jan 2016 10:31:38 +0200
Subject: [PATCH 022/600] Keep logs for 14 *days*

Complements Mike's 255c62e0 (#805322)
---
 debian/nginx-common.nginx.logrotate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/nginx-common.nginx.logrotate b/debian/nginx-common.nginx.logrotate
index 1b25aad..423c6ad 100644
--- a/debian/nginx-common.nginx.logrotate
+++ b/debian/nginx-common.nginx.logrotate
@@ -1,5 +1,5 @@
 /var/log/nginx/*.log {
-	weekly
+	daily
 	missingok
 	rotate 14
 	compress

From 706a679a92e1bfa57e22f6f09eec02800b7d289a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 14 Jan 2016 10:37:03 +0200
Subject: [PATCH 023/600] Add a NEWS entry for our logrotate policy change

---
 debian/nginx-common.NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index 46a6f14..a72049d 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,3 +1,10 @@
+nginx-common (1.9.9-1) UNRELEASED; urgency=medium
+
+  Starting with this release we are changing the default logrotate rule to keep
+  daily logs for 14 days, this aligns our policy with apache2 (Bug #805322).
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 14 Jan 2016 10:17:33 +0200
+
 nginx-common (1.9.6-1) unstable; urgency=medium
 
   As of nginx 1.9.5 spdy has been replaced by the http2 module. Make sure to

From 4f41a6929370dd71500208b147bd9af0fc950858 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 14 Jan 2016 10:41:13 +0200
Subject: [PATCH 024/600] Release 1.9.9-1

---
 debian/changelog         | 4 ++--
 debian/nginx-common.NEWS | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf298f1..5e94be3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.9.9-1) UNRELEASED; urgency=medium
+nginx (1.9.9-1) unstable; urgency=medium
 
   [ Michael Lustfield ]
   * debian/nginx-common.nginx.logrotate:
@@ -9,7 +9,7 @@ nginx (1.9.9-1) UNRELEASED; urgency=medium
   * debian/modules/nginx-lua:
     + Update nginx-lua to v0.10.0.
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 14 Jan 2016 10:11:34 +0200
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 14 Jan 2016 10:40:35 +0200
 
 nginx (1.9.6-2) unstable; urgency=medium
 
diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index a72049d..3d06e67 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,4 +1,4 @@
-nginx-common (1.9.9-1) UNRELEASED; urgency=medium
+nginx-common (1.9.9-1) unstable; urgency=medium
 
   Starting with this release we are changing the default logrotate rule to keep
   daily logs for 14 days, this aligns our policy with apache2 (Bug #805322).

From 647d381b13d22aee80f29ee9dd88ca453f49735a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 26 Jan 2016 19:42:15 +0200
Subject: [PATCH 025/600] Imported Upstream version 1.9.10

---
 CHANGES                                       |  30 +++
 CHANGES.ru                                    |  36 ++-
 LICENSE                                       |   4 +-
 src/core/nginx.c                              |  43 +++-
 src/core/nginx.h                              |   4 +-
 src/core/ngx_cycle.h                          |   1 +
 src/core/ngx_resolver.c                       | 234 ++++++++++--------
 src/core/ngx_resolver.h                       |  15 +-
 .../ngx_http_upstream_keepalive_module.c      |   4 +
 src/http/ngx_http.c                           |   1 +
 src/http/ngx_http_request_body.c              |   6 -
 src/http/ngx_http_upstream.c                  |   4 +
 src/http/ngx_http_upstream.h                  |   1 +
 13 files changed, 263 insertions(+), 120 deletions(-)

diff --git a/CHANGES b/CHANGES
index 267669b..3827f90 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,34 @@
 
+Changes with nginx 1.9.10                                        26 Jan 2016
+
+    *) Security: invalid pointer dereference might occur during DNS server
+       response processing if the "resolver" directive was used, allowing an
+       attacker who is able to forge UDP packets from the DNS server to
+       cause segmentation fault in a worker process (CVE-2016-0742).
+
+    *) Security: use-after-free condition might occur during CNAME response
+       processing if the "resolver" directive was used, allowing an attacker
+       who is able to trigger name resolution to cause segmentation fault in
+       a worker process, or might have potential other impact
+       (CVE-2016-0746).
+
+    *) Security: CNAME resolution was insufficiently limited if the
+       "resolver" directive was used, allowing an attacker who is able to
+       trigger arbitrary name resolution to cause excessive resource
+       consumption in worker processes (CVE-2016-0747).
+
+    *) Feature: the "auto" parameter of the "worker_cpu_affinity" directive.
+
+    *) Bugfix: the "proxy_protocol" parameter of the "listen" directive did
+       not work with IPv6 listen sockets.
+
+    *) Bugfix: connections to upstream servers might be cached incorrectly
+       when using the "keepalive" directive.
+
+    *) Bugfix: proxying used the HTTP method of the original request after
+       an "X-Accel-Redirect" redirection.
+
+
 Changes with nginx 1.9.9                                         09 Dec 2015
 
     *) Bugfix: proxying to unix domain sockets did not work when using
diff --git a/CHANGES.ru b/CHANGES.ru
index 315013b..563163a 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,38 @@
 
+Изменения в nginx 1.9.10                                          26.01.2016
+
+    *) Безопасность: при использовании директивы resolver во время обработки
+       ответов DNS-сервера могло происходить разыменование некорректного
+       адреса, что позволяло атакующему, имеющему возможность подделывать
+       UDP-пакеты от DNS-сервера, вызвать segmentation fault в рабочем
+       процессе (CVE-2016-0742).
+
+    *) Безопасность: при использовании директивы resolver во время обработки
+       CNAME-записей могло произойти обращение к ранее освобождённой памяти,
+       что позволяло атакующему, имеющему возможность инициировать
+       преобразование произвольных имён в адреса, вызвать segmentation fault
+       в рабочем процессе, а также потенциально могло иметь другие
+       последствия (CVE-2016-0746).
+
+    *) Безопасность: при использовании директивы resolver во время обработки
+       CNAME-записей не во всех случаях проверялось ограничение на
+       максимальное количество записей в цепочке, что позволяло атакующему,
+       имеющему возможность инициировать преобразование произвольных имён в
+       адреса, вызвать чрезмерное потребление ресурсов рабочими процессами
+       (CVE-2016-0747).
+
+    *) Добавление: параметр auto директивы worker_cpu_affinity.
+
+    *) Исправление: параметр proxy_protocol директивы listen не работал с
+       IPv6 listen-сокетами.
+
+    *) Исправление: при использовании директивы keepalive соединения к
+       бэкендам могли кэшироваться некорректно.
+
+    *) Исправление: после перенаправления запроса с помощью X-Accel-Redirect
+       при проксировании использовался HTTP-метод оригинального запроса.
+
+
 Изменения в nginx 1.9.9                                           09.12.2015
 
     *) Исправление: проксирование в unix domain сокеты не работало при
@@ -138,7 +172,7 @@
 
     *) Добавление: ограничение количества соединений в модуле stream.
 
-    *) Добавление: органичение скорости в модуле stream.
+    *) Добавление: ограничение скорости в модуле stream.
 
     *) Исправление: директива zone в блоке upstream не работала на Windows.
 
diff --git a/LICENSE b/LICENSE
index f752308..1d3d15c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2002-2015 Igor Sysoev
- * Copyright (C) 2011-2015 Nginx, Inc.
+ * Copyright (C) 2002-2016 Igor Sysoev
+ * Copyright (C) 2011-2016 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 3335587..64db381 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -961,6 +961,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
      *     ccf->pid = NULL;
      *     ccf->oldpid = NULL;
      *     ccf->priority = 0;
+     *     ccf->cpu_affinity_auto = 0;
      *     ccf->cpu_affinity_n = 0;
      *     ccf->cpu_affinity = NULL;
      */
@@ -1002,7 +1003,8 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
 
 #if (NGX_HAVE_CPU_AFFINITY)
 
-    if (ccf->cpu_affinity_n
+    if (!ccf->cpu_affinity_auto
+        && ccf->cpu_affinity_n
         && ccf->cpu_affinity_n != 1
         && ccf->cpu_affinity_n != (ngx_uint_t) ccf->worker_processes)
     {
@@ -1273,7 +1275,24 @@ ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     value = cf->args->elts;
 
-    for (n = 1; n < cf->args->nelts; n++) {
+    if (ngx_strcmp(value[1].data, "auto") == 0) {
+
+        if (cf->args->nelts > 3) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid number of arguments in "
+                               "\"worker_cpu_affinity\" directive");
+            return NGX_CONF_ERROR;
+        }
+
+        ccf->cpu_affinity_auto = 1;
+        mask[0] = (uint64_t) -1 >> (64 - ngx_min(64, ngx_ncpu));
+        n = 2;
+
+    } else {
+        n = 1;
+    }
+
+    for ( /* void */ ; n < cf->args->nelts; n++) {
 
         if (value[n].len > 64) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -1323,6 +1342,8 @@ ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 uint64_t
 ngx_get_cpu_affinity(ngx_uint_t n)
 {
+    uint64_t          mask;
+    ngx_uint_t        i;
     ngx_core_conf_t  *ccf;
 
     ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
@@ -1332,6 +1353,24 @@ ngx_get_cpu_affinity(ngx_uint_t n)
         return 0;
     }
 
+    if (ccf->cpu_affinity_auto) {
+        mask = ccf->cpu_affinity[ccf->cpu_affinity_n - 1];
+
+        if (mask == 0) {
+            return 0;
+        }
+
+        for (i = 0; /* void */ ; i++) {
+            if ((mask & ((uint64_t) 1 << (i % 64))) && n-- == 0) {
+                break;
+            }
+
+            /* void */
+        }
+
+        return (uint64_t) 1 << (i % 64);
+    }
+
     if (ccf->cpu_affinity_n > n) {
         return ccf->cpu_affinity[n];
     }
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 87a984a..0960afb 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009009
-#define NGINX_VERSION      "1.9.9"
+#define nginx_version      1009010
+#define NGINX_VERSION      "1.9.10"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index b77c109..a730efe 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -88,6 +88,7 @@ typedef struct {
 
      int                      priority;
 
+     ngx_uint_t               cpu_affinity_auto;
      ngx_uint_t               cpu_affinity_n;
      uint64_t                *cpu_affinity;
 
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 7013885..7b60abd 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -59,15 +59,15 @@ ngx_int_t ngx_udp_connect(ngx_udp_connection_t *uc);
 static void ngx_resolver_cleanup(void *data);
 static void ngx_resolver_cleanup_tree(ngx_resolver_t *r, ngx_rbtree_t *tree);
 static ngx_int_t ngx_resolve_name_locked(ngx_resolver_t *r,
-    ngx_resolver_ctx_t *ctx);
+    ngx_resolver_ctx_t *ctx, ngx_str_t *name);
 static void ngx_resolver_expire(ngx_resolver_t *r, ngx_rbtree_t *tree,
     ngx_queue_t *queue);
 static ngx_int_t ngx_resolver_send_query(ngx_resolver_t *r,
     ngx_resolver_node_t *rn);
-static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_node_t *rn,
-    ngx_resolver_ctx_t *ctx);
-static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_node_t *rn,
-    ngx_resolver_ctx_t *ctx);
+static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_t *r,
+    ngx_resolver_node_t *rn, ngx_str_t *name);
+static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_t *r,
+    ngx_resolver_node_t *rn, ngx_addr_t *addr);
 static void ngx_resolver_resend_handler(ngx_event_t *ev);
 static time_t ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree,
     ngx_queue_t *queue);
@@ -376,7 +376,7 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx)
 
     /* lock name mutex */
 
-    rc = ngx_resolve_name_locked(r, ctx);
+    rc = ngx_resolve_name_locked(r, ctx, &ctx->name);
 
     if (rc == NGX_OK) {
         return NGX_OK;
@@ -403,7 +403,6 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx)
 void
 ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
 {
-    uint32_t              hash;
     ngx_resolver_t       *r;
     ngx_resolver_ctx_t   *w, **p;
     ngx_resolver_node_t  *rn;
@@ -423,11 +422,9 @@ ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
 
     /* lock name mutex */
 
-    if (ctx->state == NGX_AGAIN) {
+    if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) {
 
-        hash = ngx_crc32_short(ctx->name.data, ctx->name.len);
-
-        rn = ngx_resolver_lookup_name(r, &ctx->name, hash);
+        rn = ctx->node;
 
         if (rn) {
             p = &rn->waiting;
@@ -472,23 +469,28 @@ done:
 
 
 static ngx_int_t
-ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
+ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
+    ngx_str_t *name)
 {
     uint32_t              hash;
     ngx_int_t             rc;
+    ngx_str_t             cname;
     ngx_uint_t            naddrs;
     ngx_addr_t           *addrs;
-    ngx_resolver_ctx_t   *next;
+    ngx_resolver_ctx_t   *next, *last;
     ngx_resolver_node_t  *rn;
 
-    ngx_strlow(ctx->name.data, ctx->name.data, ctx->name.len);
+    ngx_strlow(name->data, name->data, name->len);
 
-    hash = ngx_crc32_short(ctx->name.data, ctx->name.len);
+    hash = ngx_crc32_short(name->data, name->len);
 
-    rn = ngx_resolver_lookup_name(r, &ctx->name, hash);
+    rn = ngx_resolver_lookup_name(r, name, hash);
 
     if (rn) {
 
+        /* ctx can be a list after NGX_RESOLVE_CNAME */
+        for (last = ctx; last->next; last = last->next);
+
         if (rn->valid >= ngx_time()) {
 
             ngx_log_debug0(NGX_LOG_DEBUG_CORE, r->log, 0, "resolve cached");
@@ -516,7 +518,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
                     }
                 }
 
-                ctx->next = rn->waiting;
+                last->next = rn->waiting;
                 rn->waiting = NULL;
 
                 /* unlock name mutex */
@@ -556,13 +558,13 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
 
             if (ctx->recursion++ < NGX_RESOLVER_MAX_RECURSION) {
 
-                ctx->name.len = rn->cnlen;
-                ctx->name.data = rn->u.cname;
+                cname.len = rn->cnlen;
+                cname.data = rn->u.cname;
 
-                return ngx_resolve_name_locked(r, ctx);
+                return ngx_resolve_name_locked(r, ctx, &cname);
             }
 
-            ctx->next = rn->waiting;
+            last->next = rn->waiting;
             rn->waiting = NULL;
 
             /* unlock name mutex */
@@ -581,10 +583,29 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
 
         if (rn->waiting) {
 
-            ctx->next = rn->waiting;
+            if (ctx->event == NULL) {
+                ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
+                if (ctx->event == NULL) {
+                    return NGX_ERROR;
+                }
+
+                ctx->event->handler = ngx_resolver_timeout_handler;
+                ctx->event->data = ctx;
+                ctx->event->log = r->log;
+                ctx->ident = -1;
+
+                ngx_add_timer(ctx->event, ctx->timeout);
+            }
+
+            last->next = rn->waiting;
             rn->waiting = ctx;
             ctx->state = NGX_AGAIN;
 
+            do {
+                ctx->node = rn;
+                ctx = ctx->next;
+            } while (ctx);
+
             return NGX_AGAIN;
         }
 
@@ -623,14 +644,14 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
             return NGX_ERROR;
         }
 
-        rn->name = ngx_resolver_dup(r, ctx->name.data, ctx->name.len);
+        rn->name = ngx_resolver_dup(r, name->data, name->len);
         if (rn->name == NULL) {
             ngx_resolver_free(r, rn);
             return NGX_ERROR;
         }
 
         rn->node.key = hash;
-        rn->nlen = (u_short) ctx->name.len;
+        rn->nlen = (u_short) name->len;
         rn->query = NULL;
 #if (NGX_HAVE_INET6)
         rn->query6 = NULL;
@@ -639,7 +660,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
         ngx_rbtree_insert(&r->name_rbtree, &rn->node);
     }
 
-    rc = ngx_resolver_create_name_query(rn, ctx);
+    rc = ngx_resolver_create_name_query(r, rn, name);
 
     if (rc == NGX_ERROR) {
         goto failed;
@@ -652,8 +673,14 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
         ngx_resolver_free(r, rn->name);
         ngx_resolver_free(r, rn);
 
-        ctx->state = NGX_RESOLVE_NXDOMAIN;
-        ctx->handler(ctx);
+        do {
+            ctx->state = NGX_RESOLVE_NXDOMAIN;
+            next = ctx->next;
+
+            ctx->handler(ctx);
+
+            ctx = next;
+        } while (ctx);
 
         return NGX_OK;
     }
@@ -674,9 +701,9 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
         }
 
         ctx->event->handler = ngx_resolver_timeout_handler;
-        ctx->event->data = rn;
+        ctx->event->data = ctx;
         ctx->event->log = r->log;
-        rn->ident = -1;
+        ctx->ident = -1;
 
         ngx_add_timer(ctx->event, ctx->timeout);
     }
@@ -697,6 +724,11 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
 
     ctx->state = NGX_AGAIN;
 
+    do {
+        ctx->node = rn;
+        ctx = ctx->next;
+    } while (ctx);
+
     return NGX_AGAIN;
 
 failed:
@@ -804,9 +836,22 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
 
         if (rn->waiting) {
 
+            ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
+            if (ctx->event == NULL) {
+                return NGX_ERROR;
+            }
+
+            ctx->event->handler = ngx_resolver_timeout_handler;
+            ctx->event->data = ctx;
+            ctx->event->log = r->log;
+            ctx->ident = -1;
+
+            ngx_add_timer(ctx->event, ctx->timeout);
+
             ctx->next = rn->waiting;
             rn->waiting = ctx;
             ctx->state = NGX_AGAIN;
+            ctx->node = rn;
 
             /* unlock addr mutex */
 
@@ -848,7 +893,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
         ngx_rbtree_insert(tree, &rn->node);
     }
 
-    if (ngx_resolver_create_addr_query(rn, ctx) != NGX_OK) {
+    if (ngx_resolver_create_addr_query(r, rn, &ctx->addr) != NGX_OK) {
         goto failed;
     }
 
@@ -867,9 +912,9 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
     }
 
     ctx->event->handler = ngx_resolver_timeout_handler;
-    ctx->event->data = rn;
+    ctx->event->data = ctx;
     ctx->event->log = r->log;
-    rn->ident = -1;
+    ctx->ident = -1;
 
     ngx_add_timer(ctx->event, ctx->timeout);
 
@@ -892,6 +937,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
     /* unlock addr mutex */
 
     ctx->state = NGX_AGAIN;
+    ctx->node = rn;
 
     return NGX_OK;
 
@@ -922,17 +968,11 @@ failed:
 void
 ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
 {
-    in_addr_t             addr;
     ngx_queue_t          *expire_queue;
     ngx_rbtree_t         *tree;
     ngx_resolver_t       *r;
     ngx_resolver_ctx_t   *w, **p;
-    struct sockaddr_in   *sin;
     ngx_resolver_node_t  *rn;
-#if (NGX_HAVE_INET6)
-    uint32_t              hash;
-    struct sockaddr_in6  *sin6;
-#endif
 
     r = ctx->resolver;
 
@@ -959,23 +999,9 @@ ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
 
     /* lock addr mutex */
 
-    if (ctx->state == NGX_AGAIN) {
+    if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) {
 
-        switch (ctx->addr.sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            sin6 = (struct sockaddr_in6 *) ctx->addr.sockaddr;
-            hash = ngx_crc32_short(sin6->sin6_addr.s6_addr, 16);
-            rn = ngx_resolver_lookup_addr6(r, &sin6->sin6_addr, hash);
-            break;
-#endif
-
-        default: /* AF_INET */
-            sin = (struct sockaddr_in *) ctx->addr.sockaddr;
-            addr = ntohl(sin->sin_addr.s_addr);
-            rn = ngx_resolver_lookup_addr(r, addr);
-        }
+        rn = ctx->node;
 
         if (rn) {
             p = &rn->waiting;
@@ -1312,7 +1338,7 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n)
         times = 0;
 
         for (q = ngx_queue_head(&r->name_resend_queue);
-             q != ngx_queue_sentinel(&r->name_resend_queue) || times++ < 100;
+             q != ngx_queue_sentinel(&r->name_resend_queue) && times++ < 100;
              q = ngx_queue_next(q))
         {
             rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
@@ -1975,21 +2001,40 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
 
         ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
 
-        ctx = rn->waiting;
-        rn->waiting = NULL;
-
-        if (ctx) {
-            ctx->name = name;
-
-            (void) ngx_resolve_name_locked(r, ctx);
-        }
-
         ngx_resolver_free(r, rn->query);
         rn->query = NULL;
 #if (NGX_HAVE_INET6)
         rn->query6 = NULL;
 #endif
 
+        ctx = rn->waiting;
+        rn->waiting = NULL;
+
+        if (ctx) {
+
+            if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
+
+                /* unlock name mutex */
+
+                do {
+                    ctx->state = NGX_RESOLVE_NXDOMAIN;
+                    next = ctx->next;
+
+                    ctx->handler(ctx);
+
+                    ctx = next;
+                } while (ctx);
+
+                return;
+            }
+
+            for (next = ctx; next; next = next->next) {
+                next->node = NULL;
+            }
+
+            (void) ngx_resolve_name_locked(r, ctx, &name);
+        }
+
         /* unlock name mutex */
 
         return;
@@ -2496,27 +2541,23 @@ ngx_resolver_rbtree_insert_addr6_value(ngx_rbtree_node_t *temp,
 
 
 static ngx_int_t
-ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
+ngx_resolver_create_name_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
+    ngx_str_t *name)
 {
     u_char              *p, *s;
     size_t               len, nlen;
     ngx_uint_t           ident;
-#if (NGX_HAVE_INET6)
-    ngx_resolver_t      *r;
-#endif
     ngx_resolver_qs_t   *qs;
     ngx_resolver_hdr_t  *query;
 
-    nlen = ctx->name.len ? (1 + ctx->name.len + 1) : 1;
+    nlen = name->len ? (1 + name->len + 1) : 1;
 
     len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
 
 #if (NGX_HAVE_INET6)
-    r = ctx->resolver;
-
-    p = ngx_resolver_alloc(ctx->resolver, r->ipv6 ? len * 2 : len);
+    p = ngx_resolver_alloc(r, r->ipv6 ? len * 2 : len);
 #else
-    p = ngx_resolver_alloc(ctx->resolver, len);
+    p = ngx_resolver_alloc(r, len);
 #endif
     if (p == NULL) {
         return NGX_ERROR;
@@ -2535,8 +2576,8 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
 
     ident = ngx_random();
 
-    ngx_log_debug2(NGX_LOG_DEBUG_CORE, ctx->resolver->log, 0,
-                   "resolve: \"%V\" A %i", &ctx->name, ident & 0xffff);
+    ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
+                   "resolve: \"%V\" A %i", name, ident & 0xffff);
 
     query->ident_hi = (u_char) ((ident >> 8) & 0xff);
     query->ident_lo = (u_char) (ident & 0xff);
@@ -2566,11 +2607,11 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
     p--;
     *p-- = '\0';
 
-    if (ctx->name.len == 0)  {
+    if (name->len == 0)  {
         return NGX_DECLINED;
     }
 
-    for (s = ctx->name.data + ctx->name.len - 1; s >= ctx->name.data; s--) {
+    for (s = name->data + name->len - 1; s >= name->data; s--) {
         if (*s != '.') {
             *p = *s;
             len++;
@@ -2606,8 +2647,8 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
 
     ident = ngx_random();
 
-    ngx_log_debug2(NGX_LOG_DEBUG_CORE, ctx->resolver->log, 0,
-                   "resolve: \"%V\" AAAA %i", &ctx->name, ident & 0xffff);
+    ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
+                   "resolve: \"%V\" AAAA %i", name, ident & 0xffff);
 
     query->ident_hi = (u_char) ((ident >> 8) & 0xff);
     query->ident_lo = (u_char) (ident & 0xff);
@@ -2624,11 +2665,12 @@ ngx_resolver_create_name_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
 
 
 static ngx_int_t
-ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
+ngx_resolver_create_addr_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
+    ngx_addr_t *addr)
 {
     u_char               *p, *d;
     size_t                len;
-    in_addr_t             addr;
+    in_addr_t             inaddr;
     ngx_int_t             n;
     ngx_uint_t            ident;
     ngx_resolver_hdr_t   *query;
@@ -2637,7 +2679,7 @@ ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
     struct sockaddr_in6  *sin6;
 #endif
 
-    switch (ctx->addr.sockaddr->sa_family) {
+    switch (addr->sockaddr->sa_family) {
 
 #if (NGX_HAVE_INET6)
     case AF_INET6:
@@ -2654,7 +2696,7 @@ ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
               + sizeof(ngx_resolver_qs_t);
     }
 
-    p = ngx_resolver_alloc(ctx->resolver, len);
+    p = ngx_resolver_alloc(r, len);
     if (p == NULL) {
         return NGX_ERROR;
     }
@@ -2678,11 +2720,11 @@ ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
 
     p += sizeof(ngx_resolver_hdr_t);
 
-    switch (ctx->addr.sockaddr->sa_family) {
+    switch (addr->sockaddr->sa_family) {
 
 #if (NGX_HAVE_INET6)
     case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) ctx->addr.sockaddr;
+        sin6 = (struct sockaddr_in6 *) addr->sockaddr;
 
         for (n = 15; n >= 0; n--) {
             p = ngx_sprintf(p, "\1%xd\1%xd",
@@ -2697,11 +2739,11 @@ ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
 
     default: /* AF_INET */
 
-        sin = (struct sockaddr_in *) ctx->addr.sockaddr;
-        addr = ntohl(sin->sin_addr.s_addr);
+        sin = (struct sockaddr_in *) addr->sockaddr;
+        inaddr = ntohl(sin->sin_addr.s_addr);
 
         for (n = 0; n < 32; n += 8) {
-            d = ngx_sprintf(&p[1], "%ud", (addr >> n) & 0xff);
+            d = ngx_sprintf(&p[1], "%ud", (inaddr >> n) & 0xff);
             *p = (u_char) (d - &p[1]);
             p = d;
         }
@@ -2815,21 +2857,13 @@ done:
 static void
 ngx_resolver_timeout_handler(ngx_event_t *ev)
 {
-    ngx_resolver_ctx_t   *ctx, *next;
-    ngx_resolver_node_t  *rn;
+    ngx_resolver_ctx_t  *ctx;
 
-    rn = ev->data;
-    ctx = rn->waiting;
-    rn->waiting = NULL;
+    ctx = ev->data;
 
-    do {
-        ctx->state = NGX_RESOLVE_TIMEDOUT;
-        next = ctx->next;
+    ctx->state = NGX_RESOLVE_TIMEDOUT;
 
-        ctx->handler(ctx);
-
-        ctx = next;
-    } while (ctx);
+    ctx->handler(ctx);
 }
 
 
diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h
index d3519fb..07fa257 100644
--- a/src/core/ngx_resolver.h
+++ b/src/core/ngx_resolver.h
@@ -51,15 +51,11 @@ typedef void (*ngx_resolver_handler_pt)(ngx_resolver_ctx_t *ctx);
 
 
 typedef struct {
-    /* PTR: resolved name, A: name to resolve */
-    u_char                   *name;
-
+    ngx_rbtree_node_t         node;
     ngx_queue_t               queue;
 
-    /* event ident must be after 3 pointers as in ngx_connection_t */
-    ngx_int_t                 ident;
-
-    ngx_rbtree_node_t         node;
+    /* PTR: resolved name, A: name to resolve */
+    u_char                   *name;
 
 #if (NGX_HAVE_INET6)
     /* PTR: IPv6 address to resolve (IPv4 address is in rbtree node key) */
@@ -147,6 +143,9 @@ struct ngx_resolver_ctx_s {
     ngx_resolver_t           *resolver;
     ngx_udp_connection_t     *udp_connection;
 
+    /* event ident must be after 3 pointers as in ngx_connection_t */
+    ngx_int_t                 ident;
+
     ngx_int_t                 state;
     ngx_str_t                 name;
 
@@ -162,6 +161,8 @@ struct ngx_resolver_ctx_s {
     ngx_uint_t                quick;  /* unsigned  quick:1; */
     ngx_uint_t                recursion;
     ngx_event_t              *event;
+
+    ngx_resolver_node_t      *node;
 };
 
 
diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index 51887b4..85bfcdb 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -302,6 +302,10 @@ ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data,
         goto invalid;
     }
 
+    if (!u->request_body_sent) {
+        goto invalid;
+    }
+
     if (ngx_terminate || ngx_exiting) {
         goto invalid;
     }
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index d09e3f0..64af447 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1927,6 +1927,7 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
 #if (NGX_HTTP_V2)
         addrs6[i].conf.http2 = addr[i].opt.http2;
 #endif
+        addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
 
         if (addr[i].hash.buckets == NULL
             && (addr[i].wc_head == NULL
diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index 77e92e3..e9562c0 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -172,9 +172,6 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
                 b->file = &rb->temp_file->file;
 
                 rb->bufs = cl;
-
-            } else {
-                rb->bufs = NULL;
             }
         }
 
@@ -466,9 +463,6 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
             b->file = &rb->temp_file->file;
 
             rb->bufs = cl;
-
-        } else {
-            rb->bufs = NULL;
         }
     }
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 6c6ee80..7f377b6 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1441,6 +1441,7 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
     }
 
     u->request_sent = 0;
+    u->request_body_sent = 0;
 
     if (rc == NGX_AGAIN) {
         ngx_add_timer(c->write, u->conf->connect_timeout);
@@ -1825,6 +1826,8 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
 
     /* rc == NGX_OK */
 
+    u->request_body_sent = 1;
+
     if (c->write->timer_set) {
         ngx_del_timer(c->write);
     }
@@ -2496,6 +2499,7 @@ ngx_http_upstream_process_headers(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
             if (r->method != NGX_HTTP_HEAD) {
                 r->method = NGX_HTTP_GET;
+                r->method_name = ngx_http_core_get_method;
             }
 
             ngx_http_internal_redirect(r, &uri, &args);
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 8404265..4246c8a 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -370,6 +370,7 @@ struct ngx_http_upstream_s {
     unsigned                         upgrade:1;
 
     unsigned                         request_sent:1;
+    unsigned                         request_body_sent:1;
     unsigned                         header_sent:1;
 };
 

From e752ea86a642040d3628dbfc496003403d1429bf Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 26 Jan 2016 19:43:53 +0200
Subject: [PATCH 026/600] New upstream release (1.9.10)

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5e94be3..14d5de7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.9.10-1) UNRELEASED; urgency=medium
+
+  [ Christos Trochalakis ]
+  * New upstream release (1.9.10) (Closes: #812806)
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 26 Jan 2016 19:43:29 +0200
+
 nginx (1.9.9-1) unstable; urgency=medium
 
   [ Michael Lustfield ]

From 0bcc8e5f72587e2e3ce56376a9b1343894049753 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 26 Jan 2016 20:11:10 +0200
Subject: [PATCH 027/600] Remove python from nginx-common deps, closes ##808699

ngx-conf is going to be shipped as a separate package.
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 14d5de7..9a30425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ nginx (1.9.10-1) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis ]
   * New upstream release (1.9.10) (Closes: #812806)
+  * debian/control:
+    + Drop python dependency from nginx-common. (Closes: #808699)
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 26 Jan 2016 19:43:29 +0200
 
diff --git a/debian/control b/debian/control
index de705d4..7c60e5f 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,7 @@ Description: small, powerful, scalable web/proxy server - documentation
 
 Package: nginx-common
 Architecture: all
-Depends: lsb-base (>= 3.2-14), ${misc:Depends}, python
+Depends: lsb-base (>= 3.2-14), ${misc:Depends}
 Replaces: nginx (<< 0.8.54-4),
           nginx-extras (<< 0.8.54-4),
           nginx-full (<< 0.8.54-4),

From 19d658f41b1fa17c6ac343001606702a7690982f Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 26 Jan 2016 20:12:14 +0200
Subject: [PATCH 028/600] Release 1.9.10-1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a30425..5b341ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-nginx (1.9.10-1) UNRELEASED; urgency=medium
+nginx (1.9.10-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
   * New upstream release (1.9.10) (Closes: #812806)
   * debian/control:
     + Drop python dependency from nginx-common. (Closes: #808699)
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 26 Jan 2016 19:43:29 +0200
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 26 Jan 2016 20:12:06 +0200
 
 nginx (1.9.9-1) unstable; urgency=medium
 

From 0e20bccf292c0206de80d792ed9dc8a082d7573c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 11 Feb 2016 15:06:14 +0200
Subject: [PATCH 029/600] Imported Upstream version 1.9.11

---
 CHANGES                                    |   12 +
 CHANGES.ru                                 |   12 +
 auto/cc/conf                               |   22 +
 auto/cc/msvc                               |    6 +
 auto/cc/sunc                               |    3 +
 auto/init                                  |    1 +
 auto/install                               |   24 +
 auto/lib/conf                              |    6 +-
 auto/lib/geoip/conf                        |    7 +-
 auto/lib/libgd/conf                        |    7 +-
 auto/lib/libxslt/conf                      |   13 +-
 auto/lib/openssl/conf                      |    3 +-
 auto/make                                  |  209 +++-
 auto/module                                |  122 +++
 auto/modules                               | 1092 ++++++++++++++++----
 auto/options                               |   26 +-
 auto/os/darwin                             |    3 +
 auto/os/win32                              |    5 +
 auto/sources                               |  356 +------
 auto/summary                               |    1 +
 auto/unix                                  |    6 +-
 src/core/nginx.c                           |  116 ++-
 src/core/nginx.h                           |    4 +-
 src/core/ngx_conf_file.c                   |   14 +-
 src/core/ngx_conf_file.h                   |   51 -
 src/core/ngx_core.h                        |    2 +
 src/core/ngx_cycle.c                       |   33 +-
 src/core/ngx_cycle.h                       |    4 +
 src/core/ngx_module.c                      |  361 +++++++
 src/core/ngx_module.h                      |  307 ++++++
 src/core/ngx_resolver.c                    |  876 +++++++++++++---
 src/core/ngx_resolver.h                    |   29 +-
 src/event/ngx_event.c                      |   53 +-
 src/http/modules/ngx_http_rewrite_module.c |    8 +-
 src/http/ngx_http.c                        |   37 +-
 src/http/ngx_http_core_module.c            |   28 +-
 src/http/ngx_http_upstream.c               |   10 +-
 src/http/v2/ngx_http_v2.c                  |   25 +-
 src/http/v2/ngx_http_v2.h                  |    1 -
 src/http/v2/ngx_http_v2_filter_module.c    |    4 +-
 src/mail/ngx_mail.c                        |   25 +-
 src/mail/ngx_mail_core_module.c            |   20 +-
 src/os/unix/ngx_darwin_config.h            |    2 +
 src/os/unix/ngx_dlopen.c                   |   28 +
 src/os/unix/ngx_dlopen.h                   |   31 +
 src/os/unix/ngx_freebsd_config.h           |    2 +
 src/os/unix/ngx_linux_config.h             |    2 +
 src/os/unix/ngx_posix_config.h             |    5 +
 src/os/unix/ngx_process_cycle.c            |   30 +-
 src/os/unix/ngx_solaris_config.h           |    2 +
 src/stream/ngx_stream.c                    |   31 +-
 src/stream/ngx_stream_core_module.c        |    8 +-
 src/stream/ngx_stream_upstream.c           |    8 +-
 53 files changed, 3116 insertions(+), 977 deletions(-)
 create mode 100644 auto/module
 create mode 100644 src/core/ngx_module.c
 create mode 100644 src/core/ngx_module.h
 create mode 100644 src/os/unix/ngx_dlopen.c
 create mode 100644 src/os/unix/ngx_dlopen.h

diff --git a/CHANGES b/CHANGES
index 3827f90..da1fa00 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,16 @@
 
+Changes with nginx 1.9.11                                        09 Feb 2016
+
+    *) Feature: TCP support in resolver.
+
+    *) Feature: dynamic modules.
+
+    *) Bugfix: the $request_length variable did not include size of request
+       headers when using HTTP/2.
+
+    *) Bugfix: in the ngx_http_v2_module.
+
+
 Changes with nginx 1.9.10                                        26 Jan 2016
 
     *) Security: invalid pointer dereference might occur during DNS server
diff --git a/CHANGES.ru b/CHANGES.ru
index 563163a..33302e2 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,16 @@
 
+Изменения в nginx 1.9.11                                          09.02.2016
+
+    *) Добавление: теперь resolver поддерживает TCP.
+
+    *) Добавление: динамические модули.
+
+    *) Исправление: при использовании HTTP/2 переменная $request_length не
+       учитывала размер заголовков запроса.
+
+    *) Исправление: в модуле ngx_http_v2_module.
+
+
 Изменения в nginx 1.9.10                                          26.01.2016
 
     *) Безопасность: при использовании директивы resolver во время обработки
diff --git a/auto/cc/conf b/auto/cc/conf
index edc6d74..35fd39c 100644
--- a/auto/cc/conf
+++ b/auto/cc/conf
@@ -5,12 +5,17 @@
 
 LINK="\$(CC)"
 
+MAIN_LINK=
+MODULE_LINK="-shared"
+
 ngx_include_opt="-I "
 ngx_compile_opt="-c"
+ngx_pic_opt="-fPIC"
 ngx_objout="-o "
 ngx_binout="-o "
 ngx_objext="o"
 ngx_binext=
+ngx_modext=".so"
 
 ngx_long_start=
 ngx_long_end=
@@ -45,6 +50,9 @@ if test -n "$CFLAGS"; then
 
         sunc)
 
+            MAIN_LINK=
+            MODULE_LINK="-G"
+
             case "$NGX_MACHINE" in
 
                 i86pc)
@@ -156,6 +164,20 @@ if [ "$NGX_PLATFORM" != win32 ]; then
     fi
 
 
+    ngx_feature="-Wl,-E switch"
+    ngx_feature_name=
+    ngx_feature_run=no
+    ngx_feature_incs=
+    ngx_feature_path=
+    ngx_feature_libs=-Wl,-E
+    ngx_feature_test=
+    . auto/feature
+
+    if [ $ngx_found = yes ]; then
+        MAIN_LINK="-Wl,-E"
+    fi
+
+
     ngx_feature="gcc builtin atomic operations"
     ngx_feature_name=NGX_HAVE_GCC_ATOMIC
     ngx_feature_run=yes
diff --git a/auto/cc/msvc b/auto/cc/msvc
index 393ba32..e588c48 100644
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -118,6 +118,12 @@ NGX_RCC="rc -fo$NGX_RES \$(CORE_INCS) $NGX_WIN32_RC"
 CORE_LINK="$NGX_RES $CORE_LINK"
 
 
+# dynamic modules
+#MAIN_LINK="-link -def:$NGX_OBJS/nginx.def"
+#MODULE_LINK="-LD $NGX_OBJS/nginx.lib"
+
+
+ngx_pic_opt=
 ngx_objout="-Fo"
 ngx_binout="-Fe"
 ngx_objext="obj"
diff --git a/auto/cc/sunc b/auto/cc/sunc
index 8f12d7c..8360c49 100644
--- a/auto/cc/sunc
+++ b/auto/cc/sunc
@@ -57,6 +57,9 @@ case "$NGX_MACHINE" in
 
 esac
 
+MAIN_LINK=
+MODULE_LINK="-G"
+
 
 # optimizations
 
diff --git a/auto/init b/auto/init
index 910f529..c593eda 100644
--- a/auto/init
+++ b/auto/init
@@ -5,6 +5,7 @@
 
 NGX_MAKEFILE=$NGX_OBJS/Makefile
 NGX_MODULES_C=$NGX_OBJS/ngx_modules.c
+NGX_MODULES=
 
 NGX_AUTO_HEADERS_H=$NGX_OBJS/ngx_auto_headers.h
 NGX_AUTO_CONFIG_H=$NGX_OBJS/ngx_auto_config.h
diff --git a/auto/install b/auto/install
index f7f686c..4dcc743 100644
--- a/auto/install
+++ b/auto/install
@@ -26,6 +26,18 @@ case ".$NGX_SBIN_PATH" in
 esac
 
 
+case ".$NGX_MODULES_PATH" in
+    ./*)
+    ;;
+
+    *)
+        NGX_MODULES_PATH=$NGX_PREFIX/$NGX_MODULES_PATH
+    ;;
+esac
+
+NGX_MODULES_PATH=`dirname $NGX_MODULES_PATH/.`
+
+
 case ".$NGX_CONF_PATH" in
     ./*)
     ;;
@@ -158,12 +170,24 @@ END
 fi
 
 
+if test -n "$NGX_MODULES"; then
+    cat << END                                                >> $NGX_MAKEFILE
+
+	test -d '\$(DESTDIR)$NGX_MODULES_PATH' \
+		|| mkdir -p '\$(DESTDIR)$NGX_MODULES_PATH'
+	cp $NGX_MODULES '\$(DESTDIR)$NGX_MODULES_PATH'
+END
+
+fi
+
+
 # create Makefile
 
 cat << END >> Makefile
 
 build:
 	\$(MAKE) -f $NGX_MAKEFILE
+	\$(MAKE) -f $NGX_MAKEFILE modules
 	\$(MAKE) -f $NGX_MAKEFILE manpage
 
 install:
diff --git a/auto/lib/conf b/auto/lib/conf
index e1e4475..6aaa43a 100644
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -58,11 +58,11 @@ if [ $USE_ZLIB = YES ]; then
     . auto/lib/zlib/conf
 fi
 
-if [ $USE_LIBXSLT = YES ]; then
+if [ $USE_LIBXSLT != NO ]; then
     . auto/lib/libxslt/conf
 fi
 
-if [ $USE_LIBGD = YES ]; then
+if [ $USE_LIBGD != NO ]; then
     . auto/lib/libgd/conf
 fi
 
@@ -70,7 +70,7 @@ if [ $USE_PERL = YES ]; then
     . auto/lib/perl/conf
 fi
 
-if [ $HTTP_GEOIP = YES ]; then
+if [ $USE_GEOIP != NO ]; then
     . auto/lib/geoip/conf
 fi
 
diff --git a/auto/lib/geoip/conf b/auto/lib/geoip/conf
index 53c274d..ebd2e15 100644
--- a/auto/lib/geoip/conf
+++ b/auto/lib/geoip/conf
@@ -67,7 +67,12 @@ fi
 if [ $ngx_found = yes ]; then
 
     CORE_INCS="$CORE_INCS $ngx_feature_path"
-    CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+
+    if [ $USE_GEOIP = YES ]; then
+        CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+    fi
+
+    NGX_LIB_GEOIP=$ngx_feature_libs
 
     if [ $NGX_IPV6 = YES ]; then
         ngx_feature="GeoIP IPv6 support"
diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf
index ff99054..6e4e91c 100644
--- a/auto/lib/libgd/conf
+++ b/auto/lib/libgd/conf
@@ -67,7 +67,12 @@ fi
 if [ $ngx_found = yes ]; then
 
     CORE_INCS="$CORE_INCS $ngx_feature_path"
-    CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+
+    if [ $USE_LIBGD = YES ]; then
+        CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+    fi
+
+    NGX_LIB_LIBGD=$ngx_feature_libs
 
 else
 
diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
index bc19d83..3a0f37b 100644
--- a/auto/lib/libxslt/conf
+++ b/auto/lib/libxslt/conf
@@ -76,7 +76,12 @@ fi
 if [ $ngx_found = yes ]; then
 
     CORE_INCS="$CORE_INCS $ngx_feature_path"
-    CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+
+    if [ $USE_LIBXSLT = YES ]; then
+        CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+    fi
+
+    NGX_LIB_LIBXSLT=$ngx_feature_libs
 
 else
 
@@ -152,5 +157,9 @@ fi
 
 
 if [ $ngx_found = yes ]; then
-    CORE_LIBS="$CORE_LIBS -lexslt"
+    if [ $USE_LIBXSLT = YES ]; then
+        CORE_LIBS="$CORE_LIBS -lexslt"
+    fi
+
+    NGX_LIB_LIBXSLT="$NGX_LIB_LIBXSLT -lexslt"
 fi
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index 28a99b2..2187e5c 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -32,7 +32,6 @@ if [ $OPENSSL != NONE ]; then
             CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
             CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
             CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
-            CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
 
             if [ "$NGX_PLATFORM" = win32 ]; then
                 CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32"
@@ -106,7 +105,7 @@ else
         if [ $ngx_found = yes ]; then
             have=NGX_SSL . auto/have
             CORE_INCS="$CORE_INCS $ngx_feature_path"
-            CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL"
+            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
             OPENSSL=YES
         fi
     fi
diff --git a/auto/make b/auto/make
index dca011c..039a70f 100644
--- a/auto/make
+++ b/auto/make
@@ -98,9 +98,11 @@ fi
 
 # the mail dependencies and include paths
 
-if [ $MAIL = YES ]; then
+if [ $MAIL != NO ]; then
 
-    ngx_all_srcs="$ngx_all_srcs $MAIL_SRCS"
+    if [ $MAIL = YES ]; then
+        ngx_all_srcs="$ngx_all_srcs $MAIL_SRCS"
+    fi
 
     ngx_deps=`echo $MAIL_DEPS \
         | sed -e "s/  *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
@@ -124,9 +126,11 @@ fi
 
 # the stream dependencies and include paths
 
-if [ $STREAM = YES ]; then
+if [ $STREAM != NO ]; then
 
-    ngx_all_srcs="$ngx_all_srcs $STREAM_SRCS"
+    if [ $STREAM = YES ]; then
+        ngx_all_srcs="$ngx_all_srcs $STREAM_SRCS"
+    fi
 
     ngx_deps=`echo $STREAM_DEPS \
         | sed -e "s/  *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
@@ -148,7 +152,7 @@ END
 fi
 
 
-ngx_all_srcs="$ngx_all_srcs $NGX_MISC_SRCS"
+ngx_all_srcs="$ngx_all_srcs $MISC_SRCS"
 
 
 if test -n "$NGX_ADDON_SRCS"; then
@@ -204,6 +208,7 @@ ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \
     | sed -e "s/  *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \
           -e "s/\//$ngx_regex_dirsep/g"`
 
+ngx_libs=
 if test -n "$NGX_LD_OPT$CORE_LIBS"; then
     ngx_libs=`echo $NGX_LD_OPT $CORE_LIBS \
         | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`
@@ -212,13 +217,18 @@ fi
 ngx_link=${CORE_LINK:+`echo $CORE_LINK \
     | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`}
 
+ngx_main_link=${MAIN_LINK:+`echo $MAIN_LINK \
+    | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`}
+
 
 cat << END                                                    >> $NGX_MAKEFILE
 
 $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}:	$ngx_deps$ngx_spacer
-	\$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link
+	\$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
 	$ngx_rcc
 ${ngx_long_end}
+
+modules:
 END
 
 
@@ -365,11 +375,11 @@ fi
 
 # the misc sources
 
-if test -n "$NGX_MISC_SRCS"; then
+if test -n "$MISC_SRCS"; then
 
     ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
 
-    for ngx_src in $NGX_MISC_SRCS
+    for ngx_src in $MISC_SRCS
     do
         ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
         ngx_obj=`echo $ngx_src \
@@ -472,3 +482,186 @@ $ngx_pch
 END
 
 fi
+
+
+# dynamic modules
+
+if test -n "$NGX_PCH"; then
+    ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
+else
+    ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) \$(ALL_INCS)"
+fi
+
+ngx_obj_deps="\$(CORE_DEPS)"
+if [ $HTTP != NO ]; then
+    ngx_obj_deps="$ngx_obj_deps \$(HTTP_DEPS)"
+fi
+if [ $MAIL != NO ]; then
+    ngx_obj_deps="$ngx_obj_deps \$(MAIL_DEPS)"
+fi
+if [ $STREAM != NO ]; then
+    ngx_obj_deps="$ngx_obj_deps \$(STREAM_DEPS)"
+fi
+
+for ngx_module in $DYNAMIC_MODULES
+do
+    eval ngx_module_srcs="\$${ngx_module}_SRCS"
+    eval eval ngx_module_libs="\\\"\$${ngx_module}_LIBS\\\""
+
+    eval ngx_module_modules="\$${ngx_module}_MODULES"
+    eval ngx_module_order="\$${ngx_module}_ORDER"
+
+    ngx_modules_c=$NGX_OBJS/${ngx_module}_modules.c
+
+    cat << END                                    > $ngx_modules_c
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+END
+
+    for mod in $ngx_module_modules
+    do
+        echo "extern ngx_module_t  $mod;"         >> $ngx_modules_c
+    done
+
+    echo                                          >> $ngx_modules_c
+    echo 'ngx_module_t *ngx_modules[] = {'        >> $ngx_modules_c
+
+    for mod in $ngx_module_modules
+    do
+        echo "    &$mod,"                         >> $ngx_modules_c
+    done
+
+    cat << END                                    >> $ngx_modules_c
+    NULL
+};
+
+END
+
+    echo 'char *ngx_module_names[] = {'           >> $ngx_modules_c
+
+    for mod in $ngx_module_modules
+    do
+        echo "    \"$mod\","                      >> $ngx_modules_c
+    done
+
+    cat << END                                    >> $ngx_modules_c
+    NULL
+};
+
+END
+
+    echo 'char *ngx_module_order[] = {'           >> $ngx_modules_c
+
+    for mod in $ngx_module_order
+    do
+        echo "    \"$mod\","                      >> $ngx_modules_c
+    done
+
+    cat << END                                    >> $ngx_modules_c
+    NULL
+};
+
+END
+
+    ngx_modules_c=`echo $ngx_modules_c | sed -e "s/\//$ngx_regex_dirsep/g"`
+
+    ngx_modules_obj=`echo $ngx_modules_c \
+        | sed -e "s/\(.*\.\)c/\1$ngx_objext/"`
+
+    ngx_module_objs=
+    for ngx_src in $ngx_module_srcs
+    do
+        case "$ngx_src" in
+            src/*)
+                ngx_obj=$ngx_src
+                ;;
+            *)
+                ngx_obj="addon/`basename \`dirname $ngx_src\``"
+                mkdir -p $NGX_OBJS/$ngx_obj
+                ngx_obj="$ngx_obj/`basename $ngx_src`"
+                ;;
+        esac
+
+        ngx_module_objs="$ngx_module_objs $ngx_obj"
+    done
+
+    ngx_module_objs=`echo $ngx_module_objs \
+        | sed -e "s#\([^ ]*\.\)cpp#$NGX_OBJS\/\1$ngx_objext#g" \
+              -e "s#\([^ ]*\.\)cc#$NGX_OBJS\/\1$ngx_objext#g" \
+              -e "s#\([^ ]*\.\)c#$NGX_OBJS\/\1$ngx_objext#g" \
+              -e "s#\([^ ]*\.\)S#$NGX_OBJS\/\1$ngx_objext#g"`
+
+    ngx_deps=`echo $ngx_module_objs $ngx_modules_obj $LINK_DEPS \
+        | sed -e "s/  *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
+              -e "s/\//$ngx_regex_dirsep/g"`
+
+    ngx_objs=`echo $ngx_module_objs $ngx_modules_obj \
+        | sed -e "s/  *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \
+              -e "s/\//$ngx_regex_dirsep/g"`
+
+    ngx_obj=$NGX_OBJS${ngx_dirsep}${ngx_module}${ngx_modext}
+
+    NGX_MODULES="$NGX_MODULES $ngx_obj"
+
+    if [ "$NGX_PLATFORM" = win32 ]; then
+        ngx_module_libs="$CORE_LIBS $ngx_module_libs"
+    fi
+
+    ngx_libs=
+    if test -n "$NGX_LD_OPT$ngx_module_libs"; then
+        ngx_libs=`echo $NGX_LD_OPT $ngx_module_libs \
+            | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`
+    fi
+
+    ngx_link=${CORE_LINK:+`echo $CORE_LINK \
+        | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`}
+
+    ngx_module_link=${MODULE_LINK:+`echo $MODULE_LINK \
+        | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`}
+
+
+    cat << END                                            >> $NGX_MAKEFILE
+
+modules:	$ngx_obj
+
+$ngx_obj:	$ngx_deps$ngx_spacer
+	\$(LINK) $ngx_long_start$ngx_binout$ngx_obj$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_module_link
+$ngx_long_end
+
+$ngx_modules_obj:	\$(CORE_DEPS)$ngx_cont$ngx_modules_c
+	$ngx_cc$ngx_tab$ngx_objout$ngx_modules_obj$ngx_tab$ngx_modules_c$NGX_AUX
+
+END
+
+    for ngx_src in $ngx_module_srcs
+    do
+        case "$ngx_src" in
+            src/*)
+                ngx_obj=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
+                ;;
+            *)
+                ngx_obj="addon/`basename \`dirname $ngx_src\``"
+                ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \
+                    | sed -e "s/\//$ngx_regex_dirsep/g"`
+                ;;
+        esac
+
+        ngx_obj=`echo $ngx_obj \
+            | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \
+                  -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \
+                  -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \
+                  -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"`
+
+        ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
+
+        cat << END                                        >> $NGX_MAKEFILE
+
+$ngx_obj:	$ngx_obj_deps$ngx_cont$ngx_src
+	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
+
+END
+
+    done
+done
diff --git a/auto/module b/auto/module
new file mode 100644
index 0000000..908f0c6
--- /dev/null
+++ b/auto/module
@@ -0,0 +1,122 @@
+
+# Copyright (C) Ruslan Ermilov
+# Copyright (C) Nginx, Inc.
+
+
+case $ngx_module_type in
+    HTTP_*) ngx_var=HTTP ;;
+    *)      ngx_var=$ngx_module_type ;;
+esac
+
+
+if [ "$ngx_module_link" = DYNAMIC ]; then
+
+    for ngx_module in $ngx_module_name; do
+        # extract the first name
+        break
+    done
+
+    DYNAMIC_MODULES="$DYNAMIC_MODULES $ngx_module"
+    eval ${ngx_module}_SRCS=\"$ngx_module_srcs\"
+
+    eval ${ngx_module}_MODULES=\"$ngx_module_name\"
+
+    if [ -z "$ngx_module_order" -a \
+         \( "$ngx_module_type" = "HTTP_FILTER" \
+         -o "$ngx_module_type" = "HTTP_AUX_FILTER" \) ]
+    then
+        eval ${ngx_module}_ORDER=\"$ngx_module_name \
+                                   ngx_http_copy_filter_module\"
+    else
+        eval ${ngx_module}_ORDER=\"$ngx_module_order\"
+    fi
+
+    if test -n "$ngx_module_incs"; then
+        CORE_INCS="$CORE_INCS $ngx_module_incs"
+    fi
+
+    libs=
+    for lib in $ngx_module_libs
+    do
+        case $lib in
+
+            LIBXSLT | LIBGD | GEOIP)
+                libs="$libs \$NGX_LIB_$lib"
+
+                if eval [ "\$USE_${lib}" = NO ] ; then
+                    eval USE_${lib}=DYNAMIC
+                fi
+            ;;
+
+            PCRE | OPENSSL | MD5 | SHA1 | ZLIB | PERL)
+                eval USE_${lib}=YES
+            ;;
+
+            *)
+                libs="$libs $lib"
+            ;;
+
+        esac
+    done
+    eval ${ngx_module}_LIBS=\'$libs\'
+
+elif [ "$ngx_module_link" = YES ]; then
+
+    eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
+                                      $ngx_module_name\"
+
+    eval ${ngx_var}_SRCS=\"\$${ngx_var}_SRCS $ngx_module_srcs\"
+
+    if test -n "$ngx_module_incs"; then
+        eval ${ngx_var}_INCS=\"\$${ngx_var}_INCS $ngx_module_incs\"
+    fi
+
+    if test -n "$ngx_module_deps"; then
+        eval ${ngx_var}_DEPS=\"\$${ngx_var}_DEPS $ngx_module_deps\"
+    fi
+
+    for lib in $ngx_module_libs
+    do
+        case $lib in
+
+            PCRE | OPENSSL | MD5 | SHA1 | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
+                eval USE_${lib}=YES
+            ;;
+
+            *)
+                CORE_LIBS="$CORE_LIBS $lib"
+            ;;
+
+        esac
+    done
+
+elif [ "$ngx_module_link" = ADDON ]; then
+
+    eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
+                                      $ngx_module_name\"
+
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_module_srcs"
+
+    if test -n "$ngx_module_incs"; then
+        eval ${ngx_var}_INCS=\"\$${ngx_var}_INCS $ngx_module_incs\"
+    fi
+
+    if test -n "$ngx_module_deps"; then
+        NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_module_deps"
+    fi
+
+    for lib in $ngx_module_libs
+    do
+        case $lib in
+
+            PCRE | OPENSSL | MD5 | SHA1 | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
+                eval USE_${lib}=YES
+            ;;
+
+            *)
+                CORE_LIBS="$CORE_LIBS $lib"
+            ;;
+
+        esac
+    done
+fi
diff --git a/auto/modules b/auto/modules
index b2d2ee4..2074778 100644
--- a/auto/modules
+++ b/auto/modules
@@ -55,6 +55,45 @@ if [ $NGX_TEST_BUILD_SOLARIS_SENDFILEV = YES ]; then
 fi
 
 
+HTTP_MODULES=
+HTTP_DEPS=
+HTTP_INCS=
+
+ngx_module_type=HTTP
+
+if :; then
+    ngx_module_name="ngx_http_module \
+                     ngx_http_core_module \
+                     ngx_http_log_module \
+                     ngx_http_upstream_module"
+    ngx_module_incs="src/http src/http/modules"
+    ngx_module_deps="src/http/ngx_http.h \
+                     src/http/ngx_http_request.h \
+                     src/http/ngx_http_config.h \
+                     src/http/ngx_http_core_module.h \
+                     src/http/ngx_http_cache.h \
+                     src/http/ngx_http_variables.h \
+                     src/http/ngx_http_script.h \
+                     src/http/ngx_http_upstream.h \
+                     src/http/ngx_http_upstream_round_robin.h"
+    ngx_module_srcs="src/http/ngx_http.c \
+                     src/http/ngx_http_core_module.c \
+                     src/http/ngx_http_special_response.c \
+                     src/http/ngx_http_request.c \
+                     src/http/ngx_http_parse.c \
+                     src/http/modules/ngx_http_log_module.c \
+                     src/http/ngx_http_request_body.c \
+                     src/http/ngx_http_variables.c \
+                     src/http/ngx_http_script.c \
+                     src/http/ngx_http_upstream.c \
+                     src/http/ngx_http_upstream_round_robin.c"
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
+fi
+
+
 if [ $HTTP != YES ]; then
     have=NGX_CRYPT . auto/nohave
     CRYPT_LIB=
@@ -117,297 +156,903 @@ fi
 #     ngx_http_not_modified_filter
 #     ngx_http_slice_filter
 
-HTTP_FILTER_MODULES="$HTTP_WRITE_FILTER_MODULE \
-                     $HTTP_HEADER_FILTER_MODULE \
-                     $HTTP_CHUNKED_FILTER_MODULE"
+ngx_module_type=HTTP_FILTER
+HTTP_FILTER_MODULES=
 
-if [ $HTTP_V2 = YES ]; then
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_V2_FILTER_MODULE"
+ngx_module_order="ngx_http_static_module \
+                  ngx_http_gzip_static_module \
+                  ngx_http_dav_module \
+                  ngx_http_autoindex_module \
+                  ngx_http_index_module \
+                  ngx_http_random_index_module \
+                  ngx_http_access_module \
+                  ngx_http_realip_module \
+                  ngx_http_write_filter_module \
+                  ngx_http_header_filter_module \
+                  ngx_http_chunked_filter_module \
+                  ngx_http_v2_filter_module \
+                  ngx_http_range_header_filter_module \
+                  ngx_http_gzip_filter_module \
+                  ngx_http_postpone_filter_module \
+                  ngx_http_ssi_filter_module \
+                  ngx_http_charset_filter_module \
+                  ngx_http_xslt_filter_module \
+                  ngx_http_image_filter_module \
+                  ngx_http_sub_filter_module \
+                  ngx_http_addition_filter_module \
+                  ngx_http_gunzip_filter_module \
+                  ngx_http_userid_filter_module \
+                  ngx_http_headers_filter_module \
+                  ngx_http_copy_filter_module \
+                  ngx_http_range_body_filter_module \
+                  ngx_http_not_modified_filter_module \
+                  ngx_http_slice_filter_module"
+
+if :; then
+    ngx_module_name=ngx_http_write_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/ngx_http_write_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
 fi
 
-HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_RANGE_HEADER_FILTER_MODULE"
+if :; then
+    ngx_module_name=ngx_http_header_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/ngx_http_header_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
+fi
+
+if :; then
+    ngx_module_name=ngx_http_chunked_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_chunked_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
+fi
+
+if [ $HTTP_V2 = YES ]; then
+    ngx_module_name=ngx_http_v2_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/v2/ngx_http_v2_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_V2
+
+    . auto/module
+fi
+
+if :; then
+    ngx_module_name=ngx_http_range_header_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_range_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
+fi
 
 if [ $HTTP_GZIP = YES ]; then
     have=NGX_HTTP_GZIP . auto/have
     USE_ZLIB=YES
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_GZIP_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_GZIP_SRCS"
+
+    ngx_module_name=ngx_http_gzip_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_gzip_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_GZIP
+
+    . auto/module
 fi
 
 if [ $HTTP_POSTPONE = YES ]; then
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
+    ngx_module_name=ngx_http_postpone_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/ngx_http_postpone_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_POSTPONE
+
+    . auto/module
 fi
 
 if [ $HTTP_SSI = YES ]; then
     have=NGX_HTTP_SSI . auto/have
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE"
-    HTTP_DEPS="$HTTP_DEPS $HTTP_SSI_DEPS"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS"
+
+    ngx_module_name=ngx_http_ssi_filter_module
+    ngx_module_incs=
+    ngx_module_deps=src/http/modules/ngx_http_ssi_filter_module.h
+    ngx_module_srcs=src/http/modules/ngx_http_ssi_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_SSI
+
+    . auto/module
 fi
 
 if [ $HTTP_CHARSET = YES ]; then
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
+    ngx_module_name=ngx_http_charset_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_charset_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_CHARSET
+
+    . auto/module
 fi
 
-if [ $HTTP_XSLT = YES ]; then
-    USE_LIBXSLT=YES
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_XSLT_SRCS"
+if [ $HTTP_XSLT != NO ]; then
+    ngx_module_name=ngx_http_xslt_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_xslt_filter_module.c
+    ngx_module_libs=LIBXSLT
+    ngx_module_link=$HTTP_XSLT
+
+    . auto/module
 fi
 
-if [ $HTTP_IMAGE_FILTER = YES ]; then
-    USE_LIBGD=YES
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_IMAGE_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_IMAGE_SRCS"
+if [ $HTTP_IMAGE_FILTER != NO ]; then
+    ngx_module_name=ngx_http_image_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_image_filter_module.c
+    ngx_module_libs=LIBGD
+    ngx_module_link=$HTTP_IMAGE_FILTER
+
+    . auto/module
 fi
 
 if [ $HTTP_SUB = YES ]; then
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SUB_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_SUB_SRCS"
+    ngx_module_name=ngx_http_sub_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_sub_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_SUB
+
+    . auto/module
 fi
 
 if [ $HTTP_ADDITION = YES ]; then
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_ADDITION_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_ADDITION_SRCS"
+    ngx_module_name=ngx_http_addition_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_addition_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_ADDITION
+
+    . auto/module
 fi
 
 if [ $HTTP_GUNZIP = YES ]; then
     have=NGX_HTTP_GZIP . auto/have
     USE_ZLIB=YES
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_GUNZIP_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_GUNZIP_SRCS"
+
+    ngx_module_name=ngx_http_gunzip_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_gunzip_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_GUNZIP
+
+    . auto/module
 fi
 
 if [ $HTTP_USERID = YES ]; then
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_USERID_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_USERID_SRCS"
+    ngx_module_name=ngx_http_userid_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_userid_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_USERID
+
+    . auto/module
+fi
+
+if :; then
+    ngx_module_name=ngx_http_headers_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_headers_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
+fi
+
+
+ngx_module_type=HTTP_INIT_FILTER
+HTTP_INIT_FILTER_MODULES=
+
+if :; then
+    ngx_module_name=ngx_http_copy_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/ngx_http_copy_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
+fi
+
+if :; then
+    ngx_module_name=ngx_http_range_body_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
+fi
+
+if :; then
+    ngx_module_name=ngx_http_not_modified_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_not_modified_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
 fi
 
 if [ $HTTP_SLICE = YES ]; then
-    HTTP_SRCS="$HTTP_SRCS $HTTP_SLICE_SRCS"
-else
-    HTTP_SLICE_FILTER_MODULE=""
+    ngx_module_name=ngx_http_slice_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_slice_filter_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_SLICE
+
+    . auto/module
 fi
 
 
+ngx_module_type=HTTP
+
 if [ $HTTP_V2 = YES ]; then
     have=NGX_HTTP_V2 . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_V2_MODULE"
-    HTTP_INCS="$HTTP_INCS $HTTP_V2_INCS"
-    HTTP_DEPS="$HTTP_DEPS $HTTP_V2_DEPS"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_V2_SRCS"
+
+    ngx_module_name=ngx_http_v2_module
+    ngx_module_incs=src/http/v2
+    ngx_module_deps="src/http/v2/ngx_http_v2.h src/http/v2/ngx_http_v2_module.h"
+    ngx_module_srcs="src/http/v2/ngx_http_v2.c \
+                     src/http/v2/ngx_http_v2_table.c \
+                     src/http/v2/ngx_http_v2_huff_decode.c \
+                     src/http/v2/ngx_http_v2_huff_encode.c \
+                     src/http/v2/ngx_http_v2_module.c"
+    ngx_module_libs=
+    ngx_module_link=$HTTP_V2
+
+    . auto/module
 fi
 
-HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE"
+if :; then
+    ngx_module_name=ngx_http_static_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_static_module.c
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
+fi
 
 if [ $HTTP_GZIP_STATIC = YES ]; then
     have=NGX_HTTP_GZIP . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_GZIP_STATIC_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_GZIP_STATIC_SRCS"
+
+    ngx_module_name=ngx_http_gzip_static_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_gzip_static_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_GZIP_STATIC
+
+    . auto/module
 fi
 
 if [ $HTTP_DAV = YES ]; then
     have=NGX_HTTP_DAV . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_DAV_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_DAV_SRCS"
+
+    ngx_module_name=ngx_http_dav_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_dav_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_DAV
+
+    . auto/module
 fi
 
 if [ $HTTP_AUTOINDEX = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_AUTOINDEX_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_AUTOINDEX_SRCS"
+    ngx_module_name=ngx_http_autoindex_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_autoindex_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_AUTOINDEX
+
+    . auto/module
 fi
 
-HTTP_MODULES="$HTTP_MODULES $HTTP_INDEX_MODULE"
+if :; then
+    ngx_module_name=ngx_http_index_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_index_module.c
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    . auto/module
+fi
 
 if [ $HTTP_RANDOM_INDEX = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_RANDOM_INDEX_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_RANDOM_INDEX_SRCS"
+    ngx_module_name=ngx_http_random_index_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_random_index_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_RANDOM_INDEX
+
+    . auto/module
 fi
 
 if [ $HTTP_AUTH_REQUEST = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_AUTH_REQUEST_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_AUTH_REQUEST_SRCS"
+    ngx_module_name=ngx_http_auth_request_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_auth_request_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_AUTH_REQUEST
+
+    . auto/module
 fi
 
 if [ $HTTP_AUTH_BASIC = YES ]; then
     USE_MD5=YES
     USE_SHA1=YES
     have=NGX_CRYPT . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_AUTH_BASIC_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_AUTH_BASIC_SRCS"
+
+    ngx_module_name=ngx_http_auth_basic_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_auth_basic_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_AUTH_BASIC
+
+    . auto/module
     CORE_LIBS="$CORE_LIBS $CRYPT_LIB"
 fi
 
 if [ $HTTP_ACCESS = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_ACCESS_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_ACCESS_SRCS"
+    ngx_module_name=ngx_http_access_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_access_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_ACCESS
+
+    . auto/module
 fi
 
 if [ $HTTP_LIMIT_CONN = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_LIMIT_CONN_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_LIMIT_CONN_SRCS"
+    ngx_module_name=ngx_http_limit_conn_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_limit_conn_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_LIMIT_CONN
+
+    . auto/module
 fi
 
 if [ $HTTP_LIMIT_REQ = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_LIMIT_REQ_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_LIMIT_REQ_SRCS"
+    ngx_module_name=ngx_http_limit_req_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_limit_req_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_LIMIT_REQ
+
+    . auto/module
 fi
 
 if [ $HTTP_REALIP = YES ]; then
     have=NGX_HTTP_REALIP . auto/have
     have=NGX_HTTP_X_FORWARDED_FOR . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_REALIP_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_REALIP_SRCS"
+
+    ngx_module_name=ngx_http_realip_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_realip_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_REALIP
+
+    . auto/module
 fi
 
 if [ $HTTP_STATUS = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_STATUS_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_STATUS_SRCS"
+    ngx_module_name=ngx_http_status_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_status_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_STATUS
+
+    . auto/module
 fi
 
 if [ $HTTP_GEO = YES ]; then
     have=NGX_HTTP_X_FORWARDED_FOR . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS"
+
+    ngx_module_name=ngx_http_geo_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_geo_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_GEO
+
+    . auto/module
 fi
 
-if [ $HTTP_GEOIP = YES ]; then
+if [ $HTTP_GEOIP != NO ]; then
     have=NGX_HTTP_X_FORWARDED_FOR . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS"
+
+    ngx_module_name=ngx_http_geoip_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_geoip_module.c
+    ngx_module_libs=GEOIP
+    ngx_module_link=$HTTP_GEOIP
+
+    . auto/module
 fi
 
 if [ $HTTP_MAP = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_MAP_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_MAP_SRCS"
+    ngx_module_name=ngx_http_map_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_map_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_MAP
+
+    . auto/module
 fi
 
 if [ $HTTP_SPLIT_CLIENTS = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_SPLIT_CLIENTS_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_SPLIT_CLIENTS_SRCS"
+    ngx_module_name=ngx_http_split_clients_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_split_clients_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_SPLIT_CLIENTS
+
+    . auto/module
 fi
 
 if [ $HTTP_REFERER = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_REFERER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_REFERER_SRCS"
+    ngx_module_name=ngx_http_referer_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_referer_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_REFERER
+
+    . auto/module
 fi
 
 if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then
     USE_PCRE=YES
-    HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS"
+
+    ngx_module_name=ngx_http_rewrite_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_rewrite_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_REWRITE
+
+    . auto/module
 fi
 
 if [ $HTTP_SSL = YES ]; then
     USE_OPENSSL=YES
     have=NGX_HTTP_SSL . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_SSL_MODULE"
-    HTTP_DEPS="$HTTP_DEPS $HTTP_SSL_DEPS"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_SSL_SRCS"
+
+    ngx_module_name=ngx_http_ssl_module
+    ngx_module_incs=
+    ngx_module_deps=src/http/modules/ngx_http_ssl_module.h
+    ngx_module_srcs=src/http/modules/ngx_http_ssl_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_SSL
+
+    . auto/module
 fi
 
 if [ $HTTP_PROXY = YES ]; then
     have=NGX_HTTP_X_FORWARDED_FOR . auto/have
     #USE_MD5=YES
-    HTTP_MODULES="$HTTP_MODULES $HTTP_PROXY_MODULE"
-    HTTP_DEPS="$HTTP_DEPS $HTTP_PROXY_DEPS"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_PROXY_SRCS"
+
+    ngx_module_name=ngx_http_proxy_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_proxy_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_PROXY
+
+    . auto/module
 fi
 
 if [ $HTTP_FASTCGI = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_FASTCGI_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_FASTCGI_SRCS"
+    ngx_module_name=ngx_http_fastcgi_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_fastcgi_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_FASTCGI
+
+    . auto/module
 fi
 
 if [ $HTTP_UWSGI = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_UWSGI_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_UWSGI_SRCS"
+    ngx_module_name=ngx_http_uwsgi_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_uwsgi_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_UWSGI
+
+    . auto/module
 fi
 
 if [ $HTTP_SCGI = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_SCGI_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_SCGI_SRCS"
+    ngx_module_name=ngx_http_scgi_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_scgi_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_SCGI
+
+    . auto/module
 fi
 
 if [ $HTTP_PERL = YES ]; then
     USE_PERL=YES
-    HTTP_MODULES="$HTTP_MODULES $HTTP_PERL_MODULE"
-    HTTP_INCS="$HTTP_INCS $HTTP_PERL_INCS"
-    HTTP_DEPS="$HTTP_DEPS $HTTP_PERL_DEPS"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_PERL_SRCS"
+
+    ngx_module_name=ngx_http_perl_module
+    ngx_module_incs=src/http/modules/perl
+    ngx_module_deps=src/http/modules/perl/ngx_http_perl_module.h
+    ngx_module_srcs=src/http/modules/perl/ngx_http_perl_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_PERL
+
+    . auto/module
 fi
 
 if [ $HTTP_MEMCACHED = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_MEMCACHED_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_MEMCACHED_SRCS"
+    ngx_module_name=ngx_http_memcached_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_memcached_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_MEMCACHED
+
+    . auto/module
 fi
 
 if [ $HTTP_EMPTY_GIF = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_EMPTY_GIF_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_EMPTY_GIF_SRCS"
+    ngx_module_name=ngx_http_empty_gif_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_empty_gif_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_EMPTY_GIF
+
+    . auto/module
 fi
 
 if [ $HTTP_BROWSER = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_BROWSER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_BROWSER_SRCS"
+    ngx_module_name=ngx_http_browser_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_browser_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_BROWSER
+
+    . auto/module
 fi
 
 if [ $HTTP_SECURE_LINK = YES ]; then
     USE_MD5=YES
-    HTTP_MODULES="$HTTP_MODULES $HTTP_SECURE_LINK_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_SECURE_LINK_SRCS"
+
+    ngx_module_name=ngx_http_secure_link_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_secure_link_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_SECURE_LINK
+
+    . auto/module
 fi
 
 if [ $HTTP_DEGRADATION = YES ]; then
     have=NGX_HTTP_DEGRADATION . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_DEGRADATION_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_DEGRADATION_SRCS"
+
+    ngx_module_name=ngx_http_degradation_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_degradation_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_DEGRADATION
+
+    . auto/module
 fi
 
 if [ $HTTP_FLV = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_FLV_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_FLV_SRCS"
+    ngx_module_name=ngx_http_flv_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_flv_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_FLV
+
+    . auto/module
 fi
 
 if [ $HTTP_MP4 = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_MP4_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_MP4_SRCS"
+    ngx_module_name=ngx_http_mp4_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_mp4_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_MP4
+
+    . auto/module
 fi
 
 if [ $HTTP_UPSTREAM_HASH = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_HASH_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_HASH_SRCS"
+    ngx_module_name=ngx_http_upstream_hash_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_upstream_hash_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_UPSTREAM_HASH
+
+    . auto/module
 fi
 
 if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_IP_HASH_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS"
+    ngx_module_name=ngx_http_upstream_ip_hash_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_upstream_ip_hash_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_UPSTREAM_IP_HASH
+
+    . auto/module
 fi
 
 if [ $HTTP_UPSTREAM_LEAST_CONN = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_LEAST_CONN_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_LEAST_CONN_SRCS"
+    ngx_module_name=ngx_http_upstream_least_conn_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_upstream_least_conn_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_UPSTREAM_LEAST_CONN
+
+    . auto/module
 fi
 
 if [ $HTTP_UPSTREAM_KEEPALIVE = YES ]; then
-    HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_KEEPALIVE_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_KEEPALIVE_SRCS"
+    ngx_module_name=ngx_http_upstream_keepalive_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_upstream_keepalive_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_UPSTREAM_KEEPALIVE
+
+    . auto/module
 fi
 
 if [ $HTTP_UPSTREAM_ZONE = YES ]; then
     have=NGX_HTTP_UPSTREAM_ZONE . auto/have
-    HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_ZONE_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_ZONE_SRCS"
+
+    ngx_module_name=ngx_http_upstream_zone_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_upstream_zone_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_UPSTREAM_ZONE
+
+    . auto/module
 fi
 
 if [ $HTTP_STUB_STATUS = YES ]; then
     have=NGX_STAT_STUB . auto/have
-    HTTP_MODULES="$HTTP_MODULES ngx_http_stub_status_module"
-    HTTP_SRCS="$HTTP_SRCS src/http/modules/ngx_http_stub_status_module.c"
+
+    ngx_module_name=ngx_http_stub_status_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/http/modules/ngx_http_stub_status_module.c
+    ngx_module_libs=
+    ngx_module_link=$HTTP_STUB_STATUS
+
+    . auto/module
 fi
 
+
+if [ $MAIL != NO ]; then
+    MAIL_MODULES=
+    MAIL_DEPS=
+    MAIL_INCS=
+
+    ngx_module_type=MAIL
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    ngx_module_order=
+
+    ngx_module_name="ngx_mail_module ngx_mail_core_module"
+    ngx_module_incs="src/mail"
+    ngx_module_deps="src/mail/ngx_mail.h"
+    ngx_module_srcs="src/mail/ngx_mail.c \
+                     src/mail/ngx_mail_core_module.c \
+                     src/mail/ngx_mail_handler.c \
+                     src/mail/ngx_mail_parse.c"
+
+    . auto/module
+
+    ngx_module_incs=
+
+    if [ $MAIL_SSL = YES ]; then
+        USE_OPENSSL=YES
+        have=NGX_MAIL_SSL . auto/have
+
+        ngx_module_name=ngx_mail_ssl_module
+        ngx_module_deps=src/mail/ngx_mail_ssl_module.h
+        ngx_module_srcs=src/mail/ngx_mail_ssl_module.c
+
+        . auto/module
+    fi
+
+    if [ $MAIL_POP3 = YES ]; then
+        ngx_module_name=ngx_mail_pop3_module
+        ngx_module_deps=src/mail/ngx_mail_pop3_module.h
+        ngx_module_srcs="src/mail/ngx_mail_pop3_module.c \
+                         src/mail/ngx_mail_pop3_handler.c"
+
+        . auto/module
+    fi
+
+    if [ $MAIL_IMAP = YES ]; then
+        ngx_module_name=ngx_mail_imap_module
+        ngx_module_deps=src/mail/ngx_mail_imap_module.h
+        ngx_module_srcs="src/mail/ngx_mail_imap_module.c \
+                         src/mail/ngx_mail_imap_handler.c"
+
+        . auto/module
+    fi
+
+    if [ $MAIL_SMTP = YES ]; then
+        ngx_module_name=ngx_mail_smtp_module
+        ngx_module_deps=src/mail/ngx_mail_smtp_module.h
+        ngx_module_srcs="src/mail/ngx_mail_smtp_module.c \
+                         src/mail/ngx_mail_smtp_handler.c"
+
+        . auto/module
+    fi
+
+    ngx_module_name=ngx_mail_auth_http_module
+    ngx_module_deps=
+    ngx_module_srcs=src/mail/ngx_mail_auth_http_module.c
+
+    . auto/module
+
+    ngx_module_name=ngx_mail_proxy_module
+    ngx_module_deps=
+    ngx_module_srcs=src/mail/ngx_mail_proxy_module.c
+
+    . auto/module
+fi
+
+
+if [ $STREAM != NO ]; then
+    STREAM_MODULES=
+    STREAM_DEPS=
+    STREAM_INCS=
+
+    ngx_module_type=STREAM
+    ngx_module_libs=
+    ngx_module_link=YES
+
+    ngx_module_order=
+
+    ngx_module_name="ngx_stream_module \
+                     ngx_stream_core_module \
+                     ngx_stream_proxy_module \
+                     ngx_stream_upstream_module"
+    ngx_module_incs="src/stream"
+    ngx_module_deps="src/stream/ngx_stream.h \
+                     src/stream/ngx_stream_upstream.h \
+                     src/stream/ngx_stream_upstream_round_robin.h"
+    ngx_module_srcs="src/stream/ngx_stream.c \
+                     src/stream/ngx_stream_handler.c \
+                     src/stream/ngx_stream_core_module.c \
+                     src/stream/ngx_stream_proxy_module.c \
+                     src/stream/ngx_stream_upstream.c \
+                     src/stream/ngx_stream_upstream_round_robin.c"
+
+    . auto/module
+
+    ngx_module_incs=
+
+    if [ $STREAM_SSL = YES ]; then
+        USE_OPENSSL=YES
+        have=NGX_STREAM_SSL . auto/have
+
+        ngx_module_name=ngx_stream_ssl_module
+        ngx_module_deps=src/stream/ngx_stream_ssl_module.h
+        ngx_module_srcs=src/stream/ngx_stream_ssl_module.c
+
+        . auto/module
+    fi
+
+    if [ $STREAM_LIMIT_CONN = YES ]; then
+        ngx_module_name=ngx_stream_limit_conn_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_limit_conn_module.c
+
+        . auto/module
+    fi
+
+    if [ $STREAM_ACCESS = YES ]; then
+        ngx_module_name=ngx_stream_access_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_access_module.c
+
+        . auto/module
+    fi
+
+    if [ $STREAM_UPSTREAM_HASH = YES ]; then
+        ngx_module_name=ngx_stream_upstream_hash_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_upstream_hash_module.c
+
+        . auto/module
+    fi
+
+    if [ $STREAM_UPSTREAM_LEAST_CONN = YES ]; then
+        ngx_module_name=ngx_stream_upstream_least_conn_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_upstream_least_conn_module.c
+
+        . auto/module
+    fi
+
+    if [ $STREAM_UPSTREAM_ZONE = YES ]; then
+        have=NGX_STREAM_UPSTREAM_ZONE . auto/have
+
+        ngx_module_name=ngx_stream_upstream_zone_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_upstream_zone_module.c
+
+        . auto/module
+    fi
+fi
+
+
 #if [ -r $NGX_OBJS/auto ]; then
 #    . $NGX_OBJS/auto
 #fi
@@ -421,6 +1066,15 @@ if test -n "$NGX_ADDONS"; then
     do
         echo "adding module in $ngx_addon_dir"
 
+        ngx_module_type=
+        ngx_module_name=
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=
+        ngx_module_libs=
+        ngx_module_order=
+        ngx_module_link=ADDON
+
         if test -f $ngx_addon_dir/config; then
             . $ngx_addon_dir/config
 
@@ -434,15 +1088,62 @@ if test -n "$NGX_ADDONS"; then
 fi
 
 
-if [ $MAIL_SSL = YES ]; then
-    have=NGX_MAIL_SSL . auto/have
-    USE_OPENSSL=YES
+if test -n "$DYNAMIC_ADDONS"; then
+
+    echo configuring additional dynamic modules
+
+    for ngx_addon_dir in $DYNAMIC_ADDONS
+    do
+        echo "adding module in $ngx_addon_dir"
+
+        ngx_module_type=
+        ngx_module_name=
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=
+        ngx_module_libs=
+        ngx_module_order=
+        ngx_module_link=DYNAMIC
+
+        if test -f $ngx_addon_dir/config; then
+            . $ngx_addon_dir/config
+
+            echo " + $ngx_addon_name was configured"
+
+        else
+            echo "$0: error: no $ngx_addon_dir/config was found"
+            exit 1
+        fi
+    done
 fi
 
 
-if [ $STREAM_SSL = YES ]; then
-    have=NGX_STREAM_SSL . auto/have
-    USE_OPENSSL=YES
+if [ $USE_OPENSSL = YES ]; then
+    ngx_module_type=CORE
+    ngx_module_name=ngx_openssl_module
+    ngx_module_incs=
+    ngx_module_deps=src/event/ngx_event_openssl.h
+    ngx_module_srcs="src/event/ngx_event_openssl.c
+                     src/event/ngx_event_openssl_stapling.c"
+    ngx_module_libs=
+    ngx_module_link=YES
+    ngx_module_order=
+
+    . auto/module
+fi
+
+
+if [ $USE_PCRE = YES ]; then
+    ngx_module_type=CORE
+    ngx_module_name=ngx_regex_module
+    ngx_module_incs=
+    ngx_module_deps=src/core/ngx_regex.h
+    ngx_module_srcs=src/core/ngx_regex.c
+    ngx_module_libs=
+    ngx_module_link=YES
+    ngx_module_order=
+
+    . auto/module
 fi
 
 
@@ -455,119 +1156,81 @@ if [ $USE_THREADS = YES ]; then
 fi
 
 
-if [ $USE_OPENSSL = YES ]; then
-    modules="$modules $OPENSSL_MODULE"
-    CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS"
-    CORE_SRCS="$CORE_SRCS $OPENSSL_SRCS"
-fi
-
-if [ $USE_PCRE = YES ]; then
-    modules="$modules $REGEX_MODULE"
-    CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
-    CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
-fi
-
 if [ $HTTP = YES ]; then
     modules="$modules $HTTP_MODULES $HTTP_FILTER_MODULES \
-             $HTTP_HEADERS_FILTER_MODULE \
-             $HTTP_AUX_FILTER_MODULES \
-             $HTTP_COPY_FILTER_MODULE \
-             $HTTP_RANGE_BODY_FILTER_MODULE \
-             $HTTP_NOT_MODIFIED_FILTER_MODULE \
-             $HTTP_SLICE_FILTER_MODULE"
+             $HTTP_AUX_FILTER_MODULES $HTTP_INIT_FILTER_MODULES"
 
     NGX_ADDON_DEPS="$NGX_ADDON_DEPS \$(HTTP_DEPS)"
 fi
 
 
-if [ $MAIL = YES ]; then
-    modules="$modules $MAIL_MODULES"
+if [ $MAIL != NO ]; then
 
-    if [ $MAIL_SSL = YES ]; then
-        modules="$modules $MAIL_SSL_MODULE"
-        MAIL_DEPS="$MAIL_DEPS $MAIL_SSL_DEPS"
-        MAIL_SRCS="$MAIL_SRCS $MAIL_SSL_SRCS"
+    if [ $MAIL = YES ]; then
+        modules="$modules $MAIL_MODULES"
+
+    elif [ $MAIL = DYNAMIC ]; then
+        ngx_module_name=$MAIL_MODULES
+        ngx_module_incs=
+        ngx_module_deps=$MAIL_DEPS
+        ngx_module_srcs=$MAIL_SRCS
+        ngx_module_libs=
+        ngx_module_link=DYNAMIC
+
+        . auto/module
     fi
 
-    if [ $MAIL_POP3 = YES ]; then
-        modules="$modules $MAIL_POP3_MODULE"
-        MAIL_DEPS="$MAIL_DEPS $MAIL_POP3_DEPS"
-        MAIL_SRCS="$MAIL_SRCS $MAIL_POP3_SRCS"
-    fi
-
-    if [ $MAIL_IMAP = YES ]; then
-        modules="$modules $MAIL_IMAP_MODULE"
-        MAIL_DEPS="$MAIL_DEPS $MAIL_IMAP_DEPS"
-        MAIL_SRCS="$MAIL_SRCS $MAIL_IMAP_SRCS"
-    fi
-
-    if [ $MAIL_SMTP = YES ]; then
-        modules="$modules $MAIL_SMTP_MODULE"
-        MAIL_DEPS="$MAIL_DEPS $MAIL_SMTP_DEPS"
-        MAIL_SRCS="$MAIL_SRCS $MAIL_SMTP_SRCS"
-    fi
-
-    modules="$modules $MAIL_AUTH_HTTP_MODULE"
-    MAIL_SRCS="$MAIL_SRCS $MAIL_AUTH_HTTP_SRCS"
-
-    modules="$modules $MAIL_PROXY_MODULE"
-    MAIL_SRCS="$MAIL_SRCS $MAIL_PROXY_SRCS"
-
     NGX_ADDON_DEPS="$NGX_ADDON_DEPS \$(MAIL_DEPS)"
 fi
 
 
-if [ $STREAM = YES ]; then
-    have=NGX_STREAM . auto/have
-    modules="$modules $STREAM_MODULES"
+if [ $STREAM != NO ]; then
 
-    if [ $STREAM_SSL = YES ]; then
-        modules="$modules $STREAM_SSL_MODULE"
-        STREAM_DEPS="$STREAM_DEPS $STREAM_SSL_DEPS"
-        STREAM_SRCS="$STREAM_SRCS $STREAM_SSL_SRCS"
-    fi
+    if [ $STREAM = YES ]; then
+        modules="$modules $STREAM_MODULES"
 
-    if [ $STREAM_LIMIT_CONN = YES ]; then
-        modules="$modules $STREAM_LIMIT_CONN_MODULE"
-        STREAM_SRCS="$STREAM_SRCS $STREAM_LIMIT_CONN_SRCS"
-    fi
+    elif [ $STREAM = DYNAMIC ]; then
+        ngx_module_name=$STREAM_MODULES
+        ngx_module_incs=
+        ngx_module_deps=$STREAM_DEPS
+        ngx_module_srcs=$STREAM_SRCS
+        ngx_module_libs=
+        ngx_module_link=DYNAMIC
 
-    if [ $STREAM_ACCESS = YES ]; then
-        modules="$modules $STREAM_ACCESS_MODULE"
-        STREAM_SRCS="$STREAM_SRCS $STREAM_ACCESS_SRCS"
-    fi
-
-    if [ $STREAM_UPSTREAM_HASH = YES ]; then
-        modules="$modules $STREAM_UPSTREAM_HASH_MODULE"
-        STREAM_SRCS="$STREAM_SRCS $STREAM_UPSTREAM_HASH_SRCS"
-    fi
-
-    if [ $STREAM_UPSTREAM_LEAST_CONN = YES ]; then
-        modules="$modules $STREAM_UPSTREAM_LEAST_CONN_MODULE"
-        STREAM_SRCS="$STREAM_SRCS $STREAM_UPSTREAM_LEAST_CONN_SRCS"
-    fi
-
-    if [ $STREAM_UPSTREAM_ZONE = YES ]; then
-        have=NGX_STREAM_UPSTREAM_ZONE . auto/have
-        modules="$modules $STREAM_UPSTREAM_ZONE_MODULE"
-        STREAM_SRCS="$STREAM_SRCS $STREAM_UPSTREAM_ZONE_SRCS"
+        . auto/module
     fi
 
     NGX_ADDON_DEPS="$NGX_ADDON_DEPS \$(STREAM_DEPS)"
 fi
 
 
-if [ $NGX_GOOGLE_PERFTOOLS = YES ]; then
-    modules="$modules $NGX_GOOGLE_PERFTOOLS_MODULE"
-    NGX_MISC_SRCS="$NGX_MISC_SRCS $NGX_GOOGLE_PERFTOOLS_SRCS"
-fi
+ngx_module_type=MISC
+MISC_MODULES=
 
+if [ $NGX_GOOGLE_PERFTOOLS = YES ]; then
+    ngx_module_name=ngx_google_perftools_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/misc/ngx_google_perftools_module.c
+    ngx_module_libs=
+    ngx_module_link=$NGX_GOOGLE_PERFTOOLS
+
+    . auto/module
+fi
 
 if [ $NGX_CPP_TEST = YES ]; then
-    NGX_MISC_SRCS="$NGX_MISC_SRCS $NGX_CPP_TEST_SRCS"
-    CORE_LIBS="$CORE_LIBS -lstdc++"
+    ngx_module_name=
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs=src/misc/ngx_cpp_test_module.cpp
+    ngx_module_libs=-lstdc++
+    ngx_module_link=$NGX_CPP_TEST
+
+    . auto/module
 fi
 
+modules="$modules $MISC_MODULES"
+
 
 cat << END                                    > $NGX_MODULES_C
 
@@ -596,3 +1259,16 @@ cat << END                                    >> $NGX_MODULES_C
 };
 
 END
+
+echo 'char *ngx_module_names[] = {'           >> $NGX_MODULES_C
+
+for mod in $modules
+do
+    echo "    \"$mod\","                      >> $NGX_MODULES_C
+done
+
+cat << END                                    >> $NGX_MODULES_C
+    NULL
+};
+
+END
diff --git a/auto/options b/auto/options
index 931dabb..36b34bc 100644
--- a/auto/options
+++ b/auto/options
@@ -7,6 +7,7 @@ help=no
 
 NGX_PREFIX=
 NGX_SBIN_PATH=
+NGX_MODULES_PATH=
 NGX_CONF_PREFIX=
 NGX_CONF_PATH=
 NGX_ERROR_LOG_PATH=
@@ -120,7 +121,11 @@ STREAM_UPSTREAM_HASH=YES
 STREAM_UPSTREAM_LEAST_CONN=YES
 STREAM_UPSTREAM_ZONE=YES
 
+DYNAMIC_MODULES=
+
 NGX_ADDONS=
+NGX_ADDON_DEPS=
+DYNAMIC_ADDONS=
 
 USE_PCRE=NO
 PCRE=NONE
@@ -151,6 +156,7 @@ NGX_PERL=perl
 
 USE_LIBXSLT=NO
 USE_LIBGD=NO
+USE_GEOIP=NO
 
 NGX_GOOGLE_PERFTOOLS=NO
 NGX_CPP_TEST=NO
@@ -178,6 +184,7 @@ do
         --prefix=)                       NGX_PREFIX="!"             ;;
         --prefix=*)                      NGX_PREFIX="$value"        ;;
         --sbin-path=*)                   NGX_SBIN_PATH="$value"     ;;
+        --modules-path=*)                NGX_MODULES_PATH="$value"  ;;
         --conf-path=*)                   NGX_CONF_PATH="$value"     ;;
         --error-log-path=*)              NGX_ERROR_LOG_PATH="$value";;
         --pid-path=*)                    NGX_PID_PATH="$value"      ;;
@@ -215,8 +222,13 @@ do
         --with-http_realip_module)       HTTP_REALIP=YES            ;;
         --with-http_addition_module)     HTTP_ADDITION=YES          ;;
         --with-http_xslt_module)         HTTP_XSLT=YES              ;;
+        --with-http_xslt_module=dynamic) HTTP_XSLT=DYNAMIC          ;;
         --with-http_image_filter_module) HTTP_IMAGE_FILTER=YES      ;;
+        --with-http_image_filter_module=dynamic)
+                                         HTTP_IMAGE_FILTER=DYNAMIC  ;;
         --with-http_geoip_module)        HTTP_GEOIP=YES             ;;
+        --with-http_geoip_module=dynamic)
+                                         HTTP_GEOIP=DYNAMIC         ;;
         --with-http_sub_module)          HTTP_SUB=YES               ;;
         --with-http_dav_module)          HTTP_DAV=YES               ;;
         --with-http_flv_module)          HTTP_FLV=YES               ;;
@@ -266,6 +278,7 @@ do
         --with-http_stub_status_module)  HTTP_STUB_STATUS=YES       ;;
 
         --with-mail)                     MAIL=YES                   ;;
+        --with-mail=dynamic)             MAIL=DYNAMIC               ;;
         --with-mail_ssl_module)          MAIL_SSL=YES               ;;
         # STUB
         --with-imap)
@@ -285,6 +298,7 @@ use the \"--with-mail_ssl_module\" option instead"
         --without-mail_smtp_module)      MAIL_SMTP=NO               ;;
 
         --with-stream)                   STREAM=YES                 ;;
+        --with-stream=dynamic)           STREAM=DYNAMIC             ;;
         --with-stream_ssl_module)        STREAM_SSL=YES             ;;
         --without-stream_limit_conn_module)
                                          STREAM_LIMIT_CONN=NO       ;;
@@ -300,6 +314,7 @@ use the \"--with-mail_ssl_module\" option instead"
         --with-cpp_test_module)          NGX_CPP_TEST=YES           ;;
 
         --add-module=*)                  NGX_ADDONS="$NGX_ADDONS $value" ;;
+        --add-dynamic-module=*)          DYNAMIC_ADDONS="$DYNAMIC_ADDONS $value" ;;
 
         --with-cc=*)                     CC="$value"                ;;
         --with-cpp=*)                    CPP="$value"               ;;
@@ -356,6 +371,7 @@ cat << END
 
   --prefix=PATH                      set installation prefix
   --sbin-path=PATH                   set nginx binary pathname
+  --modules-path=PATH                set modules path
   --conf-path=PATH                   set nginx.conf pathname
   --error-log-path=PATH              set error log pathname
   --pid-path=PATH                    set nginx.pid pathname
@@ -384,8 +400,12 @@ cat << END
   --with-http_realip_module          enable ngx_http_realip_module
   --with-http_addition_module        enable ngx_http_addition_module
   --with-http_xslt_module            enable ngx_http_xslt_module
+  --with-http_xslt_module=dynamic    enable dynamic ngx_http_xslt_module
   --with-http_image_filter_module    enable ngx_http_image_filter_module
+  --with-http_image_filter_module=dynamic
+                                     enable dynamic ngx_http_image_filter_module
   --with-http_geoip_module           enable ngx_http_geoip_module
+  --with-http_geoip_module=dynamic   enable dynamic ngx_http_geoip_module
   --with-http_sub_module             enable ngx_http_sub_module
   --with-http_dav_module             enable ngx_http_dav_module
   --with-http_flv_module             enable ngx_http_flv_module
@@ -451,12 +471,14 @@ cat << END
   --without-http-cache               disable HTTP cache
 
   --with-mail                        enable POP3/IMAP4/SMTP proxy module
+  --with-mail=dynamic                enable dynamic POP3/IMAP4/SMTP proxy module
   --with-mail_ssl_module             enable ngx_mail_ssl_module
   --without-mail_pop3_module         disable ngx_mail_pop3_module
   --without-mail_imap_module         disable ngx_mail_imap_module
   --without-mail_smtp_module         disable ngx_mail_smtp_module
 
   --with-stream                      enable TCP proxy module
+  --with-stream=dynamic              enable dynamic TCP proxy module
   --with-stream_ssl_module           enable ngx_stream_ssl_module
   --without-stream_limit_conn_module disable ngx_stream_limit_conn_module
   --without-stream_access_module     disable ngx_stream_access_module
@@ -470,7 +492,8 @@ cat << END
   --with-google_perftools_module     enable ngx_google_perftools_module
   --with-cpp_test_module             enable ngx_cpp_test_module
 
-  --add-module=PATH                  enable an external module
+  --add-module=PATH                  enable external module
+  --add-dynamic-module=PATH          enable dynamic external module
 
   --with-cc=PATH                     set C compiler pathname
   --with-cpp=PATH                    set C preprocessor pathname
@@ -533,6 +556,7 @@ fi
 
 
 NGX_SBIN_PATH=${NGX_SBIN_PATH:-sbin/nginx}
+NGX_MODULES_PATH=${NGX_MODULES_PATH:-modules}
 NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf}
 NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
 NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid}
diff --git a/auto/os/darwin b/auto/os/darwin
index 1d3e3d3..9b31b1f 100644
--- a/auto/os/darwin
+++ b/auto/os/darwin
@@ -14,6 +14,9 @@ CORE_SRCS="$UNIX_SRCS $DARWIN_SRCS"
 ngx_spacer='
 '
 
+MAIN_LINK=
+MODULE_LINK="-shared -Wl,-undefined,dynamic_lookup"
+
 # kqueue
 
 echo " + kqueue found"
diff --git a/auto/os/win32 b/auto/os/win32
index 82fc212..14ae3b8 100644
--- a/auto/os/win32
+++ b/auto/os/win32
@@ -12,10 +12,15 @@ OS_CONFIG="$WIN32_CONFIG"
 NGX_ICONS="$NGX_WIN32_ICONS"
 SELECT_SRCS=$WIN32_SELECT_SRCS
 
+ngx_pic_opt=
+
 case "$NGX_CC_NAME" in
 
     gcc)
         CORE_LIBS="$CORE_LIBS -ladvapi32 -lws2_32"
+        MAIN_LINK="$MAIN_LINK -Wl,--export-all-symbols"
+        MAIN_LINK="$MAIN_LINK -Wl,--out-implib=$NGX_OBJS/libnginx.a"
+        MODULE_LINK="-shared -L $NGX_OBJS -lnginx"
     ;;
 
     *)
diff --git a/auto/sources b/auto/sources
index 2e44ce1..e08e863 100644
--- a/auto/sources
+++ b/auto/sources
@@ -36,6 +36,7 @@ CORE_DEPS="src/core/nginx.h \
            src/core/ngx_connection.h \
            src/core/ngx_cycle.h \
            src/core/ngx_conf_file.h \
+           src/core/ngx_module.h \
            src/core/ngx_resolver.h \
            src/core/ngx_open_file_cache.h \
            src/core/ngx_crypt.h \
@@ -71,6 +72,7 @@ CORE_SRCS="src/core/nginx.c \
            src/core/ngx_rwlock.c \
            src/core/ngx_cpuinfo.c \
            src/core/ngx_conf_file.c \
+           src/core/ngx_module.c \
            src/core/ngx_resolver.c \
            src/core/ngx_open_file_cache.c \
            src/core/ngx_crypt.c \
@@ -78,17 +80,6 @@ CORE_SRCS="src/core/nginx.c \
            src/core/ngx_syslog.c"
 
 
-REGEX_MODULE=ngx_regex_module
-REGEX_DEPS=src/core/ngx_regex.h
-REGEX_SRCS=src/core/ngx_regex.c
-
-
-OPENSSL_MODULE=ngx_openssl_module
-OPENSSL_DEPS=src/event/ngx_event_openssl.h
-OPENSSL_SRCS="src/event/ngx_event_openssl.c \
-              src/event/ngx_event_openssl_stapling.c"
-
-
 EVENT_MODULES="ngx_events_module ngx_event_core_module"
 
 EVENT_INCS="src/event src/event/modules"
@@ -150,6 +141,7 @@ UNIX_DEPS="$CORE_DEPS $EVENT_DEPS \
             src/os/unix/ngx_socket.h \
             src/os/unix/ngx_os.h \
             src/os/unix/ngx_user.h \
+            src/os/unix/ngx_dlopen.h \
             src/os/unix/ngx_process_cycle.h"
 
 # add to UNIX_DEPS
@@ -181,6 +173,7 @@ UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/unix/ngx_setproctitle.c \
             src/os/unix/ngx_posix_init.c \
             src/os/unix/ngx_user.c \
+            src/os/unix/ngx_dlopen.c \
             src/os/unix/ngx_process_cycle.c"
 
 POSIX_DEPS=src/os/unix/ngx_posix_config.h
@@ -226,6 +219,7 @@ WIN32_DEPS="$CORE_DEPS $EVENT_DEPS \
             src/os/win32/ngx_socket.h \
             src/os/win32/ngx_os.h \
             src/os/win32/ngx_user.h \
+            src/os/win32/ngx_dlopen.h \
             src/os/win32/ngx_process_cycle.h"
 
 WIN32_CONFIG=src/os/win32/ngx_win32_config.h
@@ -246,6 +240,7 @@ WIN32_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/win32/ngx_wsasend_chain.c \
             src/os/win32/ngx_win32_init.c \
             src/os/win32/ngx_user.c \
+            src/os/win32/ngx_dlopen.c \
             src/os/win32/ngx_event_log.c \
             src/os/win32/ngx_process_cycle.c \
             src/event/ngx_event_acceptex.c"
@@ -254,343 +249,4 @@ NGX_WIN32_ICONS="src/os/win32/nginx.ico"
 NGX_WIN32_RC="src/os/win32/nginx.rc"
 
 
-HTTP_MODULES="ngx_http_module \
-              ngx_http_core_module \
-              ngx_http_log_module \
-              ngx_http_upstream_module"
-
-HTTP_WRITE_FILTER_MODULE="ngx_http_write_filter_module"
-HTTP_HEADER_FILTER_MODULE="ngx_http_header_filter_module"
-
-HTTP_POSTPONE_FILTER_MODULE=ngx_http_postpone_filter_module
-HTTP_COPY_FILTER_MODULE=ngx_http_copy_filter_module
-
-HTTP_CHUNKED_FILTER_MODULE=ngx_http_chunked_filter_module
-HTTP_HEADERS_FILTER_MODULE=ngx_http_headers_filter_module
-
-HTTP_RANGE_HEADER_FILTER_MODULE=ngx_http_range_header_filter_module
-HTTP_RANGE_BODY_FILTER_MODULE=ngx_http_range_body_filter_module
-
-HTTP_NOT_MODIFIED_FILTER_MODULE=ngx_http_not_modified_filter_module
-
-HTTP_STATIC_MODULE=ngx_http_static_module
-HTTP_INDEX_MODULE=ngx_http_index_module
-
-HTTP_INCS="src/http src/http/modules"
-
-HTTP_DEPS="src/http/ngx_http.h \
-           src/http/ngx_http_request.h \
-           src/http/ngx_http_config.h \
-           src/http/ngx_http_core_module.h \
-           src/http/ngx_http_cache.h \
-           src/http/ngx_http_variables.h \
-           src/http/ngx_http_script.h \
-           src/http/ngx_http_upstream.h \
-           src/http/ngx_http_upstream_round_robin.h"
-
-HTTP_SRCS="src/http/ngx_http.c \
-           src/http/ngx_http_core_module.c \
-           src/http/ngx_http_special_response.c \
-           src/http/ngx_http_request.c \
-           src/http/ngx_http_parse.c \
-           src/http/ngx_http_header_filter_module.c \
-           src/http/ngx_http_write_filter_module.c \
-           src/http/ngx_http_copy_filter_module.c \
-           src/http/modules/ngx_http_log_module.c \
-           src/http/ngx_http_request_body.c \
-           src/http/ngx_http_variables.c \
-           src/http/ngx_http_script.c \
-           src/http/ngx_http_upstream.c \
-           src/http/ngx_http_upstream_round_robin.c \
-           src/http/modules/ngx_http_static_module.c \
-           src/http/modules/ngx_http_index_module.c \
-           src/http/modules/ngx_http_chunked_filter_module.c \
-           src/http/modules/ngx_http_range_filter_module.c \
-           src/http/modules/ngx_http_headers_filter_module.c \
-           src/http/modules/ngx_http_not_modified_filter_module.c"
-
-HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
-
 HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
-
-
-HTTP_V2_MODULE=ngx_http_v2_module
-HTTP_V2_FILTER_MODULE=ngx_http_v2_filter_module
-HTTP_V2_INCS="src/http/v2"
-HTTP_V2_DEPS="src/http/v2/ngx_http_v2.h \
-              src/http/v2/ngx_http_v2_module.h"
-HTTP_V2_SRCS="src/http/v2/ngx_http_v2.c \
-              src/http/v2/ngx_http_v2_table.c \
-              src/http/v2/ngx_http_v2_huff_decode.c \
-              src/http/v2/ngx_http_v2_huff_encode.c \
-              src/http/v2/ngx_http_v2_module.c \
-              src/http/v2/ngx_http_v2_filter_module.c"
-
-
-HTTP_CHARSET_FILTER_MODULE=ngx_http_charset_filter_module
-HTTP_CHARSET_SRCS=src/http/modules/ngx_http_charset_filter_module.c
-
-
-HTTP_GZIP_FILTER_MODULE=ngx_http_gzip_filter_module
-HTTP_GZIP_SRCS=src/http/modules/ngx_http_gzip_filter_module.c
-
-
-HTTP_GUNZIP_FILTER_MODULE=ngx_http_gunzip_filter_module
-HTTP_GUNZIP_SRCS=src/http/modules/ngx_http_gunzip_filter_module.c
-
-
-HTTP_SSI_FILTER_MODULE=ngx_http_ssi_filter_module
-HTTP_SSI_DEPS=src/http/modules/ngx_http_ssi_filter_module.h
-HTTP_SSI_SRCS=src/http/modules/ngx_http_ssi_filter_module.c
-
-
-HTTP_XSLT_FILTER_MODULE=ngx_http_xslt_filter_module
-HTTP_XSLT_SRCS=src/http/modules/ngx_http_xslt_filter_module.c
-
-
-HTTP_IMAGE_FILTER_MODULE=ngx_http_image_filter_module
-HTTP_IMAGE_SRCS=src/http/modules/ngx_http_image_filter_module.c
-
-
-HTTP_SUB_FILTER_MODULE=ngx_http_sub_filter_module
-HTTP_SUB_SRCS=src/http/modules/ngx_http_sub_filter_module.c
-
-
-HTTP_USERID_FILTER_MODULE=ngx_http_userid_filter_module
-HTTP_USERID_SRCS=src/http/modules/ngx_http_userid_filter_module.c
-
-
-HTTP_SLICE_FILTER_MODULE=ngx_http_slice_filter_module
-HTTP_SLICE_SRCS=src/http/modules/ngx_http_slice_filter_module.c
-
-
-HTTP_REALIP_MODULE=ngx_http_realip_module
-HTTP_REALIP_SRCS=src/http/modules/ngx_http_realip_module.c
-
-
-HTTP_ADDITION_FILTER_MODULE=ngx_http_addition_filter_module
-HTTP_ADDITION_SRCS=src/http/modules/ngx_http_addition_filter_module.c
-
-
-HTTP_DAV_MODULE=ngx_http_dav_module
-HTTP_DAV_SRCS=src/http/modules/ngx_http_dav_module.c
-
-
-HTTP_ACCESS_MODULE=ngx_http_access_module
-HTTP_ACCESS_SRCS=src/http/modules/ngx_http_access_module.c
-
-
-HTTP_AUTH_BASIC_MODULE=ngx_http_auth_basic_module
-HTTP_AUTH_BASIC_SRCS=src/http/modules/ngx_http_auth_basic_module.c
-
-
-HTTP_AUTH_REQUEST_MODULE=ngx_http_auth_request_module
-HTTP_AUTH_REQUEST_SRCS=src/http/modules/ngx_http_auth_request_module.c
-
-
-HTTP_AUTOINDEX_MODULE=ngx_http_autoindex_module
-HTTP_AUTOINDEX_SRCS=src/http/modules/ngx_http_autoindex_module.c
-
-
-HTTP_RANDOM_INDEX_MODULE=ngx_http_random_index_module
-HTTP_RANDOM_INDEX_SRCS=src/http/modules/ngx_http_random_index_module.c
-
-
-HTTP_STATUS_MODULE=ngx_http_status_module
-HTTP_STATUS_SRCS=src/http/modules/ngx_http_status_module.c
-
-
-HTTP_GEO_MODULE=ngx_http_geo_module
-HTTP_GEO_SRCS=src/http/modules/ngx_http_geo_module.c
-
-
-HTTP_GEOIP_MODULE=ngx_http_geoip_module
-HTTP_GEOIP_SRCS=src/http/modules/ngx_http_geoip_module.c
-
-
-HTTP_MAP_MODULE=ngx_http_map_module
-HTTP_MAP_SRCS=src/http/modules/ngx_http_map_module.c
-
-
-HTTP_SPLIT_CLIENTS_MODULE=ngx_http_split_clients_module
-HTTP_SPLIT_CLIENTS_SRCS=src/http/modules/ngx_http_split_clients_module.c
-
-
-HTTP_REFERER_MODULE=ngx_http_referer_module
-HTTP_REFERER_SRCS=src/http/modules/ngx_http_referer_module.c
-
-
-HTTP_REWRITE_MODULE=ngx_http_rewrite_module
-HTTP_REWRITE_SRCS=src/http/modules/ngx_http_rewrite_module.c
-
-
-HTTP_SSL_MODULE=ngx_http_ssl_module
-HTTP_SSL_DEPS=src/http/modules/ngx_http_ssl_module.h
-HTTP_SSL_SRCS=src/http/modules/ngx_http_ssl_module.c
-
-
-HTTP_PROXY_MODULE=ngx_http_proxy_module
-HTTP_PROXY_SRCS=src/http/modules/ngx_http_proxy_module.c
-
-
-HTTP_FASTCGI_MODULE=ngx_http_fastcgi_module
-HTTP_FASTCGI_SRCS=src/http/modules/ngx_http_fastcgi_module.c
-
-
-HTTP_UWSGI_MODULE=ngx_http_uwsgi_module
-HTTP_UWSGI_SRCS=src/http/modules/ngx_http_uwsgi_module.c
-
-
-HTTP_SCGI_MODULE=ngx_http_scgi_module
-HTTP_SCGI_SRCS=src/http/modules/ngx_http_scgi_module.c
-
-
-HTTP_PERL_MODULE=ngx_http_perl_module
-HTTP_PERL_INCS=src/http/modules/perl
-HTTP_PERL_DEPS=src/http/modules/perl/ngx_http_perl_module.h
-HTTP_PERL_SRCS=src/http/modules/perl/ngx_http_perl_module.c
-
-
-HTTP_MEMCACHED_MODULE=ngx_http_memcached_module
-HTTP_MEMCACHED_SRCS=src/http/modules/ngx_http_memcached_module.c
-
-
-HTTP_LIMIT_CONN_MODULE=ngx_http_limit_conn_module
-HTTP_LIMIT_CONN_SRCS=src/http/modules/ngx_http_limit_conn_module.c
-
-
-HTTP_LIMIT_REQ_MODULE=ngx_http_limit_req_module
-HTTP_LIMIT_REQ_SRCS=src/http/modules/ngx_http_limit_req_module.c
-
-
-HTTP_EMPTY_GIF_MODULE=ngx_http_empty_gif_module
-HTTP_EMPTY_GIF_SRCS=src/http/modules/ngx_http_empty_gif_module.c
-
-
-HTTP_BROWSER_MODULE=ngx_http_browser_module
-HTTP_BROWSER_SRCS=src/http/modules/ngx_http_browser_module.c
-
-
-HTTP_SECURE_LINK_MODULE=ngx_http_secure_link_module
-HTTP_SECURE_LINK_SRCS=src/http/modules/ngx_http_secure_link_module.c
-
-
-HTTP_DEGRADATION_MODULE=ngx_http_degradation_module
-HTTP_DEGRADATION_SRCS=src/http/modules/ngx_http_degradation_module.c
-
-
-HTTP_FLV_MODULE=ngx_http_flv_module
-HTTP_FLV_SRCS=src/http/modules/ngx_http_flv_module.c
-
-
-HTTP_MP4_MODULE=ngx_http_mp4_module
-HTTP_MP4_SRCS=src/http/modules/ngx_http_mp4_module.c
-
-
-HTTP_GZIP_STATIC_MODULE=ngx_http_gzip_static_module
-HTTP_GZIP_STATIC_SRCS=src/http/modules/ngx_http_gzip_static_module.c
-
-
-HTTP_UPSTREAM_HASH_MODULE=ngx_http_upstream_hash_module
-HTTP_UPSTREAM_HASH_SRCS=src/http/modules/ngx_http_upstream_hash_module.c
-
-
-HTTP_UPSTREAM_IP_HASH_MODULE=ngx_http_upstream_ip_hash_module
-HTTP_UPSTREAM_IP_HASH_SRCS=src/http/modules/ngx_http_upstream_ip_hash_module.c
-
-
-HTTP_UPSTREAM_LEAST_CONN_MODULE=ngx_http_upstream_least_conn_module
-HTTP_UPSTREAM_LEAST_CONN_SRCS=" \
-    src/http/modules/ngx_http_upstream_least_conn_module.c"
-
-
-HTTP_UPSTREAM_KEEPALIVE_MODULE=ngx_http_upstream_keepalive_module
-HTTP_UPSTREAM_KEEPALIVE_SRCS=" \
-    src/http/modules/ngx_http_upstream_keepalive_module.c"
-
-
-HTTP_UPSTREAM_ZONE_MODULE=ngx_http_upstream_zone_module
-HTTP_UPSTREAM_ZONE_SRCS=" \
-    src/http/modules/ngx_http_upstream_zone_module.c"
-
-
-MAIL_INCS="src/mail"
-
-MAIL_DEPS="src/mail/ngx_mail.h"
-
-MAIL_MODULES="ngx_mail_module ngx_mail_core_module"
-
-MAIL_SRCS="src/mail/ngx_mail.c \
-           src/mail/ngx_mail_core_module.c \
-           src/mail/ngx_mail_handler.c \
-           src/mail/ngx_mail_parse.c"
-
-MAIL_POP3_MODULE="ngx_mail_pop3_module"
-MAIL_POP3_DEPS="src/mail/ngx_mail_pop3_module.h"
-MAIL_POP3_SRCS="src/mail/ngx_mail_pop3_module.c \
-                src/mail/ngx_mail_pop3_handler.c"
-
-MAIL_IMAP_MODULE="ngx_mail_imap_module"
-MAIL_IMAP_DEPS="src/mail/ngx_mail_imap_module.h"
-MAIL_IMAP_SRCS="src/mail/ngx_mail_imap_module.c \
-                src/mail/ngx_mail_imap_handler.c"
-
-MAIL_SMTP_MODULE="ngx_mail_smtp_module"
-MAIL_SMTP_DEPS="src/mail/ngx_mail_smtp_module.h"
-MAIL_SMTP_SRCS="src/mail/ngx_mail_smtp_module.c \
-                src/mail/ngx_mail_smtp_handler.c"
-
-MAIL_SSL_MODULE="ngx_mail_ssl_module"
-MAIL_SSL_DEPS="src/mail/ngx_mail_ssl_module.h"
-MAIL_SSL_SRCS="src/mail/ngx_mail_ssl_module.c"
-
-MAIL_AUTH_HTTP_MODULE="ngx_mail_auth_http_module"
-MAIL_AUTH_HTTP_SRCS="src/mail/ngx_mail_auth_http_module.c"
-
-MAIL_PROXY_MODULE="ngx_mail_proxy_module"
-MAIL_PROXY_SRCS="src/mail/ngx_mail_proxy_module.c"
-
-
-STREAM_INCS="src/stream"
-
-STREAM_DEPS="src/stream/ngx_stream.h \
-             src/stream/ngx_stream_upstream.h \
-             src/stream/ngx_stream_upstream_round_robin.h"
-
-STREAM_MODULES="ngx_stream_module \
-                ngx_stream_core_module \
-                ngx_stream_proxy_module \
-                ngx_stream_upstream_module"
-
-STREAM_SRCS="src/stream/ngx_stream.c \
-             src/stream/ngx_stream_handler.c \
-             src/stream/ngx_stream_core_module.c \
-             src/stream/ngx_stream_proxy_module.c \
-             src/stream/ngx_stream_upstream.c \
-             src/stream/ngx_stream_upstream_round_robin.c"
-
-STREAM_SSL_MODULE="ngx_stream_ssl_module"
-STREAM_SSL_DEPS="src/stream/ngx_stream_ssl_module.h"
-STREAM_SSL_SRCS="src/stream/ngx_stream_ssl_module.c"
-
-STREAM_LIMIT_CONN_MODULE=ngx_stream_limit_conn_module
-STREAM_LIMIT_CONN_SRCS=src/stream/ngx_stream_limit_conn_module.c
-
-STREAM_ACCESS_MODULE=ngx_stream_access_module
-STREAM_ACCESS_SRCS=src/stream/ngx_stream_access_module.c
-
-STREAM_UPSTREAM_HASH_MODULE=ngx_stream_upstream_hash_module
-STREAM_UPSTREAM_HASH_SRCS=src/stream/ngx_stream_upstream_hash_module.c
-
-STREAM_UPSTREAM_LEAST_CONN_MODULE=ngx_stream_upstream_least_conn_module
-STREAM_UPSTREAM_LEAST_CONN_SRCS=" \
-    src/stream/ngx_stream_upstream_least_conn_module.c"
-
-STREAM_UPSTREAM_ZONE_MODULE=ngx_stream_upstream_zone_module
-STREAM_UPSTREAM_ZONE_SRCS=src/stream/ngx_stream_upstream_zone_module.c
-
-
-NGX_GOOGLE_PERFTOOLS_MODULE=ngx_google_perftools_module
-NGX_GOOGLE_PERFTOOLS_SRCS=src/misc/ngx_google_perftools_module.c
-
-NGX_CPP_TEST_SRCS=src/misc/ngx_cpp_test_module.cpp
diff --git a/auto/summary b/auto/summary
index 1be975d..dc8fe4f 100644
--- a/auto/summary
+++ b/auto/summary
@@ -60,6 +60,7 @@ echo
 cat << END
   nginx path prefix: "$NGX_PREFIX"
   nginx binary file: "$NGX_SBIN_PATH"
+  nginx modules path: "$NGX_MODULES_PATH"
   nginx configuration prefix: "$NGX_CONF_PREFIX"
   nginx configuration file: "$NGX_CONF_PATH"
   nginx pid file: "$NGX_PID_PATH"
diff --git a/auto/unix b/auto/unix
index 7bfca8f..e07df08 100755
--- a/auto/unix
+++ b/auto/unix
@@ -255,12 +255,12 @@ ngx_feature_test="struct statvfs  fs;
 
 
 ngx_feature="dlopen()"
-ngx_feature_name=
+ngx_feature_name="NGX_HAVE_DLOPEN"
 ngx_feature_run=no
 ngx_feature_incs="#include <dlfcn.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="dlopen(NULL, 0)"
+ngx_feature_test="dlopen(NULL, 0); dlsym(NULL, NULL)"
 . auto/feature
 
 
@@ -271,7 +271,7 @@ if [ $ngx_found != yes ]; then
     . auto/feature
 
     if [ $ngx_found = yes ]; then
-        NGX_LIBDL="-ldl"
+        CORE_LIBS="$CORE_LIBS -ldl"
     fi
 fi
 
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 64db381..6ce030c 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -24,6 +24,10 @@ static char *ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_set_worker_processes(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static char *ngx_load_module(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+#if (NGX_HAVE_DLOPEN)
+static void ngx_unload_module(void *data);
+#endif
 
 
 static ngx_conf_enum_t  ngx_debug_points[] = {
@@ -133,6 +137,13 @@ static ngx_command_t  ngx_core_commands[] = {
       0,
       NULL },
 
+    { ngx_string("load_module"),
+      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
+      ngx_load_module,
+      0,
+      0,
+      NULL },
+
       ngx_null_command
 };
 
@@ -160,8 +171,6 @@ ngx_module_t  ngx_core_module = {
 };
 
 
-ngx_uint_t          ngx_max_module;
-
 static ngx_uint_t   ngx_show_help;
 static ngx_uint_t   ngx_show_version;
 static ngx_uint_t   ngx_show_configure;
@@ -260,9 +269,8 @@ main(int argc, char *const *argv)
         return 1;
     }
 
-    ngx_max_module = 0;
-    for (i = 0; ngx_modules[i]; i++) {
-        ngx_modules[i]->index = ngx_max_module++;
+    if (ngx_preinit_modules() != NGX_OK) {
+        return 1;
     }
 
     cycle = ngx_init_cycle(&init_cycle);
@@ -1406,3 +1414,101 @@ ngx_set_worker_processes(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     return NGX_CONF_OK;
 }
+
+
+static char *
+ngx_load_module(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+#if (NGX_HAVE_DLOPEN)
+    void                *handle;
+    char               **names, **order;
+    ngx_str_t           *value, file;
+    ngx_uint_t           i;
+    ngx_module_t        *module, **modules;
+    ngx_pool_cleanup_t  *cln;
+
+    if (cf->cycle->modules_used) {
+        return "is specified too late";
+    }
+
+    value = cf->args->elts;
+
+    file = value[1];
+
+    if (ngx_conf_full_name(cf->cycle, &file, 0) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    cln = ngx_pool_cleanup_add(cf->cycle->pool, 0);
+    if (cln == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    handle = ngx_dlopen(file.data);
+    if (handle == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           ngx_dlopen_n " \"%s\" failed (%s)",
+                           file.data, ngx_dlerror());
+        return NGX_CONF_ERROR;
+    }
+
+    cln->handler = ngx_unload_module;
+    cln->data = handle;
+
+    modules = ngx_dlsym(handle, "ngx_modules");
+    if (modules == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           ngx_dlsym_n " \"%V\", \"%s\" failed (%s)",
+                           &value[1], "ngx_modules", ngx_dlerror());
+        return NGX_CONF_ERROR;
+    }
+
+    names = ngx_dlsym(handle, "ngx_module_names");
+    if (names == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           ngx_dlsym_n " \"%V\", \"%s\" failed (%s)",
+                           &value[1], "ngx_module_names", ngx_dlerror());
+        return NGX_CONF_ERROR;
+    }
+
+    order = ngx_dlsym(handle, "ngx_module_order");
+
+    for (i = 0; modules[i]; i++) {
+        module = modules[i];
+        module->name = names[i];
+
+        if (ngx_add_module(cf, &file, module, order) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_CORE, cf->log, 0, "module: %s i:%i",
+                       module->name, module->index);
+    }
+
+    return NGX_CONF_OK;
+
+#else
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "\"load_module\" is not supported "
+                       "on this platform");
+    return NGX_CONF_ERROR;
+
+#endif
+}
+
+
+#if (NGX_HAVE_DLOPEN)
+
+static void
+ngx_unload_module(void *data)
+{
+    void  *handle = data;
+
+    if (ngx_dlclose(handle) != 0) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      ngx_dlclose_n " failed (%s)", ngx_dlerror());
+    }
+}
+
+#endif
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 0960afb..e416e90 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009010
-#define NGINX_VERSION      "1.9.10"
+#define nginx_version      1009011
+#define NGINX_VERSION      "1.9.11"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 1c3238c..fb72656 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -329,9 +329,9 @@ ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last)
 
     found = 0;
 
-    for (i = 0; ngx_modules[i]; i++) {
+    for (i = 0; cf->cycle->modules[i]; i++) {
 
-        cmd = ngx_modules[i]->commands;
+        cmd = cf->cycle->modules[i]->commands;
         if (cmd == NULL) {
             continue;
         }
@@ -348,8 +348,8 @@ ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last)
 
             found = 1;
 
-            if (ngx_modules[i]->type != NGX_CONF_MODULE
-                && ngx_modules[i]->type != cf->module_type)
+            if (cf->cycle->modules[i]->type != NGX_CONF_MODULE
+                && cf->cycle->modules[i]->type != cf->module_type)
             {
                 continue;
             }
@@ -411,16 +411,16 @@ ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last)
             conf = NULL;
 
             if (cmd->type & NGX_DIRECT_CONF) {
-                conf = ((void **) cf->ctx)[ngx_modules[i]->index];
+                conf = ((void **) cf->ctx)[cf->cycle->modules[i]->index];
 
             } else if (cmd->type & NGX_MAIN_CONF) {
-                conf = &(((void **) cf->ctx)[ngx_modules[i]->index]);
+                conf = &(((void **) cf->ctx)[cf->cycle->modules[i]->index]);
 
             } else if (cf->ctx) {
                 confp = *(void **) ((char *) cf->ctx + cmd->conf);
 
                 if (confp) {
-                    conf = confp[ngx_modules[i]->ctx_index];
+                    conf = confp[cf->cycle->modules[i]->ctx_index];
                 }
             }
 
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 2d03f43..9ccee36 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -96,53 +96,6 @@ struct ngx_open_file_s {
 };
 
 
-#define NGX_MODULE_V1          0, 0, 0, 0, 0, 0, 1
-#define NGX_MODULE_V1_PADDING  0, 0, 0, 0, 0, 0, 0, 0
-
-struct ngx_module_s {
-    ngx_uint_t            ctx_index;
-    ngx_uint_t            index;
-
-    ngx_uint_t            spare0;
-    ngx_uint_t            spare1;
-    ngx_uint_t            spare2;
-    ngx_uint_t            spare3;
-
-    ngx_uint_t            version;
-
-    void                 *ctx;
-    ngx_command_t        *commands;
-    ngx_uint_t            type;
-
-    ngx_int_t           (*init_master)(ngx_log_t *log);
-
-    ngx_int_t           (*init_module)(ngx_cycle_t *cycle);
-
-    ngx_int_t           (*init_process)(ngx_cycle_t *cycle);
-    ngx_int_t           (*init_thread)(ngx_cycle_t *cycle);
-    void                (*exit_thread)(ngx_cycle_t *cycle);
-    void                (*exit_process)(ngx_cycle_t *cycle);
-
-    void                (*exit_master)(ngx_cycle_t *cycle);
-
-    uintptr_t             spare_hook0;
-    uintptr_t             spare_hook1;
-    uintptr_t             spare_hook2;
-    uintptr_t             spare_hook3;
-    uintptr_t             spare_hook4;
-    uintptr_t             spare_hook5;
-    uintptr_t             spare_hook6;
-    uintptr_t             spare_hook7;
-};
-
-
-typedef struct {
-    ngx_str_t             name;
-    void               *(*create_conf)(ngx_cycle_t *cycle);
-    char               *(*init_conf)(ngx_cycle_t *cycle, void *conf);
-} ngx_core_module_t;
-
-
 typedef struct {
     ngx_file_t            file;
     ngx_buf_t            *buffer;
@@ -340,8 +293,4 @@ char *ngx_conf_set_enum_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 
 
-extern ngx_uint_t     ngx_max_module;
-extern ngx_module_t  *ngx_modules[];
-
-
 #endif /* _NGX_CONF_FILE_H_INCLUDED_ */
diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index 6b31705..2819c1a 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -53,6 +53,7 @@ typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
 #include <ngx_shmem.h>
 #include <ngx_process.h>
 #include <ngx_user.h>
+#include <ngx_dlopen.h>
 #include <ngx_parse.h>
 #include <ngx_parse_time.h>
 #include <ngx_log.h>
@@ -83,6 +84,7 @@ typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
 #endif
 #include <ngx_process_cycle.h>
 #include <ngx_conf_file.h>
+#include <ngx_module.h>
 #include <ngx_open_file_cache.h>
 #include <ngx_os.h>
 #include <ngx_connection.h>
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index ad4bf92..f103266 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -212,12 +212,18 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
     ngx_strlow(cycle->hostname.data, (u_char *) hostname, cycle->hostname.len);
 
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_CORE_MODULE) {
+    if (ngx_cycle_modules(cycle) != NGX_OK) {
+        ngx_destroy_pool(pool);
+        return NULL;
+    }
+
+
+    for (i = 0; cycle->modules[i]; i++) {
+        if (cycle->modules[i]->type != NGX_CORE_MODULE) {
             continue;
         }
 
-        module = ngx_modules[i]->ctx;
+        module = cycle->modules[i]->ctx;
 
         if (module->create_conf) {
             rv = module->create_conf(cycle);
@@ -225,7 +231,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
                 ngx_destroy_pool(pool);
                 return NULL;
             }
-            cycle->conf_ctx[ngx_modules[i]->index] = rv;
+            cycle->conf_ctx[cycle->modules[i]->index] = rv;
         }
     }
 
@@ -276,15 +282,16 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
                        cycle->conf_file.data);
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_CORE_MODULE) {
+    for (i = 0; cycle->modules[i]; i++) {
+        if (cycle->modules[i]->type != NGX_CORE_MODULE) {
             continue;
         }
 
-        module = ngx_modules[i]->ctx;
+        module = cycle->modules[i]->ctx;
 
         if (module->init_conf) {
-            if (module->init_conf(cycle, cycle->conf_ctx[ngx_modules[i]->index])
+            if (module->init_conf(cycle,
+                                  cycle->conf_ctx[cycle->modules[i]->index])
                 == NGX_CONF_ERROR)
             {
                 environ = senv;
@@ -612,13 +619,9 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
 
     pool->log = cycle->log;
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->init_module) {
-            if (ngx_modules[i]->init_module(cycle) != NGX_OK) {
-                /* fatal */
-                exit(1);
-            }
-        }
+    if (ngx_init_modules(cycle) != NGX_OK) {
+        /* fatal */
+        exit(1);
     }
 
 
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index a730efe..27401d0 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -48,6 +48,10 @@ struct ngx_cycle_s {
     ngx_connection_t         *free_connections;
     ngx_uint_t                free_connection_n;
 
+    ngx_module_t            **modules;
+    ngx_uint_t                modules_n;
+    ngx_uint_t                modules_used;    /* unsigned  modules_used:1; */
+
     ngx_queue_t               reusable_connections_queue;
 
     ngx_array_t               listening;
diff --git a/src/core/ngx_module.c b/src/core/ngx_module.c
new file mode 100644
index 0000000..1e947c9
--- /dev/null
+++ b/src/core/ngx_module.c
@@ -0,0 +1,361 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Maxim Dounin
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_MAX_DYNAMIC_MODULES  128
+
+
+static ngx_uint_t ngx_module_index(ngx_cycle_t *cycle);
+static ngx_uint_t ngx_module_ctx_index(ngx_cycle_t *cycle, ngx_uint_t type,
+    ngx_uint_t index);
+
+
+ngx_uint_t         ngx_max_module;
+static ngx_uint_t  ngx_modules_n;
+
+
+ngx_int_t
+ngx_preinit_modules()
+{
+    ngx_uint_t  i;
+
+    ngx_max_module = 0;
+    for (i = 0; ngx_modules[i]; i++) {
+        ngx_modules[i]->index = i;
+        ngx_modules[i]->name = ngx_module_names[i];
+    }
+
+    ngx_modules_n = i;
+    ngx_max_module = ngx_modules_n + NGX_MAX_DYNAMIC_MODULES;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_cycle_modules(ngx_cycle_t *cycle)
+{
+    /*
+     * create a list of modules to be used for this cycle,
+     * copy static modules to it
+     */
+
+    cycle->modules = ngx_pcalloc(cycle->pool, (ngx_max_module + 1)
+                                              * sizeof(ngx_module_t *));
+    if (cycle->modules == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(cycle->modules, ngx_modules,
+               ngx_modules_n * sizeof(ngx_module_t *));
+
+    cycle->modules_n = ngx_modules_n;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_init_modules(ngx_cycle_t *cycle)
+{
+    ngx_uint_t  i;
+
+    for (i = 0; cycle->modules[i]; i++) {
+        if (cycle->modules[i]->init_module) {
+            if (cycle->modules[i]->init_module(cycle) != NGX_OK) {
+                return NGX_ERROR;
+            }
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_count_modules(ngx_cycle_t *cycle, ngx_uint_t type)
+{
+    ngx_uint_t     i, next, max;
+    ngx_module_t  *module;
+
+    next = 0;
+    max = 0;
+
+    /* count appropriate modules, set up their indices */
+
+    for (i = 0; cycle->modules[i]; i++) {
+        module = cycle->modules[i];
+
+        if (module->type != type) {
+            continue;
+        }
+
+        if (module->ctx_index != NGX_MODULE_UNSET_INDEX) {
+
+            /* if ctx_index was assigned, preserve it */
+
+            if (module->ctx_index > max) {
+                max = module->ctx_index;
+            }
+
+            if (module->ctx_index == next) {
+                next++;
+            }
+
+            continue;
+        }
+
+        /* search for some free index */
+
+        module->ctx_index = ngx_module_ctx_index(cycle, type, next);
+
+        if (module->ctx_index > max) {
+            max = module->ctx_index;
+        }
+
+        next = module->ctx_index + 1;
+    }
+
+    /*
+     * make sure the number returned is big enough for previous
+     * cycle as well, else there will be problems if the number
+     * will be stored in a global variable (as it's used to be)
+     * and we'll have to roll back to the previous cycle
+     */
+
+    if (cycle->old_cycle && cycle->old_cycle->modules) {
+
+        for (i = 0; cycle->old_cycle->modules[i]; i++) {
+            module = cycle->old_cycle->modules[i];
+
+            if (module->type != type) {
+                continue;
+            }
+
+            if (module->ctx_index > max) {
+                max = module->ctx_index;
+            }
+        }
+    }
+
+    /* prevent loading of additional modules */
+
+    cycle->modules_used = 1;
+
+    return max + 1;
+}
+
+
+ngx_int_t
+ngx_add_module(ngx_conf_t *cf, ngx_str_t *file, ngx_module_t *module,
+    char **order)
+{
+    void               *rv;
+    ngx_uint_t          i, m, before;
+    ngx_core_module_t  *core_module;
+
+    if (cf->cycle->modules_n >= ngx_max_module) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "too many modules loaded");
+        return NGX_ERROR;
+    }
+
+    if (module->version != nginx_version) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "module \"%V\" version %ui instead of %ui",
+                           file, module->version, nginx_version);
+        return NGX_ERROR;
+    }
+
+    if (ngx_strcmp(module->signature, NGX_MODULE_SIGNATURE) != 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "module \"%V\" is not binary compatible",
+                           file);
+        return NGX_ERROR;
+    }
+
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (ngx_strcmp(cf->cycle->modules[m]->name, module->name) == 0) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "module \"%s\" is already loaded",
+                               module->name);
+            return NGX_ERROR;
+        }
+    }
+
+    /*
+     * if the module wasn't previously loaded, assign an index
+     */
+
+    if (module->index == NGX_MODULE_UNSET_INDEX) {
+        module->index = ngx_module_index(cf->cycle);
+
+        if (module->index >= ngx_max_module) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "too many modules loaded");
+            return NGX_ERROR;
+        }
+    }
+
+    /*
+     * put the module into the cycle->modules array
+     */
+
+    before = cf->cycle->modules_n;
+
+    if (order) {
+        for (i = 0; order[i]; i++) {
+            if (ngx_strcmp(order[i], module->name) == 0) {
+                i++;
+                break;
+            }
+        }
+
+        for ( /* void */ ; order[i]; i++) {
+
+#if 0
+            ngx_log_debug2(NGX_LOG_DEBUG_CORE, cf->log, 0,
+                           "module: %s before %s",
+                           module->name, order[i]);
+#endif
+
+            for (m = 0; m < before; m++) {
+                if (ngx_strcmp(cf->cycle->modules[m]->name, order[i]) == 0) {
+
+                    ngx_log_debug3(NGX_LOG_DEBUG_CORE, cf->log, 0,
+                                   "module: %s before %s:%i",
+                                   module->name, order[i], m);
+
+                    before = m;
+                    break;
+                }
+            }
+        }
+    }
+
+    /* put the module before modules[before] */
+
+    if (before != cf->cycle->modules_n) {
+        ngx_memmove(&cf->cycle->modules[before + 1],
+                    &cf->cycle->modules[before],
+                    (cf->cycle->modules_n - before) * sizeof(ngx_module_t *));
+    }
+
+    cf->cycle->modules[before] = module;
+    cf->cycle->modules_n++;
+
+    if (module->type == NGX_CORE_MODULE) {
+
+        /*
+         * we are smart enough to initialize core modules;
+         * other modules are expected to be loaded before
+         * initialization - e.g., http modules must be loaded
+         * before http{} block
+         */
+
+        core_module = module->ctx;
+
+        if (core_module->create_conf) {
+            rv = core_module->create_conf(cf->cycle);
+            if (rv == NULL) {
+                return NGX_ERROR;
+            }
+
+            cf->cycle->conf_ctx[module->index] = rv;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_uint_t
+ngx_module_index(ngx_cycle_t *cycle)
+{
+    ngx_uint_t     i, index;
+    ngx_module_t  *module;
+
+    index = 0;
+
+again:
+
+    /* find an unused index */
+
+    for (i = 0; cycle->modules[i]; i++) {
+        module = cycle->modules[i];
+
+        if (module->index == index) {
+            index++;
+            goto again;
+        }
+    }
+
+    /* check previous cycle */
+
+    if (cycle->old_cycle && cycle->old_cycle->modules) {
+
+        for (i = 0; cycle->old_cycle->modules[i]; i++) {
+            module = cycle->old_cycle->modules[i];
+
+            if (module->index == index) {
+                index++;
+                goto again;
+            }
+        }
+    }
+
+    return index;
+}
+
+
+static ngx_uint_t
+ngx_module_ctx_index(ngx_cycle_t *cycle, ngx_uint_t type, ngx_uint_t index)
+{
+    ngx_uint_t     i;
+    ngx_module_t  *module;
+
+again:
+
+    /* find an unused ctx_index */
+
+    for (i = 0; cycle->modules[i]; i++) {
+        module = cycle->modules[i];
+
+        if (module->type != type) {
+            continue;
+        }
+
+        if (module->ctx_index == index) {
+            index++;
+            goto again;
+        }
+    }
+
+    /* check previous cycle */
+
+    if (cycle->old_cycle && cycle->old_cycle->modules) {
+
+        for (i = 0; cycle->old_cycle->modules[i]; i++) {
+            module = cycle->old_cycle->modules[i];
+
+            if (module->type != type) {
+                continue;
+            }
+
+            if (module->ctx_index == index) {
+                index++;
+                goto again;
+            }
+        }
+    }
+
+    return index;
+}
diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h
new file mode 100644
index 0000000..cd28c49
--- /dev/null
+++ b/src/core/ngx_module.h
@@ -0,0 +1,307 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Maxim Dounin
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_MODULE_H_INCLUDED_
+#define _NGX_MODULE_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <nginx.h>
+
+
+#define NGX_MODULE_UNSET_INDEX  (ngx_uint_t) -1
+
+
+#define NGX_MODULE_SIGNATURE_0                                                \
+    ngx_value(NGX_PTR_SIZE) ","                                               \
+    ngx_value(NGX_SIG_ATOMIC_T_SIZE) ","                                      \
+    ngx_value(NGX_TIME_T_SIZE) ","
+
+#if (NGX_HAVE_KQUEUE)
+#define NGX_MODULE_SIGNATURE_1   "1"
+#else
+#define NGX_MODULE_SIGNATURE_1   "0"
+#endif
+
+#if (NGX_HAVE_IOCP)
+#define NGX_MODULE_SIGNATURE_2   "1"
+#else
+#define NGX_MODULE_SIGNATURE_2   "0"
+#endif
+
+#if (NGX_HAVE_FILE_AIO)
+#define NGX_MODULE_SIGNATURE_3   "1"
+#else
+#define NGX_MODULE_SIGNATURE_3   "0"
+#endif
+
+#if (NGX_HAVE_AIO_SENDFILE)
+#define NGX_MODULE_SIGNATURE_4   "1"
+#else
+#define NGX_MODULE_SIGNATURE_4   "0"
+#endif
+
+#if (NGX_HAVE_EVENTFD)
+#define NGX_MODULE_SIGNATURE_5   "1"
+#else
+#define NGX_MODULE_SIGNATURE_5   "0"
+#endif
+
+#if (NGX_HAVE_EPOLL)
+#define NGX_MODULE_SIGNATURE_6   "1"
+#else
+#define NGX_MODULE_SIGNATURE_6   "0"
+#endif
+
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+#define NGX_MODULE_SIGNATURE_7   "1"
+#else
+#define NGX_MODULE_SIGNATURE_7   "0"
+#endif
+
+#if (NGX_HAVE_INET6)
+#define NGX_MODULE_SIGNATURE_8   "1"
+#else
+#define NGX_MODULE_SIGNATURE_8   "0"
+#endif
+
+#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#define NGX_MODULE_SIGNATURE_9   "1"
+#else
+#define NGX_MODULE_SIGNATURE_9   "0"
+#endif
+
+#if (NGX_HAVE_REUSEPORT)
+#define NGX_MODULE_SIGNATURE_10  "1"
+#else
+#define NGX_MODULE_SIGNATURE_10  "0"
+#endif
+
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
+#define NGX_MODULE_SIGNATURE_11  "1"
+#else
+#define NGX_MODULE_SIGNATURE_11  "0"
+#endif
+
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
+#define NGX_MODULE_SIGNATURE_12  "1"
+#else
+#define NGX_MODULE_SIGNATURE_12  "0"
+#endif
+
+#if (NGX_HAVE_SETFIB)
+#define NGX_MODULE_SIGNATURE_13  "1"
+#else
+#define NGX_MODULE_SIGNATURE_13  "0"
+#endif
+
+#if (NGX_HAVE_TCP_FASTOPEN)
+#define NGX_MODULE_SIGNATURE_14  "1"
+#else
+#define NGX_MODULE_SIGNATURE_14  "0"
+#endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+#define NGX_MODULE_SIGNATURE_15  "1"
+#else
+#define NGX_MODULE_SIGNATURE_15  "0"
+#endif
+
+#if (NGX_HAVE_VARIADIC_MACROS)
+#define NGX_MODULE_SIGNATURE_16  "1"
+#else
+#define NGX_MODULE_SIGNATURE_16  "0"
+#endif
+
+#if (NGX_HAVE_MD5)
+#define NGX_MODULE_SIGNATURE_17  "1"
+#else
+#define NGX_MODULE_SIGNATURE_17  "0"
+#endif
+
+#if (NGX_HAVE_SHA1)
+#define NGX_MODULE_SIGNATURE_18  "1"
+#else
+#define NGX_MODULE_SIGNATURE_18  "0"
+#endif
+
+#if (NGX_HAVE_OPENAT)
+#define NGX_MODULE_SIGNATURE_19  "1"
+#else
+#define NGX_MODULE_SIGNATURE_19  "0"
+#endif
+
+#if (NGX_HAVE_ATOMIC_OPS)
+#define NGX_MODULE_SIGNATURE_20  "1"
+#else
+#define NGX_MODULE_SIGNATURE_20  "0"
+#endif
+
+#if (NGX_HAVE_POSIX_SEM)
+#define NGX_MODULE_SIGNATURE_21  "1"
+#else
+#define NGX_MODULE_SIGNATURE_21  "0"
+#endif
+
+#if (NGX_THREADS)
+#define NGX_MODULE_SIGNATURE_22  "1"
+#else
+#define NGX_MODULE_SIGNATURE_22  "0"
+#endif
+
+#if (NGX_PCRE)
+#define NGX_MODULE_SIGNATURE_23  "1"
+#else
+#define NGX_MODULE_SIGNATURE_23  "0"
+#endif
+
+#if (NGX_HTTP_SSL)
+#define NGX_MODULE_SIGNATURE_24  "1"
+#else
+#define NGX_MODULE_SIGNATURE_24  "0"
+#endif
+
+#if (NGX_HTTP_V2)
+#define NGX_MODULE_SIGNATURE_25  "1"
+#else
+#define NGX_MODULE_SIGNATURE_25  "0"
+#endif
+
+#if (NGX_HTTP_GZIP)
+#define NGX_MODULE_SIGNATURE_26  "1"
+#else
+#define NGX_MODULE_SIGNATURE_26  "0"
+#endif
+
+#if (NGX_HTTP_DEGRADATION)
+#define NGX_MODULE_SIGNATURE_27  "1"
+#else
+#define NGX_MODULE_SIGNATURE_27  "0"
+#endif
+
+#if (NGX_HTTP_X_FORWARDED_FOR)
+#define NGX_MODULE_SIGNATURE_28  "1"
+#else
+#define NGX_MODULE_SIGNATURE_28  "0"
+#endif
+
+#if (NGX_HTTP_REALIP)
+#define NGX_MODULE_SIGNATURE_29  "1"
+#else
+#define NGX_MODULE_SIGNATURE_29  "0"
+#endif
+
+#if (NGX_HTTP_HEADERS)
+#define NGX_MODULE_SIGNATURE_30  "1"
+#else
+#define NGX_MODULE_SIGNATURE_30  "0"
+#endif
+
+#if (NGX_HTTP_DAV)
+#define NGX_MODULE_SIGNATURE_31  "1"
+#else
+#define NGX_MODULE_SIGNATURE_31  "0"
+#endif
+
+#if (NGX_HTTP_CACHE)
+#define NGX_MODULE_SIGNATURE_32  "1"
+#else
+#define NGX_MODULE_SIGNATURE_32  "0"
+#endif
+
+#if (NGX_HTTP_UPSTREAM_ZONE)
+#define NGX_MODULE_SIGNATURE_33  "1"
+#else
+#define NGX_MODULE_SIGNATURE_33  "0"
+#endif
+
+#define NGX_MODULE_SIGNATURE                                                  \
+    NGX_MODULE_SIGNATURE_0 NGX_MODULE_SIGNATURE_1 NGX_MODULE_SIGNATURE_2      \
+    NGX_MODULE_SIGNATURE_3 NGX_MODULE_SIGNATURE_4 NGX_MODULE_SIGNATURE_5      \
+    NGX_MODULE_SIGNATURE_6 NGX_MODULE_SIGNATURE_7 NGX_MODULE_SIGNATURE_8      \
+    NGX_MODULE_SIGNATURE_9 NGX_MODULE_SIGNATURE_10 NGX_MODULE_SIGNATURE_11    \
+    NGX_MODULE_SIGNATURE_12 NGX_MODULE_SIGNATURE_13 NGX_MODULE_SIGNATURE_14   \
+    NGX_MODULE_SIGNATURE_15 NGX_MODULE_SIGNATURE_16 NGX_MODULE_SIGNATURE_17   \
+    NGX_MODULE_SIGNATURE_18 NGX_MODULE_SIGNATURE_19 NGX_MODULE_SIGNATURE_20   \
+    NGX_MODULE_SIGNATURE_21 NGX_MODULE_SIGNATURE_22 NGX_MODULE_SIGNATURE_23   \
+    NGX_MODULE_SIGNATURE_24 NGX_MODULE_SIGNATURE_25 NGX_MODULE_SIGNATURE_26   \
+    NGX_MODULE_SIGNATURE_27 NGX_MODULE_SIGNATURE_28 NGX_MODULE_SIGNATURE_29   \
+    NGX_MODULE_SIGNATURE_30 NGX_MODULE_SIGNATURE_31 NGX_MODULE_SIGNATURE_32   \
+    NGX_MODULE_SIGNATURE_33
+
+
+#define NGX_MODULE_V1                                                         \
+    NGX_MODULE_UNSET_INDEX, NGX_MODULE_UNSET_INDEX,                           \
+    NULL, 0, 0, nginx_version, NGX_MODULE_SIGNATURE
+
+#define NGX_MODULE_V1_PADDING  0, 0, 0, 0, 0, 0, 0, 0
+
+
+struct ngx_module_s {
+    ngx_uint_t            ctx_index;
+    ngx_uint_t            index;
+
+    char                 *name;
+
+    ngx_uint_t            spare0;
+    ngx_uint_t            spare1;
+
+    ngx_uint_t            version;
+    char                 *signature;
+
+    void                 *ctx;
+    ngx_command_t        *commands;
+    ngx_uint_t            type;
+
+    ngx_int_t           (*init_master)(ngx_log_t *log);
+
+    ngx_int_t           (*init_module)(ngx_cycle_t *cycle);
+
+    ngx_int_t           (*init_process)(ngx_cycle_t *cycle);
+    ngx_int_t           (*init_thread)(ngx_cycle_t *cycle);
+    void                (*exit_thread)(ngx_cycle_t *cycle);
+    void                (*exit_process)(ngx_cycle_t *cycle);
+
+    void                (*exit_master)(ngx_cycle_t *cycle);
+
+    uintptr_t             spare_hook0;
+    uintptr_t             spare_hook1;
+    uintptr_t             spare_hook2;
+    uintptr_t             spare_hook3;
+    uintptr_t             spare_hook4;
+    uintptr_t             spare_hook5;
+    uintptr_t             spare_hook6;
+    uintptr_t             spare_hook7;
+};
+
+
+typedef struct {
+    ngx_str_t             name;
+    void               *(*create_conf)(ngx_cycle_t *cycle);
+    char               *(*init_conf)(ngx_cycle_t *cycle, void *conf);
+} ngx_core_module_t;
+
+
+ngx_int_t ngx_preinit_modules();
+ngx_int_t ngx_cycle_modules(ngx_cycle_t *cycle);
+ngx_int_t ngx_init_modules(ngx_cycle_t *cycle);
+ngx_int_t ngx_count_modules(ngx_cycle_t *cycle, ngx_uint_t type);
+
+
+ngx_int_t ngx_add_module(ngx_conf_t *cf, ngx_str_t *file,
+    ngx_module_t *module, char **order);
+
+
+extern ngx_module_t  *ngx_modules[];
+extern ngx_uint_t     ngx_max_module;
+
+extern char          *ngx_module_names[];
+
+
+#endif /* _NGX_MODULE_H_INCLUDED_ */
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 7b60abd..7f0d3ad 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -12,6 +12,9 @@
 
 #define NGX_RESOLVER_UDP_SIZE   4096
 
+#define NGX_RESOLVER_TCP_RSIZE  (2 + 65535)
+#define NGX_RESOLVER_TCP_WSIZE  8192
+
 
 typedef struct {
     u_char  ident_hi;
@@ -53,7 +56,8 @@ typedef struct {
         ((u_char *) (n) - offsetof(ngx_resolver_node_t, node))
 
 
-ngx_int_t ngx_udp_connect(ngx_udp_connection_t *uc);
+ngx_int_t ngx_udp_connect(ngx_resolver_connection_t *rec);
+ngx_int_t ngx_tcp_connect(ngx_resolver_connection_t *rec);
 
 
 static void ngx_resolver_cleanup(void *data);
@@ -64,6 +68,10 @@ static void ngx_resolver_expire(ngx_resolver_t *r, ngx_rbtree_t *tree,
     ngx_queue_t *queue);
 static ngx_int_t ngx_resolver_send_query(ngx_resolver_t *r,
     ngx_resolver_node_t *rn);
+static ngx_int_t ngx_resolver_send_udp_query(ngx_resolver_t *r,
+    ngx_resolver_connection_t *rec, u_char *query, u_short qlen);
+static ngx_int_t ngx_resolver_send_tcp_query(ngx_resolver_t *r,
+    ngx_resolver_connection_t *rec, u_char *query, u_short qlen);
 static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_t *r,
     ngx_resolver_node_t *rn, ngx_str_t *name);
 static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_t *r,
@@ -72,12 +80,14 @@ static void ngx_resolver_resend_handler(ngx_event_t *ev);
 static time_t ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree,
     ngx_queue_t *queue);
 static ngx_uint_t ngx_resolver_resend_empty(ngx_resolver_t *r);
-static void ngx_resolver_read_response(ngx_event_t *rev);
+static void ngx_resolver_udp_read(ngx_event_t *rev);
+static void ngx_resolver_tcp_write(ngx_event_t *wev);
+static void ngx_resolver_tcp_read(ngx_event_t *rev);
 static void ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf,
-    size_t n);
+    size_t n, ngx_uint_t tcp);
 static void ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
     ngx_uint_t ident, ngx_uint_t code, ngx_uint_t qtype,
-    ngx_uint_t nan, ngx_uint_t ans);
+    ngx_uint_t nan, ngx_uint_t trunc, ngx_uint_t ans);
 static void ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n,
     ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan);
 static ngx_resolver_node_t *ngx_resolver_lookup_name(ngx_resolver_t *r,
@@ -110,12 +120,12 @@ static ngx_resolver_node_t *ngx_resolver_lookup_addr6(ngx_resolver_t *r,
 ngx_resolver_t *
 ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
 {
-    ngx_str_t              s;
-    ngx_url_t              u;
-    ngx_uint_t             i, j;
-    ngx_resolver_t        *r;
-    ngx_pool_cleanup_t    *cln;
-    ngx_udp_connection_t  *uc;
+    ngx_str_t                   s;
+    ngx_url_t                   u;
+    ngx_uint_t                  i, j;
+    ngx_resolver_t             *r;
+    ngx_pool_cleanup_t         *cln;
+    ngx_resolver_connection_t  *rec;
 
     cln = ngx_pool_cleanup_add(cf->pool, 0);
     if (cln == NULL) {
@@ -165,6 +175,7 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
     r->ident = -1;
 
     r->resend_timeout = 5;
+    r->tcp_timeout = 5;
     r->expire = 30;
     r->valid = 0;
 
@@ -172,8 +183,8 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
     r->log_level = NGX_LOG_ERR;
 
     if (n) {
-        if (ngx_array_init(&r->udp_connections, cf->pool, n,
-                           sizeof(ngx_udp_connection_t))
+        if (ngx_array_init(&r->connections, cf->pool, n,
+                           sizeof(ngx_resolver_connection_t))
             != NGX_OK)
         {
             return NULL;
@@ -230,17 +241,18 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
             return NULL;
         }
 
-        uc = ngx_array_push_n(&r->udp_connections, u.naddrs);
-        if (uc == NULL) {
+        rec = ngx_array_push_n(&r->connections, u.naddrs);
+        if (rec == NULL) {
             return NULL;
         }
 
-        ngx_memzero(uc, u.naddrs * sizeof(ngx_udp_connection_t));
+        ngx_memzero(rec, u.naddrs * sizeof(ngx_resolver_connection_t));
 
         for (j = 0; j < u.naddrs; j++) {
-            uc[j].sockaddr = u.addrs[j].sockaddr;
-            uc[j].socklen = u.addrs[j].socklen;
-            uc[j].server = u.addrs[j].name;
+            rec[j].sockaddr = u.addrs[j].sockaddr;
+            rec[j].socklen = u.addrs[j].socklen;
+            rec[j].server = u.addrs[j].name;
+            rec[j].resolver = r;
         }
     }
 
@@ -253,8 +265,8 @@ ngx_resolver_cleanup(void *data)
 {
     ngx_resolver_t  *r = data;
 
-    ngx_uint_t             i;
-    ngx_udp_connection_t  *uc;
+    ngx_uint_t                  i;
+    ngx_resolver_connection_t  *rec;
 
     if (r) {
         ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,
@@ -273,11 +285,25 @@ ngx_resolver_cleanup(void *data)
         }
 
 
-        uc = r->udp_connections.elts;
+        rec = r->connections.elts;
 
-        for (i = 0; i < r->udp_connections.nelts; i++) {
-            if (uc[i].connection) {
-                ngx_close_connection(uc[i].connection);
+        for (i = 0; i < r->connections.nelts; i++) {
+            if (rec[i].udp) {
+                ngx_close_connection(rec[i].udp);
+            }
+
+            if (rec[i].tcp) {
+                ngx_close_connection(rec[i].tcp);
+            }
+
+            if (rec[i].read_buf) {
+                ngx_resolver_free(r, rec[i].read_buf->start);
+                ngx_resolver_free(r, rec[i].read_buf);
+            }
+
+            if (rec[i].write_buf) {
+                ngx_resolver_free(r, rec[i].write_buf->start);
+                ngx_resolver_free(r, rec[i].write_buf);
             }
         }
 
@@ -340,7 +366,7 @@ ngx_resolve_start(ngx_resolver_t *r, ngx_resolver_ctx_t *temp)
         }
     }
 
-    if (r->udp_connections.nelts == 0) {
+    if (r->connections.nelts == 0) {
         return NGX_NO_RESOLVER;
     }
 
@@ -685,9 +711,16 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
         return NGX_OK;
     }
 
+    rn->last_connection = r->last_connection++;
+    if (r->last_connection == r->connections.nelts) {
+        r->last_connection = 0;
+    }
+
     rn->naddrs = (u_short) -1;
+    rn->tcp = 0;
 #if (NGX_HAVE_INET6)
     rn->naddrs6 = r->ipv6 ? (u_short) -1 : 0;
+    rn->tcp6 = 0;
 #endif
 
     if (ngx_resolver_send_query(r, rn) != NGX_OK) {
@@ -897,9 +930,16 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
         goto failed;
     }
 
+    rn->last_connection = r->last_connection++;
+    if (r->last_connection == r->connections.nelts) {
+        r->last_connection = 0;
+    }
+
     rn->naddrs = (u_short) -1;
+    rn->tcp = 0;
 #if (NGX_HAVE_INET6)
     rn->naddrs6 = (u_short) -1;
+    rn->tcp6 = 0;
 #endif
 
     if (ngx_resolver_send_query(r, rn) != NGX_OK) {
@@ -1094,64 +1134,163 @@ ngx_resolver_expire(ngx_resolver_t *r, ngx_rbtree_t *tree, ngx_queue_t *queue)
 static ngx_int_t
 ngx_resolver_send_query(ngx_resolver_t *r, ngx_resolver_node_t *rn)
 {
-    ssize_t                n;
-    ngx_udp_connection_t  *uc;
+    ngx_int_t                   rc;
+    ngx_resolver_connection_t  *rec;
 
-    uc = r->udp_connections.elts;
+    rec = r->connections.elts;
+    rec = &rec[rn->last_connection];
 
-    uc = &uc[r->last_connection++];
-    if (r->last_connection == r->udp_connections.nelts) {
-        r->last_connection = 0;
-    }
-
-    if (uc->connection == NULL) {
-
-        uc->log = *r->log;
-        uc->log.handler = ngx_resolver_log_error;
-        uc->log.data = uc;
-        uc->log.action = "resolving";
-
-        if (ngx_udp_connect(uc) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        uc->connection->data = r;
-        uc->connection->read->handler = ngx_resolver_read_response;
-        uc->connection->read->resolver = 1;
+    if (rec->log.handler == NULL) {
+        rec->log = *r->log;
+        rec->log.handler = ngx_resolver_log_error;
+        rec->log.data = rec;
+        rec->log.action = "resolving";
     }
 
     if (rn->naddrs == (u_short) -1) {
-        n = ngx_send(uc->connection, rn->query, rn->qlen);
+        rc = rn->tcp ? ngx_resolver_send_tcp_query(r, rec, rn->query, rn->qlen)
+                     : ngx_resolver_send_udp_query(r, rec, rn->query, rn->qlen);
 
-        if (n == -1) {
-            return NGX_ERROR;
-        }
-
-        if ((size_t) n != (size_t) rn->qlen) {
-            ngx_log_error(NGX_LOG_CRIT, &uc->log, 0, "send() incomplete");
-            return NGX_ERROR;
+        if (rc != NGX_OK) {
+            return rc;
         }
     }
 
 #if (NGX_HAVE_INET6)
+
     if (rn->query6 && rn->naddrs6 == (u_short) -1) {
-        n = ngx_send(uc->connection, rn->query6, rn->qlen);
+        rc = rn->tcp6
+                    ? ngx_resolver_send_tcp_query(r, rec, rn->query6, rn->qlen)
+                    : ngx_resolver_send_udp_query(r, rec, rn->query6, rn->qlen);
 
-        if (n == -1) {
-            return NGX_ERROR;
-        }
-
-        if ((size_t) n != (size_t) rn->qlen) {
-            ngx_log_error(NGX_LOG_CRIT, &uc->log, 0, "send() incomplete");
-            return NGX_ERROR;
+        if (rc != NGX_OK) {
+            return rc;
         }
     }
+
 #endif
 
     return NGX_OK;
 }
 
 
+static ngx_int_t
+ngx_resolver_send_udp_query(ngx_resolver_t *r, ngx_resolver_connection_t  *rec,
+    u_char *query, u_short qlen)
+{
+    ssize_t  n;
+
+    if (rec->udp == NULL) {
+        if (ngx_udp_connect(rec) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        rec->udp->data = rec;
+        rec->udp->read->handler = ngx_resolver_udp_read;
+        rec->udp->read->resolver = 1;
+    }
+
+    n = ngx_send(rec->udp, query, qlen);
+
+    if (n == -1) {
+        return NGX_ERROR;
+    }
+
+    if ((size_t) n != (size_t) qlen) {
+        ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "send() incomplete");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_resolver_send_tcp_query(ngx_resolver_t *r, ngx_resolver_connection_t *rec,
+    u_char *query, u_short qlen)
+{
+    ngx_buf_t  *b;
+    ngx_int_t   rc;
+
+    rc = NGX_OK;
+
+    if (rec->tcp == NULL) {
+        b = rec->read_buf;
+
+        if (b == NULL) {
+            b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
+            if (b == NULL) {
+                return NGX_ERROR;
+            }
+
+            b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_RSIZE);
+            if (b->start == NULL) {
+                ngx_resolver_free(r, b);
+                return NGX_ERROR;
+            }
+
+            b->end = b->start + NGX_RESOLVER_TCP_RSIZE;
+
+            rec->read_buf = b;
+        }
+
+        b->pos = b->start;
+        b->last = b->start;
+
+        b = rec->write_buf;
+
+        if (b == NULL) {
+            b = ngx_resolver_calloc(r, sizeof(ngx_buf_t));
+            if (b == NULL) {
+                return NGX_ERROR;
+            }
+
+            b->start = ngx_resolver_alloc(r, NGX_RESOLVER_TCP_WSIZE);
+            if (b->start == NULL) {
+                ngx_resolver_free(r, b);
+                return NGX_ERROR;
+            }
+
+            b->end = b->start + NGX_RESOLVER_TCP_WSIZE;
+
+            rec->write_buf = b;
+        }
+
+        b->pos = b->start;
+        b->last = b->start;
+
+        rc = ngx_tcp_connect(rec);
+        if (rc == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        rec->tcp->data = rec;
+        rec->tcp->write->handler = ngx_resolver_tcp_write;
+        rec->tcp->read->handler = ngx_resolver_tcp_read;
+        rec->tcp->read->resolver = 1;
+
+        ngx_add_timer(rec->tcp->write, (ngx_msec_t) (r->tcp_timeout * 1000));
+    }
+
+    b = rec->write_buf;
+
+    if (b->end - b->last <  2 + qlen) {
+        ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "buffer overflow");
+        return NGX_ERROR;
+    }
+
+    *b->last++ = (u_char) (qlen >> 8);
+    *b->last++ = (u_char) qlen;
+    b->last = ngx_cpymem(b->last, query, qlen);
+
+    if (rc == NGX_OK) {
+        ngx_resolver_tcp_write(rec->tcp->write);
+    }
+
+    return NGX_OK;
+}
+
+
 static void
 ngx_resolver_resend_handler(ngx_event_t *ev)
 {
@@ -1244,6 +1383,10 @@ ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree, ngx_queue_t *queue)
 
         if (rn->waiting) {
 
+            if (++rn->last_connection == r->connections.nelts) {
+                rn->last_connection = 0;
+            }
+
             (void) ngx_resolver_send_query(r, rn);
 
             rn->expire = now + r->resend_timeout;
@@ -1272,13 +1415,15 @@ ngx_resolver_resend_empty(ngx_resolver_t *r)
 
 
 static void
-ngx_resolver_read_response(ngx_event_t *rev)
+ngx_resolver_udp_read(ngx_event_t *rev)
 {
-    ssize_t            n;
-    ngx_connection_t  *c;
-    u_char             buf[NGX_RESOLVER_UDP_SIZE];
+    ssize_t                     n;
+    ngx_connection_t           *c;
+    ngx_resolver_connection_t  *rec;
+    u_char                      buf[NGX_RESOLVER_UDP_SIZE];
 
     c = rev->data;
+    rec = c->data;
 
     do {
         n = ngx_udp_recv(c, buf, NGX_RESOLVER_UDP_SIZE);
@@ -1287,17 +1432,144 @@ ngx_resolver_read_response(ngx_event_t *rev)
             return;
         }
 
-        ngx_resolver_process_response(c->data, buf, n);
+        ngx_resolver_process_response(rec->resolver, buf, n, 0);
 
     } while (rev->ready);
 }
 
 
 static void
-ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n)
+ngx_resolver_tcp_write(ngx_event_t *wev)
+{
+    off_t                       sent;
+    ssize_t                     n;
+    ngx_buf_t                  *b;
+    ngx_resolver_t             *r;
+    ngx_connection_t           *c;
+    ngx_resolver_connection_t  *rec;
+
+    c = wev->data;
+    rec = c->data;
+    b = rec->write_buf;
+    r = rec->resolver;
+
+    if (wev->timedout) {
+        goto failed;
+    }
+
+    sent = c->sent;
+
+    while (wev->ready && b->pos < b->last) {
+        n = ngx_send(c, b->pos, b->last - b->pos);
+
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
+        if (n == NGX_ERROR) {
+            goto failed;
+        }
+
+        b->pos += n;
+    }
+
+    if (b->pos != b->start) {
+        b->last = ngx_movemem(b->start, b->pos, b->last - b->pos);
+        b->pos = b->start;
+    }
+
+    if (c->sent != sent) {
+        ngx_add_timer(wev, (ngx_msec_t) (r->tcp_timeout * 1000));
+    }
+
+    if (ngx_handle_write_event(wev, 0) != NGX_OK) {
+        goto failed;
+    }
+
+    return;
+
+failed:
+
+    ngx_close_connection(c);
+    rec->tcp = NULL;
+}
+
+
+static void
+ngx_resolver_tcp_read(ngx_event_t *rev)
+{
+    u_char                     *p;
+    size_t                      size;
+    ssize_t                     n;
+    u_short                     qlen;
+    ngx_buf_t                  *b;
+    ngx_resolver_t             *r;
+    ngx_connection_t           *c;
+    ngx_resolver_connection_t  *rec;
+
+    c = rev->data;
+    rec = c->data;
+    b = rec->read_buf;
+    r = rec->resolver;
+
+    while (rev->ready) {
+        n = ngx_recv(c, b->last, b->end - b->last);
+
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
+        if (n == NGX_ERROR || n == 0) {
+            goto failed;
+        }
+
+        b->last += n;
+
+        for ( ;; ) {
+            p = b->pos;
+            size = b->last - p;
+
+            if (size < 2) {
+                break;
+            }
+
+            qlen = (u_short) *p++ << 8;
+            qlen += *p++;
+
+            if (size < (size_t) (2 + qlen)) {
+                break;
+            }
+
+            ngx_resolver_process_response(r, p, qlen, 1);
+
+            b->pos += 2 + qlen;
+        }
+
+        if (b->pos != b->start) {
+            b->last = ngx_movemem(b->start, b->pos, b->last - b->pos);
+            b->pos = b->start;
+        }
+    }
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        goto failed;
+    }
+
+    return;
+
+failed:
+
+    ngx_close_connection(c);
+    rec->tcp = NULL;
+}
+
+
+static void
+ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n,
+    ngx_uint_t tcp)
 {
     char                 *err;
-    ngx_uint_t            i, times, ident, qident, flags, code, nqs, nan,
+    ngx_uint_t            i, times, ident, qident, flags, code, nqs, nan, trunc,
                           qtype, qclass;
 #if (NGX_HAVE_INET6)
     ngx_uint_t            qident6;
@@ -1317,6 +1589,7 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n)
     flags = (response->flags_hi << 8) + response->flags_lo;
     nqs = (response->nqs_hi << 8) + response->nqs_lo;
     nan = (response->nan_hi << 8) + response->nan_lo;
+    trunc = flags & 0x0200;
 
     ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
                    "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
@@ -1325,9 +1598,10 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n)
                    (response->nar_hi << 8) + response->nar_lo);
 
     /* response to a standard query */
-    if ((flags & 0xf870) != 0x8000) {
+    if ((flags & 0xf870) != 0x8000 || (trunc && tcp)) {
         ngx_log_error(r->log_level, r->log, 0,
-                      "invalid DNS response %ui fl:%04Xui", ident, flags);
+                      "invalid %s DNS response %ui fl:%04Xui",
+                      tcp ? "TCP" : "UDP", ident, flags);
         return;
     }
 
@@ -1417,7 +1691,7 @@ found:
     case NGX_RESOLVE_AAAA:
 #endif
 
-        ngx_resolver_process_a(r, buf, n, ident, code, qtype, nan,
+        ngx_resolver_process_a(r, buf, n, ident, code, qtype, nan, trunc,
                                i + sizeof(ngx_resolver_qs_t));
 
         break;
@@ -1464,28 +1738,29 @@ dns_error:
 
 
 static void
-ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
+ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
     ngx_uint_t ident, ngx_uint_t code, ngx_uint_t qtype,
-    ngx_uint_t nan, ngx_uint_t ans)
+    ngx_uint_t nan, ngx_uint_t trunc, ngx_uint_t ans)
 {
-    char                 *err;
-    u_char               *cname;
-    size_t                len;
-    int32_t               ttl;
-    uint32_t              hash;
-    in_addr_t            *addr;
-    ngx_str_t             name;
-    ngx_addr_t           *addrs;
-    ngx_uint_t            type, class, qident, naddrs, a, i, n, start;
+    char                       *err;
+    u_char                     *cname;
+    size_t                      len;
+    int32_t                     ttl;
+    uint32_t                    hash;
+    in_addr_t                  *addr;
+    ngx_str_t                   name;
+    ngx_addr_t                 *addrs;
+    ngx_uint_t                  type, class, qident, naddrs, a, i, j, start;
 #if (NGX_HAVE_INET6)
-    struct in6_addr      *addr6;
+    struct in6_addr            *addr6;
 #endif
-    ngx_resolver_an_t    *an;
-    ngx_resolver_ctx_t   *ctx, *next;
-    ngx_resolver_node_t  *rn;
+    ngx_resolver_an_t          *an;
+    ngx_resolver_ctx_t         *ctx, *next;
+    ngx_resolver_node_t        *rn;
+    ngx_resolver_connection_t  *rec;
 
     if (ngx_resolver_copy(r, &name, buf,
-                          buf + sizeof(ngx_resolver_hdr_t), buf + last)
+                          buf + sizeof(ngx_resolver_hdr_t), buf + n)
         != NGX_OK)
     {
         return;
@@ -1518,6 +1793,11 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
             goto failed;
         }
 
+        if (trunc && rn->tcp6) {
+            ngx_resolver_free(r, name.data);
+            goto failed;
+        }
+
         qident = (rn->query6[0] << 8) + rn->query6[1];
 
         break;
@@ -1532,6 +1812,11 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
             goto failed;
         }
 
+        if (trunc && rn->tcp) {
+            ngx_resolver_free(r, name.data);
+            goto failed;
+        }
+
         qident = (rn->query[0] << 8) + rn->query[1];
     }
 
@@ -1545,6 +1830,45 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
 
     ngx_resolver_free(r, name.data);
 
+    if (trunc) {
+
+        ngx_queue_remove(&rn->queue);
+
+        if (rn->waiting == NULL) {
+            ngx_rbtree_delete(&r->name_rbtree, &rn->node);
+            ngx_resolver_free_node(r, rn);
+            goto next;
+        }
+
+        rec = r->connections.elts;
+        rec = &rec[rn->last_connection];
+
+        switch (qtype) {
+
+#if (NGX_HAVE_INET6)
+        case NGX_RESOLVE_AAAA:
+
+            rn->tcp6 = 1;
+
+            (void) ngx_resolver_send_tcp_query(r, rec, rn->query6, rn->qlen);
+
+            break;
+#endif
+
+        default: /* NGX_RESOLVE_A */
+
+            rn->tcp = 1;
+
+            (void) ngx_resolver_send_tcp_query(r, rec, rn->query, rn->qlen);
+        }
+
+        rn->expire = ngx_time() + r->resend_timeout;
+
+        ngx_queue_insert_head(&r->name_resend_queue, &rn->queue);
+
+        goto next;
+    }
+
     if (code == 0 && rn->code) {
         code = rn->code;
     }
@@ -1642,7 +1966,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
 
         start = i;
 
-        while (i < last) {
+        while (i < n) {
 
             if (buf[i] & 0xc0) {
                 i += 2;
@@ -1668,7 +1992,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
 
     found:
 
-        if (i + sizeof(ngx_resolver_an_t) >= last) {
+        if (i + sizeof(ngx_resolver_an_t) >= n) {
             goto short_response;
         }
 
@@ -1708,7 +2032,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
                 goto invalid;
             }
 
-            if (i + 4 > last) {
+            if (i + 4 > n) {
                 goto short_response;
             }
 
@@ -1729,7 +2053,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
                 goto invalid;
             }
 
-            if (i + 16 > last) {
+            if (i + 16 > n) {
                 goto short_response;
             }
 
@@ -1810,7 +2134,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
 #endif
         }
 
-        n = 0;
+        j = 0;
         i = ans;
 
         for (a = 0; a < nan; a++) {
@@ -1839,10 +2163,10 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
 
             if (type == NGX_RESOLVE_A) {
 
-                addr[n] = htonl((buf[i] << 24) + (buf[i + 1] << 16)
+                addr[j] = htonl((buf[i] << 24) + (buf[i + 1] << 16)
                                 + (buf[i + 2] << 8) + (buf[i + 3]));
 
-                if (++n == naddrs) {
+                if (++j == naddrs) {
 
 #if (NGX_HAVE_INET6)
                     if (rn->naddrs6 == (u_short) -1) {
@@ -1857,9 +2181,9 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
 #if (NGX_HAVE_INET6)
             else if (type == NGX_RESOLVE_AAAA) {
 
-                ngx_memcpy(addr6[n].s6_addr, &buf[i], 16);
+                ngx_memcpy(addr6[j].s6_addr, &buf[i], 16);
 
-                if (++n == naddrs) {
+                if (++j == naddrs) {
 
                     if (rn->naddrs == (u_short) -1) {
                         goto next;
@@ -1984,7 +2308,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
             goto next;
         }
 
-        if (ngx_resolver_copy(r, &name, buf, cname, buf + last) != NGX_OK) {
+        if (ngx_resolver_copy(r, &name, buf, cname, buf + n) != NGX_OK) {
             goto failed;
         }
 
@@ -2072,12 +2396,11 @@ ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n,
 {
     char                 *err;
     size_t                len;
-    u_char                text[NGX_SOCKADDR_STRLEN];
     in_addr_t             addr;
     int32_t               ttl;
     ngx_int_t             octet;
     ngx_str_t             name;
-    ngx_uint_t            i, mask, qident, class;
+    ngx_uint_t            mask, type, class, qident, a, i, start;
     ngx_queue_t          *expire_queue;
     ngx_rbtree_t         *tree;
     ngx_resolver_an_t    *an;
@@ -2089,13 +2412,15 @@ ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n,
     struct in6_addr       addr6;
 #endif
 
-    if (ngx_resolver_copy(r, NULL, buf,
+    if (ngx_resolver_copy(r, &name, buf,
                           buf + sizeof(ngx_resolver_hdr_t), buf + n)
         != NGX_OK)
     {
         return;
     }
 
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver qs:%V", &name);
+
     /* AF_INET */
 
     addr = 0;
@@ -2123,10 +2448,6 @@ ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n,
         tree = &r->addr_rbtree;
         expire_queue = &r->addr_expire_queue;
 
-        addr = htonl(addr);
-        name.len = ngx_inet_ntop(AF_INET, &addr, text, NGX_SOCKADDR_STRLEN);
-        name.data = text;
-
         goto valid;
     }
 
@@ -2171,9 +2492,6 @@ invalid_in_addr_arpa:
         tree = &r->addr6_rbtree;
         expire_queue = &r->addr6_expire_queue;
 
-        name.len = ngx_inet6_ntop(addr6.s6_addr, text, NGX_SOCKADDR_STRLEN);
-        name.data = text;
-
         goto valid;
     }
 
@@ -2182,6 +2500,7 @@ invalid_ip6_arpa:
 
     ngx_log_error(r->log_level, r->log, 0,
                   "invalid in-addr.arpa or ip6.arpa name in DNS response");
+    ngx_resolver_free(r, name.data);
     return;
 
 valid:
@@ -2189,6 +2508,7 @@ valid:
     if (rn == NULL || rn->query == NULL) {
         ngx_log_error(r->log_level, r->log, 0,
                       "unexpected response for %V", &name);
+        ngx_resolver_free(r, name.data);
         goto failed;
     }
 
@@ -2198,9 +2518,12 @@ valid:
         ngx_log_error(r->log_level, r->log, 0,
                       "wrong ident %ui response for %V, expect %ui",
                       ident, &name, qident);
+        ngx_resolver_free(r, name.data);
         goto failed;
     }
 
+    ngx_resolver_free(r, name.data);
+
     if (code == 0 && nan == 0) {
         code = NGX_RESOLVE_NXDOMAIN;
     }
@@ -2230,44 +2553,90 @@ valid:
 
     i += sizeof(ngx_resolver_qs_t);
 
-    if (i + 2 + sizeof(ngx_resolver_an_t) >= n) {
+    for (a = 0; a < nan; a++) {
+
+        start = i;
+
+        while (i < n) {
+
+            if (buf[i] & 0xc0) {
+                i += 2;
+                goto found;
+            }
+
+            if (buf[i] == 0) {
+                i++;
+                goto test_length;
+            }
+
+            i += 1 + buf[i];
+        }
+
         goto short_response;
+
+    test_length:
+
+        if (i - start < 2) {
+            err = "invalid name in DNS response";
+            goto invalid;
+        }
+
+    found:
+
+        if (i + sizeof(ngx_resolver_an_t) >= n) {
+            goto short_response;
+        }
+
+        an = (ngx_resolver_an_t *) &buf[i];
+
+        type = (an->type_hi << 8) + an->type_lo;
+        class = (an->class_hi << 8) + an->class_lo;
+        len = (an->len_hi << 8) + an->len_lo;
+        ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16)
+            + (an->ttl[2] << 8) + (an->ttl[3]);
+
+        if (class != 1) {
+            ngx_log_error(r->log_level, r->log, 0,
+                          "unexpected RR class %ui", class);
+            goto failed;
+        }
+
+        if (ttl < 0) {
+            ttl = 0;
+        }
+
+        ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
+                      "resolver qt:%ui cl:%ui len:%uz",
+                      type, class, len);
+
+        i += sizeof(ngx_resolver_an_t);
+
+        switch (type) {
+
+        case NGX_RESOLVE_PTR:
+
+            goto ptr;
+
+        case NGX_RESOLVE_CNAME:
+
+            break;
+
+        default:
+
+            ngx_log_error(r->log_level, r->log, 0,
+                          "unexpected RR type %ui", type);
+        }
+
+        i += len;
     }
 
-    /* compression pointer to *.arpa */
+    /* unlock addr mutex */
 
-    if (buf[i] != 0xc0 || buf[i + 1] != sizeof(ngx_resolver_hdr_t)) {
-        err = "invalid in-addr.arpa or ip6.arpa name in DNS response";
-        goto invalid;
-    }
+    ngx_log_error(r->log_level, r->log, 0,
+                  "no PTR type in DNS response");
+    return;
 
-    an = (ngx_resolver_an_t *) &buf[i + 2];
-
-    class = (an->class_hi << 8) + an->class_lo;
-    len = (an->len_hi << 8) + an->len_lo;
-    ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16)
-        + (an->ttl[2] << 8) + (an->ttl[3]);
-
-    if (class != 1) {
-        ngx_log_error(r->log_level, r->log, 0,
-                      "unexpected RR class %ui", class);
-        goto failed;
-    }
-
-    if (ttl < 0) {
-        ttl = 0;
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
-                  "resolver qt:%ui cl:%ui len:%uz",
-                  (an->type_hi << 8) + an->type_lo,
-                  class, len);
-
-    i += 2 + sizeof(ngx_resolver_an_t);
-
-    if (i + len > n) {
-        goto short_response;
-    }
+ptr:
 
     if (ngx_resolver_copy(r, &name, buf, buf + i, buf + n) != NGX_OK) {
         goto failed;
@@ -3074,8 +3443,8 @@ ngx_resolver_strerror(ngx_int_t err)
 static u_char *
 ngx_resolver_log_error(ngx_log_t *log, u_char *buf, size_t len)
 {
-    u_char                *p;
-    ngx_udp_connection_t  *uc;
+    u_char                     *p;
+    ngx_resolver_connection_t  *rec;
 
     p = buf;
 
@@ -3084,10 +3453,10 @@ ngx_resolver_log_error(ngx_log_t *log, u_char *buf, size_t len)
         len -= p - buf;
     }
 
-    uc = log->data;
+    rec = log->data;
 
-    if (uc) {
-        p = ngx_snprintf(p, len, ", resolver: %V", &uc->server);
+    if (rec) {
+        p = ngx_snprintf(p, len, ", resolver: %V", &rec->server);
     }
 
     return p;
@@ -3095,7 +3464,7 @@ ngx_resolver_log_error(ngx_log_t *log, u_char *buf, size_t len)
 
 
 ngx_int_t
-ngx_udp_connect(ngx_udp_connection_t *uc)
+ngx_udp_connect(ngx_resolver_connection_t *rec)
 {
     int                rc;
     ngx_int_t          event;
@@ -3103,21 +3472,21 @@ ngx_udp_connect(ngx_udp_connection_t *uc)
     ngx_socket_t       s;
     ngx_connection_t  *c;
 
-    s = ngx_socket(uc->sockaddr->sa_family, SOCK_DGRAM, 0);
+    s = ngx_socket(rec->sockaddr->sa_family, SOCK_DGRAM, 0);
 
-    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &uc->log, 0, "UDP socket %d", s);
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "UDP socket %d", s);
 
     if (s == (ngx_socket_t) -1) {
-        ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
                       ngx_socket_n " failed");
         return NGX_ERROR;
     }
 
-    c = ngx_get_connection(s, &uc->log);
+    c = ngx_get_connection(s, &rec->log);
 
     if (c == NULL) {
         if (ngx_close_socket(s) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
+            ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
                           ngx_close_socket_n "failed");
         }
 
@@ -3125,7 +3494,7 @@ ngx_udp_connect(ngx_udp_connection_t *uc)
     }
 
     if (ngx_nonblocking(s) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
                       ngx_nonblocking_n " failed");
 
         goto failed;
@@ -3134,22 +3503,22 @@ ngx_udp_connect(ngx_udp_connection_t *uc)
     rev = c->read;
     wev = c->write;
 
-    rev->log = &uc->log;
-    wev->log = &uc->log;
+    rev->log = &rec->log;
+    wev->log = &rec->log;
 
-    uc->connection = c;
+    rec->udp = c;
 
     c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
 
-    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &uc->log, 0,
-                   "connect to %V, fd:%d #%uA", &uc->server, s, c->number);
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &rec->log, 0,
+                   "connect to %V, fd:%d #%uA", &rec->server, s, c->number);
 
-    rc = connect(s, uc->sockaddr, uc->socklen);
+    rc = connect(s, rec->sockaddr, rec->socklen);
 
     /* TODO: iocp */
 
     if (rc == -1) {
-        ngx_log_error(NGX_LOG_CRIT, &uc->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_CRIT, &rec->log, ngx_socket_errno,
                       "connect() failed");
 
         goto failed;
@@ -3172,7 +3541,190 @@ ngx_udp_connect(ngx_udp_connection_t *uc)
 failed:
 
     ngx_close_connection(c);
-    uc->connection = NULL;
+    rec->udp = NULL;
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_tcp_connect(ngx_resolver_connection_t *rec)
+{
+    int                rc;
+    ngx_int_t          event;
+    ngx_err_t          err;
+    ngx_uint_t         level;
+    ngx_socket_t       s;
+    ngx_event_t       *rev, *wev;
+    ngx_connection_t  *c;
+
+    s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM, 0);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "TCP socket %d", s);
+
+    if (s == (ngx_socket_t) -1) {
+        ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
+                      ngx_socket_n " failed");
+        return NGX_ERROR;
+    }
+
+    c = ngx_get_connection(s, &rec->log);
+
+    if (c == NULL) {
+        if (ngx_close_socket(s) == -1) {
+            ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
+                          ngx_close_socket_n "failed");
+        }
+
+        return NGX_ERROR;
+    }
+
+    if (ngx_nonblocking(s) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
+                      ngx_nonblocking_n " failed");
+
+        goto failed;
+    }
+
+    rev = c->read;
+    wev = c->write;
+
+    rev->log = &rec->log;
+    wev->log = &rec->log;
+
+    rec->tcp = c;
+
+    c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+
+    if (ngx_add_conn) {
+        if (ngx_add_conn(c) == NGX_ERROR) {
+            goto failed;
+        }
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &rec->log, 0,
+                   "connect to %V, fd:%d #%uA", &rec->server, s, c->number);
+
+    rc = connect(s, rec->sockaddr, rec->socklen);
+
+    if (rc == -1) {
+        err = ngx_socket_errno;
+
+
+        if (err != NGX_EINPROGRESS
+#if (NGX_WIN32)
+            /* Winsock returns WSAEWOULDBLOCK (NGX_EAGAIN) */
+            && err != NGX_EAGAIN
+#endif
+            )
+        {
+            if (err == NGX_ECONNREFUSED
+#if (NGX_LINUX)
+                /*
+                 * Linux returns EAGAIN instead of ECONNREFUSED
+                 * for unix sockets if listen queue is full
+                 */
+                || err == NGX_EAGAIN
+#endif
+                || err == NGX_ECONNRESET
+                || err == NGX_ENETDOWN
+                || err == NGX_ENETUNREACH
+                || err == NGX_EHOSTDOWN
+                || err == NGX_EHOSTUNREACH)
+            {
+                level = NGX_LOG_ERR;
+
+            } else {
+                level = NGX_LOG_CRIT;
+            }
+
+            ngx_log_error(level, c->log, err, "connect() to %V failed",
+                          &rec->server);
+
+            ngx_close_connection(c);
+            rec->tcp = NULL;
+
+            return NGX_ERROR;
+        }
+    }
+
+    if (ngx_add_conn) {
+        if (rc == -1) {
+
+            /* NGX_EINPROGRESS */
+
+            return NGX_AGAIN;
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
+
+        wev->ready = 1;
+
+        return NGX_OK;
+    }
+
+    if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &rec->log, ngx_socket_errno,
+                       "connect(): %d", rc);
+
+        if (ngx_blocking(s) == -1) {
+            ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
+                          ngx_blocking_n " failed");
+            goto failed;
+        }
+
+        /*
+         * FreeBSD's aio allows to post an operation on non-connected socket.
+         * NT does not support it.
+         *
+         * TODO: check in Win32, etc. As workaround we can use NGX_ONESHOT_EVENT
+         */
+
+        rev->ready = 1;
+        wev->ready = 1;
+
+        return NGX_OK;
+    }
+
+    if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
+
+        /* kqueue */
+
+        event = NGX_CLEAR_EVENT;
+
+    } else {
+
+        /* select, poll, /dev/poll */
+
+        event = NGX_LEVEL_EVENT;
+    }
+
+    if (ngx_add_event(rev, NGX_READ_EVENT, event) != NGX_OK) {
+        goto failed;
+    }
+
+    if (rc == -1) {
+
+        /* NGX_EINPROGRESS */
+
+        if (ngx_add_event(wev, NGX_WRITE_EVENT, event) != NGX_OK) {
+            goto failed;
+        }
+
+        return NGX_AGAIN;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "connected");
+
+    wev->ready = 1;
+
+    return NGX_OK;
+
+failed:
+
+    ngx_close_connection(c);
+    rec->tcp = NULL;
 
     return NGX_ERROR;
 }
diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h
index 07fa257..3165abd 100644
--- a/src/core/ngx_resolver.h
+++ b/src/core/ngx_resolver.h
@@ -36,13 +36,20 @@
 #define NGX_RESOLVER_MAX_RECURSION    50
 
 
+typedef struct ngx_resolver_s  ngx_resolver_t;
+
+
 typedef struct {
-    ngx_connection_t         *connection;
+    ngx_connection_t         *udp;
+    ngx_connection_t         *tcp;
     struct sockaddr          *sockaddr;
     socklen_t                 socklen;
     ngx_str_t                 server;
     ngx_log_t                 log;
-} ngx_udp_connection_t;
+    ngx_buf_t                *read_buf;
+    ngx_buf_t                *write_buf;
+    ngx_resolver_t           *resolver;
+} ngx_resolver_connection_t;
 
 
 typedef struct ngx_resolver_ctx_s  ngx_resolver_ctx_t;
@@ -93,11 +100,18 @@ typedef struct {
     time_t                    valid;
     uint32_t                  ttl;
 
+    unsigned                  tcp:1;
+#if (NGX_HAVE_INET6)
+    unsigned                  tcp6:1;
+#endif
+
+    ngx_uint_t                last_connection;
+
     ngx_resolver_ctx_t       *waiting;
 } ngx_resolver_node_t;
 
 
-typedef struct {
+struct ngx_resolver_s {
     /* has to be pointer because of "incomplete type" */
     ngx_event_t              *event;
     void                     *dummy;
@@ -107,7 +121,7 @@ typedef struct {
     ngx_int_t                 ident;
 
     /* simple round robin DNS peers balancer */
-    ngx_array_t               udp_connections;
+    ngx_array_t               connections;
     ngx_uint_t                last_connection;
 
     ngx_rbtree_t              name_rbtree;
@@ -131,17 +145,18 @@ typedef struct {
 #endif
 
     time_t                    resend_timeout;
+    time_t                    tcp_timeout;
     time_t                    expire;
     time_t                    valid;
 
     ngx_uint_t                log_level;
-} ngx_resolver_t;
+};
 
 
 struct ngx_resolver_ctx_s {
     ngx_resolver_ctx_t       *next;
     ngx_resolver_t           *resolver;
-    ngx_udp_connection_t     *udp_connection;
+    ngx_resolver_node_t      *node;
 
     /* event ident must be after 3 pointers as in ngx_connection_t */
     ngx_int_t                 ident;
@@ -161,8 +176,6 @@ struct ngx_resolver_ctx_s {
     ngx_uint_t                quick;  /* unsigned  quick:1; */
     ngx_uint_t                recursion;
     ngx_event_t              *event;
-
-    ngx_resolver_node_t      *node;
 };
 
 
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 15da213..955622b 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -606,16 +606,16 @@ ngx_event_process_init(ngx_cycle_t *cycle)
         return NGX_ERROR;
     }
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_EVENT_MODULE) {
+    for (m = 0; cycle->modules[m]; m++) {
+        if (cycle->modules[m]->type != NGX_EVENT_MODULE) {
             continue;
         }
 
-        if (ngx_modules[m]->ctx_index != ecf->use) {
+        if (cycle->modules[m]->ctx_index != ecf->use) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cycle->modules[m]->ctx;
 
         if (module->actions.init(cycle, ngx_timer_resolution) != NGX_OK) {
             /* fatal */
@@ -891,14 +891,7 @@ ngx_events_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     /* count the number of the event modules and set up their indices */
 
-    ngx_event_max_module = 0;
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_EVENT_MODULE) {
-            continue;
-        }
-
-        ngx_modules[i]->ctx_index = ngx_event_max_module++;
-    }
+    ngx_event_max_module = ngx_count_modules(cf->cycle, NGX_EVENT_MODULE);
 
     ctx = ngx_pcalloc(cf->pool, sizeof(void *));
     if (ctx == NULL) {
@@ -912,16 +905,17 @@ ngx_events_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     *(void **) conf = ctx;
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_EVENT_MODULE) {
+    for (i = 0; cf->cycle->modules[i]; i++) {
+        if (cf->cycle->modules[i]->type != NGX_EVENT_MODULE) {
             continue;
         }
 
-        m = ngx_modules[i]->ctx;
+        m = cf->cycle->modules[i]->ctx;
 
         if (m->create_conf) {
-            (*ctx)[ngx_modules[i]->ctx_index] = m->create_conf(cf->cycle);
-            if ((*ctx)[ngx_modules[i]->ctx_index] == NULL) {
+            (*ctx)[cf->cycle->modules[i]->ctx_index] =
+                                                     m->create_conf(cf->cycle);
+            if ((*ctx)[cf->cycle->modules[i]->ctx_index] == NULL) {
                 return NGX_CONF_ERROR;
             }
         }
@@ -940,15 +934,16 @@ ngx_events_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return rv;
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_EVENT_MODULE) {
+    for (i = 0; cf->cycle->modules[i]; i++) {
+        if (cf->cycle->modules[i]->type != NGX_EVENT_MODULE) {
             continue;
         }
 
-        m = ngx_modules[i]->ctx;
+        m = cf->cycle->modules[i]->ctx;
 
         if (m->init_conf) {
-            rv = m->init_conf(cf->cycle, (*ctx)[ngx_modules[i]->ctx_index]);
+            rv = m->init_conf(cf->cycle,
+                              (*ctx)[cf->cycle->modules[i]->ctx_index]);
             if (rv != NGX_CONF_OK) {
                 return rv;
             }
@@ -1009,15 +1004,15 @@ ngx_event_use(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_EVENT_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_EVENT_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cf->cycle->modules[m]->ctx;
         if (module->name->len == value[1].len) {
             if (ngx_strcmp(module->name->data, value[1].data) == 0) {
-                ecf->use = ngx_modules[m]->ctx_index;
+                ecf->use = cf->cycle->modules[m]->ctx_index;
                 ecf->name = module->name->data;
 
                 if (ngx_process == NGX_PROCESS_SINGLE
@@ -1232,20 +1227,20 @@ ngx_event_core_init_conf(ngx_cycle_t *cycle, void *conf)
 #endif
 
     if (module == NULL) {
-        for (i = 0; ngx_modules[i]; i++) {
+        for (i = 0; cycle->modules[i]; i++) {
 
-            if (ngx_modules[i]->type != NGX_EVENT_MODULE) {
+            if (cycle->modules[i]->type != NGX_EVENT_MODULE) {
                 continue;
             }
 
-            event_module = ngx_modules[i]->ctx;
+            event_module = cycle->modules[i]->ctx;
 
             if (ngx_strcmp(event_module->name->data, event_core_name.data) == 0)
             {
                 continue;
             }
 
-            module = ngx_modules[i];
+            module = cycle->modules[i];
             break;
         }
     }
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index 754512f..2ec7f5d 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -560,12 +560,12 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_HTTP_MODULE) {
+    for (i = 0; cf->cycle->modules[i]; i++) {
+        if (cf->cycle->modules[i]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[i]->ctx;
+        module = cf->cycle->modules[i]->ctx;
 
         if (module->create_loc_conf) {
 
@@ -574,7 +574,7 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                  return NGX_CONF_ERROR;
             }
 
-            ctx->loc_conf[ngx_modules[i]->ctx_index] = mconf;
+            ctx->loc_conf[cf->cycle->modules[i]->ctx_index] = mconf;
         }
     }
 
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 64af447..0ceb613 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -144,14 +144,7 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     /* count the number of the http modules and set up their indices */
 
-    ngx_http_max_module = 0;
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_HTTP_MODULE) {
-            continue;
-        }
-
-        ngx_modules[m]->ctx_index = ngx_http_max_module++;
-    }
+    ngx_http_max_module = ngx_count_modules(cf->cycle, NGX_HTTP_MODULE);
 
 
     /* the http main_conf context, it is the same in the all http contexts */
@@ -190,13 +183,13 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
      * of the all http modules
      */
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_HTTP_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
-        mi = ngx_modules[m]->ctx_index;
+        module = cf->cycle->modules[m]->ctx;
+        mi = cf->cycle->modules[m]->ctx_index;
 
         if (module->create_main_conf) {
             ctx->main_conf[mi] = module->create_main_conf(cf);
@@ -223,12 +216,12 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     pcf = *cf;
     cf->ctx = ctx;
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_HTTP_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cf->cycle->modules[m]->ctx;
 
         if (module->preconfiguration) {
             if (module->preconfiguration(cf) != NGX_OK) {
@@ -255,13 +248,13 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     cmcf = ctx->main_conf[ngx_http_core_module.ctx_index];
     cscfp = cmcf->servers.elts;
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_HTTP_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
-        mi = ngx_modules[m]->ctx_index;
+        module = cf->cycle->modules[m]->ctx;
+        mi = cf->cycle->modules[m]->ctx_index;
 
         /* init http{} main_conf's */
 
@@ -304,12 +297,12 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_HTTP_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cf->cycle->modules[m]->ctx;
 
         if (module->postconfiguration) {
             if (module->postconfiguration(cf) != NGX_OK) {
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 4b8dd4c..df7e8d4 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2968,12 +2968,12 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
         return NGX_CONF_ERROR;
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_HTTP_MODULE) {
+    for (i = 0; cf->cycle->modules[i]; i++) {
+        if (cf->cycle->modules[i]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[i]->ctx;
+        module = cf->cycle->modules[i]->ctx;
 
         if (module->create_srv_conf) {
             mconf = module->create_srv_conf(cf);
@@ -2981,7 +2981,7 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
                 return NGX_CONF_ERROR;
             }
 
-            ctx->srv_conf[ngx_modules[i]->ctx_index] = mconf;
+            ctx->srv_conf[cf->cycle->modules[i]->ctx_index] = mconf;
         }
 
         if (module->create_loc_conf) {
@@ -2990,7 +2990,7 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
                 return NGX_CONF_ERROR;
             }
 
-            ctx->loc_conf[ngx_modules[i]->ctx_index] = mconf;
+            ctx->loc_conf[cf->cycle->modules[i]->ctx_index] = mconf;
         }
     }
 
@@ -3086,17 +3086,17 @@ ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
         return NGX_CONF_ERROR;
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_HTTP_MODULE) {
+    for (i = 0; cf->cycle->modules[i]; i++) {
+        if (cf->cycle->modules[i]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[i]->ctx;
+        module = cf->cycle->modules[i]->ctx;
 
         if (module->create_loc_conf) {
-            ctx->loc_conf[ngx_modules[i]->ctx_index] =
+            ctx->loc_conf[cf->cycle->modules[i]->ctx_index] =
                                                    module->create_loc_conf(cf);
-            if (ctx->loc_conf[ngx_modules[i]->ctx_index] == NULL) {
+            if (ctx->loc_conf[cf->cycle->modules[i]->ctx_index] == NULL) {
                  return NGX_CONF_ERROR;
             }
         }
@@ -4607,12 +4607,12 @@ ngx_http_core_limit_except(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_HTTP_MODULE) {
+    for (i = 0; cf->cycle->modules[i]; i++) {
+        if (cf->cycle->modules[i]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[i]->ctx;
+        module = cf->cycle->modules[i]->ctx;
 
         if (module->create_loc_conf) {
 
@@ -4621,7 +4621,7 @@ ngx_http_core_limit_except(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                  return NGX_CONF_ERROR;
             }
 
-            ctx->loc_conf[ngx_modules[i]->ctx_index] = mconf;
+            ctx->loc_conf[cf->cycle->modules[i]->ctx_index] = mconf;
         }
     }
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 7f377b6..dbaa956 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -5331,12 +5331,12 @@ ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
         return NGX_CONF_ERROR;
     }
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_HTTP_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cf->cycle->modules[m]->ctx;
 
         if (module->create_srv_conf) {
             mconf = module->create_srv_conf(cf);
@@ -5344,7 +5344,7 @@ ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
                 return NGX_CONF_ERROR;
             }
 
-            ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf;
+            ctx->srv_conf[cf->cycle->modules[m]->ctx_index] = mconf;
         }
 
         if (module->create_loc_conf) {
@@ -5353,7 +5353,7 @@ ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
                 return NGX_CONF_ERROR;
             }
 
-            ctx->loc_conf[ngx_modules[m]->ctx_index] = mconf;
+            ctx->loc_conf[cf->cycle->modules[m]->ctx_index] = mconf;
         }
     }
 
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 869ce08..4e378c9 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -251,7 +251,7 @@ ngx_http_v2_init(ngx_event_t *rev)
         return;
     }
 
-    cln = ngx_pool_cleanup_add(c->pool, sizeof(ngx_pool_cleanup_file_t));
+    cln = ngx_pool_cleanup_add(c->pool, 0);
     if (cln == NULL) {
         ngx_http_close_connection(c);
         return;
@@ -1185,6 +1185,8 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
     }
 
+    stream->request->request_length = h2c->state.length;
+
     stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
     stream->node = node;
 
@@ -1731,11 +1733,21 @@ ngx_http_v2_handle_continuation(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end, ngx_http_v2_handler_pt handler)
 {
     u_char    *p;
-    size_t     len;
+    size_t     len, skip;
     uint32_t   head;
 
     len = h2c->state.length;
 
+    if (h2c->state.padding && (size_t) (end - pos) > len) {
+        skip = ngx_min(h2c->state.padding, (end - pos) - len);
+
+        h2c->state.padding -= skip;
+
+        p = pos;
+        pos += skip;
+        ngx_memmove(pos, p, len);
+    }
+
     if ((size_t) (end - pos) < len + NGX_HTTP_V2_FRAME_HEADER_SIZE) {
         return ngx_http_v2_state_save(h2c, pos, end, handler);
     }
@@ -1751,7 +1763,6 @@ ngx_http_v2_handle_continuation(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
     }
 
-    h2c->state.length += ngx_http_v2_parse_length(head);
     h2c->state.flags |= p[4];
 
     if (h2c->state.sid != ngx_http_v2_parse_sid(&p[5])) {
@@ -1766,6 +1777,14 @@ ngx_http_v2_handle_continuation(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     ngx_memcpy(pos, p, len);
 
+    len = ngx_http_v2_parse_length(head);
+
+    h2c->state.length += len;
+
+    if (h2c->state.stream) {
+        h2c->state.stream->request->request_length += len;
+    }
+
     h2c->state.handler = handler;
     return pos;
 }
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 4c63b21..0f03922 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -167,7 +167,6 @@ struct ngx_http_v2_stream_s {
     ngx_http_v2_connection_t        *connection;
     ngx_http_v2_node_t              *node;
 
-    ngx_uint_t                       header_buffers;
     ngx_uint_t                       queued;
 
     /*
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index ed30fe5..ea58979 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -215,8 +215,8 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     if (r->headers_out.server == NULL) {
-        len += 1 + clcf->server_tokens ? ngx_http_v2_literal_size(NGINX_VER)
-                                       : ngx_http_v2_literal_size("nginx");
+        len += 1 + (clcf->server_tokens ? ngx_http_v2_literal_size(NGINX_VER)
+                                        : ngx_http_v2_literal_size("nginx"));
     }
 
     if (r->headers_out.date == NULL) {
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c
index 962ae8b..6ad5a67 100644
--- a/src/mail/ngx_mail.c
+++ b/src/mail/ngx_mail.c
@@ -91,14 +91,7 @@ ngx_mail_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     /* count the number of the mail modules and set up their indices */
 
-    ngx_mail_max_module = 0;
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_MAIL_MODULE) {
-            continue;
-        }
-
-        ngx_modules[m]->ctx_index = ngx_mail_max_module++;
-    }
+    ngx_mail_max_module = ngx_count_modules(cf->cycle, NGX_MAIL_MODULE);
 
 
     /* the mail main_conf context, it is the same in the all mail contexts */
@@ -125,13 +118,13 @@ ngx_mail_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
      * create the main_conf's and the null srv_conf's of the all mail modules
      */
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_MAIL_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_MAIL_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
-        mi = ngx_modules[m]->ctx_index;
+        module = cf->cycle->modules[m]->ctx;
+        mi = cf->cycle->modules[m]->ctx_index;
 
         if (module->create_main_conf) {
             ctx->main_conf[mi] = module->create_main_conf(cf);
@@ -169,13 +162,13 @@ ngx_mail_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     cmcf = ctx->main_conf[ngx_mail_core_module.ctx_index];
     cscfp = cmcf->servers.elts;
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_MAIL_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_MAIL_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
-        mi = ngx_modules[m]->ctx_index;
+        module = cf->cycle->modules[m]->ctx;
+        mi = cf->cycle->modules[m]->ctx_index;
 
         /* init mail{} main_conf's */
 
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index c219296..8ea8ea9 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -237,12 +237,12 @@ ngx_mail_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_MAIL_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_MAIL_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cf->cycle->modules[m]->ctx;
 
         if (module->create_srv_conf) {
             mconf = module->create_srv_conf(cf);
@@ -250,7 +250,7 @@ ngx_mail_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 return NGX_CONF_ERROR;
             }
 
-            ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf;
+            ctx->srv_conf[cf->cycle->modules[m]->ctx_index] = mconf;
         }
     }
 
@@ -392,12 +392,12 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
 
     if (cscf->protocol == NULL) {
-        for (m = 0; ngx_modules[m]; m++) {
-            if (ngx_modules[m]->type != NGX_MAIL_MODULE) {
+        for (m = 0; cf->cycle->modules[m]; m++) {
+            if (cf->cycle->modules[m]->type != NGX_MAIL_MODULE) {
                 continue;
             }
 
-            module = ngx_modules[m]->ctx;
+            module = cf->cycle->modules[m]->ctx;
 
             if (module->protocol == NULL) {
                 continue;
@@ -595,12 +595,12 @@ ngx_mail_core_protocol(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     value = cf->args->elts;
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_MAIL_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_MAIL_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cf->cycle->modules[m]->ctx;
 
         if (module->protocol
             && ngx_strcmp(module->protocol->name.data, value[1].data) == 0)
diff --git a/src/os/unix/ngx_darwin_config.h b/src/os/unix/ngx_darwin_config.h
index bbad977..cfe3ce2 100644
--- a/src/os/unix/ngx_darwin_config.h
+++ b/src/os/unix/ngx_darwin_config.h
@@ -48,6 +48,8 @@
 #include <sys/sysctl.h>
 #include <xlocale.h>
 
+#include <dlfcn.h>
+
 
 #ifndef IOV_MAX
 #define IOV_MAX   64
diff --git a/src/os/unix/ngx_dlopen.c b/src/os/unix/ngx_dlopen.c
new file mode 100644
index 0000000..a0efc69
--- /dev/null
+++ b/src/os/unix/ngx_dlopen.c
@@ -0,0 +1,28 @@
+
+/*
+ * Copyright (C) Maxim Dounin
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#if (NGX_HAVE_DLOPEN)
+
+char *
+ngx_dlerror(void)
+{
+    char  *err;
+
+    err = (char *) dlerror();
+
+    if (err == NULL) {
+        return "";
+    }
+
+    return err;
+}
+
+#endif
diff --git a/src/os/unix/ngx_dlopen.h b/src/os/unix/ngx_dlopen.h
new file mode 100644
index 0000000..7a3159f
--- /dev/null
+++ b/src/os/unix/ngx_dlopen.h
@@ -0,0 +1,31 @@
+
+/*
+ * Copyright (C) Maxim Dounin
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_DLOPEN_H_INCLUDED_
+#define _NGX_DLOPEN_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define ngx_dlopen(path)           dlopen((char *) path, RTLD_NOW | RTLD_GLOBAL)
+#define ngx_dlopen_n               "dlopen()"
+
+#define ngx_dlsym(handle, symbol)  dlsym(handle, symbol)
+#define ngx_dlsym_n                "dlsym()"
+
+#define ngx_dlclose(handle)        dlclose(handle)
+#define ngx_dlclose_n              "dlclose()"
+
+
+#if (NGX_HAVE_DLOPEN)
+char *ngx_dlerror(void);
+#endif
+
+
+#endif /* _NGX_DLOPEN_H_INCLUDED_ */
diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h
index 9a25788..b7da48c 100644
--- a/src/os/unix/ngx_freebsd_config.h
+++ b/src/os/unix/ngx_freebsd_config.h
@@ -49,6 +49,8 @@
 #include <osreldate.h>
 #include <sys/sysctl.h>
 
+#include <dlfcn.h>
+
 
 #if __FreeBSD_version < 400017
 
diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
index 162a992..2f6129d 100644
--- a/src/os/unix/ngx_linux_config.h
+++ b/src/os/unix/ngx_linux_config.h
@@ -55,6 +55,8 @@
 #include <crypt.h>
 #include <sys/utsname.h>        /* uname() */
 
+#include <dlfcn.h>
+
 
 #include <ngx_auto_config.h>
 
diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h
index 443c4b0..bf75997 100644
--- a/src/os/unix/ngx_posix_config.h
+++ b/src/os/unix/ngx_posix_config.h
@@ -108,6 +108,11 @@
 #include <ngx_auto_config.h>
 
 
+#if (NGX_HAVE_DLOPEN)
+#include <dlfcn.h>
+#endif
+
+
 #if (NGX_HAVE_POSIX_SEM)
 #include <semaphore.h>
 #endif
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 5da0911..7c6bf7a 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -294,9 +294,9 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
         exit(2);
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->init_process) {
-            if (ngx_modules[i]->init_process(cycle) == NGX_ERROR) {
+    for (i = 0; cycle->modules[i]; i++) {
+        if (cycle->modules[i]->init_process) {
+            if (cycle->modules[i]->init_process(cycle) == NGX_ERROR) {
                 /* fatal */
                 exit(2);
             }
@@ -310,9 +310,9 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
 
         if (ngx_terminate || ngx_quit) {
 
-            for (i = 0; ngx_modules[i]; i++) {
-                if (ngx_modules[i]->exit_process) {
-                    ngx_modules[i]->exit_process(cycle);
+            for (i = 0; cycle->modules[i]; i++) {
+                if (cycle->modules[i]->exit_process) {
+                    cycle->modules[i]->exit_process(cycle);
                 }
             }
 
@@ -689,9 +689,9 @@ ngx_master_process_exit(ngx_cycle_t *cycle)
 
     ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exit");
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->exit_master) {
-            ngx_modules[i]->exit_master(cycle);
+    for (i = 0; cycle->modules[i]; i++) {
+        if (cycle->modules[i]->exit_master) {
+            cycle->modules[i]->exit_master(cycle);
         }
     }
 
@@ -895,9 +895,9 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
         ls[i].previous = NULL;
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->init_process) {
-            if (ngx_modules[i]->init_process(cycle) == NGX_ERROR) {
+    for (i = 0; cycle->modules[i]; i++) {
+        if (cycle->modules[i]->init_process) {
+            if (cycle->modules[i]->init_process(cycle) == NGX_ERROR) {
                 /* fatal */
                 exit(2);
             }
@@ -949,9 +949,9 @@ ngx_worker_process_exit(ngx_cycle_t *cycle)
     ngx_uint_t         i;
     ngx_connection_t  *c;
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->exit_process) {
-            ngx_modules[i]->exit_process(cycle);
+    for (i = 0; cycle->modules[i]; i++) {
+        if (cycle->modules[i]->exit_process) {
+            cycle->modules[i]->exit_process(cycle);
         }
     }
 
diff --git a/src/os/unix/ngx_solaris_config.h b/src/os/unix/ngx_solaris_config.h
index ddfd984..ffa01c8 100644
--- a/src/os/unix/ngx_solaris_config.h
+++ b/src/os/unix/ngx_solaris_config.h
@@ -55,6 +55,8 @@
 #include <inttypes.h>
 #include <crypt.h>
 
+#include <dlfcn.h>
+
 #define NGX_ALIGNMENT  _MAX_ALIGNMENT
 
 #include <ngx_auto_config.h>
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index f0aa532..caaf38a 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -91,14 +91,7 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     /* count the number of the stream modules and set up their indices */
 
-    ngx_stream_max_module = 0;
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_STREAM_MODULE) {
-            continue;
-        }
-
-        ngx_modules[m]->ctx_index = ngx_stream_max_module++;
-    }
+    ngx_stream_max_module = ngx_count_modules(cf->cycle, NGX_STREAM_MODULE);
 
 
     /* the stream main_conf context, it's the same in the all stream contexts */
@@ -126,13 +119,13 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
      * create the main_conf's and the null srv_conf's of the all stream modules
      */
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_STREAM_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_STREAM_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
-        mi = ngx_modules[m]->ctx_index;
+        module = cf->cycle->modules[m]->ctx;
+        mi = cf->cycle->modules[m]->ctx_index;
 
         if (module->create_main_conf) {
             ctx->main_conf[mi] = module->create_main_conf(cf);
@@ -170,13 +163,13 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     cmcf = ctx->main_conf[ngx_stream_core_module.ctx_index];
     cscfp = cmcf->servers.elts;
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_STREAM_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_STREAM_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
-        mi = ngx_modules[m]->ctx_index;
+        module = cf->cycle->modules[m]->ctx;
+        mi = cf->cycle->modules[m]->ctx_index;
 
         /* init stream{} main_conf's */
 
@@ -208,12 +201,12 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
     }
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_STREAM_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_STREAM_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cf->cycle->modules[m]->ctx;
 
         if (module->postconfiguration) {
             if (module->postconfiguration(cf) != NGX_OK) {
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index 4fe6818..0ecc448 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -199,12 +199,12 @@ ngx_stream_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_STREAM_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_STREAM_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cf->cycle->modules[m]->ctx;
 
         if (module->create_srv_conf) {
             mconf = module->create_srv_conf(cf);
@@ -212,7 +212,7 @@ ngx_stream_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 return NGX_CONF_ERROR;
             }
 
-            ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf;
+            ctx->srv_conf[cf->cycle->modules[m]->ctx_index] = mconf;
         }
     }
 
diff --git a/src/stream/ngx_stream_upstream.c b/src/stream/ngx_stream_upstream.c
index f21e17d..805ee70 100644
--- a/src/stream/ngx_stream_upstream.c
+++ b/src/stream/ngx_stream_upstream.c
@@ -116,12 +116,12 @@ ngx_stream_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
 
     uscf->srv_conf = ctx->srv_conf;
 
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_STREAM_MODULE) {
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_STREAM_MODULE) {
             continue;
         }
 
-        module = ngx_modules[m]->ctx;
+        module = cf->cycle->modules[m]->ctx;
 
         if (module->create_srv_conf) {
             mconf = module->create_srv_conf(cf);
@@ -129,7 +129,7 @@ ngx_stream_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
                 return NGX_CONF_ERROR;
             }
 
-            ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf;
+            ctx->srv_conf[cf->cycle->modules[m]->ctx_index] = mconf;
         }
     }
 

From 586dea93587b32afc4e69a8ac53295f54c9c778d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 11 Feb 2016 15:07:08 +0200
Subject: [PATCH 030/600] New upstream release (1.9.11)

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5b341ce..b176a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.9.11-1) UNRELEASED; urgency=medium
+
+  [ Christos Trochalakis ]
+  * New upstream release (1.9.11) (Closes: #812806)
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 11 Feb 2016 15:06:38 +0200
+
 nginx (1.9.10-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]

From 3c7520faddbf9caa0320a68676110b0fb1122762 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 12 Feb 2016 12:37:52 +0200
Subject: [PATCH 031/600] Update nginx-lua module to v0.10.1rc0-5-g01727a3

Fixes building issues with nginx 1.9.11.
---
 debian/changelog                              |   3 +
 debian/modules/README.Modules-versions        |   2 +-
 debian/modules/nginx-lua/README.markdown      | 171 +++++----
 debian/modules/nginx-lua/config               | 247 ++++++------
 .../modules/nginx-lua/doc/HttpLuaModule.wiki  | 163 ++++----
 .../nginx-lua/src/api/ngx_http_lua_api.h      |   2 +-
 .../nginx-lua/src/ngx_http_lua_accessby.c     |   9 +
 .../nginx-lua/src/ngx_http_lua_balancer.c     |  37 +-
 .../nginx-lua/src/ngx_http_lua_config.c       |   5 +-
 .../nginx-lua/src/ngx_http_lua_contentby.c    |   9 +
 .../nginx-lua/src/ngx_http_lua_headers.c      |   6 +
 .../nginx-lua/src/ngx_http_lua_initworkerby.c |  19 +-
 .../modules/nginx-lua/src/ngx_http_lua_log.c  |  16 +
 .../nginx-lua/src/ngx_http_lua_module.c       |  14 +-
 .../modules/nginx-lua/src/ngx_http_lua_ndk.c  |  13 +-
 .../nginx-lua/src/ngx_http_lua_output.c       |   1 +
 .../nginx-lua/src/ngx_http_lua_regex.c        |  36 +-
 .../nginx-lua/src/ngx_http_lua_req_body.c     |  14 +-
 .../nginx-lua/src/ngx_http_lua_rewriteby.c    |   9 +
 .../nginx-lua/src/ngx_http_lua_script.h       |   6 +-
 .../nginx-lua/src/ngx_http_lua_semaphore.c    |   2 +-
 .../nginx-lua/src/ngx_http_lua_shdict.c       |   4 +-
 .../nginx-lua/src/ngx_http_lua_socket_tcp.c   |   7 +-
 .../nginx-lua/src/ngx_http_lua_socket_udp.c   |   8 +-
 .../nginx-lua/src/ngx_http_lua_socket_udp.h   |  11 +-
 .../nginx-lua/src/ngx_http_lua_ssl_certby.c   |  25 +-
 .../modules/nginx-lua/src/ngx_http_lua_util.c |  11 +-
 debian/modules/nginx-lua/t/008-today.t        |   4 +-
 debian/modules/nginx-lua/t/009-log.t          | 107 +++++-
 debian/modules/nginx-lua/t/011-md5_bin.t      |   4 +-
 debian/modules/nginx-lua/t/013-base64.t       |   1 -
 debian/modules/nginx-lua/t/016-resp-header.t  |   5 -
 debian/modules/nginx-lua/t/034-match.t        |  31 +-
 debian/modules/nginx-lua/t/035-gmatch.t       |   8 +-
 debian/modules/nginx-lua/t/036-sub.t          |  25 +-
 debian/modules/nginx-lua/t/037-gsub.t         |  27 +-
 debian/modules/nginx-lua/t/038-match-o.t      |  10 +-
 debian/modules/nginx-lua/t/043-shdict.t       |  19 +
 debian/modules/nginx-lua/t/044-req-body.t     |  26 +-
 debian/modules/nginx-lua/t/048-match-dfa.t    |  39 +-
 debian/modules/nginx-lua/t/050-gmatch-dfa.t   |  50 +++
 debian/modules/nginx-lua/t/052-sub-dfa.t      |  37 +-
 debian/modules/nginx-lua/t/054-gsub-dfa.t     |  37 +-
 debian/modules/nginx-lua/t/058-tcp-socket.t   |   2 +-
 debian/modules/nginx-lua/t/059-unix-socket.t  |  67 ++++
 debian/modules/nginx-lua/t/062-count.t        |   4 +-
 debian/modules/nginx-lua/t/081-bytecode.t     |  57 +++
 debian/modules/nginx-lua/t/101-on-abort.t     |   1 +
 debian/modules/nginx-lua/t/106-timer.t        |   1 -
 debian/modules/nginx-lua/t/114-config.t       |  16 +
 .../modules/nginx-lua/t/116-raw-req-socket.t  |   1 -
 debian/modules/nginx-lua/t/138-balancer.t     | 103 +++++
 debian/modules/nginx-lua/t/140-ssl-c-api.t    | 363 ++++++++++++++++++
 debian/modules/nginx-lua/t/cert/test2.crt     |  16 +
 debian/modules/nginx-lua/t/cert/test2.key     |  15 +
 .../modules/nginx-lua/t/cert/test_ecdsa.crt   |  12 +
 .../modules/nginx-lua/t/cert/test_ecdsa.key   |   5 +
 .../nginx-lua/util/{build2.sh => build.sh}    |   0
 58 files changed, 1551 insertions(+), 392 deletions(-)
 create mode 100644 debian/modules/nginx-lua/t/140-ssl-c-api.t
 create mode 100644 debian/modules/nginx-lua/t/cert/test2.crt
 create mode 100644 debian/modules/nginx-lua/t/cert/test2.key
 create mode 100644 debian/modules/nginx-lua/t/cert/test_ecdsa.crt
 create mode 100644 debian/modules/nginx-lua/t/cert/test_ecdsa.key
 rename debian/modules/nginx-lua/util/{build2.sh => build.sh} (100%)

diff --git a/debian/changelog b/debian/changelog
index b176a32..0f8009f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ nginx (1.9.11-1) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis ]
   * New upstream release (1.9.11) (Closes: #812806)
+  * debian/modules/nginx-lua:
+    + Update nginx-lua to v0.10.1rc0-5-g01727a3.
+      Fixes buiding failures with nginx 1.9.11.
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 11 Feb 2016 15:06:38 +0200
 
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index eb35054..dbff74d 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -22,7 +22,7 @@ README for Modules versions
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
-  Version: v0.10.0
+  Version: v0.10.1rc0-5-g01727a3
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/nginx-lua/README.markdown
index 64adc0e..94e67ad 100644
--- a/debian/modules/nginx-lua/README.markdown
+++ b/debian/modules/nginx-lua/README.markdown
@@ -61,7 +61,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.0](https://github.com/openresty/lua-nginx-module/tags) released on 11 January 2015.
+This document describes ngx_lua [v0.10.0](https://github.com/openresty/lua-nginx-module/tags) released on 11 January 2016.
 
 Synopsis
 ========
@@ -216,6 +216,10 @@ The Lua interpreter or LuaJIT instance is shared across all the requests in a si
 
 Loaded Lua modules persist in the nginx worker process level resulting in a small memory footprint in Lua even when under heavy loads.
 
+This module is plugged into NGINX's "http" subsystem so it can only speaks downstream communication protocols in the HTTP family (HTTP 0.9/1.0/1.1/2.0, WebSockets, and etc).
+If you want to do generic TCP communications with the downstream clients, then you should use the [ngx_stream_lua](https://github.com/openresty/stream-lua-nginx-module#readme) module instead
+which has a compatible Lua API.
+
 [Back to TOC](#table-of-contents)
 
 Typical Uses
@@ -256,7 +260,7 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 Installation
 ============
 
-It is highly recommended to use the [ngx_openresty bundle](http://openresty.org) that bundles Nginx, ngx_lua,  LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: `./configure --with-luajit && make && make install`.
+It is highly recommended to use the [OpenResty bundle](http://openresty.org) that bundles Nginx, ngx_lua,  LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: `./configure --with-luajit && make && make install`.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
@@ -295,6 +299,14 @@ Build the source with this module:
  make install
 ```
 
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ngx_http_lua_module.so;
+```
+
 [Back to TOC](#table-of-contents)
 
 C Macro Configurations
@@ -591,7 +603,7 @@ If server-wide data sharing is required, then use one or more of the following a
 
 1. Use the [ngx.shared.DICT](#ngxshareddict) 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.
+1. Use data storage mechanisms such as `memcached`, `redis`, `MySQL` or `PostgreSQL`. [The 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.
 
 [Back to TOC](#table-of-contents)
 
@@ -861,7 +873,6 @@ TODO
 * cosocket: pool-based backend concurrency level control: implement automatic `connect` queueing when the backend concurrency exceeds its connection pool limit.
 * cosocket: review and merge aviramc's [patch](https://github.com/openresty/lua-nginx-module/pull/290) for adding the `bsdrecv` method.
 * add new API function `ngx.resp.add_header` to emulate the standard `add_header` config directive.
-* [ngx.re](#ngxrematch) API: use `false` instead of `nil` in the resulting match table to indicate non-existent submatch captures, such that we can avoid "holes" in the array table.
 * review and apply Jader H. Silva's patch for `ngx.re.split()`.
 * review and apply vadim-pavlov's patch for [ngx.location.capture](#ngxlocationcapture)'s `extra_headers` option
 * use `ngx_hash_t` to optimize the built-in header look-up process for [ngx.req.set_header](#ngxreqset_header), [ngx.header.HEADER](#ngxheaderheader), and etc.
@@ -876,7 +887,7 @@ TODO
 Changes
 =======
 
-The changes of every release of this module can be obtained from the ngx_openresty bundle's change logs:
+The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
 
 <http://openresty.org/#Changes>
 
@@ -945,9 +956,9 @@ Copyright and License
 
 This module is licensed under the BSD license.
 
-Copyright (C) 2009-2015, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
+Copyright (C) 2009-2016, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2015, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright (C) 2009-2016, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
 
 All rights reserved.
 
@@ -964,6 +975,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 See Also
 ========
 
+* [ngx_stream_lua_module](https://github.com/openresty/stream-lua-nginx-module#readme) for an official port of this module for the NGINX "stream" subsystem (doing generic downstream TCP communications).
 * [lua-resty-memcached](https://github.com/openresty/lua-resty-memcached) library based on ngx_lua cosocket.
 * [lua-resty-redis](https://github.com/openresty/lua-resty-redis) library based on ngx_lua cosocket.
 * [lua-resty-mysql](https://github.com/openresty/lua-resty-mysql) library based on ngx_lua cosocket.
@@ -982,7 +994,7 @@ See Also
 * [drizzle-nginx-module](http://github.com/openresty/drizzle-nginx-module)
 * [postgres-nginx-module](https://github.com/FRiCKLE/ngx_postgres)
 * [memc-nginx-module](http://github.com/openresty/memc-nginx-module)
-* [The ngx_openresty bundle](http://openresty.org)
+* [The OpenResty bundle](http://openresty.org)
 * [Nginx Systemtap Toolkit](https://github.com/openresty/nginx-systemtap-toolkit)
 
 [Back to TOC](#table-of-contents)
@@ -2116,7 +2128,7 @@ log_by_lua
 **WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
 use the new [log_by_lua_block](#log_by_lua_block) directive instead.
 
-Runs 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.
+Runs 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 before.
 
 Note that the following API functions are currently disabled within this context:
 
@@ -2915,6 +2927,7 @@ Nginx API for Lua
 * [udpsock:receive](#udpsockreceive)
 * [udpsock:close](#udpsockclose)
 * [udpsock:settimeout](#udpsocksettimeout)
+* [ngx.socket.stream](#ngxsocketstream)
 * [ngx.socket.tcp](#ngxsockettcp)
 * [tcpsock:connect](#tcpsockconnect)
 * [tcpsock:sslhandshake](#tcpsocksslhandshake)
@@ -2935,6 +2948,7 @@ Nginx API for Lua
 * [ngx.timer.at](#ngxtimerat)
 * [ngx.timer.running_count](#ngxtimerrunning_count)
 * [ngx.timer.pending_count](#ngxtimerpending_count)
+* [ngx.config.subsystem](#ngxconfigsubsystem)
 * [ngx.config.debug](#ngxconfigdebug)
 * [ngx.config.prefix](#ngxconfigprefix)
 * [ngx.config.nginx_version](#ngxconfignginx_version)
@@ -3094,7 +3108,7 @@ This API requires a relatively expensive metamethod call and it is recommended t
 
 Core constants
 --------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, &#42;log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, &#42;log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 ```lua
 
@@ -3120,7 +3134,7 @@ The `ngx.DECLINED` constant was first introduced in the `v0.5.0rc19` release.
 
 HTTP method constants
 ---------------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 
       ngx.HTTP_GET
@@ -3146,7 +3160,7 @@ These constants are usually used in [ngx.location.capture](#ngxlocationcapture)
 
 HTTP status constants
 ---------------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 ```nginx
 
@@ -3190,7 +3204,7 @@ HTTP status constants
 
 Nginx log level constants
 -------------------------
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 ```lua
 
@@ -3932,7 +3946,7 @@ ngx.req.http_version
 
 Returns the HTTP version number for the current request as a Lua number.
 
-Current possible values are 1.0, 1.1, and 0.9. Returns `nil` for unrecognized values.
+Current possible values are 2.0, 1.0, 1.1, and 0.9. Returns `nil` for unrecognized values.
 
 This method was first introduced in the `v0.7.17` release.
 
@@ -4522,7 +4536,7 @@ ngx.req.discard_body
 
 **context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
-Explicitly discard the request body, i.e., read the data on the connection and throw it away immediately. Please note that ignoring request body is not the right way to discard it, and that this function must be called to avoid breaking things under HTTP 1.1 keepalive or HTTP 1.1 pipelining.
+Explicitly discard the request body, i.e., read the data on the connection and throw it away immediately (without using the request body by any means).
 
 This function is an asynchronous call and returns immediately.
 
@@ -4538,7 +4552,7 @@ ngx.req.get_body_data
 ---------------------
 **syntax:** *data = ngx.req.get_body_data()*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, log_by_lua&#42;*
 
 Retrieves in-memory request body data. It returns a Lua string rather than a Lua table holding all the parsed query arguments. Use the [ngx.req.get_post_args](#ngxreqget_post_args) function instead if a Lua table is required.
 
@@ -5085,7 +5099,7 @@ ngx.escape_uri
 --------------
 **syntax:** *newstr = ngx.escape_uri(str)*
 
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Escape `str` as a URI component.
 
@@ -5095,7 +5109,7 @@ ngx.unescape_uri
 ----------------
 **syntax:** *newstr = ngx.unescape_uri(str)*
 
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Unescape `str` as an escaped URI component.
 
@@ -5118,7 +5132,7 @@ ngx.encode_args
 ---------------
 **syntax:** *str = ngx.encode_args(table)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Encode the Lua table to a query args string according to the URI encoded rules.
 
@@ -5175,7 +5189,7 @@ ngx.decode_args
 ---------------
 **syntax:** *table = ngx.decode_args(str, max_args?)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Decodes a URI encoded query-string into a Lua table. This is the inverse function of [ngx.encode_args](#ngxencode_args).
 
@@ -5198,11 +5212,11 @@ ngx.encode_base64
 -----------------
 **syntax:** *newstr = ngx.encode_base64(str, no_padding?)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Encodes `str` to a base64 digest.
 
-Since the `0.9.16` release, an optional boolean-typed `no_padding` argument can be specified to control whether the base64 padding should be appended to the resulting digest (default to `false`, i.e., with padding enabled). This enables streaming base64 digest calculation by (data chunks) though it would be the caller's responsibility to append an appropriate padding at the end of data stream.
+Since the `0.9.16` release, an optional boolean-typed `no_padding` argument can be specified to control whether the base64 padding should be appended to the resulting digest (default to `false`, i.e., with padding enabled).
 
 [Back to TOC](#nginx-api-for-lua)
 
@@ -5210,7 +5224,7 @@ ngx.decode_base64
 -----------------
 **syntax:** *newstr = ngx.decode_base64(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Decodes the `str` argument as a base64 digest to the raw form. Returns `nil` if `str` is not well formed.
 
@@ -5220,7 +5234,7 @@ ngx.crc32_short
 ---------------
 **syntax:** *intval = ngx.crc32_short(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
 
@@ -5236,7 +5250,7 @@ ngx.crc32_long
 --------------
 **syntax:** *intval = ngx.crc32_long(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
 
@@ -5252,7 +5266,7 @@ ngx.hmac_sha1
 -------------
 **syntax:** *digest = ngx.hmac_sha1(secret_key, str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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>`.
 
@@ -5284,7 +5298,7 @@ ngx.md5
 -------
 **syntax:** *digest = ngx.md5(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Returns the hexadecimal representation of the MD5 digest of the `str` argument.
 
@@ -5311,7 +5325,7 @@ ngx.md5_bin
 -----------
 **syntax:** *digest = ngx.md5_bin(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Returns the binary form of the MD5 digest of the `str` argument.
 
@@ -5323,7 +5337,7 @@ ngx.sha1_bin
 ------------
 **syntax:** *digest = ngx.sha1_bin(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Returns the binary form of the SHA-1 digest of the `str` argument.
 
@@ -5337,7 +5351,7 @@ ngx.quote_sql_str
 -----------------
 **syntax:** *quoted_value = ngx.quote_sql_str(raw_value)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Returns a quoted SQL string literal according to the MySQL quoting rules.
 
@@ -5347,7 +5361,7 @@ ngx.today
 ---------
 **syntax:** *str = ngx.today()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Returns current date (in the format `yyyy-mm-dd`) from the nginx cached time (no syscall involved unlike Lua's date library).
 
@@ -5359,7 +5373,7 @@ ngx.time
 --------
 **syntax:** *secs = ngx.time()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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).
 
@@ -5371,7 +5385,7 @@ ngx.now
 -------
 **syntax:** *secs = ngx.now()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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).
 
@@ -5385,7 +5399,7 @@ ngx.update_time
 ---------------
 **syntax:** *ngx.update_time()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Forcibly updates the Nginx current time cache. This call involves a syscall and thus has some overhead, so do not abuse it.
 
@@ -5397,7 +5411,7 @@ ngx.localtime
 -------------
 **syntax:** *str = ngx.localtime()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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).
 
@@ -5409,7 +5423,7 @@ ngx.utctime
 -----------
 **syntax:** *str = ngx.utctime()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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).
 
@@ -5421,7 +5435,7 @@ ngx.cookie_time
 ---------------
 **syntax:** *str = ngx.cookie_time(sec)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Returns a formatted string can be used as the cookie expiration time. The parameter `sec` is the time stamp in seconds (like those returned from [ngx.time](#ngxtime)).
 
@@ -5437,7 +5451,7 @@ ngx.http_time
 -------------
 **syntax:** *str = ngx.http_time(sec)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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](#ngxtime)).
 
@@ -5453,7 +5467,7 @@ ngx.parse_http_time
 -------------------
 **syntax:** *sec = ngx.parse_http_time(str)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Parse the http time string (as returned by [ngx.http_time](#ngxhttp_time)) into seconds. Returns the seconds or `nil` if the input string is in bad forms.
 
@@ -5481,7 +5495,7 @@ ngx.re.match
 ------------
 **syntax:** *captures, err = ngx.re.match(subject, regex, options?, ctx?, res_table?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Matches the `subject` string using the Perl compatible regular expression `regex` with the optional `options`.
 
@@ -5524,16 +5538,16 @@ and are returned in the same Lua table as key-value pairs as the numbered captur
  -- m["remaining"] == "234"
 ```
 
-Unmatched subpatterns will have `nil` values in their `captures` table fields.
+Unmatched subpatterns will have `false` values in their `captures` table fields.
 
 ```lua
 
  local m, err = ngx.re.match("hello, world", "(world)|(hello)|(?<named>howdy)")
  -- m[0] == "hello"
- -- m[1] == nil
+ -- m[1] == false
  -- m[2] == "hello"
- -- m[3] == nil
- -- m["named"] == nil
+ -- m[3] == false
+ -- m["named"] == false
 ```
 
 Specify `options` to control how the match operation will be performed. The following option characters are supported:
@@ -5623,7 +5637,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 Escaping Sequences](#special-escaping-sequences)).
 
-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:
+To confirm that PCRE JIT is enabled, activate the Nginx debug log by adding the `--with-debug` option to Nginx or 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
@@ -5639,7 +5653,7 @@ ngx.re.find
 -----------
 **syntax:** *from, to, err = ngx.re.find(subject, regex, options?, ctx?, nth?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Similar to [ngx.re.match](#ngxrematch) but only returns the begining index (`from`) and end index (`to`) of the matched substring. The returned indexes are 1-based and can be fed directly into the [string.sub](http://www.lua.org/manual/5.1/manual.html#pdf-string.sub) API function to obtain the matched substring.
 
@@ -5693,7 +5707,7 @@ ngx.re.gmatch
 -------------
 **syntax:** *iterator, err = ngx.re.gmatch(subject, regex, options?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Similar to [ngx.re.match](#ngxrematch), 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`.
 
@@ -5771,7 +5785,7 @@ ngx.re.sub
 ----------
 **syntax:** *newstr, n, err = ngx.re.sub(subject, regex, replace, options?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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](#ngxrematch).
 
@@ -5837,7 +5851,7 @@ ngx.re.gsub
 -----------
 **syntax:** *newstr, n, err = ngx.re.gsub(subject, regex, replace, options?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Just like [ngx.re.sub](#ngxresub), but does global substitution.
 
@@ -5877,7 +5891,7 @@ ngx.shared.DICT
 
 **syntax:** *dict = ngx.shared\[name_var\]*
 
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Fetching the shm-based Lua dictionary object for the shared memory zone named `DICT` defined by the [lua_shared_dict](#lua_shared_dict) directive.
 
@@ -5950,7 +5964,7 @@ ngx.shared.DICT.get
 -------------------
 **syntax:** *value, flags = ngx.shared.DICT:get(key)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Retrieving the value in the dictionary [ngx.shared.DICT](#ngxshareddict) for the key `key`. If the key does not exist or has been expired, then `nil` will be returned.
 
@@ -5988,7 +6002,7 @@ ngx.shared.DICT.get_stale
 -------------------------
 **syntax:** *value, flags, stale = ngx.shared.DICT:get_stale(key)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Similar to the [get](#ngxshareddictget) method but returns the value even if the key has already expired.
 
@@ -6006,7 +6020,7 @@ ngx.shared.DICT.set
 -------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:set(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Unconditionally sets a key-value pair into the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns three values:
 
@@ -6054,7 +6068,7 @@ ngx.shared.DICT.safe_set
 ------------------------
 **syntax:** *ok, err = ngx.shared.DICT:safe_set(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Similar to the [set](#ngxshareddictset) method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
 
@@ -6068,7 +6082,7 @@ ngx.shared.DICT.add
 -------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:add(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Just like the [set](#ngxshareddictset) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](#ngxshareddict) if the key does *not* exist.
 
@@ -6084,7 +6098,7 @@ ngx.shared.DICT.safe_add
 ------------------------
 **syntax:** *ok, err = ngx.shared.DICT:safe_add(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Similar to the [add](#ngxshareddictadd) method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
 
@@ -6098,7 +6112,7 @@ ngx.shared.DICT.replace
 -----------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:replace(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Just like the [set](#ngxshareddictset) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](#ngxshareddict) if the key *does* exist.
 
@@ -6114,7 +6128,7 @@ ngx.shared.DICT.delete
 ----------------------
 **syntax:** *ngx.shared.DICT:delete(key)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Unconditionally removes the key-value pair from the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
 
@@ -6130,7 +6144,7 @@ ngx.shared.DICT.incr
 --------------------
 **syntax:** *newval, err = ngx.shared.DICT:incr(key, value)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Increments the (numerical) value for `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict) by the step value `value`. Returns the new resulting number if the operation is successfully completed or `nil` and an error message otherwise.
 
@@ -6150,7 +6164,7 @@ ngx.shared.DICT.flush_all
 -------------------------
 **syntax:** *ngx.shared.DICT:flush_all()*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Flushes out all the items in the dictionary. This method does not actuall free up all the memory blocks in the dictionary but just marks all the existing items as expired.
 
@@ -6164,7 +6178,7 @@ ngx.shared.DICT.flush_expired
 -----------------------------
 **syntax:** *flushed = ngx.shared.DICT:flush_expired(max_count?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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.
 
@@ -6180,7 +6194,7 @@ ngx.shared.DICT.get_keys
 ------------------------
 **syntax:** *keys = ngx.shared.DICT:get_keys(max_count?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Fetch a list of the keys from the dictionary, up to `<max_count>`.
 
@@ -6314,7 +6328,7 @@ Timeout for the reading operation is controlled by the [lua_socket_read_timeout]
  sock:settimeout(1000)  -- one second timeout
  local data, err = sock:receive()
  if not data then
-     ngx.say("failed to read a packet: ", data)
+     ngx.say("failed to read a packet: ", err)
      return
  end
  ngx.say("successfully read a packet: ", data)
@@ -6354,6 +6368,16 @@ This feature was first introduced in the `v0.5.7` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+ngx.socket.stream
+-----------------
+
+Just an alias to [ngx.socket.tcp](#ngxsockettcp). If the stream-typed cosocket may also connect to a unix domain
+socket, then this API name is preferred.
+
+This API function was first added to the `v0.10.1` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
 ngx.socket.tcp
 --------------
 **syntax:** *tcpsock = ngx.socket.tcp()*
@@ -7141,7 +7165,7 @@ ngx.timer.at
 ------------
 **syntax:** *ok, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Creates an Nginx timer with a user callback function as well as optional user arguments.
 
@@ -7267,7 +7291,7 @@ ngx.timer.running_count
 -----------------------
 **syntax:** *count = ngx.timer.running_count()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Returns the number of timers currently running.
 
@@ -7279,7 +7303,7 @@ ngx.timer.pending_count
 -----------------------
 **syntax:** *count = ngx.timer.pending_count()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 Returns the number of pending timers.
 
@@ -7287,6 +7311,19 @@ This directive was first introduced in the `v0.9.20` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+ngx.config.subsystem
+--------------------
+**syntax:** *subsystem = ngx.config.subsystem*
+
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
+
+This string field indicates the current NGINX subsystem the current Lua environment is based on. For this module, this field always takes the string value `"http"`. For
+[ngx_stream_lua_module](https://github.com/openresty/stream-lua-nginx-module#readme), however, this field takes the value `"stream"`.
+
+This field was first introduced in the `0.10.1`.
+
+[Back to TOC](#nginx-api-for-lua)
+
 ngx.config.debug
 ----------------
 **syntax:** *debug = ngx.config.debug*
@@ -7497,7 +7534,7 @@ ndk.set_var.DIRECTIVE
 ---------------------
 **syntax:** *res = ndk.set_var.DIRECTIVE_NAME*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
 
 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`.
 
diff --git a/debian/modules/nginx-lua/config b/debian/modules/nginx-lua/config
index 030788c..3c2548b 100644
--- a/debian/modules/nginx-lua/config
+++ b/debian/modules/nginx-lua/config
@@ -284,14 +284,17 @@ END
     fi
 fi
 
+ngx_module_incs=
+ngx_module_libs=
+
 if [ $ngx_found = yes ]; then
     # this is a hack to persuade nginx's build system to favor
     # the paths set by our user environments:
     CFLAGS="$ngx_lua_opt_I $CFLAGS"
     NGX_LD_OPT="$ngx_lua_opt_L $NGX_LD_OPT"
 
-    CORE_INCS="$CORE_INCS $ngx_feature_path"
-    CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+    ngx_module_incs="$ngx_module_incs $ngx_feature_path"
+    ngx_module_libs="$ngx_module_libs $ngx_feature_libs"
 else
  cat << END
  $0: error: ngx_http_lua_module requires the Lua library.
@@ -300,119 +303,118 @@ END
 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_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_semaphore.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_initworkerby.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_dir/src/ngx_http_lua_timer.c \
-                $ngx_addon_dir/src/ngx_http_lua_config.c \
-                $ngx_addon_dir/src/ngx_http_lua_worker.c \
-                $ngx_addon_dir/src/ngx_http_lua_ssl_certby.c \
-                $ngx_addon_dir/src/ngx_http_lua_ssl_ocsp.c \
-                $ngx_addon_dir/src/ngx_http_lua_lex.c \
-                $ngx_addon_dir/src/ngx_http_lua_balancer.c \
-                "
+HTTP_LUA_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_semaphore.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_initworkerby.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_dir/src/ngx_http_lua_timer.c \
+            $ngx_addon_dir/src/ngx_http_lua_config.c \
+            $ngx_addon_dir/src/ngx_http_lua_worker.c \
+            $ngx_addon_dir/src/ngx_http_lua_ssl_certby.c \
+            $ngx_addon_dir/src/ngx_http_lua_ssl_ocsp.c \
+            $ngx_addon_dir/src/ngx_http_lua_lex.c \
+            $ngx_addon_dir/src/ngx_http_lua_balancer.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_semaphore.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_initworkerby.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 \
-                $ngx_addon_dir/src/ngx_http_lua_timer.h \
-                $ngx_addon_dir/src/ngx_http_lua_config.h \
-                $ngx_addon_dir/src/ngx_http_lua_worker.h \
-                $ngx_addon_dir/src/ngx_http_lua_ssl_certby.h \
-                $ngx_addon_dir/src/ngx_http_lua_lex.h \
-                $ngx_addon_dir/src/ngx_http_lua_balancer.h \
-                "
+HTTP_LUA_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_semaphore.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_initworkerby.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 \
+            $ngx_addon_dir/src/ngx_http_lua_timer.h \
+            $ngx_addon_dir/src/ngx_http_lua_config.h \
+            $ngx_addon_dir/src/ngx_http_lua_worker.h \
+            $ngx_addon_dir/src/ngx_http_lua_ssl_certby.h \
+            $ngx_addon_dir/src/ngx_http_lua_lex.h \
+            $ngx_addon_dir/src/ngx_http_lua_balancer.h \
+            "
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
 
@@ -464,6 +466,21 @@ ngx_feature_test='setsockopt(1, SOL_SOCKET, SO_PASSCRED, NULL, 0);'
 
 . auto/feature
 
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP_AUX_FILTER
+    ngx_module_name=$ngx_addon_name
+    ngx_module_deps="$HTTP_LUA_DEPS"
+    ngx_module_srcs="$HTTP_LUA_SRCS"
+
+    . auto/module
+else
+    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $HTTP_LUA_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $HTTP_LUA_DEPS"
+
+    CORE_INCS="$CORE_INCS $ngx_module_incs"
+    CORE_LIBS="$CORE_LIBS $ngx_module_libs"
+fi
+
 #CFLAGS=$"$CFLAGS -DLUA_DEFAULT_PATH='\"/usr/local/openresty/lualib/?.lua\"'"
 #CFLAGS=$"$CFLAGS -DLUA_DEFAULT_CPATH='\"/usr/local/openresty/lualib/?.so\"'"
-
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
index f3bf06e..3a39ef8 100644
--- a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.0] released on 11 January 2015.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.0] released on 11 January 2016.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -160,6 +160,10 @@ The Lua interpreter or LuaJIT instance is shared across all the requests in a si
 
 Loaded Lua modules persist in the nginx worker process level resulting in a small memory footprint in Lua even when under heavy loads.
 
+This module is plugged into NGINX's "http" subsystem so it can only speaks downstream communication protocols in the HTTP family (HTTP 0.9/1.0/1.1/2.0, WebSockets, and etc).
+If you want to do generic TCP communications with the downstream clients, then you should use the [https://github.com/openresty/stream-lua-nginx-module#readme ngx_stream_lua] module instead
+which has a compatible Lua API.
+
 = Typical Uses =
 
 Just to name a few:
@@ -191,7 +195,7 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 
 = Installation =
 
-It is highly recommended to use the [http://openresty.org ngx_openresty bundle] that bundles Nginx, ngx_lua,  LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: <code>./configure --with-luajit && make && make install</code>.
+It is highly recommended to use the [http://openresty.org OpenResty bundle] that bundles Nginx, ngx_lua,  LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: <code>./configure --with-luajit && make && make install</code>.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
@@ -229,6 +233,14 @@ Build the source with this module:
     make install
 </geshi>
 
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ngx_http_lua_module.so;
+```
+
 == C Macro Configurations ==
 
 While building this module either via OpenResty or with the NGINX core, you can define the following C macros via the C compiler options:
@@ -473,7 +485,7 @@ If server-wide data sharing is required, then use one or more of the following a
 
 # 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.
+# Use data storage mechanisms such as <code>memcached</code>, <code>redis</code>, <code>MySQL</code> or <code>PostgreSQL</code>. [http://openresty.org The 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 =
 
@@ -698,7 +710,6 @@ phases.
 * cosocket: pool-based backend concurrency level control: implement automatic <code>connect</code> queueing when the backend concurrency exceeds its connection pool limit.
 * cosocket: review and merge aviramc's [https://github.com/openresty/lua-nginx-module/pull/290 patch] for adding the <code>bsdrecv</code> method.
 * add new API function <code>ngx.resp.add_header</code> to emulate the standard <code>add_header</code> config directive.
-* [[#ngx.re.match|ngx.re]] API: use <code>false</code> instead of <code>nil</code> in the resulting match table to indicate non-existent submatch captures, such that we can avoid "holes" in the array table.
 * 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.
@@ -710,7 +721,7 @@ phases.
 
 = Changes =
 
-The changes of every release of this module can be obtained from the ngx_openresty bundle's change logs:
+The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
 
 http://openresty.org/#Changes
 
@@ -773,9 +784,9 @@ There are also various testing modes based on mockeagain, valgrind, and etc. Ref
 
 This module is licensed under the BSD license.
 
-Copyright (C) 2009-2015, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
+Copyright (C) 2009-2016, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2015, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright (C) 2009-2016, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
 
 All rights reserved.
 
@@ -789,6 +800,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 = See Also =
 
+* [https://github.com/openresty/stream-lua-nginx-module#readme ngx_stream_lua_module] for an official port of this module for the NGINX "stream" subsystem (doing generic downstream TCP communications).
 * [https://github.com/openresty/lua-resty-memcached lua-resty-memcached] library based on ngx_lua cosocket.
 * [https://github.com/openresty/lua-resty-redis lua-resty-redis] library based on ngx_lua cosocket.
 * [https://github.com/openresty/lua-resty-mysql lua-resty-mysql] library based on ngx_lua cosocket.
@@ -807,7 +819,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * [[HttpDrizzleModule]]
 * [https://github.com/FRiCKLE/ngx_postgres postgres-nginx-module]
 * [[HttpMemcModule]]
-* [http://openresty.org The ngx_openresty bundle]
+* [http://openresty.org The OpenResty bundle]
 * [https://github.com/openresty/nginx-systemtap-toolkit Nginx Systemtap Toolkit]
 
 = Directives =
@@ -1758,7 +1770,7 @@ This directive was first introduced in the <code>v0.5.0rc32</code> release.
 '''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
 use the new [[#log_by_lua_block|log_by_lua_block]] directive instead.
 
-Runs 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.
+Runs 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 before.
 
 Note that the following API functions are currently disabled within this context:
 
@@ -2488,7 +2500,7 @@ Undefined NGINX variables are evaluated to `nil` while uninitialized (but define
 This API requires a relatively expensive metamethod call and it is recommended to avoid using it on hot code paths.
 
 == Core constants ==
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 <geshi lang="lua">
   ngx.OK (0)
@@ -2509,7 +2521,7 @@ The <code>ngx.null</code> constant is a <code>NULL</code> light userdata usually
 The <code>ngx.DECLINED</code> constant was first introduced in the <code>v0.5.0rc19</code> release.
 
 == HTTP method constants ==
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 <geshi lang="text">
   ngx.HTTP_GET
@@ -2532,7 +2544,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:''' ''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 <geshi lang="nginx">
   value = ngx.HTTP_CONTINUE (100) (first added in the v0.9.20 release)
@@ -2572,7 +2584,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*, body_filter_by_lua, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 <geshi lang="lua">
   ngx.STDERR
@@ -3246,7 +3258,7 @@ See also [[#ngx.now|ngx.now]] and [[#ngx.update_time|ngx.update_time]].
 
 Returns the HTTP version number for the current request as a Lua number.
 
-Current possible values are 1.0, 1.1, and 0.9. Returns <code>nil</code> for unrecognized values.
+Current possible values are 2.0, 1.0, 1.1, and 0.9. Returns <code>nil</code> for unrecognized values.
 
 This method was first introduced in the <code>v0.7.17</code> release.
 
@@ -3754,7 +3766,7 @@ This function was first introduced in the <code>v0.3.1rc17</code> release.
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
-Explicitly discard the request body, i.e., read the data on the connection and throw it away immediately. Please note that ignoring request body is not the right way to discard it, and that this function must be called to avoid breaking things under HTTP 1.1 keepalive or HTTP 1.1 pipelining.
+Explicitly discard the request body, i.e., read the data on the connection and throw it away immediately (without using the request body by any means).
 
 This function is an asynchronous call and returns immediately.
 
@@ -3767,7 +3779,7 @@ See also [[#ngx.req.read_body|ngx.req.read_body]].
 == ngx.req.get_body_data ==
 '''syntax:''' ''data = ngx.req.get_body_data()''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, log_by_lua*''
 
 Retrieves in-memory request body data. It returns a Lua string rather than a Lua table holding all the parsed query arguments. Use the [[#ngx.req.get_post_args|ngx.req.get_post_args]] function instead if a Lua table is required.
 
@@ -4236,14 +4248,14 @@ This method was introduced in the <code>0.5.0rc30</code> release.
 == ngx.escape_uri ==
 '''syntax:''' ''newstr = ngx.escape_uri(str)''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Escape <code>str</code> as a URI component.
 
 == ngx.unescape_uri ==
 '''syntax:''' ''newstr = ngx.unescape_uri(str)''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Unescape <code>str</code> as an escaped URI component.
 
@@ -4262,7 +4274,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Encode the Lua table to a query args string according to the URI encoded rules.
 
@@ -4313,7 +4325,7 @@ 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Decodes a URI encoded query-string into a Lua table. This is the inverse function of [[#ngx.encode_args|ngx.encode_args]].
 
@@ -4332,23 +4344,23 @@ This method was introduced in the <code>v0.5.0rc29</code>.
 == ngx.encode_base64 ==
 '''syntax:''' ''newstr = ngx.encode_base64(str, no_padding?)''
 
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Encodes <code>str</code> to a base64 digest.
 
-Since the <code>0.9.16</code> release, an optional boolean-typed <code>no_padding</code> argument can be specified to control whether the base64 padding should be appended to the resulting digest (default to <code>false</code>, i.e., with padding enabled). This enables streaming base64 digest calculation by (data chunks) though it would be the caller's responsibility to append an appropriate padding at the end of data stream.
+Since the <code>0.9.16</code> release, an optional boolean-typed <code>no_padding</code> argument can be specified to control whether the base64 padding should be appended to the resulting digest (default to <code>false</code>, i.e., with padding enabled).
 
 == 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the <code>str</code> argument.
 
@@ -4361,7 +4373,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the <code>str</code> argument.
 
@@ -4374,7 +4386,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_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>.
 
@@ -4402,7 +4414,7 @@ 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Returns the hexadecimal representation of the MD5 digest of the <code>str</code> argument.
 
@@ -4425,7 +4437,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Returns the binary form of the MD5 digest of the <code>str</code> argument.
 
@@ -4434,7 +4446,7 @@ 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Returns the binary form of the SHA-1 digest of the <code>str</code> argument.
 
@@ -4445,14 +4457,14 @@ This function was first introduced in the <code>v0.5.0rc6</code>.
 == ngx.quote_sql_str ==
 '''syntax:''' ''quoted_value = ngx.quote_sql_str(raw_value)''
 
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Returns a quoted SQL string literal according to the MySQL quoting rules.
 
 == ngx.today ==
 '''syntax:''' ''str = ngx.today()''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_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).
 
@@ -4461,7 +4473,7 @@ This is the local time.
 == ngx.time ==
 '''syntax:''' ''secs = ngx.time()''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 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).
 
@@ -4470,7 +4482,7 @@ Updates of the Nginx time cache an be forced by calling [[#ngx.update_time|ngx.u
 == ngx.now ==
 '''syntax:''' ''secs = ngx.now()''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 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).
 
@@ -4481,7 +4493,7 @@ This API was first introduced in <code>v0.3.1rc32</code>.
 == ngx.update_time ==
 '''syntax:''' ''ngx.update_time()''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Forcibly updates the Nginx current time cache. This call involves a syscall and thus has some overhead, so do not abuse it.
 
@@ -4490,7 +4502,7 @@ This API was first introduced in <code>v0.3.1rc32</code>.
 == ngx.localtime ==
 '''syntax:''' ''str = ngx.localtime()''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 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).
 
@@ -4499,7 +4511,7 @@ This is the local time.
 == ngx.utctime ==
 '''syntax:''' ''str = ngx.utctime()''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 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).
 
@@ -4508,7 +4520,7 @@ This is the UTC time.
 == ngx.cookie_time ==
 '''syntax:''' ''str = ngx.cookie_time(sec)''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Returns a formatted 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]]).
 
@@ -4520,7 +4532,7 @@ Returns a formatted string can be used as the cookie expiration time. The parame
 == ngx.http_time ==
 '''syntax:''' ''str = ngx.http_time(sec)''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_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 time stamp in seconds (like those returned from [[#ngx.time|ngx.time]]).
 
@@ -4532,7 +4544,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:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_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.
 
@@ -4553,7 +4565,7 @@ Returns <code>true</code> if the current request is an nginx subrequest, or <cod
 == ngx.re.match ==
 '''syntax:''' ''captures, err = ngx.re.match(subject, regex, options?, ctx?, res_table?)''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Matches the <code>subject</code> string using the Perl compatible regular expression <code>regex</code> with the optional <code>options</code>.
 
@@ -4593,15 +4605,15 @@ and are returned in the same Lua table as key-value pairs as the numbered captur
     -- m["remaining"] == "234"
 </geshi>
 
-Unmatched subpatterns will have <code>nil</code> values in their <code>captures</code> table fields.
+Unmatched subpatterns will have <code>false</code> values in their <code>captures</code> table fields.
 
 <geshi lang="lua">
     local m, err = ngx.re.match("hello, world", "(world)|(hello)|(?<named>howdy)")
     -- m[0] == "hello"
-    -- m[1] == nil
+    -- m[1] == false
     -- m[2] == "hello"
-    -- m[3] == nil
-    -- m["named"] == nil
+    -- m[3] == false
+    -- m["named"] == false
 </geshi>
 
 Specify <code>options</code> to control how the match operation will be performed. The following option characters are supported:
@@ -4687,7 +4699,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 Escaping Sequences|Known Issue With Special Escaping Sequences]]).
 
-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:
+To confirm that PCRE JIT is enabled, activate the Nginx debug log by adding the <code>--with-debug</code> option to Nginx or 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
@@ -4700,7 +4712,7 @@ This feature was introduced in the <code>v0.2.1rc11</code> release.
 == ngx.re.find ==
 '''syntax:''' ''from, to, err = ngx.re.find(subject, regex, options?, ctx?, nth?)''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Similar to [[#ngx.re.match|ngx.re.match]] but only returns the begining index (<code>from</code>) and end index (<code>to</code>) of the matched substring. The returned indexes are 1-based and can be fed directly into the [http://www.lua.org/manual/5.1/manual.html#pdf-string.sub string.sub] API function to obtain the matched substring.
 
@@ -4749,7 +4761,7 @@ This API function was first introduced in the <code>v0.9.2</code> release.
 == ngx.re.gmatch ==
 '''syntax:''' ''iterator, err = ngx.re.gmatch(subject, regex, options?)''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_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>.
 
@@ -4822,7 +4834,7 @@ This feature was first introduced in the <code>v0.2.1rc12</code> release.
 == ngx.re.sub ==
 '''syntax:''' ''newstr, n, err = ngx.re.sub(subject, regex, replace, options?)''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_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]].
 
@@ -4881,7 +4893,7 @@ This feature was first introduced in the <code>v0.2.1rc13</code> release.
 == ngx.re.gsub ==
 '''syntax:''' ''newstr, n, err = ngx.re.gsub(subject, regex, replace, options?)''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Just like [[#ngx.re.sub|ngx.re.sub]], but does global substitution.
 
@@ -4916,7 +4928,7 @@ This feature was first introduced in the <code>v0.2.1rc15</code> release.
 
 '''syntax:''' ''dict = ngx.shared[name_var]''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_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.
 
@@ -4984,7 +4996,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_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.
 
@@ -5017,7 +5029,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.get_stale ==
 '''syntax:''' ''value, flags, stale = ngx.shared.DICT:get_stale(key)''
 
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Similar to the [[#ngx.shared.DICT.get|get]] method but returns the value even if the key has already expired.
 
@@ -5032,7 +5044,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:''' ''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Unconditionally sets a key-value pair into the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns three values:
 
@@ -5075,7 +5087,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.safe_set ==
 '''syntax:''' ''ok, err = ngx.shared.DICT:safe_set(key, value, exptime?, flags?)''
 
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Similar to the [[#ngx.shared.DICT.set|set]] method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return <code>nil</code> and the string "no memory".
 
@@ -5086,7 +5098,7 @@ 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:''' ''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_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.
 
@@ -5099,7 +5111,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.safe_add ==
 '''syntax:''' ''ok, err = ngx.shared.DICT:safe_add(key, value, exptime?, flags?)''
 
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Similar to the [[#ngx.shared.DICT.add|add]] method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return <code>nil</code> and the string "no memory".
 
@@ -5110,7 +5122,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:''' ''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_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.
 
@@ -5123,7 +5135,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.delete ==
 '''syntax:''' ''ngx.shared.DICT:delete(key)''
 
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Unconditionally removes the key-value pair from the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
 
@@ -5136,7 +5148,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.incr ==
 '''syntax:''' ''newval, err = ngx.shared.DICT:incr(key, value)''
 
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_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.
 
@@ -5153,7 +5165,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.flush_all ==
 '''syntax:''' ''ngx.shared.DICT:flush_all()''
 
-'''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.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Flushes out all the items in the dictionary. This method does not actuall free up all the memory blocks in the dictionary but just marks all the existing items as expired.
 
@@ -5164,7 +5176,7 @@ See also [[#ngx.shared.DICT.flush_expired|ngx.shared.DICT.flush_expired]] and [[
 == 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*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_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.
 
@@ -5177,7 +5189,7 @@ See also [[#ngx.shared.DICT.flush_all|ngx.shared.DICT.flush_all]] and [[#ngx.sha
 == 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*, ngx.timer.*''
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Fetch a list of the keys from the dictionary, up to <code><max_count></code>.
 
@@ -5295,7 +5307,7 @@ Timeout for the reading operation is controlled by the [[#lua_socket_read_timeou
     sock:settimeout(1000)  -- one second timeout
     local data, err = sock:receive()
     if not data then
-        ngx.say("failed to read a packet: ", data)
+        ngx.say("failed to read a packet: ", err)
         return
     end
     ngx.say("successfully read a packet: ", data)
@@ -5327,6 +5339,13 @@ Settings done by this method takes priority over those config directives, like [
 
 This feature was first introduced in the <code>v0.5.7</code> release.
 
+== ngx.socket.stream ==
+
+Just an alias to [[#ngx.socket.tcp|ngx.socket.tcp]]. If the stream-typed cosocket may also connect to a unix domain
+socket, then this API name is preferred.
+
+This API function was first added to the <code>v0.10.1</code> release.
+
 == ngx.socket.tcp ==
 '''syntax:''' ''tcpsock = ngx.socket.tcp()''
 
@@ -6046,7 +6065,7 @@ See also [[#lua_check_client_abort|lua_check_client_abort]].
 == ngx.timer.at ==
 '''syntax:''' ''ok, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Creates an Nginx timer with a user callback function as well as optional user arguments.
 
@@ -6167,7 +6186,7 @@ This API was first introduced in the <code>v0.8.0</code> release.
 == ngx.timer.running_count ==
 '''syntax:''' ''count = ngx.timer.running_count()''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Returns the number of timers currently running.
 
@@ -6176,12 +6195,22 @@ This directive was first introduced in the <code>v0.9.20</code> release.
 == ngx.timer.pending_count ==
 '''syntax:''' ''count = ngx.timer.pending_count()''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
 
 Returns the number of pending timers.
 
 This directive was first introduced in the <code>v0.9.20</code> release.
 
+== ngx.config.subsystem ==
+'''syntax:''' ''subsystem = ngx.config.subsystem''
+
+'''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.timer.*, init_by_lua*, init_worker_by_lua*''
+
+This string field indicates the current NGINX subsystem the current Lua environment is based on. For this module, this field always takes the string value `"http"`. For
+[https://github.com/openresty/stream-lua-nginx-module#readme ngx_stream_lua_module], however, this field takes the value `"stream"`.
+
+This field was first introduced in the <code>0.10.1</code>.
+
 == ngx.config.debug ==
 '''syntax:''' ''debug = ngx.config.debug''
 
@@ -6352,7 +6381,7 @@ This feature requires at least ngx_lua <code>v0.10.0</code>.
 == ndk.set_var.DIRECTIVE ==
 '''syntax:''' ''res = ndk.set_var.DIRECTIVE_NAME''
 
-'''context:''' ''init_worker_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.timer.*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_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>.
 
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 84a0579..a15d40e 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
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10000
+#define ngx_http_lua_version  10001
 
 
 typedef struct {
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 14cc342..bd09def 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
@@ -239,6 +239,7 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     int                  co_ref;
     ngx_int_t            rc;
     lua_State           *co;
+    ngx_event_t         *rev;
     ngx_connection_t    *c;
     ngx_http_lua_ctx_t  *ctx;
     ngx_http_cleanup_t  *cln;
@@ -308,6 +309,14 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (llcf->check_client_abort) {
         r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
 
+        rev = r->connection->read;
+
+        if (!rev->active) {
+            if (ngx_add_event(rev, NGX_READ_EVENT, 0) != NGX_OK) {
+                return NGX_ERROR;
+            }
+        }
+
     } else {
         r->read_event_handler = ngx_http_block_reading;
     }
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
index 4fa91fc..1201d26 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
@@ -262,7 +262,24 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
 
     ngx_http_lua_assert(lscf->balancer.handler && r);
 
-    L = ngx_http_lua_get_lua_vm(r, NULL);
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_http_lua_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        L = ngx_http_lua_get_lua_vm(r, ctx);
+
+    } else {
+        L = ngx_http_lua_get_lua_vm(r, ctx);
+
+        dd("reset ctx");
+        ngx_http_lua_reset_ctx(r, L, ctx);
+    }
+
+    ctx->context = NGX_HTTP_LUA_CONTEXT_BALANCER;
 
     bp->sockaddr = NULL;
     bp->socklen = 0;
@@ -283,8 +300,6 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
         return NGX_ERROR;
     }
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
     if (ctx->exited && ctx->exit_code != NGX_OK) {
         rc = ctx->exit_code;
         if (rc == NGX_ERROR || rc == NGX_BUSY || rc == NGX_DECLINED) {
@@ -321,22 +336,6 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
     u_char                  *err_msg;
     size_t                   len;
     ngx_int_t                rc;
-    ngx_http_lua_ctx_t      *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (ctx == NULL) {
-        ctx = ngx_http_lua_create_ctx(r);
-        if (ctx == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-    } else {
-        dd("reset ctx");
-        ngx_http_lua_reset_ctx(r, L, ctx);
-    }
-
-    ctx->context = NGX_HTTP_LUA_CONTEXT_BALANCER;
 
     /* init nginx context in Lua VM */
     ngx_http_lua_set_req(L, r);
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_config.c b/debian/modules/nginx-lua/src/ngx_http_lua_config.c
index 00594be..3323175 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_config.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_config.c
@@ -23,7 +23,7 @@ ngx_http_lua_inject_config_api(lua_State *L)
 {
     /* ngx.config */
 
-    lua_createtable(L, 0, 5 /* nrec */);    /* .config */
+    lua_createtable(L, 0, 6 /* nrec */);    /* .config */
 
 #if (NGX_DEBUG)
     lua_pushboolean(L, 1);
@@ -44,6 +44,9 @@ ngx_http_lua_inject_config_api(lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_config_configure);
     lua_setfield(L, -2, "nginx_configure");
 
+    lua_pushliteral(L, "http");
+    lua_setfield(L, -2, "subsystem");
+
     lua_setfield(L, -2, "config");
 }
 
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 666b549..6718885 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
@@ -27,6 +27,7 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
     int                      co_ref;
     ngx_int_t                rc;
     lua_State               *co;
+    ngx_event_t             *rev;
     ngx_http_lua_ctx_t      *ctx;
     ngx_http_cleanup_t      *cln;
 
@@ -96,6 +97,14 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (llcf->check_client_abort) {
         r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
 
+        rev = r->connection->read;
+
+        if (!rev->active) {
+            if (ngx_add_event(rev, NGX_READ_EVENT, 0) != NGX_OK) {
+                return NGX_ERROR;
+            }
+        }
+
     } else {
         r->read_event_handler = ngx_http_block_reading;
     }
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 a9e45d3..45be168 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
@@ -53,6 +53,12 @@ ngx_http_lua_ngx_req_http_version(lua_State *L)
         lua_pushnumber(L, 1.1);
         break;
 
+#ifdef NGX_HTTP_VERSION_20
+    case NGX_HTTP_VERSION_20:
+        lua_pushnumber(L, 2.0);
+        break;
+#endif
+
     default:
         lua_pushnil(L);
         break;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
index 0876f26..8a374c2 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
@@ -26,6 +26,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     ngx_uint_t                   i;
     ngx_conf_t                   conf;
     ngx_cycle_t                 *fake_cycle;
+    ngx_module_t               **modules;
     ngx_open_file_t             *file, *ofile;
     ngx_list_part_t             *part;
     ngx_connection_t            *c = NULL;
@@ -46,7 +47,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
         return NGX_OK;
     }
 
-    conf_ctx = ((ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index]);
+    conf_ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index];
     http_ctx.main_conf = conf_ctx->main_conf;
 
     top_clcf = conf_ctx->loc_conf[ngx_http_core_module.ctx_index];
@@ -154,12 +155,18 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
         return NGX_ERROR;
     }
 
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_HTTP_MODULE) {
+#if defined(nginx_version) && nginx_version >= 1009011
+    modules = cycle->modules;
+#else
+    modules = ngx_modules;
+#endif
+
+    for (i = 0; modules[i]; i++) {
+        if (modules[i]->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        module = ngx_modules[i]->ctx;
+        module = modules[i]->ctx;
 
         if (module->create_srv_conf) {
             cur = module->create_srv_conf(&conf);
@@ -167,7 +174,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
                 return NGX_ERROR;
             }
 
-            http_ctx.srv_conf[ngx_modules[i]->ctx_index] = cur;
+            http_ctx.srv_conf[modules[i]->ctx_index] = cur;
 
             if (module->merge_srv_conf) {
                 prev = module->create_srv_conf(&conf);
@@ -188,7 +195,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
                 return NGX_ERROR;
             }
 
-            http_ctx.loc_conf[ngx_modules[i]->ctx_index] = cur;
+            http_ctx.loc_conf[modules[i]->ctx_index] = cur;
 
             if (module->merge_loc_conf) {
                 prev = module->create_loc_conf(&conf);
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 daca3fd..c2b2269 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_log.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_log.c
@@ -160,6 +160,16 @@ log_wrapper(ngx_log_t *log, const char *ident, ngx_uint_t level,
 
                 break;
 
+            case LUA_TTABLE:
+                if (!luaL_callmeta(L, i, "__tostring")) {
+                    return luaL_argerror(L, i, "expected table to have "
+                                         "__tostring metamethod");
+                }
+
+                lua_tolstring(L, -1, &len);
+                size += len;
+                break;
+
             case LUA_TLIGHTUSERDATA:
                 if (lua_touserdata(L, i) == NULL) {
                     size += sizeof("null") - 1;
@@ -227,6 +237,12 @@ log_wrapper(ngx_log_t *log, const char *ident, ngx_uint_t level,
 
                 break;
 
+            case LUA_TTABLE:
+                luaL_callmeta(L, i, "__tostring");
+                q = (u_char *) lua_tolstring(L, -1, &len);
+                p = ngx_copy(p, q, len);
+                break;
+
             case LUA_TLIGHTUSERDATA:
                 *p++ = 'n';
                 *p++ = 'u';
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 c72a705..4cfee82 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
@@ -503,8 +503,6 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       offsetof(ngx_http_lua_loc_conf_t, ssl_ciphers),
       NULL },
 
-#if (NGX_HTTP_SSL)
-
     { ngx_string("ssl_certificate_by_lua_block"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
       ngx_http_lua_ssl_cert_by_lua_block,
@@ -519,8 +517,6 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_ssl_cert_handler_file },
 
-#endif  /* NGX_HTTP_SSL */
-
     { ngx_string("lua_ssl_verify_depth"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -941,11 +937,11 @@ ngx_http_lua_create_loc_conf(ngx_conf_t *cf)
      *      conf->body_filter_src_key = NULL
      *      conf->body_filter_handler = NULL;
      *
-     *     conf->ssl = 0;
-     *     conf->ssl_protocols = 0;
-     *     conf->ssl_ciphers = { 0, NULL };
-     *     conf->ssl_trusted_certificate = { 0, NULL };
-     *     conf->ssl_crl = { 0, NULL };
+     *      conf->ssl = 0;
+     *      conf->ssl_protocols = 0;
+     *      conf->ssl_ciphers = { 0, NULL };
+     *      conf->ssl_trusted_certificate = { 0, NULL };
+     *      conf->ssl_crl = { 0, NULL };
      */
 
     conf->force_read_body    = NGX_CONF_UNSET;
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 d942296..24b80b4 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ndk.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ndk.c
@@ -116,15 +116,22 @@ ngx_http_lookup_ndk_set_var_directive(u_char *name,
     ndk_set_var_t           *filter;
     ngx_uint_t               i;
     ngx_module_t            *module;
+    ngx_module_t           **modules;
     ngx_command_t           *cmd;
 
-    for (i = 0; ngx_modules[i]; i++) {
-        module = ngx_modules[i];
+#if defined(nginx_version) && nginx_version >= 1009011
+    modules = ngx_cycle->modules;
+#else
+    modules = ngx_modules;
+#endif
+
+    for (i = 0; modules[i]; i++) {
+        module = modules[i];
         if (module->type != NGX_HTTP_MODULE) {
             continue;
         }
 
-        cmd = ngx_modules[i]->commands;
+        cmd = modules[i]->commands;
         if (cmd == NULL) {
             continue;
         }
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 dca5fb9..ef816d2 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_output.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_output.c
@@ -3,6 +3,7 @@
 #endif
 #include "ddebug.h"
 
+
 #include "ngx_http_lua_output.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_contentby.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 8b4a668..be110e3 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
@@ -420,6 +420,7 @@ ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
 
     if (flags & NGX_LUA_RE_MODE_DFA) {
         ovecsize = 2;
+        re_comp.captures = 0;
 
     } else {
         ovecsize = (re_comp.captures + 1) * 3;
@@ -592,14 +593,15 @@ exec:
     }
 
     if (res_tb_idx == 0) {
-        lua_createtable(L, rc /* narr */, 0 /* nrec */);
+        lua_createtable(L, re_comp.captures || 1 /* narr */,
+                        name_count /* nrec */);
         res_tb_idx = lua_gettop(L);
     }
 
-    for (i = 0, n = 0; i < rc; i++, n += 2) {
+    for (i = 0, n = 0; i <= re_comp.captures; i++, n += 2) {
         dd("capture %d: %d %d", i, cap[n], cap[n + 1]);
-        if (cap[n] < 0) {
-            lua_pushnil(L);
+        if (i >= rc || cap[n] < 0) {
+            lua_pushboolean(L, 0);
 
         } else {
             lua_pushlstring(L, (char *) &subj.data[cap[n]],
@@ -881,6 +883,7 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
 
     if (flags & NGX_LUA_RE_MODE_DFA) {
         ovecsize = 2;
+        re_comp.captures = 0;
 
     } else {
         ovecsize = (re_comp.captures + 1) * 3;
@@ -1116,12 +1119,12 @@ ngx_http_lua_ngx_re_gmatch_iterator(lua_State *L)
 
     dd("rc = %d", (int) rc);
 
-    lua_createtable(L, rc /* narr */, 0 /* nrec */);
+    lua_createtable(L, ctx->ncaptures || 1 /* narr */, name_count /* nrec */);
 
-    for (i = 0, n = 0; i < rc; i++, n += 2) {
+    for (i = 0, n = 0; i <= ctx->ncaptures; i++, n += 2) {
         dd("capture %d: %d %d", i, cap[n], cap[n + 1]);
-        if (cap[n] < 0) {
-            lua_pushnil(L);
+        if (i >= rc || cap[n] < 0) {
+            lua_pushboolean(L, 0);
 
         } else {
             lua_pushlstring(L, (char *) &subj.data[cap[n]],
@@ -1564,6 +1567,7 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
 
     if (flags & NGX_LUA_RE_MODE_DFA) {
         ovecsize = 2;
+        re_comp.captures = 0;
 
     } else {
         ovecsize = (re_comp.captures + 1) * 3;
@@ -1750,12 +1754,13 @@ exec:
         if (func) {
             lua_pushvalue(L, 3);
 
-            lua_createtable(L, rc - 1 /* narr */, 1 /* nrec */);
+            lua_createtable(L, re_comp.captures || 1 /* narr */,
+                            name_count /* nrec */);
 
-            for (i = 0, n = 0; i < rc; i++, n += 2) {
+            for (i = 0, n = 0; i <= re_comp.captures; i++, n += 2) {
                 dd("capture %d: %d %d", (int) i, cap[n], cap[n + 1]);
-                if (cap[n] < 0) {
-                    lua_pushnil(L);
+                if (i >= rc || cap[n] < 0) {
+                    lua_pushboolean(L, 0);
 
                 } else {
                     lua_pushlstring(L, (char *) &subj.data[cap[n]],
@@ -2071,6 +2076,11 @@ ngx_http_lua_re_collect_named_captures(lua_State *L, int res_tb_idx,
         }
 
         if (flags & NGX_LUA_RE_MODE_DUPNAMES) {
+            /* unmatched groups are not stored in tables in DUPNAMES mode */
+            if (!lua_toboolean(L, -1)) {
+                lua_pop(L, 1);
+                continue;
+            }
 
             lua_getfield(L, -2, name); /* big_tb cap small_tb */
 
@@ -2201,6 +2211,7 @@ ngx_http_lua_ffi_compile_regex(const unsigned char *pat, size_t pat_len,
 
     if (flags & NGX_LUA_RE_MODE_DFA) {
         ovecsize = 2;
+        re_comp.captures = 0;
 
     } else {
         ovecsize = (re_comp.captures + 1) * 3;
@@ -2279,6 +2290,7 @@ ngx_http_lua_ffi_exec_regex(ngx_http_lua_regex_t *re, int flags,
 
     if (flags & NGX_LUA_RE_MODE_DFA) {
         ovecsize = 2;
+        re->ncaptures = 0;
 
     } else {
         ovecsize = (re->ncaptures + 1) * 3;
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 a916396..591d2cd 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
@@ -619,9 +619,9 @@ 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;
+    ngx_str_t                    body;
+    size_t                       size, rest;
+    size_t                       offset = 0;
 
     n = lua_gettop(L);
 
@@ -683,10 +683,10 @@ ngx_http_lua_ngx_req_body_finish(lua_State *L)
     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;
+    size_t                       size;
+    ngx_str_t                    value;
+    ngx_str_t                    key;
+    ngx_int_t                    rc;
 
     n = lua_gettop(L);
 
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 da30b8b..2ef59c5 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
@@ -235,6 +235,7 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
     int                      co_ref;
     lua_State               *co;
     ngx_int_t                rc;
+    ngx_event_t             *rev;
     ngx_connection_t        *c;
     ngx_http_lua_ctx_t      *ctx;
     ngx_http_cleanup_t      *cln;
@@ -303,6 +304,14 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (llcf->check_client_abort) {
         r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
 
+        rev = r->connection->read;
+
+        if (!rev->active) {
+            if (ngx_add_event(rev, NGX_READ_EVENT, 0) != NGX_OK) {
+                return NGX_ERROR;
+            }
+        }
+
     } else {
         r->read_event_handler = ngx_http_block_reading;
     }
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_script.h b/debian/modules/nginx-lua/src/ngx_http_lua_script.h
index b6dbcd4..9fdca96 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_script.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_script.h
@@ -75,10 +75,10 @@ typedef struct {
 
 
 ngx_int_t ngx_http_lua_compile_complex_value(
-        ngx_http_lua_compile_complex_value_t *ccv);
+    ngx_http_lua_compile_complex_value_t *ccv);
 ngx_int_t ngx_http_lua_complex_value(ngx_http_request_t *r, ngx_str_t *subj,
-        size_t offset, ngx_int_t count, int *cap,
-        ngx_http_lua_complex_value_t *val, luaL_Buffer *luabuf);
+    size_t offset, ngx_int_t count, int *cap,
+    ngx_http_lua_complex_value_t *val, luaL_Buffer *luabuf);
 
 
 #endif /* _NGX_HTTP_LUA_SCRIPT_H_INCLUDED_ */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
index b022604..8d4ac07 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
@@ -249,7 +249,7 @@ ngx_http_lua_semaphore_resume(ngx_http_request_t *r)
 
     } else {
         lua_pushboolean(ctx->cur_co_ctx->co, 0);
-        lua_pushstring(ctx->cur_co_ctx->co, "timeout");
+        lua_pushliteral(ctx->cur_co_ctx->co, "timeout");
     }
 
     rc = ngx_http_lua_run_thread(vm, r, ctx, 2);
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 d853382..43f5f9e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
@@ -140,7 +140,7 @@ void
 ngx_http_lua_shdict_rbtree_insert_value(ngx_rbtree_node_t *temp,
     ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel)
 {
-    ngx_rbtree_node_t          **p;
+    ngx_rbtree_node_t           **p;
     ngx_http_lua_shdict_node_t   *sdn, *sdnt;
 
     for ( ;; ) {
@@ -949,7 +949,7 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
     if (n >= 4) {
         exptime = luaL_checknumber(L, 4);
         if (exptime < 0) {
-            exptime = 0;
+            return luaL_error(L, "bad \"exptime\" argument");
         }
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
index 98801f5..1a6594d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
@@ -197,10 +197,12 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 {
     ngx_int_t         rc;
 
-    lua_createtable(L, 0, 3 /* nrec */);    /* ngx.socket */
+    lua_createtable(L, 0, 4 /* nrec */);    /* ngx.socket */
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp);
-    lua_setfield(L, -2, "tcp");
+    lua_pushvalue(L, -1);
+    lua_setfield(L, -3, "tcp");
+    lua_setfield(L, -2, "stream");
 
     {
         const char  buf[] = "local sock = ngx.socket.tcp()"
@@ -2874,6 +2876,7 @@ ngx_http_lua_socket_send(ngx_http_request_t *r,
     }
 
     if (n == NGX_ERROR) {
+        c->error = 1;
         u->socket_errno = ngx_socket_errno;
         ngx_http_lua_socket_handle_write_error(r, u,
                                                NGX_HTTP_LUA_SOCKET_FT_ERROR);
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
index bfb122f..1ec0c00 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
@@ -54,7 +54,7 @@ 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 ngx_int_t ngx_http_lua_udp_connect(ngx_http_lua_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);
@@ -170,10 +170,10 @@ ngx_http_lua_socket_udp_setpeername(lua_State *L)
     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_udp_connection_t           *uc;
     ngx_http_lua_socket_udp_upstream_t      *u;
 
     /*
@@ -642,11 +642,11 @@ ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
 {
     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_http_lua_udp_connection_t   *uc;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua udp socket resolve retval handler");
@@ -1348,7 +1348,7 @@ ngx_http_lua_socket_udp_handle_success(ngx_http_request_t *r,
 
 
 static ngx_int_t
-ngx_http_lua_udp_connect(ngx_udp_connection_t *uc)
+ngx_http_lua_udp_connect(ngx_http_lua_udp_connection_t *uc)
 {
     int                rc;
     ngx_int_t          event;
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
index dd75b2d..8333346 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h
@@ -24,6 +24,15 @@ typedef void (*ngx_http_lua_socket_udp_upstream_handler_pt)
     (ngx_http_request_t *r, ngx_http_lua_socket_udp_upstream_t *u);
 
 
+typedef struct {
+    ngx_connection_t         *connection;
+    struct sockaddr          *sockaddr;
+    socklen_t                 socklen;
+    ngx_str_t                 server;
+    ngx_log_t                 log;
+} ngx_http_lua_udp_connection_t;
+
+
 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;
@@ -31,7 +40,7 @@ struct ngx_http_lua_socket_udp_upstream_s {
     ngx_http_lua_loc_conf_t         *conf;
     ngx_http_cleanup_pt             *cleanup;
     ngx_http_request_t              *request;
-    ngx_udp_connection_t             udp_connection;
+    ngx_http_lua_udp_connection_t    udp_connection;
 
     ngx_msec_t                       read_timeout;
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
index f8648a7..32675b2 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
@@ -585,24 +585,24 @@ ngx_http_lua_ffi_ssl_set_der_certificate(ngx_http_request_t *r,
 
     bio = BIO_new_mem_buf((char *) data, len);
     if (bio == NULL) {
-        *err = " BIO_new_mem_buf() failed";
+        *err = "BIO_new_mem_buf() failed";
         goto failed;
     }
 
     x509 = d2i_X509_bio(bio, NULL);
     if (x509 == NULL) {
-        *err = " d2i_X509_bio() failed";
+        *err = "d2i_X509_bio() failed";
         goto failed;
     }
 
     if (SSL_use_certificate(ssl_conn, x509) == 0) {
-        *err = " SSL_use_certificate() failed";
+        *err = "SSL_use_certificate() failed";
         goto failed;
     }
 
 #if 0
     if (SSL_set_ex_data(ssl_conn, ngx_ssl_certificate_index, x509) == 0) {
-        *err = " SSL_set_ex_data() failed";
+        *err = "SSL_set_ex_data() failed";
         goto failed;
     }
 #endif
@@ -837,6 +837,7 @@ ngx_http_lua_ffi_cert_pem_to_der(const u_char *pem, size_t pem_len, u_char *der,
 
     total = i2d_X509(x509, &der);
     if (total < 0) {
+        *err = "i2d_X509() failed";
         X509_free(x509);
         BIO_free(bio);
         return NGX_ERROR;
@@ -892,7 +893,6 @@ ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
 {
     int          len;
     BIO         *in;
-    RSA         *rsa;
     EVP_PKEY    *pkey;
 
     in = BIO_new_mem_buf((char *) pem, (int) pem_len);
@@ -910,24 +910,15 @@ ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
 
     BIO_free(in);
 
-    rsa = EVP_PKEY_get1_RSA(pkey);
-    if (rsa == NULL) {
+    len = i2d_PrivateKey(pkey, &der);
+    if (len < 0) {
         EVP_PKEY_free(pkey);
-        *err = "EVP_PKEY_get1_RSA failed";
+        *err = "i2d_PrivateKey failed";
         return NGX_ERROR;
     }
 
     EVP_PKEY_free(pkey);
 
-    len = i2d_RSAPrivateKey(rsa, &der);
-    if (len < 0) {
-        RSA_free(rsa);
-        *err = "i2d_RSAPrivateKey failed";
-        return NGX_ERROR;
-    }
-
-    RSA_free(rsa);
-
     return len;
 }
 
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 afb7655..69eccae 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_util.c
@@ -1649,6 +1649,8 @@ ngx_http_lua_process_flushing_coroutines(ngx_http_request_t *r,
 
             if (coctx[i].flushing) {
                 coctx[i].flushing = 0;
+                ctx->flushing_coros--;
+                n--;
                 ctx->cur_co_ctx = &coctx[i];
 
                 rc = ngx_http_lua_flush_resume_helper(r, ctx);
@@ -1658,8 +1660,6 @@ ngx_http_lua_process_flushing_coroutines(ngx_http_request_t *r,
 
                 /* rc == NGX_DONE */
 
-                ctx->flushing_coros--;
-                n--;
                 if (n == 0) {
                     return NGX_DONE;
                 }
@@ -1694,6 +1694,8 @@ ngx_http_lua_flush_pending_output(ngx_http_request_t *r,
                    c->buffered);
 
     if (ctx->busy_bufs) {
+        /* FIXME since cosockets also share this busy_bufs chain, this condition
+         * might not be strong enough. better use separate busy_bufs chains. */
         rc = ngx_http_lua_output_filter(r, NULL);
 
     } else {
@@ -3782,8 +3784,9 @@ ngx_http_lua_cleanup_vm(void *data)
 #endif
 
     if (state) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "decrementing "
-                       "the reference count for Lua VM: %i", state->count);
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua decrementing the reference count for Lua VM: %i",
+                       state->count);
 
         if (--state->count == 0) {
             L = state->vm;
diff --git a/debian/modules/nginx-lua/t/008-today.t b/debian/modules/nginx-lua/t/008-today.t
index 02169c8..54bd949 100644
--- a/debian/modules/nginx-lua/t/008-today.t
+++ b/debian/modules/nginx-lua/t/008-today.t
@@ -1,4 +1,4 @@
-# vim:set ft=perl ts=4 sw=4 et fdm=marker:
+# vim:set ft= ts=4 sw=4 et fdm=marker:
 
 use Test::Nginx::Socket::Lua;
 
@@ -6,7 +6,7 @@ use Test::Nginx::Socket::Lua;
 #master_process_enabled(1);
 log_level('warn');
 
-repeat_each(1);
+repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 2);
 
diff --git a/debian/modules/nginx-lua/t/009-log.t b/debian/modules/nginx-lua/t/009-log.t
index e06c799..053dd45 100644
--- a/debian/modules/nginx-lua/t/009-log.t
+++ b/debian/modules/nginx-lua/t/009-log.t
@@ -265,7 +265,96 @@ qr/\[error\] \S+: \S+ \[lua\] set_by_lua:2: truefalsenil,/
 
 
 
-=== TEST 14: print() in header filter
+=== TEST 14: test table with metamethod
+--- config
+    location /log {
+        content_by_lua_block {
+            ngx.say("before log")
+            local t = setmetatable({v = "value"}, {
+                __tostring = function(self)
+                    return "tostring "..self.v
+                end
+            })
+            ngx.log(ngx.ERR, t)
+            ngx.say("after log")
+        }
+    }
+--- request
+GET /log
+--- response_body
+before log
+after log
+--- error_log eval
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8: tostring value,/
+
+
+
+=== TEST 15: test table without metamethod
+--- config
+    location /log {
+        content_by_lua_block {
+            ngx.log(ngx.ERR, {})
+            ngx.say("done")
+        }
+    }
+--- request
+GET /log
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad argument #1 to 'log' (expected table to have __tostring metamethod)
+
+
+
+=== TEST 16: test tables mixed with other types
+--- config
+    location /log {
+        content_by_lua_block {
+            ngx.say("before log")
+            local t = setmetatable({v = "value"}, {
+                __tostring = function(self)
+                    return "tostring: "..self.v
+                end
+            })
+            ngx.log(ngx.ERR, t, " hello ", t)
+            ngx.say("after log")
+        }
+    }
+--- request
+GET /log
+--- response_body
+before log
+after log
+--- error_log eval
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8: tostring: value hello tostring: value,/
+
+
+
+=== TEST 17: test print with tables
+--- config
+    location /log {
+        content_by_lua_block {
+            ngx.say("before log")
+            local t = setmetatable({v = "value"}, {
+                __tostring = function(self)
+                    return "tostring: "..self.v
+                end
+            })
+            print(t, " hello ", t)
+            ngx.say("after log")
+        }
+    }
+--- request
+GET /log
+--- response_body
+before log
+after log
+--- error_log eval
+qr/\[notice\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8: tostring: value hello tostring: value,/
+
+
+
+=== TEST 18: print() in header filter
 --- config
     location /log {
         header_filter_by_lua '
@@ -285,7 +374,7 @@ hi
 
 
 
-=== TEST 15: ngx.log() in header filter
+=== TEST 19: ngx.log in header filter
 --- config
     location /log {
         header_filter_by_lua '
@@ -305,7 +394,7 @@ qr/\[error\] .*? \[lua\] header_filter_by_lua:2: howdy, lua!/
 
 
 
-=== TEST 16: ngx.log() big data
+=== TEST 20: ngx.log big data
 --- config
     location /log {
         content_by_lua '
@@ -321,7 +410,7 @@ GET /log
 
 
 
-=== TEST 17: ngx.log in Lua function calls & inlined lua
+=== TEST 21: ngx.log in Lua function calls & inlined lua
 --- config
     location /log {
         content_by_lua '
@@ -346,7 +435,7 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):7: bar\(\): hell
 
 
 
-=== TEST 18: ngx.log in Lua function tail-calls & inlined lua
+=== TEST 22: ngx.log in Lua function tail-calls & inlined lua
 --- config
     location /log {
         content_by_lua '
@@ -376,7 +465,7 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8:(?: foo\(\):)?
 
 
 
-=== TEST 19: ngx.log in Lua files
+=== TEST 23: ngx.log in Lua files
 --- config
     location /log {
         content_by_lua_file 'html/test.lua';
@@ -403,7 +492,7 @@ qr/\[error\] \S+: \S+ \[lua\] test.lua:6: bar\(\): hello, log12343.14159/
 
 
 
-=== TEST 20: ngx.log with bad levels (ngx.ERROR, -1)
+=== TEST 24: ngx.log with bad levels (ngx.ERROR, -1)
 --- config
     location /log {
         content_by_lua '
@@ -420,7 +509,7 @@ bad log level: -1
 
 
 
-=== TEST 21: ngx.log with bad levels (9)
+=== TEST 25: ngx.log with bad levels (9)
 --- config
     location /log {
         content_by_lua '
@@ -437,7 +526,7 @@ bad log level: 9
 
 
 
-=== TEST 22: \0 in the log message
+=== TEST 26: \0 in the log message
 --- config
     location = /t {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/011-md5_bin.t b/debian/modules/nginx-lua/t/011-md5_bin.t
index 48b8c61..ae7c974 100644
--- a/debian/modules/nginx-lua/t/011-md5_bin.t
+++ b/debian/modules/nginx-lua/t/011-md5_bin.t
@@ -160,11 +160,11 @@ d41d8cd98f00b204e9800998ecf8427e
             s = string.gsub(s, ".", function (c)
                     return string.format("%02x", string.byte(c))
                 end)
-            return s
+            ngx.say(s)
 
         ';
     }
 --- request
 GET /t
 --- response_body
-
+6c8349cc7260ae62e3b1396831a8398f
diff --git a/debian/modules/nginx-lua/t/013-base64.t b/debian/modules/nginx-lua/t/013-base64.t
index 6903218..1cc27de 100644
--- a/debian/modules/nginx-lua/t/013-base64.t
+++ b/debian/modules/nginx-lua/t/013-base64.t
@@ -14,7 +14,6 @@ plan tests => repeat_each() * (blocks() * 2 + 4);
 #no_long_string();
 run_tests();
 
-
 __DATA__
 
 === TEST 1: base64 encode hello
diff --git a/debian/modules/nginx-lua/t/016-resp-header.t b/debian/modules/nginx-lua/t/016-resp-header.t
index e23b48f..b1f5e2a 100644
--- a/debian/modules/nginx-lua/t/016-resp-header.t
+++ b/debian/modules/nginx-lua/t/016-resp-header.t
@@ -1226,7 +1226,6 @@ bar: baz
 
 
 === TEST 60: built-in Content-Type header
---- main_config
 --- config
     location = /t {
         content_by_lua '
@@ -1255,7 +1254,6 @@ my content_type: text/plain
 
 
 === TEST 61: built-in Content-Length header
---- main_config
 --- config
     location = /t {
         content_by_lua '
@@ -1284,7 +1282,6 @@ my content_length: 3
 
 
 === TEST 62: built-in Connection header
---- main_config
 --- config
     location = /t {
         content_by_lua '
@@ -1311,7 +1308,6 @@ my connection: close
 
 
 === TEST 63: built-in Transfer-Encoding header (chunked)
---- main_config
 --- config
     location = /t {
         content_by_lua '
@@ -1339,7 +1335,6 @@ my transfer-encoding: chunked
 
 
 === TEST 64: built-in Transfer-Encoding header (none)
---- main_config
 --- config
     location = /t {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/034-match.t b/debian/modules/nginx-lua/t/034-match.t
index 172c1b3..4792ae6 100644
--- a/debian/modules/nginx-lua/t/034-match.t
+++ b/debian/modules/nginx-lua/t/034-match.t
@@ -409,7 +409,7 @@ error: .*?unknown flag "H" \(flags "Hm"\)
     GET /re
 --- response_body
 hello
-nil
+false
 hello
 
 
@@ -814,7 +814,7 @@ hello-1234
 
 
 
-=== TEST 38: named captures are nil
+=== TEST 38: named captures are false
 --- config
     location /re {
         content_by_lua '
@@ -834,10 +834,10 @@ hello-1234
     GET /re
 --- response_body
 hello
-nil
+false
 hello
-nil
-nil
+false
+false
 
 
 
@@ -1148,3 +1148,24 @@ failed to match
 1234
 --- SKIP
 
+
+
+=== TEST 49: trailing captures are false
+--- config
+    location /re {
+        content_by_lua '
+            local m = ngx.re.match("hello", "(hello)(.+)?")
+            if m then
+                ngx.say(m[0])
+                ngx.say(m[1])
+                ngx.say(m[2])
+            end
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hello
+hello
+false
+
diff --git a/debian/modules/nginx-lua/t/035-gmatch.t b/debian/modules/nginx-lua/t/035-gmatch.t
index 04a06ed..69b9512 100644
--- a/debian/modules/nginx-lua/t/035-gmatch.t
+++ b/debian/modules/nginx-lua/t/035-gmatch.t
@@ -582,13 +582,13 @@ matched: []
 --- response_body
 1234
 1234
-nil
+false
 1234
-nil
+false
 abcd
-nil
+false
 abcd
-nil
+false
 abcd
 
 
diff --git a/debian/modules/nginx-lua/t/036-sub.t b/debian/modules/nginx-lua/t/036-sub.t
index 88dc8d6..f08c50f 100644
--- a/debian/modules/nginx-lua/t/036-sub.t
+++ b/debian/modules/nginx-lua/t/036-sub.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 18);
+plan tests => repeat_each() * (blocks() * 2 + 19);
 
 #no_diff();
 no_long_string();
@@ -732,3 +732,26 @@ GET /t
 bad argument type
 NYI
 
+
+
+=== TEST 33: function replace (false for groups)
+--- config
+    location /re {
+        content_by_lua '
+            local repl = function (m)
+                print("group 1: ", m[2])
+                return "[" .. m[0] .. "] [" .. m[1] .. "]"
+            end
+
+            local s, n = ngx.re.sub("hello, 34", "([0-9])|(world)", repl)
+            ngx.say(s)
+            ngx.say(n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hello, [3] [3]4
+1
+--- error_log
+group 1: false
diff --git a/debian/modules/nginx-lua/t/037-gsub.t b/debian/modules/nginx-lua/t/037-gsub.t
index b3bb04e..2a1e00f 100644
--- a/debian/modules/nginx-lua/t/037-gsub.t
+++ b/debian/modules/nginx-lua/t/037-gsub.t
@@ -4,11 +4,11 @@ use Test::Nginx::Socket::Lua;
 #worker_connections(1014);
 #master_on();
 #workers(2);
-log_level('warn');
+#log_level('warn');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 16);
+plan tests => repeat_each() * (blocks() * 2 + 17);
 
 #no_diff();
 no_long_string();
@@ -674,3 +674,26 @@ GET /t
 --- no_error_log
 [error]
 
+
+
+=== TEST 29: function replace (false for groups)
+--- config
+    location /re {
+        content_by_lua '
+            local repl = function (m)
+                print("group 1: ", m[2])
+                return "[" .. m[0] .. "] [" .. m[1] .. "]"
+            end
+
+            local s, n = ngx.re.gsub("hello, 34", "([0-9])|(world)", repl)
+            ngx.say(s)
+            ngx.say(n)
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hello, [3] [3][4] [4]
+2
+--- error_log
+group 1: false
diff --git a/debian/modules/nginx-lua/t/038-match-o.t b/debian/modules/nginx-lua/t/038-match-o.t
index 4ccd73a..628e27f 100644
--- a/debian/modules/nginx-lua/t/038-match-o.t
+++ b/debian/modules/nginx-lua/t/038-match-o.t
@@ -384,7 +384,7 @@ error: pcre_compile() failed: missing ) in "(abc"
     GET /re
 --- response_body
 hello
-nil
+false
 hello
 
 
@@ -716,7 +716,7 @@ hello-1234
 
 
 
-=== TEST 33: named captures are nil
+=== TEST 33: named captures are false
 --- config
     location /re {
         content_by_lua '
@@ -736,8 +736,8 @@ hello-1234
     GET /re
 --- response_body
 hello
-nil
+false
 hello
-nil
-nil
+false
+false
 
diff --git a/debian/modules/nginx-lua/t/043-shdict.t b/debian/modules/nginx-lua/t/043-shdict.t
index 4c4d121..91a4196 100644
--- a/debian/modules/nginx-lua/t/043-shdict.t
+++ b/debian/modules/nginx-lua/t/043-shdict.t
@@ -2429,3 +2429,22 @@ nil
 nil
 --- no_error_log
 [error]
+
+
+
+=== TEST 92: invalid expire time
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", 32, -1)
+        ';
+    }
+--- request
+GET /test
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+bad "exptime" argument
diff --git a/debian/modules/nginx-lua/t/044-req-body.t b/debian/modules/nginx-lua/t/044-req-body.t
index f0d0a4d..1c1be40 100644
--- a/debian/modules/nginx-lua/t/044-req-body.t
+++ b/debian/modules/nginx-lua/t/044-req-body.t
@@ -7,7 +7,7 @@ log_level('warn');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 51);
+plan tests => repeat_each() * (blocks() * 4 + 52 );
 
 #no_diff();
 no_long_string();
@@ -1606,3 +1606,27 @@ hiya, world"]
 --- no_error_log
 [error]
 [alert]
+
+
+
+=== TEST 49: get body data at log phase
+--- config
+    location = /test {
+        content_by_lua_block {
+            ngx.req.read_body()
+            ngx.say(ngx.req.get_body_data())
+        }
+        log_by_lua_block {
+            ngx.log(ngx.WARN, "request body:", ngx.req.get_body_data())
+        }
+    }
+--- request
+POST /test
+hello, world
+--- response_body
+hello, world
+--- error_log
+request body:hello, world
+--- no_error_log
+[error]
+[alert]
diff --git a/debian/modules/nginx-lua/t/048-match-dfa.t b/debian/modules/nginx-lua/t/048-match-dfa.t
index 8350a73..8a0a328 100644
--- a/debian/modules/nginx-lua/t/048-match-dfa.t
+++ b/debian/modules/nginx-lua/t/048-match-dfa.t
@@ -23,6 +23,8 @@ __DATA__
             m = ngx.re.match("hello", "(he|hell)", "d")
             if m then
                 ngx.say(m[0])
+                ngx.say(m[1])
+                ngx.say(m[2])
             else
                 ngx.say("not matched!")
             end
@@ -32,10 +34,35 @@ __DATA__
     GET /re
 --- response_body
 hell
+nil
+nil
 
 
 
-=== TEST 2: matched with d + j
+=== TEST 2: matched with d + o
+--- config
+    location /re {
+        content_by_lua '
+            m = ngx.re.match("hello", "(he|hell)", "do")
+            if m then
+                ngx.say(m[0])
+                ngx.say(m[1])
+                ngx.say(m[2])
+            else
+                ngx.say("not matched!")
+            end
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hell
+nil
+nil
+
+
+
+=== TEST 3: matched with d + j
 --- config
     location /re {
         content_by_lua '
@@ -54,7 +81,7 @@ hell
 
 
 
-=== TEST 3: not matched with j
+=== TEST 4: not matched with j
 --- config
     location /re {
         content_by_lua '
@@ -73,7 +100,7 @@ not matched!
 
 
 
-=== TEST 4: matched with do
+=== TEST 5: matched with do
 --- config
     location /re {
         content_by_lua '
@@ -96,7 +123,7 @@ nil
 
 
 
-=== TEST 5: not matched with do
+=== TEST 6: not matched with do
 --- config
     location /re {
         content_by_lua '
@@ -115,7 +142,7 @@ not matched!
 
 
 
-=== TEST 6: UTF-8 mode without UTF-8 sequence checks
+=== TEST 7: UTF-8 mode without UTF-8 sequence checks
 --- config
     location /re {
         content_by_lua '
@@ -149,7 +176,7 @@ exec opts: 2000
 
 
 
-=== TEST 7: UTF-8 mode with UTF-8 sequence checks
+=== TEST 8: UTF-8 mode with UTF-8 sequence checks
 --- config
     location /re {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/050-gmatch-dfa.t b/debian/modules/nginx-lua/t/050-gmatch-dfa.t
index c6b87e1..d2ac2bc 100644
--- a/debian/modules/nginx-lua/t/050-gmatch-dfa.t
+++ b/debian/modules/nginx-lua/t/050-gmatch-dfa.t
@@ -23,6 +23,7 @@ __DATA__
             for m in ngx.re.gmatch("hello, halo", "h[a-z]|h[a-z][a-z]", "d") do
                 if m then
                     ngx.say(m[0])
+                    ngx.say(m[1])
                 else
                     ngx.say("not matched: ", m)
                 end
@@ -33,7 +34,9 @@ __DATA__
     GET /re
 --- response_body
 hel
+nil
 hal
+nil
 
 
 
@@ -286,3 +289,50 @@ exec opts: 0
 --- no_error_log
 [error]
 
+
+
+=== TEST 13: gmatched with submatch captures
+--- config
+    location /re {
+        content_by_lua '
+            for m in  ngx.re.gmatch("hello", "(he|hell)", "d") do
+                if m then
+                    ngx.say(m[0])
+                    ngx.say(m[1])
+                    ngx.say(m[2])
+                else
+                    ngx.say("not matched!")
+                end
+            end
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hell
+nil
+nil
+
+
+
+=== TEST 14: gmatched with submatch captures (compile once)
+--- config
+    location /re {
+        content_by_lua '
+            for m in  ngx.re.gmatch("hello", "(he|hell)", "od") do
+                if m then
+                    ngx.say(m[0])
+                    ngx.say(m[1])
+                    ngx.say(m[2])
+                else
+                    ngx.say("not matched!")
+                end
+            end
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hell
+nil
+nil
diff --git a/debian/modules/nginx-lua/t/052-sub-dfa.t b/debian/modules/nginx-lua/t/052-sub-dfa.t
index f4de4d2..254913b 100644
--- a/debian/modules/nginx-lua/t/052-sub-dfa.t
+++ b/debian/modules/nginx-lua/t/052-sub-dfa.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 6);
+plan tests => repeat_each() * (blocks() * 2 + 8);
 
 #no_diff();
 no_long_string();
@@ -198,3 +198,38 @@ s: a好
 --- no_error_log
 [error]
 
+
+
+=== TEST 9: sub with d
+--- config
+    location /re {
+        content_by_lua '
+            ngx.say(ngx.re.sub("hello", "(he|hell)", function (m) ngx.say(m[0]) ngx.say(m[1]) return "x" end, "d"))
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hell
+nil
+xo1
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: sub with d + o
+--- config
+    location /re {
+        content_by_lua '
+            ngx.say(ngx.re.sub("hello", "(he|hell)", function (m) ngx.say(m[0]) ngx.say(m[1]) return "x" end, "do"))
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hell
+nil
+xo1
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/054-gsub-dfa.t b/debian/modules/nginx-lua/t/054-gsub-dfa.t
index 9c471a9..937aa1c 100644
--- a/debian/modules/nginx-lua/t/054-gsub-dfa.t
+++ b/debian/modules/nginx-lua/t/054-gsub-dfa.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 5);
+plan tests => repeat_each() * (blocks() * 2 + 7);
 
 #no_diff();
 no_long_string();
@@ -199,3 +199,38 @@ s: aa
 --- no_error_log
 [error]
 
+
+
+=== TEST 9: gsub with d
+--- config
+    location /re {
+        content_by_lua '
+            ngx.say(ngx.re.gsub("hello", "(he|hell)", function (m) ngx.say(m[0]) ngx.say(m[1]) return "x" end, "d"))
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hell
+nil
+xo1
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: gsub with d + o
+--- config
+    location /re {
+        content_by_lua '
+            ngx.say(ngx.re.gsub("hello", "(he|hell)", function (m) ngx.say(m[0]) ngx.say(m[1]) return "x" end, "do"))
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+hell
+nil
+xo1
+--- 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 3368589..b9e4175 100644
--- a/debian/modules/nginx-lua/t/058-tcp-socket.t
+++ b/debian/modules/nginx-lua/t/058-tcp-socket.t
@@ -432,7 +432,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(?: \(\d+: Operation timed out\))?
+^failed to connect: blah-blah-not-found\.agentzh\.org could not be resolved(?: \(\d+: (?:Operation timed out|Host not found)\))?
 connected: nil
 failed to send request: closed$
 --- error_log
diff --git a/debian/modules/nginx-lua/t/059-unix-socket.t b/debian/modules/nginx-lua/t/059-unix-socket.t
index 9e9e6df..b06ba6e 100644
--- a/debian/modules/nginx-lua/t/059-unix-socket.t
+++ b/debian/modules/nginx-lua/t/059-unix-socket.t
@@ -134,3 +134,70 @@ received: foo
 failed to receive a line: closed
 close: 1 nil
 
+
+
+=== TEST 4: ngx.socket.stream
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
+        default_type 'text/plain';
+
+        server_tokens off;
+        location /foo {
+            content_by_lua_block { ngx.say("foo") }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    location /test {
+        content_by_lua_block {
+            local sock = ngx.socket.stream()
+            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)
+        }
+    }
+--- 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: 1 nil
diff --git a/debian/modules/nginx-lua/t/062-count.t b/debian/modules/nginx-lua/t/062-count.t
index c94491c..a24611c 100644
--- a/debian/modules/nginx-lua/t/062-count.t
+++ b/debian/modules/nginx-lua/t/062-count.t
@@ -212,7 +212,7 @@ n = 2
 --- request
 GET /test
 --- response_body
-n = 3
+n = 4
 --- no_error_log
 [error]
 
@@ -343,7 +343,7 @@ n = 3
 --- request
 GET /test
 --- response_body
-n = 5
+n = 6
 --- no_error_log
 [error]
 
diff --git a/debian/modules/nginx-lua/t/081-bytecode.t b/debian/modules/nginx-lua/t/081-bytecode.t
index 93139e2..cb50e94 100644
--- a/debian/modules/nginx-lua/t/081-bytecode.t
+++ b/debian/modules/nginx-lua/t/081-bytecode.t
@@ -314,3 +314,60 @@ ngx.status = 201 ngx.say("hello from Lua!")
 [error]
 --- error_code: 201
 
+
+
+=== TEST 9: bytecode (not stripped)
+--- config
+    location = /t {
+        content_by_lua_block {
+            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
+            local bc = string.dump(f)
+            local f = assert(io.open("t/servroot/html/a.luac", "w"))
+            f:write(bc)
+            f:close()
+        }
+    }
+
+    location = /t2 {
+        content_by_lua_file html/a.luac;
+    }
+
+    location = /main {
+        echo_location /t;
+        echo_location /t2;
+    }
+--- request
+GET /main
+--- response_body
+a = 1
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: bytecode (stripped)
+--- config
+    location = /t {
+        content_by_lua_block {
+            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
+            local bc = string.dump(f, true)
+            local f = assert(io.open("t/servroot/html/a.luac", "w"))
+            f:write(bc)
+            f:close()
+        }
+    }
+
+    location = /t2 {
+        content_by_lua_file html/a.luac;
+    }
+
+    location = /main {
+        echo_location /t;
+        echo_location /t2;
+    }
+--- request
+GET /main
+--- response_body
+a = 1
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/101-on-abort.t b/debian/modules/nginx-lua/t/101-on-abort.t
index bb74204..81cec78 100644
--- a/debian/modules/nginx-lua/t/101-on-abort.t
+++ b/debian/modules/nginx-lua/t/101-on-abort.t
@@ -107,6 +107,7 @@ lua req cleanup
 delete thread 2
 delete thread 1
 
+--- wait: 0.1
 --- timeout: 0.2
 --- abort
 --- ignore_response
diff --git a/debian/modules/nginx-lua/t/106-timer.t b/debian/modules/nginx-lua/t/106-timer.t
index 5cfc01b..d0f6f36 100644
--- a/debian/modules/nginx-lua/t/106-timer.t
+++ b/debian/modules/nginx-lua/t/106-timer.t
@@ -2141,7 +2141,6 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])
             end
             ngx.say("registered timer")
         ';
-        log_by_lua return;
     }
 --- request
 GET /t
diff --git a/debian/modules/nginx-lua/t/114-config.t b/debian/modules/nginx-lua/t/114-config.t
index e6d75fc..9d6680d 100644
--- a/debian/modules/nginx-lua/t/114-config.t
+++ b/debian/modules/nginx-lua/t/114-config.t
@@ -1,4 +1,5 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
+
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
@@ -30,3 +31,18 @@ GET /t
 --- no_error_log
 [error]
 
+
+
+=== TEST 2: ngx.config.subystem
+--- config
+    location /t {
+        content_by_lua '
+            ngx.say("subsystem: ", ngx.config.subsystem)
+        ';
+    }
+--- request
+GET /t
+--- response_body
+subsystem: http
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/116-raw-req-socket.t b/debian/modules/nginx-lua/t/116-raw-req-socket.t
index c2ff8f7..6518f0e 100644
--- a/debian/modules/nginx-lua/t/116-raw-req-socket.t
+++ b/debian/modules/nginx-lua/t/116-raw-req-socket.t
@@ -783,7 +783,6 @@ server: failed to get raw req socket: pending request body reading in some other
 
 
 === TEST 15: read chunked request body with raw req socket
---- main_config
 --- config
     location = /t {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/138-balancer.t b/debian/modules/nginx-lua/t/138-balancer.t
index 076465a..e44cf8e 100644
--- a/debian/modules/nginx-lua/t/138-balancer.t
+++ b/debian/modules/nginx-lua/t/138-balancer.t
@@ -302,3 +302,106 @@ I am in phase balancer
 qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"}
 --- no_error_log
 [error]
+
+
+
+=== TEST 12: code cache off
+--- http_config
+    lua_package_path "t/servroot/html/?.lua;;";
+
+    lua_code_cache off;
+
+    upstream backend {
+        server 127.0.0.1:$TEST_NGINX_SERVER_PORT;
+        balancer_by_lua_block {
+            require("test")
+        }
+    }
+--- config
+    location = /t {
+        echo_location /main;
+        echo_location /update;
+        echo_location /main;
+    }
+
+    location = /update {
+        content_by_lua_block {
+            -- os.execute("(echo HERE; pwd) > /dev/stderr")
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            f:write("print('me: ', 101)")
+            f:close()
+            ngx.say("updated")
+        }
+    }
+
+    location = /main {
+        proxy_pass http://backend/back;
+    }
+
+    location = /back {
+        echo ok;
+    }
+--- request
+    GET /t
+--- user_files
+>>> test.lua
+print("me: ", 32)
+return {}
+--- response_body
+ok
+updated
+ok
+--- grep_error_log eval: qr/\bme: \w+/
+--- grep_error_log_out
+me: 32
+me: 101
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: lua subrequests
+--- http_config
+    lua_package_path "t/servroot/html/?.lua;;";
+
+    lua_code_cache off;
+
+    upstream backend {
+        server 127.0.0.1:$TEST_NGINX_SERVER_PORT;
+        balancer_by_lua_block {
+            print("ctx counter: ", ngx.ctx.count)
+            if not ngx.ctx.count then
+                ngx.ctx.count = 1
+            else
+                ngx.ctx.count = ngx.ctx.count + 1
+            end
+        }
+    }
+--- config
+    location = /t {
+        content_by_lua_block {
+            local res = ngx.location.capture("/main")
+            ngx.print(res.body)
+            res = ngx.location.capture("/main")
+            ngx.print(res.body)
+        }
+    }
+
+    location = /main {
+        proxy_pass http://backend/back;
+    }
+
+    location = /back {
+        echo ok;
+    }
+--- request
+    GET /t
+--- response_body
+ok
+ok
+--- grep_error_log eval: qr/\bctx counter: \w+/
+--- grep_error_log_out
+ctx counter: nil
+ctx counter: nil
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/140-ssl-c-api.t b/debian/modules/nginx-lua/t/140-ssl-c-api.t
new file mode 100644
index 0000000..9812de2
--- /dev/null
+++ b/debian/modules/nginx-lua/t/140-ssl-c-api.t
@@ -0,0 +1,363 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+repeat_each(3);
+
+# All these tests need to have new openssl
+my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
+my $openssl_version = eval { `$NginxBinary -V 2>&1` };
+
+if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
+    plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
+} else {
+    plan tests => repeat_each() * (blocks() * 5);
+}
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+
+#log_level 'warn';
+log_level 'debug';
+
+no_long_string();
+#no_diff();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple cert + private key
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block {
+            collectgarbage()
+
+            local ffi = require "ffi"
+
+            ffi.cdef[[
+                int ngx_http_lua_ffi_cert_pem_to_der(const unsigned char *pem,
+                    size_t pem_len, unsigned char *der, char **err);
+
+                int ngx_http_lua_ffi_priv_key_pem_to_der(const unsigned char *pem,
+                    size_t pem_len, unsigned char *der, char **err);
+
+                int ngx_http_lua_ffi_ssl_set_der_certificate(void *r,
+                    const char *data, size_t len, char **err);
+
+                int ngx_http_lua_ffi_ssl_set_der_private_key(void *r,
+                    const char *data, size_t len, char **err);
+
+                int ngx_http_lua_ffi_ssl_clear_certs(void *r, char **err);
+            ]]
+
+            local errmsg = ffi.new("char *[1]")
+
+            local r = getfenv(0).__ngx_req
+            if not r then
+                ngx.log(ngx.ERR, "no request found")
+                return
+            end
+
+            ffi.C.ngx_http_lua_ffi_ssl_clear_certs(r, errmsg)
+
+            local f = assert(io.open("t/cert/test.crt", "rb"))
+            local cert = f:read("*all")
+            f:close()
+
+            local out = ffi.new("char [?]", #cert)
+
+            local rc = ffi.C.ngx_http_lua_ffi_cert_pem_to_der(cert, #cert, out, errmsg)
+            if rc < 1 then
+                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            local cert_der = ffi.string(out, rc)
+
+            local rc = ffi.C.ngx_http_lua_ffi_ssl_set_der_certificate(r, cert_der, #cert_der, errmsg)
+            if rc ~= 0 then
+                ngx.log(ngx.ERR, "failed to set DER cert: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            f = assert(io.open("t/cert/test.key", "rb"))
+            local pkey = f:read("*all")
+            f:close()
+
+            out = ffi.new("char [?]", #pkey)
+
+            local rc = ffi.C.ngx_http_lua_ffi_priv_key_pem_to_der(pkey, #pkey, out, errmsg)
+            if rc < 1 then
+                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            local pkey_der = ffi.string(out, rc)
+
+            local rc = ffi.C.ngx_http_lua_ffi_ssl_set_der_private_key(r, pkey_der, #pkey_der, errmsg)
+            if rc ~= 0 then
+                ngx.log(ngx.ERR, "failed to set DER priv key: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+        }
+
+        ssl_certificate ../../cert/test2.crt;
+        ssl_certificate_key ../../cert/test2.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 2: ECDSA cert + private key
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block {
+            collectgarbage()
+
+            local ffi = require "ffi"
+
+            ffi.cdef[[
+                int ngx_http_lua_ffi_cert_pem_to_der(const unsigned char *pem,
+                    size_t pem_len, unsigned char *der, char **err);
+
+                int ngx_http_lua_ffi_priv_key_pem_to_der(const unsigned char *pem,
+                    size_t pem_len, unsigned char *der, char **err);
+
+                int ngx_http_lua_ffi_ssl_set_der_certificate(void *r,
+                    const char *data, size_t len, char **err);
+
+                int ngx_http_lua_ffi_ssl_set_der_private_key(void *r,
+                    const char *data, size_t len, char **err);
+
+                int ngx_http_lua_ffi_ssl_clear_certs(void *r, char **err);
+            ]]
+
+            local errmsg = ffi.new("char *[1]")
+
+            local r = getfenv(0).__ngx_req
+            if not r then
+                ngx.log(ngx.ERR, "no request found")
+                return
+            end
+
+            ffi.C.ngx_http_lua_ffi_ssl_clear_certs(r, errmsg)
+
+            local f = assert(io.open("t/cert/test_ecdsa.crt", "rb"))
+            local cert = f:read("*all")
+            f:close()
+
+            local out = ffi.new("char [?]", #cert)
+
+            local rc = ffi.C.ngx_http_lua_ffi_cert_pem_to_der(cert, #cert, out, errmsg)
+            if rc < 1 then
+                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            local cert_der = ffi.string(out, rc)
+
+            local rc = ffi.C.ngx_http_lua_ffi_ssl_set_der_certificate(r, cert_der, #cert_der, errmsg)
+            if rc ~= 0 then
+                ngx.log(ngx.ERR, "failed to set DER cert: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            f = assert(io.open("t/cert/test_ecdsa.key", "rb"))
+            local pkey = f:read("*all")
+            f:close()
+
+            out = ffi.new("char [?]", #pkey)
+
+            local rc = ffi.C.ngx_http_lua_ffi_priv_key_pem_to_der(pkey, #pkey, out, errmsg)
+            if rc < 1 then
+                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            local pkey_der = ffi.string(out, rc)
+
+            local rc = ffi.C.ngx_http_lua_ffi_ssl_set_der_private_key(r, pkey_der, #pkey_der, errmsg)
+            if rc ~= 0 then
+                ngx.log(ngx.ERR, "failed to set DER priv key: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+        }
+
+        ssl_certificate ../../cert/test2.crt;
+        ssl_certificate_key ../../cert/test2.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test_ecdsa.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+
+--- no_error_log
+[error]
+[alert]
diff --git a/debian/modules/nginx-lua/t/cert/test2.crt b/debian/modules/nginx-lua/t/cert/test2.crt
new file mode 100644
index 0000000..edc3b0d
--- /dev/null
+++ b/debian/modules/nginx-lua/t/cert/test2.crt
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIIChzCCAfACCQDjCkJpJUtZmjANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28x
+EjAQBgNVBAoMCU9wZW5SZXN0eTESMBAGA1UEAwwJdGVzdDIuY29tMSIwIAYJKoZI
+hvcNAQkBFhNvcGVucmVzdHlAZ21haWwuY29tMCAXDTE0MDkxMzAwMTgxMFoYDzIx
+MTQwODIwMDAxODEwWjCBhjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3Ju
+aWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xEjAQBgNVBAoMCU9wZW5SZXN0eTES
+MBAGA1UEAwwJdGVzdDIuY29tMSIwIAYJKoZIhvcNAQkBFhNvcGVucmVzdHlAZ21h
+aWwuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDy+OVI2u5NBOeB2Cyz
+Gnwy9b7Ao4CSi05XtUxh2IoVdzYZz6c4PFb9C1ad52LDdRStiQT5A7+RKLj6Kr7f
+JrKFziJxMy4g4Kdn9G659vE7CWu/UAVjRUtc+mTBAEfjdbumizmHLG7DmnNhGl3R
+NGiVNLsUInSMGfUlJRzZJXhI4QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAEMmRvyN
+N7uE24Tc6TR19JadNHK8g3YGktRoXWiqd/y0HY4NRPgvnK/nX7CY/wXa1j+uDO8K
+e6/Ldm5RZrjtvfHJmTSAu8zkqTJz8bqRDH7kzL5Ni2Ky2x8r9dtB0ImpOiSlwvZN
+snMvbrxEdwBiqlC9prV2f9aG+ACo1KnPL0j6
+-----END CERTIFICATE-----
diff --git a/debian/modules/nginx-lua/t/cert/test2.key b/debian/modules/nginx-lua/t/cert/test2.key
new file mode 100644
index 0000000..82ce6ce
--- /dev/null
+++ b/debian/modules/nginx-lua/t/cert/test2.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDy+OVI2u5NBOeB2CyzGnwy9b7Ao4CSi05XtUxh2IoVdzYZz6c4
+PFb9C1ad52LDdRStiQT5A7+RKLj6Kr7fJrKFziJxMy4g4Kdn9G659vE7CWu/UAVj
+RUtc+mTBAEfjdbumizmHLG7DmnNhGl3RNGiVNLsUInSMGfUlJRzZJXhI4QIDAQAB
+AoGAEqBB83PVENJvbOTFiHVfUAjGtr3R/Wnwd4jOcjHHZB3fZ9sjVoxJntxfp3s1
+dwZir2rxlqVS6i3VAFiGiVTOGo2Vvzhw2J7f58twCECmnLb2f863AkGEYe4dAndD
+GHGD0WI0CBMD1sT18YCj561o0Wol5deWH0gM9pr2N3HkeIECQQD6hUKFlFhrpaHP
+WNJsl6BxgE6pB5kxLcMcpIQ7P+kHUvtyvCJl5QZJqPrpPGjRsAI5Ph92rpsp/zDp
+/IZNWGVjAkEA+Ele31Rt+XbV32MrLKZgBDBk+Pzss5LTn9fZ5v1k/7hrMk2VVWvk
+AD6n5QiGe/g59woANpPb1T9l956SBf0d6wJABTXOS17pc9uvANP1FGMW6CVl/Wf2
+DKrJ+weE5IKQwyE7r4gwIvRfbBrClSU3fNzvPueG2f4JphbzmnoxBNzIxwJAYivY
+mGNwzHehXx99/byXMHDWK+EN0n8WsBgP75Z3rekEcbJdfpYXY8Via1vwmOnwOW65
+4NqbzHix37PSNw37GwJBALxaGNpREO2Tk+oWOvsD2QyviMVae3mXAJHc6nLVdKDM
+q0YvDT6VdeNYYFTkAuzJacsVXOpn6AnUMFj0OBedMhc=
+-----END RSA PRIVATE KEY-----
diff --git a/debian/modules/nginx-lua/t/cert/test_ecdsa.crt b/debian/modules/nginx-lua/t/cert/test_ecdsa.crt
new file mode 100644
index 0000000..b3e1e9f
--- /dev/null
+++ b/debian/modules/nginx-lua/t/cert/test_ecdsa.crt
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBtDCCAVoCCQD0QJnL8zpA0jAKBggqhkjOPQQDAjBhMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzESMBAG
+A1UECgwJT3BlblJlc3R5MREwDwYDVQQDDAh0ZXN0LmNvbTAgFw0xNTA3MTcyMTUx
+NDFaGA8yMTE1MDYyMzIxNTE0MVowYTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
+bGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xEjAQBgNVBAoMCU9wZW5S
+ZXN0eTERMA8GA1UEAwwIdGVzdC5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AAT/OtGmlIlbtvvJ3OP0dm5lyEMCrMnpDTDjwBPnUZ2f+16LCmNsdtEJ0r0Sd4GM
+o4Lss2JpwzPy2SLGEj3KwGKSMAoGCCqGSM49BAMCA0gAMEUCIQDbNwDkq1FiqcRD
+XdbP1MPAc33N2IK9EDIfMgJ0nTL82wIgNZiL4xvCQe9UA0zC+JqHLnVCQHYAM9kI
+BbvzNrt0hEM=
+-----END CERTIFICATE-----
diff --git a/debian/modules/nginx-lua/t/cert/test_ecdsa.key b/debian/modules/nginx-lua/t/cert/test_ecdsa.key
new file mode 100644
index 0000000..46eb72c
--- /dev/null
+++ b/debian/modules/nginx-lua/t/cert/test_ecdsa.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0vwBPGgv1hE6RnQo
+3imyoceR+5dLsKegodOlBwnWtbuhRANCAAT/OtGmlIlbtvvJ3OP0dm5lyEMCrMnp
+DTDjwBPnUZ2f+16LCmNsdtEJ0r0Sd4GMo4Lss2JpwzPy2SLGEj3KwGKS
+-----END PRIVATE KEY-----
diff --git a/debian/modules/nginx-lua/util/build2.sh b/debian/modules/nginx-lua/util/build.sh
similarity index 100%
rename from debian/modules/nginx-lua/util/build2.sh
rename to debian/modules/nginx-lua/util/build.sh

From fd1a40a6f89e94a118ed1fe550d330c6ccce9606 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 12 Feb 2016 14:47:59 +0200
Subject: [PATCH 032/600] Update Vcs field with secure links

Fixes vcs-field-uses-insecure-uri

https://lintian.debian.org/tags/vcs-field-uses-insecure-uri.html
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 7c60e5f..d96788e 100644
--- a/debian/control
+++ b/debian/control
@@ -26,8 +26,8 @@ Build-Depends: autotools-dev,
                zlib1g-dev
 Standards-Version: 3.9.6.0
 Homepage: http://nginx.net
-Vcs-Git: git://anonscm.debian.org/collab-maint/nginx.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/nginx.git;a=summary
+Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/nginx.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nginx.git
 
 Package: nginx
 Architecture: all

From 7b00376f31ef3b908921f594ef14fa4d61864012 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 29 Mar 2016 13:20:16 +0300
Subject: [PATCH 033/600] Bump Standards-Version to 3.9.7.0 (no changes needed)

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d96788e..f43fe4f 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: autotools-dev,
                libxslt1-dev,
                po-debconf,
                zlib1g-dev
-Standards-Version: 3.9.6.0
+Standards-Version: 3.9.7.0
 Homepage: http://nginx.net
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/nginx.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nginx.git

From a50cd439eb4f8d5ad8c2519e0914d00b49a5ee23 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Mar 2016 13:38:53 +0300
Subject: [PATCH 034/600] Add documentation option to systemd unit

Fixes systemd-service-file-missing-documentation-key lintian check.
---
 debian/nginx-common.nginx.service | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/nginx-common.nginx.service b/debian/nginx-common.nginx.service
index 0da034d..a909641 100644
--- a/debian/nginx-common.nginx.service
+++ b/debian/nginx-common.nginx.service
@@ -12,6 +12,7 @@
 #
 [Unit]
 Description=A high performance web server and a reverse proxy server
+Documentation=man:nginx(8)
 After=network.target
 
 [Service]

From 44b30c100a3bcf9b4b6a89910aa4d989a5e1c46b Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 12 Feb 2016 14:27:46 +0200
Subject: [PATCH 035/600] Disable PIE hardening flags for now, it breaks
 dynamic libraries

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 1cdef59..c18af76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS)
 

From 7a5fa94b9d190bedabcdada1cdd6ca91fb5e0ef3 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 23 Mar 2016 16:36:44 +0200
Subject: [PATCH 036/600] Setup modules-{enabled,available} directories

Modules have to be declared with top-level includes
---
 debian/conf/nginx.conf   | 1 +
 debian/nginx-common.dirs | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index 01a4a21..6e57ea9 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -1,6 +1,7 @@
 user www-data;
 worker_processes auto;
 pid /run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
 
 events {
 	worker_connections 768;
diff --git a/debian/nginx-common.dirs b/debian/nginx-common.dirs
index d75dabf..8ee01f5 100644
--- a/debian/nginx-common.dirs
+++ b/debian/nginx-common.dirs
@@ -1,6 +1,8 @@
 etc/nginx
 etc/nginx/sites-available
 etc/nginx/sites-enabled
+etc/nginx/modules-available
+etc/nginx/modules-enabled
 etc/nginx/conf.d
 etc/ufw/applications.d
 usr/share/nginx

From 916384bde3a24d93cf2434687520429ea6855d27 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 23 Mar 2016 16:43:07 +0200
Subject: [PATCH 037/600] Setup libnginx-mod packaging flow

We introduce a dh_nginx helper script. For now dh_nginx
will only be used in the nginx source but when are confident
about it will ship it in a nginx-dev package.
---
 debian/autoscripts/postinst-nginx  |  11 ++
 debian/autoscripts/postrm-nginx    |  11 ++
 debian/autoscripts/prerm-nginx     |  11 ++
 debian/dh_nginx                    | 278 +++++++++++++++++++++++++++++
 debian/libnginx-mod.nginx.skeleton |  13 ++
 debian/nginx-common.links          |   1 +
 debian/rules                       |  10 +-
 7 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 debian/autoscripts/postinst-nginx
 create mode 100644 debian/autoscripts/postrm-nginx
 create mode 100644 debian/autoscripts/prerm-nginx
 create mode 100755 debian/dh_nginx
 create mode 100755 debian/libnginx-mod.nginx.skeleton
 create mode 100644 debian/nginx-common.links

diff --git a/debian/autoscripts/postinst-nginx b/debian/autoscripts/postinst-nginx
new file mode 100644
index 0000000..565015b
--- /dev/null
+++ b/debian/autoscripts/postinst-nginx
@@ -0,0 +1,11 @@
+for conf in #NAMES# ; do
+	# Symlink on fresh installations
+	if [ -z "$2" ]; then
+		ln -sf /usr/share/nginx/modules-available/$conf \
+			/etc/nginx/modules-enabled/$conf
+	fi
+done
+
+if [ -s /run/nginx.pid ]; then
+	nginx -s reload
+fi
diff --git a/debian/autoscripts/postrm-nginx b/debian/autoscripts/postrm-nginx
new file mode 100644
index 0000000..60b0493
--- /dev/null
+++ b/debian/autoscripts/postrm-nginx
@@ -0,0 +1,11 @@
+if [ "$1" = "purge" ] ; then
+	for conf in #NAMES# ; do
+		if [ -e /etc/nginx/etc/nginx/modules-enabled/$conf ]; then
+			rm /etc/nginx/etc/nginx/modules-enabled/$conf
+		fi
+	done
+
+	if [ -s /run/nginx.pid ]; then
+		nginx -s reload
+        fi
+fi
diff --git a/debian/autoscripts/prerm-nginx b/debian/autoscripts/prerm-nginx
new file mode 100644
index 0000000..efeaae8
--- /dev/null
+++ b/debian/autoscripts/prerm-nginx
@@ -0,0 +1,11 @@
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+	for conf in #NAMES# ; do
+		if [ -e /etc/nginx/etc/nginx/modules-enabled/$conf ]; then
+			rm /etc/nginx/etc/nginx/modules-enabled/$conf
+		fi
+	done
+
+	if [ -s /run/nginx.pid ]; then
+		nginx -s reload
+	fi
+fi
diff --git a/debian/dh_nginx b/debian/dh_nginx
new file mode 100755
index 0000000..26dedb2
--- /dev/null
+++ b/debian/dh_nginx
@@ -0,0 +1,278 @@
+#! /usr/bin/perl
+
+# dh_nginx - Nginx configuration helper
+# Copyright (C) 2016 Christos Trochalakis <yatiohi@ideopolis.gr>
+#
+# This program is licensed under the terms of the GNU General
+# Public License veserion 2+
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+use strict;
+use File::Find;
+use Debian::Debhelper::Dh_Lib;
+
+
+=head1 NAME
+
+dh_nginx - register configuration snippets to the nginx web server
+
+=cut
+
+sub nginx_depends
+{
+	return 'nginx-light (= ${binary:Version}) |nginx-full (= ${binary:Version}) | nginx-extras (= ${binary:Version})'
+}
+
+sub nginx_api_installdir
+{
+	return "/usr/lib/nginx/modules/";
+}
+
+sub nginx_modules_conf_installdir
+{
+	return "usr/share/nginx/modules-available/"
+}
+
+=head1 SYNOPSIS
+
+B<dh_nginx> [S<I<debhelper options>>] [B<-n>|B<--noscripts>]
+
+=head1 DESCRIPTION
+
+B<dh_nginx> is a debhelper program that is responsible for correctly installing
+Nginx configuration snippets and setting postinst, prerm and dependencies in
+Nginx web server modules and web applications.
+
+It supports the following configuration types
+
+=over 4
+
+=item *
+Nginx modules
+
+=head1 INVOCATION
+
+  %:
+     dh $@ --with nginx
+
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.nginx
+
+=item debian/nginx
+
+=back
+
+Lists files to be registered with the Nginx HTTP server. The file is
+interpreted as line separated list of installation stanzas, where each entry
+consists of whitespace separated values conforming to the file semantics below.
+
+=head2 FILE SEMANTICS
+
+Each line consists of a triple
+
+I<type> I<file> [I<arguments>]
+
+where the values are interpreted as follows:
+
+
+=head3 I<type>
+
+Denotes the type of file to be installed. Recognized values are B<mod> for
+Nginx modules.
+
+=head3 I<file>
+
+Is interpreted as existing file name within the source package. No path
+expansion is effectuated. Just like L<dh_install(1)>, B<dh_nginx> can not
+rename files.
+
+=head3 I<arguments>
+
+Is inrerpreted as optional arguments if any, currently not used.
+
+=head2 MODULES
+
+Modules are handled specially and are determined by the B<mod> type. Modules must
+have a I<.conf> suffix. In that case the file is interpreted as module load
+file and is installed to I</etc/nginx/modules-available>. If the file is ending
+with a I<.so> suffix it is interpreted as actual module shared object and is
+installed to the Nginx module directory. Moreover, if a I<.load> file is
+installed the configuration is activated in the maintainer script at
+installation time.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-e>, B<--noenable>
+
+Install maintainer scripts accordingly, but do not enable the scripts or
+configuration by default.
+
+=item B<-n>, B<--noscripts>
+
+Do not modify F<postinst>/F<postrm>/F<prerm> maintainer scripts.
+
+
+=back
+
+=head1 NOTES
+
+Note that this command is not idempotent. L<dh_prep(1)> should be called
+between invocations of this command. Otherwise, it may cause multiple
+instances of the same text to be added to maintainer scripts.
+
+=head1 AUTHOR
+
+This manual and L<dh_nginx> was written by Christos Trochalakis.
+dh_nginx is heavily influnced by dh_apache2 written by Arno Toell
+<debian@toell.net>.
+
+=cut
+
+
+##
+## main code starts here
+##
+
+init(options => {
+	"e|noenable" => \$dh{NOENABLE},
+});
+
+foreach my $package ((@{$dh{DOPACKAGES}}))
+{
+	my %PACKAGE_TYPE = (
+		has_a_module => [],
+	);
+
+	my $file = pkgfile($package, "nginx");
+	my $tmp  = tmpdir($package);
+
+	my @files_to_register = filedoublearray($file, ".") if $file;
+	foreach my $line (@files_to_register)
+	{
+		my $type = lc(shift @{$line}) if $line->[0];
+		my $source = shift @{$line} if $line->[0];
+		my @arguments = map {"$_ "} @{$line};
+
+		$type = "modules" if $type eq "mod";
+		my $installdir = $tmp . "/" . nginx_modules_conf_installdir();
+
+		verbose_print("$type -- $source -- @arguments\n\n");
+
+		if ($type eq "modules")
+		{
+			my $basesource = basename($source);
+
+			if ($type eq "modules")
+			{
+				if ($basesource =~ m/\.conf$/)
+				{
+					my $enablename = $basesource;
+					push @{$PACKAGE_TYPE{'has_a_module'}}, $enablename;
+					verbose_print("Installing module configuration $enablename into $installdir\n");
+				}
+				elsif ($basesource =~ m/\.so$/)
+			{
+					my $modinstalldir = $tmp . "/" . nginx_api_installdir();
+					verbose_print("Installing module binary $source into $modinstalldir\n");
+					if (! -d $modinstalldir)
+					{
+						complex_doit("mkdir","-p", $modinstalldir);
+						complex_doit("chmod","755","$modinstalldir");
+					}
+					complex_doit("cp", $source, $modinstalldir);
+					next;
+				}
+
+				# TODO
+				error("module: \"$basesource\" needs .conf, .so or .load suffix") if $basesource !~ m/\.(conf|so)/;
+			}
+
+			if (! -d $installdir)
+			{
+				complex_doit("mkdir","-p",$installdir);
+				complex_doit("chmod","755","$installdir");
+			}
+			complex_doit("cp",$source,$installdir);
+			complex_doit("chmod","644","$installdir/$basesource");
+
+		}
+		else
+		{
+			error("Unknown parameter: $type\n");
+		}
+
+	}
+
+        my @postinst_autoscripts;
+
+        if ($#{$PACKAGE_TYPE{'has_a_module'}} >= 0)
+        {
+                if ($package !~ m/libnginx-mod-\w+?/)
+                {
+                        warning("Package $package appears to be an Nginx module. It should comply to the package naming scheme libnginx-mod-<modulename>\n");
+                }
+                addsubstvar($package, "misc:Depends", nginx_depends());
+
+                my $modules = "";
+                foreach my $module (@{$PACKAGE_TYPE{'has_a_module'}})
+                {
+                        $modules .= "$module ";
+                }
+
+                push @postinst_autoscripts, ["module", $modules];
+        }
+
+	if (! $dh{NOSCRIPTS})
+	{
+		foreach my $ref (@postinst_autoscripts)
+		{
+			for my $script_type (qw/postinst prerm postrm/)
+			{
+				if ($script_type eq "postinst" &&  $dh{NOENABLE})
+				{
+					next
+				}
+
+				my %replacements = (
+					NAMES  => $ref->[1],
+				);
+
+				my $sed_command = "";
+				foreach my $key (sort keys %replacements)
+				{
+					my $val = $replacements{$key};
+					# Use a control char as separator for sed, to
+					# reduce escaping issues. Everything else is
+					# passed verbatim, i.e. it must not contain any
+					# shell or sed special characters.
+					my $sep = "\x17";
+					$sed_command .= "s" . $sep . "#$key#" .
+							      $sep . $val .
+							      $sep . "g; ";
+				}
+
+				autoscript($package, "$script_type", "$script_type-nginx", $sed_command);
+			}
+		}
+	}
+}
+
+# vim: syntax=perl sw=8 sts=8 sr noet
diff --git a/debian/libnginx-mod.nginx.skeleton b/debian/libnginx-mod.nginx.skeleton
new file mode 100755
index 0000000..bf7936c
--- /dev/null
+++ b/debian/libnginx-mod.nginx.skeleton
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/;
+
+print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/nginx-common.links b/debian/nginx-common.links
new file mode 100644
index 0000000..ca651a5
--- /dev/null
+++ b/debian/nginx-common.links
@@ -0,0 +1 @@
+usr/lib/nginx/modules usr/share/nginx/modules
diff --git a/debian/rules b/debian/rules
index c18af76..8dd6eca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ common_configure_flags := \
 			--error-log-path=/var/log/nginx/error.log \
 			--lock-path=/var/lock/nginx.lock \
 			--pid-path=/run/nginx.pid \
+			--modules-path=/usr/lib/nginx/modules \
 			--http-client-body-temp-path=/var/lib/nginx/body \
 			--http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
 			--http-proxy-temp-path=/var/lib/nginx/proxy \
@@ -126,10 +127,14 @@ extras_configure_flags := \
 
 override_dh_auto_configure: $(foreach flavour,$(FLAVOURS),config.arch.$(flavour))
 override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour))
-override_dh_strip:          $(foreach flavour,$(FLAVOURS),strip.arch.$(flavour))
+override_dh_strip:          $(foreach flavour,$(FLAVOURS),strip.arch.$(flavour)) $(foreach mod,$(DYN_MODS),strip.mods.$(mod))
 override_dh_clean:          $(foreach flavour,$(FLAVOURS),clean.$(flavour))
 	dh_clean
 
+override_dh_install:
+	dh_install
+	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/autoscripts debian/dh_nginx
+
 override_dh_installinit:
 	dh_installinit --no-restart-on-upgrade --no-start --name=nginx
 
@@ -145,6 +150,9 @@ build.arch.%:
 strip.arch.%:
 	dh_strip --package=nginx-$(*) --dbg-package=nginx-$(*)-dbg
 
+strip.mods.%:
+	dh_strip --package=libnginx-mod-$(*) --automatic-dbgsym
+
 config.arch.%:
 	dh_testdir
 	mkdir -p $(BUILDDIR_$*)

From b231ba8f39ea52a6277f029bf1c8a9f75eb61796 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Mar 2016 16:22:08 +0300
Subject: [PATCH 038/600] dh_nginx: Modules depend on nginx-common for now

We will change that to nginx-binary when it's available.
---
 debian/dh_nginx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/dh_nginx b/debian/dh_nginx
index 26dedb2..2d7b942 100755
--- a/debian/dh_nginx
+++ b/debian/dh_nginx
@@ -33,7 +33,7 @@ dh_nginx - register configuration snippets to the nginx web server
 
 sub nginx_depends
 {
-	return 'nginx-light (= ${binary:Version}) |nginx-full (= ${binary:Version}) | nginx-extras (= ${binary:Version})'
+	return 'nginx-common (= ${source:Version})'
 }
 
 sub nginx_api_installdir

From d19e7548ee639c07ee534164d1be02d88ceba8d0 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 23 Mar 2016 16:44:39 +0200
Subject: [PATCH 039/600] Build libnginx-mod-* packages

---
 debian/control                                | 63 ++++++++++++++++++-
 debian/libnginx-mod-http-geoip.nginx          | 13 ++++
 debian/libnginx-mod-http-image-filter.nginx   | 13 ++++
 debian/libnginx-mod-http-xslt-filter.nginx    | 13 ++++
 debian/libnginx-mod-mail.nginx                | 13 ++++
 debian/libnginx-mod-stream.nginx              | 13 ++++
 debian/libnginx-mod.conf/mod-http-geoip.conf  |  1 +
 .../mod-http-image-filter.conf                |  1 +
 .../mod-http-xslt-filter.conf                 |  1 +
 debian/libnginx-mod.conf/mod-mail.conf        |  1 +
 debian/libnginx-mod.conf/mod-stream.conf      |  1 +
 debian/libnginx-mod.nginx.skeleton            |  2 +-
 debian/rules                                  | 21 ++++---
 13 files changed, 144 insertions(+), 12 deletions(-)
 create mode 100755 debian/libnginx-mod-http-geoip.nginx
 create mode 100755 debian/libnginx-mod-http-image-filter.nginx
 create mode 100755 debian/libnginx-mod-http-xslt-filter.nginx
 create mode 100755 debian/libnginx-mod-mail.nginx
 create mode 100755 debian/libnginx-mod-stream.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-geoip.conf
 create mode 100644 debian/libnginx-mod.conf/mod-http-image-filter.conf
 create mode 100644 debian/libnginx-mod.conf/mod-http-xslt-filter.conf
 create mode 100644 debian/libnginx-mod.conf/mod-mail.conf
 create mode 100644 debian/libnginx-mod.conf/mod-stream.conf

diff --git a/debian/control b/debian/control
index f43fe4f..49aacde 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,14 @@ Description: small, powerful, scalable web/proxy server - common files
 
 Package: nginx-full
 Architecture: any
-Depends: nginx-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: nginx-common (= ${source:Version}),
+         libnginx-mod-http-geoip (= ${binary:Version}),
+         libnginx-mod-http-image-filter (= ${binary:Version}),
+         libnginx-mod-http-xslt-filter (= ${binary:Version}),
+         libnginx-mod-mail (= ${binary:Version}),
+         libnginx-mod-stream (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
 Provides: httpd, httpd-cgi, nginx
 Conflicts: nginx-extras, nginx-light
@@ -164,6 +171,11 @@ Package: nginx-extras
 Architecture: any
 Priority: extra
 Depends: nginx-common (= ${source:Version}),
+         libnginx-mod-http-geoip (= ${binary:Version}),
+         libnginx-mod-http-image-filter (= ${binary:Version}),
+         libnginx-mod-http-xslt-filter (= ${binary:Version}),
+         libnginx-mod-mail (= ${binary:Version}),
+         libnginx-mod-stream (= ${binary:Version}),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
@@ -209,3 +221,52 @@ Description: nginx web/proxy server (extended version) - debugging symbols
  This package provides debugging symbols for nginx-extras, to assist in
  debugging issues that you may find. It should not be required for normal
  operation.
+
+Package: libnginx-mod-http-geoip
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: GeoIP HTTP module for Nginx
+ The ngx_http_geoip module creates variables with values depending on the
+ client IP address, using the precompiled MaxMind databases.
+ .
+ Those variables include country, region, city, latitude, longitude, postal
+ code, etc.
+
+Package: libnginx-mod-http-image-filter
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: HTTP image filter module for Nginx
+ The ngx_http_image_filter module is a filter that transforms images in JPEG,
+ GIF, and PNG formats.
+ .
+ The module supports filters such as rotate, resize, crop, quality, sharpening,
+ interlacing and more.
+
+Package: libnginx-mod-http-xslt-filter
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: XSLT Transformation module for Nginx
+ The ngx_http_xslt_filter module is a filter that transforms XML responses
+ using one or more XSLT stylesheets.
+ .
+ The transformation can be adjusted by setting the relevant configuration
+ parameters.
+
+Package: libnginx-mod-mail
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Mail module for Nginx
+ The nginx_mail module adds mail proxy support to nginx.
+ .
+ The module supports proxying all the standard mail protocols such as IMAP,
+ POP3 & SMTP.
+
+Package: libnginx-mod-stream
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Stream module for Nginx
+ The nginx_stream module adds stream proxy support to nginx.
+ .
+ Stream module supports loadbalancing & proxying to TCP servers. The module
+ also supports ACLs/connection limiting and configuring multiple operational
+ parameters.
diff --git a/debian/libnginx-mod-http-geoip.nginx b/debian/libnginx-mod-http-geoip.nginx
new file mode 100755
index 0000000..02c5edc
--- /dev/null
+++ b/debian/libnginx-mod-http-geoip.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-image-filter.nginx b/debian/libnginx-mod-http-image-filter.nginx
new file mode 100755
index 0000000..02c5edc
--- /dev/null
+++ b/debian/libnginx-mod-http-image-filter.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-xslt-filter.nginx b/debian/libnginx-mod-http-xslt-filter.nginx
new file mode 100755
index 0000000..02c5edc
--- /dev/null
+++ b/debian/libnginx-mod-http-xslt-filter.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-mail.nginx b/debian/libnginx-mod-mail.nginx
new file mode 100755
index 0000000..02c5edc
--- /dev/null
+++ b/debian/libnginx-mod-mail.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-stream.nginx b/debian/libnginx-mod-stream.nginx
new file mode 100755
index 0000000..02c5edc
--- /dev/null
+++ b/debian/libnginx-mod-stream.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-geoip.conf b/debian/libnginx-mod.conf/mod-http-geoip.conf
new file mode 100644
index 0000000..9721986
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-geoip.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_geoip_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-image-filter.conf b/debian/libnginx-mod.conf/mod-http-image-filter.conf
new file mode 100644
index 0000000..dfa2939
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-image-filter.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_image_filter_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-xslt-filter.conf b/debian/libnginx-mod.conf/mod-http-xslt-filter.conf
new file mode 100644
index 0000000..a4f87ac
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-xslt-filter.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_xslt_filter_module.so;
diff --git a/debian/libnginx-mod.conf/mod-mail.conf b/debian/libnginx-mod.conf/mod-mail.conf
new file mode 100644
index 0000000..cfd4a4d
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-mail.conf
@@ -0,0 +1 @@
+load_module modules/ngx_mail_module.so;
diff --git a/debian/libnginx-mod.conf/mod-stream.conf b/debian/libnginx-mod.conf/mod-stream.conf
new file mode 100644
index 0000000..f2b2657
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-stream.conf
@@ -0,0 +1 @@
+load_module modules/ngx_stream_module.so;
diff --git a/debian/libnginx-mod.nginx.skeleton b/debian/libnginx-mod.nginx.skeleton
index bf7936c..02c5edc 100755
--- a/debian/libnginx-mod.nginx.skeleton
+++ b/debian/libnginx-mod.nginx.skeleton
@@ -7,7 +7,7 @@ $module = basename($0, '.nginx');
 $module =~ s/^libnginx-mod-//;
 
 $modulepath = $module;
-$modulepath =~ s/-/_/;
+$modulepath =~ s/-/_/g;
 
 print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/rules b/debian/rules
index 8dd6eca..6f88edc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -70,16 +71,16 @@ full_configure_flags := \
 			$(common_configure_flags) \
 			--with-http_addition_module \
 			--with-http_dav_module \
-			--with-http_geoip_module \
+			--with-http_geoip_module=dynamic \
 			--with-http_gunzip_module \
 			--with-http_gzip_static_module \
-			--with-http_image_filter_module \
+			--with-http_image_filter_module=dynamic \
 			--with-http_v2_module \
 			--with-http_sub_module \
-			--with-http_xslt_module \
-			--with-stream \
+			--with-http_xslt_module=dynamic \
+			--with-stream=dynamic \
 			--with-stream_ssl_module \
-			--with-mail \
+			--with-mail=dynamic \
 			--with-mail_ssl_module \
 			--with-threads \
 			--add-module=$(MODULESDIR)/nginx-auth-pam \
@@ -93,20 +94,20 @@ extras_configure_flags := \
 			--with-http_addition_module \
 			--with-http_dav_module \
 			--with-http_flv_module \
-			--with-http_geoip_module \
+			--with-http_geoip_module=dynamic \
 			--with-http_gunzip_module \
 			--with-http_gzip_static_module \
-			--with-http_image_filter_module \
+			--with-http_image_filter_module=dynamic \
 			--with-http_mp4_module \
 			--with-http_perl_module \
 			--with-http_random_index_module \
 			--with-http_secure_link_module \
 			--with-http_v2_module \
 			--with-http_sub_module \
-			--with-http_xslt_module \
-			--with-mail \
+			--with-http_xslt_module=dynamic \
+			--with-mail=dynamic \
 			--with-mail_ssl_module \
-			--with-stream \
+			--with-stream=dynamic \
 			--with-stream_ssl_module \
 			--with-threads \
 			--add-module=$(MODULESDIR)/headers-more-nginx-module \

From 24ba8b51ef2d27d90ec3b0739ef099fb9cef8212 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 09:53:48 +0300
Subject: [PATCH 040/600] Make sure signature stays the same in all nginx
 builds

When a dyn module is loaded the signature of the module is compared to
the one of the nginx binary.

dyn modules are build from nginx-full, so in order to make them loadable
in other flavors we need to make sure all the binaries share the same
signature.

The signature is a vector computed from 33+3 parameters (src/core/ngx_module.h)
With this commit we align all nginx flavors to same signature vector.
---
 debian/control                                |  3 +-
 ...ure-stays-the-same-in-all-nginx-buil.patch | 30 +++++++++++++++++++
 debian/patches/series                         |  1 +
 debian/rules                                  | 11 +++----
 4 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch

diff --git a/debian/control b/debian/control
index 49aacde..2076f5c 100644
--- a/debian/control
+++ b/debian/control
@@ -148,7 +148,8 @@ Description: nginx web/proxy server (basic version)
  FastCGI, Map, Proxy, Rewrite.
  .
  OPTIONAL HTTP MODULES: Auth Request, Charset, Gzip, Gzip Precompression,
- Headers, Index, Log, Real IP, SSL, Stub Status, Upstream.
+ Headers, HTTP/2, Index, Log, Real IP, SSL, Stub Status, Thread Pool, WebDAV,
+ Upstream.
  .
  THIRD PARTY MODULES: Echo.
 
diff --git a/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch b/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
new file mode 100644
index 0000000..1bea8b2
--- /dev/null
+++ b/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
@@ -0,0 +1,30 @@
+From: Christos Trochalakis <yatiohi@ideopolis.gr>
+Date: Wed, 30 Mar 2016 09:47:11 +0300
+Subject: Make sure signature stays the same in all nginx builds
+
+NGX_HTTP_HEADERS is part of nginx signature. When a dyn
+modules is loaded the signature of the module is compared
+to the one of the nginx binary.
+
+dyn modules are build from nginx-full, so in order to make
+them loadable in other flavors we need to make sure all the
+binaries share the same signature.
+---
+ configure | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure b/configure
+index ceff15e..3816fa1 100755
+--- a/configure
++++ b/configure
+@@ -58,6 +58,10 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+     . auto/unix
+ fi
+ 
++# Debian
++# Make sure signature stays the same on all nginx flavors
++have=NGX_HTTP_HEADERS . auto/have
++
+ . auto/threads
+ . auto/modules
+ . auto/lib/conf
diff --git a/debian/patches/series b/debian/patches/series
index 73f535e..04b971f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 perl-use-dpkg-buildflags.patch
+0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
diff --git a/debian/rules b/debian/rules
index 6f88edc..f9db327 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,10 @@ common_configure_flags := \
 			--with-http_ssl_module \
 			--with-http_stub_status_module \
 			--with-http_realip_module \
-			--with-http_auth_request_module
+			--with-http_auth_request_module \
+			--with-http_v2_module \
+			--with-http_dav_module \
+			--with-threads
 
 light_configure_flags := \
 			$(common_configure_flags) \
@@ -70,19 +73,16 @@ light_configure_flags := \
 full_configure_flags := \
 			$(common_configure_flags) \
 			--with-http_addition_module \
-			--with-http_dav_module \
 			--with-http_geoip_module=dynamic \
 			--with-http_gunzip_module \
 			--with-http_gzip_static_module \
 			--with-http_image_filter_module=dynamic \
-			--with-http_v2_module \
 			--with-http_sub_module \
 			--with-http_xslt_module=dynamic \
 			--with-stream=dynamic \
 			--with-stream_ssl_module \
 			--with-mail=dynamic \
 			--with-mail_ssl_module \
-			--with-threads \
 			--add-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-module=$(MODULESDIR)/nginx-echo \
@@ -92,7 +92,6 @@ full_configure_flags := \
 extras_configure_flags := \
 			$(common_configure_flags) \
 			--with-http_addition_module \
-			--with-http_dav_module \
 			--with-http_flv_module \
 			--with-http_geoip_module=dynamic \
 			--with-http_gunzip_module \
@@ -102,14 +101,12 @@ extras_configure_flags := \
 			--with-http_perl_module \
 			--with-http_random_index_module \
 			--with-http_secure_link_module \
-			--with-http_v2_module \
 			--with-http_sub_module \
 			--with-http_xslt_module=dynamic \
 			--with-mail=dynamic \
 			--with-mail_ssl_module \
 			--with-stream=dynamic \
 			--with-stream_ssl_module \
-			--with-threads \
 			--add-module=$(MODULESDIR)/headers-more-nginx-module \
 			--add-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-module=$(MODULESDIR)/nginx-cache-purge \

From bba86a8f896aeecb716dde79ef3f2ba9fc86a092 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 10:00:33 +0300
Subject: [PATCH 041/600] tests: Test if nginx-light can successfully load
 dynamic modules

---
 debian/tests/control | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/tests/control b/debian/tests/control
index 8d0e384..881cc56 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -10,3 +10,6 @@ Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\
 Restrictions: allow-stderr isolation-container
 Depends: nginx-extras, curl
 
+Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+Restrictions: allow-stderr isolation-container
+Depends: nginx-light, libnginx-mod-stream, curl

From 830a8fbc342545e228baefbbb9f4f540d6fdd3f6 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 11:17:18 +0300
Subject: [PATCH 042/600] Sum up changes

---
 debian/changelog | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0f8009f..226b72b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,23 @@ nginx (1.9.11-1) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis ]
   * New upstream release (1.9.11) (Closes: #812806)
+  * debian:
+    + Setup dynamic module flow, and implement a simple dh_nginx helper for
+      internal use.
+    + Split modules in libnginx-mod-* packages.
+      Not all modules are ready for dynamic building.
+  * debian/control:
+    + Enable http/2, thread pool & WebDAV on nginx-light.
+      In order for dynamic modules to be loadable in all nginx flavors we need
+      to ensure the share the same build signature.
+    + Use secure VCS uri (lintian).
+    + Bump Standards to 3.9.7.
+  * debian/rules:
+    + Disable PIE for now so we can build dynamic modules.
+  * debian/tests/control:
+    + Test if modules are loadable in nginx-light.
+  * debian/nginx-common.nginx.service:
+    + Documentation points to nginx man page.
   * debian/modules/nginx-lua:
     + Update nginx-lua to v0.10.1rc0-5-g01727a3.
       Fixes buiding failures with nginx 1.9.11.

From 95448c85f548c75efe77f4433c6bb1f5a30e36b2 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 11:23:20 +0300
Subject: [PATCH 043/600] Imported Upstream version 1.9.12

---
 CHANGES                                       |  30 +++
 CHANGES.ru                                    |  29 +++
 auto/cc/conf                                  |  10 +
 auto/cc/msvc                                  |  31 ++-
 auto/cc/name                                  |  27 +-
 auto/install                                  |   5 +-
 auto/lib/md5/conf                             |   4 +-
 auto/lib/md5/make                             |   4 +-
 auto/lib/openssl/conf                         |  15 +-
 auto/lib/openssl/make                         |   2 +-
 auto/lib/pcre/conf                            |   4 +-
 auto/lib/pcre/make                            |   4 +-
 auto/lib/sha1/conf                            |   4 +-
 auto/lib/sha1/make                            |   4 +-
 auto/lib/zlib/conf                            |   4 +-
 auto/lib/zlib/make                            |   4 +-
 auto/make                                     |   4 +
 auto/modules                                  |   3 +-
 auto/unix                                     |   1 +
 src/core/nginx.c                              |  79 ++++--
 src/core/nginx.h                              |   4 +-
 src/core/ngx_cycle.h                          |   4 +-
 src/core/ngx_module.c                         |   2 +-
 src/core/ngx_module.h                         |   2 +-
 src/event/ngx_event_openssl.c                 |  15 +-
 .../modules/ngx_http_headers_filter_module.c  |  16 +-
 src/http/ngx_http_request.c                   |  19 +-
 src/http/v2/ngx_http_v2.c                     | 237 ++++++++++++-----
 src/http/v2/ngx_http_v2.h                     |   5 +
 src/http/v2/ngx_http_v2_filter_module.c       | 224 +++++++++++-----
 src/http/v2/ngx_http_v2_huff_encode.c         | 244 ++++++++++++++++++
 src/os/unix/ngx_process_cycle.c               |   2 +-
 src/os/unix/ngx_setaffinity.c                 |  44 +---
 src/os/unix/ngx_setaffinity.h                 |  16 +-
 src/stream/ngx_stream_proxy_module.c          |   7 +-
 35 files changed, 820 insertions(+), 289 deletions(-)

diff --git a/CHANGES b/CHANGES
index da1fa00..e94e14f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,34 @@
 
+Changes with nginx 1.9.12                                        24 Feb 2016
+
+    *) Feature: Huffman encoding of response headers in HTTP/2.
+       Thanks to Vlad Krasnov.
+
+    *) Feature: the "worker_cpu_affinity" directive now supports more than
+       64 CPUs.
+
+    *) Bugfix: compatibility with 3rd party C++ modules; the bug had
+       appeared in 1.9.11.
+       Thanks to Piotr Sikora.
+
+    *) Bugfix: nginx could not be built statically with OpenSSL on Linux;
+       the bug had appeared in 1.9.11.
+
+    *) Bugfix: the "add_header ... always" directive with an empty value did
+       not delete "Last-Modified" and "ETag" header lines from error
+       responses.
+
+    *) Workaround: "called a function you should not call" and "shutdown
+       while in init" messages might appear in logs when using OpenSSL
+       1.0.2f.
+
+    *) Bugfix: invalid headers might be logged incorrectly.
+
+    *) Bugfix: socket leak when using HTTP/2.
+
+    *) Bugfix: in the ngx_http_v2_module.
+
+
 Changes with nginx 1.9.11                                        09 Feb 2016
 
     *) Feature: TCP support in resolver.
diff --git a/CHANGES.ru b/CHANGES.ru
index 33302e2..c11c477 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,33 @@
 
+Изменения в nginx 1.9.12                                          24.02.2016
+
+    *) Добавление: кодирование Хаффмана заголовков ответов в HTTP/2.
+       Спасибо Владу Краснову.
+
+    *) Добавление: директива worker_cpu_affinity теперь поддерживает более
+       64 процессоров.
+
+    *) Исправление: совместимость со сторонними модулями на C++; ошибка
+       появилась в 1.9.11.
+       Спасибо Piotr Sikora.
+
+    *) Исправление: nginx не собирался статически с OpenSSL на Linux; ошибка
+       появилась в 1.9.11.
+
+    *) Исправление: директива "add_header ... always" с пустым значением не
+       удаляла из заголовков ошибочных ответов строки Last-Modified и ETag.
+
+    *) Изменение: при использовании OpenSSL 1.0.2f в логах могли появляться
+       сообщения "called a function you should not call" и "shutdown while
+       in init".
+
+    *) Исправление: ошибочные заголовки могли логгироваться некорректно.
+
+    *) Исправление: утечки сокетов при использовании HTTP/2.
+
+    *) Исправление: в модуле ngx_http_v2_module.
+
+
 Изменения в nginx 1.9.11                                          09.02.2016
 
     *) Добавление: теперь resolver поддерживает TCP.
diff --git a/auto/cc/conf b/auto/cc/conf
index 35fd39c..f2c25ed 100644
--- a/auto/cc/conf
+++ b/auto/cc/conf
@@ -225,6 +225,16 @@ if [ "$NGX_PLATFORM" != win32 ]; then
     . auto/feature
 
 
+    ngx_feature="gcc builtin 64 bit byteswap"
+    ngx_feature_name="NGX_HAVE_GCC_BSWAP64"
+    ngx_feature_run=no
+    ngx_feature_incs=
+    ngx_feature_path=
+    ngx_feature_libs=
+    ngx_feature_test="__builtin_bswap64(0)"
+    . auto/feature
+
+
 #    ngx_feature="inline"
 #    ngx_feature_name=
 #    ngx_feature_run=no
diff --git a/auto/cc/msvc b/auto/cc/msvc
index e588c48..4eef101 100644
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -3,9 +3,24 @@
 # Copyright (C) Nginx, Inc.
 
 
-# MSVC 6.0 SP2
-# MSVC Toolkit 2003 (7.1)
-# MSVC 2005 Express Edition SP1 (8.0)
+# MSVC 6.0 SP2                            cl 12.00
+# MSVC Toolkit 2003 (7.1)                 cl 13.10
+# MSVC 2005 Express Edition SP1 (8.0)     cl 14.00
+# MSVC 2008 Express Edition (9.0)         cl 15.00
+# MSVC 2010 (10.0)                        cl 16.00
+# MSVC 2015 (14.0)                        cl 19.00
+
+
+NGX_MSVC_VER=`$NGX_WINE $CC 2>&1 | grep 'Compiler Version' 2>&1 \
+                                 | sed -e 's/^.* Version \(.*\)/\1/'`
+
+echo " + cl version: $NGX_MSVC_VER"
+
+have=NGX_COMPILER value="\"cl $NGX_MSVC_VER\"" . auto/define
+
+
+ngx_msvc_ver=`echo $NGX_MSVC_VER | sed -e 's/^\([0-9]*\).*/\1/'`
+
 
 # optimizations
 
@@ -90,17 +105,17 @@ CORE_LIBS="$CORE_LIBS kernel32.lib user32.lib"
 #CORE_LINK="$CORE_LINK -subsystem:windows -entry:mainCRTStartup"
 
 # debug
-# msvc8 under Wine issues
-#     Program database manager mismatch; please check your installation
-if [ $NGX_CC_NAME != msvc8 ]; then
+# msvc under Wine issues
+# C1902: Program database manager mismatch; please check your installation
+if [ -z "$NGX_WINE" ]; then
    CFLAGS="$CFLAGS -Zi"
    CORE_LINK="$CORE_LINK -debug"
 fi
 
 
 # MSVC 2005 supports C99 variadic macros
-if [ $NGX_CC_NAME = msvc8 ]; then
-   have=NGX_HAVE_C99_VARIADIC_MACROS . auto/have
+if [ "$ngx_msvc_ver" -ge 14 ]; then
+    have=NGX_HAVE_C99_VARIADIC_MACROS . auto/have
 fi
 
 
diff --git a/auto/cc/name b/auto/cc/name
index 51a7ed9..35d319e 100644
--- a/auto/cc/name
+++ b/auto/cc/name
@@ -25,31 +25,8 @@ fi
 
 
 if [ "$CC" = cl ]; then
-    if `$NGX_WINE $CC -v 2>&1 \
-        | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16' \
-        >/dev/null 2>&1`; then
-
-        NGX_CC_NAME=msvc10
-        echo " + using Microsoft Visual C++ 10 compiler"
-
-    elif `$NGX_WINE $CC -v 2>&1 \
-        | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \
-        >/dev/null 2>&1`; then
-
-        NGX_CC_NAME=msvc8
-        echo " + using Microsoft Visual C++ 8 compiler"
-
-    elif `$NGX_WINE $CC -v 2>&1 \
-        | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13' \
-        >/dev/null 2>&1`; then
-
-        NGX_CC_NAME=msvc7
-        echo " + using Microsoft Visual C++ 7 compiler"
-
-    else
-        NGX_CC_NAME=msvc
-        echo " + using Microsoft Visual C++ compiler"
-    fi
+    NGX_CC_NAME=msvc
+    echo " + using Microsoft Visual C++ compiler"
 
 elif [ "$CC" = wcl386 ]; then
     NGX_CC_NAME=owc
diff --git a/auto/install b/auto/install
index 4dcc743..9469a49 100644
--- a/auto/install
+++ b/auto/install
@@ -104,8 +104,7 @@ $NGX_OBJS/nginx.8:	$NGX_MAN $NGX_AUTO_CONFIG_H
 		-e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
 		< $NGX_MAN > \$@
 
-install:	$NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
-		$NGX_INSTALL_PERL_MODULES
+install:	build $NGX_INSTALL_PERL_MODULES
 	test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
 
 	test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
@@ -187,8 +186,6 @@ cat << END >> Makefile
 
 build:
 	\$(MAKE) -f $NGX_MAKEFILE
-	\$(MAKE) -f $NGX_MAKEFILE modules
-	\$(MAKE) -f $NGX_MAKEFILE manpage
 
 install:
 	\$(MAKE) -f $NGX_MAKEFILE install
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
index eb5dfd1..49c0ddf 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -20,12 +20,12 @@ if [ $MD5 != NONE ]; then
 
     case "$NGX_CC_NAME" in
 
-        msvc* | owc* | bcc)
+        msvc | owc | bcc)
             LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
             CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
         ;;
 
-        icc*)
+        icc)
             LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
 
             # to allow -ipo optimization we link with the *.o but not library
diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index 81f138a..7000b20 100644
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -5,13 +5,13 @@
 
 case "$NGX_CC_NAME" in
 
-    msvc*)
+    msvc)
         ngx_makefile=makefile.msvc
         ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC MD5_ASM=$MD5_ASM"
         ngx_md5="MD5=\"$MD5\""
     ;;
 
-    owc*)
+    owc)
         ngx_makefile=makefile.owc
         ngx_opt="CPU_OPT=\"$CPU_OPT\""
         ngx_md5=`echo MD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"`
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index 2187e5c..e438050 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -32,6 +32,7 @@ if [ $OPENSSL != NONE ]; then
             CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
             CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
             CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
+            CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
 
             if [ "$NGX_PLATFORM" = win32 ]; then
                 CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32"
@@ -50,7 +51,7 @@ else
         ngx_feature_run=no
         ngx_feature_incs="#include <openssl/ssl.h>"
         ngx_feature_path=
-        ngx_feature_libs="-lssl -lcrypto"
+        ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
         ngx_feature_test="SSL_library_init()"
         . auto/feature
 
@@ -62,9 +63,9 @@ else
             ngx_feature_path="/usr/local/include"
 
             if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto"
+                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto $NGX_LIBDL"
             else
-                ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto"
+                ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto $NGX_LIBDL"
             fi
 
             . auto/feature
@@ -78,9 +79,9 @@ else
             ngx_feature_path="/usr/pkg/include"
 
             if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto"
+                ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL"
             else
-                ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto"
+                ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL"
             fi
 
             . auto/feature
@@ -94,9 +95,9 @@ else
             ngx_feature_path="/opt/local/include"
 
             if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto"
+                ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto $NGX_LIBDL"
             else
-                ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto"
+                ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto $NGX_LIBDL"
             fi
 
             . auto/feature
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index 765cd06..a6090c6 100644
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -53,7 +53,7 @@ $OPENSSL/.openssl/include/openssl/ssl.h:	$NGX_MAKEFILE
 	&& if [ -f Makefile ]; then \$(MAKE) clean; fi \\
 	&& ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
 	&& \$(MAKE) \\
-	&& \$(MAKE) install LIBDIR=lib
+	&& \$(MAKE) install_sw LIBDIR=lib
 
 END
 
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 939f01b..5e3960f 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -8,7 +8,7 @@ if [ $PCRE != NONE ]; then
 
     case "$NGX_CC_NAME" in
 
-        msvc* | owc* | bcc)
+        msvc | owc | bcc)
             have=NGX_PCRE . auto/have
             have=PCRE_STATIC . auto/have
             CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
@@ -16,7 +16,7 @@ if [ $PCRE != NONE ]; then
             CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib"
         ;;
 
-        icc* )
+        icc)
             have=NGX_PCRE . auto/have
             CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
 
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 0a27a11..97c9f3b 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -5,13 +5,13 @@
 
 case "$NGX_CC_NAME" in
 
-    msvc*)
+    msvc)
         ngx_makefile=makefile.msvc
         ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
         ngx_pcre="PCRE=\"$PCRE\""
     ;;
 
-    owc*)
+    owc)
         ngx_makefile=makefile.owc
         ngx_opt="CPU_OPT=\"$CPU_OPT\""
         ngx_pcre=`echo PCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
diff --git a/auto/lib/sha1/conf b/auto/lib/sha1/conf
index fd69afd..78f9efd 100644
--- a/auto/lib/sha1/conf
+++ b/auto/lib/sha1/conf
@@ -10,12 +10,12 @@ if [ $SHA1 != NONE ]; then
 
     case "$NGX_CC_NAME" in
 
-        msvc* | owc* | bcc)
+        msvc | owc | bcc)
             LINK_DEPS="$LINK_DEPS $SHA1/sha1.lib"
             CORE_LIBS="$CORE_LIBS $SHA1/sha1.lib"
         ;;
 
-        icc*)
+        icc)
             LINK_DEPS="$LINK_DEPS $SHA1/libsha.a"
 
             # to allow -ipo optimization we link with the *.o but not library
diff --git a/auto/lib/sha1/make b/auto/lib/sha1/make
index fc10aae..fc3b340 100644
--- a/auto/lib/sha1/make
+++ b/auto/lib/sha1/make
@@ -5,13 +5,13 @@
 
 case "$NGX_CC_NAME" in
 
-    msvc*)
+    msvc)
         ngx_makefile=makefile.msvc
         ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC SHA1_ASM=$SHA1_ASM"
         ngx_sha1="SHA1=\"$SHA1\""
     ;;
 
-    owc*)
+    owc)
         ngx_makefile=makefile.owc
         ngx_opt="CPU_OPT=\"$CPU_OPT\""
         ngx_sha1=`echo SHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"`
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf
index 26db642..239592e 100644
--- a/auto/lib/zlib/conf
+++ b/auto/lib/zlib/conf
@@ -8,13 +8,13 @@ if [ $ZLIB != NONE ]; then
 
     case "$NGX_CC_NAME" in
 
-        msvc* | owc* | bcc)
+        msvc | owc | bcc)
             have=NGX_ZLIB . auto/have
             LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
             CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib"
         ;;
 
-        icc*)
+        icc)
             have=NGX_ZLIB . auto/have
             LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
 
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 7875ef6..0082ad5 100644
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -5,14 +5,14 @@
 
 case "$NGX_CC_NAME" in
 
-    msvc*)
+    msvc)
         ngx_makefile=makefile.msvc
         ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
         ngx_zlib="ZLIB=\"$ZLIB\""
 
     ;;
 
-    owc*)
+    owc)
         ngx_makefile=makefile.owc
         ngx_opt="CPU_OPT=\"$CPU_OPT\""
         ngx_zlib=`echo ZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"`
diff --git a/auto/make b/auto/make
index 039a70f..560924b 100644
--- a/auto/make
+++ b/auto/make
@@ -223,6 +223,10 @@ ngx_main_link=${MAIN_LINK:+`echo $MAIN_LINK \
 
 cat << END                                                    >> $NGX_MAKEFILE
 
+build:	binary modules manpage
+
+binary:	$NGX_OBJS${ngx_dirsep}nginx${ngx_binext}
+
 $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}:	$ngx_deps$ngx_spacer
 	\$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
 	$ngx_rcc
diff --git a/auto/modules b/auto/modules
index 2074778..ebfc91d 100644
--- a/auto/modules
+++ b/auto/modules
@@ -530,11 +530,10 @@ if [ $HTTP_AUTH_BASIC = YES ]; then
     ngx_module_incs=
     ngx_module_deps=
     ngx_module_srcs=src/http/modules/ngx_http_auth_basic_module.c
-    ngx_module_libs=
+    ngx_module_libs=$CRYPT_LIB
     ngx_module_link=$HTTP_AUTH_BASIC
 
     . auto/module
-    CORE_LIBS="$CORE_LIBS $CRYPT_LIB"
 fi
 
 if [ $HTTP_ACCESS = YES ]; then
diff --git a/auto/unix b/auto/unix
index e07df08..ce01791 100755
--- a/auto/unix
+++ b/auto/unix
@@ -272,6 +272,7 @@ if [ $ngx_found != yes ]; then
 
     if [ $ngx_found = yes ]; then
         CORE_LIBS="$CORE_LIBS -ldl"
+        NGX_LIBDL="-ldl"
     fi
 fi
 
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 6ce030c..cdc067e 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -481,6 +481,12 @@ ngx_add_inherited_sockets(ngx_cycle_t *cycle)
         }
     }
 
+    if (v != p) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+                      "invalid socket number \"%s\" in " NGINX_VAR
+                      " environment variable, ignoring", v);
+    }
+
     ngx_inherited = 1;
 
     return ngx_set_inherited_sockets(cycle);
@@ -1264,16 +1270,16 @@ ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #if (NGX_HAVE_CPU_AFFINITY)
     ngx_core_conf_t  *ccf = conf;
 
-    u_char            ch;
-    uint64_t         *mask;
+    u_char            ch, *p;
     ngx_str_t        *value;
     ngx_uint_t        i, n;
+    ngx_cpuset_t     *mask;
 
     if (ccf->cpu_affinity) {
         return "is duplicate";
     }
 
-    mask = ngx_palloc(cf->pool, (cf->args->nelts - 1) * sizeof(uint64_t));
+    mask = ngx_palloc(cf->pool, (cf->args->nelts - 1) * sizeof(ngx_cpuset_t));
     if (mask == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -1293,7 +1299,12 @@ ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
 
         ccf->cpu_affinity_auto = 1;
-        mask[0] = (uint64_t) -1 >> (64 - ngx_min(64, ngx_ncpu));
+
+        CPU_ZERO(&mask[0]);
+        for (i = 0; i < (ngx_uint_t) ngx_min(ngx_ncpu, CPU_SETSIZE); i++) {
+            CPU_SET(i, &mask[0]);
+        }
+
         n = 2;
 
     } else {
@@ -1302,30 +1313,34 @@ ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     for ( /* void */ ; n < cf->args->nelts; n++) {
 
-        if (value[n].len > 64) {
+        if (value[n].len > CPU_SETSIZE) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                         "\"worker_cpu_affinity\" supports up to 64 CPUs only");
+                         "\"worker_cpu_affinity\" supports up to %d CPUs only",
+                         CPU_SETSIZE);
             return NGX_CONF_ERROR;
         }
 
-        mask[n - 1] = 0;
+        i = 0;
+        CPU_ZERO(&mask[n - 1]);
 
-        for (i = 0; i < value[n].len; i++) {
-
-            ch = value[n].data[i];
+        for (p = value[n].data + value[n].len - 1;
+             p >= value[n].data;
+             p--)
+        {
+            ch = *p;
 
             if (ch == ' ') {
                 continue;
             }
 
-            mask[n - 1] <<= 1;
+            i++;
 
             if (ch == '0') {
                 continue;
             }
 
             if (ch == '1') {
-                mask[n - 1] |= 1;
+                CPU_SET(i - 1, &mask[n - 1]);
                 continue;
             }
 
@@ -1347,43 +1362,57 @@ ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
-uint64_t
+ngx_cpuset_t *
 ngx_get_cpu_affinity(ngx_uint_t n)
 {
-    uint64_t          mask;
-    ngx_uint_t        i;
+#if (NGX_HAVE_CPU_AFFINITY)
+    ngx_uint_t        i, j;
+    ngx_cpuset_t     *mask;
     ngx_core_conf_t  *ccf;
 
+    static ngx_cpuset_t  result;
+
     ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
                                            ngx_core_module);
 
     if (ccf->cpu_affinity == NULL) {
-        return 0;
+        return NULL;
     }
 
     if (ccf->cpu_affinity_auto) {
-        mask = ccf->cpu_affinity[ccf->cpu_affinity_n - 1];
+        mask = &ccf->cpu_affinity[ccf->cpu_affinity_n - 1];
 
-        if (mask == 0) {
-            return 0;
-        }
+        for (i = 0, j = n; /* void */ ; i++) {
 
-        for (i = 0; /* void */ ; i++) {
-            if ((mask & ((uint64_t) 1 << (i % 64))) && n-- == 0) {
+            if (CPU_ISSET(i % CPU_SETSIZE, mask) && j-- == 0) {
                 break;
             }
 
+            if (i == CPU_SETSIZE && j == n) {
+                /* empty mask */
+                return NULL;
+            }
+
             /* void */
         }
 
-        return (uint64_t) 1 << (i % 64);
+        CPU_ZERO(&result);
+        CPU_SET(i % CPU_SETSIZE, &result);
+
+        return &result;
     }
 
     if (ccf->cpu_affinity_n > n) {
-        return ccf->cpu_affinity[n];
+        return &ccf->cpu_affinity[n];
     }
 
-    return ccf->cpu_affinity[ccf->cpu_affinity_n - 1];
+    return &ccf->cpu_affinity[ccf->cpu_affinity_n - 1];
+
+#else
+
+    return NULL;
+
+#endif
 }
 
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index e416e90..dec7b88 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009011
-#define NGINX_VERSION      "1.9.11"
+#define nginx_version      1009012
+#define NGINX_VERSION      "1.9.12"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index 27401d0..cfdbb55 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -94,7 +94,7 @@ typedef struct {
 
      ngx_uint_t               cpu_affinity_auto;
      ngx_uint_t               cpu_affinity_n;
-     uint64_t                *cpu_affinity;
+     ngx_cpuset_t            *cpu_affinity;
 
      char                    *username;
      ngx_uid_t                user;
@@ -121,7 +121,7 @@ ngx_int_t ngx_signal_process(ngx_cycle_t *cycle, char *sig);
 void ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user);
 char **ngx_set_environment(ngx_cycle_t *cycle, ngx_uint_t *last);
 ngx_pid_t ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv);
-uint64_t ngx_get_cpu_affinity(ngx_uint_t n);
+ngx_cpuset_t *ngx_get_cpu_affinity(ngx_uint_t n);
 ngx_shm_zone_t *ngx_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name,
     size_t size, void *tag);
 
diff --git a/src/core/ngx_module.c b/src/core/ngx_module.c
index 1e947c9..f5ec86a 100644
--- a/src/core/ngx_module.c
+++ b/src/core/ngx_module.c
@@ -171,7 +171,7 @@ ngx_add_module(ngx_conf_t *cf, ngx_str_t *file, ngx_module_t *module,
     if (module->version != nginx_version) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "module \"%V\" version %ui instead of %ui",
-                           file, module->version, nginx_version);
+                           file, module->version, (ngx_uint_t) nginx_version);
         return NGX_ERROR;
     }
 
diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h
index cd28c49..3e74def 100644
--- a/src/core/ngx_module.h
+++ b/src/core/ngx_module.h
@@ -253,7 +253,7 @@ struct ngx_module_s {
     ngx_uint_t            spare1;
 
     ngx_uint_t            version;
-    char                 *signature;
+    const char           *signature;
 
     void                 *ctx;
     ngx_command_t        *commands;
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 57dfc6c..de10d48 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1767,6 +1767,19 @@ ngx_ssl_shutdown(ngx_connection_t *c)
     int        n, sslerr, mode;
     ngx_err_t  err;
 
+    if (SSL_in_init(c->ssl->connection)) {
+        /*
+         * OpenSSL 1.0.2f complains if SSL_shutdown() is called during
+         * an SSL handshake, while previous versions always return 0.
+         * Avoid calling SSL_shutdown() if handshake wasn't completed.
+         */
+
+        SSL_free(c->ssl->connection);
+        c->ssl = NULL;
+
+        return NGX_OK;
+    }
+
     if (c->timedout) {
         mode = SSL_RECEIVED_SHUTDOWN|SSL_SENT_SHUTDOWN;
         SSL_set_quiet_shutdown(c->ssl->connection, 1);
@@ -1797,7 +1810,7 @@ ngx_ssl_shutdown(ngx_connection_t *c)
 
     sslerr = 0;
 
-    /* SSL_shutdown() never returns -1, on error it returns 0 */
+    /* before 0.9.8m SSL_shutdown() returned 0 instead of -1 on errors */
 
     if (n != 1 && ERR_peek_error()) {
         sslerr = SSL_get_error(c->ssl->connection, n);
diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index 985e5b3..6738afe 100644
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -712,17 +712,17 @@ ngx_http_headers_add(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     if (value[2].len == 0) {
         ngx_memzero(&hv->value, sizeof(ngx_http_complex_value_t));
-        return NGX_CONF_OK;
-    }
 
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+    } else {
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
 
-    ccv.cf = cf;
-    ccv.value = &value[2];
-    ccv.complex_value = &hv->value;
+        ccv.cf = cf;
+        ccv.value = &value[2];
+        ccv.complex_value = &hv->value;
 
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
     }
 
     if (cf->args->nelts == 3) {
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 99e9325..fd790e1 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1351,12 +1351,11 @@ ngx_http_process_request_headers(ngx_event_t *rev)
             continue;
         }
 
-        /* rc == NGX_HTTP_PARSE_INVALID_HEADER: "\r" is not followed by "\n" */
+        /* rc == NGX_HTTP_PARSE_INVALID_HEADER */
 
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "client sent invalid header line: \"%*s\\r...\"",
-                      r->header_end - r->header_name_start,
-                      r->header_name_start);
+                      "client sent invalid header line");
+
         ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
         return;
     }
@@ -2574,12 +2573,6 @@ ngx_http_set_write_handler(ngx_http_request_t *r)
                                 ngx_http_test_reading;
     r->write_event_handler = ngx_http_writer;
 
-#if (NGX_HTTP_V2)
-    if (r->stream) {
-        return NGX_OK;
-    }
-#endif
-
     wev = r->connection->write;
 
     if (wev->ready && wev->delayed) {
@@ -2665,12 +2658,6 @@ ngx_http_writer(ngx_http_request_t *r)
 
     if (r->buffered || r->postponed || (r == r->main && c->buffered)) {
 
-#if (NGX_HTTP_V2)
-        if (r->stream) {
-            return;
-        }
-#endif
-
         if (!wev->delayed) {
             ngx_add_timer(wev, clcf->send_timeout);
         }
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 4e378c9..4c4a4e7 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -112,10 +112,10 @@ static u_char *ngx_http_v2_state_skip_padded(ngx_http_v2_connection_t *h2c,
     u_char *pos, u_char *end);
 static u_char *ngx_http_v2_state_skip(ngx_http_v2_connection_t *h2c,
     u_char *pos, u_char *end);
-static u_char *ngx_http_v2_state_skip_headers(ngx_http_v2_connection_t *h2c,
-    u_char *pos, u_char *end);
 static u_char *ngx_http_v2_state_save(ngx_http_v2_connection_t *h2c,
     u_char *pos, u_char *end, ngx_http_v2_handler_pt handler);
+static u_char *ngx_http_v2_state_headers_save(ngx_http_v2_connection_t *h2c,
+    u_char *pos, u_char *end, ngx_http_v2_handler_pt handler);
 static u_char *ngx_http_v2_connection_error(ngx_http_v2_connection_t *h2c,
     ngx_uint_t err);
 
@@ -164,6 +164,7 @@ static ngx_int_t ngx_http_v2_cookie(ngx_http_request_t *r,
 static ngx_int_t ngx_http_v2_construct_cookie_header(ngx_http_request_t *r);
 static void ngx_http_v2_run_request(ngx_http_request_t *r);
 static ngx_int_t ngx_http_v2_init_request_body(ngx_http_request_t *r);
+static void ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r);
 
 static ngx_int_t ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream, ngx_uint_t status);
@@ -432,6 +433,10 @@ ngx_http_v2_write_handler(ngx_event_t *wev)
                        "run http2 stream %ui", stream->node->id);
 
         wev = stream->request->connection->write;
+
+        wev->active = 0;
+        wev->ready = 1;
+
         wev->handler(wev);
     }
 
@@ -885,6 +890,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     ngx_buf_t                 *buf;
     ngx_int_t                  rc;
     ngx_temp_file_t           *tf;
+    ngx_connection_t          *fc;
     ngx_http_request_t        *r;
     ngx_http_v2_stream_t      *stream;
     ngx_http_request_body_t   *rb;
@@ -921,6 +927,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
+    fc = r->connection;
     rb = r->request_body;
     tf = rb->temp_file;
     buf = rb->buf;
@@ -931,7 +938,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
         if (r->headers_in.content_length_n != -1
             && r->headers_in.content_length_n < rb->rest)
         {
-            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+            ngx_log_error(NGX_LOG_INFO, fc->log, 0,
                           "client intended to send body data "
                           "larger than declared");
 
@@ -944,7 +951,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
             if (clcf->client_max_body_size
                 && clcf->client_max_body_size < rb->rest)
             {
-                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                ngx_log_error(NGX_LOG_ERR, fc->log, 0,
                               "client intended to send "
                               "too large chunked body: %O bytes", rb->rest);
 
@@ -984,6 +991,11 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (h2c->state.length) {
+        if (rb->post_handler) {
+            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+            ngx_add_timer(fc->read, clcf->client_body_timeout);
+        }
+
         return ngx_http_v2_state_save(h2c, pos, end,
                                       ngx_http_v2_state_read_data);
     }
@@ -995,7 +1007,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
             r->headers_in.content_length_n = rb->rest;
 
         } else if (r->headers_in.content_length_n != rb->rest) {
-            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+            ngx_log_error(NGX_LOG_INFO, fc->log, 0,
                           "client prematurely closed stream: "
                           "only %O out of %O bytes of request body received",
                           rb->rest, r->headers_in.content_length_n);
@@ -1015,9 +1027,17 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
         }
 
         if (rb->post_handler) {
+            if (fc->read->timer_set) {
+                ngx_del_timer(fc->read);
+            }
+
             r->read_event_handler = ngx_http_block_reading;
             rb->post_handler(r);
         }
+
+    } else if (rb->post_handler) {
+        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+        ngx_add_timer(fc->read, clcf->client_body_timeout);
     }
 
     if (h2c->state.padding) {
@@ -1029,6 +1049,9 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
 error:
 
     if (rb->post_handler) {
+        if (fc->read->timer_set) {
+            ngx_del_timer(fc->read);
+        }
 
         if (stream->skip_data == NGX_HTTP_V2_DATA_ERROR) {
             rc = (r->headers_in.content_length_n == -1)
@@ -1133,6 +1156,11 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     h2c->last_sid = h2c->state.sid;
 
+    h2c->state.pool = ngx_create_pool(1024, h2c->connection->log);
+    if (h2c->state.pool == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
     if (depend == h2c->state.sid) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "client sent HEADERS frame for stream %ui "
@@ -1146,7 +1174,7 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
                                                 NGX_HTTP_V2_INTERNAL_ERROR);
         }
 
-        return ngx_http_v2_state_skip_headers(h2c, pos, end);
+        return ngx_http_v2_state_header_block(h2c, pos, end);
     }
 
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@@ -1166,7 +1194,7 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
                                                 NGX_HTTP_V2_INTERNAL_ERROR);
         }
 
-        return ngx_http_v2_state_skip_headers(h2c, pos, end);
+        return ngx_http_v2_state_header_block(h2c, pos, end);
     }
 
     node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 1);
@@ -1185,6 +1213,11 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
     }
 
+    h2c->state.stream = stream;
+
+    stream->pool = h2c->state.pool;
+    h2c->state.keep_pool = 1;
+
     stream->request->request_length = h2c->state.length;
 
     stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
@@ -1192,9 +1225,6 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     node->stream = stream;
 
-    h2c->state.stream = stream;
-    h2c->state.pool = stream->request->pool;
-
     if (priority || node->parent == NULL) {
         node->weight = weight;
         ngx_http_v2_set_dependency(h2c, node, depend, excl);
@@ -1213,8 +1243,8 @@ ngx_http_v2_state_header_block(ngx_http_v2_connection_t *h2c, u_char *pos,
     ngx_uint_t  indexed, size_update, prefix;
 
     if (end - pos < 1) {
-        return ngx_http_v2_state_save(h2c, pos, end,
-                                      ngx_http_v2_state_header_block);
+        return ngx_http_v2_state_headers_save(h2c, pos, end,
+                                              ngx_http_v2_state_header_block);
     }
 
     if (!(h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG)
@@ -1257,8 +1287,8 @@ ngx_http_v2_state_header_block(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     if (value < 0) {
         if (value == NGX_AGAIN) {
-            return ngx_http_v2_state_save(h2c, pos, end,
-                                          ngx_http_v2_state_header_block);
+            return ngx_http_v2_state_headers_save(h2c, pos, end,
+                                               ngx_http_v2_state_header_block);
         }
 
         if (value == NGX_DECLINED) {
@@ -1328,8 +1358,8 @@ ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (end - pos < 1) {
-        return ngx_http_v2_state_save(h2c, pos, end,
-                                      ngx_http_v2_state_field_len);
+        return ngx_http_v2_state_headers_save(h2c, pos, end,
+                                              ngx_http_v2_state_field_len);
     }
 
     huff = *pos >> 7;
@@ -1337,8 +1367,8 @@ ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     if (len < 0) {
         if (len == NGX_AGAIN) {
-            return ngx_http_v2_state_save(h2c, pos, end,
-                                          ngx_http_v2_state_field_len);
+            return ngx_http_v2_state_headers_save(h2c, pos, end,
+                                                  ngx_http_v2_state_field_len);
         }
 
         if (len == NGX_DECLINED) {
@@ -1430,8 +1460,8 @@ ngx_http_v2_state_field_huff(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (h2c->state.length) {
-        return ngx_http_v2_state_save(h2c, pos, end,
-                                      ngx_http_v2_state_field_huff);
+        return ngx_http_v2_state_headers_save(h2c, pos, end,
+                                              ngx_http_v2_state_field_huff);
     }
 
     if (h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG) {
@@ -1475,8 +1505,8 @@ ngx_http_v2_state_field_raw(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (h2c->state.length) {
-        return ngx_http_v2_state_save(h2c, pos, end,
-                                      ngx_http_v2_state_field_raw);
+        return ngx_http_v2_state_headers_save(h2c, pos, end,
+                                              ngx_http_v2_state_field_raw);
     }
 
     if (h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG) {
@@ -1686,7 +1716,6 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
 error:
 
     h2c->state.stream = NULL;
-    h2c->state.pool = NULL;
 
     return ngx_http_v2_state_header_complete(h2c, pos, end);
 }
@@ -1699,8 +1728,7 @@ ngx_http_v2_state_header_complete(ngx_http_v2_connection_t *h2c, u_char *pos,
     ngx_http_v2_stream_t  *stream;
 
     if (h2c->state.length) {
-        h2c->state.handler = h2c->state.pool ? ngx_http_v2_state_header_block
-                                             : ngx_http_v2_state_skip_headers;
+        h2c->state.handler = ngx_http_v2_state_header_block;
         return pos;
     }
 
@@ -1713,12 +1741,14 @@ ngx_http_v2_state_header_complete(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     if (stream) {
         ngx_http_v2_run_request(stream->request);
+    }
 
-    } else if (h2c->state.pool) {
+    if (!h2c->state.keep_pool) {
         ngx_destroy_pool(h2c->state.pool);
     }
 
     h2c->state.pool = NULL;
+    h2c->state.keep_pool = 0;
 
     if (h2c->state.padding) {
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
@@ -1749,7 +1779,7 @@ ngx_http_v2_handle_continuation(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if ((size_t) (end - pos) < len + NGX_HTTP_V2_FRAME_HEADER_SIZE) {
-        return ngx_http_v2_state_save(h2c, pos, end, handler);
+        return ngx_http_v2_state_headers_save(h2c, pos, end, handler);
     }
 
     p = pos + len;
@@ -2224,8 +2254,10 @@ ngx_http_v2_state_window_update(ngx_http_v2_connection_t *h2c, u_char *pos,
 
             wev = stream->request->connection->write;
 
-            if (!wev->timer_set) {
-                wev->delayed = 0;
+            wev->active = 0;
+            wev->ready = 1;
+
+            if (!wev->delayed) {
                 wev->handler(wev);
             }
         }
@@ -2257,8 +2289,10 @@ ngx_http_v2_state_window_update(ngx_http_v2_connection_t *h2c, u_char *pos,
 
         wev = stream->request->connection->write;
 
-        if (!wev->timer_set) {
-            wev->delayed = 0;
+        wev->active = 0;
+        wev->ready = 1;
+
+        if (!wev->delayed) {
             wev->handler(wev);
 
             if (h2c->send_window == 0) {
@@ -2336,19 +2370,6 @@ ngx_http_v2_state_skip(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
 }
 
 
-static u_char *
-ngx_http_v2_state_skip_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
-    u_char *end)
-{
-    h2c->state.pool = ngx_create_pool(1024, h2c->connection->log);
-    if (h2c->state.pool == NULL) {
-        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
-    }
-
-    return ngx_http_v2_state_header_block(h2c, pos, end);
-}
-
-
 static u_char *
 ngx_http_v2_state_save(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end,
     ngx_http_v2_handler_pt handler)
@@ -2378,6 +2399,28 @@ ngx_http_v2_state_save(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end,
 }
 
 
+static u_char *
+ngx_http_v2_state_headers_save(ngx_http_v2_connection_t *h2c, u_char *pos,
+    u_char *end, ngx_http_v2_handler_pt handler)
+{
+    ngx_event_t               *rev;
+    ngx_http_request_t        *r;
+    ngx_http_core_srv_conf_t  *cscf;
+
+    if (h2c->state.stream) {
+        r = h2c->state.stream->request;
+        rev = r->connection->read;
+
+        if (!rev->timer_set) {
+            cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+            ngx_add_timer(rev, cscf->client_header_timeout);
+        }
+    }
+
+    return ngx_http_v2_state_save(h2c, pos, end, handler);
+}
+
+
 static u_char *
 ngx_http_v2_connection_error(ngx_http_v2_connection_t *h2c,
     ngx_uint_t err)
@@ -2756,6 +2799,7 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
     ngx_memcpy(log, h2c->connection->log, sizeof(ngx_log_t));
 
     log->data = ctx;
+    log->action = "reading client request headers";
 
     ngx_memzero(rev, sizeof(ngx_event_t));
 
@@ -3562,7 +3606,8 @@ ngx_int_t
 ngx_http_v2_read_request_body(ngx_http_request_t *r,
     ngx_http_client_body_handler_pt post_handler)
 {
-    ngx_http_v2_stream_t  *stream;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_core_loc_conf_t  *clcf;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http2 read request body");
@@ -3598,13 +3643,48 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
 
     r->request_body->post_handler = post_handler;
 
-    r->read_event_handler = ngx_http_test_reading;
+    r->read_event_handler = ngx_http_v2_read_client_request_body_handler;
     r->write_event_handler = ngx_http_request_empty_handler;
 
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+    ngx_add_timer(r->connection->read, clcf->client_body_timeout);
+
     return NGX_AGAIN;
 }
 
 
+static void
+ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r)
+{
+    ngx_connection_t  *fc;
+
+    fc = r->connection;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 read client request body handler");
+
+    if (fc->read->timedout) {
+        ngx_log_error(NGX_LOG_INFO, fc->log, NGX_ETIMEDOUT, "client timed out");
+
+        fc->timedout = 1;
+        r->stream->skip_data = NGX_HTTP_V2_DATA_DISCARD;
+
+        ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
+        return;
+    }
+
+    if (fc->error) {
+        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
+                      "client prematurely closed stream");
+
+        r->stream->skip_data = NGX_HTTP_V2_DATA_DISCARD;
+
+        ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+        return;
+    }
+}
+
+
 static ngx_int_t
 ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream, ngx_uint_t status)
@@ -3633,6 +3713,7 @@ ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
 void
 ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
 {
+    ngx_pool_t                *pool;
     ngx_event_t               *ev;
     ngx_connection_t          *fc;
     ngx_http_v2_node_t        *node;
@@ -3654,27 +3735,44 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
 
     if (!stream->out_closed) {
         if (ngx_http_v2_send_rst_stream(h2c, node->id,
-                                        NGX_HTTP_V2_INTERNAL_ERROR)
+                                     fc->timedout ? NGX_HTTP_V2_PROTOCOL_ERROR
+                                                  : NGX_HTTP_V2_INTERNAL_ERROR)
             != NGX_OK)
         {
             h2c->connection->error = 1;
         }
     }
 
+    if (h2c->state.stream == stream) {
+        h2c->state.stream = NULL;
+    }
+
     node->stream = NULL;
 
     ngx_queue_insert_tail(&h2c->closed, &node->reuse);
     h2c->closed_nodes++;
 
+    /*
+     * This pool keeps decoded request headers which can be used by log phase
+     * handlers in ngx_http_free_request().
+     *
+     * The pointer is stored into local variable because the stream object
+     * will be destroyed after a call to ngx_http_free_request().
+     */
+    pool = stream->pool;
+
     ngx_http_free_request(stream->request, rc);
 
-    ev = fc->read;
+    if (pool != h2c->state.pool) {
+        ngx_destroy_pool(pool);
 
-    if (ev->active || ev->disabled) {
-        ngx_log_error(NGX_LOG_ALERT, h2c->connection->log, 0,
-                      "fake read event was activated");
+    } else {
+        /* pool will be destroyed when the complete header is parsed */
+        h2c->state.keep_pool = 0;
     }
 
+    ev = fc->read;
+
     if (ev->timer_set) {
         ngx_del_timer(ev);
     }
@@ -3685,11 +3783,6 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
 
     ev = fc->write;
 
-    if (ev->active || ev->disabled) {
-        ngx_log_error(NGX_LOG_ALERT, h2c->connection->log, 0,
-                      "fake write event was activated");
-    }
-
     if (ev->timer_set) {
         ngx_del_timer(ev);
     }
@@ -3723,9 +3816,18 @@ ngx_http_v2_close_stream_handler(ngx_event_t *ev)
     fc = ev->data;
     r = fc->data;
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
                    "http2 close stream handler");
 
+    if (ev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, fc->log, NGX_ETIMEDOUT, "client timed out");
+
+        fc->timedout = 1;
+
+        ngx_http_v2_close_stream(r->stream, NGX_HTTP_REQUEST_TIME_OUT);
+        return;
+    }
+
     ngx_http_v2_close_stream(r->stream, 0);
 }
 
@@ -3733,7 +3835,11 @@ ngx_http_v2_close_stream_handler(ngx_event_t *ev)
 static void
 ngx_http_v2_handle_connection_handler(ngx_event_t *rev)
 {
-    ngx_connection_t  *c;
+    ngx_connection_t          *c;
+    ngx_http_v2_connection_t  *h2c;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0,
+                   "http2 handle connection handler");
 
     rev->handler = ngx_http_v2_read_handler;
 
@@ -3743,6 +3849,12 @@ ngx_http_v2_handle_connection_handler(ngx_event_t *rev)
     }
 
     c = rev->data;
+    h2c = c->data;
+
+    if (h2c->last_out && ngx_http_v2_send_output_queue(h2c) == NGX_ERROR) {
+        ngx_http_v2_finalize_connection(h2c, 0);
+        return;
+    }
 
     ngx_http_v2_handle_connection(c->data);
 }
@@ -3821,7 +3933,6 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     if (h2c->state.stream) {
         h2c->state.stream->out_closed = 1;
-        h2c->state.pool = NULL;
         ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST);
     }
 
@@ -3865,9 +3976,7 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
             if (stream->queued) {
                 stream->queued = 0;
-
                 ev = fc->write;
-                ev->delayed = 0;
 
             } else {
                 ev = fc->read;
@@ -3936,8 +4045,10 @@ ngx_http_v2_adjust_windows(ngx_http_v2_connection_t *h2c, ssize_t delta)
 
                 wev = stream->request->connection->write;
 
-                if (!wev->timer_set) {
-                    wev->delayed = 0;
+                wev->active = 0;
+                wev->ready = 1;
+
+                if (!wev->delayed) {
                     wev->handler(wev);
                 }
             }
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 0f03922..5a791e6 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -73,6 +73,7 @@ typedef struct {
     unsigned                         flags:8;
 
     unsigned                         incomplete:1;
+    unsigned                         keep_pool:1;
 
     /* HPACK */
     unsigned                         parse_name:1;
@@ -186,6 +187,8 @@ struct ngx_http_v2_stream_s {
 
     size_t                           header_limit;
 
+    ngx_pool_t                      *pool;
+
     unsigned                         handled:1;
     unsigned                         blocked:1;
     unsigned                         exhausted:1;
@@ -274,6 +277,8 @@ ngx_int_t ngx_http_v2_table_size(ngx_http_v2_connection_t *h2c, size_t size);
 
 ngx_int_t ngx_http_v2_huff_decode(u_char *state, u_char *src, size_t len,
     u_char **dst, ngx_uint_t last, ngx_log_t *log);
+size_t ngx_http_v2_huff_encode(u_char *src, size_t len, u_char *dst,
+    ngx_uint_t lower);
 
 
 #define ngx_http_v2_prefix(bits)  ((1 << (bits)) - 1)
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index ea58979..caa835d 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -25,6 +25,11 @@
 #define ngx_http_v2_indexed(i)      (128 + (i))
 #define ngx_http_v2_inc_indexed(i)  (64 + (i))
 
+#define ngx_http_v2_write_name(dst, src, len, tmp)                            \
+    ngx_http_v2_string_encode(dst, src, len, tmp, 1)
+#define ngx_http_v2_write_value(dst, src, len, tmp)                           \
+    ngx_http_v2_string_encode(dst, src, len, tmp, 0)
+
 #define NGX_HTTP_V2_ENCODE_RAW            0
 #define NGX_HTTP_V2_ENCODE_HUFF           0x80
 
@@ -46,6 +51,8 @@
 #define NGX_HTTP_V2_VARY_INDEX            59
 
 
+static u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len,
+    u_char *tmp, ngx_uint_t lower);
 static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix,
     ngx_uint_t value);
 static ngx_http_v2_out_frame_t *ngx_http_v2_create_headers_frame(
@@ -119,8 +126,8 @@ static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
 static ngx_int_t
 ngx_http_v2_header_filter(ngx_http_request_t *r)
 {
-    u_char                     status, *pos, *start, *p;
-    size_t                     len;
+    u_char                     status, *pos, *start, *p, *tmp;
+    size_t                     len, tmp_len;
     ngx_str_t                  host, location;
     ngx_uint_t                 i, port;
     ngx_list_part_t           *part;
@@ -136,6 +143,14 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 #endif
     u_char                     addr[NGX_SOCKADDR_STRLEN];
 
+    static const u_char nginx[5] = "\x84\xaa\x63\x55\xe7";
+#if (NGX_HTTP_GZIP)
+    static const u_char accept_encoding[12] =
+        "\x8b\x84\x84\x2d\x69\x5b\x05\x44\x3c\x86\xaa\x6f";
+#endif
+
+    static size_t nginx_ver_len = ngx_http_v2_literal_size(NGINX_VER);
+    static u_char nginx_ver[ngx_http_v2_literal_size(NGINX_VER)];
 
     if (!r->stream) {
         return ngx_http_next_header_filter(r);
@@ -215,8 +230,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     if (r->headers_out.server == NULL) {
-        len += 1 + (clcf->server_tokens ? ngx_http_v2_literal_size(NGINX_VER)
-                                        : ngx_http_v2_literal_size("nginx"));
+        len += 1 + (clcf->server_tokens ? nginx_ver_len : sizeof(nginx));
     }
 
     if (r->headers_out.date == NULL) {
@@ -340,10 +354,12 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         len += 1 + NGX_HTTP_V2_INT_OCTETS + r->headers_out.location->value.len;
     }
 
+    tmp_len = len;
+
 #if (NGX_HTTP_GZIP)
     if (r->gzip_vary) {
         if (clcf->gzip_vary) {
-            len += 1 + ngx_http_v2_literal_size("Accept-Encoding");
+            len += 1 + sizeof(accept_encoding);
 
         } else {
             r->gzip_vary = 0;
@@ -371,14 +387,14 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         }
 
         if (header[i].key.len > NGX_HTTP_V2_MAX_FIELD) {
-            ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
+            ngx_log_error(NGX_LOG_CRIT, fc->log, 0,
                           "too long response header name: \"%V\"",
                           &header[i].key);
             return NGX_ERROR;
         }
 
         if (header[i].value.len > NGX_HTTP_V2_MAX_FIELD) {
-            ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
+            ngx_log_error(NGX_LOG_CRIT, fc->log, 0,
                           "too long response header value: \"%V: %V\"",
                           &header[i].key, &header[i].value);
             return NGX_ERROR;
@@ -386,15 +402,29 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 
         len += 1 + NGX_HTTP_V2_INT_OCTETS + header[i].key.len
                  + NGX_HTTP_V2_INT_OCTETS + header[i].value.len;
+
+        if (header[i].key.len > tmp_len) {
+            tmp_len = header[i].key.len;
+        }
+
+        if (header[i].value.len > tmp_len) {
+            tmp_len = header[i].value.len;
+        }
     }
 
-    pos = ngx_palloc(r->pool, len);
-    if (pos == NULL) {
+    tmp = ngx_palloc(r->pool, tmp_len);
+    pos = ngx_pnalloc(r->pool, len);
+
+    if (pos == NULL || tmp == NULL) {
         return NGX_ERROR;
     }
 
     start = pos;
 
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 output header: \":status: %03ui\"",
+                   r->headers_out.status);
+
     if (status) {
         *pos++ = status;
 
@@ -405,24 +435,34 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     }
 
     if (r->headers_out.server == NULL) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 output header: \"server: %s\"",
+                       clcf->server_tokens ? NGINX_VER : "nginx");
+
         *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
 
         if (clcf->server_tokens) {
-            *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof(NGINX_VER) - 1);
-            pos = ngx_cpymem(pos, NGINX_VER, sizeof(NGINX_VER) - 1);
+            if (nginx_ver[0] == '\0') {
+                p = ngx_http_v2_write_value(nginx_ver, (u_char *) NGINX_VER,
+                                            sizeof(NGINX_VER) - 1, tmp);
+                nginx_ver_len = p - nginx_ver;
+            }
+
+            pos = ngx_cpymem(pos, nginx_ver, nginx_ver_len);
 
         } else {
-            *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("nginx") - 1);
-            pos = ngx_cpymem(pos, "nginx", sizeof("nginx") - 1);
+            pos = ngx_cpymem(pos, nginx, sizeof(nginx));
         }
     }
 
     if (r->headers_out.date == NULL) {
-        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_DATE_INDEX);
-        *pos++ = (u_char) ngx_cached_http_time.len;
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 output header: \"date: %V\"",
+                       &ngx_cached_http_time);
 
-        pos = ngx_cpymem(pos, ngx_cached_http_time.data,
-                         ngx_cached_http_time.len);
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_DATE_INDEX);
+        pos = ngx_http_v2_write_value(pos, ngx_cached_http_time.data,
+                                      ngx_cached_http_time.len, tmp);
     }
 
     if (r->headers_out.content_type.len) {
@@ -431,39 +471,43 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         if (r->headers_out.content_type_len == r->headers_out.content_type.len
             && r->headers_out.charset.len)
         {
-            *pos = NGX_HTTP_V2_ENCODE_RAW;
-            pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
-                                        r->headers_out.content_type.len
-                                        + sizeof("; charset=") - 1
-                                        + r->headers_out.charset.len);
+            len = r->headers_out.content_type.len + sizeof("; charset=") - 1
+                  + r->headers_out.charset.len;
 
-            p = pos;
+            p = ngx_pnalloc(r->pool, len);
+            if (p == NULL) {
+                return NGX_ERROR;
+            }
 
-            pos = ngx_cpymem(pos, r->headers_out.content_type.data,
-                             r->headers_out.content_type.len);
+            p = ngx_cpymem(p, r->headers_out.content_type.data,
+                           r->headers_out.content_type.len);
 
-            pos = ngx_cpymem(pos, "; charset=", sizeof("; charset=") - 1);
+            p = ngx_cpymem(p, "; charset=", sizeof("; charset=") - 1);
 
-            pos = ngx_cpymem(pos, r->headers_out.charset.data,
-                             r->headers_out.charset.len);
+            p = ngx_cpymem(p, r->headers_out.charset.data,
+                           r->headers_out.charset.len);
 
-            /* update r->headers_out.content_type for possible logging */
+            /* updated r->headers_out.content_type is also needed for logging */
 
-            r->headers_out.content_type.len = pos - p;
-            r->headers_out.content_type.data = p;
-
-        } else {
-            *pos = NGX_HTTP_V2_ENCODE_RAW;
-            pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
-                                        r->headers_out.content_type.len);
-            pos = ngx_cpymem(pos, r->headers_out.content_type.data,
-                             r->headers_out.content_type.len);
+            r->headers_out.content_type.len = len;
+            r->headers_out.content_type.data = p - len;
         }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 output header: \"content-type: %V\"",
+                       &r->headers_out.content_type);
+
+        pos = ngx_http_v2_write_value(pos, r->headers_out.content_type.data,
+                                      r->headers_out.content_type.len, tmp);
     }
 
     if (r->headers_out.content_length == NULL
         && r->headers_out.content_length_n >= 0)
     {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 output header: \"content-length: %O\"",
+                       r->headers_out.content_length_n);
+
         *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_CONTENT_LENGTH_INDEX);
 
         p = pos;
@@ -476,26 +520,37 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     {
         *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LAST_MODIFIED_INDEX);
 
-        *pos++ = NGX_HTTP_V2_ENCODE_RAW
-                 | (sizeof("Wed, 31 Dec 1986 18:00:00 GMT") - 1);
-        pos = ngx_http_time(pos, r->headers_out.last_modified_time);
+        ngx_http_time(pos, r->headers_out.last_modified_time);
+        len = sizeof("Wed, 31 Dec 1986 18:00:00 GMT") - 1;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 output header: \"last-modified: %*s\"",
+                       len, pos);
+
+        /*
+         * Date will always be encoded using huffman in the temporary buffer,
+         * so it's safe here to use src and dst pointing to the same address.
+         */
+        pos = ngx_http_v2_write_value(pos, pos, len, tmp);
     }
 
     if (r->headers_out.location && r->headers_out.location->value.len) {
-        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LOCATION_INDEX);
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 output header: \"location: %V\"",
+                       &r->headers_out.location->value);
 
-        *pos = NGX_HTTP_V2_ENCODE_RAW;
-        pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
-                                    r->headers_out.location->value.len);
-        pos = ngx_cpymem(pos, r->headers_out.location->value.data,
-                              r->headers_out.location->value.len);
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LOCATION_INDEX);
+        pos = ngx_http_v2_write_value(pos, r->headers_out.location->value.data,
+                                      r->headers_out.location->value.len, tmp);
     }
 
 #if (NGX_HTTP_GZIP)
     if (r->gzip_vary) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 output header: \"vary: Accept-Encoding\"");
+
         *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_VARY_INDEX);
-        *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("Accept-Encoding") - 1);
-        pos = ngx_cpymem(pos, "Accept-Encoding", sizeof("Accept-Encoding") - 1);
+        pos = ngx_cpymem(pos, accept_encoding, sizeof(accept_encoding));
     }
 #endif
 
@@ -518,18 +573,23 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
             continue;
         }
 
+#if (NGX_DEBUG)
+        if (fc->log->log_level & NGX_LOG_DEBUG_HTTP) {
+            ngx_strlow(tmp, header[i].key.data, header[i].key.len);
+
+            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                           "http2 output header: \"%*s: %V\"",
+                           header[i].key.len, tmp, &header[i].value);
+        }
+#endif
+
         *pos++ = 0;
 
-        *pos = NGX_HTTP_V2_ENCODE_RAW;
-        pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
-                                    header[i].key.len);
-        ngx_strlow(pos, header[i].key.data, header[i].key.len);
-        pos += header[i].key.len;
+        pos = ngx_http_v2_write_name(pos, header[i].key.data,
+                                     header[i].key.len, tmp);
 
-        *pos = NGX_HTTP_V2_ENCODE_RAW;
-        pos = ngx_http_v2_write_int(pos, ngx_http_v2_prefix(7),
-                                    header[i].value.len);
-        pos = ngx_cpymem(pos, header[i].value.data, header[i].value.len);
+        pos = ngx_http_v2_write_value(pos, header[i].value.data,
+                                      header[i].value.len, tmp);
     }
 
     frame = ngx_http_v2_create_headers_frame(r, start, pos);
@@ -556,6 +616,32 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 }
 
 
+static u_char *
+ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len, u_char *tmp,
+    ngx_uint_t lower)
+{
+    size_t  hlen;
+
+    hlen = ngx_http_v2_huff_encode(src, len, tmp, lower);
+
+    if (hlen > 0) {
+        *dst = NGX_HTTP_V2_ENCODE_HUFF;
+        dst = ngx_http_v2_write_int(dst, ngx_http_v2_prefix(7), hlen);
+        return ngx_cpymem(dst, tmp, hlen);
+    }
+
+    *dst = NGX_HTTP_V2_ENCODE_RAW;
+    dst = ngx_http_v2_write_int(dst, ngx_http_v2_prefix(7), len);
+
+    if (lower) {
+        ngx_strlow(dst, src, len);
+        return dst + len;
+    }
+
+    return ngx_cpymem(dst, src, len);
+}
+
+
 static u_char *
 ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value)
 {
@@ -713,7 +799,9 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
     if (in == NULL) {
 
         if (stream->queued) {
-            fc->write->delayed = 1;
+            fc->write->active = 1;
+            fc->write->ready = 0;
+
         } else {
             fc->buffered &= ~NGX_HTTP_V2_BUFFERED;
         }
@@ -724,7 +812,8 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
     h2c = stream->connection;
 
     if (size && ngx_http_v2_flow_control(h2c, stream) == NGX_DECLINED) {
-        fc->write->delayed = 1;
+        fc->write->active = 1;
+        fc->write->ready = 0;
         return in;
     }
 
@@ -861,7 +950,8 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
     }
 
     if (in && ngx_http_v2_flow_control(h2c, stream) == NGX_DECLINED) {
-        fc->write->delayed = 1;
+        fc->write->active = 1;
+        fc->write->ready = 0;
     }
 
     return in;
@@ -992,7 +1082,8 @@ ngx_http_v2_filter_send(ngx_connection_t *fc, ngx_http_v2_stream_t *stream)
 
     if (stream->queued) {
         fc->buffered |= NGX_HTTP_V2_BUFFERED;
-        fc->write->delayed = 1;
+        fc->write->active = 1;
+        fc->write->ready = 0;
         return NGX_AGAIN;
     }
 
@@ -1230,14 +1321,7 @@ ngx_http_v2_handle_stream(ngx_http_v2_connection_t *h2c,
 
     wev = stream->request->connection->write;
 
-    /*
-     * This timer can only be set if the stream was delayed because of rate
-     * limit.  In that case the event should be triggered by the timer.
-     */
-
-    if (!wev->timer_set) {
-        wev->delayed = 0;
-
+    if (!wev->delayed) {
         stream->handled = 1;
         ngx_queue_insert_tail(&h2c->posted, &stream->queue);
     }
diff --git a/src/http/v2/ngx_http_v2_huff_encode.c b/src/http/v2/ngx_http_v2_huff_encode.c
index 6c412cf..3f822cd 100644
--- a/src/http/v2/ngx_http_v2_huff_encode.c
+++ b/src/http/v2/ngx_http_v2_huff_encode.c
@@ -2,9 +2,253 @@
 /*
  * Copyright (C) Nginx, Inc.
  * Copyright (C) Valentin V. Bartenev
+ * Copyright (C) 2015 Vlad Krasnov
  */
 
 
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
+
+
+typedef struct {
+    uint32_t  code;
+    uint32_t  len;
+} ngx_http_v2_huff_encode_code_t;
+
+
+static ngx_http_v2_huff_encode_code_t  ngx_http_v2_huff_encode_table[256] =
+{
+    {0x00001ff8, 13}, {0x007fffd8, 23}, {0x0fffffe2, 28}, {0x0fffffe3, 28},
+    {0x0fffffe4, 28}, {0x0fffffe5, 28}, {0x0fffffe6, 28}, {0x0fffffe7, 28},
+    {0x0fffffe8, 28}, {0x00ffffea, 24}, {0x3ffffffc, 30}, {0x0fffffe9, 28},
+    {0x0fffffea, 28}, {0x3ffffffd, 30}, {0x0fffffeb, 28}, {0x0fffffec, 28},
+    {0x0fffffed, 28}, {0x0fffffee, 28}, {0x0fffffef, 28}, {0x0ffffff0, 28},
+    {0x0ffffff1, 28}, {0x0ffffff2, 28}, {0x3ffffffe, 30}, {0x0ffffff3, 28},
+    {0x0ffffff4, 28}, {0x0ffffff5, 28}, {0x0ffffff6, 28}, {0x0ffffff7, 28},
+    {0x0ffffff8, 28}, {0x0ffffff9, 28}, {0x0ffffffa, 28}, {0x0ffffffb, 28},
+    {0x00000014,  6}, {0x000003f8, 10}, {0x000003f9, 10}, {0x00000ffa, 12},
+    {0x00001ff9, 13}, {0x00000015,  6}, {0x000000f8,  8}, {0x000007fa, 11},
+    {0x000003fa, 10}, {0x000003fb, 10}, {0x000000f9,  8}, {0x000007fb, 11},
+    {0x000000fa,  8}, {0x00000016,  6}, {0x00000017,  6}, {0x00000018,  6},
+    {0x00000000,  5}, {0x00000001,  5}, {0x00000002,  5}, {0x00000019,  6},
+    {0x0000001a,  6}, {0x0000001b,  6}, {0x0000001c,  6}, {0x0000001d,  6},
+    {0x0000001e,  6}, {0x0000001f,  6}, {0x0000005c,  7}, {0x000000fb,  8},
+    {0x00007ffc, 15}, {0x00000020,  6}, {0x00000ffb, 12}, {0x000003fc, 10},
+    {0x00001ffa, 13}, {0x00000021,  6}, {0x0000005d,  7}, {0x0000005e,  7},
+    {0x0000005f,  7}, {0x00000060,  7}, {0x00000061,  7}, {0x00000062,  7},
+    {0x00000063,  7}, {0x00000064,  7}, {0x00000065,  7}, {0x00000066,  7},
+    {0x00000067,  7}, {0x00000068,  7}, {0x00000069,  7}, {0x0000006a,  7},
+    {0x0000006b,  7}, {0x0000006c,  7}, {0x0000006d,  7}, {0x0000006e,  7},
+    {0x0000006f,  7}, {0x00000070,  7}, {0x00000071,  7}, {0x00000072,  7},
+    {0x000000fc,  8}, {0x00000073,  7}, {0x000000fd,  8}, {0x00001ffb, 13},
+    {0x0007fff0, 19}, {0x00001ffc, 13}, {0x00003ffc, 14}, {0x00000022,  6},
+    {0x00007ffd, 15}, {0x00000003,  5}, {0x00000023,  6}, {0x00000004,  5},
+    {0x00000024,  6}, {0x00000005,  5}, {0x00000025,  6}, {0x00000026,  6},
+    {0x00000027,  6}, {0x00000006,  5}, {0x00000074,  7}, {0x00000075,  7},
+    {0x00000028,  6}, {0x00000029,  6}, {0x0000002a,  6}, {0x00000007,  5},
+    {0x0000002b,  6}, {0x00000076,  7}, {0x0000002c,  6}, {0x00000008,  5},
+    {0x00000009,  5}, {0x0000002d,  6}, {0x00000077,  7}, {0x00000078,  7},
+    {0x00000079,  7}, {0x0000007a,  7}, {0x0000007b,  7}, {0x00007ffe, 15},
+    {0x000007fc, 11}, {0x00003ffd, 14}, {0x00001ffd, 13}, {0x0ffffffc, 28},
+    {0x000fffe6, 20}, {0x003fffd2, 22}, {0x000fffe7, 20}, {0x000fffe8, 20},
+    {0x003fffd3, 22}, {0x003fffd4, 22}, {0x003fffd5, 22}, {0x007fffd9, 23},
+    {0x003fffd6, 22}, {0x007fffda, 23}, {0x007fffdb, 23}, {0x007fffdc, 23},
+    {0x007fffdd, 23}, {0x007fffde, 23}, {0x00ffffeb, 24}, {0x007fffdf, 23},
+    {0x00ffffec, 24}, {0x00ffffed, 24}, {0x003fffd7, 22}, {0x007fffe0, 23},
+    {0x00ffffee, 24}, {0x007fffe1, 23}, {0x007fffe2, 23}, {0x007fffe3, 23},
+    {0x007fffe4, 23}, {0x001fffdc, 21}, {0x003fffd8, 22}, {0x007fffe5, 23},
+    {0x003fffd9, 22}, {0x007fffe6, 23}, {0x007fffe7, 23}, {0x00ffffef, 24},
+    {0x003fffda, 22}, {0x001fffdd, 21}, {0x000fffe9, 20}, {0x003fffdb, 22},
+    {0x003fffdc, 22}, {0x007fffe8, 23}, {0x007fffe9, 23}, {0x001fffde, 21},
+    {0x007fffea, 23}, {0x003fffdd, 22}, {0x003fffde, 22}, {0x00fffff0, 24},
+    {0x001fffdf, 21}, {0x003fffdf, 22}, {0x007fffeb, 23}, {0x007fffec, 23},
+    {0x001fffe0, 21}, {0x001fffe1, 21}, {0x003fffe0, 22}, {0x001fffe2, 21},
+    {0x007fffed, 23}, {0x003fffe1, 22}, {0x007fffee, 23}, {0x007fffef, 23},
+    {0x000fffea, 20}, {0x003fffe2, 22}, {0x003fffe3, 22}, {0x003fffe4, 22},
+    {0x007ffff0, 23}, {0x003fffe5, 22}, {0x003fffe6, 22}, {0x007ffff1, 23},
+    {0x03ffffe0, 26}, {0x03ffffe1, 26}, {0x000fffeb, 20}, {0x0007fff1, 19},
+    {0x003fffe7, 22}, {0x007ffff2, 23}, {0x003fffe8, 22}, {0x01ffffec, 25},
+    {0x03ffffe2, 26}, {0x03ffffe3, 26}, {0x03ffffe4, 26}, {0x07ffffde, 27},
+    {0x07ffffdf, 27}, {0x03ffffe5, 26}, {0x00fffff1, 24}, {0x01ffffed, 25},
+    {0x0007fff2, 19}, {0x001fffe3, 21}, {0x03ffffe6, 26}, {0x07ffffe0, 27},
+    {0x07ffffe1, 27}, {0x03ffffe7, 26}, {0x07ffffe2, 27}, {0x00fffff2, 24},
+    {0x001fffe4, 21}, {0x001fffe5, 21}, {0x03ffffe8, 26}, {0x03ffffe9, 26},
+    {0x0ffffffd, 28}, {0x07ffffe3, 27}, {0x07ffffe4, 27}, {0x07ffffe5, 27},
+    {0x000fffec, 20}, {0x00fffff3, 24}, {0x000fffed, 20}, {0x001fffe6, 21},
+    {0x003fffe9, 22}, {0x001fffe7, 21}, {0x001fffe8, 21}, {0x007ffff3, 23},
+    {0x003fffea, 22}, {0x003fffeb, 22}, {0x01ffffee, 25}, {0x01ffffef, 25},
+    {0x00fffff4, 24}, {0x00fffff5, 24}, {0x03ffffea, 26}, {0x007ffff4, 23},
+    {0x03ffffeb, 26}, {0x07ffffe6, 27}, {0x03ffffec, 26}, {0x03ffffed, 26},
+    {0x07ffffe7, 27}, {0x07ffffe8, 27}, {0x07ffffe9, 27}, {0x07ffffea, 27},
+    {0x07ffffeb, 27}, {0x0ffffffe, 28}, {0x07ffffec, 27}, {0x07ffffed, 27},
+    {0x07ffffee, 27}, {0x07ffffef, 27}, {0x07fffff0, 27}, {0x03ffffee, 26}
+};
+
+
+/* same as above, but embeds lowercase transformation */
+static ngx_http_v2_huff_encode_code_t  ngx_http_v2_huff_encode_table_lc[256] =
+{
+    {0x00001ff8, 13}, {0x007fffd8, 23}, {0x0fffffe2, 28}, {0x0fffffe3, 28},
+    {0x0fffffe4, 28}, {0x0fffffe5, 28}, {0x0fffffe6, 28}, {0x0fffffe7, 28},
+    {0x0fffffe8, 28}, {0x00ffffea, 24}, {0x3ffffffc, 30}, {0x0fffffe9, 28},
+    {0x0fffffea, 28}, {0x3ffffffd, 30}, {0x0fffffeb, 28}, {0x0fffffec, 28},
+    {0x0fffffed, 28}, {0x0fffffee, 28}, {0x0fffffef, 28}, {0x0ffffff0, 28},
+    {0x0ffffff1, 28}, {0x0ffffff2, 28}, {0x3ffffffe, 30}, {0x0ffffff3, 28},
+    {0x0ffffff4, 28}, {0x0ffffff5, 28}, {0x0ffffff6, 28}, {0x0ffffff7, 28},
+    {0x0ffffff8, 28}, {0x0ffffff9, 28}, {0x0ffffffa, 28}, {0x0ffffffb, 28},
+    {0x00000014,  6}, {0x000003f8, 10}, {0x000003f9, 10}, {0x00000ffa, 12},
+    {0x00001ff9, 13}, {0x00000015,  6}, {0x000000f8,  8}, {0x000007fa, 11},
+    {0x000003fa, 10}, {0x000003fb, 10}, {0x000000f9,  8}, {0x000007fb, 11},
+    {0x000000fa,  8}, {0x00000016,  6}, {0x00000017,  6}, {0x00000018,  6},
+    {0x00000000,  5}, {0x00000001,  5}, {0x00000002,  5}, {0x00000019,  6},
+    {0x0000001a,  6}, {0x0000001b,  6}, {0x0000001c,  6}, {0x0000001d,  6},
+    {0x0000001e,  6}, {0x0000001f,  6}, {0x0000005c,  7}, {0x000000fb,  8},
+    {0x00007ffc, 15}, {0x00000020,  6}, {0x00000ffb, 12}, {0x000003fc, 10},
+    {0x00001ffa, 13}, {0x00000003,  5}, {0x00000023,  6}, {0x00000004,  5},
+    {0x00000024,  6}, {0x00000005,  5}, {0x00000025,  6}, {0x00000026,  6},
+    {0x00000027,  6}, {0x00000006,  5}, {0x00000074,  7}, {0x00000075,  7},
+    {0x00000028,  6}, {0x00000029,  6}, {0x0000002a,  6}, {0x00000007,  5},
+    {0x0000002b,  6}, {0x00000076,  7}, {0x0000002c,  6}, {0x00000008,  5},
+    {0x00000009,  5}, {0x0000002d,  6}, {0x00000077,  7}, {0x00000078,  7},
+    {0x00000079,  7}, {0x0000007a,  7}, {0x0000007b,  7}, {0x00001ffb, 13},
+    {0x0007fff0, 19}, {0x00001ffc, 13}, {0x00003ffc, 14}, {0x00000022,  6},
+    {0x00007ffd, 15}, {0x00000003,  5}, {0x00000023,  6}, {0x00000004,  5},
+    {0x00000024,  6}, {0x00000005,  5}, {0x00000025,  6}, {0x00000026,  6},
+    {0x00000027,  6}, {0x00000006,  5}, {0x00000074,  7}, {0x00000075,  7},
+    {0x00000028,  6}, {0x00000029,  6}, {0x0000002a,  6}, {0x00000007,  5},
+    {0x0000002b,  6}, {0x00000076,  7}, {0x0000002c,  6}, {0x00000008,  5},
+    {0x00000009,  5}, {0x0000002d,  6}, {0x00000077,  7}, {0x00000078,  7},
+    {0x00000079,  7}, {0x0000007a,  7}, {0x0000007b,  7}, {0x00007ffe, 15},
+    {0x000007fc, 11}, {0x00003ffd, 14}, {0x00001ffd, 13}, {0x0ffffffc, 28},
+    {0x000fffe6, 20}, {0x003fffd2, 22}, {0x000fffe7, 20}, {0x000fffe8, 20},
+    {0x003fffd3, 22}, {0x003fffd4, 22}, {0x003fffd5, 22}, {0x007fffd9, 23},
+    {0x003fffd6, 22}, {0x007fffda, 23}, {0x007fffdb, 23}, {0x007fffdc, 23},
+    {0x007fffdd, 23}, {0x007fffde, 23}, {0x00ffffeb, 24}, {0x007fffdf, 23},
+    {0x00ffffec, 24}, {0x00ffffed, 24}, {0x003fffd7, 22}, {0x007fffe0, 23},
+    {0x00ffffee, 24}, {0x007fffe1, 23}, {0x007fffe2, 23}, {0x007fffe3, 23},
+    {0x007fffe4, 23}, {0x001fffdc, 21}, {0x003fffd8, 22}, {0x007fffe5, 23},
+    {0x003fffd9, 22}, {0x007fffe6, 23}, {0x007fffe7, 23}, {0x00ffffef, 24},
+    {0x003fffda, 22}, {0x001fffdd, 21}, {0x000fffe9, 20}, {0x003fffdb, 22},
+    {0x003fffdc, 22}, {0x007fffe8, 23}, {0x007fffe9, 23}, {0x001fffde, 21},
+    {0x007fffea, 23}, {0x003fffdd, 22}, {0x003fffde, 22}, {0x00fffff0, 24},
+    {0x001fffdf, 21}, {0x003fffdf, 22}, {0x007fffeb, 23}, {0x007fffec, 23},
+    {0x001fffe0, 21}, {0x001fffe1, 21}, {0x003fffe0, 22}, {0x001fffe2, 21},
+    {0x007fffed, 23}, {0x003fffe1, 22}, {0x007fffee, 23}, {0x007fffef, 23},
+    {0x000fffea, 20}, {0x003fffe2, 22}, {0x003fffe3, 22}, {0x003fffe4, 22},
+    {0x007ffff0, 23}, {0x003fffe5, 22}, {0x003fffe6, 22}, {0x007ffff1, 23},
+    {0x03ffffe0, 26}, {0x03ffffe1, 26}, {0x000fffeb, 20}, {0x0007fff1, 19},
+    {0x003fffe7, 22}, {0x007ffff2, 23}, {0x003fffe8, 22}, {0x01ffffec, 25},
+    {0x03ffffe2, 26}, {0x03ffffe3, 26}, {0x03ffffe4, 26}, {0x07ffffde, 27},
+    {0x07ffffdf, 27}, {0x03ffffe5, 26}, {0x00fffff1, 24}, {0x01ffffed, 25},
+    {0x0007fff2, 19}, {0x001fffe3, 21}, {0x03ffffe6, 26}, {0x07ffffe0, 27},
+    {0x07ffffe1, 27}, {0x03ffffe7, 26}, {0x07ffffe2, 27}, {0x00fffff2, 24},
+    {0x001fffe4, 21}, {0x001fffe5, 21}, {0x03ffffe8, 26}, {0x03ffffe9, 26},
+    {0x0ffffffd, 28}, {0x07ffffe3, 27}, {0x07ffffe4, 27}, {0x07ffffe5, 27},
+    {0x000fffec, 20}, {0x00fffff3, 24}, {0x000fffed, 20}, {0x001fffe6, 21},
+    {0x003fffe9, 22}, {0x001fffe7, 21}, {0x001fffe8, 21}, {0x007ffff3, 23},
+    {0x003fffea, 22}, {0x003fffeb, 22}, {0x01ffffee, 25}, {0x01ffffef, 25},
+    {0x00fffff4, 24}, {0x00fffff5, 24}, {0x03ffffea, 26}, {0x007ffff4, 23},
+    {0x03ffffeb, 26}, {0x07ffffe6, 27}, {0x03ffffec, 26}, {0x03ffffed, 26},
+    {0x07ffffe7, 27}, {0x07ffffe8, 27}, {0x07ffffe9, 27}, {0x07ffffea, 27},
+    {0x07ffffeb, 27}, {0x0ffffffe, 28}, {0x07ffffec, 27}, {0x07ffffed, 27},
+    {0x07ffffee, 27}, {0x07ffffef, 27}, {0x07fffff0, 27}, {0x03ffffee, 26}
+};
+
+
+#if (NGX_PTR_SIZE == 8)
+
+#if (NGX_HAVE_LITTLE_ENDIAN)
+
+#if (NGX_HAVE_GCC_BSWAP64)
+#define ngx_http_v2_huff_encode_buf(dst, buf)                                 \
+    (*(uint64_t *) (dst) = __builtin_bswap64(buf))
+#else
+#define ngx_http_v2_huff_encode_buf(dst, buf)                                 \
+    ((dst)[0] = (u_char) ((buf) >> 56),                                       \
+     (dst)[1] = (u_char) ((buf) >> 48),                                       \
+     (dst)[2] = (u_char) ((buf) >> 40),                                       \
+     (dst)[3] = (u_char) ((buf) >> 32),                                       \
+     (dst)[4] = (u_char) ((buf) >> 24),                                       \
+     (dst)[5] = (u_char) ((buf) >> 16),                                       \
+     (dst)[6] = (u_char) ((buf) >> 8),                                        \
+     (dst)[7] = (u_char)  (buf))
+#endif
+
+#else /* !NGX_HAVE_LITTLE_ENDIAN */
+#define ngx_http_v2_huff_encode_buf(dst, buf)                                 \
+    (*(uint64_t *) (dst) = (buf))
+#endif
+
+#else /* NGX_PTR_SIZE == 4 */
+
+#define ngx_http_v2_huff_encode_buf(dst, buf)                                 \
+    (*(uint32_t *) (dst) = htonl(buf))
+
+#endif
+
+
+size_t
+ngx_http_v2_huff_encode(u_char *src, size_t len, u_char *dst, ngx_uint_t lower)
+{
+    u_char                          *end;
+    size_t                           hlen;
+    ngx_uint_t                       buf, pending, code;
+    ngx_http_v2_huff_encode_code_t  *table, *next;
+
+    table = lower ? ngx_http_v2_huff_encode_table_lc
+                  : ngx_http_v2_huff_encode_table;
+    hlen = 0;
+    buf = 0;
+    pending = 0;
+
+    end = src + len;
+
+    while (src != end) {
+        next = &table[*src++];
+
+        code = next->code;
+        pending += next->len;
+
+        /* accumulate bits */
+        if (pending < sizeof(buf) * 8) {
+            buf |= code << (sizeof(buf) * 8 - pending);
+            continue;
+        }
+
+        if (hlen + sizeof(buf) >= len) {
+            return 0;
+        }
+
+        pending -= sizeof(buf) * 8;
+
+        buf |= code >> pending;
+
+        ngx_http_v2_huff_encode_buf(&dst[hlen], buf);
+
+        hlen += sizeof(buf);
+
+        buf = pending ? code << (sizeof(buf) * 8 - pending) : 0;
+    }
+
+    if (pending == 0) {
+        return hlen;
+    }
+
+    buf |= (ngx_uint_t) -1 >> pending;
+
+    pending = ngx_align(pending, 8);
+
+    if (hlen + pending / 8 >= len) {
+        return 0;
+    }
+
+    buf >>= sizeof(buf) * 8 - pending;
+
+    do {
+        pending -= 8;
+        dst[hlen++] = (u_char) (buf >> pending);
+    } while (pending);
+
+    return hlen;
+}
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 7c6bf7a..9be6376 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -784,9 +784,9 @@ static void
 ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
 {
     sigset_t          set;
-    uint64_t          cpu_affinity;
     ngx_int_t         n;
     ngx_uint_t        i;
+    ngx_cpuset_t     *cpu_affinity;
     struct rlimit     rlmt;
     ngx_core_conf_t  *ccf;
     ngx_listening_t  *ls;
diff --git a/src/os/unix/ngx_setaffinity.c b/src/os/unix/ngx_setaffinity.c
index 8f6cf35..34ec390 100644
--- a/src/os/unix/ngx_setaffinity.c
+++ b/src/os/unix/ngx_setaffinity.c
@@ -10,29 +10,20 @@
 
 #if (NGX_HAVE_CPUSET_SETAFFINITY)
 
-#include <sys/cpuset.h>
-
 void
-ngx_setaffinity(uint64_t cpu_affinity, ngx_log_t *log)
+ngx_setaffinity(ngx_cpuset_t *cpu_affinity, ngx_log_t *log)
 {
-    cpuset_t    mask;
     ngx_uint_t  i;
 
-    ngx_log_error(NGX_LOG_NOTICE, log, 0,
-                  "cpuset_setaffinity(0x%08Xl)", cpu_affinity);
-
-    CPU_ZERO(&mask);
-    i = 0;
-    do {
-        if (cpu_affinity & 1) {
-            CPU_SET(i, &mask);
+    for (i = 0; i < CPU_SETSIZE; i++) {
+        if (CPU_ISSET(i, cpu_affinity)) {
+            ngx_log_error(NGX_LOG_NOTICE, log, 0,
+                          "cpuset_setaffinity(): using cpu #%ui", i);
         }
-        i++;
-        cpu_affinity >>= 1;
-    } while (cpu_affinity);
+    }
 
     if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1,
-                           sizeof(cpuset_t), &mask) == -1)
+                           sizeof(cpuset_t), cpu_affinity) == -1)
     {
         ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
                       "cpuset_setaffinity() failed");
@@ -42,25 +33,18 @@ ngx_setaffinity(uint64_t cpu_affinity, ngx_log_t *log)
 #elif (NGX_HAVE_SCHED_SETAFFINITY)
 
 void
-ngx_setaffinity(uint64_t cpu_affinity, ngx_log_t *log)
+ngx_setaffinity(ngx_cpuset_t *cpu_affinity, ngx_log_t *log)
 {
-    cpu_set_t   mask;
     ngx_uint_t  i;
 
-    ngx_log_error(NGX_LOG_NOTICE, log, 0,
-                  "sched_setaffinity(0x%08Xl)", cpu_affinity);
-
-    CPU_ZERO(&mask);
-    i = 0;
-    do {
-        if (cpu_affinity & 1) {
-            CPU_SET(i, &mask);
+    for (i = 0; i < CPU_SETSIZE; i++) {
+        if (CPU_ISSET(i, cpu_affinity)) {
+            ngx_log_error(NGX_LOG_NOTICE, log, 0,
+                          "sched_setaffinity(): using cpu #%ui", i);
         }
-        i++;
-        cpu_affinity >>= 1;
-    } while (cpu_affinity);
+    }
 
-    if (sched_setaffinity(0, sizeof(cpu_set_t), &mask) == -1) {
+    if (sched_setaffinity(0, sizeof(cpu_set_t), cpu_affinity) == -1) {
         ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
                       "sched_setaffinity() failed");
     }
diff --git a/src/os/unix/ngx_setaffinity.h b/src/os/unix/ngx_setaffinity.h
index 33f5835..a4139ed 100644
--- a/src/os/unix/ngx_setaffinity.h
+++ b/src/os/unix/ngx_setaffinity.h
@@ -11,12 +11,26 @@
 
 #define NGX_HAVE_CPU_AFFINITY 1
 
-void ngx_setaffinity(uint64_t cpu_affinity, ngx_log_t *log);
+#if (NGX_HAVE_SCHED_SETAFFINITY)
+
+typedef cpu_set_t  ngx_cpuset_t;
+
+#elif (NGX_HAVE_CPUSET_SETAFFINITY)
+
+#include <sys/cpuset.h>
+
+typedef cpuset_t  ngx_cpuset_t;
+
+#endif
+
+void ngx_setaffinity(ngx_cpuset_t *cpu_affinity, ngx_log_t *log);
 
 #else
 
 #define ngx_setaffinity(cpu_affinity, log)
 
+typedef uint64_t  ngx_cpuset_t;
+
 #endif
 
 
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 6800500..b969fea 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -10,9 +10,6 @@
 #include <ngx_stream.h>
 
 
-typedef void (*ngx_stream_proxy_handler_pt)(ngx_stream_session_t *s);
-
-
 typedef struct {
     ngx_msec_t                       connect_timeout;
     ngx_msec_t                       timeout;
@@ -435,8 +432,6 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
 
     ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0, "proxy connect: %i", rc);
 
-    pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
-
     if (rc == NGX_ERROR) {
         ngx_stream_proxy_finalize(s, NGX_ERROR);
         return;
@@ -471,6 +466,8 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
     pc->read->handler = ngx_stream_proxy_connect_handler;
     pc->write->handler = ngx_stream_proxy_connect_handler;
 
+    pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
+
     ngx_add_timer(pc->write, pscf->connect_timeout);
 }
 

From 3072f74f2dc5a1dc18dc5f7f288f9613800f3780 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 11:27:04 +0300
Subject: [PATCH 044/600] Imported Upstream version 1.9.13

---
 CHANGES                                       |   47 +
 CHANGES.ru                                    |   50 +
 auto/init                                     |    1 -
 auto/install                                  |   63 +-
 auto/lib/conf                                 |    2 +-
 auto/lib/make                                 |    2 +-
 auto/lib/perl/conf                            |    7 +-
 auto/lib/perl/make                            |    5 +-
 auto/make                                     |   45 +-
 auto/module                                   |    4 +-
 auto/modules                                  |    6 +-
 auto/options                                  |    6 +-
 auto/sources                                  |    1 +
 auto/unix                                     |   39 +
 src/core/nginx.c                              |    4 +-
 src/core/nginx.h                              |    4 +-
 src/core/ngx_connection.c                     |  108 +-
 src/core/ngx_connection.h                     |    4 +
 src/core/ngx_cycle.c                          |    4 +
 src/core/ngx_file.c                           |   13 +-
 src/core/ngx_file.h                           |    2 +
 src/core/ngx_inet.c                           |    6 +-
 src/core/ngx_module.c                         |    3 +-
 src/core/ngx_module.h                         |    2 +-
 src/core/ngx_output_chain.c                   |   12 +-
 src/core/ngx_palloc.c                         |   88 +-
 src/core/ngx_resolver.c                       | 1024 ++++++++++++++++-
 src/core/ngx_resolver.h                       |   48 +-
 src/event/modules/ngx_devpoll_module.c        |    4 +-
 src/event/modules/ngx_epoll_module.c          |    3 +
 src/event/modules/ngx_eventport_module.c      |    2 +-
 src/event/ngx_event.c                         |    6 +-
 src/event/ngx_event.h                         |    9 +-
 src/event/ngx_event_accept.c                  |  443 ++++++-
 src/event/ngx_event_connect.c                 |   41 +-
 src/event/ngx_event_connect.h                 |    1 +
 src/event/ngx_event_pipe.c                    |   98 +-
 src/event/ngx_event_pipe.h                    |   10 +
 src/http/modules/ngx_http_fastcgi_module.c    |    1 +
 src/http/modules/ngx_http_proxy_module.c      |    1 +
 src/http/modules/ngx_http_scgi_module.c       |    1 +
 src/http/modules/ngx_http_sub_filter_module.c |    8 +-
 src/http/modules/ngx_http_uwsgi_module.c      |    1 +
 src/http/ngx_http_cache.h                     |    4 +
 src/http/ngx_http_copy_filter_module.c        |   16 +-
 src/http/ngx_http_core_module.c               |    9 +
 src/http/ngx_http_core_module.h               |    1 +
 src/http/ngx_http_file_cache.c                |   48 +-
 src/http/ngx_http_request_body.c              |  109 +-
 src/http/ngx_http_upstream.c                  |  230 +++-
 src/http/ngx_http_upstream.h                  |    3 +-
 src/http/v2/ngx_http_v2.c                     |   15 +-
 src/os/unix/ngx_darwin_init.c                 |    1 +
 src/os/unix/ngx_errno.h                       |    1 +
 src/os/unix/ngx_files.c                       |  284 +++--
 src/os/unix/ngx_files.h                       |    6 +-
 src/os/unix/ngx_freebsd_init.c                |    1 +
 src/os/unix/ngx_freebsd_sendfile_chain.c      |   13 +
 src/os/unix/ngx_linux_init.c                  |    1 +
 src/os/unix/ngx_linux_sendfile_chain.c        |   65 +-
 src/os/unix/ngx_os.h                          |    2 +
 src/os/unix/ngx_posix_config.h                |    2 +-
 src/os/unix/ngx_posix_init.c                  |    1 +
 src/os/unix/ngx_solaris_init.c                |    1 +
 src/os/unix/ngx_solaris_sendfilev_chain.c     |   23 +
 src/os/unix/ngx_udp_send.c                    |   56 +
 src/stream/ngx_stream.c                       |    9 +-
 src/stream/ngx_stream.h                       |    2 +
 src/stream/ngx_stream_core_module.c           |   30 +-
 src/stream/ngx_stream_handler.c               |   15 +-
 src/stream/ngx_stream_proxy_module.c          |  167 ++-
 src/stream/ngx_stream_upstream.c              |    2 +-
 src/stream/ngx_stream_upstream.h              |    1 +
 73 files changed, 2809 insertions(+), 538 deletions(-)
 create mode 100644 src/os/unix/ngx_udp_send.c

diff --git a/CHANGES b/CHANGES
index e94e14f..0ac9c61 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,51 @@
 
+Changes with nginx 1.9.13                                        29 Mar 2016
+
+    *) Change: non-idempotent requests (POST, LOCK, PATCH) are no longer
+       passed to the next server by default if a request has been sent to a
+       backend; the "non_idempotent" parameter of the "proxy_next_upstream"
+       directive explicitly allows retrying such requests.
+
+    *) Feature: the ngx_http_perl_module can be built dynamically.
+
+    *) Feature: UDP support in the stream module.
+
+    *) Feature: the "aio_write" directive.
+
+    *) Feature: now cache manager monitors number of elements in caches and
+       tries to avoid cache keys zone overflows.
+
+    *) Bugfix: "task already active" and "second aio post" alerts might
+       appear in logs when using the "sendfile" and "aio" directives with
+       subrequests.
+
+    *) Bugfix: "zero size buf in output" alerts might appear in logs if
+       caching was used and a client closed a connection prematurely.
+
+    *) Bugfix: connections with clients might be closed needlessly if
+       caching was used.
+       Thanks to Justin Li.
+
+    *) Bugfix: nginx might hog CPU if the "sendfile" directive was used on
+       Linux or Solaris and a file being sent was changed during sending.
+
+    *) Bugfix: connections might hang when using the "sendfile" and "aio
+       threads" directives.
+
+    *) Bugfix: in the "proxy_pass", "fastcgi_pass", "scgi_pass", and
+       "uwsgi_pass" directives when using variables.
+       Thanks to Piotr Sikora.
+
+    *) Bugfix: in the ngx_http_sub_filter_module.
+
+    *) Bugfix: if an error occurred in a cached backend connection, the
+       request was passed to the next server regardless of the
+       proxy_next_upstream directive.
+
+    *) Bugfix: "CreateFile() failed" errors when creating temporary files on
+       Windows.
+
+
 Changes with nginx 1.9.12                                        24 Feb 2016
 
     *) Feature: Huffman encoding of response headers in HTTP/2.
diff --git a/CHANGES.ru b/CHANGES.ru
index c11c477..7c92f7b 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,54 @@
 
+Изменения в nginx 1.9.13                                          29.03.2016
+
+    *) Изменение: неидемпотентные запросы (POST, LOCK, PATCH) теперь по
+       умолчанию не передаются на другой сервер, если запрос уже был
+       отправлен на бэкенд; параметр non_idempotent директивы
+       proxy_next_upstream явно разрешает повторять такие запросы.
+
+    *) Добавление: модуль ngx_http_perl_module теперь можно собрать
+       динамически.
+
+    *) Добавление: поддержка UDP в модуле stream.
+
+    *) Добавление: директива aio_write.
+
+    *) Добавление: теперь cache manager следит за количеством элементов в
+       кэше и старается не допускать переполнений зоны разделяемой памяти.
+
+    *) Исправление: при использовании директив sendfile и aio с подзапросами
+       в логах могли появляться сообщения "task already active" и "second
+       aio post".
+
+    *) Исправление: при использовании кэширования в логах могли появляться
+       сообщения "zero size buf in output", если клиент закрывал соединение
+       преждевременно.
+
+    *) Исправление: при использовании кэширования соединения с клиентами
+       могли закрываться без необходимости.
+       Спасибо Justin Li.
+
+    *) Исправление: nginx мог нагружать процессор при использовании
+       директивы sendfile на Linux и Solaris, если отправляемый файл был
+       изменён в процессе отправки.
+
+    *) Исправление: при использовании директив sendfile и "aio threads"
+       соединения могли зависать.
+
+    *) Исправление: в директивах proxy_pass, fastcgi_pass, scgi_pass и
+       uwsgi_pass при использовании переменных.
+       Спасибо Piotr Sikora.
+
+    *) Исправление: в модуле ngx_http_sub_filter_module.
+
+    *) Исправление: если в закэшированном соединении к бэкенду происходила
+       ошибка, запрос передавался на другой сервер без учёта директивы
+       proxy_next_upstream.
+
+    *) Исправление: ошибки "CreateFile() failed" при создании временных
+       файлов на Windows.
+
+
 Изменения в nginx 1.9.12                                          24.02.2016
 
     *) Добавление: кодирование Хаффмана заголовков ответов в HTTP/2.
diff --git a/auto/init b/auto/init
index c593eda..910f529 100644
--- a/auto/init
+++ b/auto/init
@@ -5,7 +5,6 @@
 
 NGX_MAKEFILE=$NGX_OBJS/Makefile
 NGX_MODULES_C=$NGX_OBJS/ngx_modules.c
-NGX_MODULES=
 
 NGX_AUTO_HEADERS_H=$NGX_OBJS/ngx_auto_headers.h
 NGX_AUTO_CONFIG_H=$NGX_OBJS/ngx_auto_config.h
diff --git a/auto/install b/auto/install
index 9469a49..d884487 100644
--- a/auto/install
+++ b/auto/install
@@ -3,7 +3,7 @@
 # Copyright (C) Nginx, Inc.
 
 
-if [ $USE_PERL = YES ]; then
+if [ $USE_PERL != NO ]; then
 
     cat << END                                                >> $NGX_MAKEFILE
 
@@ -107,54 +107,54 @@ $NGX_OBJS/nginx.8:	$NGX_MAN $NGX_AUTO_CONFIG_H
 install:	build $NGX_INSTALL_PERL_MODULES
 	test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
 
-	test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
+	test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \\
 		|| mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`'
-	test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \
-		|| mv '\$(DESTDIR)$NGX_SBIN_PATH' \
+	test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \\
+		|| mv '\$(DESTDIR)$NGX_SBIN_PATH' \\
 			'\$(DESTDIR)$NGX_SBIN_PATH.old'
 	cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'
 
-	test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \
+	test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \\
 		|| mkdir -p '\$(DESTDIR)$NGX_CONF_PREFIX'
 
 	cp conf/koi-win '\$(DESTDIR)$NGX_CONF_PREFIX'
 	cp conf/koi-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
 	cp conf/win-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
 
-	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \
+	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \\
 		|| cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX'
 	cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.default'
 
-	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
+	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \\
 		|| cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
-	cp conf/fastcgi_params \
+	cp conf/fastcgi_params \\
 		'\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
 
-	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \
+	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \\
 		|| cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
 	cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
 
-	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params' \
+	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params' \\
 		|| cp conf/uwsgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
-	cp conf/uwsgi_params \
+	cp conf/uwsgi_params \\
 		'\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params.default'
 
-	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params' \
+	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params' \\
 		|| cp conf/scgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
-	cp conf/scgi_params \
+	cp conf/scgi_params \\
 		'\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params.default'
 
-	test -f '\$(DESTDIR)$NGX_CONF_PATH' \
+	test -f '\$(DESTDIR)$NGX_CONF_PATH' \\
 		|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
 	cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
 
-	test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \
+	test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\
 		|| mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
 
-	test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
-		mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
+	test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' \\
+		|| mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
 
-	test -d '\$(DESTDIR)$NGX_PREFIX/html' \
+	test -d '\$(DESTDIR)$NGX_PREFIX/html' \\
 		|| cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX'
 END
 
@@ -162,24 +162,38 @@ END
 if test -n "$NGX_ERROR_LOG_PATH"; then
     cat << END                                                >> $NGX_MAKEFILE
 
-	test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \
-		mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`'
+	test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' \\
+		|| mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`'
 END
 
 fi
 
 
-if test -n "$NGX_MODULES"; then
+if test -n "$DYNAMIC_MODULES"; then
     cat << END                                                >> $NGX_MAKEFILE
 
-	test -d '\$(DESTDIR)$NGX_MODULES_PATH' \
+	test -d '\$(DESTDIR)$NGX_MODULES_PATH' \\
 		|| mkdir -p '\$(DESTDIR)$NGX_MODULES_PATH'
-	cp $NGX_MODULES '\$(DESTDIR)$NGX_MODULES_PATH'
 END
 
 fi
 
 
+for ngx_module in $DYNAMIC_MODULES
+do
+    ngx_module=$ngx_module$ngx_modext
+
+    cat << END                                                >> $NGX_MAKEFILE
+
+	test ! -f '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module' \\
+		|| mv '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module' \\
+			'\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module.old'
+	cp $NGX_OBJS/$ngx_module '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module'
+END
+
+done
+
+
 # create Makefile
 
 cat << END >> Makefile
@@ -190,6 +204,9 @@ build:
 install:
 	\$(MAKE) -f $NGX_MAKEFILE install
 
+modules:
+	\$(MAKE) -f $NGX_MAKEFILE modules
+
 upgrade:
 	$NGX_SBIN_PATH -t
 
diff --git a/auto/lib/conf b/auto/lib/conf
index 6aaa43a..a6242e7 100644
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -66,7 +66,7 @@ if [ $USE_LIBGD != NO ]; then
     . auto/lib/libgd/conf
 fi
 
-if [ $USE_PERL = YES ]; then
+if [ $USE_PERL != NO ]; then
     . auto/lib/perl/conf
 fi
 
diff --git a/auto/lib/make b/auto/lib/make
index 58a84a3..6298b94 100644
--- a/auto/lib/make
+++ b/auto/lib/make
@@ -27,6 +27,6 @@ if [ $NGX_LIBATOMIC != NO -a $NGX_LIBATOMIC != YES ]; then
     . auto/lib/libatomic/make
 fi
 
-if [ $USE_PERL = YES ]; then
+if [ $USE_PERL != NO ]; then
     . auto/lib/perl/make
 fi
diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf
index 4d1bcf1..f5f5d3e 100644
--- a/auto/lib/perl/conf
+++ b/auto/lib/perl/conf
@@ -60,8 +60,11 @@ if test -n "$NGX_PERL_VER"; then
                          | sed -e 's/-arch i386//' -e 's/-arch x86_64//'`
     fi
 
-    CORE_LINK="$CORE_LINK $ngx_perl_ldopts"
-    LINK_DEPS="$LINK_DEPS $NGX_OBJS/$ngx_perl_module"
+    if [ $USE_PERL = YES ]; then
+        CORE_LINK="$CORE_LINK $ngx_perl_ldopts"
+    fi
+
+    NGX_LIB_PERL="$ngx_perl_ldopts"
 
     if test -n "$NGX_PERL_MODULES"; then
         have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\""
diff --git a/auto/lib/perl/make b/auto/lib/perl/make
index d1c1b9e..8af8902 100644
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -8,7 +8,10 @@ v=`grep 'define NGINX_VERSION' src/core/nginx.h | sed -e 's/^.*"\(.*\)".*/\1/'`
 
 cat << END                                                    >> $NGX_MAKEFILE
 
-$NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext: \\
+$NGX_OBJS/src/http/modules/perl/ngx_http_perl_module.o: \\
+		$NGX_OBJS/$ngx_perl_module
+
+$NGX_OBJS/$ngx_perl_module: \\
 		\$(CORE_DEPS) \$(HTTP_DEPS) \\
 		src/http/modules/perl/ngx_http_perl_module.h \\
 		$NGX_OBJS/src/http/modules/perl/Makefile
diff --git a/auto/make b/auto/make
index 560924b..5589bee 100644
--- a/auto/make
+++ b/auto/make
@@ -225,12 +225,12 @@ cat << END                                                    >> $NGX_MAKEFILE
 
 build:	binary modules manpage
 
-binary:	$NGX_OBJS${ngx_dirsep}nginx${ngx_binext}
+binary:	$NGX_OBJS${ngx_dirsep}nginx$ngx_binext
 
-$NGX_OBJS${ngx_dirsep}nginx${ngx_binext}:	$ngx_deps$ngx_spacer
-	\$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
+$NGX_OBJS${ngx_dirsep}nginx$ngx_binext:	$ngx_deps$ngx_spacer
+	\$(LINK) $ngx_long_start$ngx_binout$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
 	$ngx_rcc
-${ngx_long_end}
+$ngx_long_end
 
 modules:
 END
@@ -281,7 +281,7 @@ if [ $HTTP = YES ]; then
         ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
     else
         ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(HTTP_INCS)"
-        ngx_perl_cc="\$(CC) $ngx_compile_opt \$(NGX_PERL_CFLAGS) "
+        ngx_perl_cc="\$(CC) $ngx_compile_opt \$(NGX_PERL_CFLAGS)"
         ngx_perl_cc="$ngx_perl_cc \$(CORE_INCS) \$(HTTP_INCS)"
     fi
 
@@ -437,9 +437,9 @@ fi
 
 # the addons config.make
 
-if test -n "$NGX_ADDONS"; then
+if test -n "$NGX_ADDONS$DYNAMIC_ADDONS"; then
 
-    for ngx_addon_dir in $NGX_ADDONS
+    for ngx_addon_dir in $NGX_ADDONS $DYNAMIC_ADDONS
     do
         if test -f $ngx_addon_dir/config.make; then
             . $ngx_addon_dir/config.make
@@ -494,6 +494,8 @@ if test -n "$NGX_PCH"; then
     ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
 else
     ngx_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(CFLAGS) \$(ALL_INCS)"
+    ngx_perl_cc="\$(CC) $ngx_compile_opt $ngx_pic_opt \$(NGX_PERL_CFLAGS)"
+    ngx_perl_cc="$ngx_perl_cc \$(ALL_INCS)"
 fi
 
 ngx_obj_deps="\$(CORE_DEPS)"
@@ -605,9 +607,7 @@ END
         | sed -e "s/  *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \
               -e "s/\//$ngx_regex_dirsep/g"`
 
-    ngx_obj=$NGX_OBJS${ngx_dirsep}${ngx_module}${ngx_modext}
-
-    NGX_MODULES="$NGX_MODULES $ngx_obj"
+    ngx_obj=$NGX_OBJS$ngx_dirsep$ngx_module$ngx_modext
 
     if [ "$NGX_PLATFORM" = win32 ]; then
         ngx_module_libs="$CORE_LIBS $ngx_module_libs"
@@ -639,15 +639,15 @@ $ngx_modules_obj:	\$(CORE_DEPS)$ngx_cont$ngx_modules_c
 
 END
 
-    for ngx_src in $ngx_module_srcs
+    for ngx_source in $ngx_module_srcs
     do
-        case "$ngx_src" in
+        case "$ngx_source" in
             src/*)
-                ngx_obj=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
+                ngx_obj=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"`
                 ;;
             *)
-                ngx_obj="addon/`basename \`dirname $ngx_src\``"
-                ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \
+                ngx_obj="addon/`basename \`dirname $ngx_source\``"
+                ngx_obj=`echo $ngx_obj/\`basename $ngx_source\` \
                     | sed -e "s/\//$ngx_regex_dirsep/g"`
                 ;;
         esac
@@ -658,14 +658,25 @@ END
                   -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \
                   -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"`
 
-        ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
+        ngx_src=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"`
 
-        cat << END                                        >> $NGX_MAKEFILE
+        if [ $ngx_source = src/http/modules/perl/ngx_http_perl_module.c ]; then
+
+            cat << END                                        >> $NGX_MAKEFILE
+
+$ngx_obj:	$ngx_obj_deps$ngx_cont$ngx_src
+	$ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
+
+END
+        else
+
+            cat << END                                        >> $NGX_MAKEFILE
 
 $ngx_obj:	$ngx_obj_deps$ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
 
 END
 
+        fi
     done
 done
diff --git a/auto/module b/auto/module
index 908f0c6..16a816f 100644
--- a/auto/module
+++ b/auto/module
@@ -40,7 +40,7 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
     do
         case $lib in
 
-            LIBXSLT | LIBGD | GEOIP)
+            LIBXSLT | LIBGD | GEOIP | PERL)
                 libs="$libs \$NGX_LIB_$lib"
 
                 if eval [ "\$USE_${lib}" = NO ] ; then
@@ -48,7 +48,7 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
                 fi
             ;;
 
-            PCRE | OPENSSL | MD5 | SHA1 | ZLIB | PERL)
+            PCRE | OPENSSL | MD5 | SHA1 | ZLIB)
                 eval USE_${lib}=YES
             ;;
 
diff --git a/auto/modules b/auto/modules
index ebfc91d..22ff6d9 100644
--- a/auto/modules
+++ b/auto/modules
@@ -727,14 +727,12 @@ if [ $HTTP_SCGI = YES ]; then
     . auto/module
 fi
 
-if [ $HTTP_PERL = YES ]; then
-    USE_PERL=YES
-
+if [ $HTTP_PERL != NO ]; then
     ngx_module_name=ngx_http_perl_module
     ngx_module_incs=src/http/modules/perl
     ngx_module_deps=src/http/modules/perl/ngx_http_perl_module.h
     ngx_module_srcs=src/http/modules/perl/ngx_http_perl_module.c
-    ngx_module_libs=
+    ngx_module_libs=PERL
     ngx_module_link=$HTTP_PERL
 
     . auto/module
diff --git a/auto/options b/auto/options
index 36b34bc..ac8beb1 100644
--- a/auto/options
+++ b/auto/options
@@ -271,6 +271,7 @@ do
         --without-http_upstream_zone_module) HTTP_UPSTREAM_ZONE=NO  ;;
 
         --with-http_perl_module)         HTTP_PERL=YES              ;;
+        --with-http_perl_module=dynamic) HTTP_PERL=DYNAMIC          ;;
         --with-perl_modules_path=*)      NGX_PERL_MODULES="$value"  ;;
         --with-perl=*)                   NGX_PERL="$value"          ;;
 
@@ -452,6 +453,7 @@ cat << END
                                      disable ngx_http_upstream_zone_module
 
   --with-http_perl_module            enable ngx_http_perl_module
+  --with-http_perl_module=dynamic    enable dynamic ngx_http_perl_module
   --with-perl_modules_path=PATH      set Perl modules path
   --with-perl=PATH                   set perl binary pathname
 
@@ -477,8 +479,8 @@ cat << END
   --without-mail_imap_module         disable ngx_mail_imap_module
   --without-mail_smtp_module         disable ngx_mail_smtp_module
 
-  --with-stream                      enable TCP proxy module
-  --with-stream=dynamic              enable dynamic TCP proxy module
+  --with-stream                      enable TCP/UDP proxy module
+  --with-stream=dynamic              enable dynamic TCP/UDP proxy module
   --with-stream_ssl_module           enable ngx_stream_ssl_module
   --without-stream_limit_conn_module disable ngx_stream_limit_conn_module
   --without-stream_access_module     disable ngx_stream_access_module
diff --git a/auto/sources b/auto/sources
index e08e863..27849e6 100644
--- a/auto/sources
+++ b/auto/sources
@@ -165,6 +165,7 @@ UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/unix/ngx_udp_recv.c \
             src/os/unix/ngx_send.c \
             src/os/unix/ngx_writev_chain.c \
+            src/os/unix/ngx_udp_send.c \
             src/os/unix/ngx_channel.c \
             src/os/unix/ngx_shmem.c \
             src/os/unix/ngx_process.c \
diff --git a/auto/unix b/auto/unix
index ce01791..16d9523 100755
--- a/auto/unix
+++ b/auto/unix
@@ -329,6 +329,45 @@ ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0)"
 . auto/feature
 
 
+# BSD way to get IPv4 datagram destination address
+
+ngx_feature="IP_RECVDSTADDR"
+ngx_feature_name="NGX_HAVE_IP_RECVDSTADDR"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_RECVDSTADDR, NULL, 0)"
+. auto/feature
+
+
+# Linux way to get IPv4 datagram destination address
+
+ngx_feature="IP_PKTINFO"
+ngx_feature_name="NGX_HAVE_IP_PKTINFO"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)"
+. auto/feature
+
+
+# RFC 3542 way to get IPv6 datagram destination address
+
+ngx_feature="IPV6_RECVPKTINFO"
+ngx_feature_name="NGX_HAVE_IPV6_RECVPKTINFO"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IPV6, IPV6_RECVPKTINFO, NULL, 0)"
+. auto/feature
+
+
 ngx_feature="TCP_DEFER_ACCEPT"
 ngx_feature_name="NGX_HAVE_DEFERRED_ACCEPT"
 ngx_feature_run=no
diff --git a/src/core/nginx.c b/src/core/nginx.c
index cdc067e..2823169 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -10,7 +10,7 @@
 #include <nginx.h>
 
 
-static void ngx_show_version_info();
+static void ngx_show_version_info(void);
 static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle);
 static ngx_int_t ngx_get_options(int argc, char *const *argv);
 static ngx_int_t ngx_process_options(ngx_cycle_t *cycle);
@@ -372,7 +372,7 @@ main(int argc, char *const *argv)
 
 
 static void
-ngx_show_version_info()
+ngx_show_version_info(void)
 {
     ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED);
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index dec7b88..238d8b8 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009012
-#define NGINX_VERSION      "1.9.12"
+#define nginx_version      1009013
+#define NGINX_VERSION      "1.9.13"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 0c19d5d..572def2 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -210,6 +210,18 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
 
         olen = sizeof(int);
 
+        if (getsockopt(ls[i].fd, SOL_SOCKET, SO_TYPE, (void *) &ls[i].type,
+                       &olen)
+            == -1)
+        {
+            ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno,
+                          "getsockopt(SO_TYPE) %V failed", &ls[i].addr_text);
+            ls[i].ignore = 1;
+            continue;
+        }
+
+        olen = sizeof(int);
+
         if (getsockopt(ls[i].fd, SOL_SOCKET, SO_RCVBUF, (void *) &ls[i].rcvbuf,
                        &olen)
             == -1)
@@ -274,6 +286,10 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
 
 #endif
 
+        if (ls[i].type != SOCK_STREAM) {
+            continue;
+        }
+
 #if (NGX_HAVE_TCP_FASTOPEN)
 
         olen = sizeof(int);
@@ -566,6 +582,11 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
             }
 #endif
 
+            if (ls[i].type != SOCK_STREAM) {
+                ls[i].fd = s;
+                continue;
+            }
+
             if (listen(s, ls[i].backlog) == -1) {
                 err = ngx_socket_errno;
 
@@ -865,6 +886,67 @@ ngx_configure_listening_sockets(ngx_cycle_t *cycle)
 #endif
 
 #endif /* NGX_HAVE_DEFERRED_ACCEPT */
+
+#if (NGX_HAVE_IP_RECVDSTADDR)
+
+        if (ls[i].wildcard
+            && ls[i].type == SOCK_DGRAM
+            && ls[i].sockaddr->sa_family == AF_INET)
+        {
+            value = 1;
+
+            if (setsockopt(ls[i].fd, IPPROTO_IP, IP_RECVDSTADDR,
+                           (const void *) &value, sizeof(int))
+                == -1)
+            {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
+                              "setsockopt(IP_RECVDSTADDR) "
+                              "for %V failed, ignored",
+                              &ls[i].addr_text);
+            }
+        }
+
+#elif (NGX_HAVE_IP_PKTINFO)
+
+        if (ls[i].wildcard
+            && ls[i].type == SOCK_DGRAM
+            && ls[i].sockaddr->sa_family == AF_INET)
+        {
+            value = 1;
+
+            if (setsockopt(ls[i].fd, IPPROTO_IP, IP_PKTINFO,
+                           (const void *) &value, sizeof(int))
+                == -1)
+            {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
+                              "setsockopt(IP_PKTINFO) "
+                              "for %V failed, ignored",
+                              &ls[i].addr_text);
+            }
+        }
+
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+
+        if (ls[i].wildcard
+            && ls[i].type == SOCK_DGRAM
+            && ls[i].sockaddr->sa_family == AF_INET6)
+        {
+            value = 1;
+
+            if (setsockopt(ls[i].fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
+                           (const void *) &value, sizeof(int))
+                == -1)
+            {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
+                              "setsockopt(IPV6_RECVPKTINFO) "
+                              "for %V failed, ignored",
+                              &ls[i].addr_text);
+            }
+        }
+
+#endif
     }
 
     return;
@@ -978,7 +1060,7 @@ ngx_get_connection(ngx_socket_t s, ngx_log_t *log)
     ngx_cycle->free_connections = c->data;
     ngx_cycle->free_connection_n--;
 
-    if (ngx_cycle->files) {
+    if (ngx_cycle->files && ngx_cycle->files[s] == NULL) {
         ngx_cycle->files[s] = c;
     }
 
@@ -1019,7 +1101,7 @@ ngx_free_connection(ngx_connection_t *c)
     ngx_cycle->free_connections = c;
     ngx_cycle->free_connection_n++;
 
-    if (ngx_cycle->files) {
+    if (ngx_cycle->files && ngx_cycle->files[c->fd] == c) {
         ngx_cycle->files[c->fd] = NULL;
     }
 }
@@ -1045,16 +1127,18 @@ ngx_close_connection(ngx_connection_t *c)
         ngx_del_timer(c->write);
     }
 
-    if (ngx_del_conn) {
-        ngx_del_conn(c, NGX_CLOSE_EVENT);
+    if (!c->shared) {
+        if (ngx_del_conn) {
+            ngx_del_conn(c, NGX_CLOSE_EVENT);
 
-    } else {
-        if (c->read->active || c->read->disabled) {
-            ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
-        }
+        } else {
+            if (c->read->active || c->read->disabled) {
+                ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
+            }
 
-        if (c->write->active || c->write->disabled) {
-            ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
+            if (c->write->active || c->write->disabled) {
+                ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
+            }
         }
     }
 
@@ -1078,6 +1162,10 @@ ngx_close_connection(ngx_connection_t *c)
     fd = c->fd;
     c->fd = (ngx_socket_t) -1;
 
+    if (c->shared) {
+        return;
+    }
+
     if (ngx_close_socket(fd) == -1) {
 
         err = ngx_socket_errno;
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 977f028..19a2ab7 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -64,6 +64,7 @@ struct ngx_listening_s {
     unsigned            nonblocking:1;
     unsigned            shared:1;    /* shared between threads or processes */
     unsigned            addr_ntop:1;
+    unsigned            wildcard:1;
 
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
     unsigned            ipv6only:1;
@@ -141,6 +142,8 @@ struct ngx_connection_s {
 
     ngx_pool_t         *pool;
 
+    int                 type;
+
     struct sockaddr    *sockaddr;
     socklen_t           socklen;
     ngx_str_t           addr_text;
@@ -174,6 +177,7 @@ struct ngx_connection_s {
     unsigned            idle:1;
     unsigned            reusable:1;
     unsigned            close:1;
+    unsigned            shared:1;
 
     unsigned            sendfile:1;
     unsigned            sndlowat:1;
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index f103266..5785eb5 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -512,6 +512,10 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
                     continue;
                 }
 
+                if (ls[i].type != nls[n].type) {
+                    continue;
+                }
+
                 if (ngx_cmp_sockaddr(nls[n].sockaddr, nls[n].socklen,
                                      ls[i].sockaddr, ls[i].socklen, 1)
                     == NGX_OK)
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 3ebd73d..d3e2ece 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -124,6 +124,15 @@ ngx_write_chain_to_temp_file(ngx_temp_file_t *tf, ngx_chain_t *chain)
         }
     }
 
+#if (NGX_THREADS && NGX_HAVE_PWRITEV)
+
+    if (tf->thread_write) {
+        return ngx_thread_write_chain_to_file(&tf->file, chain, tf->offset,
+                                              tf->pool);
+    }
+
+#endif
+
     return ngx_write_chain_to_file(&tf->file, chain, tf->offset, tf->pool);
 }
 
@@ -187,7 +196,7 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
 
         err = ngx_errno;
 
-        if (err == NGX_EEXIST) {
+        if (err == NGX_EEXIST_FILE) {
             n = (uint32_t) ngx_next_temp_number(1);
             continue;
         }
@@ -683,7 +692,7 @@ ngx_ext_rename_file(ngx_str_t *src, ngx_str_t *to, ngx_ext_rename_file_t *ext)
 
 #if (NGX_WIN32)
 
-    if (err == NGX_EEXIST) {
+    if (err == NGX_EEXIST || err == NGX_EEXIST_FILE) {
         err = ngx_win32_rename_file(src, to, ext->log);
 
         if (err == 0) {
diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h
index 301b191..5f8228b 100644
--- a/src/core/ngx_file.h
+++ b/src/core/ngx_file.h
@@ -27,6 +27,7 @@ struct ngx_file_s {
     ngx_int_t                (*thread_handler)(ngx_thread_task_t *task,
                                                ngx_file_t *file);
     void                      *thread_ctx;
+    ngx_thread_task_t         *thread_task;
 #endif
 
 #if (NGX_HAVE_FILE_AIO)
@@ -77,6 +78,7 @@ typedef struct {
     unsigned                   log_level:8;
     unsigned                   persistent:1;
     unsigned                   clean:1;
+    unsigned                   thread_write:1;
 } ngx_temp_file_t;
 
 
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 96a04fd..3bbadb8 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -529,14 +529,16 @@ ngx_int_t
 ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u)
 {
     u_char  *p;
+    size_t   len;
 
     p = u->url.data;
+    len = u->url.len;
 
-    if (ngx_strncasecmp(p, (u_char *) "unix:", 5) == 0) {
+    if (len >= 5 && ngx_strncasecmp(p, (u_char *) "unix:", 5) == 0) {
         return ngx_parse_unix_domain_url(pool, u);
     }
 
-    if (p[0] == '[') {
+    if (len && p[0] == '[') {
         return ngx_parse_inet6_url(pool, u);
     }
 
diff --git a/src/core/ngx_module.c b/src/core/ngx_module.c
index f5ec86a..3e3c506 100644
--- a/src/core/ngx_module.c
+++ b/src/core/ngx_module.c
@@ -23,11 +23,10 @@ static ngx_uint_t  ngx_modules_n;
 
 
 ngx_int_t
-ngx_preinit_modules()
+ngx_preinit_modules(void)
 {
     ngx_uint_t  i;
 
-    ngx_max_module = 0;
     for (i = 0; ngx_modules[i]; i++) {
         ngx_modules[i]->index = i;
         ngx_modules[i]->name = ngx_module_names[i];
diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h
index 3e74def..e911cb4 100644
--- a/src/core/ngx_module.h
+++ b/src/core/ngx_module.h
@@ -288,7 +288,7 @@ typedef struct {
 } ngx_core_module_t;
 
 
-ngx_int_t ngx_preinit_modules();
+ngx_int_t ngx_preinit_modules(void);
 ngx_int_t ngx_cycle_modules(ngx_cycle_t *cycle);
 ngx_int_t ngx_init_modules(ngx_cycle_t *cycle);
 ngx_int_t ngx_count_modules(ngx_cycle_t *cycle, ngx_uint_t type);
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index 252359a..f784578 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -577,11 +577,15 @@ ngx_output_chain_copy_buf(ngx_output_chain_ctx_t *ctx)
         } else
 #endif
 #if (NGX_THREADS)
-        if (src->file->thread_handler) {
-            n = ngx_thread_read(&ctx->thread_task, src->file, dst->pos,
-                                (size_t) size, src->file_pos, ctx->pool);
+        if (ctx->thread_handler) {
+            src->file->thread_task = ctx->thread_task;
+            src->file->thread_handler = ctx->thread_handler;
+            src->file->thread_ctx = ctx->filter_ctx;
+
+            n = ngx_thread_read(src->file, dst->pos, (size_t) size,
+                                src->file_pos, ctx->pool);
             if (n == NGX_AGAIN) {
-                ctx->aio = 1;
+                ctx->thread_task = src->file->thread_task;
                 return NGX_AGAIN;
             }
 
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c
index ef4a647..d3044ac 100644
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -9,6 +9,8 @@
 #include <ngx_core.h>
 
 
+static ngx_inline void *ngx_palloc_small(ngx_pool_t *pool, size_t size,
+    ngx_uint_t align);
 static void *ngx_palloc_block(ngx_pool_t *pool, size_t size);
 static void *ngx_palloc_large(ngx_pool_t *pool, size_t size);
 
@@ -56,15 +58,6 @@ ngx_destroy_pool(ngx_pool_t *pool)
         }
     }
 
-    for (l = pool->large; l; l = l->next) {
-
-        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
-
-        if (l->alloc) {
-            ngx_free(l->alloc);
-        }
-    }
-
 #if (NGX_DEBUG)
 
     /*
@@ -72,6 +65,10 @@ ngx_destroy_pool(ngx_pool_t *pool)
      * so we cannot use this log while free()ing the pool
      */
 
+    for (l = pool->large; l; l = l->next) {
+        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc);
+    }
+
     for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
         ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
                        "free: %p, unused: %uz", p, p->d.end - p->d.last);
@@ -83,6 +80,12 @@ ngx_destroy_pool(ngx_pool_t *pool)
 
 #endif
 
+    for (l = pool->large; l; l = l->next) {
+        if (l->alloc) {
+            ngx_free(l->alloc);
+        }
+    }
+
     for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
         ngx_free(p);
 
@@ -119,28 +122,11 @@ ngx_reset_pool(ngx_pool_t *pool)
 void *
 ngx_palloc(ngx_pool_t *pool, size_t size)
 {
-    u_char      *m;
-    ngx_pool_t  *p;
-
+#if !(NGX_DEBUG_PALLOC)
     if (size <= pool->max) {
-
-        p = pool->current;
-
-        do {
-            m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT);
-
-            if ((size_t) (p->d.end - m) >= size) {
-                p->d.last = m + size;
-
-                return m;
-            }
-
-            p = p->d.next;
-
-        } while (p);
-
-        return ngx_palloc_block(pool, size);
+        return ngx_palloc_small(pool, size, 1);
     }
+#endif
 
     return ngx_palloc_large(pool, size);
 }
@@ -148,31 +134,43 @@ ngx_palloc(ngx_pool_t *pool, size_t size)
 
 void *
 ngx_pnalloc(ngx_pool_t *pool, size_t size)
+{
+#if !(NGX_DEBUG_PALLOC)
+    if (size <= pool->max) {
+        return ngx_palloc_small(pool, size, 0);
+    }
+#endif
+
+    return ngx_palloc_large(pool, size);
+}
+
+
+static ngx_inline void *
+ngx_palloc_small(ngx_pool_t *pool, size_t size, ngx_uint_t align)
 {
     u_char      *m;
     ngx_pool_t  *p;
 
-    if (size <= pool->max) {
+    p = pool->current;
 
-        p = pool->current;
+    do {
+        m = p->d.last;
 
-        do {
-            m = p->d.last;
+        if (align) {
+            m = ngx_align_ptr(m, NGX_ALIGNMENT);
+        }
 
-            if ((size_t) (p->d.end - m) >= size) {
-                p->d.last = m + size;
+        if ((size_t) (p->d.end - m) >= size) {
+            p->d.last = m + size;
 
-                return m;
-            }
+            return m;
+        }
 
-            p = p->d.next;
+        p = p->d.next;
 
-        } while (p);
+    } while (p);
 
-        return ngx_palloc_block(pool, size);
-    }
-
-    return ngx_palloc_large(pool, size);
+    return ngx_palloc_block(pool, size);
 }
 
 
@@ -237,7 +235,7 @@ ngx_palloc_large(ngx_pool_t *pool, size_t size)
         }
     }
 
-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
+    large = ngx_palloc_small(pool, sizeof(ngx_pool_large_t), 1);
     if (large == NULL) {
         ngx_free(p);
         return NULL;
@@ -262,7 +260,7 @@ ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment)
         return NULL;
     }
 
-    large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
+    large = ngx_palloc_small(pool, sizeof(ngx_pool_large_t), 1);
     if (large == NULL) {
         ngx_free(p);
         return NULL;
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 7f0d3ad..38bf956 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -74,8 +74,10 @@ static ngx_int_t ngx_resolver_send_tcp_query(ngx_resolver_t *r,
     ngx_resolver_connection_t *rec, u_char *query, u_short qlen);
 static ngx_int_t ngx_resolver_create_name_query(ngx_resolver_t *r,
     ngx_resolver_node_t *rn, ngx_str_t *name);
+static ngx_int_t ngx_resolver_create_srv_query(ngx_resolver_t *r,
+    ngx_resolver_node_t *rn, ngx_str_t *name);
 static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_t *r,
-    ngx_resolver_node_t *rn, ngx_addr_t *addr);
+    ngx_resolver_node_t *rn, ngx_resolver_addr_t *addr);
 static void ngx_resolver_resend_handler(ngx_event_t *ev);
 static time_t ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree,
     ngx_queue_t *queue);
@@ -88,10 +90,15 @@ static void ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf,
 static void ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
     ngx_uint_t ident, ngx_uint_t code, ngx_uint_t qtype,
     ngx_uint_t nan, ngx_uint_t trunc, ngx_uint_t ans);
+static void ngx_resolver_process_srv(ngx_resolver_t *r, u_char *buf, size_t n,
+    ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan,
+    ngx_uint_t trunc, ngx_uint_t ans);
 static void ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n,
     ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan);
 static ngx_resolver_node_t *ngx_resolver_lookup_name(ngx_resolver_t *r,
     ngx_str_t *name, uint32_t hash);
+static ngx_resolver_node_t *ngx_resolver_lookup_srv(ngx_resolver_t *r,
+    ngx_str_t *name, uint32_t hash);
 static ngx_resolver_node_t *ngx_resolver_lookup_addr(ngx_resolver_t *r,
     in_addr_t addr);
 static void ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
@@ -105,9 +112,14 @@ static void *ngx_resolver_calloc(ngx_resolver_t *r, size_t size);
 static void ngx_resolver_free(ngx_resolver_t *r, void *p);
 static void ngx_resolver_free_locked(ngx_resolver_t *r, void *p);
 static void *ngx_resolver_dup(ngx_resolver_t *r, void *src, size_t size);
-static ngx_addr_t *ngx_resolver_export(ngx_resolver_t *r,
+static ngx_resolver_addr_t *ngx_resolver_export(ngx_resolver_t *r,
     ngx_resolver_node_t *rn, ngx_uint_t rotate);
+static void ngx_resolver_report_srv(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx);
 static u_char *ngx_resolver_log_error(ngx_log_t *log, u_char *buf, size_t len);
+static void ngx_resolver_resolve_srv_names(ngx_resolver_ctx_t *ctx,
+    ngx_resolver_node_t *rn);
+static void ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *ctx);
+static ngx_int_t ngx_resolver_cmp_srvs(const void *one, const void *two);
 
 #if (NGX_HAVE_INET6)
 static void ngx_resolver_rbtree_insert_addr6_value(ngx_rbtree_node_t *temp,
@@ -149,13 +161,18 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
     ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel,
                     ngx_resolver_rbtree_insert_value);
 
+    ngx_rbtree_init(&r->srv_rbtree, &r->srv_sentinel,
+                    ngx_resolver_rbtree_insert_value);
+
     ngx_rbtree_init(&r->addr_rbtree, &r->addr_sentinel,
                     ngx_rbtree_insert_value);
 
     ngx_queue_init(&r->name_resend_queue);
+    ngx_queue_init(&r->srv_resend_queue);
     ngx_queue_init(&r->addr_resend_queue);
 
     ngx_queue_init(&r->name_expire_queue);
+    ngx_queue_init(&r->srv_expire_queue);
     ngx_queue_init(&r->addr_expire_queue);
 
 #if (NGX_HAVE_INET6)
@@ -274,6 +291,8 @@ ngx_resolver_cleanup(void *data)
 
         ngx_resolver_cleanup_tree(r, &r->name_rbtree);
 
+        ngx_resolver_cleanup_tree(r, &r->srv_rbtree);
+
         ngx_resolver_cleanup_tree(r, &r->addr_rbtree);
 
 #if (NGX_HAVE_INET6)
@@ -383,7 +402,9 @@ ngx_resolve_start(ngx_resolver_t *r, ngx_resolver_ctx_t *temp)
 ngx_int_t
 ngx_resolve_name(ngx_resolver_ctx_t *ctx)
 {
+    size_t           slen;
     ngx_int_t        rc;
+    ngx_str_t        name;
     ngx_resolver_t  *r;
 
     r = ctx->resolver;
@@ -400,9 +421,41 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx)
         return NGX_OK;
     }
 
-    /* lock name mutex */
+    if (ctx->service.len) {
+        slen = ctx->service.len;
 
-    rc = ngx_resolve_name_locked(r, ctx, &ctx->name);
+        if (ngx_strlchr(ctx->service.data,
+                        ctx->service.data + ctx->service.len, '.')
+            == NULL)
+        {
+            slen += sizeof("_._tcp") - 1;
+        }
+
+        name.len = slen + 1 + ctx->name.len;
+
+        name.data = ngx_resolver_alloc(r, name.len);
+        if (name.data == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (slen == ctx->service.len) {
+            ngx_sprintf(name.data, "%V.%V", &ctx->service, &ctx->name);
+
+        } else {
+            ngx_sprintf(name.data, "_%V._tcp.%V", &ctx->service, &ctx->name);
+        }
+
+        /* lock name mutex */
+
+        rc = ngx_resolve_name_locked(r, ctx, &name);
+
+        ngx_resolver_free(r, name.data);
+
+    } else {
+        /* lock name mutex */
+
+        rc = ngx_resolve_name_locked(r, ctx, &ctx->name);
+    }
 
     if (rc == NGX_OK) {
         return NGX_OK;
@@ -429,6 +482,7 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx)
 void
 ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
 {
+    ngx_uint_t            i;
     ngx_resolver_t       *r;
     ngx_resolver_ctx_t   *w, **p;
     ngx_resolver_node_t  *rn;
@@ -448,6 +502,23 @@ ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
 
     /* lock name mutex */
 
+    if (ctx->nsrvs) {
+        for (i = 0; i < ctx->nsrvs; i++) {
+            if (ctx->srvs[i].ctx) {
+                ngx_resolve_name_done(ctx->srvs[i].ctx);
+            }
+
+            if (ctx->srvs[i].addrs) {
+                ngx_resolver_free(r, ctx->srvs[i].addrs->sockaddr);
+                ngx_resolver_free(r, ctx->srvs[i].addrs);
+            }
+
+            ngx_resolver_free(r, ctx->srvs[i].name.data);
+        }
+
+        ngx_resolver_free(r, ctx->srvs);
+    }
+
     if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) {
 
         rn = ctx->node;
@@ -466,15 +537,20 @@ ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
                 p = &w->next;
                 w = w->next;
             }
-        }
 
-        ngx_log_error(NGX_LOG_ALERT, r->log, 0,
-                      "could not cancel %V resolving", &ctx->name);
+            ngx_log_error(NGX_LOG_ALERT, r->log, 0,
+                          "could not cancel %V resolving", &ctx->name);
+        }
     }
 
 done:
 
-    ngx_resolver_expire(r, &r->name_rbtree, &r->name_expire_queue);
+    if (ctx->service.len) {
+        ngx_resolver_expire(r, &r->srv_rbtree, &r->srv_expire_queue);
+
+    } else {
+        ngx_resolver_expire(r, &r->name_rbtree, &r->name_expire_queue);
+    }
 
     /* unlock name mutex */
 
@@ -501,16 +577,31 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
     uint32_t              hash;
     ngx_int_t             rc;
     ngx_str_t             cname;
-    ngx_uint_t            naddrs;
-    ngx_addr_t           *addrs;
+    ngx_uint_t            i, naddrs;
+    ngx_queue_t          *resend_queue, *expire_queue;
+    ngx_rbtree_t         *tree;
     ngx_resolver_ctx_t   *next, *last;
+    ngx_resolver_addr_t  *addrs;
     ngx_resolver_node_t  *rn;
 
     ngx_strlow(name->data, name->data, name->len);
 
     hash = ngx_crc32_short(name->data, name->len);
 
-    rn = ngx_resolver_lookup_name(r, name, hash);
+    if (ctx->service.len) {
+        rn = ngx_resolver_lookup_srv(r, name, hash);
+
+        tree = &r->srv_rbtree;
+        resend_queue = &r->srv_resend_queue;
+        expire_queue = &r->srv_expire_queue;
+
+    } else {
+        rn = ngx_resolver_lookup_name(r, name, hash);
+
+        tree = &r->name_rbtree;
+        resend_queue = &r->name_resend_queue;
+        expire_queue = &r->name_expire_queue;
+    }
 
     if (rn) {
 
@@ -525,7 +616,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
 
             rn->expire = ngx_time() + r->expire;
 
-            ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);
+            ngx_queue_insert_head(expire_queue, &rn->queue);
 
             naddrs = (rn->naddrs == (u_short) -1) ? 0 : rn->naddrs;
 #if (NGX_HAVE_INET6)
@@ -551,6 +642,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
 
                 do {
                     ctx->state = NGX_OK;
+                    ctx->valid = rn->valid;
                     ctx->naddrs = naddrs;
 
                     if (addrs == NULL) {
@@ -580,6 +672,23 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
                 return NGX_OK;
             }
 
+            if (rn->nsrvs) {
+                last->next = rn->waiting;
+                rn->waiting = NULL;
+
+                /* unlock name mutex */
+
+                do {
+                    next = ctx->next;
+
+                    ngx_resolver_resolve_srv_names(ctx, rn);
+
+                    ctx = next;
+                } while (ctx);
+
+                return NGX_OK;
+            }
+
             /* NGX_RESOLVE_CNAME */
 
             if (ctx->recursion++ < NGX_RESOLVER_MAX_RECURSION) {
@@ -597,6 +706,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
 
             do {
                 ctx->state = NGX_RESOLVE_NXDOMAIN;
+                ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
                 next = ctx->next;
 
                 ctx->handler(ctx);
@@ -609,7 +719,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
 
         if (rn->waiting) {
 
-            if (ctx->event == NULL) {
+            if (ctx->event == NULL && ctx->timeout) {
                 ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
                 if (ctx->event == NULL) {
                     return NGX_ERROR;
@@ -661,6 +771,16 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
         }
 #endif
 
+        if (rn->nsrvs) {
+            for (i = 0; i < rn->nsrvs; i++) {
+                if (rn->u.srvs[i].name.data) {
+                    ngx_resolver_free_locked(r, rn->u.srvs[i].name.data);
+                }
+            }
+
+            ngx_resolver_free_locked(r, rn->u.srvs);
+        }
+
         /* unlock alloc mutex */
 
     } else {
@@ -683,17 +803,22 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
         rn->query6 = NULL;
 #endif
 
-        ngx_rbtree_insert(&r->name_rbtree, &rn->node);
+        ngx_rbtree_insert(tree, &rn->node);
     }
 
-    rc = ngx_resolver_create_name_query(r, rn, name);
+    if (ctx->service.len) {
+        rc = ngx_resolver_create_srv_query(r, rn, name);
+
+    } else {
+        rc = ngx_resolver_create_name_query(r, rn, name);
+    }
 
     if (rc == NGX_ERROR) {
         goto failed;
     }
 
     if (rc == NGX_DECLINED) {
-        ngx_rbtree_delete(&r->name_rbtree, &rn->node);
+        ngx_rbtree_delete(tree, &rn->node);
 
         ngx_resolver_free(r, rn->query);
         ngx_resolver_free(r, rn->name);
@@ -722,12 +847,13 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
     rn->naddrs6 = r->ipv6 ? (u_short) -1 : 0;
     rn->tcp6 = 0;
 #endif
+    rn->nsrvs = 0;
 
     if (ngx_resolver_send_query(r, rn) != NGX_OK) {
         goto failed;
     }
 
-    if (ctx->event == NULL) {
+    if (ctx->event == NULL && ctx->timeout) {
         ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
         if (ctx->event == NULL) {
             goto failed;
@@ -741,13 +867,13 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
         ngx_add_timer(ctx->event, ctx->timeout);
     }
 
-    if (ngx_queue_empty(&r->name_resend_queue)) {
+    if (ngx_queue_empty(resend_queue)) {
         ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
     }
 
     rn->expire = ngx_time() + r->resend_timeout;
 
-    ngx_queue_insert_head(&r->name_resend_queue, &rn->queue);
+    ngx_queue_insert_head(resend_queue, &rn->queue);
 
     rn->code = 0;
     rn->cnlen = 0;
@@ -766,7 +892,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
 
 failed:
 
-    ngx_rbtree_delete(&r->name_rbtree, &rn->node);
+    ngx_rbtree_delete(tree, &rn->node);
 
     if (rn->query) {
         ngx_resolver_free(r, rn->query);
@@ -859,6 +985,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
             /* unlock addr mutex */
 
             ctx->state = NGX_OK;
+            ctx->valid = rn->valid;
 
             ctx->handler(ctx);
 
@@ -869,18 +996,20 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
 
         if (rn->waiting) {
 
-            ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
-            if (ctx->event == NULL) {
-                return NGX_ERROR;
+            if (ctx->event == NULL && ctx->timeout) {
+                ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
+                if (ctx->event == NULL) {
+                    return NGX_ERROR;
+                }
+
+                ctx->event->handler = ngx_resolver_timeout_handler;
+                ctx->event->data = ctx;
+                ctx->event->log = r->log;
+                ctx->ident = -1;
+
+                ngx_add_timer(ctx->event, ctx->timeout);
             }
 
-            ctx->event->handler = ngx_resolver_timeout_handler;
-            ctx->event->data = ctx;
-            ctx->event->log = r->log;
-            ctx->ident = -1;
-
-            ngx_add_timer(ctx->event, ctx->timeout);
-
             ctx->next = rn->waiting;
             rn->waiting = ctx;
             ctx->state = NGX_AGAIN;
@@ -941,23 +1070,26 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
     rn->naddrs6 = (u_short) -1;
     rn->tcp6 = 0;
 #endif
+    rn->nsrvs = 0;
 
     if (ngx_resolver_send_query(r, rn) != NGX_OK) {
         goto failed;
     }
 
-    ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
-    if (ctx->event == NULL) {
-        goto failed;
+    if (ctx->event == NULL && ctx->timeout) {
+        ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
+        if (ctx->event == NULL) {
+            goto failed;
+        }
+
+        ctx->event->handler = ngx_resolver_timeout_handler;
+        ctx->event->data = ctx;
+        ctx->event->log = r->log;
+        ctx->ident = -1;
+
+        ngx_add_timer(ctx->event, ctx->timeout);
     }
 
-    ctx->event->handler = ngx_resolver_timeout_handler;
-    ctx->event->data = ctx;
-    ctx->event->log = r->log;
-    ctx->ident = -1;
-
-    ngx_add_timer(ctx->event, ctx->timeout);
-
     if (ngx_queue_empty(resend_queue)) {
         ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
     }
@@ -1294,7 +1426,7 @@ ngx_resolver_send_tcp_query(ngx_resolver_t *r, ngx_resolver_connection_t *rec,
 static void
 ngx_resolver_resend_handler(ngx_event_t *ev)
 {
-    time_t           timer, atimer, ntimer;
+    time_t           timer, atimer, stimer, ntimer;
 #if (NGX_HAVE_INET6)
     time_t           a6timer;
 #endif
@@ -1309,6 +1441,8 @@ ngx_resolver_resend_handler(ngx_event_t *ev)
 
     ntimer = ngx_resolver_resend(r, &r->name_rbtree, &r->name_resend_queue);
 
+    stimer = ngx_resolver_resend(r, &r->srv_rbtree, &r->srv_resend_queue);
+
     /* unlock name mutex */
 
     /* lock addr mutex */
@@ -1336,6 +1470,13 @@ ngx_resolver_resend_handler(ngx_event_t *ev)
         timer = ngx_min(timer, atimer);
     }
 
+    if (timer == 0) {
+        timer = stimer;
+
+    } else if (stimer) {
+        timer = ngx_min(timer, stimer);
+    }
+
 #if (NGX_HAVE_INET6)
 
     if (timer == 0) {
@@ -1696,6 +1837,13 @@ found:
 
         break;
 
+    case NGX_RESOLVE_SRV:
+
+        ngx_resolver_process_srv(r, buf, n, ident, code, nan, trunc,
+                                 i + sizeof(ngx_resolver_qs_t));
+
+        break;
+
     case NGX_RESOLVE_PTR:
 
         ngx_resolver_process_ptr(r, buf, n, ident, code, nan);
@@ -1749,7 +1897,6 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
     uint32_t                    hash;
     in_addr_t                  *addr;
     ngx_str_t                   name;
-    ngx_addr_t                 *addrs;
     ngx_uint_t                  type, class, qident, naddrs, a, i, j, start;
 #if (NGX_HAVE_INET6)
     struct in6_addr            *addr6;
@@ -1757,6 +1904,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
     ngx_resolver_an_t          *an;
     ngx_resolver_ctx_t         *ctx, *next;
     ngx_resolver_node_t        *rn;
+    ngx_resolver_addr_t        *addrs;
     ngx_resolver_connection_t  *rec;
 
     if (ngx_resolver_copy(r, &name, buf,
@@ -1948,6 +2096,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
         while (next) {
             ctx = next;
             ctx->state = code;
+            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
             next = ctx->next;
 
             ctx->handler(ctx);
@@ -2262,6 +2411,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
         while (next) {
             ctx = next;
             ctx->state = NGX_OK;
+            ctx->valid = rn->valid;
             ctx->naddrs = naddrs;
 
             if (addrs == NULL) {
@@ -2390,6 +2540,536 @@ next:
 }
 
 
+static void
+ngx_resolver_process_srv(ngx_resolver_t *r, u_char *buf, size_t n,
+    ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan,
+    ngx_uint_t trunc, ngx_uint_t ans)
+{
+    char                       *err;
+    u_char                     *cname;
+    size_t                      len;
+    int32_t                     ttl;
+    uint32_t                    hash;
+    ngx_str_t                   name;
+    ngx_uint_t                  type, qident, class, start, nsrvs, a, i, j;
+    ngx_resolver_an_t          *an;
+    ngx_resolver_ctx_t         *ctx, *next;
+    ngx_resolver_srv_t         *srvs;
+    ngx_resolver_node_t        *rn;
+    ngx_resolver_connection_t  *rec;
+
+    if (ngx_resolver_copy(r, &name, buf,
+                          buf + sizeof(ngx_resolver_hdr_t), buf + n)
+        != NGX_OK)
+    {
+        return;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver qs:%V", &name);
+
+    hash = ngx_crc32_short(name.data, name.len);
+
+    rn = ngx_resolver_lookup_srv(r, &name, hash);
+
+    if (rn == NULL || rn->query == NULL) {
+        ngx_log_error(r->log_level, r->log, 0,
+                      "unexpected response for %V", &name);
+        ngx_resolver_free(r, name.data);
+        goto failed;
+    }
+
+    if (trunc && rn->tcp) {
+        ngx_resolver_free(r, name.data);
+        goto failed;
+    }
+
+    qident = (rn->query[0] << 8) + rn->query[1];
+
+    if (ident != qident) {
+        ngx_log_error(r->log_level, r->log, 0,
+                      "wrong ident %ui response for %V, expect %ui",
+                      ident, &name, qident);
+        ngx_resolver_free(r, name.data);
+        goto failed;
+    }
+
+    ngx_resolver_free(r, name.data);
+
+    if (trunc) {
+
+        ngx_queue_remove(&rn->queue);
+
+        if (rn->waiting == NULL) {
+            ngx_rbtree_delete(&r->srv_rbtree, &rn->node);
+            ngx_resolver_free_node(r, rn);
+            return;
+        }
+
+        rec = r->connections.elts;
+        rec = &rec[rn->last_connection];
+
+        rn->tcp = 1;
+
+        (void) ngx_resolver_send_tcp_query(r, rec, rn->query, rn->qlen);
+
+        rn->expire = ngx_time() + r->resend_timeout;
+
+        ngx_queue_insert_head(&r->srv_resend_queue, &rn->queue);
+
+        return;
+    }
+
+    if (code == 0 && rn->code) {
+        code = rn->code;
+    }
+
+    if (code == 0 && nan == 0) {
+        code = NGX_RESOLVE_NXDOMAIN;
+    }
+
+    if (code) {
+        next = rn->waiting;
+        rn->waiting = NULL;
+
+        ngx_queue_remove(&rn->queue);
+
+        ngx_rbtree_delete(&r->srv_rbtree, &rn->node);
+
+        while (next) {
+            ctx = next;
+            ctx->state = code;
+            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
+            next = ctx->next;
+
+            ctx->handler(ctx);
+        }
+
+        ngx_resolver_free_node(r, rn);
+
+        return;
+    }
+
+    i = ans;
+    nsrvs = 0;
+    cname = NULL;
+
+    for (a = 0; a < nan; a++) {
+
+        start = i;
+
+        while (i < n) {
+
+            if (buf[i] & 0xc0) {
+                i += 2;
+                goto found;
+            }
+
+            if (buf[i] == 0) {
+                i++;
+                goto test_length;
+            }
+
+            i += 1 + buf[i];
+        }
+
+        goto short_response;
+
+    test_length:
+
+        if (i - start < 2) {
+            err = "invalid name DNS response";
+            goto invalid;
+        }
+
+    found:
+
+        if (i + sizeof(ngx_resolver_an_t) >= n) {
+            goto short_response;
+        }
+
+        an = (ngx_resolver_an_t *) &buf[i];
+
+        type = (an->type_hi << 8) + an->type_lo;
+        class = (an->class_hi << 8) + an->class_lo;
+        len = (an->len_hi << 8) + an->len_lo;
+        ttl = (an->ttl[0] << 24) + (an->ttl[1] << 16)
+            + (an->ttl[2] << 8) + (an->ttl[3]);
+
+        if (class != 1) {
+            ngx_log_error(r->log_level, r->log, 0,
+                          "unexpected RR class %ui", class);
+            goto failed;
+        }
+
+        if (ttl < 0) {
+            ttl = 0;
+        }
+
+        rn->ttl = ngx_min(rn->ttl, (uint32_t) ttl);
+
+        i += sizeof(ngx_resolver_an_t);
+
+        switch (type) {
+
+        case NGX_RESOLVE_SRV:
+
+            if (i + 6 > n) {
+                goto short_response;
+            }
+
+            if (ngx_resolver_copy(r, NULL, buf, &buf[i + 6], buf + n)
+                != NGX_OK)
+            {
+                goto failed;
+            }
+
+            nsrvs++;
+
+            break;
+
+        case NGX_RESOLVE_CNAME:
+
+            cname = &buf[i];
+
+            break;
+
+        case NGX_RESOLVE_DNAME:
+
+            break;
+
+        default:
+
+            ngx_log_error(r->log_level, r->log, 0,
+                          "unexpected RR type %ui", type);
+        }
+
+        i += len;
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0,
+                   "resolver nsrvs:%ui cname:%p ttl:%uD",
+                   nsrvs, cname, rn->ttl);
+
+    if (nsrvs) {
+
+        srvs = ngx_resolver_calloc(r, nsrvs * sizeof(ngx_resolver_srv_t));
+        if (srvs == NULL) {
+            goto failed;
+        }
+
+        rn->u.srvs = srvs;
+        rn->nsrvs = (u_short) nsrvs;
+
+        j = 0;
+        i = ans;
+
+        for (a = 0; a < nan; a++) {
+
+            for ( ;; ) {
+
+                if (buf[i] & 0xc0) {
+                    i += 2;
+                    break;
+                }
+
+                if (buf[i] == 0) {
+                    i++;
+                    break;
+                }
+
+                i += 1 + buf[i];
+            }
+
+            an = (ngx_resolver_an_t *) &buf[i];
+
+            type = (an->type_hi << 8) + an->type_lo;
+            len = (an->len_hi << 8) + an->len_lo;
+
+            i += sizeof(ngx_resolver_an_t);
+
+            if (type == NGX_RESOLVE_SRV) {
+
+                srvs[j].priority = (buf[i] << 8) + buf[i + 1];
+                srvs[j].weight = (buf[i + 2] << 8) + buf[i + 3];
+
+                if (srvs[j].weight == 0) {
+                    srvs[j].weight = 1;
+                }
+
+                srvs[j].port = (buf[i + 4] << 8) + buf[i + 5];
+
+                if (ngx_resolver_copy(r, &srvs[j].name, buf, &buf[i + 6],
+                                      buf + n)
+                    != NGX_OK)
+                {
+                    goto failed;
+                }
+
+                j++;
+            }
+
+            i += len;
+        }
+
+        ngx_sort(srvs, nsrvs, sizeof(ngx_resolver_srv_t),
+                 ngx_resolver_cmp_srvs);
+
+        ngx_resolver_free(r, rn->query);
+        rn->query = NULL;
+
+        ngx_queue_remove(&rn->queue);
+
+        rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
+        rn->expire = ngx_time() + r->expire;
+
+        ngx_queue_insert_head(&r->srv_expire_queue, &rn->queue);
+
+        next = rn->waiting;
+        rn->waiting = NULL;
+
+        while (next) {
+            ctx = next;
+            next = ctx->next;
+
+            ngx_resolver_resolve_srv_names(ctx, rn);
+        }
+
+        return;
+    }
+
+    rn->nsrvs = 0;
+
+    if (cname) {
+
+        /* CNAME only */
+
+        if (ngx_resolver_copy(r, &name, buf, cname, buf + n) != NGX_OK) {
+            goto failed;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
+                       "resolver cname:\"%V\"", &name);
+
+        ngx_queue_remove(&rn->queue);
+
+        rn->cnlen = (u_short) name.len;
+        rn->u.cname = name.data;
+
+        rn->valid = ngx_time() + (r->valid ? r->valid : (time_t) rn->ttl);
+        rn->expire = ngx_time() + r->expire;
+
+        ngx_queue_insert_head(&r->srv_expire_queue, &rn->queue);
+
+        ngx_resolver_free(r, rn->query);
+        rn->query = NULL;
+#if (NGX_HAVE_INET6)
+        rn->query6 = NULL;
+#endif
+
+        ctx = rn->waiting;
+        rn->waiting = NULL;
+
+        if (ctx) {
+
+            if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {
+
+                /* unlock name mutex */
+
+                do {
+                    ctx->state = NGX_RESOLVE_NXDOMAIN;
+                    next = ctx->next;
+
+                    ctx->handler(ctx);
+
+                    ctx = next;
+                } while (ctx);
+
+                return;
+            }
+
+            for (next = ctx; next; next = next->next) {
+                next->node = NULL;
+            }
+
+            (void) ngx_resolve_name_locked(r, ctx, &name);
+        }
+
+        /* unlock name mutex */
+
+        return;
+    }
+
+    ngx_log_error(r->log_level, r->log, 0, "no SRV type in DNS response");
+
+    return;
+
+short_response:
+
+    err = "short DNS response";
+
+invalid:
+
+    /* unlock name mutex */
+
+    ngx_log_error(r->log_level, r->log, 0, err);
+
+    return;
+
+failed:
+
+    /* unlock name mutex */
+
+    return;
+}
+
+
+static void
+ngx_resolver_resolve_srv_names(ngx_resolver_ctx_t *ctx, ngx_resolver_node_t *rn)
+{
+    ngx_uint_t                i;
+    ngx_resolver_t           *r;
+    ngx_resolver_ctx_t       *cctx;
+    ngx_resolver_srv_name_t  *srvs;
+
+    r = ctx->resolver;
+
+    ctx->node = NULL;
+    ctx->state = NGX_OK;
+    ctx->valid = rn->valid;
+    ctx->count = rn->nsrvs;
+
+    srvs = ngx_resolver_calloc(r, rn->nsrvs * sizeof(ngx_resolver_srv_name_t));
+    if (srvs == NULL) {
+        goto failed;
+    }
+
+    ctx->srvs = srvs;
+    ctx->nsrvs = rn->nsrvs;
+
+    for (i = 0; i < rn->nsrvs; i++) {
+        srvs[i].name.data = ngx_resolver_alloc(r, rn->u.srvs[i].name.len);
+        if (srvs[i].name.data == NULL) {
+            goto failed;
+        }
+
+        srvs[i].name.len = rn->u.srvs[i].name.len;
+        ngx_memcpy(srvs[i].name.data, rn->u.srvs[i].name.data,
+                   srvs[i].name.len);
+
+        cctx = ngx_resolve_start(r, NULL);
+        if (cctx == NULL) {
+            goto failed;
+        }
+
+        cctx->name = srvs[i].name;
+        cctx->handler = ngx_resolver_srv_names_handler;
+        cctx->data = ctx;
+        cctx->srvs = &srvs[i];
+        cctx->timeout = 0;
+
+        srvs[i].priority = rn->u.srvs[i].priority;
+        srvs[i].weight = rn->u.srvs[i].weight;
+        srvs[i].port = rn->u.srvs[i].port;
+        srvs[i].ctx = cctx;
+
+        if (ngx_resolve_name(cctx) == NGX_ERROR) {
+            srvs[i].ctx = NULL;
+            goto failed;
+        }
+    }
+
+    return;
+
+failed:
+
+    ctx->state = NGX_ERROR;
+    ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
+
+    ctx->handler(ctx);
+}
+
+
+static void
+ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
+{
+    ngx_uint_t                 i;
+    u_char                   (*sockaddr)[NGX_SOCKADDRLEN];
+    ngx_addr_t                *addrs;
+    ngx_resolver_t            *r;
+    struct sockaddr_in        *sin;
+    ngx_resolver_ctx_t        *ctx;
+    ngx_resolver_srv_name_t   *srv;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6       *sin6;
+#endif
+
+    r = cctx->resolver;
+    ctx = cctx->data;
+    srv = cctx->srvs;
+
+    ctx->count--;
+
+    srv->ctx = NULL;
+
+    if (cctx->naddrs) {
+
+        ctx->valid = ngx_min(ctx->valid, cctx->valid);
+
+        addrs = ngx_resolver_calloc(r, cctx->naddrs * sizeof(ngx_addr_t));
+        if (addrs == NULL) {
+            ngx_resolve_name_done(cctx);
+
+            ctx->state = NGX_ERROR;
+            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
+
+            ctx->handler(ctx);
+            return;
+        }
+
+        sockaddr = ngx_resolver_alloc(r, cctx->naddrs * NGX_SOCKADDRLEN);
+        if (sockaddr == NULL) {
+            ngx_resolver_free(r, addrs);
+            ngx_resolve_name_done(cctx);
+
+            ctx->state = NGX_ERROR;
+            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
+
+            ctx->handler(ctx);
+            return;
+        }
+
+        for (i = 0; i < cctx->naddrs; i++) {
+            addrs[i].sockaddr = (struct sockaddr *) sockaddr[i];
+            addrs[i].socklen = cctx->addrs[i].socklen;
+
+            ngx_memcpy(sockaddr[i], cctx->addrs[i].sockaddr,
+                       addrs[i].socklen);
+
+            switch (addrs[i].sockaddr->sa_family) {
+#if (NGX_HAVE_INET6)
+            case AF_INET6:
+                sin6 = (struct sockaddr_in6 *) addrs[i].sockaddr;
+                sin6->sin6_port = htons(srv->port);
+                break;
+#endif
+            default: /* AF_INET */
+                sin = (struct sockaddr_in *) addrs[i].sockaddr;
+                sin->sin_port = htons(srv->port);
+            }
+        }
+
+        srv->addrs = addrs;
+        srv->naddrs = cctx->naddrs;
+    }
+
+    ngx_resolve_name_done(cctx);
+
+    if (ctx->count == 0) {
+        ngx_resolver_report_srv(r, ctx);
+    }
+}
+
+
 static void
 ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n,
     ngx_uint_t ident, ngx_uint_t code, ngx_uint_t nan)
@@ -2541,6 +3221,7 @@ valid:
         while (next) {
             ctx = next;
             ctx->state = code;
+            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
             next = ctx->next;
 
             ctx->handler(ctx);
@@ -2675,6 +3356,7 @@ ptr:
     while (next) {
         ctx = next;
         ctx->state = NGX_OK;
+        ctx->valid = rn->valid;
         ctx->name = name;
         next = ctx->next;
 
@@ -2746,6 +3428,47 @@ ngx_resolver_lookup_name(ngx_resolver_t *r, ngx_str_t *name, uint32_t hash)
 }
 
 
+static ngx_resolver_node_t *
+ngx_resolver_lookup_srv(ngx_resolver_t *r, ngx_str_t *name, uint32_t hash)
+{
+    ngx_int_t             rc;
+    ngx_rbtree_node_t    *node, *sentinel;
+    ngx_resolver_node_t  *rn;
+
+    node = r->srv_rbtree.root;
+    sentinel = r->srv_rbtree.sentinel;
+
+    while (node != sentinel) {
+
+        if (hash < node->key) {
+            node = node->left;
+            continue;
+        }
+
+        if (hash > node->key) {
+            node = node->right;
+            continue;
+        }
+
+        /* hash == node->key */
+
+        rn = ngx_resolver_node(node);
+
+        rc = ngx_memn2cmp(name->data, rn->name, name->len, rn->nlen);
+
+        if (rc == 0) {
+            return rn;
+        }
+
+        node = (rc < 0) ? node->left : node->right;
+    }
+
+    /* not found */
+
+    return NULL;
+}
+
+
 static ngx_resolver_node_t *
 ngx_resolver_lookup_addr(ngx_resolver_t *r, in_addr_t addr)
 {
@@ -3033,9 +3756,97 @@ ngx_resolver_create_name_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
 }
 
 
+static ngx_int_t
+ngx_resolver_create_srv_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
+    ngx_str_t *name)
+{
+    u_char              *p, *s;
+    size_t               len, nlen;
+    ngx_uint_t           ident;
+    ngx_resolver_qs_t   *qs;
+    ngx_resolver_hdr_t  *query;
+
+    nlen = name->len ? (1 + name->len + 1) : 1;
+
+    len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
+
+    p = ngx_resolver_alloc(r, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    rn->qlen = (u_short) len;
+    rn->query = p;
+
+    query = (ngx_resolver_hdr_t *) p;
+
+    ident = ngx_random();
+
+    ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
+                   "resolve: \"%V\" SRV %i", name, ident & 0xffff);
+
+    query->ident_hi = (u_char) ((ident >> 8) & 0xff);
+    query->ident_lo = (u_char) (ident & 0xff);
+
+    /* recursion query */
+    query->flags_hi = 1; query->flags_lo = 0;
+
+    /* one question */
+    query->nqs_hi = 0; query->nqs_lo = 1;
+    query->nan_hi = 0; query->nan_lo = 0;
+    query->nns_hi = 0; query->nns_lo = 0;
+    query->nar_hi = 0; query->nar_lo = 0;
+
+    p += sizeof(ngx_resolver_hdr_t) + nlen;
+
+    qs = (ngx_resolver_qs_t *) p;
+
+    /* query type */
+    qs->type_hi = 0; qs->type_lo = NGX_RESOLVE_SRV;
+
+    /* IN query class */
+    qs->class_hi = 0; qs->class_lo = 1;
+
+    /* converts "www.example.com" to "\3www\7example\3com\0" */
+
+    len = 0;
+    p--;
+    *p-- = '\0';
+
+    if (name->len == 0)  {
+        return NGX_DECLINED;
+    }
+
+    for (s = name->data + name->len - 1; s >= name->data; s--) {
+        if (*s != '.') {
+            *p = *s;
+            len++;
+
+        } else {
+            if (len == 0 || len > 255) {
+                return NGX_DECLINED;
+            }
+
+            *p = (u_char) len;
+            len = 0;
+        }
+
+        p--;
+    }
+
+    if (len == 0 || len > 255) {
+        return NGX_DECLINED;
+    }
+
+    *p = (u_char) len;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_resolver_create_addr_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
-    ngx_addr_t *addr)
+    ngx_resolver_addr_t *addr)
 {
     u_char               *p, *d;
     size_t                len;
@@ -3239,6 +4050,8 @@ ngx_resolver_timeout_handler(ngx_event_t *ev)
 static void
 ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn)
 {
+    ngx_uint_t  i;
+
     /* lock alloc mutex */
 
     if (rn->query) {
@@ -3263,6 +4076,16 @@ ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn)
     }
 #endif
 
+    if (rn->nsrvs) {
+        for (i = 0; i < rn->nsrvs; i++) {
+            if (rn->u.srvs[i].name.data) {
+                ngx_resolver_free_locked(r, rn->u.srvs[i].name.data);
+            }
+        }
+
+        ngx_resolver_free_locked(r, rn->u.srvs);
+    }
+
     ngx_resolver_free_locked(r, rn);
 
     /* unlock alloc mutex */
@@ -3334,15 +4157,15 @@ ngx_resolver_dup(ngx_resolver_t *r, void *src, size_t size)
 }
 
 
-static ngx_addr_t *
+static ngx_resolver_addr_t *
 ngx_resolver_export(ngx_resolver_t *r, ngx_resolver_node_t *rn,
     ngx_uint_t rotate)
 {
-    ngx_addr_t            *dst;
     ngx_uint_t             d, i, j, n;
     u_char               (*sockaddr)[NGX_SOCKADDRLEN];
     in_addr_t             *addr;
     struct sockaddr_in    *sin;
+    ngx_resolver_addr_t   *dst;
 #if (NGX_HAVE_INET6)
     struct in6_addr       *addr6;
     struct sockaddr_in6   *sin6;
@@ -3353,7 +4176,7 @@ ngx_resolver_export(ngx_resolver_t *r, ngx_resolver_node_t *rn,
     n += rn->naddrs6;
 #endif
 
-    dst = ngx_resolver_calloc(r, n * sizeof(ngx_addr_t));
+    dst = ngx_resolver_calloc(r, n * sizeof(ngx_resolver_addr_t));
     if (dst == NULL) {
         return NULL;
     }
@@ -3417,6 +4240,99 @@ ngx_resolver_export(ngx_resolver_t *r, ngx_resolver_node_t *rn,
 }
 
 
+static void
+ngx_resolver_report_srv(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
+{
+    ngx_uint_t                naddrs, nsrvs, nw, i, j, k, l, m, n, w;
+    ngx_resolver_addr_t      *addrs;
+    ngx_resolver_srv_name_t  *srvs;
+
+    naddrs = 0;
+
+    for (i = 0; i < ctx->nsrvs; i++) {
+        naddrs += ctx->srvs[i].naddrs;
+    }
+
+    if (naddrs == 0) {
+        ctx->state = NGX_RESOLVE_NXDOMAIN;
+        ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
+
+        ctx->handler(ctx);
+        return;
+    }
+
+    addrs = ngx_resolver_calloc(r, naddrs * sizeof(ngx_resolver_addr_t));
+    if (addrs == NULL) {
+        ctx->state = NGX_ERROR;
+        ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
+
+        ctx->handler(ctx);
+        return;
+    }
+
+    srvs = ctx->srvs;
+    nsrvs = ctx->nsrvs;
+
+    i = 0;
+    n = 0;
+
+    do {
+        nw = 0;
+
+        for (j = i; j < nsrvs; j++) {
+            if (srvs[j].priority != srvs[i].priority) {
+                break;
+            }
+
+            nw += srvs[j].naddrs * srvs[j].weight;
+        }
+
+        if (nw == 0) {
+            goto next_srv;
+        }
+
+        w = ngx_random() % nw;
+
+        for (k = i; k < j; k++) {
+            if (w < srvs[k].naddrs * srvs[k].weight) {
+                break;
+            }
+
+            w -= srvs[k].naddrs * srvs[k].weight;
+        }
+
+        for (l = i; l < j; l++) {
+
+            for (m = 0; m < srvs[k].naddrs; m++) {
+                addrs[n].socklen = srvs[k].addrs[m].socklen;
+                addrs[n].sockaddr = srvs[k].addrs[m].sockaddr;
+                addrs[n].name = srvs[k].name;
+                addrs[n].priority = srvs[k].priority;
+                addrs[n].weight = srvs[k].weight;
+                n++;
+            }
+
+            if (++k == j) {
+                k = i;
+            }
+        }
+
+next_srv:
+
+        i = j;
+
+    } while (i < ctx->nsrvs);
+
+    ctx->state = NGX_OK;
+    ctx->addrs = addrs;
+    ctx->naddrs = naddrs;
+
+    ctx->handler(ctx);
+
+    ngx_resolver_free(r, addrs);
+}
+
+
 char *
 ngx_resolver_strerror(ngx_int_t err)
 {
@@ -3728,3 +4644,19 @@ failed:
 
     return NGX_ERROR;
 }
+
+
+static ngx_int_t
+ngx_resolver_cmp_srvs(const void *one, const void *two)
+{
+    ngx_int_t            p1, p2;
+    ngx_resolver_srv_t  *first, *second;
+
+    first = (ngx_resolver_srv_t *) one;
+    second = (ngx_resolver_srv_t *) two;
+
+    p1 = first->priority;
+    p2 = second->priority;
+
+    return p1 - p2;
+}
diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h
index 3165abd..e36cfdc 100644
--- a/src/core/ngx_resolver.h
+++ b/src/core/ngx_resolver.h
@@ -21,6 +21,7 @@
 #if (NGX_HAVE_INET6)
 #define NGX_RESOLVE_AAAA      28
 #endif
+#define NGX_RESOLVE_SRV       33
 #define NGX_RESOLVE_DNAME     39
 
 #define NGX_RESOLVE_FORMERR   1
@@ -57,6 +58,36 @@ typedef struct ngx_resolver_ctx_s  ngx_resolver_ctx_t;
 typedef void (*ngx_resolver_handler_pt)(ngx_resolver_ctx_t *ctx);
 
 
+typedef struct {
+    struct sockaddr          *sockaddr;
+    socklen_t                 socklen;
+    ngx_str_t                 name;
+    u_short                   priority;
+    u_short                   weight;
+} ngx_resolver_addr_t;
+
+
+typedef struct {
+    ngx_str_t                 name;
+    u_short                   priority;
+    u_short                   weight;
+    u_short                   port;
+} ngx_resolver_srv_t;
+
+
+typedef struct {
+    ngx_str_t                 name;
+    u_short                   priority;
+    u_short                   weight;
+    u_short                   port;
+
+    ngx_resolver_ctx_t       *ctx;
+
+    ngx_uint_t                naddrs;
+    ngx_addr_t               *addrs;
+} ngx_resolver_srv_name_t;
+
+
 typedef struct {
     ngx_rbtree_node_t         node;
     ngx_queue_t               queue;
@@ -81,10 +112,12 @@ typedef struct {
         in_addr_t             addr;
         in_addr_t            *addrs;
         u_char               *cname;
+        ngx_resolver_srv_t   *srvs;
     } u;
 
     u_char                    code;
     u_short                   naddrs;
+    u_short                   nsrvs;
     u_short                   cnlen;
 
 #if (NGX_HAVE_INET6)
@@ -127,13 +160,18 @@ struct ngx_resolver_s {
     ngx_rbtree_t              name_rbtree;
     ngx_rbtree_node_t         name_sentinel;
 
+    ngx_rbtree_t              srv_rbtree;
+    ngx_rbtree_node_t         srv_sentinel;
+
     ngx_rbtree_t              addr_rbtree;
     ngx_rbtree_node_t         addr_sentinel;
 
     ngx_queue_t               name_resend_queue;
+    ngx_queue_t               srv_resend_queue;
     ngx_queue_t               addr_resend_queue;
 
     ngx_queue_t               name_expire_queue;
+    ngx_queue_t               srv_expire_queue;
     ngx_queue_t               addr_expire_queue;
 
 #if (NGX_HAVE_INET6)
@@ -163,12 +201,18 @@ struct ngx_resolver_ctx_s {
 
     ngx_int_t                 state;
     ngx_str_t                 name;
+    ngx_str_t                 service;
 
+    time_t                    valid;
     ngx_uint_t                naddrs;
-    ngx_addr_t               *addrs;
-    ngx_addr_t                addr;
+    ngx_resolver_addr_t      *addrs;
+    ngx_resolver_addr_t       addr;
     struct sockaddr_in        sin;
 
+    ngx_uint_t                count;
+    ngx_uint_t                nsrvs;
+    ngx_resolver_srv_name_t  *srvs;
+
     ngx_resolver_handler_pt   handler;
     void                     *data;
     ngx_msec_t                timeout;
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index fa8aebd..f985fbd 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -14,7 +14,9 @@
 
 /* Solaris declarations */
 
+#ifndef POLLREMOVE
 #define POLLREMOVE   0x0800
+#endif
 #define DP_POLL      0xD001
 #define DP_ISPOLLED  0xD002
 
@@ -436,7 +438,7 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
             default:
                 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
-                    "unexpected event %04Xd for closed and removed socket %d, ",
+                    "unexpected event %04Xd for closed and removed socket %d, "
                     "ioctl(DP_ISPOLLED) returned rc:%d, fd:%d, event %04Xd",
                     revents, fd, rc, pfd.fd, pfd.revents);
 
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index d7f915d..081b0e5 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -840,6 +840,9 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
             }
 
             wev->ready = 1;
+#if (NGX_THREADS)
+            wev->complete = 1;
+#endif
 
             if (flags & NGX_POST_EVENTS) {
                 ngx_post_event(wev, &ngx_posted_events);
diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c
index bacbb05..9184547 100644
--- a/src/event/modules/ngx_eventport_module.c
+++ b/src/event/modules/ngx_eventport_module.c
@@ -49,7 +49,7 @@ typedef struct  port_notify {
     void       *portnfy_user;   /* user defined */
 } port_notify_t;
 
-#if (__FreeBSD_version < 700005)
+#if (__FreeBSD__) && (__FreeBSD_version < 700005)
 
 typedef struct itimerspec {     /* definition per POSIX.4 */
     struct timespec it_interval;/* timer period */
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 955622b..38f9b38 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -746,6 +746,7 @@ ngx_event_process_init(ngx_cycle_t *cycle)
             return NGX_ERROR;
         }
 
+        c->type = ls[i].type;
         c->log = &ls[i].log;
 
         c->listening = &ls[i];
@@ -818,7 +819,8 @@ ngx_event_process_init(ngx_cycle_t *cycle)
 
 #else
 
-        rev->handler = ngx_event_accept;
+        rev->handler = (c->type == SOCK_STREAM) ? ngx_event_accept
+                                                : ngx_event_recvmsg;
 
         if (ngx_use_accept_mutex
 #if (NGX_HAVE_REUSEPORT)
@@ -1206,7 +1208,7 @@ ngx_event_core_init_conf(ngx_cycle_t *cycle, void *conf)
 
 #endif
 
-#if (NGX_HAVE_DEVPOLL)
+#if (NGX_HAVE_DEVPOLL) && !(NGX_TEST_BUILD_DEVPOLL)
 
     module = &ngx_devpoll_module;
 
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 855c58d..591005a 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -343,7 +343,8 @@ extern ngx_event_actions_t   ngx_event_actions;
 #define NGX_DISABLE_EVENT  EV_DISABLE
 
 
-#elif (NGX_HAVE_DEVPOLL || NGX_HAVE_EVENTPORT)
+#elif (NGX_HAVE_DEVPOLL && !(NGX_TEST_BUILD_DEVPOLL)) \
+      || (NGX_HAVE_EVENTPORT && !(NGX_TEST_BUILD_EVENTPORT))
 
 #define NGX_READ_EVENT     POLLIN
 #define NGX_WRITE_EVENT    POLLOUT
@@ -352,7 +353,7 @@ extern ngx_event_actions_t   ngx_event_actions;
 #define NGX_ONESHOT_EVENT  1
 
 
-#elif (NGX_HAVE_EPOLL)
+#elif (NGX_HAVE_EPOLL) && !(NGX_TEST_BUILD_EPOLL)
 
 #define NGX_READ_EVENT     (EPOLLIN|EPOLLRDHUP)
 #define NGX_WRITE_EVENT    EPOLLOUT
@@ -418,6 +419,7 @@ extern ngx_os_io_t  ngx_io;
 #define ngx_udp_recv         ngx_io.udp_recv
 #define ngx_send             ngx_io.send
 #define ngx_send_chain       ngx_io.send_chain
+#define ngx_udp_send         ngx_io.udp_send
 
 
 #define NGX_EVENT_MODULE      0x544E5645  /* "EVNT" */
@@ -491,6 +493,9 @@ extern ngx_module_t           ngx_event_core_module;
 
 
 void ngx_event_accept(ngx_event_t *ev);
+#if !(NGX_WIN32)
+void ngx_event_recvmsg(ngx_event_t *ev);
+#endif
 ngx_int_t ngx_trylock_accept_mutex(ngx_cycle_t *cycle);
 u_char *ngx_accept_log_error(ngx_log_t *log, u_char *buf, size_t len);
 
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 8888f5a..1c87a34 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -13,6 +13,10 @@
 static ngx_int_t ngx_enable_accept_events(ngx_cycle_t *cycle);
 static ngx_int_t ngx_disable_accept_events(ngx_cycle_t *cycle, ngx_uint_t all);
 static void ngx_close_accepted_connection(ngx_connection_t *c);
+#if (NGX_DEBUG)
+static void ngx_debug_accepted_connection(ngx_event_conf_t *ecf,
+    ngx_connection_t *c);
+#endif
 
 
 void
@@ -149,6 +153,8 @@ ngx_event_accept(ngx_event_t *ev)
             return;
         }
 
+        c->type = SOCK_STREAM;
+
 #if (NGX_STAT_STUB)
         (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
 #endif
@@ -276,60 +282,10 @@ ngx_event_accept(ngx_event_t *ev)
 
 #if (NGX_DEBUG)
         {
+        ngx_str_t  addr;
+        u_char     text[NGX_SOCKADDR_STRLEN];
 
-        ngx_str_t             addr;
-        struct sockaddr_in   *sin;
-        ngx_cidr_t           *cidr;
-        ngx_uint_t            i;
-        u_char                text[NGX_SOCKADDR_STRLEN];
-#if (NGX_HAVE_INET6)
-        struct sockaddr_in6  *sin6;
-        ngx_uint_t            n;
-#endif
-
-        cidr = ecf->debug_connection.elts;
-        for (i = 0; i < ecf->debug_connection.nelts; i++) {
-            if (cidr[i].family != (ngx_uint_t) c->sockaddr->sa_family) {
-                goto next;
-            }
-
-            switch (cidr[i].family) {
-
-#if (NGX_HAVE_INET6)
-            case AF_INET6:
-                sin6 = (struct sockaddr_in6 *) c->sockaddr;
-                for (n = 0; n < 16; n++) {
-                    if ((sin6->sin6_addr.s6_addr[n]
-                        & cidr[i].u.in6.mask.s6_addr[n])
-                        != cidr[i].u.in6.addr.s6_addr[n])
-                    {
-                        goto next;
-                    }
-                }
-                break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-            case AF_UNIX:
-                break;
-#endif
-
-            default: /* AF_INET */
-                sin = (struct sockaddr_in *) c->sockaddr;
-                if ((sin->sin_addr.s_addr & cidr[i].u.in.mask)
-                    != cidr[i].u.in.addr)
-                {
-                    goto next;
-                }
-                break;
-            }
-
-            log->log_level = NGX_LOG_DEBUG_CONNECTION|NGX_LOG_DEBUG_ALL;
-            break;
-
-        next:
-            continue;
-        }
+        ngx_debug_accepted_connection(ecf, c);
 
         if (log->log_level & NGX_LOG_DEBUG_EVENT) {
             addr.data = text;
@@ -363,6 +319,324 @@ ngx_event_accept(ngx_event_t *ev)
 }
 
 
+#if !(NGX_WIN32)
+
+void
+ngx_event_recvmsg(ngx_event_t *ev)
+{
+    ssize_t            n;
+    ngx_log_t         *log;
+    ngx_err_t          err;
+    ngx_event_t       *rev, *wev;
+    struct iovec       iov[1];
+    struct msghdr      msg;
+    ngx_listening_t   *ls;
+    ngx_event_conf_t  *ecf;
+    ngx_connection_t  *c, *lc;
+    u_char             sa[NGX_SOCKADDRLEN];
+    static u_char      buffer[65535];
+
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+
+#if (NGX_HAVE_IP_RECVDSTADDR)
+    u_char             msg_control[CMSG_SPACE(sizeof(struct in_addr))];
+#elif (NGX_HAVE_IP_PKTINFO)
+    u_char             msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))];
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+    u_char             msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+#endif
+
+#endif
+
+    if (ev->timedout) {
+        if (ngx_enable_accept_events((ngx_cycle_t *) ngx_cycle) != NGX_OK) {
+            return;
+        }
+
+        ev->timedout = 0;
+    }
+
+    ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module);
+
+    if (!(ngx_event_flags & NGX_USE_KQUEUE_EVENT)) {
+        ev->available = ecf->multi_accept;
+    }
+
+    lc = ev->data;
+    ls = lc->listening;
+    ev->ready = 0;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                   "recvmsg on %V, ready: %d", &ls->addr_text, ev->available);
+
+    do {
+        ngx_memzero(&msg, sizeof(struct msghdr));
+
+        iov[0].iov_base = (void *) buffer;
+        iov[0].iov_len = sizeof(buffer);
+
+        msg.msg_name = &sa;
+        msg.msg_namelen = sizeof(sa);
+        msg.msg_iov = iov;
+        msg.msg_iovlen = 1;
+
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+
+        if (ls->wildcard) {
+
+#if (NGX_HAVE_IP_RECVDSTADDR || NGX_HAVE_IP_PKTINFO)
+            if (ls->sockaddr->sa_family == AF_INET) {
+                msg.msg_control = &msg_control;
+                msg.msg_controllen = sizeof(msg_control);
+            }
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+            if (ls->sockaddr->sa_family == AF_INET6) {
+                msg.msg_control = &msg_control6;
+                msg.msg_controllen = sizeof(msg_control6);
+            }
+#endif
+        }
+
+#endif
+
+        n = recvmsg(lc->fd, &msg, 0);
+
+        if (n == -1) {
+            err = ngx_socket_errno;
+
+            if (err == NGX_EAGAIN) {
+                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, err,
+                               "recvmsg() not ready");
+                return;
+            }
+
+            ngx_log_error(NGX_LOG_ALERT, ev->log, err, "recvmsg() failed");
+
+            return;
+        }
+
+#if (NGX_STAT_STUB)
+        (void) ngx_atomic_fetch_add(ngx_stat_accepted, 1);
+#endif
+
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+        if (msg.msg_flags & (MSG_TRUNC|MSG_CTRUNC)) {
+            ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
+                          "recvmsg() truncated data");
+            continue;
+        }
+#endif
+
+        ngx_accept_disabled = ngx_cycle->connection_n / 8
+                              - ngx_cycle->free_connection_n;
+
+        c = ngx_get_connection(lc->fd, ev->log);
+        if (c == NULL) {
+            return;
+        }
+
+        c->shared = 1;
+        c->type = SOCK_DGRAM;
+        c->socklen = msg.msg_namelen;
+
+#if (NGX_STAT_STUB)
+        (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
+#endif
+
+        c->pool = ngx_create_pool(ls->pool_size, ev->log);
+        if (c->pool == NULL) {
+            ngx_close_accepted_connection(c);
+            return;
+        }
+
+        c->sockaddr = ngx_palloc(c->pool, c->socklen);
+        if (c->sockaddr == NULL) {
+            ngx_close_accepted_connection(c);
+            return;
+        }
+
+        ngx_memcpy(c->sockaddr, msg.msg_name, c->socklen);
+
+        log = ngx_palloc(c->pool, sizeof(ngx_log_t));
+        if (log == NULL) {
+            ngx_close_accepted_connection(c);
+            return;
+        }
+
+        *log = ls->log;
+
+        c->send = ngx_udp_send;
+
+        c->log = log;
+        c->pool->log = log;
+
+        c->listening = ls;
+        c->local_sockaddr = ls->sockaddr;
+        c->local_socklen = ls->socklen;
+
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+
+        if (ls->wildcard) {
+            struct cmsghdr   *cmsg;
+            struct sockaddr  *sockaddr;
+
+            sockaddr = ngx_palloc(c->pool, c->local_socklen);
+            if (sockaddr == NULL) {
+                ngx_close_accepted_connection(c);
+                return;
+            }
+
+            ngx_memcpy(sockaddr, c->local_sockaddr, c->local_socklen);
+            c->local_sockaddr = sockaddr;
+
+            for (cmsg = CMSG_FIRSTHDR(&msg);
+                 cmsg != NULL;
+                 cmsg = CMSG_NXTHDR(&msg, cmsg))
+            {
+
+#if (NGX_HAVE_IP_RECVDSTADDR)
+
+                if (cmsg->cmsg_level == IPPROTO_IP
+                    && cmsg->cmsg_type == IP_RECVDSTADDR
+                    && sockaddr->sa_family == AF_INET)
+                {
+                    struct in_addr      *addr;
+                    struct sockaddr_in  *sin;
+
+                    addr = (struct in_addr *) CMSG_DATA(cmsg);
+                    sin = (struct sockaddr_in *) sockaddr;
+                    sin->sin_addr = *addr;
+
+                    break;
+                }
+
+#elif (NGX_HAVE_IP_PKTINFO)
+
+                if (cmsg->cmsg_level == IPPROTO_IP
+                    && cmsg->cmsg_type == IP_PKTINFO
+                    && sockaddr->sa_family == AF_INET)
+                {
+                    struct in_pktinfo   *pkt;
+                    struct sockaddr_in  *sin;
+
+                    pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
+                    sin = (struct sockaddr_in *) sockaddr;
+                    sin->sin_addr = pkt->ipi_addr;
+
+                    break;
+                }
+
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+
+                if (cmsg->cmsg_level == IPPROTO_IPV6
+                    && cmsg->cmsg_type == IPV6_PKTINFO
+                    && sockaddr->sa_family == AF_INET6)
+                {
+                    struct in6_pktinfo   *pkt6;
+                    struct sockaddr_in6  *sin6;
+
+                    pkt6 = (struct in6_pktinfo *) CMSG_DATA(cmsg);
+                    sin6 = (struct sockaddr_in6 *) sockaddr;
+                    sin6->sin6_addr = pkt6->ipi6_addr;
+
+                    break;
+                }
+
+#endif
+
+            }
+        }
+
+#endif
+
+        c->buffer = ngx_create_temp_buf(c->pool, n);
+        if (c->buffer == NULL) {
+            ngx_close_accepted_connection(c);
+            return;
+        }
+
+        c->buffer->last = ngx_cpymem(c->buffer->last, buffer, n);
+
+        rev = c->read;
+        wev = c->write;
+
+        wev->ready = 1;
+
+        rev->log = log;
+        wev->log = log;
+
+        /*
+         * TODO: MT: - ngx_atomic_fetch_add()
+         *             or protection by critical section or light mutex
+         *
+         * TODO: MP: - allocated in a shared memory
+         *           - ngx_atomic_fetch_add()
+         *             or protection by critical section or light mutex
+         */
+
+        c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+
+#if (NGX_STAT_STUB)
+        (void) ngx_atomic_fetch_add(ngx_stat_handled, 1);
+#endif
+
+        if (ls->addr_ntop) {
+            c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
+            if (c->addr_text.data == NULL) {
+                ngx_close_accepted_connection(c);
+                return;
+            }
+
+            c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->socklen,
+                                             c->addr_text.data,
+                                             ls->addr_text_max_len, 0);
+            if (c->addr_text.len == 0) {
+                ngx_close_accepted_connection(c);
+                return;
+            }
+        }
+
+#if (NGX_DEBUG)
+        {
+        ngx_str_t  addr;
+        u_char     text[NGX_SOCKADDR_STRLEN];
+
+        ngx_debug_accepted_connection(ecf, c);
+
+        if (log->log_level & NGX_LOG_DEBUG_EVENT) {
+            addr.data = text;
+            addr.len = ngx_sock_ntop(c->sockaddr, c->socklen, text,
+                                     NGX_SOCKADDR_STRLEN, 1);
+
+            ngx_log_debug4(NGX_LOG_DEBUG_EVENT, log, 0,
+                           "*%uA recvmsg: %V fd:%d n:%z",
+                           c->number, &addr, c->fd, n);
+        }
+
+        }
+#endif
+
+        log->data = NULL;
+        log->handler = NULL;
+
+        ls->handler(c);
+
+        if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
+            ev->available -= n;
+        }
+
+    } while (ev->available);
+}
+
+#endif
+
+
 ngx_int_t
 ngx_trylock_accept_mutex(ngx_cycle_t *cycle)
 {
@@ -476,7 +750,7 @@ ngx_close_accepted_connection(ngx_connection_t *c)
     fd = c->fd;
     c->fd = (ngx_socket_t) -1;
 
-    if (ngx_close_socket(fd) == -1) {
+    if (!c->shared && ngx_close_socket(fd) == -1) {
         ngx_log_error(NGX_LOG_ALERT, c->log, ngx_socket_errno,
                       ngx_close_socket_n " failed");
     }
@@ -497,3 +771,64 @@ ngx_accept_log_error(ngx_log_t *log, u_char *buf, size_t len)
     return ngx_snprintf(buf, len, " while accepting new connection on %V",
                         log->data);
 }
+
+
+#if (NGX_DEBUG)
+
+static void
+ngx_debug_accepted_connection(ngx_event_conf_t *ecf, ngx_connection_t *c)
+{
+    struct sockaddr_in   *sin;
+    ngx_cidr_t           *cidr;
+    ngx_uint_t            i;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+    ngx_uint_t            n;
+#endif
+
+    cidr = ecf->debug_connection.elts;
+    for (i = 0; i < ecf->debug_connection.nelts; i++) {
+        if (cidr[i].family != (ngx_uint_t) c->sockaddr->sa_family) {
+            goto next;
+        }
+
+        switch (cidr[i].family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            sin6 = (struct sockaddr_in6 *) c->sockaddr;
+            for (n = 0; n < 16; n++) {
+                if ((sin6->sin6_addr.s6_addr[n]
+                    & cidr[i].u.in6.mask.s6_addr[n])
+                    != cidr[i].u.in6.addr.s6_addr[n])
+                {
+                    goto next;
+                }
+            }
+            break;
+#endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+        case AF_UNIX:
+            break;
+#endif
+
+        default: /* AF_INET */
+            sin = (struct sockaddr_in *) c->sockaddr;
+            if ((sin->sin_addr.s_addr & cidr[i].u.in.mask)
+                != cidr[i].u.in.addr)
+            {
+                goto next;
+            }
+            break;
+        }
+
+        c->log->log_level = NGX_LOG_DEBUG_CONNECTION|NGX_LOG_DEBUG_ALL;
+        break;
+
+    next:
+        continue;
+    }
+}
+
+#endif
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 1186958..8aca862 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -14,7 +14,7 @@
 ngx_int_t
 ngx_event_connect_peer(ngx_peer_connection_t *pc)
 {
-    int                rc;
+    int                rc, type;
     ngx_int_t          event;
     ngx_err_t          err;
     ngx_uint_t         level;
@@ -27,9 +27,12 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
         return rc;
     }
 
-    s = ngx_socket(pc->sockaddr->sa_family, SOCK_STREAM, 0);
+    type = (pc->type ? pc->type : SOCK_STREAM);
 
-    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0, "socket %d", s);
+    s = ngx_socket(pc->sockaddr->sa_family, type, 0);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0, "%s socket %d",
+                   (type == SOCK_STREAM) ? "stream" : "dgram", s);
 
     if (s == (ngx_socket_t) -1) {
         ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
@@ -49,6 +52,8 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
         return NGX_ERROR;
     }
 
+    c->type = type;
+
     if (pc->rcvbuf) {
         if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
                        (const void *) &pc->rcvbuf, sizeof(int)) == -1)
@@ -75,25 +80,31 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
         }
     }
 
-    c->recv = ngx_recv;
-    c->send = ngx_send;
-    c->recv_chain = ngx_recv_chain;
-    c->send_chain = ngx_send_chain;
+    if (type == SOCK_STREAM) {
+        c->recv = ngx_recv;
+        c->send = ngx_send;
+        c->recv_chain = ngx_recv_chain;
+        c->send_chain = ngx_send_chain;
 
-    c->sendfile = 1;
+        c->sendfile = 1;
 
-    c->log_error = pc->log_error;
-
-    if (pc->sockaddr->sa_family == AF_UNIX) {
-        c->tcp_nopush = NGX_TCP_NOPUSH_DISABLED;
-        c->tcp_nodelay = NGX_TCP_NODELAY_DISABLED;
+        if (pc->sockaddr->sa_family == AF_UNIX) {
+            c->tcp_nopush = NGX_TCP_NOPUSH_DISABLED;
+            c->tcp_nodelay = NGX_TCP_NODELAY_DISABLED;
 
 #if (NGX_SOLARIS)
-        /* Solaris's sendfilev() supports AF_NCA, AF_INET, and AF_INET6 */
-        c->sendfile = 0;
+            /* Solaris's sendfilev() supports AF_NCA, AF_INET, and AF_INET6 */
+            c->sendfile = 0;
 #endif
+        }
+
+    } else { /* type == SOCK_DGRAM */
+        c->recv = ngx_udp_recv;
+        c->send = ngx_send;
     }
 
+    c->log_error = pc->log_error;
+
     rev = c->read;
     wev = c->write;
 
diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h
index ed18db7..1bacf82 100644
--- a/src/event/ngx_event_connect.h
+++ b/src/event/ngx_event_connect.h
@@ -55,6 +55,7 @@ struct ngx_peer_connection_s {
 
     ngx_addr_t                      *local;
 
+    int                              type;
     int                              rcvbuf;
 
     ngx_log_t                       *log;
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index 2d0e7d3..ee86c7e 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -112,6 +112,14 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
         return NGX_OK;
     }
 
+#if (NGX_THREADS)
+    if (p->aio) {
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
+                       "pipe read upstream: aio");
+        return NGX_AGAIN;
+    }
+#endif
+
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
                    "pipe read upstream: %d", p->upstream->read->ready);
 
@@ -258,19 +266,6 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
                     break;
                 }
 
-                if (rc == NGX_AGAIN) {
-                    if (ngx_event_flags & NGX_USE_LEVEL_EVENT
-                        && p->upstream->read->active
-                        && p->upstream->read->ready)
-                    {
-                        if (ngx_del_event(p->upstream->read, NGX_READ_EVENT, 0)
-                            == NGX_ERROR)
-                        {
-                            return NGX_ABORT;
-                        }
-                    }
-                }
-
                 if (rc != NGX_OK) {
                     return rc;
                 }
@@ -475,8 +470,10 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
                        "pipe write chain");
 
-        if (ngx_event_pipe_write_chain_to_temp_file(p) == NGX_ABORT) {
-            return NGX_ABORT;
+        rc = ngx_event_pipe_write_chain_to_temp_file(p);
+
+        if (rc != NGX_OK) {
+            return rc;
         }
     }
 
@@ -499,6 +496,18 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
                    "pipe write downstream: %d", downstream->write->ready);
 
+#if (NGX_THREADS)
+
+    if (p->writing) {
+        rc = ngx_event_pipe_write_chain_to_temp_file(p);
+
+        if (rc == NGX_ABORT) {
+            return NGX_ABORT;
+        }
+    }
+
+#endif
+
     flushed = 0;
 
     for ( ;; ) {
@@ -532,6 +541,10 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
                 p->out = NULL;
             }
 
+            if (p->writing) {
+                break;
+            }
+
             if (p->in) {
                 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
                                "pipe write downstream flush in");
@@ -608,7 +621,7 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
 
                 p->out = p->out->next;
 
-            } else if (!p->cacheable && p->in) {
+            } else if (!p->cacheable && !p->writing && p->in) {
                 cl = p->in;
 
                 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, p->log, 0,
@@ -710,12 +723,38 @@ ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p)
     ssize_t       size, bsize, n;
     ngx_buf_t    *b;
     ngx_uint_t    prev_last_shadow;
-    ngx_chain_t  *cl, *tl, *next, *out, **ll, **last_out, **last_free, fl;
+    ngx_chain_t  *cl, *tl, *next, *out, **ll, **last_out, **last_free;
+
+#if (NGX_THREADS)
+
+    if (p->writing) {
+
+        if (p->aio) {
+            return NGX_AGAIN;
+        }
+
+        out = p->writing;
+        p->writing = NULL;
+
+        n = ngx_write_chain_to_temp_file(p->temp_file, NULL);
+
+        if (n == NGX_ERROR) {
+            return NGX_ABORT;
+        }
+
+        goto done;
+    }
+
+#endif
 
     if (p->buf_to_file) {
-        fl.buf = p->buf_to_file;
-        fl.next = p->in;
-        out = &fl;
+        out = ngx_alloc_chain_link(p->pool);
+        if (out == NULL) {
+            return NGX_ABORT;
+        }
+
+        out->buf = p->buf_to_file;
+        out->next = p->in;
 
     } else {
         out = p->in;
@@ -775,12 +814,31 @@ ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p)
         p->last_in = &p->in;
     }
 
+#if (NGX_THREADS)
+    p->temp_file->thread_write = p->thread_handler ? 1 : 0;
+    p->temp_file->file.thread_task = p->thread_task;
+    p->temp_file->file.thread_handler = p->thread_handler;
+    p->temp_file->file.thread_ctx = p->thread_ctx;
+#endif
+
     n = ngx_write_chain_to_temp_file(p->temp_file, out);
 
     if (n == NGX_ERROR) {
         return NGX_ABORT;
     }
 
+#if (NGX_THREADS)
+
+    if (n == NGX_AGAIN) {
+        p->writing = out;
+        p->thread_task = p->temp_file->file.thread_task;
+        return NGX_AGAIN;
+    }
+
+done:
+
+#endif
+
     if (p->buf_to_file) {
         p->temp_file->offset = p->buf_to_file->last - p->buf_to_file->pos;
         n -= p->buf_to_file->last - p->buf_to_file->pos;
diff --git a/src/event/ngx_event_pipe.h b/src/event/ngx_event_pipe.h
index 451fc4c..ef2e7a0 100644
--- a/src/event/ngx_event_pipe.h
+++ b/src/event/ngx_event_pipe.h
@@ -30,6 +30,8 @@ struct ngx_event_pipe_s {
     ngx_chain_t       *in;
     ngx_chain_t      **last_in;
 
+    ngx_chain_t       *writing;
+
     ngx_chain_t       *out;
     ngx_chain_t       *free;
     ngx_chain_t       *busy;
@@ -45,6 +47,13 @@ struct ngx_event_pipe_s {
     ngx_event_pipe_output_filter_pt   output_filter;
     void                             *output_ctx;
 
+#if (NGX_THREADS)
+    ngx_int_t                       (*thread_handler)(ngx_thread_task_t *task,
+                                                      ngx_file_t *file);
+    void                             *thread_ctx;
+    ngx_thread_task_t                *thread_task;
+#endif
+
     unsigned           read:1;
     unsigned           cacheable:1;
     unsigned           single_buf:1;
@@ -56,6 +65,7 @@ struct ngx_event_pipe_s {
     unsigned           downstream_done:1;
     unsigned           downstream_error:1;
     unsigned           cyclic_temp_file:1;
+    unsigned           aio:1;
 
     ngx_int_t          allocated;
     ngx_bufs_t         bufs;
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index dbd7767..e3024b3 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -206,6 +206,7 @@ static ngx_conf_bitmask_t  ngx_http_fastcgi_next_upstream_masks[] = {
     { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
     { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
     { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
+    { ngx_string("non_idempotent"), NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT },
     { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
     { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
     { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index a869e74..5005b6b 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -213,6 +213,7 @@ static ngx_conf_bitmask_t  ngx_http_proxy_next_upstream_masks[] = {
     { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
     { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
     { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
+    { ngx_string("non_idempotent"), NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT },
     { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
     { ngx_string("http_502"), NGX_HTTP_UPSTREAM_FT_HTTP_502 },
     { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 76c7786..b468eb7 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -77,6 +77,7 @@ static ngx_conf_bitmask_t ngx_http_scgi_next_upstream_masks[] = {
     { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
     { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
     { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
+    { ngx_string("non_idempotent"), NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT },
     { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
     { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
     { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index 8ba75ed..7bf6e19 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -229,7 +229,7 @@ ngx_http_sub_header_filter(ngx_http_request_t *r)
             return ngx_http_next_header_filter(r);
         }
 
-        ctx->matches = ngx_pnalloc(r->pool, sizeof(ngx_array_t));
+        ctx->matches = ngx_palloc(r->pool, sizeof(ngx_array_t));
         if (ctx->matches == NULL) {
             return NGX_ERROR;
         }
@@ -237,7 +237,7 @@ ngx_http_sub_header_filter(ngx_http_request_t *r)
         ctx->matches->elts = matches;
         ctx->matches->nelts = j;
 
-        ctx->tables = ngx_pnalloc(r->pool, sizeof(ngx_http_sub_tables_t));
+        ctx->tables = ngx_palloc(r->pool, sizeof(ngx_http_sub_tables_t));
         if (ctx->tables == NULL) {
             return NGX_ERROR;
         }
@@ -859,7 +859,7 @@ ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         pairs = conf->pairs->elts;
         n = conf->pairs->nelts;
 
-        matches = ngx_pnalloc(cf->pool, sizeof(ngx_http_sub_match_t) * n);
+        matches = ngx_palloc(cf->pool, sizeof(ngx_http_sub_match_t) * n);
         if (matches == NULL) {
             return NGX_CONF_ERROR;
         }
@@ -869,7 +869,7 @@ ngx_http_sub_merge_conf(ngx_conf_t *cf, void *parent, void *child)
             matches[i].value = &pairs[i].value;
         }
 
-        conf->matches = ngx_pnalloc(cf->pool, sizeof(ngx_array_t));
+        conf->matches = ngx_palloc(cf->pool, sizeof(ngx_array_t));
         if (conf->matches == NULL) {
             return NGX_CONF_ERROR;
         }
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 0313dfa..fef2c46 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -109,6 +109,7 @@ static ngx_conf_bitmask_t ngx_http_uwsgi_next_upstream_masks[] = {
     { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
     { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
     { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
+    { ngx_string("non_idempotent"), NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT },
     { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
     { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
     { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h
index d36fa77..2667cbb 100644
--- a/src/http/ngx_http_cache.h
+++ b/src/http/ngx_http_cache.h
@@ -138,6 +138,8 @@ typedef struct {
     ngx_atomic_t                     cold;
     ngx_atomic_t                     loading;
     off_t                            size;
+    ngx_uint_t                       count;
+    ngx_uint_t                       watermark;
 } ngx_http_file_cache_sh_t;
 
 
@@ -153,6 +155,8 @@ struct ngx_http_file_cache_s {
 
     time_t                           inactive;
 
+    time_t                           fail_time;
+
     ngx_uint_t                       files;
     ngx_uint_t                       loader_files;
     ngx_msec_t                       last;
diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c
index c6d03ee..c696fb6 100644
--- a/src/http/ngx_http_copy_filter_module.c
+++ b/src/http/ngx_http_copy_filter_module.c
@@ -204,10 +204,11 @@ ngx_http_copy_aio_event_handler(ngx_event_t *ev)
 static ssize_t
 ngx_http_copy_aio_sendfile_preload(ngx_buf_t *file)
 {
-    ssize_t              n;
-    static u_char        buf[1];
-    ngx_event_aio_t     *aio;
-    ngx_http_request_t  *r;
+    ssize_t                  n;
+    static u_char            buf[1];
+    ngx_event_aio_t         *aio;
+    ngx_http_request_t      *r;
+    ngx_output_chain_ctx_t  *ctx;
 
     n = ngx_file_aio_read(file->file, buf, 1, file->file_pos, NULL);
 
@@ -218,6 +219,9 @@ ngx_http_copy_aio_sendfile_preload(ngx_buf_t *file)
         r = aio->data;
         r->main->blocked++;
         r->aio = 1;
+
+        ctx = ngx_http_get_module_ctx(r, ngx_http_copy_filter_module);
+        ctx->aio = 1;
     }
 
     return n;
@@ -252,6 +256,7 @@ ngx_http_copy_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
     ngx_str_t                  name;
     ngx_thread_pool_t         *tp;
     ngx_http_request_t        *r;
+    ngx_output_chain_ctx_t    *ctx;
     ngx_http_core_loc_conf_t  *clcf;
 
     r = file->thread_ctx;
@@ -285,6 +290,9 @@ ngx_http_copy_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
     r->main->blocked++;
     r->aio = 1;
 
+    ctx = ngx_http_get_module_ctx(r, ngx_http_copy_filter_module);
+    ctx->aio = 1;
+
     return NGX_OK;
 }
 
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index df7e8d4..b88e869 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -400,6 +400,13 @@ static ngx_command_t  ngx_http_core_commands[] = {
       0,
       NULL },
 
+    { ngx_string("aio_write"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_core_loc_conf_t, aio_write),
+      NULL },
+
     { ngx_string("read_ahead"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_size_slot,
@@ -3606,6 +3613,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
     clcf->sendfile = NGX_CONF_UNSET;
     clcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE;
     clcf->aio = NGX_CONF_UNSET;
+    clcf->aio_write = NGX_CONF_UNSET;
 #if (NGX_THREADS)
     clcf->thread_pool = NGX_CONF_UNSET_PTR;
     clcf->thread_pool_value = NGX_CONF_UNSET_PTR;
@@ -3827,6 +3835,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->sendfile_max_chunk, 0);
 #if (NGX_HAVE_FILE_AIO || NGX_THREADS)
     ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF);
+    ngx_conf_merge_value(conf->aio_write, prev->aio_write, 0);
 #endif
 #if (NGX_THREADS)
     ngx_conf_merge_ptr_value(conf->thread_pool, prev->thread_pool, NULL);
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 7dec9e1..231c507 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -404,6 +404,7 @@ struct ngx_http_core_loc_conf_s {
     ngx_flag_t    internal;                /* internal */
     ngx_flag_t    sendfile;                /* sendfile */
     ngx_flag_t    aio;                     /* aio */
+    ngx_flag_t    aio_write;               /* aio_write */
     ngx_flag_t    tcp_nopush;              /* tcp_nopush */
     ngx_flag_t    tcp_nodelay;             /* tcp_nodelay */
     ngx_flag_t    reset_timedout_connection; /* reset_timedout_connection */
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 6633918..3561028 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -62,6 +62,7 @@ static ngx_int_t ngx_http_file_cache_add(ngx_http_file_cache_t *cache,
     ngx_http_cache_t *c);
 static ngx_int_t ngx_http_file_cache_delete_file(ngx_tree_ctx_t *ctx,
     ngx_str_t *path);
+static void ngx_http_file_cache_set_watermark(ngx_http_file_cache_t *cache);
 
 
 ngx_str_t  ngx_http_cache_status[] = {
@@ -147,6 +148,8 @@ ngx_http_file_cache_init(ngx_shm_zone_t *shm_zone, void *data)
     cache->sh->cold = 1;
     cache->sh->loading = 0;
     cache->sh->size = 0;
+    cache->sh->count = 0;
+    cache->sh->watermark = (ngx_uint_t) -1;
 
     cache->bsize = ngx_fs_bsize(cache->path->name.data);
 
@@ -691,12 +694,13 @@ ngx_http_file_cache_aio_read(ngx_http_request_t *r, ngx_http_cache_t *c)
 #if (NGX_THREADS)
 
     if (clcf->aio == NGX_HTTP_AIO_THREADS) {
+        c->file.thread_task = c->thread_task;
         c->file.thread_handler = ngx_http_cache_thread_handler;
         c->file.thread_ctx = r;
 
-        n = ngx_thread_read(&c->thread_task, &c->file, c->buf->pos,
-                            c->body_start, 0, r->pool);
+        n = ngx_thread_read(&c->file, c->buf->pos, c->body_start, 0, r->pool);
 
+        c->thread_task = c->file.thread_task;
         c->reading = (n == NGX_AGAIN);
 
         return n;
@@ -860,6 +864,8 @@ ngx_http_file_cache_exists(ngx_http_file_cache_t *cache, ngx_http_cache_t *c)
     fcn = ngx_slab_calloc_locked(cache->shpool,
                                  sizeof(ngx_http_file_cache_node_t));
     if (fcn == NULL) {
+        ngx_http_file_cache_set_watermark(cache);
+
         ngx_shmtx_unlock(&cache->shpool->mutex);
 
         (void) ngx_http_file_cache_forced_expire(cache);
@@ -876,6 +882,8 @@ ngx_http_file_cache_exists(ngx_http_file_cache_t *cache, ngx_http_cache_t *c)
         }
     }
 
+    cache->sh->count++;
+
     ngx_memcpy((u_char *) &fcn->node.key, c->key, sizeof(ngx_rbtree_key_t));
 
     ngx_memcpy(fcn->key, &c->key[sizeof(ngx_rbtree_key_t)],
@@ -1630,6 +1638,7 @@ ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf)
         ngx_queue_remove(&fcn->queue);
         ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node);
         ngx_slab_free_locked(cache->shpool, fcn);
+        cache->sh->count--;
         c->node = NULL;
     }
 
@@ -1882,6 +1891,7 @@ ngx_http_file_cache_delete(ngx_http_file_cache_t *cache, ngx_queue_t *q,
         ngx_queue_remove(q);
         ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node);
         ngx_slab_free_locked(cache->shpool, fcn);
+        cache->sh->count--;
     }
 }
 
@@ -1891,8 +1901,9 @@ ngx_http_file_cache_manager(void *data)
 {
     ngx_http_file_cache_t  *cache = data;
 
-    off_t   size;
-    time_t  next, wait;
+    off_t       size;
+    time_t      next, wait;
+    ngx_uint_t  count, watermark;
 
     next = ngx_http_file_cache_expire(cache);
 
@@ -1903,13 +1914,16 @@ ngx_http_file_cache_manager(void *data)
         ngx_shmtx_lock(&cache->shpool->mutex);
 
         size = cache->sh->size;
+        count = cache->sh->count;
+        watermark = cache->sh->watermark;
 
         ngx_shmtx_unlock(&cache->shpool->mutex);
 
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "http file cache size: %O", size);
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "http file cache size: %O c:%ui w:%i",
+                       size, count, (ngx_int_t) watermark);
 
-        if (size < cache->max_size) {
+        if (size < cache->max_size && count < watermark) {
             return next;
         }
 
@@ -2093,10 +2107,20 @@ ngx_http_file_cache_add(ngx_http_file_cache_t *cache, ngx_http_cache_t *c)
         fcn = ngx_slab_calloc_locked(cache->shpool,
                                      sizeof(ngx_http_file_cache_node_t));
         if (fcn == NULL) {
+            ngx_http_file_cache_set_watermark(cache);
+
+            if (cache->fail_time != ngx_time()) {
+                cache->fail_time = ngx_time();
+                ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                           "could not allocate node%s", cache->shpool->log_ctx);
+            }
+
             ngx_shmtx_unlock(&cache->shpool->mutex);
             return NGX_ERROR;
         }
 
+        cache->sh->count++;
+
         ngx_memcpy((u_char *) &fcn->node.key, c->key, sizeof(ngx_rbtree_key_t));
 
         ngx_memcpy(fcn->key, &c->key[sizeof(ngx_rbtree_key_t)],
@@ -2139,6 +2163,16 @@ ngx_http_file_cache_delete_file(ngx_tree_ctx_t *ctx, ngx_str_t *path)
 }
 
 
+static void
+ngx_http_file_cache_set_watermark(ngx_http_file_cache_t *cache)
+{
+    cache->sh->watermark = cache->sh->count - cache->sh->count / 8;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "http file cache watermark: %ui", cache->sh->watermark);
+}
+
+
 time_t
 ngx_http_file_cache_valid(ngx_array_t *cache_valid, ngx_uint_t status)
 {
diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index e9562c0..b5803d5 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -34,7 +34,7 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
     ssize_t                    size;
     ngx_int_t                  rc;
     ngx_buf_t                 *b;
-    ngx_chain_t                out, *cl;
+    ngx_chain_t                out;
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
 
@@ -59,10 +59,6 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
         goto done;
     }
 
-    if (r->request_body_no_buffering) {
-        r->request_body_in_file_only = 0;
-    }
-
     rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
     if (rb == NULL) {
         rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
@@ -148,37 +144,8 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
 
     if (rb->rest == 0) {
         /* the whole request body was pre-read */
-
-        if (r->request_body_in_file_only) {
-            if (ngx_http_write_request_body(r) != NGX_OK) {
-                rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-                goto done;
-            }
-
-            if (rb->temp_file->file.offset != 0) {
-
-                cl = ngx_chain_get_free_buf(r->pool, &rb->free);
-                if (cl == NULL) {
-                    rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-                    goto done;
-                }
-
-                b = cl->buf;
-
-                ngx_memzero(b, sizeof(ngx_buf_t));
-
-                b->in_file = 1;
-                b->file_last = rb->temp_file->file.offset;
-                b->file = &rb->temp_file->file;
-
-                rb->bufs = cl;
-            }
-        }
-
         r->request_body_no_buffering = 0;
-
         post_handler(r);
-
         return NGX_OK;
     }
 
@@ -289,8 +256,7 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
     size_t                     size;
     ssize_t                    n;
     ngx_int_t                  rc;
-    ngx_buf_t                 *b;
-    ngx_chain_t               *cl, out;
+    ngx_chain_t                out;
     ngx_connection_t          *c;
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
@@ -439,33 +405,6 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
         ngx_del_timer(c->read);
     }
 
-    if (rb->temp_file || r->request_body_in_file_only) {
-
-        /* save the last part */
-
-        if (ngx_http_write_request_body(r) != NGX_OK) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        if (rb->temp_file->file.offset != 0) {
-
-            cl = ngx_chain_get_free_buf(r->pool, &rb->free);
-            if (cl == NULL) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-
-            b = cl->buf;
-
-            ngx_memzero(b, sizeof(ngx_buf_t));
-
-            b->in_file = 1;
-            b->file_last = rb->temp_file->file.offset;
-            b->file = &rb->temp_file->file;
-
-            rb->bufs = cl;
-        }
-    }
-
     if (!r->request_body_no_buffering) {
         r->read_event_handler = ngx_http_block_reading;
         rb->post_handler(r);
@@ -1127,9 +1066,8 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
 ngx_int_t
 ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
 {
-#if (NGX_DEBUG)
+    ngx_buf_t                 *b;
     ngx_chain_t               *cl;
-#endif
     ngx_http_request_body_t   *rb;
 
     rb = r->request_body;
@@ -1166,13 +1104,46 @@ ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    if (rb->rest > 0
-        && rb->buf && rb->buf->last == rb->buf->end
-        && !r->request_body_no_buffering)
-    {
+    if (r->request_body_no_buffering) {
+        return NGX_OK;
+    }
+
+    if (rb->rest > 0) {
+
+        if (rb->buf && rb->buf->last == rb->buf->end
+            && ngx_http_write_request_body(r) != NGX_OK)
+        {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        return NGX_OK;
+    }
+
+    /* rb->rest == 0 */
+
+    if (rb->temp_file || r->request_body_in_file_only) {
+
         if (ngx_http_write_request_body(r) != NGX_OK) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
+
+        if (rb->temp_file->file.offset != 0) {
+
+            cl = ngx_chain_get_free_buf(r->pool, &rb->free);
+            if (cl == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            b = cl->buf;
+
+            ngx_memzero(b, sizeof(ngx_buf_t));
+
+            b->in_file = 1;
+            b->file_last = rb->temp_file->file.offset;
+            b->file = &rb->temp_file->file;
+
+            rb->bufs = cl;
+        }
     }
 
     return NGX_OK;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index dbaa956..911049f 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -76,6 +76,13 @@ static void
 static ngx_int_t ngx_http_upstream_non_buffered_filter_init(void *data);
 static ngx_int_t ngx_http_upstream_non_buffered_filter(void *data,
     ssize_t bytes);
+#if (NGX_THREADS)
+static ngx_int_t ngx_http_upstream_thread_handler(ngx_thread_task_t *task,
+    ngx_file_t *file);
+static void ngx_http_upstream_thread_event_handler(ngx_event_t *ev);
+#endif
+static ngx_int_t ngx_http_upstream_output_filter(void *data,
+    ngx_chain_t *chain);
 static void ngx_http_upstream_process_downstream(ngx_http_request_t *r);
 static void ngx_http_upstream_process_upstream(ngx_http_request_t *r,
     ngx_http_upstream_t *u);
@@ -416,10 +423,10 @@ static ngx_http_upstream_next_t  ngx_http_upstream_next_errors[] = {
 
 
 ngx_conf_bitmask_t  ngx_http_upstream_cache_method_mask[] = {
-   { ngx_string("GET"),  NGX_HTTP_GET},
-   { ngx_string("HEAD"), NGX_HTTP_HEAD },
-   { ngx_string("POST"), NGX_HTTP_POST },
-   { ngx_null_string, 0 }
+    { ngx_string("GET"), NGX_HTTP_GET },
+    { ngx_string("HEAD"), NGX_HTTP_HEAD },
+    { ngx_string("POST"), NGX_HTTP_POST },
+    { ngx_null_string, 0 }
 };
 
 
@@ -2861,11 +2868,16 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
         ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
     }
 
+    if (r->header_only && !u->cacheable && !u->store) {
+        ngx_http_upstream_finalize_request(r, u, 0);
+        return;
+    }
+
 #endif
 
     p = u->pipe;
 
-    p->output_filter = (ngx_event_pipe_output_filter_pt) ngx_http_output_filter;
+    p->output_filter = ngx_http_upstream_output_filter;
     p->output_ctx = r;
     p->tag = u->output.tag;
     p->bufs = u->conf->bufs;
@@ -2908,6 +2920,13 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
     p->max_temp_file_size = u->conf->max_temp_file_size;
     p->temp_file_write_size = u->conf->temp_file_write_size;
 
+#if (NGX_THREADS)
+    if (clcf->aio == NGX_HTTP_AIO_THREADS && clcf->aio_write) {
+        p->thread_handler = ngx_http_upstream_thread_handler;
+        p->thread_ctx = r;
+    }
+#endif
+
     p->preread_bufs = ngx_alloc_chain_link(r->pool);
     if (p->preread_bufs == NULL) {
         ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
@@ -3482,6 +3501,97 @@ ngx_http_upstream_non_buffered_filter(void *data, ssize_t bytes)
 }
 
 
+#if (NGX_THREADS)
+
+static ngx_int_t
+ngx_http_upstream_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
+{
+    ngx_str_t                  name;
+    ngx_event_pipe_t          *p;
+    ngx_thread_pool_t         *tp;
+    ngx_http_request_t        *r;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    r = file->thread_ctx;
+    p = r->upstream->pipe;
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+    tp = clcf->thread_pool;
+
+    if (tp == NULL) {
+        if (ngx_http_complex_value(r, clcf->thread_pool_value, &name)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        tp = ngx_thread_pool_get((ngx_cycle_t *) ngx_cycle, &name);
+
+        if (tp == NULL) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "thread pool \"%V\" not found", &name);
+            return NGX_ERROR;
+        }
+    }
+
+    task->event.data = r;
+    task->event.handler = ngx_http_upstream_thread_event_handler;
+
+    if (ngx_thread_task_post(tp, task) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    r->main->blocked++;
+    r->aio = 1;
+    p->aio = 1;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_upstream_thread_event_handler(ngx_event_t *ev)
+{
+    ngx_connection_t    *c;
+    ngx_http_request_t  *r;
+
+    r = ev->data;
+    c = r->connection;
+
+    ngx_http_set_log_request(c->log, r);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http upstream thread: \"%V?%V\"", &r->uri, &r->args);
+
+    r->main->blocked--;
+    r->aio = 0;
+
+    r->write_event_handler(r);
+
+    ngx_http_run_posted_requests(c);
+}
+
+#endif
+
+
+static ngx_int_t
+ngx_http_upstream_output_filter(void *data, ngx_chain_t *chain)
+{
+    ngx_int_t            rc;
+    ngx_event_pipe_t    *p;
+    ngx_http_request_t  *r;
+
+    r = data;
+    p = r->upstream->pipe;
+
+    rc = ngx_http_output_filter(r, chain);
+
+    p->aio = r->aio;
+
+    return rc;
+}
+
+
 static void
 ngx_http_upstream_process_downstream(ngx_http_request_t *r)
 {
@@ -3500,6 +3610,10 @@ ngx_http_upstream_process_downstream(ngx_http_request_t *r)
 
     c->log->action = "sending to client";
 
+#if (NGX_THREADS)
+    p->aio = r->aio;
+#endif
+
     if (wev->timedout) {
 
         if (wev->delayed) {
@@ -3629,6 +3743,12 @@ ngx_http_upstream_process_request(ngx_http_request_t *r,
 
     p = u->pipe;
 
+#if (NGX_THREADS)
+    if (p->writing) {
+        return;
+    }
+#endif
+
     if (u->peer.connection) {
 
         if (u->store) {
@@ -3827,42 +3947,36 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
                       "upstream timed out");
     }
 
-    if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR
-        && (!u->request_sent || !r->request_body_no_buffering))
-    {
-        status = 0;
-
+    if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR) {
         /* TODO: inform balancer instead */
-
         u->peer.tries++;
+    }
 
-    } else {
-        switch (ft_type) {
+    switch (ft_type) {
 
-        case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
-            status = NGX_HTTP_GATEWAY_TIME_OUT;
-            break;
+    case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
+        status = NGX_HTTP_GATEWAY_TIME_OUT;
+        break;
 
-        case NGX_HTTP_UPSTREAM_FT_HTTP_500:
-            status = NGX_HTTP_INTERNAL_SERVER_ERROR;
-            break;
+    case NGX_HTTP_UPSTREAM_FT_HTTP_500:
+        status = NGX_HTTP_INTERNAL_SERVER_ERROR;
+        break;
 
-        case NGX_HTTP_UPSTREAM_FT_HTTP_403:
-            status = NGX_HTTP_FORBIDDEN;
-            break;
+    case NGX_HTTP_UPSTREAM_FT_HTTP_403:
+        status = NGX_HTTP_FORBIDDEN;
+        break;
 
-        case NGX_HTTP_UPSTREAM_FT_HTTP_404:
-            status = NGX_HTTP_NOT_FOUND;
-            break;
+    case NGX_HTTP_UPSTREAM_FT_HTTP_404:
+        status = NGX_HTTP_NOT_FOUND;
+        break;
 
-        /*
-         * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING
-         * never reach here
-         */
+    /*
+     * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING
+     * never reach here
+     */
 
-        default:
-            status = NGX_HTTP_BAD_GATEWAY;
-        }
+    default:
+        status = NGX_HTTP_BAD_GATEWAY;
     }
 
     if (r->connection->error) {
@@ -3871,37 +3985,42 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
         return;
     }
 
-    if (status) {
-        u->state->status = status;
-        timeout = u->conf->next_upstream_timeout;
+    u->state->status = status;
 
-        if (u->peer.tries == 0
-            || !(u->conf->next_upstream & ft_type)
-            || (u->request_sent && r->request_body_no_buffering)
-            || (timeout && ngx_current_msec - u->peer.start_time >= timeout))
-        {
+    timeout = u->conf->next_upstream_timeout;
+
+    if (u->request_sent
+        && (r->method & (NGX_HTTP_POST|NGX_HTTP_LOCK|NGX_HTTP_PATCH)))
+    {
+        ft_type |= NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT;
+    }
+
+    if (u->peer.tries == 0
+        || ((u->conf->next_upstream & ft_type) != ft_type)
+        || (u->request_sent && r->request_body_no_buffering)
+        || (timeout && ngx_current_msec - u->peer.start_time >= timeout))
+    {
 #if (NGX_HTTP_CACHE)
 
-            if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
-                && (u->conf->cache_use_stale & ft_type))
-            {
-                ngx_int_t  rc;
+        if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
+            && (u->conf->cache_use_stale & ft_type))
+        {
+            ngx_int_t  rc;
 
-                rc = u->reinit_request(r);
+            rc = u->reinit_request(r);
 
-                if (rc == NGX_OK) {
-                    u->cache_status = NGX_HTTP_CACHE_STALE;
-                    rc = ngx_http_upstream_cache_send(r, u);
-                }
-
-                ngx_http_upstream_finalize_request(r, u, rc);
-                return;
+            if (rc == NGX_OK) {
+                u->cache_status = NGX_HTTP_CACHE_STALE;
+                rc = ngx_http_upstream_cache_send(r, u);
             }
-#endif
 
-            ngx_http_upstream_finalize_request(r, u, status);
+            ngx_http_upstream_finalize_request(r, u, rc);
             return;
         }
+#endif
+
+        ngx_http_upstream_finalize_request(r, u, status);
+        return;
     }
 
     if (u->peer.connection) {
@@ -4068,7 +4187,8 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
 
     if (!u->header_sent
         || rc == NGX_HTTP_REQUEST_TIME_OUT
-        || rc == NGX_HTTP_CLIENT_CLOSED_REQUEST)
+        || rc == NGX_HTTP_CLIENT_CLOSED_REQUEST
+        || (u->pipe && u->pipe->downstream_error))
     {
         ngx_http_finalize_request(r, rc);
         return;
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 4246c8a..7595dcf 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -29,6 +29,7 @@
 #define NGX_HTTP_UPSTREAM_FT_UPDATING        0x00000400
 #define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK       0x00000800
 #define NGX_HTTP_UPSTREAM_FT_MAX_WAITING     0x00001000
+#define NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT  0x00002000
 #define NGX_HTTP_UPSTREAM_FT_NOLIVE          0x40000000
 #define NGX_HTTP_UPSTREAM_FT_OFF             0x80000000
 
@@ -281,7 +282,7 @@ typedef struct {
     ngx_uint_t                       no_port; /* unsigned no_port:1 */
 
     ngx_uint_t                       naddrs;
-    ngx_addr_t                      *addrs;
+    ngx_resolver_addr_t             *addrs;
 
     struct sockaddr                 *sockaddr;
     socklen_t                        socklen;
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 4c4a4e7..ababd4b 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -2503,8 +2503,8 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack)
     ngx_http_v2_srv_conf_t   *h2scf;
     ngx_http_v2_out_frame_t  *frame;
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 send SETTINGS frame");
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 send SETTINGS frame ack:%ui", ack);
 
     frame = ngx_palloc(h2c->pool, sizeof(ngx_http_v2_out_frame_t));
     if (frame == NULL) {
@@ -2595,6 +2595,10 @@ ngx_http_v2_send_window_update(ngx_http_v2_connection_t *h2c, ngx_uint_t sid,
     ngx_buf_t                *buf;
     ngx_http_v2_out_frame_t  *frame;
 
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 send WINDOW_UPDATE frame sid:%ui, window:%uz",
+                   sid, window);
+
     frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_WINDOW_UPDATE_SIZE,
                                   NGX_HTTP_V2_WINDOW_UPDATE_FRAME,
                                   NGX_HTTP_V2_NO_FLAG, sid);
@@ -2619,6 +2623,10 @@ ngx_http_v2_send_rst_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t sid,
     ngx_buf_t                *buf;
     ngx_http_v2_out_frame_t  *frame;
 
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 send RST_STREAM frame sid:%ui, status:%uz",
+                   sid, status);
+
     frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_RST_STREAM_SIZE,
                                   NGX_HTTP_V2_RST_STREAM_FRAME,
                                   NGX_HTTP_V2_NO_FLAG, sid);
@@ -2642,6 +2650,9 @@ ngx_http_v2_send_goaway(ngx_http_v2_connection_t *h2c, ngx_uint_t status)
     ngx_buf_t                *buf;
     ngx_http_v2_out_frame_t  *frame;
 
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 send GOAWAY frame, status:%uz", status);
+
     frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_GOAWAY_SIZE,
                                   NGX_HTTP_V2_GOAWAY_FRAME,
                                   NGX_HTTP_V2_NO_FLAG, 0);
diff --git a/src/os/unix/ngx_darwin_init.c b/src/os/unix/ngx_darwin_init.c
index 1bc7520..a9d12a8 100644
--- a/src/os/unix/ngx_darwin_init.c
+++ b/src/os/unix/ngx_darwin_init.c
@@ -23,6 +23,7 @@ static ngx_os_io_t ngx_darwin_io = {
     ngx_readv_chain,
     ngx_udp_unix_recv,
     ngx_unix_send,
+    ngx_udp_unix_send,
 #if (NGX_HAVE_SENDFILE)
     ngx_darwin_sendfile_chain,
     NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h
index 16cafda..7d6ca76 100644
--- a/src/os/unix/ngx_errno.h
+++ b/src/os/unix/ngx_errno.h
@@ -25,6 +25,7 @@ typedef int               ngx_err_t;
 #define NGX_EACCES        EACCES
 #define NGX_EBUSY         EBUSY
 #define NGX_EEXIST        EEXIST
+#define NGX_EEXIST_FILE   EEXIST
 #define NGX_EXDEV         EXDEV
 #define NGX_ENOTDIR       ENOTDIR
 #define NGX_EISDIR        EISDIR
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 00a6a49..bcef7ec 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -12,9 +12,11 @@
 #if (NGX_THREADS)
 #include <ngx_thread_pool.h>
 static void ngx_thread_read_handler(void *data, ngx_log_t *log);
+static void ngx_thread_write_chain_to_file_handler(void *data, ngx_log_t *log);
 #endif
 
-static ssize_t ngx_writev_file(ngx_file_t *file, ngx_array_t *vec, size_t size,
+static ngx_chain_t *ngx_chain_to_iovec(ngx_iovec_t *vec, ngx_chain_t *cl);
+static ssize_t ngx_writev_file(ngx_file_t *file, ngx_iovec_t *vec,
     off_t offset);
 
 
@@ -76,38 +78,39 @@ ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
 #if (NGX_THREADS)
 
 typedef struct {
-    ngx_fd_t     fd;
-    u_char      *buf;
-    size_t       size;
-    off_t        offset;
+    ngx_fd_t       fd;
+    ngx_uint_t     write;   /* unsigned  write:1; */
 
-    size_t       read;
-    ngx_err_t    err;
-} ngx_thread_read_ctx_t;
+    u_char        *buf;
+    size_t         size;
+    ngx_chain_t   *chain;
+    off_t          offset;
+
+    size_t         nbytes;
+    ngx_err_t      err;
+} ngx_thread_file_ctx_t;
 
 
 ssize_t
-ngx_thread_read(ngx_thread_task_t **taskp, ngx_file_t *file, u_char *buf,
-    size_t size, off_t offset, ngx_pool_t *pool)
+ngx_thread_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
+    ngx_pool_t *pool)
 {
     ngx_thread_task_t      *task;
-    ngx_thread_read_ctx_t  *ctx;
+    ngx_thread_file_ctx_t  *ctx;
 
     ngx_log_debug4(NGX_LOG_DEBUG_CORE, file->log, 0,
                    "thread read: %d, %p, %uz, %O",
                    file->fd, buf, size, offset);
 
-    task = *taskp;
+    task = file->thread_task;
 
     if (task == NULL) {
-        task = ngx_thread_task_alloc(pool, sizeof(ngx_thread_read_ctx_t));
+        task = ngx_thread_task_alloc(pool, sizeof(ngx_thread_file_ctx_t));
         if (task == NULL) {
             return NGX_ERROR;
         }
 
-        task->handler = ngx_thread_read_handler;
-
-        *taskp = task;
+        file->thread_task = task;
     }
 
     ctx = task->ctx;
@@ -115,15 +118,25 @@ ngx_thread_read(ngx_thread_task_t **taskp, ngx_file_t *file, u_char *buf,
     if (task->event.complete) {
         task->event.complete = 0;
 
+        if (ctx->write) {
+            ngx_log_error(NGX_LOG_ALERT, file->log, 0,
+                          "invalid thread call, read instead of write");
+            return NGX_ERROR;
+        }
+
         if (ctx->err) {
             ngx_log_error(NGX_LOG_CRIT, file->log, ctx->err,
                           "pread() \"%s\" failed", file->name.data);
             return NGX_ERROR;
         }
 
-        return ctx->read;
+        return ctx->nbytes;
     }
 
+    task->handler = ngx_thread_read_handler;
+
+    ctx->write = 0;
+
     ctx->fd = file->fd;
     ctx->buf = buf;
     ctx->size = size;
@@ -142,7 +155,7 @@ ngx_thread_read(ngx_thread_task_t **taskp, ngx_file_t *file, u_char *buf,
 static void
 ngx_thread_read_handler(void *data, ngx_log_t *log)
 {
-    ngx_thread_read_ctx_t *ctx = data;
+    ngx_thread_file_ctx_t *ctx = data;
 
     ssize_t  n;
 
@@ -154,7 +167,7 @@ ngx_thread_read_handler(void *data, ngx_log_t *log)
         ctx->err = ngx_errno;
 
     } else {
-        ctx->read = n;
+        ctx->nbytes = n;
         ctx->err = 0;
     }
 
@@ -276,17 +289,13 @@ ngx_open_tempfile(u_char *name, ngx_uint_t persistent, ngx_uint_t access)
 }
 
 
-#define NGX_IOVS  8
-
 ssize_t
 ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
     ngx_pool_t *pool)
 {
-    u_char        *prev;
-    size_t         size;
     ssize_t        total, n;
-    ngx_array_t    vec;
-    struct iovec  *iov, iovs[NGX_IOVS];
+    ngx_iovec_t    vec;
+    struct iovec   iovs[NGX_IOVS_PREALLOCATE];
 
     /* use pwrite() if there is the only buf in a chain */
 
@@ -298,46 +307,18 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
 
     total = 0;
 
-    vec.elts = iovs;
-    vec.size = sizeof(struct iovec);
-    vec.nalloc = NGX_IOVS;
-    vec.pool = pool;
+    vec.iovs = iovs;
+    vec.nalloc = NGX_IOVS_PREALLOCATE;
 
     do {
-        prev = NULL;
-        iov = NULL;
-        size = 0;
-
-        vec.nelts = 0;
-
         /* create the iovec and coalesce the neighbouring bufs */
-
-        while (cl && vec.nelts < IOV_MAX) {
-            if (prev == cl->buf->pos) {
-                iov->iov_len += cl->buf->last - cl->buf->pos;
-
-            } else {
-                iov = ngx_array_push(&vec);
-                if (iov == NULL) {
-                    return NGX_ERROR;
-                }
-
-                iov->iov_base = (void *) cl->buf->pos;
-                iov->iov_len = cl->buf->last - cl->buf->pos;
-            }
-
-            size += cl->buf->last - cl->buf->pos;
-            prev = cl->buf->last;
-            cl = cl->next;
-        }
+        cl = ngx_chain_to_iovec(&vec, cl);
 
         /* use pwrite() if there is the only iovec buffer */
 
-        if (vec.nelts == 1) {
-            iov = vec.elts;
-
-            n = ngx_write_file(file, (u_char *) iov[0].iov_base,
-                               iov[0].iov_len, offset);
+        if (vec.count == 1) {
+            n = ngx_write_file(file, (u_char *) iovs[0].iov_base,
+                               iovs[0].iov_len, offset);
 
             if (n == NGX_ERROR) {
                 return n;
@@ -346,7 +327,7 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
             return total + n;
         }
 
-        n = ngx_writev_file(file, &vec, size, offset);
+        n = ngx_writev_file(file, &vec, offset);
 
         if (n == NGX_ERROR) {
             return n;
@@ -361,20 +342,61 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
 }
 
 
+static ngx_chain_t *
+ngx_chain_to_iovec(ngx_iovec_t *vec, ngx_chain_t *cl)
+{
+    size_t         total, size;
+    u_char        *prev;
+    ngx_uint_t     n;
+    struct iovec  *iov;
+
+    iov = NULL;
+    prev = NULL;
+    total = 0;
+    n = 0;
+
+    for ( /* void */ ; cl; cl = cl->next) {
+        size = cl->buf->last - cl->buf->pos;
+
+        if (prev == cl->buf->pos) {
+            iov->iov_len += size;
+
+        } else {
+            if (n == vec->nalloc) {
+                break;
+            }
+
+            iov = &vec->iovs[n++];
+
+            iov->iov_base = (void *) cl->buf->pos;
+            iov->iov_len = size;
+        }
+
+        prev = cl->buf->pos + size;
+        total += size;
+    }
+
+    vec->count = n;
+    vec->size = total;
+
+    return cl;
+}
+
+
 static ssize_t
-ngx_writev_file(ngx_file_t *file, ngx_array_t *vec, size_t size, off_t offset)
+ngx_writev_file(ngx_file_t *file, ngx_iovec_t *vec, off_t offset)
 {
     ssize_t    n;
     ngx_err_t  err;
 
     ngx_log_debug3(NGX_LOG_DEBUG_CORE, file->log, 0,
-                   "writev: %d, %uz, %O", file->fd, size, offset);
+                   "writev: %d, %uz, %O", file->fd, vec->size, offset);
 
 #if (NGX_HAVE_PWRITEV)
 
 eintr:
 
-    n = pwritev(file->fd, vec->elts, vec->nelts, offset);
+    n = pwritev(file->fd, vec->iovs, vec->count, offset);
 
     if (n == -1) {
         err = ngx_errno;
@@ -390,10 +412,10 @@ eintr:
         return NGX_ERROR;
     }
 
-    if ((size_t) n != size) {
+    if ((size_t) n != vec->size) {
         ngx_log_error(NGX_LOG_CRIT, file->log, 0,
                       "pwritev() \"%s\" has written only %z of %uz",
-                      file->name.data, n, size);
+                      file->name.data, n, vec->size);
         return NGX_ERROR;
     }
 
@@ -411,7 +433,7 @@ eintr:
 
 eintr:
 
-    n = writev(file->fd, vec->elts, vec->nelts);
+    n = writev(file->fd, vec->iovs, vec->count);
 
     if (n == -1) {
         err = ngx_errno;
@@ -427,10 +449,10 @@ eintr:
         return NGX_ERROR;
     }
 
-    if ((size_t) n != size) {
+    if ((size_t) n != vec->size) {
         ngx_log_error(NGX_LOG_CRIT, file->log, 0,
                       "writev() \"%s\" has written only %z of %uz",
-                      file->name.data, n, size);
+                      file->name.data, n, vec->size);
         return NGX_ERROR;
     }
 
@@ -444,6 +466,132 @@ eintr:
 }
 
 
+#if (NGX_THREADS)
+
+ssize_t
+ngx_thread_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
+    ngx_pool_t *pool)
+{
+    ngx_thread_task_t      *task;
+    ngx_thread_file_ctx_t  *ctx;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_CORE, file->log, 0,
+                   "thread write chain: %d, %p, %O",
+                   file->fd, cl, offset);
+
+    task = file->thread_task;
+
+    if (task == NULL) {
+        task = ngx_thread_task_alloc(pool,
+                                     sizeof(ngx_thread_file_ctx_t));
+        if (task == NULL) {
+            return NGX_ERROR;
+        }
+
+        file->thread_task = task;
+    }
+
+    ctx = task->ctx;
+
+    if (task->event.complete) {
+        task->event.complete = 0;
+
+        if (!ctx->write) {
+            ngx_log_error(NGX_LOG_ALERT, file->log, 0,
+                          "invalid thread call, write instead of read");
+            return NGX_ERROR;
+        }
+
+        if (ctx->err || ctx->nbytes == 0) {
+            ngx_log_error(NGX_LOG_CRIT, file->log, ctx->err,
+                          "pwritev() \"%s\" failed", file->name.data);
+            return NGX_ERROR;
+        }
+
+        file->offset += ctx->nbytes;
+        return ctx->nbytes;
+    }
+
+    task->handler = ngx_thread_write_chain_to_file_handler;
+
+    ctx->write = 1;
+
+    ctx->fd = file->fd;
+    ctx->chain = cl;
+    ctx->offset = offset;
+
+    if (file->thread_handler(task, file) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+static void
+ngx_thread_write_chain_to_file_handler(void *data, ngx_log_t *log)
+{
+    ngx_thread_file_ctx_t *ctx = data;
+
+#if (NGX_HAVE_PWRITEV)
+
+    off_t          offset;
+    ssize_t        n;
+    ngx_err_t      err;
+    ngx_chain_t   *cl;
+    ngx_iovec_t    vec;
+    struct iovec   iovs[NGX_IOVS_PREALLOCATE];
+
+    vec.iovs = iovs;
+    vec.nalloc = NGX_IOVS_PREALLOCATE;
+
+    cl = ctx->chain;
+    offset = ctx->offset;
+
+    ctx->nbytes = 0;
+    ctx->err = 0;
+
+    do {
+        /* create the iovec and coalesce the neighbouring bufs */
+        cl = ngx_chain_to_iovec(&vec, cl);
+
+eintr:
+
+        n = pwritev(ctx->fd, iovs, vec.count, offset);
+
+        if (n == -1) {
+            err = ngx_errno;
+
+            if (err == NGX_EINTR) {
+                ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, err,
+                               "pwritev() was interrupted");
+                goto eintr;
+            }
+
+            ctx->err = err;
+            return;
+        }
+
+        if ((size_t) n != vec.size) {
+            ctx->nbytes = 0;
+            return;
+        }
+
+        ctx->nbytes += n;
+        offset += n;
+    } while (cl);
+
+#else
+
+    ctx->err = NGX_ENOSYS;
+    return;
+
+#endif
+}
+
+#endif /* NGX_THREADS */
+
+
 ngx_int_t
 ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s)
 {
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 6081b00..07872b1 100644
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -385,8 +385,10 @@ extern ngx_uint_t  ngx_file_aio;
 #endif
 
 #if (NGX_THREADS)
-ssize_t ngx_thread_read(ngx_thread_task_t **taskp, ngx_file_t *file,
-    u_char *buf, size_t size, off_t offset, ngx_pool_t *pool);
+ssize_t ngx_thread_read(ngx_file_t *file, u_char *buf, size_t size,
+    off_t offset, ngx_pool_t *pool);
+ssize_t ngx_thread_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl,
+    off_t offset, ngx_pool_t *pool);
 #endif
 
 
diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c
index c4c12dd..71672c7 100644
--- a/src/os/unix/ngx_freebsd_init.c
+++ b/src/os/unix/ngx_freebsd_init.c
@@ -32,6 +32,7 @@ static ngx_os_io_t ngx_freebsd_io = {
     ngx_readv_chain,
     ngx_udp_unix_recv,
     ngx_unix_send,
+    ngx_udp_unix_send,
 #if (NGX_HAVE_SENDFILE)
     ngx_freebsd_sendfile_chain,
     NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index 3f17dc6..d0299f5 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -247,6 +247,19 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 #if (NGX_HAVE_AIO_SENDFILE)
 
         if (ebusy) {
+            if (aio->event.active) {
+                /*
+                 * tolerate duplicate calls; they can happen due to subrequests
+                 * or multiple calls of the next body filter from a filter
+                 */
+
+                if (sent) {
+                    c->busy_count = 0;
+                }
+
+                return in;
+            }
+
             if (sent == 0) {
                 c->busy_count++;
 
diff --git a/src/os/unix/ngx_linux_init.c b/src/os/unix/ngx_linux_init.c
index b306cda..a1372e9 100644
--- a/src/os/unix/ngx_linux_init.c
+++ b/src/os/unix/ngx_linux_init.c
@@ -18,6 +18,7 @@ static ngx_os_io_t ngx_linux_io = {
     ngx_readv_chain,
     ngx_udp_unix_recv,
     ngx_unix_send,
+    ngx_udp_unix_send,
 #if (NGX_HAVE_SENDFILE)
     ngx_linux_sendfile_chain,
     NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c
index 97f741d..50a9cea 100644
--- a/src/os/unix/ngx_linux_sendfile_chain.c
+++ b/src/os/unix/ngx_linux_sendfile_chain.c
@@ -292,6 +292,19 @@ eintr:
         }
     }
 
+    if (n == 0) {
+        /*
+         * if sendfile returns zero, then someone has truncated the file,
+         * so the offset became beyond the end of the file
+         */
+
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "sendfile() reported that \"%s\" was truncated at %O",
+                      file->file->name.data, file->file_pos);
+
+        return NGX_ERROR;
+    }
+
     ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, "sendfile: %z of %uz @%O",
                    n, size, file->file_pos);
 
@@ -315,7 +328,6 @@ static ngx_int_t
 ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size,
     size_t *sent)
 {
-    ngx_uint_t                 flags;
     ngx_event_t               *wev;
     ngx_thread_task_t         *task;
     ngx_linux_sendfile_ctx_t  *ctx;
@@ -343,29 +355,60 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size,
     if (task->event.complete) {
         task->event.complete = 0;
 
-        if (ctx->err && ctx->err != NGX_EAGAIN) {
+        if (ctx->err == NGX_EAGAIN) {
+            *sent = 0;
+
+            if (wev->complete) {
+                return NGX_DONE;
+            }
+
+            return NGX_AGAIN;
+        }
+
+        if (ctx->err) {
             wev->error = 1;
             ngx_connection_error(c, ctx->err, "sendfile() failed");
             return NGX_ERROR;
         }
 
+        if (ctx->sent == 0) {
+            /*
+             * if sendfile returns zero, then someone has truncated the file,
+             * so the offset became beyond the end of the file
+             */
+
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "sendfile() reported that \"%s\" was truncated at %O",
+                          file->file->name.data, file->file_pos);
+
+            return NGX_ERROR;
+        }
+
         *sent = ctx->sent;
 
-        return (ctx->sent == ctx->size) ? NGX_DONE : NGX_AGAIN;
+        if (ctx->sent == ctx->size || wev->complete) {
+            return NGX_DONE;
+        }
+
+        return NGX_AGAIN;
+    }
+
+    if (task->event.active && ctx->file == file) {
+        /*
+         * tolerate duplicate calls; they can happen due to subrequests
+         * or multiple calls of the next body filter from a filter
+         */
+
+        *sent = 0;
+
+        return NGX_OK;
     }
 
     ctx->file = file;
     ctx->socket = c->fd;
     ctx->size = size;
 
-    if (wev->active) {
-        flags = (ngx_event_flags & NGX_USE_CLEAR_EVENT) ? NGX_CLEAR_EVENT
-                                                        : NGX_LEVEL_EVENT;
-
-        if (ngx_del_event(wev, NGX_WRITE_EVENT, flags) == NGX_ERROR) {
-            return NGX_ERROR;
-        }
-    }
+    wev->complete = 0;
 
     if (file->file->thread_handler(task, file->file) != NGX_OK) {
         return NGX_ERROR;
diff --git a/src/os/unix/ngx_os.h b/src/os/unix/ngx_os.h
index d8bcb01..c0d59ef 100644
--- a/src/os/unix/ngx_os.h
+++ b/src/os/unix/ngx_os.h
@@ -28,6 +28,7 @@ typedef struct {
     ngx_recv_chain_pt  recv_chain;
     ngx_recv_pt        udp_recv;
     ngx_send_pt        send;
+    ngx_send_pt        udp_send;
     ngx_send_chain_pt  send_chain;
     ngx_uint_t         flags;
 } ngx_os_io_t;
@@ -47,6 +48,7 @@ ssize_t ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size);
 ssize_t ngx_unix_send(ngx_connection_t *c, u_char *buf, size_t size);
 ngx_chain_t *ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in,
     off_t limit);
+ssize_t ngx_udp_unix_send(ngx_connection_t *c, u_char *buf, size_t size);
 
 
 #if (IOV_MAX > 64)
diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h
index bf75997..5d1358e 100644
--- a/src/os/unix/ngx_posix_config.h
+++ b/src/os/unix/ngx_posix_config.h
@@ -128,7 +128,7 @@
 #endif
 
 
-#if (NGX_HAVE_DEVPOLL)
+#if (NGX_HAVE_DEVPOLL) && !(NGX_TEST_BUILD_DEVPOLL)
 #include <sys/ioctl.h>
 #include <sys/devpoll.h>
 #endif
diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c
index 61cc8ca..76ed94e 100644
--- a/src/os/unix/ngx_posix_init.c
+++ b/src/os/unix/ngx_posix_init.c
@@ -24,6 +24,7 @@ ngx_os_io_t ngx_os_io = {
     ngx_readv_chain,
     ngx_udp_unix_recv,
     ngx_unix_send,
+    ngx_udp_unix_send,
     ngx_writev_chain,
     0
 };
diff --git a/src/os/unix/ngx_solaris_init.c b/src/os/unix/ngx_solaris_init.c
index f2f3600..83acae1 100644
--- a/src/os/unix/ngx_solaris_init.c
+++ b/src/os/unix/ngx_solaris_init.c
@@ -19,6 +19,7 @@ static ngx_os_io_t ngx_solaris_io = {
     ngx_readv_chain,
     ngx_udp_unix_recv,
     ngx_unix_send,
+    ngx_udp_unix_send,
 #if (NGX_HAVE_SENDFILE)
     ngx_solaris_sendfilev_chain,
     NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_solaris_sendfilev_chain.c b/src/os/unix/ngx_solaris_sendfilev_chain.c
index 7504239..39bcafa 100644
--- a/src/os/unix/ngx_solaris_sendfilev_chain.c
+++ b/src/os/unix/ngx_solaris_sendfilev_chain.c
@@ -48,6 +48,7 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
     ssize_t         n;
     ngx_int_t       eintr;
     ngx_err_t       err;
+    ngx_buf_t      *file;
     ngx_uint_t      nsfv;
     sendfilevec_t  *sfv, sfvs[NGX_SENDFILEVECS];
     ngx_event_t    *wev;
@@ -77,6 +78,7 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
         fd = SFV_FD_SELF;
         prev = NULL;
         fprev = 0;
+        file = NULL;
         sfv = NULL;
         eintr = 0;
         sent = 0;
@@ -153,6 +155,7 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
                     sfv->sfv_len = (size_t) size;
                 }
 
+                file = cl->buf;
                 fprev = cl->buf->file_pos + size;
                 send += size;
             }
@@ -179,6 +182,26 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
             ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, err,
                           "sendfilev() sent only %uz bytes", sent);
+
+        } else if (n == 0 && sent == 0) {
+
+            /*
+             * sendfilev() is documented to return -1 with errno
+             * set to EINVAL if svf_len is greater than the file size,
+             * but at least Solaris 11 returns 0 instead
+             */
+
+            if (file) {
+                ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                        "sendfilev() reported that \"%s\" was truncated at %O",
+                        file->file->name.data, file->file_pos);
+
+            } else {
+                ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                              "sendfilev() returned 0 with memory buffers");
+            }
+
+            return NGX_CHAIN_ERROR;
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
diff --git a/src/os/unix/ngx_udp_send.c b/src/os/unix/ngx_udp_send.c
new file mode 100644
index 0000000..aabbc8e
--- /dev/null
+++ b/src/os/unix/ngx_udp_send.c
@@ -0,0 +1,56 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+ssize_t
+ngx_udp_unix_send(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ssize_t       n;
+    ngx_err_t     err;
+    ngx_event_t  *wev;
+
+    wev = c->write;
+
+    for ( ;; ) {
+        n = sendto(c->fd, buf, size, 0, c->sockaddr, c->socklen);
+
+        ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "sendto: fd:%d %z of %uz to \"%V\"",
+                       c->fd, n, size, &c->addr_text);
+
+        if (n >= 0) {
+            if ((size_t) n != size) {
+                wev->error = 1;
+                (void) ngx_connection_error(c, 0, "sendto() incomplete");
+                return NGX_ERROR;
+            }
+
+            c->sent += n;
+
+            return n;
+        }
+
+        err = ngx_socket_errno;
+
+        if (err == NGX_EAGAIN) {
+            wev->ready = 0;
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, NGX_EAGAIN,
+                           "sendto() not ready");
+            return NGX_AGAIN;
+        }
+
+        if (err != NGX_EINTR) {
+            wev->error = 1;
+            (void) ngx_connection_error(c, err, "sendto() failed");
+            return NGX_ERROR;
+        }
+    }
+}
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index caaf38a..3bd8f6d 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -275,8 +275,11 @@ ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
 
     port = ports->elts;
     for (i = 0; i < ports->nelts; i++) {
-        if (p == port[i].port && sa->sa_family == port[i].family) {
 
+        if (p == port[i].port
+            && listen->type == port[i].type
+            && sa->sa_family == port[i].family)
+        {
             /* a port is already in the port list */
 
             port = &port[i];
@@ -292,6 +295,7 @@ ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     }
 
     port->family = sa->sa_family;
+    port->type = listen->type;
     port->port = p;
 
     if (ngx_array_init(&port->addrs, cf->temp_pool, 2,
@@ -364,6 +368,7 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
             ls->addr_ntop = 1;
             ls->handler = ngx_stream_init_connection;
             ls->pool_size = 256;
+            ls->type = addr[i].opt.type;
 
             cscf = addr->opt.ctx->srv_conf[ngx_stream_core_module.ctx_index];
 
@@ -373,6 +378,8 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
 
             ls->backlog = addr[i].opt.backlog;
 
+            ls->wildcard = addr[i].opt.wildcard;
+
             ls->keepalive = addr[i].opt.so_keepalive;
 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
             ls->keepidle = addr[i].opt.tcp_keepidle;
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 21953e9..49efa45 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -66,6 +66,7 @@ typedef struct {
     int                     tcp_keepcnt;
 #endif
     int                     backlog;
+    int                     type;
 } ngx_stream_listen_t;
 
 
@@ -102,6 +103,7 @@ typedef struct {
 
 typedef struct {
     int                     family;
+    int                     type;
     in_port_t               port;
     ngx_array_t             addrs;       /* array of ngx_stream_conf_addr_t */
 } ngx_stream_conf_port_t;
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index 0ecc448..ebc2b1c 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -252,7 +252,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     in_port_t                     port;
     ngx_str_t                    *value;
     ngx_url_t                     u;
-    ngx_uint_t                    i;
+    ngx_uint_t                    i, backlog;
     struct sockaddr              *sa;
     struct sockaddr_in           *sin;
     ngx_stream_listen_t          *ls;
@@ -343,6 +343,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ls->socklen = u.socklen;
     ls->backlog = NGX_LISTEN_BACKLOG;
+    ls->type = SOCK_STREAM;
     ls->wildcard = u.wildcard;
     ls->ctx = cf->ctx;
 
@@ -350,8 +351,17 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ls->ipv6only = 1;
 #endif
 
+    backlog = 0;
+
     for (i = 2; i < cf->args->nelts; i++) {
 
+#if !(NGX_WIN32)
+        if (ngx_strcmp(value[i].data, "udp") == 0) {
+            ls->type = SOCK_DGRAM;
+            continue;
+        }
+#endif
+
         if (ngx_strcmp(value[i].data, "bind") == 0) {
             ls->bind = 1;
             continue;
@@ -367,6 +377,8 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 return NGX_CONF_ERROR;
             }
 
+            backlog = 1;
+
             continue;
         }
 
@@ -530,5 +542,21 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
+    if (ls->type == SOCK_DGRAM) {
+        if (backlog) {
+            return "\"backlog\" parameter is incompatible with \"udp\"";
+        }
+
+#if (NGX_STREAM_SSL)
+        if (ls->ssl) {
+            return "\"ssl\" parameter is incompatible with \"udp\"";
+        }
+#endif
+
+        if (ls->so_keepalive) {
+            return "\"so_keepalive\" parameter is incompatible with \"udp\"";
+        }
+    }
+
     return NGX_CONF_OK;
 }
diff --git a/src/stream/ngx_stream_handler.c b/src/stream/ngx_stream_handler.c
index b3edb68..aa69e44 100644
--- a/src/stream/ngx_stream_handler.c
+++ b/src/stream/ngx_stream_handler.c
@@ -52,7 +52,7 @@ ngx_stream_init_connection(ngx_connection_t *c)
          * is the "*:port" wildcard so getsockname() is needed to determine
          * the server address.
          *
-         * AcceptEx() already gave this address.
+         * AcceptEx() and recvmsg() already gave this address.
          */
 
         if (ngx_connection_local_sockaddr(c, NULL, 0) != NGX_OK) {
@@ -137,8 +137,9 @@ ngx_stream_init_connection(ngx_connection_t *c)
 
     len = ngx_sock_ntop(c->sockaddr, c->socklen, text, NGX_SOCKADDR_STRLEN, 1);
 
-    ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%uA client %*s connected to %V",
-                  c->number, len, text, &addr_conf->addr_text);
+    ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%uA %sclient %*s connected to %V",
+                  c->number, c->type == SOCK_DGRAM ? "udp " : "",
+                  len, text, &addr_conf->addr_text);
 
     c->log->connection = c->number;
     c->log->handler = ngx_stream_log_error;
@@ -166,7 +167,10 @@ ngx_stream_init_connection(ngx_connection_t *c)
         }
     }
 
-    if (cscf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
+    if (c->type == SOCK_STREAM
+        && cscf->tcp_nodelay
+        && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
+    {
         ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0, "tcp_nodelay");
 
         tcp_nodelay = 1;
@@ -325,7 +329,8 @@ ngx_stream_log_error(ngx_log_t *log, u_char *buf, size_t len)
 
     s = log->data;
 
-    p = ngx_snprintf(buf, len, ", client: %V, server: %V",
+    p = ngx_snprintf(buf, len, ", %sclient: %V, server: %V",
+                     s->connection->type == SOCK_DGRAM ? "udp " : "",
                      &s->connection->addr_text,
                      &s->connection->listening->addr_text);
     len -= p - buf;
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index b969fea..6c535fd 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -17,6 +17,7 @@ typedef struct {
     size_t                           buffer_size;
     size_t                           upload_rate;
     size_t                           download_rate;
+    ngx_uint_t                       responses;
     ngx_uint_t                       next_upstream_tries;
     ngx_flag_t                       next_upstream;
     ngx_flag_t                       proxy_protocol;
@@ -54,7 +55,7 @@ static void ngx_stream_proxy_process_connection(ngx_event_t *ev,
     ngx_uint_t from_upstream);
 static void ngx_stream_proxy_connect_handler(ngx_event_t *ev);
 static ngx_int_t ngx_stream_proxy_test_connect(ngx_connection_t *c);
-static ngx_int_t ngx_stream_proxy_process(ngx_stream_session_t *s,
+static void ngx_stream_proxy_process(ngx_stream_session_t *s,
     ngx_uint_t from_upstream, ngx_uint_t do_write);
 static void ngx_stream_proxy_next_upstream(ngx_stream_session_t *s);
 static void ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_int_t rc);
@@ -167,6 +168,13 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
       offsetof(ngx_stream_proxy_srv_conf_t, download_rate),
       NULL },
 
+    { ngx_string("proxy_responses"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_proxy_srv_conf_t, responses),
+      NULL },
+
     { ngx_string("proxy_next_upstream"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -351,6 +359,7 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
     u->peer.log_error = NGX_ERROR_ERR;
 
     u->peer.local = pscf->local;
+    u->peer.type = c->type;
 
     uscf = pscf->upstream;
 
@@ -370,6 +379,14 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
     u->proxy_protocol = pscf->proxy_protocol;
     u->start_sec = ngx_time();
 
+    c->write->handler = ngx_stream_proxy_downstream_handler;
+    c->read->handler = ngx_stream_proxy_downstream_handler;
+
+    if (c->type == SOCK_DGRAM) {
+        ngx_stream_proxy_connect(s);
+        return;
+    }
+
     p = ngx_pnalloc(c->pool, pscf->buffer_size);
     if (p == NULL) {
         ngx_stream_proxy_finalize(s, NGX_ERROR);
@@ -381,9 +398,6 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
     u->downstream_buf.pos = p;
     u->downstream_buf.last = p;
 
-    c->write->handler = ngx_stream_proxy_downstream_handler;
-    c->read->handler = ngx_stream_proxy_downstream_handler;
-
     if (u->proxy_protocol
 #if (NGX_STREAM_SSL)
         && pscf->ssl == NULL
@@ -406,8 +420,8 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
         u->proxy_protocol = 0;
     }
 
-    if (ngx_stream_proxy_process(s, 0, 0) != NGX_OK) {
-        return;
+    if (c->read->ready) {
+        ngx_post_event(c->read, &ngx_posted_events);
     }
 
     ngx_stream_proxy_connect(s);
@@ -488,7 +502,10 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 
     cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
 
-    if (cscf->tcp_nodelay && pc->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
+    if (pc->type == SOCK_STREAM
+        && cscf->tcp_nodelay
+        && pc->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
+    {
         ngx_log_debug0(NGX_LOG_DEBUG_STREAM, pc->log, 0, "tcp_nodelay");
 
         tcp_nodelay = 1;
@@ -516,7 +533,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
     pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
 
 #if (NGX_STREAM_SSL)
-    if (pscf->ssl && pc->ssl == NULL) {
+    if (pc->type == SOCK_STREAM && pscf->ssl && pc->ssl == NULL) {
         ngx_stream_proxy_ssl_init_connection(s);
         return;
     }
@@ -535,7 +552,9 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
             handler = c->log->handler;
             c->log->handler = NULL;
 
-            ngx_log_error(NGX_LOG_INFO, c->log, 0, "proxy %V connected to %V",
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "%sproxy %V connected to %V",
+                          pc->type == SOCK_DGRAM ? "udp " : "",
                           &str, u->peer.name);
 
             c->log->handler = handler;
@@ -544,24 +563,36 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 
     c->log->action = "proxying connection";
 
-    p = ngx_pnalloc(c->pool, pscf->buffer_size);
-    if (p == NULL) {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
-        return;
+    if (u->upstream_buf.start == NULL) {
+        p = ngx_pnalloc(c->pool, pscf->buffer_size);
+        if (p == NULL) {
+            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            return;
+        }
+
+        u->upstream_buf.start = p;
+        u->upstream_buf.end = p + pscf->buffer_size;
+        u->upstream_buf.pos = p;
+        u->upstream_buf.last = p;
     }
 
-    u->upstream_buf.start = p;
-    u->upstream_buf.end = p + pscf->buffer_size;
-    u->upstream_buf.pos = p;
-    u->upstream_buf.last = p;
+    if (c->type == SOCK_DGRAM) {
+        s->received = c->buffer->last - c->buffer->pos;
+        u->downstream_buf = *c->buffer;
+
+        if (pscf->responses == 0) {
+            pc->read->ready = 0;
+            pc->read->eof = 1;
+        }
+    }
 
     u->connected = 1;
 
     pc->read->handler = ngx_stream_proxy_upstream_handler;
     pc->write->handler = ngx_stream_proxy_upstream_handler;
 
-    if (ngx_stream_proxy_process(s, 1, 0) != NGX_OK) {
-        return;
+    if (pc->read->ready || pc->read->eof) {
+        ngx_post_event(pc->read, &ngx_posted_events);
     }
 
     ngx_stream_proxy_process(s, 0, 1);
@@ -894,11 +925,15 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
     s = c->data;
     u = s->upstream;
 
+    c = s->connection;
+    pc = u->peer.connection;
+
+    pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
+
     if (ev->timedout) {
+        ev->timedout = 0;
 
         if (ev->delayed) {
-
-            ev->timedout = 0;
             ev->delayed = 0;
 
             if (!ev->ready) {
@@ -907,20 +942,35 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
                     return;
                 }
 
-                if (u->connected) {
-                    pc = u->peer.connection;
-
-                    if (!c->read->delayed && !pc->read->delayed) {
-                        pscf = ngx_stream_get_module_srv_conf(s,
-                                                       ngx_stream_proxy_module);
-                        ngx_add_timer(c->write, pscf->timeout);
-                    }
+                if (u->connected && !c->read->delayed && !pc->read->delayed) {
+                    ngx_add_timer(c->write, pscf->timeout);
                 }
 
                 return;
             }
 
         } else {
+            if (s->connection->type == SOCK_DGRAM) {
+                if (pscf->responses == NGX_MAX_INT32_VALUE) {
+
+                    /*
+                     * successfully terminate timed out UDP session
+                     * with unspecified number of responses
+                     */
+
+                    pc->read->ready = 0;
+                    pc->read->eof = 1;
+
+                    ngx_stream_proxy_process(s, 1, 0);
+                    return;
+                }
+
+                if (u->received == 0) {
+                    ngx_stream_proxy_next_upstream(s);
+                    return;
+                }
+            }
+
             ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out");
             ngx_stream_proxy_finalize(s, NGX_DECLINED);
             return;
@@ -1019,7 +1069,7 @@ ngx_stream_proxy_test_connect(ngx_connection_t *c)
 }
 
 
-static ngx_int_t
+static void
 ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
     ngx_uint_t do_write)
 {
@@ -1039,6 +1089,21 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
     c = s->connection;
     pc = u->connected ? u->peer.connection : NULL;
 
+    if (c->type == SOCK_DGRAM && (ngx_terminate || ngx_exiting)) {
+
+        /* socket is already closed on worker shutdown */
+
+        handler = c->log->handler;
+        c->log->handler = NULL;
+
+        ngx_log_error(NGX_LOG_INFO, c->log, 0, "disconnected on shutdown");
+
+        c->log->handler = handler;
+
+        ngx_stream_proxy_finalize(s, NGX_OK);
+        return;
+    }
+
     pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
 
     if (from_upstream) {
@@ -1066,9 +1131,19 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 
                 n = dst->send(dst, b->pos, size);
 
+                if (n == NGX_AGAIN && dst->shared) {
+                    /* cannot wait on a shared socket */
+                    n = NGX_ERROR;
+                }
+
                 if (n == NGX_ERROR) {
+                    if (c->type == SOCK_DGRAM && !from_upstream) {
+                        ngx_stream_proxy_next_upstream(s);
+                        return;
+                    }
+
                     ngx_stream_proxy_finalize(s, NGX_DECLINED);
-                    return NGX_ERROR;
+                    return;
                 }
 
                 if (n > 0) {
@@ -1118,6 +1193,12 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                     }
                 }
 
+                if (c->type == SOCK_DGRAM && ++u->responses == pscf->responses)
+                {
+                    src->read->ready = 0;
+                    src->read->eof = 1;
+                }
+
                 *received += n;
                 b->last += n;
                 do_write = 1;
@@ -1126,6 +1207,11 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
             }
 
             if (n == NGX_ERROR) {
+                if (c->type == SOCK_DGRAM && u->received == 0) {
+                    ngx_stream_proxy_next_upstream(s);
+                    return;
+                }
+
                 src->read->eof = 1;
             }
         }
@@ -1138,29 +1224,30 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         c->log->handler = NULL;
 
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "%s disconnected"
+                      "%s%s disconnected"
                       ", bytes from/to client:%O/%O"
                       ", bytes from/to upstream:%O/%O",
+                      src->type == SOCK_DGRAM ? "udp " : "",
                       from_upstream ? "upstream" : "client",
                       s->received, c->sent, u->received, pc ? pc->sent : 0);
 
         c->log->handler = handler;
 
         ngx_stream_proxy_finalize(s, NGX_OK);
-        return NGX_DONE;
+        return;
     }
 
     flags = src->read->eof ? NGX_CLOSE_EVENT : 0;
 
-    if (ngx_handle_read_event(src->read, flags) != NGX_OK) {
+    if (!src->shared && ngx_handle_read_event(src->read, flags) != NGX_OK) {
         ngx_stream_proxy_finalize(s, NGX_ERROR);
-        return NGX_ERROR;
+        return;
     }
 
     if (dst) {
-        if (ngx_handle_write_event(dst->write, 0) != NGX_OK) {
+        if (!dst->shared && ngx_handle_write_event(dst->write, 0) != NGX_OK) {
             ngx_stream_proxy_finalize(s, NGX_ERROR);
-            return NGX_ERROR;
+            return;
         }
 
         if (!c->read->delayed && !pc->read->delayed) {
@@ -1170,8 +1257,6 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
             ngx_del_timer(c->write);
         }
     }
-
-    return NGX_OK;
 }
 
 
@@ -1333,6 +1418,7 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
     conf->buffer_size = NGX_CONF_UNSET_SIZE;
     conf->upload_rate = NGX_CONF_UNSET_SIZE;
     conf->download_rate = NGX_CONF_UNSET_SIZE;
+    conf->responses = NGX_CONF_UNSET_UINT;
     conf->next_upstream_tries = NGX_CONF_UNSET_UINT;
     conf->next_upstream = NGX_CONF_UNSET;
     conf->proxy_protocol = NGX_CONF_UNSET;
@@ -1375,6 +1461,9 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_size_value(conf->download_rate,
                               prev->download_rate, 0);
 
+    ngx_conf_merge_uint_value(conf->responses,
+                              prev->responses, NGX_MAX_INT32_VALUE);
+
     ngx_conf_merge_uint_value(conf->next_upstream_tries,
                               prev->next_upstream_tries, 0);
 
diff --git a/src/stream/ngx_stream_upstream.c b/src/stream/ngx_stream_upstream.c
index 805ee70..69dddc5 100644
--- a/src/stream/ngx_stream_upstream.c
+++ b/src/stream/ngx_stream_upstream.c
@@ -388,7 +388,7 @@ ngx_stream_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
     uscf->port = u->port;
     uscf->no_port = u->no_port;
 
-    if (u->naddrs == 1) {
+    if (u->naddrs == 1 && (u->port || u->family == AF_UNIX)) {
         uscf->servers = ngx_array_create(cf->pool, 1,
                                          sizeof(ngx_stream_upstream_server_t));
         if (uscf->servers == NULL) {
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index 80520c2..1f4810c 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -84,6 +84,7 @@ typedef struct {
     ngx_buf_t                          upstream_buf;
     off_t                              received;
     time_t                             start_sec;
+    ngx_uint_t                         responses;
 #if (NGX_STREAM_SSL)
     ngx_str_t                          ssl_name;
 #endif

From dfa3b2f2df7c50a06253dd9e4ecb22abae3be065 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 11:28:10 +0300
Subject: [PATCH 045/600] New upstream release (1.9.13)

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 226b72b..ab5e082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-nginx (1.9.11-1) UNRELEASED; urgency=medium
+nginx (1.9.13-1) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis ]
-  * New upstream release (1.9.11) (Closes: #812806)
+  * New upstream release (1.9.13) (Closes: #812806)
   * debian:
     + Setup dynamic module flow, and implement a simple dh_nginx helper for
       internal use.

From 5d3e5e8fcb4d6746aa28bc1513ed544cba29c69d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 12:05:52 +0300
Subject: [PATCH 046/600] Update auth-pam module and introduce
 libnginx-mod-http-auth-pam

---
 debian/changelog                              |  3 ++
 debian/control                                | 11 +++++
 debian/libnginx-mod-http-auth-pam.nginx       | 13 ++++++
 .../libnginx-mod.conf/mod-http-auth-pam.conf  |  1 +
 debian/modules/README.Modules-versions        |  2 +-
 debian/modules/nginx-auth-pam/ChangeLog       |  8 ++++
 debian/modules/nginx-auth-pam/LICENSE         |  2 +-
 debian/modules/nginx-auth-pam/README.md       | 14 +++---
 debian/modules/nginx-auth-pam/VERSION         |  1 +
 debian/modules/nginx-auth-pam/config          | 18 ++++++--
 .../nginx-auth-pam/ngx_http_auth_pam_module.c | 45 ++++++++++++-------
 debian/rules                                  |  6 +--
 12 files changed, 93 insertions(+), 31 deletions(-)
 create mode 100755 debian/libnginx-mod-http-auth-pam.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-auth-pam.conf
 create mode 100644 debian/modules/nginx-auth-pam/VERSION

diff --git a/debian/changelog b/debian/changelog
index ab5e082..63ae632 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ nginx (1.9.13-1) UNRELEASED; urgency=medium
   * debian/modules/nginx-lua:
     + Update nginx-lua to v0.10.1rc0-5-g01727a3.
       Fixes buiding failures with nginx 1.9.11.
+  * debian/modules/nginx-auth-pam:
+    + Update http-auth-pam module to 1.5 and convert it to a dyn module.
+      (Closes: #819062)
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 11 Feb 2016 15:06:38 +0200
 
diff --git a/debian/control b/debian/control
index 2076f5c..96def42 100644
--- a/debian/control
+++ b/debian/control
@@ -85,6 +85,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
+         libnginx-mod-http-auth-pam (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -177,6 +178,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
+         libnginx-mod-http-auth-pam (= ${binary:Version}),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
@@ -271,3 +273,12 @@ Description: Stream module for Nginx
  Stream module supports loadbalancing & proxying to TCP servers. The module
  also supports ACLs/connection limiting and configuring multiple operational
  parameters.
+
+Package: libnginx-mod-http-auth-pam
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: PAM authentication module for Nginx
+ The nginx_http_auth_pam module enables authentication using PAM.
+ .
+ The module uses PAM as a backend for simple http authentication. It
+ also allows setting the pam service name to allow more fine grained control.
diff --git a/debian/libnginx-mod-http-auth-pam.nginx b/debian/libnginx-mod-http-auth-pam.nginx
new file mode 100755
index 0000000..02c5edc
--- /dev/null
+++ b/debian/libnginx-mod-http-auth-pam.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-auth-pam.conf b/debian/libnginx-mod.conf/mod-http-auth-pam.conf
new file mode 100644
index 0000000..2eb6752
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-auth-pam.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_auth_pam_module.so;
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index dbff74d..3952163 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -14,7 +14,7 @@ README for Modules versions
 
  nginx-auth-pam
   Homepage: https://github.com/stogh/ngx_http_auth_pam_module
-  Version: 1.4
+  Version: 1.5
 
  nginx-echo
   Homepage: https://github.com/agentzh/echo-nginx-module
diff --git a/debian/modules/nginx-auth-pam/ChangeLog b/debian/modules/nginx-auth-pam/ChangeLog
index 466bd9c..8aaf031 100644
--- a/debian/modules/nginx-auth-pam/ChangeLog
+++ b/debian/modules/nginx-auth-pam/ChangeLog
@@ -1,3 +1,11 @@
+2016-03-23  sto@iti.es
+
+	* Version 1.5.
+	* Added support to build module dynamically (patch provided by Sjir
+	  Bagmeijer <sbagmeijer@ulyaoth.co.kr>).
+	* Log PAM error and info messages to nginx log files (patch provided by
+	  André Caron <andre.l.caron@gmail.com>).
+
 2015-02-04  sto@iti.es
 
 	* Version 1.4.
diff --git a/debian/modules/nginx-auth-pam/LICENSE b/debian/modules/nginx-auth-pam/LICENSE
index f5be528..b2d9324 100644
--- a/debian/modules/nginx-auth-pam/LICENSE
+++ b/debian/modules/nginx-auth-pam/LICENSE
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2008-2015 Sergio Talens Oliag
+ * Copyright (C) 2008-2016 Sergio Talens Oliag
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/debian/modules/nginx-auth-pam/README.md b/debian/modules/nginx-auth-pam/README.md
index c6d58f0..a4eea45 100644
--- a/debian/modules/nginx-auth-pam/README.md
+++ b/debian/modules/nginx-auth-pam/README.md
@@ -4,15 +4,17 @@
 
 ### Compilation
 
-When compiling from source build as usual adding the -add-module option:
+When compiling from source build as usual adding the ``--add-module`` option:
 
 	./configure --add-module=$PATH_TO_MODULE
 
-If you are using a Debian GNU/Linux distribution install the nginx-full package;
-the module has been included in the nginx debian package since version 1.1.6-1
-and there are newer packages on the stable distribution (wheezy) and the wheezy
-version is also available from the oldstable backports repository
-(squeeze-backports).
+or if you want to build the module as dynamic use the ``--add-dynamic-module``
+option.
+
+If you are using a Debian GNU/Linux distribution install the ``nginx-full``
+package; the module has been included in the debian package since version
+``1.1.6-1``, so it is available on all stable distributions since the *wheezy*
+release.
 
 ### Configuration
 
diff --git a/debian/modules/nginx-auth-pam/VERSION b/debian/modules/nginx-auth-pam/VERSION
new file mode 100644
index 0000000..c239c60
--- /dev/null
+++ b/debian/modules/nginx-auth-pam/VERSION
@@ -0,0 +1 @@
+1.5
diff --git a/debian/modules/nginx-auth-pam/config b/debian/modules/nginx-auth-pam/config
index ef0815e..9c30919 100644
--- a/debian/modules/nginx-auth-pam/config
+++ b/debian/modules/nginx-auth-pam/config
@@ -1,4 +1,16 @@
 ngx_addon_name=ngx_http_auth_pam_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_auth_pam_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_pam_module.c"
-CORE_LIBS="$CORE_LIBS -lpam"
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP
+    ngx_module_name=ngx_http_auth_pam_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_pam_module.c"
+    ngx_module_libs="$CORE_LIBS -lpam"
+
+    . auto/module
+else
+   HTTP_MODULES="$HTTP_MODULES ngx_http_auth_pam_module"
+   NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_pam_module.c"
+   CORE_LIBS="$CORE_LIBS -lpam"
+fi
\ No newline at end of file
diff --git a/debian/modules/nginx-auth-pam/ngx_http_auth_pam_module.c b/debian/modules/nginx-auth-pam/ngx_http_auth_pam_module.c
index a49d7a6..167a37f 100644
--- a/debian/modules/nginx-auth-pam/ngx_http_auth_pam_module.c
+++ b/debian/modules/nginx-auth-pam/ngx_http_auth_pam_module.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2015 Sergio Talens-Oliag <sto@iti.es>
+ * Copyright (C) 2008-2016 Sergio Talens-Oliag <sto@iti.es>
  *
  * Based on nginx's 'ngx_http_auth_basic_module.c' by Igor Sysoev and apache's
  * 'mod_auth_pam.c' by Ingo Luetkebolhe.
@@ -19,11 +19,12 @@ typedef struct {
     ngx_str_t  passwd;
 } ngx_http_auth_pam_ctx_t;
 
-/* PAM userinfo */
+/* PAM authinfo */
 typedef struct {
     ngx_str_t  username;
     ngx_str_t  password;
-} ngx_pam_userinfo;
+    ngx_log_t  *log;
+} ngx_pam_authinfo;
 
 /* Module configuration struct */
 typedef struct {
@@ -151,14 +152,14 @@ ngx_auth_pam_talker(int num_msg, const struct pam_message ** msg,
                     struct pam_response ** resp, void *appdata_ptr)
 {
     int  i;
-    ngx_pam_userinfo  *uinfo;
+    ngx_pam_authinfo  *ainfo;
     struct pam_response  *response;
 
-    uinfo = (ngx_pam_userinfo *) appdata_ptr;
+    ainfo = (ngx_pam_authinfo *) appdata_ptr;
     response = NULL;
 
     /* parameter sanity checking */
-    if (!resp || !msg || !uinfo)
+    if (!resp || !msg || !ainfo)
         return PAM_CONV_ERR;
 
     /* allocate memory to store response */
@@ -176,10 +177,18 @@ ngx_auth_pam_talker(int num_msg, const struct pam_message ** msg,
         switch (msg[i]->msg_style) {
         case PAM_PROMPT_ECHO_ON:
             /* on memory allocation failure, auth fails */
-            response[i].resp = strdup((const char *)uinfo->username.data);
+            response[i].resp = strdup((const char *)ainfo->username.data);
             break;
         case PAM_PROMPT_ECHO_OFF:
-            response[i].resp = strdup((const char *)uinfo->password.data);
+            response[i].resp = strdup((const char *)ainfo->password.data);
+            break;
+	case PAM_ERROR_MSG:
+            ngx_log_error(NGX_LOG_ERR, ainfo->log, 0,
+                          "PAM: \'%s\'.", msg[i]->msg);
+            break;
+        case PAM_TEXT_INFO:
+            ngx_log_error(NGX_LOG_INFO, ainfo->log, 0,
+                          "PAM: \'%s\'.", msg[i]->msg);
             break;
         default:
             free_resp(i, response);
@@ -277,7 +286,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
     ngx_int_t   rc;
     ngx_http_auth_pam_loc_conf_t  *alcf;
 
-    ngx_pam_userinfo  uinfo;
+    ngx_pam_authinfo  ainfo;
     struct pam_conv   conv_info;        /* PAM struct */
     pam_handle_t      *pamh;
     u_char            *service_name;
@@ -303,14 +312,16 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
     p = ngx_cpymem(uname_buf, r->headers_in.user.data , len);
     *p ='\0';
 
-    uinfo.username.data = uname_buf;
-    uinfo.username.len  = len;
+    ainfo.username.data = uname_buf;
+    ainfo.username.len  = len;
 
-    uinfo.password.data = r->headers_in.passwd.data;
-    uinfo.password.len  = r->headers_in.passwd.len;
+    ainfo.password.data = r->headers_in.passwd.data;
+    ainfo.password.len  = r->headers_in.passwd.len;
+
+    ainfo.log = r->connection->log;
 
     conv_info.conv = &ngx_auth_pam_talker;
-    conv_info.appdata_ptr = (void *) &uinfo;
+    conv_info.appdata_ptr = (void *) &ainfo;
 
     pamh = NULL;
 
@@ -321,7 +332,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
         service_name = alcf->service_name.data;
     }
     if ((rc = pam_start((const char *) service_name,
-                        (const char *) uinfo.username.data,
+                        (const char *) ainfo.username.data,
                         &conv_info,
                         &pamh)) != PAM_SUCCESS) {
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -339,7 +350,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
                                PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                       "PAM: user '%s' - not authenticated: %s",
-                      uinfo.username.data, pam_strerror(pamh, rc));
+                      ainfo.username.data, pam_strerror(pamh, rc));
         pam_end(pamh, PAM_SUCCESS);
         return ngx_http_auth_pam_set_realm(r, &alcf->realm);
     }   /* endif authenticate */
@@ -348,7 +359,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
     if ((rc = pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                       "PAM: user '%s'  - invalid account: %s",
-                      uinfo.username.data, pam_strerror(pamh, rc));
+                      ainfo.username.data, pam_strerror(pamh, rc));
         pam_end(pamh, PAM_SUCCESS);
         return ngx_http_auth_pam_set_realm(r, &alcf->realm);
     }
diff --git a/debian/rules b/debian/rules
index f9db327..4c28a8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -83,7 +83,7 @@ full_configure_flags := \
 			--with-stream_ssl_module \
 			--with-mail=dynamic \
 			--with-mail_ssl_module \
-			--add-module=$(MODULESDIR)/nginx-auth-pam \
+			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-module=$(MODULESDIR)/nginx-echo \
 			--add-module=$(MODULESDIR)/nginx-upstream-fair \
@@ -108,7 +108,7 @@ extras_configure_flags := \
 			--with-stream=dynamic \
 			--with-stream_ssl_module \
 			--add-module=$(MODULESDIR)/headers-more-nginx-module \
-			--add-module=$(MODULESDIR)/nginx-auth-pam \
+			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-module=$(MODULESDIR)/nginx-cache-purge \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-module=$(MODULESDIR)/nginx-development-kit \

From e7ea50abbd00e4172ee7d28f94c94c71047a32f0 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 12:27:13 +0300
Subject: [PATCH 047/600] Update LUA module and introduce libnginx-mod-http-lua

---
 debian/changelog                              |  2 +-
 debian/control                                | 12 ++++
 debian/libnginx-mod-http-lua.nginx            | 13 ++++
 debian/libnginx-mod.conf/mod-http-lua.conf    |  1 +
 debian/modules/README.Modules-versions        |  2 +-
 debian/modules/nginx-lua/README.markdown      | 35 +++++------
 .../modules/nginx-lua/doc/HttpLuaModule.wiki  | 30 +++++-----
 .../modules/nginx-lua/src/ngx_http_lua_args.c | 13 ++--
 .../nginx-lua/src/ngx_http_lua_balancer.c     | 59 +++++++++++++++++--
 .../nginx-lua/src/ngx_http_lua_module.c       | 16 ++++-
 .../nginx-lua/src/ngx_http_lua_ssl_certby.c   | 28 +++++++--
 debian/modules/nginx-lua/t/031-post-args.t    | 35 ++++++++++-
 debian/modules/nginx-lua/t/129-ssl-socket.t   |  2 +-
 debian/modules/nginx-lua/t/133-worker-count.t | 20 +++++++
 .../modules/nginx-lua/t/134-worker-count-5.t  | 46 +++++++++++++++
 debian/rules                                  |  4 +-
 16 files changed, 260 insertions(+), 58 deletions(-)
 create mode 100755 debian/libnginx-mod-http-lua.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-lua.conf

diff --git a/debian/changelog b/debian/changelog
index 63ae632..24f9b02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,7 @@ nginx (1.9.13-1) UNRELEASED; urgency=medium
   * debian/nginx-common.nginx.service:
     + Documentation points to nginx man page.
   * debian/modules/nginx-lua:
-    + Update nginx-lua to v0.10.1rc0-5-g01727a3.
+    + Update nginx-lua to v0.12 and convert it to a dyn module.
       Fixes buiding failures with nginx 1.9.11.
   * debian/modules/nginx-auth-pam:
     + Update http-auth-pam module to 1.5 and convert it to a dyn module.
diff --git a/debian/control b/debian/control
index 96def42..96fa475 100644
--- a/debian/control
+++ b/debian/control
@@ -179,6 +179,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-http-auth-pam (= ${binary:Version}),
+         libnginx-mod-http-lua (= ${binary:Version}),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
@@ -282,3 +283,14 @@ Description: PAM authentication module for Nginx
  .
  The module uses PAM as a backend for simple http authentication. It
  also allows setting the pam service name to allow more fine grained control.
+
+Package: libnginx-mod-http-lua
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: LUA module for Nginx
+ Embed LUA runtime into nginx.
+ .
+ This module embeds Lua, via the standard Lua 5.1 interpreter or LuaJIT
+ 2.0/2.1, into Nginx and by leveraging Nginx's subrequests, allows the
+ integration of the powerful Lua threads (Lua coroutines) into the Nginx event
+ model.
diff --git a/debian/libnginx-mod-http-lua.nginx b/debian/libnginx-mod-http-lua.nginx
new file mode 100755
index 0000000..02c5edc
--- /dev/null
+++ b/debian/libnginx-mod-http-lua.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-lua.conf b/debian/libnginx-mod.conf/mod-http-lua.conf
new file mode 100644
index 0000000..f6311f4
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-lua.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_lua_module.so;
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 3952163..53cbc2c 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -22,7 +22,7 @@ README for Modules versions
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
-  Version: v0.10.1rc0-5-g01727a3
+  Version: v0.10.2
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/nginx-lua/README.markdown
index 94e67ad..4e8f9bd 100644
--- a/debian/modules/nginx-lua/README.markdown
+++ b/debian/modules/nginx-lua/README.markdown
@@ -21,6 +21,7 @@ Table of Contents
 * [Typical Uses](#typical-uses)
 * [Nginx Compatibility](#nginx-compatibility)
 * [Installation](#installation)
+    * [Building as a dynamic module](#building-as-a-dynamic-module)
     * [C Macro Configurations](#c-macro-configurations)
     * [Installation on Ubuntu 11.10](#installation-on-ubuntu-1110)
 * [Community](#community)
@@ -61,7 +62,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.0](https://github.com/openresty/lua-nginx-module/tags) released on 11 January 2016.
+This document describes ngx_lua [v0.10.2](https://github.com/openresty/lua-nginx-module/tags) released on 8 March 2016.
 
 Synopsis
 ========
@@ -128,7 +129,7 @@ Synopsis
                  ngx.say("status: ", res.status)
                  ngx.say("body:")
                  ngx.print(res.body)
-             end';
+             end
          }
      }
 
@@ -264,7 +265,7 @@ It is highly recommended to use the [OpenResty bundle](http://openresty.org) tha
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-1. Install LuaJIT 2.0 or 2.1 (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. Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is *not* supported yet). LuaJIT can be downloaded from 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](https://github.com/simpl/ngx_devel_kit/tags).
 1. Download the latest version of ngx_lua [HERE](https://github.com/openresty/lua-nginx-module/tags).
 1. Download the latest version of Nginx [HERE](http://nginx.org/) (See [Nginx Compatibility](#nginx-compatibility))
@@ -299,11 +300,17 @@ Build the source with this module:
  make install
 ```
 
+[Back to TOC](#table-of-contents)
+
+Building as a dynamic module
+----------------------------
+
 Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
 `./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
 directive, for example,
 
 ```nginx
+load_module /path/to/modules/ndk_http_module.so;  # assuming NDK is built as a dynamic module too
 load_module /path/to/modules/ngx_http_lua_module.so;
 ```
 
@@ -843,22 +850,11 @@ TODO
 ====
 
 * cosocket: implement LuaSocket's unconnected UDP API.
-* add support for implementing general TCP servers instead of HTTP servers in Lua. For example,
+* port this module to the "datagram" subsystem of NGINX for implementing general UDP servers instead of HTTP
+servers in Lua. For example,
 ```lua
 
- tcp {
-     server {
-         listen 11212;
-         handler_by_lua '
-             -- custom Lua code implementing the special TCP server...
-         ';
-     }
- }
-```
-* add support for implementing general UDP servers instead of HTTP servers in Lua. For example,
-```lua
-
- udp {
+ datagram {
      server {
          listen 1953;
          handler_by_lua '
@@ -881,6 +877,7 @@ TODO
 * add `ignore_resp_headers`, `ignore_resp_body`, and `ignore_resp` options to [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi) methods, to allow micro performance tuning on the user side.
 * 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](https://httpd.apache.org/docs/trunk/mod/mod_lua.html).
+* cosocket: add client SSL certificiate support.
 
 [Back to TOC](#table-of-contents)
 
@@ -6845,10 +6842,14 @@ Retrieves the current running phase name. Possible return values are
 	for the context of [init_by_lua](#init_by_lua) or [init_by_lua_file](#init_by_lua_file).
 * `init_worker`
 	for the context of [init_worker_by_lua](#init_worker_by_lua) or [init_worker_by_lua_file](#init_worker_by_lua_file).
+* `ssl_cert`
+	for the context of [ssl_certificate_by_lua_block](#ssl_certificate_by_lua_block) or [ssl_certificate_by_lua_file](#ssl_certificate_by_lua_file).
 * `set`
 	for the context of [set_by_lua](#set_by_lua) or [set_by_lua_file](#set_by_lua_file).
 * `rewrite`
 	for the context of [rewrite_by_lua](#rewrite_by_lua) or [rewrite_by_lua_file](#rewrite_by_lua_file).
+* `balancer`
+	for the context of [balancer_by_lua_block](#balancer_by_lua_block) or [balancer_by_lua_file](#balancer_by_lua_file).
 * `access`
 	for the context of [access_by_lua](#access_by_lua) or [access_by_lua_file](#access_by_lua_file).
 * `content`
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
index 3a39ef8..f6824ef 100644
--- a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.0] released on 11 January 2016.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.2] released on 8 March 2016.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -75,7 +75,7 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
                     ngx.say("status: ", res.status)
                     ngx.say("body:")
                     ngx.print(res.body)
-                end';
+                end
             }
         }
  
@@ -199,7 +199,7 @@ It is highly recommended to use the [http://openresty.org OpenResty bundle] that
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-# Install LuaJIT 2.0 or 2.1 (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.
+# Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is ''not'' supported yet). LuaJIT can be downloaded from the [http://luajit.org/download.html 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 [https://github.com/simpl/ngx_devel_kit/tags HERE].
 # Download the latest version of ngx_lua [https://github.com/openresty/lua-nginx-module/tags HERE].
 # Download the latest version of Nginx [http://nginx.org/ HERE] (See [[#Nginx Compatibility|Nginx Compatibility]])
@@ -233,11 +233,14 @@ Build the source with this module:
     make install
 </geshi>
 
+== Building as a dynamic module ==
+
 Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
 `./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
 directive, for example,
 
 ```nginx
+load_module /path/to/modules/ndk_http_module.so;  # assuming NDK is built as a dynamic module too
 load_module /path/to/modules/ngx_http_lua_module.so;
 ```
 
@@ -682,20 +685,10 @@ phases.
 = TODO =
 
 * cosocket: implement LuaSocket's unconnected UDP API.
-* add support for implementing general TCP servers instead of HTTP servers in Lua. For example,
+* port this module to the "datagram" subsystem of NGINX for implementing general UDP servers instead of HTTP
+servers in Lua. For example,
 <geshi lang="lua">
-    tcp {
-        server {
-            listen 11212;
-            handler_by_lua '
-                -- custom Lua code implementing the special TCP server...
-            ';
-        }
-    }
-</geshi>
-* add support for implementing general UDP servers instead of HTTP servers in Lua. For example,
-<geshi lang="lua">
-    udp {
+    datagram {
         server {
             listen 1953;
             handler_by_lua '
@@ -718,6 +711,7 @@ phases.
 * 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.
 * 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 [https://httpd.apache.org/docs/trunk/mod/mod_lua.html mod_lua].
+* cosocket: add client SSL certificiate support.
 
 = Changes =
 
@@ -5765,10 +5759,14 @@ Retrieves the current running phase name. Possible return values are
 : for the context of [[#init_by_lua|init_by_lua]] or [[#init_by_lua_file|init_by_lua_file]].
 * <code>init_worker</code>
 : for the context of [[#init_worker_by_lua|init_worker_by_lua]] or [[#init_worker_by_lua_file|init_worker_by_lua_file]].
+* <code>ssl_cert</code>
+: for the context of [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua_block]] or [[#ssl_certificate_by_lua_file|ssl_certificate_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>balancer</code>
+: for the context of [[#balancer_by_lua_block|balancer_by_lua_block]] or [[#balancer_by_lua_file|balancer_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>
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 dbc2ac6..0c307d6 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_args.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_args.c
@@ -111,8 +111,6 @@ ngx_http_lua_ngx_req_get_uri_args(lua_State *L)
 
     ngx_http_lua_check_fake_request(L, r);
 
-    lua_createtable(L, 0, 4);
-
     if (r->args.len == 0) {
         lua_createtable(L, 0, 0);
         return 1;
@@ -126,6 +124,8 @@ ngx_http_lua_ngx_req_get_uri_args(lua_State *L)
         return luaL_error(L, "no memory");
     }
 
+    lua_createtable(L, 0, 4);
+
     ngx_memcpy(buf, r->args.data, r->args.len);
 
     last = buf + r->args.len;
@@ -183,12 +183,13 @@ ngx_http_lua_ngx_req_get_post_args(lua_State *L)
     }
 
     if (r->request_body->temp_file) {
-        return luaL_error(L, "requesty body in temp file not supported");
+        lua_pushnil(L);
+        lua_pushliteral(L, "requesty body in temp file not supported");
+        return 2;
     }
 
-    lua_createtable(L, 0, 4);
-
     if (r->request_body->bufs == NULL) {
+        lua_createtable(L, 0, 0);
         return 1;
     }
 
@@ -212,6 +213,8 @@ ngx_http_lua_ngx_req_get_post_args(lua_State *L)
         return luaL_error(L, "no memory");
     }
 
+    lua_createtable(L, 0, 4);
+
     p = buf;
     for (cl = r->request_body->bufs; cl; cl = cl->next) {
         p = ngx_copy(p, cl->buf->pos, cl->buf->last - cl->buf->pos);
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
index 1201d26..a2c66be 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
@@ -23,8 +23,6 @@ struct ngx_http_lua_balancer_peer_data_s {
     ngx_http_lua_srv_conf_t            *conf;
     ngx_http_request_t                 *request;
 
-    ngx_event_get_peer_pt               get_rr_peer;
-
     ngx_uint_t                          more_tries;
     ngx_uint_t                          total_tries;
 
@@ -38,6 +36,12 @@ struct ngx_http_lua_balancer_peer_data_s {
 };
 
 
+#if (NGX_HTTP_SSL)
+static ngx_int_t ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc,
+    void *data);
+static void ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc,
+    void *data);
+#endif
 static ngx_int_t ngx_http_lua_balancer_init(ngx_conf_t *cf,
     ngx_http_upstream_srv_conf_t *us);
 static ngx_int_t ngx_http_lua_balancer_init_peer(ngx_http_request_t *r,
@@ -232,10 +236,14 @@ ngx_http_lua_balancer_init_peer(ngx_http_request_t *r,
     r->upstream->peer.get = ngx_http_lua_balancer_get_peer;
     r->upstream->peer.free = ngx_http_lua_balancer_free_peer;
 
+#if (NGX_HTTP_SSL)
+    r->upstream->peer.set_session = ngx_http_lua_balancer_set_session;
+    r->upstream->peer.save_session = ngx_http_lua_balancer_save_session;
+#endif
+
     bcf = ngx_http_conf_upstream_srv_conf(us, ngx_http_lua_module);
 
     bp->conf = bcf;
-    bp->get_rr_peer = ngx_http_upstream_get_round_robin_peer;
     bp->request = r;
 
     return NGX_OK;
@@ -254,7 +262,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
     ngx_http_lua_balancer_peer_data_t  *bp = data;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "lua balancer peer, try: %ui", pc->tries);
+                   "lua balancer peer, tries: %ui", pc->tries);
 
     lscf = bp->conf;
 
@@ -315,6 +323,9 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
         pc->sockaddr = bp->sockaddr;
         pc->socklen = bp->socklen;
         pc->name = &bp->host;
+        pc->cached = 0;
+        pc->connection = NULL;
+
         bp->rrp.peers->single = 0;
 
         if (bp->more_tries) {
@@ -326,7 +337,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
         return NGX_OK;
     }
 
-    return bp->get_rr_peer(pc, &bp->rrp);
+    return ngx_http_upstream_get_round_robin_peer(pc, &bp->rrp);
 }
 
 
@@ -388,6 +399,9 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
 {
     ngx_http_lua_balancer_peer_data_t  *bp = data;
 
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                   "lua balancer free peer, tries: %ui", pc->tries);
+
     if (bp->sockaddr && bp->socklen) {
         bp->last_peer_state = (int) state;
 
@@ -404,6 +418,39 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
 }
 
 
+#if (NGX_HTTP_SSL)
+
+static ngx_int_t
+ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_http_lua_balancer_peer_data_t  *bp = data;
+
+    if (bp->sockaddr && bp->socklen) {
+        /* TODO */
+        return NGX_OK;
+    }
+
+    return ngx_http_upstream_set_round_robin_peer_session(pc, &bp->rrp);
+}
+
+
+static void
+ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_http_lua_balancer_peer_data_t  *bp = data;
+
+    if (bp->sockaddr && bp->socklen) {
+        /* TODO */
+        return;
+    }
+
+    ngx_http_upstream_save_round_robin_peer_session(pc, &bp->rrp);
+    return;
+}
+
+#endif
+
+
 #ifndef NGX_LUA_NO_FFI_API
 
 int
@@ -493,7 +540,9 @@ int
 ngx_http_lua_ffi_balancer_set_more_tries(ngx_http_request_t *r,
     int count, char **err)
 {
+#if (nginx_version >= 1007005)
     ngx_uint_t             max_tries;
+#endif
     ngx_http_lua_ctx_t    *ctx;
     ngx_http_upstream_t   *u;
 
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 4cfee82..11eb653 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
@@ -888,14 +888,26 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
             return NGX_CONF_ERROR;
         }
 
-#if OPENSSL_VERSION_NUMBER >= 0x1000205fL
+#ifdef LIBRESSL_VERSION_NUMBER
 
-        SSL_CTX_set_cert_cb(sscf->ssl.ctx, ngx_http_lua_ssl_cert_handler, NULL);
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "LibreSSL does not support ssl_ceritificate_by_lua*");
+        return NGX_CONF_ERROR;
 
 #else
 
+#   if OPENSSL_VERSION_NUMBER >= 0x1000205fL
+
+        SSL_CTX_set_cert_cb(sscf->ssl.ctx, ngx_http_lua_ssl_cert_handler, NULL);
+
+#   else
+
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "OpenSSL too old to support ssl_ceritificate_by_lua*");
         return NGX_CONF_ERROR;
 
+#   endif
+
 #endif
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
index 32675b2..c4e6a83 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
@@ -530,12 +530,19 @@ ngx_http_lua_ffi_ssl_get_tls1_version(ngx_http_request_t *r, char **err)
 int
 ngx_http_lua_ffi_ssl_clear_certs(ngx_http_request_t *r, char **err)
 {
-#if OPENSSL_VERSION_NUMBER < 0x1000205fL
+#ifdef LIBRESSL_VERSION_NUMBER
+
+    *err = "LibreSSL not supported";
+    return NGX_ERROR;
+
+#else
+
+#   if OPENSSL_VERSION_NUMBER < 0x1000205fL
 
     *err = "at least OpenSSL 1.0.2e required but found " OPENSSL_VERSION_TEXT;
     return NGX_ERROR;
 
-#else
+#   else
 
     ngx_ssl_conn_t    *ssl_conn;
 
@@ -553,7 +560,8 @@ ngx_http_lua_ffi_ssl_clear_certs(ngx_http_request_t *r, char **err)
     SSL_certs_clear(ssl_conn);
     return NGX_OK;
 
-#endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
+#   endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
+#endif
 }
 
 
@@ -561,12 +569,19 @@ int
 ngx_http_lua_ffi_ssl_set_der_certificate(ngx_http_request_t *r,
     const char *data, size_t len, char **err)
 {
-#if OPENSSL_VERSION_NUMBER < 0x1000205fL
+#ifdef LIBRESSL_VERSION_NUMBER
+
+    *err = "LibreSSL not supported";
+    return NGX_ERROR;
+
+#else
+
+#   if OPENSSL_VERSION_NUMBER < 0x1000205fL
 
     *err = "at least OpenSSL 1.0.2e required but found " OPENSSL_VERSION_TEXT;
     return NGX_ERROR;
 
-#else
+#   else
 
     BIO               *bio = NULL;
     X509              *x509 = NULL;
@@ -643,7 +658,8 @@ failed:
 
     return NGX_ERROR;
 
-#endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
+#   endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
+#endif
 }
 
 
diff --git a/debian/modules/nginx-lua/t/031-post-args.t b/debian/modules/nginx-lua/t/031-post-args.t
index 29d6057..4f8b9d7 100644
--- a/debian/modules/nginx-lua/t/031-post-args.t
+++ b/debian/modules/nginx-lua/t/031-post-args.t
@@ -7,9 +7,8 @@ use Test::Nginx::Socket::Lua;
 #log_level('warn');
 
 repeat_each(2);
-#repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 2 + 5);
+plan tests => repeat_each() * (blocks() * 2 + 6);
 
 #no_diff();
 #no_long_string();
@@ -323,3 +322,35 @@ for my $k (@k) {
 CORE::join("", @k);
 --- timeout: 4
 
+
+
+=== TEST 10: request body in temp file
+--- config
+    location /lua {
+        lua_need_request_body on;
+        client_body_in_file_only clean;
+        content_by_lua_block {
+            local args, err = ngx.req.get_post_args()
+
+            if not args then
+                ngx.say(err)
+            else
+                local keys = {}
+                for key, val in pairs(args) do
+                    table.insert(keys, key)
+                end
+
+                table.sort(keys)
+                for i, key in ipairs(keys) do
+                    ngx.say(key, " = ", args[key])
+                end
+            end
+        }
+    }
+--- request
+POST /lua
+a=3&b=4&c
+--- response_body
+requesty body in temp file not supported
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/129-ssl-socket.t b/debian/modules/nginx-lua/t/129-ssl-socket.t
index 446cfeb..4921099 100644
--- a/debian/modules/nginx-lua/t/129-ssl-socket.t
+++ b/debian/modules/nginx-lua/t/129-ssl-socket.t
@@ -846,7 +846,7 @@ lua ssl server name: "iscribblet.org"
 lua ssl certificate verify error
 SSL reused session
 [alert]
---- timeout: 5
+--- timeout: 7
 
 
 
diff --git a/debian/modules/nginx-lua/t/133-worker-count.t b/debian/modules/nginx-lua/t/133-worker-count.t
index a7bae65..c97f6b4 100644
--- a/debian/modules/nginx-lua/t/133-worker-count.t
+++ b/debian/modules/nginx-lua/t/133-worker-count.t
@@ -30,3 +30,23 @@ GET /lua
 workers: 1
 --- no_error_log
 [error]
+
+
+
+=== TEST 2: init_by_lua
+--- http_config
+    init_by_lua_block {
+        package.loaded.count = ngx.worker.count()
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say("workers: ", package.loaded.count)
+        }
+    }
+--- request
+GET /lua
+--- response_body
+workers: 1
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/134-worker-count-5.t b/debian/modules/nginx-lua/t/134-worker-count-5.t
index d6f16c2..b257c12 100644
--- a/debian/modules/nginx-lua/t/134-worker-count-5.t
+++ b/debian/modules/nginx-lua/t/134-worker-count-5.t
@@ -30,3 +30,49 @@ GET /lua
 worker count: 5
 --- no_error_log
 [error]
+
+
+
+=== TEST 2: init_by_lua
+--- http_config
+    init_by_lua_block {
+        package.loaded.count = ngx.worker.count()
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say("workers: ", package.loaded.count)
+        }
+    }
+--- request
+GET /lua
+--- response_body
+workers: 5
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: init_by_lua + module (github #681)
+--- http_config
+    lua_package_path "t/servroot/html/?.lua;;";
+
+    init_by_lua_block {
+        local blah = require "file"
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say("ok")
+        }
+    }
+--- user_files
+>>> file.lua
+local timer_interval = 1
+local time_factor = timer_interval / (ngx.worker.count() * 60)
+--- request
+GET /lua
+--- response_body
+ok
+--- no_error_log
+[error]
diff --git a/debian/rules b/debian/rules
index 4c28a8b..14d079f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -115,7 +115,7 @@ extras_configure_flags := \
 			--add-module=$(MODULESDIR)/nginx-echo \
 			--add-module=$(MODULESDIR)/ngx-fancyindex \
 			--add-module=$(MODULESDIR)/nginx-http-push \
-			--add-module=$(MODULESDIR)/nginx-lua \
+			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
 			--add-module=$(MODULESDIR)/nginx-upload-progress \
 			--add-module=$(MODULESDIR)/nginx-upstream-fair \
 			--add-module=$(MODULESDIR)/ngx_http_substitutions_filter_module

From a12faa39a5bce0dc61e596fd08d79fe2469d60f8 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 12:46:10 +0300
Subject: [PATCH 048/600] build modules using nginx-extras

---
 debian/libnginx-mod-http-auth-pam.nginx     | 2 +-
 debian/libnginx-mod-http-geoip.nginx        | 2 +-
 debian/libnginx-mod-http-image-filter.nginx | 2 +-
 debian/libnginx-mod-http-lua.nginx          | 2 +-
 debian/libnginx-mod-http-xslt-filter.nginx  | 2 +-
 debian/libnginx-mod-mail.nginx              | 2 +-
 debian/libnginx-mod-stream.nginx            | 2 +-
 debian/libnginx-mod.nginx.skeleton          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/libnginx-mod-http-auth-pam.nginx b/debian/libnginx-mod-http-auth-pam.nginx
index 02c5edc..78c206f 100755
--- a/debian/libnginx-mod-http-auth-pam.nginx
+++ b/debian/libnginx-mod-http-auth-pam.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-geoip.nginx b/debian/libnginx-mod-http-geoip.nginx
index 02c5edc..78c206f 100755
--- a/debian/libnginx-mod-http-geoip.nginx
+++ b/debian/libnginx-mod-http-geoip.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-image-filter.nginx b/debian/libnginx-mod-http-image-filter.nginx
index 02c5edc..78c206f 100755
--- a/debian/libnginx-mod-http-image-filter.nginx
+++ b/debian/libnginx-mod-http-image-filter.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-lua.nginx b/debian/libnginx-mod-http-lua.nginx
index 02c5edc..78c206f 100755
--- a/debian/libnginx-mod-http-lua.nginx
+++ b/debian/libnginx-mod-http-lua.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-xslt-filter.nginx b/debian/libnginx-mod-http-xslt-filter.nginx
index 02c5edc..78c206f 100755
--- a/debian/libnginx-mod-http-xslt-filter.nginx
+++ b/debian/libnginx-mod-http-xslt-filter.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-mail.nginx b/debian/libnginx-mod-mail.nginx
index 02c5edc..78c206f 100755
--- a/debian/libnginx-mod-mail.nginx
+++ b/debian/libnginx-mod-mail.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-stream.nginx b/debian/libnginx-mod-stream.nginx
index 02c5edc..78c206f 100755
--- a/debian/libnginx-mod-stream.nginx
+++ b/debian/libnginx-mod-stream.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.nginx.skeleton b/debian/libnginx-mod.nginx.skeleton
index 02c5edc..78c206f 100755
--- a/debian/libnginx-mod.nginx.skeleton
+++ b/debian/libnginx-mod.nginx.skeleton
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-full/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

From 6d20e665d31c472845d8c3315b0592ef7df992ee Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 15:07:19 +0300
Subject: [PATCH 049/600] Introduce libnginx-mod-http-perl

---
 debian/control                              | 13 ++++++++++++-
 debian/libnginx-mod-http-perl.install       |  7 +++++++
 debian/libnginx-mod-http-perl.nginx         | 13 +++++++++++++
 debian/libnginx-mod.conf/mod-http-perl.conf |  1 +
 debian/nginx-extras.install                 | 10 +---------
 debian/rules                                |  4 ++--
 6 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100755 debian/libnginx-mod-http-perl.install
 create mode 100755 debian/libnginx-mod-http-perl.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-perl.conf
 mode change 100755 => 100644 debian/nginx-extras.install

diff --git a/debian/control b/debian/control
index 96fa475..3d0b6e9 100644
--- a/debian/control
+++ b/debian/control
@@ -180,8 +180,8 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-lua (= ${binary:Version}),
+         libnginx-mod-http-perl (= ${binary:Version}),
          ${misc:Depends},
-         ${perl:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
 Provides: httpd, httpd-cgi, nginx
@@ -275,6 +275,17 @@ Description: Stream module for Nginx
  also supports ACLs/connection limiting and configuring multiple operational
  parameters.
 
+Package: libnginx-mod-http-perl
+Architecture: any
+Depends: ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Description: Perl module for Nginx
+ Embed Perl runtime into nginx.
+ .
+ The ngx_http_perl module is used to implement location and variable handlers
+ in Perl and insert Perl calls into SSI.
+ .
+ Note that this module is marked experimental.
+
 Package: libnginx-mod-http-auth-pam
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/libnginx-mod-http-perl.install b/debian/libnginx-mod-http-perl.install
new file mode 100755
index 0000000..14ca692
--- /dev/null
+++ b/debian/libnginx-mod-http-perl.install
@@ -0,0 +1,7 @@
+#!/usr/bin/perl -w
+
+use Config;
+
+my $vendorarch = substr($Config{vendorarch}, 1);
+print "debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n";
+print "debian/build-extras/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n";
diff --git a/debian/libnginx-mod-http-perl.nginx b/debian/libnginx-mod-http-perl.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-perl.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-perl.conf b/debian/libnginx-mod.conf/mod-http-perl.conf
new file mode 100644
index 0000000..ab3d02a
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-perl.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_perl_module.so;
diff --git a/debian/nginx-extras.install b/debian/nginx-extras.install
old mode 100755
new mode 100644
index dbcf498..833c24b
--- a/debian/nginx-extras.install
+++ b/debian/nginx-extras.install
@@ -1,9 +1 @@
-#!/usr/bin/perl -w
-
-use Config;
-
-my $vendorarch = substr($Config{vendorarch}, 1);
-print "debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n";
-print "debian/build-extras/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n";
-
-print "debian/build-extras/objs/nginx usr/sbin\n";
+debian/build-extras/objs/nginx usr/sbin
diff --git a/debian/rules b/debian/rules
index 14d079f..9f6aeaf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -98,7 +98,7 @@ extras_configure_flags := \
 			--with-http_gzip_static_module \
 			--with-http_image_filter_module=dynamic \
 			--with-http_mp4_module \
-			--with-http_perl_module \
+			--with-http_perl_module=dynamic \
 			--with-http_random_index_module \
 			--with-http_secure_link_module \
 			--with-http_sub_module \

From d5ba950907a7115d16a0e4cd84f6654580fdd57d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 30 Mar 2016 15:30:59 +0300
Subject: [PATCH 050/600] Perl module ifdefs for SSI so it cannot be loaded
 across builds.

nginx-light is the only flavor that doesn't include SSI so we
are including it there.

Also, we switch the nginx-light module test to use
libnginx-mod-http-perl, that way it's more likely to fail.
---
 debian/control       | 4 ++--
 debian/rules         | 1 -
 debian/tests/control | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 3d0b6e9..d83c6cb 100644
--- a/debian/control
+++ b/debian/control
@@ -149,8 +149,8 @@ Description: nginx web/proxy server (basic version)
  FastCGI, Map, Proxy, Rewrite.
  .
  OPTIONAL HTTP MODULES: Auth Request, Charset, Gzip, Gzip Precompression,
- Headers, HTTP/2, Index, Log, Real IP, SSL, Stub Status, Thread Pool, WebDAV,
- Upstream.
+ Headers, HTTP/2, Index, Log, Real IP, SSI, SSL, Stub Status, Thread Pool,
+ WebDAV, Upstream.
  .
  THIRD PARTY MODULES: Echo.
 
diff --git a/debian/rules b/debian/rules
index 9f6aeaf..8805781 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,6 @@ light_configure_flags := \
 			--without-http_referer_module \
 			--without-http_scgi_module \
 			--without-http_split_clients_module \
-			--without-http_ssi_module \
 			--without-http_userid_module \
 			--without-http_uwsgi_module \
 			--add-module=$(MODULESDIR)/nginx-echo
diff --git a/debian/tests/control b/debian/tests/control
index 881cc56..735ce14 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -12,4 +12,4 @@ Depends: nginx-extras, curl
 
 Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
 Restrictions: allow-stderr isolation-container
-Depends: nginx-light, libnginx-mod-stream, curl
+Depends: nginx-light, libnginx-mod-http-perl, curl

From 166eb741134455e18eaa40f09c1a1d3739f6cc67 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 31 Mar 2016 13:57:49 +0300
Subject: [PATCH 051/600] We accidentally closed a wishlist bug with the
 nginx-light enhancements

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 24f9b02..a6d6712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ nginx (1.9.13-1) UNRELEASED; urgency=medium
   * debian/control:
     + Enable http/2, thread pool & WebDAV on nginx-light.
       In order for dynamic modules to be loadable in all nginx flavors we need
-      to ensure the share the same build signature.
+      to ensure the share the same build signature. (Closes: #816095)
     + Use secure VCS uri (lintian).
     + Bump Standards to 3.9.7.
   * debian/rules:

From 832524e25ef79005b55886bc8595e770771846ba Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 31 Mar 2016 13:57:54 +0300
Subject: [PATCH 052/600] Mark nginx-common & nginx-doc as 'Multi-Arch:
 foreign' (Closes: #812484)

---
 debian/changelog | 2 ++
 debian/control   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a6d6712..7e366f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ nginx (1.9.13-1) UNRELEASED; urgency=medium
     + Enable http/2, thread pool & WebDAV on nginx-light.
       In order for dynamic modules to be loadable in all nginx flavors we need
       to ensure the share the same build signature. (Closes: #816095)
+    + nginx-common & nginx-doc are now 'Multi-Arch: foreign'. (Closes: #812484)
+      Thanks Elrond for the report and the initial patch.
     + Use secure VCS uri (lintian).
     + Bump Standards to 3.9.7.
   * debian/rules:
diff --git a/debian/control b/debian/control
index d83c6cb..7c0a636 100644
--- a/debian/control
+++ b/debian/control
@@ -48,6 +48,7 @@ Description: small, powerful, scalable web/proxy server
 
 Package: nginx-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: lsb-base (>= 3.2-14), ${misc:Depends}
 Description: small, powerful, scalable web/proxy server - documentation
@@ -59,6 +60,7 @@ Description: small, powerful, scalable web/proxy server - documentation
 
 Package: nginx-common
 Architecture: all
+Multi-Arch: foreign
 Depends: lsb-base (>= 3.2-14), ${misc:Depends}
 Replaces: nginx (<< 0.8.54-4),
           nginx-extras (<< 0.8.54-4),

From f6a3b87f152ac63963e729d984677dbcdd4296a4 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 7 Apr 2016 09:06:12 +0300
Subject: [PATCH 053/600] Test all modules in all flavors

---
 debian/tests/control | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/tests/control b/debian/tests/control
index 735ce14..b4f6582 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -12,4 +12,12 @@ Depends: nginx-extras, curl
 
 Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
 Restrictions: allow-stderr isolation-container
-Depends: nginx-light, libnginx-mod-http-perl, curl
+Depends: nginx-extras, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream
+
+Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+Restrictions: allow-stderr isolation-container
+Depends: nginx-full, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream
+
+Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+Restrictions: allow-stderr isolation-container
+Depends: nginx-light, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream

From ddb802850295fc87b9e49d8a0fa0d7f30895f42c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 7 Apr 2016 09:31:25 +0300
Subject: [PATCH 054/600] Convert tests to scripts

---
 debian/tests/control            | 18 +++++++++---------
 debian/tests/extras-module-deps |  3 +++
 debian/tests/extras-simple      |  3 +++
 debian/tests/full-module-deps   |  3 +++
 debian/tests/full-simple        |  3 +++
 debian/tests/light-module-deps  |  3 +++
 debian/tests/light-simple       |  3 +++
 7 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 debian/tests/extras-module-deps
 create mode 100644 debian/tests/extras-simple
 create mode 100644 debian/tests/full-module-deps
 create mode 100644 debian/tests/full-simple
 create mode 100644 debian/tests/light-module-deps
 create mode 100644 debian/tests/light-simple

diff --git a/debian/tests/control b/debian/tests/control
index b4f6582..a222b7f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,23 +1,23 @@
-Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+Tests: light-simple
 Restrictions: allow-stderr isolation-container
 Depends: nginx-light, curl
 
-Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+Tests: full-simple
 Restrictions: allow-stderr isolation-container
 Depends: nginx-full, curl
 
-Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+Tests: extras-simple
 Restrictions: allow-stderr isolation-container
 Depends: nginx-extras, curl
 
-Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
-Restrictions: allow-stderr isolation-container
-Depends: nginx-extras, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream
-
-Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+Tests: full-module-deps
 Restrictions: allow-stderr isolation-container
 Depends: nginx-full, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream
 
-Test-Command: curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+Tests: light-module-deps
 Restrictions: allow-stderr isolation-container
 Depends: nginx-light, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream
+
+Tests: extras-module-deps
+Restrictions: allow-stderr isolation-container
+Depends: nginx-extras, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream
diff --git a/debian/tests/extras-module-deps b/debian/tests/extras-module-deps
new file mode 100644
index 0000000..cefed50
--- /dev/null
+++ b/debian/tests/extras-module-deps
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/extras-simple b/debian/tests/extras-simple
new file mode 100644
index 0000000..cefed50
--- /dev/null
+++ b/debian/tests/extras-simple
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/full-module-deps b/debian/tests/full-module-deps
new file mode 100644
index 0000000..cefed50
--- /dev/null
+++ b/debian/tests/full-module-deps
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/full-simple b/debian/tests/full-simple
new file mode 100644
index 0000000..cefed50
--- /dev/null
+++ b/debian/tests/full-simple
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/light-module-deps b/debian/tests/light-module-deps
new file mode 100644
index 0000000..cefed50
--- /dev/null
+++ b/debian/tests/light-module-deps
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/light-simple b/debian/tests/light-simple
new file mode 100644
index 0000000..cefed50
--- /dev/null
+++ b/debian/tests/light-simple
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/

From 9551b6324b11f2147cea249184254bbbb387c4f1 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 7 Apr 2016 10:02:52 +0300
Subject: [PATCH 055/600] Update nginx-auth-pam module to 1.5.1

Fixes linking issue with the dynamic module.
---
 debian/modules/README.Modules-versions  | 2 +-
 debian/modules/nginx-auth-pam/ChangeLog | 6 ++++++
 debian/modules/nginx-auth-pam/config    | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 53cbc2c..f6bec49 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -14,7 +14,7 @@ README for Modules versions
 
  nginx-auth-pam
   Homepage: https://github.com/stogh/ngx_http_auth_pam_module
-  Version: 1.5
+  Version: 1.5.1
 
  nginx-echo
   Homepage: https://github.com/agentzh/echo-nginx-module
diff --git a/debian/modules/nginx-auth-pam/ChangeLog b/debian/modules/nginx-auth-pam/ChangeLog
index 8aaf031..d45eae4 100644
--- a/debian/modules/nginx-auth-pam/ChangeLog
+++ b/debian/modules/nginx-auth-pam/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-06  sto@iti.es
+
+    * Version 1.5.1.
+	* Fix building alongside other modules in nginx 1.9.11+ (patch provided by
+	  Graham Edgecombe <grahamedgecombe@gmail.com>)
+
 2016-03-23  sto@iti.es
 
 	* Version 1.5.
diff --git a/debian/modules/nginx-auth-pam/config b/debian/modules/nginx-auth-pam/config
index 9c30919..2275262 100644
--- a/debian/modules/nginx-auth-pam/config
+++ b/debian/modules/nginx-auth-pam/config
@@ -5,8 +5,8 @@ if test -n "$ngx_module_link"; then
     ngx_module_name=ngx_http_auth_pam_module
     ngx_module_incs=
     ngx_module_deps=
-    ngx_module_srcs="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_pam_module.c"
-    ngx_module_libs="$CORE_LIBS -lpam"
+    ngx_module_srcs="$ngx_addon_dir/ngx_http_auth_pam_module.c"
+    ngx_module_libs="-lpam"
 
     . auto/module
 else

From 30eb818ca4b5f6cec04d6a455900ec99713f3c07 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 7 Apr 2016 10:23:21 +0300
Subject: [PATCH 056/600] Update nginx-development-kit module to 0.3.0rc1
 (dynamic module)

---
 debian/modules/README.Modules-versions        |   2 +-
 debian/modules/nginx-development-kit/LICENSE  |  13 +
 debian/modules/nginx-development-kit/README   | 139 ----------
 .../modules/nginx-development-kit/README.md   | 238 ++++++++++++++++++
 debian/modules/nginx-development-kit/config   |  26 +-
 5 files changed, 273 insertions(+), 145 deletions(-)
 create mode 100644 debian/modules/nginx-development-kit/LICENSE
 delete mode 100644 debian/modules/nginx-development-kit/README
 create mode 100644 debian/modules/nginx-development-kit/README.md

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index f6bec49..d7f35a4 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -10,7 +10,7 @@ README for Modules versions
 
  nginx-development-kit
   Homepage: https://github.com/simpl/ngx_devel_kit/
-  Version: v0.2.19
+  Version: v0.3.0rc1
 
  nginx-auth-pam
   Homepage: https://github.com/stogh/ngx_http_auth_pam_module
diff --git a/debian/modules/nginx-development-kit/LICENSE b/debian/modules/nginx-development-kit/LICENSE
new file mode 100644
index 0000000..ee54448
--- /dev/null
+++ b/debian/modules/nginx-development-kit/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2010-2015, Marcus Clyne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/nginx-development-kit/README b/debian/modules/nginx-development-kit/README
deleted file mode 100644
index 50a2d95..0000000
--- a/debian/modules/nginx-development-kit/README
+++ /dev/null
@@ -1,139 +0,0 @@
-    Nginx Development Kit (NDK)
-    ===========================
-
-Synopsis
-
-    The NDK is an Nginx module that is designed to extend the core functionality of the 
-    excellent Nginx webserver in a way that can be used as a basis of other Nginx modules.
-
-    It has functions and macros to deal with generic tasks that don't currently have
-    generic code as part of the core distribution.  The NDK itself adds few features
-    that are seen from a user's point of view - it's just designed to help reduce the
-    code that Nginx module developers need to write.
-
-    Nginx module developers wishing to use any of the features in the NDK should specify 
-    that the NDK is a dependency of their module, and that users will need to compile
-    it as well when they compile their own modules.  They will also need to declare in
-    their own modules which features of the NDK they wish to use (explained below).
-    
-    If you are not an Nginx module developer, then the only useful part of this project
-    will be the 'usage for users' section below.
-
-
-Status
-
-    The NDK is now considered to be stable. It is already being used in quite a few third
-    party modules.
-
-
-Features
-
-    - additional conf_set functions for regexes, complex/script values, paths...
-    - macros to simplify tasks like checking for NULL values when doing ngx_array_push
-    - patches to the main source code
-    - ngx_auto_lib_core generic external library handler is included (see separate readme)
-
-
-
-Design
-
-    modular :
-
-    The kit itself is designed in a modular way, so that only the required code is compiled.
-    It's possible to add just a single NDK module, a few or all of them.
-
-    auto-generated & easily extensible :
-
-    Many of the macros available in the NDK are auto-generated from simple configuration
-    files.  This makes creating similar macros for your own code very simple - it's usually
-    just the case of adding an extra line to a config file and re-running the build script.
-
-
-Usage for users
-
-    If another Nginx module you wish to use specifies that the NDK is a dependency, you
-    will need to do the following :
-
-    1 - download the source (http://github.com/simpl/ngx_devel_kit)
-
-    2 - unpack the source (tar -xzf $name)
-
-    3 - compile Nginx with the following extra option
-
-        --add-module=/path/to/src
-
-        e.g.
-
-        ./configure --add-module=/path/to/ndk/base  --add-module=/path/to/another/mod
-
-
-Usage for developers
-
-    To use the NDK in your own module, you need to add the following :
-
-    1 - add this line to your module
-
-        #include    <ndk.h>
-
-        note : since the NDK includes the following lines
-
-        #include    <ngx_config.h>
-        #include    <ngx_core.h>
-        #include    <ngx_http.h>
-
-        you can replace these with the single include above.
-
-    2 - add the following line in the config file for your module :
-
-        have=NDK_[module_name]  . auto/have
-
-        for each NDK module that you wish to use (you need to include auto/have multiple
-        times if you wish to use multiple NDK modules.
-
-
-    Note : the old method of setting
-
-        CFLAGS="$CFLAGS -DNDK_[module_name]"
-
-        is now deprecated. It will still work, but results in unnecessary lines being
-        displayed when compiling Nginx.
-
-
-    Warning : using NDK_ALL
-
-        You can also set NDK_ALL to include all the NDK modules.  This is primarily as
-        a convenience in the early stages of development of another module. However,
-
-        DO NOT LEAVE 'NDK_ALL' IN YOUR CONFIG FILE WHEN PUBLISHING
-
-        Although the NDK is fairly small now, it could in time become a large repository
-        of code that would, if using NDK_ALL, result in considerably more code being compiled
-        than is necessary.
-
-
-Todo
-
-    - documentation for modules that don't already have it
-    - additional phase-handler functions
-    - generically testing for needing to add a handler
-    - remove dependency of set_var on OpenSSL being compiled in
-
-
-License
-
-    BSD
-
-
-Contributing / Feedback
-
-    If you are an Nginx module developer, and have developed some functions that are
-    generic in nature (or would be easily adapted to be so), then please send them to
-    me at the address below, and I'll add them to the kit.
-
-    
-Author
-
-    Marcus Clyne (contact at simpl dot it)
-
-
-
diff --git a/debian/modules/nginx-development-kit/README.md b/debian/modules/nginx-development-kit/README.md
new file mode 100644
index 0000000..e0ed4eb
--- /dev/null
+++ b/debian/modules/nginx-development-kit/README.md
@@ -0,0 +1,238 @@
+Name
+====
+
+NDK - Nginx Development Kit
+
+Table of Contents
+=================
+
+* [Name](#name)
+* [Synopsis](#synopsis)
+* [Status](#status)
+* [Features](#features)
+* [Design](#design)
+    * [modular](#modular)
+    * [auto-generated & easily extensible](#auto-generated--easily-extensible)
+* [Usage for users](#usage-for-users)
+    * [Building as a dynamic module](#building-as-a-dynamic-module)
+* [Usage for developers](#usage-for-developers)
+    * [Warning: using NDK_ALL](#warning-using-ndk_all)
+* [Modules using NDK](#modules-using-ndk)
+* [TODO](#todo)
+* [License](#license)
+* [Contributing / Feedback](#contributing--feedback)
+* [Author](#author)
+
+Synopsis
+========
+
+The NDK is an Nginx module that is designed to extend the core functionality of the
+excellent Nginx webserver in a way that can be used as a basis of other Nginx modules.
+
+It has functions and macros to deal with generic tasks that don't currently have
+generic code as part of the core distribution.  The NDK itself adds few features
+that are seen from a user's point of view - it's just designed to help reduce the
+code that Nginx module developers need to write.
+
+Nginx module developers wishing to use any of the features in the NDK should specify
+that the NDK is a dependency of their module, and that users will need to compile
+it as well when they compile their own modules.  They will also need to declare in
+their own modules which features of the NDK they wish to use (explained below).
+
+If you are not an Nginx module developer, then the only useful part of this project
+will be the 'usage for users' section below.
+
+Status
+======
+
+The NDK is now considered to be stable. It is already being used in quite a few third
+party modules.
+
+Features
+========
+
+* additional conf_set functions for regexes, complex/script values, paths...
+* macros to simplify tasks like checking for NULL values when doing ngx_array_push
+* patches to the main source code
+* ngx_auto_lib_core generic external library handler is included (see separate readme)
+
+[Back to TOC](#table-of-contents)
+
+Design
+======
+
+modular
+-------
+
+The kit itself is designed in a modular way, so that only the required code is compiled.
+It's possible to add just a single NDK module, a few or all of them.
+
+[Back to TOC](#table-of-contents)
+
+auto-generated & easily extensible
+----------------------------------
+
+Many of the macros available in the NDK are auto-generated from simple configuration
+files.  This makes creating similar macros for your own code very simple - it's usually
+just the case of adding an extra line to a config file and re-running the build script.
+
+[Back to TOC](#table-of-contents)
+
+Usage for users
+===============
+
+If another Nginx module you wish to use specifies that the NDK is a dependency, you
+will need to do the following :
+
+1. download the source (https://github.com/simpl/ngx_devel_kit)
+2. unpack the source (tar -xzf $name)
+3. compile Nginx with the following extra option `--add-module=/path/to/ngx_devel_kit`.
+
+e.g.
+
+```bash
+./configure --add-module=/path/to/ngx_devel_kit \
+            --add-module=/path/to/another/module
+```
+
+[Back to TOC](#table-of-contents)
+
+Building as a dynamic module
+----------------------------
+
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ndk_http_module.so;
+load_module /path/to/another/module.so;
+```
+
+[Back to TOC](#table-of-contents)
+
+Usage for developers
+====================
+
+To use the NDK in your own module, you need to add the following:
+
+1. add this line to your module
+
+```C
+#include    <ndk.h>
+```
+
+Note: since the NDK includes the following lines
+
+```C
+#include    <ngx_config.h>
+#include    <ngx_core.h>
+#include    <ngx_http.h>
+```
+
+you can replace these with the single include above.
+2. add the following line in the config file for your module:
+
+```bash
+have=NDK_[module_name]  . auto/have
+```
+
+for each NDK module that you wish to use (you need to include auto/have multiple
+times if you wish to use multiple NDK modules.
+
+Note: the old method of setting
+
+```config
+CFLAGS="$CFLAGS -DNDK_[module_name]"
+```
+
+is now deprecated. It will still work, but results in unnecessary lines being
+displayed when compiling Nginx.
+
+[Back to TOC](#table-of-contents)
+
+Warning: using NDK_ALL
+----------------------
+
+You can also set `NDK_ALL` to include all the NDK modules.  This is primarily as
+a convenience in the early stages of development of another module. However,
+
+DO NOT LEAVE `NDK_ALL` IN YOUR CONFIG FILE WHEN PUBLISHING
+
+Although the NDK is fairly small now, it could in time become a large repository
+of code that would, if using NDK_ALL, result in considerably more code being compiled
+than is necessary.
+
+[Back to TOC](#table-of-contents)
+
+Modules using NDK
+=================
+
+The following 3rd-party modules make use of NDK.
+
+* [ngx_http_lua_module](https://github.com/openresty/lua-nginx-module#readme)
+* [ngx_http_set_misc_module](https://github.com/openresty/set-misc-nginx-module#readme)
+* [ngx_http_encrypted_session_module](https://github.com/openresty/encrypted-session-nginx-module#readme)
+* [ngx_http_form_input_module](https://github.com/calio/form-input-nginx-module#readme)
+* [ngx_http_iconv_module](https://github.com/calio/iconv-nginx-module#readme)
+* [ngx_http_array_var_module](https://github.com/openresty/array-var-nginx-module#readme)
+
+[Back to TOC](#table-of-contents)
+
+TODO
+====
+
+* documentation for modules that don't already have it
+* additional phase-handler functions
+* generically testing for needing to add a handler
+* remove dependency of set_var on OpenSSL being compiled in
+
+[Back to TOC](#table-of-contents)
+
+License
+=======
+
+Copyright (c) 2010-2016, Marcus Clyne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other materials
+provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific prior
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[Back to TOC](#table-of-contents)
+
+Contributing / Feedback
+=======================
+
+If you are an Nginx module developer, and have developed some functions that are
+generic in nature (or would be easily adapted to be so), then please send them to
+me at the address below, and I'll add them to the kit.
+
+[Back to TOC](#table-of-contents)
+
+Author
+======
+
+Marcus Clyne (contact at simpl dot it)
+
+[Back to TOC](#table-of-contents)
+
diff --git a/debian/modules/nginx-development-kit/config b/debian/modules/nginx-development-kit/config
index 65563d7..8cb7ad0 100644
--- a/debian/modules/nginx-development-kit/config
+++ b/debian/modules/nginx-development-kit/config
@@ -18,8 +18,8 @@ ndk_get_nginx_version() {
     # We get the Nginx version number from the string form rather than
     # nginx_version because it is available in more (every?) version
 
-    cat src/core/nginx.h                                | 
-    grep  '#define NGINX_VERSION'                       | 
+    cat src/core/nginx.h                                |
+    grep  '#define NGINX_VERSION'                       |
     sed -r                                              \
         -e 's/[^0-9.]*([0-9.]+).*/\1/'                  \
         -e 's/([0-9]+\.[0-9]+\.)([0-9]{1})$/\100\2/'    \
@@ -35,10 +35,26 @@ ndk_get_nginx_version() {
 ngx_addon_name=ngx_devel_kit
 ngx_objs_dirs="$ngx_addon_dir/objs $NGX_OBJS/addon/ndk"
 
+NDK_SRCS="$ngx_addon_dir/src/ndk.c"
+NDK_DEPS="$ngx_addon_dir/src/ndk.h"
+NDK_INCS="$ngx_addon_dir/src $ngx_objs_dirs"
+
 CORE_INCS="$CORE_INCS $ngx_objs_dirs"
 HTTP_INCS="$HTTP_INCS $ngx_addon_dir/src $ngx_objs_dir"
-HTTP_MODULES="$HTTP_MODULES ndk_http_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ndk.c"
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP
+    ngx_module_name="ndk_http_module"
+    ngx_module_srcs="$NDK_SRCS"
+    ngx_module_deps="$NDK_DEPS"
+    ngx_module_incs="$NDK_INCS"
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES ndk_http_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $NDK_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_SRCS $NDK_DEPS"
+fi
 
 have=NDK . auto/have
 
@@ -46,4 +62,4 @@ have=NDK . auto/have
 ## INCLUDES ##
 ##############
 
-. $ngx_addon_dir/ngx_auto_lib_core
\ No newline at end of file
+. $ngx_addon_dir/ngx_auto_lib_core

From 481751859a332c2881d4df19d4e761be5386f64a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 7 Apr 2016 10:51:41 +0300
Subject: [PATCH 057/600] Introduce libnginx-mod-http-ndk module

---
 debian/control                             | 16 +++++++++++++++-
 debian/libnginx-mod-http-ndk.nginx         |  2 ++
 debian/libnginx-mod.conf/mod-http-ndk.conf |  1 +
 debian/rules                               |  4 ++--
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 debian/libnginx-mod-http-ndk.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-ndk.conf

diff --git a/debian/control b/debian/control
index 7c0a636..2398e29 100644
--- a/debian/control
+++ b/debian/control
@@ -299,7 +299,7 @@ Description: PAM authentication module for Nginx
 
 Package: libnginx-mod-http-lua
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libnginx-mod-http-ndk (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: LUA module for Nginx
  Embed LUA runtime into nginx.
  .
@@ -307,3 +307,17 @@ Description: LUA module for Nginx
  2.0/2.1, into Nginx and by leveraging Nginx's subrequests, allows the
  integration of the powerful Lua threads (Lua coroutines) into the Nginx event
  model.
+
+Package: libnginx-mod-http-ndk
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Nginx Development Kit module
+ The NDK is an Nginx module that is designed to extend the core functionality of
+ the excellent Nginx webserver in a way that can be used as a basis of other
+ Nginx modules.
+ .
+ It has functions and macros to deal with generic tasks that don't currently
+ have generic code as part of the core distribution. The NDK itself adds few
+ features that are seen from a user's point of view - it's just designed to help
+ reduce the code that Nginx module developers need to write.  Embed LUA runtime
+ into nginx.
diff --git a/debian/libnginx-mod-http-ndk.nginx b/debian/libnginx-mod-http-ndk.nginx
new file mode 100644
index 0000000..1905145
--- /dev/null
+++ b/debian/libnginx-mod-http-ndk.nginx
@@ -0,0 +1,2 @@
+mod debian/build-extras/objs/ndk_http_module.so
+mod debian/libnginx-mod.conf/mod-http-ndk.conf
diff --git a/debian/libnginx-mod.conf/mod-http-ndk.conf b/debian/libnginx-mod.conf/mod-http-ndk.conf
new file mode 100644
index 0000000..3908af6
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-ndk.conf
@@ -0,0 +1 @@
+load_module modules/ndk_http_module.so;
diff --git a/debian/rules b/debian/rules
index 8805781..63abd77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -110,7 +110,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-module=$(MODULESDIR)/nginx-cache-purge \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
-			--add-module=$(MODULESDIR)/nginx-development-kit \
+			--add-dynamic-module=$(MODULESDIR)/nginx-development-kit \
 			--add-module=$(MODULESDIR)/nginx-echo \
 			--add-module=$(MODULESDIR)/ngx-fancyindex \
 			--add-module=$(MODULESDIR)/nginx-http-push \

From 57e63bc6d8f61ca4c8ddeb23957b6f8de01fb46c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 18 Apr 2016 11:47:04 +0300
Subject: [PATCH 058/600] dh_nginx: Support setting module priorities in .nginx
 files

---
 debian/autoscripts/postinst-nginx | 9 ++++++---
 debian/autoscripts/postrm-nginx   | 9 ++++++---
 debian/autoscripts/prerm-nginx    | 9 ++++++---
 debian/dh_nginx                   | 9 ++++++---
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/debian/autoscripts/postinst-nginx b/debian/autoscripts/postinst-nginx
index 565015b..b2efc7b 100644
--- a/debian/autoscripts/postinst-nginx
+++ b/debian/autoscripts/postinst-nginx
@@ -1,8 +1,11 @@
-for conf in #NAMES# ; do
+for confpair in #NAMES# ; do
+	from=$(echo $confpair | cut -d: -f1)
+	to=$(echo $confpair | cut -d: -f2)
+
 	# Symlink on fresh installations
 	if [ -z "$2" ]; then
-		ln -sf /usr/share/nginx/modules-available/$conf \
-			/etc/nginx/modules-enabled/$conf
+		ln -sf /usr/share/nginx/modules-available/$from \
+			/etc/nginx/modules-enabled/$to
 	fi
 done
 
diff --git a/debian/autoscripts/postrm-nginx b/debian/autoscripts/postrm-nginx
index 60b0493..bb16a45 100644
--- a/debian/autoscripts/postrm-nginx
+++ b/debian/autoscripts/postrm-nginx
@@ -1,7 +1,10 @@
 if [ "$1" = "purge" ] ; then
-	for conf in #NAMES# ; do
-		if [ -e /etc/nginx/etc/nginx/modules-enabled/$conf ]; then
-			rm /etc/nginx/etc/nginx/modules-enabled/$conf
+	for confpair in #NAMES# ; do
+		from=$(echo $confpair | cut -d: -f1)
+		to=$(echo $confpair | cut -d: -f2)
+
+		if [ -e /etc/nginx/modules-enabled/$to ]; then
+			rm /etc/nginx/modules-enabled/$to
 		fi
 	done
 
diff --git a/debian/autoscripts/prerm-nginx b/debian/autoscripts/prerm-nginx
index efeaae8..8bc2d25 100644
--- a/debian/autoscripts/prerm-nginx
+++ b/debian/autoscripts/prerm-nginx
@@ -1,7 +1,10 @@
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
-	for conf in #NAMES# ; do
-		if [ -e /etc/nginx/etc/nginx/modules-enabled/$conf ]; then
-			rm /etc/nginx/etc/nginx/modules-enabled/$conf
+	for confpair in #NAMES# ; do
+		from=$(echo $confpair | cut -d: -f1)
+		to=$(echo $confpair | cut -d: -f2)
+
+		if [ -e /etc/nginx/modules-enabled/$to ]; then
+			rm /etc/nginx/modules-enabled/$to
 		fi
 	done
 
diff --git a/debian/dh_nginx b/debian/dh_nginx
index 2d7b942..447ab79 100755
--- a/debian/dh_nginx
+++ b/debian/dh_nginx
@@ -169,7 +169,8 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 	{
 		my $type = lc(shift @{$line}) if $line->[0];
 		my $source = shift @{$line} if $line->[0];
-		my @arguments = map {"$_ "} @{$line};
+		my @arguments = @{$line};
+		my $destination;
 
 		$type = "modules" if $type eq "mod";
 		my $installdir = $tmp . "/" . nginx_modules_conf_installdir();
@@ -185,8 +186,10 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 				if ($basesource =~ m/\.conf$/)
 				{
 					my $enablename = $basesource;
-					push @{$PACKAGE_TYPE{'has_a_module'}}, $enablename;
-					verbose_print("Installing module configuration $enablename into $installdir\n");
+					my $prio = $#arguments >= 0 ? $arguments[0] : 50;
+					$destination = "$prio-$basesource";
+					push @{$PACKAGE_TYPE{'has_a_module'}}, "$enablename:$destination";
+					verbose_print("Installing module configuration $enablename into $installdir prio:$prio\n");
 				}
 				elsif ($basesource =~ m/\.so$/)
 			{

From fef2251ae991b7133991b311268fa39040cdd750 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 7 Apr 2016 12:56:43 +0300
Subject: [PATCH 059/600] NDK is a dependency, load it before nginx-lua

---
 debian/libnginx-mod-http-ndk.nginx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/libnginx-mod-http-ndk.nginx b/debian/libnginx-mod-http-ndk.nginx
index 1905145..562723b 100644
--- a/debian/libnginx-mod-http-ndk.nginx
+++ b/debian/libnginx-mod-http-ndk.nginx
@@ -1,2 +1,2 @@
 mod debian/build-extras/objs/ndk_http_module.so
-mod debian/libnginx-mod.conf/mod-http-ndk.conf
+mod debian/libnginx-mod.conf/mod-http-ndk.conf 10

From 65f92dd626ecd8eaf809ace9b81406511ce5c7af Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 18 Apr 2016 11:54:13 +0300
Subject: [PATCH 060/600] merge into dh_nginx

---
 debian/dh_nginx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/dh_nginx b/debian/dh_nginx
index 447ab79..3be792d 100755
--- a/debian/dh_nginx
+++ b/debian/dh_nginx
@@ -112,9 +112,8 @@ Modules are handled specially and are determined by the B<mod> type. Modules mus
 have a I<.conf> suffix. In that case the file is interpreted as module load
 file and is installed to I</etc/nginx/modules-available>. If the file is ending
 with a I<.so> suffix it is interpreted as actual module shared object and is
-installed to the Nginx module directory. Moreover, if a I<.load> file is
-installed the configuration is activated in the maintainer script at
-installation time.
+installed to the Nginx module directory, an optional numeric priority can be
+set as the last argument to handle module dependencies.
 
 =head1 OPTIONS
 
@@ -205,7 +204,7 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 				}
 
 				# TODO
-				error("module: \"$basesource\" needs .conf, .so or .load suffix") if $basesource !~ m/\.(conf|so)/;
+				error("module: \"$basesource\" needs .conf, .so or suffix") if $basesource !~ m/\.(conf|so)/;
 			}
 
 			if (! -d $installdir)

From 578f222e929b84dd1cccfb8b7a606fa4d4d5511c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 18 Apr 2016 12:43:59 +0300
Subject: [PATCH 061/600] README.packaging: Add a note about dynamic module
 support.

---
 debian/README.Packaging | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/debian/README.Packaging b/debian/README.Packaging
index 66a88c1..61358da 100644
--- a/debian/README.Packaging
+++ b/debian/README.Packaging
@@ -9,6 +9,22 @@ Workflow for Unstable
 
 We use the standard git-buildpackage workflow.
 
+Dynamic Modules
+===============
+
+Since v1.9.11 Nginx added dynamic module support. This will sanitize the
+nginx packaging flow in the long term, but there is a lot work to be done
+in order to get there. We will gradually convert all modules to dynamic
+as they add support for it.
+
+Currently nginx modules need to be build together with nginx, but this
+will be fixed upstream [0]. Since we already ship 3rd party modules under
+debian/modules/ we will start shipping module packages (libnginx-mod) from
+the same source. Once upstream implements separated building we will
+split each module to a separate source.
+
+[0] https://www.nginx.com/blog/dynamic-modules-nginx-1-9-11/
+
 Workflow for Experimental (not-active)
 ======================================
 

From 0eb87154ce11613d2ad16e5ff7d0b889ca84fd54 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 18 Apr 2016 12:58:40 +0300
Subject: [PATCH 062/600] Imported Upstream version 1.9.14

---
 CHANGES                                       |  19 +-
 CHANGES.ru                                    |  17 +
 auto/lib/openssl/conf                         |   2 +-
 auto/types/sizeof                             |   8 +-
 auto/types/typedef                            |  13 +-
 auto/unix                                     |   5 +-
 contrib/vim/syntax/nginx.vim                  |   2 +-
 src/core/nginx.c                              |   7 +-
 src/core/nginx.h                              |   4 +-
 src/core/ngx_conf_file.c                      |   6 +-
 src/core/ngx_config.h                         |   5 -
 src/core/ngx_connection.c                     |  36 +-
 src/core/ngx_connection.h                     |  22 +-
 src/core/ngx_crypt.c                          |   4 +-
 src/core/ngx_cycle.c                          |  10 +-
 src/core/ngx_cycle.h                          |  40 +-
 src/core/ngx_file.c                           |   6 +-
 src/core/ngx_inet.c                           |  22 +-
 src/core/ngx_log.c                            |  20 +-
 src/core/ngx_log.h                            |   3 +-
 src/core/ngx_open_file_cache.c                |   2 +-
 src/core/ngx_parse_time.c                     |   2 +-
 src/core/ngx_resolver.c                       |   2 +-
 src/core/ngx_slab.c                           |  11 +-
 src/core/ngx_syslog.c                         |   6 +-
 src/core/ngx_times.c                          |   4 +-
 src/event/modules/ngx_epoll_module.c          |   2 +-
 src/event/modules/ngx_eventport_module.c      |  10 +-
 src/event/modules/ngx_kqueue_module.c         |  23 +-
 src/event/ngx_event.c                         |   2 +-
 src/event/ngx_event.h                         |   2 +-
 src/event/ngx_event_openssl.c                 |  69 +-
 src/event/ngx_event_openssl.h                 |  17 +
 src/event/ngx_event_openssl_stapling.c        |   6 +-
 src/event/ngx_event_pipe.c                    |  12 +-
 src/http/modules/ngx_http_auth_basic_module.c |   2 +-
 .../modules/ngx_http_auth_request_module.c    |   4 +-
 .../modules/ngx_http_chunked_filter_module.c  |   2 +-
 src/http/modules/ngx_http_dav_module.c        |  10 +-
 src/http/modules/ngx_http_fastcgi_module.c    |  16 +-
 .../modules/ngx_http_gzip_filter_module.c     |   4 +-
 .../modules/ngx_http_image_filter_module.c    |   4 +-
 src/http/modules/ngx_http_limit_conn_module.c |   4 +-
 src/http/modules/ngx_http_map_module.c        |   2 +-
 src/http/modules/ngx_http_memcached_module.c  |   2 +-
 src/http/modules/ngx_http_mp4_module.c        |  18 +-
 src/http/modules/ngx_http_proxy_module.c      |   8 +-
 .../modules/ngx_http_random_index_module.c    |   2 +-
 .../modules/ngx_http_range_filter_module.c    |   4 +-
 src/http/modules/ngx_http_realip_module.c     |   4 +-
 src/http/modules/ngx_http_referer_module.c    |   2 +-
 src/http/modules/ngx_http_rewrite_module.c    |   2 +-
 src/http/modules/ngx_http_scgi_module.c       |   2 +-
 src/http/modules/ngx_http_ssi_filter_module.c |   8 +-
 src/http/modules/ngx_http_ssl_module.c        |   9 +-
 src/http/modules/ngx_http_sub_filter_module.c |   2 +-
 .../ngx_http_upstream_ip_hash_module.c        |   2 +-
 .../ngx_http_upstream_least_conn_module.c     |   2 +-
 src/http/ngx_http_core_module.c               |  39 +-
 src/http/ngx_http_core_module.h               |   8 +-
 src/http/ngx_http_file_cache.c                |   2 +-
 src/http/ngx_http_request.c                   |  12 +-
 src/http/ngx_http_request.h                   |   3 +
 src/http/ngx_http_request_body.c              |  41 +-
 src/http/ngx_http_script.c                    |   6 +-
 src/http/ngx_http_upstream.c                  |  24 +-
 src/http/ngx_http_upstream_round_robin.c      |   2 +-
 src/http/ngx_http_variables.c                 |   5 +-
 src/http/ngx_http_write_filter_module.c       |   2 +-
 src/http/v2/ngx_http_v2.c                     | 681 ++++++++++--------
 src/http/v2/ngx_http_v2.h                     |   9 +-
 src/http/v2/ngx_http_v2_module.c              |   2 +-
 src/mail/ngx_mail.h                           |   2 +-
 src/mail/ngx_mail_auth_http_module.c          |   2 +-
 src/mail/ngx_mail_proxy_module.c              |   2 +-
 src/mail/ngx_mail_smtp_handler.c              |   2 +-
 src/mail/ngx_mail_ssl_module.c                |   8 +-
 src/os/unix/ngx_atomic.h                      |  20 +-
 src/os/unix/ngx_channel.h                     |   8 +-
 src/os/unix/ngx_file_aio_read.c               |   2 +-
 src/os/unix/ngx_files.c                       |   2 +-
 src/os/unix/ngx_linux_aio_read.c              |   2 +-
 src/os/unix/ngx_linux_sendfile_chain.c        |   2 +-
 src/os/unix/ngx_os.h                          |   2 +-
 src/os/unix/ngx_process.c                     |   2 +-
 src/os/unix/ngx_process_cycle.c               |  10 +-
 src/os/unix/ngx_readv_chain.c                 |   2 +-
 src/os/unix/ngx_recv.c                        |   4 +-
 src/os/unix/ngx_send.c                        |   2 +-
 src/os/unix/ngx_sunpro_amd64.il               |   6 +-
 src/os/unix/ngx_sunpro_x86.il                 |   6 +-
 src/os/unix/ngx_udp_recv.c                    |   4 +-
 src/stream/ngx_stream_limit_conn_module.c     |   4 +-
 src/stream/ngx_stream_ssl_module.c            |   2 +-
 .../ngx_stream_upstream_least_conn_module.c   |   2 +-
 src/stream/ngx_stream_upstream_round_robin.c  |   2 +-
 96 files changed, 844 insertions(+), 628 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0ac9c61..e1e596e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,21 @@
 
+Changes with nginx 1.9.14                                        05 Apr 2016
+
+    *) Feature: OpenSSL 1.1.0 compatibility.
+
+    *) Feature: the "proxy_request_buffering", "fastcgi_request_buffering",
+       "scgi_request_buffering", and "uwsgi_request_buffering" directives
+       now work with HTTP/2.
+
+    *) Bugfix: "zero size buf in output" alerts might appear in logs when
+       using HTTP/2.
+
+    *) Bugfix: the "client_max_body_size" directive might work incorrectly
+       when using HTTP/2.
+
+    *) Bugfix: of minor bugs in logging.
+
+
 Changes with nginx 1.9.13                                        29 Mar 2016
 
     *) Change: non-idempotent requests (POST, LOCK, PATCH) are no longer
@@ -1875,7 +1892,7 @@ Changes with nginx 1.1.6                                         17 Oct 2011
        sent to it after fail_timeout; the server will be considered alive if
        it will successfully respond to the request.
 
-    *) Change: now the 0x7F-0x1F characters are escaped as \xXX in an
+    *) Change: now the 0x7F-0xFF characters are escaped as \xXX in an
        access_log.
 
     *) Feature: "proxy/fastcgi/scgi/uwsgi_ignore_headers" directives support
diff --git a/CHANGES.ru b/CHANGES.ru
index 7c92f7b..c6e6e84 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,21 @@
 
+Изменения в nginx 1.9.14                                          05.04.2016
+
+    *) Добавление: совместимость с OpenSSL 1.1.0.
+
+    *) Добавление: директивы proxy_request_buffering,
+       fastcgi_request_buffering, scgi_request_buffering и
+       uwsgi_request_buffering теперь работают при использовании HTTP/2.
+
+    *) Исправление: при использовании HTTP/2 в логах могли появляться
+       сообщения "zero size buf in output".
+
+    *) Исправление: при использовании HTTP/2 директива client_max_body_size
+       могла работать неверно.
+
+    *) Исправление: незначительных ошибок логгирования.
+
+
 Изменения в nginx 1.9.13                                          29.03.2016
 
     *) Изменение: неидемпотентные запросы (POST, LOCK, PATCH) теперь по
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index e438050..39d9602 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -52,7 +52,7 @@ else
         ngx_feature_incs="#include <openssl/ssl.h>"
         ngx_feature_path=
         ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
-        ngx_feature_test="SSL_library_init()"
+        ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
         . auto/feature
 
         if [ $ngx_found = no ]; then
diff --git a/auto/types/sizeof b/auto/types/sizeof
index a5f66bb..b5b71bb 100644
--- a/auto/types/sizeof
+++ b/auto/types/sizeof
@@ -45,9 +45,6 @@ if [ -x $NGX_AUTOTEST ]; then
 fi
 
 
-rm -rf $NGX_AUTOTEST*
-
-
 case $ngx_size in
     4)
         ngx_max_value=2147483647
@@ -69,6 +66,11 @@ case $ngx_size in
         echo $ngx_test       >> $NGX_AUTOCONF_ERR
         echo "----------"    >> $NGX_AUTOCONF_ERR
 
+        rm -rf $NGX_AUTOTEST*
+
         exit 1
 esac
 
+
+rm -rf $NGX_AUTOTEST*
+
diff --git a/auto/types/typedef b/auto/types/typedef
index 8b5c368..b55237e 100644
--- a/auto/types/typedef
+++ b/auto/types/typedef
@@ -49,18 +49,23 @@ END
         fi
     fi
 
-    rm -rf $NGX_AUTOTEST*
-
     if [ $ngx_found = no ]; then
-        echo $ngx_n " $ngx_try not found$ngx_c"
+        if [ $ngx_try = $ngx_type ]; then
+            echo $ngx_n " $ngx_try not found$ngx_c"
+        else
+            echo $ngx_n ", $ngx_try not found$ngx_c"
+        fi
 
         echo "----------"    >> $NGX_AUTOCONF_ERR
         cat $NGX_AUTOTEST.c  >> $NGX_AUTOCONF_ERR
         echo "----------"    >> $NGX_AUTOCONF_ERR
         echo $ngx_test       >> $NGX_AUTOCONF_ERR
         echo "----------"    >> $NGX_AUTOCONF_ERR
+    fi
 
-    else
+    rm -rf $NGX_AUTOTEST*
+
+    if [ $ngx_found != no ]; then
         break
     fi
 done
diff --git a/auto/unix b/auto/unix
index 16d9523..8c0e813 100755
--- a/auto/unix
+++ b/auto/unix
@@ -260,7 +260,7 @@ ngx_feature_run=no
 ngx_feature_incs="#include <dlfcn.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="dlopen(NULL, 0); dlsym(NULL, NULL)"
+ngx_feature_test="dlopen(NULL, RTLD_NOW | RTLD_GLOBAL); dlsym(NULL, NULL)"
 . auto/feature
 
 
@@ -547,6 +547,7 @@ ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_size; . auto/types/value
 
 NGX_INCLUDE_AUTO_CONFIG_H="#include \"ngx_auto_config.h\""
 
+ngx_type="uint32_t"; ngx_types="u_int32_t"; . auto/types/typedef
 ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef
 
 ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef
@@ -555,7 +556,7 @@ ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value
 
 ngx_type="socklen_t"; ngx_types="int"; . auto/types/typedef
 
-ngx_type="in_addr_t"; ngx_types="uint32_t"; . auto/types/typedef
+ngx_type="in_addr_t"; ngx_types="uint32_t u_int32_t"; . auto/types/typedef
 
 ngx_type="in_port_t"; ngx_types="u_short"; . auto/types/typedef
 
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 444d96e..8f13017 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -57,6 +57,7 @@ syn keyword ngxDirectiveError post_action
 syn keyword ngxDirectiveDeprecated connections
 syn keyword ngxDirectiveDeprecated imap
 syn keyword ngxDirectiveDeprecated limit_zone
+syn keyword ngxDirectiveDeprecated mysql_test
 syn keyword ngxDirectiveDeprecated open_file_cache_retest
 syn keyword ngxDirectiveDeprecated optimize_server_names
 syn keyword ngxDirectiveDeprecated satisfy_any
@@ -246,7 +247,6 @@ syn keyword ngxDirective mp4_max_buffer_size
 syn keyword ngxDirective msie_padding
 syn keyword ngxDirective msie_refresh
 syn keyword ngxDirective multi_accept
-syn keyword ngxDirective mysql_test
 syn keyword ngxDirective open_file_cache
 syn keyword ngxDirective open_file_cache_errors
 syn keyword ngxDirective open_file_cache_events
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 2823169..60f8fe7 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -413,13 +413,12 @@ ngx_show_version_info(void)
 #endif
 
 #if (NGX_SSL)
-        if (SSLeay() == SSLEAY_VERSION_NUMBER) {
+        if (ngx_strcmp(ngx_ssl_version(), OPENSSL_VERSION_TEXT) == 0) {
             ngx_write_stderr("built with " OPENSSL_VERSION_TEXT NGX_LINEFEED);
         } else {
             ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
                              " (running with ");
-            ngx_write_stderr((char *) (uintptr_t)
-                             SSLeay_version(SSLEAY_VERSION));
+            ngx_write_stderr((char *) (uintptr_t) ngx_ssl_version());
             ngx_write_stderr(")" NGX_LINEFEED);
         }
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
@@ -1510,7 +1509,7 @@ ngx_load_module(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             return NGX_CONF_ERROR;
         }
 
-        ngx_log_debug2(NGX_LOG_DEBUG_CORE, cf->log, 0, "module: %s i:%i",
+        ngx_log_debug2(NGX_LOG_DEBUG_CORE, cf->log, 0, "module: %s i:%ui",
                        module->name, module->index);
     }
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 238d8b8..d0a6f65 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009013
-#define NGINX_VERSION      "1.9.13"
+#define nginx_version      1009014
+#define NGINX_VERSION      "1.9.14"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index fb72656..c60d5fb 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -613,9 +613,9 @@ ngx_conf_read_token(ngx_conf_t *cf)
                 need_space = 0;
 
             } else {
-                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                    "unexpected \"%c\"", ch);
-                 return NGX_ERROR;
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "unexpected \"%c\"", ch);
+                return NGX_ERROR;
             }
         }
 
diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h
index 145e43a..a0bfa63 100644
--- a/src/core/ngx_config.h
+++ b/src/core/ngx_config.h
@@ -125,12 +125,7 @@ typedef intptr_t        ngx_flag_t;
 #endif
 
 
-#if ((__GNU__ == 2) && (__GNUC_MINOR__ < 8))
-#define NGX_MAX_UINT32_VALUE  (uint32_t) 0xffffffffLL
-#else
 #define NGX_MAX_UINT32_VALUE  (uint32_t) 0xffffffff
-#endif
-
 #define NGX_MAX_INT32_VALUE   (uint32_t) 0x7fffffff
 
 
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 572def2..5a53bac 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -47,21 +47,21 @@ ngx_create_listening(ngx_conf_t *cf, void *sockaddr, socklen_t socklen)
     switch (ls->sockaddr->sa_family) {
 #if (NGX_HAVE_INET6)
     case AF_INET6:
-         ls->addr_text_max_len = NGX_INET6_ADDRSTRLEN;
-         break;
+        ls->addr_text_max_len = NGX_INET6_ADDRSTRLEN;
+        break;
 #endif
 #if (NGX_HAVE_UNIX_DOMAIN)
     case AF_UNIX:
-         ls->addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
-         len++;
-         break;
+        ls->addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
+        len++;
+        break;
 #endif
     case AF_INET:
-         ls->addr_text_max_len = NGX_INET_ADDRSTRLEN;
-         break;
+        ls->addr_text_max_len = NGX_INET_ADDRSTRLEN;
+        break;
     default:
-         ls->addr_text_max_len = NGX_SOCKADDR_STRLEN;
-         break;
+        ls->addr_text_max_len = NGX_SOCKADDR_STRLEN;
+        break;
     }
 
     ls->addr_text.data = ngx_pnalloc(cf->pool, len);
@@ -168,22 +168,22 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
 
 #if (NGX_HAVE_INET6)
         case AF_INET6:
-             ls[i].addr_text_max_len = NGX_INET6_ADDRSTRLEN;
-             len = NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1;
-             break;
+            ls[i].addr_text_max_len = NGX_INET6_ADDRSTRLEN;
+            len = NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1;
+            break;
 #endif
 
 #if (NGX_HAVE_UNIX_DOMAIN)
         case AF_UNIX:
-             ls[i].addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
-             len = NGX_UNIX_ADDRSTRLEN;
-             break;
+            ls[i].addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
+            len = NGX_UNIX_ADDRSTRLEN;
+            break;
 #endif
 
         case AF_INET:
-             ls[i].addr_text_max_len = NGX_INET_ADDRSTRLEN;
-             len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
-             break;
+            ls[i].addr_text_max_len = NGX_INET_ADDRSTRLEN;
+            len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
+            break;
 
         default:
             ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno,
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 19a2ab7..b0d162a 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -95,25 +95,25 @@ struct ngx_listening_s {
 
 
 typedef enum {
-     NGX_ERROR_ALERT = 0,
-     NGX_ERROR_ERR,
-     NGX_ERROR_INFO,
-     NGX_ERROR_IGNORE_ECONNRESET,
-     NGX_ERROR_IGNORE_EINVAL
+    NGX_ERROR_ALERT = 0,
+    NGX_ERROR_ERR,
+    NGX_ERROR_INFO,
+    NGX_ERROR_IGNORE_ECONNRESET,
+    NGX_ERROR_IGNORE_EINVAL
 } ngx_connection_log_error_e;
 
 
 typedef enum {
-     NGX_TCP_NODELAY_UNSET = 0,
-     NGX_TCP_NODELAY_SET,
-     NGX_TCP_NODELAY_DISABLED
+    NGX_TCP_NODELAY_UNSET = 0,
+    NGX_TCP_NODELAY_SET,
+    NGX_TCP_NODELAY_DISABLED
 } ngx_connection_tcp_nodelay_e;
 
 
 typedef enum {
-     NGX_TCP_NOPUSH_UNSET = 0,
-     NGX_TCP_NOPUSH_SET,
-     NGX_TCP_NOPUSH_DISABLED
+    NGX_TCP_NOPUSH_UNSET = 0,
+    NGX_TCP_NOPUSH_SET,
+    NGX_TCP_NOPUSH_DISABLED
 } ngx_connection_tcp_nopush_e;
 
 
diff --git a/src/core/ngx_crypt.c b/src/core/ngx_crypt.c
index d7d068c..9db74f4 100644
--- a/src/core/ngx_crypt.c
+++ b/src/core/ngx_crypt.c
@@ -165,8 +165,8 @@ ngx_crypt_to64(u_char *p, uint32_t v, size_t n)
         "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
     while (n--) {
-       *p++ = itoa64[v & 0x3f];
-       v >>= 6;
+        *p++ = itoa64[v & 0x3f];
+        v >>= 6;
     }
 
     return p;
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 5785eb5..98599f3 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -1006,7 +1006,7 @@ ngx_int_t
 ngx_signal_process(ngx_cycle_t *cycle, char *sig)
 {
     ssize_t           n;
-    ngx_int_t         pid;
+    ngx_pid_t         pid;
     ngx_file_t        file;
     ngx_core_conf_t  *ccf;
     u_char            buf[NGX_INT64_LEN + 2];
@@ -1044,7 +1044,7 @@ ngx_signal_process(ngx_cycle_t *cycle, char *sig)
 
     pid = ngx_atoi(buf, ++n);
 
-    if (pid == NGX_ERROR) {
+    if (pid == (ngx_pid_t) NGX_ERROR) {
         ngx_log_error(NGX_LOG_ERR, cycle->log, 0,
                       "invalid PID number \"%*s\" in \"%s\"",
                       n, buf, file.name.data);
@@ -1313,7 +1313,7 @@ ngx_clean_old_cycles(ngx_event_t *ev)
             if (cycle[i]->connections[n].fd != (ngx_socket_t) -1) {
                 found = 1;
 
-                ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "live fd:%d", n);
+                ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "live fd:%ui", n);
 
                 break;
             }
@@ -1324,13 +1324,13 @@ ngx_clean_old_cycles(ngx_event_t *ev)
             continue;
         }
 
-        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "clean old cycle: %d", i);
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "clean old cycle: %ui", i);
 
         ngx_destroy_pool(cycle[i]->pool);
         cycle[i] = NULL;
     }
 
-    ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "old cycles status: %d", live);
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "old cycles status: %ui", live);
 
     if (live) {
         ngx_add_timer(ev, 30000);
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index cfdbb55..c51b7ff 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -79,35 +79,35 @@ struct ngx_cycle_s {
 
 
 typedef struct {
-     ngx_flag_t               daemon;
-     ngx_flag_t               master;
+    ngx_flag_t                daemon;
+    ngx_flag_t                master;
 
-     ngx_msec_t               timer_resolution;
+    ngx_msec_t                timer_resolution;
 
-     ngx_int_t                worker_processes;
-     ngx_int_t                debug_points;
+    ngx_int_t                 worker_processes;
+    ngx_int_t                 debug_points;
 
-     ngx_int_t                rlimit_nofile;
-     off_t                    rlimit_core;
+    ngx_int_t                 rlimit_nofile;
+    off_t                     rlimit_core;
 
-     int                      priority;
+    int                       priority;
 
-     ngx_uint_t               cpu_affinity_auto;
-     ngx_uint_t               cpu_affinity_n;
-     ngx_cpuset_t            *cpu_affinity;
+    ngx_uint_t                cpu_affinity_auto;
+    ngx_uint_t                cpu_affinity_n;
+    ngx_cpuset_t             *cpu_affinity;
 
-     char                    *username;
-     ngx_uid_t                user;
-     ngx_gid_t                group;
+    char                     *username;
+    ngx_uid_t                 user;
+    ngx_gid_t                 group;
 
-     ngx_str_t                working_directory;
-     ngx_str_t                lock_file;
+    ngx_str_t                 working_directory;
+    ngx_str_t                 lock_file;
 
-     ngx_str_t                pid;
-     ngx_str_t                oldpid;
+    ngx_str_t                 pid;
+    ngx_str_t                 oldpid;
 
-     ngx_array_t              env;
-     char                   **environment;
+    ngx_array_t               env;
+    char                    **environment;
 } ngx_core_conf_t;
 
 
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index d3e2ece..fc2dfd3 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -155,7 +155,7 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
 
 #if 0
     for (i = 0; i < file->name.len; i++) {
-         file->name.data[i] = 'X';
+        file->name.data[i] = 'X';
     }
 #endif
 
@@ -841,7 +841,7 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf)
 
         if ((size_t) n != len) {
             ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
-                          ngx_read_fd_n " has read only %z of %uz from %s",
+                          ngx_read_fd_n " has read only %z of %O from %s",
                           n, size, from);
             goto failed;
         }
@@ -856,7 +856,7 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf)
 
         if ((size_t) n != len) {
             ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
-                          ngx_write_fd_n " has written only %z of %uz to %s",
+                          ngx_write_fd_n " has written only %z of %O to %s",
                           n, size, to);
             goto failed;
         }
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 3bbadb8..a4e80ed 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -348,7 +348,7 @@ ngx_inet6_ntop(u_char *p, u_char *text, size_t len)
             continue;
         }
 
-        dst = ngx_sprintf(dst, "%uxi", p[i] * 256 + p[i + 1]);
+        dst = ngx_sprintf(dst, "%uxd", p[i] * 256 + p[i + 1]);
 
         if (i < 14) {
             *dst++ = ':';
@@ -1242,19 +1242,19 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
 #if (NGX_HAVE_UNIX_DOMAIN)
     case AF_UNIX:
 
-       /* TODO length */
+        /* TODO length */
 
-       saun1 = (struct sockaddr_un *) sa1;
-       saun2 = (struct sockaddr_un *) sa2;
+        saun1 = (struct sockaddr_un *) sa1;
+        saun2 = (struct sockaddr_un *) sa2;
 
-       if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path,
-                      sizeof(saun1->sun_path))
-           != 0)
-       {
-           return NGX_DECLINED;
-       }
+        if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path,
+                       sizeof(saun1->sun_path))
+            != 0)
+        {
+            return NGX_DECLINED;
+        }
 
-       break;
+        break;
 #endif
 
     default: /* AF_INET */
diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index 0893871..8e9408d 100644
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -33,14 +33,14 @@ typedef struct {
 
 static ngx_command_t  ngx_errlog_commands[] = {
 
-    {ngx_string("error_log"),
-     NGX_MAIN_CONF|NGX_CONF_1MORE,
-     ngx_error_log,
-     0,
-     0,
-     NULL},
+    { ngx_string("error_log"),
+      NGX_MAIN_CONF|NGX_CONF_1MORE,
+      ngx_error_log,
+      0,
+      0,
+      NULL },
 
-    ngx_null_command
+      ngx_null_command
 };
 
 
@@ -86,7 +86,7 @@ static ngx_str_t err_levels[] = {
 
 static const char *debug_levels[] = {
     "debug_core", "debug_alloc", "debug_mutex", "debug_event",
-    "debug_http", "debug_mail", "debug_mysql", "debug_stream"
+    "debug_http", "debug_mail", "debug_stream"
 };
 
 
@@ -585,7 +585,7 @@ ngx_log_set_log(ngx_conf_t *cf, ngx_log_t **head)
             return NGX_CONF_ERROR;
         }
 
-     } else if (ngx_strncmp(value[1].data, "memory:", 7) == 0) {
+    } else if (ngx_strncmp(value[1].data, "memory:", 7) == 0) {
 
 #if (NGX_DEBUG)
         size_t                 size, needed;
@@ -644,7 +644,7 @@ ngx_log_set_log(ngx_conf_t *cf, ngx_log_t **head)
         return NGX_CONF_ERROR;
 #endif
 
-     } else if (ngx_strncmp(value[1].data, "syslog:", 7) == 0) {
+    } else if (ngx_strncmp(value[1].data, "syslog:", 7) == 0) {
         peer = ngx_pcalloc(cf->pool, sizeof(ngx_syslog_peer_t));
         if (peer == NULL) {
             return NGX_CONF_ERROR;
diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h
index 618d3ad..afb73bf 100644
--- a/src/core/ngx_log.h
+++ b/src/core/ngx_log.h
@@ -29,8 +29,7 @@
 #define NGX_LOG_DEBUG_EVENT       0x080
 #define NGX_LOG_DEBUG_HTTP        0x100
 #define NGX_LOG_DEBUG_MAIL        0x200
-#define NGX_LOG_DEBUG_MYSQL       0x400
-#define NGX_LOG_DEBUG_STREAM      0x800
+#define NGX_LOG_DEBUG_STREAM      0x400
 
 /*
  * do not forget to update debug_levels[] in src/core/ngx_log.c
diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c
index f8bb2e3..b23ee78 100644
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -544,7 +544,7 @@ failed:
 
     if (ngx_close_file(fd) == NGX_FILE_ERROR) {
         ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                      ngx_close_file_n " \"%V\" failed", name);
+                      ngx_close_file_n " \"%s\" failed", name);
     }
 
     ngx_set_errno(err);
diff --git a/src/core/ngx_parse_time.c b/src/core/ngx_parse_time.c
index 831cc71..13afde3 100644
--- a/src/core/ngx_parse_time.c
+++ b/src/core/ngx_parse_time.c
@@ -220,7 +220,7 @@ ngx_parse_http_time(u_char *value, size_t len)
     }
 
     if (hour > 23 || min > 59 || sec > 59) {
-         return NGX_ERROR;
+        return NGX_ERROR;
     }
 
     if (day == 29 && month == 1) {
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 38bf956..3c52de8 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1873,7 +1873,7 @@ dns_error_name:
     ngx_log_error(r->log_level, r->log, 0,
                   "DNS error (%ui: %s), query id:%ui, name:\"%*s\"",
                   code, ngx_resolver_strerror(code), ident,
-                  rn->nlen, rn->name);
+                  (size_t) rn->nlen, rn->name);
     return;
 
 dns_error:
diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
index c112506..56e7765 100644
--- a/src/core/ngx_slab.c
+++ b/src/core/ngx_slab.c
@@ -222,11 +222,11 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 
                             if (bitmap[n] == NGX_SLAB_BUSY) {
                                 for (n = n + 1; n < map; n++) {
-                                     if (bitmap[n] != NGX_SLAB_BUSY) {
-                                         p = (uintptr_t) bitmap + i;
+                                    if (bitmap[n] != NGX_SLAB_BUSY) {
+                                        p = (uintptr_t) bitmap + i;
 
-                                         goto done;
-                                     }
+                                        goto done;
+                                    }
                                 }
 
                                 prev = (ngx_slab_page_t *)
@@ -392,7 +392,8 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 
 done:
 
-    ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0, "slab alloc: %p", p);
+    ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
+                   "slab alloc: %p", (void *) p);
 
     return (void *) p;
 }
diff --git a/src/core/ngx_syslog.c b/src/core/ngx_syslog.c
index 08f4c04..0a67928 100644
--- a/src/core/ngx_syslog.c
+++ b/src/core/ngx_syslog.c
@@ -10,9 +10,9 @@
 
 
 #define NGX_SYSLOG_MAX_STR                                                    \
-     NGX_MAX_ERROR_STR + sizeof("<255>Jan 01 00:00:00 ") - 1                  \
-     + (NGX_MAXHOSTNAMELEN - 1) + 1 /* space */                               \
-     + 32 /* tag */ + 2 /* colon, space */
+    NGX_MAX_ERROR_STR + sizeof("<255>Jan 01 00:00:00 ") - 1                   \
+    + (NGX_MAXHOSTNAMELEN - 1) + 1 /* space */                                \
+    + 32 /* tag */ + 2 /* colon, space */
 
 
 static char *ngx_syslog_parse_args(ngx_conf_t *cf, ngx_syslog_peer_t *peer);
diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c
index 595c122..843314a 100644
--- a/src/core/ngx_times.c
+++ b/src/core/ngx_times.c
@@ -154,7 +154,7 @@ ngx_time_update(void)
 
     p2 = &cached_http_log_time[slot][0];
 
-    (void) ngx_sprintf(p2, "%02d/%s/%d:%02d:%02d:%02d %c%02d%02d",
+    (void) ngx_sprintf(p2, "%02d/%s/%d:%02d:%02d:%02d %c%02i%02i",
                        tm.ngx_tm_mday, months[tm.ngx_tm_mon - 1],
                        tm.ngx_tm_year, tm.ngx_tm_hour,
                        tm.ngx_tm_min, tm.ngx_tm_sec,
@@ -163,7 +163,7 @@ ngx_time_update(void)
 
     p3 = &cached_http_log_iso8601[slot][0];
 
-    (void) ngx_sprintf(p3, "%4d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
+    (void) ngx_sprintf(p3, "%4d-%02d-%02dT%02d:%02d:%02d%c%02i:%02i",
                        tm.ngx_tm_year, tm.ngx_tm_mon,
                        tm.ngx_tm_mday, tm.ngx_tm_hour,
                        tm.ngx_tm_min, tm.ngx_tm_sec,
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index 081b0e5..828e4d1 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -902,7 +902,7 @@ ngx_epoll_eventfd_handler(ngx_event_t *ev)
         events = io_getevents(ngx_aio_ctx, 1, 64, event, &ts);
 
         ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                       "io_getevents: %l", events);
+                       "io_getevents: %d", events);
 
         if (events > 0) {
             ready -= events;
diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c
index 9184547..dafa27f 100644
--- a/src/event/modules/ngx_eventport_module.c
+++ b/src/event/modules/ngx_eventport_module.c
@@ -49,7 +49,7 @@ typedef struct  port_notify {
     void       *portnfy_user;   /* user defined */
 } port_notify_t;
 
-#if (__FreeBSD__) && (__FreeBSD_version < 700005)
+#if (__FreeBSD__ && __FreeBSD_version < 700005) || (NGX_DARWIN)
 
 typedef struct itimerspec {     /* definition per POSIX.4 */
     struct timespec it_interval;/* timer period */
@@ -526,18 +526,18 @@ ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
             ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                            "eventport: fd:%d, ev:%04Xd",
-                           event_list[i].portev_object, revents);
+                           (int) event_list[i].portev_object, revents);
 
             if (revents & (POLLERR|POLLHUP|POLLNVAL)) {
                 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                                "port_getn() error fd:%d ev:%04Xd",
-                               event_list[i].portev_object, revents);
+                               (int) event_list[i].portev_object, revents);
             }
 
             if (revents & ~(POLLIN|POLLOUT|POLLERR|POLLHUP|POLLNVAL)) {
                 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
                               "strange port_getn() events fd:%d ev:%04Xd",
-                              event_list[i].portev_object, revents);
+                              (int) event_list[i].portev_object, revents);
             }
 
             if ((revents & (POLLERR|POLLHUP|POLLNVAL))
@@ -615,7 +615,7 @@ ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
         default:
             ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
                           "unexpected eventport object %d",
-                          event_list[i].portev_object);
+                          (int) event_list[i].portev_object);
             continue;
         }
     }
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 5573cb2..ca3bfe4 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -579,7 +579,7 @@ ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
         if (event_list[i].flags & EV_ERROR) {
             ngx_log_error(NGX_LOG_ALERT, cycle->log, event_list[i].data,
                           "kevent() error on %d filter:%d flags:%04Xd",
-                          event_list[i].ident, event_list[i].filter,
+                          (int) event_list[i].ident, event_list[i].filter,
                           event_list[i].flags);
             continue;
         }
@@ -676,13 +676,20 @@ ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 static ngx_inline void
 ngx_kqueue_dump_event(ngx_log_t *log, struct kevent *kev)
 {
-    ngx_log_debug6(NGX_LOG_DEBUG_EVENT, log, 0,
-                   (kev->ident > 0x8000000 && kev->ident != (unsigned) -1) ?
-                    "kevent: %p: ft:%d fl:%04Xd ff:%08Xd d:%d ud:%p":
-                    "kevent: %d: ft:%d fl:%04Xd ff:%08Xd d:%d ud:%p",
-                    kev->ident, kev->filter,
-                    kev->flags, kev->fflags,
-                    kev->data, kev->udata);
+    if (kev->ident > 0x8000000 && kev->ident != (unsigned) -1) {
+        ngx_log_debug6(NGX_LOG_DEBUG_EVENT, log, 0,
+                       "kevent: %p: ft:%d fl:%04Xd ff:%08Xd d:%d ud:%p",
+                       (void *) kev->ident, kev->filter,
+                       kev->flags, kev->fflags,
+                       (int) kev->data, kev->udata);
+
+    } else {
+        ngx_log_debug6(NGX_LOG_DEBUG_EVENT, log, 0,
+                       "kevent: %d: ft:%d fl:%04Xd ff:%08Xd d:%d ud:%p",
+                       (int) kev->ident, kev->filter,
+                       kev->flags, kev->fflags,
+                       (int) kev->data, kev->udata);
+    }
 }
 
 
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 38f9b38..c8ae5b2 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -525,7 +525,7 @@ ngx_event_module_init(ngx_cycle_t *cycle)
     (void) ngx_atomic_cmp_set(ngx_connection_counter, 0, 1);
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                   "counter: %p, %d",
+                   "counter: %p, %uA",
                    ngx_connection_counter, *ngx_connection_counter);
 
     ngx_temp_number = (ngx_atomic_t *) (shared + 2 * cl);
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 591005a..ed0682c 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -188,7 +188,7 @@ typedef struct {
     ngx_int_t  (*notify)(ngx_event_handler_pt handler);
 
     ngx_int_t  (*process_events)(ngx_cycle_t *cycle, ngx_msec_t timer,
-                   ngx_uint_t flags);
+                                 ngx_uint_t flags);
 
     ngx_int_t  (*init)(ngx_cycle_t *cycle, ngx_msec_t timer);
     void       (*done)(ngx_cycle_t *cycle);
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index de10d48..de10296 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -39,6 +39,9 @@ ngx_int_t ngx_ssl_session_cache_init(ngx_shm_zone_t *shm_zone, void *data);
 static int ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn,
     ngx_ssl_session_t *sess);
 static ngx_ssl_session_t *ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn,
+#if OPENSSL_VERSION_NUMBER >= 0x10100003L
+    const
+#endif
     u_char *id, int len, int *copy);
 static void ngx_ssl_remove_session(SSL_CTX *ssl, ngx_ssl_session_t *sess);
 static void ngx_ssl_expire_sessions(ngx_ssl_session_cache_t *cache,
@@ -52,7 +55,7 @@ static int ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     HMAC_CTX *hctx, int enc);
 #endif
 
-#if (OPENSSL_VERSION_NUMBER < 0x10002002L || defined LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10002002L
 static ngx_int_t ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *str);
 #endif
 
@@ -108,6 +111,12 @@ int  ngx_ssl_stapling_index;
 ngx_int_t
 ngx_ssl_init(ngx_log_t *log)
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10100003L
+
+    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
+
+#else
+
 #ifndef OPENSSL_IS_BORINGSSL
     OPENSSL_config(NULL);
 #endif
@@ -117,6 +126,8 @@ ngx_ssl_init(ngx_log_t *log)
 
     OpenSSL_add_all_algorithms();
 
+#endif
+
 #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
 #ifndef SSL_OP_NO_COMPRESSION
     {
@@ -747,7 +758,7 @@ ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export,
         return NULL;
     }
 
-#ifndef OPENSSL_NO_DEPRECATED
+#if (OPENSSL_VERSION_NUMBER < 0x10100003L && !defined OPENSSL_NO_DEPRECATED)
 
     if (key == NULL) {
         key = RSA_generate_key(512, RSA_F4, NULL, NULL);
@@ -1596,7 +1607,7 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
             }
 
             ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                           "SSL buf copy: %d", size);
+                           "SSL buf copy: %z", size);
 
             ngx_memcpy(buf->last, in->buf->pos, size);
 
@@ -1668,7 +1679,7 @@ ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size)
 
     ngx_ssl_clear_error(c->log);
 
-    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL to write: %d", size);
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL to write: %uz", size);
 
     n = SSL_write(c->ssl->connection, data, size);
 
@@ -1956,6 +1967,7 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
             || n == SSL_R_INAPPROPRIATE_FALLBACK                     /*  373 */
 #endif
             || n == 1000 /* SSL_R_SSLV3_ALERT_CLOSE_NOTIFY */
+#ifdef SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE
             || n == SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE             /* 1010 */
             || n == SSL_R_SSLV3_ALERT_BAD_RECORD_MAC                 /* 1020 */
             || n == SSL_R_TLSV1_ALERT_DECRYPTION_FAILED              /* 1021 */
@@ -1978,7 +1990,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
             || n == SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY          /* 1071 */
             || n == SSL_R_TLSV1_ALERT_INTERNAL_ERROR                 /* 1080 */
             || n == SSL_R_TLSV1_ALERT_USER_CANCELLED                 /* 1090 */
-            || n == SSL_R_TLSV1_ALERT_NO_RENEGOTIATION)              /* 1100 */
+            || n == SSL_R_TLSV1_ALERT_NO_RENEGOTIATION               /* 1100 */
+#endif
+            )
         {
             switch (c->log_error) {
 
@@ -2143,7 +2157,7 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
     int                   n, i;
     X509                 *cert;
     X509_NAME            *name;
-    EVP_MD_CTX            md;
+    EVP_MD_CTX           *md;
     unsigned int          len;
     STACK_OF(X509_NAME)  *list;
     u_char                buf[EVP_MAX_MD_SIZE];
@@ -2153,15 +2167,18 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
      * the server certificate, and the client CA list.
      */
 
-    EVP_MD_CTX_init(&md);
+    md = EVP_MD_CTX_create();
+    if (md == NULL) {
+        return NGX_ERROR;
+    }
 
-    if (EVP_DigestInit_ex(&md, EVP_sha1(), NULL) == 0) {
+    if (EVP_DigestInit_ex(md, EVP_sha1(), NULL) == 0) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                       "EVP_DigestInit_ex() failed");
         goto failed;
     }
 
-    if (EVP_DigestUpdate(&md, sess_ctx->data, sess_ctx->len) == 0) {
+    if (EVP_DigestUpdate(md, sess_ctx->data, sess_ctx->len) == 0) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                       "EVP_DigestUpdate() failed");
         goto failed;
@@ -2175,7 +2192,7 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
         goto failed;
     }
 
-    if (EVP_DigestUpdate(&md, buf, len) == 0) {
+    if (EVP_DigestUpdate(md, buf, len) == 0) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                       "EVP_DigestUpdate() failed");
         goto failed;
@@ -2195,7 +2212,7 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
                 goto failed;
             }
 
-            if (EVP_DigestUpdate(&md, buf, len) == 0) {
+            if (EVP_DigestUpdate(md, buf, len) == 0) {
                 ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                               "EVP_DigestUpdate() failed");
                 goto failed;
@@ -2203,13 +2220,13 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
         }
     }
 
-    if (EVP_DigestFinal_ex(&md, buf, &len) == 0) {
+    if (EVP_DigestFinal_ex(md, buf, &len) == 0) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                       "EVP_DigestUpdate() failed");
         goto failed;
     }
 
-    EVP_MD_CTX_cleanup(&md);
+    EVP_MD_CTX_destroy(md);
 
     if (SSL_CTX_set_session_id_context(ssl->ctx, buf, len) == 0) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
@@ -2221,7 +2238,7 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
 
 failed:
 
-    EVP_MD_CTX_cleanup(&md);
+    EVP_MD_CTX_destroy(md);
 
     return NGX_ERROR;
 }
@@ -2442,8 +2459,11 @@ failed:
 
 
 static ngx_ssl_session_t *
-ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn, u_char *id, int len,
-    int *copy)
+ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn,
+#if OPENSSL_VERSION_NUMBER >= 0x10100003L
+    const
+#endif
+    u_char *id, int len, int *copy)
 {
 #if OPENSSL_VERSION_NUMBER >= 0x0090707fL
     const
@@ -2460,7 +2480,7 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn, u_char *id, int len,
     u_char                    buf[NGX_SSL_MAX_SESSION_SIZE];
     ngx_connection_t         *c;
 
-    hash = ngx_crc32_short(id, (size_t) len);
+    hash = ngx_crc32_short((u_char *) (uintptr_t) id, (size_t) len);
     *copy = 0;
 
     c = ngx_ssl_get_connection(ssl_conn);
@@ -2498,7 +2518,8 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn, u_char *id, int len,
 
         sess_id = (ngx_ssl_sess_id_t *) node;
 
-        rc = ngx_memn2cmp(id, sess_id->id, (size_t) len, (size_t) node->data);
+        rc = ngx_memn2cmp((u_char *) (uintptr_t) id, sess_id->id,
+                          (size_t) len, (size_t) node->data);
 
         if (rc == 0) {
 
@@ -2542,9 +2563,9 @@ done:
 void
 ngx_ssl_remove_cached_session(SSL_CTX *ssl, ngx_ssl_session_t *sess)
 {
-     SSL_CTX_remove_session(ssl, sess);
+    SSL_CTX_remove_session(ssl, sess);
 
-     ngx_ssl_remove_session(ssl, sess);
+    ngx_ssl_remove_session(ssl, sess);
 }
 
 
@@ -2944,7 +2965,7 @@ ngx_ssl_check_host(ngx_connection_t *c, ngx_str_t *name)
         return NGX_ERROR;
     }
 
-#if (OPENSSL_VERSION_NUMBER >= 0x10002002L && !defined LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10002002L
 
     /* X509_check_host() is only available in OpenSSL 1.0.2+ */
 
@@ -3061,7 +3082,7 @@ found:
 }
 
 
-#if (OPENSSL_VERSION_NUMBER < 0x10002002L || defined LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10002002L
 
 static ngx_int_t
 ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *pattern)
@@ -3538,8 +3559,12 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 static void
 ngx_openssl_exit(ngx_cycle_t *cycle)
 {
+#if OPENSSL_VERSION_NUMBER < 0x10100003L
+
     EVP_cleanup();
 #ifndef OPENSSL_NO_ENGINE
     ENGINE_cleanup();
 #endif
+
+#endif
 }
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index c86be2a..09654db 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -33,6 +33,23 @@
 #define NGX_SSL_NAME     "OpenSSL"
 
 
+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
+#undef OPENSSL_VERSION_NUMBER
+#define OPENSSL_VERSION_NUMBER  0x1000107fL
+#endif
+
+
+#if (OPENSSL_VERSION_NUMBER >= 0x10100001L)
+
+#define ngx_ssl_version()       OpenSSL_version(OPENSSL_VERSION)
+
+#else
+
+#define ngx_ssl_version()       SSLeay_version(SSLEAY_VERSION)
+
+#endif
+
+
 #define ngx_ssl_session_t       SSL_SESSION
 #define ngx_ssl_conn_t          SSL
 
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index fa77678..5322b1b 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -285,7 +285,11 @@ ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl)
     for (i = 0; i < n; i++) {
         issuer = sk_X509_value(chain, i);
         if (X509_check_issued(issuer, cert) == X509_V_OK) {
+#if OPENSSL_VERSION_NUMBER >= 0x10100001L
+            X509_up_ref(issuer);
+#else
             CRYPTO_add(&issuer->references, 1, CRYPTO_LOCK_X509);
+#endif
 
             ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ssl->log, 0,
                            "SSL get issuer: found %p in extra certs", issuer);
@@ -1219,7 +1223,7 @@ ngx_ssl_ocsp_create_request(ngx_ssl_ocsp_ctx_t *ctx)
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
                    "ssl ocsp request length %z, escape %d",
-                   base64.len, escape);
+                   base64.len, (int) escape);
 
     len = sizeof("GET ") - 1 + ctx->uri.len + sizeof("/") - 1
           + base64.len + 2 * escape + sizeof(" HTTP/1.0" CRLF) - 1
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index ee86c7e..5ce59ae 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -434,7 +434,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
             /* STUB */ cl->buf->num = p->num++;
 
             if (p->input_filter(p, cl->buf) == NGX_ERROR) {
-                 return NGX_ABORT;
+                return NGX_ABORT;
             }
 
             ngx_free_chain(p->pool, cl);
@@ -660,7 +660,7 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
     flush:
 
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, p->log, 0,
-                       "pipe write: out:%p, f:%d", out, flush);
+                       "pipe write: out:%p, f:%ui", out, flush);
 
         if (out == NULL) {
 
@@ -801,12 +801,12 @@ ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p)
         }
 
         if (cl) {
-           p->in = cl;
-           *ll = NULL;
+            p->in = cl;
+            *ll = NULL;
 
         } else {
-           p->in = NULL;
-           p->last_in = &p->in;
+            p->in = NULL;
+            p->last_in = &p->in;
         }
 
     } else {
diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c
index 8ec5329..1e7a0c2 100644
--- a/src/http/modules/ngx_http_auth_basic_module.c
+++ b/src/http/modules/ngx_http_auth_basic_module.c
@@ -298,7 +298,7 @@ ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r,
                    &encrypted);
 
     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "rc: %d user: \"%V\" salt: \"%s\"",
+                   "rc: %i user: \"%V\" salt: \"%s\"",
                    rc, &r->headers_in.user, passwd->data);
 
     if (rc == NGX_OK) {
diff --git a/src/http/modules/ngx_http_auth_request_module.c b/src/http/modules/ngx_http_auth_request_module.c
index b4307be..bab79e4 100644
--- a/src/http/modules/ngx_http_auth_request_module.c
+++ b/src/http/modules/ngx_http_auth_request_module.c
@@ -168,7 +168,7 @@ ngx_http_auth_request_handler(ngx_http_request_t *r)
         }
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "auth request unexpected status: %d", ctx->status);
+                      "auth request unexpected status: %ui", ctx->status);
 
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -219,7 +219,7 @@ ngx_http_auth_request_done(ngx_http_request_t *r, void *data, ngx_int_t rc)
     ngx_http_auth_request_ctx_t   *ctx = data;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "auth request done s:%d", r->headers_out.status);
+                   "auth request done s:%ui", r->headers_out.status);
 
     ctx->done = 1;
     ctx->status = r->headers_out.status;
diff --git a/src/http/modules/ngx_http_chunked_filter_module.c b/src/http/modules/ngx_http_chunked_filter_module.c
index 0059a98..ac2e3e8 100644
--- a/src/http/modules/ngx_http_chunked_filter_module.c
+++ b/src/http/modules/ngx_http_chunked_filter_module.c
@@ -121,7 +121,7 @@ ngx_http_chunked_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     for ( ;; ) {
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http chunk: %d", ngx_buf_size(cl->buf));
+                       "http chunk: %O", ngx_buf_size(cl->buf));
 
         size += ngx_buf_size(cl->buf);
 
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index b9fadd0..3600265 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -621,11 +621,11 @@ destination_done:
     if ((r->uri.data[r->uri.len - 1] == '/' && *(last - 1) != '/')
         || (r->uri.data[r->uri.len - 1] != '/' && *(last - 1) == '/'))
     {
-         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                       "both URI \"%V\" and \"Destination\" URI \"%V\" "
-                       "should be either collections or non-collections",
-                       &r->uri, &dest->value);
-         return NGX_HTTP_CONFLICT;
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "both URI \"%V\" and \"Destination\" URI \"%V\" "
+                      "should be either collections or non-collections",
+                      &r->uri, &dest->value);
+        return NGX_HTTP_CONFLICT;
     }
 
     depth = ngx_http_dav_depth(r, NGX_HTTP_DAV_INFINITY_DEPTH);
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index e3024b3..a861203 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -751,7 +751,7 @@ ngx_http_fastcgi_eval(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf)
     url.no_resolve = 1;
 
     if (ngx_parse_url(r->pool, &url) != NGX_OK) {
-         if (url.err) {
+        if (url.err) {
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                           "%s in upstream \"%V\"", url.err, &url.url);
         }
@@ -1653,7 +1653,7 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
                 && f->type != NGX_HTTP_FASTCGI_STDERR)
             {
                 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                              "upstream sent unexpected FastCGI record: %d",
+                              "upstream sent unexpected FastCGI record: %ui",
                               f->type);
 
                 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
@@ -1800,7 +1800,7 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
 
             } else {
                 r->cache->header_start += u->buffer.pos - start
-                                           - sizeof(ngx_http_fastcgi_header_t);
+                                          - sizeof(ngx_http_fastcgi_header_t);
             }
 
             f->large_stderr = 0;
@@ -1834,7 +1834,7 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
             rc = ngx_http_parse_header_line(r, &u->buffer, 1);
 
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http fastcgi parser: %d", rc);
+                           "http fastcgi parser: %i", rc);
 
             if (rc == NGX_AGAIN) {
                 break;
@@ -2505,7 +2505,7 @@ ngx_http_fastcgi_non_buffered_filter(void *data, ssize_t bytes)
 
         for (cl = u->out_bufs; cl; cl = cl->next) {
             ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http fastcgi in memory %p-%p %uz",
+                           "http fastcgi in memory %p-%p %O",
                            cl->buf->pos, cl->buf->last, ngx_buf_size(cl->buf));
 
             if (buf->last == cl->buf->pos) {
@@ -2558,8 +2558,8 @@ ngx_http_fastcgi_process_record(ngx_http_request_t *r,
             case NGX_HTTP_FASTCGI_STDOUT:
             case NGX_HTTP_FASTCGI_STDERR:
             case NGX_HTTP_FASTCGI_END_REQUEST:
-                 f->type = (ngx_uint_t) ch;
-                 break;
+                f->type = (ngx_uint_t) ch;
+                break;
             default:
                 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                               "upstream sent invalid FastCGI "
@@ -2654,7 +2654,7 @@ ngx_http_fastcgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
 static ngx_int_t
 ngx_http_fastcgi_add_variables(ngx_conf_t *cf)
 {
-   ngx_http_variable_t  *var, *v;
+    ngx_http_variable_t  *var, *v;
 
     for (v = ngx_http_fastcgi_vars; v->name.len; v++) {
         var = ngx_http_add_variable(cf, &v->name, v->flags);
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index f941e63..536fdf8 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -1009,14 +1009,14 @@ ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
         ctx->allocated -= alloc;
 
         ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
-                       "gzip alloc: n:%ud s:%ud a:%ud p:%p",
+                       "gzip alloc: n:%ud s:%ud a:%ui p:%p",
                        items, size, alloc, p);
 
         return p;
     }
 
     ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0,
-                  "gzip filter failed to use preallocated memory: %ud of %ud",
+                  "gzip filter failed to use preallocated memory: %ud of %ui",
                   items * size, ctx->allocated);
 
     p = ngx_palloc(ctx->request->pool, items * size);
diff --git a/src/http/modules/ngx_http_image_filter_module.c b/src/http/modules/ngx_http_image_filter_module.c
index bd7a309..b608de1 100644
--- a/src/http/modules/ngx_http_image_filter_module.c
+++ b/src/http/modules/ngx_http_image_filter_module.c
@@ -144,7 +144,7 @@ static ngx_command_t  ngx_http_image_filter_commands[] = {
       offsetof(ngx_http_image_filter_conf_t, transparency),
       NULL },
 
-   { ngx_string("image_filter_interlace"),
+    { ngx_string("image_filter_interlace"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
@@ -737,7 +737,7 @@ ngx_http_image_size(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "image size: %d x %d", width, height);
+                   "image size: %d x %d", (int) width, (int) height);
 
     ctx->width = width;
     ctx->height = height;
diff --git a/src/http/modules/ngx_http_limit_conn_module.c b/src/http/modules/ngx_http_limit_conn_module.c
index 4379311..913d599 100644
--- a/src/http/modules/ngx_http_limit_conn_module.c
+++ b/src/http/modules/ngx_http_limit_conn_module.c
@@ -232,7 +232,7 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "limit conn: %08XD %d", node->key, lc->conn);
+                       "limit conn: %08Xi %d", node->key, lc->conn);
 
         ngx_shmtx_unlock(&shpool->mutex);
 
@@ -351,7 +351,7 @@ ngx_http_limit_conn_cleanup(void *data)
     ngx_shmtx_lock(&shpool->mutex);
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, lccln->shm_zone->shm.log, 0,
-                   "limit conn cleanup: %08XD %d", node->key, lc->conn);
+                   "limit conn cleanup: %08Xi %d", node->key, lc->conn);
 
     lc->conn--;
 
diff --git a/src/http/modules/ngx_http_map_module.c b/src/http/modules/ngx_http_map_module.c
index 2b80d0f..091ff09 100644
--- a/src/http/modules/ngx_http_map_module.c
+++ b/src/http/modules/ngx_http_map_module.c
@@ -141,7 +141,7 @@ ngx_http_map_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
     *v = *value;
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http map: \"%v\" \"%v\"", &val, v);
+                   "http map: \"%V\" \"%v\"", &val, v);
 
     return NGX_OK;
 }
diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
index 8341b92..d31996a 100644
--- a/src/http/modules/ngx_http_memcached_module.c
+++ b/src/http/modules/ngx_http_memcached_module.c
@@ -523,7 +523,7 @@ ngx_http_memcached_filter(void *data, ssize_t bytes)
     cl->buf->tag = u->output.tag;
 
     ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
-                   "memcached filter bytes:%z size:%z length:%z rest:%z",
+                   "memcached filter bytes:%z size:%z length:%O rest:%z",
                    bytes, b->last - b->pos, u->length, ctx->rest);
 
     if (bytes <= (ssize_t) (u->length - NGX_HTTP_MEMCACHED_END)) {
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 980bf57..6cb3ccf 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -913,7 +913,7 @@ ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4,
 
         ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
                        "mp4 atom: %*s @%O:%uL",
-                       4, atom_name, mp4->offset, atom_size);
+                       (size_t) 4, atom_name, mp4->offset, atom_size);
 
         if (atom_size > (uint64_t) (NGX_MAX_OFF_T_VALUE - mp4->offset)
             || mp4->offset + (off_t) atom_size > end)
@@ -1958,7 +1958,7 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
                    "stsd entries:%uD, media:%*s",
                    ngx_mp4_get_32value(stsd_atom->entries),
-                   4, stsd_atom->media_name);
+                   (size_t) 4, stsd_atom->media_name);
 
     trak = ngx_mp4_last_trak(mp4);
 
@@ -2555,14 +2555,14 @@ ngx_http_mp4_crop_ctts_data(ngx_http_mp4_file_t *mp4,
                        "sample:%uD, count:%uD, offset:%uD",
                        start_sample, count, ngx_mp4_get_32value(entry->offset));
 
-         if (start_sample <= count) {
-             rest = start_sample - 1;
-             goto found;
-         }
+        if (start_sample <= count) {
+            rest = start_sample - 1;
+            goto found;
+        }
 
-         start_sample -= count;
-         entries--;
-         entry++;
+        start_sample -= count;
+        entries--;
+        entry++;
     }
 
     if (start) {
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 5005b6b..c24ef17 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -1559,7 +1559,7 @@ ngx_http_proxy_body_output_filter(void *data, ngx_chain_t *in)
 
     for ( ;; ) {
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "proxy output chunk: %d", ngx_buf_size(cl->buf));
+                       "proxy output chunk: %O", ngx_buf_size(cl->buf));
 
         size += ngx_buf_size(cl->buf);
 
@@ -1917,7 +1917,7 @@ ngx_http_proxy_input_filter_init(void *data)
     }
 
     ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http proxy filter init s:%d h:%d c:%d l:%O",
+                   "http proxy filter init s:%ui h:%d c:%d l:%O",
                    u->headers_in.status_n, ctx->head, u->headers_in.chunked,
                    u->headers_in.content_length_n);
 
@@ -2125,7 +2125,7 @@ ngx_http_proxy_chunked_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http proxy chunked state %d, length %d",
+                   "http proxy chunked state %ui, length %O",
                    ctx->chunked.state, p->length);
 
     if (b) {
@@ -2299,7 +2299,7 @@ ngx_http_proxy_non_buffered_chunked_filter(void *data, ssize_t bytes)
 
         for (cl = u->out_bufs; cl; cl = cl->next) {
             ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http proxy in memory %p-%p %uz",
+                           "http proxy in memory %p-%p %O",
                            cl->buf->pos, cl->buf->last, ngx_buf_size(cl->buf));
 
             if (buf->last == cl->buf->pos) {
diff --git a/src/http/modules/ngx_http_random_index_module.c b/src/http/modules/ngx_http_random_index_module.c
index b0f0e08..b47ee4f 100644
--- a/src/http/modules/ngx_http_random_index_module.c
+++ b/src/http/modules/ngx_http_random_index_module.c
@@ -230,7 +230,7 @@ ngx_http_random_index_handler(ngx_http_request_t *r)
 
     if (ngx_close_dir(&dir) == NGX_ERROR) {
         ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
-                      ngx_close_dir_n " \"%s\" failed", &path);
+                      ngx_close_dir_n " \"%V\" failed", &path);
     }
 
     n = names.nelts;
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index b07b2e2..57065e1 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -207,7 +207,7 @@ ngx_http_range_header_filter(ngx_http_request_t *r)
         if_range_time = ngx_parse_http_time(if_range->data, if_range->len);
 
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http ir:%d lm:%d",
+                       "http ir:%T lm:%T",
                        if_range_time, r->headers_out.last_modified_time);
 
         if (if_range_time != r->headers_out.last_modified_time) {
@@ -665,7 +665,7 @@ ngx_http_range_test_overlapped(ngx_http_request_t *r,
         range = ctx->ranges.elts;
         for (i = 0; i < ctx->ranges.nelts; i++) {
             if (start > range[i].start || last < range[i].end) {
-                 goto overlapped;
+                goto overlapped;
             }
         }
     }
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index c3d7ebe..b7befe6 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -328,8 +328,8 @@ ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #if (NGX_HAVE_UNIX_DOMAIN)
 
     if (ngx_strcmp(value[1].data, "unix:") == 0) {
-         cidr->family = AF_UNIX;
-         return NGX_CONF_OK;
+        cidr->family = AF_UNIX;
+        return NGX_CONF_OK;
     }
 
 #endif
diff --git a/src/http/modules/ngx_http_referer_module.c b/src/http/modules/ngx_http_referer_module.c
index b417eb2..3f0f78e 100644
--- a/src/http/modules/ngx_http_referer_module.c
+++ b/src/http/modules/ngx_http_referer_module.c
@@ -109,7 +109,7 @@ ngx_module_t  ngx_http_referer_module = {
 
 static ngx_int_t
 ngx_http_referer_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
-     uintptr_t data)
+    uintptr_t data)
 {
     u_char                    *p, *ref, *last;
     size_t                     len;
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index 2ec7f5d..6b2444c 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -571,7 +571,7 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
             mconf = module->create_loc_conf(cf);
             if (mconf == NULL) {
-                 return NGX_CONF_ERROR;
+                return NGX_CONF_ERROR;
             }
 
             ctx->loc_conf[cf->cycle->modules[i]->ctx_index] = mconf;
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index b468eb7..f09617e 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -876,7 +876,7 @@ ngx_http_scgi_create_request(ngx_http_request_t *r)
         next:
 
             continue;
-         }
+        }
     }
 
     *b->last++ = (u_char) ',';
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index 8236320..b997aaa 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -468,12 +468,12 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         while (ctx->pos < ctx->buf->last) {
 
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "saved: %d state: %d", ctx->saved, ctx->state);
+                           "saved: %uz state: %ui", ctx->saved, ctx->state);
 
             rc = ngx_http_ssi_parse(r, ctx);
 
             ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "parse: %d, looked: %d %p-%p",
+                           "parse: %i, looked: %uz %p-%p",
                            rc, ctx->looked, ctx->copy_start, ctx->copy_end);
 
             if (rc == NGX_ERROR) {
@@ -485,7 +485,7 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
                 if (ctx->output) {
 
                     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                                   "saved: %d", ctx->saved);
+                                   "saved: %uz", ctx->saved);
 
                     if (ctx->saved) {
 
@@ -1911,7 +1911,7 @@ ngx_http_ssi_regex_match(ngx_http_request_t *r, ngx_str_t *pattern,
 
     if (rc < NGX_REGEX_NO_MATCHED) {
         ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-                      ngx_regex_exec_n " failed: %i on \"%V\" using \"%V\"",
+                      ngx_regex_exec_n " failed: %d on \"%V\" using \"%V\"",
                       rc, str, pattern);
         return NGX_HTTP_SSI_ERROR;
     }
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 7b051ea..6a4108c 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -337,8 +337,9 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
 
 #if (NGX_DEBUG)
     for (i = 0; i < inlen; i += in[i] + 1) {
-         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                        "SSL ALPN supported by client: %*s", in[i], &in[i + 1]);
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "SSL ALPN supported by client: %*s",
+                       (size_t) in[i], &in[i + 1]);
     }
 #endif
 
@@ -365,7 +366,7 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "SSL ALPN selected: %*s", *outlen, *out);
+                   "SSL ALPN selected: %*s", (size_t) *outlen, *out);
 
     return SSL_TLSEXT_ERR_OK;
 }
@@ -717,7 +718,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
     }
 
-#ifndef LIBRESSL_VERSION_NUMBER
+#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
     /* a temporary 512-bit RSA key is required for export versions of MSIE */
     SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback);
 #endif
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index 7bf6e19..bb1c50b 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -341,7 +341,7 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
             rc = ngx_http_sub_parse(r, ctx);
 
             ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "parse: %d, looked: \"%V\" %p-%p",
+                           "parse: %i, looked: \"%V\" %p-%p",
                            rc, &ctx->looked, ctx->copy_start, ctx->copy_end);
 
             if (rc == NGX_ERROR) {
diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c
index 401b58e..8a5f0fa 100644
--- a/src/http/modules/ngx_http_upstream_ip_hash_module.c
+++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c
@@ -199,7 +199,7 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "get ip hash peer, hash: %ui %04XA", p, m);
+                       "get ip hash peer, hash: %ui %04XL", p, (uint64_t) m);
 
         if (peer->down) {
             goto next;
diff --git a/src/http/modules/ngx_http_upstream_least_conn_module.c b/src/http/modules/ngx_http_upstream_least_conn_module.c
index 92951bd..8a300c1 100644
--- a/src/http/modules/ngx_http_upstream_least_conn_module.c
+++ b/src/http/modules/ngx_http_upstream_least_conn_module.c
@@ -259,7 +259,7 @@ failed:
                 / (8 * sizeof(uintptr_t));
 
         for (i = 0; i < n; i++) {
-             rrp->tried[i] = 0;
+            rrp->tried[i] = 0;
         }
 
         ngx_http_upstream_rr_peers_unlock(peers);
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index b88e869..bd36aec 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1222,7 +1222,7 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
             }
 
             name = path.data + root;
-         }
+        }
 
         if (tf->values == NULL) {
 
@@ -1597,7 +1597,8 @@ ngx_http_core_find_static_location(ngx_http_request_t *r,
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "test location: \"%*s\"", node->len, node->name);
+                       "test location: \"%*s\"",
+                       (size_t) node->len, node->name);
 
         n = (len <= (size_t) node->len) ? len : node->len;
 
@@ -3104,7 +3105,7 @@ ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
             ctx->loc_conf[cf->cycle->modules[i]->ctx_index] =
                                                    module->create_loc_conf(cf);
             if (ctx->loc_conf[cf->cycle->modules[i]->ctx_index] == NULL) {
-                 return NGX_CONF_ERROR;
+                return NGX_CONF_ERROR;
             }
         }
     }
@@ -4540,21 +4541,21 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
 
 static ngx_http_method_name_t  ngx_methods_names[] = {
-   { (u_char *) "GET",       (uint32_t) ~NGX_HTTP_GET },
-   { (u_char *) "HEAD",      (uint32_t) ~NGX_HTTP_HEAD },
-   { (u_char *) "POST",      (uint32_t) ~NGX_HTTP_POST },
-   { (u_char *) "PUT",       (uint32_t) ~NGX_HTTP_PUT },
-   { (u_char *) "DELETE",    (uint32_t) ~NGX_HTTP_DELETE },
-   { (u_char *) "MKCOL",     (uint32_t) ~NGX_HTTP_MKCOL },
-   { (u_char *) "COPY",      (uint32_t) ~NGX_HTTP_COPY },
-   { (u_char *) "MOVE",      (uint32_t) ~NGX_HTTP_MOVE },
-   { (u_char *) "OPTIONS",   (uint32_t) ~NGX_HTTP_OPTIONS },
-   { (u_char *) "PROPFIND",  (uint32_t) ~NGX_HTTP_PROPFIND },
-   { (u_char *) "PROPPATCH", (uint32_t) ~NGX_HTTP_PROPPATCH },
-   { (u_char *) "LOCK",      (uint32_t) ~NGX_HTTP_LOCK },
-   { (u_char *) "UNLOCK",    (uint32_t) ~NGX_HTTP_UNLOCK },
-   { (u_char *) "PATCH",     (uint32_t) ~NGX_HTTP_PATCH },
-   { NULL, 0 }
+    { (u_char *) "GET",       (uint32_t) ~NGX_HTTP_GET },
+    { (u_char *) "HEAD",      (uint32_t) ~NGX_HTTP_HEAD },
+    { (u_char *) "POST",      (uint32_t) ~NGX_HTTP_POST },
+    { (u_char *) "PUT",       (uint32_t) ~NGX_HTTP_PUT },
+    { (u_char *) "DELETE",    (uint32_t) ~NGX_HTTP_DELETE },
+    { (u_char *) "MKCOL",     (uint32_t) ~NGX_HTTP_MKCOL },
+    { (u_char *) "COPY",      (uint32_t) ~NGX_HTTP_COPY },
+    { (u_char *) "MOVE",      (uint32_t) ~NGX_HTTP_MOVE },
+    { (u_char *) "OPTIONS",   (uint32_t) ~NGX_HTTP_OPTIONS },
+    { (u_char *) "PROPFIND",  (uint32_t) ~NGX_HTTP_PROPFIND },
+    { (u_char *) "PROPPATCH", (uint32_t) ~NGX_HTTP_PROPPATCH },
+    { (u_char *) "LOCK",      (uint32_t) ~NGX_HTTP_LOCK },
+    { (u_char *) "UNLOCK",    (uint32_t) ~NGX_HTTP_UNLOCK },
+    { (u_char *) "PATCH",     (uint32_t) ~NGX_HTTP_PATCH },
+    { NULL, 0 }
 };
 
 
@@ -4627,7 +4628,7 @@ ngx_http_core_limit_except(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
             mconf = module->create_loc_conf(cf);
             if (mconf == NULL) {
-                 return NGX_CONF_ERROR;
+                return NGX_CONF_ERROR;
             }
 
             ctx->loc_conf[cf->cycle->modules[i]->ctx_index] = mconf;
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 231c507..6c446a0 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -232,10 +232,10 @@ typedef struct {
 
 
 typedef struct {
-     ngx_hash_combined_t       names;
+    ngx_hash_combined_t        names;
 
-     ngx_uint_t                nregex;
-     ngx_http_server_name_t   *regex;
+    ngx_uint_t                 nregex;
+    ngx_http_server_name_t    *regex;
 } ngx_http_virtual_names_t;
 
 
@@ -544,7 +544,7 @@ typedef ngx_int_t (*ngx_http_request_body_filter_pt)
 ngx_int_t ngx_http_output_filter(ngx_http_request_t *r, ngx_chain_t *chain);
 ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *chain);
 ngx_int_t ngx_http_request_body_save_filter(ngx_http_request_t *r,
-   ngx_chain_t *chain);
+    ngx_chain_t *chain);
 
 
 ngx_int_t ngx_http_set_disable_symlinks(ngx_http_request_t *r,
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 3561028..37cd377 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1834,7 +1834,7 @@ ngx_http_file_cache_expire(ngx_http_file_cache_t *cache)
 
         ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
                       "ignore long locked inactive cache entry %*s, count:%d",
-                      2 * NGX_HTTP_CACHE_KEY_LEN, key, fcn->count);
+                      (size_t) 2 * NGX_HTTP_CACHE_KEY_LEN, key, fcn->count);
     }
 
     ngx_shmtx_unlock(&cache->shpool->mutex);
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index fd790e1..7d6cada 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -648,7 +648,7 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
 
     err = ngx_socket_errno;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, rev->log, 0, "http recv(): %d", n);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, rev->log, 0, "http recv(): %z", n);
 
     if (n == -1) {
         if (err == NGX_EAGAIN) {
@@ -1500,7 +1500,7 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http large header copy: %d", r->header_in->pos - old);
+                   "http large header copy: %uz", r->header_in->pos - old);
 
     new = b->start;
 
@@ -2264,7 +2264,7 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
     c = r->connection;
 
     ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http finalize request: %d, \"%V?%V\" a:%d, c:%d",
+                   "http finalize request: %i, \"%V?%V\" a:%d, c:%d",
                    rc, &r->uri, &r->args, r == c->data, r->main->count);
 
     if (rc == NGX_DONE) {
@@ -2956,7 +2956,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
         b->last = b->start;
     }
 
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc free: %p %d",
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc free: %p %i",
                    hc->free, hc->nfree);
 
     if (hc->free) {
@@ -2968,7 +2968,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
         hc->nfree = 0;
     }
 
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc busy: %p %d",
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc busy: %p %i",
                    hc->busy, hc->nbusy);
 
     if (hc->busy) {
@@ -3259,7 +3259,7 @@ ngx_http_lingering_close_handler(ngx_event_t *rev)
     do {
         n = c->recv(c, buffer, NGX_HTTP_LINGERING_BUFFER_SIZE);
 
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "lingering read: %d", n);
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "lingering read: %z", n);
 
         if (n == NGX_ERROR || n == 0) {
             ngx_http_close_request(r, 0);
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 8b88139..cfde7dc 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -284,6 +284,9 @@ typedef struct {
     ngx_chain_t                      *bufs;
     ngx_buf_t                        *buf;
     off_t                             rest;
+#if (NGX_HTTP_V2)
+    off_t                             received;
+#endif
     ngx_chain_t                      *free;
     ngx_chain_t                      *busy;
     ngx_http_chunked_t               *chunked;
diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index b5803d5..0641329 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -40,20 +40,19 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
 
     r->main->count++;
 
-#if (NGX_HTTP_V2)
-    if (r->stream && r == r->main) {
-        r->request_body_no_buffering = 0;
-        rc = ngx_http_v2_read_request_body(r, post_handler);
-        goto done;
-    }
-#endif
-
     if (r != r->main || r->request_body || r->discard_body) {
         r->request_body_no_buffering = 0;
         post_handler(r);
         return NGX_OK;
     }
 
+#if (NGX_HTTP_V2)
+    if (r->stream) {
+        rc = ngx_http_v2_read_request_body(r, post_handler);
+        goto done;
+    }
+#endif
+
     if (ngx_http_test_expect(r) != NGX_OK) {
         rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
         goto done;
@@ -215,6 +214,18 @@ ngx_http_read_unbuffered_request_body(ngx_http_request_t *r)
 {
     ngx_int_t  rc;
 
+#if (NGX_HTTP_V2)
+    if (r->stream) {
+        rc = ngx_http_v2_read_unbuffered_request_body(r);
+
+        if (rc == NGX_OK) {
+            r->reading_body = 0;
+        }
+
+        return rc;
+    }
+#endif
+
     if (r->connection->read->timedout) {
         r->connection->timedout = 1;
         return NGX_HTTP_REQUEST_TIME_OUT;
@@ -503,17 +514,17 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
     ngx_int_t     rc;
     ngx_event_t  *rev;
 
-#if (NGX_HTTP_V2)
-    if (r->stream && r == r->main) {
-        r->stream->skip_data = NGX_HTTP_V2_DATA_DISCARD;
-        return NGX_OK;
-    }
-#endif
-
     if (r != r->main || r->discard_body || r->request_body) {
         return NGX_OK;
     }
 
+#if (NGX_HTTP_V2)
+    if (r->stream) {
+        r->stream->skip_data = 1;
+        return NGX_OK;
+    }
+#endif
+
     if (ngx_http_test_expect(r) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 02e2be3..bff9525 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -19,10 +19,10 @@ static ngx_int_t ngx_http_script_add_var_code(ngx_http_script_compile_t *sc,
 static ngx_int_t ngx_http_script_add_args_code(ngx_http_script_compile_t *sc);
 #if (NGX_PCRE)
 static ngx_int_t ngx_http_script_add_capture_code(ngx_http_script_compile_t *sc,
-     ngx_uint_t n);
+    ngx_uint_t n);
 #endif
 static ngx_int_t
-     ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc);
+    ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc);
 static size_t ngx_http_script_full_name_len_code(ngx_http_script_engine_t *e);
 static void ngx_http_script_full_name_code(ngx_http_script_engine_t *e);
 
@@ -1488,7 +1488,7 @@ ngx_http_script_file_code(ngx_http_script_engine_t *e)
     r = e->request;
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http script file op %p \"%V\"", code->op, &path);
+                   "http script file op %p \"%V\"", (void *) code->op, &path);
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 911049f..1386bdb 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1883,17 +1883,17 @@ ngx_http_upstream_send_request_body(ngx_http_request_t *r,
 
     if (!r->request_body_no_buffering) {
 
-       /* buffered request body */
+        /* buffered request body */
 
-       if (!u->request_sent) {
-           u->request_sent = 1;
-           out = u->request_bufs;
+        if (!u->request_sent) {
+            u->request_sent = 1;
+            out = u->request_bufs;
 
-       } else {
-           out = NULL;
-       }
+        } else {
+            out = NULL;
+        }
 
-       return ngx_output_chain(&u->output, out);
+        return ngx_output_chain(&u->output, out);
     }
 
     if (!u->request_sent) {
@@ -4327,10 +4327,10 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
     pa = &u->headers_in.cache_control;
 
     if (pa->elts == NULL) {
-       if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
-       {
-           return NGX_ERROR;
-       }
+        if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
     }
 
     ph = ngx_array_push(pa);
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index d6ae33b..8342dc8 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -480,7 +480,7 @@ failed:
                 / (8 * sizeof(uintptr_t));
 
         for (i = 0; i < n; i++) {
-             rrp->tried[i] = 0;
+            rrp->tried[i] = 0;
         }
 
         ngx_http_upstream_rr_peers_unlock(peers);
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index eaf294a..f8271ab 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -2428,9 +2428,8 @@ ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re, ngx_str_t *s)
 
         v = cmcf->variables.elts;
 
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http regex set $%V to \"%*s\"",
-                       &v[index].name, vv->len, vv->data);
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http regex set $%V to \"%v\"", &v[index].name, vv);
         }
 #endif
     }
diff --git a/src/http/ngx_http_write_filter_module.c b/src/http/ngx_http_write_filter_module.c
index c164440..0036231 100644
--- a/src/http/ngx_http_write_filter_module.c
+++ b/src/http/ngx_http_write_filter_module.c
@@ -174,7 +174,7 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
     *ll = NULL;
 
     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http write filter: l:%d f:%d s:%O", last, flush, size);
+                   "http write filter: l:%ui f:%ui s:%O", last, flush, size);
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index ababd4b..4bd85b8 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -51,6 +51,8 @@
 #define NGX_HTTP_V2_MAX_WINDOW                   ((1U << 31) - 1)
 #define NGX_HTTP_V2_DEFAULT_WINDOW               65535
 
+#define NGX_HTTP_V2_INITIAL_WINDOW               0
+
 #define NGX_HTTP_V2_ROOT                         (void *) -1
 
 
@@ -163,7 +165,9 @@ static ngx_int_t ngx_http_v2_cookie(ngx_http_request_t *r,
     ngx_http_v2_header_t *header);
 static ngx_int_t ngx_http_v2_construct_cookie_header(ngx_http_request_t *r);
 static void ngx_http_v2_run_request(ngx_http_request_t *r);
-static ngx_int_t ngx_http_v2_init_request_body(ngx_http_request_t *r);
+static ngx_int_t ngx_http_v2_process_request_body(ngx_http_request_t *r,
+    u_char *pos, size_t size, ngx_uint_t last);
+static ngx_int_t ngx_http_v2_filter_request_body(ngx_http_request_t *r);
 static void ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r);
 
 static ngx_int_t ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
@@ -762,8 +766,7 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
         if (h2c->state.length == 0) {
             ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                           "client sent padded DATA frame "
-                          "with incorrect length: %uz",
-                          h2c->state.length);
+                          "with incorrect length: 0");
 
             return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
         }
@@ -845,8 +848,9 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
 
     stream->recv_window -= h2c->state.length;
 
-    if (stream->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4) {
-
+    if (stream->no_flow_control
+        && stream->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4)
+    {
         if (ngx_http_v2_send_window_update(h2c, node->id,
                                            NGX_HTTP_V2_MAX_WINDOW
                                            - stream->recv_window)
@@ -875,6 +879,8 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
+    stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
+
     h2c->state.stream = stream;
 
     return ngx_http_v2_state_read_data(h2c, pos, end);
@@ -885,16 +891,10 @@ static u_char *
 ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    size_t                     size;
-    ssize_t                    n;
-    ngx_buf_t                 *buf;
-    ngx_int_t                  rc;
-    ngx_temp_file_t           *tf;
-    ngx_connection_t          *fc;
-    ngx_http_request_t        *r;
-    ngx_http_v2_stream_t      *stream;
-    ngx_http_request_body_t   *rb;
-    ngx_http_core_loc_conf_t  *clcf;
+    size_t                 size;
+    ngx_int_t              rc;
+    ngx_uint_t             last;
+    ngx_http_v2_stream_t  *stream;
 
     stream = h2c->state.stream;
 
@@ -903,168 +903,42 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (stream->skip_data) {
-        stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                       "skipping http2 DATA frame, reason: %d",
-                       stream->skip_data);
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "skipping http2 DATA frame");
 
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
     size = end - pos;
 
-    if (size > h2c->state.length) {
+    if (size >= h2c->state.length) {
         size = h2c->state.length;
+        last = stream->in_closed;
+
+    } else {
+        last = 0;
     }
 
-    r = stream->request;
+    rc = ngx_http_v2_process_request_body(stream->request, pos, size, last);
 
-    if (r->request_body == NULL
-        && ngx_http_v2_init_request_body(r) != NGX_OK)
-    {
-        stream->skip_data = NGX_HTTP_V2_DATA_INTERNAL_ERROR;
-        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    if (rc != NGX_OK) {
+        stream->skip_data = 1;
+        ngx_http_finalize_request(stream->request, rc);
     }
 
-    fc = r->connection;
-    rb = r->request_body;
-    tf = rb->temp_file;
-    buf = rb->buf;
-
-    if (size) {
-        rb->rest += size;
-
-        if (r->headers_in.content_length_n != -1
-            && r->headers_in.content_length_n < rb->rest)
-        {
-            ngx_log_error(NGX_LOG_INFO, fc->log, 0,
-                          "client intended to send body data "
-                          "larger than declared");
-
-            stream->skip_data = NGX_HTTP_V2_DATA_ERROR;
-            goto error;
-
-        } else {
-            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-            if (clcf->client_max_body_size
-                && clcf->client_max_body_size < rb->rest)
-            {
-                ngx_log_error(NGX_LOG_ERR, fc->log, 0,
-                              "client intended to send "
-                              "too large chunked body: %O bytes", rb->rest);
-
-                stream->skip_data = NGX_HTTP_V2_DATA_ERROR;
-                goto error;
-            }
-        }
-
-        h2c->state.length -= size;
-
-        if (tf) {
-            buf->start = pos;
-            buf->pos = pos;
-
-            pos += size;
-
-            buf->end = pos;
-            buf->last = pos;
-
-            n = ngx_write_chain_to_temp_file(tf, rb->bufs);
-
-            /* TODO: n == 0 or not complete and level event */
-
-            if (n == NGX_ERROR) {
-                stream->skip_data = NGX_HTTP_V2_DATA_INTERNAL_ERROR;
-                goto error;
-            }
-
-            tf->offset += n;
-
-        } else {
-            buf->last = ngx_cpymem(buf->last, pos, size);
-            pos += size;
-        }
-
-        r->request_length += size;
-    }
+    pos += size;
+    h2c->state.length -= size;
 
     if (h2c->state.length) {
-        if (rb->post_handler) {
-            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-            ngx_add_timer(fc->read, clcf->client_body_timeout);
-        }
-
         return ngx_http_v2_state_save(h2c, pos, end,
                                       ngx_http_v2_state_read_data);
     }
 
-    if (h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG) {
-        stream->in_closed = 1;
-
-        if (r->headers_in.content_length_n < 0) {
-            r->headers_in.content_length_n = rb->rest;
-
-        } else if (r->headers_in.content_length_n != rb->rest) {
-            ngx_log_error(NGX_LOG_INFO, fc->log, 0,
-                          "client prematurely closed stream: "
-                          "only %O out of %O bytes of request body received",
-                          rb->rest, r->headers_in.content_length_n);
-
-            stream->skip_data = NGX_HTTP_V2_DATA_ERROR;
-            goto error;
-        }
-
-        if (tf) {
-            ngx_memzero(buf, sizeof(ngx_buf_t));
-
-            buf->in_file = 1;
-            buf->file_last = tf->file.offset;
-            buf->file = &tf->file;
-
-            rb->buf = NULL;
-        }
-
-        if (rb->post_handler) {
-            if (fc->read->timer_set) {
-                ngx_del_timer(fc->read);
-            }
-
-            r->read_event_handler = ngx_http_block_reading;
-            rb->post_handler(r);
-        }
-
-    } else if (rb->post_handler) {
-        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-        ngx_add_timer(fc->read, clcf->client_body_timeout);
-    }
-
     if (h2c->state.padding) {
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
     return ngx_http_v2_state_complete(h2c, pos, end);
-
-error:
-
-    if (rb->post_handler) {
-        if (fc->read->timer_set) {
-            ngx_del_timer(fc->read);
-        }
-
-        if (stream->skip_data == NGX_HTTP_V2_DATA_ERROR) {
-            rc = (r->headers_in.content_length_n == -1)
-                 ? NGX_HTTP_REQUEST_ENTITY_TOO_LARGE : NGX_HTTP_BAD_REQUEST;
-
-        } else {
-            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        ngx_http_finalize_request(r, rc);
-    }
-
-    return ngx_http_v2_state_skip_padded(h2c, pos, end);
 }
 
 
@@ -2124,7 +1998,7 @@ ngx_http_v2_state_ping(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 PING frame, flags: %ui", h2c->state.flags);
+                   "http2 PING frame, flags: %ud", h2c->state.flags);
 
     if (h2c->state.flags & NGX_HTTP_V2_ACK_FLAG) {
         return ngx_http_v2_state_skip(h2c, pos, end);
@@ -2556,7 +2430,7 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack)
         buf->last = ngx_http_v2_write_uint16(buf->last,
                                          NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING);
         buf->last = ngx_http_v2_write_uint32(buf->last,
-                                             NGX_HTTP_V2_MAX_WINDOW);
+                                             NGX_HTTP_V2_INITIAL_WINDOW);
 
         buf->last = ngx_http_v2_write_uint16(buf->last,
                                            NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING);
@@ -2878,7 +2752,7 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
     stream->connection = h2c;
 
     stream->send_window = h2c->init_window;
-    stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+    stream->recv_window = NGX_HTTP_V2_INITIAL_WINDOW;
 
     h2c->processing++;
 
@@ -3515,155 +3389,299 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                       "client prematurely closed stream");
 
-        r->stream->skip_data = NGX_HTTP_V2_DATA_ERROR;
+        r->stream->skip_data = 1;
 
         ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
         return;
     }
 
+    r->headers_in.chunked = (r->headers_in.content_length_n == -1);
+
     ngx_http_process_request(r);
 }
 
 
-static ngx_int_t
-ngx_http_v2_init_request_body(ngx_http_request_t *r)
-{
-    ngx_buf_t                 *buf;
-    ngx_temp_file_t           *tf;
-    ngx_http_request_body_t   *rb;
-    ngx_http_core_loc_conf_t  *clcf;
-
-    rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
-    if (rb == NULL) {
-        return NGX_ERROR;
-    }
-
-    r->request_body = rb;
-
-    if (r->stream->in_closed) {
-        return NGX_OK;
-    }
-
-    rb->rest = r->headers_in.content_length_n;
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-    if (r->request_body_in_file_only
-        || rb->rest > (off_t) clcf->client_body_buffer_size
-        || rb->rest < 0)
-    {
-        tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
-        if (tf == NULL) {
-            return NGX_ERROR;
-        }
-
-        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 = r->request_body_in_persistent_file;
-        tf->clean = r->request_body_in_clean_file;
-
-        if (r->request_body_file_group_access) {
-            tf->access = 0660;
-        }
-
-        rb->temp_file = tf;
-
-        if (r->stream->in_closed
-            && ngx_create_temp_file(&tf->file, tf->path, tf->pool,
-                                    tf->persistent, tf->clean, tf->access)
-               != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        buf = ngx_calloc_buf(r->pool);
-        if (buf == NULL) {
-            return NGX_ERROR;
-        }
-
-    } else {
-
-        if (rb->rest == 0) {
-            return NGX_OK;
-        }
-
-        buf = ngx_create_temp_buf(r->pool, (size_t) rb->rest);
-        if (buf == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    rb->buf = buf;
-
-    rb->bufs = ngx_alloc_chain_link(r->pool);
-    if (rb->bufs == NULL) {
-        return NGX_ERROR;
-    }
-
-    rb->bufs->buf = buf;
-    rb->bufs->next = NULL;
-
-    rb->rest = 0;
-
-    return NGX_OK;
-}
-
-
 ngx_int_t
 ngx_http_v2_read_request_body(ngx_http_request_t *r,
     ngx_http_client_body_handler_pt post_handler)
 {
+    off_t                      len;
     ngx_http_v2_stream_t      *stream;
+    ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http2 read request body");
-
     stream = r->stream;
 
-    switch (stream->skip_data) {
-
-    case NGX_HTTP_V2_DATA_DISCARD:
+    if (stream->skip_data) {
+        r->request_body_no_buffering = 0;
         post_handler(r);
         return NGX_OK;
+    }
 
-    case NGX_HTTP_V2_DATA_ERROR:
-        if (r->headers_in.content_length_n == -1) {
-            return NGX_HTTP_REQUEST_ENTITY_TOO_LARGE;
-        } else {
-            return NGX_HTTP_BAD_REQUEST;
-        }
-
-    case NGX_HTTP_V2_DATA_INTERNAL_ERROR:
+    rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
+    if (rb == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    if (!r->request_body && ngx_http_v2_init_request_body(r) != NGX_OK) {
-        stream->skip_data = NGX_HTTP_V2_DATA_INTERNAL_ERROR;
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     rb->bufs = NULL;
+     *     rb->buf = NULL;
+     *     rb->received = 0;
+     *     rb->free = NULL;
+     *     rb->busy = NULL;
+     */
+
+    rb->rest = 1;
+    rb->post_handler = post_handler;
+
+    r->request_body = rb;
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    len = r->headers_in.content_length_n;
+
+    if (r->request_body_no_buffering && !stream->in_closed) {
+        r->request_body_in_file_only = 0;
+
+        if (len < 0 || len > (off_t) clcf->client_body_buffer_size) {
+            len = clcf->client_body_buffer_size;
+        }
+
+        if (len > NGX_HTTP_V2_MAX_WINDOW) {
+            len = NGX_HTTP_V2_MAX_WINDOW;
+        }
+    }
+
+    if (len >= 0 && len <= (off_t) clcf->client_body_buffer_size
+        && !r->request_body_in_file_only)
+    {
+        rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
+
+    } else {
+        rb->buf = ngx_calloc_buf(r->pool);
+
+        if (rb->buf != NULL) {
+            rb->buf->sync = 1;
+        }
+    }
+
+    if (rb->buf == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
     if (stream->in_closed) {
-        post_handler(r);
-        return NGX_OK;
+        r->request_body_no_buffering = 0;
+        return ngx_http_v2_process_request_body(r, NULL, 0, 1);
     }
 
-    r->request_body->post_handler = post_handler;
+    if (r->request_body_no_buffering) {
+        stream->no_flow_control = 0;
+        stream->recv_window = (size_t) len;
+
+    } else {
+        stream->no_flow_control = 1;
+        stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+    }
+
+    if (ngx_http_v2_send_window_update(stream->connection, stream->node->id,
+                                       stream->recv_window)
+        == NGX_ERROR)
+    {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    ngx_add_timer(r->connection->read, clcf->client_body_timeout);
 
     r->read_event_handler = ngx_http_v2_read_client_request_body_handler;
     r->write_event_handler = ngx_http_request_empty_handler;
 
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-    ngx_add_timer(r->connection->read, clcf->client_body_timeout);
-
     return NGX_AGAIN;
 }
 
 
+static ngx_int_t
+ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
+    size_t size, ngx_uint_t last)
+{
+    ngx_buf_t                 *buf;
+    ngx_int_t                  rc;
+    ngx_connection_t          *fc;
+    ngx_http_request_body_t   *rb;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    rb = r->request_body;
+
+    if (rb == NULL) {
+        return NGX_OK;
+    }
+
+    fc = r->connection;
+    buf = rb->buf;
+
+    if (size) {
+        if (buf->sync) {
+            buf->pos = buf->start = pos;
+            buf->last = buf->end = pos + size;
+
+        } else {
+            if (size > (size_t) (buf->end - buf->last)) {
+                ngx_log_error(NGX_LOG_INFO, fc->log, 0,
+                                "client intended to send body data "
+                                "larger than declared");
+
+                return NGX_HTTP_BAD_REQUEST;
+            }
+
+            buf->last = ngx_cpymem(buf->last, pos, size);
+        }
+    }
+
+    if (last) {
+        rb->rest = 0;
+
+        if (fc->read->timer_set) {
+            ngx_del_timer(fc->read);
+        }
+
+        if (r->request_body_no_buffering) {
+            ngx_post_event(fc->read, &ngx_posted_events);
+            return NGX_OK;
+        }
+
+        rc = ngx_http_v2_filter_request_body(r);
+
+        if (rc != NGX_OK) {
+            return rc;
+        }
+
+        if (buf->sync) {
+            /* prevent reusing this buffer in the upstream module */
+            rb->buf = NULL;
+        }
+
+        if (r->headers_in.content_length_n == -1) {
+            r->headers_in.content_length_n = rb->received;
+        }
+
+        r->read_event_handler = ngx_http_block_reading;
+        rb->post_handler(r);
+
+        return NGX_OK;
+    }
+
+    if (size == 0) {
+        return NGX_OK;
+    }
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+    ngx_add_timer(fc->read, clcf->client_body_timeout);
+
+    if (r->request_body_no_buffering) {
+        ngx_post_event(fc->read, &ngx_posted_events);
+        return NGX_OK;
+    }
+
+    if (buf->sync) {
+        return ngx_http_v2_filter_request_body(r);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_filter_request_body(ngx_http_request_t *r)
+{
+    ngx_buf_t                 *b, *buf;
+    ngx_int_t                  rc;
+    ngx_chain_t               *cl;
+    ngx_http_request_body_t   *rb;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    rb = r->request_body;
+    buf = rb->buf;
+
+    if (buf->pos == buf->last && rb->rest) {
+        cl = NULL;
+        goto update;
+    }
+
+    cl = ngx_chain_get_free_buf(r->pool, &rb->free);
+    if (cl == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    b = cl->buf;
+
+    ngx_memzero(b, sizeof(ngx_buf_t));
+
+    if (buf->pos != buf->last) {
+        r->request_length += buf->last - buf->pos;
+        rb->received += buf->last - buf->pos;
+
+        if (r->headers_in.content_length_n != -1) {
+            if (rb->received > r->headers_in.content_length_n) {
+                ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                              "client intended to send body data "
+                              "larger than declared");
+
+                return NGX_HTTP_BAD_REQUEST;
+            }
+
+        } else {
+            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+            if (clcf->client_max_body_size
+                && rb->received > clcf->client_max_body_size)
+            {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "client intended to send too large chunked body: "
+                              "%O bytes", rb->received);
+
+                return NGX_HTTP_REQUEST_ENTITY_TOO_LARGE;
+            }
+        }
+
+        b->temporary = 1;
+        b->pos = buf->pos;
+        b->last = buf->last;
+        b->start = b->pos;
+        b->end = b->last;
+
+        buf->pos = buf->last;
+    }
+
+    if (!rb->rest) {
+        if (r->headers_in.content_length_n != -1
+            && r->headers_in.content_length_n != rb->received)
+        {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client prematurely closed stream: "
+                          "only %O out of %O bytes of request body received",
+                          rb->received, r->headers_in.content_length_n);
+
+            return NGX_HTTP_BAD_REQUEST;
+        }
+
+        b->last_buf = 1;
+    }
+
+    b->tag = (ngx_buf_tag_t) &ngx_http_v2_filter_request_body;
+    b->flush = r->request_body_no_buffering;
+
+update:
+
+    rc = ngx_http_top_request_body_filter(r, cl);
+
+    ngx_chain_update_chains(r->pool, &rb->free, &rb->busy, &cl,
+                            (ngx_buf_tag_t) &ngx_http_v2_filter_request_body);
+
+    return rc;
+}
+
+
 static void
 ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r)
 {
@@ -3678,7 +3696,7 @@ ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r)
         ngx_log_error(NGX_LOG_INFO, fc->log, NGX_ETIMEDOUT, "client timed out");
 
         fc->timedout = 1;
-        r->stream->skip_data = NGX_HTTP_V2_DATA_DISCARD;
+        r->stream->skip_data = 1;
 
         ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
         return;
@@ -3688,7 +3706,7 @@ ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r)
         ngx_log_error(NGX_LOG_INFO, fc->log, 0,
                       "client prematurely closed stream");
 
-        r->stream->skip_data = NGX_HTTP_V2_DATA_DISCARD;
+        r->stream->skip_data = 1;
 
         ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
         return;
@@ -3696,6 +3714,91 @@ ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r)
 }
 
 
+ngx_int_t
+ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r)
+{
+    size_t                     window;
+    ngx_buf_t                 *buf;
+    ngx_int_t                  rc;
+    ngx_connection_t          *fc;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_connection_t  *h2c;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    stream = r->stream;
+    fc = r->connection;
+
+    if (fc->read->timedout) {
+        if (stream->recv_window) {
+            stream->skip_data = 1;
+            fc->timedout = 1;
+
+            return NGX_HTTP_REQUEST_TIME_OUT;
+        }
+
+        fc->read->timedout = 0;
+    }
+
+    if (fc->error) {
+        stream->skip_data = 1;
+        return NGX_HTTP_BAD_REQUEST;
+    }
+
+    rc = ngx_http_v2_filter_request_body(r);
+
+    if (rc != NGX_OK) {
+        stream->skip_data = 1;
+        return rc;
+    }
+
+    if (!r->request_body->rest) {
+        return NGX_OK;
+    }
+
+    if (r->request_body->busy != NULL) {
+        return NGX_AGAIN;
+    }
+
+    buf = r->request_body->buf;
+
+    buf->pos = buf->start;
+    buf->last = buf->start;
+
+    window = buf->end - buf->start;
+    h2c = stream->connection;
+
+    if (h2c->state.stream == stream) {
+        window -= h2c->state.length;
+    }
+
+    if (window == stream->recv_window) {
+        return NGX_AGAIN;
+    }
+
+    if (ngx_http_v2_send_window_update(h2c, stream->node->id,
+                                       window - stream->recv_window)
+        == NGX_ERROR)
+    {
+        stream->skip_data = 1;
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    if (ngx_http_v2_send_output_queue(h2c) == NGX_ERROR) {
+        stream->skip_data = 1;
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    if (stream->recv_window == 0) {
+        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+        ngx_add_timer(fc->read, clcf->client_body_timeout);
+    }
+
+    stream->recv_window = window;
+
+    return NGX_AGAIN;
+}
+
+
 static ngx_int_t
 ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream, ngx_uint_t status)
@@ -3709,7 +3812,7 @@ ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
         return NGX_ERROR;
     }
 
-    stream->out_closed = 1;
+    stream->rst_sent = 1;
 
     fc = stream->request->connection;
     fc->error = 1;
@@ -3744,13 +3847,23 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
         return;
     }
 
-    if (!stream->out_closed) {
-        if (ngx_http_v2_send_rst_stream(h2c, node->id,
-                                     fc->timedout ? NGX_HTTP_V2_PROTOCOL_ERROR
-                                                  : NGX_HTTP_V2_INTERNAL_ERROR)
-            != NGX_OK)
-        {
-            h2c->connection->error = 1;
+    if (!stream->rst_sent && !h2c->connection->error) {
+
+        if (!stream->out_closed) {
+            if (ngx_http_v2_send_rst_stream(h2c, node->id,
+                                      fc->timedout ? NGX_HTTP_V2_PROTOCOL_ERROR
+                                                   : NGX_HTTP_V2_INTERNAL_ERROR)
+                != NGX_OK)
+            {
+                h2c->connection->error = 1;
+            }
+
+        } else if (!stream->in_closed) {
+            if (ngx_http_v2_send_rst_stream(h2c, node->id, NGX_HTTP_V2_NO_ERROR)
+                != NGX_OK)
+            {
+                h2c->connection->error = 1;
+            }
         }
     }
 
@@ -3942,23 +4055,23 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     c = h2c->connection;
 
-    if (h2c->state.stream) {
-        h2c->state.stream->out_closed = 1;
-        ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST);
-    }
-
     h2c->blocked = 1;
 
     if (!c->error && ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) {
         (void) ngx_http_v2_send_output_queue(h2c);
     }
 
+    c->error = 1;
+
+    if (h2c->state.stream) {
+        ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST);
+    }
+
     if (!h2c->processing) {
         ngx_http_close_connection(c);
         return;
     }
 
-    c->error = 1;
     c->read->handler = ngx_http_empty_handler;
     c->write->handler = ngx_http_empty_handler;
 
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 5a791e6..7a77c27 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -24,10 +24,6 @@
 #define NGX_HTTP_V2_MAX_FIELD                                                 \
     (127 + (1 << (NGX_HTTP_V2_INT_OCTETS - 1) * 7) - 1)
 
-#define NGX_HTTP_V2_DATA_DISCARD         1
-#define NGX_HTTP_V2_DATA_ERROR           2
-#define NGX_HTTP_V2_DATA_INTERNAL_ERROR  3
-
 #define NGX_HTTP_V2_FRAME_HEADER_SIZE    9
 
 /* frame types */
@@ -194,7 +190,9 @@ struct ngx_http_v2_stream_s {
     unsigned                         exhausted:1;
     unsigned                         in_closed:1;
     unsigned                         out_closed:1;
-    unsigned                         skip_data:2;
+    unsigned                         rst_sent:1;
+    unsigned                         no_flow_control:1;
+    unsigned                         skip_data:1;
 };
 
 
@@ -262,6 +260,7 @@ void ngx_http_v2_request_headers_init(void);
 
 ngx_int_t ngx_http_v2_read_request_body(ngx_http_request_t *r,
     ngx_http_client_body_handler_pt post_handler);
+ngx_int_t ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r);
 
 void ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc);
 
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
index d99ac30..5a4561c 100644
--- a/src/http/v2/ngx_http_v2_module.c
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -215,7 +215,7 @@ static ngx_http_variable_t  ngx_http_v2_vars[] = {
 static ngx_int_t
 ngx_http_v2_add_variables(ngx_conf_t *cf)
 {
-   ngx_http_variable_t  *var, *v;
+    ngx_http_variable_t  *var, *v;
 
     for (v = ngx_http_v2_vars; v->name.len; v++) {
         var = ngx_http_add_variable(cf, &v->name, v->flags);
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index 07d0cb6..bfbf768 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -342,7 +342,7 @@ typedef struct {
 
     void                       *(*create_srv_conf)(ngx_conf_t *cf);
     char                       *(*merge_srv_conf)(ngx_conf_t *cf, void *prev,
-                                      void *conf);
+                                                  void *conf);
 } ngx_mail_module_t;
 
 
diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c
index d93e946..39f9b17 100644
--- a/src/mail/ngx_mail_auth_http_module.c
+++ b/src/mail/ngx_mail_auth_http_module.c
@@ -431,7 +431,7 @@ ngx_mail_auth_http_ignore_status_line(ngx_mail_session_t *s,
             }
 
             ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "auth http server &V sent invalid response",
+                          "auth http server %V sent invalid response",
                           ctx->peer.name);
             ngx_close_connection(ctx->peer.connection);
             ngx_destroy_pool(ctx->pool);
diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c
index 3802c3e..007284b 100644
--- a/src/mail/ngx_mail_proxy_module.c
+++ b/src/mail/ngx_mail_proxy_module.c
@@ -935,7 +935,7 @@ ngx_mail_proxy_handler(ngx_event_t *ev)
     do_write = ev->write ? 1 : 0;
 
     ngx_log_debug3(NGX_LOG_DEBUG_MAIL, ev->log, 0,
-                   "mail proxy handler: %d, #%d > #%d",
+                   "mail proxy handler: %ui, #%d > #%d",
                    do_write, src->fd, dst->fd);
 
     for ( ;; ) {
diff --git a/src/mail/ngx_mail_smtp_handler.c b/src/mail/ngx_mail_smtp_handler.c
index 46d703e..81cc75f 100644
--- a/src/mail/ngx_mail_smtp_handler.c
+++ b/src/mail/ngx_mail_smtp_handler.c
@@ -42,7 +42,7 @@ static u_char  smtp_username[] = "334 VXNlcm5hbWU6" CRLF;
 static u_char  smtp_password[] = "334 UGFzc3dvcmQ6" CRLF;
 static u_char  smtp_invalid_command[] = "500 5.5.1 Invalid command" CRLF;
 static u_char  smtp_invalid_pipelining[] =
-   "503 5.5.0 Improper use of SMTP command pipelining" CRLF;
+    "503 5.5.0 Improper use of SMTP command pipelining" CRLF;
 static u_char  smtp_invalid_argument[] = "501 5.5.4 Invalid argument" CRLF;
 static u_char  smtp_auth_required[] = "530 5.7.1 Authentication required" CRLF;
 static u_char  smtp_bad_sequence[] = "503 5.5.1 Bad sequence of commands" CRLF;
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index 1075410..ff5c141 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -312,13 +312,13 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     conf->ssl.log = cf->log;
 
     if (conf->enable) {
-       mode = "ssl";
+        mode = "ssl";
 
     } else if (conf->starttls != NGX_MAIL_STARTTLS_OFF) {
-       mode = "starttls";
+        mode = "starttls";
 
     } else {
-       mode = "";
+        mode = "";
     }
 
     if (conf->file == NULL) {
@@ -421,7 +421,7 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
     }
 
-#ifndef LIBRESSL_VERSION_NUMBER
+#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
     SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback);
 #endif
 
diff --git a/src/os/unix/ngx_atomic.h b/src/os/unix/ngx_atomic.h
index 417cd86..74b8b7f 100644
--- a/src/os/unix/ngx_atomic.h
+++ b/src/os/unix/ngx_atomic.h
@@ -276,26 +276,26 @@ typedef volatile ngx_atomic_uint_t  ngx_atomic_t;
 
 static ngx_inline ngx_atomic_uint_t
 ngx_atomic_cmp_set(ngx_atomic_t *lock, ngx_atomic_uint_t old,
-     ngx_atomic_uint_t set)
+    ngx_atomic_uint_t set)
 {
-     if (*lock == old) {
-         *lock = set;
-         return 1;
-     }
+    if (*lock == old) {
+        *lock = set;
+        return 1;
+    }
 
-     return 0;
+    return 0;
 }
 
 
 static ngx_inline ngx_atomic_int_t
 ngx_atomic_fetch_add(ngx_atomic_t *value, ngx_atomic_int_t add)
 {
-     ngx_atomic_int_t  old;
+    ngx_atomic_int_t  old;
 
-     old = *value;
-     *value += add;
+    old = *value;
+    *value += add;
 
-     return old;
+    return old;
 }
 
 #define ngx_memory_barrier()
diff --git a/src/os/unix/ngx_channel.h b/src/os/unix/ngx_channel.h
index d7a9f6b..362cc64 100644
--- a/src/os/unix/ngx_channel.h
+++ b/src/os/unix/ngx_channel.h
@@ -15,10 +15,10 @@
 
 
 typedef struct {
-     ngx_uint_t  command;
-     ngx_pid_t   pid;
-     ngx_int_t   slot;
-     ngx_fd_t    fd;
+    ngx_uint_t  command;
+    ngx_pid_t   pid;
+    ngx_int_t   slot;
+    ngx_fd_t    fd;
 } ngx_channel_t;
 
 
diff --git a/src/os/unix/ngx_file_aio_read.c b/src/os/unix/ngx_file_aio_read.c
index b11cf8a..aedc3c9 100644
--- a/src/os/unix/ngx_file_aio_read.c
+++ b/src/os/unix/ngx_file_aio_read.c
@@ -84,7 +84,7 @@ ngx_file_aio_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
     }
 
     ngx_log_debug4(NGX_LOG_DEBUG_CORE, file->log, 0,
-                   "aio complete:%d @%O:%z %V",
+                   "aio complete:%d @%O:%uz %V",
                    ev->complete, offset, size, &file->name);
 
     if (ev->complete) {
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index bcef7ec..65c79a2 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -176,7 +176,7 @@ ngx_thread_read_handler(void *data, ngx_log_t *log)
 #endif
 
     ngx_log_debug4(NGX_LOG_DEBUG_CORE, log, 0,
-                   "pread: %z (err: %i) of %uz @%O",
+                   "pread: %z (err: %d) of %uz @%O",
                    n, ctx->err, ctx->size, ctx->offset);
 }
 
diff --git a/src/os/unix/ngx_linux_aio_read.c b/src/os/unix/ngx_linux_aio_read.c
index b0a9236..9f0a6c1 100644
--- a/src/os/unix/ngx_linux_aio_read.c
+++ b/src/os/unix/ngx_linux_aio_read.c
@@ -73,7 +73,7 @@ ngx_file_aio_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
     }
 
     ngx_log_debug4(NGX_LOG_DEBUG_CORE, file->log, 0,
-                   "aio complete:%d @%O:%z %V",
+                   "aio complete:%d @%O:%uz %V",
                    ev->complete, offset, size, &file->name);
 
     if (ev->complete) {
diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c
index 50a9cea..3c0696a 100644
--- a/src/os/unix/ngx_linux_sendfile_chain.c
+++ b/src/os/unix/ngx_linux_sendfile_chain.c
@@ -451,7 +451,7 @@ again:
 #endif
 
     ngx_log_debug4(NGX_LOG_DEBUG_EVENT, log, 0,
-                   "sendfile: %z (err: %i) of %uz @%O",
+                   "sendfile: %z (err: %d) of %uz @%O",
                    n, ctx->err, ctx->size, file->file_pos);
 
     if (ctx->err == NGX_EINTR) {
diff --git a/src/os/unix/ngx_os.h b/src/os/unix/ngx_os.h
index c0d59ef..e22f07c 100644
--- a/src/os/unix/ngx_os.h
+++ b/src/os/unix/ngx_os.h
@@ -39,7 +39,7 @@ void ngx_os_status(ngx_log_t *log);
 ngx_int_t ngx_os_specific_init(ngx_log_t *log);
 void ngx_os_specific_status(ngx_log_t *log);
 ngx_int_t ngx_daemon(ngx_log_t *log);
-ngx_int_t ngx_os_signal_process(ngx_cycle_t *cycle, char *sig, ngx_int_t pid);
+ngx_int_t ngx_os_signal_process(ngx_cycle_t *cycle, char *sig, ngx_pid_t pid);
 
 
 ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size);
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
index 6f3f385..24a63fb 100644
--- a/src/os/unix/ngx_process.c
+++ b/src/os/unix/ngx_process.c
@@ -611,7 +611,7 @@ ngx_debug_point(void)
 
 
 ngx_int_t
-ngx_os_signal_process(ngx_cycle_t *cycle, char *name, ngx_int_t pid)
+ngx_os_signal_process(ngx_cycle_t *cycle, char *name, ngx_pid_t pid)
 {
     ngx_signal_t  *sig;
 
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 9be6376..7cee1c5 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -145,7 +145,7 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
             }
 
             ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                           "termination cycle: %d", delay);
+                           "termination cycle: %M", delay);
 
             itv.it_interval.tv_sec = 0;
             itv.it_interval.tv_usec = 0;
@@ -438,7 +438,7 @@ ngx_pass_open_channel(ngx_cycle_t *cycle, ngx_channel_t *ch)
         }
 
         ngx_log_debug6(NGX_LOG_DEBUG_CORE, cycle->log, 0,
-                      "pass channel s:%d pid:%P fd:%d to s:%i pid:%P fd:%d",
+                      "pass channel s:%i pid:%P fd:%d to s:%i pid:%P fd:%d",
                       ch->slot, ch->pid, ch->fd,
                       i, ngx_processes[i].pid,
                       ngx_processes[i].channel[0]);
@@ -492,7 +492,7 @@ ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo)
     for (i = 0; i < ngx_last_process; i++) {
 
         ngx_log_debug7(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                       "child: %d %P e:%d t:%d d:%d r:%d j:%d",
+                       "child: %i %P e:%d t:%d d:%d r:%d j:%d",
                        i,
                        ngx_processes[i].pid,
                        ngx_processes[i].exiting,
@@ -570,7 +570,7 @@ ngx_reap_children(ngx_cycle_t *cycle)
     for (i = 0; i < ngx_last_process; i++) {
 
         ngx_log_debug7(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                       "child: %d %P e:%d t:%d d:%d r:%d j:%d",
+                       "child: %i %P e:%d t:%d d:%d r:%d j:%d",
                        i,
                        ngx_processes[i].pid,
                        ngx_processes[i].exiting,
@@ -1047,7 +1047,7 @@ ngx_channel_handler(ngx_event_t *ev)
         }
 
         ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0,
-                       "channel command: %d", ch.command);
+                       "channel command: %ui", ch.command);
 
         switch (ch.command) {
 
diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c
index 3544b4b..9953782 100644
--- a/src/os/unix/ngx_readv_chain.c
+++ b/src/os/unix/ngx_readv_chain.c
@@ -101,7 +101,7 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "readv: %d, last:%d", vec.nelts, iov->iov_len);
+                   "readv: %ui, last:%uz", vec.nelts, iov->iov_len);
 
     do {
         n = readv(c->fd, (struct iovec *) vec.elts, vec.nelts);
diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index 86675df..fc7f76c 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -52,7 +52,7 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
         n = recv(c->fd, buf, size, 0);
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "recv: fd:%d %d of %d", c->fd, n, size);
+                       "recv: fd:%d %z of %uz", c->fd, n, size);
 
         if (n >= 0) {
             if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
@@ -139,7 +139,7 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
         n = recv(c->fd, buf, size, 0);
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "recv: fd:%d %d of %d", c->fd, n, size);
+                       "recv: fd:%d %z of %uz", c->fd, n, size);
 
         if (n == 0) {
             rev->ready = 0;
diff --git a/src/os/unix/ngx_send.c b/src/os/unix/ngx_send.c
index 80995ab..61ea202 100644
--- a/src/os/unix/ngx_send.c
+++ b/src/os/unix/ngx_send.c
@@ -34,7 +34,7 @@ ngx_unix_send(ngx_connection_t *c, u_char *buf, size_t size)
         n = send(c->fd, buf, size, 0);
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "send: fd:%d %d of %d", c->fd, n, size);
+                       "send: fd:%d %z of %uz", c->fd, n, size);
 
         if (n > 0) {
             if (n < (ssize_t) size) {
diff --git a/src/os/unix/ngx_sunpro_amd64.il b/src/os/unix/ngx_sunpro_amd64.il
index dc454b2..07f3210 100644
--- a/src/os/unix/ngx_sunpro_amd64.il
+++ b/src/os/unix/ngx_sunpro_amd64.il
@@ -38,6 +38,6 @@
 /
 / ld.so.1: nginx: fatal: hardware capability unsupported: 0x2000 [ PAUSE ]
 
-       .inline ngx_cpu_pause,0
-       rep; nop
-       .end
+        .inline ngx_cpu_pause,0
+        rep; nop
+        .end
diff --git a/src/os/unix/ngx_sunpro_x86.il b/src/os/unix/ngx_sunpro_x86.il
index fd1cc00..d7e127c 100644
--- a/src/os/unix/ngx_sunpro_x86.il
+++ b/src/os/unix/ngx_sunpro_x86.il
@@ -39,6 +39,6 @@
 /
 / ld.so.1: nginx: fatal: hardware capability unsupported: 0x2000  [ PAUSE ]
 
-       .inline ngx_cpu_pause,0
-       rep; nop
-       .end
+        .inline ngx_cpu_pause,0
+        rep; nop
+        .end
diff --git a/src/os/unix/ngx_udp_recv.c b/src/os/unix/ngx_udp_recv.c
index 1c807a0..e03bf6c 100644
--- a/src/os/unix/ngx_udp_recv.c
+++ b/src/os/unix/ngx_udp_recv.c
@@ -25,7 +25,7 @@ ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
         n = recv(c->fd, buf, size, 0);
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "recv: fd:%d %d of %d", c->fd, n, size);
+                       "recv: fd:%d %z of %uz", c->fd, n, size);
 
         if (n >= 0) {
             if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
@@ -83,7 +83,7 @@ ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
         n = recv(c->fd, buf, size, 0);
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "recv: fd:%d %d of %d", c->fd, n, size);
+                       "recv: fd:%d %z of %uz", c->fd, n, size);
 
         if (n >= 0) {
             return n;
diff --git a/src/stream/ngx_stream_limit_conn_module.c b/src/stream/ngx_stream_limit_conn_module.c
index 732b089..f1d8a37 100644
--- a/src/stream/ngx_stream_limit_conn_module.c
+++ b/src/stream/ngx_stream_limit_conn_module.c
@@ -220,7 +220,7 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
-                       "limit conn: %08XD %d", node->key, lc->conn);
+                       "limit conn: %08Xi %d", node->key, lc->conn);
 
         ngx_shmtx_unlock(&shpool->mutex);
 
@@ -340,7 +340,7 @@ ngx_stream_limit_conn_cleanup(void *data)
     ngx_shmtx_lock(&shpool->mutex);
 
     ngx_log_debug2(NGX_LOG_DEBUG_STREAM, lccln->shm_zone->shm.log, 0,
-                   "limit conn cleanup: %08XD %d", node->key, lc->conn);
+                   "limit conn cleanup: %08Xi %d", node->key, lc->conn);
 
     lc->conn--;
 
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 7abd9e1..e12da1b 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -276,7 +276,7 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
     }
 
-#ifndef LIBRESSL_VERSION_NUMBER
+#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
     SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback);
 #endif
 
diff --git a/src/stream/ngx_stream_upstream_least_conn_module.c b/src/stream/ngx_stream_upstream_least_conn_module.c
index 677da45..c9719f9 100644
--- a/src/stream/ngx_stream_upstream_least_conn_module.c
+++ b/src/stream/ngx_stream_upstream_least_conn_module.c
@@ -254,7 +254,7 @@ failed:
                 / (8 * sizeof(uintptr_t));
 
         for (i = 0; i < n; i++) {
-             rrp->tried[i] = 0;
+            rrp->tried[i] = 0;
         }
 
         ngx_stream_upstream_rr_peers_unlock(peers);
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
index efedb28..e1ab592 100644
--- a/src/stream/ngx_stream_upstream_round_robin.c
+++ b/src/stream/ngx_stream_upstream_round_robin.c
@@ -356,7 +356,7 @@ failed:
                 / (8 * sizeof(uintptr_t));
 
         for (i = 0; i < n; i++) {
-             rrp->tried[i] = 0;
+            rrp->tried[i] = 0;
         }
 
         ngx_stream_upstream_rr_peers_unlock(peers);

From cfc16224c03487b79c12990251035aced699068b Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 19 Apr 2016 12:26:59 +0300
Subject: [PATCH 063/600] Fix changelog typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7e366f3..6d5fd8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ nginx (1.9.13-1) UNRELEASED; urgency=medium
   * debian/control:
     + Enable http/2, thread pool & WebDAV on nginx-light.
       In order for dynamic modules to be loadable in all nginx flavors we need
-      to ensure the share the same build signature. (Closes: #816095)
+      to ensure they share the same build signature. (Closes: #816095)
     + nginx-common & nginx-doc are now 'Multi-Arch: foreign'. (Closes: #812484)
       Thanks Elrond for the report and the initial patch.
     + Use secure VCS uri (lintian).

From 8b10bd4f01381a69b57b9957c2eca7b258d8e7b8 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 18 Apr 2016 14:15:19 +0300
Subject: [PATCH 064/600] Release 1.9.14-1

---
 debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d5fd8a..ae2f6fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-nginx (1.9.13-1) UNRELEASED; urgency=medium
+nginx (1.9.14-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
-  * New upstream release (1.9.13) (Closes: #812806)
+  * New upstream release (1.9.14) (Closes: #812806)
   * debian:
     + Setup dynamic module flow, and implement a simple dh_nginx helper for
       internal use.
@@ -28,7 +28,7 @@ nginx (1.9.13-1) UNRELEASED; urgency=medium
     + Update http-auth-pam module to 1.5 and convert it to a dyn module.
       (Closes: #819062)
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 11 Feb 2016 15:06:38 +0200
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 19 Apr 2016 11:05:35 +0300
 
 nginx (1.9.10-1) unstable; urgency=medium
 

From 58105135c4fde9f33b277f02ff07ba6189d57abf Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 27 Apr 2016 16:37:15 +0300
Subject: [PATCH 065/600] Fix upgrading nginx-extras from a non-dynamic version

libnginx-mod-http-perl ships a common file with nginx-extras,
adding a Replaces header fixes that.

Note that the is no need to add a Breaks header since these
packages are not co-installable (they explicitly depend on
a different nginx-common version).
---
 debian/changelog | 8 ++++++++
 debian/control   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ae2f6fc..42d09e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.9.14-2) UNRELEASED; urgency=medium
+
+  [ Christos Trochalakis ]
+  * debian/control:
+    + Fix upgrading nginx-extras from testing. (Closes: #822553)
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 27 Apr 2016 16:34:16 +0300
+
 nginx (1.9.14-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
diff --git a/debian/control b/debian/control
index 2398e29..5bda8fe 100644
--- a/debian/control
+++ b/debian/control
@@ -280,6 +280,7 @@ Description: Stream module for Nginx
 Package: libnginx-mod-http-perl
 Architecture: any
 Depends: ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Replaces: nginx-extras (<< 1.9.14-1)
 Description: Perl module for Nginx
  Embed Perl runtime into nginx.
  .

From 664bdf48f483d5a0682566077a79f63131b9ba94 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 28 Apr 2016 10:00:35 +0300
Subject: [PATCH 066/600] Bump standards to 3.9.8

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 42d09e1..84d382c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nginx (1.9.14-2) UNRELEASED; urgency=medium
   [ Christos Trochalakis ]
   * debian/control:
     + Fix upgrading nginx-extras from testing. (Closes: #822553)
+    + Bump Standards to 3.9.8, no changes needed.
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 27 Apr 2016 16:34:16 +0300
 
diff --git a/debian/control b/debian/control
index 5bda8fe..52baf37 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: autotools-dev,
                libxslt1-dev,
                po-debconf,
                zlib1g-dev
-Standards-Version: 3.9.7.0
+Standards-Version: 3.9.8.0
 Homepage: http://nginx.net
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/nginx.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nginx.git

From c46cc7556bd04b652d74d2cdaf796487c3914a3c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 28 Apr 2016 10:01:02 +0300
Subject: [PATCH 067/600] libnginx-mod-http-perl: Override
 wrong-section-according-to-package-name warning

---
 debian/changelog                                | 2 ++
 debian/libnginx-mod-http-perl.lintian-overrides | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 debian/libnginx-mod-http-perl.lintian-overrides

diff --git a/debian/changelog b/debian/changelog
index 84d382c..c3ba4d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ nginx (1.9.14-2) UNRELEASED; urgency=medium
   * debian/control:
     + Fix upgrading nginx-extras from testing. (Closes: #822553)
     + Bump Standards to 3.9.8, no changes needed.
+  * debian/libnginx-mod-http-perl.lintian-overrides:
+    + Override wrong-section-according-to-package-name warning.
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 27 Apr 2016 16:34:16 +0300
 
diff --git a/debian/libnginx-mod-http-perl.lintian-overrides b/debian/libnginx-mod-http-perl.lintian-overrides
new file mode 100644
index 0000000..cda1f30
--- /dev/null
+++ b/debian/libnginx-mod-http-perl.lintian-overrides
@@ -0,0 +1 @@
+libnginx-mod-http-perl: wrong-section-according-to-package-name libnginx-mod-http-perl => perl

From a66bea579bb35c6335beee0a46ad1b1535113f97 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 27 Apr 2016 16:44:22 +0300
Subject: [PATCH 068/600] Release 1.9.14-2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c3ba4d3..4d4885f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.9.14-2) UNRELEASED; urgency=medium
+nginx (1.9.14-2) unstable; urgency=medium
 
   [ Christos Trochalakis ]
   * debian/control:
@@ -7,7 +7,7 @@ nginx (1.9.14-2) UNRELEASED; urgency=medium
   * debian/libnginx-mod-http-perl.lintian-overrides:
     + Override wrong-section-according-to-package-name warning.
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 27 Apr 2016 16:34:16 +0300
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 27 Apr 2016 16:43:02 +0300
 
 nginx (1.9.14-1) unstable; urgency=medium
 

From 95a2b168be9b408dd778f23476a22f2c9c1d2784 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 29 Apr 2016 10:30:33 +0300
Subject: [PATCH 069/600] Imported Upstream version 1.10.0

---
 CHANGES                                       |  24 ++++
 CHANGES.ru                                    |  23 ++++
 auto/cc/icc                                   |   4 +-
 contrib/vim/syntax/nginx.vim                  |   2 +-
 src/core/nginx.h                              |   4 +-
 src/core/ngx_inet.c                           |   2 +-
 src/core/ngx_regex.c                          |   2 +-
 src/core/ngx_resolver.c                       |   4 +-
 src/core/ngx_thread_pool.c                    |   4 +
 src/event/modules/ngx_epoll_module.c          |   2 +-
 src/http/modules/ngx_http_fastcgi_module.c    |   5 +
 src/http/modules/ngx_http_mp4_module.c        |   8 +-
 src/http/modules/ngx_http_ssi_filter_module.c |   6 +-
 src/http/v2/ngx_http_v2.c                     | 100 +++++++++++-----
 src/http/v2/ngx_http_v2.h                     |   1 +
 src/os/unix/ngx_readv_chain.c                 |  50 ++++----
 src/os/unix/ngx_recv.c                        | 107 +++++-------------
 src/os/unix/ngx_udp_recv.c                    |  53 +--------
 18 files changed, 201 insertions(+), 200 deletions(-)

diff --git a/CHANGES b/CHANGES
index e1e596e..408f952 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,28 @@
 
+Changes with nginx 1.10.0                                        26 Apr 2016
+
+    *) 1.10.x stable branch.
+
+
+Changes with nginx 1.9.15                                        19 Apr 2016
+
+    *) Bugfix: "recv() failed" errors might occur when using HHVM as a
+       FastCGI server.
+
+    *) Bugfix: when using HTTP/2 and the "limit_req" or "auth_request"
+       directives a timeout or a "client violated flow control" error might
+       occur while reading client request body; the bug had appeared in
+       1.9.14.
+
+    *) Workaround: a response might not be shown by some browsers if HTTP/2
+       was used and client request body was not fully read; the bug had
+       appeared in 1.9.14.
+
+    *) Bugfix: connections might hang when using the "aio threads"
+       directive.
+       Thanks to Mindaugas Rasiukevicius.
+
+
 Changes with nginx 1.9.14                                        05 Apr 2016
 
     *) Feature: OpenSSL 1.1.0 compatibility.
diff --git a/CHANGES.ru b/CHANGES.ru
index c6e6e84..4e6002e 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,27 @@
 
+Изменения в nginx 1.10.0                                          26.04.2016
+
+    *) Стабильная ветка 1.10.x.
+
+
+Изменения в nginx 1.9.15                                          19.04.2016
+
+    *) Исправление: при использовании HHVM в качестве FastCGI-сервера могли
+       возникать ошибки "recv() failed".
+
+    *) Исправление: при использовании HTTP/2 и директив limit_req или
+       auth_request при чтении тела запроса мог произойти таймаут или ошибка
+       "client violated flow control"; ошибка появилась в 1.9.14.
+
+    *) Изменение: при использовании HTTP/2 ответ мог не показываться
+       некоторыми браузерами, если тело запроса было прочитано не целиком;
+       ошибка появилась в 1.9.14.
+
+    *) Исправление: при использовании директивы "aio threads" соединения
+       могли зависать.
+       Спасибо Mindaugas Rasiukevicius.
+
+
 Изменения в nginx 1.9.14                                          05.04.2016
 
     *) Добавление: совместимость с OpenSSL 1.1.0.
diff --git a/auto/cc/icc b/auto/cc/icc
index 1d83ed3..1c0df1a 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -wd1419"
 
 case "$NGX_ICC_VER" in
     9.*)
-        # "cc" clobber ignored, warnings for Liunx's htonl()/htons()
+        # "cc" clobber ignored, warnings for Linux's htonl()/htons()
         CFLAGS="$CFLAGS -wd1469"
         # explicit conversion of a 64-bit integral type to a smaller
         # integral type
@@ -103,7 +103,7 @@ case "$NGX_ICC_VER" in
     ;;
 
     8.*)
-        # "cc" clobber ignored, warnings for Liunx's htonl()/htons()
+        # "cc" clobber ignored, warnings for Linux's htonl()/htons()
         CFLAGS="$CFLAGS -wd1469"
         # floating-point equality and inequality comparisons are unreliable,
         # warning on SvTRUE()
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 8f13017..f1fd48a 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -604,7 +604,7 @@ syn keyword ngxDirectiveThirdParty echo_subrequest
 syn keyword ngxDirectiveThirdParty echo_subrequest_async
 
 " Events Module <http://docs.dutov.org/nginx_modules_events_en.html>
-" Privides options for start/stop events.
+" Provides options for start/stop events.
 syn keyword ngxDirectiveThirdParty on_start
 syn keyword ngxDirectiveThirdParty on_stop
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index d0a6f65..fe78745 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1009014
-#define NGINX_VERSION      "1.9.14"
+#define nginx_version      1010000
+#define NGINX_VERSION      "1.10.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index a4e80ed..33b303d 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -348,7 +348,7 @@ ngx_inet6_ntop(u_char *p, u_char *text, size_t len)
             continue;
         }
 
-        dst = ngx_sprintf(dst, "%uxd", p[i] * 256 + p[i + 1]);
+        dst = ngx_sprintf(dst, "%xd", p[i] * 256 + p[i + 1]);
 
         if (i < 14) {
             *dst++ = ':';
diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c
index 416622d..9939dce 100644
--- a/src/core/ngx_regex.c
+++ b/src/core/ngx_regex.c
@@ -32,7 +32,7 @@ static ngx_conf_post_t  ngx_regex_pcre_jit_post = { ngx_regex_pcre_jit };
 static ngx_command_t  ngx_regex_commands[] = {
 
     { ngx_string("pcre_jit"),
-      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
+      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
       0,
       offsetof(ngx_regex_conf_t, pcre_jit),
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 3c52de8..e00fe22 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1733,7 +1733,7 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n,
     trunc = flags & 0x0200;
 
     ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
-                   "resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud",
+                   "resolver DNS response %ui fl:%04Xi %ui/%ui/%ud/%ud",
                    ident, flags, nqs, nan,
                    (response->nns_hi << 8) + response->nns_lo,
                    (response->nar_hi << 8) + response->nar_lo);
@@ -1741,7 +1741,7 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n,
     /* response to a standard query */
     if ((flags & 0xf870) != 0x8000 || (trunc && tcp)) {
         ngx_log_error(r->log_level, r->log, 0,
-                      "invalid %s DNS response %ui fl:%04Xui",
+                      "invalid %s DNS response %ui fl:%04Xi",
                       tcp ? "TCP" : "UDP", ident, flags);
         return;
     }
diff --git a/src/core/ngx_thread_pool.c b/src/core/ngx_thread_pool.c
index 0353085..f3655aa 100644
--- a/src/core/ngx_thread_pool.c
+++ b/src/core/ngx_thread_pool.c
@@ -345,6 +345,8 @@ ngx_thread_pool_cycle(void *data)
         *ngx_thread_pool_done.last = task;
         ngx_thread_pool_done.last = &task->next;
 
+        ngx_memory_barrier();
+
         ngx_unlock(&ngx_thread_pool_done_lock);
 
         (void) ngx_notify(ngx_thread_pool_handler);
@@ -366,6 +368,8 @@ ngx_thread_pool_handler(ngx_event_t *ev)
     ngx_thread_pool_done.first = NULL;
     ngx_thread_pool_done.last = &ngx_thread_pool_done.first;
 
+    ngx_memory_barrier();
+
     ngx_unlock(&ngx_thread_pool_done_lock);
 
     while (task) {
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index 828e4d1..166c461 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -910,7 +910,7 @@ ngx_epoll_eventfd_handler(ngx_event_t *ev)
             for (i = 0; i < events; i++) {
 
                 ngx_log_debug4(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                               "io_event: %uXL %uXL %L %L",
+                               "io_event: %XL %XL %L %L",
                                 event[i].data, event[i].obj,
                                 event[i].res, event[i].res2);
 
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index a861203..2d288ce 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -1177,6 +1177,11 @@ ngx_http_fastcgi_create_request(ngx_http_request_t *r)
 
         while (body) {
 
+            if (ngx_buf_special(body->buf)) {
+                body = body->next;
+                continue;
+            }
+
             if (body->buf->in_file) {
                 file_pos = body->buf->file_pos;
 
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 6cb3ccf..16ef83c 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -1433,10 +1433,10 @@ typedef struct {
     u_char    layer[2];
     u_char    group[2];
     u_char    volume[2];
-    u_char    reverved3[2];
+    u_char    reserved3[2];
     u_char    matrix[36];
     u_char    width[4];
-    u_char    heigth[4];
+    u_char    height[4];
 } ngx_mp4_tkhd_atom_t;
 
 typedef struct {
@@ -1453,10 +1453,10 @@ typedef struct {
     u_char    layer[2];
     u_char    group[2];
     u_char    volume[2];
-    u_char    reverved3[2];
+    u_char    reserved3[2];
     u_char    matrix[36];
     u_char    width[4];
-    u_char    heigth[4];
+    u_char    height[4];
 } ngx_mp4_tkhd64_atom_t;
 
 
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index b997aaa..fc6e65b 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -2005,7 +2005,7 @@ ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
 
     if (uri && file) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "inlcusion may be either virtual=\"%V\" or file=\"%V\"",
+                      "inclusion may be either virtual=\"%V\" or file=\"%V\"",
                       uri, file);
         return NGX_HTTP_SSI_ERROR;
     }
@@ -2525,7 +2525,7 @@ ngx_http_ssi_if(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "evaluted left: \"%V\"", &left);
+                   "evaluated left: \"%V\"", &left);
 
     if (p == last) {
         if (left.len) {
@@ -2589,7 +2589,7 @@ ngx_http_ssi_if(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "evaluted right: \"%V\"", &right);
+                   "evaluated right: \"%V\"", &right);
 
     if (noregex) {
         if (left.len != right.len) {
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 4bd85b8..278c9ab 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -948,6 +948,7 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
 {
     size_t                   size;
     ngx_uint_t               padded, priority, depend, dependency, excl, weight;
+    ngx_uint_t               status;
     ngx_http_v2_node_t      *node;
     ngx_http_v2_stream_t    *stream;
     ngx_http_v2_srv_conf_t  *h2scf;
@@ -1040,15 +1041,8 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
                       "client sent HEADERS frame for stream %ui "
                       "with incorrect dependency", h2c->state.sid);
 
-        if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid,
-                                        NGX_HTTP_V2_PROTOCOL_ERROR)
-            != NGX_OK)
-        {
-            return ngx_http_v2_connection_error(h2c,
-                                                NGX_HTTP_V2_INTERNAL_ERROR);
-        }
-
-        return ngx_http_v2_state_header_block(h2c, pos, end);
+        status = NGX_HTTP_V2_PROTOCOL_ERROR;
+        goto rst_stream;
     }
 
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@@ -1060,15 +1054,18 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "concurrent streams exceeded %ui", h2c->processing);
 
-        if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid,
-                                        NGX_HTTP_V2_REFUSED_STREAM)
-            != NGX_OK)
-        {
-            return ngx_http_v2_connection_error(h2c,
-                                                NGX_HTTP_V2_INTERNAL_ERROR);
-        }
+        status = NGX_HTTP_V2_REFUSED_STREAM;
+        goto rst_stream;
+    }
 
-        return ngx_http_v2_state_header_block(h2c, pos, end);
+    if (!h2c->settings_ack && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG))
+    {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent stream with data "
+                      "before settings were acknowledged");
+
+        status = NGX_HTTP_V2_REFUSED_STREAM;
+        goto rst_stream;
     }
 
     node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 1);
@@ -1104,6 +1101,14 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         ngx_http_v2_set_dependency(h2c, node, depend, excl);
     }
 
+    return ngx_http_v2_state_header_block(h2c, pos, end);
+
+rst_stream:
+
+    if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
     return ngx_http_v2_state_header_block(h2c, pos, end);
 }
 
@@ -1883,7 +1888,7 @@ ngx_http_v2_state_settings(ngx_http_v2_connection_t *h2c, u_char *pos,
             return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
         }
 
-        /* TODO settings acknowledged */
+        h2c->settings_ack = 1;
 
         return ngx_http_v2_state_complete(h2c, pos, end);
     }
@@ -3409,6 +3414,7 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
     ngx_http_v2_stream_t      *stream;
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
+    ngx_http_v2_connection_t  *h2c;
 
     stream = r->stream;
 
@@ -3468,6 +3474,7 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
     }
 
     if (rb->buf == NULL) {
+        stream->skip_data = 1;
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
@@ -3476,20 +3483,31 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
         return ngx_http_v2_process_request_body(r, NULL, 0, 1);
     }
 
-    if (r->request_body_no_buffering) {
-        stream->no_flow_control = 0;
-        stream->recv_window = (size_t) len;
+    if (len) {
+        if (r->request_body_no_buffering) {
+            stream->recv_window = (size_t) len;
 
-    } else {
-        stream->no_flow_control = 1;
-        stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
-    }
+        } else {
+            stream->no_flow_control = 1;
+            stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+        }
 
-    if (ngx_http_v2_send_window_update(stream->connection, stream->node->id,
-                                       stream->recv_window)
-        == NGX_ERROR)
-    {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        if (ngx_http_v2_send_window_update(stream->connection, stream->node->id,
+                                           stream->recv_window)
+            == NGX_ERROR)
+        {
+            stream->skip_data = 1;
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        h2c = stream->connection;
+
+        if (!h2c->blocked) {
+            if (ngx_http_v2_send_output_queue(h2c) == NGX_ERROR) {
+                stream->skip_data = 1;
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+        }
     }
 
     ngx_add_timer(r->connection->read, clcf->client_body_timeout);
@@ -3859,11 +3877,33 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
             }
 
         } else if (!stream->in_closed) {
+#if 0
             if (ngx_http_v2_send_rst_stream(h2c, node->id, NGX_HTTP_V2_NO_ERROR)
                 != NGX_OK)
             {
                 h2c->connection->error = 1;
             }
+#else
+            /*
+             * At the time of writing at least the latest versions of Chrome
+             * do not properly handle RST_STREAM with NO_ERROR status.
+             *
+             * See: https://bugs.chromium.org/p/chromium/issues/detail?id=603182
+             *
+             * As a workaround, the stream window is maximized before closing
+             * the stream.  This allows a client to send up to 2 GB of data
+             * before getting blocked on flow control.
+             */
+
+            if (stream->recv_window < NGX_HTTP_V2_MAX_WINDOW
+                && ngx_http_v2_send_window_update(h2c, node->id,
+                                                  NGX_HTTP_V2_MAX_WINDOW
+                                                  - stream->recv_window)
+                   != NGX_OK)
+            {
+                h2c->connection->error = 1;
+            }
+#endif
         }
     }
 
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 7a77c27..1adf8de 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -141,6 +141,7 @@ struct ngx_http_v2_connection_s {
     ngx_uint_t                       last_sid;
 
     unsigned                         closed_nodes:8;
+    unsigned                         settings_ack:1;
     unsigned                         blocked:1;
 };
 
diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c
index 9953782..d23508e 100644
--- a/src/os/unix/ngx_readv_chain.c
+++ b/src/os/unix/ngx_readv_chain.c
@@ -106,7 +106,27 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
     do {
         n = readv(c->fd, (struct iovec *) vec.elts, vec.nelts);
 
-        if (n >= 0) {
+        if (n == 0) {
+            rev->ready = 0;
+            rev->eof = 1;
+
+#if (NGX_HAVE_KQUEUE)
+
+            /*
+             * on FreeBSD readv() may return 0 on closed socket
+             * even if kqueue reported about available data
+             */
+
+            if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
+                rev->available = 0;
+            }
+
+#endif
+
+            return 0;
+        }
+
+        if (n > 0) {
 
 #if (NGX_HAVE_KQUEUE)
 
@@ -115,7 +135,7 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
 
                 /*
                  * rev->available may be negative here because some additional
-                 * bytes may be received between kevent() and recv()
+                 * bytes may be received between kevent() and readv()
                  */
 
                 if (rev->available <= 0) {
@@ -123,42 +143,18 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
                         rev->ready = 0;
                     }
 
-                    if (rev->available < 0) {
-                        rev->available = 0;
-                    }
-                }
-
-                if (n == 0) {
-
-                    /*
-                     * on FreeBSD recv() may return 0 on closed socket
-                     * even if kqueue reported about available data
-                     */
-
-#if 0
-                    ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                                  "readv() returned 0 while kevent() reported "
-                                  "%d available bytes", rev->available);
-#endif
-
-                    rev->ready = 0;
-                    rev->eof = 1;
                     rev->available = 0;
                 }
 
                 return n;
             }
 
-#endif /* NGX_HAVE_KQUEUE */
+#endif
 
             if (n < size && !(ngx_event_flags & NGX_USE_GREEDY_EVENT)) {
                 rev->ready = 0;
             }
 
-            if (n == 0) {
-                rev->eof = 1;
-            }
-
             return n;
         }
 
diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index fc7f76c..5013ae3 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -10,8 +10,6 @@
 #include <ngx_event.h>
 
 
-#if (NGX_HAVE_KQUEUE)
-
 ssize_t
 ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 {
@@ -21,6 +19,8 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 
     rev = c->read;
 
+#if (NGX_HAVE_KQUEUE)
+
     if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
                        "recv: eof:%d, avail:%d, err:%d",
@@ -48,13 +48,38 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
         }
     }
 
+#endif
+
     do {
         n = recv(c->fd, buf, size, 0);
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
                        "recv: fd:%d %z of %uz", c->fd, n, size);
 
-        if (n >= 0) {
+        if (n == 0) {
+            rev->ready = 0;
+            rev->eof = 1;
+
+#if (NGX_HAVE_KQUEUE)
+
+            /*
+             * on FreeBSD recv() may return 0 on closed socket
+             * even if kqueue reported about available data
+             */
+
+            if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
+                rev->available = 0;
+            }
+
+#endif
+
+            return 0;
+        }
+
+        if (n > 0) {
+
+#if (NGX_HAVE_KQUEUE)
+
             if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
                 rev->available -= n;
 
@@ -68,85 +93,13 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
                         rev->ready = 0;
                     }
 
-                    if (rev->available < 0) {
-                        rev->available = 0;
-                    }
-                }
-
-                if (n == 0) {
-
-                    /*
-                     * on FreeBSD recv() may return 0 on closed socket
-                     * even if kqueue reported about available data
-                     */
-
-                    rev->ready = 0;
-                    rev->eof = 1;
                     rev->available = 0;
                 }
 
                 return n;
             }
 
-            if ((size_t) n < size
-                && !(ngx_event_flags & NGX_USE_GREEDY_EVENT))
-            {
-                rev->ready = 0;
-            }
-
-            if (n == 0) {
-                rev->eof = 1;
-            }
-
-            return n;
-        }
-
-        err = ngx_socket_errno;
-
-        if (err == NGX_EAGAIN || err == NGX_EINTR) {
-            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
-                           "recv() not ready");
-            n = NGX_AGAIN;
-
-        } else {
-            n = ngx_connection_error(c, err, "recv() failed");
-            break;
-        }
-
-    } while (err == NGX_EINTR);
-
-    rev->ready = 0;
-
-    if (n == NGX_ERROR) {
-        rev->error = 1;
-    }
-
-    return n;
-}
-
-#else /* ! NGX_HAVE_KQUEUE */
-
-ssize_t
-ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
-{
-    ssize_t       n;
-    ngx_err_t     err;
-    ngx_event_t  *rev;
-
-    rev = c->read;
-
-    do {
-        n = recv(c->fd, buf, size, 0);
-
-        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "recv: fd:%d %z of %uz", c->fd, n, size);
-
-        if (n == 0) {
-            rev->ready = 0;
-            rev->eof = 1;
-            return n;
-
-        } else if (n > 0) {
+#endif
 
             if ((size_t) n < size
                 && !(ngx_event_flags & NGX_USE_GREEDY_EVENT))
@@ -179,5 +132,3 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 
     return n;
 }
-
-#endif /* NGX_HAVE_KQUEUE */
diff --git a/src/os/unix/ngx_udp_recv.c b/src/os/unix/ngx_udp_recv.c
index e03bf6c..6d544c2 100644
--- a/src/os/unix/ngx_udp_recv.c
+++ b/src/os/unix/ngx_udp_recv.c
@@ -10,8 +10,6 @@
 #include <ngx_event.h>
 
 
-#if (NGX_HAVE_KQUEUE)
-
 ssize_t
 ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 {
@@ -28,6 +26,9 @@ ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
                        "recv: fd:%d %z of %uz", c->fd, n, size);
 
         if (n >= 0) {
+
+#if (NGX_HAVE_KQUEUE)
+
             if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
                 rev->available -= n;
 
@@ -42,6 +43,8 @@ ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
                 }
             }
 
+#endif
+
             return n;
         }
 
@@ -67,49 +70,3 @@ ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 
     return n;
 }
-
-#else /* ! NGX_HAVE_KQUEUE */
-
-ssize_t
-ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
-{
-    ssize_t       n;
-    ngx_err_t     err;
-    ngx_event_t  *rev;
-
-    rev = c->read;
-
-    do {
-        n = recv(c->fd, buf, size, 0);
-
-        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "recv: fd:%d %z of %uz", c->fd, n, size);
-
-        if (n >= 0) {
-            return n;
-        }
-
-        err = ngx_socket_errno;
-
-        if (err == NGX_EAGAIN || err == NGX_EINTR) {
-            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
-                           "recv() not ready");
-            n = NGX_AGAIN;
-
-        } else {
-            n = ngx_connection_error(c, err, "recv() failed");
-            break;
-        }
-
-    } while (err == NGX_EINTR);
-
-    rev->ready = 0;
-
-    if (n == NGX_ERROR) {
-        rev->error = 1;
-    }
-
-    return n;
-}
-
-#endif /* NGX_HAVE_KQUEUE */

From 6706bbedf8ee04027fda78f8ab0e86b4947a4242 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 29 Apr 2016 10:31:44 +0300
Subject: [PATCH 070/600] New upstream release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4d4885f..411e3cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.10.0-1) UNRELEASED; urgency=medium
+
+  [ Christos Trochalakis ]
+  * New upstream release (1.10.0)
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 29 Apr 2016 10:31:21 +0300
+
 nginx (1.9.14-2) unstable; urgency=medium
 
   [ Christos Trochalakis ]

From 00cd95bfc14c7ee8035623f85f6be4359f5d75b0 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 29 Apr 2016 10:31:53 +0300
Subject: [PATCH 071/600] Release 1.10.0-1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 411e3cd..8e4cdbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-nginx (1.10.0-1) UNRELEASED; urgency=medium
+nginx (1.10.0-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
   * New upstream release (1.10.0)
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 29 Apr 2016 10:31:21 +0300
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 29 Apr 2016 10:31:46 +0300
 
 nginx (1.9.14-2) unstable; urgency=medium
 

From 7ffd2fc6a928e8f981a8d7375870d408817fe4ef Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 31 May 2016 15:54:45 +0300
Subject: [PATCH 072/600] Generate dbgsym packages only if dh_strip supports it

Makes backporting easier.
---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8e4cdbe..69fb1f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ nginx (1.10.0-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
   * New upstream release (1.10.0)
+  * debian/control:
+    + Generate dbgsym packages only if dh_strip supports it.
+      Thanks Faidon Liambotis for the hint.
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 29 Apr 2016 10:31:46 +0300
 
diff --git a/debian/rules b/debian/rules
index 63abd77..c21c307 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,7 +148,7 @@ strip.arch.%:
 	dh_strip --package=nginx-$(*) --dbg-package=nginx-$(*)-dbg
 
 strip.mods.%:
-	dh_strip --package=libnginx-mod-$(*) --automatic-dbgsym
+	dh_strip --package=libnginx-mod-$(*) -O--automatic-dbgsym
 
 config.arch.%:
 	dh_testdir

From 1b192da67cc8ce82a2fcc1c9889030cedd4a0182 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 31 May 2016 21:55:00 +0300
Subject: [PATCH 073/600] Imported Upstream version 1.10.1

---
 CHANGES                 | 7 +++++++
 CHANGES.ru              | 7 +++++++
 src/core/nginx.h        | 4 ++--
 src/os/unix/ngx_files.c | 5 +++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 408f952..4396472 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,11 @@
 
+Changes with nginx 1.10.1                                        31 May 2016
+
+    *) Security: a segmentation fault might occur in a worker process while
+       writing a specially crafted request body to a temporary file
+       (CVE-2016-4450); the bug had appeared in 1.3.9.
+
+
 Changes with nginx 1.10.0                                        26 Apr 2016
 
     *) 1.10.x stable branch.
diff --git a/CHANGES.ru b/CHANGES.ru
index 4e6002e..c96cf93 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,11 @@
 
+Изменения в nginx 1.10.1                                          31.05.2016
+
+    *) Безопасность: при записи тела специально созданного запроса во
+       временный файл в рабочем процессе мог происходить segmentation fault
+       (CVE-2016-4450); ошибка появилась в 1.3.9.
+
+
 Изменения в nginx 1.10.0                                          26.04.2016
 
     *) Стабильная ветка 1.10.x.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index fe78745..e2b8005 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1010000
-#define NGINX_VERSION      "1.10.0"
+#define nginx_version      1010001
+#define NGINX_VERSION      "1.10.1"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 65c79a2..7fbb7c9 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -356,6 +356,11 @@ ngx_chain_to_iovec(ngx_iovec_t *vec, ngx_chain_t *cl)
     n = 0;
 
     for ( /* void */ ; cl; cl = cl->next) {
+
+        if (ngx_buf_special(cl->buf)) {
+            continue;
+        }
+
         size = cl->buf->last - cl->buf->pos;
 
         if (prev == cl->buf->pos) {

From a1e2085dd78be871f4e226de667480a8c6e4e661 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 31 May 2016 22:00:26 +0300
Subject: [PATCH 074/600] Correctly add changelog entry to 1.10.0-2

---
 debian/changelog | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69fb1f9..451f3d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
+nginx (1.10.0-2) UNRELEASED; urgency=medium
+
+  [ Christos Trochalakis ]
+  * debian/control:
+    + Generate dbgsym packages only if dh_strip supports it.
+      Thanks Faidon Liambotis for the hint.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 31 May 2016 21:59:40 +0300
+
 nginx (1.10.0-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
   * New upstream release (1.10.0)
-  * debian/control:
-    + Generate dbgsym packages only if dh_strip supports it.
-      Thanks Faidon Liambotis for the hint.
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Fri, 29 Apr 2016 10:31:46 +0300
 

From 52025f4a8e64ffe9485c0bf10f286c710a2af6d3 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 31 May 2016 22:01:40 +0300
Subject: [PATCH 075/600] Release 1.10.1-1

---
 debian/changelog | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 451f3d1..d2f3264 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
-nginx (1.10.0-2) UNRELEASED; urgency=medium
+nginx (1.10.1-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
+  * New upstream release (1.10.1)
+    Fixes CVE-2016-4450
+    NULL pointer dereference while writing client request body.
+    (Closes: #825960)
+
   * debian/control:
     + Generate dbgsym packages only if dh_strip supports it.
       Thanks Faidon Liambotis for the hint.
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 31 May 2016 21:59:40 +0300
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 31 May 2016 22:01:25 +0300
 
 nginx (1.10.0-1) unstable; urgency=medium
 

From 60cdfb206953b55792c1303420d664c072fcfff2 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 7 Jun 2016 10:46:33 +0300
Subject: [PATCH 076/600] Only build against liblua5.1-0-dev when libluajit is
 not available

---
 debian/changelog | 9 +++++++++
 debian/control   | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d2f3264..bad7a82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nginx (1.10.1-2) UNRELEASED; urgency=medium
+
+  [ Christos Trochalakis ]
+  * debian/control:
+    Don't allow building against liblua5.1-0-dev on architectures
+    that libluajit is available.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 07 Jun 2016 10:47:36 +0300
+
 nginx (1.10.1-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]
diff --git a/debian/control b/debian/control
index 52baf37..0c7f2cb 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends: autotools-dev,
                libexpat-dev,
                libgd-dev,
                libgeoip-dev,
-               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel] | liblua5.1-0-dev,
+               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel],
+               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !armel !armhf !powerpc !powerpcspe !mips !mipsel],
                libmhash-dev,
                libpam0g-dev,
                libpcre3-dev,

From 15695dee6eafdc463f3b8d7844ec6241e2919864 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 7 Jul 2016 11:25:23 +0300
Subject: [PATCH 077/600] Re-enable experimental flow for 1.11.x

---
 debian/README.Packaging | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/debian/README.Packaging b/debian/README.Packaging
index 61358da..bbb7875 100644
--- a/debian/README.Packaging
+++ b/debian/README.Packaging
@@ -25,15 +25,10 @@ split each module to a separate source.
 
 [0] https://www.nginx.com/blog/dynamic-modules-nginx-1-9-11/
 
-Workflow for Experimental (not-active)
-======================================
+Workflow for Experimental
+=========================
 
-Now that nginx 1.6.0 is released there is no plan to package mainline 1.7
-releases to experimental. The following guide is been kept as a reference.
-
---------
-
-Nginx mainline releases (1.5.x series) are been packaged for experimental,
+Nginx mainline releases (1.11.x series) are been packaged for experimental,
 as they lack security support.
 
 The workflow we use is based on the assumption that packaging work happens on
@@ -41,7 +36,7 @@ origin/master and experimental builds are a trivial patch away from that.
 
 The direct consequense of treating experimental as a patchset for origin/master
 is that the relevant branches are forced-pushed whenever we release a new
-1.5.x version. In other words, **it is not safe to base your work on the
+1.11.x version. In other words, **it is not safe to base your work on the
 experimental branch**.
 
 This is a brief description of our experimental branches and how we are using
@@ -50,27 +45,27 @@ them.
 * experimental-base
   Force-pushed when origin/master changes.
 
-  experimental-base tracks the changes needed for building the 1.5.x branch,
-  such as new configure parameters, etc. On new 1.5.x releases, it is rebased
+  experimental-base tracks the changes needed for building the 1.11.x branch,
+  such as new configure parameters, etc. On new 1.11.x releases, it is rebased
   on origin/master so it is always up-to-date with our latest packaging work.
 
 * experimental
-  Force-pushed on every 1.5.x release.
+  Force-pushed on every 1.11.x release.
 
-  This branch points to the latest 1.5.x release.
+  This branch points to the latest 1.11.x release.
   Before release this branch is reset to experimental-base, and then merged
-  with the new upstream-1.5 branch. Finally all the release specific changes
+  with the new upstream-1.11 branch. Finally all the release specific changes
   are commited (changelog entry etc) and the build is made.
 
-* upstream-1.5
-  Force-pushed on every 1.5.x release.
+* upstream-1.11
+  Force-pushed on every 1.11.x release.
 
-  Before a new 1.5.x release the branch is reset to origin/upstream.
-  This is a technicallity so we can avoid resolving conflicts when a new 1.4.x
+  Before a new 1.11.x release the branch is reset to origin/upstream.
+  This is a technicallity so we can avoid resolving conflicts when a new 1.10.x
   release happens between two experimental releases.
 
-Older 1.5.x releases are not referenced by any branch, but they can be found by
-the relevant debian/* tag.
+Older 1.11.x releases are not referenced by any branch, but they can be found
+by the relevant debian/* tag.
 
 3rd party experimental workflow
 ===============================

From a4f9f837e7b2bf4fba78462df3e226e03e88b4ac Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Sat, 16 Jul 2016 17:30:40 -0700
Subject: [PATCH 078/600] Implemented patch in bug 826061.

---
 debian/changelog                              |  7 +++++-
 ...ource-on-other-glibc-based-platforms.patch | 23 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch

diff --git a/debian/changelog b/debian/changelog
index bad7a82..f2a7ab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,12 @@ nginx (1.10.1-2) UNRELEASED; urgency=medium
     Don't allow building against liblua5.1-0-dev on architectures
     that libluajit is available.
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 07 Jun 2016 10:47:36 +0300
+  [ Michael Lustfield ]
+  * debian/patches/0003-*.patch:
+    + Use _GNU_SOURCE on GNU/kFreeBSD (Closes: #826061)
+      Thanks Steven Chamberlain for the patch.
+
+ -- Michael Lustfield <michael@lustfield.net>  Sat, 16 Jul 2016 17:24:40 -0700
 
 nginx (1.10.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch b/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch
new file mode 100644
index 0000000..bb9b089
--- /dev/null
+++ b/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch
@@ -0,0 +1,23 @@
+Date: Sat, 16 Jul 2016 23:52:50 +0100
+From: Steven Chamberlain <stevenc@debian.org>
+Subject: Use _GNU_SOURCE on GNU/kFreeBSD
+
+Define _GNU_SOURCE not only on GNU/Hurd, but also other glibc-based
+platforms including GNU/kFreeBSD.
+--- a/src/os/unix/ngx_posix_config.h
++++ b/src/os/unix/ngx_posix_config.h
+@@ -21,10 +21,13 @@
+ #endif
+ 
+ 
+-#if (NGX_GNU_HURD)
++#if defined(__GLIBC__)
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE             /* accept4() */
+ #endif
++#endif
++
++#if (NGX_GNU_HURD)
+ #define _FILE_OFFSET_BITS       64
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 04b971f..f3ccceb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 perl-use-dpkg-buildflags.patch
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
+0003-define_gnu_source-on-other-glibc-based-platforms.patch

From 1b3fa883bbc71ab8fe1ddf0199f60850726a3957 Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Sat, 16 Jul 2016 19:14:08 -0700
Subject: [PATCH 079/600] Make nginx-*.postinst use invoke-rc.d.

---
 debian/changelog             |  5 ++++-
 debian/nginx-extras.postinst | 15 +--------------
 debian/nginx-full.postinst   | 15 +--------------
 debian/nginx-light.postinst  | 15 +--------------
 4 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2a7ab6..52c4dcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ nginx (1.10.1-2) UNRELEASED; urgency=medium
 
   [ Michael Lustfield ]
   * debian/patches/0003-*.patch:
-    + Use _GNU_SOURCE on GNU/kFreeBSD (Closes: #826061)
+    + Use _GNU_SOURCE on GNU/kFreeBSD. (Closes: #826061)
       Thanks Steven Chamberlain for the patch.
+  * debian/nginx-*.postinst:
+    + Make nginx-*.postinst use invoke-rc.d. (Closes: #823435)
+      Thanks Simon Deziel for the patch.
 
  -- Michael Lustfield <michael@lustfield.net>  Sat, 16 Jul 2016 17:24:40 -0700
 
diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst
index bd9c818..4ea6d9d 100644
--- a/debian/nginx-extras.postinst
+++ b/debian/nginx-extras.postinst
@@ -13,20 +13,7 @@ esac
 
 if [ -x /etc/init.d/nginx ]; then
   if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-    NGX_PID=`cat /run/nginx.pid`
-    if kill -s USR2 $NGX_PID 2>/dev/null; then
-      while [ ! -s /run/nginx.pid.oldbin ] || [ ! -s /run/nginx.pid ]; do
-        cnt=`expr $cnt + 1`
-        if [ $cnt -gt 10 ]; then
-          kill -s KILL $NGX_PID
-          invoke-rc.d nginx start
-          exit 0
-        fi
-        sleep 1
-      done
-      NGX_OLD_PID=`cat /run/nginx.pid.oldbin`
-      kill -s QUIT $NGX_OLD_PID
-    fi
+    invoke-rc.d nginx upgrade || exit $?
   else
     invoke-rc.d nginx start || exit $?
   fi
diff --git a/debian/nginx-full.postinst b/debian/nginx-full.postinst
index bd9c818..4ea6d9d 100644
--- a/debian/nginx-full.postinst
+++ b/debian/nginx-full.postinst
@@ -13,20 +13,7 @@ esac
 
 if [ -x /etc/init.d/nginx ]; then
   if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-    NGX_PID=`cat /run/nginx.pid`
-    if kill -s USR2 $NGX_PID 2>/dev/null; then
-      while [ ! -s /run/nginx.pid.oldbin ] || [ ! -s /run/nginx.pid ]; do
-        cnt=`expr $cnt + 1`
-        if [ $cnt -gt 10 ]; then
-          kill -s KILL $NGX_PID
-          invoke-rc.d nginx start
-          exit 0
-        fi
-        sleep 1
-      done
-      NGX_OLD_PID=`cat /run/nginx.pid.oldbin`
-      kill -s QUIT $NGX_OLD_PID
-    fi
+    invoke-rc.d nginx upgrade || exit $?
   else
     invoke-rc.d nginx start || exit $?
   fi
diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst
index bd9c818..4ea6d9d 100644
--- a/debian/nginx-light.postinst
+++ b/debian/nginx-light.postinst
@@ -13,20 +13,7 @@ esac
 
 if [ -x /etc/init.d/nginx ]; then
   if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-    NGX_PID=`cat /run/nginx.pid`
-    if kill -s USR2 $NGX_PID 2>/dev/null; then
-      while [ ! -s /run/nginx.pid.oldbin ] || [ ! -s /run/nginx.pid ]; do
-        cnt=`expr $cnt + 1`
-        if [ $cnt -gt 10 ]; then
-          kill -s KILL $NGX_PID
-          invoke-rc.d nginx start
-          exit 0
-        fi
-        sleep 1
-      done
-      NGX_OLD_PID=`cat /run/nginx.pid.oldbin`
-      kill -s QUIT $NGX_OLD_PID
-    fi
+    invoke-rc.d nginx upgrade || exit $?
   else
     invoke-rc.d nginx start || exit $?
   fi

From 1445c1403ca7cc0eb3030cb74525f2bbc4b8e9f8 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 29 Jul 2016 16:16:43 +0300
Subject: [PATCH 080/600] *.postinst: Make sure we restart nginx if on-the-fly
 upgrade fails

Complements Mike's 1b3fa883.
---
 debian/nginx-extras.postinst | 3 ++-
 debian/nginx-full.postinst   | 3 ++-
 debian/nginx-light.postinst  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst
index 4ea6d9d..9c2605d 100644
--- a/debian/nginx-extras.postinst
+++ b/debian/nginx-extras.postinst
@@ -13,7 +13,8 @@ esac
 
 if [ -x /etc/init.d/nginx ]; then
   if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-    invoke-rc.d nginx upgrade || exit $?
+    invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
+    exit $?
   else
     invoke-rc.d nginx start || exit $?
   fi
diff --git a/debian/nginx-full.postinst b/debian/nginx-full.postinst
index 4ea6d9d..9c2605d 100644
--- a/debian/nginx-full.postinst
+++ b/debian/nginx-full.postinst
@@ -13,7 +13,8 @@ esac
 
 if [ -x /etc/init.d/nginx ]; then
   if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-    invoke-rc.d nginx upgrade || exit $?
+    invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
+    exit $?
   else
     invoke-rc.d nginx start || exit $?
   fi
diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst
index 4ea6d9d..9c2605d 100644
--- a/debian/nginx-light.postinst
+++ b/debian/nginx-light.postinst
@@ -13,7 +13,8 @@ esac
 
 if [ -x /etc/init.d/nginx ]; then
   if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-    invoke-rc.d nginx upgrade || exit $?
+    invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
+    exit $?
   else
     invoke-rc.d nginx start || exit $?
   fi

From 0f2905a7e013b0604e77c5640d10203476012ef9 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 29 Jul 2016 16:31:20 +0300
Subject: [PATCH 081/600] mod: Upgrade nginx-lua to v0.10.5

---
 debian/changelog                              |   2 +
 debian/modules/README.Modules-versions        |   2 +-
 debian/modules/nginx-lua/README.markdown      |  17 +-
 debian/modules/nginx-lua/config               |  47 +++++
 .../modules/nginx-lua/doc/HttpLuaModule.wiki  |  17 +-
 .../nginx-lua/dtrace/ngx_lua_provider.d       |  24 +--
 .../nginx-lua/src/api/ngx_http_lua_api.h      |   2 +-
 .../nginx-lua/src/ngx_http_lua_balancer.c     |   6 +-
 .../nginx-lua/src/ngx_http_lua_common.h       |   5 +-
 .../nginx-lua/src/ngx_http_lua_control.c      |   5 +-
 .../nginx-lua/src/ngx_http_lua_directive.c    |  23 +--
 .../nginx-lua/src/ngx_http_lua_initworkerby.c |  25 ++-
 .../modules/nginx-lua/src/ngx_http_lua_misc.c |   8 +
 .../nginx-lua/src/ngx_http_lua_module.c       |  69 +++++--
 .../nginx-lua/src/ngx_http_lua_output.c       |  14 +-
 .../nginx-lua/src/ngx_http_lua_regex.c        |  42 +++--
 .../nginx-lua/src/ngx_http_lua_req_body.c     |  35 +++-
 .../nginx-lua/src/ngx_http_lua_semaphore.c    | 173 ++++++++++--------
 .../nginx-lua/src/ngx_http_lua_semaphore.h    |  18 +-
 .../nginx-lua/src/ngx_http_lua_socket_tcp.c   |   4 +-
 .../nginx-lua/src/ngx_http_lua_ssl_certby.c   |  13 ++
 .../nginx-lua/src/ngx_http_lua_ssl_ocsp.c     |   6 +
 .../nginx-lua/src/ngx_http_lua_timer.c        |   1 -
 .../modules/nginx-lua/src/ngx_http_lua_util.c |  10 +-
 .../nginx-lua/src/ngx_http_lua_variable.c     |   3 +-
 .../nginx-lua/src/ngx_http_lua_worker.c       |  13 ++
 debian/modules/nginx-lua/t/015-status.t       |  23 ++-
 debian/modules/nginx-lua/t/024-access/mixed.t |  14 ++
 debian/modules/nginx-lua/t/034-match.t        |  23 ++-
 debian/modules/nginx-lua/t/043-shdict.t       |   2 +-
 debian/modules/nginx-lua/t/044-req-body.t     | 108 +++++++++++
 debian/modules/nginx-lua/t/058-tcp-socket.t   |   4 +-
 debian/modules/nginx-lua/t/087-udp-socket.t   |   4 +-
 debian/modules/nginx-lua/t/129-ssl-socket.t   |  36 +++-
 debian/modules/nginx-lua/t/132-lua-blocks.t   |  35 +++-
 debian/modules/nginx-lua/t/135-worker-id.t    |  66 ++++++-
 debian/modules/nginx-lua/t/139-ssl-cert-by.t  |  95 ++++++++++
 debian/modules/nginx-lua/t/140-ssl-c-api.t    | 138 +++++++++++++-
 debian/modules/nginx-lua/t/141-luajit.t       |  47 +++++
 .../t/data/fake-module/ngx_http_fake_module.c |   2 -
 debian/modules/nginx-lua/util/build.sh        |   2 +-
 41 files changed, 961 insertions(+), 222 deletions(-)
 create mode 100644 debian/modules/nginx-lua/t/141-luajit.t

diff --git a/debian/changelog b/debian/changelog
index 52c4dcf..a0528da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ nginx (1.10.1-2) UNRELEASED; urgency=medium
   * debian/control:
     Don't allow building against liblua5.1-0-dev on architectures
     that libluajit is available.
+  * debian/modules/nginx-lua:
+    + Update nginx-lua to v0.10.5
 
   [ Michael Lustfield ]
   * debian/patches/0003-*.patch:
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index d7f35a4..b71b1e0 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -22,7 +22,7 @@ README for Modules versions
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
-  Version: v0.10.2
+  Version: v0.10.5
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/nginx-lua/README.markdown
index 4e8f9bd..14e9ecc 100644
--- a/debian/modules/nginx-lua/README.markdown
+++ b/debian/modules/nginx-lua/README.markdown
@@ -62,7 +62,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.2](https://github.com/openresty/lua-nginx-module/tags) released on 8 March 2016.
+This document describes ngx_lua [v0.10.5](https://github.com/openresty/lua-nginx-module/tags) released on 25 May 2016.
 
 Synopsis
 ========
@@ -249,7 +249,7 @@ Nginx Compatibility
 
 The latest version of this module is compatible with the following versions of Nginx:
 
-* 1.9.x (last tested: 1.9.7)
+* 1.9.x (last tested: 1.9.15)
 * 1.8.x
 * 1.7.x (last tested: 1.7.10)
 * 1.6.x
@@ -274,9 +274,9 @@ Build the source with this module:
 
 ```bash
 
- wget 'http://nginx.org/download/nginx-1.9.7.tar.gz'
- tar -xzvf nginx-1.9.7.tar.gz
- cd nginx-1.9.7/
+ wget 'http://nginx.org/download/nginx-1.9.15.tar.gz'
+ tar -xzvf nginx-1.9.15.tar.gz
+ cd nginx-1.9.15/
 
  # tell nginx's build system where to find LuaJIT 2.0:
  export LUAJIT_LIB=/path/to/luajit/lib
@@ -926,7 +926,7 @@ filtering chain determines the final output, for example. The correct adding ord
 	* memcached: listening on the default port, 11211.
 	* redis: listening on the default port, 6379.
 
-See also the [developer build script](https://github.com/openresty/lua-nginx-module/blob/master/util/build2.sh) for more details on setting up the testing environment.
+See also the [developer build script](https://github.com/openresty/lua-nginx-module/blob/master/util/build.sh) for more details on setting up the testing environment.
 
 To run the whole test suite in the default testing mode:
 
@@ -1060,6 +1060,11 @@ Directives
 * [lua_max_running_timers](#lua_max_running_timers)
 
 
+The basic building blocks of scripting Nginx with Lua are directives. Directives are used to specify when the user Lua code is run and
+how the result will be used. Below is a diagram showing the order in which directives are executed.
+
+![Lua Nginx Modules Directives](https://cloud.githubusercontent.com/assets/2137369/15272097/77d1c09e-1a37-11e6-97ef-d9767035fc3e.png)
+
 [Back to TOC](#table-of-contents)
 
 lua_use_default_type
diff --git a/debian/modules/nginx-lua/config b/debian/modules/nginx-lua/config
index 3c2548b..c91a07e 100644
--- a/debian/modules/nginx-lua/config
+++ b/debian/modules/nginx-lua/config
@@ -466,6 +466,53 @@ ngx_feature_test='setsockopt(1, SOL_SOCKET, SO_PASSCRED, NULL, 0);'
 
 . auto/feature
 
+ngx_feature="mmap(sbrk(0))"
+ngx_feature_libs=
+ngx_feature_name="NGX_HTTP_LUA_HAVE_MMAP_SBRK"
+ngx_feature_run=yes
+ngx_feature_incs="#include <unistd.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <sys/mman.h>
+#define align_ptr(p, a)                                                   \
+    (u_char *) (((uintptr_t) (p) + ((uintptr_t) a - 1)) & ~((uintptr_t) a - 1))
+"
+ngx_feature_test="
+#if defined(__x86_64__)
+exit(mmap(align_ptr(sbrk(0), getpagesize()), 1, PROT_READ,
+          MAP_FIXED|MAP_PRIVATE|MAP_ANON, -1, 0) < (void *) 0x40000000LL
+          ? 0 : 1);
+#else
+exit(1);
+#endif
+"
+SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
+
+. auto/feature
+
+CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+
+ngx_feature="__attribute__(constructor)"
+ngx_feature_libs=
+ngx_feature_name="NGX_HTTP_LUA_HAVE_CONSTRUCTOR"
+ngx_feature_run=yes
+ngx_feature_incs="#include <stdlib.h>
+int a = 2;
+__attribute__((constructor))
+static void foo(void)
+{
+    a = 0;
+}
+"
+ngx_feature_test="exit(a);"
+SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
+
+. auto/feature
+
+CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+
 if test -n "$ngx_module_link"; then
     ngx_module_type=HTTP_AUX_FILTER
     ngx_module_name=$ngx_addon_name
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
index f6824ef..78ce13c 100644
--- a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.2] released on 8 March 2016.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.5] released on 25 May 2016.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -186,7 +186,7 @@ The Lua state (Lua VM instance) is shared across all the requests handled by a s
 
 The latest version of this module is compatible with the following versions of Nginx:
 
-* 1.9.x (last tested: 1.9.7)
+* 1.9.x (last tested: 1.9.15)
 * 1.8.x
 * 1.7.x (last tested: 1.7.10)
 * 1.6.x
@@ -207,9 +207,9 @@ Alternatively, ngx_lua can be manually compiled into Nginx:
 Build the source with this module:
 
 <geshi lang="bash">
-    wget 'http://nginx.org/download/nginx-1.9.7.tar.gz'
-    tar -xzvf nginx-1.9.7.tar.gz
-    cd nginx-1.9.7/
+    wget 'http://nginx.org/download/nginx-1.9.15.tar.gz'
+    tar -xzvf nginx-1.9.15.tar.gz
+    cd nginx-1.9.15/
 
     # tell nginx's build system where to find LuaJIT 2.0:
     export LUAJIT_LIB=/path/to/luajit/lib
@@ -754,7 +754,7 @@ filtering chain determines the final output, for example. The correct adding ord
 ** memcached: listening on the default port, 11211.
 ** redis: listening on the default port, 6379.
 
-See also the [https://github.com/openresty/lua-nginx-module/blob/master/util/build2.sh developer build script] for more details on setting up the testing environment.
+See also the [https://github.com/openresty/lua-nginx-module/blob/master/util/build.sh developer build script] for more details on setting up the testing environment.
 
 To run the whole test suite in the default testing mode:
 <geshi lang="text">
@@ -820,6 +820,11 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 <!-- inline-toc -->
 
+The basic building blocks of scripting Nginx with Lua are directives. Directives are used to specify when the user Lua code is run and
+how the result will be used. Below is a diagram showing the order in which directives are executed.
+
+![Lua Nginx Modules Directives](https://cloud.githubusercontent.com/assets/2137369/15272097/77d1c09e-1a37-11e6-97ef-d9767035fc3e.png)
+
 == lua_use_default_type ==
 '''syntax:''' ''lua_use_default_type on | off''
 
diff --git a/debian/modules/nginx-lua/dtrace/ngx_lua_provider.d b/debian/modules/nginx-lua/dtrace/ngx_lua_provider.d
index 3767f9b..394484c 100644
--- a/debian/modules/nginx-lua/dtrace/ngx_lua_provider.d
+++ b/debian/modules/nginx-lua/dtrace/ngx_lua_provider.d
@@ -4,48 +4,48 @@ provider nginx_lua {
     /* 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,
+    probe http__lua__req__socket__consume__preread(void *r,
             u_char *data, size_t len);
 
     /* lua_State *parent, lua_State *child */
-    probe http__lua__user__coroutine__create(ngx_http_request_t *r,
+    probe http__lua__user__coroutine__create(void *r,
             void *parent, void *child);
 
     /* lua_State *parent, lua_State *child */
-    probe http__lua__user__coroutine__resume(ngx_http_request_t *r,
+    probe http__lua__user__coroutine__resume(void *r,
                                              void *parent, void *child);
 
     /* lua_State *parent, lua_State *child */
-    probe http__lua__user__coroutine__yield(ngx_http_request_t *r,
+    probe http__lua__user__coroutine__yield(void *r,
                                             void *parent, void *child);
 
     /* lua_State *L */
-    probe http__lua__thread__yield(ngx_http_request_t *r, void *L);
+    probe http__lua__thread__yield(void *r, void *L);
 
     /* ngx_http_lua_socket_tcp_upstream_t *u */
-    probe http__lua__socket__tcp__send__start(ngx_http_request_t *r,
+    probe http__lua__socket__tcp__send__start(void *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,
+    probe http__lua__socket__tcp__receive__done(void *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);
+            void *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,
+    probe http__lua__user__thread__spawn(void *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);
+    probe http__lua__thread__delete(void *r, void *thread, void *ctx);
 
     /* lua_State *thread */
-    probe http__lua__run__posted__thread(ngx_http_request_t *r, void *thread,
+    probe http__lua__run__posted__thread(void *r, void *thread,
             int status);
 
-    probe http__lua__coroutine__done(ngx_http_request_t *r, void *co,
+    probe http__lua__coroutine__done(void *r, void *co,
             int success);
 
     /* lua_State *parent, lua_State *child */
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 a15d40e..4bac0f6 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
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10001
+#define ngx_http_lua_version  10005
 
 
 typedef struct {
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
index a2c66be..5fa289b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
@@ -29,7 +29,7 @@ struct ngx_http_lua_balancer_peer_data_s {
     struct sockaddr                    *sockaddr;
     socklen_t                           socklen;
 
-    ngx_str_t                           host;
+    ngx_str_t                          *host;
     in_port_t                           port;
 
     int                                 last_peer_state;
@@ -322,9 +322,9 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
     if (bp->sockaddr && bp->socklen) {
         pc->sockaddr = bp->sockaddr;
         pc->socklen = bp->socklen;
-        pc->name = &bp->host;
         pc->cached = 0;
         pc->connection = NULL;
+        pc->name = bp->host;
 
         bp->rrp.peers->single = 0;
 
@@ -525,7 +525,7 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
     if (url.addrs && url.addrs[0].sockaddr) {
         bp->sockaddr = url.addrs[0].sockaddr;
         bp->socklen = url.addrs[0].socklen;
-        bp->host = url.addrs[0].name;
+        bp->host = &url.addrs[0].name;
 
     } else {
         *err = "no host allowed";
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 e7b9969..758c42a 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_common.h
@@ -123,7 +123,7 @@ typedef struct ngx_http_lua_balancer_peer_data_s
     ngx_http_lua_balancer_peer_data_t;
 
 
-typedef struct ngx_http_lua_semaphore_mm_s  ngx_http_lua_semaphore_mm_t;
+typedef struct ngx_http_lua_sema_mm_s  ngx_http_lua_sema_mm_t;
 
 
 typedef ngx_int_t (*ngx_http_lua_main_conf_handler_pt)(ngx_log_t *log,
@@ -182,7 +182,7 @@ struct ngx_http_lua_main_conf_s {
 
     ngx_uint_t                      shm_zones_inited;
 
-    ngx_http_lua_semaphore_mm_t    *semaphore_mm;
+    ngx_http_lua_sema_mm_t         *sema_mm;
 
     unsigned             requires_header_filter:1;
     unsigned             requires_body_filter:1;
@@ -502,6 +502,7 @@ typedef struct ngx_http_lua_ctx_s {
                                                   socket */
     unsigned         acquired_raw_req_socket:1;  /* whether a raw req socket
                                                     is acquired */
+    unsigned         seen_body_data:1;
 } ngx_http_lua_ctx_t;
 
 
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 0e1dd47..4c5f65e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_control.c
@@ -459,6 +459,7 @@ ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
                                        | NGX_HTTP_LUA_CONTEXT_CONTENT
                                        | NGX_HTTP_LUA_CONTEXT_TIMER
                                        | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
+                                       | NGX_HTTP_LUA_CONTEXT_BALANCER
                                        | NGX_HTTP_LUA_CONTEXT_SSL_CERT,
                                        err, errlen)
         != NGX_OK)
@@ -519,7 +520,9 @@ ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua exit with code %i", ctx->exit_code);
 
-    if (ctx->context & NGX_HTTP_LUA_CONTEXT_HEADER_FILTER) {
+    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
+                        | NGX_HTTP_LUA_CONTEXT_BALANCER))
+    {
         return NGX_DONE;
     }
 
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 7ac8c28..e6bc339 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
@@ -1417,20 +1417,8 @@ ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf, ngx_command_t *cmd)
             break;
 
         case FOUND_LBRACKET_STR:
-
-            break;
-
         case FOUND_LBRACKET_CMT:
-
-            break;
-
         case FOUND_RIGHT_LBRACKET:
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "unexpected lua closing long-bracket");
-            goto failed;
-
-            break;
-
         case FOUND_COMMENT_LINE:
         case FOUND_DOUBLE_QUOTED:
         case FOUND_SINGLE_QUOTED:
@@ -1492,7 +1480,10 @@ ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
 
     for ( ;; ) {
 
-        if (b->pos >= b->last) {
+        if (b->pos >= b->last
+            || (b->last - b->pos < (b->end - b->start) / 3
+                && cf->conf_file->file.offset < file_size))
+        {
 
             if (cf->conf_file->file.offset >= file_size) {
 
@@ -1505,7 +1496,7 @@ ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
                 return NGX_ERROR;
             }
 
-            len = b->pos - start;
+            len = b->last - start;
 
             if (len == buf_size) {
 
@@ -1543,8 +1534,8 @@ ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
                 return NGX_ERROR;
             }
 
-            b->pos = b->start + len;
-            b->last = b->pos + n;
+            b->pos = b->start + (b->pos - start);
+            b->last = b->start + len + n;
             start = b->start;
 
 #if nginx_version >= 1009002
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
index 8a374c2..6754b4b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
@@ -34,7 +34,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     ngx_http_request_t          *r = NULL;
     ngx_http_lua_ctx_t          *ctx;
     ngx_http_conf_ctx_t         *conf_ctx, http_ctx;
-    ngx_http_lua_loc_conf_t     *llcf, *top_llcf;
+    ngx_http_lua_loc_conf_t     *top_llcf;
     ngx_http_lua_main_conf_t    *lmcf;
     ngx_http_core_loc_conf_t    *clcf, *top_clcf;
 
@@ -198,9 +198,17 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
             http_ctx.loc_conf[modules[i]->ctx_index] = cur;
 
             if (module->merge_loc_conf) {
-                prev = module->create_loc_conf(&conf);
-                if (prev == NULL) {
-                    return NGX_ERROR;
+                if (modules[i] == &ngx_http_lua_module) {
+                    prev = top_llcf;
+
+                } else if (modules[i] == &ngx_http_core_module) {
+                    prev = top_clcf;
+
+                } else {
+                    prev = module->create_loc_conf(&conf);
+                    if (prev == NULL) {
+                        return NGX_ERROR;
+                    }
                 }
 
                 rv = module->merge_loc_conf(&conf, prev, cur);
@@ -254,10 +262,6 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
 
 #endif
 
-    if (top_clcf->resolver) {
-        clcf->resolver = top_clcf->resolver;
-    }
-
     ctx = ngx_http_lua_create_ctx(r);
     if (ctx == NULL) {
         goto failed;
@@ -267,11 +271,6 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     ctx->cur_co_ctx = NULL;
     r->read_event_handler = ngx_http_block_reading;
 
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-    if (top_llcf->log_socket_errors != NGX_CONF_UNSET) {
-        llcf->log_socket_errors = top_llcf->log_socket_errors;
-    }
-
     ngx_http_lua_set_req(lmcf->lua, r);
 
     (void) lmcf->init_worker_handler(cycle->log, lmcf, lmcf->lua);
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 e3c7ec7..f96e2f2 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_misc.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_misc.c
@@ -160,6 +160,10 @@ ngx_http_lua_ngx_set(lua_State *L)
             return 0;
         }
 
+        if (r->err_status) {
+            r->err_status = 0;
+        }
+
         ngx_http_lua_check_fake_request(L, r);
 
         /* get the value */
@@ -235,6 +239,10 @@ ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int status)
 
     r->headers_out.status = status;
 
+    if (r->err_status) {
+        r->err_status = 0;
+    }
+
     if (status == 101) {
         /*
          * XXX work-around a bug in the Nginx core older than 1.5.5
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 11eb653..867661c 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
@@ -43,6 +43,14 @@ static char *ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data);
 static ngx_int_t ngx_http_lua_set_ssl(ngx_conf_t *cf,
     ngx_http_lua_loc_conf_t *llcf);
 #endif
+#if (NGX_HTTP_LUA_HAVE_MMAP_SBRK) && (NGX_LINUX)
+/* we cannot use "static" for this function since it may lead to compiler
+ * warnings */
+void ngx_http_lua_limit_data_segment(void);
+#   if !(NGX_HTTP_LUA_HAVE_CONSTRUCTOR)
+static ngx_int_t ngx_http_lua_pre_config(ngx_conf_t *cf);
+#   endif
+#endif
 
 
 static ngx_conf_post_t  ngx_http_lua_lowat_post =
@@ -545,7 +553,13 @@ static ngx_command_t ngx_http_lua_cmds[] = {
 
 
 ngx_http_module_t ngx_http_lua_module_ctx = {
+#if (NGX_HTTP_LUA_HAVE_MMAP_SBRK)                                            \
+    && (NGX_LINUX)                                                           \
+    && !(NGX_HTTP_LUA_HAVE_CONSTRUCTOR)
+    ngx_http_lua_pre_config,          /*  preconfiguration */
+#else
     NULL,                             /*  preconfiguration */
+#endif
     ngx_http_lua_init,                /*  postconfiguration */
 
     ngx_http_lua_create_main_conf,    /*  create main configuration */
@@ -675,7 +689,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
     }
 
     cln->data = lmcf;
-    cln->handler = ngx_http_lua_cleanup_semaphore_mm;
+    cln->handler = ngx_http_lua_sema_mm_cleanup;
 
 #endif
 
@@ -747,8 +761,9 @@ ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data)
 static void *
 ngx_http_lua_create_main_conf(ngx_conf_t *cf)
 {
+    ngx_int_t       rc;
+
     ngx_http_lua_main_conf_t    *lmcf;
-    ngx_http_lua_semaphore_mm_t *mm;
 
     lmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_main_conf_t));
     if (lmcf == NULL) {
@@ -787,24 +802,10 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
     lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
     lmcf->postponed_to_access_phase_end = NGX_CONF_UNSET;
 
-    mm = ngx_palloc(cf->pool, sizeof(ngx_http_lua_semaphore_mm_t));
-    if (mm == NULL) {
+    rc = ngx_http_lua_sema_mm_init(cf, lmcf);
+    if (rc != NGX_OK) {
         return NULL;
     }
-
-    lmcf->semaphore_mm = mm;
-    mm->lmcf = lmcf;
-
-    ngx_queue_init(&mm->free_queue);
-    mm->cur_epoch = 0;
-    mm->total = 0;
-    mm->used = 0;
-
-    /* it's better to be 4096, but it needs some space for
-     * ngx_http_lua_semaphore_mm_block_t, one is enough, so it is 4095
-     */
-    mm->num_per_block = 4095;
-
     dd("nginx Lua module main config structure initialized!");
 
     return lmcf;
@@ -876,6 +877,7 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     if (conf->ssl.cert_src.len == 0) {
         conf->ssl.cert_src = prev->ssl.cert_src;
+        conf->ssl.cert_src_key = prev->ssl.cert_src_key;
         conf->ssl.cert_handler = prev->ssl.cert_handler;
     }
 
@@ -1158,4 +1160,35 @@ ngx_http_lua_set_ssl(ngx_conf_t *cf, ngx_http_lua_loc_conf_t *llcf)
 
 #endif  /* NGX_HTTP_SSL */
 
+
+#if (NGX_HTTP_LUA_HAVE_MMAP_SBRK)                                            \
+    && (NGX_LINUX)                                                           \
+    && !(NGX_HTTP_LUA_HAVE_CONSTRUCTOR)
+static ngx_int_t
+ngx_http_lua_pre_config(ngx_conf_t *cf)
+{
+    ngx_http_lua_limit_data_segment();
+    return NGX_OK;
+}
+#endif
+
+
+/*
+ * we simply assume that LuaJIT is used. it does little harm when the
+ * standard Lua 5.1 interpreter is used instead.
+ */
+#if (NGX_HTTP_LUA_HAVE_MMAP_SBRK) && (NGX_LINUX)
+#   if (NGX_HTTP_LUA_HAVE_CONSTRUCTOR)
+__attribute__((constructor))
+#   endif
+void
+ngx_http_lua_limit_data_segment(void)
+{
+    if (sbrk(0) < (void *) 0x40000000LL) {
+        mmap(ngx_align_ptr(sbrk(0), getpagesize()), 1, PROT_READ,
+             MAP_FIXED|MAP_PRIVATE|MAP_ANON, -1, 0);
+    }
+}
+#endif
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
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 ef816d2..b410ba4 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_output.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_output.c
@@ -147,11 +147,19 @@ ngx_http_lua_ngx_echo(lua_State *L, unsigned newline)
     }
 
     if (size == 0) {
-        /* do nothing for empty strings */
+        rc = ngx_http_lua_send_header_if_needed(r, ctx);
+        if (rc == NGX_ERROR || rc > NGX_OK) {
+            lua_pushnil(L);
+            lua_pushliteral(L, "nginx output filter error");
+            return 2;
+        }
+
         lua_pushinteger(L, 1);
         return 1;
     }
 
+    ctx->seen_body_data = 1;
+
     cl = ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
                                          &ctx->free_bufs, size);
 
@@ -511,7 +519,9 @@ ngx_http_lua_ngx_flush(lua_State *L)
     }
 
 #if 1
-    if (!r->header_sent && !ctx->header_sent) {
+    if ((!r->header_sent && !ctx->header_sent)
+        || (!ctx->seen_body_data && !wait))
+    {
         lua_pushnil(L);
         lua_pushliteral(L, "nothing to flush");
         return 2;
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 be110e3..d882061 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
@@ -152,6 +152,7 @@ ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
     int                          nargs;
     int                         *cap = NULL;
     int                          ovecsize;
+    int                          has_ctx = 0;
     ngx_uint_t                   flags;
     ngx_pool_t                  *pool, *old_pool;
     ngx_http_lua_main_conf_t    *lmcf;
@@ -184,29 +185,34 @@ ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
     if (nargs >= 3) {
         opts.data = (u_char *) luaL_checklstring(L, 3, &opts.len);
 
-        if (nargs == 4) {
-            luaL_checktype(L, 4, LUA_TTABLE);
-            lua_getfield(L, 4, "pos");
-            if (lua_isnumber(L, -1)) {
-                pos = (ngx_int_t) lua_tointeger(L, -1);
-                if (pos <= 0) {
+        if (nargs >= 4) {
+            if (!lua_isnil(L, 4)) {
+                luaL_checktype(L, 4, LUA_TTABLE);
+                has_ctx = 1;
+
+                lua_getfield(L, 4, "pos");
+                if (lua_isnumber(L, -1)) {
+                    pos = (ngx_int_t) lua_tointeger(L, -1);
+                    if (pos <= 0) {
+                        pos = 0;
+
+                    } else {
+                        pos--;  /* 1-based on the Lua land */
+                    }
+
+                } else if (lua_isnil(L, -1)) {
                     pos = 0;
 
                 } else {
-                    pos--;  /* 1-based on the Lua land */
+                    msg = lua_pushfstring(L, "bad pos field type in the ctx "
+                                          "table argument: %s",
+                                          luaL_typename(L, -1));
+
+                    return luaL_argerror(L, 4, msg);
                 }
 
-            } else if (lua_isnil(L, -1)) {
-                pos = 0;
-
-            } else {
-                msg = lua_pushfstring(L, "bad pos field type in the ctx table "
-                                      "argument: %s", luaL_typename(L, -1));
-
-                return luaL_argerror(L, 4, msg);
+                lua_pop(L, 1);
             }
-
-            lua_pop(L, 1);
         }
 
     } else {
@@ -555,7 +561,7 @@ exec:
 
     dd("rc = %d", (int) rc);
 
-    if (nargs == 4) { /* having ctx table */
+    if (has_ctx) { /* having ctx table */
         pos = cap[1];
         lua_pushinteger(L, (lua_Integer) (pos + 1));
         lua_setfield(L, 4, "pos");
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 591d2cd..6f2ae38 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
@@ -548,7 +548,7 @@ ngx_http_lua_ngx_req_init_body(lua_State *L)
 
     if (n == 1) {
         num = luaL_checkinteger(L, 1);
-        if (num <= 0) {
+        if (num < 0) {
             return luaL_error(L, "bad size argument: %d", (int) num);
         }
 
@@ -558,13 +558,10 @@ ngx_http_lua_ngx_req_init_body(lua_State *L)
 
         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 = (size_t) r->headers_in.content_length_n;
-        }
+    if (size == 0) {
+        r->request_body_in_file_only = 1;
     }
 
     rb = r->request_body;
@@ -622,6 +619,8 @@ ngx_http_lua_ngx_req_append_body(lua_State *L)
     ngx_str_t                    body;
     size_t                       size, rest;
     size_t                       offset = 0;
+    ngx_chain_t                  chain;
+    ngx_buf_t                    buf;
 
     n = lua_gettop(L);
 
@@ -642,7 +641,25 @@ ngx_http_lua_ngx_req_append_body(lua_State *L)
         || r->request_body->buf == NULL
         || r->request_body->bufs == NULL)
     {
-        return luaL_error(L, "request_body not initalized");
+        return luaL_error(L, "request_body not initialized");
+    }
+
+    if (r->request_body_in_file_only) {
+        buf.start = body.data;
+        buf.pos = buf.start;
+        buf.last = buf.start + body.len;
+        buf.end = buf.last;
+        buf.temporary = 1;
+
+        chain.buf = &buf;
+        chain.next = NULL;
+
+        if (ngx_http_lua_write_request_body(r, &chain) != NGX_OK) {
+            return luaL_error(L, "fail to write file");
+        }
+
+        r->headers_in.content_length_n += body.len;
+        return 0;
     }
 
     rb = r->request_body;
@@ -705,7 +722,7 @@ ngx_http_lua_ngx_req_body_finish(lua_State *L)
         || r->request_body->buf == NULL
         || r->request_body->bufs == NULL)
     {
-        return luaL_error(L, "request_body not initalized");
+        return luaL_error(L, "request_body not initialized");
     }
 
     rb = r->request_body;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
index 8d4ac07..8a3f832 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
@@ -21,21 +21,21 @@
 #include "ngx_http_lua_contentby.h"
 
 
-ngx_int_t ngx_http_lua_semaphore_init_mm(ngx_http_lua_semaphore_mm_t *mm);
-static ngx_http_lua_semaphore_t *ngx_http_lua_alloc_semaphore(void);
-void ngx_http_lua_cleanup_semaphore_mm(void *data);
-static void ngx_http_lua_free_semaphore(ngx_http_lua_semaphore_t *sem);
-static ngx_int_t ngx_http_lua_semaphore_resume(ngx_http_request_t *r);
-int ngx_http_lua_ffi_semaphore_new(ngx_http_lua_semaphore_t **psem,
+ngx_int_t ngx_http_lua_sema_mm_init(ngx_conf_t *cf,
+    ngx_http_lua_main_conf_t *lmcf);
+void ngx_http_lua_sema_mm_cleanup(void *data);
+static ngx_http_lua_sema_t *ngx_http_lua_alloc_sema(void);
+static void ngx_http_lua_free_sema(ngx_http_lua_sema_t *sem);
+static ngx_int_t ngx_http_lua_sema_resume(ngx_http_request_t *r);
+int ngx_http_lua_ffi_sema_new(ngx_http_lua_sema_t **psem,
     int n, char **errmsg);
-int ngx_http_lua_ffi_semaphore_post(ngx_http_lua_semaphore_t *sem,
-    int n);
-int ngx_http_lua_ffi_semaphore_wait(ngx_http_request_t *r,
-    ngx_http_lua_semaphore_t *sem, int wait_ms, u_char *err, size_t *errlen);
-static void ngx_http_lua_semaphore_cleanup(void *data);
-static void ngx_http_lua_semaphore_handler(ngx_event_t *ev);
-static void ngx_http_lua_semaphore_timeout_handler(ngx_event_t *ev);
-void ngx_http_lua_ffi_semaphore_gc(ngx_http_lua_semaphore_t *sem);
+int ngx_http_lua_ffi_sema_post(ngx_http_lua_sema_t *sem, int n);
+int ngx_http_lua_ffi_sema_wait(ngx_http_request_t *r,
+    ngx_http_lua_sema_t *sem, int wait_ms, u_char *err, size_t *errlen);
+static void ngx_http_lua_sema_cleanup(void *data);
+static void ngx_http_lua_sema_handler(ngx_event_t *ev);
+static void ngx_http_lua_sema_timeout_handler(ngx_event_t *ev);
+void ngx_http_lua_ffi_sema_gc(ngx_http_lua_sema_t *sem);
 
 
 enum {
@@ -44,34 +44,61 @@ enum {
 };
 
 
-static ngx_http_lua_semaphore_t *
-ngx_http_lua_alloc_semaphore(void)
+ngx_int_t
+ngx_http_lua_sema_mm_init(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
+{
+    ngx_http_lua_sema_mm_t *mm;
+
+    mm = ngx_palloc(cf->pool, sizeof(ngx_http_lua_sema_mm_t));
+    if (mm == NULL) {
+        return NGX_ERROR;
+    }
+
+    lmcf->sema_mm = mm;
+    mm->lmcf = lmcf;
+
+    ngx_queue_init(&mm->free_queue);
+    mm->cur_epoch = 0;
+    mm->total = 0;
+    mm->used = 0;
+
+    /* it's better to be 4096, but it needs some space for
+     * ngx_http_lua_sema_mm_block_t, one is enough, so it is 4095
+     */
+    mm->num_per_block = 4095;
+
+    return NGX_OK;
+}
+
+
+static ngx_http_lua_sema_t *
+ngx_http_lua_alloc_sema(void)
 {
-    ngx_http_lua_semaphore_t            *sem, *iter;
-    ngx_http_lua_main_conf_t            *lmcf;
-    ngx_queue_t                         *q;
     ngx_uint_t                           i, n;
-    ngx_http_lua_semaphore_mm_block_t   *block;
-    ngx_http_lua_semaphore_mm_t         *mm;
+    ngx_queue_t                         *q;
+    ngx_http_lua_sema_t                 *sem, *iter;
+    ngx_http_lua_sema_mm_t              *mm;
+    ngx_http_lua_main_conf_t            *lmcf;
+    ngx_http_lua_sema_mm_block_t        *block;
 
     ngx_http_lua_assert(ngx_cycle && ngx_cycle->conf_ctx);
 
     lmcf = ngx_http_cycle_get_module_main_conf(ngx_cycle,
                                                ngx_http_lua_module);
 
-    mm = lmcf->semaphore_mm;
+    mm = lmcf->sema_mm;
 
     if (!ngx_queue_empty(&mm->free_queue)) {
         q = ngx_queue_head(&mm->free_queue);
         ngx_queue_remove(q);
 
-        sem = ngx_queue_data(q, ngx_http_lua_semaphore_t, chain);
+        sem = ngx_queue_data(q, ngx_http_lua_sema_t, chain);
 
         sem->block->used++;
 
         ngx_memzero(&sem->sem_event, sizeof(ngx_event_t));
 
-        sem->sem_event.handler = ngx_http_lua_semaphore_handler;
+        sem->sem_event.handler = ngx_http_lua_sema_handler;
         sem->sem_event.data = sem;
         sem->sem_event.log = ngx_cycle->log;
 
@@ -85,12 +112,12 @@ ngx_http_lua_alloc_semaphore(void)
 
     /* free_queue is empty */
 
-    n = sizeof(ngx_http_lua_semaphore_mm_block_t)
-        + mm->num_per_block * sizeof(ngx_http_lua_semaphore_t);
+    n = sizeof(ngx_http_lua_sema_mm_block_t)
+        + mm->num_per_block * sizeof(ngx_http_lua_sema_t);
 
     dd("block size: %d, item size: %d",
-       (int) sizeof(ngx_http_lua_semaphore_mm_block_t),
-       (int) sizeof(ngx_http_lua_semaphore_t));
+       (int) sizeof(ngx_http_lua_sema_mm_block_t),
+       (int) sizeof(ngx_http_lua_sema_t));
 
     block = ngx_alloc(n, ngx_cycle->log);
     if (block == NULL) {
@@ -104,13 +131,13 @@ ngx_http_lua_alloc_semaphore(void)
     block->mm = mm;
     block->epoch = mm->cur_epoch;
 
-    sem = (ngx_http_lua_semaphore_t *) (block + 1);
+    sem = (ngx_http_lua_sema_t *) (block + 1);
     sem->block = block;
     sem->block->used = 1;
 
     ngx_memzero(&sem->sem_event, sizeof(ngx_event_t));
 
-    sem->sem_event.handler = ngx_http_lua_semaphore_handler;
+    sem->sem_event.handler = ngx_http_lua_sema_handler;
     sem->sem_event.data = sem;
     sem->sem_event.log = ngx_cycle->log;
 
@@ -127,32 +154,32 @@ ngx_http_lua_alloc_semaphore(void)
 
 
 void
-ngx_http_lua_cleanup_semaphore_mm(void *data)
+ngx_http_lua_sema_mm_cleanup(void *data)
 {
-    ngx_http_lua_semaphore_t            *sem, *iter;
     ngx_uint_t                           i;
-    ngx_http_lua_main_conf_t            *lmcf;
     ngx_queue_t                         *q;
-    ngx_http_lua_semaphore_mm_block_t   *block;
-    ngx_http_lua_semaphore_mm_t         *mm;
+    ngx_http_lua_sema_t                 *sem, *iter;
+    ngx_http_lua_sema_mm_t              *mm;
+    ngx_http_lua_main_conf_t            *lmcf;
+    ngx_http_lua_sema_mm_block_t        *block;
 
     lmcf = (ngx_http_lua_main_conf_t *) data;
-    mm = lmcf->semaphore_mm;
+    mm = lmcf->sema_mm;
 
     while (!ngx_queue_empty(&mm->free_queue)) {
         q = ngx_queue_head(&mm->free_queue);
 
-        sem = ngx_queue_data(q, ngx_http_lua_semaphore_t, chain);
+        sem = ngx_queue_data(q, ngx_http_lua_sema_t, chain);
         block = sem->block;
 
         if (block->used == 0) {
-            iter = (ngx_http_lua_semaphore_t *) (block + 1);
+            iter = (ngx_http_lua_sema_t *) (block + 1);
 
             for (i = 0; i < block->mm->num_per_block; i++, iter++) {
                 ngx_queue_remove(&iter->chain);
             }
 
-            dd("free semaphore block: %p at final", block);
+            dd("free sema block: %p at final", block);
 
             ngx_free(block);
 
@@ -160,24 +187,24 @@ ngx_http_lua_cleanup_semaphore_mm(void *data)
             /* just return directly when some thing goes wrong */
 
             ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                          "ngx_http_lua_cleanup_semaphore_mm when cleanup"
-                          " block %p is still used by someone", block);
+                          "lua sema mm: freeing a block %p that is still "
+                          " used by someone", block);
 
             return;
         }
     }
 
-    dd("ngx_http_lua_cleanup_semaphore_mm");
+    dd("lua sema mm cleanup done");
 }
 
 
 static void
-ngx_http_lua_free_semaphore(ngx_http_lua_semaphore_t *sem)
+ngx_http_lua_free_sema(ngx_http_lua_sema_t *sem)
 {
-    ngx_http_lua_semaphore_t            *iter;
-    ngx_uint_t                           i, mid_epoch;
-    ngx_http_lua_semaphore_mm_block_t   *block;
-    ngx_http_lua_semaphore_mm_t         *mm;
+    ngx_http_lua_sema_t            *iter;
+    ngx_uint_t                      i, mid_epoch;
+    ngx_http_lua_sema_mm_block_t   *block;
+    ngx_http_lua_sema_mm_t         *mm;
 
     block = sem->block;
     block->used--;
@@ -209,7 +236,7 @@ ngx_http_lua_free_semaphore(ngx_http_lua_semaphore_t *sem)
         && block->epoch < mid_epoch)
     {
         /* load <= 50% and it's on the older side */
-        iter = (ngx_http_lua_semaphore_t *) (block + 1);
+        iter = (ngx_http_lua_sema_t *) (block + 1);
 
         for (i = 0; i < mm->num_per_block; i++, iter++) {
             ngx_queue_remove(&iter->chain);
@@ -226,7 +253,7 @@ ngx_http_lua_free_semaphore(ngx_http_lua_semaphore_t *sem)
 
 
 static ngx_int_t
-ngx_http_lua_semaphore_resume(ngx_http_request_t *r)
+ngx_http_lua_sema_resume(ngx_http_request_t *r)
 {
     lua_State                   *vm;
     ngx_connection_t            *c;
@@ -278,12 +305,12 @@ ngx_http_lua_semaphore_resume(ngx_http_request_t *r)
 
 
 int
-ngx_http_lua_ffi_semaphore_new(ngx_http_lua_semaphore_t **psem,
+ngx_http_lua_ffi_sema_new(ngx_http_lua_sema_t **psem,
     int n, char **errmsg)
 {
-    ngx_http_lua_semaphore_t    *sem;
+    ngx_http_lua_sema_t    *sem;
 
-    sem = ngx_http_lua_alloc_semaphore();
+    sem = ngx_http_lua_alloc_sema();
     if (sem == NULL) {
         *errmsg = "no memory";
         return NGX_ERROR;
@@ -304,7 +331,7 @@ ngx_http_lua_ffi_semaphore_new(ngx_http_lua_semaphore_t **psem,
 
 
 int
-ngx_http_lua_ffi_semaphore_post(ngx_http_lua_semaphore_t *sem, int n)
+ngx_http_lua_ffi_sema_post(ngx_http_lua_sema_t *sem, int n)
 {
     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
                    "http lua semaphore post: %p, n: %d, resources: %d",
@@ -325,8 +352,8 @@ ngx_http_lua_ffi_semaphore_post(ngx_http_lua_semaphore_t *sem, int n)
 
 
 int
-ngx_http_lua_ffi_semaphore_wait(ngx_http_request_t *r,
-    ngx_http_lua_semaphore_t *sem, int wait_ms, u_char *err, size_t *errlen)
+ngx_http_lua_ffi_sema_wait(ngx_http_request_t *r,
+    ngx_http_lua_sema_t *sem, int wait_ms, u_char *err, size_t *errlen)
 {
     ngx_http_lua_ctx_t           *ctx;
     ngx_http_lua_co_ctx_t        *wait_co_ctx;
@@ -361,7 +388,7 @@ ngx_http_lua_ffi_semaphore_wait(ngx_http_request_t *r,
     }
 
     /* we keep the order, will resume the older waited firtly
-     * in ngx_http_lua_semaphore_handler
+     * in ngx_http_lua_sema_handler
      */
 
     if (ngx_queue_empty(&sem->wait_queue) && sem->resource_count > 0) {
@@ -376,19 +403,19 @@ ngx_http_lua_ffi_semaphore_wait(ngx_http_request_t *r,
     sem->wait_count++;
     wait_co_ctx = ctx->cur_co_ctx;
 
-    wait_co_ctx->sleep.handler = ngx_http_lua_semaphore_timeout_handler;
+    wait_co_ctx->sleep.handler = ngx_http_lua_sema_timeout_handler;
     wait_co_ctx->sleep.data = ctx->cur_co_ctx;
     wait_co_ctx->sleep.log = r->connection->log;
 
     ngx_add_timer(&wait_co_ctx->sleep, (ngx_msec_t) wait_ms);
 
-    dd("ngx_http_lua_ffi_semaphore_wait add timer coctx:%p wait: %d(ms)",
+    dd("ngx_http_lua_ffi_sema_wait add timer coctx:%p wait: %d(ms)",
        wait_co_ctx, wait_ms);
 
     ngx_queue_insert_tail(&sem->wait_queue, &wait_co_ctx->sem_wait_queue);
 
     wait_co_ctx->data = sem;
-    wait_co_ctx->cleanup = ngx_http_lua_semaphore_cleanup;
+    wait_co_ctx->cleanup = ngx_http_lua_sema_cleanup;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
                    "http lua semaphore wait yielding");
@@ -398,18 +425,18 @@ ngx_http_lua_ffi_semaphore_wait(ngx_http_request_t *r,
 
 
 int
-ngx_http_lua_ffi_semaphore_count(ngx_http_lua_semaphore_t *sem)
+ngx_http_lua_ffi_sema_count(ngx_http_lua_sema_t *sem)
 {
     return sem->resource_count - sem->wait_count;
 }
 
 
 static void
-ngx_http_lua_semaphore_cleanup(void *data)
+ngx_http_lua_sema_cleanup(void *data)
 {
     ngx_http_lua_co_ctx_t          *coctx = data;
     ngx_queue_t                    *q;
-    ngx_http_lua_semaphore_t       *sem;
+    ngx_http_lua_sema_t            *sem;
 
     sem = coctx->data;
 
@@ -429,9 +456,9 @@ ngx_http_lua_semaphore_cleanup(void *data)
 
 
 static void
-ngx_http_lua_semaphore_handler(ngx_event_t *ev)
+ngx_http_lua_sema_handler(ngx_event_t *ev)
 {
-    ngx_http_lua_semaphore_t    *sem;
+    ngx_http_lua_sema_t         *sem;
     ngx_http_request_t          *r;
     ngx_http_lua_ctx_t          *ctx;
     ngx_http_lua_co_ctx_t       *wait_co_ctx;
@@ -467,10 +494,10 @@ ngx_http_lua_semaphore_handler(ngx_event_t *ev)
         wait_co_ctx->sem_resume_status = SEMAPHORE_WAIT_SUCC;
 
         if (ctx->entered_content_phase) {
-            (void) ngx_http_lua_semaphore_resume(r);
+            (void) ngx_http_lua_sema_resume(r);
 
         } else {
-            ctx->resume_handler = ngx_http_lua_semaphore_resume;
+            ctx->resume_handler = ngx_http_lua_sema_resume;
             ngx_http_core_run_phases(r);
         }
 
@@ -480,18 +507,18 @@ ngx_http_lua_semaphore_handler(ngx_event_t *ev)
 
 
 static void
-ngx_http_lua_semaphore_timeout_handler(ngx_event_t *ev)
+ngx_http_lua_sema_timeout_handler(ngx_event_t *ev)
 {
     ngx_http_lua_co_ctx_t       *wait_co_ctx;
     ngx_http_request_t          *r;
     ngx_http_lua_ctx_t          *ctx;
     ngx_connection_t            *c;
-    ngx_http_lua_semaphore_t    *sem;
+    ngx_http_lua_sema_t         *sem;
 
     wait_co_ctx = ev->data;
     wait_co_ctx->cleanup = NULL;
 
-    dd("ngx_http_lua_semaphore_timeout_handler timeout coctx:%p", wait_co_ctx);
+    dd("ngx_http_lua_sema_timeout_handler timeout coctx:%p", wait_co_ctx);
 
     sem = wait_co_ctx->data;
 
@@ -509,10 +536,10 @@ ngx_http_lua_semaphore_timeout_handler(ngx_event_t *ev)
     wait_co_ctx->sem_resume_status = SEMAPHORE_WAIT_TIMEOUT;
 
     if (ctx->entered_content_phase) {
-        (void) ngx_http_lua_semaphore_resume(r);
+        (void) ngx_http_lua_sema_resume(r);
 
     } else {
-        ctx->resume_handler = ngx_http_lua_semaphore_resume;
+        ctx->resume_handler = ngx_http_lua_sema_resume;
         ngx_http_core_run_phases(r);
     }
 
@@ -521,7 +548,7 @@ ngx_http_lua_semaphore_timeout_handler(ngx_event_t *ev)
 
 
 void
-ngx_http_lua_ffi_semaphore_gc(ngx_http_lua_semaphore_t *sem)
+ngx_http_lua_ffi_sema_gc(ngx_http_lua_sema_t *sem)
 {
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
                    "in lua gc, semaphore %p", sem);
@@ -537,7 +564,7 @@ ngx_http_lua_ffi_semaphore_gc(ngx_http_lua_semaphore_t *sem)
                       "destroyed", sem);
     }
 
-    ngx_http_lua_free_semaphore(sem);
+    ngx_http_lua_free_sema(sem);
 }
 
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h
index a71cc23..65ba8ff 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h
@@ -14,14 +14,14 @@
 #include "ngx_http_lua_common.h"
 
 
-typedef struct ngx_http_lua_semaphore_mm_block_s {
+typedef struct ngx_http_lua_sema_mm_block_s {
     ngx_uint_t                       used;
-    ngx_http_lua_semaphore_mm_t     *mm;
+    ngx_http_lua_sema_mm_t          *mm;
     ngx_uint_t                       epoch;
-} ngx_http_lua_semaphore_mm_block_t;
+} ngx_http_lua_sema_mm_block_t;
 
 
-struct ngx_http_lua_semaphore_mm_s {
+struct ngx_http_lua_sema_mm_s {
     ngx_queue_t                  free_queue;
     ngx_uint_t                   total;
     ngx_uint_t                   used;
@@ -31,18 +31,20 @@ struct ngx_http_lua_semaphore_mm_s {
 };
 
 
-typedef struct ngx_http_lua_semaphore_s {
+typedef struct ngx_http_lua_sema_s {
     ngx_queue_t                          wait_queue;
     ngx_queue_t                          chain;
     ngx_event_t                          sem_event;
-    ngx_http_lua_semaphore_mm_block_t   *block;
+    ngx_http_lua_sema_mm_block_t        *block;
     int                                  resource_count;
     unsigned                             wait_count;
-} ngx_http_lua_semaphore_t;
+} ngx_http_lua_sema_t;
 
 
 #ifndef NGX_LUA_NO_FFI_API
-void ngx_http_lua_cleanup_semaphore_mm(void *data);
+void ngx_http_lua_sema_mm_cleanup(void *data);
+ngx_int_t ngx_http_lua_sema_mm_init(ngx_conf_t *cf,
+    ngx_http_lua_main_conf_t *lmcf);
 #endif
 
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
index 1a6594d..2bfdbd3 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
@@ -1181,8 +1181,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
     /* Lua function arguments: self [,session] [,host] [,verify] */
 
     n = lua_gettop(L);
-    if (n < 1 && n > 4) {
-        return luaL_error(L, "ngx.socket connect: expecting 1 ~ 4 "
+    if (n < 1 || n > 5) {
+        return luaL_error(L, "ngx.socket connect: expecting 1 ~ 5 "
                           "arguments (including the object), but seen %d", n);
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
index c4e6a83..c06bc8e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
@@ -656,6 +656,8 @@ failed:
         X509_free(x509);
     }
 
+    ERR_clear_error();
+
     return NGX_ERROR;
 
 #   endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
@@ -714,6 +716,8 @@ failed:
         BIO_free(bio);
     }
 
+    ERR_clear_error();
+
     return NGX_ERROR;
 }
 
@@ -842,12 +846,15 @@ ngx_http_lua_ffi_cert_pem_to_der(const u_char *pem, size_t pem_len, u_char *der,
     bio = BIO_new_mem_buf((char *) pem, (int) pem_len);
     if (bio == NULL) {
         *err = "BIO_new_mem_buf() failed";
+        ERR_clear_error();
         return NGX_ERROR;
     }
 
     x509 = PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL);
     if (x509 == NULL) {
         *err = "PEM_read_bio_X509_AUX() failed";
+        BIO_free(bio);
+        ERR_clear_error();
         return NGX_ERROR;
     }
 
@@ -856,6 +863,7 @@ ngx_http_lua_ffi_cert_pem_to_der(const u_char *pem, size_t pem_len, u_char *der,
         *err = "i2d_X509() failed";
         X509_free(x509);
         BIO_free(bio);
+        ERR_clear_error();
         return NGX_ERROR;
     }
 
@@ -881,6 +889,7 @@ ngx_http_lua_ffi_cert_pem_to_der(const u_char *pem, size_t pem_len, u_char *der,
 
             *err = "PEM_read_bio_X509() failed";
             BIO_free(bio);
+            ERR_clear_error();
             return NGX_ERROR;
         }
 
@@ -889,6 +898,7 @@ ngx_http_lua_ffi_cert_pem_to_der(const u_char *pem, size_t pem_len, u_char *der,
             *err = "i2d_X509() failed";
             X509_free(x509);
             BIO_free(bio);
+            ERR_clear_error();
             return NGX_ERROR;
         }
 
@@ -914,6 +924,7 @@ ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
     in = BIO_new_mem_buf((char *) pem, (int) pem_len);
     if (in == NULL) {
         *err = "BIO_new_mem_buf() failed";
+        ERR_clear_error();
         return NGX_ERROR;
     }
 
@@ -921,6 +932,7 @@ ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
     if (pkey == NULL) {
         BIO_free(in);
         *err = "PEM_read_bio_PrivateKey failed";
+        ERR_clear_error();
         return NGX_ERROR;
     }
 
@@ -930,6 +942,7 @@ ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
     if (len < 0) {
         EVP_PKEY_free(pkey);
         *err = "i2d_PrivateKey failed";
+        ERR_clear_error();
         return NGX_ERROR;
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
index 9f9e276..1bf4335 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
@@ -137,6 +137,10 @@ done:
         BIO_free(bio);
     }
 
+    if (rc == NGX_ERROR) {
+        ERR_clear_error();
+    }
+
     return rc;
 
 #endif  /* NGX_HTTP_LUA_USE_OCSP */
@@ -229,6 +233,8 @@ ngx_http_lua_ffi_ssl_create_ocsp_request(const char *chain_data,
     X509_free(cert);
     BIO_free(bio);
 
+    ERR_clear_error();
+
     return NGX_OK;
 
 failed:
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
index 393eac7..96c0ace 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
@@ -359,7 +359,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     ngx_memcpy(&tctx, ev->data, sizeof(ngx_http_lua_timer_ctx_t));
     ngx_free(ev);
-    ev = NULL;
 
     lmcf = tctx.lmcf;
 
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 69eccae..1bd1388 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_util.c
@@ -907,17 +907,17 @@ ngx_http_lua_request_cleanup(ngx_http_lua_ctx_t *ctx, int forcible)
     ngx_http_request_t          *r;
     ngx_http_lua_main_conf_t    *lmcf;
 
-    r = ctx->request;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua request cleanup: forcible=%d", forcible);
-
     /*  force coroutine handling the request quit */
     if (ctx == NULL) {
         dd("ctx is NULL");
         return;
     }
 
+    r = ctx->request;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua request cleanup: forcible=%d", forcible);
+
     if (ctx->cleanup) {
         *ctx->cleanup = NULL;
         ctx->cleanup = NULL;
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 0de9312..b26c862 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_variable.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_variable.c
@@ -185,7 +185,7 @@ ngx_http_lua_var_set(lua_State *L)
 
         val = ngx_palloc(r->pool, len);
         if (val == NULL) {
-            return luaL_error(L, "memory allocation erorr");
+            return luaL_error(L, "memory allocation error");
         }
 
         ngx_memcpy(val, p, len);
@@ -460,6 +460,7 @@ ngx_http_lua_ffi_var_set(ngx_http_request_t *r, u_char *name_data,
                 if (p == NULL) {
                     goto nomem;
                 }
+
                 ngx_memcpy(p, value, value_len);
                 value = p;
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_worker.c b/debian/modules/nginx-lua/src/ngx_http_lua_worker.c
index 44faf48..ff09b5b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_worker.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_worker.c
@@ -60,6 +60,13 @@ static int
 ngx_http_lua_ngx_worker_id(lua_State *L)
 {
 #if (nginx_version >= 1009001)
+    if (ngx_process != NGX_PROCESS_WORKER
+        && ngx_process != NGX_PROCESS_SINGLE)
+    {
+        lua_pushnil(L);
+        return 1;
+    }
+
     lua_pushinteger(L, (lua_Integer) ngx_worker);
 #else
     lua_pushnil(L);
@@ -93,6 +100,12 @@ int
 ngx_http_lua_ffi_worker_id(void)
 {
 #if (nginx_version >= 1009001)
+    if (ngx_process != NGX_PROCESS_WORKER
+        && ngx_process != NGX_PROCESS_SINGLE)
+    {
+        return -1;
+    }
+
     return (int) ngx_worker;
 #else
     return -1;
diff --git a/debian/modules/nginx-lua/t/015-status.t b/debian/modules/nginx-lua/t/015-status.t
index 2e026f1..666dae7 100644
--- a/debian/modules/nginx-lua/t/015-status.t
+++ b/debian/modules/nginx-lua/t/015-status.t
@@ -9,7 +9,7 @@ log_level('warn');
 #repeat_each(120);
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 7);
+plan tests => repeat_each() * (blocks() * 2 + 9);
 
 #no_diff();
 #no_long_string();
@@ -270,3 +270,24 @@ ngx.status = 502
 --- no_error_log
 [error]
 
+
+
+=== TEST 16: ngx.status assignmnt should clear r->err_status
+--- config
+location = /t {
+    return 502;
+    header_filter_by_lua_block {
+        if ngx.status == 502 then
+            ngx.status = 654
+            ngx.log(ngx.WARN, "ngx.status: ", ngx.status)
+        end
+    }
+}
+--- request
+GET /t
+--- response_body_like: Bad Gateway
+--- error_log
+ngx.status: 654
+--- no_error_log
+[error]
+--- error_code: 654
diff --git a/debian/modules/nginx-lua/t/024-access/mixed.t b/debian/modules/nginx-lua/t/024-access/mixed.t
index d801216..a9f8039 100644
--- a/debian/modules/nginx-lua/t/024-access/mixed.t
+++ b/debian/modules/nginx-lua/t/024-access/mixed.t
@@ -245,3 +245,17 @@ access cached: hello
 
 --- log_level: info
 
+
+
+=== TEST 7: I/O in access shortcuts content automatically
+--- config
+    location = /t {
+        access_by_lua_block {
+            ngx.print("")
+        }
+
+        echo ok;
+    }
+--- request
+    GET /t
+--- response_body
diff --git a/debian/modules/nginx-lua/t/034-match.t b/debian/modules/nginx-lua/t/034-match.t
index 4792ae6..35149f1 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::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 14);
+plan tests => repeat_each() * (blocks() * 2 + 15);
 
 #no_diff();
 no_long_string();
@@ -1124,6 +1124,8 @@ failed to match
 1: res size: 2
 2: m size: 2
 2: res size: 2
+--- no_error_log
+[error]
 
 
 
@@ -1169,3 +1171,22 @@ hello
 hello
 false
 
+
+
+=== TEST 50: the 5th argument hides the 4th (GitHub #719)
+--- config
+    location /re {
+        content_by_lua '
+            local ctx, m = { pos = 5 }, {};
+            local _, err = ngx.re.match("20172016-11-3 03:07:09", [=[(\d\d\d\d)]=], "", ctx, m);
+            if m then
+                ngx.say(m[0], " ", _[0], " ", ctx.pos)
+            else
+                ngx.say("not matched!")
+            end
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+2016 2016 9
diff --git a/debian/modules/nginx-lua/t/043-shdict.t b/debian/modules/nginx-lua/t/043-shdict.t
index 91a4196..cd160f7 100644
--- a/debian/modules/nginx-lua/t/043-shdict.t
+++ b/debian/modules/nginx-lua/t/043-shdict.t
@@ -1584,7 +1584,7 @@ cur value:  hello hello hello hello hello hello hello hello hello hello1
         content_by_lua '
             local dogs = ngx.shared.dogs
             dogs:set("foo", 32, 0.01)
-            dogs:set("blah", 33, 0.1)
+            dogs:set("blah", 33, 0.3)
             ngx.sleep(0.02)
             local val, flags, stale = dogs:get_stale("foo")
             ngx.say(val, ", ", flags, ", ", stale)
diff --git a/debian/modules/nginx-lua/t/044-req-body.t b/debian/modules/nginx-lua/t/044-req-body.t
index 1c1be40..28fa818 100644
--- a/debian/modules/nginx-lua/t/044-req-body.t
+++ b/debian/modules/nginx-lua/t/044-req-body.t
@@ -1630,3 +1630,111 @@ request body:hello, world
 --- no_error_log
 [error]
 [alert]
+
+
+
+=== TEST 50: init & append & finish (content_length = 0)
+--- config
+    location /t {
+        content_by_lua '
+            local old_http_content_length = ngx.var.http_content_length
+
+            ngx.req.read_body()
+            ngx.req.init_body()
+            ngx.req.append_body("he")
+            ngx.req.append_body("llo")
+            ngx.req.finish_body()
+
+            ngx.say("old content length: ", old_http_content_length)
+
+            local data = ngx.req.get_body_data()
+            local data_file = ngx.req.get_body_file()
+
+            if not data and data_file then
+                ngx.say("no data in buf, go to data file")
+            end
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+        ';
+    }
+--- request
+    GET /t
+--- more_headers
+Content-Length: 0
+--- response_body
+old content length: 0
+content length: 5
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 51: init & append & finish (init_body(0))
+--- config
+    location /t {
+        content_by_lua '
+            local old_http_content_length = ngx.var.http_content_length
+
+            ngx.req.read_body()
+            ngx.req.init_body(0)
+            ngx.req.append_body("he")
+            ngx.req.append_body("llo")
+            ngx.req.finish_body()
+
+            ngx.say("old content length: ", old_http_content_length)
+
+            local data = ngx.req.get_body_data()
+            local data_file = ngx.req.get_body_file()
+
+            if not data and data_file then
+                ngx.say("no data in buf, go to data file")
+            end
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+        ';
+    }
+--- request
+    GET /t
+--- more_headers
+Content-Length: 0
+--- response_body
+old content length: 0
+no data in buf, go to data file
+content length: 5
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 52: init & append & finish (client_body_buffer_size = 0)
+--- http_config
+    client_body_buffer_size 0;
+--- config
+    location /t {
+        content_by_lua '
+            ngx.req.read_body()
+            ngx.req.init_body()
+            ngx.req.append_body("he")
+            ngx.req.append_body("llo")
+            ngx.req.finish_body()
+
+            local data = ngx.req.get_body_data()
+            local data_file = ngx.req.get_body_file()
+
+            if not data and data_file then
+                ngx.say("no data in buf, go to data file")
+            end
+
+            ngx.say("content length: ", ngx.var.http_content_length)
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+no data in buf, go to data file
+content length: 5
+--- no_error_log
+[error]
+[alert]
diff --git a/debian/modules/nginx-lua/t/058-tcp-socket.t b/debian/modules/nginx-lua/t/058-tcp-socket.t
index b9e4175..acf69f0 100644
--- a/debian/modules/nginx-lua/t/058-tcp-socket.t
+++ b/debian/modules/nginx-lua/t/058-tcp-socket.t
@@ -2039,6 +2039,7 @@ resolve name done
 === TEST 34: github issue #215: Handle the posted requests in lua cosocket api (successfully resolved)
 --- config
     resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 5s;
 
     location = /sub {
         content_by_lua '
@@ -2053,7 +2054,7 @@ resolve name done
             local sock = ngx.socket.tcp()
             local ok, err = sock:connect(server, 80)
             if not ok then
-                ngx.say("failed to connect to agentzh.org: ", err)
+                ngx.say("failed to connect to ", server, ": ", err)
                 return
             end
             ngx.say("successfully connected to xxx!")
@@ -3298,6 +3299,7 @@ failed to receive a line: closed []
 close: 1 nil
 --- no_error_log
 [error]
+--- skip_eval: 3: system("ping6 -c 1 ::1 >/dev/null 2>&1") ne 0
 
 
 
diff --git a/debian/modules/nginx-lua/t/087-udp-socket.t b/debian/modules/nginx-lua/t/087-udp-socket.t
index 39ff54f..79ba452 100644
--- a/debian/modules/nginx-lua/t/087-udp-socket.t
+++ b/debian/modules/nginx-lua/t/087-udp-socket.t
@@ -710,7 +710,7 @@ resolve name done
 === TEST 13: github issue #215: Handle the posted requests in lua cosocket api (successfully resolved)
 --- config
     resolver $TEST_NGINX_RESOLVER;
-    resolver_timeout 3s;
+    resolver_timeout 5s;
 
     location = /sub {
         content_by_lua '
@@ -725,7 +725,7 @@ resolve name done
             local sock = ngx.socket.udp()
             local ok, err = sock:setpeername(server, 80)
             if not ok then
-                ngx.say("failed to connect to agentzh.org: ", err)
+                ngx.say("failed to connect to ", server, ": ", err)
                 return
             end
             ngx.say("successfully connected to xxx!")
diff --git a/debian/modules/nginx-lua/t/129-ssl-socket.t b/debian/modules/nginx-lua/t/129-ssl-socket.t
index 4921099..c19853d 100644
--- a/debian/modules/nginx-lua/t/129-ssl-socket.t
+++ b/debian/modules/nginx-lua/t/129-ssl-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 7);
+plan tests => repeat_each() * 219;
 
 $ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
 
@@ -2584,3 +2584,37 @@ SSL reused session
 [alert]
 --- timeout: 5
 
+
+
+=== TEST 32: handshake, too many arguments
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(2000)
+
+            local ok, err = sock:connect("g.sregex.org", 443)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local session, err = sock.sslhandshake()
+        }
+    }
+
+--- request
+GET /t
+--- ignore_response
+--- error_log eval
+qr/\[error\] .* ngx.socket connect: expecting 1 ~ 5 arguments \(including the object\), but seen 0/
+--- no_error_log
+[alert]
+--- timeout: 5
diff --git a/debian/modules/nginx-lua/t/132-lua-blocks.t b/debian/modules/nginx-lua/t/132-lua-blocks.t
index d157d27..e2933e9 100644
--- a/debian/modules/nginx-lua/t/132-lua-blocks.t
+++ b/debian/modules/nginx-lua/t/132-lua-blocks.t
@@ -10,7 +10,7 @@ use Test::Nginx::Socket::Lua;
 repeat_each(2);
 #repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 3 + 4);
+plan tests => repeat_each() * (blocks() * 3 + 3);
 
 #no_diff();
 no_long_string();
@@ -405,7 +405,7 @@ hello, world!
 
 
 
-=== TEST 16: content_by_lua_block (unexpected closing long brackets)
+=== TEST 16: content_by_lua_block unexpected closing long brackets must FAIL
 --- config
     location = /t {
         content_by_lua_block {
@@ -414,15 +414,30 @@ hello, world!
     }
 --- request
 GET /t
+--- error_code: 500
+--- error_log eval
+qr{\[error\] .*? unexpected symbol near ']'}
+
+
+
+=== TEST 17: content_by_lua_block unexpected closing long brackets ignored (GitHub #748)
+--- config
+    location = /t {
+        content_by_lua_block {
+            local t1, t2 = {"hello world"}, {1}
+            ngx.say(t1[t2[1]])
+        }
+    }
+--- request
+GET /t
+--- response_body
+hello world
 --- no_error_log
 [error]
---- error_log eval
-qr{\[emerg\] .*? unexpected lua closing long-bracket in .*?/nginx\.conf:41}
---- must_die
 
 
 
-=== TEST 17: simple set_by_lua_block (integer)
+=== TEST 18: simple set_by_lua_block (integer)
 --- config
     location /lua {
         set_by_lua_block $res { return 1+1 }
@@ -437,7 +452,7 @@ GET /lua
 
 
 
-=== TEST 18: ambiguous line comments inside a long bracket string (GitHub #596)
+=== TEST 19: ambiguous line comments inside a long bracket string (GitHub #596)
 --- config
     location = /t {
         content_by_lua_block {
@@ -459,7 +474,7 @@ done
 
 
 
-=== TEST 19: double quotes in long brackets
+=== TEST 20: double quotes in long brackets
 --- config
     location = /t {
         rewrite_by_lua_block { print([[Hey, it is "!]]) } content_by_lua_block { ngx.say([["]]) }
@@ -475,7 +490,7 @@ Hey, it is "!
 
 
 
-=== TEST 20: single quotes in long brackets
+=== TEST 21: single quotes in long brackets
 --- config
     location = /t {
         rewrite_by_lua_block { print([[Hey, it is '!]]) } content_by_lua_block { ngx.say([[']]) }
@@ -491,7 +506,7 @@ Hey, it is '!
 
 
 
-=== TEST 21: lexer no match due to incomplete data chunks in a fixed size buffer
+=== TEST 22: lexer no match due to incomplete data chunks in a fixed size buffer
 --- config
         location /test1 {
             content_by_lua_block {
diff --git a/debian/modules/nginx-lua/t/135-worker-id.t b/debian/modules/nginx-lua/t/135-worker-id.t
index 752b406..3c1f24d 100644
--- a/debian/modules/nginx-lua/t/135-worker-id.t
+++ b/debian/modules/nginx-lua/t/135-worker-id.t
@@ -3,13 +3,13 @@
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
-#master_on();
+master_on();
 workers(2);
 #log_level('warn');
 
-repeat_each(2);
+#repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3);
+plan tests => repeat_each() * (blocks() * 3 + 1);
 
 #no_diff();
 #no_long_string();
@@ -31,3 +31,63 @@ GET /lua
 --- no_error_log
 [error]
 --- skip_nginx: 3: <=1.9.0
+
+
+
+=== TEST 2: worker id should be nil for non-worker processes
+--- http_config
+    proxy_cache_path conf/cache levels=1:2 keys_zone=my-cache:8m max_size=10m inactive=60m;
+    proxy_temp_path conf/temp;
+
+    lua_shared_dict counters 1m;
+
+    init_by_lua_block {
+        ngx.shared.counters:set("c", 0)
+    }
+
+    init_worker_by_lua_block {
+        ngx.shared.counters:incr("c", 1)
+        ngx.log(ngx.INFO, ngx.worker.pid(), ": worker id ", ngx.worker.id());
+    }
+--- config
+    location = /t {
+        content_by_lua_block {
+            local counters = ngx.shared.counters
+            local ok, c
+            for i = 1, 45 do
+                c = counters:get("c")
+                if c >= 4 then
+                    ok = true
+                    break
+                end
+                local delay = 0.001 * i
+                if delay > 0.1 then
+                    delay = 0.1
+                end
+                ngx.sleep(delay)
+            end
+            if ok then
+                ngx.say("ok")
+            else
+                ngx.say("not ok: c=", c)
+            end
+        }
+    }
+    location /cache {
+        proxy_pass http://127.0.0.1:$server_port;
+        proxy_cache my-cache;
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- grep_error_log eval: qr/worker id nil/
+--- grep_error_log_out
+worker id nil
+worker id nil
+--- no_error_log
+[error]
+--- wait: 0.1
+--- skip_nginx: 3: <=1.9.0
+--- log_level: info
+--- timeout: 6
diff --git a/debian/modules/nginx-lua/t/139-ssl-cert-by.t b/debian/modules/nginx-lua/t/139-ssl-cert-by.t
index e40fe85..9297a0d 100644
--- a/debian/modules/nginx-lua/t/139-ssl-cert-by.t
+++ b/debian/modules/nginx-lua/t/139-ssl-cert-by.t
@@ -1380,3 +1380,98 @@ close: 1 nil
 uthread: thread created: running
 uthread: hello in thread
 uthread: done
+
+
+
+=== TEST 17: simple logging - use ssl_certificiate_by_lua* on the http {} level
+GitHub openresty/lua-resty-core#42
+--- http_config
+    ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
+    ssl_certificate ../../cert/test.crt;
+    ssl_certificate_key ../../cert/test.key;
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+ssl_certificate_by_lua:1: ssl cert by lua is running!
+
+--- no_error_log
+[error]
+[alert]
diff --git a/debian/modules/nginx-lua/t/140-ssl-c-api.t b/debian/modules/nginx-lua/t/140-ssl-c-api.t
index 9812de2..4ecc2cd 100644
--- a/debian/modules/nginx-lua/t/140-ssl-c-api.t
+++ b/debian/modules/nginx-lua/t/140-ssl-c-api.t
@@ -11,7 +11,7 @@ my $openssl_version = eval { `$NginxBinary -V 2>&1` };
 if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
     plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
 } else {
-    plan tests => repeat_each() * (blocks() * 5);
+    plan tests => repeat_each() * (blocks() * 5 + 1);
 }
 
 $ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
@@ -361,3 +361,139 @@ lua ssl server name: "test.com"
 --- no_error_log
 [error]
 [alert]
+
+
+
+=== TEST 3: Handshake continue when cert_pem_to_der errors
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block {
+            collectgarbage()
+
+            local ffi = require "ffi"
+
+            ffi.cdef[[
+                int ngx_http_lua_ffi_cert_pem_to_der(const unsigned char *pem,
+                    size_t pem_len, unsigned char *der, char **err);
+
+                int ngx_http_lua_ffi_priv_key_pem_to_der(const unsigned char *pem,
+                    size_t pem_len, unsigned char *der, char **err);
+            ]]
+
+            local errmsg = ffi.new("char *[1]")
+
+            local r = getfenv(0).__ngx_req
+            if not r then
+                ngx.log(ngx.ERR, "no request found")
+                return
+            end
+
+            local cert = "garbage data"
+
+            local out = ffi.new("char [?]", #cert)
+
+            local rc = ffi.C.ngx_http_lua_ffi_cert_pem_to_der(cert, #cert, out, errmsg)
+            if rc < 1 then
+                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
+                        ffi.string(errmsg[0]))
+            end
+
+            local pkey = "garbage key data"
+
+            out = ffi.new("char [?]", #pkey)
+
+            local rc = ffi.C.ngx_http_lua_ffi_priv_key_pem_to_der(pkey, #pkey, out, errmsg)
+            if rc < 1 then
+                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
+                        ffi.string(errmsg[0]))
+            end
+        }
+
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+failed to parse PEM cert: PEM_read_bio_X509_AUX()
+failed to parse PEM priv key: PEM_read_bio_PrivateKey failed
+
+--- no_error_log
+[alert]
diff --git a/debian/modules/nginx-lua/t/141-luajit.t b/debian/modules/nginx-lua/t/141-luajit.t
new file mode 100644
index 0000000..be03fe3
--- /dev/null
+++ b/debian/modules/nginx-lua/t/141-luajit.t
@@ -0,0 +1,47 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+#no_diff();
+#no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: avoid the data segment from growing on Linux
+This is to maximize the address space that can be used by LuaJIT.
+--- config
+    location = /t {
+        content_by_lua_block {
+            local ffi = require "ffi"
+            ffi.cdef[[
+                void *malloc(size_t size);
+                void free(void *p);
+            ]]
+            local p = ffi.C.malloc(1);
+            local num = tonumber(ffi.cast("uintptr_t", p))
+            ffi.C.free(p)
+            if ffi.abi("64bit") then
+                if num < 2^31 then
+                    ngx.say("fail: ", string.format("p = %#x", num))
+                    return
+                end
+            end
+            ngx.say("pass")
+        }
+    }
+--- request
+GET /t
+--- response_body
+pass
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c b/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
index ec74aa4..42cde55 100644
--- a/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
+++ b/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
@@ -85,7 +85,6 @@ static char *ngx_http_fake_merge_srv_conf(ngx_conf_t *cf, void *prev, void *conf
         return NGX_CONF_ERROR;
     }
 
-    ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0, "merge srv conf ok");
     return NGX_CONF_OK;
 }
 
@@ -116,6 +115,5 @@ static char *ngx_http_fake_merge_loc_conf(ngx_conf_t *cf, void *prev, void *conf
         return NGX_CONF_ERROR;
     }
 
-    ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0, "merge loc conf ok");
     return NGX_CONF_OK;
 }
diff --git a/debian/modules/nginx-lua/util/build.sh b/debian/modules/nginx-lua/util/build.sh
index 2aa79cc..17841ed 100755
--- a/debian/modules/nginx-lua/util/build.sh
+++ b/debian/modules/nginx-lua/util/build.sh
@@ -39,7 +39,7 @@ time ngx-build $force $version \
             --without-http_memcached_module \
             --without-http_auth_basic_module \
             --without-http_userid_module \
-                --add-module=$home/work/nginx/ngx_http_auth_request_module-0.2 \
+            --with-http_auth_request_module \
                 --add-module=$root/../echo-nginx-module \
                 --add-module=$root/../memc-nginx-module \
                 --add-module=$root/../srcache-nginx-module \

From 8e280162c688d6b00fc47690a1c7e015e8ddbb35 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 29 Jul 2016 16:46:55 +0300
Subject: [PATCH 082/600] Imported Upstream version 1.11.3

---
 CHANGES                                       |  100 +-
 CHANGES.ru                                    |  101 +-
 auto/cc/acc                                   |    1 -
 auto/cc/clang                                 |    6 -
 auto/cc/conf                                  |    2 +-
 auto/cc/gcc                                   |   19 +-
 auto/cc/icc                                   |    4 -
 auto/cc/sunc                                  |    9 +-
 auto/endianness                               |    2 +-
 auto/feature                                  |    2 +-
 auto/include                                  |    5 +-
 auto/lib/conf                                 |   29 -
 auto/lib/make                                 |    8 -
 auto/lib/md5/conf                             |  103 --
 auto/lib/md5/make                             |   96 -
 auto/lib/md5/makefile.bcc                     |   22 -
 auto/lib/md5/makefile.msvc                    |   22 -
 auto/lib/md5/makefile.owc                     |   11 -
 auto/lib/sha1/conf                            |   79 -
 auto/lib/sha1/make                            |   96 -
 auto/lib/sha1/makefile.bcc                    |   22 -
 auto/lib/sha1/makefile.msvc                   |   22 -
 auto/lib/sha1/makefile.owc                    |   11 -
 auto/lib/test                                 |   40 -
 auto/module                                   |   18 +-
 auto/modules                                  |   75 +-
 auto/options                                  |   68 +-
 auto/os/darwin                                |    4 +-
 auto/os/linux                                 |   17 +
 auto/os/solaris                               |    2 +-
 auto/sources                                  |    1 +
 auto/summary                                  |   14 -
 auto/types/sizeof                             |    2 +-
 auto/types/typedef                            |    2 +-
 auto/types/uintptr_t                          |    4 +-
 auto/unix                                     |   79 +-
 src/core/nginx.h                              |    4 +-
 src/core/ngx_conf_file.h                      |    1 -
 src/core/ngx_connection.c                     |   13 +-
 src/core/ngx_connection.h                     |    8 +-
 src/core/ngx_crypt.c                          |   13 -
 src/core/ngx_file.c                           |   19 +-
 src/core/ngx_file.h                           |    4 +-
 src/core/ngx_inet.c                           |  196 +-
 src/core/ngx_inet.h                           |   36 +-
 src/core/ngx_md5.c                            |    6 -
 src/core/ngx_md5.h                            |   32 -
 src/core/ngx_module.h                         |    9 -
 src/core/ngx_proxy_protocol.c                 |   52 +-
 src/core/ngx_resolver.c                       |   54 +-
 src/core/ngx_sha1.c                           |  294 +++
 src/core/ngx_sha1.h                           |   19 +-
 src/core/ngx_string.c                         |    4 +-
 src/event/modules/ngx_epoll_module.c          |   93 +-
 src/event/ngx_event.c                         |   35 +-
 src/event/ngx_event.h                         |   20 +-
 src/event/ngx_event_accept.c                  |   19 +-
 src/event/ngx_event_connect.c                 |  153 ++
 src/event/ngx_event_connect.h                 |    3 +
 src/event/ngx_event_openssl.c                 |  240 ++-
 src/event/ngx_event_openssl.h                 |    5 +
 src/event/ngx_event_openssl_stapling.c        |  150 +-
 src/http/modules/ngx_http_dav_module.c        |    6 +
 src/http/modules/ngx_http_fastcgi_module.c    |    2 +-
 src/http/modules/ngx_http_log_module.c        |    4 +-
 src/http/modules/ngx_http_map_module.c        |  126 +-
 src/http/modules/ngx_http_memcached_module.c  |    2 +-
 src/http/modules/ngx_http_proxy_module.c      |   10 +-
 src/http/modules/ngx_http_realip_module.c     |   66 +-
 src/http/modules/ngx_http_scgi_module.c       |    2 +-
 src/http/modules/ngx_http_ssl_module.c        |   66 +-
 src/http/modules/ngx_http_ssl_module.h        |    5 +-
 src/http/modules/ngx_http_sub_filter_module.c |  124 +-
 .../ngx_http_upstream_keepalive_module.c      |    2 +-
 .../modules/ngx_http_userid_filter_module.c   |    2 +-
 src/http/modules/ngx_http_uwsgi_module.c      |   10 +-
 src/http/ngx_http.c                           |   73 +-
 src/http/ngx_http_core_module.c               |   18 +-
 src/http/ngx_http_core_module.h               |   13 +-
 src/http/ngx_http_file_cache.c                |   11 +-
 src/http/ngx_http_header_filter_module.c      |   37 +-
 src/http/ngx_http_parse.c                     |   38 +-
 src/http/ngx_http_request.c                   |   14 +-
 src/http/ngx_http_request.h                   |    2 +
 src/http/ngx_http_script.c                    |   14 +-
 src/http/ngx_http_special_response.c          |   15 +-
 src/http/ngx_http_upstream.c                  |  115 +-
 src/http/ngx_http_upstream.h                  |    3 +
 src/http/ngx_http_upstream_round_robin.c      |   11 +-
 src/http/ngx_http_variables.c                 |  132 +-
 src/http/v2/ngx_http_v2.c                     |  220 ++-
 src/http/v2/ngx_http_v2.h                     |    7 +-
 src/http/v2/ngx_http_v2_filter_module.c       |   55 +-
 src/http/v2/ngx_http_v2_module.c              |   31 +
 src/http/v2/ngx_http_v2_module.h              |    1 +
 src/mail/ngx_mail.c                           |   42 +-
 src/mail/ngx_mail.h                           |   13 +-
 src/mail/ngx_mail_auth_http_module.c          |   29 +-
 src/mail/ngx_mail_core_module.c               |   58 +-
 src/mail/ngx_mail_ssl_module.c                |   64 +-
 src/mail/ngx_mail_ssl_module.h                |    5 +-
 src/os/unix/ngx_readv_chain.c                 |   32 +
 src/os/unix/ngx_recv.c                        |   33 +
 src/os/unix/ngx_thread_mutex.c                |    2 +-
 src/stream/ngx_stream.c                       |   65 +-
 src/stream/ngx_stream.h                       |  148 +-
 src/stream/ngx_stream_access_module.c         |    1 +
 src/stream/ngx_stream_core_module.c           |  197 ++-
 src/stream/ngx_stream_geo_module.c            | 1572 +++++++++++++++++
 src/stream/ngx_stream_geoip_module.c          |  814 +++++++++
 src/stream/ngx_stream_handler.c               |    9 +
 src/stream/ngx_stream_limit_conn_module.c     |  142 +-
 src/stream/ngx_stream_map_module.c            |  574 ++++++
 src/stream/ngx_stream_proxy_module.c          |  546 +++++-
 src/stream/ngx_stream_return_module.c         |  207 +++
 src/stream/ngx_stream_script.c                |  854 +++++++++
 src/stream/ngx_stream_script.h                |  123 ++
 src/stream/ngx_stream_split_clients_module.c  |  244 +++
 src/stream/ngx_stream_ssl_module.c            |  163 +-
 src/stream/ngx_stream_ssl_module.h            |    5 +-
 src/stream/ngx_stream_upstream.c              |    3 +-
 src/stream/ngx_stream_upstream.h              |   16 +
 src/stream/ngx_stream_upstream_hash_module.c  |   26 +-
 .../ngx_stream_upstream_least_conn_module.c   |    3 +-
 src/stream/ngx_stream_upstream_round_robin.c  |  135 ++
 src/stream/ngx_stream_upstream_round_robin.h  |    2 +
 src/stream/ngx_stream_upstream_zone_module.c  |    3 +-
 src/stream/ngx_stream_variables.c             |  971 ++++++++++
 src/stream/ngx_stream_variables.h             |  109 ++
 129 files changed, 8999 insertions(+), 2028 deletions(-)
 delete mode 100644 auto/lib/md5/conf
 delete mode 100644 auto/lib/md5/make
 delete mode 100644 auto/lib/md5/makefile.bcc
 delete mode 100644 auto/lib/md5/makefile.msvc
 delete mode 100644 auto/lib/md5/makefile.owc
 delete mode 100644 auto/lib/sha1/conf
 delete mode 100644 auto/lib/sha1/make
 delete mode 100644 auto/lib/sha1/makefile.bcc
 delete mode 100644 auto/lib/sha1/makefile.msvc
 delete mode 100644 auto/lib/sha1/makefile.owc
 delete mode 100644 auto/lib/test
 create mode 100644 src/core/ngx_sha1.c
 create mode 100644 src/stream/ngx_stream_geo_module.c
 create mode 100644 src/stream/ngx_stream_geoip_module.c
 create mode 100644 src/stream/ngx_stream_map_module.c
 create mode 100644 src/stream/ngx_stream_return_module.c
 create mode 100644 src/stream/ngx_stream_script.c
 create mode 100644 src/stream/ngx_stream_script.h
 create mode 100644 src/stream/ngx_stream_split_clients_module.c
 create mode 100644 src/stream/ngx_stream_variables.c
 create mode 100644 src/stream/ngx_stream_variables.h

diff --git a/CHANGES b/CHANGES
index 4396472..a795ef2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,14 +1,108 @@
 
-Changes with nginx 1.10.1                                        31 May 2016
+Changes with nginx 1.11.3                                        26 Jul 2016
+
+    *) Change: now the "accept_mutex" directive is turned off by default.
+
+    *) Feature: now nginx uses EPOLLEXCLUSIVE on Linux.
+
+    *) Feature: the ngx_stream_geo_module.
+
+    *) Feature: the ngx_stream_geoip_module.
+
+    *) Feature: the ngx_stream_split_clients_module.
+
+    *) Feature: variables support in the "proxy_pass" and "proxy_ssl_name"
+       directives in the stream module.
+
+    *) Bugfix: socket leak when using HTTP/2.
+
+    *) Bugfix: in configure tests.
+       Thanks to Piotr Sikora.
+
+
+Changes with nginx 1.11.2                                        05 Jul 2016
+
+    *) Change: now nginx always uses internal MD5 and SHA1 implementations;
+       the --with-md5 and --with-sha1 configure options were canceled.
+
+    *) Feature: variables support in the stream module.
+
+    *) Feature: the ngx_stream_map_module.
+
+    *) Feature: the ngx_stream_return_module.
+
+    *) Feature: a port can be specified in the "proxy_bind", "fastcgi_bind",
+       "memcached_bind", "scgi_bind", and "uwsgi_bind" directives.
+
+    *) Feature: now nginx uses the IP_BIND_ADDRESS_NO_PORT socket option
+       when available.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2 and the "proxy_request_buffering" directive.
+
+    *) Bugfix: the "Content-Length" request header line was always added to
+       requests passed to backends, including requests without body, when
+       using HTTP/2.
+
+    *) Bugfix: "http request count is zero" alerts might appear in logs when
+       using HTTP/2.
+
+    *) Bugfix: unnecessary buffering might occur when using the "sub_filter"
+       directive; the issue had appeared in 1.9.4.
+
+
+Changes with nginx 1.11.1                                        31 May 2016
 
     *) Security: a segmentation fault might occur in a worker process while
        writing a specially crafted request body to a temporary file
        (CVE-2016-4450); the bug had appeared in 1.3.9.
 
 
-Changes with nginx 1.10.0                                        26 Apr 2016
+Changes with nginx 1.11.0                                        24 May 2016
 
-    *) 1.10.x stable branch.
+    *) Feature: the "transparent" parameter of the "proxy_bind",
+       "fastcgi_bind", "memcached_bind", "scgi_bind", and "uwsgi_bind"
+       directives.
+
+    *) Feature: the $request_id variable.
+
+    *) Feature: the "map" directive supports combinations of multiple
+       variables as resulting values.
+
+    *) Feature: now nginx checks if EPOLLRDHUP events are supported by
+       kernel, and optimizes connection handling accordingly if the "epoll"
+       method is used.
+
+    *) Feature: the "ssl_certificate" and "ssl_certificate_key" directives
+       can be specified multiple times to load certificates of different
+       types (for example, RSA and ECDSA).
+
+    *) Feature: the "ssl_ecdh_curve" directive now allows specifying a list
+       of curves when using OpenSSL 1.0.2 or newer; by default a list built
+       into OpenSSL is used.
+
+    *) Change: to use DHE ciphers it is now required to specify parameters
+       using the "ssl_dhparam" directive.
+
+    *) Feature: the $proxy_protocol_port variable.
+
+    *) Feature: the $realip_remote_port variable in the
+       ngx_http_realip_module.
+
+    *) Feature: the ngx_http_realip_module is now able to set the client
+       port in addition to the address.
+
+    *) Change: the "421 Misdirected Request" response now used when
+       rejecting requests to a virtual server different from one negotiated
+       during an SSL handshake; this improves interoperability with some
+       HTTP/2 clients when using client certificates.
+
+    *) Change: HTTP/2 clients can now start sending request body
+       immediately; the "http2_body_preread_size" directive controls size of
+       the buffer used before nginx will start reading client request body.
+
+    *) Bugfix: cached error responses were not updated when using the
+       "proxy_cache_bypass" directive.
 
 
 Changes with nginx 1.9.15                                        19 Apr 2016
diff --git a/CHANGES.ru b/CHANGES.ru
index c96cf93..cd424e9 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,14 +1,109 @@
 
-Изменения в nginx 1.10.1                                          31.05.2016
+Изменения в nginx 1.11.3                                          26.07.2016
+
+    *) Изменение: теперь accept_mutex по умолчанию выключен.
+
+    *) Добавление: теперь nginx использует EPOLLEXCLUSIVE на Linux.
+
+    *) Добавление: модуль ngx_stream_geo_module.
+
+    *) Добавление: модуль ngx_stream_geoip_module.
+
+    *) Добавление: модуль ngx_stream_split_clients_module.
+
+    *) Добавление: директивы proxy_pass и proxy_ssl_name в модуле stream
+       поддерживают переменные.
+
+    *) Исправление: утечки сокетов при использовании HTTP/2.
+
+    *) Исправление: в configure.
+       Спасибо Piotr Sikora.
+
+
+Изменения в nginx 1.11.2                                          05.07.2016
+
+    *) Изменение: теперь nginx всегда использует внутренние реализации MD5 и
+       SHA1; параметры configure --with-md5 и --with-sha1 упразднены.
+
+    *) Добавление: поддержка переменных в модуле stream.
+
+    *) Добавление: модуль ngx_stream_map_module.
+
+    *) Добавление: модуль ngx_stream_return_module.
+
+    *) Добавление: в директивах proxy_bind, fastcgi_bind, memcached_bind,
+       scgi_bind и uwsgi_bind теперь можно указывать порт.
+
+    *) Добавление: теперь nginx использует опцию сокета
+       IP_BIND_ADDRESS_NO_PORT, если она доступна.
+
+    *) Исправление: при использовании HTTP/2 и директивы
+       proxy_request_buffering в рабочем процессе мог произойти segmentation
+       fault.
+
+    *) Исправление: при использовании HTTP/2 к запросам, передаваемым на
+       бэкенд, всегда добавлялась строка заголовка "Content-Length", даже
+       если у запроса не было тела.
+
+    *) Исправление: при использовании HTTP/2 в логах могли появляться
+       сообщения "http request count is zero".
+
+    *) Исправление: при использовании директивы sub_filter могло
+       буферизироваться больше данных, чем это необходимо; проблема
+       появилась в 1.9.4.
+
+
+Изменения в nginx 1.11.1                                          31.05.2016
 
     *) Безопасность: при записи тела специально созданного запроса во
        временный файл в рабочем процессе мог происходить segmentation fault
        (CVE-2016-4450); ошибка появилась в 1.3.9.
 
 
-Изменения в nginx 1.10.0                                          26.04.2016
+Изменения в nginx 1.11.0                                          24.05.2016
 
-    *) Стабильная ветка 1.10.x.
+    *) Добавление: параметр transparent директив proxy_bind, fastcgi_bind,
+       memcached_bind, scgi_bind и uwsgi_bind.
+
+    *) Добавление: переменная $request_id.
+
+    *) Добавление: директива map поддерживает комбинации нескольких
+       переменных в качестве результирующих значений.
+
+    *) Добавление: теперь при использовании метода epoll nginx проверяет,
+       поддерживает ли ядро события EPOLLRDHUP, и соответственно
+       оптимизирует обработку соединений.
+
+    *) Добавление: директивы ssl_certificate и ssl_certificate_key теперь
+       можно указывать несколько раз для загрузки сертификатов разных типов
+       (например, RSA и ECDSA).
+
+    *) Добавление: при использовании OpenSSL 1.0.2 и новее с помощью
+       директивы ssl_ecdh_curve теперь можно задать список кривых; по
+       умолчанию используется встроенный в OpenSSL список кривых.
+
+    *) Изменение: для использования DHE-шифров теперь надо явно задавать
+       файл параметров с помощью директивы ssl_dhparam.
+
+    *) Добавление: переменная $proxy_protocol_port.
+
+    *) Добавление: переменная $realip_remote_port в модуле
+       ngx_http_realip_module.
+
+    *) Добавление: модуль ngx_http_realip_module теперь позволяет
+       устанавливать не только адрес, но и порт клиента.
+
+    *) Изменение: при попытке запросить виртуальный сервер, отличающийся от
+       согласованного в процессе SSL handshake, теперь возвращается ответ
+       "421 Misdirected Request"; это улучшает совместимость с некоторыми
+       HTTP/2-клиентами в случае использования клиентских сертификатов.
+
+    *) Изменение: HTTP/2-клиенты теперь могут сразу присылать тело запроса;
+       директива http2_body_preread_size позволяет указать размер буфера,
+       который будет использоваться до того, как nginx начнёт читать тело.
+
+    *) Исправление: при использовании директивы proxy_cache_bypass не
+       обновлялись закэшированные ошибочные ответы.
 
 
 Изменения в nginx 1.9.15                                          19.04.2016
diff --git a/auto/cc/acc b/auto/cc/acc
index 6baee67..64fa671 100644
--- a/auto/cc/acc
+++ b/auto/cc/acc
@@ -12,4 +12,3 @@ CC_TEST_FLAGS="-Ae"
 
 PCRE_OPT="$PCRE_OPT -Ae"
 ZLIB_OPT="$ZLIB_OPT -Ae"
-MD5_OPT="$MD5_OPT -Ae"
diff --git a/auto/cc/clang b/auto/cc/clang
index 25707b4..19bdaaa 100644
--- a/auto/cc/clang
+++ b/auto/cc/clang
@@ -66,12 +66,6 @@ else
     PCRE_OPT="$PCRE_OPT -pipe"
 fi
 
-if [ ".$MD5_OPT" = "." ]; then
-    MD5_OPT="-O2 -pipe $CPU_OPT"
-else
-    MD5_OPT="$MD5_OPT -pipe"
-fi
-
 if [ ".$ZLIB_OPT" = "." ]; then
     ZLIB_OPT="-O2 -pipe $CPU_OPT"
 else
diff --git a/auto/cc/conf b/auto/cc/conf
index f2c25ed..b3b9f92 100644
--- a/auto/cc/conf
+++ b/auto/cc/conf
@@ -231,7 +231,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
     ngx_feature_incs=
     ngx_feature_path=
     ngx_feature_libs=
-    ngx_feature_test="__builtin_bswap64(0)"
+    ngx_feature_test="if (__builtin_bswap64(0)) return 1"
     . auto/feature
 
 
diff --git a/auto/cc/gcc b/auto/cc/gcc
index c9101fe..a5c5c18 100644
--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@@ -128,12 +128,6 @@ else
     PCRE_OPT="$PCRE_OPT $PIPE"
 fi
 
-if [ ".$MD5_OPT" = "." ]; then
-    MD5_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT"
-else
-    MD5_OPT="$MD5_OPT $PIPE"
-fi
-
 if [ ".$ZLIB_OPT" = "." ]; then
     ZLIB_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT"
 else
@@ -151,9 +145,13 @@ CFLAGS="$CFLAGS -Wall -Wpointer-arith"
 #CFLAGS="$CFLAGS -Winline"
 #CFLAGS="$CFLAGS -Wmissing-prototypes"
 
-
 case "$NGX_GCC_VER" in
-    [3-5].*)
+    2.*)
+        # we have a lot of the unused function arguments
+        CFLAGS="$CFLAGS -Wno-unused"
+    ;;
+
+    *)
         # we have a lot of the unused function arguments
         CFLAGS="$CFLAGS -Wno-unused-parameter"
         # 4.2.1 shows the warning in wrong places
@@ -164,11 +162,6 @@ case "$NGX_GCC_VER" in
             CFLAGS="$CFLAGS -Wno-deprecated-declarations"
         fi
     ;;
-
-    *)
-        # we have a lot of the unused function arguments
-        CFLAGS="$CFLAGS -Wno-unused"
-    ;;
 esac
 
 
diff --git a/auto/cc/icc b/auto/cc/icc
index 1c0df1a..c47f6e4 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -43,10 +43,6 @@ if [ ".$PCRE_OPT" = "." ]; then
     PCRE_OPT="-O $CPU_OPT"
 fi
 
-if [ ".$MD5_OPT" = "." ]; then
-    MD5_OPT="-O $CPU_OPT"
-fi
-
 if [ ".$ZLIB_OPT" = "." ]; then
     ZLIB_OPT="-O $CPU_OPT"
 fi
diff --git a/auto/cc/sunc b/auto/cc/sunc
index 8360c49..806ccc4 100644
--- a/auto/cc/sunc
+++ b/auto/cc/sunc
@@ -20,7 +20,10 @@ have=NGX_COMPILER value="\"Sun C $NGX_SUNC_VER\"" . auto/define
 
 cat << END > $NGX_AUTOTEST.c
 
-int main() { printf("%d", __SUNPRO_C); }
+int main(void) {
+    printf("%d", __SUNPRO_C);
+    return 0;
+}
 
 END
 
@@ -145,10 +148,6 @@ if [ ".$PCRE_OPT" = "." ]; then
     PCRE_OPT="$ngx_fast $IPO $CPU_OPT"
 fi
 
-if [ ".$MD5_OPT" = "." ]; then
-    MD5_OPT="$ngx_fast $IPO $CPU_OPT"
-fi
-
 if [ ".$ZLIB_OPT" = "." ]; then
     ZLIB_OPT="$ngx_fast $IPO $CPU_OPT"
 fi
diff --git a/auto/endianness b/auto/endianness
index 70b0a10..1b552b6 100644
--- a/auto/endianness
+++ b/auto/endianness
@@ -15,7 +15,7 @@ END
 
 cat << END > $NGX_AUTOTEST.c
 
-int main() {
+int main(void) {
     int i = 0x11223344;
     char *p;
 
diff --git a/auto/feature b/auto/feature
index 1145f28..3561f59 100644
--- a/auto/feature
+++ b/auto/feature
@@ -31,7 +31,7 @@ cat << END > $NGX_AUTOTEST.c
 $NGX_INCLUDE_UNISTD_H
 $ngx_feature_incs
 
-int main() {
+int main(void) {
     $ngx_feature_test;
     return 0;
 }
diff --git a/auto/include b/auto/include
index e34dabd..c1bd364 100644
--- a/auto/include
+++ b/auto/include
@@ -20,7 +20,7 @@ cat << END > $NGX_AUTOTEST.c
 $NGX_INCLUDE_SYS_PARAM_H
 #include <$ngx_include>
 
-int main() {
+int main(void) {
     return 0;
 }
 
@@ -45,9 +45,6 @@ if [ -x $NGX_AUTOTEST ]; then
 
     eval "NGX_INCLUDE_$ngx_name='#include <$ngx_include>'"
 
-    #STUB
-    eval "NGX_$ngx_name='#include <$ngx_include>'"
-
 else
     echo " not found"
 
diff --git a/auto/lib/conf b/auto/lib/conf
index a6242e7..0b8545a 100644
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -25,35 +25,6 @@ if [ $USE_OPENSSL = YES ]; then
     . auto/lib/openssl/conf
 fi
 
-if [ $USE_MD5 = YES ]; then
-
-    if [ $USE_OPENSSL = YES ]; then
-        have=NGX_HAVE_OPENSSL_MD5_H . auto/have
-        have=NGX_OPENSSL_MD5 . auto/have
-        have=NGX_HAVE_MD5 . auto/have
-        MD5=YES
-        MD5_LIB=OpenSSL
-
-    else
-        . auto/lib/md5/conf
-    fi
-
-fi
-
-if [ $USE_SHA1 = YES ]; then
-
-    if [ $USE_OPENSSL = YES ]; then
-        have=NGX_HAVE_OPENSSL_SHA1_H . auto/have
-        have=NGX_HAVE_SHA1 . auto/have
-        SHA1=YES
-        SHA1_LIB=OpenSSL
-
-    else
-        . auto/lib/sha1/conf
-    fi
-
-fi
-
 if [ $USE_ZLIB = YES ]; then
     . auto/lib/zlib/conf
 fi
diff --git a/auto/lib/make b/auto/lib/make
index 6298b94..b64e329 100644
--- a/auto/lib/make
+++ b/auto/lib/make
@@ -7,14 +7,6 @@ if [ $PCRE != NONE -a $PCRE != NO -a $PCRE != YES ]; then
     . auto/lib/pcre/make
 fi
 
-if [ $MD5 != NONE -a $MD5 != NO -a $MD5 != YES ]; then
-    . auto/lib/md5/make
-fi
-
-if [ $SHA1 != NONE -a $SHA1 != NO -a $SHA1 != YES ]; then
-    . auto/lib/sha1/make
-fi
-
 if [ $OPENSSL != NONE -a $OPENSSL != NO -a $OPENSSL != YES ]; then
     . auto/lib/openssl/make
 fi
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
deleted file mode 100644
index 49c0ddf..0000000
--- a/auto/lib/md5/conf
+++ /dev/null
@@ -1,103 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-if [ $MD5 != NONE ]; then
-
-    if grep MD5_Init $MD5/md5.h 2>&1 >/dev/null; then
-        # OpenSSL md5
-        OPENSSL_MD5=YES
-        have=NGX_HAVE_OPENSSL_MD5 . auto/have
-        have=NGX_OPENSSL_MD5 . auto/have
-    else
-        # rsaref md5
-        OPENSSL_MD5=NO
-    fi
-
-    have=NGX_HAVE_MD5 . auto/have
-    CORE_INCS="$CORE_INCS $MD5"
-
-    case "$NGX_CC_NAME" in
-
-        msvc | owc | bcc)
-            LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
-            CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
-        ;;
-
-        icc)
-            LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
-
-            # to allow -ipo optimization we link with the *.o but not library
-            CORE_LIBS="$CORE_LIBS $MD5/md5_dgst.o"
-
-            if [ $MD5_ASM = YES ]; then
-                CORE_LIBS="$CORE_LIBS $MD5/asm/mx86-elf.o"
-            fi
-        ;;
-
-        *)
-            LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
-            CORE_LIBS="$CORE_LIBS $MD5/libmd5.a"
-            #CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5"
-        ;;
-
-    esac
-
-else
-
-    if [ "$NGX_PLATFORM" != win32 ]; then
-
-            MD5=NO
-
-            # FreeBSD, Solaris 10
-
-            ngx_feature="md5 in system md library"
-            ngx_feature_name=NGX_HAVE_MD5
-            ngx_feature_run=no
-            ngx_feature_incs="#include <md5.h>"
-            ngx_feature_path=
-            ngx_feature_libs="-lmd"
-            ngx_feature_test="MD5_CTX md5; MD5Init(&md5)"
-            . auto/feature
-
-            ngx_md5_lib="system md"
-
-        if [ $ngx_found = no ]; then
-
-            # Solaris 8/9
-
-            ngx_feature="md5 in system md5 library"
-            ngx_feature_libs="-lmd5"
-            . auto/feature
-
-            ngx_md5_lib="system md5"
-        fi
-
-        if [ $ngx_found = no ]; then
-
-            # OpenSSL crypto library
-
-            ngx_feature="md5 in system OpenSSL crypto library"
-            ngx_feature_name="NGX_OPENSSL_MD5"
-            ngx_feature_incs="#include <openssl/md5.h>"
-            ngx_feature_libs="-lcrypto"
-            ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)"
-            . auto/feature
-
-            ngx_md5_lib="system crypto"
-
-            if [ $ngx_found = yes ]; then
-                have=NGX_HAVE_OPENSSL_MD5_H . auto/have
-                have=NGX_HAVE_MD5 . auto/have
-            fi
-        fi
-
-        if [ $ngx_found = yes ]; then
-            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-            MD5=YES
-            MD5_LIB=$ngx_md5_lib
-        fi
-    fi
-
-fi
diff --git a/auto/lib/md5/make b/auto/lib/md5/make
deleted file mode 100644
index 7000b20..0000000
--- a/auto/lib/md5/make
+++ /dev/null
@@ -1,96 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-case "$NGX_CC_NAME" in
-
-    msvc)
-        ngx_makefile=makefile.msvc
-        ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC MD5_ASM=$MD5_ASM"
-        ngx_md5="MD5=\"$MD5\""
-    ;;
-
-    owc)
-        ngx_makefile=makefile.owc
-        ngx_opt="CPU_OPT=\"$CPU_OPT\""
-        ngx_md5=`echo MD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"`
-    ;;
-
-    bcc)
-        ngx_makefile=makefile.bcc
-        ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DMD5_ASM=$MD5_ASM"
-        ngx_md5=`echo \-DMD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"`
-    ;;
-
-esac
-
-
-done=NO
-
-
-case "$NGX_PLATFORM" in
-
-    win32)
-        cat << END                                        >> $NGX_MAKEFILE
-
-`echo "$MD5/md5.lib:	$NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
-	\$(MAKE) -f auto/lib/md5/$ngx_makefile $ngx_opt $ngx_md5
-
-END
-
-        done=YES
-    ;;
-
-    SunOS:*:i86pc)
-        if [ $MD5_ASM = YES ]; then
-
-            cat << END                                        >> $NGX_MAKEFILE
-
-$MD5/libmd5.a:	$NGX_MAKEFILE
-	cd $MD5 \\
-	&& \$(MAKE) CFLAGS="$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN" \\
-		CC="\$(CC)" CPP="\$(CPP)" \\
-		MD5_ASM_OBJ=asm/mx86-sol.o clean libmd5.a
-
-END
-
-            done=YES
-        fi
-    ;;
-
-    # FreeBSD: i386
-    # Linux: i686
-
-    *:i386 | *:i686)
-        if [ $MD5_ASM = YES ]; then
-
-            cat << END                                        >> $NGX_MAKEFILE
-
-$MD5/libmd5.a:	$NGX_MAKEFILE
-	cd $MD5 \\
-	&& \$(MAKE) CFLAGS="$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN" \\
-		CC="\$(CC)" CPP="\$(CPP)" \\
-		MD5_ASM_OBJ=asm/mx86-elf.o clean libmd5.a
-
-END
-
-            done=YES
-        fi
-    ;;
-
-esac
-
-
-if [ $done = NO ]; then
-
-    cat << END                                                >> $NGX_MAKEFILE
-
-$MD5/libmd5.a:	$NGX_MAKEFILE
-	cd $MD5 \\
-	&& \$(MAKE) CFLAGS="$MD5_OPT" \\
-		CC="\$(CC)" MD5_ASM_OBJ= clean libmd5.a
-
-END
-
-fi
diff --git a/auto/lib/md5/makefile.bcc b/auto/lib/md5/makefile.bcc
deleted file mode 100644
index eb6fb62..0000000
--- a/auto/lib/md5/makefile.bcc
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
-
-!if "$(MD5_ASM)" == "YES"
-
-md5.lib:
-	cd $(MD5)
-	bcc32 -c $(CFLAGS) -DMD5_ASM md5_dgst.c
-	tlib md5.lib +md5_dgst.obj +"asm\m-win32.obj"
-
-!else
-
-md5.lib:
-	cd $(MD5)
-	bcc32 -c $(CFLAGS) md5_dgst.c
-	tlib md5.lib +md5_dgst.obj
-
-!endif
diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
deleted file mode 100644
index 90d62fa..0000000
--- a/auto/lib/md5/makefile.msvc
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
-
-!IF "$(MD5_ASM)" == "YES"
-
-md5.lib:
-	cd $(MD5)
-	cl -c $(CFLAGS) -D MD5_ASM md5_dgst.c
-	link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj
-
-!ELSE
-
-md5.lib:
-	cd $(MD5)
-	cl -c $(CFLAGS) md5_dgst.c
-	link -lib -out:md5.lib md5_dgst.obj
-
-!ENDIF
diff --git a/auto/lib/md5/makefile.owc b/auto/lib/md5/makefile.owc
deleted file mode 100644
index 78c1e61..0000000
--- a/auto/lib/md5/makefile.owc
+++ /dev/null
@@ -1,11 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
-
-md5.lib:
-	cd $(MD5)
-	wcl386 -c $(CFLAGS) -dL_ENDIAN md5_dgst.c
-	wlib -n md5.lib md5_dgst.obj
diff --git a/auto/lib/sha1/conf b/auto/lib/sha1/conf
deleted file mode 100644
index 78f9efd..0000000
--- a/auto/lib/sha1/conf
+++ /dev/null
@@ -1,79 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-if [ $SHA1 != NONE ]; then
-
-    have=NGX_HAVE_SHA1 . auto/have
-    CORE_INCS="$CORE_INCS $SHA1"
-
-    case "$NGX_CC_NAME" in
-
-        msvc | owc | bcc)
-            LINK_DEPS="$LINK_DEPS $SHA1/sha1.lib"
-            CORE_LIBS="$CORE_LIBS $SHA1/sha1.lib"
-        ;;
-
-        icc)
-            LINK_DEPS="$LINK_DEPS $SHA1/libsha.a"
-
-            # to allow -ipo optimization we link with the *.o but not library
-            CORE_LIBS="$CORE_LIBS $SHA1/sha1_dgst.o"
-
-            if [ $SHA1_ASM = YES ]; then
-                CORE_LIBS="$CORE_LIBS $SHA1/asm/sx86-elf.o"
-            fi
-        ;;
-
-        *)
-            LINK_DEPS="$LINK_DEPS $SHA1/libsha.a"
-            CORE_LIBS="$CORE_LIBS $SHA1/libsha.a"
-            #CORE_LIBS="$CORE_LIBS -L $SHA1 -lsha"
-        ;;
-
-    esac
-
-else
-
-    if [ "$NGX_PLATFORM" != win32 ]; then
-
-        SHA1=NO
-
-        # FreeBSD
-
-        ngx_feature="sha1 in system md library"
-        ngx_feature_name=NGX_HAVE_SHA1
-        ngx_feature_run=no
-        ngx_feature_incs="#include <sha.h>"
-        ngx_feature_path=
-        ngx_feature_libs="-lmd"
-        ngx_feature_test="SHA_CTX sha1; SHA1_Init(&sha1)"
-        . auto/feature
-
-        ngx_sha1_lib="system md"
-
-        if [ $ngx_found = no ]; then
-
-            # OpenSSL crypto library
-
-            ngx_feature="sha1 in system OpenSSL crypto library"
-            ngx_feature_incs="#include <openssl/sha.h>"
-            ngx_feature_libs="-lcrypto"
-            . auto/feature
-
-            ngx_sha1_lib="system crypto"
-
-            if [ $ngx_found = yes ]; then
-                have=NGX_HAVE_OPENSSL_SHA1_H . auto/have
-            fi
-        fi
-
-        if [ $ngx_found = yes ]; then
-            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-            SHA1=YES
-            SHA1_LIB=$ngx_sha1_lib
-        fi
-    fi
-
-fi
diff --git a/auto/lib/sha1/make b/auto/lib/sha1/make
deleted file mode 100644
index fc3b340..0000000
--- a/auto/lib/sha1/make
+++ /dev/null
@@ -1,96 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-case "$NGX_CC_NAME" in
-
-    msvc)
-        ngx_makefile=makefile.msvc
-        ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC SHA1_ASM=$SHA1_ASM"
-        ngx_sha1="SHA1=\"$SHA1\""
-    ;;
-
-    owc)
-        ngx_makefile=makefile.owc
-        ngx_opt="CPU_OPT=\"$CPU_OPT\""
-        ngx_sha1=`echo SHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"`
-    ;;
-
-    bcc)
-        ngx_makefile=makefile.bcc
-        ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DSHA1_ASM=$SHA1_ASM"
-        ngx_sha1=`echo \-DSHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"`
-    ;;
-
-esac
-
-
-done=NO
-
-
-case "$NGX_PLATFORM" in
-
-    win32)
-        cat << END                                        >> $NGX_MAKEFILE
-
-`echo "$SHA1/sha1.lib:	$NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
-	\$(MAKE) -f auto/lib/sha1/$ngx_makefile $ngx_opt $ngx_sha1
-
-END
-
-        done=YES
-    ;;
-
-    SunOS:*:i86pc)
-        if [ $SHA1_ASM = YES ]; then
-
-            cat << END                                        >> $NGX_MAKEFILE
-
-$SHA1/libsha.a:	$NGX_MAKEFILE
-	cd $SHA1 \\
-	&& \$(MAKE) CFLAGS="$SHA1_OPT -DSOL -DSHA1_ASM -DL_ENDIAN" \\
-		CC="\$(CC)" CPP="\$(CPP)" \\
-		SHA_ASM_OBJ=asm/sx86-sol.o clean libsha.a
-
-END
-
-            done=YES
-        fi
-    ;;
-
-    # FreeBSD: i386
-    # Linux: i686
-
-    *:i386 | *:i686)
-        if [ $SHA1_ASM = YES ]; then
-
-            cat << END                                        >> $NGX_MAKEFILE
-
-$SHA1/libsha.a:	$NGX_MAKEFILE
-	cd $SHA1 \\
-	&& \$(MAKE) CFLAGS="$SHA1_OPT -DELF -DSHA1_ASM -DL_ENDIAN" \\
-		CC="\$(CC)" CPP="\$(CPP)" \\
-		SHA_ASM_OBJ=asm/sx86-elf.o clean libsha.a
-
-END
-
-            done=YES
-        fi
-    ;;
-
-esac
-
-
-if [ $done = NO ]; then
-
-    cat << END                                                >> $NGX_MAKEFILE
-
-$SHA1/libsha.a:	$NGX_MAKEFILE
-	cd $SHA1 \\
-	&& \$(MAKE) CFLAGS="$SHA1_OPT" \\
-		CC="\$(CC)" SHA_ASM_OBJ= clean libsha.a
-
-END
-
-fi
diff --git a/auto/lib/sha1/makefile.bcc b/auto/lib/sha1/makefile.bcc
deleted file mode 100644
index b0685fa..0000000
--- a/auto/lib/sha1/makefile.bcc
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
-
-!if "$(SHA1_ASM)" == "YES"
-
-sha1.lib:
-	cd $(SHA1)
-	bcc32 -c $(CFLAGS) -DSHA1_ASM sha1dgst.c
-	tlib sha1.lib +sha1dgst.obj +"asm\s-win32.obj"
-
-!else
-
-sha1.lib:
-	cd $(SHA1)
-	bcc32 -c $(CFLAGS) sha1dgst.c
-	tlib sha1.lib +sha1dgst.obj
-
-!endif
diff --git a/auto/lib/sha1/makefile.msvc b/auto/lib/sha1/makefile.msvc
deleted file mode 100644
index 3cbd21b..0000000
--- a/auto/lib/sha1/makefile.msvc
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
-
-!IF "$(SHA1_ASM)" == "YES"
-
-sha1.lib:
-	cd $(SHA1)
-	cl -c $(CFLAGS) -D SHA1_ASM sha1dgst.c
-	link -lib -out:sha1.lib sha1dgst.obj asm/s-win32.obj
-
-!ELSE
-
-sha1.lib:
-	cd $(SHA1)
-	cl -c $(CFLAGS) sha1dgst.c
-	link -lib -out:sha1.lib sha1dgst.obj
-
-!ENDIF
diff --git a/auto/lib/sha1/makefile.owc b/auto/lib/sha1/makefile.owc
deleted file mode 100644
index fc095cc..0000000
--- a/auto/lib/sha1/makefile.owc
+++ /dev/null
@@ -1,11 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
-
-sha1.lib:
-	cd $(SHA1)
-	wcl386 -c $(CFLAGS) -dL_ENDIAN sha1dgst.c
-	wlib -n sha1.lib sha1dgst.obj
diff --git a/auto/lib/test b/auto/lib/test
deleted file mode 100644
index ba943a2..0000000
--- a/auto/lib/test
+++ /dev/null
@@ -1,40 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-echo $ngx_n "checking for $ngx_lib ...$ngx_c"
-
-cat << END >> $NGX_AUTOCONF_ERR
-
-----------------------------------------
-checking for $ngx_lib
-
-END
-
-ngx_found=no
-
-cat << END > $NGX_AUTOTEST.c
-
-$ngx_lib_incs
-
-int main() {
-    $ngx_lib_test;
-    return 0;
-}
-
-
-eval "$CC $cc_test_flags $ngx_lib_cflags \
-     -o $NGX_AUTOTEST $NGX_AUTOTEST.c $ngx_libs \
-     >> $NGX_ERR 2>&1"
-
-if [ -x $NGX_AUTOTEST ]; then
-    echo " found"
-
-    ngx_found=yes
-
-else
-    echo " not found"
-fi
-
-rm -rf $NGX_AUTOTEST*
diff --git a/auto/module b/auto/module
index 16a816f..3b00a07 100644
--- a/auto/module
+++ b/auto/module
@@ -48,10 +48,14 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
                 fi
             ;;
 
-            PCRE | OPENSSL | MD5 | SHA1 | ZLIB)
+            PCRE | OPENSSL | ZLIB)
                 eval USE_${lib}=YES
             ;;
 
+            MD5 | SHA1)
+                # obsolete
+            ;;
+
             *)
                 libs="$libs $lib"
             ;;
@@ -79,10 +83,14 @@ elif [ "$ngx_module_link" = YES ]; then
     do
         case $lib in
 
-            PCRE | OPENSSL | MD5 | SHA1 | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
+            PCRE | OPENSSL | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
                 eval USE_${lib}=YES
             ;;
 
+            MD5 | SHA1)
+                # obsolete
+            ;;
+
             *)
                 CORE_LIBS="$CORE_LIBS $lib"
             ;;
@@ -109,10 +117,14 @@ elif [ "$ngx_module_link" = ADDON ]; then
     do
         case $lib in
 
-            PCRE | OPENSSL | MD5 | SHA1 | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
+            PCRE | OPENSSL | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
                 eval USE_${lib}=YES
             ;;
 
+            MD5 | SHA1)
+                # obsolete
+            ;;
+
             *)
                 CORE_LIBS="$CORE_LIBS $lib"
             ;;
diff --git a/auto/modules b/auto/modules
index 22ff6d9..614037c 100644
--- a/auto/modules
+++ b/auto/modules
@@ -43,6 +43,7 @@ fi
 if [ $NGX_TEST_BUILD_EPOLL = YES ]; then
     have=NGX_HAVE_EPOLL . auto/have
     have=NGX_HAVE_EPOLLRDHUP . auto/have
+    have=NGX_HAVE_EPOLLEXCLUSIVE . auto/have
     have=NGX_HAVE_EVENTFD . auto/have
     have=NGX_TEST_BUILD_EPOLL . auto/have
     EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE"
@@ -101,7 +102,6 @@ fi
 
 
 if [ $HTTP_CACHE = YES ]; then
-    USE_MD5=YES
     have=NGX_HTTP_CACHE . auto/have
     HTTP_SRCS="$HTTP_SRCS $HTTP_FILE_CACHE_SRCS"
 fi
@@ -522,8 +522,6 @@ if [ $HTTP_AUTH_REQUEST = YES ]; then
 fi
 
 if [ $HTTP_AUTH_BASIC = YES ]; then
-    USE_MD5=YES
-    USE_SHA1=YES
     have=NGX_CRYPT . auto/have
 
     ngx_module_name=ngx_http_auth_basic_module
@@ -682,7 +680,6 @@ fi
 
 if [ $HTTP_PROXY = YES ]; then
     have=NGX_HTTP_X_FORWARDED_FOR . auto/have
-    #USE_MD5=YES
 
     ngx_module_name=ngx_http_proxy_module
     ngx_module_incs=
@@ -772,8 +769,6 @@ if [ $HTTP_BROWSER = YES ]; then
 fi
 
 if [ $HTTP_SECURE_LINK = YES ]; then
-    USE_MD5=YES
-
     ngx_module_name=ngx_http_secure_link_module
     ngx_module_incs=
     ngx_module_deps=
@@ -971,8 +966,6 @@ if [ $STREAM != NO ]; then
     STREAM_INCS=
 
     ngx_module_type=STREAM
-    ngx_module_libs=
-    ngx_module_link=YES
 
     ngx_module_order=
 
@@ -982,9 +975,13 @@ if [ $STREAM != NO ]; then
                      ngx_stream_upstream_module"
     ngx_module_incs="src/stream"
     ngx_module_deps="src/stream/ngx_stream.h \
+                     src/stream/ngx_stream_variables.h \
+                     src/stream/ngx_stream_script.h \
                      src/stream/ngx_stream_upstream.h \
                      src/stream/ngx_stream_upstream_round_robin.h"
     ngx_module_srcs="src/stream/ngx_stream.c \
+                     src/stream/ngx_stream_variables.c \
+                     src/stream/ngx_stream_script.c \
                      src/stream/ngx_stream_handler.c \
                      src/stream/ngx_stream_core_module.c \
                      src/stream/ngx_stream_proxy_module.c \
@@ -1002,6 +999,8 @@ if [ $STREAM != NO ]; then
         ngx_module_name=ngx_stream_ssl_module
         ngx_module_deps=src/stream/ngx_stream_ssl_module.h
         ngx_module_srcs=src/stream/ngx_stream_ssl_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_SSL
 
         . auto/module
     fi
@@ -1010,6 +1009,8 @@ if [ $STREAM != NO ]; then
         ngx_module_name=ngx_stream_limit_conn_module
         ngx_module_deps=
         ngx_module_srcs=src/stream/ngx_stream_limit_conn_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_LIMIT_CONN
 
         . auto/module
     fi
@@ -1018,6 +1019,58 @@ if [ $STREAM != NO ]; then
         ngx_module_name=ngx_stream_access_module
         ngx_module_deps=
         ngx_module_srcs=src/stream/ngx_stream_access_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_ACCESS
+
+        . auto/module
+    fi
+
+    if [ $STREAM_GEO = YES ]; then
+        ngx_module_name=ngx_stream_geo_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_geo_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_GEO
+
+        . auto/module
+    fi
+
+    if [ $STREAM_GEOIP != NO ]; then
+        ngx_module_name=ngx_stream_geoip_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_geoip_module.c
+        ngx_module_libs=GEOIP
+        ngx_module_link=$STREAM_GEOIP
+
+        . auto/module
+    fi
+
+    if [ $STREAM_MAP = YES ]; then
+        ngx_module_name=ngx_stream_map_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_map_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_MAP
+
+        . auto/module
+    fi
+
+    if [ $STREAM_SPLIT_CLIENTS = YES ]; then
+        ngx_module_name=ngx_stream_split_clients_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_split_clients_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_SPLIT_CLIENTS
+
+        . auto/module
+    fi
+
+    if [ $STREAM_RETURN = YES ]; then
+        ngx_module_name=ngx_stream_return_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_return_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_RETURN
 
         . auto/module
     fi
@@ -1026,6 +1079,8 @@ if [ $STREAM != NO ]; then
         ngx_module_name=ngx_stream_upstream_hash_module
         ngx_module_deps=
         ngx_module_srcs=src/stream/ngx_stream_upstream_hash_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_UPSTREAM_HASH
 
         . auto/module
     fi
@@ -1034,6 +1089,8 @@ if [ $STREAM != NO ]; then
         ngx_module_name=ngx_stream_upstream_least_conn_module
         ngx_module_deps=
         ngx_module_srcs=src/stream/ngx_stream_upstream_least_conn_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_UPSTREAM_LEAST_CONN
 
         . auto/module
     fi
@@ -1044,6 +1101,8 @@ if [ $STREAM != NO ]; then
         ngx_module_name=ngx_stream_upstream_zone_module
         ngx_module_deps=
         ngx_module_srcs=src/stream/ngx_stream_upstream_zone_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_UPSTREAM_ZONE
 
         . auto/module
     fi
diff --git a/auto/options b/auto/options
index ac8beb1..a8fce30 100644
--- a/auto/options
+++ b/auto/options
@@ -117,6 +117,11 @@ STREAM=NO
 STREAM_SSL=NO
 STREAM_LIMIT_CONN=YES
 STREAM_ACCESS=YES
+STREAM_GEO=YES
+STREAM_GEOIP=NO
+STREAM_MAP=YES
+STREAM_SPLIT_CLIENTS=YES
+STREAM_RETURN=YES
 STREAM_UPSTREAM_HASH=YES
 STREAM_UPSTREAM_LEAST_CONN=YES
 STREAM_UPSTREAM_ZONE=YES
@@ -136,16 +141,6 @@ PCRE_JIT=NO
 USE_OPENSSL=NO
 OPENSSL=NONE
 
-USE_MD5=NO
-MD5=NONE
-MD5_OPT=
-MD5_ASM=NO
-
-USE_SHA1=NO
-SHA1=NONE
-SHA1_OPT=
-SHA1_ASM=NO
-
 USE_ZLIB=NO
 ZLIB=NONE
 ZLIB_OPT=
@@ -301,9 +296,17 @@ use the \"--with-mail_ssl_module\" option instead"
         --with-stream)                   STREAM=YES                 ;;
         --with-stream=dynamic)           STREAM=DYNAMIC             ;;
         --with-stream_ssl_module)        STREAM_SSL=YES             ;;
+        --with-stream_geoip_module)      STREAM_GEOIP=YES           ;;
+        --with-stream_geoip_module=dynamic)
+                                         STREAM_GEOIP=DYNAMIC       ;;
         --without-stream_limit_conn_module)
                                          STREAM_LIMIT_CONN=NO       ;;
         --without-stream_access_module)  STREAM_ACCESS=NO           ;;
+        --without-stream_geo_module)     STREAM_GEO=NO              ;;
+        --without-stream_map_module)     STREAM_MAP=NO              ;;
+        --without-stream_split_clients_module)
+                                         STREAM_SPLIT_CLIENTS=NO    ;;
+        --without-stream_return_module)  STREAM_RETURN=NO           ;;
         --without-stream_upstream_hash_module)
                                          STREAM_UPSTREAM_HASH=NO    ;;
         --without-stream_upstream_least_conn_module)
@@ -333,13 +336,31 @@ use the \"--with-mail_ssl_module\" option instead"
         --with-openssl=*)                OPENSSL="$value"           ;;
         --with-openssl-opt=*)            OPENSSL_OPT="$value"       ;;
 
-        --with-md5=*)                    MD5="$value"               ;;
-        --with-md5-opt=*)                MD5_OPT="$value"           ;;
-        --with-md5-asm)                  MD5_ASM=YES                ;;
+        --with-md5=*)
+            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
+$0: warning: the \"--with-md5\" option is deprecated"
+        ;;
+        --with-md5-opt=*)
+            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
+$0: warning: the \"--with-md5-opt\" option is deprecated"
+        ;;
+        --with-md5-asm)
+            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
+$0: warning: the \"--with-md5-asm\" option is deprecated"
+        ;;
 
-        --with-sha1=*)                   SHA1="$value"              ;;
-        --with-sha1-opt=*)               SHA1_OPT="$value"          ;;
-        --with-sha1-asm)                 SHA1_ASM=YES               ;;
+        --with-sha1=*)
+            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
+$0: warning: the \"--with-sha1\" option is deprecated"
+        ;;
+        --with-sha1-opt=*)
+            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
+$0: warning: the \"--with-sha1-opt\" option is deprecated"
+        ;;
+        --with-sha1-asm)
+            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
+$0: warning: the \"--with-sha1-asm\" option is deprecated"
+        ;;
 
         --with-zlib=*)                   ZLIB="$value"              ;;
         --with-zlib-opt=*)               ZLIB_OPT="$value"          ;;
@@ -482,8 +503,15 @@ cat << END
   --with-stream                      enable TCP/UDP proxy module
   --with-stream=dynamic              enable dynamic TCP/UDP proxy module
   --with-stream_ssl_module           enable ngx_stream_ssl_module
+  --with-stream_geoip_module         enable ngx_stream_geoip_module
+  --with-stream_geoip_module=dynamic enable dynamic ngx_stream_geoip_module
   --without-stream_limit_conn_module disable ngx_stream_limit_conn_module
   --without-stream_access_module     disable ngx_stream_access_module
+  --without-stream_geo_module        disable ngx_stream_geo_module
+  --without-stream_map_module        disable ngx_stream_map_module
+  --without-stream_split_clients_module
+                                     disable ngx_stream_split_clients_module
+  --without-stream_return_module     disable ngx_stream_return_module
   --without-stream_upstream_hash_module
                                      disable ngx_stream_upstream_hash_module
   --without-stream_upstream_least_conn_module
@@ -511,14 +539,6 @@ cat << END
   --with-pcre-opt=OPTIONS            set additional build options for PCRE
   --with-pcre-jit                    build PCRE with JIT compilation support
 
-  --with-md5=DIR                     set path to md5 library sources
-  --with-md5-opt=OPTIONS             set additional build options for md5
-  --with-md5-asm                     use md5 assembler sources
-
-  --with-sha1=DIR                    set path to sha1 library sources
-  --with-sha1-opt=OPTIONS            set additional build options for sha1
-  --with-sha1-asm                    use sha1 assembler sources
-
   --with-zlib=DIR                    set path to zlib library sources
   --with-zlib-opt=OPTIONS            set additional build options for zlib
   --with-zlib-asm=CPU                use zlib assembler sources optimized
diff --git a/auto/os/darwin b/auto/os/darwin
index 9b31b1f..b4b3ad3 100644
--- a/auto/os/darwin
+++ b/auto/os/darwin
@@ -113,6 +113,6 @@ ngx_feature_run=no
 ngx_feature_incs="#include <libkern/OSAtomic.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="int32_t  lock, n;
-                  n = OSAtomicCompareAndSwap32Barrier(0, 1, &lock)"
+ngx_feature_test="int32_t  lock = 0;
+                  if (!OSAtomicCompareAndSwap32Barrier(0, 1, &lock)) return 1"
 . auto/feature
diff --git a/auto/os/linux b/auto/os/linux
index c932267..fae8842 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -44,6 +44,7 @@ ngx_feature_test="int efd = 0;
                   struct epoll_event ee;
                   ee.events = EPOLLIN|EPOLLOUT|EPOLLET;
                   ee.data.ptr = NULL;
+                  (void) ee;
                   efd = epoll_create(100);
                   if (efd == -1) return 1;"
 . auto/feature
@@ -69,6 +70,22 @@ if [ $ngx_found = yes ]; then
                       ee.data.ptr = NULL;
                       epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ee)"
     . auto/feature
+
+
+    # EPOLLEXCLUSIVE appeared in Linux 4.5, glibc 2.24
+
+    ngx_feature="EPOLLEXCLUSIVE"
+    ngx_feature_name="NGX_HAVE_EPOLLEXCLUSIVE"
+    ngx_feature_run=no
+    ngx_feature_incs="#include <sys/epoll.h>"
+    ngx_feature_path=
+    ngx_feature_libs=
+    ngx_feature_test="int efd = 0, fd = 0;
+                      struct epoll_event ee;
+                      ee.events = EPOLLIN|EPOLLEXCLUSIVE;
+                      ee.data.ptr = NULL;
+                      epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ee)"
+    . auto/feature
 fi
 
 
diff --git a/auto/os/solaris b/auto/os/solaris
index d39df0b..1dcfe84 100644
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -52,7 +52,7 @@ ngx_feature_run=no
 ngx_feature_incs="#include <port.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="int n = port_create()"
+ngx_feature_test="(void) port_create()"
 . auto/feature
 
 if [ $ngx_found = yes ]; then
diff --git a/auto/sources b/auto/sources
index 27849e6..216e900 100644
--- a/auto/sources
+++ b/auto/sources
@@ -61,6 +61,7 @@ CORE_SRCS="src/core/nginx.c \
            src/core/ngx_crc32.c \
            src/core/ngx_murmurhash.c \
            src/core/ngx_md5.c \
+           src/core/ngx_sha1.c \
            src/core/ngx_rbtree.c \
            src/core/ngx_radix_tree.c \
            src/core/ngx_slab.c \
diff --git a/auto/summary b/auto/summary
index dc8fe4f..9aa776e 100644
--- a/auto/summary
+++ b/auto/summary
@@ -28,20 +28,6 @@ case $OPENSSL in
     *)     echo "  + using OpenSSL library: $OPENSSL" ;;
 esac
 
-case $MD5 in
-    YES)   echo "  + md5: using $MD5_LIB library" ;;
-    NONE)  echo "  + md5 library is not used" ;;
-    NO)    echo "  + using builtin md5 code" ;;
-    *)     echo "  + using md5 library: $MD5" ;;
-esac
-
-case $SHA1 in
-    YES)   echo "  + sha1: using $SHA1_LIB library" ;;
-    NONE)  echo "  + sha1 library is not used" ;;
-    NO)    echo "  + sha1 library is not found" ;;
-    *)     echo "  + using sha1 library: $SHA1" ;;
-esac
-
 case $ZLIB in
     YES)   echo "  + using system zlib library" ;;
     NONE)  echo "  + zlib library is not used" ;;
diff --git a/auto/types/sizeof b/auto/types/sizeof
index b5b71bb..480d8cf 100644
--- a/auto/types/sizeof
+++ b/auto/types/sizeof
@@ -25,7 +25,7 @@ $NGX_INCLUDE_UNISTD_H
 $NGX_INCLUDE_INTTYPES_H
 $NGX_INCLUDE_AUTO_CONFIG_H
 
-int main() {
+int main(void) {
     printf("%d", (int) sizeof($ngx_type));
     return 0;
 }
diff --git a/auto/types/typedef b/auto/types/typedef
index b55237e..d54c289 100644
--- a/auto/types/typedef
+++ b/auto/types/typedef
@@ -27,7 +27,7 @@ do
 #include <netinet/in.h>
 $NGX_INCLUDE_INTTYPES_H
 
-int main() {
+int main(void) {
     $ngx_try i = 0;
     return (int) i;
 }
diff --git a/auto/types/uintptr_t b/auto/types/uintptr_t
index 2b7212e..a33d6d0 100644
--- a/auto/types/uintptr_t
+++ b/auto/types/uintptr_t
@@ -17,9 +17,9 @@ found=no
 cat << END > $NGX_AUTOTEST.c
 
 #include <sys/types.h>
-$NGX_INTTYPES_H
+$NGX_INCLUDE_INTTYPES_H
 
-int main() {
+int main(void) {
     uintptr_t i = 0;
     return (int) i;
 }
diff --git a/auto/unix b/auto/unix
index 8c0e813..dbc0f0e 100755
--- a/auto/unix
+++ b/auto/unix
@@ -75,7 +75,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
     ngx_feature_incs="#include <sys/event.h>"
     ngx_feature_path=
     ngx_feature_libs=
-    ngx_feature_test="int kq; kq = kqueue()"
+    ngx_feature_test="(void) kqueue()"
     . auto/feature
 
     if [ $ngx_found = yes ]; then
@@ -92,7 +92,8 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
         ngx_feature_path=
         ngx_feature_libs=
         ngx_feature_test="struct kevent  kev;
-                          kev.fflags = NOTE_LOWAT;"
+                          kev.fflags = NOTE_LOWAT;
+                          (void) kev"
         . auto/feature
 
 
@@ -260,11 +261,11 @@ ngx_feature_run=no
 ngx_feature_incs="#include <dlfcn.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="dlopen(NULL, RTLD_NOW | RTLD_GLOBAL); dlsym(NULL, NULL)"
+ngx_feature_test="dlopen(NULL, RTLD_NOW | RTLD_GLOBAL); dlsym(NULL, \"\")"
 . auto/feature
 
 
-if [ $ngx_found != yes ]; then
+if [ $ngx_found = no ]; then
 
     ngx_feature="dlopen() in libdl"
     ngx_feature_libs="-ldl"
@@ -287,7 +288,7 @@ ngx_feature_test="sched_yield()"
 . auto/feature
 
 
-if [ $ngx_found != yes ]; then
+if [ $ngx_found = no ]; then
 
     ngx_feature="sched_yield() in librt"
     ngx_feature_libs="-lrt"
@@ -329,6 +330,57 @@ ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0)"
 . auto/feature
 
 
+# NetBSD bind to any address for transparent proxying
+
+ngx_feature="SO_BINDANY"
+ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_BINDANY, NULL, 0)"
+. auto/feature
+
+
+# Linux IP_BIND_ADDRESS_NO_PORT
+
+ngx_feature="IP_BIND_ADDRESS_NO_PORT"
+ngx_feature_name="NGX_HAVE_IP_BIND_ADDRESS_NO_PORT"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, NULL, 0)"
+. auto/feature
+
+
+# Linux transparent proxying
+
+ngx_feature="IP_TRANSPARENT"
+ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_TRANSPARENT, NULL, 0)"
+. auto/feature
+
+
+# FreeBSD bind to any address for transparent proxying
+
+ngx_feature="IP_BINDANY"
+ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BINDANY, NULL, 0)"
+. auto/feature
+
+
 # BSD way to get IPv4 datagram destination address
 
 ngx_feature="IP_RECVDSTADDR"
@@ -441,9 +493,9 @@ if [ $NGX_FILE_AIO = YES ]; then
     ngx_feature_incs="#include <aio.h>"
     ngx_feature_path=
     ngx_feature_libs=
-    ngx_feature_test="int  n; struct aiocb  iocb;
+    ngx_feature_test="struct aiocb  iocb;
                       iocb.aio_sigevent.sigev_notify = SIGEV_KEVENT;
-                      n = aio_read(&iocb)"
+                      (void) aio_read(&iocb)"
     . auto/feature
 
     if [ $ngx_found = yes ]; then
@@ -463,6 +515,7 @@ if [ $NGX_FILE_AIO = YES ]; then
                           iocb.aio_lio_opcode = IOCB_CMD_PREAD;
                           iocb.aio_flags = IOCB_FLAG_RESFD;
                           iocb.aio_resfd = -1;
+                          (void) iocb;
                           (void) eventfd(0, 0)"
         . auto/feature
 
@@ -478,11 +531,12 @@ if [ $NGX_FILE_AIO = YES ]; then
         ngx_feature="Linux AIO support (SYS_eventfd)"
         ngx_feature_incs="#include <linux/aio_abi.h>
                           #include <sys/syscall.h>"
-        ngx_feature_test="int  n = SYS_eventfd;
-                          struct iocb  iocb;
+        ngx_feature_test="struct iocb  iocb;
                           iocb.aio_lio_opcode = IOCB_CMD_PREAD;
                           iocb.aio_flags = IOCB_FLAG_RESFD;
-                          iocb.aio_resfd = -1;"
+                          iocb.aio_resfd = -1;
+                          (void) iocb;
+                          (void) SYS_eventfd"
         . auto/feature
 
         if [ $ngx_found = yes ]; then
@@ -520,7 +574,7 @@ else
 
         ngx_feature="eventfd() (SYS_eventfd)"
         ngx_feature_incs="#include <sys/syscall.h>"
-        ngx_feature_test="int n = SYS_eventfd"
+        ngx_feature_test="(void) SYS_eventfd"
         . auto/feature
     fi
 fi
@@ -593,7 +647,8 @@ if [ $NGX_IPV6 = YES ]; then
     ngx_feature_path=
     ngx_feature_libs=
     ngx_feature_test="struct sockaddr_in6  sin6;
-                      sin6.sin6_family = AF_INET6;"
+                      sin6.sin6_family = AF_INET6;
+                      (void) sin6"
     . auto/feature
 fi
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index e2b8005..e303e66 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1010001
-#define NGINX_VERSION      "1.10.1"
+#define nginx_version      1011003
+#define NGINX_VERSION      "1.11.3"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 9ccee36..213611f 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -45,7 +45,6 @@
 #define NGX_CONF_ANY         0x00000400
 #define NGX_CONF_1MORE       0x00000800
 #define NGX_CONF_2MORE       0x00001000
-#define NGX_CONF_MULTI       0x00000000  /* compatibility */
 
 #define NGX_DIRECT_CONF      0x00010000
 
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 5a53bac..16ba630 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -17,7 +17,8 @@ static void ngx_drain_connections(void);
 
 
 ngx_listening_t *
-ngx_create_listening(ngx_conf_t *cf, void *sockaddr, socklen_t socklen)
+ngx_create_listening(ngx_conf_t *cf, struct sockaddr *sockaddr,
+    socklen_t socklen)
 {
     size_t            len;
     ngx_listening_t  *ls;
@@ -150,12 +151,12 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
     ls = cycle->listening.elts;
     for (i = 0; i < cycle->listening.nelts; i++) {
 
-        ls[i].sockaddr = ngx_palloc(cycle->pool, NGX_SOCKADDRLEN);
+        ls[i].sockaddr = ngx_palloc(cycle->pool, sizeof(ngx_sockaddr_t));
         if (ls[i].sockaddr == NULL) {
             return NGX_ERROR;
         }
 
-        ls[i].socklen = NGX_SOCKADDRLEN;
+        ls[i].socklen = sizeof(ngx_sockaddr_t);
         if (getsockname(ls[i].fd, ls[i].sockaddr, &ls[i].socklen) == -1) {
             ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno,
                           "getsockname() of the inherited "
@@ -1277,7 +1278,7 @@ ngx_connection_local_sockaddr(ngx_connection_t *c, ngx_str_t *s,
 {
     socklen_t             len;
     ngx_uint_t            addr;
-    u_char                sa[NGX_SOCKADDRLEN];
+    ngx_sockaddr_t        sa;
     struct sockaddr_in   *sin;
 #if (NGX_HAVE_INET6)
     ngx_uint_t            i;
@@ -1315,9 +1316,9 @@ ngx_connection_local_sockaddr(ngx_connection_t *c, ngx_str_t *s,
 
     if (addr == 0) {
 
-        len = NGX_SOCKADDRLEN;
+        len = sizeof(ngx_sockaddr_t);
 
-        if (getsockname(c->fd, (struct sockaddr *) &sa, &len) == -1) {
+        if (getsockname(c->fd, &sa.sockaddr, &len) == -1) {
             ngx_connection_error(c, ngx_socket_errno, "getsockname() failed");
             return NGX_ERROR;
         }
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index b0d162a..e484c81 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -149,6 +149,7 @@ struct ngx_connection_s {
     ngx_str_t           addr_text;
 
     ngx_str_t           proxy_protocol_addr;
+    in_port_t           proxy_protocol_port;
 
 #if (NGX_SSL)
     ngx_ssl_connection_t  *ssl;
@@ -169,7 +170,6 @@ struct ngx_connection_s {
 
     unsigned            log_error:3;     /* ngx_connection_log_error_e */
 
-    unsigned            unexpected_eof:1;
     unsigned            timedout:1;
     unsigned            error:1;
     unsigned            destroyed:1;
@@ -186,10 +186,6 @@ struct ngx_connection_s {
 
     unsigned            need_last_buf:1;
 
-#if (NGX_HAVE_IOCP)
-    unsigned            accept_context_updated:1;
-#endif
-
 #if (NGX_HAVE_AIO_SENDFILE)
     unsigned            busy_count:2;
 #endif
@@ -211,7 +207,7 @@ struct ngx_connection_s {
     }
 
 
-ngx_listening_t *ngx_create_listening(ngx_conf_t *cf, void *sockaddr,
+ngx_listening_t *ngx_create_listening(ngx_conf_t *cf, struct sockaddr *sockaddr,
     socklen_t socklen);
 ngx_int_t ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls);
 ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle);
diff --git a/src/core/ngx_crypt.c b/src/core/ngx_crypt.c
index 9db74f4..868dc5d 100644
--- a/src/core/ngx_crypt.c
+++ b/src/core/ngx_crypt.c
@@ -8,9 +8,7 @@
 #include <ngx_core.h>
 #include <ngx_crypt.h>
 #include <ngx_md5.h>
-#if (NGX_HAVE_SHA1)
 #include <ngx_sha1.h>
-#endif
 
 
 #if (NGX_CRYPT)
@@ -19,16 +17,11 @@ static ngx_int_t ngx_crypt_apr1(ngx_pool_t *pool, u_char *key, u_char *salt,
     u_char **encrypted);
 static ngx_int_t ngx_crypt_plain(ngx_pool_t *pool, u_char *key, u_char *salt,
     u_char **encrypted);
-
-#if (NGX_HAVE_SHA1)
-
 static ngx_int_t ngx_crypt_ssha(ngx_pool_t *pool, u_char *key, u_char *salt,
     u_char **encrypted);
 static ngx_int_t ngx_crypt_sha(ngx_pool_t *pool, u_char *key, u_char *salt,
     u_char **encrypted);
 
-#endif
-
 
 static u_char *ngx_crypt_to64(u_char *p, uint32_t v, size_t n);
 
@@ -42,13 +35,11 @@ ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
     } else if (ngx_strncmp(salt, "{PLAIN}", sizeof("{PLAIN}") - 1) == 0) {
         return ngx_crypt_plain(pool, key, salt, encrypted);
 
-#if (NGX_HAVE_SHA1)
     } else if (ngx_strncmp(salt, "{SSHA}", sizeof("{SSHA}") - 1) == 0) {
         return ngx_crypt_ssha(pool, key, salt, encrypted);
 
     } else if (ngx_strncmp(salt, "{SHA}", sizeof("{SHA}") - 1) == 0) {
         return ngx_crypt_sha(pool, key, salt, encrypted);
-#endif
     }
 
     /* fallback to libc crypt() */
@@ -193,8 +184,6 @@ ngx_crypt_plain(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
 }
 
 
-#if (NGX_HAVE_SHA1)
-
 static ngx_int_t
 ngx_crypt_ssha(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
 {
@@ -278,6 +267,4 @@ ngx_crypt_sha(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
     return NGX_OK;
 }
 
-#endif /* NGX_HAVE_SHA1 */
-
 #endif /* NGX_CRYPT */
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index fc2dfd3..c1137cc 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -225,7 +225,7 @@ ngx_create_hashed_filename(ngx_path_t *path, u_char *file, size_t len)
 
     file[path->name.len + path->len]  = '/';
 
-    for (n = 0; n < 3; n++) {
+    for (n = 0; n < NGX_MAX_PATH_LEVEL; n++) {
         level = path->level[n];
 
         if (level == 0) {
@@ -249,7 +249,7 @@ ngx_create_path(ngx_file_t *file, ngx_path_t *path)
 
     pos = path->name.len;
 
-    for (i = 0; i < 3; i++) {
+    for (i = 0; i < NGX_MAX_PATH_LEVEL; i++) {
         if (path->level[i] == 0) {
             break;
         }
@@ -399,6 +399,8 @@ char *
 ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev,
     ngx_path_init_t *init)
 {
+    ngx_uint_t  i;
+
     if (*path) {
         return NGX_CONF_OK;
     }
@@ -419,13 +421,10 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev,
         return NGX_CONF_ERROR;
     }
 
-    (*path)->level[0] = init->level[0];
-    (*path)->level[1] = init->level[1];
-    (*path)->level[2] = init->level[2];
-
-    (*path)->len = init->level[0] + (init->level[0] ? 1 : 0)
-                   + init->level[1] + (init->level[1] ? 1 : 0)
-                   + init->level[2] + (init->level[2] ? 1 : 0);
+    for (i = 0; i < NGX_MAX_PATH_LEVEL; i++) {
+        (*path)->level[i] = init->level[i];
+        (*path)->len += init->level[i] + (init->level[i] ? 1 : 0);
+    }
 
     if (ngx_add_path(cf, path) != NGX_OK) {
         return NGX_CONF_ERROR;
@@ -518,7 +517,7 @@ ngx_add_path(ngx_conf_t *cf, ngx_path_t **slot)
                 return NGX_ERROR;
             }
 
-            for (n = 0; n < 3; n++) {
+            for (n = 0; n < NGX_MAX_PATH_LEVEL; n++) {
                 if (p[i]->level[n] != path->level[n]) {
                     if (path->conf_file == NULL) {
                         if (p[i]->conf_file == NULL) {
diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h
index 5f8228b..a723c3d 100644
--- a/src/core/ngx_file.h
+++ b/src/core/ngx_file.h
@@ -49,7 +49,7 @@ typedef void (*ngx_path_loader_pt) (void *data);
 typedef struct {
     ngx_str_t                  name;
     size_t                     len;
-    size_t                     level[3];
+    size_t                     level[NGX_MAX_PATH_LEVEL];
 
     ngx_path_manager_pt        manager;
     ngx_path_loader_pt         loader;
@@ -62,7 +62,7 @@ typedef struct {
 
 typedef struct {
     ngx_str_t                  name;
-    size_t                     level[3];
+    size_t                     level[NGX_MAX_PATH_LEVEL];
 } ngx_path_init_t;
 
 
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 33b303d..c4aaf3a 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -525,6 +525,68 @@ ngx_parse_addr(ngx_pool_t *pool, ngx_addr_t *addr, u_char *text, size_t len)
 }
 
 
+ngx_int_t
+ngx_parse_addr_port(ngx_pool_t *pool, ngx_addr_t *addr, u_char *text,
+    size_t len)
+{
+    u_char     *p, *last;
+    size_t      plen;
+    ngx_int_t   rc, port;
+
+    rc = ngx_parse_addr(pool, addr, text, len);
+
+    if (rc != NGX_DECLINED) {
+        return rc;
+    }
+
+    last = text + len;
+
+#if (NGX_HAVE_INET6)
+    if (len && text[0] == '[') {
+
+        p = ngx_strlchr(text, last, ']');
+
+        if (p == NULL || p == last - 1 || *++p != ':') {
+            return NGX_DECLINED;
+        }
+
+        text++;
+        len -= 2;
+
+    } else
+#endif
+
+    {
+        p = ngx_strlchr(text, last, ':');
+
+        if (p == NULL) {
+            return NGX_DECLINED;
+        }
+    }
+
+    p++;
+    plen = last - p;
+
+    port = ngx_atoi(p, plen);
+
+    if (port < 1 || port > 65535) {
+        return NGX_DECLINED;
+    }
+
+    len -= plen + 1;
+
+    rc = ngx_parse_addr(pool, addr, text, len);
+
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_inet_set_port(addr->sockaddr, (in_port_t) port);
+
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u)
 {
@@ -763,7 +825,7 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
             return NGX_ERROR;
         }
 
-        ngx_memcpy(sin, u->sockaddr, sizeof(struct sockaddr_in));
+        ngx_memcpy(sin, &u->sockaddr, sizeof(struct sockaddr_in));
 
         u->addrs[0].sockaddr = (struct sockaddr *) sin;
         u->addrs[0].socklen = sizeof(struct sockaddr_in);
@@ -790,7 +852,7 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
 
     u->family = u->addrs[0].sockaddr->sa_family;
     u->socklen = u->addrs[0].socklen;
-    ngx_memcpy(u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen);
+    ngx_memcpy(&u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen);
 
     switch (u->family) {
 
@@ -843,47 +905,49 @@ ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u)
         return NGX_ERROR;
     }
 
-    if (last - p) {
+    port = p + 1;
 
-        port = p + 1;
+    uri = ngx_strlchr(port, last, '/');
 
-        uri = ngx_strlchr(port, last, '/');
-
-        if (uri) {
-            if (u->listen || !u->uri_part) {
-                u->err = "invalid host";
-                return NGX_ERROR;
-            }
-
-            u->uri.len = last - uri;
-            u->uri.data = uri;
-
-            last = uri;
+    if (uri) {
+        if (u->listen || !u->uri_part) {
+            u->err = "invalid host";
+            return NGX_ERROR;
         }
 
-        if (*port == ':') {
-            port++;
+        u->uri.len = last - uri;
+        u->uri.data = uri;
 
-            len = last - port;
+        last = uri;
+    }
 
-            n = ngx_atoi(port, len);
-
-            if (n < 1 || n > 65535) {
-                u->err = "invalid port";
-                return NGX_ERROR;
-            }
-
-            u->port = (in_port_t) n;
-            sin6->sin6_port = htons((in_port_t) n);
-
-            u->port_text.len = len;
-            u->port_text.data = port;
-
-        } else {
-            u->no_port = 1;
-            u->port = u->default_port;
-            sin6->sin6_port = htons(u->default_port);
+    if (port < last) {
+        if (*port != ':') {
+            u->err = "invalid host";
+            return NGX_ERROR;
         }
+
+        port++;
+
+        len = last - port;
+
+        n = ngx_atoi(port, len);
+
+        if (n < 1 || n > 65535) {
+            u->err = "invalid port";
+            return NGX_ERROR;
+        }
+
+        u->port = (in_port_t) n;
+        sin6->sin6_port = htons((in_port_t) n);
+
+        u->port_text.len = len;
+        u->port_text.data = port;
+
+    } else {
+        u->no_port = 1;
+        u->port = u->default_port;
+        sin6->sin6_port = htons(u->default_port);
     }
 
     len = p - host;
@@ -918,7 +982,7 @@ ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u)
         return NGX_ERROR;
     }
 
-    ngx_memcpy(sin6, u->sockaddr, sizeof(struct sockaddr_in6));
+    ngx_memcpy(sin6, &u->sockaddr, sizeof(struct sockaddr_in6));
 
     u->addrs[0].sockaddr = (struct sockaddr *) sin6;
     u->addrs[0].socklen = sizeof(struct sockaddr_in6);
@@ -1275,3 +1339,61 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
 
     return NGX_OK;
 }
+
+
+in_port_t
+ngx_inet_get_port(struct sockaddr *sa)
+{
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
+
+    switch (sa->sa_family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) sa;
+        return ntohs(sin6->sin6_port);
+#endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+        return 0;
+#endif
+
+    default: /* AF_INET */
+        sin = (struct sockaddr_in *) sa;
+        return ntohs(sin->sin_port);
+    }
+}
+
+
+void
+ngx_inet_set_port(struct sockaddr *sa, in_port_t port)
+{
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
+
+    switch (sa->sa_family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) sa;
+        sin6->sin6_port = htons(port);
+        break;
+#endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+        break;
+#endif
+
+    default: /* AF_INET */
+        sin = (struct sockaddr_in *) sa;
+        sin->sin_port = htons(port);
+        break;
+    }
+}
diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h
index 0555750..97dc354 100644
--- a/src/core/ngx_inet.h
+++ b/src/core/ngx_inet.h
@@ -13,14 +13,6 @@
 #include <ngx_core.h>
 
 
-/*
- * TODO: autoconfigure NGX_SOCKADDRLEN and NGX_SOCKADDR_STRLEN as
- *       sizeof(struct sockaddr_storage)
- *       sizeof(struct sockaddr_un)
- *       sizeof(struct sockaddr_in6)
- *       sizeof(struct sockaddr_in)
- */
-
 #define NGX_INET_ADDRSTRLEN   (sizeof("255.255.255.255") - 1)
 #define NGX_INET6_ADDRSTRLEN                                                 \
     (sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") - 1)
@@ -29,15 +21,26 @@
 
 #if (NGX_HAVE_UNIX_DOMAIN)
 #define NGX_SOCKADDR_STRLEN   (sizeof("unix:") - 1 + NGX_UNIX_ADDRSTRLEN)
-#else
+#elif (NGX_HAVE_INET6)
 #define NGX_SOCKADDR_STRLEN   (NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1)
+#else
+#define NGX_SOCKADDR_STRLEN   (NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1)
 #endif
 
-#if (NGX_HAVE_UNIX_DOMAIN)
-#define NGX_SOCKADDRLEN       sizeof(struct sockaddr_un)
-#else
-#define NGX_SOCKADDRLEN       512
+/* compatibility */
+#define NGX_SOCKADDRLEN       sizeof(ngx_sockaddr_t)
+
+
+typedef union {
+    struct sockaddr           sockaddr;
+    struct sockaddr_in        sockaddr_in;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6       sockaddr_in6;
 #endif
+#if (NGX_HAVE_UNIX_DOMAIN)
+    struct sockaddr_un        sockaddr_un;
+#endif
+} ngx_sockaddr_t;
 
 
 typedef struct {
@@ -87,13 +90,12 @@ typedef struct {
     unsigned                  listen:1;
     unsigned                  uri_part:1;
     unsigned                  no_resolve:1;
-    unsigned                  one_addr:1;  /* compatibility */
 
     unsigned                  no_port:1;
     unsigned                  wildcard:1;
 
     socklen_t                 socklen;
-    u_char                    sockaddr[NGX_SOCKADDRLEN];
+    ngx_sockaddr_t            sockaddr;
 
     ngx_addr_t               *addrs;
     ngx_uint_t                naddrs;
@@ -113,10 +115,14 @@ size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len);
 ngx_int_t ngx_ptocidr(ngx_str_t *text, ngx_cidr_t *cidr);
 ngx_int_t ngx_parse_addr(ngx_pool_t *pool, ngx_addr_t *addr, u_char *text,
     size_t len);
+ngx_int_t ngx_parse_addr_port(ngx_pool_t *pool, ngx_addr_t *addr,
+    u_char *text, size_t len);
 ngx_int_t ngx_parse_url(ngx_pool_t *pool, ngx_url_t *u);
 ngx_int_t ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u);
 ngx_int_t ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
     struct sockaddr *sa2, socklen_t slen2, ngx_uint_t cmp_port);
+in_port_t ngx_inet_get_port(struct sockaddr *sa);
+void ngx_inet_set_port(struct sockaddr *sa, in_port_t port);
 
 
 #endif /* _NGX_INET_H_INCLUDED_ */
diff --git a/src/core/ngx_md5.c b/src/core/ngx_md5.c
index 440c75b..c25d002 100644
--- a/src/core/ngx_md5.c
+++ b/src/core/ngx_md5.c
@@ -3,8 +3,6 @@
  * An internal implementation, based on Alexander Peslyak's
  * public domain implementation:
  * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
- * It is not expected to be optimal and is used only
- * if no MD5 implementation was found in system.
  */
 
 
@@ -13,8 +11,6 @@
 #include <ngx_md5.h>
 
 
-#if !(NGX_HAVE_MD5)
-
 static const u_char *ngx_md5_body(ngx_md5_t *ctx, const u_char *data,
     size_t size);
 
@@ -285,5 +281,3 @@ ngx_md5_body(ngx_md5_t *ctx, const u_char *data, size_t size)
 
     return p;
 }
-
-#endif
diff --git a/src/core/ngx_md5.h b/src/core/ngx_md5.h
index 18d09d6..713b614 100644
--- a/src/core/ngx_md5.h
+++ b/src/core/ngx_md5.h
@@ -13,36 +13,6 @@
 #include <ngx_core.h>
 
 
-#if (NGX_HAVE_MD5)
-
-#if (NGX_HAVE_OPENSSL_MD5_H)
-#include <openssl/md5.h>
-#else
-#include <md5.h>
-#endif
-
-
-typedef MD5_CTX  ngx_md5_t;
-
-
-#if (NGX_OPENSSL_MD5)
-
-#define ngx_md5_init    MD5_Init
-#define ngx_md5_update  MD5_Update
-#define ngx_md5_final   MD5_Final
-
-#else
-
-#define ngx_md5_init    MD5Init
-#define ngx_md5_update  MD5Update
-#define ngx_md5_final   MD5Final
-
-#endif
-
-
-#else /* !NGX_HAVE_MD5 */
-
-
 typedef struct {
     uint64_t  bytes;
     uint32_t  a, b, c, d;
@@ -55,6 +25,4 @@ void ngx_md5_update(ngx_md5_t *ctx, const void *data, size_t size);
 void ngx_md5_final(u_char result[16], ngx_md5_t *ctx);
 
 
-#endif
-
 #endif /* _NGX_MD5_H_INCLUDED_ */
diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h
index e911cb4..a1a0d6c 100644
--- a/src/core/ngx_module.h
+++ b/src/core/ngx_module.h
@@ -119,17 +119,8 @@
 #define NGX_MODULE_SIGNATURE_16  "0"
 #endif
 
-#if (NGX_HAVE_MD5)
-#define NGX_MODULE_SIGNATURE_17  "1"
-#else
 #define NGX_MODULE_SIGNATURE_17  "0"
-#endif
-
-#if (NGX_HAVE_SHA1)
-#define NGX_MODULE_SIGNATURE_18  "1"
-#else
 #define NGX_MODULE_SIGNATURE_18  "0"
-#endif
 
 #if (NGX_HAVE_OPENAT)
 #define NGX_MODULE_SIGNATURE_19  "1"
diff --git a/src/core/ngx_proxy_protocol.c b/src/core/ngx_proxy_protocol.c
index f347e7f..523ec35 100644
--- a/src/core/ngx_proxy_protocol.c
+++ b/src/core/ngx_proxy_protocol.c
@@ -12,8 +12,9 @@
 u_char *
 ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last)
 {
-    size_t  len;
-    u_char  ch, *p, *addr;
+    size_t     len;
+    u_char     ch, *p, *addr, *port;
+    ngx_int_t  n;
 
     p = buf;
     len = last - buf;
@@ -71,8 +72,40 @@ ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last)
     ngx_memcpy(c->proxy_protocol_addr.data, addr, len);
     c->proxy_protocol_addr.len = len;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
-                   "PROXY protocol address: \"%V\"", &c->proxy_protocol_addr);
+    for ( ;; ) {
+        if (p == last) {
+            goto invalid;
+        }
+
+        if (*p++ == ' ') {
+            break;
+        }
+    }
+
+    port = p;
+
+    for ( ;; ) {
+        if (p == last) {
+            goto invalid;
+        }
+
+        if (*p++ == ' ') {
+            break;
+        }
+    }
+
+    len = p - port - 1;
+
+    n = ngx_atoi(port, len);
+
+    if (n < 0 || n > 65535) {
+        goto invalid;
+    }
+
+    c->proxy_protocol_port = (in_port_t) n;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0,
+                   "PROXY protocol address: %V %i", &c->proxy_protocol_addr, n);
 
 skip:
 
@@ -108,19 +141,11 @@ ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last)
 
     case AF_INET:
         buf = ngx_cpymem(buf, "PROXY TCP4 ", sizeof("PROXY TCP4 ") - 1);
-
-        port = ntohs(((struct sockaddr_in *) c->sockaddr)->sin_port);
-        lport = ntohs(((struct sockaddr_in *) c->local_sockaddr)->sin_port);
-
         break;
 
 #if (NGX_HAVE_INET6)
     case AF_INET6:
         buf = ngx_cpymem(buf, "PROXY TCP6 ", sizeof("PROXY TCP6 ") - 1);
-
-        port = ntohs(((struct sockaddr_in6 *) c->sockaddr)->sin6_port);
-        lport = ntohs(((struct sockaddr_in6 *) c->local_sockaddr)->sin6_port);
-
         break;
 #endif
 
@@ -136,5 +161,8 @@ ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last)
     buf += ngx_sock_ntop(c->local_sockaddr, c->local_socklen, buf, last - buf,
                          0);
 
+    port = ngx_inet_get_port(c->sockaddr);
+    lport = ngx_inet_get_port(c->local_sockaddr);
+
     return ngx_slprintf(buf, last, " %ui %ui" CRLF, port, lport);
 }
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index e00fe22..53dae6b 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -2992,16 +2992,12 @@ failed:
 static void
 ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
 {
-    ngx_uint_t                 i;
-    u_char                   (*sockaddr)[NGX_SOCKADDRLEN];
-    ngx_addr_t                *addrs;
-    ngx_resolver_t            *r;
-    struct sockaddr_in        *sin;
-    ngx_resolver_ctx_t        *ctx;
-    ngx_resolver_srv_name_t   *srv;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6       *sin6;
-#endif
+    ngx_uint_t                i;
+    ngx_addr_t               *addrs;
+    ngx_resolver_t           *r;
+    ngx_sockaddr_t           *sockaddr;
+    ngx_resolver_ctx_t       *ctx;
+    ngx_resolver_srv_name_t  *srv;
 
     r = cctx->resolver;
     ctx = cctx->data;
@@ -3026,7 +3022,7 @@ ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
             return;
         }
 
-        sockaddr = ngx_resolver_alloc(r, cctx->naddrs * NGX_SOCKADDRLEN);
+        sockaddr = ngx_resolver_alloc(r, cctx->naddrs * sizeof(ngx_sockaddr_t));
         if (sockaddr == NULL) {
             ngx_resolver_free(r, addrs);
             ngx_resolve_name_done(cctx);
@@ -3039,23 +3035,13 @@ ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
         }
 
         for (i = 0; i < cctx->naddrs; i++) {
-            addrs[i].sockaddr = (struct sockaddr *) sockaddr[i];
+            addrs[i].sockaddr = &sockaddr[i].sockaddr;
             addrs[i].socklen = cctx->addrs[i].socklen;
 
-            ngx_memcpy(sockaddr[i], cctx->addrs[i].sockaddr,
+            ngx_memcpy(&sockaddr[i], cctx->addrs[i].sockaddr,
                        addrs[i].socklen);
 
-            switch (addrs[i].sockaddr->sa_family) {
-#if (NGX_HAVE_INET6)
-            case AF_INET6:
-                sin6 = (struct sockaddr_in6 *) addrs[i].sockaddr;
-                sin6->sin6_port = htons(srv->port);
-                break;
-#endif
-            default: /* AF_INET */
-                sin = (struct sockaddr_in *) addrs[i].sockaddr;
-                sin->sin_port = htons(srv->port);
-            }
+            ngx_inet_set_port(addrs[i].sockaddr, srv->port);
         }
 
         srv->addrs = addrs;
@@ -4161,14 +4147,14 @@ static ngx_resolver_addr_t *
 ngx_resolver_export(ngx_resolver_t *r, ngx_resolver_node_t *rn,
     ngx_uint_t rotate)
 {
-    ngx_uint_t             d, i, j, n;
-    u_char               (*sockaddr)[NGX_SOCKADDRLEN];
-    in_addr_t             *addr;
-    struct sockaddr_in    *sin;
-    ngx_resolver_addr_t   *dst;
+    ngx_uint_t            d, i, j, n;
+    in_addr_t            *addr;
+    ngx_sockaddr_t       *sockaddr;
+    struct sockaddr_in   *sin;
+    ngx_resolver_addr_t  *dst;
 #if (NGX_HAVE_INET6)
-    struct in6_addr       *addr6;
-    struct sockaddr_in6   *sin6;
+    struct in6_addr      *addr6;
+    struct sockaddr_in6  *sin6;
 #endif
 
     n = rn->naddrs;
@@ -4181,7 +4167,7 @@ ngx_resolver_export(ngx_resolver_t *r, ngx_resolver_node_t *rn,
         return NULL;
     }
 
-    sockaddr = ngx_resolver_calloc(r, n * NGX_SOCKADDRLEN);
+    sockaddr = ngx_resolver_calloc(r, n * sizeof(ngx_sockaddr_t));
     if (sockaddr == NULL) {
         ngx_resolver_free(r, dst);
         return NULL;
@@ -4196,7 +4182,7 @@ ngx_resolver_export(ngx_resolver_t *r, ngx_resolver_node_t *rn,
         addr = (rn->naddrs == 1) ? &rn->u.addr : rn->u.addrs;
 
         do {
-            sin = (struct sockaddr_in *) sockaddr[d];
+            sin = &sockaddr[d].sockaddr_in;
             sin->sin_family = AF_INET;
             sin->sin_addr.s_addr = addr[j++];
             dst[d].sockaddr = (struct sockaddr *) sin;
@@ -4219,7 +4205,7 @@ ngx_resolver_export(ngx_resolver_t *r, ngx_resolver_node_t *rn,
         addr6 = (rn->naddrs6 == 1) ? &rn->u6.addr6 : rn->u6.addrs6;
 
         do {
-            sin6 = (struct sockaddr_in6 *) sockaddr[d];
+            sin6 = &sockaddr[d].sockaddr_in6;
             sin6->sin6_family = AF_INET6;
             ngx_memcpy(sin6->sin6_addr.s6_addr, addr6[j++].s6_addr, 16);
             dst[d].sockaddr = (struct sockaddr *) sin6;
diff --git a/src/core/ngx_sha1.c b/src/core/ngx_sha1.c
new file mode 100644
index 0000000..f00dc52
--- /dev/null
+++ b/src/core/ngx_sha1.c
@@ -0,0 +1,294 @@
+
+/*
+ * Copyright (C) Maxim Dounin
+ * Copyright (C) Nginx, Inc.
+ *
+ * An internal SHA1 implementation.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_sha1.h>
+
+
+static const u_char *ngx_sha1_body(ngx_sha1_t *ctx, const u_char *data,
+    size_t size);
+
+
+void
+ngx_sha1_init(ngx_sha1_t *ctx)
+{
+    ctx->a = 0x67452301;
+    ctx->b = 0xefcdab89;
+    ctx->c = 0x98badcfe;
+    ctx->d = 0x10325476;
+    ctx->e = 0xc3d2e1f0;
+
+    ctx->bytes = 0;
+}
+
+
+void
+ngx_sha1_update(ngx_sha1_t *ctx, const void *data, size_t size)
+{
+    size_t  used, free;
+
+    used = (size_t) (ctx->bytes & 0x3f);
+    ctx->bytes += size;
+
+    if (used) {
+        free = 64 - used;
+
+        if (size < free) {
+            ngx_memcpy(&ctx->buffer[used], data, size);
+            return;
+        }
+
+        ngx_memcpy(&ctx->buffer[used], data, free);
+        data = (u_char *) data + free;
+        size -= free;
+        (void) ngx_sha1_body(ctx, ctx->buffer, 64);
+    }
+
+    if (size >= 64) {
+        data = ngx_sha1_body(ctx, data, size & ~(size_t) 0x3f);
+        size &= 0x3f;
+    }
+
+    ngx_memcpy(ctx->buffer, data, size);
+}
+
+
+void
+ngx_sha1_final(u_char result[20], ngx_sha1_t *ctx)
+{
+    size_t  used, free;
+
+    used = (size_t) (ctx->bytes & 0x3f);
+
+    ctx->buffer[used++] = 0x80;
+
+    free = 64 - used;
+
+    if (free < 8) {
+        ngx_memzero(&ctx->buffer[used], free);
+        (void) ngx_sha1_body(ctx, ctx->buffer, 64);
+        used = 0;
+        free = 64;
+    }
+
+    ngx_memzero(&ctx->buffer[used], free - 8);
+
+    ctx->bytes <<= 3;
+    ctx->buffer[56] = (u_char) (ctx->bytes >> 56);
+    ctx->buffer[57] = (u_char) (ctx->bytes >> 48);
+    ctx->buffer[58] = (u_char) (ctx->bytes >> 40);
+    ctx->buffer[59] = (u_char) (ctx->bytes >> 32);
+    ctx->buffer[60] = (u_char) (ctx->bytes >> 24);
+    ctx->buffer[61] = (u_char) (ctx->bytes >> 16);
+    ctx->buffer[62] = (u_char) (ctx->bytes >> 8);
+    ctx->buffer[63] = (u_char) ctx->bytes;
+
+    (void) ngx_sha1_body(ctx, ctx->buffer, 64);
+
+    result[0] = (u_char) (ctx->a >> 24);
+    result[1] = (u_char) (ctx->a >> 16);
+    result[2] = (u_char) (ctx->a >> 8);
+    result[3] = (u_char) ctx->a;
+    result[4] = (u_char) (ctx->b >> 24);
+    result[5] = (u_char) (ctx->b >> 16);
+    result[6] = (u_char) (ctx->b >> 8);
+    result[7] = (u_char) ctx->b;
+    result[8] = (u_char) (ctx->c >> 24);
+    result[9] = (u_char) (ctx->c >> 16);
+    result[10] = (u_char) (ctx->c >> 8);
+    result[11] = (u_char) ctx->c;
+    result[12] = (u_char) (ctx->d >> 24);
+    result[13] = (u_char) (ctx->d >> 16);
+    result[14] = (u_char) (ctx->d >> 8);
+    result[15] = (u_char) ctx->d;
+    result[16] = (u_char) (ctx->e >> 24);
+    result[17] = (u_char) (ctx->e >> 16);
+    result[18] = (u_char) (ctx->e >> 8);
+    result[19] = (u_char) ctx->e;
+
+    ngx_memzero(ctx, sizeof(*ctx));
+}
+
+
+/*
+ * Helper functions.
+ */
+
+#define ROTATE(bits, word)  (((word) << (bits)) | ((word) >> (32 - (bits))))
+
+#define F1(b, c, d)  (((b) & (c)) | ((~(b)) & (d)))
+#define F2(b, c, d)  ((b) ^ (c) ^ (d))
+#define F3(b, c, d)  (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
+
+#define STEP(f, a, b, c, d, e, w, t)                                          \
+    temp = ROTATE(5, (a)) + f((b), (c), (d)) + (e) + (w) + (t);               \
+    (e) = (d);                                                                \
+    (d) = (c);                                                                \
+    (c) = ROTATE(30, (b));                                                    \
+    (b) = (a);                                                                \
+    (a) = temp;
+
+
+/*
+ * GET() reads 4 input bytes in big-endian byte order and returns
+ * them as uint32_t.
+ */
+
+#define GET(n)                                                                \
+    ((uint32_t) p[n * 4 + 3] |                                                \
+    ((uint32_t) p[n * 4 + 2] << 8) |                                          \
+    ((uint32_t) p[n * 4 + 1] << 16) |                                         \
+    ((uint32_t) p[n * 4] << 24))
+
+
+/*
+ * This processes one or more 64-byte data blocks, but does not update
+ * the bit counters.  There are no alignment requirements.
+ */
+
+static const u_char *
+ngx_sha1_body(ngx_sha1_t *ctx, const u_char *data, size_t size)
+{
+    uint32_t       a, b, c, d, e, temp;
+    uint32_t       saved_a, saved_b, saved_c, saved_d, saved_e;
+    uint32_t       words[80];
+    ngx_uint_t     i;
+    const u_char  *p;
+
+    p = data;
+
+    a = ctx->a;
+    b = ctx->b;
+    c = ctx->c;
+    d = ctx->d;
+    e = ctx->e;
+
+    do {
+        saved_a = a;
+        saved_b = b;
+        saved_c = c;
+        saved_d = d;
+        saved_e = e;
+
+        /* Load data block into the words array */
+
+        for (i = 0; i < 16; i++) {
+            words[i] = GET(i);
+        }
+
+        for (i = 16; i < 80; i++) {
+            words[i] = ROTATE(1, words[i - 3] ^ words[i - 8] ^ words[i - 14]
+                                 ^ words[i - 16]);
+        }
+
+        /* Transformations */
+
+        STEP(F1, a, b, c, d, e, words[0],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[1],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[2],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[3],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[4],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[5],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[6],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[7],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[8],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[9],  0x5a827999);
+        STEP(F1, a, b, c, d, e, words[10], 0x5a827999);
+        STEP(F1, a, b, c, d, e, words[11], 0x5a827999);
+        STEP(F1, a, b, c, d, e, words[12], 0x5a827999);
+        STEP(F1, a, b, c, d, e, words[13], 0x5a827999);
+        STEP(F1, a, b, c, d, e, words[14], 0x5a827999);
+        STEP(F1, a, b, c, d, e, words[15], 0x5a827999);
+        STEP(F1, a, b, c, d, e, words[16], 0x5a827999);
+        STEP(F1, a, b, c, d, e, words[17], 0x5a827999);
+        STEP(F1, a, b, c, d, e, words[18], 0x5a827999);
+        STEP(F1, a, b, c, d, e, words[19], 0x5a827999);
+
+        STEP(F2, a, b, c, d, e, words[20], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[21], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[22], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[23], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[24], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[25], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[26], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[27], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[28], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[29], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[30], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[31], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[32], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[33], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[34], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[35], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[36], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[37], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[38], 0x6ed9eba1);
+        STEP(F2, a, b, c, d, e, words[39], 0x6ed9eba1);
+
+        STEP(F3, a, b, c, d, e, words[40], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[41], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[42], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[43], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[44], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[45], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[46], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[47], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[48], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[49], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[50], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[51], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[52], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[53], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[54], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[55], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[56], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[57], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[58], 0x8f1bbcdc);
+        STEP(F3, a, b, c, d, e, words[59], 0x8f1bbcdc);
+
+        STEP(F2, a, b, c, d, e, words[60], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[61], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[62], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[63], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[64], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[65], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[66], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[67], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[68], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[69], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[70], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[71], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[72], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[73], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[74], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[75], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[76], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[77], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[78], 0xca62c1d6);
+        STEP(F2, a, b, c, d, e, words[79], 0xca62c1d6);
+
+        a += saved_a;
+        b += saved_b;
+        c += saved_c;
+        d += saved_d;
+        e += saved_e;
+
+        p += 64;
+
+    } while (size -= 64);
+
+    ctx->a = a;
+    ctx->b = b;
+    ctx->c = c;
+    ctx->d = d;
+    ctx->e = e;
+
+    return p;
+}
diff --git a/src/core/ngx_sha1.h b/src/core/ngx_sha1.h
index 81c909e..4a98f71 100644
--- a/src/core/ngx_sha1.h
+++ b/src/core/ngx_sha1.h
@@ -13,19 +13,16 @@
 #include <ngx_core.h>
 
 
-#if (NGX_HAVE_OPENSSL_SHA1_H)
-#include <openssl/sha.h>
-#else
-#include <sha.h>
-#endif
+typedef struct {
+    uint64_t  bytes;
+    uint32_t  a, b, c, d, e, f;
+    u_char    buffer[64];
+} ngx_sha1_t;
 
 
-typedef SHA_CTX  ngx_sha1_t;
-
-
-#define ngx_sha1_init    SHA1_Init
-#define ngx_sha1_update  SHA1_Update
-#define ngx_sha1_final   SHA1_Final
+void ngx_sha1_init(ngx_sha1_t *ctx);
+void ngx_sha1_update(ngx_sha1_t *ctx, const void *data, size_t size);
+void ngx_sha1_final(u_char result[20], ngx_sha1_t *ctx);
 
 
 #endif /* _NGX_SHA1_H_INCLUDED_ */
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index cf665a4..7a73ef5 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -1563,7 +1563,7 @@ ngx_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
         n = 0;
 
         while (size) {
-            if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
+            if (escape[*src >> 5] & (1U << (*src & 0x1f))) {
                 n++;
             }
             src++;
@@ -1574,7 +1574,7 @@ ngx_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
     }
 
     while (size) {
-        if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
+        if (escape[*src >> 5] & (1U << (*src & 0x1f))) {
             *dst++ = '%';
             *dst++ = hex[*src >> 4];
             *dst++ = hex[*src & 0xf];
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index 166c461..c267fd6 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -17,18 +17,19 @@
 #define EPOLLIN        0x001
 #define EPOLLPRI       0x002
 #define EPOLLOUT       0x004
+#define EPOLLERR       0x008
+#define EPOLLHUP       0x010
 #define EPOLLRDNORM    0x040
 #define EPOLLRDBAND    0x080
 #define EPOLLWRNORM    0x100
 #define EPOLLWRBAND    0x200
 #define EPOLLMSG       0x400
-#define EPOLLERR       0x008
-#define EPOLLHUP       0x010
 
 #define EPOLLRDHUP     0x2000
 
-#define EPOLLET        0x80000000
+#define EPOLLEXCLUSIVE 0x10000000
 #define EPOLLONESHOT   0x40000000
+#define EPOLLET        0x80000000
 
 #define EPOLL_CTL_ADD  1
 #define EPOLL_CTL_DEL  2
@@ -105,6 +106,9 @@ static ngx_int_t ngx_epoll_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static ngx_int_t ngx_epoll_notify_init(ngx_log_t *log);
 static void ngx_epoll_notify_handler(ngx_event_t *ev);
 #endif
+#if (NGX_HAVE_EPOLLRDHUP)
+static void ngx_epoll_test_rdhup(ngx_cycle_t *cycle);
+#endif
 static void ngx_epoll_done(ngx_cycle_t *cycle);
 static ngx_int_t ngx_epoll_add_event(ngx_event_t *ev, ngx_int_t event,
     ngx_uint_t flags);
@@ -146,6 +150,10 @@ static ngx_connection_t     ngx_eventfd_conn;
 
 #endif
 
+#if (NGX_HAVE_EPOLLRDHUP)
+ngx_uint_t                  ngx_use_epoll_rdhup;
+#endif
+
 static ngx_str_t      epoll_name = ngx_string("epoll");
 
 static ngx_command_t  ngx_epoll_commands[] = {
@@ -334,9 +342,11 @@ ngx_epoll_init(ngx_cycle_t *cycle, ngx_msec_t timer)
 #endif
 
 #if (NGX_HAVE_FILE_AIO)
-
         ngx_epoll_aio_init(cycle, epcf);
+#endif
 
+#if (NGX_HAVE_EPOLLRDHUP)
+        ngx_epoll_test_rdhup(cycle);
 #endif
     }
 
@@ -449,6 +459,73 @@ ngx_epoll_notify_handler(ngx_event_t *ev)
 #endif
 
 
+#if (NGX_HAVE_EPOLLRDHUP)
+
+static void
+ngx_epoll_test_rdhup(ngx_cycle_t *cycle)
+{
+    int                 s[2], events;
+    struct epoll_event  ee;
+
+    if (socketpair(AF_UNIX, SOCK_STREAM, 0, s) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "socketpair() failed");
+        return;
+    }
+
+    ee.events = EPOLLET|EPOLLIN|EPOLLRDHUP;
+
+    if (epoll_ctl(ep, EPOLL_CTL_ADD, s[0], &ee) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "epoll_ctl() failed");
+        goto failed;
+    }
+
+    if (close(s[1]) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "close() failed");
+        s[1] = -1;
+        goto failed;
+    }
+
+    s[1] = -1;
+
+    events = epoll_wait(ep, &ee, 1, 5000);
+
+    if (events == -1) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "epoll_wait() failed");
+        goto failed;
+    }
+
+    if (events) {
+        ngx_use_epoll_rdhup = ee.events & EPOLLRDHUP;
+
+    } else {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, NGX_ETIMEDOUT,
+                      "epoll_wait() timed out");
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                   "testing the EPOLLRDHUP flag: %s",
+                   ngx_use_epoll_rdhup ? "success" : "fail");
+
+failed:
+
+    if (s[1] != -1 && close(s[1]) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "close() failed");
+    }
+
+    if (close(s[0]) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "close() failed");
+    }
+}
+
+#endif
+
+
 static void
 ngx_epoll_done(ngx_cycle_t *cycle)
 {
@@ -534,6 +611,12 @@ ngx_epoll_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
         op = EPOLL_CTL_ADD;
     }
 
+#if (NGX_HAVE_EPOLLEXCLUSIVE && NGX_HAVE_EPOLLRDHUP)
+    if (flags & NGX_EXCLUSIVE_EVENT) {
+        events &= ~EPOLLRDHUP;
+    }
+#endif
+
     ee.events = events | (uint32_t) flags;
     ee.data.ptr = (void *) ((uintptr_t) c | ev->instance);
 
@@ -808,6 +891,8 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
             if (revents & EPOLLRDHUP) {
                 rev->pending_eof = 1;
             }
+
+            rev->available = 1;
 #endif
 
             rev->ready = 1;
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index c8ae5b2..9d6c4c9 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -822,15 +822,38 @@ ngx_event_process_init(ngx_cycle_t *cycle)
         rev->handler = (c->type == SOCK_STREAM) ? ngx_event_accept
                                                 : ngx_event_recvmsg;
 
-        if (ngx_use_accept_mutex
 #if (NGX_HAVE_REUSEPORT)
-            && !ls[i].reuseport
-#endif
-           )
-        {
+
+        if (ls[i].reuseport) {
+            if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
             continue;
         }
 
+#endif
+
+        if (ngx_use_accept_mutex) {
+            continue;
+        }
+
+#if (NGX_HAVE_EPOLLEXCLUSIVE)
+
+        if ((ngx_event_flags & NGX_USE_EPOLL_EVENT)
+            && ccf->worker_processes > 1)
+        {
+            if (ngx_add_event(rev, NGX_READ_EVENT, NGX_EXCLUSIVE_EVENT)
+                == NGX_ERROR)
+            {
+                return NGX_ERROR;
+            }
+
+            continue;
+        }
+
+#endif
+
         if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
             return NGX_ERROR;
         }
@@ -1261,7 +1284,7 @@ ngx_event_core_init_conf(ngx_cycle_t *cycle, void *conf)
     ngx_conf_init_ptr_value(ecf->name, event_module->name->data);
 
     ngx_conf_init_value(ecf->multi_accept, 0);
-    ngx_conf_init_value(ecf->accept_mutex, 1);
+    ngx_conf_init_value(ecf->accept_mutex, 0);
     ngx_conf_init_msec_value(ecf->accept_mutex_delay, 500);
 
     return NGX_CONF_OK;
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index ed0682c..27139ee 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -76,11 +76,6 @@ struct ngx_event_s {
 
     unsigned         cancelable:1;
 
-#if (NGX_WIN32)
-    /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was successful */
-    unsigned         accept_context_updated:1;
-#endif
-
 #if (NGX_HAVE_KQUEUE)
     unsigned         kq_vnode:1;
 
@@ -96,6 +91,10 @@ struct ngx_event_s {
      *   write:      available space in buffer when event is ready
      *               or lowat when event is set with NGX_LOWAT_EVENT flag
      *
+     * epoll with EPOLLRDHUP:
+     *   accept:     1 if accept many, 0 otherwise
+     *   read:       1 if there can be data to read, 0 otherwise
+     *
      * iocp: TODO
      *
      * otherwise:
@@ -196,6 +195,9 @@ typedef struct {
 
 
 extern ngx_event_actions_t   ngx_event_actions;
+#if (NGX_HAVE_EPOLLRDHUP)
+extern ngx_uint_t            ngx_use_epoll_rdhup;
+#endif
 
 
 /*
@@ -365,6 +367,9 @@ extern ngx_event_actions_t   ngx_event_actions;
 #define NGX_ONESHOT_EVENT  EPOLLONESHOT
 #endif
 
+#if (NGX_HAVE_EPOLLEXCLUSIVE)
+#define NGX_EXCLUSIVE_EVENT  EPOLLEXCLUSIVE
+#endif
 
 #elif (NGX_HAVE_POLL)
 
@@ -393,6 +398,11 @@ extern ngx_event_actions_t   ngx_event_actions;
 #endif
 
 
+#if (NGX_TEST_BUILD_EPOLL)
+#define NGX_EXCLUSIVE_EVENT  0
+#endif
+
+
 #ifndef NGX_CLEAR_EVENT
 #define NGX_CLEAR_EVENT    0    /* dummy declaration */
 #endif
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 1c87a34..4445adc 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -28,10 +28,10 @@ ngx_event_accept(ngx_event_t *ev)
     ngx_uint_t         level;
     ngx_socket_t       s;
     ngx_event_t       *rev, *wev;
+    ngx_sockaddr_t     sa;
     ngx_listening_t   *ls;
     ngx_connection_t  *c, *lc;
     ngx_event_conf_t  *ecf;
-    u_char             sa[NGX_SOCKADDRLEN];
 #if (NGX_HAVE_ACCEPT4)
     static ngx_uint_t  use_accept4 = 1;
 #endif
@@ -58,17 +58,16 @@ ngx_event_accept(ngx_event_t *ev)
                    "accept on %V, ready: %d", &ls->addr_text, ev->available);
 
     do {
-        socklen = NGX_SOCKADDRLEN;
+        socklen = sizeof(ngx_sockaddr_t);
 
 #if (NGX_HAVE_ACCEPT4)
         if (use_accept4) {
-            s = accept4(lc->fd, (struct sockaddr *) sa, &socklen,
-                        SOCK_NONBLOCK);
+            s = accept4(lc->fd, &sa.sockaddr, &socklen, SOCK_NONBLOCK);
         } else {
-            s = accept(lc->fd, (struct sockaddr *) sa, &socklen);
+            s = accept(lc->fd, &sa.sockaddr, &socklen);
         }
 #else
-        s = accept(lc->fd, (struct sockaddr *) sa, &socklen);
+        s = accept(lc->fd, &sa.sockaddr, &socklen);
 #endif
 
         if (s == (ngx_socket_t) -1) {
@@ -171,7 +170,7 @@ ngx_event_accept(ngx_event_t *ev)
             return;
         }
 
-        ngx_memcpy(c->sockaddr, sa, socklen);
+        ngx_memcpy(c->sockaddr, &sa, socklen);
 
         log = ngx_palloc(c->pool, sizeof(ngx_log_t));
         if (log == NULL) {
@@ -217,8 +216,6 @@ ngx_event_accept(ngx_event_t *ev)
         c->local_sockaddr = ls->sockaddr;
         c->local_socklen = ls->socklen;
 
-        c->unexpected_eof = 1;
-
 #if (NGX_HAVE_UNIX_DOMAIN)
         if (c->sockaddr->sa_family == AF_UNIX) {
             c->tcp_nopush = NGX_TCP_NOPUSH_DISABLED;
@@ -330,10 +327,10 @@ ngx_event_recvmsg(ngx_event_t *ev)
     ngx_event_t       *rev, *wev;
     struct iovec       iov[1];
     struct msghdr      msg;
+    ngx_sockaddr_t     sa;
     ngx_listening_t   *ls;
     ngx_event_conf_t  *ecf;
     ngx_connection_t  *c, *lc;
-    u_char             sa[NGX_SOCKADDRLEN];
     static u_char      buffer[65535];
 
 #if (NGX_HAVE_MSGHDR_MSG_CONTROL)
@@ -378,7 +375,7 @@ ngx_event_recvmsg(ngx_event_t *ev)
         iov[0].iov_len = sizeof(buffer);
 
         msg.msg_name = &sa;
-        msg.msg_namelen = sizeof(sa);
+        msg.msg_namelen = sizeof(ngx_sockaddr_t);
         msg.msg_iov = iov;
         msg.msg_iovlen = 1;
 
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 8aca862..30cb59a 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -11,10 +11,19 @@
 #include <ngx_event_connect.h>
 
 
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+static ngx_int_t ngx_event_connect_set_transparent(ngx_peer_connection_t *pc,
+    ngx_socket_t s);
+#endif
+
+
 ngx_int_t
 ngx_event_connect_peer(ngx_peer_connection_t *pc)
 {
     int                rc, type;
+#if (NGX_HAVE_IP_BIND_ADDRESS_NO_PORT || NGX_LINUX)
+    in_port_t          port;
+#endif
     ngx_int_t          event;
     ngx_err_t          err;
     ngx_uint_t         level;
@@ -72,6 +81,62 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
     }
 
     if (pc->local) {
+
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+        if (pc->transparent) {
+            if (ngx_event_connect_set_transparent(pc, s) != NGX_OK) {
+                goto failed;
+            }
+        }
+#endif
+
+#if (NGX_HAVE_IP_BIND_ADDRESS_NO_PORT || NGX_LINUX)
+        port = ngx_inet_get_port(pc->sockaddr);
+#endif
+
+#if (NGX_HAVE_IP_BIND_ADDRESS_NO_PORT)
+
+        if (pc->sockaddr->sa_family != AF_UNIX && port == 0) {
+            static int  bind_address_no_port = 1;
+
+            if (bind_address_no_port) {
+                if (setsockopt(s, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT,
+                               (const void *) &bind_address_no_port,
+                               sizeof(int)) == -1)
+                {
+                    err = ngx_socket_errno;
+
+                    if (err != NGX_EOPNOTSUPP && err != NGX_ENOPROTOOPT) {
+                        ngx_log_error(NGX_LOG_ALERT, pc->log, err,
+                                      "setsockopt(IP_BIND_ADDRESS_NO_PORT) "
+                                      "failed, ignored");
+
+                    } else {
+                        bind_address_no_port = 0;
+                    }
+                }
+            }
+        }
+
+#endif
+
+#if (NGX_LINUX)
+
+        if (pc->type == SOCK_DGRAM && port != 0) {
+            int  reuse_addr = 1;
+
+            if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+                           (const void *) &reuse_addr, sizeof(int))
+                 == -1)
+            {
+                ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
+                              "setsockopt(SO_REUSEADDR) failed");
+                goto failed;
+            }
+        }
+
+#endif
+
         if (bind(s, pc->local->sockaddr, pc->local->socklen) == -1) {
             ngx_log_error(NGX_LOG_CRIT, pc->log, ngx_socket_errno,
                           "bind(%V) failed", &pc->local->name);
@@ -249,6 +314,94 @@ failed:
 }
 
 
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+
+static ngx_int_t
+ngx_event_connect_set_transparent(ngx_peer_connection_t *pc, ngx_socket_t s)
+{
+    int  value;
+
+    value = 1;
+
+#if defined(SO_BINDANY)
+
+    if (setsockopt(s, SOL_SOCKET, SO_BINDANY,
+                   (const void *) &value, sizeof(int)) == -1)
+    {
+        ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
+                      "setsockopt(SO_BINDANY) failed");
+        return NGX_ERROR;
+    }
+
+#else
+
+    switch (pc->local->sockaddr->sa_family) {
+
+    case AF_INET:
+
+#if defined(IP_TRANSPARENT)
+
+        if (setsockopt(s, IPPROTO_IP, IP_TRANSPARENT,
+                       (const void *) &value, sizeof(int)) == -1)
+        {
+            ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
+                          "setsockopt(IP_TRANSPARENT) failed");
+            return NGX_ERROR;
+        }
+
+#elif defined(IP_BINDANY)
+
+        if (setsockopt(s, IPPROTO_IP, IP_BINDANY,
+                       (const void *) &value, sizeof(int)) == -1)
+        {
+            ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
+                          "setsockopt(IP_BINDANY) failed");
+            return NGX_ERROR;
+        }
+
+#endif
+
+        break;
+
+#if (NGX_HAVE_INET6)
+
+    case AF_INET6:
+
+#if defined(IPV6_TRANSPARENT)
+
+        if (setsockopt(s, IPPROTO_IPV6, IPV6_TRANSPARENT,
+                       (const void *) &value, sizeof(int)) == -1)
+        {
+            ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
+                          "setsockopt(IPV6_TRANSPARENT) failed");
+            return NGX_ERROR;
+        }
+
+#elif defined(IPV6_BINDANY)
+
+        if (setsockopt(s, IPPROTO_IPV6, IPV6_BINDANY,
+                       (const void *) &value, sizeof(int)) == -1)
+        {
+            ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
+                          "setsockopt(IPV6_BINDANY) failed");
+            return NGX_ERROR;
+        }
+
+#endif
+        break;
+
+#endif /* NGX_HAVE_INET6 */
+
+    }
+
+#endif /* SO_BINDANY */
+
+    return NGX_OK;
+}
+
+#endif
+
+
 ngx_int_t
 ngx_event_get_peer(ngx_peer_connection_t *pc, void *data)
 {
diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h
index 1bacf82..10b72a1 100644
--- a/src/event/ngx_event_connect.h
+++ b/src/event/ngx_event_connect.h
@@ -61,6 +61,9 @@ struct ngx_peer_connection_s {
     ngx_log_t                       *log;
 
     unsigned                         cached:1;
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+    unsigned                         transparent:1;
+#endif
 
                                      /* ngx_connection_log_error_e */
     unsigned                         log_error:2;
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index de10296..bb9a900 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -105,6 +105,7 @@ int  ngx_ssl_server_conf_index;
 int  ngx_ssl_session_cache_index;
 int  ngx_ssl_session_ticket_keys_index;
 int  ngx_ssl_certificate_index;
+int  ngx_ssl_next_certificate_index;
 int  ngx_ssl_stapling_index;
 
 
@@ -187,11 +188,17 @@ ngx_ssl_init(ngx_log_t *log)
         return NGX_ERROR;
     }
 
-    ngx_ssl_stapling_index = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL,
-                                                      NULL);
+    ngx_ssl_next_certificate_index = X509_get_ex_new_index(0, NULL, NULL, NULL,
+                                                           NULL);
+    if (ngx_ssl_next_certificate_index == -1) {
+        ngx_ssl_error(NGX_LOG_ALERT, log, 0, "X509_get_ex_new_index() failed");
+        return NGX_ERROR;
+    }
+
+    ngx_ssl_stapling_index = X509_get_ex_new_index(0, NULL, NULL, NULL, NULL);
+
     if (ngx_ssl_stapling_index == -1) {
-        ngx_ssl_error(NGX_LOG_ALERT, log, 0,
-                      "SSL_CTX_get_ex_new_index() failed");
+        ngx_ssl_error(NGX_LOG_ALERT, log, 0, "X509_get_ex_new_index() failed");
         return NGX_ERROR;
     }
 
@@ -215,6 +222,12 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
         return NGX_ERROR;
     }
 
+    if (SSL_CTX_set_ex_data(ssl->ctx, ngx_ssl_certificate_index, NULL) == 0) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CTX_set_ex_data() failed");
+        return NGX_ERROR;
+    }
+
     ssl->buffer_size = NGX_SSL_BUFSIZE;
 
     /* client side options */
@@ -308,6 +321,29 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
 }
 
 
+ngx_int_t
+ngx_ssl_certificates(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *certs,
+    ngx_array_t *keys, ngx_array_t *passwords)
+{
+    ngx_str_t   *cert, *key;
+    ngx_uint_t   i;
+
+    cert = certs->elts;
+    key = keys->elts;
+
+    for (i = 0; i < certs->nelts; i++) {
+
+        if (ngx_ssl_certificate(cf, ssl, &cert[i], &key[i], passwords)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
     ngx_str_t *key, ngx_array_t *passwords)
@@ -351,6 +387,16 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
         return NGX_ERROR;
     }
 
+    if (X509_set_ex_data(x509, ngx_ssl_next_certificate_index,
+                      SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index))
+        == 0)
+    {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0, "X509_set_ex_data() failed");
+        X509_free(x509);
+        BIO_free(bio);
+        return NGX_ERROR;
+    }
+
     if (SSL_CTX_set_ex_data(ssl->ctx, ngx_ssl_certificate_index, x509)
         == 0)
     {
@@ -361,8 +407,6 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
         return NGX_ERROR;
     }
 
-    X509_free(x509);
-
     /* read rest of the chain */
 
     for ( ;; ) {
@@ -387,6 +431,24 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
             return NGX_ERROR;
         }
 
+#ifdef SSL_CTRL_CHAIN_CERT
+
+        /*
+         * SSL_CTX_add0_chain_cert() is needed to add chain to
+         * a particular certificate when multiple certificates are used;
+         * only available in OpenSSL 1.0.2+
+         */
+
+        if (SSL_CTX_add0_chain_cert(ssl->ctx, x509) == 0) {
+            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                          "SSL_CTX_add0_chain_cert(\"%s\") failed",
+                          cert->data);
+            X509_free(x509);
+            BIO_free(bio);
+            return NGX_ERROR;
+        }
+
+#else
         if (SSL_CTX_add_extra_chain_cert(ssl->ctx, x509) == 0) {
             ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                           "SSL_CTX_add_extra_chain_cert(\"%s\") failed",
@@ -395,6 +457,7 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
             BIO_free(bio);
             return NGX_ERROR;
         }
+#endif
     }
 
     BIO_free(bio);
@@ -528,6 +591,30 @@ ngx_ssl_password_callback(char *buf, int size, int rwflag, void *userdata)
 }
 
 
+ngx_int_t
+ngx_ssl_ciphers(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *ciphers,
+    ngx_uint_t prefer_server_ciphers)
+{
+    if (SSL_CTX_set_cipher_list(ssl->ctx, (char *) ciphers->data) == 0) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CTX_set_cipher_list(\"%V\") failed",
+                      ciphers);
+        return NGX_ERROR;
+    }
+
+    if (prefer_server_ciphers) {
+        SSL_CTX_set_options(ssl->ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
+    }
+
+#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
+    /* a temporary 512-bit RSA key is required for export versions of MSIE */
+    SSL_CTX_set_tmp_rsa_callback(ssl->ctx, ngx_ssl_rsa512_key_callback);
+#endif
+
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_ssl_client_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
     ngx_int_t depth)
@@ -918,52 +1005,7 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
     DH   *dh;
     BIO  *bio;
 
-    /*
-     * -----BEGIN DH PARAMETERS-----
-     * MIGHAoGBALu8LcrYRnSQfEP89YDpz9vZWKP1aLQtSwju1OsPs1BMbAMCducQgAxc
-     * y7qokiYUxb7spWWl/fHSh6K8BJvmd4Bg6RqSp1fjBI9osHb302zI8pul34HcLKcl
-     * 7OZicMyaUDXYzs7vnqAnSmOrHlj6/UmI0PZdFGdX2gcd8EXP4WubAgEC
-     * -----END DH PARAMETERS-----
-     */
-
-    static unsigned char dh1024_p[] = {
-        0xBB, 0xBC, 0x2D, 0xCA, 0xD8, 0x46, 0x74, 0x90, 0x7C, 0x43, 0xFC, 0xF5,
-        0x80, 0xE9, 0xCF, 0xDB, 0xD9, 0x58, 0xA3, 0xF5, 0x68, 0xB4, 0x2D, 0x4B,
-        0x08, 0xEE, 0xD4, 0xEB, 0x0F, 0xB3, 0x50, 0x4C, 0x6C, 0x03, 0x02, 0x76,
-        0xE7, 0x10, 0x80, 0x0C, 0x5C, 0xCB, 0xBA, 0xA8, 0x92, 0x26, 0x14, 0xC5,
-        0xBE, 0xEC, 0xA5, 0x65, 0xA5, 0xFD, 0xF1, 0xD2, 0x87, 0xA2, 0xBC, 0x04,
-        0x9B, 0xE6, 0x77, 0x80, 0x60, 0xE9, 0x1A, 0x92, 0xA7, 0x57, 0xE3, 0x04,
-        0x8F, 0x68, 0xB0, 0x76, 0xF7, 0xD3, 0x6C, 0xC8, 0xF2, 0x9B, 0xA5, 0xDF,
-        0x81, 0xDC, 0x2C, 0xA7, 0x25, 0xEC, 0xE6, 0x62, 0x70, 0xCC, 0x9A, 0x50,
-        0x35, 0xD8, 0xCE, 0xCE, 0xEF, 0x9E, 0xA0, 0x27, 0x4A, 0x63, 0xAB, 0x1E,
-        0x58, 0xFA, 0xFD, 0x49, 0x88, 0xD0, 0xF6, 0x5D, 0x14, 0x67, 0x57, 0xDA,
-        0x07, 0x1D, 0xF0, 0x45, 0xCF, 0xE1, 0x6B, 0x9B
-    };
-
-    static unsigned char dh1024_g[] = { 0x02 };
-
-
     if (file->len == 0) {
-
-        dh = DH_new();
-        if (dh == NULL) {
-            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0, "DH_new() failed");
-            return NGX_ERROR;
-        }
-
-        dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
-        dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
-
-        if (dh->p == NULL || dh->g == NULL) {
-            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0, "BN_bin2bn() failed");
-            DH_free(dh);
-            return NGX_ERROR;
-        }
-
-        SSL_CTX_set_tmp_dh(ssl->ctx, dh);
-
-        DH_free(dh);
-
         return NGX_OK;
     }
 
@@ -1000,27 +1042,69 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
 {
 #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
 #ifndef OPENSSL_NO_ECDH
-    int      nid;
-    EC_KEY  *ecdh;
 
     /*
      * Elliptic-Curve Diffie-Hellman parameters are either "named curves"
      * from RFC 4492 section 5.1.1, or explicitly described curves over
-     * binary fields. OpenSSL only supports the "named curves", which provide
+     * binary fields.  OpenSSL only supports the "named curves", which provide
      * maximum interoperability.
      */
 
-    nid = OBJ_sn2nid((const char *) name->data);
+#ifdef SSL_CTRL_SET_CURVES_LIST
+
+    /*
+     * OpenSSL 1.0.2+ allows configuring a curve list instead of a single
+     * curve previously supported.  By default an internal list is used,
+     * with prime256v1 being preferred by server in OpenSSL 1.0.2b+
+     * and X25519 in OpenSSL 1.1.0+.
+     *
+     * By default a curve preferred by the client will be used for
+     * key exchange.  The SSL_OP_CIPHER_SERVER_PREFERENCE option can
+     * be used to prefer server curves instead, similar to what it
+     * does for ciphers.
+     */
+
+    SSL_CTX_set_options(ssl->ctx, SSL_OP_SINGLE_ECDH_USE);
+
+#if SSL_CTRL_SET_ECDH_AUTO
+    /* not needed in OpenSSL 1.1.0+ */
+    SSL_CTX_set_ecdh_auto(ssl->ctx, 1);
+#endif
+
+    if (ngx_strcmp(name->data, "auto") == 0) {
+        return NGX_OK;
+    }
+
+    if (SSL_CTX_set1_curves_list(ssl->ctx, (char *) name->data) == 0) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CTX_set1_curves_list(\"%s\") failed", name->data);
+        return NGX_ERROR;
+    }
+
+#else
+
+    int      nid;
+    char    *curve;
+    EC_KEY  *ecdh;
+
+    if (ngx_strcmp(name->data, "auto") == 0) {
+        curve = "prime256v1";
+
+    } else {
+        curve = (char *) name->data;
+    }
+
+    nid = OBJ_sn2nid(curve);
     if (nid == 0) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "Unknown curve name \"%s\"", name->data);
+                      "OBJ_sn2nid(\"%s\") failed: unknown curve", curve);
         return NGX_ERROR;
     }
 
     ecdh = EC_KEY_new_by_curve_name(nid);
     if (ecdh == NULL) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "Unable to create curve \"%s\"", name->data);
+                      "EC_KEY_new_by_curve_name(\"%s\") failed", curve);
         return NGX_ERROR;
     }
 
@@ -1030,6 +1114,7 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
 
     EC_KEY_free(ecdh);
 #endif
+#endif
 #endif
 
     return NGX_OK;
@@ -2102,7 +2187,7 @@ ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
          * session reuse (see SSL_SESS_CACHE_OFF above), then
          * Outlook Express fails to upload a sent email to
          * the Sent Items folder on the IMAP server via a separate IMAP
-         * connection in the background. Therefore we have a special
+         * connection in the background.  Therefore we have a special
          * mode (SSL_SESS_CACHE_SERVER|SSL_SESS_CACHE_NO_INTERNAL_STORE)
          * where the server pretends that it supports session reuse,
          * but it does not actually store any session.
@@ -2164,7 +2249,7 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
 
     /*
      * Session ID context is set based on the string provided,
-     * the server certificate, and the client CA list.
+     * the server certificates, and the client CA list.
      */
 
     md = EVP_MD_CTX_create();
@@ -2184,18 +2269,21 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
         goto failed;
     }
 
-    cert = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index);
+    for (cert = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index);
+         cert;
+         cert = X509_get_ex_data(cert, ngx_ssl_next_certificate_index))
+    {
+        if (X509_digest(cert, EVP_sha1(), buf, &len) == 0) {
+            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                          "X509_digest() failed");
+            goto failed;
+        }
 
-    if (X509_digest(cert, EVP_sha1(), buf, &len) == 0) {
-        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "X509_digest() failed");
-        goto failed;
-    }
-
-    if (EVP_DigestUpdate(md, buf, len) == 0) {
-        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "EVP_DigestUpdate() failed");
-        goto failed;
+        if (EVP_DigestUpdate(md, buf, len) == 0) {
+            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                          "EVP_DigestUpdate() failed");
+            goto failed;
+        }
     }
 
     list = SSL_CTX_get_client_CA_list(ssl->ctx);
@@ -2951,6 +3039,16 @@ ngx_ssl_cleanup_ctx(void *data)
 {
     ngx_ssl_t  *ssl = data;
 
+    X509  *cert, *next;
+
+    cert = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index);
+
+    while (cert) {
+        next = X509_get_ex_data(cert, ngx_ssl_next_certificate_index);
+        X509_free(cert);
+        cert = next;
+    }
+
     SSL_CTX_free(ssl->ctx);
 }
 
@@ -3526,7 +3624,7 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     value = cf->args->elts;
 
-    engine = ENGINE_by_id((const char *) value[1].data);
+    engine = ENGINE_by_id((char *) value[1].data);
 
     if (engine == NULL) {
         ngx_ssl_error(NGX_LOG_WARN, cf->log, 0,
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 09654db..3367d10 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -140,8 +140,12 @@ typedef struct {
 
 ngx_int_t ngx_ssl_init(ngx_log_t *log);
 ngx_int_t ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data);
+ngx_int_t ngx_ssl_certificates(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_array_t *certs, ngx_array_t *keys, ngx_array_t *passwords);
 ngx_int_t ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_str_t *cert, ngx_str_t *key, ngx_array_t *passwords);
+ngx_int_t ngx_ssl_ciphers(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *ciphers,
+    ngx_uint_t prefer_server_ciphers);
 ngx_int_t ngx_ssl_client_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_str_t *cert, ngx_int_t depth);
 ngx_int_t ngx_ssl_trusted_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
@@ -227,6 +231,7 @@ extern int  ngx_ssl_server_conf_index;
 extern int  ngx_ssl_session_cache_index;
 extern int  ngx_ssl_session_ticket_keys_index;
 extern int  ngx_ssl_certificate_index;
+extern int  ngx_ssl_next_certificate_index;
 extern int  ngx_ssl_stapling_index;
 
 
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index 5322b1b..cce8e9e 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -83,11 +83,14 @@ struct ngx_ssl_ocsp_ctx_s {
 };
 
 
+static ngx_int_t ngx_ssl_stapling_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    X509 *cert, ngx_str_t *file, ngx_str_t *responder, ngx_uint_t verify);
 static ngx_int_t ngx_ssl_stapling_file(ngx_conf_t *cf, ngx_ssl_t *ssl,
-    ngx_str_t *file);
-static ngx_int_t ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl);
+    ngx_ssl_stapling_t *staple, ngx_str_t *file);
+static ngx_int_t ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_ssl_stapling_t *staple);
 static ngx_int_t ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
-    ngx_str_t *responder);
+    ngx_ssl_stapling_t *staple, ngx_str_t *responder);
 
 static int ngx_ssl_certificate_status_callback(ngx_ssl_conn_t *ssl_conn,
     void *data);
@@ -121,9 +124,32 @@ ngx_int_t
 ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file,
     ngx_str_t *responder, ngx_uint_t verify)
 {
-    ngx_int_t                  rc;
-    ngx_pool_cleanup_t        *cln;
-    ngx_ssl_stapling_t        *staple;
+    X509  *cert;
+
+    for (cert = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index);
+         cert;
+         cert = X509_get_ex_data(cert, ngx_ssl_next_certificate_index))
+    {
+        if (ngx_ssl_stapling_certificate(cf, ssl, cert, file, responder, verify)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    SSL_CTX_set_tlsext_status_cb(ssl->ctx, ngx_ssl_certificate_status_callback);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_ssl_stapling_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, X509 *cert,
+    ngx_str_t *file, ngx_str_t *responder, ngx_uint_t verify)
+{
+    ngx_int_t            rc;
+    ngx_pool_cleanup_t  *cln;
+    ngx_ssl_stapling_t  *staple;
 
     staple = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_stapling_t));
     if (staple == NULL) {
@@ -138,29 +164,27 @@ ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file,
     cln->handler = ngx_ssl_stapling_cleanup;
     cln->data = staple;
 
-    if (SSL_CTX_set_ex_data(ssl->ctx, ngx_ssl_stapling_index, staple)
-        == 0)
-    {
-        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "SSL_CTX_set_ex_data() failed");
+    if (X509_set_ex_data(cert, ngx_ssl_stapling_index, staple) == 0) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0, "X509_set_ex_data() failed");
         return NGX_ERROR;
     }
 
     staple->ssl_ctx = ssl->ctx;
     staple->timeout = 60000;
     staple->verify = verify;
+    staple->cert = cert;
 
     if (file->len) {
         /* use OCSP response from the file */
 
-        if (ngx_ssl_stapling_file(cf, ssl, file) != NGX_OK) {
+        if (ngx_ssl_stapling_file(cf, ssl, staple, file) != NGX_OK) {
             return NGX_ERROR;
         }
 
-        goto done;
+        return NGX_OK;
     }
 
-    rc = ngx_ssl_stapling_issuer(cf, ssl);
+    rc = ngx_ssl_stapling_issuer(cf, ssl, staple);
 
     if (rc == NGX_DECLINED) {
         return NGX_OK;
@@ -170,7 +194,7 @@ ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file,
         return NGX_ERROR;
     }
 
-    rc = ngx_ssl_stapling_responder(cf, ssl, responder);
+    rc = ngx_ssl_stapling_responder(cf, ssl, staple, responder);
 
     if (rc == NGX_DECLINED) {
         return NGX_OK;
@@ -180,25 +204,18 @@ ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file,
         return NGX_ERROR;
     }
 
-done:
-
-    SSL_CTX_set_tlsext_status_cb(ssl->ctx, ngx_ssl_certificate_status_callback);
-    SSL_CTX_set_tlsext_status_arg(ssl->ctx, staple);
-
     return NGX_OK;
 }
 
 
 static ngx_int_t
-ngx_ssl_stapling_file(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
+ngx_ssl_stapling_file(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_ssl_stapling_t *staple, ngx_str_t *file)
 {
-    BIO                 *bio;
-    int                  len;
-    u_char              *p, *buf;
-    OCSP_RESPONSE       *response;
-    ngx_ssl_stapling_t  *staple;
-
-    staple = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_stapling_index);
+    BIO            *bio;
+    int             len;
+    u_char         *p, *buf;
+    OCSP_RESPONSE  *response;
 
     if (ngx_conf_full_name(cf->cycle, file, 1) != NGX_OK) {
         return NGX_ERROR;
@@ -259,19 +276,24 @@ failed:
 
 
 static ngx_int_t
-ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl)
+ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_ssl_stapling_t *staple)
 {
-    int                  i, n, rc;
-    X509                *cert, *issuer;
-    X509_STORE          *store;
-    X509_STORE_CTX      *store_ctx;
-    STACK_OF(X509)      *chain;
-    ngx_ssl_stapling_t  *staple;
+    int              i, n, rc;
+    X509            *cert, *issuer;
+    X509_STORE      *store;
+    X509_STORE_CTX  *store_ctx;
+    STACK_OF(X509)  *chain;
 
-    staple = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_stapling_index);
-    cert = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index);
+    cert = staple->cert;
 
-#if OPENSSL_VERSION_NUMBER >= 0x10001000L
+#ifdef SSL_CTRL_SELECT_CURRENT_CERT
+    /* OpenSSL 1.0.2+ */
+    SSL_CTX_select_current_cert(ssl->ctx, cert);
+#endif
+
+#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
+    /* OpenSSL 1.0.1+ */
     SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
 #else
     chain = ssl->ctx->extra_certs;
@@ -294,7 +316,6 @@ ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl)
             ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ssl->log, 0,
                            "SSL get issuer: found %p in extra certs", issuer);
 
-            staple->cert = cert;
             staple->issuer = issuer;
 
             return NGX_OK;
@@ -343,7 +364,6 @@ ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl)
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ssl->log, 0,
                    "SSL get issuer: found %p in cert store", issuer);
 
-    staple->cert = cert;
     staple->issuer = issuer;
 
     return NGX_OK;
@@ -351,15 +371,13 @@ ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl)
 
 
 static ngx_int_t
-ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *responder)
+ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_ssl_stapling_t *staple, ngx_str_t *responder)
 {
     ngx_url_t                  u;
     char                      *s;
-    ngx_ssl_stapling_t        *staple;
     STACK_OF(OPENSSL_STRING)  *aia;
 
-    staple = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_stapling_index);
-
     if (responder->len == 0) {
 
         /* extract OCSP responder URL from certificate */
@@ -443,12 +461,17 @@ ngx_int_t
 ngx_ssl_stapling_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_resolver_t *resolver, ngx_msec_t resolver_timeout)
 {
+    X509                *cert;
     ngx_ssl_stapling_t  *staple;
 
-    staple = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_stapling_index);
-
-    staple->resolver = resolver;
-    staple->resolver_timeout = resolver_timeout;
+    for (cert = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index);
+         cert;
+         cert = X509_get_ex_data(cert, ngx_ssl_next_certificate_index))
+    {
+        staple = X509_get_ex_data(cert, ngx_ssl_stapling_index);
+        staple->resolver = resolver;
+        staple->resolver_timeout = resolver_timeout;
+    }
 
     return NGX_OK;
 }
@@ -458,6 +481,7 @@ static int
 ngx_ssl_certificate_status_callback(ngx_ssl_conn_t *ssl_conn, void *data)
 {
     int                  rc;
+    X509                *cert;
     u_char              *p;
     ngx_connection_t    *c;
     ngx_ssl_stapling_t  *staple;
@@ -467,9 +491,15 @@ ngx_ssl_certificate_status_callback(ngx_ssl_conn_t *ssl_conn, void *data)
     ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
                    "SSL certificate status callback");
 
-    staple = data;
     rc = SSL_TLSEXT_ERR_NOACK;
 
+    cert = SSL_get_certificate(ssl_conn);
+    staple = X509_get_ex_data(cert, ngx_ssl_stapling_index);
+
+    if (staple == NULL) {
+        return rc;
+    }
+
     if (staple->staple.len
         && staple->valid >= ngx_time())
     {
@@ -597,7 +627,13 @@ ngx_ssl_stapling_ocsp_handler(ngx_ssl_ocsp_ctx_t *ctx)
         goto error;
     }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10001000L
+#ifdef SSL_CTRL_SELECT_CURRENT_CERT
+    /* OpenSSL 1.0.2+ */
+    SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
+#endif
+
+#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
+    /* OpenSSL 1.0.1+ */
     SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
 #else
     chain = staple->ssl_ctx->extra_certs;
@@ -884,7 +920,6 @@ ngx_ssl_ocsp_resolve_handler(ngx_resolver_ctx_t *resolve)
 
     u_char           *p;
     size_t            len;
-    in_port_t         port;
     socklen_t         socklen;
     ngx_uint_t        i;
     struct sockaddr  *sockaddr;
@@ -926,8 +961,6 @@ ngx_ssl_ocsp_resolve_handler(ngx_resolver_ctx_t *resolve)
         goto failed;
     }
 
-    port = htons(ctx->port);
-
     for (i = 0; i < resolve->naddrs; i++) {
 
         socklen = resolve->addrs[i].socklen;
@@ -938,16 +971,7 @@ ngx_ssl_ocsp_resolve_handler(ngx_resolver_ctx_t *resolve)
         }
 
         ngx_memcpy(sockaddr, resolve->addrs[i].sockaddr, socklen);
-
-        switch (sockaddr->sa_family) {
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            ((struct sockaddr_in6 *) sockaddr)->sin6_port = port;
-            break;
-#endif
-        default: /* AF_INET */
-            ((struct sockaddr_in *) sockaddr)->sin_port = port;
-        }
+        ngx_inet_set_port(sockaddr, ctx->port);
 
         ctx->addrs[i].sockaddr = sockaddr;
         ctx->addrs[i].socklen = socklen;
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 3600265..012a0fb 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -161,6 +161,12 @@ ngx_http_dav_handler(ngx_http_request_t *r)
             return NGX_HTTP_CONFLICT;
         }
 
+        if (r->headers_in.content_range) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "PUT with range is unsupported");
+            return NGX_HTTP_NOT_IMPLEMENTED;
+        }
+
         r->request_body_in_file_only = 1;
         r->request_body_in_persistent_file = 1;
         r->request_body_in_clean_file = 1;
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 2d288ce..62502b0 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -279,7 +279,7 @@ static ngx_command_t  ngx_http_fastcgi_commands[] = {
       NULL },
 
     { ngx_string("fastcgi_bind"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
       ngx_http_upstream_bind_set_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_fastcgi_loc_conf_t, upstream.local),
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index df9424f..c42fb08 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -1000,7 +1000,7 @@ ngx_http_log_escape(u_char *dst, u_char *src, size_t size)
         n = 0;
 
         while (size) {
-            if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
+            if (escape[*src >> 5] & (1U << (*src & 0x1f))) {
                 n++;
             }
             src++;
@@ -1011,7 +1011,7 @@ ngx_http_log_escape(u_char *dst, u_char *src, size_t size)
     }
 
     while (size) {
-        if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
+        if (escape[*src >> 5] & (1U << (*src & 0x1f))) {
             *dst++ = '\\';
             *dst++ = 'x';
             *dst++ = hex[*src >> 4];
diff --git a/src/http/modules/ngx_http_map_module.c b/src/http/modules/ngx_http_map_module.c
index 091ff09..732aa5d 100644
--- a/src/http/modules/ngx_http_map_module.c
+++ b/src/http/modules/ngx_http_map_module.c
@@ -20,7 +20,6 @@ typedef struct {
     ngx_hash_keys_arrays_t      keys;
 
     ngx_array_t                *values_hash;
-    ngx_array_t                 var_values;
 #if (NGX_PCRE)
     ngx_array_t                 regexes;
 #endif
@@ -110,7 +109,8 @@ ngx_http_map_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
 {
     ngx_http_map_ctx_t  *map = (ngx_http_map_ctx_t *) data;
 
-    ngx_str_t                   val;
+    ngx_str_t                   val, str;
+    ngx_http_complex_value_t   *cv;
     ngx_http_variable_value_t  *value;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -131,14 +131,21 @@ ngx_http_map_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
     }
 
     if (!value->valid) {
-        value = ngx_http_get_flushed_variable(r, (uintptr_t) value->data);
+        cv = (ngx_http_complex_value_t *) value->data;
 
-        if (value == NULL || value->not_found) {
-            value = &ngx_http_variable_null_value;
+        if (ngx_http_complex_value(r, cv, &str) != NGX_OK) {
+            return NGX_ERROR;
         }
-    }
 
-    *v = *value;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->len = str.len;
+        v->data = str.data;
+
+    } else {
+        *v = *value;
+    }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http map: \"%V\" \"%v\"", &val, v);
@@ -246,14 +253,6 @@ ngx_http_map_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    if (ngx_array_init(&ctx.var_values, cf->pool, 2,
-                       sizeof(ngx_http_variable_value_t))
-        != NGX_OK)
-    {
-        ngx_destroy_pool(pool);
-        return NGX_CONF_ERROR;
-    }
-
 #if (NGX_PCRE)
     if (ngx_array_init(&ctx.regexes, cf->pool, 2, sizeof(ngx_http_map_regex_t))
         != NGX_OK)
@@ -375,11 +374,15 @@ ngx_http_map_cmp_dns_wildcards(const void *one, const void *two)
 static char *
 ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
 {
-    ngx_int_t                   rv, index;
-    ngx_str_t                  *value, name;
-    ngx_uint_t                  i, key;
-    ngx_http_map_conf_ctx_t    *ctx;
-    ngx_http_variable_value_t  *var, **vp;
+    u_char                            *data;
+    size_t                             len;
+    ngx_int_t                          rv;
+    ngx_str_t                         *value, v;
+    ngx_uint_t                         i, key;
+    ngx_http_map_conf_ctx_t           *ctx;
+    ngx_http_complex_value_t           cv, *cvp;
+    ngx_http_variable_value_t         *var, **vp;
+    ngx_http_compile_complex_value_t   ccv;
 
     ctx = cf->ctx;
 
@@ -401,39 +404,6 @@ ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
         return ngx_conf_include(cf, dummy, conf);
     }
 
-    if (value[1].data[0] == '$') {
-        name = value[1];
-        name.len--;
-        name.data++;
-
-        index = ngx_http_get_variable_index(ctx->cf, &name);
-        if (index == NGX_ERROR) {
-            return NGX_CONF_ERROR;
-        }
-
-        var = ctx->var_values.elts;
-
-        for (i = 0; i < ctx->var_values.nelts; i++) {
-            if (index == (intptr_t) var[i].data) {
-                var = &var[i];
-                goto found;
-            }
-        }
-
-        var = ngx_array_push(&ctx->var_values);
-        if (var == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        var->valid = 0;
-        var->no_cacheable = 0;
-        var->not_found = 0;
-        var->len = 0;
-        var->data = (u_char *) (intptr_t) index;
-
-        goto found;
-    }
-
     key = 0;
 
     for (i = 0; i < value[1].len; i++) {
@@ -446,11 +416,22 @@ ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
 
     if (vp) {
         for (i = 0; i < ctx->values_hash[key].nelts; i++) {
-            if (value[1].len != (size_t) vp[i]->len) {
+
+            if (vp[i]->valid) {
+                data = vp[i]->data;
+                len = vp[i]->len;
+
+            } else {
+                cvp = (ngx_http_complex_value_t *) vp[i]->data;
+                data = cvp->value.data;
+                len = cvp->value.len;
+            }
+
+            if (value[1].len != len) {
                 continue;
             }
 
-            if (ngx_strncmp(value[1].data, vp[i]->data, value[1].len) == 0) {
+            if (ngx_strncmp(value[1].data, data, len) == 0) {
                 var = vp[i];
                 goto found;
             }
@@ -470,13 +451,40 @@ ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    var->len = value[1].len;
-    var->data = ngx_pstrdup(ctx->keys.pool, &value[1]);
-    if (var->data == NULL) {
+    v.len = value[1].len;
+    v.data = ngx_pstrdup(ctx->keys.pool, &value[1]);
+    if (v.data == NULL) {
         return NGX_CONF_ERROR;
     }
 
-    var->valid = 1;
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = ctx->cf;
+    ccv.value = &v;
+    ccv.complex_value = &cv;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cv.lengths != NULL) {
+        cvp = ngx_palloc(ctx->keys.pool, sizeof(ngx_http_complex_value_t));
+        if (cvp == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *cvp = cv;
+
+        var->len = 0;
+        var->data = (u_char *) cvp;
+        var->valid = 0;
+
+    } else {
+        var->len = v.len;
+        var->data = v.data;
+        var->valid = 1;
+    }
+
     var->no_cacheable = 0;
     var->not_found = 0;
 
diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
index d31996a..69f28fa 100644
--- a/src/http/modules/ngx_http_memcached_module.c
+++ b/src/http/modules/ngx_http_memcached_module.c
@@ -61,7 +61,7 @@ static ngx_command_t  ngx_http_memcached_commands[] = {
       NULL },
 
     { ngx_string("memcached_bind"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
       ngx_http_upstream_bind_set_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_memcached_loc_conf_t, upstream.local),
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index c24ef17..4f49a52 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -316,7 +316,7 @@ static ngx_command_t  ngx_http_proxy_commands[] = {
       NULL },
 
     { ngx_string("proxy_bind"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
       ngx_http_upstream_bind_set_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_proxy_loc_conf_t, upstream.local),
@@ -4323,13 +4323,9 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
         }
     }
 
-    if (SSL_CTX_set_cipher_list(plcf->upstream.ssl->ctx,
-                                (const char *) plcf->ssl_ciphers.data)
-        == 0)
+    if (ngx_ssl_ciphers(cf, plcf->upstream.ssl, &plcf->ssl_ciphers, 0)
+        != NGX_OK)
     {
-        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
-                      "SSL_CTX_set_cipher_list(\"%V\") failed",
-                      &plcf->ssl_ciphers);
         return NGX_ERROR;
     }
 
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index b7befe6..490a53d 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -45,10 +45,14 @@ static char *ngx_http_realip_merge_loc_conf(ngx_conf_t *cf,
     void *parent, void *child);
 static ngx_int_t ngx_http_realip_add_variables(ngx_conf_t *cf);
 static ngx_int_t ngx_http_realip_init(ngx_conf_t *cf);
+static ngx_http_realip_ctx_t *ngx_http_realip_get_module_ctx(
+    ngx_http_request_t *r);
 
 
 static ngx_int_t ngx_http_realip_remote_addr_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_realip_remote_port_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 
 static ngx_command_t  ngx_http_realip_commands[] = {
@@ -115,6 +119,9 @@ static ngx_http_variable_t  ngx_http_realip_vars[] = {
     { ngx_string("realip_remote_addr"), NULL,
       ngx_http_realip_remote_addr_variable, 0, 0, 0 },
 
+    { ngx_string("realip_remote_port"), NULL,
+      ngx_http_realip_remote_port_variable, 0, 0, 0 },
+
     { ngx_null_string, NULL, NULL, 0, 0, 0 }
 };
 
@@ -230,6 +237,10 @@ found:
                                     rlcf->recursive)
         != NGX_DECLINED)
     {
+        if (rlcf->type == NGX_HTTP_REALIP_PROXY) {
+            ngx_inet_set_port(addr.sockaddr, c->proxy_protocol_port);
+        }
+
         return ngx_http_realip_set_addr(r, &addr);
     }
 
@@ -358,6 +369,10 @@ ngx_http_realip(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_str_t  *value;
 
+    if (rlcf->type != NGX_CONF_UNSET_UINT) {
+        return "is duplicate";
+    }
+
     value = cf->args->elts;
 
     if (ngx_strcmp(value[1].data, "X-Real-IP") == 0) {
@@ -475,11 +490,9 @@ ngx_http_realip_init(ngx_conf_t *cf)
 }
 
 
-static ngx_int_t
-ngx_http_realip_remote_addr_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
+static ngx_http_realip_ctx_t *
+ngx_http_realip_get_module_ctx(ngx_http_request_t *r)
 {
-    ngx_str_t              *addr_text;
     ngx_pool_cleanup_t     *cln;
     ngx_http_realip_ctx_t  *ctx;
 
@@ -500,6 +513,19 @@ ngx_http_realip_remote_addr_variable(ngx_http_request_t *r,
         }
     }
 
+    return ctx;
+}
+
+
+static ngx_int_t
+ngx_http_realip_remote_addr_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_str_t              *addr_text;
+    ngx_http_realip_ctx_t  *ctx;
+
+    ctx = ngx_http_realip_get_module_ctx(r);
+
     addr_text = ctx ? &ctx->addr_text : &r->connection->addr_text;
 
     v->len = addr_text->len;
@@ -510,3 +536,35 @@ ngx_http_realip_remote_addr_variable(ngx_http_request_t *r,
 
     return NGX_OK;
 }
+
+
+static ngx_int_t
+ngx_http_realip_remote_port_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_uint_t              port;
+    struct sockaddr        *sa;
+    ngx_http_realip_ctx_t  *ctx;
+
+    ctx = ngx_http_realip_get_module_ctx(r);
+
+    sa = ctx ? ctx->sockaddr : r->connection->sockaddr;
+
+    v->len = 0;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    v->data = ngx_pnalloc(r->pool, sizeof("65535") - 1);
+    if (v->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    port = ngx_inet_get_port(sa);
+
+    if (port > 0 && port < 65536) {
+        v->len = ngx_sprintf(v->data, "%ui", port) - v->data;
+    }
+
+    return NGX_OK;
+}
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index f09617e..36656ec 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -136,7 +136,7 @@ static ngx_command_t ngx_http_scgi_commands[] = {
       NULL },
 
     { ngx_string("scgi_bind"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
       ngx_http_upstream_bind_set_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_scgi_loc_conf_t, upstream.local),
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 6a4108c..d685ae9 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -15,7 +15,7 @@ typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
 
 
 #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
-#define NGX_DEFAULT_ECDH_CURVE  "prime256v1"
+#define NGX_DEFAULT_ECDH_CURVE  "auto"
 
 #define NGX_HTTP_NPN_ADVERTISE  "\x08http/1.1"
 
@@ -81,16 +81,16 @@ static ngx_command_t  ngx_http_ssl_commands[] = {
 
     { ngx_string("ssl_certificate"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_conf_set_str_array_slot,
       NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_ssl_srv_conf_t, certificate),
+      offsetof(ngx_http_ssl_srv_conf_t, certificates),
       NULL },
 
     { ngx_string("ssl_certificate_key"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_conf_set_str_array_slot,
       NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_ssl_srv_conf_t, certificate_key),
+      offsetof(ngx_http_ssl_srv_conf_t, certificate_keys),
       NULL },
 
     { ngx_string("ssl_password_file"),
@@ -508,8 +508,6 @@ ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
      * set by ngx_pcalloc():
      *
      *     sscf->protocols = 0;
-     *     sscf->certificate = { 0, NULL };
-     *     sscf->certificate_key = { 0, NULL };
      *     sscf->dhparam = { 0, NULL };
      *     sscf->ecdh_curve = { 0, NULL };
      *     sscf->client_certificate = { 0, NULL };
@@ -526,6 +524,8 @@ ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
     sscf->buffer_size = NGX_CONF_UNSET_SIZE;
     sscf->verify = NGX_CONF_UNSET_UINT;
     sscf->verify_depth = NGX_CONF_UNSET_UINT;
+    sscf->certificates = NGX_CONF_UNSET_PTR;
+    sscf->certificate_keys = NGX_CONF_UNSET_PTR;
     sscf->passwords = NGX_CONF_UNSET_PTR;
     sscf->builtin_session_cache = NGX_CONF_UNSET;
     sscf->session_timeout = NGX_CONF_UNSET;
@@ -573,8 +573,9 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
     ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
 
-    ngx_conf_merge_str_value(conf->certificate, prev->certificate, "");
-    ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, "");
+    ngx_conf_merge_ptr_value(conf->certificates, prev->certificates, NULL);
+    ngx_conf_merge_ptr_value(conf->certificate_keys, prev->certificate_keys,
+                         NULL);
 
     ngx_conf_merge_ptr_value(conf->passwords, prev->passwords, NULL);
 
@@ -601,7 +602,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     if (conf->enable) {
 
-        if (conf->certificate.len == 0) {
+        if (conf->certificates == NULL) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"ssl_certificate\" is defined for "
                           "the \"ssl\" directive in %s:%ui",
@@ -609,7 +610,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
             return NGX_CONF_ERROR;
         }
 
-        if (conf->certificate_key.len == 0) {
+        if (conf->certificate_keys == NULL) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"ssl_certificate_key\" is defined for "
                           "the \"ssl\" directive in %s:%ui",
@@ -617,16 +618,31 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
             return NGX_CONF_ERROR;
         }
 
+        if (conf->certificate_keys->nelts < conf->certificates->nelts) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no \"ssl_certificate_key\" is defined "
+                          "for certificate \"%V\" and "
+                          "the \"ssl\" directive in %s:%ui",
+                          ((ngx_str_t *) conf->certificates->elts)
+                          + conf->certificates->nelts - 1,
+                          conf->file, conf->line);
+            return NGX_CONF_ERROR;
+        }
+
     } else {
 
-        if (conf->certificate.len == 0) {
+        if (conf->certificates == NULL) {
             return NGX_CONF_OK;
         }
 
-        if (conf->certificate_key.len == 0) {
+        if (conf->certificate_keys == NULL
+            || conf->certificate_keys->nelts < conf->certificates->nelts)
+        {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"ssl_certificate_key\" is defined "
-                          "for certificate \"%V\"", &conf->certificate);
+                          "for certificate \"%V\"",
+                          ((ngx_str_t *) conf->certificates->elts)
+                          + conf->certificates->nelts - 1);
             return NGX_CONF_ERROR;
         }
     }
@@ -666,20 +682,17 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = &conf->ssl;
 
-    if (ngx_ssl_certificate(cf, &conf->ssl, &conf->certificate,
-                            &conf->certificate_key, conf->passwords)
+    if (ngx_ssl_certificates(cf, &conf->ssl, conf->certificates,
+                             conf->certificate_keys, conf->passwords)
         != NGX_OK)
     {
         return NGX_CONF_ERROR;
     }
 
-    if (SSL_CTX_set_cipher_list(conf->ssl.ctx,
-                                (const char *) conf->ciphers.data)
-        == 0)
+    if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
+                        conf->prefer_server_ciphers)
+        != NGX_OK)
     {
-        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
-                      "SSL_CTX_set_cipher_list(\"%V\") failed",
-                      &conf->ciphers);
         return NGX_CONF_ERROR;
     }
 
@@ -714,15 +727,6 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
-    if (conf->prefer_server_ciphers) {
-        SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
-    }
-
-#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
-    /* a temporary 512-bit RSA key is required for export versions of MSIE */
-    SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback);
-#endif
-
     if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
diff --git a/src/http/modules/ngx_http_ssl_module.h b/src/http/modules/ngx_http_ssl_module.h
index 8e69e9e..57f5941 100644
--- a/src/http/modules/ngx_http_ssl_module.h
+++ b/src/http/modules/ngx_http_ssl_module.h
@@ -32,8 +32,9 @@ typedef struct {
 
     time_t                          session_timeout;
 
-    ngx_str_t                       certificate;
-    ngx_str_t                       certificate_key;
+    ngx_array_t                    *certificates;
+    ngx_array_t                    *certificate_keys;
+
     ngx_str_t                       dhparam;
     ngx_str_t                       ecdh_curve;
     ngx_str_t                       client_certificate;
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index bb1c50b..e8d1d80 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -83,7 +83,9 @@ static ngx_uint_t ngx_http_sub_cmp_index;
 static ngx_int_t ngx_http_sub_output(ngx_http_request_t *r,
     ngx_http_sub_ctx_t *ctx);
 static ngx_int_t ngx_http_sub_parse(ngx_http_request_t *r,
-    ngx_http_sub_ctx_t *ctx);
+    ngx_http_sub_ctx_t *ctx, ngx_uint_t flush);
+static ngx_int_t ngx_http_sub_match(ngx_http_sub_ctx_t *ctx, ngx_int_t start,
+    ngx_str_t *m);
 
 static char * ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
@@ -285,6 +287,7 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_int_t                  rc;
     ngx_buf_t                 *b;
     ngx_str_t                 *sub;
+    ngx_uint_t                 flush, last;
     ngx_chain_t               *cl;
     ngx_http_sub_ctx_t        *ctx;
     ngx_http_sub_match_t      *match;
@@ -326,6 +329,9 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http sub filter \"%V\"", &r->uri);
 
+    flush = 0;
+    last = 0;
+
     while (ctx->in || ctx->buf) {
 
         if (ctx->buf == NULL) {
@@ -334,11 +340,19 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
             ctx->pos = ctx->buf->pos;
         }
 
+        if (ctx->buf->flush || ctx->buf->recycled) {
+            flush = 1;
+        }
+
+        if (ctx->in == NULL) {
+            last = flush;
+        }
+
         b = NULL;
 
         while (ctx->pos < ctx->buf->last) {
 
-            rc = ngx_http_sub_parse(r, ctx);
+            rc = ngx_http_sub_parse(r, ctx, last);
 
             ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                            "parse: %i, looked: \"%V\" %p-%p",
@@ -590,9 +604,10 @@ ngx_http_sub_output(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
 
 
 static ngx_int_t
-ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
+ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx,
+    ngx_uint_t flush)
 {
-    u_char                   *p, *last, *pat, *pat_end, c;
+    u_char                   *p, c;
     ngx_str_t                *m;
     ngx_int_t                 offset, start, next, end, len, rc;
     ngx_uint_t                shift, i, j;
@@ -602,6 +617,7 @@ ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
 
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_sub_filter_module);
     tables = ctx->tables;
+    match = ctx->matches->elts;
 
     offset = ctx->offset;
     end = ctx->buf->last - ctx->pos;
@@ -628,7 +644,6 @@ ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
         /* a potential match */
 
         start = offset - (ngx_int_t) tables->min_match_len + 1;
-        match = ctx->matches->elts;
 
         i = ngx_max(tables->index[c], ctx->index);
         j = tables->index[c + 1];
@@ -641,41 +656,15 @@ ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
 
             m = &match[i].match;
 
-            pat = m->data;
-            pat_end = m->data + m->len;
+            rc = ngx_http_sub_match(ctx, start, m);
 
-            if (start >= 0) {
-                p = ctx->pos + start;
-
-            } else {
-                last = ctx->looked.data + ctx->looked.len;
-                p = last + start;
-
-                while (p < last && pat < pat_end) {
-                    if (ngx_tolower(*p) != *pat) {
-                        goto next;
-                    }
-
-                    p++;
-                    pat++;
-                }
-
-                p = ctx->pos;
-            }
-
-            while (p < ctx->buf->last && pat < pat_end) {
-                if (ngx_tolower(*p) != *pat) {
-                    goto next;
-                }
-
-                p++;
-                pat++;
+            if (rc == NGX_DECLINED) {
+                goto next;
             }
 
             ctx->index = i;
 
-            if (pat != pat_end) {
-                /* partial match */
+            if (rc == NGX_AGAIN) {
                 goto again;
             }
 
@@ -695,6 +684,26 @@ ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
         ctx->index = 0;
     }
 
+    if (flush) {
+        for ( ;; ) {
+            start = offset - (ngx_int_t) tables->min_match_len + 1;
+
+            if (start >= end) {
+                break;
+            }
+
+            for (i = 0; i < ctx->matches->nelts; i++) {
+                m = &match[i].match;
+
+                if (ngx_http_sub_match(ctx, start, m) == NGX_AGAIN) {
+                    goto again;
+                }
+            }
+
+            offset++;
+        }
+    }
+
 again:
 
     ctx->offset = offset;
@@ -731,6 +740,51 @@ done:
 }
 
 
+static ngx_int_t
+ngx_http_sub_match(ngx_http_sub_ctx_t *ctx, ngx_int_t start, ngx_str_t *m)
+{
+    u_char  *p, *last, *pat, *pat_end;
+
+    pat = m->data;
+    pat_end = m->data + m->len;
+
+    if (start >= 0) {
+        p = ctx->pos + start;
+
+    } else {
+        last = ctx->looked.data + ctx->looked.len;
+        p = last + start;
+
+        while (p < last && pat < pat_end) {
+            if (ngx_tolower(*p) != *pat) {
+                return NGX_DECLINED;
+            }
+
+            p++;
+            pat++;
+        }
+
+        p = ctx->pos;
+    }
+
+    while (p < ctx->buf->last && pat < pat_end) {
+        if (ngx_tolower(*p) != *pat) {
+            return NGX_DECLINED;
+        }
+
+        p++;
+        pat++;
+    }
+
+    if (pat != pat_end) {
+        /* partial match */
+        return NGX_AGAIN;
+    }
+
+    return NGX_OK;
+}
+
+
 static char *
 ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index 85bfcdb..0048e6b 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -29,7 +29,7 @@ typedef struct {
     ngx_connection_t                  *connection;
 
     socklen_t                          socklen;
-    u_char                             sockaddr[NGX_SOCKADDRLEN];
+    ngx_sockaddr_t                     sockaddr;
 
 } ngx_http_upstream_keepalive_cache_t;
 
diff --git a/src/http/modules/ngx_http_userid_filter_module.c b/src/http/modules/ngx_http_userid_filter_module.c
index 1487c09..0dbacba 100644
--- a/src/http/modules/ngx_http_userid_filter_module.c
+++ b/src/http/modules/ngx_http_userid_filter_module.c
@@ -836,7 +836,7 @@ ngx_http_userid_init_worker(ngx_cycle_t *cycle)
     ngx_gettimeofday(&tp);
 
     /* use the most significant usec part that fits to 16 bits */
-    start_value = ((tp.tv_usec / 20) << 16) | ngx_pid;
+    start_value = (((uint32_t) tp.tv_usec / 20) << 16) | ngx_pid;
 
     return NGX_OK;
 }
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index fef2c46..7f916e8 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -196,7 +196,7 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
       NULL },
 
     { ngx_string("uwsgi_bind"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
       ngx_http_upstream_bind_set_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_uwsgi_loc_conf_t, upstream.local),
@@ -2325,13 +2325,9 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
         }
     }
 
-    if (SSL_CTX_set_cipher_list(uwcf->upstream.ssl->ctx,
-                                (const char *) uwcf->ssl_ciphers.data)
-        == 0)
+    if (ngx_ssl_ciphers(cf, uwcf->upstream.ssl, &uwcf->ssl_ciphers, 0)
+        != NGX_OK)
     {
-        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
-                      "SSL_CTX_set_cipher_list(\"%V\") failed",
-                      &uwcf->ssl_ciphers);
         return NGX_ERROR;
     }
 
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 0ceb613..7a46b3e 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1144,12 +1144,8 @@ ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
     in_port_t                   p;
     ngx_uint_t                  i;
     struct sockaddr            *sa;
-    struct sockaddr_in         *sin;
     ngx_http_conf_port_t       *port;
     ngx_http_core_main_conf_t  *cmcf;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6        *sin6;
-#endif
 
     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
 
@@ -1161,28 +1157,8 @@ ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
         }
     }
 
-    sa = &lsopt->u.sockaddr;
-
-    switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = &lsopt->u.sockaddr_in6;
-        p = sin6->sin6_port;
-        break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        p = 0;
-        break;
-#endif
-
-    default: /* AF_INET */
-        sin = &lsopt->u.sockaddr_in;
-        p = sin->sin_port;
-        break;
-    }
+    sa = &lsopt->sockaddr.sockaddr;
+    p = ngx_inet_get_port(sa);
 
     port = cmcf->ports->elts;
     for (i = 0; i < cmcf->ports->nelts; i++) {
@@ -1215,14 +1191,8 @@ static ngx_int_t
 ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
     ngx_http_conf_port_t *port, ngx_http_listen_opt_t *lsopt)
 {
-    u_char                *p;
-    size_t                 len, off;
     ngx_uint_t             i, default_server, proxy_protocol;
-    struct sockaddr       *sa;
     ngx_http_conf_addr_t  *addr;
-#if (NGX_HAVE_UNIX_DOMAIN)
-    struct sockaddr_un    *saun;
-#endif
 #if (NGX_HTTP_SSL)
     ngx_uint_t             ssl;
 #endif
@@ -1235,37 +1205,15 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
      * may fill some fields in inherited sockaddr struct's
      */
 
-    sa = &lsopt->u.sockaddr;
-
-    switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        off = offsetof(struct sockaddr_in6, sin6_addr);
-        len = 16;
-        break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        off = offsetof(struct sockaddr_un, sun_path);
-        len = sizeof(saun->sun_path);
-        break;
-#endif
-
-    default: /* AF_INET */
-        off = offsetof(struct sockaddr_in, sin_addr);
-        len = 4;
-        break;
-    }
-
-    p = lsopt->u.sockaddr_data + off;
-
     addr = port->addrs.elts;
 
     for (i = 0; i < port->addrs.nelts; i++) {
 
-        if (ngx_memcmp(p, addr[i].opt.u.sockaddr_data + off, len) != 0) {
+        if (ngx_cmp_sockaddr(&lsopt->sockaddr.sockaddr, lsopt->socklen,
+                             &addr[i].opt.sockaddr.sockaddr,
+                             addr[i].opt.socklen, 0)
+            != NGX_OK)
+        {
             continue;
         }
 
@@ -1756,7 +1704,8 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
     ngx_http_core_loc_conf_t  *clcf;
     ngx_http_core_srv_conf_t  *cscf;
 
-    ls = ngx_create_listening(cf, &addr->opt.u.sockaddr, addr->opt.socklen);
+    ls = ngx_create_listening(cf, &addr->opt.sockaddr.sockaddr,
+                              addr->opt.socklen);
     if (ls == NULL) {
         return NULL;
     }
@@ -1846,7 +1795,7 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport,
 
     for (i = 0; i < hport->naddrs; i++) {
 
-        sin = &addr[i].opt.u.sockaddr_in;
+        sin = &addr[i].opt.sockaddr.sockaddr_in;
         addrs[i].addr = sin->sin_addr.s_addr;
         addrs[i].conf.default_server = addr[i].default_server;
 #if (NGX_HTTP_SSL)
@@ -1911,7 +1860,7 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
 
     for (i = 0; i < hport->naddrs; i++) {
 
-        sin6 = &addr[i].opt.u.sockaddr_in6;
+        sin6 = &addr[i].opt.sockaddr.sockaddr_in6;
         addrs6[i].addr6 = sin6->sin6_addr;
         addrs6[i].conf.default_server = addr[i].default_server;
 #if (NGX_HTTP_SSL)
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index bd36aec..76917bb 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -793,8 +793,6 @@ ngx_http_handler(ngx_http_request_t *r)
 
     r->connection->log->action = NULL;
 
-    r->connection->unexpected_eof = 0;
-
     if (!r->internal) {
         switch (r->headers_in.connection_type) {
         case 0:
@@ -2912,7 +2910,9 @@ ngx_http_get_forwarded_addr_internal(ngx_http_request_t *r, ngx_addr_t *addr,
             }
         }
 
-        if (ngx_parse_addr(r->pool, &paddr, p, xfflen - (p - xff)) != NGX_OK) {
+        if (ngx_parse_addr_port(r->pool, &paddr, p, xfflen - (p - xff))
+            != NGX_OK)
+        {
             return NGX_DECLINED;
         }
 
@@ -3032,7 +3032,7 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
     if (rv == NGX_CONF_OK && !cscf->listen) {
         ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t));
 
-        sin = &lsopt.u.sockaddr_in;
+        sin = &lsopt.sockaddr.sockaddr_in;
 
         sin->sin_family = AF_INET;
 #if (NGX_WIN32)
@@ -3055,8 +3055,8 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
 #endif
         lsopt.wildcard = 1;
 
-        (void) ngx_sock_ntop(&lsopt.u.sockaddr, lsopt.socklen, lsopt.addr,
-                             NGX_SOCKADDR_STRLEN, 1);
+        (void) ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen,
+                             lsopt.addr, NGX_SOCKADDR_STRLEN, 1);
 
         if (ngx_http_add_listen(cf, cscf, &lsopt) != NGX_OK) {
             return NGX_CONF_ERROR;
@@ -4000,7 +4000,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t));
 
-    ngx_memcpy(&lsopt.u.sockaddr, u.sockaddr, u.socklen);
+    ngx_memcpy(&lsopt.sockaddr.sockaddr, &u.sockaddr, u.socklen);
 
     lsopt.socklen = u.socklen;
     lsopt.backlog = NGX_LISTEN_BACKLOG;
@@ -4017,7 +4017,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     lsopt.ipv6only = 1;
 #endif
 
-    (void) ngx_sock_ntop(&lsopt.u.sockaddr, lsopt.socklen, lsopt.addr,
+    (void) ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen, lsopt.addr,
                          NGX_SOCKADDR_STRLEN, 1);
 
     for (n = 2; n < cf->args->nelts; n++) {
@@ -4146,7 +4146,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
             struct sockaddr  *sa;
 
-            sa = &lsopt.u.sockaddr;
+            sa = &lsopt.sockaddr.sockaddr;
 
             if (sa->sa_family == AF_INET6) {
 
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 6c446a0..773c215 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -58,18 +58,7 @@ typedef struct ngx_http_core_loc_conf_s  ngx_http_core_loc_conf_t;
 
 
 typedef struct {
-    union {
-        struct sockaddr        sockaddr;
-        struct sockaddr_in     sockaddr_in;
-#if (NGX_HAVE_INET6)
-        struct sockaddr_in6    sockaddr_in6;
-#endif
-#if (NGX_HAVE_UNIX_DOMAIN)
-        struct sockaddr_un     sockaddr_un;
-#endif
-        u_char                 sockaddr_data[NGX_SOCKADDRLEN];
-    } u;
-
+    ngx_sockaddr_t             sockaddr;
     socklen_t                  socklen;
 
     unsigned                   set:1;
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 37cd377..4bf0f7f 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -101,7 +101,7 @@ ngx_http_file_cache_init(ngx_shm_zone_t *shm_zone, void *data)
             return NGX_ERROR;
         }
 
-        for (n = 0; n < 3; n++) {
+        for (n = 0; n < NGX_MAX_PATH_LEVEL; n++) {
             if (cache->path->level[n] != ocache->path->level[n]) {
                 ngx_log_error(NGX_LOG_EMERG, shm_zone->shm.log, 0,
                               "cache \"%V\" had previously different levels",
@@ -1403,6 +1403,7 @@ ngx_http_file_cache_update(ngx_http_request_t *r, ngx_temp_file_t *tf)
     ngx_shmtx_lock(&cache->shpool->mutex);
 
     c->node->count--;
+    c->node->error = 0;
     c->node->uniq = uniq;
     c->node->body_start = c->body_start;
 
@@ -2256,7 +2257,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             p = value[i].data + 7;
             last = value[i].data + value[i].len;
 
-            for (n = 0; n < 3 && p < last; n++) {
+            for (n = 0; n < NGX_MAX_PATH_LEVEL && p < last; n++) {
 
                 if (*p > '0' && *p < '3') {
 
@@ -2267,7 +2268,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                         break;
                     }
 
-                    if (*p++ == ':' && n < 2 && p != last) {
+                    if (*p++ == ':' && n < NGX_MAX_PATH_LEVEL - 1 && p < last) {
                         continue;
                     }
 
@@ -2277,7 +2278,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 goto invalid_levels;
             }
 
-            if (cache->path->len < 10 + 3) {
+            if (cache->path->len < 10 + NGX_MAX_PATH_LEVEL) {
                 continue;
             }
 
@@ -2449,7 +2450,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         ngx_memcpy(p, "/temp", sizeof("/temp"));
 
         ngx_memcpy(&cache->temp_path->level, &cache->path->level,
-                   3 * sizeof(size_t));
+                   NGX_MAX_PATH_LEVEL * sizeof(size_t));
 
         cache->temp_path->len = cache->path->len;
         cache->temp_path->conf_file = cf->conf_file->file.name.data;
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index 507dc93..f000b2e 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -95,17 +95,17 @@ static ngx_str_t ngx_http_status_lines[] = {
     ngx_string("414 Request-URI Too Large"),
     ngx_string("415 Unsupported Media Type"),
     ngx_string("416 Requested Range Not Satisfiable"),
+    ngx_null_string,  /* "417 Expectation Failed" */
+    ngx_null_string,  /* "418 unused" */
+    ngx_null_string,  /* "419 unused" */
+    ngx_null_string,  /* "420 unused" */
+    ngx_string("421 Misdirected Request"),
 
-    /* ngx_null_string, */  /* "417 Expectation Failed" */
-    /* ngx_null_string, */  /* "418 unused" */
-    /* ngx_null_string, */  /* "419 unused" */
-    /* ngx_null_string, */  /* "420 unused" */
-    /* ngx_null_string, */  /* "421 unused" */
     /* ngx_null_string, */  /* "422 Unprocessable Entity" */
     /* ngx_null_string, */  /* "423 Locked" */
     /* ngx_null_string, */  /* "424 Failed Dependency" */
 
-#define NGX_HTTP_LAST_4XX  417
+#define NGX_HTTP_LAST_4XX  422
 #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
     ngx_string("500 Internal Server Error"),
@@ -113,10 +113,10 @@ static ngx_str_t ngx_http_status_lines[] = {
     ngx_string("502 Bad Gateway"),
     ngx_string("503 Service Temporarily Unavailable"),
     ngx_string("504 Gateway Time-out"),
-
     ngx_null_string,        /* "505 HTTP Version Not Supported" */
     ngx_null_string,        /* "506 Variant Also Negotiates" */
     ngx_string("507 Insufficient Storage"),
+
     /* ngx_null_string, */  /* "508 unused" */
     /* ngx_null_string, */  /* "509 unused" */
     /* ngx_null_string, */  /* "510 Not Extended" */
@@ -161,10 +161,6 @@ ngx_http_header_filter(ngx_http_request_t *r)
     ngx_connection_t          *c;
     ngx_http_core_loc_conf_t  *clcf;
     ngx_http_core_srv_conf_t  *cscf;
-    struct sockaddr_in        *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6       *sin6;
-#endif
     u_char                     addr[NGX_SOCKADDR_STRLEN];
 
     if (r->header_sent) {
@@ -333,24 +329,7 @@ ngx_http_header_filter(ngx_http_request_t *r)
             }
         }
 
-        switch (c->local_sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            sin6 = (struct sockaddr_in6 *) c->local_sockaddr;
-            port = ntohs(sin6->sin6_port);
-            break;
-#endif
-#if (NGX_HAVE_UNIX_DOMAIN)
-        case AF_UNIX:
-            port = 0;
-            break;
-#endif
-        default: /* AF_INET */
-            sin = (struct sockaddr_in *) c->local_sockaddr;
-            port = ntohs(sin->sin_port);
-            break;
-        }
+        port = ngx_inet_get_port(c->local_sockaddr);
 
         len += sizeof("Location: https://") - 1
                + host.len
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index 0e0b3a2..bd6c9c9 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -481,7 +481,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
         /* check "/.", "//", "%", and "\" (Win32) in URI */
         case sw_after_slash_in_uri:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 state = sw_check_uri;
                 break;
             }
@@ -540,7 +540,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
         /* check "/", "%" and "\" (Win32) in URI */
         case sw_check_uri:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 break;
             }
 
@@ -626,7 +626,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
         /* URI */
         case sw_uri:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 break;
             }
 
@@ -737,6 +737,10 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 return NGX_HTTP_PARSE_INVALID_REQUEST;
             }
 
+            if (r->http_major > 99) {
+                return NGX_HTTP_PARSE_INVALID_REQUEST;
+            }
+
             r->http_major = r->http_major * 10 + ch - '0';
             break;
 
@@ -770,6 +774,10 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 return NGX_HTTP_PARSE_INVALID_REQUEST;
             }
 
+            if (r->http_minor > 99) {
+                return NGX_HTTP_PARSE_INVALID_REQUEST;
+            }
+
             r->http_minor = r->http_minor * 10 + ch - '0';
             break;
 
@@ -1123,7 +1131,7 @@ ngx_http_parse_uri(ngx_http_request_t *r)
         /* check "/.", "//", "%", and "\" (Win32) in URI */
         case sw_after_slash_in_uri:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 state = sw_check_uri;
                 break;
             }
@@ -1171,7 +1179,7 @@ ngx_http_parse_uri(ngx_http_request_t *r)
         /* check "/", "%" and "\" (Win32) in URI */
         case sw_check_uri:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 break;
             }
 
@@ -1220,7 +1228,7 @@ ngx_http_parse_uri(ngx_http_request_t *r)
         /* URI */
         case sw_uri:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 break;
             }
 
@@ -1281,7 +1289,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
 
         case sw_usual:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 *u++ = ch;
                 ch = *p++;
                 break;
@@ -1350,7 +1358,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
 
         case sw_slash:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 state = sw_usual;
                 *u++ = ch;
                 ch = *p++;
@@ -1393,7 +1401,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
 
         case sw_dot:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 state = sw_usual;
                 *u++ = ch;
                 ch = *p++;
@@ -1434,7 +1442,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
 
         case sw_dot_dot:
 
-            if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+            if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
                 state = sw_usual;
                 *u++ = ch;
                 ch = *p++;
@@ -1680,6 +1688,10 @@ ngx_http_parse_status_line(ngx_http_request_t *r, ngx_buf_t *b,
                 return NGX_ERROR;
             }
 
+            if (r->http_major > 99) {
+                return NGX_ERROR;
+            }
+
             r->http_major = r->http_major * 10 + ch - '0';
             break;
 
@@ -1704,6 +1716,10 @@ ngx_http_parse_status_line(ngx_http_request_t *r, ngx_buf_t *b,
                 return NGX_ERROR;
             }
 
+            if (r->http_minor > 99) {
+                return NGX_ERROR;
+            }
+
             r->http_minor = r->http_minor * 10 + ch - '0';
             break;
 
@@ -1820,7 +1836,7 @@ ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri,
             continue;
         }
 
-        if (usual[ch >> 5] & (1 << (ch & 0x1f))) {
+        if (usual[ch >> 5] & (1U << (ch & 0x1f))) {
             continue;
         }
 
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 7d6cada..6ff7903 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -110,6 +110,10 @@ ngx_http_header_t  ngx_http_headers_in[] = {
                  offsetof(ngx_http_headers_in_t, content_length),
                  ngx_http_process_unique_header_line },
 
+    { ngx_string("Content-Range"),
+                 offsetof(ngx_http_headers_in_t, content_range),
+                 ngx_http_process_unique_header_line },
+
     { ngx_string("Content-Type"),
                  offsetof(ngx_http_headers_in_t, content_type),
                  ngx_http_process_header_line },
@@ -2064,8 +2068,8 @@ ngx_http_set_virtual_server(ngx_http_request_t *r, ngx_str_t *host)
         if (sscf->verify) {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                           "client attempted to request the server name "
-                          "different from that one was negotiated");
-            ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+                          "different from the one that was negotiated");
+            ngx_http_finalize_request(r, NGX_HTTP_MISDIRECTED_REQUEST);
             return NGX_ERROR;
         }
     }
@@ -2752,9 +2756,13 @@ ngx_http_test_reading(ngx_http_request_t *r)
 
 #if (NGX_HAVE_EPOLLRDHUP)
 
-    if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && rev->pending_eof) {
+    if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && ngx_use_epoll_rdhup) {
         socklen_t  len;
 
+        if (!rev->pending_eof) {
+            return;
+        }
+
         rev->eof = 1;
         c->error = 1;
 
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index cfde7dc..499c1ef 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -95,6 +95,7 @@
 #define NGX_HTTP_REQUEST_URI_TOO_LARGE     414
 #define NGX_HTTP_UNSUPPORTED_MEDIA_TYPE    415
 #define NGX_HTTP_RANGE_NOT_SATISFIABLE     416
+#define NGX_HTTP_MISDIRECTED_REQUEST       421
 
 
 /* Our own HTTP codes */
@@ -182,6 +183,7 @@ typedef struct {
     ngx_table_elt_t                  *user_agent;
     ngx_table_elt_t                  *referer;
     ngx_table_elt_t                  *content_length;
+    ngx_table_elt_t                  *content_range;
     ngx_table_elt_t                  *content_type;
 
     ngx_table_elt_t                  *range;
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index bff9525..c2b1658 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -350,11 +350,9 @@ ngx_http_script_compile(ngx_http_script_compile_t *sc)
                 goto invalid_variable;
             }
 
-#if (NGX_PCRE)
-            {
-            ngx_uint_t  n;
-
             if (sc->source->data[i] >= '1' && sc->source->data[i] <= '9') {
+#if (NGX_PCRE)
+                ngx_uint_t  n;
 
                 n = sc->source->data[i] - '0';
 
@@ -371,9 +369,13 @@ ngx_http_script_compile(ngx_http_script_compile_t *sc)
                 i++;
 
                 continue;
-            }
-            }
+#else
+                ngx_conf_log_error(NGX_LOG_EMERG, sc->cf, 0,
+                                   "using variable \"$%c\" requires "
+                                   "PCRE library", sc->source->data[i]);
+                return NGX_ERROR;
 #endif
+            }
 
             if (sc->source->data[i] == '{') {
                 bracket = 1;
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 2771e58..64e5acd 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -210,6 +210,14 @@ static char ngx_http_error_416_page[] =
 ;
 
 
+static char ngx_http_error_421_page[] =
+"<html>" CRLF
+"<head><title>421 Misdirected Request</title></head>" CRLF
+"<body bgcolor=\"white\">" CRLF
+"<center><h1>421 Misdirected Request</h1></center>" CRLF
+;
+
+
 static char ngx_http_error_494_page[] =
 "<html>" CRLF
 "<head><title>400 Request Header Or Cookie Too Large</title></head>"
@@ -334,8 +342,13 @@ static ngx_str_t ngx_http_error_pages[] = {
     ngx_string(ngx_http_error_414_page),
     ngx_string(ngx_http_error_415_page),
     ngx_string(ngx_http_error_416_page),
+    ngx_null_string,                     /* 417 */
+    ngx_null_string,                     /* 418 */
+    ngx_null_string,                     /* 419 */
+    ngx_null_string,                     /* 420 */
+    ngx_string(ngx_http_error_421_page),
 
-#define NGX_HTTP_LAST_4XX  417
+#define NGX_HTTP_LAST_4XX  422
 #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
     ngx_string(ngx_http_error_494_page), /* 494, request header too large */
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 1386bdb..0f6b3ae 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -165,8 +165,8 @@ static char *ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy);
 static char *ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
-static ngx_addr_t *ngx_http_upstream_get_local(ngx_http_request_t *r,
-    ngx_http_upstream_local_t *local);
+static ngx_int_t ngx_http_upstream_set_local(ngx_http_request_t *r,
+  ngx_http_upstream_t *u, ngx_http_upstream_local_t *local);
 
 static void *ngx_http_upstream_create_main_conf(ngx_conf_t *cf);
 static char *ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf);
@@ -588,7 +588,10 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
         return;
     }
 
-    u->peer.local = ngx_http_upstream_get_local(r, u->conf->local);
+    if (ngx_http_upstream_set_local(r, u, u->conf->local) != NGX_OK) {
+        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return;
+    }
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
@@ -1219,9 +1222,13 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
 
 #if (NGX_HAVE_EPOLLRDHUP)
 
-    if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && ev->pending_eof) {
+    if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && ngx_use_epoll_rdhup) {
         socklen_t  len;
 
+        if (!ev->pending_eof) {
+            return;
+        }
+
         ev->eof = 1;
         c->error = 1;
 
@@ -5785,7 +5792,7 @@ ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 
     value = cf->args->elts;
 
-    if (ngx_strcmp(value[1].data, "off") == 0) {
+    if (cf->args->nelts == 2 && ngx_strcmp(value[1].data, "off") == 0) {
         *plocal = NULL;
         return NGX_CONF_OK;
     }
@@ -5815,34 +5822,52 @@ ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 
         *local->value = cv;
 
-        return NGX_CONF_OK;
+    } else {
+        local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
+        if (local->addr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        rc = ngx_parse_addr_port(cf->pool, local->addr, value[1].data,
+                                 value[1].len);
+
+        switch (rc) {
+        case NGX_OK:
+            local->addr->name = value[1];
+            break;
+
+        case NGX_DECLINED:
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid address \"%V\"", &value[1]);
+            /* fall through */
+
+        default:
+            return NGX_CONF_ERROR;
+        }
     }
 
-    local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
-    if (local->addr == NULL) {
-        return NGX_CONF_ERROR;
+    if (cf->args->nelts > 2) {
+        if (ngx_strcmp(value[2].data, "transparent") == 0) {
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+            local->transparent = 1;
+#else
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "transparent proxying is not supported "
+                               "on this platform, ignored");
+#endif
+        } else {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid parameter \"%V\"", &value[2]);
+            return NGX_CONF_ERROR;
+        }
     }
 
-    rc = ngx_parse_addr(cf->pool, local->addr, value[1].data, value[1].len);
-
-    switch (rc) {
-    case NGX_OK:
-        local->addr->name = value[1];
-        return NGX_CONF_OK;
-
-    case NGX_DECLINED:
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid address \"%V\"", &value[1]);
-        /* fall through */
-
-    default:
-        return NGX_CONF_ERROR;
-    }
+    return NGX_CONF_OK;
 }
 
 
-static ngx_addr_t *
-ngx_http_upstream_get_local(ngx_http_request_t *r,
+static ngx_int_t
+ngx_http_upstream_set_local(ngx_http_request_t *r, ngx_http_upstream_t *u,
     ngx_http_upstream_local_t *local)
 {
     ngx_int_t    rc;
@@ -5850,41 +5875,47 @@ ngx_http_upstream_get_local(ngx_http_request_t *r,
     ngx_addr_t  *addr;
 
     if (local == NULL) {
-        return NULL;
+        u->peer.local = NULL;
+        return NGX_OK;
     }
 
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+    u->peer.transparent = local->transparent;
+#endif
+
     if (local->value == NULL) {
-        return local->addr;
+        u->peer.local = local->addr;
+        return NGX_OK;
     }
 
     if (ngx_http_complex_value(r, local->value, &val) != NGX_OK) {
-        return NULL;
+        return NGX_ERROR;
     }
 
     if (val.len == 0) {
-        return NULL;
+        return NGX_OK;
     }
 
     addr = ngx_palloc(r->pool, sizeof(ngx_addr_t));
     if (addr == NULL) {
-        return NULL;
+        return NGX_ERROR;
     }
 
-    rc = ngx_parse_addr(r->pool, addr, val.data, val.len);
+    rc = ngx_parse_addr_port(r->pool, addr, val.data, val.len);
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
 
-    switch (rc) {
-    case NGX_OK:
-        addr->name = val;
-        return addr;
-
-    case NGX_DECLINED:
+    if (rc != NGX_OK) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "invalid local address \"%V\"", &val);
-        /* fall through */
-
-    default:
-        return NULL;
+        return NGX_OK;
     }
+
+    addr->name = val;
+    u->peer.local = addr;
+
+    return NGX_OK;
 }
 
 
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 7595dcf..b288f28 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -133,6 +133,9 @@ struct ngx_http_upstream_srv_conf_s {
 typedef struct {
     ngx_addr_t                      *addr;
     ngx_http_complex_value_t        *value;
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+    ngx_uint_t                       transparent; /* unsigned  transparent:1; */
+#endif
 } ngx_http_upstream_local_t;
 
 
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index 8342dc8..8479c42 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -354,16 +354,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
             }
 
             ngx_memcpy(sockaddr, ur->addrs[i].sockaddr, socklen);
-
-            switch (sockaddr->sa_family) {
-#if (NGX_HAVE_INET6)
-            case AF_INET6:
-                ((struct sockaddr_in6 *) sockaddr)->sin6_port = htons(ur->port);
-                break;
-#endif
-            default: /* AF_INET */
-                ((struct sockaddr_in *) sockaddr)->sin_port = htons(ur->port);
-            }
+            ngx_inet_set_port(sockaddr, ur->port);
 
             p = ngx_pnalloc(r->pool, NGX_SOCKADDR_STRLEN);
             if (p == NULL) {
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index f8271ab..7e65b2e 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -58,6 +58,8 @@ static ngx_int_t ngx_http_variable_remote_port(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_proxy_protocol_addr(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_variable_proxy_protocol_port(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_server_addr(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_server_port(ngx_http_request_t *r,
@@ -98,6 +100,8 @@ static ngx_int_t ngx_http_variable_request_length(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_request_time(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_variable_request_id(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_status(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 
@@ -192,6 +196,9 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("proxy_protocol_addr"), NULL,
       ngx_http_variable_proxy_protocol_addr, 0, 0, 0 },
 
+    { ngx_string("proxy_protocol_port"), NULL,
+      ngx_http_variable_proxy_protocol_port, 0, 0, 0 },
+
     { ngx_string("server_addr"), NULL, ngx_http_variable_server_addr, 0, 0, 0 },
 
     { ngx_string("server_port"), NULL, ngx_http_variable_server_port, 0, 0, 0 },
@@ -274,6 +281,10 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("request_time"), NULL, ngx_http_variable_request_time,
       0, NGX_HTTP_VAR_NOCACHEABLE, 0 },
 
+    { ngx_string("request_id"), NULL,
+      ngx_http_variable_request_id,
+      0, 0, 0 },
+
     { ngx_string("status"), NULL,
       ngx_http_variable_status, 0,
       NGX_HTTP_VAR_NOCACHEABLE, 0 },
@@ -1190,11 +1201,7 @@ static ngx_int_t
 ngx_http_variable_remote_port(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
-    ngx_uint_t            port;
-    struct sockaddr_in   *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6  *sin6;
-#endif
+    ngx_uint_t  port;
 
     v->len = 0;
     v->valid = 1;
@@ -1206,26 +1213,7 @@ ngx_http_variable_remote_port(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    switch (r->connection->sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) r->connection->sockaddr;
-        port = ntohs(sin6->sin6_port);
-        break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        port = 0;
-        break;
-#endif
-
-    default: /* AF_INET */
-        sin = (struct sockaddr_in *) r->connection->sockaddr;
-        port = ntohs(sin->sin_port);
-        break;
-    }
+    port = ngx_inet_get_port(r->connection->sockaddr);
 
     if (port > 0 && port < 65536) {
         v->len = ngx_sprintf(v->data, "%ui", port) - v->data;
@@ -1249,6 +1237,32 @@ ngx_http_variable_proxy_protocol_addr(ngx_http_request_t *r,
 }
 
 
+static ngx_int_t
+ngx_http_variable_proxy_protocol_port(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_uint_t  port;
+
+    v->len = 0;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    v->data = ngx_pnalloc(r->pool, sizeof("65535") - 1);
+    if (v->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    port = r->connection->proxy_protocol_port;
+
+    if (port > 0 && port < 65536) {
+        v->len = ngx_sprintf(v->data, "%ui", port) - v->data;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_variable_server_addr(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
@@ -1284,11 +1298,7 @@ static ngx_int_t
 ngx_http_variable_server_port(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
-    ngx_uint_t            port;
-    struct sockaddr_in   *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6  *sin6;
-#endif
+    ngx_uint_t  port;
 
     v->len = 0;
     v->valid = 1;
@@ -1304,26 +1314,7 @@ ngx_http_variable_server_port(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    switch (r->connection->local_sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) r->connection->local_sockaddr;
-        port = ntohs(sin6->sin6_port);
-        break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        port = 0;
-        break;
-#endif
-
-    default: /* AF_INET */
-        sin = (struct sockaddr_in *) r->connection->local_sockaddr;
-        port = ntohs(sin->sin_port);
-        break;
-    }
+    port = ngx_inet_get_port(r->connection->local_sockaddr);
 
     if (port > 0 && port < 65536) {
         v->len = ngx_sprintf(v->data, "%ui", port) - v->data;
@@ -2067,6 +2058,47 @@ ngx_http_variable_request_time(ngx_http_request_t *r,
 }
 
 
+static ngx_int_t
+ngx_http_variable_request_id(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    u_char  *id;
+
+#if (NGX_OPENSSL)
+    u_char   random_bytes[16];
+#endif
+
+    id = ngx_pnalloc(r->pool, 32);
+    if (id == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    v->len = 32;
+    v->data = id;
+
+#if (NGX_OPENSSL)
+
+    if (RAND_bytes(random_bytes, 16) == 1) {
+        ngx_hex_dump(id, random_bytes, 16);
+        return NGX_OK;
+    }
+
+    ngx_ssl_error(NGX_LOG_ERR, r->connection->log, 0, "RAND_bytes() failed");
+
+#endif
+
+    ngx_sprintf(id, "%08xD%08xD%08xD%08xD",
+                (uint32_t) ngx_random(), (uint32_t) ngx_random(),
+                (uint32_t) ngx_random(), (uint32_t) ngx_random());
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_variable_connection(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 278c9ab..d0cd2ab 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -48,11 +48,6 @@
 
 #define NGX_HTTP_V2_DEFAULT_FRAME_SIZE           (1 << 14)
 
-#define NGX_HTTP_V2_MAX_WINDOW                   ((1U << 31) - 1)
-#define NGX_HTTP_V2_DEFAULT_WINDOW               65535
-
-#define NGX_HTTP_V2_INITIAL_WINDOW               0
-
 #define NGX_HTTP_V2_ROOT                         (void *) -1
 
 
@@ -415,6 +410,16 @@ ngx_http_v2_write_handler(ngx_event_t *wev)
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 write handler");
 
+    if (h2c->last_out == NULL && !c->buffered) {
+
+        if (wev->timer_set) {
+            ngx_del_timer(wev);
+        }
+
+        ngx_http_v2_handle_connection(h2c);
+        return;
+    }
+
     h2c->blocked = 1;
 
     rc = ngx_http_v2_send_output_queue(h2c);
@@ -473,7 +478,7 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
     wev = c->write;
 
     if (!wev->ready) {
-        return NGX_OK;
+        return NGX_AGAIN;
     }
 
     cl = NULL;
@@ -544,15 +549,6 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
         c->tcp_nodelay = NGX_TCP_NODELAY_SET;
     }
 
-    if (cl) {
-        ngx_add_timer(wev, clcf->send_timeout);
-
-    } else {
-        if (wev->timer_set) {
-            ngx_del_timer(wev);
-        }
-    }
-
     for ( /* void */ ; out; out = fn) {
         fn = out->next;
 
@@ -577,6 +573,15 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
 
     h2c->last_out = frame;
 
+    if (!wev->ready) {
+        ngx_add_timer(wev, clcf->send_timeout);
+        return NGX_AGAIN;
+    }
+
+    if (wev->timer_set) {
+        ngx_del_timer(wev);
+    }
+
     return NGX_OK;
 
 error:
@@ -594,7 +599,8 @@ error:
 static void
 ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
 {
-    ngx_connection_t          *c;
+    ngx_int_t                rc;
+    ngx_connection_t        *c;
     ngx_http_v2_srv_conf_t  *h2scf;
 
     if (h2c->last_out || h2c->processing) {
@@ -609,7 +615,22 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
     }
 
     if (c->buffered) {
-        return;
+        h2c->blocked = 1;
+
+        rc = ngx_http_v2_send_output_queue(h2c);
+
+        h2c->blocked = 0;
+
+        if (rc == NGX_ERROR) {
+            ngx_http_close_connection(c);
+            return;
+        }
+
+        if (rc == NGX_AGAIN) {
+            return;
+        }
+
+        /* rc == NGX_OK */
     }
 
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@@ -620,7 +641,7 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
     }
 
     if (ngx_terminate || ngx_exiting) {
-        ngx_http_close_connection(c);
+        ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
         return;
     }
 
@@ -879,8 +900,6 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
-    stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
-
     h2c->state.stream = stream;
 
     return ngx_http_v2_state_read_data(h2c, pos, end);
@@ -891,10 +910,12 @@ static u_char *
 ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    size_t                 size;
-    ngx_int_t              rc;
-    ngx_uint_t             last;
-    ngx_http_v2_stream_t  *stream;
+    size_t                   size;
+    ngx_buf_t               *buf;
+    ngx_int_t                rc;
+    ngx_http_request_t      *r;
+    ngx_http_v2_stream_t    *stream;
+    ngx_http_v2_srv_conf_t  *h2scf;
 
     stream = h2c->state.stream;
 
@@ -913,17 +934,42 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     if (size >= h2c->state.length) {
         size = h2c->state.length;
-        last = stream->in_closed;
-
-    } else {
-        last = 0;
+        stream->in_closed  = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
     }
 
-    rc = ngx_http_v2_process_request_body(stream->request, pos, size, last);
+    r = stream->request;
 
-    if (rc != NGX_OK) {
-        stream->skip_data = 1;
-        ngx_http_finalize_request(stream->request, rc);
+    if (r->request_body) {
+        rc = ngx_http_v2_process_request_body(r, pos, size, stream->in_closed);
+
+        if (rc != NGX_OK) {
+            stream->skip_data = 1;
+            ngx_http_finalize_request(r, rc);
+        }
+
+    } else if (size) {
+        buf = stream->preread;
+
+        if (buf == NULL) {
+            h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
+
+            buf = ngx_create_temp_buf(r->pool, h2scf->preread_size);
+            if (buf == NULL) {
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_INTERNAL_ERROR);
+            }
+
+            stream->preread = buf;
+        }
+
+        if (size > (size_t) (buf->end - buf->last)) {
+            ngx_log_error(NGX_LOG_ALERT, h2c->connection->log, 0,
+                          "http2 preread buffer overflow");
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        buf->last = ngx_cpymem(buf->last, pos, size);
     }
 
     pos += size;
@@ -1058,7 +1104,9 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         goto rst_stream;
     }
 
-    if (!h2c->settings_ack && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG))
+    if (!h2c->settings_ack
+        && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
+        && h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
     {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "client sent stream with data "
@@ -2434,8 +2482,7 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack)
 
         buf->last = ngx_http_v2_write_uint16(buf->last,
                                          NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING);
-        buf->last = ngx_http_v2_write_uint32(buf->last,
-                                             NGX_HTTP_V2_INITIAL_WINDOW);
+        buf->last = ngx_http_v2_write_uint32(buf->last, h2scf->preread_size);
 
         buf->last = ngx_http_v2_write_uint16(buf->last,
                                            NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING);
@@ -2643,6 +2690,7 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
     ngx_http_log_ctx_t        *ctx;
     ngx_http_request_t        *r;
     ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_srv_conf_t    *h2scf;
     ngx_http_core_srv_conf_t  *cscf;
 
     fc = h2c->free_fake_connections;
@@ -2756,8 +2804,10 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
     stream->request = r;
     stream->connection = h2c;
 
+    h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
+
     stream->send_window = h2c->init_window;
-    stream->recv_window = NGX_HTTP_V2_INITIAL_WINDOW;
+    stream->recv_window = h2scf->preread_size;
 
     h2c->processing++;
 
@@ -3400,7 +3450,9 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
         return;
     }
 
-    r->headers_in.chunked = (r->headers_in.content_length_n == -1);
+    if (r->headers_in.content_length_n == -1 && !r->stream->in_closed) {
+        r->headers_in.chunked = 1;
+    }
 
     ngx_http_process_request(r);
 }
@@ -3411,7 +3463,11 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
     ngx_http_client_body_handler_pt post_handler)
 {
     off_t                      len;
+    size_t                     size;
+    ngx_buf_t                 *buf;
+    ngx_int_t                  rc;
     ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_srv_conf_t    *h2scf;
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
     ngx_http_v2_connection_t  *h2c;
@@ -3444,24 +3500,34 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
 
     r->request_body = rb;
 
+    h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     len = r->headers_in.content_length_n;
 
     if (r->request_body_no_buffering && !stream->in_closed) {
-        r->request_body_in_file_only = 0;
 
         if (len < 0 || len > (off_t) clcf->client_body_buffer_size) {
             len = clcf->client_body_buffer_size;
         }
 
+        /*
+         * We need a room to store data up to the stream's initial window size,
+         * at least until this window will be exhausted.
+         */
+
+        if (len < (off_t) h2scf->preread_size) {
+            len = h2scf->preread_size;
+        }
+
         if (len > NGX_HTTP_V2_MAX_WINDOW) {
             len = NGX_HTTP_V2_MAX_WINDOW;
         }
-    }
 
-    if (len >= 0 && len <= (off_t) clcf->client_body_buffer_size
-        && !r->request_body_in_file_only)
+        rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
+
+    } else if (len >= 0 && len <= (off_t) clcf->client_body_buffer_size
+               && !r->request_body_in_file_only)
     {
         rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
 
@@ -3478,22 +3544,44 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
+    buf = stream->preread;
+
     if (stream->in_closed) {
         r->request_body_no_buffering = 0;
+
+        if (buf) {
+            rc = ngx_http_v2_process_request_body(r, buf->pos,
+                                                  buf->last - buf->pos, 1);
+            ngx_pfree(r->pool, buf->start);
+            return rc;
+        }
+
         return ngx_http_v2_process_request_body(r, NULL, 0, 1);
     }
 
-    if (len) {
-        if (r->request_body_no_buffering) {
-            stream->recv_window = (size_t) len;
+    if (buf) {
+        rc = ngx_http_v2_process_request_body(r, buf->pos,
+                                              buf->last - buf->pos, 0);
 
-        } else {
-            stream->no_flow_control = 1;
-            stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+        ngx_pfree(r->pool, buf->start);
+
+        if (rc != NGX_OK) {
+            stream->skip_data = 1;
+            return rc;
         }
+    }
 
-        if (ngx_http_v2_send_window_update(stream->connection, stream->node->id,
-                                           stream->recv_window)
+    if (r->request_body_no_buffering) {
+        size = (size_t) len - h2scf->preread_size;
+
+    } else {
+        stream->no_flow_control = 1;
+        size = NGX_HTTP_V2_MAX_WINDOW - stream->recv_window;
+    }
+
+    if (size) {
+        if (ngx_http_v2_send_window_update(stream->connection,
+                                           stream->node->id, size)
             == NGX_ERROR)
         {
             stream->skip_data = 1;
@@ -3508,9 +3596,13 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
                 return NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
         }
+
+        stream->recv_window += size;
     }
 
-    ngx_add_timer(r->connection->read, clcf->client_body_timeout);
+    if (!buf) {
+        ngx_add_timer(r->connection->read, clcf->client_body_timeout);
+    }
 
     r->read_event_handler = ngx_http_v2_read_client_request_body_handler;
     r->write_event_handler = ngx_http_request_empty_handler;
@@ -3529,13 +3621,8 @@ ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
 
-    rb = r->request_body;
-
-    if (rb == NULL) {
-        return NGX_OK;
-    }
-
     fc = r->connection;
+    rb = r->request_body;
     buf = rb->buf;
 
     if (size) {
@@ -3579,7 +3666,7 @@ ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
             rb->buf = NULL;
         }
 
-        if (r->headers_in.content_length_n == -1) {
+        if (r->headers_in.chunked) {
             r->headers_in.content_length_n = rb->received;
         }
 
@@ -3789,7 +3876,14 @@ ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r)
         window -= h2c->state.length;
     }
 
-    if (window == stream->recv_window) {
+    if (window <= stream->recv_window) {
+        if (window < stream->recv_window) {
+            ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                          "http2 negative window update");
+            stream->skip_data = 1;
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
         return NGX_AGAIN;
     }
 
@@ -3824,6 +3918,10 @@ ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     ngx_event_t       *rev;
     ngx_connection_t  *fc;
 
+    if (stream->rst_sent) {
+        return NGX_OK;
+    }
+
     if (ngx_http_v2_send_rst_stream(h2c, stream->node->id, status)
         == NGX_ERROR)
     {
@@ -3831,6 +3929,7 @@ ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     }
 
     stream->rst_sent = 1;
+    stream->skip_data = 1;
 
     fc = stream->request->connection;
     fc->error = 1;
@@ -3862,6 +3961,7 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
 
     if (stream->queued) {
         fc->write->handler = ngx_http_v2_close_stream_handler;
+        fc->read->handler = ngx_http_empty_handler;
         return;
     }
 
@@ -4103,10 +4203,6 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     c->error = 1;
 
-    if (h2c->state.stream) {
-        ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST);
-    }
-
     if (!h2c->processing) {
         ngx_http_close_connection(c);
         return;
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 1adf8de..d712d38 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -46,6 +46,9 @@
 #define NGX_HTTP_V2_PADDED_FLAG          0x08
 #define NGX_HTTP_V2_PRIORITY_FLAG        0x20
 
+#define NGX_HTTP_V2_MAX_WINDOW           ((1U << 31) - 1)
+#define NGX_HTTP_V2_DEFAULT_WINDOW       65535
+
 
 typedef struct ngx_http_v2_connection_s   ngx_http_v2_connection_t;
 typedef struct ngx_http_v2_node_s         ngx_http_v2_node_t;
@@ -174,6 +177,8 @@ struct ngx_http_v2_stream_s {
     ssize_t                          send_window;
     size_t                           recv_window;
 
+    ngx_buf_t                       *preread;
+
     ngx_http_v2_out_frame_t         *free_frames;
     ngx_chain_t                     *free_frame_headers;
     ngx_chain_t                     *free_bufs;
@@ -293,7 +298,7 @@ size_t ngx_http_v2_huff_encode(u_char *src, size_t len, u_char *dst,
 
 #define ngx_http_v2_parse_uint16(p)  ((p)[0] << 8 | (p)[1])
 #define ngx_http_v2_parse_uint32(p)                                           \
-    ((p)[0] << 24 | (p)[1] << 16 | (p)[2] << 8 | (p)[3])
+    ((uint32_t) (p)[0] << 24 | (p)[1] << 16 | (p)[2] << 8 | (p)[3])
 
 #endif
 
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index caa835d..4ab7791 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -137,10 +137,6 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     ngx_http_v2_out_frame_t   *frame;
     ngx_http_core_loc_conf_t  *clcf;
     ngx_http_core_srv_conf_t  *cscf;
-    struct sockaddr_in        *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6       *sin6;
-#endif
     u_char                     addr[NGX_SOCKADDR_STRLEN];
 
     static const u_char nginx[5] = "\x84\xaa\x63\x55\xe7";
@@ -169,6 +165,12 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         return NGX_OK;
     }
 
+    fc = r->connection;
+
+    if (fc->error) {
+        return NGX_ERROR;
+    }
+
     if (r->method == NGX_HTTP_HEAD) {
         r->header_only = 1;
     }
@@ -259,8 +261,6 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         len += 1 + ngx_http_v2_literal_size("Wed, 31 Dec 1986 18:00:00 GMT");
     }
 
-    fc = r->connection;
-
     if (r->headers_out.location && r->headers_out.location->value.len) {
 
         if (r->headers_out.location->value.data[0] == '/') {
@@ -280,24 +280,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
                 }
             }
 
-            switch (fc->local_sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-            case AF_INET6:
-                sin6 = (struct sockaddr_in6 *) fc->local_sockaddr;
-                port = ntohs(sin6->sin6_port);
-                break;
-#endif
-#if (NGX_HAVE_UNIX_DOMAIN)
-            case AF_UNIX:
-                port = 0;
-                break;
-#endif
-            default: /* AF_INET */
-                sin = (struct sockaddr_in *) fc->local_sockaddr;
-                port = ntohs(sin->sin_port);
-                break;
-            }
+            port = ngx_inet_get_port(fc->local_sockaddr);
 
             location.len = sizeof("https://") - 1 + host.len
                            + r->headers_out.location->value.len;
@@ -995,12 +978,11 @@ static ngx_http_v2_out_frame_t *
 ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
     size_t len, ngx_chain_t *first, ngx_chain_t *last)
 {
-    u_char                      flags;
-    ngx_buf_t                  *buf;
-    ngx_chain_t                *cl;
+    u_char                    flags;
+    ngx_buf_t                *buf;
+    ngx_chain_t              *cl;
     ngx_http_v2_out_frame_t  *frame;
 
-
     frame = stream->free_frames;
 
     if (frame) {
@@ -1028,7 +1010,7 @@ ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
 
     buf = cl->buf;
 
-    if (!buf->start) {
+    if (buf->start == NULL) {
         buf->start = ngx_palloc(stream->request->pool,
                                 NGX_HTTP_V2_FRAME_HEADER_SIZE);
         if (buf->start == NULL) {
@@ -1203,7 +1185,6 @@ ngx_http_v2_data_frame_handler(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t  *stream;
 
     stream = frame->stream;
-
     cl = frame->first;
 
     if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_module) {
@@ -1313,18 +1294,20 @@ static ngx_inline void
 ngx_http_v2_handle_stream(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream)
 {
-    ngx_event_t  *wev;
+    ngx_connection_t  *fc;
 
-    if (stream->handled || stream->blocked || stream->exhausted) {
+    if (stream->handled || stream->blocked) {
         return;
     }
 
-    wev = stream->request->connection->write;
+    fc = stream->request->connection;
 
-    if (!wev->delayed) {
-        stream->handled = 1;
-        ngx_queue_insert_tail(&h2c->posted, &stream->queue);
+    if (!fc->error && (stream->exhausted || fc->write->delayed)) {
+        return;
     }
+
+    stream->handled = 1;
+    ngx_queue_insert_tail(&h2c->posted, &stream->queue);
 }
 
 
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
index 5a4561c..b7d99e0 100644
--- a/src/http/v2/ngx_http_v2_module.c
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -30,6 +30,7 @@ static char *ngx_http_v2_merge_loc_conf(ngx_conf_t *cf, void *parent,
 static char *ngx_http_v2_recv_buffer_size(ngx_conf_t *cf, void *post,
     void *data);
 static char *ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data);
+static char *ngx_http_v2_preread_size(ngx_conf_t *cf, void *post, void *data);
 static char *ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post,
     void *data);
 static char *ngx_http_v2_chunk_size(ngx_conf_t *cf, void *post, void *data);
@@ -41,6 +42,8 @@ static ngx_conf_post_t  ngx_http_v2_recv_buffer_size_post =
     { ngx_http_v2_recv_buffer_size };
 static ngx_conf_post_t  ngx_http_v2_pool_size_post =
     { ngx_http_v2_pool_size };
+static ngx_conf_post_t  ngx_http_v2_preread_size_post =
+    { ngx_http_v2_preread_size };
 static ngx_conf_post_t  ngx_http_v2_streams_index_mask_post =
     { ngx_http_v2_streams_index_mask };
 static ngx_conf_post_t  ngx_http_v2_chunk_size_post =
@@ -84,6 +87,13 @@ static ngx_command_t  ngx_http_v2_commands[] = {
       offsetof(ngx_http_v2_srv_conf_t, max_header_size),
       NULL },
 
+    { ngx_string("http2_body_preread_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, preread_size),
+      &ngx_http_v2_preread_size_post },
+
     { ngx_string("http2_streams_index_size"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -316,6 +326,8 @@ ngx_http_v2_create_srv_conf(ngx_conf_t *cf)
     h2scf->max_field_size = NGX_CONF_UNSET_SIZE;
     h2scf->max_header_size = NGX_CONF_UNSET_SIZE;
 
+    h2scf->preread_size = NGX_CONF_UNSET_SIZE;
+
     h2scf->streams_index_mask = NGX_CONF_UNSET_UINT;
 
     h2scf->recv_timeout = NGX_CONF_UNSET_MSEC;
@@ -341,6 +353,8 @@ ngx_http_v2_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_size_value(conf->max_header_size, prev->max_header_size,
                               16384);
 
+    ngx_conf_merge_size_value(conf->preread_size, prev->preread_size, 65536);
+
     ngx_conf_merge_uint_value(conf->streams_index_mask,
                               prev->streams_index_mask, 32 - 1);
 
@@ -419,6 +433,23 @@ ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data)
 }
 
 
+static char *
+ngx_http_v2_preread_size(ngx_conf_t *cf, void *post, void *data)
+{
+    size_t *sp = data;
+
+    if (*sp > NGX_HTTP_V2_MAX_WINDOW) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "the maximum body preread buffer size is %uz",
+                           NGX_HTTP_V2_MAX_WINDOW);
+
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 static char *
 ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post, void *data)
 {
diff --git a/src/http/v2/ngx_http_v2_module.h b/src/http/v2/ngx_http_v2_module.h
index 95cc7d8..91f97c2 100644
--- a/src/http/v2/ngx_http_v2_module.h
+++ b/src/http/v2/ngx_http_v2_module.h
@@ -25,6 +25,7 @@ typedef struct {
     ngx_uint_t                      concurrent_streams;
     size_t                          max_field_size;
     size_t                          max_header_size;
+    size_t                          preread_size;
     ngx_uint_t                      streams_index_mask;
     ngx_msec_t                      recv_timeout;
     ngx_msec_t                      idle_timeout;
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c
index 6ad5a67..e5a77b0 100644
--- a/src/mail/ngx_mail.c
+++ b/src/mail/ngx_mail.c
@@ -228,35 +228,11 @@ ngx_mail_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     in_port_t              p;
     ngx_uint_t             i;
     struct sockaddr       *sa;
-    struct sockaddr_in    *sin;
     ngx_mail_conf_port_t  *port;
     ngx_mail_conf_addr_t  *addr;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6   *sin6;
-#endif
 
-    sa = &listen->u.sockaddr;
-
-    switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = &listen->u.sockaddr_in6;
-        p = sin6->sin6_port;
-        break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        p = 0;
-        break;
-#endif
-
-    default: /* AF_INET */
-        sin = &listen->u.sockaddr_in;
-        p = sin->sin_port;
-        break;
-    }
+    sa = &listen->sockaddr.sockaddr;
+    p = ngx_inet_get_port(sa);
 
     port = ports->elts;
     for (i = 0; i < ports->nelts; i++) {
@@ -340,7 +316,7 @@ ngx_mail_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
                 continue;
             }
 
-            ls = ngx_create_listening(cf, &addr[i].opt.u.sockaddr,
+            ls = ngx_create_listening(cf, &addr[i].opt.sockaddr.sockaddr,
                                       addr[i].opt.socklen);
             if (ls == NULL) {
                 return NGX_CONF_ERROR;
@@ -423,7 +399,7 @@ ngx_mail_add_addrs(ngx_conf_t *cf, ngx_mail_port_t *mport,
 
     for (i = 0; i < mport->naddrs; i++) {
 
-        sin = &addr[i].opt.u.sockaddr_in;
+        sin = &addr[i].opt.sockaddr.sockaddr_in;
         addrs[i].addr = sin->sin_addr.s_addr;
 
         addrs[i].conf.ctx = addr[i].opt.ctx;
@@ -431,8 +407,8 @@ ngx_mail_add_addrs(ngx_conf_t *cf, ngx_mail_port_t *mport,
         addrs[i].conf.ssl = addr[i].opt.ssl;
 #endif
 
-        len = ngx_sock_ntop(&addr[i].opt.u.sockaddr, addr[i].opt.socklen, buf,
-                            NGX_SOCKADDR_STRLEN, 1);
+        len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
+                            buf, NGX_SOCKADDR_STRLEN, 1);
 
         p = ngx_pnalloc(cf->pool, len);
         if (p == NULL) {
@@ -472,7 +448,7 @@ ngx_mail_add_addrs6(ngx_conf_t *cf, ngx_mail_port_t *mport,
 
     for (i = 0; i < mport->naddrs; i++) {
 
-        sin6 = &addr[i].opt.u.sockaddr_in6;
+        sin6 = &addr[i].opt.sockaddr.sockaddr_in6;
         addrs6[i].addr6 = sin6->sin6_addr;
 
         addrs6[i].conf.ctx = addr[i].opt.ctx;
@@ -480,8 +456,8 @@ ngx_mail_add_addrs6(ngx_conf_t *cf, ngx_mail_port_t *mport,
         addrs6[i].conf.ssl = addr[i].opt.ssl;
 #endif
 
-        len = ngx_sock_ntop(&addr[i].opt.u.sockaddr, addr[i].opt.socklen, buf,
-                            NGX_SOCKADDR_STRLEN, 1);
+        len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
+                            buf, NGX_SOCKADDR_STRLEN, 1);
 
         p = ngx_pnalloc(cf->pool, len);
         if (p == NULL) {
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index bfbf768..ae1aa41 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -27,18 +27,7 @@ typedef struct {
 
 
 typedef struct {
-    union {
-        struct sockaddr     sockaddr;
-        struct sockaddr_in  sockaddr_in;
-#if (NGX_HAVE_INET6)
-        struct sockaddr_in6 sockaddr_in6;
-#endif
-#if (NGX_HAVE_UNIX_DOMAIN)
-        struct sockaddr_un  sockaddr_un;
-#endif
-        u_char              sockaddr_data[NGX_SOCKADDRLEN];
-    } u;
-
+    ngx_sockaddr_t          sockaddr;
     socklen_t               socklen;
 
     /* server ctx */
diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c
index 39f9b17..a94434a 100644
--- a/src/mail/ngx_mail_auth_http_module.c
+++ b/src/mail/ngx_mail_auth_http_module.c
@@ -462,15 +462,11 @@ static void
 ngx_mail_auth_http_process_headers(ngx_mail_session_t *s,
     ngx_mail_auth_http_ctx_t *ctx)
 {
-    u_char               *p;
-    time_t                timer;
-    size_t                len, size;
-    ngx_int_t             rc, port, n;
-    ngx_addr_t           *peer;
-    struct sockaddr_in   *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6  *sin6;
-#endif
+    u_char      *p;
+    time_t       timer;
+    size_t       len, size;
+    ngx_int_t    rc, port, n;
+    ngx_addr_t  *peer;
 
     ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0,
                    "mail auth http process headers");
@@ -813,20 +809,7 @@ ngx_mail_auth_http_process_headers(ngx_mail_session_t *s,
                 return;
             }
 
-            switch (peer->sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-            case AF_INET6:
-                sin6 = (struct sockaddr_in6 *) peer->sockaddr;
-                sin6->sin6_port = htons((in_port_t) port);
-                break;
-#endif
-
-            default: /* AF_INET */
-                sin = (struct sockaddr_in *) peer->sockaddr;
-                sin->sin_port = htons((in_port_t) port);
-                break;
-            }
+            ngx_inet_set_port(peer->sockaddr, (in_port_t) port);
 
             len = ctx->addr.len + 1 + ctx->port.len;
 
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 8ea8ea9..d992402 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -288,19 +288,12 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_mail_core_srv_conf_t  *cscf = conf;
 
-    size_t                      len, off;
-    in_port_t                   port;
     ngx_str_t                  *value;
     ngx_url_t                   u;
     ngx_uint_t                  i, m;
-    struct sockaddr            *sa;
     ngx_mail_listen_t          *ls;
     ngx_mail_module_t          *module;
-    struct sockaddr_in         *sin;
     ngx_mail_core_main_conf_t  *cmcf;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6        *sin6;
-#endif
 
     value = cf->args->elts;
 
@@ -325,49 +318,13 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     for (i = 0; i < cmcf->listen.nelts; i++) {
 
-        sa = &ls[i].u.sockaddr;
-
-        if (sa->sa_family != u.family) {
-            continue;
-        }
-
-        switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            off = offsetof(struct sockaddr_in6, sin6_addr);
-            len = 16;
-            sin6 = &ls[i].u.sockaddr_in6;
-            port = ntohs(sin6->sin6_port);
-            break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-        case AF_UNIX:
-            off = offsetof(struct sockaddr_un, sun_path);
-            len = sizeof(((struct sockaddr_un *) sa)->sun_path);
-            port = 0;
-            break;
-#endif
-
-        default: /* AF_INET */
-            off = offsetof(struct sockaddr_in, sin_addr);
-            len = 4;
-            sin = &ls[i].u.sockaddr_in;
-            port = ntohs(sin->sin_port);
-            break;
-        }
-
-        if (ngx_memcmp(ls[i].u.sockaddr_data + off, u.sockaddr + off, len)
-            != 0)
+        if (ngx_cmp_sockaddr(&ls[i].sockaddr.sockaddr, ls[i].socklen,
+                             (struct sockaddr *) &u.sockaddr, u.socklen, 1)
+            != NGX_OK)
         {
             continue;
         }
 
-        if (port != u.port) {
-            continue;
-        }
-
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "duplicate \"%V\" address and port pair", &u.url);
         return NGX_CONF_ERROR;
@@ -380,7 +337,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_memzero(ls, sizeof(ngx_mail_listen_t));
 
-    ngx_memcpy(&ls->u.sockaddr, u.sockaddr, u.socklen);
+    ngx_memcpy(&ls->sockaddr.sockaddr, &u.sockaddr, u.socklen);
 
     ls->socklen = u.socklen;
     ls->backlog = NGX_LISTEN_BACKLOG;
@@ -434,11 +391,10 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+            size_t  len;
             u_char  buf[NGX_SOCKADDR_STRLEN];
 
-            sa = &ls->u.sockaddr;
-
-            if (sa->sa_family == AF_INET6) {
+            if (ls->sockaddr.sockaddr.sa_family == AF_INET6) {
 
                 if (ngx_strcmp(&value[i].data[10], "n") == 0) {
                     ls->ipv6only = 1;
@@ -456,7 +412,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 ls->bind = 1;
 
             } else {
-                len = ngx_sock_ntop(sa, ls->socklen, buf,
+                len = ngx_sock_ntop(&ls->sockaddr.sockaddr, ls->socklen, buf,
                                     NGX_SOCKADDR_STRLEN, 1);
 
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index ff5c141..11e428c 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -11,7 +11,7 @@
 
 
 #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
-#define NGX_DEFAULT_ECDH_CURVE  "prime256v1"
+#define NGX_DEFAULT_ECDH_CURVE  "auto"
 
 
 static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf);
@@ -73,16 +73,16 @@ static ngx_command_t  ngx_mail_ssl_commands[] = {
 
     { ngx_string("ssl_certificate"),
       NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_conf_set_str_array_slot,
       NGX_MAIL_SRV_CONF_OFFSET,
-      offsetof(ngx_mail_ssl_conf_t, certificate),
+      offsetof(ngx_mail_ssl_conf_t, certificates),
       NULL },
 
     { ngx_string("ssl_certificate_key"),
       NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_conf_set_str_array_slot,
       NGX_MAIL_SRV_CONF_OFFSET,
-      offsetof(ngx_mail_ssl_conf_t, certificate_key),
+      offsetof(ngx_mail_ssl_conf_t, certificate_keys),
       NULL },
 
     { ngx_string("ssl_password_file"),
@@ -238,8 +238,6 @@ ngx_mail_ssl_create_conf(ngx_conf_t *cf)
      * set by ngx_pcalloc():
      *
      *     scf->protocols = 0;
-     *     scf->certificate = { 0, NULL };
-     *     scf->certificate_key = { 0, NULL };
      *     scf->dhparam = { 0, NULL };
      *     scf->ecdh_curve = { 0, NULL };
      *     scf->client_certificate = { 0, NULL };
@@ -251,6 +249,8 @@ ngx_mail_ssl_create_conf(ngx_conf_t *cf)
 
     scf->enable = NGX_CONF_UNSET;
     scf->starttls = NGX_CONF_UNSET_UINT;
+    scf->certificates = NGX_CONF_UNSET_PTR;
+    scf->certificate_keys = NGX_CONF_UNSET_PTR;
     scf->passwords = NGX_CONF_UNSET_PTR;
     scf->prefer_server_ciphers = NGX_CONF_UNSET;
     scf->verify = NGX_CONF_UNSET_UINT;
@@ -290,8 +290,9 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
     ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
 
-    ngx_conf_merge_str_value(conf->certificate, prev->certificate, "");
-    ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, "");
+    ngx_conf_merge_ptr_value(conf->certificates, prev->certificates, NULL);
+    ngx_conf_merge_ptr_value(conf->certificate_keys, prev->certificate_keys,
+                         NULL);
 
     ngx_conf_merge_ptr_value(conf->passwords, prev->passwords, NULL);
 
@@ -328,7 +329,7 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     if (*mode) {
 
-        if (conf->certificate.len == 0) {
+        if (conf->certificates == NULL) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"ssl_certificate\" is defined for "
                           "the \"%s\" directive in %s:%ui",
@@ -336,7 +337,7 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
             return NGX_CONF_ERROR;
         }
 
-        if (conf->certificate_key.len == 0) {
+        if (conf->certificate_keys == NULL) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"ssl_certificate_key\" is defined for "
                           "the \"%s\" directive in %s:%ui",
@@ -344,17 +345,31 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
             return NGX_CONF_ERROR;
         }
 
+        if (conf->certificate_keys->nelts < conf->certificates->nelts) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no \"ssl_certificate_key\" is defined "
+                          "for certificate \"%V\" and "
+                          "the \"ssl\" directive in %s:%ui",
+                          ((ngx_str_t *) conf->certificates->elts)
+                          + conf->certificates->nelts - 1,
+                          conf->file, conf->line);
+            return NGX_CONF_ERROR;
+        }
+
     } else {
 
-        if (conf->certificate.len == 0) {
+        if (conf->certificates == NULL) {
             return NGX_CONF_OK;
         }
 
-        if (conf->certificate_key.len == 0) {
+        if (conf->certificate_keys == NULL
+            || conf->certificate_keys->nelts < conf->certificates->nelts)
+        {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"ssl_certificate_key\" is defined "
                           "for certificate \"%V\"",
-                          &conf->certificate);
+                          ((ngx_str_t *) conf->certificates->elts)
+                          + conf->certificates->nelts - 1);
             return NGX_CONF_ERROR;
         }
     }
@@ -371,8 +386,8 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = &conf->ssl;
 
-    if (ngx_ssl_certificate(cf, &conf->ssl, &conf->certificate,
-                            &conf->certificate_key, conf->passwords)
+    if (ngx_ssl_certificates(cf, &conf->ssl, conf->certificates,
+                             conf->certificate_keys, conf->passwords)
         != NGX_OK)
     {
         return NGX_CONF_ERROR;
@@ -407,24 +422,13 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
-    if (SSL_CTX_set_cipher_list(conf->ssl.ctx,
-                                (const char *) conf->ciphers.data)
-        == 0)
+    if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
+                        conf->prefer_server_ciphers)
+        != NGX_OK)
     {
-        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
-                      "SSL_CTX_set_cipher_list(\"%V\") failed",
-                      &conf->ciphers);
         return NGX_CONF_ERROR;
     }
 
-    if (conf->prefer_server_ciphers) {
-        SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
-    }
-
-#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
-    SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback);
-#endif
-
     if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
diff --git a/src/mail/ngx_mail_ssl_module.h b/src/mail/ngx_mail_ssl_module.h
index 296a6a2..26628d5 100644
--- a/src/mail/ngx_mail_ssl_module.h
+++ b/src/mail/ngx_mail_ssl_module.h
@@ -35,8 +35,9 @@ typedef struct {
 
     time_t           session_timeout;
 
-    ngx_str_t        certificate;
-    ngx_str_t        certificate_key;
+    ngx_array_t     *certificates;
+    ngx_array_t     *certificate_keys;
+
     ngx_str_t        dhparam;
     ngx_str_t        ecdh_curve;
     ngx_str_t        client_certificate;
diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c
index d23508e..454cfdc 100644
--- a/src/os/unix/ngx_readv_chain.c
+++ b/src/os/unix/ngx_readv_chain.c
@@ -51,6 +51,20 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
         }
     }
 
+#endif
+
+#if (NGX_HAVE_EPOLLRDHUP)
+
+    if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "readv: eof:%d, avail:%d",
+                       rev->pending_eof, rev->available);
+
+        if (!rev->available && !rev->pending_eof) {
+            return NGX_AGAIN;
+        }
+    }
+
 #endif
 
     prev = NULL;
@@ -149,6 +163,24 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
                 return n;
             }
 
+#endif
+
+#if (NGX_HAVE_EPOLLRDHUP)
+
+            if ((ngx_event_flags & NGX_USE_EPOLL_EVENT)
+                && ngx_use_epoll_rdhup)
+            {
+                if (n < size) {
+                    if (!rev->pending_eof) {
+                        rev->ready = 0;
+                    }
+
+                    rev->available = 0;
+                }
+
+                return n;
+            }
+
 #endif
 
             if (n < size && !(ngx_event_flags & NGX_USE_GREEDY_EVENT)) {
diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index 5013ae3..c85fd45 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -48,6 +48,21 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
         }
     }
 
+#endif
+
+#if (NGX_HAVE_EPOLLRDHUP)
+
+    if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "recv: eof:%d, avail:%d",
+                       rev->pending_eof, rev->available);
+
+        if (!rev->available && !rev->pending_eof) {
+            rev->ready = 0;
+            return NGX_AGAIN;
+        }
+    }
+
 #endif
 
     do {
@@ -99,6 +114,24 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
                 return n;
             }
 
+#endif
+
+#if (NGX_HAVE_EPOLLRDHUP)
+
+            if ((ngx_event_flags & NGX_USE_EPOLL_EVENT)
+                && ngx_use_epoll_rdhup)
+            {
+                if ((size_t) n < size) {
+                    if (!rev->pending_eof) {
+                        rev->ready = 0;
+                    }
+
+                    rev->available = 0;
+                }
+
+                return n;
+            }
+
 #endif
 
             if ((size_t) n < size
diff --git a/src/os/unix/ngx_thread_mutex.c b/src/os/unix/ngx_thread_mutex.c
index 6e8385e..a0ef693 100644
--- a/src/os/unix/ngx_thread_mutex.c
+++ b/src/os/unix/ngx_thread_mutex.c
@@ -49,7 +49,7 @@
  *             for each mutex from 10 to 100 based on spin count taken
  *             previously.
  *   FreeBSD:  Deadlock detection.  The default spin count is 2000.
- *             It can be overriden using LIBPTHREAD_SPINLOOPS environment
+ *             It can be overridden using LIBPTHREAD_SPINLOOPS environment
  *             variable or by pthread_mutex_setspinloops_np().  If a lock
  *             is still busy, sched_yield() can be called on both UP and
  *             SMP systems.  The default yield loop count is zero, but
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index 3bd8f6d..c195171 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -143,11 +143,26 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
 
-    /* parse inside the stream{} block */
-
     pcf = *cf;
     cf->ctx = ctx;
 
+    for (m = 0; cf->cycle->modules[m]; m++) {
+        if (cf->cycle->modules[m]->type != NGX_STREAM_MODULE) {
+            continue;
+        }
+
+        module = cf->cycle->modules[m]->ctx;
+
+        if (module->preconfiguration) {
+            if (module->preconfiguration(cf) != NGX_OK) {
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+
+    /* parse inside the stream{} block */
+
     cf->module_type = NGX_STREAM_MODULE;
     cf->cmd_type = NGX_STREAM_MAIN_CONF;
     rv = ngx_conf_parse(cf, NULL);
@@ -215,6 +230,10 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
     }
 
+    if (ngx_stream_variables_init_vars(cf) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     *cf = pcf;
 
 
@@ -243,35 +262,11 @@ ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     in_port_t                p;
     ngx_uint_t               i;
     struct sockaddr         *sa;
-    struct sockaddr_in      *sin;
     ngx_stream_conf_port_t  *port;
     ngx_stream_conf_addr_t  *addr;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6     *sin6;
-#endif
 
-    sa = &listen->u.sockaddr;
-
-    switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = &listen->u.sockaddr_in6;
-        p = sin6->sin6_port;
-        break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        p = 0;
-        break;
-#endif
-
-    default: /* AF_INET */
-        sin = &listen->u.sockaddr_in;
-        p = sin->sin_port;
-        break;
-    }
+    sa = &listen->sockaddr.sockaddr;
+    p = ngx_inet_get_port(sa);
 
     port = ports->elts;
     for (i = 0; i < ports->nelts; i++) {
@@ -359,7 +354,7 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
                 continue;
             }
 
-            ls = ngx_create_listening(cf, &addr[i].opt.u.sockaddr,
+            ls = ngx_create_listening(cf, &addr[i].opt.sockaddr.sockaddr,
                                       addr[i].opt.socklen);
             if (ls == NULL) {
                 return NGX_CONF_ERROR;
@@ -453,7 +448,7 @@ ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
 
     for (i = 0; i < stport->naddrs; i++) {
 
-        sin = &addr[i].opt.u.sockaddr_in;
+        sin = &addr[i].opt.sockaddr.sockaddr_in;
         addrs[i].addr = sin->sin_addr.s_addr;
 
         addrs[i].conf.ctx = addr[i].opt.ctx;
@@ -461,8 +456,8 @@ ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
         addrs[i].conf.ssl = addr[i].opt.ssl;
 #endif
 
-        len = ngx_sock_ntop(&addr[i].opt.u.sockaddr, addr[i].opt.socklen, buf,
-                            NGX_SOCKADDR_STRLEN, 1);
+        len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
+                            buf, NGX_SOCKADDR_STRLEN, 1);
 
         p = ngx_pnalloc(cf->pool, len);
         if (p == NULL) {
@@ -502,7 +497,7 @@ ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
 
     for (i = 0; i < stport->naddrs; i++) {
 
-        sin6 = &addr[i].opt.u.sockaddr_in6;
+        sin6 = &addr[i].opt.sockaddr.sockaddr_in6;
         addrs6[i].addr6 = sin6->sin6_addr;
 
         addrs6[i].conf.ctx = addr[i].opt.ctx;
@@ -510,8 +505,8 @@ ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
         addrs6[i].conf.ssl = addr[i].opt.ssl;
 #endif
 
-        len = ngx_sock_ntop(&addr[i].opt.u.sockaddr, addr[i].opt.socklen, buf,
-                            NGX_SOCKADDR_STRLEN, 1);
+        len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
+                            buf, NGX_SOCKADDR_STRLEN, 1);
 
         p = ngx_pnalloc(cf->pool, len);
         if (p == NULL) {
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 49efa45..807ab5b 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -20,75 +20,66 @@
 typedef struct ngx_stream_session_s  ngx_stream_session_t;
 
 
+#include <ngx_stream_variables.h>
+#include <ngx_stream_script.h>
 #include <ngx_stream_upstream.h>
 #include <ngx_stream_upstream_round_robin.h>
 
 
 typedef struct {
-    void                  **main_conf;
-    void                  **srv_conf;
+    void                         **main_conf;
+    void                         **srv_conf;
 } ngx_stream_conf_ctx_t;
 
 
 typedef struct {
-    union {
-        struct sockaddr     sockaddr;
-        struct sockaddr_in  sockaddr_in;
-#if (NGX_HAVE_INET6)
-        struct sockaddr_in6 sockaddr_in6;
-#endif
-#if (NGX_HAVE_UNIX_DOMAIN)
-        struct sockaddr_un  sockaddr_un;
-#endif
-        u_char              sockaddr_data[NGX_SOCKADDRLEN];
-    } u;
-
-    socklen_t               socklen;
+    ngx_sockaddr_t                 sockaddr;
+    socklen_t                      socklen;
 
     /* server ctx */
-    ngx_stream_conf_ctx_t  *ctx;
+    ngx_stream_conf_ctx_t         *ctx;
 
-    unsigned                bind:1;
-    unsigned                wildcard:1;
+    unsigned                       bind:1;
+    unsigned                       wildcard:1;
 #if (NGX_STREAM_SSL)
-    unsigned                ssl:1;
+    unsigned                       ssl:1;
 #endif
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-    unsigned                ipv6only:1;
+    unsigned                       ipv6only:1;
 #endif
 #if (NGX_HAVE_REUSEPORT)
-    unsigned                reuseport:1;
+    unsigned                       reuseport:1;
 #endif
-    unsigned                so_keepalive:2;
+    unsigned                       so_keepalive:2;
 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
-    int                     tcp_keepidle;
-    int                     tcp_keepintvl;
-    int                     tcp_keepcnt;
+    int                            tcp_keepidle;
+    int                            tcp_keepintvl;
+    int                            tcp_keepcnt;
 #endif
-    int                     backlog;
-    int                     type;
+    int                            backlog;
+    int                            type;
 } ngx_stream_listen_t;
 
 
 typedef struct {
-    ngx_stream_conf_ctx_t  *ctx;
-    ngx_str_t               addr_text;
+    ngx_stream_conf_ctx_t         *ctx;
+    ngx_str_t                      addr_text;
 #if (NGX_STREAM_SSL)
-    ngx_uint_t              ssl;    /* unsigned   ssl:1; */
+    ngx_uint_t                     ssl;    /* unsigned   ssl:1; */
 #endif
 } ngx_stream_addr_conf_t;
 
 typedef struct {
-    in_addr_t               addr;
-    ngx_stream_addr_conf_t  conf;
+    in_addr_t                      addr;
+    ngx_stream_addr_conf_t         conf;
 } ngx_stream_in_addr_t;
 
 
 #if (NGX_HAVE_INET6)
 
 typedef struct {
-    struct in6_addr         addr6;
-    ngx_stream_addr_conf_t  conf;
+    struct in6_addr                addr6;
+    ngx_stream_addr_conf_t         conf;
 } ngx_stream_in6_addr_t;
 
 #endif
@@ -96,21 +87,21 @@ typedef struct {
 
 typedef struct {
     /* ngx_stream_in_addr_t or ngx_stream_in6_addr_t */
-    void                   *addrs;
-    ngx_uint_t              naddrs;
+    void                          *addrs;
+    ngx_uint_t                     naddrs;
 } ngx_stream_port_t;
 
 
 typedef struct {
-    int                     family;
-    int                     type;
-    in_port_t               port;
-    ngx_array_t             addrs;       /* array of ngx_stream_conf_addr_t */
+    int                            family;
+    int                            type;
+    in_port_t                      port;
+    ngx_array_t                    addrs; /* array of ngx_stream_conf_addr_t */
 } ngx_stream_conf_port_t;
 
 
 typedef struct {
-    ngx_stream_listen_t     opt;
+    ngx_stream_listen_t            opt;
 } ngx_stream_conf_addr_t;
 
 
@@ -118,10 +109,21 @@ typedef ngx_int_t (*ngx_stream_access_pt)(ngx_stream_session_t *s);
 
 
 typedef struct {
-    ngx_array_t             servers;     /* ngx_stream_core_srv_conf_t */
-    ngx_array_t             listen;      /* ngx_stream_listen_t */
-    ngx_stream_access_pt    limit_conn_handler;
-    ngx_stream_access_pt    access_handler;
+    ngx_array_t                    servers;     /* ngx_stream_core_srv_conf_t */
+    ngx_array_t                    listen;      /* ngx_stream_listen_t */
+
+    ngx_stream_access_pt           limit_conn_handler;
+    ngx_stream_access_pt           access_handler;
+
+    ngx_hash_t                     variables_hash;
+
+    ngx_array_t                    variables;   /* ngx_stream_variable_t */
+    ngx_uint_t                     ncaptures;
+
+    ngx_uint_t                     variables_hash_max_size;
+    ngx_uint_t                     variables_hash_bucket_size;
+
+    ngx_hash_keys_arrays_t        *variables_keys;
 } ngx_stream_core_main_conf_t;
 
 
@@ -129,41 +131,57 @@ typedef void (*ngx_stream_handler_pt)(ngx_stream_session_t *s);
 
 
 typedef struct {
-    ngx_stream_handler_pt   handler;
-    ngx_stream_conf_ctx_t  *ctx;
-    u_char                 *file_name;
-    ngx_int_t               line;
-    ngx_log_t              *error_log;
-    ngx_flag_t              tcp_nodelay;
+    ngx_stream_handler_pt          handler;
+
+    ngx_stream_conf_ctx_t         *ctx;
+
+    u_char                        *file_name;
+    ngx_int_t                      line;
+
+    ngx_flag_t                     tcp_nodelay;
+
+    ngx_log_t                     *error_log;
+
+    ngx_msec_t                     resolver_timeout;
+    ngx_resolver_t                *resolver;
 } ngx_stream_core_srv_conf_t;
 
 
 struct ngx_stream_session_s {
-    uint32_t                signature;         /* "STRM" */
+    uint32_t                       signature;         /* "STRM" */
 
-    ngx_connection_t       *connection;
+    ngx_connection_t              *connection;
 
-    off_t                   received;
+    off_t                          received;
 
-    ngx_log_handler_pt      log_handler;
+    ngx_log_handler_pt             log_handler;
 
-    void                  **ctx;
-    void                  **main_conf;
-    void                  **srv_conf;
+    void                         **ctx;
+    void                         **main_conf;
+    void                         **srv_conf;
 
-    ngx_stream_upstream_t  *upstream;
+    ngx_stream_upstream_t         *upstream;
+
+    ngx_stream_variable_value_t   *variables;
+
+#if (NGX_PCRE)
+    ngx_uint_t                     ncaptures;
+    int                           *captures;
+    u_char                        *captures_data;
+#endif
 };
 
 
 typedef struct {
-    ngx_int_t             (*postconfiguration)(ngx_conf_t *cf);
+    ngx_int_t                    (*preconfiguration)(ngx_conf_t *cf);
+    ngx_int_t                    (*postconfiguration)(ngx_conf_t *cf);
 
-    void                 *(*create_main_conf)(ngx_conf_t *cf);
-    char                 *(*init_main_conf)(ngx_conf_t *cf, void *conf);
+    void                        *(*create_main_conf)(ngx_conf_t *cf);
+    char                        *(*init_main_conf)(ngx_conf_t *cf, void *conf);
 
-    void                 *(*create_srv_conf)(ngx_conf_t *cf);
-    char                 *(*merge_srv_conf)(ngx_conf_t *cf, void *prev,
-                                            void *conf);
+    void                        *(*create_srv_conf)(ngx_conf_t *cf);
+    char                        *(*merge_srv_conf)(ngx_conf_t *cf, void *prev,
+                                                   void *conf);
 } ngx_stream_module_t;
 
 
diff --git a/src/stream/ngx_stream_access_module.c b/src/stream/ngx_stream_access_module.c
index 64869d2..6985d36 100644
--- a/src/stream/ngx_stream_access_module.c
+++ b/src/stream/ngx_stream_access_module.c
@@ -88,6 +88,7 @@ static ngx_command_t  ngx_stream_access_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_access_module_ctx = {
+    NULL,                                  /* preconfiguration */
     ngx_stream_access_init,                /* postconfiguration */
 
     NULL,                                  /* create main configuration */
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index ebc2b1c..70b9e2d 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -10,7 +10,9 @@
 #include <ngx_stream.h>
 
 
+static ngx_int_t ngx_stream_core_preconfiguration(ngx_conf_t *cf);
 static void *ngx_stream_core_create_main_conf(ngx_conf_t *cf);
+static char *ngx_stream_core_init_main_conf(ngx_conf_t *cf, void *conf);
 static void *ngx_stream_core_create_srv_conf(ngx_conf_t *cf);
 static char *ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent,
     void *child);
@@ -20,10 +22,26 @@ static char *ngx_stream_core_server(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static char *ngx_stream_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 
 
 static ngx_command_t  ngx_stream_core_commands[] = {
 
+    { ngx_string("variables_hash_max_size"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      offsetof(ngx_stream_core_main_conf_t, variables_hash_max_size),
+      NULL },
+
+    { ngx_string("variables_hash_bucket_size"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      offsetof(ngx_stream_core_main_conf_t, variables_hash_bucket_size),
+      NULL },
+
     { ngx_string("server"),
       NGX_STREAM_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
       ngx_stream_core_server,
@@ -45,6 +63,20 @@ static ngx_command_t  ngx_stream_core_commands[] = {
       0,
       NULL },
 
+    { ngx_string("resolver"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE,
+      ngx_stream_core_resolver,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("resolver_timeout"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_core_srv_conf_t, resolver_timeout),
+      NULL },
+
     { ngx_string("tcp_nodelay"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -57,10 +89,11 @@ static ngx_command_t  ngx_stream_core_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_core_module_ctx = {
+    ngx_stream_core_preconfiguration,      /* preconfiguration */
     NULL,                                  /* postconfiguration */
 
     ngx_stream_core_create_main_conf,      /* create main configuration */
-    NULL,                                  /* init main configuration */
+    ngx_stream_core_init_main_conf,        /* init main configuration */
 
     ngx_stream_core_create_srv_conf,       /* create server configuration */
     ngx_stream_core_merge_srv_conf         /* merge server configuration */
@@ -83,6 +116,13 @@ ngx_module_t  ngx_stream_core_module = {
 };
 
 
+static ngx_int_t
+ngx_stream_core_preconfiguration(ngx_conf_t *cf)
+{
+    return ngx_stream_variables_add_core_vars(cf);
+}
+
+
 static void *
 ngx_stream_core_create_main_conf(ngx_conf_t *cf)
 {
@@ -106,10 +146,32 @@ ngx_stream_core_create_main_conf(ngx_conf_t *cf)
         return NULL;
     }
 
+    cmcf->variables_hash_max_size = NGX_CONF_UNSET_UINT;
+    cmcf->variables_hash_bucket_size = NGX_CONF_UNSET_UINT;
+
     return cmcf;
 }
 
 
+static char *
+ngx_stream_core_init_main_conf(ngx_conf_t *cf, void *conf)
+{
+    ngx_stream_core_main_conf_t *cmcf = conf;
+
+    ngx_conf_init_uint_value(cmcf->variables_hash_max_size, 1024);
+    ngx_conf_init_uint_value(cmcf->variables_hash_bucket_size, 64);
+
+    cmcf->variables_hash_bucket_size =
+               ngx_align(cmcf->variables_hash_bucket_size, ngx_cacheline_size);
+
+    if (cmcf->ncaptures) {
+        cmcf->ncaptures = (cmcf->ncaptures + 1) * 3;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 static void *
 ngx_stream_core_create_srv_conf(ngx_conf_t *cf)
 {
@@ -129,6 +191,7 @@ ngx_stream_core_create_srv_conf(ngx_conf_t *cf)
 
     cscf->file_name = cf->conf_file->file.name.data;
     cscf->line = cf->conf_file->line;
+    cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
     cscf->tcp_nodelay = NGX_CONF_UNSET;
 
     return cscf;
@@ -141,6 +204,27 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_stream_core_srv_conf_t *prev = parent;
     ngx_stream_core_srv_conf_t *conf = child;
 
+    ngx_conf_merge_msec_value(conf->resolver_timeout,
+                              prev->resolver_timeout, 30000);
+
+    if (conf->resolver == NULL) {
+
+        if (prev->resolver == NULL) {
+
+            /*
+             * create dummy resolver in stream {} context
+             * to inherit it in all servers
+             */
+
+            prev->resolver = ngx_resolver_create(cf, NULL, 0);
+            if (prev->resolver == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        }
+
+        conf->resolver = prev->resolver;
+    }
+
     if (conf->handler == NULL) {
         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                       "no handler for server in %s:%ui",
@@ -248,18 +332,11 @@ ngx_stream_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 static char *
 ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    size_t                        len, off;
-    in_port_t                     port;
     ngx_str_t                    *value;
     ngx_url_t                     u;
     ngx_uint_t                    i, backlog;
-    struct sockaddr              *sa;
-    struct sockaddr_in           *sin;
-    ngx_stream_listen_t          *ls;
+    ngx_stream_listen_t          *ls, *als;
     ngx_stream_core_main_conf_t  *cmcf;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6          *sin6;
-#endif
 
     value = cf->args->elts;
 
@@ -280,58 +357,6 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
-    ls = cmcf->listen.elts;
-
-    for (i = 0; i < cmcf->listen.nelts; i++) {
-
-        sa = &ls[i].u.sockaddr;
-
-        if (sa->sa_family != u.family) {
-            continue;
-        }
-
-        switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            off = offsetof(struct sockaddr_in6, sin6_addr);
-            len = 16;
-            sin6 = &ls[i].u.sockaddr_in6;
-            port = sin6->sin6_port;
-            break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-        case AF_UNIX:
-            off = offsetof(struct sockaddr_un, sun_path);
-            len = sizeof(((struct sockaddr_un *) sa)->sun_path);
-            port = 0;
-            break;
-#endif
-
-        default: /* AF_INET */
-            off = offsetof(struct sockaddr_in, sin_addr);
-            len = 4;
-            sin = &ls[i].u.sockaddr_in;
-            port = sin->sin_port;
-            break;
-        }
-
-        if (ngx_memcmp(ls[i].u.sockaddr_data + off, u.sockaddr + off, len)
-            != 0)
-        {
-            continue;
-        }
-
-        if (port != u.port) {
-            continue;
-        }
-
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "duplicate \"%V\" address and port pair", &u.url);
-        return NGX_CONF_ERROR;
-    }
-
     ls = ngx_array_push(&cmcf->listen);
     if (ls == NULL) {
         return NGX_CONF_ERROR;
@@ -339,7 +364,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_memzero(ls, sizeof(ngx_stream_listen_t));
 
-    ngx_memcpy(&ls->u.sockaddr, u.sockaddr, u.socklen);
+    ngx_memcpy(&ls->sockaddr.sockaddr, &u.sockaddr, u.socklen);
 
     ls->socklen = u.socklen;
     ls->backlog = NGX_LISTEN_BACKLOG;
@@ -384,11 +409,10 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+            size_t  len;
             u_char  buf[NGX_SOCKADDR_STRLEN];
 
-            sa = &ls->u.sockaddr;
-
-            if (sa->sa_family == AF_INET6) {
+            if (ls->sockaddr.sockaddr.sa_family == AF_INET6) {
 
                 if (ngx_strcmp(&value[i].data[10], "n") == 0) {
                     ls->ipv6only = 1;
@@ -406,7 +430,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 ls->bind = 1;
 
             } else {
-                len = ngx_sock_ntop(sa, ls->socklen, buf,
+                len = ngx_sock_ntop(&ls->sockaddr.sockaddr, ls->socklen, buf,
                                     NGX_SOCKADDR_STRLEN, 1);
 
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -558,5 +582,46 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
     }
 
+    als = cmcf->listen.elts;
+
+    for (i = 0; i < cmcf->listen.nelts - 1; i++) {
+        if (ls->type != als[i].type) {
+            continue;
+        }
+
+        if (ngx_cmp_sockaddr(&als[i].sockaddr.sockaddr, als[i].socklen,
+                             &ls->sockaddr.sockaddr, ls->socklen, 1)
+            != NGX_OK)
+        {
+            continue;
+        }
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "duplicate \"%V\" address and port pair", &u.url);
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_stream_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_core_srv_conf_t  *cscf = conf;
+
+    ngx_str_t  *value;
+
+    if (cscf->resolver) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    cscf->resolver = ngx_resolver_create(cf, &value[1], cf->args->nelts - 1);
+    if (cscf->resolver == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
     return NGX_CONF_OK;
 }
diff --git a/src/stream/ngx_stream_geo_module.c b/src/stream/ngx_stream_geo_module.c
new file mode 100644
index 0000000..ed1a488
--- /dev/null
+++ b/src/stream/ngx_stream_geo_module.c
@@ -0,0 +1,1572 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    ngx_stream_variable_value_t       *value;
+    u_short                            start;
+    u_short                            end;
+} ngx_stream_geo_range_t;
+
+
+typedef struct {
+    ngx_radix_tree_t                  *tree;
+#if (NGX_HAVE_INET6)
+    ngx_radix_tree_t                  *tree6;
+#endif
+} ngx_stream_geo_trees_t;
+
+
+typedef struct {
+    ngx_stream_geo_range_t           **low;
+    ngx_stream_variable_value_t       *default_value;
+} ngx_stream_geo_high_ranges_t;
+
+
+typedef struct {
+    ngx_str_node_t                     sn;
+    ngx_stream_variable_value_t       *value;
+    size_t                             offset;
+} ngx_stream_geo_variable_value_node_t;
+
+
+typedef struct {
+    ngx_stream_variable_value_t       *value;
+    ngx_str_t                         *net;
+    ngx_stream_geo_high_ranges_t       high;
+    ngx_radix_tree_t                  *tree;
+#if (NGX_HAVE_INET6)
+    ngx_radix_tree_t                  *tree6;
+#endif
+    ngx_rbtree_t                       rbtree;
+    ngx_rbtree_node_t                  sentinel;
+    ngx_pool_t                        *pool;
+    ngx_pool_t                        *temp_pool;
+
+    size_t                             data_size;
+
+    ngx_str_t                          include_name;
+    ngx_uint_t                         includes;
+    ngx_uint_t                         entries;
+
+    unsigned                           ranges:1;
+    unsigned                           outside_entries:1;
+    unsigned                           allow_binary_include:1;
+    unsigned                           binary_include:1;
+} ngx_stream_geo_conf_ctx_t;
+
+
+typedef struct {
+    union {
+        ngx_stream_geo_trees_t         trees;
+        ngx_stream_geo_high_ranges_t   high;
+    } u;
+
+    ngx_int_t                          index;
+} ngx_stream_geo_ctx_t;
+
+
+static ngx_int_t ngx_stream_geo_addr(ngx_stream_session_t *s,
+    ngx_stream_geo_ctx_t *ctx, ngx_addr_t *addr);
+
+static char *ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_geo(ngx_conf_t *cf, ngx_command_t *dummy, void *conf);
+static char *ngx_stream_geo_range(ngx_conf_t *cf,
+    ngx_stream_geo_conf_ctx_t *ctx, ngx_str_t *value);
+static char *ngx_stream_geo_add_range(ngx_conf_t *cf,
+    ngx_stream_geo_conf_ctx_t *ctx, in_addr_t start, in_addr_t end);
+static ngx_uint_t ngx_stream_geo_delete_range(ngx_conf_t *cf,
+    ngx_stream_geo_conf_ctx_t *ctx, in_addr_t start, in_addr_t end);
+static char *ngx_stream_geo_cidr(ngx_conf_t *cf,
+    ngx_stream_geo_conf_ctx_t *ctx, ngx_str_t *value);
+static char *ngx_stream_geo_cidr_add(ngx_conf_t *cf,
+    ngx_stream_geo_conf_ctx_t *ctx, ngx_cidr_t *cidr, ngx_str_t *value,
+    ngx_str_t *net);
+static ngx_stream_variable_value_t *ngx_stream_geo_value(ngx_conf_t *cf,
+    ngx_stream_geo_conf_ctx_t *ctx, ngx_str_t *value);
+static ngx_int_t ngx_stream_geo_cidr_value(ngx_conf_t *cf, ngx_str_t *net,
+    ngx_cidr_t *cidr);
+static char *ngx_stream_geo_include(ngx_conf_t *cf,
+    ngx_stream_geo_conf_ctx_t *ctx, ngx_str_t *name);
+static ngx_int_t ngx_stream_geo_include_binary_base(ngx_conf_t *cf,
+    ngx_stream_geo_conf_ctx_t *ctx, ngx_str_t *name);
+static void ngx_stream_geo_create_binary_base(ngx_stream_geo_conf_ctx_t *ctx);
+static u_char *ngx_stream_geo_copy_values(u_char *base, u_char *p,
+    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
+
+
+static ngx_command_t  ngx_stream_geo_commands[] = {
+
+    { ngx_string("geo"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12,
+      ngx_stream_geo_block,
+      0,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_geo_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_geo_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_geo_module_ctx,            /* module context */
+    ngx_stream_geo_commands,               /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+typedef struct {
+    u_char    GEORNG[6];
+    u_char    version;
+    u_char    ptr_size;
+    uint32_t  endianness;
+    uint32_t  crc32;
+} ngx_stream_geo_header_t;
+
+
+static ngx_stream_geo_header_t  ngx_stream_geo_header = {
+    { 'G', 'E', 'O', 'R', 'N', 'G' }, 0, sizeof(void *), 0x12345678, 0
+};
+
+
+/* geo range is AF_INET only */
+
+static ngx_int_t
+ngx_stream_geo_cidr_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_stream_geo_ctx_t *ctx = (ngx_stream_geo_ctx_t *) data;
+
+    in_addr_t                     inaddr;
+    ngx_addr_t                    addr;
+    struct sockaddr_in           *sin;
+    ngx_stream_variable_value_t  *vv;
+#if (NGX_HAVE_INET6)
+    u_char                       *p;
+    struct in6_addr              *inaddr6;
+#endif
+
+    if (ngx_stream_geo_addr(s, ctx, &addr) != NGX_OK) {
+        vv = (ngx_stream_variable_value_t *)
+                  ngx_radix32tree_find(ctx->u.trees.tree, INADDR_NONE);
+        goto done;
+    }
+
+    switch (addr.sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        inaddr6 = &((struct sockaddr_in6 *) addr.sockaddr)->sin6_addr;
+        p = inaddr6->s6_addr;
+
+        if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
+            inaddr = p[12] << 24;
+            inaddr += p[13] << 16;
+            inaddr += p[14] << 8;
+            inaddr += p[15];
+
+            vv = (ngx_stream_variable_value_t *)
+                      ngx_radix32tree_find(ctx->u.trees.tree, inaddr);
+
+        } else {
+            vv = (ngx_stream_variable_value_t *)
+                      ngx_radix128tree_find(ctx->u.trees.tree6, p);
+        }
+
+        break;
+#endif
+
+    default: /* AF_INET */
+        sin = (struct sockaddr_in *) addr.sockaddr;
+        inaddr = ntohl(sin->sin_addr.s_addr);
+
+        vv = (ngx_stream_variable_value_t *)
+                  ngx_radix32tree_find(ctx->u.trees.tree, inaddr);
+
+        break;
+    }
+
+done:
+
+    *v = *vv;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "stream geo: %v", v);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geo_range_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_stream_geo_ctx_t *ctx = (ngx_stream_geo_ctx_t *) data;
+
+    in_addr_t                inaddr;
+    ngx_addr_t               addr;
+    ngx_uint_t               n;
+    struct sockaddr_in      *sin;
+    ngx_stream_geo_range_t  *range;
+#if (NGX_HAVE_INET6)
+    u_char                  *p;
+    struct in6_addr         *inaddr6;
+#endif
+
+    *v = *ctx->u.high.default_value;
+
+    if (ngx_stream_geo_addr(s, ctx, &addr) == NGX_OK) {
+
+        switch (addr.sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            inaddr6 = &((struct sockaddr_in6 *) addr.sockaddr)->sin6_addr;
+
+            if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
+                p = inaddr6->s6_addr;
+
+                inaddr = p[12] << 24;
+                inaddr += p[13] << 16;
+                inaddr += p[14] << 8;
+                inaddr += p[15];
+
+            } else {
+                inaddr = INADDR_NONE;
+            }
+
+            break;
+#endif
+
+        default: /* AF_INET */
+            sin = (struct sockaddr_in *) addr.sockaddr;
+            inaddr = ntohl(sin->sin_addr.s_addr);
+            break;
+        }
+
+    } else {
+        inaddr = INADDR_NONE;
+    }
+
+    if (ctx->u.high.low) {
+        range = ctx->u.high.low[inaddr >> 16];
+
+        if (range) {
+            n = inaddr & 0xffff;
+            do {
+                if (n >= (ngx_uint_t) range->start
+                    && n <= (ngx_uint_t) range->end)
+                {
+                    *v = *range->value;
+                    break;
+                }
+            } while ((++range)->value);
+        }
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "stream geo: %v", v);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geo_addr(ngx_stream_session_t *s, ngx_stream_geo_ctx_t *ctx,
+    ngx_addr_t *addr)
+{
+    ngx_stream_variable_value_t  *v;
+
+    if (ctx->index == -1) {
+        ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                       "stream geo started: %V", &s->connection->addr_text);
+
+        addr->sockaddr = s->connection->sockaddr;
+        addr->socklen = s->connection->socklen;
+        /* addr->name = s->connection->addr_text; */
+
+        return NGX_OK;
+    }
+
+    v = ngx_stream_get_flushed_variable(s, ctx->index);
+
+    if (v == NULL || v->not_found) {
+        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                       "stream geo not found");
+
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "stream geo started: %v", v);
+
+    if (ngx_parse_addr(s->connection->pool, addr, v->data, v->len) == NGX_OK) {
+        return NGX_OK;
+    }
+
+    return NGX_ERROR;
+}
+
+
+static char *
+ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char                         *rv;
+    size_t                        len;
+    ngx_str_t                    *value, name;
+    ngx_uint_t                    i;
+    ngx_conf_t                    save;
+    ngx_pool_t                   *pool;
+    ngx_array_t                  *a;
+    ngx_stream_variable_t        *var;
+    ngx_stream_geo_ctx_t         *geo;
+    ngx_stream_geo_conf_ctx_t     ctx;
+#if (NGX_HAVE_INET6)
+    static struct in6_addr        zero;
+#endif
+
+    value = cf->args->elts;
+
+    geo = ngx_palloc(cf->pool, sizeof(ngx_stream_geo_ctx_t));
+    if (geo == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    name = value[1];
+
+    if (name.data[0] != '$') {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"%V\"", &name);
+        return NGX_CONF_ERROR;
+    }
+
+    name.len--;
+    name.data++;
+
+    if (cf->args->nelts == 3) {
+
+        geo->index = ngx_stream_get_variable_index(cf, &name);
+        if (geo->index == NGX_ERROR) {
+            return NGX_CONF_ERROR;
+        }
+
+        name = value[2];
+
+        if (name.data[0] != '$') {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid variable name \"%V\"", &name);
+            return NGX_CONF_ERROR;
+        }
+
+        name.len--;
+        name.data++;
+
+    } else {
+        geo->index = -1;
+    }
+
+    var = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log);
+    if (pool == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(&ctx, sizeof(ngx_stream_geo_conf_ctx_t));
+
+    ctx.temp_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log);
+    if (ctx.temp_pool == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_rbtree_init(&ctx.rbtree, &ctx.sentinel, ngx_str_rbtree_insert_value);
+
+    ctx.pool = cf->pool;
+    ctx.data_size = sizeof(ngx_stream_geo_header_t)
+                  + sizeof(ngx_stream_variable_value_t)
+                  + 0x10000 * sizeof(ngx_stream_geo_range_t *);
+    ctx.allow_binary_include = 1;
+
+    save = *cf;
+    cf->pool = pool;
+    cf->ctx = &ctx;
+    cf->handler = ngx_stream_geo;
+    cf->handler_conf = conf;
+
+    rv = ngx_conf_parse(cf, NULL);
+
+    *cf = save;
+
+    if (ctx.ranges) {
+
+        if (ctx.high.low && !ctx.binary_include) {
+            for (i = 0; i < 0x10000; i++) {
+                a = (ngx_array_t *) ctx.high.low[i];
+
+                if (a == NULL || a->nelts == 0) {
+                    continue;
+                }
+
+                len = a->nelts * sizeof(ngx_stream_geo_range_t);
+
+                ctx.high.low[i] = ngx_palloc(cf->pool, len + sizeof(void *));
+                if (ctx.high.low[i] == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+
+                ngx_memcpy(ctx.high.low[i], a->elts, len);
+                ctx.high.low[i][a->nelts].value = NULL;
+                ctx.data_size += len + sizeof(void *);
+            }
+
+            if (ctx.allow_binary_include
+                && !ctx.outside_entries
+                && ctx.entries > 100000
+                && ctx.includes == 1)
+            {
+                ngx_stream_geo_create_binary_base(&ctx);
+            }
+        }
+
+        if (ctx.high.default_value == NULL) {
+            ctx.high.default_value = &ngx_stream_variable_null_value;
+        }
+
+        geo->u.high = ctx.high;
+
+        var->get_handler = ngx_stream_geo_range_variable;
+        var->data = (uintptr_t) geo;
+
+        ngx_destroy_pool(ctx.temp_pool);
+        ngx_destroy_pool(pool);
+
+    } else {
+        if (ctx.tree == NULL) {
+            ctx.tree = ngx_radix_tree_create(cf->pool, -1);
+            if (ctx.tree == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        }
+
+        geo->u.trees.tree = ctx.tree;
+
+#if (NGX_HAVE_INET6)
+        if (ctx.tree6 == NULL) {
+            ctx.tree6 = ngx_radix_tree_create(cf->pool, -1);
+            if (ctx.tree6 == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        }
+
+        geo->u.trees.tree6 = ctx.tree6;
+#endif
+
+        var->get_handler = ngx_stream_geo_cidr_variable;
+        var->data = (uintptr_t) geo;
+
+        ngx_destroy_pool(ctx.temp_pool);
+        ngx_destroy_pool(pool);
+
+        if (ngx_radix32tree_insert(ctx.tree, 0, 0,
+                                   (uintptr_t) &ngx_stream_variable_null_value)
+            == NGX_ERROR)
+        {
+            return NGX_CONF_ERROR;
+        }
+
+        /* NGX_BUSY is okay (default was set explicitly) */
+
+#if (NGX_HAVE_INET6)
+        if (ngx_radix128tree_insert(ctx.tree6, zero.s6_addr, zero.s6_addr,
+                                    (uintptr_t) &ngx_stream_variable_null_value)
+            == NGX_ERROR)
+        {
+            return NGX_CONF_ERROR;
+        }
+#endif
+    }
+
+    return rv;
+}
+
+
+static char *
+ngx_stream_geo(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    char                       *rv;
+    ngx_str_t                  *value;
+    ngx_stream_geo_conf_ctx_t  *ctx;
+
+    ctx = cf->ctx;
+
+    value = cf->args->elts;
+
+    if (cf->args->nelts == 1) {
+
+        if (ngx_strcmp(value[0].data, "ranges") == 0) {
+
+            if (ctx->tree
+#if (NGX_HAVE_INET6)
+                || ctx->tree6
+#endif
+               )
+            {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "the \"ranges\" directive must be "
+                                   "the first directive inside \"geo\" block");
+                goto failed;
+            }
+
+            ctx->ranges = 1;
+
+            rv = NGX_CONF_OK;
+
+            goto done;
+        }
+    }
+
+    if (cf->args->nelts != 2) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid number of the geo parameters");
+        goto failed;
+    }
+
+    if (ngx_strcmp(value[0].data, "include") == 0) {
+
+        rv = ngx_stream_geo_include(cf, ctx, &value[1]);
+
+        goto done;
+    }
+
+    if (ctx->ranges) {
+        rv = ngx_stream_geo_range(cf, ctx, value);
+
+    } else {
+        rv = ngx_stream_geo_cidr(cf, ctx, value);
+    }
+
+done:
+
+    ngx_reset_pool(cf->pool);
+
+    return rv;
+
+failed:
+
+    ngx_reset_pool(cf->pool);
+
+    return NGX_CONF_ERROR;
+}
+
+
+static char *
+ngx_stream_geo_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
+    ngx_str_t *value)
+{
+    u_char      *p, *last;
+    in_addr_t    start, end;
+    ngx_str_t   *net;
+    ngx_uint_t   del;
+
+    if (ngx_strcmp(value[0].data, "default") == 0) {
+
+        if (ctx->high.default_value) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                "duplicate default geo range value: \"%V\", old value: \"%v\"",
+                &value[1], ctx->high.default_value);
+        }
+
+        ctx->high.default_value = ngx_stream_geo_value(cf, ctx, &value[1]);
+        if (ctx->high.default_value == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        return NGX_CONF_OK;
+    }
+
+    if (ctx->binary_include) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "binary geo range base \"%s\" cannot be mixed with usual entries",
+            ctx->include_name.data);
+        return NGX_CONF_ERROR;
+    }
+
+    if (ctx->high.low == NULL) {
+        ctx->high.low = ngx_pcalloc(ctx->pool,
+                                    0x10000 * sizeof(ngx_stream_geo_range_t *));
+        if (ctx->high.low == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    ctx->entries++;
+    ctx->outside_entries = 1;
+
+    if (ngx_strcmp(value[0].data, "delete") == 0) {
+        net = &value[1];
+        del = 1;
+
+    } else {
+        net = &value[0];
+        del = 0;
+    }
+
+    last = net->data + net->len;
+
+    p = ngx_strlchr(net->data, last, '-');
+
+    if (p == NULL) {
+        goto invalid;
+    }
+
+    start = ngx_inet_addr(net->data, p - net->data);
+
+    if (start == INADDR_NONE) {
+        goto invalid;
+    }
+
+    start = ntohl(start);
+
+    p++;
+
+    end = ngx_inet_addr(p, last - p);
+
+    if (end == INADDR_NONE) {
+        goto invalid;
+    }
+
+    end = ntohl(end);
+
+    if (start > end) {
+        goto invalid;
+    }
+
+    if (del) {
+        if (ngx_stream_geo_delete_range(cf, ctx, start, end)) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "no address range \"%V\" to delete", net);
+        }
+
+        return NGX_CONF_OK;
+    }
+
+    ctx->value = ngx_stream_geo_value(cf, ctx, &value[1]);
+
+    if (ctx->value == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ctx->net = net;
+
+    return ngx_stream_geo_add_range(cf, ctx, start, end);
+
+invalid:
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid range \"%V\"", net);
+
+    return NGX_CONF_ERROR;
+}
+
+
+/* the add procedure is optimized to add a growing up sequence */
+
+static char *
+ngx_stream_geo_add_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
+    in_addr_t start, in_addr_t end)
+{
+    in_addr_t                n;
+    ngx_uint_t               h, i, s, e;
+    ngx_array_t             *a;
+    ngx_stream_geo_range_t  *range;
+
+    for (n = start; n <= end; n = (n + 0x10000) & 0xffff0000) {
+
+        h = n >> 16;
+
+        if (n == start) {
+            s = n & 0xffff;
+        } else {
+            s = 0;
+        }
+
+        if ((n | 0xffff) > end) {
+            e = end & 0xffff;
+
+        } else {
+            e = 0xffff;
+        }
+
+        a = (ngx_array_t *) ctx->high.low[h];
+
+        if (a == NULL) {
+            a = ngx_array_create(ctx->temp_pool, 64,
+                                 sizeof(ngx_stream_geo_range_t));
+            if (a == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            ctx->high.low[h] = (ngx_stream_geo_range_t *) a;
+        }
+
+        i = a->nelts;
+        range = a->elts;
+
+        while (i) {
+
+            i--;
+
+            if (e < (ngx_uint_t) range[i].start) {
+                continue;
+            }
+
+            if (s > (ngx_uint_t) range[i].end) {
+
+                /* add after the range */
+
+                range = ngx_array_push(a);
+                if (range == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+
+                range = a->elts;
+
+                ngx_memmove(&range[i + 2], &range[i + 1],
+                           (a->nelts - 2 - i) * sizeof(ngx_stream_geo_range_t));
+
+                range[i + 1].start = (u_short) s;
+                range[i + 1].end = (u_short) e;
+                range[i + 1].value = ctx->value;
+
+                goto next;
+            }
+
+            if (s == (ngx_uint_t) range[i].start
+                && e == (ngx_uint_t) range[i].end)
+            {
+                ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                    "duplicate range \"%V\", value: \"%v\", old value: \"%v\"",
+                    ctx->net, ctx->value, range[i].value);
+
+                range[i].value = ctx->value;
+
+                goto next;
+            }
+
+            if (s > (ngx_uint_t) range[i].start
+                && e < (ngx_uint_t) range[i].end)
+            {
+                /* split the range and insert the new one */
+
+                range = ngx_array_push(a);
+                if (range == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+
+                range = ngx_array_push(a);
+                if (range == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+
+                range = a->elts;
+
+                ngx_memmove(&range[i + 3], &range[i + 1],
+                           (a->nelts - 3 - i) * sizeof(ngx_stream_geo_range_t));
+
+                range[i + 2].start = (u_short) (e + 1);
+                range[i + 2].end = range[i].end;
+                range[i + 2].value = range[i].value;
+
+                range[i + 1].start = (u_short) s;
+                range[i + 1].end = (u_short) e;
+                range[i + 1].value = ctx->value;
+
+                range[i].end = (u_short) (s - 1);
+
+                goto next;
+            }
+
+            if (s == (ngx_uint_t) range[i].start
+                && e < (ngx_uint_t) range[i].end)
+            {
+                /* shift the range start and insert the new range */
+
+                range = ngx_array_push(a);
+                if (range == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+
+                range = a->elts;
+
+                ngx_memmove(&range[i + 1], &range[i],
+                           (a->nelts - 1 - i) * sizeof(ngx_stream_geo_range_t));
+
+                range[i + 1].start = (u_short) (e + 1);
+
+                range[i].start = (u_short) s;
+                range[i].end = (u_short) e;
+                range[i].value = ctx->value;
+
+                goto next;
+            }
+
+            if (s > (ngx_uint_t) range[i].start
+                && e == (ngx_uint_t) range[i].end)
+            {
+                /* shift the range end and insert the new range */
+
+                range = ngx_array_push(a);
+                if (range == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+
+                range = a->elts;
+
+                ngx_memmove(&range[i + 2], &range[i + 1],
+                           (a->nelts - 2 - i) * sizeof(ngx_stream_geo_range_t));
+
+                range[i + 1].start = (u_short) s;
+                range[i + 1].end = (u_short) e;
+                range[i + 1].value = ctx->value;
+
+                range[i].end = (u_short) (s - 1);
+
+                goto next;
+            }
+
+            s = (ngx_uint_t) range[i].start;
+            e = (ngx_uint_t) range[i].end;
+
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                         "range \"%V\" overlaps \"%d.%d.%d.%d-%d.%d.%d.%d\"",
+                         ctx->net,
+                         h >> 8, h & 0xff, s >> 8, s & 0xff,
+                         h >> 8, h & 0xff, e >> 8, e & 0xff);
+
+            return NGX_CONF_ERROR;
+        }
+
+        /* add the first range */
+
+        range = ngx_array_push(a);
+        if (range == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        range->start = (u_short) s;
+        range->end = (u_short) e;
+        range->value = ctx->value;
+
+    next:
+
+        continue;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_uint_t
+ngx_stream_geo_delete_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
+    in_addr_t start, in_addr_t end)
+{
+    in_addr_t                n;
+    ngx_uint_t               h, i, s, e, warn;
+    ngx_array_t             *a;
+    ngx_stream_geo_range_t  *range;
+
+    warn = 0;
+
+    for (n = start; n <= end; n += 0x10000) {
+
+        h = n >> 16;
+
+        if (n == start) {
+            s = n & 0xffff;
+        } else {
+            s = 0;
+        }
+
+        if ((n | 0xffff) > end) {
+            e = end & 0xffff;
+
+        } else {
+            e = 0xffff;
+        }
+
+        a = (ngx_array_t *) ctx->high.low[h];
+
+        if (a == NULL) {
+            warn = 1;
+            continue;
+        }
+
+        range = a->elts;
+        for (i = 0; i < a->nelts; i++) {
+
+            if (s == (ngx_uint_t) range[i].start
+                && e == (ngx_uint_t) range[i].end)
+            {
+                ngx_memmove(&range[i], &range[i + 1],
+                           (a->nelts - 1 - i) * sizeof(ngx_stream_geo_range_t));
+
+                a->nelts--;
+
+                break;
+            }
+
+            if (s != (ngx_uint_t) range[i].start
+                && e != (ngx_uint_t) range[i].end)
+            {
+                continue;
+            }
+
+            warn = 1;
+        }
+    }
+
+    return warn;
+}
+
+
+static char *
+ngx_stream_geo_cidr(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
+    ngx_str_t *value)
+{
+    char        *rv;
+    ngx_int_t    rc, del;
+    ngx_str_t   *net;
+    ngx_cidr_t   cidr;
+
+    if (ctx->tree == NULL) {
+        ctx->tree = ngx_radix_tree_create(ctx->pool, -1);
+        if (ctx->tree == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+#if (NGX_HAVE_INET6)
+    if (ctx->tree6 == NULL) {
+        ctx->tree6 = ngx_radix_tree_create(ctx->pool, -1);
+        if (ctx->tree6 == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+#endif
+
+    if (ngx_strcmp(value[0].data, "default") == 0) {
+        cidr.family = AF_INET;
+        cidr.u.in.addr = 0;
+        cidr.u.in.mask = 0;
+
+        rv = ngx_stream_geo_cidr_add(cf, ctx, &cidr, &value[1], &value[0]);
+
+        if (rv != NGX_CONF_OK) {
+            return rv;
+        }
+
+#if (NGX_HAVE_INET6)
+        cidr.family = AF_INET6;
+        ngx_memzero(&cidr.u.in6, sizeof(ngx_in6_cidr_t));
+
+        rv = ngx_stream_geo_cidr_add(cf, ctx, &cidr, &value[1], &value[0]);
+
+        if (rv != NGX_CONF_OK) {
+            return rv;
+        }
+#endif
+
+        return NGX_CONF_OK;
+    }
+
+    if (ngx_strcmp(value[0].data, "delete") == 0) {
+        net = &value[1];
+        del = 1;
+
+    } else {
+        net = &value[0];
+        del = 0;
+    }
+
+    if (ngx_stream_geo_cidr_value(cf, net, &cidr) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cidr.family == AF_INET) {
+        cidr.u.in.addr = ntohl(cidr.u.in.addr);
+        cidr.u.in.mask = ntohl(cidr.u.in.mask);
+    }
+
+    if (del) {
+        switch (cidr.family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            rc = ngx_radix128tree_delete(ctx->tree6,
+                                         cidr.u.in6.addr.s6_addr,
+                                         cidr.u.in6.mask.s6_addr);
+            break;
+#endif
+
+        default: /* AF_INET */
+            rc = ngx_radix32tree_delete(ctx->tree, cidr.u.in.addr,
+                                        cidr.u.in.mask);
+            break;
+        }
+
+        if (rc != NGX_OK) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "no network \"%V\" to delete", net);
+        }
+
+        return NGX_CONF_OK;
+    }
+
+    return ngx_stream_geo_cidr_add(cf, ctx, &cidr, &value[1], net);
+}
+
+
+static char *
+ngx_stream_geo_cidr_add(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
+    ngx_cidr_t *cidr, ngx_str_t *value, ngx_str_t *net)
+{
+    ngx_int_t                     rc;
+    ngx_stream_variable_value_t  *val, *old;
+
+    val = ngx_stream_geo_value(cf, ctx, value);
+
+    if (val == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    switch (cidr->family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        rc = ngx_radix128tree_insert(ctx->tree6, cidr->u.in6.addr.s6_addr,
+                                     cidr->u.in6.mask.s6_addr,
+                                     (uintptr_t) val);
+
+        if (rc == NGX_OK) {
+            return NGX_CONF_OK;
+        }
+
+        if (rc == NGX_ERROR) {
+            return NGX_CONF_ERROR;
+        }
+
+        /* rc == NGX_BUSY */
+
+        old = (ngx_stream_variable_value_t *)
+                   ngx_radix128tree_find(ctx->tree6,
+                                         cidr->u.in6.addr.s6_addr);
+
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+              "duplicate network \"%V\", value: \"%v\", old value: \"%v\"",
+              net, val, old);
+
+        rc = ngx_radix128tree_delete(ctx->tree6,
+                                     cidr->u.in6.addr.s6_addr,
+                                     cidr->u.in6.mask.s6_addr);
+
+        if (rc == NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid radix tree");
+            return NGX_CONF_ERROR;
+        }
+
+        rc = ngx_radix128tree_insert(ctx->tree6, cidr->u.in6.addr.s6_addr,
+                                     cidr->u.in6.mask.s6_addr,
+                                     (uintptr_t) val);
+
+        break;
+#endif
+
+    default: /* AF_INET */
+        rc = ngx_radix32tree_insert(ctx->tree, cidr->u.in.addr,
+                                    cidr->u.in.mask, (uintptr_t) val);
+
+        if (rc == NGX_OK) {
+            return NGX_CONF_OK;
+        }
+
+        if (rc == NGX_ERROR) {
+            return NGX_CONF_ERROR;
+        }
+
+        /* rc == NGX_BUSY */
+
+        old = (ngx_stream_variable_value_t *)
+                   ngx_radix32tree_find(ctx->tree, cidr->u.in.addr);
+
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+              "duplicate network \"%V\", value: \"%v\", old value: \"%v\"",
+              net, val, old);
+
+        rc = ngx_radix32tree_delete(ctx->tree,
+                                    cidr->u.in.addr, cidr->u.in.mask);
+
+        if (rc == NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid radix tree");
+            return NGX_CONF_ERROR;
+        }
+
+        rc = ngx_radix32tree_insert(ctx->tree, cidr->u.in.addr,
+                                    cidr->u.in.mask, (uintptr_t) val);
+
+        break;
+    }
+
+    if (rc == NGX_OK) {
+        return NGX_CONF_OK;
+    }
+
+    return NGX_CONF_ERROR;
+}
+
+
+static ngx_stream_variable_value_t *
+ngx_stream_geo_value(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
+    ngx_str_t *value)
+{
+    uint32_t                               hash;
+    ngx_stream_variable_value_t           *val;
+    ngx_stream_geo_variable_value_node_t  *gvvn;
+
+    hash = ngx_crc32_long(value->data, value->len);
+
+    gvvn = (ngx_stream_geo_variable_value_node_t *)
+               ngx_str_rbtree_lookup(&ctx->rbtree, value, hash);
+
+    if (gvvn) {
+        return gvvn->value;
+    }
+
+    val = ngx_palloc(ctx->pool, sizeof(ngx_stream_variable_value_t));
+    if (val == NULL) {
+        return NULL;
+    }
+
+    val->len = value->len;
+    val->data = ngx_pstrdup(ctx->pool, value);
+    if (val->data == NULL) {
+        return NULL;
+    }
+
+    val->valid = 1;
+    val->no_cacheable = 0;
+    val->not_found = 0;
+
+    gvvn = ngx_palloc(ctx->temp_pool,
+                      sizeof(ngx_stream_geo_variable_value_node_t));
+    if (gvvn == NULL) {
+        return NULL;
+    }
+
+    gvvn->sn.node.key = hash;
+    gvvn->sn.str.len = val->len;
+    gvvn->sn.str.data = val->data;
+    gvvn->value = val;
+    gvvn->offset = 0;
+
+    ngx_rbtree_insert(&ctx->rbtree, &gvvn->sn.node);
+
+    ctx->data_size += ngx_align(sizeof(ngx_stream_variable_value_t)
+                                + value->len, sizeof(void *));
+
+    return val;
+}
+
+
+static ngx_int_t
+ngx_stream_geo_cidr_value(ngx_conf_t *cf, ngx_str_t *net, ngx_cidr_t *cidr)
+{
+    ngx_int_t  rc;
+
+    if (ngx_strcmp(net->data, "255.255.255.255") == 0) {
+        cidr->family = AF_INET;
+        cidr->u.in.addr = 0xffffffff;
+        cidr->u.in.mask = 0xffffffff;
+
+        return NGX_OK;
+    }
+
+    rc = ngx_ptocidr(net, cidr);
+
+    if (rc == NGX_ERROR) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid network \"%V\"", net);
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "low address bits of %V are meaningless", net);
+    }
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_stream_geo_include(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
+    ngx_str_t *name)
+{
+    char       *rv;
+    ngx_str_t   file;
+
+    file.len = name->len + 4;
+    file.data = ngx_pnalloc(ctx->temp_pool, name->len + 5);
+    if (file.data == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_sprintf(file.data, "%V.bin%Z", name);
+
+    if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (ctx->ranges) {
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
+
+        switch (ngx_stream_geo_include_binary_base(cf, ctx, &file)) {
+        case NGX_OK:
+            return NGX_CONF_OK;
+        case NGX_ERROR:
+            return NGX_CONF_ERROR;
+        default:
+            break;
+        }
+    }
+
+    file.len -= 4;
+    file.data[file.len] = '\0';
+
+    ctx->include_name = file;
+
+    if (ctx->outside_entries) {
+        ctx->allow_binary_include = 0;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
+
+    rv = ngx_conf_parse(cf, &file);
+
+    ctx->includes++;
+    ctx->outside_entries = 0;
+
+    return rv;
+}
+
+
+static ngx_int_t
+ngx_stream_geo_include_binary_base(ngx_conf_t *cf,
+    ngx_stream_geo_conf_ctx_t *ctx, ngx_str_t *name)
+{
+    u_char                       *base, ch;
+    time_t                        mtime;
+    size_t                        size, len;
+    ssize_t                       n;
+    uint32_t                      crc32;
+    ngx_err_t                     err;
+    ngx_int_t                     rc;
+    ngx_uint_t                    i;
+    ngx_file_t                    file;
+    ngx_file_info_t               fi;
+    ngx_stream_geo_range_t       *range, **ranges;
+    ngx_stream_geo_header_t      *header;
+    ngx_stream_variable_value_t  *vv;
+
+    ngx_memzero(&file, sizeof(ngx_file_t));
+    file.name = *name;
+    file.log = cf->log;
+
+    file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, 0, 0);
+    if (file.fd == NGX_INVALID_FILE) {
+        err = ngx_errno;
+        if (err != NGX_ENOENT) {
+            ngx_conf_log_error(NGX_LOG_CRIT, cf, err,
+                               ngx_open_file_n " \"%s\" failed", name->data);
+        }
+        return NGX_DECLINED;
+    }
+
+    if (ctx->outside_entries) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "binary geo range base \"%s\" cannot be mixed with usual entries",
+            name->data);
+        rc = NGX_ERROR;
+        goto done;
+    }
+
+    if (ctx->binary_include) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "second binary geo range base \"%s\" cannot be mixed with \"%s\"",
+            name->data, ctx->include_name.data);
+        rc = NGX_ERROR;
+        goto done;
+    }
+
+    if (ngx_fd_info(file.fd, &fi) == NGX_FILE_ERROR) {
+        ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno,
+                           ngx_fd_info_n " \"%s\" failed", name->data);
+        goto failed;
+    }
+
+    size = (size_t) ngx_file_size(&fi);
+    mtime = ngx_file_mtime(&fi);
+
+    ch = name->data[name->len - 4];
+    name->data[name->len - 4] = '\0';
+
+    if (ngx_file_info(name->data, &fi) == NGX_FILE_ERROR) {
+        ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno,
+                           ngx_file_info_n " \"%s\" failed", name->data);
+        goto failed;
+    }
+
+    name->data[name->len - 4] = ch;
+
+    if (mtime < ngx_file_mtime(&fi)) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "stale binary geo range base \"%s\"", name->data);
+        goto failed;
+    }
+
+    base = ngx_palloc(ctx->pool, size);
+    if (base == NULL) {
+        goto failed;
+    }
+
+    n = ngx_read_file(&file, base, size, 0);
+
+    if (n == NGX_ERROR) {
+        ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno,
+                           ngx_read_file_n " \"%s\" failed", name->data);
+        goto failed;
+    }
+
+    if ((size_t) n != size) {
+        ngx_conf_log_error(NGX_LOG_CRIT, cf, 0,
+            ngx_read_file_n " \"%s\" returned only %z bytes instead of %z",
+            name->data, n, size);
+        goto failed;
+    }
+
+    header = (ngx_stream_geo_header_t *) base;
+
+    if (size < 16 || ngx_memcmp(&ngx_stream_geo_header, header, 12) != 0) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+             "incompatible binary geo range base \"%s\"", name->data);
+        goto failed;
+    }
+
+    ngx_crc32_init(crc32);
+
+    vv = (ngx_stream_variable_value_t *)
+            (base + sizeof(ngx_stream_geo_header_t));
+
+    while (vv->data) {
+        len = ngx_align(sizeof(ngx_stream_variable_value_t) + vv->len,
+                        sizeof(void *));
+        ngx_crc32_update(&crc32, (u_char *) vv, len);
+        vv->data += (size_t) base;
+        vv = (ngx_stream_variable_value_t *) ((u_char *) vv + len);
+    }
+    ngx_crc32_update(&crc32, (u_char *) vv,
+                     sizeof(ngx_stream_variable_value_t));
+    vv++;
+
+    ranges = (ngx_stream_geo_range_t **) vv;
+
+    for (i = 0; i < 0x10000; i++) {
+        ngx_crc32_update(&crc32, (u_char *) &ranges[i], sizeof(void *));
+        if (ranges[i]) {
+            ranges[i] = (ngx_stream_geo_range_t *)
+                            ((u_char *) ranges[i] + (size_t) base);
+        }
+    }
+
+    range = (ngx_stream_geo_range_t *) &ranges[0x10000];
+
+    while ((u_char *) range < base + size) {
+        while (range->value) {
+            ngx_crc32_update(&crc32, (u_char *) range,
+                             sizeof(ngx_stream_geo_range_t));
+            range->value = (ngx_stream_variable_value_t *)
+                               ((u_char *) range->value + (size_t) base);
+            range++;
+        }
+        ngx_crc32_update(&crc32, (u_char *) range, sizeof(void *));
+        range = (ngx_stream_geo_range_t *) ((u_char *) range + sizeof(void *));
+    }
+
+    ngx_crc32_final(crc32);
+
+    if (crc32 != header->crc32) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                  "CRC32 mismatch in binary geo range base \"%s\"", name->data);
+        goto failed;
+    }
+
+    ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0,
+                       "using binary geo range base \"%s\"", name->data);
+
+    ctx->include_name = *name;
+    ctx->binary_include = 1;
+    ctx->high.low = ranges;
+    rc = NGX_OK;
+
+    goto done;
+
+failed:
+
+    rc = NGX_DECLINED;
+
+done:
+
+    if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
+                      ngx_close_file_n " \"%s\" failed", name->data);
+    }
+
+    return rc;
+}
+
+
+static void
+ngx_stream_geo_create_binary_base(ngx_stream_geo_conf_ctx_t *ctx)
+{
+    u_char                                *p;
+    uint32_t                               hash;
+    ngx_str_t                              s;
+    ngx_uint_t                             i;
+    ngx_file_mapping_t                     fm;
+    ngx_stream_geo_range_t                *r, *range, **ranges;
+    ngx_stream_geo_header_t               *header;
+    ngx_stream_geo_variable_value_node_t  *gvvn;
+
+    fm.name = ngx_pnalloc(ctx->temp_pool, ctx->include_name.len + 5);
+    if (fm.name == NULL) {
+        return;
+    }
+
+    ngx_sprintf(fm.name, "%V.bin%Z", &ctx->include_name);
+
+    fm.size = ctx->data_size;
+    fm.log = ctx->pool->log;
+
+    ngx_log_error(NGX_LOG_NOTICE, fm.log, 0,
+                  "creating binary geo range base \"%s\"", fm.name);
+
+    if (ngx_create_file_mapping(&fm) != NGX_OK) {
+        return;
+    }
+
+    p = ngx_cpymem(fm.addr, &ngx_stream_geo_header,
+                   sizeof(ngx_stream_geo_header_t));
+
+    p = ngx_stream_geo_copy_values(fm.addr, p, ctx->rbtree.root,
+                                   ctx->rbtree.sentinel);
+
+    p += sizeof(ngx_stream_variable_value_t);
+
+    ranges = (ngx_stream_geo_range_t **) p;
+
+    p += 0x10000 * sizeof(ngx_stream_geo_range_t *);
+
+    for (i = 0; i < 0x10000; i++) {
+        r = ctx->high.low[i];
+        if (r == NULL) {
+            continue;
+        }
+
+        range = (ngx_stream_geo_range_t *) p;
+        ranges[i] = (ngx_stream_geo_range_t *) (p - (u_char *) fm.addr);
+
+        do {
+            s.len = r->value->len;
+            s.data = r->value->data;
+            hash = ngx_crc32_long(s.data, s.len);
+            gvvn = (ngx_stream_geo_variable_value_node_t *)
+                        ngx_str_rbtree_lookup(&ctx->rbtree, &s, hash);
+
+            range->value = (ngx_stream_variable_value_t *) gvvn->offset;
+            range->start = r->start;
+            range->end = r->end;
+            range++;
+
+        } while ((++r)->value);
+
+        range->value = NULL;
+
+        p = (u_char *) range + sizeof(void *);
+    }
+
+    header = fm.addr;
+    header->crc32 = ngx_crc32_long((u_char *) fm.addr
+                                       + sizeof(ngx_stream_geo_header_t),
+                                   fm.size - sizeof(ngx_stream_geo_header_t));
+
+    ngx_close_file_mapping(&fm);
+}
+
+
+static u_char *
+ngx_stream_geo_copy_values(u_char *base, u_char *p, ngx_rbtree_node_t *node,
+    ngx_rbtree_node_t *sentinel)
+{
+    ngx_stream_variable_value_t           *vv;
+    ngx_stream_geo_variable_value_node_t  *gvvn;
+
+    if (node == sentinel) {
+        return p;
+    }
+
+    gvvn = (ngx_stream_geo_variable_value_node_t *) node;
+    gvvn->offset = p - base;
+
+    vv = (ngx_stream_variable_value_t *) p;
+    *vv = *gvvn->value;
+    p += sizeof(ngx_stream_variable_value_t);
+    vv->data = (u_char *) (p - base);
+
+    p = ngx_cpymem(p, gvvn->sn.str.data, gvvn->sn.str.len);
+
+    p = ngx_align_ptr(p, sizeof(void *));
+
+    p = ngx_stream_geo_copy_values(base, p, node->left, sentinel);
+
+    return ngx_stream_geo_copy_values(base, p, node->right, sentinel);
+}
diff --git a/src/stream/ngx_stream_geoip_module.c b/src/stream/ngx_stream_geoip_module.c
new file mode 100644
index 0000000..f694033
--- /dev/null
+++ b/src/stream/ngx_stream_geoip_module.c
@@ -0,0 +1,814 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+#include <GeoIP.h>
+#include <GeoIPCity.h>
+
+
+#define NGX_GEOIP_COUNTRY_CODE   0
+#define NGX_GEOIP_COUNTRY_CODE3  1
+#define NGX_GEOIP_COUNTRY_NAME   2
+
+
+typedef struct {
+    GeoIP        *country;
+    GeoIP        *org;
+    GeoIP        *city;
+#if (NGX_HAVE_GEOIP_V6)
+    unsigned      country_v6:1;
+    unsigned      org_v6:1;
+    unsigned      city_v6:1;
+#endif
+} ngx_stream_geoip_conf_t;
+
+
+typedef struct {
+    ngx_str_t    *name;
+    uintptr_t     data;
+} ngx_stream_geoip_var_t;
+
+
+typedef const char *(*ngx_stream_geoip_variable_handler_pt)(GeoIP *,
+    u_long addr);
+
+
+ngx_stream_geoip_variable_handler_pt ngx_stream_geoip_country_functions[] = {
+    GeoIP_country_code_by_ipnum,
+    GeoIP_country_code3_by_ipnum,
+    GeoIP_country_name_by_ipnum,
+};
+
+
+#if (NGX_HAVE_GEOIP_V6)
+
+typedef const char *(*ngx_stream_geoip_variable_handler_v6_pt)(GeoIP *,
+    geoipv6_t addr);
+
+
+ngx_stream_geoip_variable_handler_v6_pt
+    ngx_stream_geoip_country_v6_functions[] =
+{
+    GeoIP_country_code_by_ipnum_v6,
+    GeoIP_country_code3_by_ipnum_v6,
+    GeoIP_country_name_by_ipnum_v6,
+};
+
+#endif
+
+
+static ngx_int_t ngx_stream_geoip_country_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_geoip_org_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_geoip_city_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_geoip_region_name_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_geoip_city_float_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_geoip_city_int_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static GeoIPRecord *ngx_stream_geoip_get_city_record(ngx_stream_session_t *s);
+
+static ngx_int_t ngx_stream_geoip_add_variables(ngx_conf_t *cf);
+static void *ngx_stream_geoip_create_conf(ngx_conf_t *cf);
+static char *ngx_stream_geoip_country(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_geoip_org(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_geoip_city(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static void ngx_stream_geoip_cleanup(void *data);
+
+
+static ngx_command_t  ngx_stream_geoip_commands[] = {
+
+    { ngx_string("geoip_country"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE12,
+      ngx_stream_geoip_country,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("geoip_org"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE12,
+      ngx_stream_geoip_org,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("geoip_city"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE12,
+      ngx_stream_geoip_city,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_geoip_module_ctx = {
+    ngx_stream_geoip_add_variables,        /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    ngx_stream_geoip_create_conf,          /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_geoip_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_geoip_module_ctx,          /* module context */
+    ngx_stream_geoip_commands,             /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_stream_variable_t  ngx_stream_geoip_vars[] = {
+
+    { ngx_string("geoip_country_code"), NULL,
+      ngx_stream_geoip_country_variable,
+      NGX_GEOIP_COUNTRY_CODE, 0, 0 },
+
+    { ngx_string("geoip_country_code3"), NULL,
+      ngx_stream_geoip_country_variable,
+      NGX_GEOIP_COUNTRY_CODE3, 0, 0 },
+
+    { ngx_string("geoip_country_name"), NULL,
+      ngx_stream_geoip_country_variable,
+      NGX_GEOIP_COUNTRY_NAME, 0, 0 },
+
+    { ngx_string("geoip_org"), NULL,
+      ngx_stream_geoip_org_variable,
+      0, 0, 0 },
+
+    { ngx_string("geoip_city_continent_code"), NULL,
+      ngx_stream_geoip_city_variable,
+      offsetof(GeoIPRecord, continent_code), 0, 0 },
+
+    { ngx_string("geoip_city_country_code"), NULL,
+      ngx_stream_geoip_city_variable,
+      offsetof(GeoIPRecord, country_code), 0, 0 },
+
+    { ngx_string("geoip_city_country_code3"), NULL,
+      ngx_stream_geoip_city_variable,
+      offsetof(GeoIPRecord, country_code3), 0, 0 },
+
+    { ngx_string("geoip_city_country_name"), NULL,
+      ngx_stream_geoip_city_variable,
+      offsetof(GeoIPRecord, country_name), 0, 0 },
+
+    { ngx_string("geoip_region"), NULL,
+      ngx_stream_geoip_city_variable,
+      offsetof(GeoIPRecord, region), 0, 0 },
+
+    { ngx_string("geoip_region_name"), NULL,
+      ngx_stream_geoip_region_name_variable,
+      0, 0, 0 },
+
+    { ngx_string("geoip_city"), NULL,
+      ngx_stream_geoip_city_variable,
+      offsetof(GeoIPRecord, city), 0, 0 },
+
+    { ngx_string("geoip_postal_code"), NULL,
+      ngx_stream_geoip_city_variable,
+      offsetof(GeoIPRecord, postal_code), 0, 0 },
+
+    { ngx_string("geoip_latitude"), NULL,
+      ngx_stream_geoip_city_float_variable,
+      offsetof(GeoIPRecord, latitude), 0, 0 },
+
+    { ngx_string("geoip_longitude"), NULL,
+      ngx_stream_geoip_city_float_variable,
+      offsetof(GeoIPRecord, longitude), 0, 0 },
+
+    { ngx_string("geoip_dma_code"), NULL,
+      ngx_stream_geoip_city_int_variable,
+      offsetof(GeoIPRecord, dma_code), 0, 0 },
+
+    { ngx_string("geoip_area_code"), NULL,
+      ngx_stream_geoip_city_int_variable,
+      offsetof(GeoIPRecord, area_code), 0, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
+static u_long
+ngx_stream_geoip_addr(ngx_stream_session_t *s, ngx_stream_geoip_conf_t *gcf)
+{
+    ngx_addr_t           addr;
+    struct sockaddr_in  *sin;
+
+    addr.sockaddr = s->connection->sockaddr;
+    addr.socklen = s->connection->socklen;
+    /* addr.name = s->connection->addr_text; */
+
+#if (NGX_HAVE_INET6)
+
+    if (addr.sockaddr->sa_family == AF_INET6) {
+        u_char           *p;
+        in_addr_t         inaddr;
+        struct in6_addr  *inaddr6;
+
+        inaddr6 = &((struct sockaddr_in6 *) addr.sockaddr)->sin6_addr;
+
+        if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
+            p = inaddr6->s6_addr;
+
+            inaddr = p[12] << 24;
+            inaddr += p[13] << 16;
+            inaddr += p[14] << 8;
+            inaddr += p[15];
+
+            return inaddr;
+        }
+    }
+
+#endif
+
+    if (addr.sockaddr->sa_family != AF_INET) {
+        return INADDR_NONE;
+    }
+
+    sin = (struct sockaddr_in *) addr.sockaddr;
+    return ntohl(sin->sin_addr.s_addr);
+}
+
+
+#if (NGX_HAVE_GEOIP_V6)
+
+static geoipv6_t
+ngx_stream_geoip_addr_v6(ngx_stream_session_t *s, ngx_stream_geoip_conf_t *gcf)
+{
+    ngx_addr_t            addr;
+    in_addr_t             addr4;
+    struct in6_addr       addr6;
+    struct sockaddr_in   *sin;
+    struct sockaddr_in6  *sin6;
+
+    addr.sockaddr = s->connection->sockaddr;
+    addr.socklen = s->connection->socklen;
+    /* addr.name = s->connection->addr_text; */
+
+    switch (addr.sockaddr->sa_family) {
+
+    case AF_INET:
+        /* Produce IPv4-mapped IPv6 address. */
+        sin = (struct sockaddr_in *) addr.sockaddr;
+        addr4 = ntohl(sin->sin_addr.s_addr);
+
+        ngx_memzero(&addr6, sizeof(struct in6_addr));
+        addr6.s6_addr[10] = 0xff;
+        addr6.s6_addr[11] = 0xff;
+        addr6.s6_addr[12] = addr4 >> 24;
+        addr6.s6_addr[13] = addr4 >> 16;
+        addr6.s6_addr[14] = addr4 >> 8;
+        addr6.s6_addr[15] = addr4;
+        return addr6;
+
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) addr.sockaddr;
+        return sin6->sin6_addr;
+
+    default:
+        return in6addr_any;
+    }
+}
+
+#endif
+
+
+static ngx_int_t
+ngx_stream_geoip_country_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_stream_geoip_variable_handler_pt     handler =
+        ngx_stream_geoip_country_functions[data];
+#if (NGX_HAVE_GEOIP_V6)
+    ngx_stream_geoip_variable_handler_v6_pt  handler_v6 =
+        ngx_stream_geoip_country_v6_functions[data];
+#endif
+
+    const char               *val;
+    ngx_stream_geoip_conf_t  *gcf;
+
+    gcf = ngx_stream_get_module_main_conf(s, ngx_stream_geoip_module);
+
+    if (gcf->country == NULL) {
+        goto not_found;
+    }
+
+#if (NGX_HAVE_GEOIP_V6)
+    val = gcf->country_v6
+              ? handler_v6(gcf->country, ngx_stream_geoip_addr_v6(s, gcf))
+              : handler(gcf->country, ngx_stream_geoip_addr(s, gcf));
+#else
+    val = handler(gcf->country, ngx_stream_geoip_addr(s, gcf));
+#endif
+
+    if (val == NULL) {
+        goto not_found;
+    }
+
+    v->len = ngx_strlen(val);
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = (u_char *) val;
+
+    return NGX_OK;
+
+not_found:
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip_org_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    size_t                    len;
+    char                     *val;
+    ngx_stream_geoip_conf_t  *gcf;
+
+    gcf = ngx_stream_get_module_main_conf(s, ngx_stream_geoip_module);
+
+    if (gcf->org == NULL) {
+        goto not_found;
+    }
+
+#if (NGX_HAVE_GEOIP_V6)
+    val = gcf->org_v6
+              ? GeoIP_name_by_ipnum_v6(gcf->org,
+                                       ngx_stream_geoip_addr_v6(s, gcf))
+              : GeoIP_name_by_ipnum(gcf->org,
+                                    ngx_stream_geoip_addr(s, gcf));
+#else
+    val = GeoIP_name_by_ipnum(gcf->org, ngx_stream_geoip_addr(s, gcf));
+#endif
+
+    if (val == NULL) {
+        goto not_found;
+    }
+
+    len = ngx_strlen(val);
+    v->data = ngx_pnalloc(s->connection->pool, len);
+    if (v->data == NULL) {
+        ngx_free(val);
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(v->data, val, len);
+
+    v->len = len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    ngx_free(val);
+
+    return NGX_OK;
+
+not_found:
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip_city_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    char         *val;
+    size_t        len;
+    GeoIPRecord  *gr;
+
+    gr = ngx_stream_geoip_get_city_record(s);
+    if (gr == NULL) {
+        goto not_found;
+    }
+
+    val = *(char **) ((char *) gr + data);
+    if (val == NULL) {
+        goto no_value;
+    }
+
+    len = ngx_strlen(val);
+    v->data = ngx_pnalloc(s->connection->pool, len);
+    if (v->data == NULL) {
+        GeoIPRecord_delete(gr);
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(v->data, val, len);
+
+    v->len = len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    GeoIPRecord_delete(gr);
+
+    return NGX_OK;
+
+no_value:
+
+    GeoIPRecord_delete(gr);
+
+not_found:
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip_region_name_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    size_t        len;
+    const char   *val;
+    GeoIPRecord  *gr;
+
+    gr = ngx_stream_geoip_get_city_record(s);
+    if (gr == NULL) {
+        goto not_found;
+    }
+
+    val = GeoIP_region_name_by_code(gr->country_code, gr->region);
+
+    GeoIPRecord_delete(gr);
+
+    if (val == NULL) {
+        goto not_found;
+    }
+
+    len = ngx_strlen(val);
+    v->data = ngx_pnalloc(s->connection->pool, len);
+    if (v->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(v->data, val, len);
+
+    v->len = len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+
+not_found:
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip_city_float_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    float         val;
+    GeoIPRecord  *gr;
+
+    gr = ngx_stream_geoip_get_city_record(s);
+    if (gr == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->data = ngx_pnalloc(s->connection->pool, NGX_INT64_LEN + 5);
+    if (v->data == NULL) {
+        GeoIPRecord_delete(gr);
+        return NGX_ERROR;
+    }
+
+    val = *(float *) ((char *) gr + data);
+
+    v->len = ngx_sprintf(v->data, "%.4f", val) - v->data;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    GeoIPRecord_delete(gr);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip_city_int_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    int           val;
+    GeoIPRecord  *gr;
+
+    gr = ngx_stream_geoip_get_city_record(s);
+    if (gr == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->data = ngx_pnalloc(s->connection->pool, NGX_INT64_LEN);
+    if (v->data == NULL) {
+        GeoIPRecord_delete(gr);
+        return NGX_ERROR;
+    }
+
+    val = *(int *) ((char *) gr + data);
+
+    v->len = ngx_sprintf(v->data, "%d", val) - v->data;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    GeoIPRecord_delete(gr);
+
+    return NGX_OK;
+}
+
+
+static GeoIPRecord *
+ngx_stream_geoip_get_city_record(ngx_stream_session_t *s)
+{
+    ngx_stream_geoip_conf_t  *gcf;
+
+    gcf = ngx_stream_get_module_main_conf(s, ngx_stream_geoip_module);
+
+    if (gcf->city) {
+#if (NGX_HAVE_GEOIP_V6)
+        return gcf->city_v6
+                   ? GeoIP_record_by_ipnum_v6(gcf->city,
+                                              ngx_stream_geoip_addr_v6(s, gcf))
+                   : GeoIP_record_by_ipnum(gcf->city,
+                                           ngx_stream_geoip_addr(s, gcf));
+#else
+        return GeoIP_record_by_ipnum(gcf->city, ngx_stream_geoip_addr(s, gcf));
+#endif
+    }
+
+    return NULL;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip_add_variables(ngx_conf_t *cf)
+{
+    ngx_stream_variable_t  *var, *v;
+
+    for (v = ngx_stream_geoip_vars; v->name.len; v++) {
+        var = ngx_stream_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_stream_geoip_create_conf(ngx_conf_t *cf)
+{
+    ngx_pool_cleanup_t       *cln;
+    ngx_stream_geoip_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NULL;
+    }
+
+    cln->handler = ngx_stream_geoip_cleanup;
+    cln->data = conf;
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_geoip_country(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_geoip_conf_t  *gcf = conf;
+
+    ngx_str_t  *value;
+
+    if (gcf->country) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    gcf->country = GeoIP_open((char *) value[1].data, GEOIP_MEMORY_CACHE);
+
+    if (gcf->country == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "GeoIP_open(\"%V\") failed", &value[1]);
+
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->args->nelts == 3) {
+        if (ngx_strcmp(value[2].data, "utf8") == 0) {
+            GeoIP_set_charset(gcf->country, GEOIP_CHARSET_UTF8);
+
+        } else {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid parameter \"%V\"", &value[2]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    switch (gcf->country->databaseType) {
+
+    case GEOIP_COUNTRY_EDITION:
+
+        return NGX_CONF_OK;
+
+#if (NGX_HAVE_GEOIP_V6)
+    case GEOIP_COUNTRY_EDITION_V6:
+
+        gcf->country_v6 = 1;
+        return NGX_CONF_OK;
+#endif
+
+    default:
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid GeoIP database \"%V\" type:%d",
+                           &value[1], gcf->country->databaseType);
+        return NGX_CONF_ERROR;
+    }
+}
+
+
+static char *
+ngx_stream_geoip_org(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_geoip_conf_t  *gcf = conf;
+
+    ngx_str_t  *value;
+
+    if (gcf->org) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    gcf->org = GeoIP_open((char *) value[1].data, GEOIP_MEMORY_CACHE);
+
+    if (gcf->org == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "GeoIP_open(\"%V\") failed", &value[1]);
+
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->args->nelts == 3) {
+        if (ngx_strcmp(value[2].data, "utf8") == 0) {
+            GeoIP_set_charset(gcf->org, GEOIP_CHARSET_UTF8);
+
+        } else {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid parameter \"%V\"", &value[2]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    switch (gcf->org->databaseType) {
+
+    case GEOIP_ISP_EDITION:
+    case GEOIP_ORG_EDITION:
+    case GEOIP_DOMAIN_EDITION:
+    case GEOIP_ASNUM_EDITION:
+
+        return NGX_CONF_OK;
+
+#if (NGX_HAVE_GEOIP_V6)
+    case GEOIP_ISP_EDITION_V6:
+    case GEOIP_ORG_EDITION_V6:
+    case GEOIP_DOMAIN_EDITION_V6:
+    case GEOIP_ASNUM_EDITION_V6:
+
+        gcf->org_v6 = 1;
+        return NGX_CONF_OK;
+#endif
+
+    default:
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid GeoIP database \"%V\" type:%d",
+                           &value[1], gcf->org->databaseType);
+        return NGX_CONF_ERROR;
+    }
+}
+
+
+static char *
+ngx_stream_geoip_city(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_geoip_conf_t  *gcf = conf;
+
+    ngx_str_t  *value;
+
+    if (gcf->city) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    gcf->city = GeoIP_open((char *) value[1].data, GEOIP_MEMORY_CACHE);
+
+    if (gcf->city == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "GeoIP_open(\"%V\") failed", &value[1]);
+
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->args->nelts == 3) {
+        if (ngx_strcmp(value[2].data, "utf8") == 0) {
+            GeoIP_set_charset(gcf->city, GEOIP_CHARSET_UTF8);
+
+        } else {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid parameter \"%V\"", &value[2]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    switch (gcf->city->databaseType) {
+
+    case GEOIP_CITY_EDITION_REV0:
+    case GEOIP_CITY_EDITION_REV1:
+
+        return NGX_CONF_OK;
+
+#if (NGX_HAVE_GEOIP_V6)
+    case GEOIP_CITY_EDITION_REV0_V6:
+    case GEOIP_CITY_EDITION_REV1_V6:
+
+        gcf->city_v6 = 1;
+        return NGX_CONF_OK;
+#endif
+
+    default:
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid GeoIP City database \"%V\" type:%d",
+                           &value[1], gcf->city->databaseType);
+        return NGX_CONF_ERROR;
+    }
+}
+
+
+static void
+ngx_stream_geoip_cleanup(void *data)
+{
+    ngx_stream_geoip_conf_t  *gcf = data;
+
+    if (gcf->country) {
+        GeoIP_delete(gcf->country);
+    }
+
+    if (gcf->org) {
+        GeoIP_delete(gcf->org);
+    }
+
+    if (gcf->city) {
+        GeoIP_delete(gcf->city);
+    }
+}
diff --git a/src/stream/ngx_stream_handler.c b/src/stream/ngx_stream_handler.c
index aa69e44..61169e1 100644
--- a/src/stream/ngx_stream_handler.c
+++ b/src/stream/ngx_stream_handler.c
@@ -149,6 +149,15 @@ ngx_stream_init_connection(ngx_connection_t *c)
 
     cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
 
+    s->variables = ngx_pcalloc(s->connection->pool,
+                               cmcf->variables.nelts
+                               * sizeof(ngx_stream_variable_value_t));
+
+    if (s->variables == NULL) {
+        ngx_stream_close_connection(c);
+        return;
+    }
+
     if (cmcf->limit_conn_handler) {
         rc = cmcf->limit_conn_handler(s);
 
diff --git a/src/stream/ngx_stream_limit_conn_module.c b/src/stream/ngx_stream_limit_conn_module.c
index f1d8a37..40eca94 100644
--- a/src/stream/ngx_stream_limit_conn_module.c
+++ b/src/stream/ngx_stream_limit_conn_module.c
@@ -11,33 +11,34 @@
 
 
 typedef struct {
-    u_char                     color;
-    u_char                     len;
-    u_short                    conn;
-    u_char                     data[1];
+    u_char                       color;
+    u_char                       len;
+    u_short                      conn;
+    u_char                       data[1];
 } ngx_stream_limit_conn_node_t;
 
 
 typedef struct {
-    ngx_shm_zone_t            *shm_zone;
-    ngx_rbtree_node_t         *node;
+    ngx_shm_zone_t              *shm_zone;
+    ngx_rbtree_node_t           *node;
 } ngx_stream_limit_conn_cleanup_t;
 
 
 typedef struct {
-    ngx_rbtree_t              *rbtree;
+    ngx_rbtree_t                *rbtree;
+    ngx_stream_complex_value_t   key;
 } ngx_stream_limit_conn_ctx_t;
 
 
 typedef struct {
-    ngx_shm_zone_t            *shm_zone;
-    ngx_uint_t                 conn;
+    ngx_shm_zone_t              *shm_zone;
+    ngx_uint_t                   conn;
 } ngx_stream_limit_conn_limit_t;
 
 
 typedef struct {
-    ngx_array_t                limits;
-    ngx_uint_t                 log_level;
+    ngx_array_t                  limits;
+    ngx_uint_t                   log_level;
 } ngx_stream_limit_conn_conf_t;
 
 
@@ -93,28 +94,29 @@ static ngx_command_t  ngx_stream_limit_conn_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_limit_conn_module_ctx = {
+    NULL,                                  /* preconfiguration */
     ngx_stream_limit_conn_init,            /* postconfiguration */
 
     NULL,                                  /* create main configuration */
     NULL,                                  /* init main configuration */
 
     ngx_stream_limit_conn_create_conf,     /* create server configuration */
-    ngx_stream_limit_conn_merge_conf,      /* merge server configuration */
+    ngx_stream_limit_conn_merge_conf       /* merge server configuration */
 };
 
 
 ngx_module_t  ngx_stream_limit_conn_module = {
     NGX_MODULE_V1,
-    &ngx_stream_limit_conn_module_ctx,       /* module context */
-    ngx_stream_limit_conn_commands,          /* module directives */
-    NGX_STREAM_MODULE,                       /* module type */
-    NULL,                                    /* init master */
-    NULL,                                    /* init module */
-    NULL,                                    /* init process */
-    NULL,                                    /* init thread */
-    NULL,                                    /* exit thread */
-    NULL,                                    /* exit process */
-    NULL,                                    /* exit master */
+    &ngx_stream_limit_conn_module_ctx,     /* module context */
+    ngx_stream_limit_conn_commands,        /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
     NGX_MODULE_V1_PADDING
 };
 
@@ -129,48 +131,36 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
     ngx_slab_pool_t                  *shpool;
     ngx_rbtree_node_t                *node;
     ngx_pool_cleanup_t               *cln;
-    struct sockaddr_in               *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6              *sin6;
-#endif
     ngx_stream_limit_conn_ctx_t      *ctx;
     ngx_stream_limit_conn_node_t     *lc;
     ngx_stream_limit_conn_conf_t     *lccf;
     ngx_stream_limit_conn_limit_t    *limits;
     ngx_stream_limit_conn_cleanup_t  *lccln;
 
-    switch (s->connection->sockaddr->sa_family) {
-
-    case AF_INET:
-        sin = (struct sockaddr_in *) s->connection->sockaddr;
-
-        key.len = sizeof(in_addr_t);
-        key.data = (u_char *) &sin->sin_addr;
-
-        break;
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) s->connection->sockaddr;
-
-        key.len = sizeof(struct in6_addr);
-        key.data = sin6->sin6_addr.s6_addr;
-
-        break;
-#endif
-
-    default:
-        return NGX_DECLINED;
-    }
-
-    hash = ngx_crc32_short(key.data, key.len);
-
     lccf = ngx_stream_get_module_srv_conf(s, ngx_stream_limit_conn_module);
     limits = lccf->limits.elts;
 
     for (i = 0; i < lccf->limits.nelts; i++) {
         ctx = limits[i].shm_zone->data;
 
+        if (ngx_stream_complex_value(s, &ctx->key, &key) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (key.len == 0) {
+            continue;
+        }
+
+        if (key.len > 255) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "the value of the \"%V\" key "
+                          "is more than 255 bytes: \"%V\"",
+                          &ctx->key.value, &key);
+            continue;
+        }
+
+        hash = ngx_crc32_short(key.data, key.len);
+
         shpool = (ngx_slab_pool_t *) limits[i].shm_zone->shm.addr;
 
         ngx_shmtx_lock(&shpool->mutex);
@@ -382,6 +372,19 @@ ngx_stream_limit_conn_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     ctx = shm_zone->data;
 
     if (octx) {
+        if (ctx->key.value.len != octx->key.value.len
+            || ngx_strncmp(ctx->key.value.data, octx->key.value.data,
+                           ctx->key.value.len)
+               != 0)
+        {
+            ngx_log_error(NGX_LOG_EMERG, shm_zone->shm.log, 0,
+                          "limit_conn_zone \"%V\" uses the \"%V\" key "
+                          "while previously it used the \"%V\" key",
+                          &shm_zone->shm.name, &ctx->key.value,
+                          &octx->key.value);
+            return NGX_ERROR;
+        }
+
         ctx->rbtree = octx->rbtree;
 
         return NGX_OK;
@@ -465,12 +468,13 @@ ngx_stream_limit_conn_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 static char *
 ngx_stream_limit_conn_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    u_char                       *p;
-    ssize_t                       size;
-    ngx_str_t                    *value, name, s;
-    ngx_uint_t                    i;
-    ngx_shm_zone_t               *shm_zone;
-    ngx_stream_limit_conn_ctx_t  *ctx;
+    u_char                              *p;
+    ssize_t                              size;
+    ngx_str_t                           *value, name, s;
+    ngx_uint_t                           i;
+    ngx_shm_zone_t                      *shm_zone;
+    ngx_stream_limit_conn_ctx_t         *ctx;
+    ngx_stream_compile_complex_value_t   ccv;
 
     value = cf->args->elts;
 
@@ -479,6 +483,16 @@ ngx_stream_limit_conn_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &ctx->key;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     size = 0;
     name.len = 0;
 
@@ -537,17 +551,11 @@ ngx_stream_limit_conn_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
     if (shm_zone->data) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "%V \"%V\" is already bound to key "
-                           "\"$binary_remote_addr\"",
-                           &cmd->name, &name);
-        return NGX_CONF_ERROR;
-    }
+        ctx = shm_zone->data;
 
-    if (ngx_strcmp(value[1].data, "$binary_remote_addr") != 0) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "unsupported key \"%V\", use "
-                           "$binary_remote_addr", &value[1]);
+                           "%V \"%V\" is already bound to key \"%V\"",
+                           &cmd->name, &name, &ctx->key.value);
         return NGX_CONF_ERROR;
     }
 
diff --git a/src/stream/ngx_stream_map_module.c b/src/stream/ngx_stream_map_module.c
new file mode 100644
index 0000000..47a15be
--- /dev/null
+++ b/src/stream/ngx_stream_map_module.c
@@ -0,0 +1,574 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    ngx_uint_t                    hash_max_size;
+    ngx_uint_t                    hash_bucket_size;
+} ngx_stream_map_conf_t;
+
+
+typedef struct {
+    ngx_hash_keys_arrays_t        keys;
+
+    ngx_array_t                  *values_hash;
+#if (NGX_PCRE)
+    ngx_array_t                   regexes;
+#endif
+
+    ngx_stream_variable_value_t  *default_value;
+    ngx_conf_t                   *cf;
+    ngx_uint_t                    hostnames;      /* unsigned  hostnames:1 */
+} ngx_stream_map_conf_ctx_t;
+
+
+typedef struct {
+    ngx_stream_map_t              map;
+    ngx_stream_complex_value_t    value;
+    ngx_stream_variable_value_t  *default_value;
+    ngx_uint_t                    hostnames;      /* unsigned  hostnames:1 */
+} ngx_stream_map_ctx_t;
+
+
+static int ngx_libc_cdecl ngx_stream_map_cmp_dns_wildcards(const void *one,
+    const void *two);
+static void *ngx_stream_map_create_conf(ngx_conf_t *cf);
+static char *ngx_stream_map_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf);
+
+
+static ngx_command_t  ngx_stream_map_commands[] = {
+
+    { ngx_string("map"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE2,
+      ngx_stream_map_block,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("map_hash_max_size"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      offsetof(ngx_stream_map_conf_t, hash_max_size),
+      NULL },
+
+    { ngx_string("map_hash_bucket_size"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      offsetof(ngx_stream_map_conf_t, hash_bucket_size),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_map_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    ngx_stream_map_create_conf,            /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_map_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_map_module_ctx,            /* module context */
+    ngx_stream_map_commands,               /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_stream_map_variable(ngx_stream_session_t *s, ngx_stream_variable_value_t *v,
+    uintptr_t data)
+{
+    ngx_stream_map_ctx_t  *map = (ngx_stream_map_ctx_t *) data;
+
+    ngx_str_t                     val, str;
+    ngx_stream_complex_value_t   *cv;
+    ngx_stream_variable_value_t  *value;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "stream map started");
+
+    if (ngx_stream_complex_value(s, &map->value, &val) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (map->hostnames && val.len > 0 && val.data[val.len - 1] == '.') {
+        val.len--;
+    }
+
+    value = ngx_stream_map_find(s, &map->map, &val);
+
+    if (value == NULL) {
+        value = map->default_value;
+    }
+
+    if (!value->valid) {
+        cv = (ngx_stream_complex_value_t *) value->data;
+
+        if (ngx_stream_complex_value(s, cv, &str) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->len = str.len;
+        v->data = str.data;
+
+    } else {
+        *v = *value;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "stream map: \"%V\" \"%v\"", &val, v);
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_stream_map_create_conf(ngx_conf_t *cf)
+{
+    ngx_stream_map_conf_t  *mcf;
+
+    mcf = ngx_palloc(cf->pool, sizeof(ngx_stream_map_conf_t));
+    if (mcf == NULL) {
+        return NULL;
+    }
+
+    mcf->hash_max_size = NGX_CONF_UNSET_UINT;
+    mcf->hash_bucket_size = NGX_CONF_UNSET_UINT;
+
+    return mcf;
+}
+
+
+static char *
+ngx_stream_map_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_map_conf_t  *mcf = conf;
+
+    char                                *rv;
+    ngx_str_t                           *value, name;
+    ngx_conf_t                           save;
+    ngx_pool_t                          *pool;
+    ngx_hash_init_t                      hash;
+    ngx_stream_map_ctx_t                *map;
+    ngx_stream_variable_t               *var;
+    ngx_stream_map_conf_ctx_t            ctx;
+    ngx_stream_compile_complex_value_t   ccv;
+
+    if (mcf->hash_max_size == NGX_CONF_UNSET_UINT) {
+        mcf->hash_max_size = 2048;
+    }
+
+    if (mcf->hash_bucket_size == NGX_CONF_UNSET_UINT) {
+        mcf->hash_bucket_size = ngx_cacheline_size;
+
+    } else {
+        mcf->hash_bucket_size = ngx_align(mcf->hash_bucket_size,
+                                          ngx_cacheline_size);
+    }
+
+    map = ngx_pcalloc(cf->pool, sizeof(ngx_stream_map_ctx_t));
+    if (map == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &map->value;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    name = value[2];
+
+    if (name.data[0] != '$') {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"%V\"", &name);
+        return NGX_CONF_ERROR;
+    }
+
+    name.len--;
+    name.data++;
+
+    var = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    var->get_handler = ngx_stream_map_variable;
+    var->data = (uintptr_t) map;
+
+    pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log);
+    if (pool == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ctx.keys.pool = cf->pool;
+    ctx.keys.temp_pool = pool;
+
+    if (ngx_hash_keys_array_init(&ctx.keys, NGX_HASH_LARGE) != NGX_OK) {
+        ngx_destroy_pool(pool);
+        return NGX_CONF_ERROR;
+    }
+
+    ctx.values_hash = ngx_pcalloc(pool, sizeof(ngx_array_t) * ctx.keys.hsize);
+    if (ctx.values_hash == NULL) {
+        ngx_destroy_pool(pool);
+        return NGX_CONF_ERROR;
+    }
+
+#if (NGX_PCRE)
+    if (ngx_array_init(&ctx.regexes, cf->pool, 2,
+                       sizeof(ngx_stream_map_regex_t))
+        != NGX_OK)
+    {
+        ngx_destroy_pool(pool);
+        return NGX_CONF_ERROR;
+    }
+#endif
+
+    ctx.default_value = NULL;
+    ctx.cf = &save;
+    ctx.hostnames = 0;
+
+    save = *cf;
+    cf->pool = pool;
+    cf->ctx = &ctx;
+    cf->handler = ngx_stream_map;
+    cf->handler_conf = conf;
+
+    rv = ngx_conf_parse(cf, NULL);
+
+    *cf = save;
+
+    if (rv != NGX_CONF_OK) {
+        ngx_destroy_pool(pool);
+        return rv;
+    }
+
+    map->default_value = ctx.default_value ? ctx.default_value:
+                                             &ngx_stream_variable_null_value;
+
+    map->hostnames = ctx.hostnames;
+
+    hash.key = ngx_hash_key_lc;
+    hash.max_size = mcf->hash_max_size;
+    hash.bucket_size = mcf->hash_bucket_size;
+    hash.name = "map_hash";
+    hash.pool = cf->pool;
+
+    if (ctx.keys.keys.nelts) {
+        hash.hash = &map->map.hash.hash;
+        hash.temp_pool = NULL;
+
+        if (ngx_hash_init(&hash, ctx.keys.keys.elts, ctx.keys.keys.nelts)
+            != NGX_OK)
+        {
+            ngx_destroy_pool(pool);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (ctx.keys.dns_wc_head.nelts) {
+
+        ngx_qsort(ctx.keys.dns_wc_head.elts,
+                  (size_t) ctx.keys.dns_wc_head.nelts,
+                  sizeof(ngx_hash_key_t), ngx_stream_map_cmp_dns_wildcards);
+
+        hash.hash = NULL;
+        hash.temp_pool = pool;
+
+        if (ngx_hash_wildcard_init(&hash, ctx.keys.dns_wc_head.elts,
+                                   ctx.keys.dns_wc_head.nelts)
+            != NGX_OK)
+        {
+            ngx_destroy_pool(pool);
+            return NGX_CONF_ERROR;
+        }
+
+        map->map.hash.wc_head = (ngx_hash_wildcard_t *) hash.hash;
+    }
+
+    if (ctx.keys.dns_wc_tail.nelts) {
+
+        ngx_qsort(ctx.keys.dns_wc_tail.elts,
+                  (size_t) ctx.keys.dns_wc_tail.nelts,
+                  sizeof(ngx_hash_key_t), ngx_stream_map_cmp_dns_wildcards);
+
+        hash.hash = NULL;
+        hash.temp_pool = pool;
+
+        if (ngx_hash_wildcard_init(&hash, ctx.keys.dns_wc_tail.elts,
+                                   ctx.keys.dns_wc_tail.nelts)
+            != NGX_OK)
+        {
+            ngx_destroy_pool(pool);
+            return NGX_CONF_ERROR;
+        }
+
+        map->map.hash.wc_tail = (ngx_hash_wildcard_t *) hash.hash;
+    }
+
+#if (NGX_PCRE)
+
+    if (ctx.regexes.nelts) {
+        map->map.regex = ctx.regexes.elts;
+        map->map.nregex = ctx.regexes.nelts;
+    }
+
+#endif
+
+    ngx_destroy_pool(pool);
+
+    return rv;
+}
+
+
+static int ngx_libc_cdecl
+ngx_stream_map_cmp_dns_wildcards(const void *one, const void *two)
+{
+    ngx_hash_key_t  *first, *second;
+
+    first = (ngx_hash_key_t *) one;
+    second = (ngx_hash_key_t *) two;
+
+    return ngx_dns_strcmp(first->key.data, second->key.data);
+}
+
+
+static char *
+ngx_stream_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    u_char                              *data;
+    size_t                               len;
+    ngx_int_t                            rv;
+    ngx_str_t                           *value, v;
+    ngx_uint_t                           i, key;
+    ngx_stream_map_conf_ctx_t           *ctx;
+    ngx_stream_complex_value_t           cv, *cvp;
+    ngx_stream_variable_value_t         *var, **vp;
+    ngx_stream_compile_complex_value_t   ccv;
+
+    ctx = cf->ctx;
+
+    value = cf->args->elts;
+
+    if (cf->args->nelts == 1
+        && ngx_strcmp(value[0].data, "hostnames") == 0)
+    {
+        ctx->hostnames = 1;
+        return NGX_CONF_OK;
+
+    } else if (cf->args->nelts != 2) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid number of the map parameters");
+        return NGX_CONF_ERROR;
+    }
+
+    if (ngx_strcmp(value[0].data, "include") == 0) {
+        return ngx_conf_include(cf, dummy, conf);
+    }
+
+    key = 0;
+
+    for (i = 0; i < value[1].len; i++) {
+        key = ngx_hash(key, value[1].data[i]);
+    }
+
+    key %= ctx->keys.hsize;
+
+    vp = ctx->values_hash[key].elts;
+
+    if (vp) {
+        for (i = 0; i < ctx->values_hash[key].nelts; i++) {
+
+            if (vp[i]->valid) {
+                data = vp[i]->data;
+                len = vp[i]->len;
+
+            } else {
+                cvp = (ngx_stream_complex_value_t *) vp[i]->data;
+                data = cvp->value.data;
+                len = cvp->value.len;
+            }
+
+            if (value[1].len != len) {
+                continue;
+            }
+
+            if (ngx_strncmp(value[1].data, data, len) == 0) {
+                var = vp[i];
+                goto found;
+            }
+        }
+
+    } else {
+        if (ngx_array_init(&ctx->values_hash[key], cf->pool, 4,
+                           sizeof(ngx_stream_variable_value_t *))
+            != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    var = ngx_palloc(ctx->keys.pool, sizeof(ngx_stream_variable_value_t));
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    v.len = value[1].len;
+    v.data = ngx_pstrdup(ctx->keys.pool, &value[1]);
+    if (v.data == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = ctx->cf;
+    ccv.value = &v;
+    ccv.complex_value = &cv;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cv.lengths != NULL) {
+        cvp = ngx_palloc(ctx->keys.pool, sizeof(ngx_stream_complex_value_t));
+        if (cvp == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *cvp = cv;
+
+        var->len = 0;
+        var->data = (u_char *) cvp;
+        var->valid = 0;
+
+    } else {
+        var->len = v.len;
+        var->data = v.data;
+        var->valid = 1;
+    }
+
+    var->no_cacheable = 0;
+    var->not_found = 0;
+
+    vp = ngx_array_push(&ctx->values_hash[key]);
+    if (vp == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *vp = var;
+
+found:
+
+    if (ngx_strcmp(value[0].data, "default") == 0) {
+
+        if (ctx->default_value) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "duplicate default map parameter");
+            return NGX_CONF_ERROR;
+        }
+
+        ctx->default_value = var;
+
+        return NGX_CONF_OK;
+    }
+
+#if (NGX_PCRE)
+
+    if (value[0].len && value[0].data[0] == '~') {
+        ngx_regex_compile_t      rc;
+        ngx_stream_map_regex_t  *regex;
+        u_char                   errstr[NGX_MAX_CONF_ERRSTR];
+
+        regex = ngx_array_push(&ctx->regexes);
+        if (regex == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        value[0].len--;
+        value[0].data++;
+
+        ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
+
+        if (value[0].data[0] == '*') {
+            value[0].len--;
+            value[0].data++;
+            rc.options = NGX_REGEX_CASELESS;
+        }
+
+        rc.pattern = value[0];
+        rc.err.len = NGX_MAX_CONF_ERRSTR;
+        rc.err.data = errstr;
+
+        regex->regex = ngx_stream_regex_compile(ctx->cf, &rc);
+        if (regex->regex == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        regex->value = var;
+
+        return NGX_CONF_OK;
+    }
+
+#endif
+
+    if (value[0].len && value[0].data[0] == '\\') {
+        value[0].len--;
+        value[0].data++;
+    }
+
+    rv = ngx_hash_add_key(&ctx->keys, &value[0], var,
+                          (ctx->hostnames) ? NGX_HASH_WILDCARD_KEY : 0);
+
+    if (rv == NGX_OK) {
+        return NGX_CONF_OK;
+    }
+
+    if (rv == NGX_DECLINED) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid hostname or wildcard \"%V\"", &value[0]);
+    }
+
+    if (rv == NGX_BUSY) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "conflicting parameter \"%V\"", &value[0]);
+    }
+
+    return NGX_CONF_ERROR;
+}
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 6c535fd..9d43109 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -10,6 +10,15 @@
 #include <ngx_stream.h>
 
 
+typedef struct {
+    ngx_addr_t                      *addr;
+    ngx_stream_complex_value_t      *value;
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+    ngx_uint_t                       transparent; /* unsigned  transparent:1; */
+#endif
+} ngx_stream_upstream_local_t;
+
+
 typedef struct {
     ngx_msec_t                       connect_timeout;
     ngx_msec_t                       timeout;
@@ -21,14 +30,14 @@ typedef struct {
     ngx_uint_t                       next_upstream_tries;
     ngx_flag_t                       next_upstream;
     ngx_flag_t                       proxy_protocol;
-    ngx_addr_t                      *local;
+    ngx_stream_upstream_local_t     *local;
 
 #if (NGX_STREAM_SSL)
     ngx_flag_t                       ssl_enable;
     ngx_flag_t                       ssl_session_reuse;
     ngx_uint_t                       ssl_protocols;
     ngx_str_t                        ssl_ciphers;
-    ngx_str_t                        ssl_name;
+    ngx_stream_complex_value_t      *ssl_name;
     ngx_flag_t                       ssl_server_name;
 
     ngx_flag_t                       ssl_verify;
@@ -43,12 +52,18 @@ typedef struct {
 #endif
 
     ngx_stream_upstream_srv_conf_t  *upstream;
+    ngx_stream_complex_value_t      *upstream_value;
 } ngx_stream_proxy_srv_conf_t;
 
 
 static void ngx_stream_proxy_handler(ngx_stream_session_t *s);
+static ngx_int_t ngx_stream_proxy_eval(ngx_stream_session_t *s,
+    ngx_stream_proxy_srv_conf_t *pscf);
+static ngx_int_t ngx_stream_proxy_set_local(ngx_stream_session_t *s,
+    ngx_stream_upstream_t *u, ngx_stream_upstream_local_t *local);
 static void ngx_stream_proxy_connect(ngx_stream_session_t *s);
 static void ngx_stream_proxy_init_upstream(ngx_stream_session_t *s);
+static void ngx_stream_proxy_resolve_handler(ngx_resolver_ctx_t *ctx);
 static void ngx_stream_proxy_upstream_handler(ngx_event_t *ev);
 static void ngx_stream_proxy_downstream_handler(ngx_event_t *ev);
 static void ngx_stream_proxy_process_connection(ngx_event_t *ev,
@@ -113,7 +128,7 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
       NULL },
 
     { ngx_string("proxy_bind"),
-      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE12,
       ngx_stream_proxy_bind,
       NGX_STREAM_SRV_CONF_OFFSET,
       0,
@@ -235,7 +250,7 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
 
     { ngx_string("proxy_ssl_name"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_stream_set_complex_value_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
       offsetof(ngx_stream_proxy_srv_conf_t, ssl_name),
       NULL },
@@ -303,6 +318,7 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_proxy_module_ctx = {
+    NULL,                                  /* preconfiguration */
     NULL,                                  /* postconfiguration */
 
     NULL,                                  /* create main configuration */
@@ -332,11 +348,16 @@ ngx_module_t  ngx_stream_proxy_module = {
 static void
 ngx_stream_proxy_handler(ngx_stream_session_t *s)
 {
-    u_char                          *p;
-    ngx_connection_t                *c;
-    ngx_stream_upstream_t           *u;
-    ngx_stream_proxy_srv_conf_t     *pscf;
-    ngx_stream_upstream_srv_conf_t  *uscf;
+    u_char                           *p;
+    ngx_str_t                        *host;
+    ngx_uint_t                        i;
+    ngx_connection_t                 *c;
+    ngx_resolver_ctx_t               *ctx, temp;
+    ngx_stream_upstream_t            *u;
+    ngx_stream_core_srv_conf_t       *cscf;
+    ngx_stream_proxy_srv_conf_t      *pscf;
+    ngx_stream_upstream_srv_conf_t   *uscf, **uscfp;
+    ngx_stream_upstream_main_conf_t  *umcf;
 
     c = s->connection;
 
@@ -358,10 +379,168 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
     u->peer.log = c->log;
     u->peer.log_error = NGX_ERROR_ERR;
 
-    u->peer.local = pscf->local;
+    if (ngx_stream_proxy_set_local(s, u, pscf->local) != NGX_OK) {
+        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        return;
+    }
+
     u->peer.type = c->type;
 
-    uscf = pscf->upstream;
+    u->proxy_protocol = pscf->proxy_protocol;
+    u->start_sec = ngx_time();
+
+    c->write->handler = ngx_stream_proxy_downstream_handler;
+    c->read->handler = ngx_stream_proxy_downstream_handler;
+
+    if (c->type == SOCK_STREAM) {
+        p = ngx_pnalloc(c->pool, pscf->buffer_size);
+        if (p == NULL) {
+            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            return;
+        }
+
+        u->downstream_buf.start = p;
+        u->downstream_buf.end = p + pscf->buffer_size;
+        u->downstream_buf.pos = p;
+        u->downstream_buf.last = p;
+
+        if (u->proxy_protocol
+#if (NGX_STREAM_SSL)
+            && pscf->ssl == NULL
+#endif
+            && pscf->buffer_size >= NGX_PROXY_PROTOCOL_MAX_HEADER)
+        {
+            /* optimization for a typical case */
+
+            ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                           "stream proxy send PROXY protocol header");
+
+            p = ngx_proxy_protocol_write(c, u->downstream_buf.last,
+                                         u->downstream_buf.end);
+            if (p == NULL) {
+                ngx_stream_proxy_finalize(s, NGX_ERROR);
+                return;
+            }
+
+            u->downstream_buf.last = p;
+            u->proxy_protocol = 0;
+        }
+
+        if (c->read->ready) {
+            ngx_post_event(c->read, &ngx_posted_events);
+        }
+    }
+
+    if (pscf->upstream_value) {
+        if (ngx_stream_proxy_eval(s, pscf) != NGX_OK) {
+            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            return;
+        }
+    }
+
+    if (u->resolved == NULL) {
+
+        uscf = pscf->upstream;
+
+    } else {
+
+#if (NGX_STREAM_SSL)
+        u->ssl_name = u->resolved->host;
+#endif
+
+        host = &u->resolved->host;
+
+        if (u->resolved->sockaddr) {
+
+            if (u->resolved->port == 0
+                && u->resolved->sockaddr->sa_family != AF_UNIX)
+            {
+                ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                              "no port in upstream \"%V\"", host);
+                ngx_stream_proxy_finalize(s, NGX_ERROR);
+                return;
+            }
+
+            if (ngx_stream_upstream_create_round_robin_peer(s, u->resolved)
+                != NGX_OK)
+            {
+                ngx_stream_proxy_finalize(s, NGX_ERROR);
+                return;
+            }
+
+            ngx_stream_proxy_connect(s);
+
+            return;
+        }
+
+        umcf = ngx_stream_get_module_main_conf(s, ngx_stream_upstream_module);
+
+        uscfp = umcf->upstreams.elts;
+
+        for (i = 0; i < umcf->upstreams.nelts; i++) {
+
+            uscf = uscfp[i];
+
+            if (uscf->host.len == host->len
+                && ((uscf->port == 0 && u->resolved->no_port)
+                     || uscf->port == u->resolved->port)
+                && ngx_strncasecmp(uscf->host.data, host->data, host->len) == 0)
+            {
+                goto found;
+            }
+        }
+
+        if (u->resolved->port == 0) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                          "no port in upstream \"%V\"", host);
+            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            return;
+        }
+
+        temp.name = *host;
+
+        cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
+
+        ctx = ngx_resolve_start(cscf->resolver, &temp);
+        if (ctx == NULL) {
+            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            return;
+        }
+
+        if (ctx == NGX_NO_RESOLVER) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                          "no resolver defined to resolve %V", host);
+            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            return;
+        }
+
+        ctx->name = *host;
+        ctx->handler = ngx_stream_proxy_resolve_handler;
+        ctx->data = s;
+        ctx->timeout = cscf->resolver_timeout;
+
+        u->resolved->ctx = ctx;
+
+        if (ngx_resolve_name(ctx) != NGX_OK) {
+            u->resolved->ctx = NULL;
+            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            return;
+        }
+
+        return;
+    }
+
+found:
+
+    if (uscf == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0, "no upstream configuration");
+        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        return;
+    }
+
+#if (NGX_HTTP_SSL)
+    u->ssl_name = uscf->host;
+#endif
 
     if (uscf->peer.init(s, uscf) != NGX_OK) {
         ngx_stream_proxy_finalize(s, NGX_ERROR);
@@ -376,55 +555,111 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
         u->peer.tries = pscf->next_upstream_tries;
     }
 
-    u->proxy_protocol = pscf->proxy_protocol;
-    u->start_sec = ngx_time();
+    ngx_stream_proxy_connect(s);
+}
 
-    c->write->handler = ngx_stream_proxy_downstream_handler;
-    c->read->handler = ngx_stream_proxy_downstream_handler;
 
-    if (c->type == SOCK_DGRAM) {
-        ngx_stream_proxy_connect(s);
-        return;
+static ngx_int_t
+ngx_stream_proxy_eval(ngx_stream_session_t *s,
+    ngx_stream_proxy_srv_conf_t *pscf)
+{
+    ngx_str_t               host;
+    ngx_url_t               url;
+    ngx_stream_upstream_t  *u;
+
+    if (ngx_stream_complex_value(s, pscf->upstream_value, &host) != NGX_OK) {
+        return NGX_ERROR;
     }
 
-    p = ngx_pnalloc(c->pool, pscf->buffer_size);
-    if (p == NULL) {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
-        return;
-    }
+    ngx_memzero(&url, sizeof(ngx_url_t));
 
-    u->downstream_buf.start = p;
-    u->downstream_buf.end = p + pscf->buffer_size;
-    u->downstream_buf.pos = p;
-    u->downstream_buf.last = p;
+    url.url = host;
+    url.no_resolve = 1;
 
-    if (u->proxy_protocol
-#if (NGX_STREAM_SSL)
-        && pscf->ssl == NULL
-#endif
-        && pscf->buffer_size >= NGX_PROXY_PROTOCOL_MAX_HEADER)
-    {
-        /* optimization for a typical case */
-
-        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
-                       "stream proxy send PROXY protocol header");
-
-        p = ngx_proxy_protocol_write(c, u->downstream_buf.last,
-                                     u->downstream_buf.end);
-        if (p == NULL) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
-            return;
+    if (ngx_parse_url(s->connection->pool, &url) != NGX_OK) {
+        if (url.err) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "%s in upstream \"%V\"", url.err, &url.url);
         }
 
-        u->downstream_buf.last = p;
-        u->proxy_protocol = 0;
+        return NGX_ERROR;
     }
 
-    if (c->read->ready) {
-        ngx_post_event(c->read, &ngx_posted_events);
+    u = s->upstream;
+
+    u->resolved = ngx_pcalloc(s->connection->pool,
+                              sizeof(ngx_stream_upstream_resolved_t));
+    if (u->resolved == NULL) {
+        return NGX_ERROR;
     }
 
-    ngx_stream_proxy_connect(s);
+    if (url.addrs && url.addrs[0].sockaddr) {
+        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 = url.host;
+    }
+
+    u->resolved->port = url.port;
+    u->resolved->no_port = url.no_port;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_proxy_set_local(ngx_stream_session_t *s, ngx_stream_upstream_t *u,
+    ngx_stream_upstream_local_t *local)
+{
+    ngx_int_t    rc;
+    ngx_str_t    val;
+    ngx_addr_t  *addr;
+
+    if (local == NULL) {
+        u->peer.local = NULL;
+        return NGX_OK;
+    }
+
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+    u->peer.transparent = local->transparent;
+#endif
+
+    if (local->value == NULL) {
+        u->peer.local = local->addr;
+        return NGX_OK;
+    }
+
+    if (ngx_stream_complex_value(s, local->value, &val) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (val.len == 0) {
+        return NGX_OK;
+    }
+
+    addr = ngx_palloc(s->connection->pool, sizeof(ngx_addr_t));
+    if (addr == NULL) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_parse_addr_port(s->connection->pool, addr, val.data, val.len);
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (rc != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "invalid local address \"%V\"", &val);
+        return NGX_OK;
+    }
+
+    addr->name = val;
+    u->peer.local = addr;
+
+    return NGX_OK;
 }
 
 
@@ -814,10 +1049,13 @@ ngx_stream_proxy_ssl_name(ngx_stream_session_t *s)
 
     u = s->upstream;
 
-    name = pscf->ssl_name;
+    if (pscf->ssl_name) {
+        if (ngx_stream_complex_value(s, pscf->ssl_name, &name) != NGX_OK) {
+            return NGX_ERROR;
+        }
 
-    if (name.len == 0) {
-        name = pscf->upstream->host;
+    } else {
+        name = u->ssl_name;
     }
 
     if (name.len == 0) {
@@ -906,6 +1144,75 @@ ngx_stream_proxy_downstream_handler(ngx_event_t *ev)
 }
 
 
+static void
+ngx_stream_proxy_resolve_handler(ngx_resolver_ctx_t *ctx)
+{
+    ngx_stream_session_t            *s;
+    ngx_stream_upstream_t           *u;
+    ngx_stream_proxy_srv_conf_t     *pscf;
+    ngx_stream_upstream_resolved_t  *ur;
+
+    s = ctx->data;
+
+    u = s->upstream;
+    ur = u->resolved;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
+                   "stream upstream resolve");
+
+    if (ctx->state) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "%V could not be resolved (%i: %s)",
+                      &ctx->name, ctx->state,
+                      ngx_resolver_strerror(ctx->state));
+
+        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        return;
+    }
+
+    ur->naddrs = ctx->naddrs;
+    ur->addrs = ctx->addrs;
+
+#if (NGX_DEBUG)
+    {
+    u_char      text[NGX_SOCKADDR_STRLEN];
+    ngx_str_t   addr;
+    ngx_uint_t  i;
+
+    addr.data = text;
+
+    for (i = 0; i < ctx->naddrs; i++) {
+        addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen,
+                                 text, NGX_SOCKADDR_STRLEN, 0);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                       "name was resolved to %V", &addr);
+    }
+    }
+#endif
+
+    if (ngx_stream_upstream_create_round_robin_peer(s, ur) != NGX_OK) {
+        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        return;
+    }
+
+    ngx_resolve_name_done(ctx);
+    ur->ctx = NULL;
+
+    u->peer.start_time = ngx_current_msec;
+
+    pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
+
+    if (pscf->next_upstream_tries
+        && u->peer.tries > pscf->next_upstream_tries)
+    {
+        u->peer.tries = pscf->next_upstream_tries;
+    }
+
+    ngx_stream_proxy_connect(s);
+}
+
+
 static void
 ngx_stream_proxy_upstream_handler(ngx_event_t *ev)
 {
@@ -1328,6 +1635,11 @@ ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_int_t rc)
         goto noupstream;
     }
 
+    if (u->resolved && u->resolved->ctx) {
+        ngx_resolve_name_done(u->resolved->ctx);
+        u->resolved->ctx = NULL;
+    }
+
     if (u->peer.free && u->peer.sockaddr) {
         u->peer.free(&u->peer, u->peer.data, 0);
         u->peer.sockaddr = NULL;
@@ -1402,7 +1714,7 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
      *
      *     conf->ssl_protocols = 0;
      *     conf->ssl_ciphers = { 0, NULL };
-     *     conf->ssl_name = { 0, NULL };
+     *     conf->ssl_name = NULL;
      *     conf->ssl_trusted_certificate = { 0, NULL };
      *     conf->ssl_crl = { 0, NULL };
      *     conf->ssl_certificate = { 0, NULL };
@@ -1410,6 +1722,7 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
      *
      *     conf->ssl = NULL;
      *     conf->upstream = NULL;
+     *     conf->upstream_value = NULL;
      */
 
     conf->connect_timeout = NGX_CONF_UNSET_MSEC;
@@ -1486,7 +1799,9 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT");
 
-    ngx_conf_merge_str_value(conf->ssl_name, prev->ssl_name, "");
+    if (conf->ssl_name == NULL) {
+        conf->ssl_name = prev->ssl_name;
+    }
 
     ngx_conf_merge_value(conf->ssl_server_name, prev->ssl_server_name, 0);
 
@@ -1561,13 +1876,7 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
         }
     }
 
-    if (SSL_CTX_set_cipher_list(pscf->ssl->ctx,
-                                (const char *) pscf->ssl_ciphers.data)
-        == 0)
-    {
-        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
-                      "SSL_CTX_set_cipher_list(\"%V\") failed",
-                      &pscf->ssl_ciphers);
+    if (ngx_ssl_ciphers(cf, pscf->ssl, &pscf->ssl_ciphers, 0) != NGX_OK) {
         return NGX_ERROR;
     }
 
@@ -1602,11 +1911,13 @@ ngx_stream_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_stream_proxy_srv_conf_t *pscf = conf;
 
-    ngx_url_t                    u;
-    ngx_str_t                   *value, *url;
-    ngx_stream_core_srv_conf_t  *cscf;
+    ngx_url_t                            u;
+    ngx_str_t                           *value, *url;
+    ngx_stream_complex_value_t           cv;
+    ngx_stream_core_srv_conf_t          *cscf;
+    ngx_stream_compile_complex_value_t   ccv;
 
-    if (pscf->upstream) {
+    if (pscf->upstream || pscf->upstream_value) {
         return "is duplicate";
     }
 
@@ -1618,6 +1929,28 @@ ngx_stream_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     url = &value[1];
 
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = url;
+    ccv.complex_value = &cv;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cv.lengths) {
+        pscf->upstream_value = ngx_palloc(cf->pool,
+                                          sizeof(ngx_stream_complex_value_t));
+        if (pscf->upstream_value == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *pscf->upstream_value = cv;
+
+        return NGX_CONF_OK;
+    }
+
     ngx_memzero(&u, sizeof(ngx_url_t));
 
     u.url = *url;
@@ -1637,8 +1970,11 @@ ngx_stream_proxy_bind(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_stream_proxy_srv_conf_t *pscf = conf;
 
-    ngx_int_t   rc;
-    ngx_str_t  *value;
+    ngx_int_t                            rc;
+    ngx_str_t                           *value;
+    ngx_stream_complex_value_t           cv;
+    ngx_stream_upstream_local_t         *local;
+    ngx_stream_compile_complex_value_t   ccv;
 
     if (pscf->local != NGX_CONF_UNSET_PTR) {
         return "is duplicate";
@@ -1646,29 +1982,75 @@ ngx_stream_proxy_bind(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     value = cf->args->elts;
 
-    if (ngx_strcmp(value[1].data, "off") == 0) {
+    if (cf->args->nelts == 2 && ngx_strcmp(value[1].data, "off") == 0) {
         pscf->local = NULL;
         return NGX_CONF_OK;
     }
 
-    pscf->local = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
-    if (pscf->local == NULL) {
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &cv;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
-    rc = ngx_parse_addr(cf->pool, pscf->local, value[1].data, value[1].len);
-
-    switch (rc) {
-    case NGX_OK:
-        pscf->local->name = value[1];
-        return NGX_CONF_OK;
-
-    case NGX_DECLINED:
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid address \"%V\"", &value[1]);
-        /* fall through */
-
-    default:
+    local = ngx_pcalloc(cf->pool, sizeof(ngx_stream_upstream_local_t));
+    if (local == NULL) {
         return NGX_CONF_ERROR;
     }
+
+    pscf->local = local;
+
+    if (cv.lengths) {
+        local->value = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));
+        if (local->value == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *local->value = cv;
+
+    } else {
+        local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
+        if (local->addr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        rc = ngx_parse_addr_port(cf->pool, local->addr, value[1].data,
+                                 value[1].len);
+
+        switch (rc) {
+        case NGX_OK:
+            local->addr->name = value[1];
+            break;
+
+        case NGX_DECLINED:
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid address \"%V\"", &value[1]);
+            /* fall through */
+
+        default:
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (cf->args->nelts > 2) {
+        if (ngx_strcmp(value[2].data, "transparent") == 0) {
+#if (NGX_HAVE_TRANSPARENT_PROXY)
+            local->transparent = 1;
+#else
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "transparent proxying is not supported "
+                               "on this platform, ignored");
+#endif
+        } else {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid parameter \"%V\"", &value[2]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    return NGX_CONF_OK;
 }
diff --git a/src/stream/ngx_stream_return_module.c b/src/stream/ngx_stream_return_module.c
new file mode 100644
index 0000000..3ab9bdf
--- /dev/null
+++ b/src/stream/ngx_stream_return_module.c
@@ -0,0 +1,207 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    ngx_stream_complex_value_t  text;
+} ngx_stream_return_srv_conf_t;
+
+
+typedef struct {
+    ngx_buf_t                   buf;
+} ngx_stream_return_ctx_t;
+
+
+static void ngx_stream_return_handler(ngx_stream_session_t *s);
+static void ngx_stream_return_write_handler(ngx_event_t *ev);
+
+static void *ngx_stream_return_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_stream_return(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
+
+static ngx_command_t  ngx_stream_return_commands[] = {
+
+    { ngx_string("return"),
+      NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_stream_return,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_return_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    ngx_stream_return_create_srv_conf,     /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_return_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_return_module_ctx,         /* module context */
+    ngx_stream_return_commands,            /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void
+ngx_stream_return_handler(ngx_stream_session_t *s)
+{
+    ngx_str_t                      text;
+    ngx_connection_t              *c;
+    ngx_stream_return_ctx_t       *ctx;
+    ngx_stream_return_srv_conf_t  *rscf;
+
+    c = s->connection;
+
+    c->log->action = "returning text";
+
+    rscf = ngx_stream_get_module_srv_conf(s, ngx_stream_return_module);
+
+    if (ngx_stream_complex_value(s, &rscf->text, &text) != NGX_OK) {
+        ngx_stream_close_connection(c);
+        return;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "stream return text: \"%V\"", &text);
+
+    if (text.len == 0) {
+        ngx_stream_close_connection(c);
+        return;
+    }
+
+    ctx = ngx_pcalloc(c->pool, sizeof(ngx_stream_return_ctx_t));
+    if (ctx == NULL) {
+        ngx_stream_close_connection(c);
+        return;
+    }
+
+    ngx_stream_set_ctx(s, ctx, ngx_stream_return_module);
+
+    ctx->buf.pos = text.data;
+    ctx->buf.last = text.data + text.len;
+
+    c->write->handler = ngx_stream_return_write_handler;
+
+    ngx_stream_return_write_handler(c->write);
+}
+
+
+static void
+ngx_stream_return_write_handler(ngx_event_t *ev)
+{
+    ssize_t                   n;
+    ngx_buf_t                *b;
+    ngx_connection_t         *c;
+    ngx_stream_session_t     *s;
+    ngx_stream_return_ctx_t  *ctx;
+
+    c = ev->data;
+    s = c->data;
+
+    if (ev->timedout) {
+        ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out");
+        ngx_stream_close_connection(c);
+        return;
+    }
+
+    if (ev->ready) {
+        ctx = ngx_stream_get_module_ctx(s, ngx_stream_return_module);
+
+        b = &ctx->buf;
+
+        n = c->send(c, b->pos, b->last - b->pos);
+        if (n == NGX_ERROR) {
+            ngx_stream_close_connection(c);
+            return;
+        }
+
+        if (n > 0) {
+            b->pos += n;
+
+            if (b->pos == b->last) {
+                ngx_stream_close_connection(c);
+                return;
+            }
+        }
+    }
+
+    if (ngx_handle_write_event(ev, 0) != NGX_OK) {
+        ngx_stream_close_connection(c);
+        return;
+    }
+
+    ngx_add_timer(ev, 5000);
+}
+
+
+static void *
+ngx_stream_return_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_stream_return_srv_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_return_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_return(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_return_srv_conf_t *rscf = conf;
+
+    ngx_str_t                           *value;
+    ngx_stream_core_srv_conf_t          *cscf;
+    ngx_stream_compile_complex_value_t   ccv;
+
+    if (rscf->text.value.data) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &rscf->text;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    cscf = ngx_stream_conf_get_module_srv_conf(cf, ngx_stream_core_module);
+
+    cscf->handler = ngx_stream_return_handler;
+
+    return NGX_CONF_OK;
+}
diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c
new file mode 100644
index 0000000..8130f92
--- /dev/null
+++ b/src/stream/ngx_stream_script.c
@@ -0,0 +1,854 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+static ngx_int_t ngx_stream_script_init_arrays(
+    ngx_stream_script_compile_t *sc);
+static ngx_int_t ngx_stream_script_done(ngx_stream_script_compile_t *sc);
+static ngx_int_t ngx_stream_script_add_copy_code(
+    ngx_stream_script_compile_t *sc, ngx_str_t *value, ngx_uint_t last);
+static ngx_int_t ngx_stream_script_add_var_code(
+    ngx_stream_script_compile_t *sc, ngx_str_t *name);
+#if (NGX_PCRE)
+static ngx_int_t ngx_stream_script_add_capture_code(
+    ngx_stream_script_compile_t *sc, ngx_uint_t n);
+#endif
+static ngx_int_t ngx_stream_script_add_full_name_code(
+    ngx_stream_script_compile_t *sc);
+static size_t ngx_stream_script_full_name_len_code(
+    ngx_stream_script_engine_t *e);
+static void ngx_stream_script_full_name_code(ngx_stream_script_engine_t *e);
+
+
+#define ngx_stream_script_exit  (u_char *) &ngx_stream_script_exit_code
+
+static uintptr_t ngx_stream_script_exit_code = (uintptr_t) NULL;
+
+
+void
+ngx_stream_script_flush_complex_value(ngx_stream_session_t *s,
+    ngx_stream_complex_value_t *val)
+{
+    ngx_uint_t *index;
+
+    index = val->flushes;
+
+    if (index) {
+        while (*index != (ngx_uint_t) -1) {
+
+            if (s->variables[*index].no_cacheable) {
+                s->variables[*index].valid = 0;
+                s->variables[*index].not_found = 0;
+            }
+
+            index++;
+        }
+    }
+}
+
+
+ngx_int_t
+ngx_stream_complex_value(ngx_stream_session_t *s,
+    ngx_stream_complex_value_t *val, ngx_str_t *value)
+{
+    size_t                         len;
+    ngx_stream_script_code_pt      code;
+    ngx_stream_script_engine_t     e;
+    ngx_stream_script_len_code_pt  lcode;
+
+    if (val->lengths == NULL) {
+        *value = val->value;
+        return NGX_OK;
+    }
+
+    ngx_stream_script_flush_complex_value(s, val);
+
+    ngx_memzero(&e, sizeof(ngx_stream_script_engine_t));
+
+    e.ip = val->lengths;
+    e.session = s;
+    e.flushed = 1;
+
+    len = 0;
+
+    while (*(uintptr_t *) e.ip) {
+        lcode = *(ngx_stream_script_len_code_pt *) e.ip;
+        len += lcode(&e);
+    }
+
+    value->len = len;
+    value->data = ngx_pnalloc(s->connection->pool, len);
+    if (value->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    e.ip = val->values;
+    e.pos = value->data;
+    e.buf = *value;
+
+    while (*(uintptr_t *) e.ip) {
+        code = *(ngx_stream_script_code_pt *) e.ip;
+        code((ngx_stream_script_engine_t *) &e);
+    }
+
+    *value = e.buf;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_stream_compile_complex_value(ngx_stream_compile_complex_value_t *ccv)
+{
+    ngx_str_t                    *v;
+    ngx_uint_t                    i, n, nv, nc;
+    ngx_array_t                   flushes, lengths, values, *pf, *pl, *pv;
+    ngx_stream_script_compile_t   sc;
+
+    v = ccv->value;
+
+    nv = 0;
+    nc = 0;
+
+    for (i = 0; i < v->len; i++) {
+        if (v->data[i] == '$') {
+            if (v->data[i + 1] >= '1' && v->data[i + 1] <= '9') {
+                nc++;
+
+            } else {
+                nv++;
+            }
+        }
+    }
+
+    if ((v->len == 0 || v->data[0] != '$')
+        && (ccv->conf_prefix || ccv->root_prefix))
+    {
+        if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        ccv->conf_prefix = 0;
+        ccv->root_prefix = 0;
+    }
+
+    ccv->complex_value->value = *v;
+    ccv->complex_value->flushes = NULL;
+    ccv->complex_value->lengths = NULL;
+    ccv->complex_value->values = NULL;
+
+    if (nv == 0 && nc == 0) {
+        return NGX_OK;
+    }
+
+    n = nv + 1;
+
+    if (ngx_array_init(&flushes, ccv->cf->pool, n, sizeof(ngx_uint_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    n = nv * (2 * sizeof(ngx_stream_script_copy_code_t)
+                  + sizeof(ngx_stream_script_var_code_t))
+        + sizeof(uintptr_t);
+
+    if (ngx_array_init(&lengths, ccv->cf->pool, n, 1) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    n = (nv * (2 * sizeof(ngx_stream_script_copy_code_t)
+                   + sizeof(ngx_stream_script_var_code_t))
+                + sizeof(uintptr_t)
+                + v->len
+                + sizeof(uintptr_t) - 1)
+            & ~(sizeof(uintptr_t) - 1);
+
+    if (ngx_array_init(&values, ccv->cf->pool, n, 1) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    pf = &flushes;
+    pl = &lengths;
+    pv = &values;
+
+    ngx_memzero(&sc, sizeof(ngx_stream_script_compile_t));
+
+    sc.cf = ccv->cf;
+    sc.source = v;
+    sc.flushes = &pf;
+    sc.lengths = &pl;
+    sc.values = &pv;
+    sc.complete_lengths = 1;
+    sc.complete_values = 1;
+    sc.zero = ccv->zero;
+    sc.conf_prefix = ccv->conf_prefix;
+    sc.root_prefix = ccv->root_prefix;
+
+    if (ngx_stream_script_compile(&sc) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (flushes.nelts) {
+        ccv->complex_value->flushes = flushes.elts;
+        ccv->complex_value->flushes[flushes.nelts] = (ngx_uint_t) -1;
+    }
+
+    ccv->complex_value->lengths = lengths.elts;
+    ccv->complex_value->values = values.elts;
+
+    return NGX_OK;
+}
+
+
+char *
+ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t                            *value;
+    ngx_stream_complex_value_t          **cv;
+    ngx_stream_compile_complex_value_t    ccv;
+
+    cv = (ngx_stream_complex_value_t **) (p + cmd->offset);
+
+    if (*cv != NULL) {
+        return "duplicate";
+    }
+
+    *cv = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));
+    if (*cv == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = *cv;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+ngx_uint_t
+ngx_stream_script_variables_count(ngx_str_t *value)
+{
+    ngx_uint_t  i, n;
+
+    for (n = 0, i = 0; i < value->len; i++) {
+        if (value->data[i] == '$') {
+            n++;
+        }
+    }
+
+    return n;
+}
+
+
+ngx_int_t
+ngx_stream_script_compile(ngx_stream_script_compile_t *sc)
+{
+    u_char       ch;
+    ngx_str_t    name;
+    ngx_uint_t   i, bracket;
+
+    if (ngx_stream_script_init_arrays(sc) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    for (i = 0; i < sc->source->len; /* void */ ) {
+
+        name.len = 0;
+
+        if (sc->source->data[i] == '$') {
+
+            if (++i == sc->source->len) {
+                goto invalid_variable;
+            }
+
+            if (sc->source->data[i] >= '1' && sc->source->data[i] <= '9') {
+#if (NGX_PCRE)
+                ngx_uint_t  n;
+
+                n = sc->source->data[i] - '0';
+
+                if (ngx_stream_script_add_capture_code(sc, n) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+
+                i++;
+
+                continue;
+#else
+                ngx_conf_log_error(NGX_LOG_EMERG, sc->cf, 0,
+                                   "using variable \"$%c\" requires "
+                                   "PCRE library", sc->source->data[i]);
+                return NGX_ERROR;
+#endif
+            }
+
+            if (sc->source->data[i] == '{') {
+                bracket = 1;
+
+                if (++i == sc->source->len) {
+                    goto invalid_variable;
+                }
+
+                name.data = &sc->source->data[i];
+
+            } else {
+                bracket = 0;
+                name.data = &sc->source->data[i];
+            }
+
+            for ( /* void */ ; i < sc->source->len; i++, name.len++) {
+                ch = sc->source->data[i];
+
+                if (ch == '}' && bracket) {
+                    i++;
+                    bracket = 0;
+                    break;
+                }
+
+                if ((ch >= 'A' && ch <= 'Z')
+                    || (ch >= 'a' && ch <= 'z')
+                    || (ch >= '0' && ch <= '9')
+                    || ch == '_')
+                {
+                    continue;
+                }
+
+                break;
+            }
+
+            if (bracket) {
+                ngx_conf_log_error(NGX_LOG_EMERG, sc->cf, 0,
+                                   "the closing bracket in \"%V\" "
+                                   "variable is missing", &name);
+                return NGX_ERROR;
+            }
+
+            if (name.len == 0) {
+                goto invalid_variable;
+            }
+
+            sc->variables++;
+
+            if (ngx_stream_script_add_var_code(sc, &name) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            continue;
+        }
+
+        name.data = &sc->source->data[i];
+
+        while (i < sc->source->len) {
+
+            if (sc->source->data[i] == '$') {
+                break;
+            }
+
+            i++;
+            name.len++;
+        }
+
+        sc->size += name.len;
+
+        if (ngx_stream_script_add_copy_code(sc, &name, (i == sc->source->len))
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    return ngx_stream_script_done(sc);
+
+invalid_variable:
+
+    ngx_conf_log_error(NGX_LOG_EMERG, sc->cf, 0, "invalid variable name");
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_stream_script_init_arrays(ngx_stream_script_compile_t *sc)
+{
+    ngx_uint_t   n;
+
+    if (sc->flushes && *sc->flushes == NULL) {
+        n = sc->variables ? sc->variables : 1;
+        *sc->flushes = ngx_array_create(sc->cf->pool, n, sizeof(ngx_uint_t));
+        if (*sc->flushes == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (*sc->lengths == NULL) {
+        n = sc->variables * (2 * sizeof(ngx_stream_script_copy_code_t)
+                             + sizeof(ngx_stream_script_var_code_t))
+            + sizeof(uintptr_t);
+
+        *sc->lengths = ngx_array_create(sc->cf->pool, n, 1);
+        if (*sc->lengths == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (*sc->values == NULL) {
+        n = (sc->variables * (2 * sizeof(ngx_stream_script_copy_code_t)
+                              + sizeof(ngx_stream_script_var_code_t))
+                + sizeof(uintptr_t)
+                + sc->source->len
+                + sizeof(uintptr_t) - 1)
+            & ~(sizeof(uintptr_t) - 1);
+
+        *sc->values = ngx_array_create(sc->cf->pool, n, 1);
+        if (*sc->values == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    sc->variables = 0;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_script_done(ngx_stream_script_compile_t *sc)
+{
+    ngx_str_t    zero;
+    uintptr_t   *code;
+
+    if (sc->zero) {
+
+        zero.len = 1;
+        zero.data = (u_char *) "\0";
+
+        if (ngx_stream_script_add_copy_code(sc, &zero, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (sc->conf_prefix || sc->root_prefix) {
+        if (ngx_stream_script_add_full_name_code(sc) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (sc->complete_lengths) {
+        code = ngx_stream_script_add_code(*sc->lengths, sizeof(uintptr_t),
+                                          NULL);
+        if (code == NULL) {
+            return NGX_ERROR;
+        }
+
+        *code = (uintptr_t) NULL;
+    }
+
+    if (sc->complete_values) {
+        code = ngx_stream_script_add_code(*sc->values, sizeof(uintptr_t),
+                                          &sc->main);
+        if (code == NULL) {
+            return NGX_ERROR;
+        }
+
+        *code = (uintptr_t) NULL;
+    }
+
+    return NGX_OK;
+}
+
+
+void *
+ngx_stream_script_add_code(ngx_array_t *codes, size_t size, void *code)
+{
+    u_char  *elts, **p;
+    void    *new;
+
+    elts = codes->elts;
+
+    new = ngx_array_push_n(codes, size);
+    if (new == NULL) {
+        return NULL;
+    }
+
+    if (code) {
+        if (elts != codes->elts) {
+            p = code;
+            *p += (u_char *) codes->elts - elts;
+        }
+    }
+
+    return new;
+}
+
+
+static ngx_int_t
+ngx_stream_script_add_copy_code(ngx_stream_script_compile_t *sc,
+    ngx_str_t *value, ngx_uint_t last)
+{
+    u_char                         *p;
+    size_t                          size, len, zero;
+    ngx_stream_script_copy_code_t  *code;
+
+    zero = (sc->zero && last);
+    len = value->len + zero;
+
+    code = ngx_stream_script_add_code(*sc->lengths,
+                                      sizeof(ngx_stream_script_copy_code_t),
+                                      NULL);
+    if (code == NULL) {
+        return NGX_ERROR;
+    }
+
+    code->code = (ngx_stream_script_code_pt) ngx_stream_script_copy_len_code;
+    code->len = len;
+
+    size = (sizeof(ngx_stream_script_copy_code_t) + len + sizeof(uintptr_t) - 1)
+            & ~(sizeof(uintptr_t) - 1);
+
+    code = ngx_stream_script_add_code(*sc->values, size, &sc->main);
+    if (code == NULL) {
+        return NGX_ERROR;
+    }
+
+    code->code = ngx_stream_script_copy_code;
+    code->len = len;
+
+    p = ngx_cpymem((u_char *) code + sizeof(ngx_stream_script_copy_code_t),
+                   value->data, value->len);
+
+    if (zero) {
+        *p = '\0';
+        sc->zero = 0;
+    }
+
+    return NGX_OK;
+}
+
+
+size_t
+ngx_stream_script_copy_len_code(ngx_stream_script_engine_t *e)
+{
+    ngx_stream_script_copy_code_t  *code;
+
+    code = (ngx_stream_script_copy_code_t *) e->ip;
+
+    e->ip += sizeof(ngx_stream_script_copy_code_t);
+
+    return code->len;
+}
+
+
+void
+ngx_stream_script_copy_code(ngx_stream_script_engine_t *e)
+{
+    u_char                         *p;
+    ngx_stream_script_copy_code_t  *code;
+
+    code = (ngx_stream_script_copy_code_t *) e->ip;
+
+    p = e->pos;
+
+    if (!e->skip) {
+        e->pos = ngx_copy(p, e->ip + sizeof(ngx_stream_script_copy_code_t),
+                          code->len);
+    }
+
+    e->ip += sizeof(ngx_stream_script_copy_code_t)
+          + ((code->len + sizeof(uintptr_t) - 1) & ~(sizeof(uintptr_t) - 1));
+
+    ngx_log_debug2(NGX_LOG_DEBUG_STREAM, e->session->connection->log, 0,
+                   "stream script copy: \"%*s\"", e->pos - p, p);
+}
+
+
+static ngx_int_t
+ngx_stream_script_add_var_code(ngx_stream_script_compile_t *sc, ngx_str_t *name)
+{
+    ngx_int_t                      index, *p;
+    ngx_stream_script_var_code_t  *code;
+
+    index = ngx_stream_get_variable_index(sc->cf, name);
+
+    if (index == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (sc->flushes) {
+        p = ngx_array_push(*sc->flushes);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        *p = index;
+    }
+
+    code = ngx_stream_script_add_code(*sc->lengths,
+                                      sizeof(ngx_stream_script_var_code_t),
+                                      NULL);
+    if (code == NULL) {
+        return NGX_ERROR;
+    }
+
+    code->code = (ngx_stream_script_code_pt)
+                      ngx_stream_script_copy_var_len_code;
+    code->index = (uintptr_t) index;
+
+    code = ngx_stream_script_add_code(*sc->values,
+                                      sizeof(ngx_stream_script_var_code_t),
+                                      &sc->main);
+    if (code == NULL) {
+        return NGX_ERROR;
+    }
+
+    code->code = ngx_stream_script_copy_var_code;
+    code->index = (uintptr_t) index;
+
+    return NGX_OK;
+}
+
+
+size_t
+ngx_stream_script_copy_var_len_code(ngx_stream_script_engine_t *e)
+{
+    ngx_stream_variable_value_t   *value;
+    ngx_stream_script_var_code_t  *code;
+
+    code = (ngx_stream_script_var_code_t *) e->ip;
+
+    e->ip += sizeof(ngx_stream_script_var_code_t);
+
+    if (e->flushed) {
+        value = ngx_stream_get_indexed_variable(e->session, code->index);
+
+    } else {
+        value = ngx_stream_get_flushed_variable(e->session, code->index);
+    }
+
+    if (value && !value->not_found) {
+        return value->len;
+    }
+
+    return 0;
+}
+
+
+void
+ngx_stream_script_copy_var_code(ngx_stream_script_engine_t *e)
+{
+    u_char                        *p;
+    ngx_stream_variable_value_t   *value;
+    ngx_stream_script_var_code_t  *code;
+
+    code = (ngx_stream_script_var_code_t *) e->ip;
+
+    e->ip += sizeof(ngx_stream_script_var_code_t);
+
+    if (!e->skip) {
+
+        if (e->flushed) {
+            value = ngx_stream_get_indexed_variable(e->session, code->index);
+
+        } else {
+            value = ngx_stream_get_flushed_variable(e->session, code->index);
+        }
+
+        if (value && !value->not_found) {
+            p = e->pos;
+            e->pos = ngx_copy(p, value->data, value->len);
+
+            ngx_log_debug2(NGX_LOG_DEBUG_STREAM,
+                           e->session->connection->log, 0,
+                           "stream script var: \"%*s\"", e->pos - p, p);
+        }
+    }
+}
+
+
+#if (NGX_PCRE)
+
+static ngx_int_t
+ngx_stream_script_add_capture_code(ngx_stream_script_compile_t *sc,
+    ngx_uint_t n)
+{
+    ngx_stream_script_copy_capture_code_t  *code;
+
+    code = ngx_stream_script_add_code(*sc->lengths,
+                                  sizeof(ngx_stream_script_copy_capture_code_t),
+                                  NULL);
+    if (code == NULL) {
+        return NGX_ERROR;
+    }
+
+    code->code = (ngx_stream_script_code_pt)
+                      ngx_stream_script_copy_capture_len_code;
+    code->n = 2 * n;
+
+
+    code = ngx_stream_script_add_code(*sc->values,
+                                  sizeof(ngx_stream_script_copy_capture_code_t),
+                                  &sc->main);
+    if (code == NULL) {
+        return NGX_ERROR;
+    }
+
+    code->code = ngx_stream_script_copy_capture_code;
+    code->n = 2 * n;
+
+    if (sc->ncaptures < n) {
+        sc->ncaptures = n;
+    }
+
+    return NGX_OK;
+}
+
+
+size_t
+ngx_stream_script_copy_capture_len_code(ngx_stream_script_engine_t *e)
+{
+    int                                    *cap;
+    ngx_uint_t                              n;
+    ngx_stream_session_t                   *s;
+    ngx_stream_script_copy_capture_code_t  *code;
+
+    s = e->session;
+
+    code = (ngx_stream_script_copy_capture_code_t *) e->ip;
+
+    e->ip += sizeof(ngx_stream_script_copy_capture_code_t);
+
+    n = code->n;
+
+    if (n < s->ncaptures) {
+        cap = s->captures;
+        return cap[n + 1] - cap[n];
+    }
+
+    return 0;
+}
+
+
+void
+ngx_stream_script_copy_capture_code(ngx_stream_script_engine_t *e)
+{
+    int                                    *cap;
+    u_char                                 *p, *pos;
+    ngx_uint_t                              n;
+    ngx_stream_session_t                   *s;
+    ngx_stream_script_copy_capture_code_t  *code;
+
+    s = e->session;
+
+    code = (ngx_stream_script_copy_capture_code_t *) e->ip;
+
+    e->ip += sizeof(ngx_stream_script_copy_capture_code_t);
+
+    n = code->n;
+
+    pos = e->pos;
+
+    if (n < s->ncaptures) {
+        cap = s->captures;
+        p = s->captures_data;
+        e->pos = ngx_copy(pos, &p[cap[n]], cap[n + 1] - cap[n]);
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_STREAM, e->session->connection->log, 0,
+                   "stream script capture: \"%*s\"", e->pos - pos, pos);
+}
+
+#endif
+
+
+static ngx_int_t
+ngx_stream_script_add_full_name_code(ngx_stream_script_compile_t *sc)
+{
+    ngx_stream_script_full_name_code_t  *code;
+
+    code = ngx_stream_script_add_code(*sc->lengths,
+                                    sizeof(ngx_stream_script_full_name_code_t),
+                                    NULL);
+    if (code == NULL) {
+        return NGX_ERROR;
+    }
+
+    code->code = (ngx_stream_script_code_pt)
+                                          ngx_stream_script_full_name_len_code;
+    code->conf_prefix = sc->conf_prefix;
+
+    code = ngx_stream_script_add_code(*sc->values,
+                        sizeof(ngx_stream_script_full_name_code_t), &sc->main);
+    if (code == NULL) {
+        return NGX_ERROR;
+    }
+
+    code->code = ngx_stream_script_full_name_code;
+    code->conf_prefix = sc->conf_prefix;
+
+    return NGX_OK;
+}
+
+
+static size_t
+ngx_stream_script_full_name_len_code(ngx_stream_script_engine_t *e)
+{
+    ngx_stream_script_full_name_code_t  *code;
+
+    code = (ngx_stream_script_full_name_code_t *) e->ip;
+
+    e->ip += sizeof(ngx_stream_script_full_name_code_t);
+
+    return code->conf_prefix ? ngx_cycle->conf_prefix.len:
+                               ngx_cycle->prefix.len;
+}
+
+
+static void
+ngx_stream_script_full_name_code(ngx_stream_script_engine_t *e)
+{
+    ngx_stream_script_full_name_code_t  *code;
+
+    ngx_str_t  value, *prefix;
+
+    code = (ngx_stream_script_full_name_code_t *) e->ip;
+
+    value.data = e->buf.data;
+    value.len = e->pos - e->buf.data;
+
+    prefix = code->conf_prefix ? (ngx_str_t *) &ngx_cycle->conf_prefix:
+                                 (ngx_str_t *) &ngx_cycle->prefix;
+
+    if (ngx_get_full_name(e->session->connection->pool, prefix, &value)
+        != NGX_OK)
+    {
+        e->ip = ngx_stream_script_exit;
+        return;
+    }
+
+    e->buf = value;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, e->session->connection->log, 0,
+                   "stream script fullname: \"%V\"", &value);
+
+    e->ip += sizeof(ngx_stream_script_full_name_code_t);
+}
diff --git a/src/stream/ngx_stream_script.h b/src/stream/ngx_stream_script.h
new file mode 100644
index 0000000..0abe50e
--- /dev/null
+++ b/src/stream/ngx_stream_script.h
@@ -0,0 +1,123 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_STREAM_SCRIPT_H_INCLUDED_
+#define _NGX_STREAM_SCRIPT_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    u_char                       *ip;
+    u_char                       *pos;
+    ngx_stream_variable_value_t  *sp;
+
+    ngx_str_t                     buf;
+    ngx_str_t                     line;
+
+    unsigned                      flushed:1;
+    unsigned                      skip:1;
+
+    ngx_stream_session_t         *session;
+} ngx_stream_script_engine_t;
+
+
+typedef struct {
+    ngx_conf_t                   *cf;
+    ngx_str_t                    *source;
+
+    ngx_array_t                 **flushes;
+    ngx_array_t                 **lengths;
+    ngx_array_t                 **values;
+
+    ngx_uint_t                    variables;
+    ngx_uint_t                    ncaptures;
+    ngx_uint_t                    size;
+
+    void                         *main;
+
+    unsigned                      complete_lengths:1;
+    unsigned                      complete_values:1;
+    unsigned                      zero:1;
+    unsigned                      conf_prefix:1;
+    unsigned                      root_prefix:1;
+} ngx_stream_script_compile_t;
+
+
+typedef struct {
+    ngx_str_t                     value;
+    ngx_uint_t                   *flushes;
+    void                         *lengths;
+    void                         *values;
+} ngx_stream_complex_value_t;
+
+
+typedef struct {
+    ngx_conf_t                   *cf;
+    ngx_str_t                    *value;
+    ngx_stream_complex_value_t   *complex_value;
+
+    unsigned                      zero:1;
+    unsigned                      conf_prefix:1;
+    unsigned                      root_prefix:1;
+} ngx_stream_compile_complex_value_t;
+
+
+typedef void (*ngx_stream_script_code_pt) (ngx_stream_script_engine_t *e);
+typedef size_t (*ngx_stream_script_len_code_pt) (ngx_stream_script_engine_t *e);
+
+
+typedef struct {
+    ngx_stream_script_code_pt     code;
+    uintptr_t                     len;
+} ngx_stream_script_copy_code_t;
+
+
+typedef struct {
+    ngx_stream_script_code_pt     code;
+    uintptr_t                     index;
+} ngx_stream_script_var_code_t;
+
+
+typedef struct {
+    ngx_stream_script_code_pt     code;
+    uintptr_t                     n;
+} ngx_stream_script_copy_capture_code_t;
+
+
+typedef struct {
+    ngx_stream_script_code_pt     code;
+    uintptr_t                     conf_prefix;
+} ngx_stream_script_full_name_code_t;
+
+
+void ngx_stream_script_flush_complex_value(ngx_stream_session_t *s,
+    ngx_stream_complex_value_t *val);
+ngx_int_t ngx_stream_complex_value(ngx_stream_session_t *s,
+    ngx_stream_complex_value_t *val, ngx_str_t *value);
+ngx_int_t ngx_stream_compile_complex_value(
+    ngx_stream_compile_complex_value_t *ccv);
+char *ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+
+ngx_uint_t ngx_stream_script_variables_count(ngx_str_t *value);
+ngx_int_t ngx_stream_script_compile(ngx_stream_script_compile_t *sc);
+
+void *ngx_stream_script_add_code(ngx_array_t *codes, size_t size, void *code);
+
+size_t ngx_stream_script_copy_len_code(ngx_stream_script_engine_t *e);
+void ngx_stream_script_copy_code(ngx_stream_script_engine_t *e);
+size_t ngx_stream_script_copy_var_len_code(ngx_stream_script_engine_t *e);
+void ngx_stream_script_copy_var_code(ngx_stream_script_engine_t *e);
+size_t ngx_stream_script_copy_capture_len_code(ngx_stream_script_engine_t *e);
+void ngx_stream_script_copy_capture_code(ngx_stream_script_engine_t *e);
+
+#endif /* _NGX_STREAM_SCRIPT_H_INCLUDED_ */
diff --git a/src/stream/ngx_stream_split_clients_module.c b/src/stream/ngx_stream_split_clients_module.c
new file mode 100644
index 0000000..af6c8a1
--- /dev/null
+++ b/src/stream/ngx_stream_split_clients_module.c
@@ -0,0 +1,244 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    uint32_t                      percent;
+    ngx_stream_variable_value_t   value;
+} ngx_stream_split_clients_part_t;
+
+
+typedef struct {
+    ngx_stream_complex_value_t    value;
+    ngx_array_t                   parts;
+} ngx_stream_split_clients_ctx_t;
+
+
+static char *ngx_conf_split_clients_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_split_clients(ngx_conf_t *cf, ngx_command_t *dummy,
+    void *conf);
+
+static ngx_command_t  ngx_stream_split_clients_commands[] = {
+
+    { ngx_string("split_clients"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE2,
+      ngx_conf_split_clients_block,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_split_clients_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_split_clients_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_split_clients_module_ctx,  /* module context */
+    ngx_stream_split_clients_commands,     /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_stream_split_clients_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_stream_split_clients_ctx_t *ctx =
+                                       (ngx_stream_split_clients_ctx_t *) data;
+
+    uint32_t                          hash;
+    ngx_str_t                         val;
+    ngx_uint_t                        i;
+    ngx_stream_split_clients_part_t  *part;
+
+    *v = ngx_stream_variable_null_value;
+
+    if (ngx_stream_complex_value(s, &ctx->value, &val) != NGX_OK) {
+        return NGX_OK;
+    }
+
+    hash = ngx_murmur_hash2(val.data, val.len);
+
+    part = ctx->parts.elts;
+
+    for (i = 0; i < ctx->parts.nelts; i++) {
+
+        ngx_log_debug2(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                       "stream split: %uD %uD", hash, part[i].percent);
+
+        if (hash < part[i].percent || part[i].percent == 0) {
+            *v = part[i].value;
+            return NGX_OK;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_conf_split_clients_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char                                *rv;
+    uint32_t                             sum, last;
+    ngx_str_t                           *value, name;
+    ngx_uint_t                           i;
+    ngx_conf_t                           save;
+    ngx_stream_variable_t               *var;
+    ngx_stream_split_clients_ctx_t      *ctx;
+    ngx_stream_split_clients_part_t     *part;
+    ngx_stream_compile_complex_value_t   ccv;
+
+    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_stream_split_clients_ctx_t));
+    if (ctx == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &ctx->value;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    name = value[2];
+
+    if (name.data[0] != '$') {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"%V\"", &name);
+        return NGX_CONF_ERROR;
+    }
+
+    name.len--;
+    name.data++;
+
+    var = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    var->get_handler = ngx_stream_split_clients_variable;
+    var->data = (uintptr_t) ctx;
+
+    if (ngx_array_init(&ctx->parts, cf->pool, 2,
+                       sizeof(ngx_stream_split_clients_part_t))
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    save = *cf;
+    cf->ctx = ctx;
+    cf->handler = ngx_stream_split_clients;
+    cf->handler_conf = conf;
+
+    rv = ngx_conf_parse(cf, NULL);
+
+    *cf = save;
+
+    if (rv != NGX_CONF_OK) {
+        return rv;
+    }
+
+    sum = 0;
+    last = 0;
+    part = ctx->parts.elts;
+
+    for (i = 0; i < ctx->parts.nelts; i++) {
+        sum = part[i].percent ? sum + part[i].percent : 10000;
+        if (sum > 10000) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "percent total is greater than 100%%");
+            return NGX_CONF_ERROR;
+        }
+
+        if (part[i].percent) {
+            last += part[i].percent * (uint64_t) 0xffffffff / 10000;
+            part[i].percent = last;
+        }
+    }
+
+    return rv;
+}
+
+
+static char *
+ngx_stream_split_clients(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    ngx_int_t                         n;
+    ngx_str_t                        *value;
+    ngx_stream_split_clients_ctx_t   *ctx;
+    ngx_stream_split_clients_part_t  *part;
+
+    ctx = cf->ctx;
+    value = cf->args->elts;
+
+    part = ngx_array_push(&ctx->parts);
+    if (part == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (value[0].len == 1 && value[0].data[0] == '*') {
+        part->percent = 0;
+
+    } else {
+        if (value[0].len == 0 || value[0].data[value[0].len - 1] != '%') {
+            goto invalid;
+        }
+
+        n = ngx_atofp(value[0].data, value[0].len - 1, 2);
+        if (n == NGX_ERROR || n == 0) {
+            goto invalid;
+        }
+
+        part->percent = (uint32_t) n;
+    }
+
+    part->value.len = value[1].len;
+    part->value.valid = 1;
+    part->value.no_cacheable = 0;
+    part->value.not_found = 0;
+    part->value.data = value[1].data;
+
+    return NGX_CONF_OK;
+
+invalid:
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "invalid percent value \"%V\"", &value[0]);
+    return NGX_CONF_ERROR;
+}
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index e12da1b..2661220 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -10,10 +10,20 @@
 #include <ngx_stream.h>
 
 
+typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
+    ngx_pool_t *pool, ngx_str_t *s);
+
+
 #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
-#define NGX_DEFAULT_ECDH_CURVE  "prime256v1"
+#define NGX_DEFAULT_ECDH_CURVE  "auto"
 
 
+static ngx_int_t ngx_stream_ssl_static_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_ssl_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+
+static ngx_int_t ngx_stream_ssl_add_variables(ngx_conf_t *cf);
 static void *ngx_stream_ssl_create_conf(ngx_conf_t *cf);
 static char *ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent,
     void *child);
@@ -45,16 +55,16 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
 
     { ngx_string("ssl_certificate"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_conf_set_str_array_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, certificate),
+      offsetof(ngx_stream_ssl_conf_t, certificates),
       NULL },
 
     { ngx_string("ssl_certificate_key"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_conf_set_str_array_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, certificate_key),
+      offsetof(ngx_stream_ssl_conf_t, certificate_keys),
       NULL },
 
     { ngx_string("ssl_password_file"),
@@ -132,6 +142,7 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_ssl_module_ctx = {
+    ngx_stream_ssl_add_variables,          /* preconfiguration */
     NULL,                                  /* postconfiguration */
 
     NULL,                                  /* create main configuration */
@@ -158,9 +169,112 @@ ngx_module_t  ngx_stream_ssl_module = {
 };
 
 
+static ngx_stream_variable_t  ngx_stream_ssl_vars[] = {
+
+    { ngx_string("ssl_protocol"), NULL, ngx_stream_ssl_static_variable,
+      (uintptr_t) ngx_ssl_get_protocol, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_cipher"), NULL, ngx_stream_ssl_static_variable,
+      (uintptr_t) ngx_ssl_get_cipher_name, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_session_id"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_session_id, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_session_reused"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_session_reused, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_server_name"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_server_name, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
 static ngx_str_t ngx_stream_ssl_sess_id_ctx = ngx_string("STREAM");
 
 
+static ngx_int_t
+ngx_stream_ssl_static_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_ssl_variable_handler_pt  handler = (ngx_ssl_variable_handler_pt) data;
+
+    size_t     len;
+    ngx_str_t  str;
+
+    if (s->connection->ssl) {
+
+        (void) handler(s->connection, NULL, &str);
+
+        v->data = str.data;
+
+        for (len = 0; v->data[len]; len++) { /* void */ }
+
+        v->len = len;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+
+        return NGX_OK;
+    }
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_ssl_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_ssl_variable_handler_pt  handler = (ngx_ssl_variable_handler_pt) data;
+
+    ngx_str_t  str;
+
+    if (s->connection->ssl) {
+
+        if (handler(s->connection, s->connection->pool, &str) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        v->len = str.len;
+        v->data = str.data;
+
+        if (v->len) {
+            v->valid = 1;
+            v->no_cacheable = 0;
+            v->not_found = 0;
+
+            return NGX_OK;
+        }
+    }
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_ssl_add_variables(ngx_conf_t *cf)
+{
+    ngx_stream_variable_t  *var, *v;
+
+    for (v = ngx_stream_ssl_vars; v->name.len; v++) {
+        var = ngx_stream_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
 static void *
 ngx_stream_ssl_create_conf(ngx_conf_t *cf)
 {
@@ -175,8 +289,6 @@ ngx_stream_ssl_create_conf(ngx_conf_t *cf)
      * set by ngx_pcalloc():
      *
      *     scf->protocols = 0;
-     *     scf->certificate = { 0, NULL };
-     *     scf->certificate_key = { 0, NULL };
      *     scf->dhparam = { 0, NULL };
      *     scf->ecdh_curve = { 0, NULL };
      *     scf->ciphers = { 0, NULL };
@@ -184,6 +296,8 @@ ngx_stream_ssl_create_conf(ngx_conf_t *cf)
      */
 
     scf->handshake_timeout = NGX_CONF_UNSET_MSEC;
+    scf->certificates = NGX_CONF_UNSET_PTR;
+    scf->certificate_keys = NGX_CONF_UNSET_PTR;
     scf->passwords = NGX_CONF_UNSET_PTR;
     scf->prefer_server_ciphers = NGX_CONF_UNSET;
     scf->builtin_session_cache = NGX_CONF_UNSET;
@@ -216,8 +330,9 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
                          (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
                           |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
 
-    ngx_conf_merge_str_value(conf->certificate, prev->certificate, "");
-    ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, "");
+    ngx_conf_merge_ptr_value(conf->certificates, prev->certificates, NULL);
+    ngx_conf_merge_ptr_value(conf->certificate_keys, prev->certificate_keys,
+                         NULL);
 
     ngx_conf_merge_ptr_value(conf->passwords, prev->passwords, NULL);
 
@@ -231,15 +346,18 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     conf->ssl.log = cf->log;
 
-    if (conf->certificate.len == 0) {
+    if (conf->certificates == NULL) {
         return NGX_CONF_OK;
     }
 
-    if (conf->certificate_key.len == 0) {
+    if (conf->certificate_keys == NULL
+        || conf->certificate_keys->nelts < conf->certificates->nelts)
+    {
         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                       "no \"ssl_certificate_key\" is defined "
                       "for certificate \"%V\"",
-                      &conf->certificate);
+                      ((ngx_str_t *) conf->certificates->elts)
+                      + conf->certificates->nelts - 1);
         return NGX_CONF_ERROR;
     }
 
@@ -255,31 +373,20 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = &conf->ssl;
 
-    if (ngx_ssl_certificate(cf, &conf->ssl, &conf->certificate,
-                            &conf->certificate_key, conf->passwords)
+    if (ngx_ssl_certificates(cf, &conf->ssl, conf->certificates,
+                             conf->certificate_keys, conf->passwords)
         != NGX_OK)
     {
         return NGX_CONF_ERROR;
     }
 
-    if (SSL_CTX_set_cipher_list(conf->ssl.ctx,
-                                (const char *) conf->ciphers.data)
-        == 0)
+    if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
+                        conf->prefer_server_ciphers)
+        != NGX_OK)
     {
-        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
-                      "SSL_CTX_set_cipher_list(\"%V\") failed",
-                      &conf->ciphers);
         return NGX_CONF_ERROR;
     }
 
-    if (conf->prefer_server_ciphers) {
-        SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
-    }
-
-#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
-    SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback);
-#endif
-
     if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
diff --git a/src/stream/ngx_stream_ssl_module.h b/src/stream/ngx_stream_ssl_module.h
index 85e8b6e..9b1c41a 100644
--- a/src/stream/ngx_stream_ssl_module.h
+++ b/src/stream/ngx_stream_ssl_module.h
@@ -27,8 +27,9 @@ typedef struct {
 
     time_t           session_timeout;
 
-    ngx_str_t        certificate;
-    ngx_str_t        certificate_key;
+    ngx_array_t     *certificates;
+    ngx_array_t     *certificate_keys;
+
     ngx_str_t        dhparam;
     ngx_str_t        ecdh_curve;
 
diff --git a/src/stream/ngx_stream_upstream.c b/src/stream/ngx_stream_upstream.c
index 69dddc5..2ea5eeb 100644
--- a/src/stream/ngx_stream_upstream.c
+++ b/src/stream/ngx_stream_upstream.c
@@ -39,13 +39,14 @@ static ngx_command_t  ngx_stream_upstream_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_upstream_module_ctx = {
+    NULL,                                  /* preconfiguration */
     NULL,                                  /* postconfiguration */
 
     ngx_stream_upstream_create_main_conf,  /* create main configuration */
     ngx_stream_upstream_init_main_conf,    /* init main configuration */
 
     NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index 1f4810c..5f067c0 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -78,6 +78,21 @@ struct ngx_stream_upstream_srv_conf_s {
 };
 
 
+typedef struct {
+    ngx_str_t                          host;
+    in_port_t                          port;
+    ngx_uint_t                         no_port; /* unsigned no_port:1 */
+
+    ngx_uint_t                         naddrs;
+    ngx_resolver_addr_t               *addrs;
+
+    struct sockaddr                   *sockaddr;
+    socklen_t                          socklen;
+
+    ngx_resolver_ctx_t                *ctx;
+} ngx_stream_upstream_resolved_t;
+
+
 typedef struct {
     ngx_peer_connection_t              peer;
     ngx_buf_t                          downstream_buf;
@@ -88,6 +103,7 @@ typedef struct {
 #if (NGX_STREAM_SSL)
     ngx_str_t                          ssl_name;
 #endif
+    ngx_stream_upstream_resolved_t    *resolved;
     unsigned                           connected:1;
     unsigned                           proxy_protocol:1;
 } ngx_stream_upstream_t;
diff --git a/src/stream/ngx_stream_upstream_hash_module.c b/src/stream/ngx_stream_upstream_hash_module.c
index 56ff7d6..88185eb 100644
--- a/src/stream/ngx_stream_upstream_hash_module.c
+++ b/src/stream/ngx_stream_upstream_hash_module.c
@@ -23,6 +23,7 @@ typedef struct {
 
 
 typedef struct {
+    ngx_stream_complex_value_t            key;
     ngx_stream_upstream_chash_points_t   *points;
 } ngx_stream_upstream_hash_srv_conf_t;
 
@@ -76,13 +77,14 @@ static ngx_command_t  ngx_stream_upstream_hash_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_upstream_hash_module_ctx = {
+    NULL,                                  /* preconfiguration */
     NULL,                                  /* postconfiguration */
 
     NULL,                                  /* create main configuration */
     NULL,                                  /* init main configuration */
 
     ngx_stream_upstream_hash_create_conf,  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 
@@ -140,7 +142,9 @@ ngx_stream_upstream_init_hash_peer(ngx_stream_session_t *s,
     hcf = ngx_stream_conf_upstream_srv_conf(us,
                                             ngx_stream_upstream_hash_module);
 
-    hp->key = s->connection->addr_text;
+    if (ngx_stream_complex_value(s, &hcf->key, &hp->key) != NGX_OK) {
+        return NGX_ERROR;
+    }
 
     ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
                    "upstream hash key:\"%V\"", &hp->key);
@@ -615,15 +619,21 @@ ngx_stream_upstream_hash_create_conf(ngx_conf_t *cf)
 static char *
 ngx_stream_upstream_hash(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    ngx_str_t                       *value;
-    ngx_stream_upstream_srv_conf_t  *uscf;
+    ngx_stream_upstream_hash_srv_conf_t  *hcf = conf;
+
+    ngx_str_t                           *value;
+    ngx_stream_upstream_srv_conf_t      *uscf;
+    ngx_stream_compile_complex_value_t   ccv;
 
     value = cf->args->elts;
 
-    if (ngx_strcmp(value[1].data, "$remote_addr")) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "unsupported hash key \"%V\", use $remote_addr",
-                           &value[1]);
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &hcf->key;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
diff --git a/src/stream/ngx_stream_upstream_least_conn_module.c b/src/stream/ngx_stream_upstream_least_conn_module.c
index c9719f9..e884975 100644
--- a/src/stream/ngx_stream_upstream_least_conn_module.c
+++ b/src/stream/ngx_stream_upstream_least_conn_module.c
@@ -32,13 +32,14 @@ static ngx_command_t  ngx_stream_upstream_least_conn_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_upstream_least_conn_module_ctx = {
+    NULL,                                    /* preconfiguration */
     NULL,                                    /* postconfiguration */
 
     NULL,                                    /* create main configuration */
     NULL,                                    /* init main configuration */
 
     NULL,                                    /* create server configuration */
-    NULL,                                    /* merge server configuration */
+    NULL                                     /* merge server configuration */
 };
 
 
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
index e1ab592..7aced0f 100644
--- a/src/stream/ngx_stream_upstream_round_robin.c
+++ b/src/stream/ngx_stream_upstream_round_robin.c
@@ -23,6 +23,10 @@ static ngx_int_t ngx_stream_upstream_set_round_robin_peer_session(
     ngx_peer_connection_t *pc, void *data);
 static void ngx_stream_upstream_save_round_robin_peer_session(
     ngx_peer_connection_t *pc, void *data);
+static ngx_int_t ngx_stream_upstream_empty_set_session(
+    ngx_peer_connection_t *pc, void *data);
+static void ngx_stream_upstream_empty_save_session(ngx_peer_connection_t *pc,
+    void *data);
 
 #endif
 
@@ -292,6 +296,123 @@ ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s,
 }
 
 
+ngx_int_t
+ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
+    ngx_stream_upstream_resolved_t *ur)
+{
+    u_char                              *p;
+    size_t                               len;
+    socklen_t                            socklen;
+    ngx_uint_t                           i, n;
+    struct sockaddr                     *sockaddr;
+    ngx_stream_upstream_rr_peer_t       *peer, **peerp;
+    ngx_stream_upstream_rr_peers_t      *peers;
+    ngx_stream_upstream_rr_peer_data_t  *rrp;
+
+    rrp = s->upstream->peer.data;
+
+    if (rrp == NULL) {
+        rrp = ngx_palloc(s->connection->pool,
+                         sizeof(ngx_stream_upstream_rr_peer_data_t));
+        if (rrp == NULL) {
+            return NGX_ERROR;
+        }
+
+        s->upstream->peer.data = rrp;
+    }
+
+    peers = ngx_pcalloc(s->connection->pool,
+                        sizeof(ngx_stream_upstream_rr_peers_t));
+    if (peers == NULL) {
+        return NGX_ERROR;
+    }
+
+    peer = ngx_pcalloc(s->connection->pool,
+                       sizeof(ngx_stream_upstream_rr_peer_t) * ur->naddrs);
+    if (peer == NULL) {
+        return NGX_ERROR;
+    }
+
+    peers->single = (ur->naddrs == 1);
+    peers->number = ur->naddrs;
+    peers->name = &ur->host;
+
+    if (ur->sockaddr) {
+        peer[0].sockaddr = ur->sockaddr;
+        peer[0].socklen = ur->socklen;
+        peer[0].name = ur->host;
+        peer[0].weight = 1;
+        peer[0].effective_weight = 1;
+        peer[0].current_weight = 0;
+        peer[0].max_fails = 1;
+        peer[0].fail_timeout = 10;
+        peers->peer = peer;
+
+    } else {
+        peerp = &peers->peer;
+
+        for (i = 0; i < ur->naddrs; i++) {
+
+            socklen = ur->addrs[i].socklen;
+
+            sockaddr = ngx_palloc(s->connection->pool, socklen);
+            if (sockaddr == NULL) {
+                return NGX_ERROR;
+            }
+
+            ngx_memcpy(sockaddr, ur->addrs[i].sockaddr, socklen);
+            ngx_inet_set_port(sockaddr, ur->port);
+
+            p = ngx_pnalloc(s->connection->pool, NGX_SOCKADDR_STRLEN);
+            if (p == NULL) {
+                return NGX_ERROR;
+            }
+
+            len = ngx_sock_ntop(sockaddr, socklen, p, NGX_SOCKADDR_STRLEN, 1);
+
+            peer[i].sockaddr = sockaddr;
+            peer[i].socklen = socklen;
+            peer[i].name.len = len;
+            peer[i].name.data = p;
+            peer[i].weight = 1;
+            peer[i].effective_weight = 1;
+            peer[i].current_weight = 0;
+            peer[i].max_fails = 1;
+            peer[i].fail_timeout = 10;
+            *peerp = &peer[i];
+            peerp = &peer[i].next;
+        }
+    }
+
+    rrp->peers = peers;
+    rrp->current = NULL;
+
+    if (rrp->peers->number <= 8 * sizeof(uintptr_t)) {
+        rrp->tried = &rrp->data;
+        rrp->data = 0;
+
+    } else {
+        n = (rrp->peers->number + (8 * sizeof(uintptr_t) - 1))
+                / (8 * sizeof(uintptr_t));
+
+        rrp->tried = ngx_pcalloc(s->connection->pool, n * sizeof(uintptr_t));
+        if (rrp->tried == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    s->upstream->peer.get = ngx_stream_upstream_get_round_robin_peer;
+    s->upstream->peer.free = ngx_stream_upstream_free_round_robin_peer;
+    s->upstream->peer.tries = ngx_stream_upstream_tries(rrp->peers);
+#if (NGX_STREAM_SSL)
+    s->upstream->peer.set_session = ngx_stream_upstream_empty_set_session;
+    s->upstream->peer.save_session = ngx_stream_upstream_empty_save_session;
+#endif
+
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_stream_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
 {
@@ -699,4 +820,18 @@ ngx_stream_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc,
     }
 }
 
+
+static ngx_int_t
+ngx_stream_upstream_empty_set_session(ngx_peer_connection_t *pc, void *data)
+{
+    return NGX_OK;
+}
+
+
+static void
+ngx_stream_upstream_empty_save_session(ngx_peer_connection_t *pc, void *data)
+{
+    return;
+}
+
 #endif
diff --git a/src/stream/ngx_stream_upstream_round_robin.h b/src/stream/ngx_stream_upstream_round_robin.h
index 77ee0ab..452c2e9 100644
--- a/src/stream/ngx_stream_upstream_round_robin.h
+++ b/src/stream/ngx_stream_upstream_round_robin.h
@@ -130,6 +130,8 @@ ngx_int_t ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
     ngx_stream_upstream_srv_conf_t *us);
 ngx_int_t ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s,
     ngx_stream_upstream_srv_conf_t *us);
+ngx_int_t ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
+    ngx_stream_upstream_resolved_t *ur);
 ngx_int_t ngx_stream_upstream_get_round_robin_peer(ngx_peer_connection_t *pc,
     void *data);
 void ngx_stream_upstream_free_round_robin_peer(ngx_peer_connection_t *pc,
diff --git a/src/stream/ngx_stream_upstream_zone_module.c b/src/stream/ngx_stream_upstream_zone_module.c
index ffc9e8a..07ab88d 100644
--- a/src/stream/ngx_stream_upstream_zone_module.c
+++ b/src/stream/ngx_stream_upstream_zone_module.c
@@ -32,13 +32,14 @@ static ngx_command_t  ngx_stream_upstream_zone_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_upstream_zone_module_ctx = {
+    NULL,                                  /* preconfiguration */
     NULL,                                  /* postconfiguration */
 
     NULL,                                  /* create main configuration */
     NULL,                                  /* init main configuration */
 
     NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
new file mode 100644
index 0000000..10f9c7e
--- /dev/null
+++ b/src/stream/ngx_stream_variables.c
@@ -0,0 +1,971 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+#include <nginx.h>
+
+
+static ngx_int_t ngx_stream_variable_binary_remote_addr(
+    ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_remote_addr(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_remote_port(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_server_addr(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_server_port(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_bytes_sent(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_connection(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+
+static ngx_int_t ngx_stream_variable_nginx_version(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_hostname(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_pid(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_msec(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_time_iso8601(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_time_local(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+
+
+static ngx_stream_variable_t  ngx_stream_core_variables[] = {
+
+    { ngx_string("binary_remote_addr"), NULL,
+      ngx_stream_variable_binary_remote_addr, 0, 0, 0 },
+
+    { ngx_string("remote_addr"), NULL,
+      ngx_stream_variable_remote_addr, 0, 0, 0 },
+
+    { ngx_string("remote_port"), NULL,
+      ngx_stream_variable_remote_port, 0, 0, 0 },
+
+    { ngx_string("server_addr"), NULL,
+      ngx_stream_variable_server_addr, 0, 0, 0 },
+
+    { ngx_string("server_port"), NULL,
+      ngx_stream_variable_server_port, 0, 0, 0 },
+
+    { ngx_string("bytes_sent"), NULL, ngx_stream_variable_bytes_sent,
+      0, 0, 0 },
+
+    { ngx_string("connection"), NULL,
+      ngx_stream_variable_connection, 0, 0, 0 },
+
+    { ngx_string("nginx_version"), NULL, ngx_stream_variable_nginx_version,
+      0, 0, 0 },
+
+    { ngx_string("hostname"), NULL, ngx_stream_variable_hostname,
+      0, 0, 0 },
+
+    { ngx_string("pid"), NULL, ngx_stream_variable_pid,
+      0, 0, 0 },
+
+    { ngx_string("msec"), NULL, ngx_stream_variable_msec,
+      0, NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("time_iso8601"), NULL, ngx_stream_variable_time_iso8601,
+      0, NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("time_local"), NULL, ngx_stream_variable_time_local,
+      0, NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
+ngx_stream_variable_value_t  ngx_stream_variable_null_value =
+    ngx_stream_variable("");
+ngx_stream_variable_value_t  ngx_stream_variable_true_value =
+    ngx_stream_variable("1");
+
+
+ngx_stream_variable_t *
+ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
+{
+    ngx_int_t                     rc;
+    ngx_uint_t                    i;
+    ngx_hash_key_t               *key;
+    ngx_stream_variable_t        *v;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    if (name->len == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"$\"");
+        return NULL;
+    }
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    key = cmcf->variables_keys->keys.elts;
+    for (i = 0; i < cmcf->variables_keys->keys.nelts; i++) {
+        if (name->len != key[i].key.len
+            || ngx_strncasecmp(name->data, key[i].key.data, name->len) != 0)
+        {
+            continue;
+        }
+
+        v = key[i].value;
+
+        if (!(v->flags & NGX_STREAM_VAR_CHANGEABLE)) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "the duplicate \"%V\" variable", name);
+            return NULL;
+        }
+
+        return v;
+    }
+
+    v = ngx_palloc(cf->pool, sizeof(ngx_stream_variable_t));
+    if (v == NULL) {
+        return NULL;
+    }
+
+    v->name.len = name->len;
+    v->name.data = ngx_pnalloc(cf->pool, name->len);
+    if (v->name.data == NULL) {
+        return NULL;
+    }
+
+    ngx_strlow(v->name.data, name->data, name->len);
+
+    v->set_handler = NULL;
+    v->get_handler = NULL;
+    v->data = 0;
+    v->flags = flags;
+    v->index = 0;
+
+    rc = ngx_hash_add_key(cmcf->variables_keys, &v->name, v, 0);
+
+    if (rc == NGX_ERROR) {
+        return NULL;
+    }
+
+    if (rc == NGX_BUSY) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "conflicting variable name \"%V\"", name);
+        return NULL;
+    }
+
+    return v;
+}
+
+
+ngx_int_t
+ngx_stream_get_variable_index(ngx_conf_t *cf, ngx_str_t *name)
+{
+    ngx_uint_t                    i;
+    ngx_stream_variable_t        *v;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    if (name->len == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"$\"");
+        return NGX_ERROR;
+    }
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    v = cmcf->variables.elts;
+
+    if (v == NULL) {
+        if (ngx_array_init(&cmcf->variables, cf->pool, 4,
+                           sizeof(ngx_stream_variable_t))
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+    } else {
+        for (i = 0; i < cmcf->variables.nelts; i++) {
+            if (name->len != v[i].name.len
+                || ngx_strncasecmp(name->data, v[i].name.data, name->len) != 0)
+            {
+                continue;
+            }
+
+            return i;
+        }
+    }
+
+    v = ngx_array_push(&cmcf->variables);
+    if (v == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->name.len = name->len;
+    v->name.data = ngx_pnalloc(cf->pool, name->len);
+    if (v->name.data == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_strlow(v->name.data, name->data, name->len);
+
+    v->set_handler = NULL;
+    v->get_handler = NULL;
+    v->data = 0;
+    v->flags = 0;
+    v->index = cmcf->variables.nelts - 1;
+
+    return v->index;
+}
+
+
+ngx_stream_variable_value_t *
+ngx_stream_get_indexed_variable(ngx_stream_session_t *s, ngx_uint_t index)
+{
+    ngx_stream_variable_t        *v;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
+
+    if (cmcf->variables.nelts <= index) {
+        ngx_log_error(NGX_LOG_ALERT, s->connection->log, 0,
+                      "unknown variable index: %ui", index);
+        return NULL;
+    }
+
+    if (s->variables[index].not_found || s->variables[index].valid) {
+        return &s->variables[index];
+    }
+
+    v = cmcf->variables.elts;
+
+    if (v[index].get_handler(s, &s->variables[index], v[index].data)
+        == NGX_OK)
+    {
+        if (v[index].flags & NGX_STREAM_VAR_NOCACHEABLE) {
+            s->variables[index].no_cacheable = 1;
+        }
+
+        return &s->variables[index];
+    }
+
+    s->variables[index].valid = 0;
+    s->variables[index].not_found = 1;
+
+    return NULL;
+}
+
+
+ngx_stream_variable_value_t *
+ngx_stream_get_flushed_variable(ngx_stream_session_t *s, ngx_uint_t index)
+{
+    ngx_stream_variable_value_t  *v;
+
+    v = &s->variables[index];
+
+    if (v->valid || v->not_found) {
+        if (!v->no_cacheable) {
+            return v;
+        }
+
+        v->valid = 0;
+        v->not_found = 0;
+    }
+
+    return ngx_stream_get_indexed_variable(s, index);
+}
+
+
+ngx_stream_variable_value_t *
+ngx_stream_get_variable(ngx_stream_session_t *s, ngx_str_t *name,
+    ngx_uint_t key)
+{
+    ngx_stream_variable_t        *v;
+    ngx_stream_variable_value_t  *vv;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
+
+    v = ngx_hash_find(&cmcf->variables_hash, key, name->data, name->len);
+
+    if (v) {
+        if (v->flags & NGX_STREAM_VAR_INDEXED) {
+            return ngx_stream_get_flushed_variable(s, v->index);
+
+        } else {
+
+            vv = ngx_palloc(s->connection->pool,
+                            sizeof(ngx_stream_variable_value_t));
+
+            if (vv && v->get_handler(s, vv, v->data) == NGX_OK) {
+                return vv;
+            }
+
+            return NULL;
+        }
+    }
+
+    vv = ngx_palloc(s->connection->pool, sizeof(ngx_stream_variable_value_t));
+    if (vv == NULL) {
+        return NULL;
+    }
+
+    vv->not_found = 1;
+
+    return vv;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_binary_remote_addr(ngx_stream_session_t *s,
+     ngx_stream_variable_value_t *v, uintptr_t data)
+ {
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
+
+    switch (s->connection->sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) s->connection->sockaddr;
+
+        v->len = sizeof(struct in6_addr);
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = sin6->sin6_addr.s6_addr;
+
+        break;
+#endif
+
+    default: /* AF_INET */
+        sin = (struct sockaddr_in *) s->connection->sockaddr;
+
+        v->len = sizeof(in_addr_t);
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = (u_char *) &sin->sin_addr;
+
+        break;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_remote_addr(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    v->len = s->connection->addr_text.len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = s->connection->addr_text.data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_remote_port(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_uint_t  port;
+
+    v->len = 0;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    v->data = ngx_pnalloc(s->connection->pool, sizeof("65535") - 1);
+    if (v->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    port = ngx_inet_get_port(s->connection->sockaddr);
+
+    if (port > 0 && port < 65536) {
+        v->len = ngx_sprintf(v->data, "%ui", port) - v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_server_addr(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_str_t  str;
+    u_char     addr[NGX_SOCKADDR_STRLEN];
+
+    str.len = NGX_SOCKADDR_STRLEN;
+    str.data = addr;
+
+    if (ngx_connection_local_sockaddr(s->connection, &str, 0) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    str.data = ngx_pnalloc(s->connection->pool, str.len);
+    if (str.data == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(str.data, addr, str.len);
+
+    v->len = str.len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = str.data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_server_port(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_uint_t  port;
+
+    v->len = 0;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    if (ngx_connection_local_sockaddr(s->connection, NULL, 0) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    v->data = ngx_pnalloc(s->connection->pool, sizeof("65535") - 1);
+    if (v->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    port = ngx_inet_get_port(s->connection->local_sockaddr);
+
+    if (port > 0 && port < 65536) {
+        v->len = ngx_sprintf(v->data, "%ui", port) - v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_bytes_sent(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char  *p;
+
+    p = ngx_pnalloc(s->connection->pool, NGX_OFF_T_LEN);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->len = ngx_sprintf(p, "%O", s->connection->sent) - p;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = p;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_connection(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char  *p;
+
+    p = ngx_pnalloc(s->connection->pool, NGX_ATOMIC_T_LEN);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->len = ngx_sprintf(p, "%uA", s->connection->number) - p;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = p;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_nginx_version(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    v->len = sizeof(NGINX_VERSION) - 1;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = (u_char *) NGINX_VERSION;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_hostname(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    v->len = ngx_cycle->hostname.len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = ngx_cycle->hostname.data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_pid(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char  *p;
+
+    p = ngx_pnalloc(s->connection->pool, NGX_INT64_LEN);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->len = ngx_sprintf(p, "%P", ngx_pid) - p;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = p;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_msec(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char      *p;
+    ngx_time_t  *tp;
+
+    p = ngx_pnalloc(s->connection->pool, NGX_TIME_T_LEN + 4);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    tp = ngx_timeofday();
+
+    v->len = ngx_sprintf(p, "%T.%03M", tp->sec, tp->msec) - p;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = p;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_time_iso8601(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char  *p;
+
+    p = ngx_pnalloc(s->connection->pool, ngx_cached_http_log_iso8601.len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(p, ngx_cached_http_log_iso8601.data,
+               ngx_cached_http_log_iso8601.len);
+
+    v->len = ngx_cached_http_log_iso8601.len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = p;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_time_local(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char  *p;
+
+    p = ngx_pnalloc(s->connection->pool, ngx_cached_http_log_time.len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(p, ngx_cached_http_log_time.data, ngx_cached_http_log_time.len);
+
+    v->len = ngx_cached_http_log_time.len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = p;
+
+    return NGX_OK;
+}
+
+
+void *
+ngx_stream_map_find(ngx_stream_session_t *s, ngx_stream_map_t *map,
+    ngx_str_t *match)
+{
+    void        *value;
+    u_char      *low;
+    size_t       len;
+    ngx_uint_t   key;
+
+    len = match->len;
+
+    if (len) {
+        low = ngx_pnalloc(s->connection->pool, len);
+        if (low == NULL) {
+            return NULL;
+        }
+
+    } else {
+        low = NULL;
+    }
+
+    key = ngx_hash_strlow(low, match->data, len);
+
+    value = ngx_hash_find_combined(&map->hash, key, low, len);
+    if (value) {
+        return value;
+    }
+
+#if (NGX_PCRE)
+
+    if (len && map->nregex) {
+        ngx_int_t                n;
+        ngx_uint_t               i;
+        ngx_stream_map_regex_t  *reg;
+
+        reg = map->regex;
+
+        for (i = 0; i < map->nregex; i++) {
+
+            n = ngx_stream_regex_exec(s, reg[i].regex, match);
+
+            if (n == NGX_OK) {
+                return reg[i].value;
+            }
+
+            if (n == NGX_DECLINED) {
+                continue;
+            }
+
+            /* NGX_ERROR */
+
+            return NULL;
+        }
+    }
+
+#endif
+
+    return NULL;
+}
+
+
+#if (NGX_PCRE)
+
+static ngx_int_t
+ngx_stream_variable_not_found(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    v->not_found = 1;
+    return NGX_OK;
+}
+
+
+ngx_stream_regex_t *
+ngx_stream_regex_compile(ngx_conf_t *cf, ngx_regex_compile_t *rc)
+{
+    u_char                       *p;
+    size_t                        size;
+    ngx_str_t                     name;
+    ngx_uint_t                    i, n;
+    ngx_stream_variable_t        *v;
+    ngx_stream_regex_t           *re;
+    ngx_stream_regex_variable_t  *rv;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    rc->pool = cf->pool;
+
+    if (ngx_regex_compile(rc) != NGX_OK) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc->err);
+        return NULL;
+    }
+
+    re = ngx_pcalloc(cf->pool, sizeof(ngx_stream_regex_t));
+    if (re == NULL) {
+        return NULL;
+    }
+
+    re->regex = rc->regex;
+    re->ncaptures = rc->captures;
+    re->name = rc->pattern;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+    cmcf->ncaptures = ngx_max(cmcf->ncaptures, re->ncaptures);
+
+    n = (ngx_uint_t) rc->named_captures;
+
+    if (n == 0) {
+        return re;
+    }
+
+    rv = ngx_palloc(rc->pool, n * sizeof(ngx_stream_regex_variable_t));
+    if (rv == NULL) {
+        return NULL;
+    }
+
+    re->variables = rv;
+    re->nvariables = n;
+
+    size = rc->name_size;
+    p = rc->names;
+
+    for (i = 0; i < n; i++) {
+        rv[i].capture = 2 * ((p[0] << 8) + p[1]);
+
+        name.data = &p[2];
+        name.len = ngx_strlen(name.data);
+
+        v = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
+        if (v == NULL) {
+            return NULL;
+        }
+
+        rv[i].index = ngx_stream_get_variable_index(cf, &name);
+        if (rv[i].index == NGX_ERROR) {
+            return NULL;
+        }
+
+        v->get_handler = ngx_stream_variable_not_found;
+
+        p += size;
+    }
+
+    return re;
+}
+
+
+ngx_int_t
+ngx_stream_regex_exec(ngx_stream_session_t *s, ngx_stream_regex_t *re,
+    ngx_str_t *str)
+{
+    ngx_int_t                     rc, index;
+    ngx_uint_t                    i, n, len;
+    ngx_stream_variable_value_t  *vv;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
+
+    if (re->ncaptures) {
+        len = cmcf->ncaptures;
+
+        if (s->captures == NULL) {
+            s->captures = ngx_palloc(s->connection->pool, len * sizeof(int));
+            if (s->captures == NULL) {
+                return NGX_ERROR;
+            }
+        }
+
+    } else {
+        len = 0;
+    }
+
+    rc = ngx_regex_exec(re->regex, str, s->captures, len);
+
+    if (rc == NGX_REGEX_NO_MATCHED) {
+        return NGX_DECLINED;
+    }
+
+    if (rc < 0) {
+        ngx_log_error(NGX_LOG_ALERT, s->connection->log, 0,
+                      ngx_regex_exec_n " failed: %i on \"%V\" using \"%V\"",
+                      rc, str, &re->name);
+        return NGX_ERROR;
+    }
+
+    for (i = 0; i < re->nvariables; i++) {
+
+        n = re->variables[i].capture;
+        index = re->variables[i].index;
+        vv = &s->variables[index];
+
+        vv->len = s->captures[n + 1] - s->captures[n];
+        vv->valid = 1;
+        vv->no_cacheable = 0;
+        vv->not_found = 0;
+        vv->data = &str->data[s->captures[n]];
+
+#if (NGX_DEBUG)
+        {
+        ngx_stream_variable_t  *v;
+
+        v = cmcf->variables.elts;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                       "stream regex set $%V to \"%v\"", &v[index].name, vv);
+        }
+#endif
+    }
+
+    s->ncaptures = rc * 2;
+    s->captures_data = str->data;
+
+    return NGX_OK;
+}
+
+#endif
+
+
+ngx_int_t
+ngx_stream_variables_add_core_vars(ngx_conf_t *cf)
+{
+    ngx_int_t                     rc;
+    ngx_stream_variable_t        *cv, *v;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    cmcf->variables_keys = ngx_pcalloc(cf->temp_pool,
+                                       sizeof(ngx_hash_keys_arrays_t));
+    if (cmcf->variables_keys == NULL) {
+        return NGX_ERROR;
+    }
+
+    cmcf->variables_keys->pool = cf->pool;
+    cmcf->variables_keys->temp_pool = cf->pool;
+
+    if (ngx_hash_keys_array_init(cmcf->variables_keys, NGX_HASH_SMALL)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    for (cv = ngx_stream_core_variables; cv->name.len; cv++) {
+        v = ngx_palloc(cf->pool, sizeof(ngx_stream_variable_t));
+        if (v == NULL) {
+            return NGX_ERROR;
+        }
+
+        *v = *cv;
+
+        rc = ngx_hash_add_key(cmcf->variables_keys, &v->name, v,
+                              NGX_HASH_READONLY_KEY);
+
+        if (rc == NGX_OK) {
+            continue;
+        }
+
+        if (rc == NGX_BUSY) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "conflicting variable name \"%V\"", &v->name);
+        }
+
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_stream_variables_init_vars(ngx_conf_t *cf)
+{
+    ngx_uint_t                    i, n;
+    ngx_hash_key_t               *key;
+    ngx_hash_init_t               hash;
+    ngx_stream_variable_t        *v, *av;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    /* set the handlers for the indexed stream variables */
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    v = cmcf->variables.elts;
+    key = cmcf->variables_keys->keys.elts;
+
+    for (i = 0; i < cmcf->variables.nelts; i++) {
+
+        for (n = 0; n < cmcf->variables_keys->keys.nelts; n++) {
+
+            av = key[n].value;
+
+            if (v[i].name.len == key[n].key.len
+                && ngx_strncmp(v[i].name.data, key[n].key.data, v[i].name.len)
+                   == 0)
+            {
+                v[i].get_handler = av->get_handler;
+                v[i].data = av->data;
+
+                av->flags |= NGX_STREAM_VAR_INDEXED;
+                v[i].flags = av->flags;
+
+                av->index = i;
+
+                if (av->get_handler == NULL) {
+                    break;
+                }
+
+                goto next;
+            }
+        }
+
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "unknown \"%V\" variable", &v[i].name);
+
+        return NGX_ERROR;
+
+    next:
+        continue;
+    }
+
+
+    for (n = 0; n < cmcf->variables_keys->keys.nelts; n++) {
+        av = key[n].value;
+
+        if (av->flags & NGX_STREAM_VAR_NOHASH) {
+            key[n].key.data = NULL;
+        }
+    }
+
+
+    hash.hash = &cmcf->variables_hash;
+    hash.key = ngx_hash_key;
+    hash.max_size = cmcf->variables_hash_max_size;
+    hash.bucket_size = cmcf->variables_hash_bucket_size;
+    hash.name = "variables_hash";
+    hash.pool = cf->pool;
+    hash.temp_pool = NULL;
+
+    if (ngx_hash_init(&hash, cmcf->variables_keys->keys.elts,
+                      cmcf->variables_keys->keys.nelts)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    cmcf->variables_keys = NULL;
+
+    return NGX_OK;
+}
diff --git a/src/stream/ngx_stream_variables.h b/src/stream/ngx_stream_variables.h
new file mode 100644
index 0000000..e4151e2
--- /dev/null
+++ b/src/stream/ngx_stream_variables.h
@@ -0,0 +1,109 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_STREAM_VARIABLES_H_INCLUDED_
+#define _NGX_STREAM_VARIABLES_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef ngx_variable_value_t  ngx_stream_variable_value_t;
+
+#define ngx_stream_variable(v)     { sizeof(v) - 1, 1, 0, 0, 0, (u_char *) v }
+
+typedef struct ngx_stream_variable_s  ngx_stream_variable_t;
+
+typedef void (*ngx_stream_set_variable_pt) (ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+typedef ngx_int_t (*ngx_stream_get_variable_pt) (ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+
+
+#define NGX_STREAM_VAR_CHANGEABLE   1
+#define NGX_STREAM_VAR_NOCACHEABLE  2
+#define NGX_STREAM_VAR_INDEXED      4
+#define NGX_STREAM_VAR_NOHASH       8
+
+
+struct ngx_stream_variable_s {
+    ngx_str_t                     name;   /* must be first to build the hash */
+    ngx_stream_set_variable_pt    set_handler;
+    ngx_stream_get_variable_pt    get_handler;
+    uintptr_t                     data;
+    ngx_uint_t                    flags;
+    ngx_uint_t                    index;
+};
+
+
+ngx_stream_variable_t *ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name,
+    ngx_uint_t flags);
+ngx_int_t ngx_stream_get_variable_index(ngx_conf_t *cf, ngx_str_t *name);
+ngx_stream_variable_value_t *ngx_stream_get_indexed_variable(
+    ngx_stream_session_t *s, ngx_uint_t index);
+ngx_stream_variable_value_t *ngx_stream_get_flushed_variable(
+    ngx_stream_session_t *s, ngx_uint_t index);
+
+ngx_stream_variable_value_t *ngx_stream_get_variable(ngx_stream_session_t *s,
+    ngx_str_t *name, ngx_uint_t key);
+
+
+#if (NGX_PCRE)
+
+typedef struct {
+    ngx_uint_t                    capture;
+    ngx_int_t                     index;
+} ngx_stream_regex_variable_t;
+
+
+typedef struct {
+    ngx_regex_t                  *regex;
+    ngx_uint_t                    ncaptures;
+    ngx_stream_regex_variable_t  *variables;
+    ngx_uint_t                    nvariables;
+    ngx_str_t                     name;
+} ngx_stream_regex_t;
+
+
+typedef struct {
+    ngx_stream_regex_t           *regex;
+    void                         *value;
+} ngx_stream_map_regex_t;
+
+
+ngx_stream_regex_t *ngx_stream_regex_compile(ngx_conf_t *cf,
+    ngx_regex_compile_t *rc);
+ngx_int_t ngx_stream_regex_exec(ngx_stream_session_t *s, ngx_stream_regex_t *re,
+    ngx_str_t *str);
+
+#endif
+
+
+typedef struct {
+    ngx_hash_combined_t           hash;
+#if (NGX_PCRE)
+    ngx_stream_map_regex_t       *regex;
+    ngx_uint_t                    nregex;
+#endif
+} ngx_stream_map_t;
+
+
+void *ngx_stream_map_find(ngx_stream_session_t *s, ngx_stream_map_t *map,
+    ngx_str_t *match);
+
+
+ngx_int_t ngx_stream_variables_add_core_vars(ngx_conf_t *cf);
+ngx_int_t ngx_stream_variables_init_vars(ngx_conf_t *cf);
+
+
+extern ngx_stream_variable_value_t  ngx_stream_variable_null_value;
+extern ngx_stream_variable_value_t  ngx_stream_variable_true_value;
+
+
+#endif /* _NGX_STREAM_VARIABLES_H_INCLUDED_ */

From 561cc605190ba0f0d851af4073320c0607372ad2 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 1 Aug 2016 10:38:39 +0300
Subject: [PATCH 083/600] Add pointers to track modules not yet ready for
 migration

---
 debian/modules/README.Modules-versions | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index b71b1e0..02e38b8 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -27,6 +27,7 @@ README for Modules versions
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
   Version: a18b409
+  Dynamic: No, https://github.com/gnosek/nginx-upstream-fair/pull/21
 
  nginx-push
   Homepage: https://github.com/slact/nginx_http_push_module
@@ -36,14 +37,17 @@ README for Modules versions
   Homepage: https://github.com/masterzen/nginx-upload-progress-module
     rm -r debian/nginx-upload-progress/test
   Version: v0.9.1
+  Dynamic: No, https://github.com/masterzen/nginx-upload-progress-module/issues/46
 
  nginx-cache-purge
   Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
   Version: 2.3
+  Dynamic: No, https://github.com/FRiCKLE/ngx_cache_purge/pull/45
 
  nginx-dav-ext-module
   Homepage: https://github.com/arut/nginx-dav-ext-module
   Version: v0.0.3
+  Dynamic: No, https://github.com/arut/nginx-dav-ext-module/issues/21
 
  ngx-fancyindex
   Homepage: https://github.com/aperezdc/ngx-fancyindex
@@ -52,3 +56,4 @@ README for Modules versions
  ngx_http_substitutions_filter_module
   Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
   Version: v0.6.4
+  Dynamic: No, https://github.com/yaoweibin/ngx_http_substitutions_filter_module/pull/19

From c06d35b10321f5906788672f9516a0e5afe01997 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 26 Aug 2016 12:40:48 +0300
Subject: [PATCH 084/600] Enable slice module on all flavors

---
 debian/changelog |  1 +
 debian/control   | 12 ++++++------
 debian/rules     |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0528da..b505145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ nginx (1.10.1-2) UNRELEASED; urgency=medium
   * debian/control:
     Don't allow building against liblua5.1-0-dev on architectures
     that libluajit is available.
+    + Enable slice module on all flavors. (Closes: #815080)
   * debian/modules/nginx-lua:
     + Update nginx-lua to v0.10.5
 
diff --git a/debian/control b/debian/control
index 0c7f2cb..5badc14 100644
--- a/debian/control
+++ b/debian/control
@@ -110,8 +110,8 @@ Description: nginx web/proxy server (standard version)
  .
  OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip,
  Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP,
- SSI, SSL, Stream, Stub Status, Substitution, Thread Pool, Upstream, User ID,
- XSLT.
+ Slice, SSI, SSL, Stream, Stub Status, Substitution, Thread Pool, Upstream,
+ User ID, XSLT.
  .
  MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
  .
@@ -152,8 +152,8 @@ Description: nginx web/proxy server (basic version)
  FastCGI, Map, Proxy, Rewrite.
  .
  OPTIONAL HTTP MODULES: Auth Request, Charset, Gzip, Gzip Precompression,
- Headers, HTTP/2, Index, Log, Real IP, SSI, SSL, Stub Status, Thread Pool,
- WebDAV, Upstream.
+ Headers, HTTP/2, Index, Log, Real IP, Slice, SSI, SSL, Stub Status, Thread
+ Pool, WebDAV, Upstream.
  .
  THIRD PARTY MODULES: Echo.
 
@@ -205,8 +205,8 @@ Description: nginx web/proxy server (extended version)
  .
  OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, FLV, GeoIP,
  Gunzip, Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log,
- MP4, Embedded Perl, Random Index, Real IP, Secure Link, SSI, SSL, Stream,
- Stub Status, Substitution, Thread Pool, Upstream, User ID, XSLT.
+ MP4, Embedded Perl, Random Index, Real IP, Slice, Secure Link, SSI, SSL,
+ Stream, Stub Status, Substitution, Thread Pool, Upstream, User ID, XSLT.
  .
  MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
  .
diff --git a/debian/rules b/debian/rules
index c21c307..39eb71a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,7 @@ common_configure_flags := \
 			--with-http_auth_request_module \
 			--with-http_v2_module \
 			--with-http_dav_module \
+			--with-http_slice_module \
 			--with-threads
 
 light_configure_flags := \

From 6cdcbed1f9080da5d03af903822db5d6ade7c92d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 26 Aug 2016 13:15:12 +0300
Subject: [PATCH 085/600] mod: Upgrade nginx-lua to v0.10.6

---
 debian/changelog                              |    2 +-
 debian/modules/README.Modules-versions        |    2 +-
 debian/modules/nginx-lua/Changes              |   51 -
 debian/modules/nginx-lua/README.markdown      |  416 ++++--
 debian/modules/nginx-lua/config               |    6 +
 .../modules/nginx-lua/doc/HttpLuaModule.wiki  |  380 ++++--
 .../nginx-lua/src/api/ngx_http_lua_api.h      |    2 +-
 .../nginx-lua/src/ngx_http_lua_accessby.c     |    8 +
 .../nginx-lua/src/ngx_http_lua_balancer.c     |  103 +-
 .../nginx-lua/src/ngx_http_lua_bodyfilterby.c |    2 +-
 .../nginx-lua/src/ngx_http_lua_cache.c        |    4 +-
 .../nginx-lua/src/ngx_http_lua_clfactory.c    |    8 +-
 .../nginx-lua/src/ngx_http_lua_common.h       |   47 +-
 .../nginx-lua/src/ngx_http_lua_contentby.c    |    8 +
 .../nginx-lua/src/ngx_http_lua_control.c      |   26 +-
 .../nginx-lua/src/ngx_http_lua_coroutine.c    |   12 +-
 .../nginx-lua/src/ngx_http_lua_directive.c    |   16 +-
 .../src/ngx_http_lua_headerfilterby.c         |    2 +-
 .../nginx-lua/src/ngx_http_lua_headers.c      |    6 +
 .../nginx-lua/src/ngx_http_lua_headers_in.c   |    5 +
 .../nginx-lua/src/ngx_http_lua_logby.c        |    2 +-
 .../nginx-lua/src/ngx_http_lua_module.c       |  112 +-
 .../nginx-lua/src/ngx_http_lua_phase.c        |   10 +-
 .../nginx-lua/src/ngx_http_lua_rewriteby.c    |    8 +
 .../nginx-lua/src/ngx_http_lua_setby.c        |    2 +-
 .../nginx-lua/src/ngx_http_lua_shdict.c       | 1133 +++++++++++++++--
 .../nginx-lua/src/ngx_http_lua_shdict.h       |   10 +-
 .../nginx-lua/src/ngx_http_lua_sleep.c        |    3 +-
 .../nginx-lua/src/ngx_http_lua_socket_tcp.c   |   12 +-
 .../modules/nginx-lua/src/ngx_http_lua_ssl.c  |   37 +
 .../modules/nginx-lua/src/ngx_http_lua_ssl.h  |   43 +
 .../nginx-lua/src/ngx_http_lua_ssl_certby.c   |  362 +++++-
 .../nginx-lua/src/ngx_http_lua_ssl_certby.h   |   10 -
 .../nginx-lua/src/ngx_http_lua_ssl_ocsp.c     |    4 +-
 .../src/ngx_http_lua_ssl_session_fetchby.c    |  592 +++++++++
 .../src/ngx_http_lua_ssl_session_fetchby.h    |   34 +
 .../src/ngx_http_lua_ssl_session_storeby.c    |  602 +++++++++
 .../src/ngx_http_lua_ssl_session_storeby.h    |   34 +
 .../nginx-lua/src/ngx_http_lua_string.c       |    4 +-
 .../nginx-lua/src/ngx_http_lua_subrequest.c   |    2 +-
 .../nginx-lua/src/ngx_http_lua_timer.c        |    2 +-
 .../modules/nginx-lua/src/ngx_http_lua_util.c |   48 +-
 .../modules/nginx-lua/src/ngx_http_lua_util.h |    5 +-
 debian/modules/nginx-lua/t/009-log.t          |    2 +-
 debian/modules/nginx-lua/t/010-request_body.t |    2 +-
 debian/modules/nginx-lua/t/016-resp-header.t  |    4 +-
 debian/modules/nginx-lua/t/020-subrequest.t   |    2 +-
 .../nginx-lua/t/023-rewrite/request_body.t    |    2 +-
 .../nginx-lua/t/023-rewrite/subrequest.t      |    2 +-
 .../nginx-lua/t/024-access/request_body.t     |    2 +-
 .../nginx-lua/t/024-access/subrequest.t       |    2 +-
 debian/modules/nginx-lua/t/028-req-header.t   |   42 +-
 debian/modules/nginx-lua/t/030-uri-args.t     |    4 +-
 debian/modules/nginx-lua/t/031-post-args.t    |    2 +-
 debian/modules/nginx-lua/t/043-shdict.t       |    6 +-
 debian/modules/nginx-lua/t/062-count.t        |    2 +-
 .../nginx-lua/t/068-socket-keepalive.t        |   77 +-
 debian/modules/nginx-lua/t/070-sha1.t         |    9 +-
 debian/modules/nginx-lua/t/129-ssl-socket.t   |   48 +-
 debian/modules/nginx-lua/t/132-lua-blocks.t   |   16 +
 debian/modules/nginx-lua/t/133-worker-count.t |   20 +
 debian/modules/nginx-lua/t/138-balancer.t     |   28 +-
 debian/modules/nginx-lua/t/139-ssl-cert-by.t  |  115 +-
 debian/modules/nginx-lua/t/140-ssl-c-api.t    |  402 +++++-
 .../nginx-lua/t/142-ssl-session-store.t       |  750 +++++++++++
 .../nginx-lua/t/143-ssl-session-fetch.t       | 1027 +++++++++++++++
 .../nginx-lua/t/144-shdict-incr-init.t        |  226 ++++
 debian/modules/nginx-lua/t/145-shdict-list.t  |  745 +++++++++++
 debian/modules/nginx-lua/t/lib/CRC32.lua      |    2 +-
 debian/modules/nginx-lua/util/build.sh        |    2 +-
 debian/modules/nginx-lua/util/ngx-links       |    2 +-
 71 files changed, 7164 insertions(+), 556 deletions(-)
 delete mode 100644 debian/modules/nginx-lua/Changes
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_ssl.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_ssl.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.h
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.h
 create mode 100644 debian/modules/nginx-lua/t/142-ssl-session-store.t
 create mode 100644 debian/modules/nginx-lua/t/143-ssl-session-fetch.t
 create mode 100644 debian/modules/nginx-lua/t/144-shdict-incr-init.t
 create mode 100644 debian/modules/nginx-lua/t/145-shdict-list.t

diff --git a/debian/changelog b/debian/changelog
index b505145..1c253a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ nginx (1.10.1-2) UNRELEASED; urgency=medium
     that libluajit is available.
     + Enable slice module on all flavors. (Closes: #815080)
   * debian/modules/nginx-lua:
-    + Update nginx-lua to v0.10.5
+    + Update nginx-lua to v0.10.6
 
   [ Michael Lustfield ]
   * debian/patches/0003-*.patch:
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 02e38b8..1ad980c 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -22,7 +22,7 @@ README for Modules versions
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
-  Version: v0.10.5
+  Version: v0.10.6
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
diff --git a/debian/modules/nginx-lua/Changes b/debian/modules/nginx-lua/Changes
deleted file mode 100644
index 703f73d..0000000
--- a/debian/modules/nginx-lua/Changes
+++ /dev/null
@@ -1,51 +0,0 @@
-0.2.0 - 5 July 2011
-* now we support ngx.var[1], ngx.var[2], and etc to refer to the nginx regex capturing variables \$1, \$2, and etc in Lua. this resolved github issue #43. thanks Tobia Conforto for reporting it.
-
-* now we use the same value overriding mechanism as ngx_rewrite's set command for ngx.var.VAR = new_value. Assigning values to special variables like $limit_rate and $args should now work; also writing to built-in variables that are not changeable (like $arg_PARAMETER) will result in a 500 error page, as expected, now. thanks Richard Kearsley for reporting it.
-
-* fixed the lua_code_cache off warning when the lua_code_cache is explicitly on. thanks Feng Xingguo.
-
-* applied the patch from cyberty to add ngx.http_time() function to expose the nginx core function ngx_http_time to the Lua land.
-
-* fixed an issue on i386: we now use off_t consistently. mixing it with size_t on 32-bit systems can cause Bad Things. this fixed github issue #42. thanks moodydeath.
-
-* fixed an issue on i386: fixed a formatter mismatch issue in ngx_http_echo_adjust_subrequest. thanks Wang Bin. This caused incorrect subrequest Content-Length header when a body is specified.
-
-* now in the subrequest capturing processor, we worked around an issue in ngx_http_static_module that when it issues 301 redirect for directory access w/o a trailing slash, it does not inject r->headers_out.location into the r->headers_out.headers list. thanks moodydeath for reporting it in the discussion of github issue #41.
-
-* fixed a bug in ngx.location.capture() and ngx.location.capture_multi() that we could not capture locations with internal redirections in them. thanks moodydeath for reporting it in github issue #41.
-
-* fixed redundant last chunk issue for ngx.exec() invocation at rewrite and access phases: we should quit the current core_run_phases cycle; this also fixed github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location.
-
-* fixed ngx.exit(status) where status >= 200 and status < 300 for access_by_lua* and rewrite_by_lua*: it should quit the whole request altegother and skip all those subsequent phase handlers (if any). thanks moodydeath for reporting it.
-
-* fixed github issue #39: setting differnt response headers in Lua with common prefix might interfere with each other. thanks moodydeath.
-
-* fixed GitHub issue #38: request headers did not forward to subrequests when the "method" or "body" option is explicitly specified by a non-nil value for ngx.location.capture(). thanks Richard Kearsley.
-
-* fixed a bug in output header set; we should always set the header->hash to 1. thanks moodydeath for reporting it.
-
-* fixed spots that trigger the "variable set but not used" warning issued by gcc 4.6.0.
-
-* now we turn the ngx.req.header table into an ngx.req.get_headers() function; we also added ngx.req.set_header(name, value) and ngx.req.clear_header(name). thanks moodydeath.
-
-* now we make ngx_devel_kit (NDK) optional. thanks Kirill A. Korinskiy.
-
-* removed a duplicate definition of the ngx_str_set macro caught by ctags; also fixed a warning thrown by gcc -O3 on Mac OS X 10.6.
-
-* added patch to use PCRE related Lua extensions in ngx_lua (chaoslawful)
-
-* now we change the way we process HTTP 1.0 requests by automatically buffering all the user outputs generated by ngx.print()/ngx.say() calls, which is much more natural than the old broken way.
-
-* fixed the "ngx.exec() after ngx.location.capture() hanging" bug for rewrite_by_lua* and access_by_lua* as well. thanks Wendal Chen.
-
-* applied a patch from moodydeath to introduce the "ngx.is_subrequest" attribute.
-
-* now we encourage use of the client_body_in_single_buffer directive instead of big client_body_buffer_size when lua_need_request_body is turned on.
-
-* fixed the config script and added extra linking options needed by LuaJIT in 64-bit Mac OS X.
-
-* fixed the zero size alert caused by ngx.print("") in Lua.
-
-* now we always allocate r->request_body for subrequests when the method option is specified for ngx.location.capture*. this prevents accidental inheritance of parent request's request body when client_body_buffer_size < client_max_body_size.
-
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/nginx-lua/README.markdown
index 14e9ecc..8065060 100644
--- a/debian/modules/nginx-lua/README.markdown
+++ b/debian/modules/nginx-lua/README.markdown
@@ -62,7 +62,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.5](https://github.com/openresty/lua-nginx-module/tags) released on 25 May 2016.
+This document describes ngx_lua [v0.10.6](https://github.com/openresty/lua-nginx-module/tags) released on 15 August 2016.
 
 Synopsis
 ========
@@ -249,6 +249,8 @@ Nginx Compatibility
 
 The latest version of this module is compatible with the following versions of Nginx:
 
+* 1.11.x  (last tested: 1.11.2)
+* 1.10.x
 * 1.9.x (last tested: 1.9.15)
 * 1.8.x
 * 1.7.x (last tested: 1.7.10)
@@ -274,9 +276,9 @@ Build the source with this module:
 
 ```bash
 
- wget 'http://nginx.org/download/nginx-1.9.15.tar.gz'
- tar -xzvf nginx-1.9.15.tar.gz
- cd nginx-1.9.15/
+ wget 'http://nginx.org/download/nginx-1.11.2.tar.gz'
+ tar -xzvf nginx-1.11.2.tar.gz
+ cd nginx-1.11.2/
 
  # tell nginx's build system where to find LuaJIT 2.0:
  export LUAJIT_LIB=/path/to/luajit/lib
@@ -1037,6 +1039,10 @@ Directives
 * [lua_need_request_body](#lua_need_request_body)
 * [ssl_certificate_by_lua_block](#ssl_certificate_by_lua_block)
 * [ssl_certificate_by_lua_file](#ssl_certificate_by_lua_file)
+* [ssl_session_fetch_by_lua_block](#ssl_session_fetch_by_lua_block)
+* [ssl_session_fetch_by_lua_file](#ssl_session_fetch_by_lua_file)
+* [ssl_session_store_by_lua_block](#ssl_session_store_by_lua_block)
+* [ssl_session_store_by_lua_file](#ssl_session_store_by_lua_file)
 * [lua_shared_dict](#lua_shared_dict)
 * [lua_socket_connect_timeout](#lua_socket_connect_timeout)
 * [lua_socket_send_timeout](#lua_socket_send_timeout)
@@ -2320,7 +2326,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](#ngxreqread_body) function should be called within the Lua code.
 
-To read the request body data within the [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) variable, 
+To read the request body data within the [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) variable,
 [client_body_buffer_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_buffer_size) must have the same value as [client_max_body_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size). Because when the content length exceeds [client_body_buffer_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_buffer_size) but less than [client_max_body_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#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://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) variable.
 
 If the current location includes [rewrite_by_lua](#rewrite_by_lua) or [rewrite_by_lua_file](#rewrite_by_lua_file) directives,
@@ -2441,6 +2447,123 @@ This directive was first introduced in the `v0.10.0` release.
 
 [Back to TOC](#directives)
 
+ssl_session_fetch_by_lua_block
+------------------------------
+
+**syntax:** *ssl_session_fetch_by_lua_block { lua-script }*
+
+**context:** *server*
+
+**phase:** *right-before-SSL-handshake*
+
+This directive runs Lua code to look up and load the SSL session (if any) according to the session ID
+provided by the current SSL handshake request for the downstream.
+
+The Lua API for obtaining the current session ID and loading a cached SSL session data
+is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl/session.md)
+Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
+library.
+
+Lua APIs that may yield, like [ngx.sleep](#ngxsleep) and [cosockets](#ngxsockettcp),
+are enabled in this context.
+
+This hook, together with the [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block) hook,
+can be used to implement distributed caching mechanisms in pure Lua (based
+on the [cosocket](#ngxsockettcp) API, for example). If a cached SSL session is found
+and loaded into the current SSL connection context,
+SSL session resumption can then get immediately initiated and bypass the full SSL handshake process which is very expensive in terms of CPU time.
+
+Please note that TLS session tickets are very different and it is the clients' responsibility
+to cache the SSL session state when session tickets are used. SSL session resumptions based on
+TLS session tickets would happen automatically without going through this hook (nor the
+[ssl_session_store_by_lua_block](#ssl_session_store_by_lua) hook). This hook is mainly
+for older or less capable SSL clients that can only do SSL sessions by session IDs.
+
+When [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block) is specified at the same time,
+this hook usually runs before [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
+When the SSL session is found and successfully loaded for the current SSL connection,
+SSL session resumption will happen and thus bypass the [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block)
+hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua_block](#ssl_session_store_by_lua)
+hook, for obvious reasons.
+
+If you are using the [official pre-built packages](http://openresty.org/en/linux-packages.html) for [OpenResty](https://openresty.org/)
+1.11.2.1 or later, then everything should work out of the box.
+
+If you are using OpenSSL libraries not provided by [OpenResty](https://openresty.org),
+then you need to apply the following patch for OpenSSL 1.0.2h or later:
+
+<https://github.com/openresty/openresty/blob/master/patches/openssl-1.0.2h-sess_set_get_cb_yield.patch>
+
+If you are not using the NGINX core shipped with [OpenResty](https://openresty.org) 1.11.2.1 or later, then you need to
+apply the following patch to the standard NGINX core 1.11.2 or later:
+
+<http://openresty.org/download/nginx-1.11.2-nonblocking_ssl_handshake_hooks.patch>
+
+This directive was first introduced in the `v0.10.6` release.
+
+[Back to TOC](#directives)
+
+ssl_session_fetch_by_lua_file
+-----------------------------
+
+**syntax:** *ssl_session_fetch_by_lua_file &lt;path-to-lua-script-file&gt;*
+
+**context:** *server*
+
+**phase:** *right-before-SSL-handshake*
+
+Equivalent to [ssl_session_fetch_by_lua_block](#ssl_session_fetch_by_lua_block), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or rather, the [Lua/LuaJIT bytecode](#lualuajit-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.10.6` release.
+
+[Back to TOC](#directives)
+
+ssl_session_store_by_lua_block
+------------------------------
+
+**syntax:** *ssl_session_store_by_lua_block { lua-script }*
+
+**context:** *server*
+
+**phase:** *right-after-SSL-handshake*
+
+This directive runs Lua code to fetch and save the SSL session (if any) according to the session ID
+provided by the current SSL handshake request for the downstream. The saved or cached SSL
+session data can be used for future SSL connections to resume SSL sessions without going
+through the full SSL handshake process (which is very expensive in terms of CPU time).
+
+Lua APIs that may yield, like [ngx.sleep](#ngxsleep) and [cosockets](#ngxsockettcp),
+are *disabled* in this context. You can still, however, use the [ngx.timer.at](#ngxtimerat) API
+to create 0-delay timers to save the SSL session data asynchronously to external services (like `redis` or `memcached`).
+
+The Lua API for obtaining the current session ID and the associated session state data
+is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl/session.md#readme)
+Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
+library.
+
+This directive was first introduced in the `v0.10.6` release.
+
+[Back to TOC](#directives)
+
+ssl_session_store_by_lua_file
+-----------------------------
+
+**syntax:** *ssl_session_store_by_lua_file &lt;path-to-lua-script-file&gt;*
+
+**context:** *server*
+
+**phase:** *right-before-SSL-handshake*
+
+Equivalent to [ssl_session_store_by_lua_block](#ssl_session_store_by_lua_block), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or rather, the [Lua/LuaJIT bytecode](#lualuajit-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.10.6` release.
+
+[Back to TOC](#directives)
+
 lua_shared_dict
 ---------------
 
@@ -2920,6 +3043,11 @@ Nginx API for Lua
 * [ngx.shared.DICT.replace](#ngxshareddictreplace)
 * [ngx.shared.DICT.delete](#ngxshareddictdelete)
 * [ngx.shared.DICT.incr](#ngxshareddictincr)
+* [ngx.shared.DICT.lpush](#ngxshareddictlpush)
+* [ngx.shared.DICT.rpush](#ngxshareddictrpush)
+* [ngx.shared.DICT.lpop](#ngxshareddictlpop)
+* [ngx.shared.DICT.rpop](#ngxshareddictrpop)
+* [ngx.shared.DICT.llen](#ngxshareddictllen)
 * [ngx.shared.DICT.flush_all](#ngxshareddictflush_all)
 * [ngx.shared.DICT.flush_expired](#ngxshareddictflush_expired)
 * [ngx.shared.DICT.get_keys](#ngxshareddictget_keys)
@@ -3110,7 +3238,7 @@ This API requires a relatively expensive metamethod call and it is recommended t
 
 Core constants
 --------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, &#42;log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, &#42;log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 ```lua
 
@@ -3136,7 +3264,7 @@ The `ngx.DECLINED` constant was first introduced in the `v0.5.0rc19` release.
 
 HTTP method constants
 ---------------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 
       ngx.HTTP_GET
@@ -3162,7 +3290,7 @@ These constants are usually used in [ngx.location.capture](#ngxlocationcapture)
 
 HTTP status constants
 ---------------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 ```nginx
 
@@ -3206,7 +3334,7 @@ HTTP status constants
 
 Nginx log level constants
 -------------------------
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 ```lua
 
@@ -3229,7 +3357,7 @@ print
 -----
 **syntax:** *print(...)*
 
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Writes argument values into the nginx `error.log` file with the `ngx.NOTICE` log level.
 
@@ -3998,6 +4126,8 @@ outputs something like this:
 
 This method was first introduced in the `v0.7.17` release.
 
+This method does not work in HTTP/2 requests yet.
+
 [Back to TOC](#nginx-api-for-lua)
 
 ngx.req.get_method
@@ -4961,7 +5091,7 @@ ngx.log
 -------
 **syntax:** *ngx.log(log_level, ...)*
 
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Log arguments concatenated to error.log with the given logging level.
 
@@ -4979,9 +5109,9 @@ ngx.flush
 
 **context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
 
-Flushes response output to the client. 
+Flushes response output to the client.
 
-`ngx.flush` accepts an optional boolean `wait` argument (Default: `false`) first introduced in the `v0.3.1rc34` release. When called with the default argument, it issues an asynchronous call (Returns immediately without waiting for output data to be written into the system send buffer). Calling the function with the `wait` argument set to `true` switches to synchronous mode. 
+`ngx.flush` accepts an optional boolean `wait` argument (Default: `false`) first introduced in the `v0.3.1rc34` release. When called with the default argument, it issues an asynchronous call (Returns immediately without waiting for output data to be written into the system send buffer). Calling the function with the `wait` argument set to `true` switches to synchronous mode.
 
 In synchronous mode, the function will not return until all output data has been written into the system send buffer or until the [send_timeout](http://nginx.org/en/docs/http/ngx_http_core_module.html#send_timeout) setting has expired. Note that using the Lua coroutine mechanism means that this function does not block the Nginx event loop even in the synchronous mode.
 
@@ -4997,7 +5127,7 @@ ngx.exit
 --------
 **syntax:** *ngx.exit(status)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 When `status >= 200` (i.e., `ngx.HTTP_OK` and above), it will interrupt the execution of the current request and return status code to nginx.
 
@@ -5042,7 +5172,9 @@ Note that while this method accepts all [HTTP status constants](#http-status-con
 
 Also note that this method call terminates the processing of the current request and that it is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.exit(...)` be used to reinforce the fact that the request processing is being terminated.
 
-When being used in the context of [header_filter_by_lua](#header_filter_by_lua), `ngx.exit()` is an asynchronous operation and will return immediately. This behavior may change in future and it is recommended that users always use `return` in combination as suggested above.
+When being used in the contexts of [header_filter_by_lua](#header_filter_by_lua) and
+[ssl_session_store_by_lua*](#ssl_session_store_by_lua_block), `ngx.exit()` is
+an asynchronous operation and will return immediately. This behavior may change in future and it is recommended that users always use `return` in combination as suggested above.
 
 [Back to TOC](#nginx-api-for-lua)
 
@@ -5085,7 +5217,7 @@ ngx.sleep
 ---------
 **syntax:** *ngx.sleep(seconds)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Sleeps for the specified seconds without blocking. One can specify time resolution up to 0.001 seconds (i.e., one milliseconds).
 
@@ -5101,7 +5233,7 @@ ngx.escape_uri
 --------------
 **syntax:** *newstr = ngx.escape_uri(str)*
 
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Escape `str` as a URI component.
 
@@ -5191,7 +5323,7 @@ ngx.decode_args
 ---------------
 **syntax:** *table = ngx.decode_args(str, max_args?)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Decodes a URI encoded query-string into a Lua table. This is the inverse function of [ngx.encode_args](#ngxencode_args).
 
@@ -5214,7 +5346,7 @@ ngx.encode_base64
 -----------------
 **syntax:** *newstr = ngx.encode_base64(str, no_padding?)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Encodes `str` to a base64 digest.
 
@@ -5226,7 +5358,7 @@ ngx.decode_base64
 -----------------
 **syntax:** *newstr = ngx.decode_base64(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Decodes the `str` argument as a base64 digest to the raw form. Returns `nil` if `str` is not well formed.
 
@@ -5236,7 +5368,7 @@ ngx.crc32_short
 ---------------
 **syntax:** *intval = ngx.crc32_short(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
 
@@ -5252,7 +5384,7 @@ ngx.crc32_long
 --------------
 **syntax:** *intval = ngx.crc32_long(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
 
@@ -5268,7 +5400,7 @@ ngx.hmac_sha1
 -------------
 **syntax:** *digest = ngx.hmac_sha1(secret_key, str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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>`.
 
@@ -5300,7 +5432,7 @@ ngx.md5
 -------
 **syntax:** *digest = ngx.md5(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Returns the hexadecimal representation of the MD5 digest of the `str` argument.
 
@@ -5327,7 +5459,7 @@ ngx.md5_bin
 -----------
 **syntax:** *digest = ngx.md5_bin(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Returns the binary form of the MD5 digest of the `str` argument.
 
@@ -5339,7 +5471,7 @@ ngx.sha1_bin
 ------------
 **syntax:** *digest = ngx.sha1_bin(str)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Returns the binary form of the SHA-1 digest of the `str` argument.
 
@@ -5353,7 +5485,7 @@ ngx.quote_sql_str
 -----------------
 **syntax:** *quoted_value = ngx.quote_sql_str(raw_value)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Returns a quoted SQL string literal according to the MySQL quoting rules.
 
@@ -5363,7 +5495,7 @@ ngx.today
 ---------
 **syntax:** *str = ngx.today()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Returns current date (in the format `yyyy-mm-dd`) from the nginx cached time (no syscall involved unlike Lua's date library).
 
@@ -5375,7 +5507,7 @@ ngx.time
 --------
 **syntax:** *secs = ngx.time()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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).
 
@@ -5387,7 +5519,7 @@ ngx.now
 -------
 **syntax:** *secs = ngx.now()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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).
 
@@ -5401,7 +5533,7 @@ ngx.update_time
 ---------------
 **syntax:** *ngx.update_time()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Forcibly updates the Nginx current time cache. This call involves a syscall and thus has some overhead, so do not abuse it.
 
@@ -5413,7 +5545,7 @@ ngx.localtime
 -------------
 **syntax:** *str = ngx.localtime()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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).
 
@@ -5425,7 +5557,7 @@ ngx.utctime
 -----------
 **syntax:** *str = ngx.utctime()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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).
 
@@ -5437,7 +5569,7 @@ ngx.cookie_time
 ---------------
 **syntax:** *str = ngx.cookie_time(sec)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Returns a formatted string can be used as the cookie expiration time. The parameter `sec` is the time stamp in seconds (like those returned from [ngx.time](#ngxtime)).
 
@@ -5453,7 +5585,7 @@ ngx.http_time
 -------------
 **syntax:** *str = ngx.http_time(sec)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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](#ngxtime)).
 
@@ -5469,7 +5601,7 @@ ngx.parse_http_time
 -------------------
 **syntax:** *sec = ngx.parse_http_time(str)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Parse the http time string (as returned by [ngx.http_time](#ngxhttp_time)) into seconds. Returns the seconds or `nil` if the input string is in bad forms.
 
@@ -5497,7 +5629,7 @@ ngx.re.match
 ------------
 **syntax:** *captures, err = ngx.re.match(subject, regex, options?, ctx?, res_table?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Matches the `subject` string using the Perl compatible regular expression `regex` with the optional `options`.
 
@@ -5655,9 +5787,9 @@ ngx.re.find
 -----------
 **syntax:** *from, to, err = ngx.re.find(subject, regex, options?, ctx?, nth?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
-Similar to [ngx.re.match](#ngxrematch) but only returns the begining index (`from`) and end index (`to`) of the matched substring. The returned indexes are 1-based and can be fed directly into the [string.sub](http://www.lua.org/manual/5.1/manual.html#pdf-string.sub) API function to obtain the matched substring.
+Similar to [ngx.re.match](#ngxrematch) but only returns the beginning index (`from`) and end index (`to`) of the matched substring. The returned indexes are 1-based and can be fed directly into the [string.sub](http://www.lua.org/manual/5.1/manual.html#pdf-string.sub) API function to obtain the matched substring.
 
 In case of errors (like bad regexes or any PCRE runtime errors), this API function returns two `nil` values followed by a string describing the error.
 
@@ -5709,7 +5841,7 @@ ngx.re.gmatch
 -------------
 **syntax:** *iterator, err = ngx.re.gmatch(subject, regex, options?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Similar to [ngx.re.match](#ngxrematch), 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`.
 
@@ -5787,7 +5919,7 @@ ngx.re.sub
 ----------
 **syntax:** *newstr, n, err = ngx.re.sub(subject, regex, replace, options?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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](#ngxrematch).
 
@@ -5853,7 +5985,7 @@ ngx.re.gsub
 -----------
 **syntax:** *newstr, n, err = ngx.re.gsub(subject, regex, replace, options?)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Just like [ngx.re.sub](#ngxresub), but does global substitution.
 
@@ -5893,7 +6025,7 @@ ngx.shared.DICT
 
 **syntax:** *dict = ngx.shared\[name_var\]*
 
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Fetching the shm-based Lua dictionary object for the shared memory zone named `DICT` defined by the [lua_shared_dict](#lua_shared_dict) directive.
 
@@ -5910,6 +6042,11 @@ The resulting object `dict` has the following methods:
 * [replace](#ngxshareddictreplace)
 * [delete](#ngxshareddictdelete)
 * [incr](#ngxshareddictincr)
+* [lpush](#ngxshareddictlpush)
+* [rpush](#ngxshareddictrpush)
+* [lpop](#ngxshareddictlpop)
+* [rpop](#ngxshareddictrpop)
+* [llen](#ngxshareddictllen)
 * [flush_all](#ngxshareddictflush_all)
 * [flush_expired](#ngxshareddictflush_expired)
 * [get_keys](#ngxshareddictget_keys)
@@ -5966,9 +6103,9 @@ ngx.shared.DICT.get
 -------------------
 **syntax:** *value, flags = ngx.shared.DICT:get(key)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
-Retrieving the value in the dictionary [ngx.shared.DICT](#ngxshareddict) for the key `key`. If the key does not exist or has been expired, then `nil` will be returned.
+Retrieving the value in the dictionary [ngx.shared.DICT](#ngxshareddict) for the key `key`. If the key does not exist or has expired, then `nil` will be returned.
 
 In case of errors, `nil` and a string describing the error will be returned.
 
@@ -6004,7 +6141,7 @@ ngx.shared.DICT.get_stale
 -------------------------
 **syntax:** *value, flags, stale = ngx.shared.DICT:get_stale(key)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Similar to the [get](#ngxshareddictget) method but returns the value even if the key has already expired.
 
@@ -6022,7 +6159,7 @@ ngx.shared.DICT.set
 -------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:set(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Unconditionally sets a key-value pair into the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns three values:
 
@@ -6070,7 +6207,7 @@ ngx.shared.DICT.safe_set
 ------------------------
 **syntax:** *ok, err = ngx.shared.DICT:safe_set(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Similar to the [set](#ngxshareddictset) method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
 
@@ -6084,7 +6221,7 @@ ngx.shared.DICT.add
 -------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:add(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Just like the [set](#ngxshareddictset) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](#ngxshareddict) if the key does *not* exist.
 
@@ -6100,7 +6237,7 @@ ngx.shared.DICT.safe_add
 ------------------------
 **syntax:** *ok, err = ngx.shared.DICT:safe_add(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Similar to the [add](#ngxshareddictadd) method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
 
@@ -6114,7 +6251,7 @@ ngx.shared.DICT.replace
 -----------------------
 **syntax:** *success, err, forcible = ngx.shared.DICT:replace(key, value, exptime?, flags?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Just like the [set](#ngxshareddictset) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](#ngxshareddict) if the key *does* exist.
 
@@ -6130,7 +6267,7 @@ ngx.shared.DICT.delete
 ----------------------
 **syntax:** *ngx.shared.DICT:delete(key)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Unconditionally removes the key-value pair from the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
 
@@ -6144,19 +6281,110 @@ See also [ngx.shared.DICT](#ngxshareddict).
 
 ngx.shared.DICT.incr
 --------------------
-**syntax:** *newval, err = ngx.shared.DICT:incr(key, value)*
+**syntax:** *newval, err, forcible? = ngx.shared.DICT:incr(key, value, init?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Increments the (numerical) value for `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict) by the step value `value`. Returns the new resulting number if the operation is successfully completed or `nil` and an error message otherwise.
 
-The key must already exist in the dictionary, otherwise it will return `nil` and `"not found"`.
+When the key does not exist or has already expired in the shared dictionary,
+
+1. if the `init` argument is not specified or takes the value `nil`, this method will return `nil` and the error string `"not found"`, or
+1. if the `init` argument takes a number value, this method will create a new `key` with the value `init + value`.
+
+Like the [add](#ngxshareddictadd) method, it also overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone.
+
+The `forcible` return value will always be `nil` when the `init` argument is not specified.
+
+If this method succeeds in storing the current item by forcibly removing other not-yet-expired items in the dictionary via LRU, the `forcible` return value will be `true`. If it stores the item without forcibly removing other valid items, then the return value `forcible` will be `false`.
 
 If the original value is not a valid Lua number in the dictionary, it will return `nil` and `"not a number"`.
 
-The `value` argument can be any valid Lua numbers, like negative numbers or floating-point numbers.
+The `value` argument and `init` argument can be any valid Lua numbers, like negative numbers or floating-point numbers.
 
-This feature was first introduced in the `v0.3.1rc22` release.
+This method was first introduced in the `v0.3.1rc22` release.
+
+The optional `init` parameter was first added in the `v0.10.6` release.
+
+See also [ngx.shared.DICT](#ngxshareddict).
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.shared.DICT.lpush
+---------------------
+**syntax:** *length, err = ngx.shared.DICT:lpush(key, value)*
+
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+Inserts the specified (numerical or string) `value` at the head of the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns the number of elements in the list after the push operation.
+
+If `key` does not exist, it is created as an empty list before performing the push operation. When the `key` already takes a value that is not a list, it will return `nil` and `"value not a list"`.
+
+It never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
+
+This feature was first introduced in the `v0.10.6` release.
+
+See also [ngx.shared.DICT](#ngxshareddict).
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.shared.DICT.rpush
+---------------------
+**syntax:** *length, err = ngx.shared.DICT:rpush(key, value)*
+
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+Similar to the [lpush](#ngxshareddictlpush) method, but inserts the specified (numerical or string) `value` at the tail of the list named `key`.
+
+This feature was first introduced in the `v0.10.6` release.
+
+See also [ngx.shared.DICT](#ngxshareddict).
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.shared.DICT.lpop
+--------------------
+**syntax:** *val, err = ngx.shared.DICT:lpop(key)*
+
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+Removes and returns the first element of the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
+
+If `key` does not exist, it will return `nil`. When the `key` already takes a value that is not a list, it will return `nil` and `"value not a list"`.
+
+This feature was first introduced in the `v0.10.6` release.
+
+See also [ngx.shared.DICT](#ngxshareddict).
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.shared.DICT.rpop
+--------------------
+**syntax:** *val, err = ngx.shared.DICT:rpop(key)*
+
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+Removes and returns the last element of the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
+
+If `key` does not exist, it will return `nil`. When the `key` already takes a value that is not a list, it will return `nil` and `"value not a list"`.
+
+This feature was first introduced in the `v0.10.6` release.
+
+See also [ngx.shared.DICT](#ngxshareddict).
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.shared.DICT.llen
+--------------------
+**syntax:** *len, err = ngx.shared.DICT:llen(key)*
+
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+Returns the number of elements in the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
+
+If key does not exist, it is interpreted as an empty list and 0 is returned. When the `key` already takes a value that is not a list, it will return `nil` and `"value not a list"`.
+
+This feature was first introduced in the `v0.10.6` release.
 
 See also [ngx.shared.DICT](#ngxshareddict).
 
@@ -6166,7 +6394,7 @@ ngx.shared.DICT.flush_all
 -------------------------
 **syntax:** *ngx.shared.DICT:flush_all()*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Flushes out all the items in the dictionary. This method does not actuall free up all the memory blocks in the dictionary but just marks all the existing items as expired.
 
@@ -6180,7 +6408,7 @@ ngx.shared.DICT.flush_expired
 -----------------------------
 **syntax:** *flushed = ngx.shared.DICT:flush_expired(max_count?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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.
 
@@ -6196,7 +6424,7 @@ ngx.shared.DICT.get_keys
 ------------------------
 **syntax:** *keys = ngx.shared.DICT:get_keys(max_count?)*
 
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Fetch a list of the keys from the dictionary, up to `<max_count>`.
 
@@ -6212,7 +6440,7 @@ ngx.socket.udp
 --------------
 **syntax:** *udpsock = ngx.socket.udp()*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 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:
 
@@ -6236,7 +6464,7 @@ udpsock:setpeername
 
 **syntax:** *ok, err = udpsock:setpeername("unix:/path/to/unix-domain.socket")*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 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.
 
@@ -6295,7 +6523,7 @@ udpsock:send
 ------------
 **syntax:** *ok, err = udpsock:send(data)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Sends data on the current UDP or datagram unix domain socket object.
 
@@ -6311,7 +6539,7 @@ udpsock:receive
 ---------------
 **syntax:** *data, err = udpsock:receive(size?)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Receives data from the UDP or datagram unix domain socket object with an optional receive buffer size argument, `size`.
 
@@ -6346,7 +6574,7 @@ udpsock:close
 -------------
 **syntax:** *ok, err = udpsock:close()*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 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.
 
@@ -6360,7 +6588,7 @@ udpsock:settimeout
 ------------------
 **syntax:** *udpsock:settimeout(time)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Set the timeout value in milliseconds for subsequent socket operations (like [receive](#udpsockreceive)).
 
@@ -6384,7 +6612,7 @@ ngx.socket.tcp
 --------------
 **syntax:** *tcpsock = ngx.socket.tcp()*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 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:
 
@@ -6430,7 +6658,7 @@ tcpsock:connect
 
 **syntax:** *ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket", options_table?)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Attempts to connect a TCP socket object to a remote server or to a stream unix domain socket file without blocking.
 
@@ -6509,7 +6737,7 @@ tcpsock:sslhandshake
 --------------------
 **syntax:** *session, err = tcpsock:sslhandshake(reused_session?, server_name?, ssl_verify?, send_status_req?)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Does SSL/TLS handshake on the currently established connection.
 
@@ -6554,7 +6782,7 @@ tcpsock:send
 ------------
 **syntax:** *bytes, err = tcpsock:send(data)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Sends data without blocking on the current TCP or Unix Domain Socket connection.
 
@@ -6586,7 +6814,7 @@ tcpsock:receive
 
 **syntax:** *data, err, partial = tcpsock:receive(pattern?)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Receives data from the connected socket according to the reading pattern or size.
 
@@ -6628,7 +6856,7 @@ tcpsock:receiveuntil
 --------------------
 **syntax:** *iterator = tcpsock:receiveuntil(pattern, options?)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 This method returns an iterator Lua function that can be called to read the data stream until it sees the specified pattern or an error occurs.
 
@@ -6727,7 +6955,7 @@ tcpsock:close
 -------------
 **syntax:** *ok, err = tcpsock:close()*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 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.
 
@@ -6743,7 +6971,7 @@ tcpsock:settimeout
 ------------------
 **syntax:** *tcpsock:settimeout(time)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Set the timeout value in milliseconds for subsequent socket operations ([connect](#tcpsockconnect), [receive](#tcpsockreceive), and iterators returned from [receiveuntil](#tcpsockreceiveuntil)).
 
@@ -6759,7 +6987,7 @@ tcpsock:setoption
 -----------------
 **syntax:** *tcpsock:setoption(option, value?)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 This function is added for [LuaSocket](http://w3.impa.br/~diego/software/luasocket/tcp.html) API compatibility and does nothing for now. Its functionality will be implemented in future.
 
@@ -6771,7 +6999,7 @@ tcpsock:setkeepalive
 --------------------
 **syntax:** *ok, err = tcpsock:setkeepalive(timeout?, size?)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 Puts the current socket's connection immediately into the cosocket built-in connection pool and keep it alive until other [connect](#tcpsockconnect) method calls request it or the associated maximal idle timeout is expired.
 
@@ -6799,7 +7027,7 @@ tcpsock:getreusedtimes
 ----------------------
 **syntax:** *count, err = tcpsock:getreusedtimes()*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 This method returns the (successfully) reused times for the current connection. In case of error, it returns `nil` and a string describing the error.
 
@@ -6839,7 +7067,7 @@ ngx.get_phase
 -------------
 **syntax:** *str = ngx.get_phase()*
 
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Retrieves the current running phase name. Possible return values are
 
@@ -6849,6 +7077,10 @@ Retrieves the current running phase name. Possible return values are
 	for the context of [init_worker_by_lua](#init_worker_by_lua) or [init_worker_by_lua_file](#init_worker_by_lua_file).
 * `ssl_cert`
 	for the context of [ssl_certificate_by_lua_block](#ssl_certificate_by_lua_block) or [ssl_certificate_by_lua_file](#ssl_certificate_by_lua_file).
+* `ssl_session_fetch`
+	for the context of [ssl_session_fetch_by_lua*](#ssl_session_fetch_by_lua_block).
+* `ssl_session_store`
+	for the context of [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block).
 * `set`
 	for the context of [set_by_lua](#set_by_lua) or [set_by_lua_file](#set_by_lua_file).
 * `rewrite`
@@ -6876,7 +7108,7 @@ ngx.thread.spawn
 ----------------
 **syntax:** *co = ngx.thread.spawn(func, arg1, arg2, ...)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 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".
 
@@ -7014,7 +7246,7 @@ ngx.thread.wait
 ---------------
 **syntax:** *ok, res1, res2, ... = ngx.thread.wait(thread1, thread2, ...)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
 
 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).
 
@@ -7171,7 +7403,7 @@ ngx.timer.at
 ------------
 **syntax:** *ok, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Creates an Nginx timer with a user callback function as well as optional user arguments.
 
@@ -7229,7 +7461,7 @@ Here is a simple example:
  }
 ```
 
-One can also create infinite re-occuring timers, for instance, a timer getting triggered every `5` seconds, by calling `ngx.timer.at` recursively in the timer callback function. Here is such an example,
+One can also create infinite re-occurring timers, for instance, a timer getting triggered every `5` seconds, by calling `ngx.timer.at` recursively in the timer callback function. Here is such an example,
 
 ```lua
 
@@ -7297,7 +7529,7 @@ ngx.timer.running_count
 -----------------------
 **syntax:** *count = ngx.timer.running_count()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Returns the number of timers currently running.
 
@@ -7309,7 +7541,7 @@ ngx.timer.pending_count
 -----------------------
 **syntax:** *count = ngx.timer.pending_count()*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Returns the number of pending timers.
 
@@ -7425,7 +7657,7 @@ ngx.worker.count
 
 **syntax:** *count = ngx.worker.count()*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
 
 Returns the total number of the Nginx worker processes (i.e., the value configured
 by the [worker_processes](http://nginx.org/en/docs/ngx_core_module.html#worker_processes)
@@ -7540,7 +7772,7 @@ ndk.set_var.DIRECTIVE
 ---------------------
 **syntax:** *res = ndk.set_var.DIRECTIVE_NAME*
 
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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`.
 
@@ -7581,7 +7813,7 @@ coroutine.create
 ----------------
 **syntax:** *co = coroutine.create(f)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Creates a user Lua coroutines with a Lua function, and returns a coroutine object.
 
@@ -7597,7 +7829,7 @@ coroutine.resume
 ----------------
 **syntax:** *ok, ... = coroutine.resume(co, ...)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Resumes the executation of a user Lua coroutine object previously yielded or just created.
 
@@ -7613,7 +7845,7 @@ coroutine.yield
 ---------------
 **syntax:** *... = coroutine.yield(...)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Yields the execution of the current user Lua coroutine.
 
@@ -7629,7 +7861,7 @@ coroutine.wrap
 --------------
 **syntax:** *co = coroutine.wrap(f)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 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.
 
@@ -7643,7 +7875,7 @@ coroutine.running
 -----------------
 **syntax:** *co = coroutine.running()*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Identical to the standard Lua [coroutine.running](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.running) API.
 
@@ -7657,7 +7889,7 @@ coroutine.status
 ----------------
 **syntax:** *status = coroutine.status(co)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Identical to the standard Lua [coroutine.status](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.status) API.
 
diff --git a/debian/modules/nginx-lua/config b/debian/modules/nginx-lua/config
index c91a07e..0f2749d 100644
--- a/debian/modules/nginx-lua/config
+++ b/debian/modules/nginx-lua/config
@@ -357,6 +357,9 @@ HTTP_LUA_SRCS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_ocsp.c \
             $ngx_addon_dir/src/ngx_http_lua_lex.c \
             $ngx_addon_dir/src/ngx_http_lua_balancer.c \
+            $ngx_addon_dir/src/ngx_http_lua_ssl_session_storeby.c \
+            $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.c \
+            $ngx_addon_dir/src/ngx_http_lua_ssl.c \
             "
 
 HTTP_LUA_DEPS=" \
@@ -414,6 +417,9 @@ HTTP_LUA_DEPS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_certby.h \
             $ngx_addon_dir/src/ngx_http_lua_lex.h \
             $ngx_addon_dir/src/ngx_http_lua_balancer.h \
+            $ngx_addon_dir/src/ngx_http_lua_ssl_session_storeby.h \
+            $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.h \
+            $ngx_addon_dir/src/ngx_http_lua_ssl.h \
             "
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
index 78ce13c..2a5b0d2 100644
--- a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.5] released on 25 May 2016.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.6] released on 15 August 2016.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -186,6 +186,8 @@ The Lua state (Lua VM instance) is shared across all the requests handled by a s
 
 The latest version of this module is compatible with the following versions of Nginx:
 
+* 1.11.x  (last tested: 1.11.2)
+* 1.10.x
 * 1.9.x (last tested: 1.9.15)
 * 1.8.x
 * 1.7.x (last tested: 1.7.10)
@@ -207,9 +209,9 @@ Alternatively, ngx_lua can be manually compiled into Nginx:
 Build the source with this module:
 
 <geshi lang="bash">
-    wget 'http://nginx.org/download/nginx-1.9.15.tar.gz'
-    tar -xzvf nginx-1.9.15.tar.gz
-    cd nginx-1.9.15/
+    wget 'http://nginx.org/download/nginx-1.11.2.tar.gz'
+    tar -xzvf nginx-1.11.2.tar.gz
+    cd nginx-1.11.2/
 
     # tell nginx's build system where to find LuaJIT 2.0:
     export LUAJIT_LIB=/path/to/luajit/lib
@@ -1941,7 +1943,7 @@ This directive was first introduced in the <code>v0.10.0</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, 
+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 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,
@@ -2053,6 +2055,111 @@ When a relative path like <code>foo/bar.lua</code> is given, they will be turned
 
 This directive was first introduced in the <code>v0.10.0</code> release.
 
+== ssl_session_fetch_by_lua_block ==
+
+'''syntax:''' ''ssl_session_fetch_by_lua_block { lua-script }''
+
+'''context:''' ''server''
+
+'''phase:''' ''right-before-SSL-handshake''
+
+This directive runs Lua code to look up and load the SSL session (if any) according to the session ID
+provided by the current SSL handshake request for the downstream.
+
+The Lua API for obtaining the current session ID and loading a cached SSL session data
+is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl/session.md)
+Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
+library.
+
+Lua APIs that may yield, like [[#ngx.sleep|ngx.sleep]] and [[#ngx.socket.tcp|cosockets]],
+are enabled in this context.
+
+This hook, together with the [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]] hook,
+can be used to implement distributed caching mechanisms in pure Lua (based
+on the [[#ngx.socket.tcp|cosocket]] API, for example). If a cached SSL session is found
+and loaded into the current SSL connection context,
+SSL session resumption can then get immediately initiated and bypass the full SSL handshake process which is very expensive in terms of CPU time.
+
+Please note that TLS session tickets are very different and it is the clients' responsibility
+to cache the SSL session state when session tickets are used. SSL session resumptions based on
+TLS session tickets would happen automatically without going through this hook (nor the
+[[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]] hook). This hook is mainly
+for older or less capable SSL clients that can only do SSL sessions by session IDs.
+
+When [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]] is specified at the same time,
+this hook usually runs before [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]].
+When the SSL session is found and successfully loaded for the current SSL connection,
+SSL session resumption will happen and thus bypass the [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]]
+hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]]
+hook, for obvious reasons.
+
+If you are using the [official pre-built packages](http://openresty.org/en/linux-packages.html) for [OpenResty](https://openresty.org/)
+1.11.2.1 or later, then everything should work out of the box.
+
+If you are using OpenSSL libraries not provided by [OpenResty](https://openresty.org),
+then you need to apply the following patch for OpenSSL 1.0.2h or later:
+
+https://github.com/openresty/openresty/blob/master/patches/openssl-1.0.2h-sess_set_get_cb_yield.patch
+
+If you are not using the NGINX core shipped with [OpenResty](https://openresty.org) 1.11.2.1 or later, then you need to
+apply the following patch to the standard NGINX core 1.11.2 or later:
+
+http://openresty.org/download/nginx-1.11.2-nonblocking_ssl_handshake_hooks.patch
+
+This directive was first introduced in the <code>v0.10.6</code> release.
+
+== ssl_session_fetch_by_lua_file ==
+
+'''syntax:''' ''ssl_session_fetch_by_lua_file <path-to-lua-script-file>''
+
+'''context:''' ''server''
+
+'''phase:''' ''right-before-SSL-handshake''
+
+Equivalent to [[#ssl_session_fetch_by_lua_block|ssl_session_fetch_by_lua_block]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or rather, 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.10.6</code> release.
+
+== ssl_session_store_by_lua_block ==
+
+'''syntax:''' ''ssl_session_store_by_lua_block { lua-script }''
+
+'''context:''' ''server''
+
+'''phase:''' ''right-after-SSL-handshake''
+
+This directive runs Lua code to fetch and save the SSL session (if any) according to the session ID
+provided by the current SSL handshake request for the downstream. The saved or cached SSL
+session data can be used for future SSL connections to resume SSL sessions without going
+through the full SSL handshake process (which is very expensive in terms of CPU time).
+
+Lua APIs that may yield, like [[#ngx.sleep|ngx.sleep]] and [[#ngx.socket.tcp|cosockets]],
+are *disabled* in this context. You can still, however, use the [[#ngx.timer.at|ngx.timer.at]] API
+to create 0-delay timers to save the SSL session data asynchronously to external services (like <code>redis</code> or <code>memcached</code>).
+
+The Lua API for obtaining the current session ID and the associated session state data
+is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl/session.md#readme)
+Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
+library.
+
+This directive was first introduced in the <code>v0.10.6</code> release.
+
+== ssl_session_store_by_lua_file ==
+
+'''syntax:''' ''ssl_session_store_by_lua_file <path-to-lua-script-file>''
+
+'''context:''' ''server''
+
+'''phase:''' ''right-before-SSL-handshake''
+
+Equivalent to [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua_block]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or rather, 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.10.6</code> release.
+
 == lua_shared_dict ==
 
 '''syntax:''' ''lua_shared_dict <name> <size>''
@@ -2499,7 +2606,7 @@ Undefined NGINX variables are evaluated to `nil` while uninitialized (but define
 This API requires a relatively expensive metamethod call and it is recommended to avoid using it on hot code paths.
 
 == Core constants ==
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 <geshi lang="lua">
   ngx.OK (0)
@@ -2520,7 +2627,7 @@ The <code>ngx.null</code> constant is a <code>NULL</code> light userdata usually
 The <code>ngx.DECLINED</code> constant was first introduced in the <code>v0.5.0rc19</code> release.
 
 == HTTP method constants ==
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 <geshi lang="text">
   ngx.HTTP_GET
@@ -2543,7 +2650,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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 <geshi lang="nginx">
   value = ngx.HTTP_CONTINUE (100) (first added in the v0.9.20 release)
@@ -2583,7 +2690,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*, body_filter_by_lua, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 <geshi lang="lua">
   ngx.STDERR
@@ -2602,7 +2709,7 @@ These constants are usually used by the [[#ngx.log|ngx.log]] method.
 == print ==
 '''syntax:''' ''print(...)''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, certificate_by_lua*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Writes argument values into the nginx <code>error.log</code> file with the <code>ngx.NOTICE</code> log level.
 
@@ -3302,6 +3409,8 @@ outputs something like this:
 
 This method was first introduced in the <code>v0.7.17</code> release.
 
+This method does not work in HTTP/2 requests yet.
+
 == ngx.req.get_method ==
 '''syntax:''' ''method_name = ngx.req.get_method()''
 
@@ -4127,7 +4236,7 @@ Just as [[#ngx.print|ngx.print]] but also emit a trailing newline.
 == ngx.log ==
 '''syntax:''' ''ngx.log(log_level, ...)''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Log arguments concatenated to error.log with the given logging level.
 
@@ -4142,9 +4251,9 @@ There is a hard coded <code>2048</code> byte limitation on error message lengths
 
 '''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
 
-Flushes response output to the client. 
+Flushes response output to the client.
 
-<code>ngx.flush</code> accepts an optional boolean <code>wait</code> argument (Default: <code>false</code>) first introduced in the <code>v0.3.1rc34</code> release. When called with the default argument, it issues an asynchronous call (Returns immediately without waiting for output data to be written into the system send buffer). Calling the function with the <code>wait</code> argument set to <code>true</code> switches to synchronous mode. 
+<code>ngx.flush</code> accepts an optional boolean <code>wait</code> argument (Default: <code>false</code>) first introduced in the <code>v0.3.1rc34</code> release. When called with the default argument, it issues an asynchronous call (Returns immediately without waiting for output data to be written into the system send buffer). Calling the function with the <code>wait</code> argument set to <code>true</code> switches to synchronous mode.
 
 In synchronous mode, the function will not return until all output data has been written into the system send buffer or until the [[HttpCoreModule#send_timeout|send_timeout]] setting has expired. Note that using the Lua coroutine mechanism means that this function does not block the Nginx event loop even in the synchronous mode.
 
@@ -4157,7 +4266,7 @@ Since <code>v0.8.3</code> this function returns <code>1</code> on success, or re
 == ngx.exit ==
 '''syntax:''' ''ngx.exit(status)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 When <code>status >= 200</code> (i.e., <code>ngx.HTTP_OK</code> and above), it will interrupt the execution of the current request and return status code to nginx.
 
@@ -4199,7 +4308,9 @@ Note that while this method accepts all [[#HTTP status constants|HTTP status con
 
 Also note that this method call terminates the processing of the current request and that it is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.exit(...)</code> be used to reinforce the fact that the request processing is being terminated.
 
-When being used in the context of [[#header_filter_by_lua|header_filter_by_lua]], <code>ngx.exit()</code> is an asynchronous operation and will return immediately. This behavior may change in future and it is recommended that users always use <code>return</code> in combination as suggested above.
+When being used in the contexts of [[#header_filter_by_lua|header_filter_by_lua]] and
+[[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]], <code>ngx.exit()</code> is
+an asynchronous operation and will return immediately. This behavior may change in future and it is recommended that users always use <code>return</code> in combination as suggested above.
 
 == ngx.eof ==
 '''syntax:''' ''ok, err = ngx.eof()''
@@ -4234,7 +4345,7 @@ Since <code>v0.8.3</code> this function returns <code>1</code> on success, or re
 == ngx.sleep ==
 '''syntax:''' ''ngx.sleep(seconds)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 Sleeps for the specified seconds without blocking. One can specify time resolution up to 0.001 seconds (i.e., one milliseconds).
 
@@ -4247,7 +4358,7 @@ This method was introduced in the <code>0.5.0rc30</code> release.
 == ngx.escape_uri ==
 '''syntax:''' ''newstr = ngx.escape_uri(str)''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Escape <code>str</code> as a URI component.
 
@@ -4324,7 +4435,7 @@ 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Decodes a URI encoded query-string into a Lua table. This is the inverse function of [[#ngx.encode_args|ngx.encode_args]].
 
@@ -4343,7 +4454,7 @@ This method was introduced in the <code>v0.5.0rc29</code>.
 == ngx.encode_base64 ==
 '''syntax:''' ''newstr = ngx.encode_base64(str, no_padding?)''
 
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Encodes <code>str</code> to a base64 digest.
 
@@ -4352,14 +4463,14 @@ Since the <code>0.9.16</code> release, an optional boolean-typed <code>no_paddin
 == 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the <code>str</code> argument.
 
@@ -4372,7 +4483,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Calculates the CRC-32 (Cyclic Redundancy Code) digest for the <code>str</code> argument.
 
@@ -4385,7 +4496,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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>.
 
@@ -4413,7 +4524,7 @@ 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Returns the hexadecimal representation of the MD5 digest of the <code>str</code> argument.
 
@@ -4436,7 +4547,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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Returns the binary form of the MD5 digest of the <code>str</code> argument.
 
@@ -4445,7 +4556,7 @@ 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Returns the binary form of the SHA-1 digest of the <code>str</code> argument.
 
@@ -4456,14 +4567,14 @@ This function was first introduced in the <code>v0.5.0rc6</code>.
 == ngx.quote_sql_str ==
 '''syntax:''' ''quoted_value = ngx.quote_sql_str(raw_value)''
 
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Returns a quoted SQL string literal according to the MySQL quoting rules.
 
 == ngx.today ==
 '''syntax:''' ''str = ngx.today()''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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).
 
@@ -4472,7 +4583,7 @@ This is the local time.
 == ngx.time ==
 '''syntax:''' ''secs = ngx.time()''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 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).
 
@@ -4481,7 +4592,7 @@ Updates of the Nginx time cache an be forced by calling [[#ngx.update_time|ngx.u
 == ngx.now ==
 '''syntax:''' ''secs = ngx.now()''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 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).
 
@@ -4492,7 +4603,7 @@ This API was first introduced in <code>v0.3.1rc32</code>.
 == ngx.update_time ==
 '''syntax:''' ''ngx.update_time()''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Forcibly updates the Nginx current time cache. This call involves a syscall and thus has some overhead, so do not abuse it.
 
@@ -4501,7 +4612,7 @@ This API was first introduced in <code>v0.3.1rc32</code>.
 == ngx.localtime ==
 '''syntax:''' ''str = ngx.localtime()''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 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).
 
@@ -4510,7 +4621,7 @@ This is the local time.
 == ngx.utctime ==
 '''syntax:''' ''str = ngx.utctime()''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 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).
 
@@ -4519,7 +4630,7 @@ This is the UTC time.
 == ngx.cookie_time ==
 '''syntax:''' ''str = ngx.cookie_time(sec)''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Returns a formatted 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]]).
 
@@ -4531,7 +4642,7 @@ Returns a formatted string can be used as the cookie expiration time. The parame
 == ngx.http_time ==
 '''syntax:''' ''str = ngx.http_time(sec)''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 time stamp in seconds (like those returned from [[#ngx.time|ngx.time]]).
 
@@ -4543,7 +4654,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:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
 
@@ -4564,7 +4675,7 @@ Returns <code>true</code> if the current request is an nginx subrequest, or <cod
 == ngx.re.match ==
 '''syntax:''' ''captures, err = ngx.re.match(subject, regex, options?, ctx?, res_table?)''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Matches the <code>subject</code> string using the Perl compatible regular expression <code>regex</code> with the optional <code>options</code>.
 
@@ -4711,9 +4822,9 @@ This feature was introduced in the <code>v0.2.1rc11</code> release.
 == ngx.re.find ==
 '''syntax:''' ''from, to, err = ngx.re.find(subject, regex, options?, ctx?, nth?)''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
-Similar to [[#ngx.re.match|ngx.re.match]] but only returns the begining index (<code>from</code>) and end index (<code>to</code>) of the matched substring. The returned indexes are 1-based and can be fed directly into the [http://www.lua.org/manual/5.1/manual.html#pdf-string.sub string.sub] API function to obtain the matched substring.
+Similar to [[#ngx.re.match|ngx.re.match]] but only returns the beginning index (<code>from</code>) and end index (<code>to</code>) of the matched substring. The returned indexes are 1-based and can be fed directly into the [http://www.lua.org/manual/5.1/manual.html#pdf-string.sub string.sub] API function to obtain the matched substring.
 
 In case of errors (like bad regexes or any PCRE runtime errors), this API function returns two <code>nil</code> values followed by a string describing the error.
 
@@ -4760,7 +4871,7 @@ This API function was first introduced in the <code>v0.9.2</code> release.
 == ngx.re.gmatch ==
 '''syntax:''' ''iterator, err = ngx.re.gmatch(subject, regex, options?)''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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>.
 
@@ -4833,7 +4944,7 @@ This feature was first introduced in the <code>v0.2.1rc12</code> release.
 == ngx.re.sub ==
 '''syntax:''' ''newstr, n, err = ngx.re.sub(subject, regex, replace, options?)''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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]].
 
@@ -4892,7 +5003,7 @@ This feature was first introduced in the <code>v0.2.1rc13</code> release.
 == ngx.re.gsub ==
 '''syntax:''' ''newstr, n, err = ngx.re.gsub(subject, regex, replace, options?)''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Just like [[#ngx.re.sub|ngx.re.sub]], but does global substitution.
 
@@ -4927,7 +5038,7 @@ This feature was first introduced in the <code>v0.2.1rc15</code> release.
 
 '''syntax:''' ''dict = ngx.shared[name_var]''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
 
@@ -4944,6 +5055,11 @@ The resulting object <code>dict</code> has the following methods:
 * [[#ngx.shared.DICT.replace|replace]]
 * [[#ngx.shared.DICT.delete|delete]]
 * [[#ngx.shared.DICT.incr|incr]]
+* [[#ngx.shared.DICT.lpush|lpush]]
+* [[#ngx.shared.DICT.rpush|rpush]]
+* [[#ngx.shared.DICT.lpop|lpop]]
+* [[#ngx.shared.DICT.rpop|rpop]]
+* [[#ngx.shared.DICT.llen|llen]]
 * [[#ngx.shared.DICT.flush_all|flush_all]]
 * [[#ngx.shared.DICT.flush_expired|flush_expired]]
 * [[#ngx.shared.DICT.get_keys|get_keys]]
@@ -4995,9 +5111,9 @@ 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
+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 expired, then <code>nil</code> will be returned.
 
 In case of errors, <code>nil</code> and a string describing the error will be returned.
 
@@ -5028,7 +5144,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.get_stale ==
 '''syntax:''' ''value, flags, stale = ngx.shared.DICT:get_stale(key)''
 
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Similar to the [[#ngx.shared.DICT.get|get]] method but returns the value even if the key has already expired.
 
@@ -5043,7 +5159,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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Unconditionally sets a key-value pair into the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns three values:
 
@@ -5086,7 +5202,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.safe_set ==
 '''syntax:''' ''ok, err = ngx.shared.DICT:safe_set(key, value, exptime?, flags?)''
 
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Similar to the [[#ngx.shared.DICT.set|set]] method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return <code>nil</code> and the string "no memory".
 
@@ -5097,7 +5213,7 @@ 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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
 
@@ -5110,7 +5226,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.safe_add ==
 '''syntax:''' ''ok, err = ngx.shared.DICT:safe_add(key, value, exptime?, flags?)''
 
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Similar to the [[#ngx.shared.DICT.add|add]] method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return <code>nil</code> and the string "no memory".
 
@@ -5121,7 +5237,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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
 
@@ -5134,7 +5250,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 == ngx.shared.DICT.delete ==
 '''syntax:''' ''ngx.shared.DICT:delete(key)''
 
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Unconditionally removes the key-value pair from the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
 
@@ -5145,26 +5261,102 @@ This feature was first introduced in the <code>v0.3.1rc22</code> release.
 See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 
 == ngx.shared.DICT.incr ==
-'''syntax:''' ''newval, err = ngx.shared.DICT:incr(key, value)''
+'''syntax:''' ''newval, err, forcible? = ngx.shared.DICT:incr(key, value, init?)''
 
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
 
-The key must already exist in the dictionary, otherwise it will return <code>nil</code> and <code>"not found"</code>.
+When the key does not exist or has already expired in the shared dictionary,
+
+# if the <code>init</code> argument is not specified or takes the value <code>nil</code>, this method will return <code>nil</code> and the error string <code>"not found"</code>, or
+# if the <code>init</code> argument takes a number value, this method will create a new <code>key</code> with the value <code>init + value</code>.
+
+Like the [[#ngx.shared.DICT.add|add]] method, it also overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone.
+
+The <code>forcible</code> return value will always be <code>nil</code> when the <code>init</code> argument is not specified.
+
+If this method succeeds in storing the current item by forcibly removing other not-yet-expired items in the dictionary via LRU, the <code>forcible</code> return value will be <code>true</code>. If it stores the item without forcibly removing other valid items, then the return value <code>forcible</code> will be <code>false</code>.
 
 If the original value is not a valid Lua number in the dictionary, it will return <code>nil</code> and <code>"not a number"</code>.
 
-The <code>value</code> argument can be any valid Lua numbers, like negative numbers or floating-point numbers.
+The <code>value</code> argument and <code>init</code> argument can be any valid Lua numbers, like negative numbers or floating-point numbers.
 
-This feature was first introduced in the <code>v0.3.1rc22</code> release.
+This method was first introduced in the <code>v0.3.1rc22</code> release.
+
+The optional `init` parameter was first added in the <code>v0.10.6</code> release.
+
+See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+== ngx.shared.DICT.lpush ==
+'''syntax:''' ''length, err = ngx.shared.DICT:lpush(key, value)''
+
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+Inserts the specified (numerical or string) <code>value</code> at the head of the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns the number of elements in the list after the push operation.
+
+If <code>key</code> does not exist, it is created as an empty list before performing the push operation. When the <code>key</code> already takes a value that is not a list, it will return <code>nil</code> and <code>"value not a list"</code>.
+
+It never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return <code>nil</code> and the string "no memory".
+
+This feature was first introduced in the <code>v0.10.6</code> release.
+
+See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+== ngx.shared.DICT.rpush ==
+'''syntax:''' ''length, err = ngx.shared.DICT:rpush(key, value)''
+
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+Similar to the [[#ngx.shared.DICT.lpush|lpush]] method, but inserts the specified (numerical or string) <code>value</code> at the tail of the list named <code>key</code>.
+
+This feature was first introduced in the <code>v0.10.6</code> release.
+
+See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+== ngx.shared.DICT.lpop ==
+'''syntax:''' ''val, err = ngx.shared.DICT:lpop(key)''
+
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+Removes and returns the first element of the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+If <code>key</code> does not exist, it will return <code>nil</code>. When the <code>key</code> already takes a value that is not a list, it will return <code>nil</code> and <code>"value not a list"</code>.
+
+This feature was first introduced in the <code>v0.10.6</code> release.
+
+See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+== ngx.shared.DICT.rpop ==
+'''syntax:''' ''val, err = ngx.shared.DICT:rpop(key)''
+
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+Removes and returns the last element of the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+If <code>key</code> does not exist, it will return <code>nil</code>. When the <code>key</code> already takes a value that is not a list, it will return <code>nil</code> and <code>"value not a list"</code>.
+
+This feature was first introduced in the <code>v0.10.6</code> release.
+
+See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+== ngx.shared.DICT.llen ==
+'''syntax:''' ''len, err = ngx.shared.DICT:llen(key)''
+
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+Returns the number of elements in the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+If key does not exist, it is interpreted as an empty list and 0 is returned. When the <code>key</code> already takes a value that is not a list, it will return <code>nil</code> and <code>"value not a list"</code>.
+
+This feature was first introduced in the <code>v0.10.6</code> release.
 
 See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 
 == ngx.shared.DICT.flush_all ==
 '''syntax:''' ''ngx.shared.DICT:flush_all()''
 
-'''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.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Flushes out all the items in the dictionary. This method does not actuall free up all the memory blocks in the dictionary but just marks all the existing items as expired.
 
@@ -5175,7 +5367,7 @@ See also [[#ngx.shared.DICT.flush_expired|ngx.shared.DICT.flush_expired]] and [[
 == 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*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
 
@@ -5188,7 +5380,7 @@ See also [[#ngx.shared.DICT.flush_all|ngx.shared.DICT.flush_all]] and [[#ngx.sha
 == 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*, ngx.timer.*, balancer_by_lua*, ssl_certificate_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Fetch a list of the keys from the dictionary, up to <code><max_count></code>.
 
@@ -5201,7 +5393,7 @@ 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*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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:
 
@@ -5222,7 +5414,7 @@ See also [[#ngx.socket.tcp|ngx.socket.tcp]].
 
 '''syntax:''' ''ok, err = udpsock:setpeername("unix:/path/to/unix-domain.socket")''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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.
 
@@ -5275,7 +5467,7 @@ 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*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 Sends data on the current UDP or datagram unix domain socket object.
 
@@ -5288,7 +5480,7 @@ 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*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 Receives data from the UDP or datagram unix domain socket object with an optional receive buffer size argument, <code>size</code>.
 
@@ -5319,7 +5511,7 @@ 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*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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.
 
@@ -5330,7 +5522,7 @@ 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*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 Set the timeout value in milliseconds for subsequent socket operations (like [[#udpsock:receive|receive]]).
 
@@ -5348,7 +5540,7 @@ This API function was first added to the <code>v0.10.1</code> release.
 == ngx.socket.tcp ==
 '''syntax:''' ''tcpsock = ngx.socket.tcp()''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 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:
 
@@ -5391,7 +5583,7 @@ See also [[#ngx.socket.udp|ngx.socket.udp]].
 
 '''syntax:''' ''ok, err = tcpsock:connect("unix:/path/to/unix-domain.socket", options_table?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 Attempts to connect a TCP socket object to a remote server or to a stream unix domain socket file without blocking.
 
@@ -5463,7 +5655,7 @@ This method was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:sslhandshake ==
 '''syntax:''' ''session, err = tcpsock:sslhandshake(reused_session?, server_name?, ssl_verify?, send_status_req?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 Does SSL/TLS handshake on the currently established connection.
 
@@ -5505,7 +5697,7 @@ This method was first introduced in the <code>v0.9.11</code> release.
 == tcpsock:send ==
 '''syntax:''' ''bytes, err = tcpsock:send(data)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 Sends data without blocking on the current TCP or Unix Domain Socket connection.
 
@@ -5533,7 +5725,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
 '''syntax:''' ''data, err, partial = tcpsock:receive(pattern?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 Receives data from the connected socket according to the reading pattern or size.
 
@@ -5571,7 +5763,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:receiveuntil ==
 '''syntax:''' ''iterator = tcpsock:receiveuntil(pattern, options?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 This method returns an iterator Lua function that can be called to read the data stream until it sees the specified pattern or an error occurs.
 
@@ -5663,7 +5855,7 @@ 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*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 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.
 
@@ -5676,7 +5868,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:settimeout ==
 '''syntax:''' ''tcpsock:settimeout(time)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 Set the timeout value in milliseconds for subsequent socket operations ([[#tcpsock:connect|connect]], [[#tcpsock:receive|receive]], and iterators returned from [[#tcpsock:receiveuntil|receiveuntil]]).
 
@@ -5689,7 +5881,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:setoption ==
 '''syntax:''' ''tcpsock:setoption(option, value?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 This function is added for [http://w3.impa.br/~diego/software/luasocket/tcp.html LuaSocket] API compatibility and does nothing for now. Its functionality will be implemented in future.
 
@@ -5698,7 +5890,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:setkeepalive ==
 '''syntax:''' ''ok, err = tcpsock:setkeepalive(timeout?, size?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 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.
 
@@ -5723,7 +5915,7 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 == tcpsock:getreusedtimes ==
 '''syntax:''' ''count, err = tcpsock:getreusedtimes()''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
 
 This method returns the (successfully) reused times for the current connection. In case of error, it returns <code>nil</code> and a string describing the error.
 
@@ -5756,7 +5948,7 @@ 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*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Retrieves the current running phase name. Possible return values are
 
@@ -5766,6 +5958,10 @@ Retrieves the current running phase name. Possible return values are
 : for the context of [[#init_worker_by_lua|init_worker_by_lua]] or [[#init_worker_by_lua_file|init_worker_by_lua_file]].
 * <code>ssl_cert</code>
 : for the context of [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua_block]] or [[#ssl_certificate_by_lua_file|ssl_certificate_by_lua_file]].
+* <code>ssl_session_fetch</code>
+: for the context of [[#ssl_session_fetch_by_lua_block|ssl_session_fetch_by_lua*]].
+* <code>ssl_session_store</code>
+: for the context of [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]].
 * <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>
@@ -5790,7 +5986,7 @@ This API was first introduced in the <code>v0.5.10</code> release.
 == ngx.thread.spawn ==
 '''syntax:''' ''co = ngx.thread.spawn(func, arg1, arg2, ...)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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".
 
@@ -5923,7 +6119,7 @@ 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*, ngx.timer.*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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).
 
@@ -6068,7 +6264,7 @@ See also [[#lua_check_client_abort|lua_check_client_abort]].
 == ngx.timer.at ==
 '''syntax:''' ''ok, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Creates an Nginx timer with a user callback function as well as optional user arguments.
 
@@ -6125,7 +6321,7 @@ Here is a simple example:
     }
 </geshi>
 
-One can also create infinite re-occuring timers, for instance, a timer getting triggered every <code>5</code> seconds, by calling <code>ngx.timer.at</code> recursively in the timer callback function. Here is such an example,
+One can also create infinite re-occurring timers, for instance, a timer getting triggered every <code>5</code> seconds, by calling <code>ngx.timer.at</code> recursively in the timer callback function. Here is such an example,
 
 <geshi lang="lua">
     local delay = 5
@@ -6189,7 +6385,7 @@ This API was first introduced in the <code>v0.8.0</code> release.
 == ngx.timer.running_count ==
 '''syntax:''' ''count = ngx.timer.running_count()''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Returns the number of timers currently running.
 
@@ -6198,7 +6394,7 @@ This directive was first introduced in the <code>v0.9.20</code> release.
 == ngx.timer.pending_count ==
 '''syntax:''' ''count = ngx.timer.pending_count()''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Returns the number of pending timers.
 
@@ -6287,7 +6483,7 @@ This API was first introduced in the <code>0.9.5</code> release.
 
 '''syntax:''' ''count = ngx.worker.count()''
 
-'''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.timer.*, init_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.timer.*, init_by_lua*, init_worker_by_lua*''
 
 Returns the total number of the Nginx worker processes (i.e., the value configured
 by the [http://nginx.org/en/docs/ngx_core_module.html#worker_processes worker_processes]
@@ -6384,7 +6580,7 @@ This feature requires at least ngx_lua <code>v0.10.0</code>.
 == ndk.set_var.DIRECTIVE ==
 '''syntax:''' ''res = ndk.set_var.DIRECTIVE_NAME''
 
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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>.
 
@@ -6421,7 +6617,7 @@ This feature requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_kit]
 == coroutine.create ==
 '''syntax:''' ''co = coroutine.create(f)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Creates a user Lua coroutines with a Lua function, and returns a coroutine object.
 
@@ -6434,7 +6630,7 @@ 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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Resumes the executation of a user Lua coroutine object previously yielded or just created.
 
@@ -6447,7 +6643,7 @@ This API was first introduced in the <code>v0.6.0</code> release.
 == coroutine.yield ==
 '''syntax:''' ''... = coroutine.yield(...)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Yields the execution of the current user Lua coroutine.
 
@@ -6460,7 +6656,7 @@ 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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
 
@@ -6471,7 +6667,7 @@ 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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Identical to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.running coroutine.running] API.
 
@@ -6482,7 +6678,7 @@ 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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*''
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Identical to the standard Lua [http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.status coroutine.status] API.
 
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 4bac0f6..88b41ad 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
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10005
+#define ngx_http_lua_version  10006
 
 
 typedef struct {
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 bd09def..1a4ba6d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
@@ -309,6 +309,10 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (llcf->check_client_abort) {
         r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
 
+#if (NGX_HTTP_V2)
+        if (!r->stream) {
+#endif
+
         rev = r->connection->read;
 
         if (!rev->active) {
@@ -317,6 +321,10 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
             }
         }
 
+#if (NGX_HTTP_V2)
+        }
+#endif
+
     } else {
         r->read_event_handler = ngx_http_block_reading;
     }
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
index 5fa289b..0adf787 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
@@ -33,6 +33,10 @@ struct ngx_http_lua_balancer_peer_data_s {
     in_port_t                           port;
 
     int                                 last_peer_state;
+
+#if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
+    unsigned                            cloned_upstream_conf;  /* :1 */
+#endif
 };
 
 
@@ -128,7 +132,7 @@ ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -372,7 +376,7 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
     dd("rc == %d", (int) rc);
 
     if (rc != 0) {
-        /*  error occured when running loaded code */
+        /*  error occurred when running loaded code */
         err_msg = (u_char *) lua_tolstring(L, -1, &len);
 
         if (err_msg == NULL) {
@@ -536,6 +540,101 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
 }
 
 
+int
+ngx_http_lua_ffi_balancer_set_timeouts(ngx_http_request_t *r,
+    long connect_timeout, long send_timeout, long read_timeout,
+    char **err)
+{
+    ngx_http_lua_ctx_t    *ctx;
+    ngx_http_upstream_t   *u;
+
+#if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
+    ngx_http_upstream_conf_t           *ucf;
+#endif
+    ngx_http_lua_main_conf_t           *lmcf;
+    ngx_http_lua_balancer_peer_data_t  *bp;
+
+    if (r == NULL) {
+        *err = "no request found";
+        return NGX_ERROR;
+    }
+
+    u = r->upstream;
+
+    if (u == NULL) {
+        *err = "no upstream found";
+        return NGX_ERROR;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        *err = "no ctx found";
+        return NGX_ERROR;
+    }
+
+    if ((ctx->context & NGX_HTTP_LUA_CONTEXT_BALANCER) == 0) {
+        *err = "API disabled in the current context";
+        return NGX_ERROR;
+    }
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    bp = lmcf->balancer_peer_data;
+    if (bp == NULL) {
+        *err = "no upstream peer data found";
+        return NGX_ERROR;
+    }
+
+#if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
+    if (!bp->cloned_upstream_conf) {
+        /* we clone the upstream conf for the current request so that
+         * we do not affect other requests at all. */
+
+        ucf = ngx_palloc(r->pool, sizeof(ngx_http_upstream_conf_t));
+
+        if (ucf == NULL) {
+            *err = "no memory";
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(ucf, u->conf, sizeof(ngx_http_upstream_conf_t));
+
+        u->conf = ucf;
+        bp->cloned_upstream_conf = 1;
+
+    } else {
+        ucf = u->conf;
+    }
+#endif
+
+    if (connect_timeout > 0) {
+#if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
+        u->connect_timeout = (ngx_msec_t) connect_timeout;
+#else
+        ucf->connect_timeout = (ngx_msec_t) connect_timeout;
+#endif
+    }
+
+    if (send_timeout > 0) {
+#if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
+        u->send_timeout = (ngx_msec_t) send_timeout;
+#else
+        ucf->send_timeout = (ngx_msec_t) send_timeout;
+#endif
+    }
+
+    if (read_timeout > 0) {
+#if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
+        u->read_timeout = (ngx_msec_t) read_timeout;
+#else
+        ucf->read_timeout = (ngx_msec_t) read_timeout;
+#endif
+    }
+
+    return NGX_OK;
+}
+
+
 int
 ngx_http_lua_ffi_balancer_set_more_tries(ngx_http_request_t *r,
     int count, char **err)
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c b/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
index 86e347e..2b3c38f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
@@ -116,7 +116,7 @@ ngx_http_lua_body_filter_by_chunk(lua_State *L, ngx_http_request_t *r,
 
     if (rc != 0) {
 
-        /*  error occured */
+        /*  error occurred */
         err_msg = (u_char *) lua_tolstring(L, -1, &len);
 
         if (err_msg == NULL) {
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 e8a132e..5ea3069 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_cache.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_cache.c
@@ -166,7 +166,7 @@ ngx_http_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
     rc = ngx_http_lua_clfactory_loadbuffer(L, (char *) src, src_len, name);
 
     if (rc != 0) {
-        /*  Oops! error occured when loading Lua script */
+        /*  Oops! error occurred when loading Lua script */
         if (rc == LUA_ERRMEM) {
             err = "memory allocation error";
 
@@ -252,7 +252,7 @@ ngx_http_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
     dd("loadfile returns %d (%d)", (int) rc, LUA_ERRFILE);
 
     if (rc != 0) {
-        /*  Oops! error occured when loading Lua script */
+        /*  Oops! error occurred when loading Lua script */
         switch (rc) {
         case LUA_ERRMEM:
             err = "memory allocation error";
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 86885bb..89698c7 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c
@@ -93,14 +93,14 @@
  * | Char              | Number of upvalues referenced by this function
  * | [nups]            |
  * ---------------------
- * | Char              | Number of paramters of this function
+ * | Char              | Number of parameters 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
+ * | [maxstacksize]    | Initially set to 2
  * ---------------------
  * | Vector(instr)     | Code instructions of this function
  * | [code]            |
@@ -177,7 +177,7 @@
  * | Char              | F(ffi) | V(vararg)| C(has internal funcs)
  * | [func flag]       |
  * ---------------------
- * | Char              | Number of paramters of this function
+ * | Char              | Number of parameters of this function
  * | [numparams]       |
  * ---------------------
  * | Char              |
@@ -498,7 +498,7 @@ ngx_http_lua_clfactory_bytecode_prepare(lua_State *L,
                     sizeof(size_t) + sizeof(int) * 2);
         /* number of upvalues */
         *(lf->begin_code.str + POS_NUM_OF_UPVS) = 0;
-        /* number of paramters */
+        /* number of parameters */
         *(lf->begin_code.str + POS_NUM_OF_PARA) = 0;
         /* is var-argument function? */
         *(lf->begin_code.str + POS_IS_VAR_ARG) = 2;
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 758c42a..d5e0dc8 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_common.h
@@ -42,6 +42,13 @@
 #endif
 
 
+#ifndef NGX_HAVE_SHA1
+#   if (nginx_version >= 1011002)
+#       define NGX_HAVE_SHA1  1
+#   endif
+#endif
+
+
 #ifndef MD5_DIGEST_LENGTH
 #define MD5_DIGEST_LENGTH 16
 #endif
@@ -96,17 +103,19 @@ typedef struct {
 
 
 /* must be within 16 bit */
-#define NGX_HTTP_LUA_CONTEXT_SET            0x001
-#define NGX_HTTP_LUA_CONTEXT_REWRITE        0x002
-#define NGX_HTTP_LUA_CONTEXT_ACCESS         0x004
-#define NGX_HTTP_LUA_CONTEXT_CONTENT        0x008
-#define NGX_HTTP_LUA_CONTEXT_LOG            0x010
-#define NGX_HTTP_LUA_CONTEXT_HEADER_FILTER  0x020
-#define NGX_HTTP_LUA_CONTEXT_BODY_FILTER    0x040
-#define NGX_HTTP_LUA_CONTEXT_TIMER          0x080
-#define NGX_HTTP_LUA_CONTEXT_INIT_WORKER    0x100
-#define NGX_HTTP_LUA_CONTEXT_BALANCER       0x200
-#define NGX_HTTP_LUA_CONTEXT_SSL_CERT       0x400
+#define NGX_HTTP_LUA_CONTEXT_SET            0x0001
+#define NGX_HTTP_LUA_CONTEXT_REWRITE        0x0002
+#define NGX_HTTP_LUA_CONTEXT_ACCESS         0x0004
+#define NGX_HTTP_LUA_CONTEXT_CONTENT        0x0008
+#define NGX_HTTP_LUA_CONTEXT_LOG            0x0010
+#define NGX_HTTP_LUA_CONTEXT_HEADER_FILTER  0x0020
+#define NGX_HTTP_LUA_CONTEXT_BODY_FILTER    0x0040
+#define NGX_HTTP_LUA_CONTEXT_TIMER          0x0080
+#define NGX_HTTP_LUA_CONTEXT_INIT_WORKER    0x0100
+#define NGX_HTTP_LUA_CONTEXT_BALANCER       0x0200
+#define NGX_HTTP_LUA_CONTEXT_SSL_CERT       0x0400
+#define NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE 0x0800
+#define NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH 0x1000
 
 
 #ifndef NGX_LUA_NO_FFI_API
@@ -197,10 +206,18 @@ struct ngx_http_lua_main_conf_s {
 union ngx_http_lua_srv_conf_u {
 #if (NGX_HTTP_SSL)
     struct {
-        ngx_http_lua_srv_conf_handler_pt     cert_handler;
-        ngx_str_t                            cert_src;
-        u_char                              *cert_src_key;
-    } ssl;
+        ngx_http_lua_srv_conf_handler_pt     ssl_cert_handler;
+        ngx_str_t                            ssl_cert_src;
+        u_char                              *ssl_cert_src_key;
+
+        ngx_http_lua_srv_conf_handler_pt     ssl_sess_store_handler;
+        ngx_str_t                            ssl_sess_store_src;
+        u_char                              *ssl_sess_store_src_key;
+
+        ngx_http_lua_srv_conf_handler_pt     ssl_sess_fetch_handler;
+        ngx_str_t                            ssl_sess_fetch_src;
+        u_char                              *ssl_sess_fetch_src_key;
+    } srv;
 #endif
 
     struct {
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 6718885..ecd6c0e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
@@ -97,6 +97,10 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (llcf->check_client_abort) {
         r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
 
+#if (NGX_HTTP_V2)
+        if (!r->stream) {
+#endif
+
         rev = r->connection->read;
 
         if (!rev->active) {
@@ -105,6 +109,10 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
             }
         }
 
+#if (NGX_HTTP_V2)
+        }
+#endif
+
     } else {
         r->read_event_handler = ngx_http_block_reading;
     }
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 4c5f65e..9e78bec 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_control.c
@@ -318,11 +318,16 @@ ngx_http_lua_ngx_exit(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_TIMER
                                | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
                                | NGX_HTTP_LUA_CONTEXT_BALANCER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
+                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     rc = (ngx_int_t) luaL_checkinteger(L, 1);
 
-    if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_CERT) {
+    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
+                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH))
+    {
 
 #if (NGX_HTTP_SSL)
 
@@ -332,6 +337,10 @@ ngx_http_lua_ngx_exit(lua_State *L)
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "lua exit with code %i", rc);
 
+        if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE) {
+            return 0;
+        }
+
         return lua_yield(L, 0);
 
 #else
@@ -460,14 +469,19 @@ ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
                                        | NGX_HTTP_LUA_CONTEXT_TIMER
                                        | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
                                        | NGX_HTTP_LUA_CONTEXT_BALANCER
-                                       | NGX_HTTP_LUA_CONTEXT_SSL_CERT,
+                                       | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                                       | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
+                                       | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH,
                                        err, errlen)
         != NGX_OK)
     {
         return NGX_ERROR;
     }
 
-    if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_CERT) {
+    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
+                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH))
+    {
 
 #if (NGX_HTTP_SSL)
 
@@ -477,6 +491,10 @@ ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "lua exit with code %d", status);
 
+        if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE) {
+            return NGX_DONE;
+        }
+
         return NGX_OK;
 
 #else
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c b/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
index cb819c6..b790814 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
@@ -77,7 +77,8 @@ ngx_http_lua_coroutine_create_helper(lua_State *L, ngx_http_request_t *r,
                                | NGX_HTTP_LUA_CONTEXT_ACCESS
                                | NGX_HTTP_LUA_CONTEXT_CONTENT
                                | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     vm = ngx_http_lua_get_lua_vm(r, ctx);
 
@@ -153,7 +154,8 @@ ngx_http_lua_coroutine_resume(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_ACCESS
                                | NGX_HTTP_LUA_CONTEXT_CONTENT
                                | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     p_coctx = ctx->cur_co_ctx;
     if (p_coctx == NULL) {
@@ -213,7 +215,8 @@ ngx_http_lua_coroutine_yield(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_ACCESS
                                | NGX_HTTP_LUA_CONTEXT_CONTENT
                                | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     coctx = ctx->cur_co_ctx;
 
@@ -362,7 +365,8 @@ ngx_http_lua_coroutine_status(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_ACCESS
                                | NGX_HTTP_LUA_CONTEXT_CONTENT
                                | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     coctx = ngx_http_lua_get_co_ctx(co, ctx);
     if (coctx == NULL) {
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 e6bc339..e9313db 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
@@ -459,7 +459,7 @@ ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     return "does not work with " NGINX_VER;
 #endif
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -569,7 +569,7 @@ ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -681,7 +681,7 @@ ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -802,7 +802,7 @@ ngx_http_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -912,7 +912,7 @@ ngx_http_lua_header_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -1012,7 +1012,7 @@ ngx_http_lua_body_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -1110,7 +1110,7 @@ ngx_http_lua_init_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -1177,7 +1177,7 @@ ngx_http_lua_init_worker_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
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 75ce324..b504530 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c
@@ -112,7 +112,7 @@ ngx_http_lua_header_filter_by_chunk(lua_State *L, ngx_http_request_t *r)
     dd("rc == %d", (int) rc);
 
     if (rc != 0) {
-        /*  error occured when running loaded code */
+        /*  error occurred when running loaded code */
         err_msg = (u_char *) lua_tolstring(L, -1, &len);
 
         if (err_msg == NULL) {
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 45be168..0af56f6 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
@@ -99,6 +99,12 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
     hc = mr->http_connection;
     c = mr->connection;
 
+#if (NGX_HTTP_V2)
+    if (mr->stream) {
+        return luaL_error(L, "http v2 not supported yet");
+    }
+#endif
+
 #if 1
     dd("hc->nbusy: %d", (int) hc->nbusy);
 
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 82b4331..b0c28d5 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
@@ -263,6 +263,11 @@ retry:
 
 new_header:
 
+    if (r->headers_in.headers.last == NULL) {
+        /* must be 400 bad request */
+        return NGX_OK;
+    }
+
     h = ngx_list_push(&r->headers_in.headers);
 
     if (h == NULL) {
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_logby.c b/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
index 0a79acd..49fcd08 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
@@ -198,7 +198,7 @@ ngx_http_lua_log_by_chunk(lua_State *L, ngx_http_request_t *r)
 #endif
 
         if (rc != 0) {
-            /*  error occured when running loaded code */
+            /*  error occurred when running loaded code */
             err_msg = (u_char *) lua_tolstring(L, -1, &len);
 
             if (err_msg == NULL) {
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 867661c..c5e10f9 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
@@ -26,6 +26,8 @@
 #include "ngx_http_lua_semaphore.h"
 #include "ngx_http_lua_balancer.h"
 #include "ngx_http_lua_ssl_certby.h"
+#include "ngx_http_lua_ssl_session_storeby.h"
+#include "ngx_http_lua_ssl_session_fetchby.h"
 
 
 static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
@@ -525,6 +527,34 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       (void *) ngx_http_lua_ssl_cert_handler_file },
 
+    { ngx_string("ssl_session_store_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_ssl_sess_store_by_lua_block,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_ssl_sess_store_handler_inline },
+
+    { ngx_string("ssl_session_store_by_lua_file"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_lua_ssl_sess_store_by_lua,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_ssl_sess_store_handler_file },
+
+    { ngx_string("ssl_session_fetch_by_lua_block"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_http_lua_ssl_sess_fetch_by_lua_block,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_ssl_sess_fetch_handler_inline },
+
+    { ngx_string("ssl_session_fetch_by_lua_file"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_lua_ssl_sess_fetch_by_lua,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_ssl_sess_fetch_handler_file },
+
     { ngx_string("lua_ssl_verify_depth"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -681,7 +711,6 @@ ngx_http_lua_init(ngx_conf_t *cf)
     }
 
 #ifndef NGX_LUA_NO_FFI_API
-
     /* add the cleanup of semaphores after the lua_close */
     cln = ngx_pool_cleanup_add(cf->pool, 0);
     if (cln == NULL) {
@@ -690,7 +719,6 @@ ngx_http_lua_init(ngx_conf_t *cf)
 
     cln->data = lmcf;
     cln->handler = ngx_http_lua_sema_mm_cleanup;
-
 #endif
 
     if (lmcf->lua == NULL) {
@@ -761,7 +789,9 @@ ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data)
 static void *
 ngx_http_lua_create_main_conf(ngx_conf_t *cf)
 {
+#ifndef NGX_LUA_NO_FFI_API
     ngx_int_t       rc;
+#endif
 
     ngx_http_lua_main_conf_t    *lmcf;
 
@@ -802,11 +832,14 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
     lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
     lmcf->postponed_to_access_phase_end = NGX_CONF_UNSET;
 
+#ifndef NGX_LUA_NO_FFI_API
     rc = ngx_http_lua_sema_mm_init(cf, lmcf);
     if (rc != NGX_OK) {
         return NULL;
     }
+
     dd("nginx Lua module main config structure initialized!");
+#endif
 
     return lmcf;
 }
@@ -852,9 +885,18 @@ ngx_http_lua_create_srv_conf(ngx_conf_t *cf)
     }
 
     /* set by ngx_pcalloc:
-     *      lscf->ssl.cert_handler = NULL;
-     *      lscf->ssl.cert_src = { 0, NULL };
-     *      lscf->ssl.cert_src_key = NULL;
+     *      lscf->srv.ssl_cert_handler = NULL;
+     *      lscf->srv.ssl_cert_src = { 0, NULL };
+     *      lscf->srv.ssl_cert_src_key = NULL;
+     *
+     *      lscf->srv.ssl_session_store_handler = NULL;
+     *      lscf->srv.ssl_session_store_src = { 0, NULL };
+     *      lscf->srv.ssl_session_store_src_key = NULL;
+     *
+     *      lscf->srv.ssl_session_fetch_handler = NULL;
+     *      lscf->srv.ssl_session_fetch_src = { 0, NULL };
+     *      lscf->srv.ssl_session_fetch_src_key = NULL;
+     *
      *      lscf->balancer.handler = NULL;
      *      lscf->balancer.src = { 0, NULL };
      *      lscf->balancer.src_key = NULL;
@@ -875,13 +917,13 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     dd("merge srv conf");
 
-    if (conf->ssl.cert_src.len == 0) {
-        conf->ssl.cert_src = prev->ssl.cert_src;
-        conf->ssl.cert_src_key = prev->ssl.cert_src_key;
-        conf->ssl.cert_handler = prev->ssl.cert_handler;
+    if (conf->srv.ssl_cert_src.len == 0) {
+        conf->srv.ssl_cert_src = prev->srv.ssl_cert_src;
+        conf->srv.ssl_cert_src_key = prev->srv.ssl_cert_src_key;
+        conf->srv.ssl_cert_handler = prev->srv.ssl_cert_handler;
     }
 
-    if (conf->ssl.cert_src.len) {
+    if (conf->srv.ssl_cert_src.len) {
         sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
         if (sscf == NULL || sscf->ssl.ctx == NULL) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
@@ -910,6 +952,56 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #   endif
 
+#endif
+    }
+
+    if (conf->srv.ssl_sess_store_src.len == 0) {
+        conf->srv.ssl_sess_store_src = prev->srv.ssl_sess_store_src;
+        conf->srv.ssl_sess_store_src_key = prev->srv.ssl_sess_store_src_key;
+        conf->srv.ssl_sess_store_handler = prev->srv.ssl_sess_store_handler;
+    }
+
+    if (conf->srv.ssl_sess_store_src.len) {
+        sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
+        if (sscf == NULL || sscf->ssl.ctx == NULL) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no ssl configured for the server");
+
+            return NGX_CONF_ERROR;
+        }
+
+#ifdef LIBRESSL_VERSION_NUMBER
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "LibreSSL does not support ssl_session_store_by_lua*");
+        return NGX_CONF_ERROR;
+#else
+        SSL_CTX_sess_set_new_cb(sscf->ssl.ctx,
+                                ngx_http_lua_ssl_sess_store_handler);
+#endif
+    }
+
+    if (conf->srv.ssl_sess_fetch_src.len == 0) {
+        conf->srv.ssl_sess_fetch_src = prev->srv.ssl_sess_fetch_src;
+        conf->srv.ssl_sess_fetch_src_key = prev->srv.ssl_sess_fetch_src_key;
+        conf->srv.ssl_sess_fetch_handler = prev->srv.ssl_sess_fetch_handler;
+    }
+
+    if (conf->srv.ssl_sess_fetch_src.len) {
+        sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
+        if (sscf == NULL || sscf->ssl.ctx == NULL) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no ssl configured for the server");
+
+            return NGX_CONF_ERROR;
+        }
+
+#ifdef LIBRESSL_VERSION_NUMBER
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "LibreSSL does not support ssl_session_fetch_by_lua*");
+        return NGX_CONF_ERROR;
+#else
+        SSL_CTX_sess_set_get_cb(sscf->ssl.ctx,
+                                ngx_http_lua_ssl_sess_fetch_handler);
 #endif
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_phase.c b/debian/modules/nginx-lua/src/ngx_http_lua_phase.c
index b8e936a..50c5311 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_phase.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_phase.c
@@ -84,8 +84,16 @@ ngx_http_lua_ngx_get_phase(lua_State *L)
         lua_pushliteral(L, "ssl_cert");
         break;
 
+    case NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE:
+        lua_pushliteral(L, "ssl_session_store");
+        break;
+
+    case NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH:
+        lua_pushliteral(L, "ssl_session_fetch");
+        break;
+
     default:
-        return luaL_error(L, "unknown phase: %d", (int) ctx->context);
+        return luaL_error(L, "unknown phase: %#x", (int) ctx->context);
     }
 
     return 1;
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 2ef59c5..44d8941 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
@@ -304,6 +304,10 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (llcf->check_client_abort) {
         r->read_event_handler = ngx_http_lua_rd_check_broken_connection;
 
+#if (NGX_HTTP_V2)
+        if (!r->stream) {
+#endif
+
         rev = r->connection->read;
 
         if (!rev->active) {
@@ -312,6 +316,10 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
             }
         }
 
+#if (NGX_HTTP_V2)
+        }
+#endif
+
     } else {
         r->read_event_handler = ngx_http_block_reading;
     }
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 ed9ccc4..2e8762a 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_setby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_setby.c
@@ -88,7 +88,7 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
 #endif
 
         if (rc != 0) {
-            /*  error occured when running loaded code */
+            /*  error occurred when running loaded code */
             err_msg = (u_char *) lua_tolstring(L, -1, &len);
 
             if (err_msg == NULL) {
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 43f5f9e..ac7f6f1 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
@@ -34,6 +34,13 @@ 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);
+static int ngx_http_lua_shdict_lpush(lua_State *L);
+static int ngx_http_lua_shdict_rpush(lua_State *L);
+static int ngx_http_lua_shdict_push_helper(lua_State *L, int flags);
+static int ngx_http_lua_shdict_lpop(lua_State *L);
+static int ngx_http_lua_shdict_rpop(lua_State *L);
+static int ngx_http_lua_shdict_pop_helper(lua_State *L, int flags);
+static int ngx_http_lua_shdict_llen(lua_State *L);
 
 
 static ngx_inline ngx_shm_zone_t *ngx_http_lua_shdict_get_zone(lua_State *L,
@@ -45,11 +52,32 @@ static ngx_inline ngx_shm_zone_t *ngx_http_lua_shdict_get_zone(lua_State *L,
 #define NGX_HTTP_LUA_SHDICT_SAFE_STORE  0x0004
 
 
+#define NGX_HTTP_LUA_SHDICT_LEFT        0x0001
+#define NGX_HTTP_LUA_SHDICT_RIGHT       0x0002
+
+
 enum {
     SHDICT_USERDATA_INDEX = 1,
 };
 
 
+enum {
+    SHDICT_TNIL = 0,        /* same as LUA_TNIL */
+    SHDICT_TBOOLEAN = 1,    /* same as LUA_TBOOLEAN */
+    SHDICT_TNUMBER = 3,     /* same as LUA_TNUMBER */
+    SHDICT_TSTRING = 4,     /* same as LUA_TSTRING */
+    SHDICT_TLIST = 5,
+};
+
+
+static ngx_inline ngx_queue_t *
+ngx_http_lua_shdict_get_list_head(ngx_http_lua_shdict_node_t *sd, size_t len)
+{
+    return (ngx_queue_t *) ngx_align_ptr(((u_char *) &sd->data + len),
+                                         NGX_ALIGNMENT);
+}
+
+
 ngx_int_t
 ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
 {
@@ -90,7 +118,7 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     ngx_rbtree_init(&ctx->sh->rbtree, &ctx->sh->sentinel,
                     ngx_http_lua_shdict_rbtree_insert_value);
 
-    ngx_queue_init(&ctx->sh->queue);
+    ngx_queue_init(&ctx->sh->lru_queue);
 
     len = sizeof(" in lua_shared_dict zone \"\"") + shm_zone->shm.name.len;
 
@@ -214,7 +242,7 @@ ngx_http_lua_shdict_lookup(ngx_shm_zone_t *shm_zone, ngx_uint_t hash,
 
         if (rc == 0) {
             ngx_queue_remove(&sd->queue);
-            ngx_queue_insert_head(&ctx->sh->queue, &sd->queue);
+            ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
 
             *sdp = sd;
 
@@ -249,13 +277,14 @@ ngx_http_lua_shdict_lookup(ngx_shm_zone_t *shm_zone, ngx_uint_t hash,
 static int
 ngx_http_lua_shdict_expire(ngx_http_lua_shdict_ctx_t *ctx, ngx_uint_t n)
 {
-    ngx_time_t                  *tp;
-    uint64_t                     now;
-    ngx_queue_t                 *q;
-    int64_t                      ms;
-    ngx_rbtree_node_t           *node;
-    ngx_http_lua_shdict_node_t  *sd;
-    int                          freed = 0;
+    ngx_time_t                      *tp;
+    uint64_t                         now;
+    ngx_queue_t                     *q, *list_queue, *lq;
+    int64_t                          ms;
+    ngx_rbtree_node_t               *node;
+    ngx_http_lua_shdict_node_t      *sd;
+    int                              freed = 0;
+    ngx_http_lua_shdict_list_node_t *lnode;
 
     tp = ngx_timeofday();
 
@@ -269,11 +298,11 @@ ngx_http_lua_shdict_expire(ngx_http_lua_shdict_ctx_t *ctx, ngx_uint_t n)
 
     while (n < 3) {
 
-        if (ngx_queue_empty(&ctx->sh->queue)) {
+        if (ngx_queue_empty(&ctx->sh->lru_queue)) {
             return freed;
         }
 
-        q = ngx_queue_last(&ctx->sh->queue);
+        q = ngx_queue_last(&ctx->sh->lru_queue);
 
         sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
 
@@ -289,6 +318,20 @@ ngx_http_lua_shdict_expire(ngx_http_lua_shdict_ctx_t *ctx, ngx_uint_t n)
             }
         }
 
+        if (sd->value_type == SHDICT_TLIST) {
+            list_queue = ngx_http_lua_shdict_get_list_head(sd, sd->key_len);
+
+            for (lq = ngx_queue_head(list_queue);
+                 lq != ngx_queue_sentinel(list_queue);
+                 lq = ngx_queue_next(lq))
+            {
+                lnode = ngx_queue_data(lq, ngx_http_lua_shdict_list_node_t,
+                                       queue);
+
+                ngx_slab_free_locked(ctx->shpool, lnode);
+            }
+        }
+
         ngx_queue_remove(q);
 
         node = (ngx_rbtree_node_t *)
@@ -316,7 +359,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 */, 13 /* nrec */); /* shared mt */
+        lua_createtable(L, 0 /* narr */, 18 /* nrec */); /* shared mt */
 
         lua_pushcfunction(L, ngx_http_lua_shdict_get);
         lua_setfield(L, -2, "get");
@@ -345,6 +388,21 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
         lua_pushcfunction(L, ngx_http_lua_shdict_delete);
         lua_setfield(L, -2, "delete");
 
+        lua_pushcfunction(L, ngx_http_lua_shdict_lpush);
+        lua_setfield(L, -2, "lpush");
+
+        lua_pushcfunction(L, ngx_http_lua_shdict_rpush);
+        lua_setfield(L, -2, "rpush");
+
+        lua_pushcfunction(L, ngx_http_lua_shdict_lpop);
+        lua_setfield(L, -2, "lpop");
+
+        lua_pushcfunction(L, ngx_http_lua_shdict_rpop);
+        lua_setfield(L, -2, "rpop");
+
+        lua_pushcfunction(L, ngx_http_lua_shdict_llen);
+        lua_setfield(L, -2, "llen");
+
         lua_pushcfunction(L, ngx_http_lua_shdict_flush_all);
         lua_setfield(L, -2, "flush_all");
 
@@ -503,12 +561,13 @@ ngx_http_lua_shdict_get_helper(lua_State *L, int get_stale)
     value.len = (size_t) sd->value_len;
 
     switch (value_type) {
-    case LUA_TSTRING:
+
+    case SHDICT_TSTRING:
 
         lua_pushlstring(L, (char *) value.data, value.len);
         break;
 
-    case LUA_TNUMBER:
+    case SHDICT_TNUMBER:
 
         if (value.len != sizeof(double)) {
 
@@ -524,7 +583,7 @@ ngx_http_lua_shdict_get_helper(lua_State *L, int get_stale)
         lua_pushnumber(L, num);
         break;
 
-    case LUA_TBOOLEAN:
+    case SHDICT_TBOOLEAN:
 
         if (value.len != sizeof(u_char)) {
 
@@ -540,6 +599,14 @@ ngx_http_lua_shdict_get_helper(lua_State *L, int get_stale)
         lua_pushboolean(L, c ? 1 : 0);
         break;
 
+    case SHDICT_TLIST:
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        lua_pushnil(L);
+        lua_pushliteral(L, "value is a list");
+        return 2;
+
     default:
 
         ngx_shmtx_unlock(&ctx->shpool->mutex);
@@ -621,8 +688,8 @@ ngx_http_lua_shdict_flush_all(lua_State *L)
 
     ngx_shmtx_lock(&ctx->shpool->mutex);
 
-    for (q = ngx_queue_head(&ctx->sh->queue);
-         q != ngx_queue_sentinel(&ctx->sh->queue);
+    for (q = ngx_queue_head(&ctx->sh->lru_queue);
+         q != ngx_queue_sentinel(&ctx->sh->lru_queue);
          q = ngx_queue_next(q))
     {
         sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
@@ -640,16 +707,17 @@ 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;
+    ngx_queue_t                     *q, *prev, *list_queue, *lq;
+    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;
+    ngx_http_lua_shdict_list_node_t *lnode;
 
     n = lua_gettop(L);
 
@@ -672,7 +740,7 @@ ngx_http_lua_shdict_flush_expired(lua_State *L)
 
     ngx_shmtx_lock(&ctx->shpool->mutex);
 
-    if (ngx_queue_empty(&ctx->sh->queue)) {
+    if (ngx_queue_empty(&ctx->sh->lru_queue)) {
         ngx_shmtx_unlock(&ctx->shpool->mutex);
         lua_pushnumber(L, 0);
         return 1;
@@ -682,14 +750,29 @@ ngx_http_lua_shdict_flush_expired(lua_State *L)
 
     now = (uint64_t) tp->sec * 1000 + tp->msec;
 
-    q = ngx_queue_last(&ctx->sh->queue);
+    q = ngx_queue_last(&ctx->sh->lru_queue);
 
-    while (q != ngx_queue_sentinel(&ctx->sh->queue)) {
+    while (q != ngx_queue_sentinel(&ctx->sh->lru_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) {
+
+            if (sd->value_type == SHDICT_TLIST) {
+                list_queue = ngx_http_lua_shdict_get_list_head(sd, sd->key_len);
+
+                for (lq = ngx_queue_head(list_queue);
+                     lq != ngx_queue_sentinel(list_queue);
+                     lq = ngx_queue_next(lq))
+                {
+                    lnode = ngx_queue_data(lq, ngx_http_lua_shdict_list_node_t,
+                                           queue);
+
+                    ngx_slab_free_locked(ctx->shpool, lnode);
+                }
+            }
+
             ngx_queue_remove(q);
 
             node = (ngx_rbtree_node_t *)
@@ -753,7 +836,7 @@ ngx_http_lua_shdict_get_keys(lua_State *L)
 
     ngx_shmtx_lock(&ctx->shpool->mutex);
 
-    if (ngx_queue_empty(&ctx->sh->queue)) {
+    if (ngx_queue_empty(&ctx->sh->lru_queue)) {
         ngx_shmtx_unlock(&ctx->shpool->mutex);
         lua_createtable(L, 0, 0);
         return 1;
@@ -765,9 +848,9 @@ ngx_http_lua_shdict_get_keys(lua_State *L)
 
     /* first run through: get total number of elements we need to allocate */
 
-    q = ngx_queue_last(&ctx->sh->queue);
+    q = ngx_queue_last(&ctx->sh->lru_queue);
 
-    while (q != ngx_queue_sentinel(&ctx->sh->queue)) {
+    while (q != ngx_queue_sentinel(&ctx->sh->lru_queue)) {
         prev = ngx_queue_prev(q);
 
         sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
@@ -787,9 +870,9 @@ ngx_http_lua_shdict_get_keys(lua_State *L)
     /* second run through: add keys to table */
 
     total = 0;
-    q = ngx_queue_last(&ctx->sh->queue);
+    q = ngx_queue_last(&ctx->sh->lru_queue);
 
-    while (q != ngx_queue_sentinel(&ctx->sh->queue)) {
+    while (q != ngx_queue_sentinel(&ctx->sh->lru_queue)) {
         prev = ngx_queue_prev(q);
 
         sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
@@ -870,6 +953,7 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
                          /* indicates whether to foricibly override other
                           * valid entries */
     int32_t                      user_flags = 0;
+    ngx_queue_t                 *queue, *q;
 
     n = lua_gettop(L);
 
@@ -914,17 +998,18 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
     value_type = lua_type(L, 3);
 
     switch (value_type) {
-    case LUA_TSTRING:
+
+    case SHDICT_TSTRING:
         value.data = (u_char *) lua_tolstring(L, 3, &value.len);
         break;
 
-    case LUA_TNUMBER:
+    case SHDICT_TNUMBER:
         value.len = sizeof(double);
         num = lua_tonumber(L, 3);
         value.data = (u_char *) &num;
         break;
 
-    case LUA_TBOOLEAN:
+    case SHDICT_TBOOLEAN:
         value.len = sizeof(u_char);
         c = lua_toboolean(L, 3) ? 1 : 0;
         value.data = &c;
@@ -1015,14 +1100,17 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
 
 replace:
 
-        if (value.data && value.len == (size_t) sd->value_len) {
+        if (value.data
+            && value.len == (size_t) sd->value_len
+            && sd->value_type != SHDICT_TLIST)
+        {
 
             ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
                            "lua shared dict set: found old entry and value "
                            "size matched, reusing it");
 
             ngx_queue_remove(&sd->queue);
-            ngx_queue_insert_head(&ctx->sh->queue, &sd->queue);
+            ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
 
             sd->key_len = (u_short) key.len;
 
@@ -1060,6 +1148,21 @@ replace:
 
 remove:
 
+        if (sd->value_type == SHDICT_TLIST) {
+            queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
+
+            for (q = ngx_queue_head(queue);
+                 q != ngx_queue_sentinel(queue);
+                 q = ngx_queue_next(q))
+            {
+                p = (u_char *) ngx_queue_data(q,
+                                              ngx_http_lua_shdict_list_node_t,
+                                              queue);
+
+                ngx_slab_free_locked(ctx->shpool, p);
+            }
+        }
+
         ngx_queue_remove(&sd->queue);
 
         node = (ngx_rbtree_node_t *)
@@ -1158,7 +1261,7 @@ allocated:
 
     ngx_rbtree_insert(&ctx->sh->rbtree, node);
 
-    ngx_queue_insert_head(&ctx->sh->queue, &sd->queue);
+    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
 
     ngx_shmtx_unlock(&ctx->shpool->mutex);
 
@@ -1172,21 +1275,27 @@ allocated:
 static int
 ngx_http_lua_shdict_incr(lua_State *L)
 {
-    int                          n;
+    int                          i, n;
     ngx_str_t                    key;
     uint32_t                     hash;
     ngx_int_t                    rc;
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
     double                       num;
+    double                       init = 0;
     u_char                      *p;
     ngx_shm_zone_t              *zone;
     double                       value;
+    ngx_rbtree_node_t           *node;
+                         /* indicates whether to foricibly override other
+                          * valid entries */
+    int                          forcible = 0;
+    ngx_queue_t                 *queue, *q;
 
     n = lua_gettop(L);
 
-    if (n != 3) {
-        return luaL_error(L, "expecting 3 arguments, but only seen %d", n);
+    if (n != 3 && n != 4) {
+        return luaL_error(L, "expecting 3 or 4 arguments, but only seen %d", n);
     }
 
     if (lua_type(L, 1) != LUA_TTABLE) {
@@ -1224,6 +1333,10 @@ ngx_http_lua_shdict_incr(lua_State *L)
 
     value = luaL_checknumber(L, 3);
 
+    if (n == 4) {
+        init = luaL_checknumber(L, 4);
+    }
+
     dd("looking up key %.*s in shared dict %.*s", (int) key.len, key.data,
        (int) ctx->name.len, ctx->name.data);
 
@@ -1238,16 +1351,47 @@ ngx_http_lua_shdict_incr(lua_State *L)
     dd("shdict lookup returned %d", (int) rc);
 
     if (rc == NGX_DECLINED || rc == NGX_DONE) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
 
-        lua_pushnil(L);
-        lua_pushliteral(L, "not found");
-        return 2;
+        if (n == 3) {
+            ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+            lua_pushnil(L);
+            lua_pushliteral(L, "not found");
+            return 2;
+        }
+
+        /* add value */
+        num = value + init;
+
+        if (rc == NGX_DONE) {
+
+            /* found an expired item */
+
+            if ((size_t) sd->value_len == sizeof(double)
+                && sd->value_type != SHDICT_TLIST)
+            {
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                               "lua shared dict incr: found old entry and "
+                               "value size matched, reusing it");
+
+                ngx_queue_remove(&sd->queue);
+                ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
+
+                dd("go to setvalue");
+                goto setvalue;
+            }
+
+            dd("go to remove");
+            goto remove;
+        }
+
+        dd("go to insert");
+        goto insert;
     }
 
     /* rc == NGX_OK */
 
-    if (sd->value_type != LUA_TNUMBER || sd->value_len != sizeof(double)) {
+    if (sd->value_type != SHDICT_TNUMBER || sd->value_len != sizeof(double)) {
         ngx_shmtx_unlock(&ctx->shpool->mutex);
 
         lua_pushnil(L);
@@ -1256,7 +1400,7 @@ ngx_http_lua_shdict_incr(lua_State *L)
     }
 
     ngx_queue_remove(&sd->queue);
-    ngx_queue_insert_head(&ctx->sh->queue, &sd->queue);
+    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
 
     dd("setting value type to %d", (int) sd->value_type);
 
@@ -1272,6 +1416,109 @@ ngx_http_lua_shdict_incr(lua_State *L)
     lua_pushnumber(L, num);
     lua_pushnil(L);
     return 2;
+
+remove:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                   "lua shared dict incr: found old entry but value size "
+                   "NOT matched, removing it first");
+
+    if (sd->value_type == SHDICT_TLIST) {
+        queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
+
+        for (q = ngx_queue_head(queue);
+             q != ngx_queue_sentinel(queue);
+             q = ngx_queue_next(q))
+        {
+            p = (u_char *) ngx_queue_data(q,
+                                          ngx_http_lua_shdict_list_node_t,
+                                          queue);
+
+            ngx_slab_free_locked(ctx->shpool, p);
+        }
+    }
+
+    ngx_queue_remove(&sd->queue);
+
+    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);
+
+insert:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                   "lua shared dict incr: creating a new entry");
+
+    n = offsetof(ngx_rbtree_node_t, color)
+        + offsetof(ngx_http_lua_shdict_node_t, data)
+        + key.len
+        + sizeof(double);
+
+    node = ngx_slab_alloc_locked(ctx->shpool, n);
+
+    if (node == NULL) {
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                       "lua shared dict incr: overriding non-expired items "
+                       "due to memory shortage for entry \"%V\"", &key);
+
+        for (i = 0; i < 30; i++) {
+            if (ngx_http_lua_shdict_expire(ctx, 0) == 0) {
+                break;
+            }
+
+            forcible = 1;
+
+            node = ngx_slab_alloc_locked(ctx->shpool, n);
+            if (node != NULL) {
+                goto allocated;
+            }
+        }
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        lua_pushboolean(L, 0);
+        lua_pushliteral(L, "no memory");
+        lua_pushboolean(L, forcible);
+        return 3;
+    }
+
+allocated:
+
+    sd = (ngx_http_lua_shdict_node_t *) &node->color;
+
+    node->key = hash;
+
+    sd->key_len = (u_short) key.len;
+
+    sd->value_len = (uint32_t) sizeof(double);
+
+    ngx_rbtree_insert(&ctx->sh->rbtree, node);
+
+    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
+
+setvalue:
+
+    sd->user_flags = 0;
+
+    sd->expires = 0;
+
+    dd("setting value type to %d", LUA_TNUMBER);
+
+    sd->value_type = (uint8_t) LUA_TNUMBER;
+
+    p = ngx_copy(sd->data, key.data, key.len);
+    ngx_memcpy(p, (double *) &num, sizeof(double));
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+    lua_pushnumber(L, num);
+    lua_pushnil(L);
+    lua_pushboolean(L, forcible);
+    return 3;
 }
 
 
@@ -1316,7 +1563,8 @@ ngx_http_lua_shared_dict_get(ngx_shm_zone_t *zone, u_char *key_data,
     len = (size_t) sd->value_len;
 
     switch (value->type) {
-    case LUA_TSTRING:
+
+    case SHDICT_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 "
@@ -1335,7 +1583,7 @@ ngx_http_lua_shared_dict_get(ngx_shm_zone_t *zone, u_char *key_data,
         ngx_memcpy(value->value.s.data, data, len);
         break;
 
-    case LUA_TNUMBER:
+    case SHDICT_TNUMBER:
 
         if (len != sizeof(double)) {
             ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "bad lua number "
@@ -1349,7 +1597,7 @@ ngx_http_lua_shared_dict_get(ngx_shm_zone_t *zone, u_char *key_data,
         ngx_memcpy(&value->value.b, data, len);
         break;
 
-    case LUA_TBOOLEAN:
+    case SHDICT_TBOOLEAN:
 
         if (len != sizeof(u_char)) {
             ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "bad lua boolean "
@@ -1377,6 +1625,574 @@ ngx_http_lua_shared_dict_get(ngx_shm_zone_t *zone, u_char *key_data,
 }
 
 
+static int
+ngx_http_lua_shdict_lpush(lua_State *L)
+{
+    return ngx_http_lua_shdict_push_helper(L, NGX_HTTP_LUA_SHDICT_LEFT);
+}
+
+
+static int
+ngx_http_lua_shdict_rpush(lua_State *L)
+{
+    return ngx_http_lua_shdict_push_helper(L, NGX_HTTP_LUA_SHDICT_RIGHT);
+}
+
+
+static int
+ngx_http_lua_shdict_push_helper(lua_State *L, int flags)
+{
+    int                              n;
+    ngx_str_t                        key;
+    uint32_t                         hash;
+    ngx_int_t                        rc;
+    ngx_http_lua_shdict_ctx_t       *ctx;
+    ngx_http_lua_shdict_node_t      *sd;
+    ngx_str_t                        value;
+    int                              value_type;
+    double                           num;
+    ngx_rbtree_node_t               *node;
+    ngx_shm_zone_t                  *zone;
+    ngx_queue_t                     *queue, *q;
+    ngx_http_lua_shdict_list_node_t *lnode;
+
+    n = lua_gettop(L);
+
+    if (n != 3) {
+        return luaL_error(L, "expecting 3 arguments, "
+                          "but only seen %d", n);
+    }
+
+    if (lua_type(L, 1) != LUA_TTABLE) {
+        return luaL_error(L, "bad \"zone\" argument");
+    }
+
+    zone = ngx_http_lua_shdict_get_zone(L, 1);
+    if (zone == NULL) {
+        return luaL_error(L, "bad \"zone\" argument");
+    }
+
+    ctx = zone->data;
+
+    if (lua_isnil(L, 2)) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "nil key");
+        return 2;
+    }
+
+    key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
+
+    if (key.len == 0) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "empty key");
+        return 2;
+    }
+
+    if (key.len > 65535) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "key too long");
+        return 2;
+    }
+
+    hash = ngx_crc32_short(key.data, key.len);
+
+    value_type = lua_type(L, 3);
+
+    switch (value_type) {
+
+    case SHDICT_TSTRING:
+        value.data = (u_char *) lua_tolstring(L, 3, &value.len);
+        break;
+
+    case SHDICT_TNUMBER:
+        value.len = sizeof(double);
+        num = lua_tonumber(L, 3);
+        value.data = (u_char *) &num;
+        break;
+
+    default:
+        lua_pushnil(L);
+        lua_pushliteral(L, "bad value type");
+        return 2;
+    }
+
+    ngx_shmtx_lock(&ctx->shpool->mutex);
+
+#if 1
+    ngx_http_lua_shdict_expire(ctx, 1);
+#endif
+
+    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len, &sd);
+
+    dd("shdict lookup returned %d", (int) rc);
+
+    /* exists but expired */
+
+    if (rc == NGX_DONE) {
+
+        if (sd->value_type != SHDICT_TLIST) {
+            /* TODO: reuse when length matched */
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                           "lua shared dict push: found old entry and value "
+                           "type not matched, remove it first");
+
+            ngx_queue_remove(&sd->queue);
+
+            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);
+
+            dd("go to init_list");
+            goto init_list;
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                       "lua shared dict push: found old entry and value "
+                       "type matched, reusing it");
+
+        sd->expires = 0;
+
+        /* free list nodes */
+
+        queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
+
+        for (q = ngx_queue_head(queue);
+             q != ngx_queue_sentinel(queue);
+             q = ngx_queue_next(q))
+        {
+            /* TODO: reuse matched size list node */
+            lnode = ngx_queue_data(q, ngx_http_lua_shdict_list_node_t, queue);
+            ngx_slab_free_locked(ctx->shpool, lnode);
+        }
+
+        ngx_queue_init(queue);
+
+        ngx_queue_remove(&sd->queue);
+        ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
+
+        dd("go to push_node");
+        goto push_node;
+    }
+
+    /* exists and not expired */
+
+    if (rc == NGX_OK) {
+
+        if (sd->value_type != SHDICT_TLIST) {
+            ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+            lua_pushnil(L);
+            lua_pushliteral(L, "value not a list");
+            return 2;
+        }
+
+        queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
+
+        ngx_queue_remove(&sd->queue);
+        ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
+
+        dd("go to push_node");
+        goto push_node;
+    }
+
+    /* rc == NGX_DECLINED, not found */
+
+init_list:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                   "lua shared dict list: creating a new entry");
+
+    /* NOTICE: we assume the begin point aligned in slab, be careful */
+    n = offsetof(ngx_rbtree_node_t, color)
+        + offsetof(ngx_http_lua_shdict_node_t, data)
+        + key.len
+        + sizeof(ngx_queue_t);
+
+    dd("length before aligned: %d", n);
+
+    n = (int) (uintptr_t) ngx_align_ptr(n, NGX_ALIGNMENT);
+
+    dd("length after aligned: %d", n);
+
+    node = ngx_slab_alloc_locked(ctx->shpool, n);
+
+    if (node == NULL) {
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        lua_pushboolean(L, 0);
+        lua_pushliteral(L, "no memory");
+        return 2;
+    }
+
+    sd = (ngx_http_lua_shdict_node_t *) &node->color;
+
+    queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
+
+    node->key = hash;
+    sd->key_len = (u_short) key.len;
+
+    sd->expires = 0;
+
+    sd->value_len = 0;
+
+    dd("setting value type to %d", (int) SHDICT_TLIST);
+
+    sd->value_type = (uint8_t) SHDICT_TLIST;
+
+    ngx_memcpy(sd->data, key.data, key.len);
+
+    ngx_queue_init(queue);
+
+    ngx_rbtree_insert(&ctx->sh->rbtree, node);
+
+    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
+
+push_node:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                   "lua shared dict list: creating a new list node");
+
+    n = offsetof(ngx_http_lua_shdict_list_node_t, data)
+        + value.len;
+
+    dd("list node length: %d", n);
+
+    lnode = ngx_slab_alloc_locked(ctx->shpool, n);
+
+    if (lnode == NULL) {
+
+        if (sd->value_len == 0) {
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                           "lua shared dict list: no memory for create"
+                           " list node and list empty, remove it");
+
+            ngx_queue_remove(&sd->queue);
+
+            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);
+        }
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        lua_pushboolean(L, 0);
+        lua_pushliteral(L, "no memory");
+        return 2;
+    }
+
+    dd("setting list length to %d", sd->value_len + 1);
+
+    sd->value_len = sd->value_len + 1;
+
+    dd("setting list node value length to %d", (int) value.len);
+
+    lnode->value_len = (uint32_t) value.len;
+
+    dd("setting list node value type to %d", value_type);
+
+    lnode->value_type = (uint8_t) value_type;
+
+    ngx_memcpy(lnode->data, value.data, value.len);
+
+    if (flags == NGX_HTTP_LUA_SHDICT_LEFT) {
+        ngx_queue_insert_head(queue, &lnode->queue);
+
+    } else {
+        ngx_queue_insert_tail(queue, &lnode->queue);
+    }
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+    lua_pushnumber(L, sd->value_len);
+    return 1;
+}
+
+
+static int
+ngx_http_lua_shdict_lpop(lua_State *L)
+{
+    return ngx_http_lua_shdict_pop_helper(L, NGX_HTTP_LUA_SHDICT_LEFT);
+}
+
+
+static int
+ngx_http_lua_shdict_rpop(lua_State *L)
+{
+    return ngx_http_lua_shdict_pop_helper(L, NGX_HTTP_LUA_SHDICT_RIGHT);
+}
+
+
+static int
+ngx_http_lua_shdict_pop_helper(lua_State *L, int flags)
+{
+    int                              n;
+    ngx_str_t                        name;
+    ngx_str_t                        key;
+    uint32_t                         hash;
+    ngx_int_t                        rc;
+    ngx_http_lua_shdict_ctx_t       *ctx;
+    ngx_http_lua_shdict_node_t      *sd;
+    ngx_str_t                        value;
+    int                              value_type;
+    double                           num;
+    ngx_rbtree_node_t               *node;
+    ngx_shm_zone_t                  *zone;
+    ngx_queue_t                     *queue;
+    ngx_http_lua_shdict_list_node_t *lnode;
+
+    n = lua_gettop(L);
+
+    if (n != 2) {
+        return luaL_error(L, "expecting 2 arguments, "
+                          "but only seen %d", n);
+    }
+
+    if (lua_type(L, 1) != LUA_TTABLE) {
+        return luaL_error(L, "bad \"zone\" argument");
+    }
+
+    zone = ngx_http_lua_shdict_get_zone(L, 1);
+    if (zone == NULL) {
+        return luaL_error(L, "bad \"zone\" argument");
+    }
+
+    ctx = zone->data;
+    name = ctx->name;
+
+    if (lua_isnil(L, 2)) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "nil key");
+        return 2;
+    }
+
+    key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
+
+    if (key.len == 0) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "empty key");
+        return 2;
+    }
+
+    if (key.len > 65535) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "key too long");
+        return 2;
+    }
+
+    hash = ngx_crc32_short(key.data, key.len);
+
+    ngx_shmtx_lock(&ctx->shpool->mutex);
+
+#if 1
+    ngx_http_lua_shdict_expire(ctx, 1);
+#endif
+
+    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);
+        lua_pushnil(L);
+        return 1;
+    }
+
+    /* rc == NGX_OK */
+
+    if (sd->value_type != SHDICT_TLIST) {
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        lua_pushnil(L);
+        lua_pushliteral(L, "value not a list");
+        return 2;
+    }
+
+    if (sd->value_len <= 0) {
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        return luaL_error(L, "bad lua list length found for key %s "
+                          "in shared_dict %s: %lu", key.data, name.data,
+                          (unsigned long) sd->value_len);
+    }
+
+    queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
+
+    if (flags == NGX_HTTP_LUA_SHDICT_LEFT) {
+        queue = ngx_queue_head(queue);
+
+    } else {
+        queue = ngx_queue_last(queue);
+    }
+
+    lnode = ngx_queue_data(queue, ngx_http_lua_shdict_list_node_t, queue);
+
+    value_type = lnode->value_type;
+
+    dd("data: %p", lnode->data);
+    dd("value len: %d", (int) sd->value_len);
+
+    value.data = lnode->data;
+    value.len = (size_t) lnode->value_len;
+
+    switch (value_type) {
+
+    case SHDICT_TSTRING:
+
+        lua_pushlstring(L, (char *) value.data, value.len);
+        break;
+
+    case SHDICT_TNUMBER:
+
+        if (value.len != sizeof(double)) {
+
+            ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+            return luaL_error(L, "bad lua list node number value size found "
+                              "for key %s in shared_dict %s: %lu", key.data,
+                              name.data, (unsigned long) value.len);
+        }
+
+        ngx_memcpy(&num, value.data, sizeof(double));
+
+        lua_pushnumber(L, num);
+        break;
+
+    default:
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        return luaL_error(L, "bad list node value type found for key %s in "
+                          "shared_dict %s: %d", key.data, name.data,
+                          value_type);
+    }
+
+    ngx_queue_remove(queue);
+
+    ngx_slab_free_locked(ctx->shpool, lnode);
+
+    if (sd->value_len == 1) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                       "lua shared dict list: empty node after pop, "
+                       "remove it");
+
+        ngx_queue_remove(&sd->queue);
+
+        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);
+
+    } else {
+        sd->value_len = sd->value_len - 1;
+
+        ngx_queue_remove(&sd->queue);
+        ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
+    }
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+    return 1;
+}
+
+
+static int
+ngx_http_lua_shdict_llen(lua_State *L)
+{
+    int                          n;
+    ngx_str_t                    key;
+    uint32_t                     hash;
+    ngx_int_t                    rc;
+    ngx_http_lua_shdict_ctx_t   *ctx;
+    ngx_http_lua_shdict_node_t  *sd;
+    ngx_shm_zone_t              *zone;
+
+    n = lua_gettop(L);
+
+    if (n != 2) {
+        return luaL_error(L, "expecting 2 arguments, "
+                          "but only seen %d", n);
+    }
+
+    if (lua_type(L, 1) != LUA_TTABLE) {
+        return luaL_error(L, "bad \"zone\" argument");
+    }
+
+    zone = ngx_http_lua_shdict_get_zone(L, 1);
+    if (zone == NULL) {
+        return luaL_error(L, "bad \"zone\" argument");
+    }
+
+    ctx = zone->data;
+
+    if (lua_isnil(L, 2)) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "nil key");
+        return 2;
+    }
+
+    key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
+
+    if (key.len == 0) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "empty key");
+        return 2;
+    }
+
+    if (key.len > 65535) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "key too long");
+        return 2;
+    }
+
+    hash = ngx_crc32_short(key.data, key.len);
+
+    ngx_shmtx_lock(&ctx->shpool->mutex);
+
+#if 1
+    ngx_http_lua_shdict_expire(ctx, 1);
+#endif
+
+    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len, &sd);
+
+    dd("shdict lookup returned %d", (int) rc);
+
+    if (rc == NGX_OK) {
+
+        if (sd->value_type != SHDICT_TLIST) {
+            ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+            lua_pushnil(L);
+            lua_pushliteral(L, "value not a list");
+            return 2;
+        }
+
+        ngx_queue_remove(&sd->queue);
+        ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        lua_pushnumber(L, (lua_Number) sd->value_len);
+        return 1;
+    }
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+    lua_pushnumber(L, 0);
+    return 1;
+}
+
+
 ngx_shm_zone_t *
 ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
 {
@@ -1428,6 +2244,7 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     uint32_t                     hash;
     ngx_int_t                    rc;
     ngx_time_t                  *tp;
+    ngx_queue_t                 *queue, *q;
     ngx_rbtree_node_t           *node;
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
@@ -1445,17 +2262,18 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     hash = ngx_crc32_short(key, key_len);
 
     switch (value_type) {
-    case LUA_TSTRING:
+
+    case SHDICT_TSTRING:
         /* do nothing */
         break;
 
-    case LUA_TNUMBER:
+    case SHDICT_TNUMBER:
         dd("num value: %lf", num_value);
         str_value_buf = (u_char *) &num_value;
         str_value_len = sizeof(double);
         break;
 
-    case LUA_TBOOLEAN:
+    case SHDICT_TBOOLEAN:
         c = num_value ? 1 : 0;
         str_value_buf = &c;
         str_value_len = sizeof(u_char);
@@ -1493,6 +2311,7 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
             *errmsg = "not found";
             return NGX_DECLINED;
         }
+
         /* rc == NGX_OK */
 
         goto replace;
@@ -1527,14 +2346,17 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
 
 replace:
 
-        if (str_value_buf && str_value_len == (size_t) sd->value_len) {
+        if (str_value_buf
+            && str_value_len == (size_t) sd->value_len
+            && sd->value_type != SHDICT_TLIST)
+        {
 
             ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
                            "lua shared dict set: found old entry and value "
                            "size matched, reusing it");
 
             ngx_queue_remove(&sd->queue);
-            ngx_queue_insert_head(&ctx->sh->queue, &sd->queue);
+            ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
 
             sd->key_len = (u_short) key_len;
 
@@ -1569,6 +2391,21 @@ replace:
 
 remove:
 
+        if (sd->value_type == SHDICT_TLIST) {
+            queue = ngx_http_lua_shdict_get_list_head(sd, key_len);
+
+            for (q = ngx_queue_head(queue);
+                 q != ngx_queue_sentinel(queue);
+                 q = ngx_queue_next(q))
+            {
+                p = (u_char *) ngx_queue_data(q,
+                                              ngx_http_lua_shdict_list_node_t,
+                                              queue);
+
+                ngx_slab_free_locked(ctx->shpool, p);
+            }
+        }
+
         ngx_queue_remove(&sd->queue);
 
         node = (ngx_rbtree_node_t *)
@@ -1657,7 +2494,7 @@ allocated:
     ngx_memcpy(p, str_value_buf, str_value_len);
 
     ngx_rbtree_insert(&ctx->sh->rbtree, node);
-    ngx_queue_insert_head(&ctx->sh->queue, &sd->queue);
+    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
     ngx_shmtx_unlock(&ctx->shpool->mutex);
 
     return NGX_OK;
@@ -1668,7 +2505,7 @@ int
 ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
     size_t key_len, int *value_type, u_char **str_value_buf,
     size_t *str_value_len, double *num_value, int *user_flags,
-    int get_stale, int *is_stale)
+    int get_stale, int *is_stale, char **err)
 {
     ngx_str_t                    name;
     uint32_t                     hash;
@@ -1681,6 +2518,8 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
         return NGX_ERROR;
     }
 
+    *err = NULL;
+
     ctx = zone->data;
     name = ctx->name;
 
@@ -1721,12 +2560,12 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
     value.len = (size_t) sd->value_len;
 
     if (*str_value_len < (size_t) value.len) {
-        if (*value_type == LUA_TBOOLEAN) {
+        if (*value_type == SHDICT_TBOOLEAN) {
             ngx_shmtx_unlock(&ctx->shpool->mutex);
             return NGX_ERROR;
         }
 
-        if (*value_type == LUA_TSTRING) {
+        if (*value_type == SHDICT_TSTRING) {
             *str_value_buf = malloc(value.len);
             if (*str_value_buf == NULL) {
                 ngx_shmtx_unlock(&ctx->shpool->mutex);
@@ -1736,12 +2575,13 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
     }
 
     switch (*value_type) {
-    case LUA_TSTRING:
+
+    case SHDICT_TSTRING:
         *str_value_len = value.len;
         ngx_memcpy(*str_value_buf, value.data, value.len);
         break;
 
-    case LUA_TNUMBER:
+    case SHDICT_TNUMBER:
 
         if (value.len != sizeof(double)) {
             ngx_shmtx_unlock(&ctx->shpool->mutex);
@@ -1756,7 +2596,7 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
         ngx_memcpy(num_value, value.data, sizeof(double));
         break;
 
-    case LUA_TBOOLEAN:
+    case SHDICT_TBOOLEAN:
 
         if (value.len != sizeof(u_char)) {
             ngx_shmtx_unlock(&ctx->shpool->mutex);
@@ -1770,6 +2610,13 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
         ngx_memcpy(*str_value_buf, value.data, value.len);
         break;
 
+    case SHDICT_TLIST:
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        *err = "value is a list";
+        return NGX_ERROR;
+
     default:
 
         ngx_shmtx_unlock(&ctx->shpool->mutex);
@@ -1799,16 +2646,27 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
 
 int
 ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
-    size_t key_len, double *value, char **err)
+    size_t key_len, double *value, char **err, int has_init, double init,
+    int *forcible)
 {
+    int                          i, n;
     uint32_t                     hash;
     ngx_int_t                    rc;
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
     double                       num;
+    ngx_rbtree_node_t           *node;
     u_char                      *p;
+    ngx_queue_t                 *queue, *q;
+
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
 
     ctx = zone->data;
+
+    *forcible = 0;
+
     hash = ngx_crc32_short(key, key_len);
 
     dd("looking up key %.*s in shared dict %.*s", (int) key_len, key,
@@ -1823,21 +2681,51 @@ ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
     dd("shdict lookup returned %d", (int) rc);
 
     if (rc == NGX_DECLINED || rc == NGX_DONE) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-        *err = "not found";
-        return NGX_ERROR;
+        if (!has_init) {
+            ngx_shmtx_unlock(&ctx->shpool->mutex);
+            *err = "not found";
+            return NGX_ERROR;
+        }
+
+        /* add value */
+        num = *value + init;
+
+        if (rc == NGX_DONE) {
+
+            /* found an expired item */
+
+            if ((size_t) sd->value_len == sizeof(double)
+                && sd->value_type != SHDICT_TLIST)
+            {
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                               "lua shared dict incr: found old entry and "
+                               "value size matched, reusing it");
+
+                ngx_queue_remove(&sd->queue);
+                ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
+
+                dd("go to setvalue");
+                goto setvalue;
+            }
+
+            dd("go to remove");
+            goto remove;
+        }
+
+        dd("go to insert");
+        goto insert;
     }
 
     /* rc == NGX_OK */
 
-    if (sd->value_type != LUA_TNUMBER || sd->value_len != sizeof(double)) {
+    if (sd->value_type != SHDICT_TNUMBER || sd->value_len != sizeof(double)) {
         ngx_shmtx_unlock(&ctx->shpool->mutex);
         *err = "not a number";
         return NGX_ERROR;
     }
 
     ngx_queue_remove(&sd->queue);
-    ngx_queue_insert_head(&ctx->sh->queue, &sd->queue);
+    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
 
     dd("setting value type to %d", (int) sd->value_type);
 
@@ -1850,6 +2738,105 @@ ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
 
     ngx_shmtx_unlock(&ctx->shpool->mutex);
 
+    *value = num;
+    return NGX_OK;
+
+remove:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                   "lua shared dict incr: found old entry but value size "
+                   "NOT matched, removing it first");
+
+    if (sd->value_type == SHDICT_TLIST) {
+        queue = ngx_http_lua_shdict_get_list_head(sd, key_len);
+
+        for (q = ngx_queue_head(queue);
+             q != ngx_queue_sentinel(queue);
+             q = ngx_queue_next(q))
+        {
+            p = (u_char *) ngx_queue_data(q, ngx_http_lua_shdict_list_node_t,
+                                          queue);
+
+            ngx_slab_free_locked(ctx->shpool, p);
+        }
+    }
+
+    ngx_queue_remove(&sd->queue);
+
+    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);
+
+insert:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                   "lua shared dict incr: creating a new entry");
+
+    n = offsetof(ngx_rbtree_node_t, color)
+        + offsetof(ngx_http_lua_shdict_node_t, data)
+        + key_len
+        + sizeof(double);
+
+    node = ngx_slab_alloc_locked(ctx->shpool, n);
+
+    if (node == NULL) {
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                       "lua shared dict incr: overriding non-expired items "
+                       "due to memory shortage for entry \"%*s\"", key_len,
+                       key);
+
+        for (i = 0; i < 30; i++) {
+            if (ngx_http_lua_shdict_expire(ctx, 0) == 0) {
+                break;
+            }
+
+            *forcible = 1;
+
+            node = ngx_slab_alloc_locked(ctx->shpool, n);
+            if (node != NULL) {
+                goto allocated;
+            }
+        }
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        *err = "no memory";
+        return NGX_ERROR;
+    }
+
+allocated:
+
+    sd = (ngx_http_lua_shdict_node_t *) &node->color;
+
+    node->key = hash;
+
+    sd->key_len = (u_short) key_len;
+
+    sd->value_len = (uint32_t) sizeof(double);
+
+    ngx_rbtree_insert(&ctx->sh->rbtree, node);
+
+    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
+
+setvalue:
+
+    sd->user_flags = 0;
+
+    sd->expires = 0;
+
+    dd("setting value type to %d", LUA_TNUMBER);
+
+    sd->value_type = (uint8_t) LUA_TNUMBER;
+
+    p = ngx_copy(sd->data, key, key_len);
+    ngx_memcpy(p, (double *) &num, sizeof(double));
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
     *value = num;
     return NGX_OK;
 }
@@ -1866,8 +2853,8 @@ ngx_http_lua_ffi_shdict_flush_all(ngx_shm_zone_t *zone)
 
     ngx_shmtx_lock(&ctx->shpool->mutex);
 
-    for (q = ngx_queue_head(&ctx->sh->queue);
-         q != ngx_queue_sentinel(&ctx->sh->queue);
+    for (q = ngx_queue_head(&ctx->sh->lru_queue);
+         q != ngx_queue_sentinel(&ctx->sh->lru_queue);
          q = ngx_queue_next(q))
     {
         sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
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 aa1bb58..5c4ff36 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
@@ -24,10 +24,18 @@ typedef struct {
 } ngx_http_lua_shdict_node_t;
 
 
+typedef struct {
+    ngx_queue_t                  queue;
+    uint32_t                     value_len;
+    uint8_t                      value_type;
+    u_char                       data[1];
+} ngx_http_lua_shdict_list_node_t;
+
+
 typedef struct {
     ngx_rbtree_t                  rbtree;
     ngx_rbtree_node_t             sentinel;
-    ngx_queue_t                   queue;
+    ngx_queue_t                   lru_queue;
 } ngx_http_lua_shdict_shctx_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
index a887c3a..4c0d016 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
@@ -56,7 +56,8 @@ ngx_http_lua_ngx_sleep(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_ACCESS
                                | NGX_HTTP_LUA_CONTEXT_CONTENT
                                | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     coctx = ctx->cur_co_ctx;
     if (coctx == NULL) {
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
index 2bfdbd3..fe6001f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
@@ -386,7 +386,8 @@ ngx_http_lua_socket_tcp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_ACCESS
                                | NGX_HTTP_LUA_CONTEXT_CONTENT
                                | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     lua_createtable(L, 3 /* narr */, 1 /* nrec */);
     lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
@@ -444,7 +445,8 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_ACCESS
                                | NGX_HTTP_LUA_CONTEXT_CONTENT
                                | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
+                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     luaL_checktype(L, 1, LUA_TTABLE);
 
@@ -4486,7 +4488,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     if (spool == NULL) {
         /* create a new socket pool for the current peer key */
 
-        if (n == 3) {
+        if (n >= 3 && !lua_isnil(L, 3)) {
             pool_size = luaL_checkinteger(L, 3);
 
         } else {
@@ -4589,7 +4591,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         ngx_del_timer(c->write);
     }
 
-    if (n >= 2) {
+    if (n >= 2 && !lua_isnil(L, 2)) {
         timeout = (ngx_msec_t) luaL_checkinteger(L, 2);
 
     } else {
@@ -4902,7 +4904,7 @@ ngx_http_lua_socket_downstream_destroy(lua_State *L)
 {
     ngx_http_lua_socket_tcp_upstream_t     *u;
 
-    dd("downstream destory");
+    dd("downstream destroy");
 
     u = lua_touserdata(L, 1);
     if (u == NULL) {
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl.c
new file mode 100644
index 0000000..8ed7b95
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl.c
@@ -0,0 +1,37 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#if (NGX_HTTP_SSL)
+
+
+int ngx_http_lua_ssl_ctx_index = -1;
+
+
+ngx_int_t
+ngx_http_lua_ssl_init(ngx_log_t *log)
+{
+    if (ngx_http_lua_ssl_ctx_index == -1) {
+        ngx_http_lua_ssl_ctx_index = SSL_get_ex_new_index(0, NULL, NULL,
+                                                          NULL, NULL);
+
+        if (ngx_http_lua_ssl_ctx_index == -1) {
+            ngx_ssl_error(NGX_LOG_ALERT, log, 0,
+                          "lua: SSL_get_ex_new_index() for ctx failed");
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+#endif /* NGX_HTTP_SSL */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl.h b/debian/modules/nginx-lua/src/ngx_http_lua_ssl.h
new file mode 100644
index 0000000..7a245ff
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl.h
@@ -0,0 +1,43 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_LUA_SSL_H_INCLUDED_
+#define _NGX_HTTP_LUA_SSL_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+#if (NGX_HTTP_SSL)
+typedef struct {
+    ngx_connection_t        *connection; /* original true connection */
+    ngx_http_request_t      *request;    /* fake request */
+    ngx_pool_cleanup_pt     *cleanup;
+
+    ngx_ssl_session_t       *session;    /* retrurn value for openssl's
+                                          * session_get_cb */
+
+    ngx_str_t                session_id;
+
+    int                      exit_code;  /* exit code for openssl's
+                                            set_cert_cb callback */
+
+    unsigned                 done:1;
+    unsigned                 aborted:1;
+
+    unsigned                 entered_cert_handler:1;
+    unsigned                 entered_sess_fetch_handler:1;
+} ngx_http_lua_ssl_ctx_t;
+#endif
+
+
+ngx_int_t ngx_http_lua_ssl_init(ngx_log_t *log);
+
+
+extern int ngx_http_lua_ssl_ctx_index;
+
+
+#endif  /* _NGX_HTTP_LUA_SSL_H_INCLUDED_ */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
index c06bc8e..aca4735 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
@@ -20,6 +20,7 @@
 #include "ngx_http_lua_contentby.h"
 #include "ngx_http_lua_ssl_certby.h"
 #include "ngx_http_lua_directive.h"
+#include "ngx_http_lua_ssl.h"
 
 
 enum {
@@ -37,9 +38,6 @@ static ngx_int_t ngx_http_lua_ssl_cert_by_chunk(lua_State *L,
     ngx_http_request_t *r);
 
 
-int  ngx_http_lua_ssl_ctx_index = -1;
-
-
 ngx_int_t
 ngx_http_lua_ssl_cert_handler_file(ngx_http_request_t *r,
     ngx_http_lua_srv_conf_t *lscf, lua_State *L)
@@ -47,8 +45,8 @@ ngx_http_lua_ssl_cert_handler_file(ngx_http_request_t *r,
     ngx_int_t           rc;
 
     rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
-                                     lscf->ssl.cert_src.data,
-                                     lscf->ssl.cert_src_key);
+                                     lscf->srv.ssl_cert_src.data,
+                                     lscf->srv.ssl_cert_src_key);
     if (rc != NGX_OK) {
         return rc;
     }
@@ -67,9 +65,9 @@ ngx_http_lua_ssl_cert_handler_inline(ngx_http_request_t *r,
     ngx_int_t           rc;
 
     rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       lscf->ssl.cert_src.data,
-                                       lscf->ssl.cert_src.len,
-                                       lscf->ssl.cert_src_key,
+                                       lscf->srv.ssl_cert_src.data,
+                                       lscf->srv.ssl_cert_src.len,
+                                       lscf->srv.ssl_cert_src_key,
                                        "=ssl_certificate_by_lua");
     if (rc != NGX_OK) {
         return rc;
@@ -120,29 +118,22 @@ ngx_http_lua_ssl_cert_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
     ngx_str_t                   *value;
     ngx_http_lua_srv_conf_t    *lscf = conf;
 
-    /*  must specifiy a concrete handler */
+    /*  must specify a concrete handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
 
-    if (lscf->ssl.cert_handler) {
+    if (lscf->srv.ssl_cert_handler) {
         return "is duplicate";
     }
 
-    if (ngx_http_lua_ssl_ctx_index == -1) {
-        ngx_http_lua_ssl_ctx_index = SSL_get_ex_new_index(0, NULL, NULL,
-                                                          NULL, NULL);
-
-        if (ngx_ssl_connection_index == -1) {
-            ngx_ssl_error(NGX_LOG_ALERT, cf->log, 0,
-                          "lua: SSL_get_ex_new_index() failed");
-            return NGX_CONF_ERROR;
-        }
+    if (ngx_http_lua_ssl_init(cf->log) != NGX_OK) {
+        return NGX_CONF_ERROR;
     }
 
     value = cf->args->elts;
 
-    lscf->ssl.cert_handler = (ngx_http_lua_srv_conf_handler_pt) cmd->post;
+    lscf->srv.ssl_cert_handler = (ngx_http_lua_srv_conf_handler_pt) cmd->post;
 
     if (cmd->post == ngx_http_lua_ssl_cert_handler_file) {
         /* Lua code in an external file */
@@ -153,15 +144,15 @@ ngx_http_lua_ssl_cert_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
             return NGX_CONF_ERROR;
         }
 
-        lscf->ssl.cert_src.data = name;
-        lscf->ssl.cert_src.len = ngx_strlen(name);
+        lscf->srv.ssl_cert_src.data = name;
+        lscf->srv.ssl_cert_src.len = ngx_strlen(name);
 
         p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
-        lscf->ssl.cert_src_key = p;
+        lscf->srv.ssl_cert_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);
@@ -170,14 +161,14 @@ ngx_http_lua_ssl_cert_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
     } else {
         /* inlined Lua code */
 
-        lscf->ssl.cert_src = value[1];
+        lscf->srv.ssl_cert_src = value[1];
 
         p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
-        lscf->ssl.cert_src_key = p;
+        lscf->srv.ssl_cert_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);
@@ -200,7 +191,8 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
     ngx_pool_cleanup_t              *cln;
     ngx_http_connection_t           *hc;
     ngx_http_lua_srv_conf_t         *lscf;
-    ngx_http_lua_ssl_cert_ctx_t     *cctx;
+    ngx_http_core_loc_conf_t        *clcf;
+    ngx_http_lua_ssl_ctx_t          *cctx;
 
     c = ngx_ssl_get_connection(ssl_conn);
 
@@ -210,7 +202,7 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
 
     dd("ssl cert handler, cert-ctx=%p", cctx);
 
-    if (cctx) {
+    if (cctx && cctx->entered_cert_handler) {
         /* not the first time */
 
         if (cctx->done) {
@@ -225,8 +217,6 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
         return -1;
     }
 
-    /* cctx == NULL */
-
     dd("first time");
 
     hc = c->data;
@@ -255,14 +245,42 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
     fc->log->log_level = c->log->log_level;
     fc->ssl = c->ssl;
 
-    cctx = ngx_pcalloc(c->pool, sizeof(ngx_http_lua_ssl_cert_ctx_t));
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+#if defined(nginx_version) && nginx_version >= 1003014
+
+#   if nginx_version >= 1009000
+
+    ngx_set_connection_log(fc, clcf->error_log);
+
+#   else
+
+    ngx_http_set_connection_log(fc, clcf->error_log);
+
+#   endif
+
+#else
+
+    fc->log->file = clcf->error_log->file;
+
+    if (!(fc->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
+        fc->log->log_level = clcf->error_log->log_level;
+    }
+
+#endif
+
     if (cctx == NULL) {
-        goto failed;  /* error */
+        cctx = ngx_pcalloc(c->pool, sizeof(ngx_http_lua_ssl_ctx_t));
+        if (cctx == NULL) {
+            goto failed;  /* error */
+        }
     }
 
     cctx->exit_code = 1;  /* successful by default */
     cctx->connection = c;
     cctx->request = r;
+    cctx->entered_cert_handler = 1;
+    cctx->done = 0;
 
     dd("setting cctx");
 
@@ -280,11 +298,15 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
 
     c->log->action = "loading SSL certificate by lua";
 
-    rc = lscf->ssl.cert_handler(r, lscf, L);
+    rc = lscf->srv.ssl_cert_handler(r, lscf, L);
 
     if (rc >= NGX_OK || rc == NGX_ERROR) {
         cctx->done = 1;
 
+        if (cctx->cleanup) {
+            *cctx->cleanup = NULL;
+        }
+
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                        "lua_certificate_by_lua: handler return value: %i, "
                        "cert cb exit code: %d", rc, cctx->exit_code);
@@ -303,13 +325,17 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
     cln->handler = ngx_http_lua_ssl_cert_done;
     cln->data = cctx;
 
-    cln = ngx_pool_cleanup_add(c->pool, 0);
-    if (cln == NULL) {
-        goto failed;
+    if (cctx->cleanup == NULL) {
+        cln = ngx_pool_cleanup_add(c->pool, 0);
+        if (cln == NULL) {
+            goto failed;
+        }
+
+        cln->data = cctx;
+        cctx->cleanup = &cln->handler;
     }
 
-    cln->handler = ngx_http_lua_ssl_cert_aborted;
-    cln->data = cctx;
+    *cctx->cleanup = ngx_http_lua_ssl_cert_aborted;
 
     return -1;
 
@@ -333,7 +359,7 @@ static void
 ngx_http_lua_ssl_cert_done(void *data)
 {
     ngx_connection_t                *c;
-    ngx_http_lua_ssl_cert_ctx_t     *cctx = data;
+    ngx_http_lua_ssl_ctx_t          *cctx = data;
 
     dd("lua ssl cert done");
 
@@ -345,6 +371,10 @@ ngx_http_lua_ssl_cert_done(void *data)
 
     cctx->done = 1;
 
+    if (cctx->cleanup) {
+        *cctx->cleanup = NULL;
+    }
+
     c = cctx->connection;
 
     c->log->action = "SSL handshaking";
@@ -356,7 +386,7 @@ ngx_http_lua_ssl_cert_done(void *data)
 static void
 ngx_http_lua_ssl_cert_aborted(void *data)
 {
-    ngx_http_lua_ssl_cert_ctx_t     *cctx = data;
+    ngx_http_lua_ssl_ctx_t      *cctx = data;
 
     dd("lua ssl cert done");
 
@@ -931,7 +961,7 @@ ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
     pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, NULL);
     if (pkey == NULL) {
         BIO_free(in);
-        *err = "PEM_read_bio_PrivateKey failed";
+        *err = "PEM_read_bio_PrivateKey() failed";
         ERR_clear_error();
         return NGX_ERROR;
     }
@@ -941,7 +971,7 @@ ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
     len = i2d_PrivateKey(pkey, &der);
     if (len < 0) {
         EVP_PKEY_free(pkey);
-        *err = "i2d_PrivateKey failed";
+        *err = "i2d_PrivateKey() failed";
         ERR_clear_error();
         return NGX_ERROR;
     }
@@ -952,6 +982,256 @@ ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
 }
 
 
+void *
+ngx_http_lua_ffi_parse_pem_cert(const u_char *pem, size_t pem_len,
+    char **err)
+{
+    BIO             *bio;
+    X509            *x509;
+    u_long           n;
+    STACK_OF(X509)  *chain;
+
+    bio = BIO_new_mem_buf((char *) pem, (int) pem_len);
+    if (bio == NULL) {
+        *err = "BIO_new_mem_buf() failed";
+        ERR_clear_error();
+        return NULL;
+    }
+
+    x509 = PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL);
+    if (x509 == NULL) {
+        *err = "PEM_read_bio_X509_AUX() failed";
+        BIO_free(bio);
+        ERR_clear_error();
+        return NULL;
+    }
+
+    chain = sk_X509_new_null();
+    if (chain == NULL) {
+        *err = "sk_X509_new_null() failed";
+        X509_free(x509);
+        BIO_free(bio);
+        ERR_clear_error();
+        return NULL;
+    }
+
+    if (sk_X509_push(chain, x509) == 0) {
+        *err = "sk_X509_push() failed";
+        sk_X509_free(chain);
+        X509_free(x509);
+        BIO_free(bio);
+        ERR_clear_error();
+        return NULL;
+    }
+
+    /* read rest of the chain */
+
+    for ( ;; ) {
+
+        x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
+        if (x509 == NULL) {
+            n = ERR_peek_last_error();
+
+            if (ERR_GET_LIB(n) == ERR_LIB_PEM
+                && ERR_GET_REASON(n) == PEM_R_NO_START_LINE)
+            {
+                /* end of file */
+                ERR_clear_error();
+                break;
+            }
+
+            /* some real error */
+
+            *err = "PEM_read_bio_X509() failed";
+            sk_X509_pop_free(chain, X509_free);
+            BIO_free(bio);
+            ERR_clear_error();
+            return NULL;
+        }
+
+        if (sk_X509_push(chain, x509) == 0) {
+            *err = "sk_X509_push() failed";
+            sk_X509_pop_free(chain, X509_free);
+            X509_free(x509);
+            BIO_free(bio);
+            ERR_clear_error();
+            return NULL;
+        }
+    }
+
+    BIO_free(bio);
+
+    return chain;
+}
+
+
+void
+ngx_http_lua_ffi_free_cert(void *cdata)
+{
+    STACK_OF(X509)  *chain = cdata;
+
+    sk_X509_pop_free(chain, X509_free);
+}
+
+
+void *
+ngx_http_lua_ffi_parse_pem_priv_key(const u_char *pem, size_t pem_len,
+    char **err)
+{
+    BIO         *in;
+    EVP_PKEY    *pkey;
+
+    in = BIO_new_mem_buf((char *) pem, (int) pem_len);
+    if (in == NULL) {
+        *err = "BIO_new_mem_buf() failed";
+        ERR_clear_error();
+        return NULL;
+    }
+
+    pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, NULL);
+    if (pkey == NULL) {
+        *err = "PEM_read_bio_PrivateKey() failed";
+        BIO_free(in);
+        ERR_clear_error();
+        return NULL;
+    }
+
+    BIO_free(in);
+
+    return pkey;
+}
+
+
+void
+ngx_http_lua_ffi_free_priv_key(void *cdata)
+{
+    EVP_PKEY *pkey = cdata;
+
+    EVP_PKEY_free(pkey);
+}
+
+
+int
+ngx_http_lua_ffi_set_cert(ngx_http_request_t *r,
+    void *cdata, char **err)
+{
+#ifdef LIBRESSL_VERSION_NUMBER
+
+    *err = "LibreSSL not supported";
+    return NGX_ERROR;
+
+#else
+
+#   if OPENSSL_VERSION_NUMBER < 0x1000205fL
+
+    *err = "at least OpenSSL 1.0.2e required but found " OPENSSL_VERSION_TEXT;
+    return NGX_ERROR;
+
+#   else
+
+    int                i;
+    X509              *x509 = NULL;
+    ngx_ssl_conn_t    *ssl_conn;
+    STACK_OF(X509)    *chain = cdata;
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    if (sk_X509_num(chain) < 1) {
+        *err = "invalid certificate chain";
+        goto failed;
+    }
+
+    x509 = sk_X509_value(chain, 0);
+    if (x509 == NULL) {
+        *err = "sk_X509_value() failed";
+        goto failed;
+    }
+
+    if (SSL_use_certificate(ssl_conn, x509) == 0) {
+        *err = "SSL_use_certificate() failed";
+        goto failed;
+    }
+
+    x509 = NULL;
+
+    /* read rest of the chain */
+
+    for (i = 1; i < sk_X509_num(chain); i++) {
+
+        x509 = sk_X509_value(chain, i);
+        if (x509 == NULL) {
+            *err = "sk_X509_value() failed";
+            goto failed;
+        }
+
+        if (SSL_add1_chain_cert(ssl_conn, x509) == 0) {
+            *err = "SSL_add1_chain_cert() failed";
+            goto failed;
+        }
+    }
+
+    *err = NULL;
+    return NGX_OK;
+
+failed:
+
+    ERR_clear_error();
+
+    return NGX_ERROR;
+
+#   endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
+#endif
+}
+
+
+int
+ngx_http_lua_ffi_set_priv_key(ngx_http_request_t *r,
+    void *cdata, char **err)
+{
+    EVP_PKEY          *pkey = NULL;
+    ngx_ssl_conn_t    *ssl_conn;
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    pkey = cdata;
+    if (pkey == NULL) {
+        *err = "invalid private key failed";
+        goto failed;
+    }
+
+    if (SSL_use_PrivateKey(ssl_conn, pkey) == 0) {
+        *err = "SSL_use_PrivateKey() failed";
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ERR_clear_error();
+
+    return NGX_ERROR;
+}
+
+
 #endif  /* NGX_LUA_NO_FFI_API */
 
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h
index 11cb963..fb07e01 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h
@@ -14,16 +14,6 @@
 #if (NGX_HTTP_SSL)
 
 
-typedef struct {
-    ngx_connection_t        *connection; /* original true connection */
-    ngx_http_request_t      *request;    /* fake request */
-    int                      exit_code;  /* exit code for openssl's
-                                            set_cert_cb callback */
-    unsigned                 done;       /* :1 */
-    unsigned                 aborted;    /* :1 */
-} ngx_http_lua_ssl_cert_ctx_t;
-
-
 ngx_int_t ngx_http_lua_ssl_cert_handler_inline(ngx_http_request_t *r,
     ngx_http_lua_srv_conf_t *lscf, lua_State *L);
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
index 1bf4335..3904aa8 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
@@ -233,8 +233,6 @@ ngx_http_lua_ffi_ssl_create_ocsp_request(const char *chain_data,
     X509_free(cert);
     BIO_free(bio);
 
-    ERR_clear_error();
-
     return NGX_OK;
 
 failed:
@@ -255,6 +253,8 @@ failed:
         BIO_free(bio);
     }
 
+    ERR_clear_error();
+
     return rc;
 
 #endif  /* NGX_HTTP_LUA_USE_OCSP */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c
new file mode 100644
index 0000000..4c450b5
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c
@@ -0,0 +1,592 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#if (NGX_HTTP_SSL)
+
+
+#include "ngx_http_lua_cache.h"
+#include "ngx_http_lua_initworkerby.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_ssl_module.h"
+#include "ngx_http_lua_contentby.h"
+#include "ngx_http_lua_ssl_session_fetchby.h"
+#include "ngx_http_lua_ssl.h"
+#include "ngx_http_lua_directive.h"
+
+
+/* Lua SSL cached session loading routines */
+static void ngx_http_lua_ssl_sess_fetch_done(void *data);
+static void ngx_http_lua_ssl_sess_fetch_aborted(void *data);
+static u_char *ngx_http_lua_log_ssl_sess_fetch_error(ngx_log_t *log,
+    u_char *buf, size_t len);
+static ngx_int_t ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L,
+    ngx_http_request_t *r);
+
+
+/* load Lua code from a file for fetching cached SSL session */
+ngx_int_t
+ngx_http_lua_ssl_sess_fetch_handler_file(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
+{
+    ngx_int_t           rc;
+
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
+                                     lscf->srv.ssl_sess_fetch_src.data,
+                                     lscf->srv.ssl_sess_fetch_src_key);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    /*  make sure we have a valid code chunk */
+    ngx_http_lua_assert(lua_isfunction(L, -1));
+
+    return ngx_http_lua_ssl_sess_fetch_by_chunk(L, r);
+}
+
+
+/* load lua code from an inline snippet for fetching cached SSL session */
+ngx_int_t
+ngx_http_lua_ssl_sess_fetch_handler_inline(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
+{
+    ngx_int_t           rc;
+
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       lscf->srv.ssl_sess_fetch_src.data,
+                                       lscf->srv.ssl_sess_fetch_src.len,
+                                       lscf->srv.ssl_sess_fetch_src_key,
+                                       "=ssl_session_fetch_by_lua_block");
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    /*  make sure we have a valid code chunk */
+    ngx_http_lua_assert(lua_isfunction(L, -1));
+
+    return ngx_http_lua_ssl_sess_fetch_by_chunk(L, r);
+}
+
+
+char *
+ngx_http_lua_ssl_sess_fetch_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_ssl_sess_fetch_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
+/* conf parser for directive ssl_session_fetch_by_lua */
+char *
+ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    u_char                      *p;
+    u_char                      *name;
+    ngx_str_t                   *value;
+    ngx_http_lua_srv_conf_t     *lscf = conf;
+
+    dd("enter");
+
+    /*  must specifiy a content handler */
+    if (cmd->post == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (lscf->srv.ssl_sess_fetch_handler) {
+        return "is duplicate";
+    }
+
+    if (ngx_http_lua_ssl_init(cf->log) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    lscf->srv.ssl_sess_fetch_handler =
+        (ngx_http_lua_srv_conf_handler_pt) cmd->post;
+
+    if (cmd->post == ngx_http_lua_ssl_sess_fetch_handler_file) {
+        /* Lua code in an external file */
+
+        name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
+                                        value[1].len);
+        if (name == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->srv.ssl_sess_fetch_src.data = name;
+        lscf->srv.ssl_sess_fetch_src.len = ngx_strlen(name);
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->srv.ssl_sess_fetch_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';
+
+    } else {
+        /* inlined Lua code */
+
+        lscf->srv.ssl_sess_fetch_src = value[1];
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->srv.ssl_sess_fetch_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';
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+/* cached session fetching callback to be set with SSL_CTX_sess_set_get_cb */
+ngx_ssl_session_t *
+ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
+    int len, int *copy)
+{
+    lua_State                       *L;
+    ngx_int_t                        rc;
+    ngx_connection_t                *c, *fc = NULL;
+    ngx_http_request_t              *r = NULL;
+    ngx_pool_cleanup_t              *cln;
+    ngx_http_connection_t           *hc;
+    ngx_http_lua_ssl_ctx_t          *cctx;
+    ngx_http_lua_srv_conf_t         *lscf;
+    ngx_http_core_loc_conf_t        *clcf;
+
+    /* set copy to 0 as we expect OpenSSL to handle
+     * the memory of returned session */
+
+    *copy = 0;
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    dd("c = %p", c);
+
+    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
+
+    dd("ssl sess_fetch handler, sess_fetch-ctx=%p", cctx);
+
+    if (cctx && cctx->entered_sess_fetch_handler) {
+        /* not the first time */
+
+        dd("here: %d", (int) cctx->entered_sess_fetch_handler);
+
+        if (cctx->done) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "ssl_session_fetch_by_lua*: "
+                           "sess get cb exit code: %d",
+                           cctx->exit_code);
+
+            dd("lua ssl sess_fetch done, finally");
+            return cctx->session;
+        }
+
+#ifdef SSL_ERROR_PENDING_SESSION
+        return SSL_magic_pending_session_ptr();
+#else
+        ngx_log_error(NGX_LOG_CRIT, c->log, 0,
+                      "lua: cannot yield in sess get cb: "
+                      "missing async sess get cb support in OpenSSL");
+        return NULL;
+#endif
+    }
+
+    dd("first time");
+
+    hc = c->data;
+
+    fc = ngx_http_lua_create_fake_connection(NULL);
+    if (fc == NULL) {
+        goto failed;
+    }
+
+    fc->log->handler = ngx_http_lua_log_ssl_sess_fetch_error;
+    fc->log->data = fc;
+
+    fc->addr_text = c->addr_text;
+    fc->listening = c->listening;
+
+    r = ngx_http_lua_create_fake_request(fc);
+    if (r == NULL) {
+        goto failed;
+    }
+
+    r->main_conf = hc->conf_ctx->main_conf;
+    r->srv_conf = hc->conf_ctx->srv_conf;
+    r->loc_conf = hc->conf_ctx->loc_conf;
+
+    fc->log->file = c->log->file;
+    fc->log->log_level = c->log->log_level;
+    fc->ssl = c->ssl;
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+#if defined(nginx_version) && nginx_version >= 1003014
+
+#   if nginx_version >= 1009000
+
+    ngx_set_connection_log(fc, clcf->error_log);
+
+#   else
+
+    ngx_http_set_connection_log(fc, clcf->error_log);
+
+#   endif
+
+#else
+
+    fc->log->file = clcf->error_log->file;
+
+    if (!(fc->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
+        fc->log->log_level = clcf->error_log->log_level;
+    }
+
+#endif
+
+    if (cctx == NULL) {
+        cctx = ngx_pcalloc(c->pool, sizeof(ngx_http_lua_ssl_ctx_t));
+        if (cctx == NULL) {
+            goto failed;  /* error */
+        }
+    }
+
+    cctx->exit_code = 1;  /* successful by default */
+    cctx->connection = c;
+    cctx->request = r;
+    cctx->session_id.data = id;
+    cctx->session_id.len = len;
+    cctx->entered_sess_fetch_handler = 1;
+    cctx->done = 0;
+
+    dd("setting cctx = %p", cctx);
+
+    if (SSL_set_ex_data(c->ssl->connection, ngx_http_lua_ssl_ctx_index, cctx)
+        == 0)
+    {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "SSL_set_ex_data() failed");
+        goto failed;
+    }
+
+    lscf = ngx_http_get_module_srv_conf(r, ngx_http_lua_module);
+
+    /* TODO honor lua_code_cache off */
+    L = ngx_http_lua_get_lua_vm(r, NULL);
+
+    c->log->action = "fetching SSL session by lua";
+
+    rc = lscf->srv.ssl_sess_fetch_handler(r, lscf, L);
+
+    if (rc >= NGX_OK || rc == NGX_ERROR) {
+        cctx->done = 1;
+
+        if (cctx->cleanup) {
+            *cctx->cleanup = NULL;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "ssl_session_fetch_by_lua*: handler return value: %i, "
+                       "sess get cb exit code: %d", rc, cctx->exit_code);
+
+        c->log->action = "SSL handshaking";
+        return cctx->session;
+    }
+
+    /* rc == NGX_DONE */
+
+    cln = ngx_pool_cleanup_add(fc->pool, 0);
+    if (cln == NULL) {
+        goto failed;
+    }
+
+    cln->handler = ngx_http_lua_ssl_sess_fetch_done;
+    cln->data = cctx;
+
+    if (cctx->cleanup == NULL)  {
+        /* we only want exactly one cleanup handler to be registered with the
+         * connection to clean up cctx when connection is aborted */
+        cln = ngx_pool_cleanup_add(c->pool, 0);
+        if (cln == NULL) {
+            goto failed;
+        }
+
+        cln->data = cctx;
+        cctx->cleanup = &cln->handler;
+    }
+
+    *cctx->cleanup = ngx_http_lua_ssl_sess_fetch_aborted;
+
+#ifdef SSL_ERROR_PENDING_SESSION
+    return SSL_magic_pending_session_ptr();
+#else
+    ngx_log_error(NGX_LOG_CRIT, c->log, 0,
+                  "lua: cannot yield in sess get cb: "
+                  "missing async sess get cb support in OpenSSL");
+
+    /* fall through to the "failed" label below */
+#endif
+
+failed:
+
+    if (r && r->pool) {
+        ngx_http_lua_free_fake_request(r);
+    }
+
+    if (fc) {
+        ngx_http_lua_close_fake_connection(fc);
+    }
+
+    return NULL;
+}
+
+
+static void
+ngx_http_lua_ssl_sess_fetch_done(void *data)
+{
+    ngx_connection_t                *c;
+    ngx_http_lua_ssl_ctx_t          *cctx = data;
+
+    dd("lua ssl sess_fetch done");
+
+    if (cctx->aborted) {
+        return;
+    }
+
+    ngx_http_lua_assert(cctx->done == 0);
+
+    cctx->done = 1;
+
+    if (cctx->cleanup) {
+        *cctx->cleanup = NULL;
+    }
+
+    c = cctx->connection;
+
+    c->log->action = "SSL handshaking";
+
+    ngx_post_event(c->write, &ngx_posted_events);
+}
+
+
+static void
+ngx_http_lua_ssl_sess_fetch_aborted(void *data)
+{
+    ngx_http_lua_ssl_ctx_t          *cctx = data;
+
+    dd("lua ssl sess_fetch done");
+
+    if (cctx->done) {
+        /* completed successfully already */
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cctx->connection->log, 0,
+                   "ssl_session_fetch_by_lua*: sess_fetch cb aborted");
+
+    cctx->aborted = 1;
+    cctx->request->connection->ssl = NULL;
+
+    ngx_http_lua_finalize_fake_request(cctx->request, NGX_ERROR);
+}
+
+
+static u_char *
+ngx_http_lua_log_ssl_sess_fetch_error(ngx_log_t *log, u_char *buf, size_t len)
+{
+    u_char              *p;
+    ngx_connection_t    *c;
+
+    if (log->action) {
+        p = ngx_snprintf(buf, len, " while %s", log->action);
+        len -= p - buf;
+        buf = p;
+    }
+
+    p = ngx_snprintf(buf, len, ", context: ssl_session_fetch_by_lua*");
+    len -= p - buf;
+    buf = p;
+
+    c = log->data;
+
+    if (c->addr_text.len) {
+        p = ngx_snprintf(buf, len, ", client: %V", &c->addr_text);
+        len -= p - buf;
+        buf = p;
+    }
+
+    if (c && c->listening && c->listening->addr_text.len) {
+        p = ngx_snprintf(buf, len, ", server: %V", &c->listening->addr_text);
+        buf = p;
+    }
+
+    return buf;
+}
+
+
+/* initialize lua coroutine for fetching cached session */
+static ngx_int_t
+ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L, ngx_http_request_t *r)
+{
+    int                      co_ref;
+    ngx_int_t                rc;
+    lua_State               *co;
+    ngx_http_lua_ctx_t      *ctx;
+    ngx_http_cleanup_t      *cln;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_http_lua_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+    } else {
+        dd("reset ctx");
+        ngx_http_lua_reset_ctx(r, L, ctx);
+    }
+
+    ctx->entered_content_phase = 1;
+
+    /*  {{{ 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");
+
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    /*  move code closure to new coroutine */
+    lua_xmove(L, co, 1);
+
+    /*  set closure's env table to new coroutine's globals table */
+    ngx_http_lua_get_globals_table(co);
+    lua_setfenv(co, -2);
+
+    /* save nginx request in coroutine globals table */
+    ngx_http_lua_set_req(co, r);
+
+    ctx->cur_co_ctx = &ctx->entry_co_ctx;
+    ctx->cur_co_ctx->co = co;
+    ctx->cur_co_ctx->co_ref = co_ref;
+#ifdef NGX_LUA_USE_ASSERT
+    ctx->cur_co_ctx->co_top = 1;
+#endif
+
+    /* register request cleanup hooks */
+    if (ctx->cleanup == NULL) {
+        cln = ngx_http_cleanup_add(r, 0);
+        if (cln == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        cln->handler = ngx_http_lua_request_cleanup_handler;
+        cln->data = ctx;
+        ctx->cleanup = &cln->handler;
+    }
+
+    ctx->context = NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH;
+
+    rc = ngx_http_lua_run_thread(L, r, ctx, 0);
+
+    if (rc == NGX_ERROR || rc >= NGX_OK) {
+        /* do nothing */
+
+    } else if (rc == NGX_AGAIN) {
+        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 0);
+
+    } else if (rc == NGX_DONE) {
+        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 1);
+
+    } else {
+        rc = NGX_OK;
+    }
+
+    ngx_http_lua_finalize_request(r, rc);
+    return rc;
+}
+
+
+#ifndef NGX_LUA_NO_FFI_API
+
+/* de-serialized a SSL session and set it back to the request at lua context */
+int
+ngx_http_lua_ffi_ssl_set_serialized_session(ngx_http_request_t *r,
+    const unsigned char *data, int len, char **err)
+{
+    u_char                          *p;
+    u_char                           buf[NGX_SSL_MAX_SESSION_SIZE];
+    ngx_ssl_conn_t                  *ssl_conn;
+    ngx_connection_t                *c;
+    ngx_ssl_session_t               *session = NULL;
+    ngx_http_lua_ssl_ctx_t          *cctx;
+
+    c = r->connection;
+
+    if (c == NULL || c->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = c->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(buf, data, len);
+    p = buf;
+    session = d2i_SSL_SESSION(NULL, (const unsigned char **)&p,  len);
+    if (session == NULL) {
+        ERR_clear_error();
+        *err = "failed to de-serialize session";
+        return NGX_ERROR;
+    }
+
+    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
+    if (cctx == NULL) {
+        *err = "bad lua context";
+        return NGX_ERROR;
+    }
+
+    cctx->session = session;
+
+    return NGX_OK;
+}
+
+#endif  /* NGX_LUA_NO_FFI_API */
+
+
+#endif /* NGX_HTTP_SSL */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.h b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.h
new file mode 100644
index 0000000..5a6f96f
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.h
@@ -0,0 +1,34 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_LUA_SSL_SESSION_FETCHBY_H_INCLUDED_
+#define _NGX_HTTP_LUA_SSL_SESSION_FETCHBY_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+#if (NGX_HTTP_SSL)
+ngx_int_t ngx_http_lua_ssl_sess_fetch_handler_inline(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
+
+ngx_int_t ngx_http_lua_ssl_sess_fetch_handler_file(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
+
+char *ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+char *ngx_http_lua_ssl_sess_fetch_by_lua_block(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+
+ngx_ssl_session_t *ngx_http_lua_ssl_sess_fetch_handler(
+    ngx_ssl_conn_t *ssl_conn, u_char *id, int len, int *copy);
+#endif
+
+
+#endif /* _NGX_HTTP_LUA_SSL_SESSION_FETCHBY_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
new file mode 100644
index 0000000..b5596bc
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
@@ -0,0 +1,602 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#if (NGX_HTTP_SSL)
+
+
+#include "ngx_http_lua_cache.h"
+#include "ngx_http_lua_initworkerby.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_ssl_module.h"
+#include "ngx_http_lua_contentby.h"
+#include "ngx_http_lua_ssl_session_storeby.h"
+#include "ngx_http_lua_ssl.h"
+#include "ngx_http_lua_directive.h"
+
+
+/* Lua SSL new session store routines */
+static u_char *ngx_http_lua_log_ssl_sess_store_error(ngx_log_t *log,
+    u_char *buf, size_t len);
+static ngx_int_t ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L,
+    ngx_http_request_t *r);
+
+
+/* load Lua code from a file for caching new SSL session. */
+ngx_int_t
+ngx_http_lua_ssl_sess_store_handler_file(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
+{
+    ngx_int_t           rc;
+
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
+                                     lscf->srv.ssl_sess_store_src.data,
+                                     lscf->srv.ssl_sess_store_src_key);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    /*  make sure we have a valid code chunk */
+    ngx_http_lua_assert(lua_isfunction(L, -1));
+
+    return ngx_http_lua_ssl_sess_store_by_chunk(L, r);
+}
+
+
+/* load lua code from an inline snippet for caching new SSL session */
+ngx_int_t
+ngx_http_lua_ssl_sess_store_handler_inline(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
+{
+    ngx_int_t           rc;
+
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       lscf->srv.ssl_sess_store_src.data,
+                                       lscf->srv.ssl_sess_store_src.len,
+                                       lscf->srv.ssl_sess_store_src_key,
+                                       "=ssl_session_store_by_lua_block");
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    /*  make sure we have a valid code chunk */
+    ngx_http_lua_assert(lua_isfunction(L, -1));
+
+    return ngx_http_lua_ssl_sess_store_by_chunk(L, r);
+}
+
+
+char *
+ngx_http_lua_ssl_sess_store_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_ssl_sess_store_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
+/* conf parser for directive ssl_session_store_by_lua */
+char *
+ngx_http_lua_ssl_sess_store_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    u_char                      *p;
+    u_char                      *name;
+    ngx_str_t                   *value;
+    ngx_http_lua_srv_conf_t     *lscf = conf;
+
+    dd("enter");
+
+    /*  must specifiy a content handler */
+    if (cmd->post == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (lscf->srv.ssl_sess_store_handler) {
+        return "is duplicate";
+    }
+
+    if (ngx_http_lua_ssl_init(cf->log) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    lscf->srv.ssl_sess_store_handler =
+        (ngx_http_lua_srv_conf_handler_pt) cmd->post;
+
+    if (cmd->post == ngx_http_lua_ssl_sess_store_handler_file) {
+        /* Lua code in an external file */
+
+        name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
+                                        value[1].len);
+        if (name == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->srv.ssl_sess_store_src.data = name;
+        lscf->srv.ssl_sess_store_src.len = ngx_strlen(name);
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->srv.ssl_sess_store_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';
+
+    } else {
+        /* inlined Lua code */
+
+        lscf->srv.ssl_sess_store_src = value[1];
+
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lscf->srv.ssl_sess_store_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';
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+/* callback for new session caching, to be set with SSL_CTX_sess_set_new_cb */
+int
+ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
+    ngx_ssl_session_t *sess)
+{
+    lua_State                       *L;
+    ngx_int_t                        rc;
+    ngx_connection_t                *c, *fc = NULL;
+    ngx_http_request_t              *r = NULL;
+    ngx_http_connection_t           *hc;
+    ngx_http_lua_ssl_ctx_t          *cctx;
+    ngx_http_lua_srv_conf_t         *lscf;
+    ngx_http_core_loc_conf_t        *clcf;
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    dd("c = %p", c);
+
+    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
+
+    dd("ssl sess_store handler, sess_store-ctx=%p", cctx);
+
+    hc = c->data;
+
+    fc = ngx_http_lua_create_fake_connection(NULL);
+    if (fc == NULL) {
+        goto failed;
+    }
+
+    fc->log->handler = ngx_http_lua_log_ssl_sess_store_error;
+    fc->log->data = fc;
+
+    fc->addr_text = c->addr_text;
+    fc->listening = c->listening;
+
+    r = ngx_http_lua_create_fake_request(fc);
+    if (r == NULL) {
+        goto failed;
+    }
+
+    r->main_conf = hc->conf_ctx->main_conf;
+    r->srv_conf = hc->conf_ctx->srv_conf;
+    r->loc_conf = hc->conf_ctx->loc_conf;
+
+    fc->log->file = c->log->file;
+    fc->log->log_level = c->log->log_level;
+    fc->ssl = c->ssl;
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+#if defined(nginx_version) && nginx_version >= 1003014
+
+#   if nginx_version >= 1009000
+
+    ngx_set_connection_log(fc, clcf->error_log);
+
+#   else
+
+    ngx_http_set_connection_log(fc, clcf->error_log);
+
+#   endif
+
+#else
+
+    fc->log->file = clcf->error_log->file;
+
+    if (!(fc->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
+        fc->log->log_level = clcf->error_log->log_level;
+    }
+
+#endif
+
+    if (cctx == NULL) {
+        cctx = ngx_pcalloc(c->pool, sizeof(ngx_http_lua_ssl_ctx_t));
+        if (cctx == NULL) {
+            goto failed;  /* error */
+        }
+    }
+
+    cctx->connection = c;
+    cctx->request = r;
+    cctx->session = sess;
+    cctx->session_id.data = sess->session_id;
+    cctx->session_id.len = sess->session_id_length;
+    cctx->done = 0;
+
+    dd("setting cctx");
+
+    if (SSL_set_ex_data(c->ssl->connection, ngx_http_lua_ssl_ctx_index, cctx)
+        == 0)
+    {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "SSL_set_ex_data() failed");
+        goto failed;
+    }
+
+    lscf = ngx_http_get_module_srv_conf(r, ngx_http_lua_module);
+
+    /* TODO honor lua_code_cache off */
+    L = ngx_http_lua_get_lua_vm(r, NULL);
+
+    c->log->action = "storing SSL session by lua";
+
+    rc = lscf->srv.ssl_sess_store_handler(r, lscf, L);
+
+    if (rc >= NGX_OK || rc == NGX_ERROR) {
+        cctx->done = 1;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "ssl_session_store_by_lua*: handler return value: %i, "
+                       "sess new cb exit code: %d", rc, cctx->exit_code);
+
+        c->log->action = "SSL handshaking";
+
+        /* Return value is a flag indicating whether the passed-in session
+         * has been freed by this callback; always return 0 so OpenSSL will
+         * free the session. Nginx's own session caching logic has the same
+         * practice. */
+        return 0;
+    }
+
+    /* impossible to reach here */
+    ngx_http_lua_assert(0);
+
+failed:
+
+    if (r && r->pool) {
+        ngx_http_lua_free_fake_request(r);
+    }
+
+    if (fc) {
+        ngx_http_lua_close_fake_connection(fc);
+    }
+
+    return 0;
+}
+
+
+static u_char *
+ngx_http_lua_log_ssl_sess_store_error(ngx_log_t *log, u_char *buf, size_t len)
+{
+    u_char              *p;
+    ngx_connection_t    *c;
+
+    if (log->action) {
+        p = ngx_snprintf(buf, len, " while %s", log->action);
+        len -= p - buf;
+        buf = p;
+    }
+
+    p = ngx_snprintf(buf, len, ", context: ssl_session_store_by_lua*");
+    len -= p - buf;
+    buf = p;
+
+    c = log->data;
+
+    if (c->addr_text.len) {
+        p = ngx_snprintf(buf, len, ", client: %V", &c->addr_text);
+        len -= p - buf;
+        buf = p;
+    }
+
+    if (c && c->listening && c->listening->addr_text.len) {
+        p = ngx_snprintf(buf, len, ", server: %V", &c->listening->addr_text);
+        buf = p;
+    }
+
+    return buf;
+}
+
+
+/* initialize lua coroutine for caching new SSL session */
+static ngx_int_t
+ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
+{
+    size_t                   len;
+    u_char                  *err_msg;
+    ngx_int_t                rc;
+    ngx_http_lua_ctx_t      *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_http_lua_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+    } else {
+        dd("reset ctx");
+        ngx_http_lua_reset_ctx(r, L, ctx);
+    }
+
+    ctx->entered_content_phase = 1;
+    ctx->context = NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE;
+
+    /* init nginx context in Lua VM */
+    ngx_http_lua_set_req(L, r);
+    ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
+
+    /*  {{{ make new env inheriting main thread's globals table */
+    lua_createtable(L, 0, 1 /* nrec */);   /* the metatable for the new env */
+    ngx_http_lua_get_globals_table(L);
+    lua_setfield(L, -2, "__index");
+    lua_setmetatable(L, -2);    /*  setmetatable({}, {__index = _G}) */
+    /*  }}} */
+
+    lua_setfenv(L, -2);    /*  set new running env for the code closure */
+
+    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 */
+
+    dd("rc == %d", (int) rc);
+
+    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 session_store_by_lua*: %*s", len, err_msg);
+
+        lua_settop(L, 0); /*  clear remaining elems on stack */
+        ngx_http_lua_finalize_request(r, rc);
+
+        return NGX_ERROR;
+    }
+
+    lua_settop(L, 0); /*  clear remaining elems on stack */
+    ngx_http_lua_finalize_request(r, rc);
+    return rc;
+}
+
+
+#ifndef NGX_LUA_NO_FFI_API
+
+/* serialize a session from lua context into buf.
+ * the memory allocation of buf should be handled externally. */
+int
+ngx_http_lua_ffi_ssl_get_serialized_session(ngx_http_request_t *r,
+    u_char *buf, char **err)
+{
+    ngx_ssl_conn_t                  *ssl_conn;
+    ngx_connection_t                *c;
+    ngx_ssl_session_t               *session;
+    ngx_http_lua_ssl_ctx_t          *cctx;
+
+    c = r->connection;
+
+    if (c == NULL || c->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = c->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    dd("get cctx session");
+
+    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
+    if (cctx == NULL) {
+        *err = "bad lua context";
+        return NGX_ERROR;
+    }
+
+    session = cctx->session;
+    if (session == NULL) {
+        *err = "bad session in lua context";
+        return NGX_ERROR;
+    }
+
+    if (i2d_SSL_SESSION(session, &buf) == 0) {
+        *err = "i2d_SSL_SESSION() failed";
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+/* return the size of serialized session. */
+int
+ngx_http_lua_ffi_ssl_get_serialized_session_size(ngx_http_request_t *r,
+    char **err)
+{
+    int                              len;
+    ngx_ssl_conn_t                  *ssl_conn;
+    ngx_connection_t                *c;
+    ngx_ssl_session_t               *session;
+    ngx_http_lua_ssl_ctx_t          *cctx;
+
+    c = r->connection;
+
+    if (c == NULL || c->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = c->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    dd("get cctx session size");
+    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
+    if (cctx == NULL) {
+        *err = "bad lua context";
+        return NGX_ERROR;
+    }
+
+    session = cctx->session;
+    if (session == NULL) {
+        *err = "bad session in lua context";
+        return NGX_ERROR;
+    }
+
+    len = i2d_SSL_SESSION(session, NULL);
+    if (len == 0) {
+        *err = "i2d_SSL_SESSION() failed";
+        return NGX_ERROR;
+    }
+
+    return len;
+}
+
+
+/* serialize the session id from lua context into buf.
+ * the memory allocation of buf should be handled externally. */
+int
+ngx_http_lua_ffi_ssl_get_session_id(ngx_http_request_t *r,
+    u_char *buf, char **err)
+{
+    int                              id_len;
+    u_char                          *id;
+    ngx_ssl_conn_t                  *ssl_conn;
+    ngx_connection_t                *c;
+    ngx_http_lua_ssl_ctx_t          *cctx;
+
+    c = r->connection;
+
+    if (c == NULL || c->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = c->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    dd("get cctx session");
+    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
+    if (cctx == NULL) {
+        *err = "bad lua context";
+        return NGX_ERROR;
+    }
+
+    id = cctx->session_id.data;
+    if (id == NULL) {
+        *err = "uninitialized session id in lua context";
+        return NGX_ERROR;
+    }
+
+    id_len = cctx->session_id.len;
+    if (id_len == 0) {
+        *err = "uninitialized session id len in lua context";
+        return NGX_ERROR;
+    }
+
+    ngx_hex_dump(buf, id, id_len);
+
+    return NGX_OK;
+}
+
+
+/* return the size of serialized session id. */
+int
+ngx_http_lua_ffi_ssl_get_session_id_size(ngx_http_request_t *r,
+    char **err)
+{
+    ngx_ssl_conn_t                  *ssl_conn;
+    ngx_connection_t                *c;
+    ngx_http_lua_ssl_ctx_t          *cctx;
+
+    c = r->connection;
+
+    if (c == NULL || c->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = c->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    dd("get cctx session");
+    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
+    if (cctx == NULL) {
+        *err = "bad lua context";
+        return NGX_ERROR;
+    }
+
+    if (cctx->session_id.len == 0) {
+        *err = "uninitialized session id len in lua context";
+        return NGX_ERROR;
+    }
+
+    /* since the session id will be hex dumped to serialize, the serialized
+     * session will be twice the size of the session id: each byte will be a
+     * 2-digit hex value. */
+
+    return 2 * cctx->session_id.len;
+}
+
+#endif  /* NGX_LUA_NO_FFI_API */
+
+
+#endif /* NGX_HTTP_SSL */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.h b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.h
new file mode 100644
index 0000000..9bf25ad
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.h
@@ -0,0 +1,34 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_LUA_SSL_SESSION_STOREBY_H_INCLUDED_
+#define _NGX_HTTP_LUA_SSL_SESSION_STOREBY_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+#if (NGX_HTTP_SSL)
+ngx_int_t ngx_http_lua_ssl_sess_store_handler_inline(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
+
+ngx_int_t ngx_http_lua_ssl_sess_store_handler_file(ngx_http_request_t *r,
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
+
+char *ngx_http_lua_ssl_sess_store_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+char *ngx_http_lua_ssl_sess_store_by_lua_block(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+
+int ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
+    ngx_ssl_session_t *sess);
+#endif
+
+
+#endif /* _NGX_HTTP_LUA_SSL_SESSION_STOREBY_H_INCLUDED_  */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
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 241b969..22b4c00 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_string.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_string.c
@@ -15,7 +15,7 @@
 #include "ngx_http_lua_args.h"
 #include "ngx_crc32.h"
 
-#if NGX_HAVE_SHA1
+#if (NGX_HAVE_SHA1)
 #include "ngx_sha1.h"
 #endif
 
@@ -685,7 +685,7 @@ ngx_http_lua_ffi_md5(const u_char *src, size_t len, u_char *dst)
 int
 ngx_http_lua_ffi_sha1_bin(const u_char *src, size_t len, u_char *dst)
 {
-#if NGX_HAVE_SHA1
+#if (NGX_HAVE_SHA1)
     ngx_sha1_t               sha;
 
     ngx_sha1_init(&sha);
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 4f8a753..6f7aa97 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
@@ -375,7 +375,7 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
             always_forward_body = lua_toboolean(L, -1);
             lua_pop(L, 1);
 
-            dd("always foward body: %d", always_forward_body);
+            dd("always forward body: %d", always_forward_body);
 
             /* check the "method" option */
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
index 96c0ace..04dc9d0 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
@@ -603,7 +603,7 @@ ngx_http_lua_abort_pending_timers(ngx_event_t *ev)
 
     cur = ngx_event_timer_rbtree.root;
 
-    /* XXX nginx does not guarentee the parent of root is meaningful,
+    /* XXX nginx does not guarantee the parent of root is meaningful,
      * so we temporarily override it to simplify tree traversal. */
     temp = cur->parent;
     cur->parent = NULL;
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 1bd1388..7f59833 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_util.c
@@ -50,6 +50,7 @@
 #include "ngx_http_lua_worker.h"
 #include "ngx_http_lua_socket_tcp.h"
 #include "ngx_http_lua_ssl_certby.h"
+#include "ngx_http_lua_ssl.h"
 
 
 #if 1
@@ -370,37 +371,26 @@ ngx_http_lua_del_thread(ngx_http_request_t *r, lua_State *L,
 u_char *
 ngx_http_lua_rebase_path(ngx_pool_t *pool, u_char *src, size_t len)
 {
-    u_char            *p, *dst;
+    u_char     *p;
+    ngx_str_t   dst;
 
-    if (len == 0) {
+    dst.data = ngx_palloc(pool, len + 1);
+    if (dst.data == NULL) {
         return NULL;
     }
 
-    if (src[0] == '/') {
-        /* being an absolute path already */
-        dst = ngx_palloc(pool, len + 1);
-        if (dst == NULL) {
-            return NULL;
-        }
-
-        p = ngx_copy(dst, src, len);
-
-        *p = '\0';
-
-        return dst;
-    }
-
-    dst = ngx_palloc(pool, ngx_cycle->prefix.len + len + 1);
-    if (dst == NULL) {
-        return NULL;
-    }
-
-    p = ngx_copy(dst, ngx_cycle->prefix.data, ngx_cycle->prefix.len);
-    p = ngx_copy(p, src, len);
+    dst.len = len;
 
+    p = ngx_copy(dst.data, src, len);
     *p = '\0';
 
-    return dst;
+    if (ngx_get_full_name(pool, (ngx_str_t *) &ngx_cycle->prefix, &dst)
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    return dst.data;
 }
 
 
@@ -3291,6 +3281,12 @@ ngx_http_lua_check_broken_connection(ngx_http_request_t *r, ngx_event_t *ev)
         return NGX_HTTP_CLIENT_CLOSED_REQUEST;
     }
 
+#if (NGX_HTTP_V2)
+    if (r->stream) {
+        return NGX_OK;
+    }
+#endif
+
 #if (NGX_HAVE_KQUEUE)
 
     if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
@@ -3547,8 +3543,7 @@ ngx_http_lua_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc)
     ngx_connection_t          *c;
 #if (NGX_HTTP_SSL)
     ngx_ssl_conn_t            *ssl_conn;
-
-    ngx_http_lua_ssl_cert_ctx_t     *cctx;
+    ngx_http_lua_ssl_ctx_t    *cctx;
 #endif
 
     c = r->connection;
@@ -3823,6 +3818,7 @@ ngx_http_lua_create_fake_connection(ngx_pool_t *pool)
     }
 
     c->fd = (ngx_socket_t) -1;
+    c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
 
     if (pool) {
         c->pool = pool;
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 f0e8923..a37852f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_util.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_util.h
@@ -87,6 +87,10 @@ extern char ngx_http_lua_headers_metatable_key;
      : (c) == NGX_HTTP_LUA_CONTEXT_INIT_WORKER ? "init_worker_by_lua*"       \
      : (c) == NGX_HTTP_LUA_CONTEXT_BALANCER ? "balancer_by_lua*"             \
      : (c) == NGX_HTTP_LUA_CONTEXT_SSL_CERT ? "ssl_certificate_by_lua*"      \
+     : (c) == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE ?                          \
+                                                 "ssl_session_store_by_lua*" \
+     : (c) == NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH ?                          \
+                                                 "ssl_session_fetch_by_lua*" \
      : "(unknown)")
 
 
@@ -433,7 +437,6 @@ ngx_http_lua_get_flush_chain(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 
 extern ngx_uint_t  ngx_http_lua_location_hash;
 extern ngx_uint_t  ngx_http_lua_content_length_hash;
-extern int         ngx_http_lua_ssl_ctx_index;
 
 
 #endif /* _NGX_HTTP_LUA_UTIL_H_INCLUDED_ */
diff --git a/debian/modules/nginx-lua/t/009-log.t b/debian/modules/nginx-lua/t/009-log.t
index 053dd45..0c6a9a5 100644
--- a/debian/modules/nginx-lua/t/009-log.t
+++ b/debian/modules/nginx-lua/t/009-log.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
 #master_process_enabled(1);
-log_level('debug'); # to ensure any log-level can be outputed
+log_level('debug'); # to ensure any log-level can be outputted
 
 repeat_each(2);
 
diff --git a/debian/modules/nginx-lua/t/010-request_body.t b/debian/modules/nginx-lua/t/010-request_body.t
index d200495..2640a54 100644
--- a/debian/modules/nginx-lua/t/010-request_body.t
+++ b/debian/modules/nginx-lua/t/010-request_body.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
 #master_process_enabled(1);
-log_level('debug'); # to ensure any log-level can be outputed
+log_level('debug'); # to ensure any log-level can be outputted
 
 repeat_each(2);
 
diff --git a/debian/modules/nginx-lua/t/016-resp-header.t b/debian/modules/nginx-lua/t/016-resp-header.t
index b1f5e2a..179b411 100644
--- a/debian/modules/nginx-lua/t/016-resp-header.t
+++ b/debian/modules/nginx-lua/t/016-resp-header.t
@@ -530,7 +530,7 @@ Hellofoo, baz
 
 
 
-=== TEST 27: get non-existant header
+=== TEST 27: get non-existent header
 --- config
     location /lua {
         content_by_lua '
@@ -546,7 +546,7 @@ nil
 
 
 
-=== TEST 28: get non-existant header
+=== TEST 28: get non-existent header
 --- config
     location /lua {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/020-subrequest.t b/debian/modules/nginx-lua/t/020-subrequest.t
index 88ac1b4..3390d64 100644
--- a/debian/modules/nginx-lua/t/020-subrequest.t
+++ b/debian/modules/nginx-lua/t/020-subrequest.t
@@ -427,7 +427,7 @@ cached: hello
 
 
 
-=== TEST 14: emtpy args option table
+=== TEST 14: empty args option table
 --- config
     location /foo {
         echo $query_string;
diff --git a/debian/modules/nginx-lua/t/023-rewrite/request_body.t b/debian/modules/nginx-lua/t/023-rewrite/request_body.t
index 665d6de..0594001 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/request_body.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/request_body.t
@@ -3,7 +3,7 @@ use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
 #master_process_enabled(1);
-log_level('debug'); # to ensure any log-level can be outputed
+log_level('debug'); # to ensure any log-level can be outputted
 
 repeat_each(2);
 
diff --git a/debian/modules/nginx-lua/t/023-rewrite/subrequest.t b/debian/modules/nginx-lua/t/023-rewrite/subrequest.t
index 3c206a8..a307388 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/subrequest.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/subrequest.t
@@ -409,7 +409,7 @@ cached: hello
 
 
 
-=== TEST 14: emtpy args option table
+=== TEST 14: empty args option table
 --- config
     location /foo {
         echo $query_string;
diff --git a/debian/modules/nginx-lua/t/024-access/request_body.t b/debian/modules/nginx-lua/t/024-access/request_body.t
index e4ac161..a6fead2 100644
--- a/debian/modules/nginx-lua/t/024-access/request_body.t
+++ b/debian/modules/nginx-lua/t/024-access/request_body.t
@@ -3,7 +3,7 @@ use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
 #master_process_enabled(1);
-log_level('debug'); # to ensure any log-level can be outputed
+log_level('debug'); # to ensure any log-level can be outputted
 
 repeat_each(2);
 
diff --git a/debian/modules/nginx-lua/t/024-access/subrequest.t b/debian/modules/nginx-lua/t/024-access/subrequest.t
index 00c56b8..bfe96d6 100644
--- a/debian/modules/nginx-lua/t/024-access/subrequest.t
+++ b/debian/modules/nginx-lua/t/024-access/subrequest.t
@@ -409,7 +409,7 @@ cached: hello
 
 
 
-=== TEST 14: emtpy args option table
+=== TEST 14: empty args option table
 --- config
     location /foo {
         echo $query_string;
diff --git a/debian/modules/nginx-lua/t/028-req-header.t b/debian/modules/nginx-lua/t/028-req-header.t
index fd13cba..498f777 100644
--- a/debian/modules/nginx-lua/t/028-req-header.t
+++ b/debian/modules/nginx-lua/t/028-req-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 28);
+plan tests => repeat_each() * (2 * blocks() + 30);
 
 #no_diff();
 #no_long_string();
@@ -1582,3 +1582,43 @@ X-Forwarded-For: 8.8.8.8
 Foo: 127.0.0.1
 --- no_error_log
 [error]
+
+
+
+=== TEST 52: for bad requests (bad request method letter case)
+--- config
+    error_page 400 = /err;
+
+    location = /err {
+        content_by_lua_block {
+            ngx.req.set_header("Foo", "bar")
+            ngx.say("ok")
+        }
+    }
+--- raw_request
+GeT / HTTP/1.1
+--- response_body
+ok
+--- no_error_log
+[error]
+--- no_check_leak
+
+
+
+=== TEST 53: for bad requests (bad request method names)
+--- config
+    error_page 400 = /err;
+
+    location = /err {
+        content_by_lua_block {
+            ngx.req.set_header("Foo", "bar")
+            ngx.say("ok")
+        }
+    }
+--- raw_request
+GET x HTTP/1.1
+--- response_body
+ok
+--- no_error_log
+[error]
+--- no_check_leak
diff --git a/debian/modules/nginx-lua/t/030-uri-args.t b/debian/modules/nginx-lua/t/030-uri-args.t
index 2f18ba7..8ee8401 100644
--- a/debian/modules/nginx-lua/t/030-uri-args.t
+++ b/debian/modules/nginx-lua/t/030-uri-args.t
@@ -276,7 +276,7 @@ done
 
 
 
-=== TEST 10: empty key, but non-emtpy values
+=== TEST 10: empty key, but non-empty values
 --- config
     location /lua {
         content_by_lua '
@@ -818,7 +818,7 @@ lua hit query args limit 2
 
 
 
-=== TEST 36: max args (limited after an empty key, but non-emtpy values)
+=== TEST 36: max args (limited after an empty key, but non-empty values)
 --- config
     location /lua {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/031-post-args.t b/debian/modules/nginx-lua/t/031-post-args.t
index 4f8b9d7..c2b6b8f 100644
--- a/debian/modules/nginx-lua/t/031-post-args.t
+++ b/debian/modules/nginx-lua/t/031-post-args.t
@@ -152,7 +152,7 @@ lua hit query args limit 2
 
 
 
-=== TEST 6: max args (limited after an empty key, but non-emtpy values)
+=== TEST 6: max args (limited after an empty key, but non-empty values)
 --- config
     location /lua {
         content_by_lua '
diff --git a/debian/modules/nginx-lua/t/043-shdict.t b/debian/modules/nginx-lua/t/043-shdict.t
index cd160f7..a21a34a 100644
--- a/debian/modules/nginx-lua/t/043-shdict.t
+++ b/debian/modules/nginx-lua/t/043-shdict.t
@@ -816,7 +816,7 @@ foo = hello
 
 
 
-=== TEST 31: incr key (key exists)
+=== TEST 31: replace key (key exists)
 --- http_config
     lua_shared_dict dogs 1m;
 --- config
@@ -950,7 +950,7 @@ foo = 10534
 
 
 
-=== TEST 36: replace key (key not exists)
+=== TEST 36: incr key (key not exists)
 --- http_config
     lua_shared_dict dogs 1m;
 --- config
@@ -973,7 +973,7 @@ foo = nil
 
 
 
-=== TEST 37: replace key (key expired)
+=== TEST 37: incr key (key expired)
 --- http_config
     lua_shared_dict dogs 1m;
 --- config
diff --git a/debian/modules/nginx-lua/t/062-count.t b/debian/modules/nginx-lua/t/062-count.t
index a24611c..e16291b 100644
--- a/debian/modules/nginx-lua/t/062-count.t
+++ b/debian/modules/nginx-lua/t/062-count.t
@@ -283,7 +283,7 @@ n = 4
 --- request
 GET /test
 --- response_body
-n = 13
+n = 18
 --- 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 a005620..f052e9a 100644
--- a/debian/modules/nginx-lua/t/068-socket-keepalive.t
+++ b/debian/modules/nginx-lua/t/068-socket-keepalive.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 5 + 7);
+plan tests => repeat_each() * (blocks() * 5 + 9);
 
 our $HtmlDir = html_dir;
 
@@ -1476,3 +1476,78 @@ done
 --- no_error_log
 [error]
 
+
+
+=== TEST 24: setkeepalive() with explicit nil args
+--- config
+   server_tokens off;
+   location /t {
+       lua_socket_keepalive_timeout 100ms;
+
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            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(nil, nil)
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+
+            ngx.location.capture("/sleep")
+
+            ngx.say("done")
+        }
+    }
+
+    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
diff --git a/debian/modules/nginx-lua/t/070-sha1.t b/debian/modules/nginx-lua/t/070-sha1.t
index 8648a8c..62823a9 100644
--- a/debian/modules/nginx-lua/t/070-sha1.t
+++ b/debian/modules/nginx-lua/t/070-sha1.t
@@ -7,7 +7,7 @@ log_level('warn');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 1);
+plan tests => repeat_each() * (blocks() * 3);
 
 #no_diff();
 #no_long_string();
@@ -24,6 +24,8 @@ __DATA__
 GET /sha1
 --- response_body
 qvTGHdzF6KLavt4PO0gs2a6pQ00=
+--- no_error_log
+[error]
 
 
 
@@ -36,6 +38,8 @@ qvTGHdzF6KLavt4PO0gs2a6pQ00=
 GET /sha1
 --- response_body
 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
+--- no_error_log
+[error]
 
 
 
@@ -48,6 +52,8 @@ GET /sha1
 GET /sha1
 --- response_body
 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
+--- no_error_log
+[error]
 
 
 
@@ -62,4 +68,3 @@ GET /sha1
 zgmxJ9SPg4aKRWReJG07UvS97L4=
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/129-ssl-socket.t b/debian/modules/nginx-lua/t/129-ssl-socket.t
index c19853d..9da9a5c 100644
--- a/debian/modules/nginx-lua/t/129-ssl-socket.t
+++ b/debian/modules/nginx-lua/t/129-ssl-socket.t
@@ -86,7 +86,7 @@ __DATA__
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -162,7 +162,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -239,7 +239,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -320,7 +320,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -412,7 +412,7 @@ The certificate for "blah.agentzh.org" does not contain the name "blah.agentzh.o
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -492,7 +492,7 @@ The certificate for "blah.agentzh.org" does not contain the name "blah.agentzh.o
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -569,7 +569,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -650,7 +650,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -734,7 +734,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -813,7 +813,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -902,7 +902,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -995,7 +995,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -1072,7 +1072,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -1156,7 +1156,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -1236,7 +1236,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -1316,7 +1316,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -1396,7 +1396,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -1684,7 +1684,7 @@ attempt to call method 'sslhandshake' (a nil value)
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -1789,7 +1789,7 @@ SSL reused session
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -1893,7 +1893,7 @@ SSL reused session
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -1987,7 +1987,7 @@ SSL reused session
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -2071,7 +2071,7 @@ SSL reused session
 
                 local line, err = sock:receive()
                 if not line then
-                    ngx.say("failed to recieve response status line: ", err)
+                    ngx.say("failed to receive response status line: ", err)
                     return
                 end
 
@@ -2444,7 +2444,7 @@ SSL reused session
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -2549,7 +2549,7 @@ SSL reused session
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
diff --git a/debian/modules/nginx-lua/t/132-lua-blocks.t b/debian/modules/nginx-lua/t/132-lua-blocks.t
index e2933e9..a57d701 100644
--- a/debian/modules/nginx-lua/t/132-lua-blocks.t
+++ b/debian/modules/nginx-lua/t/132-lua-blocks.t
@@ -588,3 +588,19 @@ GET /test3
 "3: " . ("this is just some random filler to cause an error" x 20) . "\n"
 --- no_error_log
 [error]
+
+
+
+=== TEST 23: lexer should not stop lexing in the middle of a value
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say("}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                }")
+            ngx.say("}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                }")
+        }
+    }
+--- request
+GET /t
+--- response_body_like: }
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/133-worker-count.t b/debian/modules/nginx-lua/t/133-worker-count.t
index c97f6b4..3e03ecc 100644
--- a/debian/modules/nginx-lua/t/133-worker-count.t
+++ b/debian/modules/nginx-lua/t/133-worker-count.t
@@ -50,3 +50,23 @@ GET /lua
 workers: 1
 --- no_error_log
 [error]
+
+
+
+=== TEST 3: init_worker_by_lua
+--- http_config
+    init_worker_by_lua_block {
+        init_worker_count = ngx.worker.count()
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say("workers: ", init_worker_count)
+        }
+    }
+--- request
+GET /lua
+--- response_body
+workers: 1
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/138-balancer.t b/debian/modules/nginx-lua/t/138-balancer.t
index e44cf8e..8d45c24 100644
--- a/debian/modules/nginx-lua/t/138-balancer.t
+++ b/debian/modules/nginx-lua/t/138-balancer.t
@@ -9,7 +9,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 8);
+plan tests => repeat_each() * (blocks() * 4 + 9);
 
 #no_diff();
 no_long_string();
@@ -405,3 +405,29 @@ ctx counter: nil
 ctx counter: nil
 --- no_error_log
 [error]
+
+
+
+=== TEST 14: ngx.log(ngx.ERR, ...) github #816
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            ngx.log(ngx.ERR, "hello from balancer by lua!")
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+[
+'[lua] balancer_by_lua:2: hello from balancer by lua! while connecting to upstream,',
+qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
+]
+--- no_error_log
+[warn]
diff --git a/debian/modules/nginx-lua/t/139-ssl-cert-by.t b/debian/modules/nginx-lua/t/139-ssl-cert-by.t
index 9297a0d..b9fd60d 100644
--- a/debian/modules/nginx-lua/t/139-ssl-cert-by.t
+++ b/debian/modules/nginx-lua/t/139-ssl-cert-by.t
@@ -82,7 +82,7 @@ __DATA__
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -180,7 +180,7 @@ ssl_certificate_by_lua:1: ssl cert by lua is running!
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -285,7 +285,7 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -403,7 +403,7 @@ my timer run!
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -1108,7 +1108,7 @@ print("ssl cert by lua is running!")
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -1219,7 +1219,7 @@ a.lua:1: ssl cert by lua is running!
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -1343,7 +1343,7 @@ lua ssl server name: "test.com"
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -1439,7 +1439,7 @@ GitHub openresty/lua-resty-core#42
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -1475,3 +1475,102 @@ ssl_certificate_by_lua:1: ssl cert by lua is running!
 --- no_error_log
 [error]
 [alert]
+
+
+
+=== TEST 18: simple logging (syslog)
+github issue #723
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        error_log syslog:server=127.0.0.1:12345 debug;
+
+        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log eval
+[
+qr/\[error\] .*? send\(\) failed/,
+'lua ssl server name: "test.com"',
+]
+--- no_error_log
+[alert]
+ssl_certificate_by_lua:1: ssl cert by lua is running!
diff --git a/debian/modules/nginx-lua/t/140-ssl-c-api.t b/debian/modules/nginx-lua/t/140-ssl-c-api.t
index 4ecc2cd..44ad93d 100644
--- a/debian/modules/nginx-lua/t/140-ssl-c-api.t
+++ b/debian/modules/nginx-lua/t/140-ssl-c-api.t
@@ -22,6 +22,57 @@ log_level 'debug';
 no_long_string();
 #no_diff();
 
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->user_files) {
+        $block->set_value("user_files", <<'_EOC_');
+>>> defines.lua
+local ffi = require "ffi"
+
+ffi.cdef[[
+    int ngx_http_lua_ffi_cert_pem_to_der(const unsigned char *pem,
+        size_t pem_len, unsigned char *der, char **err);
+
+    int ngx_http_lua_ffi_priv_key_pem_to_der(const unsigned char *pem,
+        size_t pem_len, unsigned char *der, char **err);
+
+    int ngx_http_lua_ffi_ssl_set_der_certificate(void *r,
+        const char *data, size_t len, char **err);
+
+    int ngx_http_lua_ffi_ssl_set_der_private_key(void *r,
+        const char *data, size_t len, char **err);
+
+    int ngx_http_lua_ffi_ssl_clear_certs(void *r, char **err);
+
+    void *ngx_http_lua_ffi_parse_pem_cert(const unsigned char *pem,
+        size_t pem_len, char **err);
+
+    void *ngx_http_lua_ffi_parse_pem_priv_key(const unsigned char *pem,
+        size_t pem_len, char **err);
+
+    int ngx_http_lua_ffi_set_cert(void *r,
+        void *cdata, char **err);
+
+    int ngx_http_lua_ffi_set_priv_key(void *r,
+        void *cdata, char **err);
+
+    void ngx_http_lua_ffi_free_cert(void *cdata);
+
+    void ngx_http_lua_ffi_free_priv_key(void *cdata);
+
+    int ngx_http_lua_ffi_ssl_clear_certs(void *r, char **err);
+]]
+_EOC_
+    }
+
+    my $http_config = $block->http_config || '';
+    $http_config .= <<'_EOC_';
+lua_package_path "$prefix/html/?.lua;;";
+_EOC_
+    $block->set_value("http_config", $http_config);
+});
+
 run_tests();
 
 __DATA__
@@ -35,24 +86,9 @@ __DATA__
         ssl_certificate_by_lua_block {
             collectgarbage()
 
+            require "defines"
             local ffi = require "ffi"
 
-            ffi.cdef[[
-                int ngx_http_lua_ffi_cert_pem_to_der(const unsigned char *pem,
-                    size_t pem_len, unsigned char *der, char **err);
-
-                int ngx_http_lua_ffi_priv_key_pem_to_der(const unsigned char *pem,
-                    size_t pem_len, unsigned char *der, char **err);
-
-                int ngx_http_lua_ffi_ssl_set_der_certificate(void *r,
-                    const char *data, size_t len, char **err);
-
-                int ngx_http_lua_ffi_ssl_set_der_private_key(void *r,
-                    const char *data, size_t len, char **err);
-
-                int ngx_http_lua_ffi_ssl_clear_certs(void *r, char **err);
-            ]]
-
             local errmsg = ffi.new("char *[1]")
 
             local r = getfenv(0).__ngx_req
@@ -157,7 +193,7 @@ __DATA__
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -205,22 +241,7 @@ lua ssl server name: "test.com"
             collectgarbage()
 
             local ffi = require "ffi"
-
-            ffi.cdef[[
-                int ngx_http_lua_ffi_cert_pem_to_der(const unsigned char *pem,
-                    size_t pem_len, unsigned char *der, char **err);
-
-                int ngx_http_lua_ffi_priv_key_pem_to_der(const unsigned char *pem,
-                    size_t pem_len, unsigned char *der, char **err);
-
-                int ngx_http_lua_ffi_ssl_set_der_certificate(void *r,
-                    const char *data, size_t len, char **err);
-
-                int ngx_http_lua_ffi_ssl_set_der_private_key(void *r,
-                    const char *data, size_t len, char **err);
-
-                int ngx_http_lua_ffi_ssl_clear_certs(void *r, char **err);
-            ]]
+            require "defines"
 
             local errmsg = ffi.new("char *[1]")
 
@@ -326,7 +347,7 @@ lua ssl server name: "test.com"
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -374,14 +395,7 @@ lua ssl server name: "test.com"
             collectgarbage()
 
             local ffi = require "ffi"
-
-            ffi.cdef[[
-                int ngx_http_lua_ffi_cert_pem_to_der(const unsigned char *pem,
-                    size_t pem_len, unsigned char *der, char **err);
-
-                int ngx_http_lua_ffi_priv_key_pem_to_der(const unsigned char *pem,
-                    size_t pem_len, unsigned char *der, char **err);
-            ]]
+            require "defines"
 
             local errmsg = ffi.new("char *[1]")
 
@@ -461,7 +475,7 @@ lua ssl server name: "test.com"
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -493,7 +507,307 @@ close: 1 nil
 --- error_log
 lua ssl server name: "test.com"
 failed to parse PEM cert: PEM_read_bio_X509_AUX()
-failed to parse PEM priv key: PEM_read_bio_PrivateKey failed
+failed to parse PEM priv key: PEM_read_bio_PrivateKey() failed
 
 --- no_error_log
 [alert]
+
+
+
+=== TEST 4: simple cert + private key cdata
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block {
+            collectgarbage()
+
+            local ffi = require "ffi"
+            require "defines"
+
+            local errmsg = ffi.new("char *[1]")
+
+            local r = getfenv(0).__ngx_req
+            if not r then
+                ngx.log(ngx.ERR, "no request found")
+                return
+            end
+
+            ffi.C.ngx_http_lua_ffi_ssl_clear_certs(r, errmsg)
+
+            local f = assert(io.open("t/cert/test.crt", "rb"))
+            local cert_data = f:read("*all")
+            f:close()
+
+            local cert = ffi.C.ngx_http_lua_ffi_parse_pem_cert(cert_data, #cert_data, errmsg)
+            if not cert then
+                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            local rc = ffi.C.ngx_http_lua_ffi_set_cert(r, cert, errmsg)
+            if rc ~= 0 then
+                ngx.log(ngx.ERR, "failed to set cdata cert: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            ffi.C.ngx_http_lua_ffi_free_cert(cert)
+
+            f = assert(io.open("t/cert/test.key", "rb"))
+            local pkey_data = f:read("*all")
+            f:close()
+
+            local pkey = ffi.C.ngx_http_lua_ffi_parse_pem_priv_key(pkey_data, #pkey_data, errmsg)
+            if not pkey then
+                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            local rc = ffi.C.ngx_http_lua_ffi_set_priv_key(r, pkey, errmsg)
+            if rc ~= 0 then
+                ngx.log(ngx.ERR, "failed to set cdata priv key: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            ffi.C.ngx_http_lua_ffi_free_priv_key(pkey)
+        }
+
+        ssl_certificate ../../cert/test2.crt;
+        ssl_certificate_key ../../cert/test2.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 5: ECDSA cert + private key cdata
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block {
+            collectgarbage()
+
+            local ffi = require "ffi"
+            require "defines"
+
+            local errmsg = ffi.new("char *[1]")
+
+            local r = getfenv(0).__ngx_req
+            if not r then
+                ngx.log(ngx.ERR, "no request found")
+                return
+            end
+
+            ffi.C.ngx_http_lua_ffi_ssl_clear_certs(r, errmsg)
+
+            local f = assert(io.open("t/cert/test_ecdsa.crt", "rb"))
+            local cert_data = f:read("*all")
+            f:close()
+
+            local cert = ffi.C.ngx_http_lua_ffi_parse_pem_cert(cert_data, #cert_data, errmsg)
+            if not cert then
+                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            local rc = ffi.C.ngx_http_lua_ffi_set_cert(r, cert, errmsg)
+            if rc ~= 0 then
+                ngx.log(ngx.ERR, "failed to set cdata cert: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            ffi.C.ngx_http_lua_ffi_free_cert(cert)
+
+            f = assert(io.open("t/cert/test_ecdsa.key", "rb"))
+            local pkey_data = f:read("*all")
+            f:close()
+
+            local pkey = ffi.C.ngx_http_lua_ffi_parse_pem_priv_key(pkey_data, #pkey_data, errmsg)
+            if not pkey then
+                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            local rc = ffi.C.ngx_http_lua_ffi_set_priv_key(r, pkey, errmsg)
+            if rc ~= 0 then
+                ngx.log(ngx.ERR, "failed to set cdata priv key: ",
+                        ffi.string(errmsg[0]))
+                return
+            end
+
+            ffi.C.ngx_http_lua_ffi_free_priv_key(pkey)
+        }
+
+        ssl_certificate ../../cert/test2.crt;
+        ssl_certificate_key ../../cert/test2.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test_ecdsa.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to recieve response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+
+--- no_error_log
+[error]
+[alert]
diff --git a/debian/modules/nginx-lua/t/142-ssl-session-store.t b/debian/modules/nginx-lua/t/142-ssl-session-store.t
new file mode 100644
index 0000000..da84a8d
--- /dev/null
+++ b/debian/modules/nginx-lua/t/142-ssl-session-store.t
@@ -0,0 +1,750 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+use Cwd qw(abs_path realpath);
+use File::Basename;
+
+repeat_each(3);
+
+plan tests => repeat_each() * (blocks() * 6 + 2);
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_CERT_DIR} ||= dirname(realpath(abs_path(__FILE__)));
+
+#log_level 'warn';
+log_level 'debug';
+
+no_long_string();
+#no_diff();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple logging
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_session_store_by_lua_block { print("ssl session store by lua is running!") }
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+ssl_session_store_by_lua_block:1: ssl session store by lua is running!
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 2: sleep is not allowed
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_session_store_by_lua_block {
+            local begin = ngx.now()
+            ngx.sleep(0.1)
+            print("elapsed in ssl store session by lua: ", ngx.now() - begin)
+        }
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+API disabled in the context of ssl_session_store_by_lua*
+
+--- no_error_log
+[alert]
+[emerg]
+
+
+
+=== TEST 3: timer
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_store_by_lua_block {
+            local function f()
+                print("my timer run!")
+            end
+            local ok, err = ngx.timer.at(0, f)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to create timer: ", err)
+                return
+            end
+        }
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+my timer run!
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 4: cosocket is not allowed
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_session_store_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeout(5000)
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to connect to memc: ", err)
+                return
+            end
+
+            local bytes, err = sock:send("flush_all\\r\\n")
+            if not bytes then
+                ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
+                return
+            end
+
+            local res, err = sock:receive()
+            if not res then
+                ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
+                return
+            end
+
+            print("received memc reply: ", res)
+        }
+
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+API disabled in the context of ssl_session_store_by_lua*
+
+--- no_error_log
+[alert]
+[emerg]
+
+
+
+=== TEST 5: ngx.exit(0) - no yield
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_session_store_by_lua_block {
+            ngx.exit(0)
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+lua exit with code 0
+
+--- no_error_log
+[error]
+[alert]
+[emerg]
+
+
+
+=== TEST 6: ngx.exit(ngx.ERROR) - no yield
+ngx.exit does not yield and the error code is eaten.
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_session_store_by_lua_block {
+            ngx.exit(ngx.ERROR)
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+lua exit with code -1
+ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
+
+--- no_error_log
+[error]
+[alert]
+[emerg]
+
+
+
+=== TEST 7: lua exception - no yield
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_session_store_by_lua_block {
+            error("bad bad bad")
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+failed to run session_store_by_lua*: ssl_session_store_by_lua_block:2: bad bad bad
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 8: get phase
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_session_store_by_lua_block {
+            print("get_phase: ", ngx.get_phase())
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+get_phase: ssl_session_store
+
+--- no_error_log
+[alert]
+[emerg]
+[error]
+
+
+
+=== TEST 9: inter-operation with ssl_certificate_by_lua
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            local begin = ngx.now()
+            ngx.sleep(0.1)
+            print("elapsed in ssl cert by lua: ", ngx.now() - begin)
+        }
+        ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log eval
+[
+'lua ssl server name: "test.com"',
+qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
+'ssl_session_store_by_lua_block:1: ssl store session by lua is running!',
+]
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 10: simple logging (by file)
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_session_store_by_lua_file html/a.lua;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- user_files
+>>> a.lua
+print("ssl store session by lua is running!")
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+a.lua:1: ssl store session by lua is running!
+
+--- no_error_log
+[error]
+[alert]
diff --git a/debian/modules/nginx-lua/t/143-ssl-session-fetch.t b/debian/modules/nginx-lua/t/143-ssl-session-fetch.t
new file mode 100644
index 0000000..686f671
--- /dev/null
+++ b/debian/modules/nginx-lua/t/143-ssl-session-fetch.t
@@ -0,0 +1,1027 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use lib 'lib';
+use Test::Nginx::Socket::Lua;
+use Cwd qw(abs_path realpath);
+use File::Basename;
+
+repeat_each(3);
+
+plan tests => repeat_each() * (blocks() * 6);
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_CERT_DIR} ||= dirname(realpath(abs_path(__FILE__)));
+
+#log_level 'warn';
+log_level 'debug';
+
+no_long_string();
+#no_diff();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple logging
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_session_fetch_by_lua_block { print("ssl fetch sess by lua is running!") }
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
+
+--- grep_error_log_out eval
+[
+'',
+'ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!
+',
+'ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!
+',
+]
+
+--- no_error_log
+[error]
+[alert]
+[emerg]
+
+
+
+=== TEST 2: sleep
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_session_fetch_by_lua_block {
+            local begin = ngx.now()
+            ngx.sleep(0.1)
+            print("elapsed in ssl fetch session by lua: ", ngx.now() - begin)
+        }
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
+
+--- grep_error_log_out eval
+[
+'',
+qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
+qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
+]
+
+--- no_error_log
+[error]
+[alert]
+[emerg]
+
+
+
+=== TEST 3: timer
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_fetch_by_lua_block {
+            local function f()
+                print("my timer run!")
+            end
+            local ok, err = ngx.timer.at(0, f)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to create timer: ", err)
+                return
+            end
+        }
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/my timer run!/s
+
+--- grep_error_log_out eval
+[
+'',
+'my timer run!
+',
+'my timer run!
+',
+]
+
+--- no_error_log
+[error]
+[alert]
+[emerg]
+
+
+
+=== TEST 4: cosocket
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_session_fetch_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeout(5000)
+
+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to connect to memc: ", err)
+                return
+            end
+
+            local bytes, err = sock:send("flush_all\r\n")
+            if not bytes then
+                ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
+                return
+            end
+
+            local res, err = sock:receive()
+            if not res then
+                ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
+                return
+            end
+
+            print("received memc reply: ", res)
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/received memc reply: OK/s
+
+--- grep_error_log_out eval
+[
+'',
+'received memc reply: OK
+',
+'received memc reply: OK
+',
+]
+
+--- no_error_log
+[alert]
+[error]
+[emerg]
+
+
+
+=== TEST 5: ngx.exit(0) - yield
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_session_fetch_by_lua_block {
+            ngx.exit(0)
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/lua exit with code 0/s
+
+--- grep_error_log_out eval
+[
+'',
+'lua exit with code 0
+',
+'lua exit with code 0
+',
+]
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 6: ngx.exit(ngx.ERROR) - yield
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_session_fetch_by_lua_block {
+            ngx.exit(ngx.ERROR)
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/ssl_session_fetch_by_lua\*: handler return value: -1, sess get cb exit code: 0/s
+
+--- grep_error_log_out eval
+[
+'',
+'ssl_session_fetch_by_lua*: handler return value: -1, sess get cb exit code: 0
+',
+'ssl_session_fetch_by_lua*: handler return value: -1, sess get cb exit code: 0
+',
+]
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 7: ngx.exit(ngx.ERROR) - yield
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_session_fetch_by_lua_block {
+            ngx.sleep(0.001)
+            ngx.exit(ngx.ERROR)
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/ssl_session_fetch_by_lua\*: sess get cb exit code: 0/s
+
+--- grep_error_log_out eval
+[
+'',
+'ssl_session_fetch_by_lua*: sess get cb exit code: 0
+',
+'ssl_session_fetch_by_lua*: sess get cb exit code: 0
+',
+]
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 8: lua exception - no yield
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_session_fetch_by_lua_block {
+            error("bad bad bad")
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/ssl_session_fetch_by_lua_block:2: bad bad bad/s
+
+--- grep_error_log_out eval
+[
+'',
+'ssl_session_fetch_by_lua_block:2: bad bad bad
+',
+'ssl_session_fetch_by_lua_block:2: bad bad bad
+',
+
+]
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 9: lua exception - yield
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_session_fetch_by_lua_block {
+            ngx.sleep(0.001)
+            error("bad bad bad")
+            ngx.log(ngx.ERR, "should never reached here...")
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/ssl_session_fetch_by_lua_block:3: bad bad bad|ssl_session_fetch_by_lua\*: sess get cb exit code: 0/s
+
+--- grep_error_log_out eval
+[
+'',
+'ssl_session_fetch_by_lua_block:3: bad bad bad
+ssl_session_fetch_by_lua*: sess get cb exit code: 0
+',
+'ssl_session_fetch_by_lua_block:3: bad bad bad
+ssl_session_fetch_by_lua*: sess get cb exit code: 0
+',
+
+]
+
+--- no_error_log
+should never reached here
+[alert]
+[emerg]
+
+
+
+=== TEST 10: get phase
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_session_fetch_by_lua_block { print("get_phase: ", ngx.get_phase()) }
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/get_phase: ssl_session_fetch/s
+
+--- grep_error_log_out eval
+[
+'',
+'get_phase: ssl_session_fetch
+',
+'get_phase: ssl_session_fetch
+',
+]
+
+--- no_error_log
+[error]
+[alert]
+[emerg]
+
+
+
+=== TEST 11: inter-operation with ssl_certificate_by_lua
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            ngx.sleep(0.1)
+            print("ssl cert by lua is running!")
+        }
+        ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
+        ssl_session_fetch_by_lua_block {
+            ngx.sleep(0.1)
+            print("ssl fetch session by lua is running!")
+        }
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/ssl ((fetch|store) session|cert) by lua is running!/s
+
+--- grep_error_log_out eval
+[
+'ssl cert by lua is running!
+ssl store session by lua is running!
+',
+'ssl fetch session by lua is running!
+ssl cert by lua is running!
+ssl store session by lua is running!
+',
+'ssl fetch session by lua is running!
+ssl cert by lua is running!
+ssl store session by lua is running!
+',
+]
+
+--- no_error_log
+[error]
+[alert]
+[emerg]
+
+
+
+=== TEST 12: simple logging (by file)
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_session_fetch_by_lua_file html/a.lua;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- user_files
+>>> a.lua
+print("ssl fetch sess by lua is running!")
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/\S+:\d+: ssl fetch sess by lua is running!/s
+
+--- grep_error_log_out eval
+[
+'',
+'a.lua:1: ssl fetch sess by lua is running!
+',
+'a.lua:1: ssl fetch sess by lua is running!
+',
+]
+
+--- no_error_log
+[error]
+[alert]
+[emerg]
diff --git a/debian/modules/nginx-lua/t/144-shdict-incr-init.t b/debian/modules/nginx-lua/t/144-shdict-incr-init.t
new file mode 100644
index 0000000..71bb566
--- /dev/null
+++ b/debian/modules/nginx-lua/t/144-shdict-incr-init.t
@@ -0,0 +1,226 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_process_enabled(1);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 + 0);
+
+#no_diff();
+no_long_string();
+#master_on();
+#workers(2);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: incr key with init (key exists)
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", 32)
+            local res, err = dogs:incr("foo", 10502, 1)
+            ngx.say("incr: ", res, " ", err)
+            ngx.say("foo = ", dogs:get("foo"))
+        }
+    }
+--- request
+GET /test
+--- response_body
+incr: 10534 nil
+foo = 10534
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: incr key with init (key not exists)
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            dogs:flush_all()
+            dogs:set("bah", 32)
+            local res, err = dogs:incr("foo", 10502, 1)
+            ngx.say("incr: ", res, " ", err)
+            ngx.say("foo = ", dogs:get("foo"))
+        }
+    }
+--- request
+GET /test
+--- response_body
+incr: 10503 nil
+foo = 10503
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: incr key with init (key expired and size not matched)
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            for i = 1, 20 do
+                dogs:set("bar" .. i, i, 0.001)
+            end
+            dogs:set("foo", "32", 0.001)
+            ngx.location.capture("/sleep/0.002")
+            local res, err = dogs:incr("foo", 10502, 0)
+            ngx.say("incr: ", res, " ", err)
+            ngx.say("foo = ", dogs:get("foo"))
+        }
+    }
+    location ~ ^/sleep/(.+) {
+        echo_sleep $1;
+    }
+--- request
+GET /test
+--- response_body
+incr: 10502 nil
+foo = 10502
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: incr key with init (key expired and size matched)
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            for i = 1, 20 do
+                dogs:set("bar" .. i, i, 0.001)
+            end
+            dogs:set("foo", 32, 0.001)
+            ngx.location.capture("/sleep/0.002")
+            local res, err = dogs:incr("foo", 10502, 0)
+            ngx.say("incr: ", res, " ", err)
+            ngx.say("foo = ", dogs:get("foo"))
+        }
+    }
+    location ~ ^/sleep/(.+) {
+        echo_sleep $1;
+    }
+--- request
+GET /test
+--- response_body
+incr: 10502 nil
+foo = 10502
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: incr key with init (forcibly override other valid entries)
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            dogs:flush_all()
+            local long_prefix = string.rep("1234567890", 100)
+            for i = 1, 1000 do
+                local success, err, forcible = dogs:set(long_prefix .. i, i)
+                if forcible then
+                    dogs:delete(long_prefix .. i)
+                    break
+                end
+            end
+            local res, err, forcible = dogs:incr(long_prefix .. "bar", 10502, 0)
+            ngx.say("incr: ", res, " ", err, " ", forcible)
+            local res, err, forcible = dogs:incr(long_prefix .. "foo", 10502, 0)
+            ngx.say("incr: ", res, " ", err, " ", forcible)
+            ngx.say("foo = ", dogs:get(long_prefix .. "foo"))
+        }
+    }
+--- request
+GET /test
+--- response_body
+incr: 10502 nil false
+incr: 10502 nil true
+foo = 10502
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: incr key without init (no forcible returned)
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", 1)
+            local res, err, forcible = dogs:incr("foo", 1)
+            ngx.say("incr: ", res, " ", err, " ", forcible)
+            ngx.say("foo = ", dogs:get("foo"))
+        }
+    }
+--- request
+GET /test
+--- response_body
+incr: 2 nil nil
+foo = 2
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: incr key (original value is not number)
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            dogs:set("foo", true)
+            local res, err = dogs:incr("foo", 1, 0)
+            ngx.say("incr: ", res, " ", err)
+            ngx.say("foo = ", dogs:get("foo"))
+        }
+    }
+--- request
+GET /test
+--- response_body
+incr: nil not a number
+foo = true
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: init is not number
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            local res, err, forcible = dogs:incr("foo", 1, "bar")
+            ngx.say("incr: ", res, " ", err, " ", forcible)
+            ngx.say("foo = ", dogs:get("foo"))
+        }
+    }
+--- request
+GET /test
+--- error_code: 500
+--- response_body_like: 500 Internal Server Error
+--- error_log
+number expected, got string
diff --git a/debian/modules/nginx-lua/t/145-shdict-list.t b/debian/modules/nginx-lua/t/145-shdict-list.t
new file mode 100644
index 0000000..9bb1592
--- /dev/null
+++ b/debian/modules/nginx-lua/t/145-shdict-list.t
@@ -0,0 +1,745 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_process_enabled(1);
+#log_level('warn');
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 + 0);
+
+#no_diff();
+no_long_string();
+#master_on();
+#workers(2);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: lpush & lpop
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local len, err = dogs:lpush("foo", "bar")
+            if len then
+                ngx.say("push success")
+            else
+                ngx.say("push err: ", err)
+            end
+
+            local val, err = dogs:llen("foo")
+            ngx.say(val, " ", err)
+
+            local val, err = dogs:lpop("foo")
+            ngx.say(val, " ", err)
+
+            local val, err = dogs:llen("foo")
+            ngx.say(val, " ", err)
+
+            local val, err = dogs:lpop("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+push success
+1 nil
+bar nil
+0 nil
+nil nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: get operation on list type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local len, err = dogs:lpush("foo", "bar")
+            if len then
+                ngx.say("push success")
+            else
+                ngx.say("push err: ", err)
+            end
+
+            local val, err = dogs:get("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+push success
+nil value is a list
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: set operation on list type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local len, err = dogs:lpush("foo", "bar")
+            if len then
+                ngx.say("push success")
+            else
+                ngx.say("push err: ", err)
+            end
+
+            local ok, err = dogs:set("foo", "bar")
+            ngx.say(ok, " ", err)
+
+            local val, err = dogs:get("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+push success
+true nil
+bar nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: replace operation on list type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local len, err = dogs:lpush("foo", "bar")
+            if len then
+                ngx.say("push success")
+            else
+                ngx.say("push err: ", err)
+            end
+
+            local ok, err = dogs:replace("foo", "bar")
+            ngx.say(ok, " ", err)
+
+            local val, err = dogs:get("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+push success
+true nil
+bar nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: add operation on list type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local len, err = dogs:lpush("foo", "bar")
+            if len then
+                ngx.say("push success")
+            else
+                ngx.say("push err: ", err)
+            end
+
+            local ok, err = dogs:add("foo", "bar")
+            ngx.say(ok, " ", err)
+
+            local val, err = dogs:get("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+push success
+false exists
+nil value is a list
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: delete operation on list type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local len, err = dogs:lpush("foo", "bar")
+            if len then
+                ngx.say("push success")
+            else
+                ngx.say("push err: ", err)
+            end
+
+            local ok, err = dogs:delete("foo")
+            ngx.say(ok, " ", err)
+
+            local val, err = dogs:get("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+push success
+true nil
+nil nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: incr operation on list type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local len, err = dogs:lpush("foo", "bar")
+            if len then
+                ngx.say("push success")
+            else
+                ngx.say("push err: ", err)
+            end
+
+            local ok, err = dogs:incr("foo", 1)
+            ngx.say(ok, " ", err)
+
+            local val, err = dogs:get("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+push success
+nil not a number
+nil value is a list
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: get_keys operation on list type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local len, err = dogs:lpush("foo", "bar")
+            if len then
+                ngx.say("push success")
+            else
+                ngx.say("push err: ", err)
+            end
+
+            local keys, err = dogs:get_keys()
+            ngx.say("key: ", keys[1])
+        }
+    }
+--- request
+GET /test
+--- response_body
+push success
+key: foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: push operation on key-value type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local ok, err = dogs:set("foo", "bar")
+            if ok then
+                ngx.say("set success")
+            else
+                ngx.say("set err: ", err)
+            end
+
+            local len, err = dogs:lpush("foo", "bar")
+            ngx.say(len, " ", err)
+
+            local val, err = dogs:get("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+set success
+nil value not a list
+bar nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: pop operation on key-value type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local ok, err = dogs:set("foo", "bar")
+            if ok then
+                ngx.say("set success")
+            else
+                ngx.say("set err: ", err)
+            end
+
+            local val, err = dogs:lpop("foo")
+            ngx.say(val, " ", err)
+
+            local val, err = dogs:get("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+set success
+nil value not a list
+bar nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: llen operation on key-value type
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local ok, err = dogs:set("foo", "bar")
+            if ok then
+                ngx.say("set success")
+            else
+                ngx.say("set err: ", err)
+            end
+
+            local val, err = dogs:llen("foo")
+            ngx.say(val, " ", err)
+
+            local val, err = dogs:get("foo")
+            ngx.say(val, " ", err)
+        }
+    }
+--- request
+GET /test
+--- response_body
+set success
+nil value not a list
+bar nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: lpush and lpop
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            for i = 1, 3 do
+                local len, err = dogs:lpush("foo", i)
+                if len ~= i then
+                    ngx.say("push err: ", err)
+                    break
+                end
+            end
+
+            for i = 1, 3 do
+                local val, err = dogs:lpop("foo")
+                if not val then
+                    ngx.say("pop err: ", err)
+                    break
+                else
+                    ngx.say(val)
+                end
+            end
+        }
+    }
+--- request
+GET /test
+--- response_body
+3
+2
+1
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: lpush and rpop
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            for i = 1, 3 do
+                local len, err = dogs:lpush("foo", i)
+                if len ~= i then
+                    ngx.say("push err: ", err)
+                    break
+                end
+            end
+
+            for i = 1, 3 do
+                local val, err = dogs:rpop("foo")
+                if not val then
+                    ngx.say("pop err: ", err)
+                    break
+                else
+                    ngx.say(val)
+                end
+            end
+        }
+    }
+--- request
+GET /test
+--- response_body
+1
+2
+3
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: rpush and lpop
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            for i = 1, 3 do
+                local len, err = dogs:rpush("foo", i)
+                if len ~= i then
+                    ngx.say("push err: ", err)
+                    break
+                end
+            end
+
+            for i = 1, 3 do
+                local val, err = dogs:lpop("foo")
+                if not val then
+                    ngx.say("pop err: ", err)
+                    break
+                else
+                    ngx.say(val)
+                end
+            end
+        }
+    }
+--- request
+GET /test
+--- response_body
+1
+2
+3
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: list removed: expired
+--- http_config
+    lua_shared_dict dogs 900k;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local N = 100000
+            local max = 0
+
+            for i = 1, N do
+                local key = string.format("%05d", i)
+
+                local len , err = dogs:lpush(key, i)
+                if not len then
+                    max = i
+                    break
+                end
+            end
+
+            local keys = dogs:get_keys(0)
+
+            ngx.say("max - 1 matched keys length: ", max - 1 == #keys)
+
+            dogs:flush_all()
+
+            local keys = dogs:get_keys(0)
+
+            ngx.say("keys all expired, left number: ", #keys)
+
+            for i = 100000, 1, -1 do
+                local key = string.format("%05d", i)
+
+                local len, err = dogs:lpush(key, i)
+                if not len then
+                    ngx.say("loop again, max matched: ", N + 1 - i == max)
+                    break
+                end
+            end
+
+            dogs:flush_all()
+
+            dogs:flush_expired()
+
+            for i = 1, N do
+                local key = string.format("%05d", i)
+
+                local len, err = dogs:lpush(key, i)
+                if not len then
+                    ngx.say("loop again, max matched: ", i == max)
+                    break
+                end
+            end
+        }
+    }
+--- request
+GET /test
+--- response_body
+max - 1 matched keys length: true
+keys all expired, left number: 0
+loop again, max matched: true
+loop again, max matched: true
+--- no_error_log
+[error]
+--- timeout: 9
+
+
+
+=== TEST 16: list removed: forcibly
+--- http_config
+    lua_shared_dict dogs 900k;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local N = 200000
+            local max = 0
+            for i = 1, N do
+                local ok, err, forcible  = dogs:set(i, i)
+                if not ok or forcible then
+                    max = i
+                    break
+                end
+            end
+
+            local two = dogs:get(2)
+
+            ngx.say("two == number 2: ", two == 2)
+
+            dogs:flush_all()
+            dogs:flush_expired()
+
+            local keys = dogs:get_keys(0)
+
+            ngx.say("no one left: ", #keys)
+
+            for i = 1, N do
+                local key = string.format("%05d", i)
+
+                local len, err = dogs:lpush(key, i)
+                if not len then
+                    break
+                end
+            end
+
+            for i = 1, max do
+                local ok, err = dogs:set(i, i)
+                if not ok then
+                    ngx.say("set err: ", err)
+                    break
+                end
+            end
+
+            local two = dogs:get(2)
+
+            ngx.say("two == number 2: ", two == 2)
+        }
+    }
+--- request
+GET /test
+--- response_body
+two == number 2: true
+no one left: 0
+two == number 2: true
+--- no_error_log
+[error]
+--- timeout: 9
+
+
+
+=== TEST 17: expire on all types
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local len, err = dogs:lpush("list", "foo")
+            if not len then
+                ngx.say("push err: ", err)
+            end
+
+            local ok, err = dogs:set("key", "bar")
+            if not ok then
+                ngx.say("set err: ", err)
+            end
+
+            local keys = dogs:get_keys(0)
+
+            ngx.say("keys number: ", #keys)
+
+            dogs:flush_all()
+
+            local keys = dogs:get_keys(0)
+
+            ngx.say("keys number: ", #keys)
+        }
+    }
+--- request
+GET /test
+--- response_body
+keys number: 2
+keys number: 0
+--- no_error_log
+[error]
+
+
+
+=== TEST 18: long list node
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local long_str = string.rep("foo", 10)
+
+            for i = 1, 3 do
+                local len, err = dogs:lpush("list", long_str)
+                if not len then
+                    ngx.say("push err: ", err)
+                end
+            end
+
+            for i = 1, 3 do
+                local val, err = dogs:lpop("list")
+                if val then
+                    ngx.say(val)
+                end
+            end
+        }
+    }
+--- request
+GET /test
+--- response_body
+foofoofoofoofoofoofoofoofoofoo
+foofoofoofoofoofoofoofoofoofoo
+foofoofoofoofoofoofoofoofoofoo
+--- no_error_log
+[error]
+
+
+
+=== TEST 19: incr on expired list
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local long_str = string.rep("foo", 10 * 1024) -- 30k
+
+            for i = 1, 100 do
+                for j = 1, 10 do
+                    local key = "list" .. j
+                    local len, err = dogs:lpush(key, long_str)
+                    if not len then
+                        ngx.say("push err: ", err)
+                    end
+                end
+
+                dogs:flush_all()
+
+                for j = 10, 1, -1 do
+                    local key = "list" .. j
+                    local newval, err = dogs:incr(key, 1, 0)
+                    if not newval then
+                        ngx.say("incr err: ", err)
+                    end
+                end
+
+                dogs:flush_all()
+            end
+
+            ngx.say("done")
+        }
+    }
+--- request
+GET /test
+--- response_body
+done
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/lib/CRC32.lua b/debian/modules/nginx-lua/t/lib/CRC32.lua
index 70f4215..fcf260c 100755
--- a/debian/modules/nginx-lua/t/lib/CRC32.lua
+++ b/debian/modules/nginx-lua/t/lib/CRC32.lua
@@ -157,7 +157,7 @@ end
 -- CRC32.lua
 --
 -- A pure Lua implementation of a CRC32 hashing algorithm. Slower than using a C implemtation,
--- but useful having no other dependancies.
+-- but useful having no other dependencies.
 --
 --
 -- Synopsis
diff --git a/debian/modules/nginx-lua/util/build.sh b/debian/modules/nginx-lua/util/build.sh
index 17841ed..1185e72 100755
--- a/debian/modules/nginx-lua/util/build.sh
+++ b/debian/modules/nginx-lua/util/build.sh
@@ -20,12 +20,12 @@ force=$2
             #--with-cc=gcc46 \
             #--with-cc=clang \
             #--without-http_referer_module \
-            #--with-http_v2_module \
             #--with-http_spdy_module \
 
 time ngx-build $force $version \
             --with-ipv6 \
             --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" \
+            --with-http_v2_module \
             --with-http_realip_module \
             --with-http_ssl_module \
             --add-module=$root/../ndk-nginx-module \
diff --git a/debian/modules/nginx-lua/util/ngx-links b/debian/modules/nginx-lua/util/ngx-links
index bf54f46..8afe91e 100755
--- a/debian/modules/nginx-lua/util/ngx-links
+++ b/debian/modules/nginx-lua/util/ngx-links
@@ -10,7 +10,7 @@ my %opts;
 getopts('f', \%opts) or
     die "Usage: $0 [-f]
 Options:
-    -f          Override exising symbolic links with force
+    -f          Override existing symbolic links with force
 ";
 
 my $root = shift || 'src';

From b04fb6c678504686d3eb5c3066f87082d6105a59 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 26 Aug 2016 16:09:41 +0300
Subject: [PATCH 086/600] Replace http-push module with nchan v1.0.2 by the
 same author

---
 debian/control                                |     5 +-
 debian/copyright                              |    19 +-
 debian/modules/README.Modules-versions        |     6 +-
 .../{nginx-http-push => nchan}/LICENCE        |     4 +-
 debian/modules/nchan/README.md                |   597 +
 debian/modules/nchan/changelog.txt            |   265 +
 debian/modules/nchan/cloc-exclude.txt         |    17 +
 debian/modules/nchan/config                   |   104 +
 .../tests => nchan/dev}/.gitignore            |     1 +
 debian/modules/nchan/dev/Gemfile              |    28 +
 debian/modules/nchan/dev/authserver.rb        |    62 +
 debian/modules/nchan/dev/bench-parallel.sh    |    27 +
 debian/modules/nchan/dev/bench.rb             |   178 +
 debian/modules/nchan/dev/cert-key.pem         |    28 +
 debian/modules/nchan/dev/cert.pem             |    22 +
 .../tests => nchan/dev}/chattertest.rb        |     0
 .../tests => nchan/dev}/debug.sh              |     0
 debian/modules/nchan/dev/dev.conf             |    63 +
 .../tests => nchan/dev}/examine_coredump.sh   |     2 +-
 .../modules/nchan/dev/gen_config_commands.rb  |   129 +
 debian/modules/nchan/dev/longtest.rb          |   184 +
 .../tests => nchan/dev}/memparse.lua          |    76 +-
 debian/modules/nchan/dev/nginx                |     1 +
 .../dev}/nginx-cachemanager.conf              |     0
 .../modules/nchan/dev/nginx-nchan/.gitignore  |     6 +
 .../dev/nginx-nchan}/PKGBUILD                 |   136 +-
 debian/modules/nchan/dev/nginx-nchan/bl.txt   |     6 +
 .../dev/nginx-nchan}/install                  |     0
 .../dev/nginx-nchan/nchan}                    |     0
 .../dev/nginx-nchan}/nginx.conf               |     0
 .../dev/nginx-nchan}/nginx.logrotate          |     0
 .../dev/nginx-nchan}/nginx.service            |     0
 .../dev/nginx-nchan}/ngx_slab.patch           |     0
 .../tests => nchan/dev}/nginx-proxy.conf      |     0
 debian/modules/nchan/dev/nginx.conf           |   444 +
 debian/modules/nchan/dev/nginx.sh             |   277 +
 debian/modules/nchan/dev/package/.gitignore   |     1 +
 .../dev/package/nginx-nchan-static/.gitignore |     5 +
 .../dev/package/nginx-nchan-static/PKGBUILD   |   165 +
 .../dev/package/nginx-nchan-static/nginx.conf |     1 +
 .../nginx-nchan-static/nginx.logrotate        |    11 +
 .../package/nginx-nchan-static/nginx.service  |    18 +
 debian/modules/nchan/dev/package/repackage.sh |    28 +
 debian/modules/nchan/dev/pub-multi.rb         |    39 +
 debian/modules/nchan/dev/pub.rb               |    90 +
 debian/modules/nchan/dev/pubsub.rb            |  1483 +
 debian/modules/nchan/dev/rebuild.sh           |   170 +
 debian/modules/nchan/dev/redis-trib.rb        |  1696 +
 debian/modules/nchan/dev/redis.conf           |  1018 +
 .../nchan/dev/redis_clusterconf/.gitignore    |     1 +
 .../nchan/dev/redis_clusterconf/cluster.sh    |    10 +
 .../nchan/dev/redis_clusterconf/failover.sh   |    62 +
 .../dev/redis_clusterconf/redis-7000.conf     |  1018 +
 .../dev/redis_clusterconf/redis-7001.conf     |  1018 +
 .../dev/redis_clusterconf/redis-7002.conf     |  1018 +
 .../dev/redis_clusterconf/redis-7003.conf     |  1018 +
 .../dev/redis_clusterconf/redis-7004.conf     |  1018 +
 .../dev/redis_clusterconf/redis-7005.conf     |  1018 +
 .../dev/redis_clusterconf/redis-7006.conf     |  1018 +
 .../redis-cluster-node-7000.conf              |     7 +
 .../redis-cluster-node-7001.conf              |     7 +
 .../redis-cluster-node-7002.conf              |     7 +
 .../redis-cluster-node-7003.conf              |     7 +
 .../redis-cluster-node-7004.conf              |     7 +
 .../redis-cluster-node-7005.conf              |     7 +
 .../redis-cluster-node-7006.conf              |     2 +
 debian/modules/nchan/dev/redocument.rb        |   295 +
 debian/modules/nchan/dev/rsck.sh              |    67 +
 debian/modules/nchan/dev/sub.rb               |   125 +
 .../tests => nchan/dev}/test-parallel.sh      |     4 +-
 debian/modules/nchan/dev/test.rb              |   875 +
 debian/modules/nchan/dev/vg.supp              | 26977 ++++++++++++++++
 debian/modules/nchan/src/.gitignore           |     2 +
 debian/modules/nchan/src/hiredis/.gitignore   |     7 +
 debian/modules/nchan/src/hiredis/.travis.yml  |    24 +
 debian/modules/nchan/src/hiredis/CHANGELOG.md |   110 +
 debian/modules/nchan/src/hiredis/COPYING      |    29 +
 debian/modules/nchan/src/hiredis/Makefile     |   217 +
 debian/modules/nchan/src/hiredis/README.md    |   392 +
 .../modules/nchan/src/hiredis/adapters/ae.h   |   127 +
 .../nchan/src/hiredis/adapters/libev.h        |   147 +
 .../nchan/src/hiredis/adapters/libevent.h     |   108 +
 .../nchan/src/hiredis/adapters/libuv.h        |   121 +
 debian/modules/nchan/src/hiredis/async.c      |   687 +
 debian/modules/nchan/src/hiredis/async.h      |   129 +
 debian/modules/nchan/src/hiredis/dict.c       |   338 +
 debian/modules/nchan/src/hiredis/dict.h       |   126 +
 .../nchan/src/hiredis/examples/example-ae.c   |    62 +
 .../src/hiredis/examples/example-libev.c      |    52 +
 .../src/hiredis/examples/example-libevent.c   |    53 +
 .../src/hiredis/examples/example-libuv.c      |    53 +
 .../nchan/src/hiredis/examples/example.c      |    78 +
 debian/modules/nchan/src/hiredis/fmacros.h    |    21 +
 debian/modules/nchan/src/hiredis/hiredis.c    |  1021 +
 debian/modules/nchan/src/hiredis/hiredis.h    |   223 +
 debian/modules/nchan/src/hiredis/net.c        |   458 +
 debian/modules/nchan/src/hiredis/net.h        |    53 +
 debian/modules/nchan/src/hiredis/read.c       |   525 +
 debian/modules/nchan/src/hiredis/read.h       |   116 +
 debian/modules/nchan/src/hiredis/sds.c        |  1095 +
 debian/modules/nchan/src/hiredis/sds.h        |   105 +
 debian/modules/nchan/src/hiredis/test.c       |   807 +
 debian/modules/nchan/src/hiredis/win32.h      |    42 +
 debian/modules/nchan/src/nchan_commands.rb    |   412 +
 .../modules/nchan/src/nchan_config_commands.c |   408 +
 debian/modules/nchan/src/nchan_defs.c         |    91 +
 debian/modules/nchan/src/nchan_defs.h         |   107 +
 debian/modules/nchan/src/nchan_module.c       |   817 +
 debian/modules/nchan/src/nchan_module.h       |    74 +
 debian/modules/nchan/src/nchan_setup.c        |   729 +
 debian/modules/nchan/src/nchan_types.h        |   332 +
 debian/modules/nchan/src/nchan_variables.c    |   231 +
 debian/modules/nchan/src/nchan_variables.h    |     1 +
 .../nchan/src/nchan_websocket_publisher.c     |    81 +
 .../nchan/src/nchan_websocket_publisher.h     |     2 +
 .../nchan/src/store/memory/ipc-handlers.c     |   804 +
 .../nchan/src/store/memory/ipc-handlers.h     |    16 +
 debian/modules/nchan/src/store/memory/ipc.c   |   529 +
 debian/modules/nchan/src/store/memory/ipc.h   |    55 +
 .../modules/nchan/src/store/memory/memstore.c |  2861 ++
 .../modules/nchan/src/store/memory/recycloc.c |    47 +
 .../nchan/src/store/memory/store-private.h    |   148 +
 debian/modules/nchan/src/store/memory/store.h |    11 +
 .../src/store/ngx_rwlock.c                    |     6 +-
 .../src/store/ngx_rwlock.h                    |     0
 .../modules/nchan/src/store/redis/cluster.c   |  1257 +
 .../modules/nchan/src/store/redis/cluster.h   |    30 +
 debian/modules/nchan/src/store/redis/cmp.c    |  2835 ++
 debian/modules/nchan/src/store/redis/cmp.h    |   474 +
 .../modules/nchan/src/store/redis/rdsstore.c  |  2799 ++
 .../src/store/redis/redis_lua_commands.h      |  1025 +
 .../src/store/redis/redis_nginx_adapter.c     |   271 +
 .../src/store/redis/redis_nginx_adapter.h     |    15 +
 .../nchan/src/store/redis/scripts/.gitignore  |     1 +
 .../src/store/redis/scripts}/Gemfile          |    10 +-
 .../src/store/redis/scripts/add_fakesub.lua   |    29 +
 .../store/redis/scripts/channel_keepalive.lua |    34 +
 .../nchan/src/store/redis/scripts/delete.lua  |    58 +
 .../src/store/redis/scripts/find_channel.lua  |    45 +
 .../src/store/redis/scripts/get_message.lua   |   156 +
 .../redis/scripts/get_message_from_key.lua    |     9 +
 .../nchan/src/store/redis/scripts/publish.lua |   278 +
 .../store/redis/scripts/publish_status.lua    |    26 +
 .../nchan/src/store/redis/scripts/rsck.lua    |   199 +
 .../redis/scripts/subscriber_register.lua     |    50 +
 .../redis/scripts/subscriber_unregister.lua   |    49 +
 .../src/store/redis/scripts/testscripts.rb    |   268 +
 .../nchan/src/store/redis/store-private.h     |   195 +
 debian/modules/nchan/src/store/redis/store.h  |    16 +
 debian/modules/nchan/src/store/spool.c        |  1219 +
 debian/modules/nchan/src/store/spool.h        |   113 +
 debian/modules/nchan/src/store/store_common.c |     7 +
 debian/modules/nchan/src/store/store_common.h |    12 +
 debian/modules/nchan/src/subscribers/common.c |   317 +
 debian/modules/nchan/src/subscribers/common.h |    22 +
 .../nchan/src/subscribers/eventsource.c       |   337 +
 .../nchan/src/subscribers/eventsource.h       |     4 +
 .../nchan/src/subscribers/http-chunked.c      |   256 +
 .../nchan/src/subscribers/http-chunked.h      |     4 +
 .../src/subscribers/http-multipart-mixed.c    |   291 +
 .../src/subscribers/http-multipart-mixed.h    |     3 +
 .../nchan/src/subscribers/http-raw-stream.c   |   150 +
 .../nchan/src/subscribers/http-raw-stream.h   |     1 +
 .../modules/nchan/src/subscribers/internal.c  |   275 +
 .../modules/nchan/src/subscribers/internal.h  |    30 +
 .../nchan/src/subscribers/intervalpoll.c      |    32 +
 .../nchan/src/subscribers/intervalpoll.h      |     1 +
 .../nchan/src/subscribers/longpoll-private.h  |    34 +
 .../modules/nchan/src/subscribers/longpoll.c  |   540 +
 .../modules/nchan/src/subscribers/longpoll.h  |     2 +
 .../nchan/src/subscribers/memstore_ipc.c      |   167 +
 .../nchan/src/subscribers/memstore_ipc.h      |     2 +
 .../nchan/src/subscribers/memstore_multi.c    |   179 +
 .../nchan/src/subscribers/memstore_multi.h    |     2 +
 .../nchan/src/subscribers/memstore_redis.c    |   251 +
 .../nchan/src/subscribers/memstore_redis.h    |     4 +
 .../modules/nchan/src/subscribers/websocket.c |  1509 +
 .../modules/nchan/src/subscribers/websocket.h |     4 +
 debian/modules/nchan/src/uthash.h             |   950 +
 .../nchan/src/util/nchan_bufchainpool.c       |   141 +
 .../nchan/src/util/nchan_bufchainpool.h       |    39 +
 .../modules/nchan/src/util/nchan_channel_id.c |   214 +
 .../modules/nchan/src/util/nchan_channel_id.h |     1 +
 .../nchan/src/util/nchan_channel_info.c       |   133 +
 .../nchan/src/util/nchan_channel_info.h       |     7 +
 debian/modules/nchan/src/util/nchan_list.c    |   146 +
 debian/modules/nchan/src/util/nchan_list.h    |    47 +
 debian/modules/nchan/src/util/nchan_msgid.c   |   515 +
 debian/modules/nchan/src/util/nchan_msgid.h   |    16 +
 debian/modules/nchan/src/util/nchan_output.c  |   701 +
 debian/modules/nchan/src/util/nchan_output.h  |    26 +
 debian/modules/nchan/src/util/nchan_rbtree.c  |   379 +
 debian/modules/nchan/src/util/nchan_rbtree.h  |    64 +
 debian/modules/nchan/src/util/nchan_reaper.c  |   320 +
 debian/modules/nchan/src/util/nchan_reaper.h  |    33 +
 .../nchan/src/util/nchan_reuse_queue.c        |   151 +
 .../nchan/src/util/nchan_reuse_queue.h        |    24 +
 .../modules/nchan/src/util/nchan_subrequest.c |   250 +
 .../modules/nchan/src/util/nchan_subrequest.h |     2 +
 .../modules/nchan/src/util/nchan_thingcache.c |   208 +
 .../modules/nchan/src/util/nchan_thingcache.h |     4 +
 debian/modules/nchan/src/util/nchan_util.c    |   383 +
 debian/modules/nchan/src/util/nchan_util.h    |    32 +
 .../nchan/src/util/ngx_nchan_hacked_slab.c    |   761 +
 .../nchan/src/util/ngx_nchan_hacked_slab.h    |    26 +
 debian/modules/nchan/src/util/shmem.c         |   184 +
 debian/modules/nchan/src/util/shmem.h         |    28 +
 debian/modules/nginx-http-push/README         |   206 -
 debian/modules/nginx-http-push/changelog.txt  |    53 -
 debian/modules/nginx-http-push/config         |    26 -
 debian/modules/nginx-http-push/protocol.txt   |   191 -
 .../nginx-http-push/src/ngx_http_push_defs.c  |    59 -
 .../nginx-http-push/src/ngx_http_push_defs.h  |    73 -
 .../src/ngx_http_push_module.c                |   783 -
 .../src/ngx_http_push_module.h                |    31 -
 .../src/ngx_http_push_module_setup.c          |   361 -
 .../nginx-http-push/src/ngx_http_push_types.h |   120 -
 .../nginx-http-push/src/store/memory/store.c  |  1180 -
 .../nginx-http-push/src/store/memory/store.h  |     1 -
 .../src/store/ngx_http_push_module_ipc.c      |   146 -
 .../src/store/ngx_http_push_module_ipc.h      |     5 -
 .../src/store/ngx_http_push_store.h           |    51 -
 .../nginx-http-push/src/store/rbtree_util.c   |   246 -
 .../nginx-http-push/src/store/rbtree_util.h   |     9 -
 .../tests/nginx-pushmodule/.gitignore         |     5 -
 .../modules/nginx-http-push/tests/nginx.conf  |   121 -
 debian/modules/nginx-http-push/tests/nginx.sh |   117 -
 debian/modules/nginx-http-push/tests/pub.rb   |    54 -
 .../modules/nginx-http-push/tests/pubsub.rb   |   375 -
 .../modules/nginx-http-push/tests/rebuild.sh  |    55 -
 debian/modules/nginx-http-push/tests/sub.rb   |    52 -
 debian/modules/nginx-http-push/tests/test.rb  |   396 -
 debian/nginx-extras.NEWS                      |     6 +
 debian/rules                                  |     2 +-
 234 files changed, 79692 insertions(+), 4802 deletions(-)
 rename debian/modules/{nginx-http-push => nchan}/LICENCE (90%)
 create mode 100644 debian/modules/nchan/README.md
 create mode 100644 debian/modules/nchan/changelog.txt
 create mode 100644 debian/modules/nchan/cloc-exclude.txt
 create mode 100644 debian/modules/nchan/config
 rename debian/modules/{nginx-http-push/tests => nchan/dev}/.gitignore (90%)
 create mode 100644 debian/modules/nchan/dev/Gemfile
 create mode 100755 debian/modules/nchan/dev/authserver.rb
 create mode 100755 debian/modules/nchan/dev/bench-parallel.sh
 create mode 100755 debian/modules/nchan/dev/bench.rb
 create mode 100644 debian/modules/nchan/dev/cert-key.pem
 create mode 100644 debian/modules/nchan/dev/cert.pem
 rename debian/modules/{nginx-http-push/tests => nchan/dev}/chattertest.rb (100%)
 rename debian/modules/{nginx-http-push/tests => nchan/dev}/debug.sh (100%)
 create mode 100644 debian/modules/nchan/dev/dev.conf
 rename debian/modules/{nginx-http-push/tests => nchan/dev}/examine_coredump.sh (86%)
 create mode 100755 debian/modules/nchan/dev/gen_config_commands.rb
 create mode 100755 debian/modules/nchan/dev/longtest.rb
 rename debian/modules/{nginx-http-push/tests => nchan/dev}/memparse.lua (82%)
 create mode 120000 debian/modules/nchan/dev/nginx
 rename debian/modules/{nginx-http-push/tests => nchan/dev}/nginx-cachemanager.conf (100%)
 create mode 100644 debian/modules/nchan/dev/nginx-nchan/.gitignore
 rename debian/modules/{nginx-http-push/tests/nginx-pushmodule => nchan/dev/nginx-nchan}/PKGBUILD (53%)
 create mode 100644 debian/modules/nchan/dev/nginx-nchan/bl.txt
 rename debian/modules/{nginx-http-push/tests/nginx-pushmodule => nchan/dev/nginx-nchan}/install (100%)
 rename debian/modules/{nginx-http-push/tests/nginx-pushmodule/pushmodule => nchan/dev/nginx-nchan/nchan} (100%)
 rename debian/modules/{nginx-http-push/tests/nginx-pushmodule => nchan/dev/nginx-nchan}/nginx.conf (100%)
 rename debian/modules/{nginx-http-push/tests/nginx-pushmodule => nchan/dev/nginx-nchan}/nginx.logrotate (100%)
 rename debian/modules/{nginx-http-push/tests/nginx-pushmodule => nchan/dev/nginx-nchan}/nginx.service (100%)
 rename debian/modules/{nginx-http-push/tests/nginx-pushmodule => nchan/dev/nginx-nchan}/ngx_slab.patch (100%)
 rename debian/modules/{nginx-http-push/tests => nchan/dev}/nginx-proxy.conf (100%)
 create mode 100644 debian/modules/nchan/dev/nginx.conf
 create mode 100755 debian/modules/nchan/dev/nginx.sh
 create mode 100644 debian/modules/nchan/dev/package/.gitignore
 create mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/.gitignore
 create mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/PKGBUILD
 create mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/nginx.conf
 create mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/nginx.logrotate
 create mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/nginx.service
 create mode 100755 debian/modules/nchan/dev/package/repackage.sh
 create mode 100755 debian/modules/nchan/dev/pub-multi.rb
 create mode 100755 debian/modules/nchan/dev/pub.rb
 create mode 100644 debian/modules/nchan/dev/pubsub.rb
 create mode 100755 debian/modules/nchan/dev/rebuild.sh
 create mode 100755 debian/modules/nchan/dev/redis-trib.rb
 create mode 100644 debian/modules/nchan/dev/redis.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/.gitignore
 create mode 100755 debian/modules/nchan/dev/redis_clusterconf/cluster.sh
 create mode 100755 debian/modules/nchan/dev/redis_clusterconf/failover.sh
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7000.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7001.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7002.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7003.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7004.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7005.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7006.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7000.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7001.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7002.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7003.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7004.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7005.conf
 create mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7006.conf
 create mode 100755 debian/modules/nchan/dev/redocument.rb
 create mode 100755 debian/modules/nchan/dev/rsck.sh
 create mode 100755 debian/modules/nchan/dev/sub.rb
 rename debian/modules/{nginx-http-push/tests => nchan/dev}/test-parallel.sh (83%)
 create mode 100755 debian/modules/nchan/dev/test.rb
 create mode 100644 debian/modules/nchan/dev/vg.supp
 create mode 100644 debian/modules/nchan/src/.gitignore
 create mode 100644 debian/modules/nchan/src/hiredis/.gitignore
 create mode 100644 debian/modules/nchan/src/hiredis/.travis.yml
 create mode 100644 debian/modules/nchan/src/hiredis/CHANGELOG.md
 create mode 100644 debian/modules/nchan/src/hiredis/COPYING
 create mode 100644 debian/modules/nchan/src/hiredis/Makefile
 create mode 100644 debian/modules/nchan/src/hiredis/README.md
 create mode 100644 debian/modules/nchan/src/hiredis/adapters/ae.h
 create mode 100644 debian/modules/nchan/src/hiredis/adapters/libev.h
 create mode 100644 debian/modules/nchan/src/hiredis/adapters/libevent.h
 create mode 100644 debian/modules/nchan/src/hiredis/adapters/libuv.h
 create mode 100644 debian/modules/nchan/src/hiredis/async.c
 create mode 100644 debian/modules/nchan/src/hiredis/async.h
 create mode 100644 debian/modules/nchan/src/hiredis/dict.c
 create mode 100644 debian/modules/nchan/src/hiredis/dict.h
 create mode 100644 debian/modules/nchan/src/hiredis/examples/example-ae.c
 create mode 100644 debian/modules/nchan/src/hiredis/examples/example-libev.c
 create mode 100644 debian/modules/nchan/src/hiredis/examples/example-libevent.c
 create mode 100644 debian/modules/nchan/src/hiredis/examples/example-libuv.c
 create mode 100644 debian/modules/nchan/src/hiredis/examples/example.c
 create mode 100644 debian/modules/nchan/src/hiredis/fmacros.h
 create mode 100644 debian/modules/nchan/src/hiredis/hiredis.c
 create mode 100644 debian/modules/nchan/src/hiredis/hiredis.h
 create mode 100644 debian/modules/nchan/src/hiredis/net.c
 create mode 100644 debian/modules/nchan/src/hiredis/net.h
 create mode 100644 debian/modules/nchan/src/hiredis/read.c
 create mode 100644 debian/modules/nchan/src/hiredis/read.h
 create mode 100644 debian/modules/nchan/src/hiredis/sds.c
 create mode 100644 debian/modules/nchan/src/hiredis/sds.h
 create mode 100644 debian/modules/nchan/src/hiredis/test.c
 create mode 100644 debian/modules/nchan/src/hiredis/win32.h
 create mode 100644 debian/modules/nchan/src/nchan_commands.rb
 create mode 100644 debian/modules/nchan/src/nchan_config_commands.c
 create mode 100644 debian/modules/nchan/src/nchan_defs.c
 create mode 100644 debian/modules/nchan/src/nchan_defs.h
 create mode 100755 debian/modules/nchan/src/nchan_module.c
 create mode 100644 debian/modules/nchan/src/nchan_module.h
 create mode 100644 debian/modules/nchan/src/nchan_setup.c
 create mode 100644 debian/modules/nchan/src/nchan_types.h
 create mode 100644 debian/modules/nchan/src/nchan_variables.c
 create mode 100644 debian/modules/nchan/src/nchan_variables.h
 create mode 100644 debian/modules/nchan/src/nchan_websocket_publisher.c
 create mode 100644 debian/modules/nchan/src/nchan_websocket_publisher.h
 create mode 100644 debian/modules/nchan/src/store/memory/ipc-handlers.c
 create mode 100644 debian/modules/nchan/src/store/memory/ipc-handlers.h
 create mode 100755 debian/modules/nchan/src/store/memory/ipc.c
 create mode 100755 debian/modules/nchan/src/store/memory/ipc.h
 create mode 100755 debian/modules/nchan/src/store/memory/memstore.c
 create mode 100644 debian/modules/nchan/src/store/memory/recycloc.c
 create mode 100644 debian/modules/nchan/src/store/memory/store-private.h
 create mode 100644 debian/modules/nchan/src/store/memory/store.h
 rename debian/modules/{nginx-http-push => nchan}/src/store/ngx_rwlock.c (97%)
 rename debian/modules/{nginx-http-push => nchan}/src/store/ngx_rwlock.h (100%)
 create mode 100644 debian/modules/nchan/src/store/redis/cluster.c
 create mode 100644 debian/modules/nchan/src/store/redis/cluster.h
 create mode 100644 debian/modules/nchan/src/store/redis/cmp.c
 create mode 100644 debian/modules/nchan/src/store/redis/cmp.h
 create mode 100755 debian/modules/nchan/src/store/redis/rdsstore.c
 create mode 100644 debian/modules/nchan/src/store/redis/redis_lua_commands.h
 create mode 100644 debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
 create mode 100644 debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/.gitignore
 rename debian/modules/{nginx-http-push/tests => nchan/src/store/redis/scripts}/Gemfile (61%)
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/add_fakesub.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/channel_keepalive.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/delete.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/find_channel.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/get_message.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/get_message_from_key.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/publish.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/publish_status.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/rsck.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/subscriber_register.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/subscriber_unregister.lua
 create mode 100755 debian/modules/nchan/src/store/redis/scripts/testscripts.rb
 create mode 100644 debian/modules/nchan/src/store/redis/store-private.h
 create mode 100755 debian/modules/nchan/src/store/redis/store.h
 create mode 100755 debian/modules/nchan/src/store/spool.c
 create mode 100644 debian/modules/nchan/src/store/spool.h
 create mode 100644 debian/modules/nchan/src/store/store_common.c
 create mode 100644 debian/modules/nchan/src/store/store_common.h
 create mode 100644 debian/modules/nchan/src/subscribers/common.c
 create mode 100644 debian/modules/nchan/src/subscribers/common.h
 create mode 100644 debian/modules/nchan/src/subscribers/eventsource.c
 create mode 100644 debian/modules/nchan/src/subscribers/eventsource.h
 create mode 100644 debian/modules/nchan/src/subscribers/http-chunked.c
 create mode 100644 debian/modules/nchan/src/subscribers/http-chunked.h
 create mode 100644 debian/modules/nchan/src/subscribers/http-multipart-mixed.c
 create mode 100644 debian/modules/nchan/src/subscribers/http-multipart-mixed.h
 create mode 100644 debian/modules/nchan/src/subscribers/http-raw-stream.c
 create mode 100644 debian/modules/nchan/src/subscribers/http-raw-stream.h
 create mode 100644 debian/modules/nchan/src/subscribers/internal.c
 create mode 100644 debian/modules/nchan/src/subscribers/internal.h
 create mode 100644 debian/modules/nchan/src/subscribers/intervalpoll.c
 create mode 100644 debian/modules/nchan/src/subscribers/intervalpoll.h
 create mode 100644 debian/modules/nchan/src/subscribers/longpoll-private.h
 create mode 100644 debian/modules/nchan/src/subscribers/longpoll.c
 create mode 100644 debian/modules/nchan/src/subscribers/longpoll.h
 create mode 100644 debian/modules/nchan/src/subscribers/memstore_ipc.c
 create mode 100644 debian/modules/nchan/src/subscribers/memstore_ipc.h
 create mode 100644 debian/modules/nchan/src/subscribers/memstore_multi.c
 create mode 100644 debian/modules/nchan/src/subscribers/memstore_multi.h
 create mode 100644 debian/modules/nchan/src/subscribers/memstore_redis.c
 create mode 100644 debian/modules/nchan/src/subscribers/memstore_redis.h
 create mode 100644 debian/modules/nchan/src/subscribers/websocket.c
 create mode 100644 debian/modules/nchan/src/subscribers/websocket.h
 create mode 100644 debian/modules/nchan/src/uthash.h
 create mode 100644 debian/modules/nchan/src/util/nchan_bufchainpool.c
 create mode 100644 debian/modules/nchan/src/util/nchan_bufchainpool.h
 create mode 100644 debian/modules/nchan/src/util/nchan_channel_id.c
 create mode 100644 debian/modules/nchan/src/util/nchan_channel_id.h
 create mode 100644 debian/modules/nchan/src/util/nchan_channel_info.c
 create mode 100644 debian/modules/nchan/src/util/nchan_channel_info.h
 create mode 100644 debian/modules/nchan/src/util/nchan_list.c
 create mode 100644 debian/modules/nchan/src/util/nchan_list.h
 create mode 100644 debian/modules/nchan/src/util/nchan_msgid.c
 create mode 100644 debian/modules/nchan/src/util/nchan_msgid.h
 create mode 100644 debian/modules/nchan/src/util/nchan_output.c
 create mode 100644 debian/modules/nchan/src/util/nchan_output.h
 create mode 100644 debian/modules/nchan/src/util/nchan_rbtree.c
 create mode 100644 debian/modules/nchan/src/util/nchan_rbtree.h
 create mode 100644 debian/modules/nchan/src/util/nchan_reaper.c
 create mode 100644 debian/modules/nchan/src/util/nchan_reaper.h
 create mode 100644 debian/modules/nchan/src/util/nchan_reuse_queue.c
 create mode 100644 debian/modules/nchan/src/util/nchan_reuse_queue.h
 create mode 100644 debian/modules/nchan/src/util/nchan_subrequest.c
 create mode 100644 debian/modules/nchan/src/util/nchan_subrequest.h
 create mode 100644 debian/modules/nchan/src/util/nchan_thingcache.c
 create mode 100644 debian/modules/nchan/src/util/nchan_thingcache.h
 create mode 100644 debian/modules/nchan/src/util/nchan_util.c
 create mode 100644 debian/modules/nchan/src/util/nchan_util.h
 create mode 100644 debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
 create mode 100644 debian/modules/nchan/src/util/ngx_nchan_hacked_slab.h
 create mode 100644 debian/modules/nchan/src/util/shmem.c
 create mode 100644 debian/modules/nchan/src/util/shmem.h
 delete mode 100644 debian/modules/nginx-http-push/README
 delete mode 100644 debian/modules/nginx-http-push/changelog.txt
 delete mode 100644 debian/modules/nginx-http-push/config
 delete mode 100644 debian/modules/nginx-http-push/protocol.txt
 delete mode 100644 debian/modules/nginx-http-push/src/ngx_http_push_defs.c
 delete mode 100644 debian/modules/nginx-http-push/src/ngx_http_push_defs.h
 delete mode 100755 debian/modules/nginx-http-push/src/ngx_http_push_module.c
 delete mode 100644 debian/modules/nginx-http-push/src/ngx_http_push_module.h
 delete mode 100644 debian/modules/nginx-http-push/src/ngx_http_push_module_setup.c
 delete mode 100644 debian/modules/nginx-http-push/src/ngx_http_push_types.h
 delete mode 100755 debian/modules/nginx-http-push/src/store/memory/store.c
 delete mode 100644 debian/modules/nginx-http-push/src/store/memory/store.h
 delete mode 100644 debian/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.c
 delete mode 100644 debian/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.h
 delete mode 100755 debian/modules/nginx-http-push/src/store/ngx_http_push_store.h
 delete mode 100644 debian/modules/nginx-http-push/src/store/rbtree_util.c
 delete mode 100644 debian/modules/nginx-http-push/src/store/rbtree_util.h
 delete mode 100644 debian/modules/nginx-http-push/tests/nginx-pushmodule/.gitignore
 delete mode 100644 debian/modules/nginx-http-push/tests/nginx.conf
 delete mode 100755 debian/modules/nginx-http-push/tests/nginx.sh
 delete mode 100755 debian/modules/nginx-http-push/tests/pub.rb
 delete mode 100644 debian/modules/nginx-http-push/tests/pubsub.rb
 delete mode 100755 debian/modules/nginx-http-push/tests/rebuild.sh
 delete mode 100755 debian/modules/nginx-http-push/tests/sub.rb
 delete mode 100755 debian/modules/nginx-http-push/tests/test.rb
 create mode 100644 debian/nginx-extras.NEWS

diff --git a/debian/control b/debian/control
index 5badc14..912e6c4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,8 @@ Build-Depends: autotools-dev,
                libssl-dev,
                libxslt1-dev,
                po-debconf,
-               zlib1g-dev
+               zlib1g-dev,
+               libhiredis-dev
 Standards-Version: 3.9.8.0
 Homepage: http://nginx.net
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/nginx.git
@@ -211,7 +212,7 @@ Description: nginx web/proxy server (extended version)
  MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
  .
  THIRD PARTY MODULES: Auth PAM, Cache Purge, DAV Ext, Echo, Fancy Index,
- Headers More, Embedded Lua, HTTP Push, HTTP Substitutions, Upload Progress,
+ Headers More, Embedded Lua, HTTP Substitutions, Nchan, Upload Progress,
  Upstream Fair Queue.
 
 Package: nginx-extras-dbg
diff --git a/debian/copyright b/debian/copyright
index 0edb73b..019dc9d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -70,9 +70,20 @@ Copyright: Copyright (c) 2007 Grzegorz Nosek
            Igor Sysoev
 License: BSD-2-clause
 
-Files: debian/modules/nginx-http-push/*
-Copyright: Copyright (c) 2009 Leo Ponomarev
-License: Expat
+Files: debian/modules/nchan/*
+Copyright: 2009-2016 Leo Ponomarev
+License: MIT
+
+Files: debian/modules/nchan/src/store/redis/cmp.*
+Copyright: 2015 Charles Gunyon
+License: MIT
+
+Files: debian/modules/nchan/src/hiredis/*
+Copyright: 2009-2011, Salvatore Sanfilippo
+           2010-2011, Pieter Noordhuis
+                      Matt Stancliff
+                      Jan-Erik Rediger
+License: BSD-3-clause
 
 Files: debian/modules/nginx-upload-progress/*
 Copyright: Brice Figureau
@@ -173,7 +184,7 @@ License: BSD-4-clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-License: Expat
+License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to
  deal in the Software without restriction, including without limitation the
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 1ad980c..6f32994 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -29,9 +29,9 @@ README for Modules versions
   Version: a18b409
   Dynamic: No, https://github.com/gnosek/nginx-upstream-fair/pull/21
 
- nginx-push
-  Homepage: https://github.com/slact/nginx_http_push_module
-  Version: 0.73
+ nchan
+  Homepage: https://github.com/slact/nchan
+  Version: 1.0.2
 
  nginx-upload-progress
   Homepage: https://github.com/masterzen/nginx-upload-progress-module
diff --git a/debian/modules/nginx-http-push/LICENCE b/debian/modules/nchan/LICENCE
similarity index 90%
rename from debian/modules/nginx-http-push/LICENCE
rename to debian/modules/nchan/LICENCE
index ad9c957..aed1f30 100644
--- a/debian/modules/nginx-http-push/LICENCE
+++ b/debian/modules/nchan/LICENCE
@@ -1,6 +1,6 @@
 This work is distributed under the MIT Licence.
 
-Copyright (c) 2009 Leo Ponomarev
+Written by Leo Ponomarev (slact) 2009-2015.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -11,7 +11,7 @@ copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following
 conditions:
 
-The above copyright notice and this permission notice shall be
+The above authorship notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
diff --git a/debian/modules/nchan/README.md b/debian/modules/nchan/README.md
new file mode 100644
index 0000000..fecd417
--- /dev/null
+++ b/debian/modules/nchan/README.md
@@ -0,0 +1,597 @@
+<img class="logo" alt="NCHAN" src="https://nchan.slact.net/github-logo.png" />
+
+https://nchan.slact.net
+
+Nchan is a scalable, flexible pub/sub server for the modern web, built as a module for the [Nginx](http://nginx.org) web server. It can be configured as a standalone server, or as a shim between your application and tens, thousands, or millions of live subscribers. It can buffer messages in memory, on-disk, or via [Redis](http://redis.io). All connections are handled asynchronously and distributed among any number of worker processes. It can also scale to many nginx server instances with [Redis](http://redis.io).
+
+Messages are [published](#publisher-endpoints) to channels with HTTP `POST` requests or websockets, and [subscribed](#subscriber-endpoint) also through websockets, [long-polling](#long-polling), [EventSource](#eventsource) (SSE), old-fashioned [interval polling](#interval-polling), [and](#http-chunked-transfer) [more](#http-multipart-mixed). Each subscriber can listen to [up to 255 channels](#channel-multiplexing) per connection, and can be optionally [authenticated](https://nchan.slact.net/details#authenticate-with-nchan_authorize_request) via a custom application url. An [events](#nchan_channel_event_string) [meta channel](#nchan_channel_events_channel_id) is also available for debugging.
+
+For use in a web browser, you can try the [NchanSubscriber.js](https://github.com/slact/nchan/blob/master/NchanSubscriber.js) wrapper library. It supports Long-Polling, EventSource, and resumable Websockets -- or you can build your own.
+
+## Status and History
+
+The latest Nchan release is v1.0.2 (August 29, 2016) ([changelog](https://nchan.slact.net/changelog)).
+
+The first iteration of Nchan was written in 2009-2010 as the [Nginx HTTP Push Module](https://pushmodule.slact.net), and was vastly refactored into its present state in 2014-2016. The present release is in the **testing** phase. The core features and old functionality are thoroughly tested and stable. Some of the new functionality, especially Redis Cluster may be a bit buggy.
+
+Please help make the entire codebase ready for production use! Report any quirks, bugs, leaks, crashes, or larvae you find.
+
+#### Upgrade from Nginx HTTP Push Module
+
+Although Nchan is backwards-compatible with all Push Module configuration directives, some of the more unusual and rarely used settings have been disabled and will be ignored (with a warning). See the [upgrade page](https://nchan.slact.net/upgrade) for a detailed list of changes and improvements, as well as a full list of incompatibilities.
+
+
+## Does it scale?
+
+<img class="benchmark_graph" alt="benchmarking internal subscriber response times" src="https://nchan.slact.net/img/benchmark_internal_total.png" />
+
+Yes it does. Like Nginx, Nchan can easily handle as much traffic as you can throw at it. I've tried to benchmark it, but my benchmarking tools are much slower than Nchan. The data I've gathered is on how long Nchan itself takes to respond to every subscriber after publishing a message -- this excludes TCP handshake times and internal HTTP request parsing. Basically, it measures how Nchan scales assuming all other components are already tuned for scalability. The graphed data are averages of 5 runs with 50-byte messages.
+
+With a well-tuned OS and network stack on commodity server hardware, expect to handle upwards of 300K concurrent subscribers per second at minimal CPU load. Nchan can also be scaled out to multiple Nginx instances using the [Redis storage engine](#nchan_use_redis), and that too can be scaled up beyond a single-point-of-failure by using Redis Cluster.
+
+Currently, Nchan's performance is limited by available memory bandwidth. This can be improved significantly in future versions with fewer allocations and the use of contiguous memory pools. Please consider supporting Nchan to speed up the work of memory cache optimization.
+
+## Install
+
+#### Download Packages
+ - [Arch Linux](https://archlinux.org): [nginx-nchan](https://aur.archlinux.org/packages/nginx-nchan/) and [nginx-nchan-git](https://aur.archlinux.org/packages/nginx-nchan-git/) are available in the Arch User Repository.  
+ - Mac OS X: a [homebrew](http://brew.sh) package is available. `brew tap homebrew/nginx; brew install nginx-full --with-nchan-module`
+ - [Debian](https://www.debian.org/): [nginx-common.deb](https://nchan.slact.net/download/nginx-common.deb) and [nginx-extras.deb](https://nchan.slact.net/download/nginx-extras.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`. These packages should soon be available directly from the Debian repository.
+ - [Ubuntu](http://www.ubuntu.com/):  [nginx-common.ubuntu.deb](https://nchan.slact.net/download/nginx-common.ubuntu.deb) and [nginx-extras.ubuntu.deb](https://nchan.slact.net/download/nginx-extras.ubuntu.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`. Who knows when Ubuntu will add them to their repository?...
+ - [Fedora](https://fedoraproject.org): A 64-bit binary rpm and a source rpm are available: [nginx-nchan.x86_64.rpm](https://nchan.slact.net/download/nginx-nchan.x86-64.rpm), [ngx-nchan.src.rpm](https://nchan.slact.net/download/nginx-nchan.src.rpm). 
+ - A statically compiled binary and associated linux nginx installation files are also [available as a tarball](https://nchan.slact.net/download/nginx-nchan-latest.tar.gz).
+
+
+#### Build From Source
+Grab the latest copy of Nginx from [nginx.org](http://nginx.org). Grab the latest Nchan source from [github](https://github.com/slact/nchan/releases). Follow the instructions for [building Nginx](https://www.nginx.com/resources/wiki/start/topics/tutorials/install/#source-releases), except during the `configure` stage, add
+```
+./configure --add-module=path/to/nchan ...
+```
+
+If you're using Nginx  > 1.9.11, you can build Nchan as a [dynamic module](https://www.nginx.com/blog/dynamic-modules-nginx-1-9-11/) with `--add-dynamic-module=path/to/nchan`
+
+Run `make`, `make install`, and enjoy. (Caution, contents may be hot.)
+
+## Conceptual Overview
+
+The basic unit of most pub/sub solutions is the messaging *channel*. Nchan is no different. Publishers send messages to channels with a certain *channel id*, and subscribers subscribed to those channels receive them. Some number of messages may be buffered for a time in a channel's message buffer before they are deleted. Pretty simple, right? 
+
+Well... the trouble is that nginx configuration does not deal with channels, publishers, and subscribers. Rather, it has several sections for incoming requests to match against *server* and *location* sections. **Nchan configuration directives map servers and locations onto channel publishing and subscribing endpoints**:
+
+```nginx
+#very basic nchan config
+worker_processes 5;
+
+http {  
+  server {
+    listen       80;
+    
+    location = /sub {
+      nchan_subscriber;
+      nchan_channel_id foobar;
+    }
+    
+    location = /pub {
+      nchan_publisher;
+      nchan_channel_id foobar;
+    }
+  }
+}
+```
+
+The above maps requests to the URI `/sub` onto the channel `foobar`'s *subscriber endpoint* , and similarly `/pub` onto channel `foobar`'s *publisher endpoint*.
+
+
+#### Publisher Endpoints
+
+Publisher endpoints are Nginx config *locations* with the [*`nchan_publisher`*](#nchan_publisher) directive.
+
+Messages can be published to a channel by sending HTTP **POST** requests with the message contents to the *publisher endpoint* locations. You can also publish messages through a **Websocket** connection to the same location.
+
+##### Publishing Messages
+
+Requests and websocket messages are responded to with information about the channel at time of message publication. Here's an example from publishing with `curl`:
+
+```console
+>  curl --request POST --data "test message" http://127.0.0.1:80/pub
+
+ queued messages: 5
+ last requested: 18 sec. ago
+ active subscribers: 0
+ last message id: 1450755280:0
+```
+
+The response can be in plaintext (as above), JSON, or XML, based on the request's *`Accept`* header:
+
+```console
+> curl --request POST --data "test message" -H "Accept: text/json" http://127.0.0.2:80/pub
+
+ {"messages": 6, "requested": 55, "subscribers": 0, "last_message_id": "1450755317:0" }
+```
+
+Websocket publishers also receive the same responses when publishing, with the encoding determined by the *`Accept`* header present during the handshake.
+
+The response code for an HTTP request is *`202` Accepted* if no subscribers are present at time of publication, or *`201` Created* if at least 1 subscriber was present.
+
+Metadata can be added to a message when using an HTTP POST request for publishing. A `Content-Type` header will be associated as the message's content type (and output to Long-Poll, Interval-Poll, and multipart/mixed subscribers). A `X-EventSource-Event` header can also be used to associate an EventSource `event:` line value with a message.
+
+##### Other Publisher Endpoint Actions
+
+**HTTP `GET`** requests return channel information without publishing a message. The response code is `200` if the channel exists, and `404` otherwise:  
+```console
+> curl --request POST --data "test message" http://127.0.0.2:80/pub
+  ...
+
+> curl -v --request GET -H "Accept: text/json" http://127.0.0.2:80/pub
+
+ {"messages": 1, "requested": 7, "subscribers": 0, "last_message_id": "1450755421:0" }
+```
+
+
+**HTTP `DELETE`** requests delete a channel and end all subscriber connections. Like the `GET` requests, this returns a `200` status response with channel info if the channel existed, and a `404` otherwise.
+
+#### Subscriber Endpoint
+
+Subscriber endpoints are Nginx config *locations* with the [*`nchan_subscriber`*](#nchan_subscriber) directive.
+
+Nchan supports several different kinds of subscribers for receiving messages: [*Websocket*](#websocket), [*EventSource*](#eventsource) (Server Sent Events),  [*Long-Poll*](#long-polling), [*Interval-Poll*](#interval-polling). [*HTTP chunked transfer*](#http-chunked-transfer), and [*HTTP multipart/mixed*](#http-multipart-mixed).
+
+- ##### Long-Polling
+  The tried-and-true server-push method supported by every browser out there.  
+  Initiated by sending an HTTP `GET` request to a channel subscriber endpoint.  
+  The long-polling subscriber walks through a channel's message queue via the built-in cache mechanism of HTTP clients, namely with the "`Last-Modified`" and "`Etag`" headers. Explicitly, to receive the next message for given a long-poll subscriber response, send a request with the "`If-Modified-Since`" header set to the previous response's "`Last-Modified`" header, and "`If-None-Match`" likewise set to the previous response's "`Etag`" header.  
+  Sending a request without a "`If-Modified-Since`" or "`If-None-Match`" headers returns the oldest message in a channel's message queue, or waits until the next published message, depending on the value of the `nchan_subscriber_first_message` config directive.  
+  A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
+  
+- ##### Interval-Polling
+  Works just like long-polling, except if the requested message is not yet available, immediately responds with a `304 Not Modified`.
+  There is no way to differentiate between long-poll and interval-poll subscriber requests, so long-polling must be disabled for a subscriber location if you wish to use interval-polling.
+
+- ##### Websocket
+  Bidirectional communication for web browsers. Part of the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html). Nchan supports the latest protocol version 13 ([RFC 6455](https://tools.ietf.org/html/rfc6455)).  
+  Initiated by sending a websocket handshake to the desired subscriber endpoint location.  
+  If the websocket connection is closed by the server, the `close` frame will contain the HTTP response code and status line describing the reason for closing the connection. Server-initiated keep-alive pings can be configured with the [`nchan_websocket_ping_interval`](#nchan_websocket_ping_interval) config directive. Websocket extensions are not yet supported.  
+  Messages published through a websocket connection can be forwarded to an upstream application with the [`nchan_publisher_upstream_request`](nchan_publisher_upstream_request) config directive.   
+  Websocket subscribers can use the custom `ws+meta.nchan` subprotocol to receive message metadata with messages, making websocket connections resumable. Messages received with this subprotocol are of the form
+  <pre>
+  id: message_id
+  content-type: message_content_type
+  \n
+  message_data
+  </pre>   
+  The `content-type:` line may be omitted.
+- ##### EventSource
+  Also known as [Server-Sent Events](https://en.wikipedia.org/wiki/Server-sent_events) or SSE, it predates Websockets in the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html), and is a [very simple protocol](http://www.w3.org/TR/eventsource/#event-stream-interpretation).  
+  Initiated by sending an HTTP `GET` request to a channel subscriber endpoint with the "`Accept: text/event-stream`" header.    
+  Each message `data: ` segment will be prefaced by the message `id: `.  
+  To resume a closed EventSource connection from the last-received message, one *should* start the connection with the "`Last-Event-ID`" header set to the last message's `id`.  
+  Unfortunately, browsers [don't support setting](http://www.w3.org/TR/2011/WD-eventsource-20111020/#concept-event-stream-last-event-id) this header for an `EventSource` object, so by default the last message id is set either from the "`Last-Event-Id`" header or the `last_event_id` url query string argument.  
+  This behavior can be configured via the [`nchan_subscriber_last_message_id`](#nchan_subscriber_last_message_id) config.  
+  A message's associated `event` type, if present, will be sent to this subscriber with the `event:` line.
+  
+- ##### HTTP [multipart/mixed](http://www.w3.org/Protocols/rfc1341/7_2_Multipart.html#z0)
+  The `multipart/mixed` MIMEtype was conceived for emails, but hey, why not use it for HTTP? It's easy to parse and includes metadata with each message.  
+  Initiated by including an `Accept: multipart/mixed` header.  
+  The response headers and the unused "preamble" portion of the response body are sent right away, with the boundary string generated randomly for each subscriber.  Each subsequent message will be sent as one part of the multipart message, and will include the message time and tag (`Last-Modified` and `Etag`) as well as the optional `Content-Type` headers.  
+  Each message is terminated with the next multipart message's boundary **without a trailing newline**. While this conforms to the multipart spec, it is unusual as multipart messages are defined as *starting*, rather than ending with a boundary.  
+  A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
+  
+- ##### HTTP Raw Stream
+  A simple subscription method similar to the [streaming subscriber](https://github.com/wandenberg/nginx-push-stream-module/blob/master/docs/directives/subscribers.textile#push_stream_subscriber) of the [Nginx HTTP Push Stream Module](https://github.com/wandenberg/nginx-push-stream-module). Messages are appended to the response body, separated by a newline or configurable by `nchan_subscriber_http_raw_stream_separator`.
+
+- ##### HTTP [Chunked Transfer](http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1)
+  This subscription method uses the `chunked` `Transfer-Encoding` to receive messages.   
+  Initiated by explicitly including `chunked` in the [`TE` header](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.39):  
+  `TE: chunked` (or `TE: chunked;q=??` where the qval > 0)  
+  The response headers are sent right away, and each message will be sent as an individual chunk. Note that because a zero-length chunk terminates the transfer, **zero-length messages will not be sent** to the subscriber.  
+  Unlike the other subscriber types, the `chunked` subscriber cannot be used with http/2 because it dissallows chunked encoding.
+  
+#### PubSub Endpoint  
+
+PubSub endpoints are Nginx config *locations* with the [*`nchan_pubsub`*](#nchan_pubsub) directive.
+
+A combination of *publisher* and *subscriber* endpoints, this location treats all HTTP `GET`
+requests as subscribers, and all HTTP `POST` as publishers. One simple use case is an echo server:
+
+```nginx
+  location = /pubsub {
+    nchan_pubsub;
+    nchan_channel_id foobar;
+  }
+```
+
+A more applicable setup may set different publisher and subscriber channel ids:
+
+```nginx
+  location = /pubsub {
+    nchan_pubsub;
+    nchan_publisher_channel_id foo;
+    nchan_subscriber_channel_id bar;
+  }
+```
+
+Here, subscribers will listen for messages on channel `foo`, and publishers will publish messages to channel `bar`. This can be useful when setting up websocket proxying between web clients and your application.
+
+### The Channel ID
+
+So far the examples have used static channel ids, which is not very useful in practice. It can be set to any nginx *variable*, such as a querystring argument, a header value, or a part of the location url:
+
+```nginx
+  location = /sub_by_ip {
+    #channel id is the subscriber's IP address
+    nchan_subscriber;
+    nchan_channel_id $remote_addr;
+  }
+  
+  location /sub_by_querystring {
+    #channel id is the query string parameter chanid
+    # GET /sub/sub_by_querystring?foo=bar&chanid=baz will have the channel id set to 'baz'
+    nchan_subscriber;
+    nchan_channel_id $arg_chanid;
+  }
+
+  location ~ /sub/(\w+)$ {
+    #channel id is the word after /sub/
+    # GET /sub/foobar_baz will have the channel id set to 'foobar_baz'
+    # I hope you know your regular expressions...
+    nchan_subscriber;
+    nchan_channel_id $1; #first capture of the location match
+  }
+```
+
+#### Channel Multiplexing
+
+Any subscriber location can be an endpoint for up to 255 channels. Messages published to all the specified channels will be delivered in-order to the subscriber. There are two ways to enable multiplexing:
+
+Up to 7 channel ids can be specified for the `nchan_channel_id` or `nchan_channel_subscriber_id` config directive:
+
+```nginx
+  location ~ /multisub/(\w+)/(\w+)$ {
+    nchan_subscriber;
+    nchan_channel_id "$1" "$2" "common_channel";
+    #GET /multisub/foo/bar will be subscribed to:
+    # channels 'foo', 'bar', and 'common_channel',
+    #and will receive messages from all of the above.
+  }
+```
+
+For more than 7 channels, `nchan_channel_id_split_delimiter` can be used to split the `nchan_channel_id` or `nchan_channel_subscriber_id` into up to 255 individual channel ids:
+
+```nginx
+  location ~ /multisub-split/(.*)$ {
+    nchan_subscriber;
+    nchan_channel_id "$1";
+    nchan_channel_id_split_delimiter ",";
+    #GET /multisub-split/foo,bar,baz,a will be subscribed to:
+    # channels 'foo', 'bar', 'baz', and 'a'
+    #and will receive messages from all of the above.
+  }
+```
+
+`DELETE` requests on any channel are forwarded to relevant multi-channel subscribers, and their connections are terminated.
+
+Publishing to multiple channels with a single request is also possible, with similar configuration:
+
+```nginx
+  location ~ /multipub/(\w+)/(\w+)$ {
+    nchan_publisher;
+    nchan_channel_id "$1" "$2" "another_channel";
+  }
+```
+## Storage
+
+Nchan can stores messages in memory, on disk, or via Redis. Memory storage is much faster, whereas Redis has additional overhead as is considerably slower for publishing messages, but offers near unlimited scalability for broadcast use cases with far more subscribers than publishers.
+
+### Memory Storage
+
+This storage method uses a segment of shared memory to store messages and channel data. Large messages as determined by Nginx's caching layer are stored on-disk. The size of the memory segment is configured with `nchan_max_reserved_memory`. Data stored here is not persistent, and is lost if Nginx is restarted or reloaded.
+
+### Redis
+
+Nchan can also store messages and channels on a Redis server, or in a Redis cluster. To use a Redis server, set `nchan_use_redis on;` and set the server url with `nchan_redis_url`. These two settings are inheritable by nested locations, so it is enough to set them within an `http { }` block to enable Redis for all Nchan locations in that block. Different locations can also use different Redis servers.
+
+To use a Redis Cluster, the Redis servers acting as cluster nodes need to be configured in an `upstream { }` block:
+
+```nginx
+  upstream redis_cluster {
+    nchan_redis_server redis://127.0.0.1:7000;
+    nchan_redis_server redis://127.0.0.1:7001;
+    nchan_redis_server redis://127.0.0.1:7002;
+  }
+```
+
+It is best to specify all master cluster nodes, but this is not required -- as long as Nchan can connect to at least 1 node, it will discover and connect to the whole cluster.
+
+To use Redis Cluster in an Nchan location, use the `nchan_redis_pass` setting:
+
+```nginx
+  location ~ /pubsub/(\w+)$ {
+    nchan_channel_id $1;
+    nchan_pubsub;
+    nchan_redis_pass redis_cluster;
+  }
+
+```
+
+Note that `nchan_redis_pass` implies `nchan_use_redis on;`, and that this setting is *not* inherited by nested locations.
+
+When connecting several Nchan servers to the same Redis server (or cluster), the servers **must have their times synced up**. Failure to do so may result in missing and duplicated messages.
+
+## Variables
+
+Nchan makes several variables usabled in the config file:
+ 
+- `$nchan_channel_id`  
+  The channel id extracted from a publisher or subscriber location request. For multiplexed locations, this is the first channel id in the list.
+
+- `$nchan_channel_id1`, `$nchan_channel_id2`, `$nchan_channel_id3`, `$nchan_channel_id4`  
+  As above, but for the nth channel id in multiplexed channels.
+
+- `$nchan_subscriber_type`  
+  For subscriber locations, this variable is set to the subscriber type (websocket, longpoll, etc.).
+
+- `$nchan_publisher_type`  
+  For subscriber locations, this variable is set to the subscriber type (http or websocket).
+  
+- `$nchan_prev_message_id`, `$nchan_message_id`
+  The current and previous (if applicable) message id for publisher request or subscriber response.
+
+- `$nchan_channel_event`
+  For channel events, this is the event name. Useful when configuring `nchan_channel_event_string`.
+  
+Additionally, `nchan_stub_status` data is also exposed as variables. These are available only when `nchan_stub_status` is enabled on at least one location:
+
+- `$nchan_stub_status_total_published_messages`  
+- `$nchan_stub_status_stored_messages`  
+- `$nchan_stub_status_shared_memory_used`  
+- `$nchan_stub_status_channels`  
+- `$nchan_stub_status_subscribers`  
+- `$nchan_stub_status_redis_pending_commands`  
+- `$nchan_stub_status_redis_connected_servers`  
+- `$nchan_stub_status_total_ipc_alerts_received`  
+- `$nchan_stub_status_ipc_queued_alerts`  
+- `$nchan_stub_status_total_ipc_send_delay`  
+- `$nchan_stub_status_total_ipc_receive_delay`  
+
+
+## Configuration Directives
+
+- **nchan_channel_id**  
+  arguments: 1 - 7  
+  default: `(none)`  
+  context: server, location, if  
+  > Channel id for a publisher or subscriber location. Can have up to 4 values to subscribe to up to 4 channels.    
+
+- **nchan_channel_id_split_delimiter**  
+  arguments: 1  
+  default: `(none)`  
+  context: server, location, if  
+  > Split the channel id into several ids for multiplexing using the delimiter string provided.    
+
+- **nchan_eventsource_event**  
+  arguments: 1  
+  default: `(none)`  
+  context: server, location, if  
+  > Set the EventSource `event:` line to this value. When used in a publisher location, overrides the published message's `X-EventSource-Event` header and associates the message with the given value. When used in a subscriber location, overrides all messages' associated `event:` string with the given value.    
+
+- **nchan_longpoll_multipart_response** `[ off | on | raw ]`  
+  arguments: 1  
+  default: `off`  
+  context: server, location, if  
+  > when set to 'on', enable sending multiple messages in a single longpoll response, separated using the multipart/mixed content-type scheme. If there is only one available message in response to a long-poll request, it is sent unmodified. This is useful for high-latency long-polling connections as a way to minimize round-trips to the server. When set to 'raw', sends multiple messages using the http-raw-stream message separator.    
+
+- **nchan_publisher** `[ http | websocket ]`  
+  arguments: 0 - 2  
+  default: `http websocket`  
+  context: server, location, if  
+  legacy name: push_publisher  
+  > Defines a server or location as a publisher endpoint. Requests to a publisher location are treated as messages to be sent to subscribers. See the protocol documentation for a detailed description.    
+
+- **nchan_publisher_channel_id**  
+  arguments: 1 - 7  
+  default: `(none)`  
+  context: server, location, if  
+  > Channel id for publisher location.    
+
+- **nchan_publisher_upstream_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.    
+  > The upstream response code determine how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.    
+
+- **nchan_pubsub** `[ http | websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
+  arguments: 0 - 6  
+  default: `http websocket eventsource longpoll chunked multipart-mixed`  
+  context: server, location, if  
+  > Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server.    
+
+- **nchan_subscriber** `[ websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
+  arguments: 0 - 5  
+  default: `websocket eventsource longpoll chunked multipart-mixed`  
+  context: server, location, if  
+  legacy name: push_subscriber  
+  > Defines a server or location as a channel subscriber endpoint. This location represents a subscriber's interface to a channel's message queue. The queue is traversed automatically, starting at the position defined by the `nchan_subscriber_first_message` setting.    
+  >  The value is a list of permitted subscriber types.    
+
+- **nchan_subscriber_channel_id**  
+  arguments: 1 - 7  
+  default: `(none)`  
+  context: server, location, if  
+  > Channel id for subscriber location. Can have up to 4 values to subscribe to up to 4 channels.    
+
+- **nchan_subscriber_compound_etag_message_id**  
+  arguments: 1  
+  default: `off`  
+  context: server, location, if  
+  > Override the default behavior of using both `Last-Modified` and `Etag` headers for the message id.    
+  > Enabling this option packs the entire message id into the `Etag` header, and discards  
+  > `Last-Modified` and `If-Modified-Since` headers.    
+
+- **nchan_subscriber_first_message** `[ oldest | newest | <number> ]`  
+  arguments: 1  
+  default: `oldest`  
+  context: server, location, if  
+  > Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` start at `n`th from now). 0 is equivalent to 'newest'.    
+
+- **nchan_subscriber_http_raw_stream_separator** `<string>`  
+  arguments: 1  
+  default: `\n`  
+  context: server, location, if  
+  > Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character.    
+
+- **nchan_subscriber_last_message_id**  
+  arguments: 1 - 5  
+  default: `$http_last_event_id $arg_last_event_id`  
+  context: server, location, if  
+  > If `If-Modified-Since` and `If-None-Match` headers are absent, set the message id to the first non-empty of these values. Used primarily as a workaround for the inability to set the first `Last-Message-Id` of a web browser's EventSource object.     
+
+- **nchan_subscriber_message_id_custom_etag_header**  
+  arguments: 1  
+  default: `(none)`  
+  context: server, location, if  
+  > Use a custom header instead of the Etag header for message ID in subscriber responses. This setting is a hack, useful when behind a caching proxy such as Cloudflare that under some conditions (like using gzip encoding) swallow the Etag header.    
+
+- **nchan_subscriber_timeout** `<number> (seconds)`  
+  arguments: 1  
+  default: `0 (none)`  
+  context: http, server, location, if  
+  legacy name: push_subscriber_timeout  
+  > Maximum time a subscriber may wait for a message before being disconnected. If you don't want a subscriber's connection to timeout, set this to 0. When possible, the subscriber will get a response with a `408 Request Timeout` status; otherwise the subscriber will simply be disconnected.    
+
+- **nchan_websocket_ping_interval** `<number> (seconds)`  
+  arguments: 1  
+  default: `0 (none)`  
+  context: server, location, if  
+  > Interval for sending websocket ping frames. Disabled by default.    
+
+- **nchan_authorize_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it.    
+
+- **nchan_max_reserved_memory** `<size>`  
+  arguments: 1  
+  default: `32M`  
+  context: http  
+  legacy name: push_max_reserved_memory  
+  > The size of the shared memory chunk this module will use for message queuing and buffering.    
+
+- **nchan_message_buffer_length** `<number>`  
+  arguments: 1  
+  default: `10`  
+  context: http, server, location  
+  legacy names: push_max_message_buffer_length, push_message_buffer_length  
+  > Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages.    
+
+- **nchan_message_timeout** `<time>`  
+  arguments: 1  
+  default: `1h`  
+  context: http, server, location  
+  legacy name: push_message_timeout  
+  > Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Applicable only if a nchan_publisher is present in this or a child context.    
+
+- **nchan_redis_idle_channel_cache_timeout** `<time>`  
+  arguments: 1  
+  default: `30s`  
+  context: http, server, location  
+  > A Redis-stored channel and its messages are removed from memory (local cache) after this timeout, provided there are no local subscribers.    
+
+- **nchan_redis_pass**  
+  arguments: 1  
+  context: http, server, location  
+  > Use an upstream config block for Redis servers.    
+
+- **nchan_redis_ping_interval**  
+  arguments: 1  
+  default: `4m`  
+  context: http, server, location  
+  > Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable.    
+
+- **nchan_redis_server**  
+  arguments: 1  
+  context: upstream  
+  > Used in upstream { } blocks to set redis servers.    
+
+- **nchan_redis_url**  
+  arguments: 1  
+  default: `127.0.0.1:6379`  
+  context: http, server, location  
+  > The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.    
+
+- **nchan_store_messages** `[ on | off ]`  
+  arguments: 1  
+  default: `on`  
+  context: http, server, location, if  
+  legacy name: push_store_messages  
+  > Publisher configuration. "`off`" is equivalent to setting `nchan_message_buffer_length 0`, which disables the buffering of old messages. Using this setting is not recommended when publishing very quickly, as it may result in missed messages.    
+
+- **nchan_use_redis** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: http, server, location  
+  > Use redis for message storage at this location.    
+
+- **nchan_access_control_allow_origin** `<string>`  
+  arguments: 1  
+  default: `*`  
+  context: http, server, location  
+  > Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the publisher or subscriber request's `Origin` header does not match this value, respond with a `403 Forbidden`.    
+
+- **nchan_channel_group** `<string>`  
+  arguments: 1  
+  default: `(none)`  
+  context: server, location, if  
+  legacy name: push_channel_group  
+  > Because settings are bound to locations and not individual channels, it is useful to be able to have channels that can be reached only from some locations and never others. That's where this setting comes in. Think of it as a prefix string for the channel id.    
+
+- **nchan_subscribe_existing_channels_only** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: http, server, location  
+  legacy name: push_authorized_channels_only  
+  > Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response.    
+
+- **nchan_channel_event_string** `<string>`  
+  arguments: 1  
+  default: `$nchan_channel_event $nchan_channel_id`  
+  context: server, location, if  
+  > Contents of channel event message    
+
+- **nchan_channel_events_channel_id**  
+  arguments: 1  
+  context: server, location, if  
+  > Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'.    
+
+- **nchan_stub_status**  
+  arguments: 0  
+  context: location  
+  > Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc.    
+
+- **nchan_max_channel_id_length** `<number>`  
+  arguments: 1  
+  default: `512`  
+  context: http, server, location  
+  legacy name: push_max_channel_id_length  
+  > Maximum permissible channel id length (number of characters). Longer ids will be truncated.    
+
+- **nchan_max_channel_subscribers** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: http, server, location  
+  legacy name: push_max_channel_subscribers  
+  > Maximum concurrent subscribers.    
+
+- **nchan_channel_timeout**  
+  arguments: 1  
+  context: http, server, location  
+  legacy name: push_channel_timeout  
+  > Amount of time an empty channel hangs around. Don't mess with this setting unless you know what you are doing!    
+
+- **nchan_storage_engine** `[ memory | redis ]`  
+  arguments: 1  
+  default: `memory`  
+  context: http, server, location  
+  > Development directive to completely replace default storage engine. Don't use unless you are an Nchan developer.    
+
+## Contribute
+Please support this project with a donation to keep me warm through the winter. I accept bitcoin at 15dLBzRS4HLRwCCVjx4emYkxXcyAPmGxM3 . Other donation methods can be found at https://nchan.slact.net
diff --git a/debian/modules/nchan/changelog.txt b/debian/modules/nchan/changelog.txt
new file mode 100644
index 0000000..0a6bbcb
--- /dev/null
+++ b/debian/modules/nchan/changelog.txt
@@ -0,0 +1,265 @@
+1.0.2 (Aug. 29 2016)
+ fix: more informative missed-message warnings
+ fix: invalid memory access when Redis enabled without setting server URL
+ fix: incomplete redis channel deletion
+ fix: Redis command responses may not be processed after large message
+      until next command
+ feature: catch up with missed messages after reconnecting to Redis cluster
+ fix: possible invalid memory access after disconnecting from Redis cluster
+ fix: Redis-stored unbuffered messages may not be delivered
+ fix: possible invalid memory access when using previously idling channels
+ fix: invalid memory access if publisher POST request's connection terminates
+      before receiving response
+ fix: messages published rapidly to Redis via different Ncnan servers may
+      be received out of order
+ fix: possible stack overflow when receiving messages through Redis
+      for multiplexed channels
+ fix: channels with 'nchan_store_messages off' published 1 message per second
+ fix: issue warning when out-of-order published message is detected
+ fix: Redis cluster compatibility with channel ids containing '}' character
+ fix: Redis-stored channel deleted too quickly when publishing short-lived messages
+1.0.1 (Aug. 22 2016)
+ feature: nchan_stub_status shared memory accounting
+ fix: various compiler warnings
+1.0.0 (Aug. 20 2016)
+ fix: incorrectly repeated subscriber_enqueue channel events
+ fix: badly handled Redis messages with TTL < 1 (again)
+ fix: websocket didn't close connection on PING fail
+ feature: nchan_stub_status stats location
+ fix: bad memory access for Redis channels when unsubscribing and very busy
+ optimize: SSE2 & AVX2 optimizations for websocket frame unmasking
+ feature: Redis Cluster support
+ (WARNING:) data in Redis from previous versions will be inaccessible
+ feature: different locations can use different Redis servers
+ feature: nchan_subscriber_first_message can take a number (positive or negative) 
+      for nth message (from first or last)
+ feature: expire Redis-stored idle channels with nchan_redis_idle_channel_cache_timeout
+ fix: some multiplexed channels never garbage-collected when inactive
+ fix: unbuffered message garbage collector was too lazy
+ fix: update nchan_message_buffer_length correctly when using Redis (thanks @supertong)
+ fix: incorrect handling of missing/expired messages in multiplexed channels
+ fix: memory leak when publishing via Websocket on a pubsub location
+ fix: multiplexed channel DELETE when using Redis handled incorrectly
+ fix: rare Redis script error when publishing message
+ fix: Redis connection ping infinite loop when reloading
+ fix: crash if Redis message TTL less than 1 sec
+ fix: message delivery occasionally stopped when using Redis 
+      and rapidly publishing messages
+ fix: logpoll-multipart sometimes failed to respond when using Redis 
+      and rapidly publishing messages
+ fix: don't crash if Redis server is busy loading data
+0.99.16 (Jun 10 2016)
+ fix: invalid memory access when upstream subscriber authorize request failed
+ fix: longpoll-multipart subscriber was managed incorrectly on channel deletion
+ fix: subscribers may not receive messages after Redis reconnection
+0.99.15 (May 31 2016)
+ feature: Redis client keepalive configurable with nchan_redis_ping_interval
+ feature: try to reconnect to Redis after lost connection to Redis
+ fix: invalid memory access after lost connection to Redis
+ fix: use-after-free error if subscriber disconnects before response 
+      from upstream authorize server (thanks Filip Jenicek)
+ fix: corrupt longpoll-multipart boundary data with long messages
+ feature: 'raw' mode for longpoll-multipart
+ feature: http-raw-stream client, like Push Stream Module's 'stream' mode
+ fix: incomplete longpoll-multipart response when using Redis
+ fix: "subrequests cycle" error for websocket publisher for nginx > 1.9.4
+ fix: nchan_channel_id_split_delimiter inheritance
+ fix: subscriber memory leak from 0.99.8
+ fix: reload crash from 0.99.14
+0.99.14 (May 4 2016)
+ fix: trailing NULL character in Publisher response content-type for json, xml, and yaml
+ fix: don't crash when out of shared memory
+ fix: invalid memory access when using nchan_publisher_upstream_request with websocket 
+ fix: incorrect stored messages count when using Redis store
+ fix: incorrect last_message_id on publisher GETs (memstore and Redis)
+ fix: incorrect behavior when subscribing right after startup before all workers are ready
+ fix: some internal event loop timers were not being canceled, leading to slow shutdown
+ fix: resuming some subscribers with valid message ids didn't work when using Redis store
+ fix: possible invalid memory access when restarting Nginx after using multiplexed channels
+ fix: accept url-encoded message ids
+ feature: add ws+meta.nchan websocket subprotocol that include message metadata
+ fix: all requests after X-Accel-Redirect from upstream were treated as GETs
+0.99.13 (Apr. 20 2016)
+ fix: invalid content-length for nchan_authorize_request publisher requests
+ fix: "subrequests cycle" error after 200 websocket publish requests
+ fix: zero-size buf warning when publishing empty messages via websocket
+ fix: nchan_max_channel_subscribers was ignored
+ fix: use a blocking Redis connection for commands during shutdown to ensure commands are sent
+ fix: better TTL handling for Redis keys
+0.99.12 (Apr. 10 2016)
+ fix: SPDY compatibility with EventSource and multipart/mixed subscribers
+ fix: warnings when shutting down Redis storage
+ feature: use system's hiredis library if present
+ fix: incorrect handling of missing messages when publishing to Redis
+0.99.11 (Apr. 3 2016)
+ feature: nchan can be built as a dynamic module (for nginx >= 1.9.11)
+0.99.10 (Apr. 2 2016)
+ fix: messages not freed until expired after being deleted from channel
+ fix: buffering and output issues for large messages
+ update: hiredis updated to v0.13.3
+ fix: Redis publishing and subscribing memory leaks
+ optimize: per-channel Redis subscriber counts batched into 100-ms intervals
+    to prevent Redis roundtrip floods
+ fix: Redis subscriber memory leak
+ refactor: extracted shared subscriber and message store logic
+ fix: use-after-free error for Redis channels without subscribers
+ fix: channel readying logic sometimes got confused and tripped up assert()s
+ fix: even more proper handling of websocket close frames
+ change: 408 Request Timeout instead of 304 No Content status code for timed out subscribers
+0.99.8 (Mar. 13 2016)
+ fix: multipart/mixed subscriber output issues
+ fix: memory leak for multiplexed > 4 channels
+ fix: invalid memory access for aborted subscriber connection with Redis
+      and nchan_subscribe_existing_channels_only
+ fix: accept websocket binary data frames
+ fix: proper handling of websocket close frames
+ fix: incorrect expire calculation for cached Redis-stored messages
+ fix: double free for multiplexed >4 websocket subs
+0.99.7 (Mar. 10 2016)
+ fix: websocket infinite ping loop after reload
+ feature: nchan_subscriber_message_id_custom_etag_header for misbehaving proxies that eat etags
+ fix: 100% cpu after lost Redis connection
+ fix: refined CORS cross-origin access control headers and logic
+ fix: longpoll subscriber in multipart mode didn't output all messages
+ fix: longpoll subscriber in multipart mode could access invalid memory
+ fix: compatibility with supported Redis versions < 2.8.14
+ fix: nchan_message_timeout 0 should not expire messages
+0.99.6 (Feb. 22 2016)
+ fix: SIGHUP reloading under load
+0.99.5 (Feb 15 2016)
+ fix: publishing with client_body_in_file_only enabled
+0.99.4 (Feb 12 2016)
+ fix: invalid memory access in channel DELETE response
+ fix: race condition in IPC during channel creation (thanks vtslothy)
+0.99.3 (Feb 10 2016)
+ fix: SIGHUP reloading
+ fix: startup with insufficient file descriptors shouldn't crash
+ fix: longpoll-multipart failure to immediately respond
+ fix: longpoll-multipart abort handling
+ fix: Redis-store cached message timeouts
+ fix: Redis connection-lost handling
+ fix: startup with 'master_process off' (single-process mode)
+ feature: EventSource 'event:' line support with custom header or config
+0.98 (Jan 21 2016)
+ feature: publish to multiple channels with one request
+ feature: nchan_longpoll_multipart_response config setting
+ fix: large message (in-file) handling for multipart/mixed and chunked subscribers
+ fix: 400 Bad Request error on 32-bit systems
+ fix: memory allocation error for >8 multi-channel subscribers
+0.97 (Jan 5 2016) 
+ fix: build issues with debian
+ fix: compatibility with nginx versions down to 1.0.15
+ fix: publishing bug introduced in 0.96
+0.961 (Jan 4 2016)
+ fix: compiler warning
+0.96 (Jan 1. 2016)
+ feature: websocket ping with nchan_websocket_ping_interval
+ fix: unsafe memory access for Redis publisher
+ feature: nchan_publisher_upstream_request
+ fix: http/2 compatibility for EventSource and multipart/mixed
+ fix: nchan_authorize_request for publisher location endpoints
+ fix: publishing long (stored in file) messages to Redis-store
+0.95 (Dec. 24 2015)
+ feature: configurable nchan_access_control_origin_header, default to *
+ fix: recognize non-preflighted CORS requests
+ fix: Redis invalid memory access after timeout
+0.94 (Dec. 22 2015)
+ feature: last mesage id in channel info response
+ feature: subscribe up to 255 channel ids using nchan_channel_id_split_delimiter
+ fix: tried connecting to Redis when not needed
+ change: "last requested" no longer has a -1 value for 'never requested'.
+ fix: "last requested" in channel info sometimes not updated
+ fix: deleting empty channels
+ change: more compact message ids
+0.931 (Dec. 14 2015)
+ optimize: inter-process internal subscriber fetched too many messages
+0.93 (Dec. 12 2015)
+ feature: optionally only use Etag for subscriber message id
+ feature: optionally get requested message id from variable config
+0.92 (Dec. 11 2015)
+ feature: HTTP multipart/mixed subscriber
+ fix: EventSource bad memory access on disconnect
+ feature: HTTP chunked encoding subscriber
+ fix: resolved some strict compiler warnings
+ fix: more stringent out-of-memory detection during response output. thanks @woodyhymns
+ fix: less-than-optimal cache filename handling. thanks @ZhouBox
+ fix: incorrect EventSource charset in header. thanks @eschultz
+ fix: segfault when websocket publishes message and immediately disconnects
+ fix: Duplicate "Connection: Upgrade" header for websocket handshake. thanks @eschultz 
+0.904 (Dec. 7 2015)
+ fix: more flexible Websocket handshake for "Connection" header. thanks @eschultz
+ fix: out-of-memory safety check. thanks @woodyhymns
+0.903 (Dec 3 2015)
+ fix: better Redis engine connection initializer
+ change: simpler message buffer settings
+ fix: more backwards-compatibility for pushmodule config settings
+0.9 (Dec. 2 2015) - first beta pre-release tag after rebranding as Nchan
+ feature: meta channel events: track when subscribers connect and disconnect, and when messages are
+          published, with configurable event strings
+ feature: request authorization: send upstream request before publishing or subscribing.
+          works just like the auth_request module.
+ feature: channel multiplexing. up to 4 channels can be subscribed to from a single location
+ fix: channel ids were not set within if statements in the nginx config
+ feature: hybrid memstore + Redis storage. local caching + distributed message publishing, the best
+          of both worlds. (still slower than pure memstore though)
+ feature: pubsub locations, optional separate publisher and subscriber channel ids per location
+ feature: websocket publisher support
+ name change: we're nchan now. code renamed, and cleaned up. config options are backwards-compatible.
+ feature: websocket subscriber support
+ huge refactor: completely new in-memory storage engine. No more global lock.
+    Actually, no more locks at all!
+ feature: Redis storage engine. 
+0.73 (Sep. 2 2014)
+ fix: turning on gzip cleared Etag subscriber response header
+ fix: channels incorrectly deleted when overwhelmed with connections
+ feature: CORS support via OPTIONS request method response
+ fix: file descriptor leak when restarting nginx via SIGHUP
+ improve: concurrency for interprocess notifications
+ refactor: completely encapsulated message store
+ fix: slow memory leak introduced in 0.7
+ fix: memory leak when not using message buffer
+0.712 (Mar. 21 2014)
+ fix: intermittently dropped long-polling connections on internal redirects
+ fix: unable to proxy long-polling subscribers. (thanks wandenberg and sanmai)
+0.711 (Mar. 13 2014)
+ fix: incompatibility with cache manager (proxy_cache and fastcgi_cache directives)
+0.71 (Mar. 1 2014)
+ fix: removed unused variables and functions to quiet down GCC
+0.7: (Feb. 20 2014)
+ fix: last-in concurrency setting wasn't working reliably
+ refactor: partially separated message storage. add a test harness.
+ fix: segfault from concurrency bug while garbage-collecting channels
+ fix: some large messages got lost
+0.692 (Feb. 3 2010)
+ fix: error log reported failed close() for some publisher requests with large messages
+ fix: occasional memory leak during message deletion
+ fix: worker messages intended for dead worker processes were not deleted
+0.691 (Feb. 2 2010)
+ fix: server reload (via SIGHUP signal) was failing
+ fix: segfault on messages longer than client_body_buffer_size (thanks wfelipe)
+ change: removed push_min_message_recipients, added push_delete_oldest_received_message
+0.69 (Nov. 17 2009)
+ fix: publisher got a 201 Created response even if the channel had no subscribers at the time (should be 202 Accepted)
+ fix: small memory leak after each message broadcast to a channel
+ feature: optional push_max_channel_subscribers setting added
+ fix: first-in concurrency setting wasn't responding to subscribers with a correct status code on conflict
+ fix: reused subscriber connections sometimes failed to receive messages
+ unfeature: no more nginx 0.6 support. not worth the hassle.
+0.683 (Nov. 10 2009)
+ change: default max. reserved memory size changed form 16MB to 32 MB
+ change: unused node garbage collection made a little more aggressive (max. 3 unused channels per channel search instead of 1)
+ fix: unused nodes were deleted only on channel id hash collision (very rare)
+ fix: segmentation fault from allocating insufficient memory for interprocess messaging
+0.681 (Nov. 6 2009)
+ feature: added push_message_buffer_length setting, which sets push_message_max_buffer_length and push_message_min_buffer_length at once.
+ fix: publisher channel info text/json response now uses double quotes instead of single.
+ fix: interprocess messages were not removed from shared memory correctly, causing weird errors
+0.68 (Nov. 5 2009)
+ change: default push_subscriber_concurrency value is now "broadcast"
+ fix: incorrect error messages for invalid push_pubscriber and push_subscriber_concurrency settings
+ change: removed deprecated push_buffer_size and push_queue_messages settings
+ feature: rudimentary content-type negotiation for publisher channel info response.
+   support text/plain, text/json, text/yaml and application/xml (and mimetype equivalents)
+ fix: publisher GET response has HTTP status 0
+0.67beta (Nov. 4 2009) and older
+ see git repository
diff --git a/debian/modules/nchan/cloc-exclude.txt b/debian/modules/nchan/cloc-exclude.txt
new file mode 100644
index 0000000..c72f372
--- /dev/null
+++ b/debian/modules/nchan/cloc-exclude.txt
@@ -0,0 +1,17 @@
+src/uthash.h
+src/hiredis
+src/store/redis/cmp.*
+src/nginx-source
+dev/package
+dev/nginx-nchan/*.patch
+dev/nginx-nchan/pkg
+dev/nginx-nchan/src
+dev/nginx-nchan/*.txt
+dev/nginx-nchan/nginx.conf
+dev/nginx-nchan/nginx.logrotate
+dev/nginx-nchan/*.tar
+dev/nginx-nchan/*.gz
+dev/clang-analyzer
+dev/package
+dev/src
+
diff --git a/debian/modules/nchan/config b/debian/modules/nchan/config
new file mode 100644
index 0000000..c6e4db2
--- /dev/null
+++ b/debian/modules/nchan/config
@@ -0,0 +1,104 @@
+ngx_addon_name=ngx_nchan_module
+
+#do we have hiredis on the platform?
+ngx_feature="hiredis"
+ngx_feature_run=yes
+ngx_feature_incs="#include <hiredis/hiredis.h>"
+ngx_feature_test="if(HIREDIS_SONAME < 0.13) { return 1; }"
+ngx_feature_libs="-lhiredis"
+. auto/feature
+if [ $ngx_found = no ]; then
+  _NCHAN_HIREDIS_SRCS="\
+    ${ngx_addon_dir}/src/hiredis/hiredis.c \
+    ${ngx_addon_dir}/src/hiredis/read.c \
+    ${ngx_addon_dir}/src/hiredis/async.c \
+    ${ngx_addon_dir}/src/hiredis/sds.c \
+    ${ngx_addon_dir}/src/hiredis/net.c \
+  "
+  ngx_feature_libs=""
+else
+  _NCHAN_HIREDIS_SRCS=""
+fi
+
+
+_NCHAN_SUBSCRIBERS_SRCS="\
+  ${ngx_addon_dir}/src/subscribers/common.c \
+  ${ngx_addon_dir}/src/subscribers/longpoll.c \
+  ${ngx_addon_dir}/src/subscribers/intervalpoll.c \
+  ${ngx_addon_dir}/src/subscribers/eventsource.c \
+  ${ngx_addon_dir}/src/subscribers/http-chunked.c \
+  ${ngx_addon_dir}/src/subscribers/http-multipart-mixed.c \
+  ${ngx_addon_dir}/src/subscribers/http-raw-stream.c \
+  ${ngx_addon_dir}/src/subscribers/websocket.c \
+  ${ngx_addon_dir}/src/nchan_websocket_publisher.c \
+  ${ngx_addon_dir}/src/subscribers/internal.c \
+  ${ngx_addon_dir}/src/subscribers/memstore_ipc.c \
+  ${ngx_addon_dir}/src/subscribers/memstore_multi.c \
+  ${ngx_addon_dir}/src/subscribers/memstore_redis.c \
+"
+
+_NCHAN_REDIS_STORE_SRCS="\
+  ${_NCHAN_HIREDIS_SRCS} \
+  ${ngx_addon_dir}/src/store/redis/cmp.c \
+  ${ngx_addon_dir}/src/store/redis/cluster.c \
+  ${ngx_addon_dir}/src/store/redis/rdsstore.c \
+  ${ngx_addon_dir}/src/store/redis/redis_nginx_adapter.c \
+"
+_NCHAN_MEMORY_STORE_SRCS="\
+  ${ngx_addon_dir}/src/store/memory/ipc.c \
+  ${ngx_addon_dir}/src/store/memory/ipc-handlers.c \
+  ${ngx_addon_dir}/src/store/memory/memstore.c \
+"
+
+_nchan_util_dir="${ngx_addon_dir}/src/util"
+_NCHAN_UTIL_SRCS=" \
+  $_nchan_util_dir/nchan_list.c \
+  $_nchan_util_dir/ngx_nchan_hacked_slab.c \
+  $_nchan_util_dir/shmem.c \
+  $_nchan_util_dir/nchan_rbtree.c \
+  $_nchan_util_dir/nchan_reuse_queue.c \
+  $_nchan_util_dir/nchan_output.c \
+  $_nchan_util_dir/nchan_util.c \
+  $_nchan_util_dir/nchan_bufchainpool.c \
+  $_nchan_util_dir/nchan_channel_id.c \
+  $_nchan_util_dir/nchan_channel_info.c \
+  $_nchan_util_dir/nchan_msgid.c \
+  $_nchan_util_dir/nchan_thingcache.c \
+  $_nchan_util_dir/nchan_reaper.c \
+  $_nchan_util_dir/nchan_subrequest.c \
+"
+
+_NCHAN_STORE_SRCS="\
+  ${ngx_addon_dir}/src/store/spool.c \
+  ${ngx_addon_dir}/src/store/ngx_rwlock.c \
+  ${ngx_addon_dir}/src/store/store_common.c \
+  $_NCHAN_REDIS_STORE_SRCS \
+  $_NCHAN_MEMORY_STORE_SRCS \
+"
+
+_NCHAN_SRCS="\
+  $_NCHAN_UTIL_SRCS \
+  $_NCHAN_SUBSCRIBERS_SRCS \
+  $_NCHAN_STORE_SRCS \
+  ${ngx_addon_dir}/src/nchan_defs.c \
+  ${ngx_addon_dir}/src/nchan_variables.c \
+  ${ngx_addon_dir}/src/nchan_module.c \
+"
+
+
+ngx_module_incs=$ngx_addon_dir/src
+
+have=NGX_HTTP_HEADERS . auto/have
+
+if test -n "$ngx_module_link"; then
+  ngx_module_type=HTTP
+  ngx_module_name=$ngx_addon_name
+  ngx_module_srcs="$_NCHAN_SRCS"
+  ngx_module_libs=$ngx_feature_libs
+  . auto/module
+else
+  NGX_ADDON_SRCS="$NGX_ADDON_SRCS $_NCHAN_SRCS"
+  CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+  CORE_INCS="$CORE_INCS $ngx_module_incs"
+  HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
+fi
diff --git a/debian/modules/nginx-http-push/tests/.gitignore b/debian/modules/nchan/dev/.gitignore
similarity index 90%
rename from debian/modules/nginx-http-push/tests/.gitignore
rename to debian/modules/nchan/dev/.gitignore
index 0f672e0..e8cee91 100644
--- a/debian/modules/nginx-http-push/tests/.gitignore
+++ b/debian/modules/nchan/dev/.gitignore
@@ -3,3 +3,4 @@ clang-analyzer/*
 .nginx.thisrun.conf
 Gemfile.lock
 errors*.log
+vgcore.*
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/Gemfile b/debian/modules/nchan/dev/Gemfile
new file mode 100644
index 0000000..dc1b8dd
--- /dev/null
+++ b/debian/modules/nchan/dev/Gemfile
@@ -0,0 +1,28 @@
+#!/usr/bin/ruby
+source 'https://rubygems.org'
+gem 'rack'
+gem 'typhoeus'
+gem 'json'
+gem 'nokogiri'
+gem 'pry'
+gem 'pry-debundle'
+gem 'pry-rescue'
+gem 'celluloid'
+gem 'celluloid-io'
+gem 'websocket'
+gem 'websocket-native'
+gem 'http_parser.rb'
+gem 'http-2', :github => "slact/http-2"
+
+gem 'reel', :github => "celluloid/reel"
+gem 'reel-rack', :github => "slact/reel-rack"
+
+gem "memory_profiler", :github => "slact/memory_profiler"
+
+gem 'minitest'
+gem 'minitest-reporters'
+
+
+gem 'fpm', :github => "slact/fpm"
+
+gem 'hsss'
diff --git a/debian/modules/nchan/dev/authserver.rb b/debian/modules/nchan/dev/authserver.rb
new file mode 100755
index 0000000..0dde4ed
--- /dev/null
+++ b/debian/modules/nchan/dev/authserver.rb
@@ -0,0 +1,62 @@
+#!/bin/ruby
+require "pry"
+require 'celluloid/current'
+require 'celluloid/logger'
+require "rack"
+require "reel/rack/cli"
+require 'reel/rack'
+require "optparse"
+
+class AuthServer
+  if __FILE__ != $PROGRAM_NAME then
+    include Celluloid::IO
+  end
+  attr_accessor :app
+  def initialize(opt={})
+    @opt = opt || {}
+    @opt[:Port] ||= 8053
+    
+    @app = proc do |env|
+      resp = []
+      headers = {}
+      code = 200
+      body = env["rack.input"].read
+      
+      pp env if @opt[:verbose]
+      
+      case env["REQUEST_PATH"] || env["PATH_INFO"]
+      when "/accel_redirect"  
+        chid="foo"
+        headers["X-Accel-Redirect"]="/sub/internal/#{chid}"
+        headers["X-Accel-Buffering"] = "no"
+      when "/auth"
+        #meh
+      when "/auth_fail"
+        code = 403
+      when "/pub"
+        resp << "WEE! + #{body}"
+        headers["Content-Length"]=resp.join("").length.to_s
+      end
+      
+      [ code, headers, resp ]
+    end
+  end
+  
+  def run
+    Rack::Handler::Reel.run(app, @opt)
+  end
+end
+
+
+
+if __FILE__ == $PROGRAM_NAME then
+  opt = {}
+  opt_parser=OptionParser.new do |opts|
+    opts.on("-q", "--quiet", "Be quiet!"){ opt[:quiet] = true}
+    opts.on("-v", "--verbose", "Be loud."){ opt[:verbose] = true}
+  end
+  opt_parser.parse!
+  
+  auth = AuthServer.new opt
+  auth.run
+end
diff --git a/debian/modules/nchan/dev/bench-parallel.sh b/debian/modules/nchan/dev/bench-parallel.sh
new file mode 100755
index 0000000..ec4c3db
--- /dev/null
+++ b/debian/modules/nchan/dev/bench-parallel.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+par=$1
+if [[ -z "$par" ]]; then
+  par=5
+  echo "No parallel count given. Assuming $par."
+fi
+if ! [[ $par =~ ^[0-9]+$ ]]; then
+  echo "Parallel count isn't a number." > /dev/stderr
+  exit 1
+fi
+
+for ((i = 0; i < $par; i++)); do
+
+    echo ./bench.rb ${@:2} 
+    ./bench.rb ${@:2} &
+done
+
+jobs=$(jobs -p)
+#echo "jobs are $jobs"
+killjobs() {
+  for job_pid in $jobs; do
+    kill $job_pid
+  done
+}
+
+trap killjobs SIGINT
+wait $jobs
diff --git a/debian/modules/nchan/dev/bench.rb b/debian/modules/nchan/dev/bench.rb
new file mode 100755
index 0000000..178393d
--- /dev/null
+++ b/debian/modules/nchan/dev/bench.rb
@@ -0,0 +1,178 @@
+#!/bin/ruby
+require "pry"
+require_relative "pubsub.rb"
+require "optparse"
+
+client=:longpoll
+threads = 100
+par = 100
+
+def short_id
+  SecureRandom.hex.to_i(16).to_s(36)[0..5]
+end
+
+myid = short_id
+$server="localhost:8082"
+sub_uri="/sub/broadcast/#{myid}"
+pub_uri="/pub/#{myid}"
+
+SUB_TIMEOUT = 1000
+START_MSG = "START"
+QUIT_MSG = "FIN"
+
+opt=OptionParser.new do |opts|
+  opts.on("-S", "--server SERVER (#{$server})", "server and port."){|v| $server=v}
+  opts.on("-t", "--threads NUM (#{threads})", "number of subscriber threads"){|v| threads = v.to_i}
+  opts.on("-p", "--parallel NUM (#{par})", "number of subscribers per thread"){|v| par = v.to_i}
+  opts.on("-l", "--client STRING (#{client})", "sub client"){|v| client = v.to_sym}
+  opts.on("--sub-uri STRING (#{sub_uri})", "sub uri"){|v| sub_uri = v}
+  opts.on("--pub-uri STRING (#{pub_uri})", "sub uri"){|v| pub_uri = v}
+end
+opt.banner="Usage: bench.rb [options]"
+opt.parse!
+
+def mkmsg(n=nil)
+  "#{Time.now.to_f}"
+end
+
+def url(part="")
+  part=part[1..-1] if part[0]=="/"
+  "http://#{$server}/#{part}"
+end
+
+class BenchDB
+  attr_accessor :db
+  def initialize
+    @db=[]
+  end
+  
+  def add(start_time, snd_time, rcv_time, measured_time)
+    if start_time && snd_time < start_time
+      #use measured time if possible
+      if measured_time
+        @db << measured_time
+      else
+        @db << rcv_time - start_time
+        #puts "approx time"
+      end
+    else
+      @db << rcv_time - snd_time
+      #puts "approx time"
+    end
+  end
+  
+  def analyze
+    return "no data" if @db.count == 0
+    
+    sum=0
+    @db.each{|v| sum += v}
+    "#{@db.count} entries, avg: #{sum/@db.count}"
+  end
+  
+  def to_s
+    @db.join ", "
+  end
+end
+
+
+
+def t
+  Time.now.to_f
+end
+
+Typhoeus.before do |req|
+
+  req.original_options[:start_time]=Time.now.to_f
+end
+
+class BenchSub
+  attr_accessor :sub, :benchdb, :startmsg_received, :msg_received
+  def initialize(url, parallel, client_type, benchdb)
+    self.sub = Subscriber.new url, parallel, timeout: SUB_TIMEOUT, client: client_type, nomsg: true, nostore: true
+    self.benchdb = benchdb
+    self.startmsg_received = 0
+    self.msg_received = 0
+    sub.on_failure do |resp|
+      puts "FAIL!!"
+      binding.pry
+    end
+    sub.on_message do |msg, req|
+      #puts "msg is: #{msg}"
+      if msg == START_MSG
+        self.startmsg_received +=1
+      elsif msg == QUIT_MSG
+        false
+      else
+        t_now = Time.now.to_f
+        t_msg = msg.to_f
+        if sub.client_class == Subscriber::LongPollClient
+          t_start = req.time_requested
+          measured_time = req.request_time
+        elsif sub.client_class == Subscriber::EventSourceClient
+          t_start = req.original_options[:last_msg_time] || req.original_options[:start_time]
+          measured_time = nil 
+          
+        elsif sub.client_class == Subscriber::WebSocketClient
+          t_start = req.last_message_time
+          measured_time = nil 
+        end
+        self.msg_received += 1
+        benchdb.add(t_start, t_msg, t_now, measured_time)
+      end
+    end
+    
+  end
+  def run
+    sub.run
+  end
+  
+  def wait
+    sub.wait
+  end
+end
+
+
+
+
+
+
+pub_url = url(pub_uri)
+sub_url = url(sub_uri)
+
+benchmark = BenchDB.new
+
+benches = []
+threads.times do 
+  benches << BenchSub.new(sub_url, par, client, benchmark)
+end
+
+pub = Publisher.new pub_url, nostore: true, nomsg: true, timeout: 30
+
+num_msgs = 20
+msgs = []
+
+puts "will publish #{num_msgs} messages to #{pub_url}"
+
+
+puts "subscribe to #{sub_url} & run #{threads} threads of #{par} #{client} subs"
+benches.each &:run
+
+sleep 20
+
+pub.post START_MSG
+num_msgs.times do
+  pub.post mkmsg
+end
+pub.post QUIT_MSG
+
+benches.each &:wait
+
+puts "done."
+
+benches.each do |b|
+  puts "STARTMSG received #{b.startmsg_received} times"
+  puts "MSG received #{b.msg_received} times"
+end
+
+puts benchmark.analyze
+
diff --git a/debian/modules/nchan/dev/cert-key.pem b/debian/modules/nchan/dev/cert-key.pem
new file mode 100644
index 0000000..4bcf675
--- /dev/null
+++ b/debian/modules/nchan/dev/cert-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCWRtFsEEwp6eUH
+vnaaxxuYooIiCRP0Jw6217aNaz3xSFZhqQph0LpK+942Yv9+oFxneSMFl4BSncBt
+AXv68UE8y1bFxfcwqHDvjrbxqPqC2louD+f4GVNWDEiqhX2UTc8LoB0V96KuKFv9
+31y33vNjS8KE1FIHifEZFlU5C/+CpAHCGT/LJH336bPFWCEvsMUGww4bXaIym6UM
+Jrkt6leE03eJ0ZDA1uHp3TWq6L7z9iJsjKppluXDMMlAas0Rj3YkhF2XhVD/achG
+CanzIWl3i0B4c4SrcCCzHOa0UtWtDQwoks/Q41rMTVAHDBGt8tjP0utVR+Vnx7uu
+ta37lQFXAgMBAAECggEBAItMzigL224m4CUTisHiu1P7oAGIxLRX2C3pO9FPjbWx
+xlD07yjI4UdMvilQD2IDqGRKSAqQ62Sp0ou5CoINTNnb622dGoxCN534fuD4MG9H
+lLyKBg9W+ocTD/DxmPz2O2ydWRjZ2jTyOIPWnw3aX2a1/XQ/lGJkndcReqJM2ubv
+UQgT5vIJCF4OMPPYWntgFi2GbdGAl8kKCiU6wQ0q9g3Y/EmuyEpY8uVbRV7nN65i
+3YRU4EHACOZiFNfh12hFeAWMWbaEVsyx3bmdmkfI1kiu/Rddr1HzHoOR+HNN0jrr
+E6d3cyzGE7XX0lTpTjzMcHX2PmzvH7Y3Lh1Jz+WqlJECgYEAxFfutjvuJoa4yDhG
+9S/7/AoUUdY2LhxBin8QpI+XkSHGQaP22X6vwvncjnK85nq/5Wi1tKaFQ72+df9Q
+hP3s5sgVrb41FAbm6a9KuR2FGL63LH6pGrj9X6yMT+ZHIW+V/kpaA4/bVBvLh/dp
+GEYQnZGJvrgRBis46AFVi4lvm/0CgYEAw++x+IFzEEE7x5A7AcrrWYl6V2eBPWIA
+lcnFuhosKUTgAry4pmofG+kblgI89droINF/aFrJyBa2HV/WLZH5p08hplr1/FuD
+DZoyHA5CQOvp210NXOTGti0JWFtH3W7Wz32Bj/e8gDz6ZuzsXDtdP9fiA52NqSG2
+BiaFCSOLcOMCgYBFyvwPyz3cdAc7JMYUYfownWSbsomP2ntxv7kqxeAatubCboZQ
+ybewlyDPgfmj8/5CjfYJQSgd7FTHnPoCTEDpyDXsjLBRbiKm7qihJN0q7qAuMNfr
+p9ZpK+y0eibOu9uViNh2a6yLOVYf/tJczosZd6J/KO7kQnj3/4FpGHGUAQKBgCVA
+cSm6EtJIVMFAXreciNphFO2BNEUjWNEhp4IWb8b43U4n60NYccmwrBn9GvHzSKbU
+rdB9UlfEWaOEEQhg9IImvVMPgC0WiPgRFO3YmCgXskKOknfS1yTTsy8lS6iB5j1U
+s0lX5HLNJR5kdRuj/bqhpMrjLYe2bREGSczPATfZAoGBALYbnEP85H0N1iKIh/jV
+gkKzS38el73tD8kVCCfy/B//fDzcL+M8Km0nDQI/NGISkLgsle4iGOX2P/GHDeJ9
+tNtxEAYNHZxs0ueisqa1kvUjOZi2JMq8+HoymLvADGrZPLZoIl5S874ixmX+yPfu
+oICCZTZruu/op86/owdlmS43
+-----END PRIVATE KEY-----
diff --git a/debian/modules/nchan/dev/cert.pem b/debian/modules/nchan/dev/cert.pem
new file mode 100644
index 0000000..8daa790
--- /dev/null
+++ b/debian/modules/nchan/dev/cert.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDpTCCAo2gAwIBAgIJAMIK26NcV4+mMA0GCSqGSIb3DQEBCwUAMGkxCzAJBgNV
+BAYTAlhYMQ0wCwYDVQQIDARub25lMSQwIgYDVQQKDBtuY2hhbiB0ZXN0aW5nIHVu
+Y29ycG9yYXRpb24xETAPBgNVBAsMCHN1aXRlIC05MRIwEAYDVQQDDAlsb2NhbGhv
+c3QwHhcNMTUxMjI5MTkwNDE5WhcNMTYxMjI4MTkwNDE5WjBpMQswCQYDVQQGEwJY
+WDENMAsGA1UECAwEbm9uZTEkMCIGA1UECgwbbmNoYW4gdGVzdGluZyB1bmNvcnBv
+cmF0aW9uMREwDwYDVQQLDAhzdWl0ZSAtOTESMBAGA1UEAwwJbG9jYWxob3N0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkbRbBBMKenlB752mscbmKKC
+IgkT9CcOtte2jWs98UhWYakKYdC6SvveNmL/fqBcZ3kjBZeAUp3AbQF7+vFBPMtW
+xcX3MKhw74628aj6gtpaLg/n+BlTVgxIqoV9lE3PC6AdFfeirihb/d9ct97zY0vC
+hNRSB4nxGRZVOQv/gqQBwhk/yyR99+mzxVghL7DFBsMOG12iMpulDCa5LepXhNN3
+idGQwNbh6d01qui+8/YibIyqaZblwzDJQGrNEY92JIRdl4VQ/2nIRgmp8yFpd4tA
+eHOEq3AgsxzmtFLVrQ0MKJLP0ONazE1QBwwRrfLYz9LrVUflZ8e7rrWt+5UBVwID
+AQABo1AwTjAdBgNVHQ4EFgQUV64KJ1He/hQ91ylmFediO7zqaGowHwYDVR0jBBgw
+FoAUV64KJ1He/hQ91ylmFediO7zqaGowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQsFAAOCAQEAOh6IUcVtSKix2Da9izAyJGt76rmk8wny61d6hWYbv/kBDLoWN93r
+yBrPBKHeGp8oivcofShKBMACbGttu1ZOLrvXMvtJvg8oixyODQxBKKDWKERhmZwW
+5/RYma5Uh+DHVeKyEfy8zz0Io51jksWJUZ0NIzU+PtDHSsR7sCG+HS0BUEYgzyvr
+fWvRwdKN+lXLvoaAuvEGmT5gnWtJYqrvLYq7548xl0CZbjRUlQpxt9/XdpIVRQwh
+23BucARPEgps7uv6SXXzsFLcrmjUkGJZ1itORYvT4QpaD40DAq+2hiI4u5594Stp
+Dl6MJ43WlnWQCd5FakZpvcW5ZuBbDYkxkQ==
+-----END CERTIFICATE-----
diff --git a/debian/modules/nginx-http-push/tests/chattertest.rb b/debian/modules/nchan/dev/chattertest.rb
similarity index 100%
rename from debian/modules/nginx-http-push/tests/chattertest.rb
rename to debian/modules/nchan/dev/chattertest.rb
diff --git a/debian/modules/nginx-http-push/tests/debug.sh b/debian/modules/nchan/dev/debug.sh
similarity index 100%
rename from debian/modules/nginx-http-push/tests/debug.sh
rename to debian/modules/nchan/dev/debug.sh
diff --git a/debian/modules/nchan/dev/dev.conf b/debian/modules/nchan/dev/dev.conf
new file mode 100644
index 0000000..ac84f69
--- /dev/null
+++ b/debian/modules/nchan/dev/dev.conf
@@ -0,0 +1,63 @@
+#!/bin/sh #good enough highlighting
+worker_processes  16;
+worker_rlimit_nofile 150000;
+
+#error_log  /dev/stderr debug;                                                                                                                                            
+error_log  /dev/stderr  notice;
+#error_log   err.log  notice;                                                                                                                                             
+
+pid        /tmp/nchan-test-nginx.pid;
+daemon      off;
+
+events {
+  worker_connections  50000;
+}
+
+http {
+  #include       mime.types;
+  default_type  application/octet-stream;
+
+  nchan_max_reserved_memory 1024M;
+  
+  access_log off;
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 30s;
+  types_hash_max_size 2048;
+  client_max_body_size 10M;
+  server_tokens off;
+  gzip  on;
+
+  server {
+    listen 127.0.0.1:8083;
+    location ~ /action/pub/(\w+)$ {
+      nchan_publisher;
+      nchan_channel_id $1;
+      nchan_message_timeout 5s;
+      nchan_message_buffer_length 10;
+    }
+  }
+  
+  server {
+    listen 127.0.0.1:8082;
+    location /action/subauth {
+      proxy_pass http://127.0.0.1:8053/subauth;
+      proxy_pass_request_body off;
+      proxy_set_header Content-Length "";
+      proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
+      proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
+      proxy_set_header X-Channel-Id $nchan_channel_id;
+      proxy_set_header X-Original-URI $request_uri;
+      proxy_set_header X-Forwarded-For $remote_addr;
+    }
+    location ~ /action/sub/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_id $1;
+      nchan_authorize_request /action/subauth;
+      client_body_timeout 65;
+      keepalive_timeout 65;
+      send_timeout 60;
+    }
+  }
+}
diff --git a/debian/modules/nginx-http-push/tests/examine_coredump.sh b/debian/modules/nchan/dev/examine_coredump.sh
similarity index 86%
rename from debian/modules/nginx-http-push/tests/examine_coredump.sh
rename to debian/modules/nchan/dev/examine_coredump.sh
index 97e7421..7629ac8 100755
--- a/debian/modules/nginx-http-push/tests/examine_coredump.sh
+++ b/debian/modules/nchan/dev/examine_coredump.sh
@@ -12,6 +12,6 @@ mkdir $core_dir 2>/dev/null
 
 echo "saving coredump for $target at $dump"
 
-sudo systemd-coredumpctl dump $target > $dump
+sudo coredumpctl dump $target > $dump
 kdbg ./nginx "$dump" 2>/dev/null
 # rm "$dump" #keep it around for now
diff --git a/debian/modules/nchan/dev/gen_config_commands.rb b/debian/modules/nchan/dev/gen_config_commands.rb
new file mode 100755
index 0000000..f7c75ab
--- /dev/null
+++ b/debian/modules/nchan/dev/gen_config_commands.rb
@@ -0,0 +1,129 @@
+#!/usr/bin/ruby
+ROOT_DIR=".."
+SRC_DIR="src"
+CONFIG_IN="nchan_commands.rb"
+CONFIG_OUT=ARGV[0]
+
+class CfCmd #let's make a DSL!
+  class OneOf
+    def initialize(arg) 
+      @arg=arg
+    end
+    def []=(k,v)
+      @arg[k]=v
+    end
+    def [](val)
+      ret=@arg[val]
+      raise "Unknown value lookup #{val}" if ret.nil?
+      ret
+    end
+  end
+  class Cmd
+    attr_accessor :name, :type, :set, :conf, :offset_name
+    attr_accessor :contexts, :args, :legacy, :alt, :disabled
+    def type_line
+      lut=OneOf.new(:main => :NGX_HTTP_MAIN_CONF, :srv => :NGX_HTTP_SRV_CONF, :upstream => :NGX_HTTP_UPS_CONF, :loc => :NGX_HTTP_LOC_CONF, :if => :NGX_HTTP_LIF_CONF)
+      args_lut= OneOf.new(0 => :NGX_CONF_NOARGS, false => :NGX_CONF_NOARGS)
+      
+      (1..7).each{|n| args_lut[n]="NGX_CONF_TAKE#{n}"}
+      
+      tl=[]
+      
+      contexts.each { |v| tl << lut[v] }
+      (Enumerable === args ? args : ([args]) ).each {|arg| tl << args_lut[arg]}
+      tl.join "|"
+    end
+    
+    def conf_line
+      OneOf.new(loc_conf: :NGX_HTTP_LOC_CONF_OFFSET, srv_conf: :NGX_HTTP_SRV_CONF_OFFSET, main_conf: :NGX_HTTP_MAIN_CONF_OFFSET)[conf]
+    end
+    def offset_line
+      tpdf=OneOf.new(main_conf: :nchan_main_conf_t, srv_conf: :nchan_srv_conf_t, loc_conf: :nchan_loc_conf_t)
+      if offset_name
+        "offsetof(#{tpdf[conf]}, #{offset_name})"
+      else
+        0
+      end
+    end
+    def initialize(name, func)
+      self.name=name
+      self.set=func
+    end
+    def conf_offset(val)
+
+    end
+    
+    def to_c_def(altname=nil, comment=nil)
+      str= <<-END.gsub(/^ {6}/, '')
+        { ngx_string("#{altname || name}"),#{comment && " //#{comment}"}
+          #{type_line},
+          #{set},
+          #{conf_line},
+          #{offset_line},
+          NULL } ,
+      END
+    end
+    def to_s
+      str=[]
+      str << to_c_def
+      if self.legacy
+        lgc = self.legacy.kind_of?(Array) ? self.legacy : [ self.legacy ]
+        lgc.each do |v|
+          str << to_c_def(v, "legacy for #{name}")
+        end
+      end
+      (alt || []).each {|v| str << to_c_def(v, "alt for #{name}")}
+      if disabled
+        str.unshift "/* DISABLED\r\n"
+        str.push "  */\r\n"
+      end
+      str << "\r\n"
+      str.join
+    end
+  end
+  def initialize(&block)
+    @cmds=[]
+    instance_eval &block
+  end
+  def method_missing(name, *args)
+    define_cmd name, *args
+  end
+  def define_cmd(name, valid_contexts, handler, conf, opt={})
+    cmd=Cmd.new name, handler
+    cmd.args= opt.has_key?(:args) ? opt[:args] : 1
+    cmd.contexts= valid_contexts
+    if Array === conf
+      cmd.conf=conf[0]
+      cmd.offset_name=conf[1]
+    else
+      cmd.conf=conf
+    end
+    cmd.legacy=opt[:legacy]
+    cmd.alt=opt[:alt]
+    cmd.disabled=opt[:disabled]
+    @cmds << cmd
+  end
+  
+  def to_s
+    str= <<-END.gsub(/^ {6}/, '')
+      //AUTOGENERATED, do not edit! see #{CONFIG_IN}
+      static ngx_command_t  nchan_commands[] = {
+        #{@cmds.join}
+        ngx_null_command
+      };
+    END
+  end
+end
+begin
+  cf=eval File.read("#{ROOT_DIR}/#{SRC_DIR}/#{CONFIG_IN}")
+rescue Exception => e
+  STDERR.puts e.message.gsub(/^\(eval\)/, "#{SRC_DIR}/#{CONFIG_IN}")
+  exit 1
+end
+
+if CONFIG_OUT
+  File.write "#{ROOT_DIR}/#{SRC_DIR}/#{CONFIG_OUT}", cf.to_s
+  puts "wrote config commands to #{SRC_DIR}/#{CONFIG_OUT}"
+else
+  puts cf.to_s
+end
diff --git a/debian/modules/nchan/dev/longtest.rb b/debian/modules/nchan/dev/longtest.rb
new file mode 100755
index 0000000..0e67574
--- /dev/null
+++ b/debian/modules/nchan/dev/longtest.rb
@@ -0,0 +1,184 @@
+#!/usr/bin/ruby
+require 'securerandom'
+require_relative 'pubsub.rb'
+require 'json'
+require "reel"
+
+PUB_URL="http://127.0.0.1:8083/action/pub/"
+SUB_URL="http://127.0.0.1:8082/action/sub/"
+
+AUTH_PORT=8053
+
+TIMEOUT=1000
+DEFAULT_CLIENT=:longpoll
+
+#Typhoeus::Config.verbose = true
+def short_id
+  SecureRandom.hex.to_i(16).to_s(36)[0..5]
+end
+
+def short_msg
+  SecureRandom.hex.to_i(16).to_s(36)
+end
+
+Celluloid.boot
+
+class AuthServerRunner
+  include Celluloid
+  class AuthServer < Reel::Server::HTTP
+    def initialize(host = "127.0.0.1", port = AUTH_PORT)
+      puts "init"
+      super(host, port, &method(:on_connection))
+    end
+    
+    def on_connection(connection)
+      connection.each_request do |request|
+        handle_request(request)
+      end
+    end
+    
+    def handle_request(request)
+      request.respond :ok, ""
+    end
+  end
+  
+  def run
+    AuthServer.run
+  end
+end
+
+class SubTest
+  attr_accessor :id, :sub
+  def initialize(id, out=nil)
+    @id=id
+    @out=out
+    @sub=Subscriber.new "#{SUB_URL}#{id}", 1, timeout: TIMEOUT, quit_message: 'FIN', client: DEFAULT_CLIENT, nostore: true
+    @sub.on_message do |msg|
+      if @expected != msg.message 
+        raise "unexpected message for id #{id}. expected #{@expected}, got #{msg.message}"
+      elsif @out
+        puts "received correct message for #{id}"
+      end
+    end
+  end
+  
+  def expect_msg(msg)
+    @expected=msg
+  end
+  
+  def run
+    @sub.run
+  end
+end
+
+class TestRig
+  def initialize
+    @ids=[]
+    @subs={}
+    @pub = Publisher.new '', accept: 'text/json', nostore: true
+  end
+  
+  def [](id)
+    @subs[id]
+  end
+  
+  def sub(id=nil)
+    id = short_id if id.nil?
+    raise "#{id} already running" if @subs[id]
+    @ids << id
+    @subs[id] = SubTest.new(id, @out)
+    @subs[id].run
+  end
+  
+  def pub(id)
+    raise "#{id} not subscribed" unless @subs[id]
+    msg = short_msg
+    @subs[id].expect_msg(msg)
+    @pub.with_url("#{PUB_URL}#{id}").post(msg)
+    
+    info=JSON.parse @pub.response_body
+    
+    if info["subscribers"] != 1
+      raise "subscribers != 1 for id #{id}"
+    end
+  end
+  
+  def unsub(id=nil)
+    @subs[id].terminate
+    @subs.delete id
+    @ids.delete id
+  end
+  
+  def unsub_all
+    @subs.each do |sub|
+      sub.terminate
+    end
+    @subs.empty!
+    @ids.clear
+  end
+  
+  def last_id
+    @last_id ||= random_id
+  end
+  
+  def random_id
+    @ids.sample
+  end
+  
+  def post_again
+    id=last_id
+    out "post again to #{id}"
+    pub(id)
+  end
+
+  def post_testingly
+    id = random_id
+    out "post to #{id}"
+    pub(id)
+    @last_id=id
+  end
+  
+  def out(str)
+    puts str if @out
+  end
+  
+  def output!
+    @out=true
+  end
+end
+  
+
+auth = AuthServerRunner.new
+auth.async.run
+sleep 5
+
+rig = TestRig.new
+
+class Runner 
+  def initialize(rig, count)
+    @rig = rig
+    @rig.output!
+    count.times do
+      @rig.sub
+    end
+  end
+  
+  def run
+    while true do
+      if rand(2)==1
+        @rig.post_testingly
+      else
+        @rig.post_again
+      end
+      
+      
+      t = rand(1..7)
+      puts "wait #{t} sec"
+      sleep t
+    end
+  end
+end
+
+runner = Runner.new(rig, 20)
+
+runner.run
diff --git a/debian/modules/nginx-http-push/tests/memparse.lua b/debian/modules/nchan/dev/memparse.lua
similarity index 82%
rename from debian/modules/nginx-http-push/tests/memparse.lua
rename to debian/modules/nchan/dev/memparse.lua
index d8dcea6..6522688 100755
--- a/debian/modules/nginx-http-push/tests/memparse.lua
+++ b/debian/modules/nchan/dev/memparse.lua
@@ -1,4 +1,6 @@
 #!/usr/bin/luajit
+local lpty = require "lpty"
+
 local lines_tailed=100000
 local filename="errors.log"
 local follow=false
@@ -64,32 +66,34 @@ local memmap_add
 do
   local bucketsize=0
   memmap_add= function(starthex, size, val)
-  if not poolsize or not poolstart then return err("poolsize or poolstart not known") end  
-  val = val or 1
-  local start=tonumber(starthex, 16)
-  if not start then return err("starthex was not a hex number") end
-  --start should be relative to pool start
-  start=start-poolstart
-  
-  if not size then
-    if shm[starthex] then
-      size=shm[starthex].size
-    else
-      err("shm[%s] is nil", starthex)
+    if not poolsize or not poolstart then return err("poolsize or poolstart not known") end  
+    val = val or 1
+    local start=tonumber(starthex, 16)
+    if not start then return err("starthex was not a hex number") end
+    --start should be relative to pool start
+    start=start-poolstart
+    
+    if not size then
+      if shm[starthex] then
+        size=shm[starthex].size
+      else
+        err("shm[%s] is nil", starthex)
+      end
+    end
+    
+    local bstart = math.floor(start/poolsize * membuckets)
+    local bend =   math.floor((start+size)/poolsize * membuckets)
+    if bstart == math.huge then
+      return err("alloc before shm init")
+    end    
+    for i=bstart, bend do
+      memmap[i]=(memmap[i] or 0)+val
+      if memmap[i]<0 then
+        err("negative memmap at bucket %s", i)
+        memmap[i]=0
+      end
     end
   end
-  
-  local bstart = math.floor(start/poolsize * membuckets)
-  local bend =   math.floor((start+size)/poolsize * membuckets)
-  
-  for i=bstart, bend do
-    memmap[i]=(memmap[i] or 0)+val
-    if memmap[i]<0 then
-      err("negative memmap at bucket %s", i)
-      memmap[i]=0
-    end
-  end
-end
 end
 
 function alloc(ptr, size, label, time, pid)
@@ -199,8 +203,9 @@ function parse_line(str)
       return ptr
     end
     
-    start, size = msg:match("ngx_http_push_shpool start (%w+) size (%d+)")
+    start, size = msg:match("nchan_shpool start (%w+) size (%d+)")
     if size and start then
+      init()
       poolsize=tonumber(size)
       poolstart = tonumber(start, 16)
       printf("shm start %s size %s", start, formatsize(poolsize))
@@ -227,17 +232,24 @@ init()
 if follow then
   local lasttime, now=os.time(), nil
   print "follow errors.log"
-  local tailin = io.popen(string.format('tail --lines=%s -F %s 2>&1', lines_tailed, filename), 'r')
-  for line in tailin:lines() do
+  
+  pty = lpty.new()
+  pty:startproc('tail', ("--lines=%s"):format(lines_tailed), "-F", filename)
+  
+  while true do
+    line = pty:readline(false, 1)
     now=os.time()
-    if line:match('truncated') or
+    if not line then
+      --nothing
+    elseif line:match('truncated') or
        line:match(("‘%s’ has become inaccessible: No such file or directory"):format(filename)) then
       --reset
       init()
-    elseif parse_line(line) == true then
-      summary()
-      lasttime=now
-    elseif now - lasttime > 1 then
+    else
+      parse_line(line)
+    end
+    
+    if now - lasttime >= 1 then
       summary()
       lasttime=now
     end
diff --git a/debian/modules/nchan/dev/nginx b/debian/modules/nchan/dev/nginx
new file mode 120000
index 0000000..fd55118
--- /dev/null
+++ b/debian/modules/nchan/dev/nginx
@@ -0,0 +1 @@
+./nginx-nchan/pkg/nginx-nchan-dev/usr/bin/nginx
\ No newline at end of file
diff --git a/debian/modules/nginx-http-push/tests/nginx-cachemanager.conf b/debian/modules/nchan/dev/nginx-cachemanager.conf
similarity index 100%
rename from debian/modules/nginx-http-push/tests/nginx-cachemanager.conf
rename to debian/modules/nchan/dev/nginx-cachemanager.conf
diff --git a/debian/modules/nchan/dev/nginx-nchan/.gitignore b/debian/modules/nchan/dev/nginx-nchan/.gitignore
new file mode 100644
index 0000000..b0a7412
--- /dev/null
+++ b/debian/modules/nchan/dev/nginx-nchan/.gitignore
@@ -0,0 +1,6 @@
+src
+pkg
+*.tar.gz
+*.pkg.tar*
+*no_pool.patch
+ngx_debug_pool/
diff --git a/debian/modules/nginx-http-push/tests/nginx-pushmodule/PKGBUILD b/debian/modules/nchan/dev/nginx-nchan/PKGBUILD
similarity index 53%
rename from debian/modules/nginx-http-push/tests/nginx-pushmodule/PKGBUILD
rename to debian/modules/nchan/dev/nginx-nchan/PKGBUILD
index bf3dfe4..43a7c1a 100644
--- a/debian/modules/nginx-http-push/tests/nginx-pushmodule/PKGBUILD
+++ b/debian/modules/nchan/dev/nginx-nchan/PKGBUILD
@@ -1,22 +1,39 @@
 #!/bin/zsh
-_nginx_ver=1.6.0
-_nginx_ver_nopool=1.7.2
-_nginx_ver_old=1.0.1
-_nginx_ver_very_old=0.8.40
+_nginx_ver_latest=1.11.3
+_nginx_ver_stable=1.10.1
+_nginx_ver_nopool=1.11.2
+_nginx_ver_legacy=1.8.1
+_nginx_ver_old=1.6.3
+_nginx_ver_very_old=0.8.55
 
 OPTIONS=(!strip debug docs libtool staticlibs emptydirs zipman purge !upx)
 if [[ -z $NO_DEBUG ]]; then
-    CFLAGS="-ggdb -O0 -Wall"
+  #debug build. clear cflags
+  CFLAGS=" -ggdb -fvar-tracking-assignments -O$OPTIMIZE_LEVEL"
 fi
+
+CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -Wpointer-arith -Wshadow -Wnested-externs -Wsign-compare"
+
+_include_http2=0
+
 if [[ $NO_POOL == 1 ]]; then
   _nginx_ver=$_nginx_ver_nopool
+  _include_http2=1
+elif [[ $NGINX_LEGACYVERSION == 1 ]]; then
+  _nginx_ver=$_nginx_ver_legacy
 elif [[ $NGINX_OLDVERSION == 1 ]]; then
   _nginx_ver=$_nginx_ver_old
 elif [[ $NGINX_VERYOLDVERSION == 1 ]]; then
   _nginx_ver=$_nginx_ver_very_old
+elif [[ $NGINX_STABLEVERSION == 1 ]]; then
+  _nginx_ver=$_nginx_ver_stable
+  _include_spdy=1
+else
+  _nginx_ver=$_nginx_ver_latest
+  _include_http2=1
 fi
 
-
+_pkgname="nginx"
 PKGEXT=".pkg.tar"
 
 _user="http"
@@ -24,24 +41,24 @@ _group="http"
 _doc_root="/usr/share/${_pkgname}/http"
 _sysconf_path="etc"
 _conf_path="${_sysconf_path}/${_pkgname}"
-_tmp_path="/tmp/"
+_tmp_path="/tmp"
 _pid_path="/run"
 _lock_path="/var/lock"
 _access_log="/dev/stdout"
 _error_log="errors.log"
-_pushmodule_dir="${startdir}/pushmodule"
+_nchan_dir="${startdir}/nchan"
 
 _pkgver() {
-  pushd "$startdir/pushmodule" >/dev/null
+  pushd "$startdir/nchan" >/dev/null
   printf "%s.%s.%s.%s" "$_nginx_ver" "$(git rev-parse --abbrev-ref HEAD | sed -r 's/-/_/g')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
   popd >/dev/null
 }
 
-pkgname=nginx-pushmodule-dev
-pkgver=$(_pkgver)
+pkgname=nginx-nchan-dev
+pkgver=0
 pkgrel=1
-pkgdesc="Nginx Push Module dev version"
-arch=('i686' 'x86_64')
+pkgdesc="Nginx + Nchan dev version"
+arch=('i686' 'x86_64' 'armv7h')
 install=install
 
 
@@ -63,36 +80,54 @@ backup=("${_conf_path}/conf/nginx.conf"
 _user=http
 _group=http
 
-source=("http://nginx.org/download/nginx-${_nginx_ver}.tar.gz"
+_nginx_source="http://nginx.org/download/nginx-${_nginx_ver}.tar.gz"
+_no_pool_patch_source="https://raw.github.com/shrimp/no-pool-nginx/master/nginx-${_nginx_ver_nopool}-no_pool.patch"
+_ngx_debug_pool_url="https://github.com/chobits/ngx_debug_pool.git"
+
+source=("$_nginx_source"
   "nginx.conf"
   "nginx.logrotate"
   "nginx.service"
-  "https://raw.github.com/shrimp/no-pool-nginx/master/nginx-${_nginx_ver_nopool}-no_pool.patch")
+  "git+${_ngx_debug_pool_url}"
+  "$_no_pool_patch_source"
+  "bl.txt")
+
 md5sums=('SKIP'
          '1fe7a3ca0773ce13f9f92e239a99f8b9'
          'ab1eb640c978536c1dad16674d6b3c3c'
          '62d494d23aef31d0b867161f9fffa6eb'
+         'SKIP'
+         'SKIP'
          'SKIP')
 
 build() {
   local _src_dir="${srcdir}/nginx-$_nginx_ver"
-  ln -sf $_src_dir $srcdir/nginx
+  ln -sfT "$_src_dir" "$srcdir/nginx"
+  ln -sfT "$_nchan_dir" "$srcdir/nchan"
   local _build_dir="${_src_dir}/objs"
-  cd $_src_dir
-
-  if [[ $NO_POOL == 1 ]]; then
-    echo "using the no-pool patch"
-    patch -p1 < "${srcdir}/nginx-${_nginx_ver}-no_pool.patch"
-  fi
-  if [[ $NGX_SLAB_PATCH == 1 ]]; then
-    echo "using the ngx_slab patch to fix large alloc/frees"
-    patch -p1 < "${startdir}/ngx_slab.patch"
+  cd "$srcdir/nginx"
+  
+  if [[ -z $CONTINUE ]] && [[ -z $NO_EXTRACT_SOURCE ]]; then
+    if [[ $NO_POOL == 1 ]]; then
+      echo "using the no-pool patch"
+      patch -p1 < "${srcdir}/nginx-${_nginx_ver}-no_pool.patch"
+    fi
+    if [[ $NGX_SLAB_PATCH == 1 ]]; then
+      echo "using the ngx_slab patch to fix large alloc/frees"
+      patch -p1 < "${startdir}/ngx_slab.patch"
+    fi
+    if [[ $NGX_DEBUG_POOL == 1 ]]; then
+      echo "patch nginx to debug pools"
+      patch -p1 < "${srcdir}/ngx_debug_pool/debug_pool.patch"
+    fi
   fi
 
   if [[ $MUDFLAP == 1 ]]; then
     export CFLAGS="$CFLAGS -fmudflap"
   fi
 
+  CFLAGS="${CFLAGS/-Werror/}" #no warning-as-error
+  
   CONFIGURE=(
     --prefix=/${_conf_path}
     --sbin-path=/usr/bin/nginx
@@ -104,22 +139,51 @@ build() {
     --http-uwsgi-temp-path=${_tmp_path}/uwsgi_temp
     --http-log-path=${_access_log}
     --error-log-path=${_error_log}
-    --user=${_user}
-    --group=${_group}
-    --with-debug
-    --add-module=${_pushmodule_dir})
+    --with-http_ssl_module
+  )
 
+  if [[ $DYNAMIC == 1 ]]; then
+    CONFIGURE+=( --add-dynamic-module=../nchan )
+  else
+    CONFIGURE+=( --add-module=../nchan )
+  fi
+
+  if [[ $CONFIGURE_WITH_DEBUG == 1 ]]; then
+    CONFIGURE+=( "--with-debug" )
+  fi
+  
+  if [[ -z $NO_NGINX_USER ]]; then
+    CONFIGURE+=( "--user=${_user}" "--group=${_group}" )
+  fi
+    
+  if [[ $_include_http2 == 1 ]]; then
+    CONFIGURE+=( "--with-http_v2_module" )
+  fi
+  
+  if [[ $_include_spdy == 1 ]]; then
+    CONFIGURE+=( "--with-http_spdy_module" )
+  fi
+    
+  if [[ $NGX_DEBUG_POOL == 1 ]]; then
+    CONFIGURE+=( "--add-module=../ngx_debug_pool" )
+  fi
+  
   if [[ -z $NGINX_VERYOLDVERSION ]]; then
-    CONFIGURE+=( "--http-scgi-temp-path=${_tmp_path}scgi_temp" )
+    CONFIGURE+=( "--http-scgi-temp-path=${_tmp_path}/scgi_temp" )
   fi
 
   if [[ $CC == *clang* ]]; then
     #not a valid clang parameter
     CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
-  elif [[ $CC == "cc" ]] || [[ $CC == "gcc" ]] || [[ -z $CC ]]; then
-    CFLAGS="-fdiagnostics-color=always $CFLAGS"
+    CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
+    if [[ -z $CLANG_ANALYZER ]]; then
+      CFLAGS="-ferror-limit=5 $CFLAGS"
+    fi
+  elif [[ $CC == "cc" ]] || [[ $CC == "gcc" ]] || [[ -z $CC ]] && [[ -z $NO_GCC_COLOR ]]; then
+    CFLAGS="-fdiagnostics-color=always  -Wmaybe-uninitialized $CFLAGS"
   fi
-
+  
+  echo $CFLAGS
   export CCACHE_CPP2=yes
   if ! [[ -z $CLANG_ANALYZER ]]; then
     scan-build -o "$CLANG_ANALYZER" ./configure ${CONFIGURE[@]}
@@ -127,6 +191,12 @@ build() {
   elif ! [[ -z $CONTINUE ]]; then
     make $REMAKE
   else
+    ln -svf $srcdir/bl.txt
+
+    if [[ ! -z $EXPLICIT_CFLAGS ]]; then
+      CONFIGURE+=( "--with-cc-opt=${CFLAGS}" )
+    fi
+    echo "./configure ${CONFIGURE[@]}"
     ./configure ${CONFIGURE[@]}
     make
   fi
diff --git a/debian/modules/nchan/dev/nginx-nchan/bl.txt b/debian/modules/nchan/dev/nginx-nchan/bl.txt
new file mode 100644
index 0000000..517b8fa
--- /dev/null
+++ b/debian/modules/nchan/dev/nginx-nchan/bl.txt
@@ -0,0 +1,6 @@
+fun:ngx_regex_module_init
+fun:ngx_http_script_copy_capture_len_code
+fun:ngx_http_script_copy_capture_code
+fun:ngx_http_parse_request_line
+fun:ngx_writev
+src:*ngx_writev_chain.c
diff --git a/debian/modules/nginx-http-push/tests/nginx-pushmodule/install b/debian/modules/nchan/dev/nginx-nchan/install
similarity index 100%
rename from debian/modules/nginx-http-push/tests/nginx-pushmodule/install
rename to debian/modules/nchan/dev/nginx-nchan/install
diff --git a/debian/modules/nginx-http-push/tests/nginx-pushmodule/pushmodule b/debian/modules/nchan/dev/nginx-nchan/nchan
similarity index 100%
rename from debian/modules/nginx-http-push/tests/nginx-pushmodule/pushmodule
rename to debian/modules/nchan/dev/nginx-nchan/nchan
diff --git a/debian/modules/nginx-http-push/tests/nginx-pushmodule/nginx.conf b/debian/modules/nchan/dev/nginx-nchan/nginx.conf
similarity index 100%
rename from debian/modules/nginx-http-push/tests/nginx-pushmodule/nginx.conf
rename to debian/modules/nchan/dev/nginx-nchan/nginx.conf
diff --git a/debian/modules/nginx-http-push/tests/nginx-pushmodule/nginx.logrotate b/debian/modules/nchan/dev/nginx-nchan/nginx.logrotate
similarity index 100%
rename from debian/modules/nginx-http-push/tests/nginx-pushmodule/nginx.logrotate
rename to debian/modules/nchan/dev/nginx-nchan/nginx.logrotate
diff --git a/debian/modules/nginx-http-push/tests/nginx-pushmodule/nginx.service b/debian/modules/nchan/dev/nginx-nchan/nginx.service
similarity index 100%
rename from debian/modules/nginx-http-push/tests/nginx-pushmodule/nginx.service
rename to debian/modules/nchan/dev/nginx-nchan/nginx.service
diff --git a/debian/modules/nginx-http-push/tests/nginx-pushmodule/ngx_slab.patch b/debian/modules/nchan/dev/nginx-nchan/ngx_slab.patch
similarity index 100%
rename from debian/modules/nginx-http-push/tests/nginx-pushmodule/ngx_slab.patch
rename to debian/modules/nchan/dev/nginx-nchan/ngx_slab.patch
diff --git a/debian/modules/nginx-http-push/tests/nginx-proxy.conf b/debian/modules/nchan/dev/nginx-proxy.conf
similarity index 100%
rename from debian/modules/nginx-http-push/tests/nginx-proxy.conf
rename to debian/modules/nchan/dev/nginx-proxy.conf
diff --git a/debian/modules/nchan/dev/nginx.conf b/debian/modules/nchan/dev/nginx.conf
new file mode 100644
index 0000000..69013f3
--- /dev/null
+++ b/debian/modules/nchan/dev/nginx.conf
@@ -0,0 +1,444 @@
+#!/bin/sh #good enough highlighting
+#load_module "nginx-nchan/pkg/nginx-nchan-dev/etc/nginx/modules/ngx_nchan_module.so";
+#user  nobody;
+worker_processes      20;
+working_directory     /tmp;
+
+worker_rlimit_core    1024M;
+worker_rlimit_nofile  100000;
+#debug_points stop;
+
+error_log             /dev/stderr;
+
+pid                   /tmp/nchan-test-nginx.pid;
+daemon                off;
+
+events {
+  worker_connections  50000;
+  accept_mutex on;
+}
+
+http {
+  log_format nchan '$nchan_channel_id $nchan_subscriber_type $nchan_publisher_type $nchan_message_id $nchan_prev_message_id';
+  access_log /dev/stdout;
+#  access_log /dev/stdout;
+  default_type  application/octet-stream;
+  client_body_temp_path /tmp/ 1 2;
+  sendfile        on;
+  keepalive_timeout  65;
+  nchan_subscribe_existing_channels_only off;
+  nchan_max_reserved_memory 32M;
+  #nchan_redis_fakesub_timer_interval 1s;
+  client_max_body_size 100m;
+  #client_body_in_file_only clean;
+  #client_body_buffer_size 32K;
+  
+  nchan_redis_url "redis://127.0.0.1:8537";
+  nchan_use_redis on;
+  
+  #cachetag
+  
+  #server {
+  #  listen        1443  ssl http2;
+  #  listen        8081  http2;
+  #  
+  #  ssl_certificate     cert.pem;
+  #  ssl_certificate_key cert-key.pem;
+  #  
+  #  location ~ /pubsub/(\w+)$ {
+  #    nchan_channel_id $1;
+  #    nchan_pubsub;
+  #    nchan_message_buffer_length 200;
+  #    nchan_message_timeout 240s;
+  #    nchan_channel_group test;
+  #  }
+  #  
+  #  location / {
+  #    proxy_pass http://127.0.0.1:9292$uri;
+  #    proxy_set_header    Host            $host;
+  #    proxy_set_header    X-Real-IP       $remote_addr;
+  #    proxy_set_header    X-Forwarded-For $remote_addr;
+  #    gzip on;
+  #  }
+  #}
+  
+  upstream redis_cluster {
+    nchan_redis_server redis://127.0.0.1:7000;
+    nchan_redis_server redis://127.0.0.1:7001;
+    #nchan_redis_server redis://127.0.0.1:7002;
+  }
+  
+  server {
+    listen       8082;
+    listen       8085   http2;
+    #these are all open for benchmarking with a horde of subscribers
+    #listen      18000;
+    #listen      18001;
+    #listen      18002;
+    #listen      18003;
+    #listen      18004;
+    #listen      18005;
+    #listen      18006;
+    #listen      18007;
+    #listen      18008;
+    #listen      18009;
+    #listen      18010;
+    #    root ./;
+    
+    nchan_redis_pass redis_cluster;
+    nchan_redis_pass_inheritable on;
+    
+    #nchan_channel_events_channel_id 'events';
+    
+    #nchan_access_control_allow_origin "http://localhost:8082";
+    
+    #nchan_use_redis on;
+    
+    location ~ /pubredis/(\w+)$ {
+      #nchan_redis_url "redis://127.0.0.1:8537/5";
+      nchan_publisher;
+      nchan_channel_id $1;
+      nchan_channel_group redistest;
+      #nchan_use_redis on;
+    }
+    
+    location ~ /subredis/(\w+)$ {
+      #nchan_redis_url "redis://127.0.0.1:8537/5";
+      nchan_subscriber;
+      nchan_channel_id $1;
+      nchan_channel_group redistest;
+      #nchan_use_redis on;
+    }
+    
+    location ~ /sub/events {
+      nchan_subscriber;
+      nchan_channel_group meta;
+      nchan_channel_id events;
+    }
+    
+    location ~ /sub/noid$ {
+      nchan_subscriber;  
+    }
+    
+    location ~ /sub/internal/(\w+)$ {
+      internal;
+      nchan_subscriber;
+      nchan_channel_id $1;
+      nchan_channel_group test;
+    }
+    
+    location = /upstream {
+      proxy_pass http://127.0.0.1:8053/accel;
+    }
+    
+    #'$nchan_channel_id $nchan_subscriber_type $nchan_publisher_type $nchan_message_id $nchan_prev_message_id'
+    
+    location ~ /upstream_pubsub/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_pubsub;
+      nchan_message_buffer_length 200;
+      nchan_message_timeout 240s;
+      nchan_channel_group test;
+      nchan_publisher_upstream_request /upstream_pub;
+    }
+    
+    location ~ /pubsub/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_pubsub;
+      nchan_message_buffer_length 200;
+      nchan_message_timeout 240s;
+      nchan_channel_group test;
+    }
+    
+    location ~ /pub/(\w+)$ {
+      nchan_channel_id $1;
+      #nchan_channel_events_channel_id 'events/pubftl/$1';
+      nchan_publisher;
+      nchan_message_buffer_length 200;
+      nchan_message_timeout 240s;
+      nchan_channel_group test;
+    }
+    
+    location ~ /pub_1message/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_publisher;
+      nchan_message_buffer_length 1;
+      nchan_message_timeout 240s;
+      nchan_channel_group test;
+    }
+    
+    location ~ /pubauth/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_authorize_request /auth;
+      nchan_publisher;
+      nchan_message_buffer_length 200;
+      nchan_message_timeout 240s;
+      nchan_channel_group test;
+    }
+    
+    location ~ /pub_multi/(\w+)/(\w+)/(\w+)$ {
+      nchan_channel_id $1 $2 $3;
+      #nchan_channel_events_channel_id 'events/pubftl/$1';
+      nchan_publisher;
+      nchan_message_buffer_length 200;
+      nchan_message_timeout 240s;
+      nchan_channel_group test;
+    }
+
+    location ~/pub/nobuffer/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_publisher;
+      nchan_store_messages off;
+      nchan_message_timeout 60s;
+      nchan_channel_group test;
+    }
+
+    location ~ /pub/2_sec_message_timeout/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_publisher;
+      nchan_message_buffer_length 200;
+      nchan_message_timeout 2s;
+      nchan_channel_group test;
+    }
+  
+    location ~ /sub/split/(.+)$ {
+      nchan_subscriber;
+      nchan_channel_id $1;
+      nchan_channel_group test;
+      nchan_channel_id_split_delimiter "_";
+      #nchan_use_redis on;
+    }
+    
+    location ~ /sub/broadcast/(\w+)$ {
+      #nchan_channel_events_channel_id 'events/sub/$1';
+      nchan_channel_id $1;
+      nchan_subscriber;
+      nchan_channel_group test;
+      #add_header "Content-Type" "text/plain";
+    }
+    location ~ /sub/rawstream/(\w+)$ {
+      #nchan_channel_events_channel_id 'events/sub/$1';
+      gzip on;
+      gzip_min_length 10;
+      gzip_proxied any;
+      gzip_types *;
+      nchan_channel_id $1;
+      nchan_subscriber http-raw-stream;
+      nchan_subscriber_http_raw_stream_separator "\n??";
+      nchan_channel_group test;
+      #add_header "Content-Type" "text/plain";
+    }
+    
+    location ~ /sub/from_foo\.bar/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_subscriber;
+      nchan_channel_group test;
+      nchan_access_control_allow_origin "http://foo.bar";
+    }
+    
+    location ~ /pub/from_foo\.bar/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_publisher;
+      nchan_channel_group test;
+      nchan_access_control_allow_origin "http://foo.bar";
+    }
+    
+    location ~ /sub/multipart/(\w+)$ {
+      nchan_channel_id $1;
+      
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    
+    location ~ /sub/multipart_multiplex/(\w+)/(\w+)/(\w+)$ {
+      nchan_channel_id $1 $2 $3;
+      nchan_subscriber;
+      nchan_channel_group test;
+      nchan_longpoll_multipart_response on;
+    }
+    
+    location ~ /sub/waitformsg/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_subscriber;
+      nchan_channel_group test;
+      nchan_subscriber_first_message newest;
+    }
+    
+    location ~ /sub/auth/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_authorize_request /auth;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    
+    location ~ /sub/auth_fail/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_authorize_request /auth_fail;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    
+    location = /auth_fail {
+      proxy_pass http://127.0.0.1:8053/auth_fail;
+      proxy_pass_request_body off;
+      proxy_set_header Content-Length "";
+      proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
+      proxy_set_header X-Publisher-Type $nchan_publisher_type;
+      proxy_set_header X-Message-Id $nchan_message_id;
+      proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
+      proxy_set_header X-Channel-Id $nchan_channel_id;
+      proxy_set_header X-Channel-Id2 $nchan_channel_id2;
+      proxy_set_header X-Channel-Id3 $nchan_channel_id3;
+      proxy_set_header X-Channel-Id4 $nchan_channel_id4;
+      proxy_set_header X-Original-URI $request_uri;
+    } 
+    
+    location = /auth {
+      proxy_pass http://127.0.0.1:8053/auth;
+      proxy_pass_request_body off;
+      proxy_set_header Content-Length "";
+      proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
+      proxy_set_header X-Publisher-Type $nchan_publisher_type;
+      proxy_set_header X-Message-Id $nchan_message_id;
+      proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
+      proxy_set_header X-Channel-Id $nchan_channel_id;
+      proxy_set_header X-Channel-Id2 $nchan_channel_id2;
+      proxy_set_header X-Channel-Id3 $nchan_channel_id3;
+      proxy_set_header X-Channel-Id4 $nchan_channel_id4;
+      proxy_set_header X-Original-URI $request_uri;
+    }
+    
+    location /upstream_pub {
+      proxy_pass http://127.0.0.1:8053/pub;
+      proxy_set_header X-Publisher-Type $nchan_publisher_type;
+      proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
+      proxy_set_header X-Channel-Id $nchan_channel_id;
+      proxy_set_header X-Original-URI $request_uri;
+    } 
+    
+    location ~ /sub/multi/(\w+)/(\w+)$ {
+      nchan_channel_id $1 $2;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    location ~ /sub/multi/(\w+)/(\w+)/(\w+)$ {
+      nchan_channel_id $1 $2 $3;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    location ~ /sub/multi/(\w+)/(\w+)/(\w+)/(\w+)$ {
+      nchan_channel_id $1 $2 $3 $4;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    location ~ /sub/multi/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)$ {
+      nchan_channel_id $1 $2 $3 $4 $5;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    location ~ /sub/multi/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)$ {
+      nchan_channel_id $1 $2 $3 $4 $5 $6;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    location ~ /sub/multi/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)$ {
+      nchan_channel_id $1 $2 $3 $4 $5 $6 $7;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    
+    
+    #location ~ /sub/first/(\w+)$ {
+    #  nchan_channel_id $1;
+    #  nchan_subscriber;
+    #  nchan_channel_group test;
+    #  nchan_subscriber_concurrency first;
+    #}
+    #location ~ /sub/last/(\w+)$ {
+    #  nchan_channel_id $1;
+    #  nchan_subscriber;
+    #  nchan_channel_group test;
+    #  nchan_subscriber_concurrency last;
+    #}
+    
+    
+    location ~ /sub/intervalpoll/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_subscriber interval-poll;
+      nchan_channel_group test;
+    }
+
+    location ~ /sub/gzip/(\w+)$ {
+      nchan_channel_id $1;
+      add_header Content-Type text/plain;
+      gzip on;
+      gzip_min_length 10;
+      gzip_proxied any;
+      gzip_types *;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+
+    #quick subscriber timeout
+    location ~ /sub/timeout/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_subscriber;
+      nchan_channel_group test;
+      nchan_subscriber_timeout 2s;
+    }
+
+    #existing channels only -- publishers must create the channel before subscribing
+    location ~ /sub/authorized/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_subscribe_existing_channels_only on;
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+
+    location ~ /sub/noid/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_group test;
+    }
+    
+    location ~ /rewrite/(.*)$ {
+      rewrite  ^/(.*)$  $1;
+    }
+    
+    location ~ /sub/websocket_only/(\w+)$ {
+      nchan_channel_id $1;
+      nchan_subscriber websocket;
+      nchan_channel_group test;
+      nchan_websocket_ping_interval 5s;
+    }
+    
+    location / {
+      proxy_pass http://127.0.0.1:9292$uri;
+      proxy_set_header    Host            $host;
+      proxy_set_header    X-Real-IP       $remote_addr;
+      proxy_set_header    X-Forwarded-For $remote_addr;
+      gzip on;
+    }
+    
+    
+    location = /subsub {
+      #public subscriber endpoint
+      proxy_pass http://127.0.0.1/internal_subscriber_redirect;
+      proxy_set_header    Host            $host;
+      proxy_set_header    X-Real-IP       $remote_addr;
+      proxy_set_header    X-Forwarded-For $remote_addr;
+    }
+    
+    location ~ /sub/internal {
+      internal;
+      #X-Accel-Redirect endpoint, inaccessible except via a redirect
+      nchan_subscriber;
+      nchan_channel_id user/$arg_user chat/$arg_chat;
+    }
+    
+    location ~ /pub/(user|chat)/(.+)$ {
+      nchan_publisher;
+      nchan_channel_id $1/$2;
+    }
+    
+  }
+}
diff --git a/debian/modules/nchan/dev/nginx.sh b/debian/modules/nchan/dev/nginx.sh
new file mode 100755
index 0000000..b0cd60a
--- /dev/null
+++ b/debian/modules/nchan/dev/nginx.sh
@@ -0,0 +1,277 @@
+#!/bin/zsh
+DEVDIR=`pwd`
+SRCDIR=$(readlink -m $DEVDIR/../src)
+echo $DEVDIR $SRCDIR
+
+VALGRIND_OPT=( "--tool=memcheck" "--trace-children=yes" "--track-origins=yes" "--read-var-info=yes" )
+
+VG_MEMCHECK_OPT=( "--leak-check=full" "--show-leak-kinds=all" "--leak-check-heuristics=all" "--keep-stacktraces=alloc-and-free" "--suppressions=${DEVDIR}/vg.supp" )
+
+#expensive definedness checks (newish option)
+#VALGRIND_OPT+=( "--expensive-definedness-checks=yes" )
+
+#long stack traces
+VG_MEMCHECK_OPT+=("--num-callers=20")
+
+#generate suppresions
+#VG_MEMCHECK_OPT+=("--gen-suppressions=all")
+
+#track files
+#VG_MEMCHECK_OPT+=("--track-fds=yes")
+
+
+
+WORKERS=5
+NGINX_DAEMON="off"
+NGINX_CONF=""
+ACCESS_LOG="/dev/null"
+ERROR_LOG="stderr"
+ERRLOG_LEVEL="notice"
+TMPDIR=""
+MEM="32M"
+
+DEBUGGER_NAME="kdbg"
+DEBUGGER_CMD="kdbg -p %s $SRCDIR/nginx"
+
+#DEBUGGER_NAME="nemiver"
+#DEBUGGER_CMD="nemiver --attach=%s $SRCDIR/nginx"
+
+
+REDIS_CONF="$DEVDIR/redis.conf"
+REDIS_PORT=8537
+
+_pkgdir="${DEVDIR}/nginx-nchan/pkg/nginx-nchan-dev"
+_dynamic_module="$_pkgdir/etc/nginx/modules/ngx_nchan_module.so"
+
+_cacheconf="  proxy_cache_path _CACHEDIR_ levels=1:2 keys_zone=cache:1m; \\n  server {\\n       listen 8007;\\n       location / { \\n          proxy_cache cache; \\n      }\\n  }\\n"
+
+NGINX_CONF_FILE="nginx.conf"
+
+for opt in $*; do
+  if [[ "$opt" = <-> ]]; then
+    WORKERS=$opt
+  fi
+  case $opt in
+    noredis|no-redis)
+      no_redis=1;;
+    redis-persist)
+      persist_redis=1;;
+    leak|leakcheck|valgrind|memcheck)
+      valgrind=1
+      VALGRIND_OPT+=($VG_MEMCHECK_OPT);;
+    debug-memcheck)
+      valgrind=1
+      VALGRIND_OPT+=($VG_MEMCHECK_OPT)
+      VALGRIND_OPT+=( "--vgdb=yes" "--vgdb-error=1" )
+      #ATTACH_DDD=1
+      ;;
+    massif)
+      VALGRIND_OPT=( "--tool=massif" "--heap=yes" "--stacks=yes" "--massif-out-file=massif-nginx-%p.out")
+      valgrind=1
+      ;;
+    callgrind|profile)
+      VALGRIND_OPT=( "--tool=callgrind" "--collect-jumps=yes"  "--collect-systime=yes" "--branch-sim=yes" "--cache-sim=yes" "--simulate-hwpref=yes" "--simulate-wb=yes" "--callgrind-out-file=callgrind-nginx-%p.out")
+      valgrind=1;;
+    helgrind)
+    VALGRIND_OPT=( "--tool=helgrind" "--free-is-write=yes")
+    valgrind=1
+    ;;
+    cachegrind)
+      VALGRIND_OPT=( "--tool=cachegrind" )
+      valgrind=1;;
+    alleyoop)
+      alleyoop=1;;
+    cache)
+      CACHE=1;;
+    access)
+      ACCESS_LOG="/dev/stdout";;
+    worker|one|single) 
+      WORKERS=1
+      ;;
+    debugmaster|debug-master)
+      WORKERS=1
+      debug_master=1
+      NGINX_DAEMON="off"
+      ;;
+    devconf)
+      NGINX_CONF_FILE="dev.conf"
+      ;;
+    debug)
+      WORKERS=1
+      NGINX_DAEMON="on"
+      debugger=1
+      ;;
+    altport)
+      ALTPORT=1
+      ;;
+    debuglog)
+      ERRLOG_LEVEL="debug"
+      ;;
+    errorlog)
+      ERROR_LOG="errors.log"
+      rm ./errors.log 2>/dev/null
+      ;;
+    lomem|lowmem|small)
+      MEM="5M";;
+    himem|highmem|large)
+      MEM="256M";;
+    verylowmem|tiny)
+      MEM="1M";;
+  esac
+done
+
+NGINX_CONFIG=`pwd`/$NGINX_CONF_FILE
+NGINX_TEMP_CONFIG=`pwd`/.nginx.thisrun.conf
+NGINX_OPT=( -p `pwd`/ 
+    -c $NGINX_TEMP_CONFIG
+)
+cp -fv $NGINX_CONFIG $NGINX_TEMP_CONFIG
+
+conf_replace(){
+    echo "$1 $2"
+    sed "s|^\(\s*\)\($1\)\(\s\+\).*|\1\2\3$2;|g" $NGINX_TEMP_CONFIG -i
+}
+
+ulimit -c unlimited
+
+if [[ ! -z $NGINX_CONF ]]; then
+    NGINX_OPT+=( -g "$NGINX_CONF" )
+fi
+#echo $NGINX_CONF
+#echo $NGINX_OPT
+
+export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer
+export ASAN_OPTIONS=symbolize=1
+
+echo "nginx $NGINX_OPT"
+if [[ ! -z $ALTPORT ]]; then
+  sed "s|^\(\s\+\)listen\(\s\+\)\(.*\)|\1listen\21\3|g" $NGINX_TEMP_CONFIG -i
+fi
+
+conf_replace "access_log" $ACCESS_LOG
+conf_replace "error_log" "$ERROR_LOG $ERRLOG_LEVEL"
+conf_replace "worker_processes" $WORKERS
+conf_replace "daemon" $NGINX_DAEMON
+conf_replace "working_directory" "\"$(pwd)\""
+conf_replace "push_max_reserved_memory" "$MEM"
+if [[ ! -z $CACHE ]]; then
+  sed "s|^\s*#cachetag.*|${_cacheconf}|g" $NGINX_TEMP_CONFIG -i
+  tmpdir=`pwd`"/.tmp"
+  mkdir $tmpdir 2>/dev/null
+  sed "s|_CACHEDIR_|\"$tmpdir\"|g" $NGINX_TEMP_CONFIG -i
+fi
+
+if [[ -f "$_dynamic_module" ]]; then
+  sed "s|^\s*#load_module.*|load_module \"${_dynamic_module}\";|g" $NGINX_TEMP_CONFIG -i
+fi
+
+#shutdown old redis
+old_redis_pid=`pgrep -f "redis-server 127.0.0.1:$REDIS_PORT"`
+if [[ ! -z $old_redis_pid ]] && [[ -z $persist_redis ]]; then
+  kill $old_redis_pid
+  wait $old_redis_pid
+  sleep 1
+fi
+#start redis
+if [[ -z $no_redis ]]; then
+  if [[ -z $old_redis_pid ]] || [[ -z $persist_redis ]]; then
+    if [[ -z $persist_redis ]]; then
+      redis-server $REDIS_CONF --port $REDIS_PORT &
+      redis_pid=$!
+    else
+      redis-server $REDIS_CONF --port $REDIS_PORT --daemonize yes
+      sleep 1
+      redis_pid=$(cat /tmp/redis-pushmodule.pid)
+    fi
+    echo "started redis on port $REDIS_PORT with pid $redis_pid"
+  else
+    echo "redis already running on port $REDIS_PORT with pid $old_redis_pid"
+  fi
+else
+  echo "don't start redis"
+fi
+
+
+ln -sf $DEVDIR/nginx $SRCDIR/nginx >/dev/null
+ln -sf $DEVDIR/nginx-nchan/src/nginx/src/ $SRCDIR/nginx-source >/dev/null
+
+
+debugger_pids=()
+
+TRAPINT() {
+  if [[ -z $persist_redis ]]; then
+    kill $redis_pid
+    wait $redis_pid
+  fi
+  if [[ $debugger == 1 ]]; then
+    sudo kill $debugger_pids
+  fi
+}
+
+attach_debugger() {
+  master_pid=`cat /tmp/nchan-test-nginx.pid`
+  while [[ -z $child_pids ]]; do
+    child_pids=`pgrep -P $master_pid`
+    sleep 0.1
+  done
+  while read -r line; do
+    echo "attaching $1 to $line"
+    sudo $(printf $2 $line) &
+    debugger_pids+="$!"
+  done <<< $child_pids
+  echo "$1 at $debugger_pids"
+}
+
+attach_ddd_vgdb() {
+  master_pid=$1
+  echo "attaching DDD for vgdb to master process $master_pid"
+  ddd --eval-command "set non-stop off" --eval-command "target remote | vgdb --pid=$master_pid" "$SRCDIR/nginx" 2>/dev/null &
+  debugger_pids+="$!"
+  sleep 1
+  while [[ -z $child_pids ]]; do
+    child_pids=`pgrep -P $master_pid`
+    sleep 0.3
+  done
+  echo "child pids: $child_pids"
+  
+  while read -r line; do
+    echo "attaching DDD for vgdb to $line"
+    ddd --eval-command "set non-stop off" --eval-command "target remote | vgdb --pid=$line" "$SRCDIR/nginx" 2>/dev/null &
+    debugger_pids+="$!"
+  done <<< $child_pids
+  echo "$1 at $debugger_pids"
+}
+
+if [[ $debugger == 1 ]]; then
+  ./nginx $NGINX_OPT
+  sleep 0.2
+  attach_debugger "$DEBUGGER_NAME" "$DEBUGGER_CMD"
+  wait $debugger_pids
+  kill $master_pid
+  rm -f $SRCDIR/nginx $SRCDIR/nginx-source 2>/dev/null
+elif [[ $debug_master == 1 ]]; then
+  pushd $SRCDIR
+  kdbg -a "$NGINX_OPT" "./nginx"
+  popd
+elif [[ $valgrind == 1 ]]; then
+  mkdir ./coredump 2>/dev/null
+  pushd ./coredump >/dev/null
+  if [[ $ATTACH_DDD == 1 ]]; then
+    valgrind $VALGRIND_OPT ../nginx $NGINX_OPT &
+    _master_pid=$!
+    echo "nginx at $_master_pid"
+    sleep 4
+    attach_ddd_vgdb $_master_pid
+    wait $debugger_pids
+    kill $master_pid
+  else
+    echo valgrind $VALGRIND_OPT ../nginx $NGINX_OPT
+    valgrind $VALGRIND_OPT ../nginx $NGINX_OPT
+  fi
+  popd >/dev/null
+elif [[ $alleyoop == 1 ]]; then
+  alleyoop ./nginx $NGINX_OPT
+else
+  ./nginx $NGINX_OPT &
+  wait $!
+fi
diff --git a/debian/modules/nchan/dev/package/.gitignore b/debian/modules/nchan/dev/package/.gitignore
new file mode 100644
index 0000000..d42b353
--- /dev/null
+++ b/debian/modules/nchan/dev/package/.gitignore
@@ -0,0 +1 @@
+pkgs/*
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/.gitignore b/debian/modules/nchan/dev/package/nginx-nchan-static/.gitignore
new file mode 100644
index 0000000..0c456f4
--- /dev/null
+++ b/debian/modules/nchan/dev/package/nginx-nchan-static/.gitignore
@@ -0,0 +1,5 @@
+pkg/
+src/
+nchan/
+*.tar.gz
+*.pkg.*
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/PKGBUILD b/debian/modules/nchan/dev/package/nginx-nchan-static/PKGBUILD
new file mode 100644
index 0000000..9238e95
--- /dev/null
+++ b/debian/modules/nchan/dev/package/nginx-nchan-static/PKGBUILD
@@ -0,0 +1,165 @@
+#!/bin/zsh
+_nginx_ver=1.10.1
+
+_openssl_ver=1.0.2h
+_pcre_ver=8.38
+_zlib_ver=1.2.8
+
+
+_nchan_tag=`git describe --abbrev=0 --tags`
+
+OPTIONS=(!strip debug) #nchan is still young, in case something goes wrong we want good coredumps
+
+if [[ ! -z $MTUNE_GENERIC ]]; then
+  CFLAGS="${CFLAGS//mtune=native/mtune=generic}"
+fi
+
+_pkgname=nginx
+
+_user=nginx
+_group=nginx
+
+_doc_root="/usr/share/${_pkgname}/http"
+_sysconf_path="etc"
+_conf_path="${_sysconf_path}/${_pkgname}"
+_log_path="/var/log/nginx"
+_cache_path="/var/cache/nginx"
+_pid_path="/var/run"
+_lock_path="/var/lock"
+_access_log="/dev/stdout"
+_error_log="errors.log"
+
+pkgver() {
+  echo "${_nginx_ver}.nchan${_nchan_tag:1}"
+}
+
+
+pkgname=nginx-nchan-static
+pkgver=1.10.0.nchan0.99.14
+pkgrel=1
+pkgdesc="Nginx + Nchan - a flexible pub/sub server"
+arch=('i686' 'x86_64')
+
+
+depends=('pcre' 'zlib' 'openssl')
+url="https://nchan.slact.net"
+license=('custom')
+conflicts=('nginx' 'nginx-unstable' 'nginx-svn' 'nginx-devel' 'nginx-custom' 'nginx-nchan-git') 
+provides=('nginx')
+backup=("${_conf_path}/nginx.conf"
+  "${_conf_path}/koi-win"
+  "${_conf_path}/koi-utf"
+  "${_conf_path}/win-utf"
+  "${_conf_path}/mime.types"
+  "${_conf_path}/fastcgi.conf"
+  "${_conf_path}/fastcgi_params"
+  "${_conf_path}/scgi_params"
+  "${_conf_path}/uwsgi_params"
+  "etc/logrotate.d/nginx")
+_user=nginx
+_group=nginx
+
+source=("http://nginx.org/download/nginx-${_nginx_ver}.tar.gz"
+  "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${_pcre_ver}.tar.gz"
+  "https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz"
+  "http://zlib.net/zlib-${_zlib_ver}.tar.gz"
+  "nginx.conf"
+  "nginx.logrotate"
+  "nginx.service"
+  "git+https://github.com/slact/nchan.git#tag=${_nchan_tag}"
+       )
+
+md5sums=('088292d9caf6059ef328aa7dda332e44'
+	 '8a353fe1450216b6655dfcf3561716d9'
+	 '9392e65072ce4b614c1392eefc1f23d0'
+	 '44d667c142d7cda120332623eab69f40'
+	 '845cab784b50f1666bbf89d7435ac7af'
+	 '79031b58828462dec53a9faed9ddb36a'
+	 '6696dc228a567506bca3096b5197c9db'
+         'SKIP')
+
+build() {
+  cd ${srcdir}/openssl-${_openssl_ver}
+  #don't install_docs
+  sed -i 's/^install: all install_docs install_sw$/install: all install_sw/' Makefile.org
+  rm Makefile #damn, openssl...
+    
+  local _src_dir="${srcdir}/nginx-$_nginx_ver"
+  local _build_dir="${_src_dir}/objs"
+  cd $_src_dir
+  
+  CONFIGURE=(
+    --prefix=/${_conf_path}
+    --sbin-path=/usr/sbin/nginx
+    --conf-path=/${_conf_path}/nginx.conf
+    --error-log-path=${_log_path}/error.log
+    --http-log-path=${_log_path}/access.log
+    --pid-path=${_pid_path}/nginx.pid
+    --lock-path=${_pid_path}/nginx.lock
+    
+    --http-client-body-temp-path=${_cache_path}/client_temp
+    --http-proxy-temp-path=${_cache_path}/proxy_temp
+    --http-fastcgi-temp-path=${_cache_path}/fastcgi_temp
+    --http-uwsgi-temp-path=${_cache_path}/uwsgi_temp
+    --http-scgi-temp-path=${_cache_path}/scgi_temp
+    
+    --user=${_user}
+    --group=${_group}
+    
+    --with-zlib="../zlib-${_zlib_ver}"
+    --with-pcre="../pcre-${_pcre_ver}"
+    --with-openssl="../openssl-${_openssl_ver}"
+    
+    --with-http_ssl_module
+    --with-http_realip_module
+    --with-http_addition_module
+    --with-http_sub_module
+    --with-http_dav_module
+    --with-http_flv_module
+    --with-http_mp4_module    
+    --with-http_gunzip_module
+    --with-http_gzip_static_module
+    --with-http_random_index_module
+    --with-http_secure_link_module
+    --with-http_stub_status_module
+    --with-http_auth_request_module
+    --with-mail
+    --with-mail_ssl_module
+    --with-file-aio
+    --with-http_v2_module
+    --with-ipv6
+    --with-debug
+    --with-ld-opt="-static-libgcc" #totally statically link everything
+    --with-cc-opt="-static"
+    --add-module="../nchan")
+
+  CFLAGS="$CFLAGS -ggdb" #make sure debug symbols are present
+  
+  ./configure ${CONFIGURE[@]}
+
+  make -j1
+}
+
+package() {
+  cd "${srcdir}/nginx-${_nginx_ver}"
+
+  mkdir -p ${pkgdir}/$_conf_path/sites-enabled/
+  mkdir -p ${pkgdir}/$_conf_path/sites-available/
+  mkdir -p ${pkgdir}${_cache_path}
+  
+  make DESTDIR="$pkgdir/" install >/dev/null
+  
+  sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/$_conf_path/nginx.conf
+  
+  install -d "${pkgdir}/${_tmp_path}" 
+  install -d "${pkgdir}/${_doc_root}" 
+  
+  mv "${pkgdir}/${_conf_path}/html/"* "${pkgdir}/${_doc_root}"
+  rm -rf "${pkgdir}/${_conf_path}/html"
+  
+  install -D -m644 "${srcdir}/nginx.logrotate" "${pkgdir}/etc/logrotate.d/${_pkgname}"
+  install -D -m644 "${srcdir}/nginx.conf" "${pkgdir}/etc/conf.d/${_pkgname}"
+  install -D -m644 "${srcdir}/nginx.service" "${pkgdir}/lib/systemd/system/nginx.service"
+  install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/nginx/LICENSE"
+
+}
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.conf b/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.conf
new file mode 100644
index 0000000..1b748a0
--- /dev/null
+++ b/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.conf
@@ -0,0 +1 @@
+NGINX_CONFIG=/etc/nginx/nginx.conf
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.logrotate b/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.logrotate
new file mode 100644
index 0000000..f6f7246
--- /dev/null
+++ b/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.logrotate
@@ -0,0 +1,11 @@
+/var/log/nginx/*log
+/var/log/nginx/*/*log
+{
+  daily
+  missingok
+  create 640 http log
+  compress
+  postrotate
+    [ ! -f /run/nginx.pid ] || kill -USR1 `cat /run/nginx.pid`
+  endscript
+}
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.service b/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.service
new file mode 100644
index 0000000..c237fd3
--- /dev/null
+++ b/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=A high performance web server and a reverse proxy server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/nginx.pid
+PrivateDevices=yes
+SyslogLevel=err
+
+ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; error_log stderr;'
+ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; error_log stderr;'
+ExecReload=/usr/bin/kill -HUP $MAINPID
+KillSignal=SIGQUIT
+KillMode=mixed
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/modules/nchan/dev/package/repackage.sh b/debian/modules/nchan/dev/package/repackage.sh
new file mode 100755
index 0000000..c3dcfe2
--- /dev/null
+++ b/debian/modules/nchan/dev/package/repackage.sh
@@ -0,0 +1,28 @@
+#!/bin/zsh
+mydir=${0:a:h}
+
+pkgdir=$mydir/pkgs
+
+rm $pkgdir/* -fv >/dev/null 2>/dev/null
+
+pushd $mydir/nginx-nchan-static
+MTUNE_GENERIC=1 PKGDEST="$pkgdir" makepkg
+popd
+
+pushd $pkgdir
+archpkg=`echo *pkg.tar.xz`
+
+tarname=${archpkg:r}
+tarname=${tarname:r}
+tarname=${tarname:r}
+
+echo $tarname
+
+bundle exec fpm -s pacman -t tar -n "$tarname" $archpkg
+gzip -f "$tarname.tar"
+
+bundle exec fpm -s pacman --no-auto-depends -t deb $archpkg
+#bundle exec fpm -s pacman -t rpm $archpkg
+#bundle exec fpm -s pacman -t osxpkg $archpkg
+
+popd
diff --git a/debian/modules/nchan/dev/pub-multi.rb b/debian/modules/nchan/dev/pub-multi.rb
new file mode 100755
index 0000000..948bca1
--- /dev/null
+++ b/debian/modules/nchan/dev/pub-multi.rb
@@ -0,0 +1,39 @@
+#!/usr/bin/ruby
+require 'securerandom'
+require_relative 'pubsub.rb'
+require "optparse"
+server= "localhost:8082"
+msg=false
+loop=false
+repeat_sec=0.5
+content_type=nil
+on_response=Proc.new {}
+method=:POST
+runonce=false
+
+#Typhoeus::Config.verbose=true
+
+pubs = []
+ARGV.each do |v|
+  url = "http://#{server}/pub/#{v}"
+  puts "Publishing to #{url}."
+  pub = [v, Publisher.new(url, :timeout => 10000)]
+  pub[1].nofail = true
+  pubs << pub
+end
+
+repeat=true
+i=1
+
+while repeat do
+  puts "press enter to send message ##{i}"
+  STDIN.gets
+  n=0
+  pubs.each do |p|
+    n+=1
+    this_msg = "#{p.first} (#{n}) -- #{i}"
+    p.last.submit this_msg, method, content_type, &on_response
+    puts "sent #{this_msg}"
+  end
+  i+=1
+end
diff --git a/debian/modules/nchan/dev/pub.rb b/debian/modules/nchan/dev/pub.rb
new file mode 100755
index 0000000..6bfd32f
--- /dev/null
+++ b/debian/modules/nchan/dev/pub.rb
@@ -0,0 +1,90 @@
+#!/usr/bin/ruby
+require 'securerandom'
+require_relative 'pubsub.rb'
+require "optparse"
+server= "localhost:8082"
+msg=false
+loop=false
+repeat_sec=0.5
+content_type=nil
+msg_gen = false
+on_response=Proc.new {}
+method=:POST
+runonce=false
+accept = nil
+timeout = 3
+verbose = nil
+
+opt=OptionParser.new do |opts|
+  opts.on("-s", "--server SERVER (#{server})", "server and port."){|v| server=v}
+  opts.on("-v", "--verbose", "Blabberhttp"){verbose=true}
+  opts.on("-l", "--loop [SECONDS]", "re-send message every N seconds (#{repeat_sec})") do |v| 
+    loop=true
+    repeat_sec=Float(v) unless v.nil?
+  end
+  opts.on("-M", "--method [#{method}]", "method for request to server"){|v| method= v.upcase.to_sym}
+  opts.on("-m", "--message MSG", "publish this message instead of prompting"){|v| msg=v}
+  opts.on("-1", "--once", "run once then exit"){runonce=true}
+  opts.on("-a", "--accept TYPE", "set Accept header"){|v| accept=v}
+  opts.on("-c", "--content-type TYPE", "set content-type for all messages"){|v| content_type=v}
+  opts.on("-e",  "--eval RUBY_BLOCK", '{|n| "message #{n}" }'){|v| msg_gen = eval " Proc.new #{v} "}
+  opts.on("-d", "--delete", "delete channel via a DELETE request"){method = :DELETE}
+  opts.on("-p", "--put", "create channel without submitting message"){method = :PUT}
+  opts.on("-t", "--timeout SECONDS", "publishing timeout (sec). default #{timeout} sec"){|v| timeout = v.to_i}
+  opts.on("-r",  "--response", 'Show response code and body') do
+    on_response = Proc.new do |code, body|
+      puts code
+      puts body
+    end
+  end
+end
+opt.banner="Usage: pub.rb [options] url"
+opt.parse!
+
+url = "http://#{server}#{ARGV.last}"
+
+puts "Publishing to #{url}."
+
+
+loopmsg=("\r"*20) + "sending message #"
+
+pub = Publisher.new url, nostore: true, timeout: timeout, verbose: verbose
+pub.accept=accept
+pub.nofail=true
+repeat=true
+i=1
+if loop then
+  puts "Press enter to send message."
+end
+while repeat do
+  if msg or msg_gen
+    if loop
+      sleep repeat_sec
+      print "#{loopmsg} #{i}"
+    elsif !runonce
+      STDIN.gets
+    end
+    if msg
+      pub.submit msg, method, content_type, &on_response
+    elsif msg_gen
+      this_msg = msg_gen.call(i).to_s
+      puts this_msg
+      pub.submit this_msg, method, content_type, &on_response
+    end
+  else
+    if loop
+      puts "Can't repeat with custom message. use -m option"
+    end
+    puts "Enter message, press enter twice."
+    message = ""
+    while((line = STDIN.gets) != "\n") do #doesn't work when there are parameters. wtf?
+      message << line
+    end
+    message=message[0..-2] #remove trailing newline
+    
+    pub.submit message, method, content_type, &on_response
+    puts ""
+  end
+  i+=1
+  exit 0 if runonce
+end
diff --git a/debian/modules/nchan/dev/pubsub.rb b/debian/modules/nchan/dev/pubsub.rb
new file mode 100644
index 0000000..dcd7760
--- /dev/null
+++ b/debian/modules/nchan/dev/pubsub.rb
@@ -0,0 +1,1483 @@
+#!/usr/bin/ruby
+require 'typhoeus'
+require 'json'
+require 'pry'
+require 'celluloid/current'
+require 'date'
+Typhoeus::Config.memoize = false
+require 'celluloid/io'
+require 'websocket'
+require 'uri'
+require "http/parser"
+require "http/2"
+
+PUBLISH_TIMEOUT=3 #seconds
+
+class Message
+  attr_accessor :content_type, :message, :times_seen, :etag, :last_modified
+  def initialize(msg, last_modified=nil, etag=nil)
+    @times_seen=1
+    @message, @last_modified, @etag = msg, last_modified, etag
+  end
+  def serverside_id
+    timestamp=nil
+    if last_modified
+      timestamp = DateTime.httpdate(last_modified).to_time.utc.to_i
+    end
+    "#{timestamp}:#{etag}"
+  end
+  def id=(val)
+    @id=val
+  end
+  def id
+    @id||=serverside_id
+  end
+  def unique_id
+    if id.include? ","
+      time, etag = id.split ":"
+      etag = etag.split(",").map{|x| x[0] == "[" ? x : "?"}.join "," #]
+      [time, etag].join ":"
+    else
+      id
+    end
+  end
+  def to_s
+    @message
+  end
+  
+  def self.each_multipart_message(content_type, body)
+    content_type = content_type.last if Array === content_type 
+    matches=/^multipart\/mixed; boundary=(?<boundary>.*)/.match content_type
+    
+    if matches
+      splat = body.split(/^--#{Regexp.escape matches[:boundary]}-?-?\r?\n?/)
+      splat.shift
+      
+      splat.each do |v|
+        mm=(/(Content-Type:\s(?<content_type>.*?)\r\n)?\r\n(?<body>.*)\r\n/m).match v
+        yield mm[:content_type], mm[:body], true
+      end
+      
+    else
+      yield content_type, body
+    end
+  end
+end
+
+class MessageStore
+  include Enumerable
+  attr_accessor :msgs, :name
+
+  def matches? (other_msg_store)
+    my_messages = messages
+    if MessageStore === other_msg_store
+      other_messages = other_msg_store.messages
+      other_name = other_msg_store.name
+    else
+      other_messages = other_msg_store
+      other_name = "?"
+    end
+    unless my_messages.count == other_messages.count 
+      err =  "Message count doesn't match:\r\n"
+      err << "#{self.name}: #{my_messages.count}\r\n"
+      err << "#{self.to_s}\r\n"
+      
+      err << "#{other_name}: #{other_messages.count}\r\n"
+      err << "#{other_msg_store.to_s}"
+      return false, err
+    end
+    other_messages.each_with_index do |msg, i|
+      return false, "Message #{i} doesn't match. (#{self.name} |#{my_messages[i].length}|, #{other_name} |#{msg.length}|) " if my_messages[i] != msg
+    end
+    true
+  end
+
+  def initialize(opt={})
+    @array||=opt[:noid]
+    clear
+  end
+
+  def messages
+    self.to_a.map{|m|m.to_s}
+  end
+
+  #remove n oldest messages
+  def remove_old(n=1)
+    n.times {@msgs.shift}
+    @msgs.count
+  end
+  
+  def clear
+    @msgs= @array ? [] : {}
+  end
+  
+  def to_a
+    @array ? @msgs : @msgs.values
+  end
+  def to_s
+    buf=""
+    each do |msg|
+      m = msg.to_s
+      m = m.length > 20 ? "#{m[0...20]}..." : m
+      buf<< "<#{msg.id}> \"#{m}\" (count: #{msg.times_seen})\r\n"
+    end
+    buf
+  end
+
+  def [](i)
+    @msgs[i]
+  end
+  
+  def each
+    if @array
+      @msgs.each {|msg| yield msg }
+    else
+      @msgs.each {|key, msg| yield msg }
+    end
+  end
+  def <<(msg)
+    if @array
+      @msgs << msg
+    else
+      if (cur_msg=@msgs[msg.unique_id])
+        #puts "Different messages with same id: #{msg.id}, \"#{msg.to_s}\" then \"#{cur_msg.to_s}\"" unless cur_msg.message == msg.message
+        cur_msg.times_seen+=1
+        cur_msg.times_seen
+      else
+        @msgs[msg.unique_id]=msg
+        1
+      end
+    end
+  end
+end
+
+class Subscriber
+  
+  class Client
+    attr_accessor :concurrency
+    class ErrorResponse
+      attr_accessor :code, :msg, :connected, :caller, :bundle
+      def initialize(code, msg, bundle=nil, what=nil, failword=nil)
+        self.code = code
+        self.msg = msg
+        if Subscriber::Client::ParserBundle === bundle
+          self.bundle=bundle
+          self.connected = bundle.connected?
+        else
+          self.connected = bundle
+        end
+        self.connected = connected
+        
+        @what = what || ["handshake", "connection"]
+        @failword = failword || " failed"
+      end
+      
+      def to_s
+        "#{(caller.class.name.split('::').last || self.class.name.split('::')[-2])} #{connected ? @what.last : @what.first}#{@failword}: #{msg} (code #{code})"
+      end  
+    
+    end
+    
+    def self.inherited(subclass)
+      @@inherited||=[]
+      @@inherited << subclass
+    end
+    
+    def self.lookup(name)
+      @@inherited.each do |klass|
+        return klass if klass.aliases.include? name
+      end
+      nil
+    end
+    def self.aliases
+      []
+    end
+      
+    def self.unique_aliases
+      uniqs=[]
+      @@inherited.each do |klass|
+        uniqs << klass.aliases.first if klass.aliases.length > 0
+      end
+      uniqs
+    end
+    
+    def provides_msgid?
+      true
+    end
+    
+    def error(code, msg, bundle=nil)
+      err=ErrorResponse.new code, msg, bundle, @error_what, @error_failword
+      err.caller=self
+      err
+    end
+    
+    class ParserBundle
+      attr_accessor :uri, :sock, :body_buf, :connected, :verbose, :parser, :subparser, :headers, :code, :last_modified, :etag
+      def initialize(uri, *arg)
+        @uri=uri
+        open_socket
+      end
+      def open_socket
+        case uri.scheme
+        when /^(ws|http|h2c)$/
+          @sock = Celluloid::IO::TCPSocket.new(uri.host, uri.port)
+        when /^(wss|https|h2)$/
+          @sock = Celluloid::IO::SSLSocket.new(Celluloid::IO::TCPSocket.new(uri.host, uri.port))
+        else
+          raise ArgumentError, "unexpected uri scheme #{uri.scheme}"
+        end
+        self
+      end
+      
+      def buffer_body!
+        @body_buf||=""
+      end
+      def connected?
+        @connected
+      end
+      def on_headers(code=nil, h=nil, &block)
+        @body_buf.clear if @body_buf
+        if block_given?
+          @on_headers = block
+        else
+          @on_headers.call(code, h) if @on_headers
+        end
+      end
+      
+      def on_chunk(ch=nil, &block)
+        if block_given?
+          @on_chunk = block
+        else
+          @body_buf << ch if @body_buf
+          @on_chunk.call(ch) if @on_chunk
+        end
+      end
+      
+      def on_response(code=nil, headers=nil, &block)
+        if block_given?
+          @on_response = block
+        else
+          @on_response.call(code, headers, @body_buf) if @on_response
+        end
+        
+      end
+      
+      def on_error(msg=nil, e=nil, &block)
+        if block_given?
+          @on_error = block
+        else
+          @on_error.call(msg, e) if @on_error
+        end
+      end
+    end
+    
+    def handle_bundle_error(bundle, msg, err)
+      if err && !(EOFError === err)
+        msg="<#{msg}>\n#{err.backtrace.join "\n"}"
+      end
+      @subscriber.on_failure error(0, msg, bundle)
+      @subscriber.finished+=1
+      close bundle
+    end
+    
+    def poke(what=nil)
+      if what == :ready
+        (@notready.nil? || @notready > 0) && @cooked_ready.wait
+      else
+        @connected > 0 && @cooked.wait
+      end
+    end
+    
+    def initialize(*arg)
+      @notready = 9000
+      @cooked_ready=Celluloid::Condition.new
+    end
+    
+  end
+  
+  class WebSocketClient < Client
+    include Celluloid::IO
+    
+    def self.aliases
+      [:websocket, :ws]
+    end
+    
+    #a little sugar for handshake errors
+    class WebSocket::Handshake::Client
+      attr_accessor :data
+      def response_code(what=:code)
+        resp=@data.match(/^HTTP\/1.1 (?<code>\d+) (?<line>[^\\\r\\\n]+)/)
+        resp[what]
+      end
+      def response_line
+        response_code :line
+      end
+    end
+    
+    class WebSocketBundle
+      attr_accessor :ws, :sock, :last_message_time
+      def initialize(handshake, sock)
+        @buf=""
+        self.ws = WebSocket::Frame::Incoming::Client.new(version: handshake.version)
+        self.sock = sock
+      end
+      
+      def read
+        @buf.clear
+        ws << sock.readpartial(4096, @buf)
+      end
+      
+      def next
+        ws.next
+      end
+    end
+    
+    def provides_msgid?
+      false
+    end
+    
+    attr_accessor :last_modified, :etag, :timeout
+    def initialize(subscr, opt={})
+      super
+      @last_modified, @etag, @timeout = opt[:last_modified], opt[:etag], opt[:timeout].to_i || 10
+      @connect_timeout = opt[:connect_timeout]
+      @subscriber=subscr
+      @url=subscr.url
+      @url = @url.gsub(/^h(ttp|2)(s)?:/, "ws\\2:")
+      
+      @concurrency=(opt[:concurrency] || opt[:clients] || 1).to_i
+      @retry_delay=opt[:retry_delay]
+      @ws = {}
+      @connected=0
+      @notready=@concurrency
+      @nomsg = opt[:nomsg]
+      @http2 = opt[:http2]
+      if @timeout
+        @timer = after(@timeout) do
+          @subscriber.on_failure error(0, "Timeout", b)
+          @ws.each do |b, v|
+            close b
+          end
+        end
+      end
+    end
+    
+    def try_halt
+      @disconnected ||= 0
+      @disconnected += 1
+      if @disconnected == @concurrency
+        halt
+      end
+    end
+    
+    def halt
+      @halting = true
+    end
+    
+    def run(was_success = nil)
+      uri = URI.parse(@url)
+      uri.port ||= (uri.scheme == "ws" ? 80 : 443)
+      @cooked=Celluloid::Condition.new
+      @connected = @concurrency
+      if @http2
+        @subscriber.on_failure error(0, "Refusing to try websocket over HTTP/2")
+        @connected = 0
+        @notready = 0
+        @cooked_ready.signal false
+        @cooked.signal true
+        return
+      end
+      raise ArgumentError, "invalid websocket scheme #{uri.scheme} in #{@url}" unless uri.scheme.match /^wss?$/
+      @concurrency.times do
+        begin
+          sock = ParserBundle.new(uri).open_socket.sock
+        rescue SystemCallError => e
+          @subscriber.on_failure error(0, e.to_s)
+          close nil
+          return
+        end
+          
+        @handshake = WebSocket::Handshake::Client.new(url: @url)
+        sock << @handshake.to_s
+        
+        #handshake response
+        loop do
+          @handshake << sock.readline
+          break if @handshake.finished?
+        end
+        
+        if @handshake.valid?
+          bundle = WebSocketBundle.new(@handshake, sock)
+          @ws[bundle]=true
+          async.listen bundle
+          @notready-=1
+          @cooked_ready.signal true if @notready == 0
+        else
+          @subscriber.on_failure error(@handshake.response_code, @handshake.response_line)
+          close nil
+        end
+      end
+    end
+    
+    def listen(bundle)
+      loop do
+        begin
+          bundle.read
+          while msg = bundle.next do
+            @timer.reset if @timer
+            if on_message(msg.data, msg.type, bundle) == false
+              close bundle
+              return 
+            end
+          end
+        rescue EOFError
+          bundle.sock.close
+          close bundle
+          return
+        end
+      end
+    end
+    
+    def on_error
+      if !@connected[ws]
+        @subscriber.on_failure error(ws.handshake.response_code, ws.handshake.response_line)
+        try_halt
+      end
+    end
+    
+    def on_message(data, type, bundle)
+      #puts "Received message: #{data} type: #{type}"
+      if type==:close
+        close_frame = WebSocket::Frame::Outgoing::Client.new(version: @handshake.version, type: :close)
+        bundle.sock << close_frame.to_s
+        #server should close the connection, just reply
+        data.match(/(\d+)\s(.*)/)
+        @subscriber.on_failure error(($~[1] || 0).to_i, $~[2] || "", true)
+      elsif type==:ping
+        ping_frame = WebSocket::Frame::Outgoing::Client.new(version: @handshake.version, data: data, type: :pong)
+        bundle.sock << ping_frame.to_s
+      elsif type==:text
+        msg= @nomsg ? data : Message.new(data)
+        bundle.last_message_time=Time.now.to_f
+        @subscriber.on_message(msg, bundle)
+      else
+        raise "unexpected websocket frame #{type} data #{data}"
+      end
+    end
+    
+    def close(bundle)
+      if bundle
+        @ws.delete bundle
+        bundle.sock.close unless bundle.sock.closed?
+      end
+      @connected -= 1
+      if @connected <= 0
+        binding.pry unless @ws.count == 0
+        #binding.pry
+        @cooked.signal true
+      end
+    end
+    
+  end
+  
+  class LongPollClient < Client
+    include Celluloid::IO
+    
+    def self.aliases
+      [:longpoll]
+    end
+    
+    def error(*args)
+      @error_what||= ["#{@http2 ? "HTTP/2" : "HTTP"} Request"]
+      super
+    end
+    
+    class HTTPBundle < ParserBundle
+      attr_accessor :parser, :sock, :last_message_time, :done, :time_requested, :request_time, :stop_after_headers
+      
+      def initialize(uri, user_agent, accept="*/*", extra_headers={})
+        super
+        @accept = accept
+        @rcvbuf=""
+        @sndbuf=""
+        @parser = Http::Parser.new
+        @done = false
+        extra_headers = extra_headers.map{|k,v| "#{k}: #{v}\n"}.join ""
+        @send_noid_str= <<-END.gsub(/^ {10}/, '')
+          GET #{uri.path} HTTP/1.1
+          Host: #{uri.host}#{uri.default_port == uri.port ? "" : ":#{uri.port}"}
+          #{extra_headers}Accept: #{@accept}
+          User-Agent: #{user_agent || "HTTPBundle"}
+          
+        END
+        
+        @send_withid_fmt= <<-END.gsub(/^ {10}/, '')
+          GET #{uri.path} HTTP/1.1
+          Host: #{uri.host}#{uri.default_port == uri.port ? "" : ":#{uri.port}"}
+          #{extra_headers}Accept: #{@accept}
+          User-Agent: #{user_agent || "HTTPBundle"}
+          If-Modified-Since: %s
+          If-None-Match: %s
+          
+        END
+        
+        @parser.on_headers_complete = proc do |h|
+          if verbose 
+            puts "< HTTP/1.1 #{@parser.status_code} [...]\r\n#{h.map {|k,v| "< #{k}: #{v}"}.join "\r\n"}"
+          end
+          @headers=h
+          @last_modified = h['Last-Modified']
+          @etag = h['Etag']
+          @chunky = h['Transfer-Encoding']=='chunked'
+          @gzipped = h['Content-Encoding']=='gzip'
+          @code=@parser.status_code
+          on_headers @parser.status_code, h
+          if @stop_after_headers
+            @bypass_parser = true
+            :stop
+          end
+        end
+        
+        @parser.on_body = proc do |chunk|
+          handle_chunk chunk
+        end
+        
+        @parser.on_message_complete = proc do
+          @chunky = nil
+          @gzipped = nil
+          on_response @parser.status_code, @parser.headers
+        end
+        
+      end
+      
+
+      def handle_chunk(chunk)
+        chunk = Zlib::GzipReader.new(StringIO.new(chunk)).read if @gzipped 
+        on_chunk chunk
+      end
+      private :handle_chunk
+      
+      def reconnect?
+        true
+      end
+      
+      def send_GET(msg_time=nil, msg_tag=nil)
+        @last_modified = msg_time.to_s if msg_time
+        @etag = msg_tag.to_s if msg_tag
+        @sndbuf.clear 
+        data = @last_modified ? sprintf(@send_withid_fmt, @last_modified, @etag) : @send_noid_str
+        @sndbuf << data
+        
+        if @headers && @headers["Connection"]=="close" && [200, 201, 202, 304, 408].member?(@parser.status_code) && reconnect?
+          sock.close
+          open_socket
+          @parser.reset!
+        end
+        
+        @time_requested=Time.now.to_f
+        if verbose
+          puts "", data.gsub(/^.*$/, "> \\0")
+        end
+        sock << @sndbuf
+      end
+      
+      def read
+        @rcvbuf.clear
+        begin
+          sock.readpartial(1024*10000, @rcvbuf)
+          unless @bypass_parser
+            @parser << @rcvbuf
+          else
+            handle_chunk @rcvbuf
+          end
+        rescue HTTP::Parser::Error => e
+          on_error "Invalid HTTP Respose - #{e}", e
+        rescue EOFError => e
+          on_error "Server closed connection...", e
+        rescue => e 
+          on_error "#{e.class}: #{e}", e
+        end
+        return false if @done || sock.closed?
+      end
+    end
+    
+    class HTTP2Bundle < ParserBundle
+      attr_accessor :stream, :sock, :last_message_time, :done, :time_requested, :request_time
+      GET_METHOD="GET"
+      def initialize(uri, user_agent, accept="*/*", extra_headers=nil)
+        super
+        @done = false
+        @rcvbuf=""
+        @head = {
+          ':scheme' => uri.scheme,
+          ':method' => GET_METHOD,
+          ':path' => uri.path,
+          ':authority' => [uri.host, uri.port].join(':'),
+          'user-agent' => "#{user_agent || "HTTP2Bundle"}",
+          'accept' => accept
+        }
+        if extra_headers
+          extra_headers.each{ |h, v| @head[h.to_s.downcase]=v }
+        end
+        @client = HTTP2::Client.new
+        @client.on(:frame) do |bytes|
+          #puts "Sending bytes: #{bytes.unpack("H*").first}"
+          @sock.print bytes
+          @sock.flush
+        end
+        
+        @client.on(:frame_sent) do |frame|
+          #puts "Sent frame: #{frame.inspect}" if verbose
+        end
+        @client.on(:frame_received) do |frame|
+          #puts "Received frame: #{frame.inspect}" if verbose
+        end
+        @resp_headers={}
+        @resp_code=nil
+      end
+      
+      def reconnect?
+        false
+      end
+      
+      def send_GET(msg_time=nil, msg_tag=nil)
+        @last_modified = msg_time.to_s if msg_time
+        @etag = msg_tag.to_s if msg_tag
+        @time_requested=Time.now.to_f
+        if msg_time
+          @head['if-modified-since'] = msg_time.to_s
+        else
+          @head.delete @head['if-modified-since']
+        end
+        
+        if msg_tag
+          @head['if-none-match'] = msg_tag.to_s
+        else
+          @head.delete @head['if-none-match']
+        end
+        
+        @stream = @client.new_stream
+        @resp_headers.clear
+        @resp_code=0
+        @stream.on(:close) do |k,v|
+          on_response @resp_code, @resp_headers
+        end
+        @stream.on(:headers) do |h|
+          h.each do |v|
+            puts "< #{v.join ': '}" if verbose
+            case v.first
+            when ":status"
+              @resp_code = v.last.to_i
+            when /^:/
+              @resp_headers[v.first] = v.last
+            else
+              @resp_headers[v.first.gsub(/(?<=^|\W)\w/) { |v| v.upcase }]=v.last
+            end
+          end
+          @headers = @resp_headers
+          @code = @resp_code
+          on_headers @resp_code, @resp_headers
+        end
+        @stream.on(:data) do |d|
+          #puts "got data chunk #{d}"
+          on_chunk d
+        end
+        
+        @stream.on(:altsvc) do |f|
+          puts "received ALTSVC #{f}"
+        end
+        
+        @stream.on(:half_close) do
+          puts "", @head.map {|k,v| "> #{k}: #{v}"}.join("\r\n") if verbose
+        end
+        
+        @stream.headers(@head, end_stream: true)
+      end
+      
+      def read
+        return false if @done || @sock.closed?
+        begin
+          @rcv = @sock.readpartial 1024
+          @client << @rcv
+        rescue EOFError => e
+          if @rcv && @rcv[0..5]=="HTTP/1"
+            on_error @rcv.match(/^HTTP\/1.*/)[0].chomp, e
+          else
+            on_error "Server closed connection...", e
+          end
+          @sock.close
+        rescue => e
+          on_error "#{e.class}: #{e.to_s}", e
+          @sock.close
+        end
+        return false if @done || @sock.closed?
+      end
+      
+    end
+    
+    attr_accessor :timeout
+    def initialize(subscr, opt={})
+      super
+      @last_modified, @etag, @timeout = opt[:last_modified], opt[:etag], opt[:timeout].to_i || 10
+      @connect_timeout = opt[:connect_timeout]
+      @subscriber=subscr
+      @url=subscr.url
+      @concurrency=opt[:concurrency] || opt[:clients] || 1
+      @gzip=opt[:gzip]
+      @retry_delay=opt[:retry_delay]
+      @nomsg=opt[:nomsg]
+      @bundles={}
+      @body_buf=""
+      @extra_headers = opt[:extra_headers]
+      @verbose=opt[:verbose]
+      @http2=opt[:http2] || opt[:h2]
+      if @timeout
+        @timer = after(@timeout) do 
+          @subscriber.on_failure error(0, "Timeout")
+          @bundles.each do |b, v|
+            close b
+          end
+        end
+      end
+    end
+    
+    def run(was_success = nil)
+      uri = URI.parse(@url)
+      uri.port||= uri.scheme.match(/^(ws|http)$/) ? 80 : 443
+      @cooked=Celluloid::Condition.new
+      @connected = @concurrency
+      @notready = @concurrency
+      @concurrency.times do |i|
+        begin
+          bundle = new_bundle(uri, "pubsub.rb #{self.class.name} #{@use_http2 ? "(http/2)" : ""} ##{i}")
+        rescue SystemCallError => e
+          @subscriber.on_failure error(0, e.to_s)
+          close nil
+          return
+        end
+        
+        @bundles[bundle]=true
+        bundle.send_GET @last_modified, @etag
+        async.listen bundle
+      end
+    end
+    
+    def request_code_ok(code, bundle)
+      if code != 200
+        if code == 304 || code == 408
+          @subscriber.on_failure error(code, "", bundle)
+          @subscriber.finished+=1
+          close bundle
+        elsif @subscriber.on_failure(error(code, "", bundle)) == false
+          @subscriber.finished+=1
+          close bundle
+        else
+          binding.pry
+          Celluloid.sleep @retry_delay if @retry_delay
+          bundle.send_GET
+        end
+        false
+      else
+        @timer.reset if @timer
+        true
+      end
+    end
+    
+    def new_bundle(uri, useragent, accept="*/*", extra_headers={})
+      if @extra_headers
+        extra_headers = extra_headers.merge @extra_headers
+      end
+      if @gzip
+        extra_headers = extra_headers.merge({ "Accept-Encoding" => "gzip, deflate"})
+      end
+      b=(@http2 ? HTTP2Bundle : HTTPBundle).new(uri, useragent, accept, extra_headers)
+      b.on_error do |msg, err|
+        handle_bundle_error b, msg, err
+      end
+      b.verbose=@verbose
+      setup_bundle b
+      b
+    end
+    
+    def setup_bundle(b)
+      b.buffer_body!
+      b.on_response do |code, headers, body|
+        @subscriber.waiting-=1
+        # Headers and body is all parsed
+        b.last_modified = headers["Last-Modified"]
+        b.etag = headers["Etag"]
+        b.request_time = Time.now.to_f - b.time_requested
+        if request_code_ok(code, b)
+          on_message_ret=nil
+          Message.each_multipart_message(headers["Content-Type"], body) do |content_type, msg_body, multi|
+            unless @nomsg
+              msg=Message.new msg_body.dup
+              msg.content_type=content_type
+              unless multi
+                msg.last_modified= headers["Last-Modified"]
+                msg.etag= headers["Etag"]
+              end
+            else
+              msg=msg_body.dup
+            end
+            
+            on_message_ret= @subscriber.on_message(msg, b)
+          end
+          
+          unless on_message_ret == false
+            @subscriber.waiting+=1
+            b.send_GET
+          else
+            @subscriber.finished+=1
+            close b
+          end
+        end
+      end
+      
+      b.on_error do |msg, err|
+        handle_bundle_error b, msg, err
+      end
+    end
+    
+    def listen(bundle)
+      loop do
+        begin
+          return false if bundle.read == false
+        rescue EOFError
+          @subscriber.on_failure error(0, "Server Closed Connection"), bundle
+          close bundle
+          return false
+        end
+      end
+    end
+    
+    def close(bundle)
+      if bundle
+        bundle.done=true
+        bundle.sock.close unless bundle.sock.closed?
+        @bundles.delete bundle
+      end
+      @connected -= 1
+      if @connected <= 0
+        @cooked.signal true
+      end
+    end
+    
+  end
+  
+  class IntervalPollClient < LongPollClient
+    def self.aliases
+      [:intervalpoll, :http, :interval, :poll]
+    end
+    
+    def request_code_ok(code, bundle)
+      if code == 304
+        if @subscriber.on_failure(error(code, "", bundle), true) == false
+          @subscriber.finished+=1
+          close bundle
+        else
+          Celluloid.sleep(@retry_delay || 1)
+          bundle.send_GET
+          false
+        end
+      else
+        super
+      end
+    end
+  end
+  
+  class EventSourceClient < LongPollClient
+    include Celluloid::IO
+    
+    def self.aliases
+      [:eventsource, :sse]
+    end
+    
+    def error(c,m,cn=nil)
+      @error_what ||= [ "#{@http2 ? 'HTTP/2' : 'HTTP'} Request failed", "connection closed" ]
+      @error_failword ||= ""
+      super
+    end
+    
+    class EventSourceParser
+      attr_accessor :buf, :on_headers, :connected
+      def initialize
+        @buf={data: "", id: "", comments: ""}
+        buf_reset
+      end
+      
+      def buf_reset
+        @buf[:data].clear
+        @buf[:id].clear
+        @buf[:comments].clear
+        @buf[:retry_timeout] = nil
+        @buf[:event] = nil
+      end
+      
+      def buf_empty?
+        @buf[:comments].length == 0 && @buf[:data].length == 0
+      end
+      
+      def parse_line(line)
+        ret = nil
+        case line
+        when /^: ?(.*)/
+          @buf[:comments] << "#{$1}\n"
+        when /^data(: (.*))?/
+          @buf[:data] << "#{$2}\n" or "\n"
+        when /^id(: (.*))?/
+          @buf[:id] = $2 or ""
+        when /^event(: (.*))?/
+          @buf[:event] = $2 or ""
+        when /^retry: (.*)/
+          @buf[:retry_timeout] = $1
+        when /^$/
+          ret = parse_event
+        end
+        ret
+      end
+      
+      def parse_event
+        
+        if @buf[:comments].length > 0
+          @on_event.call :comment, @buf[:comments].chomp!
+        elsif @buf[:data].length > 0 || @buf[:id].length > 0 || !@buf[:event].nil?
+          @on_event.call @buf[:event] || :message, @buf[:data].chomp!, @buf[:id]
+        end
+        buf_reset
+      end
+      
+      def on_event(&block)
+        @on_event=block
+      end
+      
+    end
+    
+    def new_bundle(uri, useragent=nil)
+      super uri, useragent, "text/event-stream"
+    end
+    
+    def setup_bundle(b)
+      b.on_headers do |code, headers|
+        if code != 200
+          @subscriber.on_failure error(code, "")
+          close b
+          b.on_response do |code, headers, body|
+            @subscriber.finished+=1
+            close b
+          end
+        else
+          @notready-=1
+          @cooked_ready.signal true if @notready == 0
+          b.connected = true
+        end
+      end
+      b.buffer_body!
+      b.subparser=EventSourceParser.new
+      b.on_chunk do |chunk|
+        while b.body_buf.slice! /^.*\n/ do
+          b.subparser.parse_line $~[0]
+        end
+      end
+      b.on_error do |msg, err|
+        if EOFError === err && !b.subparser.buf_empty?
+          b.subparser.parse_line "\n"
+        end
+        handle_bundle_error b, msg, err
+      end
+      
+      b.on_response do |code, headers, body|
+        if !b.subparser.buf_empty?
+          b.subparser.parse_line "\n"
+        else
+          @subscriber.on_failure error(0, "Response completed unexpectedly", b)
+        end
+        @subscriber.finished+=1
+        close b
+      end
+      
+      b.subparser.on_event do |evt, data, evt_id|
+        case evt 
+        when :message
+          @timer.reset if @timer
+          unless @nomsg
+            msg=Message.new data.dup
+            msg.id=evt_id
+          else
+            msg=data
+          end
+          
+          if @subscriber.on_message(msg, b) == false
+            @subscriber.finished+=1
+            close b
+          end
+        when :comment
+          if data.match(/^(?<code>\d+): (?<message>.*)/)
+            @subscriber.on_failure error($~[:code].to_i, $~[:message], b)
+            @subscriber.finished+=1
+            close b
+          end
+        end
+      end
+      b
+    end
+    
+  end
+  
+  class MultiparMixedClient < LongPollClient
+    include Celluloid::IO
+    
+    def self.aliases 
+      [:multipart, :multipartmixed, :mixed]
+    end
+    
+    class MultipartMixedParser
+      attr_accessor :bound, :finished, :buf
+      def initialize(multipart_header)
+        matches=/^multipart\/mixed; boundary=(?<boundary>.*)/.match multipart_header
+        raise "malformed Content-Type multipart/mixed header" unless matches[:boundary]
+        @bound = matches[:boundary]
+        @buf = ""
+        @preambled = false
+        @headered = nil
+        @headers = {}
+        @ninished = nil
+      end
+      
+      def on_part(&block)
+        @on_part = block
+      end
+      def on_finish(&block)
+        @on_finish = block
+      end
+      
+      def <<(chunk)
+        @buf << chunk
+        #puts @buf
+        repeat = true
+        while repeat do
+          if !@preambled && @buf.slice!(/^--#{Regexp.escape @bound}/)
+            @finished = nil
+            @preambled = true
+            @headered = nil
+          end
+          if @preambled && @buf.slice!(/^(\r\n(.*?))?\r\n\r\n/m)
+            @headered = true
+            ($~[2]).each_line do |l|
+              if l.match(/(?<name>[^:]+):\s(?<val>[^\r\n]*)/)
+                @headers[$~[:name]]=$~[:val]
+              end
+            end
+          else
+            repeat = false
+          end
+          
+          if @headered && @buf.slice!(/^(.*?)\r\n--#{Regexp.escape @bound}/m)
+            @on_part.call @headers, $~[1]
+            @headered = nil
+            @headers.clear
+            repeat = true
+          else
+            repeat = false
+          end
+          
+          if (@preambled && !@headered && @buf.slice!(/^--\r\n/)) ||
+            (!@preambled && @buf.slice!(/^--#{Regexp.escape @bound}--\r\n/))
+            @on_finish.call
+            repeat = false
+          end
+        end
+      end
+      
+    end
+    
+    def new_bundle(uri, useragent=nil)
+      super uri, useragent, "multipart/mixed"
+    end
+    
+    def setup_bundle b
+      super
+      b.on_headers do |code, headers|
+        if code != 200
+          @subscriber.on_failure error(code, "", b)
+          close b
+        else
+          b.connected = true
+          @notready -= 1
+          @cooked_ready.signal true if @notready == 0
+          b.subparser = MultipartMixedParser.new headers["Content-Type"]
+          b.subparser.on_part do |headers, message|
+            unless @nomsg
+              @timer.reset if @timer
+              msg=Message.new message.dup, headers["Last-Modified"], headers["Etag"]
+              msg.content_type=headers["Content-Type"]
+            else
+              msg=message
+            end
+            
+            if @subscriber.on_message(msg, b) == false
+              @subscriber.finished+=1
+              close b
+            end
+          end
+          
+          b.subparser.on_finish do
+            b.subparser.finished = true
+          end
+        end
+      end
+      
+      b.on_chunk do |chunk|
+        b.subparser << chunk if b.subparser
+        if HTTPBundle === b && b.subparser.finished
+          @subscriber.on_failure error(410, "Server Closed Connection", b)
+          @subscriber.finished+=1
+          close b
+        end
+      end
+      
+      b.on_response do |code, headers, body|
+        if b.subparser.finished
+          @subscriber.on_failure error(410, "Server Closed Connection", b)
+        else
+          @subscriber.on_failure error(0, "Response completed unexpectedly", b)
+        end
+        @subscriber.finished+=1
+        close b
+      end
+    end
+  end
+  
+  class HTTPChunkedClient < LongPollClient
+    include Celluloid::IO
+    
+    def provides_msgid?
+      false
+    end
+    
+    def run(*args)
+      if @http2
+        @subscriber.on_failure error(0, "Chunked transfer is not allowed in HTTP/2")
+        @connected = 0
+        return
+      end
+      super
+    end
+    
+    def self.aliases
+      [:chunked]
+    end
+    
+    def new_bundle(uri, user_agent)
+      super uri, user_agent, "*/*", {"TE": "Chunked"}
+    end
+    
+    def setup_bundle(b)
+      super
+      b.body_buf = nil
+      b.on_headers do |code, headers|
+        if code != 200
+          @subscriber.on_failure(error(code, "", b))
+          close b
+        elsif headers["Transfer-Encoding"] != "chunked"
+          @subscriber.on_failure error(0, "Transfer-Encoding should be 'chunked', was '#{headers["Transfer-Encoding"]}'.", b)
+          close b
+        else
+          @notready -= 1
+          @cooked_ready.signal true if @notready == 0
+          b.connected= true
+        end
+      end
+      
+      b.stop_after_headers = true
+      @inchunk = false
+      @chunksize = 0
+      @repeat = true
+      @chunkbuf = ""
+      b.on_chunk do |chunk|
+        #puts "yeah"
+        @chunkbuf << chunk
+        @repeat = true
+        while @repeat
+          @repeat = false
+          if !@inchunk && @chunkbuf.slice!(/^([a-fA-F0-9]+)\r\n/m)
+            @chunksize = $~[1].to_i(16)
+            @inchunk = true
+          end
+          
+          if @inchunk
+            if @chunkbuf.length >= @chunksize + 2
+              msgbody = @chunkbuf.slice!(0...@chunksize)
+              @chunkbuf.slice!(/^\r\n/m)
+              @timer.reset if @timer
+              unless @nomsg
+                msg=Message.new msgbody, nil, nil
+              else
+                msg=msgbody
+              end
+              if @subscriber.on_message(msg, b) == false
+                @subscriber.finished+=1
+                close b
+              end
+              @repeat = true if @chunkbuf.length > 0
+              @inchunk = false
+              @chunksize = 0
+            end
+          end
+        end
+      end
+      
+      b.on_response do |code, headers, body|
+        @subscriber.on_failure error(410, "Server Closed Connection", b)
+        close b
+      end
+      
+      b
+    end
+    
+  end
+
+  attr_accessor :url, :client, :messages, :max_round_trips, :quit_message, :errors, :concurrency, :waiting, :finished, :client_class
+  def initialize(url, concurrency=1, opt={})
+    @care_about_message_ids=opt[:use_message_id].nil? ? true : opt[:use_message_id]
+    @url=url
+    @quit_message = opt[:quit_message]
+    opt[:timeout] ||= 30
+    opt[:connect_timeout] ||= 5
+    #puts "Starting subscriber on #{url}"
+    @Client_Class = Client.lookup(opt[:client] || :longpoll)
+    if @Client_Class.nil?
+      raise "unknown client type #{opt[:client]}"
+    end
+    
+    if !opt[:nostore] && opt[:nomsg]
+      opt[:nomsg] = nil
+      puts "nomsg reverted to false because nostore is false"
+    end
+    opt[:concurrency]=concurrency
+    @concurrency = opt[:concurrency]
+    @opt=opt
+    new_client
+    reset
+  end
+  def new_client
+    @client=@Client_Class.new self, @opt
+  end
+  def reset
+    @errors=[]
+    unless @nostore
+      @messages=MessageStore.new :noid => !(client.provides_msgid? && @care_about_message_ids)
+      @messages.name="sub"
+    end
+    @waiting=0
+    @finished=0
+    new_client if terminated?
+    self
+  end
+  def abort
+    @client.terminate
+  end
+  def errors?
+    not no_errors?
+  end
+  def no_errors?
+    @errors.empty?
+  end
+  def match_errors(regex)
+    @errors.each do |err|
+      return false unless err =~ regex
+    end
+    true
+  end
+  
+ 
+  def run
+    begin
+      client.current_actor
+    rescue Celluloid::DeadActorError
+      return false
+    end
+    @client.async.run
+    self
+  end
+  def terminate
+    begin
+      @client.terminate
+    rescue Celluloid::DeadActorError
+      return false
+    end
+    true
+  end
+  def terminated?
+    begin
+      client.current_actor unless client == nil
+    rescue Celluloid::DeadActorError
+      return true
+    end
+    false
+  end
+  def wait(until_what=nil)
+    @client.poke until_what
+  end
+
+  def on_message(msg=nil, req=nil, &block)
+    #puts "received message #{msg && msg.to_s[0..15]}"
+    if block_given?
+      @on_message=block
+    else
+      @messages << msg if @messages
+      if @quit_message == msg.to_s
+        @on_message.call(msg, req) if @on_message
+        return false 
+      end
+      @on_message.call(msg, req) if @on_message
+    end
+  end
+  
+  def make_error(client, what, code, msg, failword=" failed")
+    "#{client.class.name.split('::').last} #{what}#{failword}: #{msg} (code #{code})"
+  end
+  
+  def on_failure(err=nil, nostore=false, &block)
+    if block_given?
+      @on_failure=block
+    else
+      @errors << err.to_s unless nostore
+      @on_failure.call(err.to_s, err.bundle) if @on_failure.respond_to? :call
+    end
+  end
+end
+
+class Publisher
+  #include Celluloid
+  attr_accessor :messages, :response, :response_code, :response_body, :nofail, :accept, :url, :extra_headers, :verbose
+  def initialize(url, opt={})
+    @url= url
+    unless opt[:nostore]
+      @messages = MessageStore.new :noid => true
+      @messages.name = "pub"
+    end
+    @timeout = opt[:timeout]
+    @accept = opt[:accept]
+    @verbose = opt[:verbose]
+    @on_response = opt[:on_response]
+  end
+  
+  def with_url(alt_url)
+    prev_url=@url
+    @url=alt_url
+    if block_given?
+      yield
+      @url=prev_url
+    else
+      self
+    end
+  end
+  
+  def on_response(&block)
+    @on_response = block if block_given?
+    @on_response
+  end
+  
+  def on_complete(&block)
+    raise ArgumentError, "block must be given" unless block
+    @on_complete = block
+  end
+  
+  def submit(body, method=:POST, content_type= :'text/plain', &block)
+    self.response=nil
+    self.response_code=nil
+    self.response_body=nil
+
+    if Enumerable===body
+      i=0
+      body.each{|b| i+=1; submit(b, method, content_type, &block)}
+      return i
+    end
+    headers = {:'Content-Type' => content_type, :'Accept' => accept}
+    headers.merge! @extra_headers if @extra_headers
+    post = Typhoeus::Request.new(
+      @url,
+      headers: headers,
+      method: method,
+      body: body,
+      timeout: @timeout || PUBLISH_TIMEOUT,
+      connecttimeout: @timeout || PUBLISH_TIMEOUT,
+      verbose: @verbose
+    )
+    if @messages
+      msg=Message.new body
+      msg.content_type=content_type
+    end
+    if @on_complete
+      post.on_complete @on_complete
+    else
+      post.on_complete do |response|
+        self.response=response
+        self.response_code=response.response_code
+        self.response_body=response.response_body
+        if response.success?
+          #puts "published message #{msg.to_s[0..15]}"
+          @messages << msg if @messages
+        elsif response.timed_out?
+          # aw hell no
+          #puts "publisher err: timeout"
+          
+          pub_url=URI.parse(response.request.url)
+          pub_url = "#{pub_url.path}#{pub_url.query ? "?#{pub_url.query}" : nil}"
+          raise "Publisher #{response.request.options[:method]} to #{pub_url} timed out."
+        elsif response.code == 0
+          # Could not get an http response, something's wrong.
+          #puts "publisher err: #{response.return_message}"
+          errmsg="No HTTP response: #{response.return_message}"
+          unless self.nofail then
+            raise errmsg
+          end
+        else
+          # Received a non-successful http response.
+          #puts "publisher err: #{response.code.to_s}"
+          errmsg="HTTP request failed: #{response.code.to_s}"
+          unless self.nofail then
+            raise errmsg
+          end
+        end
+        block.call(self.response_code, self.response_body) if block
+        on_response.call(self.response_code, self.response_body) if on_response
+      end
+    end
+    #puts "publishing to #{@url}"
+    begin
+      post.run
+    rescue Exception => e
+      last=nil, i=0
+      e.backtrace.select! do |bt|
+        if bt.match(/(gems\/(typhoeus|ethon)|pubsub\.rb)/)
+          last=i
+          false
+        else
+          i+=1
+          true
+        end 
+      end
+      e.backtrace.insert last, "..."
+      raise e
+    end
+  end
+  
+  def get(accept_header=nil)
+    self.accept=accept_header
+    submit nil, :GET
+    self.accept=nil
+  end
+  def delete
+    submit nil, :DELETE
+  end
+  def post(body, content_type=nil, &block)
+    submit body, :POST, content_type, &block
+  end
+  def put(body, content_type=nil, &block)
+    submit body, :PUT, content_type, &block
+  end
+
+  
+end
diff --git a/debian/modules/nchan/dev/rebuild.sh b/debian/modules/nchan/dev/rebuild.sh
new file mode 100755
index 0000000..54d7db3
--- /dev/null
+++ b/debian/modules/nchan/dev/rebuild.sh
@@ -0,0 +1,170 @@
+#!/bin/zsh
+#assumes PKGBUILDy nginx located at ./nginx-nchan
+MY_PATH="`dirname \"$0\"`"
+MY_PATH="`( cd \"$MY_PATH\" && pwd )`"
+
+_clang="ccache clang -Qunused-arguments -fcolor-diagnostics"
+
+#clang_memcheck="-fsanitize=address,undefined -fno-omit-frame-pointer"
+clang_sanitize_memory="-use-gold-plugins -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -fsanitize-blacklist=bl.txt"
+clang_sanitize_addres="-fsanitize=address,undefined -fno-omit-frame-pointer"
+
+optimize_level=0;
+
+export CONFIGURE_WITH_DEBUG=0
+
+for opt in $*; do
+  case $opt in
+    clang)
+      export CC=$_clang;;
+    clang-sanitize|sanitize|sanitize-memory)
+      export CC="CMAKE_LD=llvm-link $_clang -Xclang -cc1 $clang_sanitize_memory "
+      export CLINKER=$clang
+      ;;
+    sanitize-address)
+      export CC="$_clang $clang_sanitize_addres";;
+    gcc5)
+      export CC=gcc-5;;
+    gcc4|gcc47|gcc4.7)
+      export CC=gcc-4.7;;
+    nopool|no-pool|nop) 
+      export NO_POOL=1;;
+    debug-pool|debugpool) 
+      export NGX_DEBUG_POOL=1;;
+    dynamic)
+      export DYNAMIC=1;;
+    re|remake)
+      export REMAKE="-B"
+      export CONTINUE=1;;
+    c|continue|cont)
+      export CONTINUE=1;;
+    noextract)
+      export NO_EXTRACT_SOURCE=1;;
+    nomake)
+      export NO_MAKE=1;;
+    nodebug)
+      export NO_DEBUG=1;;
+    O0)
+      optimize_level=0;;
+    O1)
+      optimize_level=1;;
+    O2)
+      optimize_level=2;;
+    O3)
+      optimize_level=3;;
+    mudflap)
+      export MUDFLAP=1
+      export CC=gcc
+      ;;
+    stable|stableversion)
+      export NGINX_STABLEVERSION=1;;
+    legacyversion|legacy)
+      export NGINX_LEGACYVERSION=1;;
+    oldversion|old)
+      export NGINX_OLDVERSION=1;;
+    veryoldversion|veryold)
+      export NGINX_VERYOLDVERSION=1;;
+    slabpatch|slab)
+      export NGX_SLAB_PATCH=1;;
+    withdebug)
+      export CONFIGURE_WITH_DEBUG=1;;
+    clang-analyzer|analyzer|scan|analyze)
+      export CC="clang"
+      export CLANG_ANALYZER=$MY_PATH/clang-analyzer
+      mkdir $CLANG_ANALYZER 2>/dev/null
+      ;;
+  esac
+done
+
+export NO_WITH_DEBUG=$NO_WITH_DEBUG;
+
+_build_nginx() {
+
+  if type "makepkg" > /dev/null; then
+    if [[ $CONTINUE == 1 ]] || [[ $NO_EXTRACT_SOURCE == 1 ]]; then
+      makepkg -f -e
+    else
+      makepkg -f
+    fi
+    return 0
+  fi
+
+  export NO_NGINX_USER=1
+  export NO_GCC_COLOR=1
+  export startdir="$(pwd)"
+  export EXPLICIT_CFLAGS=1
+
+  rm "${startdir}/pkg/" -Rf
+  srcdir="${startdir}/src"
+
+  source ./PKGBUILD
+
+  pkgdir="${startdir}/pkg/${pkgname}"
+  mkdir -p "$srcdir" "$pkgdir"
+
+  echo $_nginx_source
+  echo $_no_pool_patch_source
+  
+  wget --no-clobber $_nginx_source
+  wget --no-clobber $_no_pool_patch_source
+
+  if [[ -z $NO_EXTRACT_SOURCE ]]; then
+    pushd src
+    _nginx_src_file="${_nginx_source##*/}"
+    echo $_nginx_src_file
+    tar xf "../${_nginx_src_file}"
+    cp "../${_no_pool_patch_source##*/}" ./
+    if [[ ! -d ngx_debug_pool ]]; then
+      git clone "$_ngx_debug_pool_url"
+    else
+      pushd ngx_debug_pool
+      git pull
+      popd
+    fi
+    popd
+  fi
+
+  build
+
+  pushd "${srcdir}/nginx-${_nginx_ver}"
+  ls -alh
+  make DESTDIR="$pkgdir/" install
+  popd
+}
+
+
+export OPTIMIZE_LEVEL=$optimize_level
+
+if [[ -z $NO_MAKE ]]; then
+  
+  ./redocument.rb
+
+  ./gen_config_commands.rb nchan_config_commands.c
+  if ! [ $? -eq 0 ]; then; 
+    echo "failed generating nginx directives"; 
+    exit 1
+  fi
+
+  rdstore_dir=${MY_PATH}/../src/store/redis
+  bundle exec hsss \
+     --format whole \
+     ${rdstore_dir}/scripts/*.lua > ${rdstore_dir}/redis_lua_commands.h
+  if ! [ $? -eq 0 ]; then;
+    echo "failed generating redis lua scripts";
+    exit 1
+  fi  
+  pushd ./nginx-nchan >/dev/null
+  
+  _build_nginx
+  
+  popd >/dev/null
+fi
+if ! [[ -z $CLANG_ANALYZER ]]; then
+  pushd $CLANG_ANALYZER >/dev/null
+  latest_scan=`ls -c |head -n1`
+  echo "run 'scan-view ${CLANG_ANALYZER}/${latest_scan}' for static analysis."
+  scan-view $latest_scan 2>/dev/null
+  popd >/dev/null
+fi
+
+
diff --git a/debian/modules/nchan/dev/redis-trib.rb b/debian/modules/nchan/dev/redis-trib.rb
new file mode 100755
index 0000000..f6c17ad
--- /dev/null
+++ b/debian/modules/nchan/dev/redis-trib.rb
@@ -0,0 +1,1696 @@
+#!/usr/bin/env ruby
+
+# TODO (temporary here, we'll move this into the Github issues once
+#       redis-trib initial implementation is completed).
+#
+# - Make sure that if the rehashing fails in the middle redis-trib will try
+#   to recover.
+# - When redis-trib performs a cluster check, if it detects a slot move in
+#   progress it should prompt the user to continue the move from where it
+#   stopped.
+# - Gracefully handle Ctrl+C in move_slot to prompt the user if really stop
+#   while rehashing, and performing the best cleanup possible if the user
+#   forces the quit.
+# - When doing "fix" set a global Fix to true, and prompt the user to
+#   fix the problem if automatically fixable every time there is something
+#   to fix. For instance:
+#   1) If there is a node that pretend to receive a slot, or to migrate a
+#      slot, but has no entries in that slot, fix it.
+#   2) If there is a node having keys in slots that are not owned by it
+#      fix this condition moving the entries in the same node.
+#   3) Perform more possibly slow tests about the state of the cluster.
+#   4) When aborted slot migration is detected, fix it.
+
+require 'rubygems'
+require 'redis'
+
+ClusterHashSlots = 16384
+MigrateDefaultTimeout = 60000
+MigrateDefaultPipeline = 10
+RebalanceDefaultThreshold = 2
+
+$verbose = false
+
+def xputs(s)
+    case s[0..2]
+    when ">>>"
+        color="29;1"
+    when "[ER"
+        color="31;1"
+    when "[WA"
+        color="31;1"
+    when "[OK"
+        color="32"
+    when "[FA","***"
+        color="33"
+    else
+        color=nil
+    end
+
+    color = nil if ENV['TERM'] != "xterm"
+    print "\033[#{color}m" if color
+    print s
+    print "\033[0m" if color
+    print "\n"
+end
+
+class ClusterNode
+    def initialize(addr)
+        s = addr.split(":")
+        if s.length < 2
+           puts "Invalid IP or Port (given as #{addr}) - use IP:Port format"
+           exit 1
+        end
+        port = s.pop # removes port from split array
+        ip = s.join(":") # if s.length > 1 here, it's IPv6, so restore address
+        @r = nil
+        @info = {}
+        @info[:host] = ip
+        @info[:port] = port
+        @info[:slots] = {}
+        @info[:migrating] = {}
+        @info[:importing] = {}
+        @info[:replicate] = false
+        @dirty = false # True if we need to flush slots info into node.
+        @friends = []
+    end
+
+    def friends
+        @friends
+    end
+
+    def slots
+        @info[:slots]
+    end
+
+    def has_flag?(flag)
+        @info[:flags].index(flag)
+    end
+
+    def to_s
+        "#{@info[:host]}:#{@info[:port]}"
+    end
+
+    def connect(o={})
+        return if @r
+        print "Connecting to node #{self}: " if $verbose
+        STDOUT.flush
+        begin
+            @r = Redis.new(:host => @info[:host], :port => @info[:port], :timeout => 60)
+            @r.ping
+        rescue
+            xputs "[ERR] Sorry, can't connect to node #{self}"
+            exit 1 if o[:abort]
+            @r = nil
+        end
+        xputs "OK" if $verbose
+    end
+
+    def assert_cluster
+        info = @r.info
+        if !info["cluster_enabled"] || info["cluster_enabled"].to_i == 0
+            xputs "[ERR] Node #{self} is not configured as a cluster node."
+            exit 1
+        end
+    end
+
+    def assert_empty
+        if !(@r.cluster("info").split("\r\n").index("cluster_known_nodes:1")) ||
+            (@r.info['db0'])
+            xputs "[ERR] Node #{self} is not empty. Either the node already knows other nodes (check with CLUSTER NODES) or contains some key in database 0."
+            exit 1
+        end
+    end
+
+    def load_info(o={})
+        self.connect
+        nodes = @r.cluster("nodes").split("\n")
+        nodes.each{|n|
+            # name addr flags role ping_sent ping_recv link_status slots
+            split = n.split
+            name,addr,flags,master_id,ping_sent,ping_recv,config_epoch,link_status = split[0..6]
+            slots = split[8..-1]
+            info = {
+                :name => name,
+                :addr => addr,
+                :flags => flags.split(","),
+                :replicate => master_id,
+                :ping_sent => ping_sent.to_i,
+                :ping_recv => ping_recv.to_i,
+                :link_status => link_status
+            }
+            info[:replicate] = false if master_id == "-"
+
+            if info[:flags].index("myself")
+                @info = @info.merge(info)
+                @info[:slots] = {}
+                slots.each{|s|
+                    if s[0..0] == '['
+                        if s.index("->-") # Migrating
+                            slot,dst = s[1..-1].split("->-")
+                            @info[:migrating][slot.to_i] = dst
+                        elsif s.index("-<-") # Importing
+                            slot,src = s[1..-1].split("-<-")
+                            @info[:importing][slot.to_i] = src
+                        end
+                    elsif s.index("-")
+                        start,stop = s.split("-")
+                        self.add_slots((start.to_i)..(stop.to_i))
+                    else
+                        self.add_slots((s.to_i)..(s.to_i))
+                    end
+                } if slots
+                @dirty = false
+                @r.cluster("info").split("\n").each{|e|
+                    k,v=e.split(":")
+                    k = k.to_sym
+                    v.chop!
+                    if k != :cluster_state
+                        @info[k] = v.to_i
+                    else
+                        @info[k] = v
+                    end
+                }
+            elsif o[:getfriends]
+                @friends << info
+            end
+        }
+    end
+
+    def add_slots(slots)
+        slots.each{|s|
+            @info[:slots][s] = :new
+        }
+        @dirty = true
+    end
+
+    def set_as_replica(node_id)
+        @info[:replicate] = node_id
+        @dirty = true
+    end
+
+    def flush_node_config
+        return if !@dirty
+        if @info[:replicate]
+            begin
+                @r.cluster("replicate",@info[:replicate])
+            rescue
+                # If the cluster did not already joined it is possible that
+                # the slave does not know the master node yet. So on errors
+                # we return ASAP leaving the dirty flag set, to flush the
+                # config later.
+                return
+            end
+        else
+            new = []
+            @info[:slots].each{|s,val|
+                if val == :new
+                    new << s
+                    @info[:slots][s] = true
+                end
+            }
+            @r.cluster("addslots",*new)
+        end
+        @dirty = false
+    end
+
+    def info_string
+        # We want to display the hash slots assigned to this node
+        # as ranges, like in: "1-5,8-9,20-25,30"
+        #
+        # Note: this could be easily written without side effects,
+        # we use 'slots' just to split the computation into steps.
+
+        # First step: we want an increasing array of integers
+        # for instance: [1,2,3,4,5,8,9,20,21,22,23,24,25,30]
+        slots = @info[:slots].keys.sort
+
+        # As we want to aggregate adjacent slots we convert all the
+        # slot integers into ranges (with just one element)
+        # So we have something like [1..1,2..2, ... and so forth.
+        slots.map!{|x| x..x}
+
+        # Finally we group ranges with adjacent elements.
+        slots = slots.reduce([]) {|a,b|
+            if !a.empty? && b.first == (a[-1].last)+1
+                a[0..-2] + [(a[-1].first)..(b.last)]
+            else
+                a + [b]
+            end
+        }
+
+        # Now our task is easy, we just convert ranges with just one
+        # element into a number, and a real range into a start-end format.
+        # Finally we join the array using the comma as separator.
+        slots = slots.map{|x|
+            x.count == 1 ? x.first.to_s : "#{x.first}-#{x.last}"
+        }.join(",")
+
+        role = self.has_flag?("master") ? "M" : "S"
+
+        if self.info[:replicate] and @dirty
+            is = "S: #{self.info[:name]} #{self.to_s}"
+        else
+            is = "#{role}: #{self.info[:name]} #{self.to_s}\n"+
+            "   slots:#{slots} (#{self.slots.length} slots) "+
+            "#{(self.info[:flags]-["myself"]).join(",")}"
+        end
+        if self.info[:replicate]
+            is += "\n   replicates #{info[:replicate]}"
+        elsif self.has_flag?("master") && self.info[:replicas]
+            is += "\n   #{info[:replicas].length} additional replica(s)"
+        end
+        is
+    end
+
+    # Return a single string representing nodes and associated slots.
+    # TODO: remove slaves from config when slaves will be handled
+    # by Redis Cluster.
+    def get_config_signature
+        config = []
+        @r.cluster("nodes").each_line{|l|
+            s = l.split
+            slots = s[8..-1].select {|x| x[0..0] != "["}
+            next if slots.length == 0
+            config << s[0]+":"+(slots.sort.join(","))
+        }
+        config.sort.join("|")
+    end
+
+    def info
+        @info
+    end
+
+    def is_dirty?
+        @dirty
+    end
+
+    def r
+        @r
+    end
+end
+
+class RedisTrib
+    def initialize
+        @nodes = []
+        @fix = false
+        @errors = []
+        @timeout = MigrateDefaultTimeout
+    end
+
+    def check_arity(req_args, num_args)
+        if ((req_args > 0 and num_args != req_args) ||
+           (req_args < 0 and num_args < req_args.abs))
+           xputs "[ERR] Wrong number of arguments for specified sub command"
+           exit 1
+        end
+    end
+
+    def add_node(node)
+        @nodes << node
+    end
+
+    def reset_nodes
+        @nodes = []
+    end
+
+    def cluster_error(msg)
+        @errors << msg
+        xputs msg
+    end
+
+    # Return the node with the specified ID or Nil.
+    def get_node_by_name(name)
+        @nodes.each{|n|
+            return n if n.info[:name] == name.downcase
+        }
+        return nil
+    end
+
+    # Like get_node_by_name but the specified name can be just the first
+    # part of the node ID as long as the prefix in unique across the
+    # cluster.
+    def get_node_by_abbreviated_name(name)
+        l = name.length
+        candidates = []
+        @nodes.each{|n|
+            if n.info[:name][0...l] == name.downcase
+                candidates << n
+            end
+        }
+        return nil if candidates.length != 1
+        candidates[0]
+    end
+
+    # This function returns the master that has the least number of replicas
+    # in the cluster. If there are multiple masters with the same smaller
+    # number of replicas, one at random is returned.
+    def get_master_with_least_replicas
+        masters = @nodes.select{|n| n.has_flag? "master"}
+        sorted = masters.sort{|a,b|
+            a.info[:replicas].length <=> b.info[:replicas].length
+        }
+        sorted[0]
+    end
+
+    def check_cluster(opt={})
+        xputs ">>> Performing Cluster Check (using node #{@nodes[0]})"
+        show_nodes if !opt[:quiet]
+        check_config_consistency
+        check_open_slots
+        check_slots_coverage
+    end
+
+    def show_cluster_info
+        masters = 0
+        keys = 0
+        @nodes.each{|n|
+            if n.has_flag?("master")
+                puts "#{n} (#{n.info[:name][0...8]}...) -> #{n.r.dbsize} keys | #{n.slots.length} slots | "+
+                     "#{n.info[:replicas].length} slaves."
+                masters += 1
+                keys += n.r.dbsize
+            end
+        }
+        xputs "[OK] #{keys} keys in #{masters} masters."
+        keys_per_slot = sprintf("%.2f",keys/16384.0)
+        puts "#{keys_per_slot} keys per slot on average."
+    end
+
+    # Merge slots of every known node. If the resulting slots are equal
+    # to ClusterHashSlots, then all slots are served.
+    def covered_slots
+        slots = {}
+        @nodes.each{|n|
+            slots = slots.merge(n.slots)
+        }
+        slots
+    end
+
+    def check_slots_coverage
+        xputs ">>> Check slots coverage..."
+        slots = covered_slots
+        if slots.length == ClusterHashSlots
+            xputs "[OK] All #{ClusterHashSlots} slots covered."
+        else
+            cluster_error \
+                "[ERR] Not all #{ClusterHashSlots} slots are covered by nodes."
+            fix_slots_coverage if @fix
+        end
+    end
+
+    def check_open_slots
+        xputs ">>> Check for open slots..."
+        open_slots = []
+        @nodes.each{|n|
+            if n.info[:migrating].size > 0
+                cluster_error \
+                    "[WARNING] Node #{n} has slots in migrating state (#{n.info[:migrating].keys.join(",")})."
+                open_slots += n.info[:migrating].keys
+            end
+            if n.info[:importing].size > 0
+                cluster_error \
+                    "[WARNING] Node #{n} has slots in importing state (#{n.info[:importing].keys.join(",")})."
+                open_slots += n.info[:importing].keys
+            end
+        }
+        open_slots.uniq!
+        if open_slots.length > 0
+            xputs "[WARNING] The following slots are open: #{open_slots.join(",")}"
+        end
+        if @fix
+            open_slots.each{|slot| fix_open_slot slot}
+        end
+    end
+
+    def nodes_with_keys_in_slot(slot)
+        nodes = []
+        @nodes.each{|n|
+            next if n.has_flag?("slave")
+            nodes << n if n.r.cluster("getkeysinslot",slot,1).length > 0
+        }
+        nodes
+    end
+
+    def fix_slots_coverage
+        not_covered = (0...ClusterHashSlots).to_a - covered_slots.keys
+        xputs ">>> Fixing slots coverage..."
+        xputs "List of not covered slots: " + not_covered.join(",")
+
+        # For every slot, take action depending on the actual condition:
+        # 1) No node has keys for this slot.
+        # 2) A single node has keys for this slot.
+        # 3) Multiple nodes have keys for this slot.
+        slots = {}
+        not_covered.each{|slot|
+            nodes = nodes_with_keys_in_slot(slot)
+            slots[slot] = nodes
+            xputs "Slot #{slot} has keys in #{nodes.length} nodes: #{nodes.join(", ")}"
+        }
+
+        none = slots.select {|k,v| v.length == 0}
+        single = slots.select {|k,v| v.length == 1}
+        multi = slots.select {|k,v| v.length > 1}
+
+        # Handle case "1": keys in no node.
+        if none.length > 0
+            xputs "The folowing uncovered slots have no keys across the cluster:"
+            xputs none.keys.join(",")
+            yes_or_die "Fix these slots by covering with a random node?"
+            none.each{|slot,nodes|
+                node = @nodes.sample
+                xputs ">>> Covering slot #{slot} with #{node}"
+                node.r.cluster("addslots",slot)
+            }
+        end
+
+        # Handle case "2": keys only in one node.
+        if single.length > 0
+            xputs "The folowing uncovered slots have keys in just one node:"
+            puts single.keys.join(",")
+            yes_or_die "Fix these slots by covering with those nodes?"
+            single.each{|slot,nodes|
+                xputs ">>> Covering slot #{slot} with #{nodes[0]}"
+                nodes[0].r.cluster("addslots",slot)
+            }
+        end
+
+        # Handle case "3": keys in multiple nodes.
+        if multi.length > 0
+            xputs "The folowing uncovered slots have keys in multiple nodes:"
+            xputs multi.keys.join(",")
+            yes_or_die "Fix these slots by moving keys into a single node?"
+            multi.each{|slot,nodes|
+                target = get_node_with_most_keys_in_slot(nodes,slot)
+                xputs ">>> Covering slot #{slot} moving keys to #{target}"
+
+                target.r.cluster('addslots',slot)
+                target.r.cluster('setslot',slot,'stable')
+                nodes.each{|src|
+                    next if src == target
+                    # Set the source node in 'importing' state (even if we will
+                    # actually migrate keys away) in order to avoid receiving
+                    # redirections for MIGRATE.
+                    src.r.cluster('setslot',slot,'importing',target.info[:name])
+                    move_slot(src,target,slot,:dots=>true,:fix=>true,:cold=>true)
+                    src.r.cluster('setslot',slot,'stable')
+                }
+            }
+        end
+    end
+
+    # Return the owner of the specified slot
+    def get_slot_owners(slot)
+        owners = []
+        @nodes.each{|n|
+            next if n.has_flag?("slave")
+            n.slots.each{|s,_|
+                owners << n if s == slot
+            }
+        }
+        owners
+    end
+
+    # Return the node, among 'nodes' with the greatest number of keys
+    # in the specified slot.
+    def get_node_with_most_keys_in_slot(nodes,slot)
+        best = nil
+        best_numkeys = 0
+        @nodes.each{|n|
+            next if n.has_flag?("slave")
+            numkeys = n.r.cluster("countkeysinslot",slot)
+            if numkeys > best_numkeys || best == nil
+                best = n
+                best_numkeys = numkeys
+            end
+        }
+        return best
+    end
+
+    # Slot 'slot' was found to be in importing or migrating state in one or
+    # more nodes. This function fixes this condition by migrating keys where
+    # it seems more sensible.
+    def fix_open_slot(slot)
+        puts ">>> Fixing open slot #{slot}"
+
+        # Try to obtain the current slot owner, according to the current
+        # nodes configuration.
+        owners = get_slot_owners(slot)
+        owner = owners[0] if owners.length == 1
+
+        migrating = []
+        importing = []
+        @nodes.each{|n|
+            next if n.has_flag? "slave"
+            if n.info[:migrating][slot]
+                migrating << n
+            elsif n.info[:importing][slot]
+                importing << n
+            elsif n.r.cluster("countkeysinslot",slot) > 0 && n != owner
+                xputs "*** Found keys about slot #{slot} in node #{n}!"
+                importing << n
+            end
+        }
+        puts "Set as migrating in: #{migrating.join(",")}"
+        puts "Set as importing in: #{importing.join(",")}"
+
+        # If there is no slot owner, set as owner the slot with the biggest
+        # number of keys, among the set of migrating / importing nodes.
+        if !owner
+            xputs ">>> Nobody claims ownership, selecting an owner..."
+            owner = get_node_with_most_keys_in_slot(@nodes,slot)
+
+            # If we still don't have an owner, we can't fix it.
+            if !owner
+                xputs "[ERR] Can't select a slot owner. Impossible to fix."
+                exit 1
+            end
+
+            # Use ADDSLOTS to assign the slot.
+            puts "*** Configuring #{owner} as the slot owner"
+            owner.r.cluster("setslot",slot,"stable")
+            owner.r.cluster("addslots",slot)
+            # Make sure this information will propagate. Not strictly needed
+            # since there is no past owner, so all the other nodes will accept
+            # whatever epoch this node will claim the slot with.
+            owner.r.cluster("bumpepoch")
+
+            # Remove the owner from the list of migrating/importing
+            # nodes.
+            migrating.delete(owner)
+            importing.delete(owner)
+        end
+
+        # If there are multiple owners of the slot, we need to fix it
+        # so that a single node is the owner and all the other nodes
+        # are in importing state. Later the fix can be handled by one
+        # of the base cases above.
+        #
+        # Note that this case also covers multiple nodes having the slot
+        # in migrating state, since migrating is a valid state only for
+        # slot owners.
+        if owners.length > 1
+            owner = get_node_with_most_keys_in_slot(owners,slot)
+            owners.each{|n|
+                next if n == owner
+                n.r.cluster('delslots',slot)
+                n.r.cluster('setslot',slot,'importing',owner.info[:name])
+                importing.delete(n) # Avoid duplciates
+                importing << n
+            }
+            owner.r.cluster('bumpepoch')
+        end
+
+        # Case 1: The slot is in migrating state in one slot, and in
+        #         importing state in 1 slot. That's trivial to address.
+        if migrating.length == 1 && importing.length == 1
+            move_slot(migrating[0],importing[0],slot,:dots=>true,:fix=>true)
+        # Case 2: There are multiple nodes that claim the slot as importing,
+        # they probably got keys about the slot after a restart so opened
+        # the slot. In this case we just move all the keys to the owner
+        # according to the configuration.
+        elsif migrating.length == 0 && importing.length > 0
+            xputs ">>> Moving all the #{slot} slot keys to its owner #{owner}"
+            importing.each {|node|
+                next if node == owner
+                move_slot(node,owner,slot,:dots=>true,:fix=>true,:cold=>true)
+                xputs ">>> Setting #{slot} as STABLE in #{node}"
+                node.r.cluster("setslot",slot,"stable")
+            }
+        # Case 3: There are no slots claiming to be in importing state, but
+        # there is a migrating node that actually don't have any key. We
+        # can just close the slot, probably a reshard interrupted in the middle.
+        elsif importing.length == 0 && migrating.length == 1 &&
+              migrating[0].r.cluster("getkeysinslot",slot,10).length == 0
+            migrating[0].r.cluster("setslot",slot,"stable")
+        else
+            xputs "[ERR] Sorry, Redis-trib can't fix this slot yet (work in progress). Slot is set as migrating in #{migrating.join(",")}, as importing in #{importing.join(",")}, owner is #{owner}"
+        end
+    end
+
+    # Check if all the nodes agree about the cluster configuration
+    def check_config_consistency
+        if !is_config_consistent?
+            cluster_error "[ERR] Nodes don't agree about configuration!"
+        else
+            xputs "[OK] All nodes agree about slots configuration."
+        end
+    end
+
+    def is_config_consistent?
+        signatures=[]
+        @nodes.each{|n|
+            signatures << n.get_config_signature
+        }
+        return signatures.uniq.length == 1
+    end
+
+    def wait_cluster_join
+        print "Waiting for the cluster to join"
+        while !is_config_consistent?
+            print "."
+            STDOUT.flush
+            sleep 1
+        end
+        print "\n"
+    end
+
+    def alloc_slots
+        nodes_count = @nodes.length
+        masters_count = @nodes.length / (@replicas+1)
+        masters = []
+
+        # The first step is to split instances by IP. This is useful as
+        # we'll try to allocate master nodes in different physical machines
+        # (as much as possible) and to allocate slaves of a given master in
+        # different physical machines as well.
+        #
+        # This code assumes just that if the IP is different, than it is more
+        # likely that the instance is running in a different physical host
+        # or at least a different virtual machine.
+        ips = {}
+        @nodes.each{|n|
+            ips[n.info[:host]] = [] if !ips[n.info[:host]]
+            ips[n.info[:host]] << n
+        }
+
+        # Select master instances
+        puts "Using #{masters_count} masters:"
+        interleaved = []
+        stop = false
+        while not stop do
+            # Take one node from each IP until we run out of nodes
+            # across every IP.
+            ips.each do |ip,nodes|
+                if nodes.empty?
+                    # if this IP has no remaining nodes, check for termination
+                    if interleaved.length == nodes_count
+                        # stop when 'interleaved' has accumulated all nodes
+                        stop = true
+                        next
+                    end
+                else
+                    # else, move one node from this IP to 'interleaved'
+                    interleaved.push nodes.shift
+                end
+            end
+        end
+
+        masters = interleaved.slice!(0, masters_count)
+        nodes_count -= masters.length
+
+        masters.each{|m| puts m}
+
+        # Alloc slots on masters
+        slots_per_node = ClusterHashSlots.to_f / masters_count
+        first = 0
+        cursor = 0.0
+        masters.each_with_index{|n,masternum|
+            last = (cursor+slots_per_node-1).round
+            if last > ClusterHashSlots || masternum == masters.length-1
+                last = ClusterHashSlots-1
+            end
+            last = first if last < first # Min step is 1.
+            n.add_slots first..last
+            first = last+1
+            cursor += slots_per_node
+        }
+
+        # Select N replicas for every master.
+        # We try to split the replicas among all the IPs with spare nodes
+        # trying to avoid the host where the master is running, if possible.
+        #
+        # Note we loop two times.  The first loop assigns the requested
+        # number of replicas to each master.  The second loop assigns any
+        # remaining instances as extra replicas to masters.  Some masters
+        # may end up with more than their requested number of replicas, but
+        # all nodes will be used.
+        assignment_verbose = false
+
+        [:requested,:unused].each do |assign|
+            masters.each do |m|
+                assigned_replicas = 0
+                while assigned_replicas < @replicas
+                    break if nodes_count == 0
+                    if assignment_verbose
+                        if assign == :requested
+                            puts "Requesting total of #{@replicas} replicas " \
+                                 "(#{assigned_replicas} replicas assigned " \
+                                 "so far with #{nodes_count} total remaining)."
+                        elsif assign == :unused
+                            puts "Assigning extra instance to replication " \
+                                 "role too (#{nodes_count} remaining)."
+                        end
+                    end
+
+                    # Return the first node not matching our current master
+                    node = interleaved.find{|n| n.info[:host] != m.info[:host]}
+
+                    # If we found a node, use it as a best-first match.
+                    # Otherwise, we didn't find a node on a different IP, so we
+                    # go ahead and use a same-IP replica.
+                    if node
+                        slave = node
+                        interleaved.delete node
+                    else
+                        slave = interleaved.shift
+                    end
+                    slave.set_as_replica(m.info[:name])
+                    nodes_count -= 1
+                    assigned_replicas += 1
+                    puts "Adding replica #{slave} to #{m}"
+
+                    # If we are in the "assign extra nodes" loop,
+                    # we want to assign one extra replica to each
+                    # master before repeating masters.
+                    # This break lets us assign extra replicas to masters
+                    # in a round-robin way.
+                    break if assign == :unused
+                end
+            end
+        end
+    end
+
+    def flush_nodes_config
+        @nodes.each{|n|
+            n.flush_node_config
+        }
+    end
+
+    def show_nodes
+        @nodes.each{|n|
+            xputs n.info_string
+        }
+    end
+
+    # Redis Cluster config epoch collision resolution code is able to eventually
+    # set a different epoch to each node after a new cluster is created, but
+    # it is slow compared to assign a progressive config epoch to each node
+    # before joining the cluster. However we do just a best-effort try here
+    # since if we fail is not a problem.
+    def assign_config_epoch
+        config_epoch = 1
+        @nodes.each{|n|
+            begin
+                n.r.cluster("set-config-epoch",config_epoch)
+            rescue
+            end
+            config_epoch += 1
+        }
+    end
+
+    def join_cluster
+        # We use a brute force approach to make sure the node will meet
+        # each other, that is, sending CLUSTER MEET messages to all the nodes
+        # about the very same node.
+        # Thanks to gossip this information should propagate across all the
+        # cluster in a matter of seconds.
+        first = false
+        @nodes.each{|n|
+            if !first then first = n.info; next; end # Skip the first node
+            n.r.cluster("meet",first[:host],first[:port])
+        }
+    end
+
+    def yes_or_die(msg)
+        print "#{msg} (type 'yes' to accept): "
+        STDOUT.flush
+        if !(STDIN.gets.chomp.downcase == "yes")
+            xputs "*** Aborting..."
+            exit 1
+        end
+    end
+
+    def load_cluster_info_from_node(nodeaddr)
+        node = ClusterNode.new(nodeaddr)
+        node.connect(:abort => true)
+        node.assert_cluster
+        node.load_info(:getfriends => true)
+        add_node(node)
+        node.friends.each{|f|
+            next if f[:flags].index("noaddr") ||
+                    f[:flags].index("disconnected") ||
+                    f[:flags].index("fail")
+            fnode = ClusterNode.new(f[:addr])
+            fnode.connect()
+            next if !fnode.r
+            begin
+                fnode.load_info()
+                add_node(fnode)
+            rescue => e
+                xputs "[ERR] Unable to load info for node #{fnode}"
+            end
+        }
+        populate_nodes_replicas_info
+    end
+
+    # This function is called by load_cluster_info_from_node in order to
+    # add additional information to every node as a list of replicas.
+    def populate_nodes_replicas_info
+        # Start adding the new field to every node.
+        @nodes.each{|n|
+            n.info[:replicas] = []
+        }
+
+        # Populate the replicas field using the replicate field of slave
+        # nodes.
+        @nodes.each{|n|
+            if n.info[:replicate]
+                master = get_node_by_name(n.info[:replicate])
+                if !master
+                    xputs "*** WARNING: #{n} claims to be slave of unknown node ID #{n.info[:replicate]}."
+                else
+                    master.info[:replicas] << n
+                end
+            end
+        }
+    end
+
+    # Given a list of source nodes return a "resharding plan"
+    # with what slots to move in order to move "numslots" slots to another
+    # instance.
+    def compute_reshard_table(sources,numslots)
+        moved = []
+        # Sort from bigger to smaller instance, for two reasons:
+        # 1) If we take less slots than instances it is better to start
+        #    getting from the biggest instances.
+        # 2) We take one slot more from the first instance in the case of not
+        #    perfect divisibility. Like we have 3 nodes and need to get 10
+        #    slots, we take 4 from the first, and 3 from the rest. So the
+        #    biggest is always the first.
+        sources = sources.sort{|a,b| b.slots.length <=> a.slots.length}
+        source_tot_slots = sources.inject(0) {|sum,source|
+            sum+source.slots.length
+        }
+        sources.each_with_index{|s,i|
+            # Every node will provide a number of slots proportional to the
+            # slots it has assigned.
+            n = (numslots.to_f/source_tot_slots*s.slots.length)
+            if i == 0
+                n = n.ceil
+            else
+                n = n.floor
+            end
+            s.slots.keys.sort[(0...n)].each{|slot|
+                if moved.length < numslots
+                    moved << {:source => s, :slot => slot}
+                end
+            }
+        }
+        return moved
+    end
+
+    def show_reshard_table(table)
+        table.each{|e|
+            puts "    Moving slot #{e[:slot]} from #{e[:source].info[:name]}"
+        }
+    end
+
+    # Move slots between source and target nodes using MIGRATE.
+    #
+    # Options:
+    # :verbose -- Print a dot for every moved key.
+    # :fix     -- We are moving in the context of a fix. Use REPLACE.
+    # :cold    -- Move keys without opening slots / reconfiguring the nodes.
+    # :update  -- Update nodes.info[:slots] for source/target nodes.
+    # :quiet   -- Don't print info messages.
+    def move_slot(source,target,slot,o={})
+        o = {:pipeline => MigrateDefaultPipeline}.merge(o)
+
+        # We start marking the slot as importing in the destination node,
+        # and the slot as migrating in the target host. Note that the order of
+        # the operations is important, as otherwise a client may be redirected
+        # to the target node that does not yet know it is importing this slot.
+        if !o[:quiet]
+            print "Moving slot #{slot} from #{source} to #{target}: "
+            STDOUT.flush
+        end
+
+        if !o[:cold]
+            target.r.cluster("setslot",slot,"importing",source.info[:name])
+            source.r.cluster("setslot",slot,"migrating",target.info[:name])
+        end
+        # Migrate all the keys from source to target using the MIGRATE command
+        while true
+            keys = source.r.cluster("getkeysinslot",slot,o[:pipeline])
+            break if keys.length == 0
+            begin
+                source.r.client.call(["migrate",target.info[:host],target.info[:port],"",0,@timeout,:keys,*keys])
+            rescue => e
+                if o[:fix] && e.to_s =~ /BUSYKEY/
+                    xputs "*** Target key exists. Replacing it for FIX."
+                    source.r.client.call(["migrate",target.info[:host],target.info[:port],"",0,@timeout,:replace,:keys,*keys])
+                else
+                    puts ""
+                    xputs "[ERR] Calling MIGRATE: #{e}"
+                    exit 1
+                end
+            end
+            print "."*keys.length if o[:dots]
+            STDOUT.flush
+        end
+
+        puts if !o[:quiet]
+        # Set the new node as the owner of the slot in all the known nodes.
+        if !o[:cold]
+            @nodes.each{|n|
+                next if n.has_flag?("slave")
+                n.r.cluster("setslot",slot,"node",target.info[:name])
+            }
+        end
+
+        # Update the node logical config
+        if o[:update] then
+            source.info[:slots].delete(slot)
+            target.info[:slots][slot] = true
+        end
+    end
+
+    # redis-trib subcommands implementations.
+
+    def check_cluster_cmd(argv,opt)
+        load_cluster_info_from_node(argv[0])
+        check_cluster
+    end
+
+    def info_cluster_cmd(argv,opt)
+        load_cluster_info_from_node(argv[0])
+        show_cluster_info
+    end
+
+    def rebalance_cluster_cmd(argv,opt)
+        opt = {
+            'pipeline' => MigrateDefaultPipeline,
+            'threshold' => RebalanceDefaultThreshold
+        }.merge(opt)
+
+        # Load nodes info before parsing options, otherwise we can't
+        # handle --weight.
+        load_cluster_info_from_node(argv[0])
+
+        # Options parsing
+        threshold = opt['threshold'].to_i
+        autoweights = opt['auto-weights']
+        weights = {}
+        opt['weight'].each{|w|
+            fields = w.split("=")
+            node = get_node_by_abbreviated_name(fields[0])
+            if !node || !node.has_flag?("master")
+                puts "*** No such master node #{fields[0]}"
+                exit 1
+            end
+            weights[node.info[:name]] = fields[1].to_f
+        } if opt['weight']
+        useempty = opt['use-empty-masters']
+
+       # Assign a weight to each node, and compute the total cluster weight.
+        total_weight = 0
+        nodes_involved = 0
+        @nodes.each{|n|
+            if n.has_flag?("master")
+                next if !useempty && n.slots.length == 0
+                n.info[:w] = weights[n.info[:name]] ? weights[n.info[:name]] : 1
+                total_weight += n.info[:w]
+                nodes_involved += 1
+            end
+        }
+
+        # Check cluster, only proceed if it looks sane.
+        check_cluster(:quiet => true)
+        if @errors.length != 0
+            puts "*** Please fix your cluster problems before rebalancing"
+            exit 1
+        end
+
+        # Calculate the slots balance for each node. It's the number of
+        # slots the node should lose (if positive) or gain (if negative)
+        # in order to be balanced.
+        threshold = opt['threshold'].to_f
+        threshold_reached = false
+        @nodes.each{|n|
+            if n.has_flag?("master")
+                next if !n.info[:w]
+                expected = ((ClusterHashSlots.to_f / total_weight) *
+                            n.info[:w]).to_i
+                n.info[:balance] = n.slots.length - expected
+                # Compute the percentage of difference between the
+                # expected number of slots and the real one, to see
+                # if it's over the threshold specified by the user.
+                over_threshold = false
+                if threshold > 0
+                    if n.slots.length > 0
+                        err_perc = (100-(100.0*expected/n.slots.length)).abs
+                        over_threshold = true if err_perc > threshold
+                    elsif expected > 0
+                        over_threshold = true
+                    end
+                end
+                threshold_reached = true if over_threshold
+            end
+        }
+        if !threshold_reached
+            xputs "*** No rebalancing needed! All nodes are within the #{threshold}% threshold."
+            return
+        end
+
+        # Only consider nodes we want to change
+        sn = @nodes.select{|n|
+            n.has_flag?("master") && n.info[:w]
+        }
+
+        # Because of rounding, it is possible that the balance of all nodes
+        # summed does not give 0. Make sure that nodes that have to provide
+        # slots are always matched by nodes receiving slots.
+        total_balance = sn.map{|x| x.info[:balance]}.reduce{|a,b| a+b}
+        while total_balance > 0
+            sn.each{|n|
+                if n.info[:balance] < 0 && total_balance > 0
+                    n.info[:balance] -= 1
+                    total_balance -= 1
+                end
+            }
+        end
+
+        # Sort nodes by their slots balance.
+        sn = sn.sort{|a,b|
+            a.info[:balance] <=> b.info[:balance]
+        }
+
+        xputs ">>> Rebalancing across #{nodes_involved} nodes. Total weight = #{total_weight}"
+
+        if $verbose
+            sn.each{|n|
+                puts "#{n} balance is #{n.info[:balance]} slots"
+            }
+        end
+
+        # Now we have at the start of the 'sn' array nodes that should get
+        # slots, at the end nodes that must give slots.
+        # We take two indexes, one at the start, and one at the end,
+        # incrementing or decrementing the indexes accordingly til we
+        # find nodes that need to get/provide slots.
+        dst_idx = 0
+        src_idx = sn.length - 1
+
+        while dst_idx < src_idx
+            dst = sn[dst_idx]
+            src = sn[src_idx]
+            numslots = [dst.info[:balance],src.info[:balance]].map{|n|
+                n.abs
+            }.min
+
+            if numslots > 0
+                puts "Moving #{numslots} slots from #{src} to #{dst}"
+
+                # Actaully move the slots.
+                reshard_table = compute_reshard_table([src],numslots)
+                if reshard_table.length != numslots
+                    xputs "*** Assertio failed: Reshard table != number of slots"
+                    exit 1
+                end
+                if opt['simulate']
+                    print "#"*reshard_table.length
+                else
+                    reshard_table.each{|e|
+                        move_slot(e[:source],dst,e[:slot],
+                            :quiet=>true,
+                            :dots=>false,
+                            :update=>true,
+                            :pipeline=>opt['pipeline'])
+                        print "#"
+                        STDOUT.flush
+                    }
+                end
+                puts
+            end
+
+            # Update nodes balance.
+            dst.info[:balance] += numslots
+            src.info[:balance] -= numslots
+            dst_idx += 1 if dst.info[:balance] == 0
+            src_idx -= 1 if src.info[:balance] == 0
+        end
+    end
+
+    def fix_cluster_cmd(argv,opt)
+        @fix = true
+        @timeout = opt['timeout'].to_i if opt['timeout']
+
+        load_cluster_info_from_node(argv[0])
+        check_cluster
+    end
+
+    def reshard_cluster_cmd(argv,opt)
+        opt = {'pipeline' => MigrateDefaultPipeline}.merge(opt)
+
+        load_cluster_info_from_node(argv[0])
+        check_cluster
+        if @errors.length != 0
+            puts "*** Please fix your cluster problems before resharding"
+            exit 1
+        end
+
+        @timeout = opt['timeout'].to_i if opt['timeout'].to_i
+
+        # Get number of slots
+        if opt['slots']
+            numslots = opt['slots'].to_i
+        else
+            numslots = 0
+            while numslots <= 0 or numslots > ClusterHashSlots
+                print "How many slots do you want to move (from 1 to #{ClusterHashSlots})? "
+                numslots = STDIN.gets.to_i
+            end
+        end
+
+        # Get the target instance
+        if opt['to']
+            target = get_node_by_name(opt['to'])
+            if !target || target.has_flag?("slave")
+                xputs "*** The specified node is not known or not a master, please retry."
+                exit 1
+            end
+        else
+            target = nil
+            while not target
+                print "What is the receiving node ID? "
+                target = get_node_by_name(STDIN.gets.chop)
+                if !target || target.has_flag?("slave")
+                    xputs "*** The specified node is not known or not a master, please retry."
+                    target = nil
+                end
+            end
+        end
+
+        # Get the source instances
+        sources = []
+        if opt['from']
+            opt['from'].split(',').each{|node_id|
+                if node_id == "all"
+                    sources = "all"
+                    break
+                end
+                src = get_node_by_name(node_id)
+                if !src || src.has_flag?("slave")
+                    xputs "*** The specified node is not known or is not a master, please retry."
+                    exit 1
+                end
+                sources << src
+            }
+        else
+            xputs "Please enter all the source node IDs."
+            xputs "  Type 'all' to use all the nodes as source nodes for the hash slots."
+            xputs "  Type 'done' once you entered all the source nodes IDs."
+            while true
+                print "Source node ##{sources.length+1}:"
+                line = STDIN.gets.chop
+                src = get_node_by_name(line)
+                if line == "done"
+                    break
+                elsif line == "all"
+                    sources = "all"
+                    break
+                elsif !src || src.has_flag?("slave")
+                    xputs "*** The specified node is not known or is not a master, please retry."
+                elsif src.info[:name] == target.info[:name]
+                    xputs "*** It is not possible to use the target node as source node."
+                else
+                    sources << src
+                end
+            end
+        end
+
+        if sources.length == 0
+            puts "*** No source nodes given, operation aborted"
+            exit 1
+        end
+
+        # Handle soures == all.
+        if sources == "all"
+            sources = []
+            @nodes.each{|n|
+                next if n.info[:name] == target.info[:name]
+                next if n.has_flag?("slave")
+                sources << n
+            }
+        end
+
+        # Check if the destination node is the same of any source nodes.
+        if sources.index(target)
+            xputs "*** Target node is also listed among the source nodes!"
+            exit 1
+        end
+
+        puts "\nReady to move #{numslots} slots."
+        puts "  Source nodes:"
+        sources.each{|s| puts "    "+s.info_string}
+        puts "  Destination node:"
+        puts "    #{target.info_string}"
+        reshard_table = compute_reshard_table(sources,numslots)
+        puts "  Resharding plan:"
+        show_reshard_table(reshard_table)
+        if !opt['yes']
+            print "Do you want to proceed with the proposed reshard plan (yes/no)? "
+            yesno = STDIN.gets.chop
+            exit(1) if (yesno != "yes")
+        end
+        reshard_table.each{|e|
+            move_slot(e[:source],target,e[:slot],
+                :dots=>true,
+                :pipeline=>opt['pipeline'])
+        }
+    end
+
+    # This is an helper function for create_cluster_cmd that verifies if
+    # the number of nodes and the specified replicas have a valid configuration
+    # where there are at least three master nodes and enough replicas per node.
+    def check_create_parameters
+        masters = @nodes.length/(@replicas+1)
+        if masters < 3
+            puts "*** ERROR: Invalid configuration for cluster creation."
+            puts "*** Redis Cluster requires at least 3 master nodes."
+            puts "*** This is not possible with #{@nodes.length} nodes and #{@replicas} replicas per node."
+            puts "*** At least #{3*(@replicas+1)} nodes are required."
+            exit 1
+        end
+    end
+
+    def create_cluster_cmd(argv,opt)
+        opt = {'replicas' => 0}.merge(opt)
+        @replicas = opt['replicas'].to_i
+
+        xputs ">>> Creating cluster"
+        argv[0..-1].each{|n|
+            node = ClusterNode.new(n)
+            node.connect(:abort => true)
+            node.assert_cluster
+            node.load_info
+            node.assert_empty
+            add_node(node)
+        }
+        check_create_parameters
+        xputs ">>> Performing hash slots allocation on #{@nodes.length} nodes..."
+        alloc_slots
+        show_nodes
+        yes_or_die "Can I set the above configuration?"
+        flush_nodes_config
+        xputs ">>> Nodes configuration updated"
+        xputs ">>> Assign a different config epoch to each node"
+        assign_config_epoch
+        xputs ">>> Sending CLUSTER MEET messages to join the cluster"
+        join_cluster
+        # Give one second for the join to start, in order to avoid that
+        # wait_cluster_join will find all the nodes agree about the config as
+        # they are still empty with unassigned slots.
+        sleep 1
+        wait_cluster_join
+        flush_nodes_config # Useful for the replicas
+        check_cluster
+    end
+
+    def addnode_cluster_cmd(argv,opt)
+        xputs ">>> Adding node #{argv[0]} to cluster #{argv[1]}"
+
+        # Check the existing cluster
+        load_cluster_info_from_node(argv[1])
+        check_cluster
+
+        # If --master-id was specified, try to resolve it now so that we
+        # abort before starting with the node configuration.
+        if opt['slave']
+            if opt['master-id']
+                master = get_node_by_name(opt['master-id'])
+                if !master
+                    xputs "[ERR] No such master ID #{opt['master-id']}"
+                end
+            else
+                master = get_master_with_least_replicas
+                xputs "Automatically selected master #{master}"
+            end
+        end
+
+        # Add the new node
+        new = ClusterNode.new(argv[0])
+        new.connect(:abort => true)
+        new.assert_cluster
+        new.load_info
+        new.assert_empty
+        first = @nodes.first.info
+        add_node(new)
+
+        # Send CLUSTER MEET command to the new node
+        xputs ">>> Send CLUSTER MEET to node #{new} to make it join the cluster."
+        new.r.cluster("meet",first[:host],first[:port])
+
+        # Additional configuration is needed if the node is added as
+        # a slave.
+        if opt['slave']
+            wait_cluster_join
+            xputs ">>> Configure node as replica of #{master}."
+            new.r.cluster("replicate",master.info[:name])
+        end
+        xputs "[OK] New node added correctly."
+    end
+
+    def delnode_cluster_cmd(argv,opt)
+        id = argv[1].downcase
+        xputs ">>> Removing node #{id} from cluster #{argv[0]}"
+
+        # Load cluster information
+        load_cluster_info_from_node(argv[0])
+
+        # Check if the node exists and is not empty
+        node = get_node_by_name(id)
+
+        if !node
+            xputs "[ERR] No such node ID #{id}"
+            exit 1
+        end
+
+        if node.slots.length != 0
+            xputs "[ERR] Node #{node} is not empty! Reshard data away and try again."
+            exit 1
+        end
+
+        # Send CLUSTER FORGET to all the nodes but the node to remove
+        xputs ">>> Sending CLUSTER FORGET messages to the cluster..."
+        @nodes.each{|n|
+            next if n == node
+            if n.info[:replicate] && n.info[:replicate].downcase == id
+                # Reconfigure the slave to replicate with some other node
+                master = get_master_with_least_replicas
+                xputs ">>> #{n} as replica of #{master}"
+                n.r.cluster("replicate",master.info[:name])
+            end
+            n.r.cluster("forget",argv[1])
+        }
+
+        # Finally shutdown the node
+        xputs ">>> SHUTDOWN the node."
+        node.r.shutdown
+    end
+
+    def set_timeout_cluster_cmd(argv,opt)
+        timeout = argv[1].to_i
+        if timeout < 100
+            puts "Setting a node timeout of less than 100 milliseconds is a bad idea."
+            exit 1
+        end
+
+        # Load cluster information
+        load_cluster_info_from_node(argv[0])
+        ok_count = 0
+        err_count = 0
+
+        # Send CLUSTER FORGET to all the nodes but the node to remove
+        xputs ">>> Reconfiguring node timeout in every cluster node..."
+        @nodes.each{|n|
+            begin
+                n.r.config("set","cluster-node-timeout",timeout)
+                n.r.config("rewrite")
+                ok_count += 1
+                xputs "*** New timeout set for #{n}"
+            rescue => e
+                puts "ERR setting node-timeot for #{n}: #{e}"
+                err_count += 1
+            end
+        }
+        xputs ">>> New node timeout set. #{ok_count} OK, #{err_count} ERR."
+    end
+
+    def call_cluster_cmd(argv,opt)
+        cmd = argv[1..-1]
+        cmd[0] = cmd[0].upcase
+
+        # Load cluster information
+        load_cluster_info_from_node(argv[0])
+        xputs ">>> Calling #{cmd.join(" ")}"
+        @nodes.each{|n|
+            begin
+                res = n.r.send(*cmd)
+                puts "#{n}: #{res}"
+            rescue => e
+                puts "#{n}: #{e}"
+            end
+        }
+    end
+
+    def import_cluster_cmd(argv,opt)
+        source_addr = opt['from']
+        xputs ">>> Importing data from #{source_addr} to cluster #{argv[1]}"
+        use_copy = opt['copy']
+        use_replace = opt['replace']
+        
+        # Check the existing cluster.
+        load_cluster_info_from_node(argv[0])
+        check_cluster
+
+        # Connect to the source node.
+        xputs ">>> Connecting to the source Redis instance"
+        src_host,src_port = source_addr.split(":")
+        source = Redis.new(:host =>src_host, :port =>src_port)
+        if source.info['cluster_enabled'].to_i == 1
+            xputs "[ERR] The source node should not be a cluster node."
+        end
+        xputs "*** Importing #{source.dbsize} keys from DB 0"
+
+        # Build a slot -> node map
+        slots = {}
+        @nodes.each{|n|
+            n.slots.each{|s,_|
+                slots[s] = n
+            }
+        }
+
+        # Use SCAN to iterate over the keys, migrating to the
+        # right node as needed.
+        cursor = nil
+        while cursor != 0
+            cursor,keys = source.scan(cursor, :count => 1000)
+            cursor = cursor.to_i
+            keys.each{|k|
+                # Migrate keys using the MIGRATE command.
+                slot = key_to_slot(k)
+                target = slots[slot]
+                print "Migrating #{k} to #{target}: "
+                STDOUT.flush
+                begin
+                    cmd = ["migrate",target.info[:host],target.info[:port],k,0,@timeout]
+                    cmd << :copy if use_copy
+                    cmd << :replace if use_replace
+                    source.client.call(cmd)
+                rescue => e
+                    puts e
+                else
+                    puts "OK"
+                end
+            }
+        end
+    end
+
+    def help_cluster_cmd(argv,opt)
+        show_help
+        exit 0
+    end
+
+    # Parse the options for the specific command "cmd".
+    # Returns an hash populate with option => value pairs, and the index of
+    # the first non-option argument in ARGV.
+    def parse_options(cmd)
+        idx = 1 ; # Current index into ARGV
+        options={}
+        while idx < ARGV.length && ARGV[idx][0..1] == '--'
+            if ARGV[idx][0..1] == "--"
+                option = ARGV[idx][2..-1]
+                idx += 1
+
+                # --verbose is a global option
+                if option == "verbose"
+                    $verbose = true
+                    next
+                end
+
+                if ALLOWED_OPTIONS[cmd] == nil || ALLOWED_OPTIONS[cmd][option] == nil
+                    puts "Unknown option '#{option}' for command '#{cmd}'"
+                    exit 1
+                end
+                if ALLOWED_OPTIONS[cmd][option] != false
+                    value = ARGV[idx]
+                    idx += 1
+                else
+                    value = true
+                end
+
+                # If the option is set to [], it's a multiple arguments
+                # option. We just queue every new value into an array.
+                if ALLOWED_OPTIONS[cmd][option] == []
+                    options[option] = [] if !options[option]
+                    options[option] << value
+                else
+                    options[option] = value
+                end
+            else
+                # Remaining arguments are not options.
+                break
+            end
+        end
+
+        # Enforce mandatory options
+        if ALLOWED_OPTIONS[cmd]
+            ALLOWED_OPTIONS[cmd].each {|option,val|
+                if !options[option] && val == :required
+                    puts "Option '--#{option}' is required "+ \
+                         "for subcommand '#{cmd}'"
+                    exit 1
+                end
+            }
+        end
+        return options,idx
+    end
+end
+
+#################################################################################
+# Libraries
+#
+# We try to don't depend on external libs since this is a critical part
+# of Redis Cluster.
+#################################################################################
+
+# This is the CRC16 algorithm used by Redis Cluster to hash keys.
+# Implementation according to CCITT standards.
+#
+# This is actually the XMODEM CRC 16 algorithm, using the
+# following parameters:
+#
+# Name                       : "XMODEM", also known as "ZMODEM", "CRC-16/ACORN"
+# Width                      : 16 bit
+# Poly                       : 1021 (That is actually x^16 + x^12 + x^5 + 1)
+# Initialization             : 0000
+# Reflect Input byte         : False
+# Reflect Output CRC         : False
+# Xor constant to output CRC : 0000
+# Output for "123456789"     : 31C3
+
+module RedisClusterCRC16
+    def RedisClusterCRC16.crc16(bytes)
+        crc = 0
+        bytes.each_byte{|b|
+            crc = ((crc<<8) & 0xffff) ^ XMODEMCRC16Lookup[((crc>>8)^b) & 0xff]
+        }
+        crc
+    end
+
+private
+    XMODEMCRC16Lookup = [
+        0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
+        0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
+        0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
+        0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
+        0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
+        0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
+        0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
+        0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
+        0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
+        0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
+        0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
+        0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
+        0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
+        0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
+        0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
+        0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
+        0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
+        0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
+        0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
+        0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
+        0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
+        0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
+        0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
+        0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
+        0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
+        0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
+        0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
+        0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
+        0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
+        0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
+        0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
+        0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0
+    ]
+end
+
+# Turn a key name into the corrisponding Redis Cluster slot.
+def key_to_slot(key)
+    # Only hash what is inside {...} if there is such a pattern in the key.
+    # Note that the specification requires the content that is between
+    # the first { and the first } after the first {. If we found {} without
+    # nothing in the middle, the whole key is hashed as usually.
+    s = key.index "{"
+    if s
+        e = key.index "}",s+1
+        if e && e != s+1
+            key = key[s+1..e-1]
+        end
+    end
+    RedisClusterCRC16.crc16(key) % 16384
+end
+
+#################################################################################
+# Definition of commands
+#################################################################################
+
+COMMANDS={
+    "create"  => ["create_cluster_cmd", -2, "host1:port1 ... hostN:portN"],
+    "check"   => ["check_cluster_cmd", 2, "host:port"],
+    "info"    => ["info_cluster_cmd", 2, "host:port"],
+    "fix"     => ["fix_cluster_cmd", 2, "host:port"],
+    "reshard" => ["reshard_cluster_cmd", 2, "host:port"],
+    "rebalance" => ["rebalance_cluster_cmd", -2, "host:port"],
+    "add-node" => ["addnode_cluster_cmd", 3, "new_host:new_port existing_host:existing_port"],
+    "del-node" => ["delnode_cluster_cmd", 3, "host:port node_id"],
+    "set-timeout" => ["set_timeout_cluster_cmd", 3, "host:port milliseconds"],
+    "call" =>    ["call_cluster_cmd", -3, "host:port command arg arg .. arg"],
+    "import" =>  ["import_cluster_cmd", 2, "host:port"],
+    "help"    => ["help_cluster_cmd", 1, "(show this help)"]
+}
+
+ALLOWED_OPTIONS={
+    "create" => {"replicas" => true},
+    "add-node" => {"slave" => false, "master-id" => true},
+    "import" => {"from" => :required, "copy" => false, "replace" => false},
+    "reshard" => {"from" => true, "to" => true, "slots" => true, "yes" => false, "timeout" => true, "pipeline" => true},
+    "rebalance" => {"weight" => [], "auto-weights" => false, "use-empty-masters" => false, "timeout" => true, "simulate" => false, "pipeline" => true, "threshold" => true},
+    "fix" => {"timeout" => MigrateDefaultTimeout},
+}
+
+def show_help
+    puts "Usage: redis-trib <command> <options> <arguments ...>\n\n"
+    COMMANDS.each{|k,v|
+        o = ""
+        puts "  #{k.ljust(15)} #{v[2]}"
+        if ALLOWED_OPTIONS[k]
+            ALLOWED_OPTIONS[k].each{|optname,has_arg|
+                puts "                  --#{optname}" + (has_arg ? " <arg>" : "")
+            }
+        end
+    }
+    puts "\nFor check, fix, reshard, del-node, set-timeout you can specify the host and port of any working node in the cluster.\n"
+end
+
+# Sanity check
+if ARGV.length == 0
+    show_help
+    exit 1
+end
+
+rt = RedisTrib.new
+cmd_spec = COMMANDS[ARGV[0].downcase]
+if !cmd_spec
+    puts "Unknown redis-trib subcommand '#{ARGV[0]}'"
+    exit 1
+end
+
+# Parse options
+cmd_options,first_non_option = rt.parse_options(ARGV[0].downcase)
+rt.check_arity(cmd_spec[1],ARGV.length-(first_non_option-1))
+
+# Dispatch
+rt.send(cmd_spec[0],ARGV[first_non_option..-1],cmd_options)
diff --git a/debian/modules/nchan/dev/redis.conf b/debian/modules/nchan/dev/redis.conf
new file mode 100644
index 0000000..8a7b160
--- /dev/null
+++ b/debian/modules/nchan/dev/redis.conf
@@ -0,0 +1,1018 @@
+# Redis configuration file example
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 8537
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket /tmp/redis-pushmodule.sock
+unixsocketperm 755
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 60
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /tmp/redis-pushmodule.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /dev/stdout
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+#dbfilename dump.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir ./
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only no
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+appendfsync everysec
+# appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+# cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+# cluster-config-file redis-cluster-nodes.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  by zero or multiple characters. The empty string means that notifications
+#  are disabled at all.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/.gitignore b/debian/modules/nchan/dev/redis_clusterconf/.gitignore
new file mode 100644
index 0000000..58c2a9d
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/.gitignore
@@ -0,0 +1 @@
+*.rdb
diff --git a/debian/modules/nchan/dev/redis_clusterconf/cluster.sh b/debian/modules/nchan/dev/redis_clusterconf/cluster.sh
new file mode 100755
index 0000000..d7ab5f8
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/cluster.sh
@@ -0,0 +1,10 @@
+#!/bin/zsh
+
+for (( n=7000; n<=7005; n++ ))
+do
+  redis-server ./redis-${n}.conf &
+done
+
+echo "all redis-servers in cluster started."
+
+wait
diff --git a/debian/modules/nchan/dev/redis_clusterconf/failover.sh b/debian/modules/nchan/dev/redis_clusterconf/failover.sh
new file mode 100755
index 0000000..a2f30c8
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/failover.sh
@@ -0,0 +1,62 @@
+#!/bin/zsh
+
+PORTMIN=7000
+PORTMAX=7005
+
+slaves=()
+node_slaves=()
+
+info=$(redis-cli --raw -p $PORTMIN cluster info)
+
+if ! echo $info | ack 'cluster_state:ok' > /dev/null; then
+  echo "cluster not ready" > /dev/stderr
+  exit 1
+fi    
+
+function is_master {
+  resp=$(redis-cli --raw -p $1 eval "return redis.call('info', 'replication'):match('role:master') and 1 or 0" 0)
+  if [[ $resp == "1" ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+for (( n=$PORTMIN; n<=$PORTMAX; n++ )); do
+  if ! (is_master $n); then
+    slaves+=($n)
+    node_slaves[$n]=1
+  fi
+done
+
+for n in $slaves; do
+  echo -n "$n:"
+  while ! (is_master $n); do
+    echo -n "."
+    redis-cli -p $n CLUSTER FAILOVER > /dev/null
+    sleep 0.2
+  done;
+  echo " ok"
+done
+
+repeat="repeat"
+while [[ $repeat == "repeat" ]]; do
+  repeat=""
+  for (( n=$PORTMIN; n<=$PORTMAX; n++ )); do
+    was_slave=${node_slaves[$n]:=0}
+    is_slave=0
+    if ! (is_master $n); then
+      is_slave=1
+    fi
+    #echo "$n slave?: was $was_slave is $is_slave"
+    if [[ was_slave == is_slave ]]; then
+      repeat="repeat"
+      echo -n "."
+    fi
+  done
+done
+echo "ready"
+
+redis-cli -p 7000 cluster info
+sleep 2
+redis-cli -p 7000 cluster nodes | sort -k 2
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7000.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7000.conf
new file mode 100644
index 0000000..a90a9e6
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-7000.conf
@@ -0,0 +1,1018 @@
+# Redis configuration file example
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 7000
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket /tmp/redis-nchan-cluster-7000.sock
+unixsocketperm 755
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 60
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /tmp/redis-nchan-cluster-7000.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /dev/stdout
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump-7000.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir ./
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only no
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+# appendfsync everysec
+appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+cluster-config-file redis-cluster-node-7000.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  by zero or multiple characters. The empty string means that notifications
+#  are disabled at all.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7001.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7001.conf
new file mode 100644
index 0000000..348a88c
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-7001.conf
@@ -0,0 +1,1018 @@
+# Redis configuration file example
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 7001
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket /tmp/redis-nchan-cluster-7001.sock
+unixsocketperm 755
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 60
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /tmp/redis-nchan-cluster-7001.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /dev/stdout
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump-7001.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir ./
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only no
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+# appendfsync everysec
+appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+cluster-config-file redis-cluster-node-7001.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  by zero or multiple characters. The empty string means that notifications
+#  are disabled at all.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7002.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7002.conf
new file mode 100644
index 0000000..e3c6422
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-7002.conf
@@ -0,0 +1,1018 @@
+# Redis configuration file example
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 7002
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket /tmp/redis-nchan-cluster-7002.sock
+unixsocketperm 755
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 60
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /tmp/redis-nchan-cluster-7002.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /dev/stdout
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump-7002.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir ./
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only no
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+# appendfsync everysec
+appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+cluster-config-file redis-cluster-node-7002.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  by zero or multiple characters. The empty string means that notifications
+#  are disabled at all.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7003.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7003.conf
new file mode 100644
index 0000000..4a637bc
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-7003.conf
@@ -0,0 +1,1018 @@
+# Redis configuration file example
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 7003
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket /tmp/redis-nchan-cluster-7003.sock
+unixsocketperm 755
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 60
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /tmp/redis-nchan-cluster-7003.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /dev/stdout
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump-7003.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir ./
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only no
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+# appendfsync everysec
+appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+cluster-config-file redis-cluster-node-7003.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  by zero or multiple characters. The empty string means that notifications
+#  are disabled at all.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7004.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7004.conf
new file mode 100644
index 0000000..810a780
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-7004.conf
@@ -0,0 +1,1018 @@
+# Redis configuration file example
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 7004
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket /tmp/redis-nchan-cluster-7004.sock
+unixsocketperm 755
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 60
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /tmp/redis-nchan-cluster-7004.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /dev/stdout
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump-7004.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir ./
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only no
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+# appendfsync everysec
+appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+cluster-config-file redis-cluster-node-7004.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  by zero or multiple characters. The empty string means that notifications
+#  are disabled at all.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7005.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7005.conf
new file mode 100644
index 0000000..1b32e09
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-7005.conf
@@ -0,0 +1,1018 @@
+# Redis configuration file example
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 7005
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket /tmp/redis-nchan-cluster-7005.sock
+unixsocketperm 755
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 60
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /tmp/redis-nchan-cluster-7005.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /dev/stdout
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump-7005.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir ./
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only no
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+# appendfsync everysec
+appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+cluster-config-file redis-cluster-node-7005.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  by zero or multiple characters. The empty string means that notifications
+#  are disabled at all.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7006.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7006.conf
new file mode 100644
index 0000000..b495b23
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-7006.conf
@@ -0,0 +1,1018 @@
+# Redis configuration file example
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 7006
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket /tmp/redis-nchan-cluster-7006.sock
+unixsocketperm 755
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 60
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize no
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /tmp/redis-nchan-cluster-7006.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /dev/stdout
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump-7006.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir ./
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only no
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+# appendfsync everysec
+appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+cluster-config-file redis-cluster-node-7006.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  by zero or multiple characters. The empty string means that notifications
+#  are disabled at all.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7000.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7000.conf
new file mode 100644
index 0000000..b6f83a5
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7000.conf
@@ -0,0 +1,7 @@
+f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 myself,master - 0 0 1 connected 0-5460
+b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468789200637 2 connected 5461-10922
+b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468789202612 3 connected 10923-16383
+96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468789198590 4 connected
+668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203718 6 connected
+e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468789203618 5 connected
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7001.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7001.conf
new file mode 100644
index 0000000..39a11ce
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7001.conf
@@ -0,0 +1,7 @@
+e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468789203614 5 connected
+96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468789202609 4 connected
+668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203715 6 connected
+b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468789199591 3 connected 10923-16383
+b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 myself,master - 0 0 2 connected 5461-10922
+f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468789200599 1 connected 0-5460
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7002.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7002.conf
new file mode 100644
index 0000000..0ffbb5a
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7002.conf
@@ -0,0 +1,7 @@
+e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468789202668 2 connected
+668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203674 6 connected
+96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468789203171 4 connected
+f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468789200657 1 connected 0-5460
+b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 myself,master - 0 0 3 connected 10923-16383
+b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468789203674 2 connected 5461-10922
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7003.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7003.conf
new file mode 100644
index 0000000..2670736
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7003.conf
@@ -0,0 +1,7 @@
+f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468789201991 1 connected 0-5460
+e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468789198671 5 connected
+b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468789202998 3 connected 10923-16383
+b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468789200985 2 connected 5461-10922
+96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 myself,slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 0 4 connected
+668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203700 6 connected
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7004.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7004.conf
new file mode 100644
index 0000000..8eac772
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7004.conf
@@ -0,0 +1,7 @@
+f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468789201555 1 connected 0-5460
+b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468789200549 3 connected 10923-16383
+96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468789203567 4 connected
+e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 myself,slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 0 5 connected
+b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468789202562 2 connected 5461-10922
+668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203673 6 connected
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7005.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7005.conf
new file mode 100644
index 0000000..6efc1aa
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7005.conf
@@ -0,0 +1,7 @@
+96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468472205940 4 connected
+668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 myself,slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 0 6 connected
+b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468472206941 3 connected 10923-16383
+f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468472204937 1 connected 0-5460
+e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468472202273 2 connected
+b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468472203935 2 connected 5461-10922
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7006.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7006.conf
new file mode 100644
index 0000000..421f87e
--- /dev/null
+++ b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7006.conf
@@ -0,0 +1,2 @@
+543ac57c6d28c31d69120204b153021113d0eba0 :0 myself,master - 0 0 0 connected
+vars currentEpoch 0 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redocument.rb b/debian/modules/nchan/dev/redocument.rb
new file mode 100755
index 0000000..cd3bf0c
--- /dev/null
+++ b/debian/modules/nchan/dev/redocument.rb
@@ -0,0 +1,295 @@
+#!/usr/bin/ruby
+require "date"
+require "pry"
+
+SRC_DIR="src"
+CONFIG_IN="nchan_commands.rb"
+
+
+README_FILE="README.md"
+
+if ARGV[0]
+  ROOT_DIR = ARGV[0]
+  readme_path = "#{ROOT_DIR}/#{README_FILE}"
+  readme_output_path = ARGV[1]
+  mysite = true
+else
+  ROOT_DIR = ".."
+  readme_path = "#{ROOT_DIR}/#{README_FILE}"
+  readme_output_path = readme_path
+  mysite = nil
+end
+
+current_release = nil
+current_release_date = nil
+Dir.chdir ROOT_DIR do
+  current_release=(`git describe --abbrev=0 --tags`).chomp
+  current_release_date = (`git log -1 --format=%ai #{current_release}`).chomp
+  current_release_date = DateTime.parse(current_release_date).strftime("%B %-d, %Y")
+end
+
+
+class CfCmd #let's make a DSL!
+  attr_accessor :cmds
+  class OneOf
+    def initialize(arg) 
+      @arg=arg
+    end
+    def []=(k,v)
+      @arg[k]=v
+    end
+    def [](val)
+      ret=@arg[val]
+      raise "Unknown value lookup #{val}" if ret.nil?
+      ret
+    end
+  end
+  
+  class Cmd
+    attr_accessor :name, :type, :set, :conf, :offset_name
+    attr_accessor :contexts, :args, :legacy, :alt, :disabled, :undocumented
+    attr_accessor :group, :default, :info, :value
+
+    def initialize(name, func)
+      self.name=name
+      self.set=func
+    end
+    
+    def group
+      @group || :none
+    end
+    
+    def descr(str, opt)
+      if opt[:mysite]
+        "<span class=\"description\">#{str}:</span>"
+      else
+        "#{str}:"
+      end
+    end
+    
+    def to_md(opt={})
+      lines = []
+      if value.class == Array
+        val = "[ #{value.join ' | '} ]"
+      elsif value
+        val = "#{value}"
+      end
+      
+      if opt[:mysite]
+        namestr = "<a class=\"directive\" id=\"#{name}\" href=\"##{name}\">#{name}</a>"
+      else
+        namestr = "**#{name}**"
+      end
+      
+      if val
+        lines << "- #{namestr} `#{val}`"
+      else
+        lines << "- #{namestr}"
+      end
+      
+      if Range === args
+        lines << "  #{descr 'arguments', opt} #{args.first} #{opt[:mysite] ? "&ndash;" : "-"} #{args.exclude_end? ? args.last - 1 : args.last}"
+      elsif Numeric === args
+        lines << "  #{descr 'arguments', opt} #{args}"
+      else
+        raise "invalid args: #{args}"
+      end
+      
+      if default
+        lines << "  #{descr 'default', opt} `#{Array === default ? default.join(' ') : default}`"
+      end
+      
+      ctx_lookup = { main: :http, srv: :server, loc: :location }
+      ctx = contexts.map do |c|
+        ctx_lookup[c] || c;
+      end
+      lines << "  #{descr 'context', opt} #{ctx.join ', '}"
+      
+      if legacy
+        if Array === self.legacy
+          lines << "  #{descr 'legacy names', opt} #{legacy.join ', '}"
+        else
+          lines << "  #{descr 'legacy name', opt} #{legacy}"
+        end
+      end
+      
+      if info
+        out = info.lines.map do |line|
+          "  > #{line.chomp}  "
+        end
+        lines << out.join("\n")
+      end
+      
+      lines.map! {|l| "#{l}  "}
+      lines.join "\n"
+    end
+    
+    def to_txt(opt={})
+      lines = []
+      if value.class == Array
+        val = "[ #{value.join ' | '} ]"
+      elsif value
+        val = "#{value}"
+      end
+      
+      if val
+        lines << "#{name} #{val}"
+      else
+        lines << "#{name}"
+      end
+      
+      if Range === args
+        lines << "  #{descr 'arguments', opt} #{args.first} - #{args.exclude_end? ? args.last - 1 : args.last}"
+      elsif Numeric === args
+        lines << "  #{descr 'arguments', opt} #{args}"
+      else
+        raise "invalid args: #{args}"
+      end
+      
+      if default
+        lines << "  #{descr 'default', opt} #{Array === default ? default.join(' ') : default}"
+      end
+      
+      ctx_lookup = { main: :http, srv: :server, loc: :location }
+      ctx = contexts.map do |c|
+        ctx_lookup[c] || c;
+      end
+      lines << "  #{descr 'context', opt} #{ctx.join ', '}"
+      
+      if legacy
+        if Array === self.legacy
+          lines << "  #{descr 'legacy names', opt} #{legacy.join ', '}"
+        else
+          lines << "  #{descr 'legacy name', opt} #{legacy}"
+        end
+      end
+      
+      if info
+        out = info.lines.map do |line|
+          "   #{line.chomp}  "
+        end
+        lines << out.join("\n")
+      end
+      
+      lines.map! {|l| "#{l}  "}
+      lines.join "\n"
+    end
+  end
+  
+  
+  def initialize(&block)
+    @cmds=[]
+    instance_eval &block
+  end
+  
+  def method_missing(name, *args)
+    define_cmd name, *args
+  end
+  
+  
+  def define_cmd(name, valid_contexts, handler, conf, opt={})
+    cmd=Cmd.new name, handler
+    cmd.contexts= valid_contexts
+    
+    if Array === conf
+      cmd.conf=conf[0]
+      cmd.offset_name=conf[1]
+    else
+      cmd.conf=conf
+    end
+    
+    cmd.legacy = opt[:legacy]
+    cmd.alt = opt[:alt]
+    cmd.disabled = opt[:disabled]
+    cmd.undocumented = opt[:undocumented]
+    
+    cmd.args = opt.has_key?(:args) ? opt[:args] : 1
+    cmd.group = opt[:group]
+    cmd.value = opt[:value]
+    cmd.default = opt[:default]
+    cmd.info = opt[:info]
+    
+    @cmds << cmd if !cmd.disabled && !cmd.undocumented
+  end
+ 
+end
+
+
+class Order 
+  def initialize(*args)
+    @i=0
+    @ord = {}
+    args.each do |val|
+      @ord[val] = @i
+      @i+=1
+    end
+  end
+  def [](val)
+    @ord[val] || Float::INFINITY
+  end
+end
+
+begin
+  cf=eval File.read("#{ROOT_DIR}/#{SRC_DIR}/#{CONFIG_IN}")
+rescue Exception => e
+  STDERR.puts e.message.gsub(/^\(eval\)/, "#{SRC_DIR}/#{CONFIG_IN}")
+  exit 1
+end
+
+cmds = cf.cmds
+
+group_order=Order.new(:pubsub, :security, :storage, :meta, :none, :development)
+
+cmds.sort! do |c1, c2|
+  if c1.group != c2.group
+    group_order[c1] - group_order[c2]
+  else
+    (c1.name < c2.name) ? -1 : 1
+  end
+end
+
+
+
+cmds.map! do |cmd|
+  cmd.to_md(:mysite => mysite)
+end
+
+
+config_documentation= cmds.join "\n\n"
+
+#if mysite
+#  config_documentation = "<div class='configuration'><markdown>#{config_documentation}</markdown></div>"
+#end
+
+text = File.read(readme_path)
+
+if mysite
+  #remove first line
+  text.sub!(/^<.*?>$\n\n?/m, "")
+  #remove second line
+  text.sub!(/^https:\/\/nchan.slact.net$\n\n?/m, "")
+  
+  # add an #about link
+  text.prepend "<a id=\"about\"></a>\n"
+  
+  #add a table-of-contents div right before the first heading
+  text.sub! /^#/, "<div class=\"tableOfContents\"></div>\n#"
+end
+
+config_heading = "## Configuration Directives"
+text.gsub!(/(?<=^#{config_heading}$).*(?=^## )/m, "\n\n#{config_documentation}\n\n")
+
+if mysite
+  contrib_heading = "## Contribute"
+  text.gsub!(/(^#{contrib_heading}$).*(?=^## )?/m, "")
+end
+
+
+text.gsub!(/(?<=^The latest Nchan release is )\S+\s+\([^)]+\)/, "#{current_release} (#{current_release_date})")
+
+if mysite
+  text.gsub!(/https:\/\/nchan\.slact\.net\//, "/")
+end
+
+File.open(readme_output_path, "w") {|file| file.puts text }
+
diff --git a/debian/modules/nchan/dev/rsck.sh b/debian/modules/nchan/dev/rsck.sh
new file mode 100755
index 0000000..9cc0f32
--- /dev/null
+++ b/debian/modules/nchan/dev/rsck.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+
+server="127.0.0.1"
+port="6379"
+db="0"
+dir=$(dirname $0)
+pushd $dir > /dev/null
+fulldir=$(pwd)
+popd > /dev/null
+  
+while getopts "s:p:d:t:l:h" opt; do
+  case $opt in
+    s)
+      server=$OPTARG;;
+    p)
+      port=$OPTARG;;
+    d)
+      db=$OPTARG;;
+    t)
+      interval=$OPTARG;;
+    l)  
+      logfile=$OPTARG;;
+    h)
+      echo "nchan redis server data consistency check"
+      echo " -s [server]"
+      echo " -p [port]"
+      echo " -d [db number]"
+      echo " -t [minutes]   repeat at this interval"
+      echo " -l [logfile]   log results to this file"
+      ;;
+   \?)
+     exit 1
+     ;;
+  esac
+done
+
+url="redis://$server:$port/$db"
+
+if [[ $interval ]]; then
+  echo "rsck $url every $interval minutes"
+else
+  echo "rsck $url"
+fi
+
+if [[ $logfile ]]; then
+  echo "logging to $logfile"
+fi
+
+if [[ $interval ]]; then
+  sleeptime=$(echo "$interval * 60" | bc)
+fi
+while true; do
+  ret=$(redis-cli -p 8537 --eval $dir/../src/store/redis/scripts/rsck.lua --raw)
+  echo $ret
+  
+  if [[ $logfile ]]; then
+    printf "$(date)\n$ret\n\n" >> $logfile
+  fi
+  
+  if [[ ! $interval ]]; then
+    break
+  else
+    sleep $sleeptime
+  fi
+done
+ 
diff --git a/debian/modules/nchan/dev/sub.rb b/debian/modules/nchan/dev/sub.rb
new file mode 100755
index 0000000..f4bbef9
--- /dev/null
+++ b/debian/modules/nchan/dev/sub.rb
@@ -0,0 +1,125 @@
+#!/usr/bin/ruby
+require 'securerandom'
+require_relative 'pubsub.rb'
+require "optparse"
+require 'timers'
+
+
+server= "localhost:8082"
+par=1
+
+opt = {
+  timeout:      60,
+  quit_message: 'FIN',
+  client:       :longpoll,
+  extra_headers: nil,
+  nostore:       true,
+  http2:         false
+}
+
+no_message=false
+print_content_type = false
+show_id=false
+origin = nil
+
+url = nil
+sub = nil
+
+opt_parser=OptionParser.new do |opts|
+  opts.on("-s", "--server SERVER (#{server})", "server and port."){|v| server=v}
+  opts.on("-p", "--parallel NUM (#{par})", "number of parallel clients"){|v| par = v.to_i}
+  opts.on("-t", "--timeout SEC (#{opt[:timeout]})", "Long-poll timeout"){|v| opt[:timeout] = v}
+  opts.on("-q", "--quit STRING (#{opt[:quit_message]})", "Quit message"){|v| opt[:quit_message] = v}
+  opts.on("-l", "--client STRING (#{opt[:client]})", "sub client (one of #{Subscriber::Client.unique_aliases.join ', '})") do |v|
+    opt[:client] = v.to_sym
+  end
+  opts.on("-c", "--content-type", "show received content-type"){|v| print_content_type = true}
+  opts.on("-i", "--id", "Print message id (last-modified and etag headers)."){|v| show_id = true}
+  opts.on("-n", "--no-message", "Don't output retrieved message."){|v| no_message = true}
+  opts.on("--origin STR", "Set Origin header if appplicable."){|v| origin = v}
+  opts.on("--full-url URL", "full subscriber url") do |v|
+    url = v
+  end
+  opts.on("--http2", "use HTTP/2"){opt[:http2] = true}
+  opts.on("-v", "--verbose", "somewhat rather extraneously wordful output") do
+    opt[:verbose] = true
+    Typhoeus::Config.verbose=true
+  end
+end
+opt_parser.banner="Usage: sub.rb [options] url"
+opt_parser.parse!
+
+url ||= "#{opt[:http2] ? 'h2' : 'http'}://#{server}#{ARGV.last}"
+
+puts "Subscribing #{par} #{opt[:client]} client#{par!=1 ? "s":""} to #{url}."
+puts "Timeout: #{opt[:timeout]}sec, quit msg: #{opt[:quit_message]}"
+
+if origin
+  opt[:extra_headers] ||= {}
+  opt[:extra_headers]['Origin'] = origin
+end
+
+sub = Subscriber.new url, par, opt
+
+
+NOMSGF="\r"*30 + "Received message %i, len:%i"
+if no_message
+  class OutputTimer
+    include Celluloid
+    attr_reader :fired, :timer
+
+    def initialize(interval = 0.5)
+      @count = 0
+      @last_msg_length = 0 
+      @timer = every(interval) do
+        printf NOMSGF, @count, @last_msg_length
+      end
+    end
+    
+    def incoming(msg)
+      @count += 1
+      @last_msg_length = msg.message.length
+    end
+  end
+  
+  output_timer = OutputTimer.new
+end
+
+sub.on_message do |msg|
+  if no_message
+    output_timer.incoming(msg)
+  else
+    if msg.content_type
+      out = "(#{msg.content_type}) #{msg}"
+    else
+      out = msg.to_s
+    end
+    if show_id
+      out = "<#{msg.id}> #{out}"
+    end
+    puts out
+  end
+end
+
+sub.on_failure do |err_msg|
+  if Subscriber::IntervalPollClient === sub.client
+    unless err_msg.match(/\(code 304\)/)
+      false
+    end 
+  else
+    false
+  end
+end
+
+sub.run
+sub.wait
+output_timer.terminate if output_timer
+
+
+if sub.errors.count > 0
+  puts "Errors:"
+  sub.errors.each do |err|
+    puts err
+  end
+  exit 1
+end
diff --git a/debian/modules/nginx-http-push/tests/test-parallel.sh b/debian/modules/nchan/dev/test-parallel.sh
similarity index 83%
rename from debian/modules/nginx-http-push/tests/test-parallel.sh
rename to debian/modules/nchan/dev/test-parallel.sh
index c5e5ecb..389b2a5 100755
--- a/debian/modules/nginx-http-push/tests/test-parallel.sh
+++ b/debian/modules/nchan/dev/test-parallel.sh
@@ -10,7 +10,9 @@ if ! [[ $par =~ ^[0-9]+$ ]]; then
 fi
 
 for ((i = 0; i < $par; i++)); do
-  ./test.rb ${@:2} &
+
+    echo bundle exec ./test.rb ${@:2} 
+    bundle exec ./test.rb ${@:2} &
 done
 
 jobs=$(jobs -p)
diff --git a/debian/modules/nchan/dev/test.rb b/debian/modules/nchan/dev/test.rb
new file mode 100755
index 0000000..35db249
--- /dev/null
+++ b/debian/modules/nchan/dev/test.rb
@@ -0,0 +1,875 @@
+#!/usr/bin/ruby
+require 'minitest'
+require 'minitest/reporters'
+require "minitest/autorun"
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new(:color => true)]
+require 'securerandom'
+require_relative 'pubsub.rb'
+require_relative 'authserver.rb'
+
+SERVER=ENV["PUSHMODULE_SERVER"] || "127.0.0.1"
+PORT=ENV["PUSHMODULE_PORT"] || "8082"
+DEFAULT_CLIENT=:longpoll
+OMIT_LONGMSG=ENV["OMIT_LONGMSG"]
+#Typhoeus::Config.verbose = true
+def short_id
+  SecureRandom.hex.to_i(16).to_s(36)[0..5]
+end
+
+def url(part="")
+  part=part[1..-1] if part[0]=="/"
+  "http://#{SERVER}:#{PORT}/#{part}"
+end
+puts "Server at #{url}"
+def pubsub(concurrent_clients=1, opt={})
+  test_name = caller_locations(1,1)[0].label
+  urlpart=opt[:urlpart] || 'broadcast'
+  timeout = opt[:timeout]
+  sub_url=opt[:sub] || "sub/broadcast/"
+  pub_url=opt[:pub] || "pub/"
+  chan_id = opt[:channel] || SecureRandom.hex
+  sub = Subscriber.new url("#{sub_url}#{chan_id}?test=#{test_name}"), concurrent_clients, timeout: timeout, use_message_id: opt[:use_message_id], quit_message: 'FIN', gzip: opt[:gzip], retry_delay: opt[:retry_delay], client: opt[:client] || DEFAULT_CLIENT, extra_headers: opt[:extra_headers], verbose: opt[:verbose]
+  pub = Publisher.new url("#{pub_url}#{chan_id}?test=#{test_name}"), timeout: timeout
+  return pub, sub
+end
+def verify(pub, sub, check_errors=true)
+  assert sub.errors.empty?, "There were subscriber errors: \r\n#{sub.errors.join "\r\n"}" if check_errors
+  ret, err = sub.messages.matches?(pub.messages)
+  assert ret, err || "Messages don't match"
+  i=0
+  sub.messages.each do |msg|
+    assert_equal sub.concurrency, msg.times_seen, "Concurrent subscribers didn't all receive message #{i}."
+    i+=1
+  end
+end
+
+class PubSubTest <  Minitest::Test
+  def setup
+    Celluloid.boot
+  end
+  
+  def test_interval_poll
+    pub, sub=pubsub 1, sub: "/sub/intervalpoll/", client: :intervalpoll, quit_message: 'FIN', retry_delay: 0.5
+    ws_sub=Subscriber.new(sub.url, 1, client: :websocket, quit_message: 'FIN')
+
+    got_304s=0
+    sub.on_failure do |msg|
+      got_304s += 1
+      assert_match /code 304/, msg #handshake will be treated as intervalpoll client?...
+    end
+    
+    ws_sub.run
+    sub.run
+
+    sleep 0.4
+    assert ws_sub.match_errors(/code 403/), "expected 403 for all non-intervalpoll subscribers, got #{sub.errors.pretty_inspect}"
+    ws_sub.terminate
+    
+    pub.post ["hello this", "is a thing"]
+    sleep 0.3
+    pub.post ["oh now what", "is this even a thing?"]
+    sleep 0.1
+    
+    sleep 1.5
+    
+    pub.post "yoo"
+    pub.post "FIN"
+    
+    sub.wait
+
+    verify pub, sub
+    sub.terminate
+    assert got_304s > 0, "Expected at least one 304 response"
+  end
+  
+  def test_channel_info
+    require 'json'
+    require 'nokogiri'
+    require 'yaml'
+    
+    subs=20
+    
+    chan=SecureRandom.hex
+    pub, sub = pubsub(subs, channel: chan, client: :eventsource)
+    pub.nofail=true
+    pub.get
+    assert_equal 404, pub.response_code
+    
+    pub.post ["hello", "what is this i don't even"]
+    assert_equal 202, pub.response_code
+    pub.get
+    
+    assert_equal 200, pub.response_code
+    assert_match /last requested: -?\d+ sec/, pub.response_body
+    
+    pub.get "text/json"
+    
+    info_json=JSON.parse pub.response_body
+    assert_equal 2, info_json["messages"]
+    #assert_equal 0, info_json["requested"]
+    assert_equal 0, info_json["subscribers"]
+
+    
+    sub.run
+    sub.wait :ready
+    sleep 0.15
+    pub.get "text/json"
+
+    info_json=JSON.parse pub.response_body
+    assert_equal 2, info_json["messages"]
+    #assert_equal 0, info_json["requested"]
+    assert_equal subs, info_json["subscribers"], "text/json subscriber count"
+
+    pub.get "text/xml"
+    ix = Nokogiri::XML pub.response_body
+    assert_equal 2, ix.at_xpath('//messages').content.to_i
+    #assert_equal 0, ix.at_xpath('//requested').content.to_i
+    assert_equal subs, ix.at_xpath('//subscribers').content.to_i
+    
+    pub.get "text/yaml"
+    yaml_resp1=pub.response_body
+    pub.get "application/yaml"
+    yaml_resp2=pub.response_body
+    pub.get "application/x-yaml"
+    yaml_resp3=pub.response_body
+    yam=YAML.load pub.response_body
+    assert_equal 2, yam["messages"]
+    #assert_equal 0, yam["requested"]
+    assert_equal subs, yam["subscribers"]
+    
+    assert_equal yaml_resp1, yaml_resp2
+    assert_equal yaml_resp2, yaml_resp3
+    
+    
+    pub.accept="text/json"
+
+    pub.post "FIN"
+    #stats right before FIN was issued
+    info_json=JSON.parse pub.response_body
+    assert_equal 3, info_json["messages"]
+    #assert_equal 0, info_json["requested"]
+    assert_equal subs, info_json["subscribers"]
+    
+    sub.wait
+    
+    pub.get "text/json"
+    info_json=JSON.parse pub.response_body
+    assert_equal 3, info_json["messages"], "number of messages received by channel is wrong"
+    #assert_equal 0, info_json["requested"]
+    assert_equal 0, info_json["subscribers"], "channel should say there are no subscribers"
+    
+    sub.terminate
+  end
+  
+  def multi_sub_url(pubs, prefix="/sub/multi/", delim="/")
+    ids = pubs.map{|v| v.id}.shuffle
+    "#{prefix}#{ids.join delim}"
+  end
+  
+  class MultiCheck
+    attr_accessor :id, :pub
+    def initialize(id)
+      self.id = id
+      self.pub = Publisher.new url("/pub/#{self.id}")
+    end
+  end
+  
+  
+  def test_channel_multiplexing(n=2, delimited=false)
+    
+    pubs = []
+    n.times do |i|
+      pubs << MultiCheck.new(short_id)
+    end
+    
+    sub_url=delimited ? multi_sub_url(pubs, '/sub/split/', '_') : multi_sub_url(pubs)
+    
+    n = 15
+    scrambles = 5
+    subs = []
+    scrambles.times do |i|
+      sub = Subscriber.new(url(sub_url), n, quit_message: 'FIN', retry_delay: 1, timeout: 20)
+      sub.on_failure { false }
+      subs << sub
+    end
+    
+    subs.each &:run
+    
+    pubs.each {|p| p.pub.post "FIRST from #{p.id}" }
+    
+    10.times do |i|
+      pubs.each {|p| p.pub.post "hello #{i} from #{p.id}" }
+    end
+    
+    sleep 1
+    
+    5.times do |i|
+      pubs.first.pub.post "yes #{i} from #{pubs.first.id}"
+    end
+    
+    pubs.each do |p| 
+      10.times do |i|
+        p.pub.post "hello #{i} from #{p.id}"
+      end
+    end
+    
+    latesubs = Subscriber.new(url(sub_url), n, quit_message: 'FIN')
+    latesubs.on_failure { false }
+    subs << latesubs
+    latesubs.run
+    
+    sleep 1
+    
+    10.times do |i|
+      pubs.each {|p| p.pub.post "hello again #{i} from #{p.id}" }
+    end
+    
+    pubs.first.pub.post "FIN"
+    subs.each &:wait
+    sleep 1
+    subs.each_with_index do |sub, sub_i|
+      
+      assert_equal 0, sub.errors.count, "Subscriber encountered #{sub.errors.count} errors: #{sub.errors.join ", "}"
+      
+      msgs=[]
+      pubs.each { |p| msgs << p.pub.messages.messages }
+      
+      sub.messages.each do |msg|  
+        matched = false
+        for mm in msgs do
+          if mm.first == msg.message
+            matched = true
+            mm.shift
+            break
+          end
+        end
+        assert_equal matched, true, "message not matched"
+      end
+      
+      sub.terminate
+    end
+    
+  end
+  
+  def test_channel_multiplexing_5
+    test_channel_multiplexing 5
+  end
+  
+  def test_channel_delimitered_multiplexing_15
+    test_channel_multiplexing 15, true
+  end
+  
+  def test_message_delivery
+    pub, sub = pubsub
+    sub.run
+    sleep 0.2
+    assert_equal 0, sub.messages.messages.count
+    pub.post "hi there"
+    assert_equal 201, pub.response_code, "publisher response code"
+    sleep 0.2
+    assert_equal 1, sub.messages.messages.count, "received message count"
+    pub.post "FIN"
+    assert_equal 201, pub.response_code, "publisher response code"
+    sleep 0.2
+    assert_equal 2, sub.messages.messages.count, "recelived messages count"
+    assert sub.messages.matches? pub.messages
+    sub.terminate
+  end
+  
+  def test_publish_then_subscribe
+    pub, sub = pubsub
+    pub.post "hi there"
+    sub.run
+    pub.post "FIN"
+    sub.wait
+    assert_equal 2, sub.messages.messages.count
+    assert sub.messages.matches? pub.messages
+    sub.terminate
+  end
+
+  def test_authorized_channels
+    #must be published to before subscribing
+    n=5
+    pub, sub = pubsub n, timeout: 6, sub: "sub/authorized/"
+    sub.on_failure { false }
+    sub.run
+    sleep 1
+    sub.wait
+    assert_equal n, sub.finished
+    
+    assert sub.match_errors(/code 403/), "expected 403 for all subscribers, got #{sub.errors.pretty_inspect}"
+    sub.reset
+    
+    pub.post %w( fweep )
+    assert_match /20[12]/, pub.response_code.to_s
+    sleep 0.1
+    
+    sub.run
+    
+    sleep 0.1
+    pub.post ["fwoop", "FIN"] { assert_match /20[12]/, pub.response_code.to_s }
+    
+    
+    sub.wait
+    verify pub, sub
+    sub.terminate
+  end
+
+  def test_deletion
+    #delete active channel
+    par=5
+    pub, sub = pubsub par, timeout: 10
+    sub.on_failure { false }
+    sub.run
+    sleep 0.2
+    pub.delete
+    sleep 0.1
+    assert_equal 200, pub.response_code
+    assert_equal par, pub.response_body.match(/subscribers:\s+(\d)/)[1].to_i, "subscriber count after deletion"
+    sub.wait
+    assert sub.match_errors(/code 410/), "Expected subscriber code 410: Gone, instead was \"#{sub.errors.first}\""
+
+    #delete channel with no subscribers
+    pub, sub = pubsub 5, timeout: 1
+    pub.post "hello"
+    assert_equal 202, pub.response_code
+    pub.delete
+    assert_equal 200, pub.response_code
+
+    #delete nonexistent channel
+    pub, sub = pubsub
+    pub.nofail=true
+    pub.delete
+    assert_equal 404, pub.response_code
+  end
+
+  def test_no_message_buffer
+    chan_id=SecureRandom.hex
+    pub = Publisher.new url("/pub/nobuffer/#{chan_id}")
+    sub=[]
+    40.times do 
+      sub.push Subscriber.new(url("/sub/broadcast/#{chan_id}"), 1, use_message_id: false, quit_message: 'FIN')
+    end
+    
+    pub.post ["this message should not be delivered", "nor this one"]
+    
+    sub.each {|s| s.run}
+    sleep 1
+    pub.post "received1"
+    sleep 1
+    pub.post "received2"
+    sleep 1
+    pub.post "FIN"
+    sub.each {|s| s.wait}
+    sub.each do |s|
+      assert s.errors.empty?, "There were subscriber errors: \r\n#{s.errors.join "\r\n"}"
+      ret, err = s.messages.matches? ["received1", "received2", "FIN"]
+      assert ret, err || "Messages don't match"
+    end
+  end
+  
+  def test_channel_isolation
+    rands= %w( foo bar baz bax qqqqqqqqqqqqqqqqqqq eleven andsoon andsoforth feh )
+    pub=[]
+    sub=[]
+    10.times do |i|
+      pub[i], sub[i]=pubsub 15
+      sub[i].run
+    end
+    pub.each do |p|
+      rand(1..10).times do
+        p.post rands.sample
+      end
+    end
+    sleep 1
+    pub.each do |p|
+      p.post 'FIN'
+    end
+    sub.each do |s|
+      s.wait
+    end
+    pub.each_with_index do |p, i|
+      verify p, sub[i]
+    end
+    sub.each {|s| s.terminate }
+  end
+  
+  def test_broadcast_3
+    test_broadcast 3
+  end
+  
+  def test_broadcast_20
+    test_broadcast 20
+  end
+  
+  def test_longpoll_multipart
+    pub, sub = pubsub 1, sub: 'sub/multipart/', use_message_id: false
+    
+    pub.post "first", "text/x-foobar"
+    pub.post ["1", "2", "3", "4"]
+    sub.run
+    sleep 0.5
+    pub.post "FIN"
+    sub.wait
+   
+    verify pub, sub
+    sub.terminate
+  end
+  
+  def test_longpoll_multipart_extended(range=30..35)
+    range.each do |i|
+      pub, sub = pubsub 1, sub: 'sub/multipart/', use_message_id: false, timeout: 3
+      i.times do |n|
+        pub.post "#{n+1}"
+      end
+      pub.post "FIN"
+      sub.run
+      sub.wait
+      verify pub, sub
+      sleep 0.1
+    end
+  end
+  
+  def test_multiplexed_longpoll_multipart
+    chans= [short_id, short_id, short_id]
+    pub, sub = pubsub 1, sub: "sub/multipart_multiplex/#{chans.join "/"}", pub: "pub/#{chans[1]}", channel: "", use_message_id: false
+    
+    pub.post "first", "text/x-foobar"
+    pub.post ["1", "2", "3", "4"]
+    sub.run
+    sleep 0.5
+    pub.post "FIN"
+    sub.wait
+   
+    verify pub, sub
+    sub.terminate
+  end
+  
+  
+  def test_broadcast(clients=400)
+    pub, sub = pubsub clients
+    pub.post "!!"
+    sub.run #celluloid async FTW
+    #sleep 2
+    pub.post ["!!!!", "what is this", "it's nothing", "nothing at all really"]
+    pub.post "FIN"
+    sub.wait
+    sleep 0.5
+    verify pub, sub
+    sub.terminate
+  end
+  
+  #def test_broadcast_10000
+  #  test_broadcast 10000
+  #end
+  
+  def dont_test_subscriber_concurrency
+    chan=SecureRandom.hex
+    pub_first = Publisher.new url("pub/first#{chan}")
+    pub_last = Publisher.new url("pub/last#{chan}")
+    
+    sub_first, sub_last = [], []
+    { url("sub/first/first#{chan}") => sub_first, url("sub/last/last#{chan}") => sub_last }.each do |url, arr|
+      3.times do
+        sub=Subscriber.new(url, 1, quit_message: 'FIN', timeout: 20)
+        sub.on_failure do |resp, req|
+          false
+        end
+        arr << sub
+      end
+    end
+    
+    sub_first.each {|s| s.run; sleep 0.1 }
+    assert sub_first[0].no_errors?
+    sub_first[1..2].each do |s|
+      assert s.errors?
+      assert s.match_errors(/code 409/)
+    end
+
+    sub_last.each {|s| s.run; sleep 0.1 }
+    assert sub_last[2].no_errors?
+    sub_last[0..1].each do |s|
+      assert s.errors?
+      assert s.match_errors(/code 40[49]/)
+    end
+
+    pub_first.post %w( foo bar FIN )
+    pub_last.post %w( foobar baz somethingelse FIN )
+    
+    sub_first[0].wait
+    sub_last[2].wait
+    
+    verify pub_first, sub_first[0]
+    verify pub_last, sub_last[2]
+    
+    sub_first[1..2].each{ |s| assert s.messages.count == 0 }
+    sub_last[0..1].each{ |s| assert s.messages.count == 0 }
+    [sub_first, sub_last].each {|sub| sub.each{|s| s.terminate}}
+  end
+
+  def test_queueing
+    pub, sub = pubsub 1
+    pub.post %w( what is this_thing andnow 555555555555555555555 eleven FIN ), 'text/plain'
+    sleep 0.3
+    sub.run
+    sub.wait
+    verify pub, sub
+    sub.terminate
+  end
+  
+  def test_long_message(kb=0.5)
+    pub, sub = pubsub 10, timeout: 10
+    sub.run
+    sleep 0.2
+    pub.post ["#{"q"*((kb * 1024)-3)}end", "FIN"]
+    sub.wait
+    verify pub, sub
+    sub.terminate
+  end
+  
+  unless OMIT_LONGMSG
+    #[5, 9, 9.5, 9.9, 10, 11, 15, 16, 17, 18, 19, 20, 30,  50, 100, 200, 300, 600, 900, 3000].each do |n|
+    [5, 10, 20, 200, 900].each do |n|
+      define_method "test_long_message_#{n}Kb" do 
+        test_long_message n
+      end
+    end
+    
+    def test_message_length_range
+      pub, sub = pubsub 2, timeout: 15
+      sub.run
+      
+      n=5
+      while n <= 10000 do
+        pub.post "T" * n
+        n=(n*1.01) + 1
+        sleep 0.001
+      end
+      pub.post "FIN"
+      sub.wait
+      verify pub, sub
+      sub.terminate
+    end
+    
+    def generic_test_long_buffed_messages(client=:longpoll)
+      kb=2000
+      #kb=2
+      pub, sub = pubsub 1, sub: "/sub/broadcast/", timeout: 10, client: client
+      #pub, sub = pubsub 1, sub: "/sub/websocket_only/", client: :websocket
+      #sub.on_message do |msg|
+      #  puts ">>>>>>>message: #{msg.message[0...10]}...|#{msg.message.length}|"
+      #end
+      sub.run
+      sleep 1
+      m1="#{"q"*((kb * 1024)-3)}end"
+      m2="#{"r"*((kb * 1024)-3)}end"
+      i=0
+      15.times do
+        i+=1
+        pub.post "#{i}#{m1}"
+        i+=1
+        pub.post "#{i}#{m2}"
+      end
+      pub.post "FIN"
+      sub.wait
+      verify pub, sub
+      pub.delete
+      sub.terminate
+    end
+
+    [:longpoll, :multipart, :eventsource, :websocket, :chunked].each do |client|
+      define_method "test_long_buffed_messages_#{client}" do
+        generic_test_long_buffed_messages client
+      end
+    end
+    
+  end
+  
+  def test_message_timeout
+    pub, sub = pubsub 1, pub: "/pub/2_sec_message_timeout/", timeout: 10
+    pub.post %w( foo bar etcetera ) #these shouldn't get delivered
+    pub.messages.clear
+    sleep 3
+    #binding.pry
+    sub.run
+    sleep 1
+    pub.post %w( what is this even FIN )
+    sub.wait
+    verify pub, sub
+    sub.terminate
+  end
+    
+  def test_subscriber_timeout
+    chan=SecureRandom.hex
+    sub=Subscriber.new(url("sub/timeout/#{chan}"), 5, timeout: 10)
+    sub.on_failure { false }
+    pub=Publisher.new url("pub/#{chan}")
+    sub.run
+    sleep 0.1
+    pub.post "hello"
+    sub.wait
+    verify pub, sub, false
+    assert sub.match_errors(/code 408/)
+    sub.terminate
+  end
+  
+  def assert_header_includes(response, header, str)
+    assert response.headers[header].include?(str), "Response header '#{header}: #{response.headers[header]}' must contain \"#{str}\", but does not."
+  end
+  
+  def test_access_control_options
+    chan=SecureRandom.hex
+    
+    request = Typhoeus::Request.new url("sub/broadcast/#{chan}"), method: :OPTIONS, headers: { 'Origin':'example.com' }
+    resp = request.run
+    
+    assert_equal "*", resp.headers["Access-Control-Allow-Origin"]
+    %w( GET ).each do |v| 
+      assert_header_includes resp, "Access-Control-Allow-Methods", v
+      assert_header_includes resp, "Allow", v
+    end
+    %w( If-None-Match If-Modified-Since Content-Type Cache-Control X-EventSource-Event ).each {|v| assert_header_includes resp, "Access-Control-Allow-Headers", v}
+    
+    request = Typhoeus::Request.new url("sub/broadcast/#{chan}"), method: :OPTIONS
+    resp = request.run
+    %w( GET ).each do |v| 
+      assert_header_includes resp, "Allow", v
+    end
+    
+    
+    request = Typhoeus::Request.new url("pub/#{chan}"), method: :OPTIONS, headers: { 'Origin': "example.com" }
+    resp = request.run
+    assert_equal "*", resp.headers["Access-Control-Allow-Origin"]
+    %w( GET POST DELETE ).each do |v| 
+      assert_header_includes resp, "Access-Control-Allow-Methods", v
+      assert_header_includes resp, "Allow", v
+    end
+    %w( Content-Type ).each {|v| assert_header_includes resp, "Access-Control-Allow-Headers", v}
+    
+    request = Typhoeus::Request.new url("pub/#{chan}"), method: :OPTIONS
+    resp = request.run
+    %w( GET POST DELETE ).each do |v| 
+      assert_header_includes resp, "Allow", v
+    end
+  end
+  
+  def generic_test_access_control(opt)
+    pub, sub = pubsub 1, extra_headers: { Origin: opt[:origin] }, pub: opt[:pub_url], sub: opt[:sub_url]
+    
+    sub.on_message do |msg, bundle|
+      opt[:verify_sub_response].call(bundle) if opt[:verify_sub_response]
+    end
+    
+    pub.post "FIN"
+    sub.run
+    sub.wait
+    
+    yield pub, sub if block_given?
+    
+    sub.terminate
+  end
+  
+  def test_invalid_etag
+    chan_id=short_id
+    pub = Publisher.new url("/pub/#{chan_id}"), accept: 'text/json'
+    
+    pub.post "1. one!!"
+    sleep 1
+    pub.post "2. tooo"
+    pub.post "3. throo"
+    sleep 1
+    pub.post "4. fooo"
+    n = 0
+    sub = Subscriber.new(url("/sub/multipart_multiplex/#{short_id}/#{short_id}/#{chan_id}"), 1, quit_message: 'FIN', retry_delay: 1, timeout: 20)
+    sub.on_message do |msg, bundle|
+      n=n+1
+      if n == 2
+        bundle.etag="null"
+      end
+    end
+    
+    sub.on_failure do |err|
+      assert_match /code 400/, err
+      false
+    end
+    
+    sub.run
+    sleep 1
+    pub.post "5. faaa"
+    pub.post "FIN"
+    sub.wait
+  end
+  
+  #def test_expired_messages_with_subscribers
+  #  chan = short_id
+  #  pub, sub = pubsub 1, pub: "/pub/2_sec_message_timeout/", sub: "/sub/intervalpoll/", client: :intervalpoll, timeout: 9000, channel: short_id
+  #  sub.on_failure do |err|
+  #    puts "retry?!!"
+  #    true
+  #  end
+  #  sub.run
+  #  pub.post ["foo", "bar"]
+  #  
+  #  sleep 5
+  #  
+  #  pub.post ["yeah", "what", "the"]
+  #  sub.wait
+  #end
+  
+  def dont_test_auth
+    chan = short_id
+    
+    subs = [ :longpoll, :eventsource, :websocket, :multipart ]
+    
+    subs.each do |t|
+      sub = Subscriber.new(url("sub/auth_fail/#{chan}"), 1, client: t)
+      sub.on_failure { false }
+      sub.run
+      sub.wait
+      assert(sub.errors?)
+      assert /code 500/, sub.errors.first
+      sub.terminate
+    end
+    
+    auth_pid = Process.spawn("bundle exec ./authserver.rb -q")
+    while true
+      resp = Typhoeus.get("http://127.0.0.1:8053/", followlocation: true)
+      break unless resp.return_code == :couldnt_connect
+      sleep 0.20
+    end
+    
+    subs.each do |t|
+      sub = Subscriber.new(url("sub/auth_fail/#{chan}"), 1, client: t)
+      sub.on_failure { false }
+      sub.run
+      sub.wait
+      assert(sub.errors?)
+      assert /code 403/, sub.errors.first
+      sub.terminate
+    end
+    
+    pub = Publisher.new url("pub/#{chan}")
+    
+    pub.post [ "wut", "waht", "FIN" ]
+    
+    subs.each do |t|
+      sub = Subscriber.new(url("sub/auth/#{chan}"), 1, client: t, quit_message: 'FIN')
+      sub.on_failure { false }
+      sub.run
+      sub.wait
+      verify pub, sub
+    end
+    
+    Process.kill 2, auth_pid
+  end
+  
+  def test_access_control
+    
+    ver= proc do |bundle| 
+      assert_equal "*", bundle.headers["Access-Control-Allow-Origin"] 
+    end
+    generic_test_access_control(origin: "example.com", verify_sub_response: ver) do |pub, sub|
+      verify pub, sub
+    end
+    
+    ver= proc do |bundle| 
+      assert_equal "http://foo.bar", bundle.headers["Access-Control-Allow-Origin"] 
+      %w( Last-Modified Etag ).each {|v| assert_header_includes bundle, "Access-Control-Expose-Headers", v}
+    end
+    generic_test_access_control(origin: "http://foo.bar", verify_sub_response: ver, sub_url: "sub/from_foo.bar/") do |pub, sub|
+      verify pub, sub
+    end
+    
+    #test forbidding stuff
+    pub, sub = pubsub 1, extra_headers: { "Origin": "http://forbidden.com" }, pub: "pub/from_foo.bar/", sub: "sub/from_foo.bar/", timeout: 1
+    
+    pub.extra_headers={ "Origin": "http://foo.bar" }
+    pub.post "yeah"
+    
+    assert_match /20[12]/, pub.response_code.to_s
+    pub.extra_headers={ "Origin": "http://forbidden.com" }
+    post_failed = false
+    begin 
+      pub.post "yeah"
+    rescue Exception => e
+      post_failed = true
+      assert_match /request failed:\s+403/, e.message
+    end
+    assert post_failed
+    
+    sub.on_failure { false }
+    
+    sub.run
+    sub.wait
+    
+    sub.errors.each do |err|
+      assert_match /code 403/, err
+    end
+    sub.terminate
+    
+  end
+  
+  def test_gzip
+    #bug: turning on gzip cleared the response etag
+    pub, sub = pubsub 1, sub: "/sub/gzip/", gzip: true, retry_delay: 0.3
+    sub.run
+    sleep 0.1
+    pub.post ["2", "123456789A", "alsdjklsdhflsajkfhl", "boq"]
+    sleep 1
+    pub.post "foobar"
+    msg = ""
+    200.times { msg << SecureRandom.hex }
+    pub.post msg
+    pub.post "FIN"
+    sub.wait
+    verify pub, sub
+  end
+  
+  def test_issue_212 #https://github.com/slact/nchan/issues/212
+    chan1 = short_id
+    chan2 = short_id
+    sub = Subscriber.new url("/sub/multi/#{chan1}/#{chan2}"), 1, quit_message: 'FIN', client: :eventsource, timeout: 3
+    sub.on_failure { false }
+    pub = Publisher.new url("/pub/#{chan1}")
+    pub_nobuf = Publisher.new url("/pub/nobuffer/#{chan2}")
+    sub.run
+    sub.wait :ready
+
+    pub.post %w(yes what this and also)
+    sleep 1.1
+    pub_nobuf.post "WHAT?!"
+    pub.messages << pub_nobuf.messages.first
+    pub.post %W(foo bar baz bzzzt FIN)
+
+    sub.wait
+    
+    verify pub, sub
+  end
+  
+  def test_changing_buffer_length
+    chan = short_id
+    sub = Subscriber.new url("sub/broadcast/#{chan}"), 30, quit_message: 'FIN'
+    pub_delta = Publisher.new url("/pub/#{chan}")
+    pub_snapshot = Publisher.new url("/pub_1message/#{chan}")
+    
+    pub_delta.post %W(foo bar baz bzzzt FIN)
+    sub.run
+    sub.wait
+    verify pub_delta, sub
+    sub.reset
+    
+    pub_snapshot.post %W(blah anotherblah)
+    pub_snapshot.messages.clear
+    pub_snapshot.post "this is the real thing right here"
+    
+    pub_delta.messages.clear
+    pub_delta.messages << pub_snapshot.messages.first
+    pub_delta.post %W(d1 d2 d3 and_other_deltas FIN)
+    sub.run
+    sub.wait
+    
+    verify pub_delta, sub
+  end
+end
+
+
diff --git a/debian/modules/nchan/dev/vg.supp b/debian/modules/nchan/dev/vg.supp
new file mode 100644
index 0000000..750e584
--- /dev/null
+++ b/debian/modules/nchan/dev/vg.supp
@@ -0,0 +1,26977 @@
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_proxy_set_ssl
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_locations
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_proxy_set_ssl
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_locations
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_proxy_set_ssl
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_locations
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_proxy_set_ssl
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_locations
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_proxy_set_ssl
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_locations
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_proxy_set_ssl
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_locations
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_proxy_set_ssl
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_locations
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_proxy_set_ssl
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_locations
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_proxy_set_ssl
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_locations
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_crc32_table_init
+   fun:main
+}
+
+
+{
+   <guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_save_argv
+   fun:main
+}
+{
+   <guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_strerror_init
+   fun:main
+}
+{
+   <guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_init_setproctitle
+   fun:ngx_os_init
+   fun:main
+}
+{
+   <guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_strerror_init
+   fun:main
+}
+{
+   <pool_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:pool
+   fun:__static_initialization_and_destruction_0
+   fun:_GLOBAL__sub_I_eh_alloc.cc
+   fun:call_init.part.0
+   fun:_dl_init
+   obj:/usr/lib/ld-2.22.so
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+}
+{
+   <worker_guts>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_event_process_init
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+{
+   <worker_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_epoll_init
+   fun:ngx_event_process_init
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <core_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <core_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_regex_malloc
+   fun:pcre_study
+   fun:ngx_regex_module_init
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <core_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_list_init
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:*
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:*
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_conf_read_token
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_http_get_variable_index
+   fun:ngx_http_userid_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_log_create_main_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_hide_headers_hash
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_regex_create_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_list_create
+   fun:ngx_regex_create_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_pstrdup
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_init_connection
+   fun:ngx_event_accept
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_event_accept
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_create_temp_buf
+   fun:ngx_http_wait_request_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_create_temp_buf
+   fun:ngx_http_header_filter
+   fun:ngx_http_chunked_header_filter
+   fun:ngx_http_range_header_filter
+   fun:ngx_http_gzip_header_filter
+   fun:ngx_http_ssi_header_filter
+   fun:ngx_http_charset_header_filter
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_rewrite_handler
+   fun:ngx_http_core_rewrite_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_process_request
+   fun:ngx_http_process_request_headers
+   fun:ngx_http_process_request_line
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_rewrite_handler
+   fun:ngx_http_core_rewrite_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_process_request
+   fun:ngx_http_process_request_headers
+   fun:ngx_http_process_request_line
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_list_init
+   fun:ngx_http_create_request
+   fun:ngx_http_keepalive_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_create_temp_buf
+   fun:ngx_http_header_filter
+   fun:ngx_http_chunked_header_filter
+   fun:ngx_http_range_header_filter
+   fun:ngx_http_gzip_header_filter
+   fun:ngx_http_ssi_header_filter
+   fun:ngx_http_charset_header_filter
+   fun:ngx_http_userid_filter
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_create_request
+   fun:ngx_http_keepalive_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_list_init
+   fun:ngx_http_process_request_line
+   fun:ngx_http_keepalive_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_create_request
+   fun:ngx_http_keepalive_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_keepalive_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_create_temp_buf
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_events_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_events_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_events_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_epoll_create_conf
+   fun:ngx_events_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_epoll_create_conf
+   fun:ngx_events_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_autoindex_create_loc_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_index_create_loc_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_index_create_loc_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_map_create_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_map_create_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_upstream_hash_create_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_copy_filter_create_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_copy_filter_create_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_fastcgi_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_gzip_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_gzip_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_userid_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_get_variable_index
+   fun:ngx_http_userid_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_log_set_log
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_autoindex_create_loc_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_index_create_loc_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_index_create_loc_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_upstream_hash_create_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_copy_filter_create_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_copy_filter_create_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_get_variable_index
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_crc32_table_init
+   fun:main
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_headers_add
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_headers_add
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_start_code
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_regex_compile
+   fun:ngx_http_regex_compile
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_regex_compile
+   fun:ngx_http_regex_compile
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_regex_compile
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_pstrdup
+   fun:ngx_http_core_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_get_full_name
+   fun:ngx_conf_full_name
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pool_cleanup_add
+   fun:ngx_resolver_create
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_index_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_index_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_merge_types
+   fun:ngx_http_gzip_merge_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_ssi_init_main_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_merge_types
+   fun:ngx_http_ssi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_merge_types
+   fun:ngx_http_charset_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_create_listening
+   fun:ngx_http_add_listening
+   fun:ngx_http_init_listening
+   fun:ngx_http_optimize_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_create_listening
+   fun:ngx_http_add_listening
+   fun:ngx_http_init_listening
+   fun:ngx_http_optimize_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_create_listening
+   fun:ngx_http_add_listening
+   fun:ngx_http_init_listening
+   fun:ngx_http_optimize_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_init_listening
+   fun:ngx_http_optimize_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_init_listening
+   fun:ngx_http_optimize_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_add_addrs
+   fun:ngx_http_init_listening
+   fun:ngx_http_optimize_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_core_module_init_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_core_module_init_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_set_environment
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_ssi_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_core_module_init_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pool_cleanup_add
+   fun:ngx_resolver_create
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_autoindex_create_loc_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_autoindex_create_loc_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_index_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_merge_types
+   fun:ngx_http_charset_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_add_addrs
+   fun:ngx_http_init_listening
+   fun:ngx_http_optimize_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_fastcgi_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_ssi_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push
+   fun:ngx_http_script_add_var_code
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push
+   fun:ngx_http_script_add_var_code
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_event_accept
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_event_accept
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_init_connection
+   fun:ngx_event_accept
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_regex_exec
+   fun:ngx_http_core_find_location
+   fun:ngx_http_core_find_config_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_process_request
+   fun:ngx_http_process_request_headers
+   fun:ngx_http_process_request_line
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_script_complex_value_code
+   fun:ngx_http_rewrite_handler
+   fun:ngx_http_core_rewrite_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_process_request
+   fun:ngx_http_process_request_headers
+   fun:ngx_http_process_request_line
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_alloc_chain_link
+   fun:ngx_http_write_filter
+   fun:ngx_http_header_filter
+   fun:ngx_http_chunked_header_filter
+   fun:ngx_http_range_header_filter
+   fun:ngx_http_gzip_header_filter
+   fun:ngx_http_ssi_header_filter
+   fun:ngx_http_charset_header_filter
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_alloc_chain_link
+   fun:ngx_http_write_filter
+   fun:ngx_http_header_filter
+   fun:ngx_http_chunked_header_filter
+   fun:ngx_http_range_header_filter
+   fun:ngx_http_gzip_header_filter
+   fun:ngx_http_ssi_header_filter
+   fun:ngx_http_charset_header_filter
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_process_request_headers
+   fun:ngx_http_process_request_line
+   fun:ngx_http_keepalive_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_init_connection
+   fun:ngx_event_accept
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_regex_exec
+   fun:ngx_http_core_find_location
+   fun:ngx_http_core_find_config_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_process_request
+   fun:ngx_http_process_request_headers
+   fun:ngx_http_process_request_line
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_script_complex_value_code
+   fun:ngx_http_rewrite_handler
+   fun:ngx_http_core_rewrite_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_process_request
+   fun:ngx_http_process_request_headers
+   fun:ngx_http_process_request_line
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_create_pool
+   fun:ngx_event_accept
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_create_pool
+   fun:ngx_http_create_request
+   fun:ngx_http_keepalive_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_process_request_headers
+   fun:ngx_http_process_request_line
+   fun:ngx_http_keepalive_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push
+   fun:ngx_http_script_add_var_code
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_browser_add_variable
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_pstrdup
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_pstrdup
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_fastcgi_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_core_module_init_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_get_full_name
+   fun:ngx_conf_full_name
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_conf_read_token
+   fun:ngx_conf_parse
+   fun:ngx_events_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_create_pool
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_upstream_hash_create_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_log_set_log
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_upstream_hash_create_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_headers_add
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_start_code
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_regex_compile
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_index_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_create_pool
+   fun:ngx_http_push_init_module
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push
+   fun:ngx_http_script_add_var_code
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_browser_add_variable
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_get_variable_index
+   fun:ngx_http_script_add_var_code
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_pstrdup
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_list_create
+   fun:ngx_regex_create_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_ssi_init_main_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_get_variable_index
+   fun:ngx_http_script_add_var_code
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_fastcgi_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_gzip_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_userid_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_conf_read_token
+   fun:ngx_conf_parse
+   fun:ngx_events_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_create_temp_buf
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_core_module_create_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_core_module_create_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_headers_add
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:*
+   fun:*
+   fun:*
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_userid_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:*
+   fun:*
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_rewrite_value
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_core_create_loc_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_core_create_loc_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_limit_conn_create_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_core_create_main_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_proxy_create_loc_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_proxy_create_loc_conf
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_limit_req_create_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_ssi_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push
+   fun:ngx_http_get_variable_index
+   fun:ngx_http_log_variable_compile
+   fun:ngx_http_log_compile_format
+   fun:ngx_http_log_init
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_referer_create_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_gzip_create_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_userid_create_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_regex_malloc
+   fun:pcre_compile2
+   fun:ngx_regex_compile
+   fun:ngx_http_regex_compile
+   fun:ngx_http_core_regex_location
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_init_headers_in_hash
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_conf_read_token
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_init_main_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_variables_init_vars
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_push_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_script_start_code
+   fun:ngx_http_rewrite_value
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_create_temp_buf
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_autoindex_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_proxy_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_variables_add_core_vars
+   fun:ngx_http_core_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_variables_add_core_vars
+   fun:ngx_http_core_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push
+   fun:ngx_hash_add_key
+   fun:ngx_http_variables_add_core_vars
+   fun:ngx_http_core_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_upstream_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_variables_init_vars
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_memcached_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_keys_array_init
+   fun:ngx_http_variables_add_core_vars
+   fun:ngx_http_core_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_scgi_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_uwsgi_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_fastcgi_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+{
+   <conf_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_core_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <core_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <core_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+} 
+
+{
+   <worker_guts>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_event_process_init
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_get_variable_index
+   fun:ngx_http_log_variable_compile
+   fun:ngx_http_log_compile_format
+   fun:ngx_http_log_init
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_regex_malloc
+   fun:pcre_compile2
+   fun:ngx_regex_compile
+   fun:ngx_http_regex_compile
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_conf_set_path_slot
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_conf_merge_path_value
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_conf_merge_path_value
+   fun:ngx_http_fastcgi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_conf_merge_path_value
+   fun:ngx_http_uwsgi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_conf_merge_path_value
+   fun:ngx_http_scgi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_proxy_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_event_core_create_conf
+   fun:ngx_events_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_calloc
+   fun:ngx_resolver_create
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_init_locations
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_log_set_log
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_hide_headers_hash
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_hide_headers_hash
+   fun:ngx_http_fastcgi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_hide_headers_hash
+   fun:ngx_http_uwsgi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_hide_headers_hash
+   fun:ngx_http_scgi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_list_init
+   fun:ngx_list_create
+   fun:ngx_regex_create_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_keys_array_init
+   fun:ngx_http_variables_add_core_vars
+   fun:ngx_http_core_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_keys_array_init
+   fun:ngx_http_variables_add_core_vars
+   fun:ngx_http_core_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_keys_array_init
+   fun:ngx_http_variables_add_core_vars
+   fun:ngx_http_core_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_list_push
+   fun:ngx_regex_compile
+   fun:ngx_http_regex_compile
+   fun:ngx_http_core_regex_location
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push_n
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_merge_types
+   fun:ngx_http_gzip_merge_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_merge_types
+   fun:ngx_http_ssi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_ssi_preconfiguration
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_upstream_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_regex_compile
+   fun:ngx_http_regex_compile
+   fun:ngx_http_core_regex_location
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_regex_compile
+   fun:ngx_http_regex_compile
+   fun:ngx_http_core_regex_location
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_regex_compile
+   fun:ngx_http_core_regex_location
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_start_code
+   fun:ngx_http_rewrite_value
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_rewrite_value
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_index_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_index_create_loc_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_copy_filter_create_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_copy_filter_create_conf
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_add_variable
+   fun:ngx_http_upstream_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_upstream_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_browser_add_variable
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_conf_read_token
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_conf_read_token
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_core_module_create_conf
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_array_create
+   fun:ngx_http_script_start_code
+   fun:ngx_http_rewrite
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push_n
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_init_headers_in_hash
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_init
+   fun:ngx_hash_add_key
+   fun:ngx_http_add_variable
+   fun:ngx_http_proxy_add_variables
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_conf_read_token
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_conf_read_token
+   fun:ngx_conf_parse
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_calloc
+   fun:ngx_resolver_create
+   fun:ngx_http_core_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_merge_types
+   fun:ngx_http_charset_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_init_main_conf
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_hide_headers_hash
+   fun:ngx_http_fastcgi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_hide_headers_hash
+   fun:ngx_http_uwsgi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_hash_init
+   fun:ngx_http_upstream_hide_headers_hash
+   fun:ngx_http_scgi_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_push
+   fun:ngx_http_get_variable_index
+   fun:ngx_http_script_add_var_code
+   fun:ngx_http_script_compile
+   fun:ngx_http_proxy_init_headers
+   fun:ngx_http_proxy_merge_loc_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_regex_compile
+   fun:ngx_http_core_regex_location
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_server
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_start_code
+   fun:ngx_http_rewrite_value
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+   fun:ngx_conf_handler
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_array_create
+   fun:ngx_http_script_init_arrays
+   fun:ngx_http_script_compile
+   fun:ngx_http_rewrite_value
+   fun:ngx_http_rewrite_set
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_init_connection
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_init_connection
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_create_temp_buf
+   fun:ngx_http_wait_request_handler
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_init_connection
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_create_pool
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_init_connection
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_event_accept
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_create_temp_buf
+   fun:ngx_http_wait_request_handler
+   fun:ngx_event_process_posted
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+}
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:BUF_strndup
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:BUF_strndup
+   fun:CONF_module_add
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_thread_set_item
+   fun:ERR_get_state
+   fun:ERR_clear_error
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:BIO_set
+   fun:BIO_new
+   fun:BIO_new_file
+   fun:def_load
+   fun:CONF_modules_load_file
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:BIO_set
+   fun:BIO_new
+   fun:BIO_new_file
+   fun:def_load
+   fun:CONF_modules_load_file
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_digests
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:OBJ_NAME_add
+   fun:EVP_add_digest
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:x509_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:d2i_X509_AUX
+   fun:PEM_ASN1_read_bio
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:x509_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:d2i_X509_AUX
+   fun:PEM_ASN1_read_bio
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:RSA_new_method
+   fun:rsa_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:rsa_pub_decode
+   fun:X509_PUBKEY_get
+   fun:SSL_CTX_use_certificate
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:RSA_new_method
+   fun:rsa_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:rsa_pub_decode
+   fun:X509_PUBKEY_get
+   fun:SSL_CTX_use_certificate
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:DH_new_method
+   fun:ngx_ssl_dhparam
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:DH_new_method
+   fun:ngx_ssl_dhparam
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:engine_cleanup_add_last
+   fun:ENGINE_add
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:engine_cleanup_add_last
+   fun:ENGINE_add
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:BIO_set
+   fun:BIO_new
+   fun:BIO_new_file
+   fun:def_load
+   fun:CONF_modules_load_file
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:BIO_set
+   fun:BIO_new
+   fun:BIO_new_file
+   fun:def_load
+   fun:CONF_modules_load_file
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:x509_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:d2i_X509_AUX
+   fun:PEM_ASN1_read_bio
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:x509_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:d2i_X509_AUX
+   fun:PEM_ASN1_read_bio
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:RSA_new_method
+   fun:rsa_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:rsa_pub_decode
+   fun:X509_PUBKEY_get
+   fun:SSL_CTX_use_certificate
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:RSA_new_method
+   fun:rsa_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:rsa_pub_decode
+   fun:X509_PUBKEY_get
+   fun:SSL_CTX_use_certificate
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:DH_new_method
+   fun:ngx_ssl_dhparam
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:DH_new_method
+   fun:ngx_ssl_dhparam
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:CONF_module_add
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:CRYPTO_realloc
+   fun:sk_insert
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_ECDH_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_RAND_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_COMP_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:int_thread_get
+   fun:int_thread_set_item
+   fun:ERR_get_state
+   fun:ERR_clear_error
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_BUF_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_ECDSA_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_OBJ_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:int_thread_get
+   fun:int_thread_set_item
+   fun:ERR_get_state
+   fun:ERR_clear_error
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:OBJ_NAME_init
+   fun:OBJ_NAME_add
+   fun:EVP_add_cipher
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:int_err_get
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_CRYPTO_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_UI_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_OCSP_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_DH_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_CONF_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:ERR_get_state
+   fun:ERR_clear_error
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_DSA_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_PKCS12_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_BIO_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_ENGINE_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_PKCS7_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_BN_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_PEM_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_X509_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_DSO_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_TS_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_RSA_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_X509V3_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_EVP_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_CMS_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:CRYPTO_realloc
+   fun:lh_insert
+   fun:OBJ_NAME_add
+   fun:OpenSSL_add_all_ciphers
+   fun:OPENSSL_add_all_algorithms_noconf
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_ASN1_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_EC_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_SSL_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:CRYPTO_realloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:BUF_strndup
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:engine_cleanup_add_last
+   fun:ENGINE_add
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:BUF_strndup
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:BUF_strndup
+   fun:CONF_module_add
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_thread_set_item
+   fun:ERR_get_state
+   fun:ERR_clear_error
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:BIO_set
+   fun:BIO_new
+   fun:BIO_new_file
+   fun:def_load
+   fun:CONF_modules_load_file
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:BIO_set
+   fun:BIO_new
+   fun:BIO_new_file
+   fun:def_load
+   fun:CONF_modules_load_file
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:x509_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:d2i_X509_AUX
+   fun:PEM_ASN1_read_bio
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:x509_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:d2i_X509_AUX
+   fun:PEM_ASN1_read_bio
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:RSA_new_method
+   fun:rsa_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:rsa_pub_decode
+   fun:X509_PUBKEY_get
+   fun:SSL_CTX_use_certificate
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:RSA_new_method
+   fun:rsa_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:rsa_pub_decode
+   fun:X509_PUBKEY_get
+   fun:SSL_CTX_use_certificate
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:DH_new_method
+   fun:ngx_ssl_dhparam
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:DH_new_method
+   fun:ngx_ssl_dhparam
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:BIO_set
+   fun:BIO_new
+   fun:BIO_new_file
+   fun:def_load
+   fun:CONF_modules_load_file
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:BIO_set
+   fun:BIO_new
+   fun:BIO_new_file
+   fun:def_load
+   fun:CONF_modules_load_file
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:X509_STORE_new
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:x509_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:d2i_X509_AUX
+   fun:PEM_ASN1_read_bio
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:x509_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:d2i_X509_AUX
+   fun:PEM_ASN1_read_bio
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:RSA_new_method
+   fun:rsa_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:rsa_pub_decode
+   fun:X509_PUBKEY_get
+   fun:SSL_CTX_use_certificate
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:RSA_new_method
+   fun:rsa_cb
+   fun:ASN1_item_ex_new
+   fun:ASN1_item_ex_d2i
+   fun:ASN1_item_d2i
+   fun:rsa_pub_decode
+   fun:X509_PUBKEY_get
+   fun:SSL_CTX_use_certificate
+   fun:ngx_ssl_certificate
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:DH_new_method
+   fun:ngx_ssl_dhparam
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:sk_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:DH_new_method
+   fun:ngx_ssl_dhparam
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:COMP_zlib
+   fun:SSL_COMP_get_compression_methods
+   fun:SSL_library_init
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:int_get_new_index
+   fun:SSL_get_ex_data_X509_STORE_CTX_idx
+   fun:SSL_CTX_new
+   fun:ngx_ssl_create
+   fun:ngx_http_ssl_merge_srv_conf
+   fun:ngx_http_merge_servers
+   fun:ngx_http_block
+   fun:ngx_conf_handler
+   fun:ngx_conf_parse
+   fun:ngx_init_cycle
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:CONF_module_add
+   fun:OPENSSL_load_builtin_modules
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:CONF_module_add
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:CRYPTO_realloc
+   fun:sk_insert
+   fun:int_get_new_index
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_ECDH_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_RAND_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_COMP_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:int_thread_get
+   fun:int_thread_set_item
+   fun:ERR_get_state
+   fun:ERR_clear_error
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_BUF_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_ECDSA_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_OBJ_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:def_get_class
+   fun:int_new_ex_data
+   fun:ENGINE_new
+   fun:ENGINE_load_dynamic
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:int_thread_get
+   fun:int_thread_set_item
+   fun:ERR_get_state
+   fun:ERR_clear_error
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:int_err_get
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_CRYPTO_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_UI_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_OCSP_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_DH_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_CONF_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:ERR_get_state
+   fun:ERR_clear_error
+   fun:ENGINE_load_builtin_engines
+   fun:OPENSSL_config
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_DSA_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_PKCS12_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_BIO_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_ENGINE_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_PKCS7_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_BN_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_PEM_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_X509_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_DSO_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_TS_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_RSA_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_X509V3_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_EVP_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_CMS_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_ASN1_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_ERR_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_EC_strings
+   fun:ERR_load_crypto_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ERR_load_SSL_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+
+
+
+
+
+
+
+
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:CRYPTO_realloc
+   fun:lh_insert
+   fun:int_err_set_item
+   fun:ERR_load_strings
+   fun:SSL_load_error_strings
+   fun:ngx_ssl_init
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_upstream_process_header
+   fun:ngx_http_upstream_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_upstream_create
+   fun:ngx_http_proxy_handler
+   fun:ngx_http_core_content_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_run_posted_requests
+   fun:ngx_http_request_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_list_init
+   fun:ngx_http_upstream_process_header
+   fun:ngx_http_upstream_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_proxy_handler
+   fun:ngx_http_core_content_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_run_posted_requests
+   fun:ngx_http_request_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_proxy_handler
+   fun:ngx_http_core_content_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_run_posted_requests
+   fun:ngx_http_request_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_pnalloc
+   fun:ngx_http_proxy_process_header
+   fun:ngx_http_proxy_process_status_line
+   fun:ngx_http_upstream_process_header
+   fun:ngx_http_upstream_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_chain_get_free_buf
+   fun:ngx_http_proxy_non_buffered_copy_filter
+   fun:ngx_http_upstream_process_header
+   fun:ngx_http_upstream_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+   fun:main
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_malloc
+   fun:ngx_palloc
+   fun:ngx_http_proxy_create_request
+   fun:ngx_http_upstream_init_request
+   fun:ngx_http_upstream_init
+   fun:ngx_http_read_client_request_body
+   fun:ngx_http_proxy_handler
+   fun:ngx_http_core_content_phase
+   fun:ngx_http_core_run_phases
+   fun:ngx_http_handler
+   fun:ngx_http_run_posted_requests
+   fun:ngx_http_request_handler
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+   fun:ngx_worker_process_cycle
+   fun:ngx_spawn_process
+   fun:ngx_start_worker_processes
+   fun:ngx_master_process_cycle
+}
+
+
+
diff --git a/debian/modules/nchan/src/.gitignore b/debian/modules/nchan/src/.gitignore
new file mode 100644
index 0000000..67fd4b3
--- /dev/null
+++ b/debian/modules/nchan/src/.gitignore
@@ -0,0 +1,2 @@
+nginx
+nginx-source
\ No newline at end of file
diff --git a/debian/modules/nchan/src/hiredis/.gitignore b/debian/modules/nchan/src/hiredis/.gitignore
new file mode 100644
index 0000000..c44b5c5
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/.gitignore
@@ -0,0 +1,7 @@
+/hiredis-test
+/examples/hiredis-example*
+/*.o
+/*.so
+/*.dylib
+/*.a
+/*.pc
diff --git a/debian/modules/nchan/src/hiredis/.travis.yml b/debian/modules/nchan/src/hiredis/.travis.yml
new file mode 100644
index 0000000..1e1ce30
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/.travis.yml
@@ -0,0 +1,24 @@
+language: c
+sudo: false
+compiler:
+  - gcc
+  - clang
+
+addons:
+  apt:
+    packages:
+    - libc6-dbg
+    - libc6-dev
+    - libc6:i386
+    - libc6-dev-i386
+    - libc6-dbg:i386
+    - gcc-multilib
+    - valgrind
+
+env:
+    - CFLAGS="-Werror"
+    - PRE="valgrind --track-origins=yes --leak-check=full"
+    - TARGET="32bit" TARGET_VARS="32bit-vars" CFLAGS="-Werror"
+    - TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
+
+script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE" && make $TARGET_VARS hiredis-example
diff --git a/debian/modules/nchan/src/hiredis/CHANGELOG.md b/debian/modules/nchan/src/hiredis/CHANGELOG.md
new file mode 100644
index 0000000..a5015c5
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/CHANGELOG.md
@@ -0,0 +1,110 @@
+### 0.13.3 (2015-09-16)
+
+* Revert "Clear `REDIS_CONNECTED` flag when connection is closed".
+* Make tests pass on FreeBSD (Thanks, Giacomo Olgeni)
+
+
+If the `REDIS_CONNECTED` flag is cleared,
+the async onDisconnect callback function will never be called.
+This causes problems as the disconnect is never reported back to the user.
+
+### 0.13.2 (2015-08-25)
+
+* Prevent crash on pending replies in async code (Thanks, @switch-st)
+* Clear `REDIS_CONNECTED` flag when connection is closed (Thanks, Jerry Jacobs)
+* Add MacOS X addapter (Thanks, @dizzus)
+* Add Qt adapter (Thanks, Pietro Cerutti)
+* Add Ivykis adapter (Thanks, Gergely Nagy)
+
+All adapters are provided as is and are only tested where possible.
+
+### 0.13.1 (2015-05-03)
+
+This is a bug fix release.
+The new `reconnect` method introduced new struct members, which clashed with pre-defined names in pre-C99 code.
+Another commit forced C99 compilation just to make it work, but of course this is not desirable for outside projects.
+Other non-C99 code can now use hiredis as usual again.
+Sorry for the inconvenience.
+
+* Fix memory leak in async reply handling (Salvatore Sanfilippo)
+* Rename struct member to avoid name clash with pre-c99 code (Alex Balashov, ncopa)
+
+### 0.13.0 (2015-04-16)
+
+This release adds a minimal Windows compatibility layer.
+The parser, standalone since v0.12.0, can now be compiled on Windows
+(and thus used in other client libraries as well)
+
+* Windows compatibility layer for parser code (tzickel)
+* Properly escape data printed to PKGCONF file (Dan Skorupski)
+* Fix tests when assert() undefined (Keith Bennett, Matt Stancliff)
+* Implement a reconnect method for the client context, this changes the structure of `redisContext` (Aaron Bedra)
+
+### 0.12.1 (2015-01-26)
+
+* Fix `make install`: DESTDIR support, install all required files, install PKGCONF in proper location
+* Fix `make test` as 32 bit build on 64 bit platform
+
+### 0.12.0 (2015-01-22)
+
+* Add optional KeepAlive support
+
+* Try again on EINTR errors
+
+* Add libuv adapter
+
+* Add IPv6 support
+
+* Remove possiblity of multiple close on same fd
+
+* Add ability to bind source address on connect
+
+* Add redisConnectFd() and redisFreeKeepFd()
+
+* Fix getaddrinfo() memory leak
+
+* Free string if it is unused (fixes memory leak)
+
+* Improve redisAppendCommandArgv performance 2.5x
+
+* Add support for SO_REUSEADDR
+
+* Fix redisvFormatCommand format parsing
+
+* Add GLib 2.0 adapter
+
+* Refactor reading code into read.c
+
+* Fix errno error buffers to not clobber errors
+
+* Generate pkgconf during build
+
+* Silence _BSD_SOURCE warnings
+
+* Improve digit counting for multibulk creation
+
+
+### 0.11.0
+
+* Increase the maximum multi-bulk reply depth to 7.
+
+* Increase the read buffer size from 2k to 16k.
+
+* Use poll(2) instead of select(2) to support large fds (>= 1024).
+
+### 0.10.1
+
+* Makefile overhaul. Important to check out if you override one or more
+  variables using environment variables or via arguments to the "make" tool.
+
+* Issue #45: Fix potential memory leak for a multi bulk reply with 0 elements
+  being created by the default reply object functions.
+
+* Issue #43: Don't crash in an asynchronous context when Redis returns an error
+  reply after the connection has been made (this happens when the maximum
+  number of connections is reached).
+
+### 0.10.0
+
+* See commit log.
+
diff --git a/debian/modules/nchan/src/hiredis/COPYING b/debian/modules/nchan/src/hiredis/COPYING
new file mode 100644
index 0000000..a5fc973
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/COPYING
@@ -0,0 +1,29 @@
+Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Redis nor the names of its contributors may be used
+  to endorse or promote products derived from this software without specific
+  prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/nchan/src/hiredis/Makefile b/debian/modules/nchan/src/hiredis/Makefile
new file mode 100644
index 0000000..cff2a84
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/Makefile
@@ -0,0 +1,217 @@
+# Hiredis Makefile
+# Copyright (C) 2010-2011 Salvatore Sanfilippo <antirez at gmail dot com>
+# Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
+# This file is released under the BSD license, see the COPYING file
+
+OBJ=net.o hiredis.o sds.o async.o read.o
+EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib
+TESTS=hiredis-test
+LIBNAME=libhiredis
+PKGCONFNAME=hiredis.pc
+
+HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}')
+HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}')
+HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | awk '{print $$3}')
+HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
+
+# Installation related variables and target
+PREFIX?=/usr/local
+INCLUDE_PATH?=include/hiredis
+LIBRARY_PATH?=lib
+PKGCONF_PATH?=pkgconfig
+INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
+INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
+INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
+
+# redis-server configuration used for testing
+REDIS_PORT=56379
+REDIS_SERVER=redis-server
+define REDIS_TEST_CONFIG
+	daemonize yes
+	pidfile /tmp/hiredis-test-redis.pid
+	port $(REDIS_PORT)
+	bind 127.0.0.1
+	unixsocket /tmp/hiredis-test-redis.sock
+endef
+export REDIS_TEST_CONFIG
+
+# Fallback to gcc when $CC is not in $PATH.
+CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+OPTIMIZATION?=-O3
+WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
+DEBUG?= -g -ggdb
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
+REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
+
+DYLIBSUFFIX=so
+STLIBSUFFIX=a
+DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
+DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
+DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
+DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
+STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
+
+# Platform-specific overrides
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ifeq ($(uname_S),SunOS)
+  REAL_LDFLAGS+= -ldl -lnsl -lsocket
+  DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
+  INSTALL= cp -r
+endif
+ifeq ($(uname_S),Darwin)
+  DYLIBSUFFIX=dylib
+  DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
+  DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+endif
+
+all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
+
+# Deps (use make dep to generate this)
+async.o: async.c fmacros.h async.h hiredis.h read.h sds.h net.h dict.c dict.h
+dict.o: dict.c fmacros.h dict.h
+hiredis.o: hiredis.c fmacros.h hiredis.h read.h sds.h net.h
+net.o: net.c fmacros.h net.h hiredis.h read.h sds.h
+read.o: read.c fmacros.h read.h sds.h
+sds.o: sds.c sds.h
+test.o: test.c fmacros.h hiredis.h read.h sds.h
+
+$(DYLIBNAME): $(OBJ)
+	$(DYLIB_MAKE_CMD) $(OBJ)
+
+$(STLIBNAME): $(OBJ)
+	$(STLIB_MAKE_CMD) $(OBJ)
+
+dynamic: $(DYLIBNAME)
+static: $(STLIBNAME)
+
+# Binaries:
+hiredis-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -levent $(STLIBNAME)
+
+hiredis-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -lev $(STLIBNAME)
+
+hiredis-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) $(shell pkg-config --cflags --libs glib-2.0) -I. $< $(STLIBNAME)
+
+hiredis-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -livykis $(STLIBNAME)
+
+hiredis-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME)
+
+ifndef AE_DIR
+hiredis-example-ae:
+	@echo "Please specify AE_DIR (e.g. <redis repository>/src)"
+	@false
+else
+hiredis-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(AE_DIR) $< $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o $(AE_DIR)/../deps/jemalloc/lib/libjemalloc.a -pthread $(STLIBNAME)
+endif
+
+ifndef LIBUV_DIR
+hiredis-example-libuv:
+	@echo "Please specify LIBUV_DIR (e.g. ../libuv/)"
+	@false
+else
+hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME)
+endif
+
+ifeq ($(and $(QT_MOC),$(QT_INCLUDE_DIR),$(QT_LIBRARY_DIR)),)
+hiredis-example-qt:
+	@echo "Please specify QT_MOC, QT_INCLUDE_DIR AND QT_LIBRARY_DIR"
+	@false
+else
+hiredis-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME)
+	$(QT_MOC) adapters/qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
+	    $(CXX) -x c++ -o qt-adapter-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
+	$(QT_MOC) examples/example-qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
+	    $(CXX) -x c++ -o qt-example-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
+	$(CXX) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore -L$(QT_LIBRARY_DIR) qt-adapter-moc.o qt-example-moc.o $< -pthread $(STLIBNAME) -lQtCore
+endif
+
+hiredis-example: examples/example.c $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< $(STLIBNAME)
+
+examples: $(EXAMPLES)
+
+hiredis-test: test.o $(STLIBNAME)
+
+hiredis-%: %.o $(STLIBNAME)
+	$(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
+
+test: hiredis-test
+	./hiredis-test
+
+check: hiredis-test
+	@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
+	$(PRE) ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
+			( kill `cat /tmp/hiredis-test-redis.pid` && false )
+	kill `cat /tmp/hiredis-test-redis.pid`
+
+.c.o:
+	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
+
+clean:
+	rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
+
+dep:
+	$(CC) -MM *.c
+
+ifeq ($(uname_S),SunOS)
+  INSTALL?= cp -r
+endif
+
+INSTALL?= cp -a
+
+$(PKGCONFNAME): hiredis.h
+	@echo "Generating $@ for pkgconfig..."
+	@echo prefix=$(PREFIX) > $@
+	@echo exec_prefix=\$${prefix} >> $@
+	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
+	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
+	@echo >> $@
+	@echo Name: hiredis >> $@
+	@echo Description: Minimalistic C client library for Redis. >> $@
+	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
+	@echo Libs: -L\$${libdir} -lhiredis >> $@
+	@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
+
+install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
+	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
+	$(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
+	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
+	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
+	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
+	mkdir -p $(INSTALL_PKGCONF_PATH)
+	$(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
+
+32bit:
+	@echo ""
+	@echo "WARNING: if this fails under Linux you probably need to install libc6-dev-i386"
+	@echo ""
+	$(MAKE) CFLAGS="-m32" LDFLAGS="-m32"
+
+32bit-vars:
+	$(eval CFLAGS=-m32)
+	$(eval LDFLAGS=-m32)
+
+gprof:
+	$(MAKE) CFLAGS="-pg" LDFLAGS="-pg"
+
+gcov:
+	$(MAKE) CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs"
+
+coverage: gcov
+	make check
+	mkdir -p tmp/lcov
+	lcov -d . -c -o tmp/lcov/hiredis.info
+	genhtml --legend -o tmp/lcov/report tmp/lcov/hiredis.info
+
+noopt:
+	$(MAKE) OPTIMIZATION=""
+
+.PHONY: all test check clean dep install 32bit 32bit-vars gprof gcov noopt
diff --git a/debian/modules/nchan/src/hiredis/README.md b/debian/modules/nchan/src/hiredis/README.md
new file mode 100644
index 0000000..4f1a58d
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/README.md
@@ -0,0 +1,392 @@
+[![Build Status](https://travis-ci.org/redis/hiredis.png)](https://travis-ci.org/redis/hiredis)
+
+# HIREDIS
+
+Hiredis is a minimalistic C client library for the [Redis](http://redis.io/) database.
+
+It is minimalistic because it just adds minimal support for the protocol, but
+at the same time it uses a high level printf-alike API in order to make it
+much higher level than otherwise suggested by its minimal code base and the
+lack of explicit bindings for every Redis command.
+
+Apart from supporting sending commands and receiving replies, it comes with
+a reply parser that is decoupled from the I/O layer. It
+is a stream parser designed for easy reusability, which can for instance be used
+in higher level language bindings for efficient reply parsing.
+
+Hiredis only supports the binary-safe Redis protocol, so you can use it with any
+Redis version >= 1.2.0.
+
+The library comes with multiple APIs. There is the
+*synchronous API*, the *asynchronous API* and the *reply parsing API*.
+
+## UPGRADING
+
+Version 0.9.0 is a major overhaul of hiredis in every aspect. However, upgrading existing
+code using hiredis should not be a big pain. The key thing to keep in mind when
+upgrading is that hiredis >= 0.9.0 uses a `redisContext*` to keep state, in contrast to
+the stateless 0.0.1 that only has a file descriptor to work with.
+
+## Synchronous API
+
+To consume the synchronous API, there are only a few function calls that need to be introduced:
+
+```c
+redisContext *redisConnect(const char *ip, int port);
+void *redisCommand(redisContext *c, const char *format, ...);
+void freeReplyObject(void *reply);
+```
+
+### Connecting
+
+The function `redisConnect` is used to create a so-called `redisContext`. The
+context is where Hiredis holds state for a connection. The `redisContext`
+struct has an integer `err` field that is non-zero when the connection is in
+an error state. The field `errstr` will contain a string with a description of
+the error. More information on errors can be found in the **Errors** section.
+After trying to connect to Redis using `redisConnect` you should
+check the `err` field to see if establishing the connection was successful:
+```c
+redisContext *c = redisConnect("127.0.0.1", 6379);
+if (c != NULL && c->err) {
+    printf("Error: %s\n", c->errstr);
+    // handle error
+}
+```
+
+### Sending commands
+
+There are several ways to issue commands to Redis. The first that will be introduced is
+`redisCommand`. This function takes a format similar to printf. In the simplest form,
+it is used like this:
+```c
+reply = redisCommand(context, "SET foo bar");
+```
+
+The specifier `%s` interpolates a string in the command, and uses `strlen` to
+determine the length of the string:
+```c
+reply = redisCommand(context, "SET foo %s", value);
+```
+When you need to pass binary safe strings in a command, the `%b` specifier can be
+used. Together with a pointer to the string, it requires a `size_t` length argument
+of the string:
+```c
+reply = redisCommand(context, "SET foo %b", value, (size_t) valuelen);
+```
+Internally, Hiredis splits the command in different arguments and will
+convert it to the protocol used to communicate with Redis.
+One or more spaces separates arguments, so you can use the specifiers
+anywhere in an argument:
+```c
+reply = redisCommand(context, "SET key:%s %s", myid, value);
+```
+
+### Using replies
+
+The return value of `redisCommand` holds a reply when the command was
+successfully executed. When an error occurs, the return value is `NULL` and
+the `err` field in the context will be set (see section on **Errors**).
+Once an error is returned the context cannot be reused and you should set up
+a new connection.
+
+The standard replies that `redisCommand` are of the type `redisReply`. The
+`type` field in the `redisReply` should be used to test what kind of reply
+was received:
+
+* **`REDIS_REPLY_STATUS`**:
+    * The command replied with a status reply. The status string can be accessed using `reply->str`.
+      The length of this string can be accessed using `reply->len`.
+
+* **`REDIS_REPLY_ERROR`**:
+    *  The command replied with an error. The error string can be accessed identical to `REDIS_REPLY_STATUS`.
+
+* **`REDIS_REPLY_INTEGER`**:
+    * The command replied with an integer. The integer value can be accessed using the
+      `reply->integer` field of type `long long`.
+
+* **`REDIS_REPLY_NIL`**:
+    * The command replied with a **nil** object. There is no data to access.
+
+* **`REDIS_REPLY_STRING`**:
+    * A bulk (string) reply. The value of the reply can be accessed using `reply->str`.
+      The length of this string can be accessed using `reply->len`.
+
+* **`REDIS_REPLY_ARRAY`**:
+    * A multi bulk reply. The number of elements in the multi bulk reply is stored in
+      `reply->elements`. Every element in the multi bulk reply is a `redisReply` object as well
+      and can be accessed via `reply->element[..index..]`.
+      Redis may reply with nested arrays but this is fully supported.
+
+Replies should be freed using the `freeReplyObject()` function.
+Note that this function will take care of freeing sub-reply objects
+contained in arrays and nested arrays, so there is no need for the user to
+free the sub replies (it is actually harmful and will corrupt the memory).
+
+**Important:** the current version of hiredis (0.10.0) frees replies when the
+asynchronous API is used. This means you should not call `freeReplyObject` when
+you use this API. The reply is cleaned up by hiredis _after_ the callback
+returns. This behavior will probably change in future releases, so make sure to
+keep an eye on the changelog when upgrading (see issue #39).
+
+### Cleaning up
+
+To disconnect and free the context the following function can be used:
+```c
+void redisFree(redisContext *c);
+```
+This function immediately closes the socket and then frees the allocations done in
+creating the context.
+
+### Sending commands (cont'd)
+
+Together with `redisCommand`, the function `redisCommandArgv` can be used to issue commands.
+It has the following prototype:
+```c
+void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+```
+It takes the number of arguments `argc`, an array of strings `argv` and the lengths of the
+arguments `argvlen`. For convenience, `argvlen` may be set to `NULL` and the function will
+use `strlen(3)` on every argument to determine its length. Obviously, when any of the arguments
+need to be binary safe, the entire array of lengths `argvlen` should be provided.
+
+The return value has the same semantic as `redisCommand`.
+
+### Pipelining
+
+To explain how Hiredis supports pipelining in a blocking connection, there needs to be
+understanding of the internal execution flow.
+
+When any of the functions in the `redisCommand` family is called, Hiredis first formats the
+command according to the Redis protocol. The formatted command is then put in the output buffer
+of the context. This output buffer is dynamic, so it can hold any number of commands.
+After the command is put in the output buffer, `redisGetReply` is called. This function has the
+following two execution paths:
+
+1. The input buffer is non-empty:
+    * Try to parse a single reply from the input buffer and return it
+    * If no reply could be parsed, continue at *2*
+2. The input buffer is empty:
+    * Write the **entire** output buffer to the socket
+    * Read from the socket until a single reply could be parsed
+
+The function `redisGetReply` is exported as part of the Hiredis API and can be used when a reply
+is expected on the socket. To pipeline commands, the only things that needs to be done is
+filling up the output buffer. For this cause, two commands can be used that are identical
+to the `redisCommand` family, apart from not returning a reply:
+```c
+void redisAppendCommand(redisContext *c, const char *format, ...);
+void redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+```
+After calling either function one or more times, `redisGetReply` can be used to receive the
+subsequent replies. The return value for this function is either `REDIS_OK` or `REDIS_ERR`, where
+the latter means an error occurred while reading a reply. Just as with the other commands,
+the `err` field in the context can be used to find out what the cause of this error is.
+
+The following examples shows a simple pipeline (resulting in only a single call to `write(2)` and
+a single call to `read(2)`):
+```c
+redisReply *reply;
+redisAppendCommand(context,"SET foo bar");
+redisAppendCommand(context,"GET foo");
+redisGetReply(context,&reply); // reply for SET
+freeReplyObject(reply);
+redisGetReply(context,&reply); // reply for GET
+freeReplyObject(reply);
+```
+This API can also be used to implement a blocking subscriber:
+```c
+reply = redisCommand(context,"SUBSCRIBE foo");
+freeReplyObject(reply);
+while(redisGetReply(context,&reply) == REDIS_OK) {
+    // consume message
+    freeReplyObject(reply);
+}
+```
+### Errors
+
+When a function call is not successful, depending on the function either `NULL` or `REDIS_ERR` is
+returned. The `err` field inside the context will be non-zero and set to one of the
+following constants:
+
+* **`REDIS_ERR_IO`**:
+    There was an I/O error while creating the connection, trying to write
+    to the socket or read from the socket. If you included `errno.h` in your
+    application, you can use the global `errno` variable to find out what is
+    wrong.
+
+* **`REDIS_ERR_EOF`**:
+    The server closed the connection which resulted in an empty read.
+
+* **`REDIS_ERR_PROTOCOL`**:
+    There was an error while parsing the protocol.
+
+* **`REDIS_ERR_OTHER`**:
+    Any other error. Currently, it is only used when a specified hostname to connect
+    to cannot be resolved.
+
+In every case, the `errstr` field in the context will be set to hold a string representation
+of the error.
+
+## Asynchronous API
+
+Hiredis comes with an asynchronous API that works easily with any event library.
+Examples are bundled that show using Hiredis with [libev](http://software.schmorp.de/pkg/libev.html)
+and [libevent](http://monkey.org/~provos/libevent/).
+
+### Connecting
+
+The function `redisAsyncConnect` can be used to establish a non-blocking connection to
+Redis. It returns a pointer to the newly created `redisAsyncContext` struct. The `err` field
+should be checked after creation to see if there were errors creating the connection.
+Because the connection that will be created is non-blocking, the kernel is not able to
+instantly return if the specified host and port is able to accept a connection.
+```c
+redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+if (c->err) {
+    printf("Error: %s\n", c->errstr);
+    // handle error
+}
+```
+
+The asynchronous context can hold a disconnect callback function that is called when the
+connection is disconnected (either because of an error or per user request). This function should
+have the following prototype:
+```c
+void(const redisAsyncContext *c, int status);
+```
+On a disconnect, the `status` argument is set to `REDIS_OK` when disconnection was initiated by the
+user, or `REDIS_ERR` when the disconnection was caused by an error. When it is `REDIS_ERR`, the `err`
+field in the context can be accessed to find out the cause of the error.
+
+The context object is always freed after the disconnect callback fired. When a reconnect is needed,
+the disconnect callback is a good point to do so.
+
+Setting the disconnect callback can only be done once per context. For subsequent calls it will
+return `REDIS_ERR`. The function to set the disconnect callback has the following prototype:
+```c
+int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
+```
+### Sending commands and their callbacks
+
+In an asynchronous context, commands are automatically pipelined due to the nature of an event loop.
+Therefore, unlike the synchronous API, there is only a single way to send commands.
+Because commands are sent to Redis asynchronously, issuing a command requires a callback function
+that is called when the reply is received. Reply callbacks should have the following prototype:
+```c
+void(redisAsyncContext *c, void *reply, void *privdata);
+```
+The `privdata` argument can be used to curry arbitrary data to the callback from the point where
+the command is initially queued for execution.
+
+The functions that can be used to issue commands in an asynchronous context are:
+```c
+int redisAsyncCommand(
+  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
+  const char *format, ...);
+int redisAsyncCommandArgv(
+  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
+  int argc, const char **argv, const size_t *argvlen);
+```
+Both functions work like their blocking counterparts. The return value is `REDIS_OK` when the command
+was successfully added to the output buffer and `REDIS_ERR` otherwise. Example: when the connection
+is being disconnected per user-request, no new commands may be added to the output buffer and `REDIS_ERR` is
+returned on calls to the `redisAsyncCommand` family.
+
+If the reply for a command with a `NULL` callback is read, it is immediately freed. When the callback
+for a command is non-`NULL`, the memory is freed immediately following the callback: the reply is only
+valid for the duration of the callback.
+
+All pending callbacks are called with a `NULL` reply when the context encountered an error.
+
+### Disconnecting
+
+An asynchronous connection can be terminated using:
+```c
+void redisAsyncDisconnect(redisAsyncContext *ac);
+```
+When this function is called, the connection is **not** immediately terminated. Instead, new
+commands are no longer accepted and the connection is only terminated when all pending commands
+have been written to the socket, their respective replies have been read and their respective
+callbacks have been executed. After this, the disconnection callback is executed with the
+`REDIS_OK` status and the context object is freed.
+
+### Hooking it up to event library *X*
+
+There are a few hooks that need to be set on the context object after it is created.
+See the `adapters/` directory for bindings to *libev* and *libevent*.
+
+## Reply parsing API
+
+Hiredis comes with a reply parsing API that makes it easy for writing higher
+level language bindings.
+
+The reply parsing API consists of the following functions:
+```c
+redisReader *redisReaderCreate(void);
+void redisReaderFree(redisReader *reader);
+int redisReaderFeed(redisReader *reader, const char *buf, size_t len);
+int redisReaderGetReply(redisReader *reader, void **reply);
+```
+The same set of functions are used internally by hiredis when creating a
+normal Redis context, the above API just exposes it to the user for a direct
+usage.
+
+### Usage
+
+The function `redisReaderCreate` creates a `redisReader` structure that holds a
+buffer with unparsed data and state for the protocol parser.
+
+Incoming data -- most likely from a socket -- can be placed in the internal
+buffer of the `redisReader` using `redisReaderFeed`. This function will make a
+copy of the buffer pointed to by `buf` for `len` bytes. This data is parsed
+when `redisReaderGetReply` is called. This function returns an integer status
+and a reply object (as described above) via `void **reply`. The returned status
+can be either `REDIS_OK` or `REDIS_ERR`, where the latter means something went
+wrong (either a protocol error, or an out of memory error).
+
+The parser limits the level of nesting for multi bulk payloads to 7. If the
+multi bulk nesting level is higher than this, the parser returns an error.
+
+### Customizing replies
+
+The function `redisReaderGetReply` creates `redisReply` and makes the function
+argument `reply` point to the created `redisReply` variable. For instance, if
+the response of type `REDIS_REPLY_STATUS` then the `str` field of `redisReply`
+will hold the status as a vanilla C string. However, the functions that are
+responsible for creating instances of the `redisReply` can be customized by
+setting the `fn` field on the `redisReader` struct. This should be done
+immediately after creating the `redisReader`.
+
+For example, [hiredis-rb](https://github.com/pietern/hiredis-rb/blob/master/ext/hiredis_ext/reader.c)
+uses customized reply object functions to create Ruby objects.
+
+### Reader max buffer
+
+Both when using the Reader API directly or when using it indirectly via a
+normal Redis context, the redisReader structure uses a buffer in order to
+accumulate data from the server.
+Usually this buffer is destroyed when it is empty and is larger than 16
+KiB in order to avoid wasting memory in unused buffers
+
+However when working with very big payloads destroying the buffer may slow
+down performances considerably, so it is possible to modify the max size of
+an idle buffer changing the value of the `maxbuf` field of the reader structure
+to the desired value. The special value of 0 means that there is no maximum
+value for an idle buffer, so the buffer will never get freed.
+
+For instance if you have a normal Redis context you can set the maximum idle
+buffer to zero (unlimited) just with:
+```c
+context->reader->maxbuf = 0;
+```
+This should be done only in order to maximize performances when working with
+large payloads. The context should be set back to `REDIS_READER_MAX_BUF` again
+as soon as possible in order to prevent allocation of useless memory.
+
+## AUTHORS
+
+Hiredis was written by Salvatore Sanfilippo (antirez at gmail) and
+Pieter Noordhuis (pcnoordhuis at gmail) and is released under the BSD license.  
+Hiredis is currently maintained by Matt Stancliff (matt at genges dot com) and
+Jan-Erik Rediger (janerik at fnordig dot com)
diff --git a/debian/modules/nchan/src/hiredis/adapters/ae.h b/debian/modules/nchan/src/hiredis/adapters/ae.h
new file mode 100644
index 0000000..5c551c2
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/adapters/ae.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_AE_H__
+#define __HIREDIS_AE_H__
+#include <sys/types.h>
+#include <ae.h>
+#include "../hiredis.h"
+#include "../async.h"
+
+typedef struct redisAeEvents {
+    redisAsyncContext *context;
+    aeEventLoop *loop;
+    int fd;
+    int reading, writing;
+} redisAeEvents;
+
+static void redisAeReadEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
+    ((void)el); ((void)fd); ((void)mask);
+
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    redisAsyncHandleRead(e->context);
+}
+
+static void redisAeWriteEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
+    ((void)el); ((void)fd); ((void)mask);
+
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    redisAsyncHandleWrite(e->context);
+}
+
+static void redisAeAddRead(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    aeEventLoop *loop = e->loop;
+    if (!e->reading) {
+        e->reading = 1;
+        aeCreateFileEvent(loop,e->fd,AE_READABLE,redisAeReadEvent,e);
+    }
+}
+
+static void redisAeDelRead(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    aeEventLoop *loop = e->loop;
+    if (e->reading) {
+        e->reading = 0;
+        aeDeleteFileEvent(loop,e->fd,AE_READABLE);
+    }
+}
+
+static void redisAeAddWrite(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    aeEventLoop *loop = e->loop;
+    if (!e->writing) {
+        e->writing = 1;
+        aeCreateFileEvent(loop,e->fd,AE_WRITABLE,redisAeWriteEvent,e);
+    }
+}
+
+static void redisAeDelWrite(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    aeEventLoop *loop = e->loop;
+    if (e->writing) {
+        e->writing = 0;
+        aeDeleteFileEvent(loop,e->fd,AE_WRITABLE);
+    }
+}
+
+static void redisAeCleanup(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    redisAeDelRead(privdata);
+    redisAeDelWrite(privdata);
+    free(e);
+}
+
+static int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisAeEvents *e;
+
+    /* Nothing should be attached when something is already attached */
+    if (ac->ev.data != NULL)
+        return REDIS_ERR;
+
+    /* Create container for context and r/w events */
+    e = (redisAeEvents*)malloc(sizeof(*e));
+    e->context = ac;
+    e->loop = loop;
+    e->fd = c->fd;
+    e->reading = e->writing = 0;
+
+    /* Register functions to start/stop listening for events */
+    ac->ev.addRead = redisAeAddRead;
+    ac->ev.delRead = redisAeDelRead;
+    ac->ev.addWrite = redisAeAddWrite;
+    ac->ev.delWrite = redisAeDelWrite;
+    ac->ev.cleanup = redisAeCleanup;
+    ac->ev.data = e;
+
+    return REDIS_OK;
+}
+#endif
diff --git a/debian/modules/nchan/src/hiredis/adapters/libev.h b/debian/modules/nchan/src/hiredis/adapters/libev.h
new file mode 100644
index 0000000..2bf8d52
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/adapters/libev.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_LIBEV_H__
+#define __HIREDIS_LIBEV_H__
+#include <stdlib.h>
+#include <sys/types.h>
+#include <ev.h>
+#include "../hiredis.h"
+#include "../async.h"
+
+typedef struct redisLibevEvents {
+    redisAsyncContext *context;
+    struct ev_loop *loop;
+    int reading, writing;
+    ev_io rev, wev;
+} redisLibevEvents;
+
+static void redisLibevReadEvent(EV_P_ ev_io *watcher, int revents) {
+#if EV_MULTIPLICITY
+    ((void)loop);
+#endif
+    ((void)revents);
+
+    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
+    redisAsyncHandleRead(e->context);
+}
+
+static void redisLibevWriteEvent(EV_P_ ev_io *watcher, int revents) {
+#if EV_MULTIPLICITY
+    ((void)loop);
+#endif
+    ((void)revents);
+
+    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
+    redisAsyncHandleWrite(e->context);
+}
+
+static void redisLibevAddRead(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);
+    if (!e->reading) {
+        e->reading = 1;
+        ev_io_start(EV_A_ &e->rev);
+    }
+}
+
+static void redisLibevDelRead(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);
+    if (e->reading) {
+        e->reading = 0;
+        ev_io_stop(EV_A_ &e->rev);
+    }
+}
+
+static void redisLibevAddWrite(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);
+    if (!e->writing) {
+        e->writing = 1;
+        ev_io_start(EV_A_ &e->wev);
+    }
+}
+
+static void redisLibevDelWrite(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);
+    if (e->writing) {
+        e->writing = 0;
+        ev_io_stop(EV_A_ &e->wev);
+    }
+}
+
+static void redisLibevCleanup(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    redisLibevDelRead(privdata);
+    redisLibevDelWrite(privdata);
+    free(e);
+}
+
+static int redisLibevAttach(EV_P_ redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisLibevEvents *e;
+
+    /* Nothing should be attached when something is already attached */
+    if (ac->ev.data != NULL)
+        return REDIS_ERR;
+
+    /* Create container for context and r/w events */
+    e = (redisLibevEvents*)malloc(sizeof(*e));
+    e->context = ac;
+#if EV_MULTIPLICITY
+    e->loop = loop;
+#else
+    e->loop = NULL;
+#endif
+    e->reading = e->writing = 0;
+    e->rev.data = e;
+    e->wev.data = e;
+
+    /* Register functions to start/stop listening for events */
+    ac->ev.addRead = redisLibevAddRead;
+    ac->ev.delRead = redisLibevDelRead;
+    ac->ev.addWrite = redisLibevAddWrite;
+    ac->ev.delWrite = redisLibevDelWrite;
+    ac->ev.cleanup = redisLibevCleanup;
+    ac->ev.data = e;
+
+    /* Initialize read/write events */
+    ev_io_init(&e->rev,redisLibevReadEvent,c->fd,EV_READ);
+    ev_io_init(&e->wev,redisLibevWriteEvent,c->fd,EV_WRITE);
+    return REDIS_OK;
+}
+
+#endif
diff --git a/debian/modules/nchan/src/hiredis/adapters/libevent.h b/debian/modules/nchan/src/hiredis/adapters/libevent.h
new file mode 100644
index 0000000..1c2b271
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/adapters/libevent.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_LIBEVENT_H__
+#define __HIREDIS_LIBEVENT_H__
+#include <event.h>
+#include "../hiredis.h"
+#include "../async.h"
+
+typedef struct redisLibeventEvents {
+    redisAsyncContext *context;
+    struct event rev, wev;
+} redisLibeventEvents;
+
+static void redisLibeventReadEvent(int fd, short event, void *arg) {
+    ((void)fd); ((void)event);
+    redisLibeventEvents *e = (redisLibeventEvents*)arg;
+    redisAsyncHandleRead(e->context);
+}
+
+static void redisLibeventWriteEvent(int fd, short event, void *arg) {
+    ((void)fd); ((void)event);
+    redisLibeventEvents *e = (redisLibeventEvents*)arg;
+    redisAsyncHandleWrite(e->context);
+}
+
+static void redisLibeventAddRead(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_add(&e->rev,NULL);
+}
+
+static void redisLibeventDelRead(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_del(&e->rev);
+}
+
+static void redisLibeventAddWrite(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_add(&e->wev,NULL);
+}
+
+static void redisLibeventDelWrite(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_del(&e->wev);
+}
+
+static void redisLibeventCleanup(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_del(&e->rev);
+    event_del(&e->wev);
+    free(e);
+}
+
+static int redisLibeventAttach(redisAsyncContext *ac, struct event_base *base) {
+    redisContext *c = &(ac->c);
+    redisLibeventEvents *e;
+
+    /* Nothing should be attached when something is already attached */
+    if (ac->ev.data != NULL)
+        return REDIS_ERR;
+
+    /* Create container for context and r/w events */
+    e = (redisLibeventEvents*)malloc(sizeof(*e));
+    e->context = ac;
+
+    /* Register functions to start/stop listening for events */
+    ac->ev.addRead = redisLibeventAddRead;
+    ac->ev.delRead = redisLibeventDelRead;
+    ac->ev.addWrite = redisLibeventAddWrite;
+    ac->ev.delWrite = redisLibeventDelWrite;
+    ac->ev.cleanup = redisLibeventCleanup;
+    ac->ev.data = e;
+
+    /* Initialize and install read/write events */
+    event_set(&e->rev,c->fd,EV_READ,redisLibeventReadEvent,e);
+    event_set(&e->wev,c->fd,EV_WRITE,redisLibeventWriteEvent,e);
+    event_base_set(base,&e->rev);
+    event_base_set(base,&e->wev);
+    return REDIS_OK;
+}
+#endif
diff --git a/debian/modules/nchan/src/hiredis/adapters/libuv.h b/debian/modules/nchan/src/hiredis/adapters/libuv.h
new file mode 100644
index 0000000..3cdf3d3
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/adapters/libuv.h
@@ -0,0 +1,121 @@
+#ifndef __HIREDIS_LIBUV_H__
+#define __HIREDIS_LIBUV_H__
+#include <stdlib.h>
+#include <uv.h>
+#include "../hiredis.h"
+#include "../async.h"
+#include <string.h>
+
+typedef struct redisLibuvEvents {
+  redisAsyncContext* context;
+  uv_poll_t          handle;
+  int                events;
+} redisLibuvEvents;
+
+
+static void redisLibuvPoll(uv_poll_t* handle, int status, int events) {
+  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
+
+  if (status != 0) {
+    return;
+  }
+
+  if (events & UV_READABLE) {
+    redisAsyncHandleRead(p->context);
+  }
+  if (events & UV_WRITABLE) {
+    redisAsyncHandleWrite(p->context);
+  }
+}
+
+
+static void redisLibuvAddRead(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  p->events |= UV_READABLE;
+
+  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
+}
+
+
+static void redisLibuvDelRead(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  p->events &= ~UV_READABLE;
+
+  if (p->events) {
+    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
+  } else {
+    uv_poll_stop(&p->handle);
+  }
+}
+
+
+static void redisLibuvAddWrite(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  p->events |= UV_WRITABLE;
+
+  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
+}
+
+
+static void redisLibuvDelWrite(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  p->events &= ~UV_WRITABLE;
+
+  if (p->events) {
+    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
+  } else {
+    uv_poll_stop(&p->handle);
+  }
+}
+
+
+static void on_close(uv_handle_t* handle) {
+  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
+
+  free(p);
+}
+
+
+static void redisLibuvCleanup(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  uv_close((uv_handle_t*)&p->handle, on_close);
+}
+
+
+static int redisLibuvAttach(redisAsyncContext* ac, uv_loop_t* loop) {
+  redisContext *c = &(ac->c);
+
+  if (ac->ev.data != NULL) {
+    return REDIS_ERR;
+  }
+
+  ac->ev.addRead  = redisLibuvAddRead;
+  ac->ev.delRead  = redisLibuvDelRead;
+  ac->ev.addWrite = redisLibuvAddWrite;
+  ac->ev.delWrite = redisLibuvDelWrite;
+  ac->ev.cleanup  = redisLibuvCleanup;
+
+  redisLibuvEvents* p = (redisLibuvEvents*)malloc(sizeof(*p));
+
+  if (!p) {
+    return REDIS_ERR;
+  }
+
+  memset(p, 0, sizeof(*p));
+
+  if (uv_poll_init(loop, &p->handle, c->fd) != 0) {
+    return REDIS_ERR;
+  }
+
+  ac->ev.data    = p;
+  p->handle.data = p;
+  p->context     = ac;
+
+  return REDIS_OK;
+}
+#endif
diff --git a/debian/modules/nchan/src/hiredis/async.c b/debian/modules/nchan/src/hiredis/async.c
new file mode 100644
index 0000000..d955203
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/async.c
@@ -0,0 +1,687 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include "async.h"
+#include "net.h"
+#include "dict.c"
+#include "sds.h"
+
+#define _EL_ADD_READ(ctx) do { \
+        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
+    } while(0)
+#define _EL_DEL_READ(ctx) do { \
+        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
+    } while(0)
+#define _EL_ADD_WRITE(ctx) do { \
+        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
+    } while(0)
+#define _EL_DEL_WRITE(ctx) do { \
+        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
+    } while(0)
+#define _EL_CLEANUP(ctx) do { \
+        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
+    } while(0);
+
+/* Forward declaration of function in hiredis.c */
+int __redisAppendCommand(redisContext *c, const char *cmd, size_t len);
+
+/* Functions managing dictionary of callbacks for pub/sub. */
+static unsigned int callbackHash(const void *key) {
+    return dictGenHashFunction((const unsigned char *)key,
+                               sdslen((const sds)key));
+}
+
+static void *callbackValDup(void *privdata, const void *src) {
+    ((void) privdata);
+    redisCallback *dup = malloc(sizeof(*dup));
+    memcpy(dup,src,sizeof(*dup));
+    return dup;
+}
+
+static int callbackKeyCompare(void *privdata, const void *key1, const void *key2) {
+    int l1, l2;
+    ((void) privdata);
+
+    l1 = sdslen((const sds)key1);
+    l2 = sdslen((const sds)key2);
+    if (l1 != l2) return 0;
+    return memcmp(key1,key2,l1) == 0;
+}
+
+static void callbackKeyDestructor(void *privdata, void *key) {
+    ((void) privdata);
+    sdsfree((sds)key);
+}
+
+static void callbackValDestructor(void *privdata, void *val) {
+    ((void) privdata);
+    free(val);
+}
+
+static dictType callbackDict = {
+    callbackHash,
+    NULL,
+    callbackValDup,
+    callbackKeyCompare,
+    callbackKeyDestructor,
+    callbackValDestructor
+};
+
+static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
+    redisAsyncContext *ac;
+
+    ac = realloc(c,sizeof(redisAsyncContext));
+    if (ac == NULL)
+        return NULL;
+
+    c = &(ac->c);
+
+    /* The regular connect functions will always set the flag REDIS_CONNECTED.
+     * For the async API, we want to wait until the first write event is
+     * received up before setting this flag, so reset it here. */
+    c->flags &= ~REDIS_CONNECTED;
+
+    ac->err = 0;
+    ac->errstr = NULL;
+    ac->data = NULL;
+
+    ac->ev.data = NULL;
+    ac->ev.addRead = NULL;
+    ac->ev.delRead = NULL;
+    ac->ev.addWrite = NULL;
+    ac->ev.delWrite = NULL;
+    ac->ev.cleanup = NULL;
+
+    ac->onConnect = NULL;
+    ac->onDisconnect = NULL;
+
+    ac->replies.head = NULL;
+    ac->replies.tail = NULL;
+    ac->sub.invalid.head = NULL;
+    ac->sub.invalid.tail = NULL;
+    ac->sub.channels = dictCreate(&callbackDict,NULL);
+    ac->sub.patterns = dictCreate(&callbackDict,NULL);
+    return ac;
+}
+
+/* We want the error field to be accessible directly instead of requiring
+ * an indirection to the redisContext struct. */
+static void __redisAsyncCopyError(redisAsyncContext *ac) {
+    if (!ac)
+        return;
+
+    redisContext *c = &(ac->c);
+    ac->err = c->err;
+    ac->errstr = c->errstr;
+}
+
+redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
+    redisContext *c;
+    redisAsyncContext *ac;
+
+    c = redisConnectNonBlock(ip,port);
+    if (c == NULL)
+        return NULL;
+
+    ac = redisAsyncInitialize(c);
+    if (ac == NULL) {
+        redisFree(c);
+        return NULL;
+    }
+
+    __redisAsyncCopyError(ac);
+    return ac;
+}
+
+redisAsyncContext *redisAsyncConnectBind(const char *ip, int port,
+                                         const char *source_addr) {
+    redisContext *c = redisConnectBindNonBlock(ip,port,source_addr);
+    redisAsyncContext *ac = redisAsyncInitialize(c);
+    __redisAsyncCopyError(ac);
+    return ac;
+}
+
+redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
+                                                  const char *source_addr) {
+    redisContext *c = redisConnectBindNonBlockWithReuse(ip,port,source_addr);
+    redisAsyncContext *ac = redisAsyncInitialize(c);
+    __redisAsyncCopyError(ac);
+    return ac;
+}
+
+redisAsyncContext *redisAsyncConnectUnix(const char *path) {
+    redisContext *c;
+    redisAsyncContext *ac;
+
+    c = redisConnectUnixNonBlock(path);
+    if (c == NULL)
+        return NULL;
+
+    ac = redisAsyncInitialize(c);
+    if (ac == NULL) {
+        redisFree(c);
+        return NULL;
+    }
+
+    __redisAsyncCopyError(ac);
+    return ac;
+}
+
+int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn) {
+    if (ac->onConnect == NULL) {
+        ac->onConnect = fn;
+
+        /* The common way to detect an established connection is to wait for
+         * the first write event to be fired. This assumes the related event
+         * library functions are already set. */
+        _EL_ADD_WRITE(ac);
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
+int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn) {
+    if (ac->onDisconnect == NULL) {
+        ac->onDisconnect = fn;
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
+/* Helper functions to push/shift callbacks */
+static int __redisPushCallback(redisCallbackList *list, redisCallback *source) {
+    redisCallback *cb;
+
+    /* Copy callback from stack to heap */
+    cb = malloc(sizeof(*cb));
+    if (cb == NULL)
+        return REDIS_ERR_OOM;
+
+    if (source != NULL) {
+        memcpy(cb,source,sizeof(*cb));
+        cb->next = NULL;
+    }
+
+    /* Store callback in list */
+    if (list->head == NULL)
+        list->head = cb;
+    if (list->tail != NULL)
+        list->tail->next = cb;
+    list->tail = cb;
+    return REDIS_OK;
+}
+
+static int __redisShiftCallback(redisCallbackList *list, redisCallback *target) {
+    redisCallback *cb = list->head;
+    if (cb != NULL) {
+        list->head = cb->next;
+        if (cb == list->tail)
+            list->tail = NULL;
+
+        /* Copy callback from heap to stack */
+        if (target != NULL)
+            memcpy(target,cb,sizeof(*cb));
+        free(cb);
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
+static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisReply *reply) {
+    redisContext *c = &(ac->c);
+    if (cb->fn != NULL) {
+        c->flags |= REDIS_IN_CALLBACK;
+        cb->fn(ac,reply,cb->privdata);
+        c->flags &= ~REDIS_IN_CALLBACK;
+    }
+}
+
+/* Helper function to free the context. */
+static void __redisAsyncFree(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisCallback cb;
+    dictIterator *it;
+    dictEntry *de;
+
+    /* Execute pending callbacks with NULL reply. */
+    while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK)
+        __redisRunCallback(ac,&cb,NULL);
+
+    /* Execute callbacks for invalid commands */
+    while (__redisShiftCallback(&ac->sub.invalid,&cb) == REDIS_OK)
+        __redisRunCallback(ac,&cb,NULL);
+
+    /* Run subscription callbacks callbacks with NULL reply */
+    it = dictGetIterator(ac->sub.channels);
+    while ((de = dictNext(it)) != NULL)
+        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
+    dictReleaseIterator(it);
+    dictRelease(ac->sub.channels);
+
+    it = dictGetIterator(ac->sub.patterns);
+    while ((de = dictNext(it)) != NULL)
+        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
+    dictReleaseIterator(it);
+    dictRelease(ac->sub.patterns);
+
+    /* Signal event lib to clean up */
+    _EL_CLEANUP(ac);
+
+    /* Execute disconnect callback. When redisAsyncFree() initiated destroying
+     * this context, the status will always be REDIS_OK. */
+    if (ac->onDisconnect && (c->flags & REDIS_CONNECTED)) {
+        if (c->flags & REDIS_FREEING) {
+            ac->onDisconnect(ac,REDIS_OK);
+        } else {
+            ac->onDisconnect(ac,(ac->err == 0) ? REDIS_OK : REDIS_ERR);
+        }
+    }
+
+    /* Cleanup self */
+    redisFree(c);
+}
+
+/* Free the async context. When this function is called from a callback,
+ * control needs to be returned to redisProcessCallbacks() before actual
+ * free'ing. To do so, a flag is set on the context which is picked up by
+ * redisProcessCallbacks(). Otherwise, the context is immediately free'd. */
+void redisAsyncFree(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    c->flags |= REDIS_FREEING;
+    if (!(c->flags & REDIS_IN_CALLBACK))
+        __redisAsyncFree(ac);
+}
+
+/* Helper function to make the disconnect happen and clean up. */
+static void __redisAsyncDisconnect(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    /* Make sure error is accessible if there is any */
+    __redisAsyncCopyError(ac);
+
+    if (ac->err == 0) {
+        /* For clean disconnects, there should be no pending callbacks. */
+        assert(__redisShiftCallback(&ac->replies,NULL) == REDIS_ERR);
+    } else {
+        /* Disconnection is caused by an error, make sure that pending
+         * callbacks cannot call new commands. */
+        c->flags |= REDIS_DISCONNECTING;
+    }
+
+    /* For non-clean disconnects, __redisAsyncFree() will execute pending
+     * callbacks with a NULL-reply. */
+    __redisAsyncFree(ac);
+}
+
+/* Tries to do a clean disconnect from Redis, meaning it stops new commands
+ * from being issued, but tries to flush the output buffer and execute
+ * callbacks for all remaining replies. When this function is called from a
+ * callback, there might be more replies and we can safely defer disconnecting
+ * to redisProcessCallbacks(). Otherwise, we can only disconnect immediately
+ * when there are no pending callbacks. */
+void redisAsyncDisconnect(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    c->flags |= REDIS_DISCONNECTING;
+    if (!(c->flags & REDIS_IN_CALLBACK) && ac->replies.head == NULL)
+        __redisAsyncDisconnect(ac);
+}
+
+static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, redisCallback *dstcb) {
+    redisContext *c = &(ac->c);
+    dict *callbacks;
+    dictEntry *de;
+    int pvariant;
+    char *stype;
+    sds sname;
+
+    /* Custom reply functions are not supported for pub/sub. This will fail
+     * very hard when they are used... */
+    if (reply->type == REDIS_REPLY_ARRAY) {
+        assert(reply->elements >= 2);
+        assert(reply->element[0]->type == REDIS_REPLY_STRING);
+        stype = reply->element[0]->str;
+        pvariant = (tolower(stype[0]) == 'p') ? 1 : 0;
+
+        if (pvariant)
+            callbacks = ac->sub.patterns;
+        else
+            callbacks = ac->sub.channels;
+
+        /* Locate the right callback */
+        assert(reply->element[1]->type == REDIS_REPLY_STRING);
+        sname = sdsnewlen(reply->element[1]->str,reply->element[1]->len);
+        de = dictFind(callbacks,sname);
+        if (de != NULL) {
+            memcpy(dstcb,dictGetEntryVal(de),sizeof(*dstcb));
+
+            /* If this is an unsubscribe message, remove it. */
+            if (strcasecmp(stype+pvariant,"unsubscribe") == 0) {
+                dictDelete(callbacks,sname);
+
+                /* If this was the last unsubscribe message, revert to
+                 * non-subscribe mode. */
+                assert(reply->element[2]->type == REDIS_REPLY_INTEGER);
+                if (reply->element[2]->integer == 0)
+                    c->flags &= ~REDIS_SUBSCRIBED;
+            }
+        }
+        sdsfree(sname);
+    } else {
+        /* Shift callback for invalid commands. */
+        __redisShiftCallback(&ac->sub.invalid,dstcb);
+    }
+    return REDIS_OK;
+}
+
+void redisProcessCallbacks(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisCallback cb = {NULL, NULL, NULL};
+    void *reply = NULL;
+    int status;
+
+    while((status = redisGetReply(c,&reply)) == REDIS_OK) {
+        if (reply == NULL) {
+            /* When the connection is being disconnected and there are
+             * no more replies, this is the cue to really disconnect. */
+            if (c->flags & REDIS_DISCONNECTING && sdslen(c->obuf) == 0
+                && ac->replies.head == NULL) {
+                __redisAsyncDisconnect(ac);
+                return;
+            }
+
+            /* If monitor mode, repush callback */
+            if(c->flags & REDIS_MONITORING) {
+                __redisPushCallback(&ac->replies,&cb);
+            }
+
+            /* When the connection is not being disconnected, simply stop
+             * trying to get replies and wait for the next loop tick. */
+            break;
+        }
+
+        /* Even if the context is subscribed, pending regular callbacks will
+         * get a reply before pub/sub messages arrive. */
+        if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
+            /*
+             * A spontaneous reply in a not-subscribed context can be the error
+             * reply that is sent when a new connection exceeds the maximum
+             * number of allowed connections on the server side.
+             *
+             * This is seen as an error instead of a regular reply because the
+             * server closes the connection after sending it.
+             *
+             * To prevent the error from being overwritten by an EOF error the
+             * connection is closed here. See issue #43.
+             *
+             * Another possibility is that the server is loading its dataset.
+             * In this case we also want to close the connection, and have the
+             * user wait until the server is ready to take our request.
+             */
+            if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
+                c->err = REDIS_ERR_OTHER;
+                snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
+                c->reader->fn->freeObject(reply);
+                __redisAsyncDisconnect(ac);
+                return;
+            }
+            /* No more regular callbacks and no errors, the context *must* be subscribed or monitoring. */
+            assert((c->flags & REDIS_SUBSCRIBED || c->flags & REDIS_MONITORING));
+            if(c->flags & REDIS_SUBSCRIBED)
+                __redisGetSubscribeCallback(ac,reply,&cb);
+        }
+
+        if (cb.fn != NULL) {
+            __redisRunCallback(ac,&cb,reply);
+            c->reader->fn->freeObject(reply);
+
+            /* Proceed with free'ing when redisAsyncFree() was called. */
+            if (c->flags & REDIS_FREEING) {
+                __redisAsyncFree(ac);
+                return;
+            }
+        } else {
+            /* No callback for this reply. This can either be a NULL callback,
+             * or there were no callbacks to begin with. Either way, don't
+             * abort with an error, but simply ignore it because the client
+             * doesn't know what the server will spit out over the wire. */
+            c->reader->fn->freeObject(reply);
+        }
+    }
+
+    /* Disconnect when there was an error reading the reply */
+    if (status != REDIS_OK)
+        __redisAsyncDisconnect(ac);
+}
+
+/* Internal helper function to detect socket status the first time a read or
+ * write event fires. When connecting was not successful, the connect callback
+ * is called with a REDIS_ERR status and the context is free'd. */
+static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    if (redisCheckSocketError(c) == REDIS_ERR) {
+        /* Try again later when connect(2) is still in progress. */
+        if (errno == EINPROGRESS)
+            return REDIS_OK;
+
+        if (ac->onConnect) ac->onConnect(ac,REDIS_ERR);
+        __redisAsyncDisconnect(ac);
+        return REDIS_ERR;
+    }
+
+    /* Mark context as connected. */
+    c->flags |= REDIS_CONNECTED;
+    if (ac->onConnect) ac->onConnect(ac,REDIS_OK);
+    return REDIS_OK;
+}
+
+/* This function should be called when the socket is readable.
+ * It processes all replies that can be read and executes their callbacks.
+ */
+void redisAsyncHandleRead(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    if (!(c->flags & REDIS_CONNECTED)) {
+        /* Abort connect was not successful. */
+        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
+            return;
+        /* Try again later when the context is still not connected. */
+        if (!(c->flags & REDIS_CONNECTED))
+            return;
+    }
+
+    if (redisBufferRead(c) == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+    } else {
+        /* Always re-schedule reads */
+        _EL_ADD_READ(ac);
+        redisProcessCallbacks(ac);
+    }
+}
+
+void redisAsyncHandleWrite(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    int done = 0;
+
+    if (!(c->flags & REDIS_CONNECTED)) {
+        /* Abort connect was not successful. */
+        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
+            return;
+        /* Try again later when the context is still not connected. */
+        if (!(c->flags & REDIS_CONNECTED))
+            return;
+    }
+
+    if (redisBufferWrite(c,&done) == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+    } else {
+        /* Continue writing when not done, stop writing otherwise */
+        if (!done)
+            _EL_ADD_WRITE(ac);
+        else
+            _EL_DEL_WRITE(ac);
+
+        /* Always schedule reads after writes */
+        _EL_ADD_READ(ac);
+    }
+}
+
+/* Sets a pointer to the first argument and its length starting at p. Returns
+ * the number of bytes to skip to get to the following argument. */
+static const char *nextArgument(const char *start, const char **str, size_t *len) {
+    const char *p = start;
+    if (p[0] != '$') {
+        p = strchr(p,'$');
+        if (p == NULL) return NULL;
+    }
+
+    *len = (int)strtol(p+1,NULL,10);
+    p = strchr(p,'\r');
+    assert(p);
+    *str = p+2;
+    return p+2+(*len)+2;
+}
+
+/* Helper function for the redisAsyncCommand* family of functions. Writes a
+ * formatted command to the output buffer and registers the provided callback
+ * function with the context. */
+static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
+    redisContext *c = &(ac->c);
+    redisCallback cb;
+    int pvariant, hasnext;
+    const char *cstr, *astr;
+    size_t clen, alen;
+    const char *p;
+    sds sname;
+    int ret;
+
+    /* Don't accept new commands when the connection is about to be closed. */
+    if (c->flags & (REDIS_DISCONNECTING | REDIS_FREEING)) return REDIS_ERR;
+
+    /* Setup callback */
+    cb.fn = fn;
+    cb.privdata = privdata;
+
+    /* Find out which command will be appended. */
+    p = nextArgument(cmd,&cstr,&clen);
+    assert(p != NULL);
+    hasnext = (p[0] == '$');
+    pvariant = (tolower(cstr[0]) == 'p') ? 1 : 0;
+    cstr += pvariant;
+    clen -= pvariant;
+
+    if (hasnext && strncasecmp(cstr,"subscribe\r\n",11) == 0) {
+        c->flags |= REDIS_SUBSCRIBED;
+
+        /* Add every channel/pattern to the list of subscription callbacks. */
+        while ((p = nextArgument(p,&astr,&alen)) != NULL) {
+            sname = sdsnewlen(astr,alen);
+            if (pvariant)
+                ret = dictReplace(ac->sub.patterns,sname,&cb);
+            else
+                ret = dictReplace(ac->sub.channels,sname,&cb);
+
+            if (ret == 0) sdsfree(sname);
+        }
+    } else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) {
+        /* It is only useful to call (P)UNSUBSCRIBE when the context is
+         * subscribed to one or more channels or patterns. */
+        if (!(c->flags & REDIS_SUBSCRIBED)) return REDIS_ERR;
+
+        /* (P)UNSUBSCRIBE does not have its own response: every channel or
+         * pattern that is unsubscribed will receive a message. This means we
+         * should not append a callback function for this command. */
+     } else if(strncasecmp(cstr,"monitor\r\n",9) == 0) {
+         /* Set monitor flag and push callback */
+         c->flags |= REDIS_MONITORING;
+         __redisPushCallback(&ac->replies,&cb);
+    } else {
+        if (c->flags & REDIS_SUBSCRIBED)
+            /* This will likely result in an error reply, but it needs to be
+             * received and passed to the callback. */
+            __redisPushCallback(&ac->sub.invalid,&cb);
+        else
+            __redisPushCallback(&ac->replies,&cb);
+    }
+
+    __redisAppendCommand(c,cmd,len);
+
+    /* Always schedule a write when the write buffer is non-empty */
+    _EL_ADD_WRITE(ac);
+
+    return REDIS_OK;
+}
+
+int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap) {
+    char *cmd;
+    int len;
+    int status;
+    len = redisvFormatCommand(&cmd,format,ap);
+
+    /* We don't want to pass -1 or -2 to future functions as a length. */
+    if (len < 0)
+        return REDIS_ERR;
+
+    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
+    free(cmd);
+    return status;
+}
+
+int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...) {
+    va_list ap;
+    int status;
+    va_start(ap,format);
+    status = redisvAsyncCommand(ac,fn,privdata,format,ap);
+    va_end(ap);
+    return status;
+}
+
+int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) {
+    sds cmd;
+    int len;
+    int status;
+    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
+    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
+    sdsfree(cmd);
+    return status;
+}
+
+int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
+    int status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
+    return status;
+}
diff --git a/debian/modules/nchan/src/hiredis/async.h b/debian/modules/nchan/src/hiredis/async.h
new file mode 100644
index 0000000..59cbf46
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/async.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_ASYNC_H
+#define __HIREDIS_ASYNC_H
+#include "hiredis.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
+struct dict; /* dictionary header is included in async.c */
+
+/* Reply callback prototype and container */
+typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
+typedef struct redisCallback {
+    struct redisCallback *next; /* simple singly linked list */
+    redisCallbackFn *fn;
+    void *privdata;
+} redisCallback;
+
+/* List of callbacks for either regular replies or pub/sub */
+typedef struct redisCallbackList {
+    redisCallback *head, *tail;
+} redisCallbackList;
+
+/* Connection callback prototypes */
+typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
+typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
+
+/* Context for an async connection to Redis */
+typedef struct redisAsyncContext {
+    /* Hold the regular context, so it can be realloc'ed. */
+    redisContext c;
+
+    /* Setup error flags so they can be used directly. */
+    int err;
+    char *errstr;
+
+    /* Not used by hiredis */
+    void *data;
+
+    /* Event library data and hooks */
+    struct {
+        void *data;
+
+        /* Hooks that are called when the library expects to start
+         * reading/writing. These functions should be idempotent. */
+        void (*addRead)(void *privdata);
+        void (*delRead)(void *privdata);
+        void (*addWrite)(void *privdata);
+        void (*delWrite)(void *privdata);
+        void (*cleanup)(void *privdata);
+    } ev;
+
+    /* Called when either the connection is terminated due to an error or per
+     * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
+    redisDisconnectCallback *onDisconnect;
+
+    /* Called when the first write event was received. */
+    redisConnectCallback *onConnect;
+
+    /* Regular command callbacks */
+    redisCallbackList replies;
+
+    /* Subscription callbacks */
+    struct {
+        redisCallbackList invalid;
+        struct dict *channels;
+        struct dict *patterns;
+    } sub;
+} redisAsyncContext;
+
+/* Functions that proxy to hiredis */
+redisAsyncContext *redisAsyncConnect(const char *ip, int port);
+redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
+redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
+                                                  const char *source_addr);
+redisAsyncContext *redisAsyncConnectUnix(const char *path);
+int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
+int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
+void redisAsyncDisconnect(redisAsyncContext *ac);
+void redisAsyncFree(redisAsyncContext *ac);
+
+/* Handle read/write events */
+void redisAsyncHandleRead(redisAsyncContext *ac);
+void redisAsyncHandleWrite(redisAsyncContext *ac);
+
+/* Command functions for an async context. Write the command to the
+ * output buffer and register the provided callback. */
+int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
+int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
+int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
+int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/debian/modules/nchan/src/hiredis/dict.c b/debian/modules/nchan/src/hiredis/dict.c
new file mode 100644
index 0000000..e17a625
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/dict.c
@@ -0,0 +1,338 @@
+/* Hash table implementation.
+ *
+ * This file implements in memory hash tables with insert/del/replace/find/
+ * get-random-element operations. Hash tables will auto resize if needed
+ * tables of power of two in size are used, collisions are handled by
+ * chaining. See the source code for more information... :)
+ *
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <stdlib.h>
+#include <assert.h>
+#include <limits.h>
+#include "dict.h"
+
+/* -------------------------- private prototypes ---------------------------- */
+
+static int _dictExpandIfNeeded(dict *ht);
+static unsigned long _dictNextPower(unsigned long size);
+static int _dictKeyIndex(dict *ht, const void *key);
+static int _dictInit(dict *ht, dictType *type, void *privDataPtr);
+
+/* -------------------------- hash functions -------------------------------- */
+
+/* Generic hash function (a popular one from Bernstein).
+ * I tested a few and this was the best. */
+static unsigned int dictGenHashFunction(const unsigned char *buf, int len) {
+    unsigned int hash = 5381;
+
+    while (len--)
+        hash = ((hash << 5) + hash) + (*buf++); /* hash * 33 + c */
+    return hash;
+}
+
+/* ----------------------------- API implementation ------------------------- */
+
+/* Reset an hashtable already initialized with ht_init().
+ * NOTE: This function should only called by ht_destroy(). */
+static void _dictReset(dict *ht) {
+    ht->table = NULL;
+    ht->size = 0;
+    ht->sizemask = 0;
+    ht->used = 0;
+}
+
+/* Create a new hash table */
+static dict *dictCreate(dictType *type, void *privDataPtr) {
+    dict *ht = malloc(sizeof(*ht));
+    _dictInit(ht,type,privDataPtr);
+    return ht;
+}
+
+/* Initialize the hash table */
+static int _dictInit(dict *ht, dictType *type, void *privDataPtr) {
+    _dictReset(ht);
+    ht->type = type;
+    ht->privdata = privDataPtr;
+    return DICT_OK;
+}
+
+/* Expand or create the hashtable */
+static int dictExpand(dict *ht, unsigned long size) {
+    dict n; /* the new hashtable */
+    unsigned long realsize = _dictNextPower(size), i;
+
+    /* the size is invalid if it is smaller than the number of
+     * elements already inside the hashtable */
+    if (ht->used > size)
+        return DICT_ERR;
+
+    _dictInit(&n, ht->type, ht->privdata);
+    n.size = realsize;
+    n.sizemask = realsize-1;
+    n.table = calloc(realsize,sizeof(dictEntry*));
+
+    /* Copy all the elements from the old to the new table:
+     * note that if the old hash table is empty ht->size is zero,
+     * so dictExpand just creates an hash table. */
+    n.used = ht->used;
+    for (i = 0; i < ht->size && ht->used > 0; i++) {
+        dictEntry *he, *nextHe;
+
+        if (ht->table[i] == NULL) continue;
+
+        /* For each hash entry on this slot... */
+        he = ht->table[i];
+        while(he) {
+            unsigned int h;
+
+            nextHe = he->next;
+            /* Get the new element index */
+            h = dictHashKey(ht, he->key) & n.sizemask;
+            he->next = n.table[h];
+            n.table[h] = he;
+            ht->used--;
+            /* Pass to the next element */
+            he = nextHe;
+        }
+    }
+    assert(ht->used == 0);
+    free(ht->table);
+
+    /* Remap the new hashtable in the old */
+    *ht = n;
+    return DICT_OK;
+}
+
+/* Add an element to the target hash table */
+static int dictAdd(dict *ht, void *key, void *val) {
+    int index;
+    dictEntry *entry;
+
+    /* Get the index of the new element, or -1 if
+     * the element already exists. */
+    if ((index = _dictKeyIndex(ht, key)) == -1)
+        return DICT_ERR;
+
+    /* Allocates the memory and stores key */
+    entry = malloc(sizeof(*entry));
+    entry->next = ht->table[index];
+    ht->table[index] = entry;
+
+    /* Set the hash entry fields. */
+    dictSetHashKey(ht, entry, key);
+    dictSetHashVal(ht, entry, val);
+    ht->used++;
+    return DICT_OK;
+}
+
+/* Add an element, discarding the old if the key already exists.
+ * Return 1 if the key was added from scratch, 0 if there was already an
+ * element with such key and dictReplace() just performed a value update
+ * operation. */
+static int dictReplace(dict *ht, void *key, void *val) {
+    dictEntry *entry, auxentry;
+
+    /* Try to add the element. If the key
+     * does not exists dictAdd will succeed. */
+    if (dictAdd(ht, key, val) == DICT_OK)
+        return 1;
+    /* It already exists, get the entry */
+    entry = dictFind(ht, key);
+    /* Free the old value and set the new one */
+    /* Set the new value and free the old one. Note that it is important
+     * to do that in this order, as the value may just be exactly the same
+     * as the previous one. In this context, think to reference counting,
+     * you want to increment (set), and then decrement (free), and not the
+     * reverse. */
+    auxentry = *entry;
+    dictSetHashVal(ht, entry, val);
+    dictFreeEntryVal(ht, &auxentry);
+    return 0;
+}
+
+/* Search and remove an element */
+static int dictDelete(dict *ht, const void *key) {
+    unsigned int h;
+    dictEntry *de, *prevde;
+
+    if (ht->size == 0)
+        return DICT_ERR;
+    h = dictHashKey(ht, key) & ht->sizemask;
+    de = ht->table[h];
+
+    prevde = NULL;
+    while(de) {
+        if (dictCompareHashKeys(ht,key,de->key)) {
+            /* Unlink the element from the list */
+            if (prevde)
+                prevde->next = de->next;
+            else
+                ht->table[h] = de->next;
+
+            dictFreeEntryKey(ht,de);
+            dictFreeEntryVal(ht,de);
+            free(de);
+            ht->used--;
+            return DICT_OK;
+        }
+        prevde = de;
+        de = de->next;
+    }
+    return DICT_ERR; /* not found */
+}
+
+/* Destroy an entire hash table */
+static int _dictClear(dict *ht) {
+    unsigned long i;
+
+    /* Free all the elements */
+    for (i = 0; i < ht->size && ht->used > 0; i++) {
+        dictEntry *he, *nextHe;
+
+        if ((he = ht->table[i]) == NULL) continue;
+        while(he) {
+            nextHe = he->next;
+            dictFreeEntryKey(ht, he);
+            dictFreeEntryVal(ht, he);
+            free(he);
+            ht->used--;
+            he = nextHe;
+        }
+    }
+    /* Free the table and the allocated cache structure */
+    free(ht->table);
+    /* Re-initialize the table */
+    _dictReset(ht);
+    return DICT_OK; /* never fails */
+}
+
+/* Clear & Release the hash table */
+static void dictRelease(dict *ht) {
+    _dictClear(ht);
+    free(ht);
+}
+
+static dictEntry *dictFind(dict *ht, const void *key) {
+    dictEntry *he;
+    unsigned int h;
+
+    if (ht->size == 0) return NULL;
+    h = dictHashKey(ht, key) & ht->sizemask;
+    he = ht->table[h];
+    while(he) {
+        if (dictCompareHashKeys(ht, key, he->key))
+            return he;
+        he = he->next;
+    }
+    return NULL;
+}
+
+static dictIterator *dictGetIterator(dict *ht) {
+    dictIterator *iter = malloc(sizeof(*iter));
+
+    iter->ht = ht;
+    iter->index = -1;
+    iter->entry = NULL;
+    iter->nextEntry = NULL;
+    return iter;
+}
+
+static dictEntry *dictNext(dictIterator *iter) {
+    while (1) {
+        if (iter->entry == NULL) {
+            iter->index++;
+            if (iter->index >=
+                    (signed)iter->ht->size) break;
+            iter->entry = iter->ht->table[iter->index];
+        } else {
+            iter->entry = iter->nextEntry;
+        }
+        if (iter->entry) {
+            /* We need to save the 'next' here, the iterator user
+             * may delete the entry we are returning. */
+            iter->nextEntry = iter->entry->next;
+            return iter->entry;
+        }
+    }
+    return NULL;
+}
+
+static void dictReleaseIterator(dictIterator *iter) {
+    free(iter);
+}
+
+/* ------------------------- private functions ------------------------------ */
+
+/* Expand the hash table if needed */
+static int _dictExpandIfNeeded(dict *ht) {
+    /* If the hash table is empty expand it to the initial size,
+     * if the table is "full" dobule its size. */
+    if (ht->size == 0)
+        return dictExpand(ht, DICT_HT_INITIAL_SIZE);
+    if (ht->used == ht->size)
+        return dictExpand(ht, ht->size*2);
+    return DICT_OK;
+}
+
+/* Our hash table capability is a power of two */
+static unsigned long _dictNextPower(unsigned long size) {
+    unsigned long i = DICT_HT_INITIAL_SIZE;
+
+    if (size >= LONG_MAX) return LONG_MAX;
+    while(1) {
+        if (i >= size)
+            return i;
+        i *= 2;
+    }
+}
+
+/* Returns the index of a free slot that can be populated with
+ * an hash entry for the given 'key'.
+ * If the key already exists, -1 is returned. */
+static int _dictKeyIndex(dict *ht, const void *key) {
+    unsigned int h;
+    dictEntry *he;
+
+    /* Expand the hashtable if needed */
+    if (_dictExpandIfNeeded(ht) == DICT_ERR)
+        return -1;
+    /* Compute the key hash value */
+    h = dictHashKey(ht, key) & ht->sizemask;
+    /* Search if this slot does not already contain the given key */
+    he = ht->table[h];
+    while(he) {
+        if (dictCompareHashKeys(ht, key, he->key))
+            return -1;
+        he = he->next;
+    }
+    return h;
+}
+
diff --git a/debian/modules/nchan/src/hiredis/dict.h b/debian/modules/nchan/src/hiredis/dict.h
new file mode 100644
index 0000000..95fcd28
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/dict.h
@@ -0,0 +1,126 @@
+/* Hash table implementation.
+ *
+ * This file implements in memory hash tables with insert/del/replace/find/
+ * get-random-element operations. Hash tables will auto resize if needed
+ * tables of power of two in size are used, collisions are handled by
+ * chaining. See the source code for more information... :)
+ *
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __DICT_H
+#define __DICT_H
+
+#define DICT_OK 0
+#define DICT_ERR 1
+
+/* Unused arguments generate annoying warnings... */
+#define DICT_NOTUSED(V) ((void) V)
+
+typedef struct dictEntry {
+    void *key;
+    void *val;
+    struct dictEntry *next;
+} dictEntry;
+
+typedef struct dictType {
+    unsigned int (*hashFunction)(const void *key);
+    void *(*keyDup)(void *privdata, const void *key);
+    void *(*valDup)(void *privdata, const void *obj);
+    int (*keyCompare)(void *privdata, const void *key1, const void *key2);
+    void (*keyDestructor)(void *privdata, void *key);
+    void (*valDestructor)(void *privdata, void *obj);
+} dictType;
+
+typedef struct dict {
+    dictEntry **table;
+    dictType *type;
+    unsigned long size;
+    unsigned long sizemask;
+    unsigned long used;
+    void *privdata;
+} dict;
+
+typedef struct dictIterator {
+    dict *ht;
+    int index;
+    dictEntry *entry, *nextEntry;
+} dictIterator;
+
+/* This is the initial size of every hash table */
+#define DICT_HT_INITIAL_SIZE     4
+
+/* ------------------------------- Macros ------------------------------------*/
+#define dictFreeEntryVal(ht, entry) \
+    if ((ht)->type->valDestructor) \
+        (ht)->type->valDestructor((ht)->privdata, (entry)->val)
+
+#define dictSetHashVal(ht, entry, _val_) do { \
+    if ((ht)->type->valDup) \
+        entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
+    else \
+        entry->val = (_val_); \
+} while(0)
+
+#define dictFreeEntryKey(ht, entry) \
+    if ((ht)->type->keyDestructor) \
+        (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
+
+#define dictSetHashKey(ht, entry, _key_) do { \
+    if ((ht)->type->keyDup) \
+        entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
+    else \
+        entry->key = (_key_); \
+} while(0)
+
+#define dictCompareHashKeys(ht, key1, key2) \
+    (((ht)->type->keyCompare) ? \
+        (ht)->type->keyCompare((ht)->privdata, key1, key2) : \
+        (key1) == (key2))
+
+#define dictHashKey(ht, key) (ht)->type->hashFunction(key)
+
+#define dictGetEntryKey(he) ((he)->key)
+#define dictGetEntryVal(he) ((he)->val)
+#define dictSlots(ht) ((ht)->size)
+#define dictSize(ht) ((ht)->used)
+
+/* API */
+static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
+static dict *dictCreate(dictType *type, void *privDataPtr);
+static int dictExpand(dict *ht, unsigned long size);
+static int dictAdd(dict *ht, void *key, void *val);
+static int dictReplace(dict *ht, void *key, void *val);
+static int dictDelete(dict *ht, const void *key);
+static void dictRelease(dict *ht);
+static dictEntry * dictFind(dict *ht, const void *key);
+static dictIterator *dictGetIterator(dict *ht);
+static dictEntry *dictNext(dictIterator *iter);
+static void dictReleaseIterator(dictIterator *iter);
+
+#endif /* __DICT_H */
diff --git a/debian/modules/nchan/src/hiredis/examples/example-ae.c b/debian/modules/nchan/src/hiredis/examples/example-ae.c
new file mode 100644
index 0000000..8efa730
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/examples/example-ae.c
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include <hiredis.h>
+#include <async.h>
+#include <adapters/ae.h>
+
+/* Put event loop in the global scope, so it can be explicitly stopped */
+static aeEventLoop *loop;
+
+void getCallback(redisAsyncContext *c, void *r, void *privdata) {
+    redisReply *reply = r;
+    if (reply == NULL) return;
+    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
+
+    /* Disconnect after receiving the reply to GET */
+    redisAsyncDisconnect(c);
+}
+
+void connectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        aeStop(loop);
+        return;
+    }
+
+    printf("Connected...\n");
+}
+
+void disconnectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        aeStop(loop);
+        return;
+    }
+
+    printf("Disconnected...\n");
+    aeStop(loop);
+}
+
+int main (int argc, char **argv) {
+    signal(SIGPIPE, SIG_IGN);
+
+    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+    if (c->err) {
+        /* Let *c leak for now... */
+        printf("Error: %s\n", c->errstr);
+        return 1;
+    }
+
+    loop = aeCreateEventLoop(64);
+    redisAeAttach(loop, c);
+    redisAsyncSetConnectCallback(c,connectCallback);
+    redisAsyncSetDisconnectCallback(c,disconnectCallback);
+    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
+    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
+    aeMain(loop);
+    return 0;
+}
+
diff --git a/debian/modules/nchan/src/hiredis/examples/example-libev.c b/debian/modules/nchan/src/hiredis/examples/example-libev.c
new file mode 100644
index 0000000..cc8b166
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/examples/example-libev.c
@@ -0,0 +1,52 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include <hiredis.h>
+#include <async.h>
+#include <adapters/libev.h>
+
+void getCallback(redisAsyncContext *c, void *r, void *privdata) {
+    redisReply *reply = r;
+    if (reply == NULL) return;
+    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
+
+    /* Disconnect after receiving the reply to GET */
+    redisAsyncDisconnect(c);
+}
+
+void connectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Connected...\n");
+}
+
+void disconnectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Disconnected...\n");
+}
+
+int main (int argc, char **argv) {
+    signal(SIGPIPE, SIG_IGN);
+
+    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+    if (c->err) {
+        /* Let *c leak for now... */
+        printf("Error: %s\n", c->errstr);
+        return 1;
+    }
+
+    redisLibevAttach(EV_DEFAULT_ c);
+    redisAsyncSetConnectCallback(c,connectCallback);
+    redisAsyncSetDisconnectCallback(c,disconnectCallback);
+    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
+    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
+    ev_loop(EV_DEFAULT_ 0);
+    return 0;
+}
diff --git a/debian/modules/nchan/src/hiredis/examples/example-libevent.c b/debian/modules/nchan/src/hiredis/examples/example-libevent.c
new file mode 100644
index 0000000..d333c22
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/examples/example-libevent.c
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include <hiredis.h>
+#include <async.h>
+#include <adapters/libevent.h>
+
+void getCallback(redisAsyncContext *c, void *r, void *privdata) {
+    redisReply *reply = r;
+    if (reply == NULL) return;
+    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
+
+    /* Disconnect after receiving the reply to GET */
+    redisAsyncDisconnect(c);
+}
+
+void connectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Connected...\n");
+}
+
+void disconnectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Disconnected...\n");
+}
+
+int main (int argc, char **argv) {
+    signal(SIGPIPE, SIG_IGN);
+    struct event_base *base = event_base_new();
+
+    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+    if (c->err) {
+        /* Let *c leak for now... */
+        printf("Error: %s\n", c->errstr);
+        return 1;
+    }
+
+    redisLibeventAttach(c,base);
+    redisAsyncSetConnectCallback(c,connectCallback);
+    redisAsyncSetDisconnectCallback(c,disconnectCallback);
+    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
+    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
+    event_base_dispatch(base);
+    return 0;
+}
diff --git a/debian/modules/nchan/src/hiredis/examples/example-libuv.c b/debian/modules/nchan/src/hiredis/examples/example-libuv.c
new file mode 100644
index 0000000..a5462d4
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/examples/example-libuv.c
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include <hiredis.h>
+#include <async.h>
+#include <adapters/libuv.h>
+
+void getCallback(redisAsyncContext *c, void *r, void *privdata) {
+    redisReply *reply = r;
+    if (reply == NULL) return;
+    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
+
+    /* Disconnect after receiving the reply to GET */
+    redisAsyncDisconnect(c);
+}
+
+void connectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Connected...\n");
+}
+
+void disconnectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Disconnected...\n");
+}
+
+int main (int argc, char **argv) {
+    signal(SIGPIPE, SIG_IGN);
+    uv_loop_t* loop = uv_default_loop();
+
+    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+    if (c->err) {
+        /* Let *c leak for now... */
+        printf("Error: %s\n", c->errstr);
+        return 1;
+    }
+
+    redisLibuvAttach(c,loop);
+    redisAsyncSetConnectCallback(c,connectCallback);
+    redisAsyncSetDisconnectCallback(c,disconnectCallback);
+    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
+    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
+    uv_run(loop, UV_RUN_DEFAULT);
+    return 0;
+}
diff --git a/debian/modules/nchan/src/hiredis/examples/example.c b/debian/modules/nchan/src/hiredis/examples/example.c
new file mode 100644
index 0000000..4d494c5
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/examples/example.c
@@ -0,0 +1,78 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <hiredis.h>
+
+int main(int argc, char **argv) {
+    unsigned int j;
+    redisContext *c;
+    redisReply *reply;
+    const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1";
+    int port = (argc > 2) ? atoi(argv[2]) : 6379;
+
+    struct timeval timeout = { 1, 500000 }; // 1.5 seconds
+    c = redisConnectWithTimeout(hostname, port, timeout);
+    if (c == NULL || c->err) {
+        if (c) {
+            printf("Connection error: %s\n", c->errstr);
+            redisFree(c);
+        } else {
+            printf("Connection error: can't allocate redis context\n");
+        }
+        exit(1);
+    }
+
+    /* PING server */
+    reply = redisCommand(c,"PING");
+    printf("PING: %s\n", reply->str);
+    freeReplyObject(reply);
+
+    /* Set a key */
+    reply = redisCommand(c,"SET %s %s", "foo", "hello world");
+    printf("SET: %s\n", reply->str);
+    freeReplyObject(reply);
+
+    /* Set a key using binary safe API */
+    reply = redisCommand(c,"SET %b %b", "bar", (size_t) 3, "hello", (size_t) 5);
+    printf("SET (binary API): %s\n", reply->str);
+    freeReplyObject(reply);
+
+    /* Try a GET and two INCR */
+    reply = redisCommand(c,"GET foo");
+    printf("GET foo: %s\n", reply->str);
+    freeReplyObject(reply);
+
+    reply = redisCommand(c,"INCR counter");
+    printf("INCR counter: %lld\n", reply->integer);
+    freeReplyObject(reply);
+    /* again ... */
+    reply = redisCommand(c,"INCR counter");
+    printf("INCR counter: %lld\n", reply->integer);
+    freeReplyObject(reply);
+
+    /* Create a list of numbers, from 0 to 9 */
+    reply = redisCommand(c,"DEL mylist");
+    freeReplyObject(reply);
+    for (j = 0; j < 10; j++) {
+        char buf[64];
+
+        snprintf(buf,64,"%u",j);
+        reply = redisCommand(c,"LPUSH mylist element-%s", buf);
+        freeReplyObject(reply);
+    }
+
+    /* Let's check what we have inside the list */
+    reply = redisCommand(c,"LRANGE mylist 0 -1");
+    if (reply->type == REDIS_REPLY_ARRAY) {
+        for (j = 0; j < reply->elements; j++) {
+            printf("%u) %s\n", j, reply->element[j]->str);
+        }
+    }
+    freeReplyObject(reply);
+
+    /* Disconnects and frees the context */
+    redisFree(c);
+
+    return 0;
+}
diff --git a/debian/modules/nchan/src/hiredis/fmacros.h b/debian/modules/nchan/src/hiredis/fmacros.h
new file mode 100644
index 0000000..19d7b21
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/fmacros.h
@@ -0,0 +1,21 @@
+#ifndef __HIREDIS_FMACRO_H
+#define __HIREDIS_FMACRO_H
+
+#if defined(__linux__)
+#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
+#endif
+
+#if defined(__sun__)
+#define _POSIX_C_SOURCE 200112L
+#elif defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#define _XOPEN_SOURCE 600
+#else
+#define _XOPEN_SOURCE
+#endif
+
+#if __APPLE__ && __MACH__
+#define _OSX
+#endif
+
+#endif
diff --git a/debian/modules/nchan/src/hiredis/hiredis.c b/debian/modules/nchan/src/hiredis/hiredis.c
new file mode 100644
index 0000000..2b876d9
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/hiredis.c
@@ -0,0 +1,1021 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <assert.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "hiredis.h"
+#include "net.h"
+#include "sds.h"
+
+static redisReply *createReplyObject(int type);
+static void *createStringObject(const redisReadTask *task, char *str, size_t len);
+static void *createArrayObject(const redisReadTask *task, int elements);
+static void *createIntegerObject(const redisReadTask *task, long long value);
+static void *createNilObject(const redisReadTask *task);
+
+/* Default set of functions to build the reply. Keep in mind that such a
+ * function returning NULL is interpreted as OOM. */
+static redisReplyObjectFunctions defaultFunctions = {
+    createStringObject,
+    createArrayObject,
+    createIntegerObject,
+    createNilObject,
+    freeReplyObject
+};
+
+/* Create a reply object */
+static redisReply *createReplyObject(int type) {
+    redisReply *r = calloc(1,sizeof(*r));
+
+    if (r == NULL)
+        return NULL;
+
+    r->type = type;
+    return r;
+}
+
+/* Free a reply object */
+void freeReplyObject(void *reply) {
+    redisReply *r = reply;
+    size_t j;
+
+    if (r == NULL)
+        return;
+
+    switch(r->type) {
+    case REDIS_REPLY_INTEGER:
+        break; /* Nothing to free */
+    case REDIS_REPLY_ARRAY:
+        if (r->element != NULL) {
+            for (j = 0; j < r->elements; j++)
+                if (r->element[j] != NULL)
+                    freeReplyObject(r->element[j]);
+            free(r->element);
+        }
+        break;
+    case REDIS_REPLY_ERROR:
+    case REDIS_REPLY_STATUS:
+    case REDIS_REPLY_STRING:
+        if (r->str != NULL)
+            free(r->str);
+        break;
+    }
+    free(r);
+}
+
+static void *createStringObject(const redisReadTask *task, char *str, size_t len) {
+    redisReply *r, *parent;
+    char *buf;
+
+    r = createReplyObject(task->type);
+    if (r == NULL)
+        return NULL;
+
+    buf = malloc(len+1);
+    if (buf == NULL) {
+        freeReplyObject(r);
+        return NULL;
+    }
+
+    assert(task->type == REDIS_REPLY_ERROR  ||
+           task->type == REDIS_REPLY_STATUS ||
+           task->type == REDIS_REPLY_STRING);
+
+    /* Copy string value */
+    memcpy(buf,str,len);
+    buf[len] = '\0';
+    r->str = buf;
+    r->len = len;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createArrayObject(const redisReadTask *task, int elements) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_ARRAY);
+    if (r == NULL)
+        return NULL;
+
+    if (elements > 0) {
+        r->element = calloc(elements,sizeof(redisReply*));
+        if (r->element == NULL) {
+            freeReplyObject(r);
+            return NULL;
+        }
+    }
+
+    r->elements = elements;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createIntegerObject(const redisReadTask *task, long long value) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_INTEGER);
+    if (r == NULL)
+        return NULL;
+
+    r->integer = value;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createNilObject(const redisReadTask *task) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_NIL);
+    if (r == NULL)
+        return NULL;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+/* Return the number of digits of 'v' when converted to string in radix 10.
+ * Implementation borrowed from link in redis/src/util.c:string2ll(). */
+static uint32_t countDigits(uint64_t v) {
+  uint32_t result = 1;
+  for (;;) {
+    if (v < 10) return result;
+    if (v < 100) return result + 1;
+    if (v < 1000) return result + 2;
+    if (v < 10000) return result + 3;
+    v /= 10000U;
+    result += 4;
+  }
+}
+
+/* Helper that calculates the bulk length given a certain string length. */
+static size_t bulklen(size_t len) {
+    return 1+countDigits(len)+2+len+2;
+}
+
+int redisvFormatCommand(char **target, const char *format, va_list ap) {
+    const char *c = format;
+    char *cmd = NULL; /* final command */
+    int pos; /* position in final command */
+    sds curarg, newarg; /* current argument */
+    int touched = 0; /* was the current argument touched? */
+    char **curargv = NULL, **newargv = NULL;
+    int argc = 0;
+    int totlen = 0;
+    int error_type = 0; /* 0 = no error; -1 = memory error; -2 = format error */
+    int j;
+
+    /* Abort if there is not target to set */
+    if (target == NULL)
+        return -1;
+
+    /* Build the command string accordingly to protocol */
+    curarg = sdsempty();
+    if (curarg == NULL)
+        return -1;
+
+    while(*c != '\0') {
+        if (*c != '%' || c[1] == '\0') {
+            if (*c == ' ') {
+                if (touched) {
+                    newargv = realloc(curargv,sizeof(char*)*(argc+1));
+                    if (newargv == NULL) goto memory_err;
+                    curargv = newargv;
+                    curargv[argc++] = curarg;
+                    totlen += bulklen(sdslen(curarg));
+
+                    /* curarg is put in argv so it can be overwritten. */
+                    curarg = sdsempty();
+                    if (curarg == NULL) goto memory_err;
+                    touched = 0;
+                }
+            } else {
+                newarg = sdscatlen(curarg,c,1);
+                if (newarg == NULL) goto memory_err;
+                curarg = newarg;
+                touched = 1;
+            }
+        } else {
+            char *arg;
+            size_t size;
+
+            /* Set newarg so it can be checked even if it is not touched. */
+            newarg = curarg;
+
+            switch(c[1]) {
+            case 's':
+                arg = va_arg(ap,char*);
+                size = strlen(arg);
+                if (size > 0)
+                    newarg = sdscatlen(curarg,arg,size);
+                break;
+            case 'b':
+                arg = va_arg(ap,char*);
+                size = va_arg(ap,size_t);
+                if (size > 0)
+                    newarg = sdscatlen(curarg,arg,size);
+                break;
+            case '%':
+                newarg = sdscat(curarg,"%");
+                break;
+            default:
+                /* Try to detect printf format */
+                {
+                    static const char intfmts[] = "diouxX";
+                    static const char flags[] = "#0-+ ";
+                    char _format[16];
+                    const char *_p = c+1;
+                    size_t _l = 0;
+                    va_list _cpy;
+
+                    /* Flags */
+                    while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++;
+
+                    /* Field width */
+                    while (*_p != '\0' && isdigit(*_p)) _p++;
+
+                    /* Precision */
+                    if (*_p == '.') {
+                        _p++;
+                        while (*_p != '\0' && isdigit(*_p)) _p++;
+                    }
+
+                    /* Copy va_list before consuming with va_arg */
+                    va_copy(_cpy,ap);
+
+                    /* Integer conversion (without modifiers) */
+                    if (strchr(intfmts,*_p) != NULL) {
+                        va_arg(ap,int);
+                        goto fmt_valid;
+                    }
+
+                    /* Double conversion (without modifiers) */
+                    if (strchr("eEfFgGaA",*_p) != NULL) {
+                        va_arg(ap,double);
+                        goto fmt_valid;
+                    }
+
+                    /* Size: char */
+                    if (_p[0] == 'h' && _p[1] == 'h') {
+                        _p += 2;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,int); /* char gets promoted to int */
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                    /* Size: short */
+                    if (_p[0] == 'h') {
+                        _p += 1;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,int); /* short gets promoted to int */
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                    /* Size: long long */
+                    if (_p[0] == 'l' && _p[1] == 'l') {
+                        _p += 2;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,long long);
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                    /* Size: long */
+                    if (_p[0] == 'l') {
+                        _p += 1;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,long);
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                fmt_invalid:
+                    va_end(_cpy);
+                    goto format_err;
+
+                fmt_valid:
+                    _l = (_p+1)-c;
+                    if (_l < sizeof(_format)-2) {
+                        memcpy(_format,c,_l);
+                        _format[_l] = '\0';
+                        newarg = sdscatvprintf(curarg,_format,_cpy);
+
+                        /* Update current position (note: outer blocks
+                         * increment c twice so compensate here) */
+                        c = _p-1;
+                    }
+
+                    va_end(_cpy);
+                    break;
+                }
+            }
+
+            if (newarg == NULL) goto memory_err;
+            curarg = newarg;
+
+            touched = 1;
+            c++;
+        }
+        c++;
+    }
+
+    /* Add the last argument if needed */
+    if (touched) {
+        newargv = realloc(curargv,sizeof(char*)*(argc+1));
+        if (newargv == NULL) goto memory_err;
+        curargv = newargv;
+        curargv[argc++] = curarg;
+        totlen += bulklen(sdslen(curarg));
+    } else {
+        sdsfree(curarg);
+    }
+
+    /* Clear curarg because it was put in curargv or was free'd. */
+    curarg = NULL;
+
+    /* Add bytes needed to hold multi bulk count */
+    totlen += 1+countDigits(argc)+2;
+
+    /* Build the command at protocol level */
+    cmd = malloc(totlen+1);
+    if (cmd == NULL) goto memory_err;
+
+    pos = sprintf(cmd,"*%d\r\n",argc);
+    for (j = 0; j < argc; j++) {
+        pos += sprintf(cmd+pos,"$%zu\r\n",sdslen(curargv[j]));
+        memcpy(cmd+pos,curargv[j],sdslen(curargv[j]));
+        pos += sdslen(curargv[j]);
+        sdsfree(curargv[j]);
+        cmd[pos++] = '\r';
+        cmd[pos++] = '\n';
+    }
+    assert(pos == totlen);
+    cmd[pos] = '\0';
+
+    free(curargv);
+    *target = cmd;
+    return totlen;
+
+format_err:
+    error_type = -2;
+    goto cleanup;
+
+memory_err:
+    error_type = -1;
+    goto cleanup;
+
+cleanup:
+    if (curargv) {
+        while(argc--)
+            sdsfree(curargv[argc]);
+        free(curargv);
+    }
+
+    sdsfree(curarg);
+
+    /* No need to check cmd since it is the last statement that can fail,
+     * but do it anyway to be as defensive as possible. */
+    if (cmd != NULL)
+        free(cmd);
+
+    return error_type;
+}
+
+/* Format a command according to the Redis protocol. This function
+ * takes a format similar to printf:
+ *
+ * %s represents a C null terminated string you want to interpolate
+ * %b represents a binary safe string
+ *
+ * When using %b you need to provide both the pointer to the string
+ * and the length in bytes as a size_t. Examples:
+ *
+ * len = redisFormatCommand(target, "GET %s", mykey);
+ * len = redisFormatCommand(target, "SET %s %b", mykey, myval, myvallen);
+ */
+int redisFormatCommand(char **target, const char *format, ...) {
+    va_list ap;
+    int len;
+    va_start(ap,format);
+    len = redisvFormatCommand(target,format,ap);
+    va_end(ap);
+
+    /* The API says "-1" means bad result, but we now also return "-2" in some
+     * cases.  Force the return value to always be -1. */
+    if (len < 0)
+        len = -1;
+
+    return len;
+}
+
+/* Format a command according to the Redis protocol using an sds string and
+ * sdscatfmt for the processing of arguments. This function takes the
+ * number of arguments, an array with arguments and an array with their
+ * lengths. If the latter is set to NULL, strlen will be used to compute the
+ * argument lengths.
+ */
+int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
+                              const size_t *argvlen)
+{
+    sds cmd;
+    unsigned long long totlen;
+    int j;
+    size_t len;
+
+    /* Abort on a NULL target */
+    if (target == NULL)
+        return -1;
+
+    /* Calculate our total size */
+    totlen = 1+countDigits(argc)+2;
+    for (j = 0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        totlen += bulklen(len);
+    }
+
+    /* Use an SDS string for command construction */
+    cmd = sdsempty();
+    if (cmd == NULL)
+        return -1;
+
+    /* We already know how much storage we need */
+    cmd = sdsMakeRoomFor(cmd, totlen);
+    if (cmd == NULL)
+        return -1;
+
+    /* Construct command */
+    cmd = sdscatfmt(cmd, "*%i\r\n", argc);
+    for (j=0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        cmd = sdscatfmt(cmd, "$%T\r\n", len);
+        cmd = sdscatlen(cmd, argv[j], len);
+        cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
+    }
+
+    assert(sdslen(cmd)==totlen);
+
+    *target = cmd;
+    return totlen;
+}
+
+void redisFreeSdsCommand(sds cmd) {
+    sdsfree(cmd);
+}
+
+/* Format a command according to the Redis protocol. This function takes the
+ * number of arguments, an array with arguments and an array with their
+ * lengths. If the latter is set to NULL, strlen will be used to compute the
+ * argument lengths.
+ */
+int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen) {
+    char *cmd = NULL; /* final command */
+    int pos; /* position in final command */
+    size_t len;
+    int totlen, j;
+
+    /* Abort on a NULL target */
+    if (target == NULL)
+        return -1;
+
+    /* Calculate number of bytes needed for the command */
+    totlen = 1+countDigits(argc)+2;
+    for (j = 0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        totlen += bulklen(len);
+    }
+
+    /* Build the command at protocol level */
+    cmd = malloc(totlen+1);
+    if (cmd == NULL)
+        return -1;
+
+    pos = sprintf(cmd,"*%d\r\n",argc);
+    for (j = 0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        pos += sprintf(cmd+pos,"$%zu\r\n",len);
+        memcpy(cmd+pos,argv[j],len);
+        pos += len;
+        cmd[pos++] = '\r';
+        cmd[pos++] = '\n';
+    }
+    assert(pos == totlen);
+    cmd[pos] = '\0';
+
+    *target = cmd;
+    return totlen;
+}
+
+void redisFreeCommand(char *cmd) {
+    free(cmd);
+}
+
+void __redisSetError(redisContext *c, int type, const char *str) {
+    size_t len;
+
+    c->err = type;
+    if (str != NULL) {
+        len = strlen(str);
+        len = len < (sizeof(c->errstr)-1) ? len : (sizeof(c->errstr)-1);
+        memcpy(c->errstr,str,len);
+        c->errstr[len] = '\0';
+    } else {
+        /* Only REDIS_ERR_IO may lack a description! */
+        assert(type == REDIS_ERR_IO);
+        __redis_strerror_r(errno, c->errstr, sizeof(c->errstr));
+    }
+}
+
+redisReader *redisReaderCreate(void) {
+    return redisReaderCreateWithFunctions(&defaultFunctions);
+}
+
+static redisContext *redisContextInit(void) {
+    redisContext *c;
+
+    c = calloc(1,sizeof(redisContext));
+    if (c == NULL)
+        return NULL;
+
+    c->err = 0;
+    c->errstr[0] = '\0';
+    c->obuf = sdsempty();
+    c->reader = redisReaderCreate();
+    c->tcp.host = NULL;
+    c->tcp.source_addr = NULL;
+    c->unix_sock.path = NULL;
+    c->timeout = NULL;
+
+    if (c->obuf == NULL || c->reader == NULL) {
+        redisFree(c);
+        return NULL;
+    }
+
+    return c;
+}
+
+void redisFree(redisContext *c) {
+    if (c == NULL)
+        return;
+    if (c->fd > 0)
+        close(c->fd);
+    if (c->obuf != NULL)
+        sdsfree(c->obuf);
+    if (c->reader != NULL)
+        redisReaderFree(c->reader);
+    if (c->tcp.host)
+        free(c->tcp.host);
+    if (c->tcp.source_addr)
+        free(c->tcp.source_addr);
+    if (c->unix_sock.path)
+        free(c->unix_sock.path);
+    if (c->timeout)
+        free(c->timeout);
+    free(c);
+}
+
+int redisFreeKeepFd(redisContext *c) {
+    int fd = c->fd;
+    c->fd = -1;
+    redisFree(c);
+    return fd;
+}
+
+int redisReconnect(redisContext *c) {
+    c->err = 0;
+    memset(c->errstr, '\0', strlen(c->errstr));
+
+    if (c->fd > 0) {
+        close(c->fd);
+    }
+
+    sdsfree(c->obuf);
+    redisReaderFree(c->reader);
+
+    c->obuf = sdsempty();
+    c->reader = redisReaderCreate();
+
+    if (c->connection_type == REDIS_CONN_TCP) {
+        return redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
+                c->timeout, c->tcp.source_addr);
+    } else if (c->connection_type == REDIS_CONN_UNIX) {
+        return redisContextConnectUnix(c, c->unix_sock.path, c->timeout);
+    } else {
+        /* Something bad happened here and shouldn't have. There isn't
+           enough information in the context to reconnect. */
+        __redisSetError(c,REDIS_ERR_OTHER,"Not enough information to reconnect");
+    }
+
+    return REDIS_ERR;
+}
+
+/* Connect to a Redis instance. On error the field error in the returned
+ * context will be set to the return value of the error function.
+ * When no set of reply functions is given, the default set will be used. */
+redisContext *redisConnect(const char *ip, int port) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags |= REDIS_BLOCK;
+    redisContextConnectTcp(c,ip,port,NULL);
+    return c;
+}
+
+redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags |= REDIS_BLOCK;
+    redisContextConnectTcp(c,ip,port,&tv);
+    return c;
+}
+
+redisContext *redisConnectNonBlock(const char *ip, int port) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags &= ~REDIS_BLOCK;
+    redisContextConnectTcp(c,ip,port,NULL);
+    return c;
+}
+
+redisContext *redisConnectBindNonBlock(const char *ip, int port,
+                                       const char *source_addr) {
+    redisContext *c = redisContextInit();
+    c->flags &= ~REDIS_BLOCK;
+    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
+    return c;
+}
+
+redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
+                                                const char *source_addr) {
+    redisContext *c = redisContextInit();
+    c->flags &= ~REDIS_BLOCK;
+    c->flags |= REDIS_REUSEADDR;
+    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
+    return c;
+}
+
+redisContext *redisConnectUnix(const char *path) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags |= REDIS_BLOCK;
+    redisContextConnectUnix(c,path,NULL);
+    return c;
+}
+
+redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags |= REDIS_BLOCK;
+    redisContextConnectUnix(c,path,&tv);
+    return c;
+}
+
+redisContext *redisConnectUnixNonBlock(const char *path) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags &= ~REDIS_BLOCK;
+    redisContextConnectUnix(c,path,NULL);
+    return c;
+}
+
+redisContext *redisConnectFd(int fd) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->fd = fd;
+    c->flags |= REDIS_BLOCK | REDIS_CONNECTED;
+    return c;
+}
+
+/* Set read/write timeout on a blocking socket. */
+int redisSetTimeout(redisContext *c, const struct timeval tv) {
+    if (c->flags & REDIS_BLOCK)
+        return redisContextSetTimeout(c,tv);
+    return REDIS_ERR;
+}
+
+/* Enable connection KeepAlive. */
+int redisEnableKeepAlive(redisContext *c) {
+    if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
+        return REDIS_ERR;
+    return REDIS_OK;
+}
+
+/* Use this function to handle a read event on the descriptor. It will try
+ * and read some bytes from the socket and feed them to the reply parser.
+ *
+ * After this function is called, you may use redisContextReadReply to
+ * see if there is a reply available. */
+int redisBufferRead(redisContext *c) {
+    char buf[1024*16];
+    int nread;
+
+    /* Return early when the context has seen an error. */
+    if (c->err)
+        return REDIS_ERR;
+
+    nread = read(c->fd,buf,sizeof(buf));
+    if (nread == -1) {
+        if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
+            /* Try again later */
+        } else {
+            __redisSetError(c,REDIS_ERR_IO,NULL);
+            return REDIS_ERR;
+        }
+    } else if (nread == 0) {
+        __redisSetError(c,REDIS_ERR_EOF,"Server closed the connection");
+        return REDIS_ERR;
+    } else {
+        if (redisReaderFeed(c->reader,buf,nread) != REDIS_OK) {
+            __redisSetError(c,c->reader->err,c->reader->errstr);
+            return REDIS_ERR;
+        }
+    }
+    return REDIS_OK;
+}
+
+/* Write the output buffer to the socket.
+ *
+ * Returns REDIS_OK when the buffer is empty, or (a part of) the buffer was
+ * successfully written to the socket. When the buffer is empty after the
+ * write operation, "done" is set to 1 (if given).
+ *
+ * Returns REDIS_ERR if an error occurred trying to write and sets
+ * c->errstr to hold the appropriate error string.
+ */
+int redisBufferWrite(redisContext *c, int *done) {
+    int nwritten;
+
+    /* Return early when the context has seen an error. */
+    if (c->err)
+        return REDIS_ERR;
+
+    if (sdslen(c->obuf) > 0) {
+        nwritten = write(c->fd,c->obuf,sdslen(c->obuf));
+        if (nwritten == -1) {
+            if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
+                /* Try again later */
+            } else {
+                __redisSetError(c,REDIS_ERR_IO,NULL);
+                return REDIS_ERR;
+            }
+        } else if (nwritten > 0) {
+            if (nwritten == (signed)sdslen(c->obuf)) {
+                sdsfree(c->obuf);
+                c->obuf = sdsempty();
+            } else {
+                sdsrange(c->obuf,nwritten,-1);
+            }
+        }
+    }
+    if (done != NULL) *done = (sdslen(c->obuf) == 0);
+    return REDIS_OK;
+}
+
+/* Internal helper function to try and get a reply from the reader,
+ * or set an error in the context otherwise. */
+int redisGetReplyFromReader(redisContext *c, void **reply) {
+    if (redisReaderGetReply(c->reader,reply) == REDIS_ERR) {
+        __redisSetError(c,c->reader->err,c->reader->errstr);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+int redisGetReply(redisContext *c, void **reply) {
+    int wdone = 0;
+    void *aux = NULL;
+
+    /* Try to read pending replies */
+    if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
+        return REDIS_ERR;
+
+    /* For the blocking context, flush output buffer and read reply */
+    if (aux == NULL && c->flags & REDIS_BLOCK) {
+        /* Write until done */
+        do {
+            if (redisBufferWrite(c,&wdone) == REDIS_ERR)
+                return REDIS_ERR;
+        } while (!wdone);
+
+        /* Read until there is a reply */
+        do {
+            if (redisBufferRead(c) == REDIS_ERR)
+                return REDIS_ERR;
+            if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
+                return REDIS_ERR;
+        } while (aux == NULL);
+    }
+
+    /* Set reply object */
+    if (reply != NULL) *reply = aux;
+    return REDIS_OK;
+}
+
+
+/* Helper function for the redisAppendCommand* family of functions.
+ *
+ * Write a formatted command to the output buffer. When this family
+ * is used, you need to call redisGetReply yourself to retrieve
+ * the reply (or replies in pub/sub).
+ */
+int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) {
+    sds newbuf;
+
+    newbuf = sdscatlen(c->obuf,cmd,len);
+    if (newbuf == NULL) {
+        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
+        return REDIS_ERR;
+    }
+
+    c->obuf = newbuf;
+    return REDIS_OK;
+}
+
+int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len) {
+
+    if (__redisAppendCommand(c, cmd, len) != REDIS_OK) {
+        return REDIS_ERR;
+    }
+
+    return REDIS_OK;
+}
+
+int redisvAppendCommand(redisContext *c, const char *format, va_list ap) {
+    char *cmd;
+    int len;
+
+    len = redisvFormatCommand(&cmd,format,ap);
+    if (len == -1) {
+        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
+        return REDIS_ERR;
+    } else if (len == -2) {
+        __redisSetError(c,REDIS_ERR_OTHER,"Invalid format string");
+        return REDIS_ERR;
+    }
+
+    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
+        free(cmd);
+        return REDIS_ERR;
+    }
+
+    free(cmd);
+    return REDIS_OK;
+}
+
+int redisAppendCommand(redisContext *c, const char *format, ...) {
+    va_list ap;
+    int ret;
+
+    va_start(ap,format);
+    ret = redisvAppendCommand(c,format,ap);
+    va_end(ap);
+    return ret;
+}
+
+int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
+    sds cmd;
+    int len;
+
+    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
+    if (len == -1) {
+        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
+        return REDIS_ERR;
+    }
+
+    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
+        sdsfree(cmd);
+        return REDIS_ERR;
+    }
+
+    sdsfree(cmd);
+    return REDIS_OK;
+}
+
+/* Helper function for the redisCommand* family of functions.
+ *
+ * Write a formatted command to the output buffer. If the given context is
+ * blocking, immediately read the reply into the "reply" pointer. When the
+ * context is non-blocking, the "reply" pointer will not be used and the
+ * command is simply appended to the write buffer.
+ *
+ * Returns the reply when a reply was successfully retrieved. Returns NULL
+ * otherwise. When NULL is returned in a blocking context, the error field
+ * in the context will be set.
+ */
+static void *__redisBlockForReply(redisContext *c) {
+    void *reply;
+
+    if (c->flags & REDIS_BLOCK) {
+        if (redisGetReply(c,&reply) != REDIS_OK)
+            return NULL;
+        return reply;
+    }
+    return NULL;
+}
+
+void *redisvCommand(redisContext *c, const char *format, va_list ap) {
+    if (redisvAppendCommand(c,format,ap) != REDIS_OK)
+        return NULL;
+    return __redisBlockForReply(c);
+}
+
+void *redisCommand(redisContext *c, const char *format, ...) {
+    va_list ap;
+    void *reply = NULL;
+    va_start(ap,format);
+    reply = redisvCommand(c,format,ap);
+    va_end(ap);
+    return reply;
+}
+
+void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
+    if (redisAppendCommandArgv(c,argc,argv,argvlen) != REDIS_OK)
+        return NULL;
+    return __redisBlockForReply(c);
+}
diff --git a/debian/modules/nchan/src/hiredis/hiredis.h b/debian/modules/nchan/src/hiredis/hiredis.h
new file mode 100644
index 0000000..edba658
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/hiredis.h
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_H
+#define __HIREDIS_H
+#include "read.h"
+#include <stdarg.h> /* for va_list */
+#include <sys/time.h> /* for struct timeval */
+#include <stdint.h> /* uintXX_t, etc */
+#include "sds.h" /* for sds */
+
+#define HIREDIS_MAJOR 0
+#define HIREDIS_MINOR 13
+#define HIREDIS_PATCH 3
+#define HIREDIS_SONAME 0.13
+
+/* Connection type can be blocking or non-blocking and is set in the
+ * least significant bit of the flags field in redisContext. */
+#define REDIS_BLOCK 0x1
+
+/* Connection may be disconnected before being free'd. The second bit
+ * in the flags field is set when the context is connected. */
+#define REDIS_CONNECTED 0x2
+
+/* The async API might try to disconnect cleanly and flush the output
+ * buffer and read all subsequent replies before disconnecting.
+ * This flag means no new commands can come in and the connection
+ * should be terminated once all replies have been read. */
+#define REDIS_DISCONNECTING 0x4
+
+/* Flag specific to the async API which means that the context should be clean
+ * up as soon as possible. */
+#define REDIS_FREEING 0x8
+
+/* Flag that is set when an async callback is executed. */
+#define REDIS_IN_CALLBACK 0x10
+
+/* Flag that is set when the async context has one or more subscriptions. */
+#define REDIS_SUBSCRIBED 0x20
+
+/* Flag that is set when monitor mode is active */
+#define REDIS_MONITORING 0x40
+
+/* Flag that is set when we should set SO_REUSEADDR before calling bind() */
+#define REDIS_REUSEADDR 0x80
+
+#define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
+
+/* number of times we retry to connect in the case of EADDRNOTAVAIL and
+ * SO_REUSEADDR is being used. */
+#define REDIS_CONNECT_RETRIES  10
+
+/* strerror_r has two completely different prototypes and behaviors
+ * depending on system issues, so we need to operate on the error buffer
+ * differently depending on which strerror_r we're using. */
+#ifndef _GNU_SOURCE
+/* "regular" POSIX strerror_r that does the right thing. */
+#define __redis_strerror_r(errno, buf, len)                                    \
+    do {                                                                       \
+        strerror_r((errno), (buf), (len));                                     \
+    } while (0)
+#else
+/* "bad" GNU strerror_r we need to clean up after. */
+#define __redis_strerror_r(errno, buf, len)                                    \
+    do {                                                                       \
+        char *err_str = strerror_r((errno), (buf), (len));                     \
+        /* If return value _isn't_ the start of the buffer we passed in,       \
+         * then GNU strerror_r returned an internal static buffer and we       \
+         * need to copy the result into our private buffer. */                 \
+        if (err_str != (buf)) {                                                \
+            buf[(len)] = '\0';                                                 \
+            strncat((buf), err_str, ((len) - 1));                              \
+        }                                                                      \
+    } while (0)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This is the reply object returned by redisCommand() */
+typedef struct redisReply {
+    int type; /* REDIS_REPLY_* */
+    long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
+    int len; /* Length of string */
+    char *str; /* Used for both REDIS_REPLY_ERROR and REDIS_REPLY_STRING */
+    size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
+    struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
+} redisReply;
+
+redisReader *redisReaderCreate(void);
+
+/* Function to free the reply objects hiredis returns by default. */
+void freeReplyObject(void *reply);
+
+/* Functions to format a command according to the protocol. */
+int redisvFormatCommand(char **target, const char *format, va_list ap);
+int redisFormatCommand(char **target, const char *format, ...);
+int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
+int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
+void redisFreeCommand(char *cmd);
+void redisFreeSdsCommand(sds cmd);
+
+enum redisConnectionType {
+    REDIS_CONN_TCP,
+    REDIS_CONN_UNIX,
+};
+
+/* Context for a connection to Redis */
+typedef struct redisContext {
+    int err; /* Error flags, 0 when there is no error */
+    char errstr[128]; /* String representation of error when applicable */
+    int fd;
+    int flags;
+    char *obuf; /* Write buffer */
+    redisReader *reader; /* Protocol reader */
+
+    enum redisConnectionType connection_type;
+    struct timeval *timeout;
+
+    struct {
+        char *host;
+        char *source_addr;
+        int port;
+    } tcp;
+
+    struct {
+        char *path;
+    } unix_sock;
+
+} redisContext;
+
+redisContext *redisConnect(const char *ip, int port);
+redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
+redisContext *redisConnectNonBlock(const char *ip, int port);
+redisContext *redisConnectBindNonBlock(const char *ip, int port,
+                                       const char *source_addr);
+redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
+                                                const char *source_addr);
+redisContext *redisConnectUnix(const char *path);
+redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
+redisContext *redisConnectUnixNonBlock(const char *path);
+redisContext *redisConnectFd(int fd);
+
+/**
+ * Reconnect the given context using the saved information.
+ *
+ * This re-uses the exact same connect options as in the initial connection.
+ * host, ip (or path), timeout and bind address are reused,
+ * flags are used unmodified from the existing context.
+ *
+ * Returns REDIS_OK on successful connect or REDIS_ERR otherwise.
+ */
+int redisReconnect(redisContext *c);
+
+int redisSetTimeout(redisContext *c, const struct timeval tv);
+int redisEnableKeepAlive(redisContext *c);
+void redisFree(redisContext *c);
+int redisFreeKeepFd(redisContext *c);
+int redisBufferRead(redisContext *c);
+int redisBufferWrite(redisContext *c, int *done);
+
+/* In a blocking context, this function first checks if there are unconsumed
+ * replies to return and returns one if so. Otherwise, it flushes the output
+ * buffer to the socket and reads until it has a reply. In a non-blocking
+ * context, it will return unconsumed replies until there are no more. */
+int redisGetReply(redisContext *c, void **reply);
+int redisGetReplyFromReader(redisContext *c, void **reply);
+
+/* Write a formatted command to the output buffer. Use these functions in blocking mode
+ * to get a pipeline of commands. */
+int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
+
+/* Write a command to the output buffer. Use these functions in blocking mode
+ * to get a pipeline of commands. */
+int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
+int redisAppendCommand(redisContext *c, const char *format, ...);
+int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+
+/* Issue a command to Redis. In a blocking context, it is identical to calling
+ * redisAppendCommand, followed by redisGetReply. The function will return
+ * NULL if there was an error in performing the request, otherwise it will
+ * return the reply. In a non-blocking context, it is identical to calling
+ * only redisAppendCommand and will always return NULL. */
+void *redisvCommand(redisContext *c, const char *format, va_list ap);
+void *redisCommand(redisContext *c, const char *format, ...);
+void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/debian/modules/nchan/src/hiredis/net.c b/debian/modules/nchan/src/hiredis/net.c
new file mode 100644
index 0000000..60a2dc7
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/net.c
@@ -0,0 +1,458 @@
+/* Extracted from anet.c to work properly with Hiredis error reporting.
+ *
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <netdb.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <poll.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#include "net.h"
+#include "sds.h"
+
+/* Defined in hiredis.c */
+void __redisSetError(redisContext *c, int type, const char *str);
+
+static void redisContextCloseFd(redisContext *c) {
+    if (c && c->fd >= 0) {
+        close(c->fd);
+        c->fd = -1;
+    }
+}
+
+static void __redisSetErrorFromErrno(redisContext *c, int type, const char *prefix) {
+    char buf[128] = { 0 };
+    size_t len = 0;
+
+    if (prefix != NULL)
+        len = snprintf(buf,sizeof(buf),"%s: ",prefix);
+    __redis_strerror_r(errno, (char *)(buf + len), sizeof(buf) - len);
+    __redisSetError(c,type,buf);
+}
+
+static int redisSetReuseAddr(redisContext *c) {
+    int on = 1;
+    if (setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+        redisContextCloseFd(c);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+static int redisCreateSocket(redisContext *c, int type) {
+    int s;
+    if ((s = socket(type, SOCK_STREAM, 0)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+        return REDIS_ERR;
+    }
+    c->fd = s;
+    if (type == AF_INET) {
+        if (redisSetReuseAddr(c) == REDIS_ERR) {
+            return REDIS_ERR;
+        }
+    }
+    return REDIS_OK;
+}
+
+static int redisSetBlocking(redisContext *c, int blocking) {
+    int flags;
+
+    /* Set the socket nonblocking.
+     * Note that fcntl(2) for F_GETFL and F_SETFL can't be
+     * interrupted by a signal. */
+    if ((flags = fcntl(c->fd, F_GETFL)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_GETFL)");
+        redisContextCloseFd(c);
+        return REDIS_ERR;
+    }
+
+    if (blocking)
+        flags &= ~O_NONBLOCK;
+    else
+        flags |= O_NONBLOCK;
+
+    if (fcntl(c->fd, F_SETFL, flags) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_SETFL)");
+        redisContextCloseFd(c);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+int redisKeepAlive(redisContext *c, int interval) {
+    int val = 1;
+    int fd = c->fd;
+
+    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == -1){
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = interval;
+
+#ifdef _OSX
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+#else
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
+    val = interval;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = interval/3;
+    if (val == 0) val = 1;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = 3;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+#endif
+#endif
+
+    return REDIS_OK;
+}
+
+static int redisSetTcpNoDelay(redisContext *c) {
+    int yes = 1;
+    if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(TCP_NODELAY)");
+        redisContextCloseFd(c);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+#define __MAX_MSEC (((LONG_MAX) - 999) / 1000)
+
+static int redisContextWaitReady(redisContext *c, const struct timeval *timeout) {
+    struct pollfd   wfd[1];
+    long msec;
+
+    msec          = -1;
+    wfd[0].fd     = c->fd;
+    wfd[0].events = POLLOUT;
+
+    /* Only use timeout when not NULL. */
+    if (timeout != NULL) {
+        if (timeout->tv_usec > 1000000 || timeout->tv_sec > __MAX_MSEC) {
+            __redisSetErrorFromErrno(c, REDIS_ERR_IO, NULL);
+            redisContextCloseFd(c);
+            return REDIS_ERR;
+        }
+
+        msec = (timeout->tv_sec * 1000) + ((timeout->tv_usec + 999) / 1000);
+
+        if (msec < 0 || msec > INT_MAX) {
+            msec = INT_MAX;
+        }
+    }
+
+    if (errno == EINPROGRESS) {
+        int res;
+
+        if ((res = poll(wfd, 1, msec)) == -1) {
+            __redisSetErrorFromErrno(c, REDIS_ERR_IO, "poll(2)");
+            redisContextCloseFd(c);
+            return REDIS_ERR;
+        } else if (res == 0) {
+            errno = ETIMEDOUT;
+            __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+            redisContextCloseFd(c);
+            return REDIS_ERR;
+        }
+
+        if (redisCheckSocketError(c) != REDIS_OK)
+            return REDIS_ERR;
+
+        return REDIS_OK;
+    }
+
+    __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+    redisContextCloseFd(c);
+    return REDIS_ERR;
+}
+
+int redisCheckSocketError(redisContext *c) {
+    int err = 0;
+    socklen_t errlen = sizeof(err);
+
+    if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"getsockopt(SO_ERROR)");
+        return REDIS_ERR;
+    }
+
+    if (err) {
+        errno = err;
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+        return REDIS_ERR;
+    }
+
+    return REDIS_OK;
+}
+
+int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
+    if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,&tv,sizeof(tv)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_RCVTIMEO)");
+        return REDIS_ERR;
+    }
+    if (setsockopt(c->fd,SOL_SOCKET,SO_SNDTIMEO,&tv,sizeof(tv)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_SNDTIMEO)");
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
+                                   const struct timeval *timeout,
+                                   const char *source_addr) {
+    int s, rv, n;
+    char _port[6];  /* strlen("65535"); */
+    struct addrinfo hints, *servinfo, *bservinfo, *p, *b;
+    int blocking = (c->flags & REDIS_BLOCK);
+    int reuseaddr = (c->flags & REDIS_REUSEADDR);
+    int reuses = 0;
+
+    c->connection_type = REDIS_CONN_TCP;
+    c->tcp.port = port;
+
+    /* We need to take possession of the passed parameters
+     * to make them reusable for a reconnect.
+     * We also carefully check we don't free data we already own,
+     * as in the case of the reconnect method.
+     *
+     * This is a bit ugly, but atleast it works and doesn't leak memory.
+     **/
+    if (c->tcp.host != addr) {
+        if (c->tcp.host)
+            free(c->tcp.host);
+
+        c->tcp.host = strdup(addr);
+    }
+
+    if (timeout) {
+        if (c->timeout != timeout) {
+            if (c->timeout == NULL)
+                c->timeout = malloc(sizeof(struct timeval));
+
+            memcpy(c->timeout, timeout, sizeof(struct timeval));
+        }
+    } else {
+        if (c->timeout)
+            free(c->timeout);
+        c->timeout = NULL;
+    }
+
+    if (source_addr == NULL) {
+        free(c->tcp.source_addr);
+        c->tcp.source_addr = NULL;
+    } else if (c->tcp.source_addr != source_addr) {
+        free(c->tcp.source_addr);
+        c->tcp.source_addr = strdup(source_addr);
+    }
+
+    snprintf(_port, 6, "%d", port);
+    memset(&hints,0,sizeof(hints));
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+
+    /* Try with IPv6 if no IPv4 address was found. We do it in this order since
+     * in a Redis client you can't afford to test if you have IPv6 connectivity
+     * as this would add latency to every connect. Otherwise a more sensible
+     * route could be: Use IPv6 if both addresses are available and there is IPv6
+     * connectivity. */
+    if ((rv = getaddrinfo(c->tcp.host,_port,&hints,&servinfo)) != 0) {
+         hints.ai_family = AF_INET6;
+         if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) {
+            __redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv));
+            return REDIS_ERR;
+        }
+    }
+    for (p = servinfo; p != NULL; p = p->ai_next) {
+addrretry:
+        if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == -1)
+            continue;
+
+        c->fd = s;
+        if (redisSetBlocking(c,0) != REDIS_OK)
+            goto error;
+        if (c->tcp.source_addr) {
+            int bound = 0;
+            /* Using getaddrinfo saves us from self-determining IPv4 vs IPv6 */
+            if ((rv = getaddrinfo(c->tcp.source_addr, NULL, &hints, &bservinfo)) != 0) {
+                char buf[128];
+                snprintf(buf,sizeof(buf),"Can't get addr: %s",gai_strerror(rv));
+                __redisSetError(c,REDIS_ERR_OTHER,buf);
+                goto error;
+            }
+
+            if (reuseaddr) {
+                n = 1;
+                if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*) &n,
+                               sizeof(n)) < 0) {
+                    goto error;
+                }
+            }
+
+            for (b = bservinfo; b != NULL; b = b->ai_next) {
+                if (bind(s,b->ai_addr,b->ai_addrlen) != -1) {
+                    bound = 1;
+                    break;
+                }
+            }
+            freeaddrinfo(bservinfo);
+            if (!bound) {
+                char buf[128];
+                snprintf(buf,sizeof(buf),"Can't bind socket: %s",strerror(errno));
+                __redisSetError(c,REDIS_ERR_OTHER,buf);
+                goto error;
+            }
+        }
+        if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
+            if (errno == EHOSTUNREACH) {
+                redisContextCloseFd(c);
+                continue;
+            } else if (errno == EINPROGRESS && !blocking) {
+                /* This is ok. */
+            } else if (errno == EADDRNOTAVAIL && reuseaddr) {
+                if (++reuses >= REDIS_CONNECT_RETRIES) {
+                    goto error;
+                } else {
+                    goto addrretry;
+                }
+            } else {
+                if (redisContextWaitReady(c,c->timeout) != REDIS_OK)
+                    goto error;
+            }
+        }
+        if (blocking && redisSetBlocking(c,1) != REDIS_OK)
+            goto error;
+        if (redisSetTcpNoDelay(c) != REDIS_OK)
+            goto error;
+
+        c->flags |= REDIS_CONNECTED;
+        rv = REDIS_OK;
+        goto end;
+    }
+    if (p == NULL) {
+        char buf[128];
+        snprintf(buf,sizeof(buf),"Can't create socket: %s",strerror(errno));
+        __redisSetError(c,REDIS_ERR_OTHER,buf);
+        goto error;
+    }
+
+error:
+    rv = REDIS_ERR;
+end:
+    freeaddrinfo(servinfo);
+    return rv;  // Need to return REDIS_OK if alright
+}
+
+int redisContextConnectTcp(redisContext *c, const char *addr, int port,
+                           const struct timeval *timeout) {
+    return _redisContextConnectTcp(c, addr, port, timeout, NULL);
+}
+
+int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
+                               const struct timeval *timeout,
+                               const char *source_addr) {
+    return _redisContextConnectTcp(c, addr, port, timeout, source_addr);
+}
+
+int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout) {
+    int blocking = (c->flags & REDIS_BLOCK);
+    struct sockaddr_un sa;
+
+    if (redisCreateSocket(c,AF_LOCAL) < 0)
+        return REDIS_ERR;
+    if (redisSetBlocking(c,0) != REDIS_OK)
+        return REDIS_ERR;
+
+    c->connection_type = REDIS_CONN_UNIX;
+    if (c->unix_sock.path != path)
+        c->unix_sock.path = strdup(path);
+
+    if (timeout) {
+        if (c->timeout != timeout) {
+            if (c->timeout == NULL)
+                c->timeout = malloc(sizeof(struct timeval));
+
+            memcpy(c->timeout, timeout, sizeof(struct timeval));
+        }
+    } else {
+        if (c->timeout)
+            free(c->timeout);
+        c->timeout = NULL;
+    }
+
+    sa.sun_family = AF_LOCAL;
+    strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
+    if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
+        if (errno == EINPROGRESS && !blocking) {
+            /* This is ok. */
+        } else {
+            if (redisContextWaitReady(c,c->timeout) != REDIS_OK)
+                return REDIS_ERR;
+        }
+    }
+
+    /* Reset socket to be blocking after connect(2). */
+    if (blocking && redisSetBlocking(c,1) != REDIS_OK)
+        return REDIS_ERR;
+
+    c->flags |= REDIS_CONNECTED;
+    return REDIS_OK;
+}
diff --git a/debian/modules/nchan/src/hiredis/net.h b/debian/modules/nchan/src/hiredis/net.h
new file mode 100644
index 0000000..2f1a0bf
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/net.h
@@ -0,0 +1,53 @@
+/* Extracted from anet.c to work properly with Hiredis error reporting.
+ *
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __NET_H
+#define __NET_H
+
+#include "hiredis.h"
+
+#if defined(__sun)
+#define AF_LOCAL AF_UNIX
+#endif
+
+int redisCheckSocketError(redisContext *c);
+int redisContextSetTimeout(redisContext *c, const struct timeval tv);
+int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
+int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
+                               const struct timeval *timeout,
+                               const char *source_addr);
+int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
+int redisKeepAlive(redisContext *c, int interval);
+
+#endif
diff --git a/debian/modules/nchan/src/hiredis/read.c b/debian/modules/nchan/src/hiredis/read.c
new file mode 100644
index 0000000..df1a467
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/read.c
@@ -0,0 +1,525 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#include "fmacros.h"
+#include <string.h>
+#include <stdlib.h>
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
+#include <assert.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "read.h"
+#include "sds.h"
+
+static void __redisReaderSetError(redisReader *r, int type, const char *str) {
+    size_t len;
+
+    if (r->reply != NULL && r->fn && r->fn->freeObject) {
+        r->fn->freeObject(r->reply);
+        r->reply = NULL;
+    }
+
+    /* Clear input buffer on errors. */
+    if (r->buf != NULL) {
+        sdsfree(r->buf);
+        r->buf = NULL;
+        r->pos = r->len = 0;
+    }
+
+    /* Reset task stack. */
+    r->ridx = -1;
+
+    /* Set error. */
+    r->err = type;
+    len = strlen(str);
+    len = len < (sizeof(r->errstr)-1) ? len : (sizeof(r->errstr)-1);
+    memcpy(r->errstr,str,len);
+    r->errstr[len] = '\0';
+}
+
+static size_t chrtos(char *buf, size_t size, char byte) {
+    size_t len = 0;
+
+    switch(byte) {
+    case '\\':
+    case '"':
+        len = snprintf(buf,size,"\"\\%c\"",byte);
+        break;
+    case '\n': len = snprintf(buf,size,"\"\\n\""); break;
+    case '\r': len = snprintf(buf,size,"\"\\r\""); break;
+    case '\t': len = snprintf(buf,size,"\"\\t\""); break;
+    case '\a': len = snprintf(buf,size,"\"\\a\""); break;
+    case '\b': len = snprintf(buf,size,"\"\\b\""); break;
+    default:
+        if (isprint(byte))
+            len = snprintf(buf,size,"\"%c\"",byte);
+        else
+            len = snprintf(buf,size,"\"\\x%02x\"",(unsigned char)byte);
+        break;
+    }
+
+    return len;
+}
+
+static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte) {
+    char cbuf[8], sbuf[128];
+
+    chrtos(cbuf,sizeof(cbuf),byte);
+    snprintf(sbuf,sizeof(sbuf),
+        "Protocol error, got %s as reply type byte", cbuf);
+    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
+}
+
+static void __redisReaderSetErrorOOM(redisReader *r) {
+    __redisReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
+}
+
+static char *readBytes(redisReader *r, unsigned int bytes) {
+    char *p;
+    if (r->len-r->pos >= bytes) {
+        p = r->buf+r->pos;
+        r->pos += bytes;
+        return p;
+    }
+    return NULL;
+}
+
+/* Find pointer to \r\n. */
+static char *seekNewline(char *s, size_t len) {
+    int pos = 0;
+    int _len = len-1;
+
+    /* Position should be < len-1 because the character at "pos" should be
+     * followed by a \n. Note that strchr cannot be used because it doesn't
+     * allow to search a limited length and the buffer that is being searched
+     * might not have a trailing NULL character. */
+    while (pos < _len) {
+        while(pos < _len && s[pos] != '\r') pos++;
+        if (s[pos] != '\r') {
+            /* Not found. */
+            return NULL;
+        } else {
+            if (s[pos+1] == '\n') {
+                /* Found. */
+                return s+pos;
+            } else {
+                /* Continue searching. */
+                pos++;
+            }
+        }
+    }
+    return NULL;
+}
+
+/* Read a long long value starting at *s, under the assumption that it will be
+ * terminated by \r\n. Ambiguously returns -1 for unexpected input. */
+static long long readLongLong(char *s) {
+    long long v = 0;
+    int dec, mult = 1;
+    char c;
+
+    if (*s == '-') {
+        mult = -1;
+        s++;
+    } else if (*s == '+') {
+        mult = 1;
+        s++;
+    }
+
+    while ((c = *(s++)) != '\r') {
+        dec = c - '0';
+        if (dec >= 0 && dec < 10) {
+            v *= 10;
+            v += dec;
+        } else {
+            /* Should not happen... */
+            return -1;
+        }
+    }
+
+    return mult*v;
+}
+
+static char *readLine(redisReader *r, int *_len) {
+    char *p, *s;
+    int len;
+
+    p = r->buf+r->pos;
+    s = seekNewline(p,(r->len-r->pos));
+    if (s != NULL) {
+        len = s-(r->buf+r->pos);
+        r->pos += len+2; /* skip \r\n */
+        if (_len) *_len = len;
+        return p;
+    }
+    return NULL;
+}
+
+static void moveToNextTask(redisReader *r) {
+    redisReadTask *cur, *prv;
+    while (r->ridx >= 0) {
+        /* Return a.s.a.p. when the stack is now empty. */
+        if (r->ridx == 0) {
+            r->ridx--;
+            return;
+        }
+
+        cur = &(r->rstack[r->ridx]);
+        prv = &(r->rstack[r->ridx-1]);
+        assert(prv->type == REDIS_REPLY_ARRAY);
+        if (cur->idx == prv->elements-1) {
+            r->ridx--;
+        } else {
+            /* Reset the type because the next item can be anything */
+            assert(cur->idx < prv->elements);
+            cur->type = -1;
+            cur->elements = -1;
+            cur->idx++;
+            return;
+        }
+    }
+}
+
+static int processLineItem(redisReader *r) {
+    redisReadTask *cur = &(r->rstack[r->ridx]);
+    void *obj;
+    char *p;
+    int len;
+
+    if ((p = readLine(r,&len)) != NULL) {
+        if (cur->type == REDIS_REPLY_INTEGER) {
+            if (r->fn && r->fn->createInteger)
+                obj = r->fn->createInteger(cur,readLongLong(p));
+            else
+                obj = (void*)REDIS_REPLY_INTEGER;
+        } else {
+            /* Type will be error or status. */
+            if (r->fn && r->fn->createString)
+                obj = r->fn->createString(cur,p,len);
+            else
+                obj = (void*)(size_t)(cur->type);
+        }
+
+        if (obj == NULL) {
+            __redisReaderSetErrorOOM(r);
+            return REDIS_ERR;
+        }
+
+        /* Set reply if this is the root object. */
+        if (r->ridx == 0) r->reply = obj;
+        moveToNextTask(r);
+        return REDIS_OK;
+    }
+
+    return REDIS_ERR;
+}
+
+static int processBulkItem(redisReader *r) {
+    redisReadTask *cur = &(r->rstack[r->ridx]);
+    void *obj = NULL;
+    char *p, *s;
+    long len;
+    unsigned long bytelen;
+    int success = 0;
+
+    p = r->buf+r->pos;
+    s = seekNewline(p,r->len-r->pos);
+    if (s != NULL) {
+        p = r->buf+r->pos;
+        bytelen = s-(r->buf+r->pos)+2; /* include \r\n */
+        len = readLongLong(p);
+
+        if (len < 0) {
+            /* The nil object can always be created. */
+            if (r->fn && r->fn->createNil)
+                obj = r->fn->createNil(cur);
+            else
+                obj = (void*)REDIS_REPLY_NIL;
+            success = 1;
+        } else {
+            /* Only continue when the buffer contains the entire bulk item. */
+            bytelen += len+2; /* include \r\n */
+            if (r->pos+bytelen <= r->len) {
+                if (r->fn && r->fn->createString)
+                    obj = r->fn->createString(cur,s+2,len);
+                else
+                    obj = (void*)REDIS_REPLY_STRING;
+                success = 1;
+            }
+        }
+
+        /* Proceed when obj was created. */
+        if (success) {
+            if (obj == NULL) {
+                __redisReaderSetErrorOOM(r);
+                return REDIS_ERR;
+            }
+
+            r->pos += bytelen;
+
+            /* Set reply if this is the root object. */
+            if (r->ridx == 0) r->reply = obj;
+            moveToNextTask(r);
+            return REDIS_OK;
+        }
+    }
+
+    return REDIS_ERR;
+}
+
+static int processMultiBulkItem(redisReader *r) {
+    redisReadTask *cur = &(r->rstack[r->ridx]);
+    void *obj;
+    char *p;
+    long elements;
+    int root = 0;
+
+    /* Set error for nested multi bulks with depth > 7 */
+    if (r->ridx == 8) {
+        __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+            "No support for nested multi bulk replies with depth > 7");
+        return REDIS_ERR;
+    }
+
+    if ((p = readLine(r,NULL)) != NULL) {
+        elements = readLongLong(p);
+        root = (r->ridx == 0);
+
+        if (elements == -1) {
+            if (r->fn && r->fn->createNil)
+                obj = r->fn->createNil(cur);
+            else
+                obj = (void*)REDIS_REPLY_NIL;
+
+            if (obj == NULL) {
+                __redisReaderSetErrorOOM(r);
+                return REDIS_ERR;
+            }
+
+            moveToNextTask(r);
+        } else {
+            if (r->fn && r->fn->createArray)
+                obj = r->fn->createArray(cur,elements);
+            else
+                obj = (void*)REDIS_REPLY_ARRAY;
+
+            if (obj == NULL) {
+                __redisReaderSetErrorOOM(r);
+                return REDIS_ERR;
+            }
+
+            /* Modify task stack when there are more than 0 elements. */
+            if (elements > 0) {
+                cur->elements = elements;
+                cur->obj = obj;
+                r->ridx++;
+                r->rstack[r->ridx].type = -1;
+                r->rstack[r->ridx].elements = -1;
+                r->rstack[r->ridx].idx = 0;
+                r->rstack[r->ridx].obj = NULL;
+                r->rstack[r->ridx].parent = cur;
+                r->rstack[r->ridx].privdata = r->privdata;
+            } else {
+                moveToNextTask(r);
+            }
+        }
+
+        /* Set reply if this is the root object. */
+        if (root) r->reply = obj;
+        return REDIS_OK;
+    }
+
+    return REDIS_ERR;
+}
+
+static int processItem(redisReader *r) {
+    redisReadTask *cur = &(r->rstack[r->ridx]);
+    char *p;
+
+    /* check if we need to read type */
+    if (cur->type < 0) {
+        if ((p = readBytes(r,1)) != NULL) {
+            switch (p[0]) {
+            case '-':
+                cur->type = REDIS_REPLY_ERROR;
+                break;
+            case '+':
+                cur->type = REDIS_REPLY_STATUS;
+                break;
+            case ':':
+                cur->type = REDIS_REPLY_INTEGER;
+                break;
+            case '$':
+                cur->type = REDIS_REPLY_STRING;
+                break;
+            case '*':
+                cur->type = REDIS_REPLY_ARRAY;
+                break;
+            default:
+                __redisReaderSetErrorProtocolByte(r,*p);
+                return REDIS_ERR;
+            }
+        } else {
+            /* could not consume 1 byte */
+            return REDIS_ERR;
+        }
+    }
+
+    /* process typed item */
+    switch(cur->type) {
+    case REDIS_REPLY_ERROR:
+    case REDIS_REPLY_STATUS:
+    case REDIS_REPLY_INTEGER:
+        return processLineItem(r);
+    case REDIS_REPLY_STRING:
+        return processBulkItem(r);
+    case REDIS_REPLY_ARRAY:
+        return processMultiBulkItem(r);
+    default:
+        assert(NULL);
+        return REDIS_ERR; /* Avoid warning. */
+    }
+}
+
+redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
+    redisReader *r;
+
+    r = calloc(sizeof(redisReader),1);
+    if (r == NULL)
+        return NULL;
+
+    r->err = 0;
+    r->errstr[0] = '\0';
+    r->fn = fn;
+    r->buf = sdsempty();
+    r->maxbuf = REDIS_READER_MAX_BUF;
+    if (r->buf == NULL) {
+        free(r);
+        return NULL;
+    }
+
+    r->ridx = -1;
+    return r;
+}
+
+void redisReaderFree(redisReader *r) {
+    if (r->reply != NULL && r->fn && r->fn->freeObject)
+        r->fn->freeObject(r->reply);
+    if (r->buf != NULL)
+        sdsfree(r->buf);
+    free(r);
+}
+
+int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
+    sds newbuf;
+
+    /* Return early when this reader is in an erroneous state. */
+    if (r->err)
+        return REDIS_ERR;
+
+    /* Copy the provided buffer. */
+    if (buf != NULL && len >= 1) {
+        /* Destroy internal buffer when it is empty and is quite large. */
+        if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) {
+            sdsfree(r->buf);
+            r->buf = sdsempty();
+            r->pos = 0;
+
+            /* r->buf should not be NULL since we just free'd a larger one. */
+            assert(r->buf != NULL);
+        }
+
+        newbuf = sdscatlen(r->buf,buf,len);
+        if (newbuf == NULL) {
+            __redisReaderSetErrorOOM(r);
+            return REDIS_ERR;
+        }
+
+        r->buf = newbuf;
+        r->len = sdslen(r->buf);
+    }
+
+    return REDIS_OK;
+}
+
+int redisReaderGetReply(redisReader *r, void **reply) {
+    /* Default target pointer to NULL. */
+    if (reply != NULL)
+        *reply = NULL;
+
+    /* Return early when this reader is in an erroneous state. */
+    if (r->err)
+        return REDIS_ERR;
+
+    /* When the buffer is empty, there will never be a reply. */
+    if (r->len == 0)
+        return REDIS_OK;
+
+    /* Set first item to process when the stack is empty. */
+    if (r->ridx == -1) {
+        r->rstack[0].type = -1;
+        r->rstack[0].elements = -1;
+        r->rstack[0].idx = -1;
+        r->rstack[0].obj = NULL;
+        r->rstack[0].parent = NULL;
+        r->rstack[0].privdata = r->privdata;
+        r->ridx = 0;
+    }
+
+    /* Process items in reply. */
+    while (r->ridx >= 0)
+        if (processItem(r) != REDIS_OK)
+            break;
+
+    /* Return ASAP when an error occurred. */
+    if (r->err)
+        return REDIS_ERR;
+
+    /* Discard part of the buffer when we've consumed at least 1k, to avoid
+     * doing unnecessary calls to memmove() in sds.c. */
+    if (r->pos >= 1024) {
+        sdsrange(r->buf,r->pos,-1);
+        r->pos = 0;
+        r->len = sdslen(r->buf);
+    }
+
+    /* Emit a reply when there is one. */
+    if (r->ridx == -1) {
+        if (reply != NULL)
+            *reply = r->reply;
+        r->reply = NULL;
+    }
+    return REDIS_OK;
+}
diff --git a/debian/modules/nchan/src/hiredis/read.h b/debian/modules/nchan/src/hiredis/read.h
new file mode 100644
index 0000000..180e6c6
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/read.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#ifndef __HIREDIS_READ_H
+#define __HIREDIS_READ_H
+#include <stdio.h> /* for size_t */
+
+#define REDIS_ERR -1
+#define REDIS_OK 0
+
+/* When an error occurs, the err flag in a context is set to hold the type of
+ * error that occurred. REDIS_ERR_IO means there was an I/O error and you
+ * should use the "errno" variable to find out what is wrong.
+ * For other values, the "errstr" field will hold a description. */
+#define REDIS_ERR_IO 1 /* Error in read or write */
+#define REDIS_ERR_EOF 3 /* End of file */
+#define REDIS_ERR_PROTOCOL 4 /* Protocol error */
+#define REDIS_ERR_OOM 5 /* Out of memory */
+#define REDIS_ERR_OTHER 2 /* Everything else... */
+
+#define REDIS_REPLY_STRING 1
+#define REDIS_REPLY_ARRAY 2
+#define REDIS_REPLY_INTEGER 3
+#define REDIS_REPLY_NIL 4
+#define REDIS_REPLY_STATUS 5
+#define REDIS_REPLY_ERROR 6
+
+#define REDIS_READER_MAX_BUF (1024*16)  /* Default max unused reader buffer. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct redisReadTask {
+    int type;
+    int elements; /* number of elements in multibulk container */
+    int idx; /* index in parent (array) object */
+    void *obj; /* holds user-generated value for a read task */
+    struct redisReadTask *parent; /* parent task */
+    void *privdata; /* user-settable arbitrary field */
+} redisReadTask;
+
+typedef struct redisReplyObjectFunctions {
+    void *(*createString)(const redisReadTask*, char*, size_t);
+    void *(*createArray)(const redisReadTask*, int);
+    void *(*createInteger)(const redisReadTask*, long long);
+    void *(*createNil)(const redisReadTask*);
+    void (*freeObject)(void*);
+} redisReplyObjectFunctions;
+
+typedef struct redisReader {
+    int err; /* Error flags, 0 when there is no error */
+    char errstr[128]; /* String representation of error when applicable */
+
+    char *buf; /* Read buffer */
+    size_t pos; /* Buffer cursor */
+    size_t len; /* Buffer length */
+    size_t maxbuf; /* Max length of unused buffer */
+
+    redisReadTask rstack[9];
+    int ridx; /* Index of current read task */
+    void *reply; /* Temporary reply pointer */
+
+    redisReplyObjectFunctions *fn;
+    void *privdata;
+} redisReader;
+
+/* Public API for the protocol parser. */
+redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn);
+void redisReaderFree(redisReader *r);
+int redisReaderFeed(redisReader *r, const char *buf, size_t len);
+int redisReaderGetReply(redisReader *r, void **reply);
+
+/* Backwards compatibility, can be removed on big version bump. */
+#define redisReplyReaderCreate redisReaderCreate
+#define redisReplyReaderFree redisReaderFree
+#define redisReplyReaderFeed redisReaderFeed
+#define redisReplyReaderGetReply redisReaderGetReply
+#define redisReplyReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
+#define redisReplyReaderGetObject(_r) (((redisReader*)(_r))->reply)
+#define redisReplyReaderGetError(_r) (((redisReader*)(_r))->errstr)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/debian/modules/nchan/src/hiredis/sds.c b/debian/modules/nchan/src/hiredis/sds.c
new file mode 100644
index 0000000..f01247d
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/sds.c
@@ -0,0 +1,1095 @@
+/* SDS (Simple Dynamic Strings), A C dynamic strings library.
+ *
+ * Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+
+#include "sds.h"
+
+/* Create a new sds string with the content specified by the 'init' pointer
+ * and 'initlen'.
+ * If NULL is used for 'init' the string is initialized with zero bytes.
+ *
+ * The string is always null-termined (all the sds strings are, always) so
+ * even if you create an sds string with:
+ *
+ * mystring = sdsnewlen("abc",3");
+ *
+ * You can print the string with printf() as there is an implicit \0 at the
+ * end of the string. However the string is binary safe and can contain
+ * \0 characters in the middle, as the length is stored in the sds header. */
+sds sdsnewlen(const void *init, size_t initlen) {
+    struct sdshdr *sh;
+
+    if (init) {
+        sh = malloc(sizeof *sh+initlen+1);
+    } else {
+        sh = calloc(sizeof *sh+initlen+1,1);
+    }
+    if (sh == NULL) return NULL;
+    sh->len = initlen;
+    sh->free = 0;
+    if (initlen && init)
+        memcpy(sh->buf, init, initlen);
+    sh->buf[initlen] = '\0';
+    return (char*)sh->buf;
+}
+
+/* Create an empty (zero length) sds string. Even in this case the string
+ * always has an implicit null term. */
+sds sdsempty(void) {
+    return sdsnewlen("",0);
+}
+
+/* Create a new sds string starting from a null termined C string. */
+sds sdsnew(const char *init) {
+    size_t initlen = (init == NULL) ? 0 : strlen(init);
+    return sdsnewlen(init, initlen);
+}
+
+/* Duplicate an sds string. */
+sds sdsdup(const sds s) {
+    return sdsnewlen(s, sdslen(s));
+}
+
+/* Free an sds string. No operation is performed if 's' is NULL. */
+void sdsfree(sds s) {
+    if (s == NULL) return;
+    free(s-sizeof(struct sdshdr));
+}
+
+/* Set the sds string length to the length as obtained with strlen(), so
+ * considering as content only up to the first null term character.
+ *
+ * This function is useful when the sds string is hacked manually in some
+ * way, like in the following example:
+ *
+ * s = sdsnew("foobar");
+ * s[2] = '\0';
+ * sdsupdatelen(s);
+ * printf("%d\n", sdslen(s));
+ *
+ * The output will be "2", but if we comment out the call to sdsupdatelen()
+ * the output will be "6" as the string was modified but the logical length
+ * remains 6 bytes. */
+void sdsupdatelen(sds s) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    int reallen = strlen(s);
+    sh->free += (sh->len-reallen);
+    sh->len = reallen;
+}
+
+/* Modify an sds string on-place to make it empty (zero length).
+ * However all the existing buffer is not discarded but set as free space
+ * so that next append operations will not require allocations up to the
+ * number of bytes previously available. */
+void sdsclear(sds s) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    sh->free += sh->len;
+    sh->len = 0;
+    sh->buf[0] = '\0';
+}
+
+/* Enlarge the free space at the end of the sds string so that the caller
+ * is sure that after calling this function can overwrite up to addlen
+ * bytes after the end of the string, plus one more byte for nul term.
+ *
+ * Note: this does not change the *length* of the sds string as returned
+ * by sdslen(), but only the free buffer space we have. */
+sds sdsMakeRoomFor(sds s, size_t addlen) {
+    struct sdshdr *sh, *newsh;
+    size_t free = sdsavail(s);
+    size_t len, newlen;
+
+    if (free >= addlen) return s;
+    len = sdslen(s);
+    sh = (void*) (s-sizeof *sh);
+    newlen = (len+addlen);
+    if (newlen < SDS_MAX_PREALLOC)
+        newlen *= 2;
+    else
+        newlen += SDS_MAX_PREALLOC;
+    newsh = realloc(sh, sizeof *newsh+newlen+1);
+    if (newsh == NULL) return NULL;
+
+    newsh->free = newlen - len;
+    return newsh->buf;
+}
+
+/* Reallocate the sds string so that it has no free space at the end. The
+ * contained string remains not altered, but next concatenation operations
+ * will require a reallocation.
+ *
+ * After the call, the passed sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdsRemoveFreeSpace(sds s) {
+    struct sdshdr *sh;
+
+    sh = (void*) (s-sizeof *sh);
+    sh = realloc(sh, sizeof *sh+sh->len+1);
+    sh->free = 0;
+    return sh->buf;
+}
+
+/* Return the total size of the allocation of the specifed sds string,
+ * including:
+ * 1) The sds header before the pointer.
+ * 2) The string.
+ * 3) The free buffer at the end if any.
+ * 4) The implicit null term.
+ */
+size_t sdsAllocSize(sds s) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+
+    return sizeof(*sh)+sh->len+sh->free+1;
+}
+
+/* Increment the sds length and decrements the left free space at the
+ * end of the string according to 'incr'. Also set the null term
+ * in the new end of the string.
+ *
+ * This function is used in order to fix the string length after the
+ * user calls sdsMakeRoomFor(), writes something after the end of
+ * the current string, and finally needs to set the new length.
+ *
+ * Note: it is possible to use a negative increment in order to
+ * right-trim the string.
+ *
+ * Usage example:
+ *
+ * Using sdsIncrLen() and sdsMakeRoomFor() it is possible to mount the
+ * following schema, to cat bytes coming from the kernel to the end of an
+ * sds string without copying into an intermediate buffer:
+ *
+ * oldlen = sdslen(s);
+ * s = sdsMakeRoomFor(s, BUFFER_SIZE);
+ * nread = read(fd, s+oldlen, BUFFER_SIZE);
+ * ... check for nread <= 0 and handle it ...
+ * sdsIncrLen(s, nread);
+ */
+void sdsIncrLen(sds s, int incr) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+
+    assert(sh->free >= incr);
+    sh->len += incr;
+    sh->free -= incr;
+    assert(sh->free >= 0);
+    s[sh->len] = '\0';
+}
+
+/* Grow the sds to have the specified length. Bytes that were not part of
+ * the original length of the sds will be set to zero.
+ *
+ * if the specified length is smaller than the current length, no operation
+ * is performed. */
+sds sdsgrowzero(sds s, size_t len) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    size_t totlen, curlen = sh->len;
+
+    if (len <= curlen) return s;
+    s = sdsMakeRoomFor(s,len-curlen);
+    if (s == NULL) return NULL;
+
+    /* Make sure added region doesn't contain garbage */
+    sh = (void*)(s-sizeof *sh);
+    memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */
+    totlen = sh->len+sh->free;
+    sh->len = len;
+    sh->free = totlen-sh->len;
+    return s;
+}
+
+/* Append the specified binary-safe string pointed by 't' of 'len' bytes to the
+ * end of the specified sds string 's'.
+ *
+ * After the call, the passed sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscatlen(sds s, const void *t, size_t len) {
+    struct sdshdr *sh;
+    size_t curlen = sdslen(s);
+
+    s = sdsMakeRoomFor(s,len);
+    if (s == NULL) return NULL;
+    sh = (void*) (s-sizeof *sh);
+    memcpy(s+curlen, t, len);
+    sh->len = curlen+len;
+    sh->free = sh->free-len;
+    s[curlen+len] = '\0';
+    return s;
+}
+
+/* Append the specified null termianted C string to the sds string 's'.
+ *
+ * After the call, the passed sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscat(sds s, const char *t) {
+    return sdscatlen(s, t, strlen(t));
+}
+
+/* Append the specified sds 't' to the existing sds 's'.
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscatsds(sds s, const sds t) {
+    return sdscatlen(s, t, sdslen(t));
+}
+
+/* Destructively modify the sds string 's' to hold the specified binary
+ * safe string pointed by 't' of length 'len' bytes. */
+sds sdscpylen(sds s, const char *t, size_t len) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    size_t totlen = sh->free+sh->len;
+
+    if (totlen < len) {
+        s = sdsMakeRoomFor(s,len-sh->len);
+        if (s == NULL) return NULL;
+        sh = (void*) (s-sizeof *sh);
+        totlen = sh->free+sh->len;
+    }
+    memcpy(s, t, len);
+    s[len] = '\0';
+    sh->len = len;
+    sh->free = totlen-len;
+    return s;
+}
+
+/* Like sdscpylen() but 't' must be a null-termined string so that the length
+ * of the string is obtained with strlen(). */
+sds sdscpy(sds s, const char *t) {
+    return sdscpylen(s, t, strlen(t));
+}
+
+/* Helper for sdscatlonglong() doing the actual number -> string
+ * conversion. 's' must point to a string with room for at least
+ * SDS_LLSTR_SIZE bytes.
+ *
+ * The function returns the length of the null-terminated string
+ * representation stored at 's'. */
+#define SDS_LLSTR_SIZE 21
+int sdsll2str(char *s, long long value) {
+    char *p, aux;
+    unsigned long long v;
+    size_t l;
+
+    /* Generate the string representation, this method produces
+     * an reversed string. */
+    v = (value < 0) ? -value : value;
+    p = s;
+    do {
+        *p++ = '0'+(v%10);
+        v /= 10;
+    } while(v);
+    if (value < 0) *p++ = '-';
+
+    /* Compute length and add null term. */
+    l = p-s;
+    *p = '\0';
+
+    /* Reverse the string. */
+    p--;
+    while(s < p) {
+        aux = *s;
+        *s = *p;
+        *p = aux;
+        s++;
+        p--;
+    }
+    return l;
+}
+
+/* Identical sdsll2str(), but for unsigned long long type. */
+int sdsull2str(char *s, unsigned long long v) {
+    char *p, aux;
+    size_t l;
+
+    /* Generate the string representation, this method produces
+     * an reversed string. */
+    p = s;
+    do {
+        *p++ = '0'+(v%10);
+        v /= 10;
+    } while(v);
+
+    /* Compute length and add null term. */
+    l = p-s;
+    *p = '\0';
+
+    /* Reverse the string. */
+    p--;
+    while(s < p) {
+        aux = *s;
+        *s = *p;
+        *p = aux;
+        s++;
+        p--;
+    }
+    return l;
+}
+
+/* Like sdscatpritf() but gets va_list instead of being variadic. */
+sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
+    va_list cpy;
+    char *buf, *t;
+    size_t buflen = 16;
+
+    while(1) {
+        buf = malloc(buflen);
+        if (buf == NULL) return NULL;
+        buf[buflen-2] = '\0';
+        va_copy(cpy,ap);
+        vsnprintf(buf, buflen, fmt, cpy);
+        if (buf[buflen-2] != '\0') {
+            free(buf);
+            buflen *= 2;
+            continue;
+        }
+        break;
+    }
+    t = sdscat(s, buf);
+    free(buf);
+    return t;
+}
+
+/* Append to the sds string 's' a string obtained using printf-alike format
+ * specifier.
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call.
+ *
+ * Example:
+ *
+ * s = sdsnew("Sum is: ");
+ * s = sdscatprintf(s,"%d+%d = %d",a,b,a+b);
+ *
+ * Often you need to create a string from scratch with the printf-alike
+ * format. When this is the need, just use sdsempty() as the target string:
+ *
+ * s = sdscatprintf(sdsempty(), "... your format ...", args);
+ */
+sds sdscatprintf(sds s, const char *fmt, ...) {
+    va_list ap;
+    char *t;
+    va_start(ap, fmt);
+    t = sdscatvprintf(s,fmt,ap);
+    va_end(ap);
+    return t;
+}
+
+/* This function is similar to sdscatprintf, but much faster as it does
+ * not rely on sprintf() family functions implemented by the libc that
+ * are often very slow. Moreover directly handling the sds string as
+ * new data is concatenated provides a performance improvement.
+ *
+ * However this function only handles an incompatible subset of printf-alike
+ * format specifiers:
+ *
+ * %s - C String
+ * %S - SDS string
+ * %i - signed int
+ * %I - 64 bit signed integer (long long, int64_t)
+ * %u - unsigned int
+ * %U - 64 bit unsigned integer (unsigned long long, uint64_t)
+ * %T - A size_t variable.
+ * %% - Verbatim "%" character.
+ */
+sds sdscatfmt(sds s, char const *fmt, ...) {
+    struct sdshdr *sh = (void*) (s-(sizeof(struct sdshdr)));
+    size_t initlen = sdslen(s);
+    const char *f = fmt;
+    int i;
+    va_list ap;
+
+    va_start(ap,fmt);
+    f = fmt;    /* Next format specifier byte to process. */
+    i = initlen; /* Position of the next byte to write to dest str. */
+    while(*f) {
+        char next, *str;
+        int l;
+        long long num;
+        unsigned long long unum;
+
+        /* Make sure there is always space for at least 1 char. */
+        if (sh->free == 0) {
+            s = sdsMakeRoomFor(s,1);
+            sh = (void*) (s-(sizeof(struct sdshdr)));
+        }
+
+        switch(*f) {
+        case '%':
+            next = *(f+1);
+            f++;
+            switch(next) {
+            case 's':
+            case 'S':
+                str = va_arg(ap,char*);
+                l = (next == 's') ? strlen(str) : sdslen(str);
+                if (sh->free < l) {
+                    s = sdsMakeRoomFor(s,l);
+                    sh = (void*) (s-(sizeof(struct sdshdr)));
+                }
+                memcpy(s+i,str,l);
+                sh->len += l;
+                sh->free -= l;
+                i += l;
+                break;
+            case 'i':
+            case 'I':
+                if (next == 'i')
+                    num = va_arg(ap,int);
+                else
+                    num = va_arg(ap,long long);
+                {
+                    char buf[SDS_LLSTR_SIZE];
+                    l = sdsll2str(buf,num);
+                    if (sh->free < l) {
+                        s = sdsMakeRoomFor(s,l);
+                        sh = (void*) (s-(sizeof(struct sdshdr)));
+                    }
+                    memcpy(s+i,buf,l);
+                    sh->len += l;
+                    sh->free -= l;
+                    i += l;
+                }
+                break;
+            case 'u':
+            case 'U':
+            case 'T':
+                if (next == 'u')
+                    unum = va_arg(ap,unsigned int);
+                else if(next == 'U')
+                    unum = va_arg(ap,unsigned long long);
+                else
+                    unum = (unsigned long long)va_arg(ap,size_t);
+                {
+                    char buf[SDS_LLSTR_SIZE];
+                    l = sdsull2str(buf,unum);
+                    if (sh->free < l) {
+                        s = sdsMakeRoomFor(s,l);
+                        sh = (void*) (s-(sizeof(struct sdshdr)));
+                    }
+                    memcpy(s+i,buf,l);
+                    sh->len += l;
+                    sh->free -= l;
+                    i += l;
+                }
+                break;
+            default: /* Handle %% and generally %<unknown>. */
+                s[i++] = next;
+                sh->len += 1;
+                sh->free -= 1;
+                break;
+            }
+            break;
+        default:
+            s[i++] = *f;
+            sh->len += 1;
+            sh->free -= 1;
+            break;
+        }
+        f++;
+    }
+    va_end(ap);
+
+    /* Add null-term */
+    s[i] = '\0';
+    return s;
+}
+
+
+/* Remove the part of the string from left and from right composed just of
+ * contiguous characters found in 'cset', that is a null terminted C string.
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call.
+ *
+ * Example:
+ *
+ * s = sdsnew("AA...AA.a.aa.aHelloWorld     :::");
+ * s = sdstrim(s,"A. :");
+ * printf("%s\n", s);
+ *
+ * Output will be just "Hello World".
+ */
+void sdstrim(sds s, const char *cset) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    char *start, *end, *sp, *ep;
+    size_t len;
+
+    sp = start = s;
+    ep = end = s+sdslen(s)-1;
+    while(sp <= end && strchr(cset, *sp)) sp++;
+    while(ep > start && strchr(cset, *ep)) ep--;
+    len = (sp > ep) ? 0 : ((ep-sp)+1);
+    if (sh->buf != sp) memmove(sh->buf, sp, len);
+    sh->buf[len] = '\0';
+    sh->free = sh->free+(sh->len-len);
+    sh->len = len;
+}
+
+/* Turn the string into a smaller (or equal) string containing only the
+ * substring specified by the 'start' and 'end' indexes.
+ *
+ * start and end can be negative, where -1 means the last character of the
+ * string, -2 the penultimate character, and so forth.
+ *
+ * The interval is inclusive, so the start and end characters will be part
+ * of the resulting string.
+ *
+ * The string is modified in-place.
+ *
+ * Example:
+ *
+ * s = sdsnew("Hello World");
+ * sdsrange(s,1,-1); => "ello World"
+ */
+void sdsrange(sds s, int start, int end) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    size_t newlen, len = sdslen(s);
+
+    if (len == 0) return;
+    if (start < 0) {
+        start = len+start;
+        if (start < 0) start = 0;
+    }
+    if (end < 0) {
+        end = len+end;
+        if (end < 0) end = 0;
+    }
+    newlen = (start > end) ? 0 : (end-start)+1;
+    if (newlen != 0) {
+        if (start >= (signed)len) {
+            newlen = 0;
+        } else if (end >= (signed)len) {
+            end = len-1;
+            newlen = (start > end) ? 0 : (end-start)+1;
+        }
+    } else {
+        start = 0;
+    }
+    if (start && newlen) memmove(sh->buf, sh->buf+start, newlen);
+    sh->buf[newlen] = 0;
+    sh->free = sh->free+(sh->len-newlen);
+    sh->len = newlen;
+}
+
+/* Apply tolower() to every character of the sds string 's'. */
+void sdstolower(sds s) {
+    int len = sdslen(s), j;
+
+    for (j = 0; j < len; j++) s[j] = tolower(s[j]);
+}
+
+/* Apply toupper() to every character of the sds string 's'. */
+void sdstoupper(sds s) {
+    int len = sdslen(s), j;
+
+    for (j = 0; j < len; j++) s[j] = toupper(s[j]);
+}
+
+/* Compare two sds strings s1 and s2 with memcmp().
+ *
+ * Return value:
+ *
+ *     1 if s1 > s2.
+ *    -1 if s1 < s2.
+ *     0 if s1 and s2 are exactly the same binary string.
+ *
+ * If two strings share exactly the same prefix, but one of the two has
+ * additional characters, the longer string is considered to be greater than
+ * the smaller one. */
+int sdscmp(const sds s1, const sds s2) {
+    size_t l1, l2, minlen;
+    int cmp;
+
+    l1 = sdslen(s1);
+    l2 = sdslen(s2);
+    minlen = (l1 < l2) ? l1 : l2;
+    cmp = memcmp(s1,s2,minlen);
+    if (cmp == 0) return l1-l2;
+    return cmp;
+}
+
+/* Split 's' with separator in 'sep'. An array
+ * of sds strings is returned. *count will be set
+ * by reference to the number of tokens returned.
+ *
+ * On out of memory, zero length string, zero length
+ * separator, NULL is returned.
+ *
+ * Note that 'sep' is able to split a string using
+ * a multi-character separator. For example
+ * sdssplit("foo_-_bar","_-_"); will return two
+ * elements "foo" and "bar".
+ *
+ * This version of the function is binary-safe but
+ * requires length arguments. sdssplit() is just the
+ * same function but for zero-terminated strings.
+ */
+sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count) {
+    int elements = 0, slots = 5, start = 0, j;
+    sds *tokens;
+
+    if (seplen < 1 || len < 0) return NULL;
+
+    tokens = malloc(sizeof(sds)*slots);
+    if (tokens == NULL) return NULL;
+
+    if (len == 0) {
+        *count = 0;
+        return tokens;
+    }
+    for (j = 0; j < (len-(seplen-1)); j++) {
+        /* make sure there is room for the next element and the final one */
+        if (slots < elements+2) {
+            sds *newtokens;
+
+            slots *= 2;
+            newtokens = realloc(tokens,sizeof(sds)*slots);
+            if (newtokens == NULL) goto cleanup;
+            tokens = newtokens;
+        }
+        /* search the separator */
+        if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
+            tokens[elements] = sdsnewlen(s+start,j-start);
+            if (tokens[elements] == NULL) goto cleanup;
+            elements++;
+            start = j+seplen;
+            j = j+seplen-1; /* skip the separator */
+        }
+    }
+    /* Add the final element. We are sure there is room in the tokens array. */
+    tokens[elements] = sdsnewlen(s+start,len-start);
+    if (tokens[elements] == NULL) goto cleanup;
+    elements++;
+    *count = elements;
+    return tokens;
+
+cleanup:
+    {
+        int i;
+        for (i = 0; i < elements; i++) sdsfree(tokens[i]);
+        free(tokens);
+        *count = 0;
+        return NULL;
+    }
+}
+
+/* Free the result returned by sdssplitlen(), or do nothing if 'tokens' is NULL. */
+void sdsfreesplitres(sds *tokens, int count) {
+    if (!tokens) return;
+    while(count--)
+        sdsfree(tokens[count]);
+    free(tokens);
+}
+
+/* Create an sds string from a long long value. It is much faster than:
+ *
+ * sdscatprintf(sdsempty(),"%lld\n", value);
+ */
+sds sdsfromlonglong(long long value) {
+    char buf[32], *p;
+    unsigned long long v;
+
+    v = (value < 0) ? -value : value;
+    p = buf+31; /* point to the last character */
+    do {
+        *p-- = '0'+(v%10);
+        v /= 10;
+    } while(v);
+    if (value < 0) *p-- = '-';
+    p++;
+    return sdsnewlen(p,32-(p-buf));
+}
+
+/* Append to the sds string "s" an escaped string representation where
+ * all the non-printable characters (tested with isprint()) are turned into
+ * escapes in the form "\n\r\a...." or "\x<hex-number>".
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscatrepr(sds s, const char *p, size_t len) {
+    s = sdscatlen(s,"\"",1);
+    while(len--) {
+        switch(*p) {
+        case '\\':
+        case '"':
+            s = sdscatprintf(s,"\\%c",*p);
+            break;
+        case '\n': s = sdscatlen(s,"\\n",2); break;
+        case '\r': s = sdscatlen(s,"\\r",2); break;
+        case '\t': s = sdscatlen(s,"\\t",2); break;
+        case '\a': s = sdscatlen(s,"\\a",2); break;
+        case '\b': s = sdscatlen(s,"\\b",2); break;
+        default:
+            if (isprint(*p))
+                s = sdscatprintf(s,"%c",*p);
+            else
+                s = sdscatprintf(s,"\\x%02x",(unsigned char)*p);
+            break;
+        }
+        p++;
+    }
+    return sdscatlen(s,"\"",1);
+}
+
+/* Helper function for sdssplitargs() that returns non zero if 'c'
+ * is a valid hex digit. */
+int is_hex_digit(char c) {
+    return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') ||
+           (c >= 'A' && c <= 'F');
+}
+
+/* Helper function for sdssplitargs() that converts a hex digit into an
+ * integer from 0 to 15 */
+int hex_digit_to_int(char c) {
+    switch(c) {
+    case '0': return 0;
+    case '1': return 1;
+    case '2': return 2;
+    case '3': return 3;
+    case '4': return 4;
+    case '5': return 5;
+    case '6': return 6;
+    case '7': return 7;
+    case '8': return 8;
+    case '9': return 9;
+    case 'a': case 'A': return 10;
+    case 'b': case 'B': return 11;
+    case 'c': case 'C': return 12;
+    case 'd': case 'D': return 13;
+    case 'e': case 'E': return 14;
+    case 'f': case 'F': return 15;
+    default: return 0;
+    }
+}
+
+/* Split a line into arguments, where every argument can be in the
+ * following programming-language REPL-alike form:
+ *
+ * foo bar "newline are supported\n" and "\xff\x00otherstuff"
+ *
+ * The number of arguments is stored into *argc, and an array
+ * of sds is returned.
+ *
+ * The caller should free the resulting array of sds strings with
+ * sdsfreesplitres().
+ *
+ * Note that sdscatrepr() is able to convert back a string into
+ * a quoted string in the same format sdssplitargs() is able to parse.
+ *
+ * The function returns the allocated tokens on success, even when the
+ * input string is empty, or NULL if the input contains unbalanced
+ * quotes or closed quotes followed by non space characters
+ * as in: "foo"bar or "foo'
+ */
+sds *sdssplitargs(const char *line, int *argc) {
+    const char *p = line;
+    char *current = NULL;
+    char **vector = NULL;
+
+    *argc = 0;
+    while(1) {
+        /* skip blanks */
+        while(*p && isspace(*p)) p++;
+        if (*p) {
+            /* get a token */
+            int inq=0;  /* set to 1 if we are in "quotes" */
+            int insq=0; /* set to 1 if we are in 'single quotes' */
+            int done=0;
+
+            if (current == NULL) current = sdsempty();
+            while(!done) {
+                if (inq) {
+                    if (*p == '\\' && *(p+1) == 'x' &&
+                                             is_hex_digit(*(p+2)) &&
+                                             is_hex_digit(*(p+3)))
+                    {
+                        unsigned char byte;
+
+                        byte = (hex_digit_to_int(*(p+2))*16)+
+                                hex_digit_to_int(*(p+3));
+                        current = sdscatlen(current,(char*)&byte,1);
+                        p += 3;
+                    } else if (*p == '\\' && *(p+1)) {
+                        char c;
+
+                        p++;
+                        switch(*p) {
+                        case 'n': c = '\n'; break;
+                        case 'r': c = '\r'; break;
+                        case 't': c = '\t'; break;
+                        case 'b': c = '\b'; break;
+                        case 'a': c = '\a'; break;
+                        default: c = *p; break;
+                        }
+                        current = sdscatlen(current,&c,1);
+                    } else if (*p == '"') {
+                        /* closing quote must be followed by a space or
+                         * nothing at all. */
+                        if (*(p+1) && !isspace(*(p+1))) goto err;
+                        done=1;
+                    } else if (!*p) {
+                        /* unterminated quotes */
+                        goto err;
+                    } else {
+                        current = sdscatlen(current,p,1);
+                    }
+                } else if (insq) {
+                    if (*p == '\\' && *(p+1) == '\'') {
+                        p++;
+                        current = sdscatlen(current,"'",1);
+                    } else if (*p == '\'') {
+                        /* closing quote must be followed by a space or
+                         * nothing at all. */
+                        if (*(p+1) && !isspace(*(p+1))) goto err;
+                        done=1;
+                    } else if (!*p) {
+                        /* unterminated quotes */
+                        goto err;
+                    } else {
+                        current = sdscatlen(current,p,1);
+                    }
+                } else {
+                    switch(*p) {
+                    case ' ':
+                    case '\n':
+                    case '\r':
+                    case '\t':
+                    case '\0':
+                        done=1;
+                        break;
+                    case '"':
+                        inq=1;
+                        break;
+                    case '\'':
+                        insq=1;
+                        break;
+                    default:
+                        current = sdscatlen(current,p,1);
+                        break;
+                    }
+                }
+                if (*p) p++;
+            }
+            /* add the token to the vector */
+            vector = realloc(vector,((*argc)+1)*sizeof(char*));
+            vector[*argc] = current;
+            (*argc)++;
+            current = NULL;
+        } else {
+            /* Even on empty input string return something not NULL. */
+            if (vector == NULL) vector = malloc(sizeof(void*));
+            return vector;
+        }
+    }
+
+err:
+    while((*argc)--)
+        sdsfree(vector[*argc]);
+    free(vector);
+    if (current) sdsfree(current);
+    *argc = 0;
+    return NULL;
+}
+
+/* Modify the string substituting all the occurrences of the set of
+ * characters specified in the 'from' string to the corresponding character
+ * in the 'to' array.
+ *
+ * For instance: sdsmapchars(mystring, "ho", "01", 2)
+ * will have the effect of turning the string "hello" into "0ell1".
+ *
+ * The function returns the sds string pointer, that is always the same
+ * as the input pointer since no resize is needed. */
+sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) {
+    size_t j, i, l = sdslen(s);
+
+    for (j = 0; j < l; j++) {
+        for (i = 0; i < setlen; i++) {
+            if (s[j] == from[i]) {
+                s[j] = to[i];
+                break;
+            }
+        }
+    }
+    return s;
+}
+
+/* Join an array of C strings using the specified separator (also a C string).
+ * Returns the result as an sds string. */
+sds sdsjoin(char **argv, int argc, char *sep, size_t seplen) {
+    sds join = sdsempty();
+    int j;
+
+    for (j = 0; j < argc; j++) {
+        join = sdscat(join, argv[j]);
+        if (j != argc-1) join = sdscatlen(join,sep,seplen);
+    }
+    return join;
+}
+
+/* Like sdsjoin, but joins an array of SDS strings. */
+sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) {
+    sds join = sdsempty();
+    int j;
+
+    for (j = 0; j < argc; j++) {
+        join = sdscatsds(join, argv[j]);
+        if (j != argc-1) join = sdscatlen(join,sep,seplen);
+    }
+    return join;
+}
+
+#ifdef SDS_TEST_MAIN
+#include <stdio.h>
+#include "testhelp.h"
+
+int main(void) {
+    {
+        struct sdshdr *sh;
+        sds x = sdsnew("foo"), y;
+
+        test_cond("Create a string and obtain the length",
+            sdslen(x) == 3 && memcmp(x,"foo\0",4) == 0)
+
+        sdsfree(x);
+        x = sdsnewlen("foo",2);
+        test_cond("Create a string with specified length",
+            sdslen(x) == 2 && memcmp(x,"fo\0",3) == 0)
+
+        x = sdscat(x,"bar");
+        test_cond("Strings concatenation",
+            sdslen(x) == 5 && memcmp(x,"fobar\0",6) == 0);
+
+        x = sdscpy(x,"a");
+        test_cond("sdscpy() against an originally longer string",
+            sdslen(x) == 1 && memcmp(x,"a\0",2) == 0)
+
+        x = sdscpy(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk");
+        test_cond("sdscpy() against an originally shorter string",
+            sdslen(x) == 33 &&
+            memcmp(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk\0",33) == 0)
+
+        sdsfree(x);
+        x = sdscatprintf(sdsempty(),"%d",123);
+        test_cond("sdscatprintf() seems working in the base case",
+            sdslen(x) == 3 && memcmp(x,"123\0",4) ==0)
+
+        sdsfree(x);
+        x = sdsnew("xxciaoyyy");
+        sdstrim(x,"xy");
+        test_cond("sdstrim() correctly trims characters",
+            sdslen(x) == 4 && memcmp(x,"ciao\0",5) == 0)
+
+        y = sdsdup(x);
+        sdsrange(y,1,1);
+        test_cond("sdsrange(...,1,1)",
+            sdslen(y) == 1 && memcmp(y,"i\0",2) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,1,-1);
+        test_cond("sdsrange(...,1,-1)",
+            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,-2,-1);
+        test_cond("sdsrange(...,-2,-1)",
+            sdslen(y) == 2 && memcmp(y,"ao\0",3) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,2,1);
+        test_cond("sdsrange(...,2,1)",
+            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,1,100);
+        test_cond("sdsrange(...,1,100)",
+            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,100,100);
+        test_cond("sdsrange(...,100,100)",
+            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnew("foo");
+        y = sdsnew("foa");
+        test_cond("sdscmp(foo,foa)", sdscmp(x,y) > 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnew("bar");
+        y = sdsnew("bar");
+        test_cond("sdscmp(bar,bar)", sdscmp(x,y) == 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnew("aar");
+        y = sdsnew("bar");
+        test_cond("sdscmp(bar,bar)", sdscmp(x,y) < 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnewlen("\a\n\0foo\r",7);
+        y = sdscatrepr(sdsempty(),x,sdslen(x));
+        test_cond("sdscatrepr(...data...)",
+            memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0)
+
+        {
+            int oldfree;
+
+            sdsfree(x);
+            x = sdsnew("0");
+            sh = (void*) (x-(sizeof(struct sdshdr)));
+            test_cond("sdsnew() free/len buffers", sh->len == 1 && sh->free == 0);
+            x = sdsMakeRoomFor(x,1);
+            sh = (void*) (x-(sizeof(struct sdshdr)));
+            test_cond("sdsMakeRoomFor()", sh->len == 1 && sh->free > 0);
+            oldfree = sh->free;
+            x[1] = '1';
+            sdsIncrLen(x,1);
+            test_cond("sdsIncrLen() -- content", x[0] == '0' && x[1] == '1');
+            test_cond("sdsIncrLen() -- len", sh->len == 2);
+            test_cond("sdsIncrLen() -- free", sh->free == oldfree-1);
+        }
+    }
+    test_report()
+    return 0;
+}
+#endif
diff --git a/debian/modules/nchan/src/hiredis/sds.h b/debian/modules/nchan/src/hiredis/sds.h
new file mode 100644
index 0000000..19a2abd
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/sds.h
@@ -0,0 +1,105 @@
+/* SDS (Simple Dynamic Strings), A C dynamic strings library.
+ *
+ * Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __SDS_H
+#define __SDS_H
+
+#define SDS_MAX_PREALLOC (1024*1024)
+
+#include <sys/types.h>
+#include <stdarg.h>
+#ifdef _MSC_VER
+#include "win32.h"
+#endif
+
+typedef char *sds;
+
+struct sdshdr {
+    int len;
+    int free;
+    char buf[];
+};
+
+static inline size_t sdslen(const sds s) {
+    struct sdshdr *sh = (struct sdshdr *)(s-sizeof *sh);
+    return sh->len;
+}
+
+static inline size_t sdsavail(const sds s) {
+    struct sdshdr *sh = (struct sdshdr *)(s-sizeof *sh);
+    return sh->free;
+}
+
+sds sdsnewlen(const void *init, size_t initlen);
+sds sdsnew(const char *init);
+sds sdsempty(void);
+size_t sdslen(const sds s);
+sds sdsdup(const sds s);
+void sdsfree(sds s);
+size_t sdsavail(const sds s);
+sds sdsgrowzero(sds s, size_t len);
+sds sdscatlen(sds s, const void *t, size_t len);
+sds sdscat(sds s, const char *t);
+sds sdscatsds(sds s, const sds t);
+sds sdscpylen(sds s, const char *t, size_t len);
+sds sdscpy(sds s, const char *t);
+
+sds sdscatvprintf(sds s, const char *fmt, va_list ap);
+#ifdef __GNUC__
+sds sdscatprintf(sds s, const char *fmt, ...)
+    __attribute__((format(printf, 2, 3)));
+#else
+sds sdscatprintf(sds s, const char *fmt, ...);
+#endif
+
+sds sdscatfmt(sds s, char const *fmt, ...);
+void sdstrim(sds s, const char *cset);
+void sdsrange(sds s, int start, int end);
+void sdsupdatelen(sds s);
+void sdsclear(sds s);
+int sdscmp(const sds s1, const sds s2);
+sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
+void sdsfreesplitres(sds *tokens, int count);
+void sdstolower(sds s);
+void sdstoupper(sds s);
+sds sdsfromlonglong(long long value);
+sds sdscatrepr(sds s, const char *p, size_t len);
+sds *sdssplitargs(const char *line, int *argc);
+sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
+sds sdsjoin(char **argv, int argc, char *sep, size_t seplen);
+sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
+
+/* Low level functions exposed to the user API */
+sds sdsMakeRoomFor(sds s, size_t addlen);
+void sdsIncrLen(sds s, int incr);
+sds sdsRemoveFreeSpace(sds s);
+size_t sdsAllocSize(sds s);
+
+#endif
diff --git a/debian/modules/nchan/src/hiredis/test.c b/debian/modules/nchan/src/hiredis/test.c
new file mode 100644
index 0000000..d5e8217
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/test.c
@@ -0,0 +1,807 @@
+#include "fmacros.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <unistd.h>
+#include <signal.h>
+#include <errno.h>
+#include <limits.h>
+
+#include "hiredis.h"
+#include "net.h"
+
+enum connection_type {
+    CONN_TCP,
+    CONN_UNIX,
+    CONN_FD
+};
+
+struct config {
+    enum connection_type type;
+
+    struct {
+        const char *host;
+        int port;
+        struct timeval timeout;
+    } tcp;
+
+    struct {
+        const char *path;
+    } unix;
+};
+
+/* The following lines make up our testing "framework" :) */
+static int tests = 0, fails = 0;
+#define test(_s) { printf("#%02d ", ++tests); printf(_s); }
+#define test_cond(_c) if(_c) printf("\033[0;32mPASSED\033[0;0m\n"); else {printf("\033[0;31mFAILED\033[0;0m\n"); fails++;}
+
+static long long usec(void) {
+    struct timeval tv;
+    gettimeofday(&tv,NULL);
+    return (((long long)tv.tv_sec)*1000000)+tv.tv_usec;
+}
+
+/* The assert() calls below have side effects, so we need assert()
+ * even if we are compiling without asserts (-DNDEBUG). */
+#ifdef NDEBUG
+#undef assert
+#define assert(e) (void)(e)
+#endif
+
+static redisContext *select_database(redisContext *c) {
+    redisReply *reply;
+
+    /* Switch to DB 9 for testing, now that we know we can chat. */
+    reply = redisCommand(c,"SELECT 9");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+
+    /* Make sure the DB is emtpy */
+    reply = redisCommand(c,"DBSIZE");
+    assert(reply != NULL);
+    if (reply->type == REDIS_REPLY_INTEGER && reply->integer == 0) {
+        /* Awesome, DB 9 is empty and we can continue. */
+        freeReplyObject(reply);
+    } else {
+        printf("Database #9 is not empty, test can not continue\n");
+        exit(1);
+    }
+
+    return c;
+}
+
+static int disconnect(redisContext *c, int keep_fd) {
+    redisReply *reply;
+
+    /* Make sure we're on DB 9. */
+    reply = redisCommand(c,"SELECT 9");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+    reply = redisCommand(c,"FLUSHDB");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+
+    /* Free the context as well, but keep the fd if requested. */
+    if (keep_fd)
+        return redisFreeKeepFd(c);
+    redisFree(c);
+    return -1;
+}
+
+static redisContext *connect(struct config config) {
+    redisContext *c = NULL;
+
+    if (config.type == CONN_TCP) {
+        c = redisConnect(config.tcp.host, config.tcp.port);
+    } else if (config.type == CONN_UNIX) {
+        c = redisConnectUnix(config.unix.path);
+    } else if (config.type == CONN_FD) {
+        /* Create a dummy connection just to get an fd to inherit */
+        redisContext *dummy_ctx = redisConnectUnix(config.unix.path);
+        if (dummy_ctx) {
+            int fd = disconnect(dummy_ctx, 1);
+            printf("Connecting to inherited fd %d\n", fd);
+            c = redisConnectFd(fd);
+        }
+    } else {
+        assert(NULL);
+    }
+
+    if (c == NULL) {
+        printf("Connection error: can't allocate redis context\n");
+        exit(1);
+    } else if (c->err) {
+        printf("Connection error: %s\n", c->errstr);
+        redisFree(c);
+        exit(1);
+    }
+
+    return select_database(c);
+}
+
+static void test_format_commands(void) {
+    char *cmd;
+    int len;
+
+    test("Format command without interpolation: ");
+    len = redisFormatCommand(&cmd,"SET foo bar");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command with %%s string interpolation: ");
+    len = redisFormatCommand(&cmd,"SET %s %s","foo","bar");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command with %%s and an empty string: ");
+    len = redisFormatCommand(&cmd,"SET %s %s","foo","");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
+    free(cmd);
+
+    test("Format command with an empty string in between proper interpolations: ");
+    len = redisFormatCommand(&cmd,"SET %s %s","","foo");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$0\r\n\r\n$3\r\nfoo\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(0+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command with %%b string interpolation: ");
+    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"b\0r",(size_t)3);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nb\0r\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command with %%b and an empty string: ");
+    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"",(size_t)0);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
+    free(cmd);
+
+    test("Format command with literal %%: ");
+    len = redisFormatCommand(&cmd,"SET %% %%");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$1\r\n%\r\n$1\r\n%\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(1+2)+4+(1+2));
+    free(cmd);
+
+    /* Vararg width depends on the type. These tests make sure that the
+     * width is correctly determined using the format and subsequent varargs
+     * can correctly be interpolated. */
+#define INTEGER_WIDTH_TEST(fmt, type) do {                                                \
+    type value = 123;                                                                     \
+    test("Format command with printf-delegation (" #type "): ");                          \
+    len = redisFormatCommand(&cmd,"key:%08" fmt " str:%s", value, "hello");               \
+    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",len) == 0 && \
+        len == 4+5+(12+2)+4+(9+2));                                                       \
+    free(cmd);                                                                            \
+} while(0)
+
+#define FLOAT_WIDTH_TEST(type) do {                                                       \
+    type value = 123.0;                                                                   \
+    test("Format command with printf-delegation (" #type "): ");                          \
+    len = redisFormatCommand(&cmd,"key:%08.3f str:%s", value, "hello");                   \
+    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",len) == 0 && \
+        len == 4+5+(12+2)+4+(9+2));                                                       \
+    free(cmd);                                                                            \
+} while(0)
+
+    INTEGER_WIDTH_TEST("d", int);
+    INTEGER_WIDTH_TEST("hhd", char);
+    INTEGER_WIDTH_TEST("hd", short);
+    INTEGER_WIDTH_TEST("ld", long);
+    INTEGER_WIDTH_TEST("lld", long long);
+    INTEGER_WIDTH_TEST("u", unsigned int);
+    INTEGER_WIDTH_TEST("hhu", unsigned char);
+    INTEGER_WIDTH_TEST("hu", unsigned short);
+    INTEGER_WIDTH_TEST("lu", unsigned long);
+    INTEGER_WIDTH_TEST("llu", unsigned long long);
+    FLOAT_WIDTH_TEST(float);
+    FLOAT_WIDTH_TEST(double);
+
+    test("Format command with invalid printf format: ");
+    len = redisFormatCommand(&cmd,"key:%08p %b",(void*)1234,"foo",(size_t)3);
+    test_cond(len == -1);
+
+    const char *argv[3];
+    argv[0] = "SET";
+    argv[1] = "foo\0xxx";
+    argv[2] = "bar";
+    size_t lens[3] = { 3, 7, 3 };
+    int argc = 3;
+
+    test("Format command by passing argc/argv without lengths: ");
+    len = redisFormatCommandArgv(&cmd,argc,argv,NULL);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command by passing argc/argv with lengths: ");
+    len = redisFormatCommandArgv(&cmd,argc,argv,lens);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
+    free(cmd);
+}
+
+static void test_append_formatted_commands(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    char *cmd;
+    int len;
+
+    c = connect(config);
+
+    test("Append format command: ");
+
+    len = redisFormatCommand(&cmd, "SET foo bar");
+
+    test_cond(redisAppendFormattedCommand(c, cmd, len) == REDIS_OK);
+
+    assert(redisGetReply(c, (void*)&reply) == REDIS_OK);
+
+    free(cmd);
+    freeReplyObject(reply);
+
+    disconnect(c, 0);
+}
+
+static void test_reply_reader(void) {
+    redisReader *reader;
+    void *reply;
+    int ret;
+    int i;
+
+    test("Error handling in reply parser: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"@foo\r\n",6);
+    ret = redisReaderGetReply(reader,NULL);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
+    redisReaderFree(reader);
+
+    /* when the reply already contains multiple items, they must be free'd
+     * on an error. valgrind will bark when this doesn't happen. */
+    test("Memory cleanup in reply parser: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"*2\r\n",4);
+    redisReaderFeed(reader,(char*)"$5\r\nhello\r\n",11);
+    redisReaderFeed(reader,(char*)"@foo\r\n",6);
+    ret = redisReaderGetReply(reader,NULL);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
+    redisReaderFree(reader);
+
+    test("Set error on nested multi bulks with depth > 7: ");
+    reader = redisReaderCreate();
+
+    for (i = 0; i < 9; i++) {
+        redisReaderFeed(reader,(char*)"*1\r\n",4);
+    }
+
+    ret = redisReaderGetReply(reader,NULL);
+    test_cond(ret == REDIS_ERR &&
+              strncasecmp(reader->errstr,"No support for",14) == 0);
+    redisReaderFree(reader);
+
+    test("Works with NULL functions for reply: ");
+    reader = redisReaderCreate();
+    reader->fn = NULL;
+    redisReaderFeed(reader,(char*)"+OK\r\n",5);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
+    redisReaderFree(reader);
+
+    test("Works when a single newline (\\r\\n) covers two calls to feed: ");
+    reader = redisReaderCreate();
+    reader->fn = NULL;
+    redisReaderFeed(reader,(char*)"+OK\r",4);
+    ret = redisReaderGetReply(reader,&reply);
+    assert(ret == REDIS_OK && reply == NULL);
+    redisReaderFeed(reader,(char*)"\n",1);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
+    redisReaderFree(reader);
+
+    test("Don't reset state after protocol error: ");
+    reader = redisReaderCreate();
+    reader->fn = NULL;
+    redisReaderFeed(reader,(char*)"x",1);
+    ret = redisReaderGetReply(reader,&reply);
+    assert(ret == REDIS_ERR);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR && reply == NULL);
+    redisReaderFree(reader);
+
+    /* Regression test for issue #45 on GitHub. */
+    test("Don't do empty allocation for empty multi bulk: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"*0\r\n",4);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
+        ((redisReply*)reply)->elements == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+}
+
+static void test_free_null(void) {
+    void *redisContext = NULL;
+    void *reply = NULL;
+
+    test("Don't fail when redisFree is passed a NULL value: ");
+    redisFree(redisContext);
+    test_cond(redisContext == NULL);
+
+    test("Don't fail when freeReplyObject is passed a NULL value: ");
+    freeReplyObject(reply);
+    test_cond(reply == NULL);
+}
+
+static void test_blocking_connection_errors(void) {
+    redisContext *c;
+
+    test("Returns error when host cannot be resolved: ");
+    c = redisConnect((char*)"idontexist.test", 6379);
+    test_cond(c->err == REDIS_ERR_OTHER &&
+        (strcmp(c->errstr,"Name or service not known") == 0 ||
+         strcmp(c->errstr,"Can't resolve: idontexist.test") == 0 ||
+         strcmp(c->errstr,"nodename nor servname provided, or not known") == 0 ||
+         strcmp(c->errstr,"No address associated with hostname") == 0 ||
+         strcmp(c->errstr,"Temporary failure in name resolution") == 0 ||
+         strcmp(c->errstr,"hostname nor servname provided, or not known") == 0 ||
+         strcmp(c->errstr,"no address associated with name") == 0));
+    redisFree(c);
+
+    test("Returns error when the port is not open: ");
+    c = redisConnect((char*)"localhost", 1);
+    test_cond(c->err == REDIS_ERR_IO &&
+        strcmp(c->errstr,"Connection refused") == 0);
+    redisFree(c);
+
+    test("Returns error when the unix socket path doesn't accept connections: ");
+    c = redisConnectUnix((char*)"/tmp/idontexist.sock");
+    test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
+    redisFree(c);
+}
+
+static void test_blocking_connection(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+
+    c = connect(config);
+
+    test("Is able to deliver commands: ");
+    reply = redisCommand(c,"PING");
+    test_cond(reply->type == REDIS_REPLY_STATUS &&
+        strcasecmp(reply->str,"pong") == 0)
+    freeReplyObject(reply);
+
+    test("Is a able to send commands verbatim: ");
+    reply = redisCommand(c,"SET foo bar");
+    test_cond (reply->type == REDIS_REPLY_STATUS &&
+        strcasecmp(reply->str,"ok") == 0)
+    freeReplyObject(reply);
+
+    test("%%s String interpolation works: ");
+    reply = redisCommand(c,"SET %s %s","foo","hello world");
+    freeReplyObject(reply);
+    reply = redisCommand(c,"GET foo");
+    test_cond(reply->type == REDIS_REPLY_STRING &&
+        strcmp(reply->str,"hello world") == 0);
+    freeReplyObject(reply);
+
+    test("%%b String interpolation works: ");
+    reply = redisCommand(c,"SET %b %b","foo",(size_t)3,"hello\x00world",(size_t)11);
+    freeReplyObject(reply);
+    reply = redisCommand(c,"GET foo");
+    test_cond(reply->type == REDIS_REPLY_STRING &&
+        memcmp(reply->str,"hello\x00world",11) == 0)
+
+    test("Binary reply length is correct: ");
+    test_cond(reply->len == 11)
+    freeReplyObject(reply);
+
+    test("Can parse nil replies: ");
+    reply = redisCommand(c,"GET nokey");
+    test_cond(reply->type == REDIS_REPLY_NIL)
+    freeReplyObject(reply);
+
+    /* test 7 */
+    test("Can parse integer replies: ");
+    reply = redisCommand(c,"INCR mycounter");
+    test_cond(reply->type == REDIS_REPLY_INTEGER && reply->integer == 1)
+    freeReplyObject(reply);
+
+    test("Can parse multi bulk replies: ");
+    freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
+    freeReplyObject(redisCommand(c,"LPUSH mylist bar"));
+    reply = redisCommand(c,"LRANGE mylist 0 -1");
+    test_cond(reply->type == REDIS_REPLY_ARRAY &&
+              reply->elements == 2 &&
+              !memcmp(reply->element[0]->str,"bar",3) &&
+              !memcmp(reply->element[1]->str,"foo",3))
+    freeReplyObject(reply);
+
+    /* m/e with multi bulk reply *before* other reply.
+     * specifically test ordering of reply items to parse. */
+    test("Can handle nested multi bulk replies: ");
+    freeReplyObject(redisCommand(c,"MULTI"));
+    freeReplyObject(redisCommand(c,"LRANGE mylist 0 -1"));
+    freeReplyObject(redisCommand(c,"PING"));
+    reply = (redisCommand(c,"EXEC"));
+    test_cond(reply->type == REDIS_REPLY_ARRAY &&
+              reply->elements == 2 &&
+              reply->element[0]->type == REDIS_REPLY_ARRAY &&
+              reply->element[0]->elements == 2 &&
+              !memcmp(reply->element[0]->element[0]->str,"bar",3) &&
+              !memcmp(reply->element[0]->element[1]->str,"foo",3) &&
+              reply->element[1]->type == REDIS_REPLY_STATUS &&
+              strcasecmp(reply->element[1]->str,"pong") == 0);
+    freeReplyObject(reply);
+
+    disconnect(c, 0);
+}
+
+static void test_blocking_connection_timeouts(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    ssize_t s;
+    const char *cmd = "DEBUG SLEEP 3\r\n";
+    struct timeval tv;
+
+    c = connect(config);
+    test("Successfully completes a command when the timeout is not exceeded: ");
+    reply = redisCommand(c,"SET foo fast");
+    freeReplyObject(reply);
+    tv.tv_sec = 0;
+    tv.tv_usec = 10000;
+    redisSetTimeout(c, tv);
+    reply = redisCommand(c, "GET foo");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STRING && memcmp(reply->str, "fast", 4) == 0);
+    freeReplyObject(reply);
+    disconnect(c, 0);
+
+    c = connect(config);
+    test("Does not return a reply when the command times out: ");
+    s = write(c->fd, cmd, strlen(cmd));
+    tv.tv_sec = 0;
+    tv.tv_usec = 10000;
+    redisSetTimeout(c, tv);
+    reply = redisCommand(c, "GET foo");
+    test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Resource temporarily unavailable") == 0);
+    freeReplyObject(reply);
+
+    test("Reconnect properly reconnects after a timeout: ");
+    redisReconnect(c);
+    reply = redisCommand(c, "PING");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
+    freeReplyObject(reply);
+
+    test("Reconnect properly uses owned parameters: ");
+    config.tcp.host = "foo";
+    config.unix.path = "foo";
+    redisReconnect(c);
+    reply = redisCommand(c, "PING");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
+    freeReplyObject(reply);
+
+    disconnect(c, 0);
+}
+
+static void test_blocking_io_errors(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    void *_reply;
+    int major, minor;
+
+    /* Connect to target given by config. */
+    c = connect(config);
+    {
+        /* Find out Redis version to determine the path for the next test */
+        const char *field = "redis_version:";
+        char *p, *eptr;
+
+        reply = redisCommand(c,"INFO");
+        p = strstr(reply->str,field);
+        major = strtol(p+strlen(field),&eptr,10);
+        p = eptr+1; /* char next to the first "." */
+        minor = strtol(p,&eptr,10);
+        freeReplyObject(reply);
+    }
+
+    test("Returns I/O error when the connection is lost: ");
+    reply = redisCommand(c,"QUIT");
+    if (major > 2 || (major == 2 && minor > 0)) {
+        /* > 2.0 returns OK on QUIT and read() should be issued once more
+         * to know the descriptor is at EOF. */
+        test_cond(strcasecmp(reply->str,"OK") == 0 &&
+            redisGetReply(c,&_reply) == REDIS_ERR);
+        freeReplyObject(reply);
+    } else {
+        test_cond(reply == NULL);
+    }
+
+    /* On 2.0, QUIT will cause the connection to be closed immediately and
+     * the read(2) for the reply on QUIT will set the error to EOF.
+     * On >2.0, QUIT will return with OK and another read(2) needed to be
+     * issued to find out the socket was closed by the server. In both
+     * conditions, the error will be set to EOF. */
+    assert(c->err == REDIS_ERR_EOF &&
+        strcmp(c->errstr,"Server closed the connection") == 0);
+    redisFree(c);
+
+    c = connect(config);
+    test("Returns I/O error on socket timeout: ");
+    struct timeval tv = { 0, 1000 };
+    assert(redisSetTimeout(c,tv) == REDIS_OK);
+    test_cond(redisGetReply(c,&_reply) == REDIS_ERR &&
+        c->err == REDIS_ERR_IO && errno == EAGAIN);
+    redisFree(c);
+}
+
+static void test_invalid_timeout_errors(struct config config) {
+    redisContext *c;
+
+    test("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: ");
+
+    config.tcp.timeout.tv_sec = 0;
+    config.tcp.timeout.tv_usec = 10000001;
+
+    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
+
+    test_cond(c->err == REDIS_ERR_IO);
+    redisFree(c);
+
+    test("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
+
+    config.tcp.timeout.tv_sec = (((LONG_MAX) - 999) / 1000) + 1;
+    config.tcp.timeout.tv_usec = 0;
+
+    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
+
+    test_cond(c->err == REDIS_ERR_IO);
+    redisFree(c);
+}
+
+static void test_throughput(struct config config) {
+    redisContext *c = connect(config);
+    redisReply **replies;
+    int i, num;
+    long long t1, t2;
+
+    test("Throughput:\n");
+    for (i = 0; i < 500; i++)
+        freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
+
+    num = 1000;
+    replies = malloc(sizeof(redisReply*)*num);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        replies[i] = redisCommand(c,"PING");
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    free(replies);
+    printf("\t(%dx PING: %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    replies = malloc(sizeof(redisReply*)*num);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        replies[i] = redisCommand(c,"LRANGE mylist 0 499");
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
+        assert(replies[i] != NULL && replies[i]->elements == 500);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    free(replies);
+    printf("\t(%dx LRANGE with 500 elements: %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    num = 10000;
+    replies = malloc(sizeof(redisReply*)*num);
+    for (i = 0; i < num; i++)
+        redisAppendCommand(c,"PING");
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    free(replies);
+    printf("\t(%dx PING (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    replies = malloc(sizeof(redisReply*)*num);
+    for (i = 0; i < num; i++)
+        redisAppendCommand(c,"LRANGE mylist 0 499");
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
+        assert(replies[i] != NULL && replies[i]->elements == 500);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    free(replies);
+    printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    disconnect(c, 0);
+}
+
+// static long __test_callback_flags = 0;
+// static void __test_callback(redisContext *c, void *privdata) {
+//     ((void)c);
+//     /* Shift to detect execution order */
+//     __test_callback_flags <<= 8;
+//     __test_callback_flags |= (long)privdata;
+// }
+//
+// static void __test_reply_callback(redisContext *c, redisReply *reply, void *privdata) {
+//     ((void)c);
+//     /* Shift to detect execution order */
+//     __test_callback_flags <<= 8;
+//     __test_callback_flags |= (long)privdata;
+//     if (reply) freeReplyObject(reply);
+// }
+//
+// static redisContext *__connect_nonblock() {
+//     /* Reset callback flags */
+//     __test_callback_flags = 0;
+//     return redisConnectNonBlock("127.0.0.1", port, NULL);
+// }
+//
+// static void test_nonblocking_connection() {
+//     redisContext *c;
+//     int wdone = 0;
+//
+//     test("Calls command callback when command is issued: ");
+//     c = __connect_nonblock();
+//     redisSetCommandCallback(c,__test_callback,(void*)1);
+//     redisCommand(c,"PING");
+//     test_cond(__test_callback_flags == 1);
+//     redisFree(c);
+//
+//     test("Calls disconnect callback on redisDisconnect: ");
+//     c = __connect_nonblock();
+//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
+//     redisDisconnect(c);
+//     test_cond(__test_callback_flags == 2);
+//     redisFree(c);
+//
+//     test("Calls disconnect callback and free callback on redisFree: ");
+//     c = __connect_nonblock();
+//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
+//     redisSetFreeCallback(c,__test_callback,(void*)4);
+//     redisFree(c);
+//     test_cond(__test_callback_flags == ((2 << 8) | 4));
+//
+//     test("redisBufferWrite against empty write buffer: ");
+//     c = __connect_nonblock();
+//     test_cond(redisBufferWrite(c,&wdone) == REDIS_OK && wdone == 1);
+//     redisFree(c);
+//
+//     test("redisBufferWrite against not yet connected fd: ");
+//     c = __connect_nonblock();
+//     redisCommand(c,"PING");
+//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
+//               strncmp(c->error,"write:",6) == 0);
+//     redisFree(c);
+//
+//     test("redisBufferWrite against closed fd: ");
+//     c = __connect_nonblock();
+//     redisCommand(c,"PING");
+//     redisDisconnect(c);
+//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
+//               strncmp(c->error,"write:",6) == 0);
+//     redisFree(c);
+//
+//     test("Process callbacks in the right sequence: ");
+//     c = __connect_nonblock();
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)1,"PING");
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)3,"PING");
+//
+//     /* Write output buffer */
+//     wdone = 0;
+//     while(!wdone) {
+//         usleep(500);
+//         redisBufferWrite(c,&wdone);
+//     }
+//
+//     /* Read until at least one callback is executed (the 3 replies will
+//      * arrive in a single packet, causing all callbacks to be executed in
+//      * a single pass). */
+//     while(__test_callback_flags == 0) {
+//         assert(redisBufferRead(c) == REDIS_OK);
+//         redisProcessCallbacks(c);
+//     }
+//     test_cond(__test_callback_flags == 0x010203);
+//     redisFree(c);
+//
+//     test("redisDisconnect executes pending callbacks with NULL reply: ");
+//     c = __connect_nonblock();
+//     redisSetDisconnectCallback(c,__test_callback,(void*)1);
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
+//     redisDisconnect(c);
+//     test_cond(__test_callback_flags == 0x0201);
+//     redisFree(c);
+// }
+
+int main(int argc, char **argv) {
+    struct config cfg = {
+        .tcp = {
+            .host = "127.0.0.1",
+            .port = 6379
+        },
+        .unix = {
+            .path = "/tmp/redis.sock"
+        }
+    };
+    int throughput = 1;
+    int test_inherit_fd = 1;
+
+    /* Ignore broken pipe signal (for I/O error tests). */
+    signal(SIGPIPE, SIG_IGN);
+
+    /* Parse command line options. */
+    argv++; argc--;
+    while (argc) {
+        if (argc >= 2 && !strcmp(argv[0],"-h")) {
+            argv++; argc--;
+            cfg.tcp.host = argv[0];
+        } else if (argc >= 2 && !strcmp(argv[0],"-p")) {
+            argv++; argc--;
+            cfg.tcp.port = atoi(argv[0]);
+        } else if (argc >= 2 && !strcmp(argv[0],"-s")) {
+            argv++; argc--;
+            cfg.unix.path = argv[0];
+        } else if (argc >= 1 && !strcmp(argv[0],"--skip-throughput")) {
+            throughput = 0;
+        } else if (argc >= 1 && !strcmp(argv[0],"--skip-inherit-fd")) {
+            test_inherit_fd = 0;
+        } else {
+            fprintf(stderr, "Invalid argument: %s\n", argv[0]);
+            exit(1);
+        }
+        argv++; argc--;
+    }
+
+    test_format_commands();
+    test_reply_reader();
+    test_blocking_connection_errors();
+    test_free_null();
+
+    printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
+    cfg.type = CONN_TCP;
+    test_blocking_connection(cfg);
+    test_blocking_connection_timeouts(cfg);
+    test_blocking_io_errors(cfg);
+    test_invalid_timeout_errors(cfg);
+    test_append_formatted_commands(cfg);
+    if (throughput) test_throughput(cfg);
+
+    printf("\nTesting against Unix socket connection (%s):\n", cfg.unix.path);
+    cfg.type = CONN_UNIX;
+    test_blocking_connection(cfg);
+    test_blocking_connection_timeouts(cfg);
+    test_blocking_io_errors(cfg);
+    if (throughput) test_throughput(cfg);
+
+    if (test_inherit_fd) {
+        printf("\nTesting against inherited fd (%s):\n", cfg.unix.path);
+        cfg.type = CONN_FD;
+        test_blocking_connection(cfg);
+    }
+
+
+    if (fails) {
+        printf("*** %d TESTS FAILED ***\n", fails);
+        return 1;
+    }
+
+    printf("ALL TESTS PASSED\n");
+    return 0;
+}
diff --git a/debian/modules/nchan/src/hiredis/win32.h b/debian/modules/nchan/src/hiredis/win32.h
new file mode 100644
index 0000000..1a27c18
--- /dev/null
+++ b/debian/modules/nchan/src/hiredis/win32.h
@@ -0,0 +1,42 @@
+#ifndef _WIN32_HELPER_INCLUDE
+#define _WIN32_HELPER_INCLUDE
+#ifdef _MSC_VER
+
+#ifndef inline
+#define inline __inline
+#endif
+
+#ifndef va_copy
+#define va_copy(d,s) ((d) = (s))
+#endif
+
+#ifndef snprintf
+#define snprintf c99_snprintf
+
+__inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
+{
+    int count = -1;
+
+    if (size != 0)
+        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
+    if (count == -1)
+        count = _vscprintf(format, ap);
+
+    return count;
+}
+
+__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
+{
+    int count;
+    va_list ap;
+
+    va_start(ap, format);
+    count = c99_vsnprintf(str, size, format, ap);
+    va_end(ap);
+
+    return count;
+}
+#endif
+
+#endif
+#endif
\ No newline at end of file
diff --git a/debian/modules/nchan/src/nchan_commands.rb b/debian/modules/nchan/src/nchan_commands.rb
new file mode 100644
index 0000000..8f4126a
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_commands.rb
@@ -0,0 +1,412 @@
+CfCmd.new do
+  
+  nchan_channel_id [:srv, :loc, :if],
+      :nchan_set_pubsub_channel_id,
+      :loc_conf,
+      args: 1..7,
+      alt: [ :nchan_pubsub_channel_id ],
+      
+      group: "pubsub",
+      default: "(none)",
+      info: "Channel id for a publisher or subscriber location. Can have up to 4 values to subscribe to up to 4 channels."
+  
+  nchan_publisher_channel_id [:srv, :loc, :if],
+      :nchan_set_pub_channel_id,
+      :loc_conf,
+      args: 1..7,
+      alt: [ :nchan_pub_channel_id ],
+      
+      group: "pubsub",
+      default: "(none)",
+      info: "Channel id for publisher location."
+  
+  nchan_publisher_upstream_request [:srv, :loc, :if],
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :publisher_upstream_request_url],
+      
+      group: "pubsub",
+      value: "<url>",
+      info: <<-EOS.gsub(/^ {8}/, '')
+        Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.  
+        The upstream response code determine how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.
+      EOS
+  
+  nchan_channel_id_split_delimiter [:srv, :loc, :if],
+      :ngx_conf_set_str_slot,
+      [:loc_conf, :channel_id_split_delimiter],
+      
+      group: "pubsub",
+      default: "(none)",
+      info: "Split the channel id into several ids for multiplexing using the delimiter string provided."
+      
+  
+  nchan_subscriber_channel_id [:srv, :loc, :if],
+      :nchan_set_sub_channel_id,
+      :loc_conf,
+      args: 1..7,
+      alt: [ :nchan_sub_channel_id ],
+      group: "pubsub",
+      
+      default: "(none)",
+      info: "Channel id for subscriber location. Can have up to 4 values to subscribe to up to 4 channels."
+  
+  nchan_pubsub [:srv, :loc, :if],
+      :nchan_pubsub_directive,
+      :loc_conf,
+      args: 0..6,
+      
+      group: "pubsub",
+      value: ["http", "websocket", "eventsource", "longpoll", "intervalpoll", "chunked", "multipart-mixed", "http-raw-stream"],
+      default: ["http", "websocket", "eventsource", "longpoll", "chunked", "multipart-mixed"],
+      info: "Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server."
+  
+  
+  nchan_longpoll_multipart_response [:srv, :loc, :if],
+      :nchan_set_longpoll_multipart,
+      [:loc_conf, :longpoll_multimsg],
+      args: 1,
+      
+      group: "pubsub",
+      default: "off",
+      value: ["off", "on", "raw"],
+      info: "when set to 'on', enable sending multiple messages in a single longpoll response, separated using the multipart/mixed content-type scheme. If there is only one available message in response to a long-poll request, it is sent unmodified. This is useful for high-latency long-polling connections as a way to minimize round-trips to the server. When set to 'raw', sends multiple messages using the http-raw-stream message separator."
+  
+  nchan_eventsource_event [:srv, :loc, :if],
+      :ngx_conf_set_str_slot,
+      [:loc_conf, :eventsource_event],
+      args: 1,
+      
+      group: "pubsub",
+      default: "(none)",
+      info: "Set the EventSource `event:` line to this value. When used in a publisher location, overrides the published message's `X-EventSource-Event` header and associates the message with the given value. When used in a subscriber location, overrides all messages' associated `event:` string with the given value."
+      
+  
+  nchan_subscriber [:srv, :loc, :if],
+      :nchan_subscriber_directive,
+      :loc_conf,
+      args: 0..5,
+      legacy: "push_subscriber",
+      
+      group: "pubsub",
+      value: ["websocket", "eventsource", "longpoll", "intervalpoll", "chunked", "multipart-mixed", "http-raw-stream"],
+      default: ["websocket", "eventsource", "longpoll", "chunked", "multipart-mixed"],
+      info: "Defines a server or location as a channel subscriber endpoint. This location represents a subscriber's interface to a channel's message queue. The queue is traversed automatically, starting at the position defined by the `nchan_subscriber_first_message` setting.  \n The value is a list of permitted subscriber types." 
+  
+  nchan_subscriber_compound_etag_message_id [:srv, :loc, :if], 
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, :msg_in_etag_only],
+      args: 1,
+      
+      group: "pubsub",
+      default: "off",
+      info: <<-EOS.gsub(/^ {8}/, '')
+        Override the default behavior of using both `Last-Modified` and `Etag` headers for the message id.  
+        Enabling this option packs the entire message id into the `Etag` header, and discards
+        `Last-Modified` and `If-Modified-Since` headers.
+      EOS
+      
+  nchan_subscriber_message_id_custom_etag_header [:srv, :loc, :if], 
+      :ngx_conf_set_str_slot, 
+      [:loc_conf, :custom_msgtag_header],
+      args: 1,
+      
+      group: "pubsub",
+      default: "(none)",
+      info: <<-EOS.gsub(/^ {8}/, '')
+        Use a custom header instead of the Etag header for message ID in subscriber responses. This setting is a hack, useful when behind a caching proxy such as Cloudflare that under some conditions (like using gzip encoding) swallow the Etag header.
+      EOS
+  
+  nchan_subscriber_last_message_id [:srv, :loc, :if], 
+      :nchan_subscriber_last_message_id,
+      :loc_conf,
+      args: 1..5,
+      
+      group: "pubsub",
+      default: ["$http_last_event_id", "$arg_last_event_id"],
+      info: "If `If-Modified-Since` and `If-None-Match` headers are absent, set the message id to the first non-empty of these values. Used primarily as a workaround for the inability to set the first `Last-Message-Id` of a web browser's EventSource object. "
+  
+  nchan_subscriber_http_raw_stream_separator [:srv, :loc, :if],
+      :nchan_set_raw_subscriber_separator,
+      [:loc_conf, :subscriber_http_raw_stream_separator],
+      args: 1,
+      
+      group: "pubsub",
+      value: "<string>",
+      default: "\\n",
+      info: "Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character."
+  
+  nchan_subscriber_first_message [:srv, :loc, :if],
+      :nchan_subscriber_first_message_directive,
+      :loc_conf,
+      args: 1,
+      
+      group: "pubsub",
+      value: ["oldest", "newest", "<number>"],
+      default: "oldest",
+      info: "Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` start at `n`th from now). 0 is equivalent to 'newest'."
+  
+  
+  #nchan_subscriber_concurrency [:main, :srv, :loc, :if],
+  #    :nchan_set_subscriber_concurrency,
+  #    [:loc_conf, :subscriber_concurrency],
+  #    legacy: "push_subscriber_concurrency",
+  #    
+  #    group: "pubsub",
+  #    value: [ :last, :first, :broadcast ],
+  #    info: "Controls how multiple subscriber requests to a channel (identified by some common ID) are handled.The values work as follows:
+  #    - broadcast: any number of concurrent subscriber requests may be held.
+  #    - last: only the most recent subscriber request is kept, all others get a 409 Conflict response.
+  #    - first: only the oldest subscriber request is kept, all others get a 409 Conflict response."
+  
+  nchan_websocket_ping_interval [:srv, :loc, :if],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :websocket_ping_interval],
+      
+      group: "pubsub",
+      value: "<number> (seconds)",
+      default: "0 (none)",
+      info: "Interval for sending websocket ping frames. Disabled by default."
+  
+  nchan_publisher [:srv, :loc, :if],
+      :nchan_publisher_directive,
+      :loc_conf,
+      args: 0..2,
+      legacy: "push_publisher",
+      
+      group: "pubsub",
+      value: ["http", "websocket"],
+      default: ["http", "websocket"],
+      info: "Defines a server or location as a publisher endpoint. Requests to a publisher location are treated as messages to be sent to subscribers. See the protocol documentation for a detailed description."
+  
+  nchan_subscriber_timeout [:main, :srv, :loc, :if],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :subscriber_timeout],
+      legacy: "push_subscriber_timeout",
+      
+      group: "pubsub",
+      value: "<number> (seconds)",
+      default: "0 (none)",
+      info: "Maximum time a subscriber may wait for a message before being disconnected. If you don't want a subscriber's connection to timeout, set this to 0. When possible, the subscriber will get a response with a `408 Request Timeout` status; otherwise the subscriber will simply be disconnected."
+  
+  nchan_authorize_request [:srv, :loc, :if], 
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :authorize_request_url],
+      
+      group: "security",
+      value: "<url>",
+      info: "Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it."
+  
+  nchan_store_messages [:main, :srv, :loc, :if],
+      :nchan_store_messages_directive,
+      :loc_conf,
+      legacy: "push_store_messages",
+      
+      group: "storage",
+      value: [:on, :off],
+      default: :on,
+      info: "Publisher configuration. \"`off`\" is equivalent to setting `nchan_message_buffer_length 0`, which disables the buffering of old messages. Using this setting is not recommended when publishing very quickly, as it may result in missed messages."
+    
+  nchan_max_reserved_memory [:main],
+      :ngx_conf_set_size_slot,
+      [:main_conf, :shm_size],
+      legacy: "push_max_reserved_memory",
+      
+      group: "storage",
+      value: "<size>",
+      default: "32M",
+      info: "The size of the shared memory chunk this module will use for message queuing and buffering."
+    
+  nchan_redis_url [:main, :srv, :loc],
+      :ngx_conf_set_redis_url,
+      [:loc_conf, :"redis.url"],
+      
+      group: "storage",
+      default: "127.0.0.1:6379",
+      info: "The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted."
+  
+  nchan_redis_pass [:main, :srv, :loc],
+      :ngx_conf_set_redis_upstream_pass,
+      [:loc_conf, :"redis"],
+      
+      group: "storage",
+      info: "Use an upstream config block for Redis servers."
+  
+  nchan_redis_pass_inheritable [:main, :srv, :loc],
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, :"redis.upstream_inheritable"],
+      
+      undocumented: true,
+      group: "debug"
+  
+  nchan_redis_publish_msgpacked_max_size [:main],
+      :ngx_conf_set_size_slot,
+      [:main_conf, :redis_publish_message_msgkey_size],
+      undocumented: true,
+      group: "storage"
+  
+  nchan_redis_server [:upstream],
+      :ngx_conf_upstream_redis_server,
+      :loc_conf,
+      group: "storage",
+      info: "Used in upstream { } blocks to set redis servers."
+  
+  nchan_use_redis [:main, :srv, :loc],
+      :ngx_conf_enable_redis,
+      [:loc_conf, :"redis.url_enabled"],
+      
+      group: "storage",
+      value: [ :on, :off ],
+      default: :off,
+      info: "Use redis for message storage at this location."
+  
+  nchan_redis_ping_interval [:main, :srv, :loc],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :"redis.ping_interval"],
+      
+      group: "storage",
+      default: "4m",
+      info: "Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable."
+  
+  nchan_redis_fakesub_timer_interval [:main],
+      :ngx_conf_set_msec_slot,
+      [:main_conf, :redis_fakesub_timer_interval],
+      
+      group: "tweak",
+      undocumented: true,
+      default: "100ms"
+  
+  nchan_redis_idle_channel_cache_timeout [:main, :srv, :loc],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :redis_idle_channel_cache_timeout],
+      
+      group: "storage",
+      value: "<time>",
+      default: "30s",
+      info: "A Redis-stored channel and its messages are removed from memory (local cache) after this timeout, provided there are no local subscribers."
+  
+  nchan_message_timeout [:main, :srv, :loc], 
+      :ngx_conf_set_sec_slot, 
+      [:loc_conf, :buffer_timeout],
+      legacy: "push_message_timeout",
+      
+      group: "storage",
+      value: "<time>",
+      default: "1h",
+      info: "Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Applicable only if a nchan_publisher is present in this or a child context."
+  
+  nchan_message_buffer_length [:main, :srv, :loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, :max_messages],
+      legacy: [ "push_max_message_buffer_length", "push_message_buffer_length" ],
+      alt: ["nchan_message_max_buffer_length"],
+      
+      group: "storage",
+      value: "<number>",
+      default: 10,
+      info: "Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages."
+  
+  nchan_subscribe_existing_channels_only [:main, :srv, :loc],
+      :ngx_conf_set_flag_slot, 
+      [:loc_conf, :subscribe_only_existing_channel],
+      legacy: "push_authorized_channels_only",
+      
+      group: "security",
+      value: [:on, :off],
+      default: :off,
+      info: "Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response."
+  
+  nchan_access_control_allow_origin [:main, :srv, :loc], 
+      :ngx_conf_set_str_slot,
+      [:loc_conf, :allow_origin],
+      args: 1,
+      
+      group: "security",
+      value: "<string>",
+      default: "*",
+      info: "Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the publisher or subscriber request's `Origin` header does not match this value, respond with a `403 Forbidden`."
+  
+  nchan_channel_group [:srv, :loc, :if], 
+      :ngx_conf_set_str_slot, 
+      [:loc_conf, :channel_group],
+      legacy: "push_channel_group",
+      
+      group: "security",
+      value: "<string>",
+      default: "(none)",
+      info: "Because settings are bound to locations and not individual channels, it is useful to be able to have channels that can be reached only from some locations and never others. That's where this setting comes in. Think of it as a prefix string for the channel id."
+  
+  nchan_channel_events_channel_id [:srv, :loc, :if],
+      :nchan_set_channel_events_channel_id,
+      :loc_conf,
+      args: 1,
+      
+      group: "meta",
+      info: "Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'."
+  
+  nchan_stub_status [:loc],
+      :nchan_stub_status_directive,
+      :loc_conf,
+      args: 0,
+      
+      group: "meta",
+      info: "Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc."
+  
+  nchan_channel_event_string [:srv, :loc, :if], 
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :channel_event_string],
+      
+      group: "meta",
+      value: "<string>",
+      default: "$nchan_channel_event $nchan_channel_id",
+      info: "Contents of channel event message"
+  
+  nchan_max_channel_id_length [:main, :srv, :loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, :max_channel_id_length],
+      legacy: "push_max_channel_id_length",
+      
+      group: "security",
+      value: "<number>",
+      default: 512,
+      info: "Maximum permissible channel id length (number of characters). Longer ids will be truncated."
+  
+  nchan_max_channel_subscribers [:main, :srv, :loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, :max_channel_subscribers],
+      legacy: "push_max_channel_subscribers",
+      
+      group: "security",
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum concurrent subscribers."
+  
+  nchan_channel_timeout [:main, :srv, :loc],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :channel_timeout],
+      legacy: "push_channel_timeout",
+      
+      group: "development",
+      info: "Amount of time an empty channel hangs around. Don't mess with this setting unless you know what you are doing!"
+  
+  nchan_storage_engine [:main, :srv, :loc],
+      :nchan_set_storage_engine, 
+      [:loc_conf, :storage_engine],
+      
+      group: "development",
+      value: ["memory", "redis"],
+      default: "memory",
+      info: "Development directive to completely replace default storage engine. Don't use unless you are an Nchan developer."
+  
+  push_min_message_buffer_length [:srv, :loc, :if],
+      :nchan_ignore_obsolete_setting,
+      :loc_conf,
+      undocumented: true,
+      group: "obsolete"
+  
+  push_subscriber_concurrency [:srv, :loc, :if],
+      :nchan_ignore_subscriber_concurrency,
+      :loc_conf,
+      undocumented: true,
+      group: "obsolete"
+  
+end
diff --git a/debian/modules/nchan/src/nchan_config_commands.c b/debian/modules/nchan/src/nchan_config_commands.c
new file mode 100644
index 0000000..2b0d492
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_config_commands.c
@@ -0,0 +1,408 @@
+//AUTOGENERATED, do not edit! see nchan_commands.rb
+static ngx_command_t  nchan_commands[] = {
+    { ngx_string("nchan_channel_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_pubsub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_pubsub_channel_id"), //alt for nchan_channel_id
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_pubsub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_publisher_channel_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_pub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_pub_channel_id"), //alt for nchan_publisher_channel_id
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_pub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_publisher_upstream_request"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, publisher_upstream_request_url),
+    NULL } ,
+
+  { ngx_string("nchan_channel_id_split_delimiter"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_id_split_delimiter),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_channel_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_sub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_sub_channel_id"), //alt for nchan_subscriber_channel_id
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_sub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_pubsub"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6,
+    nchan_pubsub_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_longpoll_multipart_response"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_set_longpoll_multipart,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, longpoll_multimsg),
+    NULL } ,
+
+  { ngx_string("nchan_eventsource_event"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_event),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
+    nchan_subscriber_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("push_subscriber"), //legacy for nchan_subscriber
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
+    nchan_subscriber_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_compound_etag_message_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, msg_in_etag_only),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_message_id_custom_etag_header"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, custom_msgtag_header),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_last_message_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
+    nchan_subscriber_last_message_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_http_raw_stream_separator"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_set_raw_subscriber_separator,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_http_raw_stream_separator),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_first_message"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_subscriber_first_message_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_websocket_ping_interval"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, websocket_ping_interval),
+    NULL } ,
+
+  { ngx_string("nchan_publisher"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    nchan_publisher_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("push_publisher"), //legacy for nchan_publisher
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    nchan_publisher_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_timeout"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_timeout),
+    NULL } ,
+  { ngx_string("push_subscriber_timeout"), //legacy for nchan_subscriber_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_authorize_request"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, authorize_request_url),
+    NULL } ,
+
+  { ngx_string("nchan_store_messages"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_store_messages_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("push_store_messages"), //legacy for nchan_store_messages
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_store_messages_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_max_reserved_memory"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, shm_size),
+    NULL } ,
+  { ngx_string("push_max_reserved_memory"), //legacy for nchan_max_reserved_memory
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, shm_size),
+    NULL } ,
+
+  { ngx_string("nchan_redis_url"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_url,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.url),
+    NULL } ,
+
+  { ngx_string("nchan_redis_pass"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_upstream_pass,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis),
+    NULL } ,
+
+  { ngx_string("nchan_redis_pass_inheritable"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.upstream_inheritable),
+    NULL } ,
+
+  { ngx_string("nchan_redis_publish_msgpacked_max_size"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, redis_publish_message_msgkey_size),
+    NULL } ,
+
+  { ngx_string("nchan_redis_server"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_upstream_redis_server,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_use_redis"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_enable_redis,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.url_enabled),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ping_interval"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.ping_interval),
+    NULL } ,
+
+  { ngx_string("nchan_redis_fakesub_timer_interval"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, redis_fakesub_timer_interval),
+    NULL } ,
+
+  { ngx_string("nchan_redis_idle_channel_cache_timeout"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis_idle_channel_cache_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_message_timeout"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, buffer_timeout),
+    NULL } ,
+  { ngx_string("push_message_timeout"), //legacy for nchan_message_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, buffer_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_message_buffer_length"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_messages),
+    NULL } ,
+  { ngx_string("push_max_message_buffer_length"), //legacy for nchan_message_buffer_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_messages),
+    NULL } ,
+  { ngx_string("push_message_buffer_length"), //legacy for nchan_message_buffer_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_messages),
+    NULL } ,
+  { ngx_string("nchan_message_max_buffer_length"), //alt for nchan_message_buffer_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_messages),
+    NULL } ,
+
+  { ngx_string("nchan_subscribe_existing_channels_only"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscribe_only_existing_channel),
+    NULL } ,
+  { ngx_string("push_authorized_channels_only"), //legacy for nchan_subscribe_existing_channels_only
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscribe_only_existing_channel),
+    NULL } ,
+
+  { ngx_string("nchan_access_control_allow_origin"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, allow_origin),
+    NULL } ,
+
+  { ngx_string("nchan_channel_group"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_group),
+    NULL } ,
+  { ngx_string("push_channel_group"), //legacy for nchan_channel_group
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_group),
+    NULL } ,
+
+  { ngx_string("nchan_channel_events_channel_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_set_channel_events_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_stub_status"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
+    nchan_stub_status_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_channel_event_string"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_event_string),
+    NULL } ,
+
+  { ngx_string("nchan_max_channel_id_length"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_id_length),
+    NULL } ,
+  { ngx_string("push_max_channel_id_length"), //legacy for nchan_max_channel_id_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_id_length),
+    NULL } ,
+
+  { ngx_string("nchan_max_channel_subscribers"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_subscribers),
+    NULL } ,
+  { ngx_string("push_max_channel_subscribers"), //legacy for nchan_max_channel_subscribers
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_subscribers),
+    NULL } ,
+
+  { ngx_string("nchan_channel_timeout"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_timeout),
+    NULL } ,
+  { ngx_string("push_channel_timeout"), //legacy for nchan_channel_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_storage_engine"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_storage_engine,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, storage_engine),
+    NULL } ,
+
+  { ngx_string("push_min_message_buffer_length"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_obsolete_setting,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("push_subscriber_concurrency"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_subscriber_concurrency,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+
+  ngx_null_command
+};
diff --git a/debian/modules/nchan/src/nchan_defs.c b/debian/modules/nchan/src/nchan_defs.c
new file mode 100644
index 0000000..c9e07e1
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_defs.c
@@ -0,0 +1,91 @@
+#include <ngx_http.h>
+#include "nchan_defs.h"
+
+//string constants
+//headers
+const  ngx_str_t NCHAN_HEADER_ETAG = ngx_string("Etag");
+const  ngx_str_t NCHAN_HEADER_IF_NONE_MATCH = ngx_string("If-None-Match");
+const  ngx_str_t NCHAN_HEADER_VARY = ngx_string("Vary");
+const  ngx_str_t NCHAN_HEADER_ALLOW = ngx_string("Allow");
+const  ngx_str_t NCHAN_HEADER_CACHE_CONTROL = ngx_string("Cache-Control");
+const  ngx_str_t NCHAN_HEADER_PRAGMA = ngx_string("Pragma");
+const  ngx_str_t NCHAN_HEADER_ORIGIN = ngx_string("Origin");
+
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS = ngx_string("Access-Control-Allow-Headers");
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS = ngx_string("Access-Control-Allow-Methods");
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN = ngx_string("Access-Control-Allow-Origin");
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS = ngx_string("Access-Control-Expose-Headers");
+
+const  ngx_str_t NCHAN_HEADER_EVENTSOURCE_EVENT = ngx_string("X-EventSource-Event");
+
+//websocket headers
+
+const ngx_str_t NCHAN_HEADER_CONNECTION = ngx_string("Connection");
+const ngx_str_t NCHAN_HEADER_UPGRADE = ngx_string("Upgrade");
+const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_KEY = ngx_string("Sec-WebSocket-Key");
+const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT = ngx_string("Sec-WebSocket-Accept");
+const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_VERSION = ngx_string("Sec-WebSocket-Version");
+const ngx_str_t NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL = ngx_string("Sec-WebSocket-Protocol");
+
+//and some wobsockety values
+const ngx_str_t NCHAN_UPGRADE = ngx_string("Upgrade");
+const ngx_str_t NCHAN_WEBSOCKET = ngx_string("websocket");
+
+
+//header values
+const  ngx_str_t NCHAN_CACHE_CONTROL_VALUE = ngx_string("no-cache");
+
+//status strings
+const  ngx_str_t NCHAN_HTTP_STATUS_101 = ngx_string("101 Switching Protocols");
+const  ngx_str_t NCHAN_HTTP_STATUS_204 = ngx_string("204 No Content");
+const  ngx_str_t NCHAN_HTTP_STATUS_304 = ngx_string("304 Not Modified");
+const  ngx_str_t NCHAN_HTTP_STATUS_408 = ngx_string("408 Request Timeout");
+const  ngx_str_t NCHAN_HTTP_STATUS_409 = ngx_string("409 Conflict");
+const  ngx_str_t NCHAN_HTTP_STATUS_410 = ngx_string("410 Gone");
+
+//other stuff
+const  ngx_str_t NCHAN_SUBSCRIBER_TIMEOUT= ngx_string("Subscriber Timeout");
+const  ngx_str_t NCHAN_ANYSTRING= ngx_string("*");
+const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS = ngx_string("Content-Type");
+const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS = ngx_string("If-None-Match, If-Modified-Since, Content-Type, Cache-Control, X-EventSource-Event");
+const  ngx_str_t NCHAN_ALLOW_GET_POST_PUT_DELETE= ngx_string("GET, POST, PUT, DELETE");
+const  ngx_str_t NCHAN_ALLOW_GET= ngx_string("GET");
+
+const  ngx_str_t NCHAN_VARY_HEADER_VALUE = ngx_string("If-None-Match, If-Modified-Since");
+const  ngx_str_t NCHAN_MSG_RESPONSE_ALLOWED_HEADERS = ngx_string("Last-Modified, Etag, Content-Type");
+const  char *NCHAN_MSG_RESPONSE_ALLOWED_CUSTOM_ETAG_HEADERS_STRF = "Last-Modified, %V, Content-Type";
+
+const ngx_str_t  NCHAN_CONTENT_TYPE_TEXT_PLAIN = ngx_string("text/plain");
+
+const ngx_str_t NCHAN_CHANNEL_INFO_PLAIN = ngx_string(
+  "queued messages: %ui" CRLF
+  "last requested: %d sec. ago" CRLF
+  "active subscribers: %ui" CRLF
+  "last message id: %V" 
+  "\0");
+
+const ngx_str_t NCHAN_CHANNEL_INFO_JSON = ngx_string(
+  "{\"messages\": %ui, "
+  "\"requested\": %d, "
+  "\"subscribers\": %ui, "
+  "\"last_message_id\": \"%V\" }"
+  "\0");
+
+const ngx_str_t NCHAN_CHANNEL_INFO_XML = ngx_string(
+  "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" CRLF
+  "<channel>" CRLF
+  "  <messages>%ui</messages>" CRLF
+  "  <requested>%d</requested>" CRLF
+  "  <subscribers>%ui</subscribers>" CRLF
+  "  <last_message_id>%V</last_message_id>" CRLF
+  "</channel>"
+  "\0");
+
+const ngx_str_t NCHAN_CHANNEL_INFO_YAML = ngx_string(
+  "---" CRLF
+  "messages: %ui" CRLF
+  "requested: %d" CRLF
+  "subscribers: %ui" CRLF
+  "last_message_id: %V" CRLF
+  CRLF
+  "\0");
diff --git a/debian/modules/nchan/src/nchan_defs.h b/debian/modules/nchan/src/nchan_defs.h
new file mode 100644
index 0000000..c67949c
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_defs.h
@@ -0,0 +1,107 @@
+#ifndef NCHAN_DEFS_H
+#define NCHAN_DEFS_H
+
+#define NCHAN_DEFAULT_SHM_SIZE 33554432 //32 megs
+#define NCHAN_DEFAULT_BUFFER_TIMEOUT 3600
+#define NCHAN_DEFAULT_REDIS_IDLE_CHANNEL_CACHE_TIMEOUT 30
+#define NCHAN_DEFAULT_SUBSCRIBER_TIMEOUT 0  //default: never timeout
+//(liucougar: this is a bit confusing, but it is what's the default behavior before this option is introducecd)
+#define NCHAN_DEFAULT_WEBSOCKET_PING_INTERVAL 0
+
+#define NCHAN_DEFAULT_CHANNEL_TIMEOUT 5 //default: timeout in 5 seconds
+
+#define NCHAN_DEFAULT_MIN_MESSAGES 1
+#define NCHAN_DEFAULT_MAX_MESSAGES 10
+
+#define NCHAN_SUBSCRIBER_DEFAULT_FIRST_MESSAGE 1
+#define NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET 4096
+
+#define NCHAN_MAX_CHANNEL_ID_LENGTH 1024 //bytes
+
+#define NCHAN_META_CHANNEL_MAX_MESSAGES 100
+#define NCHAN_META_CHANNEL_MESSAGE_TTL 10
+#define NCHAN_META_CHANNEL_TIMEOUT 30
+
+#ifndef NGX_HTTP_REQUEST_TIMEOUT
+#define NGX_HTTP_REQUEST_TIMEOUT 408
+#endif
+
+#ifndef NGX_HTTP_CONFLICT
+#define NGX_HTTP_CONFLICT 409
+#endif
+
+#ifndef NGX_HTTP_SWITCHING_PROTOCOLS
+#define NGX_HTTP_SWITCHING_PROTOCOLS       101
+#endif
+
+#ifndef NGX_HTTP_GONE
+#define NGX_HTTP_GONE 410
+#endif
+
+#ifndef NGX_HTTP_CREATED
+#define NGX_HTTP_CREATED 201
+#endif
+
+#ifndef NGX_HTTP_ACCEPTED
+#define NGX_HTTP_ACCEPTED 202
+#endif
+
+
+#define NCHAN_MESSAGE_RECEIVED  9000
+#define NCHAN_MESSAGE_QUEUED    9001
+
+extern const ngx_str_t NCHAN_HEADER_ETAG;
+extern const ngx_str_t NCHAN_HEADER_IF_NONE_MATCH;
+extern const ngx_str_t NCHAN_HEADER_VARY;
+extern const ngx_str_t NCHAN_HEADER_ALLOW;
+extern const ngx_str_t NCHAN_HEADER_CACHE_CONTROL;
+extern const ngx_str_t NCHAN_HEADER_PRAGMA;
+extern const ngx_str_t NCHAN_HEADER_ORIGIN;
+
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS;
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS;
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN;
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS;
+
+extern const ngx_str_t NCHAN_HEADER_EVENTSOURCE_EVENT;
+
+extern const ngx_str_t NCHAN_HEADER_CONNECTION;
+extern const ngx_str_t NCHAN_HEADER_UPGRADE;
+extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_KEY;
+extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT;
+extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_VERSION;
+extern const ngx_str_t NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL;
+
+//header values
+extern const  ngx_str_t NCHAN_CACHE_CONTROL_VALUE;
+
+//status strings
+extern const  ngx_str_t NCHAN_HTTP_STATUS_101;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_204;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_304;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_408;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_409;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_410;
+
+//other stuff
+
+extern const ngx_str_t NCHAN_UPGRADE;
+extern const ngx_str_t NCHAN_SUBSCRIBER_TIMEOUT;
+extern const ngx_str_t NCHAN_WEBSOCKET;
+extern const ngx_str_t NCHAN_ANYSTRING;
+extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS;
+extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS;
+extern const ngx_str_t NCHAN_ALLOW_GET_POST_PUT_DELETE;
+extern const ngx_str_t NCHAN_ALLOW_GET;
+extern const ngx_str_t NCHAN_VARY_HEADER_VALUE;
+extern const ngx_str_t NCHAN_MSG_RESPONSE_ALLOWED_HEADERS;
+extern const char *NCHAN_MSG_RESPONSE_ALLOWED_CUSTOM_ETAG_HEADERS_STRF;
+extern const ngx_str_t NCHAN_CONTENT_TYPE_TEXT_PLAIN;
+extern const ngx_str_t NCHAN_CHANNEL_INFO_PLAIN;
+extern const ngx_str_t NCHAN_CHANNEL_INFO_JSON;
+extern const ngx_str_t NCHAN_CHANNEL_INFO_XML;
+extern const ngx_str_t NCHAN_CHANNEL_INFO_YAML;
+
+#define NCHAN_REDIS_DEFAULT_URL "redis://127.0.0.1:6379"
+
+#endif /* NCHAN_DEFS_H */
diff --git a/debian/modules/nchan/src/nchan_module.c b/debian/modules/nchan/src/nchan_module.c
new file mode 100755
index 0000000..8a93fdb
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_module.c
@@ -0,0 +1,817 @@
+/*
+ *  Written by Leo Ponomarev 2009-2015
+ */
+
+#include <nchan_module.h>
+#include <util/nchan_subrequest.h>
+#include <assert.h>
+
+#include <subscribers/longpoll.h>
+#include <subscribers/intervalpoll.h>
+#include <subscribers/eventsource.h>
+#include <subscribers/http-chunked.h>
+#include <subscribers/http-multipart-mixed.h>
+#include <subscribers/http-raw-stream.h>
+#include <subscribers/websocket.h>
+#include <store/memory/store.h>
+#include <store/redis/store.h>
+
+#include <nchan_setup.c>
+
+#if FAKESHARD
+#include <store/memory/ipc.h>
+#include <store/memory/shmem.h>
+//#include <store/memory/store-private.h> //for debugging
+#endif
+#include <util/nchan_output.h>
+#include <nchan_websocket_publisher.h>
+
+ngx_int_t           nchan_worker_processes;
+int                 nchan_stub_status_enabled = 0;
+
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+//#define DEBUG_LEVEL NGX_LOG_DEBUG
+//#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "NCHAN:" fmt, ##args)
+
+ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *r, channel_event_type_t event_type) {
+  static nchan_loc_conf_t            evcf_data;
+  static nchan_loc_conf_t           *evcf = NULL;
+  
+  static ngx_str_t group =           ngx_string("meta");
+  
+  static ngx_str_t evt_sub_enqueue = ngx_string("subscriber_enqueue");
+  static ngx_str_t evt_sub_dequeue = ngx_string("subscriber_dequeue");
+  static ngx_str_t evt_sub_recvmsg = ngx_string("subscriber_receive_message");
+  static ngx_str_t evt_sub_recvsts = ngx_string("subscriber_receive_status");
+  static ngx_str_t evt_chan_publish= ngx_string("channel_publish");
+  static ngx_str_t evt_chan_delete = ngx_string("channel_delete");
+
+  struct timeval             tv;
+  
+  nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_http_complex_value_t  *cv = cf->channel_events_channel_id;
+  if(cv==NULL) {
+    //nothing to send
+    return NGX_OK;
+  }
+  
+  nchan_request_ctx_t       *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_str_t                  tmpid;
+  size_t                     sz;
+  ngx_str_t                 *id;
+  u_char                    *cur;
+  ngx_str_t                  evstr;
+  ngx_buf_t                  buf;
+  nchan_msg_t                msg;
+  
+  switch(event_type) {
+    case SUB_ENQUEUE:
+      ctx->channel_event_name = &evt_sub_enqueue;
+      break;
+    case SUB_DEQUEUE:
+      ctx->channel_event_name = &evt_sub_dequeue;
+      break;
+    case SUB_RECEIVE_MESSAGE:
+      ctx->channel_event_name = &evt_sub_recvmsg;
+      break;
+    case SUB_RECEIVE_STATUS:
+      ctx->channel_event_name = &evt_sub_recvsts;
+      break;
+    case CHAN_PUBLISH:
+      ctx->channel_event_name = &evt_chan_publish;
+      break;
+    case CHAN_DELETE:
+      ctx->channel_event_name = &evt_chan_delete;
+      break;
+  }
+  
+  //the id
+  ngx_http_complex_value(r, cv, &tmpid); 
+  sz = group.len + 1 + tmpid.len;
+  if((id = ngx_palloc(r->pool, sizeof(*id) + sz)) == NULL) {
+    nchan_log_request_error(r, "can't allocate space for legacy channel id");
+    return NGX_ERROR;
+  }
+  id->len = sz;
+  id->data = (u_char *)&id[1];
+  cur = id->data;  
+  ngx_memcpy(cur, group.data, group.len);
+  cur += group.len;
+  cur[0]='/';
+  cur++;
+  ngx_memcpy(cur, tmpid.data, tmpid.len);
+  
+  
+  //the event message
+  ngx_http_complex_value(r, cf->channel_event_string, &evstr);
+  ngx_memzero(&buf, sizeof(buf)); //do we really need this?...
+  buf.temporary = 1;
+  buf.memory = 1;
+  buf.last_buf = 1;
+  buf.pos = evstr.data;
+  buf.last = evstr.data + evstr.len;
+  buf.start = buf.pos;
+  buf.end = buf.last;
+  
+  ngx_memzero(&msg, sizeof(msg));
+  ngx_gettimeofday(&tv);
+  msg.id.time = tv.tv_sec;
+  msg.id.tagcount = 1;
+  msg.buf = &buf;
+  
+  
+  if(evcf == NULL) {
+    evcf = &evcf_data;
+    ngx_memzero(evcf, sizeof(*evcf));
+
+    evcf->buffer_timeout = NCHAN_META_CHANNEL_MESSAGE_TTL;
+    evcf->max_messages = NCHAN_META_CHANNEL_MAX_MESSAGES;
+    evcf->subscriber_first_message = 0;
+    evcf->channel_timeout = NCHAN_META_CHANNEL_TIMEOUT;
+  }
+  evcf->storage_engine = cf->storage_engine;
+  evcf->redis = cf->redis;
+  
+  evcf->storage_engine->publish(id, &msg, evcf, NULL, NULL);
+  
+  return NGX_OK;
+}
+
+#if FAKESHARD 
+static void memstore_sub_debug_start() {
+  #ifdef SUB_FAKE_WORKER
+  memstore_fakeprocess_push(SUB_FAKE_WORKER);
+  #else
+  memstore_fakeprocess_push_random();
+  #endif
+}
+static void memstore_sub_debug_end() {
+  memstore_fakeprocess_pop();
+}
+static void memstore_pub_debug_start() {
+  #ifdef PUB_FAKE_WORKER
+  memstore_fakeprocess_push(PUB_FAKE_WORKER);
+  #else
+  memstore_fakeprocess_push_random();
+  #endif
+}
+static void memstore_pub_debug_end() {
+  memstore_fakeprocess_pop();
+}
+#endif
+
+static void nchan_publisher_body_handler(ngx_http_request_t *r);
+
+static ngx_int_t nchan_http_publisher_handler(ngx_http_request_t * r) {
+  ngx_int_t                       rc;
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  static ngx_str_t                publisher_name = ngx_string("http");
+  
+  if(ctx) ctx->publisher_type = &publisher_name;
+  
+  /* Instruct ngx_http_read_subscriber_request_body to store the request
+     body entirely in a memory buffer or in a file */
+  r->request_body_in_single_buf = 1;
+  r->request_body_in_persistent_file = 1;
+  r->request_body_in_clean_file = 0;
+  r->request_body_file_log_level = 0;
+  
+  //don't buffer the request body --send it right on through
+  //r->request_body_no_buffering = 1;
+
+  rc = ngx_http_read_client_request_body(r, nchan_publisher_body_handler);
+  if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+    return rc;
+  }
+  return NGX_DONE;
+}
+
+ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r) {
+  ngx_buf_t           *b;
+  ngx_chain_t          out;
+  nchan_stub_status_t *stats;
+  
+  float                shmem_used;
+  
+  char     *buf_fmt = "total published messages: %ui\n"
+                      "stored messages: %ui\n"
+                      "shared memory used: %fK\n"
+                      "channels: %ui\n"
+                      "subscribers: %ui\n"
+                      "redis pending commands: %ui\n"
+                      "redis connected servers: %ui\n"
+                      "total interprocess alerts received: %ui\n"
+                      "interprocess alerts in transit: %ui\n"
+                      "interprocess queued alerts: %ui\n"
+                      "total interprocess send delay: %ui\n"
+                      "total interprocess receive delay: %ui\n";
+  
+  if ((b = ngx_pcalloc(r->pool, sizeof(*b) + 800)) == NULL) {
+    nchan_log_request_error(r, "Failed to allocate response buffer for nchan_stub_status.");
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  
+  shmem_used = (float )((float )nchan_get_used_shmem() / 1024.0);
+  
+  stats = nchan_get_stub_status_stats();
+  
+  b->start = (u_char *)&b[1];
+  b->pos = b->start;
+  
+  b->end = ngx_snprintf(b->start, 800, buf_fmt, stats->total_published_messages, stats->messages, shmem_used, stats->channels, stats->subscribers, stats->redis_pending_commands, stats->redis_connected_servers, stats->ipc_total_alerts_received, stats->ipc_total_alerts_sent - stats->ipc_total_alerts_received, stats->ipc_queue_size, stats->ipc_total_send_delay, stats->ipc_total_receive_delay);
+  b->last = b->end;
+
+  b->memory = 1;
+  b->last_buf = 1;
+  
+  r->headers_out.status = NGX_HTTP_OK;
+  r->headers_out.content_type.len = sizeof("text/plain") - 1;
+  r->headers_out.content_type.data = (u_char *) "text/plain";
+  
+  r->headers_out.content_length_n = b->end - b->start;
+  ngx_http_send_header(r);
+  
+  out.buf = b;
+  out.next = NULL;
+  
+  return ngx_http_output_filter(r, &out);
+}
+
+ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_str_t              *channel_id;
+  subscriber_t           *sub;
+  nchan_msg_id_t         *msg_id;
+  ngx_int_t               rc = NGX_DONE;
+  nchan_request_ctx_t    *ctx;
+  ngx_str_t              *origin_header;
+  
+#if NCHAN_BENCHMARK
+  struct timeval          tv;
+  ngx_gettimeofday(&tv);
+#endif
+  
+  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
+
+#if NCHAN_BENCHMARK
+  ctx->start_tv = tv;
+#endif
+  
+  //X-Accel-Redirected requests get their method mangled to GET. De-mangle it if necessary
+  if(r->upstream && r->upstream->headers_in.x_accel_redirect) {
+    //yep, we got x-accel-redirected. what was the original method?...
+    nchan_recover_x_accel_redirected_request_method(r);
+  }
+  
+  if((origin_header = nchan_get_header_value(r, NCHAN_HEADER_ORIGIN)) != NULL) {
+    ctx->request_origin_header = *origin_header;
+    if(!(cf->allow_origin.len == 1 && cf->allow_origin.data[0] == '*')) {
+      if(!(origin_header->len == cf->allow_origin.len && ngx_strnstr(origin_header->data, (char *)cf->allow_origin.data, origin_header->len) != NULL)) {
+        //CORS origin match failed! return a 403 forbidden
+        goto forbidden;
+      }
+    }
+  }
+  else {
+    ctx->request_origin_header.len=0;
+    ctx->request_origin_header.data=NULL;
+  }
+  
+  if((channel_id = nchan_get_channel_id(r, SUB, 1)) == NULL) {
+    //just get the subscriber_channel_id for now. the publisher one is handled elsewhere
+    return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+
+  if(nchan_detect_websocket_request(r)) {
+    //want websocket?
+    if(cf->sub.websocket) {
+      //we prefer to subscribe
+#if FAKESHARD
+      memstore_sub_debug_start();
+#endif
+      if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
+        goto bad_msgid;
+      }
+      if((sub = websocket_subscriber_create(r, msg_id)) == NULL) {
+        nchan_log_request_error(r, "unable to create websocket subscriber");
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+      }
+      sub->fn->subscribe(sub, channel_id);
+#if FAKESHARD      
+      memstore_sub_debug_end();
+#endif
+    }
+    else if(cf->pub.websocket) {
+      //no need to subscribe, but keep a connection open for publishing
+      //not yet implemented
+      nchan_create_websocket_publisher(r);
+    }
+    else goto forbidden;
+    return NGX_DONE;
+  }
+  else {
+    subscriber_t *(*sub_create)(ngx_http_request_t *r, nchan_msg_id_t *msg_id) = NULL;
+    
+    switch(r->method) {
+      case NGX_HTTP_GET:
+        if(cf->sub.eventsource && nchan_detect_eventsource_request(r)) {
+          sub_create = eventsource_subscriber_create;
+        }
+        else if(cf->sub.http_chunked && nchan_detect_chunked_subscriber_request(r)) {
+          sub_create = http_chunked_subscriber_create;
+        }
+        else if(cf->sub.http_multipart && nchan_detect_multipart_subscriber_request(r)) {
+          sub_create = http_multipart_subscriber_create;
+        }
+        else if(cf->sub.poll) {
+          sub_create = intervalpoll_subscriber_create;
+        }
+        else if(cf->sub.http_raw_stream) {
+          sub_create = http_raw_stream_subscriber_create;
+        }
+        else if(cf->sub.longpoll) {
+          sub_create = longpoll_subscriber_create;
+        }
+        else if(cf->pub.http) {
+          nchan_http_publisher_handler(r);
+        }
+        else {
+          goto forbidden;
+        }
+        
+        if(sub_create) {
+#if FAKESHARD
+          memstore_sub_debug_start();
+#endif
+          if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
+            goto bad_msgid;
+          }
+          if((sub = sub_create(r, msg_id)) == NULL) {
+            nchan_log_request_error(r, "unable to create subscriber");
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+          }
+          
+          sub->fn->subscribe(sub, channel_id);
+#if FAKESHARD
+          memstore_sub_debug_end();
+#endif
+        }
+        
+        break;
+      
+      case NGX_HTTP_POST:
+      case NGX_HTTP_PUT:
+        if(cf->pub.http) {
+          nchan_http_publisher_handler(r);
+        }
+        else goto forbidden;
+        break;
+      
+      case NGX_HTTP_DELETE:
+        if(cf->pub.http) {
+          nchan_http_publisher_handler(r);
+        }
+        else goto forbidden;
+        break;
+      
+      case NGX_HTTP_OPTIONS:
+        if(cf->pub.http) {
+          nchan_OPTIONS_respond(r, &cf->allow_origin, &NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS, &NCHAN_ALLOW_GET_POST_PUT_DELETE);
+        }
+        else if(cf->sub.poll || cf->sub.longpoll || cf->sub.eventsource || cf->sub.websocket) {
+          nchan_OPTIONS_respond(r, &cf->allow_origin, &NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS, &NCHAN_ALLOW_GET);
+        }
+        else goto forbidden;
+        break;
+    }
+  }
+  
+  return rc;
+  
+forbidden:
+  nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, 0);
+  return NGX_OK;
+
+bad_msgid:
+  nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Message ID invalid", 0);
+  return NGX_OK;
+  
+}
+
+static ngx_int_t channel_info_callback(ngx_int_t status, void *rptr, ngx_http_request_t *r) {
+  ngx_http_finalize_request(r, nchan_response_channel_ptr_info( (nchan_channel_t *)rptr, r, 0));
+  return NGX_OK;
+}
+
+static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, ngx_http_cleanup_t *cln) {
+  nchan_request_ctx_t   *ctx;
+  static nchan_msg_id_t  empty_msgid = NCHAN_ZERO_MSGID;
+  ngx_http_request_t    **rptr = cln->data;
+  ngx_http_request_t    *r = *rptr;
+  
+  cln->data = NULL;
+  ngx_free(rptr);
+  
+  if(r == NULL) { // the request has since disappered
+    return NGX_ERROR;
+  }
+  ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  //DBG("publish_callback %V owner %i status %i", ch_id, memstore_channel_owner(ch_id), status);
+  switch(status) {
+    case NCHAN_MESSAGE_QUEUED:
+      //message was queued successfully, but there were no subscribers to receive it.
+      ctx->prev_msg_id = ctx->msg_id;
+      ctx->msg_id = ch != NULL ? ch->last_published_msg_id : empty_msgid;
+      
+      nchan_maybe_send_channel_event_message(r, CHAN_PUBLISH);
+      ngx_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_ACCEPTED));
+      return NGX_OK;
+      
+    case NCHAN_MESSAGE_RECEIVED:
+      //message was queued successfully, and it was already sent to at least one subscriber
+      ctx->prev_msg_id = ctx->msg_id;
+      ctx->msg_id = ch != NULL ? ch->last_published_msg_id : empty_msgid;
+      
+      nchan_maybe_send_channel_event_message(r, CHAN_PUBLISH);
+      ngx_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_CREATED));
+      return NGX_OK;
+      
+    case NGX_ERROR:
+    case NGX_HTTP_INTERNAL_SERVER_ERROR:
+      //WTF?
+      nchan_log_request_error(r, "error publishing message");
+      ctx->prev_msg_id = empty_msgid;;
+      ctx->msg_id = empty_msgid;
+      ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+      return NGX_ERROR;
+      
+    default:
+      //for debugging, mostly. I don't expect this branch to behit during regular operation
+      ctx->prev_msg_id = empty_msgid;;
+      ctx->msg_id = empty_msgid;
+      nchan_log_request_error(r, "TOTALLY UNEXPECTED error publishing message, status code %i", status);
+      ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+      return NGX_ERROR;
+  }
+}
+
+static void clear_request_pointer(ngx_http_request_t **rptr) {
+  if(rptr) {
+    *rptr = NULL;
+  }
+}
+
+static void nchan_publisher_post_request(ngx_http_request_t *r, ngx_str_t *content_type, size_t content_length, ngx_chain_t *request_body_chain, ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  ngx_buf_t                      *buf;
+  struct timeval                  tv;
+  nchan_msg_t                    *msg;
+  ngx_str_t                      *eventsource_event;
+  
+  ngx_http_request_t            **rptr;
+  ngx_http_cleanup_t             *cln;
+
+#if FAKESHARD
+  memstore_pub_debug_start();
+#endif
+  if((msg = ngx_pcalloc(r->pool, sizeof(*msg))) == NULL) {
+    nchan_log_request_error(r, "can't allocate msg in request pool");
+    ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    return; 
+  }
+  msg->shared = 0;
+  
+  
+  if(cf->eventsource_event.len > 0) {
+    msg->eventsource_event = cf->eventsource_event;
+  }
+  else if((eventsource_event = nchan_get_header_value(r, NCHAN_HEADER_EVENTSOURCE_EVENT)) != NULL) {
+    msg->eventsource_event = *eventsource_event;
+  }
+  
+  //content type
+  if(content_type) {
+    msg->content_type = *content_type;
+  }
+  
+  if(content_length == 0) {
+    buf = ngx_create_temp_buf(r->pool, 0);
+  }
+  else if(request_body_chain!=NULL) {
+    buf = nchan_chain_to_single_buffer(r->pool, request_body_chain, content_length);
+  }
+  else {
+    nchan_log_request_error(r, "unexpected publisher message request body buffer location. please report this to the nchan developers.");
+    ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    return;
+  }
+  
+  ngx_gettimeofday(&tv);
+  msg->id.time = tv.tv_sec;
+  msg->id.tag.fixed[0] = 0;
+  msg->id.tagactive = 0;
+  msg->id.tagcount = 1;
+  
+  msg->buf = buf;
+#if NCHAN_MSG_LEAK_DEBUG
+  msg->lbl = r->uri;
+#endif
+#if NCHAN_BENCHMARK
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  msg->start_tv = ctx->start_tv;
+#endif
+  
+  cln = ngx_http_cleanup_add(r, 0);
+  rptr = ngx_alloc(sizeof(rptr), ngx_cycle->log);
+  if(!cln || !rptr) {
+    nchan_log_request_error(r, "couldn't allocate publisher request cleanup stuff.");
+    ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    return;
+  }
+  *rptr = r;
+  cln->data = rptr;
+  cln->handler = (ngx_http_cleanup_pt )clear_request_pointer;
+  
+  cf->storage_engine->publish(channel_id, msg, cf, (callback_pt) &publish_callback, cln);
+  nchan_update_stub_status(total_published_messages, 1);
+#if FAKESHARD
+  memstore_pub_debug_end();
+#endif
+}
+
+typedef struct {
+  ngx_str_t       *ch_id;
+} nchan_pub_upstream_data_t;
+
+typedef struct {
+  ngx_http_post_subrequest_t    psr;
+  nchan_pub_upstream_data_t   psr_data;
+} nchan_pub_upstream_stuff_t;
+
+static ngx_int_t nchan_publisher_upstream_handler(ngx_http_request_t *sr, void *data, ngx_int_t rc) {
+  ngx_http_request_t         *r = sr->parent;
+  nchan_pub_upstream_data_t  *d = (nchan_pub_upstream_data_t *)data;
+  
+  //switch(r->headers_out
+  if(rc == NGX_OK) {
+    nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+    ngx_int_t                 code = sr->headers_out.status;
+    ngx_str_t                *content_type;
+    ngx_int_t                 content_length;
+    ngx_chain_t              *request_chain;
+    
+    switch(code) {
+      case NGX_HTTP_OK:
+      case NGX_HTTP_CREATED:
+      case NGX_HTTP_ACCEPTED:
+        if(sr->upstream) {
+          content_type = (sr->upstream->headers_in.content_type ? &sr->upstream->headers_in.content_type->value : NULL);
+          content_length = sr->upstream->headers_in.content_length_n > 0 ? sr->upstream->headers_in.content_length_n : 0;
+          request_chain = sr->upstream->out_bufs;
+        }
+        else {
+          content_type = NULL;
+          content_length = 0;
+          request_chain = NULL;
+        }
+        nchan_publisher_post_request(r, content_type, content_length, request_chain, d->ch_id, cf);
+        break;
+      
+      case NGX_HTTP_NOT_MODIFIED:
+        content_type = (r->headers_in.content_type ? &r->headers_in.content_type->value : NULL);
+        content_length = r->headers_in.content_length_n > 0 ? r->headers_in.content_length_n : 0;
+        nchan_publisher_post_request(r, content_type, content_length, r->request_body->bufs, d->ch_id, cf);
+        break;
+        
+      case NGX_HTTP_NO_CONTENT:
+        //cancel publication
+        ngx_http_finalize_request(r, NGX_HTTP_NO_CONTENT);
+        break;
+      
+      default:
+        ngx_http_finalize_request(r, NGX_HTTP_FORBIDDEN);
+    }
+  }
+  else {
+    ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+  }
+  
+  return NGX_OK;
+}
+
+static void nchan_publisher_body_handler_continued(ngx_http_request_t *r, ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  ngx_http_complex_value_t       *publisher_upstream_request_url_ccv;
+  static ngx_str_t                POST_REQUEST_STRING = {4, (u_char *)"POST "};
+  
+  switch(r->method) {
+    case NGX_HTTP_GET:
+      cf->storage_engine->find_channel(channel_id, cf, (callback_pt) &channel_info_callback, (void *)r);
+      break;
+    
+    case NGX_HTTP_PUT:
+    case NGX_HTTP_POST:
+      publisher_upstream_request_url_ccv = cf->publisher_upstream_request_url;
+      if(publisher_upstream_request_url_ccv == NULL) {
+        ngx_str_t    *content_type = (r->headers_in.content_type ? &r->headers_in.content_type->value : NULL);
+        ngx_int_t     content_length = r->headers_in.content_length_n > 0 ? r->headers_in.content_length_n : 0;
+        
+        nchan_publisher_post_request(r, content_type, content_length, r->request_body->bufs, channel_id, cf);
+      }
+      else {
+        nchan_pub_upstream_stuff_t    *psr_stuff;
+        
+        if((psr_stuff = ngx_palloc(r->pool, sizeof(*psr_stuff))) == NULL) {
+          nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest");
+          ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+          return;
+        }
+        
+        ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
+        nchan_pub_upstream_data_t     *psrd = &psr_stuff->psr_data;
+        ngx_http_request_t            *sr;
+        ngx_str_t                      publisher_upstream_request_url;
+        
+        ngx_http_complex_value(r, publisher_upstream_request_url_ccv, &publisher_upstream_request_url);
+        
+        psr->handler = nchan_publisher_upstream_handler;
+        psr->data = psrd;
+        
+        psrd->ch_id = channel_id;
+        
+        ngx_http_subrequest(r, &publisher_upstream_request_url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
+        nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, r->request_body, r->headers_in.content_length_n, NULL);
+      }
+      break;
+      
+    case NGX_HTTP_DELETE:
+      cf->storage_engine->delete_channel(channel_id, cf, (callback_pt) &channel_info_callback, (void *)r);
+      nchan_maybe_send_channel_event_message(r, CHAN_DELETE);
+      break;
+      
+    default: 
+      nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, 0);
+  }
+  
+}
+
+typedef struct {
+  ngx_str_t       *ch_id;
+} nchan_pub_subrequest_data_t;
+
+typedef struct {
+  ngx_http_post_subrequest_t    psr;
+  nchan_pub_subrequest_data_t   psr_data;
+} nchan_pub_subrequest_stuff_t;
+
+
+static ngx_int_t nchan_publisher_body_authorize_handler(ngx_http_request_t *r, void *data, ngx_int_t rc) {
+  nchan_pub_subrequest_data_t  *d = data;
+  
+  if(rc == NGX_OK) {
+    nchan_loc_conf_t    *cf = ngx_http_get_module_loc_conf(r->parent, ngx_nchan_module);
+    ngx_int_t            code = r->headers_out.status;
+    if(code >= 200 && code <299) {
+      //authorized. proceed as planned
+      nchan_publisher_body_handler_continued(r->parent, d->ch_id, cf);
+    }
+    else { //anything else means forbidden
+      ngx_http_finalize_request(r->parent, NGX_HTTP_FORBIDDEN);
+    }
+  }
+  else {
+    ngx_http_finalize_request(r->parent, NGX_HTTP_INTERNAL_SERVER_ERROR);
+  }
+  return NGX_OK;
+}
+
+static void nchan_publisher_body_handler(ngx_http_request_t *r) {
+  ngx_str_t                      *channel_id;
+  nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_table_elt_t                *content_length_elt;
+  ngx_http_complex_value_t       *authorize_request_url_ccv = cf->authorize_request_url;
+  
+  if((channel_id = nchan_get_channel_id(r, PUB, 1))==NULL) {
+    ngx_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
+    return;
+  }
+  
+  if(!authorize_request_url_ccv) {
+    nchan_publisher_body_handler_continued(r, channel_id, cf);
+  }
+  else {
+    nchan_pub_subrequest_stuff_t   *psr_stuff;
+    
+    if((psr_stuff = ngx_palloc(r->pool, sizeof(*psr_stuff))) == NULL) {
+      nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest");
+      ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+      return;
+    }
+    
+    ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
+    nchan_pub_subrequest_data_t   *psrd = &psr_stuff->psr_data;
+    ngx_http_request_t            *sr;
+    ngx_str_t                      auth_request_url;
+    
+    ngx_http_complex_value(r, authorize_request_url_ccv, &auth_request_url);
+    
+    psr->handler = nchan_publisher_body_authorize_handler;
+    psr->data = psrd;
+    
+    psrd->ch_id = channel_id;
+    
+    ngx_http_subrequest(r, &auth_request_url, NULL, &sr, psr, 0);
+    
+    if((sr->request_body = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t))) == NULL) {
+      nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest body");
+      ngx_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
+      return;
+    }
+    if((content_length_elt = ngx_palloc(r->pool, sizeof(*content_length_elt))) == NULL) {
+      nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest content-length header");
+      ngx_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
+      return;
+    }
+    *content_length_elt = *sr->headers_in.content_length;
+    content_length_elt->value.len=1;
+    content_length_elt->value.data=(u_char *)"0";
+    sr->headers_in.content_length = content_length_elt;
+    sr->headers_in.content_length_n = 0;
+    sr->args = r->args;
+    sr->header_only = 1;
+  }
+}
+
+#if NCHAN_BENCHMARK
+int nchan_timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y) {
+  /* Perform the carry for the later subtraction by updating y. */
+  if (x->tv_usec < y->tv_usec) {
+    int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
+    y->tv_usec -= 1000000 * nsec;
+    y->tv_sec += nsec;
+  }
+  if (x->tv_usec - y->tv_usec > 1000000) {
+    int nsec = (x->tv_usec - y->tv_usec) / 1000000;
+    y->tv_usec += 1000000 * nsec;
+    y->tv_sec -= nsec;
+  }
+
+  /* Compute the time remaining to wait.
+     tv_usec is certainly positive. */
+  result->tv_sec = x->tv_sec - y->tv_sec;
+  result->tv_usec = x->tv_usec - y->tv_usec;
+
+  /* Return 1 if result is negative. */
+  return x->tv_sec < y->tv_sec;
+}
+#endif
+
+
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+
+subscriber_t *subdebug_head = NULL;
+
+void subscriber_debug_add(subscriber_t *sub) {
+  if(subdebug_head == NULL) {
+    sub->dbg_next = NULL;
+    sub->dbg_prev = NULL;
+  }
+  else {
+    sub->dbg_next = subdebug_head;
+    sub->dbg_prev = NULL;
+    assert(subdebug_head->dbg_prev == NULL);
+    subdebug_head->dbg_prev = sub;
+  }
+  subdebug_head = sub;
+}
+void subscriber_debug_remove(subscriber_t *sub) {
+  subscriber_t *prev, *next;
+  prev = sub->dbg_prev;
+  next = sub->dbg_next;
+  if(subdebug_head == sub) {
+    assert(sub->dbg_prev == NULL);
+    if(next) {
+      next->dbg_prev = NULL;
+    }
+    subdebug_head = next;
+  }
+  else {
+    if(prev) {
+      prev->dbg_next = next;
+    }
+    if(next) {
+      next->dbg_prev = prev;
+    }
+  }
+  
+  sub->dbg_next = NULL;
+  sub->dbg_prev = NULL;
+}
+void subscriber_debug_assert_isempty(void) {
+  assert(subdebug_head == NULL);
+}
+#endif
diff --git a/debian/modules/nchan/src/nchan_module.h b/debian/modules/nchan/src/nchan_module.h
new file mode 100644
index 0000000..b45cf5f
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_module.h
@@ -0,0 +1,74 @@
+#ifndef NCHAN_MODULE_H
+#define NCHAN_MODULE_H
+//#define NCHAN_SUBSCRIBER_LEAK_DEBUG 1
+//#define NCHAN_MSG_RESERVE_DEBUG 1
+//#define NCHAN_MSG_LEAK_DEBUG 1
+//#define NCHAN_BENCHMARK 1
+
+//debugging config
+//#define FAKESHARD 1
+#if FAKESHARD
+//#define PUB_FAKE_WORKER 0
+//#define SUB_FAKE_WORKER 1
+//#define ONE_FAKE_CHANNEL_OWNER 2
+#define MAX_FAKE_WORKERS 5
+#endif
+
+#include <ngx_http.h>
+
+//building for old versions
+#ifndef NGX_MAX_INT_T_VALUE
+#if (NGX_PTR_SIZE == 4)
+#define NGX_MAX_INT_T_VALUE  2147483647
+#else
+#define NGX_MAX_INT_T_VALUE  9223372036854775807
+#endif
+#endif
+
+#include <nginx.h>
+#include <nchan_types.h>
+#include <nchan_defs.h>
+#include <util/nchan_util.h>
+#include <util/nchan_channel_id.h>
+#include <util/nchan_channel_info.h>
+#include <util/nchan_msgid.h>
+#include <util/nchan_output.h>
+
+extern ngx_pool_t *nchan_pool;
+extern ngx_int_t nchan_worker_processes;
+extern ngx_module_t ngx_nchan_module;
+extern nchan_store_t *nchan_store;
+
+extern int nchan_stub_status_enabled;
+
+ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r);
+ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r);
+ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type);
+
+ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *, channel_event_type_t);
+
+#define nchan_update_stub_status(counter_name, count) __memstore_update_stub_status(offsetof(nchan_stub_status_t, counter_name), count)
+void __memstore_update_stub_status(off_t offset, int count);
+nchan_stub_status_t *nchan_get_stub_status_stats(void);
+size_t nchan_get_used_shmem(void);
+
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+void subscriber_debug_add(subscriber_t *);
+void subscriber_debug_remove(subscriber_t *);
+void subscriber_debug_assert_isempty(void);
+#endif
+
+#if NCHAN_BENCHMARK
+int nchan_timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
+#endif
+
+#define nchan_log_notice(fmt, args...)  ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0, "nchan: " fmt, ##args)
+#define nchan_log_warning(fmt, args...) ngx_log_error(NGX_LOG_WARN,   ngx_cycle->log, 0, "nchan: " fmt, ##args)
+#define nchan_log_error(fmt, args...)   ngx_log_error(NGX_LOG_ERR,    ngx_cycle->log, 0, "nchan: " fmt, ##args)
+#define nchan_log_request_warning(request, fmt, args...) ngx_log_error(NGX_LOG_WARN, (request)->connection->log, 0, "nchan: " fmt, ##args)
+#define nchan_log_request_error(request, fmt, args...)    ngx_log_error(NGX_LOG_ERR, (request)->connection->log, 0, "nchan: " fmt, ##args)
+
+#define nchan_log(level, log, fmt, args...) ngx_log_error(level, log, 0, "nchan: " fmt, ##args)
+
+
+#endif /*NCHAN_MODULE_H*/
diff --git a/debian/modules/nchan/src/nchan_setup.c b/debian/modules/nchan/src/nchan_setup.c
new file mode 100644
index 0000000..b7485ca
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_setup.c
@@ -0,0 +1,729 @@
+#include <nchan_websocket_publisher.h>
+#include <nchan_types.h>
+#include <util/nchan_output.h>
+#include <nchan_variables.h>
+#include <store/memory/store.h>
+#include <store/redis/store.h>
+
+static ngx_str_t      DEFAULT_CHANNEL_EVENT_STRING = ngx_string("$nchan_channel_event $nchan_channel_id");
+
+nchan_store_t   *default_storage_engine = &nchan_store_memory;
+ngx_flag_t       global_redis_enabled = 0;
+
+#define MERGE_CONF(cf, prev_cf, name) if((cf)->name == NULL) { (cf)->name = (prev_cf)->name; }
+
+static ngx_int_t nchan_init_module(ngx_cycle_t *cycle) {
+  ngx_core_conf_t                *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  nchan_worker_processes = ccf->worker_processes;
+  
+  //initialize storage engines
+  nchan_store_memory.init_module(cycle);
+  if(global_redis_enabled) {
+    nchan_store_redis.init_module(cycle);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_init_worker(ngx_cycle_t *cycle) {
+  if (ngx_process != NGX_PROCESS_WORKER && ngx_process != NGX_PROCESS_SINGLE) {
+    //not a worker, stop initializing stuff.
+    return NGX_OK;
+  }
+  
+  if(nchan_store_memory.init_worker(cycle)!=NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+  if(global_redis_enabled && nchan_store_redis.init_worker(cycle)!=NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+  nchan_websocket_publisher_llist_init();
+  nchan_output_init();
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_postconfig(ngx_conf_t *cf) {
+  if(nchan_store_memory.init_postconfig(cf)!=NGX_OK) {
+    return NGX_ERROR;
+  }
+  if(global_redis_enabled && nchan_store_redis.init_postconfig(cf)!=NGX_OK) {
+    return NGX_ERROR;
+  }
+  return NGX_OK;
+}
+
+//main config
+static void * nchan_create_main_conf(ngx_conf_t *cf) {
+  nchan_main_conf_t      *mcf = ngx_pcalloc(cf->pool, sizeof(*mcf));
+  if(mcf == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  nchan_store_memory.create_main_conf(cf, mcf);
+  nchan_store_redis.create_main_conf(cf, mcf);
+  
+  return mcf;
+}
+
+//location config stuff
+static void *nchan_create_loc_conf(ngx_conf_t *cf) {
+  nchan_loc_conf_t       *lcf = ngx_pcalloc(cf->pool, sizeof(*lcf));
+  if(lcf == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  
+  lcf->pub.http=0;
+  lcf->pub.websocket=0;
+  
+  lcf->sub.poll=0;
+  lcf->sub.longpoll=0;
+  lcf->sub.eventsource=0;
+  lcf->sub.websocket=0;
+  lcf->sub.http_chunked=0;
+  
+  lcf->authorize_request_url = NULL;
+  lcf->publisher_upstream_request_url = NULL;
+  
+  lcf->buffer_timeout=NGX_CONF_UNSET;
+  lcf->max_messages=NGX_CONF_UNSET;
+  
+  lcf->subscriber_first_message=NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET;
+  
+  lcf->subscriber_timeout=NGX_CONF_UNSET;
+  lcf->subscribe_only_existing_channel=NGX_CONF_UNSET;
+  lcf->redis_idle_channel_cache_timeout=NGX_CONF_UNSET;
+  lcf->max_channel_id_length=NGX_CONF_UNSET;
+  lcf->max_channel_subscribers=NGX_CONF_UNSET;
+  lcf->channel_timeout=NGX_CONF_UNSET;
+  lcf->storage_engine=NULL;
+  
+  lcf->websocket_ping_interval=NGX_CONF_UNSET;
+  
+  lcf->msg_in_etag_only = NGX_CONF_UNSET;
+  
+  lcf->channel_events_channel_id = NULL;
+  lcf->channel_event_string = NULL;
+  
+  
+  lcf->longpoll_multimsg=NGX_CONF_UNSET;
+  lcf->longpoll_multimsg_use_raw_stream_separator=NGX_CONF_UNSET;
+  
+  ngx_memzero(&lcf->pub_chid, sizeof(nchan_complex_value_arr_t));
+  ngx_memzero(&lcf->sub_chid, sizeof(nchan_complex_value_arr_t));
+  ngx_memzero(&lcf->pubsub_chid, sizeof(nchan_complex_value_arr_t));
+  ngx_memzero(&lcf->last_message_id, sizeof(nchan_complex_value_arr_t));
+  
+  ngx_memzero(&lcf->redis, sizeof(lcf->redis));
+  lcf->redis.url_enabled=NGX_CONF_UNSET;
+  lcf->redis.ping_interval = NGX_CONF_UNSET;
+  lcf->redis.upstream_inheritable=NGX_CONF_UNSET;
+  
+  return lcf;
+}
+
+static char * create_complex_value_from_ngx_str(ngx_conf_t *cf, ngx_http_complex_value_t **dst_cv, ngx_str_t *str) {
+  ngx_http_complex_value_t           *cv;
+  ngx_http_compile_complex_value_t    ccv;
+  
+  cv = ngx_palloc(cf->pool, sizeof(*cv));
+  if (cv == NULL) {
+    ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "unable to allocate space for complex value");
+    return NGX_CONF_ERROR;
+  }
+  
+  ngx_memzero(&ccv, sizeof(ccv));
+  
+  ccv.cf = cf;
+  ccv.value = str;
+  ccv.complex_value = cv;
+  
+  if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+    return NGX_CONF_ERROR;
+  }
+  
+  *dst_cv = cv;
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_set_redis_upstream(ngx_conf_t *cf, ngx_str_t *url, void *conf) {  
+  ngx_url_t             upstream_url;
+  nchan_loc_conf_t     *lcf = conf;
+  if (lcf->redis.upstream) {
+    return "is duplicate";
+  }
+  
+  ngx_memzero(&upstream_url, sizeof(upstream_url));
+  upstream_url.url = *url;
+  upstream_url.no_resolve = 1;
+  
+  if ((lcf->redis.upstream = ngx_http_upstream_add(cf, &upstream_url, 0)) == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  
+  lcf->redis.enabled = 1;
+  global_redis_enabled = 1;
+  nchan_store_redis_add_server_conf(cf, &lcf->redis, lcf);
+  
+  return NGX_CONF_OK;
+}
+
+static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
+  nchan_loc_conf_t       *prev = parent, *conf = child;
+  
+  //publisher types
+  ngx_conf_merge_bitmask_value(conf->pub.http, prev->pub.http, 0);
+  ngx_conf_merge_bitmask_value(conf->pub.websocket, prev->pub.websocket, 0);
+  
+  //subscriber types
+  ngx_conf_merge_bitmask_value(conf->sub.poll, prev->sub.poll, 0);
+  ngx_conf_merge_bitmask_value(conf->sub.longpoll, prev->sub.longpoll, 0);
+  ngx_conf_merge_bitmask_value(conf->sub.eventsource, prev->sub.eventsource, 0);
+  ngx_conf_merge_bitmask_value(conf->sub.http_chunked, prev->sub.http_chunked, 0);
+  ngx_conf_merge_bitmask_value(conf->sub.websocket, prev->sub.websocket, 0);
+  
+  ngx_conf_merge_sec_value(conf->buffer_timeout, prev->buffer_timeout, NCHAN_DEFAULT_BUFFER_TIMEOUT);
+  ngx_conf_merge_value(conf->max_messages, prev->max_messages, NCHAN_DEFAULT_MAX_MESSAGES);
+  
+  
+  if (conf->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) {
+    conf->subscriber_first_message = (prev->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) ? NCHAN_SUBSCRIBER_DEFAULT_FIRST_MESSAGE : prev->subscriber_first_message;
+  }
+  
+  ngx_conf_merge_sec_value(conf->websocket_ping_interval, prev->websocket_ping_interval, NCHAN_DEFAULT_WEBSOCKET_PING_INTERVAL);
+  
+  ngx_conf_merge_sec_value(conf->subscriber_timeout, prev->subscriber_timeout, NCHAN_DEFAULT_SUBSCRIBER_TIMEOUT);
+  ngx_conf_merge_sec_value(conf->redis_idle_channel_cache_timeout, prev->redis_idle_channel_cache_timeout, NCHAN_DEFAULT_REDIS_IDLE_CHANNEL_CACHE_TIMEOUT);
+  
+  ngx_conf_merge_value(conf->subscribe_only_existing_channel, prev->subscribe_only_existing_channel, 0);
+  ngx_conf_merge_value(conf->max_channel_id_length, prev->max_channel_id_length, NCHAN_MAX_CHANNEL_ID_LENGTH);
+  ngx_conf_merge_value(conf->max_channel_subscribers, prev->max_channel_subscribers, 0);
+  ngx_conf_merge_value(conf->channel_timeout, prev->channel_timeout, NCHAN_DEFAULT_CHANNEL_TIMEOUT);
+  
+  ngx_conf_merge_str_value(conf->subscriber_http_raw_stream_separator, prev->subscriber_http_raw_stream_separator, "\n");
+  
+  ngx_conf_merge_str_value(conf->channel_id_split_delimiter, prev->channel_id_split_delimiter, "");
+  ngx_conf_merge_str_value(conf->channel_group, prev->channel_group, "");
+  ngx_conf_merge_str_value(conf->allow_origin, prev->allow_origin, "*");
+  ngx_conf_merge_str_value(conf->eventsource_event, prev->eventsource_event, "");
+  ngx_conf_merge_str_value(conf->custom_msgtag_header, prev->custom_msgtag_header, "");
+  ngx_conf_merge_value(conf->msg_in_etag_only, prev->msg_in_etag_only, 0);
+  ngx_conf_merge_value(conf->longpoll_multimsg, prev->longpoll_multimsg, 0);
+  ngx_conf_merge_value(conf->longpoll_multimsg_use_raw_stream_separator, prev->longpoll_multimsg_use_raw_stream_separator, 0);
+  MERGE_CONF(conf, prev, channel_events_channel_id);
+  MERGE_CONF(conf, prev, channel_event_string);
+  
+  if(conf->channel_event_string == NULL) { //still null? use the default string
+    if(create_complex_value_from_ngx_str(cf, &conf->channel_event_string, &DEFAULT_CHANNEL_EVENT_STRING) == NGX_CONF_ERROR) {
+      return NGX_CONF_ERROR;
+    }
+  }
+
+  if(conf->storage_engine == NULL) {
+    conf->storage_engine = prev->storage_engine ? prev->storage_engine : default_storage_engine;
+  }
+
+  MERGE_CONF(conf, prev, authorize_request_url);
+  MERGE_CONF(conf, prev, publisher_upstream_request_url);
+  
+  if(conf->pub_chid.n == 0) {
+    conf->pub_chid = prev->pub_chid;
+  }
+  if(conf->sub_chid.n == 0) {
+    conf->sub_chid = prev->sub_chid;
+  }
+  if(conf->pubsub_chid.n == 0) {
+    conf->pubsub_chid = prev->pubsub_chid;
+  }
+  if(conf->last_message_id.n == 0) {
+    conf->last_message_id = prev->last_message_id;
+  }
+  if(conf->last_message_id.n == 0) { //if it's still null
+    ngx_str_t      first_choice_msgid = ngx_string("$http_last_event_id");
+    ngx_str_t      second_choice_msgid = ngx_string("$arg_last_event_id");
+    
+    if(create_complex_value_from_ngx_str(cf, &conf->last_message_id.cv[0], &first_choice_msgid) == NGX_CONF_ERROR) {
+      return NGX_CONF_ERROR;
+    }
+    if(create_complex_value_from_ngx_str(cf, &conf->last_message_id.cv[1], &second_choice_msgid) == NGX_CONF_ERROR) {
+      return NGX_CONF_ERROR;
+    }
+    conf->last_message_id.n = 2;
+  }
+  
+  ngx_conf_merge_value(conf->redis.url_enabled, prev->redis.url_enabled, 0);
+  ngx_conf_merge_value(conf->redis.upstream_inheritable, prev->redis.upstream_inheritable, 0);
+  ngx_conf_merge_str_value(conf->redis.url, prev->redis.url, NCHAN_REDIS_DEFAULT_URL);
+  ngx_conf_merge_value(conf->redis.ping_interval, prev->redis.ping_interval, NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME);
+  if(conf->redis.url_enabled) {
+    conf->redis.enabled = 1;
+    nchan_store_redis_add_server_conf(cf, &conf->redis, conf);
+  }
+  if(conf->redis.upstream_inheritable && !conf->redis.upstream && prev->redis.upstream && prev->redis.upstream_url.len > 0) {
+    conf->redis.upstream_url = prev->redis.upstream_url;
+    ngx_conf_set_redis_upstream(cf, &conf->redis.upstream_url, conf);
+  }
+  
+  return NGX_CONF_OK;
+}
+
+ //channel id variable
+//publisher and subscriber handlers now.
+static char *nchan_setup_handler(ngx_conf_t *cf, void * conf, ngx_int_t (*handler)(ngx_http_request_t *)) {
+  ngx_http_core_loc_conf_t       *clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+  //nchan_loc_conf_t               *plcf = conf;
+  clcf->handler = handler;
+  clcf->if_modified_since = NGX_HTTP_IMS_OFF;
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_set_storage_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t     *lcf = conf;
+  ngx_str_t            *val = &((ngx_str_t *) cf->args->elts)[1];
+  
+  if(nchan_strmatch(val, 1, "memory")) {
+    lcf->storage_engine = &nchan_store_memory;
+  }
+  else if(nchan_strmatch(val, 1, "redis")) {
+    lcf->storage_engine = &nchan_store_redis;
+    global_redis_enabled = 1;
+  }
+  else {
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "invalid %V value: %V", &cmd->name, val);
+    return NGX_CONF_ERROR;
+  }
+
+  return NGX_CONF_OK;
+}
+
+#define WEBSOCKET_STRINGS "websocket", "ws", "websockets"
+#define WEBSOCKET_STRINGS_N 3
+
+#define EVENTSOURCE_STRINGS "eventsource", "event-source", "es", "sse"
+#define EVENTSOURCE_STRINGS_N 4
+
+#define HTTP_CHUNKED_STRINGS "chunked", "http-chunked"
+#define HTTP_CHUNKED_STRINGS_N 2
+
+#define HTTP_MULTIPART_STRINGS "multipart", "multipart/mixed", "http-multipart", "multipart-mixed"
+#define HTTP_MULTIPART_STRINGS_N 4
+
+#define LONGPOLL_STRINGS "longpoll", "long-poll"
+#define LONGPOLL_STRINGS_N 2
+
+#define INTERVALPOLL_STRINGS "poll", "interval-poll", "intervalpoll", "http"
+#define INTERVALPOLL_STRINGS_N 4
+
+#define HTTP_RAW_STREAM_STRINGS "http-raw-stream"
+#define HTTP_RAW_STREAM_STRINGS_N 1
+
+#define DISABLED_STRINGS "none", "off", "disabled"
+#define DISABLED_STRINGS_N 3
+
+
+static char *nchan_publisher_directive_parse(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, ngx_int_t fail) {
+  nchan_loc_conf_t     *lcf = conf;
+  ngx_str_t            *val;
+  ngx_uint_t            i;
+  
+  nchan_conf_publisher_types_t *pubt = &lcf->pub;
+  
+  if(cf->args->nelts == 1){ //no arguments
+    pubt->http=1;
+    pubt->websocket=1;
+  }
+  else {
+    for(i=1; i < cf->args->nelts; i++) {
+      val = &((ngx_str_t *) cf->args->elts)[i];
+      if(nchan_strmatch(val, 1, "http")) {
+        pubt->http=1;
+      }
+      else if(nchan_strmatch(val, WEBSOCKET_STRINGS_N, WEBSOCKET_STRINGS)) {
+        pubt->websocket=1;
+      }
+      else{
+         if(fail) {
+          ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
+         }
+        return NGX_CONF_ERROR;
+      }
+    }
+  }
+  
+  return nchan_setup_handler(cf, conf, &nchan_pubsub_handler);
+}
+
+static char *nchan_publisher_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_publisher_directive_parse(cf, cmd, conf, 1);
+}
+
+static char *nchan_subscriber_directive_parse(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, ngx_int_t fail) {
+  nchan_loc_conf_t     *lcf = conf;
+  ngx_str_t            *val;
+  ngx_uint_t            i;
+  
+  nchan_conf_subscriber_types_t *subt = &lcf->sub;
+  
+  if(cf->args->nelts == 1){ //no arguments
+    subt->poll=0;
+    subt->http_raw_stream = 0;
+    subt->longpoll=1;
+    subt->websocket=1;
+    subt->eventsource=1;
+    subt->http_chunked=1;
+    subt->http_multipart=1;
+  }
+  else {
+    for(i=1; i < cf->args->nelts; i++) {
+      val = &((ngx_str_t *) cf->args->elts)[i];
+      if(nchan_strmatch(val, LONGPOLL_STRINGS_N, LONGPOLL_STRINGS)) {
+        subt->longpoll=1;
+      }
+      else if(nchan_strmatch(val, INTERVALPOLL_STRINGS_N, INTERVALPOLL_STRINGS)) {
+        subt->poll=1;
+      }
+      else if(nchan_strmatch(val, HTTP_RAW_STREAM_STRINGS_N, HTTP_RAW_STREAM_STRINGS)) {
+        subt->http_raw_stream=1;
+      }
+      else if(nchan_strmatch(val, HTTP_CHUNKED_STRINGS_N, HTTP_CHUNKED_STRINGS)) {
+        subt->http_chunked=1;
+      }
+      else if(nchan_strmatch(val, HTTP_MULTIPART_STRINGS_N, HTTP_MULTIPART_STRINGS)) {
+        subt->http_multipart=1;
+      }
+      else if(nchan_strmatch(val, WEBSOCKET_STRINGS_N, WEBSOCKET_STRINGS)) {
+        subt->websocket=1;
+      }
+      else if(nchan_strmatch(val, EVENTSOURCE_STRINGS_N, EVENTSOURCE_STRINGS)) {
+        subt->eventsource=1;
+      }
+      else if(nchan_strmatch(val, DISABLED_STRINGS_N, DISABLED_STRINGS)) {
+        subt->poll=0;
+        subt->longpoll=0;
+        subt->websocket=0;
+        subt->eventsource=0;
+        subt->http_chunked=0;
+        subt->http_multipart=0;
+      }
+      else {
+        if(fail) {
+          ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
+        }
+        return NGX_CONF_ERROR;
+      }
+    }
+  }
+  return nchan_setup_handler(cf, conf, &nchan_pubsub_handler);
+}
+
+static char *nchan_subscriber_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_subscriber_directive_parse(cf, cmd, conf, 1);
+}
+
+static char *nchan_pubsub_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t            *val;
+  ngx_uint_t            i;
+  nchan_publisher_directive_parse(cf, cmd, conf, 0);
+  nchan_subscriber_directive_parse(cf, cmd, conf, 0);
+  for(i=1; i < cf->args->nelts; i++) {
+    val = &((ngx_str_t *) cf->args->elts)[i];
+    if(! nchan_strmatch(val, 
+      WEBSOCKET_STRINGS_N + EVENTSOURCE_STRINGS_N + HTTP_CHUNKED_STRINGS_N + HTTP_MULTIPART_STRINGS_N + LONGPOLL_STRINGS_N + INTERVALPOLL_STRINGS_N + DISABLED_STRINGS_N,
+      WEBSOCKET_STRINGS, EVENTSOURCE_STRINGS, HTTP_CHUNKED_STRINGS, HTTP_MULTIPART_STRINGS, LONGPOLL_STRINGS_N, INTERVALPOLL_STRINGS_N, DISABLED_STRINGS_N)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
+      return NGX_CONF_ERROR;
+    }
+  }
+  return nchan_setup_handler(cf, conf, &nchan_pubsub_handler);
+}
+
+static char *nchan_subscriber_first_message_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t   *lcf = (nchan_loc_conf_t *)conf;
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  if(nchan_strmatch(val, 1, "oldest")) {
+    lcf->subscriber_first_message = 1;
+  }
+  else if(nchan_strmatch(val, 1, "newest")) {
+    lcf->subscriber_first_message = 0;
+  }
+  else {
+    //maybe a number?
+    ngx_str_t num = *val;
+    int       sign = 1;
+    ngx_int_t n;
+    
+    if(num.len > 0 && num.data[0] == '-') {
+      num.len--;
+      num.data++;
+      sign = -1;
+    }
+    if((n = ngx_atoi(num.data, num.len)) == NGX_ERROR) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V, must be 'oldest', 'newest', or a number", &cmd->name, val);
+      return NGX_CONF_ERROR;
+    }
+    if (n > 32) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V, must be 'oldest', 'newest', or a number between -32 and 32", &cmd->name, val);
+      return NGX_CONF_ERROR;
+    }
+    lcf->subscriber_first_message = n * sign;
+  }
+  return NGX_CONF_OK;
+}
+
+static void nchan_exit_worker(ngx_cycle_t *cycle) {
+  if(global_redis_enabled) {
+    redis_store_prepare_to_exit_worker();
+  }
+  nchan_store_memory.exit_worker(cycle);
+  if(global_redis_enabled) {
+    nchan_store_redis.exit_worker(cycle);
+  }
+  nchan_output_shutdown();
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  subscriber_debug_assert_isempty();
+#endif
+}
+
+static void nchan_exit_master(ngx_cycle_t *cycle) {
+  nchan_store_memory.exit_master(cycle);
+  if(global_redis_enabled) {
+    nchan_store_redis.exit_master(cycle);
+  }
+}
+
+static char *nchan_set_complex_value_array(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, nchan_complex_value_arr_t *chid) {
+  ngx_uint_t                          i;
+  ngx_str_t                          *value;
+  ngx_http_complex_value_t          **cv;
+  ngx_http_compile_complex_value_t    ccv;  
+  
+  chid->n = cf->args->nelts - 1;
+  for(i=1; i < cf->args->nelts && i <= NCHAN_COMPLEX_VALUE_ARRAY_MAX; i++) {
+    value = &((ngx_str_t *) cf->args->elts)[i];
+    
+    cv = &chid->cv[i-1];
+    *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+    if (*cv == NULL) {
+      return NGX_CONF_ERROR;
+    }
+    
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+    ccv.cf = cf;
+    ccv.value = value;
+    ccv.complex_value = *cv;
+    
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+      return NGX_CONF_ERROR;
+    }
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_set_pub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->pub_chid);
+}
+
+static char *nchan_set_sub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->sub_chid);
+}
+
+static char *nchan_set_pubsub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->pubsub_chid);
+}
+
+static char *nchan_subscriber_last_message_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->last_message_id);
+}
+
+static char *nchan_set_channel_events_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t                          *value = &((ngx_str_t *) cf->args->elts)[1];
+  ngx_http_complex_value_t          **cv = &((nchan_loc_conf_t *)conf)->channel_events_channel_id;
+  ngx_http_compile_complex_value_t    ccv;  
+  
+  *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+  if (*cv == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  
+  ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+  ccv.cf = cf;
+  ccv.value = value;
+  ccv.complex_value = *cv;
+  
+  if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+    return NGX_CONF_ERROR;
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_store_messages_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  char    *p = conf;
+  ngx_str_t *val = cf->args->elts;
+
+  
+  if (ngx_strcasecmp(val[1].data, (u_char *) "off") == 0) {
+    ngx_int_t *max;
+    max = (ngx_int_t *) (p + offsetof(nchan_loc_conf_t, max_messages));
+    *max=0;
+  }
+  return NGX_CONF_OK;
+}
+
+static char *nchan_ignore_obsolete_setting(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "ignoring obsolete nchan config directive '%V'.", &cmd->name);
+  return NGX_CONF_OK;
+}
+
+static char *nchan_ignore_subscriber_concurrency(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  if(!nchan_strmatch(val, 1, "broadcast")) {
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "ignoring obsolete nchan config directive '%V %V;'. Only 'broadcast' is currently supported.", &cmd->name, val);
+  }
+  return NGX_CONF_OK;
+}
+
+static char *nchan_set_raw_subscriber_separator(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+  ngx_str_t          *cf_val = &lcf->subscriber_http_raw_stream_separator;
+  
+  if( val->data[val->len - 1] != '\n' ) { //must end in a newline
+    u_char   *cur;
+    if((cur = ngx_palloc(cf->pool, val->len + 1)) == NULL) {
+      return NGX_CONF_ERROR;
+    }
+    ngx_memcpy(cur, val->data, val->len);
+    cur[val->len] = '\n';
+    cf_val->len = val->len + 1;
+    cf_val->data = cur;
+  }
+  else {
+    *cf_val = *val;
+  }
+  return NGX_CONF_OK;
+}
+
+static char *nchan_set_longpoll_multipart(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+  if(nchan_strmatch(val, 1, "on")) {
+    lcf->longpoll_multimsg = 1;
+  }
+  else if(nchan_strmatch(val, 1, "off")) {
+    lcf->longpoll_multimsg = 0;
+  }
+  else if(nchan_strmatch(val, 1, "raw")) {
+    lcf->longpoll_multimsg = 1;
+    lcf->longpoll_multimsg_use_raw_stream_separator = 1;
+  }
+  else {
+    ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid value for %V: %V;'. Must be 'on', 'off', or 'raw'", &cmd->name, val);
+    return NGX_CONF_ERROR;
+  }
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_enable_redis(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  char                *rc;
+  ngx_flag_t          *fp;
+  char                *p = conf;
+  nchan_loc_conf_t    *lcf = (nchan_loc_conf_t *)conf;
+  
+  rc = ngx_conf_set_flag_slot(cf, cmd, conf);
+  if(rc == NGX_CONF_ERROR) {
+    return rc;
+  }
+  fp = (ngx_flag_t *) (p + cmd->offset);
+  
+  if(*fp) {
+    if(!lcf->redis.enabled) {
+      lcf->redis.enabled = 1;
+      nchan_store_redis_add_server_conf(cf, &lcf->redis, lcf);
+    }
+    global_redis_enabled = 1;
+  }
+  else {
+    nchan_store_redis_remove_server_conf(cf, &lcf->redis);
+  }
+  
+  return rc;
+}
+
+static char *nchan_stub_status_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_stub_status_enabled = 1;
+  return nchan_setup_handler(cf, conf, &nchan_stub_status_handler);
+}
+
+
+static ngx_int_t nchan_upstream_dummy_roundrobin_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us) {
+  return NGX_OK;
+}
+
+static char *ngx_conf_upstream_redis_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_http_upstream_srv_conf_t        *uscf;
+  ngx_str_t                           *value;
+  ngx_http_upstream_server_t          *usrv;
+  
+  uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);  
+  
+  
+  if ((usrv = ngx_array_push(uscf->servers)) == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  value = cf->args->elts;
+  ngx_memzero(usrv, sizeof(*usrv));
+  usrv->name = value[1];
+  
+  uscf->peer.init_upstream = nchan_upstream_dummy_roundrobin_init;
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_set_redis_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t  *lcf = conf;
+  
+  if(lcf->redis.upstream) {
+    return "can't be set here: already using nchan_redis_pass";
+  }
+  
+  return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
+static char *ngx_conf_set_redis_upstream_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t  *lcf = conf;
+  ngx_str_t         *value = cf->args->elts;
+  
+  lcf->redis.upstream_url = value[1];
+  return ngx_conf_set_redis_upstream(cf, &value[1], conf);
+}
+
+
+#include "nchan_config_commands.c" //hideous but hey, it works
+
+static ngx_http_module_t  nchan_module_ctx = {
+    nchan_add_variables,           /* preconfiguration */
+    nchan_postconfig,              /* postconfiguration */
+    nchan_create_main_conf,        /* create main configuration */
+    NULL,                          /* init main configuration */
+    NULL,                          /* create server configuration */
+    NULL,                          /* merge server configuration */
+    nchan_create_loc_conf,         /* create location configuration */
+    nchan_merge_loc_conf,          /* merge location configuration */
+};
+
+ngx_module_t  ngx_nchan_module = {
+    NGX_MODULE_V1,
+    &nchan_module_ctx,             /* module context */
+    nchan_commands,                /* module directives */
+    NGX_HTTP_MODULE,               /* module type */
+    NULL,                          /* init master */
+    nchan_init_module,             /* init module */
+    nchan_init_worker,             /* init process */
+    NULL,                          /* init thread */
+    NULL,                          /* exit thread */
+    nchan_exit_worker,             /* exit process */
+    nchan_exit_master,             /* exit master */
+    NGX_MODULE_V1_PADDING
+};
diff --git a/debian/modules/nchan/src/nchan_types.h b/debian/modules/nchan/src/nchan_types.h
new file mode 100644
index 0000000..1860346
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_types.h
@@ -0,0 +1,332 @@
+#ifndef NCHAN_TYPES_H
+#define NCHAN_TYPES_H
+#include <util/nchan_reuse_queue.h>
+#include <util/nchan_bufchainpool.h>
+
+typedef ngx_int_t (*callback_pt)(ngx_int_t, void *, void *);
+
+typedef enum {MSG_CHANNEL_NOTREADY, MSG_NORESPONSE, MSG_INVALID, MSG_PENDING, MSG_NOTFOUND, MSG_FOUND, MSG_EXPECTED, MSG_EXPIRED} nchan_msg_status_t;
+typedef enum {INACTIVE, NOTREADY, WAITING, STUBBED, READY} chanhead_pubsub_status_t;
+
+typedef enum {
+  SUB_ENQUEUE, SUB_DEQUEUE, SUB_RECEIVE_MESSAGE, SUB_RECEIVE_STATUS, 
+  CHAN_PUBLISH, CHAN_DELETE  
+} channel_event_type_t;
+//on with the declarations
+typedef struct {
+  size_t                          shm_size;
+  ngx_msec_t                      redis_fakesub_timer_interval;
+  size_t                          redis_publish_message_msgkey_size;
+} nchan_main_conf_t;
+
+
+typedef struct {
+  ngx_str_t                     url;
+  ngx_flag_t                    url_enabled;
+  time_t                        ping_interval;
+  ngx_str_t                     upstream_url;
+  ngx_http_upstream_srv_conf_t *upstream;
+  ngx_flag_t                    upstream_inheritable;
+  unsigned                      enabled:1;
+  void                         *privdata;
+} nchan_redis_conf_t;
+
+typedef struct {
+  ngx_atomic_int_t  lock;
+  ngx_atomic_t      mutex;
+  ngx_int_t         write_pid;
+} ngx_rwlock_t;
+
+
+#define NCHAN_OLDEST_MSGID_TIME 0
+#define NCHAN_NEWEST_MSGID_TIME -1
+#define NCHAN_NTH_MSGID_TIME -2
+
+#define NCHAN_ZERO_MSGID {0, {{0}}, 0, 0}
+#define NCHAN_OLDEST_MSGID {NCHAN_OLDEST_MSGID_TIME, {{0}}, 0, 1}
+#define NCHAN_NEWEST_MSGID {NCHAN_NEWEST_MSGID_TIME, {{0}}, 0, 1}
+#define NCHAN_NTH_MSGID {NCHAN_NTH_MSGID_TIME, {{0}}, 0, 1}
+
+#define NCHAN_MULTITAG_MAX 255
+#define NCHAN_FIXED_MULTITAG_MAX 4
+union nchan_msg_multitag {
+  int16_t         fixed[NCHAN_FIXED_MULTITAG_MAX];
+  int16_t        *allocd;
+};
+
+typedef struct {
+  time_t                          time; //tag message by time
+  union nchan_msg_multitag        tag;
+  unsigned                        tagactive:16;
+  unsigned                        tagcount:16;
+} nchan_msg_id_t;
+
+typedef struct {
+  time_t                          time;
+  int16_t                         tag;
+} nchan_msg_tiny_id_t;
+
+//message queue
+
+#if NCHAN_MSG_RESERVE_DEBUG
+typedef struct msg_rsv_dbg_s msg_rsv_dbg_t;
+struct msg_rsv_dbg_s {
+  char                  *lbl;
+  msg_rsv_dbg_t         *prev;
+  msg_rsv_dbg_t         *next;
+}; //msg_rsv_dbg_s
+#endif
+
+typedef struct nchan_loc_conf_s nchan_loc_conf_t;
+typedef struct nchan_msg_s nchan_msg_t;
+
+struct nchan_msg_s {
+  nchan_msg_id_t                  id;
+  nchan_msg_id_t                  prev_id;
+  ngx_str_t                       content_type;
+  ngx_str_t                       eventsource_event;
+  //  ngx_str_t                   charset;
+  ngx_buf_t                      *buf;
+  time_t                          expires;
+  ngx_atomic_int_t                refcount;
+  
+  struct nchan_msg_s             *reload_next;
+  
+  unsigned                        shared:1; //for debugging
+  unsigned                        temp_allocd:1;
+#if NCHAN_MSG_RESERVE_DEBUG
+  struct msg_rsv_dbg_s           *rsv;
+#endif
+#if NCHAN_MSG_LEAK_DEBUG
+  ngx_str_t                       lbl;
+  struct nchan_msg_s             *dbg_prev;
+  struct nchan_msg_s             *dbg_next;
+#endif
+#if NCHAN_BENCHMARK
+  struct timeval                  start_tv;
+#endif
+}; // nchan_msg_t
+
+typedef struct {
+  nchan_msg_t       copy;
+  nchan_msg_t      *original;
+} nchan_msg_copy_t;
+
+typedef struct {
+  ngx_str_t                       id;
+  ngx_int_t                       messages;
+  ngx_int_t                       subscribers;
+  time_t                          last_seen;
+  time_t                          expires;
+  nchan_msg_id_t                  last_published_msg_id;
+} nchan_channel_t;
+
+
+//garbage collecting goodness
+typedef struct {
+  ngx_queue_t                     queue;
+  nchan_channel_t                *channel;
+} nchan_channel_queue_t;
+
+
+typedef struct {
+  ngx_queue_t                    queue;
+  ngx_rwlock_t                   lock;
+} nchan_worker_msg_sentinel_t;
+
+typedef struct {
+  ngx_atomic_uint_t      channels;
+  ngx_atomic_uint_t      subscribers;
+  ngx_atomic_uint_t      total_published_messages;
+  ngx_atomic_uint_t      messages;
+  ngx_atomic_uint_t      redis_pending_commands;
+  ngx_atomic_uint_t      redis_connected_servers;
+  ngx_atomic_uint_t      ipc_total_alerts_sent;
+  ngx_atomic_uint_t      ipc_total_alerts_received;
+  ngx_atomic_uint_t      ipc_queue_size;
+  ngx_atomic_uint_t      ipc_total_send_delay;
+  ngx_atomic_uint_t      ipc_total_receive_delay;
+} nchan_stub_status_t;
+
+typedef struct subscriber_s subscriber_t;
+
+typedef struct{
+  //init
+  ngx_int_t (*init_module)(ngx_cycle_t *cycle);
+  ngx_int_t (*init_worker)(ngx_cycle_t *cycle);
+  ngx_int_t (*init_postconfig)(ngx_conf_t *cf);
+  void      (*create_main_conf)(ngx_conf_t *cf, nchan_main_conf_t *mcf);
+  
+  //quit
+  void      (*exit_worker)(ngx_cycle_t *cycle);
+  void      (*exit_master)(ngx_cycle_t *cycle);
+  
+  //async-friendly functions with callbacks
+  ngx_int_t (*get_message) (ngx_str_t *, nchan_msg_id_t *, nchan_loc_conf_t *cf, callback_pt, void *);
+  ngx_int_t (*subscribe)   (ngx_str_t *, subscriber_t *);
+  ngx_int_t (*publish)     (ngx_str_t *, nchan_msg_t *, nchan_loc_conf_t *, callback_pt, void *);
+  
+  ngx_int_t (*delete_channel)(ngx_str_t *, nchan_loc_conf_t *, callback_pt, void *);
+  
+  //channel actions
+  ngx_int_t (*find_channel)(ngx_str_t *, nchan_loc_conf_t *, callback_pt, void*);
+  
+  
+  
+  //message actions and properties
+  ngx_str_t * (*message_etag)(nchan_msg_t *msg, ngx_pool_t *pool);
+  ngx_str_t * (*message_content_type)(nchan_msg_t *msg, ngx_pool_t *pool);
+
+} nchan_store_t;
+
+#define NCHAN_MULTI_SEP_CHR '\0'
+
+typedef struct {
+  unsigned                        http:1;
+  unsigned                        websocket:1;
+} nchan_conf_publisher_types_t;
+
+typedef struct {
+  unsigned                        poll:1; //bleugh
+  unsigned                        http_raw_stream:1; //ugleh
+  unsigned                        longpoll:1;
+  unsigned                        http_chunked:1;
+  unsigned                        http_multipart:1;
+  unsigned                        eventsource:1;
+  unsigned                        websocket:1;
+} nchan_conf_subscriber_types_t;
+
+#define NCHAN_COMPLEX_VALUE_ARRAY_MAX 8
+typedef struct {
+  ngx_http_complex_value_t       *cv[NCHAN_COMPLEX_VALUE_ARRAY_MAX];
+  ngx_int_t                       n;
+} nchan_complex_value_arr_t;
+
+struct nchan_loc_conf_s { //nchan_loc_conf_t
+  
+  time_t                          buffer_timeout;
+  ngx_int_t                       max_messages;
+  
+  ngx_http_complex_value_t       *authorize_request_url;
+  ngx_http_complex_value_t       *publisher_upstream_request_url;
+  
+  nchan_complex_value_arr_t       pub_chid;
+  nchan_complex_value_arr_t       sub_chid;
+  nchan_complex_value_arr_t       pubsub_chid;
+  ngx_str_t                       channel_group;
+  ngx_str_t                       channel_id_split_delimiter;
+  
+  ngx_str_t                       subscriber_http_raw_stream_separator;
+
+  ngx_str_t                       allow_origin;
+  
+  nchan_complex_value_arr_t       last_message_id;
+  ngx_str_t                       custom_msgtag_header;
+  ngx_int_t                       msg_in_etag_only;
+  
+  nchan_conf_publisher_types_t    pub;
+  nchan_conf_subscriber_types_t   sub; 
+  
+  time_t                          subscriber_timeout;
+  
+  ngx_int_t                       longpoll_multimsg;
+  ngx_int_t                       longpoll_multimsg_use_raw_stream_separator;
+  
+  ngx_str_t                       eventsource_event;
+  
+  time_t                          websocket_ping_interval;
+  
+  ngx_int_t                       subscriber_first_message;
+  
+  ngx_http_complex_value_t       *channel_events_channel_id;
+  ngx_http_complex_value_t       *channel_event_string;
+  
+  ngx_int_t                       subscribe_only_existing_channel;
+  
+  nchan_redis_conf_t              redis;
+  time_t                          redis_idle_channel_cache_timeout;
+  
+  ngx_int_t                       max_channel_id_length;
+  ngx_int_t                       max_channel_subscribers;
+  time_t                          channel_timeout;
+  nchan_store_t                  *storage_engine;
+};// nchan_loc_conf_t;
+
+typedef struct {
+  char              *subtype;
+  size_t             len;
+  const ngx_str_t   *format;
+} nchan_content_subtype_t;
+
+typedef struct nchan_llist_timed_s {
+  struct nchan_llist_timed_s     *prev;
+  void                           *data;
+  time_t                          time;
+  struct nchan_llist_timed_s     *next;
+} nchan_llist_timed_t;
+
+typedef enum {PUB, SUB} pub_or_sub_t;
+typedef enum {LONGPOLL, HTTP_CHUNKED, HTTP_MULTIPART, HTTP_RAW_STREAM, INTERVALPOLL, EVENTSOURCE, WEBSOCKET, INTERNAL, SUBSCRIBER_TYPES} subscriber_type_t;
+typedef void (*subscriber_callback_pt)(subscriber_t *, void *);
+
+typedef struct {
+  ngx_int_t              (*enqueue)(struct subscriber_s *);
+  ngx_int_t              (*dequeue)(struct subscriber_s *);
+  ngx_int_t              (*respond_message)(struct subscriber_s *, nchan_msg_t *);
+  ngx_int_t              (*respond_status)(struct subscriber_s *, ngx_int_t, const ngx_str_t *);
+  ngx_int_t              (*set_dequeue_callback)(subscriber_t *self, subscriber_callback_pt cb, void *privdata);
+  ngx_int_t              (*reserve)(struct subscriber_s *);
+  ngx_int_t              (*release)(struct subscriber_s *, uint8_t nodestroy);
+  ngx_int_t              (*notify)(struct subscriber_s *, ngx_int_t code, void *data);
+  ngx_int_t              (*subscribe)(subscriber_t *, ngx_str_t *);
+  
+} subscriber_fn_t;
+
+typedef enum {ALIVE, DEAD, UNKNOWN, PININGFORTHEFJORDS} nchan_subscriber_status_t;
+
+struct subscriber_s {
+  ngx_str_t                 *name;
+  subscriber_type_t          type;
+  const subscriber_fn_t     *fn;
+  nchan_subscriber_status_t  status;
+  nchan_msg_id_t             last_msgid;
+  nchan_loc_conf_t          *cf;
+  ngx_http_request_t        *request;
+  ngx_uint_t                 reserved;
+  unsigned                   dequeue_after_response:1;
+  unsigned                   destroy_after_dequeue:1;
+  unsigned                   enqueued:1;
+#if FAKESHARD
+  ngx_int_t                  owner;
+#endif
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  u_char                    *lbl;
+  subscriber_t              *dbg_prev;
+  subscriber_t              *dbg_next;
+#endif
+}; //subscriber_t
+
+#define NCHAN_MULTITAG_REQUEST_CTX_MAX 4
+typedef struct {
+  subscriber_t                  *sub;
+  nchan_reuse_queue_t           *output_str_queue;
+  nchan_reuse_queue_t           *reserved_msg_queue;
+  nchan_bufchain_pool_t         *bcp; //bufchainpool maybe?
+  
+  ngx_str_t                     *subscriber_type;
+  nchan_msg_id_t                 msg_id;
+  nchan_msg_id_t                 prev_msg_id;
+  ngx_str_t                     *publisher_type;
+  ngx_str_t                     *multipart_boundary;
+  ngx_str_t                     *channel_event_name;
+  ngx_str_t                      channel_id[NCHAN_MULTITAG_REQUEST_CTX_MAX];
+  int                            channel_id_count;
+  ngx_str_t                      request_origin_header;
+#if NCHAN_BENCHMARK
+  struct timeval                 start_tv;
+#endif
+  
+} nchan_request_ctx_t;
+
+
+#endif  /* NCHAN_TYPES_H */
diff --git a/debian/modules/nchan/src/nchan_variables.c b/debian/modules/nchan/src/nchan_variables.c
new file mode 100644
index 0000000..f1b0da7
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_variables.c
@@ -0,0 +1,231 @@
+#include <nchan_module.h>
+#include <util/nchan_output.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "VARIABLES:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "VARIABLES:" fmt, ##arg)
+
+typedef struct {
+  ngx_str_t                   name;
+  ngx_http_get_variable_pt    handler;
+  uintptr_t                   data;
+} nchan_variable_t;
+
+static nchan_request_ctx_t *get_main_request_ctx(ngx_http_request_t *r){
+  nchan_request_ctx_t        *ctx;
+  ngx_http_request_t        *rcur;
+  
+  //if this is an subrequest, get nearest parent existing ctx
+  for(rcur = r; rcur != NULL; rcur = rcur->parent) {
+    ctx = ngx_http_get_module_ctx(rcur, ngx_nchan_module);
+    if(ctx) return ctx;
+  }
+  
+  //no existing ctx found
+  return NULL;
+}
+
+static void set_varval(ngx_http_variable_value_t *v, u_char *data, size_t len) {
+  v->valid = 1;
+  v->no_cacheable = 1;
+  v->not_found = 0;
+  v->len = len;
+  v->data = data;
+}
+
+static ngx_int_t nchan_channel_event(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL || ctx->channel_event_name == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  set_varval(v, ctx->channel_event_name->data, ctx->channel_event_name->len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_channel_id_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  set_varval(v, ctx->channel_id[data].data, ctx->channel_id[data].len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_subscriber_type_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL || ctx->subscriber_type == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  set_varval(v, ctx->subscriber_type->data, ctx->subscriber_type->len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_publisher_type_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL || ctx->publisher_type == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  set_varval(v, ctx->publisher_type->data, ctx->publisher_type->len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_message_id_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char        msgidbuf[100];
+  ngx_str_t           *msgid;
+  
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL || (ctx->msg_id.time == 0 && ctx->msg_id.tagcount == 0)) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  msgid = msgid_to_str(&ctx->msg_id);
+  ngx_memcpy(msgidbuf, msgid->data, msgid->len);
+  set_varval(v, msgidbuf, msgid->len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_prev_message_id_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char        msgidbuf[100];
+  ngx_str_t           *msgid;
+  
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL  || (ctx->prev_msg_id.time == 0 && ctx->prev_msg_id.tagcount == 0)) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  msgid = msgid_to_str(&ctx->prev_msg_id);
+  ngx_memcpy(msgidbuf, msgid->data, msgid->len);
+  set_varval(v, msgidbuf, msgid->len);
+  
+  return NGX_OK;
+}
+
+/*
+static ngx_int_t nchan_message_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  
+  
+  v->not_found = 1;
+  return NGX_OK;
+}
+*/
+
+/*
+static ngx_int_t nchan_message_alert_type_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  
+  
+  v->not_found = 1;
+  return NGX_OK;
+}
+*/
+
+static ngx_int_t nchan_stub_status_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[sizeof(nchan_stub_status_t)/sizeof(ngx_atomic_uint_t)][NGX_INT_T_LEN + 4];
+  off_t                 offset = (off_t )data;
+  int                   n = offset / sizeof(ngx_atomic_uint_t);
+  nchan_stub_status_t  *stats = nchan_get_stub_status_stats();
+  ngx_atomic_uint_t     stat = *(ngx_atomic_uint_t *)((char *)stats + offset);
+  ngx_str_t             str;
+  
+  str.data = &buf[n][0];
+  str.len = ngx_sprintf(str.data, "%ui", stat) - str.data;
+  
+  set_varval(v, str.data, str.len);
+  
+  return NGX_OK;
+}
+
+
+static ngx_int_t nchan_stub_status_ipc_alerts_in_transit(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[NGX_INT_T_LEN + 4];
+  nchan_stub_status_t  *stats = nchan_get_stub_status_stats();
+  ngx_str_t             str;
+  
+  str.data = &buf[0];
+  str.len = ngx_sprintf(str.data, "%ui", stats->ipc_total_alerts_sent - stats->ipc_total_alerts_received) - str.data;
+  
+  set_varval(v, str.data, str.len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_stub_status_shared_memory_used(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t d) {
+  static u_char data[30];
+  
+  set_varval(v, data, ngx_snprintf(data, 30, "%fK", (float )((float )nchan_get_used_shmem() / 1024.0)) - data);
+  return NGX_OK;
+}
+
+
+
+#define STUB_STATUS_VARIABLE(counter) \
+  {  ngx_string("nchan_stub_status_"#counter), nchan_stub_status_variable, offsetof(nchan_stub_status_t, counter) }
+  
+#define STUB_STATUS_NAMED_VARIABLE(var_name, counter) \
+  {  ngx_string("nchan_stub_status_" var_name), nchan_stub_status_variable, offsetof(nchan_stub_status_t, counter) }
+
+
+nchan_variable_t nchan_vars[] = {
+  { ngx_string("nchan_channel_id"),         nchan_channel_id_variable, 0},
+  { ngx_string("nchan_channel_id1"),        nchan_channel_id_variable, 0},
+  { ngx_string("nchan_channel_id2"),        nchan_channel_id_variable, 1},
+  { ngx_string("nchan_channel_id3"),        nchan_channel_id_variable, 2},
+  { ngx_string("nchan_channel_id4"),        nchan_channel_id_variable, 3},
+  { ngx_string("nchan_channel_event"),      nchan_channel_event, 0},
+  { ngx_string("nchan_subscriber_type"),    nchan_subscriber_type_variable, 0},
+  { ngx_string("nchan_publisher_type"),     nchan_publisher_type_variable, 0},
+//  { ngx_string("nchan_message"),            nchan_message_variable, 0},
+  { ngx_string("nchan_prev_message_id"),    nchan_prev_message_id_variable, 0},
+  { ngx_string("nchan_message_id"),         nchan_message_id_variable, 0},
+  
+  STUB_STATUS_VARIABLE(channels),
+  STUB_STATUS_VARIABLE(subscribers),
+  STUB_STATUS_VARIABLE(total_published_messages),
+  STUB_STATUS_NAMED_VARIABLE("stored_messages", messages),
+  STUB_STATUS_VARIABLE(redis_pending_commands),
+  STUB_STATUS_VARIABLE(redis_connected_servers),
+  STUB_STATUS_NAMED_VARIABLE("total_ipc_alerts_received", ipc_total_alerts_received),
+  { ngx_string("nchan_stub_status_shared_memory_used"),  nchan_stub_status_shared_memory_used, 0},
+  { ngx_string("nchan_stub_status_ipc_alerts_in_transit"),  nchan_stub_status_ipc_alerts_in_transit, 0},
+  STUB_STATUS_NAMED_VARIABLE("ipc_queued_alerts", ipc_queue_size),
+  STUB_STATUS_NAMED_VARIABLE("total_ipc_send_delay", ipc_total_send_delay),
+  STUB_STATUS_NAMED_VARIABLE("total_ipc_receive_delay", ipc_total_receive_delay),
+  
+//  { ngx_string("nchan_message_alert_type"), nchan_message_alert_type_variable, 0},
+  
+  { ngx_null_string,                        NULL, 0 }
+};
+
+
+ngx_int_t nchan_add_variables(ngx_conf_t *cf) {
+  nchan_variable_t              *var;
+  ngx_http_variable_t           *v;
+
+  for (var = nchan_vars; var->name.len; var++) {
+    
+    v = ngx_http_add_variable(cf, &var->name, NGX_HTTP_VAR_CHANGEABLE);
+    if (v == NULL) {
+      return NGX_ERROR;
+    }
+    
+    v->get_handler = var->handler;
+    v->data = var->data;
+  }
+
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/nchan_variables.h b/debian/modules/nchan/src/nchan_variables.h
new file mode 100644
index 0000000..726b99c
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_variables.h
@@ -0,0 +1 @@
+ngx_int_t nchan_add_variables(ngx_conf_t *cf);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/nchan_websocket_publisher.c b/debian/modules/nchan/src/nchan_websocket_publisher.c
new file mode 100644
index 0000000..d198088
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_websocket_publisher.c
@@ -0,0 +1,81 @@
+#include <nchan_module.h>
+#include "subscribers/websocket.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "WEBSOCKET_PUBLISHER:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "WEBSOCKET_PUBLISHER:" fmt, ##arg)
+
+static nchan_llist_timed_t  ws_pub_head;
+
+void nchan_websocket_publisher_llist_init() {
+  DBG("init WS publisher llist");
+  ws_pub_head.prev = &ws_pub_head;
+  ws_pub_head.next = &ws_pub_head;
+  ws_pub_head.data = NULL;
+  ws_pub_head.time = 0;
+}
+
+
+static nchan_llist_timed_t   *nchan_ws_llist_enqueue(subscriber_t *sub) {
+  nchan_llist_timed_t    *cur, *last;
+  if((cur = ngx_alloc(sizeof(*cur), ngx_cycle->log)) == NULL) {
+    ERR("couldn't allocate llink for websocket publisher");
+    return NULL;
+  }
+  last = ws_pub_head.prev;
+  
+  cur->prev = last;
+  last->next = cur;
+  
+  cur->next = &ws_pub_head;
+  ws_pub_head.prev = cur;
+  
+  cur->time = ngx_time();
+  cur->data = (void *)sub;
+  return cur;
+}
+
+static ngx_int_t nchan_ws_llink_destroy(nchan_llist_timed_t *cur) {
+  nchan_llist_timed_t    *prev, *next;
+  prev = cur->prev;
+  next = cur->next;
+  
+  prev->next = next;
+  next->prev = prev;
+  
+  ngx_memset(cur, 0xC4, sizeof(*cur)); //debugstuffs
+  ngx_free(cur);
+  return NGX_OK;
+}
+
+static void ws_publisher_dequeue_callback(subscriber_t *sub, void *privdata) {
+  nchan_ws_llink_destroy((nchan_llist_timed_t *)privdata);
+}
+
+static ngx_str_t   pub_name = ngx_string("websocket");
+
+ngx_int_t nchan_create_websocket_publisher(ngx_http_request_t  *r) {
+  subscriber_t         *sub;
+  nchan_llist_timed_t  *sub_link;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  if(ctx) {
+    ctx->publisher_type = &pub_name;
+  }
+  
+  if((sub = websocket_subscriber_create(r, NULL)) == NULL) {
+    ERR("couldn't create websocket publisher.");
+    return NGX_ERROR;
+  }
+  
+  if((sub_link = nchan_ws_llist_enqueue(sub)) == NULL) {
+    websocket_subscriber_destroy(sub);
+    ERR("couldn't create websocket publisher llink");
+    return NGX_ERROR;
+  }
+  
+  sub->fn->set_dequeue_callback(sub, ws_publisher_dequeue_callback, sub_link);
+  sub->fn->enqueue(sub);
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/nchan_websocket_publisher.h b/debian/modules/nchan/src/nchan_websocket_publisher.h
new file mode 100644
index 0000000..b08e419
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_websocket_publisher.h
@@ -0,0 +1,2 @@
+void nchan_websocket_publisher_llist_init();
+ngx_int_t nchan_create_websocket_publisher(ngx_http_request_t  *r);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/store/memory/ipc-handlers.c b/debian/modules/nchan/src/store/memory/ipc-handlers.c
new file mode 100644
index 0000000..6656b07
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/ipc-handlers.c
@@ -0,0 +1,804 @@
+#include <nchan_module.h>
+#include <ngx_channel.h>
+#include "ipc.h"
+#include "ipc-handlers.h"
+#include "store-private.h"
+#include "store.h"
+#include <assert.h>
+#include <store/redis/store.h>
+#include <subscribers/memstore_ipc.h>
+#include <subscribers/memstore_redis.h>
+#include <util/nchan_msgid.h>
+
+#define IPC_SUBSCRIBE               1
+#define IPC_SUBSCRIBE_REPLY         2
+#define IPC_UNSUBSCRIBE             3  //NOT USED
+#define IPC_UNSUBSCRIBED            4
+#define IPC_PUBLISH_MESSAGE         5
+#define IPC_PUBLISH_MESSAGE_REPLY   6
+#define IPC_PUBLISH_STATUS          7
+#define IPC_PUBLISH_STATUS_REPLY    8
+#define IPC_GET_MESSAGE             9
+#define IPC_GET_MESSAGE_REPLY       10
+#define IPC_DELETE                  11
+#define IPC_DELETE_REPLY            12
+#define IPC_GET_CHANNEL_INFO        13
+#define IPC_GET_CHANNEL_INFO_REPLY  14
+#define IPC_GET_CHANNEL_AUTHCHECK   15
+#define IPC_GET_CHANNEL_AUTHCHECK_REPLY 16
+#define IPC_SUBSCRIBER_KEEPALIVE    17
+#define IPC_SUBSCRIBER_KEEPALIVE_REPLY 18
+
+#define IPC_TEST_FLOOD                 30
+
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "IPC-HANDLERS(%i):" fmt, memstore_slot(), ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "IPC-HANDLERS(%i):" fmt, memstore_slot(), ##args)
+
+//#define DEBUG_MEMZERO(var) ngx_memzero(var, sizeof(*(var)))
+#define DEBUG_MEMZERO(var) /*nothing*/
+
+//lots of copypasta here, but it's the fastest way for me to write these IPC handlers
+//maybe TODO: simplify this stuff, but probably not as it's not a performance penalty and the code is simple
+
+
+//static ngx_int_t empty_callback() {
+//  return NGX_OK;
+//}
+
+static nchan_msg_id_t zero_msgid = NCHAN_ZERO_MSGID;
+
+static ngx_str_t *str_shm_copy(ngx_str_t *str){
+  ngx_str_t *out;
+  out = shm_copy_immutable_string(nchan_memstore_get_shm(), str);
+  DBG("create shm_str %p (data@ %p) %V", out, out->data, out);
+  return out;
+}
+
+static void str_shm_free(ngx_str_t *str) {
+  DBG("free shm_str %V @ %p", str, str->data);
+  shm_free_immutable_string(nchan_memstore_get_shm(), str);
+}
+
+////////// SUBSCRIBE ////////////////
+union subdata_u {
+  memstore_channel_head_t     *origin_chanhead;
+  subscriber_t                *subscriber;
+};
+
+typedef struct {
+  ngx_str_t                   *shm_chid;
+  store_channel_head_shm_t    *shared_channel_data;
+  nchan_loc_conf_t            *cf;
+  union subdata_u              d;
+  
+} subscribe_data_t;
+
+ngx_int_t memstore_ipc_send_subscribe(ngx_int_t dst, ngx_str_t *chid, memstore_channel_head_t *origin_chanhead, nchan_loc_conf_t *cf) {
+  DBG("send subscribe to %i, %V", dst, chid);
+
+  subscribe_data_t   data; 
+  DEBUG_MEMZERO(&data);
+  
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    ERR("Out of shared memory, can't send IPC subscrive alert");
+    return NGX_DECLINED;
+  }
+  data.shared_channel_data = NULL;
+  data.d.origin_chanhead = origin_chanhead;
+  data.cf = cf;
+  
+  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_SUBSCRIBE, &data, sizeof(data));
+}
+static void receive_subscribe(ngx_int_t sender, subscribe_data_t *d) {
+  memstore_channel_head_t    *head;
+  subscriber_t               *ipc_sub = NULL;
+  
+  DBG("received subscribe request for channel %V", d->shm_chid);
+  head = nchan_memstore_get_chanhead(d->shm_chid, d->cf);
+  
+  if(head == NULL) {
+    ERR("couldn't get chanhead while receiving subscribe ipc msg");
+    d->shared_channel_data = NULL;
+    d->d.subscriber = NULL;
+  }
+  else {
+    ipc_sub = memstore_ipc_subscriber_create(sender, &head->id, d->cf, d->d.origin_chanhead);
+    d->d.subscriber = ipc_sub;
+    d->shared_channel_data = head->shared;
+    assert(d->shared_channel_data);
+  }
+  
+  ipc_alert(nchan_memstore_get_ipc(), sender, IPC_SUBSCRIBE_REPLY, d, sizeof(*d));
+  DBG("sent subscribe reply for channel %V to %i", d->shm_chid, sender);
+  
+  if(ipc_sub) {
+    head->spooler.fn->add(&head->spooler, ipc_sub);
+  }
+}
+static void receive_subscribe_reply(ngx_int_t sender, subscribe_data_t *d) {
+  memstore_channel_head_t      *head;
+  store_channel_head_shm_t     *old_shared;
+  DBG("received subscribe reply for channel %V", d->shm_chid);
+  //we have the chanhead address, but are too afraid to use it.
+  
+  if(!d->shared_channel_data && !d->d.subscriber) {
+    ERR("failed to subscribe");
+    return;
+  }
+  
+  if((head = nchan_memstore_get_chanhead_no_ipc_sub(d->shm_chid, d->cf)) == NULL) {
+    ERR("Error regarding an aspect of life or maybe freshly fallen cookie crumbles");
+    return;
+  }
+  
+  old_shared = head->shared;
+  if(old_shared) {
+    assert(old_shared == d->shared_channel_data);
+  }
+  DBG("receive subscribe proceed to do ipc_sub stuff");
+  head->shared = d->shared_channel_data;
+  
+  if(old_shared == NULL) {
+    //ERR("%V local total_sub_count %i, internal_sub_count %i", &head->id,  head->sub_count, head->internal_sub_count);
+    assert(head->total_sub_count >= head->internal_sub_count);
+    ngx_atomic_fetch_add(&head->shared->sub_count, head->total_sub_count - head->internal_sub_count);
+    ngx_atomic_fetch_add(&head->shared->internal_sub_count, head->internal_sub_count);
+  }
+  else {
+    ERR("%V sub count already shared, don't update", &head->id);
+  }
+  
+  assert(head->shared != NULL);
+  if(head->foreign_owner_ipc_sub) {
+    assert(head->foreign_owner_ipc_sub == d->d.subscriber);
+  }
+  else {
+    head->foreign_owner_ipc_sub = d->d.subscriber;
+  }
+  
+  memstore_ready_chanhead_unless_stub(head);
+  
+  str_shm_free(d->shm_chid);
+}
+
+
+
+////////// UNSUBSCRIBED ////////////////
+typedef struct {
+  ngx_str_t    *shm_chid;
+  void         *privdata;
+} unsubscribed_data_t;
+
+ngx_int_t memstore_ipc_send_unsubscribed(ngx_int_t dst, ngx_str_t *chid, void* privdata) {
+  DBG("send unsubscribed to %i %V", dst, chid);
+  unsubscribed_data_t        data = {str_shm_copy(chid), privdata};
+  if(data.shm_chid == NULL) {
+    ERR("Out of shared memory, can't send IPC unsubscribe alert");
+    return NGX_DECLINED;
+  }
+  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_UNSUBSCRIBED, &data, sizeof(data));
+}
+static void receive_unsubscribed(ngx_int_t sender, unsubscribed_data_t *d) {
+  DBG("received unsubscribed request for channel %V privdata %p", d->shm_chid, d->privdata);
+  if(memstore_channel_owner(d->shm_chid) != memstore_slot()) {
+    memstore_channel_head_t    *head;
+    //find channel
+    head = nchan_memstore_find_chanhead(d->shm_chid);
+    if(head == NULL) {
+      //already deleted maybe?
+      DBG("already unsubscribed...");
+      return;
+    }
+    //gc if no subscribers
+    if(head->total_sub_count == 0) {
+      DBG("add %p to GC", head);
+      head->foreign_owner_ipc_sub = NULL;
+      chanhead_gc_add(head, "received UNSUBSCRIVED over ipc, sub_count == 0");
+    }
+    else {
+      //subscribe again?...
+      DBG("maybe subscribe again?...");
+    }
+  }
+  else {
+    ERR("makes no sense...");
+  }
+  str_shm_free(d->shm_chid);
+}
+
+////////// PUBLISH STATUS ////////////////
+typedef struct {
+  ngx_str_t                 *shm_chid;
+  ngx_int_t                  status_code;
+  const ngx_str_t           *status_line;
+  callback_pt                callback;
+  void                      *callback_privdata;
+} publish_status_data_t;
+
+ngx_int_t memstore_ipc_send_publish_status(ngx_int_t dst, ngx_str_t *chid, ngx_int_t status_code, const ngx_str_t *status_line, callback_pt callback, void *privdata) {
+  DBG("IPC: send publish status to %i ch %V", dst, chid);
+  publish_status_data_t  data = {str_shm_copy(chid), status_code, status_line, callback, privdata};
+  if(data.shm_chid == NULL) {
+    return NGX_DECLINED;
+  }
+  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_PUBLISH_STATUS, &data, sizeof(data));
+}
+
+static void receive_publish_status(ngx_int_t sender, publish_status_data_t *d) {
+  static ngx_str_t               nullstring = ngx_null_string;
+  memstore_channel_head_t       *chead;
+  
+  if((chead = nchan_memstore_find_chanhead(d->shm_chid)) == NULL) {
+    if(ngx_exiting || ngx_quit) {
+      ERR("can't find chanhead for id %V, but it's okay.", d->shm_chid);
+    }
+    else {
+      ERR("can't find chanhead for id %V", d->shm_chid);
+      assert(0);
+    }
+    return;
+  }
+  
+  DBG("IPC: received publish status for channel %V status %i %s", d->shm_chid, d->status_code, d->status_line == NULL ? &nullstring : d->status_line);
+  
+  nchan_memstore_publish_generic(chead, NULL, d->status_code, d->status_line);
+  
+  str_shm_free(d->shm_chid);
+  d->shm_chid=NULL;
+}
+
+////////// PUBLISH  ////////////////
+typedef struct {
+  ngx_str_t                 *shm_chid;
+  nchan_msg_t               *shm_msg;
+  nchan_loc_conf_t          *cf;
+  callback_pt                callback;
+  void                      *callback_privdata;
+  
+} publish_data_t;
+
+ngx_int_t memstore_ipc_send_publish_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_t *shm_msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  publish_data_t    data; 
+  DEBUG_MEMZERO(&data);
+  
+  DBG("IPC: send publish message to %i ch %V", dst, chid);
+  assert(shm_msg->shared == 1);
+  assert(shm_msg->temp_allocd == 0);
+  assert(chid->data != NULL);
+  data.shm_chid = str_shm_copy(chid);
+  if(data.shm_chid == NULL) {
+    return NGX_DECLINED;
+  }
+  data.shm_msg = shm_msg;
+  data.cf = cf;
+  data.callback = callback;
+  data.callback_privdata = privdata;
+  
+  assert(data.shm_chid->data != NULL);
+  assert(msg_reserve(shm_msg, "publish_message") == NGX_OK);
+  
+  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_PUBLISH_MESSAGE, &data, sizeof(data));
+}
+
+typedef struct {
+  ngx_int_t        sender;
+  publish_data_t  *d;
+  unsigned         allocd:1;
+} publish_callback_data;
+
+static ngx_int_t publish_message_generic_callback(ngx_int_t, void *, void *);
+
+static void receive_publish_message(ngx_int_t sender, publish_data_t *d) {
+  
+  publish_callback_data         cd_data;
+  publish_callback_data        *cd;
+  memstore_channel_head_t      *head;
+
+  assert(d->shm_chid->data != NULL);
+  
+  DBG("IPC: received publish request for channel %V  msg %p", d->shm_chid, d->shm_msg);
+  
+  if(memstore_channel_owner(d->shm_chid) == memstore_slot()) {
+    if(d->cf->redis.enabled) {
+      cd = ngx_alloc(sizeof(*cd) + sizeof(*d), ngx_cycle->log);
+      cd->allocd=1;
+      cd->d = (publish_data_t *)&cd[1];
+      *cd->d = *d;
+    }
+    else {
+      cd = &cd_data;
+      cd->allocd=0;
+      cd->d = d;
+    }
+    
+    cd->sender = sender;
+    
+    nchan_store_publish_message_generic(d->shm_chid, d->shm_msg, 1, d->cf, publish_message_generic_callback, cd);
+    //string will be freed on publish response
+  }
+  else {
+    if((head = nchan_memstore_get_chanhead(d->shm_chid, d->cf))) {
+      nchan_memstore_publish_generic(head, d->shm_msg, 0, NULL);
+    }
+    else {
+      ERR("Unable to get chanhead for publishing");
+    }
+    
+    //don't deallocate shm_msg
+  }
+  
+  msg_release(d->shm_msg, "publish_message");
+  str_shm_free(d->shm_chid);
+  d->shm_chid=NULL;
+}
+
+typedef struct {
+  uint16_t        status;// NCHAN_MESSAGE_RECEIVED or NCHAN_MESSAGE_QUEUED;
+  uint32_t        subscribers;
+  uint16_t        messages;
+  time_t          last_seen;
+  time_t          msg_time;
+  uint16_t        msg_tag;
+  callback_pt     callback;
+  void           *callback_privdata;
+} publish_response_data;
+
+static ngx_int_t publish_message_generic_callback(ngx_int_t status, void *rptr, void *privdata) {
+  DBG("IPC: publish message generic callback");
+  publish_callback_data   *cd = (publish_callback_data *)privdata;
+  publish_response_data    rd; 
+  DEBUG_MEMZERO(&rd);
+  
+  nchan_channel_t *ch = (nchan_channel_t *)rptr;
+  rd.status = status;
+  rd.callback = cd->d->callback;
+  rd.callback_privdata = cd->d->callback_privdata;
+  if(ch != NULL) {
+    rd.last_seen = ch->last_seen;
+    rd.subscribers = ch->subscribers;
+    rd.messages = ch->messages;
+    assert(ch->last_published_msg_id.tagcount == 1);
+    rd.msg_time = ch->last_published_msg_id.time;
+    rd.msg_tag = ch->last_published_msg_id.tag.fixed[0];
+  }
+  ipc_alert(nchan_memstore_get_ipc(), cd->sender, IPC_PUBLISH_MESSAGE_REPLY, &rd, sizeof(rd));
+  if(cd->allocd) {
+    ngx_free(cd);
+  }
+  return NGX_OK;
+}
+static void receive_publish_message_reply(ngx_int_t sender, publish_response_data *d) {
+  nchan_channel_t         ch;
+  DBG("IPC: received publish reply");
+  
+  ch.last_seen = d->last_seen;
+  ch.subscribers = d->subscribers;
+  ch.messages = d->messages;
+  ch.last_published_msg_id.time = d->msg_time;
+  ch.last_published_msg_id.tag.fixed[0] = d->msg_tag;
+  ch.last_published_msg_id.tagcount = 1;
+  ch.last_published_msg_id.tagactive = 0;
+  d->callback(d->status, &ch, d->callback_privdata);
+}
+
+
+////////// GET MESSAGE ////////////////
+union getmsg_u {
+  struct req_s {
+    nchan_msg_id_t          msgid;
+  } req;
+  
+  struct resp_s {
+    nchan_msg_status_t      getmsg_code;
+    nchan_msg_t            *shm_msg;
+  } resp; 
+};
+
+typedef struct {
+  ngx_str_t              *shm_chid;
+  void                   *privdata;
+  union getmsg_u          d;
+} getmessage_data_t;
+
+ngx_int_t memstore_ipc_send_get_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_id_t *msgid, void *privdata) {
+  getmessage_data_t      data;
+  
+  if((data.shm_chid= str_shm_copy(chid)) == NULL) {
+    return NGX_ERROR;
+  }
+  data.privdata = privdata;
+  data.d.req.msgid = *msgid;
+  
+  DBG("IPC: send get message from %i ch %V", dst, chid);
+  assert(data.shm_chid->len>1);
+  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_GET_MESSAGE, &data, sizeof(data));
+}
+
+
+typedef struct {
+  ngx_int_t            sender;
+  getmessage_data_t    data;
+} getmessage_data_rsub_pd_t;
+
+static void ipc_handler_notify_on_MSG_EXPECTED_callback(nchan_msg_status_t status, void *pd) {
+  assert(status == MSG_EXPECTED || status == MSG_NORESPONSE);
+  getmessage_data_rsub_pd_t *gd = (getmessage_data_rsub_pd_t *)pd;
+  gd->data.d.resp.getmsg_code = status;
+  gd->data.d.resp.shm_msg = NULL;
+  ipc_alert(nchan_memstore_get_ipc(), gd->sender, IPC_GET_MESSAGE_REPLY, &gd->data, sizeof(gd->data));
+}
+
+static void receive_get_message(ngx_int_t sender, getmessage_data_t *d) {
+  memstore_channel_head_t     *head;
+  store_message_t             *msg = NULL;
+  
+  
+  assert(d->shm_chid->len>1);
+  assert(d->shm_chid->data!=NULL);
+  DBG("IPC: received get_message request for channel %V privdata %p", d->shm_chid, d->privdata);
+  
+  head = nchan_memstore_find_chanhead(d->shm_chid);
+  if(head == NULL) {
+    //no such thing here. reply.
+    d->d.resp.getmsg_code = MSG_NOTFOUND;
+    d->d.resp.shm_msg = NULL;
+  }
+  else {
+    nchan_msg_status_t           status;
+    msg = chanhead_find_next_message(head, &d->d.req.msgid, &status);
+    
+    if(msg == NULL && head->cf && head->cf->redis.enabled) {
+      //messages from redis are not requested explicitly, but are delivered from oldest to newest
+      //by the memmstore-redis subscriber. 
+      getmessage_data_rsub_pd_t  rdata = {sender, *d};
+      
+      nchan_memstore_redis_subscriber_notify_on_MSG_EXPECTED(head->redis_sub, &d->d.req.msgid, ipc_handler_notify_on_MSG_EXPECTED_callback, sizeof(rdata), &rdata);
+      return;
+    }
+    
+    d->d.resp.getmsg_code = status;
+    d->d.resp.shm_msg = msg == NULL ? NULL : msg->msg;
+  }
+  if(d->d.resp.shm_msg) {
+    assert(msg_reserve(d->d.resp.shm_msg, "get_message_reply") == NGX_OK);
+  }
+  DBG("IPC: send get_message_reply for channel %V  msg %p, privdata: %p", d->shm_chid, msg, d->privdata);
+  ipc_alert(nchan_memstore_get_ipc(), sender, IPC_GET_MESSAGE_REPLY, d, sizeof(*d));
+}
+
+static void receive_get_message_reply(ngx_int_t sender, getmessage_data_t *d) {
+  
+  assert(d->shm_chid->len>1);
+  assert(d->shm_chid->data!=NULL);
+  DBG("IPC: received get_message reply for channel %V msg %p privdata %p", d->shm_chid, d->d.resp.shm_msg, d->privdata);
+  nchan_memstore_handle_get_message_reply(d->d.resp.shm_msg, d->d.resp.getmsg_code, d->privdata);
+  if(d->d.resp.shm_msg) {
+    msg_release(d->d.resp.shm_msg, "get_message_reply");
+  }
+  str_shm_free(d->shm_chid);
+}
+
+
+
+
+////////// DELETE ////////////////
+typedef struct {
+  ngx_str_t           *shm_chid;
+  ngx_int_t            sender;
+  nchan_channel_t     *shm_channel_info;
+  ngx_int_t            code;
+  callback_pt          callback;
+  void                *privdata;
+} delete_data_t;
+
+ngx_int_t memstore_ipc_send_delete(ngx_int_t dst, ngx_str_t *chid, callback_pt callback,void *privdata) {
+  delete_data_t  data = {str_shm_copy(chid), 0, NULL, 0, callback, privdata};
+  if(data.shm_chid == NULL) {
+    return NGX_ERROR;
+  }
+  DBG("IPC: send delete to %i ch %V", dst, chid);
+  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_DELETE, &data, sizeof(data));
+}
+
+static ngx_int_t delete_callback_handler(ngx_int_t, nchan_channel_t *, delete_data_t *);
+
+static void receive_delete(ngx_int_t sender, delete_data_t *d) {
+  d->sender = sender;
+  DBG("IPC received delete request for channel %V privdata %p", d->shm_chid, d->privdata);
+  nchan_memstore_force_delete_channel(d->shm_chid, (callback_pt )delete_callback_handler, d);
+}
+
+static ngx_int_t delete_callback_handler(ngx_int_t code, nchan_channel_t *chan, delete_data_t *d) {
+  nchan_channel_t      *chan_info;
+  
+  d->code = code;
+  if (chan) {
+    if((chan_info = shm_alloc(nchan_memstore_get_shm(), sizeof(*chan_info), "channel info for delete IPC response")) == NULL) {
+      d->shm_channel_info = NULL;
+      //yeah
+      ERR("unable to allocate chan_info");
+    }
+    else {
+      d->shm_channel_info= chan_info;
+      chan_info->messages = chan->messages;
+      chan_info->subscribers = chan->subscribers;
+      chan_info->last_seen = chan->last_seen;
+      
+      if(chan->last_published_msg_id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+        //meh, this can't be triggered... can it?...
+        nchan_msg_id_t           zeroid = NCHAN_ZERO_MSGID;
+        chan_info->last_published_msg_id = zeroid;
+      }
+      else {
+        chan_info->last_published_msg_id = chan->last_published_msg_id;
+      }
+    }
+  }
+  else {
+    d->shm_channel_info = NULL;
+  }
+  ipc_alert(nchan_memstore_get_ipc(), d->sender, IPC_DELETE_REPLY, d, sizeof(*d));
+  return NGX_OK;
+}
+static void receive_delete_reply(ngx_int_t sender, delete_data_t *d) {
+  
+  DBG("IPC received delete reply for channel %V privdata %p", d->shm_chid, d->privdata);
+  d->callback(d->code, d->shm_channel_info, d->privdata);
+  
+  if(d->shm_channel_info != NULL) {
+    shm_free(nchan_memstore_get_shm(), d->shm_channel_info);
+  }
+  str_shm_free(d->shm_chid);
+}
+
+
+
+
+////////// GET CHANNEL INFO ////////////////
+typedef struct {
+  ngx_str_t                 *shm_chid;
+  store_channel_head_shm_t  *channel_info;
+  nchan_msg_id_t             last_msgid;
+  callback_pt                callback;
+  void                      *privdata;
+} channel_info_data_t;
+
+ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, callback_pt callback, void* privdata) {
+  DBG("send get_channel_info to %i %V", dst, chid);
+  channel_info_data_t        data;
+  DEBUG_MEMZERO(&data);
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    return NGX_ERROR;
+  }
+
+  data.channel_info = NULL;
+  data.last_msgid = zero_msgid;
+  data.callback = callback;
+  data.privdata = privdata;
+  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_GET_CHANNEL_INFO, &data, sizeof(data));
+}
+static void receive_get_channel_info(ngx_int_t sender, channel_info_data_t *d) {
+  memstore_channel_head_t    *head;
+  
+  DBG("received get_channel_info request for channel %V privdata %p", d->shm_chid, d->privdata);
+  head = nchan_memstore_find_chanhead(d->shm_chid);
+  assert(memstore_slot() == memstore_channel_owner(d->shm_chid));
+  if(head == NULL) {
+    //already deleted maybe?
+    DBG("channel not for for get_channel_info");
+    d->channel_info = NULL;
+  }
+  else {
+    d->channel_info = head->shared;
+    assert(head->latest_msgid.tagcount <= 1);
+    d->last_msgid = head->latest_msgid;
+  }
+  ipc_alert(nchan_memstore_get_ipc(), sender, IPC_GET_CHANNEL_INFO_REPLY, d, sizeof(*d));
+}
+
+static void receive_get_channel_info_reply(ngx_int_t sender, channel_info_data_t *d) {
+  nchan_channel_t            chan;
+  store_channel_head_shm_t  *chinfo = d->channel_info;
+  
+  if(chinfo) {
+    //construct channel
+    chan.subscribers = chinfo->sub_count;
+    chan.last_seen = chinfo->last_seen;
+    chan.id.data = d->shm_chid->data;
+    chan.id.len = d->shm_chid->len;
+    chan.messages = chinfo->stored_message_count;
+    chan.last_published_msg_id = d->last_msgid;
+    d->callback(NGX_OK, &chan, d->privdata);
+  }
+  else {
+    d->callback(NGX_OK, NULL, d->privdata);
+  }
+  str_shm_free(d->shm_chid);
+}
+
+
+////////// CHANNEL AUTHORIZATION DATA ////////////////
+typedef struct {
+  ngx_str_t               *shm_chid;
+  unsigned                 auth_ok:1;
+  unsigned                 channel_must_exist:1;
+  nchan_loc_conf_t        *cf;
+  ngx_int_t                max_subscribers;
+  callback_pt              callback;
+  void                    *privdata;
+} channel_authcheck_data_t;
+
+ngx_int_t memstore_ipc_send_channel_auth_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata) {
+  DBG("send channel_auth_check to %i %V", dst, chid);
+  channel_authcheck_data_t        data;
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    return NGX_ERROR;
+  }
+  data.auth_ok = 0;
+  data.channel_must_exist = cf->subscribe_only_existing_channel;
+  data.cf = cf;
+  data.max_subscribers = cf->max_channel_subscribers;
+  data.callback = callback;
+  data.privdata = privdata;
+  
+  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_GET_CHANNEL_AUTHCHECK, &data, sizeof(data));
+}
+
+typedef struct {
+  ngx_int_t                 sender;
+  channel_authcheck_data_t  d;
+} channel_authcheck_data_callback_t;
+
+static ngx_int_t redis_receive_channel_auth_check_callback(ngx_int_t status, void *ch, void *d) {
+  nchan_channel_t                     *channel = (nchan_channel_t *)ch;
+  channel_authcheck_data_callback_t   *data = (channel_authcheck_data_callback_t *)d;
+  assert(status == NGX_OK);
+  if(channel == NULL) {
+    data->d.auth_ok = !data->d.channel_must_exist;
+  }
+  else if(data->d.max_subscribers == 0) {
+    data->d.auth_ok = 1;
+  }
+  else {
+    data->d.auth_ok = channel->subscribers < data->d.max_subscribers;
+  }
+  ipc_alert(nchan_memstore_get_ipc(), data->sender, IPC_GET_CHANNEL_AUTHCHECK_REPLY, &data->d, sizeof(data->d));
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static void receive_channel_auth_check(ngx_int_t sender, channel_authcheck_data_t *d) {
+  memstore_channel_head_t    *head;
+  
+  DBG("received channel_auth_check request for channel %V privdata %p", d->shm_chid, d->privdata);
+  
+  assert(memstore_slot() == memstore_channel_owner(d->shm_chid));
+  if(!d->cf->redis.enabled) {
+    head = nchan_memstore_find_chanhead(d->shm_chid);
+    if(head == NULL) {
+      d->auth_ok = !d->channel_must_exist;
+    }
+    else if (d->max_subscribers == 0) {
+      d->auth_ok = 1;
+    }
+    else {
+      assert(head->shared);
+      d->auth_ok = head->shared->sub_count < (ngx_uint_t )d->max_subscribers;
+    }
+    ipc_alert(nchan_memstore_get_ipc(), sender, IPC_GET_CHANNEL_AUTHCHECK_REPLY, d, sizeof(*d));
+  }
+  else {
+    channel_authcheck_data_callback_t    *dd = ngx_alloc(sizeof(*dd), ngx_cycle->log);
+    dd->d = *d;
+    dd->sender = sender;
+    nchan_store_redis.find_channel(d->shm_chid, d->cf, redis_receive_channel_auth_check_callback, dd);
+  }
+}
+
+static void receive_channel_auth_check_reply(ngx_int_t sender, channel_authcheck_data_t *d) {
+  d->callback(d->auth_ok, NULL, d->privdata);
+  str_shm_free(d->shm_chid);
+}
+
+/////////// SUBSCRIBER KEEPALIVE ///////////
+typedef struct {
+  ngx_str_t                   *shm_chid;
+  subscriber_t                *ipc_sub;
+  memstore_channel_head_t     *originator;
+  ngx_uint_t                   renew;
+  callback_pt                  callback;
+  void                        *privdata;
+} sub_keepalive_data_t;
+
+ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch, callback_pt callback, void *privdata) {
+  sub_keepalive_data_t        data = {str_shm_copy(chid), sub, ch, 0, callback, privdata};
+  if(data.shm_chid == NULL) {
+    return NGX_ERROR;
+  }
+  DBG("send SUBSCRIBER KEEPALIVE to %i %V", dst, chid);
+  ipc_alert(nchan_memstore_get_ipc(), dst, IPC_SUBSCRIBER_KEEPALIVE, &data, sizeof(data));
+  return NGX_OK;
+}
+static void receive_subscriber_keepalive(ngx_int_t sender, sub_keepalive_data_t *d) {
+  memstore_channel_head_t    *head;
+  DBG("received SUBSCRIBER KEEPALIVE from %i for channel %V", sender, d->shm_chid);
+  head = nchan_memstore_find_chanhead(d->shm_chid);
+  if(head == NULL) {
+    DBG("not subscribed anymore");
+    d->renew = 0;
+  }
+  else {
+    assert(head == d->originator);
+    assert(head->status == READY || head->status == STUBBED);
+    assert(head->foreign_owner_ipc_sub == d->ipc_sub);
+    if(head->total_sub_count == 0) {
+      if(ngx_time() - head->last_subscribed_local > MEMSTORE_IPC_SUBSCRIBER_TIMEOUT) {
+        d->renew = 0;
+        DBG("No subscribers lately. Time... to die.");
+      }
+      else {
+        DBG("No subscribers, but there was one %i sec ago. don't unsubscribe.", ngx_time() - head->last_subscribed_local);
+        d->renew = 1;
+      }
+    }
+    else {
+      d->renew = 1;
+    }
+  }
+  ipc_alert(nchan_memstore_get_ipc(), sender, IPC_SUBSCRIBER_KEEPALIVE_REPLY, d, sizeof(*d));
+}
+
+static void receive_subscriber_keepalive_reply(ngx_int_t sender, sub_keepalive_data_t *d) {
+  d->callback(d->renew, NULL, d->privdata);
+  str_shm_free(d->shm_chid);
+}
+
+/////////// FLOOD TEST ///////////
+typedef struct {
+  uint64_t          n;
+} flood_data_t;
+
+
+static int  flood_seq = 0;
+ngx_int_t memstore_ipc_send_flood_test(ngx_int_t dst) {
+  flood_data_t        data = {flood_seq++};
+  ipc_alert(nchan_memstore_get_ipc(), dst, IPC_TEST_FLOOD, &data, sizeof(data));
+  return NGX_OK;
+}
+
+
+static void receive_flood_test(ngx_int_t sender, flood_data_t *d) {
+  struct timespec  tv;
+  tv.tv_sec=0;
+  tv.tv_nsec=8000000;
+  ERR("      received FLOOD TEST from %i seq %l", sender, d->n);
+  nanosleep(&tv, NULL);
+}
+
+static ipc_handler_pt ipc_alert_handler[] = {
+  [IPC_SUBSCRIBE] =                   (ipc_handler_pt )receive_subscribe,
+  [IPC_SUBSCRIBE_REPLY] =             (ipc_handler_pt )receive_subscribe_reply,
+  [IPC_UNSUBSCRIBED] =                (ipc_handler_pt )receive_unsubscribed,
+  [IPC_PUBLISH_MESSAGE] =             (ipc_handler_pt )receive_publish_message,
+  [IPC_PUBLISH_MESSAGE_REPLY] =       (ipc_handler_pt )receive_publish_message_reply,
+  [IPC_PUBLISH_STATUS] =              (ipc_handler_pt )receive_publish_status,
+  [IPC_GET_MESSAGE] =                 (ipc_handler_pt )receive_get_message,
+  [IPC_GET_MESSAGE_REPLY] =           (ipc_handler_pt )receive_get_message_reply,
+  [IPC_DELETE] =                      (ipc_handler_pt )receive_delete,
+  [IPC_DELETE_REPLY] =                (ipc_handler_pt )receive_delete_reply,
+  [IPC_GET_CHANNEL_INFO] =            (ipc_handler_pt )receive_get_channel_info,
+  [IPC_GET_CHANNEL_INFO_REPLY]=       (ipc_handler_pt )receive_get_channel_info_reply,
+  [IPC_GET_CHANNEL_AUTHCHECK] =       (ipc_handler_pt )receive_channel_auth_check,
+  [IPC_GET_CHANNEL_AUTHCHECK_REPLY]=  (ipc_handler_pt )receive_channel_auth_check_reply,
+  [IPC_SUBSCRIBER_KEEPALIVE] =        (ipc_handler_pt )receive_subscriber_keepalive,
+  [IPC_SUBSCRIBER_KEEPALIVE_REPLY] =  (ipc_handler_pt )receive_subscriber_keepalive_reply,
+  [IPC_TEST_FLOOD]                 =  (ipc_handler_pt )receive_flood_test
+};
+
+void memstore_ipc_alert_handler(ngx_int_t sender, ngx_uint_t code, void *data) {
+  ipc_alert_handler[code](sender, data);
+}
diff --git a/debian/modules/nchan/src/store/memory/ipc-handlers.h b/debian/modules/nchan/src/store/memory/ipc-handlers.h
new file mode 100644
index 0000000..a245c4f
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/ipc-handlers.h
@@ -0,0 +1,16 @@
+#include "store-private.h"
+
+typedef void (*ipc_handler_pt)(ngx_int_t, void *);
+
+ngx_int_t memstore_ipc_send_subscribe(ngx_int_t owner, ngx_str_t *shm_chid, memstore_channel_head_t *, nchan_loc_conf_t *);
+ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch, callback_pt callback, void *privdata);
+ngx_int_t memstore_ipc_send_unsubscribe(ngx_int_t dst, ngx_str_t *chid, void *subscriber, void* privdata);
+ngx_int_t memstore_ipc_send_unsubscribed(ngx_int_t dst, ngx_str_t *chid, void* privdata);
+ngx_int_t memstore_ipc_send_publish_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_t *shm_msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
+ngx_int_t memstore_ipc_send_publish_status(ngx_int_t dst, ngx_str_t *chid, ngx_int_t status_code, const ngx_str_t *status_line, callback_pt callback, void *privdata);
+ngx_int_t memstore_ipc_send_get_message(ngx_int_t owner, ngx_str_t *shm_chid, nchan_msg_id_t *msgid, void * privdata);
+ngx_int_t memstore_ipc_send_delete(ngx_int_t owner, ngx_str_t *shm_chid, callback_pt callback, void *privdata);
+void memstore_ipc_alert_handler(ngx_int_t sender, ngx_uint_t code, void *data);
+ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, callback_pt callback, void* privdata);
+ngx_int_t memstore_ipc_send_channel_auth_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata);
+ngx_int_t memstore_ipc_send_flood_test(ngx_int_t dst);
diff --git a/debian/modules/nchan/src/store/memory/ipc.c b/debian/modules/nchan/src/store/memory/ipc.c
new file mode 100755
index 0000000..dbdce5e
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/ipc.c
@@ -0,0 +1,529 @@
+//worker processes of the world, unite.
+#include <nchan_module.h>
+#include <ngx_channel.h>
+#include <assert.h>
+#include "ipc.h"
+
+#include "store-private.h"
+
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+//#define DEBUG_LEVEL NGX_LOG_WARN
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "IPC:" fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "IPC:" fmt, ##args)
+
+//#define DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC 100
+
+static ngx_event_t  receive_alert_delay_log_timer;
+static ngx_event_t  send_alert_delay_log_timer;
+static void receive_alert_delay_log_timer_handler(ngx_event_t *ev);
+static void send_alert_delay_log_timer_handler(ngx_event_t *ev);
+
+
+static void ipc_read_handler(ngx_event_t *ev);
+
+ngx_int_t ipc_init(ipc_t *ipc) {
+  int                             i = 0;
+  ipc_process_t                  *proc;
+  
+  nchan_init_timer(&receive_alert_delay_log_timer, receive_alert_delay_log_timer_handler, NULL);
+  nchan_init_timer(&send_alert_delay_log_timer, send_alert_delay_log_timer_handler, NULL);
+  
+  for(i=0; i< NGX_MAX_PROCESSES; i++) {
+    proc = &ipc->process[i];
+    proc->ipc = ipc;
+    proc->pipe[0]=NGX_INVALID_FILE;
+    proc->pipe[1]=NGX_INVALID_FILE;
+    proc->c=NULL;
+    proc->active = 0;
+    ngx_memzero(proc->wbuf.alerts, sizeof(proc->wbuf.alerts));
+    proc->wbuf.first = 0;
+    proc->wbuf.n = 0;
+    proc->wbuf.overflow_first = NULL;
+    proc->wbuf.overflow_last = NULL;
+    proc->wbuf.overflow_n = 0;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t ipc_set_handler(ipc_t *ipc, void (*alert_handler)(ngx_int_t, ngx_uint_t, void *)) {
+  ipc->handler=alert_handler;
+  return NGX_OK;
+}
+
+static void ipc_try_close_fd(ngx_socket_t *fd) {
+  if(*fd != NGX_INVALID_FILE) {
+    ngx_close_socket(*fd);
+    *fd=NGX_INVALID_FILE;
+  }
+}
+
+ngx_int_t ipc_open(ipc_t *ipc, ngx_cycle_t *cycle, ngx_int_t workers, void (*slot_callback)(int slot, int worker)) {
+//initialize pipes for workers in advance.
+  int                             i, j, s = 0;
+  ngx_int_t                       last_expected_process = ngx_last_process;
+  ipc_process_t                  *proc;
+  ngx_socket_t                   *socks;
+  
+  /* here's the deal: we have no control over fork()ing, nginx's internal 
+    * socketpairs are unusable for our purposes (as of nginx 0.8 -- check the 
+    * code to see why), and the module initialization callbacks occur before
+    * any workers are spawned. Rather than futzing around with existing 
+    * socketpairs, we make our own pipes array. 
+    * Trouble is, ngx_spawn_process() creates them one-by-one, and we need to 
+    * do it all at once. So we must guess all the workers' ngx_process_slots in 
+    * advance. Meaning the spawning logic must be copied to the T.
+    * ... with some allowances for already-opened sockets...
+    */
+  for(i=0; i < workers; i++) {
+    //copypasta from os/unix/ngx_process.c (ngx_spawn_process)
+    while (s < last_expected_process && ngx_processes[s].pid != -1) {
+      //find empty existing slot
+      s++;
+    }
+    
+    if(slot_callback) {
+      slot_callback(s, i);
+    }
+    
+    proc = &ipc->process[s];
+
+    socks = proc->pipe;
+    
+    if(proc->active) {
+      // reinitialize already active pipes. This is done to prevent IPC alerts
+      // from a previous restart that were never read from being received by
+      // a newly restarted worker
+      ipc_try_close_fd(&socks[0]);
+      ipc_try_close_fd(&socks[1]);
+      proc->active = 0;
+    }
+    
+    assert(socks[0] == NGX_INVALID_FILE && socks[1] == NGX_INVALID_FILE);
+    
+    //make-a-pipe
+    if (pipe(socks) == -1) {
+      ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "pipe() failed while initializing nchan IPC");
+      return NGX_ERROR;
+    }
+    //make both ends nonblocking
+    for(j=0; j <= 1; j++) {
+      if (ngx_nonblocking(socks[j]) == -1) {
+	ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_nonblocking_n " failed on pipe socket %i while initializing nchan", j);
+	ipc_try_close_fd(&socks[0]);
+	ipc_try_close_fd(&socks[1]);
+	return NGX_ERROR;
+      }
+    }
+    //It's ALIIIIIVE! ... erm.. active...
+    proc->active = 1;
+    
+    s++; //NEXT!!
+  }
+  
+  //ERR("ipc_alert_t size %i bytes", sizeof(ipc_alert_t));
+  
+  return NGX_OK;
+}
+
+
+
+ngx_int_t ipc_close(ipc_t *ipc, ngx_cycle_t *cycle) {
+  int i;
+  ipc_process_t            *proc;
+  ipc_writebuf_overflow_t  *of, *of_next;
+  
+  for (i=0; i<NGX_MAX_PROCESSES; i++) {
+    proc = &ipc->process[i];
+    if(!proc->active) continue;
+    
+    if(proc->c) {
+      ngx_close_connection(proc->c);
+      proc->c = NULL;
+    }
+    
+    for(of = proc->wbuf.overflow_first; of != NULL; of = of_next) {
+      of_next = of->next;
+      ngx_free(of);
+    }
+    
+    ipc_try_close_fd(&proc->pipe[0]);
+    ipc_try_close_fd(&proc->pipe[1]);
+    ipc->process[i].active = 0;
+  }
+  return NGX_OK;
+}
+
+static ngx_uint_t delayed_sent_alerts_count;
+static ngx_uint_t delayed_sent_alerts_delay;
+
+static void send_alert_delay_log_timer_handler(ngx_event_t *ev) {
+  nchan_log_error("Sending %ui interprocess alert%s delayed by %ui sec.", delayed_sent_alerts_count, delayed_sent_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_sent_alerts_count > 0 ? delayed_sent_alerts_delay / delayed_sent_alerts_count : 0));
+  
+  delayed_sent_alerts_count = 0;
+  delayed_sent_alerts_delay = 0;
+}
+
+static void ipc_record_alert_send_delay(ngx_uint_t delay) {
+  delayed_sent_alerts_count ++;
+  delayed_sent_alerts_delay += delay;
+  nchan_update_stub_status(ipc_total_send_delay, delay);
+  if(!send_alert_delay_log_timer.timer_set && !ngx_exiting && !ngx_quit) {
+    ngx_add_timer(&send_alert_delay_log_timer, 1000);
+  }
+}
+
+static ngx_int_t ipc_write_alert_fd(ngx_socket_t fd, ipc_alert_t *alert) {
+  int         n;
+  ngx_int_t   err;
+  
+  n = write(fd, alert, sizeof(*alert));
+ 
+  if (n == -1) {
+    err = ngx_errno;
+    if (err == NGX_EAGAIN) {
+      return NGX_AGAIN;
+    }
+    
+    ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, "write() failed");
+    assert(0);
+    return NGX_ERROR;
+  }
+  
+  if(ngx_time() - alert->time_sent >= 2) {
+    ipc_record_alert_send_delay(ngx_time() - alert->time_sent);
+  }
+  return NGX_OK;
+}
+
+static void ipc_write_handler(ngx_event_t *ev) {
+  ngx_connection_t        *c = ev->data;
+  ngx_socket_t             fd = c->fd;
+  
+  ipc_process_t           *proc = (ipc_process_t *) c->data;
+  ipc_alert_t             *alerts = proc->wbuf.alerts;
+  
+  int                      n = proc->wbuf.n;
+  int                      i, first = proc->wbuf.first, last = first + n;
+  uint8_t                  write_aborted = 0;
+  
+  //DBG("%i alerts to write, with %i in overflow", proc->wbuf.n, proc->wbuf.overflow_n);
+  
+  if(!memstore_ready()) {
+#if nginx_version >= 1008000
+    ev->cancelable = 1;
+#endif
+    ngx_add_timer(ev, 1000);
+    return;
+  }
+#if nginx_version >= 1008000
+  else {
+    ev->cancelable = 0;
+  }
+#endif
+  
+  for(i = first; i < last; i++) {
+    //ERR("send alert at %i", i % IPC_WRITEBUF_SIZE );
+    if(ipc_write_alert_fd(fd, &alerts[i % IPC_WRITEBUF_SIZE]) != NGX_OK) {
+      write_aborted = 1;
+      //DBG("write aborted at %i iter. first: %i, n: %i", i - first, first, proc->wbuf.n);
+      break;
+    }
+    /*
+    else {
+      DBG("wrote alert at %i", i % IPC_WRITEBUF_SIZE);
+    }
+    */
+  }
+  
+  if(i==last) { //sent all outstanding alerts
+    //DBG("finished writing %i alerts.", proc->wbuf.n);
+    proc->wbuf.first = 0; // for debugging and stuff
+    proc->wbuf.n = 0;
+  }
+  else {
+    proc->wbuf.first = i;
+    proc->wbuf.n -= (i - first);
+    //DBG("first now at %i, %i alerts remain", i, proc->wbuf.n);
+  }
+  
+  nchan_update_stub_status(ipc_queue_size, proc->wbuf.n - n);
+  
+  if(proc->wbuf.overflow_n > 0 && i - first > 0) {
+    ipc_writebuf_overflow_t  *of;
+    first = proc->wbuf.first + proc->wbuf.n;
+    last = first + (IPC_WRITEBUF_SIZE - proc->wbuf.n);
+    //DBG("try to squeeze in overflow between %i and %i", first, last);
+    for(i = first; i < last; i++) {
+      of = proc->wbuf.overflow_first;
+      ///DBG("looking at overflow %p next %p", of, of->next);
+      alerts[i % IPC_WRITEBUF_SIZE] = of->alert;
+      proc->wbuf.overflow_n--;
+      proc->wbuf.n++;
+      assert(proc->wbuf.overflow_n >= 0);
+      
+      proc->wbuf.overflow_first = of->next;
+      
+      ngx_free(of);
+      
+      //DBG("squeezed in overflow at %i, %i overflow remaining", i, proc->wbuf.overflow_n);
+      
+      if(proc->wbuf.overflow_first == NULL) {
+        proc->wbuf.overflow_last = NULL;
+        break;
+      }
+    }
+    
+    if(!write_aborted) {
+      //retry
+      //DBG("retry write after squeezing in overflow");
+      ipc_write_handler(ev);
+      return;
+    }
+    
+  }
+  
+  if(write_aborted) {
+    //DBG("re-add event because the write failed");
+    ngx_handle_write_event(c->write, 0);
+  }
+}
+
+ngx_int_t ipc_register_worker(ipc_t *ipc, ngx_cycle_t *cycle) {
+  int                    i;    
+  ngx_connection_t      *c;
+  ipc_process_t         *proc;
+  
+  for(i=0; i< NGX_MAX_PROCESSES; i++) {
+    
+    proc = &ipc->process[i];
+    
+    if(!proc->active) continue;
+    
+    assert(proc->pipe[0] != NGX_INVALID_FILE);
+    assert(proc->pipe[1] != NGX_INVALID_FILE);
+    
+    if(i==ngx_process_slot) {
+      //set up read connection
+      c = ngx_get_connection(proc->pipe[0], cycle->log);
+      c->data = ipc;
+      
+      c->read->handler = ipc_read_handler;
+      c->read->log = cycle->log;
+      c->write->handler = NULL;
+      
+      ngx_add_event(c->read, NGX_READ_EVENT, 0);
+      proc->c=c;
+    }
+    else {
+      //set up write connection
+      c = ngx_get_connection(proc->pipe[1], cycle->log);
+      
+      c->data = proc;
+      
+      c->read->handler = NULL;
+      c->write->log = cycle->log;
+      c->write->handler = ipc_write_handler;
+      
+      proc->c=c;
+    }
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t ipc_read_socket(ngx_socket_t s, ipc_alert_t *alert, ngx_log_t *log) {
+  DBG("IPC read channel");
+  ssize_t             n;
+  ngx_err_t           err;
+  //static char         buf[sizeof(ipc_alert_t) * 2];
+  //static char        *cur;
+  
+  n = read(s, alert, sizeof(ipc_alert_t));
+ 
+  if (n == -1) {
+    err = ngx_errno;
+    if (err == NGX_EAGAIN) {
+      return NGX_AGAIN;
+    }
+    
+    ngx_log_error(NGX_LOG_ERR, log, err, "nchan IPC: read() failed");
+    return NGX_ERROR;
+  }
+ 
+  if (n == 0) {
+    ngx_log_debug0(NGX_LOG_ERR, log, 0, "nchan IPC: read() returned zero");
+    return NGX_ERROR;
+  }
+ 
+  if ((size_t) n < sizeof(*alert)) {
+    ngx_log_error(NGX_LOG_ERR, log, 0, "nchan IPC: read() returned not enough data: %z", n);
+    return NGX_ERROR;
+  }
+  
+  return n;
+}
+
+static ngx_uint_t delayed_received_alerts_count;
+static ngx_uint_t delayed_received_alerts_delay;
+
+static void receive_alert_delay_log_timer_handler(ngx_event_t *ev) {
+  nchan_log_error("Received %ui interprocess alert%s delayed by %ui sec.", delayed_received_alerts_count, delayed_received_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_received_alerts_count > 0 ? delayed_received_alerts_delay / delayed_received_alerts_count : 0));
+  
+  delayed_received_alerts_count = 0;
+  delayed_received_alerts_delay = 0;
+}
+
+static void ipc_record_alert_receive_delay(ngx_uint_t delay) {
+  delayed_received_alerts_count ++;
+  delayed_received_alerts_delay += delay;
+  nchan_update_stub_status(ipc_total_receive_delay, delay);
+  if(!receive_alert_delay_log_timer.timer_set && !ngx_exiting && !ngx_quit) {
+    ngx_add_timer(&receive_alert_delay_log_timer, 1000);
+  }
+}
+
+#if DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC
+typedef struct {
+  ngx_event_t   timer;
+  ipc_alert_t   alert;
+  ipc_t        *ipc;
+} delayed_alert_glob_t;
+static void fake_ipc_alert_delay_handler(ngx_event_t *ev) {
+  delayed_alert_glob_t *glob = (delayed_alert_glob_t *)ev->data;
+  
+  if(ngx_time() - glob->alert.time_sent >= 2) {
+    ipc_record_alert_receive_delay(ngx_time() - glob->alert.time_sent);
+  }
+  
+  glob->ipc->handler(glob->alert.src_slot, glob->alert.code, glob->alert.data);
+  ngx_free(glob);
+}
+#endif
+
+static void ipc_read_handler(ngx_event_t *ev) {
+  DBG("IPC channel handler");
+  //copypasta from os/unix/ngx_process_cycle.c (ngx_channel_handler)
+  ngx_int_t          n;
+  ipc_alert_t        alert;
+  ngx_connection_t  *c;
+  if (ev->timedout) {
+    ev->timedout = 0;
+    return;
+  }
+  c = ev->data;
+  
+  while(1) {
+    n = ipc_read_socket(c->fd, &alert, ev->log);
+    if (n == NGX_ERROR) {
+      ERR("IPC_READ_SOCKET failed: bad connection. This should never have happened, yet here we are...");
+      assert(0);
+      return;
+    }
+    if (n == NGX_AGAIN) {
+      return;
+    }
+    //ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, "nchan: channel command: %d", ch.command);
+    
+    assert(n == sizeof(alert));
+    if(alert.worker_generation < memstore_worker_generation) {
+      ERR("Got IPC alert for previous generation's worker. discarding.");
+    }
+    else {
+#if DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC
+      delayed_alert_glob_t   *glob = ngx_alloc(sizeof(*glob), ngx_cycle->log);
+      if (NULL == glob) {
+          ERR("Couldn't allocate memory for alert glob data.");
+          return;
+      }
+      ngx_memzero(&glob->timer, sizeof(glob->timer));
+      nchan_init_timer(&glob->timer, fake_ipc_alert_delay_handler, glob);
+      
+      glob->alert = alert;
+      glob->ipc = (ipc_t *)c->data;
+      ngx_add_timer(&glob->timer, DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC);
+#else
+      if(ngx_time() - alert.time_sent >= 2) {
+        ipc_record_alert_receive_delay(ngx_time() - alert.time_sent);
+      }
+      nchan_update_stub_status(ipc_total_alerts_received, 1);
+      ((ipc_t *)c->data)->handler(alert.src_slot, alert.code, alert.data);
+#endif
+    }
+  }
+}
+
+
+ngx_int_t ipc_alert(ipc_t *ipc, ngx_int_t slot, ngx_uint_t code, void *data, size_t data_size) {
+  DBG("IPC send alert code %i to slot %i", code, slot);
+  
+  if(data_size > IPC_DATA_SIZE) {
+    ERR("IPC_DATA_SIZE too small. wanted %i, have %i", data_size, IPC_DATA_SIZE);
+    assert(0);
+  }
+  nchan_update_stub_status(ipc_total_alerts_sent, 1);
+#if (FAKESHARD)
+  
+  ipc_alert_t         alert = {0};
+  
+  alert.src_slot = memstore_slot();
+  alert.time_sent = ngx_time();
+  alert.worker_generation = memstore_worker_generation;
+  alert.code = code;
+  ngx_memcpy(alert.data, data, data_size);
+  
+  //switch to destination
+  memstore_fakeprocess_push(slot);
+  ipc->handler(alert.src_slot, alert.code, alert.data);
+  memstore_fakeprocess_pop();
+  //switch back  
+  
+#else
+  
+  ipc_process_t      *proc = &ipc->process[slot];
+  ipc_writebuf_t     *wb = &proc->wbuf;
+  ipc_alert_t        *alert;
+  
+  assert(proc->active);
+  
+  nchan_update_stub_status(ipc_queue_size, 1);
+  
+  if(wb->n < IPC_WRITEBUF_SIZE) {
+    alert = &wb->alerts[(wb->first + wb->n++) % IPC_WRITEBUF_SIZE];
+  }
+  else { //overflow
+    ipc_writebuf_overflow_t  *overflow;
+    DBG("writebuf overflow, allocating memory");
+    if((overflow = ngx_alloc(sizeof(*overflow), ngx_cycle->log)) == NULL) {
+      ERR("can't allocate memory for IPC write buffer overflow");
+      return NGX_ERROR;
+    }
+    overflow->next = NULL;
+    alert= &overflow->alert;
+    
+    if(wb->overflow_first == NULL) {
+      wb->overflow_first = overflow;
+    }
+    if(wb->overflow_last) {
+      wb->overflow_last->next = overflow;
+    }
+    wb->overflow_last = overflow;
+  
+    wb->overflow_n++;
+  }
+  
+  alert->src_slot = ngx_process_slot;
+  alert->time_sent = ngx_time();
+  alert->code = code;
+  alert->worker_generation = memstore_worker_generation;
+  ngx_memcpy(&alert->data, data, data_size);
+  
+  ipc_write_handler(proc->c->write);
+  
+  //ngx_handle_write_event(ipc->c[slot]->write, 0);
+  //ngx_add_event(ipc->c[slot]->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT);
+  
+#endif
+
+  return NGX_OK;
+}
+
diff --git a/debian/modules/nchan/src/store/memory/ipc.h b/debian/modules/nchan/src/store/memory/ipc.h
new file mode 100755
index 0000000..361bbd7
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/ipc.h
@@ -0,0 +1,55 @@
+#define IPC_DATA_SIZE 56
+//#define IPC_DATA_SIZE 80
+
+typedef struct {
+  char            data[IPC_DATA_SIZE];
+  time_t          time_sent;
+  int16_t         src_slot;
+  uint16_t        worker_generation;
+  uint8_t         code;
+} ipc_alert_t;
+
+#define IPC_WRITEBUF_SIZE 32
+
+typedef struct ipc_writebuf_overflow_s ipc_writebuf_overflow_t;
+struct ipc_writebuf_overflow_s {
+  ipc_alert_t               alert;
+  ipc_writebuf_overflow_t  *next;
+};
+
+typedef struct ipc_writebuf_s ipc_writebuf_t;
+struct ipc_writebuf_s {
+  //a ring buffer with a linked-list overflow for writing alerts, 
+  uint16_t                  n;
+  uint16_t                  first;
+  int32_t                   overflow_n;
+  ipc_writebuf_overflow_t  *overflow_first;
+  ipc_writebuf_overflow_t  *overflow_last;
+  ipc_alert_t               alerts[IPC_WRITEBUF_SIZE];
+}; //ipc_writebuf_t
+
+typedef struct ipc_s ipc_t;
+
+typedef struct {
+  ipc_t                 *ipc; //useful for write events
+  ngx_socket_t           pipe[2];
+  ngx_connection_t      *c;
+  ipc_writebuf_t         wbuf;
+  unsigned               active:1;
+} ipc_process_t;
+
+struct ipc_s {
+  const char            *name;
+  
+  ipc_process_t         process[NGX_MAX_PROCESSES];
+  
+  void                  (*handler)(ngx_int_t, ngx_uint_t, void*);
+}; //ipc_t
+
+ngx_int_t ipc_init(ipc_t *ipc);
+ngx_int_t ipc_open(ipc_t *ipc, ngx_cycle_t *cycle, ngx_int_t workers, void (*slot_callback)(int slot, int worker));
+ngx_int_t ipc_set_handler(ipc_t *ipc, void (*alert_handler)(ngx_int_t, ngx_uint_t , void *data));
+ngx_int_t ipc_register_worker(ipc_t *ipc, ngx_cycle_t *cycle);
+ngx_int_t ipc_close(ipc_t *ipc, ngx_cycle_t *cycle);
+
+ngx_int_t ipc_alert(ipc_t *ipc, ngx_int_t slot, ngx_uint_t code,  void *data, size_t data_size);
diff --git a/debian/modules/nchan/src/store/memory/memstore.c b/debian/modules/nchan/src/store/memory/memstore.c
new file mode 100755
index 0000000..03ff478
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/memstore.c
@@ -0,0 +1,2861 @@
+#include <nchan_module.h>
+
+#include <signal.h> 
+#include <assert.h>
+#include "uthash.h"
+#include "store.h"
+#include <util/shmem.h>
+#include "ipc.h"
+#include "ipc-handlers.h"
+#include "store-private.h"
+#include <store/spool.h>
+
+#include <util/nchan_reaper.h>
+
+#include <store/redis/store.h>
+#include <store/store_common.h>
+#include <subscribers/memstore_redis.h>
+#include <subscribers/memstore_multi.h>
+
+#define NCHAN_CHANHEAD_EXPIRE_SEC 5
+
+static ngx_int_t redis_fakesub_timer_interval;
+#define REDIS_DEFAULT_FAKESUB_TIMER_INTERVAL 100;
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#if FAKESHARD
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
+
+#else
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
+
+#endif
+
+
+typedef struct {
+  //memstore_channel_head_t       unbuffered_dummy_chanhead;
+  store_channel_head_shm_t        dummy_shared_chaninfo;
+  memstore_channel_head_t        *hash;
+  nchan_reaper_t                  msg_reaper;
+  nchan_reaper_t                  nobuffer_msg_reaper;
+  nchan_reaper_t                  chanhead_reaper;
+  
+  nchan_reaper_t                  chanhead_churner;
+  
+  ngx_int_t                       workers;
+  
+#if FAKESHARD
+  ngx_int_t                       fake_slot;
+#endif
+} memstore_data_t;
+
+
+ngx_int_t                         memstore_procslot_offset = 0;
+static nchan_loc_conf_t           default_multiconf;
+
+static ngx_int_t nchan_memstore_store_msg_ready_to_reap_generic(store_message_t *smsg, uint8_t respect_expire, uint8_t force) {
+  if(!force) {
+    if(respect_expire && smsg->msg->expires > ngx_time()) {
+      //not time yet
+      return NGX_DECLINED;
+    }
+    
+    if(ngx_atomic_cmp_set((ngx_atomic_uint_t *)&smsg->msg->refcount, 0, MSG_REFCOUNT_INVALID)) {
+      return NGX_OK;
+    }
+    return NGX_DECLINED;
+  }
+  else {
+    if(! ngx_atomic_cmp_set((ngx_atomic_uint_t *)&smsg->msg->refcount, 0, MSG_REFCOUNT_INVALID)) {
+      if(smsg->msg->refcount > 0) {
+        ERR("force-reaping msg with refcount %d", smsg->msg->refcount);
+      }
+      smsg->msg->refcount = MSG_REFCOUNT_INVALID;
+    }
+    return NGX_OK;
+  }
+}
+
+static ngx_int_t nchan_memstore_store_msg_ready_to_reap(store_message_t *smsg, uint8_t force) {
+  return nchan_memstore_store_msg_ready_to_reap_generic(smsg, 0, force);
+}
+
+static ngx_int_t nchan_memstore_store_msg_ready_to_reap_wait_util_expired(store_message_t *smsg, uint8_t force) {
+  return nchan_memstore_store_msg_ready_to_reap_generic(smsg, 1, force);
+}
+
+static ngx_int_t memstore_reap_message( nchan_msg_t *msg );
+static ngx_int_t memstore_reap_store_message( store_message_t *smsg );
+
+static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch);
+
+
+/*
+static void log_memstore_chanhead_reservations(memstore_channel_head_t *ch) {
+#if MESTORE_CHANHEAD_RESERVE_DEBUG
+  nchan_list_el_t  *cur;
+  char            **lbl;
+  ERR("%p %V reservations: %i", ch, &ch->id, ch->reserved.n);
+  for(cur = ch->reserved.head; cur != NULL; cur = cur->next) {
+    lbl = nchan_list_data_from_el(cur);
+    ERR("   %s", *lbl);
+  }
+#else
+  ERR("%p %V reservations: %i", ch, &ch->id, ch->reserved);
+#endif
+}
+*/
+
+static int memstore_chanhead_reservations(memstore_channel_head_t *ch) {
+#if MESTORE_CHANHEAD_RESERVE_DEBUG
+  return ch->reserved.n;
+#else
+  return ch->reserved;
+#endif
+}
+
+static void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *lbl) {
+#if MESTORE_CHANHEAD_RESERVE_DEBUG
+  char   **label = nchan_list_append(&ch->reserved);
+  *label = (char *)lbl;
+#else
+  ch->reserved++;
+#endif
+}
+
+static void memstore_chanhead_release(memstore_channel_head_t *ch, char *label) {
+#if MESTORE_CHANHEAD_RESERVE_DEBUG
+  nchan_list_el_t  *cur;
+  char            **lbl;
+  for(cur = ch->reserved.head; cur != NULL; cur = cur->next) {
+    lbl = nchan_list_data_from_el(cur);
+    if(strcmp(label, *lbl) == 0) {
+      nchan_list_remove(&ch->reserved, lbl);
+      return;
+    }
+  }
+  ERR("can't release for channel %p %V reservation %s (total reservations: %i)", ch, &ch->id, label, ch->reserved.n);
+  assert(0);
+#else
+  ch->reserved--;
+#endif
+}
+
+
+static ngx_int_t nchan_memstore_chanhead_ready_to_reap(memstore_channel_head_t *ch, uint8_t force) {
+  
+  memstore_chanhead_messages_gc(ch);
+  if(!force) {
+    if(ch->status != INACTIVE) {
+      char *sts;
+      switch(ch->status) {
+        case NOTREADY:
+          sts = "NOTREADY";
+          break;
+        case WAITING:
+          sts = "WAITING";
+          break;
+        case STUBBED:
+          sts = "STUBBED";
+          break;
+        case READY:
+          sts = "READY";
+          break;
+        case INACTIVE:
+          sts = "INACTIVE";
+          break;
+        default:
+          sts = "????";
+      }
+      DBG("not ready to reap %V : status %s", &ch->id, sts);
+      return NGX_DECLINED;
+    }
+    
+    if(ch->gc_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
+      DBG("not ready to reap %V, %i sec left", &ch->id, ch->gc_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
+      return NGX_DECLINED;
+    }
+    
+    if (ch->total_sub_count > 0) { //there are subscribers
+      DBG("not ready to reap %V, %i subs left", &ch->id, ch->total_sub_count);
+      return NGX_DECLINED;
+    }
+    
+    if(memstore_chanhead_reservations(ch) > 0) {
+      DBG("not ready to reap %V, still reserved:", &ch->id);
+      //log_memstore_chanhead_reservations(ch);
+      return NGX_DECLINED;
+    }
+    
+    if(ch->cf && ch->cf->redis.enabled && ch->churn_start_time + ch->redis_idle_cache_ttl < ngx_time()) {
+      DBG("get rid of idle redis cache channel %p %V (msgs: %i)", ch, &ch->id, ch->channel.messages);
+      return NGX_OK;
+    }
+    else if(ch->channel.messages > 0) {
+      assert(ch->msg_first != NULL);
+      DBG("not ready to reap %V, %i messages left", &ch->id, ch->channel.messages);
+      return NGX_DECLINED;
+    }
+    //DBG("ok to delete channel %V", &ch->id);
+    return NGX_OK;
+  }
+  else {
+    //force delete is always ok
+    return NGX_OK;
+  }
+}
+
+static ngx_int_t nchan_memstore_chanhead_ready_to_reap_slowly(memstore_channel_head_t *ch, uint8_t force) {
+  
+  memstore_chanhead_messages_gc(ch);
+  if(!force) {
+    if(ch->churn_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
+      DBG("not ready to reap %p %V, %i sec left", ch, &ch->id, ch->churn_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
+      return NGX_DECLINED;
+    }
+    
+    if (ch->total_sub_count > 0) { //there are subscribers
+      DBG("not ready to reap %V, %i subs left", &ch->id, ch->total_sub_count);
+      //ERR("not ready to reap %p %V, %i [%i] {%i} subs (%i {%i} internal) left", ch, &ch->id, ch->total_sub_count, ch->channel.subscribers, ch->shared->sub_count, ch->internal_sub_count, ch->shared->internal_sub_count);
+      return NGX_DECLINED;
+    }
+    
+    if(ch->cf && ch->cf->redis.enabled && ch->churn_start_time + ch->redis_idle_cache_ttl < ngx_time()) {
+      DBG("get rid of idle redis cache channel %p %V (msgs: %i)", ch, &ch->id, ch->channel.messages);
+      return NGX_OK;
+    }
+    else if(ch->channel.messages > 0 || (ch->churn_start_time )) {
+      assert(ch->msg_first != NULL);
+      DBG("not ready to reap %p %V, %i messages left", ch, &ch->id, ch->channel.messages);
+      return NGX_DECLINED;
+    }
+  }
+  
+  //DBG("ok to delete channel %V", &ch->id);
+  return NGX_OK;
+}
+
+static void memstore_reap_chanhead(memstore_channel_head_t *ch);
+static void memstore_reap_churned_chanhead(memstore_channel_head_t *ch) { //different method for some debug tracing
+  memstore_reap_chanhead(ch);
+}
+
+static void init_mpt(memstore_data_t *m) {
+  
+  nchan_reaper_start(&m->msg_reaper, 
+                     "memstore message", 
+                     offsetof(store_message_t, prev), 
+                     offsetof(store_message_t, next), 
+    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_store_msg_ready_to_reap,
+         (void (*)(void *)) memstore_reap_store_message,
+                     5
+  );
+  
+  nchan_reaper_start(&m->nobuffer_msg_reaper, 
+                     "memstore nobuffer message", 
+                     offsetof(store_message_t, prev), 
+                     offsetof(store_message_t, next), 
+    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_store_msg_ready_to_reap_wait_util_expired,
+         (void (*)(void *)) memstore_reap_store_message,
+                     2
+  );
+  m->nobuffer_msg_reaper.strategy = ROTATE;
+  m->nobuffer_msg_reaper.max_notready_ratio = 0.20;
+  
+  nchan_reaper_start(&m->chanhead_reaper, 
+                     "chanhead", 
+                     offsetof(memstore_channel_head_t, gc_prev), 
+                     offsetof(memstore_channel_head_t, gc_next), 
+    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_chanhead_ready_to_reap,
+         (void (*)(void *)) memstore_reap_chanhead,
+                     4
+  );
+  
+  nchan_reaper_start(&m->chanhead_churner, 
+                     "chanhead churner", 
+                     offsetof(memstore_channel_head_t, churn_prev), 
+                     offsetof(memstore_channel_head_t, churn_next), 
+    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_chanhead_ready_to_reap_slowly,
+         (void (*)(void *)) memstore_reap_churned_chanhead,
+                     10
+  );
+  m->chanhead_churner.strategy = KEEP_PLACE;
+  m->chanhead_churner.max_notready_ratio = 0.10;
+  
+}
+
+static shmem_t         *shm = NULL;
+static shm_data_t      *shdata = NULL;
+static ipc_t            ipc_data;
+static ipc_t           *ipc = NULL;
+
+#if FAKESHARD
+
+static memstore_data_t  mdata[MAX_FAKE_WORKERS];
+static memstore_data_t fake_default_mdata;
+memstore_data_t *mpt = &fake_default_mdata;
+
+ngx_int_t memstore_slot(void) {
+  return mpt->fake_slot;
+}
+
+int memstore_ready(void) {
+  return 1;
+}
+#else
+
+static memstore_data_t  mdata;
+memstore_data_t *mpt = &mdata;
+
+
+ngx_int_t memstore_slot(void) {
+  return ngx_process_slot;
+}
+
+int memstore_ready(void) {
+  if(memstore_worker_generation == shdata->generation && shdata->max_workers == shdata->current_active_workers) {
+    return 1;
+  }
+  else if(memstore_worker_generation < shdata->generation) {
+    return 1;
+  }
+  return 0;
+}
+#endif
+
+shmem_t *nchan_memstore_get_shm(void){
+  return shm;
+}
+
+ipc_t *nchan_memstore_get_ipc(void){
+  return ipc;
+}
+
+#define CHANNEL_HASH_FIND(id_buf, p)    HASH_FIND( hh, mpt->hash, (id_buf)->data, (id_buf)->len, p)
+#define CHANNEL_HASH_ADD(chanhead)      HASH_ADD_KEYPTR( hh, mpt->hash, (chanhead->id).data, (chanhead->id).len, chanhead)
+#define CHANNEL_HASH_DEL(chanhead)      HASH_DEL( mpt->hash, chanhead)
+
+#define NCHAN_NOBUFFER_MSG_EXPIRE_SEC 10
+
+
+#if FAKESHARD
+
+static nchan_llist_timed_t *fakeprocess_top = NULL;
+void memstore_fakeprocess_push(ngx_int_t slot) {
+  assert(slot < MAX_FAKE_WORKERS);
+  nchan_llist_timed_t *link = ngx_calloc(sizeof(*fakeprocess_top), ngx_cycle->log);
+  link->data = (void *)slot;
+  link->time = ngx_time();
+  link->next = fakeprocess_top;
+  if(fakeprocess_top != NULL) {
+    fakeprocess_top->prev = link;
+  }
+  fakeprocess_top = link;
+  //DBG("push fakeprocess %i onto stack", slot);
+  mpt = &mdata[slot];
+}
+
+ngx_int_t memstore_fakeprocess_pop(void) {
+  nchan_llist_timed_t   *next;
+  if(fakeprocess_top == NULL) {
+    DBG("can't pop empty fakeprocess stack");
+    return 0;
+  }
+  next = fakeprocess_top->next;
+  ngx_free(fakeprocess_top);
+  if(next == NULL) {
+    DBG("can't pop last item off of fakeprocess stack");
+    return 0;
+  }
+  //DBG("pop fakeprocess to return to %i", (ngx_int_t)next->data);
+  next->prev = NULL;
+  fakeprocess_top = next;
+  mpt = &mdata[(ngx_int_t )fakeprocess_top->data];
+  return 1;
+}
+
+void memstore_fakeprocess_push_random(void) {
+  return memstore_fakeprocess_push(rand() % MAX_FAKE_WORKERS);
+}
+
+#endif
+
+static ngx_int_t is_multi_id(ngx_str_t *id);
+
+ngx_int_t memstore_channel_owner(ngx_str_t *id) {
+  uint32_t        h;
+  ngx_int_t       workers;
+  //multi is always self-owned
+  if(is_multi_id(id)) {
+    return memstore_slot();
+  }
+  
+  workers = shdata->max_workers;
+  h = ngx_crc32_short(id->data, id->len);
+#if FAKESHARD
+  #ifdef ONE_FAKE_CHANNEL_OWNER
+  h++; //just to avoid the unused variable warning
+  return ONE_FAKE_CHANNEL_OWNER;
+  #else
+  return h % MAX_FAKE_WORKERS;
+  #endif
+#else
+  ngx_int_t       i, slot;
+  i = h % workers;
+  assert(i >= 0);
+  slot = shdata->procslot[i + memstore_procslot_offset];
+  //DBG("channel owner for %V workers=%i (max=%i active=%i) h=%ui m_p_off=%i i=%i slot=%i", id, workers, shdata->max_workers, shdata->total_active_workers, h, memstore_procslot_offset, i, slot);
+  if(slot == NCHAN_INVALID_SLOT) {
+    ERR("something went wrong, the channel owner is invalid. i: %i h: %ui, workers: %i", i, h, workers);
+    assert(0);
+    return NCHAN_INVALID_SLOT;
+  }
+  return slot;
+#endif
+}
+
+
+
+#if NCHAN_MSG_LEAK_DEBUG
+
+void msg_debug_add(nchan_msg_t *msg) {
+  //ensure this message is present only once
+  nchan_msg_t      *cur;
+  shmtx_lock(shm);
+  for(cur = shdata->msgdebug_head; cur != NULL; cur = cur->dbg_next) {
+    assert(cur != msg);
+  }
+  
+  if(shdata->msgdebug_head == NULL) {
+    msg->dbg_next = NULL;
+    msg->dbg_prev = NULL;
+  }
+  else {
+    msg->dbg_next = shdata->msgdebug_head;
+    msg->dbg_prev = NULL;
+    assert(shdata->msgdebug_head->dbg_prev == NULL);
+    shdata->msgdebug_head->dbg_prev = msg;
+  }
+  shdata->msgdebug_head = msg;
+  shmtx_unlock(shm);
+}
+void msg_debug_remove(nchan_msg_t *msg) {
+  nchan_msg_t *prev, *next;
+  shmtx_lock(shm);
+  prev = msg->dbg_prev;
+  next = msg->dbg_next;
+  if(shdata->msgdebug_head == msg) {
+    assert(msg->dbg_prev == NULL);
+    if(next) {
+      next->dbg_prev = NULL;
+    }
+    shdata->msgdebug_head = next;
+  }
+  else {
+    if(prev) {
+      prev->dbg_next = next;
+    }
+    if(next) {
+      next->dbg_prev = prev;
+    }
+  }
+  
+  msg->dbg_next = NULL;
+  msg->dbg_prev = NULL;
+  shmtx_unlock(shm);
+}
+void msg_debug_assert_isempty(void) {
+  assert(shdata->msgdebug_head == NULL);
+}
+#endif
+
+
+
+static ngx_int_t chanhead_churner_add(memstore_channel_head_t *ch) {
+  DBG("Chanhead churn add %p %V", ch, &ch->id);
+  
+  //the churner is only allowed to churn self-owned channels
+  assert(ch->owner == ch->slot);
+  
+  if(!ch->shutting_down) {
+    assert(ch->foreign_owner_ipc_sub == NULL); //we don't accept still-subscribed chanheads
+  }
+
+  assert(!ch->in_gc_queue);
+  
+  if(!ch->in_churn_queue) {
+    ch->in_churn_queue = 1;
+    ch->churn_start_time = ngx_time();
+    nchan_reaper_add(&mpt->chanhead_churner, ch);
+  }
+
+  return NGX_OK;
+}
+
+static ngx_int_t chanhead_churner_withdraw(memstore_channel_head_t *ch) {
+  //remove from gc list if we're there
+  DBG("Chanhead churn withdraw %p %V", ch, &ch->id);
+  
+  if(ch->in_churn_queue) {
+    ch->in_churn_queue = 0;
+    nchan_reaper_withdraw(&mpt->chanhead_churner, ch);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
+  shm_data_t         *d;
+  ngx_int_t           i;
+  if(data) { //zone being passed after restart
+    zone->data = data;
+    d = zone->data;
+    DBG("reattached shm data at %p", data);
+    shm_reinit(shm);
+    shmtx_lock(shm);
+    d->generation ++;
+    d->current_active_workers = 0;
+    ngx_memzero(&d->stats, sizeof(d->stats));
+    shm_set_allocd_pages_tracker(shm, &d->shmem_pages_used);
+    shmtx_unlock(shm);
+  }
+  else {
+    shm_init(shm);
+    
+    if((d = shm_calloc(shm, sizeof(*d), "root shared data")) == NULL) {
+      return NGX_ERROR;
+    }
+    
+    zone->data = d;
+    shdata = d;
+    shdata->rlch = NULL;
+    shdata->max_workers = NGX_CONF_UNSET;
+    shdata->old_max_workers = NGX_CONF_UNSET;
+    shdata->generation = 0;
+    shdata->total_active_workers = 0;
+    shdata->current_active_workers = 0;
+    shdata->reloading = 0;
+    for(i=0; i< NGX_MAX_PROCESSES; i++) {
+      shdata->procslot[i]=NCHAN_INVALID_SLOT;
+    }
+    ngx_memzero(&d->stats, sizeof(d->stats));
+    
+    shdata->shmem_pages_used=0;
+    shm_set_allocd_pages_tracker(shm, &shdata->shmem_pages_used);
+    
+    DBG("Shm created with data at %p", d);
+#if NCHAN_MSG_LEAK_DEBUG
+    shdata->msgdebug_head = NULL;
+#endif
+  }
+  return NGX_OK;
+}
+
+
+void __memstore_update_stub_status(off_t offset, int count) {
+  if(nchan_stub_status_enabled) {
+    ngx_atomic_fetch_add((ngx_atomic_uint_t *)((char *)&shdata->stats + offset), count);
+  }
+}
+
+nchan_stub_status_t *nchan_get_stub_status_stats(void) {
+  return &shdata->stats;
+}
+
+size_t nchan_get_used_shmem(void) {
+  return shdata->shmem_pages_used * ngx_pagesize;
+}
+
+static int send_redis_fakesub_delta(memstore_channel_head_t *head) {
+  if(head->delta_fakesubs != 0) {
+    nchan_store_redis_fakesub_add(&head->id, head->cf, head->delta_fakesubs, head->shutting_down);
+    head->delta_fakesubs = 0;
+    return 1;
+  }
+  return 0;
+}
+
+static void memstore_reap_chanhead(memstore_channel_head_t *ch) {
+  int       i;
+  
+  chanhead_messages_delete(ch);
+  
+  if(ch->total_sub_count > 0) {
+    ch->spooler.fn->broadcast_status(&ch->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+  }
+  stop_spooler(&ch->spooler, 0);
+  if(ch->cf && ch->cf->redis.enabled && !ch->multi) {
+    send_redis_fakesub_delta(ch);
+    if(ch->delta_fakesubs_timer_ev.timer_set) {
+      ngx_del_timer(&ch->delta_fakesubs_timer_ev);
+    }
+  }
+  if(ch->owner == memstore_slot()) {
+    nchan_update_stub_status(channels, -1);
+    if(ch->shared)
+      shm_free(shm, ch->shared);
+  }
+  DBG("chanhead %p (%V) is empty and expired. DELETE.", ch, &ch->id);
+  CHANNEL_HASH_DEL(ch);
+  if(ch->redis_sub) {
+    if(ch->redis_sub->enqueued) {
+      ch->redis_sub->fn->dequeue(ch->redis_sub);
+    }
+    memstore_redis_subscriber_destroy(ch->redis_sub);
+  }
+  if(ch->multi) {
+    for(i=0; i < ch->multi_count; i++) {
+      if(ch->multi[i].sub) {
+        ch->multi[i].sub->fn->dequeue(ch->multi[i].sub);
+      }
+    }
+    ngx_free(ch->multi);
+    nchan_free_msg_id(&ch->latest_msgid);
+    nchan_free_msg_id(&ch->oldest_msgid);
+  }
+  ngx_free(ch);
+}
+
+static store_message_t *create_shared_message(nchan_msg_t *m, ngx_int_t msg_already_in_shm);
+static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_message_t *msg);
+
+static ngx_int_t nchan_store_init_worker(ngx_cycle_t *cycle) {
+  ngx_core_conf_t    *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  ngx_int_t           workers = ccf->worker_processes;
+  ngx_int_t           i, procslot_found = 0;
+  
+#if FAKESHARD
+  for(i = 0; i < MAX_FAKE_WORKERS; i++) {
+  memstore_fakeprocess_push(i);
+#endif
+  
+  
+  init_mpt(mpt);
+
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+  }
+#endif
+
+  ipc_register_worker(ipc, cycle);
+  
+  DBG("init memstore worker pid:%i slot:%i max workers :%i or %i", ngx_pid, memstore_slot(), shdata->max_workers, workers);
+
+  shmtx_lock(shm);
+  
+  if(shdata->max_workers != workers) {
+    DBG("update number of workers from %i to %i", shdata->max_workers, workers);
+    if(shdata->old_max_workers != shdata->max_workers) {
+      shdata->old_max_workers = shdata->max_workers;
+    }
+    shdata->max_workers = workers;
+  }
+  
+  shdata->total_active_workers++;
+  shdata->current_active_workers++;
+  
+  for(i = memstore_procslot_offset; i < NGX_MAX_PROCESSES - memstore_procslot_offset; i++) {
+    if(shdata->procslot[i] == ngx_process_slot) {
+      DBG("found my procslot (ngx_process_slot %i, procslot %i)", ngx_process_slot, i);
+      procslot_found = 1;
+      break;
+    }
+  }
+  assert(procslot_found == 1);
+  
+  mpt->workers = workers;
+  
+  if(i >= workers) {
+    //we're probably reloading or something
+    DBG("that was a reload just now");
+  }
+  
+  //reload_msgs();
+  
+  DBG("shm: %p, shdata: %p", shm, shdata);
+  shmtx_unlock(shm);
+  return NGX_OK;
+}
+
+#define CHANHEAD_SHARED_OKAY(head) head->status == READY || head->status == STUBBED || (!head->stub && head->cf->redis.enabled == 1 && head->status == WAITING && head->owner == head->slot)
+
+void memstore_fakesub_add(memstore_channel_head_t *head, ngx_int_t n) {
+  if(redis_fakesub_timer_interval == 0) {
+    nchan_store_redis_fakesub_add(&head->id, head->cf, n, head->shutting_down);
+  }
+  else {
+    head->delta_fakesubs += n;
+    if(!head->delta_fakesubs_timer_ev.timer_set && !head->shutting_down && !ngx_exiting && !ngx_quit) {
+      //ERR("%V start fakesub timer", &head->id);
+      ngx_add_timer(&head->delta_fakesubs_timer_ev, redis_fakesub_timer_interval);
+    }
+  }
+}
+
+static void memstore_spooler_use_handler(channel_spooler_t *spl, void *d) {
+  memstore_channel_head_t  *head = d;
+  time_t t = ngx_time();
+  //ugh, this is so redundant. TODO: clean this shit up
+  head->last_subscribed_local = t;
+  head->channel.last_seen = t;
+  if(head->shared) {
+    head->shared->last_seen = t;
+  }
+}
+
+static void memstore_spooler_add_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
+  memstore_channel_head_t   *head = (memstore_channel_head_t *)privdata;
+  head->total_sub_count++;
+  head->channel.subscribers++;
+  if(sub->type == INTERNAL) {
+    head->internal_sub_count++;
+    if(head->shared) {
+      assert(CHANHEAD_SHARED_OKAY(head));
+      ngx_atomic_fetch_add(&head->shared->internal_sub_count, 1);
+    }
+  }
+  else {
+    if(head->shared) {
+      assert(CHANHEAD_SHARED_OKAY(head));
+      ngx_atomic_fetch_add(&head->shared->sub_count, 1);
+    }
+    if(head->cf && head->cf->redis.enabled && !head->multi) {
+      memstore_fakesub_add(head, 1);
+    }
+    nchan_update_stub_status(subscribers, 1);
+    if(head->multi) {
+      ngx_int_t      i, max = head->multi_count;
+      subscriber_t  *msub;
+      for(i = 0; i < max; i++) {
+        msub = head->multi[i].sub;
+        if(msub) {
+          msub->fn->notify(msub, NCHAN_SUB_MULTI_NOTIFY_ADDSUB, (void *)1);
+        }
+      }
+    }
+    
+  }
+
+  assert(head->total_sub_count >= head->internal_sub_count);
+}
+
+static void memstore_spooler_bulk_dequeue_handler(channel_spooler_t *spl, subscriber_type_t type, ngx_int_t count, void *privdata) {
+  memstore_channel_head_t   *head = (memstore_channel_head_t *)privdata;
+  if (type == INTERNAL) {
+    //internal subscribers are *special* and don't really count
+    head->internal_sub_count -= count;
+    if(head->shared) {
+      ngx_atomic_fetch_add(&head->shared->internal_sub_count, -count);
+    }
+  }
+  else {
+    if(head->shared){
+      ngx_atomic_fetch_add(&head->shared->sub_count, -count);
+    }
+    /*
+    else if(head->shared == NULL) {
+      assert(head->shutting_down == 1);
+    }
+    */
+    if(head->cf && head->cf->redis.enabled && !head->multi) {
+      memstore_fakesub_add(head, -count);
+    }
+    
+    nchan_update_stub_status(subscribers, -count);
+    
+    if(head->multi) {
+      ngx_int_t     i, max = head->multi_count;
+      subscriber_t *sub;
+      for(i = 0; i < max; i++) {
+        sub = head->multi[i].sub;
+        if(sub) {
+          sub->fn->notify(sub, NCHAN_SUB_MULTI_NOTIFY_ADDSUB, (void *)-count);
+        }
+      }
+    }
+  }
+  head->total_sub_count -= count;
+  head->channel.subscribers = head->total_sub_count - head->internal_sub_count;
+  assert(head->total_sub_count >= 0);
+  assert(head->internal_sub_count >= 0);
+  assert(head->channel.subscribers >= 0);
+  assert(head->total_sub_count >= head->internal_sub_count);
+  if(head->total_sub_count == 0 && head->foreign_owner_ipc_sub == NULL) {
+    chanhead_gc_add(head, "sub count == 0 after spooler dequeue");
+  }
+}
+
+
+
+static ngx_int_t start_chanhead_spooler(memstore_channel_head_t *head) {
+  static channel_spooler_handlers_t handlers = {
+    memstore_spooler_add_handler,
+    NULL,
+    memstore_spooler_bulk_dequeue_handler,
+    memstore_spooler_use_handler,
+    NULL,
+    NULL
+  };
+  
+  
+  //(head->use_redis && head->owner == memstore_slot()) ? FETCH_IGNORE_MSG_NOTFOUND : FETCH
+  start_spooler(&head->spooler, &head->id, &head->status, &nchan_store_memory, head->cf, (head->cf && head->cf->redis.enabled) ? FETCH_IGNORE_MSG_NOTFOUND : FETCH, &handlers, head);
+  if(head->meta) {
+    head->spooler.publish_events = 0;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_ready_chanhead_unless_stub(memstore_channel_head_t *head) {
+  if(head->stub) {
+    head->status = STUBBED;
+  }
+  else {
+    head->status = READY;
+    head->spooler.fn->handle_channel_status_change(&head->spooler);
+    if(head->status == INACTIVE) {
+      chanhead_gc_withdraw(head, "rare weird condition after handle_channel_status_change");
+      head->status = READY;
+    }
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8_t ipc_subscribe_if_needed) {
+  ngx_int_t                      owner;
+  ngx_int_t                      i;
+  if(head == NULL) {
+    return NGX_OK;
+  }
+  assert(!head->stub && head->cf);
+  owner = head->owner;
+  DBG("ensure chanhead ready: chanhead %p, status %i, foreign_ipc_sub:%p", head, head->status, head->foreign_owner_ipc_sub);
+  if(head->in_gc_queue) {//recycled chanhead
+    chanhead_gc_withdraw(head, "readying INACTIVE");
+  }
+  if(head->owner == head->slot && !head->in_churn_queue) {
+    chanhead_churner_add(head);
+  }
+  
+  if(!head->spooler.running) {
+    DBG("ensure chanhead ready: Spooler for channel %p %V wasn't running. start it.", head, &head->id);
+    start_chanhead_spooler(head);
+  }
+  
+  for(i=0; i< head->multi_count; i++) {
+    if(head->multi[i].sub == NULL) {
+      if(memstore_multi_subscriber_create(head, i) == NULL) { //stores and enqueues automatically
+        ERR("can't create multi subscriber for channel");
+        return NGX_ERROR;
+      }
+    }
+  }
+  
+  if(owner != memstore_slot()) {
+    if(head->foreign_owner_ipc_sub == NULL && head->status != WAITING) {
+      head->status = WAITING;
+      if(ipc_subscribe_if_needed) {
+        ngx_int_t       rc;
+        assert(head->cf);
+        DBG("ensure chanhead ready: request for %V from %i to %i", &head->id, memstore_slot(), owner);
+        if((rc = memstore_ipc_send_subscribe(owner, &head->id, head, head->cf)) != NGX_OK) {
+          return rc;
+        }
+      }
+    }
+    else if(head->foreign_owner_ipc_sub != NULL && head->status == WAITING) {
+      DBG("ensure chanhead ready: subscribe request for %V from %i to %i", &head->id, memstore_slot(), owner);
+      memstore_ready_chanhead_unless_stub(head);
+    }
+  }
+  else {
+    if(head->cf && head->cf->redis.enabled && !head->multi && head->status != READY) {
+      if(head->redis_sub == NULL) {
+        head->redis_sub = memstore_redis_subscriber_create(head);
+        nchan_store_redis.subscribe(&head->id, head->redis_sub);
+        head->status = WAITING;
+      }
+      else {
+        if(head->redis_sub->enqueued) {
+          memstore_ready_chanhead_unless_stub(head);
+        }
+        else {
+          head->status = WAITING;
+        }
+      }
+    }
+    else if(head->status != READY) {
+      memstore_ready_chanhead_unless_stub(head);
+    }
+  }
+  return NGX_OK;
+}
+
+
+static ngx_int_t is_multi_id(ngx_str_t *id) {
+  u_char         *cur = id->data;
+  return (cur[0] == 'm' && cur[1] == '/' && cur[2] == NCHAN_MULTI_SEP_CHR);
+}
+
+static ngx_int_t parse_multi_id(ngx_str_t *id, ngx_str_t ids[]) {
+  ngx_int_t       n = 0;
+  u_char         *cur = id->data;
+  u_char         *last = cur + id->len;
+  u_char         *sep;
+  
+  if(is_multi_id(id)) {
+    cur += 3;
+    while((sep = ngx_strlchr(cur, last, NCHAN_MULTI_SEP_CHR)) != NULL) {
+      ids[n].data=cur;
+      ids[n].len = sep - cur;
+      cur = sep + 1;
+      n++;
+    }
+    return n;
+  }
+  return 0;
+}
+
+static void delta_fakesubs_timer_handler(ngx_event_t *ev) {
+  memstore_channel_head_t *head = (memstore_channel_head_t *)ev->data;
+  if(send_redis_fakesub_delta(head) && !ngx_exiting && !ngx_quit && ev->timedout) {
+    ev->timedout = 0;
+    ngx_add_timer(ev, redis_fakesub_timer_interval);
+  }
+}
+
+static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  memstore_channel_head_t      *head;
+  ngx_int_t                     owner = memstore_channel_owner(channel_id);
+  ngx_str_t                     ids[NCHAN_MULTITAG_MAX];
+  ngx_int_t                     i, n = 0;
+  
+  head=ngx_calloc(sizeof(*head) + sizeof(u_char)*(channel_id->len), ngx_cycle->log);
+  
+  if(head == NULL) {
+    ERR("can't allocate memory for (new) chanhead");
+    return NULL;
+  }
+  
+  head->channel.last_published_msg_id.time=0;
+  head->channel.last_published_msg_id.tagcount=1;
+  head->channel.last_published_msg_id.tagactive=0;
+  head->channel.last_published_msg_id.tag.fixed[0]=0;
+  
+  head->slot = memstore_slot();
+  head->owner = owner;
+  head->shutting_down = 0;
+  head->in_gc_queue = 0;
+  head->in_churn_queue = 0;
+  head->gc_queued_times = 0;
+  head->redis_sub = NULL;
+  if(cf) {
+    head->stub = 0;
+    head->cf=cf;
+  }
+  else {
+    head->stub = 1;
+    head->cf = NULL;
+  }
+  
+  if(head->cf && head->cf->redis.enabled && !head->multi) {
+    head->delta_fakesubs = 0;
+    nchan_init_timer(&head->delta_fakesubs_timer_ev, delta_fakesubs_timer_handler, head);
+    head->redis_idle_cache_ttl = cf->redis_idle_channel_cache_timeout;
+  }
+  else {
+    head->redis_idle_cache_ttl = 0;
+  }
+  
+  if(head->slot == owner) {
+    if((head->shared = shm_alloc(shm, sizeof(*head->shared), "channel shared data")) == NULL) {
+      ERR("can't allocate shared memory for (new) chanhead");
+      return NULL;
+    }
+    head->shared->sub_count = 0;
+    head->shared->internal_sub_count = 0;
+    head->shared->total_message_count = 0;
+    head->shared->stored_message_count = 0;
+    head->shared->last_seen = ngx_time();
+    
+    nchan_update_stub_status(channels, 1);
+  }
+  else {
+    head->shared = NULL;
+  }
+  
+  //no lock needed, no one else knows about this chanhead yet.
+  head->id.len = channel_id->len;
+  head->id.data = (u_char *)&head[1];
+  ngx_memcpy(head->id.data, channel_id->data, channel_id->len);
+  head->total_sub_count=0;
+  head->internal_sub_count=0;
+  head->status = NOTREADY;
+  head->msg_last = NULL;
+  head->msg_first = NULL;
+  head->foreign_owner_ipc_sub = NULL;
+  head->last_subscribed_local = 0;
+  
+#if MESTORE_CHANHEAD_RESERVE_DEBUG
+  nchan_list_init(&head->reserved, sizeof(char *), "chanhead reserve (debug)");
+#else
+  head->reserved = 0;
+#endif
+  head->multi=NULL;
+  head->multi_count = 0;
+  head->multi_waiting = 0;
+  
+  //set channel
+  ngx_memcpy(&head->channel.id, &head->id, sizeof(ngx_str_t));
+  head->channel.messages = 0;
+  head->channel.subscribers = 0;
+  head->channel.last_seen = ngx_time();
+  head->max_messages = (ngx_int_t) -1;
+  
+  if(head->id.len >= 5 && ngx_strncmp(head->id.data, "meta/", 5) == 0) {
+    head->meta = 1;
+    head->max_messages = NCHAN_META_CHANNEL_MAX_MESSAGES;
+  }
+  else {
+    head->meta = 0;
+  }
+  
+  head->spooler.running=0;
+  
+  head->multi_waiting = 0;
+  if((n = parse_multi_id(&head->id, ids)) > 0) {
+    memstore_multi_t          *multi;
+    int16_t                   *tags_latest, *tags_oldest;
+    
+    if((multi = ngx_calloc(sizeof(*multi) * n, ngx_cycle->log)) == NULL) {
+      ERR("can't allocate multi array for multi-channel %p", head);
+    }
+    
+    head->latest_msgid.time = 0;
+    head->latest_msgid.tagcount = n;
+    head->oldest_msgid.time = 0;
+    head->oldest_msgid.tagcount = n;
+    
+    if(n <= NCHAN_FIXED_MULTITAG_MAX) {
+      tags_latest = head->latest_msgid.tag.fixed;
+      tags_oldest = head->oldest_msgid.tag.fixed;
+    }
+    else {
+      head->latest_msgid.tag.allocd = ngx_alloc(sizeof(*head->latest_msgid.tag.allocd) * n, ngx_cycle->log);
+      head->oldest_msgid.tag.allocd = ngx_alloc(sizeof(*head->oldest_msgid.tag.allocd) * n, ngx_cycle->log);
+      if(!head->latest_msgid.tag.allocd  || !head->oldest_msgid.tag.allocd) {
+        ERR("can't allocate multi tag array for multi-channel %p", head);
+        return NULL;
+      }
+      
+      tags_latest = head->latest_msgid.tag.allocd;
+      tags_oldest = head->oldest_msgid.tag.allocd;
+    }
+    
+    for(i=0; i < n; i++) {
+      tags_latest[i] = 0;
+      tags_oldest[i] = 0;
+      multi[i].id = ids[i];
+      multi[i].sub = NULL;
+    }
+    
+    head->multi_count = n;
+    head->multi = multi;
+    head->owner = head->slot; //multis are always self-owned
+  }
+  else {
+    head->multi_count = 0;
+    
+    head->latest_msgid.time = 0;
+    head->latest_msgid.tag.fixed[0] = 0;
+    head->latest_msgid.tagcount = 1;
+    
+    head->oldest_msgid.time = 0;
+    head->oldest_msgid.tag.fixed[0] = 0;
+    head->oldest_msgid.tagcount = 1;
+    
+    head->multi = NULL;
+  }
+  
+  start_chanhead_spooler(head);
+
+  CHANNEL_HASH_ADD(head);
+  
+  return head;
+}
+
+static ngx_inline memstore_channel_head_t *ensure_chanhead_ready_or_trash_chanhead(memstore_channel_head_t *head, int8_t ipc_sub_if_needed) {
+  if(head != NULL) {
+    if(memstore_ensure_chanhead_is_ready(head, ipc_sub_if_needed) != NGX_OK) {
+      head->status = INACTIVE;
+      chanhead_gc_add(head, "bad chanhead, couldn't ensure readiness");
+      return NULL;
+    }
+  }
+  return head;
+}
+
+memstore_channel_head_t * nchan_memstore_find_chanhead(ngx_str_t *channel_id) {
+  memstore_channel_head_t     *head = NULL;
+  CHANNEL_HASH_FIND(channel_id, head);
+  return ensure_chanhead_ready_or_trash_chanhead(head, 1);
+}
+
+memstore_channel_head_t *nchan_memstore_get_chanhead(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  memstore_channel_head_t          *head;
+  head = nchan_memstore_find_chanhead(channel_id);
+  if(head==NULL) {
+    head = chanhead_memstore_create(channel_id, cf);
+    return ensure_chanhead_ready_or_trash_chanhead(head, 1);
+  }
+  
+  if(cf->pub.http || cf->pub.websocket) {
+    head->cf = cf;
+  }
+  
+  return head;
+}
+
+memstore_channel_head_t *nchan_memstore_get_chanhead_no_ipc_sub(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  memstore_channel_head_t     *head = NULL;
+  CHANNEL_HASH_FIND(channel_id, head);
+  if(head != NULL) {
+    return ensure_chanhead_ready_or_trash_chanhead(head, 0);
+  }
+  else {
+    head = chanhead_memstore_create(channel_id, cf);
+    return ensure_chanhead_ready_or_trash_chanhead(head, 0);
+  }
+  return head;
+}
+
+ngx_int_t chanhead_gc_add(memstore_channel_head_t *ch, const char *reason) {
+  ngx_int_t                   slot = memstore_slot();
+  DBG("Chanhead gc add %p %V: %s", ch, &ch->id, reason);
+  
+  if(!ch->shutting_down) {
+    assert(ch->foreign_owner_ipc_sub == NULL); //we don't accept still-subscribed chanheads
+  }
+  
+  if(ch->slot != ch->owner) {
+    ch->shared = NULL;
+  }
+  if(ch->status == WAITING && !(ch->cf && ch->cf->redis.enabled) && !(ngx_exiting || ngx_quit)) {
+    ERR("tried adding WAITING chanhead %p %V to chanhead_gc. why?", ch, &ch->id);
+    //don't gc it just yet.
+    return NGX_OK;
+  }
+  
+  assert(ch->slot == slot);
+  if(! ch->in_gc_queue) {
+    ch->gc_start_time = ngx_time();
+    ch->status = INACTIVE;
+    ch->gc_queued_times ++;
+    chanhead_churner_withdraw(ch);
+    ch->in_gc_queue = 1;
+    nchan_reaper_add(&mpt->chanhead_reaper, ch);
+  }
+  else {
+    DBG("gc_add chanhead %V: already added", &ch->id);
+  }
+
+  return NGX_OK;
+}
+
+ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *ch, const char *reason) {
+  //remove from gc list if we're there
+  DBG("Chanhead gc withdraw %p %V: %s", ch, &ch->id, reason);
+  
+  if(ch->in_gc_queue) {
+    nchan_reaper_withdraw(&mpt->chanhead_reaper, ch);
+    ch->in_gc_queue = 0;
+  }
+  if(ch->owner == ch->slot) {
+    chanhead_churner_add(ch);
+  }
+  
+  return NGX_OK;
+}
+
+
+/*
+static ngx_str_t *msg_to_str(nchan_msg_t *msg) {
+  static ngx_str_t str;
+  ngx_buf_t *buf = msg->buf;
+  if(ngx_buf_in_memory(buf)) {
+    str.data = buf->start;
+    str.len = buf->end - buf->start;
+  }
+  else {
+    str.data= (u_char *)"{not in memory}";
+    str.len =  15;
+  }
+  return &str;
+}
+*/
+/*
+static ngx_str_t *chanhead_msg_to_str(store_message_t *msg) {
+  static ngx_str_t str;
+  if (msg == NULL) {
+    str.data=(u_char *)"{NULL}";
+    str.len = 6;
+    return &str;
+  }
+  else {
+    return msg_to_str(msg->msg); //WHOA, shared space!
+  }
+}
+*/
+
+ngx_int_t nchan_memstore_publish_generic(memstore_channel_head_t *head, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line) {
+  
+  ngx_int_t          shared_sub_count = 0;
+  
+  if(head->shared) {
+    if(!(head->cf && head->cf->redis.enabled) && !head->multi) {
+      assert(head->status == READY || head->status == STUBBED);
+    }
+    shared_sub_count = head->shared->sub_count;
+  }
+
+  if(head==NULL) {
+    /*
+    if(msg) {
+      DBG("tried publishing %V with a NULL chanhead", msgid_to_str(&msg->id));
+    }
+    else {
+      DBG("tried publishing status %i msg with a NULL chanhead", status_code);
+    }
+    */
+    return NCHAN_MESSAGE_QUEUED;
+  }
+
+  if(msg) {
+    //DBG("tried publishing %V to chanhead %p (subs: %i)", msgid_to_str(&msg->id), head, head->total_sub_count);
+    head->spooler.fn->respond_message(&head->spooler, msg);
+
+#if NCHAN_BENCHMARK
+    struct timeval          tv, diff;
+    ngx_gettimeofday(&tv);
+    nchan_timeval_subtract(&diff, &tv, &msg->start_tv);
+    
+    ngx_str_t              *msgid_str = msgid_to_str(&msg->id);
+    
+    assert(diff.tv_sec < 10);
+    
+    ERR("::BENCH:: channel %V msg %p <%V> len %i responded to %i in %l.%06l sec", &head->id, msg, msgid_str, ngx_buf_size(msg->buf), head->spooler.last_responded_subscriber_count, (long int)(diff.tv_sec), (long int)(diff.tv_usec));
+#endif
+    
+    if(msg->temp_allocd) {
+      ngx_free(msg);
+    }
+  }
+  else {
+    DBG("tried publishing status %i to chanhead %p (subs: %i)", status_code, head, head->total_sub_count);
+    head->spooler.fn->broadcast_status(&head->spooler, status_code, status_line);
+  }
+    
+  //TODO: be smarter about garbage-collecting chanheads
+  if(head->owner == memstore_slot()) {
+    //the owner is responsible for the chanhead and its interprocess siblings
+    //when removed, said siblings will be notified via IPC
+    chanhead_gc_add(head, "add owner chanhead after publish");
+  }
+  
+  if(head->shared) {
+    head->channel.subscribers = head->shared->sub_count;
+  }
+  
+  return (shared_sub_count > 0) ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED;
+}
+
+static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch);
+
+static ngx_int_t empty_callback(){
+  return NGX_OK;
+}
+
+typedef struct {
+  ngx_int_t       n;
+  nchan_channel_t chinfo;
+  callback_pt     cb;
+  void           *pd;
+} delete_multi_data_t;
+
+static ngx_int_t delete_multi_callback_handler(ngx_int_t code, nchan_channel_t* chinfo, delete_multi_data_t *d) {
+  assert(d->n >= 1);
+  d->n--;
+  
+  if(chinfo) {
+    d->chinfo.subscribers += chinfo->subscribers;
+    if(d->chinfo.last_seen < chinfo->last_seen) {
+      d->chinfo.last_seen = chinfo->last_seen;
+    }
+  }
+  
+  if(d->n == 0) {
+    if(d->cb) {
+      d->cb(code, &d->chinfo, d->pd);
+    }
+    ngx_free(d);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  ngx_int_t                owner;
+  if(!is_multi_id(channel_id)) {
+    if(cf->redis.enabled) {
+      return nchan_store_redis.delete_channel(channel_id, cf, callback, privdata);
+    }
+    else if(memstore_slot() != (owner = memstore_channel_owner(channel_id))) {
+      memstore_ipc_send_delete(owner, channel_id, callback, privdata);
+    }
+    else {
+      nchan_memstore_force_delete_channel(channel_id, callback, privdata);
+    }
+  }
+  else {
+    //delete a multichannel
+    ngx_int_t              i, max, slot;
+    delete_multi_data_t   *d = ngx_calloc(sizeof(*d), ngx_cycle->log);
+    assert(d);
+    //everyone might have this multi. broadcast the delete everywhere
+#if FAKESHARD
+    max = MAX_FAKE_WORKERS;
+#else
+    max = shdata->max_workers;
+#endif
+    d->n = max;
+    d->cb = callback;
+    d->pd = privdata;
+    
+    for(i=0; i < max; i++) {
+#if FAKESHARD
+      slot = i;
+#else
+      slot = shdata->procslot[i + memstore_procslot_offset];
+#endif
+      if(slot == memstore_slot()) {
+        nchan_memstore_force_delete_channel(channel_id, (callback_pt )delete_multi_callback_handler, d);
+      }
+      else {
+        memstore_ipc_send_delete(slot, channel_id, (callback_pt )delete_multi_callback_handler, d);
+      }
+    }
+    
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t chanhead_delete_message(memstore_channel_head_t *ch, store_message_t *msg);
+
+ngx_int_t nchan_memstore_force_delete_channel(ngx_str_t *channel_id, callback_pt callback, void *privdata) {
+  memstore_channel_head_t       *ch;
+  nchan_channel_t                chaninfo_copy;
+  store_message_t               *msg = NULL;
+  
+  assert(memstore_channel_owner(channel_id) == memstore_slot());
+  
+  if(callback == NULL) {
+    callback = empty_callback;
+  }
+  if((ch = nchan_memstore_find_chanhead(channel_id))) {
+    chaninfo_copy.messages = ch->shared->stored_message_count;
+    chaninfo_copy.subscribers = ch->shared->sub_count;
+    chaninfo_copy.last_seen = ch->shared->last_seen;
+    chaninfo_copy.last_published_msg_id = ch->latest_msgid;
+    
+    nchan_memstore_publish_generic(ch, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+    callback(NGX_OK, &chaninfo_copy, privdata);
+    //delete all messages
+    while((msg = ch->msg_first) != NULL) {
+      chanhead_delete_message(ch, msg);
+    }
+    chanhead_gc_add(ch, "forced delete");
+  }
+  else {
+    callback(NGX_OK, NULL, privdata);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_find_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  ngx_int_t                    owner = memstore_channel_owner(channel_id);
+  memstore_channel_head_t     *ch;
+  nchan_channel_t              chaninfo;
+  if(cf->redis.enabled) {
+    return nchan_store_redis.find_channel(channel_id, cf, callback, privdata);
+  }
+  else if(memstore_slot() == owner) {
+    ch = nchan_memstore_find_chanhead(channel_id);
+    if(ch == NULL) {
+      callback(NGX_OK, NULL, privdata);
+    }
+    else {
+      chaninfo = ch->channel;
+      if(ch->shared) {
+        chaninfo.last_seen = ch->shared->last_seen;
+      }
+      chaninfo.last_published_msg_id = ch->latest_msgid;
+      callback(NGX_OK, &chaninfo, privdata);
+    }
+    
+  }
+  else {
+    memstore_ipc_send_get_channel_info(owner, channel_id, callback, privdata);
+  }
+  return NGX_OK;
+}
+
+static void init_shdata_procslots(int slot, int n) {
+  shmtx_lock(shm);
+  ngx_int_t          offset = memstore_procslot_offset + n;
+  assert(shdata->procslot[offset] == NCHAN_INVALID_SLOT);
+  DBG("set shdata->procslot[%i] = %i", offset, slot);
+  shdata->procslot[offset] = slot;
+  shmtx_unlock(shm);
+}
+
+//initialization
+static ngx_int_t nchan_store_init_module(ngx_cycle_t *cycle) {
+  ngx_int_t          i;
+  shmtx_lock(shm);
+#if FAKESHARD
+
+  shdata->max_workers = MAX_FAKE_WORKERS;
+  
+  
+  memstore_data_t   *cur;
+  for(i = 0; i < MAX_FAKE_WORKERS; i++) {
+    cur = &mdata[i];
+    cur->fake_slot = i;
+  }
+  
+  memstore_fakeprocess_push(0);
+
+#else
+  ngx_int_t           count = 0;
+  ngx_core_conf_t    *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  
+  if(shdata->total_active_workers > 0) {
+    shdata->reloading += shdata->max_workers;
+  }
+  
+  shdata->old_max_workers = shdata->max_workers;
+  shdata->max_workers = ccf->worker_processes;
+  if(shdata->old_max_workers == NCHAN_INVALID_SLOT) {
+    shdata->old_max_workers = shdata->max_workers;
+  }
+  
+  //figure out the memstore_procslot_offset
+  for(i = 0; i < NGX_MAX_PROCESSES; i++) {
+    if(shdata->procslot[i] == NCHAN_INVALID_SLOT) {
+      count++;
+    }
+    else {
+      count = 0;
+    }
+    if(count == shdata->max_workers) {
+      break;
+    }
+  }
+  if(count < shdata->max_workers) {
+    ERR("Not enough free procslots?! Don't know what to do... :'(");
+    return NGX_ERROR;
+  }
+  memstore_procslot_offset = i + 1 - shdata->max_workers;
+
+#endif
+  memstore_worker_generation = shdata->generation;
+  shmtx_unlock(shm);
+  DBG("memstore init_module pid %i. ipc: %p, procslot_offset: %i", ngx_pid, ipc, memstore_procslot_offset);
+
+  //initialize our little IPC
+  if(ipc == NULL) {
+    ipc = &ipc_data;
+    ipc_init(ipc);
+    ipc_set_handler(ipc, memstore_ipc_alert_handler);
+  }
+  ipc_open(ipc, cycle, shdata->max_workers, &init_shdata_procslots);
+
+  //initialize default shared multi-channel config
+  ngx_memzero(&default_multiconf, sizeof(default_multiconf));
+  default_multiconf.buffer_timeout = 0;
+  default_multiconf.max_messages = -1;
+  default_multiconf.max_channel_id_length = NCHAN_MAX_CHANNEL_ID_LENGTH;
+  default_multiconf.max_channel_subscribers = -1;
+  
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
+  nchan_main_conf_t     *conf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
+  ngx_str_t              name = ngx_string("memstore");
+  if(conf->shm_size==NGX_CONF_UNSET_SIZE) {
+    conf->shm_size=NCHAN_DEFAULT_SHM_SIZE;
+  }
+  if(conf->redis_fakesub_timer_interval == NGX_CONF_UNSET_MSEC) {
+    conf->redis_fakesub_timer_interval = REDIS_DEFAULT_FAKESUB_TIMER_INTERVAL;
+  }
+  redis_fakesub_timer_interval = conf->redis_fakesub_timer_interval;
+  
+  shm = shm_create(&name, cf, conf->shm_size, initialize_shm, &ngx_nchan_module);
+  return NGX_OK;
+}
+
+static void nchan_store_create_main_conf(ngx_conf_t *cf, nchan_main_conf_t *mcf) {
+  mcf->shm_size=NGX_CONF_UNSET_SIZE;
+  mcf->redis_fakesub_timer_interval=NGX_CONF_UNSET_MSEC;
+}
+
+static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
+  memstore_channel_head_t            *cur, *tmp;
+  ngx_int_t                           i, my_procslot_index = NCHAN_INVALID_SLOT;
+    
+  DBG("exit worker %i  (slot %i)", ngx_pid, ngx_process_slot);
+  
+#if FAKESHARD
+  for(i = 0; i < MAX_FAKE_WORKERS; i++) {
+  memstore_fakeprocess_push(i);
+#endif
+  HASH_ITER(hh, mpt->hash, cur, tmp) {
+    cur->shutting_down = 1;
+    
+    //serialize_chanhead_msgs_for_reload(cur);
+    
+    chanhead_gc_add(cur, "exit worker");
+  }
+  
+  nchan_exit_notice_about_remaining_things("channel", "", mpt->chanhead_reaper.count);
+  nchan_exit_notice_about_remaining_things("channel", "in churner ", mpt->chanhead_churner.count);
+  nchan_exit_notice_about_remaining_things("unbuffered message", "", mpt->nobuffer_msg_reaper.count);
+  nchan_exit_notice_about_remaining_things("message", "", mpt->msg_reaper.count);
+  
+  nchan_reaper_stop(&mpt->chanhead_churner);
+  nchan_reaper_stop(&mpt->chanhead_reaper);
+  
+  nchan_reaper_stop(&mpt->nobuffer_msg_reaper);
+  nchan_reaper_stop(&mpt->msg_reaper);
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+  }
+#endif
+  
+  shmtx_lock(shm);
+  
+  if(shdata->old_max_workers == NGX_CONF_UNSET) {
+    shdata->old_max_workers = shdata->max_workers;
+  }
+  
+  shdata->reloading--;
+  
+  //don't care if this is 'inefficient', it only happens once per worker per load
+  for(i = memstore_procslot_offset; i < memstore_procslot_offset + shdata->old_max_workers; i++) {
+    if(ngx_process_slot == shdata->procslot[i]) {
+      my_procslot_index = i;
+      break;
+    }
+  }
+  if(my_procslot_index == NCHAN_INVALID_SLOT) {
+    ERR("my procslot not found! I don't know what to do!");
+    assert(0);
+  }
+  
+  ipc_close(ipc, cycle);
+  
+  if(shdata->reloading == 0) {
+    for(i = memstore_procslot_offset; i < memstore_procslot_offset + shdata->old_max_workers; i++) {
+      shdata->procslot[i] = NCHAN_INVALID_SLOT;
+    }
+  }
+
+  shdata->total_active_workers--;
+  
+  shmtx_unlock(shm);
+  
+#if NCHAN_MSG_LEAK_DEBUG
+  msg_debug_assert_isempty();
+#endif
+  
+  shm_destroy(shm); //just for this worker...
+  
+#if FAKESHARD
+  while(memstore_fakeprocess_pop()) {  };
+#endif
+}
+
+static void nchan_store_exit_master(ngx_cycle_t *cycle) {
+  DBG("exit master from pid %i", ngx_pid);
+  
+  ipc_close(ipc, cycle);
+#if FAKESHARD
+  while(memstore_fakeprocess_pop()) {  };
+ #endif
+  shm_free(shm, shdata);
+  shm_destroy(shm);
+}
+
+static ngx_int_t validate_chanhead_messages(memstore_channel_head_t *ch) {
+  /*
+  ngx_int_t              count = ch->channel.messages;
+  ngx_int_t              rev_count = count;
+  ngx_int_t              owner = memstore_channel_owner(&ch->id);
+  store_message_t        *cur;
+  
+  if(memstore_slot() == owner) {
+    assert(ch->shared->stored_message_count == ch->channel.messages);
+  }
+  //walk it forwards
+  for(cur = ch->msg_first; cur != NULL; cur=cur->next){
+    count--;
+  }
+  for(cur = ch->msg_last; cur != NULL; cur=cur->prev){
+    rev_count--;
+  }
+  
+  assert(count == 0);
+  assert(rev_count == 0);
+  */
+  return NGX_OK;
+}
+
+static ngx_int_t memstore_reap_message( nchan_msg_t *msg ) {
+  ngx_buf_t         *buf = msg->buf;
+  ngx_file_t        *f = buf->file;
+  
+  assert(msg->refcount == MSG_REFCOUNT_INVALID);
+  
+  if(f != NULL) {
+    if(f->fd != NGX_INVALID_FILE) {
+      DBG("close fd %u ", f->fd);
+      ngx_close_file(f->fd);
+    }
+    else {
+      DBG("reap msg fd invalid");
+    }
+    ngx_delete_file(f->name.data); // assumes string is zero-terminated, which required trickery during allocation
+  }
+  //DBG("free smsg %p",s msg);
+#if NCHAN_MSG_LEAK_DEBUG  
+  msg_debug_remove(msg);
+#endif
+  
+  //ERR("reap msg %p", msg);
+  nchan_free_msg_id(&msg->id);
+  nchan_free_msg_id(&msg->prev_id);
+  ngx_memset(msg, 0xFA, sizeof(*msg)); //debug stuff
+  shm_free(shm, msg);
+  nchan_update_stub_status(messages, -1);
+  return NGX_OK;
+}
+
+static ngx_int_t memstore_reap_store_message( store_message_t *smsg ) {
+  
+  memstore_reap_message(smsg->msg);
+  
+  ngx_memset(smsg, 0xBC, sizeof(*smsg)); //debug stuff
+  ngx_free(smsg);
+  return NGX_OK;
+}
+
+
+
+static ngx_int_t chanhead_delete_message(memstore_channel_head_t *ch, store_message_t *msg) {
+  //validate_chanhead_messages(ch);
+  
+  //DBG("withdraw message %V from ch %p %V", msgid_to_str(&msg->msg->id), ch, &ch->id);
+  if(ch->msg_first == msg) {
+    //DBG("first message removed");
+    ch->msg_first = msg->next;
+  }
+  if(ch->msg_last == msg) {
+    //DBG("last message removed");
+    ch->msg_last = msg->prev;
+  }
+  if(msg->next != NULL) {
+    //DBG("set next");
+    msg->next->prev = msg->prev;
+  }
+  if(msg->prev != NULL) {
+    //DBG("set prev");
+    assert(0);
+    msg->prev->next = msg->next;
+  }
+  
+  ch->channel.messages--;
+  
+  ngx_atomic_fetch_add(&ch->shared->stored_message_count, -1);
+  
+  if(ch->channel.messages == 0) {
+    assert(ch->msg_first == NULL);
+    assert(ch->msg_last == NULL);
+  }
+  
+  nchan_reaper_add(&mpt->msg_reaper, msg);
+  return NGX_OK;
+}
+
+static ngx_int_t chanhead_messages_gc_custom(memstore_channel_head_t *ch, ngx_int_t max_messages) {
+  validate_chanhead_messages(ch);
+  store_message_t   *cur = ch->msg_first;
+  store_message_t   *next = NULL;
+  time_t             now = ngx_time();
+  ngx_int_t          started_count, tried_count, deleted_count;
+  DBG("chanhead_gc max %i count %i", max_messages, ch->channel.messages);
+  
+  started_count = ch->channel.messages;
+  tried_count = 0;
+  deleted_count = 0;
+  
+  //is the message queue too big?
+  while(cur != NULL && max_messages >= 0 && ch->channel.messages > max_messages) {
+    tried_count++;
+    next = cur->next;
+    chanhead_delete_message(ch, cur);
+    deleted_count++;        
+    cur = next;
+  }
+  
+  //any expired messages?
+  while(cur != NULL && now > cur->msg->expires) {
+    tried_count++;
+    next = cur->next;
+    chanhead_delete_message(ch, cur);
+    cur = next;
+  }
+  DBG("message GC results: started with %i, walked %i, deleted %i msgs", started_count, tried_count, deleted_count);
+  validate_chanhead_messages(ch);
+  return NGX_OK;
+}
+
+ngx_int_t memstore_chanhead_messages_gc(memstore_channel_head_t *ch) {
+  //DBG("messages gc for ch %p %V", ch, &ch->id);
+  return chanhead_messages_gc_custom(ch, ch->max_messages);
+}
+
+static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch) {
+  chanhead_messages_gc_custom(ch, 0);
+  return NGX_OK;
+}
+
+store_message_t *chanhead_find_next_message(memstore_channel_head_t *ch, nchan_msg_id_t *msgid, nchan_msg_status_t *status) {
+  store_message_t      *cur, *first;
+  
+  time_t           mid_time; //optimization yeah
+  int16_t          mid_tag; //optimization yeah
+  
+  //DBG("find next message %V", msgid_to_str(msgid));
+  if(ch == NULL) {
+    *status = MSG_NOTFOUND;
+    return NULL;
+  }
+  memstore_chanhead_messages_gc(ch);
+  
+  first = ch->msg_first;
+  cur = ch->msg_last;
+  
+  if(cur == NULL) {
+    if(msgid->time == NCHAN_OLDEST_MSGID_TIME || ch->max_messages == 0) {
+      *status = MSG_EXPECTED;
+    }
+    else {
+      *status = MSG_NOTFOUND;
+    }
+    return NULL;
+  }
+  else if(msgid->time == NCHAN_NEWEST_MSGID_TIME) {
+    ERR("wanted 'NCHAN_NEWEST_MSGID_TIME', which is weird...");
+    *status = MSG_EXPECTED; //future message
+    return NULL;
+  }
+  
+  mid_time = msgid->time;
+  mid_tag = msgid->tag.fixed[0];
+  
+  if(mid_time == NCHAN_NTH_MSGID_TIME) {
+    int               direction = mid_tag > 0 ? 1 : -1;
+    int               nth_msg = mid_tag * direction;
+    int               n = nth_msg;
+    store_message_t  *prev = NULL;
+    
+    assert(mid_tag != 0);
+    for(cur = (direction>0 ? ch->msg_first : ch->msg_last); cur != NULL && n > 1; cur = (direction>0 ? cur->next : cur->prev)) {
+      prev = cur;
+      n--;
+    }
+    cur = cur ? cur : prev;
+    if(cur) {
+      *status = MSG_FOUND;
+      return cur;
+    }
+    else {
+      *status = MSG_EXPECTED;
+      return NULL;
+    }
+  }
+  else {
+    assert(msgid->tagcount == 1 && first->msg->id.tagcount == 1);
+    if(msgid == NULL || (mid_time < first->msg->id.time || (mid_time == first->msg->id.time && mid_tag < first->msg->id.tag.fixed[0])) ) {
+      //DBG("found message %V", msgid_to_str(&first->msg->id));
+      *status = MSG_FOUND;
+      return first;
+    }
+    
+    while(cur != NULL) {
+      //assert(cur->msg->id.tagcount == 1);
+      //DBG("cur: (chid: %V)  %V %V", &ch->id, msgid_to_str(&cur->msg->id), chanhead_msg_to_str(cur));
+      
+      if(mid_time > cur->msg->id.time || (mid_time == cur->msg->id.time && mid_tag >= cur->msg->id.tag.fixed[0])){
+        if(cur->next != NULL) {
+          *status = MSG_FOUND;
+          //DBG("found message %V", msgid_to_str(&cur->next->msg->id));
+          return cur->next;
+        }
+        else {
+          *status = MSG_EXPECTED;
+          return NULL;
+        }
+      }
+      cur=cur->prev;
+    }
+    //DBG("looked everywhere, not found");
+    *status = MSG_NOTFOUND;
+    return NULL;
+  }
+}
+
+typedef struct {
+  subscriber_t                *sub;
+  ngx_int_t                    channel_owner;
+  memstore_channel_head_t     *chanhead;
+  ngx_str_t                   *channel_id;
+  nchan_msg_id_t               msg_id;
+  callback_pt                  cb;
+  void                        *cb_privdata;
+  unsigned                     reserved:1;
+  unsigned                     subbed:1;
+  unsigned                     allocd:1;
+} subscribe_data_t;
+
+//static subscribe_data_t        static_subscribe_data;
+
+static subscribe_data_t *subscribe_data_alloc(ngx_int_t owner) {
+  subscribe_data_t            *d;
+  //fuck it, just always allocate. we need to handle multis and shit too
+  d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+  assert(d);
+  d->allocd = 1;
+  /*if(memstore_slot() != owner) {
+    d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    d->allocd = 1;
+  }
+  else {
+    d = &static_subscribe_data;
+    d->allocd = 0;
+  }*/
+  return d;
+}
+
+static void subscribe_data_free(subscribe_data_t *d) {
+  if(d->allocd) {
+    ngx_free(d);
+  }
+}
+
+#define SUB_CHANNEL_UNAUTHORIZED 0
+#define SUB_CHANNEL_AUTHORIZED 1
+#define SUB_CHANNEL_NOTSURE 2
+
+static ngx_int_t nchan_store_subscribe_sub_auth_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d);
+static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d);
+
+static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub) {
+  ngx_int_t                    owner = memstore_channel_owner(channel_id);
+  subscribe_data_t            *d = subscribe_data_alloc(sub->cf->redis.enabled ? -1 : owner);
+  
+  assert(d != NULL);
+  
+  d->channel_owner = owner;
+  d->channel_id = channel_id;
+  d->sub = sub;
+  d->subbed = 0;
+  d->reserved = 0;
+  d->msg_id = sub->last_msgid;
+  
+  if(sub->cf->subscribe_only_existing_channel || sub->cf->max_channel_subscribers > 0) {
+    sub->fn->reserve(sub);
+    d->reserved = 1;
+    if(memstore_slot() != owner) {
+      memstore_ipc_send_channel_auth_check(owner, channel_id, sub->cf, (callback_pt )nchan_store_subscribe_sub_auth_check_callback, d);
+    }
+    else {
+      nchan_store_subscribe_continued(SUB_CHANNEL_NOTSURE, NULL, d);
+    }
+  }
+  else {
+    nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_subscribe_sub_auth_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
+  if(d->sub->fn->release(d->sub, 0) == NGX_OK) {
+    d->reserved = 0;
+    return nchan_store_subscribe_continued(channel_status, _, d);
+  }
+  else {//don't go any further, the sub has been deleted
+    assert(d->sub->reserved == 0);
+    subscribe_data_free(d);
+    return NGX_OK;
+  }
+}
+
+static ngx_int_t redis_subscribe_channel_authcheck_callback(ngx_int_t status, void *ch, void *d) {
+  nchan_channel_t    *channel = (nchan_channel_t *)ch;
+  subscribe_data_t   *data = (subscribe_data_t *)d;
+  nchan_loc_conf_t   *cf = data->sub->cf;
+  ngx_int_t           channel_status;
+  if(status == NGX_OK) {
+    if(channel == NULL) {
+      channel_status = cf->subscribe_only_existing_channel ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
+    }
+    else if(cf->max_channel_subscribers == 0) {
+      channel_status = SUB_CHANNEL_AUTHORIZED;
+    }
+    else {
+      channel_status = channel->subscribers >= cf->max_channel_subscribers ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
+    }
+    nchan_store_subscribe_continued(channel_status, NULL, data);
+  }
+  else {
+    //error!!
+    subscribe_data_free(data);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
+  memstore_channel_head_t       *chanhead = NULL;
+  //store_message_t             *chmsg;
+  //nchan_msg_status_t           findmsg_status;
+  ngx_int_t                      not_dead;
+  ngx_int_t                      use_redis = d->sub->cf->redis.enabled;
+  nchan_loc_conf_t              *cf = d->sub->cf;
+  ngx_int_t                      rc = NGX_OK;
+  
+  switch(channel_status) {
+    case SUB_CHANNEL_AUTHORIZED:
+      chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
+      break;
+    
+    case SUB_CHANNEL_UNAUTHORIZED:
+      chanhead = NULL;
+      break;
+    
+    case SUB_CHANNEL_NOTSURE:
+      if(use_redis) {
+        if(cf->subscribe_only_existing_channel && cf->max_channel_subscribers == 0) {
+          if((chanhead = nchan_memstore_find_chanhead(d->channel_id)) != NULL) {
+            break;
+          }
+        }
+        nchan_store_redis.find_channel(d->channel_id, cf, redis_subscribe_channel_authcheck_callback, d);
+        return NGX_OK;
+      }
+      else {
+        chanhead = nchan_memstore_find_chanhead(d->channel_id);
+      }
+      break;
+  }
+  
+  not_dead = d->sub->status != DEAD;
+
+  if ((channel_status == SUB_CHANNEL_UNAUTHORIZED) || 
+      (!chanhead && cf->subscribe_only_existing_channel) ||
+      (chanhead && cf->max_channel_subscribers > 0 && chanhead->shared && chanhead->shared->sub_count >= (ngx_uint_t )cf->max_channel_subscribers)) {
+    if(not_dead) {
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL);
+    }
+    
+    if(d->reserved) {
+      d->sub->fn->release(d->sub, 0);
+      d->reserved = 0;
+    }
+    
+    //sub should be destroyed by now.
+    
+    d->sub = NULL; //debug
+    //d->cb(NGX_HTTP_NOT_FOUND, NULL, d->cb_privdata);
+    subscribe_data_free(d);
+    return NGX_OK;
+  }
+  else if(!chanhead) {
+    chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
+  }
+  
+  if(!chanhead) { //nchan_memstore_get_chanhead could fail when out of shared memory
+    if(not_dead) {
+      //this response does something funny (i.e. crashy) to the finalize_request function
+      //no response for now, but TODO: get this right
+      //d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL);
+      rc = NGX_ERROR;
+    }
+  }
+  
+  d->chanhead = chanhead;
+  
+  if(d->reserved) {
+    d->sub->fn->release(d->sub, 1);
+    d->reserved = 0;
+  }
+  if(chanhead && not_dead) {
+    chanhead->spooler.fn->add(&chanhead->spooler, d->sub);
+  }
+
+  subscribe_data_free(d);
+
+  return rc;
+}
+
+static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
+
+typedef struct get_multi_message_data_s get_multi_message_data_t;
+struct get_multi_message_data_s {
+  memstore_channel_head_t     *chanhead;
+  nchan_msg_status_t           msg_status;
+  nchan_msg_t                 *msg;
+  ngx_int_t                    n;
+  
+  nchan_msg_id_t               wanted_msgid;
+  ngx_int_t                    getting;
+  ngx_int_t                    multi_count;
+  
+  ngx_event_t                  timer; 
+  
+  time_t                       expired;
+  
+  callback_pt                  cb;
+  void                        *privdata;
+};
+
+typedef struct {
+  ngx_int_t                   n;
+  get_multi_message_data_t   *d;
+} get_multi_message_data_single_t;
+
+typedef struct {
+  get_multi_message_data_t         d;
+  get_multi_message_data_single_t  sd;
+} get_multi_message_data_blob_t;
+
+static ngx_inline void set_multimsg_msg(get_multi_message_data_t *d, get_multi_message_data_single_t *sd, nchan_msg_t *msg, nchan_msg_status_t status) {
+  d->msg_status = status;
+  if(d->msg) msg_release(d->msg, "get multi msg");
+  d->msg = msg;
+  if(msg) assert(msg_reserve(msg, "get multi msg") == NGX_OK);
+  d->n = sd->n;
+  d->msg_status = status;
+}
+
+static ngx_int_t nchan_store_async_get_multi_message_callback(nchan_msg_status_t status, nchan_msg_t *msg, get_multi_message_data_single_t *sd);
+
+static void retry_get_multi_message_after_MSG_NORESPONSE(void *pd) {
+  get_multi_message_data_single_t  *sd = pd;
+  get_multi_message_data_t         *d = sd->d;
+  nchan_msg_id_t                    retry_msgid = NCHAN_ZERO_MSGID;
+  assert(nchan_extract_from_multi_msgid(&d->wanted_msgid, sd->n, &retry_msgid) == NGX_OK);
+  nchan_store_async_get_message(&d->chanhead->multi[sd->n].id, &retry_msgid, d->chanhead->cf, (callback_pt )nchan_store_async_get_multi_message_callback, sd);
+}
+
+static ngx_int_t nchan_store_async_get_multi_message_callback(nchan_msg_status_t status, nchan_msg_t *msg, get_multi_message_data_single_t *sd) {
+  static int16_t              multi_largetag[NCHAN_MULTITAG_MAX], multi_prevlargetag[NCHAN_MULTITAG_MAX];
+  //ngx_str_t                   empty_id_str = ngx_string("-");
+  get_multi_message_data_t   *d = sd->d;
+  nchan_msg_copy_t            retmsg;
+  
+  /*
+  switch(status) {
+    case MSG_FOUND:
+      ERR("multi[%i] of %i msg FOUND (getting: %i) %V %p", sd->n, d->multi_count, d->getting, msgid_to_str(&msg->id), msg);
+      break;
+    default: 
+      ERR("multi[%i] of %i msg %s (getting: %i)", sd->n, d->multi_count, nchan_msgstatus_to_str(status), d->getting);
+  }
+  */
+  if(d->expired) {
+    ERR("multimsg callback #%i for %p received after expiring at %ui status %i msg %p", d->n, d, d->expired, status, msg);
+    d->getting--;
+    goto cleanup;
+  }
+  
+  if(status == MSG_NORESPONSE) {
+    //retry featching that message
+    //this isn't clean, nor is it efficient
+    //buf fuck it, we're doing it live.
+    nchan_add_oneshot_timer(retry_get_multi_message_after_MSG_NORESPONSE, sd, 10);
+    return NGX_OK;
+  }
+  d->getting--;
+  
+  if(d->msg_status == MSG_PENDING) {
+    set_multimsg_msg(d, sd, msg, status);
+  }
+  else if(msg) {
+    if(d->msg == NULL) {
+      //DBG("first response: %V (n:%i) %p", d->msg ? msgid_to_str(&d->msg->id) : &empty_id_str, d->n, d->msg);
+      set_multimsg_msg(d, sd, msg, status); 
+    }
+    else {
+      //DBG("prev best response: %V (n:%i) %p", d->msg ? msgid_to_str(&d->msg->id) : &empty_id_str, d->n, d->msg);
+      
+      assert(d->wanted_msgid.time <= msg->id.time);
+      
+      if(msg->id.time < d->msg->id.time) {
+        set_multimsg_msg(d, sd, msg, status);
+      }
+      else if((msg->id.time == d->msg->id.time && msg->id.tag.fixed[0] <  d->msg->id.tag.fixed[0]) 
+           || (msg->id.time == d->msg->id.time && msg->id.tag.fixed[0] == d->msg->id.tag.fixed[0] && sd->n < d->n) ) {
+        
+        //DBG("got a better response %V (n:%i), replace.", msgid_to_str(&msg->id), sd->n);
+        set_multimsg_msg(d, sd, msg, status);    
+      }
+      //else {
+      //  DBG("got a worse response %V (n:%i), keep prev.", msgid_to_str(&msg->id), sd->n);
+      //}
+    }
+  }
+  else if(d->msg == NULL && d->msg_status != MSG_EXPECTED) {
+    d->msg_status = status;
+  }
+  
+  if(d->getting == 0) {
+    //got all the messages we wanted
+    memstore_chanhead_release(d->chanhead, "multimsg");
+    if(d->msg) {
+      int16_t      *muhtags;
+      
+      ngx_int_t     n = d->n;
+      retmsg.copy = *d->msg;
+      retmsg.copy.shared = 0;
+      retmsg.copy.temp_allocd = 0;
+      retmsg.original = d->msg;
+      
+      nchan_copy_msg_id(&retmsg.copy.prev_id, &d->wanted_msgid, multi_prevlargetag);
+      
+      //TODO: some kind of missed-message check maybe?
+      
+      if (d->wanted_msgid.time != d->msg->id.time) {
+        nchan_copy_msg_id(&retmsg.copy.id, &d->msg->id, multi_largetag);
+        
+        if(d->multi_count > NCHAN_FIXED_MULTITAG_MAX) {
+          retmsg.copy.id.tag.allocd = multi_largetag;
+          assert(d->msg->id.tagcount == 1);
+          retmsg.copy.id.tag.allocd[0] = d->msg->id.tag.fixed[0];
+        }
+        retmsg.copy.id.tagcount = d->multi_count;
+        nchan_expand_msg_id_multi_tag(&retmsg.copy.id, 0, n, -1);
+      }
+      else {
+        nchan_copy_msg_id(&retmsg.copy.id, &d->wanted_msgid, multi_largetag); 
+      }
+      
+      muhtags = (d->multi_count > NCHAN_FIXED_MULTITAG_MAX) ? retmsg.copy.id.tag.allocd : retmsg.copy.id.tag.fixed;
+      muhtags[n] = d->msg->id.tag.fixed[0];
+      
+      retmsg.copy.id.tagactive = n;
+      
+      //DBG("respond msg id transformed into %p %V", &retmsg.copy, msgid_to_str(&retmsg.copy.id));
+      
+      d->cb(d->msg_status, &retmsg.copy, d->privdata);
+      
+      msg_release(d->msg, "get multi msg");
+    }
+    else {
+      d->cb(d->msg_status, NULL, d->privdata);
+    }
+  }
+
+cleanup:
+  if(d->getting == 0) {
+    nchan_free_msg_id(&d->wanted_msgid);
+    if(d->timer.timer_set) {
+      ngx_del_timer(&d->timer);
+    }
+    ngx_free(d);
+  }
+  return NGX_OK;
+}
+
+static void get_multimsg_timeout(ngx_event_t *ev) {
+  get_multi_message_data_t    *d = (get_multi_message_data_t *)ev->data;
+  ERR("multimsg %p timeout!!", d);  
+  d->expired = ngx_time();
+  
+  memstore_chanhead_release(d->chanhead, "multimsg");
+  //don't free it, a multimsg callback might arrive late. ngx_free(d);
+}
+
+static ngx_int_t nchan_store_async_get_multi_message(ngx_str_t *chid, nchan_msg_id_t *msg_id, callback_pt callback, void *privdata) {
+  
+  memstore_channel_head_t     *chead;
+  memstore_multi_t            *multi = NULL;
+  
+  ngx_int_t                    n;
+  uint8_t                      want[NCHAN_MULTITAG_MAX];
+  ngx_str_t                    ids[NCHAN_MULTITAG_MAX];
+  nchan_msg_id_t               req_msgid[NCHAN_MULTITAG_MAX];
+  
+  nchan_msg_id_t              *lastid;
+  ngx_str_t                   *getmsg_chid;
+  ngx_int_t                    getting = 0;
+  
+  ngx_int_t                    i;
+  
+  ngx_memzero(req_msgid, sizeof(req_msgid));
+  
+  chead = nchan_memstore_get_chanhead(chid, &default_multiconf);
+  assert(chead);
+  n = chead->multi_count;
+  
+  multi = chead->multi;
+  
+  memstore_chanhead_reserve(chead, "multimsg");
+  
+  //init loop
+  for(i = 0; i < n; i++) {
+    want[i] = 0;
+  }
+  
+  //DBG("get multi msg %V (count: %i)", msgid_to_str(msg_id), n);
+  
+  
+  if(msg_id->time == 0) {
+    for(i = 0; i < n; i++) {
+      assert(nchan_extract_from_multi_msgid(msg_id, i, &req_msgid[i]) == NGX_OK);
+      want[i] = 1;
+    }
+    getting = n;
+    //DBG("want all msgs");
+  }
+  else {
+    //what msgids do we want?
+    for(i = 0; i < n; i++) {
+      assert(nchan_extract_from_multi_msgid(msg_id, i, &req_msgid[i]) == NGX_OK);
+      //DBG("might want msgid %V from chan_index %i", msgid_to_str(&req_msgid[i]), i);
+    }
+    
+    //what do we need to fetch?
+    for(i = 0; i < n; i++) {
+      lastid = &multi[i].sub->last_msgid;
+      //DBG("chan index %i last id %V", i, msgid_to_str(lastid));
+      if(lastid->time == 0 
+        || lastid->time == -1
+        || lastid->time > req_msgid[i].time
+        || (lastid->time == req_msgid[i].time && lastid->tag.fixed[0] >= req_msgid[i].tag.fixed[0])) {
+        want[i]=1;
+        getting++;
+        DBG("want %i", i);
+      }
+      else {
+        DBG("Do not want %i", i);
+      }
+    }
+  }
+  
+  
+  get_multi_message_data_t         *d;
+  get_multi_message_data_single_t  *sd;
+  get_multi_message_data_blob_t    *dblob = ngx_alloc(sizeof(*dblob) + sizeof(*sd)*(getting - 1), ngx_cycle->log);
+  assert(dblob);
+  d = &dblob->d;
+  sd = &dblob->sd;
+  
+  d->cb = callback;
+  d->privdata = privdata;
+  d->multi_count = n;
+  d->msg_status = getting == n ? MSG_PENDING : MSG_EXPECTED;
+  d->msg = NULL;
+  d->n = -1;
+  d->getting = getting;
+  d->chanhead = chead;
+  d->expired = 0;
+  
+  ngx_memzero(&d->timer, sizeof(d->timer));
+  nchan_init_timer(&d->timer, get_multimsg_timeout, d);
+  ngx_add_timer(&d->timer, 20000);
+  
+  nchan_copy_new_msg_id(&d->wanted_msgid, msg_id);
+  
+  //do it.
+  for(i = 0; i < n; i++) {
+    if(want[i]) {
+      ngx_memzero(sd, sizeof(*sd));
+      sd->d = d;
+      sd->n = i;
+      
+      getmsg_chid = (multi == NULL) ? &ids[i] : &multi[i].id;
+      //DBG("get message from %V (n: %i) %V", getmsg_chid, i, msgid_to_str(&req_msgid[i]));
+      nchan_store_async_get_message(getmsg_chid, &req_msgid[i], chead->cf, (callback_pt )nchan_store_async_get_multi_message_callback, sd);
+      sd++;
+    }
+  }
+  
+  return NGX_OK;
+}
+
+void async_get_message_notify_on_MSG_EXPECTED_callback(nchan_msg_status_t status, void *pd){
+  subscribe_data_t            *d = (subscribe_data_t *) pd; 
+  nchan_memstore_handle_get_message_reply(NULL, status, d);
+}
+
+static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  store_message_t             *chmsg;
+  ngx_int_t                    owner = memstore_channel_owner(channel_id);
+  subscribe_data_t            *d; 
+  nchan_msg_status_t           findmsg_status;
+  memstore_channel_head_t     *chead;
+  
+  ngx_int_t                    use_redis = 0;
+  
+  if(callback==NULL) {
+    ERR("no callback given for async get_message. someone's using the API wrong!");
+    return NGX_ERROR;
+  }
+  
+  if(is_multi_id(channel_id)) {
+    return nchan_store_async_get_multi_message(channel_id, msg_id, callback, privdata);
+  }
+  
+  chead = nchan_memstore_find_chanhead(channel_id);
+  if(chead) {
+    use_redis = chead->cf && chead->cf->redis.enabled;
+  }
+  d = subscribe_data_alloc(owner);
+  d->channel_owner = owner;
+  d->channel_id = channel_id;
+  d->cb = callback;
+  d->cb_privdata = privdata;
+  d->sub = NULL;
+  d->msg_id = *msg_id;
+  d->chanhead = chead;
+  
+  if(memstore_slot() != owner) {
+    //check if we need to ask for a message
+    memstore_ipc_send_get_message(d->channel_owner, d->channel_id, &d->msg_id, d);
+  }
+  else {
+    chmsg = chanhead_find_next_message(d->chanhead, &d->msg_id, &findmsg_status);
+    
+    if(chmsg == NULL && use_redis) {
+      int       was_it_allocd = d->allocd;
+      d->allocd = 0;
+      nchan_memstore_redis_subscriber_notify_on_MSG_EXPECTED(chead->redis_sub, msg_id, async_get_message_notify_on_MSG_EXPECTED_callback, sizeof(*d), d);
+      d->allocd = was_it_allocd;
+      subscribe_data_free(d);
+      return NGX_OK;
+    }
+    return nchan_memstore_handle_get_message_reply(chmsg == NULL ? NULL : chmsg->msg, findmsg_status, d);
+  }
+  
+  return NGX_OK; //async only now!
+}
+
+ngx_int_t nchan_memstore_handle_get_message_reply(nchan_msg_t *msg, nchan_msg_status_t findmsg_status, void *data) {
+  subscribe_data_t           *d = (subscribe_data_t *)data;
+  //memstore_channel_head_t    *chanhead = d->chanhead;
+  d->cb(findmsg_status, msg, d->cb_privdata);
+  
+  subscribe_data_free(d);
+  return NGX_OK;
+}
+
+static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_message_t *msg) {
+  msg->next = NULL;
+  msg->prev = ch->msg_last;
+  
+  assert(msg->msg->id.tagcount == 1);
+  
+  if(msg->prev != NULL) {
+    msg->prev->next = msg;
+    msg->msg->prev_id = msg->prev->msg->id;
+  }
+  else {
+    msg->msg->prev_id.time = 0;
+    msg->msg->prev_id.tag.fixed[0] = 0;
+    msg->msg->prev_id.tagcount = 1;
+  }
+  
+  //set time and tag
+  if(msg->msg->id.time == 0) {
+    msg->msg->id.time = ngx_time();
+  }
+  if(ch->msg_last && ch->msg_last->msg->id.time == msg->msg->id.time) {
+    msg->msg->id.tag.fixed[0] = ch->msg_last->msg->id.tag.fixed[0] + 1;
+  }
+  else {
+    msg->msg->id.tag.fixed[0] = 0;
+  }
+
+  if(ch->msg_first == NULL) {
+    ch->msg_first = msg;
+  }
+  ch->channel.messages++;
+  ngx_atomic_fetch_add(&ch->shared->stored_message_count, 1);
+  ngx_atomic_fetch_add(&ch->shared->total_message_count, 1);
+
+  ch->msg_last = msg;
+  
+  //DBG("create %V %V", msgid_to_str(&msg->msg->id), chanhead_msg_to_str(msg));
+  memstore_chanhead_messages_gc(ch);
+  if(ch->msg_last != msg) { //why does this happen?
+    ERR("just-published messages is no longer the last message for some reason... This is unexpected.");
+  }
+  return ch->msg_last == msg ? NGX_OK : NGX_ERROR;
+}
+
+typedef struct {
+  nchan_msg_t             msg;
+  ngx_buf_t               buf;
+  ngx_file_t              file;
+} shmsg_memspace_t;
+
+static u_char* copy_preallocated_str_to_cur(ngx_str_t *dst, ngx_str_t *src, u_char *cur) {
+  size_t   sz = src->len;
+  dst->len = sz; 
+  if(sz > 0) {
+    dst->data = cur;
+    ngx_memcpy(dst->data, src->data, sz);
+  }
+  else {
+    dst->data = NULL;
+  }
+  return cur + sz;
+}
+
+static nchan_msg_t *create_shm_msg(nchan_msg_t *m) {
+  shmsg_memspace_t        *stuff;
+  nchan_msg_t             *msg;
+  ngx_buf_t               *mbuf = NULL, *buf=NULL;
+  u_char                  *cur;
+  mbuf = m->buf;
+  
+  size_t                  total_sz, buf_body_size = 0, content_type_size = 0, buf_filename_size = 0, eventsource_event_size = 0;
+  
+  eventsource_event_size += m->eventsource_event.len;
+  content_type_size += m->content_type.len;
+  if(ngx_buf_in_memory_only(mbuf)) {
+    buf_body_size = ngx_buf_size(mbuf);
+  }
+  if(mbuf->in_file && mbuf->file != NULL) {
+    buf_filename_size = mbuf->file->name.len + 1; //+1 to ensure NUL-terminated filename string
+  }
+  
+  total_sz = sizeof(*stuff) + (buf_filename_size + content_type_size + eventsource_event_size +  buf_body_size);
+#if NCHAN_MSG_LEAK_DEBUG
+  size_t    debug_sz = m->lbl.len;
+  total_sz += debug_sz;
+#endif
+  
+  if((stuff = shm_alloc(shm, total_sz, "message")) == NULL) {
+    ERR("can't allocate 'shared' memory for msg for channel id");
+    return NULL;
+  }
+  cur = (u_char *)&stuff[1];
+  
+  assert(m->id.tagcount == 1);
+  
+  msg = &stuff->msg;
+  buf = &stuff->buf;
+  
+  ngx_memcpy(msg, m, sizeof(*msg));
+  ngx_memcpy(buf, mbuf, sizeof(*buf));
+  
+  msg->buf = buf;
+  
+  cur = copy_preallocated_str_to_cur(&msg->content_type, &m->content_type, cur);
+  
+  cur = copy_preallocated_str_to_cur(&msg->eventsource_event, &m->eventsource_event, cur);
+  
+  if(mbuf->file!=NULL) {
+    buf->file = &stuff->file;
+    *buf->file = *mbuf->file;
+    buf->file->fd =NGX_INVALID_FILE;
+    buf->file->log = ngx_cycle->log;
+    
+    cur = copy_preallocated_str_to_cur(&buf->file->name, &mbuf->file->name, cur);
+    //ensure last char is NUL
+    *(++cur) = '\0';
+  }
+  
+  if(buf_body_size > 0) {
+    ngx_str_t   dst_str, src_str = {buf_body_size, mbuf->pos};
+    
+    //cur = copy_preallocated_str_to_cur(&dst_str, &src_str, cur);
+    copy_preallocated_str_to_cur(&dst_str, &src_str, cur);
+    
+    buf->pos = dst_str.data;
+    buf->last = buf->pos + dst_str.len;
+    buf->start = buf->pos;
+    buf->end = buf->last;
+  }
+  
+  msg->shared = 1;
+  msg->temp_allocd = 0;
+  
+#if NCHAN_MSG_RESERVE_DEBUG
+  msg->rsv = NULL;
+#endif
+#if NCHAN_MSG_LEAK_DEBUG  
+  msg->lbl.len = m->lbl.len;
+  msg->lbl.data = (u_char *)stuff + (total_sz - debug_sz);
+  ngx_memcpy(msg->lbl.data, m->lbl.data, msg->lbl.len);
+  
+  msg_debug_add(msg);
+#endif
+  
+  return msg;
+}
+
+ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl) {
+  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, 1);
+  assert(msg->refcount >= 0);
+  if(msg->refcount < 0) {
+    msg->refcount = MSG_REFCOUNT_INVALID;
+    return NGX_ERROR;
+  }
+#if NCHAN_MSG_RESERVE_DEBUG  
+  msg_rsv_dbg_t     *rsv;
+  shmtx_lock(shm);
+  rsv=shm_locked_calloc(shm, sizeof(*rsv) + ngx_strlen(lbl) + 1, "msgdebug");
+  rsv->lbl = (char *)(&rsv[1]);
+  ngx_memcpy(rsv->lbl, lbl, ngx_strlen(lbl));
+  if(msg->rsv == NULL) {
+    msg->rsv = rsv;
+    rsv->prev = NULL;
+    rsv->next = NULL;
+  }
+  else {
+    msg->rsv->prev = rsv;
+    rsv->next = msg->rsv;
+    rsv->prev = NULL;
+    msg->rsv = rsv;
+  }
+  shmtx_unlock(shm);
+#endif
+  //DBG("msg %p reserved (%i) %s", msg, msg->refcount, lbl);
+  return NGX_OK;
+}
+
+ngx_int_t msg_release(nchan_msg_t *msg, char *lbl) {
+#if NCHAN_MSG_RESERVE_DEBUG
+  msg_rsv_dbg_t     *cur, *prev, *next;
+  size_t             sz = ngx_strlen(lbl);
+  ngx_int_t          rsv_found=0;
+  shmtx_lock(shm);
+  assert(msg->refcount > 0);
+  for(cur = msg->rsv; cur != NULL; cur = cur->next) {
+    if(ngx_memcmp(lbl, cur->lbl, sz) == 0) {
+      prev = cur->prev;
+      next = cur->next;
+      if(prev) {
+        prev->next = next;
+      }
+      if(next) {
+        next->prev = prev;
+      }
+      if(cur == msg->rsv) {
+        msg->rsv = next;
+      }
+      shm_locked_free(shm, cur);
+      rsv_found = 1;
+      break;
+    }
+  }
+  assert(rsv_found);
+  shmtx_unlock(shm);
+#endif
+  assert(msg->refcount > 0);
+  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, -1);
+  //DBG("msg %p released (%i) %s", msg, msg->refcount, lbl);
+  return NGX_OK;
+}
+
+static store_message_t *create_shared_message(nchan_msg_t *m, ngx_int_t msg_already_in_shm) {
+  store_message_t          *chmsg;
+  nchan_msg_t              *msg;
+  
+  if(msg_already_in_shm) {
+    msg = m;
+  }
+  else {
+    if((msg=create_shm_msg(m)) == NULL ) {
+      return NULL;
+    }
+  }
+  if((chmsg = ngx_alloc(sizeof(*chmsg), ngx_cycle->log)) != NULL) {
+    chmsg->prev = NULL;
+    chmsg->next = NULL;
+    chmsg->msg  = msg;
+  }
+  return chmsg;
+}
+
+typedef struct {
+  uint16_t              n;
+  ngx_int_t             rc;
+  nchan_channel_t       ch;
+  callback_pt           callback;
+  void                 *privdata;
+} publish_multi_data_t;
+
+static ngx_int_t publish_multi_callback(ngx_int_t status, void *rptr, void *privdata) {
+  nchan_channel_t       *ch = rptr;
+  publish_multi_data_t  *pd = privdata;
+  static nchan_msg_id_t  empty_msgid = NCHAN_ZERO_MSGID;
+  
+  if(status == NGX_HTTP_INTERNAL_SERVER_ERROR || (status == NCHAN_MESSAGE_RECEIVED && pd->rc != NGX_HTTP_INTERNAL_SERVER_ERROR)) {
+    pd->rc = status;
+  }
+  
+  if(pd->ch.last_seen < ch->last_seen) {
+    pd->ch.last_seen = ch->last_seen;
+  }
+  
+  if(pd->ch.messages < ch->messages) {
+    pd->ch.messages = ch->messages;
+  }
+  
+  pd->ch.subscribers += ch->subscribers;
+  
+  pd->n--;
+  
+  if(pd->n == 0) {
+    pd->ch.last_published_msg_id = empty_msgid;
+    pd->callback(pd->rc, &pd->ch, pd->privdata);
+    ngx_free(pd);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t *msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  return nchan_store_publish_message_generic(channel_id, msg, 0, cf, callback, privdata);
+}
+
+static ngx_inline time_t message_timeout(nchan_loc_conf_t *cf) {
+  return cf->buffer_timeout != 0 ? cf->buffer_timeout : 525600 * 60;
+}
+
+static void fill_message_timedata(nchan_msg_t *msg, time_t timeout) {
+  //this coould be dangerous!!
+  if(msg->id.time == 0) {
+    msg->id.time = ngx_time();
+  }
+  if(msg->expires == 0) {
+    msg->expires = msg->id.time + timeout;
+  }
+}
+
+ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  memstore_channel_head_t  *chead;
+  
+  if(is_multi_id(channel_id)) {
+    ngx_int_t             i, n = 0;
+    ngx_str_t             ids[NCHAN_MULTITAG_MAX];
+    publish_multi_data_t *pd;
+    if((pd = ngx_alloc(sizeof(*pd), ngx_cycle->log)) == NULL) {
+      ERR("can't allocate publish multi chanhead data");
+      return NGX_ERROR;
+    }
+    
+    n = parse_multi_id(channel_id, ids);
+    
+    pd->callback = callback;
+    pd->privdata = privdata;
+    pd->n = n;
+    pd->rc = NCHAN_MESSAGE_QUEUED;
+    ngx_memzero(&pd->ch, sizeof(pd->ch));
+    
+    for(i=0; i<n; i++) {
+      if((chead = nchan_memstore_get_chanhead(&ids[i], cf)) == NULL) {
+        ERR("can't get chanhead for id %V", ids[i]);
+        //we probably just ran out of shared memory
+        callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+        return NGX_ERROR;
+      }
+      nchan_store_chanhead_publish_message_generic(chead, msg, msg_in_shm, cf, publish_multi_callback, pd);
+    }
+    return NGX_OK;
+  }
+  else {
+    if(cf->redis.enabled) {
+      assert(!msg_in_shm);
+      nchan_update_stub_status(messages, 1);
+      fill_message_timedata(msg, message_timeout(cf));
+      if(callback == NULL) {
+        callback = empty_callback;
+      }
+      return nchan_store_redis.publish(channel_id, msg, cf, callback, privdata);
+    }
+    
+    if((chead = nchan_memstore_get_chanhead(channel_id, cf)) == NULL) {
+      ERR("can't get chanhead for id %V", channel_id);
+      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
+      return NGX_ERROR;
+    }
+    return nchan_store_chanhead_publish_message_generic(chead, msg, msg_in_shm, cf, callback, privdata);
+  }
+}
+
+ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *chead, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  nchan_channel_t              channel_copy_data;
+  nchan_channel_t             *channel_copy = &channel_copy_data;
+  store_message_t             *shmsg_link;
+  ngx_int_t                    sub_count;
+  nchan_msg_t                 *publish_msg;
+  ngx_int_t                    owner = chead->owner;
+  ngx_int_t                    rc;
+  time_t                       chan_expire, timeout = message_timeout(cf);
+  
+  if(callback == NULL) {
+    callback = empty_callback;
+  }
+
+  assert(msg->id.tagcount == 1);
+  
+  fill_message_timedata(msg, timeout);
+  
+  assert(!cf->redis.enabled);
+  
+  if(memstore_slot() != owner) {
+    if((publish_msg = create_shm_msg(msg)) == NULL) {
+      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+      return NGX_ERROR;
+    }
+    return memstore_ipc_send_publish_message(owner, &chead->id, publish_msg, cf, callback, privdata);
+  }
+  
+  chan_expire = ngx_time() + timeout;
+  chead->channel.expires = chan_expire > msg->expires + 5 ? chan_expire : msg->expires + 5;
+  if( chan_expire > chead->channel.expires) {
+    chead->channel.expires = chan_expire;
+  }
+  sub_count = chead->shared->sub_count;
+  
+  chead->max_messages = cf->max_messages;
+  
+  if(chead->latest_msgid.time > msg->id.time) {
+    if(cf->redis.enabled) {
+      nchan_log_error("A message from the past has just been published. At least one of your servers running Nchan using Redis does not have its time synchronized.");
+    }
+    else {
+      nchan_log_error("A message from the past has just been published. Unless the system time has been adjusted, this should never happen.");
+    }
+  }
+  
+  memstore_chanhead_messages_gc(chead);
+  if(cf->max_messages == 0) {
+    ///no buffer
+    channel_copy=&chead->channel;
+    
+    if((shmsg_link = create_shared_message(msg, msg_in_shm)) == NULL) {
+      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
+      ERR("can't create unbuffered message for channel %V", &chead->id);
+      return NGX_ERROR;
+    }
+    publish_msg= shmsg_link->msg;
+    publish_msg->expires = ngx_time() + NCHAN_NOBUFFER_MSG_EXPIRE_SEC;
+    
+    publish_msg->prev_id.time = 0;
+    publish_msg->prev_id.tag.fixed[0] = 0;
+    publish_msg->prev_id.tagcount = 1;
+    
+    if(chead->latest_msgid.time == publish_msg->id.time) {
+      publish_msg->id.tag.fixed[0] = chead->latest_msgid.tag.fixed[0] + 1;
+    }
+    
+    nchan_reaper_add(&mpt->nobuffer_msg_reaper, shmsg_link);
+    //DBG("publish unbuffer msg %V expire %i ", msgid_to_str(&publish_msg->id), cf->buffer_timeout);
+  }
+  else {
+    
+    if((shmsg_link = create_shared_message(msg, msg_in_shm)) == NULL) {
+      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
+      ERR("can't create shared message for channel %V", &chead->id);
+      return NGX_ERROR;
+    }
+    
+    if(chanhead_push_message(chead, shmsg_link) != NGX_OK) {
+      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
+      ERR("can't enqueue shared message for channel %V", &chead->id);
+      return NGX_ERROR;
+    }
+    
+    ngx_memcpy(channel_copy, &chead->channel, sizeof(*channel_copy));
+    channel_copy->subscribers = sub_count;
+    assert(shmsg_link != NULL);
+    assert(chead->msg_last == shmsg_link);
+    publish_msg = shmsg_link->msg;
+  }
+  
+  nchan_copy_msg_id(&chead->latest_msgid, &publish_msg->id, NULL);
+  if (chead->shared) {
+    channel_copy->last_seen = chead->shared->last_seen;
+  }
+  nchan_copy_msg_id(&channel_copy->last_published_msg_id, &chead->latest_msgid, NULL);
+  
+  //do the actual publishing
+  assert(publish_msg->id.time != publish_msg->prev_id.time || ( publish_msg->id.time == publish_msg->prev_id.time && publish_msg->id.tag.fixed[0] != publish_msg->prev_id.tag.fixed[0]));
+  //DBG("publish %V expire %i", msgid_to_str(&publish_msg->id), cf->buffer_timeout);
+  //DBG("prev: %V", msgid_to_str(&publish_msg->prev_id));
+  /*
+  if(publish_msg->buf && publish_msg->buf->file) {
+    DBG("fd %i", publish_msg->buf->file->fd);
+  }
+  */
+  
+  nchan_update_stub_status(messages, 1);
+  
+  rc = nchan_memstore_publish_generic(chead, publish_msg, 0, NULL);
+  
+  assert(!cf->redis.enabled);
+  callback(rc, channel_copy, privdata);
+
+  return rc;
+}
+
+nchan_store_t  nchan_store_memory = {
+    //init
+    &nchan_store_init_module,
+    &nchan_store_init_worker,
+    &nchan_store_init_postconfig,
+    &nchan_store_create_main_conf,
+    
+    //shutdown
+    &nchan_store_exit_worker,
+    &nchan_store_exit_master,
+    
+    //async-friendly functions with callbacks
+    &nchan_store_async_get_message, //+callback
+    &nchan_store_subscribe, //+callback
+    &nchan_store_publish_message, //+callback
+    
+    &nchan_store_delete_channel, //+callback
+    &nchan_store_find_channel, //+callback
+    
+    //message stuff
+    NULL,
+    NULL,
+    
+};
+
diff --git a/debian/modules/nchan/src/store/memory/recycloc.c b/debian/modules/nchan/src/store/memory/recycloc.c
new file mode 100644
index 0000000..1424f5a
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/recycloc.c
@@ -0,0 +1,47 @@
+#include <nchan_module.h>
+
+#define DBG(...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, __VA_ARGS__)
+#define ERR(...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, __VA_ARGS__)
+
+typedef struct recycloc_trash_s recycloc_trash_t;
+typedef struct recycloc_s recycloc_t;
+
+struct recycloc_llist_s {
+  void             *data;
+  struct recycloc_page_t  *prev;
+  struct recycloc_page_t  *next;
+};
+
+struct recycloc_s {
+  const char       *name;
+  recycloc_llist_s *head;
+  recycloc_llist_s *tail;
+  recycloc_llist_s *prealloc_start;
+  recycloc_llist_s *prealloc_end;
+}
+
+recycloc_t *recycloc_init(const char *name, recycloc_t *ptr, size_t data_size, size_t prealloc_count) {
+  recycloc_t rec = NULL;
+  if(page_size > ngx_pagesize) {
+    ERR("can't create recycloc: page_size %i > ngx_pagesize %i", page_size, ngx_pagesize);
+    return NULL;
+  }
+  if(!(rec = ngx_alloc(sizeof(recycloc_t) + page_size))){
+    ERR("can't alloc enough (%i) memory for recycloc", sizeof(recycloc_t) + page_size);
+    return NULL;
+  }
+  rec->name=name;
+  rec->data_size = data_size
+  return rec;
+  
+  
+}
+
+void * recycloc_alloc(recycloc_t *self);
+
+
+
+recycloc_t *recycloc_destroy(recycloc_t *self) {
+  
+  
+}
\ No newline at end of file
diff --git a/debian/modules/nchan/src/store/memory/store-private.h b/debian/modules/nchan/src/store/memory/store-private.h
new file mode 100644
index 0000000..2221510
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/store-private.h
@@ -0,0 +1,148 @@
+ #ifndef MEMSTORE_PRIVATE_HEADER
+#define MEMSTORE_PRIVATE_HEADER
+#include <util/shmem.h>
+//#define MESTORE_CHANHEAD_RESERVE_DEBUG 0
+#include "uthash.h"
+typedef struct memstore_channel_head_s memstore_channel_head_t;
+typedef struct store_message_s store_message_t;
+
+struct store_message_s {
+  nchan_msg_t               *msg;
+  store_message_t           *prev;
+  store_message_t           *next;
+}; //store_message_t
+
+#include "../spool.h"
+
+typedef struct {
+  ngx_atomic_t                sub_count;
+  ngx_atomic_t                internal_sub_count;
+  ngx_atomic_t                total_message_count;
+  ngx_atomic_t                stored_message_count;
+  ngx_atomic_t                last_seen;
+} store_channel_head_shm_t;
+
+#define MSG_REFCOUNT_INVALID -9000
+
+typedef struct {
+  ngx_str_t            id;
+  subscriber_t        *sub;
+} memstore_multi_t;
+
+struct memstore_channel_head_s {
+  ngx_str_t                       id; //channel id
+  ngx_int_t                       owner;
+  ngx_int_t                       slot;
+  nchan_channel_t                 channel;
+  channel_spooler_t               spooler;
+  chanhead_pubsub_status_t        status;
+  ngx_atomic_int_t                total_sub_count;
+  ngx_int_t                       internal_sub_count;
+  time_t                          last_subscribed_local;
+
+#if MESTORE_CHANHEAD_RESERVE_DEBUG
+  nchan_list_t                    reserved;
+#else
+  uint16_t                        reserved;
+#endif
+  
+  uint8_t                         multi_waiting;
+  uint8_t                         multi_count;
+  memstore_multi_t               *multi;
+  
+  ngx_int_t                       gc_queued_times; // useful for debugging
+  store_channel_head_shm_t       *shared;
+  
+  ngx_uint_t                      max_messages;
+  store_message_t                *msg_first;
+  store_message_t                *msg_last;
+  nchan_msg_id_t                  latest_msgid;
+  nchan_msg_id_t                  oldest_msgid;
+  subscriber_t                   *foreign_owner_ipc_sub; //points to NULL or inaacceessible memory.
+  time_t                          redis_idle_cache_ttl;
+  unsigned                        stub:1;
+  unsigned                        shutting_down:1;
+  unsigned                        meta:1;
+  
+  nchan_loc_conf_t               *cf;
+
+  subscriber_t                   *redis_sub;
+  ngx_int_t                       delta_fakesubs;
+  ngx_event_t                     delta_fakesubs_timer_ev;
+  
+  memstore_channel_head_t        *gc_prev;
+  memstore_channel_head_t        *gc_next;
+  time_t                          gc_start_time;
+  unsigned                        in_gc_queue:1;
+  
+  memstore_channel_head_t        *churn_prev;
+  memstore_channel_head_t        *churn_next;
+  time_t                          churn_start_time;
+  unsigned                        in_churn_queue:1;
+  
+  UT_hash_handle                  hh;
+};
+
+typedef struct nchan_reloading_channel_s nchan_reloading_channel_t;
+
+struct nchan_reloading_channel_s {
+  ngx_str_t                          id;
+  ngx_uint_t                         max_messages;
+  unsigned                           use_redis:1;
+  struct nchan_reloading_channel_s  *prev;
+  struct nchan_reloading_channel_s  *next;
+  nchan_msg_t                       *msgs;
+};
+
+#define NCHAN_INVALID_SLOT           -1
+
+typedef struct {
+  nchan_reloading_channel_t         *rlch;
+  ngx_atomic_int_t                   procslot[NGX_MAX_PROCESSES];
+  ngx_atomic_int_t                   max_workers;
+  ngx_atomic_int_t                   old_max_workers;
+  ngx_atomic_int_t                   total_active_workers;
+  ngx_atomic_int_t                   current_active_workers;
+  ngx_atomic_int_t                   reloading;
+  ngx_atomic_uint_t                  generation;
+  
+  nchan_stub_status_t                stats;
+  
+  ngx_atomic_uint_t                  shmem_pages_used;
+  
+#if NCHAN_MSG_LEAK_DEBUG
+  nchan_msg_t                       *msgdebug_head;
+#endif
+} shm_data_t;
+
+memstore_channel_head_t *nchan_memstore_find_chanhead(ngx_str_t *channel_id);
+memstore_channel_head_t *nchan_memstore_get_chanhead(ngx_str_t *channel_id, nchan_loc_conf_t *cf);
+memstore_channel_head_t *nchan_memstore_get_chanhead_no_ipc_sub(ngx_str_t *channel_id, nchan_loc_conf_t *cf);
+store_message_t *chanhead_find_next_message(memstore_channel_head_t *ch, nchan_msg_id_t *msgid, nchan_msg_status_t *status);
+shmem_t *nchan_memstore_get_shm(void);
+ipc_t *nchan_memstore_get_ipc(void);
+ngx_int_t nchan_memstore_handle_get_message_reply(nchan_msg_t *msg, nchan_msg_status_t findmsg_status, void *d);
+
+ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
+ngx_int_t nchan_memstore_publish_generic(memstore_channel_head_t *head, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line);
+ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *chead, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
+ngx_int_t nchan_memstore_force_delete_channel(ngx_str_t *channel_id, callback_pt callback, void *privdata);
+ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8_t ipc_subscribe_if_needed);
+ngx_int_t memstore_ready_chanhead_unless_stub(memstore_channel_head_t *head);
+void memstore_fakesub_add(memstore_channel_head_t *head, ngx_int_t n);
+ngx_int_t memstore_chanhead_messages_gc(memstore_channel_head_t *ch);
+
+#if FAKESHARD
+void memstore_fakeprocess_push(ngx_int_t slot);
+void memstore_fakeprocess_push_random(void);
+ngx_int_t memstore_fakeprocess_pop(void);
+#endif
+
+ngx_int_t memstore_slot(void);
+int memstore_ready(void);
+ngx_int_t chanhead_gc_add(memstore_channel_head_t *head, const char *);
+ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *chanhead, const char *);
+
+uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
+
+#endif /*MEMSTORE_PRIVATE_HEADER*/
diff --git a/debian/modules/nchan/src/store/memory/store.h b/debian/modules/nchan/src/store/memory/store.h
new file mode 100644
index 0000000..4124512
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/store.h
@@ -0,0 +1,11 @@
+#ifndef NCHAN_MEMSTORE_H
+#define NCHAN_MEMSTORE_H
+
+extern nchan_store_t  nchan_store_memory;
+
+ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl);
+ngx_int_t msg_release(nchan_msg_t *msg, char *lbl);
+
+ngx_int_t memstore_channel_owner(ngx_str_t *id);
+
+#endif //NCHAN_MEMSTORE_H
diff --git a/debian/modules/nginx-http-push/src/store/ngx_rwlock.c b/debian/modules/nchan/src/store/ngx_rwlock.c
similarity index 97%
rename from debian/modules/nginx-http-push/src/store/ngx_rwlock.c
rename to debian/modules/nchan/src/store/ngx_rwlock.c
index c5e2383..0fd04fb 100644
--- a/debian/modules/nginx-http-push/src/store/ngx_rwlock.c
+++ b/debian/modules/nchan/src/store/ngx_rwlock.c
@@ -1,11 +1,11 @@
-#include <ngx_http_push_module.h>
+#include <nchan_module.h>
 #include "ngx_rwlock.h"
 
 #define NGX_RWLOCK_SPIN         2048
 #define NGX_RWLOCK_WRITE        -1
 
-#define DISABLE_RWLOCK 1  //just use a regular mutex for everything
-//#define DEBUG_NGX_RWLOCK 1
+#define DISABLE_RWLOCK 0  //just use a regular mutex for everything
+#define DEBUG_NGX_RWLOCK 1
 
 void ngx_rwlock_init(ngx_rwlock_t *lock) {
   lock->mutex=1;
diff --git a/debian/modules/nginx-http-push/src/store/ngx_rwlock.h b/debian/modules/nchan/src/store/ngx_rwlock.h
similarity index 100%
rename from debian/modules/nginx-http-push/src/store/ngx_rwlock.h
rename to debian/modules/nchan/src/store/ngx_rwlock.h
diff --git a/debian/modules/nchan/src/store/redis/cluster.c b/debian/modules/nchan/src/store/redis/cluster.c
new file mode 100644
index 0000000..9d1322d
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/cluster.c
@@ -0,0 +1,1257 @@
+#include <nchan_module.h>
+#include <assert.h>
+
+#include "redis_nginx_adapter.h"
+
+#include <util/nchan_msgid.h>
+#include <util/nchan_rbtree.h>
+#include <store/store_common.h>
+
+#include "cluster.h"
+
+//#define DBG(fmt, args...) ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "REDISTORE(CLUSTER): " fmt, ##args)
+#define DBG(args...) //
+
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDISTORE(CLUSTER): " fmt, ##args)
+
+
+#define CLUSTER_NOTREADY_RETRY_TIME 1000
+
+static rbtree_seed_t              redis_cluster_node_id_tree;
+static nchan_list_t               redis_cluster_list;
+
+typedef struct {
+  ngx_str_t      line;
+  ngx_str_t      id;         //node id
+  ngx_str_t      address;    //address as known by redis
+  ngx_str_t      flags;
+  
+  ngx_str_t      master_id;  //if slave
+  ngx_str_t      ping_sent;
+  ngx_str_t      pong_recv;
+  ngx_str_t      config_epoch;
+  ngx_str_t      link_state; //connected or disconnected
+  
+  ngx_str_t      slots;
+  
+  unsigned       connected:1;
+  unsigned       master:1;
+  unsigned       failed:1;
+  unsigned       self:1;
+} cluster_nodes_line_t;
+
+static ngx_int_t index_rdata_by_cluster_node_id(rdstore_data_t *rdata, cluster_nodes_line_t *line);
+static ngx_int_t unindex_rdata_by_cluster_node_id(rdstore_data_t *rdata);
+
+static void redis_cluster_node_drop_keyslots(rdstore_data_t *rdata);
+static void rdata_set_cluster_node_flags(rdstore_data_t *rdata, cluster_nodes_line_t *l);
+
+static ngx_int_t associate_rdata_with_cluster(rdstore_data_t *rdata, redis_cluster_t *cluster);
+static ngx_int_t dissociate_rdata_from_cluster(rdstore_data_t *rdata);
+
+static void *redis_data_rbtree_node_cluster_id(void *data) {
+  return &(*(rdstore_data_t **)data)->node.id;
+}
+void redis_cluster_init_postconfig(ngx_conf_t *cf) {
+  rbtree_init(&redis_cluster_node_id_tree, "redis cluster node (by id) data", redis_data_rbtree_node_cluster_id, NULL, NULL);
+  nchan_list_init(&redis_cluster_list, sizeof(redis_cluster_t), "clusters");
+}
+
+void redis_cluster_exit_worker(ngx_cycle_t *cycle) {
+  nchan_list_el_t  *cur;
+  redis_cluster_t  *cluster;
+  for(cur = redis_cluster_list.head; cur != NULL; cur = cur->next) {
+    cluster = nchan_list_data_from_el(cur);
+    nchan_list_empty(&cluster->nodes.master);
+    nchan_list_empty(&cluster->nodes.slave);
+    nchan_list_empty(&cluster->nodes.disconnected);
+    
+    nchan_list_empty(&cluster->retry_commands);
+    
+    rbtree_empty(&cluster->hashslots, NULL, NULL);
+    
+    cluster->status = CLUSTER_NOTREADY;
+    nchan_reaper_stop(&cluster->chanhead_reaper);
+    if(cluster->still_notready_timer.timer_set) {
+      ngx_del_timer(&cluster->still_notready_timer);
+    }
+    if(cluster->pool) {
+      ngx_destroy_pool(cluster->pool);
+    }
+  }
+  nchan_list_empty(&redis_cluster_list);
+  rbtree_empty(&redis_cluster_node_id_tree, NULL, NULL);
+}
+
+static ngx_int_t cluster_set_status(redis_cluster_t *cluster, redis_cluster_status_t status);
+
+static void redis_cluster_info_callback(redisAsyncContext *ac, void *rep, void *privdata);
+static void redis_get_cluster_nodes_callback(redisAsyncContext *ac, void *rep, void *privdata);
+static uint16_t redis_crc16(uint16_t crc, const char *buf, int len);
+
+static void redis_check_if_cluster_ready_handler(ngx_event_t *ev) {
+  rdstore_data_t   *rdata = ev->data;
+  if(rdata->status != DISCONNECTED && rdata->ctx) {
+    redis_get_cluster_info(rdata);
+  }
+  
+  ngx_free(ev);
+}
+
+static void nchan_list_rdata_init(nchan_list_t *list, char *name) {
+  nchan_list_init(list, sizeof(rdstore_data_t *), name);
+}
+
+static ngx_int_t nchan_cluster_nodes_list_rdata_remove(rdstore_data_t *rdata) {
+  if(rdata->node.in_node_list) {
+    assert(rdata->node.node_list_el_data && *rdata->node.node_list_el_data == rdata);
+    nchan_list_remove(rdata->node.in_node_list, rdata->node.node_list_el_data);
+    rdata->node.in_node_list = NULL;
+    rdata->node.node_list_el_data = NULL;
+    return NGX_OK;
+  }
+  return NGX_DECLINED;
+}
+
+#define nchan_list_rdata_from_el(cur) *(rdstore_data_t **)nchan_list_data_from_el(cur)
+
+
+void redis_get_cluster_info(rdstore_data_t *rdata) {
+  redisAsyncCommand(rdata->ctx, redis_cluster_info_callback, NULL, "CLUSTER INFO");
+}
+
+static void redis_cluster_info_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply        *reply = rep;
+  rdstore_data_t    *rdata = ac->data;
+  //uintptr_t          cluster_size = 0;
+  //u_char            *cluster_size_start, *cluster_size_end;
+  if(!redisReplyOk(ac, reply) || reply->type != REDIS_REPLY_STRING) {
+    return;
+  }
+  
+  //what's the cluster size (# of master nodes)
+  /*
+  if((cluster_size_start = ngx_strstrn((u_char *)reply->str, "cluster_size:", 12)) != 0) {
+    cluster_size_start += 13;
+    cluster_size_end = (u_char *)ngx_strchr(cluster_size_start, '\r');
+    cluster_size = ngx_atoi(cluster_size_start, cluster_size_end - cluster_size_start);
+  }
+  */
+  
+  if(ngx_strstrn((u_char *)reply->str, "cluster_state:ok", 15)) {
+    redis_get_cluster_nodes(rdata);
+  }
+  else {
+    nchan_log_warning("Redis cluster not ready, says node %V", rdata->connect_url);
+    ngx_event_t      *evt = ngx_calloc(sizeof(*evt), ngx_cycle->log);
+    nchan_init_timer(evt, redis_check_if_cluster_ready_handler, rdata);
+    //rdt_set_status(rdata, WAITING_FOR_CLUSTER_READY, ac);
+    ngx_add_timer(evt, 1000);
+  }
+}
+
+
+static void *rbtree_cluster_hashslots_id(void *data) {
+  return &((redis_cluster_keyslot_range_node_t *)data)->range;
+}
+static uint32_t rbtree_cluster_hashslots_bucketer(void *vid) {
+  return 1; //no buckets
+}
+static ngx_int_t rbtree_cluster_hashslots_compare(void *v1, void *v2) {
+  redis_cluster_slot_range_t   *r1 = v1;
+  redis_cluster_slot_range_t   *r2 = v2;
+  
+  if(r2->max < r1->min) {
+    //r2 is strictly left of r1
+    return -1;
+  }
+  else if(r2->min > r1->max) {
+    //r2 is structly right of r1
+    return 1;
+  }
+  else {
+    //there's an overlap
+    return 0;
+  }
+}
+
+
+void redis_get_cluster_nodes(rdstore_data_t *rdata) {
+  redisAsyncCommand(rdata->ctx, redis_get_cluster_nodes_callback, NULL, "CLUSTER NODES");
+}
+
+#define nchan_scan_str(str_src, cur, chr, str)\
+  (str)->data = (u_char *)memchr(cur, chr, (str_src)->len - (cur - (str_src)->data));\
+  if(!(str)->data)                            \
+    (str)->data = (str_src)->data + (str_src)->len;\
+  if((str)->data) {                           \
+    (str)->len = (str)->data - cur;           \
+    (str)->data = cur;                        \
+    cur+=(str)->len+1;                        \
+  }                                           \
+  else                                        \
+    goto fail
+
+static rdstore_data_t *find_rdata_by_node_id(ngx_str_t *id) {
+  ngx_rbtree_node_t   *rbtree_node;
+  if((rbtree_node = rbtree_find_node(&redis_cluster_node_id_tree, id)) != NULL) {
+    //do any other nodes already have the cluster set? if so, use that cluster struct.
+    return *(rdstore_data_t **)rbtree_data_from_node(rbtree_node);
+  }
+  return NULL;
+}
+
+static char *redis_scan_cluster_nodes_line(char *line, cluster_nodes_line_t *l) {
+  u_char     *cur = (u_char *)line;
+  u_char     *max = cur;
+  ngx_str_t   rest_line;
+  
+  if(cur[0]=='\0')
+    return NULL;
+  
+  nchan_scan_nearest_chr(&max, &rest_line, 2, '\n', '\0');
+  l->line = rest_line;
+  
+  nchan_scan_until_chr_on_line(&rest_line, &l->id,           ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->address,      ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->flags,        ' ');
+  
+  nchan_scan_until_chr_on_line(&rest_line, &l->master_id,    ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->ping_sent,    ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->pong_recv,    ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->config_epoch, ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->link_state,   ' ');
+  
+  if(nchan_ngx_str_substr((&l->flags), "master")) {
+    l->slots = rest_line;
+    l->master = 1;
+  }
+  else {
+    l->slots.data = NULL;
+    l->slots.len = 0;
+    l->master = 0;
+  }
+  l->failed = nchan_ngx_str_substr((&l->flags), "fail");
+  l->self = nchan_ngx_str_substr((&l->flags), "myself") ? 1 : 0;
+  
+  l->connected = l->link_state.data[0]=='c' ? 1 : 0; //[c]onnected
+  
+  cur = max;
+  if(&cur[-1] > (u_char *)line && cur[-1] == '\0')
+    cur--;
+  return (char *)cur;
+}
+
+static u_char *redis_scan_cluster_nodes_slots_string(ngx_str_t *str, u_char *cur, redis_cluster_slot_range_t *r) {
+  ngx_str_t       slot_min_str, slot_max_str, slot;
+  ngx_int_t       slot_min,     slot_max;
+  u_char         *dash;
+  
+  if(cur == NULL) {
+    cur = str->data;
+  }
+  else if(cur >= str->data + str->len) {
+    return NULL;
+  }
+  if(str->len == 0) {
+    return NULL;
+  }
+  
+  nchan_scan_str(str, cur, ' ', &slot);
+  if(slot.data[0] == '[') {
+    //transitional special slot. ignore it.
+    return redis_scan_cluster_nodes_slots_string(str, cur, r);
+  }
+  
+  dash = (u_char *)memchr(slot.data, '-', slot.len);
+  if(dash) {
+    slot_min_str.data = slot.data;
+    slot_min_str.len = dash - slot.data;
+    
+    slot_max_str.data = dash + 1;
+    slot_max_str.len = slot.len - (slot_max_str.data - slot.data);
+  }
+  else {
+    slot_min_str = slot;
+    slot_max_str = slot;
+  }
+  
+  slot_min = ngx_atoi(slot_min_str.data, slot_min_str.len);
+  slot_max = ngx_atoi(slot_max_str.data, slot_max_str.len);
+  
+  DBG("slots: %i - %i", slot_min, slot_max);
+  
+  r->min = slot_min;
+  r->max = slot_max;
+  
+  return cur;
+  
+fail:
+  return NULL;
+}
+
+static void redis_cluster_discover_and_connect_to_missing_nodes(redisReply *reply, nchan_loc_conf_t *cf, redis_cluster_t *cluster) {
+  char                  *line;
+  redis_connect_params_t rcp;
+  rdstore_data_t        *rdata;
+  cluster_nodes_line_t   l;
+  ngx_str_t             *url;
+  
+  DBG("discover new nodes");
+  line = reply->str;
+  while((line = redis_scan_cluster_nodes_line(line, &l)) != NULL) {
+    if(l.master && !l.failed) {
+      if((rdata = find_rdata_by_node_id(&l.id)) == NULL) {
+        DBG("found a new node %V %V", &l.id, &l.address);
+        url = ngx_palloc(ngx_cycle->pool, sizeof(*url) + l.address.len + 1); //TODO: pallocate from a more fitting pool
+        url->data = (u_char *)&url[1];
+        nchan_strcpy(url, &l.address, 0);
+        url->data[url->len] = '\0';
+        parse_redis_url(url, &rcp);
+        rdata = redis_create_rdata(url, &rcp, &cf->redis, cf);
+        index_rdata_by_cluster_node_id(rdata, &l);
+      }
+      assert(rdata);
+      
+      if(rdata->node.cluster && rdata->node.cluster != cluster) {
+        dissociate_rdata_from_cluster(rdata);
+      }
+      
+      if(!nchan_ngx_str_match(&rdata->node.slots, &l.slots)) {
+        if(rdata->node.cluster) {
+          redis_cluster_node_drop_keyslots(rdata);
+        }
+        
+        unindex_rdata_by_cluster_node_id(rdata);
+        index_rdata_by_cluster_node_id(rdata, &l);
+      }
+      
+      rdata_set_cluster_node_flags(rdata, &l);
+      
+      associate_rdata_with_cluster(rdata, cluster);
+      
+      if(!rdata->node.failed && rdata->status != CONNECTED) {
+        cluster->node_connections_pending++;
+        redis_ensure_connected(rdata);
+      }
+    }
+    else if(!l.master && !l.failed && (rdata = find_rdata_by_node_id(&l.id)) != NULL) {
+      if(rdata->node.master) {
+        //master got downgraded to slave
+        rdata_set_cluster_node_flags(rdata, &l);
+      }
+    }
+  }
+}
+
+static rdstore_data_t *get_any_connected_cluster_node(redis_cluster_t *cluster) {
+  rdstore_data_t     *rdata;
+  nchan_list_el_t    *cur;
+  nchan_list_el_t   *node_head[] = {cluster->nodes.master.head, cluster->nodes.slave.head};
+  int                 i;
+  
+  for(i = 0; i < 2; i++) {
+    for(cur = node_head[i]; cur != NULL; cur = cur->next) {
+      rdata = nchan_list_rdata_from_el(cur);
+      if(rdata->status == CONNECTED) {
+        return rdata;
+      }
+    }
+  }
+  
+  return NULL;
+}
+
+static void cluster_not_ready_timer_handler(ngx_event_t *ev) {
+  redis_cluster_t               *cluster = ev->data;
+  rdstore_data_t                *rdata;
+  
+  if(ngx_exiting || ngx_quit) {
+    return;
+  }
+  
+  if(ev->timedout) {
+    ev->timedout=0;
+    if((rdata = get_any_connected_cluster_node(cluster)) != NULL) {
+      cluster->node_connections_pending = 0; //enough waiting. assume no more pending connections
+      redis_get_cluster_nodes(rdata);
+    }
+    else {
+      nchan_log_warning("No connected Redis cluster nodes. Wait until a connection can be established to at least one...");
+    }
+  }
+  
+  ngx_add_timer(ev, CLUSTER_NOTREADY_RETRY_TIME);
+}
+
+static ngx_int_t index_rdata_by_cluster_node_id(rdstore_data_t *rdata, cluster_nodes_line_t *line) {
+  struct {
+    rdstore_data_t   *rdata;
+    u_char            chr;
+  } *rdata_ptr_and_buf;
+  
+  ngx_rbtree_node_t      *rbtree_node;
+  
+  if(rdata->node.indexed)
+    return NGX_OK;
+  
+  if((rbtree_node = rbtree_create_node(&redis_cluster_node_id_tree, sizeof(*rdata) + line->id.len + line->address.len + line->slots.len)) == NULL) {
+    ERR("can't create rbtree node for redis connection");
+    return NGX_ERROR;
+  }
+  
+  rdata_ptr_and_buf = rbtree_data_from_node(rbtree_node);
+  rdata_ptr_and_buf->rdata = rdata;
+  
+  rdata->node.id.data = &rdata_ptr_and_buf->chr;
+  nchan_strcpy(&rdata->node.id, &line->id, 0);
+  
+  rdata->node.address.data = &rdata_ptr_and_buf->chr + line->id.len;
+  nchan_strcpy(&rdata->node.address, &line->address, 0);
+  
+  rdata->node.slots.data = &rdata_ptr_and_buf->chr + line->id.len + line->address.len;
+  nchan_strcpy(&rdata->node.slots, &line->slots, 0);
+  
+  if(rbtree_insert_node(&redis_cluster_node_id_tree, rbtree_node) != NGX_OK) {
+    ERR("couldn't insert redis cluster node ");
+    rbtree_destroy_node(&redis_cluster_node_id_tree, rbtree_node);
+    return NGX_ERROR;
+  }
+  
+  rdata->node.indexed = 1;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t unindex_rdata_by_cluster_node_id(rdstore_data_t *rdata) {
+  ngx_rbtree_node_t    *node = rbtree_find_node(&redis_cluster_node_id_tree, &rdata->node.id);
+  if(node) {
+    rbtree_remove_node(&redis_cluster_node_id_tree, node);
+    rbtree_destroy_node(&redis_cluster_node_id_tree, node);
+    ngx_memzero(&rdata->node.id, sizeof(rdata->node.id));
+    ngx_memzero(&rdata->node.address, sizeof(rdata->node.address));
+    ngx_memzero(&rdata->node.slots, sizeof(rdata->node.slots));
+    rdata->node.indexed = 0;
+  }
+  return NGX_OK;
+}
+
+
+#define script_nonlocal_key_error "Lua script attempted to access a non local key in a cluster node"
+
+int clusterKeySlotOk(redisAsyncContext *c, void *r) {
+  redisReply *reply = (redisReply *)r;
+  if(reply && reply->type == REDIS_REPLY_ERROR) {
+    char    *script_error_start = "ERR Error running script";
+    char    *command_move_error = "MOVED ";
+    char    *command_ask_error = "ASK ";
+    
+    if((nchan_cstr_startswith(reply->str, script_error_start) && nchan_strstrn(reply->str, script_nonlocal_key_error))
+     || nchan_cstr_startswith(reply->str, command_move_error)
+     || nchan_cstr_startswith(reply->str, command_ask_error)) {
+      rdstore_data_t  *rdata = c->data;
+      
+      rbtree_empty(&rdata->node.cluster->hashslots, NULL, NULL);
+      cluster_set_status(rdata->node.cluster, CLUSTER_NOTREADY);
+      
+      return 0;
+    }
+    else
+      return 1;
+  }
+  return 1;
+}
+
+void *cluster_retry_palloc(redis_cluster_t *cluster, size_t sz) {
+  return ngx_palloc(nchan_list_get_pool(&cluster->retry_commands), sz);
+}
+void  cluster_retry_pfree(redis_cluster_t *cluster, void *ptr) {
+  ngx_pfree(cluster->retry_commands.pool, ptr);
+}
+
+static redis_cluster_retry_t *cluster_create_retry_command(redis_cluster_t *cluster, void (*handler)(rdstore_data_t *, void *), void *pd) {
+  redis_cluster_retry_t *retry;
+  if((retry = nchan_list_append(&cluster->retry_commands)) == NULL)
+    return NULL;
+  retry->retry = handler;
+  retry->data = pd;
+  return retry;
+}
+
+ngx_int_t cluster_add_retry_command_with_chanhead(rdstore_channel_head_t *chanhead, void (*handler)(rdstore_data_t *, void *), void *pd) {
+  redis_cluster_retry_t         *retry;
+  if((retry = cluster_create_retry_command(chanhead->rdt->node.cluster, handler, pd)) == NULL)
+    return NGX_ERROR;
+  
+  retry->type = CLUSTER_RETRY_BY_CHANHEAD;
+  retry->chanhead = chanhead;
+  chanhead->reserved++;
+  
+  return NGX_OK;
+}
+
+ngx_int_t cluster_add_retry_command_with_key(redis_cluster_t *cluster, ngx_str_t *key, void (*handler)(rdstore_data_t *, void *pd), void *pd) {
+  redis_cluster_retry_t         *retry;
+  if((retry = cluster_create_retry_command(cluster, handler, pd)) == NULL)
+    return NGX_ERROR;
+  
+  retry->type = CLUSTER_RETRY_BY_KEY;
+  retry->str.data = cluster_retry_palloc(cluster, key->len);
+  nchan_strcpy(&retry->str, key, 0);
+  
+  return NGX_OK;
+}
+
+ngx_int_t cluster_add_retry_command_with_channel_id(redis_cluster_t *cluster, ngx_str_t *chid, void (*handler)(rdstore_data_t *, void *pd), void *pd) {
+  redis_cluster_retry_t         *retry;
+  if((retry = cluster_create_retry_command(cluster, handler, pd)) == NULL)
+    return NGX_ERROR;
+  
+  retry->type = CLUSTER_RETRY_BY_CHANNEL_ID;
+  retry->str.data = cluster_retry_palloc(cluster, chid->len);
+  nchan_strcpy(&retry->str, chid, 0);
+  
+  return NGX_OK;
+}
+
+ngx_int_t cluster_add_retry_command_with_cstr(redis_cluster_t *cluster, u_char *cstr, void (*handler)(rdstore_data_t *, void *pd), void *pd) {
+  redis_cluster_retry_t         *retry;
+  size_t                         str_sz = strlen((char *)cstr);
+  
+  if((retry = cluster_create_retry_command(cluster, handler, pd)) == NULL)
+    return NGX_ERROR;
+  
+  retry->type = CLUSTER_RETRY_BY_CSTR;
+  retry->cstr = cluster_retry_palloc(cluster, str_sz + 1);
+  strcpy((char *)retry->cstr, (char *)cstr);
+  
+  return NGX_OK;
+}
+
+static void retry_commands_traverse_callback(void *data, void *pd) {
+  redis_cluster_t         *cluster = pd;
+  redis_cluster_retry_t   *retry = data;
+  rdstore_data_t          *rdata = NULL;
+  rdstore_data_t          *any_rdata = get_any_connected_cluster_node(cluster);
+  switch(retry->type) {
+    case CLUSTER_RETRY_BY_CHANHEAD:
+      retry->chanhead->reserved--;
+      rdata = redis_cluster_rdata_from_channel(retry->chanhead);
+      break;
+    
+    case CLUSTER_RETRY_BY_CHANNEL_ID:
+      rdata = redis_cluster_rdata_from_channel_id(any_rdata, &retry->str);
+      break;
+      
+    case CLUSTER_RETRY_BY_KEY:
+      rdata = redis_cluster_rdata_from_key(any_rdata, &retry->str);
+      break;
+      
+    case CLUSTER_RETRY_BY_CSTR:
+      rdata = redis_cluster_rdata_from_cstr(any_rdata, retry->cstr);
+      break;
+    
+  }
+  retry->retry(rdata, retry->data);
+}
+
+static ngx_int_t cluster_run_retry_commands(redis_cluster_t *cluster) {
+  assert(cluster->status = CLUSTER_READY);
+  nchan_list_traverse_and_empty(&cluster->retry_commands, retry_commands_traverse_callback, cluster);
+  return NGX_OK;
+}
+
+static void retry_commands_traverse_abort_callback(void *data, void *pd) {
+  redis_cluster_retry_t   *retry = data;
+  if(retry->type == CLUSTER_RETRY_BY_CHANHEAD) {
+    retry->chanhead->reserved--;
+  }
+  retry->retry(NULL, retry->data);
+}
+
+static ngx_int_t cluster_abort_retry_commands(redis_cluster_t *cluster) {
+  nchan_list_traverse_and_empty(&cluster->retry_commands, retry_commands_traverse_abort_callback, cluster);
+  return NGX_OK;
+}
+
+
+static redis_cluster_t *create_cluster_data(rdstore_data_t *node_rdata, int num_master_nodes, uint32_t homebrew_cluster_id, int configured_unverified_nodes) {
+  redis_cluster_t               *cluster = NULL;
+  size_t                         reaper_name_len = strlen("redis channel (cluster orphans) ()   ") + 60; //whatever
+  char                          *reaper_name;
+  
+  if((cluster = nchan_list_append_sized(&redis_cluster_list, sizeof(*cluster) + reaper_name_len )) == NULL) { //TODO: don't allocate from heap, use a pool or something
+    ERR("can't allocate cluster data");
+    return NULL;
+  }
+  ngx_memzero(cluster, sizeof(*cluster));
+  
+  rbtree_init(&cluster->hashslots, "redis cluster node (by id) data", rbtree_cluster_hashslots_id, rbtree_cluster_hashslots_bucketer, rbtree_cluster_hashslots_compare);
+  
+  cluster->size = num_master_nodes;
+  cluster->uscf = node_rdata->lcf->redis.upstream;
+  cluster->pool = NULL;
+  cluster->homebrew_id = homebrew_cluster_id;
+  nchan_list_rdata_init(&cluster->nodes.master, "connected master nodes");
+  nchan_list_rdata_init(&cluster->nodes.slave, "connected slave nodes");
+  nchan_list_rdata_init(&cluster->nodes.disconnected, "disconnected nodes");
+  //nchan_list_rdata_init(&cluster->failed_nodes, "failed nodes");
+  
+  nchan_list_pool_init(&cluster->retry_commands, sizeof(redis_cluster_retry_t), NGX_DEFAULT_POOL_SIZE, "retry commands");
+  
+  nchan_init_timer(&cluster->still_notready_timer, cluster_not_ready_timer_handler, cluster);
+  ngx_add_timer(&cluster->still_notready_timer, CLUSTER_NOTREADY_RETRY_TIME);
+  
+  cluster->node_connections_pending = configured_unverified_nodes;
+  
+  reaper_name = (char *)&cluster[1];
+  ngx_sprintf((u_char *)reaper_name, "redis channel (cluster orphans) (%p hid=%i)%Z", cluster, cluster->homebrew_id);
+  
+  rdstore_initialize_chanhead_reaper(&cluster->chanhead_reaper, reaper_name);
+  return cluster;
+}
+/*
+static void print_cluster_slots(redis_cluster_t *cluster) {
+  ngx_rbtree_node_t                   *node;
+  redis_cluster_slot_range_t           range = {0, 0};
+  redis_cluster_keyslot_range_node_t  *keyslot_tree_node;
+  
+  while(range.min <= 16383) {
+    if((node = rbtree_find_node(&cluster->hashslots, &range)) == NULL) {
+      DBG("cluster slots range incomplete: can't find slot %i", range.min);
+      return;
+    }
+    keyslot_tree_node = rbtree_data_from_node(node);
+    
+    if(keyslot_tree_node->rdata->status != CONNECTED) {
+      DBG("cluster node for range %i - %i not connected", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
+      return;
+    }
+    
+    DBG("%p %V : range %i - %i", keyslot_tree_node->rdata, keyslot_tree_node->rdata->connect_url, keyslot_tree_node->range.min, keyslot_tree_node->range.max);
+    range.min = keyslot_tree_node->range.max + 1;
+    range.max = range.min;
+  }
+  DBG("cluster range complete");
+}
+*/
+static int check_cluster_slots_range_ok(redis_cluster_t *cluster) {
+  ngx_rbtree_node_t                   *node;
+  redis_cluster_slot_range_t           range = {0, 0};
+  redis_cluster_keyslot_range_node_t  *keyslot_tree_node;
+  
+  while(range.min <= 16383) {
+    if((node = rbtree_find_node(&cluster->hashslots, &range)) == NULL) {
+      DBG("cluster slots range incomplete: can't find slot %i", range.min);
+      return 0;
+    }
+    keyslot_tree_node = rbtree_data_from_node(node);
+    
+    if(keyslot_tree_node->rdata->status != CONNECTED) {
+      DBG("cluster node for range %i - %i not connected", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
+      return 0;
+    }
+    
+    range.min = keyslot_tree_node->range.max + 1;
+    range.max = range.min;
+  }
+  DBG("cluster range complete");
+  //print_cluster_slots(cluster);
+  return 1;
+}
+
+static rdstore_data_t  **nchan_list_rdata_append(nchan_list_t *list, rdstore_data_t *rdata) {
+  rdstore_data_t   **ptr_rdata;
+  assert(rdata);
+  ptr_rdata = nchan_list_append(list);
+  *ptr_rdata = rdata;
+  return ptr_rdata;
+}
+
+static ngx_int_t update_rdata_cluster_node_lists(rdstore_data_t *rdata) {
+  nchan_list_t      *list;
+  rdstore_data_t   **ptr_rdata;
+  redis_cluster_t   *cluster = rdata->node.cluster;
+  
+  if(!cluster) {
+    nchan_cluster_nodes_list_rdata_remove(rdata);
+    return NGX_DECLINED;
+  }
+  
+  if(rdata->status != CONNECTED)
+    list = &cluster->nodes.disconnected;
+  else if(rdata->node.master)
+    list = &cluster->nodes.master;
+  else
+    list = &cluster->nodes.slave;
+  
+  if(rdata->node.in_node_list != list) {
+    nchan_cluster_nodes_list_rdata_remove(rdata);
+    
+    assert(rdata->node.in_node_list == NULL);
+    assert(rdata->node.node_list_el_data == NULL);
+    
+    ptr_rdata = nchan_list_rdata_append(list, rdata);
+    
+    rdata->node.in_node_list = list;
+    rdata->node.node_list_el_data = ptr_rdata;
+  }
+  return NGX_OK;
+}
+
+
+static ngx_int_t associate_rdata_with_cluster(rdstore_data_t *rdata, redis_cluster_t *cluster) {
+  u_char                              *cur;
+  redis_cluster_slot_range_t           range;
+  ngx_rbtree_node_t                   *rbtree_node;
+  redis_cluster_keyslot_range_node_t  *keyslot_tree_node;
+  
+  if(!rdata->node.cluster) {
+    rdata->node.cluster = cluster;
+  }
+  
+  update_rdata_cluster_node_lists(rdata);
+  
+  if(rdata->node.master) {
+    //hash slots
+    cur = NULL;
+    while((cur = redis_scan_cluster_nodes_slots_string(&rdata->node.slots, cur, &range)) != NULL) {
+      
+      rbtree_node = rbtree_find_node(&cluster->hashslots, &range);
+      if(rbtree_node) {
+        keyslot_tree_node = rbtree_data_from_node(rbtree_node);
+        if(keyslot_tree_node->rdata == rdata && keyslot_tree_node->range.min == range.min && keyslot_tree_node->range.max == range.max) {
+          DBG("cluster node keyslot range already exists. no problem here.");
+        }
+        else {
+          DBG("this slot range is a little different. get rid of the old one");
+          rbtree_remove_node(&cluster->hashslots, rbtree_node);
+          rbtree_destroy_node(&cluster->hashslots, rbtree_node);
+          rbtree_node = NULL;
+        }
+      }
+      
+      if(rbtree_node == NULL) {
+        rbtree_node = rbtree_create_node(&cluster->hashslots, sizeof(*keyslot_tree_node));
+        keyslot_tree_node = rbtree_data_from_node(rbtree_node);
+        keyslot_tree_node->range = range;
+        keyslot_tree_node->rdata = rdata;
+        
+        if(rbtree_insert_node(&cluster->hashslots, rbtree_node) != NGX_OK) {
+          ERR("couldn't insert redis cluster hashslots node ");
+          rbtree_destroy_node(&cluster->hashslots, rbtree_node);
+          assert(0);
+        }
+      }
+    }
+  }
+  
+  if(check_cluster_slots_range_ok(cluster)) {
+    cluster_set_status(cluster, CLUSTER_READY);
+  }
+  return NGX_OK;
+}
+
+static void rdata_set_cluster_node_flags(rdstore_data_t *rdata, cluster_nodes_line_t *l) {
+  if(l->failed != rdata->node.failed) {
+    rdata->node.failed = l->failed;
+  }
+  
+  if(l->master != rdata->node.master) {
+    if(rdata->node.cluster && rdata->node.master)
+      redis_cluster_node_drop_keyslots(rdata);
+    
+    rdata->node.master = l->master;
+  }
+  
+  update_rdata_cluster_node_lists(rdata);
+}
+
+static void redis_get_cluster_nodes_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                    *reply = rep;
+  rdstore_data_t                *rdata = ac->data;
+  rdstore_data_t                *found_rdata = NULL, *unassoc_rdata, *my_rdata = NULL; //cluster tree node
+  redis_cluster_t               *cluster = NULL;
+  ngx_uint_t                     num_master_nodes = 0;
+  uint32_t                       homebrew_cluster_id = 0;
+  int                            configured_unverified_nodes = 0;
+  
+  nchan_list_t                   unassociated_nodes;
+  nchan_list_el_t               *cur;
+  nchan_list_rdata_init(&unassociated_nodes, "unassociated nodes");
+  
+  
+  nchan_loc_conf_t              *cf = rdata->lcf;
+  
+  DBG("redis_get_cluster_nodes_callback for %p", rdata);
+  
+  if(cf->redis.upstream) {
+    configured_unverified_nodes = cf->redis.upstream->servers->nelts;
+  }
+  else {
+    assert(0);
+  }
+  
+  if(!redisReplyOk(ac, reply) || reply->type != REDIS_REPLY_STRING) {
+    return;
+  }
+  
+  char                 *line;
+  cluster_nodes_line_t  l;
+  
+  line = reply->str;
+  DBG("\n%s", reply->str);
+  while((line = redis_scan_cluster_nodes_line(line, &l)) != NULL) {
+    found_rdata = NULL;
+    
+    if(l.master && !l.failed) {
+      num_master_nodes++;
+      homebrew_cluster_id += redis_crc16(0, (const char*)l.id.data, l.id.len);
+    }
+      
+    if((found_rdata = find_rdata_by_node_id(&l.id)) == NULL) {
+      redis_connect_params_t rcp;
+      parse_redis_url(&l.address, &rcp);
+      found_rdata = find_rdata_by_connect_params(&rcp);
+    }
+    
+    if(found_rdata) {
+      rdata_set_cluster_node_flags(found_rdata, &l);
+      index_rdata_by_cluster_node_id(found_rdata, &l);
+      if(found_rdata->node.cluster) {
+        if(cluster)
+          assert(cluster == found_rdata->node.cluster);
+        else
+          cluster = found_rdata->node.cluster;
+      }
+      else {
+        nchan_list_rdata_append(&unassociated_nodes, found_rdata);
+      }
+      if(cluster)
+        associate_rdata_with_cluster(found_rdata, cluster);
+    }
+    
+    if(l.self) {
+      //myself
+      rdata_set_cluster_node_flags(rdata, &l);
+      index_rdata_by_cluster_node_id(rdata, &l);
+      if(found_rdata) {
+        assert(found_rdata == rdata);
+        DBG("%p %V %V already added to redis_cluster_node_id_tree... weird... how?...", rdata, &rdata->node.id, &rdata->node.id);
+      }
+      
+      my_rdata = rdata;
+    }
+  }
+  
+  if(my_rdata) {
+    if(!cluster) {
+      cluster = create_cluster_data(my_rdata, num_master_nodes, homebrew_cluster_id, configured_unverified_nodes);
+    }
+    if(cluster->homebrew_id != homebrew_cluster_id && cluster->status != CLUSTER_READY) {
+      DBG("Cluster homebrew_id changed maybe");
+      cluster->homebrew_id = homebrew_cluster_id;
+    }
+    
+    associate_rdata_with_cluster(my_rdata, cluster);
+    
+    if(cluster->node_connections_pending > 0) {
+      cluster->node_connections_pending --;
+    }
+    if(cluster->node_connections_pending == 0 && cluster->nodes.master.n < cluster->size) {
+      redis_cluster_discover_and_connect_to_missing_nodes(reply, cf, cluster);
+    }
+    
+  }
+  else {
+    DBG("my_rdata was blank... eh?...");
+  }
+  
+  if(cluster) {
+    for(cur = unassociated_nodes.head; cur != NULL; cur = cur->next) {
+      unassoc_rdata = nchan_list_rdata_from_el(cur);
+      associate_rdata_with_cluster(unassoc_rdata, cluster);
+    }
+  }
+  nchan_list_empty(&unassociated_nodes);
+  
+}
+
+static ngx_int_t cluster_set_status(redis_cluster_t *cluster, redis_cluster_status_t status) {
+  redis_cluster_status_t     prev_status = cluster->status;
+  rdstore_channel_head_t    *ch_cur;
+  
+  
+  if(status == CLUSTER_READY && prev_status != CLUSTER_READY) {
+    assert(check_cluster_slots_range_ok(cluster));
+    while((ch_cur = cluster->orphan_channels_head) != NULL) {
+      redis_chanhead_gc_withdraw(ch_cur);
+      
+      ensure_chanhead_pubsub_subscribed(ch_cur);
+      
+      cluster->orphan_channels_head = ch_cur->rd_next;
+      if(cluster->orphan_channels_head) {
+        cluster->orphan_channels_head->rd_prev = NULL;
+      }
+      
+      ch_cur->rd_prev = NULL;
+      ch_cur->rd_next = NULL;
+      assert(redis_cluster_associate_chanhead_with_rdata(ch_cur) == NGX_OK);
+      redis_chanhead_catch_up_after_reconnect(ch_cur);
+    }
+    
+    //stop any still running rdata reconnect timers
+    rdstore_data_t    *rcur;
+    nchan_list_el_t   *cur;
+    nchan_list_t     **list;
+    nchan_list_t      *lists[] = {&cluster->nodes.master, &cluster->nodes.slave, &cluster->nodes.disconnected, NULL};
+    for(list = lists; *list != NULL; list++) {
+      for(cur = (*list)->head; cur != NULL; cur = cur->next) {
+        rcur = nchan_list_rdata_from_el(cur);
+        if(rcur->reconnect_timer.timer_set) {
+          ngx_del_timer(&rcur->reconnect_timer);
+        }
+      }
+    }
+    
+    if(cluster->still_notready_timer.timer_set) {
+      ngx_del_timer(&cluster->still_notready_timer);
+    }
+    
+    cluster_run_retry_commands(cluster);
+    
+    nchan_log_notice("Redis cluster ready.");
+    
+  }
+  else if(status != CLUSTER_READY && prev_status == CLUSTER_READY) {
+    for(ch_cur = cluster->orphan_channels_head; ch_cur != NULL; ch_cur = ch_cur->rd_next) {
+      if(ch_cur->in_gc_reaper) {
+        redis_chanhead_gc_withdraw(ch_cur);
+        redis_chanhead_gc_add_to_reaper(&cluster->chanhead_reaper, ch_cur, NCHAN_CHANHEAD_CLUSTER_ORPHAN_EXPIRE_SEC, "redis connection to cluster node gone"); //automatically added to cluster's gc
+      }
+    }
+    
+    if(!cluster->still_notready_timer.timer_set) {
+      ngx_add_timer(&cluster->still_notready_timer, CLUSTER_NOTREADY_RETRY_TIME);
+    }
+    
+  }
+  
+  else if(status == CLUSTER_FAILED && prev_status != CLUSTER_FAILED) {
+    cluster_abort_retry_commands(cluster);
+  }
+  
+  cluster->status = status;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t rdata_make_chanheads_cluster_orphans(rdstore_data_t *rdata) {
+  redis_cluster_t            *cluster = rdata->node.cluster;
+  if(rdata->channels_head) {
+    rdstore_channel_head_t  *cur, *last = NULL;
+    for(cur = rdata->channels_head; cur != NULL; cur = cur->rd_next){
+      last = cur;
+      redis_chanhead_gc_withdraw(cur);
+      cur->status = NOTREADY;
+      cur->pubsub_status = UNSUBBED;
+      cur->cluster.node_rdt = NULL;
+    }
+    if(last) {
+      last->rd_next = cluster->orphan_channels_head;
+      if(cluster->orphan_channels_head)
+        cluster->orphan_channels_head->rd_prev = last;
+      cluster->orphan_channels_head = last;
+    }
+    rdata->channels_head = NULL;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t redis_cluster_node_change_status(rdstore_data_t *rdata, redis_connection_status_t status) {
+  redis_connection_status_t   prev_status = rdata->status;
+  redis_cluster_t            *cluster = rdata->node.cluster;
+  
+  if(status == CONNECTED && prev_status != CONNECTED) {
+    cluster->nodes_connected++;
+  }
+  else if(status != CONNECTED && prev_status == CONNECTED) {
+    
+    cluster->nodes_connected--;
+    //add to orphan chanheads list
+    
+    //wait to reconnect maybe?
+    rdata_make_chanheads_cluster_orphans(rdata);
+    
+    cluster_set_status(cluster, CLUSTER_NOTREADY);
+  }
+
+  return NGX_OK; 
+}
+
+typedef struct {
+  rdstore_data_t      *rdata;
+  ngx_rbtree_node_t   *found;
+} rdata_node_finder_data_t;
+
+rbtree_walk_direction_t rdata_node_finder(rbtree_seed_t *seed, void *data, void *privdata) {
+  redis_cluster_keyslot_range_node_t *d = data;
+  rdata_node_finder_data_t           *pd = privdata;
+  
+  if(d->rdata == pd->rdata) {
+    pd->found = rbtree_node_from_data(d);
+    return RBTREE_WALK_STOP;
+  }
+  else {
+    return RBTREE_WALK_LEFT_RIGHT;
+  }
+}
+
+static void redis_cluster_node_drop_keyslots(rdstore_data_t *rdata) {
+  rdata_node_finder_data_t   finder_data;
+  redis_cluster_t           *cluster = rdata->node.cluster;
+  
+  //remove from hashslots. this is a little tricky, we walk the hashslots tree 
+  // until we can's find this rdata
+  
+  finder_data.rdata = rdata;
+  while(1) {
+    finder_data.found = NULL;
+    rbtree_conditional_walk(&cluster->hashslots, rdata_node_finder, &finder_data);
+    if(finder_data.found != NULL) {
+      DBG("destroyed node %p", finder_data.found);
+      rbtree_remove_node(&cluster->hashslots, finder_data.found);
+      rbtree_destroy_node(&cluster->hashslots, finder_data.found);
+    }
+    else {
+      break;
+    }
+  }
+  
+  rdata_make_chanheads_cluster_orphans(rdata);
+}
+
+
+static ngx_int_t dissociate_rdata_from_cluster(rdstore_data_t *rdata) {
+  assert(rdata->node.cluster != NULL);
+  if((rdata->node.failed || !rdata->node.master) && rdata->reconnect_timer.timer_set) {
+    ngx_del_timer(&rdata->reconnect_timer);
+  }
+  
+  rdata_make_chanheads_cluster_orphans(rdata);
+  
+  redis_cluster_node_drop_keyslots(rdata);
+  
+  rdata->node.cluster = NULL;
+  update_rdata_cluster_node_lists(rdata);
+  return NGX_OK;
+}
+
+
+
+static uint16_t redis_crc16(uint16_t crc, const char *buf, int len);
+static rdstore_data_t *redis_cluster_rdata_from_keyslot(rdstore_data_t *rdata, uint16_t slot);
+
+
+ngx_int_t redis_cluster_associate_chanhead_with_rdata(rdstore_channel_head_t *ch) {
+  if(redis_cluster_rdata_from_channel(ch)) {
+    return NGX_OK;
+  }
+  else {
+    return NGX_ERROR;
+  }
+}
+
+rdstore_data_t *redis_cluster_rdata_from_channel(rdstore_channel_head_t *ch) {
+  rdstore_data_t  *rdata;
+  if(!ch->cluster.enabled) {
+    return ch->rdt;
+  }
+  
+  if(ch->cluster.node_rdt) {
+    return ch->cluster.node_rdt;
+  }
+  
+  rdata = redis_cluster_rdata_from_channel_id(ch->rdt, &ch->id);
+  
+  assert(ch->rd_prev == NULL);
+  assert(ch->rd_next == NULL);
+  
+  if(rdata) {
+    redis_associate_chanhead_with_rdata(ch, rdata);
+  }
+  else {
+    redis_cluster_t   *cluster = ch->rdt->node.cluster;
+    ch->rd_prev = NULL;
+    
+    if(cluster->orphan_channels_head) {
+      cluster->orphan_channels_head = ch;
+    }
+    cluster->orphan_channels_head = ch;
+  }
+  
+  ch->cluster.node_rdt = rdata;
+  return rdata;
+  
+}
+
+rdstore_data_t *redis_cluster_rdata_from_channel_id(rdstore_data_t *rdata, ngx_str_t *str){
+  if(!rdata->node.cluster)
+    return rdata;
+  
+  static uint16_t  prefix_crc = 0;
+  if(prefix_crc == 0) {
+    prefix_crc = redis_crc16(0, "channel:", 8);
+  }
+  uint16_t   slot = redis_crc16(prefix_crc, (const char *)str->data, str->len) % 16384;
+  //DBG("channel id %V (key {channel:%V}) slot %i", str, str, slot);
+  
+  return redis_cluster_rdata_from_keyslot(rdata, slot);
+}
+
+rdstore_data_t *redis_cluster_rdata_from_key(rdstore_data_t *rdata, ngx_str_t *key) {
+  char        *start, *end;
+  ngx_str_t    hashable;
+  
+  if(((start = memchr(key->data, '{', key->len))) != NULL) {
+    start++;
+    end = memchr(start, '}', key->len - ((u_char *)start - key->data));
+    if(end && end - start > 1) {
+      hashable.data = (u_char *)start;
+      hashable.len = (end - start);
+    }
+    else {
+      hashable = *key;
+      // not quite right -- need to ignore zero-length {} and scan to the next {
+      // but it's good enough for the keys we're using
+    }
+    return redis_cluster_rdata(rdata, &hashable);
+  }
+  return redis_cluster_rdata(rdata, key);
+}
+
+rdstore_data_t *redis_cluster_rdata(rdstore_data_t *rdata, ngx_str_t *str) {
+  if(!rdata->node.cluster)
+    return rdata;
+  
+  uint16_t   slot = redis_crc16(0, (const char *)str->data, str->len) % 16384;
+  DBG("str %V slot %i", str, slot);
+  
+  return redis_cluster_rdata_from_keyslot(rdata, slot);
+}
+
+rdstore_data_t *redis_cluster_rdata_from_cstr(rdstore_data_t *rdata, u_char *str) {
+  if(!rdata->node.cluster)
+    return rdata;
+  
+  uint16_t   slot = redis_crc16(0, (const char *)str, strlen((char *)str)) % 16384;
+  DBG("cstr %s slot %i", str, slot);
+  
+  return redis_cluster_rdata_from_keyslot(rdata, slot);
+}
+
+static rdstore_data_t *redis_cluster_rdata_from_keyslot(rdstore_data_t *rdata, uint16_t slot) {
+  
+
+  redis_cluster_slot_range_t           range = {slot, slot};
+  ngx_rbtree_node_t                   *rbtree_node;
+  redis_cluster_keyslot_range_node_t  *keyslot_tree_node;
+  
+  if((rbtree_node = rbtree_find_node(&rdata->node.cluster->hashslots, &range)) == NULL) {
+    DBG("hashslot not found. what do?!");
+    return NULL;
+  }
+  
+  keyslot_tree_node = rbtree_data_from_node(rbtree_node);
+  assert(keyslot_tree_node->range.min <= slot && keyslot_tree_node->range.max >= slot);
+  return keyslot_tree_node->rdata;
+}
+
+
+
+
+
+/*
+ * Copyright 2001-2010 Georges Menie (www.menie.org)
+ * Copyright 2010 Salvatore Sanfilippo (adapted to Redis coding style)
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the University of California, Berkeley nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* CRC16 implementation according to CCITT standards.
+ *
+ * Note by @antirez: this is actually the XMODEM CRC 16 algorithm, using the
+ * following parameters:
+ *
+ * Name                       : "XMODEM", also known as "ZMODEM", "CRC-16/ACORN"
+ * Width                      : 16 bit
+ * Poly                       : 1021 (That is actually x^16 + x^12 + x^5 + 1)
+ * Initialization             : 0000
+ * Reflect Input byte         : False
+ * Reflect Output CRC         : False
+ * Xor constant to output CRC : 0000
+ * Output for "123456789"     : 31C3
+ */
+
+static const uint16_t crc16tab[256]= {
+    0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
+    0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
+    0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
+    0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
+    0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
+    0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
+    0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
+    0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
+    0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
+    0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
+    0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
+    0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
+    0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
+    0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
+    0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
+    0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
+    0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
+    0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
+    0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
+    0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
+    0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
+    0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
+    0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
+    0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
+    0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
+    0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
+    0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
+    0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
+    0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
+    0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
+    0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
+    0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0
+};
+
+static uint16_t redis_crc16(uint16_t crc, const char *buf, int len) {
+    int counter;
+    for (counter = 0; counter < len; counter++)
+            crc = (crc<<8) ^ crc16tab[((crc>>8) ^ *buf++)&0x00FF];
+    return crc;
+}
diff --git a/debian/modules/nchan/src/store/redis/cluster.h b/debian/modules/nchan/src/store/redis/cluster.h
new file mode 100644
index 0000000..b09b70d
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/cluster.h
@@ -0,0 +1,30 @@
+#ifndef NCHAN_REDIS_CLUSTER_H
+#define NCHAN_REDIS_CLUSTER_H
+
+#include "store-private.h"
+#include "store.h"
+
+void redis_cluster_init_postconfig(ngx_conf_t *cf);
+void redis_cluster_exit_worker(ngx_cycle_t *cycle);
+
+void redis_get_cluster_info(rdstore_data_t *rdata);
+void redis_get_cluster_nodes(rdstore_data_t *rdata);
+
+rdstore_data_t *redis_cluster_rdata(rdstore_data_t *rdata, ngx_str_t *str);
+rdstore_data_t *redis_cluster_rdata_from_cstr(rdstore_data_t *rdata, u_char *str);
+rdstore_data_t *redis_cluster_rdata_from_key(rdstore_data_t *rdata, ngx_str_t *key);
+rdstore_data_t *redis_cluster_rdata_from_channel_id(rdstore_data_t *rdata, ngx_str_t *str);
+rdstore_data_t *redis_cluster_rdata_from_channel(rdstore_channel_head_t *ch);
+ngx_int_t redis_cluster_associate_chanhead_with_rdata(rdstore_channel_head_t *ch);
+
+void *cluster_retry_palloc(redis_cluster_t *, size_t);
+void  cluster_retry_pfree(redis_cluster_t *, void *);
+ngx_int_t cluster_add_retry_command_with_chanhead(rdstore_channel_head_t *, void (*)(rdstore_data_t *, void *), void *);
+ngx_int_t cluster_add_retry_command_with_key(redis_cluster_t *, ngx_str_t *, void (*)(rdstore_data_t *, void *pd), void *pd);
+ngx_int_t cluster_add_retry_command_with_channel_id(redis_cluster_t *, ngx_str_t *, void (*)(rdstore_data_t *, void *pd), void *pd);
+ngx_int_t cluster_add_retry_command_with_cstr(redis_cluster_t *, u_char *, void (*)(rdstore_data_t *, void *pd), void *pd);
+
+int clusterKeySlotOk(redisAsyncContext *c, void *r);
+
+ngx_int_t redis_cluster_node_change_status(rdstore_data_t *rdata, redis_connection_status_t status);
+#endif //NCHAN_REDIS_CLUSTER_H
diff --git a/debian/modules/nchan/src/store/redis/cmp.c b/debian/modules/nchan/src/store/redis/cmp.c
new file mode 100644
index 0000000..4a7fe06
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/cmp.c
@@ -0,0 +1,2835 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2015 Charles Gunyon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "cmp.h"
+
+static const uint32_t version = 14;
+static const uint32_t mp_version = 5;
+
+enum {
+  POSITIVE_FIXNUM_MARKER = 0x00,
+  FIXMAP_MARKER          = 0x80,
+  FIXARRAY_MARKER        = 0x90,
+  FIXSTR_MARKER          = 0xA0,
+  NIL_MARKER             = 0xC0,
+  FALSE_MARKER           = 0xC2,
+  TRUE_MARKER            = 0xC3,
+  BIN8_MARKER            = 0xC4,
+  BIN16_MARKER           = 0xC5,
+  BIN32_MARKER           = 0xC6,
+  EXT8_MARKER            = 0xC7,
+  EXT16_MARKER           = 0xC8,
+  EXT32_MARKER           = 0xC9,
+  FLOAT_MARKER           = 0xCA,
+  DOUBLE_MARKER          = 0xCB,
+  U8_MARKER              = 0xCC,
+  U16_MARKER             = 0xCD,
+  U32_MARKER             = 0xCE,
+  U64_MARKER             = 0xCF,
+  S8_MARKER              = 0xD0,
+  S16_MARKER             = 0xD1,
+  S32_MARKER             = 0xD2,
+  S64_MARKER             = 0xD3,
+  FIXEXT1_MARKER         = 0xD4,
+  FIXEXT2_MARKER         = 0xD5,
+  FIXEXT4_MARKER         = 0xD6,
+  FIXEXT8_MARKER         = 0xD7,
+  FIXEXT16_MARKER        = 0xD8,
+  STR8_MARKER            = 0xD9,
+  STR16_MARKER           = 0xDA,
+  STR32_MARKER           = 0xDB,
+  ARRAY16_MARKER         = 0xDC,
+  ARRAY32_MARKER         = 0xDD,
+  MAP16_MARKER           = 0xDE,
+  MAP32_MARKER           = 0xDF,
+  NEGATIVE_FIXNUM_MARKER = 0xE0
+};
+
+enum {
+  FIXARRAY_SIZE        = 0xF,
+  FIXMAP_SIZE          = 0xF,
+  FIXSTR_SIZE          = 0x1F
+};
+
+enum {
+  ERROR_NONE,
+  STR_DATA_LENGTH_TOO_LONG_ERROR,
+  BIN_DATA_LENGTH_TOO_LONG_ERROR,
+  ARRAY_LENGTH_TOO_LONG_ERROR,
+  MAP_LENGTH_TOO_LONG_ERROR,
+  INPUT_VALUE_TOO_LARGE_ERROR,
+  FIXED_VALUE_WRITING_ERROR,
+  TYPE_MARKER_READING_ERROR,
+  TYPE_MARKER_WRITING_ERROR,
+  DATA_READING_ERROR,
+  DATA_WRITING_ERROR,
+  EXT_TYPE_READING_ERROR,
+  EXT_TYPE_WRITING_ERROR,
+  INVALID_TYPE_ERROR,
+  LENGTH_READING_ERROR,
+  LENGTH_WRITING_ERROR,
+  ERROR_MAX
+};
+
+const char *cmp_error_messages[ERROR_MAX + 1] = {
+  "No Error",
+  "Specified string data length is too long (> 0xFFFFFFFF)",
+  "Specified binary data length is too long (> 0xFFFFFFFF)",
+  "Specified array length is too long (> 0xFFFFFFFF)",
+  "Specified map length is too long (> 0xFFFFFFFF)",
+  "Input value is too large",
+  "Error writing fixed value",
+  "Error reading type marker",
+  "Error writing type marker",
+  "Error reading packed data",
+  "Error writing packed data",
+  "Error reading ext type",
+  "Error writing ext type",
+  "Invalid type",
+  "Error reading size",
+  "Error writing size",
+  "Max Error"
+};
+
+static const int32_t _i = 1;
+#define is_bigendian() ((*(char *)&_i) == 0)
+
+static uint16_t be16(uint16_t x) {
+  char *b = (char *)&x;
+
+  if (!is_bigendian()) {
+    char swap = 0;
+
+    swap = b[0];
+    b[0] = b[1];
+    b[1] = swap;
+  }
+
+  return x;
+}
+
+static uint32_t be32(uint32_t x) {
+  char *b = (char *)&x;
+
+  if (!is_bigendian()) {
+    char swap = 0;
+
+    swap = b[0];
+    b[0] = b[3];
+    b[3] = swap;
+
+    swap = b[1];
+    b[1] = b[2];
+    b[2] = swap;
+  }
+
+  return x;
+}
+
+static uint64_t be64(uint64_t x) {
+  char *b = (char *)&x;
+
+  if (!is_bigendian()) {
+    char swap = 0;
+
+    swap = b[0];
+    b[0] = b[7];
+    b[7] = swap;
+
+    swap = b[1];
+    b[1] = b[6];
+    b[6] = swap;
+
+    swap = b[2];
+    b[2] = b[5];
+    b[5] = swap;
+
+    swap = b[3];
+    b[3] = b[4];
+    b[4] = swap;
+  }
+
+  return x;
+}
+
+static float befloat(float x) {
+  char *b = (char *)&x;
+
+  if (!is_bigendian()) {
+    char swap = 0;
+
+    swap = b[0];
+    b[0] = b[3];
+    b[3] = swap;
+
+    swap = b[1];
+    b[1] = b[2];
+    b[2] = swap;
+  }
+
+  return x;
+}
+
+static double bedouble(double x) {
+  char *b = (char *)&x;
+
+  if (!is_bigendian()) {
+    char swap = 0;
+
+    swap = b[0];
+    b[0] = b[7];
+    b[7] = swap;
+
+    swap = b[1];
+    b[1] = b[6];
+    b[6] = swap;
+
+    swap = b[2];
+    b[2] = b[5];
+    b[5] = swap;
+
+    swap = b[3];
+    b[3] = b[4];
+    b[4] = swap;
+  }
+
+  return x;
+}
+
+static bool read_byte(cmp_ctx_t *ctx, uint8_t *x) {
+  return ctx->read(ctx, x, sizeof(uint8_t));
+}
+
+static bool write_byte(cmp_ctx_t *ctx, uint8_t x) {
+  return (ctx->write(ctx, &x, sizeof(uint8_t)) == (sizeof(uint8_t)));
+}
+
+static bool read_type_marker(cmp_ctx_t *ctx, uint8_t *marker) {
+  if (read_byte(ctx, marker))
+    return true;
+
+  ctx->error = TYPE_MARKER_READING_ERROR;
+  return false;
+}
+
+static bool write_type_marker(cmp_ctx_t *ctx, uint8_t marker) {
+  if (write_byte(ctx, marker))
+    return true;
+
+  ctx->error = TYPE_MARKER_WRITING_ERROR;
+  return false;
+}
+
+static bool write_fixed_value(cmp_ctx_t *ctx, uint8_t value) {
+  if (write_byte(ctx, value))
+    return true;
+
+  ctx->error = FIXED_VALUE_WRITING_ERROR;
+  return false;
+}
+
+void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read, cmp_writer write) {
+  ctx->error = ERROR_NONE;
+  ctx->buf = buf;
+  ctx->read = read;
+  ctx->write = write;
+}
+
+uint32_t cmp_version(void) {
+  return version;
+}
+
+uint32_t cmp_mp_version(void) {
+  return mp_version;
+}
+
+const char* cmp_strerror(cmp_ctx_t *ctx) {
+  if (ctx->error > ERROR_NONE && ctx->error < ERROR_MAX)
+    return cmp_error_messages[ctx->error];
+
+  return "";
+}
+
+bool cmp_write_pfix(cmp_ctx_t *ctx, uint8_t c) {
+  if (c <= 0x7F)
+    return write_fixed_value(ctx, c);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_nfix(cmp_ctx_t *ctx, int8_t c) {
+  if (c >= -32 && c <= -1)
+    return write_fixed_value(ctx, c);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_sfix(cmp_ctx_t *ctx, int8_t c) {
+  if (c >= 0)
+    return cmp_write_pfix(ctx, c);
+  if (c >= -32 && c <= -1)
+    return cmp_write_nfix(ctx, c);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_s8(cmp_ctx_t *ctx, int8_t c) {
+  if (!write_type_marker(ctx, S8_MARKER))
+    return false;
+
+  return ctx->write(ctx, &c, sizeof(int8_t));
+}
+
+bool cmp_write_s16(cmp_ctx_t *ctx, int16_t s) {
+  if (!write_type_marker(ctx, S16_MARKER))
+    return false;
+
+  s = be16(s);
+
+  return ctx->write(ctx, &s, sizeof(int16_t));
+}
+
+bool cmp_write_s32(cmp_ctx_t *ctx, int32_t i) {
+  if (!write_type_marker(ctx, S32_MARKER))
+    return false;
+
+  i = be32(i);
+
+  return ctx->write(ctx, &i, sizeof(int32_t));
+}
+
+bool cmp_write_s64(cmp_ctx_t *ctx, int64_t l) {
+  if (!write_type_marker(ctx, S64_MARKER))
+    return false;
+
+  l = be64(l);
+
+  return ctx->write(ctx, &l, sizeof(int64_t));
+}
+
+bool cmp_write_integer(cmp_ctx_t *ctx, int64_t d) {
+  if (d >= 0)
+    return cmp_write_uinteger(ctx, d);
+  if (d >= -32)
+    return cmp_write_nfix(ctx, d);
+  if (d >= -128)
+    return cmp_write_s8(ctx, d);
+  if (d >= -32768)
+    return cmp_write_s16(ctx, d);
+  if (d >= (-2147483647 - 1))
+    return cmp_write_s32(ctx, (int32_t) d);
+
+  return cmp_write_s64(ctx, d);
+}
+
+bool cmp_write_ufix(cmp_ctx_t *ctx, uint8_t c) {
+  return cmp_write_pfix(ctx, c);
+}
+
+bool cmp_write_u8(cmp_ctx_t *ctx, uint8_t c) {
+  if (!write_type_marker(ctx, U8_MARKER))
+    return false;
+
+  return ctx->write(ctx, &c, sizeof(uint8_t));
+}
+
+bool cmp_write_u16(cmp_ctx_t *ctx, uint16_t s) {
+  if (!write_type_marker(ctx, U16_MARKER))
+    return false;
+
+  s = be16(s);
+
+  return ctx->write(ctx, &s, sizeof(uint16_t));
+}
+
+bool cmp_write_u32(cmp_ctx_t *ctx, uint32_t i) {
+  if (!write_type_marker(ctx, U32_MARKER))
+    return false;
+
+  i = be32(i);
+
+  return ctx->write(ctx, &i, sizeof(uint32_t));
+}
+
+bool cmp_write_u64(cmp_ctx_t *ctx, uint64_t l) {
+  if (!write_type_marker(ctx, U64_MARKER))
+    return false;
+
+  l = be64(l);
+
+  return ctx->write(ctx, &l, sizeof(uint64_t));
+}
+
+bool cmp_write_uinteger(cmp_ctx_t *ctx, uint64_t u) {
+  if (u <= 0x7F)
+    return cmp_write_pfix(ctx, u);
+  if (u <= 0xFF)
+    return cmp_write_u8(ctx, u);
+  if (u <= 0xFFFF)
+    return cmp_write_u16(ctx, u);
+  if (u <= 0xFFFFFFFF)
+    return cmp_write_u32(ctx, (uint32_t) u);
+
+  return cmp_write_u64(ctx, u);
+}
+
+bool cmp_write_float(cmp_ctx_t *ctx, float f) {
+  if (!write_type_marker(ctx, FLOAT_MARKER))
+    return false;
+
+  f = befloat(f);
+
+  return ctx->write(ctx, &f, sizeof(float));
+}
+
+bool cmp_write_double(cmp_ctx_t *ctx, double d) {
+  if (!write_type_marker(ctx, DOUBLE_MARKER))
+    return false;
+
+  d = bedouble(d);
+
+  return ctx->write(ctx, &d, sizeof(double));
+}
+
+bool cmp_write_decimal(cmp_ctx_t *ctx, double d) {
+  float f = (float)d;
+  float df = (double)f;
+
+  if (df == d)
+    return cmp_write_float(ctx, f);
+  else
+    return cmp_write_double(ctx, d);
+}
+
+bool cmp_write_nil(cmp_ctx_t *ctx) {
+  return write_type_marker(ctx, NIL_MARKER);
+}
+
+bool cmp_write_true(cmp_ctx_t *ctx) {
+  return write_type_marker(ctx, TRUE_MARKER);
+}
+
+bool cmp_write_false(cmp_ctx_t *ctx) {
+  return write_type_marker(ctx, FALSE_MARKER);
+}
+
+bool cmp_write_bool(cmp_ctx_t *ctx, bool b) {
+  if (b)
+    return cmp_write_true(ctx);
+
+  return cmp_write_false(ctx);
+}
+
+bool cmp_write_u8_as_bool(cmp_ctx_t *ctx, uint8_t b) {
+  if (b)
+    return cmp_write_true(ctx);
+
+  return cmp_write_false(ctx);
+}
+
+bool cmp_write_fixstr_marker(cmp_ctx_t *ctx, uint8_t size) {
+  if (size <= FIXSTR_SIZE)
+    return write_fixed_value(ctx, FIXSTR_MARKER | size);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_fixstr(cmp_ctx_t *ctx, const char *data, uint8_t size) {
+  if (!cmp_write_fixstr_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str8_marker(cmp_ctx_t *ctx, uint8_t size) {
+  if (!write_type_marker(ctx, STR8_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &size, sizeof(uint8_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str8(cmp_ctx_t *ctx, const char *data, uint8_t size) {
+  if (!cmp_write_str8_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str16_marker(cmp_ctx_t *ctx, uint16_t size) {
+  if (!write_type_marker(ctx, STR16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint16_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str16(cmp_ctx_t *ctx, const char *data, uint16_t size) {
+  if (!cmp_write_str16_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str32_marker(cmp_ctx_t *ctx, uint32_t size) {
+  if (!write_type_marker(ctx, STR32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint32_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str32(cmp_ctx_t *ctx, const char *data, uint32_t size) {
+  if (!cmp_write_str32_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str_marker(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= FIXSTR_SIZE)
+    return cmp_write_fixstr_marker(ctx, size);
+  if (size <= 0xFF)
+    return cmp_write_str8_marker(ctx, size);
+  if (size <= 0xFFFF)
+    return cmp_write_str16_marker(ctx, size);
+
+  return cmp_write_str32_marker(ctx, size);
+}
+
+bool cmp_write_str_marker_v4(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= FIXSTR_SIZE)
+    return cmp_write_fixstr_marker(ctx, size);
+  if (size <= 0xFFFF)
+    return cmp_write_str16_marker(ctx, size);
+
+  return cmp_write_str32_marker(ctx, size);
+}
+
+bool cmp_write_str(cmp_ctx_t *ctx, const char *data, uint32_t size) {
+  if (size <= FIXSTR_SIZE)
+    return cmp_write_fixstr(ctx, data, size);
+  if (size <= 0xFF)
+    return cmp_write_str8(ctx, data, size);
+  if (size <= 0xFFFF)
+    return cmp_write_str16(ctx, data, size);
+
+  return cmp_write_str32(ctx, data, size);
+}
+
+bool cmp_write_str_v4(cmp_ctx_t *ctx, const char *data, uint32_t size) {
+  if (size <= FIXSTR_SIZE)
+    return cmp_write_fixstr(ctx, data, size);
+  if (size <= 0xFFFF)
+    return cmp_write_str16(ctx, data, size);
+
+  return cmp_write_str32(ctx, data, size);
+}
+
+bool cmp_write_bin8_marker(cmp_ctx_t *ctx, uint8_t size) {
+  if (!write_type_marker(ctx, BIN8_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &size, sizeof(uint8_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin8(cmp_ctx_t *ctx, const void *data, uint8_t size) {
+  if (!cmp_write_bin8_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin16_marker(cmp_ctx_t *ctx, uint16_t size) {
+  if (!write_type_marker(ctx, BIN16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint16_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin16(cmp_ctx_t *ctx, const void *data, uint16_t size) {
+  if (!cmp_write_bin16_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin32_marker(cmp_ctx_t *ctx, uint32_t size) {
+  if (!write_type_marker(ctx, BIN32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint32_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin32(cmp_ctx_t *ctx, const void *data, uint32_t size) {
+  if (!cmp_write_bin32_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin_marker(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= 0xFF)
+    return cmp_write_bin8_marker(ctx, size);
+  if (size <= 0xFFFF)
+    return cmp_write_bin16_marker(ctx, size);
+
+  return cmp_write_bin32_marker(ctx, size);
+}
+
+bool cmp_write_bin(cmp_ctx_t *ctx, const void *data, uint32_t size) {
+  if (size <= 0xFF)
+    return cmp_write_bin8(ctx, data, size);
+  if (size <= 0xFFFF)
+    return cmp_write_bin16(ctx, data, size);
+
+  return cmp_write_bin32(ctx, data, size);
+}
+
+bool cmp_write_fixarray(cmp_ctx_t *ctx, uint8_t size) {
+  if (size <= FIXARRAY_SIZE)
+    return write_fixed_value(ctx, FIXARRAY_MARKER | size);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_array16(cmp_ctx_t *ctx, uint16_t size) {
+  if (!write_type_marker(ctx, ARRAY16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint16_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_array32(cmp_ctx_t *ctx, uint32_t size) {
+  if (!write_type_marker(ctx, ARRAY32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint32_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_array(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= FIXARRAY_SIZE)
+    return cmp_write_fixarray(ctx, size);
+  if (size <= 0xFFFF)
+    return cmp_write_array16(ctx, size);
+
+  return cmp_write_array32(ctx, size);
+}
+
+bool cmp_write_fixmap(cmp_ctx_t *ctx, uint8_t size) {
+  if (size <= FIXMAP_SIZE)
+    return write_fixed_value(ctx, FIXMAP_MARKER | size);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_map16(cmp_ctx_t *ctx, uint16_t size) {
+  if (!write_type_marker(ctx, MAP16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint16_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_map32(cmp_ctx_t *ctx, uint32_t size) {
+  if (!write_type_marker(ctx, MAP32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint32_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_map(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= FIXMAP_SIZE)
+    return cmp_write_fixmap(ctx, size);
+  if (size <= 0xFFFF)
+    return cmp_write_map16(ctx, size);
+
+  return cmp_write_map32(ctx, size);
+}
+
+bool cmp_write_fixext1_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT1_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext1(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext1_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 1))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext2_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT2_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext2(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext2_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 2))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext4_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT4_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext4(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext4_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 4))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext8_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT8_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext8(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext8_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 8))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext16_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT16_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext16(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext16_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 16))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext8_marker(cmp_ctx_t *ctx, int8_t type, uint8_t size) {
+  if (!write_type_marker(ctx, EXT8_MARKER))
+    return false;
+
+  if (!ctx->write(ctx, &size, sizeof(uint8_t))) {
+    ctx->error = LENGTH_WRITING_ERROR;
+    return false;
+  }
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext8(cmp_ctx_t *ctx, int8_t tp, uint8_t sz, const void *data) {
+  if (!cmp_write_ext8_marker(ctx, tp, sz))
+    return false;
+
+  if (ctx->write(ctx, data, sz))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext16_marker(cmp_ctx_t *ctx, int8_t type, uint16_t size) {
+  if (!write_type_marker(ctx, EXT16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (!ctx->write(ctx, &size, sizeof(uint16_t))) {
+    ctx->error = LENGTH_WRITING_ERROR;
+    return false;
+  }
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext16(cmp_ctx_t *ctx, int8_t tp, uint16_t sz, const void *data) {
+  if (!cmp_write_ext16_marker(ctx, tp, sz))
+    return false;
+
+  if (ctx->write(ctx, data, sz))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext32_marker(cmp_ctx_t *ctx, int8_t type, uint32_t size) {
+  if (!write_type_marker(ctx, EXT32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (!ctx->write(ctx, &size, sizeof(uint32_t))) {
+    ctx->error = LENGTH_WRITING_ERROR;
+    return false;
+  }
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext32(cmp_ctx_t *ctx, int8_t tp, uint32_t sz, const void *data) {
+  if (!cmp_write_ext32_marker(ctx, tp, sz))
+    return false;
+
+  if (ctx->write(ctx, data, sz))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext_marker(cmp_ctx_t *ctx, int8_t tp, uint32_t sz) {
+  if (sz == 1)
+    return cmp_write_fixext1_marker(ctx, tp);
+  if (sz == 2)
+    return cmp_write_fixext2_marker(ctx, tp);
+  if (sz == 4)
+    return cmp_write_fixext4_marker(ctx, tp);
+  if (sz == 8)
+    return cmp_write_fixext8_marker(ctx, tp);
+  if (sz == 16)
+    return cmp_write_fixext16_marker(ctx, tp);
+  if (sz <= 0xFF)
+    return cmp_write_ext8_marker(ctx, tp, sz);
+  if (sz <= 0xFFFF)
+    return cmp_write_ext16_marker(ctx, tp, sz);
+
+  return cmp_write_ext32_marker(ctx, tp, sz);
+}
+
+bool cmp_write_ext(cmp_ctx_t *ctx, int8_t tp, uint32_t sz, const void *data) {
+  if (sz == 1)
+    return cmp_write_fixext1(ctx, tp, data);
+  if (sz == 2)
+    return cmp_write_fixext2(ctx, tp, data);
+  if (sz == 4)
+    return cmp_write_fixext4(ctx, tp, data);
+  if (sz == 8)
+    return cmp_write_fixext8(ctx, tp, data);
+  if (sz == 16)
+    return cmp_write_fixext16(ctx, tp, data);
+  if (sz <= 0xFF)
+    return cmp_write_ext8(ctx, tp, sz, data);
+  if (sz <= 0xFFFF)
+    return cmp_write_ext16(ctx, tp, sz, data);
+
+  return cmp_write_ext32(ctx, tp, sz, data);
+}
+
+bool cmp_write_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
+  switch(obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+      return cmp_write_pfix(ctx, obj->as.u8);
+    case CMP_TYPE_FIXMAP:
+      return cmp_write_fixmap(ctx, obj->as.map_size);
+    case CMP_TYPE_FIXARRAY:
+      return cmp_write_fixarray(ctx, obj->as.array_size);
+    case CMP_TYPE_FIXSTR:
+      return cmp_write_fixstr_marker(ctx, obj->as.str_size);
+    case CMP_TYPE_NIL:
+      return cmp_write_nil(ctx);
+    case CMP_TYPE_BOOLEAN:
+      if (obj->as.boolean)
+        return cmp_write_true(ctx);
+      return cmp_write_false(ctx);
+    case CMP_TYPE_BIN8:
+      return cmp_write_bin8_marker(ctx, obj->as.bin_size);
+    case CMP_TYPE_BIN16:
+      return cmp_write_bin16_marker(ctx, obj->as.bin_size);
+    case CMP_TYPE_BIN32:
+      return cmp_write_bin32_marker(ctx, obj->as.bin_size);
+    case CMP_TYPE_EXT8:
+      return cmp_write_ext8_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+    case CMP_TYPE_EXT16:
+      return cmp_write_ext16_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+    case CMP_TYPE_EXT32:
+      return cmp_write_ext32_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+    case CMP_TYPE_FLOAT:
+      return cmp_write_float(ctx, obj->as.flt);
+    case CMP_TYPE_DOUBLE:
+      return cmp_write_double(ctx, obj->as.dbl);
+    case CMP_TYPE_UINT8:
+      return cmp_write_u8(ctx, obj->as.u8);
+    case CMP_TYPE_UINT16:
+      return cmp_write_u16(ctx, obj->as.u16);
+    case CMP_TYPE_UINT32:
+      return cmp_write_u32(ctx, obj->as.u32);
+    case CMP_TYPE_UINT64:
+      return cmp_write_u64(ctx, obj->as.u64);
+    case CMP_TYPE_SINT8:
+      return cmp_write_s8(ctx, obj->as.s8);
+    case CMP_TYPE_SINT16:
+      return cmp_write_s16(ctx, obj->as.s16);
+    case CMP_TYPE_SINT32:
+      return cmp_write_s32(ctx, obj->as.s32);
+    case CMP_TYPE_SINT64:
+      return cmp_write_s64(ctx, obj->as.s64);
+    case CMP_TYPE_FIXEXT1:
+      return cmp_write_fixext1_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT2:
+      return cmp_write_fixext2_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT4:
+      return cmp_write_fixext4_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT8:
+      return cmp_write_fixext8_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT16:
+      return cmp_write_fixext16_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_STR8:
+      return cmp_write_str8_marker(ctx, obj->as.str_size);
+    case CMP_TYPE_STR16:
+      return cmp_write_str16_marker(ctx, obj->as.str_size);
+    case CMP_TYPE_STR32:
+      return cmp_write_str32_marker(ctx, obj->as.str_size);
+    case CMP_TYPE_ARRAY16:
+      return cmp_write_array16(ctx, obj->as.array_size);
+    case CMP_TYPE_ARRAY32:
+      return cmp_write_array32(ctx, obj->as.array_size);
+    case CMP_TYPE_MAP16:
+      return cmp_write_map16(ctx, obj->as.map_size);
+    case CMP_TYPE_MAP32:
+      return cmp_write_map32(ctx, obj->as.map_size);
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      return cmp_write_nfix(ctx, obj->as.s8);
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_write_object_v4(cmp_ctx_t *ctx, cmp_object_t *obj) {
+  switch(obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+      return cmp_write_pfix(ctx, obj->as.u8);
+    case CMP_TYPE_FIXMAP:
+      return cmp_write_fixmap(ctx, obj->as.map_size);
+    case CMP_TYPE_FIXARRAY:
+      return cmp_write_fixarray(ctx, obj->as.array_size);
+    case CMP_TYPE_FIXSTR:
+      return cmp_write_fixstr_marker(ctx, obj->as.str_size);
+    case CMP_TYPE_NIL:
+      return cmp_write_nil(ctx);
+    case CMP_TYPE_BOOLEAN:
+      if (obj->as.boolean)
+        return cmp_write_true(ctx);
+      return cmp_write_false(ctx);
+    case CMP_TYPE_BIN8:
+      return cmp_write_bin8_marker(ctx, obj->as.bin_size);
+    case CMP_TYPE_BIN16:
+      return cmp_write_bin16_marker(ctx, obj->as.bin_size);
+    case CMP_TYPE_BIN32:
+      return cmp_write_bin32_marker(ctx, obj->as.bin_size);
+    case CMP_TYPE_EXT8:
+      return cmp_write_ext8_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+    case CMP_TYPE_EXT16:
+      return cmp_write_ext16_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+    case CMP_TYPE_EXT32:
+      return cmp_write_ext32_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+    case CMP_TYPE_FLOAT:
+      return cmp_write_float(ctx, obj->as.flt);
+    case CMP_TYPE_DOUBLE:
+      return cmp_write_double(ctx, obj->as.dbl);
+    case CMP_TYPE_UINT8:
+      return cmp_write_u8(ctx, obj->as.u8);
+    case CMP_TYPE_UINT16:
+      return cmp_write_u16(ctx, obj->as.u16);
+    case CMP_TYPE_UINT32:
+      return cmp_write_u32(ctx, obj->as.u32);
+    case CMP_TYPE_UINT64:
+      return cmp_write_u64(ctx, obj->as.u64);
+    case CMP_TYPE_SINT8:
+      return cmp_write_s8(ctx, obj->as.s8);
+    case CMP_TYPE_SINT16:
+      return cmp_write_s16(ctx, obj->as.s16);
+    case CMP_TYPE_SINT32:
+      return cmp_write_s32(ctx, obj->as.s32);
+    case CMP_TYPE_SINT64:
+      return cmp_write_s64(ctx, obj->as.s64);
+    case CMP_TYPE_FIXEXT1:
+      return cmp_write_fixext1_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT2:
+      return cmp_write_fixext2_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT4:
+      return cmp_write_fixext4_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT8:
+      return cmp_write_fixext8_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT16:
+      return cmp_write_fixext16_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_STR16:
+      return cmp_write_str16_marker(ctx, obj->as.str_size);
+    case CMP_TYPE_STR32:
+      return cmp_write_str32_marker(ctx, obj->as.str_size);
+    case CMP_TYPE_ARRAY16:
+      return cmp_write_array16(ctx, obj->as.array_size);
+    case CMP_TYPE_ARRAY32:
+      return cmp_write_array32(ctx, obj->as.array_size);
+    case CMP_TYPE_MAP16:
+      return cmp_write_map16(ctx, obj->as.map_size);
+    case CMP_TYPE_MAP32:
+      return cmp_write_map32(ctx, obj->as.map_size);
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      return cmp_write_nfix(ctx, obj->as.s8);
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_pfix(cmp_ctx_t *ctx, uint8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_POSITIVE_FIXNUM) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *c = obj.as.u8;
+  return true;
+}
+
+bool cmp_read_nfix(cmp_ctx_t *ctx, int8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_NEGATIVE_FIXNUM) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *c = obj.as.s8;
+  return true;
+}
+
+bool cmp_read_sfix(cmp_ctx_t *ctx, int8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      *c = obj.as.s8;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_s8(cmp_ctx_t *ctx, int8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_SINT8) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *c = obj.as.s8;
+  return true;
+}
+
+bool cmp_read_s16(cmp_ctx_t *ctx, int16_t *s) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_SINT16) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *s = obj.as.s16;
+  return true;
+}
+
+bool cmp_read_s32(cmp_ctx_t *ctx, int32_t *i) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_SINT32) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *i = obj.as.s32;
+  return true;
+}
+
+bool cmp_read_s64(cmp_ctx_t *ctx, int64_t *l) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_SINT64) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *l = obj.as.s64;
+  return true;
+}
+
+bool cmp_read_char(cmp_ctx_t *ctx, int8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *c = obj.as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      if (obj.as.u8 <= 127) {
+        *c = obj.as.u8;
+        return true;
+      }
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_short(cmp_ctx_t *ctx, int16_t *s) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *s = obj.as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *s = obj.as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *s = obj.as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      if (obj.as.u16 <= 32767) {
+        *s = obj.as.u16;
+        return true;
+      }
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_int(cmp_ctx_t *ctx, int32_t *i) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *i = obj.as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *i = obj.as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *i = obj.as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      *i = obj.as.u16;
+      return true;
+    case CMP_TYPE_SINT32:
+      *i = obj.as.s32;
+      return true;
+    case CMP_TYPE_UINT32:
+      if (obj.as.u32 <= 2147483647) {
+        *i = obj.as.u32;
+        return true;
+      }
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_long(cmp_ctx_t *ctx, int64_t *d) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *d = obj.as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *d = obj.as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *d = obj.as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      *d = obj.as.u16;
+      return true;
+    case CMP_TYPE_SINT32:
+      *d = obj.as.s32;
+      return true;
+    case CMP_TYPE_UINT32:
+      *d = obj.as.u32;
+      return true;
+    case CMP_TYPE_SINT64:
+      *d = obj.as.s64;
+      return true;
+    case CMP_TYPE_UINT64:
+      if (obj.as.u64 <= 9223372036854775807) {
+        *d = obj.as.u64;
+        return true;
+      }
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_integer(cmp_ctx_t *ctx, int64_t *d) {
+  return cmp_read_long(ctx, d);
+}
+
+bool cmp_read_ufix(cmp_ctx_t *ctx, uint8_t *c) {
+  return cmp_read_pfix(ctx, c);
+}
+
+bool cmp_read_u8(cmp_ctx_t *ctx, uint8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_UINT8) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *c = obj.as.u8;
+  return true;
+}
+
+bool cmp_read_u16(cmp_ctx_t *ctx, uint16_t *s) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_UINT16) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *s = obj.as.u16;
+  return true;
+}
+
+bool cmp_read_u32(cmp_ctx_t *ctx, uint32_t *i) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_UINT32) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *i = obj.as.u32;
+  return true;
+}
+
+bool cmp_read_u64(cmp_ctx_t *ctx, uint64_t *l) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_UINT64) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *l = obj.as.u64;
+  return true;
+}
+
+bool cmp_read_uchar(cmp_ctx_t *ctx, uint8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *c = obj.as.u8;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_ushort(cmp_ctx_t *ctx, uint16_t *s) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *s = obj.as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *s = obj.as.u16;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_uint(cmp_ctx_t *ctx, uint32_t *i) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *i = obj.as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *i = obj.as.u16;
+      return true;
+    case CMP_TYPE_UINT32:
+      *i = obj.as.u32;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_ulong(cmp_ctx_t *ctx, uint64_t *u) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *u = obj.as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *u = obj.as.u16;
+      return true;
+    case CMP_TYPE_UINT32:
+      *u = obj.as.u32;
+      return true;
+    case CMP_TYPE_UINT64:
+      *u = obj.as.u64;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_uinteger(cmp_ctx_t *ctx, uint64_t *d) {
+  return cmp_read_ulong(ctx, d);
+}
+
+bool cmp_read_float(cmp_ctx_t *ctx, float *f) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_FLOAT) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *f = obj.as.flt;
+
+  return true;
+}
+
+bool cmp_read_double(cmp_ctx_t *ctx, double *d) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_DOUBLE) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *d = obj.as.dbl;
+
+  return true;
+}
+
+bool cmp_read_decimal(cmp_ctx_t *ctx, double *d) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FLOAT:
+      *d = (double)obj.as.flt;
+      return true;
+    case CMP_TYPE_DOUBLE:
+      *d = obj.as.dbl;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_nil(cmp_ctx_t *ctx) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type == CMP_TYPE_NIL)
+    return true;
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_bool(cmp_ctx_t *ctx, bool *b) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_BOOLEAN) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  if (obj.as.boolean)
+    *b = true;
+  else
+    *b = false;
+
+  return true;
+}
+
+bool cmp_read_bool_as_u8(cmp_ctx_t *ctx, uint8_t *b) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_BOOLEAN) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  if (obj.as.boolean)
+    *b = 1;
+  else
+    *b = 0;
+
+  return true;
+}
+
+bool cmp_read_str_size(cmp_ctx_t *ctx, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      *size = obj.as.str_size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_str(cmp_ctx_t *ctx, char *data, uint32_t *size) {
+  uint32_t str_size = 0;
+
+  if (!cmp_read_str_size(ctx, &str_size))
+    return false;
+
+  if ((str_size + 1) > *size) {
+    *size = str_size;
+    ctx->error = STR_DATA_LENGTH_TOO_LONG_ERROR;
+    return false;
+  }
+
+  if (!ctx->read(ctx, data, str_size)) {
+    ctx->error = DATA_READING_ERROR;
+    return false;
+  }
+
+  data[str_size] = 0;
+
+  *size = str_size;
+  return true;
+}
+
+bool cmp_read_bin_size(cmp_ctx_t *ctx, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      *size = obj.as.bin_size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_bin(cmp_ctx_t *ctx, void *data, uint32_t *size) {
+  uint32_t bin_size = 0;
+
+  if (!cmp_read_bin_size(ctx, &bin_size))
+    return false;
+
+  if (bin_size > *size) {
+    ctx->error = BIN_DATA_LENGTH_TOO_LONG_ERROR;
+    return false;
+  }
+
+  if (!ctx->read(ctx, data, bin_size)) {
+    ctx->error = DATA_READING_ERROR;
+    return false;
+  }
+
+  *size = bin_size;
+  return true;
+}
+
+bool cmp_read_array(cmp_ctx_t *ctx, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FIXARRAY:
+    case CMP_TYPE_ARRAY16:
+    case CMP_TYPE_ARRAY32:
+      *size = obj.as.array_size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_map(cmp_ctx_t *ctx, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FIXMAP:
+    case CMP_TYPE_MAP16:
+    case CMP_TYPE_MAP32:
+      *size = obj.as.map_size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_fixext1_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT1) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext1(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext1_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 1))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_fixext2_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT2) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext2(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext2_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 2))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_fixext4_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT4) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext4(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext4_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 4))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_fixext8_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT8) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext8(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext8_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 8))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_fixext16_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT16) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext16(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext16_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 16))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_ext8_marker(cmp_ctx_t *ctx, int8_t *type, uint8_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_EXT8) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  *size = obj.as.ext.size;
+
+  return true;
+}
+
+bool cmp_read_ext8(cmp_ctx_t *ctx, int8_t *type, uint8_t *size, void *data) {
+  if (!cmp_read_ext8_marker(ctx, type, size))
+    return false;
+
+  if (ctx->read(ctx, data, *size))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_ext16_marker(cmp_ctx_t *ctx, int8_t *type, uint16_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_EXT16) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  *size = obj.as.ext.size;
+
+  return true;
+}
+
+bool cmp_read_ext16(cmp_ctx_t *ctx, int8_t *type, uint16_t *size, void *data) {
+  if (!cmp_read_ext16_marker(ctx, type, size))
+    return false;
+
+  if (ctx->read(ctx, data, *size))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_ext32_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_EXT32) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  *size = obj.as.ext.size;
+
+  return true;
+}
+
+bool cmp_read_ext32(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data) {
+  if (!cmp_read_ext32_marker(ctx, type, size))
+    return false;
+
+  if (ctx->read(ctx, data, *size))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_ext_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FIXEXT1:
+    case CMP_TYPE_FIXEXT2:
+    case CMP_TYPE_FIXEXT4:
+    case CMP_TYPE_FIXEXT8:
+    case CMP_TYPE_FIXEXT16:
+    case CMP_TYPE_EXT8:
+    case CMP_TYPE_EXT16:
+    case CMP_TYPE_EXT32:
+      *type = obj.as.ext.type;
+      *size = obj.as.ext.size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_ext(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data) {
+  if (!cmp_read_ext_marker(ctx, type, size))
+    return false;
+
+  if (ctx->read(ctx, data, *size))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
+  uint8_t type_marker = 0;
+
+  if (!read_type_marker(ctx, &type_marker))
+    return false;
+
+  if (type_marker <= 0x7F) {
+    obj->type = CMP_TYPE_POSITIVE_FIXNUM;
+    obj->as.u8 = type_marker;
+  }
+  else if (type_marker <= 0x8F) {
+    obj->type = CMP_TYPE_FIXMAP;
+    obj->as.map_size = type_marker & FIXMAP_SIZE;
+  }
+  else if (type_marker <= 0x9F) {
+    obj->type = CMP_TYPE_FIXARRAY;
+    obj->as.array_size = type_marker & FIXARRAY_SIZE;
+  }
+  else if (type_marker <= 0xBF) {
+    obj->type = CMP_TYPE_FIXSTR;
+    obj->as.str_size = type_marker & FIXSTR_SIZE;
+  }
+  else if (type_marker == NIL_MARKER) {
+    obj->type = CMP_TYPE_NIL;
+    obj->as.u8 = 0;
+  }
+  else if (type_marker == FALSE_MARKER) {
+    obj->type = CMP_TYPE_BOOLEAN;
+    obj->as.boolean = false;
+  }
+  else if (type_marker == TRUE_MARKER) {
+    obj->type = CMP_TYPE_BOOLEAN;
+    obj->as.boolean = true;
+  }
+  else if (type_marker == BIN8_MARKER) {
+    obj->type = CMP_TYPE_BIN8;
+    if (!ctx->read(ctx, &obj->as.u8, sizeof(uint8_t))) {
+      ctx->error = LENGTH_READING_ERROR;
+      return false;
+    }
+    obj->as.bin_size = obj->as.u8;
+  }
+  else if (type_marker == BIN16_MARKER) {
+    obj->type = CMP_TYPE_BIN16;
+    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
+      ctx->error = LENGTH_READING_ERROR;
+      return false;
+    }
+    obj->as.bin_size = be16(obj->as.u16);
+  }
+  else if (type_marker == BIN32_MARKER) {
+    obj->type = CMP_TYPE_BIN32;
+    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
+      ctx->error = LENGTH_READING_ERROR;
+      return false;
+    }
+    obj->as.bin_size = be32(obj->as.u32);
+  }
+  else if (type_marker == EXT8_MARKER) {
+    uint8_t ext_size;
+    int8_t ext_type;
+
+    obj->type = CMP_TYPE_EXT8;
+    if (!ctx->read(ctx, &ext_size, sizeof(uint8_t))) {
+      ctx->error = LENGTH_READING_ERROR;
+      return false;
+    }
+    if (!ctx->read(ctx, &ext_type, sizeof(int8_t))) {
+      ctx->error = EXT_TYPE_READING_ERROR;
+      return false;
+    }
+    obj->as.ext.size = ext_size;
+    obj->as.ext.type = ext_type;
+  }
+  else if (type_marker == EXT16_MARKER) {
+    int8_t ext_type;
+    uint16_t ext_size;
+
+    obj->type = CMP_TYPE_EXT16;
+    if (!ctx->read(ctx, &ext_size, sizeof(uint16_t))) {
+      ctx->error = LENGTH_READING_ERROR;
+      return false;
+    }
+    if (!ctx->read(ctx, &ext_type, sizeof(int8_t))) {
+      ctx->error = EXT_TYPE_READING_ERROR;
+      return false;
+    }
+    obj->as.ext.size = be16(ext_size);
+    obj->as.ext.type = ext_type;
+  }
+  else if (type_marker == EXT32_MARKER) {
+    int8_t ext_type;
+    uint32_t ext_size;
+
+    obj->type = CMP_TYPE_EXT32;
+    if (!ctx->read(ctx, &ext_size, sizeof(uint32_t))) {
+      ctx->error = LENGTH_READING_ERROR;
+      return false;
+    }
+    if (!ctx->read(ctx, &ext_type, sizeof(int8_t))) {
+      ctx->error = EXT_TYPE_READING_ERROR;
+      return false;
+    }
+    obj->as.ext.size = be32(ext_size);
+    obj->as.ext.type = ext_type;
+  }
+  else if (type_marker == FLOAT_MARKER) {
+    obj->type = CMP_TYPE_FLOAT;
+    if (!ctx->read(ctx, &obj->as.flt, sizeof(float))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.flt = befloat(obj->as.flt);
+  }
+  else if (type_marker == DOUBLE_MARKER) {
+    obj->type = CMP_TYPE_DOUBLE;
+    if (!ctx->read(ctx, &obj->as.dbl, sizeof(double))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.dbl = bedouble(obj->as.dbl);
+  }
+  else if (type_marker == U8_MARKER) {
+    obj->type = CMP_TYPE_UINT8;
+    if (!ctx->read(ctx, &obj->as.u8, sizeof(uint8_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+  }
+  else if (type_marker == U16_MARKER) {
+    obj->type = CMP_TYPE_UINT16;
+    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.u16 = be16(obj->as.u16);
+  }
+  else if (type_marker == U32_MARKER) {
+    obj->type = CMP_TYPE_UINT32;
+    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.u32 = be32(obj->as.u32);
+  }
+  else if (type_marker == U64_MARKER) {
+    obj->type = CMP_TYPE_UINT64;
+    if (!ctx->read(ctx, &obj->as.u64, sizeof(uint64_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.u64 = be64(obj->as.u64);
+  }
+  else if (type_marker == S8_MARKER) {
+    obj->type = CMP_TYPE_SINT8;
+    if (!ctx->read(ctx, &obj->as.s8, sizeof(int8_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+  }
+  else if (type_marker == S16_MARKER) {
+    obj->type = CMP_TYPE_SINT16;
+    if (!ctx->read(ctx, &obj->as.s16, sizeof(int16_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.s16 = be16(obj->as.s16);
+  }
+  else if (type_marker == S32_MARKER) {
+    obj->type = CMP_TYPE_SINT32;
+    if (!ctx->read(ctx, &obj->as.s32, sizeof(int32_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.s32 = be32(obj->as.s32);
+  }
+  else if (type_marker == S64_MARKER) {
+    obj->type = CMP_TYPE_SINT64;
+    if (!ctx->read(ctx, &obj->as.s64, sizeof(int64_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.s64 = be64(obj->as.s64);
+  }
+  else if (type_marker == FIXEXT1_MARKER) {
+    obj->type = CMP_TYPE_FIXEXT1;
+    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+      ctx->error = EXT_TYPE_READING_ERROR;
+      return false;
+    }
+    obj->as.ext.size = 1;
+  }
+  else if (type_marker == FIXEXT2_MARKER) {
+    obj->type = CMP_TYPE_FIXEXT2;
+    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+      ctx->error = EXT_TYPE_READING_ERROR;
+      return false;
+    }
+    obj->as.ext.size = 2;
+  }
+  else if (type_marker == FIXEXT4_MARKER) {
+    obj->type = CMP_TYPE_FIXEXT4;
+    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+      ctx->error = EXT_TYPE_READING_ERROR;
+      return false;
+    }
+    obj->as.ext.size = 4;
+  }
+  else if (type_marker == FIXEXT8_MARKER) {
+    obj->type = CMP_TYPE_FIXEXT8;
+    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+      ctx->error = EXT_TYPE_READING_ERROR;
+      return false;
+    }
+    obj->as.ext.size = 8;
+  }
+  else if (type_marker == FIXEXT16_MARKER) {
+    obj->type = CMP_TYPE_FIXEXT16;
+    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+      ctx->error = EXT_TYPE_READING_ERROR;
+      return false;
+    }
+    obj->as.ext.size = 16;
+  }
+  else if (type_marker == STR8_MARKER) {
+    obj->type = CMP_TYPE_STR8;
+    if (!ctx->read(ctx, &obj->as.u8, sizeof(uint8_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.str_size = obj->as.u8;
+  }
+  else if (type_marker == STR16_MARKER) {
+    obj->type = CMP_TYPE_STR16;
+    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.str_size = be16(obj->as.u16);
+  }
+  else if (type_marker == STR32_MARKER) {
+    obj->type = CMP_TYPE_STR32;
+    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.str_size = be32(obj->as.u32);
+  }
+  else if (type_marker == ARRAY16_MARKER) {
+    obj->type = CMP_TYPE_ARRAY16;
+    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.array_size = be16(obj->as.u16);
+  }
+  else if (type_marker == ARRAY32_MARKER) {
+    obj->type = CMP_TYPE_ARRAY32;
+    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.array_size = be32(obj->as.u32);
+  }
+  else if (type_marker == MAP16_MARKER) {
+    obj->type = CMP_TYPE_MAP16;
+    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.map_size = be16(obj->as.u16);
+  }
+  else if (type_marker == MAP32_MARKER) {
+    obj->type = CMP_TYPE_MAP32;
+    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
+      ctx->error = DATA_READING_ERROR;
+      return false;
+    }
+    obj->as.map_size = be32(obj->as.u32);
+  }
+  else if (type_marker >= NEGATIVE_FIXNUM_MARKER) {
+    obj->type = CMP_TYPE_NEGATIVE_FIXNUM;
+    obj->as.s8 = type_marker;
+  }
+  else {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  return true;
+}
+
+bool cmp_object_is_char(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_short(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+    case CMP_TYPE_SINT16:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_int(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+    case CMP_TYPE_SINT16:
+    case CMP_TYPE_SINT32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_long(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+    case CMP_TYPE_SINT16:
+    case CMP_TYPE_SINT32:
+    case CMP_TYPE_SINT64:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_sinteger(cmp_object_t *obj) {
+  return cmp_object_is_long(obj);
+}
+
+bool cmp_object_is_uchar(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_ushort(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      return true;
+    case CMP_TYPE_UINT16:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_uint(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+    case CMP_TYPE_UINT16:
+    case CMP_TYPE_UINT32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_ulong(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+    case CMP_TYPE_UINT16:
+    case CMP_TYPE_UINT32:
+    case CMP_TYPE_UINT64:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_uinteger(cmp_object_t *obj) {
+  return cmp_object_is_ulong(obj);
+}
+
+bool cmp_object_is_float(cmp_object_t *obj) {
+  if (obj->type == CMP_TYPE_FLOAT)
+    return true;
+
+  return false;
+}
+
+bool cmp_object_is_double(cmp_object_t *obj) {
+  if (obj->type == CMP_TYPE_DOUBLE)
+    return true;
+
+  return false;
+}
+
+bool cmp_object_is_nil(cmp_object_t *obj) {
+  if (obj->type == CMP_TYPE_NIL)
+    return true;
+
+  return false;
+}
+
+bool cmp_object_is_bool(cmp_object_t *obj) {
+  if (obj->type == CMP_TYPE_BOOLEAN)
+    return true;
+
+  return false;
+}
+
+bool cmp_object_is_str(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_bin(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_array(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXARRAY:
+    case CMP_TYPE_ARRAY16:
+    case CMP_TYPE_ARRAY32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_map(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXMAP:
+    case CMP_TYPE_MAP16:
+    case CMP_TYPE_MAP32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_ext(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXEXT1:
+    case CMP_TYPE_FIXEXT2:
+    case CMP_TYPE_FIXEXT4:
+    case CMP_TYPE_FIXEXT8:
+    case CMP_TYPE_FIXEXT16:
+    case CMP_TYPE_EXT8:
+    case CMP_TYPE_EXT16:
+    case CMP_TYPE_EXT32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_as_char(cmp_object_t *obj, int8_t *c) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *c = obj->as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      if (obj->as.u8 <= 127) {
+        *c = obj->as.s8;
+        return true;
+      }
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_short(cmp_object_t *obj, int16_t *s) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *s = obj->as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *s = obj->as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *s = obj->as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      if (obj->as.u16 <= 32767) {
+        *s = obj->as.u16;
+        return true;
+      }
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_int(cmp_object_t *obj, int32_t *i) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *i = obj->as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *i = obj->as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *i = obj->as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      *i = obj->as.u16;
+      return true;
+    case CMP_TYPE_SINT32:
+      *i = obj->as.s32;
+      return true;
+    case CMP_TYPE_UINT32:
+      if (obj->as.u32 <= 2147483647) {
+        *i = obj->as.u32;
+        return true;
+      }
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_long(cmp_object_t *obj, int64_t *d) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *d = obj->as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *d = obj->as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *d = obj->as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      *d = obj->as.u16;
+      return true;
+    case CMP_TYPE_SINT32:
+      *d = obj->as.s32;
+      return true;
+    case CMP_TYPE_UINT32:
+      *d = obj->as.u32;
+      return true;
+    case CMP_TYPE_SINT64:
+      *d = obj->as.s64;
+      return true;
+    case CMP_TYPE_UINT64:
+      if (obj->as.u64 <= 9223372036854775807) {
+        *d = obj->as.u64;
+        return true;
+      }
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_sinteger(cmp_object_t *obj, int64_t *d) {
+  return cmp_object_as_long(obj, d);
+}
+
+bool cmp_object_as_uchar(cmp_object_t *obj, uint8_t *c) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *c = obj->as.u8;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_ushort(cmp_object_t *obj, uint16_t *s) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *s = obj->as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *s = obj->as.u16;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_uint(cmp_object_t *obj, uint32_t *i) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *i = obj->as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *i = obj->as.u16;
+      return true;
+    case CMP_TYPE_UINT32:
+      *i = obj->as.u32;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_ulong(cmp_object_t *obj, uint64_t *u) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *u = obj->as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *u = obj->as.u16;
+      return true;
+    case CMP_TYPE_UINT32:
+      *u = obj->as.u32;
+      return true;
+    case CMP_TYPE_UINT64:
+      *u = obj->as.u64;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_uinteger(cmp_object_t *obj, uint64_t *d) {
+  return cmp_object_as_ulong(obj, d);
+}
+
+bool cmp_object_as_float(cmp_object_t *obj, float *f) {
+  if (obj->type == CMP_TYPE_FLOAT) {
+    *f = obj->as.flt;
+    return true;
+  }
+
+  return false;
+}
+
+bool cmp_object_as_double(cmp_object_t *obj, double *d) {
+  if (obj->type == CMP_TYPE_DOUBLE) {
+    *d = obj->as.dbl;
+    return true;
+  }
+
+  return false;
+}
+
+bool cmp_object_as_bool(cmp_object_t *obj, bool *b) {
+  if (obj->type == CMP_TYPE_BOOLEAN) {
+    if (obj->as.boolean)
+      *b = true;
+    else
+      *b = false;
+
+    return true;
+  }
+
+  return false;
+}
+
+bool cmp_object_as_str(cmp_object_t *obj, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      *size = obj->as.str_size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_bin(cmp_object_t *obj, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      *size = obj->as.bin_size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_array(cmp_object_t *obj, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXARRAY:
+    case CMP_TYPE_ARRAY16:
+    case CMP_TYPE_ARRAY32:
+      *size = obj->as.array_size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_map(cmp_object_t *obj, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXMAP:
+    case CMP_TYPE_MAP16:
+    case CMP_TYPE_MAP32:
+      *size = obj->as.map_size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_ext(cmp_object_t *obj, int8_t *type, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXEXT1:
+    case CMP_TYPE_FIXEXT2:
+    case CMP_TYPE_FIXEXT4:
+    case CMP_TYPE_FIXEXT8:
+    case CMP_TYPE_FIXEXT16:
+    case CMP_TYPE_EXT8:
+    case CMP_TYPE_EXT16:
+    case CMP_TYPE_EXT32:
+      *type = obj->as.ext.type;
+      *size = obj->as.ext.size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_to_str(cmp_ctx_t *ctx, cmp_object_t *obj, char *data, uint32_t buf_size) {
+  uint32_t str_size = 0;
+   switch (obj->type) {
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      str_size = obj->as.str_size;
+      if ((str_size + 1) > buf_size) {
+        ctx->error = STR_DATA_LENGTH_TOO_LONG_ERROR;
+        return false;
+      }
+
+      if (!ctx->read(ctx, data, str_size)) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+
+      data[str_size] = 0;
+      return true;
+    default:
+      return false;
+   }
+}
+
+bool cmp_object_to_bin(cmp_ctx_t *ctx, cmp_object_t *obj, void *data, uint32_t buf_size) {
+  uint32_t bin_size = 0;
+   switch (obj->type) {
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      bin_size = obj->as.bin_size;
+      if (bin_size > buf_size) {
+        ctx->error = BIN_DATA_LENGTH_TOO_LONG_ERROR;
+        return false;
+      }
+
+      if (!ctx->read(ctx, data, bin_size)) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      return true;
+    default:
+      return false;
+   }
+}
+
+/* vi: set et ts=2 sw=2: */
+
diff --git a/debian/modules/nchan/src/store/redis/cmp.h b/debian/modules/nchan/src/store/redis/cmp.h
new file mode 100644
index 0000000..8397588
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/cmp.h
@@ -0,0 +1,474 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2015 Charles Gunyon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#ifndef CMP_H__
+#define CMP_H__
+
+struct cmp_ctx_s;
+
+typedef bool   (*cmp_reader)(struct cmp_ctx_s *ctx, void *data, size_t limit);
+typedef size_t (*cmp_writer)(struct cmp_ctx_s *ctx, const void *data,
+                                                    size_t count);
+
+enum {
+  CMP_TYPE_POSITIVE_FIXNUM, /*  0 */
+  CMP_TYPE_FIXMAP,          /*  1 */
+  CMP_TYPE_FIXARRAY,        /*  2 */
+  CMP_TYPE_FIXSTR,          /*  3 */
+  CMP_TYPE_NIL,             /*  4 */
+  CMP_TYPE_BOOLEAN,         /*  5 */
+  CMP_TYPE_BIN8,            /*  6 */
+  CMP_TYPE_BIN16,           /*  7 */
+  CMP_TYPE_BIN32,           /*  8 */
+  CMP_TYPE_EXT8,            /*  9 */
+  CMP_TYPE_EXT16,           /* 10 */
+  CMP_TYPE_EXT32,           /* 11 */
+  CMP_TYPE_FLOAT,           /* 12 */
+  CMP_TYPE_DOUBLE,          /* 13 */
+  CMP_TYPE_UINT8,           /* 14 */
+  CMP_TYPE_UINT16,          /* 15 */
+  CMP_TYPE_UINT32,          /* 16 */
+  CMP_TYPE_UINT64,          /* 17 */
+  CMP_TYPE_SINT8,           /* 18 */
+  CMP_TYPE_SINT16,          /* 19 */
+  CMP_TYPE_SINT32,          /* 20 */
+  CMP_TYPE_SINT64,          /* 21 */
+  CMP_TYPE_FIXEXT1,         /* 22 */
+  CMP_TYPE_FIXEXT2,         /* 23 */
+  CMP_TYPE_FIXEXT4,         /* 24 */
+  CMP_TYPE_FIXEXT8,         /* 25 */
+  CMP_TYPE_FIXEXT16,        /* 26 */
+  CMP_TYPE_STR8,            /* 27 */
+  CMP_TYPE_STR16,           /* 28 */
+  CMP_TYPE_STR32,           /* 29 */
+  CMP_TYPE_ARRAY16,         /* 30 */
+  CMP_TYPE_ARRAY32,         /* 31 */
+  CMP_TYPE_MAP16,           /* 32 */
+  CMP_TYPE_MAP32,           /* 33 */
+  CMP_TYPE_NEGATIVE_FIXNUM  /* 34 */
+};
+
+typedef struct cmp_ext_s {
+  int8_t type;
+  uint32_t size;
+} cmp_ext_t;
+
+union cmp_object_data_u {
+  bool      boolean;
+  uint8_t   u8;
+  uint16_t  u16;
+  uint32_t  u32;
+  uint64_t  u64;
+  int8_t    s8;
+  int16_t   s16;
+  int32_t   s32;
+  int64_t   s64;
+  float     flt;
+  double    dbl;
+  uint32_t  array_size;
+  uint32_t  map_size;
+  uint32_t  str_size;
+  uint32_t  bin_size;
+  cmp_ext_t ext;
+};
+
+typedef struct cmp_ctx_s {
+  uint8_t     error;
+  void       *buf;
+  cmp_reader  read;
+  cmp_writer  write;
+} cmp_ctx_t;
+
+typedef struct cmp_object_s {
+  uint8_t type;
+  union cmp_object_data_u as;
+} cmp_object_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * === Main API
+ * ============================================================================
+ */
+
+/* Initializes a CMP context */
+void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read, cmp_writer write);
+
+/* Returns CMP's version */
+uint32_t cmp_version(void);
+
+/* Returns the MessagePack version employed by CMP */
+uint32_t cmp_mp_version(void);
+
+/* Returns a string description of a CMP context's error */
+const char* cmp_strerror(cmp_ctx_t *ctx);
+
+/* Writes a signed integer to the backend */
+bool cmp_write_integer(cmp_ctx_t *ctx, int64_t d);
+
+/* Writes an unsigned integer to the backend */
+bool cmp_write_uinteger(cmp_ctx_t *ctx, uint64_t u);
+
+/*
+ * Writes a floating-point value (either single or double-precision) to the
+ * backend
+ */
+bool cmp_write_decimal(cmp_ctx_t *ctx, double d);
+
+/* Writes NULL to the backend */
+bool cmp_write_nil(cmp_ctx_t *ctx);
+
+/* Writes true to the backend */
+bool cmp_write_true(cmp_ctx_t *ctx);
+
+/* Writes false to the backend */
+bool cmp_write_false(cmp_ctx_t *ctx);
+
+/* Writes a boolean value to the backend */
+bool cmp_write_bool(cmp_ctx_t *ctx, bool b);
+
+/*
+ * Writes an unsigned char's value to the backend as a boolean.  This is useful
+ * if you are using a different boolean type in your application.
+ */
+bool cmp_write_u8_as_bool(cmp_ctx_t *ctx, uint8_t b);
+
+/*
+ * Writes a string to the backend; according to the MessagePack spec, this must
+ * be encoded using UTF-8, but CMP leaves that job up to the programmer.
+ */
+bool cmp_write_str(cmp_ctx_t *ctx, const char *data, uint32_t size);
+
+/*
+ * Writes a string to the backend.  This avoids using the STR8 marker, which
+ * is unsupported by MessagePack v4, the version implemented by many other
+ * MessagePack libraries.  No encoding is assumed in this case, not that it
+ * matters.
+ */
+bool cmp_write_str_v4(cmp_ctx_t *ctx, const char *data, uint32_t size);
+
+/*
+ * Writes the string marker to the backend.  This is useful if you are writing
+ * data in chunks instead of a single shot.
+ */
+bool cmp_write_str_marker(cmp_ctx_t *ctx, uint32_t size);
+
+/*
+ * Writes the string marker to the backend.  This is useful if you are writing
+ * data in chunks instead of a single shot.  This avoids using the STR8
+ * marker, which is unsupported by MessagePack v4, the version implemented by
+ * many other MessagePack libraries.  No encoding is assumed in this case, not
+ * that it matters.
+ */
+bool cmp_write_str_marker_v4(cmp_ctx_t *ctx, uint32_t size);
+
+/* Writes binary data to the backend */
+bool cmp_write_bin(cmp_ctx_t *ctx, const void *data, uint32_t size);
+
+/*
+ * Writes the binary data marker to the backend.  This is useful if you are
+ * writing data in chunks instead of a single shot.
+ */
+bool cmp_write_bin_marker(cmp_ctx_t *ctx, uint32_t size);
+
+/* Writes an array to the backend. */
+bool cmp_write_array(cmp_ctx_t *ctx, uint32_t size);
+
+/* Writes a map to the backend. */
+bool cmp_write_map(cmp_ctx_t *ctx, uint32_t size);
+
+/* Writes an extended type to the backend */
+bool cmp_write_ext(cmp_ctx_t *ctx, int8_t type, uint32_t size,
+                                   const void *data);
+
+/*
+ * Writes the extended type marker to the backend.  This is useful if you want
+ * to write the type's data in chunks instead of a single shot.
+ */
+bool cmp_write_ext_marker(cmp_ctx_t *ctx, int8_t type, uint32_t size);
+
+/* Writes an object to the backend */
+bool cmp_write_object(cmp_ctx_t *ctx, cmp_object_t *obj);
+
+/*
+ * Writes an object to the backend. This avoids using the STR8 marker, which
+ * is unsupported by MessagePack v4, the version implemented by many other
+ * MessagePack libraries.
+ */
+bool cmp_write_object_v4(cmp_ctx_t *ctx, cmp_object_t *obj);
+
+/* Reads a signed integer that fits inside a signed char */
+bool cmp_read_char(cmp_ctx_t *ctx, int8_t *c);
+
+/* Reads a signed integer that fits inside a signed short */
+bool cmp_read_short(cmp_ctx_t *ctx, int16_t *s);
+
+/* Reads a signed integer that fits inside a signed int */
+bool cmp_read_int(cmp_ctx_t *ctx, int32_t *i);
+
+/* Reads a signed integer that fits inside a signed long */
+bool cmp_read_long(cmp_ctx_t *ctx, int64_t *d);
+
+/* Reads a signed integer */
+bool cmp_read_integer(cmp_ctx_t *ctx, int64_t *d);
+
+/* Reads an unsigned integer that fits inside an unsigned char */
+bool cmp_read_uchar(cmp_ctx_t *ctx, uint8_t *c);
+
+/* Reads an unsigned integer that fits inside an unsigned short */
+bool cmp_read_ushort(cmp_ctx_t *ctx, uint16_t *s);
+
+/* Reads an unsigned integer that fits inside an unsigned int */
+bool cmp_read_uint(cmp_ctx_t *ctx, uint32_t *i);
+
+/* Reads an unsigned integer that fits inside an unsigned long */
+bool cmp_read_ulong(cmp_ctx_t *ctx, uint64_t *u);
+
+/* Reads an unsigned integer */
+bool cmp_read_uinteger(cmp_ctx_t *ctx, uint64_t *u);
+
+/*
+ * Reads a floating point value (either single or double-precision) from the
+ * backend
+ */
+bool cmp_read_decimal(cmp_ctx_t *ctx, double *d);
+
+/* "Reads" (more like "skips") a NULL value from the backend */
+bool cmp_read_nil(cmp_ctx_t *ctx);
+
+/* Reads a boolean from the backend */
+bool cmp_read_bool(cmp_ctx_t *ctx, bool *b);
+
+/*
+ * Reads a boolean as an unsigned char from the backend; this is useful if your
+ * application uses a different boolean type.
+ */
+bool cmp_read_bool_as_u8(cmp_ctx_t *ctx, uint8_t *b);
+
+/* Reads a string's size from the backend */
+bool cmp_read_str_size(cmp_ctx_t *ctx, uint32_t *size);
+
+/*
+ * Reads a string from the backend; according to the spec, the string's data
+ * ought to be encoded using UTF-8, 
+ */
+bool cmp_read_str(cmp_ctx_t *ctx, char *data, uint32_t *size);
+
+/* Reads the size of packed binary data from the backend */
+bool cmp_read_bin_size(cmp_ctx_t *ctx, uint32_t *size);
+
+/* Reads packed binary data from the backend */
+bool cmp_read_bin(cmp_ctx_t *ctx, void *data, uint32_t *size);
+
+/* Reads an array from the backend */
+bool cmp_read_array(cmp_ctx_t *ctx, uint32_t *size);
+
+/* Reads a map from the backend */
+bool cmp_read_map(cmp_ctx_t *ctx, uint32_t *size);
+
+/* Reads the extended type's marker from the backend */
+bool cmp_read_ext_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size);
+
+/* Reads an extended type from the backend */
+bool cmp_read_ext(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data);
+
+/* Reads an object from the backend */
+bool cmp_read_object(cmp_ctx_t *ctx, cmp_object_t *obj);
+
+/*
+ * ============================================================================
+ * === Specific API
+ * ============================================================================
+ */
+
+bool cmp_write_pfix(cmp_ctx_t *ctx, uint8_t c);
+bool cmp_write_nfix(cmp_ctx_t *ctx, int8_t c);
+
+bool cmp_write_sfix(cmp_ctx_t *ctx, int8_t c);
+bool cmp_write_s8(cmp_ctx_t *ctx, int8_t c);
+bool cmp_write_s16(cmp_ctx_t *ctx, int16_t s);
+bool cmp_write_s32(cmp_ctx_t *ctx, int32_t i);
+bool cmp_write_s64(cmp_ctx_t *ctx, int64_t l);
+
+bool cmp_write_ufix(cmp_ctx_t *ctx, uint8_t c);
+bool cmp_write_u8(cmp_ctx_t *ctx, uint8_t c);
+bool cmp_write_u16(cmp_ctx_t *ctx, uint16_t s);
+bool cmp_write_u32(cmp_ctx_t *ctx, uint32_t i);
+bool cmp_write_u64(cmp_ctx_t *ctx, uint64_t l);
+
+bool cmp_write_float(cmp_ctx_t *ctx, float f);
+bool cmp_write_double(cmp_ctx_t *ctx, double d);
+
+bool cmp_write_fixstr_marker(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_fixstr(cmp_ctx_t *ctx, const char *data, uint8_t size);
+bool cmp_write_str8_marker(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_str8(cmp_ctx_t *ctx, const char *data, uint8_t size);
+bool cmp_write_str16_marker(cmp_ctx_t *ctx, uint16_t size);
+bool cmp_write_str16(cmp_ctx_t *ctx, const char *data, uint16_t size);
+bool cmp_write_str32_marker(cmp_ctx_t *ctx, uint32_t size);
+bool cmp_write_str32(cmp_ctx_t *ctx, const char *data, uint32_t size);
+
+bool cmp_write_bin8_marker(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_bin8(cmp_ctx_t *ctx, const void *data, uint8_t size);
+bool cmp_write_bin16_marker(cmp_ctx_t *ctx, uint16_t size);
+bool cmp_write_bin16(cmp_ctx_t *ctx, const void *data, uint16_t size);
+bool cmp_write_bin32_marker(cmp_ctx_t *ctx, uint32_t size);
+bool cmp_write_bin32(cmp_ctx_t *ctx, const void *data, uint32_t size);
+
+bool cmp_write_fixarray(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_array16(cmp_ctx_t *ctx, uint16_t size);
+bool cmp_write_array32(cmp_ctx_t *ctx, uint32_t size);
+
+bool cmp_write_fixmap(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_map16(cmp_ctx_t *ctx, uint16_t size);
+bool cmp_write_map32(cmp_ctx_t *ctx, uint32_t size);
+
+bool cmp_write_fixext1_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext1(cmp_ctx_t *ctx, int8_t type, const void *data);
+bool cmp_write_fixext2_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext2(cmp_ctx_t *ctx, int8_t type, const void *data);
+bool cmp_write_fixext4_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext4(cmp_ctx_t *ctx, int8_t type, const void *data);
+bool cmp_write_fixext8_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext8(cmp_ctx_t *ctx, int8_t type, const void *data);
+bool cmp_write_fixext16_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext16(cmp_ctx_t *ctx, int8_t type, const void *data);
+
+bool cmp_write_ext8_marker(cmp_ctx_t *ctx, int8_t type, uint8_t size);
+bool cmp_write_ext8(cmp_ctx_t *ctx, int8_t type, uint8_t size,
+                                    const void *data);
+bool cmp_write_ext16_marker(cmp_ctx_t *ctx, int8_t type, uint16_t size);
+bool cmp_write_ext16(cmp_ctx_t *ctx, int8_t type, uint16_t size,
+                                     const void *data);
+bool cmp_write_ext32_marker(cmp_ctx_t *ctx, int8_t type, uint32_t size);
+bool cmp_write_ext32(cmp_ctx_t *ctx, int8_t type, uint32_t size,
+                                     const void *data);
+
+bool cmp_read_pfix(cmp_ctx_t *ctx, uint8_t *c);
+bool cmp_read_nfix(cmp_ctx_t *ctx, int8_t *c);
+
+bool cmp_read_sfix(cmp_ctx_t *ctx, int8_t *c);
+bool cmp_read_s8(cmp_ctx_t *ctx, int8_t *c);
+bool cmp_read_s16(cmp_ctx_t *ctx, int16_t *s);
+bool cmp_read_s32(cmp_ctx_t *ctx, int32_t *i);
+bool cmp_read_s64(cmp_ctx_t *ctx, int64_t *l);
+
+bool cmp_read_ufix(cmp_ctx_t *ctx, uint8_t *c);
+bool cmp_read_u8(cmp_ctx_t *ctx, uint8_t *c);
+bool cmp_read_u16(cmp_ctx_t *ctx, uint16_t *s);
+bool cmp_read_u32(cmp_ctx_t *ctx, uint32_t *i);
+bool cmp_read_u64(cmp_ctx_t *ctx, uint64_t *l);
+
+bool cmp_read_float(cmp_ctx_t *ctx, float *f);
+bool cmp_read_double(cmp_ctx_t *ctx, double *d);
+
+bool cmp_read_fixext1_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext1(cmp_ctx_t *ctx, int8_t *type, void *data);
+bool cmp_read_fixext2_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext2(cmp_ctx_t *ctx, int8_t *type, void *data);
+bool cmp_read_fixext4_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext4(cmp_ctx_t *ctx, int8_t *type, void *data);
+bool cmp_read_fixext8_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext8(cmp_ctx_t *ctx, int8_t *type, void *data);
+bool cmp_read_fixext16_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext16(cmp_ctx_t *ctx, int8_t *type, void *data);
+
+bool cmp_read_ext8_marker(cmp_ctx_t *ctx, int8_t *type, uint8_t *size);
+bool cmp_read_ext8(cmp_ctx_t *ctx, int8_t *type, uint8_t *size, void *data);
+bool cmp_read_ext16_marker(cmp_ctx_t *ctx, int8_t *type, uint16_t *size);
+bool cmp_read_ext16(cmp_ctx_t *ctx, int8_t *type, uint16_t *size, void *data);
+bool cmp_read_ext32_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size);
+bool cmp_read_ext32(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data);
+
+/*
+ * ============================================================================
+ * === Object API
+ * ============================================================================
+ */
+
+bool cmp_object_is_char(cmp_object_t *obj);
+bool cmp_object_is_short(cmp_object_t *obj);
+bool cmp_object_is_int(cmp_object_t *obj);
+bool cmp_object_is_long(cmp_object_t *obj);
+bool cmp_object_is_sinteger(cmp_object_t *obj);
+bool cmp_object_is_uchar(cmp_object_t *obj);
+bool cmp_object_is_ushort(cmp_object_t *obj);
+bool cmp_object_is_uint(cmp_object_t *obj);
+bool cmp_object_is_ulong(cmp_object_t *obj);
+bool cmp_object_is_uinteger(cmp_object_t *obj);
+bool cmp_object_is_float(cmp_object_t *obj);
+bool cmp_object_is_double(cmp_object_t *obj);
+bool cmp_object_is_nil(cmp_object_t *obj);
+bool cmp_object_is_bool(cmp_object_t *obj);
+bool cmp_object_is_str(cmp_object_t *obj);
+bool cmp_object_is_bin(cmp_object_t *obj);
+bool cmp_object_is_array(cmp_object_t *obj);
+bool cmp_object_is_map(cmp_object_t *obj);
+bool cmp_object_is_ext(cmp_object_t *obj);
+
+bool cmp_object_as_char(cmp_object_t *obj, int8_t *c);
+bool cmp_object_as_short(cmp_object_t *obj, int16_t *s);
+bool cmp_object_as_int(cmp_object_t *obj, int32_t *i);
+bool cmp_object_as_long(cmp_object_t *obj, int64_t *d);
+bool cmp_object_as_sinteger(cmp_object_t *obj, int64_t *d);
+bool cmp_object_as_uchar(cmp_object_t *obj, uint8_t *c);
+bool cmp_object_as_ushort(cmp_object_t *obj, uint16_t *s);
+bool cmp_object_as_uint(cmp_object_t *obj, uint32_t *i);
+bool cmp_object_as_ulong(cmp_object_t *obj, uint64_t *u);
+bool cmp_object_as_uinteger(cmp_object_t *obj, uint64_t *u);
+bool cmp_object_as_float(cmp_object_t *obj, float *f);
+bool cmp_object_as_double(cmp_object_t *obj, double *d);
+bool cmp_object_as_bool(cmp_object_t *obj, bool *b);
+bool cmp_object_as_str(cmp_object_t *obj, uint32_t *size);
+bool cmp_object_as_bin(cmp_object_t *obj, uint32_t *size);
+bool cmp_object_as_array(cmp_object_t *obj, uint32_t *size);
+bool cmp_object_as_map(cmp_object_t *obj, uint32_t *size);
+bool cmp_object_as_ext(cmp_object_t *obj, int8_t *type, uint32_t *size);
+
+bool cmp_object_to_str(cmp_ctx_t *ctx, cmp_object_t *obj, char *data, uint32_t buf_size);
+bool cmp_object_to_bin(cmp_ctx_t *ctx, cmp_object_t *obj, void *data, uint32_t buf_size);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+/*
+ * ============================================================================
+ * === Backwards compatibility defines
+ * ============================================================================
+ */
+
+#define cmp_write_int      cmp_write_integer
+#define cmp_write_sint     cmp_write_integer
+#define cmp_write_sinteger cmp_write_integer
+#define cmp_write_uint     cmp_write_uinteger
+#define cmp_read_sinteger  cmp_read_integer
+
+#endif /* CMP_H__ */
+
+/* vi: set et ts=2 sw=2: */
+
diff --git a/debian/modules/nchan/src/store/redis/rdsstore.c b/debian/modules/nchan/src/store/redis/rdsstore.c
new file mode 100755
index 0000000..559c297
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/rdsstore.c
@@ -0,0 +1,2799 @@
+#include <nchan_module.h>
+
+#include <assert.h>
+#include "store-private.h"
+#include "store.h"
+#include "cluster.h"
+
+#include "redis_nginx_adapter.h"
+
+#include <util/nchan_msgid.h>
+#include <util/nchan_rbtree.h>
+#include <store/store_common.h>
+
+#include <store/memory/store.h>
+
+#include "redis_lua_commands.h"
+
+#define REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL 300
+#define REDIS_LUA_HASH_LENGTH 40
+
+#define REDIS_RECONNECT_TIME 5000
+
+#define REDIS_STALL_CHECK_TIME 0 //disable for now
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REDISTORE: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDISTORE: " fmt, ##args)
+
+u_char            redis_subscriber_id[255];
+u_char            redis_subscriber_channel[255];
+
+static rbtree_seed_t              redis_data_tree;
+static rdstore_channel_head_t    *chanhead_hash = NULL;
+static size_t                     redis_publish_message_msgkey_size;
+
+redis_connection_status_t redis_connection_status(nchan_loc_conf_t *cf) {
+  rdstore_data_t  *rdata = cf->redis.privdata;
+  return rdata->status;
+}
+
+ngx_int_t redis_store_callback_on_connected(nchan_loc_conf_t *cf, callback_pt cb, void *privdata) {
+  rdstore_data_t    *rdata = cf->redis.privdata;
+  callback_chain_t  *d;
+  
+  if(rdata->status == CONNECTED) {
+    cb(NGX_OK, NULL, privdata);
+  }
+  
+  d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+  
+  d->cb = cb;
+  d->pd = privdata;
+  d->next = rdata->on_connected;
+  
+  rdata->on_connected = d;
+  return NGX_OK;
+}
+
+#define CHANNEL_HASH_FIND(id_buf, p)    HASH_FIND( hh, chanhead_hash, (id_buf)->data, (id_buf)->len, p)
+#define CHANNEL_HASH_ADD(chanhead)      HASH_ADD_KEYPTR( hh, chanhead_hash, (chanhead->id).data, (chanhead->id).len, chanhead)
+#define CHANNEL_HASH_DEL(chanhead)      HASH_DEL( chanhead_hash, chanhead)
+
+#include <stdbool.h>
+#include "cmp.h"
+
+#define redis_command(rdata, cb, pd, fmt, args...)                   \
+  do {                                                               \
+    if(redis_ensure_connected(rdata) == NGX_OK) {                    \
+      rdata->pending_commands++;                                     \
+      nchan_update_stub_status(redis_pending_commands, 1);           \
+      redisAsyncCommand((rdata)->ctx, cb, pd, fmt, ##args);          \
+    } else {                                                         \
+      ERR("Can't run redis command: no connection to redis server.");\
+    }                                                                \
+  }while(0)                                                          \
+
+#define redis_subscriber_command(rdata, cb, pd, fmt, args...)        \
+  do {                                                               \
+    if(redis_ensure_connected(rdata) == NGX_OK) {                    \
+      redisAsyncCommand((rdata)->sub_ctx, cb, pd, fmt, ##args);      \
+    } else {                                                         \
+      ERR("Can't run redis command: no connection to redis server.");\
+    }                                                                \
+  }while(0)                                                          \
+  
+#define redis_sync_command(rdata, fmt, args...)                      \
+  do {                                                               \
+    if((rdata)->sync_ctx == NULL) {                                  \
+      redis_nginx_open_sync_context(&(rdata)->connect_params.host, (rdata)->connect_params.port, (rdata)->connect_params.db, &(rdata)->connect_params.password, &(rdata)->sync_ctx); \
+    }                                                                \
+    if((rdata)->sync_ctx) {                                          \
+      redisCommand((rdata)->sync_ctx, fmt, ##args);                  \
+    } else {                                                         \
+      ERR("Can't run redis command: no connection to redis server.");\
+    }                                                                \
+  }while(0)
+  
+
+#define CHECK_REPLY_STR(reply) ((reply)->type == REDIS_REPLY_STRING)
+#define CHECK_REPLY_STRVAL(reply, v) ( CHECK_REPLY_STR(reply) && ngx_strcmp((reply)->str, v) == 0 )
+#define CHECK_REPLY_STRNVAL(reply, v, n) ( CHECK_REPLY_STR(reply) && ngx_strncmp((reply)->str, v, n) == 0 )
+#define CHECK_REPLY_INT(reply) ((reply)->type == REDIS_REPLY_INTEGER)
+#define CHECK_REPLY_INTVAL(reply, v) ( CHECK_REPLY_INT(reply) && (reply)->integer == v )
+#define CHECK_REPLY_ARRAY_MIN_SIZE(reply, size) ( (reply)->type == REDIS_REPLY_ARRAY && (reply)->elements >= (unsigned )size )
+#define CHECK_REPLY_NIL(reply) ((reply)->type == REDIS_REPLY_NIL)
+#define CHECK_REPLY_INT_OR_STR(reply) ((reply)->type == REDIS_REPLY_INTEGER || (reply)->type == REDIS_REPLY_STRING)
+  
+static ngx_int_t nchan_store_publish_generic(ngx_str_t *, rdstore_data_t *, nchan_msg_t *, ngx_int_t, const ngx_str_t *);
+static ngx_str_t * nchan_store_content_type_from_message(nchan_msg_t *, ngx_pool_t *);
+static ngx_str_t * nchan_store_etag_from_message(nchan_msg_t *, ngx_pool_t *);
+
+static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, rdstore_data_t *rdata);
+
+static ngx_buf_t *set_buf(ngx_buf_t *buf, u_char *start, off_t len){
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = start;
+  buf->end = start + len;
+  buf->pos = buf->start;
+  buf->last = buf->end;
+  return buf;
+}
+
+static int ngx_strmatch(ngx_str_t *str, char *match) {
+  return ngx_strncmp(str->data, match, str->len) == 0;
+}
+
+static int ngx_str_chop_if_startswith(ngx_str_t *str, char *match) {
+  char *cur, *max = (char *)str->data + str->len;
+  for(cur = (char *)str->data; cur < max; cur++, match++) {
+    if(*match == '\0') {
+      str->len -= (u_char *)cur - str->data;
+      str->data = (u_char *)cur;
+      return 1;
+    }
+    else if(*match != *cur)
+      break;
+  }
+  return 0;
+}
+
+static u_char *fwd_buf(ngx_buf_t *buf, size_t sz) {
+  u_char *ret = buf->pos;
+  buf->pos += sz;
+  return ret;
+}
+
+static void fwd_buf_to_str(ngx_buf_t *buf, size_t sz, ngx_str_t *str) {
+  str->data = fwd_buf(buf, sz);
+  str->len = sz;;
+}
+
+static bool ngx_buf_reader(cmp_ctx_t *ctx, void *data, size_t limit) {
+  ngx_buf_t   *buf=(ngx_buf_t *)ctx->buf;
+  if(buf->pos + limit > buf->last){
+    return false;
+  }
+  ngx_memcpy(data, buf->pos, limit);
+  buf->pos += limit;
+  return true;
+}
+static size_t ngx_buf_writer(cmp_ctx_t *ctx, const void *data, size_t count) {
+  return 0;
+}
+
+ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
+
+  u_char                  *cur, *last, *ret;
+  
+  cur = url->data;
+  last = url->data + url->len;
+  
+  
+  //ignore redis://
+  if(ngx_strnstr(cur, "redis://", 8) != NULL) {
+    cur += 8;
+  }
+  
+  if(cur[0] == ':') {
+    cur++;
+    if((ret = ngx_strlchr(cur, last, '@')) == NULL) {
+      rcp->password.data = NULL;
+      rcp->password.len = 0;
+    }
+    else {
+      rcp->password.data = cur;
+      rcp->password.len = ret - cur;
+      cur = ret + 1;
+    }
+  }
+  else {
+    rcp->password.data = NULL;
+    rcp->password.len = 0;
+  }
+  
+  ///port:host
+  if((ret = ngx_strlchr(cur, last, ':')) == NULL) {
+    //just host
+    rcp->port = 6379;
+    if((ret = ngx_strlchr(cur, last, '/')) == NULL) {
+      ret = last;
+    }
+    rcp->host.data = cur;
+    rcp->host.len = ret - cur;
+  }
+  else {
+    rcp->host.data = cur;
+    rcp->host.len = ret - cur;
+    cur = ret + 1;
+    
+    //port
+    if((ret = ngx_strlchr(cur, last, '/')) == NULL) {
+      ret = last;
+    }
+    
+    rcp->port = ngx_atoi(cur, ret-cur);
+    if(rcp->port == NGX_ERROR) {
+      rcp->port = 6379;
+    }
+  }
+  cur = ret;
+  
+  if(cur[0] == '/') {
+    cur++;
+    rcp->db = ngx_atoi(cur, last-cur);
+    if(rcp->db == NGX_ERROR) {
+      rcp->db = 0;
+    }
+  }
+  else {
+    rcp->db = 0;
+  }
+  
+  return NGX_OK;
+}
+
+static void redis_store_reap_chanhead(rdstore_channel_head_t *ch) {
+  rdstore_data_t   *rdata;
+  if(!ch->shutting_down) {
+    assert(ch->sub_count == 0 && ch->fetching_message_count == 0);
+  }
+  
+  DBG("reap channel %V", &ch->id);
+
+  rdata = redis_cluster_rdata_from_channel(ch);
+  if(ch->pubsub_status == SUBBED) {
+    ch->pubsub_status = UNSUBBING;
+    redis_subscriber_command(rdata, NULL, NULL, "UNSUBSCRIBE {channel:%b}:pubsub", STR(&ch->id));
+  }
+  
+  if(ch->rd_prev) {
+    ch->rd_prev->rd_next = ch->rd_next;
+  }
+  if(ch->rd_next) {
+    ch->rd_next->rd_prev = ch->rd_prev;
+  }
+  if(rdata->channels_head == ch) {
+    rdata->channels_head = ch->rd_next;
+  }
+  
+  if(rdata->almost_deleted_channels_head) {
+    rdata->almost_deleted_channels_head->rd_prev = ch;
+    ch->rd_next = rdata->almost_deleted_channels_head;
+    ch->rd_prev = NULL;
+  }
+  else {
+    ch->rd_next = NULL;
+    ch->rd_prev = NULL;
+  }
+  
+  rdata->almost_deleted_channels_head = ch;
+  
+  if(rdata->node.cluster && rdata->node.cluster->orphan_channels_head == ch) {
+    rdata->node.cluster->orphan_channels_head = ch->rd_next;
+  }
+  
+  DBG("chanhead %p (%V) is empty and expired. delete.", ch, &ch->id);
+  if(ch->keepalive_timer.timer_set) {
+    ngx_del_timer(&ch->keepalive_timer);
+  }
+  stop_spooler(&ch->spooler, 1);
+  CHANNEL_HASH_DEL(ch);
+  
+  
+  //don't free the actual chanhead. That will be done once an UNSUBSCRIBE reply is received.
+}
+
+static void free_chanhead(rdstore_channel_head_t *ch) {
+  rdstore_data_t   *rdata = redis_cluster_rdata_from_channel(ch);
+  if(ch->rd_prev) {
+    ch->rd_prev->rd_next = ch->rd_next;
+  }
+  if(ch->rd_next) {
+    ch->rd_next->rd_prev = ch->rd_prev;
+  }
+  if(rdata->almost_deleted_channels_head == ch) {
+    rdata->almost_deleted_channels_head = ch->rd_next;
+  }
+
+  DBG("freed channel %V %p", &ch->id, ch);
+  
+  ngx_free(ch);
+
+}
+
+static ngx_int_t nchan_redis_chanhead_ready_to_reap(rdstore_channel_head_t *ch, uint8_t force) {
+  if(!force) {
+    if(ch->status != INACTIVE) {
+      return NGX_DECLINED;
+    }
+    
+    if(ch->reserved > 0 ) {
+      DBG("not yet time to reap %V, %i reservations left", &ch->id, ch->reserved);
+      return NGX_DECLINED;
+    }
+    
+    if(ch->gc_time - ngx_time() > 0) {
+      DBG("not yet time to reap %V, %i sec left", &ch->id, ch->gc_time - ngx_time());
+      return NGX_DECLINED;
+    }
+    
+    if (ch->sub_count > 0) { //there are subscribers
+      DBG("not ready to reap %V, %i subs left", &ch->id, ch->sub_count);
+      return NGX_DECLINED;
+    }
+    
+    if (ch->fetching_message_count > 0) { //there are subscribers
+      DBG("not ready to reap %V, fetching %i messages", &ch->id, ch->fetching_message_count);
+      return NGX_DECLINED;
+    }
+    
+    //if(ch->pubsub_status == SUBBING) {
+    //  return NGX_DECLINED;
+    //}
+    
+    //DBG("ok to delete channel %V", &ch->id);
+    return NGX_OK;
+  }
+  else {
+    //force delete is always ok
+    return NGX_OK;
+  }
+}
+
+static redisAsyncContext **whichRedisContext(rdstore_data_t *rdata, const redisAsyncContext *ac) {
+  if(rdata->ctx == ac) {
+    return &rdata->ctx;
+  }
+  else if(rdata->sub_ctx == ac) {
+    return &rdata->sub_ctx;
+  }
+  return NULL;
+}
+
+static void rdt_set_status(rdstore_data_t *rdata, redis_connection_status_t status, const redisAsyncContext *ac) {
+  redis_connection_status_t prev_status = rdata->status;
+  
+  if(rdata->node.cluster) {
+    redis_cluster_node_change_status(rdata, status);
+  }
+  
+  rdata->status = status;
+  
+  if(status == DISCONNECTED) {
+    if(!rdata->shutting_down && !rdata->reconnect_timer.timer_set) {
+      ngx_add_timer(&rdata->reconnect_timer, REDIS_RECONNECT_TIME);
+    }
+    if(rdata->ping_timer.timer_set) {
+      ngx_del_timer(&rdata->ping_timer);
+    }
+    if(rdata->stall_timer.timer_set) {
+      ngx_del_timer(&rdata->stall_timer);
+    }
+    
+    if(prev_status == CONNECTED) {
+      rdstore_channel_head_t   *cur;
+      
+      //nchan_update_stub_status(redis_pending_commands, -(rdata->pending_commands)); // not  necessary, callbacks will be called
+      nchan_update_stub_status(redis_connected_servers, -1);
+      
+      if(!rdata->node.cluster) {
+        //not in a cluster -- disconnect all subs right away
+        for(cur = rdata->channels_head; cur != NULL; cur = cur->rd_next) {
+          cur->spooler.fn->broadcast_status(&cur->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+          if(!cur->in_gc_reaper) {
+            redis_chanhead_gc_add(cur, 0, "redis connection gone");
+          }
+        }
+        
+        nchan_reaper_flush(&rdata->chanhead_reaper);
+        
+        while((cur = rdata->almost_deleted_channels_head) != NULL) {
+          free_chanhead(cur);
+        }
+      }
+    }
+    
+    if(ac) {
+      redisAsyncContext **pac = whichRedisContext(rdata, ac);
+      if(pac)
+        *pac = NULL;
+    }
+  }
+  else if(status == CONNECTED && prev_status != CONNECTED) {
+    callback_chain_t    *cur, *next;
+    
+    nchan_update_stub_status(redis_connected_servers, 1);
+    
+    if(!rdata->ping_timer.timer_set && rdata->ping_interval > 0) {
+      ngx_add_timer(&rdata->ping_timer, rdata->ping_interval * 1000);
+    }
+    
+    rdata->pending_commands = 0;
+    if(!rdata->stall_timer.timer_set && REDIS_STALL_CHECK_TIME > 0) {
+      ngx_add_timer(&rdata->stall_timer, REDIS_STALL_CHECK_TIME);
+    }
+    
+    //on_connected callbacks
+    cur = rdata->on_connected;
+    rdata->on_connected = NULL;
+    
+    while(cur != NULL) {
+      next = cur->next;
+      cur->cb(NGX_OK, NULL, cur->pd);
+      ngx_free(cur);
+      cur = next;
+    }
+    rdata->generation++;
+  }
+}
+
+static void redis_reconnect_timer_handler(ngx_event_t *ev) {
+  if(!ev->timedout || ngx_exiting || ngx_quit)
+    return;
+  ev->timedout = 0;
+  redis_ensure_connected((rdstore_data_t *)ev->data);
+}
+
+static void redis_ping_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply         *reply = (redisReply *)r;
+  rdstore_data_t     *rdata = c->data;
+  
+  rdata->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  if(redisReplyOk(c, r)) {
+    if(CHECK_REPLY_INT(reply)) {
+      if(reply->integer < 1) {
+        ERR("failed to forward ping to sub_ctx");
+      }
+    }
+    else {
+      ERR("unexpected reply type for redis_ping_callback");
+    }
+  }
+}
+
+static void redis_ping_timer_handler(ngx_event_t *ev) {
+  rdstore_data_t  *rdata = ev->data, *cmd_rdata;
+  if(!ev->timedout || ngx_exiting || ngx_quit)
+    return;
+  
+  ev->timedout = 0;
+  if(rdata->status == CONNECTED && rdata->ctx && rdata->sub_ctx) {
+    if((cmd_rdata = redis_cluster_rdata_from_cstr(rdata, redis_subscriber_channel)) != NULL) {
+      redis_command(cmd_rdata, redis_ping_callback, NULL, "PUBLISH %s ping", redis_subscriber_channel);
+    }
+    else {
+      //TODO: what to do?...
+    }
+    if(rdata->ping_interval > 0) {
+      ngx_add_timer(ev, rdata->ping_interval * 1000);
+    }
+  }
+}
+
+static ngx_int_t redis_data_tree_connector(rbtree_seed_t *seed, rdstore_data_t *rdata, ngx_int_t *total_rc) {
+  ngx_int_t  rc = redis_ensure_connected(rdata);
+  if(rc != NGX_OK) {
+    *total_rc = rc;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_init_worker(ngx_cycle_t *cycle) {
+  ngx_int_t rc = NGX_OK;
+  ngx_memzero(&redis_subscriber_id, sizeof(redis_subscriber_id));
+  ngx_memzero(&redis_subscriber_channel, sizeof(redis_subscriber_channel));
+  ngx_snprintf(redis_subscriber_id, 255, "worker:%i:time:%i", ngx_pid, ngx_time());
+  ngx_snprintf(redis_subscriber_channel, 255, "nchan:%s", redis_subscriber_id);
+  
+  redis_nginx_init();
+  
+  rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_connector, &rc);
+  return rc;
+}
+
+void redisCheckErrorCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReplyOk(c, r);
+}
+int redisReplyOk(redisAsyncContext *c, void *r) {
+  static const ngx_str_t script_error_start= ngx_string("ERR Error running script (call to f_");
+  redisReply *reply = (redisReply *)r;
+  if(reply == NULL) { //redis disconnected?...
+    if(c->err) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "connection to redis failed while waiting for reply - %s", c->errstr);
+    }
+    else {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "got a NULL redis reply for unknown reason");
+    }
+    return 0;
+  }
+  else if(reply->type == REDIS_REPLY_ERROR) {
+    if(ngx_strncmp(reply->str, script_error_start.data, script_error_start.len) == 0 && (unsigned ) reply->len > script_error_start.len + REDIS_LUA_HASH_LENGTH) {
+      char *hash = &reply->str[script_error_start.len];
+      redis_lua_script_t  *script;
+      REDIS_LUA_SCRIPTS_EACH(script) {
+        if (ngx_strncmp(script->hash, hash, REDIS_LUA_HASH_LENGTH)==0) {
+          ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS SCRIPT ERROR: %s :%s", script->name, &reply->str[script_error_start.len + REDIS_LUA_HASH_LENGTH + 2]);
+          return 0;
+        }
+      }
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS SCRIPT ERROR: (unknown): %s", reply->str);
+    }
+    else {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS REPLY ERROR: %s", reply->str);
+    }
+    return 0;
+  }
+  else {
+    return 1;
+  }
+}
+
+static void redisEchoCallback(redisAsyncContext *ac, void *r, void *privdata) {
+  redisReply      *reply = r;
+  rdstore_data_t  *rdata;
+  unsigned    i;
+  //nchan_channel_t * channel = (nchan_channel_t *)privdata;
+  if(ac) {
+    rdata = ac->data;
+    if(ac->err) {
+      if(rdata->status != DISCONNECTED) {
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "connection to redis failed - %s", ac->errstr);
+        rdt_set_status(rdata, DISCONNECTED, ac);
+      }
+      return;
+    }
+  }
+  else {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "connection to redis was terminated");
+    return;
+  }
+  if(reply == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS REPLY is NULL");
+    return;
+  }  
+  
+  switch(reply->type) {
+    case REDIS_REPLY_STATUS:
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_STATUS  %s", reply->str);
+      break;
+      
+    case REDIS_REPLY_ERROR:
+      redisCheckErrorCallback(ac, r, privdata);
+      break;
+      
+    case REDIS_REPLY_INTEGER:
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_INTEGER: %i", reply->integer);
+      break;
+      
+    case REDIS_REPLY_NIL:
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_NIL: nil");
+      break;
+      
+    case REDIS_REPLY_STRING:
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_STRING: %s", reply->str);
+      break;
+      
+    case REDIS_REPLY_ARRAY:
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_ARRAY: %i", reply->elements);
+      for(i=0; i< reply->elements; i++) {
+        redisEchoCallback(ac, reply->element[i], "  ");
+      }
+      break;
+  }
+  //redis_subscriber_command(NULL, NULL, "UNSUBSCRIBE {channel:%b}:pubsub", str(&(channel->id)));
+}
+
+static void redis_load_script_callback(redisAsyncContext *ac, void *r, void *privdata) {
+  redis_lua_script_t  *script = privdata;
+
+  redisReply *reply = r;
+  if (reply == NULL) return;
+  switch(reply->type) {
+    case REDIS_REPLY_ERROR:
+      nchan_log_error("Failed loading redis lua script %s :%s", script->name, reply->str);
+      break;
+    case REDIS_REPLY_STRING:
+      if(ngx_strncmp(reply->str, script->hash, REDIS_LUA_HASH_LENGTH)!=0) {
+        nchan_log_error("Redis lua script %s has unexpected hash %s (expected %s)", script->name, reply->str, script->hash);
+      }
+      else {
+        //everything went well
+        rdstore_data_t  *rdata = ac->data;
+        if(rdata->status == LOADING_SCRIPTS) {
+          rdata->scripts_loaded_count++;
+          if(rdata->scripts_loaded_count == redis_lua_scripts_count) {
+            
+            if(rdata->generation == 0) {
+              nchan_log_notice( "Established connection to redis at %V.",    rdata->connect_url);
+            }
+            else {
+              nchan_log_warning("Re-established connection to redis at %V.", rdata->connect_url);
+            }
+            
+            rdt_set_status(rdata, CONNECTED, NULL);
+          }
+        }
+      }
+      break;
+  }
+}
+
+static void redisInitScripts(rdstore_data_t *rdata){
+  redis_lua_script_t  *script;
+  if(rdata->ctx == NULL) {
+    ERR("unable to init lua scripts: redis connection not initialized.");
+  }
+  else {
+    rdt_set_status(rdata, LOADING_SCRIPTS, NULL);
+    rdata->scripts_loaded_count = 0;
+    REDIS_LUA_SCRIPTS_EACH(script) {
+      redisAsyncCommand(rdata->ctx, &redis_load_script_callback, script, "SCRIPT LOAD %s", script->script);
+    }
+  }
+}
+
+static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privdata);
+
+static void redis_nginx_connect_event_handler(const redisAsyncContext *ac, int status) {
+  //ERR("redis_nginx_connect_event_handler %v: %i", rdt.connect_url, status);
+  rdstore_data_t    *rdata = ac->data;
+  if(status != REDIS_OK) {
+    if(rdata->status != DISCONNECTED) {
+      char *action = rdata->generation == 0 ? "connect" : "reconnect";
+      if(ac->errstr) {
+        nchan_log_error("Can't %s to redis at %V: %s.", action, rdata->connect_url, ac->errstr);
+      }
+      else {
+        nchan_log_error("Can't %s to redis at %V.", action, rdata->connect_url);
+      }
+    }
+    rdt_set_status(rdata, DISCONNECTED, ac);
+  }
+}
+
+static void redis_nginx_disconnect_event_handler(const redisAsyncContext *ac, int status) {
+  rdstore_data_t    *rdata = ac->data;
+  
+  DBG("connection to redis for %V closed: %s", rdata->connect_url, ac->errstr);
+  
+  if(rdata->status == CONNECTED && !ngx_exiting && !ngx_quit && !rdata->shutting_down) {
+    if(ac->err) {
+      nchan_log_error("Lost connection to redis at %V: %s.", rdata->connect_url, ac->errstr);
+    }
+    else {
+      nchan_log_error("Lost connection to redis at %V.", rdata->connect_url);
+    }
+  }
+  rdt_set_status(rdata, DISCONNECTED, ac);
+  
+}
+
+static void redis_get_server_info(redisAsyncContext *ac);
+
+static void redis_check_if_still_loading_handler(ngx_event_t *ev) {
+  DBG("still loading?,,.");
+  rdstore_data_t   *rdata = ev->data;
+  if(rdata->status != DISCONNECTED && rdata->ctx) {
+    redis_get_server_info(rdata->ctx);
+  }
+  
+  ngx_free(ev);
+}
+
+void redis_get_server_info_callback(redisAsyncContext *ac, void *rep, void *privdata);
+
+
+static void redis_get_server_info(redisAsyncContext *ac) {
+  redisAsyncCommand(ac, redis_get_server_info_callback, NULL, "INFO");
+}
+
+
+
+
+void redis_get_server_info_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply             *reply = rep;
+  rdstore_data_t         *rdata = ac->data;
+  
+  //DBG("redis_get_server_info_callback %p", ac);
+  if(ac->err || !redisReplyOk(ac, rep) || reply->type != REDIS_REPLY_STRING) {
+    return;
+  }
+  
+  //is it loading?
+  if(ngx_strstrn((u_char *)reply->str, "loading:1", 8)) {
+    nchan_log_warning("Redis server at %V is still loading data.", rdata->connect_url);
+    ngx_event_t      *evt = ngx_calloc(sizeof(*evt), ngx_cycle->log);
+    nchan_init_timer(evt, redis_check_if_still_loading_handler, rdata);
+    rdt_set_status(rdata, LOADING, ac);
+    ngx_add_timer(evt, 1000);
+  }
+  else {
+    DBG("everything loaded and good to go");
+    redisInitScripts(rdata);
+    if(rdata->sub_ctx) {
+      //ERR("rdata->sub_ctx OK, subscribing for %V", rdata->connect_url);
+      if(redis_cluster_rdata_from_cstr(rdata, redis_subscriber_channel) == rdata) {
+        redisAsyncCommand(rdata->sub_ctx, redis_subscriber_callback, NULL, "SUBSCRIBE %s", redis_subscriber_channel);
+      }
+    }
+    else {
+      ERR("rdata->sub_ctx NULL, can't subscribe for %V", rdata->connect_url);
+    }
+  }
+  
+  //is it part of a cluster?
+  if(ac == rdata->ctx && ngx_strstrn((u_char *)reply->str, "cluster_enabled:1", 16)) {
+    DBG("is part of a cluster. learn more.");
+    redis_get_cluster_info(rdata);
+  }
+}
+
+void redis_nginx_select_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply             *reply = rep;
+  rdstore_data_t         *rdata = ac->data;
+  if ((reply == NULL) || (reply->type == REDIS_REPLY_ERROR)) {
+    if(rdata->status == CONNECTING) {
+      ERR("could not select redis database");
+    }
+    rdt_set_status(rdata, DISCONNECTED, ac);
+    redisAsyncFree(ac);
+  }
+  else if(rdata->ctx && rdata->sub_ctx && rdata->status == CONNECTING && !rdata->ctx->err && !rdata->sub_ctx->err) {
+    rdt_set_status(rdata, AUTHENTICATING, NULL);
+    
+    if(rdata->ctx == ac) {
+      redis_get_server_info(ac);
+    }
+  }
+}
+
+void redis_nginx_auth_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply             *reply = rep;
+  rdstore_data_t         *rdata = ac->data;
+  if ((reply == NULL) || (reply->type == REDIS_REPLY_ERROR)) {
+    if(rdata->status == CONNECTING) {
+      ERR("AUTH command failed, probably because the password is incorrect");
+      rdt_set_status(rdata, DISCONNECTED, ac);
+    }
+  }
+}
+
+static int redis_initialize_ctx(redisAsyncContext **ctx, rdstore_data_t *rdata) {
+  if(*ctx == NULL) {
+    redis_nginx_open_context(&rdata->connect_params.host, rdata->connect_params.port, rdata->connect_params.db, &rdata->connect_params.password, rdata, ctx);
+    if(*ctx != NULL) {
+      if(rdata->connect_params.password.len > 0) {
+        redisAsyncCommand(*ctx, redis_nginx_auth_callback, NULL, "AUTH %b", STR(&rdata->connect_params.password));
+      }
+      if(rdata->connect_params.db > 0) {
+        redisAsyncCommand(*ctx, redis_nginx_select_callback, NULL, "SELECT %d", rdata->connect_params.db);
+      }
+      else {
+        redis_get_server_info(*ctx);
+      }
+      redisAsyncSetConnectCallback(*ctx, redis_nginx_connect_event_handler);
+      redisAsyncSetDisconnectCallback(*ctx, redis_nginx_disconnect_event_handler);
+      return 1;
+    }
+    else {
+      ERR("can't initialize redis ctx %p", ctx);
+      return 0;
+    }
+  }
+  else {
+    return 0;
+  }
+}
+
+ngx_int_t redis_ensure_connected(rdstore_data_t *rdata) {
+  int connecting = 0;
+  if(redis_initialize_ctx(&rdata->ctx, rdata)) {
+    connecting = 1;
+  }
+  
+  if(redis_initialize_ctx(&rdata->sub_ctx, rdata)) {
+    connecting = 1;
+  }
+    
+  if(rdata->ctx && rdata->sub_ctx) {
+    if(connecting) {
+      rdt_set_status(rdata, CONNECTING, NULL);
+    }
+    return NGX_OK;
+  }
+  else {
+    return NGX_DECLINED;
+  }
+
+}
+
+static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, ngx_buf_t *buf, redisReply *r, uint16_t offset);
+
+#define SLOW_REDIS_REPLY 100 //ms
+
+static ngx_int_t log_redis_reply(char *name, ngx_msec_t t) {
+  ngx_msec_t   dt = ngx_current_msec - t;
+  if(dt >= SLOW_REDIS_REPLY) {
+    DBG("redis command %s took %i msec", name, dt);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t redisReply_to_int(redisReply *el, ngx_int_t *integer) {
+  if(CHECK_REPLY_INT(el)) {
+    *integer=el->integer;
+  }
+  else if(CHECK_REPLY_STR(el)) {
+    *integer=ngx_atoi((u_char *)el->str, el->len);
+  }
+  else {
+    return NGX_ERROR;
+  }
+  return NGX_OK;
+}
+
+typedef struct {
+  ngx_msec_t                    t;
+  char                         *name;
+  ngx_str_t                     channel_id;
+  nchan_msg_id_t               *msg_id;
+  ngx_str_t                     msg_key;
+  rdstore_data_t               *rdata;
+} redis_get_message_from_key_data_t;
+
+static void get_msg_from_msgkey_callback(redisAsyncContext *c, void *r, void *privdata);
+
+static void get_msg_from_msgkey_send(rdstore_data_t *rdata, void *pd) {
+  redis_get_message_from_key_data_t *d = pd;
+  if(rdata) {
+    redis_command(rdata, &get_msg_from_msgkey_callback, d, "EVALSHA %s 1 %b", redis_lua_scripts.get_message_from_key.hash, STR(&d->msg_key));
+  }
+  else {
+    ngx_free(d);
+  }
+}
+
+static void get_msg_from_msgkey_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_get_message_from_key_data_t *d = (redis_get_message_from_key_data_t *)privdata;
+  redisReply           *reply = r;
+  nchan_msg_t           msg;
+  ngx_buf_t             msgbuf;
+  ngx_str_t            *chid = &d->channel_id;
+  rdstore_data_t       *rdata = c->data;
+  
+  rdata->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  DBG("get_msg_from_msgkey_callback");
+  
+  log_redis_reply(d->name, d->t);
+  
+  if(!clusterKeySlotOk(c, r)) {
+    cluster_add_retry_command_with_channel_id(rdata->node.cluster, chid, get_msg_from_msgkey_send, d);
+    return;
+  }
+  
+  if(reply) {
+    if(chid == NULL) {
+      ERR("get_msg_from_msgkey channel id is NULL");
+      return;
+    }
+    if(msg_from_redis_get_message_reply(&msg, &msgbuf, reply, 0) != NGX_OK) {
+      ERR("invalid message or message absent after get_msg_from_key");
+      return;
+    }
+    nchan_store_publish_generic(chid, d->rdata, &msg, 0, NULL);
+  }
+  else {
+    //reply is NULL
+  }
+  ngx_free(d);
+}
+
+static bool cmp_err(cmp_ctx_t *cmp) {
+  ERR("msgpack parsing error: %s", cmp_strerror(cmp));
+  return false;
+}
+
+static bool cmp_to_str(cmp_ctx_t *cmp, ngx_str_t *str) {
+  ngx_buf_t      *mpbuf =(ngx_buf_t *)cmp->buf;
+  uint32_t        sz;
+  
+  if(cmp_read_str_size(cmp, &sz)) {
+    fwd_buf_to_str(mpbuf, sz, str);
+    return true;
+  }
+  else {
+    cmp_err(cmp);
+    return false;
+  }
+}
+
+static bool cmp_to_msg(cmp_ctx_t *cmp, nchan_msg_t *msg, ngx_buf_t *buf) {
+  ngx_buf_t  *mpb = (ngx_buf_t *)cmp->buf;
+  uint32_t    sz;
+  uint64_t    msgtag;
+  int32_t     ttl;
+  //ttl 
+  if(!cmp_read_int(cmp, &ttl)) {
+    return cmp_err(cmp);
+  }
+  assert(ttl >= 0);
+  if(ttl == 0) {
+    ttl++; // less than a second left for this message... give it a second's lease on life
+  }
+  msg->expires = ngx_time() + ttl;
+  
+  //msg id
+  if(!cmp_read_uinteger(cmp, (uint64_t *)&msg->id.time)) {
+    return cmp_err(cmp);
+  }
+  if(!cmp_read_uinteger(cmp, &msgtag)) {
+    return cmp_err(cmp);
+  }
+  else {
+    msg->id.tag.fixed[0] = msgtag;
+    msg->id.tagactive = 0;
+    msg->id.tagcount = 1;
+  }
+  
+  //msg prev_id
+  if(!cmp_read_uinteger(cmp, (uint64_t *)&msg->prev_id.time)) {
+    return cmp_err(cmp);
+  }
+  if(!cmp_read_uinteger(cmp, &msgtag)) {
+    return cmp_err(cmp);
+  }
+  else {
+    msg->prev_id.tag.fixed[0] = msgtag;
+    msg->prev_id.tagactive = 0;
+    msg->prev_id.tagcount = 1;
+  }
+  
+  //message data
+  if(!cmp_read_str_size(cmp, &sz)) {
+    return cmp_err(cmp);
+  }
+  set_buf(buf, mpb->pos, sz);
+  fwd_buf(mpb, sz);
+  buf->memory = 1;
+  buf->last_buf = 1;
+  buf->last_in_chain = 1;
+  msg->buf = buf;
+
+  //content-type
+  if(!cmp_read_str_size(cmp, &sz)) {
+    return cmp_err(cmp);
+  }
+  fwd_buf_to_str(mpb, sz, &msg->content_type);
+  
+  //eventsource_event
+  if(!cmp_read_str_size(cmp, &sz)) {
+    return cmp_err(cmp);
+  }
+  fwd_buf_to_str(mpb, sz, &msg->eventsource_event);
+  
+  return true;
+}
+
+static ngx_int_t get_msg_from_msgkey(ngx_str_t *channel_id, rdstore_data_t *rdata, nchan_msg_id_t *msgid, ngx_str_t *msg_redis_hash_key) {
+  rdstore_channel_head_t              *head;
+  redis_get_message_from_key_data_t   *d;
+  DBG("Get message from msgkey %V", msg_redis_hash_key);
+  
+  head = nchan_store_get_chanhead(channel_id, rdata);
+  if(head->sub_count == 0) {
+    DBG("Nobody wants this message we'll need to grab with an HMGET");
+    return NGX_OK;
+  }
+  
+  if((d=ngx_alloc(sizeof(*d) + (u_char)channel_id->len + (u_char)msg_redis_hash_key->len, ngx_cycle->log)) == 0) {
+    ERR("unable to allocate memory for callback data for message hmget");
+    return NGX_ERROR;
+  }
+  d->channel_id.data = (u_char *)&d[1];
+  nchan_strcpy(&d->channel_id, channel_id, 0);
+  
+  d->msg_key.data = d->channel_id.data + d->channel_id.len;
+  nchan_strcpy(&d->msg_key, msg_redis_hash_key, 0);
+  
+  d->t = ngx_current_msec;
+  d->rdata = rdata;
+  
+  d->name = "get_message_from_key";
+  
+  //d->hcln = put_current_subscribers_in_limbo(head);
+  //assert(d->hcln != 0);
+  if((rdata = redis_cluster_rdata_from_key(rdata, msg_redis_hash_key)) == NULL) {
+    return NGX_ERROR;
+  }
+  get_msg_from_msgkey_send(rdata, d);
+
+  return NGX_OK;
+}
+
+static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub);
+
+static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply             *reply = r;
+  redisReply             *el = NULL;
+  nchan_msg_t             msg;
+  ngx_buf_t               buf;
+  ngx_str_t              *chid = NULL;
+  ngx_str_t               pubsub_channel; 
+  ngx_str_t               msg_redis_hash_key = ngx_null_string;
+  ngx_uint_t              subscriber_id;
+  
+  ngx_buf_t               mpbuf;
+  cmp_ctx_t               cmp;
+  
+  rdstore_channel_head_t     *chanhead;
+  rdstore_data_t             *rdata = c->data;
+  
+  ngx_memzero(&buf, sizeof(buf)); 
+  
+  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "redis_subscriber_callback,  privdata=%p", privdata);
+  
+  chanhead = (rdstore_channel_head_t *)privdata;
+  
+  msg.expires = 0;
+  msg.refcount = 0;
+  msg.buf = NULL;
+
+  if(reply == NULL) return;
+  if(CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3)
+    && CHECK_REPLY_STRVAL(reply->element[0], "message")
+    && CHECK_REPLY_STR(reply->element[1])
+    && CHECK_REPLY_STR(reply->element[2])) {
+    
+    pubsub_channel.data = (u_char *)reply->element[1]->str;
+    pubsub_channel.len = reply->element[1]->len;
+  
+    //reply->element[1] is the pubsub channel name
+    el = reply->element[2];
+    
+    if(CHECK_REPLY_STRVAL(el, "ping") && ngx_strmatch(&pubsub_channel, (char *)&redis_subscriber_channel)) {
+      DBG("got pinged");
+    }
+    else if(CHECK_REPLY_STR(el)) {
+      uint32_t    array_sz;
+      unsigned    chid_present = 0;
+      ngx_str_t   extracted_channel_id;
+      unsigned    msgbuf_size_changed = 0;
+      int64_t     msgbuf_size;
+      //maybe a message?
+      set_buf(&mpbuf, (u_char *)el->str, el->len);
+      cmp_init(&cmp, &mpbuf, ngx_buf_reader, ngx_buf_writer);
+      if(cmp_read_array(&cmp, &array_sz)) {
+        
+        if(array_sz != 0) {
+          uint32_t      sz;
+          ngx_str_t     msg_type;
+          cmp_read_str_size(&cmp ,&sz);
+          fwd_buf_to_str(&mpbuf, sz, &msg_type);
+          
+          if(ngx_str_chop_if_startswith(&msg_type, "max_msgs+")) {
+            if(cmp_read_integer(&cmp, &msgbuf_size))
+              msgbuf_size_changed = 1; 
+            else
+              cmp_err(&cmp);
+          }
+          
+          if(ngx_str_chop_if_startswith(&msg_type, "ch+")) {
+            if(cmp_read_str_size(&cmp, &sz)) {
+              fwd_buf_to_str(&mpbuf, sz, &extracted_channel_id);
+              chid = &extracted_channel_id;
+            }
+            else {
+              cmp_err(&cmp);
+            }
+          }
+          else if(chanhead) {
+            chid = &chanhead->id;
+          }
+          
+          if(msgbuf_size_changed && (chanhead || ((chanhead = nchan_store_get_chanhead(chid, rdata)) != NULL))) {
+            chanhead->spooler.fn->broadcast_notice(&chanhead->spooler, NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE, (void *)(intptr_t )msgbuf_size);
+          }
+          
+          if(ngx_strmatch(&msg_type, "msg")) {
+            assert(array_sz == 9 + msgbuf_size_changed + chid_present);
+            if(chanhead != NULL && cmp_to_msg(&cmp, &msg, &buf)) {
+              //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "got msg %V", msgid_to_str(&msg));
+              nchan_store_publish_generic(chid, chanhead ? chanhead->rdt : rdata, &msg, 0, NULL);
+            }
+            else {
+              ERR("thought there'd be a channel id around for msg");
+            }
+          }
+          else if(ngx_strmatch(&msg_type, "msgkey")) {
+            assert(array_sz == 4 + msgbuf_size_changed + chid_present);
+            if(chanhead != NULL) {
+              uint64_t              msgtag;
+              nchan_msg_id_t        msgid;
+              
+              if(!cmp_read_uinteger(&cmp, (uint64_t *)&msgid.time)) {
+                cmp_err(&cmp);
+                return;
+              }
+              
+              if(!cmp_read_uinteger(&cmp, &msgtag)) {
+                cmp_err(&cmp);
+                return;
+              }
+              else {
+                msgid.tag.fixed[0] = msgtag;
+                msgid.tagactive = 0;
+                msgid.tagcount = 1;
+              }
+              
+              if(cmp_to_str(&cmp, &msg_redis_hash_key)) {
+                get_msg_from_msgkey(chid, chanhead ? chanhead->rdt : rdata, &msgid, &msg_redis_hash_key);
+              }
+            }
+            else {
+              ERR("thought there'd be a channel id around for msgkey");
+            }
+          }
+          else if(ngx_strmatch(&msg_type, "alert") && array_sz > 1) {
+            ngx_str_t    alerttype;
+            
+            if(!cmp_to_str(&cmp, &alerttype)) {
+              return;
+            }
+            
+            if(ngx_strmatch(&alerttype, "delete channel") && array_sz > 2) {
+              if(cmp_to_str(&cmp, &extracted_channel_id)) {
+                rdstore_channel_head_t *doomed_channel;
+                nchan_store_publish_generic(&extracted_channel_id, rdata, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+                doomed_channel = nchan_store_get_chanhead(&extracted_channel_id, rdata);
+                redis_chanhead_gc_add(doomed_channel, 0, "channel deleted");
+              }
+              else {
+                ERR("unexpected \"delete channel\" msgpack message from redis");
+              }
+            }
+            else if(ngx_strmatch(&alerttype, "unsub one") && array_sz > 3) {
+              if(cmp_to_str(&cmp, &extracted_channel_id)) {
+                cmp_to_str(&cmp, &extracted_channel_id);
+                cmp_read_uinteger(&cmp, (uint64_t *)&subscriber_id);
+                //TODO
+              }
+              ERR("unsub one not yet implemented");
+              assert(0);
+            }
+            else if(ngx_strmatch(&alerttype, "unsub all") && array_sz > 1) {
+              if(cmp_to_str(&cmp, &extracted_channel_id)) {
+                nchan_store_publish_generic(&extracted_channel_id, rdata, NULL, NGX_HTTP_CONFLICT, &NCHAN_HTTP_STATUS_409);
+              }
+            }
+            else if(ngx_strmatch(&alerttype, "unsub all except")) {
+              if(cmp_to_str(&cmp, &extracted_channel_id)) {
+                cmp_read_uinteger(&cmp, (uint64_t *)&subscriber_id);
+                //TODO
+              }
+              ERR("unsub all except not yet  implemented");
+              assert(0);
+            }
+            else {
+              ERR("unexpected msgpack alert from redis");
+              assert(0);
+            }
+          }
+          else {
+            ERR("unexpected msgpack message from redis");
+            assert(0);
+          }
+        }
+        else {
+          ERR("unexpected msgpack object from redis");
+          assert(0);
+        }
+      }
+      else {
+        ERR("invalid msgpack message from redis: %s", cmp_strerror(&cmp));
+        assert(0);
+      }
+    }
+    else { //not a string
+      redisEchoCallback(c, el, NULL);
+    }
+  }
+
+  else if(CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3)
+    && CHECK_REPLY_STRVAL(reply->element[0], "subscribe")
+    && CHECK_REPLY_STR(reply->element[1])
+    && CHECK_REPLY_INT(reply->element[2])) {
+
+    if(chanhead != NULL){
+      if(chanhead->pubsub_status != SUBBING) {
+        ERR("expected previous pubsub_status for channel %p (id: %V) to be SUBBING (%i), was %i", chanhead, &chanhead->id, SUBBING, chanhead->pubsub_status);
+      }
+      chanhead->pubsub_status = SUBBED;
+      
+      switch(chanhead->status) {
+        case NOTREADY:
+          chanhead->status = READY;
+          chanhead->spooler.fn->handle_channel_status_change(&chanhead->spooler);
+          //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "REDIS: PUB/SUB subscribed to %s, chanhead %p now READY.", reply->element[1]->str, chanhead);
+          break;
+        case READY:
+          ERR("REDIS: PUB/SUB already subscribed to %s, chanhead %p (id %V) already READY.", reply->element[1]->str, chanhead, &chanhead->id);
+          break;
+        case INACTIVE:
+          ERR("REDIS: PUB/SUB already unsubscribed from %s, chanhead %p (id %V) INACTIVE.", reply->element[1]->str, chanhead, &chanhead->id);
+          break;
+        default:
+          ERR("REDIS: PUB/SUB really unexpected chanhead status %i", chanhead->status);
+          assert(0);
+          //not sposed to happen
+      }
+    }
+    
+    DBG("REDIS: PUB/SUB subscribed to %s (%i total)", reply->element[1]->str, reply->element[2]->integer);
+  }
+  else if(CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3)
+    && CHECK_REPLY_STRVAL(reply->element[0], "unsubscribe")
+    && CHECK_REPLY_STR(reply->element[1])
+    && CHECK_REPLY_INT(reply->element[2])) {
+
+    DBG("REDIS: PUB/SUB unsubscribed from %s (%i total)", reply->element[1]->str, reply->element[2]->integer);
+    if(chanhead->pubsub_status == UNSUBBING) {
+      chanhead->pubsub_status = UNSUBBED;
+      free_chanhead(chanhead);
+    }
+  }
+  
+  else {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "no message, something else");
+    redisEchoCallback(c,r,privdata);
+  }
+}
+
+static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub);
+static ngx_int_t redis_subscriber_unregister(rdstore_channel_head_t *chanhead, subscriber_t *sub, uint8_t shutting_down);
+static void spooler_add_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
+  rdstore_channel_head_t *head = (rdstore_channel_head_t *)privdata;
+  head->sub_count++;
+  if(sub->type == INTERNAL) {
+    head->internal_sub_count++;
+  }
+  redis_subscriber_register(head, sub);
+}
+
+static void spooler_dequeue_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
+  //need individual subscriber
+  //TODO
+  rdstore_channel_head_t *head = (rdstore_channel_head_t *)privdata;
+  
+  head->sub_count--;
+  if(sub->type == INTERNAL) {
+    head->internal_sub_count--;
+  }
+  
+  if(head->rdt->status == CONNECTED) {
+    redis_subscriber_unregister(head, sub, head->shutting_down);
+  }
+  
+  if(head->sub_count == 0 && head->fetching_message_count == 0) {
+    redis_chanhead_gc_add(head, 0, "sub count == 0 and fetching_message_count == 0 after spooler dequeue");
+  }
+  
+}
+
+static void spooler_use_handler(channel_spooler_t *spl, void *d) {
+  //nothing. 
+}
+
+void spooler_get_message_start_handler(channel_spooler_t *spl, void *pd) {
+  ((rdstore_channel_head_t *)pd)->fetching_message_count++;
+}
+
+void spooler_get_message_finish_handler(channel_spooler_t *spl, void *pd) {
+  ((rdstore_channel_head_t *)pd)->fetching_message_count--;
+  assert(((rdstore_channel_head_t *)pd)->fetching_message_count >= 0);
+}
+
+static ngx_int_t start_chanhead_spooler(rdstore_channel_head_t *head) {
+  static channel_spooler_handlers_t handlers = {
+    spooler_add_handler,
+    spooler_dequeue_handler,
+    NULL,
+    spooler_use_handler,
+    spooler_get_message_start_handler,
+    spooler_get_message_finish_handler
+  };
+  start_spooler(&head->spooler, &head->id, &head->status, &nchan_store_redis, head->rdt->lcf, FETCH, &handlers, head);
+  return NGX_OK;
+}
+
+static void redis_subscriber_register_callback(redisAsyncContext *c, void *vr, void *privdata);
+
+typedef struct {
+  rdstore_channel_head_t *chanhead;
+  unsigned                generation;
+  subscriber_t           *sub;
+} redis_subscriber_register_t;
+
+static void redis_subscriber_register_send(rdstore_data_t *rdata, void *pd) {
+  redis_subscriber_register_t   *d = pd;
+  if(rdata) {
+    d->chanhead->reserved++;
+    redis_command(rdata, &redis_subscriber_register_callback, d, "EVALSHA %s 0 %b - %i", redis_lua_scripts.subscriber_register.hash, STR(&d->chanhead->id), REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL);
+  }
+  else {
+    d->sub->fn->release(d->sub, 0);
+    ngx_free(d);
+  }
+}
+
+
+static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub) {
+  redis_subscriber_register_t *sdata=NULL;
+  rdstore_data_t              *rdata;
+  if((sdata = ngx_alloc(sizeof(*sdata), ngx_cycle->log)) == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "No memory for sdata. Part IV, subparagraph 12 of the Cryptic Error Series.");
+    return NGX_ERROR;
+  }
+  sdata->chanhead = chanhead;
+  sdata->generation = chanhead->generation;
+  sdata->sub = sub;
+  
+  sub->fn->reserve(sub);
+  
+  //input: keys: [], values: [channel_id, subscriber_id, active_ttl]
+  //  'subscriber_id' can be '-' for new id, or an existing id
+  //  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
+  //output: subscriber_id, num_current_subscribers, next_keepalive_time
+  if((rdata = redis_cluster_rdata_from_channel(chanhead)) == NULL) {
+    return NGX_ERROR;
+  }
+  redis_subscriber_register_send(rdata, sdata);
+  
+  return NGX_OK;
+}
+
+static void redis_subscriber_register_callback(redisAsyncContext *c, void *vr, void *privdata) {
+  redis_subscriber_register_t *sdata= (redis_subscriber_register_t *) privdata;
+  redisReply                  *reply = (redisReply *)vr;
+  rdstore_data_t              *rdata = c->data;
+  int                          keepalive_ttl;
+  
+  rdata->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  sdata->chanhead->reserved--;
+  sdata->sub->fn->release(sdata->sub, 0);
+  
+  if(!clusterKeySlotOk(c, reply)) {
+    cluster_add_retry_command_with_chanhead(sdata->chanhead, redis_subscriber_register_send, sdata);
+    return; 
+  }
+  
+  if (!redisReplyOk(c, reply)) {
+    ngx_free(sdata);
+    return;
+  }
+  
+  if ( !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3) || !CHECK_REPLY_INT(reply->element[1]) || !CHECK_REPLY_INT(reply->element[2])) {
+    //no good
+    redisEchoCallback(c,reply,privdata);
+    return;
+  }
+  if(sdata->generation == sdata->chanhead->generation) {
+    //is the subscriber     
+    //TODO: set subscriber id
+    //sdata->sub->id = reply->element[1]->integer;
+  }
+  keepalive_ttl = reply->element[2]->integer;
+  if(keepalive_ttl > 0) {
+    if(!sdata->chanhead->keepalive_timer.timer_set) {
+      ngx_add_timer(&sdata->chanhead->keepalive_timer, keepalive_ttl * 1000);
+    }
+  }
+  ngx_free(sdata);
+}
+
+
+typedef struct {
+  ngx_str_t    *channel_id;
+  time_t        channel_timeout;
+} subscriber_unregister_data_t;
+
+static void redis_subscriber_unregister_callback(redisAsyncContext *c, void *r, void *privdata);
+static void redis_subscriber_unregister_send(rdstore_data_t *rdata, void *pd) {
+  //input: keys: [], values: [channel_id, subscriber_id, empty_ttl]
+  // 'subscriber_id' is an existing id
+  // 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
+  //output: subscriber_id, num_current_subscribers
+  if(rdata) {
+    redis_command(rdata, &redis_subscriber_unregister_callback, NULL, "EVALSHA %s 0 %b %i %i", redis_lua_scripts.subscriber_unregister.hash, STR(((subscriber_unregister_data_t *)pd)->channel_id), 0/*TODO: sub->id*/, ((subscriber_unregister_data_t *)pd)->channel_timeout);
+  }
+}
+
+static void redis_subscriber_unregister_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply      *reply = r;
+  rdstore_data_t  *rdata = c->data;
+  
+  rdata->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  if(reply && reply->type == REDIS_REPLY_ERROR) {
+    ngx_str_t    errstr;
+    ngx_str_t    countstr;
+    ngx_str_t    channel_id;
+    ngx_int_t    channel_timeout;
+    
+    errstr.data = (u_char *)reply->str;
+    errstr.len = strlen(reply->str);
+    
+    if(ngx_str_chop_if_startswith(&errstr, "CLUSTER KEYSLOT ERROR. ")) {
+      
+      nchan_scan_until_chr_on_line(&errstr, &countstr, ' ');
+      channel_timeout = ngx_atoi(countstr.data, countstr.len);
+      channel_id = errstr;
+      
+      subscriber_unregister_data_t  *d = cluster_retry_palloc(rdata->node.cluster, sizeof(*d) + sizeof(ngx_str_t) + channel_id.len);
+      if(!d) {
+        ERR("can't allocate add_fakesub_data for CLUSTER KEYSLOT ERROR retry");
+        return;
+      }
+      d->channel_timeout = channel_timeout;
+      d->channel_id = (ngx_str_t *)&d[1];
+      d->channel_id->data = (u_char *)&d->channel_id[1];
+      nchan_strcpy(d->channel_id, &channel_id, 0);
+      cluster_add_retry_command_with_channel_id(rdata->node.cluster, &channel_id, redis_subscriber_unregister_send, d);
+      
+      return;
+    }
+    
+  }
+  redisCheckErrorCallback(c, r, privdata);
+}
+
+static ngx_int_t redis_subscriber_unregister(rdstore_channel_head_t *chanhead, subscriber_t *sub, uint8_t shutting_down) {
+  nchan_loc_conf_t  *cf = sub->cf;
+  rdstore_data_t    *rdata;
+  
+  if((rdata = redis_cluster_rdata_from_channel(chanhead)) == NULL) {
+    return NGX_ERROR;
+  }
+  if(!shutting_down) {
+    subscriber_unregister_data_t d;
+    d.channel_id = &chanhead->id;
+    d.channel_timeout = cf->channel_timeout;
+    redis_subscriber_unregister_send(rdata, &d);
+  }
+  else {
+    redis_sync_command(rdata, "EVALSHA %s 0 %b %i %i", redis_lua_scripts.subscriber_unregister.hash, STR(&chanhead->id), 0/*TODO: sub->id*/, cf->channel_timeout);
+  }
+  return NGX_OK;
+}
+
+
+static void redisChannelKeepaliveCallback(redisAsyncContext *c, void *vr, void *privdata);
+
+static void redisChannelKeepaliveCallback_send(rdstore_data_t *rdata, void *pd) {
+  rdstore_channel_head_t   *head = pd;
+  if(rdata) {
+    head->reserved++;
+    redis_command(rdata, &redisChannelKeepaliveCallback, head, "EVALSHA %s 0 %b %i", redis_lua_scripts.channel_keepalive.hash, STR(&head->id), REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL);
+  }
+}
+
+static void redisChannelKeepaliveCallback(redisAsyncContext *c, void *vr, void *privdata) {
+  rdstore_channel_head_t   *head = (rdstore_channel_head_t *)privdata;
+  redisReply               *reply = (redisReply *)vr;
+  rdstore_data_t           *rdata = c->data;
+  
+  head->reserved--;
+  rdata->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  if(!clusterKeySlotOk(c, vr)) {
+    cluster_add_retry_command_with_chanhead(head, redisChannelKeepaliveCallback_send, head);
+    return;
+  }
+  
+  if(redisReplyOk(c, vr)) {
+    assert(CHECK_REPLY_INT(reply));
+    
+    //reply->integer == -1 means "let it disappear" (see channel_keepalive.lua)
+    
+    if(reply->integer != -1 && !head->keepalive_timer.timer_set) {
+      ngx_add_timer(&head->keepalive_timer, reply->integer * 1000);
+    }
+  }
+  
+}
+
+static void redis_channel_keepalive_timer_handler(ngx_event_t *ev) {
+  rdstore_channel_head_t   *head = ev->data;
+  rdstore_data_t           *rdata;
+  if(ev->timedout) {
+    ev->timedout=0;
+    if((rdata = redis_cluster_rdata_from_channel(head)) != NULL) {
+      redisChannelKeepaliveCallback_send(rdata, head);
+    }
+  }
+}
+
+void redis_associate_chanhead_with_rdata(rdstore_channel_head_t *head, rdstore_data_t *rdata) {
+  head->rd_prev = NULL;
+  head->rd_next = rdata->channels_head;
+  if(rdata->channels_head) {
+    rdata->channels_head->rd_prev = head;
+  }
+  rdata->channels_head = head;
+}
+
+ngx_int_t ensure_chanhead_pubsub_subscribed(rdstore_channel_head_t *ch) {
+  rdstore_data_t     *rdata;
+  if(ch->pubsub_status != SUBBED && (rdata = redis_cluster_rdata_from_channel(ch)) != NULL) {
+    ch->pubsub_status = SUBBING;
+    redis_subscriber_command(rdata, redis_subscriber_callback, ch, "SUBSCRIBE {channel:%b}:pubsub", STR(&ch->id));
+  }
+  return NGX_OK;
+}
+
+ngx_int_t redis_chanhead_catch_up_after_reconnect(rdstore_channel_head_t *ch) {
+  return spooler_catch_up(&ch->spooler);
+}
+
+static rdstore_channel_head_t *create_chanhead(ngx_str_t *channel_id, rdstore_data_t *rdata) {
+  rdstore_channel_head_t   *head;
+  
+  head=ngx_calloc(sizeof(*head) + sizeof(u_char)*(channel_id->len), ngx_cycle->log);
+  if(head==NULL) {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "can't allocate memory for (new) channel subscriber head");
+    return NULL;
+  }
+  head->id.len = channel_id->len;
+  head->id.data = (u_char *)&head[1];
+  ngx_memcpy(head->id.data, channel_id->data, channel_id->len);
+  head->sub_count=0;
+  head->fetching_message_count=0;
+  head->redis_subscriber_privdata = NULL;
+  head->status = NOTREADY;
+  head->pubsub_status = UNSUBBED;
+  head->generation = 0;
+  head->last_msgid.time=0;
+  head->last_msgid.tag.fixed[0]=0;
+  head->last_msgid.tagcount = 1;
+  head->last_msgid.tagactive = 0;
+  head->shutting_down = 0;
+  head->reserved = 0;
+  
+  head->in_gc_reaper = NULL;
+  
+  if(head->id.len >= 5 && ngx_strncmp(head->id.data, "meta/", 5) == 0) {
+    head->meta = 1;
+  }
+  else {
+    head->meta = 0;
+  }
+
+  ngx_memzero(&head->keepalive_timer, sizeof(head->keepalive_timer));
+  nchan_init_timer(&head->keepalive_timer, redis_channel_keepalive_timer_handler, head);
+  
+  if(channel_id->len > 2) { // absolutely no multiplexed channels allowed
+    assert(ngx_strncmp(head->id.data, "m/", 2) != 0);
+  }
+  
+  head->rd_next = NULL;
+  head->rd_prev = NULL;
+  head->rdt = rdata;
+  if(rdata->node.cluster) {
+    head->cluster.enabled = 1;
+    redis_cluster_associate_chanhead_with_rdata(head);
+  }
+  else {
+    redis_associate_chanhead_with_rdata(head, rdata);
+  }
+  
+  head->spooler.running=0;
+  start_chanhead_spooler(head);
+  if(head->meta) {
+    head->spooler.publish_events = 0;
+  }
+  
+  DBG("SUBSCRIBING to {channel:%V}:pubsub", channel_id);
+  ensure_chanhead_pubsub_subscribed(head);
+  CHANNEL_HASH_ADD(head);
+  
+  return head;
+}
+
+static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, rdstore_data_t *rdata) {
+  rdstore_channel_head_t    *head;
+  
+  CHANNEL_HASH_FIND(channel_id, head);
+  if(head==NULL) {
+    head = create_chanhead(channel_id, rdata);
+  }
+  if(head == NULL) {
+    ERR("can't create chanhead for redis store");
+    return NULL;
+  }
+  
+  if (head->status == INACTIVE) { //recycled chanhead
+    ensure_chanhead_pubsub_subscribed(head);
+    redis_chanhead_gc_withdraw(head);
+    
+    head->status = head->pubsub_status == SUBBED ? READY : NOTREADY;
+  }
+
+  if(!head->spooler.running) {
+    DBG("Spooler for channel %p %V wasn't running. start it.", head, &head->id);
+    start_chanhead_spooler(head);
+  }
+  
+  return head;
+}
+
+nchan_reaper_t *rdstore_get_chanhead_reaper(rdstore_channel_head_t *ch) {
+  if(ch->cluster.enabled) {
+    rdstore_data_t *rdata;
+    if((rdata = redis_cluster_rdata_from_channel(ch)) != NULL && rdata->status == CONNECTED) {
+      return &rdata->chanhead_reaper;
+    }
+    else {
+      return &ch->rdt->node.cluster->chanhead_reaper;
+    }
+  }
+  else {
+    return &ch->rdt->chanhead_reaper;
+  }
+}
+
+ngx_int_t redis_chanhead_gc_add_to_reaper(nchan_reaper_t *reaper, rdstore_channel_head_t *head, ngx_int_t expire, const char *reason) {
+  assert(head->sub_count == 0);
+    
+  if(head->in_gc_reaper && head->in_gc_reaper != reaper) {
+    redis_chanhead_gc_withdraw(head);
+  }
+    
+  if(!head->in_gc_reaper) {
+    assert(head->status != INACTIVE);
+    head->status = INACTIVE;
+    head->gc_time = ngx_time() + (expire == 0 ? NCHAN_CHANHEAD_EXPIRE_SEC : expire);
+    head->in_gc_reaper = reaper;
+    
+    nchan_reaper_add(reaper, head);
+    
+    DBG("gc_add chanhead %V to %s (%s)", &head->id, reaper->name, reason);
+  }
+  else {
+    assert(head->in_gc_reaper == reaper);
+    ERR("gc_add chanhead %V to %s: already added (%s)", &head->id, reaper->name, reason);
+  }
+
+  return NGX_OK;
+}
+
+
+ngx_int_t redis_chanhead_gc_add(rdstore_channel_head_t *head, ngx_int_t expire, const char *reason) {
+  return redis_chanhead_gc_add_to_reaper(rdstore_get_chanhead_reaper(head), head, expire, reason);
+}
+
+ngx_int_t redis_chanhead_gc_withdraw(rdstore_channel_head_t *chanhead) {
+  if(chanhead->in_gc_reaper) {
+    DBG("gc_withdraw chanhead %s from %V", chanhead->in_gc_reaper->name, &chanhead->id);
+    assert(chanhead->status == INACTIVE);
+    
+    nchan_reaper_withdraw(chanhead->in_gc_reaper, chanhead);
+    chanhead->in_gc_reaper = NULL;
+  }
+  else {
+    DBG("gc_withdraw chanhead (%V), but not in gc reaper", &chanhead->id);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_publish_generic(ngx_str_t *channel_id, rdstore_data_t *rdata, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line){
+  rdstore_channel_head_t   *head;
+  ngx_int_t                 ret;
+  //redis_channel_head_cleanup_t *hcln;
+  
+  head = nchan_store_get_chanhead(channel_id, rdata);
+  
+  if(head->sub_count > 0) {
+    if(msg) {
+      assert(msg->id.tagcount == 1);
+      head->last_msgid.time = msg->id.time;
+      head->last_msgid.tag.fixed[0] = msg->id.tag.fixed[0];
+      head->last_msgid.tagcount = 1;
+      head->last_msgid.tagactive = 0;
+      
+      head->spooler.fn->respond_message(&head->spooler, msg);
+    }
+    else {
+      head->spooler.fn->broadcast_status(&head->spooler, status_code, status_line);
+    }
+    ret= NGX_OK;
+  }
+  else {
+    ret= NCHAN_MESSAGE_QUEUED;
+  }
+  return ret;
+}
+
+static ngx_int_t redis_array_to_channel(redisReply *r, nchan_channel_t *ch) {
+  if ( CHECK_REPLY_ARRAY_MIN_SIZE(r, 4)
+    && CHECK_REPLY_INT(r->element[0])
+    && CHECK_REPLY_INT(r->element[1])
+    && CHECK_REPLY_INT(r->element[2]) ) {
+    
+    //channel info
+    ch->expires = ngx_time() + r->element[0]->integer;
+    ch->last_seen = r->element[1]->integer;
+    ch->subscribers = r->element[2]->integer;
+    ch->messages = r->element[3]->integer;
+    
+    //no id?..
+    ch->id.len=0;
+    ch->id.data=NULL;
+    
+    //last message id
+    if( CHECK_REPLY_ARRAY_MIN_SIZE(r, 5)
+      && CHECK_REPLY_STR(r->element[4])) {
+      
+      ngx_str_t      msgid;
+      msgid.data = (u_char *)r->element[4]->str;
+      msgid.len = r->element[4]->len;
+      
+      if(msgid.len > 0 && nchan_parse_compound_msgid(&ch->last_published_msg_id, &msgid, 1) != NGX_OK) {
+        ERR("failed to parse last-msgid %V from redis", &msgid);
+      }
+      else {
+        nchan_msg_id_t  zeroid = NCHAN_OLDEST_MSGID;
+        ch->last_published_msg_id = zeroid;
+      }
+    }
+    
+    //queued messages
+    if( CHECK_REPLY_ARRAY_MIN_SIZE(r, 6)
+      && CHECK_REPLY_INT(r->element[5])) {
+      
+      ch->messages = r->element[5]->integer;
+    }
+    
+    return NGX_OK;
+  }
+  else if(CHECK_REPLY_NIL(r)) {
+    return NGX_DECLINED;
+  }
+  else {
+    return NGX_ERROR;
+  }
+}
+
+typedef struct {
+  ngx_msec_t           t;
+  char                *name;
+  ngx_str_t           *channel_id;
+  callback_pt          callback;
+  void                *privdata;
+} redis_channel_callback_data_t;
+
+#define CREATE_CALLBACK_DATA(d, rdata, namestr, channel_id, callback, privdata) \
+  do {                                                                       \
+    if ((d = ngx_alloc(sizeof(*d) + ((rdata->node.cluster != NULL) ? (sizeof(*channel_id) + channel_id->len) : 0), ngx_cycle->log)) == NULL) { \
+      ERR("Can't allocate redis %s channel callback data", namestr);         \
+      return NGX_ERROR;                                                      \
+    }                                                                        \
+    d->t = ngx_current_msec;                                                 \
+    d->name = namestr;                                                       \
+    if(rdata->node.cluster != NULL) {                                        \
+      /* might need to use channel id later to retry the command */          \
+      d->channel_id = (ngx_str_t *)&d[1];                                    \
+      d->channel_id->data = (u_char *)&d->channel_id[1];                     \
+      nchan_strcpy(d->channel_id, channel_id, 0);                            \
+    }                                                                        \
+    else {                                                                   \
+      d->channel_id = channel_id;                                            \
+    }                                                                        \
+    d->callback = callback;                                                  \
+    d->privdata = privdata;                                                  \
+  } while(0)
+
+static void redisChannelInfoCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply *reply=r;
+  redis_channel_callback_data_t *d=(redis_channel_callback_data_t *)privdata;
+  nchan_channel_t channel;
+  ngx_memzero(&channel, sizeof(channel)); // for ddebugging. this should be removed later.
+  
+  log_redis_reply(d->name, d->t);
+  
+  if(d->callback) {
+    if(reply) {
+      switch(redis_array_to_channel(reply, &channel)) {
+        case NGX_OK:
+          d->callback(NGX_OK, &channel, d->privdata);
+          break;
+        case NGX_DECLINED: //not found
+          d->callback(NGX_OK, NULL, d->privdata);
+          break;
+        case NGX_ERROR:
+        default:
+          d->callback(NGX_ERROR, NULL, d->privdata);
+          redisEchoCallback(c, r, privdata);
+      }
+    }
+    else {
+      d->callback(NGX_ERROR, NULL, d->privdata);
+    }
+  }
+}
+
+static void redisChannelDeleteCallback(redisAsyncContext *c, void *r, void *privdata);
+
+static void nchan_store_delete_channel_send(rdstore_data_t *rdata, void *pd) {
+  redis_channel_callback_data_t *d = pd;
+  if(rdata) {
+    redis_command(rdata, &redisChannelDeleteCallback, d, "EVALSHA %s 0 %b", redis_lua_scripts.delete.hash, STR(d->channel_id));
+  }
+  else {
+    redisChannelDeleteCallback(NULL, NULL, d);
+  }
+}
+
+static void redisChannelDeleteCallback(redisAsyncContext *ac, void *r, void *privdata) {
+  rdstore_data_t  *rdata;
+  
+  if(ac) {
+    rdata = ac->data;
+    rdata->pending_commands--;
+    
+    if(!clusterKeySlotOk(ac, r)) {
+      redis_channel_callback_data_t  *d = privdata;
+      
+      cluster_add_retry_command_with_channel_id(rdata->node.cluster, d->channel_id, nchan_store_delete_channel_send, privdata);
+      return;
+    }
+  }
+  redisChannelInfoCallback(ac, r, privdata);
+  ngx_free(privdata);
+}
+
+static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  redis_channel_callback_data_t *d;
+  rdstore_data_t                *rdata = cf->redis.privdata;
+  
+  CREATE_CALLBACK_DATA(d, rdata, "delete", channel_id, callback, privdata);
+  
+  if((rdata = redis_cluster_rdata_from_channel_id(rdata, channel_id)) == NULL) {
+    return NGX_ERROR;
+  }
+  
+  nchan_store_delete_channel_send(rdata, d);
+  
+  return NGX_OK;
+}
+
+
+static void redisChannelFindCallback(redisAsyncContext *c, void *r, void *privdata);
+
+static void nchan_store_find_channel_send(rdstore_data_t *rdata, void *pd) {
+  redis_channel_callback_data_t *d = pd;
+  if(rdata) {
+    redis_command(rdata, &redisChannelFindCallback, d, "EVALSHA %s 0 %b", redis_lua_scripts.find_channel.hash, STR(d->channel_id));
+  }
+  else {
+    redisChannelFindCallback(NULL, NULL, d);
+  }
+}
+
+static void redisChannelFindCallback(redisAsyncContext *ac, void *r, void *privdata) {
+  rdstore_data_t                 *rdata;
+  
+  if(ac) {
+    rdata = ac->data;
+    rdata->pending_commands--;
+    nchan_update_stub_status(redis_pending_commands, -1);
+  }
+  
+  if(ac && !clusterKeySlotOk(ac, r)) {
+    redis_channel_callback_data_t  *d = privdata;
+    cluster_add_retry_command_with_channel_id(rdata->node.cluster, d->channel_id, nchan_store_find_channel_send, privdata);
+    return;
+  }
+  
+  redisChannelInfoCallback(ac, r, privdata);
+  ngx_free(privdata);
+}
+
+static ngx_int_t nchan_store_find_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  redis_channel_callback_data_t *d;
+  rdstore_data_t                *rdata = cf->redis.privdata;
+  CREATE_CALLBACK_DATA(d, rdata, "find_channel", channel_id, callback, privdata);
+  
+  if((rdata = redis_cluster_rdata_from_channel_id(rdata, channel_id)) == NULL) {
+    return NGX_ERROR;
+  }
+  nchan_store_find_channel_send(rdata, d);
+  
+  return NGX_OK;
+}
+
+typedef struct {
+  nchan_msg_t   msg;
+  ngx_buf_t     buf;
+} getmessage_blob_t;
+
+static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, ngx_buf_t *buf, redisReply *r, uint16_t offset) {
+  
+  redisReply         **els = r->element;
+  size_t               content_type_len = 0, es_event_len = 0;
+  ngx_int_t            time_int, ttl;
+  
+  if(CHECK_REPLY_ARRAY_MIN_SIZE(r, offset + 7)
+   && CHECK_REPLY_INT(els[offset])            //msg TTL
+   && CHECK_REPLY_INT_OR_STR(els[offset+1])   //id - time
+   && CHECK_REPLY_INT_OR_STR(els[offset+2])   //id - tag
+   && CHECK_REPLY_INT_OR_STR(els[offset+3])   //prev_id - time
+   && CHECK_REPLY_INT_OR_STR(els[offset+4])   //prev_id - tag
+   && CHECK_REPLY_STR(els[offset+5])   //message
+   && CHECK_REPLY_STR(els[offset+6])   //content-type
+   && CHECK_REPLY_STR(els[offset+7])){ //eventsource event
+     
+    content_type_len=els[offset+6]->len;
+    es_event_len = els[offset+7]->len;
+    
+    ngx_memzero(msg, sizeof(*msg));
+    ngx_memzero(buf, sizeof(*buf));
+    //set up message buffer;
+    msg->buf = buf;
+    
+    buf->start = buf->pos = (u_char *)els[offset+5]->str;
+    buf->end = buf->last = buf->start + els[offset+5]->len;
+    buf->memory = 1;
+    buf->last_buf = 1;
+    buf->last_in_chain = 1;
+    
+    if(redisReply_to_int(els[offset], &ttl) != NGX_OK) {
+      ERR("invalid ttl integer value is msg response from redis");
+      return NGX_ERROR;
+    }
+    assert(ttl >= 0);
+    if(ttl == 0)
+      ttl++; // less than a second left for this message... give it a second's lease on life
+
+    msg->expires = ngx_time() + ttl;
+    
+    if(content_type_len > 0) {
+      msg->content_type.len=content_type_len;
+      msg->content_type.data=(u_char *)els[offset+6]->str;
+    }
+    
+    if(es_event_len > 0) {
+      msg->eventsource_event.len=es_event_len;
+      msg->eventsource_event.data=(u_char *)els[offset+7]->str;
+    }
+    
+    if(redisReply_to_int(els[offset+1], &time_int) == NGX_OK) {
+      msg->id.time = time_int;
+    }
+    else {
+      msg->id.time = 0;
+      ERR("invalid msg time from redis");
+    }
+    
+    redisReply_to_int(els[offset+2], (ngx_int_t *)&msg->id.tag.fixed[0]); // tag is a uint, meh.
+    msg->id.tagcount = 1;
+    msg->id.tagactive = 0;
+    
+    redisReply_to_int(els[offset+3], &time_int);
+    msg->prev_id.time = time_int;
+    redisReply_to_int(els[offset+4], (ngx_int_t *)&msg->prev_id.tag.fixed[0]);
+    msg->prev_id.tagcount = 1;
+    msg->prev_id.tagactive = 0;
+    
+    return NGX_OK;
+  }
+  else {
+    ERR("invalid message redis reply");
+    return NGX_ERROR;
+  }
+}
+
+typedef struct {
+  ngx_msec_t              t;
+  char                   *name;
+  ngx_str_t              *channel_id;
+  nchan_msg_tiny_id_t     msg_id;
+  callback_pt             callback;
+  void                   *privdata;
+} redis_get_message_data_t;
+
+static void redis_get_message_callback(redisAsyncContext *c, void *r, void *privdata);
+
+static void nchan_store_async_get_message_send(rdstore_data_t *rdata, void *pd) {
+  redis_get_message_data_t           *d = pd;
+  //input:  keys: [], values: [channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl, subscriber_channel]
+  //subscriber channel is not given, because we don't care to subscribe
+  if(rdata) {
+    redis_command(rdata, &redis_get_message_callback, d, "EVALSHA %s 0 %b %i %i %s", redis_lua_scripts.get_message.hash, STR(d->channel_id), d->msg_id.time, d->msg_id.tag, "FILO", 0);
+  }
+  else {
+    //TODO: pass on a get_msg error status maybe?
+    ngx_free(d);
+  }
+}
+
+static void redis_get_message_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply                *reply= r;
+  redis_get_message_data_t  *d= (redis_get_message_data_t *)privdata;
+  nchan_msg_t                msg;
+  ngx_buf_t                  msgbuf;
+  rdstore_data_t            *rdata = c->data;
+  
+  rdata->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  if(!clusterKeySlotOk(c, r)) {
+    cluster_add_retry_command_with_channel_id(rdata->node.cluster, d->channel_id, nchan_store_async_get_message_send, d);
+    return;
+  }
+  
+  if(d == NULL) {
+    ERR("redis_get_mesage_callback has NULL userdata");
+    return;
+  }
+  
+  log_redis_reply(d->name, d->t);
+  
+  //output: result_code, msg_time, msg_tag, message, content_type,  channel-subscriber-count
+  // result_code can be: 200 - ok, 403 - channel not found, 404 - not found, 410 - gone, 418 - not yet available
+  
+  if (!redisReplyOk(c, r) || !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 1) || !CHECK_REPLY_INT(reply->element[0]) ) {
+    //no good
+    ngx_free(d);
+    return;
+  }
+  
+  switch(reply->element[0]->integer) {
+    case 200: //ok
+      if(msg_from_redis_get_message_reply(&msg, &msgbuf, reply, 1) == NGX_OK) {
+        d->callback(MSG_FOUND, &msg, d->privdata);
+      }
+      break;
+    case 403: //channel not found
+    case 404: //not found
+      d->callback(MSG_NOTFOUND, NULL, d->privdata);
+      break;
+    case 410: //gone
+      d->callback(MSG_EXPIRED, NULL, d->privdata);
+      break;
+    case 418: //not yet available
+      d->callback(MSG_EXPECTED, NULL, d->privdata);
+      break;
+  }
+  
+  ngx_free(d);
+}
+
+static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  redis_get_message_data_t           *d;
+  rdstore_data_t                     *rdata = cf->redis.privdata;
+  if(callback==NULL) {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "no callback given for async get_message. someone's using the API wrong!");
+    return NGX_ERROR;
+  }
+  
+  assert(msg_id->tagcount == 1);
+  
+  CREATE_CALLBACK_DATA(d, rdata, "get_message", channel_id, callback, privdata);
+  d->msg_id.time = msg_id->time;
+  d->msg_id.tag = msg_id->tag.fixed[0];
+  
+  if((rdata = redis_cluster_rdata_from_channel_id(rdata, channel_id)) == NULL) {
+    return NGX_ERROR;
+  }
+  nchan_store_async_get_message_send(rdata, d);
+  return NGX_OK; //async only now!
+}
+
+
+typedef struct nchan_redis_conf_ll_s nchan_redis_conf_ll_t;
+struct nchan_redis_conf_ll_s {
+  nchan_redis_conf_t     *cf;
+  nchan_loc_conf_t       *loc_conf;
+  nchan_redis_conf_ll_t  *next;
+};
+
+nchan_redis_conf_ll_t   *redis_conf_head;
+
+ngx_int_t nchan_store_redis_add_server_conf(ngx_conf_t *cf, nchan_redis_conf_t *rcf, nchan_loc_conf_t *loc_conf) {
+  nchan_redis_conf_ll_t  *rcf_ll = ngx_palloc(cf->pool, sizeof(*rcf_ll));
+  rcf_ll->cf = rcf;
+  rcf_ll->loc_conf = loc_conf;
+  rcf_ll->next = redis_conf_head;
+  redis_conf_head = rcf_ll;
+  return NGX_OK;
+}
+
+ngx_int_t nchan_store_redis_remove_server_conf(ngx_conf_t *cf, nchan_redis_conf_t *rcf) {
+  nchan_redis_conf_ll_t  *cur, *prev;
+  
+  for(cur = redis_conf_head, prev = NULL; cur != NULL; prev = cur, cur = cur->next) {
+    if(cur->cf == rcf) { //found it
+      if(prev == NULL) {
+        redis_conf_head = cur->next;
+      }
+      else {
+        prev->next = cur->next;
+      }
+      //don't need to ngx_pfree
+      return NGX_OK;
+    }
+  }
+  return NGX_OK;
+}
+
+//initialization
+static ngx_int_t nchan_store_init_module(ngx_cycle_t *cycle) {
+  ngx_core_conf_t                *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  nchan_worker_processes = ccf->worker_processes;
+  return NGX_OK;
+}
+
+
+//rbtree for all redis connections
+static void *redis_data_rbtree_node_id(void *data) {
+  return &((rdstore_data_t *)data)->connect_params;
+}
+static uint32_t redis_data_rbtree_bucketer(void *vid) {
+  redis_connect_params_t   *id = (redis_connect_params_t *)vid;
+  return (uint32_t )id->port;
+}
+static ngx_int_t redis_data_rbtree_compare(void *v1, void *v2) {
+  redis_connect_params_t   *id1 = (redis_connect_params_t *)v1;
+  redis_connect_params_t   *id2 = (redis_connect_params_t *)v2;
+  
+  if(id1->port > id2->port)
+    return 1;
+  else if (id1->port < id2->port)
+    return -1;
+  
+  if(id1->db > id2->db)
+    return 1;
+  else if (id1->db < id2->db)
+    return -1;
+  
+  if(id1->host.len > id2->host.len)
+    return 1;
+  else if(id1->host.len < id2->host.len)
+    return -1;
+  
+  return ngx_strncmp(id1->host.data, id2->host.data, id1->host.len);
+}
+
+ngx_int_t rdstore_initialize_chanhead_reaper(nchan_reaper_t *reaper, char *name) {
+  
+  nchan_reaper_start(reaper, 
+              name, 
+              offsetof(rdstore_channel_head_t, gc_prev), 
+              offsetof(rdstore_channel_head_t, gc_next), 
+  (ngx_int_t (*)(void *, uint8_t)) nchan_redis_chanhead_ready_to_reap,
+  (void (*)(void *)) redis_store_reap_chanhead,
+              4
+  );
+    
+  return NGX_OK;
+}
+
+static void redis_stall_timer_handler(ngx_event_t *ev) {
+  /*rdstore_data_t  *rdata = ev->data;
+  
+  
+  if(!ev->timedout || ngx_exiting || ngx_quit || rdata->shutting_down)
+    return;
+  //ERR("redis_stall_timer_handler PRE  ctr: %d ctr_while_checking: %d, chk: %i", rdata->stall_counter, rdata->stall_counter_while_checking, rdata->stall_count_check);
+  ev->timedout = 0;
+  if(rdata->status != CONNECTED) {
+   return;
+  }
+  if( 0 ) { //stalled
+    if(rdata->stall_counter > 0) {
+      //yep, it stalled
+      if(rdata->ctx) {
+        redisAsyncFree(rdata->ctx);
+        rdata->ctx = NULL;
+      }
+      if(rdata->sub_ctx) {
+        redisAsyncFree(rdata->sub_ctx);
+        rdata->sub_ctx = NULL;
+      }
+      if(rdata->sync_ctx) {
+        redisFree(rdata->sync_ctx);
+        rdata->sync_ctx = NULL;
+      }
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "Detected stalled connection to Redis server %V.", rdata->connect_url);
+      rdt_set_status(rdata, DISCONNECTED, NULL);
+      //ERR("redis_stall_timer_handler DSCN ctr: %d ctr_while_checking: %d, chk: %i", rdata->stall_counter, rdata->stall_counter_while_checking, rdata->stall_count_check);
+      return;
+    }
+    else {
+      //ERR("all good");
+    }
+  }
+  else if(rdata->stall_counter != 0) {
+    //ERR("will check");
+    rdata->stall_count_check = 1;
+  }
+  //ERR("redis_stall_timer_handler POST ctr: %d ctr_while_checking: %d, chk: %i", rdata->stall_counter, rdata->stall_counter_while_checking, rdata->stall_count_check);
+  if(REDIS_STALL_CHECK_TIME > 0) {
+    ngx_add_timer(ev, REDIS_STALL_CHECK_TIME);
+  }
+  */
+}
+
+rdstore_data_t *redis_create_rdata(ngx_str_t *url, redis_connect_params_t *rcp, nchan_redis_conf_t *rcf, nchan_loc_conf_t *lcf) {
+  ngx_rbtree_node_t     *node;
+  rdstore_data_t        *rdata;
+  size_t                 reaper_name_len;
+  char                  *reaper_name;
+  
+  reaper_name_len = strlen("redis chanhead ()  ") + url->len;
+  
+  if((node = rbtree_create_node(&redis_data_tree, sizeof(*rdata) + reaper_name_len)) == NULL) {
+    ERR("can't create rbtree node for redis connection");
+    return NULL;
+  }
+  
+  rdata = (rdstore_data_t *)rbtree_data_from_node(node);
+  ngx_memzero(rdata, sizeof(*rdata));
+  rdata->connect_params = *rcp;
+  rdata->status = DISCONNECTED;
+  rdata->generation = 0;
+  rdata->shutting_down = 0;
+  rdata->lcf = lcf;
+  nchan_init_timer(&rdata->reconnect_timer, redis_reconnect_timer_handler, rdata);
+  nchan_init_timer(&rdata->ping_timer, redis_ping_timer_handler, rdata);
+
+  rdata->pending_commands = 0;  
+  nchan_init_timer(&rdata->stall_timer, redis_stall_timer_handler, rdata);
+  
+  rdata->channels_head = NULL;
+  rdata->almost_deleted_channels_head = NULL;
+  
+  reaper_name = (char *)&rdata[1];
+  ngx_sprintf((u_char *)reaper_name, "redis chanhead (%V)%Z", url);
+  rdstore_initialize_chanhead_reaper(&rdata->chanhead_reaper, reaper_name);
+  
+  rdata->ping_interval = rcf->ping_interval;
+  rdata->connect_url = url;
+  
+  if(rbtree_insert_node(&redis_data_tree, node) != NGX_OK) {
+    ERR("couldn't insert redis date node");
+    rbtree_destroy_node(&redis_data_tree, node);
+    return NULL;
+  }
+  
+  return rdata;
+}
+
+rdstore_data_t *find_rdata_by_url(ngx_str_t *url) {
+  redis_connect_params_t rcp;
+  parse_redis_url(url, &rcp);
+  return find_rdata_by_connect_params(&rcp);
+}
+
+rdstore_data_t *find_rdata_by_connect_params(redis_connect_params_t *rcp) {
+  rdstore_data_t        *rdata;
+  ngx_rbtree_node_t     *node;
+  if((node = rbtree_find_node(&redis_data_tree, rcp)) == NULL) {
+    return NULL;
+  }
+  rdata = (rdstore_data_t *)rbtree_data_from_node(node);
+  return rdata;
+}
+
+ngx_int_t redis_add_connection_data(nchan_redis_conf_t *rcf, nchan_loc_conf_t *lcf, ngx_str_t *override_url) {
+  rdstore_data_t          *rdata;
+  redis_connect_params_t   rcp;
+  static ngx_str_t         default_redis_url = ngx_string(NCHAN_REDIS_DEFAULT_URL);
+  ngx_str_t               *url;
+  
+  if(rcf->url.len == 0) {
+    rcf->url = default_redis_url;
+  }
+  url = override_url ? override_url : &rcf->url;
+  
+  if(url->len == 0) {
+    url = &default_redis_url;
+  }
+  
+  parse_redis_url(url, &rcp);
+  
+  if((rdata = find_rdata_by_connect_params(&rcp)) == NULL) {
+    rdata = redis_create_rdata(url, &rcp, rcf, lcf);
+  }
+  else {
+    if(rcf->ping_interval > 0 && rcf->ping_interval < rdata->ping_interval) {
+      //shorter ping interval wins
+      rdata->ping_interval = rcf->ping_interval;
+    }
+  }
+  
+  rcf->privdata = rdata;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
+  nchan_redis_conf_t    *rcf;
+  nchan_redis_conf_ll_t *cur;
+  nchan_main_conf_t     *mcf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
+  
+  if(mcf->redis_publish_message_msgkey_size == NGX_CONF_UNSET_SIZE) {
+    mcf->redis_publish_message_msgkey_size = NCHAN_REDIS_DEFAULT_PUBSUB_MESSAGE_MSGKEY_SIZE;
+  }
+  redis_publish_message_msgkey_size = mcf->redis_publish_message_msgkey_size;
+  
+  rbtree_init(&redis_data_tree, "redis connection data", redis_data_rbtree_node_id, redis_data_rbtree_bucketer, redis_data_rbtree_compare);
+  
+  redis_cluster_init_postconfig(cf);
+  
+  for(cur = redis_conf_head; cur != NULL; cur = cur->next) {
+    rcf = cur->cf;
+    if(!rcf->enabled) {
+      ERR("there's a non-enabled redis_conf_t here");
+      continue;
+    }
+    
+    if(rcf->upstream) {
+      ngx_uint_t                   i;
+      ngx_array_t                 *servers = rcf->upstream->servers;
+      ngx_http_upstream_server_t  *usrv = servers->elts;
+      ngx_str_t                   *upstream_url;
+      
+      for(i=0; i < servers->nelts; i++) {
+        upstream_url = &usrv[i].name;
+        redis_add_connection_data(rcf, cur->loc_conf, upstream_url);
+      }
+    }
+    else {
+      redis_add_connection_data(rcf, cur->loc_conf, NULL);
+    }
+  }
+  
+  return NGX_OK;
+}
+
+static void nchan_store_create_main_conf(ngx_conf_t *cf, nchan_main_conf_t *mcf) {
+  mcf->redis_publish_message_msgkey_size=NGX_CONF_UNSET_SIZE;
+}
+
+void redis_store_prepare_to_exit_worker() {
+  rdstore_channel_head_t    *cur, *tmp;
+  HASH_ITER(hh, chanhead_hash, cur, tmp) {
+    cur->shutting_down = 1;
+  }
+}
+
+static ngx_int_t redis_data_tree_exiter_stage1(rbtree_seed_t *seed, rdstore_data_t *rdata, void *pd) {
+  rdata->shutting_down = 1;
+  
+  callback_chain_t     *ccur, *cnext;  
+  for(ccur = rdata->on_connected; ccur != NULL; ccur = cnext) {
+    cnext = ccur->next;
+    ngx_free(ccur);
+  }
+  rdata->on_connected = NULL;
+
+  return NGX_OK;
+}
+
+static ngx_int_t redis_data_tree_exiter_stage2(rbtree_seed_t *seed, rdstore_data_t *rdata, unsigned *chanheads) {
+  
+  *chanheads += rdata->chanhead_reaper.count;
+  
+  nchan_reaper_stop(&rdata->chanhead_reaper);
+  
+  if(rdata->ctx)
+    redis_nginx_force_close_context(&rdata->ctx);
+  if(rdata->sub_ctx)
+    redis_nginx_force_close_context(&rdata->sub_ctx);
+  if(rdata->sync_ctx) {
+    redisFree(rdata->sync_ctx);
+    rdata->sync_ctx = NULL;
+  }
+
+  return NGX_OK;
+}
+
+static ngx_int_t redis_data_tree_exiter_stage3(rbtree_seed_t *seed, rdstore_data_t *rdata, unsigned *chanheads) {
+  
+  DBG("exiting3 rdata %p %V", rdata, rdata->connect_url);
+  
+  if(rdata->ctx)
+    redis_nginx_force_close_context(&rdata->ctx);
+  if(rdata->sub_ctx)
+    redis_nginx_force_close_context(&rdata->sub_ctx);
+  if(rdata->sync_ctx) {
+    redisFree(rdata->sync_ctx);
+    rdata->sync_ctx = NULL;
+  }
+  if(rdata->ping_timer.timer_set) {
+    ngx_del_timer(&rdata->ping_timer);
+  }
+  if(rdata->stall_timer.timer_set) {
+    ngx_del_timer(&rdata->stall_timer);
+  }
+  if(rdata->reconnect_timer.timer_set) {
+    ngx_del_timer(&rdata->reconnect_timer);
+  }
+
+  return NGX_OK;
+}
+
+static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
+  rdstore_channel_head_t     *cur, *tmp;
+  unsigned                    chanheads = 0;
+  DBG("redis exit worker");
+  rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage1, NULL);
+  
+  HASH_ITER(hh, chanhead_hash, cur, tmp) {
+    cur->shutting_down = 1;
+    if(!cur->in_gc_reaper) {
+      cur->spooler.fn->broadcast_status(&cur->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+      redis_chanhead_gc_add(cur, 0, "exit worker");
+    }
+  }
+  
+  rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage2, &chanheads);
+  
+  rbtree_empty(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage3, NULL);
+  nchan_exit_notice_about_remaining_things("redis channel", "", chanheads);
+  
+  redis_cluster_exit_worker(cycle);
+}
+
+static void nchan_store_exit_master(ngx_cycle_t *cycle) {
+  rbtree_empty(&redis_data_tree, NULL, NULL);
+}
+
+typedef struct {
+  ngx_str_t                   *channel_id;
+  subscriber_t                *sub;
+  unsigned                     allocd:1;
+} redis_subscribe_data_t;
+
+static ngx_int_t nchan_store_subscribe_continued(redis_subscribe_data_t *d);
+
+static ngx_int_t subscribe_existing_channel_callback(ngx_int_t status, void *ch, void *d) {
+  nchan_channel_t              *channel = (nchan_channel_t *)ch;
+  redis_subscribe_data_t       *data = (redis_subscribe_data_t *)d;
+  
+  if(channel == NULL) {
+    data->sub->fn->respond_status(data->sub, NGX_HTTP_FORBIDDEN, NULL);
+    data->sub->fn->release(data->sub, 0);
+  }
+  else {
+    nchan_store_subscribe_continued(d);
+  }
+  assert(data->allocd);
+  ngx_free(data);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub) {
+  redis_subscribe_data_t        d_data;
+  redis_subscribe_data_t       *d = NULL;
+
+  assert(sub->last_msgid.tagcount == 1);
+  
+  if(!sub->cf->subscribe_only_existing_channel) {
+    d_data.allocd = 0;
+    d_data.channel_id = channel_id;
+    d_data.sub = sub;
+    nchan_store_subscribe_continued(&d_data);
+  }
+  else {
+    if((d=ngx_alloc(sizeof(*d) + sizeof(ngx_str_t) + channel_id->len, ngx_cycle->log))==NULL) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "can't allocate redis get_message callback data");
+      return NGX_ERROR;
+    }
+    d->allocd = 1;
+    d->channel_id=(ngx_str_t *)&d[1];
+    d->channel_id->len = channel_id->len;
+    d->channel_id->data = (u_char *)&(d->channel_id)[1];
+    ngx_memcpy(d->channel_id->data, channel_id->data, channel_id->len);
+    d->sub = sub;
+    nchan_store_find_channel(channel_id, sub->cf, subscribe_existing_channel_callback, d);
+  }
+
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_subscribe_continued(redis_subscribe_data_t *d) {
+  //nchan_loc_conf_t           *cf = d->sub->cf;
+  rdstore_channel_head_t       *ch;
+  //ngx_int_t                   create_channel_ttl = cf->subscribe_only_existing_channel==1 ? 0 : cf->channel_timeout;
+  rdstore_data_t               *rdata = d->sub->cf->redis.privdata;
+  
+  ch = nchan_store_get_chanhead(d->channel_id, rdata);
+  
+  assert(ch != NULL);
+  
+  ch->spooler.fn->add(&ch->spooler, d->sub);
+  //redisAsyncCommand(rds_ctx(), &redis_getmessage_callback, (void *)d, "EVALSHA %s 0 %b %i %i %s %i", redis_lua_scripts.get_message.hash, STR(d->channel_id), d->msg_id->time, d->msg_id->tag[0], "FILO", create_channel_ttl);
+  return NGX_OK;
+}
+
+static ngx_str_t * nchan_store_etag_from_message(nchan_msg_t *msg, ngx_pool_t *pool){
+  ngx_str_t       *etag = NULL;
+  if(pool!=NULL && (etag = ngx_palloc(pool, sizeof(*etag) + NGX_INT_T_LEN))==NULL) {
+    nchan_log_error("unable to allocate memory for Etag header in pool");
+    return NULL;
+  }
+  else if(pool==NULL && (etag = ngx_alloc(sizeof(*etag) + NGX_INT_T_LEN, ngx_cycle->log))==NULL) {
+    nchan_log_error("unable to allocate memory for Etag header");
+    return NULL;
+  }
+  etag->data = (u_char *)(etag+1);
+  etag->len = ngx_sprintf(etag->data,"%i", msg->id.tag.fixed[0])- etag->data;
+  return etag;
+}
+
+static ngx_str_t * nchan_store_content_type_from_message(nchan_msg_t *msg, ngx_pool_t *pool){
+  ngx_str_t        *content_type = NULL;
+  if(pool != NULL && (content_type = ngx_palloc(pool, sizeof(*content_type) + msg->content_type.len))==NULL) {
+    nchan_log_error("unable to allocate memory for Content Type header in pool");
+    return NULL;
+  }
+  else if(pool == NULL && (content_type = ngx_alloc(sizeof(*content_type) + msg->content_type.len, ngx_cycle->log))==NULL) {
+    nchan_log_error("unable to allocate memory for Content Type header");
+    return NULL;
+  }
+  content_type->data = (u_char *)(content_type+1);
+  content_type->len = msg->content_type.len;
+  ngx_memcpy(content_type->data, msg->content_type.data, content_type->len);
+  return content_type;
+}
+
+typedef struct {
+  ngx_msec_t            t;
+  char                 *name;
+  ngx_str_t            *channel_id;
+  time_t                msg_time;
+  nchan_msg_t          *msg;
+  unsigned              shared_msg:1;
+  time_t                buffer_timeout;
+  ngx_int_t             max_messages;
+  ngx_int_t             msglen;
+  callback_pt           callback;
+  void                 *privdata;
+} redis_publish_callback_data_t;
+
+static void redisPublishCallback(redisAsyncContext *, void *, void *);
+
+static void redis_publish_message_send(rdstore_data_t *rdata, void *pd) {
+  redis_publish_callback_data_t  *d = pd;
+  ngx_int_t                       mmapped = 0;
+  ngx_buf_t                      *buf;
+  u_char                         *msgstart;
+  size_t                          msglen;
+  nchan_msg_t                    *msg = d->msg;
+  
+  buf = msg->buf;
+  if(ngx_buf_in_memory(buf)) {
+    msgstart = buf->pos;
+    msglen = buf->last - msgstart;
+  }
+  else { //in a file
+    ngx_fd_t fd = buf->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&buf->file->name) : buf->file->fd;
+    
+    msglen = buf->file_last - buf->file_pos;
+    msgstart = mmap(NULL, msglen, PROT_READ, MAP_SHARED, fd, 0);
+    if (msgstart != MAP_FAILED) {
+      mmapped = 1;
+    }
+    else {
+      msgstart = NULL;
+      msglen = 0;
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno, "Redis store: Couldn't mmap file %V", &buf->file->name);
+    }
+  }
+  d->msglen = msglen;
+  
+  
+  //input:  keys: [], values: [channel_id, time, message, content_type, eventsource_event, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]
+  //output: message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
+  redis_command(rdata, &redisPublishCallback, d, "EVALSHA %s 0 %b %i %b %b %b %i %i %i", redis_lua_scripts.publish.hash, STR(d->channel_id), msg->id.time, msgstart, msglen, STR(&(msg->content_type)), STR(&(msg->eventsource_event)), d->buffer_timeout, d->max_messages, redis_publish_message_msgkey_size);
+  if(mmapped && munmap(msgstart, msglen) == -1) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "munmap was a problem");
+  }
+}
+
+static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t *msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  redis_publish_callback_data_t  *d=NULL;
+  rdstore_data_t                 *rdata = cf->redis.privdata;
+  
+  assert(callback != NULL);
+
+  CREATE_CALLBACK_DATA(d, rdata, "publish_message", channel_id, callback, privdata);
+  
+  d->channel_id=channel_id;
+  d->msg_time=msg->id.time;
+  if(d->msg_time == 0) {
+    d->msg_time = ngx_time();
+  }
+  d->msg = msg;
+  d->shared_msg = msg->shared;
+  d->buffer_timeout = cf->buffer_timeout;
+  d->max_messages = cf->max_messages;
+  
+  assert(msg->id.tagcount == 1);
+  if((rdata = redis_cluster_rdata_from_channel_id(rdata, channel_id)) == NULL) {
+    return NGX_ERROR;
+  }
+  
+  if(d->shared_msg) {
+    msg_reserve(d->msg, "redis publish");
+  }
+  redis_publish_message_send(rdata, d);
+  
+  return NGX_OK;
+}
+
+static void redisPublishCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
+  redisReply                    *reply=r;
+  redisReply                    *cur;
+  nchan_channel_t                ch;
+  
+  rdstore_data_t                *rdata = c->data;
+  rdata->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  if(!clusterKeySlotOk(c, r)) {
+    if(d->shared_msg) {
+      cluster_add_retry_command_with_channel_id(rdata->node.cluster, d->channel_id, redis_publish_message_send, d);
+    }
+    else {
+      //message probably isn't available anymore...
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis store received cluster MOVE/ASK error while publishing, and can't retry publishing after reconfiguring cluster.");
+      d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
+      ngx_free(d);
+    }
+    return;
+  }
+  
+  if(d->shared_msg) {
+    msg_release(d->msg, "redis publish");
+  }
+  
+  ngx_memzero(&ch, sizeof(ch)); //for debugging basically. should be removed in the future and zeroed as-needed
+  
+  if(reply && CHECK_REPLY_ARRAY_MIN_SIZE(reply, 2)) {
+    ch.last_published_msg_id.time=d->msg_time;
+    ch.last_published_msg_id.tag.fixed[0]=reply->element[0]->integer;
+    ch.last_published_msg_id.tagcount = 1;
+    ch.last_published_msg_id.tagactive = 0;
+    
+    cur=reply->element[1];
+    switch(redis_array_to_channel(cur, &ch)) {
+      case NGX_OK:
+        d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
+        break;
+      case NGX_DECLINED: //not found
+        d->callback(NGX_OK, NULL, d->privdata);
+        break;
+      case NGX_ERROR:
+      default:
+        redisEchoCallback(c, r, privdata);
+        d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
+    }
+  }
+  else {
+    redisEchoCallback(c, r, privdata);
+    d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
+  }
+  ngx_free(d);
+}
+
+
+
+typedef struct {
+  ngx_str_t      *channel_id;
+  ngx_int_t       count;
+} add_fakesub_data_t;
+
+
+static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r, void *privdata);
+static void nchan_store_redis_add_fakesub_send(rdstore_data_t *rdata, void *pd) {
+  if(rdata) {
+    redis_command(rdata, &nchan_store_redis_add_fakesub_callback, NULL, "EVALSHA %s 0 %b %i", redis_lua_scripts.add_fakesub.hash, STR(((add_fakesub_data_t *)pd)->channel_id), ((add_fakesub_data_t *)pd)->count);
+  }
+}
+
+static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply      *reply = r;
+  rdstore_data_t  *rdata = c->data;
+  
+  rdata->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  if(reply && reply->type == REDIS_REPLY_ERROR) {
+    ngx_str_t    errstr;
+    ngx_str_t    countstr;
+    ngx_str_t    channel_id;
+    intptr_t     count;
+    
+    errstr.data = (u_char *)reply->str;
+    errstr.len = strlen(reply->str);
+    
+    if(ngx_str_chop_if_startswith(&errstr, "CLUSTER KEYSLOT ERROR. ")) {
+      
+      nchan_scan_until_chr_on_line(&errstr, &countstr, ' ');
+      count = ngx_atoi(countstr.data, countstr.len);
+      channel_id = errstr;
+      
+      add_fakesub_data_t  *d = cluster_retry_palloc(rdata->node.cluster, sizeof(*d) + sizeof(ngx_str_t) + channel_id.len);
+      if(!d) {
+        ERR("can't allocate add_fakesub_data for CLUSTER KEYSLOT ERROR retry");
+        return;
+      }
+      d->count = count;
+      d->channel_id = (ngx_str_t *)&d[1];
+      d->channel_id->data = (u_char *)&d->channel_id[1];
+      nchan_strcpy(d->channel_id, &channel_id, 0);
+      cluster_add_retry_command_with_channel_id(rdata->node.cluster, &channel_id, nchan_store_redis_add_fakesub_send, d);
+      
+      return;
+    }
+    
+  }
+  redisCheckErrorCallback(c, r, privdata);
+}
+
+ngx_int_t nchan_store_redis_fakesub_add(ngx_str_t *channel_id, nchan_loc_conf_t *cf, ngx_int_t count, uint8_t shutting_down) {
+  rdstore_data_t                 *rdata;
+  
+  if((rdata = redis_cluster_rdata_from_channel_id(cf->redis.privdata, channel_id)) == NULL) {
+    return NGX_ERROR;
+  }
+  if(!shutting_down) {
+    add_fakesub_data_t   data = {channel_id, count};
+    nchan_store_redis_add_fakesub_send(rdata, &data);
+  }
+  else {
+    redis_sync_command(rdata, "EVALSHA %s 0 %b %i", redis_lua_scripts.add_fakesub.hash, STR(channel_id), count);
+  }
+  return NGX_OK;
+}
+
+nchan_store_t nchan_store_redis = {
+    //init
+    &nchan_store_init_module,
+    &nchan_store_init_worker,
+    &nchan_store_init_postconfig,
+    &nchan_store_create_main_conf,
+    
+    //shutdown
+    &nchan_store_exit_worker,
+    &nchan_store_exit_master,
+    
+    //async-friendly functions with callbacks
+    &nchan_store_async_get_message, //+callback
+    &nchan_store_subscribe, //+callback
+    &nchan_store_publish_message, //+callback
+    
+    &nchan_store_delete_channel, //+callback
+    &nchan_store_find_channel, //+callback
+    
+    //message stuff
+    &nchan_store_etag_from_message,
+    &nchan_store_content_type_from_message,
+    
+};
+
diff --git a/debian/modules/nchan/src/store/redis/redis_lua_commands.h b/debian/modules/nchan/src/store/redis/redis_lua_commands.h
new file mode 100644
index 0000000..f1766c3
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis_lua_commands.h
@@ -0,0 +1,1025 @@
+// don't edit this please, it was auto-generated by hsss
+// https://github.com/slact/hsss
+
+typedef struct {
+  char *name;
+  char *hash;
+  char *script;
+} redis_lua_script_t;
+
+typedef struct {
+  //input:  keys: [], values: [channel_id, number]
+  //output: current_fake_subscribers
+  redis_lua_script_t add_fakesub;
+
+  //input:  keys: [], values: [channel_id, ttl]
+  // ttl is for when there are no messages but at least 1 subscriber.
+  //output: seconds until next keepalive is expected, or -1 for "let it disappear"
+  redis_lua_script_t channel_keepalive;
+
+  //input: keys: [],  values: [ channel_id ]
+  //output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
+  // delete this channel and all its messages
+  redis_lua_script_t delete;
+
+  //input: keys: [],  values: [ channel_id ]
+  //output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
+  // finds and return the info hash of a channel, or nil of channel not found
+  redis_lua_script_t find_channel;
+
+  //input:  keys: [], values: [channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
+  //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
+  // no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent
+  // create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.
+  // result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available
+  redis_lua_script_t get_message;
+
+  //input:  keys: [message_key], values: []
+  //output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
+  redis_lua_script_t get_message_from_key;
+
+  //input:  keys: [], values: [channel_id, time, message, content_type, eventsource_event, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]
+  //output: message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
+  redis_lua_script_t publish;
+
+  //input:  keys: [], values: [channel_id, status_code]
+  //output: current_subscribers
+  redis_lua_script_t publish_status;
+
+  //redis-store consistency check
+  redis_lua_script_t rsck;
+
+  //input: keys: [], values: [channel_id, subscriber_id, active_ttl]
+  //  'subscriber_id' can be '-' for new id, or an existing id
+  //  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
+  //output: subscriber_id, num_current_subscribers, next_keepalive_time
+  redis_lua_script_t subscriber_register;
+
+  //input: keys: [], values: [channel_id, subscriber_id, empty_ttl]
+  // 'subscriber_id' is an existing id
+  // 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
+  //output: subscriber_id, num_current_subscribers
+  redis_lua_script_t subscriber_unregister;
+
+} redis_lua_scripts_t;
+
+static redis_lua_scripts_t redis_lua_scripts = {
+  {"add_fakesub", "b6511d02062dd6f2a1e99d761fe57ef8c987f299",
+   "--input:  keys: [], values: [channel_id, number]\n"
+   "--output: current_fake_subscribers\n"
+   "  \n"
+   "redis.call('echo', ' ####### FAKESUBS ####### ')\n"
+   "local id=ARGV[1]\n"
+   "local num=tonumber(ARGV[2])\n"
+   "if num==nil then\n"
+   "  return {err=\"fakesub number not given\"}\n"
+   "end\n"
+   "\n"
+   "local chan_key = ('{channel:%s}'):format(id)\n"
+   "\n"
+   "local res = redis.pcall('EXISTS', chan_key)\n"
+   "if type(res) == \"table\" and res[\"err\"] then\n"
+   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(num, id)}\n"
+   "end\n"
+   "\n"
+   "local exists = res == 1\n"
+   "\n"
+   "local cur = 0\n"
+   "\n"
+   "if exists or (not exists and num > 0) then\n"
+   "  cur = redis.call('HINCRBY', chan_key, 'fake_subscribers', num)\n"
+   "  if not exists then\n"
+   "    redis.call('EXPIRE', chan_key, 5) --something small\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "return cur\n"},
+
+  {"channel_keepalive", "e291b7ccc0c11cbd85292ae8b6a443b37f2220f2",
+   "--input:  keys: [], values: [channel_id, ttl]\n"
+   "-- ttl is for when there are no messages but at least 1 subscriber.\n"
+   "--output: seconds until next keepalive is expected, or -1 for \"let it disappear\"\n"
+   "redis.call('ECHO', ' ####### CHANNEL KEEPALIVE ####### ')\n"
+   "local id=ARGV[1]\n"
+   "local ttl=tonumber(ARGV[2])\n"
+   "if not ttl then\n"
+   "  return {err=\"Invalid channel keepalive TTL (2nd arg)\"}\n"
+   "end\n"
+   "\n"
+   "local random_safe_next_ttl = function(ttl)\n"
+   "  return math.floor(ttl/2 + ttl/2.1 * math.random())\n"
+   "end\n"
+   "local ch = ('{channel:%s}'):format(id)\n"
+   "local key={\n"
+   "  channel=   ch, --hash\n"
+   "  messages=  ch..':messages', --list\n"
+   "}\n"
+   "  \n"
+   "local subs_count = tonumber(redis.call('HGET', key.channel, \"subscribers\")) or 0\n"
+   "local msgs_count = tonumber(redis.call('LLEN', key.messages)) or 0\n"
+   "local actual_ttl = tonumber(redis.call('TTL',  key.channel))\n"
+   "\n"
+   "if subs_count > 0 then\n"
+   "  if msgs_count > 0 and actual_ttl > ttl then\n"
+   "    return random_safe_next_ttl(actual_ttl)\n"
+   "  end\n"
+   "  --refresh ttl\n"
+   "  redis.call('expire', key.channel, ttl);\n"
+   "  redis.call('expire', key.messages, ttl);\n"
+   "  return random_safe_next_ttl(ttl)\n"
+   "else\n"
+   "  return -1\n"
+   "end\n"},
+
+  {"delete", "fa52ada69e16947a687f9592529063f3c2d429bd",
+   "--input: keys: [],  values: [ channel_id ]\n"
+   "--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil\n"
+   "-- delete this channel and all its messages\n"
+   "local id = ARGV[1]\n"
+   "local ch = ('{channel:%s}'):format(id)\n"
+   "local key_msg=    ch..':msg:%s' --not finished yet\n"
+   "local key_channel=ch\n"
+   "local messages=   ch..':messages'\n"
+   "local subscribers=ch..':subscribers'\n"
+   "local pubsub=     ch..':pubsub'\n"
+   "\n"
+   "redis.call('echo', ' ####### DELETE #######')\n"
+   "local num_messages = 0\n"
+   "--delete all the messages right now mister!\n"
+   "local msg\n"
+   "while true do\n"
+   "  msg = redis.call('LPOP', messages)\n"
+   "  if msg then\n"
+   "    num_messages = num_messages + 1\n"
+   "    redis.call('DEL', key_msg:format(msg))\n"
+   "  else\n"
+   "    break\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local del_msgpack =cmsgpack.pack({\"alert\", \"delete channel\", id})\n"
+   "for k,channel_key in pairs(redis.call('SMEMBERS', subscribers)) do\n"
+   "  redis.call('PUBLISH', channel_key, del_msgpack)\n"
+   "end\n"
+   "\n"
+   "local nearly_departed = nil\n"
+   "if redis.call('EXISTS', key_channel) ~= 0 then\n"
+   "  nearly_departed = redis.call('hmget', key_channel, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')\n"
+   "  if(nearly_departed[4]) then\n"
+   "    --replace subscribers count with fake_subscribers\n"
+   "    nearly_departed[3]=nearly_departed[4]\n"
+   "    table.remove(nearly_departed, 4)\n"
+   "  end\n"
+   "  for i = 1, 4 do\n"
+   "    nearly_departed[i]=tonumber(nearly_departed[i]) or 0\n"
+   "  end\n"
+   "  if type(nearly_departed[5]) ~= \"string\" then\n"
+   "    nearly_departed[5]=\"\"\n"
+   "  end\n"
+   "  \n"
+   "  --leave some crumbs behind showing this channel was just deleted\n"
+   "  redis.call('setex', ch..\":deleted\", 5, 1)\n"
+   "  \n"
+   "  table.insert(nearly_departed, num_messages)\n"
+   "end\n"
+   "\n"
+   "redis.call('DEL', key_channel, messages, subscribers)\n"
+   "\n"
+   "if redis.call('PUBSUB','NUMSUB', pubsub)[2] > 0 then\n"
+   "  redis.call('PUBLISH', pubsub, del_msgpack)\n"
+   "end\n"
+   "\n"
+   "return nearly_departed\n"},
+
+  {"find_channel", "0954f83f54ba95b59c7b899176417ad5edfc0f12",
+   "--input: keys: [],  values: [ channel_id ]\n"
+   "--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil\n"
+   "-- finds and return the info hash of a channel, or nil of channel not found\n"
+   "local id = ARGV[1]\n"
+   "local chk = ('{channel:%s}'):format(id)\n"
+   "local key_channel =  chk\n"
+   "local key_messages = chk..':messages'\n"
+   "\n"
+   "redis.call('echo', ' #######  FIND_CHANNEL ######## ')\n"
+   "\n"
+   "if redis.call('EXISTS', key_channel) ~= 0 then\n"
+   "  local ch = redis.call('hmget', key_channel, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')\n"
+   "  if(ch[4]) then\n"
+   "    --replace subscribers count with fake_subscribers\n"
+   "    ch[3]=ch[4]\n"
+   "    table.remove(ch, 4)\n"
+   "  end\n"
+   "  for i = 1, 4 do\n"
+   "    ch[i]=tonumber(ch[i]) or 0\n"
+   "  end\n"
+   "  if type(ch[5]) ~= \"string\" then\n"
+   "    ch[5]=\"\"\n"
+   "  end\n"
+   "  \n"
+   "  if redis.call(\"TYPE\", key_messages)['ok'] == 'list' then\n"
+   "    local oldest_msgid;\n"
+   "    while true do\n"
+   "      oldest_msgid = redis.call('LRANGE', key_messages, -1, -1)[1]\n"
+   "      if redis.call('EXISTS', (chk..':msg:%s'):format(oldest_msgid)) ~= 0 then\n"
+   "        --key exists.\n"
+   "        break\n"
+   "      else\n"
+   "        redis.breakpoint()\n"
+   "        redis.call('RPOP', key_messages)\n"
+   "      end\n"
+   "    end\n"
+   "    table.insert(ch, tonumber(redis.call('llen', chk..\":messages\")))\n"
+   "  else\n"
+   "    table.insert(ch, 0)\n"
+   "  end\n"
+   "  \n"
+   "  return ch\n"
+   "else\n"
+   "  return nil\n"
+   "end\n"},
+
+  {"get_message", "cc3d8f6503731b6580f3a5a5d0de97bfc18c19ca",
+   "--input:  keys: [], values: [channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]\n"
+   "--output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count\n"
+   "-- no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent\n"
+   "-- create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.\n"
+   "-- result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available\n"
+   "local id, time, tag, subscribe_if_current = ARGV[1], tonumber(ARGV[2]), tonumber(ARGV[3])\n"
+   "local no_msgid_order=ARGV[4]\n"
+   "local create_channel_ttl=tonumber(ARGV[5]) or 0\n"
+   "local msg_id\n"
+   "if time and time ~= 0 and tag then\n"
+   "  msg_id=(\"%s:%s\"):format(time, tag)\n"
+   "end\n"
+   "\n"
+   "if redis.replicate_commands then\n"
+   "  redis.replicate_commands()\n"
+   "end\n"
+   "\n"
+   "-- This script has gotten big and ugly, but there are a few good reasons \n"
+   "-- to keep it big and ugly. It needs to do a lot of stuff atomically, and \n"
+   "-- redis doesn't do includes. It could be generated pre-insertion into redis, \n"
+   "-- but then error messages become less useful, complicating debugging. If you \n"
+   "-- have a solution to this, please help.\n"
+   "local ch=('{channel:%s}'):format(id)\n"
+   "local msgkey_fmt=ch..':msg:%s'\n"
+   "local key={\n"
+   "  next_message= msgkey_fmt, --hash\n"
+   "  message=      msgkey_fmt, --hash\n"
+   "  channel=      ch, --hash\n"
+   "  messages=     ch..':messages', --list\n"
+   "--  pubsub=       ch..':subscribers:', --set\n"
+   "}\n"
+   "\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "\n"
+   "redis.call('echo', ' #######  GET_MESSAGE ######## ')\n"
+   "\n"
+   "local oldestmsg=function(list_key, old_fmt)\n"
+   "  local old, oldkey\n"
+   "  local n, del=0,0\n"
+   "  while true do\n"
+   "    n=n+1\n"
+   "    old=redis.call('lindex', list_key, -1)\n"
+   "    if old then\n"
+   "      oldkey=old_fmt:format(old)\n"
+   "      local ex=redis.call('exists', oldkey)\n"
+   "      if ex==1 then\n"
+   "        return oldkey\n"
+   "      else\n"
+   "        redis.call('rpop', list_key)\n"
+   "        del=del+1\n"
+   "      end \n"
+   "    else\n"
+   "      --dbg(list_key, \" is empty\")\n"
+   "      break\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      --dbg(k..\"=\"..v)\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "if no_msgid_order ~= 'FIFO' then\n"
+   "  no_msgid_order = 'FILO'\n"
+   "end\n"
+   "\n"
+   "local channel = tohash(redis.call('HGETALL', key.channel))\n"
+   "local new_channel = false\n"
+   "if next(channel) == nil then\n"
+   "  if create_channel_ttl==0 then\n"
+   "    return {404, nil}\n"
+   "  end\n"
+   "  redis.call('HSET', key.channel, 'time', time)\n"
+   "  redis.call('EXPIRE', key.channel, create_channel_ttl)\n"
+   "  channel = {time=time}\n"
+   "  new_channel = true\n"
+   "end\n"
+   "\n"
+   "local subs_count = tonumber(channel.subscribers)\n"
+   "\n"
+   "local found_msg_id\n"
+   "if msg_id==nil then\n"
+   "  if new_channel then\n"
+   "    --dbg(\"new channel\")\n"
+   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
+   "  else\n"
+   "    --dbg(\"no msg id given, ord=\"..no_msgid_order)\n"
+   "    \n"
+   "    if no_msgid_order == 'FIFO' then --most recent message\n"
+   "      --dbg(\"get most recent\")\n"
+   "      found_msg_id=channel.current_message\n"
+   "    elseif no_msgid_order == 'FILO' then --oldest message\n"
+   "      --dbg(\"get oldest\")\n"
+   "      \n"
+   "      found_msg_id=oldestmsg(key.messages, msgkey_fmt)\n"
+   "    end\n"
+   "    if found_msg_id == nil then\n"
+   "      --we await a message\n"
+   "      return {418, \"\", \"\", \"\", \"\", subs_count}\n"
+   "    else\n"
+   "      msg_id = found_msg_id\n"
+   "      local msg=tohash(redis.call('HGETALL', msg_id))\n"
+   "      if not next(msg) then --empty\n"
+   "        return {404, \"\", \"\", \"\", \"\", subs_count}\n"
+   "      else\n"
+   "        --dbg((\"found msg %s:%s  after %s:%s\"):format(tostring(msg.time), tostring(msg.tag), tostring(time), tostring(tag)))\n"
+   "        local ttl = redis.call('TTL', msg_id)\n"
+   "        return {200, ttl, tonumber(msg.time) or \"\", tonumber(msg.tag) or \"\", tonumber(msg.prev_time) or \"\", tonumber(msg.prev_tag) or \"\", msg.data or \"\", msg.content_type or \"\", msg.eventsource_event or \"\", subs_count}\n"
+   "      end\n"
+   "    end\n"
+   "  end\n"
+   "else\n"
+   "  if msg_id and channel.current_message == msg_id\n"
+   "   or not channel.current_message then\n"
+   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
+   "  end\n"
+   "\n"
+   "  key.message=key.message:format(msg_id)\n"
+   "  local msg=tohash(redis.call('HGETALL', key.message))\n"
+   "\n"
+   "  if next(msg) == nil then -- no such message. it might've expired, or maybe it was never there\n"
+   "    --dbg(\"MESSAGE NOT FOUND\")\n"
+   "    return {404, nil}\n"
+   "  end\n"
+   "\n"
+   "  local next_msg, next_msgtime, next_msgtag\n"
+   "  if not msg.next then --this should have been taken care of by the channel.current_message check\n"
+   "    --dbg(\"NEXT MESSAGE KEY NOT PRESENT. ERROR, ERROR!\")\n"
+   "    return {404, nil}\n"
+   "  else\n"
+   "    --dbg(\"NEXT MESSAGE KEY PRESENT: \" .. msg.next)\n"
+   "    key.next_message=key.next_message:format(msg.next)\n"
+   "    if redis.call('EXISTS', key.next_message)~=0 then\n"
+   "      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event'))\n"
+   "      local ttl = redis.call('TTL', key.next_message)\n"
+   "      --dbg((\"found msg2 %i:%i  after %i:%i\"):format(ntime, ntag, time, tag))\n"
+   "      return {200, ttl, tonumber(ntime) or \"\", tonumber(ntag) or \"\", tonumber(prev_time) or \"\", tonumber(prev_tag) or \"\", ndata or \"\", ncontenttype or \"\", neventsource_event or \"\", subs_count}\n"
+   "    else\n"
+   "      --dbg(\"NEXT MESSAGE NOT FOUND\")\n"
+   "      return {404, nil}\n"
+   "    end\n"
+   "  end\n"
+   "end\n"},
+
+  {"get_message_from_key", "173ff5fb759e434296433d6ff2a554ec7a57cbdb",
+   "--input:  keys: [message_key], values: []\n"
+   "--output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count\n"
+   "\n"
+   "local key = KEYS[1]\n"
+   "\n"
+   "local ttl = redis.call('TTL', key)\n"
+   "local time, tag, prev_time, prev_tag, data, content_type, es_event = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event'))\n"
+   "\n"
+   "return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or \"\", content_type or \"\", es_event or \"\"}\n"},
+
+  {"publish", "a3ef246c361dbe55269bce8afc4974c6e555a482",
+   "--input:  keys: [], values: [channel_id, time, message, content_type, eventsource_event, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]\n"
+   "--output: message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}\n"
+   "\n"
+   "local id=ARGV[1]\n"
+   "local time\n"
+   "if redis.replicate_commands then\n"
+   "  -- we're on redis >= 3.2. We can use We can use 'script effects replication' to allow\n"
+   "  -- writing nondeterministic command values like TIME.\n"
+   "  -- That's exactly what we want to do, use Redis' TIME rather than the given time from Nginx\n"
+   "  -- Also, it's more efficient to replicate just the commands in this case rather than run the whole script\n"
+   "  redis.replicate_commands()\n"
+   "  time = tonumber(redis.call('TIME')[1])\n"
+   "else\n"
+   "  --fallback to the provided time\n"
+   "  time = tonumber(ARGV[2])\n"
+   "end\n"
+   "\n"
+   "local msg={\n"
+   "  id=nil,\n"
+   "  data= ARGV[3],\n"
+   "  content_type=ARGV[4],\n"
+   "  eventsource_event=ARGV[5],\n"
+   "  ttl= tonumber(ARGV[6]),\n"
+   "  time= time,\n"
+   "  tag= 0\n"
+   "}\n"
+   "if msg.ttl == 0 then\n"
+   "  msg.ttl = 126144000 --4 years\n"
+   "end\n"
+   "local store_at_most_n_messages = tonumber(ARGV[7])\n"
+   "if store_at_most_n_messages == nil or store_at_most_n_messages == \"\" then\n"
+   "  return {err=\"Argument 7, max_msg_buf_size, can't be empty\"}\n"
+   "end\n"
+   "if store_at_most_n_messages == 0 then\n"
+   "  msg.unbuffered = 1\n"
+   "end\n"
+   "\n"
+   "local msgpacked_pubsub_cutoff = tonumber(ARGV[8])\n"
+   "\n"
+   "--[[local dbg = function(...)\n"
+   "  local arg = {...}\n"
+   "  for i = 1, #arg do\n"
+   "    arg[i]=tostring(arg[i])\n"
+   "  end\n"
+   "  redis.call('echo', table.concat(arg))\n"
+   "end\n"
+   "]]\n"
+   "if type(msg.content_type)=='string' and msg.content_type:find(':') then\n"
+   "  return {err='Message content-type cannot contain \":\" character.'}\n"
+   "end\n"
+   "\n"
+   "redis.call('echo', ' #######  PUBLISH   ######## ')\n"
+   "\n"
+   "-- sets all fields for a hash from a dictionary\n"
+   "local hmset = function (key, dict)\n"
+   "  if next(dict) == nil then return nil end\n"
+   "  local bulk = {}\n"
+   "  for k, v in pairs(dict) do\n"
+   "    table.insert(bulk, k)\n"
+   "    table.insert(bulk, v)\n"
+   "  end\n"
+   "  return redis.call('HMSET', key, unpack(bulk))\n"
+   "end\n"
+   "\n"
+   "--[[\n"
+   "local hash_tostr=function(h)\n"
+   "  local tt = {}\n"
+   "  for k, v in pairs(h) do\n"
+   "    table.insert(tt, (\"%s: %s\"):format(k, v))\n"
+   "  end\n"
+   "  return \"{\" .. table.concat(tt,\", \") .. \"}\"\n"
+   "end\n"
+   "]]\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "local ch = ('{channel:%s}'):format(id)\n"
+   "local msg_fmt = ch..':msg:%s'\n"
+   "local key={\n"
+   "  last_message= msg_fmt, --not finished yet\n"
+   "  message=      msg_fmt, --not finished yet\n"
+   "  channel=      ch,\n"
+   "  messages=     ch..':messages',\n"
+   "  subscribers=  ch..':subscribers'\n"
+   "}\n"
+   "local channel_pubsub = ch..':pubsub'\n"
+   "\n"
+   "local new_channel\n"
+   "local channel\n"
+   "if redis.call('EXISTS', key.channel) ~= 0 then\n"
+   "  channel=tohash(redis.call('HGETALL', key.channel))\n"
+   "  channel.max_stored_messages = tonumber(channel.max_stored_messages)\n"
+   "end\n"
+   "\n"
+   "if channel~=nil then\n"
+   "  --dbg(\"channel present\")\n"
+   "  if channel.current_message ~= nil then\n"
+   "    --dbg(\"channel current_message present\")\n"
+   "    key.last_message=key.last_message:format(channel.current_message, id)\n"
+   "  else\n"
+   "    --dbg(\"channel current_message absent\")\n"
+   "    key.last_message=nil\n"
+   "  end\n"
+   "  new_channel=false\n"
+   "else\n"
+   "  --dbg(\"channel missing\")\n"
+   "  channel={}\n"
+   "  new_channel=true\n"
+   "  key.last_message=nil\n"
+   "end\n"
+   "\n"
+   "--set new message id\n"
+   "local lastmsg, lasttime, lasttag\n"
+   "if key.last_message then\n"
+   "  lastmsg = redis.call('HMGET', key.last_message, 'time', 'tag')\n"
+   "  lasttime, lasttag = tonumber(lastmsg[1]), tonumber(lastmsg[2])\n"
+   "  --dbg(\"New message id: last_time \", lasttime, \" last_tag \", lasttag, \" msg_time \", msg.time)\n"
+   "  if lasttime and tonumber(lasttime) > tonumber(msg.time) then\n"
+   "    redis.log(redis.LOG_WARNING, \"Nchan: message for \" .. id .. \" arrived a little late and may be delivered out of order. Redis must be very busy.\")\n"
+   "    msg.time = lasttime\n"
+   "    time = lasttime\n"
+   "  end\n"
+   "  if lasttime and lasttime==msg.time then\n"
+   "    msg.tag=lasttag+1\n"
+   "  end\n"
+   "  msg.prev_time = lasttime\n"
+   "  msg.prev_tag = lasttag\n"
+   "else\n"
+   "  msg.prev_time = 0\n"
+   "  msg.prev_tag = 0\n"
+   "end\n"
+   "msg.id=('%i:%i'):format(msg.time, msg.tag)\n"
+   "\n"
+   "key.message=key.message:format(msg.id)\n"
+   "if redis.call('EXISTS', key.message) ~= 0 then\n"
+   "  local errmsg = \"Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s\"\n"
+   "  errmsg = errmsg:format(key.message, id, msg.id, time, lasttime, lasttag)\n"
+   "  --redis.log(redis.LOG_WARNING, errmsg)\n"
+   "  --redis.log(redis.LOG_WARNING, \"channel: \" .. key.channel .. hash_tostr(channel))\n"
+   "  --redis.log(redis.LOG_WARNING, (\"messages: %s {%s}\"):format(key.messages, table.concat(redis.call('LRANGE', key.messages, 0, -1), \", \")))\n"
+   "  return {err=errmsg}\n"
+   "end\n"
+   "\n"
+   "msg.prev=channel.current_message\n"
+   "if key.last_message and redis.call('exists', key.last_message) == 1 then\n"
+   "  redis.call('HSET', key.last_message, 'next', msg.id)\n"
+   "end\n"
+   "\n"
+   "--update channel\n"
+   "redis.call('HSET', key.channel, 'current_message', msg.id)\n"
+   "if msg.prev then\n"
+   "  redis.call('HSET', key.channel, 'prev_message', msg.prev)\n"
+   "end\n"
+   "if time then\n"
+   "  redis.call('HSET', key.channel, 'time', time)\n"
+   "end\n"
+   "\n"
+   "local message_len_changed = false\n"
+   "if channel.max_stored_messages ~= store_at_most_n_messages then\n"
+   "  channel.max_stored_messages = store_at_most_n_messages\n"
+   "  message_len_changed = true\n"
+   "  redis.call('HSET', key.channel, 'max_stored_messages', store_at_most_n_messages)\n"
+   "  --dbg(\"channel.max_stored_messages was not set, but is now \", store_at_most_n_messages)\n"
+   "end\n"
+   "\n"
+   "--write message\n"
+   "hmset(key.message, msg)\n"
+   "\n"
+   "\n"
+   "--check old entries\n"
+   "local oldestmsg=function(list_key, old_fmt)\n"
+   "  local old, oldkey\n"
+   "  local n, del=0,0\n"
+   "  while true do\n"
+   "    n=n+1\n"
+   "    old=redis.call('lindex', list_key, -1)\n"
+   "    if old then\n"
+   "      oldkey=old_fmt:format(old)\n"
+   "      local ex=redis.call('exists', oldkey)\n"
+   "      if ex==1 then\n"
+   "        return oldkey\n"
+   "      else\n"
+   "        redis.call('rpop', list_key)\n"
+   "        del=del+1\n"
+   "      end\n"
+   "    else\n"
+   "      break\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local max_stored_msgs = channel.max_stored_messages or -1\n"
+   "\n"
+   "if max_stored_msgs < 0 then --no limit\n"
+   "  oldestmsg(key.messages, msg_fmt)\n"
+   "  redis.call('LPUSH', key.messages, msg.id)\n"
+   "elseif max_stored_msgs > 0 then\n"
+   "  local stored_messages = tonumber(redis.call('LLEN', key.messages))\n"
+   "  redis.call('LPUSH', key.messages, msg.id)\n"
+   "  -- Reduce the message length if necessary\n"
+   "  local dump_message_ids = redis.call('LRANGE', key.messages, max_stored_msgs, stored_messages);\n"
+   "  if dump_message_ids then\n"
+   "    for _, msgid in ipairs(dump_message_ids) do\n"
+   "      redis.call('DEL', msg_fmt:format(msgid))\n"
+   "    end\n"
+   "  end\n"
+   "  redis.call('LTRIM', key.messages, 0, max_stored_msgs - 1)\n"
+   "  oldestmsg(key.messages, msg_fmt)\n"
+   "end\n"
+   "\n"
+   "\n"
+   "--set expiration times for all the things\n"
+   "local channel_ttl = tonumber(redis.call('TTL',  key.channel))\n"
+   "redis.call('EXPIRE', key.message, msg.ttl)\n"
+   "if msg.ttl > channel_ttl then\n"
+   "  redis.call('EXPIRE', key.channel, msg.ttl)\n"
+   "  redis.call('EXPIRE', key.messages, msg.ttl)\n"
+   "  redis.call('EXPIRE', key.subscribers, msg.ttl)\n"
+   "end\n"
+   "\n"
+   "--publish message\n"
+   "local unpacked\n"
+   "\n"
+   "if msg.unbuffered or #msg.data < msgpacked_pubsub_cutoff then\n"
+   "  unpacked= {\n"
+   "    \"msg\",\n"
+   "    msg.ttl or 0,\n"
+   "    msg.time,\n"
+   "    tonumber(msg.tag) or 0,\n"
+   "    (msg.unbuffered and 0 or msg.prev_time) or 0,\n"
+   "    (msg.unbuffered and 0 or msg.prev_tag) or 0,\n"
+   "    msg.data or \"\",\n"
+   "    msg.content_type or \"\",\n"
+   "    msg.eventsource_event or \"\"\n"
+   "  }\n"
+   "else\n"
+   "  unpacked= {\n"
+   "    \"msgkey\",\n"
+   "    msg.time,\n"
+   "    tonumber(msg.tag) or 0,\n"
+   "    key.message\n"
+   "  }\n"
+   "end\n"
+   "\n"
+   "if message_len_changed then\n"
+   "  unpacked[1] = \"max_msgs+\" .. unpacked[1]\n"
+   "  table.insert(unpacked, 2, tonumber(channel.max_stored_messages))\n"
+   "end\n"
+   "\n"
+   "local msgpacked\n"
+   "\n"
+   "--dbg((\"Stored message with id %i:%i => %s\"):format(msg.time, msg.tag, msg.data))\n"
+   "\n"
+   "--now publish to the efficient channel\n"
+   "local numsub = redis.call('PUBSUB','NUMSUB', channel_pubsub)[2]\n"
+   "if tonumber(numsub) > 0 then\n"
+   "  msgpacked = cmsgpack.pack(unpacked)\n"
+   "  redis.call('PUBLISH', channel_pubsub, msgpacked)\n"
+   "end\n"
+   "\n"
+   "local num_messages = redis.call('llen', key.messages)\n"
+   "\n"
+   "--dbg(\"channel \", id, \" ttl: \",channel.ttl, \", subscribers: \", channel.subscribers, \"(fake: \", channel.fake_subscribers or \"nil\", \"), messages: \", num_messages)\n"
+   "return { msg.tag, {tonumber(channel.ttl or msg.ttl), tonumber(channel.time or msg.time), tonumber(channel.fake_subscribers or channel.subscribers or 0), tonumber(num_messages)}, new_channel}\n"},
+
+  {"publish_status", "cb9ff03713d74f854e3a90f4f77030a0791d3028",
+   "--input:  keys: [], values: [channel_id, status_code]\n"
+   "--output: current_subscribers\n"
+   "\n"
+   "redis.call('echo', ' ####### PUBLISH STATUS ####### ')\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "local id=ARGV[1]\n"
+   "local code=tonumber(ARGV[2])\n"
+   "if code==nil then\n"
+   "  return {err=\"non-numeric status code given, bailing!\"}\n"
+   "end\n"
+   "\n"
+   "local pubmsg = \"status:\"..code\n"
+   "local ch = ('{channel:%s}'):format(id)\n"
+   "local subs_key = ch..':subscribers'\n"
+   "local chan_key = ch\n"
+   "--local channel_pubsub = ch..':pubsub'\n"
+   "\n"
+   "for k,channel_key in pairs(redis.call('SMEMBERS', subs_key)) do\n"
+   "  --not efficient, but useful for a few short-term subscriptions\n"
+   "  redis.call('PUBLISH', channel_key, pubmsg)\n"
+   "end\n"
+   "--clear short-term subscriber list\n"
+   "redis.call('DEL', subs_key)\n"
+   "--now publish to the efficient channel\n"
+   "--what?... redis.call('PUBLISH', channel_pubsub, pubmsg)\n"
+   "return redis.call('HGET', chan_key, 'subscribers') or 0\n"},
+
+  {"rsck", "71beb40b0e39f61f6e53dc81d6f8849fd3b23632",
+   "--redis-store consistency check\n"
+   "\n"
+   "local concat = function(...)\n"
+   "  local arg = {...}\n"
+   "  for i = 1, #arg do\n"
+   "    arg[i]=tostring(arg[i])\n"
+   "  end\n"
+   "  return table.concat(arg, \" \")\n"
+   "end\n"
+   "local dbg =function(...) redis.call('echo', concat(...)); end\n"
+   "local errors={}\n"
+   "local err = function(...)\n"
+   "  local msg = concat(...)\n"
+   "  dbg(msg)\n"
+   "  table.insert(errors, msg)\n"
+   "end\n"
+   "\n"
+   "local tp=function(t, max_n)\n"
+   "  local tt={}\n"
+   "  for i, v in pairs(t) do\n"
+   "    local val = tostring(v)\n"
+   "    if max_n and #val > max_n then\n"
+   "      val = val:sub(1, max_n) .. \"[...]\"\n"
+   "    end\n"
+   "    table.insert(tt, tostring(i) .. \": \" .. val)\n"
+   "  end\n"
+   "  return \"{\" .. table.concat(tt, \", \") .. \"}\"\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "local type_is = function(key, _type, description)\n"
+   "  local t = redis.call(\"TYPE\", key)['ok']\n"
+   "  local type_ok = true\n"
+   "  if type(_type) == \"table\" then\n"
+   "    type_ok = false\n"
+   "    for i, v in pairs(_type) do\n"
+   "      if v == _type then\n"
+   "        type_ok = true\n"
+   "        break\n"
+   "      end\n"
+   "    end\n"
+   "  elseif t ~= _type then\n"
+   "    err((description or \"\"), key, \"should be type \" .. _type .. \", is\", t)\n"
+   "    type_ok = false\n"
+   "  end\n"
+   "  return type_ok, t\n"
+   "end\n"
+   "\n"
+   "local known_msgs_count=0\n"
+   "local known_msgkeys = {}\n"
+   "local known_channel_keys = {}\n"
+   "\n"
+   "local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)\n"
+   "  description = description and \"msg (\" .. description ..\")\" or \"msg\"\n"
+   "  local msgkey = \"{channel:\"..chid..\"}:msg:\"..msgid\n"
+   "  if not known_msgkeys[msgkey] then\n"
+   "    known_msgs_count = known_msgs_count + 1\n"
+   "  end\n"
+   "  known_msgkeys[msgkey]=true\n"
+   "  local ok, t = type_is(msgkey, {\"hash\", \"none\"}, \"message hash\")\n"
+   "  if t == \"none\" then\n"
+   "    --message is missing, but maybe it expired under normal circumstances. \n"
+   "    --check if any earlier messages are present\n"
+   "    local msgids = redis.call('LRANGE', \"{channel:\"..chid..\"}:messages\", 0, -1)\n"
+   "    local founds = 0\n"
+   "    for i=#msgids, 1, -1 do\n"
+   "      if msgids[i] == msgid then \n"
+   "        break\n"
+   "      end\n"
+   "      local thismsgkey = \"{channel:\"..chid..\"}:msg:\".. msgids[i]\n"
+   "      local ttt = redis.call('type', thismsgkey)['ok']\n"
+   "      redis.breakpoint()\n"
+   "      if ttt == \"hash\" then\n"
+   "        founds = founds + 1\n"
+   "      end\n"
+   "    end\n"
+   "    \n"
+   "    if founds > 0 then\n"
+   "      err(\"message\", msgkey, \"missing, with\", founds, \"prev. msgs in msg list\")\n"
+   "    end\n"
+   "    \n"
+   "  end\n"
+   "  local msg = tohash(redis.call('HGETALL', msgkey))\n"
+   "  local ttl = tonumber(redis.call('TTL', msgkey))\n"
+   "  local n = tonumber(redis.call(\"HLEN\", msgkey))\n"
+   "  if n > 0 and (msg.data == nil or msg.id == nil or msg.time == nil or msg.tag == nil)then\n"
+   "    err(\"incomplete \" .. description ..\"(ttl \"..ttl..\")\", msgkey, tp(msg))\n"
+   "    return false\n"
+   "  end\n"
+   "  if t == \"hash\" and tonumber(ttl) < 0 then\n"
+   "    err(\"message\", msgkey, \"ttl =\", ttl)\n"
+   "  end\n"
+   "  if ttl ~= -2 then\n"
+   "    if prev_msgid ~= false and msg.prev ~= prev_msgid then\n"
+   "      err(description, chid, msgid, \"prev_message wrong. expected\", prev_msgid, \"got\", msg.prev)\n"
+   "    end\n"
+   "    if next_msgid ~= false and msg.next ~= next_msgid then\n"
+   "      err(description, chid, msgid, \"next_message wrong. expected\", next_msgid, \"got\", msg.next)\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local check_channel = function(id)\n"
+   "  local key={\n"
+   "    ch = \"{channel:\"..id..\"}\",\n"
+   "    msgs = \"{channel:\"..id..\"}:messages\"\n"
+   "  }\n"
+   "  \n"
+   "  local ok, chkey_type = type_is(key.ch, \"hash\", \"channel hash\")\n"
+   "  if not ok then\n"
+   "    if chkey_type ~= \"none\" then\n"
+   "      err(\"unecpected channel key\", key.ch, \"type:\", chkey_type);\n"
+   "    end\n"
+   "    return false\n"
+   "  end\n"
+   "  local _, msgs_list_type = type_is(key.msgs, {\"list\", \"none\"}, \"channel messages list\")\n"
+   "  \n"
+   "  local ch = tohash(redis.call('HGETALL', key.ch))\n"
+   "  local len = tonumber(redis.call(\"HLEN\", key.ch))\n"
+   "  local ttl = tonumber(redis.call('TTL',  key.ch))\n"
+   "  if not ch.current_message or not ch.time then\n"
+   "    if msgs_list_type == \"list\" then\n"
+   "      err(\"incomplete channel (ttl \" .. ttl ..\")\", key.ch, tp(ch))\n"
+   "    end  \n"
+   "  elseif (ch.current_message or ch.prev_message) and msgs_list_type ~= \"list\" then\n"
+   "    err(\"channel\", key.ch, \"has a current_message but no message list\")\n"
+   "  end\n"
+   "  \n"
+   "  local msgids = redis.call('LRANGE', key.msgs, 0, -1)\n"
+   "  for i, msgid in ipairs(msgids) do\n"
+   "    check_msg(id, msgid, msgids[i+1], msgids[i-1], \"msglist\")\n"
+   "  end\n"
+   "  \n"
+   "  if ch.prev_message then\n"
+   "    if redis.call('LINDEX', key.msgs, 1) ~= ch.prev_message then\n"
+   "      err(\"channel\", key.ch, \"prev_message doesn't correspond to\", key.msgs, \"second list element\")\n"
+   "    end\n"
+   "    check_msg(id, ch.prev_message, false, ch.current_message, \"channel prev_message\")\n"
+   "  end\n"
+   "  if ch.current_message then\n"
+   "    if redis.call('LINDEX', key.msgs, 0) ~= ch.current_message then\n"
+   "      err(\"channel\", key.ch, \"current_message doesn't correspond to\", key.msgs, \"first list element\")\n"
+   "    end\n"
+   "    check_msg(id, ch.current_message, ch.prev_message, false, \"channel current_message\")\n"
+   "  end\n"
+   "  \n"
+   "end\n"
+   "\n"
+   "local channel_ids = {}\n"
+   "\n"
+   "for i, chkey in ipairs(redis.call(\"KEYS\", \"{channel:*}\")) do\n"
+   "  local msgs_chid_match = chkey:match(\"^{channel:(.*)}:messages\")\n"
+   "  if msgs_chid_match then\n"
+   "    type_is(\"{channel:\" .. msgs_chid_match..\"}\", \"hash\", \"channel messages' corresponding hash key\")\n"
+   "  elseif not chkey:match(\":msg$\") then\n"
+   "    table.insert(channel_ids, chkey);\n"
+   "    known_channel_keys[chkey] = true\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "dbg(\"found\", #channel_ids, \"channels\")\n"
+   "for i, chkey in ipairs(channel_ids) do\n"
+   "  local chid = chkey:match(\"^{channel:(.*)}\")\n"
+   "  check_channel(chid)\n"
+   "end\n"
+   "\n"
+   "for i, msgkey in ipairs(redis.call(\"KEYS\", \"{channel:*}:msg\")) do\n"
+   "  if not known_msgkeys[msgkey] then\n"
+   "    local ok, t = type_is(msgkey, \"hash\")\n"
+   "    if ok then\n"
+   "      if not redis.call('HGET', msgkey, 'unbuffered') then\n"
+   "        err(\"orphan message\", msgkey, \"(ttl: \" .. redis.call('TTL', msgkey) .. \")\", tp(tohash(redis.call('HGETALL', msgkey)), 15))\n"
+   "      end\n"
+   "    else\n"
+   "      err(\"orphan message\", msgkey, \"wrong type\", t) \n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "if errors then\n"
+   "  table.insert(errors, 1, concat(#channel_ids, \"channels,\",known_msgs_count,\"messages found\", #errors, \"problems\"))\n"
+   "  return errors\n"
+   "else\n"
+   "  return concat(#channel_ids, \"channels,\", known_msgs_count, \"messages, all ok\")\n"
+   "end\n"},
+
+  {"subscriber_register", "4e04dbb8bcb66052b49c87e95c30f91a224e9144",
+   "--input: keys: [], values: [channel_id, subscriber_id, active_ttl]\n"
+   "--  'subscriber_id' can be '-' for new id, or an existing id\n"
+   "--  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec\n"
+   "--output: subscriber_id, num_current_subscribers, next_keepalive_time\n"
+   "\n"
+   "local id, sub_id, active_ttl, concurrency = ARGV[1], ARGV[2], tonumber(ARGV[3]) or 20, ARGV[4]\n"
+   "\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "\n"
+   "redis.call('echo', ' ######## SUBSCRIBER REGISTER SCRIPT ####### ')\n"
+   "local ch=(\"{channel:%s}\"):format(id)\n"
+   "local keys = {\n"
+   "  channel =     ch,\n"
+   "  messages =    ch..':messages:',\n"
+   "  subscribers = ch..':subscribers'\n"
+   "}\n"
+   "\n"
+   "local setkeyttl=function(ttl)\n"
+   "  for i,v in pairs(keys) do\n"
+   "    if ttl > 0 then\n"
+   "      redis.call('expire', v, ttl)\n"
+   "    else\n"
+   "      redis.call('persist', v)\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local random_safe_next_ttl = function(ttl)\n"
+   "  return math.floor(ttl/2 + ttl/2.1 * math.random())\n"
+   "end\n"
+   "\n"
+   "local sub_count\n"
+   "\n"
+   "if sub_id == \"-\" then\n"
+   "  sub_id = tonumber(redis.call('HINCRBY', keys.channel, \"last_subscriber_id\", 1))\n"
+   "  sub_count=tonumber(redis.call('hincrby', keys.channel, 'subscribers', 1))\n"
+   "else\n"
+   "  sub_count=tonumber(redis.call('hget', keys.channel, 'subscribers'))\n"
+   "end\n"
+   "\n"
+   "local next_keepalive \n"
+   "local actual_ttl = tonumber(redis.call('ttl', keys.channel))\n"
+   "if actual_ttl < active_ttl then\n"
+   "  setkeyttl(active_ttl)\n"
+   "  next_keepalive = random_safe_next_ttl(active_ttl)\n"
+   "else\n"
+   "  next_keepalive = random_safe_next_ttl(actual_ttl)\n"
+   "end\n"
+   "\n"
+   "return {sub_id, sub_count, next_keepalive}\n"},
+
+  {"subscriber_unregister", "841cddb1a9ae8af8f25df7ee53fa8739abdd6f76",
+   "--input: keys: [], values: [channel_id, subscriber_id, empty_ttl]\n"
+   "-- 'subscriber_id' is an existing id\n"
+   "-- 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec\n"
+   "--output: subscriber_id, num_current_subscribers\n"
+   "\n"
+   "local id, sub_id, empty_ttl = ARGV[1], ARGV[2], tonumber(ARGV[3]) or 20\n"
+   "\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "\n"
+   "redis.call('echo', ' ######## SUBSCRIBER UNREGISTER SCRIPT ####### ')\n"
+   "local ch=('{channel:%s}'):format(id)\n"
+   "local keys = {\n"
+   "  channel =     ch,\n"
+   "  messages =    ch..':messages',\n"
+   "  subscribers = ch..':subscribers',\n"
+   "}\n"
+   "\n"
+   "local setkeyttl=function(ttl)\n"
+   "  for i,v in pairs(keys) do\n"
+   "    if ttl > 0 then\n"
+   "      redis.call('expire', v, ttl)\n"
+   "    elseif ttl < 0 then\n"
+   "      redis.call('persist', v)\n"
+   "    else\n"
+   "      redis.call('del', v)\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local sub_count = 0\n"
+   "\n"
+   "local res = redis.pcall('EXISTS', keys.channel)\n"
+   "if type(res) == \"table\" and res[\"err\"] then\n"
+   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(empty_ttl, id)}\n"
+   "end\n"
+   "\n"
+   "if res ~= 0 then\n"
+   "   sub_count = redis.call('hincrby', keys.channel, 'subscribers', -1)\n"
+   "\n"
+   "  if sub_count == 0 and tonumber(redis.call('LLEN', keys.messages)) == 0 then\n"
+   "    setkeyttl(empty_ttl)\n"
+   "  elseif sub_count < 0 then\n"
+   "    return {err=\"Subscriber count for channel \" .. id .. \" less than zero: \" .. sub_count}\n"
+   "  end\n"
+   "else\n"
+   "  --dbg(\"channel \", id, \" already gone\")\n"
+   "end\n"
+   "\n"
+   "return {sub_id, sub_count}\n"}
+};
+
+const int redis_lua_scripts_count=11;
+#define REDIS_LUA_SCRIPTS_EACH(script) \
+for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++) 
diff --git a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
new file mode 100644
index 0000000..4c4f351
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
@@ -0,0 +1,271 @@
+//Copyright (c) 2014 Wandenberg Peixoto under the MIT Licence'
+//additional code from Alexander Lyalin's redis_nginx_module (New BSD licence)
+//edited by slact 2015-2016
+
+#include <ngx_event.h>
+#include <ngx_connection.h>
+#include <signal.h>
+#include "redis_nginx_adapter.h"
+
+#include <nchan_module.h>
+#include <store/redis/store.h>
+
+#include <assert.h>
+
+#define PING_DATABASE_COMMAND "PING"
+
+#define EVENT_FLAGS ((ngx_event_flags & NGX_USE_CLEAR_EVENT) ?  NGX_CLEAR_EVENT : NGX_LEVEL_EVENT)
+
+#define REDIS_MAX_BUFFERED_READ_SIZE 1024*18 //hardcoded into hiredis
+
+//NGX_CLEAR_EVENT for kqueue, epoll
+//NGX_LEVEL_EVENT for select, poll, /dev/poll
+
+int redis_nginx_event_attach(redisAsyncContext *ac);
+void redis_nginx_cleanup(void *privdata);
+void redis_nginx_ping_callback(redisAsyncContext *ac, void *rep, void *privdata);
+
+
+void redis_nginx_init(void) {
+  signal(SIGPIPE, SIG_IGN);
+}
+
+
+redisAsyncContext *redis_nginx_open_context(ngx_str_t *host, int port, int database, ngx_str_t *password, void *privdata, redisAsyncContext **context) {
+  redisAsyncContext *ac = NULL;
+  u_char             hostchr[1024] = {0};
+  if(host->len >= 1023) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: hostname is too long");
+    return NULL;
+  }
+  ngx_memcpy(hostchr, host->data, host->len);
+  
+  if ((context == NULL) || (*context == NULL) || (*context)->err) {
+    ac = redisAsyncConnect((const char *)hostchr, port);
+    if (ac == NULL) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not allocate the redis context for %V:%d", host, port);
+      return NULL;
+    }
+    
+    if (ac->err) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not create the redis context for %V:%d - %s", host, port, ac->errstr);
+      redisAsyncFree(ac);
+      *context = NULL;
+      return NULL;
+    }
+    
+    if(redis_nginx_event_attach(ac) == REDIS_OK) {
+      ac->data = privdata;
+      *context = ac;
+    }
+  }
+  else {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: redis context already open");
+  }
+
+  return ac;
+}
+
+
+redisContext *redis_nginx_open_sync_context(ngx_str_t *host, int port, int database, ngx_str_t *password, redisContext **context) {
+  redisContext  *c = NULL;
+  redisReply    *reply;
+  
+  u_char        hostchr[1024] = {0};
+  if(host->len >= 1023) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: hostname is too long");
+    return NULL;
+  }
+  ngx_memcpy(hostchr, host->data, host->len);
+  
+  if ((context == NULL) || (*context == NULL) || (*context)->err) {
+    c = redisConnect((const char *)hostchr, port);
+    if (c == NULL) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not allocate the redis sync context for %s:%d", host, port);
+      return NULL;
+    }
+    
+    if (c->err) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not create the redis sync context for %s:%d - %s", host, port, c->errstr);
+      goto fail;
+    }
+    
+    if (context != NULL) {
+      *context = c;
+    }
+    if(password->len > 0) {
+      reply = redisCommand(c, "AUTH %b", password->data, password->len);
+      if ((reply == NULL) || (reply->type == REDIS_REPLY_ERROR)) {
+        goto fail;
+      }
+    }
+    if(database != -1) {
+      reply = redisCommand(c, "SELECT %d", database);
+      if ((reply == NULL) || (reply->type == REDIS_REPLY_ERROR)) {
+        goto fail;
+      }
+    }
+  }
+  else {
+    c = *context;
+  }
+
+  return c;
+fail:
+  if (context != NULL) {
+    *context = NULL;
+  }
+  redisFree(c);
+  return NULL;
+}
+
+
+void redis_nginx_force_close_context(redisAsyncContext **context) {
+  if ((context != NULL) && (*context != NULL)) {
+    redisAsyncContext *ac = *context;
+    if (!ac->err) {
+      redisAsyncDisconnect(ac);
+    }
+    *context = NULL;
+  }
+}
+
+void redis_nginx_ping_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  void *data = ac->data;
+  void (*callback) (void *) = privdata;
+  redisAsyncDisconnect(ac);
+  if (callback != NULL) {
+    callback(data);
+  }
+}
+
+void redis_nginx_read_event(ngx_event_t *ev) {
+  redisAsyncContext *ac = ((ngx_connection_t *)ev->data)->data;
+  int                bytes_left;
+  redisAsyncHandleRead(ac);
+  
+  // we need to do this because hiredis, in its infinite wisdom, will read at 
+  // most 16Kb of data, and there's no reliable way to tell if it read that 
+  // whole amount in one gulp. Otherwise, we could just check if 16Kb have 
+  //been read and try again. But no, apparently that's not an option.
+  
+  ioctl(ac->c.fd, FIONREAD, &bytes_left);
+  if (bytes_left > 0 && !ac->err) {
+    //ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "again!");
+    redis_nginx_read_event(ev);
+  }
+}
+
+void redis_nginx_write_event(ngx_event_t *ev) {
+  ngx_connection_t *connection = (ngx_connection_t *) ev->data;
+  redisAsyncHandleWrite(connection->data);
+}
+
+
+int redis_nginx_fd_is_valid(int fd) {
+  return (fd > 0) && ((fcntl(fd, F_GETFL) != -1) || (errno != EBADF));
+}
+
+void redis_nginx_add_read(void *privdata) {
+  ngx_connection_t *connection = (ngx_connection_t *) privdata;
+  ngx_int_t         flags = EVENT_FLAGS;
+  if (!connection->read->active && redis_nginx_fd_is_valid(connection->fd)) {
+    connection->read->handler = redis_nginx_read_event;
+    connection->read->log = connection->log;
+    if (ngx_add_event(connection->read, NGX_READ_EVENT, flags) == NGX_ERROR) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not add read event to redis");
+    }
+  }
+}
+
+void redis_nginx_del_read(void *privdata) {
+  ngx_connection_t *connection = (ngx_connection_t *) privdata;
+  ngx_int_t         flags = EVENT_FLAGS;
+  if (connection->read->active && redis_nginx_fd_is_valid(connection->fd)) {
+    if (ngx_del_event(connection->read, NGX_READ_EVENT, flags) == NGX_ERROR) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not delete read event to redis");
+    }
+  }
+  else {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: didn't delete read event %p", connection->read);
+  }
+}
+
+void redis_nginx_add_write(void *privdata) {
+  ngx_connection_t *connection = (ngx_connection_t *) privdata;
+  ngx_int_t         flags = EVENT_FLAGS;
+  if (!connection->write->active && redis_nginx_fd_is_valid(connection->fd)) {
+    connection->write->handler = redis_nginx_write_event;
+    connection->write->log = connection->log;
+    if (ngx_add_event(connection->write, NGX_WRITE_EVENT, flags) == NGX_ERROR) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not add write event to redis");
+    }
+  }
+}
+
+void redis_nginx_del_write(void *privdata) {
+  ngx_connection_t *connection = (ngx_connection_t *) privdata;
+  ngx_int_t         flags = EVENT_FLAGS;
+  if (connection->write->active && redis_nginx_fd_is_valid(connection->fd)) {
+    if (ngx_del_event(connection->write, NGX_WRITE_EVENT, flags) == NGX_ERROR) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not delete write event to redis");
+    }
+  }
+}
+
+void redis_nginx_cleanup(void *privdata) {
+  if (privdata) {
+    ngx_connection_t *connection = (ngx_connection_t *) privdata;
+    redisAsyncContext *ac = (redisAsyncContext *) connection->data;
+    if (ac->err) {
+      //nchan_store_redis_connection_close_handler(ac);
+      //ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: connection to redis failed - %s", ac->errstr);
+      /**
+        * If the context had an error but the fd still valid is because another context got the same fd from OS.
+        * So we clean the reference to this fd on redisAsyncContext and on ngx_connection, avoiding close a socket in use.
+        */
+      if (redis_nginx_fd_is_valid(ac->c.fd)) {
+        ac->c.fd = -1;
+        connection->fd = NGX_INVALID_FILE;
+      }
+    }
+    
+    if ((connection->fd != NGX_INVALID_FILE)) {
+      redis_nginx_del_read(privdata);
+      redis_nginx_del_write(privdata);
+      ngx_close_connection(connection);
+    } else {
+      ngx_free_connection(connection);
+    }
+    
+    ac->ev.data = NULL;
+  }
+}
+
+int redis_nginx_event_attach(redisAsyncContext *ac) {
+  ngx_connection_t *connection;
+  redisContext *c = &(ac->c);
+  
+  /* Nothing should be attached when something is already attached */
+  if (ac->ev.data != NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: context already attached");
+    return REDIS_ERR;
+  }
+  
+  connection = ngx_get_connection(c->fd, ngx_cycle->log);
+  if (connection == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not get a connection for fd #%d", c->fd);
+    return REDIS_ERR;
+  }
+  
+  /* Register functions to start/stop listening for events */
+  ac->ev.addRead = redis_nginx_add_read;
+  ac->ev.delRead = redis_nginx_del_read;
+  ac->ev.addWrite = redis_nginx_add_write;
+  ac->ev.delWrite = redis_nginx_del_write;
+  ac->ev.cleanup = redis_nginx_cleanup;
+  ac->ev.data = connection;
+  connection->data = ac;
+  
+  return REDIS_OK;
+}
diff --git a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
new file mode 100644
index 0000000..716c397
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
@@ -0,0 +1,15 @@
+//Copyright (c) 2014 Wandenberg Peixoto under the MIT Licence
+#ifndef __REDIS_NGINX_ADAPTER_H
+#define __REDIS_NGINX_ADAPTER_H
+
+#include <hiredis/hiredis.h>
+#include <hiredis/async.h>
+
+void redis_nginx_init(void);
+redisAsyncContext *redis_nginx_open_context(ngx_str_t *host, int port, int database, ngx_str_t *password, void *privdata, redisAsyncContext **context);
+redisContext *redis_nginx_open_sync_context(ngx_str_t *host, int port, int database, ngx_str_t *password, redisContext **context);
+void redis_nginx_force_close_context(redisAsyncContext **context);
+void redis_nginx_close_context(redisAsyncContext **context);
+void redis_nginx_ping_callback(redisAsyncContext *ac, void *rep, void *privdata);
+
+#endif // __REDIS_NGINX_ADAPTER_H
diff --git a/debian/modules/nchan/src/store/redis/scripts/.gitignore b/debian/modules/nchan/src/store/redis/scripts/.gitignore
new file mode 100644
index 0000000..b844b14
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/.gitignore
@@ -0,0 +1 @@
+Gemfile.lock
diff --git a/debian/modules/nginx-http-push/tests/Gemfile b/debian/modules/nchan/src/store/redis/scripts/Gemfile
similarity index 61%
rename from debian/modules/nginx-http-push/tests/Gemfile
rename to debian/modules/nchan/src/store/redis/scripts/Gemfile
index 60a6eb7..b792720 100644
--- a/debian/modules/nginx-http-push/tests/Gemfile
+++ b/debian/modules/nchan/src/store/redis/scripts/Gemfile
@@ -1,9 +1,11 @@
 #!/usr/bin/ruby
 source 'https://rubygems.org'
-gem 'typhoeus'
-gem 'json'
-gem 'nokogiri'
 gem 'pry'
-gem 'celluloid'
+gem 'pry-debundle'
+gem 'pry-rescue'
+
 gem 'minitest'
 gem 'minitest-reporters'
+
+gem "redis"
+gem "hsss"
diff --git a/debian/modules/nchan/src/store/redis/scripts/add_fakesub.lua b/debian/modules/nchan/src/store/redis/scripts/add_fakesub.lua
new file mode 100644
index 0000000..dfee879
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/add_fakesub.lua
@@ -0,0 +1,29 @@
+--input:  keys: [], values: [channel_id, number]
+--output: current_fake_subscribers
+  
+redis.call('echo', ' ####### FAKESUBS ####### ')
+local id=ARGV[1]
+local num=tonumber(ARGV[2])
+if num==nil then
+  return {err="fakesub number not given"}
+end
+
+local chan_key = ('{channel:%s}'):format(id)
+
+local res = redis.pcall('EXISTS', chan_key)
+if type(res) == "table" and res["err"] then
+  return {err = ("CLUSTER KEYSLOT ERROR. %i %s"):format(num, id)}
+end
+
+local exists = res == 1
+
+local cur = 0
+
+if exists or (not exists and num > 0) then
+  cur = redis.call('HINCRBY', chan_key, 'fake_subscribers', num)
+  if not exists then
+    redis.call('EXPIRE', chan_key, 5) --something small
+  end
+end
+
+return cur
diff --git a/debian/modules/nchan/src/store/redis/scripts/channel_keepalive.lua b/debian/modules/nchan/src/store/redis/scripts/channel_keepalive.lua
new file mode 100644
index 0000000..b495087
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/channel_keepalive.lua
@@ -0,0 +1,34 @@
+--input:  keys: [], values: [channel_id, ttl]
+-- ttl is for when there are no messages but at least 1 subscriber.
+--output: seconds until next keepalive is expected, or -1 for "let it disappear"
+redis.call('ECHO', ' ####### CHANNEL KEEPALIVE ####### ')
+local id=ARGV[1]
+local ttl=tonumber(ARGV[2])
+if not ttl then
+  return {err="Invalid channel keepalive TTL (2nd arg)"}
+end
+
+local random_safe_next_ttl = function(ttl)
+  return math.floor(ttl/2 + ttl/2.1 * math.random())
+end
+local ch = ('{channel:%s}'):format(id)
+local key={
+  channel=   ch, --hash
+  messages=  ch..':messages', --list
+}
+  
+local subs_count = tonumber(redis.call('HGET', key.channel, "subscribers")) or 0
+local msgs_count = tonumber(redis.call('LLEN', key.messages)) or 0
+local actual_ttl = tonumber(redis.call('TTL',  key.channel))
+
+if subs_count > 0 then
+  if msgs_count > 0 and actual_ttl > ttl then
+    return random_safe_next_ttl(actual_ttl)
+  end
+  --refresh ttl
+  redis.call('expire', key.channel, ttl);
+  redis.call('expire', key.messages, ttl);
+  return random_safe_next_ttl(ttl)
+else
+  return -1
+end
diff --git a/debian/modules/nchan/src/store/redis/scripts/delete.lua b/debian/modules/nchan/src/store/redis/scripts/delete.lua
new file mode 100644
index 0000000..382c9db
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/delete.lua
@@ -0,0 +1,58 @@
+--input: keys: [],  values: [ channel_id ]
+--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
+-- delete this channel and all its messages
+local id = ARGV[1]
+local ch = ('{channel:%s}'):format(id)
+local key_msg=    ch..':msg:%s' --not finished yet
+local key_channel=ch
+local messages=   ch..':messages'
+local subscribers=ch..':subscribers'
+local pubsub=     ch..':pubsub'
+
+redis.call('echo', ' ####### DELETE #######')
+local num_messages = 0
+--delete all the messages right now mister!
+local msg
+while true do
+  msg = redis.call('LPOP', messages)
+  if msg then
+    num_messages = num_messages + 1
+    redis.call('DEL', key_msg:format(msg))
+  else
+    break
+  end
+end
+
+local del_msgpack =cmsgpack.pack({"alert", "delete channel", id})
+for k,channel_key in pairs(redis.call('SMEMBERS', subscribers)) do
+  redis.call('PUBLISH', channel_key, del_msgpack)
+end
+
+local nearly_departed = nil
+if redis.call('EXISTS', key_channel) ~= 0 then
+  nearly_departed = redis.call('hmget', key_channel, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')
+  if(nearly_departed[4]) then
+    --replace subscribers count with fake_subscribers
+    nearly_departed[3]=nearly_departed[4]
+    table.remove(nearly_departed, 4)
+  end
+  for i = 1, 4 do
+    nearly_departed[i]=tonumber(nearly_departed[i]) or 0
+  end
+  if type(nearly_departed[5]) ~= "string" then
+    nearly_departed[5]=""
+  end
+  
+  --leave some crumbs behind showing this channel was just deleted
+  redis.call('setex', ch..":deleted", 5, 1)
+  
+  table.insert(nearly_departed, num_messages)
+end
+
+redis.call('DEL', key_channel, messages, subscribers)
+
+if redis.call('PUBSUB','NUMSUB', pubsub)[2] > 0 then
+  redis.call('PUBLISH', pubsub, del_msgpack)
+end
+
+return nearly_departed
diff --git a/debian/modules/nchan/src/store/redis/scripts/find_channel.lua b/debian/modules/nchan/src/store/redis/scripts/find_channel.lua
new file mode 100644
index 0000000..f02c6fb
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/find_channel.lua
@@ -0,0 +1,45 @@
+--input: keys: [],  values: [ channel_id ]
+--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
+-- finds and return the info hash of a channel, or nil of channel not found
+local id = ARGV[1]
+local chk = ('{channel:%s}'):format(id)
+local key_channel =  chk
+local key_messages = chk..':messages'
+
+redis.call('echo', ' #######  FIND_CHANNEL ######## ')
+
+if redis.call('EXISTS', key_channel) ~= 0 then
+  local ch = redis.call('hmget', key_channel, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')
+  if(ch[4]) then
+    --replace subscribers count with fake_subscribers
+    ch[3]=ch[4]
+    table.remove(ch, 4)
+  end
+  for i = 1, 4 do
+    ch[i]=tonumber(ch[i]) or 0
+  end
+  if type(ch[5]) ~= "string" then
+    ch[5]=""
+  end
+  
+  if redis.call("TYPE", key_messages)['ok'] == 'list' then
+    local oldest_msgid;
+    while true do
+      oldest_msgid = redis.call('LRANGE', key_messages, -1, -1)[1]
+      if redis.call('EXISTS', (chk..':msg:%s'):format(oldest_msgid)) ~= 0 then
+        --key exists.
+        break
+      else
+        redis.breakpoint()
+        redis.call('RPOP', key_messages)
+      end
+    end
+    table.insert(ch, tonumber(redis.call('llen', chk..":messages")))
+  else
+    table.insert(ch, 0)
+  end
+  
+  return ch
+else
+  return nil
+end
diff --git a/debian/modules/nchan/src/store/redis/scripts/get_message.lua b/debian/modules/nchan/src/store/redis/scripts/get_message.lua
new file mode 100644
index 0000000..4cb84e6
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/get_message.lua
@@ -0,0 +1,156 @@
+--input:  keys: [], values: [channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
+--output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
+-- no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent
+-- create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.
+-- result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available
+local id, time, tag, subscribe_if_current = ARGV[1], tonumber(ARGV[2]), tonumber(ARGV[3])
+local no_msgid_order=ARGV[4]
+local create_channel_ttl=tonumber(ARGV[5]) or 0
+local msg_id
+if time and time ~= 0 and tag then
+  msg_id=("%s:%s"):format(time, tag)
+end
+
+if redis.replicate_commands then
+  redis.replicate_commands()
+end
+
+-- This script has gotten big and ugly, but there are a few good reasons 
+-- to keep it big and ugly. It needs to do a lot of stuff atomically, and 
+-- redis doesn't do includes. It could be generated pre-insertion into redis, 
+-- but then error messages become less useful, complicating debugging. If you 
+-- have a solution to this, please help.
+local ch=('{channel:%s}'):format(id)
+local msgkey_fmt=ch..':msg:%s'
+local key={
+  next_message= msgkey_fmt, --hash
+  message=      msgkey_fmt, --hash
+  channel=      ch, --hash
+  messages=     ch..':messages', --list
+--  pubsub=       ch..':subscribers:', --set
+}
+
+--local dbg = function(...) redis.call('echo', table.concat({...})); end
+
+redis.call('echo', ' #######  GET_MESSAGE ######## ')
+
+local oldestmsg=function(list_key, old_fmt)
+  local old, oldkey
+  local n, del=0,0
+  while true do
+    n=n+1
+    old=redis.call('lindex', list_key, -1)
+    if old then
+      oldkey=old_fmt:format(old)
+      local ex=redis.call('exists', oldkey)
+      if ex==1 then
+        return oldkey
+      else
+        redis.call('rpop', list_key)
+        del=del+1
+      end 
+    else
+      --dbg(list_key, " is empty")
+      break
+    end
+  end
+end
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      --dbg(k.."="..v)
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+
+if no_msgid_order ~= 'FIFO' then
+  no_msgid_order = 'FILO'
+end
+
+local channel = tohash(redis.call('HGETALL', key.channel))
+local new_channel = false
+if next(channel) == nil then
+  if create_channel_ttl==0 then
+    return {404, nil}
+  end
+  redis.call('HSET', key.channel, 'time', time)
+  redis.call('EXPIRE', key.channel, create_channel_ttl)
+  channel = {time=time}
+  new_channel = true
+end
+
+local subs_count = tonumber(channel.subscribers)
+
+local found_msg_id
+if msg_id==nil then
+  if new_channel then
+    --dbg("new channel")
+    return {418, "", "", "", "", subs_count}
+  else
+    --dbg("no msg id given, ord="..no_msgid_order)
+    
+    if no_msgid_order == 'FIFO' then --most recent message
+      --dbg("get most recent")
+      found_msg_id=channel.current_message
+    elseif no_msgid_order == 'FILO' then --oldest message
+      --dbg("get oldest")
+      
+      found_msg_id=oldestmsg(key.messages, msgkey_fmt)
+    end
+    if found_msg_id == nil then
+      --we await a message
+      return {418, "", "", "", "", subs_count}
+    else
+      msg_id = found_msg_id
+      local msg=tohash(redis.call('HGETALL', msg_id))
+      if not next(msg) then --empty
+        return {404, "", "", "", "", subs_count}
+      else
+        --dbg(("found msg %s:%s  after %s:%s"):format(tostring(msg.time), tostring(msg.tag), tostring(time), tostring(tag)))
+        local ttl = redis.call('TTL', msg_id)
+        return {200, ttl, tonumber(msg.time) or "", tonumber(msg.tag) or "", tonumber(msg.prev_time) or "", tonumber(msg.prev_tag) or "", msg.data or "", msg.content_type or "", msg.eventsource_event or "", subs_count}
+      end
+    end
+  end
+else
+  if msg_id and channel.current_message == msg_id
+   or not channel.current_message then
+    return {418, "", "", "", "", subs_count}
+  end
+
+  key.message=key.message:format(msg_id)
+  local msg=tohash(redis.call('HGETALL', key.message))
+
+  if next(msg) == nil then -- no such message. it might've expired, or maybe it was never there
+    --dbg("MESSAGE NOT FOUND")
+    return {404, nil}
+  end
+
+  local next_msg, next_msgtime, next_msgtag
+  if not msg.next then --this should have been taken care of by the channel.current_message check
+    --dbg("NEXT MESSAGE KEY NOT PRESENT. ERROR, ERROR!")
+    return {404, nil}
+  else
+    --dbg("NEXT MESSAGE KEY PRESENT: " .. msg.next)
+    key.next_message=key.next_message:format(msg.next)
+    if redis.call('EXISTS', key.next_message)~=0 then
+      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event'))
+      local ttl = redis.call('TTL', key.next_message)
+      --dbg(("found msg2 %i:%i  after %i:%i"):format(ntime, ntag, time, tag))
+      return {200, ttl, tonumber(ntime) or "", tonumber(ntag) or "", tonumber(prev_time) or "", tonumber(prev_tag) or "", ndata or "", ncontenttype or "", neventsource_event or "", subs_count}
+    else
+      --dbg("NEXT MESSAGE NOT FOUND")
+      return {404, nil}
+    end
+  end
+end
diff --git a/debian/modules/nchan/src/store/redis/scripts/get_message_from_key.lua b/debian/modules/nchan/src/store/redis/scripts/get_message_from_key.lua
new file mode 100644
index 0000000..13055ca
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/get_message_from_key.lua
@@ -0,0 +1,9 @@
+--input:  keys: [message_key], values: []
+--output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
+
+local key = KEYS[1]
+
+local ttl = redis.call('TTL', key)
+local time, tag, prev_time, prev_tag, data, content_type, es_event = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event'))
+
+return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or "", content_type or "", es_event or ""}
diff --git a/debian/modules/nchan/src/store/redis/scripts/publish.lua b/debian/modules/nchan/src/store/redis/scripts/publish.lua
new file mode 100644
index 0000000..23da3bb
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/publish.lua
@@ -0,0 +1,278 @@
+--input:  keys: [], values: [channel_id, time, message, content_type, eventsource_event, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]
+--output: message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
+
+local id=ARGV[1]
+local time
+if redis.replicate_commands then
+  -- we're on redis >= 3.2. We can use We can use 'script effects replication' to allow
+  -- writing nondeterministic command values like TIME.
+  -- That's exactly what we want to do, use Redis' TIME rather than the given time from Nginx
+  -- Also, it's more efficient to replicate just the commands in this case rather than run the whole script
+  redis.replicate_commands()
+  time = tonumber(redis.call('TIME')[1])
+else
+  --fallback to the provided time
+  time = tonumber(ARGV[2])
+end
+
+local msg={
+  id=nil,
+  data= ARGV[3],
+  content_type=ARGV[4],
+  eventsource_event=ARGV[5],
+  ttl= tonumber(ARGV[6]),
+  time= time,
+  tag= 0
+}
+if msg.ttl == 0 then
+  msg.ttl = 126144000 --4 years
+end
+local store_at_most_n_messages = tonumber(ARGV[7])
+if store_at_most_n_messages == nil or store_at_most_n_messages == "" then
+  return {err="Argument 7, max_msg_buf_size, can't be empty"}
+end
+if store_at_most_n_messages == 0 then
+  msg.unbuffered = 1
+end
+
+local msgpacked_pubsub_cutoff = tonumber(ARGV[8])
+
+--[[local dbg = function(...)
+  local arg = {...}
+  for i = 1, #arg do
+    arg[i]=tostring(arg[i])
+  end
+  redis.call('echo', table.concat(arg))
+end
+]]
+if type(msg.content_type)=='string' and msg.content_type:find(':') then
+  return {err='Message content-type cannot contain ":" character.'}
+end
+
+redis.call('echo', ' #######  PUBLISH   ######## ')
+
+-- sets all fields for a hash from a dictionary
+local hmset = function (key, dict)
+  if next(dict) == nil then return nil end
+  local bulk = {}
+  for k, v in pairs(dict) do
+    table.insert(bulk, k)
+    table.insert(bulk, v)
+  end
+  return redis.call('HMSET', key, unpack(bulk))
+end
+
+--[[
+local hash_tostr=function(h)
+  local tt = {}
+  for k, v in pairs(h) do
+    table.insert(tt, ("%s: %s"):format(k, v))
+  end
+  return "{" .. table.concat(tt,", ") .. "}"
+end
+]]
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+
+local ch = ('{channel:%s}'):format(id)
+local msg_fmt = ch..':msg:%s'
+local key={
+  last_message= msg_fmt, --not finished yet
+  message=      msg_fmt, --not finished yet
+  channel=      ch,
+  messages=     ch..':messages',
+  subscribers=  ch..':subscribers'
+}
+local channel_pubsub = ch..':pubsub'
+
+local new_channel
+local channel
+if redis.call('EXISTS', key.channel) ~= 0 then
+  channel=tohash(redis.call('HGETALL', key.channel))
+  channel.max_stored_messages = tonumber(channel.max_stored_messages)
+end
+
+if channel~=nil then
+  --dbg("channel present")
+  if channel.current_message ~= nil then
+    --dbg("channel current_message present")
+    key.last_message=key.last_message:format(channel.current_message, id)
+  else
+    --dbg("channel current_message absent")
+    key.last_message=nil
+  end
+  new_channel=false
+else
+  --dbg("channel missing")
+  channel={}
+  new_channel=true
+  key.last_message=nil
+end
+
+--set new message id
+local lastmsg, lasttime, lasttag
+if key.last_message then
+  lastmsg = redis.call('HMGET', key.last_message, 'time', 'tag')
+  lasttime, lasttag = tonumber(lastmsg[1]), tonumber(lastmsg[2])
+  --dbg("New message id: last_time ", lasttime, " last_tag ", lasttag, " msg_time ", msg.time)
+  if lasttime and tonumber(lasttime) > tonumber(msg.time) then
+    redis.log(redis.LOG_WARNING, "Nchan: message for " .. id .. " arrived a little late and may be delivered out of order. Redis must be very busy.")
+    msg.time = lasttime
+    time = lasttime
+  end
+  if lasttime and lasttime==msg.time then
+    msg.tag=lasttag+1
+  end
+  msg.prev_time = lasttime
+  msg.prev_tag = lasttag
+else
+  msg.prev_time = 0
+  msg.prev_tag = 0
+end
+msg.id=('%i:%i'):format(msg.time, msg.tag)
+
+key.message=key.message:format(msg.id)
+if redis.call('EXISTS', key.message) ~= 0 then
+  local errmsg = "Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s"
+  errmsg = errmsg:format(key.message, id, msg.id, time, lasttime, lasttag)
+  --redis.log(redis.LOG_WARNING, errmsg)
+  --redis.log(redis.LOG_WARNING, "channel: " .. key.channel .. hash_tostr(channel))
+  --redis.log(redis.LOG_WARNING, ("messages: %s {%s}"):format(key.messages, table.concat(redis.call('LRANGE', key.messages, 0, -1), ", ")))
+  return {err=errmsg}
+end
+
+msg.prev=channel.current_message
+if key.last_message and redis.call('exists', key.last_message) == 1 then
+  redis.call('HSET', key.last_message, 'next', msg.id)
+end
+
+--update channel
+redis.call('HSET', key.channel, 'current_message', msg.id)
+if msg.prev then
+  redis.call('HSET', key.channel, 'prev_message', msg.prev)
+end
+if time then
+  redis.call('HSET', key.channel, 'time', time)
+end
+
+local message_len_changed = false
+if channel.max_stored_messages ~= store_at_most_n_messages then
+  channel.max_stored_messages = store_at_most_n_messages
+  message_len_changed = true
+  redis.call('HSET', key.channel, 'max_stored_messages', store_at_most_n_messages)
+  --dbg("channel.max_stored_messages was not set, but is now ", store_at_most_n_messages)
+end
+
+--write message
+hmset(key.message, msg)
+
+
+--check old entries
+local oldestmsg=function(list_key, old_fmt)
+  local old, oldkey
+  local n, del=0,0
+  while true do
+    n=n+1
+    old=redis.call('lindex', list_key, -1)
+    if old then
+      oldkey=old_fmt:format(old)
+      local ex=redis.call('exists', oldkey)
+      if ex==1 then
+        return oldkey
+      else
+        redis.call('rpop', list_key)
+        del=del+1
+      end
+    else
+      break
+    end
+  end
+end
+
+local max_stored_msgs = channel.max_stored_messages or -1
+
+if max_stored_msgs < 0 then --no limit
+  oldestmsg(key.messages, msg_fmt)
+  redis.call('LPUSH', key.messages, msg.id)
+elseif max_stored_msgs > 0 then
+  local stored_messages = tonumber(redis.call('LLEN', key.messages))
+  redis.call('LPUSH', key.messages, msg.id)
+  -- Reduce the message length if necessary
+  local dump_message_ids = redis.call('LRANGE', key.messages, max_stored_msgs, stored_messages);
+  if dump_message_ids then
+    for _, msgid in ipairs(dump_message_ids) do
+      redis.call('DEL', msg_fmt:format(msgid))
+    end
+  end
+  redis.call('LTRIM', key.messages, 0, max_stored_msgs - 1)
+  oldestmsg(key.messages, msg_fmt)
+end
+
+
+--set expiration times for all the things
+local channel_ttl = tonumber(redis.call('TTL',  key.channel))
+redis.call('EXPIRE', key.message, msg.ttl)
+if msg.ttl > channel_ttl then
+  redis.call('EXPIRE', key.channel, msg.ttl)
+  redis.call('EXPIRE', key.messages, msg.ttl)
+  redis.call('EXPIRE', key.subscribers, msg.ttl)
+end
+
+--publish message
+local unpacked
+
+if msg.unbuffered or #msg.data < msgpacked_pubsub_cutoff then
+  unpacked= {
+    "msg",
+    msg.ttl or 0,
+    msg.time,
+    tonumber(msg.tag) or 0,
+    (msg.unbuffered and 0 or msg.prev_time) or 0,
+    (msg.unbuffered and 0 or msg.prev_tag) or 0,
+    msg.data or "",
+    msg.content_type or "",
+    msg.eventsource_event or ""
+  }
+else
+  unpacked= {
+    "msgkey",
+    msg.time,
+    tonumber(msg.tag) or 0,
+    key.message
+  }
+end
+
+if message_len_changed then
+  unpacked[1] = "max_msgs+" .. unpacked[1]
+  table.insert(unpacked, 2, tonumber(channel.max_stored_messages))
+end
+
+local msgpacked
+
+--dbg(("Stored message with id %i:%i => %s"):format(msg.time, msg.tag, msg.data))
+
+--now publish to the efficient channel
+local numsub = redis.call('PUBSUB','NUMSUB', channel_pubsub)[2]
+if tonumber(numsub) > 0 then
+  msgpacked = cmsgpack.pack(unpacked)
+  redis.call('PUBLISH', channel_pubsub, msgpacked)
+end
+
+local num_messages = redis.call('llen', key.messages)
+
+--dbg("channel ", id, " ttl: ",channel.ttl, ", subscribers: ", channel.subscribers, "(fake: ", channel.fake_subscribers or "nil", "), messages: ", num_messages)
+return { msg.tag, {tonumber(channel.ttl or msg.ttl), tonumber(channel.time or msg.time), tonumber(channel.fake_subscribers or channel.subscribers or 0), tonumber(num_messages)}, new_channel}
diff --git a/debian/modules/nchan/src/store/redis/scripts/publish_status.lua b/debian/modules/nchan/src/store/redis/scripts/publish_status.lua
new file mode 100644
index 0000000..a8b5ef0
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/publish_status.lua
@@ -0,0 +1,26 @@
+--input:  keys: [], values: [channel_id, status_code]
+--output: current_subscribers
+
+redis.call('echo', ' ####### PUBLISH STATUS ####### ')
+--local dbg = function(...) redis.call('echo', table.concat({...})); end
+local id=ARGV[1]
+local code=tonumber(ARGV[2])
+if code==nil then
+  return {err="non-numeric status code given, bailing!"}
+end
+
+local pubmsg = "status:"..code
+local ch = ('{channel:%s}'):format(id)
+local subs_key = ch..':subscribers'
+local chan_key = ch
+--local channel_pubsub = ch..':pubsub'
+
+for k,channel_key in pairs(redis.call('SMEMBERS', subs_key)) do
+  --not efficient, but useful for a few short-term subscriptions
+  redis.call('PUBLISH', channel_key, pubmsg)
+end
+--clear short-term subscriber list
+redis.call('DEL', subs_key)
+--now publish to the efficient channel
+--what?... redis.call('PUBLISH', channel_pubsub, pubmsg)
+return redis.call('HGET', chan_key, 'subscribers') or 0
diff --git a/debian/modules/nchan/src/store/redis/scripts/rsck.lua b/debian/modules/nchan/src/store/redis/scripts/rsck.lua
new file mode 100644
index 0000000..76dbffe
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/rsck.lua
@@ -0,0 +1,199 @@
+--redis-store consistency check
+
+local concat = function(...)
+  local arg = {...}
+  for i = 1, #arg do
+    arg[i]=tostring(arg[i])
+  end
+  return table.concat(arg, " ")
+end
+local dbg =function(...) redis.call('echo', concat(...)); end
+local errors={}
+local err = function(...)
+  local msg = concat(...)
+  dbg(msg)
+  table.insert(errors, msg)
+end
+
+local tp=function(t, max_n)
+  local tt={}
+  for i, v in pairs(t) do
+    local val = tostring(v)
+    if max_n and #val > max_n then
+      val = val:sub(1, max_n) .. "[...]"
+    end
+    table.insert(tt, tostring(i) .. ": " .. val)
+  end
+  return "{" .. table.concat(tt, ", ") .. "}"
+end
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+local type_is = function(key, _type, description)
+  local t = redis.call("TYPE", key)['ok']
+  local type_ok = true
+  if type(_type) == "table" then
+    type_ok = false
+    for i, v in pairs(_type) do
+      if v == _type then
+        type_ok = true
+        break
+      end
+    end
+  elseif t ~= _type then
+    err((description or ""), key, "should be type " .. _type .. ", is", t)
+    type_ok = false
+  end
+  return type_ok, t
+end
+
+local known_msgs_count=0
+local known_msgkeys = {}
+local known_channel_keys = {}
+
+local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)
+  description = description and "msg (" .. description ..")" or "msg"
+  local msgkey = "{channel:"..chid.."}:msg:"..msgid
+  if not known_msgkeys[msgkey] then
+    known_msgs_count = known_msgs_count + 1
+  end
+  known_msgkeys[msgkey]=true
+  local ok, t = type_is(msgkey, {"hash", "none"}, "message hash")
+  if t == "none" then
+    --message is missing, but maybe it expired under normal circumstances. 
+    --check if any earlier messages are present
+    local msgids = redis.call('LRANGE', "{channel:"..chid.."}:messages", 0, -1)
+    local founds = 0
+    for i=#msgids, 1, -1 do
+      if msgids[i] == msgid then 
+        break
+      end
+      local thismsgkey = "{channel:"..chid.."}:msg:".. msgids[i]
+      local ttt = redis.call('type', thismsgkey)['ok']
+      redis.breakpoint()
+      if ttt == "hash" then
+        founds = founds + 1
+      end
+    end
+    
+    if founds > 0 then
+      err("message", msgkey, "missing, with", founds, "prev. msgs in msg list")
+    end
+    
+  end
+  local msg = tohash(redis.call('HGETALL', msgkey))
+  local ttl = tonumber(redis.call('TTL', msgkey))
+  local n = tonumber(redis.call("HLEN", msgkey))
+  if n > 0 and (msg.data == nil or msg.id == nil or msg.time == nil or msg.tag == nil)then
+    err("incomplete " .. description .."(ttl "..ttl..")", msgkey, tp(msg))
+    return false
+  end
+  if t == "hash" and tonumber(ttl) < 0 then
+    err("message", msgkey, "ttl =", ttl)
+  end
+  if ttl ~= -2 then
+    if prev_msgid ~= false and msg.prev ~= prev_msgid then
+      err(description, chid, msgid, "prev_message wrong. expected", prev_msgid, "got", msg.prev)
+    end
+    if next_msgid ~= false and msg.next ~= next_msgid then
+      err(description, chid, msgid, "next_message wrong. expected", next_msgid, "got", msg.next)
+    end
+  end
+end
+
+local check_channel = function(id)
+  local key={
+    ch = "{channel:"..id.."}",
+    msgs = "{channel:"..id.."}:messages"
+  }
+  
+  local ok, chkey_type = type_is(key.ch, "hash", "channel hash")
+  if not ok then
+    if chkey_type ~= "none" then
+      err("unecpected channel key", key.ch, "type:", chkey_type);
+    end
+    return false
+  end
+  local _, msgs_list_type = type_is(key.msgs, {"list", "none"}, "channel messages list")
+  
+  local ch = tohash(redis.call('HGETALL', key.ch))
+  local len = tonumber(redis.call("HLEN", key.ch))
+  local ttl = tonumber(redis.call('TTL',  key.ch))
+  if not ch.current_message or not ch.time then
+    if msgs_list_type == "list" then
+      err("incomplete channel (ttl " .. ttl ..")", key.ch, tp(ch))
+    end  
+  elseif (ch.current_message or ch.prev_message) and msgs_list_type ~= "list" then
+    err("channel", key.ch, "has a current_message but no message list")
+  end
+  
+  local msgids = redis.call('LRANGE', key.msgs, 0, -1)
+  for i, msgid in ipairs(msgids) do
+    check_msg(id, msgid, msgids[i+1], msgids[i-1], "msglist")
+  end
+  
+  if ch.prev_message then
+    if redis.call('LINDEX', key.msgs, 1) ~= ch.prev_message then
+      err("channel", key.ch, "prev_message doesn't correspond to", key.msgs, "second list element")
+    end
+    check_msg(id, ch.prev_message, false, ch.current_message, "channel prev_message")
+  end
+  if ch.current_message then
+    if redis.call('LINDEX', key.msgs, 0) ~= ch.current_message then
+      err("channel", key.ch, "current_message doesn't correspond to", key.msgs, "first list element")
+    end
+    check_msg(id, ch.current_message, ch.prev_message, false, "channel current_message")
+  end
+  
+end
+
+local channel_ids = {}
+
+for i, chkey in ipairs(redis.call("KEYS", "{channel:*}")) do
+  local msgs_chid_match = chkey:match("^{channel:(.*)}:messages")
+  if msgs_chid_match then
+    type_is("{channel:" .. msgs_chid_match.."}", "hash", "channel messages' corresponding hash key")
+  elseif not chkey:match(":msg$") then
+    table.insert(channel_ids, chkey);
+    known_channel_keys[chkey] = true
+  end
+end
+
+dbg("found", #channel_ids, "channels")
+for i, chkey in ipairs(channel_ids) do
+  local chid = chkey:match("^{channel:(.*)}")
+  check_channel(chid)
+end
+
+for i, msgkey in ipairs(redis.call("KEYS", "{channel:*}:msg")) do
+  if not known_msgkeys[msgkey] then
+    local ok, t = type_is(msgkey, "hash")
+    if ok then
+      if not redis.call('HGET', msgkey, 'unbuffered') then
+        err("orphan message", msgkey, "(ttl: " .. redis.call('TTL', msgkey) .. ")", tp(tohash(redis.call('HGETALL', msgkey)), 15))
+      end
+    else
+      err("orphan message", msgkey, "wrong type", t) 
+    end
+  end
+end
+
+if errors then
+  table.insert(errors, 1, concat(#channel_ids, "channels,",known_msgs_count,"messages found", #errors, "problems"))
+  return errors
+else
+  return concat(#channel_ids, "channels,", known_msgs_count, "messages, all ok")
+end
diff --git a/debian/modules/nchan/src/store/redis/scripts/subscriber_register.lua b/debian/modules/nchan/src/store/redis/scripts/subscriber_register.lua
new file mode 100644
index 0000000..479623f
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/subscriber_register.lua
@@ -0,0 +1,50 @@
+--input: keys: [], values: [channel_id, subscriber_id, active_ttl]
+--  'subscriber_id' can be '-' for new id, or an existing id
+--  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
+--output: subscriber_id, num_current_subscribers, next_keepalive_time
+
+local id, sub_id, active_ttl, concurrency = ARGV[1], ARGV[2], tonumber(ARGV[3]) or 20, ARGV[4]
+
+--local dbg = function(...) redis.call('echo', table.concat({...})); end
+
+redis.call('echo', ' ######## SUBSCRIBER REGISTER SCRIPT ####### ')
+local ch=("{channel:%s}"):format(id)
+local keys = {
+  channel =     ch,
+  messages =    ch..':messages:',
+  subscribers = ch..':subscribers'
+}
+
+local setkeyttl=function(ttl)
+  for i,v in pairs(keys) do
+    if ttl > 0 then
+      redis.call('expire', v, ttl)
+    else
+      redis.call('persist', v)
+    end
+  end
+end
+
+local random_safe_next_ttl = function(ttl)
+  return math.floor(ttl/2 + ttl/2.1 * math.random())
+end
+
+local sub_count
+
+if sub_id == "-" then
+  sub_id = tonumber(redis.call('HINCRBY', keys.channel, "last_subscriber_id", 1))
+  sub_count=tonumber(redis.call('hincrby', keys.channel, 'subscribers', 1))
+else
+  sub_count=tonumber(redis.call('hget', keys.channel, 'subscribers'))
+end
+
+local next_keepalive 
+local actual_ttl = tonumber(redis.call('ttl', keys.channel))
+if actual_ttl < active_ttl then
+  setkeyttl(active_ttl)
+  next_keepalive = random_safe_next_ttl(active_ttl)
+else
+  next_keepalive = random_safe_next_ttl(actual_ttl)
+end
+
+return {sub_id, sub_count, next_keepalive}
diff --git a/debian/modules/nchan/src/store/redis/scripts/subscriber_unregister.lua b/debian/modules/nchan/src/store/redis/scripts/subscriber_unregister.lua
new file mode 100644
index 0000000..9233c78
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/subscriber_unregister.lua
@@ -0,0 +1,49 @@
+--input: keys: [], values: [channel_id, subscriber_id, empty_ttl]
+-- 'subscriber_id' is an existing id
+-- 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
+--output: subscriber_id, num_current_subscribers
+
+local id, sub_id, empty_ttl = ARGV[1], ARGV[2], tonumber(ARGV[3]) or 20
+
+--local dbg = function(...) redis.call('echo', table.concat({...})); end
+
+redis.call('echo', ' ######## SUBSCRIBER UNREGISTER SCRIPT ####### ')
+local ch=('{channel:%s}'):format(id)
+local keys = {
+  channel =     ch,
+  messages =    ch..':messages',
+  subscribers = ch..':subscribers',
+}
+
+local setkeyttl=function(ttl)
+  for i,v in pairs(keys) do
+    if ttl > 0 then
+      redis.call('expire', v, ttl)
+    elseif ttl < 0 then
+      redis.call('persist', v)
+    else
+      redis.call('del', v)
+    end
+  end
+end
+
+local sub_count = 0
+
+local res = redis.pcall('EXISTS', keys.channel)
+if type(res) == "table" and res["err"] then
+  return {err = ("CLUSTER KEYSLOT ERROR. %i %s"):format(empty_ttl, id)}
+end
+
+if res ~= 0 then
+   sub_count = redis.call('hincrby', keys.channel, 'subscribers', -1)
+
+  if sub_count == 0 and tonumber(redis.call('LLEN', keys.messages)) == 0 then
+    setkeyttl(empty_ttl)
+  elseif sub_count < 0 then
+    return {err="Subscriber count for channel " .. id .. " less than zero: " .. sub_count}
+  end
+else
+  --dbg("channel ", id, " already gone")
+end
+
+return {sub_id, sub_count}
diff --git a/debian/modules/nchan/src/store/redis/scripts/testscripts.rb b/debian/modules/nchan/src/store/redis/scripts/testscripts.rb
new file mode 100755
index 0000000..27f4f9d
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/testscripts.rb
@@ -0,0 +1,268 @@
+#!/usr/bin/ruby
+require 'digest/sha1'
+require "redis"
+require 'open3'
+require 'minitest'
+require 'minitest/reporters'
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new(:color => true)]
+require "minitest/autorun"
+require 'securerandom'
+require "pry"
+
+REDIS_HOST="127.0.0.1"
+REDIS_PORT=8537
+REDIS_DB=1
+
+class PubSubTest < Minitest::Test
+  @@redis=nil
+  @@scripts= {}
+  @@files=   {}
+  @@scripts= {}
+  @@hashes=  {}
+  
+  def self.test_order
+    :alpha
+  end
+  
+  def self.luac
+    if @@scripts
+      @@scripts.each do |name, script|
+        Open3.popen2e('luac', "-p", @@files[name]) do |stdin, stdouterr, process|
+          raise stdouterr.read unless process.value.success?
+        end
+      end
+    else
+      raise "scripts not loaded yet"
+    end
+  end
+  
+  def self.loadscripts
+    @@scripts.each do |name, script|
+      begin
+        h=@@redis.script :load, script
+        @@hashes[name]=h
+      rescue Redis::CommandError => e
+        e.message.gsub!(/:\s+(user_script):(\d+):/, ": \n#{name}.lua:\\2:")
+        def e.backtrace; []; end
+        raise e
+      end
+    end
+  end
+  
+  def setup
+    unless @@redis
+      @@redis=Redis.new(:host => REDIS_HOST, :port => REDIS_PORT, :db => REDIS_DB)
+
+      Dir[ "#{File.dirname(__FILE__)}/*.lua" ].each do |f|
+        scriptname=File.basename(f, ".lua").to_sym
+        @@scripts[scriptname]=IO.read f
+        @@files[scriptname]=f
+      end
+      self.class.luac
+      self.class.loadscripts
+    end
+  end
+
+  def redis; @@redis; end
+  def hashes; @@hashes; end
+
+  class Msg
+    attr_accessor :data, :chid, :time, :tag, :id, :content_type, :channel_info, :ttl, :max_buf_size, :eventsource_event
+    def _empty_is_nil(v)
+      v == "" ? nil : v
+    end
+    def initialize(channel_id, arg={})
+      @chid= _empty_is_nil channel_id
+      id(arg[:id]) if arg[:id]
+      @time= _empty_is_nil arg[:time]
+      @tag= _empty_is_nil arg[:tag]
+      @data= _empty_is_nil arg[:data]
+      if @data && @time.nil?
+        @time=Time.now.utc.to_i
+      end
+      @ttl=_empty_is_nil arg[:ttl]
+      @eventsource_event = _empty_is_nil arg[:eventsource_event]
+      @max_buf_size = _empty_is_nil arg[:max_buf_size] || 100
+      @content_type=_empty_is_nil arg[:content_type]
+    end
+    def ==(m)
+      self.to_s==m.to_s
+    end
+    
+    def to_s
+      "[#{@chid}]#{id}<#{@content_type}> #{@data}"
+    end
+    
+    def id(msgid=nil)
+      if msgid
+        @id=msgid
+        @time, @tag =@id.split(":")
+      else
+        @id||= "#{time}:#{tag}" unless time.nil? || tag.nil?
+      end
+      @id
+    end
+    def time=(t)
+      @time=t
+      id
+    end
+    def tag=(t)
+      @tag=t
+      id
+    end
+  end
+
+  def publish(*arg)
+    if arg.length==1
+      msg = arg.first
+      msg=Msg.new(msg[:channel_id] || msg[:chid], msg) if Hash === msg
+    elsif arg.length==2
+      msg=Msg.new(arg.first, arg.last)
+    end
+
+    msg.time= Time.now.utc.to_i unless msg.time
+    msg_tag, channel_info=redis.evalsha hashes[:publish], [], [msg.chid, msg.time, msg.data, msg.content_type, msg.eventsource_event, msg.ttl, msg.max_buf_size]
+    msg.tag=msg_tag
+    msg.channel_info=channel_info
+    return msg
+  end
+
+  def delete(ch_id)
+    redis.evalsha hashes[:delete], [], [ch_id]
+  end
+
+  def getmsg(msg, opt={})
+    if String===opt
+      ch_id=msg
+      msg_id=opt
+      msg_time, msg_tag = msg_id.split(":")
+    elsif Msg === msg
+      msg_id, msg_time, msg_tag = msg.id, msg.time, msg.tag
+      ch_id=msg.chid
+    else
+      msg_time, msg_tag = msg.split(":")
+      msg_id=msg
+    end
+    traverse_order=((Hash === opt) && opt[:getfirst]) ? 'FIFO' : 'FILO'
+    msg_tag=0 if msg_time && msg_tag.nil?
+    #binding.pry
+    status, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, msg_data, msg_content_type, msg_eventsource_event, subscriber_count = redis.evalsha hashes[:get_message], [], [ch_id, msg_time || 0, msg_tag || 0, traverse_order, 15 ]
+    if status == 404
+      return nil
+    elsif status == 418 #not ready
+      return false
+    elsif status == 200
+      return Msg.new ch_id, time: msg_time, tag: msg_tag, data: msg_data, content_type: msg_content_type, eventsource_event: msg_eventsource_event, ttl: msg_ttl
+    end
+  end
+
+  def randid
+    SecureRandom.hex
+  end
+
+  def test_connection
+    assert_equal "PONG", redis.ping
+  end
+
+  #now for the real tests
+  def test_publish
+    msg_id, channel = publish chid: randid, data: "hello what is this", ttl: 10, content_type: "X-fruit/banana"
+  end
+  
+  def test_nomessage
+    id = randid
+    publish chid: id, data:"whatever this is", ttl: 100
+    msg = getmsg randid, "1200:0"
+    refute msg, "message should be absent"
+  end
+  
+  def test_simple
+    id=randid
+    msg2_data = "what is this i don't even"
+    m=[]
+    m << Msg.new(id, data: "whatever",ttl: 100, content_type: "X-fruit/banana")
+    m << Msg.new(id, data: msg2_data, ttl: 100, content_type: "X-fruit/banana")
+    m.each do |msg|
+      publish msg
+    end
+    refute_equal m[0], m[1], "two different messages should have different message ids"
+    msg = getmsg m[0]
+
+    assert_equal m[1], msg, "retrieved message doesn't match"
+  end
+  
+  def test_publish_invalid_content_type
+    e = assert_raises Redis::CommandError do
+      publish randid, data: "this message has an invalid content-type", content_type: "foo:bar", ttl: 10
+    end
+    assert_match /cannot contain ":"/, e.message
+  end
+  
+  def test_walk_buffer
+    id=randid
+    sent=[]
+    %w( foobar1 whatthe-somethng-of isnot-even-meaning -has-you-evenr-as-sofar-as-to -even-move-zig).each do |w|
+      sent << Msg.new(id, data: w, ttl: 100)
+      sleep rand(0..1.1)
+    end
+    sent.each do |m|
+      publish m
+    end
+    
+    cur=Msg.new(id)
+    while sent.length>0
+      #binding.pry
+      cur=getmsg cur
+      n=sent.shift
+      assert_equal cur, n
+      cur=n
+    end
+    assert_equal false, getmsg(cur), "Last message should return 'false'"
+  end
+  
+  def test_timeout
+    id=randid
+    sent=[]
+    sent << publish(Msg.new(id, data: "fee", ttl: 3))
+    sleep 2
+    sent << publish(Msg.new(id, data: "foo", ttl: 3))
+    sent << publish(Msg.new(id, data: "fie", ttl: 3))
+    sleep 1.5
+    cur=getmsg id, ""
+    assert_equal cur, sent[1]
+    sleep 1.6
+    cur=getmsg id, ""
+    assert_equal false, cur
+    #nice!
+  end
+  
+  def test_largemsg
+    id=randid
+    sent= publish(Msg.new id, data: "0" * 100000 * 1024, ttl: 20)
+    cur = getmsg id, ""
+    assert_equal cur, sent
+  end
+  
+  def test_delete
+    id=randid
+    sent=[]
+    sent << publish(Msg.new(id, data: "fee", ttl: 30))
+    sent << publish(Msg.new(id, data: "foo", ttl: 30))
+    sent << publish(Msg.new(id, data: "foo2", ttl: 30))
+    
+    cur=getmsg id, ""
+    assert_equal sent[0], cur
+    
+    cur=getmsg cur
+    assert_equal sent[1], cur
+    
+    cur=getmsg cur
+    assert_equal sent[2], cur
+    
+    delete id
+    
+    cur=getmsg Msg.new(id), sub: 'foobar'
+    assert_equal false, cur
+  end
+  
+end
diff --git a/debian/modules/nchan/src/store/redis/store-private.h b/debian/modules/nchan/src/store/redis/store-private.h
new file mode 100644
index 0000000..8487efa
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/store-private.h
@@ -0,0 +1,195 @@
+#ifndef NCHAN_REDIS_STORE_PRIVATE_H
+#define NCHAN_REDIS_STORE_PRIVATE_H
+
+#define NCHAN_CHANHEAD_EXPIRE_SEC 1
+#define NCHAN_CHANHEAD_CLUSTER_ORPHAN_EXPIRE_SEC 15
+#define NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE 0xB00F
+
+#include <nchan_module.h>
+#include "uthash.h"
+#include "hiredis/hiredis.h"
+#include "hiredis/async.h"
+#include <util/nchan_reaper.h>
+#include <util/nchan_rbtree.h>
+#include <util/nchan_list.h>
+#include <store/spool.h>
+
+typedef struct rdstore_data_s rdstore_data_t;
+typedef struct rdstore_channel_head_s rdstore_channel_head_t;
+
+typedef struct {
+  rdstore_data_t          *node_rdt;
+  unsigned                 enabled:1;
+} rdstore_channel_head_cluster_data_t;
+
+
+typedef enum {SUBBING, SUBBED, UNSUBBING, UNSUBBED} redis_pubsub_status_t;
+
+struct rdstore_channel_head_s {
+  ngx_str_t                    id; //channel id
+  channel_spooler_t            spooler;
+  ngx_uint_t                   generation; //subscriber pool generation.
+  chanhead_pubsub_status_t     status;
+  ngx_uint_t                   sub_count;
+  ngx_int_t                    fetching_message_count;
+  ngx_uint_t                   internal_sub_count;
+  ngx_event_t                  keepalive_timer;
+  nchan_msg_id_t               last_msgid;
+  
+  void                        *redis_subscriber_privdata;
+  rdstore_data_t              *rdt;
+  rdstore_channel_head_cluster_data_t cluster;
+  
+  ngx_int_t                    reserved;
+  
+  rdstore_channel_head_t      *gc_prev;
+  rdstore_channel_head_t      *gc_next;
+  
+  rdstore_channel_head_t      *rd_next;
+  rdstore_channel_head_t      *rd_prev;
+  
+  time_t                       gc_time;
+  nchan_reaper_t              *in_gc_reaper;
+  
+  redis_pubsub_status_t        pubsub_status;
+  unsigned                     meta:1;
+  unsigned                     shutting_down:1;
+  UT_hash_handle               hh;
+};
+
+typedef struct {
+  ngx_str_t     host;
+  ngx_int_t     port;
+  ngx_str_t     password;
+  ngx_int_t     db;
+} redis_connect_params_t;
+
+typedef struct callback_chain_s callback_chain_t;
+struct callback_chain_s {
+  callback_pt                  cb;
+  void                        *pd;
+  callback_chain_t            *next;
+};
+
+typedef enum {DISCONNECTED, CONNECTING, AUTHENTICATING, LOADING, LOADING_SCRIPTS, CONNECTED} redis_connection_status_t;
+
+typedef enum {CLUSTER_DISCONNECTED, CLUSTER_CONNECTING, CLUSTER_NOTREADY, CLUSTER_READY, CLUSTER_FAILED} redis_cluster_status_t;
+
+
+typedef enum {CLUSTER_RETRY_BY_CHANHEAD, CLUSTER_RETRY_BY_CHANNEL_ID, CLUSTER_RETRY_BY_KEY, CLUSTER_RETRY_BY_CSTR} redis_cluster_retry_hashslot_t;
+typedef struct redis_cluster_retry_s redis_cluster_retry_t;
+struct redis_cluster_retry_s {
+  redis_cluster_retry_hashslot_t     type;
+  union {
+    rdstore_channel_head_t          *chanhead;
+    ngx_str_t                        str;
+    u_char                          *cstr;
+  };
+  void                              (*retry)(rdstore_data_t*, void *);
+  void                               *data;
+}; //retry_redis_script_t
+
+typedef struct {
+  redis_cluster_status_t           status;
+  
+  rbtree_seed_t                    hashslots; //cluster rbtree seed
+  struct {
+    nchan_list_t                     master;
+    nchan_list_t                     slave;
+    nchan_list_t                     disconnected;
+  } nodes;
+  ngx_uint_t                       size; //number of master nodes
+  ngx_uint_t                       nodes_connected; //number of connected nodes
+  ngx_int_t                        node_connections_pending; //number of master nodes
+  uint32_t                         homebrew_id;
+  ngx_http_upstream_srv_conf_t    *uscf;
+  ngx_pool_t                      *pool;
+  
+  ngx_event_t                      still_notready_timer;
+  
+  nchan_reaper_t                   chanhead_reaper;
+  rdstore_channel_head_t          *orphan_channels_head;
+  
+  nchan_list_t                     retry_commands;
+} redis_cluster_t;
+
+typedef struct {
+  ngx_str_t         id;
+  ngx_str_t         address;
+  ngx_str_t         slots;
+  redis_cluster_t  *cluster;
+  
+  nchan_list_t     *in_node_list;
+  rdstore_data_t  **node_list_el_data;
+  
+  unsigned          master:1;
+  unsigned          failed:1;
+  unsigned          inactive:1;
+  unsigned          indexed:1;
+} redis_cluster_node_t;
+
+typedef struct {
+  unsigned         min:16;
+  unsigned         max:16;
+} redis_cluster_slot_range_t;
+
+typedef struct {
+  redis_cluster_slot_range_t   range;
+  rdstore_data_t              *rdata;
+} redis_cluster_keyslot_range_node_t;
+
+struct rdstore_data_s {
+  ngx_str_t                       *connect_url;
+  redis_connect_params_t           connect_params;
+  
+  redisAsyncContext               *ctx;
+  redisAsyncContext               *sub_ctx;
+  redisContext                    *sync_ctx;
+  
+  nchan_reaper_t                   chanhead_reaper;
+  
+  redis_connection_status_t        status;
+  int                              scripts_loaded_count;
+  int                              generation;
+  ngx_event_t                      reconnect_timer;
+  ngx_event_t                      ping_timer;
+  time_t                           ping_interval;
+  callback_chain_t                *on_connected;
+  nchan_loc_conf_t                *lcf;
+  
+  //cluster stuff
+  redis_cluster_node_t             node;
+  rdstore_channel_head_t          *channels_head;
+  rdstore_channel_head_t          *almost_deleted_channels_head;
+  
+  ngx_int_t                        pending_commands;
+  ngx_event_t                      stall_timer;
+  
+  unsigned                         shutting_down:1;
+}; // rdstore_data_t
+
+
+redis_connection_status_t redis_connection_status(nchan_loc_conf_t *cf);
+void redisCheckErrorCallback(redisAsyncContext *c, void *r, void *privdata);
+int redisReplyOk(redisAsyncContext *c, void *r);
+ngx_int_t redis_add_connection_data(nchan_redis_conf_t *rcf, nchan_loc_conf_t *lcf, ngx_str_t *override_url);
+rdstore_data_t *redis_create_rdata(ngx_str_t *url, redis_connect_params_t *rcp, nchan_redis_conf_t *rcf, nchan_loc_conf_t *lcf);
+ngx_int_t redis_ensure_connected(rdstore_data_t *rdata);
+ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp);
+ngx_int_t rdstore_initialize_chanhead_reaper(nchan_reaper_t *reaper, char *name);
+
+ngx_int_t redis_chanhead_gc_add(rdstore_channel_head_t *head, ngx_int_t expire, const char *reason);
+ngx_int_t redis_chanhead_gc_add_to_reaper(nchan_reaper_t *, rdstore_channel_head_t *head, ngx_int_t expire, const char *reason);
+ngx_int_t redis_chanhead_gc_withdraw(rdstore_channel_head_t *head);
+ngx_int_t redis_chanhead_gc_withdraw_from_reaper(nchan_reaper_t *, rdstore_channel_head_t *head);
+ngx_int_t redis_chanhead_catch_up_after_reconnect(rdstore_channel_head_t *ch);
+
+
+void redis_associate_chanhead_with_rdata(rdstore_channel_head_t *head, rdstore_data_t *rdata);
+nchan_reaper_t *rdstore_get_chanhead_reaper(rdstore_channel_head_t *ch);
+ngx_int_t ensure_chanhead_pubsub_subscribed(rdstore_channel_head_t *ch);
+
+
+rdstore_data_t *find_rdata_by_connect_params(redis_connect_params_t *rcp);
+rdstore_data_t *find_rdata_by_url(ngx_str_t *url);
+#endif //NCHAN_REDIS_STORE_PRIVATE_H
diff --git a/debian/modules/nchan/src/store/redis/store.h b/debian/modules/nchan/src/store/redis/store.h
new file mode 100755
index 0000000..834cadb
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/store.h
@@ -0,0 +1,16 @@
+#ifndef NCHAN_REDIS_STORE_H
+#define NCHAN_REDIS_STORE_H
+
+#define NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME 4*60
+#define NCHAN_REDIS_DEFAULT_PUBSUB_MESSAGE_MSGKEY_SIZE 1024*5
+
+extern nchan_store_t  nchan_store_redis;
+
+ngx_int_t nchan_store_redis_fakesub_add(ngx_str_t *channel_id, nchan_loc_conf_t *cf, ngx_int_t count, uint8_t shutting_down);
+void redis_store_prepare_to_exit_worker(); // hark! a hack!!
+
+ngx_int_t nchan_store_redis_add_server_conf(ngx_conf_t *cf, nchan_redis_conf_t *rcf, nchan_loc_conf_t *loc_conf);
+ngx_int_t nchan_store_redis_remove_server_conf(ngx_conf_t *cf, nchan_redis_conf_t *rcf);
+
+ngx_int_t redis_store_callback_on_connected(nchan_loc_conf_t *cf, callback_pt cb, void *privdata);
+#endif // NCHAN_REDIS_STORE_H
diff --git a/debian/modules/nchan/src/store/spool.c b/debian/modules/nchan/src/store/spool.c
new file mode 100755
index 0000000..0f1dde5
--- /dev/null
+++ b/debian/modules/nchan/src/store/spool.c
@@ -0,0 +1,1219 @@
+#include <nchan_module.h>
+#include "spool.h"
+#include <assert.h>
+
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+//#define DEBUG_LEVEL NGX_LOG_WARN
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SPOOL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SPOOL:" fmt, ##arg)
+
+#define NCHAN_MSG_NORESPONSE_RETRY_TIME 200
+
+//////// SPOOLs -- Subscriber Pools  /////////
+
+static ngx_int_t spool_remove_subscriber(subscriber_pool_t *, spooled_subscriber_t *);
+static void spool_bubbleup_dequeue_handler(subscriber_pool_t *spool, subscriber_t *sub, channel_spooler_t *spl);
+//static void spool_bubbleup_bulk_dequeue_handler(subscriber_pool_t *spool, subscriber_type_t type, ngx_int_t count, channel_spooler_t *spl);
+static ngx_int_t spool_respond_general(subscriber_pool_t *self, nchan_msg_t *msg, ngx_int_t status_code, void *code_data, unsigned notice);
+static ngx_int_t spool_transfer_subscribers(subscriber_pool_t *spool, subscriber_pool_t *newspool, uint8_t update_subscriber_last_msgid);
+static ngx_int_t destroy_spool(subscriber_pool_t *spool);
+static ngx_int_t remove_spool(subscriber_pool_t *spool);
+static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool);
+
+static nchan_msg_id_t     latest_msg_id = NCHAN_NEWEST_MSGID;
+static nchan_msg_id_t     oldest_msg_id = NCHAN_OLDEST_MSGID;
+
+
+static subscriber_pool_t *find_spool(channel_spooler_t *spl, nchan_msg_id_t *id) {
+  rbtree_seed_t      *seed = &spl->spoolseed;
+  ngx_rbtree_node_t  *node;
+  
+  if((node = rbtree_find_node(seed, id)) != NULL) {
+    return (subscriber_pool_t *)rbtree_data_from_node(node);
+  }
+  else {
+    return NULL;
+  }
+}
+/*
+typedef struct {
+  int                  n;
+  subscriber_pool_t   *msg_expected_spool;
+  
+  int                  err;
+} spool_verify_data_t;
+
+
+static void log_spool_err(spool_verify_data_t *d, subscriber_pool_t *spool, char *str) {
+  ERR("%p %s [%s]", spool, msg_status_to_chr(spool->msg_status), str);
+  d->err = 1;
+}
+
+static int validate_spooler_walker(rbtree_seed_t *seed, subscriber_pool_t *spool, spool_verify_data_t *d) {
+  if(spool->msg_status == MSG_EXPECTED) {
+    if(d->msg_expected_spool) {
+      log_spool_err(d, spool, "Found more than 1 spool with MSG_EXPECTED status");
+    }
+    else {
+      d->msg_expected_spool = spool;
+    }
+  }
+  else {
+    if(spool->sub_count == 0) {
+      log_spool_err(d, spool, "empty spool (not MSG_EXPECTED)");
+    }
+  }
+  d->n++;
+
+  return NGX_OK;
+}
+
+static int validate_spooler(channel_spooler_t *spl, char *str) {
+  spool_verify_data_t  d;
+  ngx_memzero(&d, sizeof(d));
+  rbtree_walk(&spl->spoolseed, (rbtree_walk_callback_pt )validate_spooler_walker, &d);
+  if(d.err == 0) {
+    ERR("%s: validated %i spools in channel spooler %V", str, d.n, spl->chid);
+  }
+  else {
+    ERR("%s: validating %i spools  FAILED in channel spooler %V; %i error(s).", str, d.n, spl->chid, d.err);
+  }
+  return d.err == 0;
+}
+*/
+
+static int msg_ids_equal(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
+  int           i, max;
+  int16_t      *tags1, *tags2;
+  
+  if(id1->time != id2->time || id1->tagcount != id2->tagcount) return 0;
+  max = id1->tagcount;
+  if(max <= NCHAN_FIXED_MULTITAG_MAX) {
+    tags1 = id1->tag.fixed;
+    tags2 = id2->tag.fixed;
+  }
+  else {
+    tags1 = id1->tag.allocd;
+    tags2 = id2->tag.allocd;
+  }
+  
+  
+  for(i=0; i < max; i++) {
+    if(tags1[i] != tags2[i]) return 0;
+  }
+  return 1;
+}
+
+static void spooler_timer_handler(ngx_event_t *ev) {
+  spooler_event_ll_t *spl_ev = container_of(ev, spooler_event_ll_t, ev);
+  spl_ev->callback(ev->data);
+  if(spl_ev->prev) {
+    spl_ev->prev->next = spl_ev->next;
+  }
+  if(spl_ev->next) {
+    spl_ev->next->prev = spl_ev->prev;
+  }
+  if(spl_ev->spooler->spooler_dependent_events == spl_ev) {
+    spl_ev->spooler->spooler_dependent_events = spl_ev->next;
+  }
+  ngx_free(spl_ev);
+}
+
+ngx_event_t *spooler_add_timer(channel_spooler_t *spl, ngx_msec_t timeout, void (*cb)(void *), void (*cancel)(void *), void *pd) {
+  spooler_event_ll_t  *spl_ev = ngx_alloc(sizeof(*spl_ev), ngx_cycle->log);
+  ngx_memzero(&spl_ev->ev, sizeof(spl_ev->ev));
+  nchan_init_timer(&spl_ev->ev, spooler_timer_handler, pd);
+  
+  spl_ev->callback = cb;
+  spl_ev->cancel = cancel;
+  
+  spl_ev->spooler = spl;
+  spl_ev->next = spl->spooler_dependent_events;
+  spl_ev->prev = NULL;
+  if(spl->spooler_dependent_events) {
+    spl->spooler_dependent_events->prev = spl_ev;
+  }
+  spl->spooler_dependent_events = spl_ev;
+  
+  ngx_add_timer(&spl_ev->ev, timeout);
+  return &spl_ev->ev;
+}
+
+static ngx_inline void init_spool(channel_spooler_t *spl, subscriber_pool_t *spool, nchan_msg_id_t *id) {
+  nchan_copy_new_msg_id(&spool->id, id);
+  spool->msg = NULL;
+  spool->msg_status = MSG_INVALID;
+  
+  spool->first = NULL;
+  spool->pool = NULL;
+  spool->sub_count = 0;
+  spool->non_internal_sub_count = 0;
+  spool->generation = 0;
+  spool->responded_count = 0;
+  
+  spool->spooler = spl;
+}
+
+static subscriber_pool_t *get_spool(channel_spooler_t *spl, nchan_msg_id_t *id) {
+  rbtree_seed_t      *seed = &spl->spoolseed;
+  ngx_rbtree_node_t  *node;
+  subscriber_pool_t *spool;
+  
+  if(id->time == NCHAN_NEWEST_MSGID_TIME) {
+    spool = &spl->current_msg_spool;
+    spool->msg_status = MSG_EXPECTED;
+    return &spl->current_msg_spool;
+  }
+  
+  if((node = rbtree_find_node(seed, id)) == NULL) {
+    
+    if((node = rbtree_create_node(seed, sizeof(*spool))) == NULL) {
+      ERR("can't create rbtree node for spool");
+      return NULL;
+    }
+    
+   // DBG("CREATED spool node %p for msgid %V", node, msgid_to_str(id));
+    spool = (subscriber_pool_t *)rbtree_data_from_node(node);
+    
+    init_spool(spl, spool, id);
+    
+    if(rbtree_insert_node(seed, node) != NGX_OK) {
+      ERR("couldn't insert spool node");
+      rbtree_destroy_node(seed, node);
+      return NULL;
+    }
+  }
+  else {
+    spool = (subscriber_pool_t *)rbtree_data_from_node(node);
+    DBG("found spool node %p with msgid %V", node, msgid_to_str(id));
+    assert(spool->id.time == id->time);
+  }
+  return spool;
+}
+
+static ngx_int_t spool_nextmsg(subscriber_pool_t *spool, nchan_msg_id_t *new_last_id) {
+  subscriber_pool_t      *newspool;
+  channel_spooler_t      *spl = spool->spooler;
+  
+  ngx_int_t               immortal_spool = spool->id.time == NCHAN_NEWEST_MSGID_TIME;
+  int16_t                 largetags[NCHAN_MULTITAG_MAX];
+  nchan_msg_id_t          new_id = NCHAN_ZERO_MSGID;
+  
+  nchan_copy_msg_id(&new_id, &spool->id, largetags);
+  nchan_update_multi_msgid(&new_id, new_last_id, largetags);
+  
+  //ERR("spool %p nextmsg (%V) --", spool, msgid_to_str(&spool->id));
+  //ERR(" --  update with               (%V) --", msgid_to_str(new_last_id));
+  //ERR(" -- newid                       %V", msgid_to_str(&new_id));
+  
+  if(msg_ids_equal(&spool->id, &new_id)) {
+    ERR("nextmsg id same as curmsg (%V)", msgid_to_str(&spool->id));
+    assert(0);
+  }
+  else {
+    newspool = !immortal_spool ? find_spool(spl, &new_id) : get_spool(spl, &new_id);
+    
+    if(newspool != NULL) {
+      assert(spool != newspool);
+      spool_transfer_subscribers(spool, newspool, 0);
+      if(!immortal_spool) destroy_spool(spool);
+    }
+    else {
+      ngx_rbtree_node_t       *node;
+      assert(!immortal_spool);
+      node = rbtree_node_from_data(spool);
+      rbtree_remove_node(&spl->spoolseed, node);
+      nchan_copy_msg_id(&spool->id, &new_id, NULL);
+      rbtree_insert_node(&spl->spoolseed, node);
+      spool->msg_status = MSG_INVALID;
+      spool->msg = NULL;
+      newspool = spool;
+      
+      /*
+      newspool = get_spool(spl, &new_id);
+      assert(spool != newspool);
+      spool_transfer_subscribers(spool, newspool, 0);
+      destroy_spool(spool);
+      */
+    }
+
+    
+    if(newspool->non_internal_sub_count > 0 && spl->handlers->use != NULL) {
+      spl->handlers->use(spl, spl->handlers_privdata);
+    }
+    
+    if(newspool->sub_count > 0) {
+      switch(newspool->msg_status) {
+        case MSG_CHANNEL_NOTREADY:
+          newspool->msg_status = MSG_INVALID;
+        case MSG_INVALID:
+          spool_fetch_msg(newspool);
+          break;
+        case MSG_EXPECTED:
+          spool_respond_general(newspool, NULL, NGX_HTTP_NO_CONTENT, NULL, 0);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+  
+  return NGX_OK;
+}
+
+typedef struct {
+  nchan_msg_id_t     msg_id;
+  channel_spooler_t *spooler;
+} nomsg_retry_data_t;
+
+static void spool_fetch_msg_noresponse_retry_cancel(void *pd) {
+  nomsg_retry_data_t *d = pd;
+  nchan_free_msg_id(&d->msg_id);
+  ngx_free(d);
+}
+
+static void spool_fetch_msg_noresponse_retry_callback(void *pd) {
+  nomsg_retry_data_t *d = pd;
+  subscriber_pool_t *spool = get_spool(d->spooler, &d->msg_id);
+  if(spool && spool->msg_status == MSG_INVALID) {
+    spool_fetch_msg(spool);
+  }
+  else if(!spool) {
+    DBG("spool not found for spool_fetch_msg_noresponse_retry_callback");
+  }
+  
+  spool_fetch_msg_noresponse_retry_cancel(pd);
+}
+
+static ngx_int_t spool_fetch_msg_callback(nchan_msg_status_t findmsg_status, nchan_msg_t *msg, fetchmsg_data_t *data) {
+  nchan_msg_status_t    prev_status;
+  subscriber_pool_t    *spool, *nuspool;
+  channel_spooler_t    *spl = data->spooler;
+  int                   free_msg_id = 1;
+  
+  if(spl && data == spl->fetchmsg_cb_data_list) {
+    spl->fetchmsg_cb_data_list = data->next;
+  }
+  if(data->next) {
+    data->next->prev = data->prev;
+  }
+  if(data->prev) {
+    data->prev->next = data->next;
+  }
+  
+  if(spl == NULL) { //channel already deleted
+    nchan_free_msg_id(&data->msgid);
+    ngx_free(data);
+    return NGX_OK;
+  }
+  
+  if(spl->handlers->get_message_finish) {
+    spl->handlers->get_message_finish(spl, spl->handlers_privdata);
+  }
+  
+  if((spool = find_spool(spl, &data->msgid)) == NULL) {
+    DBG("spool for msgid %V not found. discarding getmsg callback response.", msgid_to_str(&data->msgid));
+    nchan_free_msg_id(&data->msgid);
+    ngx_free(data);
+    return NGX_ERROR;
+  }
+  
+  prev_status = spool->msg_status;
+  
+  switch(findmsg_status) {
+    case MSG_FOUND:
+      spool->msg_status = findmsg_status;
+      DBG("fetchmsg callback for spool %p msg FOUND %p %V", spool, msg, msgid_to_str(&msg->id));
+      assert(msg != NULL);
+      spool->msg = msg;
+      spool_respond_general(spool, spool->msg, 0, NULL, 0);
+      
+      spool_nextmsg(spool, &msg->id);      
+      break;
+    
+    case MSG_EXPECTED:
+      // ♫ It's gonna be the future soon ♫
+      if(spool->id.time == NCHAN_NTH_MSGID_TIME) {
+        //wait for message in the NEWEST_ID spool
+        nchan_msg_id_t  newest_id = NCHAN_NEWEST_MSGID;
+        spool_nextmsg(spool, &newest_id); 
+      }
+      else {
+        spool->msg_status = findmsg_status;
+        DBG("fetchmsg callback for spool %p msg EXPECTED", spool);
+        spool_respond_general(spool, NULL, NGX_HTTP_NO_CONTENT, NULL, 0);
+        assert(msg == NULL);
+        spool->msg = NULL;
+      }
+      break;
+      
+    case MSG_NORESPONSE:
+      if(prev_status == MSG_PENDING) {
+        spool->msg_status = MSG_INVALID;
+        if(spool->sub_count > 0) {
+          nomsg_retry_data_t *retry_data = ngx_alloc(sizeof(*retry_data), ngx_cycle->log);
+          
+          retry_data->spooler = spl;
+          
+          free_msg_id = 0;
+          retry_data->msg_id = data->msgid;
+          
+          spooler_add_timer(spl, NCHAN_MSG_NORESPONSE_RETRY_TIME, spool_fetch_msg_noresponse_retry_callback, spool_fetch_msg_noresponse_retry_cancel, retry_data);
+        }
+      }
+      break;
+      
+    case MSG_NOTFOUND:
+      if(spl->fetching_strategy == FETCH_IGNORE_MSG_NOTFOUND) {
+        spool->msg_status = prev_status;
+        break;
+      }
+    case MSG_EXPIRED:
+      //is this right?
+      //TODO: maybe message-expired notification
+      spool->msg_status = findmsg_status;
+      spool_respond_general(spool, NULL, NGX_HTTP_NO_CONTENT, NULL, 0);
+      nuspool = get_spool(spool->spooler, &oldest_msg_id);
+      if(spool != nuspool) {
+        spool_transfer_subscribers(spool, nuspool, 1);
+        destroy_spool(spool);
+      }
+      else {
+        ERR("Unexpected spool == nuspool during spool fetch_msg_callback. This is weird, please report this to the developers. findmsg_status: %i", findmsg_status);
+        assert(0);
+      }
+      break;
+    
+    case MSG_PENDING:
+      ERR("spool %p set status to MSG_PENDING", spool);
+      break;
+      
+    default:
+      assert(0);
+      break;
+  }
+  
+  if(free_msg_id) {
+    nchan_free_msg_id(&data->msgid);
+  }
+  ngx_free(data);
+  return NGX_OK;
+}
+
+static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool) {
+  fetchmsg_data_t        *data;
+  channel_spooler_t      *spl = spool->spooler;
+  if(*spl->channel_status != READY) {
+    DBG("%p wanted to fetch msg %V, but channel %V not ready", spool, msgid_to_str(&spool->id), spl->chid);
+    spool->msg_status = MSG_CHANNEL_NOTREADY;
+    return NGX_DECLINED;
+  }
+  DBG("%p fetch msg %V for channel %V", spool, msgid_to_str(&spool->id), spl->chid);
+  data = ngx_alloc(sizeof(*data), ngx_cycle->log); //correctness over efficiency (at first).
+  //TODO: optimize this alloc away
+  
+  assert(data);
+  
+  data->next = spl->fetchmsg_cb_data_list;
+  if(data->next) {
+    data->next->prev = data;
+  }
+  spl->fetchmsg_cb_data_list = data;
+  data->prev = NULL;
+  
+  nchan_copy_new_msg_id(&data->msgid, &spool->id);
+  data->spooler = spool->spooler;
+  
+  assert(spool->msg == NULL);
+  assert(spool->msg_status == MSG_INVALID);
+  spool->msg_status = MSG_PENDING;
+  if(spl->handlers->get_message_start) {
+    spl->handlers->get_message_start(spl, spl->handlers_privdata);
+  }
+  switch(spl->fetching_strategy) {
+    case FETCH:
+    case FETCH_IGNORE_MSG_NOTFOUND:
+      spool->spooler->store->get_message(spool->spooler->chid, &spool->id, spool->spooler->cf, (callback_pt )spool_fetch_msg_callback, data);
+      break;
+    case NO_FETCH:
+      //do nothing
+      break;
+  }
+  return NGX_OK;
+}
+
+static void spool_sub_dequeue_callback(subscriber_t *sub, void *data) {
+  spooled_subscriber_cleanup_t  *d = (spooled_subscriber_cleanup_t *)data;
+  subscriber_pool_t             *spool = d->spool;
+  
+  DBG("sub %p dequeue callback", sub);
+  
+  assert(sub == d->ssub->sub);
+  spool_remove_subscriber(spool, d->ssub);
+  spool_bubbleup_dequeue_handler(spool, sub, spool->spooler);
+  
+  if(sub->type != INTERNAL && spool->spooler->publish_events) {
+    nchan_maybe_send_channel_event_message(sub->request, SUB_DEQUEUE);
+  }
+}
+
+static ngx_int_t spool_add_subscriber(subscriber_pool_t *self, subscriber_t *sub, uint8_t enqueue) {
+  spooled_subscriber_t       *ssub;
+  
+  ssub = ngx_calloc(sizeof(*ssub), ngx_cycle->log);
+  //DBG("add sub %p to spool %p", sub, self);
+  
+  if(ssub == NULL) {
+    ERR("failed to allocate new sub for spool");
+    return NGX_ERROR;
+  }
+  
+  ssub->next = self->first;
+  ssub->prev = NULL;
+  if(self->first != NULL) {
+    self->first->prev = ssub;
+  }
+  self->first = ssub;
+  self->sub_count++;
+  if(sub->type != INTERNAL) {
+    self->non_internal_sub_count++;
+  }
+  ssub->dequeue_callback_data.ssub = ssub;
+  ssub->dequeue_callback_data.spool = self;
+  
+  if(enqueue) {
+    sub->fn->enqueue(sub);
+    if(sub->type != INTERNAL && self->spooler->publish_events) {
+      nchan_maybe_send_channel_event_message(sub->request, SUB_ENQUEUE);
+    }
+  }
+  
+  sub->fn->set_dequeue_callback(sub, spool_sub_dequeue_callback, &ssub->dequeue_callback_data);
+  ssub->sub = sub;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t spool_remove_subscriber(subscriber_pool_t *self, spooled_subscriber_t *ssub) {
+  assert(ssub->next != ssub);
+  assert(ssub->prev != ssub);
+  spooled_subscriber_t   *prev, *next;
+  prev = ssub->prev;
+  next = ssub->next;
+  if(next) {
+    next->prev = prev;
+  }
+  if(prev) {
+    prev->next = next;
+  }
+  if(self->first == ssub) {
+    self->first = next;
+  }
+  
+  if(ssub->sub->type != INTERNAL) {
+    self->non_internal_sub_count--;
+  }
+  
+  ngx_free(ssub);
+
+  assert(self->sub_count > 0);
+  self->sub_count--;
+  return NGX_OK;
+}
+
+static ngx_int_t spool_respond_general(subscriber_pool_t *self, nchan_msg_t *msg, ngx_int_t code, void *code_data, unsigned notice) {
+  ngx_uint_t                  numsubs[SUBSCRIBER_TYPES];
+  spooled_subscriber_t       *nsub, *nnext;
+  subscriber_t               *sub;
+  
+  //channel_spooler_t          *spl = self->spooler;
+  //validate_spooler(spl, "before respond_general");
+  //nchan_msg_id_t             unid;
+  //nchan_msg_id_t             unprevid;
+  //int8_t                     i, max;
+  
+  ngx_memzero(numsubs, sizeof(numsubs));
+  self->generation++;
+  
+  DBG("spool %p (%V) (subs: %i) respond with msg %p or code %i", self, msgid_to_str(&self->id), self->sub_count, msg, code);
+  if(msg) {
+    DBG("msgid: %V", msgid_to_str(&msg->id));
+    DBG("prev: %V", msgid_to_str(&msg->prev_id));
+  }
+  
+  /*
+  if(msg && msg->prev_id.time > 0 && msg->id.tagcount > 1) {
+    assert(msg->shared == 0);
+    max = msg->id.tagcount;
+    for(i=0; i< max; i++) {
+      unid.tag[i] =     msg->id.tag[i];
+      unprevid.tag[i] = msg->prev_id.tag[i];
+      if(unid.tag[i] == -1)     msg->id.tag[i]   =    self->id.tag[i];
+      if(unprevid.tag[i] == -1) msg->prev_id.tag[i] = self->id.tag[i];
+    }
+  }
+  */
+  
+  //uint8_t publish_events = self->spooler->publish_events;
+  
+  for(nsub = self->first; nsub != NULL; nsub = nnext) {
+    sub = nsub->sub;
+    nnext = nsub->next;
+    
+    if(msg) {
+      self->responded_count++;
+      sub->fn->respond_message(sub, msg);
+    }
+    else if(!notice) {
+      self->responded_count++;
+      sub->fn->respond_status(sub, code, code_data);
+    }
+    else {
+      sub->fn->notify(sub, code, code_data);
+    }
+  }
+  
+  if(!notice && code != NGX_HTTP_NO_CONTENT) self->responded_count++;
+  //assert(validate_spooler(spl, "after respond_general"));
+  return NGX_OK;
+}
+
+/////////// SPOOLER - container of several spools //////////
+
+channel_spooler_t *create_spooler() {
+  channel_spooler_t  *spooler;
+  if((spooler = ngx_alloc(sizeof(*spooler), ngx_cycle->log))==NULL) {
+    ERR("Can't allocate spooler");
+    return NULL;
+  }
+  return spooler;
+}
+
+static void spool_bubbleup_dequeue_handler(subscriber_pool_t *spool, subscriber_t *sub, channel_spooler_t *spl) {
+  //bubble on up, yeah
+  channel_spooler_handlers_t *h = spl->handlers;
+  if(h->dequeue) {
+    h->dequeue(spl, sub, spl->handlers_privdata);
+  }
+  else if (h->bulk_dequeue){
+    h->bulk_dequeue(spl, sub->type, 1, spl->handlers_privdata);
+  }
+  else {
+    ERR("Neither dequeue_handler not bulk_dequeue_handler present in spooler for spool sub dequeue");
+  }
+}
+
+/*
+static void spool_bubbleup_bulk_dequeue_handler(subscriber_pool_t *spool, subscriber_type_t type, ngx_int_t count, channel_spooler_t *spl) {
+  //bubble on up, yeah
+  if(spl->handlers->bulk_dequeue) {
+    spl->handlers->bulk_dequeue(spl, type, count, spl->handlers_privdata);
+  }
+}
+*/
+
+static ngx_int_t spooler_add_subscriber(channel_spooler_t *self, subscriber_t *sub) {
+  nchan_msg_id_t          *msgid = &sub->last_msgid;
+  subscriber_pool_t       *spool;
+  subscriber_type_t        subtype;
+  
+  if(self->want_to_stop) {
+    ERR("Not accepting new subscribers right now. want to stop.");
+    return NGX_ERROR;
+  }
+  
+  //validate_spooler(self, "before add_subscriber");
+  
+  spool = get_spool(self, msgid);
+  
+  assert(spool->id.time == msgid->time);
+  
+  
+  if(spool == NULL) {
+    return NGX_ERROR;
+  }
+
+  subtype = sub->type;
+  
+  if(spool_add_subscriber(spool, sub, 1) != NGX_OK) {
+    ERR("couldn't add subscriber to spool %p", spool);
+    return NGX_ERROR;
+  }
+  self->handlers->add(self, sub, self->handlers_privdata);
+  
+  switch(spool->msg_status) {
+    case MSG_FOUND:
+      assert(spool->msg);
+      spool_respond_general(spool, spool->msg, 0, NULL, 0);
+      break;
+    
+    case MSG_INVALID:
+      assert(spool->msg == NULL);
+      spool_fetch_msg(spool);
+      break;
+    
+    case MSG_CHANNEL_NOTREADY:
+    case MSG_PENDING:
+      //nothing to do
+      break;
+      
+    case MSG_EXPECTED:
+      //notify subscriber
+      sub->fn->respond_status(sub, NGX_HTTP_NO_CONTENT, NULL);
+      break;
+      
+    case MSG_EXPIRED:
+    case MSG_NOTFOUND:
+    case MSG_NORESPONSE:
+      //shouldn't happen
+      assert(0);
+  }
+  
+  if(self->handlers->use != NULL && subtype != INTERNAL) {
+    self->handlers->use(self, self->handlers_privdata);
+  }
+  
+  //validate_spooler(self, "after add_subscriber");
+  
+  return NGX_OK;
+}
+
+
+static ngx_int_t spool_transfer_subscribers(subscriber_pool_t *spool, subscriber_pool_t *newspool, uint8_t update_subscriber_last_msgid) {
+  ngx_int_t               count = 0;
+  subscriber_t           *sub;
+  spooled_subscriber_t   *cur;
+  channel_spooler_t      *spl = spool->spooler;
+  
+  assert(spl == newspool->spooler);
+  
+  if(spool == NULL || newspool == NULL) {
+    ERR("failed to transfer spool subscribers");
+    return 0;
+  }
+  for(cur = spool->first; cur != NULL; cur = spool->first) {
+    sub = cur->sub;
+    spool_remove_subscriber(spool, cur);
+    if(update_subscriber_last_msgid) {
+      sub->last_msgid=newspool->id;
+    }
+    spool_add_subscriber(newspool, sub, 0);
+    count++;
+  }
+  
+  return count;
+}
+
+typedef struct spool_collect_overflow_s spool_collect_overflow_t;
+struct spool_collect_overflow_s {
+  subscriber_pool_t                *spool;
+  struct spool_collect_overflow_s  *next;
+};// spool_collect_overflow_t;
+
+#define SPOOLER_RESPOND_SPOOLARRAY_SIZE 32
+
+typedef struct {
+  nchan_msg_id_t             min;
+  nchan_msg_id_t             max;
+  uint8_t                    multi;
+  ngx_int_t                  n;
+  nchan_msg_t               *msg;
+  subscriber_pool_t         *spools[SPOOLER_RESPOND_SPOOLARRAY_SIZE];
+  spool_collect_overflow_t  *overflow;
+} spooler_respond_data_t;
+
+
+static rbtree_walk_direction_t compare_msgid_onetag_range(nchan_msg_id_t *min, nchan_msg_id_t *max, nchan_msg_id_t *id) {
+  
+  assert(min->tagcount == max->tagcount);
+  assert(max->tagcount == id->tagcount);
+  assert(id->tagcount == 1);
+  
+  if(min->time < id->time || (min->time == id->time && min->tag.fixed[0] <= id->tag.fixed[0])) {
+    if(max->time > id->time || (max->time == id->time && max->tag.fixed[0] > id->tag.fixed[0])) {
+      //inrange
+      return RBTREE_WALK_LEFT_RIGHT;
+    }
+    else {
+      //too large
+      return RBTREE_WALK_LEFT;
+    }
+  }
+  else {
+    //too small
+    return RBTREE_WALK_RIGHT;
+  } 
+}
+
+static int8_t compare_msgid_time(nchan_msg_id_t *min, nchan_msg_id_t *max, nchan_msg_id_t *cur) {
+  if(min->time <= cur->time) {
+    if(max->time >= cur->time) {
+      return 0;
+    }
+    else {
+      return 1;
+    }
+  }
+  else {
+    return -1;
+  }
+}
+
+
+static void spoolcollector_addspool(spooler_respond_data_t *data, subscriber_pool_t *spool) {
+  spool_collect_overflow_t  *overflow;
+  if(data->n < SPOOLER_RESPOND_SPOOLARRAY_SIZE) {
+    data->spools[data->n] = spool;
+  }
+  else {
+    if((overflow = ngx_alloc(sizeof(*overflow), ngx_cycle->log)) == NULL) {
+      ERR("can't allocate spoolcollector overflow");
+      return;
+    }
+    overflow->next = data->overflow;
+    overflow->spool = spool;
+    data->overflow = overflow;
+  }
+  data->n++;
+}
+
+static subscriber_pool_t *spoolcollector_unwind_nextspool(spooler_respond_data_t *data) {
+  spool_collect_overflow_t  *overflow;
+  subscriber_pool_t         *spool;
+  if(data->n > SPOOLER_RESPOND_SPOOLARRAY_SIZE) {
+    overflow = data->overflow;
+    spool = overflow->spool;
+    data->overflow = overflow->next;
+    ngx_free(overflow);
+    data->n--;
+    return spool;
+  }
+  else if(data->n > 0) {
+    return data->spools[--data->n];
+  }
+  else {
+    return NULL;
+  }
+}
+
+
+static rbtree_walk_direction_t collect_spool_range_callback(rbtree_seed_t *seed, subscriber_pool_t *spool, spooler_respond_data_t *data) {
+  rbtree_walk_direction_t  dir;
+  uint8_t multi_count = data->multi;
+  
+  if(multi_count <= 1) {
+    dir = compare_msgid_onetag_range(&data->min, &data->max, &spool->id);
+    if(dir == RBTREE_WALK_LEFT_RIGHT) {
+      spoolcollector_addspool(data, spool);
+    }
+    return dir;
+  }
+  else {
+    int tc = compare_msgid_time(&data->min, &data->max, &spool->id);
+    if(tc < 0) {
+      return RBTREE_WALK_RIGHT;
+    }
+    else if(tc > 0) {
+      return RBTREE_WALK_LEFT;
+    }
+    else {
+      time_t      timmin = data->min.time, timmax = data->max.time, timcur = spool->id.time;
+      
+      int         max_cmp = -1, min_cmp = -1;
+      
+      if( timcur > timmin && timcur < timmax) {
+        spoolcollector_addspool(data, spool);
+      }
+      else if(timcur == timmax && timcur == timmin) {
+        if( nchan_compare_msgid_tags(&spool->id, &data->max) < 0
+         && nchan_compare_msgid_tags(&spool->id, &data->min) >= 0 ) 
+        {
+          spoolcollector_addspool(data, spool);
+        } 
+      }
+      else if((timcur == timmax && (max_cmp = nchan_compare_msgid_tags(&spool->id, &data->max)) < 0) 
+           || (timcur == timmin && (min_cmp = nchan_compare_msgid_tags(&spool->id, &data->min)) >= 0))
+      {
+        spoolcollector_addspool(data, spool);
+      }
+      else if( timcur > timmin && timcur < timmax) {
+        spoolcollector_addspool(data, spool);
+      }
+      /*
+      else {
+        ERR("time_min: %i, time_cur: %i, time_max: %i", timmin, timcur, timmax);
+      }
+      */
+      
+      return RBTREE_WALK_LEFT_RIGHT;
+    }
+  }
+}
+
+static ngx_int_t spooler_respond_status(channel_spooler_t *self, nchan_msg_id_t *id, ngx_int_t status_code, ngx_str_t *status_line) {
+  subscriber_pool_t         *spool = find_spool(self, id);
+  //validate_spooler(self, "before respond_status");
+  if(spool) {
+    if(status_code == NGX_HTTP_NO_CONTENT) {
+      spool->msg_status = MSG_EXPECTED;
+    }
+    spool_respond_general(spool, NULL, status_code, status_line, 0);
+    destroy_spool(spool);
+  }
+  //validate_spooler(self, "after respond_status");
+  return NGX_OK;
+}
+
+static ngx_int_t spooler_respond_message(channel_spooler_t *self, nchan_msg_t *msg) {
+  spooler_respond_data_t     srdata;
+  subscriber_pool_t         *spool;
+  ngx_int_t                  responded_subs = 0;
+  
+  srdata.min = msg->prev_id;
+  srdata.max = msg->id;
+  srdata.multi = msg->id.tagcount;
+  srdata.overflow = NULL;
+  srdata.msg = msg;
+  srdata.n = 0;
+  
+  //spooler_print_contents(self);
+  
+  //find all spools between msg->prev_id and msg->id
+  rbtree_conditional_walk(&self->spoolseed, (rbtree_walk_conditional_callback_pt )collect_spool_range_callback, &srdata);
+  /*
+  if(srdata.n == 0) {
+    DBG("no spools in range %V -- ", msgid_to_str(&msg->prev_id));
+    DBG(" -- %V", msgid_to_str(&msg->id));
+  }
+  */
+  while((spool = spoolcollector_unwind_nextspool(&srdata)) != NULL) {
+    responded_subs += spool->sub_count;
+    if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+      assert(spool->id.tag.allocd != msg->id.tag.allocd);
+    }
+    spool_respond_general(spool, msg, 0, NULL, 0);
+    if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+      assert(spool->id.tag.allocd != msg->id.tag.allocd);
+    }
+    spool_nextmsg(spool, &msg->id);
+  }
+  
+  spool = get_spool(self, &latest_msg_id);
+  if(spool->sub_count > 0) {
+#if NCHAN_BENCHMARK
+    responded_subs += spool->sub_count;
+#endif
+    spool_respond_general(spool, msg, 0, NULL, 0);
+    spool_nextmsg(spool, &msg->id);
+  }
+
+  nchan_copy_msg_id(&self->prev_msg_id, &msg->id, NULL);
+  
+#if NCHAN_BENCHMARK
+  self->last_responded_subscriber_count = responded_subs;
+#endif
+  return NGX_OK;
+}
+
+typedef struct {
+  channel_spooler_t *spl;
+  nchan_msg_t       *msg;
+  ngx_int_t          code;
+  void              *code_data;
+  unsigned           notice:1;
+} spooler_respond_generic_data_t;
+
+static ngx_int_t spooler_respond_rbtree_node_spool(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
+  spooler_respond_generic_data_t  *d = data;
+  
+  return spool_respond_general(spool, d->msg, d->code, d->code_data, d->notice);
+}
+
+static ngx_int_t spooler_respond_generic(channel_spooler_t *self, nchan_msg_t *msg, ngx_int_t code, void *code_data, unsigned notice) {
+  spooler_respond_generic_data_t  data = {self, msg, code, code_data, notice};
+  rbtree_walk(&self->spoolseed, (rbtree_walk_callback_pt )spooler_respond_rbtree_node_spool, &data);
+  spool_respond_general(&self->current_msg_spool, data.msg, data.code, data.code_data, notice);
+  return NGX_OK;
+}
+
+static ngx_int_t spooler_broadcast_status(channel_spooler_t *self, ngx_int_t code, const ngx_str_t *line) {
+  return spooler_respond_generic(self, NULL, code, (void *)line, 0);
+}
+
+static ngx_int_t spooler_broadcast_notice(channel_spooler_t *self, ngx_int_t code, void *data) {
+  return spooler_respond_generic(self, NULL, code, data, 1);
+}
+
+static ngx_int_t spooler_spool_dequeue_all(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
+  spooled_subscriber_t *cur;
+  
+  for(cur = spool->first; cur != NULL; cur = cur->next) {
+    cur->sub->dequeue_after_response = 1;  
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t spooler_prepare_to_stop(channel_spooler_t *spl) {
+  rbtree_walk(&spl->spoolseed, (rbtree_walk_callback_pt )spooler_spool_dequeue_all, (void *)spl);
+  spl->want_to_stop = 1;
+  return NGX_OK;
+}
+
+
+
+static void *spool_rbtree_node_id(void *data) {
+  return &((subscriber_pool_t *)data)->id;
+}
+
+static uint32_t spool_rbtree_bucketer(void *vid) {
+  nchan_msg_id_t   *id = (nchan_msg_id_t *)vid;
+  return (uint32_t )id->time;
+}
+
+static ngx_int_t spool_rbtree_compare(void *v1, void *v2) {
+  nchan_msg_id_t   *id1 = (nchan_msg_id_t *)v1;
+  nchan_msg_id_t   *id2 = (nchan_msg_id_t *)v2;
+  time_t            t1 = id1->time;
+  time_t            t2 = id2->time;
+  ngx_int_t         tag1;
+  ngx_int_t         tag2;
+  
+  if(t1 > t2) {
+    return 1;
+  }
+  else if (t1 < t2) {
+    return -1;
+  }
+  else {
+    uint16_t   i, max1 = id1->tagcount, max2 = id2->tagcount;
+    uint16_t   max = max1 > max2 ? max1 : max2;
+    int16_t   *tags1, *tags2;
+    
+    tags1 = max1 <= NCHAN_FIXED_MULTITAG_MAX ? id1->tag.fixed : id1->tag.allocd;
+    tags2 = max2 <= NCHAN_FIXED_MULTITAG_MAX ? id2->tag.fixed : id2->tag.allocd;
+    
+    for(i=0; i < max; i++) {
+      tag1 = i < max1 ? tags1[i] : -1;
+      tag2 = i < max2 ? tags2[i] : -1;
+      if(tag1 > tag2) {
+        return 1;
+      }
+      else if(tag1 < tag2) {
+        return -1;
+      }
+    }
+    return 0;
+  }
+}
+
+static int its_time_for_a_spooling_filter(void *data) {
+  return ((subscriber_pool_t *)data)->msg_status == MSG_CHANNEL_NOTREADY;
+}
+
+static ngx_int_t its_time_for_a_spooling(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
+  ngx_int_t       rc;
+  //validate_spool(spool);
+  assert(spool->msg_status == MSG_CHANNEL_NOTREADY);
+  spool->msg_status = MSG_INVALID;
+  rc = spool_fetch_msg(spool);
+  assert(rc == NGX_OK);
+  return rc;
+}
+
+static ngx_int_t spooler_channel_status_changed(channel_spooler_t *self) {
+  switch(*self->channel_status) {
+    case READY:
+      rbtree_walk_writesafe(&self->spoolseed, its_time_for_a_spooling_filter, (rbtree_walk_callback_pt )its_time_for_a_spooling, NULL); 
+      break;
+      
+    default:
+      //do nothing
+      break;
+  };
+  return NGX_OK;
+}
+
+
+static ngx_int_t spooler_print_contents_callback(rbtree_seed_t *seed, subscriber_pool_t *spool, channel_spooler_t *spl) {
+  spooled_subscriber_t       *cur;
+  
+  ERR("  spool %p id %V", spool, msgid_to_str(&spool->id));
+  for(cur = spool->first; cur != NULL; cur = cur->next) {
+    ERR("    %V", cur->sub->name);
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t spooler_print_contents(channel_spooler_t *spl) {
+  ERR("spooler for channel %V", spl->chid);
+  spooler_print_contents_callback(NULL, &spl->current_msg_spool, spl);
+  rbtree_walk_incr(&spl->spoolseed, (rbtree_walk_callback_pt )spooler_print_contents_callback, spl);
+  return NGX_OK;
+}
+
+
+
+static int spooler_catch_up_filter(void *data) {
+  nchan_msg_status_t  status =  ((subscriber_pool_t *)data)->msg_status;
+  return status == MSG_EXPECTED || status == MSG_PENDING;
+}
+
+static ngx_int_t spooler_catch_up_callback(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
+  spool->msg_status = MSG_INVALID;
+  spool_fetch_msg(spool);
+  return NGX_OK;
+}
+
+ngx_int_t spooler_catch_up(channel_spooler_t *spl) {
+  rbtree_walk_writesafe(&spl->spoolseed, spooler_catch_up_filter, (rbtree_walk_callback_pt )spooler_catch_up_callback, NULL); 
+  return NGX_OK;
+}
+
+
+static channel_spooler_fn_t  spooler_fn = {
+  spooler_add_subscriber,
+  spooler_channel_status_changed,
+  spooler_respond_message,
+  spooler_respond_status,
+  spooler_broadcast_status,
+  spooler_broadcast_notice,
+  spooler_prepare_to_stop
+};
+
+channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata) {
+  if(!spl->running) {
+    ngx_memzero(spl, sizeof(*spl));
+    rbtree_init(&spl->spoolseed, "spooler msg_id tree", spool_rbtree_node_id, spool_rbtree_bucketer, spool_rbtree_compare);
+    
+    spl->fn=&spooler_fn;
+    //spl->prev_msg_id.time=0;
+    //spl->prev_msg_id.tag=0;
+    
+    DBG("start SPOOLER %p", *spl);
+    
+    spl->chid = chid;
+    spl->store = store;
+    
+    spl->channel_status = channel_status;
+    
+    spl->running = 1;
+    //spl->want_to_stop = 0;
+    spl->publish_events = 1;
+    spl->fetching_strategy = fetching_strategy;
+    
+    init_spool(spl, &spl->current_msg_spool, &latest_msg_id);
+    spl->current_msg_spool.msg_status = MSG_EXPECTED;
+    
+    spl->handlers = handlers;
+    spl->handlers_privdata = handlers_privdata;
+    
+    spl->cf = cf;
+    
+    return spl;
+  }
+  else {
+    ERR("looks like spooler is already running. make sure spooler->running=0 before starting.");
+    assert(0);
+    return NULL;
+  }
+}
+
+static ngx_int_t remove_spool(subscriber_pool_t *spool) {
+  channel_spooler_t    *spl = spool->spooler;
+  ngx_rbtree_node_t    *node = rbtree_node_from_data(spool);
+  
+  DBG("remove spool node %p", node);
+  
+  assert(spool->spooler->running);
+  nchan_free_msg_id(&spool->id);
+  rbtree_remove_node(&spl->spoolseed, rbtree_node_from_data(spool));
+
+  //assert((node = rbtree_find_node(&spl->spoolseed, &spool->id)) == NULL);
+  //double-check that it's gone 
+  
+  return NGX_OK;
+}
+
+static ngx_int_t destroy_spool(subscriber_pool_t *spool) {
+  rbtree_seed_t         *seed = &spool->spooler->spoolseed;
+  spooled_subscriber_t  *ssub;
+  subscriber_t          *sub;
+  ngx_rbtree_node_t     *node = rbtree_node_from_data(spool);
+  
+  remove_spool(spool);
+  
+  DBG("destroy spool node %p", node);
+  
+  for(ssub = spool->first; ssub!=NULL; ssub=ssub->next) {
+    sub = ssub->sub;
+    //DBG("dequeue sub %p in spool %p", sub, spool);
+    sub->fn->dequeue(sub);
+  }
+  assert(spool->sub_count == 0);
+  assert(spool->first == NULL);
+  
+  ngx_memset(spool, 0x42, sizeof(*spool)); //debug
+  
+  rbtree_destroy_node(seed, node);
+  return NGX_OK;
+}
+
+ngx_int_t stop_spooler(channel_spooler_t *spl, uint8_t dequeue_subscribers) {
+  ngx_rbtree_node_t    *cur, *sentinel;
+  spooler_event_ll_t   *ecur, *ecur_next;
+  subscriber_pool_t    *spool;
+  rbtree_seed_t        *seed = &spl->spoolseed;
+  ngx_rbtree_t         *tree = &seed->tree;
+  ngx_int_t             n=0;
+  sentinel = tree->sentinel;
+  
+  fetchmsg_data_t      *dcur;
+#if NCHAN_RBTREE_DBG
+  ngx_int_t active_before = seed->active_nodes, allocd_before = seed->active_nodes;
+#endif
+  if(spl->running) {
+    
+    for(ecur = spl->spooler_dependent_events; ecur != NULL; ecur = ecur_next) {
+      ecur_next = ecur->next;
+      if(ecur->cancel) {
+        ecur->cancel(ecur->ev.data);
+      }
+      ngx_event_del_timer(&ecur->ev);
+      
+      ngx_free(ecur);
+    }
+    
+    for(cur = tree->root; cur != NULL && cur != sentinel; cur = tree->root) {
+      spool = (subscriber_pool_t *)rbtree_data_from_node(cur);
+      if(dequeue_subscribers) {
+        destroy_spool(spool);
+      }
+      else {
+        remove_spool(spool);
+        rbtree_destroy_node(seed, cur);
+      }
+      n++;
+    }
+    
+    for(dcur = spl->fetchmsg_cb_data_list; dcur != NULL; dcur = dcur->next) {
+      dcur->spooler = NULL;
+    }
+    
+    DBG("stopped %i spools in SPOOLER %p", n, *spl);
+  }
+  else {
+    DBG("SPOOLER %p not running", *spl);
+  }
+#if NCHAN_RBTREE_DBG
+  assert(active_before - n == 0);
+  assert(allocd_before - n == 0);
+  assert(seed->active_nodes == 0);
+  assert(seed->allocd_nodes == 0);
+#endif
+  nchan_free_msg_id(&spl->prev_msg_id);
+  spl->running = 0;
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/store/spool.h b/debian/modules/nchan/src/store/spool.h
new file mode 100644
index 0000000..576d98d
--- /dev/null
+++ b/debian/modules/nchan/src/store/spool.h
@@ -0,0 +1,113 @@
+#ifndef SPOOL_HEADER
+#define SPOOL_HEADER
+
+#include <util/nchan_rbtree.h>
+
+typedef struct spooled_subscriber_s spooled_subscriber_t;
+typedef struct subscriber_pool_s subscriber_pool_t;
+
+typedef struct {
+  spooled_subscriber_t  *ssub;
+  subscriber_pool_t     *spool;
+} spooled_subscriber_cleanup_t;
+  
+struct spooled_subscriber_s {
+  ngx_uint_t                    id; //could be useful later
+  subscriber_t                 *sub;
+  spooled_subscriber_cleanup_t  dequeue_callback_data;
+  spooled_subscriber_t         *next;
+  spooled_subscriber_t         *prev;
+}; //spooled_subscriber_t
+
+
+struct subscriber_pool_s {
+  nchan_msg_id_t              id;
+  nchan_msg_t                *msg;
+  nchan_msg_status_t          msg_status;
+  spooled_subscriber_t       *first;
+  ngx_pool_t                 *pool;
+  ngx_uint_t                  sub_count;
+  ngx_uint_t                  non_internal_sub_count;
+  ngx_uint_t                  generation;
+  ngx_uint_t                  responded_count;
+  struct channel_spooler_s   *spooler;
+}; // subscriber_pool_t
+
+typedef struct channel_spooler_s channel_spooler_t; //holds many different spools
+typedef struct channel_spooler_handlers_s channel_spooler_handlers_t; //spooler callbacks table
+
+typedef struct {
+  ngx_int_t            (*add)(channel_spooler_t *self, subscriber_t *sub);
+  ngx_int_t            (*handle_channel_status_change)(channel_spooler_t *self);
+  ngx_int_t            (*respond_message)(channel_spooler_t *self, nchan_msg_t *msg);
+  ngx_int_t            (*respond_status)(channel_spooler_t *self, nchan_msg_id_t *id, ngx_int_t status_code, ngx_str_t *status_line);
+  ngx_int_t            (*broadcast_status)(channel_spooler_t *self, ngx_int_t status_code, const ngx_str_t *status_line);
+  ngx_int_t            (*broadcast_notice)(channel_spooler_t *self, ngx_int_t notice_code, void *data);
+  ngx_int_t            (*prepare_to_stop)(channel_spooler_t *self);
+} channel_spooler_fn_t;
+
+typedef enum {FETCH, FETCH_IGNORE_MSG_NOTFOUND, NO_FETCH} spooler_fetching_strategy_t;
+
+
+typedef struct fetchmsg_data_s fetchmsg_data_t;
+struct fetchmsg_data_s {
+  channel_spooler_t   *spooler;
+  nchan_msg_id_t       msgid;
+  fetchmsg_data_t     *next;
+  fetchmsg_data_t     *prev;
+};
+
+typedef struct spooler_event_ll_s spooler_event_ll_t;
+struct spooler_event_ll_s {
+  spooler_event_ll_t   *prev;
+  ngx_event_t           ev;
+  void                (*callback)(void *);
+  void                (*cancel)(void *);
+  channel_spooler_t    *spooler;
+  spooler_event_ll_t   *next;
+};
+
+struct channel_spooler_s {
+  rbtree_seed_t               spoolseed;
+  subscriber_pool_t           current_msg_spool;
+  nchan_msg_id_t              prev_msg_id;
+  ngx_uint_t                  responded_count;
+  ngx_str_t                  *chid;
+  chanhead_pubsub_status_t   *channel_status;
+  nchan_store_t              *store;
+  nchan_loc_conf_t           *cf;
+  channel_spooler_fn_t       *fn;
+  channel_spooler_handlers_t *handlers;
+  void                       *handlers_privdata;
+  fetchmsg_data_t            *fetchmsg_cb_data_list;
+  spooler_event_ll_t         *spooler_dependent_events;
+#if NCHAN_BENCHMARK
+  ngx_int_t                   last_responded_subscriber_count;
+#endif  
+  spooler_fetching_strategy_t fetching_strategy;
+  unsigned                    publish_events:1;
+  unsigned                    running:1;
+  unsigned                    want_to_stop:1;
+  
+};
+
+struct channel_spooler_handlers_s {
+  void                        (*add)(channel_spooler_t *, subscriber_t *, void *);
+  void                        (*dequeue)(channel_spooler_t *, subscriber_t *, void *);
+  void                        (*bulk_dequeue)(channel_spooler_t *, subscriber_type_t, ngx_int_t, void *); //called after dequeueing 1 or many subs
+  void                        (*use)(channel_spooler_t *, void *);
+  void                        (*get_message_start)(channel_spooler_t *, void *);
+  void                        (*get_message_finish)(channel_spooler_t *, void *);
+};
+
+channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata);
+ngx_int_t stop_spooler(channel_spooler_t *spl, uint8_t dequeue_subscribers);
+
+ngx_int_t spooler_catch_up(channel_spooler_t *spl);
+
+ngx_int_t spooler_print_contents(channel_spooler_t *spl);
+
+ngx_event_t *spooler_add_timer(channel_spooler_t *spl, ngx_msec_t timeout, void (*cb)(void *), void (*cancel)(void *), void *pd);
+
+
+#endif  /*SPOOL_HEADER*/
diff --git a/debian/modules/nchan/src/store/store_common.c b/debian/modules/nchan/src/store/store_common.c
new file mode 100644
index 0000000..873ae73
--- /dev/null
+++ b/debian/modules/nchan/src/store/store_common.c
@@ -0,0 +1,7 @@
+#include <nchan_module.h>
+
+void nchan_exit_notice_about_remaining_things(char *thing, char *where, ngx_int_t num) {
+  if(num > 0) {
+    nchan_log_notice("%i %s%s remain%s %sat exit", num, thing, num == 1 ? "" : "s", num == 1 ? "s" : "", where == NULL ? "" : where);
+  }
+}
diff --git a/debian/modules/nchan/src/store/store_common.h b/debian/modules/nchan/src/store/store_common.h
new file mode 100644
index 0000000..c5335de
--- /dev/null
+++ b/debian/modules/nchan/src/store/store_common.h
@@ -0,0 +1,12 @@
+#undef uthash_malloc
+#undef uthash_free
+#define uthash_malloc(sz) ngx_alloc(sz, ngx_cycle->log)
+#define uthash_free(ptr,sz) ngx_free(ptr)
+
+#define STR(buf) (buf)->data, (buf)->len
+#define BUF(buf) (buf)->pos, ((buf)->last - (buf)->pos)
+
+#define NCHAN_DEFAULT_SUBSCRIBER_POOL_SIZE (5 * 1024)
+#define NCHAN_DEFAULT_CHANHEAD_CLEANUP_INTERVAL 1000
+
+void nchan_exit_notice_about_remaining_things(char *thing, char *where, ngx_int_t num);
diff --git a/debian/modules/nchan/src/subscribers/common.c b/debian/modules/nchan/src/subscribers/common.c
new file mode 100644
index 0000000..77d96a6
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/common.c
@@ -0,0 +1,317 @@
+#include <nchan_module.h>
+#include <assert.h>
+#include "common.h"
+
+#if FAKESHARD
+#include <store/memory/store.h>
+#endif
+
+ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id) {
+  return sub->cf->storage_engine->subscribe(ch_id, sub);
+}
+
+typedef struct {
+  subscriber_t    *sub;
+  ngx_str_t       *ch_id;
+  ngx_int_t        rc;
+  ngx_int_t        http_response_code;
+} nchan_auth_subrequest_data_t;
+
+typedef struct {
+  ngx_http_post_subrequest_t     psr;
+  nchan_auth_subrequest_data_t   psr_data;
+} nchan_auth_subrequest_stuff_t;
+
+static void subscriber_authorize_timer_callback_handler(ngx_event_t *ev) {
+  nchan_auth_subrequest_data_t *d = ev->data;
+  
+  d->sub->fn->release(d->sub, 1);
+  
+  if(d->rc == NGX_OK) {
+    ngx_int_t code = d->http_response_code;
+    if(code >= 200 && code <299) {
+      //authorized. proceed as planned
+      nchan_subscriber_subscribe(d->sub, d->ch_id);
+    }
+    else { //anything else means forbidden
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL); //auto-closes subscriber
+    }
+  }
+  else {
+    d->sub->fn->respond_status(d->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL); //auto-closes subscriber
+  }
+
+}
+
+static ngx_int_t subscriber_authorize_callback(ngx_http_request_t *r, void *data, ngx_int_t rc) {
+  nchan_auth_subrequest_data_t  *d = data;
+  ngx_event_t                   *timer;
+  
+  if (rc == NGX_HTTP_CLIENT_CLOSED_REQUEST) {
+    d->sub->fn->release(d->sub, 1);
+    //subscriber will be cleaned up and destroyed because this happens before the 
+    //subscriber's sudden_abort_handler is called
+  }
+  else {
+    d->rc = rc;
+    d->http_response_code = r->headers_out.status;
+    if((timer = ngx_pcalloc(r->pool, sizeof(*timer))) == NULL) {
+      return NGX_ERROR;
+    }
+    timer->handler = subscriber_authorize_timer_callback_handler;
+    timer->log = d->sub->request->connection->log;
+    timer->data = data;
+    
+    ngx_add_timer(timer, 0); //not sure if this needs to be done like this, but i'm just playing it safe here.
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_subscriber_authorize_subscribe(subscriber_t *sub, ngx_str_t *ch_id) {
+  
+  ngx_http_complex_value_t  *authorize_request_url_ccv = sub->cf->authorize_request_url;
+  ngx_str_t                  auth_request_url;
+  
+  if(!authorize_request_url_ccv) {
+    return nchan_subscriber_subscribe(sub, ch_id);
+  }
+  else {
+    nchan_auth_subrequest_stuff_t *psr_stuff = ngx_palloc(sub->request->pool, sizeof(*psr_stuff));
+    assert(psr_stuff != NULL);
+    
+    //ngx_http_request_t            *fake_parent_req = fake_cloned_parent_request(sub->request);
+    
+    ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
+    nchan_auth_subrequest_data_t  *psrd = &psr_stuff->psr_data;
+    ngx_http_request_t            *sr;
+    
+    ngx_http_complex_value(sub->request, authorize_request_url_ccv, &auth_request_url);
+    
+    sub->fn->reserve(sub);
+    
+    psr->handler = subscriber_authorize_callback;
+    psr->data = psrd;
+    
+    psrd->sub = sub;
+    psrd->ch_id = ch_id;
+    
+    ngx_http_subrequest(sub->request, &auth_request_url, NULL, &sr, psr, 0);
+    
+    sr->request_body = ngx_pcalloc(sub->request->pool, sizeof(ngx_http_request_body_t)); //dummy request body 
+    if (sr->request_body == NULL) {
+      return NGX_ERROR;
+    }
+    
+    sr->header_only = 1;
+    
+    sr->args = sub->request->args;
+    
+    return NGX_OK;
+  }
+}
+
+
+ngx_int_t nchan_cleverly_output_headers_only_for_later_response(ngx_http_request_t *r) {
+  ngx_int_t                rc;
+  static const ngx_str_t   everything_ok = ngx_string("200 OK");
+  
+  r->headers_out.status_line = everything_ok; //but in reality, we're returning a 200 OK
+#if (NGX_HTTP_V2)
+  if(r->stream) {
+    r->headers_out.status=NGX_HTTP_OK; //no need to fool chunking module
+    r->header_only = 0;
+  }
+  else {
+    r->headers_out.status=NGX_HTTP_NO_CONTENT; //fake it to fool the chunking module (mostly);  
+    r->header_only = 1;
+  }
+#elif (NGX_HTTP_SPDY)
+   if(r->spdy_stream) {
+    r->headers_out.status=NGX_HTTP_OK; //no need to fool chunking module
+    r->header_only = 0;
+  }
+  else {
+    r->headers_out.status=NGX_HTTP_NO_CONTENT; //fake it to fool the chunking module (mostly);  
+    r->header_only = 1;
+  }
+#else
+  r->headers_out.status=NGX_HTTP_NO_CONTENT; //fake it to fool the chunking module (mostly);  
+  r->header_only = 1;
+#endif
+  nchan_include_access_control_if_needed(r, NULL);
+  rc = ngx_http_send_header(r);
+  
+  if(r->headers_out.status == NGX_HTTP_OK) {
+    r->keepalive = 1;
+  }
+  
+  return rc;
+}
+
+
+static void nchan_generate_random_boundary(u_char *buf, int sz) {
+  //use the shitty-ass LFSR-based ngx_random. we're not looking for cryptographic randomness, 
+  //just something unlikely
+  static u_char   itoa64[] ="./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+  int             i;
+  u_char         *p = buf;
+  
+  for(i=0; i < sz; i++) {
+    *p++ = itoa64[ngx_random() % 64];
+  }
+}
+
+ngx_str_t *nchan_request_multipart_boundary(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
+  if(ctx) {
+    if(!ctx->multipart_boundary) {
+      if((ctx->multipart_boundary = ngx_palloc(r->pool, sizeof(ngx_str_t) + 32)) == NULL) {
+        //unable to allocate multipart boundary;
+        return NULL;
+      }
+      ctx->multipart_boundary->data=(u_char *)&ctx->multipart_boundary[1];
+      ctx->multipart_boundary->len = 32;
+      nchan_generate_random_boundary(ctx->multipart_boundary->data, 32);
+    }
+    return ctx->multipart_boundary;
+  }
+  else {
+    return NULL;
+  }
+}
+
+ngx_int_t nchan_request_set_content_type_multipart_boundary_header(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
+  u_char                        *cur;
+  u_char                        *cbuf;
+  ngx_str_t                      val;
+  
+  if((cbuf = ngx_palloc(r->pool, sizeof(u_char)*100)) == NULL) {
+    return NGX_ERROR;
+  }
+  
+  val.data = cbuf;
+  cur = ngx_snprintf(cbuf, 100, "multipart/mixed; boundary=%V", nchan_request_multipart_boundary(r, ctx));
+  val.len = cur - cbuf;
+  
+  r->headers_out.content_type = val;
+  
+  return NGX_OK;
+}
+
+void nchan_subscriber_timeout_ev_handler(ngx_event_t *ev) {
+  subscriber_t *sub = (subscriber_t *)ev->data;
+#if FAKESHARD
+  memstore_fakeprocess_push(sub->owner);
+#endif
+  sub->dequeue_after_response = 1;
+  sub->fn->respond_status(sub, NGX_HTTP_REQUEST_TIMEOUT, &NCHAN_HTTP_STATUS_408);
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+#endif
+}
+
+
+void nchan_subscriber_init_timeout_timer(subscriber_t *sub, ngx_event_t *ev) {
+  ngx_memzero(ev, sizeof(*ev));
+  nchan_init_timer(ev, nchan_subscriber_timeout_ev_handler, sub);
+}
+
+void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http_request_t *r, nchan_msg_id_t *msgid) {
+  nchan_request_ctx_t  *ctx = NULL;
+  *sub = *tmpl;
+  sub->request = r;
+  if(r) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+    sub->cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  }
+  sub->reserved = 0;
+  sub->enqueued = 0;
+  sub->status = ALIVE;
+  
+  if(msgid) {
+    nchan_copy_new_msg_id(&sub->last_msgid, msgid);
+  }
+  else {
+    sub->last_msgid.time = 0;
+    sub->last_msgid.tag.fixed[0] = 0;
+    sub->last_msgid.tagcount = 1;
+  }
+  
+  if(ctx) {
+    ctx->prev_msg_id = sub->last_msgid;
+    ctx->sub = sub;
+    ctx->subscriber_type = sub->name;
+  }
+  
+#if FAKESHARD
+  sub->owner = memstore_slot();
+#endif
+  
+}
+
+void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t dequeue_after_response) {
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  sub->type = type;
+  sub->name = name;
+  sub->fn = fn;
+  
+  sub->dequeue_after_response = dequeue_after_response;
+  if(ctx) {
+    ctx->subscriber_type = sub->name;
+  }
+}
+
+ngx_int_t nchan_subscriber_empty_notify(subscriber_t *self, ngx_int_t code, void *data) {
+  return NGX_OK;
+}
+
+
+#define MSGID_BUF_LEN (10*255)
+typedef struct msgidbuf_s msgidbuf_t;
+struct msgidbuf_s {
+  u_char       chr[MSGID_BUF_LEN];
+  msgidbuf_t  *prev;
+  msgidbuf_t  *next;
+};
+
+static void *msgidbuf_alloc(void *pd) {
+  return ngx_palloc((ngx_pool_t *)pd, sizeof(msgidbuf_t));
+}
+
+ngx_int_t nchan_subscriber_init_msgid_reusepool(nchan_request_ctx_t *ctx, ngx_pool_t *request_pool) {
+  ctx->output_str_queue = ngx_palloc(request_pool, sizeof(*ctx->output_str_queue));
+  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(msgidbuf_t, prev), offsetof(msgidbuf_t, next), msgidbuf_alloc, NULL, request_pool);
+  return NGX_OK;
+}
+
+ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid) {
+  ngx_str_t               ret;
+  msgidbuf_t             *msgidbuf;
+  
+  msgidbuf = nchan_reuse_queue_push(ctx->output_str_queue);
+  ret.data = &msgidbuf->chr[0];
+  
+  nchan_strcpy(&ret, msgid_to_str(msgid), MSGID_BUF_LEN);
+  
+  return ret;
+}
+
+void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = start;
+  buf->pos = start;
+  buf->end = end;
+  buf->last = end;
+  buf->memory = 1;
+}
+
+void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = str->data;
+  buf->pos = str->data;
+  buf->end = str->data + str->len;
+  buf->last = buf->end;
+  buf->memory = 1;
+}
+
+
diff --git a/debian/modules/nchan/src/subscribers/common.h b/debian/modules/nchan/src/subscribers/common.h
new file mode 100644
index 0000000..b0193c4
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/common.h
@@ -0,0 +1,22 @@
+ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id);
+
+ngx_int_t nchan_subscriber_authorize_subscribe(subscriber_t *sub, ngx_str_t *ch_id);
+
+ngx_int_t nchan_cleverly_output_headers_only_for_later_response(ngx_http_request_t *r);
+
+ngx_str_t *nchan_request_multipart_boundary(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
+
+ngx_int_t nchan_request_set_content_type_multipart_boundary_header(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
+
+ngx_int_t nchan_subscriber_empty_notify(subscriber_t *, ngx_int_t code, void *data);
+
+void nchan_subscriber_timeout_ev_handler(ngx_event_t *ev);
+void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http_request_t *r, nchan_msg_id_t *msgid);
+void nchan_subscriber_init_timeout_timer(subscriber_t *sub, ngx_event_t *ev);
+void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t dequeue_after_response);
+ngx_int_t nchan_subscriber_init_msgid_reusepool(nchan_request_ctx_t *ctx, ngx_pool_t *request_pool);
+ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
+void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end);
+void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str);
+#define ngx_init_set_membuf_char(buf, str) \
+  ngx_init_set_membuf(buf, (u_char *)str, ((u_char *)str) + sizeof(str)-1)
diff --git a/debian/modules/nchan/src/subscribers/eventsource.c b/debian/modules/nchan/src/subscribers/eventsource.c
new file mode 100644
index 0000000..6ba4387
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/eventsource.c
@@ -0,0 +1,337 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <util/nchan_bufchainpool.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:EVENTSOURCE:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:EVENTSOURCE:" fmt, ##arg)
+#include <assert.h> 
+
+static nchan_bufchain_pool_t *fsub_bcp(full_subscriber_t *fsub) {
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  return ctx->bcp;
+}
+
+/*static ngx_inline void str_to_buf(ngx_buf_t *buf, ngx_str_t *str) {
+  buf->start = str->data;
+  buf->pos = str->data;
+  buf->end = str->data + str->len;
+  buf->last = buf->end;
+  buf->memory = 1;
+}
+*/
+
+static void es_ensure_headers_sent(full_subscriber_t *fsub) {
+  static const ngx_str_t   content_type = ngx_string("text/event-stream; charset=utf-8");
+  static const ngx_str_t   hello = ngx_string(": hi\n\n");
+  ngx_http_request_t             *r = fsub->sub.request;
+  ngx_http_core_loc_conf_t       *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+  
+  nchan_buf_and_chain_t          *bc;
+  
+  if(!fsub->data.shook_hands) {
+    bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 1);
+    clcf->chunked_transfer_encoding = 0;
+    
+    r->headers_out.content_type.len = content_type.len;
+    r->headers_out.content_type.data = content_type.data;
+    r->headers_out.content_length_n = -1;
+    //send headers
+    
+    nchan_cleverly_output_headers_only_for_later_response(r);
+    
+    //send a ":hi" comment
+    ngx_init_set_membuf(&bc->buf, hello.data, hello.data + hello.len);
+    
+    bc->buf.last_buf = 0;
+    bc->buf.flush = 1;
+
+    nchan_output_filter(fsub->sub.request, &bc->chain);
+    
+    fsub->data.shook_hands = 1; 
+  }
+}
+
+static ngx_int_t create_dataline_bufchain(full_subscriber_t *fsub, ngx_chain_t **first_chain, ngx_chain_t **last_chain, ngx_buf_t *databuf) {
+  static ngx_str_t        data_prefix=ngx_string("data: ");
+  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), ngx_buf_size(databuf) == 0 ? 1 : 2);
+  ngx_chain_t            *chain = &bc->chain;
+  
+  if(*last_chain) {
+    (*last_chain)->next = chain;
+  }
+  
+  ngx_init_set_membuf(chain->buf, data_prefix.data, data_prefix.data + data_prefix.len);
+  
+  if(*first_chain == NULL) {
+    *first_chain = chain;
+  }
+  
+  if(ngx_buf_size(databuf) > 0) {
+    chain = chain->next;
+    *chain->buf = *databuf;
+    chain->buf->last_buf = 0;
+    chain->buf->last_in_chain = 0;
+  }
+  *last_chain = chain;
+
+  return NGX_OK;
+}
+
+static void prepend_es_response_line(full_subscriber_t *fsub, ngx_str_t *lbl, ngx_chain_t **first_chain, ngx_str_t *str) {
+  static ngx_str_t        nl = ngx_string("\n");
+  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 3);
+  ngx_chain_t            *chain;
+
+  chain = &bc->chain;
+  ngx_init_set_membuf(chain->buf, lbl->data, lbl->data + lbl->len);
+  chain = chain->next;
+  ngx_init_set_membuf(chain->buf, str->data, str->data + str->len);
+  chain = chain->next;
+  ngx_init_set_membuf(chain->buf, nl.data, nl.data + 1);
+  
+  assert(chain->next == NULL);
+  chain->next = *first_chain;
+  *first_chain = &bc->chain;
+}
+
+static ngx_int_t es_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
+  static ngx_str_t        terminal_newlines=ngx_string("\n\n");
+  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
+  u_char                 *cur = NULL, *last = NULL;
+  ngx_buf_t              *msg_buf = msg->buf;
+  ngx_buf_t               databuf;
+  nchan_buf_and_chain_t  *bc;
+  ngx_chain_t            *first_link = NULL, *last_link = NULL;
+  ngx_str_t               msgid;
+  static ngx_str_t        id_line = ngx_string("id: ");
+  static ngx_str_t        event_line = ngx_string("event: ");
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  
+  
+  ctx->prev_msg_id = fsub->sub.last_msgid;
+  update_subscriber_last_msg_id(sub, msg);
+  ctx->msg_id = fsub->sub.last_msgid;
+  
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
+  }
+  
+  es_ensure_headers_sent(fsub);
+  
+  DBG("%p output msg to subscriber", sub);
+  
+  ngx_memcpy(&databuf, msg_buf, sizeof(*msg_buf));
+  databuf.last_buf = 0;
+  
+  if(!databuf.in_file) {
+    cur = msg_buf->start;
+    last = msg_buf->end;
+    do {
+      databuf.start = cur;
+      databuf.pos = cur;
+      databuf.end = last;
+      databuf.last = last;
+      
+      cur = ngx_strlchr(cur, last, '\n');
+      if(cur == NULL) {
+        //sweet, no newlines!
+        //let's get out of this hellish loop
+        databuf.end = last;
+        databuf.last = last;
+        cur = last + 1;
+      }
+      else {
+        cur++; //include the newline
+        databuf.end = cur;
+        databuf.last = cur;
+      }
+      
+      create_dataline_bufchain(fsub, &first_link, &last_link, &databuf);
+      
+    } while(cur <= last);
+  } 
+  else {
+    //great, we've gotta scan this whole damn file for line breaks.
+    //EventStream really isn't designed for large chunks of data
+    off_t       fcur, flast;
+    //int         chr_int;
+    FILE       *stream;
+    ngx_file_t *msgfile =  nchan_bufchain_pool_reserve_file(ctx->bcp);
+    
+    nchan_msg_buf_open_fd_if_needed(&databuf, msgfile, NULL);
+
+    if(msgfile->fd == NGX_INVALID_FILE) {
+      msgfile->fd = nchan_fdcache_get(&msgfile->name);
+    }
+    stream = fdopen(dup(msgfile->fd), "r");
+    
+    fcur = databuf.file_pos;
+    flast = databuf.file_last;
+    
+    fseek(stream, fcur, SEEK_SET);
+    
+    do {
+      databuf.file_pos = fcur;
+      databuf.file_last = flast;
+      
+      //getc that shit
+      /*for(;;) {
+        chr_int = getc(stream);
+        if(chr_int == EOF) {
+          break;
+        }
+        else if(chr_int == (int )'\n') {
+          fcur++;
+          break;
+        }
+        fcur++;
+      }*/
+      
+      if(fscanf(stream,"%*[^\n]\n") != EOF) {
+        fcur = ftell(stream);
+      }
+      else {
+        fcur = flast;
+      }
+      
+      databuf.file_last = fcur;
+      create_dataline_bufchain(fsub, &first_link, &last_link, &databuf);
+      
+    } while(fcur < flast);
+    
+    fclose(stream);
+  }
+  
+  //now 2 newlines at the end
+  if(last_link) {
+    bc = nchan_bufchain_pool_reserve(ctx->bcp, 1);
+    last_link->next=&bc->chain;
+    ngx_init_set_membuf(&bc->buf, terminal_newlines.data, terminal_newlines.data + terminal_newlines.len);
+    
+    bc->buf.flush = 1;
+    bc->buf.last_buf = 0;
+    
+    bc->chain.next = NULL;
+    bc->chain.buf = &bc->buf;
+    
+    last_link = &bc->chain;
+  }
+  //okay, this crazy data chain is finished. 
+    
+  //now how about the mesage tag?
+  
+  msgid = nchan_subscriber_set_recyclable_msgid_str(ctx, &sub->last_msgid);
+  prepend_es_response_line(fsub, &id_line, &first_link, &msgid);
+  
+  //and maybe the event type?
+  if(sub->cf->eventsource_event.len > 0) {
+    prepend_es_response_line(fsub, &event_line, &first_link, &sub->cf->eventsource_event);
+  }
+  else if(msg->eventsource_event.len > 0) {
+    prepend_es_response_line(fsub, &event_line, &first_link, &msg->eventsource_event);
+  }
+  
+  return nchan_output_msg_filter(fsub->sub.request, msg, first_link);
+}
+
+static void empty_handler(void) {}
+
+static ngx_int_t es_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line){
+  
+  static ngx_str_t          empty_line = ngx_string("");
+  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
+  u_char                    resp_buf[256];
+  nchan_buf_and_chain_t     bc;
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //ignore
+    return NGX_OK;
+  }
+  
+  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line);
+  }
+  
+  es_ensure_headers_sent(fsub);
+  
+  DBG("%p output status to subscriber", sub);
+  
+  bc.chain.buf = &bc.buf;
+  bc.chain.next = NULL;
+  ngx_init_set_membuf(&bc.buf, resp_buf, ngx_snprintf(resp_buf, 256, ":%i: %V\n\n", status_code, status_line ? status_line : &empty_line));
+  bc.buf.flush = 1;
+  bc.buf.last_buf = 1;
+  
+  nchan_output_filter(fsub->sub.request, &bc.chain);
+  
+  if((status_code >=400 && status_code <599) || status_code == NGX_HTTP_NOT_MODIFIED) {
+    fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
+    fsub->sub.request->keepalive=0;
+    fsub->data.finalize_request=1;
+    sub->fn->dequeue(sub);
+  }
+
+  return NGX_OK;
+}
+
+static ngx_int_t es_enqueue(subscriber_t *sub) {
+  ngx_int_t           rc;
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  DBG("%p output status to subscriber", sub);
+  rc = longpoll_enqueue(sub);
+  fsub->data.finalize_request = 0;
+  es_ensure_headers_sent(fsub);
+  sub->enqueued = 1;
+  return rc;
+}
+
+static       subscriber_fn_t  eventsource_fn_data;
+static       subscriber_fn_t *eventsource_fn = NULL;
+
+static       ngx_str_t   sub_name = ngx_string("eventsource");
+
+
+subscriber_t *eventsource_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
+  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  if(eventsource_fn == NULL) {
+    eventsource_fn = &eventsource_fn_data;
+    *eventsource_fn = *sub->fn;
+    eventsource_fn->enqueue = es_enqueue;
+    eventsource_fn->respond_message= es_respond_message;
+    eventsource_fn->respond_status = es_respond_status;
+  }
+  
+  fsub->data.shook_hands = 0;
+  
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  //msgid bufs -- unique per response
+  nchan_subscriber_init_msgid_reusepool(ctx, r->pool);
+  
+  nchan_subscriber_common_setup(sub, EVENTSOURCE, &sub_name, eventsource_fn, 0);
+  return sub;
+}
+
+ngx_int_t nchan_detect_eventsource_request(ngx_http_request_t *r) {
+  ngx_str_t       *accept_header;
+  if(r->headers_in.accept == NULL) {
+    return 0;
+  }
+  accept_header = &r->headers_in.accept->value;
+
+  if(ngx_strnstr(accept_header->data, "text/event-stream", accept_header->len)) {
+    return 1;
+  }
+  
+  return 0;
+}
diff --git a/debian/modules/nchan/src/subscribers/eventsource.h b/debian/modules/nchan/src/subscribers/eventsource.h
new file mode 100644
index 0000000..424a7c7
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/eventsource.h
@@ -0,0 +1,4 @@
+subscriber_t *eventsource_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+//ngx_int_t eventsource_subscriber_destroy(subscriber_t *sub);
+
+ngx_int_t nchan_detect_eventsource_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/http-chunked.c b/debian/modules/nchan/src/subscribers/http-chunked.c
new file mode 100644
index 0000000..d356f5d
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/http-chunked.c
@@ -0,0 +1,256 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:CHUNKED:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:CHUNKED:" fmt, ##arg)
+#include <assert.h> 
+
+#define CHUNKSIZE_BUF_LEN 20
+
+typedef struct chunksizebuf_s chunksizebuf_t;
+struct chunksizebuf_s {
+  u_char           chr[CHUNKSIZE_BUF_LEN];
+  chunksizebuf_t  *prev;
+  chunksizebuf_t  *next;
+};
+
+static void chunked_ensure_headers_sent(full_subscriber_t *fsub) {
+  static ngx_str_t         transfer_encoding_header = ngx_string("Transfer-Encoding");
+  static ngx_str_t         transfer_encoding = ngx_string("chunked");
+  
+  ngx_http_request_t             *r = fsub->sub.request;
+  ngx_http_core_loc_conf_t       *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+  if(!fsub->data.shook_hands) {
+    
+    clcf->chunked_transfer_encoding = 0;
+    
+    //r->headers_out.content_type.len = content_type.len;
+    //r->headers_out.content_type.data = content_type.data;
+    
+    nchan_add_response_header(r, &transfer_encoding_header, &transfer_encoding);
+    
+    nchan_cleverly_output_headers_only_for_later_response(r);
+    
+    fsub->data.shook_hands = 1; 
+  }
+}
+
+static ngx_int_t chunked_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
+  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  chunksizebuf_t         *chunksizebuf = nchan_reuse_queue_push(ctx->output_str_queue);
+  u_char                 *chunk_start = &chunksizebuf->chr[0];
+  static u_char          *chunk_end=(u_char *)"\r\n";
+  ngx_file_t             *file_copy;
+  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(ctx->bcp, 3);
+  ngx_chain_t            *chain;
+  ngx_buf_t              *buf, *msg_buf = msg->buf;
+  ngx_int_t               rc;
+  
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
+  }
+  
+  ctx->prev_msg_id = fsub->sub.last_msgid;
+  update_subscriber_last_msg_id(sub, msg);
+  ctx->msg_id = fsub->sub.last_msgid;
+  
+  if (ngx_buf_size(msg_buf) == 0) {
+    //empty messages are skipped, because a zero-length chunk finalizes the request
+    return NGX_OK;
+  }
+  
+  //chunk size
+  chain = &bc->chain;
+  buf = chain->buf;
+  ngx_memzero(buf, sizeof(*buf));
+  buf->memory = 1;
+  buf->start = chunk_start;
+  buf->pos = chunk_start;
+  buf->end = ngx_snprintf(chunk_start, 15, "%xi\r\n", ngx_buf_size(msg_buf));
+  buf->last = buf->end;
+  
+  //message
+  chain = chain->next;
+  buf = chain->buf;
+  *buf = *msg_buf;
+  if(buf->file) {
+    file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
+    nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
+  }
+  buf->last_buf = 0;
+  buf->last_in_chain = 0;
+  buf->flush = 0;
+  
+  //trailing newlines
+  chain = chain->next;
+  buf = chain->buf;
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = chunk_end;
+  buf->pos = chunk_end;
+  buf->end = chunk_end + 2;
+  buf->last = buf->end;
+  buf->memory = 1;
+  buf->last_buf = 0;
+  buf->last_in_chain = 1;
+  buf->flush = 1;
+  
+  chunked_ensure_headers_sent(fsub);
+  
+  DBG("%p output msg to subscriber", sub);
+  
+  rc = nchan_output_msg_filter(fsub->sub.request, msg, &bc->chain);
+  
+  return rc;
+}
+
+static ngx_int_t chunked_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line){
+  nchan_buf_and_chain_t     bc;
+  ngx_chain_t              *chain = NULL;
+  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
+  
+  if(chain == NULL) {
+    bc.chain.buf=&bc.buf;
+    bc.chain.next=NULL;
+    ngx_memzero(&bc.buf, sizeof(ngx_buf_t));
+    bc.buf.last_buf = 1;
+    bc.buf.last_in_chain = 1;
+    bc.buf.flush = 1;
+    bc.buf.memory = 1;
+    chain = &bc.chain;
+  }
+  
+  bc.buf.start = (u_char *)"0\r\n\r\n";
+  bc.buf.end = bc.buf.start + 5;
+  bc.buf.pos = bc.buf.start;
+  bc.buf.last = bc.buf.end;
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //ignore
+    return NGX_OK;
+  }
+  
+  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code < 600) {
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line);
+  }
+  
+  chunked_ensure_headers_sent(fsub);
+  
+  nchan_output_filter(fsub->sub.request, chain);
+  
+  subscriber_maybe_dequeue_after_status_response(fsub, status_code);
+
+  return NGX_OK;
+}
+
+void *chunksizebuf_alloc(void *pd) {
+  return ngx_palloc((ngx_pool_t *)pd, sizeof(chunksizebuf_t));
+}
+
+static ngx_int_t chunked_enqueue(subscriber_t *sub) {
+  ngx_int_t           rc;
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  DBG("%p output status to subscriber", sub);
+  rc = longpoll_enqueue(sub);
+  fsub->data.finalize_request = 0;
+  chunked_ensure_headers_sent(fsub);
+  sub->enqueued = 1;
+  return rc;
+}
+
+static       subscriber_fn_t  chunked_fn_data;
+static       subscriber_fn_t *chunked_fn = NULL;
+
+static       ngx_str_t   sub_name = ngx_string("http-chunked");
+
+subscriber_t *http_chunked_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
+  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  if(chunked_fn == NULL) {
+    chunked_fn = &chunked_fn_data;
+    *chunked_fn = *sub->fn;
+    chunked_fn->enqueue = chunked_enqueue;
+    chunked_fn->respond_message = chunked_respond_message;
+    chunked_fn->respond_status = chunked_respond_status;
+  }
+  
+  fsub->data.shook_hands = 0;
+  
+  ctx->output_str_queue = ngx_palloc(r->pool, sizeof(*ctx->output_str_queue));
+  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(chunksizebuf_t, prev), offsetof(chunksizebuf_t, next), chunksizebuf_alloc, NULL, r->pool);
+  
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  nchan_subscriber_common_setup(sub, HTTP_CHUNKED, &sub_name, chunked_fn, 0);
+  return sub;
+}
+
+
+
+ngx_int_t nchan_detect_chunked_subscriber_request(ngx_http_request_t *r) {
+  static ngx_str_t   TE_HEADER = ngx_string("TE");
+  ngx_str_t         *tmp;
+  u_char            *cur, *last;
+  
+  if(r->method != NGX_HTTP_GET) {
+    return 0;
+  }
+  
+  if((tmp = nchan_get_header_value(r, TE_HEADER)) != NULL) {
+    last = tmp->data + tmp->len;
+    cur = ngx_strlcasestrn(tmp->data, last, (u_char *)"chunked", 7 - 1);
+    
+    if(cur == NULL) {
+      return 0;
+    }
+    
+    //see if there's a qvalue
+    cur += 7;
+    if((cur + 1 <= last) && cur[0]==' ') { 
+      //no qvalue. assume non-zero, meaning it's legit
+      return 1;
+    }
+    else if((cur + 4) < last) {
+      //maybe there is...
+      if(cur[0]==';' && cur[1]=='q' && cur[2]=='=') {
+        //parse the freaking qvalue
+        cur += 3;
+        ngx_int_t qval_fp;
+        qval_fp = ngx_atofp(cur, last - cur, 2);
+        if(qval_fp == NGX_ERROR) {
+          DBG("invalid qval. reject.");
+          return 0;
+        }
+        else if(qval_fp > 0) {
+          //got nonzero qval. accept
+          return 1;
+        }
+        else {
+          //qval=0. reject
+          return 0;
+        }
+      }
+      else {
+        //we're looking at  "chunkedsomething", not "chunked;q=<...>". reject.
+        return 0;
+      }
+    }
+    else if (cur == last){
+      //last thing in the header. "chunked". accept
+      return 1;
+    }
+    else {
+      //too small to have a qvalue, not followed by a space. must be "chunkedsomething"
+      return 0;
+    }
+  }
+  else return 0;
+}
diff --git a/debian/modules/nchan/src/subscribers/http-chunked.h b/debian/modules/nchan/src/subscribers/http-chunked.h
new file mode 100644
index 0000000..efb5197
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/http-chunked.h
@@ -0,0 +1,4 @@
+subscriber_t *http_chunked_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+//ngx_int_t http_chunked_subscriber_destroy(subscriber_t *sub);
+
+ngx_int_t nchan_detect_chunked_subscriber_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/http-multipart-mixed.c b/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
new file mode 100644
index 0000000..4a4acb1
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
@@ -0,0 +1,291 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <util/nchan_bufchainpool.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MULTIPART:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MULTIPART:" fmt, ##arg)
+#include <assert.h> 
+
+typedef struct {
+  u_char                 boundary[50];
+  u_char                *boundary_end;
+} multipart_privdata_t;
+
+typedef struct {
+  u_char       charbuf[58 + 10*NCHAN_FIXED_MULTITAG_MAX];
+  void        *prev;
+  void        *next;
+} headerbuf_t;
+
+static nchan_bufchain_pool_t *fsub_bcp(full_subscriber_t *fsub) {
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  return ctx->bcp;
+}
+
+static void multipart_ensure_headers_sent(full_subscriber_t *fsub) {
+  nchan_buf_and_chain_t          *bc;
+  
+  ngx_http_request_t             *r = fsub->sub.request;
+  ngx_http_core_loc_conf_t       *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  multipart_privdata_t           *mpd = (multipart_privdata_t *)fsub->privdata;
+  
+  if(!fsub->data.shook_hands) {
+    clcf->chunked_transfer_encoding = 0;
+    nchan_request_set_content_type_multipart_boundary_header(r, ctx);
+    
+    nchan_cleverly_output_headers_only_for_later_response(r);
+    
+    //set preamble in the request ctx. it would be nicer to store in in the subscriber data, 
+    //but that would mean not reusing longpoll's fsub directly
+    
+    if((bc = nchan_bufchain_pool_reserve(ctx->bcp, 1)) == NULL) {
+      ERR("can't reserve bufchain for multipart headers");
+      nchan_respond_status(fsub->sub.request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 1);
+      return;
+    }
+    
+    ngx_memzero(&bc->buf, sizeof(ngx_buf_t));
+    bc->buf.start = mpd->boundary + 2;
+    bc->buf.pos = bc->buf.start;
+    bc->buf.end = mpd->boundary_end;
+    bc->buf.last = bc->buf.end;
+    bc->buf.memory = 1;
+    bc->buf.last_buf = 0;
+    bc->buf.last_in_chain = 1;
+    bc->buf.flush = 1;
+    
+    nchan_output_filter(r, &bc->chain);
+    
+    fsub->data.shook_hands = 1; 
+  }
+}
+static void *headerbuf_alloc(void *pd) {
+  return ngx_palloc((ngx_pool_t *)pd, sizeof(headerbuf_t));
+}
+
+static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
+  
+  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
+  ngx_buf_t              *buf, *msg_buf = msg->buf, *msgid_buf;
+  ngx_int_t               rc;
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(fsub->sub.request, ngx_nchan_module);
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  ngx_int_t               n;
+  nchan_buf_and_chain_t  *bc;
+  ngx_chain_t            *chain;
+  ngx_file_t             *file_copy;
+  multipart_privdata_t   *mpd = (multipart_privdata_t *)fsub->privdata;
+  
+  headerbuf_t            *headerbuf = nchan_reuse_queue_push(ctx->output_str_queue);
+  u_char                 *cur = headerbuf->charbuf;
+  
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
+  }
+  
+  //generate the headers
+  if(!cf->msg_in_etag_only) {
+    //msgtime
+    cur = ngx_cpymem(cur, "\r\nLast-Modified: ", sizeof("\r\nLast-Modified: ") - 1);
+    cur = ngx_http_time(cur, msg->id.time);
+    *cur++ = CR; *cur++ = LF;
+    //msgtag
+    cur = ngx_cpymem(cur, "Etag: ", sizeof("Etag: ") - 1);
+    cur += msgtag_to_strptr(&msg->id, (char *)cur);
+    *cur++ = CR; *cur++ = LF;
+  }
+  else {
+    ngx_str_t   *tmp_etag = msgid_to_str(&msg->id);
+    cur = ngx_snprintf(cur, 58 + 10*NCHAN_FIXED_MULTITAG_MAX, "\r\nEtag: %V\r\n", tmp_etag);
+  }
+  
+  n=4;
+  if(msg->content_type.len == 0) {
+    //don't need content_type buf'n'chain
+    n--;
+  }
+  if(ngx_buf_size(msg_buf) == 0) {
+    //don't need msgbuf
+    n --;
+  }
+  if((bc = nchan_bufchain_pool_reserve(ctx->bcp, n)) == NULL) {
+    ERR("cant allocate buf-and-chains for multipart/mixed client output");
+    return NGX_ERROR;
+  }
+  
+  chain = &bc->chain;
+  msgid_buf = chain->buf;
+  
+  //message id
+  ngx_memzero(chain->buf, sizeof(ngx_buf_t));
+  chain->buf->memory = 1;
+  chain->buf->start = headerbuf->charbuf;
+  chain->buf->pos = headerbuf->charbuf;
+  
+  //content_type maybe
+  if(msg->content_type.len > 0) {
+    chain = chain->next;
+    buf = chain->buf;
+    
+    msgid_buf->last = cur;
+    msgid_buf->end = cur;
+    
+    ngx_memzero(buf, sizeof(ngx_buf_t));
+    buf->memory = 1;
+    buf->start = cur;
+    buf->pos = cur;
+    buf->last = ngx_snprintf(cur, 255, "Content-Type: %V\r\n\r\n", &msg->content_type);
+    buf->end = buf->last;
+  }
+  else {
+    *cur++ = CR; *cur++ = LF;
+    msgid_buf->last = cur;
+    msgid_buf->end = cur;
+  }
+  
+  chain = chain->next;
+  buf = chain->buf;
+  //msgbuf
+  if(ngx_buf_size(msg_buf) > 0) {
+    ngx_memcpy(buf, msg_buf, sizeof(*msg_buf));
+    if(msg_buf->file) {
+      file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
+      nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
+    }
+    buf->last_buf = 0;
+    buf->last_in_chain = 0;
+    buf->flush = 0;
+  }
+  
+  chain = chain->next;
+  buf = chain->buf;
+  ngx_memzero(buf, sizeof(ngx_buf_t));
+  buf->start = &mpd->boundary[0];
+  buf->pos = buf->start;
+  buf->end = mpd->boundary_end;
+  buf->last = buf->end;
+  buf->memory = 1;
+  buf->last_buf = 0;
+  buf->last_in_chain = 1;
+  buf->flush = 1;
+  
+  ctx->prev_msg_id = fsub->sub.last_msgid;
+  update_subscriber_last_msg_id(sub, msg);
+  ctx->msg_id = fsub->sub.last_msgid;
+  
+  multipart_ensure_headers_sent(fsub);
+  
+  DBG("%p output msg to subscriber", sub);
+  
+  rc = nchan_output_msg_filter(fsub->sub.request, msg, &bc->chain);
+  
+  return rc;
+}
+
+static ngx_int_t multipart_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line){
+  nchan_buf_and_chain_t    *bc;
+  static u_char            *end_boundary=(u_char *)"--\r\n";
+  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
+  //nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //ignore
+    return NGX_OK;
+  }
+  
+  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line);
+  }
+  
+  multipart_ensure_headers_sent(fsub);
+  
+  if((bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 1)) == NULL) {
+    nchan_respond_status(sub->request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 1);
+    return NGX_ERROR;
+  }
+  
+  ngx_memzero(&bc->buf, sizeof(ngx_buf_t));
+  bc->buf.memory = 1;
+  bc->buf.last_buf = 1;
+  bc->buf.last_in_chain = 1;
+  bc->buf.flush = 1;
+  bc->buf.start = end_boundary;
+  bc->buf.pos = end_boundary;
+  bc->buf.end = end_boundary + 4;
+  bc->buf.last = bc->buf.end;
+  
+  nchan_output_filter(fsub->sub.request, &bc->chain);
+  
+  subscriber_maybe_dequeue_after_status_response(fsub, status_code);
+
+  return NGX_OK;
+}
+
+static ngx_int_t multipart_enqueue(subscriber_t *sub) {
+  ngx_int_t           rc;
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  DBG("%p output status to subscriber", sub);
+  rc = longpoll_enqueue(sub);
+  fsub->data.finalize_request = 0;
+  multipart_ensure_headers_sent(fsub);
+  sub->enqueued = 1;
+  return rc;
+}
+
+static       subscriber_fn_t  multipart_fn_data;
+static       subscriber_fn_t *multipart_fn = NULL;
+
+static       ngx_str_t   sub_name = ngx_string("http-multipart");
+
+
+subscriber_t *http_multipart_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
+  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
+  multipart_privdata_t *multipart_data;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  
+  if(multipart_fn == NULL) {
+    multipart_fn = &multipart_fn_data;
+    *multipart_fn = *sub->fn;
+    multipart_fn->enqueue = multipart_enqueue;
+    multipart_fn->respond_message = multipart_respond_message;
+    multipart_fn->respond_status = multipart_respond_status;
+  }
+  
+  fsub->data.shook_hands = 0;
+  
+  fsub->privdata = ngx_palloc(sub->request->pool, sizeof(multipart_privdata_t));
+  multipart_data = (multipart_privdata_t *)fsub->privdata;
+  multipart_data->boundary_end = ngx_snprintf(multipart_data->boundary, 50, "\r\n--%V", nchan_request_multipart_boundary(fsub->sub.request, ctx));
+  
+  //header bufs -- unique per response
+  ctx->output_str_queue = ngx_palloc(r->pool, sizeof(*ctx->output_str_queue));
+  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(headerbuf_t, prev), offsetof(headerbuf_t, next), headerbuf_alloc, NULL, sub->request->pool);
+  
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  nchan_subscriber_common_setup(sub, HTTP_MULTIPART, &sub_name, multipart_fn, 0);
+  return sub;
+}
+
+ngx_int_t nchan_detect_multipart_subscriber_request(ngx_http_request_t *r) {
+  ngx_str_t       *accept_header;
+  if(r->headers_in.accept == NULL) {
+    return 0;
+  }
+  accept_header = &r->headers_in.accept->value;
+
+  if(ngx_strnstr(accept_header->data, "multipart/mixed", accept_header->len)) {
+    return 1;
+  }
+  
+  return 0;
+}
diff --git a/debian/modules/nchan/src/subscribers/http-multipart-mixed.h b/debian/modules/nchan/src/subscribers/http-multipart-mixed.h
new file mode 100644
index 0000000..6a0e097
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/http-multipart-mixed.h
@@ -0,0 +1,3 @@
+subscriber_t *http_multipart_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+
+ngx_int_t nchan_detect_multipart_subscriber_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/http-raw-stream.c b/debian/modules/nchan/src/subscribers/http-raw-stream.c
new file mode 100644
index 0000000..7f8007c
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/http-raw-stream.c
@@ -0,0 +1,150 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <util/nchan_bufchainpool.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:RAWSTREAM:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:RAWSTREAM:" fmt, ##arg)
+#include <assert.h> 
+
+static void rawstream_ensure_headers_sent(full_subscriber_t *fsub) {
+  ngx_http_request_t             *r = fsub->sub.request;
+  //nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  if(!fsub->data.shook_hands) {
+    nchan_cleverly_output_headers_only_for_later_response(r);
+    fsub->data.shook_hands = 1; 
+  }
+}
+
+static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
+  
+  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
+  ngx_buf_t              *buf, *msg_buf = msg->buf;
+  ngx_int_t               rc;
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(fsub->sub.request, ngx_nchan_module);
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  nchan_buf_and_chain_t  *bc;
+  ngx_chain_t            *chain;
+  ngx_file_t             *file_copy;
+  
+  size_t                  separator_len = cf->subscriber_http_raw_stream_separator.len;
+  size_t                  msg_len = ngx_buf_size((msg->buf));
+  
+  
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
+  }
+  
+  if(msg_len + separator_len == 0) {
+    //nothing to output
+    return NGX_OK;
+  }
+  
+  if((bc = nchan_bufchain_pool_reserve(ctx->bcp, (1 + (msg_len > 0 ? 1: 0)))) == NULL) {
+    ERR("cant allocate buf-and-chains for http-raw-stream client output");
+    return NGX_ERROR;
+  }
+  
+  chain = &bc->chain;
+  
+  //message
+  if(msg_len > 0) {
+    buf = chain->buf;
+    *buf = *msg_buf;
+    if(buf->file) {
+      file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
+      nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
+    }
+    buf->last_buf = 0;
+    buf->last_in_chain = 0;
+    buf->flush = 0;
+    
+    chain = chain->next;
+  }
+  
+  //separator 
+  buf = chain->buf;
+  ngx_memzero(buf, sizeof(ngx_buf_t));
+  buf->start = cf->subscriber_http_raw_stream_separator.data;
+  buf->pos = buf->start;
+  buf->end = buf->start + separator_len;
+  buf->last = buf->end;
+  buf->memory = 1;
+  
+  buf->last_buf = 0;
+  buf->last_in_chain = 1;
+  buf->flush = 1;
+  
+  rawstream_ensure_headers_sent(fsub);
+  
+  DBG("%p output msg to subscriber", sub);
+  
+  rc = nchan_output_msg_filter(fsub->sub.request, msg, &bc->chain);
+  
+  return rc;
+}
+
+static ngx_int_t rawstream_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line){
+  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
+  //nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //ignore
+    return NGX_OK;
+  }
+  
+  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line);
+  }
+  
+  subscriber_maybe_dequeue_after_status_response(fsub, status_code);
+
+  return NGX_OK;
+}
+
+static ngx_int_t rawstream_enqueue(subscriber_t *sub) {
+  ngx_int_t           rc;
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  DBG("%p output status to subscriber", sub);
+  rc = longpoll_enqueue(sub);
+  fsub->data.finalize_request = 0;
+  rawstream_ensure_headers_sent(fsub);
+  sub->enqueued = 1;
+  return rc;
+}
+
+static       subscriber_fn_t  rawstream_fn_data;
+static       subscriber_fn_t *rawstream_fn = NULL;
+
+static       ngx_str_t   sub_name = ngx_string("http-raw-stream");
+
+
+subscriber_t *http_raw_stream_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
+  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  
+  if(rawstream_fn == NULL) {
+    rawstream_fn = &rawstream_fn_data;
+    *rawstream_fn = *sub->fn;
+    rawstream_fn->enqueue = rawstream_enqueue;
+    rawstream_fn->respond_message = rawstream_respond_message;
+    rawstream_fn->respond_status = rawstream_respond_status;
+  }
+  
+  fsub->data.shook_hands = 0;
+  r->keepalive=0;
+  
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  nchan_subscriber_common_setup(sub, HTTP_RAW_STREAM, &sub_name, rawstream_fn, 0);
+  return sub;
+}
+
diff --git a/debian/modules/nchan/src/subscribers/http-raw-stream.h b/debian/modules/nchan/src/subscribers/http-raw-stream.h
new file mode 100644
index 0000000..b85530b
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/http-raw-stream.h
@@ -0,0 +1 @@
+subscriber_t *http_raw_stream_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
diff --git a/debian/modules/nchan/src/subscribers/internal.c b/debian/modules/nchan/src/subscribers/internal.c
new file mode 100644
index 0000000..7ead609
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/internal.c
@@ -0,0 +1,275 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "internal.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:INTERNAL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:INTERNAL:" fmt, ##arg)
+
+static const subscriber_t new_internal_sub;
+
+static ngx_int_t empty_callback(ngx_int_t code, void *ptr, void *d) {
+  return NGX_OK;
+}
+
+ngx_int_t internal_subscriber_set_enqueue_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->enqueue = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_dequeue_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->dequeue = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_notify_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->notify = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_respond_message_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->respond_message = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_respond_status_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->respond_status = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_destroy_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->destroy = handler;
+  return NGX_OK;
+}
+
+static ngx_str_t     subscriber_name = ngx_string("internal");
+
+subscriber_t *internal_subscriber_create(ngx_str_t *name, nchan_loc_conf_t *cf, size_t pd_size, void **pd) {
+  internal_subscriber_t               *fsub;
+  /*
+  if(dummy_config_ptr == NULL) {
+    ngx_memzero(&dummy_config, sizeof(dummy_config));
+    dummy_config.buffer_timeout = 0;
+    dummy_config.max_messages = -1;
+    dummy_config_ptr = &dummy_config;
+  }
+  */
+  
+  if((fsub = ngx_alloc(sizeof(*fsub) + pd_size, ngx_cycle->log)) == NULL) {
+    ERR("Unable to allocate");
+    return NULL;
+  }
+  if(pd) {
+    *pd = pd_size > 0 ? &fsub[1] : NULL;
+  }
+  
+  nchan_subscriber_init(&fsub->sub, &new_internal_sub, NULL, NULL);
+  nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->timeout_ev);
+  fsub->sub.cf = cf;
+  fsub->sub.name= (name == NULL ? &subscriber_name : name);
+  
+  fsub->enqueue = empty_callback;
+  fsub->dequeue = empty_callback;
+  fsub->respond_message = empty_callback;
+  fsub->respond_status = empty_callback;
+  fsub->notify = empty_callback;
+  fsub->destroy = empty_callback;
+  
+  DBG("%p create %V with privdata %p", fsub, fsub->sub.name, *pd);
+  fsub->privdata = pd_size == 0 ? NULL : *pd;
+  
+  fsub->already_dequeued = 0;
+  fsub->awaiting_destruction = 0;
+  
+  fsub->dequeue_handler_data = NULL;
+  
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  subscriber_debug_add(&fsub->sub);
+#endif
+  
+  return &fsub->sub;
+}
+
+subscriber_t *internal_subscriber_create_init(ngx_str_t *sub_name, nchan_loc_conf_t *cf, size_t pd_sz, void **pd, callback_pt enqueue, callback_pt dequeue, callback_pt respond_message, callback_pt respond_status, callback_pt notify_handler, callback_pt destroy_handler) {
+  subscriber_t          *sub;
+  
+  if(pd == NULL) {
+    ERR("nowhere to allocate %V subscriber data", sub_name);
+    return NULL;
+  }
+  
+  sub = internal_subscriber_create(sub_name, cf, pd_sz, pd);
+  if(enqueue)
+    internal_subscriber_set_enqueue_handler(sub, enqueue);
+  if(dequeue)
+    internal_subscriber_set_dequeue_handler(sub, dequeue);
+  if(respond_message)
+    internal_subscriber_set_respond_message_handler(sub, respond_message);
+  if(respond_status)
+    internal_subscriber_set_respond_status_handler(sub, respond_status);
+  if(notify_handler)
+    internal_subscriber_set_notify_handler(sub, notify_handler);
+  if(destroy_handler) 
+    internal_subscriber_set_destroy_handler(sub, destroy_handler);
+  return sub;
+}
+
+ngx_int_t internal_subscriber_destroy(subscriber_t *sub) {
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)sub;
+  if(sub->reserved > 0) {
+    DBG("%p not ready to destroy (reserved for %i)", sub, sub->reserved);
+    fsub->awaiting_destruction = 1;
+  }
+  else {
+    DBG("%p (%V) destroy", sub, fsub->sub.name);
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+    subscriber_debug_remove(sub);
+#endif
+    fsub->destroy(NGX_OK, NULL, fsub->privdata);
+    nchan_free_msg_id(&sub->last_msgid);
+    ngx_free(fsub);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t internal_reserve(subscriber_t *self) {
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)self;
+  DBG("%p ) (%V) reserve", self, fsub->sub.name);
+  self->reserved++;
+  return NGX_OK;
+}
+static ngx_int_t internal_release(subscriber_t *sub, uint8_t nodestroy) {
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)sub;
+  DBG("%p (%V) release", sub, fsub->sub.name);
+  sub->reserved--;
+  if(nodestroy == 0 && fsub->awaiting_destruction == 1 && sub->reserved == 0) {
+    DBG("%p (%V) free", sub, fsub->sub.name);
+    fsub->destroy(NGX_OK, NULL, fsub->privdata);
+    nchan_free_msg_id(&sub->last_msgid);
+    ngx_free(fsub);
+    return NGX_ABORT;
+  }
+  else {
+    return NGX_OK;
+  }
+}
+
+void *internal_subscriber_get_privdata(subscriber_t *sub) {
+  internal_subscriber_t               *fsub = (internal_subscriber_t *)sub;
+  return fsub->privdata;
+}
+
+static void reset_timer(internal_subscriber_t *f) {
+  if(f->sub.cf->subscriber_timeout > 0) {
+    if(f->timeout_ev.timer_set) {
+      ngx_del_timer(&f->timeout_ev);
+    }
+    ngx_add_timer(&f->timeout_ev, f->sub.cf->subscriber_timeout * 1000);
+  }
+}
+
+static ngx_int_t internal_enqueue(subscriber_t *self) {
+  internal_subscriber_t   *fsub = (internal_subscriber_t *)self;
+  DBG("%p (%V) enqueue", self, fsub->sub.name);
+  if(self->cf->subscriber_timeout > 0 && !fsub->timeout_ev.timer_set) {
+    //add timeout timer
+    reset_timer(fsub);
+  }
+  fsub->enqueue(fsub->sub.cf->buffer_timeout, NULL, fsub->privdata);
+  self->enqueued = 1;
+  return NGX_OK;
+}
+
+static ngx_int_t internal_dequeue(subscriber_t *self) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  assert(!f->already_dequeued);
+  f->already_dequeued = 1;
+  DBG("%p (%V) dequeue sub", self, f->sub.name);
+  f->dequeue(NGX_OK, NULL, f->privdata);
+  f->dequeue_handler(self, f->dequeue_handler_data);
+  if(self->cf->subscriber_timeout > 0 && f->timeout_ev.timer_set) {
+    ngx_del_timer(&f->timeout_ev);
+  }
+  self->enqueued = 0;
+  if(self->destroy_after_dequeue) {
+    internal_subscriber_destroy(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t dequeue_maybe(subscriber_t *self) {
+  if(self->dequeue_after_response) {
+    self->fn->dequeue(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t internal_respond_message(subscriber_t *self, nchan_msg_t *msg) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  
+  update_subscriber_last_msg_id(self, msg);
+  
+  DBG("%p (%V) respond msg %p", self, f->sub.name, msg);
+  f->respond_message(NGX_OK, msg, f->privdata);
+  reset_timer(f);
+  return dequeue_maybe(self);
+}
+
+static ngx_int_t internal_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  DBG("%p status %i", self, status_code);
+  if(status_code == NGX_HTTP_GONE) {
+    self->dequeue_after_response = 1;
+  }
+  f->respond_status(status_code, (void *)status_line, f->privdata);
+  reset_timer(f);
+  return dequeue_maybe(self);
+}
+
+static ngx_int_t internal_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  if(cb != NULL) {
+    DBG("%p set dequeue handler to %p", self, cb);
+    f->dequeue_handler = cb;
+  }
+  if(privdata != NULL) {
+    DBG("%p set dequeue handler data to %p", self, cb);
+    f->dequeue_handler_data = privdata;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t internal_subscriber_set_name(subscriber_t *self, ngx_str_t *name) {
+  self->name = name;
+  return NGX_OK;
+}
+
+static ngx_int_t internal_notify(subscriber_t *self, ngx_int_t code, void *data) {
+  internal_subscriber_t   *fsub = (internal_subscriber_t *)self;
+  return fsub->notify(code, data, fsub->privdata);
+}
+
+static const subscriber_fn_t internal_sub_fn = {
+  &internal_enqueue,
+  &internal_dequeue,
+  &internal_respond_message,
+  &internal_respond_status,
+  &internal_set_dequeue_callback,
+  &internal_reserve,
+  &internal_release,
+  &internal_notify,
+  &nchan_subscriber_subscribe
+};
+
+static const subscriber_t new_internal_sub = {
+  &subscriber_name,
+  INTERNAL,
+  &internal_sub_fn,
+  UNKNOWN,
+  NCHAN_ZERO_MSGID,
+  NULL,
+  NULL,
+  0, //reserved
+  0, //stick around after response
+  1, //destroy after dequeue
+  0, //enqueued
+
+};
diff --git a/debian/modules/nchan/src/subscribers/internal.h b/debian/modules/nchan/src/subscribers/internal.h
new file mode 100644
index 0000000..eb89a0c
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/internal.h
@@ -0,0 +1,30 @@
+#define NCHAN_DEFAULT_INTERNAL_SUBSCRIBER_POOL_SIZE 1024
+
+typedef struct {
+  subscriber_t            sub;
+  callback_pt             enqueue;
+  callback_pt             dequeue;
+  callback_pt             respond_message;
+  callback_pt             respond_status;
+  callback_pt             notify;
+  callback_pt             destroy;
+  ngx_event_t             timeout_ev;
+  subscriber_callback_pt  dequeue_handler;
+  void                   *dequeue_handler_data;
+  void                   *privdata;
+  unsigned                already_dequeued:1;
+  unsigned                awaiting_destruction:1;
+} internal_subscriber_t;
+
+extern subscriber_t *internal_subscriber_create(ngx_str_t *, nchan_loc_conf_t *cf, size_t pd_sz, void **pd);
+extern ngx_int_t internal_subscriber_destroy(subscriber_t *sub);
+
+subscriber_t *internal_subscriber_create_init(ngx_str_t *sub_name, nchan_loc_conf_t *cf, size_t pd_sz, void **pd, callback_pt enqueue, callback_pt dequeue, callback_pt respond_message, callback_pt respond_status, callback_pt notify_handler, callback_pt destroy_handler);
+ngx_int_t internal_subscriber_set_name(subscriber_t *sub, ngx_str_t *name);
+ngx_int_t internal_subscriber_set_enqueue_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_dequeue_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_notify_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_respond_message_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_respond_status_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_destroy_handler(subscriber_t *sub, callback_pt handler);
+void *internal_subscriber_get_privdata(subscriber_t *sub);
diff --git a/debian/modules/nchan/src/subscribers/intervalpoll.c b/debian/modules/nchan/src/subscribers/intervalpoll.c
new file mode 100644
index 0000000..54537bf
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/intervalpoll.c
@@ -0,0 +1,32 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:INTERVALPOLL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:INTERVALPOLL:" fmt, ##arg)
+#include <assert.h> 
+
+static       ngx_str_t   sub_name = ngx_string("intervalpoll");
+
+subscriber_t *intervalpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub;
+  full_subscriber_t    *fsub;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  sub = longpoll_subscriber_create(r, msg_id);
+  
+  fsub = (full_subscriber_t *)sub;
+  
+  fsub->data.act_as_intervalpoll = 1;
+  
+  sub->name = &sub_name;
+  sub->type = INTERVALPOLL;
+  
+  if(ctx) {
+    ctx->subscriber_type = sub->name;
+  }
+  return sub;
+}
diff --git a/debian/modules/nchan/src/subscribers/intervalpoll.h b/debian/modules/nchan/src/subscribers/intervalpoll.h
new file mode 100644
index 0000000..c493730
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/intervalpoll.h
@@ -0,0 +1 @@
+subscriber_t *intervalpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/longpoll-private.h b/debian/modules/nchan/src/subscribers/longpoll-private.h
new file mode 100644
index 0000000..f388c74
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/longpoll-private.h
@@ -0,0 +1,34 @@
+typedef struct nchan_longpoll_multimsg_s nchan_longpoll_multimsg_t;
+struct nchan_longpoll_multimsg_s {
+  nchan_msg_t                   *msg;
+  nchan_longpoll_multimsg_t     *next;
+};
+
+typedef struct {
+  ngx_http_cleanup_t      *cln;
+  subscriber_callback_pt  dequeue_handler;
+  void                   *dequeue_handler_data;
+  ngx_event_t             timeout_ev;
+  
+  nchan_longpoll_multimsg_t *multimsg_first;
+  nchan_longpoll_multimsg_t *multimsg_last;
+  
+  unsigned                act_as_intervalpoll:1;
+  unsigned                holding:1;
+  unsigned                finalize_request:1;
+  unsigned                already_responded:1;
+  unsigned                awaiting_destruction:1;
+  unsigned                shook_hands:1;
+} subscriber_data_t;
+
+typedef struct {
+  subscriber_t       sub;
+  subscriber_data_t  data;
+  void              *privdata;
+} full_subscriber_t;
+
+ngx_int_t longpoll_enqueue(subscriber_t *self);
+
+void subscriber_maybe_dequeue_after_status_response(full_subscriber_t *fsub, ngx_int_t status_code);
+
+ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line);
diff --git a/debian/modules/nchan/src/subscribers/longpoll.c b/debian/modules/nchan/src/subscribers/longpoll.c
new file mode 100644
index 0000000..99b5492
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/longpoll.c
@@ -0,0 +1,540 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:LONGPOLL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:LONGPOLL:" fmt, ##arg)
+#include <assert.h>
+#include "longpoll-private.h"
+
+#include <store/memory/store.h>
+
+void memstore_fakeprocess_push(ngx_int_t slot);
+void memstore_fakeprocess_push_random(void);
+void memstore_fakeprocess_pop(void);
+ngx_int_t memstore_slot(void);
+
+static const subscriber_t new_longpoll_sub;
+
+static void empty_handler() { }
+
+static void sudden_abort_handler(subscriber_t *sub) {
+#if FAKESHARD
+  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
+  memstore_fakeprocess_push(fsub->sub.owner);
+#endif
+  sub->status = DEAD;
+  sub->fn->dequeue(sub);
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+#endif
+}
+
+//void verify_unique_response(ngx_str_t *uri, nchan_msg_id_t *msgid, nchan_msg_t *msg, subscriber_t *sub);
+
+subscriber_t *longpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  DBG("create for req %p", r);
+  full_subscriber_t      *fsub;
+
+  //TODO: allocate from pool (but not the request's pool)
+  if((fsub = ngx_alloc(sizeof(*fsub), ngx_cycle->log)) == NULL) {
+    ERR("Unable to allocate");
+    assert(0);
+    return NULL;
+  }
+  
+  nchan_subscriber_init(&fsub->sub, &new_longpoll_sub, r, msg_id);
+  fsub->privdata = NULL;
+  fsub->data.cln = NULL;
+  fsub->data.finalize_request = 1;
+  fsub->data.holding = 0;
+  fsub->data.act_as_intervalpoll = 0;
+  
+  nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->data.timeout_ev);
+  
+  fsub->data.dequeue_handler = empty_handler;
+  fsub->data.dequeue_handler_data = NULL;
+  fsub->data.already_responded = 0;
+  fsub->data.awaiting_destruction = 0;
+  
+  if(fsub->sub.cf->longpoll_multimsg) {
+    nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+    fsub->sub.dequeue_after_response = 0;
+    ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+    nchan_bufchain_pool_init(ctx->bcp, r->pool);
+
+  }
+  
+  fsub->data.multimsg_first = NULL;
+  fsub->data.multimsg_last = NULL;
+  
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  subscriber_debug_add(&fsub->sub);
+  //set debug label
+  fsub->sub.lbl = ngx_calloc(r->uri.len+1, ngx_cycle->log);
+  ngx_memcpy(fsub->sub.lbl, r->uri.data, r->uri.len);
+#endif
+  
+  //http request sudden close cleanup
+  if((fsub->data.cln = ngx_http_cleanup_add(r, 0)) == NULL) {
+    ERR("Unable to add request cleanup for longpoll subscriber");
+    assert(0);
+    return NULL;
+  }
+  fsub->data.cln->data = fsub;
+  fsub->data.cln->handler = (ngx_http_cleanup_pt )sudden_abort_handler;
+  DBG("%p created for request %p", &fsub->sub, r);
+  
+  
+  return &fsub->sub;
+}
+
+ngx_int_t longpoll_subscriber_destroy(subscriber_t *sub) {
+  full_subscriber_t   *fsub = (full_subscriber_t  *)sub;
+  
+  if(sub->reserved > 0) {
+    DBG("%p not ready to destroy (reserved for %i) for req %p", sub, sub->reserved, fsub->sub.request);
+    fsub->data.awaiting_destruction = 1;
+  }
+  else {
+    DBG("%p destroy for req %p", sub, fsub->sub.request);
+    nchan_free_msg_id(&fsub->sub.last_msgid);
+    assert(sub->status == DEAD);
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+    subscriber_debug_remove(sub);
+    ngx_free(sub->lbl);
+    ngx_memset(fsub, 0xB9, sizeof(*fsub)); //debug
+#endif
+    ngx_free(fsub);
+  }
+  return NGX_OK;
+}
+
+static void ensure_request_hold(full_subscriber_t *fsub) {
+  if(fsub->data.holding == 0) {
+    DBG("hodl request %p", fsub->sub.request);
+    fsub->data.holding = 1;
+    fsub->sub.request->read_event_handler = ngx_http_test_reading;
+    fsub->sub.request->write_event_handler = ngx_http_request_empty_handler;
+    fsub->sub.request->main->count++; //this is the right way to hold and finalize the request... maybe
+  }
+}
+
+static ngx_int_t longpoll_reserve(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  ensure_request_hold(fsub);
+  self->reserved++;
+  DBG("%p reserve for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
+  return NGX_OK;
+}
+static ngx_int_t longpoll_release(subscriber_t *self, uint8_t nodestroy) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  assert(self->reserved > 0);
+  self->reserved--;
+  DBG("%p release for req %p. reservations: %i", self, fsub->sub.request, self->reserved);
+  if(nodestroy == 0 && fsub->data.awaiting_destruction == 1 && self->reserved == 0) {
+    longpoll_subscriber_destroy(self);
+    return NGX_ABORT;
+  }
+  else {
+    return NGX_OK;
+  }
+}
+
+ngx_int_t longpoll_enqueue(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  assert(fsub->sub.enqueued == 0);
+  DBG("%p enqueue", self);
+  
+  fsub->data.finalize_request = 1;
+  
+  fsub->sub.enqueued = 1;
+  ensure_request_hold(fsub);
+  if(self->cf->subscriber_timeout > 0) {
+    //add timeout timer
+    ngx_add_timer(&fsub->data.timeout_ev, self->cf->subscriber_timeout * 1000);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t longpoll_dequeue(subscriber_t *self) {
+  full_subscriber_t    *fsub = (full_subscriber_t  *)self;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+  }
+  DBG("%p dequeue", self);
+  fsub->data.dequeue_handler(self, fsub->data.dequeue_handler_data);
+  self->enqueued = 0;
+  
+  ctx->sub = NULL;
+  
+  if(fsub->data.finalize_request) {
+    DBG("finalize request %p", fsub->sub.request);
+    ngx_http_finalize_request(fsub->sub.request, NGX_OK);
+    self->status = DEAD;
+  }
+  
+  if(self->destroy_after_dequeue) {
+    longpoll_subscriber_destroy(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t dequeue_maybe(subscriber_t *self) {
+  if(self->dequeue_after_response) {
+    self->fn->dequeue(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t abort_response(subscriber_t *sub, char *errmsg) {
+  ERR("abort! %s", errmsg ? errmsg : "unknown error");
+  dequeue_maybe(sub);
+  return NGX_ERROR;
+}
+
+static ngx_int_t longpoll_multipart_add(full_subscriber_t *fsub, nchan_msg_t *msg, char **err) {
+  
+  nchan_longpoll_multimsg_t     *mmsg;
+  
+  if((mmsg = ngx_palloc(fsub->sub.request->pool, sizeof(*mmsg))) == NULL) {
+    *err = "can't allocate multipart msg link";
+    return NGX_ERROR;
+  }
+  
+  if(msg->shared) {
+    msg_reserve(msg, "longpoll multipart");
+  }
+  else if(msg->id.tagcount > 1) {
+    //msg from a multiplexed channel
+    assert(!msg->shared && !msg->temp_allocd);
+    nchan_msg_copy_t *cmsg;
+    if((cmsg = ngx_palloc(fsub->sub.request->pool, sizeof(*cmsg))) == NULL) {
+      *err = "can't allocate msgcopy for message from multiplexed channel";
+      return NGX_ERROR;
+      
+    }
+    //  multiplexed channel message should have been created as a nchan_msg_copy_t
+    *cmsg = *(nchan_msg_copy_t *)msg;
+    
+    cmsg->copy.temp_allocd = 1;
+    
+    assert(cmsg->original->shared);
+    msg_reserve(cmsg->original, "longpoll multipart for multiplexed channel");
+    msg = &cmsg->copy;
+  }
+  else {
+    assert(0); //this is not yet an expected scenario;
+  }
+  
+  mmsg->msg = msg;
+  mmsg->next = NULL;
+  if(fsub->data.multimsg_first == NULL) {
+    fsub->data.multimsg_first = mmsg;
+  }
+  if(fsub->data.multimsg_last) {
+    fsub->data.multimsg_last->next = mmsg;
+  }
+  fsub->data.multimsg_last = mmsg;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t longpoll_respond_message(subscriber_t *self, nchan_msg_t *msg) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  ngx_int_t                  rc;
+  char                      *err = NULL;
+  ngx_http_request_t        *r = fsub->sub.request;
+  nchan_request_ctx_t       *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  nchan_loc_conf_t          *cf = fsub->sub.cf;
+  
+  DBG("%p respond req %p msg %p", self, r, msg);
+  
+  ctx->prev_msg_id = self->last_msgid;
+  update_subscriber_last_msg_id(self, msg);
+  ctx->msg_id = self->last_msgid;
+
+  //verify_unique_response(&fsub->data.request->uri, &self->last_msgid, msg, self);
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+  }
+  if(!cf->longpoll_multimsg) {
+    //disable abort handler
+    fsub->data.cln->handler = empty_handler;
+    
+    assert(fsub->data.already_responded != 1);
+    fsub->data.already_responded = 1;
+    if((rc = nchan_respond_msg(r, msg, &self->last_msgid, 0, &err)) != NGX_OK) {
+      return abort_response(self, err);
+    }
+  }
+  else {
+    if((rc = longpoll_multipart_add(fsub, msg, &err)) != NGX_OK) {
+      return abort_response(self, err);
+    }
+  }
+  dequeue_maybe(self);
+  return rc;
+}
+
+static void multipart_request_cleanup_handler(nchan_longpoll_multimsg_t *first) {
+  nchan_longpoll_multimsg_t    *cur;
+  nchan_msg_copy_t             *cmsg;
+  for(cur = first; cur != NULL; cur = cur->next) {
+    if(cur->msg->shared) {
+      msg_release(cur->msg, "longpoll multipart");
+    }
+    else if(cur->msg->id.tagcount > 1) {
+      assert(!cur->msg->shared && cur->msg->temp_allocd);
+      // multiplexed channel message should have been created as a nchan_msg_copy_t
+      cmsg = (nchan_msg_copy_t *)cur->msg;
+      
+      assert(cmsg->original->shared);
+      msg_release(cmsg->original, "longpoll multipart for multiplexed channel");
+    }
+    else {
+      assert(0);
+    }
+  }
+}
+
+static ngx_int_t longpoll_multipart_respond(full_subscriber_t *fsub) {
+  ngx_http_request_t    *r = fsub->sub.request;
+  nchan_request_ctx_t   *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  char                  *err;
+  ngx_int_t              rc;
+  u_char                *char_boundary = NULL;
+  u_char                *char_boundary_last;
+  
+  ngx_buf_t              boundary[3]; //first, mid, and last boundary
+  ngx_buf_t              newline_buf;
+  ngx_chain_t           *chain, *first_chain = NULL, *last_chain = NULL;
+  ngx_buf_t             *buf;
+  ngx_buf_t              double_newline_buf;
+  ngx_str_t             *content_type;
+  size_t                 size = 0;
+  nchan_loc_conf_t      *cf = fsub->sub.cf;
+  int                    use_raw_stream_separator = cf->longpoll_multimsg_use_raw_stream_separator;
+  nchan_buf_and_chain_t *bc;
+  
+  nchan_longpoll_multimsg_t *first, *cur;
+  
+  //disable abort handler
+  fsub->data.cln->handler = empty_handler;
+  
+  first = fsub->data.multimsg_first;
+  
+  fsub->sub.dequeue_after_response = 1;
+  
+  //cleanup to release msgs
+  fsub->data.cln = ngx_http_cleanup_add(fsub->sub.request, 0);
+  fsub->data.cln->data = first;
+  fsub->data.cln->handler = (ngx_http_cleanup_pt )multipart_request_cleanup_handler;
+  
+  if(fsub->data.multimsg_first == fsub->data.multimsg_last) {
+    //just one message.
+    if((rc = nchan_respond_msg(r, fsub->data.multimsg_first->msg, &fsub->sub.last_msgid, 0, &err)) != NGX_OK) {
+      return abort_response(&fsub->sub, err);
+    }
+    return NGX_OK;
+  }
+  
+  //multi messages
+  if(!use_raw_stream_separator) {
+    nchan_request_set_content_type_multipart_boundary_header(r, ctx);
+    char_boundary = ngx_palloc(r->pool, 50);
+    char_boundary_last = ngx_snprintf(char_boundary, 50, ("\r\n--%V--\r\n"), nchan_request_multipart_boundary(r, ctx));
+    
+    ngx_init_set_membuf_char(&double_newline_buf, "\r\n\r\n");
+    
+    //set up the boundaries
+    ngx_init_set_membuf(&boundary[0], &char_boundary[2], &char_boundary_last[-4]);
+    ngx_init_set_membuf(&boundary[1], &char_boundary[0], &char_boundary_last[-4]);
+    ngx_init_set_membuf(&boundary[2], &char_boundary[0], char_boundary_last);
+    
+    ngx_init_set_membuf_char(&newline_buf, "\n");
+  }
+  
+  int n=0;
+  
+  for(cur = first; cur != NULL; cur = cur->next) {
+    bc = nchan_bufchain_pool_reserve(ctx->bcp, 4);
+    chain = &bc->chain;
+    n++;
+    
+    if(last_chain) {
+      last_chain->next = chain;
+    }
+    if(!first_chain) {
+      first_chain = chain;
+    }
+    if(!use_raw_stream_separator) {
+      // each buffer needs to be unique for the purpose of dealing with nginx output guts
+      // (something about max. 64 iovecs per write call and counting the number of bytes already sent)
+      *chain->buf = cur == first ? boundary[0] : boundary[1];
+      size += ngx_buf_size((chain->buf));
+      chain = chain->next;
+      
+      content_type = &cur->msg->content_type;
+      buf = chain->buf;
+      if (content_type->data != NULL) {
+        u_char    *char_cur = ngx_pcalloc(r->pool, content_type->len + 25);
+        ngx_init_set_membuf(buf, char_cur, ngx_snprintf(char_cur, content_type->len + 25, "\r\nContent-Type: %V\r\n\r\n", content_type));
+      }
+      else {
+        *buf = double_newline_buf;
+      }
+      size += ngx_buf_size(buf);
+      chain = chain->next;
+    }
+      
+    if(ngx_buf_size(cur->msg->buf) > 0) {
+      buf = chain->buf;
+      *buf = *cur->msg->buf;
+      
+      if(buf->file) {
+        ngx_file_t  *file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
+        nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
+      }
+      buf->last_buf = 0;
+      size += ngx_buf_size(buf);
+    }
+    
+    if(use_raw_stream_separator) {
+      chain = chain->next;
+      ngx_init_set_membuf_str(chain->buf, &cf->subscriber_http_raw_stream_separator);
+      size += ngx_buf_size((chain->buf));
+    }
+    else {
+      if(cur->next == NULL) {
+        chain = chain->next;
+        chain->buf = &boundary[2];
+        size += ngx_buf_size((chain->buf));
+      }
+    }
+    last_chain = chain;
+  }
+    
+  buf = last_chain->buf;
+  buf->last_buf = 1;
+  buf->last_in_chain = 1;
+  buf->flush = 1;
+  last_chain->next = NULL;
+    
+  r->headers_out.status = NGX_HTTP_OK;
+  r->headers_out.content_length_n = size;
+  nchan_set_msgid_http_response_headers(r, ctx, &fsub->data.multimsg_last->msg->id);
+  nchan_include_access_control_if_needed(r, ctx);
+  ngx_http_send_header(r);
+  nchan_output_filter(r, first_chain);
+  
+  
+  return NGX_OK;
+}
+
+static ngx_int_t longpoll_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line) {
+  
+  full_subscriber_t     *fsub = (full_subscriber_t *)self;
+  ngx_http_request_t    *r = fsub->sub.request;
+  nchan_loc_conf_t      *cf = fsub->sub.cf;
+  
+  //DBG("%p got status %i", self, status_code);
+  
+  if(fsub->data.act_as_intervalpoll) {
+    if(status_code == NGX_HTTP_NO_CONTENT || status_code == NGX_HTTP_NOT_MODIFIED || status_code == NGX_HTTP_NOT_FOUND ) {
+      status_code = NGX_HTTP_NOT_MODIFIED;
+    }
+  }
+  else if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    if(cf->longpoll_multimsg) {
+      if(fsub->data.multimsg_first != NULL) {
+        longpoll_multipart_respond(fsub);
+        dequeue_maybe(self);
+      }
+      return NGX_OK;
+    }
+    else { 
+      //don't care, ignore
+      return NGX_OK;
+    }
+  }
+  
+  DBG("%p respond req %p status %i", self, r, status_code);
+  
+  fsub->sub.dequeue_after_response = 1;
+  
+  nchan_set_msgid_http_response_headers(r, NULL, &self->last_msgid);
+  
+  //disable abort handler
+  fsub->data.cln->handler = empty_handler;
+  
+  nchan_respond_status(r, status_code, status_line, 0);
+
+  dequeue_maybe(self);
+  return NGX_OK;
+}
+
+ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line) {
+  ngx_http_request_t     *r = fsub->sub.request;
+  fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
+  fsub->data.finalize_request = 0;
+  fsub->sub.status = DEAD;
+  fsub->sub.fn->dequeue(&fsub->sub);
+  return nchan_respond_status(r, status_code, status_line, 1);
+}
+
+void subscriber_maybe_dequeue_after_status_response(full_subscriber_t *fsub, ngx_int_t status_code) {
+  if((status_code >=400 && status_code < 600) || status_code == NGX_HTTP_NOT_MODIFIED) {
+    fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
+    fsub->sub.request->keepalive=0;
+    fsub->data.finalize_request=1;
+    fsub->sub.fn->dequeue(&fsub->sub);
+  }
+}
+
+static void request_cleanup_handler(subscriber_t *sub) {
+
+}
+
+
+static ngx_int_t longpoll_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  if(fsub->data.cln == NULL) {
+    fsub->data.cln = ngx_http_cleanup_add(fsub->sub.request, 0);
+    fsub->data.cln->data = self;
+    fsub->data.cln->handler = (ngx_http_cleanup_pt )request_cleanup_handler;
+  }
+  fsub->data.dequeue_handler = cb;
+  fsub->data.dequeue_handler_data = privdata;
+  return NGX_OK;
+}
+
+static const subscriber_fn_t longpoll_fn = {
+  &longpoll_enqueue,
+  &longpoll_dequeue,
+  &longpoll_respond_message,
+  &longpoll_respond_status,
+  &longpoll_set_dequeue_callback,
+  &longpoll_reserve,
+  &longpoll_release,
+  &nchan_subscriber_empty_notify,
+  &nchan_subscriber_authorize_subscribe
+};
+
+static ngx_str_t  sub_name = ngx_string("longpoll");
+
+static const subscriber_t new_longpoll_sub = {
+  &sub_name,
+  LONGPOLL,
+  &longpoll_fn,
+  UNKNOWN,
+  NCHAN_ZERO_MSGID,
+  NULL,
+  NULL,
+  0, //reservations
+  1, //deque after response
+  1, //destroy after dequeue
+  0, //enqueued
+};
diff --git a/debian/modules/nchan/src/subscribers/longpoll.h b/debian/modules/nchan/src/subscribers/longpoll.h
new file mode 100644
index 0000000..65509ed
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/longpoll.h
@@ -0,0 +1,2 @@
+subscriber_t *longpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+ngx_int_t longpoll_subscriber_destroy(subscriber_t *sub);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/memstore_ipc.c b/debian/modules/nchan/src/subscribers/memstore_ipc.c
new file mode 100644
index 0000000..a84f974
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/memstore_ipc.c
@@ -0,0 +1,167 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <store/memory/ipc.h>
+#include <store/memory/store-private.h>
+#include <store/memory/ipc-handlers.h>
+#include "internal.h"
+#include "memstore_ipc.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MEM-IPC:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-IPC:" fmt, ##arg)
+
+
+typedef struct sub_data_s sub_data_t;
+
+struct sub_data_s {
+  subscriber_t                 *sub;
+  ngx_str_t                    *chid;
+  ngx_int_t                     originator;
+  ngx_int_t                     owner;
+  void                         *foreign_chanhead;
+  ngx_event_t                   timeout_ev;
+}; //sub_data_t
+
+static ngx_int_t empty_callback(){
+  return NGX_OK;
+}
+
+static ngx_int_t sub_enqueue(ngx_int_t timeout, void *ptr, sub_data_t *d) {
+  DBG("%p (%V) memstore subsriber enqueued ok", d->sub, d->chid);
+  return NGX_OK;
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  ngx_int_t           ret;
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)d->sub;
+  DBG("%p (%V) memstore subscriber dequeue: notify owner", d->sub, d->chid);
+  if(d->timeout_ev.timer_set) {
+    ngx_del_timer(&d->timeout_ev);
+  }
+  ret = memstore_ipc_send_unsubscribed(d->originator, d->chid, NULL);
+  
+  if(fsub->sub.reserved > 0) {
+    DBG("%p (%V) not ready to destroy (reserved for %i)", fsub, d->chid, fsub->sub.reserved);
+    fsub->awaiting_destruction = 1;
+  }
+  else {
+    DBG("%p (%V) destroy", fsub, d->chid);
+  }
+  
+  return ret;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
+  ngx_int_t               rc;
+  nchan_msg_t            *msg = (nchan_msg_t *) ptr;
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)d->sub;
+  
+  //DBG("%p (%V) memstore subscriber (lastid %V) respond with message %V (lastid %V)", d->sub, d->chid, msgid_to_str(&d->sub->last_msg_id), msgid_to_str(&msg->id), msgid_to_str(&msg->prev_id));
+  
+  //update_subscriber_last_msg_id(d->sub, msg);
+  
+  rc = memstore_ipc_send_publish_message(d->originator, d->chid, msg, d->sub->cf, empty_callback, NULL);
+  
+  //no multi-ids allowed here
+  assert(msg->id.tagcount == 1);
+    
+  fsub->sub.last_msgid = msg->id;
+  
+  return rc;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  const ngx_str_t   *status_line = (const ngx_str_t *)ptr;
+  if((status == NGX_HTTP_NO_CONTENT || status == NGX_HTTP_NOT_MODIFIED) && !status_line) {
+    //don't care, ignore
+    return NGX_OK;
+  }
+  
+  if(!ptr) {
+    switch(status) {
+      case NGX_HTTP_GONE: //delete
+        status_line = &NCHAN_HTTP_STATUS_410;
+        break;
+      case NGX_HTTP_CONFLICT:
+        status_line = &NCHAN_HTTP_STATUS_409;
+        break;
+      case NGX_HTTP_NO_CONTENT:
+        assert(0);
+        break;
+      case NGX_HTTP_CLOSE: //delete
+        break;
+      case NGX_HTTP_NOT_MODIFIED: //timeout?
+        break;
+      case NGX_HTTP_FORBIDDEN:
+        break;
+      default:
+        ERR("unknown status %i", status);
+    }
+  }
+  return memstore_ipc_send_publish_status(d->originator, d->chid, status, status_line, empty_callback, NULL);
+}
+static void reset_timer(sub_data_t *data) {
+  if(data->timeout_ev.timer_set) {
+    ngx_del_timer(&data->timeout_ev);
+  }
+  ngx_add_timer(&data->timeout_ev, MEMSTORE_IPC_SUBSCRIBER_TIMEOUT * 1000);
+}
+
+
+static ngx_int_t keepalive_reply_handler(ngx_int_t renew, void *_, void* pd) {
+  sub_data_t *d = (sub_data_t *)pd;
+  DBG("%p (%V) keepalive reply - renew: %i.", d->sub, d->chid, renew);
+  if(d->sub->fn->release(d->sub, 0) == NGX_OK) {
+    if(renew) {
+      reset_timer(d);
+    }
+    else {
+      d->sub->fn->dequeue(d->sub);
+    }
+  }
+  return NGX_OK;
+}
+
+static void timeout_ev_handler(ngx_event_t *ev) {
+  sub_data_t *d = (sub_data_t *)ev->data;
+#if FAKESHARD
+  memstore_fakeprocess_push(d->owner);
+#endif
+  DBG("%p (%V), timeout event. Ping originator to see if still needed.", d->sub, d->chid);
+  d->sub->fn->reserve(d->sub);
+  memstore_ipc_send_memstore_subscriber_keepalive(d->originator, d->chid, d->sub, d->foreign_chanhead, keepalive_reply_handler, d);
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+#endif
+}
+
+static ngx_str_t  sub_name = ngx_string("memstore-ipc");
+
+subscriber_t *memstore_ipc_subscriber_create(ngx_int_t originator_slot, ngx_str_t *chid, nchan_loc_conf_t *cf, void* foreign_chanhead) { //, nchan_channel_head_t *local_chanhead) {
+  static  nchan_msg_id_t      newest_msgid = NCHAN_NEWEST_MSGID;
+  sub_data_t                 *d;
+  subscriber_t               *sub;
+  
+  assert(originator_slot != memstore_slot());
+  sub = internal_subscriber_create_init(&sub_name, cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, NULL, NULL);
+  
+  sub->last_msgid = newest_msgid;
+  sub->destroy_after_dequeue = 1;
+  d->sub = sub;
+  d->chid = chid;
+  d->originator = originator_slot;
+  assert(foreign_chanhead != NULL);
+  d->foreign_chanhead = foreign_chanhead;
+  //d->chanhead = local_chanhead;
+  d->owner = memstore_slot();
+
+  ngx_memzero(&d->timeout_ev, sizeof(d->timeout_ev));
+  nchan_init_timer(&d->timeout_ev, timeout_ev_handler, d);
+
+  reset_timer(d);
+  DBG("%p (%V) memstore-ipc subscriber created with privdata %p", d->sub, d->chid, d);
+  return sub;
+}
diff --git a/debian/modules/nchan/src/subscribers/memstore_ipc.h b/debian/modules/nchan/src/subscribers/memstore_ipc.h
new file mode 100644
index 0000000..d388ed6
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/memstore_ipc.h
@@ -0,0 +1,2 @@
+#define MEMSTORE_IPC_SUBSCRIBER_TIMEOUT 5
+subscriber_t *memstore_ipc_subscriber_create(ngx_int_t originator_slot, ngx_str_t *chid, nchan_loc_conf_t *cf, void* foreign_chanhead);
diff --git a/debian/modules/nchan/src/subscribers/memstore_multi.c b/debian/modules/nchan/src/subscribers/memstore_multi.c
new file mode 100644
index 0000000..a9d64c6
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/memstore_multi.c
@@ -0,0 +1,179 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <store/memory/ipc.h>
+#include <store/memory/store-private.h>
+#include <store/memory/ipc-handlers.h>
+
+#include <store/memory/store.h>
+#include <store/redis/store.h>
+
+#include "internal.h"
+#include "memstore_multi.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MEM-MULTI:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-MULTI:" fmt, ##arg)
+
+
+typedef struct {
+  memstore_channel_head_t      *target_chanhead;
+  memstore_channel_head_t      *multi_chanhead;
+  memstore_multi_t             *multi;
+  ngx_int_t                     n;
+} sub_data_t;
+
+/*
+static ngx_int_t empty_callback(){
+  return NGX_OK;
+}
+*/
+
+static void change_sub_count(memstore_channel_head_t *ch, ngx_int_t n) {
+  ch->total_sub_count += n;
+  ch->channel.subscribers += n;
+  if(ch->shared) {
+    ngx_atomic_fetch_add(&ch->shared->sub_count, n);
+  }
+  if(ch->cf->redis.enabled) {
+    memstore_fakesub_add(ch, n);
+  }
+}
+
+static ngx_int_t sub_enqueue(ngx_int_t timeout, void *ptr, sub_data_t *d) {
+  DBG("%p enqueued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  assert(d->multi_chanhead->multi_waiting > 0);
+  d->multi_chanhead->multi_waiting --;
+  if(d->multi_chanhead->multi_waiting == 0) {
+    memstore_ready_chanhead_unless_stub(d->multi_chanhead);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  DBG("%p dequeued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  d->multi_chanhead->status = WAITING;
+  d->multi_chanhead->multi_waiting++;
+  d->multi->sub = NULL;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, nchan_msg_t *msg, sub_data_t* d) {
+  nchan_msg_copy_t  remsg;
+  //nchan_msg_id_t   *last_msgid;
+  ngx_int_t         mcount;
+  
+  int16_t          tags[NCHAN_MULTITAG_MAX], prevtags[NCHAN_MULTITAG_MAX];
+  
+  //remsg = ngx_alloc(sizeof(*remsg), ngx_cycle->log);
+  //assert(remsg);
+  
+  assert( msg->id.tagcount == 1 );
+  assert( msg->prev_id.tagcount == 1 );
+  
+  remsg.original = msg;
+  
+  remsg.copy = *msg;
+  remsg.copy.shared = 0;
+  remsg.copy.temp_allocd = 0;
+  
+  mcount = d->multi_chanhead->multi_count;
+  
+  remsg.copy.prev_id.tagcount = mcount;
+  remsg.copy.prev_id.tagactive = d->n;
+  
+  remsg.copy.id.tagcount = mcount;
+  remsg.copy.id.tagactive = d->n;
+  
+  if(mcount > NCHAN_FIXED_MULTITAG_MAX) {
+    remsg.copy.id.tag.allocd = tags;
+    tags[0]=msg->id.tag.fixed[0];
+    remsg.copy.prev_id.tag.allocd = prevtags;
+    prevtags[0]=msg->prev_id.tag.fixed[0];
+  }
+  
+  
+  nchan_expand_msg_id_multi_tag(&remsg.copy.prev_id, 0, d->n, -1);
+  nchan_expand_msg_id_multi_tag(&remsg.copy.id, 0, d->n, -1);
+  
+  memstore_ensure_chanhead_is_ready(d->multi_chanhead, 1);
+  
+  DBG("%p respond with transformed message %p %V (%p %V %i) %V", d->multi->sub, &remsg.copy, msgid_to_str(&remsg.copy.id), d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  
+  nchan_memstore_publish_generic(d->multi_chanhead, &remsg.copy, 0, NULL);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  DBG("%p subscriber respond with status (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  switch(status) {
+    case NGX_HTTP_GONE: //delete
+    case NGX_HTTP_CLOSE: //delete
+      nchan_memstore_publish_generic(d->multi_chanhead, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+      //nchan_store_memory.delete_channel(d->chid, NULL, NULL);
+      //TODO: change status to NOTREADY and whatnot
+      break;
+    
+    case NGX_HTTP_CONFLICT:
+      nchan_memstore_publish_generic(d->multi_chanhead, NULL, NGX_HTTP_CONFLICT, &NCHAN_HTTP_STATUS_410);
+      break;
+    
+    default:
+      //meh, no big deal.
+      break;
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_notify_handler(ngx_int_t code, void *data, sub_data_t *d) {
+  if(code == NCHAN_SUB_MULTI_NOTIFY_ADDSUB) {
+    change_sub_count(d->target_chanhead, (ngx_int_t )data);
+  }
+  return NGX_OK;
+}
+
+static ngx_str_t  sub_name = ngx_string("memstore-multi");
+
+subscriber_t *memstore_multi_subscriber_create(memstore_channel_head_t *chanhead, uint8_t n) {
+  static nchan_msg_id_t        latest_msgid = NCHAN_NEWEST_MSGID;
+  sub_data_t                  *d;
+  memstore_channel_head_t     *target_ch;
+  ngx_int_t                    multi_subs;
+  subscriber_t                *sub;
+  
+  if((target_ch = nchan_memstore_get_chanhead(&chanhead->multi[n].id, chanhead->cf))==NULL) {
+    return NULL;
+  }
+  
+  assert(chanhead->cf);
+  
+  sub = internal_subscriber_create_init(&sub_name, chanhead->cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_notify_handler, NULL);
+  
+  sub->last_msgid = latest_msgid;
+  
+  sub->destroy_after_dequeue = 1;
+  sub->dequeue_after_response = 0;
+
+  d->multi = &chanhead->multi[n];
+  d->multi->sub = sub;
+  d->multi_chanhead = chanhead;
+  d->n = n;
+  chanhead->multi_waiting++;  
+
+  target_ch->spooler.fn->add(&target_ch->spooler, sub);
+  
+  multi_subs = chanhead->shared->sub_count;
+  
+  d->target_chanhead = target_ch;
+  
+  change_sub_count(target_ch, multi_subs);
+  
+  DBG("%p created with privdata %p", d->multi->sub, d);
+  return sub;
+}
diff --git a/debian/modules/nchan/src/subscribers/memstore_multi.h b/debian/modules/nchan/src/subscribers/memstore_multi.h
new file mode 100644
index 0000000..d735598
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/memstore_multi.h
@@ -0,0 +1,2 @@
+#define NCHAN_SUB_MULTI_NOTIFY_ADDSUB 0
+subscriber_t *memstore_multi_subscriber_create(memstore_channel_head_t *chanhead, uint8_t n);
diff --git a/debian/modules/nchan/src/subscribers/memstore_redis.c b/debian/modules/nchan/src/subscribers/memstore_redis.c
new file mode 100644
index 0000000..0bbd4cf
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/memstore_redis.c
@@ -0,0 +1,251 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+
+#include <store/memory/ipc.h>
+#include <store/memory/store-private.h>
+#include <store/memory/ipc-handlers.h>
+#include <store/memory/store.h>
+
+#include <store/redis/store.h>
+#include <store/redis/store-private.h>
+
+#include <util/nchan_msgid.h>
+#include "internal.h"
+#include "memstore_redis.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MEM-REDIS:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-REDIS:" fmt, ##arg)
+
+
+typedef struct msgexpected_callback_llist_s msgexpected_callback_llist_t;
+struct msgexpected_callback_llist_s {
+  void                         (*cb)(nchan_msg_status_t, void *);
+  msgexpected_callback_llist_t  *next;
+};
+
+typedef struct sub_data_s sub_data_t;
+
+struct sub_data_s {
+  subscriber_t                 *sub;
+  memstore_channel_head_t      *chanhead;
+  ngx_str_t                    *chid;
+  ngx_event_t                   timeout_ev;
+  nchan_msg_status_t            last_msg_status;
+  msgexpected_callback_llist_t *waiting_for_msg_expected;
+  sub_data_t                  **onconnect_callback_pd;
+}; //sub_data_t
+
+/*
+static ngx_int_t empty_callback(){
+  return NGX_OK;
+}
+*/
+
+static void respond_msgexpected_callbacks(sub_data_t *d, nchan_msg_status_t status) {
+  msgexpected_callback_llist_t    *cur, *next;
+  cur = d->waiting_for_msg_expected;
+  d->waiting_for_msg_expected = NULL;
+  for(; cur != NULL; cur = next) {
+    next = cur->next;
+    cur->cb(status, &cur[1]);
+    ngx_free(cur);
+  }
+}
+
+static ngx_int_t sub_enqueue(ngx_int_t timeout, void *ptr, sub_data_t *d) {
+  DBG("%p memstore-redis subsriber enqueued ok", d->sub);
+  
+  d->chanhead->status = READY;
+  d->chanhead->spooler.fn->handle_channel_status_change(&d->chanhead->spooler);
+  
+  return NGX_OK;
+}
+
+ngx_int_t memstore_redis_subscriber_destroy(subscriber_t *sub) {
+  DBG("%p destroy", sub);
+  return internal_subscriber_destroy(sub);
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  DBG("%p dequeue", d->sub);
+  respond_msgexpected_callbacks(d, MSG_NORESPONSE);
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
+  nchan_msg_t       *msg = (nchan_msg_t *) ptr;
+  nchan_loc_conf_t   cf;
+  nchan_msg_id_t    *lastid;    
+  DBG("%p memstore-redis subscriber respond with message", d->sub);
+
+  cf.max_messages = d->chanhead->max_messages;
+  cf.redis.enabled = 0;
+  cf.buffer_timeout = msg->expires - ngx_time();
+  
+  lastid = &d->chanhead->latest_msgid;
+  
+  respond_msgexpected_callbacks(d, MSG_NORESPONSE);
+  
+  assert(lastid->tagcount == 1 && msg->id.tagcount == 1);
+  if(lastid->time < msg->id.time || 
+    (lastid->time == msg->id.time && lastid->tag.fixed[0] < msg->id.tag.fixed[0])) {
+    memstore_ensure_chanhead_is_ready(d->chanhead, 1);
+    nchan_store_chanhead_publish_message_generic(d->chanhead, msg, 0, &cf, NULL, NULL);
+  }
+  else {
+    //meh, this message has already been delivered probably hopefully
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_destroy_handler(ngx_int_t status, void *d, sub_data_t *pd) {
+  DBG("%p sub_destroy_handler", pd->sub);
+  if(pd->onconnect_callback_pd)
+    (*pd->onconnect_callback_pd) = NULL;
+  return NGX_OK;
+}
+
+static ngx_int_t reconnect_callback(ngx_int_t status, void *d, void *pd) {
+  sub_data_t *sd = *((sub_data_t **) pd);
+  if(sd) {
+    DBG("%reconnect callback");
+    assert(sd->chanhead->redis_sub == sd->sub);
+    assert(&sd->chanhead->id == sd->chid);
+    nchan_store_redis.subscribe(sd->chid, sd->chanhead->redis_sub);
+    sd->onconnect_callback_pd = NULL;
+    sd->sub->dequeue_after_response = 0;
+    ((internal_subscriber_t *)sd->sub)->already_dequeued = 0;
+    ngx_free(pd);
+  }
+  else {
+    DBG("%reconnect callback skipped");
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  nchan_loc_conf_t  fake_cf;
+  DBG("%p memstore-redis subscriber respond with status %i", d->sub, status);
+  switch(status) {
+    case NGX_HTTP_GONE: //delete
+    case NGX_HTTP_CLOSE: //delete
+      respond_msgexpected_callbacks(d, MSG_NORESPONSE);
+      fake_cf = *d->sub->cf;
+      fake_cf.redis.enabled = 0;
+      d->sub->destroy_after_dequeue = 1;
+      nchan_store_memory.delete_channel(d->chid, &fake_cf, NULL, NULL);
+      //now the chanhead will be in the garbage collector
+      d->chanhead->redis_sub = NULL;
+      
+      if(redis_connection_status(d->sub->cf) != CONNECTED && d->onconnect_callback_pd == NULL) {
+        sub_data_t **dd = ngx_alloc(sizeof(*d), ngx_cycle->log);
+        *dd = d;
+        d->onconnect_callback_pd = dd;
+        redis_store_callback_on_connected(d->sub->cf, reconnect_callback, dd);
+      }
+      break;
+      
+    case NGX_HTTP_NO_CONTENT:
+      d->last_msg_status = MSG_EXPECTED;
+      respond_msgexpected_callbacks(d, MSG_EXPECTED);
+      break;
+      
+    default:
+      //meh, no big deal.
+      break;
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_notify_handler(ngx_int_t code, void *data, sub_data_t *d) {
+  if(code == NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE) {
+    intptr_t   max_messages = (intptr_t )data;
+    d->chanhead->max_messages = max_messages;
+    memstore_chanhead_messages_gc(d->chanhead);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_memstore_redis_subscriber_notify_on_MSG_EXPECTED(subscriber_t *sub, nchan_msg_id_t *id, void (*cb)(nchan_msg_status_t, void*), size_t pd_sz, void *pd) {
+  sub_data_t      *d = internal_subscriber_get_privdata(sub);
+  int8_t           cmpval = nchan_compare_msgids(id, &sub->last_msgid);
+  if(cmpval < 0) {
+    cb(MSG_NORESPONSE, pd);
+  }
+  else if(d->last_msg_status == MSG_EXPECTED) {
+    cb(MSG_EXPECTED, pd);
+  }
+  else {
+    msgexpected_callback_llist_t *cbl;
+    void  *pd_copy;
+    if((cbl = ngx_alloc(sizeof(*cbl) + pd_sz, ngx_cycle->log)) == NULL) {
+      ERR("Unable to allocate memory for notify_on_MSG_EXPECTED callback llist");
+      return NGX_ERROR;
+    }
+    pd_copy = &cbl[1];
+    ngx_memcpy(pd_copy, pd, pd_sz);
+    cbl->cb = cb;
+    cbl->next = d->waiting_for_msg_expected;
+    d->waiting_for_msg_expected = cbl;
+  }
+  return NGX_OK;
+}
+/*
+static void reset_timer(sub_data_t *data) {
+  if(data->timeout_ev.timer_set) {
+    ngx_del_timer(&data->timeout_ev);
+  }
+  ngx_add_timer(&data->timeout_ev, MEMSTORE_REDIS_SUBSCRIBER_TIMEOUT * 1000);
+}
+*/
+/*
+static ngx_int_t keepalive_reply_handler(ngx_int_t renew, void *_, void* pd) {
+  sub_data_t *d = (sub_data_t *)pd;
+  if(d->sub->release(d->sub) == NGX_OK) {
+    if(renew) {
+      reset_timer(d);
+    }
+    else{
+      d->sub->dequeue(d->sub);
+    }
+  }
+  return NGX_OK;
+}
+*/
+
+static ngx_str_t   sub_name = ngx_string("memstore-redis");
+
+subscriber_t *memstore_redis_subscriber_create(memstore_channel_head_t *chanhead) {
+  subscriber_t               *sub;
+  sub_data_t                 *d;
+  
+  assert(chanhead->cf);
+  
+  sub = internal_subscriber_create_init(&sub_name, chanhead->cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_notify_handler, (callback_pt )sub_destroy_handler);
+  
+  
+  sub->destroy_after_dequeue = 0;
+  sub->dequeue_after_response = 0;
+  
+  d->sub = sub;
+  d->chanhead = chanhead;
+  d->chid = &chanhead->id;
+  d->last_msg_status = MSG_PENDING;
+  d->waiting_for_msg_expected = NULL;
+  d->onconnect_callback_pd = NULL;
+
+  
+  /*
+  ngx_memzero(&d->timeout_ev, sizeof(d->timeout_ev));
+  nchan_init_timer(&d->timeout_ev, timeout_ev_handler, d)
+  reset_timer(d);
+  */
+  DBG("%p created memstore-redis subscriber with privdata %p", d->sub, d);
+  return sub;
+}
diff --git a/debian/modules/nchan/src/subscribers/memstore_redis.h b/debian/modules/nchan/src/subscribers/memstore_redis.h
new file mode 100644
index 0000000..e1149d1
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/memstore_redis.h
@@ -0,0 +1,4 @@
+#define MEMSTORE_REDIS_SUBSCRIBER_TIMEOUT 10
+subscriber_t *memstore_redis_subscriber_create(memstore_channel_head_t *chanhead);
+ngx_int_t memstore_redis_subscriber_destroy(subscriber_t *sub);
+ngx_int_t nchan_memstore_redis_subscriber_notify_on_MSG_EXPECTED(subscriber_t *sub, nchan_msg_id_t *id, void (*cb)(nchan_msg_status_t, void*), size_t pd_sz, void *pd);
diff --git a/debian/modules/nchan/src/subscribers/websocket.c b/debian/modules/nchan/src/subscribers/websocket.c
new file mode 100644
index 0000000..e69b1e4
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/websocket.c
@@ -0,0 +1,1509 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <util/nchan_subrequest.h>
+#include <ngx_crypt.h>
+#include <ngx_sha1.h>
+#include <nginx.h>
+
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:WEBSOCKET:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:WEBSOCKET:" fmt, ##arg)
+#include <assert.h>
+
+#if __AVX2__
+  #include <immintrin.h>                     // AVX2 intrinsics
+  #define WEBSOCKET_OPTIMIZED_UNMASK 1
+  
+  #define __vector_size_bytes 32
+  #define __vector_type __m256i
+  #define __vector_load_intrinsic _mm256_load_si256
+  #define __vector_xor_intrinsic _mm256_xor_si256
+  #define __vector_store_intrinsic _mm256_store_si256
+    
+#elif __SSE2__
+  #define WEBSOCKET_OPTIMIZED_UNMASK 1
+  #include <emmintrin.h>                     // SSE2 instrinsics
+  
+  #define __vector_size_bytes 16
+  #define __vector_type __m128i
+  #define __vector_load_intrinsic _mm_load_si128
+  #define __vector_xor_intrinsic _mm_xor_si128
+  #define __vector_store_intrinsic _mm_store_si128
+#endif
+
+#define WEBSOCKET_LAST_FRAME                0x8
+
+#define WEBSOCKET_OPCODE_TEXT               0x1
+#define WEBSOCKET_OPCODE_BINARY             0x2
+#define WEBSOCKET_OPCODE_CLOSE              0x8
+#define WEBSOCKET_OPCODE_PING               0x9
+#define WEBSOCKET_OPCODE_PONG               0xA
+  
+#define WEBSOCKET_READ_START_STEP           0
+#define WEBSOCKET_READ_GET_REAL_SIZE_STEP   1
+#define WEBSOCKET_READ_GET_MASK_KEY_STEP    2
+#define WEBSOCKET_READ_GET_PAYLOAD_STEP     3
+
+
+#define WEBSOCKET_FRAME_HEADER_MAX_LENGTH   146 //144 + 2 for possible close status code
+
+#define WEBSOCKET_CLOSING_TIMEOUT           250 //ms
+
+/**
+ * here's what a websocket frame looks like
+ * 
+    0                   1                   2                   3
+  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+  +-+-+-+-+-------+-+-------------+-------------------------------+
+  |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
+  |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
+  |N|V|V|V|       |S|             |   (if payload len==126/127)   |
+  | |1|2|3|       |K|             |                               |
+  +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
+  |     Extended payload length continued, if payload len == 127  |
+  + - - - - - - - - - - - - - - - +-------------------------------+
+  |                               |Masking-key, if MASK set to 1  |
+  +-------------------------------+-------------------------------+
+  | Masking-key (continued)       |          Payload Data         |
+  +-------------------------------- - - - - - - - - - - - - - - - +
+  :                     Payload Data continued ...                :
+  + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+  |                     Payload Data continued ...                |
+  +---------------------------------------------------------------+
+ */
+
+#define CLOSE_NORMAL                 1000
+#define CLOSE_GOING_AWAY             1001
+#define CLOSE_PROTOCOL_ERROR         1002
+#define CLOSE_UNSUPPORTED_DATA       1003
+#define CLOSE_INVALID_PAYLOAD        1007
+#define CLOSE_POLICY_VIOLATION       1008
+#define CLOSE_MESSAGE_TOO_BIG        1009
+#define CLOSE_EXTENSION_MISSING      1010
+#define CLOSE_INTERNAL_SERVER_ERROR  1011
+
+#define REQUEST_PCALLOC(r, what) what = ngx_pcalloc((r)->pool, sizeof(*(what)))
+#define REQUEST_PALLOC(r, what) what = ngx_palloc((r)->pool, sizeof(*(what)))
+
+static const u_char WEBSOCKET_PAYLOAD_LEN_16_BYTE = 126;
+static const u_char WEBSOCKET_PAYLOAD_LEN_64_BYTE = 127;
+static const u_char WEBSOCKET_TEXT_LAST_FRAME_BYTE =  WEBSOCKET_OPCODE_TEXT  | (WEBSOCKET_LAST_FRAME << 4);
+static const u_char WEBSOCKET_CLOSE_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_CLOSE | (WEBSOCKET_LAST_FRAME << 4);
+static const u_char WEBSOCKET_PONG_LAST_FRAME_BYTE  = WEBSOCKET_OPCODE_PONG  | (WEBSOCKET_LAST_FRAME << 4);
+static const u_char WEBSOCKET_PING_LAST_FRAME_BYTE  = WEBSOCKET_OPCODE_PING  | (WEBSOCKET_LAST_FRAME << 4);
+
+#define NCHAN_WS_TMP_POOL_SIZE (4*1024)
+
+
+typedef struct framebuf_s framebuf_t;
+struct framebuf_s {
+  u_char        chr[WEBSOCKET_FRAME_HEADER_MAX_LENGTH + 10]; // +10 for the reservoir tip. just to be safe.
+  framebuf_t   *prev;
+  framebuf_t   *next;
+};
+
+
+#if FAKESHARD
+//debugstuff
+void memstore_fakeprocess_push(ngx_int_t slot);
+void memstore_fakeprocess_push_random(void);
+void memstore_fakeprocess_pop();
+ngx_int_t memstore_slot();
+#endif
+
+static const subscriber_t new_websocket_sub;
+
+typedef struct {
+  u_char fin:1;
+  u_char rsv1:1;
+  u_char rsv2:1;
+  u_char rsv3:1;
+  u_char opcode:4;
+  u_char mask:1;
+  u_char mask_key[4];
+  uint64_t payload_len;
+  u_char  header[8];
+  u_char *payload;
+  u_char *last;
+  ngx_uint_t step;
+} ws_frame_t;
+
+typedef struct full_subscriber_s full_subscriber_t;
+
+typedef struct {
+  ngx_pool_t                  *original_pool;
+  ngx_http_cleanup_t          *original_cleanup;
+  ngx_pool_t                  *tmp_pool;
+  ngx_pool_t                  *framebuf_pool;
+  ngx_http_cleanup_t          *cln;
+  full_subscriber_t           *fsub;
+  ngx_buf_t                    buf;
+  //ngx_http_request_t        *sr;
+  //ngx_http_posted_request_t *pr;
+  //ngx_chain_t                link;
+  ngx_str_t                    upstream_request_url;
+} nchan_pub_upstream_data_t;
+
+typedef struct nchan_pub_upstream_stuff_s nchan_pub_upstream_stuff_t;
+struct nchan_pub_upstream_stuff_s {
+  ngx_http_post_subrequest_t  psr;
+  nchan_pub_upstream_data_t   psr_data;
+  nchan_pub_upstream_stuff_t *prev;
+  nchan_pub_upstream_stuff_t *next;
+};
+
+struct full_subscriber_s {
+  subscriber_t            sub;
+  ngx_http_cleanup_t     *cln;
+  nchan_request_ctx_t    *ctx;
+  subscriber_callback_pt  dequeue_handler;
+  void                   *dequeue_handler_data;
+  ngx_event_t             timeout_ev;
+  ngx_event_t             closing_ev;
+  ws_frame_t              frame;
+  
+  ngx_str_t              *publish_channel_id;
+  nchan_pub_upstream_stuff_t  *upstream_stuff;
+  
+  ngx_event_t             ping_ev;
+  unsigned                awaiting_pong:1;
+  unsigned                ws_meta_subprotocol:1;
+  unsigned                holding:1; //make sure the request doesn't close right away
+  unsigned                shook_hands:1;
+  unsigned                connected:1;
+  unsigned                closing:1;
+  unsigned                finalize_request:1;
+  unsigned                awaiting_destruction:1;
+};// full_subscriber_t
+
+
+static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *chain);
+static void set_buf_to_str(ngx_buf_t *buf, const ngx_str_t *str);
+static ngx_chain_t *websocket_frame_header_chain(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *chain);
+static ngx_flag_t is_utf8(u_char *, size_t);
+static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err);
+static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err);
+static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line);
+
+static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, ngx_pool_t *frame_pool);
+
+static ngx_int_t websocket_reserve(subscriber_t *self);
+static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy);
+
+static void aborted_ws_close_request_rev_handler(ngx_http_request_t *r) {
+  ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+}
+
+
+static void sudden_abort_handler(subscriber_t *sub) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
+#if FAKESHARD
+  memstore_fakeprocess_push(fsub->sub.owner);
+#endif
+  fsub->connected = 0;
+  sub->request->read_event_handler = aborted_ws_close_request_rev_handler;
+  sub->status = DEAD;
+  sub->fn->dequeue(sub);
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+#endif
+}
+
+/*
+static void sudden_upstream_request_abort_handler(full_subscriber_t *fsub) {
+  
+}
+*/
+
+static void init_msg_buf(ngx_buf_t *buf);
+
+#if WEBSOCKET_OPTIMIZED_UNMASK
+static void websocket_unmask_frame(ws_frame_t *frame) {
+  //stupid overcomplicated websockets and their masks
+  
+  uint64_t   i, j, payload_len = frame->payload_len;
+  u_char    *payload = frame->payload;
+  u_char    *mask_key = frame->mask_key;
+  uint64_t   preamble_len = payload_len <= __vector_size_bytes ? payload_len : (uintptr_t )payload % __vector_size_bytes;
+  uint64_t   fastlen;
+  __vector_type    w, w_mask;
+  u_char     extended_mask[__vector_size_bytes];  
+  
+  //preamble
+  for (i = 0; i < preamble_len && i < payload_len; i++) {
+    payload[i] ^= mask_key[i % 4];
+  }
+  //are we done?
+  if(payload_len < __vector_size_bytes) {
+    return;
+  }
+  
+  assert((uintptr_t )(&payload[i]) % __vector_size_bytes == 0);
+  
+  for(j=0; j<__vector_size_bytes; j+=4) {
+    ngx_memcpy(&extended_mask[j], mask_key, 4);
+  }
+  
+  w_mask = __vector_load_intrinsic((__vector_type *)extended_mask);
+  fastlen = payload_len - ((payload_len - i) % __vector_size_bytes);
+  
+  assert(fastlen % __vector_size_bytes == 0);
+  
+  for (/*void*/; i < fastlen; i += __vector_size_bytes) {           // note that N must be multiple of [__vector_size_bytes]
+    w = __vector_load_intrinsic((__vector_type *)&payload[i]);       // load [__vector_size_bytes] bytes
+    w = __vector_xor_intrinsic(w, w_mask);           // XOR with mask
+    __vector_store_intrinsic((__vector_type *)&payload[i], w);   // store [__vector_size_bytes] masked bytes
+  }
+  
+  //leftovers
+  for (/*void*/; i < payload_len; i++) {
+    payload[i] ^= mask_key[i % 4];
+  }
+  
+}
+#else
+static void websocket_unmask_frame(ws_frame_t *frame) {
+  //stupid overcomplicated websockets and their masks
+  uint64_t   i, mpayload_len = frame->payload_len;
+  u_char    *mpayload = frame->payload;
+  u_char    *mask_key = frame->mask_key;
+  
+  for (i = 0; i < mpayload_len; i++) {
+    mpayload[i] ^= mask_key[i % 4];
+  }
+}
+#endif
+
+static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *ch, full_subscriber_t *fsub) {
+  time_t                 last_seen = 0;
+  ngx_uint_t             subscribers = 0;
+  ngx_uint_t             messages = 0;
+  nchan_msg_id_t        *msgid = NULL;
+  ngx_http_request_t    *r = fsub->sub.request;
+  ngx_str_t             *accept_header = NULL;
+  ngx_buf_t             *tmp_buf;
+  nchan_buf_and_chain_t *bc;
+  if(ch) {
+    subscribers = ch->subscribers;
+    last_seen = ch->last_seen;
+    messages  = ch->messages;
+    msgid = &ch->last_published_msg_id;
+  }
+  
+  if(websocket_release(&fsub->sub, 0) == NGX_ABORT) {
+    //zombie publisher
+    //nothing more to do, we're finished here
+    return NGX_OK;
+  }
+  
+  switch(status) {
+    case NCHAN_MESSAGE_QUEUED:
+    case NCHAN_MESSAGE_RECEIVED:
+      if(fsub->sub.cf->sub.websocket) {
+        //don't reply with status info, this websocket is used for subscribing too,
+        //so it should only be recieving messages
+        return NGX_OK;
+      }
+      if(r->headers_in.accept) {
+        accept_header = &r->headers_in.accept->value;
+      }
+      bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+      tmp_buf = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, NULL);
+      ngx_memcpy(&bc->buf, tmp_buf, sizeof(*tmp_buf));
+      bc->buf.last_buf=1;
+      
+      nchan_output_filter(fsub->sub.request, websocket_frame_header_chain(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, ngx_buf_size((&bc->buf)), &bc->chain));
+      break;
+    case NGX_ERROR:
+    case NGX_HTTP_INTERNAL_SERVER_ERROR:
+      websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL);
+      break;
+  }
+  return NGX_OK;
+}
+
+static void websocket_publish_continue(full_subscriber_t *fsub, ngx_buf_t *buf) {
+  nchan_msg_t              msg;
+  struct timeval           tv;
+  ngx_http_request_t      *r = fsub->sub.request;
+  ngx_memzero(&msg, sizeof(msg));
+  
+  msg.buf=buf;
+  if(r->headers_in.content_type) {
+    msg.content_type.data = r->headers_in.content_type->value.data;
+    msg.content_type.len = r->headers_in.content_type->value.len;
+  }
+  
+  ngx_gettimeofday(&tv);
+  msg.id.time = tv.tv_sec;
+  msg.id.tag.fixed[0]=0;
+  msg.id.tagcount=1;
+  msg.id.tagactive=0;
+  
+  websocket_reserve(&fsub->sub);
+  fsub->sub.cf->storage_engine->publish(fsub->publish_channel_id, &msg, fsub->sub.cf, (callback_pt )websocket_publish_callback, fsub); 
+  nchan_update_stub_status(total_published_messages, 1);
+  
+}
+
+static void clean_upstream_sr_tmp_pools(nchan_pub_upstream_data_t *d) {
+  ngx_destroy_pool(d->tmp_pool);
+  ngx_destroy_pool(d->framebuf_pool);
+}
+
+static ngx_int_t websocket_publisher_upstream_handler(ngx_http_request_t *sr, void *data, ngx_int_t rc) {
+  ngx_http_request_t         *r = sr->parent;
+  nchan_pub_upstream_stuff_t *stuff = (nchan_pub_upstream_stuff_t *)data;
+  nchan_pub_upstream_data_t  *d = &stuff->psr_data;
+  full_subscriber_t          *fsub = d->fsub;
+  ngx_http_cleanup_t         *cln;
+  
+#if nginx_version <= 1009004
+  r->main->subrequests++; //avoid tripping up subrequest loop detection
+#endif
+  if(r->connection->data == sr) {
+    r->connection->data = r;
+  }
+  if(r->postponed) {
+    r->postponed = NULL;
+  }
+  
+  r->pool = d->original_pool;
+  //ERR("request %p orig pool %p", r, r->pool);
+  
+  //discard cleanup
+  r->cleanup = d->original_cleanup;
+  r->count--;
+  //don't destroy the temp pool just yet, 
+  
+  if(rc == NGX_OK) {
+    ngx_int_t                 code = sr->headers_out.status;
+    ngx_int_t                 content_length;
+    ngx_chain_t              *request_chain;
+    
+    switch(code) {
+      case NGX_HTTP_OK:
+      case NGX_HTTP_CREATED:
+      case NGX_HTTP_ACCEPTED:
+        if(sr->upstream) {
+          ngx_buf_t    *buf;
+          
+          content_length = sr->upstream->headers_in.content_length_n > 0 ? sr->upstream->headers_in.content_length_n : 0;
+          request_chain = sr->upstream->out_bufs;
+          
+          if (request_chain->next != NULL) {
+            buf = nchan_chain_to_single_buffer(d->framebuf_pool, request_chain, content_length);
+          }
+          else {
+            buf = request_chain->buf;
+            if(buf->memory) {
+              buf->start = buf->pos;
+              buf->end = buf->last;
+              buf->last_in_chain = 1;
+              buf->last_buf = 1;
+            }
+          }
+          
+          websocket_publish_continue(fsub, buf);
+        }
+        else {
+          //content_length = 0;
+          request_chain = NULL;
+          ERR("upstream missing from upstream subrequest");
+        }
+        
+        break;
+      
+      case NGX_HTTP_NOT_MODIFIED:
+        websocket_publish_continue(fsub, &d->buf);
+        
+        break;
+        
+      case NGX_HTTP_NO_CONTENT:
+        //cancel publication
+        break;
+      
+      default:
+        websocket_respond_status(&fsub->sub, NGX_HTTP_FORBIDDEN, NULL);
+        break;
+    }
+  }
+  else {
+    websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL);
+  }
+  
+  if(fsub->upstream_stuff == stuff) {
+    fsub->upstream_stuff = stuff->next;
+  }
+  if(stuff->next) {
+    stuff->next->prev = stuff->prev;
+  }  
+  if(stuff->prev) {
+    stuff->prev->next = stuff->next;
+  }
+
+  if((cln = ngx_http_cleanup_add(sr, 0)) == NULL) {
+    ERR("Unable to add post-request cleanup for websocket upstream request");
+    return NGX_ERROR;
+  }
+  cln->data = d;
+  cln->handler = (ngx_http_cleanup_pt )clean_upstream_sr_tmp_pools;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, ngx_pool_t *fb_pool) {
+  static ngx_str_t         nopublishing = ngx_string("Publishing not allowed.");
+  static ngx_str_t         POST_REQUEST_STRING = {4, (u_char *)"POST "};
+  
+  if(!fsub->sub.cf->pub.websocket) {
+    return websocket_send_close_frame(fsub, CLOSE_POLICY_VIOLATION, &nopublishing);
+  }
+  
+#if (NGX_DEBUG_POOL)
+  ERR("ws request pool size: %V", ngx_http_debug_pool_str(fsub->sub.request->pool));
+#endif
+  
+  ngx_http_complex_value_t        *publisher_upstream_request_url_ccv;
+  
+  publisher_upstream_request_url_ccv = fsub->sub.cf->publisher_upstream_request_url;
+  if(publisher_upstream_request_url_ccv == NULL) {
+    websocket_publish_continue(fsub, buf);
+  }
+  else {
+    nchan_pub_upstream_stuff_t    *psr_stuff;
+    ngx_http_post_subrequest_t    *psr;
+    nchan_pub_upstream_data_t     *psrd;
+    ngx_http_request_t            *r = fsub->sub.request;
+    ngx_http_request_t            *sr;
+    ngx_http_request_body_t       *fakebody;
+    ngx_chain_t                   *fakebody_chain;
+    ngx_buf_t                     *fakebody_buf;
+    size_t                         sz;
+    
+    if(!fb_pool) {
+      fb_pool = ngx_create_pool(1024, r->connection->log);
+    }
+    
+    if((psr_stuff = ngx_palloc(fb_pool, sizeof(*psr_stuff))) == NULL) {
+      ERR("can't allocate memory for publisher auth subrequest");
+      websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL);
+      return NGX_ERROR;
+    }
+    
+    if(fsub->upstream_stuff) {
+     fsub->upstream_stuff->prev = psr_stuff;
+    }
+    psr_stuff->next = fsub->upstream_stuff;
+    psr_stuff->prev = NULL;
+    fsub->upstream_stuff = psr_stuff;
+    
+    psr = &psr_stuff->psr;
+    psr->data = psr_stuff;
+    psr->handler = websocket_publisher_upstream_handler;
+    psr_stuff->psr_data.fsub = fsub;
+    
+    psr_stuff->psr_data.tmp_pool = NULL;
+    
+    ngx_http_complex_value(r, publisher_upstream_request_url_ccv, &psr_stuff->psr_data.upstream_request_url); 
+    
+    psrd = &fsub->upstream_stuff->psr_data;
+    psr = &fsub->upstream_stuff->psr;
+    
+    if(psrd->tmp_pool) {
+      //previous upstream request's pool
+      ngx_destroy_pool(psrd->tmp_pool);
+      psrd->tmp_pool = NULL;
+    }
+    
+    psrd->framebuf_pool = fb_pool;
+    
+    psrd->buf = *buf;
+    psrd->original_pool = r->pool;
+    psrd->original_cleanup = r->cleanup;
+    r->cleanup = NULL;
+    
+    psrd->tmp_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, r->connection->log);
+    
+    r->pool = psrd->tmp_pool;
+    //ERR("request %p tmp pool %p", r, r->pool);
+    
+    fakebody = ngx_pcalloc(r->pool, sizeof(*fakebody));
+    if(ngx_buf_size(buf) > 0) {
+      fakebody_chain = ngx_palloc(r->pool, sizeof(*fakebody_chain));
+      fakebody_buf = ngx_palloc(r->pool, sizeof(*fakebody_buf));
+      fakebody->bufs = fakebody_chain;
+      fakebody_chain->next = NULL;
+      fakebody_chain->buf = fakebody_buf;
+      init_msg_buf(fakebody_buf);
+      
+      //just copy the buffer contents. it's inefficient but I don't care at the moment.
+      //this can and should be optimized later
+      sz = ngx_buf_size(buf);
+      fakebody_buf->start = ngx_palloc(r->pool, sz); //huuh?
+      ngx_memcpy(fakebody_buf->start, buf->start, sz);
+      fakebody_buf->end = fakebody_buf->start + sz;
+      fakebody_buf->pos = fakebody_buf->start;
+      fakebody_buf->last = fakebody_buf->end;
+    }
+    else {
+      sz = 0;
+    }
+    
+    ngx_http_subrequest(r, &psrd->upstream_request_url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
+    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, fakebody, sz, NULL);
+    
+    /*
+    //http request sudden close cleanup
+    if((psrd->cln = ngx_http_cleanup_add(sr, 0)) == NULL) {
+      ERR("Unable to add request cleanup for websocket upstream request");
+      return NGX_ERROR;
+    }
+    psrd->cln->data = fsub;
+    psrd->cln->handler = (ngx_http_cleanup_pt )sudden_upstream_request_abort_handler;
+    */
+  }
+  
+  return NGX_OK;
+}
+
+static void empty_handler() { }
+
+static void websocket_init_frame(ws_frame_t *frame) {
+  ngx_memzero(frame, sizeof(*frame)); 
+  frame->step = WEBSOCKET_READ_START_STEP;
+  frame->last = NULL;
+  frame->payload = NULL;
+}
+
+static void *framebuf_alloc(void *pd) {
+  return ngx_palloc((ngx_pool_t *)pd, sizeof(framebuf_t));
+}
+
+static void closing_ev_handler(ngx_event_t *ev) {
+  full_subscriber_t *fsub = (full_subscriber_t *)ev->data;
+  ngx_http_finalize_request(fsub->sub.request, NGX_OK);
+}
+
+subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  DBG("create for req %p", r);
+  full_subscriber_t  *fsub;
+  if((fsub = ngx_alloc(sizeof(*fsub), ngx_cycle->log)) == NULL) {
+    ERR("Unable to allocate");
+    return NULL;
+  }
+  
+  nchan_subscriber_init(&fsub->sub, &new_websocket_sub, r, msg_id);
+  fsub->cln = NULL;
+  fsub->ctx = ctx;
+  fsub->ws_meta_subprotocol = 0;
+  fsub->finalize_request = 0;
+  fsub->holding = 0;
+  fsub->shook_hands = 0;
+  fsub->connected = 0;
+  fsub->awaiting_pong = 0;
+  fsub->closing = 0;
+  ngx_memzero(&fsub->ping_ev, sizeof(fsub->ping_ev));
+  nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->timeout_ev);
+  fsub->dequeue_handler = empty_handler;
+  fsub->dequeue_handler_data = NULL;
+  fsub->awaiting_destruction = 0;
+  
+  ngx_memzero(&fsub->closing_ev, sizeof(fsub->closing_ev));
+  nchan_init_timer(&fsub->closing_ev, closing_ev_handler, fsub);
+  
+  //what should the buffers look like?
+  
+  /*
+  //mesage buf
+  b->last_buf = 1;
+  b->last_in_chain = 1;
+  b->flush = 1;
+  b->memory = 1;
+  b->temporary = 0;
+  */
+  
+  if(fsub->sub.cf->pub.websocket) {
+    fsub->publish_channel_id = nchan_get_channel_id(r, PUB, 0);
+  }
+  
+  fsub->upstream_stuff = NULL;
+  
+  websocket_init_frame(&fsub->frame);
+  
+  //http request sudden close cleanup
+  if((fsub->cln = ngx_http_cleanup_add(r, 0)) == NULL) {
+    ERR("Unable to add request cleanup for websocket subscriber");
+    return NULL;
+  }
+  fsub->cln->data = fsub;
+  fsub->cln->handler = (ngx_http_cleanup_pt )sudden_abort_handler;
+  DBG("%p created for request %p", &fsub->sub, r);
+  
+  assert(ctx != NULL);
+  ctx->sub = &fsub->sub; //gonna need this for recv
+  ctx->subscriber_type = fsub->sub.name;
+  
+  #if NCHAN_SUBSCRIBER_LEAK_DEBUG
+    subscriber_debug_add(&fsub->sub);
+  #endif
+
+  //send-frame buffer
+  ctx->output_str_queue = ngx_palloc(r->pool, sizeof(*ctx->output_str_queue));
+  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(framebuf_t, prev), offsetof(framebuf_t, next), framebuf_alloc, NULL, r->pool);
+  
+  //bufchain pool
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  return &fsub->sub;
+}
+
+ngx_int_t websocket_subscriber_destroy(subscriber_t *sub) {
+  full_subscriber_t            *fsub = (full_subscriber_t  *)sub;
+  nchan_pub_upstream_stuff_t   *up_cur, *up_next;
+  
+  if(!fsub->awaiting_destruction) {
+    fsub->ctx->sub = NULL;
+  }
+  
+  for(up_cur = fsub->upstream_stuff; up_cur != NULL; up_cur = up_next) {
+    up_next = up_cur->next;
+    if(up_cur->psr_data.tmp_pool) {
+      ngx_destroy_pool(up_cur->psr_data.tmp_pool);
+    }
+    
+    if(up_cur->psr_data.framebuf_pool) {
+      ngx_destroy_pool(up_cur->psr_data.framebuf_pool);
+    }
+  }
+   
+  if(sub->reserved > 0) {
+    DBG("%p not ready to destroy (reserved for %i) for req %p", sub, sub->reserved, fsub->sub.request);
+    fsub->awaiting_destruction = 1;
+  }
+  else {
+    DBG("%p destroy for req %p", sub, fsub->sub.request);
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+    subscriber_debug_remove(&fsub->sub);
+#endif
+    nchan_free_msg_id(&sub->last_msgid);
+    //debug 
+    ngx_memset(fsub, 0x13, sizeof(*fsub));
+    ngx_free(fsub);
+  }
+  return NGX_OK;
+}
+
+static void websocket_perform_handshake(full_subscriber_t *fsub) {
+  static ngx_str_t    magic = ngx_string("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
+  ngx_str_t           ws_accept_key, sha1_str;
+  u_char              buf_sha1[21];
+  u_char              buf[255];
+  ngx_str_t          *tmp, *ws_key, *subprotocols;
+  ngx_int_t           ws_version;
+  ngx_http_request_t *r = fsub->sub.request;
+  
+  ngx_sha1_t          sha1;
+  
+  ws_accept_key.data = buf;
+  
+  r->headers_out.content_length_n = 0;
+  r->header_only = 1;  
+  
+  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_VERSION)) == NULL) {
+    r->headers_out.status = NGX_HTTP_BAD_REQUEST;
+    fsub->sub.dequeue_after_response=1;
+  }
+  else {
+    ws_version=ngx_atoi(tmp->data, tmp->len);
+    if(ws_version != 13) {
+      r->headers_out.status = NGX_HTTP_BAD_REQUEST;
+      fsub->sub.dequeue_after_response=1;
+    }
+  }
+  
+  if((ws_key = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_KEY)) == NULL) {
+    r->headers_out.status = NGX_HTTP_BAD_REQUEST;
+    fsub->sub.dequeue_after_response=1;
+  }
+  
+  if((subprotocols = nchan_get_header_value(r, NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL)) != NULL) {
+    static ngx_str_t     ws_meta = ngx_string("ws+meta.nchan");
+    if(subprotocols->len >= ws_meta.len && ngx_strncmp(subprotocols->data, ws_meta.data, ws_meta.len) == 0) {
+      fsub->ws_meta_subprotocol = 1;
+      nchan_add_response_header(r, &NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL, &ws_meta);
+      
+      //init meta headers str reuse queue
+      nchan_subscriber_init_msgid_reusepool(fsub->ctx, r->pool);
+    }
+    else {
+      nchan_add_response_header(r, &NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL, NULL);
+    }
+  }
+  
+  if(r->headers_out.status != NGX_HTTP_BAD_REQUEST) {
+    //generate accept key
+    ngx_sha1_init(&sha1);
+    ngx_sha1_update(&sha1, ws_key->data, ws_key->len);
+    ngx_sha1_update(&sha1, magic.data, magic.len);
+    ngx_sha1_final(buf_sha1, &sha1);
+    sha1_str.len=20;
+    sha1_str.data=buf_sha1;
+    
+    ws_accept_key.len=ngx_base64_encoded_length(sha1_str.len);
+    assert(ws_accept_key.len < 255);
+    ngx_encode_base64(&ws_accept_key, &sha1_str);
+    
+    nchan_include_access_control_if_needed(r, fsub->ctx);
+    nchan_add_response_header(r, &NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT, &ws_accept_key);
+    nchan_add_response_header(r, &NCHAN_HEADER_UPGRADE, &NCHAN_WEBSOCKET);
+#if nginx_version < 1003013
+    nchan_add_response_header(r, &NCHAN_HEADER_CONNECTION, &NCHAN_UPGRADE);
+#endif
+    r->headers_out.status_line = NCHAN_HTTP_STATUS_101;
+    r->headers_out.status = NGX_HTTP_SWITCHING_PROTOCOLS;
+    
+    r->keepalive=0; //apparently, websocket must not use keepalive.
+  }
+  
+  ngx_http_send_header(r);
+}
+
+static void websocket_reading(ngx_http_request_t *r);
+
+
+static void ensure_request_hold(full_subscriber_t *fsub) {
+  if(fsub->holding == 0) {
+    fsub->sub.request->read_event_handler = websocket_reading;
+    fsub->sub.request->write_event_handler = ngx_http_request_empty_handler;
+    fsub->sub.request->main->count++; //this is the right way to hold and finalize the
+    fsub->holding = 1;
+  }
+}
+
+static ngx_int_t ensure_handshake(full_subscriber_t *fsub) {
+  if(fsub->shook_hands == 0) {
+    ensure_request_hold(fsub);
+    websocket_perform_handshake(fsub);
+    fsub->shook_hands = 1;
+    fsub->connected = 1;
+    return NGX_OK;
+  }
+  return NGX_DECLINED;
+}
+
+static ngx_int_t websocket_reserve(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  ensure_request_hold(fsub);
+  self->reserved++;
+  DBG("%p reserve for req %p. reservations: %i", self, fsub->sub.request, self->reserved);
+  return NGX_OK;
+}
+static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  assert(self->reserved > 0);
+  self->reserved--;
+  DBG("%p release for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
+  if(nodestroy == 0 && fsub->awaiting_destruction == 1 && self->reserved == 0) {
+    websocket_subscriber_destroy(self);
+    return NGX_ABORT;
+  }
+  else {
+    return NGX_OK;
+  }
+}
+
+static void ping_ev_handler(ngx_event_t *ev) {
+  full_subscriber_t *fsub = (full_subscriber_t *)ev->data;
+  if(ev->timedout) {
+    ev->timedout=0;
+    if(fsub->awaiting_pong) {
+      //never got a PONG back
+      ngx_http_finalize_request(fsub->sub.request, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+    }
+    else {
+      fsub->awaiting_pong = 1;
+      websocket_send_frame(fsub, WEBSOCKET_PING_LAST_FRAME_BYTE, 0, NULL); 
+      ngx_add_timer(&fsub->ping_ev, fsub->sub.cf->websocket_ping_interval * 1000);
+    }
+  }
+}
+
+static ngx_int_t websocket_enqueue(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  ensure_handshake(fsub);
+  self->enqueued = 1;
+  
+  if(self->cf->websocket_ping_interval > 0) {
+    //add timeout timer
+    //nextsub->ev should be zeroed;
+    nchan_init_timer(&fsub->ping_ev, ping_ev_handler, fsub);
+    ngx_add_timer(&fsub->ping_ev, self->cf->websocket_ping_interval * 1000);
+  }
+  
+  if(self->cf->subscriber_timeout > 0) {
+    //add timeout timer
+    ngx_add_timer(&fsub->timeout_ev, self->cf->subscriber_timeout * 1000);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t websocket_dequeue(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  DBG("%p dequeue", self);
+  fsub->dequeue_handler(&fsub->sub, fsub->dequeue_handler_data);
+  self->enqueued = 0;
+  
+  if(fsub->connected) {
+    ngx_str_t          close_msg = ngx_string("410 Gone");
+    websocket_send_close_frame(fsub, CLOSE_NORMAL, &close_msg);
+  }
+  
+  if(fsub->ping_ev.timer_set) {
+    ngx_del_timer(&fsub->ping_ev);
+  }
+  
+  if(fsub->closing_ev.timer_set) {
+    ngx_del_timer(&fsub->closing_ev);
+  }
+  
+  if(fsub->timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->timeout_ev);
+  }
+  
+  if(self->destroy_after_dequeue) {
+    websocket_subscriber_destroy(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t websocket_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  fsub->dequeue_handler = cb;
+  fsub->dequeue_handler_data = privdata;
+  return NGX_OK;
+}
+
+static ngx_int_t ws_recv(ngx_connection_t *c, ngx_event_t *rev, ngx_buf_t *buf, ssize_t len) {
+  ssize_t         n;
+  n = c->recv(c, buf->last, (ssize_t) len - (buf->last - buf->start));
+
+  if (n == NGX_AGAIN) {
+    return NGX_AGAIN;
+  }
+
+  if ((n == NGX_ERROR) || (n == 0)) {
+    return NGX_ERROR;
+  }
+  buf->pos = buf->last;
+  buf->last += n;
+
+  if ((buf->last - buf->start) < len) {
+    return NGX_AGAIN;
+  }
+
+  return NGX_OK;
+}
+
+static uint64_t ws_ntohll(uint64_t value) {
+  int num = 42;
+  if (*(char *)&num == 42) {
+    uint32_t high_part = ntohl((uint32_t)(value >> 32));
+    uint32_t low_part = ntohl((uint32_t)(value & 0xFFFFFFFFLL));
+    return (((uint64_t)low_part) << 32) | high_part;
+  } else {
+    return value;
+  }
+}
+
+static void set_buffer(ngx_buf_t *buf, u_char *start, u_char *last, ssize_t len) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = start;
+  buf->pos = buf->start;
+  buf->last = (last != NULL) ? last : start;
+  buf->end = buf->start + len;
+  buf->temporary = 0;
+  buf->memory = 1;
+}
+
+/* based on code from push stream module, written by
+ * Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * thanks, guys!
+*/
+static void websocket_reading(ngx_http_request_t *r) {
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
+  ws_frame_t                 *frame = &fsub->frame;
+  ngx_int_t                   rc = NGX_OK;
+  ngx_event_t                *rev;
+  ngx_connection_t           *c;
+  ngx_buf_t                   buf;
+  ngx_pool_t                 *temp_pool = NULL;
+  int                         free_temp_pool = 1;
+  ngx_buf_t                   msgbuf;
+  int                         close_code;
+  ngx_str_t                   close_reason;
+  
+  set_buffer(&buf, frame->header, frame->last, 8);
+
+  //ERR("fsub: %p, frame: %p", fsub, frame);
+  
+  c = r->connection;
+  rev = c->read;
+
+  for (;;) {
+    if (c->error || c->timedout || c->close || c->destroyed || rev->closed || rev->eof) {
+      goto finalize;
+    }
+    
+    switch (frame->step) {
+      case WEBSOCKET_READ_START_STEP:
+        //reading frame header
+        if ((rc = ws_recv(c, rev, &buf, 2)) != NGX_OK) {
+          goto exit;
+        }
+        
+        frame->fin  = (frame->header[0] >> 7) & 1;
+        frame->rsv1 = (frame->header[0] >> 6) & 1;
+        frame->rsv2 = (frame->header[0] >> 5) & 1;
+        frame->rsv3 = (frame->header[0] >> 4) & 1;
+        frame->opcode = frame->header[0] & 0xf;
+        
+        frame->mask = (frame->header[1] >> 7) & 1;
+        frame->payload_len = frame->header[1] & 0x7f;
+        
+        frame->step = WEBSOCKET_READ_GET_REAL_SIZE_STEP;
+        break;
+      
+      case WEBSOCKET_READ_GET_REAL_SIZE_STEP:
+        switch(frame->payload_len) {
+          uint64_t len;
+          case 126:
+            if ((rc = ws_recv(c, rev, &buf, 2)) != NGX_OK) {
+              goto exit;
+            }
+            ngx_memcpy(&len, frame->header, 2);
+            frame->payload_len = ntohs(len);
+            break;
+            
+          case 127:
+            if ((rc = ws_recv(c, rev, &buf, 8)) != NGX_OK) {
+              goto exit;
+            }
+            ngx_memcpy(&len, frame->header, 8);
+            frame->payload_len = ws_ntohll(len);
+            break;
+        }
+        
+        frame->step = WEBSOCKET_READ_GET_MASK_KEY_STEP;
+        break;
+      
+      case WEBSOCKET_READ_GET_MASK_KEY_STEP:
+        if (frame->mask) {
+          if ((rc = ws_recv(c, rev, &buf, 4)) != NGX_OK) {
+            goto exit;
+          }
+          ngx_memcpy(frame->mask_key, buf.start, 4);
+        }
+        
+        frame->step = WEBSOCKET_READ_GET_PAYLOAD_STEP;
+        break;
+      
+      case WEBSOCKET_READ_GET_PAYLOAD_STEP:
+        if ((frame->opcode != WEBSOCKET_OPCODE_TEXT) && (frame->opcode != WEBSOCKET_OPCODE_CLOSE) && (frame->opcode != WEBSOCKET_OPCODE_PING) && (frame->opcode != WEBSOCKET_OPCODE_PONG)) {
+          websocket_send_frame(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL);
+          goto finalize;
+        }
+        
+        if (frame->payload_len > 0) {
+          //create a temporary pool to allocate temporary elements
+          if (temp_pool == NULL) {
+            if ((temp_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, r->connection->log)) == NULL) {
+              ERR("unable to allocate memory for temporary pool");
+              goto finalize;
+            }
+            if ((frame->payload = ngx_pcalloc(temp_pool, frame->payload_len)) == NULL) {
+              ERR("unable to allocate memory for payload");
+              goto finalize;
+            }
+            frame->last = frame->payload;
+          }
+          
+          set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
+          
+          if ((rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
+            goto exit;
+          }
+          
+          if (frame->mask) {
+            websocket_unmask_frame(frame);
+          }
+        }
+        frame->step = WEBSOCKET_READ_START_STEP;
+        frame->last = NULL;
+        switch(frame->opcode) {
+          case WEBSOCKET_OPCODE_TEXT:
+            if (!is_utf8(frame->payload, frame->payload_len)) {
+              goto finalize;
+            }
+            //intentional fall-through
+          case WEBSOCKET_OPCODE_BINARY:
+            init_msg_buf(&msgbuf);
+            
+            msgbuf.start = frame->payload;
+            msgbuf.pos = msgbuf.start;
+            msgbuf.end = msgbuf.start + frame->payload_len;
+            msgbuf.last = msgbuf.end;
+            
+            //DBG("we got data %V", &msg_in_str);
+            
+            websocket_publish(fsub, &msgbuf, temp_pool);
+            if(fsub->upstream_stuff) {
+              free_temp_pool = 0;
+            }
+            break;
+          
+          case WEBSOCKET_OPCODE_PING:
+            DBG("%p got pinged", fsub);
+            websocket_send_frame(fsub, WEBSOCKET_PONG_LAST_FRAME_BYTE, 0, NULL);
+            break;
+            
+          case WEBSOCKET_OPCODE_PONG:
+            DBG("%p Got ponged", fsub);
+            if(fsub->awaiting_pong) {
+              fsub->awaiting_pong = 0;
+            }
+            else { //unexpected PONG. quit.
+              websocket_send_frame(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL);
+              goto finalize;
+            }
+            break;
+            
+          case WEBSOCKET_OPCODE_CLOSE:
+            if(frame->payload_len >= 2) {
+              ngx_memcpy(&close_code, frame->payload, 2);
+              close_code = ntohs(close_code);
+              close_reason.data = frame->payload + 2;
+              close_reason.len = frame->payload_len - 2;
+            }
+            else {
+              close_code = 0;
+              close_reason.data = (u_char *)"";
+              close_reason.len = 0;
+            }
+            DBG("%p wants to close (code %i reason \"%V\")", fsub, close_code, &close_reason);
+            websocket_send_close_frame(fsub, 0, NULL);
+            goto finalize;
+            break; //good practice?
+        }
+        if(free_temp_pool && temp_pool != NULL) {
+          ngx_destroy_pool(temp_pool);
+          temp_pool = NULL;
+        }
+        return;
+        
+        break;
+        
+      default:
+        ngx_log_debug(NGX_LOG_ERR, c->log, 0, "push stream module: unknown websocket step (%d)", frame->step);
+        goto finalize;
+        break;
+    }
+    
+    set_buffer(&buf, frame->header, NULL, 8);
+  }
+
+exit:
+  
+  if (temp_pool != NULL) {
+    ngx_destroy_pool(temp_pool);
+    temp_pool = NULL;
+  }
+  if (rc == NGX_AGAIN) {
+    frame->last = buf.last;
+    if (!c->read->ready) {
+      if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+        ngx_log_error(NGX_LOG_INFO, c->log, ngx_socket_errno, "push stream module: failed to restore read events");
+        goto finalize;
+      }
+    }
+  }
+
+  if (rc == NGX_ERROR) {
+    rev->eof = 1;
+    c->error = 1;
+    ngx_log_error(NGX_LOG_INFO, c->log, ngx_socket_errno, "push stream module: client closed prematurely connection");
+    goto finalize;
+  }
+
+  return;
+
+finalize:
+
+  if (temp_pool != NULL) {
+    ngx_destroy_pool(temp_pool);
+    temp_pool = NULL;
+  }
+  
+  ngx_http_finalize_request(r, c->error ? NGX_HTTP_CLIENT_CLOSED_REQUEST : NGX_OK);
+  
+}
+
+
+static ngx_flag_t is_utf8(u_char *p, size_t n) {
+  u_char  c, *last;
+  size_t  len;
+  
+  last = p + n;
+  
+  for (len = 0; p < last; len++) {
+    c = *p;
+    
+    if (c < 0x80) {
+      p++;
+      continue;
+    }
+    
+    if (ngx_utf8_decode(&p, n) > 0x10ffff) {
+      /* invalid UTF-8 */
+      return 0;
+    }
+  }
+  return 1;
+}
+
+uint64_t ws_htonll(uint64_t value) {
+  int num = 42;
+  if (*(char *)&num == 42) {
+    uint32_t high_part = htonl((uint32_t)(value >> 32));
+    uint32_t low_part = htonl((uint32_t)(value & 0xFFFFFFFFLL));
+    return (((uint64_t)low_part) << 32) | high_part;
+  } else {
+    return value;
+  }
+}
+
+
+static void init_header_buf(ngx_buf_t *buf) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->memory = 1;
+}
+
+static void init_msg_buf(ngx_buf_t *buf) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->last_buf = 1;
+  buf->last_in_chain = 1;
+  buf->flush = 1;
+  buf->memory = 1;
+}
+
+static ngx_int_t websocket_frame_header(full_subscriber_t *fsub, ngx_buf_t *buf, const u_char opcode, off_t len) {
+  
+  framebuf_t           *framebuf = nchan_reuse_queue_push(fsub->ctx->output_str_queue);
+  u_char               *last = framebuf->chr;
+  uint64_t              len_net;
+  init_header_buf(buf);
+  buf->start = last;
+  *last = opcode;
+  last++;
+  
+  if (len <= 125) {
+    last = ngx_copy(last, &len, 1);
+    buf->end++;
+  }
+  else if (len < (1 << 16)) {
+    last = ngx_copy(last, &WEBSOCKET_PAYLOAD_LEN_16_BYTE, sizeof(WEBSOCKET_PAYLOAD_LEN_16_BYTE));
+    len_net = htons(len);
+    last = ngx_copy(last, &len_net, 2);
+  }
+  else {
+    last = ngx_copy(last, &WEBSOCKET_PAYLOAD_LEN_64_BYTE, sizeof(WEBSOCKET_PAYLOAD_LEN_64_BYTE));
+    len_net = ws_htonll(len);
+    last = ngx_copy(last, &len_net, 8);
+  }
+  buf->end=last;
+  buf->last=last;
+  buf->last_buf= len == 0;
+  buf->pos=buf->start;
+  return NGX_OK;
+}
+
+/*static ngx_int_t websocket_msg_frame_header(ngx_buf_t *buf, off_t len) {
+  return websocket_frame_header(buf, WEBSOCKET_TEXT_LAST_FRAME_BYTE, len);
+}
+*/
+
+static void set_buf_to_str(ngx_buf_t *buf, const ngx_str_t *str) {
+  buf->start=str->data;
+  buf->end=str->data + str->len;
+  buf->pos = buf->start;
+  buf->last = buf->end;
+}
+
+static ngx_chain_t *websocket_frame_header_chain(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *msg_chain) {
+  
+  nchan_buf_and_chain_t   *bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+
+  init_header_buf(&bc->buf);
+  
+  websocket_frame_header(fsub, &bc->buf, opcode, len);
+  
+  if(len == 0) {
+    bc->buf.last_buf=1;
+  }
+  else {
+    bc->buf.last_buf=0;
+    assert(msg_chain != NULL);
+    bc->chain.next = msg_chain;
+  }
+  bc->buf.pos=bc->buf.start;
+
+  return &bc->chain;
+}
+
+static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *msg_chain) {
+  return nchan_output_filter(fsub->sub.request, websocket_frame_header_chain(fsub, opcode, len, msg_chain));
+}
+
+static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg_t *msg) {
+  nchan_buf_and_chain_t *bc;
+  size_t                 sz = ngx_buf_size((msg->buf));
+  if(fsub->ws_meta_subprotocol) {
+    static ngx_str_t          id_line = ngx_string("id: ");
+    static ngx_str_t          content_type_line = ngx_string("\ncontent-type: ");
+    static ngx_str_t          two_newlines = ngx_string("\n\n");
+    ngx_chain_t              *cur;
+    ngx_str_t                 msgid;
+    bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 4 + (msg->content_type.len > 0 ? 2 : 0));
+    cur = &bc->chain;
+    
+    // id: 
+    ngx_init_set_membuf(cur->buf, id_line.data, id_line.data + id_line.len);
+    sz += id_line.len;
+    cur = cur->next;
+    
+    //msgid value
+    msgid = nchan_subscriber_set_recyclable_msgid_str(fsub->ctx, &fsub->sub.last_msgid);
+    ngx_init_set_membuf(cur->buf, msgid.data, msgid.data + msgid.len);
+    sz += msgid.len;
+    cur = cur->next;
+    
+    if(msg->content_type.len > 0) {
+      // content-type: 
+      ngx_init_set_membuf(cur->buf, content_type_line.data, content_type_line.data + content_type_line.len);
+      sz += content_type_line.len;
+      cur = cur->next;
+      
+      //content-type value
+      ngx_init_set_membuf(cur->buf, msg->content_type.data, msg->content_type.data + msg->content_type.len);
+      sz += msg->content_type.len;
+      cur = cur->next;
+    }
+    
+    // \n\n
+    ngx_init_set_membuf(cur->buf, two_newlines.data, two_newlines.data + two_newlines.len);
+    sz += two_newlines.len;
+    cur = cur->next;
+    
+    //now the message
+    *cur->buf = *msg->buf;
+    assert(cur->next == NULL);
+  }
+  else {
+    bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+    //message first
+    bc->buf = *msg->buf;
+  }
+  
+  if(msg->buf->file) {
+    nchan_msg_buf_open_fd_if_needed(&bc->buf, nchan_bufchain_pool_reserve_file(fsub->ctx->bcp), NULL);
+  }
+  
+  //now the header
+  return websocket_frame_header_chain(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, sz, &bc->chain);
+}
+
+static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err) {
+  nchan_output_filter(fsub->sub.request, websocket_close_frame_chain(fsub, code, err));
+  fsub->connected = 0;
+  if(fsub->closing == 1) {
+    DBG("%p already sent close frame");
+    ngx_http_finalize_request(fsub->sub.request, NGX_OK);
+  }
+  else {
+    fsub->closing = 1;
+    ngx_add_timer(&fsub->closing_ev, WEBSOCKET_CLOSING_TIMEOUT);
+  }
+  return NGX_OK;
+}
+
+static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err) {
+  nchan_buf_and_chain_t *bc; 
+  ngx_chain_t   *hdr_chain;
+  ngx_buf_t     *hdr_buf;
+  ngx_buf_t     *msg_buf;
+  ngx_str_t      alt_err;
+  uint16_t       code_net;
+  
+  if(err) {
+    alt_err.data=err->data;
+    alt_err.len=err->len;
+  }
+  else {
+    alt_err.data=NULL;
+    alt_err.len=0;
+  }
+  err = &alt_err;
+  
+  if(code == 0) {
+    return websocket_frame_header_chain(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL);
+  }
+  
+  if(code < 1000 || code > 1011) {
+    ERR("invalid websocket close status code %i", code);
+    code=CLOSE_NORMAL;
+  }
+  bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+  msg_buf = &bc->buf;
+  init_msg_buf(msg_buf);
+  set_buf_to_str(msg_buf, err);
+  hdr_chain = websocket_frame_header_chain(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, err->len + 2, &bc->chain);
+  hdr_buf = hdr_chain->buf;
+  //there's definitely enough space at the end for 2 more bytes
+  code_net=htons(code);
+  hdr_buf->last = ngx_copy(hdr_buf->last, &code_net, 2);
+  hdr_buf->end = hdr_buf->last;
+  
+
+  return hdr_chain;
+}
+
+static ngx_int_t websocket_respond_message(subscriber_t *self, nchan_msg_t *msg) {
+  ngx_int_t        rc;
+  full_subscriber_t         *fsub = (full_subscriber_t *)self;
+  ensure_handshake(fsub);
+  
+  if(fsub->timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->timeout_ev);
+    ngx_add_timer(&fsub->timeout_ev, fsub->sub.cf->subscriber_timeout * 1000);
+  }
+  
+  fsub->ctx->prev_msg_id = self->last_msgid;
+  update_subscriber_last_msg_id(self, msg);
+  fsub->ctx->msg_id = self->last_msgid;
+  
+  rc = nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
+  
+  return rc;
+}
+
+static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line) {
+  static const ngx_str_t    STATUS_410=ngx_string("410 Channel Deleted");
+  static const ngx_str_t    STATUS_403=ngx_string("403 Forbidden");
+  static const ngx_str_t    STATUS_500=ngx_string("500 Internal Server Error");
+  static const ngx_str_t    empty=ngx_string("");
+  u_char                    msgbuf[50];
+  ngx_str_t                 custom_close_msg;
+  ngx_str_t                *close_msg = NULL;
+  uint16_t                  close_code = 0;
+  full_subscriber_t        *fsub = (full_subscriber_t *)self;
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //don't care, ignore
+    return NGX_OK;
+  }
+  
+  if(!fsub->shook_hands) {
+    //still in HTTP land
+    return nchan_respond_status(fsub->sub.request, status_code, status_line, 0);
+  }
+  
+  switch(status_code) {
+    case 410:
+      close_code = CLOSE_GOING_AWAY;
+      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_410);
+      break;
+    case 403:
+      close_code = CLOSE_POLICY_VIOLATION;
+      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_403);
+      break;
+    case 500: 
+      close_code = CLOSE_INTERNAL_SERVER_ERROR;
+      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_500);
+      break;
+    default:
+      if((status_code >= 400 && status_code < 600) || status_code == NGX_HTTP_NOT_MODIFIED) {
+        custom_close_msg.data=msgbuf;
+        custom_close_msg.len = ngx_sprintf(msgbuf,"%i %v", status_code, (status_line ? status_line : &empty)) - msgbuf;
+        close_msg = &custom_close_msg;
+        close_code = CLOSE_NORMAL;
+      }
+      else {
+        ERR("unhandled code %i, %v", status_code, (status_line ? status_line : &empty));
+        assert(0);
+      }
+  }
+  websocket_send_close_frame(fsub, close_code, close_msg);
+  
+  return NGX_OK;
+}
+
+
+ngx_int_t nchan_detect_websocket_request(ngx_http_request_t *r) {
+  ngx_str_t       *tmp;
+  
+  if(r->method != NGX_HTTP_GET) {
+    return 0;
+  }
+  
+  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_CONNECTION))) {
+    if(ngx_strlcasestrn(tmp->data, tmp->data + tmp->len, NCHAN_UPGRADE.data, NCHAN_UPGRADE.len - 1) == NULL) return 0;
+  }
+  else return 0;
+  
+  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_UPGRADE))) {
+    if(tmp->len != NCHAN_WEBSOCKET.len || ngx_strncasecmp(tmp->data, NCHAN_WEBSOCKET.data, NCHAN_WEBSOCKET.len) != 0) return 0;
+  }
+  else return 0;
+
+  return 1;
+}
+
+static const subscriber_fn_t websocket_fn = {
+  &websocket_enqueue,
+  &websocket_dequeue,
+  &websocket_respond_message,
+  &websocket_respond_status,
+  &websocket_set_dequeue_callback,
+  &websocket_reserve,
+  &websocket_release,
+  &nchan_subscriber_empty_notify,
+  &nchan_subscriber_authorize_subscribe
+};
+
+static ngx_str_t     sub_name = ngx_string("websocket");
+
+static const subscriber_t new_websocket_sub = {
+  &sub_name,
+  WEBSOCKET,
+  &websocket_fn,
+  UNKNOWN,
+  NCHAN_ZERO_MSGID,
+  NULL,
+  NULL,
+  0, //reserved
+  0, //deque after response
+  1, //destroy after dequeue
+  0, //enqueued
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  NULL,
+  NULL
+#endif
+};
diff --git a/debian/modules/nchan/src/subscribers/websocket.h b/debian/modules/nchan/src/subscribers/websocket.h
new file mode 100644
index 0000000..ff15b24
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/websocket.h
@@ -0,0 +1,4 @@
+subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+ngx_int_t websocket_subscriber_destroy(subscriber_t *sub);
+
+ngx_int_t nchan_detect_websocket_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/uthash.h b/debian/modules/nchan/src/uthash.h
new file mode 100644
index 0000000..375f9e4
--- /dev/null
+++ b/debian/modules/nchan/src/uthash.h
@@ -0,0 +1,950 @@
+/*
+Copyright (c) 2003-2014, Troy D. Hanson     http://troydhanson.github.com/uthash/
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef UTHASH_H
+#define UTHASH_H 
+
+#include <string.h>   /* memcmp,strlen */
+#include <stddef.h>   /* ptrdiff_t */
+#include <stdlib.h>   /* exit() */
+
+/* These macros use decltype or the earlier __typeof GNU extension.
+   As decltype is only available in newer compilers (VS2010 or gcc 4.3+
+   when compiling c++ source) this code uses whatever method is needed
+   or, for VS2008 where neither is available, uses casting workarounds. */
+#ifdef _MSC_VER         /* MS compiler */
+#if _MSC_VER >= 1600 && defined(__cplusplus)  /* VS2010 or newer in C++ mode */
+#define DECLTYPE(x) (decltype(x))
+#else                   /* VS2008 or older (or VS2010 in C mode) */
+#define NO_DECLTYPE
+#define DECLTYPE(x)
+#endif
+#else                   /* GNU, Sun and other compilers */
+#define DECLTYPE(x) (__typeof(x))
+#endif
+
+#ifdef NO_DECLTYPE
+#define DECLTYPE_ASSIGN(dst,src)                                                 \
+do {                                                                             \
+  char **_da_dst = (char**)(&(dst));                                             \
+  *_da_dst = (char*)(src);                                                       \
+} while(0)
+#else 
+#define DECLTYPE_ASSIGN(dst,src)                                                 \
+do {                                                                             \
+  (dst) = DECLTYPE(dst)(src);                                                    \
+} while(0)
+#endif
+
+/* a number of the hash function use uint32_t which isn't defined on win32 */
+#ifdef _MSC_VER
+typedef unsigned int uint32_t;
+typedef unsigned char uint8_t;
+#else
+#include <inttypes.h>   /* uint32_t */
+#endif
+
+#define UTHASH_VERSION 1.9.9
+
+#ifndef uthash_fatal
+#define uthash_fatal(msg) exit(-1)        /* fatal error (out of memory,etc) */
+#endif
+#ifndef uthash_malloc
+#define uthash_malloc(sz) malloc(sz)      /* malloc fcn                      */
+#endif
+#ifndef uthash_free
+#define uthash_free(ptr,sz) free(ptr)     /* free fcn                        */
+#endif
+
+#ifndef uthash_noexpand_fyi
+#define uthash_noexpand_fyi(tbl)          /* can be defined to log noexpand  */
+#endif
+#ifndef uthash_expand_fyi
+#define uthash_expand_fyi(tbl)            /* can be defined to log expands   */
+#endif
+
+/* initial number of buckets */
+#define HASH_INITIAL_NUM_BUCKETS 32      /* initial number of buckets        */
+#define HASH_INITIAL_NUM_BUCKETS_LOG2 5  /* lg2 of initial number of buckets */
+#define HASH_BKT_CAPACITY_THRESH 10      /* expand when bucket count reaches */
+
+/* calculate the element whose hash handle address is hhe */
+#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho)))
+
+#define HASH_FIND(hh,head,keyptr,keylen,out)                                     \
+do {                                                                             \
+  unsigned _hf_bkt,_hf_hashv;                                                    \
+  out=NULL;                                                                      \
+  if (head) {                                                                    \
+     HASH_FCN(keyptr,keylen, (head)->hh.tbl->num_buckets, _hf_hashv, _hf_bkt);   \
+     if (HASH_BLOOM_TEST((head)->hh.tbl, _hf_hashv)) {                           \
+       HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ],  \
+                        keyptr,keylen,out);                                      \
+     }                                                                           \
+  }                                                                              \
+} while (0)
+
+#ifdef HASH_BLOOM
+#define HASH_BLOOM_BITLEN (1ULL << HASH_BLOOM)
+#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8) + ((HASH_BLOOM_BITLEN%8) ? 1:0)
+#define HASH_BLOOM_MAKE(tbl)                                                     \
+do {                                                                             \
+  (tbl)->bloom_nbits = HASH_BLOOM;                                               \
+  (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN);                 \
+  if (!((tbl)->bloom_bv))  { uthash_fatal( "out of memory"); }                   \
+  memset((tbl)->bloom_bv, 0, HASH_BLOOM_BYTELEN);                                \
+  (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE;                                       \
+} while (0) 
+
+#define HASH_BLOOM_FREE(tbl)                                                     \
+do {                                                                             \
+  uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN);                              \
+} while (0) 
+
+#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8] |= (1U << ((idx)%8)))
+#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8] & (1U << ((idx)%8)))
+
+#define HASH_BLOOM_ADD(tbl,hashv)                                                \
+  HASH_BLOOM_BITSET((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1)))
+
+#define HASH_BLOOM_TEST(tbl,hashv)                                               \
+  HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1)))
+
+#else
+#define HASH_BLOOM_MAKE(tbl) 
+#define HASH_BLOOM_FREE(tbl) 
+#define HASH_BLOOM_ADD(tbl,hashv) 
+#define HASH_BLOOM_TEST(tbl,hashv) (1)
+#define HASH_BLOOM_BYTELEN 0
+#endif
+
+#define HASH_MAKE_TABLE(hh,head)                                                 \
+do {                                                                             \
+  (head)->hh.tbl = (UT_hash_table*)uthash_malloc(                                \
+                  sizeof(UT_hash_table));                                        \
+  if (!((head)->hh.tbl))  { uthash_fatal( "out of memory"); }                    \
+  memset((head)->hh.tbl, 0, sizeof(UT_hash_table));                              \
+  (head)->hh.tbl->tail = &((head)->hh);                                          \
+  (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS;                        \
+  (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2;              \
+  (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head);                    \
+  (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc(                      \
+          HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));               \
+  if (! (head)->hh.tbl->buckets) { uthash_fatal( "out of memory"); }             \
+  memset((head)->hh.tbl->buckets, 0,                                             \
+          HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));               \
+  HASH_BLOOM_MAKE((head)->hh.tbl);                                               \
+  (head)->hh.tbl->signature = HASH_SIGNATURE;                                    \
+} while(0)
+
+#define HASH_ADD(hh,head,fieldname,keylen_in,add)                                \
+        HASH_ADD_KEYPTR(hh,head,&((add)->fieldname),keylen_in,add)
+
+#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced)                   \
+do {                                                                             \
+  replaced=NULL;                                                                 \
+  HASH_FIND(hh,head,&((add)->fieldname),keylen_in,replaced);                     \
+  if (replaced!=NULL) {                                                          \
+     HASH_DELETE(hh,head,replaced);                                              \
+  };                                                                             \
+  HASH_ADD(hh,head,fieldname,keylen_in,add);                                     \
+} while(0)
+ 
+#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add)                            \
+do {                                                                             \
+ unsigned _ha_bkt;                                                               \
+ (add)->hh.next = NULL;                                                          \
+ (add)->hh.key = (char*)(keyptr);                                                \
+ (add)->hh.keylen = (unsigned)(keylen_in);                                       \
+ if (!(head)) {                                                                  \
+    head = (add);                                                                \
+    (head)->hh.prev = NULL;                                                      \
+    HASH_MAKE_TABLE(hh,head);                                                    \
+ } else {                                                                        \
+    (head)->hh.tbl->tail->next = (add);                                          \
+    (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail);         \
+    (head)->hh.tbl->tail = &((add)->hh);                                         \
+ }                                                                               \
+ (head)->hh.tbl->num_items++;                                                    \
+ (add)->hh.tbl = (head)->hh.tbl;                                                 \
+ HASH_FCN(keyptr,keylen_in, (head)->hh.tbl->num_buckets,                         \
+         (add)->hh.hashv, _ha_bkt);                                              \
+ HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt],&(add)->hh);                   \
+ HASH_BLOOM_ADD((head)->hh.tbl,(add)->hh.hashv);                                 \
+ HASH_EMIT_KEY(hh,head,keyptr,keylen_in);                                        \
+ HASH_FSCK(hh,head);                                                             \
+} while(0)
+
+#define HASH_TO_BKT( hashv, num_bkts, bkt )                                      \
+do {                                                                             \
+  bkt = ((hashv) & ((num_bkts) - 1));                                            \
+} while(0)
+
+/* delete "delptr" from the hash table.
+ * "the usual" patch-up process for the app-order doubly-linked-list.
+ * The use of _hd_hh_del below deserves special explanation.
+ * These used to be expressed using (delptr) but that led to a bug
+ * if someone used the same symbol for the head and deletee, like
+ *  HASH_DELETE(hh,users,users);
+ * We want that to work, but by changing the head (users) below
+ * we were forfeiting our ability to further refer to the deletee (users)
+ * in the patch-up process. Solution: use scratch space to
+ * copy the deletee pointer, then the latter references are via that
+ * scratch pointer rather than through the repointed (users) symbol.
+ */
+#define HASH_DELETE(hh,head,delptr)                                              \
+do {                                                                             \
+    unsigned _hd_bkt;                                                            \
+    struct UT_hash_handle *_hd_hh_del;                                           \
+    if ( ((delptr)->hh.prev == NULL) && ((delptr)->hh.next == NULL) )  {         \
+        uthash_free((head)->hh.tbl->buckets,                                     \
+                    (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \
+        HASH_BLOOM_FREE((head)->hh.tbl);                                         \
+        uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                      \
+        head = NULL;                                                             \
+    } else {                                                                     \
+        _hd_hh_del = &((delptr)->hh);                                            \
+        if ((delptr) == ELMT_FROM_HH((head)->hh.tbl,(head)->hh.tbl->tail)) {     \
+            (head)->hh.tbl->tail =                                               \
+                (UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) +               \
+                (head)->hh.tbl->hho);                                            \
+        }                                                                        \
+        if ((delptr)->hh.prev) {                                                 \
+            ((UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) +                  \
+                    (head)->hh.tbl->hho))->next = (delptr)->hh.next;             \
+        } else {                                                                 \
+            DECLTYPE_ASSIGN(head,(delptr)->hh.next);                             \
+        }                                                                        \
+        if (_hd_hh_del->next) {                                                  \
+            ((UT_hash_handle*)((ptrdiff_t)_hd_hh_del->next +                     \
+                    (head)->hh.tbl->hho))->prev =                                \
+                    _hd_hh_del->prev;                                            \
+        }                                                                        \
+        HASH_TO_BKT( _hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt);   \
+        HASH_DEL_IN_BKT(hh,(head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del);        \
+        (head)->hh.tbl->num_items--;                                             \
+    }                                                                            \
+    HASH_FSCK(hh,head);                                                          \
+} while (0)
+
+
+/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
+#define HASH_FIND_STR(head,findstr,out)                                          \
+    HASH_FIND(hh,head,findstr,strlen(findstr),out)
+#define HASH_ADD_STR(head,strfield,add)                                          \
+    HASH_ADD(hh,head,strfield[0],strlen(add->strfield),add)
+#define HASH_REPLACE_STR(head,strfield,add,replaced)                             \
+    HASH_REPLACE(hh,head,strfield[0],strlen(add->strfield),add,replaced)
+#define HASH_FIND_INT(head,findint,out)                                          \
+    HASH_FIND(hh,head,findint,sizeof(int),out)
+#define HASH_ADD_INT(head,intfield,add)                                          \
+    HASH_ADD(hh,head,intfield,sizeof(int),add)
+#define HASH_REPLACE_INT(head,intfield,add,replaced)                             \
+    HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced)
+#define HASH_FIND_PTR(head,findptr,out)                                          \
+    HASH_FIND(hh,head,findptr,sizeof(void *),out)
+#define HASH_ADD_PTR(head,ptrfield,add)                                          \
+    HASH_ADD(hh,head,ptrfield,sizeof(void *),add)
+#define HASH_REPLACE_PTR(head,ptrfield,add,replaced)                             \
+    HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced)
+#define HASH_DEL(head,delptr)                                                    \
+    HASH_DELETE(hh,head,delptr)
+
+/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined.
+ * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined.
+ */
+#ifdef HASH_DEBUG
+#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
+#define HASH_FSCK(hh,head)                                                       \
+do {                                                                             \
+    unsigned _bkt_i;                                                             \
+    unsigned _count, _bkt_count;                                                 \
+    char *_prev;                                                                 \
+    struct UT_hash_handle *_thh;                                                 \
+    if (head) {                                                                  \
+        _count = 0;                                                              \
+        for( _bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; _bkt_i++) {       \
+            _bkt_count = 0;                                                      \
+            _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head;                      \
+            _prev = NULL;                                                        \
+            while (_thh) {                                                       \
+               if (_prev != (char*)(_thh->hh_prev)) {                            \
+                   HASH_OOPS("invalid hh_prev %p, actual %p\n",                  \
+                    _thh->hh_prev, _prev );                                      \
+               }                                                                 \
+               _bkt_count++;                                                     \
+               _prev = (char*)(_thh);                                            \
+               _thh = _thh->hh_next;                                             \
+            }                                                                    \
+            _count += _bkt_count;                                                \
+            if ((head)->hh.tbl->buckets[_bkt_i].count !=  _bkt_count) {          \
+               HASH_OOPS("invalid bucket count %d, actual %d\n",                 \
+                (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count);              \
+            }                                                                    \
+        }                                                                        \
+        if (_count != (head)->hh.tbl->num_items) {                               \
+            HASH_OOPS("invalid hh item count %d, actual %d\n",                   \
+                (head)->hh.tbl->num_items, _count );                             \
+        }                                                                        \
+        /* traverse hh in app order; check next/prev integrity, count */         \
+        _count = 0;                                                              \
+        _prev = NULL;                                                            \
+        _thh =  &(head)->hh;                                                     \
+        while (_thh) {                                                           \
+           _count++;                                                             \
+           if (_prev !=(char*)(_thh->prev)) {                                    \
+              HASH_OOPS("invalid prev %p, actual %p\n",                          \
+                    _thh->prev, _prev );                                         \
+           }                                                                     \
+           _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh);                    \
+           _thh = ( _thh->next ?  (UT_hash_handle*)((char*)(_thh->next) +        \
+                                  (head)->hh.tbl->hho) : NULL );                 \
+        }                                                                        \
+        if (_count != (head)->hh.tbl->num_items) {                               \
+            HASH_OOPS("invalid app item count %d, actual %d\n",                  \
+                (head)->hh.tbl->num_items, _count );                             \
+        }                                                                        \
+    }                                                                            \
+} while (0)
+#else
+#define HASH_FSCK(hh,head) 
+#endif
+
+/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to 
+ * the descriptor to which this macro is defined for tuning the hash function.
+ * The app can #include <unistd.h> to get the prototype for write(2). */
+#ifdef HASH_EMIT_KEYS
+#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                                   \
+do {                                                                             \
+    unsigned _klen = fieldlen;                                                   \
+    write(HASH_EMIT_KEYS, &_klen, sizeof(_klen));                                \
+    write(HASH_EMIT_KEYS, keyptr, fieldlen);                                     \
+} while (0)
+#else 
+#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                    
+#endif
+
+/* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */
+#ifdef HASH_FUNCTION 
+#define HASH_FCN HASH_FUNCTION
+#else
+#define HASH_FCN HASH_JEN
+#endif
+
+/* The Bernstein hash function, used in Perl prior to v5.6. Note (x<<5+x)=x*33. */
+#define HASH_BER(key,keylen,num_bkts,hashv,bkt)                                  \
+do {                                                                             \
+  unsigned _hb_keylen=keylen;                                                    \
+  char *_hb_key=(char*)(key);                                                    \
+  (hashv) = 0;                                                                   \
+  while (_hb_keylen--)  { (hashv) = (((hashv) << 5) + (hashv)) + *_hb_key++; }   \
+  bkt = (hashv) & (num_bkts-1);                                                  \
+} while (0)
+
+
+/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at 
+ * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */
+#define HASH_SAX(key,keylen,num_bkts,hashv,bkt)                                  \
+do {                                                                             \
+  unsigned _sx_i;                                                                \
+  char *_hs_key=(char*)(key);                                                    \
+  hashv = 0;                                                                     \
+  for(_sx_i=0; _sx_i < keylen; _sx_i++)                                          \
+      hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i];                     \
+  bkt = hashv & (num_bkts-1);                                                    \
+} while (0)
+/* FNV-1a variation */
+#define HASH_FNV(key,keylen,num_bkts,hashv,bkt)                                  \
+do {                                                                             \
+  unsigned _fn_i;                                                                \
+  char *_hf_key=(char*)(key);                                                    \
+  hashv = 2166136261UL;                                                          \
+  for(_fn_i=0; _fn_i < keylen; _fn_i++)                                          \
+      hashv = hashv ^ _hf_key[_fn_i];                                            \
+      hashv = hashv * 16777619;                                                  \
+  bkt = hashv & (num_bkts-1);                                                    \
+} while(0) 
+ 
+#define HASH_OAT(key,keylen,num_bkts,hashv,bkt)                                  \
+do {                                                                             \
+  unsigned _ho_i;                                                                \
+  char *_ho_key=(char*)(key);                                                    \
+  hashv = 0;                                                                     \
+  for(_ho_i=0; _ho_i < keylen; _ho_i++) {                                        \
+      hashv += _ho_key[_ho_i];                                                   \
+      hashv += (hashv << 10);                                                    \
+      hashv ^= (hashv >> 6);                                                     \
+  }                                                                              \
+  hashv += (hashv << 3);                                                         \
+  hashv ^= (hashv >> 11);                                                        \
+  hashv += (hashv << 15);                                                        \
+  bkt = hashv & (num_bkts-1);                                                    \
+} while(0)
+
+#define HASH_JEN_MIX(a,b,c)                                                      \
+do {                                                                             \
+  a -= b; a -= c; a ^= ( c >> 13 );                                              \
+  b -= c; b -= a; b ^= ( a << 8 );                                               \
+  c -= a; c -= b; c ^= ( b >> 13 );                                              \
+  a -= b; a -= c; a ^= ( c >> 12 );                                              \
+  b -= c; b -= a; b ^= ( a << 16 );                                              \
+  c -= a; c -= b; c ^= ( b >> 5 );                                               \
+  a -= b; a -= c; a ^= ( c >> 3 );                                               \
+  b -= c; b -= a; b ^= ( a << 10 );                                              \
+  c -= a; c -= b; c ^= ( b >> 15 );                                              \
+} while (0)
+
+#define HASH_JEN(key,keylen,num_bkts,hashv,bkt)                                  \
+do {                                                                             \
+  unsigned _hj_i,_hj_j,_hj_k;                                                    \
+  unsigned char *_hj_key=(unsigned char*)(key);                                  \
+  hashv = 0xfeedbeef;                                                            \
+  _hj_i = _hj_j = 0x9e3779b9;                                                    \
+  _hj_k = (unsigned)(keylen);                                                      \
+  while (_hj_k >= 12) {                                                          \
+    _hj_i +=    (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 )                      \
+        + ( (unsigned)_hj_key[2] << 16 )                                         \
+        + ( (unsigned)_hj_key[3] << 24 ) );                                      \
+    _hj_j +=    (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 )                      \
+        + ( (unsigned)_hj_key[6] << 16 )                                         \
+        + ( (unsigned)_hj_key[7] << 24 ) );                                      \
+    hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 )                         \
+        + ( (unsigned)_hj_key[10] << 16 )                                        \
+        + ( (unsigned)_hj_key[11] << 24 ) );                                     \
+                                                                                 \
+     HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                          \
+                                                                                 \
+     _hj_key += 12;                                                              \
+     _hj_k -= 12;                                                                \
+  }                                                                              \
+  hashv += keylen;                                                               \
+  switch ( _hj_k ) {                                                             \
+     case 11: hashv += ( (unsigned)_hj_key[10] << 24 );                          \
+     case 10: hashv += ( (unsigned)_hj_key[9] << 16 );                           \
+     case 9:  hashv += ( (unsigned)_hj_key[8] << 8 );                            \
+     case 8:  _hj_j += ( (unsigned)_hj_key[7] << 24 );                           \
+     case 7:  _hj_j += ( (unsigned)_hj_key[6] << 16 );                           \
+     case 6:  _hj_j += ( (unsigned)_hj_key[5] << 8 );                            \
+     case 5:  _hj_j += _hj_key[4];                                               \
+     case 4:  _hj_i += ( (unsigned)_hj_key[3] << 24 );                           \
+     case 3:  _hj_i += ( (unsigned)_hj_key[2] << 16 );                           \
+     case 2:  _hj_i += ( (unsigned)_hj_key[1] << 8 );                            \
+     case 1:  _hj_i += _hj_key[0];                                               \
+  }                                                                              \
+  HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                             \
+  bkt = hashv & (num_bkts-1);                                                    \
+} while(0)
+
+/* The Paul Hsieh hash function */
+#undef get16bits
+#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__)             \
+  || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
+#define get16bits(d) (*((const uint16_t *) (d)))
+#endif
+
+#if !defined (get16bits)
+#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)             \
+                       +(uint32_t)(((const uint8_t *)(d))[0]) )
+#endif
+#define HASH_SFH(key,keylen,num_bkts,hashv,bkt)                                  \
+do {                                                                             \
+  unsigned char *_sfh_key=(unsigned char*)(key);                                 \
+  uint32_t _sfh_tmp, _sfh_len = keylen;                                          \
+                                                                                 \
+  int _sfh_rem = _sfh_len & 3;                                                   \
+  _sfh_len >>= 2;                                                                \
+  hashv = 0xcafebabe;                                                            \
+                                                                                 \
+  /* Main loop */                                                                \
+  for (;_sfh_len > 0; _sfh_len--) {                                              \
+    hashv    += get16bits (_sfh_key);                                            \
+    _sfh_tmp       = (uint32_t)(get16bits (_sfh_key+2)) << 11  ^ hashv;          \
+    hashv     = (hashv << 16) ^ _sfh_tmp;                                        \
+    _sfh_key += 2*sizeof (uint16_t);                                             \
+    hashv    += hashv >> 11;                                                     \
+  }                                                                              \
+                                                                                 \
+  /* Handle end cases */                                                         \
+  switch (_sfh_rem) {                                                            \
+    case 3: hashv += get16bits (_sfh_key);                                       \
+            hashv ^= hashv << 16;                                                \
+            hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)] << 18);              \
+            hashv += hashv >> 11;                                                \
+            break;                                                               \
+    case 2: hashv += get16bits (_sfh_key);                                       \
+            hashv ^= hashv << 11;                                                \
+            hashv += hashv >> 17;                                                \
+            break;                                                               \
+    case 1: hashv += *_sfh_key;                                                  \
+            hashv ^= hashv << 10;                                                \
+            hashv += hashv >> 1;                                                 \
+  }                                                                              \
+                                                                                 \
+    /* Force "avalanching" of final 127 bits */                                  \
+    hashv ^= hashv << 3;                                                         \
+    hashv += hashv >> 5;                                                         \
+    hashv ^= hashv << 4;                                                         \
+    hashv += hashv >> 17;                                                        \
+    hashv ^= hashv << 25;                                                        \
+    hashv += hashv >> 6;                                                         \
+    bkt = hashv & (num_bkts-1);                                                  \
+} while(0) 
+
+#ifdef HASH_USING_NO_STRICT_ALIASING
+/* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads.
+ * For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error.
+ * MurmurHash uses the faster approach only on CPU's where we know it's safe. 
+ *
+ * Note the preprocessor built-in defines can be emitted using:
+ *
+ *   gcc -m64 -dM -E - < /dev/null                  (on gcc)
+ *   cc -## a.c (where a.c is a simple test file)   (Sun Studio)
+ */
+#if (defined(__i386__) || defined(__x86_64__)  || defined(_M_IX86))
+#define MUR_GETBLOCK(p,i) p[i]
+#else /* non intel */
+#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0)
+#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 0x3) == 1)
+#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 0x3) == 2)
+#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 0x3) == 3)
+#define WP(p) ((uint32_t*)((unsigned long)(p) & ~3UL))
+#if (defined(__BIG_ENDIAN__) || defined(SPARC) || defined(__ppc__) || defined(__ppc64__))
+#define MUR_THREE_ONE(p) ((((*WP(p))&0x00ffffff) << 8) | (((*(WP(p)+1))&0xff000000) >> 24))
+#define MUR_TWO_TWO(p)   ((((*WP(p))&0x0000ffff) <<16) | (((*(WP(p)+1))&0xffff0000) >> 16))
+#define MUR_ONE_THREE(p) ((((*WP(p))&0x000000ff) <<24) | (((*(WP(p)+1))&0xffffff00) >>  8))
+#else /* assume little endian non-intel */
+#define MUR_THREE_ONE(p) ((((*WP(p))&0xffffff00) >> 8) | (((*(WP(p)+1))&0x000000ff) << 24))
+#define MUR_TWO_TWO(p)   ((((*WP(p))&0xffff0000) >>16) | (((*(WP(p)+1))&0x0000ffff) << 16))
+#define MUR_ONE_THREE(p) ((((*WP(p))&0xff000000) >>24) | (((*(WP(p)+1))&0x00ffffff) <<  8))
+#endif
+#define MUR_GETBLOCK(p,i) (MUR_PLUS0_ALIGNED(p) ? ((p)[i]) :           \
+                            (MUR_PLUS1_ALIGNED(p) ? MUR_THREE_ONE(p) : \
+                             (MUR_PLUS2_ALIGNED(p) ? MUR_TWO_TWO(p) :  \
+                                                      MUR_ONE_THREE(p))))
+#endif
+#define MUR_ROTL32(x,r) (((x) << (r)) | ((x) >> (32 - (r))))
+#define MUR_FMIX(_h) \
+do {                 \
+  _h ^= _h >> 16;    \
+  _h *= 0x85ebca6b;  \
+  _h ^= _h >> 13;    \
+  _h *= 0xc2b2ae35l; \
+  _h ^= _h >> 16;    \
+} while(0)
+
+#define HASH_MUR(key,keylen,num_bkts,hashv,bkt)                        \
+do {                                                                   \
+  const uint8_t *_mur_data = (const uint8_t*)(key);                    \
+  const int _mur_nblocks = (keylen) / 4;                               \
+  uint32_t _mur_h1 = 0xf88D5353;                                       \
+  uint32_t _mur_c1 = 0xcc9e2d51;                                       \
+  uint32_t _mur_c2 = 0x1b873593;                                       \
+  uint32_t _mur_k1 = 0;                                                \
+  const uint8_t *_mur_tail;                                            \
+  const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+_mur_nblocks*4); \
+  int _mur_i;                                                          \
+  for(_mur_i = -_mur_nblocks; _mur_i; _mur_i++) {                      \
+    _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i);                        \
+    _mur_k1 *= _mur_c1;                                                \
+    _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
+    _mur_k1 *= _mur_c2;                                                \
+                                                                       \
+    _mur_h1 ^= _mur_k1;                                                \
+    _mur_h1 = MUR_ROTL32(_mur_h1,13);                                  \
+    _mur_h1 = _mur_h1*5+0xe6546b64;                                    \
+  }                                                                    \
+  _mur_tail = (const uint8_t*)(_mur_data + _mur_nblocks*4);            \
+  _mur_k1=0;                                                           \
+  switch((keylen) & 3) {                                               \
+    case 3: _mur_k1 ^= _mur_tail[2] << 16;                             \
+    case 2: _mur_k1 ^= _mur_tail[1] << 8;                              \
+    case 1: _mur_k1 ^= _mur_tail[0];                                   \
+    _mur_k1 *= _mur_c1;                                                \
+    _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
+    _mur_k1 *= _mur_c2;                                                \
+    _mur_h1 ^= _mur_k1;                                                \
+  }                                                                    \
+  _mur_h1 ^= (keylen);                                                 \
+  MUR_FMIX(_mur_h1);                                                   \
+  hashv = _mur_h1;                                                     \
+  bkt = hashv & (num_bkts-1);                                          \
+} while(0)
+#endif  /* HASH_USING_NO_STRICT_ALIASING */
+
+/* key comparison function; return 0 if keys equal */
+#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) 
+
+/* iterate over items in a known bucket to find desired item */
+#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out)                       \
+do {                                                                             \
+ if (head.hh_head) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,head.hh_head));          \
+ else out=NULL;                                                                  \
+ while (out) {                                                                   \
+    if ((out)->hh.keylen == keylen_in) {                                           \
+        if ((HASH_KEYCMP((out)->hh.key,keyptr,keylen_in)) == 0) break;             \
+    }                                                                            \
+    if ((out)->hh.hh_next) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,(out)->hh.hh_next)); \
+    else out = NULL;                                                             \
+ }                                                                               \
+} while(0)
+
+/* add an item to a bucket  */
+#define HASH_ADD_TO_BKT(head,addhh)                                              \
+do {                                                                             \
+ head.count++;                                                                   \
+ (addhh)->hh_next = head.hh_head;                                                \
+ (addhh)->hh_prev = NULL;                                                        \
+ if (head.hh_head) { (head).hh_head->hh_prev = (addhh); }                        \
+ (head).hh_head=addhh;                                                           \
+ if (head.count >= ((head.expand_mult+1) * HASH_BKT_CAPACITY_THRESH)             \
+     && (addhh)->tbl->noexpand != 1) {                                           \
+       HASH_EXPAND_BUCKETS((addhh)->tbl);                                        \
+ }                                                                               \
+} while(0)
+
+/* remove an item from a given bucket */
+#define HASH_DEL_IN_BKT(hh,head,hh_del)                                          \
+    (head).count--;                                                              \
+    if ((head).hh_head == hh_del) {                                              \
+      (head).hh_head = hh_del->hh_next;                                          \
+    }                                                                            \
+    if (hh_del->hh_prev) {                                                       \
+        hh_del->hh_prev->hh_next = hh_del->hh_next;                              \
+    }                                                                            \
+    if (hh_del->hh_next) {                                                       \
+        hh_del->hh_next->hh_prev = hh_del->hh_prev;                              \
+    }                                                                
+
+/* Bucket expansion has the effect of doubling the number of buckets
+ * and redistributing the items into the new buckets. Ideally the
+ * items will distribute more or less evenly into the new buckets
+ * (the extent to which this is true is a measure of the quality of
+ * the hash function as it applies to the key domain). 
+ * 
+ * With the items distributed into more buckets, the chain length
+ * (item count) in each bucket is reduced. Thus by expanding buckets
+ * the hash keeps a bound on the chain length. This bounded chain 
+ * length is the essence of how a hash provides constant time lookup.
+ * 
+ * The calculation of tbl->ideal_chain_maxlen below deserves some
+ * explanation. First, keep in mind that we're calculating the ideal
+ * maximum chain length based on the *new* (doubled) bucket count.
+ * In fractions this is just n/b (n=number of items,b=new num buckets).
+ * Since the ideal chain length is an integer, we want to calculate 
+ * ceil(n/b). We don't depend on floating point arithmetic in this
+ * hash, so to calculate ceil(n/b) with integers we could write
+ * 
+ *      ceil(n/b) = (n/b) + ((n%b)?1:0)
+ * 
+ * and in fact a previous version of this hash did just that.
+ * But now we have improved things a bit by recognizing that b is
+ * always a power of two. We keep its base 2 log handy (call it lb),
+ * so now we can write this with a bit shift and logical AND:
+ * 
+ *      ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0)
+ * 
+ */
+#define HASH_EXPAND_BUCKETS(tbl)                                                 \
+do {                                                                             \
+    unsigned _he_bkt;                                                            \
+    unsigned _he_bkt_i;                                                          \
+    struct UT_hash_handle *_he_thh, *_he_hh_nxt;                                 \
+    UT_hash_bucket *_he_new_buckets, *_he_newbkt;                                \
+    _he_new_buckets = (UT_hash_bucket*)uthash_malloc(                            \
+             2 * tbl->num_buckets * sizeof(struct UT_hash_bucket));              \
+    if (!_he_new_buckets) { uthash_fatal( "out of memory"); }                    \
+    memset(_he_new_buckets, 0,                                                   \
+            2 * tbl->num_buckets * sizeof(struct UT_hash_bucket));               \
+    tbl->ideal_chain_maxlen =                                                    \
+       (tbl->num_items >> (tbl->log2_num_buckets+1)) +                           \
+       ((tbl->num_items & ((tbl->num_buckets*2)-1)) ? 1 : 0);                    \
+    tbl->nonideal_items = 0;                                                     \
+    for(_he_bkt_i = 0; _he_bkt_i < tbl->num_buckets; _he_bkt_i++)                \
+    {                                                                            \
+        _he_thh = tbl->buckets[ _he_bkt_i ].hh_head;                             \
+        while (_he_thh) {                                                        \
+           _he_hh_nxt = _he_thh->hh_next;                                        \
+           HASH_TO_BKT( _he_thh->hashv, tbl->num_buckets*2, _he_bkt);            \
+           _he_newbkt = &(_he_new_buckets[ _he_bkt ]);                           \
+           if (++(_he_newbkt->count) > tbl->ideal_chain_maxlen) {                \
+             tbl->nonideal_items++;                                              \
+             _he_newbkt->expand_mult = _he_newbkt->count /                       \
+                                        tbl->ideal_chain_maxlen;                 \
+           }                                                                     \
+           _he_thh->hh_prev = NULL;                                              \
+           _he_thh->hh_next = _he_newbkt->hh_head;                               \
+           if (_he_newbkt->hh_head) _he_newbkt->hh_head->hh_prev =               \
+                _he_thh;                                                         \
+           _he_newbkt->hh_head = _he_thh;                                        \
+           _he_thh = _he_hh_nxt;                                                 \
+        }                                                                        \
+    }                                                                            \
+    uthash_free( tbl->buckets, tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \
+    tbl->num_buckets *= 2;                                                       \
+    tbl->log2_num_buckets++;                                                     \
+    tbl->buckets = _he_new_buckets;                                              \
+    tbl->ineff_expands = (tbl->nonideal_items > (tbl->num_items >> 1)) ?         \
+        (tbl->ineff_expands+1) : 0;                                              \
+    if (tbl->ineff_expands > 1) {                                                \
+        tbl->noexpand=1;                                                         \
+        uthash_noexpand_fyi(tbl);                                                \
+    }                                                                            \
+    uthash_expand_fyi(tbl);                                                      \
+} while(0)
+
+
+/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
+/* Note that HASH_SORT assumes the hash handle name to be hh. 
+ * HASH_SRT was added to allow the hash handle name to be passed in. */
+#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn)
+#define HASH_SRT(hh,head,cmpfcn)                                                 \
+do {                                                                             \
+  unsigned _hs_i;                                                                \
+  unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize;               \
+  struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail;            \
+  if (head) {                                                                    \
+      _hs_insize = 1;                                                            \
+      _hs_looping = 1;                                                           \
+      _hs_list = &((head)->hh);                                                  \
+      while (_hs_looping) {                                                      \
+          _hs_p = _hs_list;                                                      \
+          _hs_list = NULL;                                                       \
+          _hs_tail = NULL;                                                       \
+          _hs_nmerges = 0;                                                       \
+          while (_hs_p) {                                                        \
+              _hs_nmerges++;                                                     \
+              _hs_q = _hs_p;                                                     \
+              _hs_psize = 0;                                                     \
+              for ( _hs_i = 0; _hs_i  < _hs_insize; _hs_i++ ) {                  \
+                  _hs_psize++;                                                   \
+                  _hs_q = (UT_hash_handle*)((_hs_q->next) ?                      \
+                          ((void*)((char*)(_hs_q->next) +                        \
+                          (head)->hh.tbl->hho)) : NULL);                         \
+                  if (! (_hs_q) ) break;                                         \
+              }                                                                  \
+              _hs_qsize = _hs_insize;                                            \
+              while ((_hs_psize > 0) || ((_hs_qsize > 0) && _hs_q )) {           \
+                  if (_hs_psize == 0) {                                          \
+                      _hs_e = _hs_q;                                             \
+                      _hs_q = (UT_hash_handle*)((_hs_q->next) ?                  \
+                              ((void*)((char*)(_hs_q->next) +                    \
+                              (head)->hh.tbl->hho)) : NULL);                     \
+                      _hs_qsize--;                                               \
+                  } else if ( (_hs_qsize == 0) || !(_hs_q) ) {                   \
+                      _hs_e = _hs_p;                                             \
+                      if (_hs_p){                                                \
+                        _hs_p = (UT_hash_handle*)((_hs_p->next) ?                \
+                                ((void*)((char*)(_hs_p->next) +                  \
+                                (head)->hh.tbl->hho)) : NULL);                   \
+                       }                                                         \
+                      _hs_psize--;                                               \
+                  } else if ((                                                   \
+                      cmpfcn(DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_p)), \
+                             DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_q))) \
+                             ) <= 0) {                                           \
+                      _hs_e = _hs_p;                                             \
+                      if (_hs_p){                                                \
+                        _hs_p = (UT_hash_handle*)((_hs_p->next) ?                \
+                               ((void*)((char*)(_hs_p->next) +                   \
+                               (head)->hh.tbl->hho)) : NULL);                    \
+                       }                                                         \
+                      _hs_psize--;                                               \
+                  } else {                                                       \
+                      _hs_e = _hs_q;                                             \
+                      _hs_q = (UT_hash_handle*)((_hs_q->next) ?                  \
+                              ((void*)((char*)(_hs_q->next) +                    \
+                              (head)->hh.tbl->hho)) : NULL);                     \
+                      _hs_qsize--;                                               \
+                  }                                                              \
+                  if ( _hs_tail ) {                                              \
+                      _hs_tail->next = ((_hs_e) ?                                \
+                            ELMT_FROM_HH((head)->hh.tbl,_hs_e) : NULL);          \
+                  } else {                                                       \
+                      _hs_list = _hs_e;                                          \
+                  }                                                              \
+                  if (_hs_e) {                                                   \
+                  _hs_e->prev = ((_hs_tail) ?                                    \
+                     ELMT_FROM_HH((head)->hh.tbl,_hs_tail) : NULL);              \
+                  }                                                              \
+                  _hs_tail = _hs_e;                                              \
+              }                                                                  \
+              _hs_p = _hs_q;                                                     \
+          }                                                                      \
+          if (_hs_tail){                                                         \
+            _hs_tail->next = NULL;                                               \
+          }                                                                      \
+          if ( _hs_nmerges <= 1 ) {                                              \
+              _hs_looping=0;                                                     \
+              (head)->hh.tbl->tail = _hs_tail;                                   \
+              DECLTYPE_ASSIGN(head,ELMT_FROM_HH((head)->hh.tbl, _hs_list));      \
+          }                                                                      \
+          _hs_insize *= 2;                                                       \
+      }                                                                          \
+      HASH_FSCK(hh,head);                                                        \
+ }                                                                               \
+} while (0)
+
+/* This function selects items from one hash into another hash. 
+ * The end result is that the selected items have dual presence 
+ * in both hashes. There is no copy of the items made; rather 
+ * they are added into the new hash through a secondary hash 
+ * hash handle that must be present in the structure. */
+#define HASH_SELECT(hh_dst, dst, hh_src, src, cond)                              \
+do {                                                                             \
+  unsigned _src_bkt, _dst_bkt;                                                   \
+  void *_last_elt=NULL, *_elt;                                                   \
+  UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL;                         \
+  ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst));                 \
+  if (src) {                                                                     \
+    for(_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) {     \
+      for(_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head;                \
+          _src_hh;                                                               \
+          _src_hh = _src_hh->hh_next) {                                          \
+          _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh);                       \
+          if (cond(_elt)) {                                                      \
+            _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho);               \
+            _dst_hh->key = _src_hh->key;                                         \
+            _dst_hh->keylen = _src_hh->keylen;                                   \
+            _dst_hh->hashv = _src_hh->hashv;                                     \
+            _dst_hh->prev = _last_elt;                                           \
+            _dst_hh->next = NULL;                                                \
+            if (_last_elt_hh) { _last_elt_hh->next = _elt; }                     \
+            if (!dst) {                                                          \
+              DECLTYPE_ASSIGN(dst,_elt);                                         \
+              HASH_MAKE_TABLE(hh_dst,dst);                                       \
+            } else {                                                             \
+              _dst_hh->tbl = (dst)->hh_dst.tbl;                                  \
+            }                                                                    \
+            HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt);    \
+            HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt],_dst_hh);            \
+            (dst)->hh_dst.tbl->num_items++;                                      \
+            _last_elt = _elt;                                                    \
+            _last_elt_hh = _dst_hh;                                              \
+          }                                                                      \
+      }                                                                          \
+    }                                                                            \
+  }                                                                              \
+  HASH_FSCK(hh_dst,dst);                                                         \
+} while (0)
+
+#define HASH_CLEAR(hh,head)                                                      \
+do {                                                                             \
+  if (head) {                                                                    \
+    uthash_free((head)->hh.tbl->buckets,                                         \
+                (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket));      \
+    HASH_BLOOM_FREE((head)->hh.tbl);                                             \
+    uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                          \
+    (head)=NULL;                                                                 \
+  }                                                                              \
+} while(0)
+
+#define HASH_OVERHEAD(hh,head)                                                   \
+ (size_t)((((head)->hh.tbl->num_items   * sizeof(UT_hash_handle))   +            \
+           ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket))   +            \
+            (sizeof(UT_hash_table))                                 +            \
+            (HASH_BLOOM_BYTELEN)))
+
+#ifdef NO_DECLTYPE
+#define HASH_ITER(hh,head,el,tmp)                                                \
+for((el)=(head), (*(char**)(&(tmp)))=(char*)((head)?(head)->hh.next:NULL);       \
+  el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL)) 
+#else
+#define HASH_ITER(hh,head,el,tmp)                                                \
+for((el)=(head),(tmp)=DECLTYPE(el)((head)?(head)->hh.next:NULL);                 \
+  el; (el)=(tmp),(tmp)=DECLTYPE(el)((tmp)?(tmp)->hh.next:NULL))
+#endif
+
+/* obtain a count of items in the hash */
+#define HASH_COUNT(head) HASH_CNT(hh,head) 
+#define HASH_CNT(hh,head) ((head)?((head)->hh.tbl->num_items):0)
+
+typedef struct UT_hash_bucket {
+   struct UT_hash_handle *hh_head;
+   unsigned count;
+
+   /* expand_mult is normally set to 0. In this situation, the max chain length
+    * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If
+    * the bucket's chain exceeds this length, bucket expansion is triggered). 
+    * However, setting expand_mult to a non-zero value delays bucket expansion
+    * (that would be triggered by additions to this particular bucket)
+    * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH.
+    * (The multiplier is simply expand_mult+1). The whole idea of this
+    * multiplier is to reduce bucket expansions, since they are expensive, in
+    * situations where we know that a particular bucket tends to be overused.
+    * It is better to let its chain length grow to a longer yet-still-bounded
+    * value, than to do an O(n) bucket expansion too often. 
+    */
+   unsigned expand_mult;
+
+} UT_hash_bucket;
+
+/* random signature used only to find hash tables in external analysis */
+#define HASH_SIGNATURE 0xa0111fe1
+#define HASH_BLOOM_SIGNATURE 0xb12220f2
+
+typedef struct UT_hash_table {
+   UT_hash_bucket *buckets;
+   unsigned num_buckets, log2_num_buckets;
+   unsigned num_items;
+   struct UT_hash_handle *tail; /* tail hh in app order, for fast append    */
+   ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */
+
+   /* in an ideal situation (all buckets used equally), no bucket would have
+    * more than ceil(#items/#buckets) items. that's the ideal chain length. */
+   unsigned ideal_chain_maxlen;
+
+   /* nonideal_items is the number of items in the hash whose chain position
+    * exceeds the ideal chain maxlen. these items pay the penalty for an uneven
+    * hash distribution; reaching them in a chain traversal takes >ideal steps */
+   unsigned nonideal_items;
+
+   /* ineffective expands occur when a bucket doubling was performed, but 
+    * afterward, more than half the items in the hash had nonideal chain
+    * positions. If this happens on two consecutive expansions we inhibit any
+    * further expansion, as it's not helping; this happens when the hash
+    * function isn't a good fit for the key domain. When expansion is inhibited
+    * the hash will still work, albeit no longer in constant time. */
+   unsigned ineff_expands, noexpand;
+
+   uint32_t signature; /* used only to find hash tables in external analysis */
+#ifdef HASH_BLOOM
+   uint32_t bloom_sig; /* used only to test bloom exists in external analysis */
+   uint8_t *bloom_bv;
+   char bloom_nbits;
+#endif
+
+} UT_hash_table;
+
+typedef struct UT_hash_handle {
+   struct UT_hash_table *tbl;
+   void *prev;                       /* prev element in app order      */
+   void *next;                       /* next element in app order      */
+   struct UT_hash_handle *hh_prev;   /* previous hh in bucket order    */
+   struct UT_hash_handle *hh_next;   /* next hh in bucket order        */
+   void *key;                        /* ptr to enclosing struct's key  */
+   unsigned keylen;                  /* enclosing struct's key len     */
+   unsigned hashv;                   /* result of hash-fcn(key)        */
+} UT_hash_handle;
+
+#endif /* UTHASH_H */
+ 
diff --git a/debian/modules/nchan/src/util/nchan_bufchainpool.c b/debian/modules/nchan/src/util/nchan_bufchainpool.c
new file mode 100644
index 0000000..175c044
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_bufchainpool.c
@@ -0,0 +1,141 @@
+#include <nchan_module.h>
+#include <util/nchan_output.h>
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "BUFCHAINPOOL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "BUFCHAINPOOL:" fmt, ##arg)
+/*
+static void validate_stuff(nchan_bufchain_pool_t *bcp) {
+  nchan_bufchain_link_t      *cur;
+  nchan_file_link_t          *fcur;
+  int                         bcs=0, rbcs = 0, files=0, rfiles = 0;
+  for(cur = bcp->bc_head; cur != NULL; cur = cur->next) {
+    bcs++;
+  }
+  assert(bcs == bcp->bc_count);
+  for(cur = bcp->bc_recycle_head; cur != NULL; cur = cur->next) {
+    rbcs++;
+  }
+  assert(rbcs == bcp->bc_recycle_count);
+  for(fcur = bcp->file_head; fcur != NULL; fcur = fcur->next) {
+    files++;
+  }
+  assert(files == bcp->file_count);
+  for(fcur = bcp->file_recycle_head; fcur != NULL; fcur = fcur->next) {
+    rfiles++;
+  }
+  assert(rfiles == bcp->file_recycle_count);
+}
+*/
+
+nchan_buf_and_chain_t *nchan_bufchain_pool_reserve(nchan_bufchain_pool_t *bcp, ngx_int_t count) {
+  nchan_bufchain_link_t      *cur = NULL, *last = NULL, *first = NULL;
+  nchan_bufchain_link_t      **rhead = &bcp->bc_recycle_head;
+  //validate_stuff(bcp);
+  if(count <= 0) {
+    return NULL;
+  }
+  while(count > 0) {
+    if(*rhead) {
+      cur = *rhead;
+      *rhead = cur->next;
+      bcp->bc_recycle_count --;
+    } else {
+      cur = ngx_palloc(bcp->pool, sizeof(*cur));
+      cur->bc.chain.buf = &cur->bc.buf;
+    }
+    if(!first) {
+      first = cur;
+    }
+    if(last) {
+      last->next = cur;
+      last->bc.chain.next = &cur->bc.chain;
+    }
+    last = cur;
+    count --;
+    bcp->bc_count++;
+  }
+  last->next = bcp->bc_head;
+  last->bc.chain.next=NULL;
+  bcp->bc_head = first;
+  DBG("%p bcs %i (rec. %i), files %i (rec. %i)", bcp, bcp->bc_count, bcp->bc_recycle_count, bcp->file_count, bcp->file_recycle_count);
+  //validate_stuff(bcp);
+  return &first->bc;
+}
+
+ngx_file_t *nchan_bufchain_pool_reserve_file(nchan_bufchain_pool_t *bcp) {
+  nchan_file_link_t    *cur;
+  //validate_stuff(bcp);
+  if(bcp->file_recycle_head) {
+    cur = bcp->file_recycle_head;
+    bcp->file_recycle_head = cur->next;
+    bcp->file_recycle_count --;
+  }
+  else {
+    cur = ngx_palloc(bcp->pool, sizeof(*cur));
+  }
+  cur->next = bcp->file_head;
+  bcp->file_head = cur;
+  bcp->file_count++;
+  DBG("%p bcs %i (rec. %i), files %i (rec. %i)", bcp, bcp->bc_count, bcp->bc_recycle_count, bcp->file_count, bcp->file_recycle_count);
+  //validate_stuff(bcp);
+  return &cur->file;
+}
+
+void nchan_bufchain_pool_refresh_files(nchan_bufchain_pool_t *bcp) {
+  nchan_file_link_t    *cur;
+  //validate_stuff(bcp);
+  for(cur = bcp->file_head; cur != NULL; cur = cur->next) {
+    cur->file.fd = nchan_fdcache_get(&cur->file.name);
+  }
+}
+
+ngx_int_t nchan_bufchain_pool_init(nchan_bufchain_pool_t *bcp, ngx_pool_t *pool) {
+  bcp->bc_count = 0;
+  bcp->file_count = 0;
+  
+  bcp->bc_recycle_count = 0;
+  bcp->file_recycle_count = 0;
+  
+  bcp->bc_head = NULL;
+  bcp->bc_recycle_head = NULL;
+  
+  bcp->file_head = NULL;
+  bcp->file_recycle_head = NULL;
+  
+  bcp->pool = pool;
+  //validate_stuff(bcp);
+  return NGX_OK;
+}
+
+void nchan_bufchain_pool_flush(nchan_bufchain_pool_t *bcp) {
+  nchan_bufchain_link_t      *cur;
+  nchan_file_link_t          *fcur, **fhead = &bcp->file_head, **rfhead = &bcp->file_recycle_head;
+  //validate_stuff(bcp);
+  while(bcp->bc_head != NULL) {
+    cur = bcp->bc_head;
+    bcp->bc_head = cur->next;
+    
+    cur->next = bcp->bc_recycle_head;
+    bcp->bc_recycle_head = cur;
+    bcp->bc_count--;
+    bcp->bc_recycle_count ++;
+  }
+  assert(bcp->bc_count == 0);
+  //validate_stuff(bcp);
+  while(*fhead) {
+    fcur = *fhead;
+    *fhead = fcur->next;
+    
+    fcur->next = *rfhead;
+    *rfhead = fcur;
+    bcp->file_count--;
+    bcp->file_recycle_count ++;
+  }
+  assert(bcp->file_count == 0);
+  //validate_stuff(bcp);
+  DBG("%p bcs %i (rec. %i), files %i (rec. %i)", bcp, bcp->bc_count, bcp->bc_recycle_count, bcp->file_count, bcp->file_recycle_count);
+}
diff --git a/debian/modules/nchan/src/util/nchan_bufchainpool.h b/debian/modules/nchan/src/util/nchan_bufchainpool.h
new file mode 100644
index 0000000..67f7d1a
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_bufchainpool.h
@@ -0,0 +1,39 @@
+#ifndef NCHAN_BUFCHAINPOOL_H
+#define NCHAN_BUFCHAINPOOL_H
+#include <nchan_module.h>
+
+typedef struct {
+  ngx_chain_t     chain;
+  ngx_buf_t       buf;
+} nchan_buf_and_chain_t;
+
+typedef struct nchan_bufchain_link_s nchan_bufchain_link_t;
+struct nchan_bufchain_link_s {
+  nchan_bufchain_link_t    *next;
+  nchan_buf_and_chain_t     bc;
+};
+
+typedef struct nchan_file_link_s nchan_file_link_t;
+struct nchan_file_link_s{
+  nchan_file_link_t        *next;
+  ngx_file_t                file;
+};
+
+typedef struct {
+  ngx_int_t                  bc_count;
+  ngx_int_t                  file_count;
+  ngx_int_t                  bc_recycle_count;
+  ngx_int_t                  file_recycle_count;
+  nchan_bufchain_link_t     *bc_head;
+  nchan_bufchain_link_t     *bc_recycle_head;
+  nchan_file_link_t         *file_head;
+  nchan_file_link_t         *file_recycle_head;
+  ngx_pool_t                *pool;
+} nchan_bufchain_pool_t;
+
+ngx_int_t nchan_bufchain_pool_init(nchan_bufchain_pool_t *bcp, ngx_pool_t *pool);
+nchan_buf_and_chain_t *nchan_bufchain_pool_reserve(nchan_bufchain_pool_t *bcp, ngx_int_t count);
+ngx_file_t *nchan_bufchain_pool_reserve_file(nchan_bufchain_pool_t *bcp);
+void nchan_bufchain_pool_refresh_files(nchan_bufchain_pool_t *bcp);
+void nchan_bufchain_pool_flush(nchan_bufchain_pool_t *bcp);
+#endif //NCHAN_BUFCHAINPOOL_H
diff --git a/debian/modules/nchan/src/util/nchan_channel_id.c b/debian/modules/nchan/src/util/nchan_channel_id.c
new file mode 100644
index 0000000..532d0be
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_channel_id.c
@@ -0,0 +1,214 @@
+#include <nchan_module.h>
+#include <assert.h>
+
+static ngx_int_t validate_id(ngx_http_request_t *r, ngx_str_t *id, nchan_loc_conf_t *cf) {
+  if(id->len > (unsigned )cf->max_channel_id_length) {
+    nchan_log_request_warning(r, "channel id is too long: should be at most %i, is %i.", cf->max_channel_id_length, id->len);
+    return NGX_ERROR;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_process_multi_channel_id(ngx_http_request_t *r, nchan_complex_value_arr_t *idcf, nchan_loc_conf_t *cf, ngx_str_t **ret_id) {
+  ngx_int_t                   i, n = idcf->n, n_out = 0;
+  ngx_str_t                   id[NCHAN_MULTITAG_MAX];
+  ngx_str_t                  *id_out;
+  ngx_str_t                  *group = &cf->channel_group;
+  size_t                      sz = 0, grouplen = group->len;
+  u_char                     *cur;
+  
+  //static ngx_str_t            empty_string = ngx_string("");
+  
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  for(i=0; i < n && n_out < NCHAN_MULTITAG_MAX; i++) {
+    ngx_http_complex_value(r, idcf->cv[i], &id[n_out]);
+    if(validate_id(r, &id[n_out], cf) != NGX_OK) {
+      *ret_id = NULL;
+      return NGX_DECLINED;
+    }
+    
+    if(cf->channel_id_split_delimiter.len > 0) {
+      ngx_str_t  *delim = &cf->channel_id_split_delimiter;
+      u_char     *cur_last, *last;
+      cur = id[n_out].data;
+      last = cur + id[n_out].len;
+      
+      u_char     *cur_first = cur;
+      while ((cur_last = nchan_strsplit(&cur, delim, last)) != NULL) {
+        id[n_out].data = cur_first;
+        id[n_out].len = cur_last - cur_first;
+        cur_first = cur;
+        sz += id[n_out].len + 1 + grouplen; // "group/<channel-id>"
+        if(n_out < NCHAN_MULTITAG_REQUEST_CTX_MAX) {
+          ctx->channel_id[n_out] = id[n_out];
+        }
+        n_out++;
+      }
+      
+    }
+    else {
+      sz += id[n_out].len + 1 + grouplen; // "group/<channel-id>"
+      if(n_out < NCHAN_MULTITAG_REQUEST_CTX_MAX) {
+        ctx->channel_id[n_out] = id[n_out];
+      }
+      n_out++;
+    }
+  }
+  if(n_out>1) {
+    sz += 3 + n_out; //space for null-separators and "m/<SEP>" prefix for multi-chid
+  }
+  if(ctx) {
+    ctx->channel_id_count = n_out;
+    //for(; i < NCHAN_MULTITAG_REQUEST_CTX_MAX; i++) {
+    //  ctx->channel_id[i] = empty_string;
+    //}
+  }
+
+  if((id_out = ngx_palloc(r->pool, sizeof(*id_out) + sz)) == NULL) {
+    nchan_log_warning("can't allocate space for channel id");
+    *ret_id = NULL;
+    return NGX_ERROR;
+  }
+  id_out->len = sz;
+  id_out->data = (u_char *)&id_out[1];
+  cur = id_out->data;
+  
+  if(n_out > 1) {
+    cur[0]='m';
+    cur[1]='/';
+    cur[2]=NCHAN_MULTI_SEP_CHR;
+    cur+=3;
+  }
+  
+  for(i = 0; i < n_out; i++) {
+    ngx_memcpy(cur, group->data, grouplen);
+    cur += grouplen;
+    cur[0] = '/';
+    cur++;
+    ngx_memcpy(cur, id[i].data, id[i].len);
+    cur += id[i].len;
+    if(n_out>1) {
+      cur[0] = NCHAN_MULTI_SEP_CHR;
+      cur++;
+    }
+  }
+  *ret_id = id_out;
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_process_legacy_channel_id(ngx_http_request_t *r, nchan_loc_conf_t *cf, ngx_str_t **ret_id) {
+  static ngx_str_t            channel_id_var_name = ngx_string("push_channel_id");
+  ngx_uint_t                  key = ngx_hash_key(channel_id_var_name.data, channel_id_var_name.len);
+  ngx_http_variable_value_t  *vv = NULL;
+  ngx_str_t                  *group = &cf->channel_group;
+  ngx_str_t                   tmpid;
+  ngx_str_t                  *id;
+  size_t                      sz;
+  u_char                     *cur;
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  ctx->channel_id_count = 0;
+  
+  vv = ngx_http_get_variable(r, &channel_id_var_name, key);
+  if (vv == NULL || vv->not_found || vv->len == 0) {
+    //nchan_log_warning("the legacy $push_channel_id variable is not set");
+    return NGX_ABORT;
+  }
+  else {
+    tmpid.len = vv->len;
+    tmpid.data = vv->data;
+  }
+  
+  if(validate_id(r, &tmpid, cf) != NGX_OK) {
+    *ret_id = NULL;
+    return NGX_DECLINED;
+  }
+  
+  sz = group->len + 1 + tmpid.len;
+  if((id = ngx_palloc(r->pool, sizeof(*id) + sz)) == NULL) {
+    nchan_log_error("can't allocate space for legacy channel id");
+    *ret_id = NULL;
+    return NGX_ERROR;
+  }
+  id->len = sz;
+  id->data = (u_char *)&id[1];
+  cur = id->data;
+  
+  ngx_memcpy(cur, group->data, group->len);
+  cur += group->len;
+  cur[0]='/';
+  cur++;
+  ngx_memcpy(cur, tmpid.data, tmpid.len);
+  
+  ctx->channel_id_count = 1;
+  ctx->channel_id[0] = *id;
+  
+  *ret_id = id;
+  return NGX_OK;
+}
+
+ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_int_t fail_hard) {
+  static const ngx_str_t          NO_CHANNEL_ID_MESSAGE = ngx_string("No channel id provided.");
+  nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_int_t                       rc;
+  ngx_str_t                      *id = NULL;
+  nchan_complex_value_arr_t          *chid_conf;
+  
+  chid_conf = what == PUB ? &cf->pub_chid : &cf->sub_chid;
+  if(chid_conf->n == 0) {
+    chid_conf = &cf->pubsub_chid;
+  }
+  
+  if(chid_conf->n > 0) {
+    rc = nchan_process_multi_channel_id(r, chid_conf, cf, &id);
+  }
+  else {
+    //fallback to legacy $push_channel_id
+    rc = nchan_process_legacy_channel_id(r, cf, &id);
+  }
+  
+  if(cf->redis.enabled && id) {
+    // make sure all closing curlybrace '}' are silently and unambiguously replaced by \31
+    // that's because failing to do so will mess up cluster sharding {channel key strings}
+    // it's not pretty, but it _is_ good enough.
+    ngx_str_t id_cur = *id;
+    char     *cur;
+    if(memchr(id_cur.data, '\31', id_cur.len)) {
+      nchan_log_request_warning(r, "character \\31 not allowed in channel id when using Redis.");
+      id = NULL;
+      rc = NGX_DECLINED;
+      goto done;
+    }
+    
+    while((cur = memchr(id_cur.data, '}', id_cur.len)) != NULL) {
+      *cur='\31';
+      id_cur.len -= (cur - (char *)id_cur.data + 1);
+      id_cur.data = (u_char *)cur + 1;
+    }
+  }
+
+done:
+  if(id == NULL && fail_hard) {
+    assert(rc != NGX_OK);
+    switch(rc) {
+      case NGX_ERROR:
+        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 0);
+        break;
+      
+      case NGX_DECLINED:
+        nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, 0);
+        break;
+      
+      case NGX_ABORT:
+        nchan_respond_string(r, NGX_HTTP_NOT_FOUND, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, &NO_CHANNEL_ID_MESSAGE, 0);
+        break;
+    }
+    //DBG("%s channel id NULL", what == PUB ? "pub" : "sub");
+  }
+  else {
+    //DBG("%s channel id %V", what == PUB ? "pub" : "sub", id);
+  }
+  
+  return id;
+}
diff --git a/debian/modules/nchan/src/util/nchan_channel_id.h b/debian/modules/nchan/src/util/nchan_channel_id.h
new file mode 100644
index 0000000..f8e4084
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_channel_id.h
@@ -0,0 +1 @@
+ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_int_t fail_hard);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/util/nchan_channel_info.c b/debian/modules/nchan/src/util/nchan_channel_info.c
new file mode 100644
index 0000000..8c7f6b7
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_channel_info.c
@@ -0,0 +1,133 @@
+#include <nchan_module.h>
+
+void nchan_match_channel_info_subtype(size_t off, u_char *cur, size_t rem, u_char **priority, const ngx_str_t **format, ngx_str_t *content_type) {
+  static nchan_content_subtype_t subtypes[] = {
+    { "json"  , 4, &NCHAN_CHANNEL_INFO_JSON },
+    { "yaml"  , 4, &NCHAN_CHANNEL_INFO_YAML },
+    { "xml"   , 3, &NCHAN_CHANNEL_INFO_XML  },
+    { "x-json", 6, &NCHAN_CHANNEL_INFO_JSON },
+    { "x-yaml", 6, &NCHAN_CHANNEL_INFO_YAML }
+  };
+  u_char                         *start = cur + off;
+  ngx_uint_t                      i;
+  
+  for(i=0; i<(sizeof(subtypes)/sizeof(nchan_content_subtype_t)); i++) {
+    if(ngx_strncmp(start, subtypes[i].subtype, rem<subtypes[i].len ? rem : subtypes[i].len)==0) {
+      if(*priority>start) {
+        *format = subtypes[i].format;
+        *priority = start;
+        content_type->data=cur;
+        content_type->len= off + subtypes[i].len;
+      }
+    }
+  }
+}
+
+ngx_buf_t                       channel_info_buf;
+u_char                          channel_info_buf_str[512]; //big enough
+ngx_str_t                       channel_info_content_type;
+
+ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type) {
+  ngx_buf_t                      *b = &channel_info_buf;
+  ngx_uint_t                      len;
+  const ngx_str_t                *format = &NCHAN_CHANNEL_INFO_PLAIN;
+  time_t                          time_elapsed = ngx_time() - last_seen;
+  static nchan_msg_id_t           zero_msgid = NCHAN_ZERO_MSGID;
+  if(!last_msgid) {
+    last_msgid = &zero_msgid;
+  }
+ 
+  ngx_memcpy(&channel_info_content_type, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, sizeof(NCHAN_CONTENT_TYPE_TEXT_PLAIN));
+  
+  b->start = channel_info_buf_str;
+  b->pos = b->start;
+  b->last_buf = 1;
+  b->last_in_chain = 1;
+  b->flush = 1;
+  b->memory = 1;
+  
+  if(accept_header) {
+    //lame content-negotiation (without regard for qvalues)
+    u_char                    *accept = accept_header->data;
+    len = accept_header->len;
+    size_t                     rem;
+    u_char                    *cur = accept;
+    u_char                    *priority=&accept[len-1];
+    
+    for(rem=len; (cur = ngx_strnstr(cur, "text/", rem))!=NULL; cur += sizeof("text/")-1) {
+      rem=len - ((size_t)(cur-accept)+sizeof("text/")-1);
+      if(ngx_strncmp(cur+sizeof("text/")-1, "plain", rem<5 ? rem : 5)==0) {
+        if(priority) {
+          format = &NCHAN_CHANNEL_INFO_PLAIN;
+          priority = cur+sizeof("text/")-1;
+          //content-type is already set by default
+        }
+      }
+      nchan_match_channel_info_subtype(sizeof("text/")-1, cur, rem, &priority, &format, &channel_info_content_type);
+    }
+    cur = accept;
+    for(rem=len; (cur = ngx_strnstr(cur, "application/", rem))!=NULL; cur += sizeof("application/")-1) {
+      rem=len - ((size_t)(cur-accept)+sizeof("application/")-1);
+      nchan_match_channel_info_subtype(sizeof("application/")-1, cur, rem, &priority, &format, &channel_info_content_type);
+    }
+  }
+  
+  if(generated_content_type) {
+    *generated_content_type = &channel_info_content_type;
+  }
+  
+  len = format->len - 8 - 1 + 3*NGX_INT_T_LEN; //minus 8 sprintf
+  
+  if(len > 512) {
+    nchan_log_error("NCHAN: Channel info string too long: max: 512, is: %i", len);
+  }
+  
+  b->last = ngx_snprintf(b->start, 512, (char *)format->data, messages, last_seen==0 ? -1 : (ngx_int_t) time_elapsed, subscribers, msgid_to_str(last_msgid));
+  b->end = b->last;
+  
+  return b;
+}
+
+//print information about a channel
+ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid) {
+  ngx_buf_t                      *b;
+  ngx_str_t                      *content_type;
+  ngx_str_t                      *accept_header = NULL;
+  
+  if(r->headers_in.accept) {
+    accept_header = &r->headers_in.accept->value;
+  }
+  
+  b = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, &content_type);
+  
+  return nchan_respond_membuf(r, NGX_HTTP_OK, content_type, b, 0);
+}
+
+ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code) {
+  static const ngx_str_t CREATED_LINE = ngx_string("201 Created");
+  static const ngx_str_t ACCEPTED_LINE = ngx_string("202 Accepted");
+  
+  time_t             last_seen = 0;
+  ngx_uint_t         subscribers = 0;
+  ngx_uint_t         messages = 0;
+  nchan_msg_id_t    *msgid = NULL;
+  if(channel!=NULL) {
+    subscribers = channel->subscribers;
+    last_seen = channel->last_seen;
+    messages  = channel->messages;
+    msgid = &channel->last_published_msg_id;
+    r->headers_out.status = status_code == (ngx_int_t) NULL ? NGX_HTTP_OK : status_code;
+    if (status_code == NGX_HTTP_CREATED) {
+      ngx_memcpy(&r->headers_out.status_line, &CREATED_LINE, sizeof(ngx_str_t));
+    }
+    else if (status_code == NGX_HTTP_ACCEPTED) {
+      ngx_memcpy(&r->headers_out.status_line, &ACCEPTED_LINE, sizeof(ngx_str_t));
+    }
+    nchan_channel_info(r, messages, subscribers, last_seen, msgid);
+  }
+  else {
+    //404!
+    nchan_respond_status(r, NGX_HTTP_NOT_FOUND, NULL, 0);
+  }
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/util/nchan_channel_info.h b/debian/modules/nchan/src/util/nchan_channel_info.h
new file mode 100644
index 0000000..6028e4a
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_channel_info.h
@@ -0,0 +1,7 @@
+void nchan_match_channel_info_subtype(size_t off, u_char *cur, size_t rem, u_char **priority, const ngx_str_t **format, ngx_str_t *content_type);
+
+ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type);
+
+ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid);
+
+ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/util/nchan_list.c b/debian/modules/nchan/src/util/nchan_list.c
new file mode 100644
index 0000000..cfe9e7b
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_list.c
@@ -0,0 +1,146 @@
+#include "nchan_list.h"
+
+ /*
+  * Regular boring unoptimized doubly linked list.
+  * Allocates elements from heap.
+  * Should not be used in tight loops.
+  */
+
+ngx_int_t nchan_list_init(nchan_list_t *list, size_t data_sz, char *name) {
+  return nchan_list_pool_init(list, data_sz, 0, name);
+}
+
+ngx_int_t nchan_list_pool_init(nchan_list_t *list, size_t data_sz, size_t pool_sz, char *name) {
+#if NCHAN_LIST_DEBUG
+  list->name = name;
+#endif
+  list->head = NULL;
+  list->tail = NULL;
+  list->data_sz = data_sz;
+  list->n = 0;
+  list->pool = NULL;
+  list->pool_sz = pool_sz;
+  return NGX_OK;
+}
+
+ngx_pool_t *nchan_list_get_pool(nchan_list_t *list) {
+  if(!list->pool && list->pool_sz) {
+    list->pool = ngx_create_pool(list->pool_sz, ngx_cycle->log);
+  }
+  return list->pool;
+}
+
+void *nchan_list_append(nchan_list_t *list) {
+ return nchan_list_append_sized(list, list->data_sz);
+}
+
+void *nchan_list_append_sized(nchan_list_t *list, size_t sz) {
+  nchan_list_el_t  *el, *tail = list->tail;
+  if(list->pool_sz > 0) {
+    el = ngx_palloc(nchan_list_get_pool(list), sizeof(*el) + sz);
+  }
+  else {
+    el = ngx_alloc(sizeof(*el) + sz, ngx_cycle->log);
+  }
+  if(tail)
+    tail->next = el;
+  
+  el->prev = tail;
+  el->next = NULL;
+  
+  if(!list->head)
+    list->head = el;
+  
+  list->tail = el;
+  list->n++;
+  return (void *)&el[1];
+}
+
+
+void *nchan_list_prepend(nchan_list_t *list) {
+  return nchan_list_prepend_sized(list, list->data_sz);
+}
+
+void *nchan_list_prepend_sized(nchan_list_t *list, size_t sz) {
+nchan_list_el_t  *el, *head = list->head;
+  el = ngx_alloc(sizeof(*el) + sz, ngx_cycle->log);
+  if(head)
+    head->prev = el;
+  
+  el->prev = NULL;
+  el->next = head;
+  
+  list->head = el;
+  
+  if(!list->tail)
+    list->head = el;
+  list->n++;
+  return (void *)&el[1];
+}
+
+ngx_int_t nchan_list_remove(nchan_list_t *list, void *el_data) {
+  
+  nchan_list_el_t  *el = (nchan_list_el_t *)el_data - 1;
+  
+  if(el->prev) 
+    el->prev->next = el->next;
+  
+  if(el->next)
+    el->next->prev = el->prev;
+  
+  if(list->head == el)
+    list->head = el->next;
+  
+  if(list->tail == el)
+    list->tail = el->prev;
+  list->n--;
+  
+  if(list->pool)
+    ngx_pfree(list->pool, el);
+  else
+    ngx_free(el);
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_list_empty(nchan_list_t *list) {
+  nchan_list_el_t  *el, *next;
+  if(list->pool) {
+    ngx_destroy_pool(list->pool);
+    list->pool = NULL;
+  }
+  else {
+    for(el = list->head; el != NULL; el = next) {
+      next = el->next;
+      ngx_free(el);
+    }
+  }
+  list->head = NULL;
+  list->tail = NULL;
+  list->n = 0;
+  return NGX_OK;
+}
+
+
+ngx_int_t nchan_list_traverse_and_empty(nchan_list_t *list, void (*cb)(void *data, void *pd), void *pd) {
+  nchan_list_el_t  *head = list->head, *el, *next;
+  ngx_pool_t       *pool = list->pool;
+  
+  list->head = NULL;
+  list->tail = NULL;
+  list->n = 0;
+  list->pool = NULL;
+  
+  for(el = head; el != NULL; el = next) {
+    cb(nchan_list_data_from_el(el), pd);
+    next = el->next;
+    if(!pool) {
+      ngx_free(el);
+    }
+  }
+  
+  if(pool)
+    ngx_destroy_pool(pool);
+  
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/util/nchan_list.h b/debian/modules/nchan/src/util/nchan_list.h
new file mode 100644
index 0000000..d9728a6
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_list.h
@@ -0,0 +1,47 @@
+#ifndef NCHAN_LIST_H
+#define NCHAN_LIST_H
+
+#define NCHAN_LIST_DEBUG 1
+
+#include <nginx.h>
+#include <ngx_http.h>
+
+typedef struct nchan_list_el_s nchan_list_el_t;
+
+struct nchan_list_el_s {
+  nchan_list_el_t  *prev;
+  nchan_list_el_t  *next;
+};
+
+typedef struct {
+#if NCHAN_LIST_DEBUG
+  char            *name;
+#endif
+  nchan_list_el_t *head;
+  nchan_list_el_t *tail;
+  ngx_uint_t       n;
+  size_t           data_sz;
+  ngx_pool_t      *pool;
+  size_t           pool_sz;
+} nchan_list_t;
+
+ngx_int_t nchan_list_init(nchan_list_t *list, size_t data_sz, char *name);
+ngx_int_t nchan_list_pool_init(nchan_list_t *list, size_t data_sz, size_t pool_sz, char *name);
+ngx_pool_t *nchan_list_get_pool(nchan_list_t *list);
+
+void *nchan_list_append(nchan_list_t *list);
+void *nchan_list_prepend(nchan_list_t *list);
+
+void *nchan_list_prepend_sized(nchan_list_t *list, size_t sz);
+void *nchan_list_append_sized(nchan_list_t *list, size_t sz);
+
+ngx_int_t nchan_list_remove(nchan_list_t *list, void *el_data);
+ngx_int_t nchan_list_empty(nchan_list_t *list);
+ngx_int_t nchan_list_traverse_and_empty(nchan_list_t *list, void (*)(void *data, void *pd), void *pd);
+
+#define nchan_list_el_from_data(el_data) \
+  ((nchan_list_el_t *)el_data - 1)
+#define nchan_list_data_from_el(el) \
+  ((void *)&el[1])
+
+#endif //NCHAN_LIST_H
diff --git a/debian/modules/nchan/src/util/nchan_msgid.c b/debian/modules/nchan/src/util/nchan_msgid.c
new file mode 100644
index 0000000..8d501ca
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_msgid.c
@@ -0,0 +1,515 @@
+#include <nchan_module.h>
+#include <assert.h>
+
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "NCHAN MSG_ID:" fmt, ##args)
+
+void nchan_expand_msg_id_multi_tag(nchan_msg_id_t *id, uint8_t in_n, uint8_t out_n, int16_t fill) {
+  int16_t v, n = id->tagcount;
+  int16_t *tags = n <= NCHAN_FIXED_MULTITAG_MAX ? id->tag.fixed : id->tag.allocd;
+  uint8_t i;
+  assert(n > in_n && n > out_n);
+  v = tags[in_n];
+  
+  for(i=0; i < n; i++) {
+    tags[i] = (i == out_n) ? v : fill;
+  }
+}
+
+void nchan_expand_tiny_msgid(nchan_msg_tiny_id_t *tinyid, nchan_msg_id_t *id) {
+  id->time = tinyid->time;
+  id->tag.fixed[0]=tinyid->tag;
+  id->tagcount = 1;
+  id->tagactive = 1;
+}
+
+void nchan_shrink_normal_msgid(nchan_msg_id_t *id, nchan_msg_tiny_id_t *tinyid) {
+  assert(id->tagcount <= 1);
+  tinyid->time = id->time;
+  tinyid->tag = id->tag.fixed[0];
+}
+
+ngx_int_t nchan_copy_new_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src) {
+  ngx_memcpy(dst, src, sizeof(*src));
+  if(src->tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+    size_t sz = sizeof(*src->tag.allocd) * src->tagcount;
+    if((dst->tag.allocd = ngx_alloc(sz, ngx_cycle->log)) == NULL) {
+      return NGX_ERROR;
+    }
+    ngx_memcpy(dst->tag.allocd, src->tag.allocd, sz);
+  }
+  return NGX_OK; 
+}
+ngx_int_t nchan_copy_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src, int16_t *largetags) {
+  uint16_t dst_n = dst->tagcount, src_n = src->tagcount;
+  dst->time = src->time;
+  
+  if(dst_n > NCHAN_FIXED_MULTITAG_MAX && dst_n != src_n) {
+    ngx_free(dst->tag.allocd);
+    dst_n = NCHAN_FIXED_MULTITAG_MAX;
+  }
+  
+  dst->tagcount = src->tagcount;
+  dst->tagactive = src->tagactive;
+  
+  if(src_n <= NCHAN_FIXED_MULTITAG_MAX) {
+    dst->tag = src->tag;
+  }
+  else {
+    if(dst_n != src_n) {
+      if(!largetags) {
+        if((largetags = ngx_alloc(sizeof(*largetags) * src_n, ngx_cycle->log)) == NULL) {
+          return NGX_ERROR;
+        }
+      }
+      dst->tag.allocd = largetags;
+    }
+    
+    ngx_memcpy(dst->tag.allocd, src->tag.allocd, sizeof(*src->tag.allocd) * src_n);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_free_msg_id(nchan_msg_id_t *id) {
+  if(id->tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+    ngx_free(id->tag.allocd);
+    id->tag.allocd = NULL;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t verify_msg_id(nchan_msg_id_t *id1, nchan_msg_id_t *id2, nchan_msg_id_t *msgid, char **err) {
+  int16_t  *tags1 = id1->tagcount <= NCHAN_FIXED_MULTITAG_MAX ? id1->tag.fixed : id1->tag.allocd;
+  int16_t  *tags2 = id2->tagcount <= NCHAN_FIXED_MULTITAG_MAX ? id2->tag.fixed : id2->tag.allocd;
+  if(id1->time > 0 && id2->time > 0) {
+    if(id1->time != id2->time) {
+      //is this a missed message, or just a multi msg?
+      
+      if(id2->tagcount > 1) {
+        int       i = -1, j, max = id2->tagcount;  
+        int16_t  *msgidtags = msgid->tagcount <= NCHAN_FIXED_MULTITAG_MAX ? msgid->tag.fixed : msgid->tag.allocd;
+        
+        for(j=0; j < max; j++) {
+          if(tags2[j] != -1) {
+            if( i != -1) {
+              *err = "more than one tag set to something besides -1. that means this isn't a single channel's forwarded multi msg";
+              return NGX_ERROR;
+            }
+            else {
+              i = j;
+            }
+          }
+        }
+        if(msgidtags[i] != 0) {
+          *err = "only the first message in a given second is ok. anything else means a missed message.";
+          return NGX_ERROR;
+        }
+        //ok, it's just the first-per-second message of a channel from a multi-channel
+        //this is a rather convoluted description... but basically this is ok.
+        return NGX_OK;
+      }
+      else {
+        *err = "previous message id times don't match";
+        return NGX_ERROR;
+      }
+    }
+    
+    if(id1->tagcount == 1) {
+      if(tags1[0] != tags2[0]){
+        *err = "previous message id tags don't match";
+        return NGX_ERROR;
+      }
+    }
+    else {
+      int   i, max = id1->tagcount;
+      for(i=0; i < max; i++) {
+        if(tags2[i] != -1 && tags1[i] != tags2[i]) {
+          *err = "previous message multitag mismatch";
+          return NGX_ERROR;
+        }
+      }
+    }
+  }
+  return NGX_OK;
+}
+
+void nchan_update_multi_msgid(nchan_msg_id_t *oldid, nchan_msg_id_t *newid, int16_t *largetags) {
+  if(newid->tagcount == 1) {
+    //nice and simple
+    *oldid = *newid;
+  }
+  else {
+    //DBG("======= updating multi_msgid ======");
+    //DBG("======= old: %V", msgid_to_str(oldid));
+    //DBG("======= new: %V", msgid_to_str(newid));
+    uint16_t         newcount = newid->tagcount, oldcount = oldid->tagcount;
+    if(newcount > NCHAN_FIXED_MULTITAG_MAX && oldcount < newcount) {
+      int16_t       *oldtags, *old_largetags = NULL;
+      int            i;
+      size_t         sz = sizeof(*oldid->tag.allocd) * newcount;
+      if(oldcount > NCHAN_FIXED_MULTITAG_MAX) {
+        old_largetags = oldid->tag.allocd;
+        oldtags = old_largetags;
+      }
+      else {
+        oldtags = oldid->tag.fixed;
+      }
+      if(largetags == NULL) {
+        largetags = ngx_alloc(sz, ngx_cycle->log);
+      }
+      oldid->tag.allocd = largetags;
+      for(i=0; i < newcount; i++) {
+        oldid->tag.allocd[i] = (i < oldcount) ? oldtags[i] : -1;
+      }
+      if(old_largetags) {
+        ngx_free(old_largetags);
+      }
+      oldid->tagcount = newcount;
+    }
+    
+    if(oldid->time != newid->time) {
+      nchan_copy_msg_id(oldid, newid, NULL);
+    }
+    else {
+      int i, max = newcount;
+      int16_t  *oldtags = oldcount <= NCHAN_FIXED_MULTITAG_MAX ? oldid->tag.fixed : oldid->tag.allocd;
+      int16_t  *newtags = oldcount <= NCHAN_FIXED_MULTITAG_MAX ? newid->tag.fixed : newid->tag.allocd;
+      
+      assert(max == oldcount);
+      
+      for(i=0; i< max; i++) {
+        
+        //DEBUG CHECK -- REMOVE BEFORE RELEASE
+        if(newid->tagactive == i && newtags[i] != -1 && oldtags[i] != -1) {
+          assert(newtags[i] > oldtags[i]);
+        }
+        
+        
+        if (newtags[i] != -1) {
+          oldtags[i] = newtags[i];
+        }
+      }
+      oldid->tagactive = newid->tagactive;
+    }
+    //DBG("=== updated: %V", msgid_to_str(oldid));
+  }
+}
+
+ngx_int_t update_subscriber_last_msg_id(subscriber_t *sub, nchan_msg_t *msg) {
+  if(msg) {
+    char *err, *huh;
+    if(verify_msg_id(&sub->last_msgid, &msg->prev_id, &msg->id, &err) == NGX_ERROR) {
+      struct timeval    tv;
+      time_t            time;
+      int               ttl = msg->expires - msg->id.time;
+      ngx_gettimeofday(&tv);
+      time = tv.tv_sec;
+      
+      if(sub->last_msgid.time + ttl <= time) {
+        huh = "The message probably expired.";
+      }
+      else {
+        huh = "Try increasing the message buffer length.";
+      }
+      
+      if(sub->type == INTERNAL) {
+        nchan_log_warning("Missed message for internal %V subscriber: %s. %s", sub->name, err, huh);
+      }
+      else {
+        nchan_log_request_warning(sub->request, "Missed message for %V subscriber: %s. %s", sub->name, err, huh);
+      }
+    }
+    
+    nchan_update_multi_msgid(&sub->last_msgid, &msg->id, NULL);
+  }
+  
+  return NGX_OK;
+}
+
+
+
+
+
+
+static ngx_int_t nchan_parse_msg_tag(u_char *first, u_char *last, nchan_msg_id_t *mid, ngx_int_t expected_tag_count) {
+  u_char           *cur = first;
+  u_char            c;
+  int16_t           i = 0;
+  int8_t            sign = 1;
+  int16_t           val = 0;
+  static int16_t    tags[NCHAN_MULTITAG_MAX];
+  
+  while(cur <= last && i < NCHAN_MULTITAG_MAX) {
+    if(cur == last) {
+      tags[i]=(val == 0 && sign == -1) ? -1 : val * sign; //shorthand "-" for "-1";
+      i++;
+      break;
+    }
+    
+    c = *cur;
+    if(c == '-') {
+      sign = -1;
+    }
+    else if (c >= '0' && c <= '9') {
+      val = 10 * val + (c - '0');
+    }
+    else if (c == '[') {
+      mid->tagactive = i;
+    }
+    else if (c == ',') {
+      tags[i]=(val == 0 && sign == -1) ? -1 : val * sign; //shorthand "-" for "-1"
+      sign=1;
+      val=0;
+      i++;
+    }
+    cur++;
+  }
+  if(expected_tag_count > i) {
+    return NGX_ERROR;
+  }
+  mid->tagcount = i;
+  
+  if(i <= NCHAN_FIXED_MULTITAG_MAX) {
+    ngx_memcpy(mid->tag.fixed, tags, sizeof(mid->tag.fixed));
+  }
+  else {
+    mid->tag.allocd = tags;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_extract_from_multi_msgid(nchan_msg_id_t *src, uint16_t n, nchan_msg_id_t *dst) {
+  uint8_t count = src->tagcount;
+  int16_t *tags;
+  
+  if(src->time == NCHAN_OLDEST_MSGID_TIME || src->time == NCHAN_NEWEST_MSGID_TIME) {
+    dst->time = src->time;
+    dst->tag.fixed[0] = 0;
+    dst->tagcount = 1;
+    dst->tagactive = 0;
+    return NGX_OK;
+  }
+  else if(src->time == NCHAN_NTH_MSGID_TIME) {
+    dst->time = src->time;
+    dst->tag.fixed[0] = src->tag.fixed[0];
+    dst->tagcount = 1;
+    dst->tagactive = 0;
+    return NGX_OK; 
+  }
+  
+  if(n > count) {
+    ERR("can't extract msgid %i from multi-msg of count %i", n, count);
+    return NGX_ERROR;
+  }
+  tags = (count <= NCHAN_FIXED_MULTITAG_MAX) ? src->tag.fixed : src->tag.allocd;
+  
+  dst->time = src->time;
+  if(tags[n] == -1) {
+    dst->time --;
+    dst->tag.fixed[0] = 32767; //eeeeeh this is bad. but it's good enough.
+  }
+  else {
+    dst->tag.fixed[0] = tags[n];
+  }
+  dst->tagcount = 1;
+  dst->tagactive = 0;
+  
+  return NGX_OK; 
+}
+
+static ngx_str_t *nchan_subscriber_get_etag(ngx_http_request_t * r) {
+#if nginx_version >= 1008000
+  return r->headers_in.if_none_match ? &r->headers_in.if_none_match->value : NULL;
+#else
+  ngx_uint_t                       i;
+  ngx_list_part_t                 *part = &r->headers_in.headers.part;
+  ngx_table_elt_t                 *header= part->elts;
+  for (i = 0;  ; i++) {
+    if (i >= part->nelts) {
+      if (part->next == NULL) {
+        break;
+      }
+      part = part->next;
+      header = part->elts;
+      i = 0;
+    }
+    if (header[i].key.len == NCHAN_HEADER_IF_NONE_MATCH.len
+      && ngx_strncasecmp(header[i].key.data, NCHAN_HEADER_IF_NONE_MATCH.data, header[i].key.len) == 0) {
+      return &header[i].value;
+    }
+  }
+  return NULL;
+#endif
+}
+
+ngx_int_t nchan_parse_compound_msgid(nchan_msg_id_t *id, ngx_str_t *str, ngx_int_t expected_tag_count) {
+  u_char       *split, *last;
+  ngx_int_t     time;
+  uint8_t       len;
+  //"<msg_time>:<msg_tag>"
+  last = str->data + str->len;
+  if((split = ngx_strlchr(str->data, last, ':')) != NULL) {
+    len = 1;
+  }
+  else if( (str->len > 3 && (split = ngx_strnstr(str->data, "%3A", str->len)) != NULL)
+        || (str->len > 3 && (split = ngx_strnstr(str->data, "%3a", str->len)) != NULL)) {
+    len = 3;
+  }
+  else {
+    len = 0; //placate dumb GCC warning
+  }
+  if(split) {
+    time = ngx_atoi(str->data, split - str->data);
+    split += len;
+    if(time != NGX_ERROR) {
+      id->time = time;
+      return nchan_parse_msg_tag(split, last, id, expected_tag_count);
+    }
+    else {
+      return NGX_ERROR;
+    }
+  }
+  return NGX_DECLINED;
+}
+
+
+
+nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r) {
+  static nchan_msg_id_t           id = NCHAN_ZERO_MSGID;
+  static nchan_msg_id_t           nth_msg_id = NCHAN_NTH_MSGID;
+  static nchan_msg_id_t           oldest_msg_id = NCHAN_OLDEST_MSGID;
+  static nchan_msg_id_t           newest_msg_id = NCHAN_NEWEST_MSGID;
+  
+  ngx_str_t                      *if_none_match;
+  nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  int                             i;
+  ngx_int_t                       rc;
+  
+  if_none_match = nchan_subscriber_get_etag(r);
+  
+  if(!cf->msg_in_etag_only && r->headers_in.if_modified_since != NULL) {
+    id.time=ngx_http_parse_time(r->headers_in.if_modified_since->value.data, r->headers_in.if_modified_since->value.len);
+    
+    if(if_none_match==NULL) {
+      id.tagcount=1;
+      id.tagactive=0;
+    }
+    else {
+      if(nchan_parse_msg_tag(if_none_match->data, if_none_match->data + if_none_match->len, &id, ctx->channel_id_count) == NGX_ERROR) {
+        return NULL;
+      }
+    }
+    return &id;
+  }
+  else if((cf->msg_in_etag_only || r->headers_in.if_modified_since == NULL) && if_none_match) {
+    rc = nchan_parse_compound_msgid(&id, if_none_match, ctx->channel_id_count);
+    if(rc == NGX_OK) {
+      return &id;
+    }
+    else if(rc == NGX_ERROR) {
+      return NULL;
+    }
+  }
+  else {
+    nchan_complex_value_arr_t   *alt_msgid_cv_arr = &cf->last_message_id;
+    u_char                       buf[128];
+    ngx_str_t                    str;
+    int                          n = alt_msgid_cv_arr->n;
+    ngx_int_t                    rc2;
+    
+    str.len = 0;
+    str.data = buf;
+    
+    for(i=0; i < n; i++) {
+      rc = ngx_http_complex_value_noalloc(r, alt_msgid_cv_arr->cv[i], &str, 128);
+      if(str.len > 0 && rc == NGX_OK) {
+        rc2 = nchan_parse_compound_msgid(&id, &str, ctx->channel_id_count);
+        if(rc2 == NGX_OK) {
+          return &id;
+        }
+        else if(rc2 == NGX_ERROR) {
+          return NULL;
+        }
+      }
+    }
+  }
+  
+  //eh, we didn't find a valid alt_msgid value from variables. use the defaults
+  switch(cf->subscriber_first_message) {
+    case 1:
+      id = oldest_msg_id;
+      break;
+    case 0: 
+      id = newest_msg_id;
+      break;
+    default:
+      id = nth_msg_id;
+      id.tag.fixed[0] = cf->subscriber_first_message;
+      break;
+  }
+  return &id;
+}
+
+
+int8_t nchan_compare_msgid_tags(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
+  uint8_t active = id2->tagactive;
+  int16_t *tags1, *tags2;
+  int16_t t1, t2;
+  
+  tags1 = (id1->tagcount <= NCHAN_FIXED_MULTITAG_MAX) ? id1->tag.fixed : id1->tag.allocd;
+  tags2 = (id2->tagcount <= NCHAN_FIXED_MULTITAG_MAX) ? id2->tag.fixed : id2->tag.allocd;
+  
+  //debugstuff that prevents this function from getting inlined
+  assert(id1->time == id2->time);
+  int i, nonnegs = 0;
+  for (i=0; i < id2->tagcount; i++) {
+    if(tags2[i] >= 0) nonnegs++;
+  }
+  assert(nonnegs == 1);
+  
+  if(id1->time == 0 && id2->time == 0) return 0; //always equal on zero-time
+  
+  t1 = (active < id1->tagcount) ? tags1[active] : -1;
+  t2 = tags2[active];
+  
+  //ERR("Comparing msgids: id1: %V --", msgid_to_str(id1));
+  //ERR("  --- id2: %V --", msgid_to_str(id2));
+  
+  if(t1 < t2){ 
+    //ERR("id1 is smaller. -1");
+    return -1;
+  }
+  if(t1 > t2){
+    //ERR("id1 is larger. 1");
+    return  1;
+  }
+  //ERR("id1 equals id2. 0");
+  return 0;
+}
+
+int8_t nchan_compare_msgids(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
+  assert(id1->tagcount == id2->tagcount);
+  if(id1->time < id2->time) {
+    return -1;
+  }
+  else if(id1->time > id2->time) {
+    return 1;
+  }
+  else {
+    assert(id1->tagcount == id2->tagcount);
+    if(id1->tagcount == 1) {
+      if(id1->tag.fixed[0] < id2->tag.fixed[0]) {
+        return -1;
+      }
+      else if(id1->tag.fixed[0] > id2->tag.fixed[0]) {
+        return 1;
+      }
+      else {
+        return 0;
+      }
+    }
+    else {
+      return nchan_compare_msgid_tags(id1, id2);
+    }
+  }
+}
diff --git a/debian/modules/nchan/src/util/nchan_msgid.h b/debian/modules/nchan/src/util/nchan_msgid.h
new file mode 100644
index 0000000..ceeb129
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_msgid.h
@@ -0,0 +1,16 @@
+void nchan_expand_msg_id_multi_tag(nchan_msg_id_t *id, uint8_t in_n, uint8_t out_n, int16_t fill);
+ngx_int_t nchan_copy_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src, int16_t *largetags);
+ngx_int_t nchan_copy_new_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src);
+ngx_int_t nchan_free_msg_id(nchan_msg_id_t *id);
+
+ngx_int_t nchan_parse_compound_msgid(nchan_msg_id_t *id, ngx_str_t *str, ngx_int_t expected_tag_count);
+void nchan_update_multi_msgid(nchan_msg_id_t *oldid, nchan_msg_id_t *newid, int16_t *largetags);
+ngx_int_t update_subscriber_last_msg_id(subscriber_t *sub, nchan_msg_t *msg);
+nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r);
+ngx_int_t nchan_extract_from_multi_msgid(nchan_msg_id_t *src, uint16_t n, nchan_msg_id_t *dst);
+
+int8_t nchan_compare_msgid_tags(nchan_msg_id_t *id1, nchan_msg_id_t *id2);
+int8_t nchan_compare_msgids(nchan_msg_id_t *id1, nchan_msg_id_t *id2);
+
+void nchan_expand_tiny_msgid(nchan_msg_tiny_id_t *tinyid, nchan_msg_id_t *id);
+void nchan_shrink_normal_msgid(nchan_msg_id_t *id, nchan_msg_tiny_id_t *tinyid);
diff --git a/debian/modules/nchan/src/util/nchan_output.c b/debian/modules/nchan/src/util/nchan_output.c
new file mode 100644
index 0000000..fb9da38
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_output.c
@@ -0,0 +1,701 @@
+#include <ngx_http.h>
+#include <nchan_module.h>
+#include "nchan_output.h"
+#include <util/nchan_thingcache.h>
+#include <util/nchan_bufchainpool.h>
+#include <store/memory/store.h>
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "OUTPUT:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "OUTPUT:" fmt, ##arg)
+
+#define REQUEST_PCALLOC(r, what) what = ngx_pcalloc((r)->pool, sizeof(*(what)))
+#define REQUEST_PALLOC(r, what) what = ngx_palloc((r)->pool, sizeof(*(what)))
+
+//file descriptor cache
+static void *fd_cache = NULL;
+
+static void *fd_open(ngx_str_t *filename) {
+  static u_char   fn_buf[512];
+  u_char         *fname, *last;
+  ngx_fd_t        fd;
+  off_t           len = filename->len;
+  last = filename->data + len;
+  if(*last == '\0' || (len > 0 && *(last - 1) == '\0')) {
+    fname = filename->data;
+  }
+  else if(filename->len < 512) {
+    DBG("non-null-terminated filename. gotta copy.");
+    ngx_memcpy(&fn_buf, filename->data, filename->len);
+    fn_buf[filename->len]='\0';
+    fname = fn_buf;
+  }
+  else{
+    DBG("filaname too long: %V", filename);
+    return (void *)NGX_INVALID_FILE;
+  }
+  if(fname == NULL) {
+    //static analyzer pointed this out. This is a damn unlikely condition, but
+    //ALL HAIL CLANG'S STATIC ANALYZER
+    return (void *)NGX_INVALID_FILE;
+  }
+  
+  
+  fd = ngx_open_file(fname, NGX_FILE_RDONLY, NGX_FILE_OPEN, NGX_FILE_OWNER_ACCESS);
+  return (void *)(uintptr_t)fd;
+}
+
+static ngx_int_t fd_close(ngx_str_t *id, void *fdv) {
+  ngx_fd_t     fd = (ngx_fd_t )(uintptr_t )fdv;
+  
+  DBG("fdcache close fd %i", fd);
+  
+  ngx_close_file(fd);
+  return 1;
+}
+
+ngx_fd_t nchan_fdcache_get(ngx_str_t *filename) {
+  ngx_fd_t    fd;
+  fd = (ngx_fd_t)(uintptr_t )nchan_thingcache_get(fd_cache, filename);
+  DBG("fdcache fd %i", fd);
+  return fd;
+}
+
+ngx_int_t nchan_msg_buf_open_fd_if_needed(ngx_buf_t *buf, ngx_file_t *file, ngx_http_request_t *r) {
+  if(buf->in_file) {
+    //open file fd if necessary
+    if(!file) {
+      if(r) {
+        if((file = ngx_pcalloc(r->pool, sizeof(*file))) == NULL) {
+          ERR("couldn't allocate memory for file struct while responding with msg");
+          return NGX_ERROR;
+        }
+      }
+      else {
+        //no file given, can't allocate from NULL pool
+        return NGX_ERROR;
+      }
+    }
+    
+    ngx_memcpy(file, buf->file, sizeof(*file));
+    if(file->fd == NGX_INVALID_FILE) {
+      file->fd = nchan_fdcache_get(&file->name);
+      if(file->fd == NGX_INVALID_FILE) {
+        ERR("can't create output chain, file in buffer won't open");
+        return NGX_ERROR;
+      }
+    }
+    buf->file = file;
+  }
+  return NGX_OK;
+}
+
+
+void nchan_output_init(void) {
+  fd_cache = nchan_thingcache_init("fd_cache", fd_open, fd_close, 5);
+  
+}
+
+void nchan_output_shutdown(void) {
+  nchan_thingcache_shutdown(fd_cache);
+}
+
+typedef struct rsvmsg_queue_s rsvmsg_queue_t;
+struct rsvmsg_queue_s {
+  nchan_msg_t                  *msg;
+  rsvmsg_queue_t               *prev;
+  rsvmsg_queue_t               *next;
+};
+
+static void *rsvmsg_queue_palloc(void *pd) {
+  return ngx_palloc(((ngx_http_request_t *)pd)->pool, sizeof(rsvmsg_queue_t));
+}
+
+static ngx_int_t rsvmsg_queue_release(void *pd, void *thing) {
+  //ERR("release msg %p", ((rsvmsg_queue_t *)thing)->msg);
+  msg_release(((rsvmsg_queue_t *)thing)->msg, "output reservation");
+  return NGX_OK;
+}
+
+static void nchan_push_release_entire_message_queue(nchan_request_ctx_t *ctx) {
+  if(ctx->reserved_msg_queue) {
+    nchan_reuse_queue_flush(ctx->reserved_msg_queue);
+  }
+}
+
+static void nchan_reserve_msg_cleanup(void *pd) {
+  nchan_push_release_entire_message_queue((nchan_request_ctx_t *)pd);
+}
+
+static void nchan_output_reserve_message_queue(ngx_http_request_t *r, nchan_msg_t *msg) {
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_http_cleanup_t   *cln;
+  if(!ctx->reserved_msg_queue) {
+    if((ctx->reserved_msg_queue = ngx_palloc(r->pool, sizeof(*ctx->reserved_msg_queue))) == NULL) {
+      ERR("Coudln't palloc reserved_msg_queue");
+      return;
+    }
+    nchan_reuse_queue_init(ctx->reserved_msg_queue, offsetof(rsvmsg_queue_t, prev), offsetof(rsvmsg_queue_t, next), rsvmsg_queue_palloc, rsvmsg_queue_release, r);
+    
+    if((cln = ngx_http_cleanup_add(r, 0)) == NULL) {
+      ERR("Unable to add request cleanup for reserved_msg_queue queue");
+      assert(0);
+      return;
+    }
+    
+    cln->data = ctx;
+    cln->handler = nchan_reserve_msg_cleanup;
+  }
+  
+  rsvmsg_queue_t   *qmsg = nchan_reuse_queue_push(ctx->reserved_msg_queue);
+  qmsg->msg = msg;
+  msg_reserve(msg, "output reservation");
+}
+
+//general request-output functions and the iraq and the asian countries and dated references and the, uh, such
+
+static void nchan_flush_pending_output(ngx_http_request_t *r) {
+  int                        rc;
+  ngx_event_t               *wev;
+  ngx_connection_t          *c;
+  ngx_http_core_loc_conf_t  *clcf;
+  
+  c = r->connection;
+  wev = c->write;
+  
+  //ngx_log_debug2(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer handler: \"%V?%V\"", &r->uri, &r->args);
+
+  clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
+
+  if (wev->timedout) {
+    if (!wev->delayed) {
+      ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "request timed out");
+      c->timedout = 1;
+      ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
+      return;
+    }
+    wev->timedout = 0;
+    wev->delayed = 0;
+
+    if (!wev->ready) {
+      ngx_add_timer(wev, clcf->send_timeout);
+      if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
+        ngx_http_finalize_request(r, 0);
+      }
+      return;
+    }
+  }
+  
+  if (wev->delayed || r->aio) {
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer delayed");
+    if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
+      ngx_http_finalize_request(r, 0);
+    }
+    return;
+  }
+  
+  rc = nchan_output_filter(r, NULL);
+
+  //ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, "http writer output filter: %d, \"%V?%V\"", rc, &r->uri, &r->args);
+
+  if (rc == NGX_ERROR) {
+    ngx_http_finalize_request(r, rc);
+    return;
+  }
+
+  if (r->buffered || r->postponed || (r == r->main && c->buffered)) {
+    if (!wev->delayed) {
+      ngx_add_timer(wev, clcf->send_timeout);
+    }
+    if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
+      ngx_http_finalize_request(r, 0);
+      return;
+    }
+  }
+  //ngx_log_debug2(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer done: \"%V?%V\"", &r->uri, &r->args);
+  if(r->out == NULL) {
+    r->write_event_handler = ngx_http_request_empty_handler;
+  }
+}
+
+static void flush_all_the_reserved_things(nchan_request_ctx_t *ctx) {
+  nchan_push_release_entire_message_queue(ctx);
+  if(ctx->bcp) {
+    nchan_bufchain_pool_flush(ctx->bcp);
+  }
+  if(ctx->output_str_queue) {
+    nchan_reuse_queue_flush(ctx->output_str_queue);
+  }
+}
+
+static ngx_int_t nchan_output_filter_generic(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in) {
+/* from push stream module, written by
+ * Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * thanks, guys!
+ * modified to fit the needs of websockets and eventsources and multipartses and so on
+*/
+  ngx_http_core_loc_conf_t               *clcf;
+  ngx_int_t                               rc;
+  ngx_event_t                            *wev;
+  ngx_connection_t                       *c;
+  nchan_request_ctx_t                    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  c = r->connection;
+  wev = c->write;
+
+  if(ctx->bcp) {
+    nchan_bufchain_pool_refresh_files(ctx->bcp);
+  }
+  
+  rc = ngx_http_output_filter(r, in);
+  //ERR("outpuit filter plz");
+
+  if (c->buffered & NGX_HTTP_LOWLEVEL_BUFFERED) {
+    //ERR("what's the deal with this NGX_HTTP_LOWLEVEL_BUFFERED thing?");
+    clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
+    r->write_event_handler = nchan_flush_pending_output;
+    if(msg) {
+      nchan_output_reserve_message_queue(r, msg);
+    }
+    if (!wev->delayed) {
+      //ERR("delay output by %ims", clcf->send_timeout);
+      ngx_add_timer(wev, clcf->send_timeout);
+    }
+    if ((ngx_handle_write_event(wev, clcf->send_lowat)) != NGX_OK) {
+      flush_all_the_reserved_things(ctx);
+      return NGX_ERROR;
+    }
+    return NGX_OK;
+  } 
+  else {
+    if (wev->timer_set) {
+      //ERR("nevermind timer");
+      ngx_del_timer(wev);
+    }
+  }
+  
+  if(r->out == NULL) {
+    flush_all_the_reserved_things(ctx);
+  }
+  
+  return rc;
+}
+
+ngx_int_t nchan_output_filter(ngx_http_request_t *r, ngx_chain_t *in) {
+  return nchan_output_filter_generic(r, NULL, in);
+}
+ngx_int_t nchan_output_msg_filter(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in) {
+  return nchan_output_filter_generic(r, msg, in);
+}
+
+void nchan_include_access_control_if_needed(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
+  if(!ctx) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  }
+  nchan_loc_conf_t       *cf;
+  if(!ctx) {
+    return;
+  }
+  if(ctx->request_origin_header.data) {
+    cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+    nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, &cf->allow_origin);
+  }
+}
+
+ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_int_t finalize) {
+  ngx_int_t    rc = NGX_OK;
+  r->headers_out.status=status_code;
+  if(status_line!=NULL) {
+    r->headers_out.status_line.len =status_line->len;
+    r->headers_out.status_line.data=status_line->data;
+  }
+  r->headers_out.content_length_n = 0;
+  r->header_only = 1;
+  
+  nchan_include_access_control_if_needed(r, NULL);
+  
+  rc= ngx_http_send_header(r);
+  if(finalize) {
+    ngx_http_finalize_request(r, rc);
+  }
+  return rc;
+}
+
+ngx_int_t nchan_respond_cstring(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, char *body, ngx_int_t finalize) {
+  ngx_str_t str;
+  str.data = (u_char *)body;
+  str.len=strlen(body);
+  return nchan_respond_string(r, status_code, content_type, &str, finalize);
+}
+
+ngx_int_t nchan_respond_membuf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, ngx_buf_t *body, ngx_int_t finalize) {
+  ngx_str_t str;
+  str.len = ngx_buf_size(body);
+  str.data = body->start;
+  return nchan_respond_string(r, status_code, content_type, &str, finalize);
+}
+/*
+static size_t etag_maxlen(nchan_msg_id_t *id) {
+  return 7 * id->multi_count;
+}
+*/
+
+
+static ngx_str_t msgtag_str;
+static char msgtag_str_buf[10*255 + 30];
+
+size_t msgtag_to_strptr(nchan_msg_id_t *id, char *ch) {
+
+  uint8_t   max = id->tagcount;
+  int16_t  *t = max <= NCHAN_FIXED_MULTITAG_MAX ? id->tag.fixed : id->tag.allocd;
+  
+  uint8_t   i;
+  char     *cur;
+  
+  assert(max < 255);
+  static char* inactive="%i,";
+  static char*  active="[%i],";
+  if(max == 1) {
+    return sprintf(ch, "%i", t[0]);
+  }
+  else {
+    cur = ch;
+    for(i=0; i < max; i++) {
+      
+      assert(t[i] >= -2);
+      
+      if(t[i] != -1) {
+        cur += sprintf(cur, id->tagactive != i ? inactive : active, t[i]);
+      }
+      else { //shorthand
+        assert(id->tagactive != i);
+        *cur++='-';
+        *cur++=',';
+      }
+    }
+    cur[-1]='\0';
+    return cur - ch - 1;
+  }  
+}
+
+ngx_str_t *msgtag_to_str(nchan_msg_id_t *id) {
+  size_t len;
+  len = msgtag_to_strptr(id, msgtag_str_buf);
+  msgtag_str.len = len;
+  msgtag_str.data = (u_char *)msgtag_str_buf;
+  return &msgtag_str;
+}
+
+ngx_str_t *msgid_to_str(nchan_msg_id_t *id) {
+  int   l1, l2;
+  char *cur;
+  l1 = sprintf(msgtag_str_buf, "%li:", id->time);
+  cur = &msgtag_str_buf[l1];
+  l2 = msgtag_to_strptr(id, cur);
+  msgtag_str.len = l1 + l2;
+  msgtag_str.data = (u_char *)msgtag_str_buf;
+  return &msgtag_str;
+}
+
+ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid) {
+  ngx_str_t                 *etag, *tmp_etag;
+  nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  int8_t                     output_etag = 1, cross_origin;
+  
+  if(!ctx) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  }
+  cross_origin = ctx && ctx->request_origin_header.data;
+
+  if(!cf->msg_in_etag_only) {
+    //last-modified
+    if(msgid->time > 0) {
+      r->headers_out.last_modified_time = msgid->time;
+    }
+    else {
+      output_etag = 0;
+    }
+    tmp_etag = msgtag_to_str(msgid);
+  }
+  else {
+    tmp_etag = msgid_to_str(msgid);
+  }
+  
+  if((etag = ngx_palloc(r->pool, sizeof(*etag) + tmp_etag->len))==NULL) {
+    return NGX_ERROR;
+  }
+  etag->data = (u_char *)(etag+1);
+  etag->len = tmp_etag->len;
+  ngx_memcpy(etag->data, tmp_etag->data, tmp_etag->len);
+
+  if(cf->custom_msgtag_header.len == 0) {
+    if(output_etag) {
+      nchan_add_response_header(r, &NCHAN_HEADER_ETAG, etag);
+    }
+    if(cross_origin) {
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS, &NCHAN_MSG_RESPONSE_ALLOWED_HEADERS);
+    }
+  }
+  else {
+    if(output_etag) {
+      nchan_add_response_header(r, &cf->custom_msgtag_header, etag);
+    }
+    if(cross_origin) {
+      u_char        *cur = ngx_palloc(r->pool, 255);
+      if(cur == NULL) {
+        return NGX_ERROR;
+      }
+      ngx_str_t      allowed;
+      allowed.data = cur;
+      cur = ngx_snprintf(cur, 255, NCHAN_MSG_RESPONSE_ALLOWED_CUSTOM_ETAG_HEADERS_STRF, &cf->custom_msgtag_header);
+      allowed.len = cur - allowed.data;
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS, &allowed);
+     }
+  }
+  
+  //Vary header needed for proper HTTP caching.
+  nchan_add_response_header(r, &NCHAN_HEADER_VARY, &NCHAN_VARY_HEADER_VALUE);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_id_t *msgid, ngx_int_t finalize, char **err) {
+  ngx_buf_t                 *buffer = msg->buf;
+  nchan_buf_and_chain_t     *cb;
+  ngx_int_t                  rc;
+  ngx_chain_t               *rchain = NULL;
+  ngx_buf_t                 *rbuffer;
+  nchan_request_ctx_t       *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  if(ngx_buf_size(buffer) > 0) {
+    cb = ngx_palloc(r->pool, sizeof(*cb));
+    if (!cb) {
+      if(err) *err = "couldn't allocate memory for buf-and-chain while responding with msg";
+      return NGX_ERROR;
+    }
+    rchain = &cb->chain;
+    rbuffer = &cb->buf;
+    
+    rchain->next = NULL;
+    rchain->buf = rbuffer;
+    
+    ngx_memcpy(rbuffer, buffer, sizeof(*buffer));
+    nchan_msg_buf_open_fd_if_needed(rbuffer, NULL, r);
+    
+    r->headers_out.content_length_n=ngx_buf_size(rbuffer);
+  }
+  else {
+    r->headers_out.content_length_n = 0;
+    r->header_only = 1;
+  }
+
+  if (msg->content_type.data!=NULL) {
+    r->headers_out.content_type.len=msg->content_type.len;
+    r->headers_out.content_type.data = msg->content_type.data;
+  }
+  
+  if(msgid == NULL) {
+    msgid = &msg->id;
+  }
+  
+  if(nchan_set_msgid_http_response_headers(r, ctx, msgid) != NGX_OK) {
+    if(err) *err = "can't set msgid headers";
+    return NGX_ERROR;
+  }
+  
+  r->headers_out.status=NGX_HTTP_OK;
+  
+  nchan_include_access_control_if_needed(r, ctx);
+  
+  //we know the entity length, and we're using just one buffer. so no chunking please.
+  if((rc = ngx_http_send_header(r)) >= NGX_HTTP_SPECIAL_RESPONSE) {
+    ERR("request %p, send_header response %i", r, rc);
+    if(err) *err="WTF just happened to request?";
+    return NGX_ERROR;
+  }
+  
+  if(rchain) {
+    rc= nchan_output_filter(r, rchain);
+  }
+  
+  if(finalize) {
+    ngx_http_finalize_request(r, rc);
+  }
+  return rc;
+}
+
+ngx_int_t nchan_respond_string(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_str_t *body, ngx_int_t finalize) {
+  ngx_int_t    rc = NGX_OK;
+  ngx_buf_t   *b = REQUEST_PCALLOC(r, b);
+  ngx_chain_t *chain = REQUEST_PALLOC(r, chain);
+  
+  //assume both were alloc'd fine
+  
+  r->headers_out.status=status_code;
+  r->headers_out.content_length_n = body->len;
+  
+  if(content_type) {
+    r->headers_out.content_type.len = content_type->len;
+    r->headers_out.content_type.data = content_type->data;
+  }
+  
+  nchan_include_access_control_if_needed(r, NULL);
+  
+  if ((!b) || (!chain)) {
+    ERR("Couldn't allocate ngx buf or chain.");
+    r->headers_out.status=NGX_HTTP_INTERNAL_SERVER_ERROR;
+    r->headers_out.content_length_n = 0;
+    r->header_only = 1;
+    ngx_http_send_header(r);
+    rc=NGX_ERROR;
+  }
+  else {
+    chain->buf=b;
+    chain->next=NULL;
+    
+    b->last_buf = 1;
+    b->last_in_chain = 1;
+    b->flush = 1; //flush just to be sure, although I should perhaps rethink this
+    b->memory = 1;
+    b->start = body->data;
+    b->pos = body->data;
+    b->end = body->data + body->len;
+    b->last = b->end;
+    
+    ngx_http_send_header(r);
+    rc= nchan_output_filter(r, chain);
+  }
+  
+  if(finalize) {
+    ngx_http_finalize_request(r, rc);
+  }
+  return rc;
+}
+
+ngx_table_elt_t * nchan_add_response_header(ngx_http_request_t *r, const ngx_str_t *header_name, const ngx_str_t *header_value) {
+  ngx_table_elt_t                *h = ngx_list_push(&r->headers_out.headers);
+  if (h == NULL) {
+    return NULL;
+  }
+  h->hash = 1;
+  h->key.len = header_name->len;
+  h->key.data = header_name->data;
+  if(header_value) {
+    h->value.len = header_value->len;
+    h->value.data = header_value->data;
+  }
+  else {
+    h->value.len = 0;
+    h->value.data = NULL;
+  }
+  return h;
+}
+
+ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allow_origin, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods) {
+  nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  nchan_add_response_header(r, &NCHAN_HEADER_ALLOW, allowed_methods);
+  
+  if(ctx && ctx->request_origin_header.data) {
+    //Access-Control-Allow-Origin is included later
+    nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS, allowed_headers);
+    nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS, allowed_methods);
+  }
+  return nchan_respond_status(r, NGX_HTTP_OK, NULL, 0);
+}
+
+/*
+
+void nchan_copy_preallocated_buffer(ngx_buf_t *buf, ngx_buf_t *cbuf) {
+  if (cbuf!=NULL) {
+    ngx_memcpy(cbuf, buf, sizeof(*buf)); //overkill?
+    if(buf->temporary || buf->memory) { //we don't want to copy mmpapped memory, so no ngx_buf_in_momory(buf)
+      cbuf->pos = (u_char *) (cbuf+1);
+      cbuf->last = cbuf->pos + ngx_buf_size(buf);
+      cbuf->start=cbuf->pos;
+      cbuf->end = cbuf->start + ngx_buf_size(buf);
+      ngx_memcpy(cbuf->pos, buf->pos, ngx_buf_size(buf));
+      cbuf->memory=ngx_buf_in_memory_only(buf) ? 1 : 0;
+    }
+    if (buf->file!=NULL) {
+      cbuf->file = (ngx_file_t *) (cbuf+1) + ((buf->temporary || buf->memory) ? ngx_buf_size(buf) : 0);
+      cbuf->file->fd=buf->file->fd;
+      cbuf->file->log=ngx_cycle->log;
+      cbuf->file->offset=buf->file->offset;
+      cbuf->file->sys_offset=buf->file->sys_offset;
+      cbuf->file->name.len=buf->file->name.len;
+      cbuf->file->name.data=(u_char *) (cbuf->file+1);
+      ngx_memcpy(cbuf->file->name.data, buf->file->name.data, buf->file->name.len);
+    }
+  }
+}
+
+#define NGX_HTTP_BUF_ALLOC_SIZE(buf)                                         \
+(sizeof(*buf) +                                                              \
+(((buf)->temporary || (buf)->memory) ? ngx_buf_size(buf) : 0) +              \
+(((buf)->file!=NULL) ? (sizeof(*(buf)->file) + (buf)->file->name.len + 1) : 0))
+
+//buffer is _copied_
+ngx_chain_t * nchan_create_output_chain(ngx_buf_t *buf, ngx_pool_t *pool, ngx_log_t *log) {
+  ngx_chain_t                    *out;
+  ngx_file_t                     *file;
+  ngx_pool_cleanup_t             *cln = NULL;
+  ngx_pool_cleanup_file_t        *clnf = NULL;
+  if((out = ngx_pcalloc(pool, sizeof(*out)))==NULL) {
+    nchan_log(NGX_LOG_ERR, log, "can't create output chain, can't allocate chain  in pool");
+    return NULL;
+  }
+  ngx_buf_t                      *buf_copy;
+  
+  if((buf_copy = ngx_pcalloc(pool, NGX_HTTP_BUF_ALLOC_SIZE(buf)))==NULL) {
+    //TODO: don't zero the whole thing!
+    nchan_log(NGX_LOG_ERR, log, "can't create output chain, can't allocate buffer copy in pool");
+    return NULL;
+  }
+  nchan_copy_preallocated_buffer(buf, buf_copy);
+  
+  if (buf->file!=NULL) {
+    if(buf->mmap) { //just the mmap, please
+      buf->in_file=0;
+      buf->file=NULL;
+      buf->file_pos=0;
+      buf->file_last=0;
+    }
+    else {
+      file = buf_copy->file;
+      file->log=log;
+      if(file->fd==NGX_INVALID_FILE) {
+        //nchan_log(NGX_LOG_ERR, log, "opening invalid file at %s", file->name.data);
+        file->fd=ngx_open_file(file->name.data, NGX_FILE_RDONLY, NGX_FILE_OPEN, NGX_FILE_OWNER_ACCESS);
+      }
+      if(file->fd==NGX_INVALID_FILE) {
+        nchan_log(NGX_LOG_ERR, log, "can't create output chain, file in buffer is invalid");
+        return NULL;
+      }
+      else {
+        //close file on cleanup
+        if((cln = ngx_pool_cleanup_add(pool, sizeof(*clnf))) == NULL) {
+          ngx_close_file(file->fd);
+          file->fd=NGX_INVALID_FILE;
+          nchan_log(NGX_LOG_ERR, log, "can't create output chain file cleanup.");
+          return NULL;
+        }
+        cln->handler = ngx_pool_cleanup_file;
+        clnf = cln->data;
+        clnf->fd = file->fd;
+        clnf->name = file->name.data;
+        clnf->log = pool->log;
+      }
+    }
+  }
+  
+  
+  
+  buf_copy->last_buf = 1;
+  out->buf = buf_copy;
+  out->next = NULL;
+  return out;
+}
+*/
diff --git a/debian/modules/nchan/src/util/nchan_output.h b/debian/modules/nchan/src/util/nchan_output.h
new file mode 100644
index 0000000..5e585d5
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_output.h
@@ -0,0 +1,26 @@
+#include <nchan_defs.h>
+#include <nchan_types.h>
+
+void nchan_output_init(void);
+void nchan_output_shutdown(void);
+
+ngx_int_t nchan_output_filter(ngx_http_request_t *r, ngx_chain_t *in);
+ngx_int_t nchan_output_msg_filter(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in);
+
+ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_int_t finalize);
+ngx_int_t nchan_respond_string(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_str_t *body, ngx_int_t finalize);
+ngx_int_t nchan_respond_cstring(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, char *body, ngx_int_t finalize);
+ngx_int_t nchan_respond_membuf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, ngx_buf_t *body, ngx_int_t finalize);
+ngx_table_elt_t * nchan_add_response_header(ngx_http_request_t *r, const ngx_str_t *header_name, const ngx_str_t *header_value);
+ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
+ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allow_origin, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods);
+ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_id_t *msgid, ngx_int_t finalize, char **err);
+void nchan_include_access_control_if_needed(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
+
+ngx_fd_t nchan_fdcache_get(ngx_str_t *filename);
+
+ngx_int_t nchan_msg_buf_open_fd_if_needed(ngx_buf_t *buf, ngx_file_t *file, ngx_http_request_t *r);
+
+ngx_str_t *msgtag_to_str(nchan_msg_id_t *id);
+ngx_str_t *msgid_to_str(nchan_msg_id_t *id);
+size_t msgtag_to_strptr(nchan_msg_id_t *id, char *ch);
diff --git a/debian/modules/nchan/src/util/nchan_rbtree.c b/debian/modules/nchan/src/util/nchan_rbtree.c
new file mode 100644
index 0000000..5614979
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_rbtree.c
@@ -0,0 +1,379 @@
+#include <nchan_module.h>
+#include "nchan_rbtree.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "RBTREE:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "RBTREE:" fmt, ##arg)
+
+static uint32_t rbtree_hash_crc32(void *str) {
+  return ngx_crc32_short(((ngx_str_t *)str)->data, ((ngx_str_t *)str)->len);
+}
+static ngx_int_t rbtree_compare_str(void *id1, void *id2) {
+  return ngx_memn2cmp(((ngx_str_t *)id1)->data, ((ngx_str_t *)id2)->data, ((ngx_str_t *)id1)->len, ((ngx_str_t *)id2)->len);
+}
+
+/*
+static ngx_int_t rbtree_validate_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
+  if (node == &seed->sentinel) {
+    return 1;
+  }
+  
+  ngx_int_t    i, max, valid;
+  ngx_rbtree_node_t *cur;
+  valid = 0;
+  max = sizeof(seed->actives)/sizeof(cur);
+  
+  for(i=0; i<max; i++){
+    if(seed->actives[i] == node) {
+      valid = 1;
+      break;
+    }
+  }
+  return valid;
+  
+}
+*/
+
+/*
+static ngx_int_t rbtree_validate_nodes_reachable(rbtree_seed_t *seed) {
+  ngx_int_t    i, max;
+  ngx_rbtree_node_t *cur, *match;
+  max = sizeof(seed->actives)/sizeof(cur);
+  
+  for(i=0; i<max; i++){
+    cur = seed->actives[i];
+    if(cur != NULL) {
+      match = rbtree_find_node(seed, seed->id(rbtree_data_from_node(cur)));
+      assert(match == cur);
+    }
+  }
+  return 1;
+}
+*/
+
+static ngx_rbtree_node_t * rbtree_find_node_generic(rbtree_seed_t *seed, void *id, uint32_t hash, ngx_rbtree_node_t **last_parent, ngx_int_t *last_compare) {
+  ngx_rbtree_node_t              *root = seed->tree.root;
+  ngx_rbtree_node_t              *node = root;
+  ngx_rbtree_node_t              *sentinel = seed->tree.sentinel;
+  ngx_int_t                       rc;
+
+  while (node != sentinel) {
+    if (hash < node->key) {
+      node = node->left;
+      continue;
+    }
+    if (hash > node->key) {
+      node = node->right;
+      continue;
+    }
+
+    /* hash == node->key */
+    rc = seed->compare(id, seed->id(rbtree_data_from_node(node)));
+    if (rc == 0) {
+      return node;
+    }
+    node = (rc < 0) ? node->left : node->right;
+  }
+  /* not found */
+
+  return NULL;
+}
+
+ngx_rbtree_node_t *rbtree_find_node(rbtree_seed_t *seed, void *id) {
+  ngx_rbtree_node_t *found;
+  found = rbtree_find_node_generic(seed, id, seed->hash(id), NULL, NULL);
+  if(found) {
+    DBG("found node %p", found);
+  }
+  else {
+    DBG("node not found");
+  }
+  return found;
+}
+
+static void rbtree_insert_generic(ngx_rbtree_node_t *temp, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) {
+  ngx_int_t         offset = offsetof(rbtree_seed_t, sentinel);
+  rbtree_seed_t    *seed = (rbtree_seed_t *)((char *)sentinel - offset);
+  ngx_int_t         rc;
+  void             *id = seed->id(rbtree_data_from_node(node));
+  
+  ngx_rbtree_node_t  **p;
+ 
+  for ( ;; ) {
+    
+    if (node->key != temp->key) {
+      p = (node->key < temp->key) ? &temp->left : &temp->right;
+    }
+    else {
+      rc = seed->compare(id, seed->id(rbtree_data_from_node(temp)));
+      p = (rc < 0) ? &temp->left : &temp->right;
+    }
+    
+    if (*p == sentinel) {
+      break;
+    }
+    
+    temp = *p;
+  }
+
+  *p = node;
+  node->parent = temp;
+  node->left = sentinel;
+  node->right = sentinel;
+  ngx_rbt_red(node);
+}
+
+ngx_rbtree_node_t *rbtree_create_node(rbtree_seed_t *seed, size_t data) {
+  ngx_rbtree_node_t *node = ngx_alloc(sizeof(ngx_rbtree_node_t) + data, ngx_cycle->log);
+  if(node) {
+    node->left = NULL;
+    node->right = NULL;
+    node->parent = NULL;
+    seed->allocd_nodes++;
+  }
+  DBG("created node %p", node);
+  return node;
+}
+
+ngx_int_t rbtree_destroy_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
+  seed->allocd_nodes--;
+#if NCHAN_RBTREE_DBG
+  ngx_memset(node, 0x67, sizeof(*node));
+#endif
+  DBG("Destroyed node %p", node);
+  ngx_free(node);
+  
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_insert_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
+  void  *id = seed->id(rbtree_data_from_node(node));
+  node->key = seed->hash(id);
+  ngx_rbtree_insert(&seed->tree, node);
+  seed->active_nodes++;
+  
+#if NCHAN_RBTREE_DBG
+  
+  //assert(rbtree_find_node(seed, seed->id(rbtree_data_from_node(node))) == node);
+  
+  //super-heavy debugging
+  /*
+  ngx_int_t    i, max, inserted = 0;
+  ngx_rbtree_node_t *cur;
+  max = sizeof(seed->actives)/sizeof(cur);
+  
+  assert(seed->active_nodes < max);
+  
+  for(i=0; i<max; i++){
+    if(seed->actives[i] == NULL) {
+      seed->actives[i]=node;
+      inserted = 1;
+      break;
+    }
+  }
+  assert(inserted);
+  */
+  
+#endif
+  DBG("inserted node %p", node);
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_remove_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
+  
+  ngx_rbtree_delete(&seed->tree, node);
+  DBG("Removed node %p", node);
+  seed->active_nodes--;
+  
+#if NCHAN_RBTREE_DBG
+  //assert(rbtree_find_node(seed, seed->id(rbtree_data_from_node(node))) == NULL);
+  ngx_memset(node, 0x65, sizeof(*node));
+  
+  
+  //super-heavy debugging
+  /*
+  ngx_int_t    i, max, removed = 0;
+  ngx_rbtree_node_t *cur;
+  max = sizeof(seed->actives)/sizeof(cur);
+  
+  assert(seed->active_nodes < max);
+  
+  for(i=0; i<max; i++){
+    if(seed->actives[i] == node) {
+      seed->actives[i]=NULL;
+      removed = 1;
+      break;
+    }
+  }
+  assert(removed);
+  
+  */
+  
+#endif
+  return NGX_OK;
+}
+
+static ngx_inline void rbtree_walk_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_callback_pt callback, void *data) {
+  ngx_rbtree_node_t  *left, *right;
+  if(node == sentinel || node == NULL) {
+    return;
+  }
+  left = node->left;
+  right = node->right;
+  rbtree_walk_real(seed, left, sentinel, callback, data);
+  rbtree_walk_real(seed, right, sentinel, callback, data);
+  callback(seed, rbtree_data_from_node(node), data);
+}
+
+static ngx_inline void rbtree_walk_ordered_incr_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_callback_pt callback, void *data) {
+  ngx_rbtree_node_t  *left, *right;
+  if(node == sentinel || node == NULL) {
+    return;
+  }
+  left = node->left;
+  right = node->right;
+  rbtree_walk_real(seed, left, sentinel, callback, data);
+  callback(seed, rbtree_data_from_node(node), data);
+  rbtree_walk_real(seed, right, sentinel, callback, data);
+}
+
+static ngx_inline void rbtree_walk_ordered_decr_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_callback_pt callback, void *data) {
+  ngx_rbtree_node_t  *left, *right;
+  if(node == sentinel || node == NULL) {
+    return;
+  }
+  left = node->left;
+  right = node->right;
+  rbtree_walk_real(seed, right, sentinel, callback, data);
+  callback(seed, rbtree_data_from_node(node), data);
+  rbtree_walk_real(seed, left, sentinel, callback, data);
+}
+
+ngx_int_t rbtree_walk(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
+  rbtree_walk_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_walk_incr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
+  rbtree_walk_ordered_incr_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
+  return NGX_OK;
+}
+ngx_int_t rbtree_walk_decr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
+  rbtree_walk_ordered_decr_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
+  return NGX_OK;
+}
+
+typedef struct {
+  void                **els;
+  int                 (*include)(void *);
+  int                   n;
+} rbtree_walk_writesafe_data_t;
+
+static ngx_int_t rbtree_walk_writesafe_callback(rbtree_seed_t *seed, void *node_data, rbtree_walk_writesafe_data_t *d) {
+  if(d->include(node_data)) {
+    d->els[d->n++]=node_data;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_walk_writesafe(rbtree_seed_t *seed, int (*include)(void *), rbtree_walk_callback_pt callback, void *data) {
+  void                         *els_static[32];
+  int                           allocd;
+  int                           i;
+  rbtree_walk_writesafe_data_t  d;
+  if(seed->active_nodes > 32) {
+    d.els = ngx_alloc(sizeof(void *) * seed->active_nodes, ngx_cycle->log);
+    allocd = 1;
+  }
+  else {
+    d.els = els_static;
+    allocd = 0;
+  }
+  d.include = include;
+  d.n = 0;
+  rbtree_walk(seed, (rbtree_walk_callback_pt )rbtree_walk_writesafe_callback, &d);
+  
+  for(i=0; i<d.n; i++) {
+    callback(seed, d.els[i], data);
+  }
+  
+  if(allocd) ngx_free(d.els);
+  return NGX_OK;
+}
+
+unsigned rbtree_empty(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
+  ngx_rbtree_t         *tree = &seed->tree;
+  ngx_rbtree_node_t    *cur, *sentinel = tree->sentinel;
+  unsigned int          n = 0;
+  
+  for(cur = tree->root; cur != NULL && cur != sentinel; cur = tree->root) {
+    if(callback) {
+      callback(seed, rbtree_data_from_node(cur), data);
+    }
+    rbtree_remove_node(seed, cur);
+    rbtree_destroy_node(seed, cur);
+    n++;
+  }
+  return n;
+}
+
+
+static ngx_inline void rbtree_conditional_walk_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_conditional_callback_pt callback, void *data) {
+  rbtree_walk_direction_t    direction;
+  
+  if(node == sentinel || node == NULL) {
+    return;
+  }
+  
+  direction = callback(seed, rbtree_data_from_node(node), data);
+  switch(direction) {
+    case RBTREE_WALK_LEFT:
+      rbtree_conditional_walk_real(seed, node->left, sentinel, callback, data);
+      break;
+    
+    case RBTREE_WALK_RIGHT:
+      rbtree_conditional_walk_real(seed, node->right, sentinel, callback, data);
+      break;
+    
+    case RBTREE_WALK_LEFT_RIGHT:
+      rbtree_conditional_walk_real(seed, node->left, sentinel, callback, data);
+      rbtree_conditional_walk_real(seed, node->right, sentinel, callback, data);
+      break;
+    
+    case RBTREE_WALK_STOP:
+      //no more
+      break;
+  }
+}
+
+ngx_int_t rbtree_conditional_walk(rbtree_seed_t *seed, rbtree_walk_conditional_callback_pt callback, void *data) {
+  rbtree_conditional_walk_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_init(rbtree_seed_t *seed, char *name, void *(*id)(void *), uint32_t (*hash)(void *), ngx_int_t (*compare)(void *, void *)) {
+  seed->name=name;
+  assert(id != NULL);
+  if(hash==NULL) {
+    hash = &rbtree_hash_crc32;
+  }
+  if(compare == NULL) {
+    compare = &rbtree_compare_str;
+  }
+  seed->id = id;
+  seed->hash = hash;
+  seed->compare = compare;
+  seed->active_nodes = 0;
+  seed->allocd_nodes = 0;
+#if NCHAN_RBTREE_DBG
+  /*
+  //super-heavy debugging setup
+  ngx_int_t max = sizeof(seed->actives);
+  ngx_memzero(seed->actives, sizeof(seed->actives));
+  */
+#endif
+  ngx_rbtree_init(&seed->tree, &seed->sentinel, &rbtree_insert_generic);
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/util/nchan_rbtree.h b/debian/modules/nchan/src/util/nchan_rbtree.h
new file mode 100644
index 0000000..7a18dfc
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_rbtree.h
@@ -0,0 +1,64 @@
+#ifndef NCHAN_RBTREE_UTIL_HEADER
+#define NCHAN_RBTREE_UTIL_HEADER
+
+#define NCHAN_RBTREE_DBG 0
+
+typedef struct {
+  char              *name;
+  ngx_rbtree_t       tree;
+  ngx_rbtree_node_t  sentinel;
+  ngx_uint_t         allocd_nodes;
+  ngx_uint_t         active_nodes;
+  void              *(*id)(void *node);
+  uint32_t           (*hash)(void *);
+  ngx_int_t          (*compare)(void *, void *);
+  #if NCHAN_RBTREE_DBG   
+  //ngx_rbtree_node_t *actives[4096]; //super-heavy debugging
+#endif
+} rbtree_seed_t;
+
+
+#if NCHAN_RBTREE_DBG 
+typedef struct ngx_rbtree_debug_node_s ngx_rbtree_debug_node_t;
+
+typedef struct {
+  struct ngx_rbtree_debug_node_s  *prev;
+  struct ngx_rbtree_debug_node_s  *next;
+} ngx_rbtree_debug_node_link_t;
+
+struct ngx_rbtree_debug_node_s {
+  ngx_rbtree_node_t              node;
+  ngx_rbtree_debug_node_link_t   allocd;
+  ngx_rbtree_debug_node_link_t   active;
+}; //ngx_rbtree_debug_node_t;
+#endif
+
+typedef enum {RBTREE_WALK_LEFT, RBTREE_WALK_RIGHT, RBTREE_WALK_LEFT_RIGHT, RBTREE_WALK_STOP} rbtree_walk_direction_t;
+
+typedef ngx_int_t (*rbtree_walk_callback_pt)(rbtree_seed_t *, void *, void *);
+typedef rbtree_walk_direction_t (*rbtree_walk_conditional_callback_pt)(rbtree_seed_t *, void *, void *);
+
+ngx_int_t rbtree_init(rbtree_seed_t *seed, char *name, void *(*id)(void *), uint32_t (*hash)(void *), ngx_int_t (*compare)(void *, void *));
+unsigned             rbtree_empty(rbtree_seed_t *, rbtree_walk_callback_pt, void *data);
+
+ngx_rbtree_node_t   *rbtree_create_node(rbtree_seed_t *, size_t);
+ngx_int_t            rbtree_insert_node(rbtree_seed_t *, ngx_rbtree_node_t *);
+ngx_int_t            rbtree_remove_node(rbtree_seed_t *, ngx_rbtree_node_t *);
+ngx_int_t            rbtree_destroy_node(rbtree_seed_t *, ngx_rbtree_node_t *);
+
+ngx_rbtree_node_t   *rbtree_find_node(rbtree_seed_t *, void *);
+
+ngx_int_t            rbtree_walk(rbtree_seed_t *seed, rbtree_walk_callback_pt, void *data);
+ngx_int_t            rbtree_walk_incr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data);
+ngx_int_t            rbtree_walk_decr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data);
+ngx_int_t            rbtree_walk_writesafe(rbtree_seed_t *seed, int (*include)(void *), rbtree_walk_callback_pt callback, void *data);
+
+ngx_int_t            rbtree_conditional_walk(rbtree_seed_t *seed, rbtree_walk_conditional_callback_pt, void *data);
+
+ngx_rbtree_node_t   *rbtree_node_from_data(void *);
+
+
+#define rbtree_data_from_node(node) ((void *)(&node[1]))
+#define rbtree_node_from_data(data) (ngx_rbtree_node_t *)((u_char *)data - sizeof(ngx_rbtree_node_t))
+
+#endif /*NCHAN_RBTREE_UTIL_HEADER*/
diff --git a/debian/modules/nchan/src/util/nchan_reaper.c b/debian/modules/nchan/src/util/nchan_reaper.c
new file mode 100644
index 0000000..99d6801
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_reaper.c
@@ -0,0 +1,320 @@
+#include <nchan_module.h>
+#include "nchan_reaper.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REAPER: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REAPER: " fmt, ##args)
+
+static void reaper_timer_handler(ngx_event_t *ev);
+void verify_reaper_list(nchan_reaper_t *rp, void *thing);
+
+ngx_int_t nchan_reaper_start(nchan_reaper_t *rp, char *name, int prev, int next, ngx_int_t (*ready)(void *, uint8_t), void (*reap)(void *), int tick_sec) {
+  rp->name = name;
+  rp->count = 0;
+  rp->next_ptr_offset = next;
+  rp->prev_ptr_offset = prev;
+  rp->last = NULL;
+  rp->first = NULL;
+  rp->ready = ready;
+  rp->reap = reap;
+  ngx_memzero(&rp->timer, sizeof(rp->timer));
+  nchan_init_timer(&rp->timer, reaper_timer_handler, rp);
+  
+  rp->tick_usec = tick_sec * 1000;
+  rp->strategy = RESCAN;
+  rp->max_notready_ratio = 0; //disabled
+  rp->position = NULL;
+  
+  DBG("start reaper %s with tick time of %i sec", name, tick_sec);
+  verify_reaper_list(rp, NULL);
+  return NGX_OK;
+}
+
+static void its_reaping_time(nchan_reaper_t *rp, uint8_t force);
+
+ngx_int_t nchan_reaper_flush(nchan_reaper_t *rp) {
+  its_reaping_time(rp, 1);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_reaper_stop(nchan_reaper_t *rp) {
+  nchan_reaper_flush(rp);
+  if(rp->timer.timer_set) {
+    ngx_del_timer(&rp->timer);
+  }
+  DBG("stopped reaper %s", rp->name);
+  return NGX_OK;
+}
+
+static ngx_inline void **thing_next_ptr(nchan_reaper_t *rp, void *thing) {
+  return (void *)((char *)thing + rp->next_ptr_offset);
+}
+static ngx_inline void *thing_next(nchan_reaper_t *rp, void *thing) {
+  return *thing_next_ptr(rp, thing);
+}
+
+static ngx_inline void **thing_prev_ptr(nchan_reaper_t *rp, void *thing) {
+  return (void *)((char *)thing + rp->prev_ptr_offset);
+}
+static ngx_inline void *thing_prev(nchan_reaper_t *rp, void *thing) {
+  return *thing_prev_ptr(rp, thing);
+}
+
+void nchan_reaper_each(nchan_reaper_t *rp, void (*cb)(void *thing, void *pd), void *pd) {
+  void                *cur;
+  for(cur = rp->first; cur != NULL; cur = thing_next(rp, cur)) {
+    cb(cur, pd);
+  }
+}
+
+ngx_inline void verify_reaper_list(nchan_reaper_t *rp, void *thing) {
+  /*
+  if(rp->first == NULL) {
+    assert(rp->count == 0 && rp->last == NULL);
+  }
+  else {
+    assert(rp->count > 0 && rp->last != NULL);
+  }
+  
+  if(rp->last == NULL) {
+    assert(rp->count == 0 && rp->first == NULL);
+  }
+  else {
+    assert(rp->count > 0 && rp->first != NULL);
+  }
+  
+  if(rp->count == 0) {
+    assert(rp->last == NULL && rp->first == NULL);
+  }
+  else {
+    assert(rp->last != NULL && rp->first != NULL);
+  }
+  
+  int i=0;
+  void *cur;
+  for(cur = rp->first; cur != NULL; cur = thing_next(rp, cur)) {
+    i++;
+    if(thing) assert(cur != thing);
+  }
+  assert(i == rp->count);
+  */
+}
+
+static ngx_inline void reaper_reset_timer(nchan_reaper_t *rp) {
+  verify_reaper_list(rp, NULL);
+  if (!ngx_exiting && !ngx_quit && rp->count > 0 && !rp->timer.timer_set) {
+    DBG("reap %s again later (remaining: %i)", rp->name, rp->count);
+    ngx_add_timer(&rp->timer, rp->tick_usec);
+  }
+  
+}
+
+ngx_int_t nchan_reaper_add(nchan_reaper_t *rp, void *thing) {
+  verify_reaper_list(rp, thing);
+  
+  if(rp->ready(thing, 0) == NGX_OK) {
+    rp->reap(thing);
+    return NGX_OK;
+  }
+  
+  void    **next = thing_next_ptr(rp, thing);
+  void    **prev = thing_prev_ptr(rp, thing);
+  
+  if(rp->last) {
+    *thing_next_ptr(rp, rp->last) = thing;
+  }
+  *prev = rp->last;
+  *next = NULL;
+  rp->last = thing;
+  
+  if(rp->first == NULL) {
+    rp->first = thing;
+  }
+  
+  assert(rp->count >= 0);
+  rp->count++;
+  
+  DBG("reap %s %p later (waiting to be reaped: %i)", rp->name, thing, rp->count);
+  verify_reaper_list(rp, NULL);
+  reaper_reset_timer(rp);
+  return NGX_OK;
+}
+
+
+//this is not a safe function -- it doesn't check if the thing is actually being reaped.
+ngx_int_t nchan_reaper_withdraw(nchan_reaper_t *rp, void *thing) {
+  void *prev, *next;
+  
+  prev = thing_prev(rp, thing);
+  next = thing_next(rp, thing);
+  
+  if(prev) *thing_next_ptr(rp, prev) = next;
+  if(next) *thing_prev_ptr(rp, next) = prev;
+  
+  if(thing == rp->first) rp->first = next;
+  if(thing == rp->last)  rp->last  = prev;
+  
+  assert(rp->count > 0);
+  rp->count--;
+  
+  if(rp->strategy == KEEP_PLACE && rp->position == thing) {
+    rp->position = next;
+  }
+  
+  *thing_next_ptr(rp, thing) = NULL;
+  *thing_prev_ptr(rp, thing) = NULL;
+
+  verify_reaper_list(rp, thing);
+  
+  DBG("withdraw %s %p", rp->name, thing);
+  return NGX_OK;
+}
+
+static ngx_inline void reap_ready_thing(nchan_reaper_t *rp, void *cur, void *next) {
+  void   *prev;
+  prev = thing_prev(rp, cur);
+  if(prev != NULL && next != NULL) {
+    assert(prev != next);
+  }
+  assert(cur != prev);
+  assert(cur != next);
+  if(prev) *thing_next_ptr(rp, prev) = next;
+  if(next) *thing_prev_ptr(rp, next) = prev;
+  if(cur == rp->first) rp->first = next;
+  if(cur == rp->last)  rp->last = prev;
+  if(rp->strategy == KEEP_PLACE && rp->position == cur) {
+    rp->position = next;
+  }
+  rp->count--;
+  
+  rp->reap(cur);
+  
+  assert(rp->count >= 0);
+  verify_reaper_list(rp, cur);
+  DBG("reaped %s %p (waiting to be reaped: %l)", rp->name, cur, rp->count);
+}
+
+static void its_reaping_time(nchan_reaper_t *rp, uint8_t force) {
+  void                *cur = rp->first, *next;
+  int                  max_notready, notready = 0; 
+  
+  max_notready = rp->max_notready_ratio * rp->count;
+  
+  DBG("%s scan max notready %i", rp->name, max_notready);
+  
+  while(cur != NULL && notready <= max_notready) {
+    next = thing_next(rp, cur);
+    if(rp->ready(cur, force) == NGX_OK) {
+      reap_ready_thing(rp, cur, next);
+      verify_reaper_list(rp, cur);
+    }
+    else if(max_notready > 0){
+      DBG("not ready to reap %s %p", rp->name, cur);
+      notready++;
+      verify_reaper_list(rp, NULL);
+    }
+    cur = next;
+  } 
+}
+
+static void its_reaping_time_keep_place(nchan_reaper_t *rp, uint8_t force) {
+  void                *cur, *next;
+  int                  max_notready, notready = 0; 
+  int                  n = 0;
+  max_notready = rp->max_notready_ratio * rp->count;
+  cur = rp->position == NULL ? rp->first : rp->position;
+  
+  DBG("%s keep_place max notready %i, cur %p", rp->name, max_notready, cur);
+  
+  while(n < rp->count && notready <= max_notready) {
+    n++;
+    next = thing_next(rp, cur);
+    if(rp->ready(cur, force) == NGX_OK) {
+      reap_ready_thing(rp, cur, next);
+      verify_reaper_list(rp, cur);
+    }
+    else if(max_notready > 0) {
+      DBG("not ready to reap %s %p", rp->name, cur);
+      notready++;
+      verify_reaper_list(rp, NULL);
+    }
+    cur = (next == NULL ? rp->first : next);
+  }
+  rp->position = cur;
+}
+
+static void its_reaping_rotating_time(nchan_reaper_t *rp, uint8_t force) {
+  void                *cur = rp->first, *next, *prev;
+  void                *firstmoved = NULL;
+  void               **next_ptr, **prev_ptr;
+  int                  max_notready, notready = 0; 
+  
+  max_notready = rp->max_notready_ratio * rp->count;
+  
+  DBG("%s rotatey max notready %i", rp->name, max_notready);
+  
+  while(cur != NULL && cur != firstmoved && notready <= max_notready) {
+    next = thing_next(rp, cur);
+    if(rp->ready(cur, force) == NGX_OK) {
+      reap_ready_thing(rp, cur, next);
+    }
+    else {
+      //move to the end of the list
+      //TODO: bulk move
+      if(max_notready > 0) {
+        DBG("not ready to reap %s %p", rp->name, cur);
+        notready++;
+        verify_reaper_list(rp, NULL);
+      }
+      
+      if(!firstmoved) firstmoved = cur;
+      
+      if(rp->last != cur) {
+        prev = thing_prev(rp, cur);
+        
+        if(prev) *thing_next_ptr(rp, prev) = next;
+        if(next) *thing_prev_ptr(rp, next) = prev;
+        
+        next_ptr = thing_next_ptr(rp, cur);
+        prev_ptr = thing_prev_ptr(rp, cur);
+        
+        if(rp->last) {
+          *thing_next_ptr(rp, rp->last) = cur;
+        }
+        
+        *prev_ptr = rp->last;
+        *next_ptr = NULL;
+        rp->last = cur;
+        
+        if(rp->first == NULL) {
+          rp->first = cur;
+        }
+        else if(rp->first == cur) {
+          rp->first = next;
+        }
+      }
+      verify_reaper_list(rp, NULL);
+    }
+    cur = next;
+  } 
+}
+
+static void reaper_timer_handler(ngx_event_t *ev) {
+  nchan_reaper_t      *rp = ev->data;
+  switch (rp->strategy) {
+    case RESCAN:
+      its_reaping_time(rp, 0);
+      reaper_reset_timer(rp);
+      return;
+    case ROTATE:
+      its_reaping_rotating_time(rp, 0);
+      reaper_reset_timer(rp);
+      return;
+    case KEEP_PLACE:
+      its_reaping_time_keep_place(rp, 0);
+      reaper_reset_timer(rp);
+      return;
+  }
+}
diff --git a/debian/modules/nchan/src/util/nchan_reaper.h b/debian/modules/nchan/src/util/nchan_reaper.h
new file mode 100644
index 0000000..541389a
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_reaper.h
@@ -0,0 +1,33 @@
+#ifndef NCHAN_REAPER_H
+#define NCHAN_REAPER_H
+
+typedef enum {RESCAN, ROTATE, KEEP_PLACE} nchan_reaper_strategy_t;
+
+typedef struct {
+  char                      *name;
+  int                        count;
+  int                        next_ptr_offset;
+  int                        prev_ptr_offset;
+  void                      *last;
+  void                      *first;
+  ngx_int_t                  (*ready)(void *, uint8_t force); //ready to be reaped?
+  void                       (*reap)(void *); //reap it
+  ngx_event_t                timer;
+  int                        tick_usec;
+  nchan_reaper_strategy_t    strategy;
+  float                      max_notready_ratio;
+  void                      *position;
+
+} nchan_reaper_t;
+
+ngx_int_t nchan_reaper_start(nchan_reaper_t *rp, char *name, int prev, int next, ngx_int_t (*ready)(void *, uint8_t force), void (*reap)(void *), int tick_sec);
+
+ngx_int_t nchan_reaper_flush(nchan_reaper_t *rp);
+ngx_int_t nchan_reaper_stop(nchan_reaper_t *rp);
+void nchan_reaper_each(nchan_reaper_t *rp, void (*cb)(void *thing, void *pd), void *pd);
+
+
+ngx_int_t nchan_reaper_add(nchan_reaper_t *rp, void *thing);
+ngx_int_t nchan_reaper_withdraw(nchan_reaper_t *rp, void *thing);
+
+#endif /*NCHAN_REAPER_H*/
diff --git a/debian/modules/nchan/src/util/nchan_reuse_queue.c b/debian/modules/nchan/src/util/nchan_reuse_queue.c
new file mode 100644
index 0000000..c79ceb0
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_reuse_queue.c
@@ -0,0 +1,151 @@
+#include <nchan_module.h>
+#include "nchan_reuse_queue.h"
+#include <assert.h>
+#define DEBUG_LEVEL NGX_LOG_WARN
+//#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REUSEQUEUE:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REUSEQUEUE:" fmt, ##arg)
+
+ngx_int_t nchan_reuse_queue_init(nchan_reuse_queue_t *rq, int prev, int next, void *(*alloc)(void *), ngx_int_t (*free)(void *, void*), void *privdata) {
+  rq->size = 0;
+  rq->prev_ptr_offset = prev;
+    rq->next_ptr_offset = next;
+  rq->first = NULL;
+  rq->last = NULL;
+  rq->reserve = NULL;
+  rq->alloc = alloc;
+  rq->free = free;
+  rq->pd = privdata;
+  
+  return NGX_OK;
+}
+
+static ngx_inline void **thing_next_ptr(nchan_reuse_queue_t *rq, void *thing) {
+  return (void *)((char *)thing + rq->next_ptr_offset);
+}
+static ngx_inline void *thing_next(nchan_reuse_queue_t *rq, void *thing) {
+  return *thing_next_ptr(rq, thing);
+}
+
+static ngx_inline void **thing_prev_ptr(nchan_reuse_queue_t *rq, void *thing) {
+  return (void *)((char *)thing + rq->prev_ptr_offset);
+}
+
+/*static ngx_inline void *thing_prev(nchan_reuse_queue_t *rq, void *thing) {
+  return *thing_prev_ptr(rq, thing);
+}
+
+
+static void check_queue(nchan_reuse_queue_t *rq) {
+  void *cur;
+  for(cur = rq->first; cur != NULL; cur = thing_next(rq, cur)) {
+    if(thing_prev_ptr(rq, rq->first)) {
+      assert(thing_prev(rq, rq->first) != rq->first);
+    }
+    if(thing_next_ptr(rq, rq->first)) {
+      assert(thing_next(rq, rq->first) != rq->first);
+    }
+  }
+}
+*/
+
+ngx_int_t nchan_reuse_queue_flush(nchan_reuse_queue_t *rq) {
+  void *pd = rq->pd;
+  void *thing, *next;
+  ngx_int_t     i=0;
+  next = rq->first;
+  while((thing = next) != NULL) {
+    i++;
+    next = thing_next(rq, thing);
+    if(rq->free) rq->free(pd, thing);
+  }
+  rq->reserve = rq->first;
+  rq->first = NULL;
+  rq->last = NULL;
+  return i;
+}
+
+ngx_int_t nchan_reuse_queue_shutdown(nchan_reuse_queue_t *rq) {
+  if(rq->free) {
+    void *pd = rq->pd;
+    void *thing, *next;
+    next = rq->first;
+    while((thing = next) != NULL) {
+      next = thing_next(rq, thing);
+      rq->free(pd, thing);
+    }
+    next = rq->reserve;
+    while((thing = next) != NULL) {
+      next = thing_next(rq, thing);
+      rq->free(pd, thing);
+    }
+  }
+  
+  if(rq->last) {
+    *thing_next_ptr(rq, rq->last) = rq->reserve;
+  }
+  rq->first = NULL;
+  rq->last = NULL;
+  
+  if(rq->first) {
+    rq->reserve = rq->first;
+  }
+  return NGX_OK;
+}
+
+void *nchan_reuse_queue_push(nchan_reuse_queue_t *rq) {
+  void     *q;
+  //check_queue(rq);
+  if(rq->reserve) {
+    q = rq->reserve;
+    rq->reserve = thing_next(rq, q);
+  }
+  else {
+    q = rq->alloc(rq->pd);
+    rq->size++;
+  }
+  *thing_next_ptr(rq, q) = NULL;
+  *thing_prev_ptr(rq, q) = rq->last;
+  if(rq->last) {
+    *thing_next_ptr(rq, rq->last) = q;
+  }
+  rq->last = q;
+  if(!rq->first) {
+    rq->first = q;
+  }
+  //check_queue(rq);
+  return q;
+}
+
+
+
+void *nchan_reuse_queue_first(nchan_reuse_queue_t *rq) {
+  return rq->first;
+}
+
+void nchan_reuse_queue_each(nchan_reuse_queue_t *rq, void (*callback)(void *)) {
+  void      *cur;
+  for(cur = rq->first; cur != NULL; cur = thing_next(rq, cur)) {
+    callback(cur);
+  }
+}
+
+ngx_int_t nchan_reuse_queue_pop(nchan_reuse_queue_t *rq) {
+  void      *q = rq->first;
+  //check_queue(rq);
+  if(q) {
+    rq->first = thing_next(rq, q);
+    if(rq->first) {
+      *thing_prev_ptr(rq, rq->first) = NULL;
+    }
+    if(rq->last == q) {
+      rq->last = NULL;
+    }
+    *thing_prev_ptr(rq, q) = NULL;
+    *thing_next_ptr(rq, q) = rq->reserve;
+    rq->reserve = q;
+  }
+  //check_queue(rq);
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/util/nchan_reuse_queue.h b/debian/modules/nchan/src/util/nchan_reuse_queue.h
new file mode 100644
index 0000000..660f8e0
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_reuse_queue.h
@@ -0,0 +1,24 @@
+#ifndef NCHAN_REUSE_QUEUE_H
+#define NCHAN_REUSE_QUEUE_H
+
+typedef struct {
+  int                        size;
+  int                        next_ptr_offset;
+  int                        prev_ptr_offset;
+  void                      *first;
+  void                      *last;
+  void                      *reserve;
+  void                      *(*alloc)(void *privdata);
+  ngx_int_t                  (*free)(void *privdata, void *thing);
+  void                      *pd;
+} nchan_reuse_queue_t;
+
+ngx_int_t nchan_reuse_queue_init(nchan_reuse_queue_t *rq, int prev, int next, void *(*alloc)(void *), ngx_int_t (*free)(void *, void*), void *privdata);
+ngx_int_t nchan_reuse_queue_shutdown(nchan_reuse_queue_t *rq);
+ngx_int_t nchan_reuse_queue_flush(nchan_reuse_queue_t *rq);
+void nchan_reuse_queue_each(nchan_reuse_queue_t *rq, void (*calback)(void *));
+void *nchan_reuse_queue_first(nchan_reuse_queue_t *rq);
+void *nchan_reuse_queue_push(nchan_reuse_queue_t *rq);
+ngx_int_t nchan_reuse_queue_pop(nchan_reuse_queue_t *rq);
+
+#endif /*NCHAN_REUSE_QUEUE_H*/
diff --git a/debian/modules/nchan/src/util/nchan_subrequest.c b/debian/modules/nchan/src/util/nchan_subrequest.c
new file mode 100644
index 0000000..7b3287e
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_subrequest.c
@@ -0,0 +1,250 @@
+// Taken from agenzh's echo nginx module
+// https://github.com/openresty/echo-nginx-module
+// Thanks, agenzh!
+
+/*
+Copyright (C) 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#include <nchan_module.h>
+
+ngx_str_t  nchan_content_length_header_key = ngx_string("Content-Length");
+
+static ngx_inline ngx_uint_t nchan_hash_str(u_char *src, size_t n) {
+  ngx_uint_t  key;
+  key = 0;
+  while (n--) {
+    key = ngx_hash(key, *src);
+    src++;
+  }
+  return key;
+}
+#define nchan_hash_literal(s)                                        \
+  nchan_hash_str((u_char *) s, sizeof(s) - 1)
+
+static ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t len, u_char *p) {
+  ngx_table_elt_t                 *h, *header;
+  ngx_list_part_t                 *part;
+  ngx_http_request_t              *pr;
+  ngx_uint_t                       i;
+  static ngx_uint_t                nchan_content_length_hash = 0;
+  if(nchan_content_length_hash == 0) {
+    nchan_content_length_hash = nchan_hash_literal("content-length");
+  }
+  
+  r->headers_in.content_length_n = len;
+  
+  if (ngx_list_init(&r->headers_in.headers, r->pool, 20, sizeof(ngx_table_elt_t)) != NGX_OK) {
+    return NGX_ERROR;
+  }
+
+  h = ngx_list_push(&r->headers_in.headers);
+  if (h == NULL) {
+    return NGX_ERROR;
+  }
+
+  h->key = nchan_content_length_header_key;
+  h->lowcase_key= (u_char *)"content-length";
+
+  r->headers_in.content_length = h;
+  if(p == NULL) {
+    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+    if (p == NULL) {
+      return NGX_ERROR;
+    }
+  }
+
+  h->value.data = p;
+  h->value.len = ngx_sprintf(h->value.data, "%O", len) - h->value.data;
+
+  h->hash = nchan_content_length_hash;
+
+  pr = r->parent;
+
+  if (pr == NULL) {
+    return NGX_OK;
+  }
+
+  /* forward the parent request's all other request headers */
+
+  part = &pr->headers_in.headers.part;
+  header = part->elts;
+
+  for (i = 0; /* void */; i++) {
+    
+    if (i >= part->nelts) {
+      if (part->next == NULL) {
+        break;
+      }
+      part = part->next;
+      header = part->elts;
+      i = 0;
+    }
+    if (header[i].key.len == sizeof("Content-Length") - 1 
+        && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length", sizeof("Content-Length") - 1) == 0) {
+      continue;
+    }
+    h = ngx_list_push(&r->headers_in.headers);
+    if (h == NULL) {
+      return NGX_ERROR;
+    }
+    *h = header[i];
+  }
+
+  /* XXX maybe we should set those built-in header slot in
+    * ngx_http_headers_in_t too? */
+
+  return NGX_OK;
+}
+
+ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n, u_char *content_len_str) {
+  //ngx_http_core_main_conf_t  *cmcf;
+  ngx_http_request_t         *r;
+  ngx_http_request_body_t    *body;
+  ngx_int_t                   rc;
+
+  sr->method = method;
+  sr->method_name = *method_name;
+
+  if (sr->method == NGX_HTTP_HEAD) {
+    sr->header_only = 1;
+  }
+  r = sr->parent;
+
+  sr->header_in = r->header_in;
+
+  /* XXX work-around a bug in ngx_http_subrequest */
+  if (r->headers_in.headers.last == &r->headers_in.headers.part) {
+    sr->headers_in.headers.last = &sr->headers_in.headers.part;
+  }
+
+  
+  /* we do not inherit the parent request's variables */
+  //scratch that, let's inherit those vars
+  //cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
+  //sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts * sizeof(ngx_http_variable_value_t));
+
+  if (sr->variables == NULL) {
+    return NGX_ERROR;
+  }
+
+  if ((body = request_body)!=NULL) {
+    sr->request_body = body;
+
+    rc = nchan_set_content_length_header(sr, content_length_n, content_len_str);
+    
+    if (rc != NGX_OK) {
+      return NGX_ERROR;
+    }
+  }
+
+  //dd("subrequest body: %p", sr->request_body);
+
+  return NGX_OK;
+}
+#if (NGX_HTTP_V2) || (NGX_HTTP_SPDY)
+static void nchan_recover_upstream_hacky_request_method(ngx_http_request_t *r) {
+  ngx_uint_t           i;
+  ngx_buf_t            request_buf;
+  u_char              *str;
+  ngx_int_t            len;
+  
+  static const struct {
+    int8_t            len;
+    const u_char      method[11];
+    uint32_t          code;
+  } tests[] = {
+    { 3, "GET ",       NGX_HTTP_GET },
+    { 4, "POST ",      NGX_HTTP_POST },
+    { 4, "HEAD ",      NGX_HTTP_HEAD },
+    { 7, "OPTIONS ",   NGX_HTTP_OPTIONS },
+    { 8, "PROPFIND ",  NGX_HTTP_PROPFIND },
+    { 3, "PUT ",       NGX_HTTP_PUT },
+    { 5, "MKCOL ",     NGX_HTTP_MKCOL },
+    { 6, "DELETE ",    NGX_HTTP_DELETE },
+    { 4, "COPY ",      NGX_HTTP_COPY },
+    { 4, "MOVE ",      NGX_HTTP_MOVE },
+    { 9, "PROPPATCH ", NGX_HTTP_PROPPATCH },
+    { 4, "LOCK ",      NGX_HTTP_LOCK },
+    { 6, "UNLOCK ",    NGX_HTTP_UNLOCK },
+    { 5, "PATCH ",     NGX_HTTP_PATCH },
+    { 5, "TRACE ",     NGX_HTTP_TRACE }
+  };
+  
+  request_buf = *r->upstream->request_bufs->buf;
+  str= request_buf.start;
+  len = request_buf.end - request_buf.start;
+  
+  for(i=0; i < sizeof(tests) / sizeof(tests[0]); i++) {
+    if(len >= tests[i].len + 1 && ngx_strncmp(str, tests[i].method, tests[i].len + 1) == 0) {
+      r->method = tests[i].code;
+      r->method_name.len = tests[i].len;
+      r->method_name.data = (u_char *)tests[i].method;
+      break;
+    }
+  }
+}
+#endif
+
+
+static void nchan_recover_http_request_method(ngx_http_request_t *r) {
+  ngx_http_request_t       rdummy;
+  ngx_buf_t                header_in_buf = *r->header_in;
+  ngx_int_t                rc;
+  
+  header_in_buf.pos = header_in_buf.start;
+  ngx_memzero(&rdummy, sizeof(rdummy));
+  rdummy.request_line = r->request_line;
+  
+  rc = ngx_http_parse_request_line(&rdummy, &header_in_buf);
+
+  if (rc == NGX_OK) {
+    r->method_name.len = rdummy.method_end - rdummy.request_start + 1;
+    r->method_name.data = rdummy.request_line.data;
+    r->method = rdummy.method;
+  }
+}
+
+ngx_int_t nchan_recover_x_accel_redirected_request_method(ngx_http_request_t *r) {
+#if (NGX_HTTP_V2)
+  if(r->stream) {
+    nchan_recover_upstream_hacky_request_method(r);
+  }
+  else {
+    nchan_recover_http_request_method(r);
+  }
+#elif (NGX_HTTP_SPDY)
+  if(r->spdy_stream) {
+    nchan_recover_upstream_hacky_request_method(r);
+  }
+  else {
+    nchan_recover_http_request_method(r);
+  }
+#else
+  nchan_recover_http_request_method(r);
+#endif
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/util/nchan_subrequest.h b/debian/modules/nchan/src/util/nchan_subrequest.h
new file mode 100644
index 0000000..437b17d
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_subrequest.h
@@ -0,0 +1,2 @@
+ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n, u_char *content_len_str);
+ngx_int_t nchan_recover_x_accel_redirected_request_method(ngx_http_request_t *r);
diff --git a/debian/modules/nchan/src/util/nchan_thingcache.c b/debian/modules/nchan/src/util/nchan_thingcache.c
new file mode 100644
index 0000000..537ea98
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_thingcache.c
@@ -0,0 +1,208 @@
+#include <nchan_module.h>
+#include <uthash.h>
+#define THING_HASH_FIND(tc, id_str, p)    HASH_FIND( hh, tc->things, (id_str)->data, (id_str)->len, p)
+#define THING_HASH_ADD(tc, thing)      HASH_ADD_KEYPTR( hh, tc->things, (thing->id).data, (thing->id).len, thing)
+#define THING_HASH_DEL(tc, thing)      HASH_DEL(tc->things, thing)
+
+#undef uthash_malloc
+#undef uthash_free
+#define uthash_malloc(sz) ngx_alloc(sz, ngx_cycle->log)
+#define uthash_free(ptr,sz) ngx_free(ptr)
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "THINGCACHE: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "THINGCACHE: " fmt, ##args)
+
+typedef struct {
+  ngx_str_t            id;
+  nchan_llist_timed_t  ll;
+  UT_hash_handle       hh;
+} thing_t;
+
+typedef struct {
+  void *               (*create)(ngx_str_t *id);
+  ngx_int_t            (*destroy)(ngx_str_t *id, void *);
+  char                  *name;
+  ngx_uint_t             ttl;
+  thing_t               *things;
+  nchan_llist_timed_t   *thing_head;
+  nchan_llist_timed_t   *thing_tail;
+  ngx_event_t            gc_timer;
+} nchan_thing_cache_t;
+
+/*
+static ngx_int_t walk_tc(nchan_thing_cache_t *tc) {
+  nchan_llist_timed_t    *cur;
+  int                     head_to_tail = 0, tail_to_head = 0;
+  for(cur = tc->thing_head; cur != NULL; cur = cur->next) {
+    head_to_tail++;
+  }
+  for(cur = tc->thing_tail; cur != NULL; cur = cur->prev) {
+    tail_to_head++;
+  }
+  
+  assert(head_to_tail == tail_to_head);
+  return tail_to_head;
+}
+
+static void verify_tc(nchan_thing_cache_t *tc) {
+  thing_t                *thing, *ttmp;
+  int                    hash = 0;
+  HASH_ITER(hh, (tc->things), thing, ttmp) {  
+    hash++;
+  }
+  assert(walk_tc(tc) == hash);
+}
+*/
+
+static void enqueue_llist_thing(nchan_thing_cache_t *tc, nchan_llist_timed_t *cur) {
+  //verify_tc(tc);
+  if(tc->thing_head == NULL) {
+    cur->prev = NULL;
+    tc->thing_head = cur;
+  }
+  if(tc->thing_tail) {
+    tc->thing_tail->next = cur;
+  }
+  cur->prev = tc->thing_tail;
+  cur->next = NULL;
+  cur->time = ngx_time() + tc->ttl;
+  tc->thing_tail = cur;
+  
+  //start the clock
+  if(! tc->gc_timer.timer_set) {
+    ngx_add_timer(&tc->gc_timer, tc->ttl * 1000);
+  }
+  //walk_tc(tc);
+}
+
+static void nchan_thingcache_gc_timer_handler(ngx_event_t *ev) {
+  nchan_llist_timed_t    *cur, *next;
+  nchan_thing_cache_t    *tc = (nchan_thing_cache_t *)ev->data;
+  time_t                  time = ngx_time();
+  thing_t                *thing;
+  cur = tc->thing_head;
+  while(cur != NULL) {
+    //verify_tc(tc);
+    next = cur->next;
+    if(cur->time <= time) {
+      if(cur->prev) {
+        cur->prev->next = next;
+      }
+      if(next) {
+        next->prev = cur->prev;
+      }
+      thing = container_of(cur, thing_t, ll);
+      if(!tc->destroy(&thing->id, thing->ll.data)) {
+        //time extended!
+        enqueue_llist_thing(tc, cur);
+      }
+      else {
+        if(tc->thing_head == cur) {
+          tc->thing_head = cur->next;
+        }
+        if(tc->thing_tail == cur) {
+          tc->thing_tail = cur->prev;
+        }
+        THING_HASH_DEL(tc, thing);
+        //verify_tc(tc);
+        ngx_free(thing);
+      }
+    }
+    else {
+      break;
+    }
+    cur = next;
+  }
+  
+  if(tc->thing_head != NULL) {
+    ngx_add_timer(&tc->gc_timer, tc->ttl * 1000);
+  }
+  //verify_tc(tc);
+}
+
+void *nchan_thingcache_init(char *name, void *(*create)(ngx_str_t *), ngx_int_t(*destroy)(ngx_str_t *, void *), ngx_uint_t ttl) {
+  nchan_thing_cache_t *tc;
+  if((tc = ngx_alloc(sizeof(*tc), ngx_cycle->log)) == NULL) {
+    return NULL;
+  }
+  DBG("init %s %p", name, tc);
+  
+  tc->name = name;
+  tc->create = create;
+  tc->destroy = destroy;
+  tc->ttl = ttl;
+  tc->thing_head = NULL;
+  tc->thing_tail = NULL;
+  tc->things = NULL;
+  ngx_memzero(&tc->gc_timer, sizeof(tc->gc_timer));
+  nchan_init_timer(&tc->gc_timer, nchan_thingcache_gc_timer_handler, tc);
+  return (void *)tc;
+}
+
+ngx_int_t nchan_thingcache_shutdown(void *tcv) {
+  nchan_thing_cache_t   *tc = (nchan_thing_cache_t *)tcv;
+  nchan_llist_timed_t   *cur = tc->thing_head;
+  thing_t               *thing;
+  nchan_llist_timed_t   *next; 
+  DBG("shutdown %s %p", tc->name, tc);
+  
+  while(cur != NULL) {
+    thing = container_of(cur, thing_t, ll);
+    next = cur->next;
+    tc->destroy(&thing->id, cur->data);
+    THING_HASH_DEL(tc, thing);
+    ngx_free(thing);
+    cur = next;
+  }
+  
+  if(tc->gc_timer.timer_set) {
+    ngx_del_timer(&tc->gc_timer);
+  }
+  
+  ngx_free(tc);
+  return NGX_OK;
+}
+
+void *nchan_thingcache_find(void *tcv, ngx_str_t *id) {
+  nchan_thing_cache_t   *tc = (nchan_thing_cache_t *)tcv;
+  thing_t               *thing;
+  
+  //verify_tc(tc);
+  THING_HASH_FIND(tc, id, thing);
+  return thing ? thing->ll.data : NULL;
+}
+
+void *nchan_thingcache_get(void *tcv, ngx_str_t *id) {
+  nchan_thing_cache_t   *tc = (nchan_thing_cache_t *)tcv;
+  nchan_llist_timed_t   *cur;
+  thing_t               *thing;
+  
+  //verify_tc(tc);
+  
+  THING_HASH_FIND(tc, id, thing);
+  if(thing == NULL) {
+    DBG("not found in %s %p", tc->name, tc);
+    
+    if((thing = ngx_alloc(sizeof(*thing) + id->len, ngx_cycle->log)) == NULL) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "nchan thingcache %p: can't allocate memory for thing with id %V", tc, id);
+      return NULL;
+    }
+    cur = &thing->ll;
+    cur->data = thing;
+    thing->id.len = id->len;
+    thing->id.data = (u_char *)(&thing[1]);
+    ngx_memcpy(thing->id.data, id->data, id->len);
+    
+    thing->ll.data = tc->create(id);
+    
+    enqueue_llist_thing(tc, cur);
+    THING_HASH_ADD(tc, thing);
+  }
+  
+  //verify_tc(tc);
+  
+  return thing->ll.data;
+}
diff --git a/debian/modules/nchan/src/util/nchan_thingcache.h b/debian/modules/nchan/src/util/nchan_thingcache.h
new file mode 100644
index 0000000..2b0b8bd
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_thingcache.h
@@ -0,0 +1,4 @@
+void *nchan_thingcache_init(char *name, void *(*create)(ngx_str_t *), ngx_int_t(*destroy)(ngx_str_t *, void *), ngx_uint_t ttl);
+ngx_int_t nchan_thingcache_shutdown(void *tcv);
+void *nchan_thingcache_get(void *tcv, ngx_str_t *id);
+void *nchan_thingcache_find(void *tcv, ngx_str_t *id);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/util/nchan_util.c b/debian/modules/nchan/src/util/nchan_util.c
new file mode 100644
index 0000000..9a1b14c
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_util.c
@@ -0,0 +1,383 @@
+#include <nchan_module.h>
+#include <assert.h>
+
+char *nchan_msgstatus_to_str(nchan_msg_status_t status) {
+  switch(status) {
+    case MSG_CHANNEL_NOTREADY:
+      return "MSG_CHANNEL_NOTREADY";
+    case MSG_NORESPONSE:
+      return "MSG_NORESPONSE";
+    case MSG_INVALID:
+      return "MSG_INVALID";
+    case MSG_PENDING:
+      return "MSG_PENDING";
+    case MSG_NOTFOUND:
+      return "MSG_NOTFOUND";
+    case MSG_FOUND:
+      return "MSG_FOUND";
+    case MSG_EXPECTED:
+      return "MSG_EXPECTED";
+    case MSG_EXPIRED:
+      return "MSG_EXPIRED";
+  }
+  return "???";
+}
+
+int nchan_ngx_str_match(ngx_str_t *str1, ngx_str_t *str2) {
+  if(str1->len != str2->len) {
+    return 0;
+  }
+  return memcmp(str1->data, str2->data, str1->len) == 0;
+}
+
+ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen) {
+  size_t                        len;
+  ngx_http_script_code_pt       code;
+  ngx_http_script_len_code_pt   lcode;
+  ngx_http_script_engine_t      e;
+
+  if (val->lengths == NULL) {
+    *value = val->value;
+    return NGX_OK;
+  }
+
+  ngx_http_script_flush_complex_value(r, val);
+
+  ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
+
+  e.ip = val->lengths;
+  e.request = r;
+  e.flushed = 1;
+
+  len = 0;
+
+  while (*(uintptr_t *) e.ip) {
+    lcode = *(ngx_http_script_len_code_pt *) e.ip;
+    len += lcode(&e);
+  }
+  
+  if(len > maxlen) {
+    return NGX_ERROR;
+  }
+  
+  value->len = len;
+
+  e.ip = val->values;
+  e.pos = value->data;
+  e.buf = *value;
+
+  while (*(uintptr_t *) e.ip) {
+    code = *(ngx_http_script_code_pt *) e.ip;
+    code((ngx_http_script_engine_t *) &e);
+  }
+
+  *value = e.buf;
+
+  return NGX_OK;
+}
+
+u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char) {
+  u_char   *delim = sub->data;
+  size_t    delim_sz = sub->len;
+  u_char   *last = last_char - delim_sz;
+  u_char   *cur;
+  
+  for(cur = *s1; cur < last; cur++) {
+    if(ngx_strncmp(cur, delim, delim_sz) == 0) {
+      *s1 = cur + delim_sz;
+      return cur;
+    }
+  }
+  *s1 = last_char;
+  if(cur == last) {
+    return last_char;
+  }
+  else if(cur > last) {
+    return NULL;
+  }
+  assert(0);
+  return NULL;
+}
+
+ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name) {
+  ngx_uint_t                       i;
+  ngx_list_part_t                 *part = &r->headers_in.headers.part;
+  ngx_table_elt_t                 *header= part->elts;
+  
+  for (i = 0; /* void */ ; i++) {
+    if (i >= part->nelts) {
+      if (part->next == NULL) {
+        break;
+      }
+      part = part->next;
+      header = part->elts;
+      i = 0;
+    }
+    if (header[i].key.len == header_name.len
+      && ngx_strncasecmp(header[i].key.data, header_name.data, header[i].key.len) == 0) {
+      return &header[i].value;
+      }
+  }
+  return NULL;
+}
+
+static int nchan_strmatch_va_list(ngx_str_t *val, ngx_int_t n, va_list args) {
+  u_char   *match;
+  ngx_int_t i;
+  for(i=0; i<n; i++) {
+    match = va_arg(args, u_char *);
+    if(ngx_strncasecmp(val->data, match, val->len)==0) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+int nchan_strmatch(ngx_str_t *val, ngx_int_t n, ...) {
+  int      rc;
+  va_list  args;
+  va_start(args, n);  
+  rc = nchan_strmatch_va_list(val, n, args);
+  va_end(args);
+  return rc;
+}
+
+int nchan_cstrmatch(char *cstr, ngx_int_t n, ...) {
+  int       rc;
+  va_list   args;
+  ngx_str_t str;
+  str.data = (u_char *)cstr;
+  str.len = strlen(cstr);
+  va_start(args, n);  
+  rc = nchan_strmatch_va_list(&str, n, args);
+  va_end(args);
+  return rc;
+}
+
+int nchan_cstr_startswith(char *cstr, char *match) {
+  for(/*void*/; *match != '\0'; cstr++, match++) {
+    if(*cstr == '\0' || *cstr != *match)
+      return 0;
+  }
+  return 1;
+}
+
+void nchan_scan_nearest_chr(u_char **cur, ngx_str_t *str, ngx_int_t n, ...) {
+  u_char    chr;
+  va_list   args;
+  u_char   *shortest = NULL;
+  
+  u_char *tmp_cur;
+  
+  ngx_int_t i;
+  
+  for(tmp_cur = *cur; shortest == NULL && (tmp_cur == *cur || tmp_cur[-1] != '\0'); tmp_cur++) {
+    va_start(args, n);
+    for(i=0; shortest == NULL && i<n; i++) {
+      chr = (u_char )va_arg(args, int);
+      if(*tmp_cur == chr) {
+        shortest = tmp_cur;
+      }
+    }
+    va_end(args);
+  }
+  if(shortest) {
+    str->data = (u_char *)*cur;
+    str->len = shortest - *cur;
+    *cur = shortest + 1;
+  }
+  else {
+    str->data = NULL;
+    str->len = 0;
+  }
+}
+
+void nchan_scan_until_chr_on_line(ngx_str_t *line, ngx_str_t *str, u_char chr) {
+  u_char     *cur;
+  //ERR("rest_line: \"%V\"", line);
+  cur = (u_char *)memchr(line->data, chr, line->len);
+  if(!cur) {
+    *str = *line;
+    line->data += line->len;
+    line->len = 0;
+  }
+  else {
+    str->data = line->data;
+    str->len = (cur - line->data);
+    line->len -= str->len + 1;
+    line->data += str->len + 1;
+  }
+  //ERR("str: \"%V\"", str);
+}
+
+void nchan_strcpy(ngx_str_t *dst, ngx_str_t *src, size_t maxlen) {
+  size_t len = src->len > maxlen && maxlen > 0 ? maxlen : src->len;
+  ngx_memcpy(dst->data, src->data, len);
+  dst->len = len;
+}
+
+static ngx_buf_t *ensure_last_buf(ngx_pool_t *pool, ngx_buf_t *buf) {
+  ngx_buf_t *cbuf;
+  if(buf->last_buf == 1) {
+    return buf;
+  }
+  else {
+    cbuf = ngx_create_temp_buf(pool,sizeof(*cbuf));
+    *cbuf = *buf;
+    cbuf->last_buf = 1;
+    return cbuf;
+  }
+}
+
+// this function adapted from push stream module. thanks Wandenberg Peixoto <wandenberg@gmail.com> and Rogério Carvalho Schneider <stockrt@gmail.com>
+ngx_buf_t * nchan_chain_to_single_buffer(ngx_pool_t *pool, ngx_chain_t *chain, size_t content_length) {
+  ngx_buf_t *buf = NULL;
+  ssize_t n;
+  size_t len;
+
+  if (chain->next == NULL) {
+    return ensure_last_buf(pool, chain->buf);
+  }
+  //nchan_log_error("multiple buffers in request, need memcpy :(");
+  if (chain->buf->in_file) {
+    if (ngx_buf_in_memory(chain->buf)) {
+      nchan_log_error("can't handle a buffer in a temp file and in memory ");
+    }
+    if (chain->next != NULL) {
+      nchan_log_error("error reading request body with multiple ");
+    }
+    return ensure_last_buf(pool, chain->buf);
+  }
+  buf = ngx_create_temp_buf(pool, content_length + 1);
+  if (buf != NULL) {
+    ngx_memset(buf->start, '\0', content_length + 1);
+    while ((chain != NULL) && (chain->buf != NULL)) {
+      len = ngx_buf_size(chain->buf);
+      // if buffer is equal to content length all the content is in this buffer
+      if (len >= content_length) {
+        buf->start = buf->pos;
+        buf->last = buf->pos;
+        len = content_length;
+      }
+      if (chain->buf->in_file) {
+        n = ngx_read_file(chain->buf->file, buf->start, len, 0);
+        if (n == NGX_FILE_ERROR) {
+          nchan_log_error("cannot read file with request body");
+          return NULL;
+        }
+        buf->last = buf->last + len;
+        ngx_delete_file(chain->buf->file->name.data);
+        chain->buf->file->fd = NGX_INVALID_FILE;
+      } else {
+        buf->last = ngx_copy(buf->start, chain->buf->pos, len);
+      }
+      
+      chain = chain->next;
+      buf->start = buf->last;
+    }
+    buf->last_buf = 1;
+  }
+  return buf;
+}
+
+ngx_int_t nchan_init_timer(ngx_event_t *ev, void (*cb)(ngx_event_t *), void *pd) {
+#if nginx_version >= 1008000
+  ev->cancelable = 1;
+#endif
+  ev->handler = cb;
+  ev->data = pd;
+  ev->log = ngx_cycle->log;
+  return NGX_OK;
+}
+
+
+typedef struct {
+  ngx_event_t    ev;
+  void          (*cb)(void *pd);
+} oneshot_timer_t;
+
+void oneshot_timer_callback(ngx_event_t *ev) {
+  oneshot_timer_t  *timer = container_of(ev, oneshot_timer_t, ev);
+  timer->cb(ev->data);
+  ngx_free(timer);
+ }
+
+ngx_int_t nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay) {
+  oneshot_timer_t *timer = ngx_alloc(sizeof(*timer), ngx_cycle->log);
+  ngx_memzero(&timer->ev, sizeof(timer->ev));
+  timer->cb = cb;
+  nchan_init_timer(&timer->ev, oneshot_timer_callback, pd);
+  ngx_add_timer(&timer->ev, delay);
+  return NGX_OK;
+}
+
+int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz) {
+  //naive non-null-terminated string matcher. don't use it in tight loops!
+  char *cur;
+  size_t len = str->len;
+  
+  for(cur = (char *)str->data, len = str->len; len >= sz; cur++, len--) {
+    if(strncmp(cur, substr, sz) == 0) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+#if (NGX_DEBUG_POOL)
+//Copyright (C) 2015 Alibaba Group Holding Limited
+static ngx_str_t            debug_pool_str;
+ngx_str_t *ngx_http_debug_pool_str(ngx_pool_t *pool) {
+  u_char              *p, *unit;
+  size_t               s, n, cn, ln;
+  ngx_uint_t           i;
+  ngx_pool_stat_t     *stat;
+  static u_char        charbuf[512];
+  
+  debug_pool_str.len = 0;
+  debug_pool_str.data = charbuf;
+  
+#define NGX_POOL_PID_SIZE       (NGX_TIME_T_LEN + sizeof("pid:\n") - 1)     /* sizeof pid_t equals time_t */
+#define NGX_POOL_PID_FORMAT     "pid:%P\n"
+#define NGX_POOL_ENTRY_SIZE     (48 /* func */ + 12 * 4 + sizeof("size: num: cnum: lnum: \n") - 1)
+#define NGX_POOL_ENTRY_FORMAT   "size:%12z num:%12z cnum:%12z lnum:%12z %s\n"
+#define NGX_POOL_SUMMARY_SIZE   (12 * 4 + sizeof("size: num: cnum: lnum: [SUMMARY]\n") - 1)
+#define NGX_POOL_SUMMARY_FORMAT "size:%10z%2s num:%12z cnum:%12z lnum:%12z [SUMMARY]\n"
+
+  p = charbuf;
+  p = ngx_sprintf(p, NGX_POOL_PID_FORMAT, ngx_pid);
+
+  /* lines of entry */
+
+  s = n = cn = ln = 0;
+
+  for (i = 0; i < NGX_POOL_STATS_MAX; i++) {
+      for (stat = ngx_pool_stats[i]; stat != NULL; stat = stat->next) {
+          p = ngx_snprintf(p, NGX_POOL_ENTRY_SIZE, NGX_POOL_ENTRY_FORMAT,
+                            stat->size, stat->num, stat->cnum, stat->lnum,
+                            stat->func);
+          s += stat->size;
+          n += stat->num;
+          cn += stat->cnum;
+          ln += stat->lnum;
+      }
+  }
+
+  /* summary line */
+
+  unit = (u_char *) " B";
+  if (s > 1024 * 1024) {
+    s = s / (1024 * 1024);
+    unit = (u_char *) "MB";
+  } else if (s > 1024) {
+    s = s / 1024;
+    unit = (u_char *) "KB";
+  }
+
+  p = ngx_snprintf(p, NGX_POOL_SUMMARY_SIZE, NGX_POOL_SUMMARY_FORMAT, s, unit, n, cn, ln);
+
+  debug_pool_str.len = p - debug_pool_str.data;
+  
+  return &debug_pool_str;
+}
+#endif
diff --git a/debian/modules/nchan/src/util/nchan_util.h b/debian/modules/nchan/src/util/nchan_util.h
new file mode 100644
index 0000000..5214ca2
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_util.h
@@ -0,0 +1,32 @@
+ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen);
+u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char);
+ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name);
+ngx_buf_t *nchan_chain_to_single_buffer(ngx_pool_t *pool, ngx_chain_t *chain, size_t content_length);
+ngx_str_t *ngx_http_debug_pool_str(ngx_pool_t *pool);
+int nchan_strmatch(ngx_str_t *val, ngx_int_t n, ...);
+int nchan_cstrmatch(char *cstr, ngx_int_t n, ...);
+int nchan_cstr_startswith(char *cstr, char *match);
+
+void nchan_scan_nearest_chr(u_char **cur, ngx_str_t *str, ngx_int_t n, ...);
+void nchan_scan_until_chr_on_line(ngx_str_t *line, ngx_str_t *str, u_char chr);
+
+int nchan_ngx_str_match(ngx_str_t *str1, ngx_str_t *str2);
+
+void nchan_strcpy(ngx_str_t *dst, ngx_str_t *src, size_t maxlen);
+ngx_int_t nchan_init_timer(ngx_event_t *ev, void (*cb)(ngx_event_t *), void *pd);
+ngx_int_t nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay);
+char *nchan_msgstatus_to_str(nchan_msg_status_t status);
+
+
+int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz);
+#define nchan_ngx_str_substr(str, substr) \
+  nchan_ngx_str_char_substr(str, substr, sizeof(substr)-1)
+  
+#define nchan_strstrn(haystack, needle) ngx_strstrn((u_char *)(haystack), (needle), sizeof(needle) - 2)
+
+#ifndef container_of
+
+#define container_of(ptr, type, member) ({                      \
+        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
+        (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
diff --git a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
new file mode 100644
index 0000000..f396ce7
--- /dev/null
+++ b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
@@ -0,0 +1,761 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+#include "ngx_nchan_hacked_slab.h"
+
+#define NGX_SLAB_PAGE_MASK   3
+#define NGX_SLAB_PAGE        0
+#define NGX_SLAB_BIG         1
+#define NGX_SLAB_EXACT       2
+#define NGX_SLAB_SMALL       3
+
+#if (NGX_PTR_SIZE == 4)
+
+#define NGX_SLAB_PAGE_FREE   0
+#define NGX_SLAB_PAGE_BUSY   0xffffffff
+#define NGX_SLAB_PAGE_START  0x80000000
+
+#define NGX_SLAB_SHIFT_MASK  0x0000000f
+#define NGX_SLAB_MAP_MASK    0xffff0000
+#define NGX_SLAB_MAP_SHIFT   16
+
+#define NGX_SLAB_BUSY        0xffffffff
+
+#else /* (NGX_PTR_SIZE == 8) */
+
+#define NGX_SLAB_PAGE_FREE   0
+#define NGX_SLAB_PAGE_BUSY   0xffffffffffffffff
+#define NGX_SLAB_PAGE_START  0x8000000000000000
+
+#define NGX_SLAB_SHIFT_MASK  0x000000000000000f
+#define NGX_SLAB_MAP_MASK    0xffffffff00000000
+#define NGX_SLAB_MAP_SHIFT   32
+
+#define NGX_SLAB_BUSY        0xffffffffffffffff
+
+#endif
+
+
+#if (NGX_DEBUG_MALLOC)
+
+#define ngx_slab_junk(p, size)     ngx_memset(p, 0xA5, size)
+
+#elif (NGX_HAVE_DEBUG_MALLOC)
+
+#define ngx_slab_junk(p, size)                                                \
+    if (ngx_debug_malloc)          ngx_memset(p, 0xA5, size)
+
+#else
+
+#define ngx_slab_junk(p, size)
+
+#endif
+
+static ngx_slab_page_t *nchan_slab_alloc_pages(ngx_slab_pool_t *pool,
+    ngx_uint_t pages);
+static void nchan_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
+    ngx_uint_t pages);
+static void ngx_slab_error(ngx_slab_pool_t *pool, ngx_uint_t level,
+    char *text);
+
+
+static ngx_uint_t  ngx_slab_max_size;
+static ngx_uint_t  ngx_slab_exact_size;
+static ngx_uint_t  ngx_slab_exact_shift;
+
+static ngx_atomic_uint_t *nchan_slab_reserved_pagecount;
+static ngx_int_t          nchan_slab_reserved_pagecount_temp;
+
+
+void
+nchan_slab_init(ngx_slab_pool_t *pool)
+{
+  ngx_uint_t        n;
+
+  /* STUB */
+  if (ngx_slab_max_size == 0) {
+    ngx_slab_max_size = ngx_pagesize / 2;
+    ngx_slab_exact_size = ngx_pagesize / (8 * sizeof(uintptr_t));
+    for (n = ngx_slab_exact_size; n >>= 1; ngx_slab_exact_shift++) {
+      /* void */
+    }
+  }
+  /**/
+}
+
+
+static void nchan_track_slab_reserved_pages(ngx_slab_pool_t *pool, ngx_int_t pages) {
+  if(nchan_slab_reserved_pagecount) {
+    ngx_atomic_fetch_add(nchan_slab_reserved_pagecount, pages);
+  }
+  else {
+    nchan_slab_reserved_pagecount_temp += pages;
+  }
+}
+
+void nchan_slab_set_reserved_pages_tracker(ngx_slab_pool_t *pool, ngx_atomic_uint_t *ref) {
+  nchan_slab_reserved_pagecount = ref;
+  nchan_track_slab_reserved_pages(pool, nchan_slab_reserved_pagecount_temp);
+  nchan_slab_reserved_pagecount_temp = 0;
+}
+
+void *
+nchan_slab_alloc(ngx_slab_pool_t *pool, size_t size)
+{
+    void  *p;
+
+    ngx_shmtx_lock(&pool->mutex);
+
+    p = nchan_slab_alloc_locked(pool, size);
+
+    ngx_shmtx_unlock(&pool->mutex);
+
+    return p;
+}
+
+
+void *
+nchan_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
+{
+    size_t            s;
+    uintptr_t         p, n, m, mask, *bitmap;
+    ngx_uint_t        i, slot, shift, map;
+    ngx_slab_page_t  *page, *prev, *slots;
+
+    if (size > ngx_slab_max_size) {
+
+        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
+                       "slab alloc: %uz", size);
+
+        page = nchan_slab_alloc_pages(pool, (size >> ngx_pagesize_shift)
+                                          + ((size % ngx_pagesize) ? 1 : 0));
+        if (page) {
+            p = (page - pool->pages) << ngx_pagesize_shift;
+            p += (uintptr_t) pool->start;
+
+        } else {
+            p = 0;
+        }
+
+        goto done;
+    }
+
+    if (size > pool->min_size) {
+        shift = 1;
+        for (s = size - 1; s >>= 1; shift++) { /* void */ }
+        slot = shift - pool->min_shift;
+
+    } else {
+        size = pool->min_size;
+        shift = pool->min_shift;
+        slot = 0;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
+                   "slab alloc: %uz slot: %ui", size, slot);
+
+    slots = (ngx_slab_page_t *) ((u_char *) pool + sizeof(ngx_slab_pool_t));
+    page = slots[slot].next;
+
+    if (page->next != page) {
+
+        if (shift < ngx_slab_exact_shift) {
+
+            do {
+                p = (page - pool->pages) << ngx_pagesize_shift;
+                bitmap = (uintptr_t *) (pool->start + p);
+
+                map = (1 << (ngx_pagesize_shift - shift))
+                          / (sizeof(uintptr_t) * 8);
+
+                for (n = 0; n < map; n++) {
+
+                    if (bitmap[n] != NGX_SLAB_BUSY) {
+
+                        for (m = 1, i = 0; m; m <<= 1, i++) {
+                            if ((bitmap[n] & m)) {
+                                continue;
+                            }
+
+                            bitmap[n] |= m;
+
+                            i = ((n * sizeof(uintptr_t) * 8) << shift)
+                                + (i << shift);
+
+                            if (bitmap[n] == NGX_SLAB_BUSY) {
+                                for (n = n + 1; n < map; n++) {
+                                    if (bitmap[n] != NGX_SLAB_BUSY) {
+                                        p = (uintptr_t) bitmap + i;
+
+                                        goto done;
+                                    }
+                                }
+
+                                prev = (ngx_slab_page_t *)
+                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
+                                prev->next = page->next;
+                                page->next->prev = page->prev;
+
+                                page->next = NULL;
+                                page->prev = NGX_SLAB_SMALL;
+                            }
+
+                            p = (uintptr_t) bitmap + i;
+
+                            goto done;
+                        }
+                    }
+                }
+
+                page = page->next;
+
+            } while (page);
+
+        } else if (shift == ngx_slab_exact_shift) {
+
+            do {
+                if (page->slab != NGX_SLAB_BUSY) {
+
+                    for (m = 1, i = 0; m; m <<= 1, i++) {
+                        if ((page->slab & m)) {
+                            continue;
+                        }
+
+                        page->slab |= m;
+
+                        if (page->slab == NGX_SLAB_BUSY) {
+                            prev = (ngx_slab_page_t *)
+                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
+                            prev->next = page->next;
+                            page->next->prev = page->prev;
+
+                            page->next = NULL;
+                            page->prev = NGX_SLAB_EXACT;
+                        }
+
+                        p = (page - pool->pages) << ngx_pagesize_shift;
+                        p += i << shift;
+                        p += (uintptr_t) pool->start;
+
+                        goto done;
+                    }
+                }
+
+                page = page->next;
+
+            } while (page);
+
+        } else { /* shift > ngx_slab_exact_shift */
+
+            n = ngx_pagesize_shift - (page->slab & NGX_SLAB_SHIFT_MASK);
+            n = 1 << n;
+            n = ((uintptr_t) 1 << n) - 1;
+            mask = n << NGX_SLAB_MAP_SHIFT;
+
+            do {
+                if ((page->slab & NGX_SLAB_MAP_MASK) != mask) {
+
+                    for (m = (uintptr_t) 1 << NGX_SLAB_MAP_SHIFT, i = 0;
+                         m & mask;
+                         m <<= 1, i++)
+                    {
+                        if ((page->slab & m)) {
+                            continue;
+                        }
+
+                        page->slab |= m;
+
+                        if ((page->slab & NGX_SLAB_MAP_MASK) == mask) {
+                            prev = (ngx_slab_page_t *)
+                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
+                            prev->next = page->next;
+                            page->next->prev = page->prev;
+
+                            page->next = NULL;
+                            page->prev = NGX_SLAB_BIG;
+                        }
+
+                        p = (page - pool->pages) << ngx_pagesize_shift;
+                        p += i << shift;
+                        p += (uintptr_t) pool->start;
+
+                        goto done;
+                    }
+                }
+
+                page = page->next;
+
+            } while (page);
+        }
+    }
+
+    page = nchan_slab_alloc_pages(pool, 1);
+
+    if (page) {
+        if (shift < ngx_slab_exact_shift) {
+            p = (page - pool->pages) << ngx_pagesize_shift;
+            bitmap = (uintptr_t *) (pool->start + p);
+
+            s = 1 << shift;
+            n = (1 << (ngx_pagesize_shift - shift)) / 8 / s;
+
+            if (n == 0) {
+                n = 1;
+            }
+
+            bitmap[0] = (2 << n) - 1;
+
+            map = (1 << (ngx_pagesize_shift - shift)) / (sizeof(uintptr_t) * 8);
+
+            for (i = 1; i < map; i++) {
+                bitmap[i] = 0;
+            }
+
+            page->slab = shift;
+            page->next = &slots[slot];
+            page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_SMALL;
+
+            slots[slot].next = page;
+
+            p = ((page - pool->pages) << ngx_pagesize_shift) + s * n;
+            p += (uintptr_t) pool->start;
+
+            goto done;
+
+        } else if (shift == ngx_slab_exact_shift) {
+
+            page->slab = 1;
+            page->next = &slots[slot];
+            page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_EXACT;
+
+            slots[slot].next = page;
+
+            p = (page - pool->pages) << ngx_pagesize_shift;
+            p += (uintptr_t) pool->start;
+
+            goto done;
+
+        } else { /* shift > ngx_slab_exact_shift */
+
+            page->slab = ((uintptr_t) 1 << NGX_SLAB_MAP_SHIFT) | shift;
+            page->next = &slots[slot];
+            page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_BIG;
+
+            slots[slot].next = page;
+
+            p = (page - pool->pages) << ngx_pagesize_shift;
+            p += (uintptr_t) pool->start;
+
+            goto done;
+        }
+    }
+
+    p = 0;
+
+done:
+
+    ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
+                   "slab alloc: %p", (void *) p);
+
+    return (void *) p;
+}
+
+
+void *
+nchan_slab_calloc(ngx_slab_pool_t *pool, size_t size)
+{
+    void  *p;
+
+    ngx_shmtx_lock(&pool->mutex);
+
+    p = nchan_slab_calloc_locked(pool, size);
+
+    ngx_shmtx_unlock(&pool->mutex);
+
+    return p;
+}
+
+
+void *
+nchan_slab_calloc_locked(ngx_slab_pool_t *pool, size_t size)
+{
+    void  *p;
+
+    p = nchan_slab_alloc_locked(pool, size);
+    if (p) {
+        ngx_memzero(p, size);
+    }
+
+    return p;
+}
+
+
+void
+nchan_slab_free(ngx_slab_pool_t *pool, void *p)
+{
+    ngx_shmtx_lock(&pool->mutex);
+
+    nchan_slab_free_locked(pool, p);
+
+    ngx_shmtx_unlock(&pool->mutex);
+}
+
+
+void
+nchan_slab_free_locked(ngx_slab_pool_t *pool, void *p)
+{
+    size_t            size;
+    uintptr_t         slab, m, *bitmap;
+    ngx_uint_t        n, type, slot, shift, map;
+    ngx_slab_page_t  *slots, *page;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0, "slab free: %p", p);
+
+    if ((u_char *) p < pool->start || (u_char *) p > pool->end) {
+        ngx_slab_error(pool, NGX_LOG_ALERT, "ngx_slab_free(): outside of pool");
+        goto fail;
+    }
+
+    n = ((u_char *) p - pool->start) >> ngx_pagesize_shift;
+    page = &pool->pages[n];
+    slab = page->slab;
+    type = page->prev & NGX_SLAB_PAGE_MASK;
+
+    switch (type) {
+
+    case NGX_SLAB_SMALL:
+
+        shift = slab & NGX_SLAB_SHIFT_MASK;
+        size = 1 << shift;
+
+        if ((uintptr_t) p & (size - 1)) {
+            goto wrong_chunk;
+        }
+
+        n = ((uintptr_t) p & (ngx_pagesize - 1)) >> shift;
+        m = (uintptr_t) 1 << (n & (sizeof(uintptr_t) * 8 - 1));
+        n /= (sizeof(uintptr_t) * 8);
+        bitmap = (uintptr_t *)
+                             ((uintptr_t) p & ~((uintptr_t) ngx_pagesize - 1));
+
+        if (bitmap[n] & m) {
+
+            if (page->next == NULL) {
+                slots = (ngx_slab_page_t *)
+                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
+                slot = shift - pool->min_shift;
+
+                page->next = slots[slot].next;
+                slots[slot].next = page;
+
+                page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_SMALL;
+                page->next->prev = (uintptr_t) page | NGX_SLAB_SMALL;
+            }
+
+            bitmap[n] &= ~m;
+
+            n = (1 << (ngx_pagesize_shift - shift)) / 8 / (1 << shift);
+
+            if (n == 0) {
+                n = 1;
+            }
+
+            if (bitmap[0] & ~(((uintptr_t) 1 << n) - 1)) {
+                goto done;
+            }
+
+            map = (1 << (ngx_pagesize_shift - shift)) / (sizeof(uintptr_t) * 8);
+
+            for (n = 1; n < map; n++) {
+                if (bitmap[n]) {
+                    goto done;
+                }
+            }
+
+            nchan_slab_free_pages(pool, page, 1);
+
+            goto done;
+        }
+
+        goto chunk_already_free;
+
+    case NGX_SLAB_EXACT:
+
+        m = (uintptr_t) 1 <<
+                (((uintptr_t) p & (ngx_pagesize - 1)) >> ngx_slab_exact_shift);
+        size = ngx_slab_exact_size;
+
+        if ((uintptr_t) p & (size - 1)) {
+            goto wrong_chunk;
+        }
+
+        if (slab & m) {
+            if (slab == NGX_SLAB_BUSY) {
+                slots = (ngx_slab_page_t *)
+                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
+                slot = ngx_slab_exact_shift - pool->min_shift;
+
+                page->next = slots[slot].next;
+                slots[slot].next = page;
+
+                page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_EXACT;
+                page->next->prev = (uintptr_t) page | NGX_SLAB_EXACT;
+            }
+
+            page->slab &= ~m;
+
+            if (page->slab) {
+                goto done;
+            }
+
+            nchan_slab_free_pages(pool, page, 1);
+
+            goto done;
+        }
+
+        goto chunk_already_free;
+
+    case NGX_SLAB_BIG:
+
+        shift = slab & NGX_SLAB_SHIFT_MASK;
+        size = 1 << shift;
+
+        if ((uintptr_t) p & (size - 1)) {
+            goto wrong_chunk;
+        }
+
+        m = (uintptr_t) 1 << ((((uintptr_t) p & (ngx_pagesize - 1)) >> shift)
+                              + NGX_SLAB_MAP_SHIFT);
+
+        if (slab & m) {
+
+            if (page->next == NULL) {
+                slots = (ngx_slab_page_t *)
+                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
+                slot = shift - pool->min_shift;
+
+                page->next = slots[slot].next;
+                slots[slot].next = page;
+
+                page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_BIG;
+                page->next->prev = (uintptr_t) page | NGX_SLAB_BIG;
+            }
+
+            page->slab &= ~m;
+
+            if (page->slab & NGX_SLAB_MAP_MASK) {
+                goto done;
+            }
+
+            nchan_slab_free_pages(pool, page, 1);
+
+            goto done;
+        }
+
+        goto chunk_already_free;
+
+    case NGX_SLAB_PAGE:
+
+        if ((uintptr_t) p & (ngx_pagesize - 1)) {
+            goto wrong_chunk;
+        }
+
+        if (slab == NGX_SLAB_PAGE_FREE) {
+            ngx_slab_error(pool, NGX_LOG_ALERT,
+                           "ngx_slab_free(): page is already free");
+            goto fail;
+        }
+
+        if (slab == NGX_SLAB_PAGE_BUSY) {
+            ngx_slab_error(pool, NGX_LOG_ALERT,
+                           "ngx_slab_free(): pointer to wrong page");
+            goto fail;
+        }
+
+        n = ((u_char *) p - pool->start) >> ngx_pagesize_shift;
+        size = slab & ~NGX_SLAB_PAGE_START;
+
+        nchan_slab_free_pages(pool, &pool->pages[n], size);
+
+        ngx_slab_junk(p, size << ngx_pagesize_shift);
+
+        return;
+    }
+
+    /* not reached */
+
+    return;
+
+done:
+
+    ngx_slab_junk(p, size);
+
+    return;
+
+wrong_chunk:
+
+    ngx_slab_error(pool, NGX_LOG_ALERT,
+                   "ngx_slab_free(): pointer to wrong chunk");
+
+    goto fail;
+
+chunk_already_free:
+
+    ngx_slab_error(pool, NGX_LOG_ALERT,
+                   "ngx_slab_free(): chunk is already free");
+
+fail:
+
+    return;
+}
+
+
+static ngx_slab_page_t *
+nchan_slab_alloc_pages(ngx_slab_pool_t *pool, ngx_uint_t pages)
+{
+    ngx_slab_page_t  *page, *p;
+    ngx_uint_t        need_pages = pages;
+
+    
+    for (page = pool->free.next; page != &pool->free; page = page->next) {
+
+        if (page->slab >= pages) {
+
+            if (page->slab > pages) {
+                page[page->slab - 1].prev = (uintptr_t) &page[pages];
+
+                page[pages].slab = page->slab - pages;
+                page[pages].next = page->next;
+                page[pages].prev = page->prev;
+
+                p = (ngx_slab_page_t *) page->prev;
+                p->next = &page[pages];
+                page->next->prev = (uintptr_t) &page[pages];
+
+            } else {
+                p = (ngx_slab_page_t *) page->prev;
+                p->next = page->next;
+                page->next->prev = page->prev;
+            }
+
+            page->slab = pages | NGX_SLAB_PAGE_START;
+            page->next = NULL;
+            page->prev = NGX_SLAB_PAGE;
+
+            if (--pages == 0) {
+                nchan_track_slab_reserved_pages(pool, need_pages);
+                return page;
+            }
+
+            for (p = page + 1; pages; pages--) {
+                p->slab = NGX_SLAB_PAGE_BUSY;
+                p->next = NULL;
+                p->prev = NGX_SLAB_PAGE;
+                p++;
+            }
+            
+            nchan_track_slab_reserved_pages(pool, need_pages);
+            return page;
+        }
+    }
+
+    if (pool->log_nomem) {
+        ngx_slab_error(pool, NGX_LOG_CRIT,
+                       "ngx_slab_alloc() failed: no memory");
+    }
+
+    return NULL;
+}
+
+
+static void
+nchan_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
+    ngx_uint_t pages)
+{
+    ngx_uint_t        type;
+    ngx_slab_page_t  *prev, *join;
+
+    nchan_track_slab_reserved_pages(pool, -pages);
+    
+    page->slab = pages--;
+    
+    if (pages) {
+        ngx_memzero(&page[1], pages * sizeof(ngx_slab_page_t));
+    }
+
+    if (page->next) {
+        prev = (ngx_slab_page_t *) (page->prev & ~NGX_SLAB_PAGE_MASK);
+        prev->next = page->next;
+        page->next->prev = page->prev;
+    }
+
+    join = page + page->slab;
+
+    if (join < pool->last) {
+        type = join->prev & NGX_SLAB_PAGE_MASK;
+
+        if (type == NGX_SLAB_PAGE) {
+
+            if (join->next != NULL) {
+                pages += join->slab;
+                page->slab += join->slab;
+
+                prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
+                prev->next = join->next;
+                join->next->prev = join->prev;
+
+                join->slab = NGX_SLAB_PAGE_FREE;
+                join->next = NULL;
+                join->prev = NGX_SLAB_PAGE;
+            }
+        }
+    }
+
+    if (page > pool->pages) {
+        join = page - 1;
+        type = join->prev & NGX_SLAB_PAGE_MASK;
+
+        if (type == NGX_SLAB_PAGE) {
+
+            if (join->slab == NGX_SLAB_PAGE_FREE) {
+                join = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
+            }
+
+            if (join->next != NULL) {
+                pages += join->slab;
+                join->slab += page->slab;
+
+                prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
+                prev->next = join->next;
+                join->next->prev = join->prev;
+
+                page->slab = NGX_SLAB_PAGE_FREE;
+                page->next = NULL;
+                page->prev = NGX_SLAB_PAGE;
+
+                page = join;
+            }
+        }
+    }
+
+    if (pages) {
+        page[pages].prev = (uintptr_t) page;
+    }
+
+    page->prev = (uintptr_t) &pool->free;
+    page->next = pool->free.next;
+
+    page->next->prev = (uintptr_t) page;
+
+    pool->free.next = page;
+}
+
+
+static void
+ngx_slab_error(ngx_slab_pool_t *pool, ngx_uint_t level, char *text)
+{
+    ngx_log_error(level, ngx_cycle->log, 0, "%s%s", text, pool->log_ctx);
+}
diff --git a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.h b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.h
new file mode 100644
index 0000000..87b8f05
--- /dev/null
+++ b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.h
@@ -0,0 +1,26 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NCHAN_HACKED_SLAB_H_INCLUDED_
+#define _NCHAN_HACKED_SLAB_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+void nchan_slab_init(ngx_slab_pool_t *pool);
+void *nchan_slab_alloc(ngx_slab_pool_t *pool, size_t size);
+void *nchan_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size);
+void *nchan_slab_calloc(ngx_slab_pool_t *pool, size_t size);
+void *nchan_slab_calloc_locked(ngx_slab_pool_t *pool, size_t size);
+void nchan_slab_free(ngx_slab_pool_t *pool, void *p);
+void nchan_slab_free_locked(ngx_slab_pool_t *pool, void *p);
+
+void nchan_slab_set_reserved_pages_tracker(ngx_slab_pool_t *pool, ngx_atomic_uint_t *ref);
+
+#endif /* _NCHAN_HACKED_SLAB_H_INCLUDED_ */
diff --git a/debian/modules/nchan/src/util/shmem.c b/debian/modules/nchan/src/util/shmem.c
new file mode 100644
index 0000000..9a68240
--- /dev/null
+++ b/debian/modules/nchan/src/util/shmem.c
@@ -0,0 +1,184 @@
+#include <nchan_module.h>
+#include "shmem.h"
+#include "assert.h"
+#include <util/ngx_nchan_hacked_slab.h>
+
+#define DEBUG_SHM_ALLOC 0
+
+#define SHPOOL(shmem) ((ngx_slab_pool_t *)(shmem)->zone->shm.addr)
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SHMEM(%i):" fmt, memstore_slot(), ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SHMEM(%i):" fmt, memstore_slot(), ##args)
+
+//#include <valgrind/memcheck.h>
+
+//shared memory
+shmem_t *shm_create(ngx_str_t *name, ngx_conf_t *cf, size_t shm_size, ngx_int_t (*init)(ngx_shm_zone_t *, void *), void *privdata) {
+
+  ngx_shm_zone_t    *zone;
+  shmem_t           *shm;
+
+  shm_size = ngx_align(shm_size, ngx_pagesize);
+  if (shm_size < 8 * ngx_pagesize) {
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "The push_max_reserved_memory value must be at least %udKiB", (8 * ngx_pagesize) >> 10);
+    shm_size = 8 * ngx_pagesize;
+  }
+  /*
+  if(nchan_shm_zone && nchan_shm_zone->shm.size != shm_size) {
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Cannot change memory area size without restart, ignoring change");
+  }
+  */
+  ngx_conf_log_error(NGX_LOG_INFO, cf, 0, "Using %udKiB of shared memory for nchan", shm_size >> 10);
+
+  shm = ngx_alloc(sizeof(*shm), ngx_cycle->log);
+  zone = ngx_shared_memory_add(cf, name, shm_size, &ngx_nchan_module);
+  if (zone == NULL || shm == NULL) {
+    return NULL;
+  }
+  shm->zone = zone;
+
+  zone->init = init;
+  zone->data = (void *) 1;
+  return shm;
+}
+
+void shm_set_allocd_pages_tracker(shmem_t *shm, ngx_atomic_uint_t *ptr) {
+  nchan_slab_set_reserved_pages_tracker(SHPOOL(shm), ptr);
+}
+
+ngx_int_t shm_init(shmem_t *shm) {
+  ngx_slab_pool_t    *shpool = SHPOOL(shm);
+  #if (DEBUG_SHM_ALLOC == 1)
+  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "nchan_shpool start %p size %i", shpool->start, (u_char *)shpool->end - (u_char *)shpool->start);
+  #endif
+  nchan_slab_init(shpool);
+  
+  return NGX_OK;
+}
+
+ngx_int_t shm_reinit(shmem_t *shm) {
+  ngx_slab_pool_t    *shpool = SHPOOL(shm);
+  nchan_slab_init(shpool);
+  
+  return NGX_OK;
+}
+
+void shmtx_lock(shmem_t *shm) {
+  ngx_shmtx_lock(&SHPOOL(shm)->mutex);
+}
+void shmtx_unlock(shmem_t *shm) {
+  ngx_shmtx_unlock(&SHPOOL(shm)->mutex);
+}
+
+ngx_int_t shm_destroy(shmem_t *shm) {
+  //VALGRIND_DESTROY_MEMPOOL(SHPOOL(shm));
+  ngx_free(shm);
+  
+  return NGX_OK;
+}
+void *shm_alloc(shmem_t *shm, size_t size, const char *label) {
+  void         *p;
+#if FAKESHARD  
+  p = ngx_alloc(size, ngx_cycle->log);
+#else
+  p = nchan_slab_alloc(SHPOOL(shm), size);  
+#endif
+  if(p == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "shpool alloc failed");
+  }
+
+  #if (DEBUG_SHM_ALLOC == 1)
+  if (p != NULL) {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool alloc addr %p size %ui label %s", p, size, label == NULL ? "none" : label);
+  }
+  #endif
+  return p;
+}
+
+void *shm_calloc(shmem_t *shm, size_t size, const char *label) {
+  void *p = shm_alloc(shm, size, label);
+  if(p != NULL) {
+    ngx_memzero(p, size);
+  }
+  return p;
+}
+
+void shm_free(shmem_t *shm, void *p) {
+#if FAKESHARD
+  ngx_free(p);
+#else
+  nchan_slab_free(SHPOOL(shm), p);
+#endif
+#if (DEBUG_SHM_ALLOC == 1)
+  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool free addr %p", p);
+#endif
+}
+
+
+
+//copypasta because these should only be used for debugging
+
+void *shm_locked_alloc(shmem_t *shm, size_t size, const char *label) {
+  void         *p;
+#if FAKESHARD  
+  p = ngx_alloc(size, ngx_cycle->log);
+#else
+  p = nchan_slab_alloc_locked(SHPOOL(shm), size);  
+#endif
+  if(p == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "shpool alloc failed");
+  }
+
+  #if (DEBUG_SHM_ALLOC == 1)
+  if (p != NULL) {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool alloc addr %p size %ui label %s", p, size, label == NULL ? "none" : label);
+  }
+  #endif
+  return p;
+}
+
+void *shm_locked_calloc(shmem_t *shm, size_t size, const char *label) {
+  void *p = shm_locked_alloc(shm, size, label);
+  if(p != NULL) {
+    ngx_memzero(p, size);
+  }
+  return p;
+}
+
+void shm_locked_free(shmem_t *shm, void *p) {
+#if FAKESHARD
+  ngx_free(p);
+#else
+  nchan_slab_free_locked(SHPOOL(shm), p);
+#endif
+#if (DEBUG_SHM_ALLOC == 1)
+  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool free addr %p", p);
+#endif
+}
+
+void shm_verify_immutable_string(shmem_t *shm, ngx_str_t *str) {
+ /* u_char    *pt=(u_char *)str-1;
+  assert(pt[0]=='<');
+  pt=str->data;
+  assert(pt[str->len]=='>');
+  */
+}
+
+void shm_free_immutable_string(shmem_t *shm, ngx_str_t *str) {
+  shm_free(shm, (void *)str);
+}
+
+ngx_str_t *shm_copy_immutable_string(shmem_t *shm, ngx_str_t *str_in) {
+  ngx_str_t    *str;
+  size_t        sz = sizeof(*str) + str_in->len;
+  if((str = shm_alloc(shm, sz, "string")) == NULL) {
+    return NULL;
+  }
+  str->data=(u_char *)&str[1];
+  str->len=str_in->len;
+  ngx_memcpy(str->data, str_in->data, str_in->len);
+  return str;
+}
diff --git a/debian/modules/nchan/src/util/shmem.h b/debian/modules/nchan/src/util/shmem.h
new file mode 100644
index 0000000..18514c4
--- /dev/null
+++ b/debian/modules/nchan/src/util/shmem.h
@@ -0,0 +1,28 @@
+#ifndef NCHAN_SHMEM_H
+#define NCHAN_SHMEM_H
+typedef struct {
+  ngx_shm_zone_t        *zone;
+} shmem_t;
+
+shmem_t          *shm_create(ngx_str_t *name, ngx_conf_t *cf, size_t shm_size, ngx_int_t (*init)(ngx_shm_zone_t *, void *), void *privdata);
+ngx_int_t         shm_init(shmem_t *shm);
+ngx_int_t         shm_reinit(shmem_t *shm);
+ngx_int_t         shm_destroy(shmem_t *shm);
+void             *shm_alloc(shmem_t *shm, size_t size, const char *label);
+void             *shm_calloc(shmem_t *shm, size_t size, const char *label);
+void              shm_free(shmem_t *shm, void *p);
+
+void             *shm_locked_alloc(shmem_t *shm, size_t size, const char *label);
+void             *shm_locked_calloc(shmem_t *shm, size_t size, const char *label);
+void              shm_locked_free(shmem_t *shm, void *p);
+
+void              shmtx_lock(shmem_t *shm);
+void              shmtx_unlock(shmem_t *shm);
+
+ngx_str_t        *shm_copy_immutable_string(shmem_t *shm, ngx_str_t *str);
+void              shm_free_immutable_string(shmem_t *shm, ngx_str_t *str);
+void              shm_verify_immutable_string(shmem_t *shm, ngx_str_t *str);
+
+void shm_set_allocd_pages_tracker(shmem_t *shm, ngx_atomic_uint_t *ptr);
+
+#endif //NCHAN_SHMEM_H
diff --git a/debian/modules/nginx-http-push/README b/debian/modules/nginx-http-push/README
deleted file mode 100644
index fece50a..0000000
--- a/debian/modules/nginx-http-push/README
+++ /dev/null
@@ -1,206 +0,0 @@
-NGiNX HTTP push module - Turn NGiNX into an adept HTTP Push (Comet) server.
-
-This module takes care of all the connection juggling, and exposes a simple
-interface to broadcast messages to clients via plain old HTTP requests.
-This makes it possible to write live-updating applications without having to
-wait on idle connections via upstream proxies or making your code all
-asynchronous and concurrent.
-
----------------- Configuration Directives & Variables ------------------------
-Variables:
-$push_channel_id
-  A token uniquely identifying a communication channel. Must be present in the
-  context of the push_subscriber and push_publisher directives.
-  Example:
-    set $push_channel_id $arg_id; 
-	#channel id is now the url query string parameter "id"
-	#(/foo/bar?id=channel_id_string)
-
-Directives:
-
-==Publisher/Subscriber==
-
-push_subscriber [ long-poll | interval-poll ]
-  default: long-poll
-  context: server, location
-  Defines a server or location as a subscriber. This location represents a 
-  subscriber's interface to a channel's message queue. The queue is traversed
-  automatically via caching information request headers (If-Modified-Since and
-  If-None-Match), beginning with the oldest available message. Requests for 
-  upcoming messages are handled in accordance with the setting provided. 
-  See the protocol documentation for a detailed description. 
-
-push_subscriber_concurrency [ last | first | broadcast ]
-  default: broadcast
-  context: http, server, location
-  Controls how multiple subscriber requests to a channel (identified by
-  some common ID) are handled.
-  The values work as follows:
-   - broadcast: any number of concurrent subscriber requests may be held.
-   - last: only the most recent subscriber request is kept, all others get 
-     a 409 Conflict response.
-   - first: only the oldest subscriber request is kept, all others get a 
-     409 Conflict response.
-
-push_publisher
-  default: none
-  context: server, location
-  Defines a server or location as a message publisher. Requests to a publisher
-  location are treated as messages to be sent to subscribers. See the protocol 
-  documentation for a detailed description. 
-
-== Message storage ==
-
-push_store_messages [ on | off ]
-  default: on
-  context: http, server, location
-  Whether or not message queuing is enabled. "Off" is equivalent to the setting
-  push_channel_buffer_length 0;
-
-push_max_reserved_memory [ size ]
-  default: 32M
-  context: http
-  The size of the memory chunk this module will use for all message queuing
-  and buffering. 
-
-push_min_message_buffer_length [ number ]
-  default: 1
-  context: http, server, location
-  The minimum number of messages to store per channel. A channel's message
-  buffer will retain at least this many most recent messages.
-
-push_max_message_buffer_length [ number ]
-  default: 10
-  context: http, server, location
-  The maximum number of messages to store per channel. A channel's message
-  buffer will retain at most this many most recent messages.
-
-push_message_buffer_length [ number ]
-  default: none
-  context: http, server, location
-  The exact number of messages to store per channel. Sets both
-  push_max_message_buffer_length and push_min_message_buffer_length to this 
-  value.
-  
-push_delete_oldest_received_message [ on | off ]
-  default: off
-  context: http, server, location
-  When enabled, as soon as the oldest message in a channel's message queue has
-  been received by a subscriber, it is deleted -- provided there are more than
-  push_min_message_buffer_length messages in the channel's message buffer.
-  Recommend avoiding this directive as it violates subscribers' assumptions of 
-  GET request idempotence.
-
-push_message_timeout [ time ]
-  default: 1h
-  context: http, server, location
-  The length of time a message may be queued before it is considered expired. 
-  If you do not want messages to expire, set this to 0. Applicable only if a 
-  push_publisher is present in this or a child context. 
-
-push_subscriber_timeout [ time ]
-  default: 0
-  context: http, server, location
-  The length of time a subscriber's long-polling connection can last before
-  it's timed out. If you don't want subscriber's connection to timeout, set
-  this to 0. Applicable only if a push_subscriber is present in this or a 
-  child context.
-
-push_channel_timeout [ time ]
-  default: 0
-  context: http, server, location
-  The length of time a channel will be removed after it has no subscriber and
-  no queued messages. If you want to remove a channel as soon as possible, 
-  set this to 0. Applicable only if a push_publisher or push_subscriber is 
-  present in this or a child context and push_subscriber_timeout is greater
-  than 0. This value should be greater than push_subscriber_timeout to make
-  sense.
-
-== Security ==
-
-push_authorized_channels_only [ on | off ]
-  default: off
-  context: http, server, location
-  Whether or not a subscriber may create a channel by making a request to a 
-  push_subscriber location. If set to on, a publisher must send a POST or PUT
-  request before a subscriber can request messages on the channel. Otherwise, 
-  all subscriber requests to nonexistent channels will get a 403 Forbidden 
-  response.
-
-push_channel_group [ string ]
-  default: (none)
-  context: server, location
-  Because settings are bound to locations and not individual channels,
-  it is useful to be able to have channels that can be reached only from some
-  locations and never others. That's where this setting comes in. Think of it
-  as a prefix string for the channel id.
-
-push_max_channel_id_length [ number ]
-  default: 512
-  context: main, server, location
-  Maximum permissible channel id length (number of characters). 
-  Longer ids will be truncated.
-
-push_max_channel_subscribers [ number ]
-  default: 0 (unlimited)
-  context: main, server, location
-  Maximum concurrent subscribers. Pretty self-explanatory.
-
---------------------------- Example Config -----------------------------------
-http {
-  #maximum amount of memory the push module is allowed to use 
-  #for buffering and stuff
-  push_max_reserved_memory	12M; #default is 3M
-
-  # internal publish endpoint (keep it private / protected)
-  location /publish {
-    set $push_channel_id $arg_channel; #/?channel=239aff3 or some-such
-    push_publisher;
-
-    push_message_timeout 2h;           # expire buffered messages after 2 hours
-    push_max_message_buffer_length 10; # store absolutely at most 10 messages
-    push_min_message_recipients 0;     # minimum recipients before purge
-  }
- 
-  # public long-polling endpoint
-  location /activity {
-    push_subscriber;
- 
-    # how multiple subscriber requests to the same channel id are handled
-    # - last: only the most recent subscriber request is kept, 409 for others.
-    # - first: only the oldest subscriber request is kept, 409 for others.
-    # - broadcast: any number of subscriber requests may be long-polling.
-    push_subscriber_concurrency broadcast;
-    set $push_channel_id $arg_channel; #/?channel=239aff3 or some-such
-    default_type  text/plain;
-  }
-}
-
----------------------------- Operation ---------------------------------------
-The following describes what is likely to be the most commonly desired setup:
-
-Assuming the example config given above,
-Clients will connect to http://example.com/activity?id=... and have the 
-response delayed until a message is POSTed to http://example.com/publish?id=...
-Messages can be sent to clients that have not yet connected, i.e. they are 
-queued.
-
-Upon sending a request to a push_publisher location, the message, contained in
-the publisher request body, will be sent to the channel identified by 
-$push_channel_id and to all presently connected channel subscribers. If there 
-are no subscribers waiting for a message at the time, the publisher will be 
-sent to with a with a 202 Accepted response. Otherwise, a 201 Created response
-is sent. Additionally, the body of the publisher response will contain 
-information about the channel (number of current subscribers, message queue
-length, etc).
- 
-If you intend to have the publisher be a server-side application, it's a damn 
-good idea to make sure the push_publisher location is not publicly accessible.
-
-Traversal through a channel's message buffer by a subscriber requires proper 
-HTTP caching support from the subscriber client. Make sure it correctly sends 
-Last-Modified and Etag headers. (All modern web browsers do this.)
-
------------------------ Protocol Spec --------------------------------------
-This module is unconditionally (fully) compliant with the Basic HTTP Push 
-Relay Protocol, Rev. 2.21, found in the file protocol.txt.
diff --git a/debian/modules/nginx-http-push/changelog.txt b/debian/modules/nginx-http-push/changelog.txt
deleted file mode 100644
index 0479987..0000000
--- a/debian/modules/nginx-http-push/changelog.txt
+++ /dev/null
@@ -1,53 +0,0 @@
- fix: turning on gzip cleared Etag subscriber response header
- fix: channels incorrectly deleted when overwhelmed with connections
- feature: CORS support via OPTIONS request method response
- fix: file descriptor leak when restarting nginx via SIGHUP
- improve: concurrency for interprocess notifications
- refactor: completely encapsulated message store
- fix: slow memory leak introduced in 0.7
- fix: memory leak when not using message buffer
-0.712 (Mar. 21 2014)
- fix: intermittently dropped long-polling connections on internal redirects
- fix: unable to proxy long-polling subscribers. (thanks wandenberg and sanmai)
-0.711 (Mar. 13 2014)
- fix: incompatibility with cache manager (proxy_cache and fastcgi_cache directives)
-0.71 (Mar. 1 2014)
- fix: removed unused variables and functions to quiet down GCC
-0.7: (Feb. 20 2014)
- fix: last-in concurrency setting wasn't working reliably
- refactor: partially separated message storage. add a test harness.
- fix: segfault from concurrency bug while garbage-collecting channels
- fix: some large messages got lost
-0.692 (Feb. 3 2010)
- fix: error log reported failed close() for some publisher requests with large messages
- fix: occasional memory leak during message deletion
- fix: worker messages intended for dead worker processes were not deleted
-0.691 (Feb. 2 2010)
- fix: server reload (via SIGHUP signal) was failing
- fix: segfault on messages longer than client_body_buffer_size (thanks wfelipe)
- change: removed push_min_message_recipients, added push_delete_oldest_received_message
-0.69 (Nov. 17 2009)
- fix: publisher got a 201 Created response even if the channel had no subscribers at the time (should be 202 Accepted)
- fix: small memory leak after each message broadcast to a channel
- feature: optional push_max_channel_subscribers setting added
- fix: first-in concurrency setting wasn't responding to subscribers with a correct status code on conflict
- fix: reused subscriber connections sometimes failed to receive messages
- unfeature: no more nginx 0.6 support. not worth the hassle.
-0.683 (Nov. 10 2009)
- change: default max. reserved memory size changed form 16MB to 32 MB
- change: unused node garbage collection made a little more aggressive (max. 3 unused channels per channel search instead of 1)
- fix: unused nodes were deleted only on channel id hash collision (very rare)
- fix: segmentation fault from allocating insufficient memory for interprocess messaging
-0.681 (Nov. 6 2009)
- feature: added push_message_buffer_length setting, which sets push_message_max_buffer_length and push_message_min_buffer_length at once.
- fix: publisher channel info text/json response now uses double quotes instead of single.
- fix: interprocess messages were not removed from shared memory correctly, causing weird errors
-0.68 (Nov. 5 2009)
- change: default push_subscriber_concurrency value is now "broadcast"
- fix: incorrect error messages for invalid push_pubscriber and push_subscriber_concurrency settings
- change: removed deprecated push_buffer_size and push_queue_messages settings
- feature: rudimentary content-type negotiation for publisher channel info response.
-   support text/plain, text/json, text/yaml and application/xml (and mimetype equivalents)
- fix: publisher GET response has HTTP status 0
-0.67beta (Nov. 4 2009) and older
- see git repository
diff --git a/debian/modules/nginx-http-push/config b/debian/modules/nginx-http-push/config
deleted file mode 100644
index 375337b..0000000
--- a/debian/modules/nginx-http-push/config
+++ /dev/null
@@ -1,26 +0,0 @@
-ngx_feature="http_push_module"
-ngx_feature_name=
-ngx_feature_run=no
-ngx_feature_incs=
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test=
- 
-ngx_addon_name=ngx_http_push_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_push_module"
-CORE_INCS="$CORE_INCS \
-	$ngx_addon_dir/src"	
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
-    ${ngx_addon_dir}/src/ngx_http_push_defs.c \
-    ${ngx_addon_dir}/src/store/rbtree_util.c \
-    ${ngx_addon_dir}/src/store/ngx_http_push_module_ipc.c \
-    ${ngx_addon_dir}/src/store/memory/store.c \
-    ${ngx_addon_dir}/src/store/ngx_rwlock.c \
-    ${ngx_addon_dir}/src/ngx_http_push_module.c \
-    "
-
-have=NGX_HTTP_HEADERS . auto/have
-. auto/feature
-
-CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-CORE_INCS="$CORE_INCS $ngx_feature_incs"
\ No newline at end of file
diff --git a/debian/modules/nginx-http-push/protocol.txt b/debian/modules/nginx-http-push/protocol.txt
deleted file mode 100644
index 5233003..0000000
--- a/debian/modules/nginx-http-push/protocol.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-                         Basic HTTP Push Relay Protocol
-
-   Rev. 2.23
-
-1. Introduction
-
-  1.1. Purpose
-
-   The primary purpose of this protocol is to enable a method of
-   long-polling, transparent to the web client, where client connections
-   idle only on the HTTP server and need not be forwarded.
-
-  1.2. Requirements
-
-   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
-   document are to be interpreted as described in RFC2119. An
-   implementation is not compliant if it fails to satisfy one or more of
-   the MUST or REQUIRED level requirements for the protocols it
-   implements.
-
-   An implementation that satisfies all the MUST or REQUIRED level and all
-   the SHOULD level requirements for its protocols is said to be
-   "unconditionally compliant"; one that satisfies all the MUST level
-   requirements but not all the SHOULD level requirements for its
-   protocols is said to be "conditionally compliant."
-
-  1.3. Terminology
-
-   This specification uses a number of terms to refer to the roles played
-   by participants in, and objects of, this protocol:
-
-   server
-          The HTTP server implementing this protocol.
-
-   client
-          A program that initiates TCP/IP connections with the HTTP server
-          for the purpose of sending HTTP requests.
-
-   message
-          Application specific data, usually enclosed in a request or
-          response body.
-
-   channel
-          A resource representing an isolated pathway for message
-          transmission. Each channel has a single unique message queue.
-
-   subscriber
-          A client that sends HTTP requests to the server for the purposes
-          of receiving messages via some channel.
-
-   publisher
-          A client that sends HTTP requests to the server in order to
-          transmit messages to subscribers via a channel.
-
-   channel id
-          A unique identifier for a channel.
-
-   location
-          A url (or set of urls) on the server.
-
-2. Requirements
-
-  2.1. Server Requirements
-
-   The HTTP server MUST have a mechanism of specifying a url, or a set of
-   urls as publisher and subscriber locations. All requests to the
-   publisher location MUST be treated as publisher requests, all to the
-   subscriber location as subscriber requests.
-
-   The server MUST implement a mechanism for identifying channels with
-   unique ids. This MAY, for example, be a url parameter (/foo/?id=123) or
-   a cookie. Methods of channel identification other than those using the
-   url MAY be used, but are strongly discouraged.
-
-   The server MUST accept requests on publisher locations and respond to
-   them immediately. It MUST also accept requests on subscriber locations,
-   but need not respond immediately.
-
-  2.2. Client Requirements
-
-   All clients must prodice valid HTTP requests. Subscriber clients must
-   have a caching mechanism that appropriately reacts to Last-Modified and
-   Etag response headers (web browsers, for example).
-
-  2.3. The Channel ID
-
-   It is not the responsibility of the server to generate IDs.
-
-3. Server Operation
-
-   A publisher request functions as notification to the server of a
-   message to send to some subscribers over some channel. A subscriber
-   request notifies the server of the subscriber's intent to receive a
-   message.
-
-  3.1. The Subscriber
-
-   The server MUST accept all valid HTTP GET requests to the subscriber
-   location. All other request methods SHOULD be responded to with a 405
-   Method Not Allowed status code.
-
-   Subscriber requests are considered notifications of intent to receive
-   some message. Subscribers may request existing messages, messages that
-   are not yet available, and messages that are no longer available. The
-   requested message is identified using the If-Modified-Since and
-   If-None-Match request headers. A request with no If-Modified-Since
-   header MUST be assumed to be requesting the oldest available message in
-   a channel. Each 200 OK response containing a message MUST have its
-   Last-Modified and Etag headers set so that a request using those
-   headers will be interpreted as a request for the next available
-   message. Additionally, said 200 OK MUST contain the Content-Type header
-   of the message publisher request, unless no Content-Type header had
-   been provided or it is explicitly overridden by server configuration.
-
-   There are several common mechanisms for performing an HTTP server push.
-   The rest of the behavior of the server in response to a subscriber
-   request SHOULD be configurable and MUST be selected from the following
-   list of mechanisms:
-
-   Long-Polling
-          Requests for existing messages will be responded to immediately;
-          responses to requests for messages not yet available MUST be
-          delayed until the message becomes available. Delayed responses
-          MUST satisfy all of the following conditions:
-
-          + A 200 OK response containing the message (and its
-            Content-Type) MUST be sent immediately after the message
-            becomes available. The entire response must be
-            indistinguishable from a response to a request for an existing
-            message.
-          + If the channel the subscriber is waiting on is deleted or for
-            some reason becomes unavailable, the server MUST immediately
-            send a 410 Gone response.
-          + If another subscriber has conflicted with this request, the
-            server MUST immediately send a 409 Conflict response.
-
-   Interval-Polling
-          All requests will be responded to immediately. Requests for
-          messages not yet available MUST produce a 304 Not Modified
-          response code.
-
-   In addition, when the server receives more than one concurrent
-   subscriber request on the same channel, it MUST do one of the
-   following:
-
-   Broadcast
-          No additional actions are performed
-
-   Last-in, first-out
-          All but the most recent long-held subscriber request on the
-          channel are sent a 409 Conflict response.
-
-   First-in, last-out
-          All but the oldest request will be sent a 409 Conflict
-
-   The server SHOULD make this selection configurable, and MUST default to
-   broadcast behavior.
-
-  3.2. The Publisher
-
-   The server MUST accept all valid HTTP requests to the publisher
-   location. The server, when sent a publisher request, MUST satisfy all
-   of the following conditions:
-     * GET requests receive a 200 OK response for existing channels and a
-       404 Not Found otherwise.
-     * PUT requests receive a 200 OK response. The request creates a
-       channel if no channel with the given channel id exists.
-     * DELETE requests receive a 200 OK if the channel identified by the
-       channel id exists and has been completely deleted. All subscribers
-       MUST have been sent a 410 Gone response. Requests for nonexistent
-       channels MUST be responded to with a 404 Not Found.
-     * POST requests are used to send messages. The request MAY contain a
-       body in any encoding representing a message to be sent over the
-       channel. The message MUST be immediately delivered to all currently
-       long-held subscriber requests. Additionally, the message MAY be
-       stored for future retrieval and the oldest message stored for the
-       channel MAY be deleted.
-       A POST request MUST be replied to with a 201 Created if there were
-       any long-held subscribers that have been sent this message, and
-       with a 202 Accepted otherwise.
-       The Content-Type header of the request MUST be forwarded with the
-       message.
-
-   Message storage limits SHOULD be configurable. publisher locations
-   SHOULD be configurable to allow foregoing message storage on POST
-   requests. All 200-level responses MUST, in the response body, contain
-   information about the applicable channel. This information MAY contain
-   the number of stored messages and the number of subscribers' requests
-   being long-held prior to this request. The server MAY implement a
-   content-negotiation scheme for this information.
diff --git a/debian/modules/nginx-http-push/src/ngx_http_push_defs.c b/debian/modules/nginx-http-push/src/ngx_http_push_defs.c
deleted file mode 100644
index 65b8243..0000000
--- a/debian/modules/nginx-http-push/src/ngx_http_push_defs.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <ngx_http.h>
-#include "ngx_http_push_defs.h"
-
-//string constants
-//headers
-const  ngx_str_t NGX_HTTP_PUSH_HEADER_ETAG = ngx_string("Etag");
-const  ngx_str_t NGX_HTTP_PUSH_HEADER_IF_NONE_MATCH = ngx_string("If-None-Match");
-const  ngx_str_t NGX_HTTP_PUSH_HEADER_VARY = ngx_string("Vary");
-const  ngx_str_t NGX_HTTP_PUSH_HEADER_ALLOW = ngx_string("Allow");
-const  ngx_str_t NGX_HTTP_PUSH_HEADER_CACHE_CONTROL = ngx_string("Cache-Control");
-const  ngx_str_t NGX_HTTP_PUSH_HEADER_PRAGMA = ngx_string("Pragma");
-const  ngx_str_t NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_HEADERS = ngx_string("Access-Control-Allow-Headers");
-const  ngx_str_t NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_METHODS = ngx_string("Access-Control-Allow-Methods");
-const  ngx_str_t NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN = ngx_string("Access-Control-Allow-Origin");
-
-//header values
-const  ngx_str_t NGX_HTTP_PUSH_CACHE_CONTROL_VALUE = ngx_string("no-cache");
-
-//status strings
-const  ngx_str_t NGX_HTTP_PUSH_HTTP_STATUS_409 = ngx_string("409 Conflict");
-const  ngx_str_t NGX_HTTP_PUSH_HTTP_STATUS_410 = ngx_string("410 Gone");
-
-//other stuff
-const  ngx_str_t NGX_HTTP_PUSH_ANYSTRING= ngx_string("*");
-const  ngx_str_t NGX_HTTP_PUSH_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS = ngx_string("Content-Type, Origin");
-const  ngx_str_t NGX_HTTP_PUSH_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS = ngx_string("If-None-Match, If-Modified-Since, Origin");
-const  ngx_str_t NGX_HTTP_PUSH_ALLOW_GET_POST_PUT_DELETE_OPTIONS= ngx_string("GET, POST, PUT, DELETE, OPTIONS");
-const  ngx_str_t NGX_HTTP_PUSH_ALLOW_GET_OPTIONS= ngx_string("GET, OPTIONS");
-const  ngx_str_t NGX_HTTP_PUSH_VARY_HEADER_VALUE = ngx_string("If-None-Match, If-Modified-Since");
-
-
-const ngx_str_t NGX_HTTP_PUSH_CHANNEL_INFO_PLAIN = ngx_string(
-  "queued messages: %ui" CRLF
-  "last requested: %d sec. ago (-1=never)" CRLF
-  "active subscribers: %ui"
-  "\0");
-
-const ngx_str_t NGX_HTTP_PUSH_CHANNEL_INFO_JSON = ngx_string(
-  "{\"messages\": %ui, "
-  "\"requested\": %d, "
-  "\"subscribers\": %ui }"
-  "\0");
-
-const ngx_str_t NGX_HTTP_PUSH_CHANNEL_INFO_XML = ngx_string(
-  "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" CRLF
-  "<channel>" CRLF
-  "  <messages>%ui</messages>" CRLF
-  "  <requested>%d</requested>" CRLF
-  "  <subscribers>%ui</subscribers>" CRLF
-  "</channel>"
-  "\0");
-
-const ngx_str_t NGX_HTTP_PUSH_CHANNEL_INFO_YAML = ngx_string(
-  "---" CRLF
-  "messages: %ui" CRLF
-  "requested: %d" CRLF
-  "subscribers: %ui" CRLF
-  CRLF
-  "\0");
diff --git a/debian/modules/nginx-http-push/src/ngx_http_push_defs.h b/debian/modules/nginx-http-push/src/ngx_http_push_defs.h
deleted file mode 100644
index 1481501..0000000
--- a/debian/modules/nginx-http-push/src/ngx_http_push_defs.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-#define NGX_HTTP_PUSH_DEFAULT_SHM_SIZE 33554432 //32 megs
-#define NGX_HTTP_PUSH_DEFAULT_BUFFER_TIMEOUT 3600
-#define NGX_HTTP_PUSH_DEFAULT_SUBSCRIBER_TIMEOUT 0  //default: never timeout
-//(liucougar: this is a bit confusing, but it is what's the default behavior before this option is introducecd)
-#define NGX_HTTP_PUSH_DEFAULT_CHANNEL_TIMEOUT 5 //default: timeout in 5 seconds
-
-#define NGX_HTTP_PUSH_DEFAULT_MIN_MESSAGES 1
-#define NGX_HTTP_PUSH_DEFAULT_MAX_MESSAGES 10
-
-#define NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_LASTIN 0
-#define NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_FIRSTIN 1
-#define NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_BROADCAST 2
-
-#define NGX_HTTP_PUSH_MECHANISM_LONGPOLL 0
-#define NGX_HTTP_PUSH_MECHANISM_INTERVALPOLL 1
-
-#define NGX_HTTP_PUSH_MIN_MESSAGE_RECIPIENTS 0
-
-#define NGX_HTTP_PUSH_MAX_CHANNEL_ID_LENGTH 1024 //bytes
-
-#ifndef NGX_HTTP_CONFLICT
-#define NGX_HTTP_CONFLICT 409
-#endif
-
-#ifndef NGX_HTTP_GONE
-#define NGX_HTTP_GONE 410
-#endif
-
-#ifndef NGX_HTTP_CREATED
-#define NGX_HTTP_CREATED 201
-#endif
-
-#ifndef NGX_HTTP_ACCEPTED
-#define NGX_HTTP_ACCEPTED 202
-#endif
-
-
-#define NGX_HTTP_PUSH_MESSAGE_RECEIVED 9000
-#define NGX_HTTP_PUSH_MESSAGE_QUEUED   9001
-
-#define NGX_HTTP_PUSH_MESSAGE_FOUND     1000
-#define NGX_HTTP_PUSH_MESSAGE_EXPECTED  1001
-#define NGX_HTTP_PUSH_MESSAGE_EXPIRED   1002
-
-extern const  ngx_str_t NGX_HTTP_PUSH_HEADER_ETAG;
-extern const  ngx_str_t NGX_HTTP_PUSH_HEADER_IF_NONE_MATCH;
-extern const  ngx_str_t NGX_HTTP_PUSH_HEADER_VARY;
-extern const  ngx_str_t NGX_HTTP_PUSH_HEADER_ALLOW;
-extern const  ngx_str_t NGX_HTTP_PUSH_HEADER_CACHE_CONTROL;
-extern const  ngx_str_t NGX_HTTP_PUSH_HEADER_PRAGMA;
-extern const  ngx_str_t NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_METHODS;
-extern const  ngx_str_t NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_HEADERS;
-extern const  ngx_str_t NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN;
-
-//header values
-extern const  ngx_str_t NGX_HTTP_PUSH_CACHE_CONTROL_VALUE;
-
-//status strings
-extern const  ngx_str_t NGX_HTTP_PUSH_HTTP_STATUS_409;
-extern const  ngx_str_t NGX_HTTP_PUSH_HTTP_STATUS_410;
-
-//other stuff
-extern const ngx_str_t NGX_HTTP_PUSH_ANYSTRING;
-extern const ngx_str_t NGX_HTTP_PUSH_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS;
-extern const ngx_str_t NGX_HTTP_PUSH_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS;
-extern const ngx_str_t NGX_HTTP_PUSH_ALLOW_GET_POST_PUT_DELETE_OPTIONS;
-extern const ngx_str_t NGX_HTTP_PUSH_ALLOW_GET_OPTIONS;
-extern const ngx_str_t NGX_HTTP_PUSH_VARY_HEADER_VALUE;
-extern const ngx_str_t NGX_HTTP_PUSH_CHANNEL_INFO_PLAIN;
-extern const ngx_str_t NGX_HTTP_PUSH_CHANNEL_INFO_JSON;
-extern const ngx_str_t NGX_HTTP_PUSH_CHANNEL_INFO_XML;
-extern const ngx_str_t NGX_HTTP_PUSH_CHANNEL_INFO_YAML;
\ No newline at end of file
diff --git a/debian/modules/nginx-http-push/src/ngx_http_push_module.c b/debian/modules/nginx-http-push/src/ngx_http_push_module.c
deleted file mode 100755
index 2703ee0..0000000
--- a/debian/modules/nginx-http-push/src/ngx_http_push_module.c
+++ /dev/null
@@ -1,783 +0,0 @@
-/*
- *  Copyright 2009 Leo Ponomarev.
- */
-
-#include <ngx_http_push_module.h>
-
-#include <store/memory/store.h>
-#include <ngx_http_push_module_setup.c>
-
-ngx_int_t           ngx_http_push_worker_processes;
-ngx_pool_t         *ngx_http_push_pool;
-ngx_module_t        ngx_http_push_module;
-
-ngx_http_push_store_t *ngx_http_push_store = &ngx_http_push_store_memory;
-
-
-ngx_int_t ngx_http_push_respond_status_only(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *statusline) {
-  r->headers_out.status=status_code;
-  if(statusline!=NULL) {
-    r->headers_out.status_line.len =statusline->len;
-    r->headers_out.status_line.data=statusline->data;
-  }
-  r->headers_out.content_length_n = 0;
-  r->header_only = 1;
-  return ngx_http_send_header(r);
-}
-
-void ngx_http_push_clean_timeouted_subscriber(ngx_event_t *ev)
-{
-  ngx_http_push_subscriber_t *subscriber = NULL;
-  ngx_http_request_t *r = NULL;
-
-  subscriber = ev->data;
-  r = subscriber->request;
-  
-  if (r->connection->destroyed) {
-    return;
-  }
-
-  ngx_int_t rc = ngx_http_push_respond_status_only(r, NGX_HTTP_NOT_MODIFIED, NULL);
-  ngx_http_finalize_request(r, rc);
-  //the subscriber and channel counter will be freed by the pool cleanup callback
-}
-
-void ngx_http_push_subscriber_del_timer(ngx_http_push_subscriber_t *sb) {
-  if (sb->event.timer_set) {
-    ngx_del_timer(&sb->event);
-  }
-}
-
-void ngx_http_push_subscriber_clear_ctx(ngx_http_push_subscriber_t *sb) {
-  ngx_http_push_subscriber_del_timer(sb);
-  sb->clndata->subscriber = NULL;
-  sb->clndata->channel = NULL;
-}
-
-
-#define NGX_HTTP_BUF_ALLOC_SIZE(buf)                                          \
-(sizeof(*buf) +                                                           \
-(((buf)->temporary || (buf)->memory) ? ngx_buf_size(buf) : 0) +          \
-(((buf)->file!=NULL) ? (sizeof(*(buf)->file) + (buf)->file->name.len + 1) : 0))
-
-//buffer is _copied_
-ngx_chain_t * ngx_http_push_create_output_chain(ngx_buf_t *buf, ngx_pool_t *pool, ngx_log_t *log) {
-  ngx_chain_t                    *out;
-  ngx_file_t                     *file;
-  
-  if((out = ngx_pcalloc(pool, sizeof(*out)))==NULL) {
-    return NULL;
-  }
-  ngx_buf_t                      *buf_copy;
-  
-  if((buf_copy = ngx_pcalloc(pool, NGX_HTTP_BUF_ALLOC_SIZE(buf)))==NULL) {
-    return NULL;
-  }
-  ngx_http_push_copy_preallocated_buffer(buf, buf_copy);
-  
-  if (buf->file!=NULL) {
-    file = buf_copy->file;
-    file->log=log;
-    if(file->fd==NGX_INVALID_FILE) {
-      file->fd=ngx_open_file(file->name.data, NGX_FILE_RDONLY, NGX_FILE_OPEN, NGX_FILE_OWNER_ACCESS);
-    }
-    if(file->fd==NGX_INVALID_FILE) {
-      return NULL;
-    }
-  }
-  buf_copy->last_buf = 1;
-  out->buf = buf_copy;
-  out->next = NULL;
-  return out;
-}
-
-#define NGX_HTTP_PUSH_NO_CHANNEL_ID_MESSAGE "No channel id provided."
-static ngx_str_t * ngx_http_push_get_channel_id(ngx_http_request_t *r, ngx_http_push_loc_conf_t *cf) {
-  ngx_http_variable_value_t      *vv = ngx_http_get_indexed_variable(r, cf->index);
-  ngx_str_t                      *group = &cf->channel_group;
-  size_t                          group_len = group->len;
-  size_t                          var_len;
-  size_t                          len;
-  ngx_str_t                      *id;
-    if (vv == NULL || vv->not_found || vv->len == 0) {
-        ngx_buf_t *buf = ngx_create_temp_buf(r->pool, sizeof(NGX_HTTP_PUSH_NO_CHANNEL_ID_MESSAGE));
-    ngx_chain_t *chain;
-    if(buf==NULL) {
-      return NULL;
-    }
-    buf->pos=(u_char *)NGX_HTTP_PUSH_NO_CHANNEL_ID_MESSAGE;
-    buf->last=buf->pos + sizeof(NGX_HTTP_PUSH_NO_CHANNEL_ID_MESSAGE)-1;
-    chain = ngx_http_push_create_output_chain(buf, r->pool, r->connection->log);
-    buf->last_buf=1;
-    r->headers_out.content_length_n=ngx_buf_size(buf);
-    r->headers_out.status=NGX_HTTP_NOT_FOUND;
-    r->headers_out.content_type.len = sizeof("text/plain") - 1;
-    r->headers_out.content_type.data = (u_char *) "text/plain";
-    r->headers_out.content_type_len = r->headers_out.content_type.len;
-    ngx_http_send_header(r);
-    ngx_http_output_filter(r, chain);
-    ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-            "push module: the $push_channel_id variable is required but is not set");
-    return NULL;
-    }
-  //maximum length limiter for channel id
-  var_len = vv->len <= cf->max_channel_id_length ? vv->len : cf->max_channel_id_length; 
-  len = group_len + 1 + var_len;
-  if((id = ngx_palloc(r->pool, sizeof(*id) + len))==NULL) {
-    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-            "push module: unable to allocate memory for $push_channel_id string");
-    return NULL;
-  }
-  id->len=len;
-  id->data=(u_char *)(id+1);
-  ngx_memcpy(id->data, group->data, group_len);
-  id->data[group_len]='/';
-  ngx_memcpy(id->data + group_len + 1, vv->data, var_len);
-  return id;
-}
-
-ngx_table_elt_t * ngx_http_push_add_response_header(ngx_http_request_t *r, const ngx_str_t *header_name, const ngx_str_t *header_value) {
-  ngx_table_elt_t                *h = ngx_list_push(&r->headers_out.headers);
-  if (h == NULL) {
-    return NULL;
-  }
-  h->hash = 1;
-  h->key.len = header_name->len;
-  h->key.data = header_name->data;
-  h->value.len = header_value->len;
-  h->value.data = header_value->data;
-  return h;
-}
-
-static ngx_str_t * ngx_http_push_find_in_header_value(ngx_http_request_t * r, ngx_str_t header_name) {
-  ngx_uint_t                       i;
-  ngx_list_part_t                 *part = &r->headers_in.headers.part;
-  ngx_table_elt_t                 *header= part->elts;
-  
-  for (i = 0; /* void */ ; i++) {
-    if (i >= part->nelts) {
-      if (part->next == NULL) {
-        break;
-      }
-      part = part->next;
-      header = part->elts;
-      i = 0;
-    }
-    if (header[i].key.len == header_name.len
-      && ngx_strncasecmp(header[i].key.data, header_name.data, header[i].key.len) == 0) {
-      return &header[i].value;
-      }
-  }
-  return NULL;
-}
-
-ngx_int_t ngx_http_push_allow_caching(ngx_http_request_t * r) {
-  ngx_str_t *tmp_header;
-  ngx_str_t header_checks[2] = { NGX_HTTP_PUSH_HEADER_CACHE_CONTROL, NGX_HTTP_PUSH_HEADER_PRAGMA };
-  ngx_int_t i = 0;
-  
-  for(; i < 2; i++) {
-    tmp_header = ngx_http_push_find_in_header_value(r, header_checks[i]);
-    
-    if (tmp_header != NULL) {
-      return !!ngx_strncasecmp(tmp_header->data, NGX_HTTP_PUSH_CACHE_CONTROL_VALUE.data, tmp_header->len);
-    }
-  }
-  
-  return 1;
-}
-
-void ngx_http_push_subscriber_cleanup(ngx_http_push_subscriber_cleanup_t *data) {
-  if(data->subscriber!=NULL) { //still queued up
-    ngx_http_push_subscriber_t* sb = data->subscriber;
-    ngx_http_push_subscriber_del_timer(sb);
-    ngx_queue_remove(&data->subscriber->queue);
-    ngx_pfree(ngx_http_push_pool, data->subscriber); //was there an error? oh whatever.
-  }
-  if (data->rchain != NULL) {
-    ngx_pfree(data->rpool, data->rchain->buf);
-    ngx_pfree(data->rpool, data->rchain);
-    data->rchain=NULL;
-  }
-  if(data->buf_use_count != NULL && --(*data->buf_use_count) <= 0) {
-    ngx_buf_t                      *buf;
-    ngx_pfree(ngx_http_push_pool, data->buf_use_count);
-    buf=data->buf;
-    if(buf->file) {
-      ngx_close_file(buf->file->fd);
-    }
-    ngx_pfree(ngx_http_push_pool, buf);
-  }
-  
-  if(data->channel!=NULL) { //we're expected to decrement the subscriber count
-    ngx_http_push_store->lock();
-    data->channel->subscribers--;
-    ngx_http_push_store->unlock();
-  }
-}
-
-ngx_str_t * ngx_http_push_subscriber_get_etag(ngx_http_request_t * r) {
-  ngx_uint_t                       i;
-  ngx_list_part_t                 *part = &r->headers_in.headers.part;
-  ngx_table_elt_t                 *header= part->elts;
-  
-  for (i = 0; /* void */ ; i++) {
-    if (i >= part->nelts) {
-      if (part->next == NULL) {
-        break;
-      }
-      part = part->next;
-      header = part->elts;
-      i = 0;
-    }
-    if (header[i].key.len == NGX_HTTP_PUSH_HEADER_IF_NONE_MATCH.len
-      && ngx_strncasecmp(header[i].key.data, NGX_HTTP_PUSH_HEADER_IF_NONE_MATCH.data, header[i].key.len) == 0) {
-      return &header[i].value;
-      }
-  }
-  return NULL;
-}
-
-ngx_int_t ngx_http_push_subscriber_get_msg_id(ngx_http_request_t *r, ngx_http_push_msg_id_t *id) {
-  ngx_str_t                      *if_none_match = ngx_http_push_subscriber_get_etag(r);
-  ngx_int_t                       tag=0;
-  id->time=(r->headers_in.if_modified_since == NULL) ? 0 : ngx_http_parse_time(r->headers_in.if_modified_since->value.data, r->headers_in.if_modified_since->value.len);
-  if(if_none_match==NULL || (if_none_match!=NULL && (tag = ngx_atoi(if_none_match->data, if_none_match->len))==NGX_ERROR)) {
-    tag=0;
-  }
-  id->tag=ngx_abs(tag);
-  return NGX_OK;
-}
-
-//allocates nothing
-ngx_int_t ngx_http_push_prepare_response_to_subscriber_request(ngx_http_request_t *r, ngx_chain_t *chain, ngx_str_t *content_type, ngx_str_t *etag, time_t last_modified) {
-  ngx_int_t                      res;
-  if (content_type!=NULL) {
-    r->headers_out.content_type.len=content_type->len;
-    r->headers_out.content_type.data = content_type->data;
-    r->headers_out.content_type_len = r->headers_out.content_type.len;
-  }
-  if(last_modified) {
-    //if-modified-since header
-    r->headers_out.last_modified_time=last_modified;
-  }
-  if(etag!=NULL) {
-    //etag, if we need one
-    if ((ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ETAG, etag))==NULL) {
-      return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-  }
-  //Vary header needed for proper HTTP caching.
-  ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_VARY, &NGX_HTTP_PUSH_VARY_HEADER_VALUE);
-  
-  r->headers_out.status=NGX_HTTP_OK;
-  //we know the entity length, and we're using just one buffer. so no chunking please.
-  r->headers_out.content_length_n=ngx_buf_size(chain->buf);
-  if((res = ngx_http_send_header(r)) >= NGX_HTTP_SPECIAL_RESPONSE) {
-    return res;
-  }
-  
-  return ngx_http_output_filter(r, chain);
-}
-
-//allocates message and responds to subscriber
-ngx_int_t ngx_http_push_alloc_for_subscriber_response(ngx_pool_t *pool, ngx_int_t shared, ngx_http_push_msg_t *msg, ngx_chain_t **chain, ngx_str_t **content_type, ngx_str_t **etag, time_t *last_modified) {
-  if(etag != NULL && (*etag = ngx_http_push_store->message_etag(msg, pool))==NULL) {
-    //oh, nevermind...
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: unable to allocate memory for Etag header");
-    return NGX_ERROR;
-  }
-  if(content_type != NULL && (*content_type= ngx_http_push_store->message_content_type(msg, pool))==NULL) {
-    //oh, nevermind...
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: unable to allocate memory for Content Type header");
-    if(pool == NULL) {
-      ngx_free(*etag);
-    }
-    else {
-      ngx_pfree(pool, *etag);
-    }
-    return NGX_ERROR;
-  }
-  
-  //preallocate output chain. yes, same one for every waiting subscriber
-  if(chain != NULL && (*chain = ngx_http_push_create_output_chain(msg->buf, pool, ngx_cycle->log))==NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: unable to allocate buffer chain while responding to subscriber request");
-    if(pool == NULL) {
-      ngx_free(*etag);
-      ngx_free(*content_type);
-    }
-    else {
-      ngx_pfree(pool, *etag);
-      ngx_pfree(pool, *content_type);
-    }
-    return NGX_ERROR;
-  }
-  
-  if(last_modified != NULL) {
-    *last_modified = msg->message_time;
-  }
-  ngx_http_push_store->unlock();
-  
-  
-  if(pool!=NULL && shared == 0 && ((*chain)->buf->file!=NULL)) {
-    //close file when we're done with it
-    ngx_pool_cleanup_t *cln;
-    ngx_pool_cleanup_file_t *clnf;
-    
-    if((cln = ngx_pool_cleanup_add(pool, sizeof(ngx_pool_cleanup_file_t)))==NULL) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: unable to allocate buffer chain pool cleanup while responding to subscriber request");
-      ngx_pfree(pool, *etag);
-      ngx_pfree(pool, *content_type);
-      ngx_pfree(pool, *chain);
-      return NGX_ERROR;
-    }
-    cln->handler = ngx_pool_cleanup_file;
-    clnf = cln->data;
-    clnf->fd = (*chain)->buf->file->fd;
-    clnf->name = (*chain)->buf->file->name.data;
-    clnf->log = ngx_cycle->log;
-  }
-  return NGX_OK;
-}
-
-
-
-static void ngx_http_push_match_channel_info_subtype(size_t off, u_char *cur, size_t rem, u_char **priority, const ngx_str_t **format, ngx_str_t *content_type) {
-  static ngx_http_push_content_subtype_t subtypes[] = {
-    { "json"  , 4, &NGX_HTTP_PUSH_CHANNEL_INFO_JSON },
-    { "yaml"  , 4, &NGX_HTTP_PUSH_CHANNEL_INFO_YAML },
-    { "xml"   , 3, &NGX_HTTP_PUSH_CHANNEL_INFO_XML  },
-    { "x-json", 6, &NGX_HTTP_PUSH_CHANNEL_INFO_JSON },
-    { "x-yaml", 6, &NGX_HTTP_PUSH_CHANNEL_INFO_YAML }
-  };
-  u_char                         *start = cur + off;
-  ngx_uint_t                      i;
-  
-  for(i=0; i<(sizeof(subtypes)/sizeof(ngx_http_push_content_subtype_t)); i++) {
-    if(ngx_strncmp(start, subtypes[i].subtype, rem<subtypes[i].len ? rem : subtypes[i].len)==0) {
-      if(*priority>start) {
-        *format = subtypes[i].format;
-        *priority = start;
-        content_type->data=cur;
-        content_type->len= off + 1 + subtypes[i].len;
-      }
-    }
-  }
-}
-
-//print information about a channel
-static ngx_int_t ngx_http_push_channel_info(ngx_http_request_t *r, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen) {
-  ngx_buf_t                      *b;
-  ngx_uint_t                      len;
-  ngx_str_t                       content_type = ngx_string("text/plain");
-  const ngx_str_t                *format = &NGX_HTTP_PUSH_CHANNEL_INFO_PLAIN;
-  time_t                          time_elapsed = ngx_time() - last_seen;
-  
-  if(r->headers_in.accept) {
-    //lame content-negotiation (without regard for qvalues)
-    u_char                    *accept = r->headers_in.accept->value.data;
-    size_t                     len = r->headers_in.accept->value.len;
-    size_t                     rem;
-    u_char                    *cur = accept;
-    u_char                    *priority=&accept[len-1];
-    for(rem=len; (cur = ngx_strnstr(cur, "text/", rem))!=NULL; cur += sizeof("text/")-1) {
-      rem=len - ((size_t)(cur-accept)+sizeof("text/")-1);
-      if(ngx_strncmp(cur+sizeof("text/")-1, "plain", rem<5 ? rem : 5)==0) {
-        if(priority) {
-          format = &NGX_HTTP_PUSH_CHANNEL_INFO_PLAIN;
-          priority = cur+sizeof("text/")-1;
-          //content-type is already set by default
-        }
-      }
-      ngx_http_push_match_channel_info_subtype(sizeof("text/")-1, cur, rem, &priority, &format, &content_type);
-    }
-    cur = accept;
-    for(rem=len; (cur = ngx_strnstr(cur, "application/", rem))!=NULL; cur += sizeof("application/")-1) {
-      rem=len - ((size_t)(cur-accept)+sizeof("application/")-1);
-      ngx_http_push_match_channel_info_subtype(sizeof("application/")-1, cur, rem, &priority, &format, &content_type);
-    }
-  }
-  
-  r->headers_out.content_type.len = content_type.len;
-  r->headers_out.content_type.data = content_type.data;
-  r->headers_out.content_type_len = r->headers_out.content_type.len;
-  
-  len = format->len - 8 - 1 + 3*NGX_INT_T_LEN; //minus 8 sprintf
-  
-  if ((b = ngx_create_temp_buf(r->pool, len)) == NULL) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  b->last = ngx_sprintf(b->last, (char *)format->data, messages, last_seen==0 ? -1 : (ngx_int_t) time_elapsed ,subscribers);
-  
-  //lastly, set the content-length, because if the status code isn't 200, nginx may not do so automatically
-  r->headers_out.content_length_n = ngx_buf_size(b);
-  
-  if (ngx_http_send_header(r) > NGX_HTTP_SPECIAL_RESPONSE) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  
-  return ngx_http_output_filter(r, ngx_http_push_create_output_chain(b, r->pool, r->connection->log));
-}
-
-
-
-#define NGX_HTTP_PUSH_MAKE_CONTENT_TYPE(content_type, content_type_len, msg, pool)  \
-    if(((content_type) = ngx_palloc(pool, sizeof(*content_type)+content_type_len))!=NULL) { \
-        (content_type)->len=content_type_len;                                        \
-        (content_type)->data=(u_char *)((content_type)+1);                           \
-        ngx_memcpy(content_type->data, (msg)->content_type.data, content_type_len);  \
-    }
-
-#define NGX_HTTP_PUSH_OPTIONS_OK_MESSAGE "Go ahead"
-
-
-ngx_int_t ngx_push_longpoll_subscriber_enqueue(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *subscriber, ngx_int_t subscriber_timeout) {
-  ngx_http_cleanup_t                 *cln;
-  ngx_http_push_subscriber_cleanup_t *clndata;
-  ngx_http_request_t                 *r = subscriber->request;
-  //attach a cleaner to remove the request from the channel and handle shared buffer deallocation.
-  if ((cln=ngx_http_cleanup_add(r, sizeof(*clndata))) == NULL) { //make sure we can.
-    return NGX_ERROR;
-  }
-  cln->handler = (ngx_http_cleanup_pt) ngx_http_push_subscriber_cleanup;
-  clndata = (ngx_http_push_subscriber_cleanup_t *) cln->data;
-  clndata->channel=channel;
-  clndata->subscriber=subscriber;
-  clndata->buf_use_count=0;
-  clndata->buf=NULL;
-  clndata->rchain=NULL;
-  clndata->rpool=NULL;
-  subscriber->clndata=clndata;
-  
-  //set up subscriber timeout event
-  ngx_memzero(&subscriber->event, sizeof(subscriber->event));
-  if (subscriber_timeout > 0) {
-    subscriber->event.handler = ngx_http_push_clean_timeouted_subscriber;  
-    subscriber->event.data = subscriber;
-    subscriber->event.log = r->connection->log;
-    ngx_add_timer(&subscriber->event, subscriber_timeout * 1000);
-  }
-  
-  r->read_event_handler = ngx_http_test_reading;
-  r->write_event_handler = ngx_http_request_empty_handler;
-  r->main->count++; //this is the right way to hold and finalize the request... maybe
-  //r->keepalive = 1; //stayin' alive!!
-  return NGX_OK;
-}
-
-/*
-ngx_int_t ngx_push_longpoll_subscriber_dequeue(ngx_http_push_subscriber_t *subscriber) {
-  return NGX_OK;
-}
-*/
-
-static ngx_int_t ngx_http_push_response_channel_ptr_info(ngx_http_push_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code) {
-  time_t             last_seen = 0;
-  ngx_uint_t         subscribers = 0;
-  ngx_uint_t         messages = 0;
-  if(channel!=NULL) {
-    ngx_http_push_store->lock();
-    subscribers = channel->subscribers;
-    last_seen = channel->last_seen;
-    messages  = channel->messages;
-    ngx_http_push_store->unlock();
-    r->headers_out.status = status_code == (ngx_int_t) NULL ? NGX_HTTP_OK : status_code;
-    if (status_code == NGX_HTTP_CREATED) {
-      r->headers_out.status_line.len =sizeof("201 Created")- 1;
-      r->headers_out.status_line.data=(u_char *) "201 Created";
-    }
-    else if (status_code == NGX_HTTP_ACCEPTED) {
-      r->headers_out.status_line.len =sizeof("202 Accepted")- 1;
-      r->headers_out.status_line.data=(u_char *) "202 Accepted";
-    }
-    ngx_http_push_channel_info(r, messages, subscribers, last_seen);
-  }
-  else {
-    //404!
-    r->headers_out.status=NGX_HTTP_NOT_FOUND;
-    //just the headers, please. we don't care to describe the situation or
-    //respond with an html page
-    r->headers_out.content_length_n=0;
-    r->header_only = 1;
-    ngx_http_send_header(r);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t ngx_http_push_response_channel_info(ngx_str_t *channel_id, ngx_http_request_t *r, ngx_int_t status_code) {
-  ngx_http_push_channel_t        *channel;
-  ngx_http_push_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_http_push_module);
-  channel = channel_id == NULL ? NULL : ngx_http_push_store->find_channel(channel_id, cf->channel_timeout, NULL);
-  return ngx_http_push_response_channel_ptr_info(channel, r, status_code);
-}
-
-static ngx_int_t subscribe_longpoll_callback(ngx_int_t status, ngx_http_request_t *r) {
-  ngx_http_finalize_request(r, status);
-  return NGX_OK;
-}
-
-static ngx_int_t subscribe_intervalpoll_callback(ngx_http_push_msg_t *msg, ngx_int_t msg_search_outcome, ngx_http_request_t *r) {
-  ngx_chain_t                *chain;
-  ngx_str_t                  *content_type, *etag;
-  time_t                     last_modified;
-  switch(msg_search_outcome) {
-    case NGX_HTTP_PUSH_MESSAGE_EXPECTED:
-      //interval-polling subscriber requests get a 304 with their entity tags preserved.
-      if (r->headers_in.if_modified_since != NULL) {
-        r->headers_out.last_modified_time=ngx_http_parse_time(r->headers_in.if_modified_since->value.data, r->headers_in.if_modified_since->value.len);
-      }
-      if ((etag=ngx_http_push_subscriber_get_etag(r)) != NULL) {
-        ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ETAG, etag);
-      }
-      ngx_http_finalize_request(r, NGX_HTTP_NOT_MODIFIED);
-      return NGX_OK;
-      
-    case NGX_HTTP_PUSH_MESSAGE_FOUND:
-      ngx_http_push_alloc_for_subscriber_response(r->pool, 0, msg, &chain, &content_type, &etag, &last_modified);
-      ngx_http_push_prepare_response_to_subscriber_request(r, chain, content_type, etag, last_modified);
-      ngx_http_push_store->release_message(NULL, msg);
-      ngx_http_finalize_request(r, NGX_OK);
-      return NGX_OK;
-      
-    default:
-      ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-      return NGX_ERROR;
-  }
-}
-
-ngx_int_t ngx_http_push_subscriber_handler(ngx_http_request_t *r) {
-  ngx_http_push_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_http_push_module);
-  ngx_str_t                      *channel_id;
-  ngx_http_push_msg_id_t          msg_id;
-  
-  if((channel_id=ngx_http_push_get_channel_id(r, cf)) == NULL) {
-    return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  
-  switch(r->method) {
-    case NGX_HTTP_GET:
-      ngx_http_push_subscriber_get_msg_id(r, &msg_id);
-
-      r->main->count++; //let it linger until callback
-      switch(cf->subscriber_poll_mechanism) {
-        ngx_int_t                       msg_search_outcome;
-        
-        //for NGX_HTTP_PUSH_MECHANISM_LONGPOLL
-        case NGX_HTTP_PUSH_MECHANISM_INTERVALPOLL:
-          ngx_http_push_store->get_message(channel_id, &msg_id, &msg_search_outcome, r, &subscribe_intervalpoll_callback);
-          break;
-          
-        case NGX_HTTP_PUSH_MECHANISM_LONGPOLL:
-          ngx_http_push_store->subscribe(channel_id, &msg_id, r, &subscribe_longpoll_callback);
-          break;
-      }
-      return NGX_DONE;
-    
-    case NGX_HTTP_OPTIONS:
-      ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,  &NGX_HTTP_PUSH_ANYSTRING);
-      ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_HEADERS, &NGX_HTTP_PUSH_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS);
-      ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_METHODS, &NGX_HTTP_PUSH_ALLOW_GET_OPTIONS);
-      r->headers_out.content_length_n = 0;
-      r->header_only = 1;
-      r->headers_out.status=NGX_HTTP_OK;
-      ngx_http_send_header(r);
-      return NGX_OK;
-      
-    default:
-      ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ALLOW, &NGX_HTTP_PUSH_ALLOW_GET_OPTIONS); //valid HTTP for the win
-      return NGX_HTTP_NOT_ALLOWED;
-  }
-}
-
-static ngx_int_t publish_callback(ngx_int_t status, ngx_http_push_channel_t *ch, ngx_http_request_t *r) {
-  switch(status) {
-    case NGX_HTTP_PUSH_MESSAGE_QUEUED:
-      //message was queued successfully, but there were no subscribers to receive it.
-      ngx_http_finalize_request(r, ngx_http_push_response_channel_ptr_info(ch, r, NGX_HTTP_ACCEPTED));
-      return NGX_OK;
-      
-    case NGX_HTTP_PUSH_MESSAGE_RECEIVED:
-      //message was queued successfully, and it was already sent to at least one subscriber
-      ngx_http_finalize_request(r, ngx_http_push_response_channel_ptr_info(ch, r, NGX_HTTP_CREATED));
-      return NGX_OK;
-      
-    case NGX_ERROR:
-      //WTF?
-      ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: error broadcasting message to workers");
-      ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-      return NGX_ERROR;
-      
-    default:
-      //for debugging, mostly. I don't expect this branch to behit during regular operation
-      ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: TOTALLY UNEXPECTED error broadcasting message to workers");
-      ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-      return NGX_ERROR;
-  }
-}
-
-static void ngx_http_push_publisher_body_handler(ngx_http_request_t * r) {
-  ngx_str_t                      *channel_id;
-  ngx_http_push_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_http_push_module);
-  ngx_uint_t                      method = r->method;
-  
-  if((channel_id = ngx_http_push_get_channel_id(r, cf))==NULL) {
-    ngx_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
-    return;
-  }
-  
-  switch(method) {
-    case NGX_HTTP_POST:
-    case NGX_HTTP_PUT:
-      ngx_http_push_store->publish(channel_id, r, &publish_callback);
-      break;
-      
-    case NGX_HTTP_DELETE:
-      ngx_http_finalize_request(r, ngx_http_push_response_channel_info(channel_id, r, NGX_HTTP_OK));
-      ngx_http_push_store->delete_channel(channel_id);
-      break;
-      
-    case NGX_HTTP_GET:
-      ngx_http_finalize_request(r, ngx_http_push_response_channel_info(channel_id, r, NGX_HTTP_OK));
-      break;
-      
-    case NGX_HTTP_OPTIONS:
-      ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, &NGX_HTTP_PUSH_ANYSTRING);
-      ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_HEADERS,  &NGX_HTTP_PUSH_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS);
-      ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ACCESS_CONTROL_ALLOW_METHODS, &NGX_HTTP_PUSH_ALLOW_GET_POST_PUT_DELETE_OPTIONS);
-      r->header_only = 1;
-      r->headers_out.content_length_n = 0;
-      r->headers_out.status=NGX_HTTP_OK;
-      ngx_http_send_header(r);
-      ngx_http_finalize_request(r, NGX_HTTP_OK);
-      break;
-      
-    default:
-      //some other weird request method
-      ngx_http_push_add_response_header(r, &NGX_HTTP_PUSH_HEADER_ALLOW, &NGX_HTTP_PUSH_ALLOW_GET_POST_PUT_DELETE_OPTIONS);
-      ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
-      break;
-  }
-}
-
-ngx_int_t ngx_http_push_respond_to_subscribers(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *sentinel, ngx_http_push_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line) {
-
-  //copy everything we need first
-  ngx_str_t                  *content_type=NULL;
-  ngx_str_t                  *etag=NULL;
-  time_t                      last_modified;
-  ngx_chain_t                *chain=NULL;
-  ngx_http_request_t         *r;
-  ngx_buf_t                  *buffer;
-  ngx_chain_t                *rchain;
-  ngx_buf_t                  *rbuffer;
-  ngx_int_t                  *buf_use_count;
-  ngx_http_push_subscriber_cleanup_t *clndata;
-  ngx_http_push_subscriber_t *cur=NULL;
-  ngx_int_t                   responded_subscribers=0;
-
-  if(sentinel==NULL) {
-    //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "respond_to_subscribers with sentinel==NULL");
-    return NGX_OK;
-  }
-  
-  if(msg!=NULL) {
-    if(ngx_http_push_alloc_for_subscriber_response(ngx_http_push_pool, 1, msg, &chain, &content_type, &etag, &last_modified)==NGX_ERROR) {
-      ngx_http_push_store->release_message(channel, msg);
-      return NGX_ERROR;
-    }
-    
-    buffer = chain->buf;
-    buffer->recycled = 1;
-
-    buf_use_count = ngx_pcalloc(ngx_http_push_pool, sizeof(*buf_use_count));
-    *buf_use_count = ngx_http_push_store->channel_worker_subscribers(sentinel);
-  }
-    
-  while((cur=ngx_http_push_store->next_subscriber(channel, sentinel, cur, 1))!=NULL) {
-    //in this block, nothing in shared memory should be dereferenced.
-    r=cur->request;
-
-    if(msg!=NULL) {
-      //chain and buffer for this request
-      rchain = ngx_pcalloc(r->pool, sizeof(*rchain));
-      rchain->next = NULL;
-      rbuffer = ngx_pcalloc(r->pool, sizeof(*rbuffer));
-      rchain->buf = rbuffer;
-      ngx_memcpy(rbuffer, buffer, sizeof(*buffer));
-
-      //request buffer cleanup
-      clndata = cur->clndata;
-      clndata->buf = buffer;
-      clndata->buf_use_count = buf_use_count;
-      clndata->rchain = rchain;
-      clndata->rpool = r->pool;
-
-      if (rbuffer->in_file && (fcntl(rbuffer->file->fd, F_GETFD) == -1)) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: buffer in invalid file descriptor");
-      }
-      //cleanup oughtn't dequeue anything. or decrement the subscriber count, for that matter
-      ngx_http_push_subscriber_clear_ctx(cur);
-      ngx_http_finalize_request(r, ngx_http_push_prepare_response_to_subscriber_request(r, rchain, content_type, etag, last_modified)); //BAM!
-    }
-    else {
-      ngx_http_push_subscriber_clear_ctx(cur);
-      ngx_http_finalize_request(r, ngx_http_push_respond_status_only(r, status_code, status_line));
-    }
-    responded_subscribers++;
-  }
-  if(msg!=NULL) {
-    ngx_http_push_store->release_message(channel, msg);
-    ngx_pfree(ngx_http_push_pool, etag);
-    ngx_pfree(ngx_http_push_pool, content_type);
-    ngx_pfree(ngx_http_push_pool, chain);
-  }
-  
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "respond_to_subscribers with msg %p finished", msg);
-  ngx_http_push_store->lock();
-  channel->subscribers-=responded_subscribers;
-  //is the message still needed?
-  ngx_http_push_store->unlock();
-  ngx_http_push_store->release_subscriber_sentinel(channel, sentinel);
-  return NGX_OK;
-}
-
-ngx_int_t ngx_http_push_publisher_handler(ngx_http_request_t * r) {
-  ngx_int_t                       rc;
-  
-  /* Instruct ngx_http_read_subscriber_request_body to store the request
-     body entirely in a memory buffer or in a file */
-  r->request_body_in_single_buf = 1;
-  r->request_body_in_persistent_file = 1;
-  r->request_body_in_clean_file = 0;
-  r->request_body_file_log_level = 0;
-
-  rc = ngx_http_read_client_request_body(r, ngx_http_push_publisher_body_handler);
-  if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-    return rc;
-  }
-  return NGX_DONE;
-}
-
-void ngx_http_push_copy_preallocated_buffer(ngx_buf_t *buf, ngx_buf_t *cbuf) {
-  if (cbuf!=NULL) {
-    ngx_memcpy(cbuf, buf, sizeof(*buf)); //overkill?
-    if(buf->temporary || buf->memory) { //we don't want to copy mmpapped memory, so no ngx_buf_in_momory(buf)
-      cbuf->pos = (u_char *) (cbuf+1);
-      cbuf->last = cbuf->pos + ngx_buf_size(buf);
-      cbuf->start=cbuf->pos;
-      cbuf->end = cbuf->start + ngx_buf_size(buf);
-      ngx_memcpy(cbuf->pos, buf->pos, ngx_buf_size(buf));
-      cbuf->memory=ngx_buf_in_memory_only(buf) ? 1 : 0;
-    }
-    if (buf->file!=NULL) {
-      cbuf->file = (ngx_file_t *) (cbuf+1) + ((buf->temporary || buf->memory) ? ngx_buf_size(buf) : 0);
-      cbuf->file->fd=NGX_INVALID_FILE;
-      cbuf->file->log=NULL;
-      cbuf->file->offset=buf->file->offset;
-      cbuf->file->sys_offset=buf->file->sys_offset;
-      cbuf->file->name.len=buf->file->name.len;
-      cbuf->file->name.data=(u_char *) (cbuf->file+1);
-      ngx_memcpy(cbuf->file->name.data, buf->file->name.data, buf->file->name.len);
-    }
-  }
-}
diff --git a/debian/modules/nginx-http-push/src/ngx_http_push_module.h b/debian/modules/nginx-http-push/src/ngx_http_push_module.h
deleted file mode 100644
index 7c79cde..0000000
--- a/debian/modules/nginx-http-push/src/ngx_http_push_module.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <ngx_http.h>
-#include <ngx_http_push_types.h>
-#include <ngx_http_push_defs.h>
-#include <store/ngx_http_push_store.h>
-
-
-extern ngx_pool_t *ngx_http_push_pool;
-extern ngx_int_t ngx_http_push_worker_processes;
-extern ngx_module_t ngx_http_push_module;
-extern ngx_http_push_store_t *ngx_http_push_store;
-
-ngx_int_t ngx_http_push_respond_status_only(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *statusline);
-void ngx_http_push_clean_timeouted_subscriber(ngx_event_t *ev);
-ngx_int_t ngx_http_push_allow_caching(ngx_http_request_t *r);
-ngx_int_t ngx_http_push_subscriber_get_msg_id(ngx_http_request_t *r, ngx_http_push_msg_id_t *id);
-void ngx_http_push_subscriber_cleanup(ngx_http_push_subscriber_cleanup_t *data);
-ngx_str_t * ngx_http_push_subscriber_get_etag(ngx_http_request_t * r);
-ngx_table_elt_t * ngx_http_push_add_response_header(ngx_http_request_t *r, const ngx_str_t *header_name, const ngx_str_t *header_value);
-ngx_chain_t * ngx_http_push_create_output_chain(ngx_buf_t *buf, ngx_pool_t *pool, ngx_log_t *log);
-ngx_int_t ngx_http_push_prepare_response_to_subscriber_request(ngx_http_request_t *r, ngx_chain_t *chain, ngx_str_t *content_type, ngx_str_t *etag, time_t last_modified);
-ngx_int_t ngx_push_longpoll_subscriber_enqueue(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *subscriber, ngx_int_t subscriber_timeout);
-ngx_int_t ngx_push_longpoll_subscriber_dequeue(ngx_http_push_subscriber_t *subscriber);
-ngx_int_t ngx_http_push_alloc_for_subscriber_response(ngx_pool_t *pool, ngx_int_t shared, ngx_http_push_msg_t *msg, ngx_chain_t **chain, ngx_str_t **content_type, ngx_str_t **etag, time_t *last_modified);
-
-
-ngx_int_t ngx_http_push_subscriber_handler(ngx_http_request_t *r);
-ngx_int_t ngx_http_push_publisher_handler(ngx_http_request_t *r);
-ngx_int_t ngx_http_push_respond_to_subscribers(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *sentinel, ngx_http_push_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line);
-ngx_int_t ngx_http_push_respond_status_only(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *statusline);
-ngx_int_t ngx_http_push_subscriber_get_etag_int(ngx_http_request_t * r);
-void ngx_http_push_copy_preallocated_buffer(ngx_buf_t *buf, ngx_buf_t *cbuf);
diff --git a/debian/modules/nginx-http-push/src/ngx_http_push_module_setup.c b/debian/modules/nginx-http-push/src/ngx_http_push_module_setup.c
deleted file mode 100644
index ea05d93..0000000
--- a/debian/modules/nginx-http-push/src/ngx_http_push_module_setup.c
+++ /dev/null
@@ -1,361 +0,0 @@
-ngx_module_t  ngx_http_push_module;
-
-static ngx_int_t ngx_http_push_init_module(ngx_cycle_t *cycle) {
-  ngx_core_conf_t                *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-  ngx_http_push_worker_processes = ccf->worker_processes;
-  //initialize subscriber queues
-  //pool, please
-  if((ngx_http_push_pool = ngx_create_pool(NGX_CYCLE_POOL_SIZE, cycle->log))==NULL) { //I trust the cycle pool size to be a well-tuned one.
-    return NGX_ERROR; 
-  }
-  
-  //initialize storage engine
-  return ngx_http_push_store->init_module(cycle);
-}
-
-static ngx_int_t ngx_http_push_init_worker(ngx_cycle_t *cycle) {
-  if (ngx_process != NGX_PROCESS_WORKER) {
-    //not a worker, stop initializing stuff.
-    return NGX_OK;
-  }
-  
-  if(ngx_http_push_store->init_worker(cycle)!=NGX_OK) {
-    return NGX_ERROR;
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t ngx_http_push_postconfig(ngx_conf_t *cf) {
-  return ngx_http_push_store->init_postconfig(cf);
-}
-
-//main config
-static void * ngx_http_push_create_main_conf(ngx_conf_t *cf) {
-  ngx_http_push_main_conf_t      *mcf = ngx_pcalloc(cf->pool, sizeof(*mcf));
-  if(mcf == NULL) {
-    return NGX_CONF_ERROR;
-  }
-  
-  ngx_http_push_store->create_main_conf(cf, mcf);
-  
-  return mcf;
-}
-
-//location config stuff
-static void *ngx_http_push_create_loc_conf(ngx_conf_t *cf) {
-  ngx_http_push_loc_conf_t       *lcf = ngx_pcalloc(cf->pool, sizeof(*lcf));
-  if(lcf == NULL) {
-    return NGX_CONF_ERROR;
-  }
-  lcf->buffer_timeout=NGX_CONF_UNSET;
-  lcf->max_messages=NGX_CONF_UNSET;
-  lcf->min_messages=NGX_CONF_UNSET;
-  lcf->subscriber_concurrency=NGX_CONF_UNSET;
-  lcf->subscriber_poll_mechanism=NGX_CONF_UNSET;
-  lcf->subscriber_timeout=NGX_CONF_UNSET;
-  lcf->authorize_channel=NGX_CONF_UNSET;
-  lcf->delete_oldest_received_message=NGX_CONF_UNSET;
-  lcf->max_channel_id_length=NGX_CONF_UNSET;
-  lcf->max_channel_subscribers=NGX_CONF_UNSET;
-  lcf->ignore_queue_on_no_cache=NGX_CONF_UNSET;
-  lcf->channel_timeout=NGX_CONF_UNSET;
-  lcf->channel_group.data=NULL;
-  return lcf;
-}
-
-static char *  ngx_http_push_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
-  ngx_http_push_loc_conf_t       *prev = parent, *conf = child;
-  ngx_conf_merge_sec_value(conf->buffer_timeout, prev->buffer_timeout, NGX_HTTP_PUSH_DEFAULT_BUFFER_TIMEOUT);
-  ngx_conf_merge_value(conf->max_messages, prev->max_messages, NGX_HTTP_PUSH_DEFAULT_MAX_MESSAGES);
-  ngx_conf_merge_value(conf->min_messages, prev->min_messages, NGX_HTTP_PUSH_DEFAULT_MIN_MESSAGES);
-  ngx_conf_merge_value(conf->subscriber_concurrency, prev->subscriber_concurrency, NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_BROADCAST);
-  ngx_conf_merge_value(conf->subscriber_poll_mechanism, prev->subscriber_poll_mechanism, NGX_HTTP_PUSH_MECHANISM_LONGPOLL);
-  ngx_conf_merge_sec_value(conf->subscriber_timeout, prev->subscriber_timeout, NGX_HTTP_PUSH_DEFAULT_SUBSCRIBER_TIMEOUT);
-  ngx_conf_merge_value(conf->authorize_channel, prev->authorize_channel, 0);
-  ngx_conf_merge_value(conf->delete_oldest_received_message, prev->delete_oldest_received_message, 0);
-  ngx_conf_merge_value(conf->max_channel_id_length, prev->max_channel_id_length, NGX_HTTP_PUSH_MAX_CHANNEL_ID_LENGTH);
-  ngx_conf_merge_value(conf->max_channel_subscribers, prev->max_channel_subscribers, 0);
-  ngx_conf_merge_value(conf->ignore_queue_on_no_cache, prev->ignore_queue_on_no_cache, 0);
-  ngx_conf_merge_value(conf->channel_timeout, prev->channel_timeout, NGX_HTTP_PUSH_DEFAULT_CHANNEL_TIMEOUT);
-  ngx_conf_merge_str_value(conf->channel_group, prev->channel_group, "");
-  
-  //sanity checks
-  if(conf->max_messages < conf->min_messages) {
-    //min/max buffer size makes sense?
-    ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "push_max_message_buffer_length cannot be smaller than push_min_message_buffer_length.");
-    return NGX_CONF_ERROR;
-  }
-  
-  return NGX_CONF_OK;
-}
-
-static ngx_str_t  ngx_http_push_channel_id = ngx_string("push_channel_id"); //channel id variable
-//publisher and subscriber handlers now.
-static char *ngx_http_push_setup_handler(ngx_conf_t *cf, void * conf, ngx_int_t (*handler)(ngx_http_request_t *)) {
-  ngx_http_core_loc_conf_t       *clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-  ngx_http_push_loc_conf_t       *plcf = conf;
-  clcf->handler = handler;
-  clcf->if_modified_since = NGX_HTTP_IMS_OFF;
-  plcf->index = ngx_http_get_variable_index(cf, &ngx_http_push_channel_id);
-  if (plcf->index == NGX_ERROR) {
-    return NGX_CONF_ERROR;
-  }
-  return NGX_CONF_OK;
-}
-
-typedef struct {
-  char                           *str;
-  ngx_int_t                       val;
-} ngx_http_push_strval_t;
-
-static ngx_int_t ngx_http_push_strval(ngx_str_t string, ngx_http_push_strval_t strval[], ngx_int_t strval_len, ngx_int_t *val) {
-  ngx_int_t                      i;
-  for(i=0; i<strval_len; i++) {
-    if(ngx_strncasecmp(string.data, (u_char *)strval[i].str, string.len)==0) {
-      *val = strval[i].val;
-      return NGX_OK;
-    }
-  }
-  return NGX_DONE; //nothing matched
-}
-
-static char *ngx_http_push_set_subscriber_concurrency(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  static ngx_http_push_strval_t  concurrency[] = {
-    { "first"    , NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_FIRSTIN   },
-    { "last"     , NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_LASTIN    },
-    { "broadcast", NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_BROADCAST }
-  };
-  ngx_int_t                      *field = (ngx_int_t *) ((char *) conf + cmd->offset);
-  
-  if (*field != NGX_CONF_UNSET) {
-    return "is duplicate";
-  }
-  
-  ngx_str_t                   value = (((ngx_str_t *) cf->args->elts)[1]);
-  if(ngx_http_push_strval(value, concurrency, 3, field)!=NGX_OK) {
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "invalid push_subscriber_concurrency value: %V", &value);
-    return NGX_CONF_ERROR;
-  }
-
-  return NGX_CONF_OK;
-}
-
-static char *ngx_http_push_publisher(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  return ngx_http_push_setup_handler(cf, conf, &ngx_http_push_publisher_handler);
-}
-
-static char *ngx_http_push_subscriber(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  static ngx_http_push_strval_t  mech[] = {
-    { "interval-poll", NGX_HTTP_PUSH_MECHANISM_INTERVALPOLL },
-    { "long-poll"    , NGX_HTTP_PUSH_MECHANISM_LONGPOLL     }  
-  };
-  ngx_int_t                      *field = (ngx_int_t *) ((char *) conf + cmd->offset);
-  if (*field != NGX_CONF_UNSET) {
-    return "is duplicate";
-  }
-  
-  if(cf->args->nelts==1) { //no argument given
-    *field = NGX_HTTP_PUSH_MECHANISM_LONGPOLL; //default
-  }
-  else {
-    ngx_str_t                   value = (((ngx_str_t *) cf->args->elts)[1]);
-    if(ngx_http_push_strval(value, mech, 2, field)!=NGX_OK) {
-      ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "invalid push_subscriber value: %V", &value);
-      return NGX_CONF_ERROR;
-    }
-  }
-  
-  return ngx_http_push_setup_handler(cf, conf, &ngx_http_push_subscriber_handler);
-}
-
-static void ngx_http_push_exit_worker(ngx_cycle_t *cycle) {
-  ngx_http_push_store->exit_worker(cycle);
-}
-
-static void ngx_http_push_exit_master(ngx_cycle_t *cycle) {
-  ngx_http_push_store->exit_master(cycle);
-}
-
-static char *ngx_http_push_set_message_buffer_length(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  char                           *p = conf;
-  ngx_int_t                      *min, *max;
-  ngx_str_t                      *value;
-  ngx_int_t                       intval;
-  min = (ngx_int_t *) (p + offsetof(ngx_http_push_loc_conf_t, min_messages));
-  max = (ngx_int_t *) (p + offsetof(ngx_http_push_loc_conf_t, max_messages));
-  if(*min != NGX_CONF_UNSET || *max != NGX_CONF_UNSET) {
-    return "is duplicate";
-  }
-  value = cf->args->elts;
-  if((intval = ngx_atoi(value[1].data, value[1].len))==NGX_ERROR) {
-    return "invalid number";
-  }
-  *min = intval;
-  *max = intval;
-  
-  return NGX_CONF_OK;
-}
-
-static char *ngx_http_push_store_messages_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  char    *p = conf;
-  ngx_str_t *val = cf->args->elts;
-
-  
-  if (ngx_strcasecmp(val[1].data, (u_char *) "off") == 0) {
-    ngx_int_t *min, *max;
-    min = (ngx_int_t *) (p + offsetof(ngx_http_push_loc_conf_t, min_messages));
-    max = (ngx_int_t *) (p + offsetof(ngx_http_push_loc_conf_t, max_messages));
-    *min=0;
-    *max=0;
-  }
-  return NGX_CONF_OK;
-}
-
-static ngx_command_t  ngx_http_push_commands[] = {
-
-    { ngx_string("push_message_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_sec_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, buffer_timeout),
-      NULL },
-
-    { ngx_string("push_max_reserved_memory"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_push_main_conf_t, shm_size),
-      NULL },
-    
-  { ngx_string("push_min_message_buffer_length"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, min_messages),
-      NULL },
-  
-  { ngx_string("push_max_message_buffer_length"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, max_messages),
-      NULL },
-    
-  { ngx_string("push_message_buffer_length"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_http_push_set_message_buffer_length,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-    
-  { ngx_string("push_delete_oldest_received_message"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, delete_oldest_received_message),
-      NULL },
-
-  { ngx_string("push_publisher"),
-      NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
-      ngx_http_push_publisher,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-  
-  { ngx_string("push_subscriber"),
-      NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1,
-      ngx_http_push_subscriber,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, subscriber_poll_mechanism),
-      NULL },
-  
-    { ngx_string("push_subscriber_concurrency"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_http_push_set_subscriber_concurrency,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, subscriber_concurrency),
-      NULL },
-  
-    { ngx_string("push_subscriber_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_sec_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, subscriber_timeout),
-      NULL },
-    
-  { ngx_string("push_authorized_channels_only"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, authorize_channel),
-      NULL },
-    
-  { ngx_string("push_store_messages"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_http_push_store_messages_directive,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-    
-  { ngx_string("push_channel_group"),
-      NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, channel_group),
-      NULL },
-    
-  { ngx_string("push_max_channel_id_length"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, max_channel_id_length),
-      NULL },
-    
-  { ngx_string("push_max_channel_subscribers"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, max_channel_subscribers),
-      NULL },
-    { ngx_string("push_ignore_queue_on_no_cache"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, ignore_queue_on_no_cache),
-      NULL },
-
-    { ngx_string("push_channel_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_sec_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_push_loc_conf_t, channel_timeout),
-      NULL },
-
-    ngx_null_command
-};
-
-static ngx_http_module_t  ngx_http_push_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    ngx_http_push_postconfig,              /* postconfiguration */
-    ngx_http_push_create_main_conf,        /* create main configuration */
-    NULL,                                  /* init main configuration */
-    NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
-    ngx_http_push_create_loc_conf,         /* create location configuration */
-    ngx_http_push_merge_loc_conf,          /* merge location configuration */
-};
-
-ngx_module_t  ngx_http_push_module = {
-    NGX_MODULE_V1,
-    &ngx_http_push_module_ctx,             /* module context */
-    ngx_http_push_commands,                /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    ngx_http_push_init_module,             /* init module */
-    ngx_http_push_init_worker,             /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    ngx_http_push_exit_worker,             /* exit process */
-    ngx_http_push_exit_master,             /* exit master */
-    NGX_MODULE_V1_PADDING
-};
diff --git a/debian/modules/nginx-http-push/src/ngx_http_push_types.h b/debian/modules/nginx-http-push/src/ngx_http_push_types.h
deleted file mode 100644
index 656d9de..0000000
--- a/debian/modules/nginx-http-push/src/ngx_http_push_types.h
+++ /dev/null
@@ -1,120 +0,0 @@
-//on with the declarations
-typedef struct {
-  size_t                          shm_size;
-} ngx_http_push_main_conf_t;
-
-typedef struct {
-  ngx_atomic_int_t  lock;
-  ngx_atomic_t      mutex;
-  ngx_int_t         write_pid;
-} ngx_rwlock_t;
-
-
-typedef struct {
-  time_t                          time; //tag message by time
-  ngx_int_t                       tag;  //used in conjunction with message_time if more than one message have the same time.
-} ngx_http_push_msg_id_t;
-
-//message queue
-typedef struct {
-  ngx_queue_t                     queue; //this MUST be first.
-  ngx_str_t                       content_type;
-  //  ngx_str_t                       charset;
-  ngx_buf_t                      *buf;
-  time_t                          expires;
-  ngx_uint_t                      delete_oldest_received_min_messages; //NGX_MAX_UINT32_VALUE for 'never'
-  time_t                          message_time; //tag message by time
-  ngx_int_t                       message_tag;  //used in conjunction with message_time if more than one message have the same time.
-  ngx_int_t                       refcount;
-} ngx_http_push_msg_t;
-
-typedef struct ngx_http_push_subscriber_cleanup_s ngx_http_push_subscriber_cleanup_t;
-
-//subscriber request queue
-typedef struct {
-  ngx_queue_t                     queue; //this MUST be first.
-  ngx_http_request_t             *request;
-  ngx_http_push_subscriber_cleanup_t *clndata; 
-  ngx_event_t                     event;
-} ngx_http_push_subscriber_t;
-
-typedef struct {
-  ngx_queue_t                     queue;
-  pid_t                           pid;
-  ngx_int_t                       slot;
-  ngx_http_push_subscriber_t     *subscriber_sentinel;
-} ngx_http_push_pid_queue_t; 
-
-//our typecast-friendly rbtree node (channel)
-typedef struct {
-  ngx_rbtree_node_t               node; //this MUST be first.
-  ngx_str_t                       id;
-  ngx_http_push_msg_t            *message_queue;
-  ngx_uint_t                      messages;
-  ngx_http_push_pid_queue_t      *workers_with_subscribers;
-  ngx_uint_t                      subscribers;
-  time_t                          last_seen;
-  time_t                          expires;
-} ngx_http_push_channel_t; 
-
-//cleaning supplies
-struct ngx_http_push_subscriber_cleanup_s {
-  ngx_http_push_subscriber_t    *subscriber;
-  ngx_http_push_channel_t       *channel;
-  ngx_int_t                     *buf_use_count;
-  ngx_buf_t                     *buf;
-  ngx_chain_t                   *rchain;
-  ngx_pool_t                    *rpool;
-};
-
-//garbage collecting goodness
-typedef struct {
-  ngx_queue_t                     queue;
-  ngx_http_push_channel_t        *channel;
-} ngx_http_push_channel_queue_t;
-
-//messages to worker processes
-typedef struct {
-  ngx_queue_t                     queue;
-  ngx_http_push_msg_t            *msg; //->shared memory
-  ngx_int_t                       status_code;
-  ngx_pid_t                       pid; 
-  ngx_http_push_channel_t        *channel; //->shared memory
-  ngx_http_push_subscriber_t     *subscriber_sentinel; //->a worker's local pool
-} ngx_http_push_worker_msg_t;
-
-typedef struct {
-  ngx_queue_t                    queue;
-  ngx_rwlock_t                   lock;
-} ngx_http_push_worker_msg_sentinel_t;
-
-//shared memory
-typedef struct {
-  ngx_rbtree_t                          tree;
-  ngx_uint_t                            channels; //# of channels being used
-  ngx_uint_t                            messages; //# of channels being used
-  ngx_http_push_worker_msg_sentinel_t  *ipc; //interprocess stuff
-} ngx_http_push_shm_data_t;
-
-typedef struct {
-  ngx_int_t                       index;
-  time_t                          buffer_timeout;
-  ngx_int_t                       min_messages;
-  ngx_int_t                       max_messages;
-  ngx_int_t                       subscriber_concurrency;
-  ngx_int_t                       subscriber_poll_mechanism;
-  time_t                          subscriber_timeout;
-  ngx_int_t                       authorize_channel;
-  ngx_int_t                       delete_oldest_received_message;
-  ngx_str_t                       channel_group;
-  ngx_int_t                       max_channel_id_length;
-  ngx_int_t                       max_channel_subscribers;
-  ngx_int_t                       ignore_queue_on_no_cache;
-  time_t                          channel_timeout;
-} ngx_http_push_loc_conf_t;
-
-typedef struct {
-  char *subtype;
-  size_t len;
-  const ngx_str_t *format;
-} ngx_http_push_content_subtype_t;
diff --git a/debian/modules/nginx-http-push/src/store/memory/store.c b/debian/modules/nginx-http-push/src/store/memory/store.c
deleted file mode 100755
index 65fa04c..0000000
--- a/debian/modules/nginx-http-push/src/store/memory/store.c
+++ /dev/null
@@ -1,1180 +0,0 @@
-#include <ngx_http_push_module.h>
-
-#include "store.h"
-#include <store/rbtree_util.h>
-#include <store/ngx_rwlock.h>
-#include <store/ngx_http_push_module_ipc.h>
-
-#define NGX_HTTP_PUSH_BROADCAST_CHECK(val, fail, r, errormessage)             \
-    if (val == fail) {                                                        \
-        ngx_log_error(NGX_LOG_ERR, (r)->connection->log, 0, errormessage);    \
-        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);         \
-        return NULL;                                                          \
-  }
-
-#define NGX_HTTP_PUSH_BROADCAST_CHECK_LOCKED(val, fail, r, errormessage, shpool) \
-    if (val == fail) {                                                        \
-        ngx_shmtx_unlock(&(shpool)->mutex);                                   \
-        ngx_log_error(NGX_LOG_ERR, (r)->connection->log, 0, errormessage);    \
-        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);         \
-        return NULL;                                                          \
-    }
-
-#define NGX_HTTP_BUF_ALLOC_SIZE(buf)                                          \
-    (sizeof(*buf) +                                                           \
-   (((buf)->temporary || (buf)->memory) ? ngx_buf_size(buf) : 0) +          \
-   (((buf)->file!=NULL) ? (sizeof(*(buf)->file) + (buf)->file->name.len + 1) : 0))
-
-#define ENQUEUED_DBG "msg %p enqueued.  ref:%i, p:%p n:%p"
-#define CREATED_DBG  "msg %p created    ref:%i, p:%p n:%p"
-#define FREED_DBG    "msg %p freed.     ref:%i, p:%p n:%p"
-#define RESERVED_DBG "msg %p reserved.  ref:%i, p:%p n:%p"
-#define RELEASED_DBG "msg %p released.  ref:%i, p:%p n:%p"
-
-//#define DEBUG_SHM_ALLOC 1
-
-static ngx_http_push_channel_queue_t channel_gc_sentinel;
-static ngx_slab_pool_t    *ngx_http_push_shpool = NULL;
-static ngx_shm_zone_t     *ngx_http_push_shm_zone = NULL;
-
-static ngx_int_t ngx_http_push_store_send_worker_message(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *subscriber_sentinel, ngx_pid_t pid, ngx_int_t worker_slot, ngx_http_push_msg_t *msg, ngx_int_t status_code);
-
-static ngx_int_t ngx_http_push_channel_collector(ngx_http_push_channel_t * channel) {
-  if((ngx_http_push_clean_channel_locked(channel))!=NULL) { //we're up for deletion
-    ngx_http_push_channel_queue_t *trashy;
-    if((trashy = ngx_alloc(sizeof(*trashy), ngx_cycle->log))!=NULL) {
-      //yeah, i'm allocating memory during garbage collection. sue me.
-      trashy->channel=channel;
-      ngx_queue_insert_tail(&channel_gc_sentinel.queue, &trashy->queue);
-      return NGX_OK;
-    }
-    return NGX_ERROR;
-  }
-  return NGX_OK;
-}
-
-static void ngx_http_push_store_lock_shmem(void){
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-}
-static void ngx_http_push_store_unlock_shmem(void){
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-}
-
-//garbage-collecting slab allocator
-static void * ngx_http_push_slab_alloc_locked(size_t size, char *label) {
-  void  *p;
-  if((p = ngx_slab_alloc_locked(ngx_http_push_shpool, size))==NULL) {
-    ngx_http_push_channel_queue_t *ccur, *cnext;
-    ngx_uint_t                  collected = 0;
-    //failed. emergency garbage sweep, then.
-    
-    //collect channels
-    ngx_queue_init(&channel_gc_sentinel.queue);
-    ngx_http_push_walk_rbtree(ngx_http_push_channel_collector, ngx_http_push_shm_zone);
-    for(ccur=(ngx_http_push_channel_queue_t *)ngx_queue_next(&channel_gc_sentinel.queue); ccur != &channel_gc_sentinel; ccur=cnext) {
-      cnext = (ngx_http_push_channel_queue_t *)ngx_queue_next(&ccur->queue);
-      ngx_http_push_delete_channel_locked(ccur->channel, ngx_http_push_shm_zone);
-      ngx_free(ccur);
-      collected++;
-    }
-    
-    //todo: collect worker messages maybe
-    
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "push module: out of shared memory. emergency garbage collection deleted %ui unused channels.", collected);
-    
-    p = ngx_slab_alloc_locked(ngx_http_push_shpool, size);
-  }
-#if (DEBUG_SHM_ALLOC == 1)
-  if (p != NULL) {
-    if(label==NULL)
-      label="none";
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool alloc addr %p size %ui label %s", p, size, label);
-  }
-#endif
-  return p;
-}
-
-static void * ngx_http_push_slab_alloc(size_t size, char *label) {
-  void * p;
-  ngx_http_push_store_lock_shmem();
-  p= ngx_http_push_slab_alloc_locked(size, label);
-  ngx_http_push_store_unlock_shmem();
-  return p;
-}
-
-static void ngx_http_push_slab_free_locked(void *ptr) {
-  ngx_slab_free_locked(ngx_http_push_shpool, ptr);
-  #if (DEBUG_SHM_ALLOC == 1)
-  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool free addr %p", ptr);
-  #endif
-}
-/*
-static void ngx_http_push_slab_free(void *ptr) {
-  ngx_http_push_store_lock_shmem();
-  ngx_http_push_slab_free_locked(ptr);
-  ngx_http_push_store_unlock_shmem();
-}*/
-
-//shpool is assumed to be locked.
-static ngx_http_push_msg_t *ngx_http_push_get_latest_message_locked(ngx_http_push_channel_t * channel) {
-  ngx_queue_t                    *sentinel = &channel->message_queue->queue; 
-  if(ngx_queue_empty(sentinel)) {
-    return NULL;
-  }
-  ngx_queue_t                    *qmsg = ngx_queue_last(sentinel);
-  return ngx_queue_data(qmsg, ngx_http_push_msg_t, queue);
-}
-
-//shpool must be locked. No memory is freed. O(1)
-static ngx_http_push_msg_t *ngx_http_push_get_oldest_message_locked(ngx_http_push_channel_t * channel) {
-  ngx_queue_t                    *sentinel = &channel->message_queue->queue; 
-  if(ngx_queue_empty(sentinel)) {
-    return NULL;
-  }
-  ngx_queue_t                    *qmsg = ngx_queue_head(sentinel);
-  return ngx_queue_data(qmsg, ngx_http_push_msg_t, queue);
-}
-
-static void ngx_http_push_store_reserve_message_locked(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg) {
-  if(msg == NULL) {
-    return;
-  }
-  msg->refcount++;
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, RESERVED_DBG, msg, msg->refcount, msg->queue.prev, msg->queue.next);
-  //we need a refcount because channel messages MAY be dequed before they are used up. It thus falls on the IPC stuff to free it.
-}
-
-static void ngx_http_push_store_reserve_message_num_locked(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg, ngx_int_t reservations) {
-  if(msg == NULL) {
-    return;
-  }
-  msg->refcount+=reservations;
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, RESERVED_DBG, msg, msg->refcount, msg->queue.prev, msg->queue.next);
-  //we need a refcount because channel messages MAY be dequed before they are used up. It thus falls on the IPC stuff to free it.
-}
-
-static void ngx_http_push_store_reserve_message(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg) {
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  ngx_http_push_store_reserve_message_locked(channel, msg);
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  //we need a refcount because channel messages MAY be dequed before they are used up. It thus falls on the IPC stuff to free it.
-}
-
-
-
-//free memory for a message. 
-static ngx_inline void ngx_http_push_free_message_locked(ngx_http_push_msg_t *msg, ngx_slab_pool_t *shpool) {
-  if(msg->buf->file!=NULL) {
-    // i'd like to release the shpool lock here while i do stuff to this file, but that 
-    // might unlock during channel rbtree traversal, which is Bad News.
-    if(msg->buf->file->fd!=NGX_INVALID_FILE) {
-      ngx_close_file(msg->buf->file->fd);
-    }
-    ngx_delete_file(msg->buf->file->name.data); //should I care about deletion errors? doubt it.
-  }
-  ngx_http_push_slab_free_locked(msg->buf); //separate block, remember?
-  ngx_http_push_slab_free_locked(msg);
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, FREED_DBG, msg, msg->refcount, msg->queue.prev, msg->queue.next);
-  if(msg->refcount < 0) { //something worth exploring went wrong
-    raise(SIGSEGV);
-  }
-  ((ngx_http_push_shm_data_t *) ngx_http_push_shm_zone->data)->messages--;
-}
-
-// remove a message from queue and free all associated memory. assumes shpool is already locked.
-static ngx_int_t ngx_http_push_delete_message_locked(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg, ngx_int_t force) {
-  if (msg==NULL) {
-    return NGX_OK;
-  }
-  if(channel!=NULL) {
-    ngx_queue_remove(&msg->queue);
-    channel->messages--;
-  }
-  if(msg->refcount<=0 || force) {
-    //nobody needs this message, or we were forced at integer-point to delete
-    ngx_http_push_free_message_locked(msg, ngx_http_push_shpool);
-  }
-  return NGX_OK;
-}
-
-static void ngx_http_push_store_release_message_locked(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg) {
-  if(msg == NULL) {
-    return;
-  }
-  msg->refcount--;
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, RELEASED_DBG, msg, msg->refcount, msg->queue.prev, msg->queue.next);
-  if(msg->queue.next==NULL && msg->refcount<=0) { 
-    //message had been dequeued and nobody needs it anymore
-    ngx_http_push_free_message_locked(msg, ngx_http_push_shpool);
-  }
-  if(channel != NULL && channel->messages > msg->delete_oldest_received_min_messages && ngx_http_push_get_oldest_message_locked(channel) == msg) {
-    ngx_http_push_delete_message_locked(channel, msg, 0);
-  }
-}
-
-static void ngx_http_push_store_release_message(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg) {
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  ngx_http_push_store_release_message_locked(channel, msg);
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-}
-
-static ngx_int_t ngx_http_push_delete_message(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg, ngx_int_t force) {
-  ngx_int_t ret;
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  ret = ngx_http_push_delete_message_locked(channel, msg, force);
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  return ret;
-}
-
-
-/** find message with entity tags matching those of the request r.
-  * @param r subscriber request
-  */
-static ngx_http_push_msg_t * ngx_http_push_find_message_locked(ngx_http_push_channel_t *channel, ngx_http_push_msg_id_t *msgid, ngx_int_t *status) {
-  //TODO: consider using an RBTree for message storage.
-  ngx_queue_t                    *sentinel = &channel->message_queue->queue;
-  ngx_queue_t                    *cur = ngx_queue_head(sentinel);
-  ngx_http_push_msg_t            *msg;
-  
-  time_t                          time = msgid->time;
-  ngx_int_t                       tag = msgid->tag;
-  
-  //channel's message buffer empty?
-  if(channel->messages==0) {
-    *status=NGX_HTTP_PUSH_MESSAGE_EXPECTED; //wait.
-    return NULL;
-  }
-  
-  // do we want a future message?
-  msg = ngx_queue_data(sentinel->prev, ngx_http_push_msg_t, queue); 
-  if(time <= msg->message_time) { //that's an empty check (Sentinel's values are zero)
-    if(time == msg->message_time) {
-      if(tag >= msg->message_tag) {
-        *status=NGX_HTTP_PUSH_MESSAGE_EXPECTED;
-        return NULL;
-      }
-    }
-  }
-  else {
-    *status=NGX_HTTP_PUSH_MESSAGE_EXPECTED;
-    return NULL;
-  }
-  
-  while(cur!=sentinel) {
-    msg = ngx_queue_data(cur, ngx_http_push_msg_t, queue);
-    if (time < msg->message_time) {
-      *status = NGX_HTTP_PUSH_MESSAGE_FOUND;
-      return msg;
-    }
-    else if(time == msg->message_time) {
-      while (tag >= msg->message_tag  && time == msg->message_time && ngx_queue_next(cur)!=sentinel) {
-        cur=ngx_queue_next(cur);
-        msg = ngx_queue_data(cur, ngx_http_push_msg_t, queue);
-      }
-      if(time == msg->message_time && tag < msg->message_tag) {
-        *status = NGX_HTTP_PUSH_MESSAGE_FOUND;
-        return msg;
-      }
-      continue;
-    }
-    cur=ngx_queue_next(cur);
-  }
-  *status = NGX_HTTP_PUSH_MESSAGE_EXPIRED; //message too old and was not found.
-  return NULL;
-}
-
-static ngx_http_push_channel_t * ngx_http_push_store_find_channel(ngx_str_t *id, time_t channel_timeout, ngx_int_t (*callback)(ngx_http_push_channel_t *channel)) {
-  //get the channel and check channel authorization while we're at it.
-  ngx_http_push_channel_t        *channel;
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  channel = ngx_http_push_find_channel(id, channel_timeout, ngx_http_push_shm_zone);
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  if(callback!=NULL) {
-    callback(channel);
-  }
-  return channel;
-}
-
-//temporary cheat
-static ngx_int_t ngx_http_push_store_publish_raw(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line) {
-  
-  //subscribers are queued up in a local pool. Queue heads, however, are located
-  //in shared memory, identified by pid.
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  ngx_http_push_pid_queue_t     *sentinel = channel->workers_with_subscribers;
-  ngx_http_push_subscriber_t    *subscriber_sentinels[NGX_MAX_PROCESSES];
-  ngx_http_push_pid_queue_t     *pid_queues[NGX_MAX_PROCESSES];
-  ngx_int_t                      sub_sentinel_count=0;
-  
-  ngx_http_push_pid_queue_t     *cur;
-  ngx_int_t                      i, received;
-  received = channel->subscribers > 0 ? NGX_HTTP_PUSH_MESSAGE_RECEIVED : NGX_HTTP_PUSH_MESSAGE_QUEUED;
-  
-  //we need to reserve the message for all the workers in advance
-  for(cur=(ngx_http_push_pid_queue_t *)ngx_queue_next(&sentinel->queue); cur != sentinel; cur=(ngx_http_push_pid_queue_t *)ngx_queue_next(&cur->queue)) {
-    if(cur->subscriber_sentinel != NULL) {
-      pid_queues[sub_sentinel_count] = cur;
-      subscriber_sentinels[sub_sentinel_count] = cur->subscriber_sentinel;
-      /*
-       *     each time all of a worker's subscribers are removed, so is the sentinel. 
-       *     this is done to make garbage collection easier. Assuming we want to avoid
-       *     placing the sentinel in shared memory (for now -- it's a little tricky
-       *     to debug), the owner of the worker pool must be the one to free said sentinel.
-       *     But channels may be deleted by different worker processes, and it seems unwieldy
-       *     (for now) to do IPC just to delete one stinkin' sentinel. Hence a new sentinel
-       *     is used every time the subscriber queue is emptied.
-       */
-      cur->subscriber_sentinel = NULL; //think about it it terms of garbage collection. it'll make sense. sort of.
-      sub_sentinel_count++;
-    }
-  }
-  if(sub_sentinel_count > 0) {
-    ngx_http_push_store_reserve_message_num_locked(channel, msg, sub_sentinel_count);
-  }
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  
-  ngx_http_push_subscriber_t *subscriber_sentinel=NULL;
-  for(i=0; i < sub_sentinel_count; i++) {
-    ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-    subscriber_sentinel = subscriber_sentinels[i];
-    pid_t           worker_pid  = pid_queues[i]->pid;
-    ngx_int_t       worker_slot = pid_queues[i]->slot;
-    ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-    //if(msg != NULL)
-    //  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "publish msg %p (ref: %i) for worker %i (slot %i)", msg, msg->refcount, worker_pid, worker_slot);
-    
-    
-    if(subscriber_sentinel != NULL) {
-      if(worker_pid == ngx_pid) {
-        //my subscribers
-        ngx_http_push_respond_to_subscribers(channel, subscriber_sentinel, msg, status_code, status_line);
-      }
-      else {
-        //some other worker's subscribers
-        //interprocess communication breakdown
-        if(ngx_http_push_store_send_worker_message(channel, subscriber_sentinel, worker_pid, worker_slot, msg, status_code) != NGX_ERROR) {
-          ngx_http_push_alert_worker(worker_pid, worker_slot);
-        }
-        else {
-          ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: error communicating with some other worker process");
-        }
-      }
-    } else {
-      //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "subscriber sentinel is NULL");
-    }
-    
-    
-  }
-  return received;
-}
-
-static ngx_int_t ngx_http_push_store_delete_channel(ngx_str_t *channel_id) {
-  ngx_http_push_channel_t        *channel;
-  ngx_http_push_msg_t            *msg, *sentinel;
-  ngx_http_push_store_lock_shmem();
-  channel = ngx_http_push_find_channel(channel_id, NGX_HTTP_PUSH_DEFAULT_CHANNEL_TIMEOUT, ngx_http_push_shm_zone);
-  if (channel == NULL) {
-    ngx_http_push_store_unlock_shmem();
-    return NGX_OK;
-  }
-  sentinel = channel->message_queue; 
-  msg = sentinel;
-        
-  while((msg=(ngx_http_push_msg_t *)ngx_queue_next(&msg->queue))!=sentinel) {
-    //force-delete all the messages
-    ngx_http_push_delete_message_locked(NULL, msg, 1);
-  }
-  channel->messages=0;
-  
-  //410 gone
-  ngx_http_push_store_unlock_shmem();
-  
-  ngx_http_push_store_publish_raw(channel, NULL, NGX_HTTP_GONE, &NGX_HTTP_PUSH_HTTP_STATUS_410);
-  
-  ngx_http_push_store_lock_shmem();
-  ngx_http_push_delete_channel_locked(channel, ngx_http_push_shm_zone);
-  ngx_http_push_store_unlock_shmem();
-  return NGX_OK;
-}
-
-static ngx_http_push_channel_t * ngx_http_push_store_get_channel(ngx_str_t *id, time_t channel_timeout, ngx_int_t (*callback)(ngx_http_push_channel_t *channel)) {
-  //get the channel and check channel authorization while we're at it.
-  ngx_http_push_channel_t        *channel;
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  channel = ngx_http_push_get_channel(id, channel_timeout, ngx_http_push_shm_zone);
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  if(channel==NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: unable to allocate memory for new channel");
-  }
-  if(callback!=NULL) {
-    callback(channel);
-  }
-  return channel;
-}
-
-static ngx_http_push_msg_t * ngx_http_push_store_get_channel_message(ngx_http_push_channel_t *channel, ngx_http_push_msg_id_t *msgid, ngx_int_t *msg_search_outcome, ngx_http_push_loc_conf_t *cf) {
-  ngx_http_push_msg_t *msg;
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  msg = ngx_http_push_find_message_locked(channel, msgid, msg_search_outcome);
-  if(*msg_search_outcome == NGX_HTTP_PUSH_MESSAGE_FOUND) {
-    ngx_http_push_store_reserve_message_locked(channel, msg);
-  }
-  channel->last_seen = ngx_time();
-  channel->expires = ngx_time() + cf->channel_timeout;
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  return msg;
-}
-
-static ngx_int_t default_get_message_callback(ngx_http_push_msg_t *msg, ngx_int_t msg_search_outcome, ngx_http_request_t *r) {
-  return NGX_OK;
-}
-
-static ngx_http_push_msg_t * ngx_http_push_store_get_message(ngx_str_t *channel_id, ngx_http_push_msg_id_t *msg_id, ngx_int_t *msg_search_outcome, ngx_http_request_t *r, ngx_int_t (*callback)(ngx_http_push_msg_t *msg, ngx_int_t msg_search_outcome, ngx_http_request_t *r)) {
-  ngx_http_push_channel_t            *channel;
-  ngx_http_push_msg_t                *msg;
-  if(callback==NULL) {
-    callback=&default_get_message_callback;
-  }
-  ngx_http_push_store_lock_shmem();
-  channel = ngx_http_push_get_channel(channel_id, NGX_HTTP_PUSH_DEFAULT_CHANNEL_TIMEOUT, ngx_http_push_shm_zone);
-  ngx_http_push_store_unlock_shmem();
-  if (channel == NULL) {
-    return NULL;
-  }
-  msg = ngx_http_push_store_get_channel_message(channel, msg_id, msg_search_outcome, ngx_http_get_module_loc_conf(r, ngx_http_push_module));
-  callback(msg, *msg_search_outcome, r);
-  return msg;
-}
-
-// shared memory zone initializer
-static ngx_int_t  ngx_http_push_init_shm_zone(ngx_shm_zone_t * shm_zone, void *data) {
-  if(data) { /* zone already initialized */
-    shm_zone->data = data;
-    return NGX_OK;
-  }
-
-  ngx_slab_pool_t                *shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-  ngx_rbtree_node_t              *sentinel;
-  ngx_http_push_shm_data_t       *d;
-  
-  ngx_http_push_shpool = shpool; //we'll be using this a bit.
-  #if (DEBUG_SHM_ALLOC == 1)
-  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "ngx_http_push_shpool start %p size %i", shpool->start, (u_char *)shpool->end - (u_char *)shpool->start);
-  #endif
-  
-  if ((d = (ngx_http_push_shm_data_t *)ngx_http_push_slab_alloc(sizeof(*d), "shm data")) == NULL) { //shm_data
-    return NGX_ERROR;
-  }
-  d->channels=0;
-  d->messages=0;
-  shm_zone->data = d;
-  d->ipc=NULL;
-  //initialize rbtree
-  if ((sentinel = ngx_http_push_slab_alloc(sizeof(*sentinel), "channel rbtree sentinel"))==NULL) {
-    return NGX_ERROR;
-  }
-  ngx_rbtree_init(&d->tree, sentinel, ngx_http_push_rbtree_insert);
-  return NGX_OK;
-}
-
-//shared memory
-static ngx_str_t  ngx_push_shm_name = ngx_string("push_module"); //shared memory segment name
-static ngx_int_t  ngx_http_push_set_up_shm(ngx_conf_t *cf, size_t shm_size) {
-  ngx_http_push_shm_zone = ngx_shared_memory_add(cf, &ngx_push_shm_name, shm_size, &ngx_http_push_module);
-  if (ngx_http_push_shm_zone == NULL) {
-    return NGX_ERROR;
-  }
-  ngx_http_push_shm_zone->init = ngx_http_push_init_shm_zone;
-  ngx_http_push_shm_zone->data = (void *) 1; 
-  return NGX_OK;
-}
-
-//initialization
-static ngx_int_t ngx_http_push_store_init_module(ngx_cycle_t *cycle) {
-  ngx_core_conf_t                *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-  ngx_http_push_worker_processes = ccf->worker_processes;
-  //initialize our little IPC
-  return ngx_http_push_init_ipc(cycle, ngx_http_push_worker_processes);
-}
-
-//will be called once per worker
-static ngx_int_t ngx_http_push_store_init_ipc_shm(ngx_int_t workers) {
-  ngx_slab_pool_t                *shpool = (ngx_slab_pool_t *) ngx_http_push_shm_zone->shm.addr;
-  ngx_http_push_shm_data_t       *d = (ngx_http_push_shm_data_t *) ngx_http_push_shm_zone->data;
-  ngx_http_push_worker_msg_sentinel_t     *worker_messages=NULL;
-  ngx_shmtx_lock(&shpool->mutex);
-  if(d->ipc==NULL) {
-    //ipc uninitialized. get it done!
-    if((worker_messages = ngx_http_push_slab_alloc_locked(sizeof(*worker_messages)*NGX_MAX_PROCESSES, "IPC worker message sentinel array"))==NULL) {
-      ngx_shmtx_unlock(&shpool->mutex);
-      return NGX_ERROR;
-    }
-    d->ipc=worker_messages;
-  }
-  else {
-    worker_messages=d->ipc;
-  }
-  
-  ngx_queue_init(&worker_messages[ngx_process_slot].queue);
-  ngx_rwlock_init(&worker_messages[ngx_process_slot].lock);
-  
-  ngx_shmtx_unlock(&shpool->mutex);
-  return NGX_OK;
-}
-
-static ngx_int_t ngx_http_push_store_init_worker(ngx_cycle_t *cycle) {
-  ngx_core_conf_t                *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-  if(ngx_http_push_store_init_ipc_shm(ccf->worker_processes) == NGX_OK) {
-    return ngx_http_push_ipc_init_worker(cycle);
-  }
-  else {
-    return NGX_ERROR;
-  }
-}
-
-static ngx_int_t ngx_http_push_store_init_postconfig(ngx_conf_t *cf) {
-  ngx_http_push_main_conf_t *conf = ngx_http_conf_get_module_main_conf(cf, ngx_http_push_module);
-
-  //initialize shared memory
-  size_t                       shm_size;
-  if(conf->shm_size==NGX_CONF_UNSET_SIZE) {
-    conf->shm_size=NGX_HTTP_PUSH_DEFAULT_SHM_SIZE;
-  }
-  shm_size = ngx_align(conf->shm_size, ngx_pagesize);
-  if (shm_size < 8 * ngx_pagesize) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "The push_max_reserved_memory value must be at least %udKiB", (8 * ngx_pagesize) >> 10);
-        shm_size = 8 * ngx_pagesize;
-    }
-  if(ngx_http_push_shm_zone && ngx_http_push_shm_zone->shm.size != shm_size) {
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Cannot change memory area size without restart, ignoring change");
-  }
-  ngx_conf_log_error(NGX_LOG_INFO, cf, 0, "Using %udKiB of shared memory for push module", shm_size >> 10);
-  
-  return ngx_http_push_set_up_shm(cf, shm_size);
-}
-
-static void ngx_http_push_store_create_main_conf(ngx_conf_t *cf, ngx_http_push_main_conf_t *mcf) {
-  mcf->shm_size=NGX_CONF_UNSET_SIZE;
-}
-
-//great justice appears to be at hand
-static ngx_int_t ngx_http_push_movezig_channel_locked(ngx_http_push_channel_t * channel) {
-  ngx_queue_t                 *sentinel = &channel->message_queue->queue;
-  ngx_http_push_msg_t         *msg=NULL;
-  while(!ngx_queue_empty(sentinel)) {
-    msg = ngx_queue_data(ngx_queue_head(sentinel), ngx_http_push_msg_t, queue);
-    ngx_http_push_delete_message_locked(channel, msg, 1);
-  }
-  return NGX_OK;
-}
-static ngx_int_t ngx_http_push_store_channel_subscribers(ngx_http_push_channel_t * channel) {
-  ngx_int_t subs;
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  subs = channel->subscribers;
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  return subs;
-}
-
-static ngx_int_t ngx_http_push_store_channel_worker_subscribers(ngx_http_push_subscriber_t * worker_sentinel) {
-  ngx_http_push_subscriber_t *cur;
-  ngx_int_t count=0;
-  cur=(ngx_http_push_subscriber_t *)ngx_queue_head(&worker_sentinel->queue);
-  while(cur!=worker_sentinel) {
-    count++;
-    cur=(ngx_http_push_subscriber_t *)ngx_queue_next(&cur->queue);
-  }
-  return count;
-}
-
-static ngx_http_push_subscriber_t *ngx_http_push_store_channel_next_subscriber(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *sentinel, ngx_http_push_subscriber_t *cur, int release_previous) {
-  ngx_http_push_subscriber_t *next;
-  if(cur==NULL) {
-    next=(ngx_http_push_subscriber_t *)ngx_queue_head(&sentinel->queue);
-  }
-  else{
-    next=(ngx_http_push_subscriber_t *)ngx_queue_next(&cur->queue);
-    if(release_previous==1 && cur!=sentinel) {
-      //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "freeing subscriber cursor at %p.", cur);
-      ngx_pfree(ngx_http_push_pool, cur);
-    }
-  }
-  return next!=sentinel ? next : NULL;
-}
-
-static ngx_int_t ngx_http_push_store_channel_release_subscriber_sentinel(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *sentinel) {
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "freeing subscriber sentinel at %p.", sentinel);
-  ngx_pfree(ngx_http_push_pool, sentinel);
-  return NGX_OK;
-}
-
-static void ngx_http_push_store_exit_worker(ngx_cycle_t *cycle) {
-  ngx_http_push_ipc_exit_worker(cycle);
-}
-
-static void ngx_http_push_store_exit_master(ngx_cycle_t *cycle) {
-  //destroy channel tree in shared memory
-  ngx_http_push_walk_rbtree(ngx_http_push_movezig_channel_locked, ngx_http_push_shm_zone);
-  //deinitialize IPC
-  ngx_http_push_shutdown_ipc(cycle);
-}
-
-static ngx_http_push_subscriber_t * ngx_http_push_store_subscribe_raw(ngx_http_push_channel_t *channel, ngx_http_request_t *r) {
-  ngx_http_push_pid_queue_t  *sentinel, *cur, *found;
-  ngx_http_push_subscriber_t *subscriber;
-  ngx_http_push_subscriber_t *subscriber_sentinel;
-  //ngx_http_push_loc_conf_t   *cf = ngx_http_get_module_loc_conf(r, ngx_http_push_module);
-  
-  //subscribers are queued up in a local pool. Queue sentinels are separate and also local, but not in the pool.
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  sentinel = channel->workers_with_subscribers;
-  cur = (ngx_http_push_pid_queue_t *)ngx_queue_head(&sentinel->queue);
-  found = NULL;
-  
-  while(cur!=sentinel) {
-    if(cur->pid==ngx_pid) {
-      found = cur;
-      break;
-    }
-    cur = (ngx_http_push_pid_queue_t *)ngx_queue_next(&cur->queue);
-  }
-  if(found == NULL) { //found nothing
-    if((found=ngx_http_push_slab_alloc_locked(sizeof(*found), "worker subscriber sentinel"))==NULL) {
-      ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-      ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: unable to allocate worker subscriber queue marker in shared memory");
-      return NULL;
-    }
-    //initialize
-    ngx_queue_insert_tail(&sentinel->queue, &found->queue);
-    found->pid=ngx_pid;
-    found->slot=ngx_process_slot;
-    found->subscriber_sentinel=NULL;
-  }
-  if((subscriber = ngx_palloc(ngx_http_push_pool, sizeof(*subscriber)))==NULL) { //unable to allocate request queue element
-    ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: unable to allocate subscriber worker's memory pool");
-    return NULL;
-  }
-  channel->subscribers++; // do this only when we know everything went okay.
-  
-  //figure out the subscriber sentinel
-  subscriber_sentinel = ((ngx_http_push_pid_queue_t *)found)->subscriber_sentinel;
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "reserve subscriber sentinel at %p", subscriber_sentinel);
-  
-  if(subscriber_sentinel==NULL) {
-    //it's perfectly normal for the sentinel to be NULL.
-    if((subscriber_sentinel=ngx_palloc(ngx_http_push_pool, sizeof(*subscriber_sentinel)))==NULL) {
-      ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: unable to allocate channel subscriber sentinel");
-      return NULL;
-    }
-    ngx_queue_init(&subscriber_sentinel->queue);
-    ((ngx_http_push_pid_queue_t *)found)->subscriber_sentinel=subscriber_sentinel;
-  }
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "add to subscriber sentinel at %p", subscriber_sentinel);
-  ngx_queue_insert_tail(&subscriber_sentinel->queue, &subscriber->queue);
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  
-  subscriber->request = r;
-  return subscriber;
-}
-
-static ngx_int_t ngx_http_push_handle_subscriber_concurrency(ngx_http_push_channel_t *channel, ngx_http_request_t *r, ngx_http_push_loc_conf_t *cf) {
-  ngx_int_t                      max_subscribers = cf->max_channel_subscribers;
-  ngx_int_t                      current_subscribers = ngx_http_push_store->channel_subscribers(channel) ;
-  
-  
-  if(current_subscribers==0) { 
-    //empty channels are always okay.
-    return NGX_OK;
-  }  
-  
-  if(max_subscribers!=0 && current_subscribers >= max_subscribers) {
-    //max_channel_subscribers setting
-    ngx_http_push_respond_status_only(r, NGX_HTTP_FORBIDDEN, NULL);
-    return NGX_DECLINED;
-  }
-  
-  //nonzero number of subscribers present
-  switch(cf->subscriber_concurrency) {
-    case NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_BROADCAST:
-      return NGX_OK;
-      
-    case NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_LASTIN:
-      //send "everyone" a 409 Conflict response.
-      //in most reasonable cases, there'll be at most one subscriber on the
-      //channel. However, since settings are bound to locations and not
-      //specific channels, this assumption need not hold. Hence this broadcast.
-      ngx_http_push_store_publish_raw(channel, NULL, NGX_HTTP_NOT_FOUND, &NGX_HTTP_PUSH_HTTP_STATUS_409);
-      
-      return NGX_OK;
-      
-    case NGX_HTTP_PUSH_SUBSCRIBER_CONCURRENCY_FIRSTIN:
-      ngx_http_push_respond_status_only(r, NGX_HTTP_NOT_FOUND, &NGX_HTTP_PUSH_HTTP_STATUS_409);
-      return NGX_DECLINED;
-      
-    default:
-      return NGX_ERROR;
-  }
-}
-
-static ngx_int_t default_subscribe_callback(ngx_int_t status, ngx_http_request_t *r) {
-  return status;
-}
-
-static ngx_int_t ngx_http_push_store_subscribe(ngx_str_t *channel_id, ngx_http_push_msg_id_t *msg_id, ngx_http_request_t *r, ngx_int_t (*callback)(ngx_int_t status, ngx_http_request_t *r)) {
-  ngx_http_push_channel_t        *channel;
-  ngx_http_push_msg_t            *msg;
-  ngx_int_t                       msg_search_outcome;
-  ngx_http_push_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_http_push_module);
-
-  
-  if(callback == NULL) {
-    callback=&default_subscribe_callback;
-  }
-  
-  if (cf->authorize_channel==1) {
-    channel = ngx_http_push_store_find_channel(channel_id, cf->channel_timeout, NULL);
-  }else{
-    channel = ngx_http_push_store_get_channel(channel_id, cf->channel_timeout, NULL);
-  }
-  if (channel==NULL) {
-    //unable to allocate channel OR channel not found
-    if(cf->authorize_channel) {
-      return callback(NGX_HTTP_FORBIDDEN, r);
-    }
-    else {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: unable to allocate shared memory for channel");
-      return callback(NGX_HTTP_INTERNAL_SERVER_ERROR, r);
-    }
-  }
-  
-  switch(ngx_http_push_handle_subscriber_concurrency(channel, r, cf)) {
-    case NGX_DECLINED: //this request was declined for some reason.
-      //status codes and whatnot should have already been written. just get out of here quickly.
-      return callback(NGX_OK, r);
-    case NGX_ERROR:
-      ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: error handling subscriber concurrency setting");
-      return callback(NGX_ERROR, r);
-  }
-  
-  
-  msg = ngx_http_push_store->get_channel_message(channel, msg_id, &msg_search_outcome, cf);
-  
-  if (cf->ignore_queue_on_no_cache && !ngx_http_push_allow_caching(r)) {
-    msg_search_outcome = NGX_HTTP_PUSH_MESSAGE_EXPECTED; 
-    msg = NULL;
-  }
-  
-  switch(msg_search_outcome) {
-    //for message-found:
-    ngx_str_t                  *etag;
-    ngx_str_t                  *content_type;
-    ngx_chain_t                *chain;
-    time_t                      last_modified;
-    ngx_http_push_subscriber_t *subscriber;
-    
-    case NGX_HTTP_PUSH_MESSAGE_EXPECTED:
-      // ♫ It's gonna be the future soon ♫
-      if ((subscriber = ngx_http_push_store_subscribe_raw(channel, r))==NULL) {
-        return callback(NGX_HTTP_INTERNAL_SERVER_ERROR, r);
-      }
-      if(ngx_push_longpoll_subscriber_enqueue(channel, subscriber, cf->subscriber_timeout) == NGX_OK) {
-        return callback(NGX_DONE, r);
-      }
-      else {
-        return callback(NGX_ERROR, r);
-      }
-    
-    case NGX_HTTP_PUSH_MESSAGE_EXPIRED:
-      //subscriber wants an expired message
-      //TODO: maybe respond with entity-identifiers for oldest available message?
-      return callback(NGX_HTTP_NO_CONTENT, r);
-      
-    case NGX_HTTP_PUSH_MESSAGE_FOUND:
-      ngx_http_push_alloc_for_subscriber_response(r->pool, 0, msg, &chain, &content_type, &etag, &last_modified);
-      ngx_int_t ret=ngx_http_push_prepare_response_to_subscriber_request(r, chain, content_type, etag, last_modified);
-      ngx_http_push_store->release_message(channel, msg);
-      return callback(ret, r);
-      
-    default: //we shouldn't be here.
-      return callback(NGX_HTTP_INTERNAL_SERVER_ERROR, r);
-  }
-}
-
-static ngx_str_t * ngx_http_push_store_etag_from_message(ngx_http_push_msg_t *msg, ngx_pool_t *pool){
-  ngx_str_t *etag;
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  if(pool!=NULL && (etag = ngx_palloc(pool, sizeof(*etag) + NGX_INT_T_LEN))==NULL) {
-    return NULL;
-  }
-  else if(pool==NULL && (etag = ngx_alloc(sizeof(*etag) + NGX_INT_T_LEN, ngx_cycle->log))==NULL) {
-    return NULL;
-  }
-  etag->data = (u_char *)(etag+1);
-  etag->len = ngx_sprintf(etag->data,"%ui", msg->message_tag)- etag->data;
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  return etag;
-}
-
-static ngx_str_t * ngx_http_push_store_content_type_from_message(ngx_http_push_msg_t *msg, ngx_pool_t *pool){
-  ngx_str_t *content_type;
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  if(pool != NULL && (content_type = ngx_palloc(pool, sizeof(*content_type) + msg->content_type.len))==NULL) {
-    return NULL;
-  }
-  else if(pool == NULL && (content_type = ngx_alloc(sizeof(*content_type) + msg->content_type.len, ngx_cycle->log))==NULL) {
-    return NULL;
-  }
-  content_type->data = (u_char *)(content_type+1);
-  content_type->len = msg->content_type.len;
-  ngx_memcpy(content_type->data, msg->content_type.data, content_type->len);
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  return content_type;
-}
-
-// this function adapted from push stream module. thanks Wandenberg Peixoto <wandenberg@gmail.com> and Rogério Carvalho Schneider <stockrt@gmail.com>
-static ngx_buf_t * ngx_http_push_request_body_to_single_buffer(ngx_http_request_t *r) {
-  ngx_buf_t *buf = NULL;
-  ngx_chain_t *chain;
-  ssize_t n;
-  off_t len;
-
-  chain = r->request_body->bufs;
-  if (chain->next == NULL) {
-    return chain->buf;
-  }
-  if (chain->buf->in_file) {
-    if (ngx_buf_in_memory(chain->buf)) {
-      ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: can't handle a buffer in a temp file and in memory ");
-    }
-    if (chain->next != NULL) {
-      ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: error reading request body with multiple ");
-    }
-    return chain->buf;
-  }
-  buf = ngx_create_temp_buf(r->pool, r->headers_in.content_length_n + 1);
-  if (buf != NULL) {
-    ngx_memset(buf->start, '\0', r->headers_in.content_length_n + 1);
-    while ((chain != NULL) && (chain->buf != NULL)) {
-      len = ngx_buf_size(chain->buf);
-      // if buffer is equal to content length all the content is in this buffer
-      if (len >= r->headers_in.content_length_n) {
-        buf->start = buf->pos;
-        buf->last = buf->pos;
-        len = r->headers_in.content_length_n;
-      }
-      if (chain->buf->in_file) {
-        n = ngx_read_file(chain->buf->file, buf->start, len, 0);
-        if (n == NGX_FILE_ERROR) {
-          ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "push module: cannot read file with request body");
-          return NULL;
-        }
-        buf->last = buf->last + len;
-        ngx_delete_file(chain->buf->file->name.data);
-        chain->buf->file->fd = NGX_INVALID_FILE;
-      } else {
-        buf->last = ngx_copy(buf->start, chain->buf->pos, len);
-      }
-
-      chain = chain->next;
-      buf->start = buf->last;
-    }
-  }
-  return buf;
-}
-
-
-static ngx_http_push_msg_t * ngx_http_push_store_create_message(ngx_http_push_channel_t *channel, ngx_http_request_t *r) {
-  ngx_buf_t                      *buf = NULL, *buf_copy;
-  size_t                          content_type_len;
-  ngx_http_push_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_http_push_module);
-  ngx_http_push_msg_t            *msg, *previous_msg;
-  
-  //first off, we'll want to extract the body buffer
-  
-  //note: this works mostly because of r->request_body_in_single_buf = 1; 
-  //which, i suppose, makes this module a little slower than it could be.
-  //this block is a little hacky. might be a thorn for forward-compatibility.
-  if(r->headers_in.content_length_n == -1 || r->headers_in.content_length_n == 0) {
-    buf = ngx_create_temp_buf(r->pool, 0);
-    //this buffer will get copied to shared memory in a few lines, 
-    //so it does't matter what pool we make it in.
-  }
-  else if(r->request_body->bufs!=NULL) {
-    buf = ngx_http_push_request_body_to_single_buffer(r);
-  }
-  else {
-    ngx_log_error(NGX_LOG_ERR, (r)->connection->log, 0, "push module: unexpected publisher message request body buffer location. please report this to the push module developers.");
-    return NULL;
-  }
-  
-  NGX_HTTP_PUSH_BROADCAST_CHECK(buf, NULL, r, "push module: can't find or allocate publisher request body buffer");
-      
-  content_type_len = (r->headers_in.content_type!=NULL ? r->headers_in.content_type->value.len : 0);
-  
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  
-  //create a buffer copy in shared mem
-  msg = ngx_http_push_slab_alloc_locked(sizeof(*msg) + content_type_len, "message + content_type");
-  NGX_HTTP_PUSH_BROADCAST_CHECK_LOCKED(msg, NULL, r, "push module: unable to allocate message in shared memory", ngx_http_push_shpool);
-  previous_msg=ngx_http_push_get_latest_message_locked(channel); //need this for entity-tags generation
-  
-  buf_copy = ngx_http_push_slab_alloc_locked(NGX_HTTP_BUF_ALLOC_SIZE(buf), "message buffer copy");
-  NGX_HTTP_PUSH_BROADCAST_CHECK_LOCKED(buf_copy, NULL, r, "push module: unable to allocate buffer in shared memory", ngx_http_push_shpool) //magic nullcheck
-  ngx_http_push_copy_preallocated_buffer(buf, buf_copy);
-  
-  msg->buf=buf_copy;
-  
-  //Stamp the new message with entity tags
-  msg->message_time=ngx_time(); //ESSENTIAL TODO: make sure this ends up producing GMT time
-  msg->message_tag=(previous_msg!=NULL && msg->message_time == previous_msg->message_time) ? (previous_msg->message_tag + 1) : 0;    
-  
-  //store the content-type
-  if(content_type_len>0) {
-    msg->content_type.len=r->headers_in.content_type->value.len;
-    msg->content_type.data=(u_char *) (msg+1); //we had reserved a contiguous chunk, myes?
-    ngx_memcpy(msg->content_type.data, r->headers_in.content_type->value.data, msg->content_type.len);
-  }
-  else {
-    msg->content_type.len=0;
-    msg->content_type.data=NULL;
-  }
-  
-  //queue stuff ought to be NULL
-  msg->queue.prev=NULL;
-  msg->queue.next=NULL;
-  
-  msg->refcount=0;
-  
-  //set message expiration time
-  time_t                  message_timeout = cf->buffer_timeout;
-  msg->expires = (message_timeout==0 ? 0 : (ngx_time() + message_timeout));
-  
-  msg->delete_oldest_received_min_messages = cf->delete_oldest_received_message ? (ngx_uint_t) cf->min_messages : NGX_MAX_UINT32_VALUE;
-  //NGX_MAX_UINT32_VALUE to disable, otherwise = min_message_buffer_size of the publisher location from whence the message came
-  
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, CREATED_DBG, msg, msg->refcount, msg->queue.prev, msg->queue.next);
-  return msg;
-}
-
-static ngx_int_t ngx_http_push_store_enqueue_message(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg, ngx_http_push_loc_conf_t *cf) {
-  ngx_shmtx_lock(&ngx_http_push_shpool->mutex);
-  ngx_queue_insert_tail(&channel->message_queue->queue, &msg->queue);
-  channel->messages++;
-  
-  //now see if the queue is too big
-  if(channel->messages > (ngx_uint_t) cf->max_messages) {
-    //exceeeds max queue size. don't force it, someone might still be using this message.
-    ngx_http_push_delete_message_locked(channel, ngx_http_push_get_oldest_message_locked(channel), 0);
-  }
-  if(channel->messages > (ngx_uint_t) cf->min_messages) {
-    //exceeeds min queue size. maybe delete the oldest message
-    //no, don't do anything for now. This feature is badly implemented and I think I'll deprecate it.
-  }
-
-  ngx_shmtx_unlock(&ngx_http_push_shpool->mutex);
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, ENQUEUED_DBG, msg, msg->refcount, msg->queue.prev, msg->queue.next);
-  return NGX_OK;
-}
-
-static ngx_int_t default_publish_callback(ngx_int_t status, ngx_http_push_channel_t *ch, ngx_http_request_t *r) {
-  return status;
-}
-
-static ngx_int_t ngx_http_push_store_publish_message(ngx_str_t *channel_id, ngx_http_request_t *r, ngx_int_t (*callback)(ngx_int_t status, ngx_http_push_channel_t *ch, ngx_http_request_t *r)) {
-  ngx_http_push_channel_t        *channel;
-  ngx_http_push_msg_t            *msg;
-  ngx_http_push_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_http_push_module);
-  ngx_int_t                       result=0;
-  if(callback==NULL) {
-    callback=&default_publish_callback;
-  }
-  if((channel=ngx_http_push_store_get_channel(channel_id, cf->channel_timeout, NULL))==NULL) { //always returns a channel, unless no memory left
-    return callback(NGX_ERROR, NULL, r);
-    //ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-  }
-  
-  if((msg = ngx_http_push_store_create_message(channel, r))==NULL) {
-    return callback(NGX_ERROR, channel, r);
-    //ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-  }
-  
-  if(cf->max_messages > 0) { //channel buffers exist
-    ngx_http_push_store_enqueue_message(channel, msg, cf);
-  }
-  else if(cf->max_messages == 0) {
-    ngx_http_push_store_reserve_message(NULL, msg);
-  }
-  result= ngx_http_push_store_publish_raw(channel, msg, 0, NULL);
-  return callback(result, channel, r);
-}
-
-static ngx_int_t ngx_http_push_store_send_worker_message(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *subscriber_sentinel, ngx_pid_t pid, ngx_int_t worker_slot, ngx_http_push_msg_t *msg, ngx_int_t status_code) {
-  ngx_http_push_worker_msg_sentinel_t   *worker_messages = ((ngx_http_push_shm_data_t *)ngx_http_push_shm_zone->data)->ipc;
-  ngx_http_push_worker_msg_sentinel_t   *sentinel = &worker_messages[worker_slot];
-  ngx_http_push_worker_msg_t            *newmessage;
-  if((newmessage=ngx_http_push_slab_alloc(sizeof(*newmessage), "IPC worker message"))==NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: unable to allocate worker message");
-    return NGX_ERROR;
-  }
-  newmessage->msg = msg;
-  newmessage->status_code = status_code;
-  newmessage->pid = pid;
-  newmessage->subscriber_sentinel = subscriber_sentinel;
-  newmessage->channel = channel;
-  
-  ngx_http_push_store_lock_shmem();
-  ngx_queue_insert_tail(&sentinel->queue, &newmessage->queue);
-  ngx_http_push_store_unlock_shmem();
-  return NGX_OK;
-  
-}
-
-static void ngx_http_push_store_receive_worker_message(void) {
-  ngx_http_push_worker_msg_t     *prev_worker_msg, *worker_msg;
-  ngx_http_push_worker_msg_sentinel_t    *sentinel;
-  const ngx_str_t                *status_line = NULL;
-  ngx_http_push_channel_t        *channel;
-  ngx_http_push_subscriber_t     *subscriber_sentinel;
-  ngx_int_t                       worker_msg_pid;
-  
-  ngx_int_t                       status_code;
-  ngx_http_push_msg_t            *msg;
-  
-  sentinel = &(((ngx_http_push_shm_data_t *)ngx_http_push_shm_zone->data)->ipc)[ngx_process_slot];
-  
-  ngx_http_push_store_lock_shmem();
-  worker_msg = (ngx_http_push_worker_msg_t *)ngx_queue_next(&sentinel->queue);
-  ngx_http_push_store_unlock_shmem();
-  while((void *)worker_msg != (void *)sentinel) {
-    
-    ngx_http_push_store_lock_shmem();
-    worker_msg_pid = worker_msg->pid;
-    ngx_http_push_store_unlock_shmem();
-    
-    if(worker_msg_pid == ngx_pid) {
-      //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "process_worker_message processing proper worker_msg ");
-      //everything is okay.
-      
-      ngx_http_push_store_lock_shmem();
-      status_code = worker_msg->status_code;
-      msg = worker_msg->msg;
-      channel = worker_msg->channel;
-      subscriber_sentinel = worker_msg->subscriber_sentinel;
-      ngx_http_push_store_unlock_shmem();
-      
-      if(msg==NULL) {
-        //just a status line, is all    
-        //status code only.
-        switch(status_code) {
-          case NGX_HTTP_CONFLICT:
-            status_line=&NGX_HTTP_PUSH_HTTP_STATUS_409;
-            break;
-            
-          case NGX_HTTP_GONE:
-            status_line=&NGX_HTTP_PUSH_HTTP_STATUS_410;
-            break;
-            
-          case 0:
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: worker message contains neither a channel message nor a status code");
-            //let's let the subscribers know that something went wrong and they might've missed a message
-            status_code = NGX_HTTP_INTERNAL_SERVER_ERROR; 
-            //intentional fall-through
-          default:
-            status_line=NULL;
-        }
-      }
-      
-      ngx_http_push_respond_to_subscribers(channel, subscriber_sentinel, msg, status_code, status_line);
-    }
-    else {
-      //that's quite bad you see. a previous worker died with an undelivered message.
-      //but all its subscribers' connections presumably got canned, too. so it's not so bad after all.
-      //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "process_worker_message processing INVALID worker_msg ");
-      
-      ngx_http_push_store_lock_shmem();
-      
-      ngx_http_push_pid_queue_t     *channel_worker_sentinel = worker_msg->channel->workers_with_subscribers;
-      
-      ngx_http_push_pid_queue_t     *channel_worker_cur = channel_worker_sentinel;
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: worker %i intercepted a message intended for another worker process (%i) that probably died", ngx_pid, worker_msg->pid);
-      
-      //delete that invalid sucker.
-      while((channel_worker_cur=(ngx_http_push_pid_queue_t *)ngx_queue_next(&channel_worker_cur->queue))!=channel_worker_sentinel) {
-        if(channel_worker_cur->pid == worker_msg->pid) {
-          ngx_queue_remove(&channel_worker_cur->queue);
-          ngx_http_push_slab_free_locked(channel_worker_cur);
-          break;
-        }
-      }
-      
-      ngx_http_push_store_unlock_shmem();
-      
-    }
-    //It may be worth it to memzero worker_msg for debugging purposes.
-    prev_worker_msg = worker_msg;
-    
-    ngx_http_push_store_lock_shmem();
-    worker_msg = (ngx_http_push_worker_msg_t *)ngx_queue_next(&worker_msg->queue);
-    ngx_http_push_slab_free_locked(prev_worker_msg);
-    ngx_http_push_store_unlock_shmem();
-
-  }
-  ngx_http_push_store_lock_shmem();
-  ngx_queue_init(&sentinel->queue); //reset the worker message sentinel
-  ngx_http_push_store_unlock_shmem();
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "process_worker_message finished");
-  return;
-}
-
-ngx_http_push_store_t  ngx_http_push_store_memory = {
-    //init
-    &ngx_http_push_store_init_module,
-    &ngx_http_push_store_init_worker,
-    &ngx_http_push_store_init_postconfig,
-    &ngx_http_push_store_create_main_conf,
-    
-    //shutdown
-    &ngx_http_push_store_exit_worker,
-    &ngx_http_push_store_exit_master,
-    
-    //async-friendly functions with callbacks
-    &ngx_http_push_store_get_message, //+callback
-    &ngx_http_push_store_subscribe, //+callback
-    &ngx_http_push_store_publish_message, //+callback
-    
-    //channel stuff,
-    &ngx_http_push_store_get_channel, //creates channel if not found, +callback
-    &ngx_http_push_store_find_channel, //returns channel or NULL if not found, +callback
-    &ngx_http_push_store_delete_channel,
-    
-    &ngx_http_push_store_get_channel_message,
-    &ngx_http_push_store_reserve_message,
-    &ngx_http_push_store_release_message,
-    
-    //channel properties
-    &ngx_http_push_store_channel_subscribers,
-    &ngx_http_push_store_channel_worker_subscribers,
-    &ngx_http_push_store_channel_next_subscriber,
-    &ngx_http_push_store_channel_release_subscriber_sentinel,
-
-    //legacy shared-memory store helpers
-    &ngx_http_push_store_lock_shmem,
-    &ngx_http_push_store_unlock_shmem,
-    &ngx_http_push_slab_alloc_locked,
-    &ngx_http_push_slab_free_locked,
-    
-    //message stuff
-    &ngx_http_push_store_create_message,
-    &ngx_http_push_delete_message,
-    &ngx_http_push_delete_message_locked,
-    &ngx_http_push_store_enqueue_message,
-    &ngx_http_push_store_etag_from_message,
-    &ngx_http_push_store_content_type_from_message,
-    
-    //interprocess communication
-    &ngx_http_push_store_send_worker_message,
-    &ngx_http_push_store_receive_worker_message
-    
-
-};
diff --git a/debian/modules/nginx-http-push/src/store/memory/store.h b/debian/modules/nginx-http-push/src/store/memory/store.h
deleted file mode 100644
index cb9dea3..0000000
--- a/debian/modules/nginx-http-push/src/store/memory/store.h
+++ /dev/null
@@ -1 +0,0 @@
-extern ngx_http_push_store_t  ngx_http_push_store_memory;
\ No newline at end of file
diff --git a/debian/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.c b/debian/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.c
deleted file mode 100644
index ba37224..0000000
--- a/debian/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.c
+++ /dev/null
@@ -1,146 +0,0 @@
-//worker processes of the world, unite.
-#include <ngx_http_push_module.h>
-#include <ngx_channel.h>
-#include <store/ngx_http_push_module_ipc.h>
-
-static void ngx_http_push_channel_handler(ngx_event_t *ev);
-#define NGX_CMD_HTTP_PUSH_CHECK_MESSAGES 49
-
-static ngx_socket_t                       ngx_http_push_socketpairs[NGX_MAX_PROCESSES][2];
-ngx_int_t ngx_http_push_init_ipc(ngx_cycle_t *cycle, ngx_int_t workers) {
-//initialize socketpairs for workers in advance.
-    static int invalid_sockets_initialized = 0;
-    int                             i, s = 0, on = 1;
-    ngx_int_t                       last_expected_process = ngx_last_process;
-	
-    if(!invalid_sockets_initialized) {
-      for(i=0; i< NGX_MAX_PROCESSES; i++) {
-        ngx_http_push_socketpairs[i][0]=NGX_INVALID_FILE;
-        ngx_http_push_socketpairs[i][1]=NGX_INVALID_FILE;
-      }
-      invalid_sockets_initialized=1;
-    }
-    
-    /* here's the deal: we have no control over fork()ing, nginx's internal 
-     * socketpairs are unusable for our purposes (as of nginx 0.8 -- check the 
-     * code to see why), and the module initialization callbacks occur before
-     * any workers are spawned. Rather than futzing around with existing 
-     * socketpairs, we populate our own socketpairs array. 
-     * Trouble is, ngx_spawn_process() creates them one-by-one, and we need to 
-     * do it all at once. So we must guess all the workers' ngx_process_slots in 
-     * advance. Meaning the spawning logic must be copied to the T.
-     * ... with some allowances for already-opened sockets...
-     */
-	for(i=0; i < workers; i++) {
-		//copypasta from os/unix/ngx_process.c (ngx_spawn_process)
-        while (s < last_expected_process && ngx_processes[s].pid != -1) {
-          //find empty existing slot
-          s++;
-        }
-        ngx_socket_t               *socks = ngx_http_push_socketpairs[s];
-        if(socks[0] == NGX_INVALID_FILE || socks[1] == NGX_INVALID_FILE) {
-          //copypasta from os/unix/ngx_process.c (ngx_spawn_process)
-          if (socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "socketpair() failed on socketpair while initializing push module");
-            return NGX_ERROR;
-          }
-          if (ngx_nonblocking(socks[0]) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_nonblocking_n " failed on socketpair while initializing push module");
-            ngx_close_channel(socks, cycle->log);
-            return NGX_ERROR;
-          }
-          if (ngx_nonblocking(socks[1]) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_nonblocking_n " failed on socketpair while initializing push module");
-            ngx_close_channel(socks, cycle->log);
-            return NGX_ERROR;
-          }
-          if (ioctl(socks[0], FIOASYNC, &on) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "ioctl(FIOASYNC) failed on socketpair while initializing push module");
-            ngx_close_channel(socks, cycle->log);
-            return NGX_ERROR;
-          }
-          
-          if (fcntl(socks[0], F_SETOWN, ngx_pid) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "fcntl(F_SETOWN) failed on socketpair while initializing push module");
-            ngx_close_channel(socks, cycle->log);
-            return NGX_ERROR;
-          }
-          if (fcntl(socks[0], F_SETFD, FD_CLOEXEC) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "fcntl(FD_CLOEXEC) failed on socketpair while initializing push module");
-            ngx_close_channel(socks, cycle->log);
-            return NGX_ERROR;
-          }
-          
-          if (fcntl(socks[1], F_SETFD, FD_CLOEXEC) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "fcntl(FD_CLOEXEC) failed while initializing push module");
-            ngx_close_channel(socks, cycle->log);
-            return NGX_ERROR;
-          }
-        }
-        s++; //NEXT!!
-	}
-	return NGX_OK;
-}
-
-ngx_int_t ngx_http_push_shutdown_ipc(ngx_cycle_t *cycle) {
-  int i;
-  for (i=0; i<NGX_MAX_PROCESSES; i++) {
-    if(ngx_http_push_socketpairs[i][0] != NGX_INVALID_FILE || ngx_http_push_socketpairs[i][1] != NGX_INVALID_FILE) {
-      ngx_close_channel(ngx_http_push_socketpairs[i], cycle->log);
-    }
-  }
-  return NGX_OK;
-}
-
-void ngx_http_push_ipc_exit_worker(ngx_cycle_t *cycle) {
-  ngx_http_push_shutdown_ipc(cycle);
-}
- 
-ngx_int_t ngx_http_push_ipc_init_worker(ngx_cycle_t *cycle) {
-    if (ngx_add_channel_event(cycle, ngx_http_push_socketpairs[ngx_process_slot][1], NGX_READ_EVENT, ngx_http_push_channel_handler) == NGX_ERROR) {
-		ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "failed to register channel handler while initializing push module worker");
-		return NGX_ERROR;
-	}
-	return NGX_OK;
-}
-
-static void ngx_http_push_channel_handler(ngx_event_t *ev) {
-	//copypasta from os/unix/ngx_process_cycle.c (ngx_channel_handler)
-	ngx_int_t          n;
-	ngx_channel_t      ch;
-	ngx_connection_t  *c;
-	if (ev->timedout) {
-		ev->timedout = 0;
-		return;
-	}
-	c = ev->data;
-	
-	while(1) {
-		n = ngx_read_channel(c->fd, &ch, sizeof(ch), ev->log);
-		if (n == NGX_ERROR) {
-			if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
-				ngx_del_conn(c, 0);
-			}
-			ngx_close_connection(c);
-			return;
-		}
-		if ((ngx_event_flags & NGX_USE_EVENTPORT_EVENT) && (ngx_add_event(ev, NGX_READ_EVENT, 0) == NGX_ERROR)) {
-			return;
-		}
-		if (n == NGX_AGAIN) {
-			return;
-		}
-		//ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, "push module: channel command: %d", ch.command);
-
-		if (ch.command==NGX_CMD_HTTP_PUSH_CHECK_MESSAGES) {
-			ngx_http_push_store->receive_worker_message();
-		}
-	}
-}
-
-ngx_int_t ngx_http_push_alert_worker(ngx_pid_t pid, ngx_int_t slot) {
-	//seems ch doesn't need to have fd set. odd, but roll with it. pid and process slot also unnecessary.
-	static ngx_channel_t            ch = {NGX_CMD_HTTP_PUSH_CHECK_MESSAGES, 0, 0, -1};
-	return ngx_write_channel(ngx_http_push_socketpairs[slot][0], &ch, sizeof(ngx_channel_t), ngx_cycle->log);
-}
-
diff --git a/debian/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.h b/debian/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.h
deleted file mode 100644
index 01e7669..0000000
--- a/debian/modules/nginx-http-push/src/store/ngx_http_push_module_ipc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-ngx_int_t ngx_http_push_alert_worker(ngx_pid_t pid,ngx_int_t slot);
-ngx_int_t ngx_http_push_ipc_init_worker(ngx_cycle_t *cycle);
-void ngx_http_push_ipc_exit_worker(ngx_cycle_t *cycle);
-ngx_int_t ngx_http_push_shutdown_ipc(ngx_cycle_t *cycle);
-ngx_int_t ngx_http_push_init_ipc(ngx_cycle_t *cycle,ngx_int_t workers);
\ No newline at end of file
diff --git a/debian/modules/nginx-http-push/src/store/ngx_http_push_store.h b/debian/modules/nginx-http-push/src/store/ngx_http_push_store.h
deleted file mode 100755
index fb54d97..0000000
--- a/debian/modules/nginx-http-push/src/store/ngx_http_push_store.h
+++ /dev/null
@@ -1,51 +0,0 @@
-typedef struct {
-  //init
-  ngx_int_t (*init_module)(ngx_cycle_t *cycle);
-  ngx_int_t (*init_worker)(ngx_cycle_t *cycle);
-  ngx_int_t (*init_postconfig)(ngx_conf_t *cf);
-  void      (*create_main_conf)(ngx_conf_t *cf, ngx_http_push_main_conf_t *mcf);
-  
-  //quit
-  void      (*exit_worker)(ngx_cycle_t *cycle);
-  void      (*exit_master)(ngx_cycle_t *cycle);
-  
-  
-  //async-friendly functions with callbacks
-  ngx_http_push_msg_t * (*get_message) (ngx_str_t *channel_id, ngx_http_push_msg_id_t *msg_id, ngx_int_t *msg_search_outcome, ngx_http_request_t *r, ngx_int_t (*callback)(ngx_http_push_msg_t *msg, ngx_int_t msg_search_outcome, ngx_http_request_t *r));
-  ngx_int_t             (*subscribe)   (ngx_str_t *channel_id, ngx_http_push_msg_id_t *msg_id, ngx_http_request_t *r, ngx_int_t (*callback)(ngx_int_t status, ngx_http_request_t *r));
-  ngx_int_t             (*publish)     (ngx_str_t *channel_id, ngx_http_request_t *r, ngx_int_t (*callback)(ngx_int_t status, ngx_http_push_channel_t *ch, ngx_http_request_t *r));
-  
-  //channel actions
-  ngx_http_push_channel_t *(*get_channel)(ngx_str_t *id, time_t channel_timeout, ngx_int_t (*callback)(ngx_http_push_channel_t *channel));
-  ngx_http_push_channel_t *(*find_channel)(ngx_str_t *id, time_t channel_timeout, ngx_int_t (*callback)(ngx_http_push_channel_t *channel));
-  
-  ngx_int_t (*delete_channel)(ngx_str_t *channel_id);
-  ngx_http_push_msg_t *(*get_channel_message)(ngx_http_push_channel_t *channel, ngx_http_push_msg_id_t *msgid, ngx_int_t *msg_search_outcome, ngx_http_push_loc_conf_t *cf);
-  
-  void (*reserve_message)(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg);
-  void (*release_message)(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg);
-  
-  //channel properties
-  ngx_int_t (*channel_subscribers)(ngx_http_push_channel_t * channel);
-  ngx_int_t (*channel_worker_subscribers)(ngx_http_push_subscriber_t * worker_sentinel);
-  ngx_http_push_subscriber_t *(*next_subscriber)(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *sentinel, ngx_http_push_subscriber_t *cur, int release_previous);
-  ngx_int_t (*release_subscriber_sentinel)(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *sentinel);
-  
-  void (*lock)(void); //legacy shared-memory store helpers
-  void (*unlock)(void);
-  void * (*alloc_locked)(size_t size, char * label);
-  void (*free_locked)(void *ptr);
-  
-  //message actions and properties
-  ngx_http_push_msg_t * (*create_message)(ngx_http_push_channel_t *channel, ngx_http_request_t *r);
-  ngx_int_t (*delete_message)(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg, ngx_int_t force);
-  ngx_int_t (*delete_message_locked)(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg, ngx_int_t force);
-  ngx_int_t (*enqueue_message)(ngx_http_push_channel_t *channel, ngx_http_push_msg_t *msg, ngx_http_push_loc_conf_t *cf);
-  ngx_str_t * (*message_etag)(ngx_http_push_msg_t *msg, ngx_pool_t *pool);
-  ngx_str_t * (*message_content_type)(ngx_http_push_msg_t *msg, ngx_pool_t *pool);
-  
-  //ipc
-  ngx_int_t (*send_worker_message)(ngx_http_push_channel_t *channel, ngx_http_push_subscriber_t *subscriber_sentinel, ngx_pid_t pid, ngx_int_t worker_slot, ngx_http_push_msg_t *msg, ngx_int_t status_code);
-  void (*receive_worker_message)(void);
-} ngx_http_push_store_t;
-
diff --git a/debian/modules/nginx-http-push/src/store/rbtree_util.c b/debian/modules/nginx-http-push/src/store/rbtree_util.c
deleted file mode 100644
index 735bfcc..0000000
--- a/debian/modules/nginx-http-push/src/store/rbtree_util.c
+++ /dev/null
@@ -1,246 +0,0 @@
-#include <ngx_http_push_module.h>
-#include "rbtree_util.h"
-
-ngx_http_push_channel_t * ngx_http_push_clean_channel_locked(ngx_http_push_channel_t * channel) {
-  ngx_queue_t                 *sentinel = &channel->message_queue->queue;
-  time_t                       now = ngx_time();
-  ngx_http_push_msg_t         *msg=NULL;
-  while(!ngx_queue_empty(sentinel)){
-    msg = ngx_queue_data(ngx_queue_head(sentinel), ngx_http_push_msg_t, queue);
-    if (msg!=NULL && msg->expires != 0 && now > msg->expires) {
-      ngx_http_push_store->delete_message_locked(channel, msg, 0);
-    }
-    else { //definitely a message left to send
-      return NULL;
-    }
-  }
-  //at this point, the queue is empty
-  return (channel->subscribers==0 && (channel->expires <= now)) ? channel : NULL; //if no waiting requests and channel expired, return this channel to be deleted
-}
-
-static ngx_int_t ngx_http_push_delete_node_locked(ngx_rbtree_t *tree, ngx_rbtree_node_t *trash) {
-//assume the shm zone is already locked
-  if(trash != NULL){ //take out the trash
-    ngx_rbtree_delete(tree, trash);
-    
-    //delete the worker-subscriber queue
-    ngx_queue_t                *sentinel = (ngx_queue_t *)((ngx_http_push_channel_t *)trash)->workers_with_subscribers;
-    ngx_queue_t                *cur = ngx_queue_head(sentinel);
-    ngx_queue_t                *next;
-    while(cur!=sentinel) {
-      next = ngx_queue_next(cur);
-      ngx_http_push_store->free_locked(cur);
-      cur = next;
-    }
-    
-    ngx_http_push_store->free_locked(trash);
-    ngx_http_push_store->free_locked(sentinel);
-    return NGX_OK;
-  }
-  return NGX_DECLINED;
-}
-
-ngx_int_t ngx_http_push_delete_channel_locked(ngx_http_push_channel_t *trash, ngx_shm_zone_t *shm_zone) {
-  ngx_int_t                      res;
-  res = ngx_http_push_delete_node_locked(&((ngx_http_push_shm_data_t *) shm_zone->data)->tree, (ngx_rbtree_node_t *)trash);
-  if(res==NGX_OK) {
-    ((ngx_http_push_shm_data_t *) shm_zone->data)->channels--;
-    return NGX_OK;
-  }
-  return res;
-  
-}
-
-ngx_http_push_channel_t * ngx_http_push_find_channel(ngx_str_t *id, time_t timeout, ngx_shm_zone_t *shm_zone) {
-  ngx_rbtree_t                   *tree = &((ngx_http_push_shm_data_t *) shm_zone->data)->tree;
-  uint32_t                        hash;
-  ngx_rbtree_node_t              *node, *sentinel;
-  ngx_int_t                       rc;
-  ngx_http_push_channel_t        *up = NULL;
-  ngx_http_push_channel_t        *trash[] = { NULL, NULL, NULL };
-  
-  ngx_uint_t                      i, trashed=0;
-  if (tree==NULL) {
-    return NULL;
-  }
-  
-  hash = ngx_crc32_short(id->data, id->len);
-
-  node = tree->root;
-  sentinel = tree->sentinel;
-
-  while (node != sentinel) {
-    
-    //every search is responsible for deleting a couple of empty, if it comes across them
-    if (trashed < (sizeof(trash) / sizeof(*trash))) {
-      if((trash[trashed]=ngx_http_push_clean_channel_locked((ngx_http_push_channel_t *) node))!=NULL) {
-        trashed++;
-      }
-    }
-    
-    if (hash < node->key) {
-      node = node->left;
-      continue;
-    }
-
-    if (hash > node->key) {
-      node = node->right;
-      continue;
-    }
-    
-    /* hash == node->key */
-
-    do {
-      up = (ngx_http_push_channel_t *) node;
-
-      rc = ngx_memn2cmp(id->data, up->id.data, id->len, up->id.len);
-
-      if (rc == 0) {
-        //found
-        for(i=0; i<trashed; i++) {
-          if(trash[i] != up){ //take out the trash
-            ngx_http_push_delete_channel_locked(trash[i], shm_zone);
-          }
-        }
-        up->expires = ngx_time() + timeout;
-        ngx_http_push_clean_channel_locked(up);
-        return up;
-      }
-
-      node = (rc < 0) ? node->left : node->right;
-
-    } while (node != sentinel && hash == node->key);
-
-    break;
-  }
-  //not found
-  for(i=0; i<trashed; i++) {
-    ngx_http_push_delete_channel_locked(trash[i], shm_zone);
-  }
-  return NULL;
-}
-
-//find a channel by id. if channel not found, make one, insert it, and return that.
-ngx_http_push_channel_t *ngx_http_push_get_channel(ngx_str_t *id, time_t timeout, ngx_shm_zone_t *shm_zone) {
-  ngx_rbtree_t                   *tree;
-  ngx_http_push_channel_t        *up=ngx_http_push_find_channel(id, timeout, shm_zone);
-  ngx_http_push_pid_queue_t      *worker_queue_sentinel;
-  
-  if(up != NULL) { //we found our channel
-    return up;
-  }
-  tree = &((ngx_http_push_shm_data_t *) shm_zone->data)->tree;
-  if((up = ngx_http_push_store->alloc_locked(sizeof(*up) + id->len + sizeof(ngx_http_push_msg_t), "channel"))==NULL) {
-    return NULL;
-  }
-  if((worker_queue_sentinel=ngx_http_push_store->alloc_locked(sizeof(*worker_queue_sentinel), "channel worker queue sentinel"))==NULL) {
-    ngx_http_push_store->free_locked(up);
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "push module: unable to allocate worker queue sentinel");
-    return NULL;
-  }
-  ngx_queue_init(&worker_queue_sentinel->queue);
-  
-  up->id.data = (u_char *) (up+1); //contiguous piggy
-  up->message_queue = (ngx_http_push_msg_t *) (up->id.data + id->len);
-  
-  up->id.len = (u_char) id->len;
-  ngx_memcpy(up->id.data, id->data, up->id.len);
-  up->node.key = ngx_crc32_short(id->data, id->len);
-  ngx_rbtree_insert(tree, (ngx_rbtree_node_t *) up);
-
-  //initialize queues
-  ngx_queue_init(&up->message_queue->queue);
-  up->messages=0;
-  
-  up->workers_with_subscribers=worker_queue_sentinel;
-  up->subscribers=0;
-  
-  up->last_seen=ngx_time();
-
-  up->expires = ngx_time() + timeout;
-  
-  ((ngx_http_push_shm_data_t *) shm_zone->data)->channels++;
-  
-  return up;
-}
-
-
-void ngx_rbtree_generic_insert(
-        ngx_rbtree_node_t *temp, 
-        ngx_rbtree_node_t *node, 
-        ngx_rbtree_node_t *sentinel, 
-        int (*compare)(const ngx_rbtree_node_t *left, const ngx_rbtree_node_t *right))
-{
-  for ( ;; ) {
-    if (node->key < temp->key) {
-
-      if (temp->left == sentinel) {
-        temp->left = node;
-        break;
-      }
-
-      temp = temp->left;
-
-    } else if (node->key > temp->key) {
-
-      if (temp->right == sentinel) {
-        temp->right = node;
-        break;
-      }
-
-      temp = temp->right;
-
-    } else { /* node->key == temp->key */
-      if (compare(node, temp) < 0) {
-
-        if (temp->left == sentinel) {
-          temp->left = node;
-          break;
-        }
-
-        temp = temp->left;
-
-      } else {
-
-        if (temp->right == sentinel) {
-          temp->right = node;
-          break;
-        }
-
-        temp = temp->right;
-      }
-    }
-  }
-
-  node->parent = temp;
-  node->left = sentinel;
-  node->right = sentinel;
-  ngx_rbt_red(node);
-}
-
-void ngx_http_push_rbtree_walker(ngx_rbtree_t *tree, ngx_int_t (*apply)(ngx_http_push_channel_t * channel), ngx_rbtree_node_t *node) {
-  ngx_rbtree_node_t              *sentinel = tree->sentinel;
-  
-  if(node!=sentinel) {
-    apply((ngx_http_push_channel_t *)node);
-    if(node->left!=NULL) {
-      ngx_http_push_rbtree_walker(tree, apply, node->left);
-    }
-    if(node->right!=NULL) {
-      ngx_http_push_rbtree_walker(tree, apply, node->right);
-    }
-  }
-}
-
-
-static int ngx_http_push_compare_rbtree_node(const ngx_rbtree_node_t *v_left, const ngx_rbtree_node_t *v_right)
-{
-  ngx_http_push_channel_t *left = (ngx_http_push_channel_t *) v_left, *right = (ngx_http_push_channel_t *) v_right;
-  return ngx_memn2cmp(left->id.data, right->id.data, left->id.len, right->id.len);
-}
-
-void ngx_http_push_rbtree_insert(ngx_rbtree_node_t *temp,  ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) 
-{
-  ngx_rbtree_generic_insert(temp, node, sentinel, ngx_http_push_compare_rbtree_node);
-}
-
diff --git a/debian/modules/nginx-http-push/src/store/rbtree_util.h b/debian/modules/nginx-http-push/src/store/rbtree_util.h
deleted file mode 100644
index 3850c1d..0000000
--- a/debian/modules/nginx-http-push/src/store/rbtree_util.h
+++ /dev/null
@@ -1,9 +0,0 @@
-void ngx_http_push_rbtree_insert(ngx_rbtree_node_t *temp,ngx_rbtree_node_t *node,ngx_rbtree_node_t *sentinel);
-void ngx_http_push_rbtree_walker(ngx_rbtree_t *tree,ngx_int_t(*apply)(ngx_http_push_channel_t *channel),ngx_rbtree_node_t *node);
-void ngx_rbtree_generic_insert(ngx_rbtree_node_t *temp,ngx_rbtree_node_t *node,ngx_rbtree_node_t *sentinel,int(*compare)(const ngx_rbtree_node_t *left,const ngx_rbtree_node_t *right));
-ngx_http_push_channel_t *ngx_http_push_get_channel(ngx_str_t *id,time_t timeout,ngx_shm_zone_t *shm_zoneg);
-ngx_http_push_channel_t *ngx_http_push_find_channel(ngx_str_t *id,time_t timeout,ngx_shm_zone_t *shm_zone);
-ngx_int_t ngx_http_push_delete_channel_locked(ngx_http_push_channel_t *trash,ngx_shm_zone_t *shm_zone);
-ngx_http_push_channel_t *ngx_http_push_clean_channel_locked(ngx_http_push_channel_t *channel);
-#define ngx_http_push_walk_rbtree(apply, shm_zone)                                            \
-ngx_http_push_rbtree_walker(&((ngx_http_push_shm_data_t *) shm_zone->data)->tree, apply, ((ngx_http_push_shm_data_t *) shm_zone->data)->tree.root)
diff --git a/debian/modules/nginx-http-push/tests/nginx-pushmodule/.gitignore b/debian/modules/nginx-http-push/tests/nginx-pushmodule/.gitignore
deleted file mode 100644
index 980111f..0000000
--- a/debian/modules/nginx-http-push/tests/nginx-pushmodule/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-src
-pkg
-*.tar.gz
-*.pkg.tar*
-*no_pool.patch
\ No newline at end of file
diff --git a/debian/modules/nginx-http-push/tests/nginx.conf b/debian/modules/nginx-http-push/tests/nginx.conf
deleted file mode 100644
index e89c5ce..0000000
--- a/debian/modules/nginx-http-push/tests/nginx.conf
+++ /dev/null
@@ -1,121 +0,0 @@
- 
-#user  nobody;
-worker_processes 20;
-working_directory /tmp;
-
-worker_rlimit_core  1024M;
-worker_rlimit_nofile 100000;
-#debug_points stop;
-
-#error_log  /dev/stderr debug;
-error_log  /dev/stderr  notice;
-#error_log   err.log  notice;
-
-pid        /tmp/pushmodule-test-nginx.pid;
-daemon	    off;
-
-events {
-  worker_connections  10000;
-  accept_mutex off;
-}
-
-http {
-  access_log /dev/stdout;
-#  access_log /dev/stdout;
-  default_type  application/octet-stream;
-  client_body_temp_path /tmp/ 1 2;
-  sendfile        on;
-  keepalive_timeout  65;
-  push_authorized_channels_only off;
-  push_max_reserved_memory 32M;
-  #cachetag
-
-  server {
-    listen       8082;
-#    root ./;
-    location ~ /pub/(\w+)$ {
-      set $push_channel_id $1;
-      push_publisher;
-      push_min_message_buffer_length 5;
-      push_max_message_buffer_length 20;
-      push_message_timeout 5s;
-      push_channel_group test;
-    }
-
-    location ~/pub/nobuffer/(\w+)$ {
-      set $push_channel_id $1;
-      push_publisher;
-      push_store_messages off;
-      push_message_timeout 60s;
-      push_channel_group test;
-    }
-
-    location ~ /pub/2_sec_message_timeout/(\w+)$ {
-      set $push_channel_id $1;
-      push_publisher;
-      push_min_message_buffer_length 5;
-      push_max_message_buffer_length 20;
-      push_message_timeout 2s;
-      push_channel_group test;
-    }
-
-    location ~ /sub/broadcast/(\w+)$ {
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-      push_subscriber_concurrency broadcast;
-    }
-    location ~ /sub/first/(\w+)$ {
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-      push_subscriber_concurrency first;
-    }
-    location ~ /sub/last/(\w+)$ {
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-      push_subscriber_concurrency last;
-    }
-    location ~ /sub/intervalpoll/(\w+)$ {
-      push_subscriber interval-poll;
-      push_channel_group test;
-      set $push_channel_id $1;
-      push_subscriber_concurrency broadcast;
-    }
-
-    location ~ /sub/gzip/(\w+)$ {
-      add_header Content-Type text/plain;
-      gzip on;
-      gzip_min_length 10;
-      gzip_proxied any;
-      gzip_types *;
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-      push_subscriber_concurrency broadcast;
-    }
-
-    #quick subscriber timeout
-    location ~ /sub/timeout/(\w+)$ {
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-      push_subscriber_concurrency broadcast;
-      push_subscriber_timeout 2s;
-    }
-
-    #authorized channels only -- publishers must create the channel before subscribing
-    location ~ /sub/authorized/(\w+)$ {
-      push_authorized_channels_only on;
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-    }
-
-    location ~ /rewrite/(.*)$ {
-      rewrite  ^/(.*)$  $1;
-    }
-
-  }
-}
diff --git a/debian/modules/nginx-http-push/tests/nginx.sh b/debian/modules/nginx-http-push/tests/nginx.sh
deleted file mode 100755
index 9172db1..0000000
--- a/debian/modules/nginx-http-push/tests/nginx.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/zsh
-TESTDIR=`pwd`
-SRCDIR=$(readlink -m $TESTDIR/../src)
-echo $TESTDIR $SRCDIR
-NGINX_CONFIG=`pwd`/nginx.conf
-NGINX_TEMP_CONFIG=`pwd`/.nginx.thisrun.conf
-NGINX_OPT=( -p `pwd`/ 
-    -c $NGINX_TEMP_CONFIG
-)
-cp -fv $NGINX_CONFIG $NGINX_TEMP_CONFIG
-VALGRIND_OPT=( --trace-children=yes --track-origins=yes --read-var-info=yes )
-WORKERS=5
-NGINX_DAEMON="off"
-NGINX_CONF=""
-ACCESS_LOG="/dev/null"
-ERROR_LOG="stderr"
-ERRLOG_LEVEL="notice"
-TMPDIR=""
-MEM="32M"
-
-
-_cacheconf="  proxy_cache_path _CACHEDIR_ levels=1:2 keys_zone=cache:1m; \\n  server {\\n       listen 8007;\\n       location / { \\n          proxy_cache cache; \\n      }\\n  }\\n"
-echo $cacheconf
-
-for opt in $*; do
-  if [[ "$opt" = <-> ]]; then
-    WORKERS=$opt
-  fi
-  case $opt in
-    leak|leakcheck)
-      VALGRIND_OPT+=("--leak-check=full" "--show-leak-kinds=all" "--track-fds=yes");;
-    valgrind)
-      valgrind=1;;
-    alleyoop)
-      alleyoop=1;;
-    cache)
-      CACHE=1;;
-    access)
-      ACCESS_LOG="/dev/stdout";;
-    worker|one|single) 
-      WORKERS=1
-      ;;
-    debug|kdbg)
-      WORKERS=1
-      NGINX_DAEMON="on"
-      debugger=1
-      ;;
-    debuglog)
-      ERRLOG_LEVEL="debug"
-      ;;
-    errorlog)
-      ERROR_LOG="errors.log"
-      rm ./errors.log 2>/dev/null
-      ;;
-    lomem|lowmem|small)
-      MEM="5M";;
-    himem|highmem|large)
-      MEM="256M";;
-    verylowmem|tiny)
-      MEM="1M";;
-  esac
-done
-
-conf_replace(){
-    echo "$1 $2"
-    sed "s|\($1\).*|\1 $2;|g" $NGINX_TEMP_CONFIG -i
-}
-
-ulimit -c unlimited
-
-if [[ ! -z $NGINX_CONF ]]; then
-    NGINX_OPT+=( -g "$NGINX_CONF" )
-fi
-#echo $NGINX_CONF
-#echo $NGINX_OPT
-echo "nginx $NGINX_OPT"
-conf_replace "access_log" $ACCESS_LOG
-conf_replace "error_log" "$ERROR_LOG $ERRLOG_LEVEL"
-conf_replace "worker_processes" $WORKERS
-conf_replace "daemon" $NGINX_DAEMON
-conf_replace "working_directory" "\"$(pwd)\""
-conf_replace "push_max_reserved_memory" "$MEM"
-if [[ ! -z $CACHE ]]; then
-  sed "s|^\s*#cachetag.*|${_cacheconf}|g" $NGINX_TEMP_CONFIG -i
-  tmpdir=`pwd`"/.tmp"
-  mkdir $tmpdir 2>/dev/null
-  sed "s|_CACHEDIR_|\"$tmpdir\"|g" $NGINX_TEMP_CONFIG -i
-fi
-
-if [[ $debugger == 1 ]]; then
-  
-  ./nginx $NGINX_OPT
-  sleep 0.2
-  master_pid=`cat /tmp/pushmodule-test-nginx.pid`
-  child_pids=`pgrep -P $master_pid`
-  kdbg_pids=()
-  ln -sf $TESTDIR/nginx $SRCDIR/nginx >/dev/null
-  ln -sf  $TESTDIR/nginx-pushmodule/src/nginx/src/ $SRCDIR/nginx-source >/dev/null
-  sudo echo "attaching kdbg..."
-  while read -r line; do
-    sudo kdbg -p $line $SRCDIR/nginx &
-    kdbg_pids+="$!"
-  done <<< $child_pids
-  echo "kdbg at $kdbg_pids"
-  wait $kdbg_pids
-  kill $master_pid
-  rm -f $SRCDIR/nginx $SRCDIR/nginx-source 2>/dev/null
-elif [[ $valgrind == 1 ]]; then
-  mkdir ./coredump 2>/dev/null
-  pushd ./coredump >/dev/null
-  valgrind $VALGRIND_OPT ../nginx $NGINX_OPT
-  popd >/dev/null
-elif [[ $alleyoop == 1 ]]; then
-  alleyoop ./nginx $NGINX_OPT
-else
-  ./nginx $NGINX_OPT
-fi
diff --git a/debian/modules/nginx-http-push/tests/pub.rb b/debian/modules/nginx-http-push/tests/pub.rb
deleted file mode 100755
index 0f0e64a..0000000
--- a/debian/modules/nginx-http-push/tests/pub.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/ruby
-require 'securerandom'
-require_relative 'pubsub.rb'
-require "optparse"
-server= "localhost:8082"
-msg=false
-loop=false
-repeat_sec=0.5
-
-opt=OptionParser.new do |opts|
-  opts.on("-s", "--server SERVER (#{server})", "server and port."){|v| server=v}
-  opts.on("-v", "--verbose", "Blabberhttp"){Typhoeus::Config.verbose=true}
-  opts.on("-r", "--repeat [SECONDS]", "re-send message every N seconds (#{repeat_sec})") do |v| 
-    loop=true
-    repeat_sec=Float(v) unless v.nil?
-  end 
-  opts.on("-m", "--message MSG", "publish this message instead of prompting"){|v| msg=v}
-end
-opt.banner="Usage: pub.rb [options] url"
-opt.parse!
-
-url = "http://#{server}#{ARGV.last}"
-
-puts "Publishing to #{url}."
-
-
-loopmsg=("\r"*20) + "sending message #"
-
-pub = Publisher.new url
-repeat=true
-i=1
-while repeat do
-  if msg
-    if loop
-      sleep repeat_sec
-      print loopmsg
-      print i
-      i+=1
-    else
-      puts "Press enter to send message."
-      STDIN.gets
-    end
-    pub.post msg
-    
-  else
-    if loop
-      puts "Can't repeat with custom message. use -m option"
-    end
-    puts "Enter one-line message, press enter."
-    message=STDIN.gets #doesn't work when there are parameters. wtf?
-    pub.post message
-    puts ""
-  end
-end
diff --git a/debian/modules/nginx-http-push/tests/pubsub.rb b/debian/modules/nginx-http-push/tests/pubsub.rb
deleted file mode 100644
index 83ffd30..0000000
--- a/debian/modules/nginx-http-push/tests/pubsub.rb
+++ /dev/null
@@ -1,375 +0,0 @@
-#!/usr/bin/ruby
-require 'typhoeus'
-require 'json'
-require 'pry'
-require 'celluloid'
-Typhoeus::Config.memoize = false
-
-class Message
-  attr_accessor :content_type, :message, :times_seen, :etag, :last_modified
-  def initialize(msg, last_modified=nil, etag=nil)
-    @times_seen=1
-    @message, @last_modified, @etag = msg, last_modified, etag
-  end
-  def id
-    @id||="#{last_modified}:#{etag}"
-  end
-  def to_s
-    @message
-  end
-end
-
-class MessageStore
-  include Enumerable
-  attr_accessor :msgs, :quit_message
-
-  def matches? (msg_store)
-    my_messages = messages
-    if MessageStore === msg_store
-      other_messages = msg_store.messages
-    else
-      other_messages = msg_store
-    end
-    return false, "Message count doesn't match. ( #{my_messages.count}, #{other_messages.count})" unless my_messages.count == other_messages.count
-    other_messages.each_with_index do |msg, i|
-      return false, "Message #{i} doesn't match. (|#{my_messages[i].length}|, |#{msg.length}|) " if my_messages[i] != msg
-    end
-    true
-  end
-
-  def initialize(opt={})
-    @array||=opt[:noid]
-    clear
-  end
-
-  def messages
-    self.to_a.map{|m|m.to_s}
-  end
-
-  #remove n oldest messages
-  def remove_old(n=1)
-    n.times {@msgs.shift}
-    @msgs.count
-  end
-  
-  def clear
-    @msgs= @array ? [] : {}
-  end
-  
-  def to_a
-    @array ? @msgs : @msgs.values
-  end
-  def pp
-    each do |msg|
-      puts "\"#{msg.to_s}\" (seen #{msg.times_seen} times.)"
-    end
-  end
-  def each
-    if @array
-      @msgs.each {|msg| yield msg }
-    else
-      @msgs.each {|key, msg| yield msg }
-    end
-  end
-  def <<(msg)
-    if @array
-      @msgs << msg
-    else
-      if (cur_msg=@msgs[msg.id])
-        puts "Received different messages with same message id #{msg.id}: '#{cur_msg.message}' and '#{msg.message}'" unless cur_msg.message == msg.message
-        cur_msg.times_seen+=1
-        cur_msg.times_seen
-      else
-        @msgs[msg.id]=msg
-        1
-      end
-    end
-  end
-end
-
-class Subscriber
-  class LongPollClient
-    include Celluloid
-    attr_accessor :last_modified, :etag, :hydra, :timeout
-    def initialize(subscr, opt={})
-      @last_modified, @etag, @timeout = opt[:last_modified], opt[:etag], opt[:timeout] || 10
-      @connect_timeout = opt[:connect_timeout]
-      @subscriber=subscr
-      @url=subscr.url
-      @concurrency=opt[:concurrency] || opt[:clients] || 1
-      @hydra= Typhoeus::Hydra.new( max_concurrency: @concurrency)
-      @gzip=opt[:gzip]
-      @retry_delay=opt[:retry_delay]
-    end
-
-    def response_success(response, req)
-      #puts "received OK response at #{req.url}"
-      #parse it
-      msg=Message.new response.body, response.headers["Last-Modified"], response.headers["Etag"]
-      msg.content_type=response.headers["Content-Type"]
-      req.options[:headers]["If-None-Match"]=msg.etag
-      req.options[:headers]["If-Modified-Since"]=msg.last_modified
-      unless @subscriber.on_message(msg) == false
-        @subscriber.waiting+=1
-        Celluloid.sleep @retry_delay if @retry_delay
-        @hydra.queue req
-      else
-        @subscriber.finished+=1
-      end
-    end
-    
-    def response_failure(response, req)
-      #puts "received bad or no response at #{req.url}"
-      unless @subscriber.on_failure(response) == false
-        @subscriber.waiting+=1
-        Celluloid.sleep @retry_delay if @retry_delay
-        @hydra.queue req
-      else
-        @subscriber.finished+=1
-      end
-    end
-    
-    def new_request
-      req=Typhoeus::Request.new(@url, timeout: @timeout, connecttimeout: @connect_timeout, accept_encoding: (@gzip ? "gzip" : nil) )
-      req.on_complete do |response|
-        @subscriber.waiting-=1
-        if response.success?
-          response_success response, req
-        else
-          response_failure response, req
-        end
-      end
-      req
-    end
-
-    def run(was_success=nil)
-      #puts "running #{self.class.name} hydra with #{@hydra.queued_requests.count} requests."
-      (@concurrency - @hydra.queued_requests.count).times do
-        @subscriber.waiting+=1
-        @hydra.queue new_request
-      end
-      @hydra.run
-    end
-    
-    def poke
-    end
-  end
-  
-  class IntervalPollClient < LongPollClient
-    def initialize(subscr, opt={})
-      @last_modified=nil
-      @etag=nil
-      super
-    end
-    
-    def store_msg_id(response, req)
-      @last_modified=response.headers["Last-Modified"] if response.headers["Last-Modified"]
-      @etag=response.headers["Etag"] if response.headers["Etag"]
-      req.options[:headers]["If-Modified-Since"]=@last_modified
-      req.options[:headers]["If-None-Match"]=@etag
-    end
-    
-    def response_success(response, req)
-      store_msg_id(response, req)
-      super response, req
-    end
-    def response_failure(response, req)
-      if response.code == 304 || @subscriber.on_failure(response) != false
-        @subscriber.waiting+=1
-        Celluloid.sleep @retry_delay if @retry_delay
-        @hydra.queue req
-      else
-        @subscriber.finished+=1
-      end
-    end
-    
-    def poke
-      while @subscriber.finished < @concurrency do
-        sleep 1
-      end
-    end
-  end
-  
-  attr_accessor :url, :client, :messages, :max_round_trips, :quit_message, :errors, :concurrency, :waiting, :finished, :client_class
-  def initialize(url, concurrency=1, opt={})
-    @care_about_message_ids=opt[:use_message_id].nil? ? true : opt[:use_message_id]
-    @url=url
-    @timeout=opt[:timeout] || 30
-    @connect_timeout=opt[:connect_timeout] || 5
-    @quit_message=opt[:quit_message]
-    @gzip=opt[:gzip]
-    @retry_delay=opt[:retry_delay]
-    reset
-    #puts "Starting subscriber on #{url}"
-    case opt[:client]
-    when :longpoll, :long, nil
-      @client_class=LongPollClient
-    when :interval, :intervalpoll
-      @client_class=IntervalPollClient
-    when :ws, :websocket
-      raise "websocket client not yet implemented"
-    when :es, :eventsource
-      raise "EventSource client not yet implemented"
-    else
-      raise "unknown client type #{opt[:client]}"
-    end
-    @concurrency=concurrency
-    @client_class ||= opt[:client_class] || LongPollClient
-    new_client @client_class
-  end
-  def new_client(client_class=LongPollClient)
-    @client=client_class.new(self, concurrency: @concurrency, timeout: @timeout, connect_timeout: @connect_timeout, gzip: @gzip, retry_delay: @retry_delay)
-  end
-  def reset
-    @errors=[]
-    @messages=MessageStore.new :noid => !@care_about_message_ids
-    @waiting=0
-    @finished=0
-    new_client if terminated?
-    self
-  end
-  def abort
-    @client.terminate
-  end
-  def errors?
-    not no_errors?
-  end
-  def no_errors?
-    @errors.empty?
-  end
-  def match_errors(regex)
-    @errors.each do |err|
-      return false unless err =~ regex
-    end
-    true
-  end
-  
- 
-  def run
-    begin
-      client.current_actor
-    rescue Celluloid::DeadActorError
-      return false
-    end
-    @client.async.run
-    self
-  end
-  def terminate
-    begin
-      @client.terminate
-    rescue Celluloid::DeadActorError
-      return false
-    end
-    true
-  end
-  def terminated?
-    begin
-      client.current_actor unless client == nil
-    rescue Celluloid::DeadActorError
-      return false
-    end
-    true
-  end
-  def wait
-    @client.poke
-  end
-
-  def on_message(msg=nil, &block)
-    #puts "received message #{msg.to_s[0..15]}"
-    if block_given?
-      @on_message=block
-    else
-      @messages << msg
-      return false if @quit_message == msg.to_s
-      @on_message.call(msg) if @on_message.respond_to? :call
-    end
-  end
-  def on_failure(response=nil, &block)
-    if block_given?
-      @on_failure=block
-    else
-      #puts "failed with #{response.to_s}. handler is #{@on_failure.to_s}"
-      if response.timed_out?
-        # aw hell no
-        @errors << "Client response timeout."
-      elsif response.code == 0
-        # Could not get an http response, something's wrong.
-        @errors << response.return_message
-      else
-        # Received a non-successful http response.
-        @errors << "HTTP request failed: #{response.return_message} (code #{response.code})"
-      end
-      @on_failure.call(response) if @on_failure.respond_to? :call
-    end
-  end
-end
-
-class Publisher
-  include Celluloid
-  attr_accessor :messages, :response, :response_code, :response_body, :nofail, :accept
-  def initialize(url)
-    @url= url
-    @messages = MessageStore.new :noid => true
-  end
-  
-  def submit(body, method=:POST, content_type= :'text/plain', &block)
-    self.response=nil
-    self.response_code=nil
-    self.response_body=nil
-
-    if Enumerable===body
-      i=0
-      body.each{|b| i+=1; submit(b, method, content_type, &block)}
-      return i
-    end
-    post = Typhoeus::Request.new(
-      @url,
-      headers: {:'Content-Type' => content_type, :'Accept' => accept},
-      method: method,
-      body: body,
-    )
-    msg=Message.new body
-    msg.content_type=content_type
-    post.on_complete do |response|
-      self.response=response
-      self.response_code=response.response_code
-      self.response_body=response.response_body
-      if response.success?
-        #puts "published message #{msg.to_s[0..15]}"
-        @messages << msg
-      elsif response.timed_out?
-        # aw hell no
-        #puts "publisher err: timeout"
-        raise "Response timed out."
-      elsif response.code == 0
-        # Could not get an http response, something's wrong.
-        #puts "publisher err: #{response.return_message}"
-        raise "No HTTP response: #{response.return_message}" unless self.nofail
-      else
-        # Received a non-successful http response.
-        #puts "publisher err: #{response.code.to_s}"
-        raise "HTTP request failed: #{response.code.to_s}" unless self.nofail
-      end
-      block.call(self) if block
-    end
-    #puts "publishing to #{@url}"
-    post.run
-  end
-  
-  def get(accept_header=nil)
-    self.accept=accept_header
-    submit nil, :GET
-    self.accept=nil
-  end
-  def delete
-    submit nil, :DELETE
-  end
-  def post(body, content_type=nil, &block)
-    submit body, :POST, content_type, &block
-  end
-  def put(body, content_type=nil, &block)
-    submit body, :PUT, content_type, &block
-  end
-
-  
-end
diff --git a/debian/modules/nginx-http-push/tests/rebuild.sh b/debian/modules/nginx-http-push/tests/rebuild.sh
deleted file mode 100755
index 8ee0115..0000000
--- a/debian/modules/nginx-http-push/tests/rebuild.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/zsh
-#assumes PKGBUILDy nginx located at ./nginx-pushmodule
-MY_PATH="`dirname \"$0\"`"
-MY_PATH="`( cd \"$MY_PATH\" && pwd )`"
-
-ccached_clang="ccache clang -Qunused-arguments -fcolor-diagnostics"
-for opt in $*; do
-  case $opt in
-    clang)
-      export CC=$ccached_clang;;
-    nopool|no-pool|nop) 
-      export NO_POOL=1;;
-    re|remake)
-      export REMAKE="-B"
-      export CONTINUE=1;;
-    c|continue|cont)
-      export CONTINUE=1;;
-    nomake)
-      export NO_MAKE=1;;
-    nodebug)
-      export NO_DEBUG=1;;
-    mudflap)
-      export MUDFLAP=1
-      export CC=gcc
-      ;;
-    oldversion|old)
-      export NGINX_OLDVERSION=1;;
-    veryoldversion|veryold)
-      export NGINX_VERYOLDVERSION=1;;
-    slabpatch|slab)
-      export NGX_SLAB_PATCH=1;;
-    clang-analyzer|analyzer|scan|analyze)
-      export CC="clang"
-      export CLANG_ANALYZER=$MY_PATH/clang-analyzer
-      mkdir $CLANG_ANALYZER 2>/dev/null
-      ;;
-  esac
-done
-
-if [[ -z $NO_MAKE ]]; then
-  pushd ./nginx-pushmodule >/dev/null
-  if [[ $CONTINUE == 1 ]]; then
-    makepkg -f -e
-  else
-    makepkg -f
-  fi
-  popd >/dev/null
-fi
-if ! [[ -z $CLANG_ANALYZER ]]; then
-  pushd $CLANG_ANALYZER >/dev/null
-  latest_scan=`ls -c |head -n1`
-  echo "run 'scan-view ${CLANG_ANALYZER}/${latest_scan}' for static analysis."
-  scan-view $latest_scan 2>/dev/null
-  popd >/dev/null
-fi
diff --git a/debian/modules/nginx-http-push/tests/sub.rb b/debian/modules/nginx-http-push/tests/sub.rb
deleted file mode 100755
index e55fb73..0000000
--- a/debian/modules/nginx-http-push/tests/sub.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/ruby
-require 'securerandom'
-require_relative 'pubsub.rb'
-require "optparse"
-
-server= "localhost:8082"
-par=1
-quit_msg='FIN'
-no_message=false
-max_wait=60
-msg_count=0
-opt=OptionParser.new do |opts|
-  opts.on("-s", "--server SERVER (#{server})", "server and port."){|v| server=v}
-  opts.on("-p", "--parallel NUM (#{par})", "number of parallel clients"){|v| par = v.to_i}
-  opts.on("-t", "--timeout SEC (#{max_wait})", "Long-poll timeout"){|v| max_wait = v}
-  opts.on("-q", "--quit STRING (#{quit_msg})", "Quit message"){|v| quit_msg = v}
-  opts.on("-n", "--no-message", "Don't output retrieved message."){|v| no_message = true}
-  opts.on("-v", "--verbose", "somewhat rather extraneously wordful output"){Typhoeus::Config.verbose=true}
-end
-opt.banner="Usage: sub.rb [options] url"
-opt.parse!
-
-url = "http://#{server}#{ARGV.last}"
-
-puts "Subscribing #{par} client#{par!=1 ? "s":""} to #{url}."
-puts "Timeout: #{max_wait}sec, quit msg: #{quit_msg}"
-
-
-sub = Subscriber.new url, par, timeout: max_wait, quit_message: quit_msg
-
-nomsgmessage="\r"*20 + "Received message #"
-
-sub.on_message do |msg|
-  if no_message
-    msg_count+=1
-    print nomsgmessage
-    print msg_count
-  else
-    puts msg
-  end
-end
-
-errors_shown=false
-sub.on_failure do |x,y|
-  puts sub.errors.join "\r\n" unless errors_shown
-  errors_shown=true
-  false
-end
-
-
-sub.run
-sub.wait
diff --git a/debian/modules/nginx-http-push/tests/test.rb b/debian/modules/nginx-http-push/tests/test.rb
deleted file mode 100755
index c4428a7..0000000
--- a/debian/modules/nginx-http-push/tests/test.rb
+++ /dev/null
@@ -1,396 +0,0 @@
-#!/usr/bin/ruby
-require 'minitest'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require "minitest/autorun"
-require 'securerandom'
-require_relative 'pubsub.rb'
-SERVER=ENV["PUSHMODULE_SERVER"] || "127.0.0.1"
-PORT=ENV["PUSHMODULE_PORT"] || "8082"
-#Typhoeus::Config.verbose = true
-def url(part="")
-  part=part[1..-1] if part[0]=="/"
-  "http://#{SERVER}:#{PORT}/#{part}"
-end
-puts "Server at #{url}"
-def pubsub(concurrent_clients=1, opt={})
-  urlpart=opt[:urlpart] || 'broadcast'
-  timeout = opt[:timeout]
-  sub_url=opt[:sub] || "sub/broadcast/"
-  pub_url=opt[:pub] || "pub/"
-  chan_id = opt[:channel] || SecureRandom.hex
-  sub = Subscriber.new url("#{sub_url}#{chan_id}"), concurrent_clients, timeout: timeout, use_message_id: opt[:use_message_id], quit_message: 'FIN', gzip: opt[:gzip], retry_delay: opt[:retry_delay], client: opt[:client]
-  pub = Publisher.new url("#{pub_url}#{chan_id}")
-  return pub, sub
-end
-def verify(pub, sub, check_errors=true)
-  assert sub.errors.empty?, "There were subscriber errors: \r\n#{sub.errors.join "\r\n"}" if check_errors
-  ret, err = sub.messages.matches?(pub.messages)
-  assert ret, err || "Messages don't match"
-  sub.messages.each do |msg|
-    assert_equal sub.concurrency, msg.times_seen, "Concurrent subscribers didn't all receive a message."
-  end
-end
-
-class PubSubTest <  Minitest::Test
-  def setup
-    Celluloid.boot
-  end
-  
-  def test_interval_poll
-    pub, sub=pubsub 1, client: :intervalpoll, quit_message: 'FIN', retry_delay:0.1
-    sub.run
-    pub.post ["hello this", "is a thing"]
-    sleep 1
-    pub.post ["oh now what", "is this even a thing?"]
-    sleep 1
-    pub.post "FIN"
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-  
-  def test_channel_info
-    require 'json'
-    require 'nokogiri'
-    require 'yaml'
-    
-    subs=20
-    
-    chan=SecureRandom.hex
-    pub, sub = pubsub(subs, channel: chan)
-    pub.nofail=true
-    pub.get
-    assert_equal 404, pub.response_code
-    
-    pub.post ["hello", "what is this i don't even"]
-    assert_equal 202, pub.response_code
-    pub.get
-    assert_equal 200, pub.response_code
-    assert_match /last requested: \d+ sec/, pub.response_body
-    
-    pub.get "text/json"
-    info_json=JSON.parse pub.response_body
-    assert_equal 2, info_json["messages"]
-    #assert_equal 0, info_json["requested"]
-    assert_equal 0, info_json["subscribers"]
-
-    
-    sub.run
-    sleep 0.2
-    pub.get "text/json"
-    info_json=JSON.parse pub.response_body
-    assert_equal 2, info_json["messages"]
-    #assert_equal 0, info_json["requested"]
-    assert_equal subs, info_json["subscribers"]
-
-    pub.get "text/xml"
-    ix = Nokogiri::XML pub.response_body
-    assert_equal 2, ix.at_xpath('//messages').content.to_i
-    #assert_equal 0, ix.at_xpath('//requested').content.to_i
-    assert_equal subs, ix.at_xpath('//subscribers').content.to_i
-    
-    pub.get "text/yaml"
-    yaml_resp1=pub.response_body
-    pub.get "application/yaml"
-    yaml_resp2=pub.response_body
-    pub.get "application/x-yaml"
-    yaml_resp3=pub.response_body
-    yam=YAML.load pub.response_body
-    assert_equal 2, yam["messages"]
-    #assert_equal 0, yam["requested"]
-    assert_equal subs, yam["subscribers"]
-    
-    assert_equal yaml_resp1, yaml_resp2
-    assert_equal yaml_resp2, yaml_resp3
-    
-    
-    pub.post "FIN"
-    sub.wait
-    pub.get "text/json"
-    info_json=JSON.parse pub.response_body
-    assert_equal 3, info_json["messages"]
-    #assert_equal 0, info_json["requested"]
-    assert_equal 0, info_json["subscribers"]
-    
-    sub.terminate
-  end
-  
-  def test_message_delivery
-    pub, sub = pubsub
-    sub.run
-    sleep 0.2
-    assert_equal 0, sub.messages.messages.count
-    pub.post "hi there"
-    assert_equal 201, pub.response_code
-    sleep 0.2
-    assert_equal 1, sub.messages.messages.count
-    pub.post "FIN"
-    assert_equal 201, pub.response_code
-    sleep 0.2
-    assert_equal 2, sub.messages.messages.count
-    assert sub.messages.matches? pub.messages
-    sub.terminate
-  end
-
-  def test_authorized_channels
-    #must be published to before subscribing
-    pub, sub = pubsub 5, timeout: 1, sub: "sub/authorized/"
-    sub.on_failure { false }
-    sub.run
-    sub.wait
-    assert_equal 5, sub.finished
-    assert sub.match_errors(/code 40[34]/)
-    sub.reset
-    pub.post %w( fweep )
-    assert_match /20[12]/, pub.response_code.to_s
-    sleep 0.1
-    sub.run
-    sleep 0.1
-    pub.post ["fwoop", "FIN"] { assert_match /20[12]/, pub.response_code.to_s }
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-
-  def test_deletion
-    #delete active channel
-    pub, sub = pubsub 5, timeout: 10
-    sub.on_failure { false }
-    sub.run
-    sleep 0.2
-    pub.delete
-    sleep 0.2
-    assert_equal 200, pub.response_code
-    sub.wait
-    assert sub.match_errors(/code 410/), "Expected subscriber code 410: Gone, instead was \"#{sub.errors.first}\""
-
-    #delete channel with no subscribers
-    pub, sub = pubsub 5, timeout: 1
-    pub.post "hello"
-    assert_equal 202, pub.response_code
-    pub.delete
-    assert_equal 200, pub.response_code
-
-    #delete nonexistent channel
-    pub, sub = pubsub
-    pub.nofail=true
-    pub.delete
-    assert_equal 404, pub.response_code
-  end
-
-  def test_no_message_buffer
-    chan_id=SecureRandom.hex
-    pub = Publisher.new url("/pub/nobuffer/#{chan_id}")
-    sub=[]
-    40.times do 
-      sub.push Subscriber.new(url("/sub/broadcast/#{chan_id}"), 1, use_message_id: false, quit_message: 'FIN')
-    end
-
-    pub.post ["this message should not be delivered", "nor this one"]
-    sub.each {|s| s.run}
-    sleep 0.2
-    pub.post "received1"
-    sleep 0.2
-    pub.post "received2"
-    sleep 0.2 
-    pub.post "FIN"
-    sub.each {|s| s.wait}
-    sub.each do |s|
-      assert s.errors.empty?, "There were subscriber errors: \r\n#{s.errors.join "\r\n"}"
-      ret, err = s.messages.matches? ["received1", "received2", "FIN"]
-      assert ret, err || "Messages don't match"
-    end
-  end
-  
-  def test_channel_isolation
-    rands= %w( foo bar baz bax qqqqqqqqqqqqqqqqqqq eleven andsoon andsoforth feh )
-    pub=[]
-    sub=[]
-    10.times do |i|
-      pub[i], sub[i]=pubsub 15
-      sub[i].run
-    end
-    pub.each do |p|
-      rand(1..10).times do
-        p.post rands.sample
-      end
-    end
-    sleep 1
-    pub.each do |p|
-      p.post 'FIN'
-    end
-    sub.each do |s|
-      s.wait
-    end
-    pub.each_with_index do |p, i|
-      verify p, sub[i]
-    end
-    sub.each {|s| s.terminate }
-  end
-  
-  def test_broadcast(clients=400)
-    pub, sub = pubsub clients
-    pub.post "yeah okay"
-    sub.run #celluloid async FTW
-    sleep 0.5
-    pub.post ["hello there", "what is this", "it's nothing", "nothing at all really"]
-    pub.post "FIN"
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-  
-  #def test_broadcast_for_3000
-  #  test_broadcast 3000
-  #end
-  
-  def test_subscriber_concurrency
-    chan=SecureRandom.hex
-    pub_first = Publisher.new url("pub/first#{chan}")
-    pub_last = Publisher.new url("pub/last#{chan}")
-    
-    sub_first, sub_last = [], []
-    { url("sub/first/first#{chan}") => sub_first, url("sub/last/last#{chan}") => sub_last }.each do |url, arr|
-      3.times do
-        sub=Subscriber.new(url, 1, quit_message: 'FIN', timeout: 20)
-        sub.on_failure do |resp, req|
-          false
-        end
-        arr << sub
-      end
-    end
-    
-    sub_first.each {|s| s.run; sleep 0.1 }
-    assert sub_first[0].no_errors?
-    sub_first[1..2].each do |s|
-      assert s.errors?
-      assert s.match_errors(/code 409/)
-    end
-
-    sub_last.each {|s| s.run; sleep 0.1 }
-    assert sub_last[2].no_errors?
-    sub_last[0..1].each do |s|
-      assert s.errors?
-      assert s.match_errors(/code 40[49]/)
-    end
-
-    pub_first.post %w( foo bar FIN )
-    pub_last.post %w( foobar baz somethingelse FIN )
-    
-    sub_first[0].wait
-    sub_last[2].wait
-    
-    verify pub_first, sub_first[0]
-    verify pub_last, sub_last[2]
-    
-    sub_first[1..2].each{ |s| assert s.messages.count == 0 }
-    sub_last[0..1].each{ |s| assert s.messages.count == 0 }
-    [sub_first, sub_last].each {|sub| sub.each{|s| s.terminate}}
-  end
-
-  def test_queueing
-    pub, sub = pubsub 5
-    pub.post %w( what is this_thing andnow 555555555555555555555 eleven FIN )
-    sleep 0.3
-    sub.run
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-  
-  def test_long_message(kb=1)
-    pub, sub = pubsub 10, timeout: 10
-    sub.run
-    pub.post ["q" * kb * 1024, "FIN"]
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-  
-  def test_long_message_500kb
-    test_long_message 500
-  end
-  
-  def test_long_message_700kb
-    test_long_message 700
-  end
-  
-  def test_long_message_950kb
-    test_long_message 950
-  end
-  
-  def test_message_length_range
-    pub, sub = pubsub 2, timeout: 6
-    sub.run
-    
-    n=5
-    while n <= 10000 do
-      pub.post "T" * n
-      n=n*1.01
-      sleep 0.001
-    end
-    pub.post "FIN"
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-  
-  def test_message_timeout
-    pub, sub = pubsub 10, pub: "/pub/2_sec_message_timeout/", timeout: 4
-    pub.post %w( foo bar etcetera ) #these shouldn't get delivered
-    pub.messages.clear
-    sleep 3
-    
-    sub.run
-    pub.post %w( what is this even FIN )
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-  
-  def test_subscriber_timeout
-    chan=SecureRandom.hex
-    sub=Subscriber.new(url("sub/timeout/#{chan}"), 2, timeout: 10)
-    sub.on_failure { false }
-    pub=Publisher.new url("pub/#{chan}")
-    sub.run
-    pub.post "hello"
-    sub.wait
-    verify pub, sub, false
-    assert sub.match_errors(/code 304/)
-  end
-  
-  def assert_header_includes(response, header, str)
-    assert response.headers[header].include?(str), "Response header '#{header}:#{response.headers[header]}' must include \"#{str}\", but does not."
-  end
-  
-  def test_options
-    chan=SecureRandom.hex
-    request = Typhoeus::Request.new url("sub/broadcast/#{chan}"), method: :OPTIONS
-    resp = request.run
-    assert_equal "*", resp.headers["Access-Control-Allow-Origin"]
-    %w( GET OPTIONS ).each {|v| assert_header_includes resp, "Access-Control-Allow-Methods", v}
-    %w( If-None-Match If-Modified-Since Origin ).each {|v| assert_header_includes resp, "Access-Control-Allow-Headers", v}
-    
-    request = Typhoeus::Request.new url("pub/#{chan}"), method: :OPTIONS
-    resp = request.run
-    assert_equal "*", resp.headers["Access-Control-Allow-Origin"]
-    %w( GET POST DELETE OPTIONS ).each {|v| assert_header_includes resp, "Access-Control-Allow-Methods", v}
-    %w( Content-Type Origin ).each {|v| assert_header_includes resp, "Access-Control-Allow-Headers", v}
-  end
-  
-  def test_gzip
-    #bug: turning on gzip cleared the response etag
-    pub, sub = pubsub 1, sub: "/sub/gzip/", gzip: true, retry_delay: 0.3
-    sub.run
-    pub.post ["2", "123456789A", "alsdjklsdhflsajkfhl", "boq"]
-    sleep 1
-    pub.post "foobar"
-    pub.post "FIN"
-    sleep 1
-    verify pub, sub
-  end
-end
-
-
diff --git a/debian/nginx-extras.NEWS b/debian/nginx-extras.NEWS
new file mode 100644
index 0000000..55c9701
--- /dev/null
+++ b/debian/nginx-extras.NEWS
@@ -0,0 +1,6 @@
+nginx-extras (1.10.1-2) UNRELEASED; urgency=medium
+
+  Starting with this release the HTTP Push module has been replaced by Nchan.
+  More info for the upgrade can be found at https://nchan.slact.net/upgrade.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 31 Aug 2016 15:07:20 +0300
diff --git a/debian/rules b/debian/rules
index 39eb71a..7233af1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,7 +114,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/nginx-development-kit \
 			--add-module=$(MODULESDIR)/nginx-echo \
 			--add-module=$(MODULESDIR)/ngx-fancyindex \
-			--add-module=$(MODULESDIR)/nginx-http-push \
+			--add-module=$(MODULESDIR)/nchan \
 			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
 			--add-module=$(MODULESDIR)/nginx-upload-progress \
 			--add-module=$(MODULESDIR)/nginx-upstream-fair \

From 18532f376a736cb1df730bfb7355d0de1cdd740e Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 26 Aug 2016 16:09:52 +0300
Subject: [PATCH 087/600] mod: Convert nchan to a dynamic module

---
 debian/control                          | 14 ++++++++++++++
 debian/libnginx-mod-nchan.nginx         | 13 +++++++++++++
 debian/libnginx-mod.conf/mod-nchan.conf |  1 +
 debian/rules                            |  4 ++--
 debian/tests/control                    |  2 +-
 5 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100755 debian/libnginx-mod-nchan.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-nchan.conf

diff --git a/debian/control b/debian/control
index 912e6c4..9cbfe3f 100644
--- a/debian/control
+++ b/debian/control
@@ -185,6 +185,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-lua (= ${binary:Version}),
          libnginx-mod-http-perl (= ${binary:Version}),
+         libnginx-mod-nchan (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -324,3 +325,16 @@ Description: Nginx Development Kit module
  features that are seen from a user's point of view - it's just designed to help
  reduce the code that Nginx module developers need to write.  Embed LUA runtime
  into nginx.
+
+Package: libnginx-mod-nchan
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Fast, flexible pub/sub server for Nginx
+ Nchan is a scalable, flexible pub/sub server for the modern web, It can be
+ configured as a standalone server, or as a shim between your application and
+ tens, thousands, or millions of live subscribers. It can buffer messages in
+ memory, on-disk, or via Redis. All connections are handled asynchronously and
+ distributed among any number of worker processes. It can also scale to many
+ nginx server instances with Redis.
+ .
+ Full documentation available at https://nchan.slact.net
diff --git a/debian/libnginx-mod-nchan.nginx b/debian/libnginx-mod-nchan.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-nchan.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-nchan.conf b/debian/libnginx-mod.conf/mod-nchan.conf
new file mode 100644
index 0000000..0a524e5
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-nchan.conf
@@ -0,0 +1 @@
+load_module modules/ngx_nchan_module.so;
diff --git a/debian/rules b/debian/rules
index 7233af1..e1e4121 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -114,7 +114,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/nginx-development-kit \
 			--add-module=$(MODULESDIR)/nginx-echo \
 			--add-module=$(MODULESDIR)/ngx-fancyindex \
-			--add-module=$(MODULESDIR)/nchan \
+			--add-dynamic-module=$(MODULESDIR)/nchan \
 			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
 			--add-module=$(MODULESDIR)/nginx-upload-progress \
 			--add-module=$(MODULESDIR)/nginx-upstream-fair \
diff --git a/debian/tests/control b/debian/tests/control
index a222b7f..457de34 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -20,4 +20,4 @@ Depends: nginx-light, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip,
 
 Tests: extras-module-deps
 Restrictions: allow-stderr isolation-container
-Depends: nginx-extras, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream
+Depends: nginx-extras, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream, libnginx-mod-nchan

From 580a98d123a15b903713b920550a04349f6d4170 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 26 Aug 2016 16:37:07 +0300
Subject: [PATCH 088/600] Wrap tests/control

---
 debian/tests/control | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 457de34..2e6d447 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -12,12 +12,42 @@ Depends: nginx-extras, curl
 
 Tests: full-module-deps
 Restrictions: allow-stderr isolation-container
-Depends: nginx-full, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream
+Depends: nginx-full,
+         curl,
+         libnginx-mod-http-auth-pam,
+         libnginx-mod-http-geoip,
+         libnginx-mod-http-image-filter,
+         libnginx-mod-http-lua,
+         libnginx-mod-http-perl,
+         libnginx-mod-http-xslt-filter,
+         libnginx-mod-mail,
+         libnginx-mod-nchan,
+         libnginx-mod-stream
 
 Tests: light-module-deps
 Restrictions: allow-stderr isolation-container
-Depends: nginx-light, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream
+Depends: nginx-light,
+         curl,
+         libnginx-mod-http-auth-pam,
+         libnginx-mod-http-geoip,
+         libnginx-mod-http-image-filter,
+         libnginx-mod-http-lua,
+         libnginx-mod-http-perl,
+         libnginx-mod-http-xslt-filter,
+         libnginx-mod-mail,
+         libnginx-mod-nchan,
+         libnginx-mod-stream
 
 Tests: extras-module-deps
 Restrictions: allow-stderr isolation-container
-Depends: nginx-extras, curl, libnginx-mod-http-auth-pam, libnginx-mod-http-geoip, libnginx-mod-http-image-filter, libnginx-mod-http-lua, libnginx-mod-http-perl, libnginx-mod-http-xslt-filter, libnginx-mod-mail, libnginx-mod-stream, libnginx-mod-nchan
+Depends: nginx-extras,
+         curl,
+         libnginx-mod-http-auth-pam,
+         libnginx-mod-http-geoip,
+         libnginx-mod-http-image-filter,
+         libnginx-mod-http-lua,
+         libnginx-mod-http-perl,
+         libnginx-mod-http-xslt-filter,
+         libnginx-mod-mail,
+         libnginx-mod-nchan,
+         libnginx-mod-stream

From 60e563b366893679ce1ad93019ced91a4d925225 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 26 Aug 2016 16:15:06 +0300
Subject: [PATCH 089/600] Upgrade nginx-echo to v0.60

---
 debian/modules/README.Modules-versions        |    2 +-
 debian/modules/nginx-echo/.gitignore          |   65 -
 debian/modules/nginx-echo/README.markdown     | 1076 ++++++------
 debian/modules/nginx-echo/config              |   61 +-
 .../nginx-echo/doc/HttpEchoModule.wiki        | 1558 -----------------
 debian/modules/nginx-echo/src/ddebug.h        |   13 +-
 .../nginx-echo/src/ngx_http_echo_echo.c       |    8 +-
 .../nginx-echo/src/ngx_http_echo_foreach.c    |    6 +-
 .../nginx-echo/src/ngx_http_echo_handler.c    |    8 +-
 .../nginx-echo/src/ngx_http_echo_module.c     |   48 +-
 .../nginx-echo/src/ngx_http_echo_module.h     |   12 +-
 .../src/ngx_http_echo_request_info.c          |   10 +-
 .../src/ngx_http_echo_request_info.h          |   20 +-
 .../nginx-echo/src/ngx_http_echo_sleep.c      |   10 +-
 .../nginx-echo/src/ngx_http_echo_subrequest.c |   31 +-
 .../nginx-echo/src/ngx_http_echo_timer.c      |    7 +-
 .../nginx-echo/src/ngx_http_echo_util.c       |   14 +-
 .../nginx-echo/src/ngx_http_echo_util.h       |   22 +-
 debian/modules/nginx-echo/t/echo.t            |   34 +-
 debian/modules/nginx-echo/t/location.t        |    2 +-
 debian/modules/nginx-echo/t/subrequest.t      |    2 +-
 debian/modules/nginx-echo/t/unused.t          |    6 +
 debian/modules/nginx-echo/util/build.sh       |    7 +-
 debian/modules/nginx-echo/util/releng         |    8 +
 24 files changed, 765 insertions(+), 2265 deletions(-)
 delete mode 100644 debian/modules/nginx-echo/.gitignore
 delete mode 100644 debian/modules/nginx-echo/doc/HttpEchoModule.wiki
 create mode 100755 debian/modules/nginx-echo/util/releng

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 6f32994..b882e24 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -18,7 +18,7 @@ README for Modules versions
 
  nginx-echo
   Homepage: https://github.com/agentzh/echo-nginx-module
-  Version: v0.57
+  Version: v0.60
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
diff --git a/debian/modules/nginx-echo/.gitignore b/debian/modules/nginx-echo/.gitignore
deleted file mode 100644
index a9948e4..0000000
--- a/debian/modules/nginx-echo/.gitignore
+++ /dev/null
@@ -1,65 +0,0 @@
-.libs
-*.swp
-*.slo
-*.la
-*.swo
-*.lo
-*.mobi
-genmobi.sh
-*~
-*.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_
-reindex
-src/location.h
-src/filter.c
-src/subrequest.h
-src/sleep.h
-src/util.c
-src/echo.c
-src/info.c
-src/util.h
-src/var.h
-src/filter.h
-src/sleep.c
-src/var.c
-src/timer.c
-src/module.h
-src/echo.h
-src/info.h
-src/foreach.c
-src/location.c
-src/timer.h
-src/module.c
-src/subrequest.c
-src/handler.h
-src/foreach.h
-src/handler.c
-nginx
-*.html
-ctags
-t/servroot
-all
-buildroot/
-go
-Changes
-build1[0-9]
-analyze
-Makefile
-*.plist
diff --git a/debian/modules/nginx-echo/README.markdown b/debian/modules/nginx-echo/README.markdown
index c9768c2..9de2c0b 100644
--- a/debian/modules/nginx-echo/README.markdown
+++ b/debian/modules/nginx-echo/README.markdown
@@ -1,8 +1,3 @@
-<!---
-Don't edit this file manually! Instead you should generate it by using:
-    wiki2markdown.pl doc/HttpEchoModule.wiki
--->
-
 Name
 ====
 
@@ -13,6 +8,7 @@ Name
 Table of Contents
 =================
 
+* [Name](#name)
 * [Status](#status)
 * [Version](#version)
 * [Synopsis](#synopsis)
@@ -50,7 +46,6 @@ Table of Contents
     * [$echo_response_status](#echo_response_status)
 * [Installation](#installation)
 * [Compatibility](#compatibility)
-* [Known Issues](#known-issues)
 * [Modules that use this module for testing](#modules-that-use-this-module-for-testing)
 * [Community](#community)
     * [English Mailing List](#english-mailing-list)
@@ -73,203 +68,203 @@ This module is production ready.
 Version
 =======
 
-This document describes ngx_echo [v0.57](https://github.com/agentzh/echo-nginx-module/tags) released on 21 November 2014.
+This document describes ngx_echo [v0.59](https://github.com/openresty/echo-nginx-module/tags) released on 15 May 2016.
 
 Synopsis
 ========
 
 ```nginx
 
-  location /hello {
-    echo "hello, world!";
-  }
+   location /hello {
+     echo "hello, world!";
+   }
 ```
 
 ```nginx
 
-  location /hello {
-    echo -n "hello, ";
-    echo "world!";
-  }
+   location /hello {
+     echo -n "hello, ";
+     echo "world!";
+   }
 ```
 
 ```nginx
 
-  location /timed_hello {
-    echo_reset_timer;
-    echo hello world;
-    echo "'hello world' takes about $echo_timer_elapsed sec.";
-    echo hiya igor;
-    echo "'hiya igor' takes about $echo_timer_elapsed sec.";
-  }
+   location /timed_hello {
+     echo_reset_timer;
+     echo hello world;
+     echo "'hello world' takes about $echo_timer_elapsed sec.";
+     echo hiya igor;
+     echo "'hiya igor' takes about $echo_timer_elapsed sec.";
+   }
 ```
 
 ```nginx
 
-  location /echo_with_sleep {
-    echo hello;
-    echo_flush;  # ensure the client can see previous output immediately
-    echo_sleep   2.5;  # in sec
-    echo world;
-  }
+   location /echo_with_sleep {
+     echo hello;
+     echo_flush;  # ensure the client can see previous output immediately
+     echo_sleep   2.5;  # in sec
+     echo world;
+   }
 ```
 
 ```nginx
 
-  # in the following example, accessing /echo yields
-  #   hello
-  #   world
-  #   blah
-  #   hiya
-  #   igor
-  location /echo {
-      echo_before_body hello;
-      echo_before_body world;
-      proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
-      echo_after_body hiya;
-      echo_after_body igor;
-  }
-  location /echo/more {
-      echo blah;
-  }
+   # in the following example, accessing /echo yields
+   #   hello
+   #   world
+   #   blah
+   #   hiya
+   #   igor
+   location /echo {
+       echo_before_body hello;
+       echo_before_body world;
+       proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
+       echo_after_body hiya;
+       echo_after_body igor;
+   }
+   location /echo/more {
+       echo blah;
+   }
 ```
 
 ```nginx
 
-  # the output of /main might be
-  #   hello
-  #   world
-  #   took 0.000 sec for total.
-  # and the whole request would take about 2 sec to complete.
-  location /main {
-      echo_reset_timer;
-       
-      # subrequests in parallel
-      echo_location_async /sub1;
-      echo_location_async /sub2;
-       
-      echo "took $echo_timer_elapsed sec for total.";
-  }
-  location /sub1 {
-      echo_sleep 2;
-      echo hello;
-  }
-  location /sub2 {
-      echo_sleep 1;
-      echo world;
-  }
+   # the output of /main might be
+   #   hello
+   #   world
+   #   took 0.000 sec for total.
+   # and the whole request would take about 2 sec to complete.
+   location /main {
+       echo_reset_timer;
+
+       # subrequests in parallel
+       echo_location_async /sub1;
+       echo_location_async /sub2;
+
+       echo "took $echo_timer_elapsed sec for total.";
+   }
+   location /sub1 {
+       echo_sleep 2;
+       echo hello;
+   }
+   location /sub2 {
+       echo_sleep 1;
+       echo world;
+   }
 ```
 
 ```nginx
 
-  # the output of /main might be
-  #   hello
-  #   world
-  #   took 3.003 sec for total.
-  # and the whole request would take about 3 sec to complete.
-  location /main {
-      echo_reset_timer;
-      
-      # subrequests in series (chained by CPS)
-      echo_location /sub1;
-      echo_location /sub2;
-      
-      echo "took $echo_timer_elapsed sec for total.";
-  }
-  location /sub1 {
-      echo_sleep 2;
-      echo hello;
-  }
-  location /sub2 {
-      echo_sleep 1;
-      echo world;
-  }
+   # the output of /main might be
+   #   hello
+   #   world
+   #   took 3.003 sec for total.
+   # and the whole request would take about 3 sec to complete.
+   location /main {
+       echo_reset_timer;
+
+       # subrequests in series (chained by CPS)
+       echo_location /sub1;
+       echo_location /sub2;
+
+       echo "took $echo_timer_elapsed sec for total.";
+   }
+   location /sub1 {
+       echo_sleep 2;
+       echo hello;
+   }
+   location /sub2 {
+       echo_sleep 1;
+       echo world;
+   }
 ```
 
 ```nginx
 
-  # Accessing /dup gives
-  #   ------ END ------
-  location /dup {
-    echo_duplicate 3 "--";
-    echo_duplicate 1 " END ";
-    echo_duplicate 3 "--";
-    echo;
-  }
+   # Accessing /dup gives
+   #   ------ END ------
+   location /dup {
+     echo_duplicate 3 "--";
+     echo_duplicate 1 " END ";
+     echo_duplicate 3 "--";
+     echo;
+   }
 ```
 
 ```nginx
 
-  # /bighello will generate 1000,000,000 hello's.
-  location /bighello {
-    echo_duplicate 1000_000_000 'hello';
-  }
+   # /bighello will generate 1000,000,000 hello's.
+   location /bighello {
+     echo_duplicate 1000_000_000 'hello';
+   }
 ```
 
 ```nginx
 
-  # echo back the client request
-  location /echoback {
-    echo_duplicate 1 $echo_client_request_headers;
-    echo "\r";
-    
-    echo_read_request_body;
-    
-    echo_request_body;
-  }
+   # echo back the client request
+   location /echoback {
+     echo_duplicate 1 $echo_client_request_headers;
+     echo "\r";
+
+     echo_read_request_body;
+
+     echo_request_body;
+   }
 ```
 
 ```nginx
 
-  # GET /multi will yields
-  #   querystring: foo=Foo
-  #   method: POST
-  #   body: hi
-  #   content length: 2
-  #   ///
-  #   querystring: bar=Bar
-  #   method: PUT
-  #   body: hello
-  #   content length: 5
-  #   ///
-  location /multi {
-      echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
-      echo_subrequest_async PUT '/sub' -q 'bar=Bar' -b 'hello';
-  }
-  location /sub {
-      echo "querystring: $query_string";
-      echo "method: $echo_request_method";
-      echo "body: $echo_request_body";
-      echo "content length: $http_content_length";
-      echo '///';
-  }
+   # GET /multi will yields
+   #   querystring: foo=Foo
+   #   method: POST
+   #   body: hi
+   #   content length: 2
+   #   ///
+   #   querystring: bar=Bar
+   #   method: PUT
+   #   body: hello
+   #   content length: 5
+   #   ///
+   location /multi {
+       echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
+       echo_subrequest_async PUT '/sub' -q 'bar=Bar' -b 'hello';
+   }
+   location /sub {
+       echo "querystring: $query_string";
+       echo "method: $echo_request_method";
+       echo "body: $echo_request_body";
+       echo "content length: $http_content_length";
+       echo '///';
+   }
 ```
 
 ```nginx
 
-  # GET /merge?/foo.js&/bar/blah.js&/yui/baz.js will merge the .js resources together
-  location /merge {
-      default_type 'text/javascript';
-      echo_foreach_split '&' $query_string;
-          echo "/* JS File $echo_it */";
-          echo_location_async $echo_it;
-          echo;
-      echo_end;
-  }
+   # GET /merge?/foo.js&/bar/blah.js&/yui/baz.js will merge the .js resources together
+   location /merge {
+       default_type 'text/javascript';
+       echo_foreach_split '&' $query_string;
+           echo "/* JS File $echo_it */";
+           echo_location_async $echo_it;
+           echo;
+       echo_end;
+   }
 ```
 
 ```nginx
 
-  # accessing /if?val=abc yields the "hit" output
-  # while /if?val=bcd yields "miss":
-  location ^~ /if {
-      set $res miss;
-      if ($arg_val ~* '^a') {
-          set $res hit;
-          echo $res;
-      }
-      echo $res;
-  }
+   # accessing /if?val=abc yields the "hit" output
+   # while /if?val=bcd yields "miss":
+   location ^~ /if {
+       set $res miss;
+       if ($arg_val ~* '^a') {
+           set $res hit;
+           echo $res;
+       }
+       echo $res;
+   }
 ```
 
 [Back to TOC](#table-of-contents)
@@ -316,43 +311,43 @@ The MIME type set by the [standard default_type directive](http://nginx.org/en/d
 
 ```nginx
 
-  location /hello {
-    default_type text/plain;
-    echo hello;
-  }
+   location /hello {
+     default_type text/plain;
+     echo hello;
+   }
 ```
 
 Then on the client side:
 
 ```bash
 
-  $ curl -I 'http://localhost/echo'
-  HTTP/1.1 200 OK
-  Server: nginx/0.8.20
-  Date: Sat, 17 Oct 2009 03:40:19 GMT
-  Content-Type: text/plain
-  Connection: keep-alive
+   $ curl -I 'http://localhost/echo'
+   HTTP/1.1 200 OK
+   Server: nginx/0.8.20
+   Date: Sat, 17 Oct 2009 03:40:19 GMT
+   Content-Type: text/plain
+   Connection: keep-alive
 ```
 
 Since the [v0.22](#v022) release, all of the directives are allowed in the [rewrite module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)'s [if](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#if) directive block, for instance:
 
 ```nginx
 
-location ^~ /if {
-    set $res miss;
-    if ($arg_val ~* '^a') {
-        set $res hit;
-        echo $res;
-    }
-    echo $res;
-}
+ location ^~ /if {
+     set $res miss;
+     if ($arg_val ~* '^a') {
+         set $res hit;
+         echo $res;
+     }
+     echo $res;
+ }
 ```
 
 [Back to TOC](#table-of-contents)
 
 echo
 ----
-**syntax:** *echo [options] &lt;string&gt;...*
+**syntax:** *echo \[options\] &lt;string&gt;...*
 
 **default:** *no*
 
@@ -366,8 +361,8 @@ Note that the data might be buffered by Nginx's underlying buffer. To force the
 
 ```nginx
 
-   echo hello world;
-   echo_flush;
+    echo hello world;
+    echo_flush;
 ```
 
 When no argument is specified, *echo* emits the trailing newline alone, just like the *echo* command in shell.
@@ -376,7 +371,7 @@ Variables may appear in the arguments. An example is
 
 ```nginx
 
-   echo The current request uri is $request_uri;
+    echo The current request uri is $request_uri;
 ```
 
 where [$request_uri](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_uri) is a variable exposed by the [ngx_http_core_module](http://nginx.org/en/docs/http/ngx_http_core_module.html).
@@ -385,19 +380,19 @@ This command can be used multiple times in a single location configuration, as i
 
 ```nginx
 
-location /echo {
-    echo hello;
-    echo world;
-}
+ location /echo {
+     echo hello;
+     echo world;
+ }
 ```
 
 The output on the client side looks like this
 
 ```bash
 
-$ curl 'http://localhost/echo'
-hello
-world
+ $ curl 'http://localhost/echo'
+ hello
+ world
 ```
 
 Special characters like newlines (`\n`) and tabs (`\t`) can be escaped using C-style escaping sequences. But a notable exception is the dollar sign (`$`). As of Nginx 0.8.20, there's still no clean way to esacpe this characters. (A work-around might be to use a `$echo_dollor` variable that is always evaluated to the constant `$` character. This feature will possibly be introduced in a future version of this module.)
@@ -406,57 +401,59 @@ As of the echo [v0.28](#v028) release, one can suppress the trailing newline cha
 
 ```nginx
 
-location /echo {
-    echo -n "hello, ";
-    echo "world";
-}
+ location /echo {
+     echo -n "hello, ";
+     echo "world";
+ }
 ```
 
 Accessing `/echo` gives
 
 ```bash
 
-$ curl 'http://localhost/echo'
-hello, world
+ $ curl 'http://localhost/echo'
+ hello, world
 ```
 
 Leading `-n` in variable values won't take effect and will be emitted literally, as in
 
 ```nginx
 
-location /echo {
-    set $opt -n;
-    echo $opt "hello,";
-    echo "world";
-}
+ location /echo {
+     set $opt -n;
+     echo $opt "hello,";
+     echo "world";
+ }
 ```
 
 This gives the following output
 
 ```bash
 
-$ curl 'http://localhost/echo'
--n hello,
-world
+ $ curl 'http://localhost/echo'
+ -n hello,
+ world
 ```
 
 One can output leading `-n` literals and other options using the special `--` option like this
 
 ```nginx
 
-location /echo {
-    echo -- -n is an option;
-}
+ location /echo {
+     echo -- -n is an option;
+ }
 ```
 
 which yields
 
 ```bash
 
-$ curl 'http://localhost/echo'
--n is an option
+ $ curl 'http://localhost/echo'
+ -n is an option
 ```
 
+Use this form when you want to output anything leading with a dash (`-`).
+
 [Back to TOC](#table-of-contents)
 
 echo_duplicate
@@ -469,26 +466,26 @@ echo_duplicate
 
 **phase:** *content*
 
-Outputs duplication of a string indicated by the second argument, using the times specified in the first argument.
+Outputs duplication of a string indicated by the second argument, using the count specified in the first argument.
 
 For instance,
 
 ```nginx
 
-  location /dup {
-      echo_duplicate 3 "abc";
-  }
+   location /dup {
+       echo_duplicate 3 "abc";
+   }
 ```
 
-will lead to an output of `"abcabcabc"`.
+will lead to the output of `"abcabcabc"`.
 
 Underscores are allowed in the count number, just like in Perl. For example, to emit 1000,000,000 instances of `"hello, world"`:
 
 ```nginx
 
-  location /many_hellos {
-      echo_duplicate 1000_000_000 "hello, world";
-  }
+   location /many_hellos {
+       echo_duplicate 1000_000_000 "hello, world";
+   }
 ```
 
 The `count` argument could be zero, but not negative. The second `string` argument could be an empty string ("") likewise.
@@ -497,21 +494,22 @@ Unlike the [echo](#echo) directive, no trailing newline is appended to the resul
 
 ```nginx
 
-  location /echo_art {
-      echo_duplicate 2 '---';
-      echo_duplicate 1 ' END ';  # we don't want a trailing newline here
-      echo_duplicate 2 '---';
-      echo;  # we want a trailing newline here...
-  }
+   location /echo_art {
+       echo_duplicate 2 '---';
+       echo_duplicate 1 ' END ';  # we don't want a trailing newline here
+       echo_duplicate 2 '---';
+       echo;  # we want a trailing newline here...
+   }
 ```
 
 You get
 
 ```bash
-
-  ------ END ------
+   ------ END ------
 ```
 
+But use of the `-n` option in [echo](#echo) is more appropriate for this purpose.
+
 This directive was first introduced in [version 0.11](#v011).
 
 [Back to TOC](#table-of-contents)
@@ -536,14 +534,14 @@ Consider the following example:
 
 ```nginx
 
-  location /flush {
-     echo hello;
-     
-     echo_flush;
-     
-     echo_sleep 1;
-     echo world;
-  }
+   location /flush {
+      echo hello;
+
+      echo_flush;
+
+      echo_sleep 1;
+      echo world;
+   }
 ```
 
 Then on the client side, using curl to access `/flush`, you'll see the "hello" line immediately, but only after 1 second, the last "world" line. Without calling `echo_flush` in the example above, you'll most likely see no output until 1 second is elapsed due to the internal buffering of Nginx.
@@ -552,14 +550,14 @@ This directive will fail to flush the output buffer in case of subrequests get i
 
 ```nginx
 
-  location /main {
-      echo_location_async /sub;
-      echo hello;
-      echo_flush;
-  }
-  location /sub {
-      echo_sleep 1;
-  }
+   location /main {
+       echo_location_async /sub;
+       echo hello;
+       echo_flush;
+   }
+   location /sub {
+       echo_sleep 1;
+   }
 ```
 
 Then the client won't see "hello" appear even if `echo_flush` has been executed before the subrequest to `/sub` has actually started executing. The outputs of `/main` that are sent *after* [echo_location_async](#echo_location_async) will be postponed and buffered firmly.
@@ -568,14 +566,14 @@ This does *not* apply to outputs sent before the subrequest initiated. For a mod
 
 ```nginx
 
-  location /main {
-      echo hello;
-      echo_flush;
-      echo_location_async /sub;
-  }
-  location /sub {
-      echo_sleep 1;
-  }
+   location /main {
+       echo hello;
+       echo_flush;
+       echo_location_async /sub;
+   }
+   location /sub {
+       echo_sleep 1;
+   }
 ```
 
 The client will immediately see "hello" before `/sub` enters sleeping.
@@ -604,10 +602,10 @@ An example is
 
 ```nginx
 
-   location /echo_after_sleep {
-       echo_sleep 1.234;
-       echo resumed!;
-   }
+    location /echo_after_sleep {
+        echo_sleep 1.234;
+        echo resumed!;
+    }
 ```
 
 Behind the scene, it sets up a per-request "sleep" ngx_event_t object, and adds a timer using that custom event to the Nginx event model and just waits for a timeout on that event. Because the "sleep" event is per-request, this directive can work in parallel subrequests.
@@ -650,24 +648,24 @@ The timer begin time is default to the starting time of the current request and
 
 ```nginx
 
-  location /timed_sleep {
-      echo_sleep 0.03;
-      echo "$echo_timer_elapsed sec elapsed.";
-      
-      echo_reset_timer;
-      
-      echo_sleep 0.02;
-      echo "$echo_timer_elapsed sec elapsed.";
-  }
+   location /timed_sleep {
+       echo_sleep 0.03;
+       echo "$echo_timer_elapsed sec elapsed.";
+
+       echo_reset_timer;
+
+       echo_sleep 0.02;
+       echo "$echo_timer_elapsed sec elapsed.";
+   }
 ```
 
 The output on the client side might be
 
 ```bash
 
-$ curl 'http://localhost/timed_sleep'
-0.032 sec elapsed.
-0.020 sec elapsed.
+ $ curl 'http://localhost/timed_sleep'
+ 0.032 sec elapsed.
+ 0.020 sec elapsed.
 ```
 
 The actual figures you get on your side may vary a bit due to your system's current activities.
@@ -698,29 +696,29 @@ Here's an example for echo'ing back the original HTTP client request (both heade
 
 ```nginx
 
-  location /echoback {
-    echo_duplicate 1 $echo_client_request_headers;
-    echo "\r";
-    echo_read_request_body;
-    echo $request_body;
-  }
+   location /echoback {
+     echo_duplicate 1 $echo_client_request_headers;
+     echo "\r";
+     echo_read_request_body;
+     echo $request_body;
+   }
 ```
 
 The content of `/echoback` looks like this on my side (I was using Perl's LWP utility to access this location on the server):
 
 ```bash
 
-  $ (echo hello; echo world) | lwp-request -m POST 'http://localhost/echoback'
-  POST /echoback HTTP/1.1
-  TE: deflate,gzip;q=0.3
-  Connection: TE, close
-  Host: localhost
-  User-Agent: lwp-request/5.818 libwww-perl/5.820
-  Content-Length: 12
-  Content-Type: application/x-www-form-urlencoded
-  
-  hello
-  world
+   $ (echo hello; echo world) | lwp-request -m POST 'http://localhost/echoback'
+   POST /echoback HTTP/1.1
+   TE: deflate,gzip;q=0.3
+   Connection: TE, close
+   Host: localhost
+   User-Agent: lwp-request/5.818 libwww-perl/5.820
+   Content-Length: 12
+   Content-Type: application/x-www-form-urlencoded
+
+   hello
+   world
 ```
 
 Because `/echoback` is the main request, [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) holds the original client request body.
@@ -749,55 +747,55 @@ A very simple example is
 
 ```nginx
 
-location /main {
-    echo_location_async /sub;
-    echo world;
-}
-location /sub {
-    echo hello;
-}
+ location /main {
+     echo_location_async /sub;
+     echo world;
+ }
+ location /sub {
+     echo hello;
+ }
 ```
 
 Accessing `/main` gets
 
 ```bash
 
-  hello
-  world
+   hello
+   world
 ```
 
 Calling multiple locations in parallel is also possible:
 
 ```nginx
 
-location /main {
-    echo_reset_timer;
-    echo_location_async /sub1;
-    echo_location_async /sub2;
-    echo "took $echo_timer_elapsed sec for total.";
-}
-location /sub1 {
-    echo_sleep 2; # sleeps 2 sec
-    echo hello;
-}
-location /sub2 {
-    echo_sleep 1; # sleeps 1 sec
-    echo world;
-}
+ location /main {
+     echo_reset_timer;
+     echo_location_async /sub1;
+     echo_location_async /sub2;
+     echo "took $echo_timer_elapsed sec for total.";
+ }
+ location /sub1 {
+     echo_sleep 2; # sleeps 2 sec
+     echo hello;
+ }
+ location /sub2 {
+     echo_sleep 1; # sleeps 1 sec
+     echo world;
+ }
 ```
 
 Accessing `/main` yields
 
 ```bash
 
-  $ time curl 'http://localhost/main'
-  hello
-  world
-  took 0.000 sec for total.
-  
-  real  0m2.006s
-  user  0m0.000s
-  sys   0m0.004s
+   $ time curl 'http://localhost/main'
+   hello
+   world
+   took 0.000 sec for total.
+
+   real  0m2.006s
+   user  0m0.000s
+   sys   0m0.004s
 ```
 
 You can see that the main handler `/main` does *not* wait the subrequests `/sub1` and `/sub2` to complete and quickly goes on, hence the "0.000 sec" timing result. The whole request, however takes approximately 2 sec in total to complete because `/sub1` and `/sub2` run in parallel (or "concurrently" to be more accurate).
@@ -808,20 +806,20 @@ Locations can also take an optional querystring argument, for instance
 
 ```nginx
 
-location /main {
-    echo_location_async /sub 'foo=Foo&bar=Bar';
-}
-location /sub {
-    echo $arg_foo $arg_bar;
-}
+ location /main {
+     echo_location_async /sub 'foo=Foo&bar=Bar';
+ }
+ location /sub {
+     echo $arg_foo $arg_bar;
+ }
 ```
 
 Accessing `/main` yields
 
 ```bash
 
-  $ curl 'http://localhost/main'
-  Foo Bar
+   $ curl 'http://localhost/main'
+   Foo Bar
 ```
 
 Querystrings is *not* allowed to be concatenated onto the `location` argument with "?" directly, for example, `/sub?foo=Foo&bar=Bar` is an invalid location, and shouldn't be fed as the first argument to this directive.
@@ -834,20 +832,18 @@ This directive is logically equivalent to the GET version of [echo_subrequest_as
 
 ```nginx
 
-  echo_location_async /foo 'bar=Bar';
+   echo_location_async /foo 'bar=Bar';
 ```
 
 is logically equivalent to
 
 ```nginx
 
-  echo_subrequest_async GET /foo -q 'bar=Bar';
+   echo_subrequest_async GET /foo -q 'bar=Bar';
 ```
 
 But calling this directive is slightly faster than calling [echo_subrequest_async](#echo_subrequest_async) using `GET` because we don't have to parse the HTTP method names like `GET` and options like `-q`.
 
-There is a known issue with this directive when disabling the standard [standard SSI module](http://nginx.org/en/docs/http/ngx_http_ssi_module.html). See [Known Issues](#known-issues) for more details.
-
 This directive is first introduced in [version 0.09](#v009) of this module and requires at least Nginx 0.7.46.
 
 [Back to TOC](#table-of-contents)
@@ -870,48 +866,48 @@ Consider the following example:
 
 ```nginx
 
-location /main {
-    echo_reset_timer;
-    echo_location /sub1;
-    echo_location /sub2;
-    echo "took $echo_timer_elapsed sec for total.";
-}
-location /sub1 {
-    echo_sleep 2;
-    echo hello;
-}
-location /sub2 {
-    echo_sleep 1;
-    echo world;
-}
+ location /main {
+     echo_reset_timer;
+     echo_location /sub1;
+     echo_location /sub2;
+     echo "took $echo_timer_elapsed sec for total.";
+ }
+ location /sub1 {
+     echo_sleep 2;
+     echo hello;
+ }
+ location /sub2 {
+     echo_sleep 1;
+     echo world;
+ }
 ```
 
 The location `/main` above will take for total 3 sec to complete (compared to 2 sec if [echo_location_async](#echo_location_async) is used instead here). Here's the result in action on my machine:
 
 ```bash
 
-  $ curl 'http://localhost/main'
-  hello
-  world
-  took 3.003 sec for total.
-  
-  real  0m3.027s
-  user  0m0.020s
-  sys   0m0.004s
+   $ curl 'http://localhost/main'
+   hello
+   world
+   took 3.003 sec for total.
+
+   real  0m3.027s
+   user  0m0.020s
+   sys   0m0.004s
 ```
 
 This directive is logically equivalent to the GET version of [echo_subrequest](#echo_subrequest). For example,
 
 ```nginx
 
-  echo_location /foo 'bar=Bar';
+   echo_location /foo 'bar=Bar';
 ```
 
 is logically equivalent to
 
 ```nginx
 
-  echo_subrequest GET /foo -q 'bar=Bar';
+   echo_subrequest GET /foo -q 'bar=Bar';
 ```
 
 But calling this directive is slightly faster than calling [echo_subrequest](#echo_subrequest) using `GET` because we don't have to parse the HTTP method names like `GET` and options like `-q`.
@@ -944,67 +940,67 @@ Here's a small example demonstrating its usage:
 
 ```nginx
 
-location /multi {
-    # body defined as string
-    echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
-    # body defined as path to a file, relative to nginx prefix path if not absolute
-    echo_subrequest_async PUT '/sub' -q 'bar=Bar' -f '/tmp/hello.txt';
-}
-location /sub {
-    echo "querystring: $query_string";
-    echo "method: $echo_request_method";
-    echo "body: $echo_request_body";
-    echo "content length: $http_content_length";
-    echo '///';
-}
+ location /multi {
+     # body defined as string
+     echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
+     # body defined as path to a file, relative to nginx prefix path if not absolute
+     echo_subrequest_async PUT '/sub' -q 'bar=Bar' -f '/tmp/hello.txt';
+ }
+ location /sub {
+     echo "querystring: $query_string";
+     echo "method: $echo_request_method";
+     echo "body: $echo_request_body";
+     echo "content length: $http_content_length";
+     echo '///';
+ }
 ```
 
 Then on the client side:
 
 ```bash
 
-  $ echo -n hello > /tmp/hello.txt
-  $ curl 'http://localhost/multi'
-  querystring: foo=Foo
-  method: POST
-  body: hi
-  content length: 2
-  ///
-  querystring: bar=Bar
-  method: PUT
-  body: hello
-  content length: 5
-  ///
+   $ echo -n hello > /tmp/hello.txt
+   $ curl 'http://localhost/multi'
+   querystring: foo=Foo
+   method: POST
+   body: hi
+   content length: 2
+   ///
+   querystring: bar=Bar
+   method: PUT
+   body: hello
+   content length: 5
+   ///
 ```
 
 Here's more funny example using the standard [proxy module](#httpproxymodule) to handle the subrequest:
 
 ```nginx
 
-location /main {
-    echo_subrequest_async POST /sub -b 'hello, world';
-}
-location /sub {
-    proxy_pass $scheme://127.0.0.1:$server_port/proxied;
-}
-location /proxied {
-    echo "method: $echo_request_method.";
-    
-    # we need to read body explicitly here...or $echo_request_body
-    #   will evaluate to empty ("")
-    echo_read_request_body;
-    
-    echo "body: $echo_request_body.";
-}
+ location /main {
+     echo_subrequest_async POST /sub -b 'hello, world';
+ }
+ location /sub {
+     proxy_pass $scheme://127.0.0.1:$server_port/proxied;
+ }
+ location /proxied {
+     echo "method: $echo_request_method.";
+
+     # we need to read body explicitly here...or $echo_request_body
+     #   will evaluate to empty ("")
+     echo_read_request_body;
+
+     echo "body: $echo_request_body.";
+ }
 ```
 
 Then on the client side, we can see that
 
 ```bash
 
-  $ curl 'http://localhost/main'
-  method: POST.
-  body: hello, world.
+   $ curl 'http://localhost/main'
+   method: POST.
+   body: hello, world.
 ```
 
 Nginx named locations like `@foo` is *not* supported here.
@@ -1026,8 +1022,6 @@ The `-f` option to define a file path for the body was introduced in the [releas
 
 See also the [echo_subrequest](#echo_subrequest) and [echo_location_async](#echo_location_async) directives.
 
-There is a known issue with this directive when disabling the standard [standard SSI module](http://nginx.org/en/docs/http/ngx_http_ssi_module.html). See [Known Issues](#known-issues) for more details.
-
 [Back to TOC](#table-of-contents)
 
 echo_subrequest
@@ -1064,21 +1058,21 @@ Split the second argument `string` using the delimiter specified in the first ar
 
 ```nginx
 
-  location /loop {
-    echo_foreach_split ',' $arg_list;
-      echo "item: $echo_it";
-    echo_end;
-  }
+   location /loop {
+     echo_foreach_split ',' $arg_list;
+       echo "item: $echo_it";
+     echo_end;
+   }
 ```
 
 Accessing /main yields
 
 ```bash
 
-  $ curl 'http://localhost/loop?list=cat,dog,mouse'
-  item: cat
-  item: dog
-  item: mouse
+   $ curl 'http://localhost/loop?list=cat,dog,mouse'
+   item: cat
+   item: dog
+   item: mouse
 ```
 
 As seen in the previous example, this directive should always be accompanied by an [echo_end](#echo_end) directive.
@@ -1089,41 +1083,41 @@ The `delimiter` argument could contain *multiple* arbitrary characters, like
 
 ```nginx
 
-  # this outputs "cat\ndog\nmouse\n"
-  echo_foreach_split -- '-a-' 'cat-a-dog-a-mouse';
-    echo $echo_it;
-  echo_end;
+   # this outputs "cat\ndog\nmouse\n"
+   echo_foreach_split -- '-a-' 'cat-a-dog-a-mouse';
+     echo $echo_it;
+   echo_end;
 ```
 
 Logically speaking, this looping structure is just the `foreach` loop combined with a `split` function call in Perl (using the previous example):
 
 ```perl
 
-   foreach (split ',', $arg_list) {
-       print "item $_\n";
-   }
+    foreach (split ',', $arg_list) {
+        print "item $_\n";
+    }
 ```
 
 People will also find it useful in merging multiple `.js` or `.css` resources into a whole. Here's an example:
 
 ```nginx
 
-  location /merge {
-      default_type 'text/javascript';
-      
-      echo_foreach_split '&' $query_string;
-          echo "/* JS File $echo_it */";
-          echo_location_async $echo_it;
-          echo;
-      echo_end;
-  }
+   location /merge {
+       default_type 'text/javascript';
+
+       echo_foreach_split '&' $query_string;
+           echo "/* JS File $echo_it */";
+           echo_location_async $echo_it;
+           echo;
+       echo_end;
+   }
 ```
 
 Then accessing /merge to merge the `.js` resources specified in the query string:
 
 ```bash
 
-  $ curl 'http://localhost/merge?/foo/bar.js&/yui/blah.js&/baz.js'
+   $ curl 'http://localhost/merge?/foo/bar.js&/yui/blah.js&/baz.js'
 ```
 
 One can also use third-party Nginx cache module to cache the merged response generated by the `/merge` location in the previous example.
@@ -1164,9 +1158,9 @@ Behind the scene, it's implemented roughly like this:
 
 ```C
 
-  if (r->request_body && r->request_body->bufs) {
-      return ngx_http_output_filter(r, r->request_body->bufs);
-  }
+   if (r->request_body && r->request_body->bufs) {
+       return ngx_http_output_filter(r, r->request_body->bufs);
+   }
 ```
 
 Unlike the [$echo_request_body](#echo_request_body) and $request_body variables, this directive will show the whole request body even if some parts or all parts of it are saved in temporary files on the disk.
@@ -1195,38 +1189,38 @@ Does an internal redirect to the location specified. An optional query string ca
 
 ```nginx
 
-  location /foo {
-      echo_exec /bar weight=5;
-  }
-  location /bar {
-      echo $arg_weight;
-  }
+   location /foo {
+       echo_exec /bar weight=5;
+   }
+   location /bar {
+       echo $arg_weight;
+   }
 ```
 
 Or equivalently
 
 ```nginx
 
-  location /foo {
-      echo_exec /bar?weight=5;
-  }
-  location /bar {
-      echo $arg_weight;
-  }
+   location /foo {
+       echo_exec /bar?weight=5;
+   }
+   location /bar {
+       echo $arg_weight;
+   }
 ```
 
 Named locations are also supported. Here's an example:
 
 ```nginx
 
-  location /foo {
-      echo_exec @bar;
-  }
-  location @bar {
-      # you'll get /foo rather than @bar
-      #  due to a potential bug in nginx.
-      echo $echo_request_uri;
-  }
+   location /foo {
+       echo_exec @bar;
+   }
+   location @bar {
+       # you'll get /foo rather than @bar
+       #  due to a potential bug in nginx.
+       echo $echo_request_uri;
+   }
 ```
 
 But query string (if any) will always be ignored for named location redirects due to a limitation in the `ngx_http_named_location` function.
@@ -1255,10 +1249,10 @@ Here is an example,
 
 ```nginx
 
-location = /bad {
-    echo_status 404;
-    echo "Something is missing...";
-}
+ location = /bad {
+     echo_status 404;
+     echo "Something is missing...";
+ }
 ```
 
 then we get a response like this:
@@ -1289,7 +1283,7 @@ Every filter directive supports variable interpolation in its arguments (if any)
 
 echo_before_body
 ----------------
-**syntax:** *echo_before_body [options] [argument]...*
+**syntax:** *echo_before_body \[options\] \[argument\]...*
 
 **default:** *no*
 
@@ -1303,21 +1297,21 @@ An example is
 
 ```nginx
 
-location /echo {
-    echo_before_body hello;
-    proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
-}
-location /echo/more {
-    echo world
-}
+ location /echo {
+     echo_before_body hello;
+     proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
+ }
+ location /echo/more {
+     echo world
+ }
 ```
 
 Accessing `/echo` from the client side yields
 
 ```bash
 
-  hello
-  world
+   hello
+   world
 ```
 
 In the previous sample, we borrow the [standard proxy module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) to serve as the underlying content handler that generates the "main contents".
@@ -1326,21 +1320,21 @@ Multiple instances of this filter directive are also allowed, as in:
 
 ```nginx
 
-location /echo {
-    echo_before_body hello;
-    echo_before_body world;
-    echo !;
-}
+ location /echo {
+     echo_before_body hello;
+     echo_before_body world;
+     echo !;
+ }
 ```
 
 On the client side, the output is like
 
 ```bash
 
-  $ curl 'http://localhost/echo'
-  hello
-  world
-  !
+   $ curl 'http://localhost/echo'
+   hello
+   world
+   !
 ```
 
 In this example, we also use the [content handler directives](#content-handler-directives) provided by this module as the underlying content handler.
@@ -1353,7 +1347,7 @@ This directive can be mixed with its brother directive [echo_after_body](#echo_a
 
 echo_after_body
 ---------------
-**syntax:** *echo_after_body [argument]...*
+**syntax:** *echo_after_body \[argument\]...*
 
 **default:** *no*
 
@@ -1367,13 +1361,13 @@ Here's a simple example:
 
 ```nginx
 
-location /echo {
-    echo_after_body hello;
-    proxy_pass http://127.0.0.1:$server_port$request_uri/more;
-}
-location /echo/more {
-    echo world
-}
+ location /echo {
+     echo_after_body hello;
+     proxy_pass http://127.0.0.1:$server_port$request_uri/more;
+ }
+ location /echo/more {
+     echo world
+ }
 ```
 
 Accessing `/echo` from the client side yields
@@ -1387,12 +1381,12 @@ Multiple instances are allowed, as in:
 
 ```nginx
 
-location /echo {
-    echo_after_body hello;
-    echo_after_body world;
-    echo i;
-    echo say;
-}
+ location /echo {
+     echo_after_body hello;
+     echo_after_body world;
+     echo i;
+     echo say;
+ }
 ```
 
 The output on the client side while accessing the `/echo` location looks like
@@ -1479,22 +1473,22 @@ A simple example is below:
 
 ```nginx
 
-  location /echoback {
-     echo "headers are:"
-     echo $echo_client_request_headers;
-  }
+   location /echoback {
+      echo "headers are:"
+      echo $echo_client_request_headers;
+   }
 ```
 
 Accessing `/echoback` yields
 
 ```bash
 
-  $ curl 'http://localhost/echoback'
-  headers are
-  GET /echoback HTTP/1.1
-  User-Agent: curl/7.18.2 (i486-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.8g
-  Host: localhost:1984
-  Accept: */*
+   $ curl 'http://localhost/echoback'
+   headers are
+   GET /echoback HTTP/1.1
+   User-Agent: curl/7.18.2 (i486-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.8g
+   Host: localhost:1984
+   Accept: */*
 ```
 
 Behind the scene, it recovers `r->main->header_in` (or the large header buffers, if any) on the C level and does not construct the headers itself by traversing parsed results in the request object.
@@ -1534,15 +1528,15 @@ Consider the following example
 
 ```Nginx
 
-location /main {
-    echo "main pre: $echo_incr";
-    echo_location_async /sub;
-    echo_location_async /sub;
-    echo "main post: $echo_incr";
-}
-location /sub {
-    echo "sub: $echo_incr";
-}
+ location /main {
+     echo "main pre: $echo_incr";
+     echo_location_async /sub;
+     echo_location_async /sub;
+     echo "main post: $echo_incr";
+ }
+ location /sub {
+     echo "sub: $echo_incr";
+ }
 ```
 
 Accessing `/main` yields
@@ -1570,30 +1564,38 @@ This directive was first introduced in the [v0.23 release](#v023).
 Installation
 ============
 
-You're recommended to install this module (as well as the Nginx core and many other goodies) via the [ngx_openresty bundle](http://openresty.org). See [the detailed instructions](http://openresty.org/#Installation) for downloading and installing ngx_openresty into your system. This is the easiest and most safe way to set things up.
+You're recommended to install this module (as well as the Nginx core and many other goodies) via the [OpenResty bundle](http://openresty.org). See [the detailed instructions](http://openresty.org/#Installation) for downloading and installing OpenResty into your system. This is the easiest and most safe way to set things up.
 
 Alternatively, you can install this module manually with the Nginx source:
 
 Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
-the version 1.7.7 (see [nginx compatibility](#compatibility)), and then build the source with this module:
+the version 1.9.15 (see [nginx compatibility](#compatibility)), and then build the source with this module:
 
 ```bash
 
-$ wget 'http://nginx.org/download/nginx-1.7.7.tar.gz'
-$ tar -xzvf nginx-1.7.7.tar.gz
-$ cd nginx-1.7.7/
+ $ wget 'http://nginx.org/download/nginx-1.9.15.tar.gz'
+ $ tar -xzvf nginx-1.9.15.tar.gz
+ $ cd nginx-1.9.15/
 
-# Here we assume you would install you nginx under /opt/nginx/.
-$ ./configure --prefix=/opt/nginx \
-    --add-module=/path/to/echo-nginx-module
- 
-$ make -j2
-$ make install
+ # Here we assume you would install you nginx under /opt/nginx/.
+ $ ./configure --prefix=/opt/nginx \
+     --add-module=/path/to/echo-nginx-module
+
+ $ make -j2
+ $ make install
 ```
 
-Download the latest version of the release tarball of this module from [echo-nginx-module file list](https://github.com/agentzh/echo-nginx-module/tags).
+Download the latest version of the release tarball of this module from [echo-nginx-module file list](https://github.com/openresty/echo-nginx-module/tags).
 
-Also, this module is included and enabled by default in the [ngx_openresty bundle](http://openresty.org).
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ngx_http_echo_module.so;
+```
+
+Also, this module is included and enabled by default in the [OpenResty bundle](http://openresty.org).
 
 [Back to TOC](#table-of-contents)
 
@@ -1602,7 +1604,9 @@ Compatibility
 
 The following versions of Nginx should work with this module:
 
-* **1.7.x**                       (last tested: 1.7.7)
+* **1.9.x**                       (last tested: 1.9.15)
+* **1.8.x**
+* **1.7.x**                       (last tested: 1.7.10)
 * **1.6.x**
 * **1.5.x**                       (last tested: 1.5.12)
 * **1.4.x**                       (last tested: 1.4.4)
@@ -1626,20 +1630,6 @@ If you find that any particular version of Nginx above 0.7.21 does not work with
 
 [Back to TOC](#table-of-contents)
 
-Known Issues
-============
-
-Due to an unknown bug in Nginx (it still exists in Nginx 1.7.7), the [standard SSI module](http://nginx.org/en/docs/http/ngx_http_ssi_module.html) is required to ensure that the contents of the subrequests issued by [echo_locatoin_async](#echo_location_async) and [echo_subrequest_async](#echo_subrequest_async) are correctly merged into the output chains of the main one. Fortunately, the SSI module is enabled by default during Nginx's `configure` process.
-
-If calling this directive without SSI module enabled, you'll get truncated response without contents of any subrequests and get an alert message in your Nginx's `error.log`, like this:
-
-```nginx
-
-  [alert] 24212#0: *1 the http output chain is empty, client: 127.0.0.1, ...
-```
-
-[Back to TOC](#table-of-contents)
-
 Modules that use this module for testing
 ========================================
 
@@ -1678,7 +1668,7 @@ Report Bugs
 
 Although a lot of effort has been put into testing and code tuning, there must be some serious bugs lurking somewhere in this module. So whenever you are bitten by any quirks, please don't hesitate to
 
-1. create a ticket on the [issue tracking interface](https://github.com/agentzh/echo-nginx-module/issues) provided by GitHub,
+1. create a ticket on the [issue tracking interface](https://github.com/openresty/echo-nginx-module/issues) provided by GitHub,
 1. or send a bug report, questions, or even patches to the [OpenResty Community](#community).
 
 [Back to TOC](#table-of-contents)
@@ -1686,14 +1676,14 @@ Although a lot of effort has been put into testing and code tuning, there must b
 Source Repository
 =================
 
-Available on github at [agentzh/echo-nginx-module](https://github.com/agentzh/echo-nginx-module).
+Available on github at [openresty/echo-nginx-module](https://github.com/openresty/echo-nginx-module).
 
 [Back to TOC](#table-of-contents)
 
 Changes
 =======
 
-The changes of every release of this module can be obtained from the ngx_openresty bundle's change logs:
+The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
 
 <http://openresty.org/#Changes>
 
@@ -1702,14 +1692,14 @@ The changes of every release of this module can be obtained from the ngx_openres
 Test Suite
 ==========
 
-This module comes with a Perl-driven test suite. The [test cases](https://github.com/agentzh/echo-nginx-module/tree/master/t/) are
-[declarative](https://github.com/agentzh/echo-nginx-module/blob/master/t/echo.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Nginx) module in the Perl world.
+This module comes with a Perl-driven test suite. The [test cases](https://github.com/openresty/echo-nginx-module/tree/master/t/) are
+[declarative](https://github.com/openresty/echo-nginx-module/blob/master/t/echo.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Nginx) module in the Perl world.
 
 To run it on your side:
 
 ```bash
 
-$ PATH=/path/to/your/nginx-with-echo-module:$PATH prove -r t
+ $ PATH=/path/to/your/nginx-with-echo-module:$PATH prove -r t
 ```
 
 You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
@@ -1729,14 +1719,14 @@ TODO
 
 ```nginx
 
-  echo_log debug "I am being called.";
+   echo_log debug "I am being called.";
 ```
 
 * Add support for options `-h` and `-t` to [echo_subrequest_async](#echo_subrequest_async) and [echo_subrequest](#echo_subrequest). For example
 
 ```nginx
 
-  echo_subrequest POST /sub -q 'foo=Foo&bar=Bar' -b 'hello' -t 'text/plan' -h 'X-My-Header: blah blah'
+   echo_subrequest POST /sub -q 'foo=Foo&bar=Bar' -b 'hello' -t 'text/plan' -h 'X-My-Header: blah blah'
 ```
 
 * Add options to control whether a subrequest should inherit cached variables from its parent request (i.e. the current request that is calling the subrequest in question). Currently none of the subrequests issued by this module inherit the cached variables from the parent request.
@@ -1747,38 +1737,38 @@ TODO
 
 ```nginx
 
-  echo_foreach 'cat' 'dog' 'mouse';
-    echo_location_async "/animals/$echo_it";
-  echo_end;
+   echo_foreach 'cat' 'dog' 'mouse';
+     echo_location_async "/animals/$echo_it";
+   echo_end;
 ```
 
 * Add new directive *echo_foreach_range*, as in
 
 ```nginx
 
-  echo_foreach_range '[1..100]' '[a-zA-z0-9]';
-    echo_location_async "/item/$echo_it";
-  echo_end;
+   echo_foreach_range '[1..100]' '[a-zA-z0-9]';
+     echo_location_async "/item/$echo_it";
+   echo_end;
 ```
 
 * Add new directive *echo_repeat*, as in
 
 ```nginx
 
-  echo_repeat 10 $i {
-      echo "Page $i";
-      echo_location "/path/to/page/$i";
-  }
+   echo_repeat 10 $i {
+       echo "Page $i";
+       echo_location "/path/to/page/$i";
+   }
 ```
 
 This is just another way of saying
 
 ```nginx
 
-  echo_foreach_range $i [1..10];
-      echo "Page $i";
-      echo_location "/path/to/page/$i";
-  echo_end;
+   echo_foreach_range $i [1..10];
+       echo "Page $i";
+       echo_location "/path/to/page/$i";
+   echo_end;
 ```
 
 Thanks Marcus Clyne for providing this idea.
@@ -1787,9 +1777,9 @@ Thanks Marcus Clyne for providing this idea.
 
 ```nginx
 
-  echo_random_min  10
-  echo_random_max  200
-  echo "random number: $echo_random";
+   echo_random_min  10
+   echo_random_max  200
+   echo "random number: $echo_random";
 ```
 
 Thanks Marcus Clyne for providing this idea.
@@ -1815,7 +1805,7 @@ This wiki page is also maintained by the author himself, and everybody is encour
 Copyright & License
 ===================
 
-Copyright (c) 2009-2014, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright (c) 2009-2016, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
 
 This module is licensed under the terms of the BSD license.
 
@@ -1846,5 +1836,7 @@ See Also
 * The original [blog post](http://agentzh.blogspot.com/2009/10/hacking-on-nginx-echo-module.html) about this module's initial development.
 * The standard [addition filter module](http://nginx.org/en/docs/http/ngx_http_addition_module.html).
 * The standard [proxy module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html).
-* The [ngx_openresty](http://openresty.org) bundle.
+* The [OpenResty](http://openresty.org) bundle.
+
+[Back to TOC](#table-of-contents)
 
diff --git a/debian/modules/nginx-echo/config b/debian/modules/nginx-echo/config
index c0cead0..32b54bf 100644
--- a/debian/modules/nginx-echo/config
+++ b/debian/modules/nginx-echo/config
@@ -1,5 +1,60 @@
 ngx_addon_name=ngx_http_echo_module
-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_echo_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_echo_module.c $ngx_addon_dir/src/ngx_http_echo_util.c $ngx_addon_dir/src/ngx_http_echo_timer.c $ngx_addon_dir/src/ngx_http_echo_var.c $ngx_addon_dir/src/ngx_http_echo_handler.c $ngx_addon_dir/src/ngx_http_echo_filter.c $ngx_addon_dir/src/ngx_http_echo_sleep.c $ngx_addon_dir/src/ngx_http_echo_location.c $ngx_addon_dir/src/ngx_http_echo_echo.c $ngx_addon_dir/src/ngx_http_echo_request_info.c $ngx_addon_dir/src/ngx_http_echo_subrequest.c $ngx_addon_dir/src/ngx_http_echo_foreach.c"
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ngx_http_echo_module.h $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_echo_handler.h $ngx_addon_dir/src/ngx_http_echo_util.h $ngx_addon_dir/src/ngx_http_echo_sleep.h $ngx_addon_dir/src/ngx_http_echo_filter.h $ngx_addon_dir/src/ngx_http_echo_var.h $ngx_addon_dir/src/ngx_http_echo_location.h $ngx_addon_dir/src/ngx_http_echo_echo.h $ngx_addon_dir/src/ngx_http_echo_request_info.h $ngx_addon_dir/src/ngx_http_echo_subrequest.h $ngx_addon_dir/src/ngx_http_echo_foreach.h"
 
+ECHO_SRCS="                                                                 \
+        $ngx_addon_dir/src/ngx_http_echo_module.c                           \
+        $ngx_addon_dir/src/ngx_http_echo_util.c                             \
+        $ngx_addon_dir/src/ngx_http_echo_timer.c                            \
+        $ngx_addon_dir/src/ngx_http_echo_var.c                              \
+        $ngx_addon_dir/src/ngx_http_echo_handler.c                          \
+        $ngx_addon_dir/src/ngx_http_echo_filter.c                           \
+        $ngx_addon_dir/src/ngx_http_echo_sleep.c                            \
+        $ngx_addon_dir/src/ngx_http_echo_location.c                         \
+        $ngx_addon_dir/src/ngx_http_echo_echo.c                             \
+        $ngx_addon_dir/src/ngx_http_echo_request_info.c                     \
+        $ngx_addon_dir/src/ngx_http_echo_subrequest.c                       \
+        $ngx_addon_dir/src/ngx_http_echo_foreach.c                          \
+        "
+
+ECHO_DEPS="                                                                 \
+        $ngx_addon_dir/src/ddebug.h                                         \
+        $ngx_addon_dir/src/ngx_http_echo_module.h                           \
+        $ngx_addon_dir/src/ngx_http_echo_handler.h                          \
+        $ngx_addon_dir/src/ngx_http_echo_util.h                             \
+        $ngx_addon_dir/src/ngx_http_echo_sleep.h                            \
+        $ngx_addon_dir/src/ngx_http_echo_filter.h                           \
+        $ngx_addon_dir/src/ngx_http_echo_var.h                              \
+        $ngx_addon_dir/src/ngx_http_echo_location.h                         \
+        $ngx_addon_dir/src/ngx_http_echo_echo.h                             \
+        $ngx_addon_dir/src/ngx_http_echo_request_info.h                     \
+        $ngx_addon_dir/src/ngx_http_echo_subrequest.h                       \
+        $ngx_addon_dir/src/ngx_http_echo_foreach.h                          \
+        "
+
+# nginx won't have HTTP_POSTPONE_FILTER_MODULE & HTTP_POSTPONE_FILTER_SRCS
+# defined since 1.9.11
+if test -z "$HTTP_POSTPONE_FILTER_MODULE"; then
+    HTTP_POSTPONE_FILTER_MODULE=ngx_http_postpone_filter_module
+    HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
+fi
+
+# This module depends upon the postpone filter being activated
+if [ $HTTP_POSTPONE != YES ]; then
+    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
+    HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
+    HTTP_POSTPONE=YES
+fi
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP_AUX_FILTER
+    ngx_module_name=$ngx_addon_name
+    ngx_module_incs=
+    ngx_module_deps="$ECHO_DEPS"
+    ngx_module_srcs="$ECHO_SRCS"
+    ngx_module_libs=
+
+    . auto/module
+else
+    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ECHO_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ECHO_DEPS"
+fi
diff --git a/debian/modules/nginx-echo/doc/HttpEchoModule.wiki b/debian/modules/nginx-echo/doc/HttpEchoModule.wiki
deleted file mode 100644
index 59c7f47..0000000
--- a/debian/modules/nginx-echo/doc/HttpEchoModule.wiki
+++ /dev/null
@@ -1,1558 +0,0 @@
-= Name =
-
-'''ngx_echo''' - Brings "echo", "sleep", "time", "exec" and more shell-style goodies to Nginx config file.
-
-''This module is not distributed with the Nginx source.'' See [[#Installation|the installation instructions]].
-
-= Status =
-
-This module is production ready.
-
-= Version =
-
-This document describes ngx_echo [https://github.com/agentzh/echo-nginx-module/tags v0.57] released on 21 November 2014.
-
-= Synopsis =
-
-<geshi lang="nginx">
-  location /hello {
-    echo "hello, world!";
-  }
-</geshi>
-
-<geshi lang="nginx">
-  location /hello {
-    echo -n "hello, ";
-    echo "world!";
-  }
-</geshi>
-
-<geshi lang="nginx">
-  location /timed_hello {
-    echo_reset_timer;
-    echo hello world;
-    echo "'hello world' takes about $echo_timer_elapsed sec.";
-    echo hiya igor;
-    echo "'hiya igor' takes about $echo_timer_elapsed sec.";
-  }
-</geshi>
-
-<geshi lang="nginx">
-  location /echo_with_sleep {
-    echo hello;
-    echo_flush;  # ensure the client can see previous output immediately
-    echo_sleep   2.5;  # in sec
-    echo world;
-  }
-</geshi>
-
-<geshi lang="nginx">
-  # in the following example, accessing /echo yields
-  #   hello
-  #   world
-  #   blah
-  #   hiya
-  #   igor
-  location /echo {
-      echo_before_body hello;
-      echo_before_body world;
-      proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
-      echo_after_body hiya;
-      echo_after_body igor;
-  }
-  location /echo/more {
-      echo blah;
-  }
-</geshi>
-
-<geshi lang="nginx">
-  # the output of /main might be
-  #   hello
-  #   world
-  #   took 0.000 sec for total.
-  # and the whole request would take about 2 sec to complete.
-  location /main {
-      echo_reset_timer;
-       
-      # subrequests in parallel
-      echo_location_async /sub1;
-      echo_location_async /sub2;
-       
-      echo "took $echo_timer_elapsed sec for total.";
-  }
-  location /sub1 {
-      echo_sleep 2;
-      echo hello;
-  }
-  location /sub2 {
-      echo_sleep 1;
-      echo world;
-  }
-</geshi>
-
-<geshi lang="nginx">
-  # the output of /main might be
-  #   hello
-  #   world
-  #   took 3.003 sec for total.
-  # and the whole request would take about 3 sec to complete.
-  location /main {
-      echo_reset_timer;
-      
-      # subrequests in series (chained by CPS)
-      echo_location /sub1;
-      echo_location /sub2;
-      
-      echo "took $echo_timer_elapsed sec for total.";
-  }
-  location /sub1 {
-      echo_sleep 2;
-      echo hello;
-  }
-  location /sub2 {
-      echo_sleep 1;
-      echo world;
-  }
-</geshi>
-
-<geshi lang="nginx">
-  # Accessing /dup gives
-  #   ------ END ------
-  location /dup {
-    echo_duplicate 3 "--";
-    echo_duplicate 1 " END ";
-    echo_duplicate 3 "--";
-    echo;
-  }
-</geshi>
-
-<geshi lang="nginx">
-  # /bighello will generate 1000,000,000 hello's.
-  location /bighello {
-    echo_duplicate 1000_000_000 'hello';
-  }
-</geshi>
-
-<geshi lang="nginx">
-  # echo back the client request
-  location /echoback {
-    echo_duplicate 1 $echo_client_request_headers;
-    echo "\r";
-    
-    echo_read_request_body;
-    
-    echo_request_body;
-  }
-</geshi>
-
-<geshi lang="nginx">
-  # GET /multi will yields
-  #   querystring: foo=Foo
-  #   method: POST
-  #   body: hi
-  #   content length: 2
-  #   ///
-  #   querystring: bar=Bar
-  #   method: PUT
-  #   body: hello
-  #   content length: 5
-  #   ///
-  location /multi {
-      echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
-      echo_subrequest_async PUT '/sub' -q 'bar=Bar' -b 'hello';
-  }
-  location /sub {
-      echo "querystring: $query_string";
-      echo "method: $echo_request_method";
-      echo "body: $echo_request_body";
-      echo "content length: $http_content_length";
-      echo '///';
-  }
-</geshi>
-
-<geshi lang="nginx">
-  # GET /merge?/foo.js&/bar/blah.js&/yui/baz.js will merge the .js resources together
-  location /merge {
-      default_type 'text/javascript';
-      echo_foreach_split '&' $query_string;
-          echo "/* JS File $echo_it */";
-          echo_location_async $echo_it;
-          echo;
-      echo_end;
-  }
-</geshi>
-
-<geshi lang="nginx">
-  # accessing /if?val=abc yields the "hit" output
-  # while /if?val=bcd yields "miss":
-  location ^~ /if {
-      set $res miss;
-      if ($arg_val ~* '^a') {
-          set $res hit;
-          echo $res;
-      }
-      echo $res;
-  }
-</geshi>
-
-= Description =
-
-This module wraps lots of Nginx internal APIs for streaming input and output, parallel/sequential subrequests, timers and sleeping, as well as various meta data accessing.
-
-Basically it provides various utilities that help testing and debugging of other modules by trivially emulating different kinds of faked subrequest locations.
-
-People will also find it useful in real-world applications that need to
-
-# serve static contents directly from memory (loading from the Nginx config file).
-# wrap the upstream response with custom header and footer (kinda like the [[HttpAdditionModule|addition module]] but with contents read directly from the config file and Nginx variables).
-# merge contents of various "Nginx locations" (i.e., subrequests) together in a single main request (using [[#echo_location|echo_location]] and its friends).
-
-This is a special dual-role module that can ''lazily'' serve as a content handler or register itself as an output filter only upon demand. By default, this module does not do anything at all.
-
-Technially, this module has also demonstrated the following techniques that might be helpful for module writers:
-
-# Issue parallel subreqeusts directly from content handler.
-# Issue chained subrequests directly from content handler, by passing continuation along the subrequest chain.
-# Issue subrequests with all HTTP 1.1 methods and even an optional faked HTTP request body.
-# Interact with the Nginx event model directly from content handler using custom events and timers, and resume the content handler back if necessary.
-# Dual-role module that can (lazily) serve as a content handler or an output filter or both.
-# Nginx config file variable creation and interpolation.
-# Streaming output control using output_chain, flush and its friends.
-# Read client request body from the content handler, and returns back (asynchronously) to the content handler after completion.
-# Use Perl-based declarative [[#Test Suite|test suite]] to drive the development of Nginx C modules.
-
-= Content Handler Directives =
-
-Use of the following directives register this module to the current Nginx location as a content handler. If you want to use another module, like the [[HttpProxyModule|standard proxy module]], as the content handler, use the [[#Filter Directives|filter directives]] provided by this module.
-
-All the content handler directives can be mixed together in a single Nginx location and they're supposed to run sequentially just as in the Bash scripting language.
-
-Every content handler directive supports variable interpolation in its arguments (if any).
-
-The MIME type set by the [[HttpCoreModule#default_type|standard default_type directive]] is respected by this module, as in:
-
-<geshi lang="nginx">
-  location /hello {
-    default_type text/plain;
-    echo hello;
-  }
-</geshi>
-
-Then on the client side:
-
-<geshi lang="bash">
-  $ curl -I 'http://localhost/echo'
-  HTTP/1.1 200 OK
-  Server: nginx/0.8.20
-  Date: Sat, 17 Oct 2009 03:40:19 GMT
-  Content-Type: text/plain
-  Connection: keep-alive
-</geshi>
-
-Since the [[#v0.22|v0.22]] release, all of the directives are allowed in the [[HttpRewriteModule|rewrite module]]'s [[HttpRewriteModule#if|if]] directive block, for instance:
-
-<geshi lang="nginx">
-    location ^~ /if {
-        set $res miss;
-        if ($arg_val ~* '^a') {
-            set $res hit;
-            echo $res;
-        }
-        echo $res;
-    }
-</geshi>
-
-== echo ==
-'''syntax:''' ''echo [options] <string>...''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Sends arguments joined by spaces, along with a trailing newline, out to the client.
-
-Note that the data might be buffered by Nginx's underlying buffer. To force the output data flushed immediately, use the [[#echo_flush|echo_flush]] command just after <code>echo</code>, as in
-
-<geshi lang="nginx">
-   echo hello world;
-   echo_flush;
-</geshi>
-
-When no argument is specified, ''echo'' emits the trailing newline alone, just like the ''echo'' command in shell.
-
-Variables may appear in the arguments. An example is
-
-<geshi lang="nginx">
-   echo The current request uri is $request_uri;
-</geshi>
-
-where [[HttpCoreModule#$request_uri|$request_uri]] is a variable exposed by the [[HttpCoreModule]].
-
-This command can be used multiple times in a single location configuration, as in
-
-<geshi lang="nginx">
-    location /echo {
-        echo hello;
-        echo world;
-    }
-</geshi>
-
-The output on the client side looks like this
-
-<geshi lang="bash">
-    $ curl 'http://localhost/echo'
-    hello
-    world
-</geshi>
-
-Special characters like newlines (<code>\n</code>) and tabs (<code>\t</code>) can be escaped using C-style escaping sequences. But a notable exception is the dollar sign (<code>$</code>). As of Nginx 0.8.20, there's still no clean way to esacpe this characters. (A work-around might be to use a <code>$echo_dollor</code> variable that is always evaluated to the constant <code>$</code> character. This feature will possibly be introduced in a future version of this module.)
-
-As of the echo [[#v0.28|v0.28]] release, one can suppress the trailing newline character in the output by using the <code>-n</code> option, as in
-
-<geshi lang="nginx">
-    location /echo {
-        echo -n "hello, ";
-        echo "world";
-    }
-</geshi>
-
-Accessing <code>/echo</code> gives
-
-<geshi lang="bash">
-    $ curl 'http://localhost/echo'
-    hello, world
-</geshi>
-
-Leading <code>-n</code> in variable values won't take effect and will be emitted literally, as in
-
-<geshi lang="nginx">
-    location /echo {
-        set $opt -n;
-        echo $opt "hello,";
-        echo "world";
-    }
-</geshi>
-
-This gives the following output
-
-<geshi lang="bash">
-    $ curl 'http://localhost/echo'
-    -n hello,
-    world
-</geshi>
-
-One can output leading <code>-n</code> literals and other options using the special <code>--</code> option like this
-
-<geshi lang="nginx">
-    location /echo {
-        echo -- -n is an option;
-    }
-</geshi>
-
-which yields
-
-<geshi lang="bash">
-    $ curl 'http://localhost/echo'
-    -n is an option
-</geshi>
-
-== echo_duplicate ==
-'''syntax:''' ''echo_duplicate <count> <string>''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Outputs duplication of a string indicated by the second argument, using the times specified in the first argument.
-
-For instance,
-
-<geshi lang="nginx">
-  location /dup {
-      echo_duplicate 3 "abc";
-  }
-</geshi>
-
-will lead to an output of <code>"abcabcabc"</code>.
-
-Underscores are allowed in the count number, just like in Perl. For example, to emit 1000,000,000 instances of <code>"hello, world"</code>:
-
-<geshi lang="nginx">
-  location /many_hellos {
-      echo_duplicate 1000_000_000 "hello, world";
-  }
-</geshi>
-
-The <code>count</code> argument could be zero, but not negative. The second <code>string</code> argument could be an empty string ("") likewise.
-
-Unlike the [[#echo|echo]] directive, no trailing newline is appended to the result. So it's possible to "abuse" this directive as a no-trailing-newline version of [[#echo|echo]] by using "count" 1, as in
-
-<geshi lang="nginx">
-  location /echo_art {
-      echo_duplicate 2 '---';
-      echo_duplicate 1 ' END ';  # we don't want a trailing newline here
-      echo_duplicate 2 '---';
-      echo;  # we want a trailing newline here...
-  }
-</geshi>
-
-You get
-
-<geshi lang="bash">
-  ------ END ------
-</geshi>
-
-This directive was first introduced in [[#v0.11|version 0.11]].
-
-== echo_flush ==
-'''syntax:''' ''echo_flush''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Forces the data potentially buffered by underlying Nginx output filters to send immediately to the client side via socket.
-
-Note that techically the command just emits a ngx_buf_t object with <code>flush</code> slot set to 1, so certain weird third-party output filter module could still block it before it reaches Nginx's (last) write filter.
-
-This directive does not take any argument.
-
-Consider the following example:
-
-<geshi lang="nginx">
-  location /flush {
-     echo hello;
-     
-     echo_flush;
-     
-     echo_sleep 1;
-     echo world;
-  }
-</geshi>
-
-Then on the client side, using curl to access <code>/flush</code>, you'll see the "hello" line immediately, but only after 1 second, the last "world" line. Without calling <code>echo_flush</code> in the example above, you'll most likely see no output until 1 second is elapsed due to the internal buffering of Nginx.
-
-This directive will fail to flush the output buffer in case of subrequests get involved. Consider the following example:
-
-<geshi lang="nginx">
-  location /main {
-      echo_location_async /sub;
-      echo hello;
-      echo_flush;
-  }
-  location /sub {
-      echo_sleep 1;
-  }
-</geshi>
-
-Then the client won't see "hello" appear even if <code>echo_flush</code> has been executed before the subrequest to <code>/sub</code> has actually started executing. The outputs of <code>/main</code> that are sent ''after'' [[#echo_location_async|echo_location_async]] will be postponed and buffered firmly.
-
-This does ''not'' apply to outputs sent before the subrequest initiated. For a modified version of the example given above:
-
-<geshi lang="nginx">
-  location /main {
-      echo hello;
-      echo_flush;
-      echo_location_async /sub;
-  }
-  location /sub {
-      echo_sleep 1;
-  }
-</geshi>
-
-The client will immediately see "hello" before <code>/sub</code> enters sleeping.
-
-See also [[#echo|echo]], [[#echo_sleep|echo_sleep]], and [[#echo_location_async|echo_location_async]].
-
-== echo_sleep ==
-'''syntax:''' ''echo_sleep <seconds>''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Sleeps for the time period specified by the argument, which is in seconds.
-
-This operation is non-blocking on server side, so unlike the [[#echo_blocking_sleep|echo_blocking_sleep]] directive, it won't block the whole Nginx worker process.
-
-The period might takes three digits after the decimal point and must be greater than 0.001.
-
-An example is
-
-<geshi lang="nginx">
-   location /echo_after_sleep {
-       echo_sleep 1.234;
-       echo resumed!;
-   }
-</geshi>
-
-Behind the scene, it sets up a per-request "sleep" ngx_event_t object, and adds a timer using that custom event to the Nginx event model and just waits for a timeout on that event. Because the "sleep" event is per-request, this directive can work in parallel subrequests.
-
-== echo_blocking_sleep ==
-'''syntax:''' ''echo_blocking_sleep <seconds>''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-This is a blocking version of the [[#echo_sleep|echo_sleep]] directive.
-
-See the documentation of [[#echo_sleep|echo_sleep]] for more detail.
-
-Behind the curtain, it calls the ngx_msleep macro provided by the Nginx core which maps to usleep on POSIX-compliant systems.
-
-Note that this directive will block the current Nginx worker process completely while being executed, so never use it in production environment.
-
-== echo_reset_timer ==
-'''syntax:''' ''echo_reset_timer''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Reset the timer begin time to ''now'', i.e., the time when this command is executed during request.
-
-The timer begin time is default to the starting time of the current request and can be overridden by this directive, potentially multiple times in a single location. For example:
-
-<geshi lang="nginx">
-  location /timed_sleep {
-      echo_sleep 0.03;
-      echo "$echo_timer_elapsed sec elapsed.";
-      
-      echo_reset_timer;
-      
-      echo_sleep 0.02;
-      echo "$echo_timer_elapsed sec elapsed.";
-  }
-</geshi>
-
-The output on the client side might be
-
-<geshi lang="bash">
-    $ curl 'http://localhost/timed_sleep'
-    0.032 sec elapsed.
-    0.020 sec elapsed.
-</geshi>
-
-The actual figures you get on your side may vary a bit due to your system's current activities.
-
-Invocation of this directive will force the underlying Nginx timer to get updated to the current system time (regardless the timer resolution specified elsewhere in the config file). Furthermore, references of the [[#$echo_timer_elapsed|$echo_timer_elapsed]] variable will also trigger timer update forcibly.
-
-See also [[#echo_sleep|echo_sleep]] and [[#$echo_timer_elapsed|$echo_timer_elapsed]].
-
-== echo_read_request_body ==
-'''syntax:''' ''echo_read_request_body''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Explicitly reads request body so that the [[HttpCoreModule#$request_body|$request_body]] variable will always have non-empty values (unless the body is so big that it has been saved by Nginx to a local temporary file).
-
-Note that this might not be the original client request body because the current request might be a subrequest with a "artificial" body specified by its parent.
-
-This directive does not generate any output itself, just like [[#echo_sleep|echo_sleep]].
-
-Here's an example for echo'ing back the original HTTP client request (both headers and body are included):
-
-<geshi lang="nginx">
-  location /echoback {
-    echo_duplicate 1 $echo_client_request_headers;
-    echo "\r";
-    echo_read_request_body;
-    echo $request_body;
-  }
-</geshi>
-
-The content of <code>/echoback</code> looks like this on my side (I was using Perl's LWP utility to access this location on the server):
-
-<geshi lang="bash">
-  $ (echo hello; echo world) | lwp-request -m POST 'http://localhost/echoback'
-  POST /echoback HTTP/1.1
-  TE: deflate,gzip;q=0.3
-  Connection: TE, close
-  Host: localhost
-  User-Agent: lwp-request/5.818 libwww-perl/5.820
-  Content-Length: 12
-  Content-Type: application/x-www-form-urlencoded
-  
-  hello
-  world
-</geshi>
-
-Because <code>/echoback</code> is the main request, [[HttpCoreModule#$request_body|$request_body]] holds the original client request body.
-
-Before Nginx 0.7.56, it makes no sense to use this directive because [[HttpCoreModule#$request_body|$request_body]] was first introduced in Nginx 0.7.58.
-
-This directive itself was first introduced in the echo module's [[#v0.14|v0.14 release]].
-
-== echo_location_async ==
-'''syntax:''' ''echo_location_async <location> [<url_args>]''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Issue GET subrequest to the location specified (first argument) with optional url arguments specified in the second argument.
-
-As of Nginx 0.8.20, the <code>location</code> argument does ''not'' support named location, due to a limitation in the <code>ngx_http_subrequest</code> function. The same is true for its brother, the [[#echo_location|echo_location]] directive.
-
-A very simple example is
-
-<geshi lang="nginx">
-    location /main {
-        echo_location_async /sub;
-        echo world;
-    }
-    location /sub {
-        echo hello;
-    }
-</geshi>
-
-Accessing <code>/main</code> gets
-
-<geshi lang="bash">
-  hello
-  world
-</geshi>
-
-Calling multiple locations in parallel is also possible:
-
-<geshi lang="nginx">
-    location /main {
-        echo_reset_timer;
-        echo_location_async /sub1;
-        echo_location_async /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_sleep 2; # sleeps 2 sec
-        echo hello;
-    }
-    location /sub2 {
-        echo_sleep 1; # sleeps 1 sec
-        echo world;
-    }
-</geshi>
-
-Accessing <code>/main</code> yields
-
-<geshi lang="bash">
-  $ time curl 'http://localhost/main'
-  hello
-  world
-  took 0.000 sec for total.
-  
-  real  0m2.006s
-  user  0m0.000s
-  sys   0m0.004s
-</geshi>
-
-You can see that the main handler <code>/main</code> does ''not'' wait the subrequests <code>/sub1</code> and <code>/sub2</code> to complete and quickly goes on, hence the "0.000 sec" timing result. The whole request, however takes approximately 2 sec in total to complete because <code>/sub1</code> and <code>/sub2</code> run in parallel (or "concurrently" to be more accurate).
-
-If you use [[#echo_blocking_sleep|echo_blocking_sleep]] in the previous example instead, then you'll get the same output, but with 3 sec total response time, because "blocking sleep" blocks the whole Nginx worker process.
-
-Locations can also take an optional querystring argument, for instance
-
-<geshi lang="nginx">
-    location /main {
-        echo_location_async /sub 'foo=Foo&bar=Bar';
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
-</geshi>
-
-Accessing <code>/main</code> yields
-
-<geshi lang="bash">
-  $ curl 'http://localhost/main'
-  Foo Bar
-</geshi>
-
-Querystrings is ''not'' allowed to be concatenated onto the <code>location</code> argument with "?" directly, for example, <code>/sub?foo=Foo&bar=Bar</code> is an invalid location, and shouldn't be fed as the first argument to this directive.
-
-Technically speaking, this directive is an example that Nginx content handler issues one or more subrequests directly. AFAIK, the [https://connectical.com/projects/ngx-fancyindex/wiki fancyindex module] also does such kind of things ;)
-
-Nginx named locations like <code>@foo</code> is ''not'' supported here.
-
-This directive is logically equivalent to the GET version of [[#echo_subrequest_async|echo_subrequest_async]]. For example,
-
-<geshi lang="nginx">
-  echo_location_async /foo 'bar=Bar';
-</geshi>
-
-is logically equivalent to
-
-<geshi lang="nginx">
-  echo_subrequest_async GET /foo -q 'bar=Bar';
-</geshi>
-
-But calling this directive is slightly faster than calling [[#echo_subrequest_async|echo_subrequest_async]] using <code>GET</code> because we don't have to parse the HTTP method names like <code>GET</code> and options like <code>-q</code>.
-
-There is a known issue with this directive when disabling the standard [[HttpSsiModule|standard SSI module]]. See [[#Known Issues|Known Issues]] for more details.
-
-This directive is first introduced in [[#v0.09|version 0.09]] of this module and requires at least Nginx 0.7.46.
-
-== echo_location ==
-'''syntax:''' ''echo_location <location> [<url_args>]''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Just like the [[#echo_location_async|echo_location_async]] directive, but <code>echo_location</code> issues subrequests ''in series'' rather than in parallel. That is, the content handler directives following this directive won't be executed until the subrequest issued by this directive completes.
-
-The final response body is almost always equivalent to the case when [[#echo_location_async|echo_location_async]] is used instead, only if timing variables is used in the outputs.
-
-Consider the following example:
-
-<geshi lang="nginx">
-    location /main {
-        echo_reset_timer;
-        echo_location /sub1;
-        echo_location /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_sleep 2;
-        echo hello;
-    }
-    location /sub2 {
-        echo_sleep 1;
-        echo world;
-    }
-</geshi>
-
-The location <code>/main</code> above will take for total 3 sec to complete (compared to 2 sec if [[#echo_location_async|echo_location_async]] is used instead here). Here's the result in action on my machine:
-
-<geshi lang="bash">
-  $ curl 'http://localhost/main'
-  hello
-  world
-  took 3.003 sec for total.
-  
-  real  0m3.027s
-  user  0m0.020s
-  sys   0m0.004s
-</geshi>
-
-This directive is logically equivalent to the GET version of [[#echo_subrequest|echo_subrequest]]. For example,
-
-<geshi lang="nginx">
-  echo_location /foo 'bar=Bar';
-</geshi>
-
-is logically equivalent to
-
-<geshi lang="nginx">
-  echo_subrequest GET /foo -q 'bar=Bar';
-</geshi>
-
-But calling this directive is slightly faster than calling [[#echo_subrequest|echo_subrequest]] using <code>GET</code> because we don't have to parse the HTTP method names like <code>GET</code> and options like <code>-q</code>.
-
-Behind the scene, it creates an <code>ngx_http_post_subrequest_t</code> object as a ''continuation'' and passes it into the <code>ngx_http_subrequest</code> function call. Nginx will later reopen this "continuation" in the subrequest's <code>ngx_http_finalize_request</code> function call. We resumes the execution of the parent-request's content handler and starts to run the next directive (command) if any.
-
-Nginx named locations like <code>@foo</code> is ''not'' supported here.
-
-This directive was first introduced in the [[#v0.12|release v0.12]].
-
-See also [[#echo_location_async|echo_location_async]] for more details about the meaning of the arguments.
-
-== echo_subrequest_async ==
-'''syntax:''' ''echo_subrequest_async <HTTP_method> <location> [-q <url_args>] [-b <request_body>] [-f <request_body_path>]''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Initiate an asynchronous subrequest using HTTP method, an optional url arguments (or querystring) and an optional request body which can be defined as a string or as a path to a file which contains the body.
-
-This directive is very much like a generalized version of the [[#echo_location_async|echo_location_async]] directive.
-
-Here's a small example demonstrating its usage:
-
-<geshi lang="nginx">
-    location /multi {
-        # body defined as string
-        echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
-        # body defined as path to a file, relative to nginx prefix path if not absolute
-        echo_subrequest_async PUT '/sub' -q 'bar=Bar' -f '/tmp/hello.txt';
-    }
-    location /sub {
-        echo "querystring: $query_string";
-        echo "method: $echo_request_method";
-        echo "body: $echo_request_body";
-        echo "content length: $http_content_length";
-        echo '///';
-    }
-</geshi>
-
-Then on the client side:
-
-<geshi lang="bash">
-  $ echo -n hello > /tmp/hello.txt
-  $ curl 'http://localhost/multi'
-  querystring: foo=Foo
-  method: POST
-  body: hi
-  content length: 2
-  ///
-  querystring: bar=Bar
-  method: PUT
-  body: hello
-  content length: 5
-  ///
-</geshi>
-
-Here's more funny example using the standard [[#HttpProxyModule|proxy module]] to handle the subrequest:
-
-<geshi lang="nginx">
-    location /main {
-        echo_subrequest_async POST /sub -b 'hello, world';
-    }
-    location /sub {
-        proxy_pass $scheme://127.0.0.1:$server_port/proxied;
-    }
-    location /proxied {
-        echo "method: $echo_request_method.";
-        
-        # we need to read body explicitly here...or $echo_request_body
-        #   will evaluate to empty ("")
-        echo_read_request_body;
-        
-        echo "body: $echo_request_body.";
-    }
-</geshi>
-
-Then on the client side, we can see that
-
-<geshi lang="bash">
-  $ curl 'http://localhost/main'
-  method: POST.
-  body: hello, world.
-</geshi>
-
-Nginx named locations like <code>@foo</code> is ''not'' supported here.
-
-This directive takes several options:
-
-<geshi lang="text">
-    -q <url_args>        Specify the URL arguments (or URL querystring) for the subrequest.
-
-    -f <path>            Specify the path for the file whose content will be serve as the
-                         subrequest's request body.
-
-    -b <data>            Specify the request body data
-</geshi>
-
-This directive was first introduced in the [[#v0.15|release v0.15]].
-
-The <code>-f</code> option to define a file path for the body was introduced in the [[#v0.35|release v0.35]].
-
-See also the [[#echo_subrequest|echo_subrequest]] and [[#echo_location_async|echo_location_async]] directives.
-
-There is a known issue with this directive when disabling the standard [[HttpSsiModule|standard SSI module]]. See [[#Known Issues|Known Issues]] for more details.
-
-== echo_subrequest ==
-'''syntax:''' ''echo_subrequest <HTTP_method> <location> [-q <url_args>] [-b <request_body>] [-f <request_body_path>]''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-This is the synchronous version of the [[#echo_subrequest_async|echo_subrequest_async]] directive. And just like [[#echo_location|echo_location]], it does not block the Nginx worker process (while [[#echo_blocking_sleep|echo_blocking_sleep]] does), rather, it uses continuation to pass control along the subrequest chain.
-
-See [[#echo_subrequest_async|echo_subrequest_async]] for more details.
-
-Nginx named locations like <code>@foo</code> is ''not'' supported here.
-
-This directive was first introduced in the [[#v0.15|release v0.15]].
-
-== echo_foreach_split ==
-'''syntax:''' ''echo_foreach_split <delimiter> <string>''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Split the second argument <code>string</code> using the delimiter specified in the first argument, and then iterate through the resulting items. For instance:
-
-<geshi lang="nginx">
-  location /loop {
-    echo_foreach_split ',' $arg_list;
-      echo "item: $echo_it";
-    echo_end;
-  }
-</geshi>
-
-Accessing /main yields
-
-<geshi lang="bash">
-  $ curl 'http://localhost/loop?list=cat,dog,mouse'
-  item: cat
-  item: dog
-  item: mouse
-</geshi>
-
-As seen in the previous example, this directive should always be accompanied by an [[#echo_end|echo_end]] directive.
-
-Parallel <code>echo_foreach_split</code> loops are allowed, but nested ones are currently forbidden.
-
-The <code>delimiter</code> argument could contain ''multiple'' arbitrary characters, like
-
-<geshi lang="nginx">
-  # this outputs "cat\ndog\nmouse\n"
-  echo_foreach_split -- '-a-' 'cat-a-dog-a-mouse';
-    echo $echo_it;
-  echo_end;
-</geshi>
-
-Logically speaking, this looping structure is just the <code>foreach</code> loop combined with a <code>split</code> function call in Perl (using the previous example):
-
-<geshi lang="perl">
-   foreach (split ',', $arg_list) {
-       print "item $_\n";
-   }
-</geshi>
-
-People will also find it useful in merging multiple <code>.js</code> or <code>.css</code> resources into a whole. Here's an example:
-
-<geshi lang="nginx">
-  location /merge {
-      default_type 'text/javascript';
-      
-      echo_foreach_split '&' $query_string;
-          echo "/* JS File $echo_it */";
-          echo_location_async $echo_it;
-          echo;
-      echo_end;
-  }
-</geshi>
-
-Then accessing /merge to merge the <code>.js</code> resources specified in the query string:
-
-<geshi lang="bash">
-  $ curl 'http://localhost/merge?/foo/bar.js&/yui/blah.js&/baz.js'
-</geshi>
-
-One can also use third-party Nginx cache module to cache the merged response generated by the <code>/merge</code> location in the previous example.
-
-This directive was first introduced in the [[#v0.17|release v0.17]].
-
-== echo_end ==
-'''syntax:''' ''echo_end''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-This directive is used to terminate the body of looping and conditional control structures like [[#echo_foreach_split|echo_foreach_split]].
-
-This directive was first introduced in the [[#v0.17|release v0.17]].
-
-== echo_request_body ==
-'''syntax:''' ''echo_request_body''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Outputs the contents of the request body previous read.
-
-Behind the scene, it's implemented roughly like this:
-
-<geshi lang="C">
-  if (r->request_body && r->request_body->bufs) {
-      return ngx_http_output_filter(r, r->request_body->bufs);
-  }
-</geshi>
-
-Unlike the [[#$echo_request_body|$echo_request_body]] and $request_body variables, this directive will show the whole request body even if some parts or all parts of it are saved in temporary files on the disk.
-
-It is a "no-op" if no request body has been read yet.
-
-This directive was first introduced in the [[#v0.18|release v0.18]].
-
-See also [[#echo_read_request_body|echo_read_request_body]] and the [[HttpChunkinModule|chunkin module]].
-
-== echo_exec ==
-'''syntax:''' ''echo_exec <location> [<query_string>]''
-
-'''syntax:''' ''echo_exec <named_location>''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Does an internal redirect to the location specified. An optional query string can be specified for normal locations, as in
-
-<geshi lang="nginx">
-  location /foo {
-      echo_exec /bar weight=5;
-  }
-  location /bar {
-      echo $arg_weight;
-  }
-</geshi>
-
-Or equivalently
-
-<geshi lang="nginx">
-  location /foo {
-      echo_exec /bar?weight=5;
-  }
-  location /bar {
-      echo $arg_weight;
-  }
-</geshi>
-
-Named locations are also supported. Here's an example:
-
-<geshi lang="nginx">
-  location /foo {
-      echo_exec @bar;
-  }
-  location @bar {
-      # you'll get /foo rather than @bar
-      #  due to a potential bug in nginx.
-      echo $echo_request_uri;
-  }
-</geshi>
-
-But query string (if any) will always be ignored for named location redirects due to a limitation in the <code>ngx_http_named_location</code> function.
-
-Never try to echo things before the <code>echo_exec</code> directive or you won't see the proper response of the location you want to redirect to. Because any echoing will cause the original location handler to send HTTP headers before the redirection happens.
-
-Technically speaking, this directive exposes the Nginx internal API functions <code>ngx_http_internal_redirect</code> and <code>ngx_http_named_location</code>.
-
-This directive was first introduced in the [[#v0.21|v0.21 release]].
-
-== echo_status ==
-'''syntax:''' ''echo_status <status-num>''
-
-'''default:''' ''echo_status 200''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Specify the default response status code. Default to <code>200</code>. This directive is declarative and the relative order with other echo-like directives is not important.
-
-Here is an example,
-
-<geshi lang="nginx">
-    location = /bad {
-        echo_status 404;
-        echo "Something is missing...";
-    }
-</geshi>
-
-then we get a response like this:
-
-<geshi lang="text">
-    HTTP/1.1 404 Not Found
-    Server: nginx/1.2.1
-    Date: Sun, 24 Jun 2012 03:58:18 GMT
-    Content-Type: text/plain
-    Transfer-Encoding: chunked
-    Connection: keep-alive
-
-    Something is missing...
-</geshi>
-
-This directive was first introduced in the <code>v0.40</code> release.
-
-= Filter Directives =
-
-Use of the following directives trigger the filter registration of this module. By default, no filter will be registered by this module.
-
-Every filter directive supports variable interpolation in its arguments (if any).
-
-== echo_before_body ==
-'''syntax:''' ''echo_before_body [options] [argument]...''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''output filter''
-
-It's the filter version of the [[#echo|echo]] directive, and prepends its output to the beginning of the original outputs generated by the underlying content handler.
-
-An example is
-
-<geshi lang="nginx">
-    location /echo {
-        echo_before_body hello;
-        proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
-    }
-    location /echo/more {
-        echo world
-    }
-</geshi>
-
-Accessing <code>/echo</code> from the client side yields
-
-<geshi lang="bash">
-  hello
-  world
-</geshi>
-
-In the previous sample, we borrow the [[HttpProxyModule|standard proxy module]] to serve as the underlying content handler that generates the "main contents".
-
-Multiple instances of this filter directive are also allowed, as in:
-
-<geshi lang="nginx">
-    location /echo {
-        echo_before_body hello;
-        echo_before_body world;
-        echo !;
-    }
-</geshi>
-
-On the client side, the output is like
-
-<geshi lang="bash">
-  $ curl 'http://localhost/echo'
-  hello
-  world
-  !
-</geshi>
-
-In this example, we also use the [[#Content Handler Directives|content handler directives]] provided by this module as the underlying content handler.
-
-This directive also supports the <code>-n</code> and <code>--</code> options like the [[#echo|echo]] directive.
-
-This directive can be mixed with its brother directive [[#echo_after_body|echo_after_body]].
-
-== echo_after_body ==
-'''syntax:''' ''echo_after_body [argument]...''
-
-'''default:''' ''no''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''output filter''
-
-It's very much like the [[#echo_before_body|echo_before_body]] directive, but ''appends'' its output to the end of the original outputs generated by the underlying content handler.
-
-Here's a simple example:
-
-<geshi lang="nginx">
-    location /echo {
-        echo_after_body hello;
-        proxy_pass http://127.0.0.1:$server_port$request_uri/more;
-    }
-    location /echo/more {
-        echo world
-    }
-</geshi>
-
-Accessing <code>/echo</code> from the client side yields
-
-<geshi lang="text">
-  world
-  hello
-</geshi>
-
-Multiple instances are allowed, as in:
-
-<geshi lang="nginx">
-    location /echo {
-        echo_after_body hello;
-        echo_after_body world;
-        echo i;
-        echo say;
-    }
-</geshi>
-
-The output on the client side while accessing the <code>/echo</code> location looks like
-
-<geshi lang="text">
-  i
-  say
-  hello
-  world
-</geshi>
-
-This directive also supports the <code>-n</code> and <code>--</code> options like the [[#echo|echo]] directive.
-
-This directive can be mixed with its brother directive [[#echo_before_body|echo_before_body]].
-
-= Variables =
-
-== $echo_it ==
-
-This is a "topic variable" used by [[#echo_foreach_split|echo_foreach_split]], just like the <code>$_</code> variable in Perl.
-
-== $echo_timer_elapsed ==
-
-This variable holds the seconds elapsed since the start of the current request (might be a subrequest though) or the last invocation of the [[#echo_reset_timer|echo_reset_timer]] command.
-
-The timing result takes three digits after the decimal point.
-
-References of this variable will force the underlying Nginx timer to update to the current system time, regardless the timer resolution settings elsewhere in the config file, just like the [[#echo_reset_timer|echo_reset_timer]] directive.
-
-== $echo_request_body ==
-
-Evaluates to the current (sub)request's request body previously read if no part of the body has been saved to a temporary file. To always show the request body even if it's very large, use the [[#echo_request_body|echo_request_body]] directive.
-
-== $echo_request_method ==
-
-Evaluates to the HTTP request method of the current request (it can be a subrequest).
-
-Behind the scene, it just takes the string data stored in <code>r->method_name</code>.
-
-Compare it to the [[#$echo_client_request_method|$echo_client_request_method]] variable.
-
-At least for Nginx 0.8.20 and older, the [[HttpCoreModule#$request_method|$request_method]] variable provided by the [[HttpCoreModule|http core module]] is actually doing what our [[#$echo_client_request_method|$echo_client_request_method]] is doing.
-
-This variable was first introduced in our [[#v0.15|v0.15 release]].
-
-== $echo_client_request_method ==
-
-Always evaluates to the main request's HTTP method even if the current request is a subrequest.
-
-Behind the scene, it just takes the string data stored in <code>r->main->method_name</code>.
-
-Compare it to the [[#$echo_request_method|$echo_request_method]] variable.
-
-This variable was first introduced in our [[#v0.15|v0.15 release]].
-
-== $echo_client_request_headers ==
-
-Evaluates to the original client request's headers.
-
-Just as the name suggests, it will always take the main request (or the client request) even if it's currently executed in a subrequest.
-
-A simple example is below:
-
-<geshi lang="nginx">
-  location /echoback {
-     echo "headers are:"
-     echo $echo_client_request_headers;
-  }
-</geshi>
-
-Accessing <code>/echoback</code> yields
-
-<geshi lang="bash">
-  $ curl 'http://localhost/echoback'
-  headers are
-  GET /echoback HTTP/1.1
-  User-Agent: curl/7.18.2 (i486-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.8g
-  Host: localhost:1984
-  Accept: */*
-</geshi>
-
-Behind the scene, it recovers <code>r->main->header_in</code> (or the large header buffers, if any) on the C level and does not construct the headers itself by traversing parsed results in the request object.
-
-This variable was first introduced in [[#v0.15|version 0.15]].
-
-== $echo_cacheable_request_uri ==
-
-Evaluates to the parsed form of the URI (usually led by <code>/</code>) of the current (sub-)request. Unlike the [[#$echo_request_uri|$echo_request_uri]] variable, it is cacheable.
-
-See [[#$echo_request_uri|$echo_request_uri]] for more details.
-
-This variable was first introduced in [[#v0.17|version 0.17]].
-
-== $echo_request_uri ==
-
-Evaluates to the parsed form of the URI (usually led by <code>/</code>) of the current (sub-)request. Unlike the [[#$echo_cacheable_request_uri|$echo_cacheable_request_uri]] variable, it is ''not'' cacheable.
-
-This is quite different from the [[HttpCoreModule#$request_uri|$request_uri]] variable exported by the [[HttpCoreModule]], because <code>$request_uri</code> is the ''unparsed'' form of the current request's URI.
-
-This variable was first introduced in [[#v0.17|version 0.17]].
-
-== $echo_incr ==
-
-It is a counter that always generate the current counting number, starting from 1. The counter is always associated with the main request even if it is accessed within a subrequest.
-
-Consider the following example
-
-<geshi lang="Nginx">
-    location /main {
-        echo "main pre: $echo_incr";
-        echo_location_async /sub;
-        echo_location_async /sub;
-        echo "main post: $echo_incr";
-    }
-    location /sub {
-        echo "sub: $echo_incr";
-    }
-</geshi>
-
-Accessing <code>/main</code> yields
-
-    main pre: 1
-    sub: 3
-    sub: 4
-    main post: 2
-
-This directive was first introduced in the [[#v0.18|v0.18 release]].
-
-== $echo_response_status ==
-
-Evaluates to the status code of the current (sub)request, null if not any.
-
-Behind the scene, it's just the textual representation of <code>r->headers_out->status</code>.
-
-This directive was first introduced in the [[#v0.23|v0.23 release]].
-
-= Installation =
-
-You're recommended to install this module (as well as the Nginx core and many other goodies) via the [http://openresty.org ngx_openresty bundle]. See [http://openresty.org/#Installation the detailed instructions] for downloading and installing ngx_openresty into your system. This is the easiest and most safe way to set things up.
-
-Alternatively, you can install this module manually with the Nginx source:
-
-Grab the nginx source code from [http://nginx.org/ nginx.org], for example,
-the version 1.7.7 (see [[#Compatibility|nginx compatibility]]), and then build the source with this module:
-
-<geshi lang="bash">
-    $ wget 'http://nginx.org/download/nginx-1.7.7.tar.gz'
-    $ tar -xzvf nginx-1.7.7.tar.gz
-    $ cd nginx-1.7.7/
-    
-    # Here we assume you would install you nginx under /opt/nginx/.
-    $ ./configure --prefix=/opt/nginx \
-        --add-module=/path/to/echo-nginx-module
-     
-    $ make -j2
-    $ make install
-</geshi>
-
-Download the latest version of the release tarball of this module from [https://github.com/agentzh/echo-nginx-module/tags echo-nginx-module file list].
-
-Also, this module is included and enabled by default in the [http://openresty.org ngx_openresty bundle].
-
-= Compatibility =
-
-The following versions of Nginx should work with this module:
-
-* '''1.7.x'''                       (last tested: 1.7.7)
-* '''1.6.x'''
-* '''1.5.x'''                       (last tested: 1.5.12)
-* '''1.4.x'''                       (last tested: 1.4.4)
-* '''1.3.x'''                       (last tested: 1.3.7)
-* '''1.2.x'''                       (last tested: 1.2.9)
-* '''1.1.x'''                       (last tested: 1.1.5)
-* '''1.0.x'''                       (last tested: 1.0.11)
-* '''0.9.x'''                       (last tested: 0.9.4)
-* '''0.8.x'''                       (last tested: 0.8.54)
-* '''0.7.x >= 0.7.21'''             (last tested: 0.7.68)
-
-In particular,
-
-* the directive [[#echo_location_async|echo_location_async]] and its brother [[#echo_subrequest_async|echo_subrequest_async]] do ''not'' work with '''0.7.x < 0.7.46'''.
-* the [[#echo_after_body|echo_after_body]] directive does ''not'' work at all with nginx '''< 0.8.7'''.
-* the [[#echo_sleep|echo_sleep]] directive cannot be used after [[#echo_location|echo_location]] or [[#echo_subrequest|echo_subrequest]] for nginx '''< 0.8.11'''.
-
-Earlier versions of Nginx like 0.6.x and 0.5.x will ''not'' work at all.
-
-If you find that any particular version of Nginx above 0.7.21 does not work with this module, please consider [[#Report Bugs|reporting a bug]].
-
-= Known Issues =
-
-Due to an unknown bug in Nginx (it still exists in Nginx 1.7.7), the [[HttpSsiModule|standard SSI module]] is required to ensure that the contents of the subrequests issued by [[#echo_location_async|echo_locatoin_async]] and [[#echo_subrequest_async|echo_subrequest_async]] are correctly merged into the output chains of the main one. Fortunately, the SSI module is enabled by default during Nginx's <code>configure</code> process.
-
-If calling this directive without SSI module enabled, you'll get truncated response without contents of any subrequests and get an alert message in your Nginx's <code>error.log</code>, like this:
-
-<geshi lang="nginx">
-  [alert] 24212#0: *1 the http output chain is empty, client: 127.0.0.1, ...
-</geshi>
-
-= Modules that use this module for testing =
-
-The following modules take advantage of this <code>echo</code> module in their test suite:
-
-* The [[HttpMemcModule|memc]] module that supports almost the whole memcached TCP protocol.
-* The [[HttpChunkinModule|chunkin]] module that adds HTTP 1.1 chunked input support to Nginx.
-* The [[HttpHeadersMoreModule|headers_more]] module that allows you to add, set, and clear input and output headers under the conditions that you specify.
-* The <code>echo</code> module itself.
-
-Please mail me other modules that use <code>echo</code> in any form and I'll add them to the list above :)
-
-= 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.
-
-= Report Bugs =
-
-Although a lot of effort has been put into testing and code tuning, there must be some serious bugs lurking somewhere in this module. So whenever you are bitten by any quirks, please don't hesitate to
-
-# create a ticket on the [https://github.com/agentzh/echo-nginx-module/issues issue tracking interface] provided by GitHub,
-# or send a bug report, questions, or even patches to the [[#Community|OpenResty Community]].
-
-= Source Repository =
-
-Available on github at [https://github.com/agentzh/echo-nginx-module agentzh/echo-nginx-module].
-
-= Changes =
-
-The changes of every release of this module can be obtained from the ngx_openresty bundle's change logs:
-
-http://openresty.org/#Changes
-
-= Test Suite =
-
-This module comes with a Perl-driven test suite. The [https://github.com/agentzh/echo-nginx-module/tree/master/t/ test cases] are
-[https://github.com/agentzh/echo-nginx-module/blob/master/t/echo.t declarative] too. Thanks to the [http://search.cpan.org/perldoc?Test::Nginx Test::Nginx] module in the Perl world.
-
-To run it on your side:
-
-<geshi lang="bash">
-    $ PATH=/path/to/your/nginx-with-echo-module:$PATH prove -r t
-</geshi>
-
-You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
-
-Because a single nginx server (by default, <code>localhost:1984</code>) is used across all the test scripts (<code>.t</code> files), it's meaningless to run the test suite in parallel by specifying <code>-jN</code> when invoking the <code>prove</code> utility.
-
-Some parts of the test suite requires standard modules [[HttpProxyModule|proxy]], [[HttpRewriteModule|rewrite]] and [[HttpSsiModule|SSI]] to be enabled as well when building Nginx.
-
-= TODO =
-
-* Fix the [[#echo_after_body|echo_after_body]] directive in subrequests.
-* Add directives ''echo_read_client_request_body'' and ''echo_request_headers''.
-* Add new directive ''echo_log'' to use Nginx's logging facility directly from the config file and specific loglevel can be specified, as in
-
-<geshi lang="nginx">
-  echo_log debug "I am being called.";
-</geshi>
-
-* Add support for options <code>-h</code> and <code>-t</code> to [[#echo_subrequest_async|echo_subrequest_async]] and [[#echo_subrequest|echo_subrequest]]. For example
-
-<geshi lang="nginx">
-  echo_subrequest POST /sub -q 'foo=Foo&bar=Bar' -b 'hello' -t 'text/plan' -h 'X-My-Header: blah blah'
-</geshi>
-
-* Add options to control whether a subrequest should inherit cached variables from its parent request (i.e. the current request that is calling the subrequest in question). Currently none of the subrequests issued by this module inherit the cached variables from the parent request.
-* Add new variable ''$echo_active_subrequests'' to show <code>r->main->count - 1</code>.
-* Add the ''echo_file'' and ''echo_cached_file'' directives.
-* Add new varaible ''$echo_request_headers'' to accompany the existing [[#$echo_client_request_headers|$echo_client_request_headers]] variable.
-* Add new directive ''echo_foreach'', as in
-
-<geshi lang="nginx">
-  echo_foreach 'cat' 'dog' 'mouse';
-    echo_location_async "/animals/$echo_it";
-  echo_end;
-</geshi>
-
-* Add new directive ''echo_foreach_range'', as in
-
-<geshi lang="nginx">
-  echo_foreach_range '[1..100]' '[a-zA-z0-9]';
-    echo_location_async "/item/$echo_it";
-  echo_end;
-</geshi>
-
-* Add new directive ''echo_repeat'', as in
-
-<geshi lang="nginx">
-  echo_repeat 10 $i {
-      echo "Page $i";
-      echo_location "/path/to/page/$i";
-  }
-</geshi>
-
-This is just another way of saying
-
-<geshi lang="nginx">
-  echo_foreach_range $i [1..10];
-      echo "Page $i";
-      echo_location "/path/to/page/$i";
-  echo_end;
-</geshi>
-
-Thanks Marcus Clyne for providing this idea.
-
-* Add new variable $echo_random which always returns a random non-negative integer with the lower/upper limit specified by the new directives <code>echo_random_min</code> and <code>echo_random_max</code>. For example,
-
-<geshi lang="nginx">
-  echo_random_min  10
-  echo_random_max  200
-  echo "random number: $echo_random";
-</geshi>
-
-Thanks Marcus Clyne for providing this idea.
-
-= Getting involved =
-
-You'll be very welcomed to submit patches to the [[#Author|author]] or just ask for a commit bit to the [[#Source Repository|source repository]] on GitHub.
-
-= Author =
-
-Yichun "agentzh" Zhang (章亦春) ''<agentzh@gmail.com>'', CloudFlare Inc.
-
-This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
-
-= Copyright & License =
-
-Copyright (c) 2009-2014, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
-
-This module is licensed under the terms of the BSD license.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-= See Also =
-
-* The original [http://agentzh.blogspot.com/2009/10/hacking-on-nginx-echo-module.html blog post] about this module's initial development.
-* The standard [[HttpAdditionModule|addition filter module]].
-* The standard [[HttpProxyModule|proxy module]].
-* The [http://openresty.org ngx_openresty] bundle.
-
diff --git a/debian/modules/nginx-echo/src/ddebug.h b/debian/modules/nginx-echo/src/ddebug.h
index e812446..a92d7a7 100644
--- a/debian/modules/nginx-echo/src/ddebug.h
+++ b/debian/modules/nginx-echo/src/ddebug.h
@@ -1,6 +1,7 @@
 #ifndef DDEBUG_H
 #define DDEBUG_H
 
+#include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
 
@@ -19,7 +20,8 @@
 
 #include <stdarg.h>
 
-static void dd(const char * fmt, ...) {
+static ngx_inline void
+dd(const char * fmt, ...) {
 }
 
 #    endif
@@ -28,7 +30,8 @@ static void dd(const char * fmt, ...) {
 
 #       define dd_enter() dd_enter_helper(r, __func__)
 
-static void dd_enter_helper(ngx_http_request_t *r, const char *func) {
+static ngx_inline void
+dd_enter_helper(ngx_http_request_t *r, const char *func) {
     ngx_http_posted_request_t       *pr;
 
     fprintf(stderr, ">enter %s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
@@ -68,10 +71,12 @@ static void dd_enter_helper(ngx_http_request_t *r, const char *func) {
 
 #include <stdarg.h>
 
-static void dd(const char * fmt, ...) {
+static ngx_inline void
+dd(const char * fmt, ...) {
 }
 
-static void dd_enter() {
+static ngx_inline void
+dd_enter() {
 }
 
 #   endif
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_echo.c b/debian/modules/nginx-echo/src/ngx_http_echo_echo.c
index 5fa5a7f..f5789f5 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_echo.c
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_echo.c
@@ -94,7 +94,6 @@ ngx_http_echo_exec_echo(ngx_http_request_t *r,
     ngx_chain_t *cl  = NULL; /* the head of the chain link */
     ngx_chain_t **ll = &cl;  /* always point to the address of the last link */
 
-
     dd_enter();
 
     if (computed_args == NULL) {
@@ -173,6 +172,7 @@ ngx_http_echo_exec_echo(ngx_http_request_t *r,
 
     if (opts && opts->nelts > 0) {
         opt = opts->elts;
+        /* FIXME handle other unrecognized options here */
         if (opt[0].len == 1 && opt[0].data[0] == 'n') {
             goto done;
         }
@@ -287,15 +287,13 @@ ngx_http_echo_exec_echo_duplicate(ngx_http_request_t *r,
 {
     ngx_str_t                   *computed_arg;
     ngx_str_t                   *computed_arg_elts;
-    ssize_t                     i, count;
+    ssize_t                      i, count;
     ngx_str_t                   *str;
     u_char                      *p;
-    ngx_int_t                   rc;
-
+    ngx_int_t                    rc;
     ngx_buf_t                   *buf;
     ngx_chain_t                 *cl;
 
-
     dd_enter();
 
     computed_arg_elts = computed_args->elts;
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_foreach.c b/debian/modules/nginx-echo/src/ngx_http_echo_foreach.c
index 44e1549..a4a2b54 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_foreach.c
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_foreach.c
@@ -14,7 +14,7 @@ ngx_http_echo_it_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
     ngx_http_echo_ctx_t         *ctx;
-    ngx_uint_t                  i;
+    ngx_uint_t                   i;
     ngx_array_t                 *choices;
     ngx_str_t                   *choice_elts, *choice;
 
@@ -156,8 +156,8 @@ ngx_http_echo_exec_echo_end(ngx_http_request_t *r,
 {
     if (ctx->foreach == NULL) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                     "Found a echo_end that has no corresponding echo_foreach "
-                     "before it.");
+                      "Found a echo_end that has no corresponding echo_foreach "
+                      "before it.");
         return NGX_ERROR;
     }
 
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_handler.c b/debian/modules/nginx-echo/src/ngx_http_echo_handler.c
index bb506e3..00933a4 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_handler.c
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_handler.c
@@ -93,7 +93,7 @@ ngx_http_echo_wev_handler(ngx_http_request_t *r)
         dd("finalizing with rc %d", (int) rc);
 
         dd("finalize request %.*s with %d", (int) r->uri.len, r->uri.data,
-                (int) rc);
+           (int) rc);
 
         ngx_http_finalize_request(r, rc);
     }
@@ -164,7 +164,6 @@ ngx_http_echo_run_cmds(ngx_http_request_t *r)
     ngx_http_echo_cmd_t         *cmd_elts;
     ngx_array_t                 *opts = NULL;
 
-
     elcf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
     cmds = elcf->handler_cmds;
     if (cmds == NULL) {
@@ -182,7 +181,7 @@ ngx_http_echo_run_cmds(ngx_http_request_t *r)
     }
 
     dd("exec handler: %.*s: %i", (int) r->uri.len, r->uri.data,
-            (int) ctx->next_handler_cmd);
+       (int) ctx->next_handler_cmd);
 
     cmd_elts = cmds->elts;
 
@@ -215,7 +214,9 @@ ngx_http_echo_run_cmds(ngx_http_request_t *r)
         }
 
         /* do command dispatch based on the opcode */
+
         switch (cmd->opcode) {
+
         case echo_opcode_echo_sync:
             rc = ngx_http_echo_exec_echo_sync(r, ctx);
             break;
@@ -351,7 +352,6 @@ read_request_body:
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                           "unknown opcode: %d", cmd->opcode);
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            break;
         }
 
         if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_module.c b/debian/modules/nginx-echo/src/ngx_http_echo_module.c
index eade972..ae70479 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_module.c
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_module.c
@@ -17,55 +17,57 @@
 #include "ngx_http_echo_var.h"
 #include "ngx_http_echo_util.h"
 
+
 #include <nginx.h>
 #include <ngx_config.h>
 #include <ngx_log.h>
 
+
 /* config init handler */
-static void * ngx_http_echo_create_loc_conf(ngx_conf_t *cf);
-static char * ngx_http_echo_merge_loc_conf(ngx_conf_t *cf, void *parent,
+static void *ngx_http_echo_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_echo_merge_loc_conf(ngx_conf_t *cf, void *parent,
     void *child);
 static void *ngx_http_echo_create_main_conf(ngx_conf_t *cf);
 static ngx_int_t ngx_http_echo_post_config(ngx_conf_t *cf);
 
 /* config directive handlers */
-static char * ngx_http_echo_echo(ngx_conf_t *cf, ngx_command_t *cmd,
+static char *ngx_http_echo_echo(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
-static char * ngx_http_echo_echo_request_body(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_request_body(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_sleep(ngx_conf_t *cf, ngx_command_t *cmd,
+static char *ngx_http_echo_echo_sleep(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
-static char * ngx_http_echo_echo_flush(ngx_conf_t *cf, ngx_command_t *cmd,
+static char *ngx_http_echo_echo_flush(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
-static char * ngx_http_echo_echo_blocking_sleep(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_blocking_sleep(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_reset_timer(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_reset_timer(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_before_body(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_before_body(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_after_body(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_after_body(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_location_async(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_location_async(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_location(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_location(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_subrequest_async(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_subrequest_async(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_subrequest(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_subrequest(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_duplicate(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_duplicate(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_read_request_body(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_read_request_body(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_foreach_split(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_foreach_split(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_end(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_end(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_abort_parent(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_abort_parent(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_echo_exec(ngx_conf_t *cf,
+static char *ngx_http_echo_echo_exec(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
-static char * ngx_http_echo_helper(ngx_http_echo_opcode_t opcode,
+static char *ngx_http_echo_helper(ngx_http_echo_opcode_t opcode,
     ngx_http_echo_cmd_category_t cat,
     ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 
@@ -309,7 +311,7 @@ ngx_http_echo_helper(ngx_http_echo_opcode_t opcode,
     /* cmds_ptr points to ngx_http_echo_loc_conf_t's
      * handler_cmds, before_body_cmds, or after_body_cmds
      * array, depending on the actual offset */
-    cmds_ptr = (ngx_array_t**)(((u_char*)conf) + cmd->offset);
+    cmds_ptr = (ngx_array_t **) (((u_char *) conf) + cmd->offset);
 
     if (*cmds_ptr == NULL) {
         *cmds_ptr = ngx_array_create(cf->pool, 1,
@@ -344,7 +346,7 @@ ngx_http_echo_helper(ngx_http_echo_opcode_t opcode,
 
     args_ptr = &echo_cmd->args;
     *args_ptr = ngx_array_create(cf->pool, 1,
-            sizeof(ngx_http_echo_arg_template_t));
+                                 sizeof(ngx_http_echo_arg_template_t));
 
     if (*args_ptr == NULL) {
         return NGX_CONF_ERROR;
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_module.h b/debian/modules/nginx-echo/src/ngx_http_echo_module.h
index b2ae1b4..2d212c3 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_module.h
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_module.h
@@ -1,4 +1,8 @@
-/* Copyright (C) by agentzh */
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
 
 #ifndef NGX_HTTP_ECHO_MODULE_H
 #define NGX_HTTP_ECHO_MODULE_H
@@ -130,6 +134,12 @@ typedef struct {
     unsigned         done:1;
 
     unsigned         run_post_subrequest:1;
+    unsigned         header_sent:1; /* r->header_sent is not sufficient
+                                     * because special header filters like
+                                     * ngx_http_image_filter_module's may
+                                     * intercept the whole header filter chain
+                                     * leaving r->header_sent unset. So we
+                                     * should always test both flags. */
 
 } ngx_http_echo_ctx_t;
 
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_request_info.c b/debian/modules/nginx-echo/src/ngx_http_echo_request_info.c
index 6e00ab1..d28ec4d 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_request_info.c
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_request_info.c
@@ -20,7 +20,7 @@ static void ngx_http_echo_post_read_request_body(ngx_http_request_t *r);
 
 
 ngx_int_t
-ngx_http_echo_exec_echo_read_request_body(ngx_http_request_t* r,
+ngx_http_echo_exec_echo_read_request_body(ngx_http_request_t *r,
     ngx_http_echo_ctx_t *ctx)
 {
     return ngx_http_read_client_request_body(r,
@@ -187,6 +187,14 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
     hc = r->main->http_connection;
     c = mr->connection;
 
+#if (NGX_HTTP_V2)
+    /* TODO */
+    if (mr->stream) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+#endif
+
     size = 0;
     b = c->buffer;
 
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_request_info.h b/debian/modules/nginx-echo/src/ngx_http_echo_request_info.h
index 160d612..3b3713b 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_request_info.h
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_request_info.h
@@ -1,31 +1,33 @@
 #ifndef ECHO_REQUEST_INFO_H
 #define ECHO_REQUEST_INFO_H
 
+
 #include "ngx_http_echo_module.h"
 
+
 ngx_int_t ngx_http_echo_exec_echo_read_request_body(
-        ngx_http_request_t* r, ngx_http_echo_ctx_t *ctx);
+    ngx_http_request_t *r, ngx_http_echo_ctx_t *ctx);
 
 ngx_int_t ngx_http_echo_request_method_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 ngx_int_t ngx_http_echo_client_request_method_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 ngx_int_t ngx_http_echo_request_body_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 ngx_int_t ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 ngx_int_t ngx_http_echo_cacheable_request_uri_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 ngx_int_t ngx_http_echo_request_uri_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 ngx_int_t ngx_http_echo_response_status_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
+    ngx_http_variable_value_t *v, uintptr_t data);
+
 
 #endif /* ECHO_REQUEST_INFO_H */
-
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_sleep.c b/debian/modules/nginx-echo/src/ngx_http_echo_sleep.c
index 13fffdf..c96fa5a 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_sleep.c
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_sleep.c
@@ -39,13 +39,13 @@ ngx_http_echo_exec_echo_sleep(ngx_http_request_t *r,
 
     if (delay == NGX_ERROR) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                   "invalid sleep duration \"%V\"", &computed_arg_elts[0]);
+                      "invalid sleep duration \"%V\"", &computed_arg_elts[0]);
 
         return NGX_HTTP_BAD_REQUEST;
     }
 
     dd("adding timer with delay %lu ms, r:%.*s", (unsigned long) delay,
-            (int) r->uri.len, r->uri.data);
+       (int) r->uri.len, r->uri.data);
 
     ngx_add_timer(&ctx->sleep, (ngx_msec_t) delay);
 
@@ -135,7 +135,7 @@ ngx_http_echo_sleep_event_handler(ngx_event_t *ev)
      * and delete our timer and then quit. */
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-            "echo sleep handler: \"%V?%V\"", &r->uri, &r->args);
+                   "echo sleep event handler: \"%V?%V\"", &r->uri, &r->args);
 
     /*
     if (r->done) {
@@ -172,7 +172,7 @@ ngx_http_echo_exec_echo_blocking_sleep(ngx_http_request_t *r,
 
     if (delay == NGX_ERROR) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                   "invalid sleep duration \"%V\"", &computed_arg_elts[0]);
+                      "invalid sleep duration \"%V\"", &computed_arg_elts[0]);
         return NGX_HTTP_BAD_REQUEST;
     }
 
@@ -188,7 +188,7 @@ static void
 ngx_http_echo_sleep_cleanup(void *data)
 {
     ngx_http_request_t      *r = data;
-    ngx_http_echo_ctx_t         *ctx;
+    ngx_http_echo_ctx_t     *ctx;
 
     dd("echo sleep cleanup");
 
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_subrequest.c b/debian/modules/nginx-echo/src/ngx_http_echo_subrequest.c
index fd240d6..8644d7f 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_subrequest.c
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_subrequest.c
@@ -165,7 +165,7 @@ ngx_http_echo_exec_echo_subrequest(ngx_http_request_t *r,
      */
 
     dd("creating sr ctx for %.*s: %p", (int) parsed_sr->location->len,
-            parsed_sr->location->data, sr_ctx);
+       parsed_sr->location->data, sr_ctx);
 
     psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
 
@@ -177,7 +177,7 @@ ngx_http_echo_exec_echo_subrequest(ngx_http_request_t *r,
     psr->data = sr_ctx;
 
     rc = ngx_http_subrequest(r, parsed_sr->location, parsed_sr->query_string,
-            &sr, psr, 0);
+                             &sr, psr, 0);
 
     if (rc != NGX_OK) {
         return NGX_ERROR;
@@ -263,10 +263,10 @@ ngx_http_echo_parse_subrequest_spec(ngx_http_request_t *r,
             }
 
             if (ngx_strncmp("-f", arg->data, arg->len) == 0) {
-              dd("found option -f");
-              to_write = &body_file;
-              expecting_opt = 0;
-              continue;
+                dd("found option -f");
+                to_write = &body_file;
+                expecting_opt = 0;
+                continue;
             }
         }
 
@@ -425,7 +425,7 @@ ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr,
     /* we do not inherit the parent request's variables */
     cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
     sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts
-                                        * sizeof(ngx_http_variable_value_t));
+                                * sizeof(ngx_http_variable_value_t));
 
     if (sr->variables == NULL) {
         return NGX_ERROR;
@@ -453,7 +453,7 @@ ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr,
 static ngx_int_t
 ngx_http_echo_parse_method_name(ngx_str_t **method_name_ptr)
 {
-    const ngx_str_t* method_name = *method_name_ptr;
+    const ngx_str_t     *method_name = *method_name_ptr;
 
     switch (method_name->len) {
     case 3:
@@ -688,7 +688,7 @@ ngx_http_echo_exec_exec(ngx_http_request_t *r,
 #endif
 
         dd("named location: %.*s, c:%d", (int) uri->len, uri->data,
-                (int) r->main->count);
+           (int) r->main->count);
 
         return ngx_http_named_location(r, uri);
     }
@@ -709,7 +709,9 @@ ngx_http_echo_set_content_length_header(ngx_http_request_t *r, off_t len)
     r->headers_in.content_length_n = len;
 
     if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
-                sizeof(ngx_table_elt_t)) != NGX_OK) {
+                      sizeof(ngx_table_elt_t))
+        != NGX_OK)
+    {
         return NGX_ERROR;
     }
 
@@ -740,7 +742,7 @@ ngx_http_echo_set_content_length_header(ngx_http_request_t *r, off_t len)
     h->hash = ngx_http_echo_content_length_hash;
 
     dd("r content length: %.*s",
-            (int)r->headers_in.content_length->value.len,
+       (int) r->headers_in.content_length->value.len,
             r->headers_in.content_length->value.data);
 
     pr = r->parent;
@@ -766,9 +768,10 @@ ngx_http_echo_set_content_length_header(ngx_http_request_t *r, off_t len)
             i = 0;
         }
 
-        if (header[i].key.len == sizeof("Content-Length") - 1 &&
-                ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length",
-                sizeof("Content-Length") - 1) == 0)
+        if (header[i].key.len == sizeof("Content-Length") - 1
+            && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length",
+                               sizeof("Content-Length") - 1)
+               == 0)
         {
             continue;
         }
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_timer.c b/debian/modules/nginx-echo/src/ngx_http_echo_timer.c
index 41dada9..e2777ee 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_timer.c
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_timer.c
@@ -17,10 +17,10 @@ ngx_http_echo_timer_elapsed_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
     ngx_http_echo_ctx_t     *ctx;
-    ngx_msec_int_t          ms;
+    ngx_msec_int_t           ms;
     u_char                  *p;
     ngx_time_t              *tp;
-    size_t                  size;
+    size_t                   size;
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
     if (ctx == NULL) {
@@ -64,8 +64,7 @@ ngx_http_echo_timer_elapsed_variable(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    v->len = ngx_snprintf(p, size, "%T.%03M",
-             ms / 1000, ms % 1000) - p;
+    v->len = ngx_snprintf(p, size, "%T.%03M", ms / 1000, ms % 1000) - p;
     v->data = p;
 
     v->valid = 1;
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_util.c b/debian/modules/nginx-echo/src/ngx_http_echo_util.c
index 6332dc6..fed0587 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_util.c
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_util.c
@@ -40,11 +40,11 @@ ngx_http_echo_eval_cmd_args(ngx_http_request_t *r,
     ngx_http_echo_cmd_t *cmd, ngx_array_t *computed_args,
     ngx_array_t *opts)
 {
+    unsigned                         expecting_opts = 1;
     ngx_uint_t                       i;
     ngx_array_t                     *args = cmd->args;
     ngx_str_t                       *arg, *raw, *opt;
     ngx_http_echo_arg_template_t    *value;
-    ngx_flag_t                       expecting_opts = 1;
 
     value = args->elts;
 
@@ -105,7 +105,7 @@ ngx_http_echo_eval_cmd_args(ngx_http_request_t *r,
 
 
 ngx_int_t
-ngx_http_echo_send_chain_link(ngx_http_request_t* r,
+ngx_http_echo_send_chain_link(ngx_http_request_t *r,
     ngx_http_echo_ctx_t *ctx, ngx_chain_t *in)
 {
     ngx_int_t        rc;
@@ -136,17 +136,19 @@ ngx_http_echo_send_chain_link(ngx_http_request_t* r,
         return NGX_OK;
     }
 
+    /* FIXME we should udpate chains to recycle chain links and bufs */
     return ngx_http_output_filter(r, in);
 }
 
 
 ngx_int_t
-ngx_http_echo_send_header_if_needed(ngx_http_request_t* r,
+ngx_http_echo_send_header_if_needed(ngx_http_request_t *r,
     ngx_http_echo_ctx_t *ctx)
 {
+    ngx_int_t                    rc;
     ngx_http_echo_loc_conf_t    *elcf;
 
-    if (!r->header_sent) {
+    if (!r->header_sent && !ctx->header_sent) {
         elcf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
 
         r->headers_out.status = (ngx_uint_t) elcf->status;
@@ -158,7 +160,9 @@ ngx_http_echo_send_header_if_needed(ngx_http_request_t* r,
         ngx_http_clear_content_length(r);
         ngx_http_clear_accept_ranges(r);
 
-        return ngx_http_send_header(r);
+        rc = ngx_http_send_header(r);
+        ctx->header_sent = 1;
+        return rc;
     }
 
     return NGX_OK;
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_util.h b/debian/modules/nginx-echo/src/ngx_http_echo_util.h
index 34fd596..24b3e15 100644
--- a/debian/modules/nginx-echo/src/ngx_http_echo_util.h
+++ b/debian/modules/nginx-echo/src/ngx_http_echo_util.h
@@ -38,20 +38,20 @@ ngx_http_echo_hash_str(u_char *src, size_t n)
 extern ngx_uint_t  ngx_http_echo_content_length_hash;
 
 
-ngx_http_echo_ctx_t * ngx_http_echo_create_ctx(ngx_http_request_t *r);
+ngx_http_echo_ctx_t *ngx_http_echo_create_ctx(ngx_http_request_t *r);
 ngx_int_t ngx_http_echo_eval_cmd_args(ngx_http_request_t *r,
-        ngx_http_echo_cmd_t *cmd, ngx_array_t *computed_args,
-        ngx_array_t *opts);
-ngx_int_t ngx_http_echo_send_header_if_needed(ngx_http_request_t* r,
-        ngx_http_echo_ctx_t *ctx);
-ngx_int_t ngx_http_echo_send_chain_link(ngx_http_request_t* r,
-        ngx_http_echo_ctx_t *ctx, ngx_chain_t *cl);
+    ngx_http_echo_cmd_t *cmd, ngx_array_t *computed_args,
+    ngx_array_t *opts);
+ngx_int_t ngx_http_echo_send_header_if_needed(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx);
+ngx_int_t ngx_http_echo_send_chain_link(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_chain_t *cl);
 ssize_t ngx_http_echo_atosz(u_char *line, size_t n);
-u_char * ngx_http_echo_strlstrn(u_char *s1, u_char *last, u_char *s2, size_t n);
+u_char *ngx_http_echo_strlstrn(u_char *s1, u_char *last, u_char *s2, size_t n);
 ngx_int_t ngx_http_echo_post_request_at_head(ngx_http_request_t *r,
-        ngx_http_posted_request_t *pr);
-u_char * ngx_http_echo_rebase_path(ngx_pool_t *pool, u_char *src, size_t osize,
-        size_t *nsize);
+    ngx_http_posted_request_t *pr);
+u_char *ngx_http_echo_rebase_path(ngx_pool_t *pool, u_char *src, size_t osize,
+    size_t *nsize);
 ngx_int_t ngx_http_echo_flush_postponed_outputs(ngx_http_request_t *r);
 
 
diff --git a/debian/modules/nginx-echo/t/echo.t b/debian/modules/nginx-echo/t/echo.t
index 629682e..b181259 100644
--- a/debian/modules/nginx-echo/t/echo.t
+++ b/debian/modules/nginx-echo/t/echo.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 5);
+plan tests => repeat_each() * (2 * blocks() + 6);
 
 #$Test::Nginx::LWP::LogLevel = 'debug';
 
@@ -382,3 +382,35 @@ foo bar baz"]
 --- response_body chop
  hello world
 
+
+
+=== TEST 27: image filter
+--- config
+    location = /gif {
+        empty_gif;
+    }
+
+    location = /t {
+        default_type image/gif;
+        image_filter resize 10 10;
+        set $gif1 '';
+        set $gif2 '';
+        rewrite_by_lua '
+            local res = ngx.location.capture("/gif")
+            local data = res.body
+            ngx.var.gif1 = string.sub(data, 1, #data - 1)
+            ngx.var.gif2 = string.sub(data, #data)
+        ';
+        echo -n $gif1;
+        echo -n $gif2;
+    }
+--- request
+    GET /t
+--- stap
+F(ngx_http_image_header_filter) {
+    println("image header filter")
+}
+--- stap_out
+image header filter
+--- response_body_like: .
+
diff --git a/debian/modules/nginx-echo/t/location.t b/debian/modules/nginx-echo/t/location.t
index 90514c8..48c851e 100644
--- a/debian/modules/nginx-echo/t/location.t
+++ b/debian/modules/nginx-echo/t/location.t
@@ -149,7 +149,7 @@ after sr 2
 --- response_body_like
 ^hello
 world
-took 0\.0(?:2[5-9]|3[0-5]) sec for total\.$
+took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
 
 
 
diff --git a/debian/modules/nginx-echo/t/subrequest.t b/debian/modules/nginx-echo/t/subrequest.t
index 7562f12..6d965d0 100644
--- a/debian/modules/nginx-echo/t/subrequest.t
+++ b/debian/modules/nginx-echo/t/subrequest.t
@@ -130,7 +130,7 @@ after sr 2
 --- response_body_like
 ^hello
 world
-took 0\.0(?:2[5-9]|3[0-5]) sec for total\.$
+took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
 
 
 
diff --git a/debian/modules/nginx-echo/t/unused.t b/debian/modules/nginx-echo/t/unused.t
index c761e44..f3c6e9e 100644
--- a/debian/modules/nginx-echo/t/unused.t
+++ b/debian/modules/nginx-echo/t/unused.t
@@ -60,6 +60,9 @@ echo body filter, uri "/echo?blah"
 
 
 === TEST 3: (after) filters used (multiple http {} blocks)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
 --- http_config
     postpone_output 1;
 --- config
@@ -87,6 +90,9 @@ echo body filter, uri "/echo?blah"
 
 
 === TEST 4: (before) filters used (multiple http {} blocks)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
 --- http_config
     postpone_output 1;
 --- config
diff --git a/debian/modules/nginx-echo/util/build.sh b/debian/modules/nginx-echo/util/build.sh
index 09a3914..45949bb 100755
--- a/debian/modules/nginx-echo/util/build.sh
+++ b/debian/modules/nginx-echo/util/build.sh
@@ -7,24 +7,22 @@ version=$1
 force=$2
 home=~
 
-  #--without-http_ssi_module \
             #--with-cc=gcc46 \
 
 ngx-build $force $version \
             --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:/usr/local/lib" \
             --with-cc-opt="-DDEBUG_MALLOC" \
             --with-http_stub_status_module \
+            --with-http_image_filter_module \
             --without-mail_pop3_module \
             --without-mail_imap_module \
             --without-mail_smtp_module \
             --without-http_upstream_ip_hash_module \
-            --without-http_empty_gif_module \
             --without-http_memcached_module \
             --without-http_referer_module \
             --without-http_autoindex_module \
             --without-http_auth_basic_module \
             --without-http_userid_module \
-          --with-http_addition_module \
           --add-module=$root/../ndk-nginx-module \
           --add-module=$root/../set-misc-nginx-module \
           --add-module=$root/../eval-nginx-module \
@@ -33,9 +31,10 @@ ngx-build $force $version \
           --add-module=$root/../headers-more-nginx-module \
           --add-module=$root/../lua-nginx-module \
           --add-module=$root $opts \
+          --with-http_v2_module \
           --with-select_module \
           --with-poll_module \
-          --with-rtsig_module \
+          --without-http_ssi_module \
           --with-debug || exit 1
           #--add-module=$root/../lz-session-nginx-module \
           #--add-module=$home/work/ndk \
diff --git a/debian/modules/nginx-echo/util/releng b/debian/modules/nginx-echo/util/releng
new file mode 100755
index 0000000..b3ad9f2
--- /dev/null
+++ b/debian/modules/nginx-echo/util/releng
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+./update-readme
+ack '.{81}' src/ngx_http_*.[ch]
+ack '(?<=\#define)\s*DDEBUG\s*[12]' src
+echo =======================================
+ack '(?<=This document describes echo-nginx-module v)\d+\.\d+' README
+

From 155f1a5b11f97927e25d308e8360d497a848e019 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 26 Aug 2016 16:35:59 +0300
Subject: [PATCH 090/600] mod: Convert http-echo to a dynamic module

---
 debian/control                              | 28 ++++++++++++++++++++-
 debian/libnginx-mod-http-echo.nginx         | 13 ++++++++++
 debian/libnginx-mod.conf/mod-http-echo.conf |  1 +
 debian/rules                                |  8 +++---
 debian/tests/control                        |  3 +++
 5 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100755 debian/libnginx-mod-http-echo.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-echo.conf

diff --git a/debian/control b/debian/control
index 9cbfe3f..3cc5010 100644
--- a/debian/control
+++ b/debian/control
@@ -90,6 +90,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-http-auth-pam (= ${binary:Version}),
+         libnginx-mod-http-echo (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -136,7 +137,10 @@ Description: nginx web/proxy server (standard version) - debugging symbols
 Package: nginx-light
 Architecture: any
 Priority: extra
-Depends: nginx-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: nginx-common (= ${source:Version}),
+         libnginx-mod-http-echo (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
 Provides: httpd, httpd-cgi, nginx
 Conflicts: nginx-extras, nginx-full
@@ -186,6 +190,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-lua (= ${binary:Version}),
          libnginx-mod-http-perl (= ${binary:Version}),
          libnginx-mod-nchan (= ${binary:Version}),
+         libnginx-mod-http-echo (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -338,3 +343,24 @@ Description: Fast, flexible pub/sub server for Nginx
  nginx server instances with Redis.
  .
  Full documentation available at https://nchan.slact.net
+
+Package: libnginx-mod-http-echo
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Bring echo and more shell style goodies to Nginx
+ Echo module wraps lots of Nginx internal APIs for streaming input and output,
+ parallel/sequential subrequests, timers and sleeping, as well as various meta
+ data accessing.
+ .
+ Basically it provides various utilities that help testing and debugging of
+ other modules by trivially emulating different kinds of faked subrequest
+ locations.
+ .
+ People will also find it useful in real-world applications that need to:
+ .
+ 1. Serve static contents directly from memory.
+ 2. Wrap the upstream response with custom header and footer (kinda like the
+    addition module but with contents read directly from the config file and
+    Nginx variables).
+ 3. Merge contents of various "Nginx locations" (i.e., subrequests) together in
+    a single main request (using echo_location and its friends).
diff --git a/debian/libnginx-mod-http-echo.nginx b/debian/libnginx-mod-http-echo.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-echo.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-echo.conf b/debian/libnginx-mod.conf/mod-http-echo.conf
new file mode 100644
index 0000000..a82ee29
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-echo.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_echo_module.so;
diff --git a/debian/rules b/debian/rules
index e1e4121..d108bd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -68,7 +68,7 @@ light_configure_flags := \
 			--without-http_split_clients_module \
 			--without-http_userid_module \
 			--without-http_uwsgi_module \
-			--add-module=$(MODULESDIR)/nginx-echo
+			--add-dynamic-module=$(MODULESDIR)/nginx-echo
 
 full_configure_flags := \
 			$(common_configure_flags) \
@@ -85,7 +85,7 @@ full_configure_flags := \
 			--with-mail_ssl_module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
-			--add-module=$(MODULESDIR)/nginx-echo \
+			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
 			--add-module=$(MODULESDIR)/nginx-upstream-fair \
 			--add-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
 
@@ -112,7 +112,7 @@ extras_configure_flags := \
 			--add-module=$(MODULESDIR)/nginx-cache-purge \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-development-kit \
-			--add-module=$(MODULESDIR)/nginx-echo \
+			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
 			--add-module=$(MODULESDIR)/ngx-fancyindex \
 			--add-dynamic-module=$(MODULESDIR)/nchan \
 			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
diff --git a/debian/tests/control b/debian/tests/control
index 2e6d447..d12d49d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -15,6 +15,7 @@ Restrictions: allow-stderr isolation-container
 Depends: nginx-full,
          curl,
          libnginx-mod-http-auth-pam,
+         libnginx-mod-http-echo,
          libnginx-mod-http-geoip,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
@@ -29,6 +30,7 @@ Restrictions: allow-stderr isolation-container
 Depends: nginx-light,
          curl,
          libnginx-mod-http-auth-pam,
+         libnginx-mod-http-echo,
          libnginx-mod-http-geoip,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
@@ -43,6 +45,7 @@ Restrictions: allow-stderr isolation-container
 Depends: nginx-extras,
          curl,
          libnginx-mod-http-auth-pam,
+         libnginx-mod-http-echo,
          libnginx-mod-http-geoip,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,

From d0712299ce4dd586e90007ef6d3e790154e3cba4 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 10:37:04 +0300
Subject: [PATCH 091/600] mod: Convert upstream-fair to dynamic module

---
 debian/control                                      | 10 ++++++++++
 debian/libnginx-mod-http-upstream-fair.nginx        | 13 +++++++++++++
 .../libnginx-mod.conf/mod-http-upstream-fair.conf   |  1 +
 debian/modules/README.Modules-versions              |  3 +--
 debian/modules/nginx-upstream-fair/config           | 13 +++++++++++--
 debian/rules                                        |  6 +++---
 debian/tests/control                                |  3 +++
 7 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100755 debian/libnginx-mod-http-upstream-fair.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-upstream-fair.conf

diff --git a/debian/control b/debian/control
index 3cc5010..de3d752 100644
--- a/debian/control
+++ b/debian/control
@@ -91,6 +91,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-echo (= ${binary:Version}),
+         libnginx-mod-http-upstream-fair (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -191,6 +192,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-perl (= ${binary:Version}),
          libnginx-mod-nchan (= ${binary:Version}),
          libnginx-mod-http-echo (= ${binary:Version}),
+         libnginx-mod-http-upstream-fair (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -364,3 +366,11 @@ Description: Bring echo and more shell style goodies to Nginx
     Nginx variables).
  3. Merge contents of various "Nginx locations" (i.e., subrequests) together in
     a single main request (using echo_location and its friends).
+
+Package: libnginx-mod-http-upstream-fair
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Nginx Upstream Fair Proxy Load Balancer
+ The Nginx fair proxy balancer enhances the standard round-robin load balancer
+ provided with Nginx so that it tracks busy backend servers and adjusts
+ balancing accordingly.
diff --git a/debian/libnginx-mod-http-upstream-fair.nginx b/debian/libnginx-mod-http-upstream-fair.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-upstream-fair.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-upstream-fair.conf b/debian/libnginx-mod.conf/mod-http-upstream-fair.conf
new file mode 100644
index 0000000..62750b5
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-upstream-fair.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_upstream_fair_module.so;
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index b882e24..71befd8 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -26,8 +26,7 @@ README for Modules versions
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
-  Version: a18b409
-  Dynamic: No, https://github.com/gnosek/nginx-upstream-fair/pull/21
+  Version: a18b409+pull/21
 
  nchan
   Homepage: https://github.com/slact/nchan
diff --git a/debian/modules/nginx-upstream-fair/config b/debian/modules/nginx-upstream-fair/config
index ff351b7..d8d478b 100644
--- a/debian/modules/nginx-upstream-fair/config
+++ b/debian/modules/nginx-upstream-fair/config
@@ -1,3 +1,12 @@
 ngx_addon_name=ngx_http_upstream_fair_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP
+    ngx_module_name=ngx_http_upstream_fair_module
+    ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_fair_module.c"
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
+fi
diff --git a/debian/rules b/debian/rules
index d108bd8..439ddcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -86,7 +86,7 @@ full_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
-			--add-module=$(MODULESDIR)/nginx-upstream-fair \
+			--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
 			--add-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
 
 extras_configure_flags := \
@@ -117,7 +117,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/nchan \
 			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
 			--add-module=$(MODULESDIR)/nginx-upload-progress \
-			--add-module=$(MODULESDIR)/nginx-upstream-fair \
+			--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
 			--add-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
 
 %:
diff --git a/debian/tests/control b/debian/tests/control
index d12d49d..0a97376 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -20,6 +20,7 @@ Depends: nginx-full,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
+         libnginx-mod-http-upstream-fair,
          libnginx-mod-http-xslt-filter,
          libnginx-mod-mail,
          libnginx-mod-nchan,
@@ -35,6 +36,7 @@ Depends: nginx-light,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
+         libnginx-mod-http-upstream-fair,
          libnginx-mod-http-xslt-filter,
          libnginx-mod-mail,
          libnginx-mod-nchan,
@@ -50,6 +52,7 @@ Depends: nginx-extras,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
+         libnginx-mod-http-upstream-fair,
          libnginx-mod-http-xslt-filter,
          libnginx-mod-mail,
          libnginx-mod-nchan,

From 543f230b1880a2231362adf9d04ec085c758872c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 26 Aug 2016 17:04:13 +0300
Subject: [PATCH 092/600] Upgrade headers-more to v0.31

---
 debian/modules/README.Modules-versions        |   2 +-
 .../headers-more-nginx-module/.gitignore      |  54 ---
 .../headers-more-nginx-module/README.markdown | 196 +++++----
 .../modules/headers-more-nginx-module/config  |  33 +-
 .../doc/HttpHeadersMoreModule.wiki            | 390 ------------------
 .../headers-more-nginx-module/src/ddebug.h    |  14 +-
 .../src/ngx_http_headers_more_filter_module.c |   6 +-
 .../src/ngx_http_headers_more_headers_in.c    | 128 ++++--
 .../src/ngx_http_headers_more_headers_in.h    |   4 +-
 .../src/ngx_http_headers_more_headers_out.c   |  11 +-
 .../src/ngx_http_headers_more_headers_out.h   |   4 +-
 .../src/ngx_http_headers_more_util.c          |  60 +--
 .../src/ngx_http_headers_more_util.h          |   3 -
 .../modules/headers-more-nginx-module/t/bug.t |  75 +++-
 .../headers-more-nginx-module/t/eval.t        |   3 +-
 .../headers-more-nginx-module/t/input.t       | 125 +++++-
 .../headers-more-nginx-module/t/unused.t      |   8 +-
 .../headers-more-nginx-module/util/build.sh   |   3 +-
 .../valgrind.suppress                         |  12 +-
 19 files changed, 484 insertions(+), 647 deletions(-)
 delete mode 100644 debian/modules/headers-more-nginx-module/.gitignore
 delete mode 100644 debian/modules/headers-more-nginx-module/doc/HttpHeadersMoreModule.wiki

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 71befd8..24b23a5 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -6,7 +6,7 @@ README for Modules versions
 
  headers-more-nginx-module
   Homepage: https://github.com/agentzh/headers-more-nginx-module
-  Version: v0.25
+  Version: v0.31
 
  nginx-development-kit
   Homepage: https://github.com/simpl/ngx_devel_kit/
diff --git a/debian/modules/headers-more-nginx-module/.gitignore b/debian/modules/headers-more-nginx-module/.gitignore
deleted file mode 100644
index 39c82fa..0000000
--- a/debian/modules/headers-more-nginx-module/.gitignore
+++ /dev/null
@@ -1,54 +0,0 @@
-reindex
-.libs
-*.swp
-*.slo
-*.la
-*.swo
-*.lo
-*~
-*.o
-print.txt
-.rsync
-*.tar.gz
-dist
-build[78]
-build
-tags
-update-readme
-*.tmp
-test/Makefile
-test/blib
-test.sh
-t.sh
-t/t.sh
-test/t/servroot/
-releng
-reset
-*.t_
-genmobi.sh
-*.mobi
-misc/chunked
-src/headers.c
-src/headers.h
-src/module.c
-src/module.h
-src/util.c
-src/util.h
-go
-ctags
-src/in.c
-src/in.h
-src/out.c
-src/out.h
-build[89]
-build1[0-9]
-buildroot/
-work/
-all
-t/servroot
-analyze
-cov
-nginx
-*.plist
-a.patch
-Makefile
diff --git a/debian/modules/headers-more-nginx-module/README.markdown b/debian/modules/headers-more-nginx-module/README.markdown
index 9693504..8ab4b26 100644
--- a/debian/modules/headers-more-nginx-module/README.markdown
+++ b/debian/modules/headers-more-nginx-module/README.markdown
@@ -1,8 +1,3 @@
-<!---
-Don't edit this file manually! Instead you should generate it by using:
-    wiki2markdown.pl doc/HttpHeadersMoreModule.wiki
--->
-
 Name
 ====
 
@@ -13,6 +8,7 @@ Name
 Table of Contents
 =================
 
+* [Name](#name)
 * [Version](#version)
 * [Synopsis](#synopsis)
 * [Description](#description)
@@ -40,44 +36,44 @@ Table of Contents
 Version
 =======
 
-This document describes headers-more-nginx-module [v0.25](http://github.com/agentzh/headers-more-nginx-module/tags) released on 10 January 2014.
+This document describes headers-more-nginx-module [v0.31](https://github.com/openresty/headers-more-nginx-module/tags) released on 15 August 2016.
 
 Synopsis
 ========
 
 ```nginx
 
-# set the Server output header
-more_set_headers 'Server: my-server';
+ # set the Server output header
+ more_set_headers 'Server: my-server';
 
-# set and clear output headers
-location /bar {
-    more_set_headers 'X-MyHeader: blah' 'X-MyHeader2: foo';
-    more_set_headers -t 'text/plain text/css' 'Content-Type: text/foo';
-    more_set_headers -s '400 404 500 503' -s 413 'Foo: Bar';
-    more_clear_headers 'Content-Type';
-    
-    # your proxy_pass/memcached_pass/or any other config goes here...
-}
+ # set and clear output headers
+ location /bar {
+     more_set_headers 'X-MyHeader: blah' 'X-MyHeader2: foo';
+     more_set_headers -t 'text/plain text/css' 'Content-Type: text/foo';
+     more_set_headers -s '400 404 500 503' -s 413 'Foo: Bar';
+     more_clear_headers 'Content-Type';
 
-# set output headers
-location /type {
-    more_set_headers 'Content-Type: text/plain';
-    # ...
-}
+     # your proxy_pass/memcached_pass/or any other config goes here...
+ }
 
-# set input headers
-location /foo {
-    set $my_host 'my dog';
-    more_set_input_headers 'Host: $my_host';
-    more_set_input_headers -t 'text/plain' 'X-Foo: bah';
-   
-    # now $host and $http_host have their new values...
-    # ...
-}
+ # set output headers
+ location /type {
+     more_set_headers 'Content-Type: text/plain';
+     # ...
+ }
 
-# replace input header X-Foo *only* if it already exists
-more_set_input_headers -r 'X-Foo: howdy';
+ # set input headers
+ location /foo {
+     set $my_host 'my dog';
+     more_set_input_headers 'Host: $my_host';
+     more_set_input_headers -t 'text/plain' 'X-Foo: bah';
+
+     # now $host and $http_host have their new values...
+     # ...
+ }
+
+ # replace input header X-Foo *only* if it already exists
+ more_set_input_headers -r 'X-Foo: howdy';
 ```
 
 Description
@@ -98,19 +94,27 @@ output headers with the [more_set_headers](#more_set_headers) and
 [more_clear_headers](#more_clear_headers) directives. For example,
 
 ```nginx
-
-more_set_headers -s 404 -t 'text/html' 'X-Foo: Bar';
+ more_set_headers -s 404 -t 'text/html' 'X-Foo: Bar';
 ```
 
+You can also specify multiple MIME types to filter out in a single `-t` option.
+For example,
+
+```nginx
+more_set_headers -t 'text/html text/plain' 'X-Foo: Bar';
+```
+
+Never use other paramemters like `charset=utf-8` in the `-t` option values; they will not
+work as you would expect.
+
 Input headers can be modified as well. For example
 
 ```nginx
-
-location /foo {
-    more_set_input_headers 'Host: foo' 'User-Agent: faked';
-    # now $host, $http_host, $user_agent, and
-    #   $http_user_agent all have their new values.
-}
+ location /foo {
+     more_set_input_headers 'Host: foo' 'User-Agent: faked';
+     # now $host, $http_host, $user_agent, and
+     #   $http_user_agent all have their new values.
+ }
 ```
 
 The option `-t` is also available in the
@@ -138,34 +142,36 @@ more_set_headers
 
 **phase:** *output-header-filter*
 
-Adds or replaces the specified output headers when the response status code matches the codes specified by the `-s` option *AND* the response content type matches the types specified by the `-t` option.
+Replaces (if any) or adds (if not any) the specified output headers when the response status code matches the codes specified by the `-s` option *AND* the response content type matches the types specified by the `-t` option.
 
 If either `-s` or `-t` is not specified or has an empty list value, then no match is required. Therefore, the following directive set the `Server` output header to the custom value for *any* status code and *any* content type:
 
 ```nginx
 
-  more_set_headers    "Server: my_server";
+   more_set_headers    "Server: my_server";
 ```
 
+Existing response headers with the same name are always overridden. If you want to add headers incrementally, use the standard [add_header](http://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header) directive instead.
+
 A single directive can set/add multiple output headers. For example
 
 ```nginx
 
-  more_set_headers 'Foo: bar' 'Baz: bah';
+   more_set_headers 'Foo: bar' 'Baz: bah';
 ```
 
 Multiple occurrences of the options are allowed in a single directive. Their values will be merged together. For instance
 
 ```nginx
 
-  more_set_headers -s 404 -s '500 503' 'Foo: bar';
+   more_set_headers -s 404 -s '500 503' 'Foo: bar';
 ```
 
 is equivalent to
 
 ```nginx
 
-  more_set_headers -s '404 500 503' 'Foo: bar';
+   more_set_headers -s '404 500 503' 'Foo: bar';
 ```
 
 The new header should be the one of the forms:
@@ -180,8 +186,8 @@ Nginx variables are allowed in header values. For example:
 
 ```nginx
 
-   set $my_var "dog";
-   more_set_headers "Server: $my_var";
+    set $my_var "dog";
+    more_set_headers "Server: $my_var";
 ```
 
 But variables won't work in header keys due to performance considerations.
@@ -194,13 +200,13 @@ Note that although `more_set_headers` is allowed in *location* if blocks, it is
 
 ```nginx
 
-  ?  # This is NOT allowed!
-  ?  server {
-  ?      if ($args ~ 'download') {
-  ?          more_set_headers 'Foo: Bar';
-  ?      }
-  ?      ...
-  ?  }
+   ?  # This is NOT allowed!
+   ?  server {
+   ?      if ($args ~ 'download') {
+   ?          more_set_headers 'Foo: Bar';
+   ?      }
+   ?      ...
+   ?  }
 ```
 
 Behind the scene, use of this directive and its friend [more_clear_headers](#more_clear_headers) will (lazily) register an ouput header filter that modifies `r->headers_out` the way you specify.
@@ -223,21 +229,21 @@ In fact,
 
 ```nginx
 
-   more_clear_headers -s 404 -t 'text/plain' Foo Baz;
+    more_clear_headers -s 404 -t 'text/plain' Foo Baz;
 ```
 
 is exactly equivalent to
 
 ```nginx
 
-   more_set_headers -s 404 -t 'text/plain' "Foo: " "Baz: ";
+    more_set_headers -s 404 -t 'text/plain' "Foo: " "Baz: ";
 ```
 
 or
 
 ```nginx
 
-   more_set_headers -s 404 -t 'text/plain' Foo Baz
+    more_set_headers -s 404 -t 'text/plain' Foo Baz
 ```
 
 See [more_set_headers](#more_set_headers) for more details.
@@ -246,7 +252,7 @@ Wildcard `*` can also be used to specify a header name pattern. For example, the
 
 ```nginx
 
-more_clear_headers 'X-Hidden-*';
+ more_clear_headers 'X-Hidden-*';
 ```
 
 The `*` wildcard support was first introduced in [v0.09](#v009).
@@ -267,7 +273,10 @@ Very much like [more_set_headers](#more_set_headers) except that it operates on
 
 Note that using the `-t` option in this directive means filtering by the `Content-Type` *request* header, rather than the response header.
 
-Behind the scene, use of this directive and its friend [more_clear_input_headers](#more_clear_input_headers) will (lazily) register a `rewrite phase` handler that modifies `r->headers_in` the way you specify. Note that it always run at the *end* of the `rewrite` so that it runs *after* the standard [rewrite module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html) and works in subrequests as well.
+Behind the scene, use of this directive and its friend [more_clear_input_headers](#more_clear_input_headers) will (lazily)
+register a `rewrite phase` handler that modifies `r->headers_in` the way you specify. Note that it always run at the *end* of
+the `rewrite` phase so that it runs *after* the standard [rewrite module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)
+and works in subrequests as well.
 
 If the `-r` option is specified, then the headers will be replaced to the new values *only if* they already exist.
 
@@ -289,21 +298,21 @@ In fact,
 
 ```nginx
 
-   more_clear_input_headers -s 404 -t 'text/plain' Foo Baz;
+    more_clear_input_headers -s 404 -t 'text/plain' Foo Baz;
 ```
 
 is exactly equivalent to
 
 ```nginx
 
-   more_set_input_headers -s 404 -t 'text/plain' "Foo: " "Baz: ";
+    more_set_input_headers -s 404 -t 'text/plain' "Foo: " "Baz: ";
 ```
 
 or
 
 ```nginx
 
-   more_set_input_headers -s 404 -t 'text/plain' Foo Baz
+    more_set_input_headers -s 404 -t 'text/plain' Foo Baz
 ```
 
 See [more_set_input_headers](#more_set_input_headers) for more details.
@@ -322,25 +331,33 @@ Installation
 ============
 
 Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
-the version 1.5.8 (see [nginx compatibility](#compatibility)), and then build the source with this module:
+the version 1.11.2 (see [nginx compatibility](#compatibility)), and then build the source with this module:
 
 ```bash
 
-wget 'http://nginx.org/download/nginx-1.5.8.tar.gz'
-tar -xzvf nginx-1.5.8.tar.gz
-cd nginx-1.5.8/
+ wget 'http://nginx.org/download/nginx-1.11.2.tar.gz'
+ tar -xzvf nginx-1.11.2.tar.gz
+ cd nginx-1.11.2/
 
-# Here we assume you would install you nginx under /opt/nginx/.
-./configure --prefix=/opt/nginx \
-    --add-module=/path/to/headers-more-nginx-module
- 
-make
-make install
+ # Here we assume you would install you nginx under /opt/nginx/.
+ ./configure --prefix=/opt/nginx \
+     --add-module=/path/to/headers-more-nginx-module
+
+ make
+ make install
 ```
 
-Download the latest version of the release tarball of this module from [headers-more-nginx-module file list](http://github.com/agentzh/headers-more-nginx-module/tags).
+Download the latest version of the release tarball of this module from [headers-more-nginx-module file list](https://github.com/openresty/headers-more-nginx-module/tags).
 
-Also, this module is included and enabled by default in the [ngx_openresty bundle](http://openresty.org).
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ngx_http_headers_more_filter_module.so;
+```
+
+Also, this module is included and enabled by default in the [OpenResty bundle](http://openresty.org).
 
 [Back to TOC](#table-of-contents)
 
@@ -349,6 +366,12 @@ Compatibility
 
 The following versions of Nginx should work with this module:
 
+* **1.11.x**                      (last tested: 1.11.2)
+* **1.10.x**
+* **1.9.x**                       (last tested: 1.9.15)
+* **1.8.x**
+* **1.7.x**                       (last tested: 1.7.10)
+* **1.6.x**                       (last tested: 1.6.2)
 * **1.5.x**                       (last tested: 1.5.8)
 * **1.4.x**                       (last tested: 1.4.4)
 * **1.3.x**                       (last tested: 1.3.7)
@@ -389,7 +412,7 @@ Bugs and Patches
 
 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),
+1. creating a ticket on the [GitHub Issue Tracker](https://github.com/chaoslawful/lua-nginx-module/issues),
 1. or posting to the [OpenResty community](#community).
 
 [Back to TOC](#table-of-contents)
@@ -397,14 +420,14 @@ Please submit bug reports, wishlists, or patches by
 Source Repository
 =================
 
-Available on github at [agentzh/headers-more-nginx-module](http://github.com/agentzh/headers-more-nginx-module).
+Available on github at [openresty/headers-more-nginx-module](https://github.com/openresty/headers-more-nginx-module).
 
 [Back to TOC](#table-of-contents)
 
 Changes
 =======
 
-The changes of every release of this module can be obtained from the ngx_openresty bundle's change logs:
+The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
 
 <http://openresty.org/#Changes>
 
@@ -413,29 +436,29 @@ The changes of every release of this module can be obtained from the ngx_openres
 Test Suite
 ==========
 
-This module comes with a Perl-driven test suite. The [test cases](http://github.com/agentzh/headers-more-nginx-module/tree/master/t/) are
-[declarative](http://github.com/agentzh/headers-more-nginx-module/blob/master/t/sanity.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Nginx) module in the Perl world.
+This module comes with a Perl-driven test suite. The [test cases](https://github.com/openresty/headers-more-nginx-module/tree/master/t/) are
+[declarative](https://github.com/openresty/headers-more-nginx-module/blob/master/t/sanity.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Nginx) module in the Perl world.
 
 To run it on your side:
 
 ```bash
 
-$ PATH=/path/to/your/nginx-with-headers-more-module:$PATH prove -r t
+ $ PATH=/path/to/your/nginx-with-headers-more-module:$PATH prove -r t
 ```
 
 To run the test suite with valgrind's memcheck, use the following commands:
 
 ```bash
 
-$ export PATH=/path/to/your/nginx-with-headers-more-module:$PATH
-$ TEST_NGINX_USE_VALGRIND=1 prove -r t
+ $ export PATH=/path/to/your/nginx-with-headers-more-module:$PATH
+ $ TEST_NGINX_USE_VALGRIND=1 prove -r t
 ```
 
 You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
 
 Because a single nginx server (by default, `localhost:1984`) is used across all the test scripts (`.t` files), it's meaningless to run the test suite in parallel by specifying `-jN` when invoking the `prove` utility.
 
-Some parts of the test suite requires modules [proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html), and [echo](http://github.com/agentzh/echo-nginx-module) to be enabled as well when building Nginx.
+Some parts of the test suite requires modules [proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html), and [echo](https://github.com/openresty/echo-nginx-module) to be enabled as well when building Nginx.
 
 [Back to TOC](#table-of-contents)
 
@@ -501,5 +524,8 @@ See Also
 * The original thread on the Nginx mailing list that inspires this module's development: ["A question about add_header replication"](http://forum.nginx.org/read.php?2,11206,11738).
 * The orginal announcement thread on the Nginx mailing list: ["The "headers_more" module: Set and clear output headers...more than 'add'!"](http://forum.nginx.org/read.php?2,23460).
 * The original [blog post](http://agentzh.blogspot.com/2009/11/headers-more-module-scripting-input-and.html) about this module's initial development.
-* The [echo module](http://github.com/agentzh/echo-nginx-module) for Nginx module's automated testing.
+* The [echo module](https://github.com/openresty/echo-nginx-module) for Nginx module's automated testing.
 * The standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module.
+
+[Back to TOC](#table-of-contents)
+
diff --git a/debian/modules/headers-more-nginx-module/config b/debian/modules/headers-more-nginx-module/config
index d92baea..5707cc4 100644
--- a/debian/modules/headers-more-nginx-module/config
+++ b/debian/modules/headers-more-nginx-module/config
@@ -1,5 +1,32 @@
 ngx_addon_name=ngx_http_headers_more_filter_module
-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_headers_more_filter_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_headers_more_filter_module.c $ngx_addon_dir/src/ngx_http_headers_more_headers_out.c $ngx_addon_dir/src/ngx_http_headers_more_headers_in.c $ngx_addon_dir/src/ngx_http_headers_more_util.c"
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_headers_more_filter_module.h $ngx_addon_dir/src/ngx_http_headers_more_headers_in.h $ngx_addon_dir/src/ngx_http_headers_more_headers_out.h $ngx_addon_dir/src/ngx_http_headers_more_headers_in.h $ngx_addon_dir/src/ngx_http_headers_more_util.h"
 
+HEADERS_MORE_SRCS="                                                         \
+                $ngx_addon_dir/src/ngx_http_headers_more_filter_module.c    \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_out.c      \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_in.c       \
+                $ngx_addon_dir/src/ngx_http_headers_more_util.c             \
+                "
+
+HEADERS_MORE_DEPS="                                                         \
+                $ngx_addon_dir/src/ddebug.h                                 \
+                $ngx_addon_dir/src/ngx_http_headers_more_filter_module.h    \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_in.h       \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_out.h      \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_in.h       \
+                $ngx_addon_dir/src/ngx_http_headers_more_util.h             \
+                "
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP_AUX_FILTER
+    ngx_module_name=$ngx_addon_name
+    ngx_module_incs=
+    ngx_module_deps="$HEADERS_MORE_DEPS"
+    ngx_module_srcs="$HEADERS_MORE_SRCS"
+    ngx_module_libs=
+
+    . auto/module
+else
+    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $HEADERS_MORE_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $HEADERS_MORE_DEPS"
+fi
diff --git a/debian/modules/headers-more-nginx-module/doc/HttpHeadersMoreModule.wiki b/debian/modules/headers-more-nginx-module/doc/HttpHeadersMoreModule.wiki
deleted file mode 100644
index c57a1f5..0000000
--- a/debian/modules/headers-more-nginx-module/doc/HttpHeadersMoreModule.wiki
+++ /dev/null
@@ -1,390 +0,0 @@
-= Name =
-
-'''ngx_headers_more''' - Set and clear input and output headers...more than "add"!
-
-''This module is not distributed with the Nginx source.'' See [[#Installation|the installation instructions]].
-
-= Version =
-
-This document describes headers-more-nginx-module [http://github.com/agentzh/headers-more-nginx-module/tags v0.25] released on 10 January 2014.
-
-= Synopsis =
-
-<geshi lang="nginx">
-    # set the Server output header
-    more_set_headers 'Server: my-server';
-
-    # set and clear output headers
-    location /bar {
-        more_set_headers 'X-MyHeader: blah' 'X-MyHeader2: foo';
-        more_set_headers -t 'text/plain text/css' 'Content-Type: text/foo';
-        more_set_headers -s '400 404 500 503' -s 413 'Foo: Bar';
-        more_clear_headers 'Content-Type';
-        
-        # your proxy_pass/memcached_pass/or any other config goes here...
-    }
-
-    # set output headers
-    location /type {
-        more_set_headers 'Content-Type: text/plain';
-        # ...
-    }
-
-    # set input headers
-    location /foo {
-        set $my_host 'my dog';
-        more_set_input_headers 'Host: $my_host';
-        more_set_input_headers -t 'text/plain' 'X-Foo: bah';
-       
-        # now $host and $http_host have their new values...
-        # ...
-    }
-
-    # replace input header X-Foo *only* if it already exists
-    more_set_input_headers -r 'X-Foo: howdy';
-</geshi>
-
-= Description =
-
-This module allows you to add, set, or clear any output
-or input header that you specify.
-
-This is an enhanced version of the standard
-[[HttpHeadersModule|headers]] module because it provides more utilities like
-resetting or clearing "builtin headers" like <code>Content-Type</code>,
-<code>Content-Length</code>, and <code>Server</code>.
-
-It also allows you to specify an optional HTTP status code
-criteria using the <code>-s</code> option and an optional content
-type criteria using the <code>-t</code> option while modifying the
-output headers with the [[#more_set_headers|more_set_headers]] and
-[[#more_clear_headers|more_clear_headers]] directives. For example,
-
-<geshi lang="nginx">
-    more_set_headers -s 404 -t 'text/html' 'X-Foo: Bar';
-</geshi>
-
-Input headers can be modified as well. For example
-
-<geshi lang="nginx">
-    location /foo {
-        more_set_input_headers 'Host: foo' 'User-Agent: faked';
-        # now $host, $http_host, $user_agent, and
-        #   $http_user_agent all have their new values.
-    }
-</geshi>
-
-The option <code>-t</code> is also available in the
-[[#more_set_input_headers|more_set_input_headers]] and
-[[#more_clear_input_headers|more_clear_input_headers]] directives (for request header filtering) while the <code>-s</code> option
-is not allowed.
-
-Unlike the standard [[HttpHeadersModule|headers]] module, this module's directives will by
-default apply to all the status codes, including <code>4xx</code> and <code>5xx</code>.
-
-= Directives =
-
-== more_set_headers ==
-'''syntax:''' ''more_set_headers [-t <content-type list>]... [-s <status-code list>]... <new-header>...''
-
-'''default:''' ''no''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''output-header-filter''
-
-Adds or replaces the specified output headers when the response status code matches the codes specified by the <code>-s</code> option ''AND'' the response content type matches the types specified by the <code>-t</code> option.
-
-If either <code>-s</code> or <code>-t</code> is not specified or has an empty list value, then no match is required. Therefore, the following directive set the <code>Server</code> output header to the custom value for ''any'' status code and ''any'' content type:
-
-<geshi lang="nginx">
-  more_set_headers    "Server: my_server";
-</geshi>
-
-A single directive can set/add multiple output headers. For example
-
-<geshi lang="nginx">
-  more_set_headers 'Foo: bar' 'Baz: bah';
-</geshi>
-
-Multiple occurrences of the options are allowed in a single directive. Their values will be merged together. For instance
-
-<geshi lang="nginx">
-  more_set_headers -s 404 -s '500 503' 'Foo: bar';
-</geshi>
-
-is equivalent to
-
-<geshi lang="nginx">
-  more_set_headers -s '404 500 503' 'Foo: bar';
-</geshi>
-
-The new header should be the one of the forms:
-
-# <code>Name: Value</code>
-# <code>Name: </code>
-# <code>Name</code>
-
-The last two effectively clear the value of the header <code>Name</code>.
-
-Nginx variables are allowed in header values. For example:
-
-<geshi lang="nginx">
-   set $my_var "dog";
-   more_set_headers "Server: $my_var";
-</geshi>
-
-But variables won't work in header keys due to performance considerations.
-
-Multiple set/clear header directives are allowed in a single location, and they're executed sequentially.
-
-Directives inherited from an upper level scope (say, http block or server blocks) are executed before the directives in the location block.
-
-Note that although <code>more_set_headers</code> is allowed in ''location'' if blocks, it is ''not'' allowed in the ''server'' if blocks, as in
-
-<geshi lang="nginx">
-      ?  # This is NOT allowed!
-      ?  server {
-      ?      if ($args ~ 'download') {
-      ?          more_set_headers 'Foo: Bar';
-      ?      }
-      ?      ...
-      ?  }
-</geshi>
-
-Behind the scene, use of this directive and its friend [[#more_clear_headers|more_clear_headers]] will (lazily) register an ouput header filter that modifies <code>r->headers_out</code> the way you specify.
-
-== more_clear_headers ==
-'''syntax:''' ''more_clear_headers [-t <content-type list>]... [-s <status-code list>]... <new-header>...''
-
-'''default:''' ''no''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''output-header-filter''
-
-Clears the specified output headers.
-
-In fact,
-
-<geshi lang="nginx">
-   more_clear_headers -s 404 -t 'text/plain' Foo Baz;
-</geshi>
-
-is exactly equivalent to
-
-<geshi lang="nginx">
-   more_set_headers -s 404 -t 'text/plain' "Foo: " "Baz: ";
-</geshi>
-
-or
-
-<geshi lang="nginx">
-   more_set_headers -s 404 -t 'text/plain' Foo Baz
-</geshi>
-
-See [[#more_set_headers|more_set_headers]] for more details.
-
-Wildcard <code>*</code> can also be used to specify a header name pattern. For example, the following directive effectively clears ''any'' output headers starting by "<code>X-Hidden-</code>":
-
-<geshi lang="nginx">
-    more_clear_headers 'X-Hidden-*';
-</geshi>
-
-The <code>*</code> wildcard support was first introduced in [[#v0.09|v0.09]].
-
-== more_set_input_headers ==
-'''syntax:''' ''more_set_input_headers [-r] [-t <content-type list>]... <new-header>...''
-
-'''default:''' ''no''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''rewrite tail''
-
-Very much like [[#more_set_headers|more_set_headers]] except that it operates on input headers (or request headers) and it only supports the <code>-t</code> option.
-
-Note that using the <code>-t</code> option in this directive means filtering by the <code>Content-Type</code> ''request'' header, rather than the response header.
-
-Behind the scene, use of this directive and its friend [[#more_clear_input_headers|more_clear_input_headers]] will (lazily) register a <code>rewrite phase</code> handler that modifies <code>r->headers_in</code> the way you specify. Note that it always run at the ''end'' of the <code>rewrite</code> so that it runs ''after'' the standard [[HttpRewriteModule|rewrite module]] and works in subrequests as well.
-
-If the <code>-r</code> option is specified, then the headers will be replaced to the new values ''only if'' they already exist.
-
-== more_clear_input_headers ==
-'''syntax:''' ''more_clear_input_headers [-t <content-type list>]... <new-header>...''
-
-'''default:''' ''no''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''rewrite tail''
-
-Clears the specified input headers.
-
-In fact,
-
-<geshi lang="nginx">
-   more_clear_input_headers -s 404 -t 'text/plain' Foo Baz;
-</geshi>
-
-is exactly equivalent to
-
-<geshi lang="nginx">
-   more_set_input_headers -s 404 -t 'text/plain' "Foo: " "Baz: ";
-</geshi>
-
-or
-
-<geshi lang="nginx">
-   more_set_input_headers -s 404 -t 'text/plain' Foo Baz
-</geshi>
-
-See [[#more_set_input_headers|more_set_input_headers]] for more details.
-
-= Limitations =
-
-* Unlike the standard [[HttpHeadersModule|headers]] module, this module does not automatically take care of the constraint among the <code>Expires</code>, <code>Cache-Control</code>, and <code>Last-Modified</code> headers. You have to get them right yourself or use the [[HttpHeadersModule|headers]] module together with this module.
-* You cannot remove the <code>Connection</code> response header using this module because the <code>Connection</code> response header is generated by the standard <code>ngx_http_header_filter_module</code> in the Nginx core, whose output header filter runs always ''after'' the filter of this module. The only way to actually remove the <code>Connection</code> header is to patch the Nginx core, that is, editing the C function <code>ngx_http_header_filter</code> in the <code>src/http/ngx_http_header_filter_module.c</code> file.
-
-= Installation =
-
-Grab the nginx source code from [http://nginx.org/ nginx.org], for example,
-the version 1.5.8 (see [[#Compatibility|nginx compatibility]]), and then build the source with this module:
-
-<geshi lang="bash">
-    wget 'http://nginx.org/download/nginx-1.5.8.tar.gz'
-    tar -xzvf nginx-1.5.8.tar.gz
-    cd nginx-1.5.8/
-    
-    # Here we assume you would install you nginx under /opt/nginx/.
-    ./configure --prefix=/opt/nginx \
-        --add-module=/path/to/headers-more-nginx-module
-     
-    make
-    make install
-</geshi>
-
-Download the latest version of the release tarball of this module from [http://github.com/agentzh/headers-more-nginx-module/tags headers-more-nginx-module file list].
-
-Also, this module is included and enabled by default in the [http://openresty.org ngx_openresty bundle].
-
-= Compatibility =
-
-The following versions of Nginx should work with this module:
-
-* '''1.5.x'''                       (last tested: 1.5.8)
-* '''1.4.x'''                       (last tested: 1.4.4)
-* '''1.3.x'''                       (last tested: 1.3.7)
-* '''1.2.x'''                       (last tested: 1.2.9)
-* '''1.1.x'''                       (last tested: 1.1.5)
-* '''1.0.x'''                       (last tested: 1.0.11)
-* '''0.9.x'''                       (last tested: 0.9.4)
-* '''0.8.x'''                       (last tested: 0.8.54)
-* '''0.7.x >= 0.7.44'''             (last tested: 0.7.68)
-
-Earlier versions of Nginx like 0.6.x and 0.5.x will ''not'' work.
-
-If you find that any particular version of Nginx above 0.7.44 does not work with this module, please consider [[#Report Bugs|reporting a bug]].
-
-= 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 submit bug reports, wishlists, or patches by
-
-# creating a ticket on the [http://github.com/chaoslawful/lua-nginx-module/issues GitHub Issue Tracker],
-# or posting to the [[#Community|OpenResty community]].
-
-= Source Repository =
-
-Available on github at [http://github.com/agentzh/headers-more-nginx-module agentzh/headers-more-nginx-module].
-
-= Changes =
-
-The changes of every release of this module can be obtained from the ngx_openresty bundle's change logs:
-
-http://openresty.org/#Changes
-
-= Test Suite =
-
-This module comes with a Perl-driven test suite. The [http://github.com/agentzh/headers-more-nginx-module/tree/master/t/ test cases] are
-[http://github.com/agentzh/headers-more-nginx-module/blob/master/t/sanity.t declarative] too. Thanks to the [http://search.cpan.org/perldoc?Test::Nginx Test::Nginx] module in the Perl world.
-
-To run it on your side:
-
-<geshi lang="bash">
-    $ PATH=/path/to/your/nginx-with-headers-more-module:$PATH prove -r t
-</geshi>
-
-To run the test suite with valgrind's memcheck, use the following commands:
-
-<geshi lang="bash">
-    $ export PATH=/path/to/your/nginx-with-headers-more-module:$PATH
-    $ TEST_NGINX_USE_VALGRIND=1 prove -r t
-</geshi>
-
-You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
-
-Because a single nginx server (by default, <code>localhost:1984</code>) is used across all the test scripts (<code>.t</code> files), it's meaningless to run the test suite in parallel by specifying <code>-jN</code> when invoking the <code>prove</code> utility.
-
-Some parts of the test suite requires modules [[HttpProxyModule|proxy]], [[HttpRewriteModule|rewrite]], and [[HttpEchoModule|echo]] to be enabled as well when building Nginx.
-
-= TODO =
-
-* Support variables in new headers' keys.
-
-= Getting involved =
-
-You'll be very welcomed to submit patches to the [[#Author|author]] or just ask for a commit bit to the [[#Source Repository|source repository]] on GitHub.
-
-= Authors =
-
-* Yichun "agentzh" Zhang (章亦春) ''<agentzh@gmail.com>'', CloudFlare Inc.
-* Bernd Dorn ( http://www.lovelysystems.com/ )
-
-This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
-
-= Copyright & License =
-
-The code base is borrowed directly from the standard [[HttpHeadersModule|headers]] module in Nginx 0.8.24. This part of code is copyrighted by Igor Sysoev.
-
-Copyright (c) 2009-2014, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
-
-Copyright (c) 2010-2013, Bernd Dorn.
-
-This module is licensed under the terms of the BSD license.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-= See Also =
-
-* The original thread on the Nginx mailing list that inspires this module's development: [http://forum.nginx.org/read.php?2,11206,11738 "A question about add_header replication"].
-* The orginal announcement thread on the Nginx mailing list: [http://forum.nginx.org/read.php?2,23460 "The "headers_more" module: Set and clear output headers...more than 'add'!"].
-* The original [http://agentzh.blogspot.com/2009/11/headers-more-module-scripting-input-and.html blog post] about this module's initial development.
-* The [[HttpEchoModule|echo module]] for Nginx module's automated testing.
-* The standard [[HttpHeadersModule|headers]] module.
diff --git a/debian/modules/headers-more-nginx-module/src/ddebug.h b/debian/modules/headers-more-nginx-module/src/ddebug.h
index c86764d..13879af 100644
--- a/debian/modules/headers-more-nginx-module/src/ddebug.h
+++ b/debian/modules/headers-more-nginx-module/src/ddebug.h
@@ -1,10 +1,13 @@
 #ifndef DDEBUG_H
 #define DDEBUG_H
 
+
+#include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
 #include <nginx.h>
 
+
 #if defined(DDEBUG) && (DDEBUG)
 
 #   if (NGX_HAVE_VARIADIC_MACROS)
@@ -20,7 +23,8 @@
 
 #include <stdarg.h>
 
-static void dd(const char * fmt, ...) {
+static ngx_inline void
+dd(const char * fmt, ...) {
 }
 
 #    endif
@@ -35,7 +39,7 @@ static void dd(const char * fmt, ...) {
 #           define dd_main_req_count 0
 #       endif
 
-static void
+static ngx_inline void
 dd_enter_helper(ngx_http_request_t *r, const char *func)
 {
     ngx_http_posted_request_t       *pr;
@@ -77,10 +81,12 @@ dd_enter_helper(ngx_http_request_t *r, const char *func)
 
 #include <stdarg.h>
 
-static void dd(const char * fmt, ...) {
+static ngx_inline void
+dd(const char * fmt, ...) {
 }
 
-static void dd_enter() {
+static ngx_inline void
+dd_enter() {
 }
 
 #   endif
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.c b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.c
index 5fe6088..0bb6fec 100644
--- a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.c
+++ b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.c
@@ -19,10 +19,10 @@
 
 /* config handlers */
 
-static void * ngx_http_headers_more_create_loc_conf(ngx_conf_t *cf);
-static char * ngx_http_headers_more_merge_loc_conf(ngx_conf_t *cf,
+static void *ngx_http_headers_more_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_headers_more_merge_loc_conf(ngx_conf_t *cf,
     void *parent, void *child);
-static void * ngx_http_headers_more_create_main_conf(ngx_conf_t *cf);
+static void *ngx_http_headers_more_create_main_conf(ngx_conf_t *cf);
 static ngx_int_t ngx_http_headers_more_post_config(ngx_conf_t *cf);
 
 /* post-read-phase handler */
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c
index 7cadb56..f903908 100644
--- a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c
+++ b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c
@@ -15,7 +15,7 @@
 #include <ctype.h>
 
 
-static char * ngx_http_headers_more_parse_directive(ngx_conf_t *cf,
+static char *ngx_http_headers_more_parse_directive(ngx_conf_t *cf,
     ngx_command_t *ngx_cmd, void *conf,
     ngx_http_headers_more_opcode_t opcode);
 static int ngx_http_headers_more_check_type(ngx_http_request_t *r,
@@ -39,7 +39,7 @@ static ngx_int_t ngx_http_set_host_header(ngx_http_request_t *r,
     ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
 static ngx_int_t ngx_http_set_connection_header(ngx_http_request_t *r,
     ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_cookie_header(ngx_http_request_t *r,
+static ngx_int_t ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
     ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
 static ngx_int_t ngx_http_headers_more_validate_host(ngx_str_t *host,
     ngx_pool_t *pool, ngx_uint_t alloc);
@@ -48,16 +48,6 @@ static ngx_int_t ngx_http_headers_more_validate_host(ngx_str_t *host,
 static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
         = {
 
-#if (NGX_HTTP_GZIP)
-    { ngx_string("Accept-Encoding"),
-                 offsetof(ngx_http_headers_in_t, accept_encoding),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Via"),
-                 offsetof(ngx_http_headers_in_t, via),
-                 ngx_http_set_builtin_header },
-#endif
-
     { ngx_string("Host"),
                  offsetof(ngx_http_headers_in_t, host),
                  ngx_http_set_host_header },
@@ -70,6 +60,22 @@ static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
                  offsetof(ngx_http_headers_in_t, if_modified_since),
                  ngx_http_set_builtin_header },
 
+#if defined(nginx_version) && nginx_version >= 9002
+    { ngx_string("If-Unmodified-Since"),
+                 offsetof(ngx_http_headers_in_t, if_unmodified_since),
+                 ngx_http_set_builtin_header },
+#endif
+
+#if defined(nginx_version) && nginx_version >= 1003003
+    { ngx_string("If-Match"),
+                 offsetof(ngx_http_headers_in_t, if_match),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("If-None-Match"),
+                 offsetof(ngx_http_headers_in_t, if_none_match),
+                 ngx_http_set_builtin_header },
+#endif
+
     { ngx_string("User-Agent"),
                  offsetof(ngx_http_headers_in_t, user_agent),
                  ngx_http_set_user_agent_header },
@@ -78,6 +84,10 @@ static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
                  offsetof(ngx_http_headers_in_t, referer),
                  ngx_http_set_builtin_header },
 
+    { ngx_string("Content-Length"),
+                 offsetof(ngx_http_headers_in_t, content_length),
+                 ngx_http_set_content_length_header },
+
     { ngx_string("Content-Type"),
                  offsetof(ngx_http_headers_in_t, content_type),
                  ngx_http_set_builtin_header },
@@ -98,6 +108,21 @@ static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
                  offsetof(ngx_http_headers_in_t, expect),
                  ngx_http_set_builtin_header },
 
+#if defined(nginx_version) && nginx_version >= 1003013
+    { ngx_string("Upgrade"),
+                 offsetof(ngx_http_headers_in_t, upgrade),
+                 ngx_http_set_builtin_header },
+#endif
+
+#if (NGX_HTTP_GZIP)
+    { ngx_string("Accept-Encoding"),
+                 offsetof(ngx_http_headers_in_t, accept_encoding),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Via"), offsetof(ngx_http_headers_in_t, via),
+                 ngx_http_set_builtin_header },
+#endif
+
     { ngx_string("Authorization"),
                  offsetof(ngx_http_headers_in_t, authorization),
                  ngx_http_set_builtin_header },
@@ -106,13 +131,12 @@ static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
                  offsetof(ngx_http_headers_in_t, keep_alive),
                  ngx_http_set_builtin_header },
 
-    { ngx_string("Content-Length"),
-                 offsetof(ngx_http_headers_in_t, content_length),
-                 ngx_http_set_content_length_header },
+#if (NGX_HTTP_X_FORWARDED_FOR)
+    { ngx_string("X-Forwarded-For"),
+                 offsetof(ngx_http_headers_in_t, x_forwarded_for),
+                 ngx_http_set_builtin_multi_header },
 
-    { ngx_string("Cookie"),
-                 0,
-                 ngx_http_set_cookie_header },
+#endif
 
 #if (NGX_HTTP_REALIP)
     { ngx_string("X-Real-IP"),
@@ -120,6 +144,24 @@ static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
                  ngx_http_set_builtin_header },
 #endif
 
+#if (NGX_HTTP_DAV)
+    { ngx_string("Depth"), offsetof(ngx_http_headers_in_t, depth),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Destination"), offsetof(ngx_http_headers_in_t, destination),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Overwrite"), offsetof(ngx_http_headers_in_t, overwrite),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Date"), offsetof(ngx_http_headers_in_t, date),
+                 ngx_http_set_builtin_header },
+#endif
+
+    { ngx_string("Cookie"),
+                 offsetof(ngx_http_headers_in_t, cookies),
+                 ngx_http_set_builtin_multi_header },
+
     { ngx_null_string, 0, ngx_http_set_header }
 };
 
@@ -184,6 +226,7 @@ ngx_http_set_header_helper(ngx_http_request_t *r,
     matched = NULL;
 
 retry:
+
     part = &r->headers_in.headers.part;
     h = part->elts;
 
@@ -247,6 +290,11 @@ retry:
         return NGX_OK;
     }
 
+    if (r->headers_in.headers.last == NULL) {
+        /* must be 400 bad request */
+        return NGX_OK;
+    }
+
     h = ngx_list_push(&r->headers_in.headers);
 
     if (h == NULL) {
@@ -364,7 +412,7 @@ ngx_http_set_content_length_header(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    dd("reset headers_in.content_length_n to %d", (int)len);
+    dd("reset headers_in.content_length_n to %d", (int) len);
 
     r->headers_in.content_length_n = len;
 
@@ -412,9 +460,9 @@ ngx_http_headers_more_clear_input_headers(ngx_conf_t *cf,
 static int
 ngx_http_headers_more_check_type(ngx_http_request_t *r, ngx_array_t *types)
 {
-    ngx_uint_t          i;
+    ngx_uint_t           i;
     ngx_str_t           *t;
-    ngx_str_t           actual_type;
+    ngx_str_t            actual_type;
 
     if (r->headers_in.content_type == NULL) {
         return 0;
@@ -463,7 +511,7 @@ ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
 
     if (hlcf->cmds == NULL) {
         hlcf->cmds = ngx_array_create(cf->pool, 1,
-                                     sizeof(ngx_http_headers_more_cmd_t));
+                                      sizeof(ngx_http_headers_more_cmd_t));
 
         if (hlcf->cmds == NULL) {
             return NGX_CONF_ERROR;
@@ -477,7 +525,7 @@ ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
     }
 
     cmd->headers = ngx_array_create(cf->pool, 1,
-                                sizeof(ngx_http_headers_more_header_val_t));
+                                    sizeof(ngx_http_headers_more_header_val_t));
 
     if (cmd->headers == NULL) {
         return NGX_CONF_ERROR;
@@ -540,11 +588,12 @@ ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
                 ignore_next_arg = 1;
 
                 continue;
+            }
 
-            } else if (arg[i].data[1] == 'r') {
-              dd("Found replace flag");
-              replace = 1;
-              continue;
+            if (arg[i].data[1] == 'r') {
+                dd("Found replace flag");
+                replace = 1;
+                continue;
             }
         }
 
@@ -683,27 +732,30 @@ ngx_http_set_connection_header(ngx_http_request_t *r,
 
 
 static ngx_int_t
-ngx_http_set_cookie_header(ngx_http_request_t *r,
+ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
     ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
 {
-    ngx_table_elt_t  **cookie, *h;
+    ngx_array_t       *headers;
+    ngx_table_elt_t  **v, *h;
 
-    if (r->headers_in.cookies.nelts > 0) {
-        ngx_array_destroy(&r->headers_in.cookies);
+    headers = (ngx_array_t *) ((char *) &r->headers_in + hv->offset);
 
-        if (ngx_array_init(&r->headers_in.cookies, r->pool, 2,
+    if (headers->nelts > 0) {
+        ngx_array_destroy(headers);
+
+        if (ngx_array_init(headers, r->pool, 2,
                            sizeof(ngx_table_elt_t *))
             != NGX_OK)
         {
             return NGX_ERROR;
         }
 
-        dd("clear headers in cookies: %d", (int) r->headers_in.cookies.nelts);
+        dd("clear multi-value headers: %d", (int) headers->nelts);
     }
 
 #if 1
-    if (r->headers_in.cookies.nalloc == 0) {
-        if (ngx_array_init(&r->headers_in.cookies, r->pool, 2,
+    if (headers->nalloc == 0) {
+        if (ngx_array_init(headers, r->pool, 2,
                            sizeof(ngx_table_elt_t *))
             != NGX_OK)
         {
@@ -723,12 +775,12 @@ ngx_http_set_cookie_header(ngx_http_request_t *r,
 
     dd("new cookie header: %p", h);
 
-    cookie = ngx_array_push(&r->headers_in.cookies);
-    if (cookie == NULL) {
+    v = ngx_array_push(headers);
+    if (v == NULL) {
         return NGX_ERROR;
     }
 
-    *cookie = h;
+    *v = h;
     return NGX_OK;
 }
 
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.h b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.h
index ae21501..d2251da 100644
--- a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.h
+++ b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.h
@@ -16,10 +16,10 @@
 ngx_int_t ngx_http_headers_more_exec_input_cmd(ngx_http_request_t *r,
     ngx_http_headers_more_cmd_t *cmd);
 
-char * ngx_http_headers_more_set_input_headers(ngx_conf_t *cf,
+char *ngx_http_headers_more_set_input_headers(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
 
-char * ngx_http_headers_more_clear_input_headers(ngx_conf_t *cf,
+char *ngx_http_headers_more_clear_input_headers(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
 
 
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.c b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.c
index 0685cf9..0f9bc87 100644
--- a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.c
+++ b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.c
@@ -223,6 +223,7 @@ ngx_http_set_header_helper(ngx_http_request_t *r,
         continue;
 
 matched:
+
         if (value->len == 0 || matched) {
             dd("clearing normal header for %.*s", (int) hv->key.len,
                hv->key.data);
@@ -243,7 +244,7 @@ matched:
     }
 
     if (matched){
-      return NGX_OK;
+        return NGX_OK;
     }
 
     if ((hv->wildcard || no_create) && value->len == 0) {
@@ -515,7 +516,7 @@ static ngx_flag_t
 ngx_http_headers_more_check_type(ngx_http_request_t *r, ngx_array_t *types)
 {
     ngx_uint_t          i;
-    ngx_str_t           *t;
+    ngx_str_t          *t;
 
     dd("headers_out->content_type: %.*s (len %d)",
        (int) r->headers_out.content_type.len,
@@ -527,7 +528,7 @@ ngx_http_headers_more_check_type(ngx_http_request_t *r, ngx_array_t *types)
     for (i = 0; i < types->nelts; i++) {
         dd("...comparing with type [%.*s]", (int) t[i].len, t[i].data);
 
-        if (r->headers_out.content_type.len == t[i].len
+        if (r->headers_out.content_type_len == t[i].len
             && ngx_strncmp(r->headers_out.content_type.data,
                            t[i].data, t[i].len) == 0)
         {
@@ -543,7 +544,7 @@ static ngx_flag_t
 ngx_http_headers_more_check_status(ngx_http_request_t *r, ngx_array_t *statuses)
 {
     ngx_uint_t          i;
-    ngx_uint_t          *status;
+    ngx_uint_t         *status;
 
     dd("headers_out.status = %d", (int) r->headers_out.status);
 
@@ -577,7 +578,7 @@ ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
 
     if (hlcf->cmds == NULL) {
         hlcf->cmds = ngx_array_create(cf->pool, 1,
-                                     sizeof(ngx_http_headers_more_cmd_t));
+                                      sizeof(ngx_http_headers_more_cmd_t));
 
         if (hlcf->cmds == NULL) {
             return NGX_CONF_ERROR;
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.h b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.h
index ad21bb5..c939507 100644
--- a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.h
+++ b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.h
@@ -16,10 +16,10 @@
 ngx_int_t ngx_http_headers_more_exec_cmd(ngx_http_request_t *r,
     ngx_http_headers_more_cmd_t *cmd);
 
-char * ngx_http_headers_more_set_headers(ngx_conf_t *cf,
+char *ngx_http_headers_more_set_headers(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
 
-char * ngx_http_headers_more_clear_headers(ngx_conf_t *cf,
+char *ngx_http_headers_more_clear_headers(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
 
 
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.c b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.c
index caba38f..caf372e 100644
--- a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.c
+++ b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.c
@@ -84,12 +84,12 @@ ngx_http_headers_more_parse_header(ngx_conf_t *cf, ngx_str_t *cmd_name,
         return NGX_ERROR;
     }
 
-    hv->wildcard = (key.data[key.len-1] == '*');
+    hv->wildcard = (key.data[key.len - 1] == '*');
     if (hv->wildcard && key.len<2){
-      ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                    "%V: wildcard key to short: %V",
-                    cmd_name, raw_header);
-      return NGX_ERROR;
+        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                      "%V: wildcard key too short: %V",
+                      cmd_name, raw_header);
+        return NGX_ERROR;
     }
 
     hv->hash = ngx_hash_key_lc(key.data, key.len);
@@ -103,7 +103,7 @@ ngx_http_headers_more_parse_header(ngx_conf_t *cf, ngx_str_t *cmd_name,
                                handlers[i].name.len) != 0)
         {
             dd("hv key comparison: %s <> %s", handlers[i].name.data,
-                    hv->key.data);
+               hv->key.data);
 
             continue;
         }
@@ -235,7 +235,7 @@ ngx_http_headers_more_parse_types(ngx_log_t *log, ngx_str_t *cmd_name,
 
     for (; p != last; p++) {
         if (t == NULL) {
-            if (isspace(*p)) {
+            if (isspace(*p) || *p == ';') {
                 continue;
             }
 
@@ -250,7 +250,7 @@ ngx_http_headers_more_parse_types(ngx_log_t *log, ngx_str_t *cmd_name,
             continue;
         }
 
-        if (isspace(*p)) {
+        if (isspace(*p) || *p == ';') {
             t = NULL;
             continue;
         }
@@ -262,46 +262,6 @@ ngx_http_headers_more_parse_types(ngx_log_t *log, ngx_str_t *cmd_name,
 }
 
 
-ngx_int_t
-ngx_http_headers_more_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;
-            }
-
-            dd("switching to the next part %p", part->next);
-
-            part = part->next;
-#if 1
-            data = part->elts;
-#endif
-
-            h = part->elts;
-            i = 0;
-        }
-
-        if (&data[i] == h) {
-            dd("found header at %d", (int) i);
-
-            return ngx_http_headers_more_rm_header_helper(l, part, i);
-        }
-    }
-
-    return NGX_ERROR;
-}
-
-
 ngx_int_t
 ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
     ngx_uint_t i)
@@ -310,12 +270,12 @@ ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
     ngx_list_part_t             *new, *part;
 
     dd("list rm item: part %p, i %d, nalloc %d", cur, (int) i,
-            (int) l->nalloc);
+       (int) l->nalloc);
 
     data = cur->elts;
 
     dd("cur: nelts %d, nalloc %d", (int) cur->nelts,
-            (int) l->nalloc);
+       (int) l->nalloc);
 
     if (i == 0) {
         cur->elts = (char *) cur->elts + l->size;
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.h b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.h
index 11dee8c..6c4614b 100644
--- a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.h
+++ b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.h
@@ -48,8 +48,5 @@ ngx_int_t ngx_http_headers_more_parse_types(ngx_log_t *log,
 ngx_int_t ngx_http_headers_more_rm_header_helper(ngx_list_t *l,
     ngx_list_part_t *cur, ngx_uint_t i);
 
-ngx_int_t ngx_http_headers_more_rm_header(ngx_list_t *l,
-    ngx_table_elt_t *h);
-
 
 #endif /* NGX_HTTP_HEADERS_MORE_UTIL_H */
diff --git a/debian/modules/headers-more-nginx-module/t/bug.t b/debian/modules/headers-more-nginx-module/t/bug.t
index 656b8a5..88cfa09 100644
--- a/debian/modules/headers-more-nginx-module/t/bug.t
+++ b/debian/modules/headers-more-nginx-module/t/bug.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket; # 'no_plan';
 
 repeat_each(2);
 
-plan tests => 43 * repeat_each();
+plan tests => 53 * repeat_each();
 
 no_diff;
 
@@ -318,3 +318,76 @@ Bah: baz
 --- no_error_log
 [error]
 
+
+
+=== TEST 17: Content-Type response headers with a charset param (correct -t values)
+--- config
+    location = /t {
+        more_set_headers -t 'text/html' 'X-Foo: Bar';
+        proxy_pass http://127.0.0.1:$server_port/fake;
+    }
+
+    location = /fake {
+        default_type text/html;
+        charset utf-8;
+        echo ok;
+    }
+--- request
+GET /t
+--- response_headers
+X-Foo: Bar
+--- response_body
+ok
+
+
+
+=== TEST 18: Content-Type response headers with a charset param (WRONG -t values)
+--- config
+    location = /t {
+        more_set_headers -t 'text/html; charset=utf-8' 'X-Foo: Bar';
+        proxy_pass http://127.0.0.1:$server_port/fake;
+    }
+
+    location = /fake {
+        default_type text/html;
+        charset utf-8;
+        echo ok;
+    }
+--- request
+GET /t
+--- response_headers
+X-Foo: Bar
+--- response_body
+ok
+
+
+
+=== TEST 19: for bad requests (bad request method letter case)
+--- config
+    error_page 400 = /err;
+
+    location = /err {
+        more_set_input_headers "Foo: bar";
+        echo ok;
+    }
+--- raw_request
+GeT / HTTP/1.1
+--- response_body
+ok
+--- no_check_leak
+
+
+
+=== TEST 20: for bad requests (bad request method names)
+--- config
+    error_page 400 = /err;
+
+    location = /err {
+        more_set_input_headers "Foo: bar";
+        echo ok;
+    }
+--- raw_request
+GET x HTTP/1.1
+--- response_body
+ok
+--- no_check_leak
diff --git a/debian/modules/headers-more-nginx-module/t/eval.t b/debian/modules/headers-more-nginx-module/t/eval.t
index e28a787..febd306 100644
--- a/debian/modules/headers-more-nginx-module/t/eval.t
+++ b/debian/modules/headers-more-nginx-module/t/eval.t
@@ -1,4 +1,4 @@
-# vi:filetype=perl
+# vi:filetype=
 
 use lib 'lib';
 use Test::Nginx::Socket; # 'no_plan';
@@ -34,4 +34,3 @@ __DATA__
     GET /foo
 --- response_body
 OK
-
diff --git a/debian/modules/headers-more-nginx-module/t/input.t b/debian/modules/headers-more-nginx-module/t/input.t
index 9c5da23..0b8989f 100644
--- a/debian/modules/headers-more-nginx-module/t/input.t
+++ b/debian/modules/headers-more-nginx-module/t/input.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket; # 'no_plan';
 
 repeat_each(2);
 
-plan tests => repeat_each() * 105;
+plan tests => repeat_each() * 124;
 
 no_long_string();
 #no_diff;
@@ -1166,3 +1166,126 @@ AAA: 678
 --- no_error_log
 [error]
 
+
+
+=== TEST 44: clear If-Unmodified-Since req header
+--- config
+    location = /t {
+        more_clear_input_headers 'If-Unmodified-Since';
+        content_by_lua '
+            ngx.header["Last-Modified"] = "Tue, 30 Jun 2011 12:16:36 GMT"
+            ngx.say("If-Unmodified-Since: ", ngx.var.http_if_unmodified_since)
+        ';
+    }
+--- request
+GET /t
+--- more_headers
+If-Unmodified-Since: Tue, 28 Jun 2011 12:16:36 GMT
+--- response_body
+If-Unmodified-Since: nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 45: clear If-Match req header
+--- config
+    location = /t {
+        more_clear_input_headers 'If-Match';
+        echo "If-Match: $http_if_match";
+    }
+--- request
+GET /t
+--- more_headers
+If-Match: abc
+--- response_body
+If-Match: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 46: clear If-None-Match req header
+--- config
+    location = /t {
+        more_clear_input_headers 'If-None-Match';
+        echo "If-None-Match: $http_if_none_match";
+    }
+--- request
+GET /t
+--- more_headers
+If-None-Match: *
+--- response_body
+If-None-Match: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 47: set the Destination request header for WebDav
+--- config
+    location = /a.txt {
+        more_set_input_headers "Destination: /b.txt";
+        dav_methods MOVE;
+        dav_access            all:rw;
+        root                  html;
+    }
+
+--- user_files
+>>> a.txt
+hello, world!
+
+--- request
+MOVE /a.txt
+
+--- response_body
+--- no_error_log
+client sent no "Destination" header
+[error]
+--- error_code: 204
+
+
+
+=== TEST 48: more_set_input_headers + X-Forwarded-For
+--- config
+    location = /t {
+        more_set_input_headers "X-Forwarded-For: 8.8.8.8";
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Foo $proxy_add_x_forwarded_for;
+    }
+
+    location = /back {
+        echo "Foo: $http_foo";
+    }
+
+--- request
+GET /t
+
+--- response_body
+Foo: 8.8.8.8, 127.0.0.1
+--- no_error_log
+[error]
+
+
+
+=== TEST 49: more_clear_input_headers + X-Forwarded-For
+--- config
+    location = /t {
+        more_clear_input_headers "X-Forwarded-For";
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Foo $proxy_add_x_forwarded_for;
+    }
+
+    location = /back {
+        echo "Foo: $http_foo";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+X-Forwarded-For: 8.8.8.8
+--- response_body
+Foo: 127.0.0.1
+--- no_error_log
+[error]
diff --git a/debian/modules/headers-more-nginx-module/t/unused.t b/debian/modules/headers-more-nginx-module/t/unused.t
index c3c869f..1f35adc 100644
--- a/debian/modules/headers-more-nginx-module/t/unused.t
+++ b/debian/modules/headers-more-nginx-module/t/unused.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 3);
+plan tests => repeat_each() * (blocks() * 4 + 2);
 
 #master_on();
 #workers(2);
@@ -125,6 +125,9 @@ headers more rewrite handler
 
 
 === TEST 7: multiple http {} blocks (filter)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
 --- config
     location /foo {
         echo hi;
@@ -149,6 +152,9 @@ headers more header filter
 
 
 === TEST 8: multiple http {} blocks (handler)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
 --- config
     location /foo {
         more_set_input_headers 'Foo: bar';
diff --git a/debian/modules/headers-more-nginx-module/util/build.sh b/debian/modules/headers-more-nginx-module/util/build.sh
index 1e91f56..007194d 100755
--- a/debian/modules/headers-more-nginx-module/util/build.sh
+++ b/debian/modules/headers-more-nginx-module/util/build.sh
@@ -10,7 +10,7 @@ force=$2
         #--with-cc=gcc46 \
 
 ngx-build $force $version \
-        --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:$LUAJIT_LIB:/usr/local/lib" \
+        --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB" \
         --without-mail_pop3_module \
         --without-mail_imap_module \
         --without-mail_smtp_module \
@@ -22,6 +22,7 @@ ngx-build $force $version \
         --without-http_auth_basic_module \
         --without-http_userid_module \
         --with-http_realip_module \
+        --with-http_dav_module \
       --add-module=$root/../eval-nginx-module \
       --add-module=$root/../lua-nginx-module \
       --add-module=$root/../echo-nginx-module \
diff --git a/debian/modules/headers-more-nginx-module/valgrind.suppress b/debian/modules/headers-more-nginx-module/valgrind.suppress
index 87ce6af..bba7217 100644
--- a/debian/modules/headers-more-nginx-module/valgrind.suppress
+++ b/debian/modules/headers-more-nginx-module/valgrind.suppress
@@ -202,4 +202,14 @@ fun:ngx_http_lua_get_output_header
    fun:exit
    fun:ngx_master_process_exit
 }
-
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:index
+   fun:expand_dynamic_string_token
+   fun:_dl_map_object
+   fun:map_doit
+   fun:_dl_catch_error
+   fun:do_preload
+   fun:dl_main
+}

From f2b7f2cbcc7d4160556208392d1120e9eb60c780 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 26 Aug 2016 17:08:56 +0300
Subject: [PATCH 093/600] mod: Convert headers-more to a dynamic module

---
 debian/control                                      | 12 ++++++++++++
 debian/libnginx-mod-http-headers-more-filter.nginx  | 13 +++++++++++++
 .../mod-http-headers-more-filter.conf               |  1 +
 debian/rules                                        |  4 ++--
 debian/tests/control                                |  3 +++
 5 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100755 debian/libnginx-mod-http-headers-more-filter.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-headers-more-filter.conf

diff --git a/debian/control b/debian/control
index de3d752..484e10b 100644
--- a/debian/control
+++ b/debian/control
@@ -193,6 +193,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-nchan (= ${binary:Version}),
          libnginx-mod-http-echo (= ${binary:Version}),
          libnginx-mod-http-upstream-fair (= ${binary:Version}),
+         libnginx-mod-http-headers-more-filter (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -374,3 +375,14 @@ Description: Nginx Upstream Fair Proxy Load Balancer
  The Nginx fair proxy balancer enhances the standard round-robin load balancer
  provided with Nginx so that it tracks busy backend servers and adjusts
  balancing accordingly.
+
+Package: libnginx-mod-http-headers-more-filter
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Set and clear input and output headers for Nginx
+ The Headers More module allows you to add, set, or clear any output or input
+ header that you specify.
+ .
+ This is an enhanced version of the standard headers module because it provides
+ more utilities like resetting or clearing "builtin headers" like Content-Type,
+ Content-Length, and Server.
diff --git a/debian/libnginx-mod-http-headers-more-filter.nginx b/debian/libnginx-mod-http-headers-more-filter.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-headers-more-filter.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-headers-more-filter.conf b/debian/libnginx-mod.conf/mod-http-headers-more-filter.conf
new file mode 100644
index 0000000..266d84e
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-headers-more-filter.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_headers_more_filter_module.so;
diff --git a/debian/rules b/debian/rules
index 439ddcd..14bbde2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -107,7 +107,7 @@ extras_configure_flags := \
 			--with-mail_ssl_module \
 			--with-stream=dynamic \
 			--with-stream_ssl_module \
-			--add-module=$(MODULESDIR)/headers-more-nginx-module \
+			--add-dynamic-module=$(MODULESDIR)/headers-more-nginx-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-module=$(MODULESDIR)/nginx-cache-purge \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
diff --git a/debian/tests/control b/debian/tests/control
index 0a97376..0466750 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -17,6 +17,7 @@ Depends: nginx-full,
          libnginx-mod-http-auth-pam,
          libnginx-mod-http-echo,
          libnginx-mod-http-geoip,
+         libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
@@ -33,6 +34,7 @@ Depends: nginx-light,
          libnginx-mod-http-auth-pam,
          libnginx-mod-http-echo,
          libnginx-mod-http-geoip,
+         libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
@@ -49,6 +51,7 @@ Depends: nginx-extras,
          libnginx-mod-http-auth-pam,
          libnginx-mod-http-echo,
          libnginx-mod-http-geoip,
+         libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,

From ffa01fb4734c80dfafe3bc954cd5c3ad4fce10ae Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 10:55:19 +0300
Subject: [PATCH 094/600] mod: Convert http-cache to a dynamic module

---
 debian/control                                     |  9 +++++++++
 debian/libnginx-mod-http-cache-purge.nginx         | 13 +++++++++++++
 debian/libnginx-mod.conf/mod-http-cache-purge.conf |  1 +
 debian/modules/README.Modules-versions             |  3 +--
 debian/modules/nginx-cache-purge/config            | 14 ++++++++++++--
 debian/rules                                       |  4 ++--
 debian/tests/control                               |  3 +++
 7 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100755 debian/libnginx-mod-http-cache-purge.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-cache-purge.conf

diff --git a/debian/control b/debian/control
index 484e10b..ec29351 100644
--- a/debian/control
+++ b/debian/control
@@ -194,6 +194,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-echo (= ${binary:Version}),
          libnginx-mod-http-upstream-fair (= ${binary:Version}),
          libnginx-mod-http-headers-more-filter (= ${binary:Version}),
+         libnginx-mod-http-cache-purge (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -386,3 +387,11 @@ Description: Set and clear input and output headers for Nginx
  This is an enhanced version of the standard headers module because it provides
  more utilities like resetting or clearing "builtin headers" like Content-Type,
  Content-Length, and Server.
+
+Package: libnginx-mod-http-cache-purge
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Purge content from Nginx caches
+ Cache Purge module adds purging capabilities to Nginx. It allows purging
+ content from caches used by all of Nginx proxy modules, like FastCGI, Proxy,
+ SCGI and uWSGI.
diff --git a/debian/libnginx-mod-http-cache-purge.nginx b/debian/libnginx-mod-http-cache-purge.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-cache-purge.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-cache-purge.conf b/debian/libnginx-mod.conf/mod-http-cache-purge.conf
new file mode 100644
index 0000000..5974b1f
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-cache-purge.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_cache_purge_module.so;
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 24b23a5..23eaaca 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -40,8 +40,7 @@ README for Modules versions
 
  nginx-cache-purge
   Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
-  Version: 2.3
-  Dynamic: No, https://github.com/FRiCKLE/ngx_cache_purge/pull/45
+  Version: 2.3+pull/45
 
  nginx-dav-ext-module
   Homepage: https://github.com/arut/nginx-dav-ext-module
diff --git a/debian/modules/nginx-cache-purge/config b/debian/modules/nginx-cache-purge/config
index 34f42ec..b900680 100644
--- a/debian/modules/nginx-cache-purge/config
+++ b/debian/modules/nginx-cache-purge/config
@@ -15,7 +15,17 @@ if [ "$HTTP_UWSGI" = "YES" ]; then
 fi
 
 ngx_addon_name=ngx_http_cache_purge_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_cache_purge_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_cache_purge_module.c"
+CACHE_PURGE_SRCS="$ngx_addon_dir/ngx_cache_purge_module.c"
+
+if [ -n "$ngx_module_link" ]; then
+    ngx_module_type=HTTP
+    ngx_module_name="$ngx_addon_name"
+    ngx_module_srcs="$CACHE_PURGE_SRCS"
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $CACHE_PURGE_SRCS"
+fi
 
 have=NGX_CACHE_PURGE_MODULE . auto/have
diff --git a/debian/rules b/debian/rules
index 14bbde2..4567a07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter http-cache-purge
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -109,7 +109,7 @@ extras_configure_flags := \
 			--with-stream_ssl_module \
 			--add-dynamic-module=$(MODULESDIR)/headers-more-nginx-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
-			--add-module=$(MODULESDIR)/nginx-cache-purge \
+			--add-dynamic-module=$(MODULESDIR)/nginx-cache-purge \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-development-kit \
 			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
diff --git a/debian/tests/control b/debian/tests/control
index 0466750..bdffd81 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -15,6 +15,7 @@ Restrictions: allow-stderr isolation-container
 Depends: nginx-full,
          curl,
          libnginx-mod-http-auth-pam,
+         libnginx-mod-http-cache-purge,
          libnginx-mod-http-echo,
          libnginx-mod-http-geoip,
          libnginx-mod-http-headers-more-filter,
@@ -32,6 +33,7 @@ Restrictions: allow-stderr isolation-container
 Depends: nginx-light,
          curl,
          libnginx-mod-http-auth-pam,
+         libnginx-mod-http-cache-purge,
          libnginx-mod-http-echo,
          libnginx-mod-http-geoip,
          libnginx-mod-http-headers-more-filter,
@@ -49,6 +51,7 @@ Restrictions: allow-stderr isolation-container
 Depends: nginx-extras,
          curl,
          libnginx-mod-http-auth-pam,
+         libnginx-mod-http-cache-purge,
          libnginx-mod-http-echo,
          libnginx-mod-http-geoip,
          libnginx-mod-http-headers-more-filter,

From acf0e3123db06d82605e432abdbfad8bb9b2034d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 14:24:59 +0300
Subject: [PATCH 095/600] Enable SCGI & uWSGI module for nginx-light

Other proxy modules like FastCGI & Proxy were already enabled, but the
true reason for this change is that libnginx-http-cache-purge depends on
those modules being enable.

It makes things much easier if all our modules are installable along
with all possible nginx binaries. After all, this is transient until
we move to a single nginx-binary package that ships /usr/bin/nginx.
---
 debian/control | 2 +-
 debian/rules   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index ec29351..a61ee9f 100644
--- a/debian/control
+++ b/debian/control
@@ -155,7 +155,7 @@ Description: nginx web/proxy server (basic version)
  minimal set of features and modules.
  .
  STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Empty GIF,
- FastCGI, Map, Proxy, Rewrite.
+ FastCGI, Map, Proxy, Rewrite, SCGI, uWSGI.
  .
  OPTIONAL HTTP MODULES: Auth Request, Charset, Gzip, Gzip Precompression,
  Headers, HTTP/2, Index, Log, Real IP, Slice, SSI, SSL, Stub Status, Thread
diff --git a/debian/rules b/debian/rules
index 4567a07..f6a814a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,10 +64,8 @@ light_configure_flags := \
 			--without-http_limit_conn_module \
 			--without-http_memcached_module \
 			--without-http_referer_module \
-			--without-http_scgi_module \
 			--without-http_split_clients_module \
 			--without-http_userid_module \
-			--without-http_uwsgi_module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-echo
 
 full_configure_flags := \

From d6c9309b3be4e7190a220f890a87cb83c3bef160 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 10:58:18 +0300
Subject: [PATCH 096/600] Upgrade fancyindex to v0.4.1

---
 debian/modules/README.Modules-versions        |   2 +-
 debian/modules/ngx-fancyindex/.gitignore      |   1 -
 debian/modules/ngx-fancyindex/CHANGELOG.md    |  86 +++-
 debian/modules/ngx-fancyindex/README.rst      | 109 ++++-
 debian/modules/ngx-fancyindex/config          |  20 +-
 .../ngx_http_fancyindex_module.c              | 403 ++++++++++++------
 .../ngx-fancyindex/t/00-build-artifacts.test  |  22 +
 .../ngx-fancyindex/t/01-smoke-hasindex.test   |   7 +
 .../t/02-smoke-indexisfancy.test              |  11 +
 debian/modules/ngx-fancyindex/t/build-and-run |  25 ++
 .../modules/ngx-fancyindex/t/has-index.test   |   7 +
 .../ngx-fancyindex/t/has-index/index.html     |  10 +
 debian/modules/ngx-fancyindex/t/nginx.conf    |  25 ++
 debian/modules/ngx-fancyindex/t/preamble      |  84 ++++
 debian/modules/ngx-fancyindex/t/run           |  67 +++
 debian/modules/ngx-fancyindex/template.h      |   6 +-
 debian/modules/ngx-fancyindex/template.html   |   6 +-
 17 files changed, 745 insertions(+), 146 deletions(-)
 delete mode 100644 debian/modules/ngx-fancyindex/.gitignore
 create mode 100644 debian/modules/ngx-fancyindex/t/00-build-artifacts.test
 create mode 100644 debian/modules/ngx-fancyindex/t/01-smoke-hasindex.test
 create mode 100644 debian/modules/ngx-fancyindex/t/02-smoke-indexisfancy.test
 create mode 100755 debian/modules/ngx-fancyindex/t/build-and-run
 create mode 100644 debian/modules/ngx-fancyindex/t/has-index.test
 create mode 100644 debian/modules/ngx-fancyindex/t/has-index/index.html
 create mode 100644 debian/modules/ngx-fancyindex/t/nginx.conf
 create mode 100644 debian/modules/ngx-fancyindex/t/preamble
 create mode 100755 debian/modules/ngx-fancyindex/t/run

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 23eaaca..d2537a4 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -49,7 +49,7 @@ README for Modules versions
 
  ngx-fancyindex
   Homepage: https://github.com/aperezdc/ngx-fancyindex
-  Version: v0.3.5
+  Version: v0.4.1
 
  ngx_http_substitutions_filter_module
   Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
diff --git a/debian/modules/ngx-fancyindex/.gitignore b/debian/modules/ngx-fancyindex/.gitignore
deleted file mode 100644
index dbec55f..0000000
--- a/debian/modules/ngx-fancyindex/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.sw[op]
diff --git a/debian/modules/ngx-fancyindex/CHANGELOG.md b/debian/modules/ngx-fancyindex/CHANGELOG.md
index 0028c8c..9d76ae0 100644
--- a/debian/modules/ngx-fancyindex/CHANGELOG.md
+++ b/debian/modules/ngx-fancyindex/CHANGELOG.md
@@ -1,37 +1,111 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## Unreleased
+## [Unreleased]
+
+## [0.4.1] - 2016-08-18
+### Added
+- New `fancyindex_directories_first` configuration directive (enabled by
+  default), which allows setting whether directories are sorted before other
+  files. (Patch by Luke Zapart <<luke@zapart.org>>.)
+
+### Fixed
+- Fix index files not working when the fancyindex module is in use (#46).
+
+
+## [0.4.0] - 2016-06-08
+### Added
+- The module can now be built as a [dynamic
+  module](https://www.nginx.com/resources/wiki/extending/converting/).
+  (Patch by Róbert Nagy <<vrnagy@gmail.com>>.)
+- New configuration directive `fancyindex_show_path`, which allows hiding the
+  `<h1>` header which contains the current path.
+  (Patch by Thomas P.  <<tpxp@live.fr>>.)
+
+### Changed
+- Directory and file links in listings now have a title="..." attribute.
+  (Patch by `@janglapuk` <<trusdi.agus@gmail.com>>.)
+
+### Fixed
+- Fix for hung requests when the module is used along with `ngx_pagespeed`.
+  (Patch by Otto van der Schaaf <<oschaaf@we-amp.com>>.)
+
+
+## [0.3.6] - 2016-01-26
+### Added
+- New feature: Allow filtering out symbolic links using the
+  `fancyindex_hide_symlinks` configuration directive. (Idea and prototype
+  patch by Thomas Wemm.)
+- New feature: Allow specifying the format of timestamps using the
+  `fancyindex_time_format` configuration directive. (Idea suggested by Xiao
+  Meng <<novoreorx@gmail.com>>).
+
+### Changed
+- Listings in top-level directories will not generate a "Parent Directory"
+  link as first element of the listing. (Patch by Thomas P.)
+
+### Fixed
+- Fix propagation and overriding of the `fancyindex_css_href` setting inside
+  nested locations.
+- Minor changes in the code to allow building cleanly under Windows with
+  Visual Studio 2013. (Patch by Y. Yuan <<yzwduck@gmail.com>>).
+
+
+## [0.3.5] - 2015-02-19
 ### Added
 - New feature: Allow setting the default sort criterion using the
   `fancyindex_default_sort` configuration directive. (Patch by
   Алексей Урбанский).
-- New feature: Allos changing the maximum length of file names, using
+- New feature: Allow changing the maximum length of file names, using
   the `fancyindex_name_length` configuration directive. (Patch by
   Martin Herkt).
+
 ### Changed
 - Renames `NEWS.rst` to `CHANGELOG.md`, which follows the recommendations
 	from [Keep a Change Log](http://keepachangelog.com/).
+- Configuring Nginx without the `http_addition_module` will generate a
+  warning during configuration, as it is needed for the `fancyindex_footer`
+  and `fancyindex_header` directives.
+
+
+## [0.3.4] - 2014-09-03
 
-## 0.3.4 - 2014-09-03
 ### Added
 - Viewport is now defined in the generated HTML, which works better
   for mobile devices.
+
 ### Changed
 - Even-odd row styling moved to the CSS using :nth-child(). This
   makes the HTML served to clients smaller.
 
-## 0.3.3 - 2013-10-25
+
+## [0.3.3] - 2013-10-25
+
 ### Added
 - New feature: table headers in the default template are now clickable
   to set the sorting criteria and direction of the index entries.
   (https://github.com/aperezdc/ngx-fancyindex/issues/7)
 
-## 0.3.2 - 2013-06-05
+
+## [0.3.2] - 2013-06-05
+
 ### Fixed
 - Solved a bug that would leave certain clients stalled forever.
 - Improved handling of subrequests for non-builtin headers/footers.
 
-## 0.3.1 - 2011-04-04
+
+## [0.3.1] - 2011-04-04
+
 ### Added
 - `NEWS.rst` file, to act as change log.
+
+
+[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.1...HEAD
+[0.4.1]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.0...v0.4.1
+[0.4.0]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.6...v0.4.0
+[0.3.6]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.5...v0.3.6
+[0.3.5]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.4...v0.3.5
+[0.3.4]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.3...v0.3.4
+[0.3.3]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.2...v0.3.3
+[0.3.2]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.1...v0.3.2
+[0.3.1]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3...v0.3.1
diff --git a/debian/modules/ngx-fancyindex/README.rst b/debian/modules/ngx-fancyindex/README.rst
index fd9f775..93a8206 100644
--- a/debian/modules/ngx-fancyindex/README.rst
+++ b/debian/modules/ngx-fancyindex/README.rst
@@ -2,8 +2,8 @@
 Nginx Fancy Index module
 ========================
 
-.. image:: https://drone.io/github.com/aperezdc/ngx-fancyindex/status.png
-   :target: https://drone.io/github.com/aperezdc/ngx-fancyindex/latest
+.. image:: https://travis-ci.org/aperezdc/ngx-fancyindex.svg?branch=master
+   :target: https://travis-ci.org/aperezdc/ngx-fancyindex
    :alt: Build Status
 
 .. contents::
@@ -31,6 +31,10 @@ series onwards will work.  Note that the modules *might* compile with
 versions in the 0.6 series by applying ``nginx-0.6-support.patch``, but this
 is unsupported (YMMV).
 
+In order to use the fancyindex_header_ and fancyindex_footer_ directives
+you will also need the `ngx_http_addition_module <http://nginx.org/en/docs/http/ngx_http_addition_module.html>`_
+built into Nginx.
+
 
 Building
 ========
@@ -49,7 +53,12 @@ Building
    of the fancy indexing module::
 
     $ cd nginx-?.?.?
-    $ ./configure --add-module=../nginx-fancyindex-?.?.?  [extra desired options]
+    $ ./configure --add-module=../nginx-fancyindex-?.?.? \
+       [--with-http_addition_module] [extra desired options]
+
+   Since version 0.4.0, the module can also be built as a
+   `dynamic module <https://www.nginx.com/resources/wiki/extending/converting/>`_,
+   using ``--add-dynamic-module=…`` instead.
 
 4. Build and install the software::
 
@@ -74,13 +83,19 @@ a ``server`` section in your Nginx_ configuration file::
   }
 
 
-Advanced Theming
-~~~~~~~~~~~~~~~~
+Themes
+~~~~~~
 
-For a more elaborate example using `fancyindex_header`_ and
-`fancyindex_footer`_ you can check `nice theme
-<https://github.com/TheInsomniac/Nginx-Fancyindex-Theme>`__
-designed by `@TheInsomniac <https://github.com/TheInsomniac>`__.
+The following themes demonstrate the level of customization which can be
+achieved using the module:
+
+* `Theme <https://github.com/TheInsomniac/Nginx-Fancyindex-Theme>`__ by
+  `@TheInsomniac <https://github.com/TheInsomniac>`__. Uses custom header and
+  footer.
+* `Theme <https://github.com/nwrd/Nginx-Fancyindex-Theme>`__ by
+  nwrd <https://github.com/nwrd>`__. Uses custom header and footer, the
+  header includes search field to filter by filename using JavaScript
+  (`demo <http://nwrd.sly.io/>`__).
 
 
 Directives
@@ -102,6 +117,15 @@ fancyindex_default_sort
 :Description:
   Defines sorting criterion by default.
 
+fancyindex_directories_first
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:Syntax: *fancyindex_directories_first* [*on* | *off*]
+:Default: fancyindex_directories_first on
+:Context: http, server, location
+:Description:
+  If enabled (default setting), groups directories together and sorts them
+  before all regular files. If disabled, directories are sorted together with files.
+
 fancyindex_css_href
 ~~~~~~~~~~~~~~~~~~~
 :Syntax: *fancyindex_css_href uri*
@@ -141,6 +165,9 @@ fancyindex_footer
   If set to an empty string, the default footer supplied by the module will
   be sent.
 
+.. note:: Using this directive needs the ngx_http_addition_module_ built
+   into Nginx.
+
 .. warning:: When inserting custom header/footer a subrequest will be
    issued so potentially any URL can be used as source for them. Although it
    will work with external URLs, only using internal ones is supported.
@@ -159,6 +186,22 @@ fancyindex_header
   If set to an empty string, the default header supplied by the module will
   be sent.
 
+.. note:: Using this directive needs the ngx_http_addition_module_ built
+   into Nginx.
+
+fancyindex_show_path
+~~~~~~~~~~~~~~~~~
+:Syntax: *fancyindex_show_path* [*on* | *off*]
+:Default: fancyindex_show_path on
+:Context: http, server, location
+:Description:
+  Whether to output or not the path and the closing </h1> tag after the header.
+  This is useful when you want to handle the path displaying with a PHP script
+  for example.
+
+.. warning:: This directive can be turned off only if a custom header is provided
+   using fancyindex_header.
+
 fancyindex_ignore
 ~~~~~~~~~~~~~~~~~
 :Syntax: *fancyindex_ignore string1 [string2 [... stringN]]*
@@ -169,6 +212,14 @@ fancyindex_ignore
   listings. If Nginx was built with PCRE support strings are interpreted as
   regular expressions.
 
+fancyindex_hide_symlinks
+~~~~~~~~~~~~~~~~~~~~~~~~
+:Syntax: *fancyindex_hide_symlinks* [*on* | *off*]
+:Default: fancyindex_hide_symlinks off
+:Context: http, server, location
+:Description:
+  When enabled, generated listings will not contain symbolic links.
+
 fancyindex_localtime
 ~~~~~~~~~~~~~~~~~~~~
 :Syntax: *fancyindex_localtime* [*on* | *off*]
@@ -177,6 +228,46 @@ fancyindex_localtime
 :Description:
   Enables showing file times as local time. Default is “off” (GMT time).
 
+fancyindex_time_format
+~~~~~~~~~~~~~~~~~~~~~~
+:Syntax: *fancyindex_time_format* string
+:Default: fancyindex_time_format "%Y-%b-%d %H:%M"
+:Context: http, server, location
+:Description:
+  Format string used for timestamps. The format specifiers are a subset of
+  those supported by the `strftime <http://linux.die.net/man/3/strftime>`_
+  function, and the behavior is locale-independent (for example, day and month
+  names are always in English). The supported formats are:
+
+  * ``%a``: Abbreviated name of the day of the week.
+  * ``%A``: Full name of the day of the week.
+  * ``%b``: Abbreviated month name.
+  * ``%B``: Full month name.
+  * ``%d``: Day of the month as a decimal number (range 01 to 31).
+  * ``%e``: Like ``%d``, the day of the month as a decimal number, but a
+    leading zero is replaced by a space.
+  * ``%F``: Equivalent to ``%Y-%m-%d`` (the ISO 8601 date format).
+  * ``%H``: Hour as a decimal number using a 24-hour clock (range 00
+    to 23).
+  * ``%I``: Hour as a decimal number using a 12-hour clock (range 01 to 12).
+  * ``%k``: Hour (24-hour clock) as a decimal number (range 0 to 23);
+    single digits are preceded by a blank.
+  * ``%l``: Hour (12-hour clock) as a decimal number (range 1 to 12); single
+    digits are preceded by a blank.
+  * ``%m``: Month as a decimal number (range 01 to 12).
+  * ``%M``: Minute as a decimal number (range 00 to 59).
+  * ``%p``: Either "AM" or "PM" according to the given time value.
+  * ``%P``: Like ``%p`` but in lowercase: "am" or "pm".
+  * ``%r``: Time in a.m. or p.m. notation. Equivalent to ``%I:%M:%S %p``.
+  * ``%R``: Time in 24-hour notation (``%H:%M``).
+  * ``%S``: Second as a decimal number (range 00 to 60).
+  * ``%T``: Time in 24-hour notation (``%H:%M:%S``).
+  * ``%u``: Day of the week as a decimal, range 1 to 7, Monday being 1.
+  * ``%w``: Day of the week as a decimal, range 0 to 6, Monday being 0.
+  * ``%y``: Year as a decimal number without a century (range 00 to 99).
+  * ``%Y``: Year as a decimal number including the century.
+
+
 .. _nginx: http://nginx.net
 
 .. vim:ft=rst:spell:spelllang=en:
diff --git a/debian/modules/ngx-fancyindex/config b/debian/modules/ngx-fancyindex/config
index 0430ed8..4ef3809 100644
--- a/debian/modules/ngx-fancyindex/config
+++ b/debian/modules/ngx-fancyindex/config
@@ -1,8 +1,20 @@
 # vim:ft=sh:
 ngx_addon_name=ngx_http_fancyindex_module
 
-# XXX: Insert fancyindex module *after* index module!
-#
-HTTP_MODULES=`echo "${HTTP_MODULES}" | sed -e \
+if [ "$ngx_module_link" = DYNAMIC ] ; then
+    ngx_module_type=HTTP
+    ngx_module_name=ngx_http_fancyindex_module
+    ngx_module_srcs="$ngx_addon_dir/ngx_http_fancyindex_module.c"
+    ngx_module_deps="$ngx_addon_dir/template.h"
+    ngx_module_order="$ngx_module_name ngx_http_autoindex_module"
+    . auto/module
+else
+    # XXX: Insert fancyindex module *after* index module!
+    #
+    HTTP_MODULES=`echo "${HTTP_MODULES}" | sed -e \
 	's/ngx_http_index_module/ngx_http_fancyindex_module ngx_http_index_module/'`
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fancyindex_module.c"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fancyindex_module.c"
+    if [ $HTTP_ADDITION != YES ] ; then
+        echo " - The 'addition' filter is needed for fancyindex_{header,footer}, but it was disabled"
+    fi
+fi
diff --git a/debian/modules/ngx-fancyindex/ngx_http_fancyindex_module.c b/debian/modules/ngx-fancyindex/ngx_http_fancyindex_module.c
index 9675e92..170167d 100644
--- a/debian/modules/ngx-fancyindex/ngx_http_fancyindex_module.c
+++ b/debian/modules/ngx-fancyindex/ngx_http_fancyindex_module.c
@@ -1,6 +1,6 @@
 /*
  * ngx_http_fancyindex_module.c
- * Copyright © 2007-2013 Adrian Perez <aperez@igalia.com>
+ * Copyright © 2007-2016 Adrian Perez <aperez@igalia.com>
  *
  * Module used for fancy indexing of directories. Features and differences
  * with the stock nginx autoindex module:
@@ -33,6 +33,113 @@
 #endif /* __GNUC__ */
 
 
+static const char *short_weekday[] = {
+    "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun",
+};
+static const char *long_weekday[] = {
+    "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Sunday",
+};
+static const char *short_month[] = {
+    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+};
+static const char *long_month[] = {
+    "January", "February", "March", "April", "May", "June", "July",
+    "August", "September", "October", "November", "December",
+};
+
+
+#define DATETIME_FORMATS(F_, t) \
+    F_ ('a',  3, "%3s",  short_weekday[((t)->ngx_tm_wday + 6) % 7]) \
+    F_ ('A',  9, "%s",   long_weekday [((t)->ngx_tm_wday + 6) % 7]) \
+    F_ ('b',  3, "%3s",  short_month[(t)->ngx_tm_mon - 1]         ) \
+    F_ ('B',  9, "%s",   long_month [(t)->ngx_tm_mon - 1]         ) \
+    F_ ('d',  2, "%02d", (t)->ngx_tm_mday                         ) \
+    F_ ('e',  2, "%2d",  (t)->ngx_tm_mday                         ) \
+    F_ ('F', 10, "%d-%02d-%02d",                                    \
+                  (t)->ngx_tm_year,                                 \
+                  (t)->ngx_tm_mon,                                  \
+                  (t)->ngx_tm_mday                                ) \
+    F_ ('H',  2, "%02d", (t)->ngx_tm_hour                         ) \
+    F_ ('I',  2, "%02d", ((t)->ngx_tm_hour % 12) + 1              ) \
+    F_ ('k',  2, "%2d",  (t)->ngx_tm_hour                         ) \
+    F_ ('l',  2, "%2d",  ((t)->ngx_tm_hour % 12) + 1              ) \
+    F_ ('m',  2, "%02d", (t)->ngx_tm_mon                          ) \
+    F_ ('M',  2, "%02d", (t)->ngx_tm_min                          ) \
+    F_ ('p',  2, "%2s",  (((t)->ngx_tm_hour < 12) ? "AM" : "PM")  ) \
+    F_ ('P',  2, "%2s",  (((t)->ngx_tm_hour < 12) ? "am" : "pm")  ) \
+    F_ ('r', 11, "%02d:%02d:%02d %2s",                              \
+                 ((t)->ngx_tm_hour % 12) + 1,                       \
+                 (t)->ngx_tm_min,                                   \
+                 (t)->ngx_tm_sec,                                   \
+                 (((t)->ngx_tm_hour < 12) ? "AM" : "PM")          ) \
+    F_ ('R',  5, "%02d:%02d", (t)->ngx_tm_hour, (t)->ngx_tm_min   ) \
+    F_ ('S',  2, "%02d", (t)->ngx_tm_sec                          ) \
+    F_ ('T',  8, "%02d:%02d:%02d",                                  \
+                 (t)->ngx_tm_hour,                                  \
+                 (t)->ngx_tm_min,                                   \
+                 (t)->ngx_tm_sec                                  ) \
+    F_ ('u',  1, "%1d", (((t)->ngx_tm_wday + 6) % 7) + 1          ) \
+    F_ ('w',  1, "%1d", ((t)->ngx_tm_wday + 6) % 7                ) \
+    F_ ('y',  2, "%02d", (t)->ngx_tm_year % 100                   ) \
+    F_ ('Y',  4, "%04d", (t)->ngx_tm_year                         )
+
+
+static size_t
+ngx_fancyindex_timefmt_calc_size (const ngx_str_t *fmt)
+{
+#define DATETIME_CASE(letter, fmtlen, fmt, ...) \
+        case letter: result += (fmtlen); break;
+
+    size_t i, result = 0;
+    for (i = 0; i < fmt->len; i++) {
+        if (fmt->data[i] == '%') {
+            if (++i >= fmt->len) {
+                result++;
+                break;
+            }
+            switch (fmt->data[i]) {
+                DATETIME_FORMATS(DATETIME_CASE,)
+                default:
+                    result++;
+            }
+        } else {
+            result++;
+        }
+    }
+    return result;
+
+#undef DATETIME_CASE
+}
+
+
+static u_char*
+ngx_fancyindex_timefmt (u_char *buffer, const ngx_str_t *fmt, const ngx_tm_t *tm)
+{
+#define DATETIME_CASE(letter, fmtlen, fmt, ...) \
+        case letter: buffer = ngx_snprintf(buffer, fmtlen, fmt, ##__VA_ARGS__); break;
+
+    size_t i;
+    for (i = 0; i < fmt->len; i++) {
+        if (fmt->data[i] == '%') {
+            if (++i >= fmt->len) {
+                *buffer++ = '%';
+                break;
+            }
+            switch (fmt->data[i]) {
+                DATETIME_FORMATS(DATETIME_CASE, tm)
+                default:
+                    *buffer++ = fmt->data[i];
+            }
+        } else {
+            *buffer++ = fmt->data[i];
+        }
+    }
+    return buffer;
+
+#undef DATETIME_CASE
+}
+
 
 /**
  * Configuration structure for the fancyindex module. The configuration
@@ -41,13 +148,17 @@
 typedef struct {
     ngx_flag_t enable;       /**< Module is enabled. */
     ngx_uint_t default_sort; /**< Default sort criterion. */
+    ngx_flag_t dirs_first;   /**< Group directories together first when sorting */
     ngx_flag_t localtime;    /**< File mtime dates are sent in local time. */
     ngx_flag_t exact_size;   /**< Sizes are sent always in bytes. */
     ngx_uint_t name_length;  /**< Maximum length of file names in bytes. */
+    ngx_flag_t hide_symlinks;/**< Hide symbolic links in listings. */
+    ngx_flag_t show_path;    /**< Whether to display or not the path + '</h1>' after the header */
 
     ngx_str_t  header;       /**< File name for header, or empty if none. */
     ngx_str_t  footer;       /**< File name for footer, or empty if none. */
     ngx_str_t  css_href;     /**< Link to a CSS stylesheet, or empty if none. */
+    ngx_str_t  time_format;  /**< Format used for file timestamps. */
 
     ngx_array_t *ignore;     /**< List of files to ignore in listings. */
 } ngx_http_fancyindex_loc_conf_t;
@@ -113,17 +224,19 @@ typedef struct {
 
 
 
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
+    ngx_http_fancyindex_cmp_entries_dirs_first(const void *one, const void *two);
+static ngx_int_t ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_name_desc(const void *one, const void *two);
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_size_desc(const void *one, const void *two);
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_mtime_desc(const void *one, const void *two);
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_name_asc(const void *one, const void *two);
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_size_asc(const void *one, const void *two);
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_mtime_asc(const void *one, const void *two);
 
 static ngx_int_t ngx_http_fancyindex_error(ngx_http_request_t *r,
@@ -174,6 +287,13 @@ static ngx_command_t  ngx_http_fancyindex_commands[] = {
       offsetof(ngx_http_fancyindex_loc_conf_t, default_sort),
       &ngx_http_fancyindex_sort_criteria },
 
+    { ngx_string("fancyindex_directories_first"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fancyindex_loc_conf_t, dirs_first),
+      NULL },
+
     { ngx_string("fancyindex_localtime"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -223,6 +343,27 @@ static ngx_command_t  ngx_http_fancyindex_commands[] = {
       0,
       NULL },
 
+    { ngx_string("fancyindex_hide_symlinks"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fancyindex_loc_conf_t, hide_symlinks),
+      NULL },
+
+    { ngx_string("fancyindex_show_path"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fancyindex_loc_conf_t, show_path),
+      NULL },
+
+    { ngx_string("fancyindex_time_format"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fancyindex_loc_conf_t, time_format),
+      NULL },
+
     ngx_null_command
 };
 
@@ -406,7 +547,7 @@ make_content_buf(
 {
     ngx_http_fancyindex_entry_t *entry;
 
-    int (*sort_cmp_func) (const void*, const void*);
+    ngx_int_t (*sort_cmp_func) (const void*, const void*);
     const char  *sort_url_args = "";
 
     off_t        length;
@@ -421,11 +562,6 @@ make_content_buf(
     ngx_dir_t    dir;
     ngx_buf_t   *b;
 
-    static char *months[] = {
-        "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
-    };
-
     /*
      * NGX_DIR_MASK_LEN is lesser than NGX_HTTP_FANCYINDEX_PREALLOCATE
      */
@@ -497,9 +633,14 @@ make_content_buf(
         if (ngx_de_name(&dir)[0] == '.')
             continue;
 
+        if (alcf->hide_symlinks && ngx_de_is_link (&dir))
+            continue;
+
 #if NGX_PCRE
         {
-            ngx_str_t str = { len, ngx_de_name(&dir) };
+            ngx_str_t str;
+            str.len = len;
+            str.data = ngx_de_name(&dir);
 
             if (alcf->ignore && ngx_regex_exec_array(alcf->ignore, &str,
                                                      r->connection->log)
@@ -588,12 +729,29 @@ make_content_buf(
     /*
      * Calculate needed buffer length.
      */
-    len = r->uri.len
-        + ngx_sizeof_ssz(t05_body2)
-        + ngx_sizeof_ssz(t06_list1)
-        + ngx_sizeof_ssz(t_parentdir_entry)
-        + ngx_sizeof_ssz(t07_list2)
-        ;
+    if (alcf->show_path)
+        len = r->uri.len
+          + ngx_sizeof_ssz(t05_body2)
+          + ngx_sizeof_ssz(t06_list1)
+          + ngx_sizeof_ssz(t_parentdir_entry)
+          + ngx_sizeof_ssz(t07_list2)
+          + ngx_fancyindex_timefmt_calc_size (&alcf->time_format) * entries.nelts
+          ;
+   else
+        len = r->uri.len
+          + ngx_sizeof_ssz(t06_list1)
+          + ngx_sizeof_ssz(t_parentdir_entry)
+          + ngx_sizeof_ssz(t07_list2)
+          + ngx_fancyindex_timefmt_calc_size (&alcf->time_format) * entries.nelts
+          ;
+
+    /*
+     * If we are a the root of the webserver (URI =  "/" --> length of 1),
+     * do not display the "Parent Directory" link.
+     */
+    if (r->uri.len == 1) {
+        len -= ngx_sizeof_ssz(t_parentdir_entry);
+    }
 
     entry = entries.elts;
     for (i = 0; i < entries.nelts; i++) {
@@ -609,14 +767,15 @@ make_content_buf(
         len += ngx_sizeof_ssz("<tr><td><a href=\"")
             + entry[i].name.len + entry[i].escape /* Escaped URL */
             + ngx_sizeof_ssz("?C=x&amp;O=y") /* URL sorting arguments */
+            + ngx_sizeof_ssz("\" title=\"")
+            + entry[i].name.len + entry[i].utf_len
             + ngx_sizeof_ssz("\">")
             + entry[i].name.len + entry[i].utf_len
             + alcf->name_length + ngx_sizeof_ssz("&gt;")
             + ngx_sizeof_ssz("</a></td><td>")
             + 20 /* File size */
-            + ngx_sizeof_ssz("</td><td>")
-            + ngx_sizeof_ssz(" 28-Sep-1970 12:00 ")
-            + ngx_sizeof_ssz("</td></tr>\n")
+            + ngx_sizeof_ssz("</td><td>")    /* Date prefix */
+            + ngx_sizeof_ssz("</td></tr>\n") /* Date suffix */
             + 2 /* CR LF */
             ;
     }
@@ -707,31 +866,48 @@ make_content_buf(
 
     /* Sort entries, if needed */
     if (entries.nelts > 1) {
-        ngx_qsort(entry, (size_t) entries.nelts,
+        /* Use ngx_sort for stability */ 
+        ngx_sort(entry, (size_t) entries.nelts,
                   sizeof(ngx_http_fancyindex_entry_t),
                   sort_cmp_func);
+
+        if (alcf->dirs_first)
+        {
+            /* Sort directories first */
+            ngx_sort(entry, (size_t) entries.nelts,
+                      sizeof(ngx_http_fancyindex_entry_t),
+                      ngx_http_fancyindex_cmp_entries_dirs_first);
+        }
+
     }
 
-    b->last = ngx_cpymem_str(b->last, r->uri);
-    b->last = ngx_cpymem_ssz(b->last, t05_body2);
+    /* Display the path, if needed */
+    if (alcf->show_path){
+        b->last = ngx_cpymem_str(b->last, r->uri);
+        b->last = ngx_cpymem_ssz(b->last, t05_body2);
+    }
+
+    /* Open the <table> tag */
     b->last = ngx_cpymem_ssz(b->last, t06_list1);
 
     tp = ngx_timeofday();
 
-    /* "Parent dir" entry, always first */
-    b->last = ngx_cpymem_ssz(b->last,
-                             "<tr>"
-                             "<td><a href=\"../");
-    if (*sort_url_args) {
-        b->last = ngx_cpymem(b->last,
-                             sort_url_args,
-                             ngx_sizeof_ssz("?C=N&amp;O=A"));
+    /* "Parent dir" entry, always first if displayed */
+    if (r->uri.len > 1) {
+        b->last = ngx_cpymem_ssz(b->last,
+                                 "<tr>"
+                                 "<td><a href=\"../");
+        if (*sort_url_args) {
+            b->last = ngx_cpymem(b->last,
+                                 sort_url_args,
+                                 ngx_sizeof_ssz("?C=N&amp;O=A"));
+        }
+        b->last = ngx_cpymem_ssz(b->last,
+                                 "\">Parent directory/</a></td>"
+                                 "<td>-</td>"
+                                 "<td>-</td>"
+                                 "</tr>");
     }
-    b->last = ngx_cpymem_ssz(b->last,
-                             "\">Parent directory/</a></td>"
-                             "<td>-</td>"
-                             "<td>-</td>"
-                             "</tr>");
 
     /* Entries for directories and files */
     for (i = 0; i < entries.nelts; i++) {
@@ -757,6 +933,9 @@ make_content_buf(
             }
         }
 
+        *b->last++ = '"';
+        b->last = ngx_cpymem_ssz(b->last, " title=\"");
+        b->last = ngx_cpymem_str(b->last, entry[i].name);
         *b->last++ = '"';
         *b->last++ = '>';
 
@@ -842,14 +1021,9 @@ make_content_buf(
         }
 
         ngx_gmtime(entry[i].mtime + tp->gmtoff * 60 * alcf->localtime, &tm);
-
-        b->last = ngx_sprintf(b->last, "</td><td>%02d-%s-%d %02d:%02d</td></tr>",
-                              tm.ngx_tm_mday,
-                              months[tm.ngx_tm_mon - 1],
-                              tm.ngx_tm_year,
-                              tm.ngx_tm_hour,
-                              tm.ngx_tm_min);
-
+        b->last = ngx_cpymem_ssz(b->last, "</td><td>");
+        b->last = ngx_fancyindex_timefmt(b->last, &alcf->time_format, &tm);
+        b->last = ngx_cpymem_ssz(b->last, "</td></tr>");
 
         *b->last++ = CR;
         *b->last++ = LF;
@@ -899,7 +1073,7 @@ ngx_http_fancyindex_handler(ngx_http_request_t *r)
         return NGX_DECLINED;
     }
 
-    if ((rc = make_content_buf(r, &out[0].buf, alcf) != NGX_OK))
+    if ((rc = make_content_buf(r, &out[0].buf, alcf)) != NGX_OK)
         return rc;
 
     out[0].buf->last_in_chain = 1;
@@ -910,8 +1084,7 @@ ngx_http_fancyindex_handler(ngx_http_request_t *r)
     r->headers_out.content_type.data = (u_char *) "text/html";
 
     rc = ngx_http_send_header(r);
-
-    if (rc != NGX_OK || r->header_only)
+    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only)
         return rc;
 
     if (alcf->header.len > 0) {
@@ -943,7 +1116,7 @@ ngx_http_fancyindex_handler(ngx_http_request_t *r)
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                 "http fancyindex: header subrequest status = %i",
                 sr->headers_out.status);
-	/* ngx_http_subrequest returns NGX_OK(0), not NGX_HTTP_OK(200) */
+        /* ngx_http_subrequest returns NGX_OK(0), not NGX_HTTP_OK(200) */
         if (sr->headers_out.status != NGX_OK) {
             /*
              * XXX: Should we write a message to the error log just in case
@@ -1038,112 +1211,81 @@ add_builtin_header:
     return (r != r->main) ? rc : ngx_http_send_special(r, NGX_HTTP_LAST);
 }
 
+static ngx_int_t ngx_libc_cdecl
+ngx_http_fancyindex_cmp_entries_dirs_first(const void *one, const void *two)
+{
+    ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
+    ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-static int ngx_libc_cdecl
+    /* move the directories to the start */
+    if (first->dir && !second->dir) {
+        return -1;
+    }
+    if (!first->dir && second->dir) {
+        return 1;
+    }
+
+    return 0;
+}
+
+
+static ngx_int_t ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_name_desc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
     ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    /* move the directories to the start */
-    if (first->dir && !second->dir) {
-        return -1;
-    }
-    if (!first->dir && second->dir) {
-        return 1;
-    }
-
     return (int) ngx_strcmp(second->name.data, first->name.data);
 }
 
 
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_size_desc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
     ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    /* move the directories to the start */
-    if (first->dir && !second->dir) {
-        return -1;
-    }
-    if (!first->dir && second->dir) {
-        return 1;
-    }
-
-    return second->size - first->size;
+    return (int) (second->size - first->size);
 }
 
 
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_mtime_desc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
     ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    /* move the directories to the start */
-    if (first->dir && !second->dir) {
-        return -1;
-    }
-    if (!first->dir && second->dir) {
-        return 1;
-    }
-
-    return second->mtime - first->mtime;
+    return (int) (second->mtime - first->mtime);
 }
 
 
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_name_asc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
     ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    /* move the directories to the start */
-    if (first->dir && !second->dir) {
-        return -1;
-    }
-    if (!first->dir && second->dir) {
-        return 1;
-    }
-
     return (int) ngx_strcmp(first->name.data, second->name.data);
 }
 
 
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_size_asc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
     ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    /* move the directories to the start */
-    if (first->dir && !second->dir) {
-        return -1;
-    }
-    if (!first->dir && second->dir) {
-        return 1;
-    }
-
-    return first->size - second->size;
+    return (int) (first->size - second->size);
 }
 
 
-static int ngx_libc_cdecl
+static ngx_int_t ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_mtime_asc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
     ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    /* move the directories to the start */
-    if (first->dir && !second->dir) {
-        return -1;
-    }
-    if (!first->dir && second->dir) {
-        return 1;
-    }
-
-    return first->mtime - second->mtime;
+    return (int) (first->mtime - second->mtime);
 }
 
 
@@ -1171,17 +1313,24 @@ ngx_http_fancyindex_create_loc_conf(ngx_conf_t *cf)
 
     /*
      * Set by ngx_pcalloc:
-     *    conf->header.len   = 0
-     *    conf->header.data  = NULL
-     *    conf->footer.len   = 0
-     *    conf->footer.data  = NULL
+     *    conf->header.len       = 0
+     *    conf->header.data      = NULL
+     *    conf->footer.len       = 0
+     *    conf->footer.data      = NULL
+     *    conf->css_href.len     = 0
+     *    conf->css_href.data    = NULL
+     *    conf->time_format.len  = 0
+     *    conf->time_format.data = NULL
      */
-    conf->enable       = NGX_CONF_UNSET;
-    conf->default_sort = NGX_CONF_UNSET_UINT;
-    conf->localtime    = NGX_CONF_UNSET;
-    conf->name_length  = NGX_CONF_UNSET_UINT;
-    conf->exact_size   = NGX_CONF_UNSET;
-    conf->ignore       = NGX_CONF_UNSET_PTR;
+    conf->enable        = NGX_CONF_UNSET;
+    conf->default_sort  = NGX_CONF_UNSET_UINT;
+    conf->dirs_first    = NGX_CONF_UNSET;
+    conf->localtime     = NGX_CONF_UNSET;
+    conf->name_length   = NGX_CONF_UNSET_UINT;
+    conf->exact_size    = NGX_CONF_UNSET;
+    conf->ignore        = NGX_CONF_UNSET_PTR;
+    conf->hide_symlinks = NGX_CONF_UNSET;
+    conf->show_path     = NGX_CONF_UNSET;
 
     return conf;
 }
@@ -1193,16 +1342,30 @@ ngx_http_fancyindex_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_http_fancyindex_loc_conf_t *prev = parent;
     ngx_http_fancyindex_loc_conf_t *conf = child;
 
+    (void) cf; /* unused */
+
     ngx_conf_merge_value(conf->enable, prev->enable, 0);
     ngx_conf_merge_uint_value(conf->default_sort, prev->default_sort, NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME);
+    ngx_conf_merge_value(conf->dirs_first, prev->dirs_first, 1);
     ngx_conf_merge_value(conf->localtime, prev->localtime, 0);
     ngx_conf_merge_value(conf->exact_size, prev->exact_size, 1);
+    ngx_conf_merge_value(conf->show_path, prev->show_path, 1);
     ngx_conf_merge_uint_value(conf->name_length, prev->name_length, 50);
 
     ngx_conf_merge_str_value(conf->header, prev->header, "");
     ngx_conf_merge_str_value(conf->footer, prev->footer, "");
+    ngx_conf_merge_str_value(conf->css_href, prev->css_href, "");
+    ngx_conf_merge_str_value(conf->time_format, prev->time_format, "%Y-%b-%d %H:%M");
 
     ngx_conf_merge_ptr_value(conf->ignore, prev->ignore, NULL);
+    ngx_conf_merge_value(conf->hide_symlinks, prev->hide_symlinks, 0);
+
+    /* Just make sure we haven't disabled the show_path directive without providing a custom header */
+    if (conf->show_path == 0 && conf->header.len == 0)
+    {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "FancyIndex : cannot set show_path to off without providing a custom header !");
+        return NGX_CONF_ERROR;
+    }
 
     return NGX_CONF_OK;
 }
@@ -1214,6 +1377,8 @@ ngx_http_fancyindex_ignore(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_fancyindex_loc_conf_t *alcf = conf;
     ngx_str_t *value;
 
+    (void) cmd; /* unused */
+
 #if (NGX_PCRE)
     ngx_uint_t          i;
     ngx_regex_elt_t    *re;
diff --git a/debian/modules/ngx-fancyindex/t/00-build-artifacts.test b/debian/modules/ngx-fancyindex/t/00-build-artifacts.test
new file mode 100644
index 0000000..b9bc1ac
--- /dev/null
+++ b/debian/modules/ngx-fancyindex/t/00-build-artifacts.test
@@ -0,0 +1,22 @@
+#! /bin/bash
+cat <<---
+This test checks that the built Nginx either has the dynamic fancyindex
+module available, or that it's not there (for static builds).
+--
+
+readonly nginx_path="${PREFIX}/sbin/nginx"
+readonly so_path="${PREFIX}/modules/ngx_http_fancyindex_module.so"
+
+if [[ ! -x ${nginx_path} ]] ; then
+	fail "executable binary not found at '%s'\n" "${nginx_path}"
+fi
+
+if ${DYNAMIC} ; then
+	if [[ ! -r ${so_path} ]] ; then
+		fail "module not found at '%s'\n" "${so_path}"
+	fi
+else
+	if [[ -r ${so_path} ]] ; then
+		fail "module should not exist at '%s'\n" "${so_path}"
+	fi
+fi
diff --git a/debian/modules/ngx-fancyindex/t/01-smoke-hasindex.test b/debian/modules/ngx-fancyindex/t/01-smoke-hasindex.test
new file mode 100644
index 0000000..19706a4
--- /dev/null
+++ b/debian/modules/ngx-fancyindex/t/01-smoke-hasindex.test
@@ -0,0 +1,7 @@
+#! /bin/bash
+cat <<---
+This test fetches the root directory served by Nginx, which has no index file,
+and checks that the output contains something that resembles a directory index.
+--
+nginx_start
+grep 'Index of' <( fetch )
diff --git a/debian/modules/ngx-fancyindex/t/02-smoke-indexisfancy.test b/debian/modules/ngx-fancyindex/t/02-smoke-indexisfancy.test
new file mode 100644
index 0000000..10cc403
--- /dev/null
+++ b/debian/modules/ngx-fancyindex/t/02-smoke-indexisfancy.test
@@ -0,0 +1,11 @@
+#! /bin/bash
+cat <<---
+This test fetches the root directory served by Nginx, which has no index file,
+and checks that the output contains something that resembles the output from
+the fancyindex module.
+--
+nginx_start
+content=$(fetch --with-headers)
+grep 'Index of /' <<< "${content}"  # It is an index
+grep '\<table\>'  <<< "${content}"  # It contains a table
+grep '^  Content-Type:[[:space:]]*text/html' <<< "${content}"
diff --git a/debian/modules/ngx-fancyindex/t/build-and-run b/debian/modules/ngx-fancyindex/t/build-and-run
new file mode 100755
index 0000000..68584b7
--- /dev/null
+++ b/debian/modules/ngx-fancyindex/t/build-and-run
@@ -0,0 +1,25 @@
+#! /bin/bash
+set -e
+
+if [[ $# -lt 1 || $# -gt 2 ]] ; then
+	echo "Usage: $0 <nginx-version> [1]" 1>&2
+	exit 1
+fi
+
+readonly NGINX=$1
+
+if [[ $2 -eq 1 ]] ; then
+	readonly DYNAMIC=$2
+fi
+
+cd "$(dirname "$0")/.."
+wget -O - http://nginx.org/download/nginx-${NGINX}.tar.gz | tar -xzf -
+rm -rf prefix/
+cd nginx-${NGINX}
+./configure \
+	--add-${DYNAMIC:+dynamic-}module=.. \
+	--with-http_addition_module \
+	--prefix="$(pwd)/../prefix"
+make install
+cd ..
+exec ./t/run prefix ${DYNAMIC}
diff --git a/debian/modules/ngx-fancyindex/t/has-index.test b/debian/modules/ngx-fancyindex/t/has-index.test
new file mode 100644
index 0000000..cf34207
--- /dev/null
+++ b/debian/modules/ngx-fancyindex/t/has-index.test
@@ -0,0 +1,7 @@
+#! /bin/bash
+cat <<---
+This test ensures that the "index.html" is returned instead of a directory
+listing when fetching a directory which contains an index file.
+--
+nginx_start
+diff -u "${TESTDIR}/has-index/index.html" <( fetch /has-index/ ) 1>&2
diff --git a/debian/modules/ngx-fancyindex/t/has-index/index.html b/debian/modules/ngx-fancyindex/t/has-index/index.html
new file mode 100644
index 0000000..419ae86
--- /dev/null
+++ b/debian/modules/ngx-fancyindex/t/has-index/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+	<head>
+        <meta charset="utf-8" />
+		<title>Index file test</title>
+	</head>
+	<body>
+		This is <code>index.html</code>.
+	</body>
+</html>
diff --git a/debian/modules/ngx-fancyindex/t/nginx.conf b/debian/modules/ngx-fancyindex/t/nginx.conf
new file mode 100644
index 0000000..2b99a3d
--- /dev/null
+++ b/debian/modules/ngx-fancyindex/t/nginx.conf
@@ -0,0 +1,25 @@
+worker_processes  1;
+
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+    server {
+        listen       80;
+        server_name  localhost;
+        location / {
+            root   html;
+            index  index.html index.htm;
+        }
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
+}
diff --git a/debian/modules/ngx-fancyindex/t/preamble b/debian/modules/ngx-fancyindex/t/preamble
new file mode 100644
index 0000000..a571381
--- /dev/null
+++ b/debian/modules/ngx-fancyindex/t/preamble
@@ -0,0 +1,84 @@
+#! /bin/bash
+#
+# preamble
+# Copyright (C) 2016 Adrian Perez <aperez@igalia.com>
+#
+# Distributed under terms of the MIT license.
+#
+
+function nginx_conf_generate () {
+	if ${DYNAMIC} ; then
+		echo 'load_module modules/ngx_http_fancyindex_module.so;'
+	fi
+	cat <<-EOF
+	worker_processes 1;
+	events { worker_connections 1024; }
+	http {
+		include mime.types;
+		default_type application/octet-stream;
+		sendfile on;
+		keepalive_timeout 65;
+		server {
+			server_name localhost;
+			listen 127.0.0.1:8888;
+			root ${TESTDIR};
+			error_page 500 502 503 504 /50x.html;
+			location = /50x.html { root html; }
+			location / {
+				index index.html;
+				fancyindex on;
+				$*
+			}
+		}
+	}
+	EOF
+}
+
+readonly NGINX_CONF="${PREFIX}/conf/nginx.conf"
+readonly NGINX_PID="${PREFIX}/logs/nginx.pid"
+rm -f "${NGINX_CONF}" "${NGINX_PID}"
+mkdir -p "${PREFIX}/logs"
+
+function nginx () {
+	env - PATH="${PATH}" "${PREFIX}/sbin/nginx" "$@"
+}
+
+function nginx_conf () {
+	nginx_conf_generate "$@" > "${NGINX_CONF}"
+}
+
+function nginx_is_running () {
+	[[ -r ${NGINX_PID} ]] && kill -0 $(< "${NGINX_PID}")
+}
+
+function nginx_stop () {
+	if nginx_is_running ; then nginx -s stop ; fi
+	rm -f "${NGINX_PID}"
+}
+trap nginx_stop EXIT
+
+function nginx_start () {
+	if [[ $# -gt 0 || ! -r ${NGINX_CONF} ]] ; then nginx_conf "$@" ; fi
+	nginx_stop  # Ensure that it is not running.
+	nginx
+}
+
+function fetch () {
+	local -a opts=( -q )
+	if [[ $1 = --with-headers ]] ; then
+		opts+=( -S )
+		shift
+	fi
+	wget "${opts[@]}" -O- "http://localhost:8888${1:-/}" 2>&1
+}
+
+function fail () {
+	printf "(FF) "
+	printf "$@"
+	exit 1
+} 1>&2
+
+function warn () {
+	printf "(WW)"
+	printf "$@"
+} 1>&2
diff --git a/debian/modules/ngx-fancyindex/t/run b/debian/modules/ngx-fancyindex/t/run
new file mode 100755
index 0000000..2001bff
--- /dev/null
+++ b/debian/modules/ngx-fancyindex/t/run
@@ -0,0 +1,67 @@
+#! /bin/bash
+set -e
+
+if [[ $# -lt 1 || $# -gt 2 ]] ; then
+	echo "Usage: $0 <prefix-path> [1]" 1>&2
+	exit 1
+fi
+
+# Obtain the absolute path to the tests directory
+pushd "$(dirname "$0")" &> /dev/null
+readonly T=$(pwd)
+popd &> /dev/null
+export T
+
+# Same for the nginx prefix directory
+pushd "$1" &> /dev/null
+readonly prefix=$(pwd)
+popd &> /dev/null
+
+dynamic=false
+if [[ $# -gt 1 && $2 -eq 1 ]] ; then
+	dynamic=true
+fi
+readonly dynamic
+
+declare -a t_pass=( )
+declare -a t_fail=( )
+
+for t in "$T"/*.test ; do
+	name="t/${t##*/}"
+	name=${name%.test}
+	printf "${name} ... "
+	errfile="${name}.err"
+	outfile="${name}.out"
+	shfile="${name}.sh"
+	cat > "${shfile}" <<-EOF
+	readonly DYNAMIC=${dynamic}
+	readonly TESTDIR='$T'
+	readonly PREFIX='${prefix}'
+	$(< "$T/preamble")
+	$(< "$t")
+	EOF
+	if bash -e "${shfile}" > "${outfile}" 2> "${errfile}" ; then
+		t_pass+=( "${name}" )
+		printf 'passed\n'
+	else
+		t_fail+=( "${name}" )
+		printf 'failed\n'
+	fi
+done
+
+for name in "${t_fail[@]}" ; do
+	echo
+	printf '=== %s.out\n' "${name}"
+	cat "${name}.out"
+	echo
+	printf '=== %s.err\n' "${name}"
+	cat "${name}.err"
+	echo
+done
+
+printf '=== passed/failed/total: %d/%d/%d\n' \
+	${#t_pass[@]} ${#t_fail[@]} $(( ${#t_pass[@]} + ${#t_fail[@]} ))
+
+if [[ ${#t_fail[@]} -gt 0 ]] ; then
+	exit 1
+fi
diff --git a/debian/modules/ngx-fancyindex/template.h b/debian/modules/ngx-fancyindex/template.h
index 8375a1f..4881ac7 100644
--- a/debian/modules/ngx-fancyindex/template.h
+++ b/debian/modules/ngx-fancyindex/template.h
@@ -66,9 +66,9 @@ static const u_char t06_list1[] = ""
 "\n"
 "<thead>"
 "<tr>"
-"<th><a href=\"?C=N&O=A\">File Name</a>&nbsp;<a href=\"?C=N&O=D\">&nbsp;↓&nbsp;</a></th>"
-"<th><a href=\"?C=S&O=A\">File Size</a>&nbsp;<a href=\"?C=S&O=D\">&nbsp;↓&nbsp;</a></th>"
-"<th><a href=\"?C=M&O=A\">Date</a>&nbsp;<a href=\"?C=M&O=D\">&nbsp;↓&nbsp;</a></th>"
+"<th><a href=\"?C=N&O=A\">File Name</a>&nbsp;<a href=\"?C=N&O=D\">&nbsp;&#8595;&nbsp;</a></th>"
+"<th><a href=\"?C=S&O=A\">File Size</a>&nbsp;<a href=\"?C=S&O=D\">&nbsp;&#8595;&nbsp;</a></th>"
+"<th><a href=\"?C=M&O=A\">Date</a>&nbsp;<a href=\"?C=M&O=D\">&nbsp;&#8595;&nbsp;</a></th>"
 "</tr>"
 "</thead>"
 "\n"
diff --git a/debian/modules/ngx-fancyindex/template.html b/debian/modules/ngx-fancyindex/template.html
index eb0a40d..bc41292 100644
--- a/debian/modules/ngx-fancyindex/template.html
+++ b/debian/modules/ngx-fancyindex/template.html
@@ -64,9 +64,9 @@
 
 			<thead>
 				<tr>
-					<th><a href="?C=N&O=A">File Name</a>&nbsp;<a href="?C=N&O=D">&nbsp;↓&nbsp;</a></th>
-					<th><a href="?C=S&O=A">File Size</a>&nbsp;<a href="?C=S&O=D">&nbsp;↓&nbsp;</a></th>
-					<th><a href="?C=M&O=A">Date</a>&nbsp;<a href="?C=M&O=D">&nbsp;↓&nbsp;</a></th>
+					<th><a href="?C=N&O=A">File Name</a>&nbsp;<a href="?C=N&O=D">&nbsp;&#8595;&nbsp;</a></th>
+					<th><a href="?C=S&O=A">File Size</a>&nbsp;<a href="?C=S&O=D">&nbsp;&#8595;&nbsp;</a></th>
+					<th><a href="?C=M&O=A">Date</a>&nbsp;<a href="?C=M&O=D">&nbsp;&#8595;&nbsp;</a></th>
 				</tr>
 			</thead>
 

From cf3d323bd558ed215d2ad4cf106840e2d3b63c07 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 13:00:13 +0300
Subject: [PATCH 097/600] mod: Convert fancyindex to a dynamic module

---
 debian/control                                    |  9 +++++++++
 debian/libnginx-mod-http-fancyindex.nginx         | 13 +++++++++++++
 debian/libnginx-mod.conf/mod-http-fancyindex.conf |  1 +
 debian/rules                                      |  4 ++--
 debian/tests/control                              |  3 +++
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100755 debian/libnginx-mod-http-fancyindex.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-fancyindex.conf

diff --git a/debian/control b/debian/control
index a61ee9f..1eb6d70 100644
--- a/debian/control
+++ b/debian/control
@@ -195,6 +195,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-upstream-fair (= ${binary:Version}),
          libnginx-mod-http-headers-more-filter (= ${binary:Version}),
          libnginx-mod-http-cache-purge (= ${binary:Version}),
+         libnginx-mod-http-fancyindex (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -395,3 +396,11 @@ Description: Purge content from Nginx caches
  Cache Purge module adds purging capabilities to Nginx. It allows purging
  content from caches used by all of Nginx proxy modules, like FastCGI, Proxy,
  SCGI and uWSGI.
+
+Package: libnginx-mod-http-fancyindex
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Fancy indexes module for the Nginx
+ The Fancy Index module makes possible the generation of file listings, like
+ the built-in autoindex module does, but adding a touch of style by introducing
+ ways to customize the result.
diff --git a/debian/libnginx-mod-http-fancyindex.nginx b/debian/libnginx-mod-http-fancyindex.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-fancyindex.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-fancyindex.conf b/debian/libnginx-mod.conf/mod-http-fancyindex.conf
new file mode 100644
index 0000000..4aa4f2f
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-fancyindex.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_fancyindex_module.so;
diff --git a/debian/rules b/debian/rules
index f6a814a..7a15973 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter http-cache-purge
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter http-cache-purge http-fancyindex
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -111,7 +111,7 @@ extras_configure_flags := \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-development-kit \
 			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
-			--add-module=$(MODULESDIR)/ngx-fancyindex \
+			--add-dynamic-module=$(MODULESDIR)/ngx-fancyindex \
 			--add-dynamic-module=$(MODULESDIR)/nchan \
 			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
 			--add-module=$(MODULESDIR)/nginx-upload-progress \
diff --git a/debian/tests/control b/debian/tests/control
index bdffd81..ddc1e4e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -17,6 +17,7 @@ Depends: nginx-full,
          libnginx-mod-http-auth-pam,
          libnginx-mod-http-cache-purge,
          libnginx-mod-http-echo,
+         libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
@@ -35,6 +36,7 @@ Depends: nginx-light,
          libnginx-mod-http-auth-pam,
          libnginx-mod-http-cache-purge,
          libnginx-mod-http-echo,
+         libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
@@ -53,6 +55,7 @@ Depends: nginx-extras,
          libnginx-mod-http-auth-pam,
          libnginx-mod-http-cache-purge,
          libnginx-mod-http-echo,
+         libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,

From 4dd8c07889e827a479bb038f5a854329b1990ccb Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 13:12:16 +0300
Subject: [PATCH 098/600] Upgrade upload-progress module to v0.9.2

---
 debian/modules/README.Modules-versions       |  3 +--
 debian/modules/nginx-upload-progress/CHANGES |  4 ++++
 debian/modules/nginx-upload-progress/config  | 12 ++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index d2537a4..b9a37e3 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -35,8 +35,7 @@ README for Modules versions
  nginx-upload-progress
   Homepage: https://github.com/masterzen/nginx-upload-progress-module
     rm -r debian/nginx-upload-progress/test
-  Version: v0.9.1
-  Dynamic: No, https://github.com/masterzen/nginx-upload-progress-module/issues/46
+  Version: v0.9.2
 
  nginx-cache-purge
   Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
diff --git a/debian/modules/nginx-upload-progress/CHANGES b/debian/modules/nginx-upload-progress/CHANGES
index f33b435..1de19aa 100644
--- a/debian/modules/nginx-upload-progress/CHANGES
+++ b/debian/modules/nginx-upload-progress/CHANGES
@@ -1,3 +1,7 @@
+nginx_upload_progress release 0.9.2                              03 Aug 2016
+
+ * Allow to build as an externally loadable module (thanks to Peter Tonoli).
+
 nginx_upload_progress release 0.9.0                              06 Apr 2012
 
  * INCOMPATIBLE CHANGE: JSONP is now the default output for nginx upload
diff --git a/debian/modules/nginx-upload-progress/config b/debian/modules/nginx-upload-progress/config
index 5cf6fa1..364af8c 100644
--- a/debian/modules/nginx-upload-progress/config
+++ b/debian/modules/nginx-upload-progress/config
@@ -1,3 +1,11 @@
 ngx_addon_name=ngx_http_uploadprogress_module
-HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES ngx_http_uploadprogress_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_uploadprogress_module.c"
+if test -n "$ngx_module_link"; then
+    ngx_module_type=FILTER
+    ngx_module_name=ngx_http_uploadprogress_module
+    ngx_module_srcs="$ngx_addon_dir/ngx_http_uploadprogress_module.c"
+
+    . auto/module
+else
+    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES ngx_http_uploadprogress_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_uploadprogress_module.c"
+fi

From 577178cdffd44bd01896d6ed0dc489d37764a16c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 13:18:37 +0300
Subject: [PATCH 099/600] mod: Convert upload progress module to dynamic

---
 debian/control                                      | 12 ++++++++++++
 debian/libnginx-mod-http-uploadprogress.nginx       | 13 +++++++++++++
 .../libnginx-mod.conf/mod-http-uploadprogress.conf  |  1 +
 debian/rules                                        |  4 ++--
 debian/tests/control                                |  3 +++
 5 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100755 debian/libnginx-mod-http-uploadprogress.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-uploadprogress.conf

diff --git a/debian/control b/debian/control
index 1eb6d70..7f2bb3e 100644
--- a/debian/control
+++ b/debian/control
@@ -196,6 +196,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-headers-more-filter (= ${binary:Version}),
          libnginx-mod-http-cache-purge (= ${binary:Version}),
          libnginx-mod-http-fancyindex (= ${binary:Version}),
+         libnginx-mod-http-uploadprogress (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -404,3 +405,14 @@ Description: Fancy indexes module for the Nginx
  The Fancy Index module makes possible the generation of file listings, like
  the built-in autoindex module does, but adding a touch of style by introducing
  ways to customize the result.
+
+Package: libnginx-mod-http-uploadprogress
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Upload progress system for Nginx
+ Upload progress module is an implementation of an upload progress system, that
+ monitors RFC1867 POST uploads as they are transmitted to upstream servers.
+ .
+ It works by tracking the uploads proxied by Nginx to upstream servers without
+ analysing the uploaded content and offers a web API to report upload progress
+ in Javscript, Json or any other format.
diff --git a/debian/libnginx-mod-http-uploadprogress.nginx b/debian/libnginx-mod-http-uploadprogress.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-uploadprogress.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-uploadprogress.conf b/debian/libnginx-mod.conf/mod-http-uploadprogress.conf
new file mode 100644
index 0000000..edc0c0b
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-uploadprogress.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_uploadprogress_module.so;
diff --git a/debian/rules b/debian/rules
index 7a15973..adbbd42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter http-cache-purge http-fancyindex
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter http-cache-purge http-fancyindex http-uploadprogress
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -114,7 +114,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/ngx-fancyindex \
 			--add-dynamic-module=$(MODULESDIR)/nchan \
 			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
-			--add-module=$(MODULESDIR)/nginx-upload-progress \
+			--add-dynamic-module=$(MODULESDIR)/nginx-upload-progress \
 			--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
 			--add-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
 
diff --git a/debian/tests/control b/debian/tests/control
index ddc1e4e..e5a4d83 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -23,6 +23,7 @@ Depends: nginx-full,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
+         libnginx-mod-http-uploadprogress,
          libnginx-mod-http-upstream-fair,
          libnginx-mod-http-xslt-filter,
          libnginx-mod-mail,
@@ -42,6 +43,7 @@ Depends: nginx-light,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
+         libnginx-mod-http-uploadprogress,
          libnginx-mod-http-upstream-fair,
          libnginx-mod-http-xslt-filter,
          libnginx-mod-mail,
@@ -61,6 +63,7 @@ Depends: nginx-extras,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
+         libnginx-mod-http-uploadprogress,
          libnginx-mod-http-upstream-fair,
          libnginx-mod-http-xslt-filter,
          libnginx-mod-mail,

From 3381e6e548c38039b44b5a77464dfe87bb840927 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 14:44:11 +0300
Subject: [PATCH 100/600] mod: Convert substitution module to dynamic

---
 debian/control                                   | 11 +++++++++++
 debian/libnginx-mod-http-subs-filter.nginx       | 13 +++++++++++++
 .../libnginx-mod.conf/mod-http-subs-filter.conf  |  1 +
 debian/modules/README.Modules-versions           |  3 +--
 .../ngx_http_substitutions_filter_module/config  | 16 ++++++++++++++--
 debian/rules                                     |  6 +++---
 debian/tests/control                             |  3 +++
 7 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100755 debian/libnginx-mod-http-subs-filter.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-subs-filter.conf

diff --git a/debian/control b/debian/control
index 7f2bb3e..c986066 100644
--- a/debian/control
+++ b/debian/control
@@ -92,6 +92,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-echo (= ${binary:Version}),
          libnginx-mod-http-upstream-fair (= ${binary:Version}),
+         libnginx-mod-http-subs-filter (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -197,6 +198,7 @@ Depends: nginx-common (= ${source:Version}),
          libnginx-mod-http-cache-purge (= ${binary:Version}),
          libnginx-mod-http-fancyindex (= ${binary:Version}),
          libnginx-mod-http-uploadprogress (= ${binary:Version}),
+         libnginx-mod-http-subs-filter (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -416,3 +418,12 @@ Description: Upload progress system for Nginx
  It works by tracking the uploads proxied by Nginx to upstream servers without
  analysing the uploaded content and offers a web API to report upload progress
  in Javscript, Json or any other format.
+
+Package: libnginx-mod-http-subs-filter
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Substitution filter module for Nginx
+ Subsitution Nginx module can do both regular expression and fixed string
+ substitutions on response bodies. The module is quite different from Nginx's
+ native Substitution module. It scans the output chains buffer and
+ matches string line by line, just like Apache's mod_substitute.
diff --git a/debian/libnginx-mod-http-subs-filter.nginx b/debian/libnginx-mod-http-subs-filter.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-subs-filter.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-subs-filter.conf b/debian/libnginx-mod.conf/mod-http-subs-filter.conf
new file mode 100644
index 0000000..fe34b6c
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-subs-filter.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_subs_filter_module.so;
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index b9a37e3..a87f25d 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -52,5 +52,4 @@ README for Modules versions
 
  ngx_http_substitutions_filter_module
   Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
-  Version: v0.6.4
-  Dynamic: No, https://github.com/yaoweibin/ngx_http_substitutions_filter_module/pull/19
+  Version: v0.6.4+pull/19
diff --git a/debian/modules/ngx_http_substitutions_filter_module/config b/debian/modules/ngx_http_substitutions_filter_module/config
index fdb016c..f1de029 100644
--- a/debian/modules/ngx_http_substitutions_filter_module/config
+++ b/debian/modules/ngx_http_substitutions_filter_module/config
@@ -1,3 +1,15 @@
 ngx_addon_name=ngx_http_subs_filter_module
-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP_FILTER
+    ngx_module_name=ngx_http_subs_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs="$ngx_addon_dir/ngx_http_subs_filter_module.c"
+    ngx_module_libs=""
+
+    . auto/module
+else
+    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
+fi
diff --git a/debian/rules b/debian/rules
index adbbd42..8ae25ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter http-cache-purge http-fancyindex http-uploadprogress
+DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter http-cache-purge http-fancyindex http-uploadprogress http-subs-filter
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -85,7 +85,7 @@ full_configure_flags := \
 			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
 			--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
-			--add-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
+			--add-dynamic-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
 
 extras_configure_flags := \
 			$(common_configure_flags) \
@@ -116,7 +116,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
 			--add-dynamic-module=$(MODULESDIR)/nginx-upload-progress \
 			--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
-			--add-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
+			--add-dynamic-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
 
 %:
 	dh $@ --with systemd
diff --git a/debian/tests/control b/debian/tests/control
index e5a4d83..86a0da7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -23,6 +23,7 @@ Depends: nginx-full,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
+         libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
          libnginx-mod-http-upstream-fair,
          libnginx-mod-http-xslt-filter,
@@ -43,6 +44,7 @@ Depends: nginx-light,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
+         libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
          libnginx-mod-http-upstream-fair,
          libnginx-mod-http-xslt-filter,
@@ -63,6 +65,7 @@ Depends: nginx-extras,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
          libnginx-mod-http-perl,
+         libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
          libnginx-mod-http-upstream-fair,
          libnginx-mod-http-xslt-filter,

From 14e6282c9bfec49372025158a42dba4dc1b1b44d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 16:12:37 +0300
Subject: [PATCH 101/600] Update d/changelog

---
 debian/changelog | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c253a7..9d34e8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,26 @@ nginx (1.10.1-2) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis ]
   * debian/control:
-    Don't allow building against liblua5.1-0-dev on architectures
-    that libluajit is available.
+    + Don't allow building against liblua5.1-0-dev on architectures
+      that libluajit is available.
     + Enable slice module on all flavors. (Closes: #815080)
-  * debian/modules/nginx-lua:
-    + Update nginx-lua to v0.10.6
+    + Enable SCGI & uWSGI module for nginx-light.
+    + Convert to dynamic module packages:
+      o libnginx-mod-nchan
+      o libnginx-mod-http-echo
+      o libnginx-mod-http-upstream-fair
+      o libnginx-mod-http-headers-more-filter
+      o libnginx-mod-http-cache-purge
+      o libnginx-mod-http-fancyindex
+      o libnginx-mod-http-uploadprogress
+      o libnginx-mod-http-subs-filter
+  * debian/modules:
+    + Replace http-push with nchan v1.0.2 (Closes: #836134)
+    + Upgrade nginx-lua to v0.10.6
+    + Upgrade nginx-echo to v0.60
+    + Upgrade headers-more to v0.31
+    + Upgrade fancyindex to v0.4.1
+    + Upgrade upload-progress to v0.9.2
 
   [ Michael Lustfield ]
   * debian/patches/0003-*.patch:

From 3953784152f876fdcdf8e838651432d560aec031 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 Aug 2016 14:48:28 +0300
Subject: [PATCH 102/600] wrap-and-sort

---
 debian/control              | 58 ++++++++++++++++++-------------------
 debian/nginx-common.dirs    |  8 ++---
 debian/nginx-common.install |  4 +--
 debian/rules                | 19 +++++++++++-
 4 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/debian/control b/debian/control
index c986066..cd18cbc 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,9 @@ Build-Depends: autotools-dev,
                libexpat-dev,
                libgd-dev,
                libgeoip-dev,
-               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel],
+               libhiredis-dev,
                liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !armel !armhf !powerpc !powerpcspe !mips !mipsel],
+               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel],
                libmhash-dev,
                libpam0g-dev,
                libpcre3-dev,
@@ -24,8 +25,7 @@ Build-Depends: autotools-dev,
                libssl-dev,
                libxslt1-dev,
                po-debconf,
-               zlib1g-dev,
-               libhiredis-dev
+               zlib1g-dev
 Standards-Version: 3.9.8.0
 Homepage: http://nginx.net
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/nginx.git
@@ -33,12 +33,8 @@ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nginx.git
 
 Package: nginx
 Architecture: all
-Depends: nginx-full   (>= ${source:Version}) |
-         nginx-light  (>= ${source:Version}) |
-         nginx-extras (>= ${source:Version}) ,
-         nginx-full   (<< ${source:Version}.1~) |
-         nginx-light  (<< ${source:Version}.1~) |
-         nginx-extras (<< ${source:Version}.1~) ,
+Depends: nginx-full (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
+         nginx-full (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version}),
          ${misc:Depends}
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -83,16 +79,16 @@ Description: small, powerful, scalable web/proxy server - common files
 
 Package: nginx-full
 Architecture: any
-Depends: nginx-common (= ${source:Version}),
+Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
+         libnginx-mod-http-echo (= ${binary:Version}),
          libnginx-mod-http-geoip (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
+         libnginx-mod-http-subs-filter (= ${binary:Version}),
+         libnginx-mod-http-upstream-fair (= ${binary:Version}),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
-         libnginx-mod-http-auth-pam (= ${binary:Version}),
-         libnginx-mod-http-echo (= ${binary:Version}),
-         libnginx-mod-http-upstream-fair (= ${binary:Version}),
-         libnginx-mod-http-subs-filter (= ${binary:Version}),
+         nginx-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -139,8 +135,8 @@ Description: nginx web/proxy server (standard version) - debugging symbols
 Package: nginx-light
 Architecture: any
 Priority: extra
-Depends: nginx-common (= ${source:Version}),
-         libnginx-mod-http-echo (= ${binary:Version}),
+Depends: libnginx-mod-http-echo (= ${binary:Version}),
+         nginx-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -182,23 +178,23 @@ Description: nginx web/proxy server (basic version) - debugging symbols
 Package: nginx-extras
 Architecture: any
 Priority: extra
-Depends: nginx-common (= ${source:Version}),
+Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
+         libnginx-mod-http-cache-purge (= ${binary:Version}),
+         libnginx-mod-http-echo (= ${binary:Version}),
+         libnginx-mod-http-fancyindex (= ${binary:Version}),
          libnginx-mod-http-geoip (= ${binary:Version}),
+         libnginx-mod-http-headers-more-filter (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
-         libnginx-mod-http-xslt-filter (= ${binary:Version}),
-         libnginx-mod-mail (= ${binary:Version}),
-         libnginx-mod-stream (= ${binary:Version}),
-         libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-lua (= ${binary:Version}),
          libnginx-mod-http-perl (= ${binary:Version}),
-         libnginx-mod-nchan (= ${binary:Version}),
-         libnginx-mod-http-echo (= ${binary:Version}),
-         libnginx-mod-http-upstream-fair (= ${binary:Version}),
-         libnginx-mod-http-headers-more-filter (= ${binary:Version}),
-         libnginx-mod-http-cache-purge (= ${binary:Version}),
-         libnginx-mod-http-fancyindex (= ${binary:Version}),
-         libnginx-mod-http-uploadprogress (= ${binary:Version}),
          libnginx-mod-http-subs-filter (= ${binary:Version}),
+         libnginx-mod-http-uploadprogress (= ${binary:Version}),
+         libnginx-mod-http-upstream-fair (= ${binary:Version}),
+         libnginx-mod-http-xslt-filter (= ${binary:Version}),
+         libnginx-mod-mail (= ${binary:Version}),
+         libnginx-mod-nchan (= ${binary:Version}),
+         libnginx-mod-stream (= ${binary:Version}),
+         nginx-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -295,7 +291,7 @@ Description: Stream module for Nginx
 
 Package: libnginx-mod-http-perl
 Architecture: any
-Depends: ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Replaces: nginx-extras (<< 1.9.14-1)
 Description: Perl module for Nginx
  Embed Perl runtime into nginx.
@@ -316,7 +312,9 @@ Description: PAM authentication module for Nginx
 
 Package: libnginx-mod-http-lua
 Architecture: any
-Depends: libnginx-mod-http-ndk (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libnginx-mod-http-ndk (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: LUA module for Nginx
  Embed LUA runtime into nginx.
  .
diff --git a/debian/nginx-common.dirs b/debian/nginx-common.dirs
index 8ee01f5..65bb651 100644
--- a/debian/nginx-common.dirs
+++ b/debian/nginx-common.dirs
@@ -1,13 +1,13 @@
 etc/nginx
-etc/nginx/sites-available
-etc/nginx/sites-enabled
+etc/nginx/conf.d
 etc/nginx/modules-available
 etc/nginx/modules-enabled
-etc/nginx/conf.d
+etc/nginx/sites-available
+etc/nginx/sites-enabled
 etc/ufw/applications.d
 usr/share/nginx
 usr/share/vim/addons
 usr/share/vim/registry
-var/log/nginx
 var/lib/nginx
+var/log/nginx
 var/www/html
diff --git a/debian/nginx-common.install b/debian/nginx-common.install
index a114903..90f173b 100644
--- a/debian/nginx-common.install
+++ b/debian/nginx-common.install
@@ -1,5 +1,5 @@
+contrib/vim/* usr/share/vim/addons
 debian/conf/* etc/nginx
 debian/ufw/nginx etc/ufw/applications.d
-html/index.html usr/share/nginx/html/
 debian/vim/nginx.yaml usr/share/vim/registry
-contrib/vim/* usr/share/vim/addons
+html/index.html usr/share/nginx/html/
diff --git a/debian/rules b/debian/rules
index 8ae25ac..b453c47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,24 @@ DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
-DYN_MODS := http-geoip http-image-filter http-xslt-filter mail stream http-auth-pam http-lua http-perl http-ndk nchan http-echo http-upstream-fair http-headers-more-filter http-cache-purge http-fancyindex http-uploadprogress http-subs-filter
+DYN_MODS := \
+	http-auth-pam \
+	http-cache-purge \
+	http-echo \
+	http-fancyindex \
+	http-geoip \
+	http-headers-more-filter \
+	http-image-filter \
+	http-lua \
+	http-ndk \
+	http-perl \
+	http-subs-filter \
+	http-uploadprogress \
+	http-upstream-fair \
+	http-xslt-filter \
+	mail \
+	nchan \
+	stream
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)

From 3f6df9e7065699a77f247d3f73196c1313334b40 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 6 Sep 2016 11:07:34 +0300
Subject: [PATCH 103/600] Release 1.10.1-2

---
 debian/changelog         | 4 ++--
 debian/nginx-extras.NEWS | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d34e8c..7022476 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.10.1-2) UNRELEASED; urgency=medium
+nginx (1.10.1-2) unstable; urgency=medium
 
   [ Christos Trochalakis ]
   * debian/control:
@@ -31,7 +31,7 @@ nginx (1.10.1-2) UNRELEASED; urgency=medium
     + Make nginx-*.postinst use invoke-rc.d. (Closes: #823435)
       Thanks Simon Deziel for the patch.
 
- -- Michael Lustfield <michael@lustfield.net>  Sat, 16 Jul 2016 17:24:40 -0700
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 06 Sep 2016 11:06:26 +0300
 
 nginx (1.10.1-1) unstable; urgency=medium
 
diff --git a/debian/nginx-extras.NEWS b/debian/nginx-extras.NEWS
index 55c9701..d4fff37 100644
--- a/debian/nginx-extras.NEWS
+++ b/debian/nginx-extras.NEWS
@@ -1,4 +1,4 @@
-nginx-extras (1.10.1-2) UNRELEASED; urgency=medium
+nginx-extras (1.10.1-2) unstable; urgency=medium
 
   Starting with this release the HTTP Push module has been replaced by Nchan.
   More info for the upgrade can be found at https://nchan.slact.net/upgrade.

From 8b6e35fe350490f7ed6bed0477372cd5bfa8e6df Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 13 Sep 2016 14:21:06 +0300
Subject: [PATCH 104/600] Drop nginx-*-dbg packages

Switch to autogenerated -dbgsym packages.
---
 debian/changelog |  7 +++++++
 debian/control   | 44 --------------------------------------------
 debian/rules     |  2 +-
 3 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7022476..9704e83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.10.1-3) UNRELEASED; urgency=medium
+
+  * debian/control:
+    + Drop nginx-*-dbg packages in favor of autogenerated -dbgsym packages.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 14 Sep 2016 10:43:41 +0300
+
 nginx (1.10.1-2) unstable; urgency=medium
 
   [ Christos Trochalakis ]
diff --git a/debian/control b/debian/control
index cd18cbc..64e219f 100644
--- a/debian/control
+++ b/debian/control
@@ -118,20 +118,6 @@ Description: nginx web/proxy server (standard version)
  THIRD PARTY MODULES: Auth PAM, DAV Ext, Echo, HTTP Substitutions, Upstream
  Fair Queue.
 
-Package: nginx-full-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: nginx-full (= ${binary:Version}), ${misc:Depends}
-Conflicts: nginx-extras-dbg, nginx-light-dbg
-Description: nginx web/proxy server (standard version) - debugging symbols
- Nginx ("engine X") is a high-performance web and reverse proxy server
- created by Igor Sysoev. It can be used both as a standalone web server
- and as a proxy to reduce the load on back-end HTTP or mail servers.
- .
- This package provides debugging symbols for nginx-full, to assist in debugging
- issues that you may find. It should not be required for normal operation.
-
 Package: nginx-light
 Architecture: any
 Priority: extra
@@ -160,21 +146,6 @@ Description: nginx web/proxy server (basic version)
  .
  THIRD PARTY MODULES: Echo.
 
-Package: nginx-light-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: nginx-light (= ${binary:Version}), ${misc:Depends}
-Conflicts: nginx-extras-dbg, nginx-full-dbg
-Description: nginx web/proxy server (basic version) - debugging symbols
- Nginx ("engine X") is a high-performance web and reverse proxy server
- created by Igor Sysoev. It can be used both as a standalone web server
- and as a proxy to reduce the load on back-end HTTP or mail servers.
- .
- This package provides debugging symbols for nginx-light, to assist in
- debugging issues that you may find. It should not be required for normal
- operation.
-
 Package: nginx-extras
 Architecture: any
 Priority: extra
@@ -225,21 +196,6 @@ Description: nginx web/proxy server (extended version)
  Headers More, Embedded Lua, HTTP Substitutions, Nchan, Upload Progress,
  Upstream Fair Queue.
 
-Package: nginx-extras-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: nginx-extras (= ${binary:Version}), ${misc:Depends}
-Conflicts: nginx-full-dbg, nginx-light-dbg
-Description: nginx web/proxy server (extended version) - debugging symbols
- Nginx ("engine X") is a high-performance web and reverse proxy server
- created by Igor Sysoev. It can be used both as a standalone web server
- and as a proxy to reduce the load on back-end HTTP or mail servers.
- .
- This package provides debugging symbols for nginx-extras, to assist in
- debugging issues that you may find. It should not be required for normal
- operation.
-
 Package: libnginx-mod-http-geoip
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index b453c47..7547660 100755
--- a/debian/rules
+++ b/debian/rules
@@ -161,7 +161,7 @@ build.arch.%:
 	$(MAKE) -C $(BUILDDIR_$*) build
 
 strip.arch.%:
-	dh_strip --package=nginx-$(*) --dbg-package=nginx-$(*)-dbg
+	dh_strip --package=nginx-$(*) -O--dbgsym-migration='nginx-$(*)-dbg (<< 1.10.1-3~)'
 
 strip.mods.%:
 	dh_strip --package=libnginx-mod-$(*) -O--automatic-dbgsym

From 0570da941eed18d6e3ec8bcde591a8315931c470 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 14 Sep 2016 10:36:04 +0300
Subject: [PATCH 105/600] Remove relic Breaks/Replaces used for squeeze
 upgrades

---
 debian/changelog | 1 +
 debian/control   | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9704e83..6220dea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nginx (1.10.1-3) UNRELEASED; urgency=medium
 
   * debian/control:
     + Drop nginx-*-dbg packages in favor of autogenerated -dbgsym packages.
+    + Remove relic Breaks/Replaces from nginx-common.
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 14 Sep 2016 10:43:41 +0300
 
diff --git a/debian/control b/debian/control
index 64e219f..11198ca 100644
--- a/debian/control
+++ b/debian/control
@@ -60,14 +60,6 @@ Package: nginx-common
 Architecture: all
 Multi-Arch: foreign
 Depends: lsb-base (>= 3.2-14), ${misc:Depends}
-Replaces: nginx (<< 0.8.54-4),
-          nginx-extras (<< 0.8.54-4),
-          nginx-full (<< 0.8.54-4),
-          nginx-light (<< 0.8.54-4)
-Breaks: nginx (<< 0.8.54-4),
-        nginx-extras (<< 0.8.54-4),
-        nginx-full (<< 0.8.54-4),
-        nginx-light (<< 0.8.54-4)
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server

From b624187e45ce20790954e4bd24d61b6243538bd6 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 14 Sep 2016 10:37:47 +0300
Subject: [PATCH 106/600] Fix lsb-base deps

 o nginx-doc doesn't need lsb-base.
 o relax nginx-common dependency, any recent version should work.
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6220dea..8564a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nginx (1.10.1-3) UNRELEASED; urgency=medium
   * debian/control:
     + Drop nginx-*-dbg packages in favor of autogenerated -dbgsym packages.
     + Remove relic Breaks/Replaces from nginx-common.
+    + Fix lsb-base dependencies.
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 14 Sep 2016 10:43:41 +0300
 
diff --git a/debian/control b/debian/control
index 11198ca..b08be6a 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,7 @@ Package: nginx-doc
 Architecture: all
 Multi-Arch: foreign
 Section: doc
-Depends: lsb-base (>= 3.2-14), ${misc:Depends}
+Depends: ${misc:Depends}
 Description: small, powerful, scalable web/proxy server - documentation
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
@@ -59,7 +59,7 @@ Description: small, powerful, scalable web/proxy server - documentation
 Package: nginx-common
 Architecture: all
 Multi-Arch: foreign
-Depends: lsb-base (>= 3.2-14), ${misc:Depends}
+Depends: lsb-base, ${misc:Depends}
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server

From 725adf41f2325c853914a2e2e029a22119e5eb93 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 7 Sep 2016 14:31:11 +0300
Subject: [PATCH 107/600] Switch Maintainer to the Debian Nginx Maintainers
 list

Keep all active maintainers as Uploaders.
---
 debian/changelog | 5 ++++-
 debian/control   | 7 ++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8564a16..a787dc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ nginx (1.10.1-3) UNRELEASED; urgency=medium
     + Drop nginx-*-dbg packages in favor of autogenerated -dbgsym packages.
     + Remove relic Breaks/Replaces from nginx-common.
     + Fix lsb-base dependencies.
+    + Switch Maintainer to the Nginx Packaging Team and keep active maintainers
+      as uploaders. Jose, Fabio, Dmitry & Cyril, thanks a lot for all your
+      contributions!
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 14 Sep 2016 10:43:41 +0300
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 06 Sep 2016 15:06:47 +0300
 
 nginx (1.10.1-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index b08be6a..baa4b52 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,9 @@
 Source: nginx
 Section: httpd
 Priority: optional
-Maintainer: Kartik Mistry <kartik@debian.org>
-Uploaders: Jose Parrella <bureado@debian.org>,
-           Fabio Tranchitella <kobold@debian.org>,
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@lists.alioth.debian.org>
+Uploaders: Kartik Mistry <kartik@debian.org>,
            Michael Lustfield <michael@lustfield.net>,
-           Dmitry E. Oboukhov <unera@debian.org>,
-           Cyril Lavier <cyril.lavier@davromaniak.eu>,
            Christos Trochalakis <yatiohi@ideopolis.gr>
 Build-Depends: autotools-dev,
                debhelper (>= 9),

From 255d6d4e4a63e891153bc9bc7a9410351c39a639 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 15 Sep 2016 15:21:11 +0300
Subject: [PATCH 108/600] Release 1.10.1-3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a787dc6..0d59634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.10.1-3) UNRELEASED; urgency=medium
+nginx (1.10.1-3) unstable; urgency=medium
 
   * debian/control:
     + Drop nginx-*-dbg packages in favor of autogenerated -dbgsym packages.
@@ -8,7 +8,7 @@ nginx (1.10.1-3) UNRELEASED; urgency=medium
       as uploaders. Jose, Fabio, Dmitry & Cyril, thanks a lot for all your
       contributions!
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 06 Sep 2016 15:06:47 +0300
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 15 Sep 2016 15:20:58 +0300
 
 nginx (1.10.1-2) unstable; urgency=medium
 

From 42f5c9e7b475ee71e5bda337dd18474c54a101ac Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 16 Sep 2016 12:54:01 +0300
Subject: [PATCH 109/600] New upstream version 1.11.4

---
 CHANGES                                       |   30 +
 CHANGES.ru                                    |   29 +
 auto/modules                                  |   12 +
 auto/options                                  |    3 +
 contrib/unicode2nginx/unicode-to-nginx.pl     |    7 +-
 src/core/nginx.h                              |    4 +-
 src/core/ngx_inet.c                           |   87 +
 src/core/ngx_inet.h                           |    1 +
 src/core/ngx_thread_pool.c                    |    7 +
 src/event/ngx_event_connect.c                 |    2 +-
 src/event/ngx_event_openssl.c                 |   63 +-
 src/event/ngx_event_openssl_stapling.c        |    3 +
 src/event/ngx_event_pipe.c                    |   12 +-
 src/http/modules/ngx_http_geo_module.c        |   50 +-
 src/http/modules/ngx_http_limit_req_module.c  |   14 +-
 src/http/modules/ngx_http_realip_module.c     |    2 +-
 src/http/modules/ngx_http_ssi_filter_module.c |   10 +-
 src/http/ngx_http_core_module.c               |  134 +-
 src/http/ngx_http_upstream.c                  |   22 +-
 src/http/ngx_http_upstream.h                  |    1 +
 src/mail/ngx_mail.h                           |    4 +-
 src/mail/ngx_mail_core_module.c               |    9 +
 src/os/unix/ngx_posix_init.c                  |    6 +-
 src/os/unix/ngx_process_cycle.c               |    4 +-
 src/stream/ngx_stream.c                       |    2 +
 src/stream/ngx_stream.h                       |   33 +-
 src/stream/ngx_stream_core_module.c           |   31 +
 src/stream/ngx_stream_geo_module.c            |   40 +-
 src/stream/ngx_stream_handler.c               |  238 ++-
 src/stream/ngx_stream_log_module.c            | 1474 +++++++++++++++++
 src/stream/ngx_stream_proxy_module.c          |  129 +-
 src/stream/ngx_stream_realip_module.c         |  342 ++++
 src/stream/ngx_stream_return_module.c         |   14 +-
 src/stream/ngx_stream_script.c                |   67 +
 src/stream/ngx_stream_script.h                |    4 +
 src/stream/ngx_stream_upstream.c              |  236 ++-
 src/stream/ngx_stream_upstream.h              |   12 +
 src/stream/ngx_stream_variables.c             |  143 +-
 38 files changed, 3005 insertions(+), 276 deletions(-)
 create mode 100644 src/stream/ngx_stream_log_module.c
 create mode 100644 src/stream/ngx_stream_realip_module.c

diff --git a/CHANGES b/CHANGES
index a795ef2..2ea8d8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,34 @@
 
+Changes with nginx 1.11.4                                        13 Sep 2016
+
+    *) Feature: the $upstream_bytes_received variable.
+
+    *) Feature: the $bytes_received, $session_time, $protocol, $status,
+       $upstream_addr, $upstream_bytes_sent, $upstream_bytes_received,
+       $upstream_connect_time, $upstream_first_byte_time, and
+       $upstream_session_time variables in the stream module.
+
+    *) Feature: the ngx_stream_log_module.
+
+    *) Feature: the "proxy_protocol" parameter of the "listen" directive,
+       the $proxy_protocol_addr and $proxy_protocol_port variables in the
+       stream module.
+
+    *) Feature: the ngx_stream_realip_module.
+
+    *) Bugfix: nginx could not be built with the stream module and the
+       ngx_http_ssl_module, but without ngx_stream_ssl_module; the bug had
+       appeared in 1.11.3.
+
+    *) Feature: the IP_BIND_ADDRESS_NO_PORT socket option was not used; the
+       bug had appeared in 1.11.2.
+
+    *) Bugfix: in the "ranges" parameter of the "geo" directive.
+
+    *) Bugfix: an incorrect response might be returned when using the "aio
+       threads" and "sendfile" directives; the bug had appeared in 1.9.13.
+
+
 Changes with nginx 1.11.3                                        26 Jul 2016
 
     *) Change: now the "accept_mutex" directive is turned off by default.
diff --git a/CHANGES.ru b/CHANGES.ru
index cd424e9..28ac2d8 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,33 @@
 
+Изменения в nginx 1.11.4                                          13.09.2016
+
+    *) Добавление: переменная $upstream_bytes_received.
+
+    *) Добавление: переменные $bytes_received, $session_time, $protocol,
+       $status, $upstream_addr, $upstream_bytes_sent,
+       $upstream_bytes_received, $upstream_connect_time,
+       $upstream_first_byte_time и $upstream_session_time в модуле stream.
+
+    *) Добавление: модуль ngx_stream_log_module.
+
+    *) Добавление: параметр proxy_protocol в директиве listen, переменные
+       $proxy_protocol_addr и $proxy_protocol_port в модуле stream.
+
+    *) Добавление: модуль ngx_stream_realip_module.
+
+    *) Исправление: nginx не собирался с модулем stream и модулем
+       ngx_http_ssl_module, но без модуля ngx_stream_ssl_module; ошибка
+       появилась в 1.11.3.
+
+    *) Добавление: опция сокета IP_BIND_ADDRESS_NO_PORT не использовалась;
+       ошибка появилась в 1.11.2.
+
+    *) Исправление: в параметре ranges директивы geo.
+
+    *) Исправление: при использовании директив "aio threads" и sendfile мог
+       возвращаться некорректный ответ; ошибка появилась в 1.9.13.
+
+
 Изменения в nginx 1.11.3                                          26.07.2016
 
     *) Изменение: теперь accept_mutex по умолчанию выключен.
diff --git a/auto/modules b/auto/modules
index 614037c..433767a 100644
--- a/auto/modules
+++ b/auto/modules
@@ -971,6 +971,7 @@ if [ $STREAM != NO ]; then
 
     ngx_module_name="ngx_stream_module \
                      ngx_stream_core_module \
+                     ngx_stream_log_module \
                      ngx_stream_proxy_module \
                      ngx_stream_upstream_module"
     ngx_module_incs="src/stream"
@@ -984,6 +985,7 @@ if [ $STREAM != NO ]; then
                      src/stream/ngx_stream_script.c \
                      src/stream/ngx_stream_handler.c \
                      src/stream/ngx_stream_core_module.c \
+                     src/stream/ngx_stream_log_module.c \
                      src/stream/ngx_stream_proxy_module.c \
                      src/stream/ngx_stream_upstream.c \
                      src/stream/ngx_stream_upstream_round_robin.c"
@@ -1005,6 +1007,16 @@ if [ $STREAM != NO ]; then
         . auto/module
     fi
 
+    if [ $STREAM_REALIP = YES ]; then
+        ngx_module_name=ngx_stream_realip_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_realip_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_REALIP
+
+        . auto/module
+    fi
+
     if [ $STREAM_LIMIT_CONN = YES ]; then
         ngx_module_name=ngx_stream_limit_conn_module
         ngx_module_deps=
diff --git a/auto/options b/auto/options
index a8fce30..73149d9 100644
--- a/auto/options
+++ b/auto/options
@@ -115,6 +115,7 @@ MAIL_SMTP=YES
 
 STREAM=NO
 STREAM_SSL=NO
+STREAM_REALIP=NO
 STREAM_LIMIT_CONN=YES
 STREAM_ACCESS=YES
 STREAM_GEO=YES
@@ -296,6 +297,7 @@ use the \"--with-mail_ssl_module\" option instead"
         --with-stream)                   STREAM=YES                 ;;
         --with-stream=dynamic)           STREAM=DYNAMIC             ;;
         --with-stream_ssl_module)        STREAM_SSL=YES             ;;
+        --with-stream_realip_module)     STREAM_REALIP=YES          ;;
         --with-stream_geoip_module)      STREAM_GEOIP=YES           ;;
         --with-stream_geoip_module=dynamic)
                                          STREAM_GEOIP=DYNAMIC       ;;
@@ -503,6 +505,7 @@ cat << END
   --with-stream                      enable TCP/UDP proxy module
   --with-stream=dynamic              enable dynamic TCP/UDP proxy module
   --with-stream_ssl_module           enable ngx_stream_ssl_module
+  --with-stream_realip_module        enable ngx_stream_realip_module
   --with-stream_geoip_module         enable ngx_stream_geoip_module
   --with-stream_geoip_module=dynamic enable dynamic ngx_stream_geoip_module
   --without-stream_limit_conn_module disable ngx_stream_limit_conn_module
diff --git a/contrib/unicode2nginx/unicode-to-nginx.pl b/contrib/unicode2nginx/unicode-to-nginx.pl
index daaf354..d113fed 100755
--- a/contrib/unicode2nginx/unicode-to-nginx.pl
+++ b/contrib/unicode2nginx/unicode-to-nginx.pl
@@ -10,7 +10,7 @@
 
 # Needs perl 5.6 or later.
 
-# Written by Maxim Dounin, mdounin@rambler-co.ru
+# Written by Maxim Dounin, mdounin@mdounin.ru
 
 ###############################################################################
 
@@ -33,7 +33,10 @@ while (<>) {
 
 		# Produce UTF-8 sequence from character code;
 
-		my $un_utf8 = join('', map { sprintf("%02X", $_) } unpack("C*", pack("U", hex($un_code))));
+		my $un_utf8 = join('',
+			map { sprintf("%02X", $_) }
+			unpack("U0C*", pack("U", hex($un_code)))
+		);
 
 		print "    $cs_code  $un_utf8 ; $un_name\n";
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index e303e66..7e9aae6 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011003
-#define NGINX_VERSION      "1.11.3"
+#define nginx_version      1011004
+#define NGINX_VERSION      "1.11.4"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index c4aaf3a..dbd1f46 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -465,6 +465,93 @@ ngx_ptocidr(ngx_str_t *text, ngx_cidr_t *cidr)
 }
 
 
+ngx_int_t
+ngx_cidr_match(struct sockaddr *sa, ngx_array_t *cidrs)
+{
+#if (NGX_HAVE_INET6)
+    u_char           *p;
+#endif
+    in_addr_t         inaddr;
+    ngx_cidr_t       *cidr;
+    ngx_uint_t        family, i;
+#if (NGX_HAVE_INET6)
+    ngx_uint_t        n;
+    struct in6_addr  *inaddr6;
+#endif
+
+#if (NGX_SUPPRESS_WARN)
+    inaddr = 0;
+#if (NGX_HAVE_INET6)
+    inaddr6 = NULL;
+#endif
+#endif
+
+    family = sa->sa_family;
+
+    if (family == AF_INET) {
+        inaddr = ((struct sockaddr_in *) sa)->sin_addr.s_addr;
+    }
+
+#if (NGX_HAVE_INET6)
+    else if (family == AF_INET6) {
+        inaddr6 = &((struct sockaddr_in6 *) sa)->sin6_addr;
+
+        if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
+            family = AF_INET;
+
+            p = inaddr6->s6_addr;
+
+            inaddr = p[12] << 24;
+            inaddr += p[13] << 16;
+            inaddr += p[14] << 8;
+            inaddr += p[15];
+
+            inaddr = htonl(inaddr);
+        }
+    }
+#endif
+
+    for (cidr = cidrs->elts, i = 0; i < cidrs->nelts; i++) {
+        if (cidr[i].family != family) {
+            goto next;
+        }
+
+        switch (family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            for (n = 0; n < 16; n++) {
+                if ((inaddr6->s6_addr[n] & cidr[i].u.in6.mask.s6_addr[n])
+                    != cidr[i].u.in6.addr.s6_addr[n])
+                {
+                    goto next;
+                }
+            }
+            break;
+#endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+        case AF_UNIX:
+            break;
+#endif
+
+        default: /* AF_INET */
+            if ((inaddr & cidr[i].u.in.mask) != cidr[i].u.in.addr) {
+                goto next;
+            }
+            break;
+        }
+
+        return NGX_OK;
+
+    next:
+        continue;
+    }
+
+    return NGX_DECLINED;
+}
+
+
 ngx_int_t
 ngx_parse_addr(ngx_pool_t *pool, ngx_addr_t *addr, u_char *text, size_t len)
 {
diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h
index 97dc354..538771e 100644
--- a/src/core/ngx_inet.h
+++ b/src/core/ngx_inet.h
@@ -113,6 +113,7 @@ size_t ngx_sock_ntop(struct sockaddr *sa, socklen_t socklen, u_char *text,
     size_t len, ngx_uint_t port);
 size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len);
 ngx_int_t ngx_ptocidr(ngx_str_t *text, ngx_cidr_t *cidr);
+ngx_int_t ngx_cidr_match(struct sockaddr *sa, ngx_array_t *cidrs);
 ngx_int_t ngx_parse_addr(ngx_pool_t *pool, ngx_addr_t *addr, u_char *text,
     size_t len);
 ngx_int_t ngx_parse_addr_port(ngx_pool_t *pool, ngx_addr_t *addr,
diff --git a/src/core/ngx_thread_pool.c b/src/core/ngx_thread_pool.c
index f3655aa..7fb0f7f 100644
--- a/src/core/ngx_thread_pool.c
+++ b/src/core/ngx_thread_pool.c
@@ -137,6 +137,13 @@ ngx_thread_pool_init(ngx_thread_pool_t *tp, ngx_log_t *log, ngx_pool_t *pool)
         return NGX_ERROR;
     }
 
+    err = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+    if (err) {
+        ngx_log_error(NGX_LOG_ALERT, log, err,
+                      "pthread_attr_setdetachstate() failed");
+        return NGX_ERROR;
+    }
+
 #if 0
     err = pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
     if (err) {
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 30cb59a..06534ef 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -91,7 +91,7 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
 #endif
 
 #if (NGX_HAVE_IP_BIND_ADDRESS_NO_PORT || NGX_LINUX)
-        port = ngx_inet_get_port(pc->sockaddr);
+        port = ngx_inet_get_port(pc->local->sockaddr);
 #endif
 
 #if (NGX_HAVE_IP_BIND_ADDRESS_NO_PORT)
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index bb9a900..1cbfdf2 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -118,9 +118,7 @@ ngx_ssl_init(ngx_log_t *log)
 
 #else
 
-#ifndef OPENSSL_IS_BORINGSSL
     OPENSSL_config(NULL);
-#endif
 
     SSL_library_init();
     SSL_load_error_strings();
@@ -2023,7 +2021,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
             || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              /*  151 */
             || n == SSL_R_EXCESSIVE_MESSAGE_SIZE                     /*  152 */
             || n == SSL_R_LENGTH_MISMATCH                            /*  159 */
+#ifdef SSL_R_NO_CIPHERS_PASSED
             || n == SSL_R_NO_CIPHERS_PASSED                          /*  182 */
+#endif
             || n == SSL_R_NO_CIPHERS_SPECIFIED                       /*  183 */
             || n == SSL_R_NO_COMPRESSION_SPECIFIED                   /*  187 */
             || n == SSL_R_NO_SHARED_CIPHER                           /*  193 */
@@ -2941,13 +2941,6 @@ failed:
 }
 
 
-#ifdef OPENSSL_NO_SHA256
-#define ngx_ssl_session_ticket_md  EVP_sha1
-#else
-#define ngx_ssl_session_ticket_md  EVP_sha256
-#endif
-
-
 static int
 ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     unsigned char *name, unsigned char *iv, EVP_CIPHER_CTX *ectx,
@@ -2958,6 +2951,8 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     ngx_array_t                   *keys;
     ngx_connection_t              *c;
     ngx_ssl_session_ticket_key_t  *key;
+    const EVP_MD                  *digest;
+    const EVP_CIPHER              *cipher;
 #if (NGX_DEBUG)
     u_char                         buf[32];
 #endif
@@ -2965,6 +2960,13 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     c = ngx_ssl_get_connection(ssl_conn);
     ssl_ctx = c->ssl->session_ctx;
 
+    cipher = EVP_aes_128_cbc();
+#ifdef OPENSSL_NO_SHA256
+    digest = EVP_sha1();
+#else
+    digest = EVP_sha256();
+#endif
+
     keys = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_session_ticket_keys_index);
     if (keys == NULL) {
         return -1;
@@ -2980,13 +2982,29 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
                        ngx_hex_dump(buf, key[0].name, 16) - buf, buf,
                        SSL_session_reused(ssl_conn) ? "reused" : "new");
 
-        RAND_bytes(iv, 16);
-        EVP_EncryptInit_ex(ectx, EVP_aes_128_cbc(), NULL, key[0].aes_key, iv);
-        HMAC_Init_ex(hctx, key[0].hmac_key, 16,
-                     ngx_ssl_session_ticket_md(), NULL);
+        if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) != 1) {
+            ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "RAND_bytes() failed");
+            return -1;
+        }
+
+        if (EVP_EncryptInit_ex(ectx, cipher, NULL, key[0].aes_key, iv) != 1) {
+            ngx_ssl_error(NGX_LOG_ALERT, c->log, 0,
+                          "EVP_EncryptInit_ex() failed");
+            return -1;
+        }
+
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+        if (HMAC_Init_ex(hctx, key[0].hmac_key, 16, digest, NULL) != 1) {
+            ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "HMAC_Init_ex() failed");
+            return -1;
+        }
+#else
+        HMAC_Init_ex(hctx, key[0].hmac_key, 16, digest, NULL);
+#endif
+
         ngx_memcpy(name, key[0].name, 16);
 
-        return 0;
+        return 1;
 
     } else {
         /* decrypt session ticket */
@@ -3010,9 +3028,20 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
                        ngx_hex_dump(buf, key[i].name, 16) - buf, buf,
                        (i == 0) ? " (default)" : "");
 
-        HMAC_Init_ex(hctx, key[i].hmac_key, 16,
-                     ngx_ssl_session_ticket_md(), NULL);
-        EVP_DecryptInit_ex(ectx, EVP_aes_128_cbc(), NULL, key[i].aes_key, iv);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+        if (HMAC_Init_ex(hctx, key[i].hmac_key, 16, digest, NULL) != 1) {
+            ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "HMAC_Init_ex() failed");
+            return -1;
+        }
+#else
+        HMAC_Init_ex(hctx, key[i].hmac_key, 16, digest, NULL);
+#endif
+
+        if (EVP_DecryptInit_ex(ectx, cipher, NULL, key[i].aes_key, iv) != 1) {
+            ngx_ssl_error(NGX_LOG_ALERT, c->log, 0,
+                          "EVP_DecryptInit_ex() failed");
+            return -1;
+        }
 
         return (i == 0) ? 1 : 2 /* renew */;
     }
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index cce8e9e..09fab76 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -376,6 +376,7 @@ ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
 {
     ngx_url_t                  u;
     char                      *s;
+    ngx_str_t                  rsp;
     STACK_OF(OPENSSL_STRING)  *aia;
 
     if (responder->len == 0) {
@@ -403,6 +404,8 @@ ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
             return NGX_DECLINED;
         }
 
+        responder = &rsp;
+
         responder->len = ngx_strlen(s);
         responder->data = ngx_palloc(cf->pool, responder->len);
         if (responder->data == NULL) {
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index 5ce59ae..249433a 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -300,7 +300,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
 
             if (n == NGX_ERROR) {
                 p->upstream_error = 1;
-                return NGX_ERROR;
+                break;
             }
 
             if (n == NGX_AGAIN) {
@@ -815,10 +815,12 @@ ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p)
     }
 
 #if (NGX_THREADS)
-    p->temp_file->thread_write = p->thread_handler ? 1 : 0;
-    p->temp_file->file.thread_task = p->thread_task;
-    p->temp_file->file.thread_handler = p->thread_handler;
-    p->temp_file->file.thread_ctx = p->thread_ctx;
+    if (p->thread_handler) {
+        p->temp_file->thread_write = 1;
+        p->temp_file->file.thread_task = p->thread_task;
+        p->temp_file->file.thread_handler = p->thread_handler;
+        p->temp_file->file.thread_ctx = p->thread_ctx;
+    }
 #endif
 
     n = ngx_write_chain_to_temp_file(p->temp_file, out);
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 9b3c6cb..46a8d7c 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -469,7 +469,12 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             for (i = 0; i < 0x10000; i++) {
                 a = (ngx_array_t *) ctx.high.low[i];
 
-                if (a == NULL || a->nelts == 0) {
+                if (a == NULL) {
+                    continue;
+                }
+
+                if (a->nelts == 0) {
+                    ctx.high.low[i] = NULL;
                     continue;
                 }
 
@@ -814,7 +819,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
                 range = a->elts;
 
                 ngx_memmove(&range[i + 2], &range[i + 1],
-                           (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
+                            (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
 
                 range[i + 1].start = (u_short) s;
                 range[i + 1].end = (u_short) e;
@@ -853,7 +858,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
                 range = a->elts;
 
                 ngx_memmove(&range[i + 3], &range[i + 1],
-                           (a->nelts - 3 - i) * sizeof(ngx_http_geo_range_t));
+                            (a->nelts - 3 - i) * sizeof(ngx_http_geo_range_t));
 
                 range[i + 2].start = (u_short) (e + 1);
                 range[i + 2].end = range[i].end;
@@ -881,7 +886,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
                 range = a->elts;
 
                 ngx_memmove(&range[i + 1], &range[i],
-                           (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
+                            (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
 
                 range[i + 1].start = (u_short) (e + 1);
 
@@ -905,7 +910,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
                 range = a->elts;
 
                 ngx_memmove(&range[i + 2], &range[i + 1],
-                           (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
+                            (a->nelts - 2 - i) * sizeof(ngx_http_geo_range_t));
 
                 range[i + 1].start = (u_short) s;
                 range[i + 1].end = (u_short) e;
@@ -935,13 +940,20 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
             return NGX_CONF_ERROR;
         }
 
-        range->start = (u_short) s;
-        range->end = (u_short) e;
-        range->value = ctx->value;
+        range = a->elts;
+
+        ngx_memmove(&range[1], &range[0],
+                    (a->nelts - 1) * sizeof(ngx_http_geo_range_t));
+
+        range[0].start = (u_short) s;
+        range[0].end = (u_short) e;
+        range[0].value = ctx->value;
 
     next:
 
-        continue;
+        if (h == 0xffff) {
+            break;
+        }
     }
 
     return NGX_CONF_OK;
@@ -959,7 +971,7 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
 
     warn = 0;
 
-    for (n = start; n <= end; n += 0x10000) {
+    for (n = start; n <= end; n = (n + 0x10000) & 0xffff0000) {
 
         h = n >> 16;
 
@@ -978,9 +990,9 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
 
         a = (ngx_array_t *) ctx->high.low[h];
 
-        if (a == NULL) {
+        if (a == NULL || a->nelts == 0) {
             warn = 1;
-            continue;
+            goto next;
         }
 
         range = a->elts;
@@ -990,20 +1002,22 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
                 && e == (ngx_uint_t) range[i].end)
             {
                 ngx_memmove(&range[i], &range[i + 1],
-                           (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
+                            (a->nelts - 1 - i) * sizeof(ngx_http_geo_range_t));
 
                 a->nelts--;
 
                 break;
             }
 
-            if (s != (ngx_uint_t) range[i].start
-                && e != (ngx_uint_t) range[i].end)
-            {
-                continue;
+            if (i == a->nelts - 1) {
+                warn = 1;
             }
+        }
 
-            warn = 1;
+    next:
+
+        if (h == 0xffff) {
+            break;
         }
     }
 
diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c
index 9059ac3..2f695f2 100644
--- a/src/http/modules/ngx_http_limit_req_module.c
+++ b/src/http/modules/ngx_http_limit_req_module.c
@@ -362,15 +362,13 @@ ngx_http_limit_req_lookup(ngx_http_limit_req_limit_t *limit, ngx_uint_t hash,
 {
     size_t                      size;
     ngx_int_t                   rc, excess;
-    ngx_time_t                 *tp;
     ngx_msec_t                  now;
     ngx_msec_int_t              ms;
     ngx_rbtree_node_t          *node, *sentinel;
     ngx_http_limit_req_ctx_t   *ctx;
     ngx_http_limit_req_node_t  *lr;
 
-    tp = ngx_timeofday();
-    now = (ngx_msec_t) (tp->sec * 1000 + tp->msec);
+    now = ngx_current_msec;
 
     ctx = limit->shm_zone->data;
 
@@ -483,7 +481,6 @@ ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits, ngx_uint_t n,
     ngx_uint_t *ep, ngx_http_limit_req_limit_t **limit)
 {
     ngx_int_t                   excess;
-    ngx_time_t                 *tp;
     ngx_msec_t                  now, delay, max_delay;
     ngx_msec_int_t              ms;
     ngx_http_limit_req_ctx_t   *ctx;
@@ -509,9 +506,7 @@ ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits, ngx_uint_t n,
 
         ngx_shmtx_lock(&ctx->shpool->mutex);
 
-        tp = ngx_timeofday();
-
-        now = (ngx_msec_t) (tp->sec * 1000 + tp->msec);
+        now = ngx_current_msec;
         ms = (ngx_msec_int_t) (now - lr->last);
 
         excess = lr->excess - ctx->rate * ngx_abs(ms) / 1000 + 1000;
@@ -549,16 +544,13 @@ static void
 ngx_http_limit_req_expire(ngx_http_limit_req_ctx_t *ctx, ngx_uint_t n)
 {
     ngx_int_t                   excess;
-    ngx_time_t                 *tp;
     ngx_msec_t                  now;
     ngx_queue_t                *q;
     ngx_msec_int_t              ms;
     ngx_rbtree_node_t          *node;
     ngx_http_limit_req_node_t  *lr;
 
-    tp = ngx_timeofday();
-
-    now = (ngx_msec_t) (tp->sec * 1000 + tp->msec);
+    now = ngx_current_msec;
 
     /*
      * n == 1 deletes one or two zero rate entries
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index 490a53d..dba3c52 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -264,7 +264,6 @@ ngx_http_realip_set_addr(ngx_http_request_t *r, ngx_addr_t *addr)
     }
 
     ctx = cln->data;
-    ngx_http_set_ctx(r, ctx, ngx_http_realip_module);
 
     c = r->connection;
 
@@ -282,6 +281,7 @@ ngx_http_realip_set_addr(ngx_http_request_t *r, ngx_addr_t *addr)
     ngx_memcpy(p, text, len);
 
     cln->handler = ngx_http_realip_cleanup;
+    ngx_http_set_ctx(r, ctx, ngx_http_realip_module);
 
     ctx->connection = c;
     ctx->sockaddr = c->sockaddr;
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index fc6e65b..6fb1fbe 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -2722,8 +2722,8 @@ static ngx_int_t
 ngx_http_ssi_date_gmt_local_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t gmt)
 {
+    time_t               now;
     ngx_http_ssi_ctx_t  *ctx;
-    ngx_time_t          *tp;
     ngx_str_t           *timefmt;
     struct tm            tm;
     char                 buf[NGX_HTTP_SSI_DATE_LEN];
@@ -2732,7 +2732,7 @@ ngx_http_ssi_date_gmt_local_variable(ngx_http_request_t *r,
     v->no_cacheable = 0;
     v->not_found = 0;
 
-    tp = ngx_timeofday();
+    now = ngx_time();
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module);
 
@@ -2746,15 +2746,15 @@ ngx_http_ssi_date_gmt_local_variable(ngx_http_request_t *r,
             return NGX_ERROR;
         }
 
-        v->len = ngx_sprintf(v->data, "%T", tp->sec) - v->data;
+        v->len = ngx_sprintf(v->data, "%T", now) - v->data;
 
         return NGX_OK;
     }
 
     if (gmt) {
-        ngx_libc_gmtime(tp->sec, &tm);
+        ngx_libc_gmtime(now, &tm);
     } else {
-        ngx_libc_localtime(tp->sec, &tm);
+        ngx_libc_localtime(now, &tm);
     }
 
     v->len = strftime(buf, NGX_HTTP_SSI_DATE_LEN,
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 76917bb..e26c3f7 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2823,120 +2823,46 @@ static ngx_int_t
 ngx_http_get_forwarded_addr_internal(ngx_http_request_t *r, ngx_addr_t *addr,
     u_char *xff, size_t xfflen, ngx_array_t *proxies, int recursive)
 {
-    u_char           *p;
-    in_addr_t         inaddr;
-    ngx_int_t         rc;
-    ngx_addr_t        paddr;
-    ngx_cidr_t       *cidr;
-    ngx_uint_t        family, i;
-#if (NGX_HAVE_INET6)
-    ngx_uint_t        n;
-    struct in6_addr  *inaddr6;
-#endif
+    u_char      *p;
+    ngx_int_t    rc;
+    ngx_addr_t   paddr;
 
-#if (NGX_SUPPRESS_WARN)
-    inaddr = 0;
-#if (NGX_HAVE_INET6)
-    inaddr6 = NULL;
-#endif
-#endif
-
-    family = addr->sockaddr->sa_family;
-
-    if (family == AF_INET) {
-        inaddr = ((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr;
+    if (ngx_cidr_match(addr->sockaddr, proxies) != NGX_OK) {
+        return NGX_DECLINED;
     }
 
-#if (NGX_HAVE_INET6)
-    else if (family == AF_INET6) {
-        inaddr6 = &((struct sockaddr_in6 *) addr->sockaddr)->sin6_addr;
-
-        if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
-            family = AF_INET;
-
-            p = inaddr6->s6_addr;
-
-            inaddr = p[12] << 24;
-            inaddr += p[13] << 16;
-            inaddr += p[14] << 8;
-            inaddr += p[15];
-
-            inaddr = htonl(inaddr);
+    for (p = xff + xfflen - 1; p > xff; p--, xfflen--) {
+        if (*p != ' ' && *p != ',') {
+            break;
         }
     }
-#endif
 
-    for (cidr = proxies->elts, i = 0; i < proxies->nelts; i++) {
-        if (cidr[i].family != family) {
-            goto next;
-        }
-
-        switch (family) {
-
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            for (n = 0; n < 16; n++) {
-                if ((inaddr6->s6_addr[n] & cidr[i].u.in6.mask.s6_addr[n])
-                    != cidr[i].u.in6.addr.s6_addr[n])
-                {
-                    goto next;
-                }
-            }
-            break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-        case AF_UNIX:
-            break;
-#endif
-
-        default: /* AF_INET */
-            if ((inaddr & cidr[i].u.in.mask) != cidr[i].u.in.addr) {
-                goto next;
-            }
+    for ( /* void */ ; p > xff; p--) {
+        if (*p == ' ' || *p == ',') {
+            p++;
             break;
         }
-
-        for (p = xff + xfflen - 1; p > xff; p--, xfflen--) {
-            if (*p != ' ' && *p != ',') {
-                break;
-            }
-        }
-
-        for ( /* void */ ; p > xff; p--) {
-            if (*p == ' ' || *p == ',') {
-                p++;
-                break;
-            }
-        }
-
-        if (ngx_parse_addr_port(r->pool, &paddr, p, xfflen - (p - xff))
-            != NGX_OK)
-        {
-            return NGX_DECLINED;
-        }
-
-        *addr = paddr;
-
-        if (recursive && p > xff) {
-            rc = ngx_http_get_forwarded_addr_internal(r, addr, xff, p - 1 - xff,
-                                                      proxies, 1);
-
-            if (rc == NGX_DECLINED) {
-                return NGX_DONE;
-            }
-
-            /* rc == NGX_OK || rc == NGX_DONE  */
-            return rc;
-        }
-
-        return NGX_OK;
-
-    next:
-        continue;
     }
 
-    return NGX_DECLINED;
+    if (ngx_parse_addr_port(r->pool, &paddr, p, xfflen - (p - xff)) != NGX_OK) {
+        return NGX_DECLINED;
+    }
+
+    *addr = paddr;
+
+    if (recursive && p > xff) {
+        rc = ngx_http_get_forwarded_addr_internal(r, addr, xff, p - 1 - xff,
+                                                  proxies, 1);
+
+        if (rc == NGX_DECLINED) {
+            return NGX_DONE;
+        }
+
+        /* rc == NGX_OK || rc == NGX_DONE  */
+        return rc;
+    }
+
+    return NGX_OK;
 }
 
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 0f6b3ae..7e4b3c5 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -391,6 +391,10 @@ static ngx_http_variable_t  ngx_http_upstream_vars[] = {
       ngx_http_upstream_response_length_variable, 0,
       NGX_HTTP_VAR_NOCACHEABLE, 0 },
 
+    { ngx_string("upstream_bytes_received"), NULL,
+      ngx_http_upstream_response_length_variable, 1,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
 #if (NGX_HTTP_CACHE)
 
     { ngx_string("upstream_cache_status"), NULL,
@@ -2136,6 +2140,8 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u)
             return;
         }
 
+        u->state->bytes_received += n;
+
         u->buffer.last += n;
 
 #if 0
@@ -2642,6 +2648,7 @@ ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r,
             return;
         }
 
+        u->state->bytes_received += n;
         u->state->response_length += n;
 
         if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
@@ -3215,6 +3222,10 @@ ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
                 do_write = 1;
                 b->last += n;
 
+                if (from_upstream) {
+                    u->state->bytes_received += n;
+                }
+
                 continue;
             }
 
@@ -3411,6 +3422,7 @@ ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
             }
 
             if (n > 0) {
+                u->state->bytes_received += n;
                 u->state->response_length += n;
 
                 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
@@ -4095,6 +4107,8 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
         u->state->response_time = ngx_current_msec - u->state->response_time;
 
         if (u->pipe && u->pipe->read_length) {
+            u->state->bytes_received += u->pipe->read_length
+                                        - u->pipe->preread_size;
             u->state->response_length = u->pipe->read_length;
         }
     }
@@ -5242,7 +5256,13 @@ ngx_http_upstream_response_length_variable(ngx_http_request_t *r,
     state = r->upstream_states->elts;
 
     for ( ;; ) {
-        p = ngx_sprintf(p, "%O", state[i].response_length);
+
+        if (data == 1) {
+            p = ngx_sprintf(p, "%O", state[i].bytes_received);
+
+        } else {
+            p = ngx_sprintf(p, "%O", state[i].response_length);
+        }
 
         if (++i == r->upstream_states->nelts) {
             break;
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index b288f28..ef861f4 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -63,6 +63,7 @@ typedef struct {
     ngx_msec_t                       connect_time;
     ngx_msec_t                       header_time;
     off_t                            response_length;
+    off_t                            bytes_received;
 
     ngx_str_t                       *peer;
 } ngx_http_upstream_state_t;
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index ae1aa41..1068bb3 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -117,13 +117,15 @@ typedef struct {
     ngx_str_t               server_name;
 
     u_char                 *file_name;
-    ngx_int_t               line;
+    ngx_uint_t              line;
 
     ngx_resolver_t         *resolver;
     ngx_log_t              *error_log;
 
     /* server ctx */
     ngx_mail_conf_ctx_t    *ctx;
+
+    ngx_uint_t              listen;  /* unsigned  listen:1; */
 } ngx_mail_core_srv_conf_t;
 
 
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index d992402..48eacfa 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -279,6 +279,13 @@ ngx_mail_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     *cf = pcf;
 
+    if (rv == NGX_CONF_OK && !cscf->listen) {
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "no \"listen\" is defined for server in %s:%ui",
+                      cscf->file_name, cscf->line);
+        return NGX_CONF_ERROR;
+    }
+
     return rv;
 }
 
@@ -295,6 +302,8 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_mail_module_t          *module;
     ngx_mail_core_main_conf_t  *cmcf;
 
+    cscf->listen = 1;
+
     value = cf->args->elts;
 
     ngx_memzero(&u, sizeof(ngx_url_t));
diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c
index 76ed94e..7e6e79d 100644
--- a/src/os/unix/ngx_posix_init.c
+++ b/src/os/unix/ngx_posix_init.c
@@ -33,7 +33,8 @@ ngx_os_io_t ngx_os_io = {
 ngx_int_t
 ngx_os_init(ngx_log_t *log)
 {
-    ngx_uint_t  n;
+    ngx_time_t  *tp;
+    ngx_uint_t   n;
 
 #if (NGX_HAVE_OS_SPECIFIC_INIT)
     if (ngx_os_specific_init(log) != NGX_OK) {
@@ -76,7 +77,8 @@ ngx_os_init(ngx_log_t *log)
     ngx_inherited_nonblocking = 0;
 #endif
 
-    srandom(ngx_time());
+    tp = ngx_timeofday();
+    srandom(((unsigned) ngx_pid << 16) ^ tp->sec ^ tp->msec);
 
     return NGX_OK;
 }
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 7cee1c5..83b04ee 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -785,6 +785,7 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
 {
     sigset_t          set;
     ngx_int_t         n;
+    ngx_time_t       *tp;
     ngx_uint_t        i;
     ngx_cpuset_t     *cpu_affinity;
     struct rlimit     rlmt;
@@ -884,7 +885,8 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
                       "sigprocmask() failed");
     }
 
-    srandom((ngx_pid << 16) ^ ngx_time());
+    tp = ngx_timeofday();
+    srandom(((unsigned) ngx_pid << 16) ^ tp->sec ^ tp->msec);
 
     /*
      * disable deleting previous events for the listening sockets because
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index c195171..873e102 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -455,6 +455,7 @@ ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
 #if (NGX_STREAM_SSL)
         addrs[i].conf.ssl = addr[i].opt.ssl;
 #endif
+        addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
 
         len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
                             buf, NGX_SOCKADDR_STRLEN, 1);
@@ -504,6 +505,7 @@ ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
 #if (NGX_STREAM_SSL)
         addrs6[i].conf.ssl = addr[i].opt.ssl;
 #endif
+        addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
 
         len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
                             buf, NGX_SOCKADDR_STRLEN, 1);
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 807ab5b..6251cc7 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -26,6 +26,14 @@ typedef struct ngx_stream_session_s  ngx_stream_session_t;
 #include <ngx_stream_upstream_round_robin.h>
 
 
+#define NGX_STREAM_OK                        200
+#define NGX_STREAM_BAD_REQUEST               400
+#define NGX_STREAM_FORBIDDEN                 403
+#define NGX_STREAM_INTERNAL_SERVER_ERROR     500
+#define NGX_STREAM_BAD_GATEWAY               502
+#define NGX_STREAM_SERVICE_UNAVAILABLE       503
+
+
 typedef struct {
     void                         **main_conf;
     void                         **srv_conf;
@@ -51,6 +59,7 @@ typedef struct {
     unsigned                       reuseport:1;
 #endif
     unsigned                       so_keepalive:2;
+    unsigned                       proxy_protocol:1;
 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
     int                            tcp_keepidle;
     int                            tcp_keepintvl;
@@ -65,8 +74,9 @@ typedef struct {
     ngx_stream_conf_ctx_t         *ctx;
     ngx_str_t                      addr_text;
 #if (NGX_STREAM_SSL)
-    ngx_uint_t                     ssl;    /* unsigned   ssl:1; */
+    unsigned                       ssl:1;
 #endif
+    unsigned                       proxy_protocol:1;
 } ngx_stream_addr_conf_t;
 
 typedef struct {
@@ -112,8 +122,10 @@ typedef struct {
     ngx_array_t                    servers;     /* ngx_stream_core_srv_conf_t */
     ngx_array_t                    listen;      /* ngx_stream_listen_t */
 
+    ngx_stream_access_pt           realip_handler;
     ngx_stream_access_pt           limit_conn_handler;
     ngx_stream_access_pt           access_handler;
+    ngx_stream_access_pt           access_log_handler;
 
     ngx_hash_t                     variables_hash;
 
@@ -136,7 +148,7 @@ typedef struct {
     ngx_stream_conf_ctx_t         *ctx;
 
     u_char                        *file_name;
-    ngx_int_t                      line;
+    ngx_uint_t                     line;
 
     ngx_flag_t                     tcp_nodelay;
 
@@ -144,6 +156,10 @@ typedef struct {
 
     ngx_msec_t                     resolver_timeout;
     ngx_resolver_t                *resolver;
+
+    ngx_msec_t                     proxy_protocol_timeout;
+
+    ngx_uint_t                     listen;  /* unsigned  listen:1; */
 } ngx_stream_core_srv_conf_t;
 
 
@@ -153,6 +169,8 @@ struct ngx_stream_session_s {
     ngx_connection_t              *connection;
 
     off_t                          received;
+    time_t                         start_sec;
+    ngx_msec_t                     start_msec;
 
     ngx_log_handler_pt             log_handler;
 
@@ -161,7 +179,8 @@ struct ngx_stream_session_s {
     void                         **srv_conf;
 
     ngx_stream_upstream_t         *upstream;
-
+    ngx_array_t                   *upstream_states;
+                                           /* of ngx_stream_upstream_state_t */
     ngx_stream_variable_value_t   *variables;
 
 #if (NGX_PCRE)
@@ -169,6 +188,12 @@ struct ngx_stream_session_s {
     int                           *captures;
     u_char                        *captures_data;
 #endif
+
+    ngx_uint_t                     status;
+
+#if (NGX_STREAM_SSL)
+    ngx_uint_t                     ssl;  /* unsigned  ssl:1; */
+#endif
 };
 
 
@@ -219,7 +244,7 @@ typedef struct {
 
 
 void ngx_stream_init_connection(ngx_connection_t *c);
-void ngx_stream_close_connection(ngx_connection_t *c);
+void ngx_stream_finalize_session(ngx_stream_session_t *s, ngx_uint_t rc);
 
 
 extern ngx_module_t  ngx_stream_module;
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index 70b9e2d..1c808ad 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -77,6 +77,13 @@ static ngx_command_t  ngx_stream_core_commands[] = {
       offsetof(ngx_stream_core_srv_conf_t, resolver_timeout),
       NULL },
 
+    { ngx_string("proxy_protocol_timeout"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_core_srv_conf_t, proxy_protocol_timeout),
+      NULL },
+
     { ngx_string("tcp_nodelay"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -192,6 +199,7 @@ ngx_stream_core_create_srv_conf(ngx_conf_t *cf)
     cscf->file_name = cf->conf_file->file.name.data;
     cscf->line = cf->conf_file->line;
     cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
+    cscf->proxy_protocol_timeout = NGX_CONF_UNSET_MSEC;
     cscf->tcp_nodelay = NGX_CONF_UNSET;
 
     return cscf;
@@ -240,6 +248,9 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
+    ngx_conf_merge_msec_value(conf->proxy_protocol_timeout,
+                              prev->proxy_protocol_timeout, 30000);
+
     ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);
 
     return NGX_CONF_OK;
@@ -325,6 +336,13 @@ ngx_stream_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     *cf = pcf;
 
+    if (rv == NGX_CONF_OK && !cscf->listen) {
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "no \"listen\" is defined for server in %s:%ui",
+                      cscf->file_name, cscf->line);
+        return NGX_CONF_ERROR;
+    }
+
     return rv;
 }
 
@@ -332,12 +350,16 @@ ngx_stream_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 static char *
 ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
+    ngx_stream_core_srv_conf_t  *cscf = conf;
+
     ngx_str_t                    *value;
     ngx_url_t                     u;
     ngx_uint_t                    i, backlog;
     ngx_stream_listen_t          *ls, *als;
     ngx_stream_core_main_conf_t  *cmcf;
 
+    cscf->listen = 1;
+
     value = cf->args->elts;
 
     ngx_memzero(&u, sizeof(ngx_url_t));
@@ -561,6 +583,11 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
         }
 
+        if (ngx_strcmp(value[i].data, "proxy_protocol") == 0) {
+            ls->proxy_protocol = 1;
+            continue;
+        }
+
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "the invalid \"%V\" parameter", &value[i]);
         return NGX_CONF_ERROR;
@@ -580,6 +607,10 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         if (ls->so_keepalive) {
             return "\"so_keepalive\" parameter is incompatible with \"udp\"";
         }
+
+        if (ls->proxy_protocol) {
+            return "\"proxy_protocol\" parameter is incompatible with \"udp\"";
+        }
     }
 
     als = cmcf->listen.elts;
diff --git a/src/stream/ngx_stream_geo_module.c b/src/stream/ngx_stream_geo_module.c
index ed1a488..2204546 100644
--- a/src/stream/ngx_stream_geo_module.c
+++ b/src/stream/ngx_stream_geo_module.c
@@ -436,7 +436,12 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             for (i = 0; i < 0x10000; i++) {
                 a = (ngx_array_t *) ctx.high.low[i];
 
-                if (a == NULL || a->nelts == 0) {
+                if (a == NULL) {
+                    continue;
+                }
+
+                if (a->nelts == 0) {
+                    ctx.high.low[i] = NULL;
                     continue;
                 }
 
@@ -885,13 +890,20 @@ ngx_stream_geo_add_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
             return NGX_CONF_ERROR;
         }
 
-        range->start = (u_short) s;
-        range->end = (u_short) e;
-        range->value = ctx->value;
+        range = a->elts;
+
+        ngx_memmove(&range[1], &range[0],
+                    (a->nelts - 1) * sizeof(ngx_stream_geo_range_t));
+
+        range[0].start = (u_short) s;
+        range[0].end = (u_short) e;
+        range[0].value = ctx->value;
 
     next:
 
-        continue;
+        if (h == 0xffff) {
+            break;
+        }
     }
 
     return NGX_CONF_OK;
@@ -909,7 +921,7 @@ ngx_stream_geo_delete_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
 
     warn = 0;
 
-    for (n = start; n <= end; n += 0x10000) {
+    for (n = start; n <= end; n = (n + 0x10000) & 0xffff0000) {
 
         h = n >> 16;
 
@@ -928,9 +940,9 @@ ngx_stream_geo_delete_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
 
         a = (ngx_array_t *) ctx->high.low[h];
 
-        if (a == NULL) {
+        if (a == NULL || a->nelts == 0) {
             warn = 1;
-            continue;
+            goto next;
         }
 
         range = a->elts;
@@ -947,13 +959,15 @@ ngx_stream_geo_delete_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
                 break;
             }
 
-            if (s != (ngx_uint_t) range[i].start
-                && e != (ngx_uint_t) range[i].end)
-            {
-                continue;
+            if (i == a->nelts - 1) {
+                warn = 1;
             }
+        }
 
-            warn = 1;
+    next:
+
+        if (h == 0xffff) {
+            break;
         }
     }
 
diff --git a/src/stream/ngx_stream_handler.c b/src/stream/ngx_stream_handler.c
index 61169e1..6e2ed82 100644
--- a/src/stream/ngx_stream_handler.c
+++ b/src/stream/ngx_stream_handler.c
@@ -11,8 +11,10 @@
 #include <ngx_stream.h>
 
 
+static void ngx_stream_close_connection(ngx_connection_t *c);
 static u_char *ngx_stream_log_error(ngx_log_t *log, u_char *buf, size_t len);
-static void ngx_stream_init_session(ngx_connection_t *c);
+static void ngx_stream_proxy_protocol_handler(ngx_event_t *rev);
+static void ngx_stream_init_session_handler(ngx_event_t *rev);
 
 #if (NGX_STREAM_SSL)
 static void ngx_stream_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c);
@@ -23,11 +25,11 @@ static void ngx_stream_ssl_handshake_handler(ngx_connection_t *c);
 void
 ngx_stream_init_connection(ngx_connection_t *c)
 {
-    int                           tcp_nodelay;
     u_char                        text[NGX_SOCKADDR_STRLEN];
     size_t                        len;
-    ngx_int_t                     rc;
     ngx_uint_t                    i;
+    ngx_time_t                   *tp;
+    ngx_event_t                  *rev;
     struct sockaddr              *sa;
     ngx_stream_port_t            *port;
     struct sockaddr_in           *sin;
@@ -128,6 +130,10 @@ ngx_stream_init_connection(ngx_connection_t *c)
     s->main_conf = addr_conf->ctx->main_conf;
     s->srv_conf = addr_conf->ctx->srv_conf;
 
+#if (NGX_STREAM_SSL)
+    s->ssl = addr_conf->ssl;
+#endif
+
     s->connection = c;
     c->data = s;
 
@@ -147,6 +153,12 @@ ngx_stream_init_connection(ngx_connection_t *c)
     c->log->action = "initializing connection";
     c->log_error = NGX_ERROR_INFO;
 
+    s->ctx = ngx_pcalloc(c->pool, sizeof(void *) * ngx_stream_max_module);
+    if (s->ctx == NULL) {
+        ngx_stream_close_connection(c);
+        return;
+    }
+
     cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
 
     s->variables = ngx_pcalloc(s->connection->pool,
@@ -158,11 +170,151 @@ ngx_stream_init_connection(ngx_connection_t *c)
         return;
     }
 
+    tp = ngx_timeofday();
+    s->start_sec = tp->sec;
+    s->start_msec = tp->msec;
+
+    rev = c->read;
+    rev->handler = ngx_stream_init_session_handler;
+
+    if (addr_conf->proxy_protocol) {
+        c->log->action = "reading PROXY protocol";
+
+        rev->handler = ngx_stream_proxy_protocol_handler;
+
+        if (!rev->ready) {
+            ngx_add_timer(rev, cscf->proxy_protocol_timeout);
+
+            if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+                ngx_stream_finalize_session(s,
+                                            NGX_STREAM_INTERNAL_SERVER_ERROR);
+            }
+
+            return;
+        }
+    }
+
+    if (ngx_use_accept_mutex) {
+        ngx_post_event(rev, &ngx_posted_events);
+        return;
+    }
+
+    rev->handler(rev);
+}
+
+
+static void
+ngx_stream_proxy_protocol_handler(ngx_event_t *rev)
+{
+    u_char                      *p, buf[NGX_PROXY_PROTOCOL_MAX_HEADER];
+    size_t                       size;
+    ssize_t                      n;
+    ngx_err_t                    err;
+    ngx_connection_t            *c;
+    ngx_stream_session_t        *s;
+    ngx_stream_core_srv_conf_t  *cscf;
+
+    c = rev->data;
+    s = c->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "stream PROXY protocol handler");
+
+    if (rev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
+        ngx_stream_finalize_session(s, NGX_STREAM_OK);
+        return;
+    }
+
+    n = recv(c->fd, (char *) buf, sizeof(buf), MSG_PEEK);
+
+    err = ngx_socket_errno;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0, "recv(): %z", n);
+
+    if (n == -1) {
+        if (err == NGX_EAGAIN) {
+            rev->ready = 0;
+
+            if (!rev->timer_set) {
+                cscf = ngx_stream_get_module_srv_conf(s,
+                                                      ngx_stream_core_module);
+
+                ngx_add_timer(rev, cscf->proxy_protocol_timeout);
+            }
+
+            if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+                ngx_stream_finalize_session(s,
+                                            NGX_STREAM_INTERNAL_SERVER_ERROR);
+            }
+
+            return;
+        }
+
+        ngx_connection_error(c, err, "recv() failed");
+
+        ngx_stream_finalize_session(s, NGX_STREAM_OK);
+        return;
+    }
+
+    if (rev->timer_set) {
+        ngx_del_timer(rev);
+    }
+
+    p = ngx_proxy_protocol_read(c, buf, buf + n);
+
+    if (p == NULL) {
+        ngx_stream_finalize_session(s, NGX_STREAM_BAD_REQUEST);
+        return;
+    }
+
+    size = p - buf;
+
+    if (c->recv(c, buf, size) != (ssize_t) size) {
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    ngx_stream_init_session_handler(rev);
+}
+
+
+static void
+ngx_stream_init_session_handler(ngx_event_t *rev)
+{
+    int                           tcp_nodelay;
+    ngx_int_t                     rc;
+    ngx_connection_t             *c;
+    ngx_stream_session_t         *s;
+    ngx_stream_core_srv_conf_t   *cscf;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    c = rev->data;
+    s = c->data;
+
+    c->log->action = "initializing session";
+
+    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
+
+    if (cmcf->realip_handler) {
+        rc = cmcf->realip_handler(s);
+
+        if (rc == NGX_ERROR) {
+            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return;
+        }
+    }
+
     if (cmcf->limit_conn_handler) {
         rc = cmcf->limit_conn_handler(s);
 
-        if (rc != NGX_DECLINED) {
-            ngx_stream_close_connection(c);
+        if (rc == NGX_ERROR) {
+            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return;
+        }
+
+        if (rc == NGX_ABORT) {
+            ngx_stream_finalize_session(s, NGX_STREAM_SERVICE_UNAVAILABLE);
             return;
         }
     }
@@ -170,12 +322,19 @@ ngx_stream_init_connection(ngx_connection_t *c)
     if (cmcf->access_handler) {
         rc = cmcf->access_handler(s);
 
-        if (rc != NGX_OK && rc != NGX_DECLINED) {
-            ngx_stream_close_connection(c);
+        if (rc == NGX_ERROR) {
+            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return;
+        }
+
+        if (rc == NGX_ABORT) {
+            ngx_stream_finalize_session(s, NGX_STREAM_FORBIDDEN);
             return;
         }
     }
 
+    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
+
     if (c->type == SOCK_STREAM
         && cscf->tcp_nodelay
         && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
@@ -189,7 +348,7 @@ ngx_stream_init_connection(ngx_connection_t *c)
         {
             ngx_connection_error(c, ngx_socket_errno,
                                  "setsockopt(TCP_NODELAY) failed");
-            ngx_stream_close_connection(c);
+            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
 
@@ -203,14 +362,14 @@ ngx_stream_init_connection(ngx_connection_t *c)
 
     sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
 
-    if (addr_conf->ssl) {
+    if (s->ssl) {
         c->log->action = "SSL handshaking";
 
         if (sslcf->ssl.ctx == NULL) {
             ngx_log_error(NGX_LOG_ERR, c->log, 0,
                           "no \"ssl_certificate\" is defined "
                           "in server listening on SSL port");
-            ngx_stream_close_connection(c);
+            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
 
@@ -220,27 +379,8 @@ ngx_stream_init_connection(ngx_connection_t *c)
     }
 #endif
 
-    ngx_stream_init_session(c);
-}
-
-
-static void
-ngx_stream_init_session(ngx_connection_t *c)
-{
-    ngx_stream_session_t        *s;
-    ngx_stream_core_srv_conf_t  *cscf;
-
-    s = c->data;
     c->log->action = "handling client connection";
 
-    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
-
-    s->ctx = ngx_pcalloc(c->pool, sizeof(void *) * ngx_stream_max_module);
-    if (s->ctx == NULL) {
-        ngx_stream_close_connection(c);
-        return;
-    }
-
     cscf->handler(s);
 }
 
@@ -253,15 +393,14 @@ ngx_stream_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c)
     ngx_stream_session_t   *s;
     ngx_stream_ssl_conf_t  *sslcf;
 
+    s = c->data;
+
     if (ngx_ssl_create_connection(ssl, c, 0) == NGX_ERROR) {
-        ngx_stream_close_connection(c);
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
     if (ngx_ssl_handshake(c) == NGX_AGAIN) {
-
-        s = c->data;
-
         sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
 
         ngx_add_timer(c->read, sslcf->handshake_timeout);
@@ -278,8 +417,11 @@ ngx_stream_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c)
 static void
 ngx_stream_ssl_handshake_handler(ngx_connection_t *c)
 {
+    ngx_stream_session_t        *s;
+    ngx_stream_core_srv_conf_t  *cscf;
+
     if (!c->ssl->handshaked) {
-        ngx_stream_close_connection(c);
+        ngx_stream_finalize_session(c->data, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
@@ -287,13 +429,39 @@ ngx_stream_ssl_handshake_handler(ngx_connection_t *c)
         ngx_del_timer(c->read);
     }
 
-    ngx_stream_init_session(c);
+    c->log->action = "handling client connection";
+
+    s = c->data;
+
+    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
+
+    cscf->handler(s);
 }
 
 #endif
 
 
 void
+ngx_stream_finalize_session(ngx_stream_session_t *s, ngx_uint_t rc)
+{
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "finalize stream session: %i", rc);
+
+    s->status = rc;
+
+    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
+
+    if (cmcf->access_log_handler) {
+        (void) cmcf->access_log_handler(s);
+    }
+
+    ngx_stream_close_connection(s->connection);
+}
+
+
+static void
 ngx_stream_close_connection(ngx_connection_t *c)
 {
     ngx_pool_t  *pool;
diff --git a/src/stream/ngx_stream_log_module.c b/src/stream/ngx_stream_log_module.c
new file mode 100644
index 0000000..4affbdf
--- /dev/null
+++ b/src/stream/ngx_stream_log_module.c
@@ -0,0 +1,1474 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
+
+
+typedef struct ngx_stream_log_op_s  ngx_stream_log_op_t;
+
+typedef u_char *(*ngx_stream_log_op_run_pt) (ngx_stream_session_t *s,
+    u_char *buf, ngx_stream_log_op_t *op);
+
+typedef size_t (*ngx_stream_log_op_getlen_pt) (ngx_stream_session_t *s,
+    uintptr_t data);
+
+
+struct ngx_stream_log_op_s {
+    size_t                       len;
+    ngx_stream_log_op_getlen_pt  getlen;
+    ngx_stream_log_op_run_pt     run;
+    uintptr_t                    data;
+};
+
+
+typedef struct {
+    ngx_str_t                    name;
+    ngx_array_t                 *flushes;
+    ngx_array_t                 *ops;        /* array of ngx_stream_log_op_t */
+} ngx_stream_log_fmt_t;
+
+
+typedef struct {
+    ngx_array_t                  formats;    /* array of ngx_stream_log_fmt_t */
+} ngx_stream_log_main_conf_t;
+
+
+typedef struct {
+    u_char                      *start;
+    u_char                      *pos;
+    u_char                      *last;
+
+    ngx_event_t                 *event;
+    ngx_msec_t                   flush;
+    ngx_int_t                    gzip;
+} ngx_stream_log_buf_t;
+
+
+typedef struct {
+    ngx_array_t                 *lengths;
+    ngx_array_t                 *values;
+} ngx_stream_log_script_t;
+
+
+typedef struct {
+    ngx_open_file_t             *file;
+    ngx_stream_log_script_t     *script;
+    time_t                       disk_full_time;
+    time_t                       error_log_time;
+    ngx_syslog_peer_t           *syslog_peer;
+    ngx_stream_log_fmt_t        *format;
+    ngx_stream_complex_value_t  *filter;
+} ngx_stream_log_t;
+
+
+typedef struct {
+    ngx_array_t                 *logs;       /* array of ngx_stream_log_t */
+
+    ngx_open_file_cache_t       *open_file_cache;
+    time_t                       open_file_cache_valid;
+    ngx_uint_t                   open_file_cache_min_uses;
+
+    ngx_uint_t                   off;        /* unsigned  off:1 */
+} ngx_stream_log_srv_conf_t;
+
+
+typedef struct {
+    ngx_str_t                    name;
+    size_t                       len;
+    ngx_stream_log_op_run_pt     run;
+} ngx_stream_log_var_t;
+
+
+static void ngx_stream_log_write(ngx_stream_session_t *s, ngx_stream_log_t *log,
+    u_char *buf, size_t len);
+static ssize_t ngx_stream_log_script_write(ngx_stream_session_t *s,
+    ngx_stream_log_script_t *script, u_char **name, u_char *buf, size_t len);
+
+#if (NGX_ZLIB)
+static ssize_t ngx_stream_log_gzip(ngx_fd_t fd, u_char *buf, size_t len,
+    ngx_int_t level, ngx_log_t *log);
+
+static void *ngx_stream_log_gzip_alloc(void *opaque, u_int items, u_int size);
+static void ngx_stream_log_gzip_free(void *opaque, void *address);
+#endif
+
+static void ngx_stream_log_flush(ngx_open_file_t *file, ngx_log_t *log);
+static void ngx_stream_log_flush_handler(ngx_event_t *ev);
+
+static ngx_int_t ngx_stream_log_variable_compile(ngx_conf_t *cf,
+    ngx_stream_log_op_t *op, ngx_str_t *value);
+static size_t ngx_stream_log_variable_getlen(ngx_stream_session_t *s,
+    uintptr_t data);
+static u_char *ngx_stream_log_variable(ngx_stream_session_t *s, u_char *buf,
+    ngx_stream_log_op_t *op);
+static uintptr_t ngx_stream_log_escape(u_char *dst, u_char *src, size_t size);
+
+
+static void *ngx_stream_log_create_main_conf(ngx_conf_t *cf);
+static void *ngx_stream_log_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_stream_log_merge_srv_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static char *ngx_stream_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_log_compile_format(ngx_conf_t *cf,
+    ngx_array_t *flushes, ngx_array_t *ops, ngx_array_t *args, ngx_uint_t s);
+static char *ngx_stream_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static ngx_int_t ngx_stream_log_init(ngx_conf_t *cf);
+
+
+static ngx_command_t  ngx_stream_log_commands[] = {
+
+    { ngx_string("log_format"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_2MORE,
+      ngx_stream_log_set_format,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("access_log"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE,
+      ngx_stream_log_set_log,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("open_log_file_cache"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1234,
+      ngx_stream_log_open_file_cache,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_log_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_stream_log_init,                   /* postconfiguration */
+
+    ngx_stream_log_create_main_conf,       /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    ngx_stream_log_create_srv_conf,        /* create server configuration */
+    ngx_stream_log_merge_srv_conf          /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_log_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_log_module_ctx,            /* module context */
+    ngx_stream_log_commands,               /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_stream_log_handler(ngx_stream_session_t *s)
+{
+    u_char                     *line, *p;
+    size_t                      len, size;
+    ssize_t                     n;
+    ngx_str_t                   val;
+    ngx_uint_t                  i, l;
+    ngx_stream_log_t           *log;
+    ngx_stream_log_op_t        *op;
+    ngx_stream_log_buf_t       *buffer;
+    ngx_stream_log_srv_conf_t  *lscf;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "stream log handler");
+
+    lscf = ngx_stream_get_module_srv_conf(s, ngx_stream_log_module);
+
+    if (lscf->off || lscf->logs == NULL) {
+        return NGX_OK;
+    }
+
+    log = lscf->logs->elts;
+    for (l = 0; l < lscf->logs->nelts; l++) {
+
+        if (log[l].filter) {
+            if (ngx_stream_complex_value(s, log[l].filter, &val) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            if (val.len == 0 || (val.len == 1 && val.data[0] == '0')) {
+                continue;
+            }
+        }
+
+        if (ngx_time() == log[l].disk_full_time) {
+
+            /*
+             * on FreeBSD writing to a full filesystem with enabled softupdates
+             * may block process for much longer time than writing to non-full
+             * filesystem, so we skip writing to a log for one second
+             */
+
+            continue;
+        }
+
+        ngx_stream_script_flush_no_cacheable_variables(s,
+                                                       log[l].format->flushes);
+
+        len = 0;
+        op = log[l].format->ops->elts;
+        for (i = 0; i < log[l].format->ops->nelts; i++) {
+            if (op[i].len == 0) {
+                len += op[i].getlen(s, op[i].data);
+
+            } else {
+                len += op[i].len;
+            }
+        }
+
+        if (log[l].syslog_peer) {
+
+            /* length of syslog's PRI and HEADER message parts */
+            len += sizeof("<255>Jan 01 00:00:00 ") - 1
+                   + ngx_cycle->hostname.len + 1
+                   + log[l].syslog_peer->tag.len + 2;
+
+            goto alloc_line;
+        }
+
+        len += NGX_LINEFEED_SIZE;
+
+        buffer = log[l].file ? log[l].file->data : NULL;
+
+        if (buffer) {
+
+            if (len > (size_t) (buffer->last - buffer->pos)) {
+
+                ngx_stream_log_write(s, &log[l], buffer->start,
+                                     buffer->pos - buffer->start);
+
+                buffer->pos = buffer->start;
+            }
+
+            if (len <= (size_t) (buffer->last - buffer->pos)) {
+
+                p = buffer->pos;
+
+                if (buffer->event && p == buffer->start) {
+                    ngx_add_timer(buffer->event, buffer->flush);
+                }
+
+                for (i = 0; i < log[l].format->ops->nelts; i++) {
+                    p = op[i].run(s, p, &op[i]);
+                }
+
+                ngx_linefeed(p);
+
+                buffer->pos = p;
+
+                continue;
+            }
+
+            if (buffer->event && buffer->event->timer_set) {
+                ngx_del_timer(buffer->event);
+            }
+        }
+
+    alloc_line:
+
+        line = ngx_pnalloc(s->connection->pool, len);
+        if (line == NULL) {
+            return NGX_ERROR;
+        }
+
+        p = line;
+
+        if (log[l].syslog_peer) {
+            p = ngx_syslog_add_header(log[l].syslog_peer, line);
+        }
+
+        for (i = 0; i < log[l].format->ops->nelts; i++) {
+            p = op[i].run(s, p, &op[i]);
+        }
+
+        if (log[l].syslog_peer) {
+
+            size = p - line;
+
+            n = ngx_syslog_send(log[l].syslog_peer, line, size);
+
+            if (n < 0) {
+                ngx_log_error(NGX_LOG_WARN, s->connection->log, 0,
+                              "send() to syslog failed");
+
+            } else if ((size_t) n != size) {
+                ngx_log_error(NGX_LOG_WARN, s->connection->log, 0,
+                              "send() to syslog has written only %z of %uz",
+                              n, size);
+            }
+
+            continue;
+        }
+
+        ngx_linefeed(p);
+
+        ngx_stream_log_write(s, &log[l], line, p - line);
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_stream_log_write(ngx_stream_session_t *s, ngx_stream_log_t *log,
+    u_char *buf, size_t len)
+{
+    u_char                *name;
+    time_t                 now;
+    ssize_t                n;
+    ngx_err_t              err;
+#if (NGX_ZLIB)
+    ngx_stream_log_buf_t  *buffer;
+#endif
+
+    if (log->script == NULL) {
+        name = log->file->name.data;
+
+#if (NGX_ZLIB)
+        buffer = log->file->data;
+
+        if (buffer && buffer->gzip) {
+            n = ngx_stream_log_gzip(log->file->fd, buf, len, buffer->gzip,
+                                    s->connection->log);
+        } else {
+            n = ngx_write_fd(log->file->fd, buf, len);
+        }
+#else
+        n = ngx_write_fd(log->file->fd, buf, len);
+#endif
+
+    } else {
+        name = NULL;
+        n = ngx_stream_log_script_write(s, log->script, &name, buf, len);
+    }
+
+    if (n == (ssize_t) len) {
+        return;
+    }
+
+    now = ngx_time();
+
+    if (n == -1) {
+        err = ngx_errno;
+
+        if (err == NGX_ENOSPC) {
+            log->disk_full_time = now;
+        }
+
+        if (now - log->error_log_time > 59) {
+            ngx_log_error(NGX_LOG_ALERT, s->connection->log, err,
+                          ngx_write_fd_n " to \"%s\" failed", name);
+
+            log->error_log_time = now;
+        }
+
+        return;
+    }
+
+    if (now - log->error_log_time > 59) {
+        ngx_log_error(NGX_LOG_ALERT, s->connection->log, 0,
+                      ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz",
+                      name, n, len);
+
+        log->error_log_time = now;
+    }
+}
+
+
+static ssize_t
+ngx_stream_log_script_write(ngx_stream_session_t *s,
+    ngx_stream_log_script_t *script, u_char **name, u_char *buf, size_t len)
+{
+    ssize_t                     n;
+    ngx_str_t                   log;
+    ngx_open_file_info_t        of;
+    ngx_stream_log_srv_conf_t  *lscf;
+
+    if (ngx_stream_script_run(s, &log, script->lengths->elts, 1,
+                              script->values->elts)
+        == NULL)
+    {
+        /* simulate successful logging */
+        return len;
+    }
+
+    log.data[log.len - 1] = '\0';
+    *name = log.data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "stream log \"%s\"", log.data);
+
+    lscf = ngx_stream_get_module_srv_conf(s, ngx_stream_log_module);
+
+    ngx_memzero(&of, sizeof(ngx_open_file_info_t));
+
+    of.log = 1;
+    of.valid = lscf->open_file_cache_valid;
+    of.min_uses = lscf->open_file_cache_min_uses;
+    of.directio = NGX_OPEN_FILE_DIRECTIO_OFF;
+
+    if (ngx_open_cached_file(lscf->open_file_cache, &log, &of,
+                             s->connection->pool)
+        != NGX_OK)
+    {
+        ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
+                      "%s \"%s\" failed", of.failed, log.data);
+        /* simulate successful logging */
+        return len;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "stream log #%d", of.fd);
+
+    n = ngx_write_fd(of.fd, buf, len);
+
+    return n;
+}
+
+
+#if (NGX_ZLIB)
+
+static ssize_t
+ngx_stream_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, ngx_int_t level,
+    ngx_log_t *log)
+{
+    int          rc, wbits, memlevel;
+    u_char      *out;
+    size_t       size;
+    ssize_t      n;
+    z_stream     zstream;
+    ngx_err_t    err;
+    ngx_pool_t  *pool;
+
+    wbits = MAX_WBITS;
+    memlevel = MAX_MEM_LEVEL - 1;
+
+    while ((ssize_t) len < ((1 << (wbits - 1)) - 262)) {
+        wbits--;
+        memlevel--;
+    }
+
+    /*
+     * This is a formula from deflateBound() for conservative upper bound of
+     * compressed data plus 18 bytes of gzip wrapper.
+     */
+
+    size = len + ((len + 7) >> 3) + ((len + 63) >> 6) + 5 + 18;
+
+    ngx_memzero(&zstream, sizeof(z_stream));
+
+    pool = ngx_create_pool(256, log);
+    if (pool == NULL) {
+        /* simulate successful logging */
+        return len;
+    }
+
+    pool->log = log;
+
+    zstream.zalloc = ngx_stream_log_gzip_alloc;
+    zstream.zfree = ngx_stream_log_gzip_free;
+    zstream.opaque = pool;
+
+    out = ngx_pnalloc(pool, size);
+    if (out == NULL) {
+        goto done;
+    }
+
+    zstream.next_in = buf;
+    zstream.avail_in = len;
+    zstream.next_out = out;
+    zstream.avail_out = size;
+
+    rc = deflateInit2(&zstream, (int) level, Z_DEFLATED, wbits + 16, memlevel,
+                      Z_DEFAULT_STRATEGY);
+
+    if (rc != Z_OK) {
+        ngx_log_error(NGX_LOG_ALERT, log, 0, "deflateInit2() failed: %d", rc);
+        goto done;
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_STREAM, log, 0,
+                   "deflate in: ni:%p no:%p ai:%ud ao:%ud",
+                   zstream.next_in, zstream.next_out,
+                   zstream.avail_in, zstream.avail_out);
+
+    rc = deflate(&zstream, Z_FINISH);
+
+    if (rc != Z_STREAM_END) {
+        ngx_log_error(NGX_LOG_ALERT, log, 0,
+                      "deflate(Z_FINISH) failed: %d", rc);
+        goto done;
+    }
+
+    ngx_log_debug5(NGX_LOG_DEBUG_STREAM, log, 0,
+                   "deflate out: ni:%p no:%p ai:%ud ao:%ud rc:%d",
+                   zstream.next_in, zstream.next_out,
+                   zstream.avail_in, zstream.avail_out,
+                   rc);
+
+    size -= zstream.avail_out;
+
+    rc = deflateEnd(&zstream);
+
+    if (rc != Z_OK) {
+        ngx_log_error(NGX_LOG_ALERT, log, 0, "deflateEnd() failed: %d", rc);
+        goto done;
+    }
+
+    n = ngx_write_fd(fd, out, size);
+
+    if (n != (ssize_t) size) {
+        err = (n == -1) ? ngx_errno : 0;
+
+        ngx_destroy_pool(pool);
+
+        ngx_set_errno(err);
+        return -1;
+    }
+
+done:
+
+    ngx_destroy_pool(pool);
+
+    /* simulate successful logging */
+    return len;
+}
+
+
+static void *
+ngx_stream_log_gzip_alloc(void *opaque, u_int items, u_int size)
+{
+    ngx_pool_t *pool = opaque;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_STREAM, pool->log, 0,
+                   "gzip alloc: n:%ud s:%ud", items, size);
+
+    return ngx_palloc(pool, items * size);
+}
+
+
+static void
+ngx_stream_log_gzip_free(void *opaque, void *address)
+{
+#if 0
+    ngx_pool_t *pool = opaque;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, pool->log, 0,
+                   "gzip free: %p", address);
+#endif
+}
+
+#endif
+
+
+static void
+ngx_stream_log_flush(ngx_open_file_t *file, ngx_log_t *log)
+{
+    size_t                 len;
+    ssize_t                n;
+    ngx_stream_log_buf_t  *buffer;
+
+    buffer = file->data;
+
+    len = buffer->pos - buffer->start;
+
+    if (len == 0) {
+        return;
+    }
+
+#if (NGX_ZLIB)
+    if (buffer->gzip) {
+        n = ngx_stream_log_gzip(file->fd, buffer->start, len, buffer->gzip,
+                                log);
+    } else {
+        n = ngx_write_fd(file->fd, buffer->start, len);
+    }
+#else
+    n = ngx_write_fd(file->fd, buffer->start, len);
+#endif
+
+    if (n == -1) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      ngx_write_fd_n " to \"%s\" failed",
+                      file->name.data);
+
+    } else if ((size_t) n != len) {
+        ngx_log_error(NGX_LOG_ALERT, log, 0,
+                      ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz",
+                      file->name.data, n, len);
+    }
+
+    buffer->pos = buffer->start;
+
+    if (buffer->event && buffer->event->timer_set) {
+        ngx_del_timer(buffer->event);
+    }
+}
+
+
+static void
+ngx_stream_log_flush_handler(ngx_event_t *ev)
+{
+    ngx_open_file_t       *file;
+    ngx_stream_log_buf_t  *buffer;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                   "stream log buffer flush handler");
+
+    if (ev->timedout) {
+        ngx_stream_log_flush(ev->data, ev->log);
+        return;
+    }
+
+    /* cancel the flush timer for graceful shutdown */
+
+    file = ev->data;
+    buffer = file->data;
+
+    buffer->event = NULL;
+}
+
+
+static u_char *
+ngx_stream_log_copy_short(ngx_stream_session_t *s, u_char *buf,
+    ngx_stream_log_op_t *op)
+{
+    size_t     len;
+    uintptr_t  data;
+
+    len = op->len;
+    data = op->data;
+
+    while (len--) {
+        *buf++ = (u_char) (data & 0xff);
+        data >>= 8;
+    }
+
+    return buf;
+}
+
+
+static u_char *
+ngx_stream_log_copy_long(ngx_stream_session_t *s, u_char *buf,
+    ngx_stream_log_op_t *op)
+{
+    return ngx_cpymem(buf, (u_char *) op->data, op->len);
+}
+
+
+static ngx_int_t
+ngx_stream_log_variable_compile(ngx_conf_t *cf, ngx_stream_log_op_t *op,
+    ngx_str_t *value)
+{
+    ngx_int_t  index;
+
+    index = ngx_stream_get_variable_index(cf, value);
+    if (index == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    op->len = 0;
+    op->getlen = ngx_stream_log_variable_getlen;
+    op->run = ngx_stream_log_variable;
+    op->data = index;
+
+    return NGX_OK;
+}
+
+
+static size_t
+ngx_stream_log_variable_getlen(ngx_stream_session_t *s, uintptr_t data)
+{
+    uintptr_t                     len;
+    ngx_stream_variable_value_t  *value;
+
+    value = ngx_stream_get_indexed_variable(s, data);
+
+    if (value == NULL || value->not_found) {
+        return 1;
+    }
+
+    len = ngx_stream_log_escape(NULL, value->data, value->len);
+
+    value->escape = len ? 1 : 0;
+
+    return value->len + len * 3;
+}
+
+
+static u_char *
+ngx_stream_log_variable(ngx_stream_session_t *s, u_char *buf,
+    ngx_stream_log_op_t *op)
+{
+    ngx_stream_variable_value_t  *value;
+
+    value = ngx_stream_get_indexed_variable(s, op->data);
+
+    if (value == NULL || value->not_found) {
+        *buf = '-';
+        return buf + 1;
+    }
+
+    if (value->escape == 0) {
+        return ngx_cpymem(buf, value->data, value->len);
+
+    } else {
+        return (u_char *) ngx_stream_log_escape(buf, value->data, value->len);
+    }
+}
+
+
+static uintptr_t
+ngx_stream_log_escape(u_char *dst, u_char *src, size_t size)
+{
+    ngx_uint_t      n;
+    static u_char   hex[] = "0123456789ABCDEF";
+
+    static uint32_t   escape[] = {
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+
+                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
+        0x00000004, /* 0000 0000 0000 0000  0000 0000 0000 0100 */
+
+                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
+        0x10000000, /* 0001 0000 0000 0000  0000 0000 0000 0000 */
+
+                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
+        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
+
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+    };
+
+
+    if (dst == NULL) {
+
+        /* find the number of the characters to be escaped */
+
+        n = 0;
+
+        while (size) {
+            if (escape[*src >> 5] & (1U << (*src & 0x1f))) {
+                n++;
+            }
+            src++;
+            size--;
+        }
+
+        return (uintptr_t) n;
+    }
+
+    while (size) {
+        if (escape[*src >> 5] & (1U << (*src & 0x1f))) {
+            *dst++ = '\\';
+            *dst++ = 'x';
+            *dst++ = hex[*src >> 4];
+            *dst++ = hex[*src & 0xf];
+            src++;
+
+        } else {
+            *dst++ = *src++;
+        }
+        size--;
+    }
+
+    return (uintptr_t) dst;
+}
+
+
+static void *
+ngx_stream_log_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_stream_log_main_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_log_main_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    if (ngx_array_init(&conf->formats, cf->pool, 4,
+                       sizeof(ngx_stream_log_fmt_t))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    return conf;
+}
+
+
+static void *
+ngx_stream_log_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_stream_log_srv_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_log_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->open_file_cache = NGX_CONF_UNSET_PTR;
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_log_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_stream_log_srv_conf_t *prev = parent;
+    ngx_stream_log_srv_conf_t *conf = child;
+
+    if (conf->open_file_cache == NGX_CONF_UNSET_PTR) {
+
+        conf->open_file_cache = prev->open_file_cache;
+        conf->open_file_cache_valid = prev->open_file_cache_valid;
+        conf->open_file_cache_min_uses = prev->open_file_cache_min_uses;
+
+        if (conf->open_file_cache == NGX_CONF_UNSET_PTR) {
+            conf->open_file_cache = NULL;
+        }
+    }
+
+    if (conf->logs || conf->off) {
+        return NGX_CONF_OK;
+    }
+
+    conf->logs = prev->logs;
+    conf->off = prev->off;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_stream_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_log_srv_conf_t *lscf = conf;
+
+    ssize_t                              size;
+    ngx_int_t                            gzip;
+    ngx_uint_t                           i, n;
+    ngx_msec_t                           flush;
+    ngx_str_t                           *value, name, s;
+    ngx_stream_log_t                    *log;
+    ngx_syslog_peer_t                   *peer;
+    ngx_stream_log_buf_t                *buffer;
+    ngx_stream_log_fmt_t                *fmt;
+    ngx_stream_script_compile_t          sc;
+    ngx_stream_log_main_conf_t          *lmcf;
+    ngx_stream_compile_complex_value_t   ccv;
+
+    value = cf->args->elts;
+
+    if (ngx_strcmp(value[1].data, "off") == 0) {
+        lscf->off = 1;
+        if (cf->args->nelts == 2) {
+            return NGX_CONF_OK;
+        }
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\"", &value[2]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (lscf->logs == NULL) {
+        lscf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_stream_log_t));
+        if (lscf->logs == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    lmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_log_module);
+
+    log = ngx_array_push(lscf->logs);
+    if (log == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(log, sizeof(ngx_stream_log_t));
+
+
+    if (ngx_strncmp(value[1].data, "syslog:", 7) == 0) {
+
+        peer = ngx_pcalloc(cf->pool, sizeof(ngx_syslog_peer_t));
+        if (peer == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        if (ngx_syslog_process_conf(cf, peer) != NGX_CONF_OK) {
+            return NGX_CONF_ERROR;
+        }
+
+        log->syslog_peer = peer;
+
+        goto process_formats;
+    }
+
+    n = ngx_stream_script_variables_count(&value[1]);
+
+    if (n == 0) {
+        log->file = ngx_conf_open_file(cf->cycle, &value[1]);
+        if (log->file == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+    } else {
+        if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+
+        log->script = ngx_pcalloc(cf->pool, sizeof(ngx_stream_log_script_t));
+        if (log->script == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        ngx_memzero(&sc, sizeof(ngx_stream_script_compile_t));
+
+        sc.cf = cf;
+        sc.source = &value[1];
+        sc.lengths = &log->script->lengths;
+        sc.values = &log->script->values;
+        sc.variables = n;
+        sc.complete_lengths = 1;
+        sc.complete_values = 1;
+
+        if (ngx_stream_script_compile(&sc) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+process_formats:
+
+    if (cf->args->nelts >= 3) {
+        name = value[2];
+
+    } else {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "log format is not specified");
+        return NGX_CONF_ERROR;
+    }
+
+    fmt = lmcf->formats.elts;
+    for (i = 0; i < lmcf->formats.nelts; i++) {
+        if (fmt[i].name.len == name.len
+            && ngx_strcasecmp(fmt[i].name.data, name.data) == 0)
+        {
+            log->format = &fmt[i];
+            break;
+        }
+    }
+
+    if (log->format == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "unknown log format \"%V\"", &name);
+        return NGX_CONF_ERROR;
+    }
+
+    size = 0;
+    flush = 0;
+    gzip = 0;
+
+    for (i = 3; i < cf->args->nelts; i++) {
+
+        if (ngx_strncmp(value[i].data, "buffer=", 7) == 0) {
+            s.len = value[i].len - 7;
+            s.data = value[i].data + 7;
+
+            size = ngx_parse_size(&s);
+
+            if (size == NGX_ERROR || size == 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid buffer size \"%V\"", &s);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "flush=", 6) == 0) {
+            s.len = value[i].len - 6;
+            s.data = value[i].data + 6;
+
+            flush = ngx_parse_time(&s, 0);
+
+            if (flush == (ngx_msec_t) NGX_ERROR || flush == 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid flush time \"%V\"", &s);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "gzip", 4) == 0
+            && (value[i].len == 4 || value[i].data[4] == '='))
+        {
+#if (NGX_ZLIB)
+            if (size == 0) {
+                size = 64 * 1024;
+            }
+
+            if (value[i].len == 4) {
+                gzip = Z_BEST_SPEED;
+                continue;
+            }
+
+            s.len = value[i].len - 5;
+            s.data = value[i].data + 5;
+
+            gzip = ngx_atoi(s.data, s.len);
+
+            if (gzip < 1 || gzip > 9) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid compression level \"%V\"", &s);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+
+#else
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "nginx was built without zlib support");
+            return NGX_CONF_ERROR;
+#endif
+        }
+
+        if (ngx_strncmp(value[i].data, "if=", 3) == 0) {
+            s.len = value[i].len - 3;
+            s.data = value[i].data + 3;
+
+            ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+            ccv.cf = cf;
+            ccv.value = &s;
+            ccv.complex_value = ngx_palloc(cf->pool,
+                                           sizeof(ngx_stream_complex_value_t));
+            if (ccv.complex_value == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+                return NGX_CONF_ERROR;
+            }
+
+            log->filter = ccv.complex_value;
+
+            continue;
+        }
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\"", &value[i]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (flush && size == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "no buffer is defined for access_log \"%V\"",
+                           &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (size) {
+
+        if (log->script) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "buffered logs cannot have variables in name");
+            return NGX_CONF_ERROR;
+        }
+
+        if (log->syslog_peer) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "logs to syslog cannot be buffered");
+            return NGX_CONF_ERROR;
+        }
+
+        if (log->file->data) {
+            buffer = log->file->data;
+
+            if (buffer->last - buffer->start != size
+                || buffer->flush != flush
+                || buffer->gzip != gzip)
+            {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "access_log \"%V\" already defined "
+                                   "with conflicting parameters",
+                                   &value[1]);
+                return NGX_CONF_ERROR;
+            }
+
+            return NGX_CONF_OK;
+        }
+
+        buffer = ngx_pcalloc(cf->pool, sizeof(ngx_stream_log_buf_t));
+        if (buffer == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        buffer->start = ngx_pnalloc(cf->pool, size);
+        if (buffer->start == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        buffer->pos = buffer->start;
+        buffer->last = buffer->start + size;
+
+        if (flush) {
+            buffer->event = ngx_pcalloc(cf->pool, sizeof(ngx_event_t));
+            if (buffer->event == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            buffer->event->data = log->file;
+            buffer->event->handler = ngx_stream_log_flush_handler;
+            buffer->event->log = &cf->cycle->new_log;
+            buffer->event->cancelable = 1;
+
+            buffer->flush = flush;
+        }
+
+        buffer->gzip = gzip;
+
+        log->file->flush = ngx_stream_log_flush;
+        log->file->data = buffer;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_stream_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_log_main_conf_t *lmcf = conf;
+
+    ngx_str_t             *value;
+    ngx_uint_t             i;
+    ngx_stream_log_fmt_t  *fmt;
+
+    value = cf->args->elts;
+
+    fmt = lmcf->formats.elts;
+    for (i = 0; i < lmcf->formats.nelts; i++) {
+        if (fmt[i].name.len == value[1].len
+            && ngx_strcmp(fmt[i].name.data, value[1].data) == 0)
+        {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "duplicate \"log_format\" name \"%V\"",
+                               &value[1]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    fmt = ngx_array_push(&lmcf->formats);
+    if (fmt == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    fmt->name = value[1];
+
+    fmt->flushes = ngx_array_create(cf->pool, 4, sizeof(ngx_int_t));
+    if (fmt->flushes == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_stream_log_op_t));
+    if (fmt->ops == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    return ngx_stream_log_compile_format(cf, fmt->flushes, fmt->ops,
+                                         cf->args, 2);
+}
+
+
+static char *
+ngx_stream_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
+    ngx_array_t *ops, ngx_array_t *args, ngx_uint_t s)
+{
+    u_char                *data, *p, ch;
+    size_t                 i, len;
+    ngx_str_t             *value, var;
+    ngx_int_t             *flush;
+    ngx_uint_t             bracket;
+    ngx_stream_log_op_t   *op;
+
+    value = args->elts;
+
+    for ( /* void */ ; s < args->nelts; s++) {
+
+        i = 0;
+
+        while (i < value[s].len) {
+
+            op = ngx_array_push(ops);
+            if (op == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            data = &value[s].data[i];
+
+            if (value[s].data[i] == '$') {
+
+                if (++i == value[s].len) {
+                    goto invalid;
+                }
+
+                if (value[s].data[i] == '{') {
+                    bracket = 1;
+
+                    if (++i == value[s].len) {
+                        goto invalid;
+                    }
+
+                    var.data = &value[s].data[i];
+
+                } else {
+                    bracket = 0;
+                    var.data = &value[s].data[i];
+                }
+
+                for (var.len = 0; i < value[s].len; i++, var.len++) {
+                    ch = value[s].data[i];
+
+                    if (ch == '}' && bracket) {
+                        i++;
+                        bracket = 0;
+                        break;
+                    }
+
+                    if ((ch >= 'A' && ch <= 'Z')
+                        || (ch >= 'a' && ch <= 'z')
+                        || (ch >= '0' && ch <= '9')
+                        || ch == '_')
+                    {
+                        continue;
+                    }
+
+                    break;
+                }
+
+                if (bracket) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "the closing bracket in \"%V\" "
+                                       "variable is missing", &var);
+                    return NGX_CONF_ERROR;
+                }
+
+                if (var.len == 0) {
+                    goto invalid;
+                }
+
+                if (ngx_stream_log_variable_compile(cf, op, &var) != NGX_OK) {
+                    return NGX_CONF_ERROR;
+                }
+
+                if (flushes) {
+
+                    flush = ngx_array_push(flushes);
+                    if (flush == NULL) {
+                        return NGX_CONF_ERROR;
+                    }
+
+                    *flush = op->data; /* variable index */
+                }
+
+                continue;
+            }
+
+            i++;
+
+            while (i < value[s].len && value[s].data[i] != '$') {
+                i++;
+            }
+
+            len = &value[s].data[i] - data;
+
+            if (len) {
+
+                op->len = len;
+                op->getlen = NULL;
+
+                if (len <= sizeof(uintptr_t)) {
+                    op->run = ngx_stream_log_copy_short;
+                    op->data = 0;
+
+                    while (len--) {
+                        op->data <<= 8;
+                        op->data |= data[len];
+                    }
+
+                } else {
+                    op->run = ngx_stream_log_copy_long;
+
+                    p = ngx_pnalloc(cf->pool, len);
+                    if (p == NULL) {
+                        return NGX_CONF_ERROR;
+                    }
+
+                    ngx_memcpy(p, data, len);
+                    op->data = (uintptr_t) p;
+                }
+            }
+        }
+    }
+
+    return NGX_CONF_OK;
+
+invalid:
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%s\"", data);
+
+    return NGX_CONF_ERROR;
+}
+
+
+static char *
+ngx_stream_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_log_srv_conf_t *lscf = conf;
+
+    time_t       inactive, valid;
+    ngx_str_t   *value, s;
+    ngx_int_t    max, min_uses;
+    ngx_uint_t   i;
+
+    if (lscf->open_file_cache != NGX_CONF_UNSET_PTR) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    max = 0;
+    inactive = 10;
+    valid = 60;
+    min_uses = 1;
+
+    for (i = 1; i < cf->args->nelts; i++) {
+
+        if (ngx_strncmp(value[i].data, "max=", 4) == 0) {
+
+            max = ngx_atoi(value[i].data + 4, value[i].len - 4);
+            if (max == NGX_ERROR) {
+                goto failed;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "inactive=", 9) == 0) {
+
+            s.len = value[i].len - 9;
+            s.data = value[i].data + 9;
+
+            inactive = ngx_parse_time(&s, 1);
+            if (inactive == (time_t) NGX_ERROR) {
+                goto failed;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "min_uses=", 9) == 0) {
+
+            min_uses = ngx_atoi(value[i].data + 9, value[i].len - 9);
+            if (min_uses == NGX_ERROR) {
+                goto failed;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "valid=", 6) == 0) {
+
+            s.len = value[i].len - 6;
+            s.data = value[i].data + 6;
+
+            valid = ngx_parse_time(&s, 1);
+            if (valid == (time_t) NGX_ERROR) {
+                goto failed;
+            }
+
+            continue;
+        }
+
+        if (ngx_strcmp(value[i].data, "off") == 0) {
+
+            lscf->open_file_cache = NULL;
+
+            continue;
+        }
+
+    failed:
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid \"open_log_file_cache\" parameter \"%V\"",
+                           &value[i]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (lscf->open_file_cache == NULL) {
+        return NGX_CONF_OK;
+    }
+
+    if (max == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                        "\"open_log_file_cache\" must have \"max\" parameter");
+        return NGX_CONF_ERROR;
+    }
+
+    lscf->open_file_cache = ngx_open_file_cache_init(cf->pool, max, inactive);
+
+    if (lscf->open_file_cache) {
+
+        lscf->open_file_cache_valid = valid;
+        lscf->open_file_cache_min_uses = min_uses;
+
+        return NGX_CONF_OK;
+    }
+
+    return NGX_CONF_ERROR;
+}
+
+
+static ngx_int_t
+ngx_stream_log_init(ngx_conf_t *cf)
+{
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    cmcf->access_log_handler = ngx_stream_log_handler;
+
+    return NGX_OK;
+}
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 9d43109..ed802e7 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -73,7 +73,7 @@ static ngx_int_t ngx_stream_proxy_test_connect(ngx_connection_t *c);
 static void ngx_stream_proxy_process(ngx_stream_session_t *s,
     ngx_uint_t from_upstream, ngx_uint_t do_write);
 static void ngx_stream_proxy_next_upstream(ngx_stream_session_t *s);
-static void ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_int_t rc);
+static void ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc);
 static u_char *ngx_stream_proxy_log_error(ngx_log_t *log, u_char *buf,
     size_t len);
 
@@ -368,7 +368,7 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
 
     u = ngx_pcalloc(c->pool, sizeof(ngx_stream_upstream_t));
     if (u == NULL) {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
@@ -380,7 +380,7 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
     u->peer.log_error = NGX_ERROR_ERR;
 
     if (ngx_stream_proxy_set_local(s, u, pscf->local) != NGX_OK) {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
@@ -392,10 +392,17 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
     c->write->handler = ngx_stream_proxy_downstream_handler;
     c->read->handler = ngx_stream_proxy_downstream_handler;
 
+    s->upstream_states = ngx_array_create(c->pool, 1,
+                                          sizeof(ngx_stream_upstream_state_t));
+    if (s->upstream_states == NULL) {
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
     if (c->type == SOCK_STREAM) {
         p = ngx_pnalloc(c->pool, pscf->buffer_size);
         if (p == NULL) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
 
@@ -418,7 +425,7 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
             p = ngx_proxy_protocol_write(c, u->downstream_buf.last,
                                          u->downstream_buf.end);
             if (p == NULL) {
-                ngx_stream_proxy_finalize(s, NGX_ERROR);
+                ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
                 return;
             }
 
@@ -433,7 +440,7 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
 
     if (pscf->upstream_value) {
         if (ngx_stream_proxy_eval(s, pscf) != NGX_OK) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
     }
@@ -457,14 +464,14 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
             {
                 ngx_log_error(NGX_LOG_ERR, c->log, 0,
                               "no port in upstream \"%V\"", host);
-                ngx_stream_proxy_finalize(s, NGX_ERROR);
+                ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
                 return;
             }
 
             if (ngx_stream_upstream_create_round_robin_peer(s, u->resolved)
                 != NGX_OK)
             {
-                ngx_stream_proxy_finalize(s, NGX_ERROR);
+                ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
                 return;
             }
 
@@ -493,7 +500,7 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
         if (u->resolved->port == 0) {
             ngx_log_error(NGX_LOG_ERR, c->log, 0,
                           "no port in upstream \"%V\"", host);
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
 
@@ -503,14 +510,14 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
 
         ctx = ngx_resolve_start(cscf->resolver, &temp);
         if (ctx == NULL) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
 
         if (ctx == NGX_NO_RESOLVER) {
             ngx_log_error(NGX_LOG_ERR, c->log, 0,
                           "no resolver defined to resolve %V", host);
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
 
@@ -523,7 +530,7 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
 
         if (ngx_resolve_name(ctx) != NGX_OK) {
             u->resolved->ctx = NULL;
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
 
@@ -534,16 +541,16 @@ found:
 
     if (uscf == NULL) {
         ngx_log_error(NGX_LOG_ALERT, c->log, 0, "no upstream configuration");
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
-#if (NGX_HTTP_SSL)
+#if (NGX_STREAM_SSL)
     u->ssl_name = uscf->host;
 #endif
 
     if (uscf->peer.init(s, uscf) != NGX_OK) {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
@@ -677,18 +684,36 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
 
     u = s->upstream;
 
+    if (u->state) {
+        u->state->response_time = ngx_current_msec - u->state->response_time;
+    }
+
+    u->state = ngx_array_push(s->upstream_states);
+    if (u->state == NULL) {
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    ngx_memzero(u->state, sizeof(ngx_stream_upstream_state_t));
+
+    u->state->connect_time = (ngx_msec_t) -1;
+    u->state->first_byte_time = (ngx_msec_t) -1;
+    u->state->response_time = ngx_current_msec;
+
     rc = ngx_event_connect_peer(&u->peer);
 
     ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0, "proxy connect: %i", rc);
 
     if (rc == NGX_ERROR) {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
+    u->state->peer = u->peer.name;
+
     if (rc == NGX_BUSY) {
         ngx_log_error(NGX_LOG_ERR, c->log, 0, "no live upstreams");
-        ngx_stream_proxy_finalize(s, NGX_DECLINED);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_BAD_GATEWAY);
         return;
     }
 
@@ -796,12 +821,14 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
         }
     }
 
+    u->state->connect_time = ngx_current_msec - u->state->response_time;
+
     c->log->action = "proxying connection";
 
     if (u->upstream_buf.start == NULL) {
         p = ngx_pnalloc(c->pool, pscf->buffer_size);
         if (p == NULL) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
 
@@ -851,7 +878,7 @@ ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
 
     p = ngx_proxy_protocol_write(c, buf, buf + NGX_PROXY_PROTOCOL_MAX_HEADER);
     if (p == NULL) {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return NGX_ERROR;
     }
 
@@ -865,7 +892,7 @@ ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
 
     if (n == NGX_AGAIN) {
         if (ngx_handle_write_event(pc->write, 0) != NGX_OK) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return NGX_ERROR;
         }
 
@@ -879,7 +906,7 @@ ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
     }
 
     if (n == NGX_ERROR) {
-        ngx_stream_proxy_finalize(s, NGX_DECLINED);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
         return NGX_ERROR;
     }
 
@@ -895,7 +922,7 @@ ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
         ngx_log_error(NGX_LOG_ERR, c->log, 0,
                       "could not send PROXY protocol header at once");
 
-        ngx_stream_proxy_finalize(s, NGX_DECLINED);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
 
         return NGX_ERROR;
     }
@@ -947,20 +974,20 @@ ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s)
     if (ngx_ssl_create_connection(pscf->ssl, pc, NGX_SSL_BUFFER|NGX_SSL_CLIENT)
         != NGX_OK)
     {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
     if (pscf->ssl_server_name || pscf->ssl_verify) {
         if (ngx_stream_proxy_ssl_name(s) != NGX_OK) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
     }
 
     if (pscf->ssl_session_reuse) {
         if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
     }
@@ -1157,7 +1184,7 @@ ngx_stream_proxy_resolve_handler(ngx_resolver_ctx_t *ctx)
     u = s->upstream;
     ur = u->resolved;
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
                    "stream upstream resolve");
 
     if (ctx->state) {
@@ -1166,7 +1193,7 @@ ngx_stream_proxy_resolve_handler(ngx_resolver_ctx_t *ctx)
                       &ctx->name, ctx->state,
                       ngx_resolver_strerror(ctx->state));
 
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
@@ -1192,7 +1219,7 @@ ngx_stream_proxy_resolve_handler(ngx_resolver_ctx_t *ctx)
 #endif
 
     if (ngx_stream_upstream_create_round_robin_peer(s, ur) != NGX_OK) {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
@@ -1245,7 +1272,8 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
 
             if (!ev->ready) {
                 if (ngx_handle_read_event(ev, 0) != NGX_OK) {
-                    ngx_stream_proxy_finalize(s, NGX_ERROR);
+                    ngx_stream_proxy_finalize(s,
+                                              NGX_STREAM_INTERNAL_SERVER_ERROR);
                     return;
                 }
 
@@ -1279,7 +1307,7 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
             }
 
             ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out");
-            ngx_stream_proxy_finalize(s, NGX_DECLINED);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
             return;
         }
 
@@ -1289,7 +1317,7 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
                        "stream connection delayed");
 
         if (ngx_handle_read_event(ev, 0) != NGX_OK) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         }
 
         return;
@@ -1407,7 +1435,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 
         c->log->handler = handler;
 
-        ngx_stream_proxy_finalize(s, NGX_OK);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
         return;
     }
 
@@ -1449,7 +1477,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                         return;
                     }
 
-                    ngx_stream_proxy_finalize(s, NGX_DECLINED);
+                    ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
                     return;
                 }
 
@@ -1500,6 +1528,13 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                     }
                 }
 
+                if (from_upstream) {
+                    if (u->state->first_byte_time == (ngx_msec_t) -1) {
+                        u->state->first_byte_time = ngx_current_msec
+                                                    - u->state->response_time;
+                    }
+                }
+
                 if (c->type == SOCK_DGRAM && ++u->responses == pscf->responses)
                 {
                     src->read->ready = 0;
@@ -1540,20 +1575,20 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 
         c->log->handler = handler;
 
-        ngx_stream_proxy_finalize(s, NGX_OK);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
         return;
     }
 
     flags = src->read->eof ? NGX_CLOSE_EVENT : 0;
 
     if (!src->shared && ngx_handle_read_event(src->read, flags) != NGX_OK) {
-        ngx_stream_proxy_finalize(s, NGX_ERROR);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
     if (dst) {
         if (!dst->shared && ngx_handle_write_event(dst->write, 0) != NGX_OK) {
-            ngx_stream_proxy_finalize(s, NGX_ERROR);
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
 
@@ -1593,7 +1628,7 @@ ngx_stream_proxy_next_upstream(ngx_stream_session_t *s)
         || !pscf->next_upstream
         || (timeout && ngx_current_msec - u->peer.start_time >= timeout))
     {
-        ngx_stream_proxy_finalize(s, NGX_DECLINED);
+        ngx_stream_proxy_finalize(s, NGX_STREAM_BAD_GATEWAY);
         return;
     }
 
@@ -1612,6 +1647,9 @@ ngx_stream_proxy_next_upstream(ngx_stream_session_t *s)
         }
 #endif
 
+        u->state->bytes_received = u->received;
+        u->state->bytes_sent = pc->sent;
+
         ngx_close_connection(pc);
         u->peer.connection = NULL;
     }
@@ -1621,7 +1659,7 @@ ngx_stream_proxy_next_upstream(ngx_stream_session_t *s)
 
 
 static void
-ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_int_t rc)
+ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc)
 {
     ngx_connection_t       *pc;
     ngx_stream_upstream_t  *u;
@@ -1640,13 +1678,22 @@ ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_int_t rc)
         u->resolved->ctx = NULL;
     }
 
+    pc = u->peer.connection;
+
+    if (u->state) {
+        u->state->response_time = ngx_current_msec - u->state->response_time;
+
+        if (pc) {
+            u->state->bytes_received = u->received;
+            u->state->bytes_sent = pc->sent;
+        }
+    }
+
     if (u->peer.free && u->peer.sockaddr) {
         u->peer.free(&u->peer, u->peer.data, 0);
         u->peer.sockaddr = NULL;
     }
 
-    pc = u->peer.connection;
-
     if (pc) {
         ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
                        "close stream proxy upstream connection: %d", pc->fd);
@@ -1664,7 +1711,7 @@ ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_int_t rc)
 
 noupstream:
 
-    ngx_stream_close_connection(s->connection);
+    ngx_stream_finalize_session(s, rc);
 }
 
 
diff --git a/src/stream/ngx_stream_realip_module.c b/src/stream/ngx_stream_realip_module.c
new file mode 100644
index 0000000..8ce05a0
--- /dev/null
+++ b/src/stream/ngx_stream_realip_module.c
@@ -0,0 +1,342 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    ngx_array_t       *from;     /* array of ngx_cidr_t */
+} ngx_stream_realip_srv_conf_t;
+
+
+typedef struct {
+    struct sockaddr   *sockaddr;
+    socklen_t          socklen;
+    ngx_str_t          addr_text;
+} ngx_stream_realip_ctx_t;
+
+
+static ngx_int_t ngx_stream_realip_handler(ngx_stream_session_t *s);
+static ngx_int_t ngx_stream_realip_set_addr(ngx_stream_session_t *s,
+    ngx_addr_t *addr);
+static char *ngx_stream_realip_from(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static void *ngx_stream_realip_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_stream_realip_merge_srv_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static ngx_int_t ngx_stream_realip_add_variables(ngx_conf_t *cf);
+static ngx_int_t ngx_stream_realip_init(ngx_conf_t *cf);
+
+
+static ngx_int_t ngx_stream_realip_remote_addr_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_realip_remote_port_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+
+
+static ngx_command_t  ngx_stream_realip_commands[] = {
+
+    { ngx_string("set_real_ip_from"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_stream_realip_from,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_realip_module_ctx = {
+    ngx_stream_realip_add_variables,       /* preconfiguration */
+    ngx_stream_realip_init,                /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    ngx_stream_realip_create_srv_conf,     /* create server configuration */
+    ngx_stream_realip_merge_srv_conf       /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_realip_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_realip_module_ctx,         /* module context */
+    ngx_stream_realip_commands,            /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_stream_variable_t  ngx_stream_realip_vars[] = {
+
+    { ngx_string("realip_remote_addr"), NULL,
+      ngx_stream_realip_remote_addr_variable, 0, 0, 0 },
+
+    { ngx_string("realip_remote_port"), NULL,
+      ngx_stream_realip_remote_port_variable, 0, 0, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
+static ngx_int_t
+ngx_stream_realip_handler(ngx_stream_session_t *s)
+{
+    ngx_addr_t                     addr;
+    ngx_connection_t              *c;
+    ngx_stream_realip_srv_conf_t  *rscf;
+
+    rscf = ngx_stream_get_module_srv_conf(s, ngx_stream_realip_module);
+
+    if (rscf->from == NULL) {
+        return NGX_DECLINED;
+    }
+
+    c = s->connection;
+
+    if (c->proxy_protocol_addr.len == 0) {
+        return NGX_DECLINED;
+    }
+
+    if (ngx_cidr_match(c->sockaddr, rscf->from) != NGX_OK) {
+        return NGX_DECLINED;
+    }
+
+    if (ngx_parse_addr(c->pool, &addr, c->proxy_protocol_addr.data,
+                       c->proxy_protocol_addr.len)
+        != NGX_OK)
+    {
+        return NGX_DECLINED;
+    }
+
+    ngx_inet_set_port(addr.sockaddr, c->proxy_protocol_port);
+
+    return ngx_stream_realip_set_addr(s, &addr);
+}
+
+
+static ngx_int_t
+ngx_stream_realip_set_addr(ngx_stream_session_t *s, ngx_addr_t *addr)
+{
+    size_t                    len;
+    u_char                   *p;
+    u_char                    text[NGX_SOCKADDR_STRLEN];
+    ngx_connection_t         *c;
+    ngx_stream_realip_ctx_t  *ctx;
+
+    c = s->connection;
+
+    ctx = ngx_palloc(c->pool, sizeof(ngx_stream_realip_ctx_t));
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    len = ngx_sock_ntop(addr->sockaddr, addr->socklen, text,
+                        NGX_SOCKADDR_STRLEN, 0);
+    if (len == 0) {
+        return NGX_ERROR;
+    }
+
+    p = ngx_pnalloc(c->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(p, text, len);
+
+    ngx_stream_set_ctx(s, ctx, ngx_stream_realip_module);
+
+    ctx->sockaddr = c->sockaddr;
+    ctx->socklen = c->socklen;
+    ctx->addr_text = c->addr_text;
+
+    c->sockaddr = addr->sockaddr;
+    c->socklen = addr->socklen;
+    c->addr_text.len = len;
+    c->addr_text.data = p;
+
+    return NGX_DECLINED;
+}
+
+
+static char *
+ngx_stream_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_realip_srv_conf_t *rscf = conf;
+
+    ngx_int_t                rc;
+    ngx_str_t               *value;
+    ngx_cidr_t              *cidr;
+
+    value = cf->args->elts;
+
+    if (rscf->from == NULL) {
+        rscf->from = ngx_array_create(cf->pool, 2,
+                                      sizeof(ngx_cidr_t));
+        if (rscf->from == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    cidr = ngx_array_push(rscf->from);
+    if (cidr == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+
+    if (ngx_strcmp(value[1].data, "unix:") == 0) {
+        cidr->family = AF_UNIX;
+        return NGX_CONF_OK;
+    }
+
+#endif
+
+    rc = ngx_ptocidr(&value[1], cidr);
+
+    if (rc == NGX_ERROR) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"",
+                           &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "low address bits of %V are meaningless", &value[1]);
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_stream_realip_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_stream_realip_srv_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_realip_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->from = NULL;
+     */
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_realip_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_stream_realip_srv_conf_t *prev = parent;
+    ngx_stream_realip_srv_conf_t *conf = child;
+
+    if (conf->from == NULL) {
+        conf->from = prev->from;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_realip_add_variables(ngx_conf_t *cf)
+{
+    ngx_stream_variable_t  *var, *v;
+
+    for (v = ngx_stream_realip_vars; v->name.len; v++) {
+        var = ngx_stream_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_realip_init(ngx_conf_t *cf)
+{
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    cmcf->realip_handler = ngx_stream_realip_handler;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_realip_remote_addr_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_str_t                *addr_text;
+    ngx_stream_realip_ctx_t  *ctx;
+
+    ctx = ngx_stream_get_module_ctx(s, ngx_stream_realip_module);
+
+    addr_text = ctx ? &ctx->addr_text : &s->connection->addr_text;
+
+    v->len = addr_text->len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = addr_text->data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_realip_remote_port_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_uint_t                port;
+    struct sockaddr          *sa;
+    ngx_stream_realip_ctx_t  *ctx;
+
+    ctx = ngx_stream_get_module_ctx(s, ngx_stream_realip_module);
+
+    sa = ctx ? ctx->sockaddr : s->connection->sockaddr;
+
+    v->len = 0;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    v->data = ngx_pnalloc(s->connection->pool, sizeof("65535") - 1);
+    if (v->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    port = ngx_inet_get_port(sa);
+
+    if (port > 0 && port < 65536) {
+        v->len = ngx_sprintf(v->data, "%ui", port) - v->data;
+    }
+
+    return NGX_OK;
+}
diff --git a/src/stream/ngx_stream_return_module.c b/src/stream/ngx_stream_return_module.c
index 3ab9bdf..c22087f 100644
--- a/src/stream/ngx_stream_return_module.c
+++ b/src/stream/ngx_stream_return_module.c
@@ -83,7 +83,7 @@ ngx_stream_return_handler(ngx_stream_session_t *s)
     rscf = ngx_stream_get_module_srv_conf(s, ngx_stream_return_module);
 
     if (ngx_stream_complex_value(s, &rscf->text, &text) != NGX_OK) {
-        ngx_stream_close_connection(c);
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
@@ -91,13 +91,13 @@ ngx_stream_return_handler(ngx_stream_session_t *s)
                    "stream return text: \"%V\"", &text);
 
     if (text.len == 0) {
-        ngx_stream_close_connection(c);
+        ngx_stream_finalize_session(s, NGX_STREAM_OK);
         return;
     }
 
     ctx = ngx_pcalloc(c->pool, sizeof(ngx_stream_return_ctx_t));
     if (ctx == NULL) {
-        ngx_stream_close_connection(c);
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
@@ -126,7 +126,7 @@ ngx_stream_return_write_handler(ngx_event_t *ev)
 
     if (ev->timedout) {
         ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out");
-        ngx_stream_close_connection(c);
+        ngx_stream_finalize_session(s, NGX_STREAM_OK);
         return;
     }
 
@@ -137,7 +137,7 @@ ngx_stream_return_write_handler(ngx_event_t *ev)
 
         n = c->send(c, b->pos, b->last - b->pos);
         if (n == NGX_ERROR) {
-            ngx_stream_close_connection(c);
+            ngx_stream_finalize_session(s, NGX_STREAM_OK);
             return;
         }
 
@@ -145,14 +145,14 @@ ngx_stream_return_write_handler(ngx_event_t *ev)
             b->pos += n;
 
             if (b->pos == b->last) {
-                ngx_stream_close_connection(c);
+                ngx_stream_finalize_session(s, NGX_STREAM_OK);
                 return;
             }
         }
     }
 
     if (ngx_handle_write_event(ev, 0) != NGX_OK) {
-        ngx_stream_close_connection(c);
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c
index 8130f92..ff8e655 100644
--- a/src/stream/ngx_stream_script.c
+++ b/src/stream/ngx_stream_script.c
@@ -388,6 +388,73 @@ invalid_variable:
 }
 
 
+u_char *
+ngx_stream_script_run(ngx_stream_session_t *s, ngx_str_t *value,
+    void *code_lengths, size_t len, void *code_values)
+{
+    ngx_uint_t                      i;
+    ngx_stream_script_code_pt       code;
+    ngx_stream_script_engine_t      e;
+    ngx_stream_core_main_conf_t    *cmcf;
+    ngx_stream_script_len_code_pt   lcode;
+
+    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
+
+    for (i = 0; i < cmcf->variables.nelts; i++) {
+        if (s->variables[i].no_cacheable) {
+            s->variables[i].valid = 0;
+            s->variables[i].not_found = 0;
+        }
+    }
+
+    ngx_memzero(&e, sizeof(ngx_stream_script_engine_t));
+
+    e.ip = code_lengths;
+    e.session = s;
+    e.flushed = 1;
+
+    while (*(uintptr_t *) e.ip) {
+        lcode = *(ngx_stream_script_len_code_pt *) e.ip;
+        len += lcode(&e);
+    }
+
+
+    value->len = len;
+    value->data = ngx_pnalloc(s->connection->pool, len);
+    if (value->data == NULL) {
+        return NULL;
+    }
+
+    e.ip = code_values;
+    e.pos = value->data;
+
+    while (*(uintptr_t *) e.ip) {
+        code = *(ngx_stream_script_code_pt *) e.ip;
+        code((ngx_stream_script_engine_t *) &e);
+    }
+
+    return e.pos;
+}
+
+
+void
+ngx_stream_script_flush_no_cacheable_variables(ngx_stream_session_t *s,
+    ngx_array_t *indices)
+{
+    ngx_uint_t  n, *index;
+
+    if (indices) {
+        index = indices->elts;
+        for (n = 0; n < indices->nelts; n++) {
+            if (s->variables[index[n]].no_cacheable) {
+                s->variables[index[n]].valid = 0;
+                s->variables[index[n]].not_found = 0;
+            }
+        }
+    }
+}
+
+
 static ngx_int_t
 ngx_stream_script_init_arrays(ngx_stream_script_compile_t *sc)
 {
diff --git a/src/stream/ngx_stream_script.h b/src/stream/ngx_stream_script.h
index 0abe50e..25a450d 100644
--- a/src/stream/ngx_stream_script.h
+++ b/src/stream/ngx_stream_script.h
@@ -110,6 +110,10 @@ char *ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 
 ngx_uint_t ngx_stream_script_variables_count(ngx_str_t *value);
 ngx_int_t ngx_stream_script_compile(ngx_stream_script_compile_t *sc);
+u_char *ngx_stream_script_run(ngx_stream_session_t *s, ngx_str_t *value,
+    void *code_lengths, size_t reserved, void *code_values);
+void ngx_stream_script_flush_no_cacheable_variables(ngx_stream_session_t *s,
+    ngx_array_t *indices);
 
 void *ngx_stream_script_add_code(ngx_array_t *codes, size_t size, void *code);
 
diff --git a/src/stream/ngx_stream_upstream.c b/src/stream/ngx_stream_upstream.c
index 2ea5eeb..0c59780 100644
--- a/src/stream/ngx_stream_upstream.c
+++ b/src/stream/ngx_stream_upstream.c
@@ -10,6 +10,14 @@
 #include <ngx_stream.h>
 
 
+static ngx_int_t ngx_stream_upstream_add_variables(ngx_conf_t *cf);
+static ngx_int_t ngx_stream_upstream_addr_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_upstream_response_time_variable(
+    ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_upstream_bytes_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+
 static char *ngx_stream_upstream(ngx_conf_t *cf, ngx_command_t *cmd,
     void *dummy);
 static char *ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -39,7 +47,7 @@ static ngx_command_t  ngx_stream_upstream_commands[] = {
 
 
 static ngx_stream_module_t  ngx_stream_upstream_module_ctx = {
-    NULL,                                  /* preconfiguration */
+    ngx_stream_upstream_add_variables,     /* preconfiguration */
     NULL,                                  /* postconfiguration */
 
     ngx_stream_upstream_create_main_conf,  /* create main configuration */
@@ -66,6 +74,232 @@ ngx_module_t  ngx_stream_upstream_module = {
 };
 
 
+static ngx_stream_variable_t  ngx_stream_upstream_vars[] = {
+
+    { ngx_string("upstream_addr"), NULL,
+      ngx_stream_upstream_addr_variable, 0,
+      NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("upstream_bytes_sent"), NULL,
+      ngx_stream_upstream_bytes_variable, 0,
+      NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("upstream_connect_time"), NULL,
+      ngx_stream_upstream_response_time_variable, 2,
+      NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("upstream_first_byte_time"), NULL,
+      ngx_stream_upstream_response_time_variable, 1,
+      NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("upstream_session_time"), NULL,
+      ngx_stream_upstream_response_time_variable, 0,
+      NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("upstream_bytes_received"), NULL,
+      ngx_stream_upstream_bytes_variable, 1,
+      NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
+static ngx_int_t
+ngx_stream_upstream_add_variables(ngx_conf_t *cf)
+{
+    ngx_stream_variable_t  *var, *v;
+
+    for (v = ngx_stream_upstream_vars; v->name.len; v++) {
+        var = ngx_stream_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_upstream_addr_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char                       *p;
+    size_t                        len;
+    ngx_uint_t                    i;
+    ngx_stream_upstream_state_t  *state;
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    if (s->upstream_states == NULL || s->upstream_states->nelts == 0) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    len = 0;
+    state = s->upstream_states->elts;
+
+    for (i = 0; i < s->upstream_states->nelts; i++) {
+        if (state[i].peer) {
+            len += state[i].peer->len;
+        }
+
+        len += 2;
+    }
+
+    p = ngx_pnalloc(s->connection->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->data = p;
+
+    i = 0;
+
+    for ( ;; ) {
+        if (state[i].peer) {
+            p = ngx_cpymem(p, state[i].peer->data, state[i].peer->len);
+        }
+
+        if (++i == s->upstream_states->nelts) {
+            break;
+        }
+
+        *p++ = ',';
+        *p++ = ' ';
+    }
+
+    v->len = p - v->data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_upstream_bytes_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char                       *p;
+    size_t                        len;
+    ngx_uint_t                    i;
+    ngx_stream_upstream_state_t  *state;
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    if (s->upstream_states == NULL || s->upstream_states->nelts == 0) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    len = s->upstream_states->nelts * (NGX_OFF_T_LEN + 2);
+
+    p = ngx_pnalloc(s->connection->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->data = p;
+
+    i = 0;
+    state = s->upstream_states->elts;
+
+    for ( ;; ) {
+
+        if (data == 1) {
+            p = ngx_sprintf(p, "%O", state[i].bytes_received);
+
+        } else {
+            p = ngx_sprintf(p, "%O", state[i].bytes_sent);
+        }
+
+        if (++i == s->upstream_states->nelts) {
+            break;
+        }
+
+        *p++ = ',';
+        *p++ = ' ';
+    }
+
+    v->len = p - v->data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_upstream_response_time_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char                       *p;
+    size_t                        len;
+    ngx_uint_t                    i;
+    ngx_msec_int_t                ms;
+    ngx_stream_upstream_state_t  *state;
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    if (s->upstream_states == NULL || s->upstream_states->nelts == 0) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    len = s->upstream_states->nelts * (NGX_TIME_T_LEN + 4 + 2);
+
+    p = ngx_pnalloc(s->connection->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->data = p;
+
+    i = 0;
+    state = s->upstream_states->elts;
+
+    for ( ;; ) {
+
+        if (data == 1) {
+            if (state[i].first_byte_time == (ngx_msec_t) -1) {
+                *p++ = '-';
+                goto next;
+            }
+
+            ms = state[i].first_byte_time;
+
+        } else if (data == 2 && state[i].connect_time != (ngx_msec_t) -1) {
+            ms = state[i].connect_time;
+
+        } else {
+            ms = state[i].response_time;
+        }
+
+        ms = ngx_max(ms, 0);
+        p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000);
+
+    next:
+
+        if (++i == s->upstream_states->nelts) {
+            break;
+        }
+
+        *p++ = ',';
+        *p++ = ' ';
+    }
+
+    v->len = p - v->data;
+
+    return NGX_OK;
+}
+
+
 static char *
 ngx_stream_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
 {
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index 5f067c0..f83b5ba 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -78,6 +78,17 @@ struct ngx_stream_upstream_srv_conf_s {
 };
 
 
+typedef struct {
+    ngx_msec_t                         response_time;
+    ngx_msec_t                         connect_time;
+    ngx_msec_t                         first_byte_time;
+    off_t                              bytes_sent;
+    off_t                              bytes_received;
+
+    ngx_str_t                         *peer;
+} ngx_stream_upstream_state_t;
+
+
 typedef struct {
     ngx_str_t                          host;
     in_port_t                          port;
@@ -104,6 +115,7 @@ typedef struct {
     ngx_str_t                          ssl_name;
 #endif
     ngx_stream_upstream_resolved_t    *resolved;
+    ngx_stream_upstream_state_t       *state;
     unsigned                           connected:1;
     unsigned                           proxy_protocol:1;
 } ngx_stream_upstream_t;
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
index 10f9c7e..aa5361d 100644
--- a/src/stream/ngx_stream_variables.c
+++ b/src/stream/ngx_stream_variables.c
@@ -17,11 +17,19 @@ static ngx_int_t ngx_stream_variable_remote_addr(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_remote_port(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_proxy_protocol_addr(
+    ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_proxy_protocol_port(
+    ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_server_addr(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_server_port(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
-static ngx_int_t ngx_stream_variable_bytes_sent(ngx_stream_session_t *s,
+static ngx_int_t ngx_stream_variable_bytes(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_session_time(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_status(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_connection(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
@@ -38,6 +46,8 @@ static ngx_int_t ngx_stream_variable_time_iso8601(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_time_local(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_protocol(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
 
 
 static ngx_stream_variable_t  ngx_stream_core_variables[] = {
@@ -51,15 +61,30 @@ static ngx_stream_variable_t  ngx_stream_core_variables[] = {
     { ngx_string("remote_port"), NULL,
       ngx_stream_variable_remote_port, 0, 0, 0 },
 
+    { ngx_string("proxy_protocol_addr"), NULL,
+      ngx_stream_variable_proxy_protocol_addr, 0, 0, 0 },
+
+    { ngx_string("proxy_protocol_port"), NULL,
+      ngx_stream_variable_proxy_protocol_port, 0, 0, 0 },
+
     { ngx_string("server_addr"), NULL,
       ngx_stream_variable_server_addr, 0, 0, 0 },
 
     { ngx_string("server_port"), NULL,
       ngx_stream_variable_server_port, 0, 0, 0 },
 
-    { ngx_string("bytes_sent"), NULL, ngx_stream_variable_bytes_sent,
+    { ngx_string("bytes_sent"), NULL, ngx_stream_variable_bytes,
       0, 0, 0 },
 
+    { ngx_string("bytes_received"), NULL, ngx_stream_variable_bytes,
+      1, 0, 0 },
+
+    { ngx_string("session_time"), NULL, ngx_stream_variable_session_time,
+      0, NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("status"), NULL, ngx_stream_variable_status,
+      0, NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
     { ngx_string("connection"), NULL,
       ngx_stream_variable_connection, 0, 0, 0 },
 
@@ -81,6 +106,9 @@ static ngx_stream_variable_t  ngx_stream_core_variables[] = {
     { ngx_string("time_local"), NULL, ngx_stream_variable_time_local,
       0, NGX_STREAM_VAR_NOCACHEABLE, 0 },
 
+    { ngx_string("protocol"), NULL,
+      ngx_stream_variable_protocol, 0, 0, 0 },
+
     { ngx_null_string, NULL, NULL, 0, 0, 0 }
 };
 
@@ -399,6 +427,46 @@ ngx_stream_variable_remote_port(ngx_stream_session_t *s,
 }
 
 
+static ngx_int_t
+ngx_stream_variable_proxy_protocol_addr(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    v->len = s->connection->proxy_protocol_addr.len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = s->connection->proxy_protocol_addr.data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_proxy_protocol_port(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_uint_t  port;
+
+    v->len = 0;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    v->data = ngx_pnalloc(s->connection->pool, sizeof("65535") - 1);
+    if (v->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    port = s->connection->proxy_protocol_port;
+
+    if (port > 0 && port < 65536) {
+        v->len = ngx_sprintf(v->data, "%ui", port) - v->data;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_variable_server_addr(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data)
@@ -461,7 +529,7 @@ ngx_stream_variable_server_port(ngx_stream_session_t *s,
 
 
 static ngx_int_t
-ngx_stream_variable_bytes_sent(ngx_stream_session_t *s,
+ngx_stream_variable_bytes(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data)
 {
     u_char  *p;
@@ -471,7 +539,13 @@ ngx_stream_variable_bytes_sent(ngx_stream_session_t *s,
         return NGX_ERROR;
     }
 
-    v->len = ngx_sprintf(p, "%O", s->connection->sent) - p;
+    if (data == 1) {
+        v->len = ngx_sprintf(p, "%O", s->received) - p;
+
+    } else {
+        v->len = ngx_sprintf(p, "%O", s->connection->sent) - p;
+    }
+
     v->valid = 1;
     v->no_cacheable = 0;
     v->not_found = 0;
@@ -481,6 +555,53 @@ ngx_stream_variable_bytes_sent(ngx_stream_session_t *s,
 }
 
 
+static ngx_int_t
+ngx_stream_variable_session_time(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    u_char          *p;
+    ngx_time_t      *tp;
+    ngx_msec_int_t   ms;
+
+    p = ngx_pnalloc(s->connection->pool, NGX_TIME_T_LEN + 4);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    tp = ngx_timeofday();
+
+    ms = (ngx_msec_int_t)
+             ((tp->sec - s->start_sec) * 1000 + (tp->msec - s->start_msec));
+    ms = ngx_max(ms, 0);
+
+    v->len = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000) - p;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = p;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_variable_status(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    v->data = ngx_pnalloc(s->connection->pool, NGX_INT_T_LEN);
+    if (v->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->len = ngx_sprintf(v->data, "%03ui", s->status) - v->data;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_variable_connection(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data)
@@ -622,6 +743,20 @@ ngx_stream_variable_time_local(ngx_stream_session_t *s,
 }
 
 
+static ngx_int_t
+ngx_stream_variable_protocol(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    v->len = 3;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = (u_char *) (s->connection->type == SOCK_DGRAM ? "UDP" : "TCP");
+
+    return NGX_OK;
+}
+
+
 void *
 ngx_stream_map_find(ngx_stream_session_t *s, ngx_stream_map_t *map,
     ngx_str_t *match)

From 5692397ea12c468deaf6abc3ad453b557f4fce10 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 4 Oct 2016 19:52:52 +0300
Subject: [PATCH 110/600] debian/control: Reference nginx-extras in nginx
 meta-package

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index baa4b52..131872b 100644
--- a/debian/control
+++ b/debian/control
@@ -38,8 +38,8 @@ Description: small, powerful, scalable web/proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This is a dependency package to install either nginx-full (by default) or
- nginx-light.
+ This is a dependency package to install either nginx-full (by default),
+ nginx-light or nginx-extras.
 
 Package: nginx-doc
 Architecture: all

From d045f9b328d77d85e2fdf3c9c6f8d5febe2c19e5 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 10 Oct 2016 16:57:12 +0300
Subject: [PATCH 111/600] Strict version depend on lsb-base version >= 3.0-6

Fixes lintian error init.d-script-needs-depends-on-lsb-base
that strict checks the version.
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0d59634..40a7cf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.10.1-4) UNRELEASED; urgency=medium
+
+  * debian/control:
+    + Version depend on lsb-base (>= 3.0-6).
+      Fixes lintian init.d-script-needs-depends-on-lsb-base.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 11 Oct 2016 10:00:23 +0300
+
 nginx (1.10.1-3) unstable; urgency=medium
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 131872b..ec867ae 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Description: small, powerful, scalable web/proxy server - documentation
 Package: nginx-common
 Architecture: all
 Multi-Arch: foreign
-Depends: lsb-base, ${misc:Depends}
+Depends: lsb-base (>= 3.0-6), ${misc:Depends}
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server

From 646704e9fbeace3af6be908c8148c045ad6eca25 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 12 Oct 2016 08:07:21 +0300
Subject: [PATCH 112/600] New upstream version 1.11.5

---
 CHANGES                                       |  39 ++
 CHANGES.ru                                    |  39 ++
 auto/lib/geoip/conf                           |  20 +-
 auto/lib/perl/conf                            |   4 +-
 auto/lib/perl/make                            |   1 +
 auto/make                                     |   1 +
 auto/modules                                  |  28 +-
 auto/options                                  |  18 +-
 auto/os/win32                                 |   4 +-
 auto/sources                                  |   1 +
 auto/unix                                     |  26 +-
 src/core/nginx.h                              |   4 +-
 src/core/ngx_buf.h                            |  12 +-
 src/core/ngx_conf_file.c                      |   4 +-
 src/core/ngx_config.h                         |  13 +
 src/core/ngx_connection.c                     |   5 +-
 src/core/ngx_connection.h                     |  14 +-
 src/core/ngx_core.h                           |  31 +-
 src/core/ngx_file.c                           |   8 +-
 src/core/ngx_file.h                           |   8 +-
 src/core/ngx_inet.c                           |  19 +-
 src/core/ngx_module.h                         |  37 +-
 src/core/ngx_resolver.c                       |   1 +
 src/core/ngx_resolver.h                       |   1 +
 src/event/ngx_event.h                         |   3 +-
 src/event/ngx_event_accept.c                  |   1 +
 src/event/ngx_event_connect.c                 |   1 +
 src/event/ngx_event_connect.h                 |  13 +-
 src/event/ngx_event_openssl.c                 |  10 +-
 src/event/ngx_event_openssl.h                 |   8 +-
 src/event/ngx_event_pipe.h                    |   2 +-
 .../modules/ngx_http_addition_filter_module.c |   1 +
 src/http/modules/ngx_http_mp4_module.c        |   2 +-
 .../modules/ngx_http_range_filter_module.c    |   3 +-
 src/http/modules/ngx_http_realip_module.c     |  12 +-
 .../modules/ngx_http_upstream_hash_module.c   |  11 +-
 .../ngx_http_upstream_ip_hash_module.c        |   5 +
 .../ngx_http_upstream_least_conn_module.c     |  16 +-
 src/http/modules/perl/Makefile.PL             |   2 +
 src/http/ngx_http.c                           |   2 +-
 src/http/ngx_http.h                           |   3 -
 src/http/ngx_http_cache.h                     |  11 +-
 src/http/ngx_http_core_module.c               |   4 +-
 src/http/ngx_http_core_module.h               |  22 +-
 src/http/ngx_http_file_cache.c                | 103 +++-
 src/http/ngx_http_parse.c                     |   4 +-
 src/http/ngx_http_request.h                   |  14 +-
 src/http/ngx_http_special_response.c          |   2 +-
 src/http/ngx_http_upstream.c                  |  26 +-
 src/http/ngx_http_upstream.h                  |  18 +-
 src/http/ngx_http_upstream_round_robin.c      |  22 +-
 src/http/ngx_http_upstream_round_robin.h      |  15 +-
 src/http/v2/ngx_http_v2.c                     |   2 +-
 src/mail/ngx_mail.c                           |   2 +-
 src/mail/ngx_mail.h                           |   6 +-
 src/mail/ngx_mail_core_module.c               |   2 +-
 src/mail/ngx_mail_ssl_module.c                |   4 +-
 src/os/unix/ngx_darwin_init.c                 |   1 +
 src/os/unix/ngx_freebsd_init.c                |   1 +
 src/os/unix/ngx_linux_init.c                  |   1 +
 src/os/unix/ngx_os.h                          |   3 +
 src/os/unix/ngx_posix_init.c                  |   1 +
 src/os/unix/ngx_process_cycle.c               |   6 +-
 src/os/unix/ngx_solaris_init.c                |   1 +
 src/os/unix/ngx_udp_sendmsg_chain.c           | 245 ++++++++++
 src/stream/ngx_stream.c                       | 124 ++++-
 src/stream/ngx_stream.h                       |  86 +++-
 src/stream/ngx_stream_access_module.c         |  11 +-
 src/stream/ngx_stream_core_module.c           | 232 ++++++++-
 src/stream/ngx_stream_handler.c               | 204 ++------
 src/stream/ngx_stream_limit_conn_module.c     |  12 +-
 src/stream/ngx_stream_log_module.c            |   8 +-
 src/stream/ngx_stream_proxy_module.c          | 218 ++++++---
 src/stream/ngx_stream_realip_module.c         |   8 +-
 src/stream/ngx_stream_return_module.c         |  55 ++-
 src/stream/ngx_stream_ssl_module.c            | 108 ++++-
 src/stream/ngx_stream_ssl_preread_module.c    | 449 ++++++++++++++++++
 src/stream/ngx_stream_upstream.c              |  24 +-
 src/stream/ngx_stream_upstream.h              |  19 +-
 src/stream/ngx_stream_upstream_hash_module.c  |  11 +-
 .../ngx_stream_upstream_least_conn_module.c   |  16 +-
 src/stream/ngx_stream_upstream_round_robin.c  |  22 +-
 src/stream/ngx_stream_upstream_round_robin.h  |  15 +-
 src/stream/ngx_stream_write_filter_module.c   | 273 +++++++++++
 84 files changed, 2297 insertions(+), 547 deletions(-)
 create mode 100644 src/os/unix/ngx_udp_sendmsg_chain.c
 create mode 100644 src/stream/ngx_stream_ssl_preread_module.c
 create mode 100644 src/stream/ngx_stream_write_filter_module.c

diff --git a/CHANGES b/CHANGES
index 2ea8d8d..6a88ce4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,43 @@
 
+Changes with nginx 1.11.5                                        11 Oct 2016
+
+    *) Change: the --with-ipv6 configure option was removed, now IPv6
+       support is configured automatically.
+
+    *) Change: now if there are no available servers in an upstream, nginx
+       will not reset number of failures of all servers as it previously
+       did, but will wait for fail_timeout to expire.
+
+    *) Feature: the ngx_stream_ssl_preread_module.
+
+    *) Feature: the "server" directive in the "upstream" context supports
+       the "max_conns" parameter.
+
+    *) Feature: the --with-compat configure option.
+
+    *) Feature: "manager_files", "manager_threshold", and "manager_sleep"
+       parameters of the "proxy_cache_path", "fastcgi_cache_path",
+       "scgi_cache_path", and "uwsgi_cache_path" directives.
+
+    *) Bugfix: flags passed by the --with-ld-opt configure option were not
+       used while building perl module.
+
+    *) Bugfix: in the "add_after_body" directive when used with the
+       "sub_filter" directive.
+
+    *) Bugfix: in the $realip_remote_addr variable.
+
+    *) Bugfix: the "dav_access", "proxy_store_access",
+       "fastcgi_store_access", "scgi_store_access", and "uwsgi_store_access"
+       directives ignored permissions specified for user.
+
+    *) Bugfix: unix domain listen sockets might not be inherited during
+       binary upgrade on Linux.
+
+    *) Bugfix: nginx returned the 400 response on requests with the "-"
+       character in the HTTP method.
+
+
 Changes with nginx 1.11.4                                        13 Sep 2016
 
     *) Feature: the $upstream_bytes_received variable.
diff --git a/CHANGES.ru b/CHANGES.ru
index 28ac2d8..f0bdaf5 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,43 @@
 
+Изменения в nginx 1.11.5                                          11.10.2016
+
+    *) Изменение: параметр configure --with-ipv6 упразднён, поддержка IPv6
+       теперь собирается автоматически.
+
+    *) Изменение: теперь, если в блоке upstream не оказалось доступных
+       серверов, nginx не сбрасывает статистику ошибок всех серверов, как
+       делал ранее, а ожидает истечения fail_timeout.
+
+    *) Добавление: модуль ngx_stream_ssl_preread_module.
+
+    *) Добавление: директива server в блоке upstream поддерживает параметр
+       max_conns.
+
+    *) Добавление: параметр configure --with-compat.
+
+    *) Добавление: параметры manager_files, manager_threshold и
+       manager_sleep директив proxy_cache_path, fastcgi_cache_path,
+       scgi_cache_path и uwsgi_cache_path.
+
+    *) Исправление: при сборке perl-модуля не использовались флаги, заданные
+       с помощью параметра configure --with-ld-opt.
+
+    *) Исправление: в директиве add_after_body при использовании совместно с
+       директивой sub_filter.
+
+    *) Исправление: в переменной $realip_remote_addr.
+
+    *) Исправление: директивы dav_access, proxy_store_access,
+       fastcgi_store_access, scgi_store_access и uwsgi_store_access
+       игнорировали права, заданные для пользователя.
+
+    *) Исправление: unix domain listen-сокеты могли не наследоваться при
+       обновлении исполняемого файла на Linux.
+
+    *) Исправление: nginx возвращал ошибку 400 на запросы с символом "-" в
+       HTTP-методе.
+
+
 Изменения в nginx 1.11.4                                          13.09.2016
 
     *) Добавление: переменная $upstream_bytes_received.
diff --git a/auto/lib/geoip/conf b/auto/lib/geoip/conf
index ebd2e15..8302aae 100644
--- a/auto/lib/geoip/conf
+++ b/auto/lib/geoip/conf
@@ -74,17 +74,15 @@ if [ $ngx_found = yes ]; then
 
     NGX_LIB_GEOIP=$ngx_feature_libs
 
-    if [ $NGX_IPV6 = YES ]; then
-        ngx_feature="GeoIP IPv6 support"
-        ngx_feature_name="NGX_HAVE_GEOIP_V6"
-        ngx_feature_run=no
-        ngx_feature_incs="#include <stdio.h>
-                          #include <GeoIP.h>"
-        #ngx_feature_path=
-        #ngx_feature_libs=
-        ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);"
-        . auto/feature
-    fi
+    ngx_feature="GeoIP IPv6 support"
+    ngx_feature_name="NGX_HAVE_GEOIP_V6"
+    ngx_feature_run=no
+    ngx_feature_incs="#include <stdio.h>
+                      #include <GeoIP.h>"
+    #ngx_feature_path=
+    #ngx_feature_libs=
+    ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);"
+    . auto/feature
 
 else
 
diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf
index f5f5d3e..d891d82 100644
--- a/auto/lib/perl/conf
+++ b/auto/lib/perl/conf
@@ -28,8 +28,10 @@ if test -n "$NGX_PERL_VER"; then
         exit 1;
     fi
 
-    NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`"
     NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts`
+    NGX_PM_LDFLAGS=`$NGX_PERL -MConfig -e 'print $Config{lddlflags}'`
+
+    NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`"
 
     # gcc 4.1/4.2 warn about unused values in pTHX_
     NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \
diff --git a/auto/lib/perl/make b/auto/lib/perl/make
index 8af8902..350090c 100644
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -35,6 +35,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \\
 
 	cd $NGX_OBJS/src/http/modules/perl \\
 		&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\
+			NGX_PM_LDFLAGS="$NGX_LD_OPT \$(NGX_PM_LDFLAGS)" \\
 			NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\
 			NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\
 		$NGX_PERL Makefile.PL \\
diff --git a/auto/make b/auto/make
index 5589bee..84d2668 100644
--- a/auto/make
+++ b/auto/make
@@ -31,6 +31,7 @@ END
 if test -n "$NGX_PERL_CFLAGS"; then
     echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS                   >> $NGX_MAKEFILE
     echo NGX_PM_CFLAGS = $NGX_PM_CFLAGS                       >> $NGX_MAKEFILE
+    echo NGX_PM_LDFLAGS = $NGX_PM_LDFLAGS                     >> $NGX_MAKEFILE
 fi
 
 
diff --git a/auto/modules b/auto/modules
index 433767a..89377bf 100644
--- a/auto/modules
+++ b/auto/modules
@@ -973,7 +973,8 @@ if [ $STREAM != NO ]; then
                      ngx_stream_core_module \
                      ngx_stream_log_module \
                      ngx_stream_proxy_module \
-                     ngx_stream_upstream_module"
+                     ngx_stream_upstream_module \
+                     ngx_stream_write_filter_module"
     ngx_module_incs="src/stream"
     ngx_module_deps="src/stream/ngx_stream.h \
                      src/stream/ngx_stream_variables.h \
@@ -988,7 +989,8 @@ if [ $STREAM != NO ]; then
                      src/stream/ngx_stream_log_module.c \
                      src/stream/ngx_stream_proxy_module.c \
                      src/stream/ngx_stream_upstream.c \
-                     src/stream/ngx_stream_upstream_round_robin.c"
+                     src/stream/ngx_stream_upstream_round_robin.c \
+                     src/stream/ngx_stream_write_filter_module.c"
 
     . auto/module
 
@@ -1118,6 +1120,16 @@ if [ $STREAM != NO ]; then
 
         . auto/module
     fi
+
+    if [ $STREAM_SSL_PREREAD = YES ]; then
+        ngx_module_name=ngx_stream_ssl_preread_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_ssl_preread_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_SSL_PREREAD
+
+        . auto/module
+    fi
 fi
 
 
@@ -1300,6 +1312,18 @@ fi
 modules="$modules $MISC_MODULES"
 
 
+if [ $NGX_COMPAT = YES ]; then
+    have=NGX_COMPAT . auto/have
+    have=NGX_HTTP_GZIP . auto/have
+    have=NGX_HTTP_DAV . auto/have
+    have=NGX_HTTP_REALIP . auto/have
+    have=NGX_HTTP_X_FORWARDED_FOR . auto/have
+    have=NGX_HTTP_HEADERS . auto/have
+    have=NGX_HTTP_UPSTREAM_ZONE . auto/have
+    have=NGX_STREAM_UPSTREAM_ZONE . auto/have
+fi
+
+
 cat << END                                    > $NGX_MODULES_C
 
 #include <ngx_config.h>
diff --git a/auto/options b/auto/options
index 73149d9..43724b1 100644
--- a/auto/options
+++ b/auto/options
@@ -44,7 +44,6 @@ EVENT_POLL=NO
 USE_THREADS=NO
 
 NGX_FILE_AIO=NO
-NGX_IPV6=NO
 
 HTTP=YES
 
@@ -126,6 +125,7 @@ STREAM_RETURN=YES
 STREAM_UPSTREAM_HASH=YES
 STREAM_UPSTREAM_LEAST_CONN=YES
 STREAM_UPSTREAM_ZONE=YES
+STREAM_SSL_PREREAD=NO
 
 DYNAMIC_MODULES=
 
@@ -133,6 +133,8 @@ NGX_ADDONS=
 NGX_ADDON_DEPS=
 DYNAMIC_ADDONS=
 
+NGX_COMPAT=NO
+
 USE_PCRE=NO
 PCRE=NONE
 PCRE_OPT=
@@ -201,7 +203,11 @@ do
         --with-threads)                  USE_THREADS=YES            ;;
 
         --with-file-aio)                 NGX_FILE_AIO=YES           ;;
-        --with-ipv6)                     NGX_IPV6=YES               ;;
+
+        --with-ipv6)
+            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
+$0: warning: the \"--with-ipv6\" option is deprecated"
+        ;;
 
         --without-http)                  HTTP=NO                    ;;
         --without-http-cache)            HTTP_CACHE=NO              ;;
@@ -301,6 +307,8 @@ use the \"--with-mail_ssl_module\" option instead"
         --with-stream_geoip_module)      STREAM_GEOIP=YES           ;;
         --with-stream_geoip_module=dynamic)
                                          STREAM_GEOIP=DYNAMIC       ;;
+        --with-stream_ssl_preread_module)
+                                         STREAM_SSL_PREREAD=YES     ;;
         --without-stream_limit_conn_module)
                                          STREAM_LIMIT_CONN=NO       ;;
         --without-stream_access_module)  STREAM_ACCESS=NO           ;;
@@ -322,6 +330,8 @@ use the \"--with-mail_ssl_module\" option instead"
         --add-module=*)                  NGX_ADDONS="$NGX_ADDONS $value" ;;
         --add-dynamic-module=*)          DYNAMIC_ADDONS="$DYNAMIC_ADDONS $value" ;;
 
+        --with-compat)                   NGX_COMPAT=YES             ;;
+
         --with-cc=*)                     CC="$value"                ;;
         --with-cpp=*)                    CPP="$value"               ;;
         --with-cc-opt=*)                 NGX_CC_OPT="$value"        ;;
@@ -417,7 +427,6 @@ cat << END
   --with-threads                     enable thread pool support
 
   --with-file-aio                    enable file AIO support
-  --with-ipv6                        enable IPv6 support
 
   --with-http_ssl_module             enable ngx_http_ssl_module
   --with-http_v2_module              enable ngx_http_v2_module
@@ -508,6 +517,7 @@ cat << END
   --with-stream_realip_module        enable ngx_stream_realip_module
   --with-stream_geoip_module         enable ngx_stream_geoip_module
   --with-stream_geoip_module=dynamic enable dynamic ngx_stream_geoip_module
+  --with-stream_ssl_preread_module   enable ngx_stream_ssl_preread_module
   --without-stream_limit_conn_module disable ngx_stream_limit_conn_module
   --without-stream_access_module     disable ngx_stream_access_module
   --without-stream_geo_module        disable ngx_stream_geo_module
@@ -528,6 +538,8 @@ cat << END
   --add-module=PATH                  enable external module
   --add-dynamic-module=PATH          enable dynamic external module
 
+  --with-compat                      dynamic modules compatibility
+
   --with-cc=PATH                     set C compiler pathname
   --with-cpp=PATH                    set C preprocessor pathname
   --with-cc-opt=OPTIONS              set additional C compiler options
diff --git a/auto/os/win32 b/auto/os/win32
index 14ae3b8..650cf49 100644
--- a/auto/os/win32
+++ b/auto/os/win32
@@ -37,8 +37,6 @@ if [ $EVENT_SELECT = NO ]; then
     EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
 fi
 
-if [ $NGX_IPV6 = YES ]; then
-    have=NGX_HAVE_INET6 . auto/have
-fi
+have=NGX_HAVE_INET6 . auto/have
 
 have=NGX_HAVE_IOCP . auto/have
diff --git a/auto/sources b/auto/sources
index 216e900..1398147 100644
--- a/auto/sources
+++ b/auto/sources
@@ -167,6 +167,7 @@ UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/unix/ngx_send.c \
             src/os/unix/ngx_writev_chain.c \
             src/os/unix/ngx_udp_send.c \
+            src/os/unix/ngx_udp_sendmsg_chain.c \
             src/os/unix/ngx_channel.c \
             src/os/unix/ngx_shmem.c \
             src/os/unix/ngx_process.c \
diff --git a/auto/unix b/auto/unix
index dbc0f0e..5ef74d4 100755
--- a/auto/unix
+++ b/auto/unix
@@ -637,20 +637,18 @@ ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
 # syscalls, libc calls and some features
 
 
-if [ $NGX_IPV6 = YES ]; then
-    ngx_feature="AF_INET6"
-    ngx_feature_name="NGX_HAVE_INET6"
-    ngx_feature_run=no
-    ngx_feature_incs="#include <sys/socket.h>
-                      #include <netinet/in.h>
-                      #include <arpa/inet.h>"
-    ngx_feature_path=
-    ngx_feature_libs=
-    ngx_feature_test="struct sockaddr_in6  sin6;
-                      sin6.sin6_family = AF_INET6;
-                      (void) sin6"
-    . auto/feature
-fi
+ngx_feature="AF_INET6"
+ngx_feature_name="NGX_HAVE_INET6"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>
+                  #include <arpa/inet.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="struct sockaddr_in6  sin6;
+                  sin6.sin6_family = AF_INET6;
+                  (void) sin6"
+. auto/feature
 
 
 ngx_feature="setproctitle()"
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 7e9aae6..1446251 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011004
-#define NGINX_VERSION      "1.11.4"
+#define nginx_version      1011005
+#define NGINX_VERSION      "1.11.5"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h
index f652b20..12781a7 100644
--- a/src/core/ngx_buf.h
+++ b/src/core/ngx_buf.h
@@ -72,10 +72,8 @@ typedef struct ngx_output_chain_ctx_s  ngx_output_chain_ctx_t;
 
 typedef ngx_int_t (*ngx_output_chain_filter_pt)(void *ctx, ngx_chain_t *in);
 
-#if (NGX_HAVE_FILE_AIO)
 typedef void (*ngx_output_chain_aio_pt)(ngx_output_chain_ctx_t *ctx,
     ngx_file_t *file);
-#endif
 
 struct ngx_output_chain_ctx_s {
     ngx_buf_t                   *buf;
@@ -85,23 +83,19 @@ struct ngx_output_chain_ctx_s {
 
     unsigned                     sendfile:1;
     unsigned                     directio:1;
-#if (NGX_HAVE_ALIGNED_DIRECTIO)
     unsigned                     unaligned:1;
-#endif
     unsigned                     need_in_memory:1;
     unsigned                     need_in_temp:1;
-#if (NGX_HAVE_FILE_AIO || NGX_THREADS)
     unsigned                     aio:1;
-#endif
 
-#if (NGX_HAVE_FILE_AIO)
+#if (NGX_HAVE_FILE_AIO || NGX_COMPAT)
     ngx_output_chain_aio_pt      aio_handler;
-#if (NGX_HAVE_AIO_SENDFILE)
+#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
     ssize_t                    (*aio_preload)(ngx_buf_t *file);
 #endif
 #endif
 
-#if (NGX_THREADS)
+#if (NGX_THREADS || NGX_COMPAT)
     ngx_int_t                  (*thread_handler)(ngx_thread_task_t *task,
                                                  ngx_file_t *file);
     ngx_thread_task_t           *thread_task;
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index c60d5fb..ea1dceb 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -1336,7 +1336,7 @@ ngx_conf_set_enum_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_OK;
     }
 
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                        "invalid value \"%s\"", value[1].data);
 
     return NGX_CONF_ERROR;
@@ -1378,7 +1378,7 @@ ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
 
         if (mask[m].name.len == 0) {
-            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "invalid value \"%s\"", value[i].data);
 
             return NGX_CONF_ERROR;
diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h
index a0bfa63..1861be6 100644
--- a/src/core/ngx_config.h
+++ b/src/core/ngx_config.h
@@ -129,4 +129,17 @@ typedef intptr_t        ngx_flag_t;
 #define NGX_MAX_INT32_VALUE   (uint32_t) 0x7fffffff
 
 
+#if (NGX_COMPAT)
+
+#define NGX_COMPAT_BEGIN(slots)  uint64_t spare[slots];
+#define NGX_COMPAT_END
+
+#else
+
+#define NGX_COMPAT_BEGIN(slots)
+#define NGX_COMPAT_END
+
+#endif
+
+
 #endif /* _NGX_CONFIG_H_INCLUDED_ */
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 16ba630..a789d8c 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -1191,10 +1191,7 @@ ngx_close_connection(ngx_connection_t *c)
             level = NGX_LOG_CRIT;
         }
 
-        /* we use ngx_cycle->log because c->log was in c->pool */
-
-        ngx_log_error(level, ngx_cycle->log, err,
-                      ngx_close_socket_n " %d failed", fd);
+        ngx_log_error(level, c->log, err, ngx_close_socket_n " %d failed", fd);
     }
 }
 
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index e484c81..1d3e3a3 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -66,23 +66,19 @@ struct ngx_listening_s {
     unsigned            addr_ntop:1;
     unsigned            wildcard:1;
 
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
     unsigned            ipv6only:1;
 #endif
-#if (NGX_HAVE_REUSEPORT)
     unsigned            reuseport:1;
     unsigned            add_reuseport:1;
-#endif
     unsigned            keepalive:2;
 
-#if (NGX_HAVE_DEFERRED_ACCEPT)
     unsigned            deferred_accept:1;
     unsigned            delete_deferred:1;
     unsigned            add_deferred:1;
-#ifdef SO_ACCEPTFILTER
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
     char               *accept_filter;
 #endif
-#endif
 #if (NGX_HAVE_SETFIB)
     int                 setfib;
 #endif
@@ -151,7 +147,7 @@ struct ngx_connection_s {
     ngx_str_t           proxy_protocol_addr;
     in_port_t           proxy_protocol_port;
 
-#if (NGX_SSL)
+#if (NGX_SSL || NGX_COMPAT)
     ngx_ssl_connection_t  *ssl;
 #endif
 
@@ -186,11 +182,11 @@ struct ngx_connection_s {
 
     unsigned            need_last_buf:1;
 
-#if (NGX_HAVE_AIO_SENDFILE)
+#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
     unsigned            busy_count:2;
 #endif
 
-#if (NGX_THREADS)
+#if (NGX_THREADS || NGX_COMPAT)
     ngx_thread_task_t  *sendfile_task;
 #endif
 };
diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index 2819c1a..2069373 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -12,22 +12,21 @@
 #include <ngx_config.h>
 
 
-typedef struct ngx_module_s      ngx_module_t;
-typedef struct ngx_conf_s        ngx_conf_t;
-typedef struct ngx_cycle_s       ngx_cycle_t;
-typedef struct ngx_pool_s        ngx_pool_t;
-typedef struct ngx_chain_s       ngx_chain_t;
-typedef struct ngx_log_s         ngx_log_t;
-typedef struct ngx_open_file_s   ngx_open_file_t;
-typedef struct ngx_command_s     ngx_command_t;
-typedef struct ngx_file_s        ngx_file_t;
-typedef struct ngx_event_s       ngx_event_t;
-typedef struct ngx_event_aio_s   ngx_event_aio_t;
-typedef struct ngx_connection_s  ngx_connection_t;
-
-#if (NGX_THREADS)
-typedef struct ngx_thread_task_s  ngx_thread_task_t;
-#endif
+typedef struct ngx_module_s          ngx_module_t;
+typedef struct ngx_conf_s            ngx_conf_t;
+typedef struct ngx_cycle_s           ngx_cycle_t;
+typedef struct ngx_pool_s            ngx_pool_t;
+typedef struct ngx_chain_s           ngx_chain_t;
+typedef struct ngx_log_s             ngx_log_t;
+typedef struct ngx_open_file_s       ngx_open_file_t;
+typedef struct ngx_command_s         ngx_command_t;
+typedef struct ngx_file_s            ngx_file_t;
+typedef struct ngx_event_s           ngx_event_t;
+typedef struct ngx_event_aio_s       ngx_event_aio_t;
+typedef struct ngx_connection_s      ngx_connection_t;
+typedef struct ngx_thread_task_s     ngx_thread_task_t;
+typedef struct ngx_ssl_s             ngx_ssl_t;
+typedef struct ngx_ssl_connection_s  ngx_ssl_connection_t;
 
 typedef void (*ngx_event_handler_pt)(ngx_event_t *ev);
 typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index c1137cc..8359c0f 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -441,7 +441,7 @@ ngx_conf_set_access_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     u_char      *p;
     ngx_str_t   *value;
-    ngx_uint_t   i, right, shift, *access;
+    ngx_uint_t   i, right, shift, *access, user;
 
     access = (ngx_uint_t *) (confp + cmd->offset);
 
@@ -451,7 +451,8 @@ ngx_conf_set_access_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     value = cf->args->elts;
 
-    *access = 0600;
+    *access = 0;
+    user = 0600;
 
     for (i = 1; i < cf->args->nelts; i++) {
 
@@ -460,6 +461,7 @@ ngx_conf_set_access_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         if (ngx_strncmp(p, "user:", sizeof("user:") - 1) == 0) {
             shift = 6;
             p += sizeof("user:") - 1;
+            user = 0;
 
         } else if (ngx_strncmp(p, "group:", sizeof("group:") - 1) == 0) {
             shift = 3;
@@ -486,6 +488,8 @@ ngx_conf_set_access_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         *access |= right << shift;
     }
 
+    *access |= user;
+
     return NGX_CONF_OK;
 
 invalid:
diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h
index a723c3d..320adc2 100644
--- a/src/core/ngx_file.h
+++ b/src/core/ngx_file.h
@@ -23,14 +23,14 @@ struct ngx_file_s {
 
     ngx_log_t                 *log;
 
-#if (NGX_THREADS)
+#if (NGX_THREADS || NGX_COMPAT)
     ngx_int_t                (*thread_handler)(ngx_thread_task_t *task,
                                                ngx_file_t *file);
     void                      *thread_ctx;
     ngx_thread_task_t         *thread_task;
 #endif
 
-#if (NGX_HAVE_FILE_AIO)
+#if (NGX_HAVE_FILE_AIO || NGX_COMPAT)
     ngx_event_aio_t           *aio;
 #endif
 
@@ -42,7 +42,8 @@ struct ngx_file_s {
 #define NGX_MAX_PATH_LEVEL  3
 
 
-typedef time_t (*ngx_path_manager_pt) (void *data);
+typedef ngx_msec_t (*ngx_path_manager_pt) (void *data);
+typedef ngx_msec_t (*ngx_path_purger_pt) (void *data);
 typedef void (*ngx_path_loader_pt) (void *data);
 
 
@@ -52,6 +53,7 @@ typedef struct {
     size_t                     level[NGX_MAX_PATH_LEVEL];
 
     ngx_path_manager_pt        manager;
+    ngx_path_purger_pt         purger;
     ngx_path_loader_pt         loader;
     void                      *data;
 
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index dbd1f46..3bcd3e7 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -1364,6 +1364,7 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
     struct sockaddr_in6  *sin61, *sin62;
 #endif
 #if (NGX_HAVE_UNIX_DOMAIN)
+    size_t                len;
     struct sockaddr_un   *saun1, *saun2;
 #endif
 
@@ -1393,15 +1394,21 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
 #if (NGX_HAVE_UNIX_DOMAIN)
     case AF_UNIX:
 
-        /* TODO length */
-
         saun1 = (struct sockaddr_un *) sa1;
         saun2 = (struct sockaddr_un *) sa2;
 
-        if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path,
-                       sizeof(saun1->sun_path))
-            != 0)
-        {
+        if (slen1 < slen2) {
+            len = slen1 - offsetof(struct sockaddr_un, sun_path);
+
+        } else {
+            len = slen2 - offsetof(struct sockaddr_un, sun_path);
+        }
+
+        if (len > sizeof(saun1->sun_path)) {
+            len = sizeof(saun1->sun_path);
+        }
+
+        if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path, len) != 0) {
             return NGX_DECLINED;
         }
 
diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h
index a1a0d6c..8cf3210 100644
--- a/src/core/ngx_module.h
+++ b/src/core/ngx_module.h
@@ -35,13 +35,13 @@
 #define NGX_MODULE_SIGNATURE_2   "0"
 #endif
 
-#if (NGX_HAVE_FILE_AIO)
+#if (NGX_HAVE_FILE_AIO || NGX_COMPAT)
 #define NGX_MODULE_SIGNATURE_3   "1"
 #else
 #define NGX_MODULE_SIGNATURE_3   "0"
 #endif
 
-#if (NGX_HAVE_AIO_SENDFILE)
+#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
 #define NGX_MODULE_SIGNATURE_4   "1"
 #else
 #define NGX_MODULE_SIGNATURE_4   "0"
@@ -71,17 +71,8 @@
 #define NGX_MODULE_SIGNATURE_8   "0"
 #endif
 
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
 #define NGX_MODULE_SIGNATURE_9   "1"
-#else
-#define NGX_MODULE_SIGNATURE_9   "0"
-#endif
-
-#if (NGX_HAVE_REUSEPORT)
 #define NGX_MODULE_SIGNATURE_10  "1"
-#else
-#define NGX_MODULE_SIGNATURE_10  "0"
-#endif
 
 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
 #define NGX_MODULE_SIGNATURE_11  "1"
@@ -89,11 +80,7 @@
 #define NGX_MODULE_SIGNATURE_11  "0"
 #endif
 
-#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
 #define NGX_MODULE_SIGNATURE_12  "1"
-#else
-#define NGX_MODULE_SIGNATURE_12  "0"
-#endif
 
 #if (NGX_HAVE_SETFIB)
 #define NGX_MODULE_SIGNATURE_13  "1"
@@ -140,7 +127,7 @@
 #define NGX_MODULE_SIGNATURE_21  "0"
 #endif
 
-#if (NGX_THREADS)
+#if (NGX_THREADS || NGX_COMPAT)
 #define NGX_MODULE_SIGNATURE_22  "1"
 #else
 #define NGX_MODULE_SIGNATURE_22  "0"
@@ -152,17 +139,13 @@
 #define NGX_MODULE_SIGNATURE_23  "0"
 #endif
 
-#if (NGX_HTTP_SSL)
+#if (NGX_HTTP_SSL || NGX_COMPAT)
 #define NGX_MODULE_SIGNATURE_24  "1"
 #else
 #define NGX_MODULE_SIGNATURE_24  "0"
 #endif
 
-#if (NGX_HTTP_V2)
 #define NGX_MODULE_SIGNATURE_25  "1"
-#else
-#define NGX_MODULE_SIGNATURE_25  "0"
-#endif
 
 #if (NGX_HTTP_GZIP)
 #define NGX_MODULE_SIGNATURE_26  "1"
@@ -170,11 +153,7 @@
 #define NGX_MODULE_SIGNATURE_26  "0"
 #endif
 
-#if (NGX_HTTP_DEGRADATION)
 #define NGX_MODULE_SIGNATURE_27  "1"
-#else
-#define NGX_MODULE_SIGNATURE_27  "0"
-#endif
 
 #if (NGX_HTTP_X_FORWARDED_FOR)
 #define NGX_MODULE_SIGNATURE_28  "1"
@@ -212,6 +191,12 @@
 #define NGX_MODULE_SIGNATURE_33  "0"
 #endif
 
+#if (NGX_COMPAT)
+#define NGX_MODULE_SIGNATURE_34  "1"
+#else
+#define NGX_MODULE_SIGNATURE_34  "0"
+#endif
+
 #define NGX_MODULE_SIGNATURE                                                  \
     NGX_MODULE_SIGNATURE_0 NGX_MODULE_SIGNATURE_1 NGX_MODULE_SIGNATURE_2      \
     NGX_MODULE_SIGNATURE_3 NGX_MODULE_SIGNATURE_4 NGX_MODULE_SIGNATURE_5      \
@@ -224,7 +209,7 @@
     NGX_MODULE_SIGNATURE_24 NGX_MODULE_SIGNATURE_25 NGX_MODULE_SIGNATURE_26   \
     NGX_MODULE_SIGNATURE_27 NGX_MODULE_SIGNATURE_28 NGX_MODULE_SIGNATURE_29   \
     NGX_MODULE_SIGNATURE_30 NGX_MODULE_SIGNATURE_31 NGX_MODULE_SIGNATURE_32   \
-    NGX_MODULE_SIGNATURE_33
+    NGX_MODULE_SIGNATURE_33 NGX_MODULE_SIGNATURE_34
 
 
 #define NGX_MODULE_V1                                                         \
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 53dae6b..bdfed88 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -3006,6 +3006,7 @@ ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
     ctx->count--;
 
     srv->ctx = NULL;
+    srv->state = cctx->state;
 
     if (cctx->naddrs) {
 
diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h
index e36cfdc..a0d6fc3 100644
--- a/src/core/ngx_resolver.h
+++ b/src/core/ngx_resolver.h
@@ -82,6 +82,7 @@ typedef struct {
     u_short                   port;
 
     ngx_resolver_ctx_t       *ctx;
+    ngx_int_t                 state;
 
     ngx_uint_t                naddrs;
     ngx_addr_t               *addrs;
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 27139ee..053bd16 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -152,7 +152,7 @@ struct ngx_event_aio_s {
     ngx_event_handler_pt       handler;
     ngx_file_t                *file;
 
-#if (NGX_HAVE_AIO_SENDFILE)
+#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
     ssize_t                  (*preload_handler)(ngx_buf_t *file);
 #endif
 
@@ -430,6 +430,7 @@ extern ngx_os_io_t  ngx_io;
 #define ngx_send             ngx_io.send
 #define ngx_send_chain       ngx_io.send_chain
 #define ngx_udp_send         ngx_io.udp_send
+#define ngx_udp_send_chain   ngx_io.udp_send_chain
 
 
 #define NGX_EVENT_MODULE      0x544E5645  /* "EVNT" */
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 4445adc..1fce2e8 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -467,6 +467,7 @@ ngx_event_recvmsg(ngx_event_t *ev)
         *log = ls->log;
 
         c->send = ngx_udp_send;
+        c->send_chain = ngx_udp_send_chain;
 
         c->log = log;
         c->pool->log = log;
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 06534ef..c5bb806 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -166,6 +166,7 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
     } else { /* type == SOCK_DGRAM */
         c->recv = ngx_udp_recv;
         c->send = ngx_send;
+        c->send_chain = ngx_udp_send_chain;
     }
 
     c->log_error = pc->log_error;
diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h
index 10b72a1..72d21d7 100644
--- a/src/event/ngx_event_connect.h
+++ b/src/event/ngx_event_connect.h
@@ -25,13 +25,12 @@ typedef ngx_int_t (*ngx_event_get_peer_pt)(ngx_peer_connection_t *pc,
     void *data);
 typedef void (*ngx_event_free_peer_pt)(ngx_peer_connection_t *pc, void *data,
     ngx_uint_t state);
-#if (NGX_SSL)
-
+typedef void (*ngx_event_notify_peer_pt)(ngx_peer_connection_t *pc,
+    void *data, ngx_uint_t type);
 typedef ngx_int_t (*ngx_event_set_peer_session_pt)(ngx_peer_connection_t *pc,
     void *data);
 typedef void (*ngx_event_save_peer_session_pt)(ngx_peer_connection_t *pc,
     void *data);
-#endif
 
 
 struct ngx_peer_connection_s {
@@ -46,9 +45,10 @@ struct ngx_peer_connection_s {
 
     ngx_event_get_peer_pt            get;
     ngx_event_free_peer_pt           free;
+    ngx_event_notify_peer_pt         notify;
     void                            *data;
 
-#if (NGX_SSL)
+#if (NGX_SSL || NGX_COMPAT)
     ngx_event_set_peer_session_pt    set_session;
     ngx_event_save_peer_session_pt   save_session;
 #endif
@@ -61,12 +61,13 @@ struct ngx_peer_connection_s {
     ngx_log_t                       *log;
 
     unsigned                         cached:1;
-#if (NGX_HAVE_TRANSPARENT_PROXY)
     unsigned                         transparent:1;
-#endif
 
                                      /* ngx_connection_log_error_e */
     unsigned                         log_error:2;
+
+    NGX_COMPAT_BEGIN(2)
+    NGX_COMPAT_END
 };
 
 
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 1cbfdf2..68d02bf 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -55,7 +55,7 @@ static int ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     HMAC_CTX *hctx, int enc);
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10002002L
+#ifndef X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT
 static ngx_int_t ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *str);
 #endif
 
@@ -3092,7 +3092,7 @@ ngx_ssl_check_host(ngx_connection_t *c, ngx_str_t *name)
         return NGX_ERROR;
     }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10002002L
+#ifdef X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT
 
     /* X509_check_host() is only available in OpenSSL 1.0.2+ */
 
@@ -3209,7 +3209,7 @@ found:
 }
 
 
-#if OPENSSL_VERSION_NUMBER < 0x10002002L
+#ifndef X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT
 
 static ngx_int_t
 ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *pattern)
@@ -3656,13 +3656,13 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     engine = ENGINE_by_id((char *) value[1].data);
 
     if (engine == NULL) {
-        ngx_ssl_error(NGX_LOG_WARN, cf->log, 0,
+        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
                       "ENGINE_by_id(\"%V\") failed", &value[1]);
         return NGX_CONF_ERROR;
     }
 
     if (ENGINE_set_default(engine, ENGINE_METHOD_ALL) == 0) {
-        ngx_ssl_error(NGX_LOG_WARN, cf->log, 0,
+        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
                       "ENGINE_set_default(\"%V\", ENGINE_METHOD_ALL) failed",
                       &value[1]);
 
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 3367d10..24b812f 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -54,14 +54,14 @@
 #define ngx_ssl_conn_t          SSL
 
 
-typedef struct {
+struct ngx_ssl_s {
     SSL_CTX                    *ctx;
     ngx_log_t                  *log;
     size_t                      buffer_size;
-} ngx_ssl_t;
+};
 
 
-typedef struct {
+struct ngx_ssl_connection_s {
     ngx_ssl_conn_t             *connection;
     SSL_CTX                    *session_ctx;
 
@@ -80,7 +80,7 @@ typedef struct {
     unsigned                    no_wait_shutdown:1;
     unsigned                    no_send_shutdown:1;
     unsigned                    handshake_buffer_set:1;
-} ngx_ssl_connection_t;
+};
 
 
 #define NGX_SSL_NO_SCACHE            -2
diff --git a/src/event/ngx_event_pipe.h b/src/event/ngx_event_pipe.h
index ef2e7a0..10a3340 100644
--- a/src/event/ngx_event_pipe.h
+++ b/src/event/ngx_event_pipe.h
@@ -47,7 +47,7 @@ struct ngx_event_pipe_s {
     ngx_event_pipe_output_filter_pt   output_filter;
     void                             *output_ctx;
 
-#if (NGX_THREADS)
+#if (NGX_THREADS || NGX_COMPAT)
     ngx_int_t                       (*thread_handler)(ngx_thread_task_t *task,
                                                       ngx_file_t *file);
     void                             *thread_ctx;
diff --git a/src/http/modules/ngx_http_addition_filter_module.c b/src/http/modules/ngx_http_addition_filter_module.c
index db4970b..2fad0e5 100644
--- a/src/http/modules/ngx_http_addition_filter_module.c
+++ b/src/http/modules/ngx_http_addition_filter_module.c
@@ -171,6 +171,7 @@ ngx_http_addition_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     for (cl = in; cl; cl = cl->next) {
         if (cl->buf->last_buf) {
             cl->buf->last_buf = 0;
+            cl->buf->last_in_chain = 1;
             cl->buf->sync = 1;
             last = 1;
         }
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 16ef83c..2a68bae 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -1144,7 +1144,7 @@ ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
     data = &mp4->mdat_data_buf;
     data->file = &mp4->file;
     data->in_file = 1;
-    data->last_buf = 1;
+    data->last_buf = (mp4->request == mp4->request->main) ? 1 : 0;
     data->last_in_chain = 1;
     data->file_last = mp4->offset + atom_data_size;
 
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index 57065e1..095ef06 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -750,7 +750,8 @@ ngx_http_range_singlepart_body(ngx_http_request_t *r,
                 buf->last -= (size_t) (last - range->end);
             }
 
-            buf->last_buf = 1;
+            buf->last_buf = (r == r->main) ? 1 : 0;
+            buf->last_in_chain = 1;
             *ll = cl;
             cl->next = NULL;
 
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index dba3c52..5e3355c 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -141,18 +141,18 @@ ngx_http_realip_handler(ngx_http_request_t *r)
     ngx_http_realip_ctx_t       *ctx;
     ngx_http_realip_loc_conf_t  *rlcf;
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_realip_module);
-
-    if (ctx) {
-        return NGX_DECLINED;
-    }
-
     rlcf = ngx_http_get_module_loc_conf(r, ngx_http_realip_module);
 
     if (rlcf->from == NULL) {
         return NGX_DECLINED;
     }
 
+    ctx = ngx_http_realip_get_module_ctx(r);
+
+    if (ctx) {
+        return NGX_DECLINED;
+    }
+
     switch (rlcf->type) {
 
     case NGX_HTTP_REALIP_XREALIP:
diff --git a/src/http/modules/ngx_http_upstream_hash_module.c b/src/http/modules/ngx_http_upstream_hash_module.c
index 1e2e05c..6c28c64 100644
--- a/src/http/modules/ngx_http_upstream_hash_module.c
+++ b/src/http/modules/ngx_http_upstream_hash_module.c
@@ -242,6 +242,10 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
             goto next;
         }
 
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            goto next;
+        }
+
         break;
 
     next:
@@ -523,7 +527,6 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
              peer;
              peer = peer->next, i++)
         {
-
             n = i / (8 * sizeof(uintptr_t));
             m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
 
@@ -549,6 +552,10 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
                 continue;
             }
 
+            if (peer->max_conns && peer->conns >= peer->max_conns) {
+                continue;
+            }
+
             peer->current_weight += peer->effective_weight;
             total += peer->effective_weight;
 
@@ -571,6 +578,7 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
         hp->tries++;
 
         if (hp->tries >= points->number) {
+            pc->name = hp->rrp.peers->name;
             ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
             return NGX_BUSY;
         }
@@ -647,6 +655,7 @@ ngx_http_upstream_hash(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     uscf->flags = NGX_HTTP_UPSTREAM_CREATE
                   |NGX_HTTP_UPSTREAM_WEIGHT
+                  |NGX_HTTP_UPSTREAM_MAX_CONNS
                   |NGX_HTTP_UPSTREAM_MAX_FAILS
                   |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
                   |NGX_HTTP_UPSTREAM_DOWN;
diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c
index 8a5f0fa..296108f 100644
--- a/src/http/modules/ngx_http_upstream_ip_hash_module.c
+++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c
@@ -212,6 +212,10 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
             goto next;
         }
 
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            goto next;
+        }
+
         break;
 
     next:
@@ -259,6 +263,7 @@ ngx_http_upstream_ip_hash(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     uscf->flags = NGX_HTTP_UPSTREAM_CREATE
                   |NGX_HTTP_UPSTREAM_WEIGHT
+                  |NGX_HTTP_UPSTREAM_MAX_CONNS
                   |NGX_HTTP_UPSTREAM_MAX_FAILS
                   |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
                   |NGX_HTTP_UPSTREAM_DOWN;
diff --git a/src/http/modules/ngx_http_upstream_least_conn_module.c b/src/http/modules/ngx_http_upstream_least_conn_module.c
index 8a300c1..ebe0627 100644
--- a/src/http/modules/ngx_http_upstream_least_conn_module.c
+++ b/src/http/modules/ngx_http_upstream_least_conn_module.c
@@ -136,7 +136,6 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
          peer;
          peer = peer->next, i++)
     {
-
         n = i / (8 * sizeof(uintptr_t));
         m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
 
@@ -155,6 +154,10 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
             continue;
         }
 
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            continue;
+        }
+
         /*
          * select peer with least number of connections; if there are
          * multiple peers with the same number of connections, select
@@ -210,6 +213,10 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
                 continue;
             }
 
+            if (peer->max_conns && peer->conns >= peer->max_conns) {
+                continue;
+            }
+
             peer->current_weight += peer->effective_weight;
             total += peer->effective_weight;
 
@@ -273,12 +280,6 @@ failed:
         ngx_http_upstream_rr_peers_wlock(peers);
     }
 
-    /* all peers failed, mark them as live for quick recovery */
-
-    for (peer = peers->peer; peer; peer = peer->next) {
-        peer->fails = 0;
-    }
-
     ngx_http_upstream_rr_peers_unlock(peers);
 
     pc->name = peers->name;
@@ -303,6 +304,7 @@ ngx_http_upstream_least_conn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     uscf->flags = NGX_HTTP_UPSTREAM_CREATE
                   |NGX_HTTP_UPSTREAM_WEIGHT
+                  |NGX_HTTP_UPSTREAM_MAX_CONNS
                   |NGX_HTTP_UPSTREAM_MAX_FAILS
                   |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
                   |NGX_HTTP_UPSTREAM_DOWN
diff --git a/src/http/modules/perl/Makefile.PL b/src/http/modules/perl/Makefile.PL
index 03348b5..7edadcb 100644
--- a/src/http/modules/perl/Makefile.PL
+++ b/src/http/modules/perl/Makefile.PL
@@ -16,6 +16,8 @@ WriteMakefile(
     CCFLAGS           => "$ENV{NGX_PM_CFLAGS}",
     OPTIMIZE          => '-O',
 
+    LDDLFLAGS         => "$ENV{NGX_PM_LDFLAGS}",
+
     INC               => join(" ", map {
                              m#^/# ? "-I $_" : "-I ../../../../../$_"
                          } (split /\s+/, $ENV{NGX_INCS})),
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 7a46b3e..ba559f2 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1756,7 +1756,7 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
     ls->deferred_accept = addr->opt.deferred_accept;
 #endif
 
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
     ls->ipv6only = addr->opt.ipv6only;
 #endif
 
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index 19cb680..afab4f6 100644
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -19,10 +19,7 @@ typedef struct ngx_http_cache_s       ngx_http_cache_t;
 typedef struct ngx_http_file_cache_s  ngx_http_file_cache_t;
 typedef struct ngx_http_log_ctx_s     ngx_http_log_ctx_t;
 typedef struct ngx_http_chunked_s     ngx_http_chunked_t;
-
-#if (NGX_HTTP_V2)
 typedef struct ngx_http_v2_stream_s   ngx_http_v2_stream_t;
-#endif
 
 typedef ngx_int_t (*ngx_http_header_handler_pt)(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset);
diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h
index 2667cbb..70342d0 100644
--- a/src/http/ngx_http_cache.h
+++ b/src/http/ngx_http_cache.h
@@ -50,7 +50,8 @@ typedef struct {
     unsigned                         exists:1;
     unsigned                         updating:1;
     unsigned                         deleting:1;
-                                     /* 11 unused bits */
+    unsigned                         purged:1;
+                                     /* 10 unused bits */
 
     ngx_file_uniq_t                  uniq;
     time_t                           expire;
@@ -85,13 +86,14 @@ struct ngx_http_cache_s {
     ngx_uint_t                       min_uses;
     ngx_uint_t                       error;
     ngx_uint_t                       valid_msec;
+    ngx_uint_t                       vary_tag;
 
     ngx_buf_t                       *buf;
 
     ngx_http_file_cache_t           *file_cache;
     ngx_http_file_cache_node_t      *node;
 
-#if (NGX_THREADS)
+#if (NGX_THREADS || NGX_COMPAT)
     ngx_thread_task_t               *thread_task;
 #endif
 
@@ -109,6 +111,7 @@ struct ngx_http_cache_s {
     unsigned                         updating:1;
     unsigned                         exists:1;
     unsigned                         temp_file:1;
+    unsigned                         purged:1;
     unsigned                         reading:1;
     unsigned                         secondary:1;
 };
@@ -163,6 +166,10 @@ struct ngx_http_file_cache_s {
     ngx_msec_t                       loader_sleep;
     ngx_msec_t                       loader_threshold;
 
+    ngx_uint_t                       manager_files;
+    ngx_msec_t                       manager_sleep;
+    ngx_msec_t                       manager_threshold;
+
     ngx_shm_zone_t                  *shm_zone;
 };
 
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index e26c3f7..9da5d10 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3760,10 +3760,8 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
     ngx_conf_merge_size_value(conf->sendfile_max_chunk,
                               prev->sendfile_max_chunk, 0);
-#if (NGX_HAVE_FILE_AIO || NGX_THREADS)
     ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF);
     ngx_conf_merge_value(conf->aio_write, prev->aio_write, 0);
-#endif
 #if (NGX_THREADS)
     ngx_conf_merge_ptr_value(conf->thread_pool, prev->thread_pool, NULL);
     ngx_conf_merge_ptr_value(conf->thread_pool_value, prev->thread_pool_value,
@@ -3939,7 +3937,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     lsopt.fastopen = -1;
 #endif
     lsopt.wildcard = u.wildcard;
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
     lsopt.ipv6only = 1;
 #endif
 
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 773c215..ade9abb 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -15,6 +15,8 @@
 
 #if (NGX_THREADS)
 #include <ngx_thread_pool.h>
+#elif (NGX_COMPAT)
+typedef struct ngx_thread_pool_s  ngx_thread_pool_t;
 #endif
 
 
@@ -65,18 +67,13 @@ typedef struct {
     unsigned                   default_server:1;
     unsigned                   bind:1;
     unsigned                   wildcard:1;
-#if (NGX_HTTP_SSL)
     unsigned                   ssl:1;
-#endif
-#if (NGX_HTTP_V2)
     unsigned                   http2:1;
-#endif
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
     unsigned                   ipv6only:1;
 #endif
-#if (NGX_HAVE_REUSEPORT)
+    unsigned                   deferred_accept:1;
     unsigned                   reuseport:1;
-#endif
     unsigned                   so_keepalive:2;
     unsigned                   proxy_protocol:1;
 
@@ -98,9 +95,6 @@ typedef struct {
 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
     char                      *accept_filter;
 #endif
-#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
-    ngx_uint_t                 deferred_accept;
-#endif
 
     u_char                     addr[NGX_SOCKADDR_STRLEN + 1];
 } ngx_http_listen_opt_t;
@@ -234,12 +228,8 @@ struct ngx_http_addr_conf_s {
 
     ngx_http_virtual_names_t  *virtual_names;
 
-#if (NGX_HTTP_SSL)
     unsigned                   ssl:1;
-#endif
-#if (NGX_HTTP_V2)
     unsigned                   http2:1;
-#endif
     unsigned                   proxy_protocol:1;
 };
 
@@ -327,9 +317,7 @@ struct ngx_http_core_loc_conf_s {
     unsigned      auto_redirect:1;
 #if (NGX_HTTP_GZIP)
     unsigned      gzip_disable_msie6:2;
-#if (NGX_HTTP_DEGRADATION)
     unsigned      gzip_disable_degradation:2;
-#endif
 #endif
 
     ngx_http_location_tree_node_t   *static_locations;
@@ -419,7 +407,7 @@ struct ngx_http_core_loc_conf_s {
 #endif
 #endif
 
-#if (NGX_THREADS)
+#if (NGX_THREADS || NGX_COMPAT)
     ngx_thread_pool_t         *thread_pool;
     ngx_http_complex_value_t  *thread_pool_value;
 #endif
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 4bf0f7f..199a901 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1759,6 +1759,7 @@ ngx_http_file_cache_expire(ngx_http_file_cache_t *cache)
     size_t                       len;
     time_t                       now, wait;
     ngx_path_t                  *path;
+    ngx_msec_t                   elapsed;
     ngx_queue_t                 *q;
     ngx_http_file_cache_node_t  *fcn;
     u_char                       key[2 * NGX_HTTP_CACHE_KEY_LEN];
@@ -1810,7 +1811,7 @@ ngx_http_file_cache_expire(ngx_http_file_cache_t *cache)
 
         if (fcn->count == 0) {
             ngx_http_file_cache_delete(cache, q, name);
-            continue;
+            goto next;
         }
 
         if (fcn->deleting) {
@@ -1836,6 +1837,22 @@ ngx_http_file_cache_expire(ngx_http_file_cache_t *cache)
         ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
                       "ignore long locked inactive cache entry %*s, count:%d",
                       (size_t) 2 * NGX_HTTP_CACHE_KEY_LEN, key, fcn->count);
+
+next:
+
+        if (++cache->files >= cache->manager_files) {
+            wait = 0;
+            break;
+        }
+
+        ngx_time_update();
+
+        elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last));
+
+        if (elapsed >= cache->manager_threshold) {
+            wait = 0;
+            break;
+        }
     }
 
     ngx_shmtx_unlock(&cache->shpool->mutex);
@@ -1897,20 +1914,25 @@ ngx_http_file_cache_delete(ngx_http_file_cache_t *cache, ngx_queue_t *q,
 }
 
 
-static time_t
+static ngx_msec_t
 ngx_http_file_cache_manager(void *data)
 {
     ngx_http_file_cache_t  *cache = data;
 
     off_t       size;
     time_t      next, wait;
+    ngx_msec_t  elapsed;
     ngx_uint_t  count, watermark;
 
-    next = ngx_http_file_cache_expire(cache);
-
     cache->last = ngx_current_msec;
     cache->files = 0;
 
+    next = ngx_http_file_cache_expire(cache);
+
+    if (next == 0) {
+        return cache->manager_sleep;
+    }
+
     for ( ;; ) {
         ngx_shmtx_lock(&cache->shpool->mutex);
 
@@ -1925,17 +1947,29 @@ ngx_http_file_cache_manager(void *data)
                        size, count, (ngx_int_t) watermark);
 
         if (size < cache->max_size && count < watermark) {
-            return next;
+            return (ngx_msec_t) next * 1000;
         }
 
         wait = ngx_http_file_cache_forced_expire(cache);
 
         if (wait > 0) {
-            return wait;
+            return (ngx_msec_t) wait * 1000;
         }
 
         if (ngx_quit || ngx_terminate) {
-            return next;
+            return (ngx_msec_t) next * 1000;
+        }
+
+        if (++cache->files >= cache->manager_files) {
+            return cache->manager_sleep;
+        }
+
+        ngx_time_update();
+
+        elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last));
+
+        if (elapsed >= cache->manager_threshold) {
+            return cache->manager_sleep;
         }
     }
 }
@@ -2211,8 +2245,9 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     size_t                  len;
     ssize_t                 size;
     ngx_str_t               s, name, *value;
-    ngx_int_t               loader_files;
-    ngx_msec_t              loader_sleep, loader_threshold;
+    ngx_int_t               loader_files, manager_files;
+    ngx_msec_t              loader_sleep, manager_sleep, loader_threshold,
+                            manager_threshold;
     ngx_uint_t              i, n, use_temp_path;
     ngx_array_t            *caches;
     ngx_http_file_cache_t  *cache, **ce;
@@ -2230,10 +2265,15 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     use_temp_path = 1;
 
     inactive = 600;
+
     loader_files = 100;
     loader_sleep = 50;
     loader_threshold = 200;
 
+    manager_files = 100;
+    manager_sleep = 50;
+    manager_threshold = 200;
+
     name.len = 0;
     size = 0;
     max_size = NGX_MAX_OFF_T_VALUE;
@@ -2405,6 +2445,48 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             continue;
         }
 
+        if (ngx_strncmp(value[i].data, "manager_files=", 14) == 0) {
+
+            manager_files = ngx_atoi(value[i].data + 14, value[i].len - 14);
+            if (manager_files == NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid manager_files value \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "manager_sleep=", 14) == 0) {
+
+            s.len = value[i].len - 14;
+            s.data = value[i].data + 14;
+
+            manager_sleep = ngx_parse_time(&s, 0);
+            if (manager_sleep == (ngx_msec_t) NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid manager_sleep value \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "manager_threshold=", 18) == 0) {
+
+            s.len = value[i].len - 18;
+            s.data = value[i].data + 18;
+
+            manager_threshold = ngx_parse_time(&s, 0);
+            if (manager_threshold == (ngx_msec_t) NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid manager_threshold value \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid parameter \"%V\"", &value[i]);
         return NGX_CONF_ERROR;
@@ -2425,6 +2507,9 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     cache->loader_files = loader_files;
     cache->loader_sleep = loader_sleep;
     cache->loader_threshold = loader_threshold;
+    cache->manager_files = manager_files;
+    cache->manager_sleep = manager_sleep;
+    cache->manager_threshold = manager_threshold;
 
     if (ngx_add_path(cf, &cache->path) != NGX_OK) {
         return NGX_CONF_ERROR;
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index bd6c9c9..9f99473 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -149,7 +149,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 break;
             }
 
-            if ((ch < 'A' || ch > 'Z') && ch != '_') {
+            if ((ch < 'A' || ch > 'Z') && ch != '_' && ch != '-') {
                 return NGX_HTTP_PARSE_INVALID_METHOD;
             }
 
@@ -270,7 +270,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 break;
             }
 
-            if ((ch < 'A' || ch > 'Z') && ch != '_') {
+            if ((ch < 'A' || ch > 'Z') && ch != '_' && ch != '-') {
                 return NGX_HTTP_PARSE_INVALID_METHOD;
             }
 
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 499c1ef..cf9ee3c 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -286,9 +286,7 @@ typedef struct {
     ngx_chain_t                      *bufs;
     ngx_buf_t                        *buf;
     off_t                             rest;
-#if (NGX_HTTP_V2)
     off_t                             received;
-#endif
     ngx_chain_t                      *free;
     ngx_chain_t                      *busy;
     ngx_http_chunked_t               *chunked;
@@ -302,7 +300,7 @@ typedef struct {
     ngx_http_addr_conf_t             *addr_conf;
     ngx_http_conf_ctx_t              *conf_ctx;
 
-#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME)
+#if (NGX_HTTP_SSL || NGX_COMPAT)
     ngx_str_t                        *ssl_servername;
 #if (NGX_PCRE)
     ngx_http_regex_t                 *ssl_servername_regex;
@@ -315,9 +313,7 @@ typedef struct {
     ngx_buf_t                       **free;
     ngx_int_t                         nfree;
 
-#if (NGX_HTTP_SSL)
     unsigned                          ssl:1;
-#endif
     unsigned                          proxy_protocol:1;
 } ngx_http_connection_t;
 
@@ -438,9 +434,7 @@ struct ngx_http_request_s {
     ngx_uint_t                        err_status;
 
     ngx_http_connection_t            *http_connection;
-#if (NGX_HTTP_V2)
     ngx_http_v2_stream_t             *stream;
-#endif
 
     ngx_http_log_handler_pt           log_handler;
 
@@ -539,11 +533,11 @@ struct ngx_http_request_s {
     unsigned                          subrequest_ranges:1;
     unsigned                          single_range:1;
     unsigned                          disable_not_modified:1;
-
-#if (NGX_STAT_STUB)
     unsigned                          stat_reading:1;
     unsigned                          stat_writing:1;
-#endif
+    unsigned                          stat_processing:1;
+
+    unsigned                          health_check:1;
 
     /* used to parse HTTP headers */
 
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 64e5acd..7692f80 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -792,7 +792,7 @@ ngx_http_send_refresh(ngx_http_request_t *r)
     b->last = ngx_cpymem(p, ngx_http_msie_refresh_tail,
                          sizeof(ngx_http_msie_refresh_tail) - 1);
 
-    b->last_buf = 1;
+    b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
 
     out.buf = b;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 7e4b3c5..ceb798f 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -748,6 +748,8 @@ found:
         return;
     }
 
+    u->upstream = uscf;
+
 #if (NGX_HTTP_SSL)
     u->ssl_name = uscf->host;
 #endif
@@ -5442,6 +5444,7 @@ ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
 
     uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE
                                          |NGX_HTTP_UPSTREAM_WEIGHT
+                                         |NGX_HTTP_UPSTREAM_MAX_CONNS
                                          |NGX_HTTP_UPSTREAM_MAX_FAILS
                                          |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
                                          |NGX_HTTP_UPSTREAM_DOWN
@@ -5543,7 +5546,7 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     time_t                       fail_timeout;
     ngx_str_t                   *value, s;
     ngx_url_t                    u;
-    ngx_int_t                    weight, max_fails;
+    ngx_int_t                    weight, max_conns, max_fails;
     ngx_uint_t                   i;
     ngx_http_upstream_server_t  *us;
 
@@ -5557,6 +5560,7 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     value = cf->args->elts;
 
     weight = 1;
+    max_conns = 0;
     max_fails = 1;
     fail_timeout = 10;
 
@@ -5577,6 +5581,21 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             continue;
         }
 
+        if (ngx_strncmp(value[i].data, "max_conns=", 10) == 0) {
+
+            if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_CONNS)) {
+                goto not_supported;
+            }
+
+            max_conns = ngx_atoi(&value[i].data[10], value[i].len - 10);
+
+            if (max_conns == NGX_ERROR) {
+                goto invalid;
+            }
+
+            continue;
+        }
+
         if (ngx_strncmp(value[i].data, "max_fails=", 10) == 0) {
 
             if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_FAILS)) {
@@ -5653,6 +5672,7 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     us->addrs = u.addrs;
     us->naddrs = u.naddrs;
     us->weight = weight;
+    us->max_conns = max_conns;
     us->max_fails = max_fails;
     us->fail_timeout = fail_timeout;
 
@@ -5717,14 +5737,14 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
         }
 
         if ((uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE) && !u->no_port) {
-            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "upstream \"%V\" may not have port %d",
                                &u->host, u->port);
             return NULL;
         }
 
         if ((flags & NGX_HTTP_UPSTREAM_CREATE) && !uscfp[i]->no_port) {
-            ngx_log_error(NGX_LOG_WARN, cf->log, 0,
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "upstream \"%V\" may not have port %d in %s:%ui",
                           &u->host, uscfp[i]->port,
                           uscfp[i]->file_name, uscfp[i]->line);
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index ef861f4..3d521f2 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -95,11 +95,16 @@ typedef struct {
     ngx_addr_t                      *addrs;
     ngx_uint_t                       naddrs;
     ngx_uint_t                       weight;
+    ngx_uint_t                       max_conns;
     ngx_uint_t                       max_fails;
     time_t                           fail_timeout;
+    ngx_msec_t                       slow_start;
 
     unsigned                         down:1;
     unsigned                         backup:1;
+
+    NGX_COMPAT_BEGIN(6)
+    NGX_COMPAT_END
 } ngx_http_upstream_server_t;
 
 
@@ -109,6 +114,7 @@ typedef struct {
 #define NGX_HTTP_UPSTREAM_FAIL_TIMEOUT  0x0008
 #define NGX_HTTP_UPSTREAM_DOWN          0x0010
 #define NGX_HTTP_UPSTREAM_BACKUP        0x0020
+#define NGX_HTTP_UPSTREAM_MAX_CONNS     0x0100
 
 
 struct ngx_http_upstream_srv_conf_s {
@@ -202,6 +208,7 @@ typedef struct {
 
     ngx_array_t                     *cache_valid;
     ngx_array_t                     *cache_bypass;
+    ngx_array_t                     *cache_purge;
     ngx_array_t                     *no_cache;
 #endif
 
@@ -215,7 +222,7 @@ typedef struct {
     unsigned                         intercept_404:1;
     unsigned                         change_buffering:1;
 
-#if (NGX_HTTP_SSL)
+#if (NGX_HTTP_SSL || NGX_COMPAT)
     ngx_ssl_t                       *ssl;
     ngx_flag_t                       ssl_session_reuse;
 
@@ -225,6 +232,9 @@ typedef struct {
 #endif
 
     ngx_str_t                        module;
+
+    NGX_COMPAT_BEGIN(2)
+    NGX_COMPAT_END
 } ngx_http_upstream_conf_t;
 
 
@@ -313,6 +323,7 @@ struct ngx_http_upstream_s {
     ngx_chain_writer_ctx_t           writer;
 
     ngx_http_upstream_conf_t        *conf;
+    ngx_http_upstream_srv_conf_t    *upstream;
 #if (NGX_HTTP_CACHE)
     ngx_array_t                     *caches;
 #endif
@@ -356,7 +367,7 @@ struct ngx_http_upstream_s {
     ngx_str_t                        schema;
     ngx_str_t                        uri;
 
-#if (NGX_HTTP_SSL)
+#if (NGX_HTTP_SSL || NGX_COMPAT)
     ngx_str_t                        ssl_name;
 #endif
 
@@ -377,6 +388,9 @@ struct ngx_http_upstream_s {
     unsigned                         request_sent:1;
     unsigned                         request_body_sent:1;
     unsigned                         header_sent:1;
+
+    NGX_COMPAT_BEGIN(1)
+    NGX_COMPAT_END
 };
 
 
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index 8479c42..0137bf6 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -92,6 +92,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
                 peer[n].weight = server[i].weight;
                 peer[n].effective_weight = server[i].weight;
                 peer[n].current_weight = 0;
+                peer[n].max_conns = server[i].max_conns;
                 peer[n].max_fails = server[i].max_fails;
                 peer[n].fail_timeout = server[i].fail_timeout;
                 peer[n].down = server[i].down;
@@ -155,6 +156,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
                 peer[n].weight = server[i].weight;
                 peer[n].effective_weight = server[i].weight;
                 peer[n].current_weight = 0;
+                peer[n].max_conns = server[i].max_conns;
                 peer[n].max_fails = server[i].max_fails;
                 peer[n].fail_timeout = server[i].fail_timeout;
                 peer[n].down = server[i].down;
@@ -223,6 +225,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
         peer[i].weight = 1;
         peer[i].effective_weight = 1;
         peer[i].current_weight = 0;
+        peer[i].max_conns = 0;
         peer[i].max_fails = 1;
         peer[i].fail_timeout = 10;
         *peerp = &peer[i];
@@ -257,6 +260,7 @@ ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r,
 
     rrp->peers = us->peer.data;
     rrp->current = NULL;
+    rrp->config = 0;
 
     n = rrp->peers->number;
 
@@ -337,6 +341,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
         peer[0].weight = 1;
         peer[0].effective_weight = 1;
         peer[0].current_weight = 0;
+        peer[0].max_conns = 0;
         peer[0].max_fails = 1;
         peer[0].fail_timeout = 10;
         peers->peer = peer;
@@ -370,6 +375,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
             peer[i].weight = 1;
             peer[i].effective_weight = 1;
             peer[i].current_weight = 0;
+            peer[i].max_conns = 0;
             peer[i].max_fails = 1;
             peer[i].fail_timeout = 10;
             *peerp = &peer[i];
@@ -379,6 +385,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
 
     rrp->peers = peers;
     rrp->current = NULL;
+    rrp->config = 0;
 
     if (rrp->peers->number <= 8 * sizeof(uintptr_t)) {
         rrp->tried = &rrp->data;
@@ -432,6 +439,10 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
             goto failed;
         }
 
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            goto failed;
+        }
+
         rrp->current = peer;
 
     } else {
@@ -485,12 +496,6 @@ failed:
         ngx_http_upstream_rr_peers_wlock(peers);
     }
 
-    /* all peers failed, mark them as live for quick recovery */
-
-    for (peer = peers->peer; peer; peer = peer->next) {
-        peer->fails = 0;
-    }
-
     ngx_http_upstream_rr_peers_unlock(peers);
 
     pc->name = peers->name;
@@ -521,7 +526,6 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp)
          peer;
          peer = peer->next, i++)
     {
-
         n = i / (8 * sizeof(uintptr_t));
         m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
 
@@ -540,6 +544,10 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp)
             continue;
         }
 
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            continue;
+        }
+
         peer->current_weight += peer->effective_weight;
         total += peer->effective_weight;
 
diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h
index f2c573f..45f258d 100644
--- a/src/http/ngx_http_upstream_round_robin.h
+++ b/src/http/ngx_http_upstream_round_robin.h
@@ -27,6 +27,7 @@ struct ngx_http_upstream_rr_peer_s {
     ngx_int_t                       weight;
 
     ngx_uint_t                      conns;
+    ngx_uint_t                      max_conns;
 
     ngx_uint_t                      fails;
     time_t                          accessed;
@@ -34,19 +35,24 @@ struct ngx_http_upstream_rr_peer_s {
 
     ngx_uint_t                      max_fails;
     time_t                          fail_timeout;
+    ngx_msec_t                      slow_start;
+    ngx_msec_t                      start_time;
 
-    ngx_uint_t                      down;          /* unsigned  down:1; */
+    ngx_uint_t                      down;
 
-#if (NGX_HTTP_SSL)
+#if (NGX_HTTP_SSL || NGX_COMPAT)
     void                           *ssl_session;
     int                             ssl_session_len;
 #endif
 
-    ngx_http_upstream_rr_peer_t    *next;
-
 #if (NGX_HTTP_UPSTREAM_ZONE)
     ngx_atomic_t                    lock;
 #endif
+
+    ngx_http_upstream_rr_peer_t    *next;
+
+    NGX_COMPAT_BEGIN(32)
+    NGX_COMPAT_END
 };
 
 
@@ -119,6 +125,7 @@ struct ngx_http_upstream_rr_peers_s {
 
 
 typedef struct {
+    ngx_uint_t                      config;
     ngx_http_upstream_rr_peers_t   *peers;
     ngx_http_upstream_rr_peer_t    *current;
     uintptr_t                      *tried;
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index d0cd2ab..235092b 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -3178,7 +3178,7 @@ ngx_http_v2_parse_method(ngx_http_request_t *r, ngx_http_v2_header_t *header)
     p = r->method_name.data;
 
     do {
-        if ((*p < 'A' || *p > 'Z') && *p != '_') {
+        if ((*p < 'A' || *p > 'Z') && *p != '_' && *p != '-') {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                           "client sent invalid method: \"%V\"",
                           &r->method_name);
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c
index e5a77b0..9e560bb 100644
--- a/src/mail/ngx_mail.c
+++ b/src/mail/ngx_mail.c
@@ -341,7 +341,7 @@ ngx_mail_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
             ls->keepcnt = addr[i].opt.tcp_keepcnt;
 #endif
 
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
             ls->ipv6only = addr[i].opt.ipv6only;
 #endif
 
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index 1068bb3..c30af35 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -35,10 +35,8 @@ typedef struct {
 
     unsigned                bind:1;
     unsigned                wildcard:1;
-#if (NGX_MAIL_SSL)
     unsigned                ssl:1;
-#endif
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
     unsigned                ipv6only:1;
 #endif
     unsigned                so_keepalive:2;
@@ -54,9 +52,7 @@ typedef struct {
 typedef struct {
     ngx_mail_conf_ctx_t    *ctx;
     ngx_str_t               addr_text;
-#if (NGX_MAIL_SSL)
     ngx_uint_t              ssl;    /* unsigned   ssl:1; */
-#endif
 } ngx_mail_addr_conf_t;
 
 typedef struct {
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 48eacfa..b974d90 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -353,7 +353,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ls->wildcard = u.wildcard;
     ls->ctx = cf->ctx;
 
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
     ls->ipv6only = 1;
 #endif
 
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index 11e428c..fbc9bc7 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -488,7 +488,7 @@ ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
     if (scf->enable && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "\"starttls\" directive conflicts with \"ssl on\"");
         return NGX_CONF_ERROR;
     }
@@ -514,7 +514,7 @@ ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
     if (scf->enable == 1 && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "\"ssl\" directive conflicts with \"starttls\"");
         return NGX_CONF_ERROR;
     }
diff --git a/src/os/unix/ngx_darwin_init.c b/src/os/unix/ngx_darwin_init.c
index a9d12a8..aabe02f 100644
--- a/src/os/unix/ngx_darwin_init.c
+++ b/src/os/unix/ngx_darwin_init.c
@@ -24,6 +24,7 @@ static ngx_os_io_t ngx_darwin_io = {
     ngx_udp_unix_recv,
     ngx_unix_send,
     ngx_udp_unix_send,
+    ngx_udp_unix_sendmsg_chain,
 #if (NGX_HAVE_SENDFILE)
     ngx_darwin_sendfile_chain,
     NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c
index 71672c7..1823f02 100644
--- a/src/os/unix/ngx_freebsd_init.c
+++ b/src/os/unix/ngx_freebsd_init.c
@@ -33,6 +33,7 @@ static ngx_os_io_t ngx_freebsd_io = {
     ngx_udp_unix_recv,
     ngx_unix_send,
     ngx_udp_unix_send,
+    ngx_udp_unix_sendmsg_chain,
 #if (NGX_HAVE_SENDFILE)
     ngx_freebsd_sendfile_chain,
     NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_linux_init.c b/src/os/unix/ngx_linux_init.c
index a1372e9..a8cf6a0 100644
--- a/src/os/unix/ngx_linux_init.c
+++ b/src/os/unix/ngx_linux_init.c
@@ -19,6 +19,7 @@ static ngx_os_io_t ngx_linux_io = {
     ngx_udp_unix_recv,
     ngx_unix_send,
     ngx_udp_unix_send,
+    ngx_udp_unix_sendmsg_chain,
 #if (NGX_HAVE_SENDFILE)
     ngx_linux_sendfile_chain,
     NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_os.h b/src/os/unix/ngx_os.h
index e22f07c..3b32819 100644
--- a/src/os/unix/ngx_os.h
+++ b/src/os/unix/ngx_os.h
@@ -29,6 +29,7 @@ typedef struct {
     ngx_recv_pt        udp_recv;
     ngx_send_pt        send;
     ngx_send_pt        udp_send;
+    ngx_send_chain_pt  udp_send_chain;
     ngx_send_chain_pt  send_chain;
     ngx_uint_t         flags;
 } ngx_os_io_t;
@@ -49,6 +50,8 @@ ssize_t ngx_unix_send(ngx_connection_t *c, u_char *buf, size_t size);
 ngx_chain_t *ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in,
     off_t limit);
 ssize_t ngx_udp_unix_send(ngx_connection_t *c, u_char *buf, size_t size);
+ngx_chain_t *ngx_udp_unix_sendmsg_chain(ngx_connection_t *c, ngx_chain_t *in,
+    off_t limit);
 
 
 #if (IOV_MAX > 64)
diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c
index 7e6e79d..583ea4f 100644
--- a/src/os/unix/ngx_posix_init.c
+++ b/src/os/unix/ngx_posix_init.c
@@ -25,6 +25,7 @@ ngx_os_io_t ngx_os_io = {
     ngx_udp_unix_recv,
     ngx_unix_send,
     ngx_udp_unix_send,
+    ngx_udp_unix_sendmsg_chain,
     ngx_writev_chain,
     0
 };
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 83b04ee..5c4e21d 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -1148,11 +1148,11 @@ ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data)
 static void
 ngx_cache_manager_process_handler(ngx_event_t *ev)
 {
-    time_t        next, n;
     ngx_uint_t    i;
+    ngx_msec_t    next, n;
     ngx_path_t  **path;
 
-    next = 60 * 60;
+    next = 60 * 60 * 1000;
 
     path = ngx_cycle->paths.elts;
     for (i = 0; i < ngx_cycle->paths.nelts; i++) {
@@ -1170,7 +1170,7 @@ ngx_cache_manager_process_handler(ngx_event_t *ev)
         next = 1;
     }
 
-    ngx_add_timer(ev, next * 1000);
+    ngx_add_timer(ev, next);
 }
 
 
diff --git a/src/os/unix/ngx_solaris_init.c b/src/os/unix/ngx_solaris_init.c
index 83acae1..65d7875 100644
--- a/src/os/unix/ngx_solaris_init.c
+++ b/src/os/unix/ngx_solaris_init.c
@@ -20,6 +20,7 @@ static ngx_os_io_t ngx_solaris_io = {
     ngx_udp_unix_recv,
     ngx_unix_send,
     ngx_udp_unix_send,
+    ngx_udp_unix_sendmsg_chain,
 #if (NGX_HAVE_SENDFILE)
     ngx_solaris_sendfilev_chain,
     NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_udp_sendmsg_chain.c b/src/os/unix/ngx_udp_sendmsg_chain.c
new file mode 100644
index 0000000..65bde6f
--- /dev/null
+++ b/src/os/unix/ngx_udp_sendmsg_chain.c
@@ -0,0 +1,245 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+static ngx_chain_t *ngx_udp_output_chain_to_iovec(ngx_iovec_t *vec,
+    ngx_chain_t *in, ngx_log_t *log);
+static ssize_t ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec);
+
+
+ngx_chain_t *
+ngx_udp_unix_sendmsg_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+{
+    ssize_t        n;
+    off_t          send;
+    ngx_chain_t   *cl;
+    ngx_event_t   *wev;
+    ngx_iovec_t    vec;
+    struct iovec   iovs[NGX_IOVS_PREALLOCATE];
+
+    wev = c->write;
+
+    if (!wev->ready) {
+        return in;
+    }
+
+#if (NGX_HAVE_KQUEUE)
+
+    if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) {
+        (void) ngx_connection_error(c, wev->kq_errno,
+                               "kevent() reported about an closed connection");
+        wev->error = 1;
+        return NGX_CHAIN_ERROR;
+    }
+
+#endif
+
+    /* the maximum limit size is the maximum size_t value - the page size */
+
+    if (limit == 0 || limit > (off_t) (NGX_MAX_SIZE_T_VALUE - ngx_pagesize)) {
+        limit = NGX_MAX_SIZE_T_VALUE - ngx_pagesize;
+    }
+
+    send = 0;
+
+    vec.iovs = iovs;
+    vec.nalloc = NGX_IOVS_PREALLOCATE;
+
+    for ( ;; ) {
+
+        /* create the iovec and coalesce the neighbouring bufs */
+
+        cl = ngx_udp_output_chain_to_iovec(&vec, in, c->log);
+
+        if (cl == NGX_CHAIN_ERROR) {
+            return NGX_CHAIN_ERROR;
+        }
+
+        if (cl && cl->buf->in_file) {
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "file buf in sendmsg "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          cl->buf->temporary,
+                          cl->buf->recycled,
+                          cl->buf->in_file,
+                          cl->buf->start,
+                          cl->buf->pos,
+                          cl->buf->last,
+                          cl->buf->file,
+                          cl->buf->file_pos,
+                          cl->buf->file_last);
+
+            ngx_debug_point();
+
+            return NGX_CHAIN_ERROR;
+        }
+
+        if (cl == in) {
+            return in;
+        }
+
+        send += vec.size;
+
+        n = ngx_sendmsg(c, &vec);
+
+        if (n == NGX_ERROR) {
+            return NGX_CHAIN_ERROR;
+        }
+
+        if (n == NGX_AGAIN) {
+            wev->ready = 0;
+            return in;
+        }
+
+        c->sent += n;
+
+        in = ngx_chain_update_sent(in, n);
+
+        if (send >= limit || in == NULL) {
+            return in;
+        }
+    }
+}
+
+
+static ngx_chain_t *
+ngx_udp_output_chain_to_iovec(ngx_iovec_t *vec, ngx_chain_t *in, ngx_log_t *log)
+{
+    size_t         total, size;
+    u_char        *prev;
+    ngx_uint_t     n, flush;
+    ngx_chain_t   *cl;
+    struct iovec  *iov;
+
+    cl = in;
+    iov = NULL;
+    prev = NULL;
+    total = 0;
+    n = 0;
+    flush = 0;
+
+    for ( /* void */ ; in && !flush; in = in->next) {
+
+        if (in->buf->flush || in->buf->last_buf) {
+            flush = 1;
+        }
+
+        if (ngx_buf_special(in->buf)) {
+            continue;
+        }
+
+        if (in->buf->in_file) {
+            break;
+        }
+
+        if (!ngx_buf_in_memory(in->buf)) {
+            ngx_log_error(NGX_LOG_ALERT, log, 0,
+                          "bad buf in output chain "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          in->buf->temporary,
+                          in->buf->recycled,
+                          in->buf->in_file,
+                          in->buf->start,
+                          in->buf->pos,
+                          in->buf->last,
+                          in->buf->file,
+                          in->buf->file_pos,
+                          in->buf->file_last);
+
+            ngx_debug_point();
+
+            return NGX_CHAIN_ERROR;
+        }
+
+        size = in->buf->last - in->buf->pos;
+
+        if (prev == in->buf->pos) {
+            iov->iov_len += size;
+
+        } else {
+            if (n == vec->nalloc) {
+                ngx_log_error(NGX_LOG_ALERT, log, 0,
+                              "too many parts in a datagram");
+                return NGX_CHAIN_ERROR;
+            }
+
+            iov = &vec->iovs[n++];
+
+            iov->iov_base = (void *) in->buf->pos;
+            iov->iov_len = size;
+        }
+
+        prev = in->buf->pos + size;
+        total += size;
+    }
+
+    if (!flush) {
+#if (NGX_SUPPRESS_WARN)
+        vec->size = 0;
+        vec->count = 0;
+#endif
+        return cl;
+    }
+
+    vec->count = n;
+    vec->size = total;
+
+    return in;
+}
+
+
+static ssize_t
+ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec)
+{
+    ssize_t        n;
+    ngx_err_t      err;
+    struct msghdr  msg;
+
+    ngx_memzero(&msg, sizeof(struct msghdr));
+
+    if (c->socklen) {
+        msg.msg_name = c->sockaddr;
+        msg.msg_namelen = c->socklen;
+    }
+
+    msg.msg_iov = vec->iovs;
+    msg.msg_iovlen = vec->count;
+
+eintr:
+
+    n = sendmsg(c->fd, &msg, 0);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "sendmsg: %z of %uz", n, vec->size);
+
+    if (n == -1) {
+        err = ngx_errno;
+
+        switch (err) {
+        case NGX_EAGAIN:
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "sendmsg() not ready");
+            return NGX_AGAIN;
+
+        case NGX_EINTR:
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "sendmsg() was interrupted");
+            goto eintr;
+
+        default:
+            c->write->error = 1;
+            ngx_connection_error(c, err, "sendmsg() failed");
+            return NGX_ERROR;
+        }
+    }
+
+    return n;
+}
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index 873e102..4a394d7 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -12,6 +12,10 @@
 
 
 static char *ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+static ngx_int_t ngx_stream_init_phases(ngx_conf_t *cf,
+    ngx_stream_core_main_conf_t *cmcf);
+static ngx_int_t ngx_stream_init_phase_handlers(ngx_conf_t *cf,
+    ngx_stream_core_main_conf_t *cmcf);
 static ngx_int_t ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     ngx_stream_listen_t *listen);
 static char *ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports);
@@ -27,6 +31,9 @@ static ngx_int_t ngx_stream_cmp_conf_addrs(const void *one, const void *two);
 ngx_uint_t  ngx_stream_max_module;
 
 
+ngx_stream_filter_pt  ngx_stream_top_filter;
+
+
 static ngx_command_t  ngx_stream_commands[] = {
 
     { ngx_string("stream"),
@@ -216,6 +223,10 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
     }
 
+    if (ngx_stream_init_phases(cf, cmcf) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     for (m = 0; cf->cycle->modules[m]; m++) {
         if (cf->cycle->modules[m]->type != NGX_STREAM_MODULE) {
             continue;
@@ -236,6 +247,9 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     *cf = pcf;
 
+    if (ngx_stream_init_phase_handlers(cf, cmcf) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
 
     if (ngx_array_init(&ports, cf->temp_pool, 4, sizeof(ngx_stream_conf_port_t))
         != NGX_OK)
@@ -255,6 +269,114 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static ngx_int_t
+ngx_stream_init_phases(ngx_conf_t *cf, ngx_stream_core_main_conf_t *cmcf)
+{
+    if (ngx_array_init(&cmcf->phases[NGX_STREAM_POST_ACCEPT_PHASE].handlers,
+                       cf->pool, 1, sizeof(ngx_stream_handler_pt))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_array_init(&cmcf->phases[NGX_STREAM_PREACCESS_PHASE].handlers,
+                       cf->pool, 1, sizeof(ngx_stream_handler_pt))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_array_init(&cmcf->phases[NGX_STREAM_ACCESS_PHASE].handlers,
+                       cf->pool, 1, sizeof(ngx_stream_handler_pt))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_array_init(&cmcf->phases[NGX_STREAM_SSL_PHASE].handlers,
+                       cf->pool, 1, sizeof(ngx_stream_handler_pt))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_array_init(&cmcf->phases[NGX_STREAM_PREREAD_PHASE].handlers,
+                       cf->pool, 1, sizeof(ngx_stream_handler_pt))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_array_init(&cmcf->phases[NGX_STREAM_LOG_PHASE].handlers,
+                       cf->pool, 1, sizeof(ngx_stream_handler_pt))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_init_phase_handlers(ngx_conf_t *cf,
+    ngx_stream_core_main_conf_t *cmcf)
+{
+    ngx_int_t                     j;
+    ngx_uint_t                    i, n;
+    ngx_stream_handler_pt        *h;
+    ngx_stream_phase_handler_t   *ph;
+    ngx_stream_phase_handler_pt   checker;
+
+    n = 1 /* content phase */;
+
+    for (i = 0; i < NGX_STREAM_LOG_PHASE; i++) {
+        n += cmcf->phases[i].handlers.nelts;
+    }
+
+    ph = ngx_pcalloc(cf->pool,
+                     n * sizeof(ngx_stream_phase_handler_t) + sizeof(void *));
+    if (ph == NULL) {
+        return NGX_ERROR;
+    }
+
+    cmcf->phase_engine.handlers = ph;
+    n = 0;
+
+    for (i = 0; i < NGX_STREAM_LOG_PHASE; i++) {
+        h = cmcf->phases[i].handlers.elts;
+
+        switch (i) {
+
+        case NGX_STREAM_PREREAD_PHASE:
+            checker = ngx_stream_core_preread_phase;
+            break;
+
+        case NGX_STREAM_CONTENT_PHASE:
+            ph->checker = ngx_stream_core_content_phase;
+            n++;
+            ph++;
+
+            continue;
+
+        default:
+            checker = ngx_stream_core_generic_phase;
+        }
+
+        n += cmcf->phases[i].handlers.nelts;
+
+        for (j = cmcf->phases[i].handlers.nelts - 1; j >= 0; j--) {
+            ph->checker = checker;
+            ph->handler = h[j];
+            ph->next = n;
+            ph++;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     ngx_stream_listen_t *listen)
@@ -382,7 +504,7 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
             ls->keepcnt = addr[i].opt.tcp_keepcnt;
 #endif
 
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
             ls->ipv6only = addr[i].opt.ipv6only;
 #endif
 
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 6251cc7..9e4169c 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -49,15 +49,11 @@ typedef struct {
 
     unsigned                       bind:1;
     unsigned                       wildcard:1;
-#if (NGX_STREAM_SSL)
     unsigned                       ssl:1;
-#endif
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
     unsigned                       ipv6only:1;
 #endif
-#if (NGX_HAVE_REUSEPORT)
     unsigned                       reuseport:1;
-#endif
     unsigned                       so_keepalive:2;
     unsigned                       proxy_protocol:1;
 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
@@ -73,9 +69,7 @@ typedef struct {
 typedef struct {
     ngx_stream_conf_ctx_t         *ctx;
     ngx_str_t                      addr_text;
-#if (NGX_STREAM_SSL)
     unsigned                       ssl:1;
-#endif
     unsigned                       proxy_protocol:1;
 } ngx_stream_addr_conf_t;
 
@@ -115,17 +109,47 @@ typedef struct {
 } ngx_stream_conf_addr_t;
 
 
-typedef ngx_int_t (*ngx_stream_access_pt)(ngx_stream_session_t *s);
+typedef enum {
+    NGX_STREAM_POST_ACCEPT_PHASE = 0,
+    NGX_STREAM_PREACCESS_PHASE,
+    NGX_STREAM_ACCESS_PHASE,
+    NGX_STREAM_SSL_PHASE,
+    NGX_STREAM_PREREAD_PHASE,
+    NGX_STREAM_CONTENT_PHASE,
+    NGX_STREAM_LOG_PHASE
+} ngx_stream_phases;
+
+
+typedef struct ngx_stream_phase_handler_s  ngx_stream_phase_handler_t;
+
+typedef ngx_int_t (*ngx_stream_phase_handler_pt)(ngx_stream_session_t *s,
+    ngx_stream_phase_handler_t *ph);
+typedef ngx_int_t (*ngx_stream_handler_pt)(ngx_stream_session_t *s);
+typedef void (*ngx_stream_content_handler_pt)(ngx_stream_session_t *s);
+
+
+struct ngx_stream_phase_handler_s {
+    ngx_stream_phase_handler_pt    checker;
+    ngx_stream_handler_pt          handler;
+    ngx_uint_t                     next;
+};
+
+
+typedef struct {
+    ngx_stream_phase_handler_t    *handlers;
+} ngx_stream_phase_engine_t;
+
+
+typedef struct {
+    ngx_array_t                    handlers;
+} ngx_stream_phase_t;
 
 
 typedef struct {
     ngx_array_t                    servers;     /* ngx_stream_core_srv_conf_t */
     ngx_array_t                    listen;      /* ngx_stream_listen_t */
 
-    ngx_stream_access_pt           realip_handler;
-    ngx_stream_access_pt           limit_conn_handler;
-    ngx_stream_access_pt           access_handler;
-    ngx_stream_access_pt           access_log_handler;
+    ngx_stream_phase_engine_t      phase_engine;
 
     ngx_hash_t                     variables_hash;
 
@@ -136,14 +160,13 @@ typedef struct {
     ngx_uint_t                     variables_hash_bucket_size;
 
     ngx_hash_keys_arrays_t        *variables_keys;
+
+    ngx_stream_phase_t             phases[NGX_STREAM_LOG_PHASE + 1];
 } ngx_stream_core_main_conf_t;
 
 
-typedef void (*ngx_stream_handler_pt)(ngx_stream_session_t *s);
-
-
 typedef struct {
-    ngx_stream_handler_pt          handler;
+    ngx_stream_content_handler_pt  handler;
 
     ngx_stream_conf_ctx_t         *ctx;
 
@@ -151,6 +174,8 @@ typedef struct {
     ngx_uint_t                     line;
 
     ngx_flag_t                     tcp_nodelay;
+    size_t                         preread_buffer_size;
+    ngx_msec_t                     preread_timeout;
 
     ngx_log_t                     *error_log;
 
@@ -189,11 +214,14 @@ struct ngx_stream_session_s {
     u_char                        *captures_data;
 #endif
 
+    ngx_int_t                      phase_handler;
     ngx_uint_t                     status;
 
-#if (NGX_STREAM_SSL)
-    ngx_uint_t                     ssl;  /* unsigned  ssl:1; */
-#endif
+    unsigned                       ssl:1;
+
+    unsigned                       stat_processing:1;
+
+    unsigned                       health_check:1;
 };
 
 
@@ -243,7 +271,20 @@ typedef struct {
         NULL)
 
 
+#define NGX_STREAM_WRITE_BUFFERED  0x10
+
+
+void ngx_stream_core_run_phases(ngx_stream_session_t *s);
+ngx_int_t ngx_stream_core_generic_phase(ngx_stream_session_t *s,
+    ngx_stream_phase_handler_t *ph);
+ngx_int_t ngx_stream_core_preread_phase(ngx_stream_session_t *s,
+    ngx_stream_phase_handler_t *ph);
+ngx_int_t ngx_stream_core_content_phase(ngx_stream_session_t *s,
+    ngx_stream_phase_handler_t *ph);
+
+
 void ngx_stream_init_connection(ngx_connection_t *c);
+void ngx_stream_session_handler(ngx_event_t *rev);
 void ngx_stream_finalize_session(ngx_stream_session_t *s, ngx_uint_t rc);
 
 
@@ -252,4 +293,11 @@ extern ngx_uint_t    ngx_stream_max_module;
 extern ngx_module_t  ngx_stream_core_module;
 
 
+typedef ngx_int_t (*ngx_stream_filter_pt)(ngx_stream_session_t *s,
+    ngx_chain_t *chain, ngx_uint_t from_upstream);
+
+
+extern ngx_stream_filter_pt  ngx_stream_top_filter;
+
+
 #endif /* _NGX_STREAM_H_INCLUDED_ */
diff --git a/src/stream/ngx_stream_access_module.c b/src/stream/ngx_stream_access_module.c
index 6985d36..1745cdf 100644
--- a/src/stream/ngx_stream_access_module.c
+++ b/src/stream/ngx_stream_access_module.c
@@ -275,7 +275,7 @@ ngx_stream_access_found(ngx_stream_session_t *s, ngx_uint_t deny)
     if (deny) {
         ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
                       "access forbidden by rule");
-        return NGX_ABORT;
+        return NGX_STREAM_FORBIDDEN;
     }
 
     return NGX_OK;
@@ -443,10 +443,17 @@ ngx_stream_access_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 static ngx_int_t
 ngx_stream_access_init(ngx_conf_t *cf)
 {
+    ngx_stream_handler_pt        *h;
     ngx_stream_core_main_conf_t  *cmcf;
 
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
-    cmcf->access_handler = ngx_stream_access_handler;
+
+    h = ngx_array_push(&cmcf->phases[NGX_STREAM_ACCESS_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_stream_access_handler;
 
     return NGX_OK;
 }
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index 1c808ad..f7870ee 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -91,6 +91,20 @@ static ngx_command_t  ngx_stream_core_commands[] = {
       offsetof(ngx_stream_core_srv_conf_t, tcp_nodelay),
       NULL },
 
+    { ngx_string("preread_buffer_size"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_core_srv_conf_t, preread_buffer_size),
+      NULL },
+
+    { ngx_string("preread_timeout"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_core_srv_conf_t, preread_timeout),
+      NULL },
+
       ngx_null_command
 };
 
@@ -123,6 +137,214 @@ ngx_module_t  ngx_stream_core_module = {
 };
 
 
+void
+ngx_stream_core_run_phases(ngx_stream_session_t *s)
+{
+    ngx_int_t                     rc;
+    ngx_stream_phase_handler_t   *ph;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
+
+    ph = cmcf->phase_engine.handlers;
+
+    while (ph[s->phase_handler].checker) {
+
+        rc = ph[s->phase_handler].checker(s, &ph[s->phase_handler]);
+
+        if (rc == NGX_OK) {
+            return;
+        }
+    }
+}
+
+
+ngx_int_t
+ngx_stream_core_generic_phase(ngx_stream_session_t *s,
+    ngx_stream_phase_handler_t *ph)
+{
+    ngx_int_t  rc;
+
+    /*
+     * generic phase checker,
+     * used by all phases, except for preread and content
+     */
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "generic phase: %ui", s->phase_handler);
+
+    rc = ph->handler(s);
+
+    if (rc == NGX_OK) {
+        s->phase_handler = ph->next;
+        return NGX_AGAIN;
+    }
+
+    if (rc == NGX_DECLINED) {
+        s->phase_handler++;
+        return NGX_AGAIN;
+    }
+
+    if (rc == NGX_AGAIN || rc == NGX_DONE) {
+        return NGX_OK;
+    }
+
+    if (rc == NGX_ERROR) {
+        rc = NGX_STREAM_INTERNAL_SERVER_ERROR;
+    }
+
+    ngx_stream_finalize_session(s, rc);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_stream_core_preread_phase(ngx_stream_session_t *s,
+    ngx_stream_phase_handler_t *ph)
+{
+    size_t                       size;
+    ssize_t                      n;
+    ngx_int_t                    rc;
+    ngx_connection_t            *c;
+    ngx_stream_core_srv_conf_t  *cscf;
+
+    c = s->connection;
+
+    c->log->action = "prereading client data";
+
+    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
+
+    if (c->read->timedout) {
+        rc = NGX_STREAM_OK;
+
+    } else if (c->read->timer_set) {
+        rc = NGX_AGAIN;
+
+    } else {
+        rc = ph->handler(s);
+    }
+
+    while (rc == NGX_AGAIN) {
+
+        if (c->buffer == NULL) {
+            c->buffer = ngx_create_temp_buf(c->pool, cscf->preread_buffer_size);
+            if (c->buffer == NULL) {
+                rc = NGX_ERROR;
+                break;
+            }
+        }
+
+        size = c->buffer->end - c->buffer->last;
+
+        if (size == 0) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0, "preread buffer full");
+            rc = NGX_STREAM_BAD_REQUEST;
+            break;
+        }
+
+        if (c->read->eof) {
+            rc = NGX_STREAM_OK;
+            break;
+        }
+
+        if (!c->read->ready) {
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                rc = NGX_ERROR;
+                break;
+            }
+
+            if (!c->read->timer_set) {
+                ngx_add_timer(c->read, cscf->preread_timeout);
+            }
+
+            c->read->handler = ngx_stream_session_handler;
+
+            return NGX_OK;
+        }
+
+        n = c->recv(c, c->buffer->last, size);
+
+        if (n == NGX_ERROR) {
+            rc = NGX_STREAM_OK;
+            break;
+        }
+
+        if (n > 0) {
+            c->buffer->last += n;
+        }
+
+        rc = ph->handler(s);
+    }
+
+    if (c->read->timer_set) {
+        ngx_del_timer(c->read);
+    }
+
+    if (rc == NGX_OK) {
+        s->phase_handler = ph->next;
+        return NGX_AGAIN;
+    }
+
+    if (rc == NGX_DECLINED) {
+        s->phase_handler++;
+        return NGX_AGAIN;
+    }
+
+    if (rc == NGX_DONE) {
+        return NGX_OK;
+    }
+
+    if (rc == NGX_ERROR) {
+        rc = NGX_STREAM_INTERNAL_SERVER_ERROR;
+    }
+
+    ngx_stream_finalize_session(s, rc);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_stream_core_content_phase(ngx_stream_session_t *s,
+    ngx_stream_phase_handler_t *ph)
+{
+    int                          tcp_nodelay;
+    ngx_connection_t            *c;
+    ngx_stream_core_srv_conf_t  *cscf;
+
+    c = s->connection;
+
+    c->log->action = NULL;
+
+    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
+
+    if (c->type == SOCK_STREAM
+        && cscf->tcp_nodelay
+        && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
+    {
+        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0, "tcp_nodelay");
+
+        tcp_nodelay = 1;
+
+        if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
+                       (const void *) &tcp_nodelay, sizeof(int)) == -1)
+        {
+            ngx_connection_error(c, ngx_socket_errno,
+                                 "setsockopt(TCP_NODELAY) failed");
+            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return NGX_OK;
+        }
+
+        c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+    }
+
+    cscf->handler(s);
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_core_preconfiguration(ngx_conf_t *cf)
 {
@@ -201,6 +423,8 @@ ngx_stream_core_create_srv_conf(ngx_conf_t *cf)
     cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
     cscf->proxy_protocol_timeout = NGX_CONF_UNSET_MSEC;
     cscf->tcp_nodelay = NGX_CONF_UNSET;
+    cscf->preread_buffer_size = NGX_CONF_UNSET_SIZE;
+    cscf->preread_timeout = NGX_CONF_UNSET_MSEC;
 
     return cscf;
 }
@@ -253,6 +477,12 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);
 
+    ngx_conf_merge_size_value(conf->preread_buffer_size,
+                              prev->preread_buffer_size, 16384);
+
+    ngx_conf_merge_msec_value(conf->preread_timeout,
+                              prev->preread_timeout, 30000);
+
     return NGX_CONF_OK;
 }
 
@@ -394,7 +624,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ls->wildcard = u.wildcard;
     ls->ctx = cf->ctx;
 
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
     ls->ipv6only = 1;
 #endif
 
diff --git a/src/stream/ngx_stream_handler.c b/src/stream/ngx_stream_handler.c
index 6e2ed82..669b6a1 100644
--- a/src/stream/ngx_stream_handler.c
+++ b/src/stream/ngx_stream_handler.c
@@ -11,15 +11,10 @@
 #include <ngx_stream.h>
 
 
+static void ngx_stream_log_session(ngx_stream_session_t *s);
 static void ngx_stream_close_connection(ngx_connection_t *c);
 static u_char *ngx_stream_log_error(ngx_log_t *log, u_char *buf, size_t len);
 static void ngx_stream_proxy_protocol_handler(ngx_event_t *rev);
-static void ngx_stream_init_session_handler(ngx_event_t *rev);
-
-#if (NGX_STREAM_SSL)
-static void ngx_stream_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c);
-static void ngx_stream_ssl_handshake_handler(ngx_connection_t *c);
-#endif
 
 
 void
@@ -134,6 +129,10 @@ ngx_stream_init_connection(ngx_connection_t *c)
     s->ssl = addr_conf->ssl;
 #endif
 
+    if (c->buffer) {
+        s->received += c->buffer->last - c->buffer->pos;
+    }
+
     s->connection = c;
     c->data = s;
 
@@ -150,7 +149,7 @@ ngx_stream_init_connection(ngx_connection_t *c)
     c->log->connection = c->number;
     c->log->handler = ngx_stream_log_error;
     c->log->data = s;
-    c->log->action = "initializing connection";
+    c->log->action = "initializing session";
     c->log_error = NGX_ERROR_INFO;
 
     s->ctx = ngx_pcalloc(c->pool, sizeof(void *) * ngx_stream_max_module);
@@ -175,7 +174,7 @@ ngx_stream_init_connection(ngx_connection_t *c)
     s->start_msec = tp->msec;
 
     rev = c->read;
-    rev->handler = ngx_stream_init_session_handler;
+    rev->handler = ngx_stream_session_handler;
 
     if (addr_conf->proxy_protocol) {
         c->log->action = "reading PROXY protocol";
@@ -275,192 +274,57 @@ ngx_stream_proxy_protocol_handler(ngx_event_t *rev)
         return;
     }
 
-    ngx_stream_init_session_handler(rev);
+    c->log->action = "initializing session";
+
+    ngx_stream_session_handler(rev);
 }
 
 
-static void
-ngx_stream_init_session_handler(ngx_event_t *rev)
+void
+ngx_stream_session_handler(ngx_event_t *rev)
 {
-    int                           tcp_nodelay;
-    ngx_int_t                     rc;
-    ngx_connection_t             *c;
-    ngx_stream_session_t         *s;
-    ngx_stream_core_srv_conf_t   *cscf;
-    ngx_stream_core_main_conf_t  *cmcf;
+    ngx_connection_t      *c;
+    ngx_stream_session_t  *s;
 
     c = rev->data;
     s = c->data;
 
-    c->log->action = "initializing session";
-
-    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
-
-    if (cmcf->realip_handler) {
-        rc = cmcf->realip_handler(s);
-
-        if (rc == NGX_ERROR) {
-            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
-            return;
-        }
-    }
-
-    if (cmcf->limit_conn_handler) {
-        rc = cmcf->limit_conn_handler(s);
-
-        if (rc == NGX_ERROR) {
-            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
-            return;
-        }
-
-        if (rc == NGX_ABORT) {
-            ngx_stream_finalize_session(s, NGX_STREAM_SERVICE_UNAVAILABLE);
-            return;
-        }
-    }
-
-    if (cmcf->access_handler) {
-        rc = cmcf->access_handler(s);
-
-        if (rc == NGX_ERROR) {
-            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
-            return;
-        }
-
-        if (rc == NGX_ABORT) {
-            ngx_stream_finalize_session(s, NGX_STREAM_FORBIDDEN);
-            return;
-        }
-    }
-
-    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
-
-    if (c->type == SOCK_STREAM
-        && cscf->tcp_nodelay
-        && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
-    {
-        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0, "tcp_nodelay");
-
-        tcp_nodelay = 1;
-
-        if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                       (const void *) &tcp_nodelay, sizeof(int)) == -1)
-        {
-            ngx_connection_error(c, ngx_socket_errno,
-                                 "setsockopt(TCP_NODELAY) failed");
-            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
-            return;
-        }
-
-        c->tcp_nodelay = NGX_TCP_NODELAY_SET;
-    }
-
-
-#if (NGX_STREAM_SSL)
-    {
-    ngx_stream_ssl_conf_t  *sslcf;
-
-    sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
-
-    if (s->ssl) {
-        c->log->action = "SSL handshaking";
-
-        if (sslcf->ssl.ctx == NULL) {
-            ngx_log_error(NGX_LOG_ERR, c->log, 0,
-                          "no \"ssl_certificate\" is defined "
-                          "in server listening on SSL port");
-            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
-            return;
-        }
-
-        ngx_stream_ssl_init_connection(&sslcf->ssl, c);
-        return;
-    }
-    }
-#endif
-
-    c->log->action = "handling client connection";
-
-    cscf->handler(s);
+    ngx_stream_core_run_phases(s);
 }
 
 
-#if (NGX_STREAM_SSL)
-
-static void
-ngx_stream_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c)
-{
-    ngx_stream_session_t   *s;
-    ngx_stream_ssl_conf_t  *sslcf;
-
-    s = c->data;
-
-    if (ngx_ssl_create_connection(ssl, c, 0) == NGX_ERROR) {
-        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
-        return;
-    }
-
-    if (ngx_ssl_handshake(c) == NGX_AGAIN) {
-        sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
-
-        ngx_add_timer(c->read, sslcf->handshake_timeout);
-
-        c->ssl->handler = ngx_stream_ssl_handshake_handler;
-
-        return;
-    }
-
-    ngx_stream_ssl_handshake_handler(c);
-}
-
-
-static void
-ngx_stream_ssl_handshake_handler(ngx_connection_t *c)
-{
-    ngx_stream_session_t        *s;
-    ngx_stream_core_srv_conf_t  *cscf;
-
-    if (!c->ssl->handshaked) {
-        ngx_stream_finalize_session(c->data, NGX_STREAM_INTERNAL_SERVER_ERROR);
-        return;
-    }
-
-    if (c->read->timer_set) {
-        ngx_del_timer(c->read);
-    }
-
-    c->log->action = "handling client connection";
-
-    s = c->data;
-
-    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
-
-    cscf->handler(s);
-}
-
-#endif
-
-
 void
 ngx_stream_finalize_session(ngx_stream_session_t *s, ngx_uint_t rc)
 {
-    ngx_stream_core_main_conf_t  *cmcf;
-
     ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
                    "finalize stream session: %i", rc);
 
     s->status = rc;
 
-    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
-
-    if (cmcf->access_log_handler) {
-        (void) cmcf->access_log_handler(s);
-    }
+    ngx_stream_log_session(s);
 
     ngx_stream_close_connection(s->connection);
 }
 
 
+static void
+ngx_stream_log_session(ngx_stream_session_t *s)
+{
+    ngx_uint_t                    i, n;
+    ngx_stream_handler_pt        *log_handler;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_get_module_main_conf(s, ngx_stream_core_module);
+
+    log_handler = cmcf->phases[NGX_STREAM_LOG_PHASE].handlers.elts;
+    n = cmcf->phases[NGX_STREAM_LOG_PHASE].handlers.nelts;
+
+    for (i = 0; i < n; i++) {
+        log_handler[i](s);
+    }
+}
+
+
 static void
 ngx_stream_close_connection(ngx_connection_t *c)
 {
diff --git a/src/stream/ngx_stream_limit_conn_module.c b/src/stream/ngx_stream_limit_conn_module.c
index 40eca94..b64a426 100644
--- a/src/stream/ngx_stream_limit_conn_module.c
+++ b/src/stream/ngx_stream_limit_conn_module.c
@@ -178,7 +178,7 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
             if (node == NULL) {
                 ngx_shmtx_unlock(&shpool->mutex);
                 ngx_stream_limit_conn_cleanup_all(s->connection->pool);
-                return NGX_ABORT;
+                return NGX_STREAM_SERVICE_UNAVAILABLE;
             }
 
             lc = (ngx_stream_limit_conn_node_t *) &node->color;
@@ -203,7 +203,7 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
                               &limits[i].shm_zone->shm.name);
 
                 ngx_stream_limit_conn_cleanup_all(s->connection->pool);
-                return NGX_ABORT;
+                return NGX_STREAM_SERVICE_UNAVAILABLE;
             }
 
             lc->conn++;
@@ -630,11 +630,17 @@ ngx_stream_limit_conn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 static ngx_int_t
 ngx_stream_limit_conn_init(ngx_conf_t *cf)
 {
+    ngx_stream_handler_pt        *h;
     ngx_stream_core_main_conf_t  *cmcf;
 
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
-    cmcf->limit_conn_handler = ngx_stream_limit_conn_handler;
+    h = ngx_array_push(&cmcf->phases[NGX_STREAM_PREACCESS_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_stream_limit_conn_handler;
 
     return NGX_OK;
 }
diff --git a/src/stream/ngx_stream_log_module.c b/src/stream/ngx_stream_log_module.c
index 4affbdf..26e6d22 100644
--- a/src/stream/ngx_stream_log_module.c
+++ b/src/stream/ngx_stream_log_module.c
@@ -1464,11 +1464,17 @@ ngx_stream_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 static ngx_int_t
 ngx_stream_log_init(ngx_conf_t *cf)
 {
+    ngx_stream_handler_pt        *h;
     ngx_stream_core_main_conf_t  *cmcf;
 
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
-    cmcf->access_log_handler = ngx_stream_log_handler;
+    h = ngx_array_push(&cmcf->phases[NGX_STREAM_LOG_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_stream_log_handler;
 
     return NGX_OK;
 }
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index ed802e7..4231f97 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -84,10 +84,10 @@ static char *ngx_stream_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_stream_proxy_bind(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
-static ngx_int_t ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s);
 
 #if (NGX_STREAM_SSL)
 
+static ngx_int_t ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s);
 static char *ngx_stream_proxy_ssl_password_file(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
 static void ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s);
@@ -385,8 +385,6 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
     }
 
     u->peer.type = c->type;
-
-    u->proxy_protocol = pscf->proxy_protocol;
     u->start_sec = ngx_time();
 
     c->write->handler = ngx_stream_proxy_downstream_handler;
@@ -411,28 +409,6 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
         u->downstream_buf.pos = p;
         u->downstream_buf.last = p;
 
-        if (u->proxy_protocol
-#if (NGX_STREAM_SSL)
-            && pscf->ssl == NULL
-#endif
-            && pscf->buffer_size >= NGX_PROXY_PROTOCOL_MAX_HEADER)
-        {
-            /* optimization for a typical case */
-
-            ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
-                           "stream proxy send PROXY protocol header");
-
-            p = ngx_proxy_protocol_write(c, u->downstream_buf.last,
-                                         u->downstream_buf.end);
-            if (p == NULL) {
-                ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
-                return;
-            }
-
-            u->downstream_buf.last = p;
-            u->proxy_protocol = 0;
-        }
-
         if (c->read->ready) {
             ngx_post_event(c->read, &ngx_posted_events);
         }
@@ -545,6 +521,8 @@ found:
         return;
     }
 
+    u->upstream = uscf;
+
 #if (NGX_STREAM_SSL)
     u->ssl_name = uscf->host;
 #endif
@@ -682,8 +660,13 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
 
     c->log->action = "connecting to upstream";
 
+    pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
+
     u = s->upstream;
 
+    u->connected = 0;
+    u->proxy_protocol = pscf->proxy_protocol;
+
     if (u->state) {
         u->state->response_time = ngx_current_msec - u->state->response_time;
     }
@@ -740,8 +723,6 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
     pc->read->handler = ngx_stream_proxy_connect_handler;
     pc->write->handler = ngx_stream_proxy_connect_handler;
 
-    pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
-
     ngx_add_timer(pc->write, pscf->connect_timeout);
 }
 
@@ -751,6 +732,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 {
     int                           tcp_nodelay;
     u_char                       *p;
+    ngx_chain_t                  *cl;
     ngx_connection_t             *c, *pc;
     ngx_log_handler_pt            handler;
     ngx_stream_upstream_t        *u;
@@ -782,21 +764,26 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
         pc->tcp_nodelay = NGX_TCP_NODELAY_SET;
     }
 
-    if (u->proxy_protocol) {
-        if (ngx_stream_proxy_send_proxy_protocol(s) != NGX_OK) {
-            return;
-        }
-
-        u->proxy_protocol = 0;
-    }
-
     pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
 
 #if (NGX_STREAM_SSL)
-    if (pc->type == SOCK_STREAM && pscf->ssl && pc->ssl == NULL) {
-        ngx_stream_proxy_ssl_init_connection(s);
-        return;
+
+    if (pc->type == SOCK_STREAM && pscf->ssl) {
+
+        if (u->proxy_protocol) {
+            if (ngx_stream_proxy_send_proxy_protocol(s) != NGX_OK) {
+                return;
+            }
+
+            u->proxy_protocol = 0;
+        }
+
+        if (pc->ssl == NULL) {
+            ngx_stream_proxy_ssl_init_connection(s);
+            return;
+        }
     }
+
 #endif
 
     c = s->connection;
@@ -838,14 +825,66 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
         u->upstream_buf.last = p;
     }
 
-    if (c->type == SOCK_DGRAM) {
-        s->received = c->buffer->last - c->buffer->pos;
-        u->downstream_buf = *c->buffer;
+    if (c->buffer && c->buffer->pos < c->buffer->last) {
+        ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                       "stream proxy add preread buffer: %uz",
+                       c->buffer->last - c->buffer->pos);
 
-        if (pscf->responses == 0) {
-            pc->read->ready = 0;
-            pc->read->eof = 1;
+        cl = ngx_chain_get_free_buf(c->pool, &u->free);
+        if (cl == NULL) {
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return;
         }
+
+        *cl->buf = *c->buffer;
+
+        cl->buf->tag = (ngx_buf_tag_t) &ngx_stream_proxy_module;
+        cl->buf->flush = 1;
+        cl->buf->last_buf = (c->type == SOCK_DGRAM);
+
+        cl->next = u->upstream_out;
+        u->upstream_out = cl;
+    }
+
+    if (u->proxy_protocol) {
+        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                       "stream proxy add PROXY protocol header");
+
+        cl = ngx_chain_get_free_buf(c->pool, &u->free);
+        if (cl == NULL) {
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return;
+        }
+
+        p = ngx_pnalloc(c->pool, NGX_PROXY_PROTOCOL_MAX_HEADER);
+        if (p == NULL) {
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return;
+        }
+
+        cl->buf->pos = p;
+
+        p = ngx_proxy_protocol_write(c, p, p + NGX_PROXY_PROTOCOL_MAX_HEADER);
+        if (p == NULL) {
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return;
+        }
+
+        cl->buf->last = p;
+        cl->buf->temporary = 1;
+        cl->buf->flush = 0;
+        cl->buf->last_buf = 0;
+        cl->buf->tag = (ngx_buf_tag_t) &ngx_stream_proxy_module;
+
+        cl->next = u->upstream_out;
+        u->upstream_out = cl;
+
+        u->proxy_protocol = 0;
+    }
+
+    if (c->type == SOCK_DGRAM && pscf->responses == 0) {
+        pc->read->ready = 0;
+        pc->read->eof = 1;
     }
 
     u->connected = 1;
@@ -861,6 +900,8 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 }
 
 
+#if (NGX_STREAM_SSL)
+
 static ngx_int_t
 ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
 {
@@ -931,8 +972,6 @@ ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
 }
 
 
-#if (NGX_STREAM_SSL)
-
 static char *
 ngx_stream_proxy_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
@@ -1412,8 +1451,10 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
     size_t                        size, limit_rate;
     ssize_t                       n;
     ngx_buf_t                    *b;
+    ngx_int_t                     rc;
     ngx_uint_t                    flags;
     ngx_msec_t                    delay;
+    ngx_chain_t                  *cl, **ll, **out, **busy;
     ngx_connection_t             *c, *pc, *src, *dst;
     ngx_log_handler_pt            handler;
     ngx_stream_upstream_t        *u;
@@ -1447,6 +1488,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         b = &u->upstream_buf;
         limit_rate = pscf->download_rate;
         received = &u->received;
+        out = &u->downstream_out;
+        busy = &u->downstream_busy;
 
     } else {
         src = c;
@@ -1454,24 +1497,18 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         b = &u->downstream_buf;
         limit_rate = pscf->upload_rate;
         received = &s->received;
+        out = &u->upstream_out;
+        busy = &u->upstream_busy;
     }
 
     for ( ;; ) {
 
-        if (do_write) {
+        if (do_write && dst) {
 
-            size = b->last - b->pos;
+            if (*out || *busy || dst->buffered) {
+                rc = ngx_stream_top_filter(s, *out, from_upstream);
 
-            if (size && dst && dst->write->ready) {
-
-                n = dst->send(dst, b->pos, size);
-
-                if (n == NGX_AGAIN && dst->shared) {
-                    /* cannot wait on a shared socket */
-                    n = NGX_ERROR;
-                }
-
-                if (n == NGX_ERROR) {
+                if (rc == NGX_ERROR) {
                     if (c->type == SOCK_DGRAM && !from_upstream) {
                         ngx_stream_proxy_next_upstream(s);
                         return;
@@ -1481,13 +1518,12 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                     return;
                 }
 
-                if (n > 0) {
-                    b->pos += n;
+                ngx_chain_update_chains(c->pool, &u->free, busy, out,
+                                      (ngx_buf_tag_t) &ngx_stream_proxy_module);
 
-                    if (b->pos == b->last) {
-                        b->pos = b->start;
-                        b->last = b->start;
-                    }
+                if (*busy == NULL) {
+                    b->pos = b->start;
+                    b->last = b->start;
                 }
             }
         }
@@ -1514,11 +1550,21 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 
             n = src->recv(src, b->last, size);
 
-            if (n == NGX_AGAIN || n == 0) {
+            if (n == NGX_AGAIN) {
                 break;
             }
 
-            if (n > 0) {
+            if (n == NGX_ERROR) {
+                if (c->type == SOCK_DGRAM && u->received == 0) {
+                    ngx_stream_proxy_next_upstream(s);
+                    return;
+                }
+
+                src->read->eof = 1;
+                n = 0;
+            }
+
+            if (n >= 0) {
                 if (limit_rate) {
                     delay = (ngx_msec_t) (n * 1000 / limit_rate);
 
@@ -1541,27 +1587,37 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                     src->read->eof = 1;
                 }
 
+                for (ll = out; *ll; ll = &(*ll)->next) { /* void */ }
+
+                cl = ngx_chain_get_free_buf(c->pool, &u->free);
+                if (cl == NULL) {
+                    ngx_stream_proxy_finalize(s,
+                                              NGX_STREAM_INTERNAL_SERVER_ERROR);
+                    return;
+                }
+
+                *ll = cl;
+
+                cl->buf->pos = b->last;
+                cl->buf->last = b->last + n;
+                cl->buf->tag = (ngx_buf_tag_t) &ngx_stream_proxy_module;
+
+                cl->buf->temporary = (n ? 1 : 0);
+                cl->buf->last_buf = src->read->eof;
+                cl->buf->flush = 1;
+
                 *received += n;
                 b->last += n;
                 do_write = 1;
 
                 continue;
             }
-
-            if (n == NGX_ERROR) {
-                if (c->type == SOCK_DGRAM && u->received == 0) {
-                    ngx_stream_proxy_next_upstream(s);
-                    return;
-                }
-
-                src->read->eof = 1;
-            }
         }
 
         break;
     }
 
-    if (src->read->eof && (b->pos == b->last || (dst && dst->read->eof))) {
+    if (src->read->eof && dst && (dst->read->eof || !dst->buffered)) {
         handler = c->log->handler;
         c->log->handler = NULL;
 
@@ -1614,6 +1670,14 @@ ngx_stream_proxy_next_upstream(ngx_stream_session_t *s)
                    "stream proxy next upstream");
 
     u = s->upstream;
+    pc = u->peer.connection;
+
+    if (u->upstream_out || u->upstream_busy || (pc && pc->buffered)) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "pending buffers on next upstream");
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return;
+    }
 
     if (u->peer.sockaddr) {
         u->peer.free(&u->peer, u->peer.data, NGX_PEER_FAILED);
@@ -1632,8 +1696,6 @@ ngx_stream_proxy_next_upstream(ngx_stream_session_t *s)
         return;
     }
 
-    pc = u->peer.connection;
-
     if (pc) {
         ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
                        "close proxy upstream connection: %d", pc->fd);
diff --git a/src/stream/ngx_stream_realip_module.c b/src/stream/ngx_stream_realip_module.c
index 8ce05a0..0740431 100644
--- a/src/stream/ngx_stream_realip_module.c
+++ b/src/stream/ngx_stream_realip_module.c
@@ -279,11 +279,17 @@ ngx_stream_realip_add_variables(ngx_conf_t *cf)
 static ngx_int_t
 ngx_stream_realip_init(ngx_conf_t *cf)
 {
+    ngx_stream_handler_pt        *h;
     ngx_stream_core_main_conf_t  *cmcf;
 
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
-    cmcf->realip_handler = ngx_stream_realip_handler;
+    h = ngx_array_push(&cmcf->phases[NGX_STREAM_POST_ACCEPT_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_stream_realip_handler;
 
     return NGX_OK;
 }
diff --git a/src/stream/ngx_stream_return_module.c b/src/stream/ngx_stream_return_module.c
index c22087f..9301b02 100644
--- a/src/stream/ngx_stream_return_module.c
+++ b/src/stream/ngx_stream_return_module.c
@@ -11,12 +11,12 @@
 
 
 typedef struct {
-    ngx_stream_complex_value_t  text;
+    ngx_stream_complex_value_t   text;
 } ngx_stream_return_srv_conf_t;
 
 
 typedef struct {
-    ngx_buf_t                   buf;
+    ngx_chain_t                 *out;
 } ngx_stream_return_ctx_t;
 
 
@@ -72,6 +72,7 @@ static void
 ngx_stream_return_handler(ngx_stream_session_t *s)
 {
     ngx_str_t                      text;
+    ngx_buf_t                     *b;
     ngx_connection_t              *c;
     ngx_stream_return_ctx_t       *ctx;
     ngx_stream_return_srv_conf_t  *rscf;
@@ -103,8 +104,25 @@ ngx_stream_return_handler(ngx_stream_session_t *s)
 
     ngx_stream_set_ctx(s, ctx, ngx_stream_return_module);
 
-    ctx->buf.pos = text.data;
-    ctx->buf.last = text.data + text.len;
+    b = ngx_calloc_buf(c->pool);
+    if (b == NULL) {
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    b->memory = 1;
+    b->pos = text.data;
+    b->last = text.data + text.len;
+    b->last_buf = 1;
+
+    ctx->out = ngx_alloc_chain_link(c->pool);
+    if (ctx->out == NULL) {
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    ctx->out->buf = b;
+    ctx->out->next = NULL;
 
     c->write->handler = ngx_stream_return_write_handler;
 
@@ -115,8 +133,6 @@ ngx_stream_return_handler(ngx_stream_session_t *s)
 static void
 ngx_stream_return_write_handler(ngx_event_t *ev)
 {
-    ssize_t                   n;
-    ngx_buf_t                *b;
     ngx_connection_t         *c;
     ngx_stream_session_t     *s;
     ngx_stream_return_ctx_t  *ctx;
@@ -130,25 +146,20 @@ ngx_stream_return_write_handler(ngx_event_t *ev)
         return;
     }
 
-    if (ev->ready) {
-        ctx = ngx_stream_get_module_ctx(s, ngx_stream_return_module);
+    ctx = ngx_stream_get_module_ctx(s, ngx_stream_return_module);
 
-        b = &ctx->buf;
+    if (ngx_stream_top_filter(s, ctx->out, 1) == NGX_ERROR) {
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return;
+    }
 
-        n = c->send(c, b->pos, b->last - b->pos);
-        if (n == NGX_ERROR) {
-            ngx_stream_finalize_session(s, NGX_STREAM_OK);
-            return;
-        }
+    ctx->out = NULL;
 
-        if (n > 0) {
-            b->pos += n;
-
-            if (b->pos == b->last) {
-                ngx_stream_finalize_session(s, NGX_STREAM_OK);
-                return;
-            }
-        }
+    if (!c->buffered) {
+        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                       "stream return done sending");
+        ngx_stream_finalize_session(s, NGX_STREAM_OK);
+        return;
     }
 
     if (ngx_handle_write_event(ev, 0) != NGX_OK) {
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 2661220..d00718b 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -18,6 +18,10 @@ typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
 #define NGX_DEFAULT_ECDH_CURVE  "auto"
 
 
+static ngx_int_t ngx_stream_ssl_handler(ngx_stream_session_t *s);
+static ngx_int_t ngx_stream_ssl_init_connection(ngx_ssl_t *ssl,
+    ngx_connection_t *c);
+static void ngx_stream_ssl_handshake_handler(ngx_connection_t *c);
 static ngx_int_t ngx_stream_ssl_static_variable(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_ssl_variable(ngx_stream_session_t *s,
@@ -32,6 +36,7 @@ static char *ngx_stream_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static ngx_int_t ngx_stream_ssl_init(ngx_conf_t *cf);
 
 
 static ngx_conf_bitmask_t  ngx_stream_ssl_protocols[] = {
@@ -143,7 +148,7 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
 
 static ngx_stream_module_t  ngx_stream_ssl_module_ctx = {
     ngx_stream_ssl_add_variables,          /* preconfiguration */
-    NULL,                                  /* postconfiguration */
+    ngx_stream_ssl_init,                   /* postconfiguration */
 
     NULL,                                  /* create main configuration */
     NULL,                                  /* init main configuration */
@@ -193,6 +198,88 @@ static ngx_stream_variable_t  ngx_stream_ssl_vars[] = {
 static ngx_str_t ngx_stream_ssl_sess_id_ctx = ngx_string("STREAM");
 
 
+static ngx_int_t
+ngx_stream_ssl_handler(ngx_stream_session_t *s)
+{
+    ngx_connection_t       *c;
+    ngx_stream_ssl_conf_t  *sslcf;
+
+    c = s->connection;
+
+    sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
+
+    if (s->ssl && c->ssl == NULL) {
+        c->log->action = "SSL handshaking";
+
+        if (sslcf->ssl.ctx == NULL) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                          "no \"ssl_certificate\" is defined "
+                          "in server listening on SSL port");
+            return NGX_ERROR;
+        }
+
+        return ngx_stream_ssl_init_connection(&sslcf->ssl, c);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c)
+{
+    ngx_int_t               rc;
+    ngx_stream_session_t   *s;
+    ngx_stream_ssl_conf_t  *sslcf;
+
+    s = c->data;
+
+    if (ngx_ssl_create_connection(ssl, c, 0) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_ssl_handshake(c);
+
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_AGAIN) {
+        sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
+
+        ngx_add_timer(c->read, sslcf->handshake_timeout);
+
+        c->ssl->handler = ngx_stream_ssl_handshake_handler;
+
+        return NGX_AGAIN;
+    }
+
+    /* rc == NGX_OK */
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_stream_ssl_handshake_handler(ngx_connection_t *c)
+{
+    ngx_stream_session_t  *s;
+
+    s = c->data;
+
+    if (!c->ssl->handshaked) {
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    if (c->read->timer_set) {
+        ngx_del_timer(c->read);
+    }
+
+    ngx_stream_core_run_phases(s);
+}
+
+
 static ngx_int_t
 ngx_stream_ssl_static_variable(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data)
@@ -565,3 +652,22 @@ invalid:
 
     return NGX_CONF_ERROR;
 }
+
+
+static ngx_int_t
+ngx_stream_ssl_init(ngx_conf_t *cf)
+{
+    ngx_stream_handler_pt        *h;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_STREAM_SSL_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_stream_ssl_handler;
+
+    return NGX_OK;
+}
diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c
new file mode 100644
index 0000000..e26c518
--- /dev/null
+++ b/src/stream/ngx_stream_ssl_preread_module.c
@@ -0,0 +1,449 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    ngx_flag_t      enabled;
+} ngx_stream_ssl_preread_srv_conf_t;
+
+
+typedef struct {
+    size_t          left;
+    size_t          size;
+    u_char         *pos;
+    u_char         *dst;
+    u_char          buf[4];
+    ngx_str_t       host;
+    ngx_log_t      *log;
+    ngx_pool_t     *pool;
+    ngx_uint_t      state;
+} ngx_stream_ssl_preread_ctx_t;
+
+
+static ngx_int_t ngx_stream_ssl_preread_handler(ngx_stream_session_t *s);
+static ngx_int_t ngx_stream_ssl_preread_parse_record(
+    ngx_stream_ssl_preread_ctx_t *ctx, u_char *pos, u_char *last);
+static ngx_int_t ngx_stream_ssl_preread_server_name_variable(
+    ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_ssl_preread_add_variables(ngx_conf_t *cf);
+static void *ngx_stream_ssl_preread_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_stream_ssl_preread_merge_srv_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static ngx_int_t ngx_stream_ssl_preread_init(ngx_conf_t *cf);
+
+
+static ngx_command_t  ngx_stream_ssl_preread_commands[] = {
+
+    { ngx_string("ssl_preread"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_ssl_preread_srv_conf_t, enabled),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_ssl_preread_module_ctx = {
+    ngx_stream_ssl_preread_add_variables,   /* preconfiguration */
+    ngx_stream_ssl_preread_init,            /* postconfiguration */
+
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+
+    ngx_stream_ssl_preread_create_srv_conf, /* create server configuration */
+    ngx_stream_ssl_preread_merge_srv_conf   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_ssl_preread_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_ssl_preread_module_ctx,     /* module context */
+    ngx_stream_ssl_preread_commands,        /* module directives */
+    NGX_STREAM_MODULE,                      /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_stream_variable_t  ngx_stream_ssl_preread_vars[] = {
+
+    { ngx_string("ssl_preread_server_name"), NULL,
+      ngx_stream_ssl_preread_server_name_variable, 0, 0, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
+static ngx_int_t
+ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
+{
+    u_char                             *last, *p;
+    size_t                              len;
+    ngx_int_t                           rc;
+    ngx_connection_t                   *c;
+    ngx_stream_ssl_preread_ctx_t       *ctx;
+    ngx_stream_ssl_preread_srv_conf_t  *sscf;
+
+    c = s->connection;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0, "ssl preread handler");
+
+    sscf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_preread_module);
+
+    if (!sscf->enabled) {
+        return NGX_DECLINED;
+    }
+
+    if (c->type != SOCK_STREAM) {
+        return NGX_DECLINED;
+    }
+
+    if (c->buffer == NULL) {
+        return NGX_AGAIN;
+    }
+
+    ctx = ngx_stream_get_module_ctx(s, ngx_stream_ssl_preread_module);
+    if (ctx == NULL) {
+        ctx = ngx_pcalloc(c->pool, sizeof(ngx_stream_ssl_preread_ctx_t));
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_stream_set_ctx(s, ctx, ngx_stream_ssl_preread_module);
+
+        ctx->pool = c->pool;
+        ctx->log = c->log;
+        ctx->pos = c->buffer->pos;
+    }
+
+    p = ctx->pos;
+    last = c->buffer->last;
+
+    while (last - p >= 5) {
+
+        if (p[0] != 0x16) {
+            ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                           "ssl preread: not a handshake");
+            return NGX_DECLINED;
+        }
+
+        if (p[1] != 3 || p[2] == 0) {
+            ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                           "ssl preread: unsupported SSL version");
+            return NGX_DECLINED;
+        }
+
+        len = (p[3] << 8) + p[4];
+
+        /* read the whole record before parsing */
+        if ((size_t) (last - p) < len + 5) {
+            break;
+        }
+
+        p += 5;
+
+        rc = ngx_stream_ssl_preread_parse_record(ctx, p, p + len);
+        if (rc != NGX_AGAIN) {
+            return rc;
+        }
+
+        p += len;
+    }
+
+    ctx->pos = p;
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
+    u_char *pos, u_char *last)
+{
+    size_t   left, n, size;
+    u_char  *dst, *p;
+
+    enum {
+        sw_start = 0,
+        sw_header,          /* handshake msg_type, length */
+        sw_head_tail,       /* version, random */
+        sw_sid_len,         /* session_id length */
+        sw_sid,             /* session_id */
+        sw_cs_len,          /* cipher_suites length */
+        sw_cs,              /* cipher_suites */
+        sw_cm_len,          /* compression_methods length */
+        sw_cm,              /* compression_methods */
+        sw_ext,             /* extension */
+        sw_ext_header,      /* extension_type, extension_data length */
+        sw_sni_len,         /* SNI length */
+        sw_sni_host_head,   /* SNI name_type, host_name length */
+        sw_sni_host         /* SNI host_name */
+    } state;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                   "ssl preread: state %ui left %z", ctx->state, ctx->left);
+
+    state = ctx->state;
+    size = ctx->size;
+    left = ctx->left;
+    dst = ctx->dst;
+    p = ctx->buf;
+
+    for ( ;; ) {
+        n = ngx_min((size_t) (last - pos), size);
+
+        if (dst) {
+            dst = ngx_cpymem(dst, pos, n);
+        }
+
+        pos += n;
+        size -= n;
+        left -= n;
+
+        if (size != 0) {
+            break;
+        }
+
+        switch (state) {
+
+        case sw_start:
+            state = sw_header;
+            dst = p;
+            size = 4;
+            left = size;
+            break;
+
+        case sw_header:
+            if (p[0] != 1) {
+                ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                               "ssl preread: not a client hello");
+                return NGX_DECLINED;
+            }
+
+            state = sw_head_tail;
+            dst = NULL;
+            size = 34;
+            left = (p[1] << 16) + (p[2] << 8) + p[3];
+            break;
+
+        case sw_head_tail:
+            state = sw_sid_len;
+            dst = p;
+            size = 1;
+            break;
+
+        case sw_sid_len:
+            state = sw_sid;
+            dst = NULL;
+            size = p[0];
+            break;
+
+        case sw_sid:
+            state = sw_cs_len;
+            dst = p;
+            size = 2;
+            break;
+
+        case sw_cs_len:
+            state = sw_cs;
+            dst = NULL;
+            size = (p[0] << 8) + p[1];
+            break;
+
+        case sw_cs:
+            state = sw_cm_len;
+            dst = p;
+            size = 1;
+            break;
+
+        case sw_cm_len:
+            state = sw_cm;
+            dst = NULL;
+            size = p[0];
+            break;
+
+        case sw_cm:
+            if (left == 0) {
+                /* no extensions */
+                return NGX_OK;
+            }
+
+            state = sw_ext;
+            dst = p;
+            size = 2;
+            break;
+
+        case sw_ext:
+            if (left == 0) {
+                return NGX_OK;
+            }
+
+            state = sw_ext_header;
+            dst = p;
+            size = 4;
+            break;
+
+        case sw_ext_header:
+            if (p[0] == 0 && p[1] == 0) {
+                /* SNI extension */
+                state = sw_sni_len;
+                dst = NULL;
+                size = 2;
+                break;
+            }
+
+            state = sw_ext;
+            dst = NULL;
+            size = (p[2] << 8) + p[3];
+            break;
+
+        case sw_sni_len:
+            state = sw_sni_host_head;
+            dst = p;
+            size = 3;
+            break;
+
+        case sw_sni_host_head:
+            if (p[0] != 0) {
+                ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                               "ssl preread: SNI hostname type is not DNS");
+                return NGX_DECLINED;
+            }
+
+            state = sw_sni_host;
+            size = (p[1] << 8) + p[2];
+
+            ctx->host.data = ngx_pnalloc(ctx->pool, size);
+            if (ctx->host.data == NULL) {
+                return NGX_ERROR;
+            }
+
+            dst = ctx->host.data;
+            break;
+
+        case sw_sni_host:
+            ctx->host.len = (p[1] << 8) + p[2];
+
+            ngx_log_debug1(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                           "ssl preread: SNI hostname \"%V\"", &ctx->host);
+            return NGX_OK;
+        }
+
+        if (left < size) {
+           ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                          "ssl preread: failed to parse handshake");
+           return NGX_DECLINED;
+        }
+    }
+
+    ctx->state = state;
+    ctx->size = size;
+    ctx->left = left;
+    ctx->dst = dst;
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_stream_ssl_preread_server_name_variable(ngx_stream_session_t *s,
+    ngx_variable_value_t *v, uintptr_t data)
+{
+    ngx_stream_ssl_preread_ctx_t  *ctx;
+
+    ctx = ngx_stream_get_module_ctx(s, ngx_stream_ssl_preread_module);
+
+    if (ctx == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->len = ctx->host.len;
+    v->data = ctx->host.data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_ssl_preread_add_variables(ngx_conf_t *cf)
+{
+    ngx_stream_variable_t  *var, *v;
+
+    for (v = ngx_stream_ssl_preread_vars; v->name.len; v++) {
+        var = ngx_stream_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_stream_ssl_preread_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_stream_ssl_preread_srv_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_ssl_preread_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->enabled = NGX_CONF_UNSET;
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_ssl_preread_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_stream_ssl_preread_srv_conf_t *prev = parent;
+    ngx_stream_ssl_preread_srv_conf_t *conf = child;
+
+    ngx_conf_merge_value(conf->enabled, prev->enabled, 0);
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_ssl_preread_init(ngx_conf_t *cf)
+{
+    ngx_stream_handler_pt        *h;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_STREAM_PREREAD_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_stream_ssl_preread_handler;
+
+    return NGX_OK;
+}
diff --git a/src/stream/ngx_stream_upstream.c b/src/stream/ngx_stream_upstream.c
index 0c59780..c9e1784 100644
--- a/src/stream/ngx_stream_upstream.c
+++ b/src/stream/ngx_stream_upstream.c
@@ -322,6 +322,7 @@ ngx_stream_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
 
     uscf = ngx_stream_upstream_add(cf, &u, NGX_STREAM_UPSTREAM_CREATE
                                            |NGX_STREAM_UPSTREAM_WEIGHT
+                                           |NGX_STREAM_UPSTREAM_MAX_CONNS
                                            |NGX_STREAM_UPSTREAM_MAX_FAILS
                                            |NGX_STREAM_UPSTREAM_FAIL_TIMEOUT
                                            |NGX_STREAM_UPSTREAM_DOWN
@@ -407,7 +408,7 @@ ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     time_t                         fail_timeout;
     ngx_str_t                     *value, s;
     ngx_url_t                      u;
-    ngx_int_t                      weight, max_fails;
+    ngx_int_t                      weight, max_conns, max_fails;
     ngx_uint_t                     i;
     ngx_stream_upstream_server_t  *us;
 
@@ -421,6 +422,7 @@ ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     value = cf->args->elts;
 
     weight = 1;
+    max_conns = 0;
     max_fails = 1;
     fail_timeout = 10;
 
@@ -441,6 +443,21 @@ ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             continue;
         }
 
+        if (ngx_strncmp(value[i].data, "max_conns=", 10) == 0) {
+
+            if (!(uscf->flags & NGX_STREAM_UPSTREAM_MAX_CONNS)) {
+                goto not_supported;
+            }
+
+            max_conns = ngx_atoi(&value[i].data[10], value[i].len - 10);
+
+            if (max_conns == NGX_ERROR) {
+                goto invalid;
+            }
+
+            continue;
+        }
+
         if (ngx_strncmp(value[i].data, "max_fails=", 10) == 0) {
 
             if (!(uscf->flags & NGX_STREAM_UPSTREAM_MAX_FAILS)) {
@@ -522,6 +539,7 @@ ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     us->addrs = u.addrs;
     us->naddrs = u.naddrs;
     us->weight = weight;
+    us->max_conns = max_conns;
     us->max_fails = max_fails;
     us->fail_timeout = fail_timeout;
 
@@ -586,14 +604,14 @@ ngx_stream_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
         }
 
         if ((uscfp[i]->flags & NGX_STREAM_UPSTREAM_CREATE) && !u->no_port) {
-            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "upstream \"%V\" may not have port %d",
                                &u->host, u->port);
             return NULL;
         }
 
         if ((flags & NGX_STREAM_UPSTREAM_CREATE) && !uscfp[i]->no_port) {
-            ngx_log_error(NGX_LOG_WARN, cf->log, 0,
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "upstream \"%V\" may not have port %d in %s:%ui",
                           &u->host, uscfp[i]->port,
                           uscfp[i]->file_name, uscfp[i]->line);
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index f83b5ba..764a340 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -21,6 +21,7 @@
 #define NGX_STREAM_UPSTREAM_FAIL_TIMEOUT  0x0008
 #define NGX_STREAM_UPSTREAM_DOWN          0x0010
 #define NGX_STREAM_UPSTREAM_BACKUP        0x0020
+#define NGX_STREAM_UPSTREAM_MAX_CONNS     0x0100
 
 
 typedef struct {
@@ -50,11 +51,16 @@ typedef struct {
     ngx_addr_t                        *addrs;
     ngx_uint_t                         naddrs;
     ngx_uint_t                         weight;
+    ngx_uint_t                         max_conns;
     ngx_uint_t                         max_fails;
     time_t                             fail_timeout;
+    ngx_msec_t                         slow_start;
 
     unsigned                           down:1;
     unsigned                           backup:1;
+
+    NGX_COMPAT_BEGIN(4)
+    NGX_COMPAT_END
 } ngx_stream_upstream_server_t;
 
 
@@ -106,14 +112,23 @@ typedef struct {
 
 typedef struct {
     ngx_peer_connection_t              peer;
+
     ngx_buf_t                          downstream_buf;
     ngx_buf_t                          upstream_buf;
+
+    ngx_chain_t                       *free;
+    ngx_chain_t                       *upstream_out;
+    ngx_chain_t                       *upstream_busy;
+    ngx_chain_t                       *downstream_out;
+    ngx_chain_t                       *downstream_busy;
+
     off_t                              received;
     time_t                             start_sec;
     ngx_uint_t                         responses;
-#if (NGX_STREAM_SSL)
+
     ngx_str_t                          ssl_name;
-#endif
+
+    ngx_stream_upstream_srv_conf_t    *upstream;
     ngx_stream_upstream_resolved_t    *resolved;
     ngx_stream_upstream_state_t       *state;
     unsigned                           connected:1;
diff --git a/src/stream/ngx_stream_upstream_hash_module.c b/src/stream/ngx_stream_upstream_hash_module.c
index 88185eb..cb44fcd 100644
--- a/src/stream/ngx_stream_upstream_hash_module.c
+++ b/src/stream/ngx_stream_upstream_hash_module.c
@@ -241,6 +241,10 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
             goto next;
         }
 
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            goto next;
+        }
+
         break;
 
     next:
@@ -524,7 +528,6 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
              peer;
              peer = peer->next, i++)
         {
-
             n = i / (8 * sizeof(uintptr_t));
             m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
 
@@ -550,6 +553,10 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
                 continue;
             }
 
+            if (peer->max_conns && peer->conns >= peer->max_conns) {
+                continue;
+            }
+
             peer->current_weight += peer->effective_weight;
             total += peer->effective_weight;
 
@@ -572,6 +579,7 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
         hp->tries++;
 
         if (hp->tries >= points->number) {
+            pc->name = hp->rrp.peers->name;
             ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
             return NGX_BUSY;
         }
@@ -646,6 +654,7 @@ ngx_stream_upstream_hash(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     uscf->flags = NGX_STREAM_UPSTREAM_CREATE
                   |NGX_STREAM_UPSTREAM_WEIGHT
+                  |NGX_STREAM_UPSTREAM_MAX_CONNS
                   |NGX_STREAM_UPSTREAM_MAX_FAILS
                   |NGX_STREAM_UPSTREAM_FAIL_TIMEOUT
                   |NGX_STREAM_UPSTREAM_DOWN;
diff --git a/src/stream/ngx_stream_upstream_least_conn_module.c b/src/stream/ngx_stream_upstream_least_conn_module.c
index e884975..739b20a 100644
--- a/src/stream/ngx_stream_upstream_least_conn_module.c
+++ b/src/stream/ngx_stream_upstream_least_conn_module.c
@@ -132,7 +132,6 @@ ngx_stream_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
          peer;
          peer = peer->next, i++)
     {
-
         n = i / (8 * sizeof(uintptr_t));
         m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
 
@@ -151,6 +150,10 @@ ngx_stream_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
             continue;
         }
 
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            continue;
+        }
+
         /*
          * select peer with least number of connections; if there are
          * multiple peers with the same number of connections, select
@@ -206,6 +209,10 @@ ngx_stream_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
                 continue;
             }
 
+            if (peer->max_conns && peer->conns >= peer->max_conns) {
+                continue;
+            }
+
             peer->current_weight += peer->effective_weight;
             total += peer->effective_weight;
 
@@ -269,12 +276,6 @@ failed:
         ngx_stream_upstream_rr_peers_wlock(peers);
     }
 
-    /* all peers failed, mark them as live for quick recovery */
-
-    for (peer = peers->peer; peer; peer = peer->next) {
-        peer->fails = 0;
-    }
-
     ngx_stream_upstream_rr_peers_unlock(peers);
 
     pc->name = peers->name;
@@ -299,6 +300,7 @@ ngx_stream_upstream_least_conn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     uscf->flags = NGX_STREAM_UPSTREAM_CREATE
                   |NGX_STREAM_UPSTREAM_WEIGHT
+                  |NGX_STREAM_UPSTREAM_MAX_CONNS
                   |NGX_STREAM_UPSTREAM_MAX_FAILS
                   |NGX_STREAM_UPSTREAM_FAIL_TIMEOUT
                   |NGX_STREAM_UPSTREAM_DOWN
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
index 7aced0f..3a62501 100644
--- a/src/stream/ngx_stream_upstream_round_robin.c
+++ b/src/stream/ngx_stream_upstream_round_robin.c
@@ -96,6 +96,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
                 peer[n].weight = server[i].weight;
                 peer[n].effective_weight = server[i].weight;
                 peer[n].current_weight = 0;
+                peer[n].max_conns = server[i].max_conns;
                 peer[n].max_fails = server[i].max_fails;
                 peer[n].fail_timeout = server[i].fail_timeout;
                 peer[n].down = server[i].down;
@@ -159,6 +160,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
                 peer[n].weight = server[i].weight;
                 peer[n].effective_weight = server[i].weight;
                 peer[n].current_weight = 0;
+                peer[n].max_conns = server[i].max_conns;
                 peer[n].max_fails = server[i].max_fails;
                 peer[n].fail_timeout = server[i].fail_timeout;
                 peer[n].down = server[i].down;
@@ -227,6 +229,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
         peer[i].weight = 1;
         peer[i].effective_weight = 1;
         peer[i].current_weight = 0;
+        peer[i].max_conns = 0;
         peer[i].max_fails = 1;
         peer[i].fail_timeout = 10;
         *peerp = &peer[i];
@@ -262,6 +265,7 @@ ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s,
 
     rrp->peers = us->peer.data;
     rrp->current = NULL;
+    rrp->config = 0;
 
     n = rrp->peers->number;
 
@@ -344,6 +348,7 @@ ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
         peer[0].weight = 1;
         peer[0].effective_weight = 1;
         peer[0].current_weight = 0;
+        peer[0].max_conns = 0;
         peer[0].max_fails = 1;
         peer[0].fail_timeout = 10;
         peers->peer = peer;
@@ -377,6 +382,7 @@ ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
             peer[i].weight = 1;
             peer[i].effective_weight = 1;
             peer[i].current_weight = 0;
+            peer[i].max_conns = 0;
             peer[i].max_fails = 1;
             peer[i].fail_timeout = 10;
             *peerp = &peer[i];
@@ -386,6 +392,7 @@ ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
 
     rrp->peers = peers;
     rrp->current = NULL;
+    rrp->config = 0;
 
     if (rrp->peers->number <= 8 * sizeof(uintptr_t)) {
         rrp->tried = &rrp->data;
@@ -438,6 +445,10 @@ ngx_stream_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
             goto failed;
         }
 
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            goto failed;
+        }
+
         rrp->current = peer;
 
     } else {
@@ -491,12 +502,6 @@ failed:
         ngx_stream_upstream_rr_peers_wlock(peers);
     }
 
-    /* all peers failed, mark them as live for quick recovery */
-
-    for (peer = peers->peer; peer; peer = peer->next) {
-        peer->fails = 0;
-    }
-
     ngx_stream_upstream_rr_peers_unlock(peers);
 
     pc->name = peers->name;
@@ -527,7 +532,6 @@ ngx_stream_upstream_get_peer(ngx_stream_upstream_rr_peer_data_t *rrp)
          peer;
          peer = peer->next, i++)
     {
-
         n = i / (8 * sizeof(uintptr_t));
         m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
 
@@ -546,6 +550,10 @@ ngx_stream_upstream_get_peer(ngx_stream_upstream_rr_peer_data_t *rrp)
             continue;
         }
 
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            continue;
+        }
+
         peer->current_weight += peer->effective_weight;
         total += peer->effective_weight;
 
diff --git a/src/stream/ngx_stream_upstream_round_robin.h b/src/stream/ngx_stream_upstream_round_robin.h
index 452c2e9..35d9fce 100644
--- a/src/stream/ngx_stream_upstream_round_robin.h
+++ b/src/stream/ngx_stream_upstream_round_robin.h
@@ -27,6 +27,7 @@ struct ngx_stream_upstream_rr_peer_s {
     ngx_int_t                        weight;
 
     ngx_uint_t                       conns;
+    ngx_uint_t                       max_conns;
 
     ngx_uint_t                       fails;
     time_t                           accessed;
@@ -34,19 +35,22 @@ struct ngx_stream_upstream_rr_peer_s {
 
     ngx_uint_t                       max_fails;
     time_t                           fail_timeout;
+    ngx_msec_t                       slow_start;
+    ngx_msec_t                       start_time;
 
-    ngx_uint_t                       down;         /* unsigned  down:1; */
+    ngx_uint_t                       down;
 
-#if (NGX_STREAM_SSL)
     void                            *ssl_session;
     int                              ssl_session_len;
-#endif
-
-    ngx_stream_upstream_rr_peer_t   *next;
 
 #if (NGX_STREAM_UPSTREAM_ZONE)
     ngx_atomic_t                     lock;
 #endif
+
+    ngx_stream_upstream_rr_peer_t   *next;
+
+    NGX_COMPAT_BEGIN(25)
+    NGX_COMPAT_END
 };
 
 
@@ -119,6 +123,7 @@ struct ngx_stream_upstream_rr_peers_s {
 
 
 typedef struct {
+    ngx_uint_t                       config;
     ngx_stream_upstream_rr_peers_t  *peers;
     ngx_stream_upstream_rr_peer_t   *current;
     uintptr_t                       *tried;
diff --git a/src/stream/ngx_stream_write_filter_module.c b/src/stream/ngx_stream_write_filter_module.c
new file mode 100644
index 0000000..8fdcd37
--- /dev/null
+++ b/src/stream/ngx_stream_write_filter_module.c
@@ -0,0 +1,273 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    ngx_chain_t  *from_upstream;
+    ngx_chain_t  *from_downstream;
+} ngx_stream_write_filter_ctx_t;
+
+
+static ngx_int_t ngx_stream_write_filter(ngx_stream_session_t *s,
+    ngx_chain_t *in, ngx_uint_t from_upstream);
+static ngx_int_t ngx_stream_write_filter_init(ngx_conf_t *cf);
+
+
+static ngx_stream_module_t  ngx_stream_write_filter_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_stream_write_filter_init,          /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_write_filter_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_write_filter_module_ctx,   /* module context */
+    NULL,                                  /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in,
+    ngx_uint_t from_upstream)
+{
+    off_t                           size;
+    ngx_uint_t                      last, flush, sync;
+    ngx_chain_t                    *cl, *ln, **ll, **out, *chain;
+    ngx_connection_t               *c;
+    ngx_stream_write_filter_ctx_t  *ctx;
+
+    ctx = ngx_stream_get_module_ctx(s, ngx_stream_write_filter_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_pcalloc(s->connection->pool,
+                          sizeof(ngx_stream_write_filter_ctx_t));
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_stream_set_ctx(s, ctx, ngx_stream_write_filter_module);
+    }
+
+    if (from_upstream) {
+        c = s->connection;
+        out = &ctx->from_upstream;
+
+    } else {
+        c = s->upstream->peer.connection;
+        out = &ctx->from_downstream;
+    }
+
+    if (c->error) {
+        return NGX_ERROR;
+    }
+
+    size = 0;
+    flush = 0;
+    sync = 0;
+    last = 0;
+    ll = out;
+
+    /* find the size, the flush point and the last link of the saved chain */
+
+    for (cl = *out; cl; cl = cl->next) {
+        ll = &cl->next;
+
+        ngx_log_debug7(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "write old buf t:%d f:%d %p, pos %p, size: %z "
+                       "file: %O, size: %O",
+                       cl->buf->temporary, cl->buf->in_file,
+                       cl->buf->start, cl->buf->pos,
+                       cl->buf->last - cl->buf->pos,
+                       cl->buf->file_pos,
+                       cl->buf->file_last - cl->buf->file_pos);
+
+#if 1
+        if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) {
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "zero size buf in writer "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          cl->buf->temporary,
+                          cl->buf->recycled,
+                          cl->buf->in_file,
+                          cl->buf->start,
+                          cl->buf->pos,
+                          cl->buf->last,
+                          cl->buf->file,
+                          cl->buf->file_pos,
+                          cl->buf->file_last);
+
+            ngx_debug_point();
+            return NGX_ERROR;
+        }
+#endif
+
+        size += ngx_buf_size(cl->buf);
+
+        if (cl->buf->flush || cl->buf->recycled) {
+            flush = 1;
+        }
+
+        if (cl->buf->sync) {
+            sync = 1;
+        }
+
+        if (cl->buf->last_buf) {
+            last = 1;
+        }
+    }
+
+    /* add the new chain to the existent one */
+
+    for (ln = in; ln; ln = ln->next) {
+        cl = ngx_alloc_chain_link(c->pool);
+        if (cl == NULL) {
+            return NGX_ERROR;
+        }
+
+        cl->buf = ln->buf;
+        *ll = cl;
+        ll = &cl->next;
+
+        ngx_log_debug7(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "write new buf t:%d f:%d %p, pos %p, size: %z "
+                       "file: %O, size: %O",
+                       cl->buf->temporary, cl->buf->in_file,
+                       cl->buf->start, cl->buf->pos,
+                       cl->buf->last - cl->buf->pos,
+                       cl->buf->file_pos,
+                       cl->buf->file_last - cl->buf->file_pos);
+
+#if 1
+        if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) {
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "zero size buf in writer "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          cl->buf->temporary,
+                          cl->buf->recycled,
+                          cl->buf->in_file,
+                          cl->buf->start,
+                          cl->buf->pos,
+                          cl->buf->last,
+                          cl->buf->file,
+                          cl->buf->file_pos,
+                          cl->buf->file_last);
+
+            ngx_debug_point();
+            return NGX_ERROR;
+        }
+#endif
+
+        size += ngx_buf_size(cl->buf);
+
+        if (cl->buf->flush || cl->buf->recycled) {
+            flush = 1;
+        }
+
+        if (cl->buf->sync) {
+            sync = 1;
+        }
+
+        if (cl->buf->last_buf) {
+            last = 1;
+        }
+    }
+
+    *ll = NULL;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "stream write filter: l:%ui f:%ui s:%O", last, flush, size);
+
+    if (size == 0
+        && !(c->buffered & NGX_LOWLEVEL_BUFFERED)
+        && !(last && c->need_last_buf))
+    {
+        if (last || flush || sync) {
+            for (cl = *out; cl; /* void */) {
+                ln = cl;
+                cl = cl->next;
+                ngx_free_chain(c->pool, ln);
+            }
+
+            *out = NULL;
+            c->buffered &= ~NGX_STREAM_WRITE_BUFFERED;
+
+            return NGX_OK;
+        }
+
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "the stream output chain is empty");
+
+        ngx_debug_point();
+
+        return NGX_ERROR;
+    }
+
+    chain = c->send_chain(c, *out, 0);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "stream write filter %p", chain);
+
+    if (chain == NGX_CHAIN_ERROR) {
+        c->error = 1;
+        return NGX_ERROR;
+    }
+
+    for (cl = *out; cl && cl != chain; /* void */) {
+        ln = cl;
+        cl = cl->next;
+        ngx_free_chain(c->pool, ln);
+    }
+
+    *out = chain;
+
+    if (chain) {
+        if (c->shared) {
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "shared connection is busy");
+            return NGX_ERROR;
+        }
+
+        c->buffered |= NGX_STREAM_WRITE_BUFFERED;
+        return NGX_AGAIN;
+    }
+
+    c->buffered &= ~NGX_STREAM_WRITE_BUFFERED;
+
+    if (c->buffered & NGX_LOWLEVEL_BUFFERED) {
+        return NGX_AGAIN;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_write_filter_init(ngx_conf_t *cf)
+{
+    ngx_stream_top_filter = ngx_stream_write_filter;
+
+    return NGX_OK;
+}

From 7bfa979832b01ccb4afd02aae0f5bb3e9c863b74 Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Wed, 19 Oct 2016 04:36:34 +0000
Subject: [PATCH 113/600] Updated PHP sample configuration block. #841230

---
 debian/changelog                    | 9 +++++++--
 debian/conf/sites-available/default | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40a7cf4..e616576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-nginx (1.10.1-4) UNRELEASED; urgency=medium
+nginx (1.10.1-5) UNRELEASED; urgency=medium
 
+  [ Christos Trochalakis ]
   * debian/control:
     + Version depend on lsb-base (>= 3.0-6).
       Fixes lintian init.d-script-needs-depends-on-lsb-base.
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 11 Oct 2016 10:00:23 +0300
+  [ Michael Lustfield ]
+  * debian/conf/sites-available/default:
+    + Updated PHP sample configuration block. (Closes: #841230)
+
+ -- Michael Lustfield <michael@lustfield.net>  Wed, 19 Oct 2016 04:34:08 +0000
 
 nginx (1.10.1-3) unstable; urgency=medium
 
diff --git a/debian/conf/sites-available/default b/debian/conf/sites-available/default
index 79e41e8..5073cc4 100644
--- a/debian/conf/sites-available/default
+++ b/debian/conf/sites-available/default
@@ -46,15 +46,15 @@ server {
 		try_files $uri $uri/ =404;
 	}
 
-	# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+	# pass PHP scripts to FastCGI server
 	#
 	#location ~ \.php$ {
 	#	include snippets/fastcgi-php.conf;
 	#
-	#	# With php5-cgi alone:
+	#	# With php5-fpm (or other unix sockets):
+	#	fastcgi_pass unix:/var/run/php7-fpm.sock;
+	#	# With php5-cgi (or other tcp sockets):
 	#	fastcgi_pass 127.0.0.1:9000;
-	#	# With php5-fpm:
-	#	fastcgi_pass unix:/var/run/php5-fpm.sock;
 	#}
 
 	# deny access to .htaccess files, if Apache's document root

From 8c5b5c4f670fb860599b0eb0e6fb0c1aebdcf625 Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Wed, 19 Oct 2016 06:49:34 +0000
Subject: [PATCH 114/600] More documentation updates.

---
 debian/conf/sites-available/default | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/conf/sites-available/default b/debian/conf/sites-available/default
index 5073cc4..bfb7f0c 100644
--- a/debian/conf/sites-available/default
+++ b/debian/conf/sites-available/default
@@ -1,12 +1,17 @@
 ##
 # You should look at the following URL's in order to grasp a solid understanding
 # of Nginx configuration files in order to fully unleash the power of Nginx.
-# http://wiki.nginx.org/Pitfalls
-# http://wiki.nginx.org/QuickStart
-# http://wiki.nginx.org/Configuration
+# https://www.nginx.com/resources/wiki/start/
+# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/
+# https://wiki.debian.org/Nginx/DirectoryStructure
 #
-# Generally, you will want to move this file somewhere, and start with a clean
-# file but keep this around for reference. Or just disable in sites-enabled.
+# In most cases, administrators will remove this file from sites-enabled/ and
+# leave it as reference inside of sites-available where it will continue to be
+# updated by the nginx packaging team.
+#
+# This file will automatically load configuration files provided by other
+# applications, such as Drupal or Wordpress. These applications will be made
+# available underneath a path with that package name, such as /drupal8.
 #
 # Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
 ##
@@ -52,7 +57,7 @@ server {
 	#	include snippets/fastcgi-php.conf;
 	#
 	#	# With php5-fpm (or other unix sockets):
-	#	fastcgi_pass unix:/var/run/php7-fpm.sock;
+	#	fastcgi_pass unix:/var/run/php7.0-fpm.sock;
 	#	# With php5-cgi (or other tcp sockets):
 	#	fastcgi_pass 127.0.0.1:9000;
 	#}

From 5d09382c825202bf2b28ae16b6dbfb9485d3c67b Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Wed, 19 Oct 2016 06:56:25 +0000
Subject: [PATCH 115/600] Adding support for packaged application
 configurations.

---
 debian/changelog                    | 7 +++++--
 debian/conf/sites-available/default | 4 ++++
 debian/nginx-common.dirs            | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e616576..a678a83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.10.1-5) UNRELEASED; urgency=medium
+nginx (1.10.1-6) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis ]
   * debian/control:
@@ -8,8 +8,11 @@ nginx (1.10.1-5) UNRELEASED; urgency=medium
   [ Michael Lustfield ]
   * debian/conf/sites-available/default:
     + Updated PHP sample configuration block. (Closes: #841230)
+    + Adding include default-server.d/pkg_*.conf. (Closes: #822792)
+  * debian/nginx-common.dirs:
+    + Adding support for packaged application configurations.
 
- -- Michael Lustfield <michael@lustfield.net>  Wed, 19 Oct 2016 04:34:08 +0000
+ -- Michael Lustfield <michael@lustfield.net>  Wed, 19 Oct 2016 06:51:46 +0000
 
 nginx (1.10.1-3) unstable; urgency=medium
 
diff --git a/debian/conf/sites-available/default b/debian/conf/sites-available/default
index bfb7f0c..cca2b9a 100644
--- a/debian/conf/sites-available/default
+++ b/debian/conf/sites-available/default
@@ -68,6 +68,10 @@ server {
 	#location ~ /\.ht {
 	#	deny all;
 	#}
+
+        # load package-maintained configuration files
+        #   https://wiki.debian.org/Nginx/DirectoryStructure#Packaged_Applications
+        include default-server.d/pkg_*.conf;
 }
 
 
diff --git a/debian/nginx-common.dirs b/debian/nginx-common.dirs
index 65bb651..b674397 100644
--- a/debian/nginx-common.dirs
+++ b/debian/nginx-common.dirs
@@ -4,6 +4,7 @@ etc/nginx/modules-available
 etc/nginx/modules-enabled
 etc/nginx/sites-available
 etc/nginx/sites-enabled
+etc/nginx/default-server.d
 etc/ufw/applications.d
 usr/share/nginx
 usr/share/vim/addons

From 8bf94db95d9d75e4887947628744ea6d8719ec92 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 20 Oct 2016 09:47:41 +0300
Subject: [PATCH 116/600] Follow the 1.10.x stable branch

---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 2cb0678..d54dab0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-http://nginx.org/download/nginx-(\d\.\d+\.\d+)\.tar\.gz
+http://nginx.org/download/nginx-(1.10\.\d+)\.tar\.gz

From a8a1325840eae9d93c5b05e66151eba362dd99c7 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 20 Oct 2016 09:48:27 +0300
Subject: [PATCH 117/600] New upstream version 1.10.2

---
 CHANGES                                       |  32 +++
 CHANGES.ru                                    |  34 +++
 src/core/nginx.h                              |   4 +-
 src/event/ngx_event_openssl.c                 |  23 +-
 src/event/ngx_event_pipe.c                    |  10 +-
 src/http/modules/ngx_http_sub_filter_module.c | 124 +++++++---
 src/http/ngx_http_header_filter_module.c      |  14 +-
 src/http/ngx_http_request.c                   |   2 +-
 src/http/ngx_http_request.h                   |   1 +
 src/http/ngx_http_special_response.c          |  15 +-
 src/http/v2/ngx_http_v2.c                     | 220 +++++++++++++-----
 src/http/v2/ngx_http_v2.h                     |   5 +
 src/http/v2/ngx_http_v2_filter_module.c       |  22 +-
 src/http/v2/ngx_http_v2_module.c              |  31 +++
 src/http/v2/ngx_http_v2_module.h              |   1 +
 15 files changed, 417 insertions(+), 121 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4396472..209da02 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,36 @@
 
+Changes with nginx 1.10.2                                        18 Oct 2016
+
+    *) Change: the "421 Misdirected Request" response now used when
+       rejecting requests to a virtual server different from one negotiated
+       during an SSL handshake; this improves interoperability with some
+       HTTP/2 clients when using client certificates.
+
+    *) Change: HTTP/2 clients can now start sending request body
+       immediately; the "http2_body_preread_size" directive controls size of
+       the buffer used before nginx will start reading client request body.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2 and the "proxy_request_buffering" directive.
+
+    *) Bugfix: the "Content-Length" request header line was always added to
+       requests passed to backends, including requests without body, when
+       using HTTP/2.
+
+    *) Bugfix: "http request count is zero" alerts might appear in logs when
+       using HTTP/2.
+
+    *) Bugfix: unnecessary buffering might occur when using the "sub_filter"
+       directive; the issue had appeared in 1.9.4.
+
+    *) Bugfix: socket leak when using HTTP/2.
+
+    *) Bugfix: an incorrect response might be returned when using the "aio
+       threads" and "sendfile" directives; the bug had appeared in 1.9.13.
+
+    *) Workaround: OpenSSL 1.1.0 compatibility.
+
+
 Changes with nginx 1.10.1                                        31 May 2016
 
     *) Security: a segmentation fault might occur in a worker process while
diff --git a/CHANGES.ru b/CHANGES.ru
index c96cf93..ea46689 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,38 @@
 
+Изменения в nginx 1.10.2                                          18.10.2016
+
+    *) Изменение: при попытке запросить виртуальный сервер, отличающийся от
+       согласованного в процессе SSL handshake, теперь возвращается ответ
+       "421 Misdirected Request"; это улучшает совместимость с некоторыми
+       HTTP/2-клиентами в случае использования клиентских сертификатов.
+
+    *) Изменение: HTTP/2-клиенты теперь могут сразу присылать тело запроса;
+       директива http2_body_preread_size позволяет указать размер буфера,
+       который будет использоваться до того, как nginx начнёт читать тело.
+
+    *) Исправление: при использовании HTTP/2 и директивы
+       proxy_request_buffering в рабочем процессе мог произойти segmentation
+       fault.
+
+    *) Исправление: при использовании HTTP/2 к запросам, передаваемым на
+       бэкенд, всегда добавлялась строка заголовка "Content-Length", даже
+       если у запроса не было тела.
+
+    *) Исправление: при использовании HTTP/2 в логах могли появляться
+       сообщения "http request count is zero".
+
+    *) Исправление: при использовании директивы sub_filter могло
+       буферизироваться больше данных, чем это необходимо; проблема
+       появилась в 1.9.4.
+
+    *) Исправление: утечки сокетов при использовании HTTP/2.
+
+    *) Исправление: при использовании директив "aio threads" и sendfile мог
+       возвращаться некорректный ответ; ошибка появилась в 1.9.13.
+
+    *) Изменение: совместимость с OpenSSL 1.1.0.
+
+
 Изменения в nginx 1.10.1                                          31.05.2016
 
     *) Безопасность: при записи тела специально созданного запроса во
diff --git a/src/core/nginx.h b/src/core/nginx.h
index e2b8005..95123f1 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1010001
-#define NGINX_VERSION      "1.10.1"
+#define nginx_version      1010002
+#define NGINX_VERSION      "1.10.2"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index de10296..a3160b4 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -951,6 +951,8 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
             return NGX_ERROR;
         }
 
+#if OPENSSL_VERSION_NUMBER < 0x10100005L
+
         dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
         dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
 
@@ -960,6 +962,23 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
             return NGX_ERROR;
         }
 
+#else
+        {
+        BIGNUM  *p, *g;
+
+        p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
+        g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
+
+        if (p == NULL || g == NULL || !DH_set0_pqg(dh, p, NULL, g)) {
+            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0, "BN_bin2bn() failed");
+            DH_free(dh);
+            BN_free(p);
+            BN_free(g);
+            return NGX_ERROR;
+        }
+        }
+#endif
+
         SSL_CTX_set_tmp_dh(ssl->ctx, dh);
 
         DH_free(dh);
@@ -1938,7 +1957,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
             || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              /*  151 */
             || n == SSL_R_EXCESSIVE_MESSAGE_SIZE                     /*  152 */
             || n == SSL_R_LENGTH_MISMATCH                            /*  159 */
+#ifdef SSL_R_NO_CIPHERS_PASSED
             || n == SSL_R_NO_CIPHERS_PASSED                          /*  182 */
+#endif
             || n == SSL_R_NO_CIPHERS_SPECIFIED                       /*  183 */
             || n == SSL_R_NO_COMPRESSION_SPECIFIED                   /*  187 */
             || n == SSL_R_NO_SHARED_CIPHER                           /*  193 */
@@ -2898,7 +2919,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
                      ngx_ssl_session_ticket_md(), NULL);
         ngx_memcpy(name, key[0].name, 16);
 
-        return 0;
+        return 1;
 
     } else {
         /* decrypt session ticket */
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index 5ce59ae..be1b475 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -815,10 +815,12 @@ ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p)
     }
 
 #if (NGX_THREADS)
-    p->temp_file->thread_write = p->thread_handler ? 1 : 0;
-    p->temp_file->file.thread_task = p->thread_task;
-    p->temp_file->file.thread_handler = p->thread_handler;
-    p->temp_file->file.thread_ctx = p->thread_ctx;
+    if (p->thread_handler) {
+        p->temp_file->thread_write = 1;
+        p->temp_file->file.thread_task = p->thread_task;
+        p->temp_file->file.thread_handler = p->thread_handler;
+        p->temp_file->file.thread_ctx = p->thread_ctx;
+    }
 #endif
 
     n = ngx_write_chain_to_temp_file(p->temp_file, out);
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index bb1c50b..e8d1d80 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -83,7 +83,9 @@ static ngx_uint_t ngx_http_sub_cmp_index;
 static ngx_int_t ngx_http_sub_output(ngx_http_request_t *r,
     ngx_http_sub_ctx_t *ctx);
 static ngx_int_t ngx_http_sub_parse(ngx_http_request_t *r,
-    ngx_http_sub_ctx_t *ctx);
+    ngx_http_sub_ctx_t *ctx, ngx_uint_t flush);
+static ngx_int_t ngx_http_sub_match(ngx_http_sub_ctx_t *ctx, ngx_int_t start,
+    ngx_str_t *m);
 
 static char * ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
@@ -285,6 +287,7 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_int_t                  rc;
     ngx_buf_t                 *b;
     ngx_str_t                 *sub;
+    ngx_uint_t                 flush, last;
     ngx_chain_t               *cl;
     ngx_http_sub_ctx_t        *ctx;
     ngx_http_sub_match_t      *match;
@@ -326,6 +329,9 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http sub filter \"%V\"", &r->uri);
 
+    flush = 0;
+    last = 0;
+
     while (ctx->in || ctx->buf) {
 
         if (ctx->buf == NULL) {
@@ -334,11 +340,19 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
             ctx->pos = ctx->buf->pos;
         }
 
+        if (ctx->buf->flush || ctx->buf->recycled) {
+            flush = 1;
+        }
+
+        if (ctx->in == NULL) {
+            last = flush;
+        }
+
         b = NULL;
 
         while (ctx->pos < ctx->buf->last) {
 
-            rc = ngx_http_sub_parse(r, ctx);
+            rc = ngx_http_sub_parse(r, ctx, last);
 
             ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                            "parse: %i, looked: \"%V\" %p-%p",
@@ -590,9 +604,10 @@ ngx_http_sub_output(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
 
 
 static ngx_int_t
-ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
+ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx,
+    ngx_uint_t flush)
 {
-    u_char                   *p, *last, *pat, *pat_end, c;
+    u_char                   *p, c;
     ngx_str_t                *m;
     ngx_int_t                 offset, start, next, end, len, rc;
     ngx_uint_t                shift, i, j;
@@ -602,6 +617,7 @@ ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
 
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_sub_filter_module);
     tables = ctx->tables;
+    match = ctx->matches->elts;
 
     offset = ctx->offset;
     end = ctx->buf->last - ctx->pos;
@@ -628,7 +644,6 @@ ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
         /* a potential match */
 
         start = offset - (ngx_int_t) tables->min_match_len + 1;
-        match = ctx->matches->elts;
 
         i = ngx_max(tables->index[c], ctx->index);
         j = tables->index[c + 1];
@@ -641,41 +656,15 @@ ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
 
             m = &match[i].match;
 
-            pat = m->data;
-            pat_end = m->data + m->len;
+            rc = ngx_http_sub_match(ctx, start, m);
 
-            if (start >= 0) {
-                p = ctx->pos + start;
-
-            } else {
-                last = ctx->looked.data + ctx->looked.len;
-                p = last + start;
-
-                while (p < last && pat < pat_end) {
-                    if (ngx_tolower(*p) != *pat) {
-                        goto next;
-                    }
-
-                    p++;
-                    pat++;
-                }
-
-                p = ctx->pos;
-            }
-
-            while (p < ctx->buf->last && pat < pat_end) {
-                if (ngx_tolower(*p) != *pat) {
-                    goto next;
-                }
-
-                p++;
-                pat++;
+            if (rc == NGX_DECLINED) {
+                goto next;
             }
 
             ctx->index = i;
 
-            if (pat != pat_end) {
-                /* partial match */
+            if (rc == NGX_AGAIN) {
                 goto again;
             }
 
@@ -695,6 +684,26 @@ ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
         ctx->index = 0;
     }
 
+    if (flush) {
+        for ( ;; ) {
+            start = offset - (ngx_int_t) tables->min_match_len + 1;
+
+            if (start >= end) {
+                break;
+            }
+
+            for (i = 0; i < ctx->matches->nelts; i++) {
+                m = &match[i].match;
+
+                if (ngx_http_sub_match(ctx, start, m) == NGX_AGAIN) {
+                    goto again;
+                }
+            }
+
+            offset++;
+        }
+    }
+
 again:
 
     ctx->offset = offset;
@@ -731,6 +740,51 @@ done:
 }
 
 
+static ngx_int_t
+ngx_http_sub_match(ngx_http_sub_ctx_t *ctx, ngx_int_t start, ngx_str_t *m)
+{
+    u_char  *p, *last, *pat, *pat_end;
+
+    pat = m->data;
+    pat_end = m->data + m->len;
+
+    if (start >= 0) {
+        p = ctx->pos + start;
+
+    } else {
+        last = ctx->looked.data + ctx->looked.len;
+        p = last + start;
+
+        while (p < last && pat < pat_end) {
+            if (ngx_tolower(*p) != *pat) {
+                return NGX_DECLINED;
+            }
+
+            p++;
+            pat++;
+        }
+
+        p = ctx->pos;
+    }
+
+    while (p < ctx->buf->last && pat < pat_end) {
+        if (ngx_tolower(*p) != *pat) {
+            return NGX_DECLINED;
+        }
+
+        p++;
+        pat++;
+    }
+
+    if (pat != pat_end) {
+        /* partial match */
+        return NGX_AGAIN;
+    }
+
+    return NGX_OK;
+}
+
+
 static char *
 ngx_http_sub_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index 507dc93..2cf1205 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -95,17 +95,17 @@ static ngx_str_t ngx_http_status_lines[] = {
     ngx_string("414 Request-URI Too Large"),
     ngx_string("415 Unsupported Media Type"),
     ngx_string("416 Requested Range Not Satisfiable"),
+    ngx_null_string,  /* "417 Expectation Failed" */
+    ngx_null_string,  /* "418 unused" */
+    ngx_null_string,  /* "419 unused" */
+    ngx_null_string,  /* "420 unused" */
+    ngx_string("421 Misdirected Request"),
 
-    /* ngx_null_string, */  /* "417 Expectation Failed" */
-    /* ngx_null_string, */  /* "418 unused" */
-    /* ngx_null_string, */  /* "419 unused" */
-    /* ngx_null_string, */  /* "420 unused" */
-    /* ngx_null_string, */  /* "421 unused" */
     /* ngx_null_string, */  /* "422 Unprocessable Entity" */
     /* ngx_null_string, */  /* "423 Locked" */
     /* ngx_null_string, */  /* "424 Failed Dependency" */
 
-#define NGX_HTTP_LAST_4XX  417
+#define NGX_HTTP_LAST_4XX  422
 #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
     ngx_string("500 Internal Server Error"),
@@ -113,10 +113,10 @@ static ngx_str_t ngx_http_status_lines[] = {
     ngx_string("502 Bad Gateway"),
     ngx_string("503 Service Temporarily Unavailable"),
     ngx_string("504 Gateway Time-out"),
-
     ngx_null_string,        /* "505 HTTP Version Not Supported" */
     ngx_null_string,        /* "506 Variant Also Negotiates" */
     ngx_string("507 Insufficient Storage"),
+
     /* ngx_null_string, */  /* "508 unused" */
     /* ngx_null_string, */  /* "509 unused" */
     /* ngx_null_string, */  /* "510 Not Extended" */
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 7d6cada..c2ce222 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2065,7 +2065,7 @@ ngx_http_set_virtual_server(ngx_http_request_t *r, ngx_str_t *host)
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                           "client attempted to request the server name "
                           "different from that one was negotiated");
-            ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+            ngx_http_finalize_request(r, NGX_HTTP_MISDIRECTED_REQUEST);
             return NGX_ERROR;
         }
     }
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index cfde7dc..57f8583 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -95,6 +95,7 @@
 #define NGX_HTTP_REQUEST_URI_TOO_LARGE     414
 #define NGX_HTTP_UNSUPPORTED_MEDIA_TYPE    415
 #define NGX_HTTP_RANGE_NOT_SATISFIABLE     416
+#define NGX_HTTP_MISDIRECTED_REQUEST       421
 
 
 /* Our own HTTP codes */
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 2771e58..64e5acd 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -210,6 +210,14 @@ static char ngx_http_error_416_page[] =
 ;
 
 
+static char ngx_http_error_421_page[] =
+"<html>" CRLF
+"<head><title>421 Misdirected Request</title></head>" CRLF
+"<body bgcolor=\"white\">" CRLF
+"<center><h1>421 Misdirected Request</h1></center>" CRLF
+;
+
+
 static char ngx_http_error_494_page[] =
 "<html>" CRLF
 "<head><title>400 Request Header Or Cookie Too Large</title></head>"
@@ -334,8 +342,13 @@ static ngx_str_t ngx_http_error_pages[] = {
     ngx_string(ngx_http_error_414_page),
     ngx_string(ngx_http_error_415_page),
     ngx_string(ngx_http_error_416_page),
+    ngx_null_string,                     /* 417 */
+    ngx_null_string,                     /* 418 */
+    ngx_null_string,                     /* 419 */
+    ngx_null_string,                     /* 420 */
+    ngx_string(ngx_http_error_421_page),
 
-#define NGX_HTTP_LAST_4XX  417
+#define NGX_HTTP_LAST_4XX  422
 #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
     ngx_string(ngx_http_error_494_page), /* 494, request header too large */
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 278c9ab..d0cd2ab 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -48,11 +48,6 @@
 
 #define NGX_HTTP_V2_DEFAULT_FRAME_SIZE           (1 << 14)
 
-#define NGX_HTTP_V2_MAX_WINDOW                   ((1U << 31) - 1)
-#define NGX_HTTP_V2_DEFAULT_WINDOW               65535
-
-#define NGX_HTTP_V2_INITIAL_WINDOW               0
-
 #define NGX_HTTP_V2_ROOT                         (void *) -1
 
 
@@ -415,6 +410,16 @@ ngx_http_v2_write_handler(ngx_event_t *wev)
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 write handler");
 
+    if (h2c->last_out == NULL && !c->buffered) {
+
+        if (wev->timer_set) {
+            ngx_del_timer(wev);
+        }
+
+        ngx_http_v2_handle_connection(h2c);
+        return;
+    }
+
     h2c->blocked = 1;
 
     rc = ngx_http_v2_send_output_queue(h2c);
@@ -473,7 +478,7 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
     wev = c->write;
 
     if (!wev->ready) {
-        return NGX_OK;
+        return NGX_AGAIN;
     }
 
     cl = NULL;
@@ -544,15 +549,6 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
         c->tcp_nodelay = NGX_TCP_NODELAY_SET;
     }
 
-    if (cl) {
-        ngx_add_timer(wev, clcf->send_timeout);
-
-    } else {
-        if (wev->timer_set) {
-            ngx_del_timer(wev);
-        }
-    }
-
     for ( /* void */ ; out; out = fn) {
         fn = out->next;
 
@@ -577,6 +573,15 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
 
     h2c->last_out = frame;
 
+    if (!wev->ready) {
+        ngx_add_timer(wev, clcf->send_timeout);
+        return NGX_AGAIN;
+    }
+
+    if (wev->timer_set) {
+        ngx_del_timer(wev);
+    }
+
     return NGX_OK;
 
 error:
@@ -594,7 +599,8 @@ error:
 static void
 ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
 {
-    ngx_connection_t          *c;
+    ngx_int_t                rc;
+    ngx_connection_t        *c;
     ngx_http_v2_srv_conf_t  *h2scf;
 
     if (h2c->last_out || h2c->processing) {
@@ -609,7 +615,22 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
     }
 
     if (c->buffered) {
-        return;
+        h2c->blocked = 1;
+
+        rc = ngx_http_v2_send_output_queue(h2c);
+
+        h2c->blocked = 0;
+
+        if (rc == NGX_ERROR) {
+            ngx_http_close_connection(c);
+            return;
+        }
+
+        if (rc == NGX_AGAIN) {
+            return;
+        }
+
+        /* rc == NGX_OK */
     }
 
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@@ -620,7 +641,7 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
     }
 
     if (ngx_terminate || ngx_exiting) {
-        ngx_http_close_connection(c);
+        ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
         return;
     }
 
@@ -879,8 +900,6 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
-    stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
-
     h2c->state.stream = stream;
 
     return ngx_http_v2_state_read_data(h2c, pos, end);
@@ -891,10 +910,12 @@ static u_char *
 ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    size_t                 size;
-    ngx_int_t              rc;
-    ngx_uint_t             last;
-    ngx_http_v2_stream_t  *stream;
+    size_t                   size;
+    ngx_buf_t               *buf;
+    ngx_int_t                rc;
+    ngx_http_request_t      *r;
+    ngx_http_v2_stream_t    *stream;
+    ngx_http_v2_srv_conf_t  *h2scf;
 
     stream = h2c->state.stream;
 
@@ -913,17 +934,42 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     if (size >= h2c->state.length) {
         size = h2c->state.length;
-        last = stream->in_closed;
-
-    } else {
-        last = 0;
+        stream->in_closed  = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
     }
 
-    rc = ngx_http_v2_process_request_body(stream->request, pos, size, last);
+    r = stream->request;
 
-    if (rc != NGX_OK) {
-        stream->skip_data = 1;
-        ngx_http_finalize_request(stream->request, rc);
+    if (r->request_body) {
+        rc = ngx_http_v2_process_request_body(r, pos, size, stream->in_closed);
+
+        if (rc != NGX_OK) {
+            stream->skip_data = 1;
+            ngx_http_finalize_request(r, rc);
+        }
+
+    } else if (size) {
+        buf = stream->preread;
+
+        if (buf == NULL) {
+            h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
+
+            buf = ngx_create_temp_buf(r->pool, h2scf->preread_size);
+            if (buf == NULL) {
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_INTERNAL_ERROR);
+            }
+
+            stream->preread = buf;
+        }
+
+        if (size > (size_t) (buf->end - buf->last)) {
+            ngx_log_error(NGX_LOG_ALERT, h2c->connection->log, 0,
+                          "http2 preread buffer overflow");
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+
+        buf->last = ngx_cpymem(buf->last, pos, size);
     }
 
     pos += size;
@@ -1058,7 +1104,9 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         goto rst_stream;
     }
 
-    if (!h2c->settings_ack && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG))
+    if (!h2c->settings_ack
+        && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
+        && h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
     {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "client sent stream with data "
@@ -2434,8 +2482,7 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack)
 
         buf->last = ngx_http_v2_write_uint16(buf->last,
                                          NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING);
-        buf->last = ngx_http_v2_write_uint32(buf->last,
-                                             NGX_HTTP_V2_INITIAL_WINDOW);
+        buf->last = ngx_http_v2_write_uint32(buf->last, h2scf->preread_size);
 
         buf->last = ngx_http_v2_write_uint16(buf->last,
                                            NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING);
@@ -2643,6 +2690,7 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
     ngx_http_log_ctx_t        *ctx;
     ngx_http_request_t        *r;
     ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_srv_conf_t    *h2scf;
     ngx_http_core_srv_conf_t  *cscf;
 
     fc = h2c->free_fake_connections;
@@ -2756,8 +2804,10 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
     stream->request = r;
     stream->connection = h2c;
 
+    h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
+
     stream->send_window = h2c->init_window;
-    stream->recv_window = NGX_HTTP_V2_INITIAL_WINDOW;
+    stream->recv_window = h2scf->preread_size;
 
     h2c->processing++;
 
@@ -3400,7 +3450,9 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
         return;
     }
 
-    r->headers_in.chunked = (r->headers_in.content_length_n == -1);
+    if (r->headers_in.content_length_n == -1 && !r->stream->in_closed) {
+        r->headers_in.chunked = 1;
+    }
 
     ngx_http_process_request(r);
 }
@@ -3411,7 +3463,11 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
     ngx_http_client_body_handler_pt post_handler)
 {
     off_t                      len;
+    size_t                     size;
+    ngx_buf_t                 *buf;
+    ngx_int_t                  rc;
     ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_srv_conf_t    *h2scf;
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
     ngx_http_v2_connection_t  *h2c;
@@ -3444,24 +3500,34 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
 
     r->request_body = rb;
 
+    h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     len = r->headers_in.content_length_n;
 
     if (r->request_body_no_buffering && !stream->in_closed) {
-        r->request_body_in_file_only = 0;
 
         if (len < 0 || len > (off_t) clcf->client_body_buffer_size) {
             len = clcf->client_body_buffer_size;
         }
 
+        /*
+         * We need a room to store data up to the stream's initial window size,
+         * at least until this window will be exhausted.
+         */
+
+        if (len < (off_t) h2scf->preread_size) {
+            len = h2scf->preread_size;
+        }
+
         if (len > NGX_HTTP_V2_MAX_WINDOW) {
             len = NGX_HTTP_V2_MAX_WINDOW;
         }
-    }
 
-    if (len >= 0 && len <= (off_t) clcf->client_body_buffer_size
-        && !r->request_body_in_file_only)
+        rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
+
+    } else if (len >= 0 && len <= (off_t) clcf->client_body_buffer_size
+               && !r->request_body_in_file_only)
     {
         rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
 
@@ -3478,22 +3544,44 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
+    buf = stream->preread;
+
     if (stream->in_closed) {
         r->request_body_no_buffering = 0;
+
+        if (buf) {
+            rc = ngx_http_v2_process_request_body(r, buf->pos,
+                                                  buf->last - buf->pos, 1);
+            ngx_pfree(r->pool, buf->start);
+            return rc;
+        }
+
         return ngx_http_v2_process_request_body(r, NULL, 0, 1);
     }
 
-    if (len) {
-        if (r->request_body_no_buffering) {
-            stream->recv_window = (size_t) len;
+    if (buf) {
+        rc = ngx_http_v2_process_request_body(r, buf->pos,
+                                              buf->last - buf->pos, 0);
 
-        } else {
-            stream->no_flow_control = 1;
-            stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+        ngx_pfree(r->pool, buf->start);
+
+        if (rc != NGX_OK) {
+            stream->skip_data = 1;
+            return rc;
         }
+    }
 
-        if (ngx_http_v2_send_window_update(stream->connection, stream->node->id,
-                                           stream->recv_window)
+    if (r->request_body_no_buffering) {
+        size = (size_t) len - h2scf->preread_size;
+
+    } else {
+        stream->no_flow_control = 1;
+        size = NGX_HTTP_V2_MAX_WINDOW - stream->recv_window;
+    }
+
+    if (size) {
+        if (ngx_http_v2_send_window_update(stream->connection,
+                                           stream->node->id, size)
             == NGX_ERROR)
         {
             stream->skip_data = 1;
@@ -3508,9 +3596,13 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
                 return NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
         }
+
+        stream->recv_window += size;
     }
 
-    ngx_add_timer(r->connection->read, clcf->client_body_timeout);
+    if (!buf) {
+        ngx_add_timer(r->connection->read, clcf->client_body_timeout);
+    }
 
     r->read_event_handler = ngx_http_v2_read_client_request_body_handler;
     r->write_event_handler = ngx_http_request_empty_handler;
@@ -3529,13 +3621,8 @@ ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
 
-    rb = r->request_body;
-
-    if (rb == NULL) {
-        return NGX_OK;
-    }
-
     fc = r->connection;
+    rb = r->request_body;
     buf = rb->buf;
 
     if (size) {
@@ -3579,7 +3666,7 @@ ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
             rb->buf = NULL;
         }
 
-        if (r->headers_in.content_length_n == -1) {
+        if (r->headers_in.chunked) {
             r->headers_in.content_length_n = rb->received;
         }
 
@@ -3789,7 +3876,14 @@ ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r)
         window -= h2c->state.length;
     }
 
-    if (window == stream->recv_window) {
+    if (window <= stream->recv_window) {
+        if (window < stream->recv_window) {
+            ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                          "http2 negative window update");
+            stream->skip_data = 1;
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
         return NGX_AGAIN;
     }
 
@@ -3824,6 +3918,10 @@ ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     ngx_event_t       *rev;
     ngx_connection_t  *fc;
 
+    if (stream->rst_sent) {
+        return NGX_OK;
+    }
+
     if (ngx_http_v2_send_rst_stream(h2c, stream->node->id, status)
         == NGX_ERROR)
     {
@@ -3831,6 +3929,7 @@ ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     }
 
     stream->rst_sent = 1;
+    stream->skip_data = 1;
 
     fc = stream->request->connection;
     fc->error = 1;
@@ -3862,6 +3961,7 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
 
     if (stream->queued) {
         fc->write->handler = ngx_http_v2_close_stream_handler;
+        fc->read->handler = ngx_http_empty_handler;
         return;
     }
 
@@ -4103,10 +4203,6 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     c->error = 1;
 
-    if (h2c->state.stream) {
-        ngx_http_v2_close_stream(h2c->state.stream, NGX_HTTP_BAD_REQUEST);
-    }
-
     if (!h2c->processing) {
         ngx_http_close_connection(c);
         return;
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 1adf8de..9e738aa 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -46,6 +46,9 @@
 #define NGX_HTTP_V2_PADDED_FLAG          0x08
 #define NGX_HTTP_V2_PRIORITY_FLAG        0x20
 
+#define NGX_HTTP_V2_MAX_WINDOW           ((1U << 31) - 1)
+#define NGX_HTTP_V2_DEFAULT_WINDOW       65535
+
 
 typedef struct ngx_http_v2_connection_s   ngx_http_v2_connection_t;
 typedef struct ngx_http_v2_node_s         ngx_http_v2_node_t;
@@ -174,6 +177,8 @@ struct ngx_http_v2_stream_s {
     ssize_t                          send_window;
     size_t                           recv_window;
 
+    ngx_buf_t                       *preread;
+
     ngx_http_v2_out_frame_t         *free_frames;
     ngx_chain_t                     *free_frame_headers;
     ngx_chain_t                     *free_bufs;
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index caa835d..09ce3f6 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -169,6 +169,12 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         return NGX_OK;
     }
 
+    fc = r->connection;
+
+    if (fc->error) {
+        return NGX_ERROR;
+    }
+
     if (r->method == NGX_HTTP_HEAD) {
         r->header_only = 1;
     }
@@ -259,8 +265,6 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         len += 1 + ngx_http_v2_literal_size("Wed, 31 Dec 1986 18:00:00 GMT");
     }
 
-    fc = r->connection;
-
     if (r->headers_out.location && r->headers_out.location->value.len) {
 
         if (r->headers_out.location->value.data[0] == '/') {
@@ -1313,18 +1317,20 @@ static ngx_inline void
 ngx_http_v2_handle_stream(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream)
 {
-    ngx_event_t  *wev;
+    ngx_connection_t  *fc;
 
-    if (stream->handled || stream->blocked || stream->exhausted) {
+    if (stream->handled || stream->blocked) {
         return;
     }
 
-    wev = stream->request->connection->write;
+    fc = stream->request->connection;
 
-    if (!wev->delayed) {
-        stream->handled = 1;
-        ngx_queue_insert_tail(&h2c->posted, &stream->queue);
+    if (!fc->error && (stream->exhausted || fc->write->delayed)) {
+        return;
     }
+
+    stream->handled = 1;
+    ngx_queue_insert_tail(&h2c->posted, &stream->queue);
 }
 
 
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
index 5a4561c..b7d99e0 100644
--- a/src/http/v2/ngx_http_v2_module.c
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -30,6 +30,7 @@ static char *ngx_http_v2_merge_loc_conf(ngx_conf_t *cf, void *parent,
 static char *ngx_http_v2_recv_buffer_size(ngx_conf_t *cf, void *post,
     void *data);
 static char *ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data);
+static char *ngx_http_v2_preread_size(ngx_conf_t *cf, void *post, void *data);
 static char *ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post,
     void *data);
 static char *ngx_http_v2_chunk_size(ngx_conf_t *cf, void *post, void *data);
@@ -41,6 +42,8 @@ static ngx_conf_post_t  ngx_http_v2_recv_buffer_size_post =
     { ngx_http_v2_recv_buffer_size };
 static ngx_conf_post_t  ngx_http_v2_pool_size_post =
     { ngx_http_v2_pool_size };
+static ngx_conf_post_t  ngx_http_v2_preread_size_post =
+    { ngx_http_v2_preread_size };
 static ngx_conf_post_t  ngx_http_v2_streams_index_mask_post =
     { ngx_http_v2_streams_index_mask };
 static ngx_conf_post_t  ngx_http_v2_chunk_size_post =
@@ -84,6 +87,13 @@ static ngx_command_t  ngx_http_v2_commands[] = {
       offsetof(ngx_http_v2_srv_conf_t, max_header_size),
       NULL },
 
+    { ngx_string("http2_body_preread_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, preread_size),
+      &ngx_http_v2_preread_size_post },
+
     { ngx_string("http2_streams_index_size"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -316,6 +326,8 @@ ngx_http_v2_create_srv_conf(ngx_conf_t *cf)
     h2scf->max_field_size = NGX_CONF_UNSET_SIZE;
     h2scf->max_header_size = NGX_CONF_UNSET_SIZE;
 
+    h2scf->preread_size = NGX_CONF_UNSET_SIZE;
+
     h2scf->streams_index_mask = NGX_CONF_UNSET_UINT;
 
     h2scf->recv_timeout = NGX_CONF_UNSET_MSEC;
@@ -341,6 +353,8 @@ ngx_http_v2_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_size_value(conf->max_header_size, prev->max_header_size,
                               16384);
 
+    ngx_conf_merge_size_value(conf->preread_size, prev->preread_size, 65536);
+
     ngx_conf_merge_uint_value(conf->streams_index_mask,
                               prev->streams_index_mask, 32 - 1);
 
@@ -419,6 +433,23 @@ ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data)
 }
 
 
+static char *
+ngx_http_v2_preread_size(ngx_conf_t *cf, void *post, void *data)
+{
+    size_t *sp = data;
+
+    if (*sp > NGX_HTTP_V2_MAX_WINDOW) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "the maximum body preread buffer size is %uz",
+                           NGX_HTTP_V2_MAX_WINDOW);
+
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 static char *
 ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post, void *data)
 {
diff --git a/src/http/v2/ngx_http_v2_module.h b/src/http/v2/ngx_http_v2_module.h
index 95cc7d8..91f97c2 100644
--- a/src/http/v2/ngx_http_v2_module.h
+++ b/src/http/v2/ngx_http_v2_module.h
@@ -25,6 +25,7 @@ typedef struct {
     ngx_uint_t                      concurrent_streams;
     size_t                          max_field_size;
     size_t                          max_header_size;
+    size_t                          preread_size;
     ngx_uint_t                      streams_index_mask;
     ngx_msec_t                      recv_timeout;
     ngx_msec_t                      idle_timeout;

From 6a025de47dcd08d6a937fed6ba3b3f131d23d059 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 20 Oct 2016 09:49:53 +0300
Subject: [PATCH 118/600] New upstream release

---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a678a83..1274498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-nginx (1.10.1-6) UNRELEASED; urgency=medium
+nginx (1.10.2-1) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis ]
+  * New upstream release.
   * debian/control:
     + Version depend on lsb-base (>= 3.0-6).
       Fixes lintian init.d-script-needs-depends-on-lsb-base.
@@ -12,7 +13,7 @@ nginx (1.10.1-6) UNRELEASED; urgency=medium
   * debian/nginx-common.dirs:
     + Adding support for packaged application configurations.
 
- -- Michael Lustfield <michael@lustfield.net>  Wed, 19 Oct 2016 06:51:46 +0000
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 20 Oct 2016 09:49:25 +0300
 
 nginx (1.10.1-3) unstable; urgency=medium
 

From 1e6e4c88cf4cadc27f5d6b4ecb1d6cd2a73e93f3 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 20 Oct 2016 09:58:54 +0300
Subject: [PATCH 119/600] Drop unused lintian overrides
 (spelling-error-in-binary)

---
 debian/changelog                      | 2 ++
 debian/nginx-extras.lintian-overrides | 1 -
 debian/nginx-full.lintian-overrides   | 1 -
 debian/nginx-light.lintian-overrides  | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 debian/nginx-extras.lintian-overrides
 delete mode 100644 debian/nginx-full.lintian-overrides
 delete mode 100644 debian/nginx-light.lintian-overrides

diff --git a/debian/changelog b/debian/changelog
index 1274498..c79b10a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ nginx (1.10.2-1) UNRELEASED; urgency=medium
   * debian/control:
     + Version depend on lsb-base (>= 3.0-6).
       Fixes lintian init.d-script-needs-depends-on-lsb-base.
+  * debian/nginx-*.lintian-overrides:
+    + Drop unused spelling-error-in-binary override.
 
   [ Michael Lustfield ]
   * debian/conf/sites-available/default:
diff --git a/debian/nginx-extras.lintian-overrides b/debian/nginx-extras.lintian-overrides
deleted file mode 100644
index a90c2bf..0000000
--- a/debian/nginx-extras.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-nginx-extras: spelling-error-in-binary usr/sbin/nginx tEH the
diff --git a/debian/nginx-full.lintian-overrides b/debian/nginx-full.lintian-overrides
deleted file mode 100644
index 4e6e3ed..0000000
--- a/debian/nginx-full.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-nginx-full: spelling-error-in-binary usr/sbin/nginx tEH the
diff --git a/debian/nginx-light.lintian-overrides b/debian/nginx-light.lintian-overrides
deleted file mode 100644
index 3ba2609..0000000
--- a/debian/nginx-light.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-nginx-light: spelling-error-in-binary usr/sbin/nginx tEH the

From 37b847285aa31501fe7a58135ab783c845791c40 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 28 Oct 2016 09:31:11 +0300
Subject: [PATCH 120/600] Revert "Adding support for packaged application
 configurations."

This reverts commit 5d09382c825202bf2b28ae16b6dbfb9485d3c67b.

We will include it in a later release (-2) and perhaps adjust
the paths involved.
---
 debian/changelog                    | 3 ---
 debian/conf/sites-available/default | 4 ----
 debian/nginx-common.dirs            | 1 -
 3 files changed, 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c79b10a..3671be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,6 @@ nginx (1.10.2-1) UNRELEASED; urgency=medium
   [ Michael Lustfield ]
   * debian/conf/sites-available/default:
     + Updated PHP sample configuration block. (Closes: #841230)
-    + Adding include default-server.d/pkg_*.conf. (Closes: #822792)
-  * debian/nginx-common.dirs:
-    + Adding support for packaged application configurations.
 
  -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 20 Oct 2016 09:49:25 +0300
 
diff --git a/debian/conf/sites-available/default b/debian/conf/sites-available/default
index cca2b9a..bfb7f0c 100644
--- a/debian/conf/sites-available/default
+++ b/debian/conf/sites-available/default
@@ -68,10 +68,6 @@ server {
 	#location ~ /\.ht {
 	#	deny all;
 	#}
-
-        # load package-maintained configuration files
-        #   https://wiki.debian.org/Nginx/DirectoryStructure#Packaged_Applications
-        include default-server.d/pkg_*.conf;
 }
 
 
diff --git a/debian/nginx-common.dirs b/debian/nginx-common.dirs
index b674397..65bb651 100644
--- a/debian/nginx-common.dirs
+++ b/debian/nginx-common.dirs
@@ -4,7 +4,6 @@ etc/nginx/modules-available
 etc/nginx/modules-enabled
 etc/nginx/sites-available
 etc/nginx/sites-enabled
-etc/nginx/default-server.d
 etc/ufw/applications.d
 usr/share/nginx
 usr/share/vim/addons

From 333595dc8382e728bc9d57c1e533fa656b2fd6b3 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 14 Sep 2016 12:23:49 +0300
Subject: [PATCH 121/600] CVE-2016-1247: Secure log file handling

Backporting patches from 1.6.2-5+deb8u{3,4} and adjusting
the compare-versions check to 1.10.2-1~.
---
 debian/changelog              |  8 ++++++
 debian/control                |  1 +
 debian/nginx-common.NEWS      | 15 +++++++++++
 debian/nginx-common.config    | 36 +++++++++++++++++++++++++
 debian/nginx-common.postinst  | 35 ++++++++++++++++++-------
 debian/nginx-common.templates | 13 ++++++++++
 debian/po/POTFILES.in         |  1 +
 debian/po/templates.pot       | 49 +++++++++++++++++++++++++++++++++++
 8 files changed, 148 insertions(+), 10 deletions(-)
 create mode 100755 debian/nginx-common.config
 create mode 100644 debian/nginx-common.templates
 create mode 100644 debian/po/POTFILES.in
 create mode 100644 debian/po/templates.pot

diff --git a/debian/changelog b/debian/changelog
index 3671be9..d36950e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,14 @@ nginx (1.10.2-1) UNRELEASED; urgency=medium
 
   [ Christos Trochalakis ]
   * New upstream release.
+  * debian/nginx-common.postinst:
+    + CVE-2016-1247: Secure log file handling (owner & permissions)
+      against privilege escalation attacks. /var/log/nginx is now owned
+      by root:adm. Thanks ro Dawid Golunski for the report.
+      Changing /var/log/nginx permissions effectively reopens #701112,
+      since log files can be world-readable. This is a trade-off until
+      a better log opening solution is implemented upstream (trac:376).
+      (Closes: #842295)
   * debian/control:
     + Version depend on lsb-base (>= 3.0-6).
       Fixes lintian init.d-script-needs-depends-on-lsb-base.
diff --git a/debian/control b/debian/control
index ec867ae..c9b5ab5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders: Kartik Mistry <kartik@debian.org>,
            Christos Trochalakis <yatiohi@ideopolis.gr>
 Build-Depends: autotools-dev,
                debhelper (>= 9),
+               po-debconf,
                dh-systemd (>= 1.5),
                dpkg-dev (>= 1.15.5),
                libexpat-dev,
diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index 3d06e67..fd8e57a 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,3 +1,18 @@
+nginx-common (1.10.2-1) UNRELEASED; urgency=medium
+
+  In order to secure nginx against privilege escalation attacks, we are
+  changing the way log file owners & permissions are handled so that www-data
+  is not allowed to symlink a logfile. /var/log/nginx is now owned by root:adm
+  and its permissions are changed to 0755. The package checks for such symlinks
+  on existing installations and informs the admin using debconf.
+
+  That unfortunately may come at a cost in terms of privacy. /var/log/nginx is
+  now world-readable, and nginx hardcodes permissions of non-existing logs to
+  0644. On systems running logrotate log files are private after the first
+  logrotate run, since the new log files are created with 0640 permissions.
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Tue, 04 Oct 2016 15:20:33 +0300
+
 nginx-common (1.9.9-1) unstable; urgency=medium
 
   Starting with this release we are changing the default logrotate rule to keep
diff --git a/debian/nginx-common.config b/debian/nginx-common.config
new file mode 100755
index 0000000..27cb92f
--- /dev/null
+++ b/debian/nginx-common.config
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+logdir="/var/log/nginx"
+
+log_symlinks_check() {
+    # Skip new installations
+    [ -z "$1" ] && return
+
+    # Skip unaffected installations
+    dpkg --compare-versions "$1" lt-nl "1.10.2-1~" || return 0
+
+    # Check for unsecure symlinks
+    linked_logfiles="` find "$logdir" -type l -user www-data -name '*.log' `"
+
+    # Skip if nothing is found
+    [ -z "$linked_logfiles" ] && return
+
+    db_subst nginx/log-symlinks logfiles $linked_logfiles
+    db_input high nginx/log-symlinks || true
+    db_go || true
+}
+
+case "$1" in
+    configure|reconfigure)
+        log_symlinks_check "$2"
+        ;;
+    *)
+        ;;
+esac
+
+# vim: set ts=4 sts=4 sw=4 et sta ai :
+
diff --git a/debian/nginx-common.postinst b/debian/nginx-common.postinst
index 351bdf9..2b176f8 100644
--- a/debian/nginx-common.postinst
+++ b/debian/nginx-common.postinst
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
 
+. /usr/share/debconf/confmodule
+
 # Handle naxsi removal
 dpkg-maintscript-helper rm_conffile \
 	          /etc/nginx/naxsi.rules         1.6.2-2~ -- "$@"
@@ -14,18 +16,31 @@ dpkg-maintscript-helper rm_conffile \
 case "$1" in
   configure)
     logdir="/var/log/nginx"
-    # Ensure secure permissions (CVE-2013-0337)
-    # http://bugs.debian.org/701112
-    #
-    # nginx uses 0755 for log files making them world readable,
-    # we fix that by using 0750 for the log directory.
-    #
-    # Allow local admin to override:
-    # e.g. dpkg-statoverride --add root adm 0755 /var/log/nginx
+
+    # Allow local admin to override
     if ! dpkg-statoverride --list "$logdir" >/dev/null; then
-      chown www-data:adm $logdir
-      chmod 0750 $logdir
+      chown root:adm $logdir
+      chmod 0755 $logdir
     fi
+
+    # Secure default logfiles on fresh installations
+    if [ -z "$2" ]; then
+      access_log="$logdir/access.log"
+      error_log="$logdir/error.log"
+
+      if [ ! -e "$access_log" ]; then
+        touch "$access_log"
+        chmod 640 "$access_log"
+        chown www-data:adm "$access_log"
+      fi
+
+      if [ ! -e "$error_log" ]; then
+        touch "$error_log"
+        chmod 640 "$error_log"
+        chown www-data:adm "$error_log"
+      fi
+    fi
+
     # If a symlink doesn't exist and can be created, then create it.
     if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
        [ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
diff --git a/debian/nginx-common.templates b/debian/nginx-common.templates
new file mode 100644
index 0000000..225762c
--- /dev/null
+++ b/debian/nginx-common.templates
@@ -0,0 +1,13 @@
+Template: nginx/log-symlinks
+Type: note
+_Description: Possible insecure nginx log files
+ The following log files under /var/log/nginx directory are symlinks
+ owned by www-data:
+ .
+ ${logfiles}
+ .
+ Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result
+ www-data could symlink log files to sensitive locations, which in turn
+ could lead to privilege escalation attacks. Although /var/log/nginx
+ permissions are now fixed it is possible that such insecure links
+ already exist. So, please make sure to check the above locations.
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000..dcbe15b
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] nginx-common.templates
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000..bb72383
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,49 @@
+# Nginx debconf translations
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Chrirtos Trochalakis <yatiohi@ideopolis.gr>, 2016.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""

From 7f827f420adfcfeeb6c9a08aba3f006ad39e7d79 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 29 Oct 2016 08:45:31 +0300
Subject: [PATCH 122/600] Release 1.10.2-1

---
 debian/changelog         | 4 ++--
 debian/nginx-common.NEWS | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d36950e..03d1afb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.10.2-1) UNRELEASED; urgency=medium
+nginx (1.10.2-1) unstable; urgency=high
 
   [ Christos Trochalakis ]
   * New upstream release.
@@ -20,7 +20,7 @@ nginx (1.10.2-1) UNRELEASED; urgency=medium
   * debian/conf/sites-available/default:
     + Updated PHP sample configuration block. (Closes: #841230)
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Thu, 20 Oct 2016 09:49:25 +0300
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Sat, 29 Oct 2016 08:45:09 +0300
 
 nginx (1.10.1-3) unstable; urgency=medium
 
diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index fd8e57a..da94a4c 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,4 +1,4 @@
-nginx-common (1.10.2-1) UNRELEASED; urgency=medium
+nginx-common (1.10.2-1) unstable; urgency=high
 
   In order to secure nginx against privilege escalation attacks, we are
   changing the way log file owners & permissions are handled so that www-data

From 4cf05a14a9a87a97daa9017cd3d577fc07cd7507 Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Sat, 29 Oct 2016 20:48:02 +0000
Subject: [PATCH 123/600] Removing php major version number from comment

---
 debian/conf/sites-available/default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/conf/sites-available/default b/debian/conf/sites-available/default
index bfb7f0c..890f572 100644
--- a/debian/conf/sites-available/default
+++ b/debian/conf/sites-available/default
@@ -56,9 +56,9 @@ server {
 	#location ~ \.php$ {
 	#	include snippets/fastcgi-php.conf;
 	#
-	#	# With php5-fpm (or other unix sockets):
+	#	# With php-fpm (or other unix sockets):
 	#	fastcgi_pass unix:/var/run/php7.0-fpm.sock;
-	#	# With php5-cgi (or other tcp sockets):
+	#	# With php-cgi (or other tcp sockets):
 	#	fastcgi_pass 127.0.0.1:9000;
 	#}
 

From 62276a745b977df88a9a8e7d02bd0ed9e3d27d8b Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 29 Oct 2016 17:27:05 +0300
Subject: [PATCH 124/600] mod: Convert dav-ext to dynamic module

Patch by Florian Kinder
---
 debian/changelog                               |  8 ++++++++
 debian/control                                 | 11 +++++++++++
 debian/libnginx-mod-http-dav-ext.nginx         | 13 +++++++++++++
 debian/libnginx-mod.conf/mod-http-dav-ext.conf |  1 +
 debian/modules/README.Modules-versions         |  3 +--
 debian/modules/nginx-dav-ext-module/config     | 16 ++++++++++++----
 debian/rules                                   |  5 +++--
 debian/tests/control                           |  3 +++
 8 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100755 debian/libnginx-mod-http-dav-ext.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-dav-ext.conf

diff --git a/debian/changelog b/debian/changelog
index 03d1afb..a8ec36c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.10.2-2) UNRELEASED; urgency=medium
+
+  * debian/modules:
+    + Convert dav-ext to a dynamic module package:
+      o libnginx-mod-http-dav-ext
+
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Sat, 29 Oct 2016 17:26:04 +0300
+
 nginx (1.10.2-1) unstable; urgency=high
 
   [ Christos Trochalakis ]
diff --git a/debian/control b/debian/control
index c9b5ab5..704c309 100644
--- a/debian/control
+++ b/debian/control
@@ -70,6 +70,7 @@ Description: small, powerful, scalable web/proxy server - common files
 Package: nginx-full
 Architecture: any
 Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
+         libnginx-mod-http-dav-ext (= ${binary:Version}),
          libnginx-mod-http-echo (= ${binary:Version}),
          libnginx-mod-http-geoip (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
@@ -141,6 +142,7 @@ Architecture: any
 Priority: extra
 Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-cache-purge (= ${binary:Version}),
+         libnginx-mod-http-dav-ext (= ${binary:Version}),
          libnginx-mod-http-echo (= ${binary:Version}),
          libnginx-mod-http-fancyindex (= ${binary:Version}),
          libnginx-mod-http-geoip (= ${binary:Version}),
@@ -371,3 +373,12 @@ Description: Substitution filter module for Nginx
  substitutions on response bodies. The module is quite different from Nginx's
  native Substitution module. It scans the output chains buffer and
  matches string line by line, just like Apache's mod_substitute.
+
+Package: libnginx-mod-http-dav-ext
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: WebDAV missing commands support for Nginx
+ WebDAV Ext module complements the Nginx WebDAV module to provide a full
+ WebDAV support.
+ .
+ WebDAV Ext provides the missing PROPFIND & OPTIONS methods.
diff --git a/debian/libnginx-mod-http-dav-ext.nginx b/debian/libnginx-mod-http-dav-ext.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-dav-ext.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-dav-ext.conf b/debian/libnginx-mod.conf/mod-http-dav-ext.conf
new file mode 100644
index 0000000..e852329
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-dav-ext.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_dav_ext_module.so;
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index a87f25d..33135ac 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -43,8 +43,7 @@ README for Modules versions
 
  nginx-dav-ext-module
   Homepage: https://github.com/arut/nginx-dav-ext-module
-  Version: v0.0.3
-  Dynamic: No, https://github.com/arut/nginx-dav-ext-module/issues/21
+  Version: v0.0.3+pull/22
 
  ngx-fancyindex
   Homepage: https://github.com/aperezdc/ngx-fancyindex
diff --git a/debian/modules/nginx-dav-ext-module/config b/debian/modules/nginx-dav-ext-module/config
index 98b2b7a..b7aeb7a 100644
--- a/debian/modules/nginx-dav-ext-module/config
+++ b/debian/modules/nginx-dav-ext-module/config
@@ -1,9 +1,17 @@
 ngx_addon_name="ngx_http_dav_ext_module"
 
-HTTP_MODULES="$HTTP_MODULES \
+CORE_LIBS="$CORE_LIBS -lexpat"
+
+if test -n "$ngx_module_link"; then
+	ngx_module_type=HTTP
+	ngx_module_name=ngx_http_dav_ext_module
+	ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
+
+	. auto/module
+else
+	HTTP_MODULES="$HTTP_MODULES \
 		ngx_http_dav_ext_module"
 
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
+	NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
 		$ngx_addon_dir/ngx_http_dav_ext_module.c"
-
-CORE_LIBS="$CORE_LIBS -lexpat"
+fi
diff --git a/debian/rules b/debian/rules
index 7547660..3194993 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ FLAVOURS := full light extras
 DYN_MODS := \
 	http-auth-pam \
 	http-cache-purge \
+	http-dav-ext \
 	http-echo \
 	http-fancyindex \
 	http-geoip \
@@ -99,7 +100,7 @@ full_configure_flags := \
 			--with-mail=dynamic \
 			--with-mail_ssl_module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
-			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
+			--add-dynamic-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
 			--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
 			--add-dynamic-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
@@ -125,7 +126,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/headers-more-nginx-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-dynamic-module=$(MODULESDIR)/nginx-cache-purge \
-			--add-module=$(MODULESDIR)/nginx-dav-ext-module \
+			--add-dynamic-module=$(MODULESDIR)/nginx-dav-ext-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-development-kit \
 			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
 			--add-dynamic-module=$(MODULESDIR)/ngx-fancyindex \
diff --git a/debian/tests/control b/debian/tests/control
index 86a0da7..2bc571a 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,6 +16,7 @@ Depends: nginx-full,
          curl,
          libnginx-mod-http-auth-pam,
          libnginx-mod-http-cache-purge,
+         libnginx-mod-http-dav-ext,
          libnginx-mod-http-echo,
          libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip,
@@ -37,6 +38,7 @@ Depends: nginx-light,
          curl,
          libnginx-mod-http-auth-pam,
          libnginx-mod-http-cache-purge,
+         libnginx-mod-http-dav-ext,
          libnginx-mod-http-echo,
          libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip,
@@ -58,6 +60,7 @@ Depends: nginx-extras,
          curl,
          libnginx-mod-http-auth-pam,
          libnginx-mod-http-cache-purge,
+         libnginx-mod-http-dav-ext,
          libnginx-mod-http-echo,
          libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip,

From 340b30f10ca4b6765f30e88804887deabee3752d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sun, 30 Oct 2016 12:25:28 +0200
Subject: [PATCH 125/600] Rethink module patches logic

Collect all patches under debian/patches/modules so they can be
easily tracked and apply them before configure.
---
 debian/changelog                              |  1 +
 debian/control                                |  1 +
 debian/modules/README.Modules-versions        | 12 ++++--
 debian/modules/nginx-cache-purge/config       | 14 +------
 debian/modules/nginx-dav-ext-module/config    | 16 ++------
 debian/modules/nginx-upstream-fair/config     | 13 +-----
 .../config                                    | 16 +-------
 .../nginx-cache-purge/dynamic-module.patch    | 34 +++++++++++++++
 .../patches/modules/nginx-cache-purge/series  |  1 +
 .../nginx-dav-ext-module/dynamic-module.patch | 41 +++++++++++++++++++
 .../modules/nginx-dav-ext-module/series       |  1 +
 .../nginx-upstream-fair/dynamic-module.patch  | 29 +++++++++++++
 .../modules/nginx-upstream-fair/series        |  1 +
 .../dynamic-module.patch                      | 32 +++++++++++++++
 .../series                                    |  1 +
 debian/rules                                  | 11 ++++-
 16 files changed, 170 insertions(+), 54 deletions(-)
 create mode 100644 debian/patches/modules/nginx-cache-purge/dynamic-module.patch
 create mode 100644 debian/patches/modules/nginx-cache-purge/series
 create mode 100644 debian/patches/modules/nginx-dav-ext-module/dynamic-module.patch
 create mode 100644 debian/patches/modules/nginx-dav-ext-module/series
 create mode 100644 debian/patches/modules/nginx-upstream-fair/dynamic-module.patch
 create mode 100644 debian/patches/modules/nginx-upstream-fair/series
 create mode 100644 debian/patches/modules/ngx_http_substitutions_filter_module/dynamic-module.patch
 create mode 100644 debian/patches/modules/ngx_http_substitutions_filter_module/series

diff --git a/debian/changelog b/debian/changelog
index a8ec36c..5101bbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nginx (1.10.2-2) UNRELEASED; urgency=medium
 
   * debian/modules:
+    + Rethink module patching logic.
     + Convert dav-ext to a dynamic module package:
       o libnginx-mod-http-dav-ext
 
diff --git a/debian/control b/debian/control
index 704c309..e553a8a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Build-Depends: autotools-dev,
                libssl-dev,
                libxslt1-dev,
                po-debconf,
+               quilt,
                zlib1g-dev
 Standards-Version: 3.9.8.0
 Homepage: http://nginx.net
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 33135ac..e999b41 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -26,7 +26,8 @@ README for Modules versions
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
-  Version: a18b409+pull/21
+  Version: a18b409
+  Patch: dynamic-module.patch
 
  nchan
   Homepage: https://github.com/slact/nchan
@@ -39,11 +40,13 @@ README for Modules versions
 
  nginx-cache-purge
   Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
-  Version: 2.3+pull/45
+  Version: 2.3
+  Patch: dynamic-module.patch
 
  nginx-dav-ext-module
   Homepage: https://github.com/arut/nginx-dav-ext-module
-  Version: v0.0.3+pull/22
+  Version: v0.0.3
+  Patch: dynamic-module.patch
 
  ngx-fancyindex
   Homepage: https://github.com/aperezdc/ngx-fancyindex
@@ -51,4 +54,5 @@ README for Modules versions
 
  ngx_http_substitutions_filter_module
   Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
-  Version: v0.6.4+pull/19
+  Version: v0.6.4
+  Patch: dynamic-module.patch
diff --git a/debian/modules/nginx-cache-purge/config b/debian/modules/nginx-cache-purge/config
index b900680..34f42ec 100644
--- a/debian/modules/nginx-cache-purge/config
+++ b/debian/modules/nginx-cache-purge/config
@@ -15,17 +15,7 @@ if [ "$HTTP_UWSGI" = "YES" ]; then
 fi
 
 ngx_addon_name=ngx_http_cache_purge_module
-CACHE_PURGE_SRCS="$ngx_addon_dir/ngx_cache_purge_module.c"
-
-if [ -n "$ngx_module_link" ]; then
-    ngx_module_type=HTTP
-    ngx_module_name="$ngx_addon_name"
-    ngx_module_srcs="$CACHE_PURGE_SRCS"
-
-    . auto/module
-else
-    HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $CACHE_PURGE_SRCS"
-fi
+HTTP_MODULES="$HTTP_MODULES ngx_http_cache_purge_module"
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_cache_purge_module.c"
 
 have=NGX_CACHE_PURGE_MODULE . auto/have
diff --git a/debian/modules/nginx-dav-ext-module/config b/debian/modules/nginx-dav-ext-module/config
index b7aeb7a..98b2b7a 100644
--- a/debian/modules/nginx-dav-ext-module/config
+++ b/debian/modules/nginx-dav-ext-module/config
@@ -1,17 +1,9 @@
 ngx_addon_name="ngx_http_dav_ext_module"
 
-CORE_LIBS="$CORE_LIBS -lexpat"
-
-if test -n "$ngx_module_link"; then
-	ngx_module_type=HTTP
-	ngx_module_name=ngx_http_dav_ext_module
-	ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
-
-	. auto/module
-else
-	HTTP_MODULES="$HTTP_MODULES \
+HTTP_MODULES="$HTTP_MODULES \
 		ngx_http_dav_ext_module"
 
-	NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
 		$ngx_addon_dir/ngx_http_dav_ext_module.c"
-fi
+
+CORE_LIBS="$CORE_LIBS -lexpat"
diff --git a/debian/modules/nginx-upstream-fair/config b/debian/modules/nginx-upstream-fair/config
index d8d478b..ff351b7 100644
--- a/debian/modules/nginx-upstream-fair/config
+++ b/debian/modules/nginx-upstream-fair/config
@@ -1,12 +1,3 @@
 ngx_addon_name=ngx_http_upstream_fair_module
-
-if test -n "$ngx_module_link"; then
-    ngx_module_type=HTTP
-    ngx_module_name=ngx_http_upstream_fair_module
-    ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_fair_module.c"
-
-    . auto/module
-else
-    HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
-fi
+HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
diff --git a/debian/modules/ngx_http_substitutions_filter_module/config b/debian/modules/ngx_http_substitutions_filter_module/config
index f1de029..fdb016c 100644
--- a/debian/modules/ngx_http_substitutions_filter_module/config
+++ b/debian/modules/ngx_http_substitutions_filter_module/config
@@ -1,15 +1,3 @@
 ngx_addon_name=ngx_http_subs_filter_module
-
-if test -n "$ngx_module_link"; then
-    ngx_module_type=HTTP_FILTER
-    ngx_module_name=ngx_http_subs_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs="$ngx_addon_dir/ngx_http_subs_filter_module.c"
-    ngx_module_libs=""
-
-    . auto/module
-else
-    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
-fi
+HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
diff --git a/debian/patches/modules/nginx-cache-purge/dynamic-module.patch b/debian/patches/modules/nginx-cache-purge/dynamic-module.patch
new file mode 100644
index 0000000..58dc77c
--- /dev/null
+++ b/debian/patches/modules/nginx-cache-purge/dynamic-module.patch
@@ -0,0 +1,34 @@
+From 26d7114ac82195cd4f7db606d7762a6cff9132ad Mon Sep 17 00:00:00 2001
+From: Hiroaki Nakamura <hnakamur@gmail.com>
+Date: Fri, 12 Feb 2016 09:03:35 +0900
+Subject: [PATCH] Convert a config file to build a dynamic module
+Origin: other, https://github.com/FRiCKLE/ngx_cache_purge/pull/45
+
+---
+ config | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/config b/config
+index 34f42ec..b900680 100644
+--- a/config
++++ b/config
+@@ -15,7 +15,17 @@ if [ "$HTTP_UWSGI" = "YES" ]; then
+ fi
+ 
+ ngx_addon_name=ngx_http_cache_purge_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_cache_purge_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_cache_purge_module.c"
++CACHE_PURGE_SRCS="$ngx_addon_dir/ngx_cache_purge_module.c"
++
++if [ -n "$ngx_module_link" ]; then
++    ngx_module_type=HTTP
++    ngx_module_name="$ngx_addon_name"
++    ngx_module_srcs="$CACHE_PURGE_SRCS"
++
++    . auto/module
++else
++    HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
++    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $CACHE_PURGE_SRCS"
++fi
+ 
+ have=NGX_CACHE_PURGE_MODULE . auto/have
diff --git a/debian/patches/modules/nginx-cache-purge/series b/debian/patches/modules/nginx-cache-purge/series
new file mode 100644
index 0000000..f9b9360
--- /dev/null
+++ b/debian/patches/modules/nginx-cache-purge/series
@@ -0,0 +1 @@
+dynamic-module.patch
diff --git a/debian/patches/modules/nginx-dav-ext-module/dynamic-module.patch b/debian/patches/modules/nginx-dav-ext-module/dynamic-module.patch
new file mode 100644
index 0000000..c865460
--- /dev/null
+++ b/debian/patches/modules/nginx-dav-ext-module/dynamic-module.patch
@@ -0,0 +1,41 @@
+From 0473d8d1bb63a14afe608ecf46bfc933234e3048 Mon Sep 17 00:00:00 2001
+From: Florian Kinder <florian.kinder@fankserver.com>
+Date: Fri, 28 Oct 2016 13:34:21 +0200
+Subject: [PATCH] Added dynamic module support
+Origin: other, https://github.com/Fank/nginx-dav-ext-module/pull/1
+
+---
+ config | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/config b/config
+index 98b2b7a..b6b65de 100644
+--- a/config
++++ b/config
+@@ -1,9 +1,21 @@
+ ngx_addon_name="ngx_http_dav_ext_module"
+ 
+-HTTP_MODULES="$HTTP_MODULES \
+-		ngx_http_dav_ext_module"
+ 
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
+-		$ngx_addon_dir/ngx_http_dav_ext_module.c"
++if test -n "$ngx_module_link"; then
++	ngx_module_type=HTTP
++	ngx_module_name=ngx_http_dav_ext_module
++	ngx_module_incs=
++	ngx_module_deps=
++	ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
++	ngx_module_libs="-lexpat"
++
++	. auto/module
++else
++	CORE_LIBS="$CORE_LIBS -lexpat"
+ 
+-CORE_LIBS="$CORE_LIBS -lexpat"
++	HTTP_MODULES="$HTTP_MODULES \
++		ngx_http_dav_ext_module"
++	
++	NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
++		$ngx_addon_dir/ngx_http_dav_ext_module.c"
++fi
diff --git a/debian/patches/modules/nginx-dav-ext-module/series b/debian/patches/modules/nginx-dav-ext-module/series
new file mode 100644
index 0000000..f9b9360
--- /dev/null
+++ b/debian/patches/modules/nginx-dav-ext-module/series
@@ -0,0 +1 @@
+dynamic-module.patch
diff --git a/debian/patches/modules/nginx-upstream-fair/dynamic-module.patch b/debian/patches/modules/nginx-upstream-fair/dynamic-module.patch
new file mode 100644
index 0000000..0e00466
--- /dev/null
+++ b/debian/patches/modules/nginx-upstream-fair/dynamic-module.patch
@@ -0,0 +1,29 @@
+From 725c58638f5d1921ad5d4a39274edb81bc5b47e6 Mon Sep 17 00:00:00 2001
+From: 99999 <PeterTonoli@users.noreply.github.com>
+Date: Sat, 30 Apr 2016 23:56:19 +1000
+Subject: [PATCH] nginx-upstream-fair can now be compiled as a dynamic module
+Origin: other, https://github.com/gnosek/nginx-upstream-fair/pull/21
+
+---
+ config | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/config b/config
+index ff351b7..d8d478b 100644
+--- a/config
++++ b/config
+@@ -1,3 +1,12 @@
+ ngx_addon_name=ngx_http_upstream_fair_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
++
++if test -n "$ngx_module_link"; then
++    ngx_module_type=HTTP
++    ngx_module_name=ngx_http_upstream_fair_module
++    ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_fair_module.c"
++
++    . auto/module
++else
++    HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
++    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
++fi
diff --git a/debian/patches/modules/nginx-upstream-fair/series b/debian/patches/modules/nginx-upstream-fair/series
new file mode 100644
index 0000000..f9b9360
--- /dev/null
+++ b/debian/patches/modules/nginx-upstream-fair/series
@@ -0,0 +1 @@
+dynamic-module.patch
diff --git a/debian/patches/modules/ngx_http_substitutions_filter_module/dynamic-module.patch b/debian/patches/modules/ngx_http_substitutions_filter_module/dynamic-module.patch
new file mode 100644
index 0000000..2001ff7
--- /dev/null
+++ b/debian/patches/modules/ngx_http_substitutions_filter_module/dynamic-module.patch
@@ -0,0 +1,32 @@
+From b157ed379c3c9c5c1846caa594d6733e88406863 Mon Sep 17 00:00:00 2001
+From: Jeffrey Kriegsman <jeffrey@kriegsman.eu>
+Date: Mon, 15 Feb 2016 15:36:21 +0100
+Subject: [PATCH] Feature: nginx dynamic module support
+Origin: other, https://github.com/yaoweibin/ngx_http_substitutions_filter_module/pull/19
+
+---
+ config | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/config b/config
+index fdb016c..f1de029 100644
+--- a/config
++++ b/config
+@@ -1,3 +1,15 @@
+ ngx_addon_name=ngx_http_subs_filter_module
+-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
++
++if test -n "$ngx_module_link"; then
++    ngx_module_type=HTTP_FILTER
++    ngx_module_name=ngx_http_subs_filter_module
++    ngx_module_incs=
++    ngx_module_deps=
++    ngx_module_srcs="$ngx_addon_dir/ngx_http_subs_filter_module.c"
++    ngx_module_libs=""
++
++    . auto/module
++else
++    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
++    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
++fi
diff --git a/debian/patches/modules/ngx_http_substitutions_filter_module/series b/debian/patches/modules/ngx_http_substitutions_filter_module/series
new file mode 100644
index 0000000..f9b9360
--- /dev/null
+++ b/debian/patches/modules/ngx_http_substitutions_filter_module/series
@@ -0,0 +1 @@
+dynamic-module.patch
diff --git a/debian/rules b/debian/rules
index 3194993..f1806b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,9 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+MODULESPATCHDIR = $(CURDIR)/debian/patches/modules
+modules_with_patches := $(notdir $(wildcard $(CURDIR)/debian/patches/modules/*))
+
 # configure flags
 common_configure_flags := \
 			--with-cc-opt="$(debian_cflags)" \
@@ -139,7 +142,7 @@ extras_configure_flags := \
 %:
 	dh $@ --with systemd
 
-override_dh_auto_configure: $(foreach flavour,$(FLAVOURS),config.arch.$(flavour))
+override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour))
 override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour))
 override_dh_strip:          $(foreach flavour,$(FLAVOURS),strip.arch.$(flavour)) $(foreach mod,$(DYN_MODS),strip.mods.$(mod))
 override_dh_clean:          $(foreach flavour,$(FLAVOURS),clean.$(flavour))
@@ -167,6 +170,10 @@ strip.arch.%:
 strip.mods.%:
 	dh_strip --package=libnginx-mod-$(*) -O--automatic-dbgsym
 
+config_patch_modules: $(foreach mod,$(modules_with_patches),config.patch.$(mod))
+config.patch.%:
+	cd $(MODULESDIR)/$* && QUILT_PATCHES=$(MODULESPATCHDIR)/$* quilt push -a
+
 config.arch.%:
 	dh_testdir
 	mkdir -p $(BUILDDIR_$*)
@@ -180,3 +187,5 @@ config.arch.%:
 
 clean.%:
 	rm -rf $(BUILDDIR_$*)
+
+.PHONY: config_patch_modules

From 2a4f3717931bea9ee2090a9e5f260dbdf1acc149 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 5 Sep 2016 16:55:33 +0300
Subject: [PATCH 126/600] upstream-fair: Apply OpenSSL 1.1.0 FTBFS

https://github.com/gnosek/nginx-upstream-fair/pull/22
---
 debian/modules/README.Modules-versions        |  1 +
 .../nginx-upstream-fair/openssl-1.1.0.patch   | 50 +++++++++++++++++++
 .../modules/nginx-upstream-fair/series        |  1 +
 3 files changed, 52 insertions(+)
 create mode 100644 debian/patches/modules/nginx-upstream-fair/openssl-1.1.0.patch

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index e999b41..2ac5f96 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -28,6 +28,7 @@ README for Modules versions
   Homepage: https://github.com/gnosek/nginx-upstream-fair
   Version: a18b409
   Patch: dynamic-module.patch
+  Patch: openssl-1.1.0.patch
 
  nchan
   Homepage: https://github.com/slact/nchan
diff --git a/debian/patches/modules/nginx-upstream-fair/openssl-1.1.0.patch b/debian/patches/modules/nginx-upstream-fair/openssl-1.1.0.patch
new file mode 100644
index 0000000..c154daa
--- /dev/null
+++ b/debian/patches/modules/nginx-upstream-fair/openssl-1.1.0.patch
@@ -0,0 +1,50 @@
+From cfdf4ffa18e812cbbff3872c1026c3c072d22c09 Mon Sep 17 00:00:00 2001
+From: Kurt Roeckx <kurt@roeckx.be>
+Date: Fri, 2 Sep 2016 23:04:36 +0200
+Subject: [PATCH] Make it build using OpenSSL 1.1.0
+Origin: other, https://github.com/gnosek/nginx-upstream-fair/pull/22
+
+The reference counter is now internal in OpenSSL and not accessible any more.
+---
+ ngx_http_upstream_fair_module.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c
+index a4419ca..6353f1b 100644
+--- a/ngx_http_upstream_fair_module.c
++++ b/ngx_http_upstream_fair_module.c
+@@ -1174,9 +1174,8 @@ ngx_http_upstream_fair_set_session(ngx_peer_connection_t *pc, void *data)
+ 
+     rc = ngx_ssl_set_session(pc->connection, ssl_session);
+ 
+-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+-                   "set session: %p:%d",
+-                   ssl_session, ssl_session ? ssl_session->references : 0);
++    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
++                   "set session: %p", ssl_session);
+ 
+     /* ngx_unlock_mutex(fp->peers->mutex); */
+ 
+@@ -1200,8 +1199,8 @@ ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc, void *data)
+         return;
+     }
+ 
+-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+-                   "save session: %p:%d", ssl_session, ssl_session->references);
++    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
++                   "save session: %p", ssl_session);
+ 
+     peer = &fp->peers->peer[fp->current];
+ 
+@@ -1215,9 +1214,8 @@ ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc, void *data)
+ 
+     if (old_ssl_session) {
+ 
+-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+-                       "old session: %p:%d",
+-                       old_ssl_session, old_ssl_session->references);
++        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
++                       "old session: %p", old_ssl_session);
+ 
+         /* TODO: may block */
+ 
diff --git a/debian/patches/modules/nginx-upstream-fair/series b/debian/patches/modules/nginx-upstream-fair/series
index f9b9360..373a826 100644
--- a/debian/patches/modules/nginx-upstream-fair/series
+++ b/debian/patches/modules/nginx-upstream-fair/series
@@ -1 +1,2 @@
 dynamic-module.patch
+openssl-1.1.0.patch

From 0ec83a636e60da5434b36c6c3b07570c71e79208 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 3 Nov 2016 15:12:22 +0200
Subject: [PATCH 127/600] lua: Apply OpenSSL 1.1.0 FTBFS

https://github.com/openresty/lua-nginx-module/pull/761
---
 debian/modules/README.Modules-versions        |   1 +
 .../modules/nginx-lua/openssl-1.1.0.patch     | 799 ++++++++++++++++++
 debian/patches/modules/nginx-lua/series       |   1 +
 3 files changed, 801 insertions(+)
 create mode 100644 debian/patches/modules/nginx-lua/openssl-1.1.0.patch
 create mode 100644 debian/patches/modules/nginx-lua/series

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 2ac5f96..a8b93ff 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -23,6 +23,7 @@ README for Modules versions
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
   Version: v0.10.6
+  Patch: openssl-1.1.0.patch
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
diff --git a/debian/patches/modules/nginx-lua/openssl-1.1.0.patch b/debian/patches/modules/nginx-lua/openssl-1.1.0.patch
new file mode 100644
index 0000000..e3d0a92
--- /dev/null
+++ b/debian/patches/modules/nginx-lua/openssl-1.1.0.patch
@@ -0,0 +1,799 @@
+From 61301109f812bc8af0e731cea90ed89e03b7b4aa Mon Sep 17 00:00:00 2001
+From: Alessandro Ghedini <alessandro@ghedini.me>
+Date: Tue, 13 Sep 2016 22:31:32 +0100
+Subject: [PATCH 1/5] bugfix: ssl: use TLV1.2 in tests
+
+---
+ t/142-ssl-session-store.t | 20 ++++++++++----------
+ t/143-ssl-session-fetch.t | 24 ++++++++++++------------
+ 2 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/t/142-ssl-session-store.t b/t/142-ssl-session-store.t
+index da84a8d..d0d6080 100644
+--- a/t/142-ssl-session-store.t
++++ b/t/142-ssl-session-store.t
+@@ -32,7 +32,7 @@ __DATA__
+         ssl_session_store_by_lua_block { print("ssl session store by lua is running!") }
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+@@ -102,7 +102,7 @@ ssl_session_store_by_lua_block:1: ssl session store by lua is running!
+         }
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+@@ -177,7 +177,7 @@ API disabled in the context of ssl_session_store_by_lua*
+                 return
+             end
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+@@ -266,7 +266,7 @@ my timer run!
+             print("received memc reply: ", res)
+         }
+ 
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -334,7 +334,7 @@ API disabled in the context of ssl_session_store_by_lua*
+         ssl_session_store_by_lua_block {
+             ngx.exit(0)
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -406,7 +406,7 @@ ngx.exit does not yield and the error code is eaten.
+         ssl_session_store_by_lua_block {
+             ngx.exit(ngx.ERROR)
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -479,7 +479,7 @@ ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
+             error("bad bad bad")
+             ngx.log(ngx.ERR, "should never reached here...")
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -547,7 +547,7 @@ should never reached here
+         ssl_session_store_by_lua_block {
+             print("get_phase: ", ngx.get_phase())
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -620,7 +620,7 @@ get_phase: ssl_session_store
+         ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+@@ -689,7 +689,7 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
+         ssl_session_store_by_lua_file html/a.lua;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+diff --git a/t/143-ssl-session-fetch.t b/t/143-ssl-session-fetch.t
+index 686f671..fc796e8 100644
+--- a/t/143-ssl-session-fetch.t
++++ b/t/143-ssl-session-fetch.t
+@@ -33,7 +33,7 @@ __DATA__
+         ssl_session_fetch_by_lua_block { print("ssl fetch sess by lua is running!") }
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+@@ -114,7 +114,7 @@ qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
+         }
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+@@ -198,7 +198,7 @@ qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
+                 return
+             end
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+@@ -297,7 +297,7 @@ qr/my timer run!/s
+ 
+             print("received memc reply: ", res)
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -377,7 +377,7 @@ qr/received memc reply: OK/s
+             ngx.exit(0)
+             ngx.log(ngx.ERR, "should never reached here...")
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -458,7 +458,7 @@ should never reached here
+             ngx.exit(ngx.ERROR)
+             ngx.log(ngx.ERR, "should never reached here...")
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -540,7 +540,7 @@ should never reached here
+             ngx.exit(ngx.ERROR)
+             ngx.log(ngx.ERR, "should never reached here...")
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -621,7 +621,7 @@ should never reached here
+             error("bad bad bad")
+             ngx.log(ngx.ERR, "should never reached here...")
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -704,7 +704,7 @@ should never reached here
+             error("bad bad bad")
+             ngx.log(ngx.ERR, "should never reached here...")
+         }
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -787,7 +787,7 @@ should never reached here
+         ssl_session_fetch_by_lua_block { print("get_phase: ", ngx.get_phase()) }
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+@@ -872,7 +872,7 @@ qr/get_phase: ssl_session_fetch/s
+         }
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+@@ -956,7 +956,7 @@ ssl store session by lua is running!
+         ssl_session_fetch_by_lua_file html/a.lua;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_protocols TLSv1.2;
+ 
+         server_tokens off;
+     }
+
+From 7b5bd0839cde38a99408092fa53f2c376c80a8a2 Mon Sep 17 00:00:00 2001
+From: Alessandro Ghedini <alessandro@cloudflare.com>
+Date: Thu, 12 May 2016 13:12:23 +0100
+Subject: [PATCH 2/5] bugfix: ssl: do not access SSL_SESSION struct directly
+
+In OpenSSL 1.1.0 it was made opaque.
+---
+ src/ngx_http_lua_socket_tcp.c |  15 ++---
+ t/129-ssl-socket.t            | 152 +++++++++++++++++++++---------------------
+ 2 files changed, 82 insertions(+), 85 deletions(-)
+
+diff --git a/src/ngx_http_lua_socket_tcp.c b/src/ngx_http_lua_socket_tcp.c
+index fe6001f..1861e6f 100644
+--- a/src/ngx_http_lua_socket_tcp.c
++++ b/src/ngx_http_lua_socket_tcp.c
+@@ -1283,9 +1283,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
+                     return 2;
+                 }
+ 
+-                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+-                               "lua ssl set session: %p:%d",
+-                               *psession, (*psession)->references);
++                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
++                               "lua ssl set session: %p", *psession);
+             }
+         }
+ 
+@@ -1549,9 +1548,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
+     } else {
+         *ud = ssl_session;
+ 
+-       ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+-                      "lua ssl save session: %p:%d", ssl_session,
+-                      ssl_session->references);
++       ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
++                      "lua ssl save session: %p", ssl_session);
+ 
+         /* set up the __gc metamethod */
+         lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
+@@ -5272,9 +5270,8 @@ ngx_http_lua_ssl_free_session(lua_State *L)
+ 
+     psession = lua_touserdata(L, 1);
+     if (psession && *psession != NULL) {
+-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+-                       "lua ssl free session: %p:%d", *psession,
+-                       (*psession)->references);
++        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
++                       "lua ssl free session: %p", *psession);
+ 
+         ngx_ssl_free_session(*psession);
+     }
+diff --git a/t/129-ssl-socket.t b/t/129-ssl-socket.t
+index 9da9a5c..98fb5a2 100644
+--- a/t/129-ssl-socket.t
++++ b/t/129-ssl-socket.t
+@@ -108,10 +108,10 @@ sent http request: 59 bytes.
+ received: HTTP/1.1 (?:200 OK|302 Found)
+ close: 1 nil
+ \z
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- no_error_log
+ lua ssl server name:
+@@ -185,10 +185,10 @@ received: HTTP/1.1 401 Unauthorized
+ close: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- no_error_log
+ lua ssl server name:
+@@ -262,10 +262,10 @@ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+@@ -349,13 +349,13 @@ sent http request: 59 bytes.
+ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl set session: \1:2
+-lua ssl save session: \1:3
+-lua ssl free session: \1:2
+-lua ssl free session: \1:1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl set session: \1
++lua ssl save session: \1
++lua ssl free session: \1
++lua ssl free session: \1
+ $/
+ 
+ --- error_log
+@@ -437,7 +437,7 @@ failed to do SSL handshake: certificate host mismatch
+ failed to send http request: closed
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log
+ lua ssl server name: "blah.agentzh.org"
+@@ -517,7 +517,7 @@ failed to do SSL handshake: certificate host mismatch
+ failed to send http request: closed
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log
+ lua ssl server name: "blah.agentzh.org"
+@@ -592,10 +592,10 @@ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ 
+ --- error_log
+@@ -677,10 +677,10 @@ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]++/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ 
+ --- error_log
+@@ -759,7 +759,7 @@ failed to do SSL handshake: 20: unable to get local issuer certificate
+ failed to send http request: closed
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+@@ -838,7 +838,7 @@ failed to do SSL handshake: 20: unable to get local issuer certificate
+ failed to send http request: closed
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+@@ -928,10 +928,10 @@ sent http request: 59 bytes.
+ received: HTTP/1.1 (?:200 OK|302 Found)
+ close: 1 nil
+ \z
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ lua ssl server name: "www.google.com"
+@@ -1018,7 +1018,7 @@ GET /t
+ connected: 1
+ failed to do SSL handshake: 20: unable to get local issuer certificate
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log
+ lua ssl server name: "www.google.com"
+@@ -1100,10 +1100,10 @@ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ 
+ --- error_log
+@@ -1179,10 +1179,10 @@ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+@@ -1259,10 +1259,10 @@ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+@@ -1339,10 +1339,10 @@ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+@@ -1417,7 +1417,7 @@ failed to do SSL handshake: handshake failed
+ failed to send http request: closed
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log eval
+ [
+@@ -1493,10 +1493,10 @@ ssl handshake: userdata
+ set keepalive: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: \1:2
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: \1
+ $/
+ 
+ --- error_log
+@@ -1569,14 +1569,14 @@ ssl handshake: userdata
+ set keepalive: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl save session: \1:3
+-lua ssl save session: \1:4
+-lua ssl free session: \1:4
+-lua ssl free session: \1:3
+-lua ssl free session: \1:2
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl save session: \1
++lua ssl save session: \1
++lua ssl free session: \1
++lua ssl free session: \1
++lua ssl free session: \1
+ $/
+ 
+ --- error_log
+@@ -1620,7 +1620,7 @@ hello world
+ --- response_body_like: 500 Internal Server Error
+ --- error_code: 500
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log
+ attempt to call method 'sslhandshake' (a nil value)
+@@ -1719,10 +1719,10 @@ $::TestCertificateKey
+ >>> test.crt
+ $::TestCertificate"
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- no_error_log
+ lua ssl server name:
+@@ -1824,10 +1824,10 @@ $::TestCertificateKey
+ >>> test.crt
+ $::TestCertificate"
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ lua ssl server name: "test.com"
+@@ -1917,7 +1917,7 @@ failed to do SSL handshake: handshake failed
+ ">>> test.crt
+ $::TestCertificate"
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log eval
+ qr/SSL_do_handshake\(\) failed .*?unknown protocol/
+@@ -2016,7 +2016,7 @@ $::TestCertificate
+ >>> test.crl
+ $::TestCRL"
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log
+ lua ssl server name: "test.com"
+@@ -2095,12 +2095,12 @@ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl save session: ([0-9A-F]+):3
+-lua ssl free session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+@@ -2154,7 +2154,7 @@ connected: 1
+ failed to do SSL handshake: timeout
+ 
+ --- log_level: debug
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+@@ -2226,7 +2226,7 @@ $::TestCertificateKey
+ >>> test.crt
+ $::TestCertificate"
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- no_error_log
+ lua ssl server name:
+@@ -2297,10 +2297,10 @@ $::TestCertificateKey
+ >>> test.crt
+ $::TestCertificate"
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- no_error_log
+ lua ssl server name:
+@@ -2377,7 +2377,7 @@ $::TestCertificateKey
+ >>> test.crt
+ $::TestCertificate"
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- no_error_log
+ lua ssl server name:
+@@ -2479,10 +2479,10 @@ $::TestCertificateKey
+ >>> test.crt
+ $::TestCertificate"
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out eval
+-qr/^lua ssl save session: ([0-9A-F]+):2
+-lua ssl free session: ([0-9A-F]+):1
++qr/^lua ssl save session: ([0-9A-F]+)
++lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ --- no_error_log
+@@ -2575,7 +2575,7 @@ $::TestCertificateKey
+ >>> test.crt
+ $::TestCertificate"
+ 
+---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
++--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+ --- grep_error_log_out
+ --- error_log
+ lua ssl certificate verify error: (18: self signed certificate)
+
+From 4f7dcf142a180c817c038122eeff53148353e0fa Mon Sep 17 00:00:00 2001
+From: Alessandro Ghedini <alessandro@cloudflare.com>
+Date: Thu, 12 May 2016 13:17:52 +0100
+Subject: [PATCH 3/5] bugfix: ssl: do not set tlsext_status_expected flag
+
+In OpenSSL 1.1.0 the SSL struct was made opaque, and setting this
+flag manually is not required anyway since OpenSSL already does that
+automatically when ngx_http_lua_ssl_empty_status_callback() returns
+"OK" (which is always), and an OCSP response has been set.
+---
+ src/ngx_http_lua_ssl_ocsp.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/ngx_http_lua_ssl_ocsp.c b/src/ngx_http_lua_ssl_ocsp.c
+index 3904aa8..31b4f24 100644
+--- a/src/ngx_http_lua_ssl_ocsp.c
++++ b/src/ngx_http_lua_ssl_ocsp.c
+@@ -490,7 +490,6 @@ ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
+ 
+     dd("set ocsp resp: resp_len=%d", (int) resp_len);
+     (void) SSL_set_tlsext_status_ocsp_resp(ssl_conn, p, resp_len);
+-    ssl_conn->tlsext_status_expected = 1;
+ 
+     return NGX_OK;
+ 
+
+From 0a1a3dd1ee86732abd2f44c070292eae5064fced Mon Sep 17 00:00:00 2001
+From: Alessandro Ghedini <alessandro@cloudflare.com>
+Date: Fri, 10 Jun 2016 13:23:21 +0100
+Subject: [PATCH 4/5] bugfix: ssl: do not access SSL struct directly for
+ tlsext_status_type
+
+In OpenSSL 1.1.0 it was made opaque, and a getter function was added.
+---
+ src/ngx_http_lua_ssl_ocsp.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/ngx_http_lua_ssl_ocsp.c b/src/ngx_http_lua_ssl_ocsp.c
+index 31b4f24..9ec8b50 100644
+--- a/src/ngx_http_lua_ssl_ocsp.c
++++ b/src/ngx_http_lua_ssl_ocsp.c
+@@ -468,7 +468,11 @@ ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
+         return NGX_ERROR;
+     }
+ 
++#ifdef SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE
++    if (SSL_get_tlsext_status_type(ssl_conn) == -1) {
++#else
+     if (ssl_conn->tlsext_status_type == -1) {
++#endif
+         dd("no ocsp status req from client");
+         return NGX_DECLINED;
+     }
+
+From 1769df4649ed54b6cfef97de6cd7a79753be7a43 Mon Sep 17 00:00:00 2001
+From: Alessandro Ghedini <alessandro@ghedini.me>
+Date: Tue, 13 Sep 2016 22:19:10 +0100
+Subject: [PATCH 5/5] bugfix: ssl: make SSL session callback build with OpenSSL
+ 1.1.0
+
+---
+ src/ngx_http_lua_ssl_session_fetchby.c | 9 ++++++---
+ src/ngx_http_lua_ssl_session_fetchby.h | 6 +++++-
+ src/ngx_http_lua_ssl_session_storeby.c | 8 ++++++--
+ 3 files changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/src/ngx_http_lua_ssl_session_fetchby.c b/src/ngx_http_lua_ssl_session_fetchby.c
+index 4c450b5..6212c60 100644
+--- a/src/ngx_http_lua_ssl_session_fetchby.c
++++ b/src/ngx_http_lua_ssl_session_fetchby.c
+@@ -171,8 +171,11 @@ ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+ 
+ /* cached session fetching callback to be set with SSL_CTX_sess_set_get_cb */
+ ngx_ssl_session_t *
+-ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
+-    int len, int *copy)
++ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn,
++#if OPENSSL_VERSION_NUMBER >= 0x10100003L
++    const
++#endif
++    u_char *id, int len, int *copy)
+ {
+     lua_State                       *L;
+     ngx_int_t                        rc;
+@@ -284,7 +287,7 @@ ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
+     cctx->exit_code = 1;  /* successful by default */
+     cctx->connection = c;
+     cctx->request = r;
+-    cctx->session_id.data = id;
++    cctx->session_id.data = (u_char *) id;
+     cctx->session_id.len = len;
+     cctx->entered_sess_fetch_handler = 1;
+     cctx->done = 0;
+diff --git a/src/ngx_http_lua_ssl_session_fetchby.h b/src/ngx_http_lua_ssl_session_fetchby.h
+index 5a6f96f..50c6616 100644
+--- a/src/ngx_http_lua_ssl_session_fetchby.h
++++ b/src/ngx_http_lua_ssl_session_fetchby.h
+@@ -25,7 +25,11 @@ char *ngx_http_lua_ssl_sess_fetch_by_lua_block(ngx_conf_t *cf,
+     ngx_command_t *cmd, void *conf);
+ 
+ ngx_ssl_session_t *ngx_http_lua_ssl_sess_fetch_handler(
+-    ngx_ssl_conn_t *ssl_conn, u_char *id, int len, int *copy);
++    ngx_ssl_conn_t *ssl_conn,
++#if OPENSSL_VERSION_NUMBER >= 0x10100003L
++    const
++#endif
++    u_char *id, int len, int *copy);
+ #endif
+ 
+ 
+diff --git a/src/ngx_http_lua_ssl_session_storeby.c b/src/ngx_http_lua_ssl_session_storeby.c
+index b5596bc..85dbece 100644
+--- a/src/ngx_http_lua_ssl_session_storeby.c
++++ b/src/ngx_http_lua_ssl_session_storeby.c
+@@ -172,6 +172,8 @@ int
+ ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
+     ngx_ssl_session_t *sess)
+ {
++    const u_char                    *sess_id;
++    unsigned int                     sess_id_len;
+     lua_State                       *L;
+     ngx_int_t                        rc;
+     ngx_connection_t                *c, *fc = NULL;
+@@ -246,11 +248,13 @@ ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
+         }
+     }
+ 
++    sess_id = SSL_SESSION_get_id(sess, &sess_id_len);
++
+     cctx->connection = c;
+     cctx->request = r;
+     cctx->session = sess;
+-    cctx->session_id.data = sess->session_id;
+-    cctx->session_id.len = sess->session_id_length;
++    cctx->session_id.data = (u_char *) sess_id;
++    cctx->session_id.len = sess_id_len;
+     cctx->done = 0;
+ 
+     dd("setting cctx");
diff --git a/debian/patches/modules/nginx-lua/series b/debian/patches/modules/nginx-lua/series
new file mode 100644
index 0000000..ed0d540
--- /dev/null
+++ b/debian/patches/modules/nginx-lua/series
@@ -0,0 +1 @@
+openssl-1.1.0.patch

From 424f50a53b532f552261df7102adcc8d64881c10 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 3 Nov 2016 16:50:33 +0200
Subject: [PATCH 128/600] Fix FTBFS for OpenSSL 1.1.0

---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5101bbb..470a04a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 nginx (1.10.2-2) UNRELEASED; urgency=medium
 
+  * Build against OpenSSL 1.1.0. (Closes: #828453)
+    + Patch for nginx-lua by Alessandro Ghedini.
+    + Patch for nginx-upstream-fair by Kurt Roeckx.
   * debian/modules:
     + Rethink module patching logic.
     + Convert dav-ext to a dynamic module package:

From 6c9b75da5f2af954c9a393f4e30d21f051e6048f Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 12 Nov 2016 09:18:26 +0200
Subject: [PATCH 129/600] Release 1.10.2-2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 470a04a..89b8f64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.10.2-2) UNRELEASED; urgency=medium
+nginx (1.10.2-2) unstable; urgency=medium
 
   * Build against OpenSSL 1.1.0. (Closes: #828453)
     + Patch for nginx-lua by Alessandro Ghedini.
@@ -8,7 +8,7 @@ nginx (1.10.2-2) UNRELEASED; urgency=medium
     + Convert dav-ext to a dynamic module package:
       o libnginx-mod-http-dav-ext
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Sat, 29 Oct 2016 17:26:04 +0300
+ -- Christos Trochalakis <yatiohi@ideopolis.gr>  Sat, 12 Nov 2016 09:18:12 +0200
 
 nginx (1.10.2-1) unstable; urgency=high
 

From 14707687a2e53588102a3a4d33e7e37eeb52c602 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 16 Nov 2016 10:29:39 +0200
Subject: [PATCH 130/600] New upstream version 1.11.6

---
 CHANGES                                       |  39 +++++
 CHANGES.ru                                    |  42 ++++-
 auto/lib/libgd/conf                           |   5 +
 src/core/nginx.h                              |   4 +-
 src/core/ngx_buf.c                            |  16 +-
 src/core/ngx_conf_file.c                      |  83 ++++++---
 src/core/ngx_cycle.c                          |   3 +
 src/core/ngx_cycle.h                          |   4 +
 src/core/ngx_file.c                           |  32 +++-
 src/core/ngx_hash.c                           |   1 -
 src/event/ngx_event_openssl.c                 | 110 +++++++++++-
 src/event/ngx_event_openssl.h                 |   4 +
 src/http/modules/ngx_http_fastcgi_module.c    |  34 +++-
 .../modules/ngx_http_image_filter_module.c    | 164 +++++++++++++++++-
 src/http/modules/ngx_http_mp4_module.c        |  74 ++++++--
 src/http/modules/ngx_http_proxy_module.c      |  75 +++++---
 .../modules/ngx_http_range_filter_module.c    |  12 +-
 src/http/modules/ngx_http_scgi_module.c       |  34 +++-
 src/http/modules/ngx_http_ssl_module.c        |   6 +
 src/http/modules/ngx_http_uwsgi_module.c      |  34 +++-
 src/http/modules/perl/ngx_http_perl_module.c  |   2 +-
 src/http/ngx_http_cache.h                     |   4 +-
 src/http/ngx_http_core_module.c               |   2 -
 src/http/ngx_http_file_cache.c                |  77 ++++----
 src/http/ngx_http_special_response.c          |   1 -
 src/http/ngx_http_upstream.c                  | 156 +++++++++++++----
 src/http/ngx_http_upstream.h                  |   4 +-
 src/http/ngx_http_upstream_round_robin.c      |   2 +-
 src/http/v2/ngx_http_v2.c                     |  68 ++++++--
 src/http/v2/ngx_http_v2.h                     |   1 +
 src/http/v2/ngx_http_v2_filter_module.c       |   4 +
 src/http/v2/ngx_http_v2_module.c              |   9 +
 src/http/v2/ngx_http_v2_module.h              |   1 +
 src/mail/ngx_mail.h                           |  13 +-
 src/mail/ngx_mail_auth_http_module.c          |   1 +
 src/mail/ngx_mail_handler.c                   |  34 ++++
 src/mail/ngx_mail_imap_handler.c              |  11 ++
 src/mail/ngx_mail_imap_module.c               |   6 +-
 src/mail/ngx_mail_parse.c                     |  22 ++-
 src/mail/ngx_mail_pop3_handler.c              |  11 ++
 src/mail/ngx_mail_pop3_module.c               |  96 +++++++---
 src/mail/ngx_mail_smtp_handler.c              |  11 ++
 src/mail/ngx_mail_smtp_module.c               |   6 +-
 src/stream/ngx_stream_proxy_module.c          |  45 +++--
 src/stream/ngx_stream_upstream.h              |   1 +
 src/stream/ngx_stream_upstream_round_robin.c  |   2 +-
 46 files changed, 1101 insertions(+), 265 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6a88ce4..1882976 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,43 @@
 
+Changes with nginx 1.11.6                                        15 Nov 2016
+
+    *) Change: format of the $ssl_client_s_dn and $ssl_client_i_dn variables
+       has been changed to follow RFC 2253 (RFC 4514); values in the old
+       format are available in the $ssl_client_s_dn_legacy and
+       $ssl_client_i_dn_legacy variables.
+
+    *) Change: when storing temporary files in a cache directory they will
+       be stored in the same subdirectories as corresponding cache files
+       instead of a separate subdirectory for temporary files.
+
+    *) Feature: EXTERNAL authentication mechanism support in mail proxy.
+       Thanks to Robert Norris.
+
+    *) Feature: WebP support in the ngx_http_image_filter_module.
+
+    *) Feature: variables support in the "proxy_method" directive.
+       Thanks to Dmitry Lazurkin.
+
+    *) Feature: the "http2_max_requests" directive in the
+       ngx_http_v2_module.
+
+    *) Feature: the "proxy_cache_max_range_offset",
+       "fastcgi_cache_max_range_offset", "scgi_cache_max_range_offset", and
+       "uwsgi_cache_max_range_offset" directives.
+
+    *) Bugfix: graceful shutdown of old worker processes might require
+       infinite time when using HTTP/2.
+
+    *) Bugfix: in the ngx_http_mp4_module.
+
+    *) Bugfix: "ignore long locked inactive cache entry" alerts might appear
+       in logs when proxying WebSocket connections with caching enabled.
+
+    *) Bugfix: nginx did not write anything to log and returned a response
+       with code 502 instead of 504 when a timeout occurred during an SSL
+       handshake to a backend.
+
+
 Changes with nginx 1.11.5                                        11 Oct 2016
 
     *) Change: the --with-ipv6 configure option was removed, now IPv6
diff --git a/CHANGES.ru b/CHANGES.ru
index f0bdaf5..3b66b94 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,44 @@
 
+Изменения в nginx 1.11.6                                          15.11.2016
+
+    *) Изменение: формат переменных $ssl_client_s_dn и $ssl_client_i_dn
+       изменён на соответствующий RFC 2253 (RFC 4514); значения в старом
+       формате доступны через переменные $ssl_client_s_dn_legacy и
+       $ssl_client_i_dn_legacy.
+
+    *) Изменение: при сохранении временных файлов в каталоге кэша они теперь
+       располагаются не в отдельном подкаталоге для временных файлов, а в
+       том же подкаталоге, что и соответствующие файлы в кэше.
+
+    *) Добавление: поддержка метода аутентификации EXTERNAL в почтовом
+       прокси-сервере.
+       Спасибо Robert Norris.
+
+    *) Добавление: поддержка WebP в модуле ngx_http_image_filter_module.
+
+    *) Добавление: директива proxy_method поддерживает переменные.
+       Спасибо Дмитрию Лазуркину.
+
+    *) Добавление: директива http2_max_requests в модуле ngx_http_v2_module.
+
+    *) Добавление: директивы proxy_cache_max_range_offset,
+       fastcgi_cache_max_range_offset, scgi_cache_max_range_offset и
+       uwsgi_cache_max_range_offset.
+
+    *) Исправление: плавное завершение старых рабочих процессов могло
+       занимать бесконечное время при использовании HTTP/2.
+
+    *) Исправление: в модуле ngx_http_mp4_module.
+
+    *) Исправление: при проксировании WebSocket-соединений и включённом
+       кэшировании в логах могли появляться сообщения "ignore long locked
+       inactive cache entry".
+
+    *) Исправление: если во время SSL handshake с бэкендом происходил
+       таймаут, nginx ничего не писал в лог и возвращал ответ с кодом 502
+       вместо 504.
+
+
 Изменения в nginx 1.11.5                                          11.10.2016
 
     *) Изменение: параметр configure --with-ipv6 упразднён, поддержка IPv6
@@ -5589,7 +5629,7 @@
 
 Изменения в nginx 0.4.11                                          25.10.2006
 
-    *) Добавление: POP3 прокси поддерживает AUTH LOIGN PLAIN и CRAM-MD5.
+    *) Добавление: POP3 прокси поддерживает AUTH LOGIN PLAIN и CRAM-MD5.
 
     *) Добавление: модуль ngx_http_perl_module поддерживает метод
        $r->allow_ranges.
diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf
index 6e4e91c..87761f1 100644
--- a/auto/lib/libgd/conf
+++ b/auto/lib/libgd/conf
@@ -74,6 +74,11 @@ if [ $ngx_found = yes ]; then
 
     NGX_LIB_LIBGD=$ngx_feature_libs
 
+    ngx_feature="GD WebP support"
+    ngx_feature_name="NGX_HAVE_GD_WEBP"
+    ngx_feature_test="gdImagePtr img = gdImageCreateFromWebpPtr(1, NULL);"
+    . auto/feature
+
 else
 
 cat << END
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 1446251..a75ef04 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011005
-#define NGINX_VERSION      "1.11.5"
+#define nginx_version      1011006
+#define NGINX_VERSION      "1.11.6"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_buf.c b/src/core/ngx_buf.c
index 00b6644..d30a0a4 100644
--- a/src/core/ngx_buf.c
+++ b/src/core/ngx_buf.c
@@ -186,17 +186,19 @@ ngx_chain_update_chains(ngx_pool_t *p, ngx_chain_t **free, ngx_chain_t **busy,
 {
     ngx_chain_t  *cl;
 
-    if (*busy == NULL) {
-        *busy = *out;
+    if (*out) {
+        if (*busy == NULL) {
+            *busy = *out;
 
-    } else {
-        for (cl = *busy; cl->next; cl = cl->next) { /* void */ }
+        } else {
+            for (cl = *busy; cl->next; cl = cl->next) { /* void */ }
 
-        cl->next = *out;
+            cl->next = *out;
+        }
+
+        *out = NULL;
     }
 
-    *out = NULL;
-
     while (*busy) {
         cl = *busy;
 
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index ea1dceb..ce8c602 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -10,6 +10,7 @@
 
 #define NGX_CONF_BUFFER  4096
 
+static ngx_int_t ngx_conf_add_dump(ngx_conf_t *cf, ngx_str_t *filename);
 static ngx_int_t ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last);
 static ngx_int_t ngx_conf_read_token(ngx_conf_t *cf);
 static void ngx_conf_flush_files(ngx_cycle_t *cycle);
@@ -97,17 +98,70 @@ ngx_conf_param(ngx_conf_t *cf)
 }
 
 
+static ngx_int_t
+ngx_conf_add_dump(ngx_conf_t *cf, ngx_str_t *filename)
+{
+    off_t             size;
+    u_char           *p;
+    uint32_t          hash;
+    ngx_buf_t        *buf;
+    ngx_str_node_t   *sn;
+    ngx_conf_dump_t  *cd;
+
+    hash = ngx_crc32_long(filename->data, filename->len);
+
+    sn = ngx_str_rbtree_lookup(&cf->cycle->config_dump_rbtree, filename, hash);
+
+    if (sn) {
+        cf->conf_file->dump = NULL;
+        return NGX_OK;
+    }
+
+    p = ngx_pstrdup(cf->cycle->pool, filename);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    cd = ngx_array_push(&cf->cycle->config_dump);
+    if (cd == NULL) {
+        return NGX_ERROR;
+    }
+
+    size = ngx_file_size(&cf->conf_file->file.info);
+
+    buf = ngx_create_temp_buf(cf->cycle->pool, (size_t) size);
+    if (buf == NULL) {
+        return NGX_ERROR;
+    }
+
+    cd->name.data = p;
+    cd->name.len = filename->len;
+    cd->buffer = buf;
+
+    cf->conf_file->dump = buf;
+
+    sn = ngx_palloc(cf->temp_pool, sizeof(ngx_str_node_t));
+    if (sn == NULL) {
+        return NGX_ERROR;
+    }
+
+    sn->node.key = hash;
+    sn->str = cd->name;
+
+    ngx_rbtree_insert(&cf->cycle->config_dump_rbtree, &sn->node);
+
+    return NGX_OK;
+}
+
+
 char *
 ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
 {
     char             *rv;
-    u_char           *p;
-    off_t             size;
     ngx_fd_t          fd;
     ngx_int_t         rc;
-    ngx_buf_t         buf, *tbuf;
+    ngx_buf_t         buf;
     ngx_conf_file_t  *prev, conf_file;
-    ngx_conf_dump_t  *cd;
     enum {
         parse_file = 0,
         parse_block,
@@ -167,29 +221,10 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
 #endif
            )
         {
-            p = ngx_pstrdup(cf->cycle->pool, filename);
-            if (p == NULL) {
+            if (ngx_conf_add_dump(cf, filename) != NGX_OK) {
                 goto failed;
             }
 
-            size = ngx_file_size(&cf->conf_file->file.info);
-
-            tbuf = ngx_create_temp_buf(cf->cycle->pool, (size_t) size);
-            if (tbuf == NULL) {
-                goto failed;
-            }
-
-            cd = ngx_array_push(&cf->cycle->config_dump);
-            if (cd == NULL) {
-                goto failed;
-            }
-
-            cd->name.len = filename->len;
-            cd->name.data = p;
-            cd->buffer = tbuf;
-
-            cf->conf_file->dump = tbuf;
-
         } else {
             cf->conf_file->dump = NULL;
         }
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 98599f3..a57991c 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -132,6 +132,9 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
         return NULL;
     }
 
+    ngx_rbtree_init(&cycle->config_dump_rbtree, &cycle->config_dump_sentinel,
+                    ngx_str_rbtree_insert_value);
+
     if (old_cycle->open_files.part.nelts) {
         n = old_cycle->open_files.part.nelts;
         for (part = old_cycle->open_files.part.next; part; part = part->next) {
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index c51b7ff..5cdacf1 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -56,7 +56,11 @@ struct ngx_cycle_s {
 
     ngx_array_t               listening;
     ngx_array_t               paths;
+
     ngx_array_t               config_dump;
+    ngx_rbtree_t              config_dump_rbtree;
+    ngx_rbtree_node_t         config_dump_sentinel;
+
     ngx_list_t                open_files;
     ngx_list_t                shared_memory;
 
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 8359c0f..b7dd4bc 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -141,12 +141,27 @@ ngx_int_t
 ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
     ngx_uint_t persistent, ngx_uint_t clean, ngx_uint_t access)
 {
+    size_t                    levels;
+    u_char                   *p;
     uint32_t                  n;
     ngx_err_t                 err;
+    ngx_str_t                 name;
+    ngx_uint_t                prefix;
     ngx_pool_cleanup_t       *cln;
     ngx_pool_cleanup_file_t  *clnf;
 
-    file->name.len = path->name.len + 1 + path->len + 10;
+    if (file->name.len) {
+        name = file->name;
+        levels = 0;
+        prefix = 1;
+
+    } else {
+        name = path->name;
+        levels = path->len;
+        prefix = 0;
+    }
+
+    file->name.len = name.len + 1 + levels + 10;
 
     file->name.data = ngx_pnalloc(pool, file->name.len + 1);
     if (file->name.data == NULL) {
@@ -159,7 +174,13 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
     }
 #endif
 
-    ngx_memcpy(file->name.data, path->name.data, path->name.len);
+    p = ngx_cpymem(file->name.data, name.data, name.len);
+
+    if (prefix) {
+        *p = '.';
+    }
+
+    p += 1 + levels;
 
     n = (uint32_t) ngx_next_temp_number(0);
 
@@ -169,10 +190,11 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
     }
 
     for ( ;; ) {
-        (void) ngx_sprintf(file->name.data + path->name.len + 1 + path->len,
-                           "%010uD%Z", n);
+        (void) ngx_sprintf(p, "%010uD%Z", n);
 
-        ngx_create_hashed_filename(path, file->name.data, file->name.len);
+        if (!prefix) {
+            ngx_create_hashed_filename(path, file->name.data, file->name.len);
+        }
 
         ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
                        "hashed path: %s", file->name.data);
diff --git a/src/core/ngx_hash.c b/src/core/ngx_hash.c
index 151e643..1944c7a 100644
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -390,7 +390,6 @@ found:
 
         buckets[i] = (ngx_hash_elt_t *) elts;
         elts += test[i];
-
     }
 
     for (i = 0; i < size; i++) {
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 68d02bf..5c7734d 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -2137,7 +2137,9 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, char *fmt, ...)
             break;
         }
 
-        if (p >= last) {
+        /* ERR_error_string_n() requires at least one byte */
+
+        if (p >= last - 1) {
             goto next;
         }
 
@@ -3435,6 +3437,109 @@ ngx_ssl_get_certificate(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 
 ngx_int_t
 ngx_ssl_get_subject_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+    BIO        *bio;
+    X509       *cert;
+    X509_NAME  *name;
+
+    s->len = 0;
+
+    cert = SSL_get_peer_certificate(c->ssl->connection);
+    if (cert == NULL) {
+        return NGX_OK;
+    }
+
+    name = X509_get_subject_name(cert);
+    if (name == NULL) {
+        return NGX_ERROR;
+    }
+
+    bio = BIO_new(BIO_s_mem());
+    if (bio == NULL) {
+        X509_free(cert);
+        return NGX_ERROR;
+    }
+
+    if (X509_NAME_print_ex(bio, name, 0, XN_FLAG_RFC2253) < 0) {
+        goto failed;
+    }
+
+    s->len = BIO_pending(bio);
+    s->data = ngx_pnalloc(pool, s->len);
+    if (s->data == NULL) {
+        goto failed;
+    }
+
+    BIO_read(bio, s->data, s->len);
+
+    BIO_free(bio);
+    X509_free(cert);
+
+    return NGX_OK;
+
+failed:
+
+    BIO_free(bio);
+    X509_free(cert);
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_ssl_get_issuer_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+    BIO        *bio;
+    X509       *cert;
+    X509_NAME  *name;
+
+    s->len = 0;
+
+    cert = SSL_get_peer_certificate(c->ssl->connection);
+    if (cert == NULL) {
+        return NGX_OK;
+    }
+
+    name = X509_get_issuer_name(cert);
+    if (name == NULL) {
+        return NGX_ERROR;
+    }
+
+    bio = BIO_new(BIO_s_mem());
+    if (bio == NULL) {
+        X509_free(cert);
+        return NGX_ERROR;
+    }
+
+    if (X509_NAME_print_ex(bio, name, 0, XN_FLAG_RFC2253) < 0) {
+        goto failed;
+    }
+
+    s->len = BIO_pending(bio);
+    s->data = ngx_pnalloc(pool, s->len);
+    if (s->data == NULL) {
+        goto failed;
+    }
+
+    BIO_read(bio, s->data, s->len);
+
+    BIO_free(bio);
+    X509_free(cert);
+
+    return NGX_OK;
+
+failed:
+
+    BIO_free(bio);
+    X509_free(cert);
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_ssl_get_subject_dn_legacy(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s)
 {
     char       *p;
     size_t      len;
@@ -3476,7 +3581,8 @@ ngx_ssl_get_subject_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 
 
 ngx_int_t
-ngx_ssl_get_issuer_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+ngx_ssl_get_issuer_dn_legacy(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s)
 {
     char       *p;
     size_t      len;
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 24b812f..d233c02 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -205,6 +205,10 @@ ngx_int_t ngx_ssl_get_subject_dn(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_issuer_dn(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
+ngx_int_t ngx_ssl_get_subject_dn_legacy(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
+ngx_int_t ngx_ssl_get_issuer_dn_legacy(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
 ngx_int_t ngx_ssl_get_serial_number(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_fingerprint(ngx_connection_t *c, ngx_pool_t *pool,
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 62502b0..c7c417b 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -420,6 +420,13 @@ static ngx_command_t  ngx_http_fastcgi_commands[] = {
       offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_min_uses),
       NULL },
 
+    { ngx_string("fastcgi_cache_max_range_offset"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_off_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_max_range_offset),
+      NULL },
+
     { ngx_string("fastcgi_cache_use_stale"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
       ngx_conf_set_bitmask_slot,
@@ -766,16 +773,14 @@ ngx_http_fastcgi_eval(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf)
         return NGX_ERROR;
     }
 
-    if (url.addrs && url.addrs[0].sockaddr) {
+    if (url.addrs) {
         u->resolved->sockaddr = url.addrs[0].sockaddr;
         u->resolved->socklen = url.addrs[0].socklen;
+        u->resolved->name = url.addrs[0].name;
         u->resolved->naddrs = 1;
-        u->resolved->host = url.addrs[0].name;
-
-    } else {
-        u->resolved->host = url.host;
     }
 
+    u->resolved->host = url.host;
     u->resolved->port = url.port;
     u->resolved->no_port = url.no_port;
 
@@ -2756,6 +2761,7 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
 #if (NGX_HTTP_CACHE)
     conf->upstream.cache = NGX_CONF_UNSET;
     conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
+    conf->upstream.cache_max_range_offset = NGX_CONF_UNSET;
     conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR;
     conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
     conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
@@ -3001,6 +3007,10 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
                               prev->upstream.cache_min_uses, 1);
 
+    ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
+                              prev->upstream.cache_max_range_offset,
+                              NGX_MAX_OFF_T_VALUE);
+
     ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
                               prev->upstream.cache_use_stale,
                               (NGX_CONF_BITMASK_SET
@@ -3127,6 +3137,20 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #endif
 
+    /*
+     * special handling to preserve conf->params in the "http" section
+     * to inherit it to all servers
+     */
+
+    if (prev->params.hash.buckets == NULL
+        && conf->params_source == prev->params_source)
+    {
+        prev->params = conf->params;
+#if (NGX_HTTP_CACHE)
+        prev->params_cache = conf->params_cache;
+#endif
+    }
+
     return NGX_CONF_OK;
 }
 
diff --git a/src/http/modules/ngx_http_image_filter_module.c b/src/http/modules/ngx_http_image_filter_module.c
index b608de1..dbec5d8 100644
--- a/src/http/modules/ngx_http_image_filter_module.c
+++ b/src/http/modules/ngx_http_image_filter_module.c
@@ -31,6 +31,7 @@
 #define NGX_HTTP_IMAGE_JPEG      1
 #define NGX_HTTP_IMAGE_GIF       2
 #define NGX_HTTP_IMAGE_PNG       3
+#define NGX_HTTP_IMAGE_WEBP      4
 
 
 #define NGX_HTTP_IMAGE_BUFFERED  0x08
@@ -42,6 +43,7 @@ typedef struct {
     ngx_uint_t                   height;
     ngx_uint_t                   angle;
     ngx_uint_t                   jpeg_quality;
+    ngx_uint_t                   webp_quality;
     ngx_uint_t                   sharpen;
 
     ngx_flag_t                   transparency;
@@ -51,6 +53,7 @@ typedef struct {
     ngx_http_complex_value_t    *hcv;
     ngx_http_complex_value_t    *acv;
     ngx_http_complex_value_t    *jqcv;
+    ngx_http_complex_value_t    *wqcv;
     ngx_http_complex_value_t    *shcv;
 
     size_t                       buffer_size;
@@ -109,6 +112,8 @@ static char *ngx_http_image_filter(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_image_filter_jpeg_quality(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
+static char *ngx_http_image_filter_webp_quality(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
 static char *ngx_http_image_filter_sharpen(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static ngx_int_t ngx_http_image_filter_init(ngx_conf_t *cf);
@@ -130,6 +135,13 @@ static ngx_command_t  ngx_http_image_filter_commands[] = {
       0,
       NULL },
 
+    { ngx_string("image_filter_webp_quality"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_image_filter_webp_quality,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
     { ngx_string("image_filter_sharpen"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_http_image_filter_sharpen,
@@ -200,7 +212,8 @@ static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
 static ngx_str_t  ngx_http_image_types[] = {
     ngx_string("image/jpeg"),
     ngx_string("image/gif"),
-    ngx_string("image/png")
+    ngx_string("image/png"),
+    ngx_string("image/webp")
 };
 
 
@@ -441,6 +454,13 @@ ngx_http_image_test(ngx_http_request_t *r, ngx_chain_t *in)
         /* PNG */
 
         return NGX_HTTP_IMAGE_PNG;
+
+    } else if (p[0] == 'R' && p[1] == 'I' && p[2] == 'F' && p[3] == 'F'
+               && p[8] == 'W' && p[9] == 'E' && p[10] == 'B' && p[11] == 'P')
+    {
+        /* WebP */
+
+        return NGX_HTTP_IMAGE_WEBP;
     }
 
     return NGX_HTTP_IMAGE_NONE;
@@ -731,6 +751,56 @@ ngx_http_image_size(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
 
         break;
 
+    case NGX_HTTP_IMAGE_WEBP:
+
+        if (ctx->length < 30) {
+            return NGX_DECLINED;
+        }
+
+        if (p[12] != 'V' || p[13] != 'P' || p[14] != '8') {
+            return NGX_DECLINED;
+        }
+
+        switch (p[15]) {
+
+        case ' ':
+            if (p[20] & 1) {
+                /* not a key frame */
+                return NGX_DECLINED;
+            }
+
+            if (p[23] != 0x9d || p[24] != 0x01 || p[25] != 0x2a) {
+                /* invalid start code */
+                return NGX_DECLINED;
+            }
+
+            width = (p[26] | p[27] << 8) & 0x3fff;
+            height = (p[28] | p[29] << 8) & 0x3fff;
+
+            break;
+
+        case 'L':
+            if (p[20] != 0x2f) {
+                /* invalid signature */
+                return NGX_DECLINED;
+            }
+
+            width = ((p[21] | p[22] << 8) & 0x3fff) + 1;
+            height = ((p[22] >> 6 | p[23] << 2 | p[24] << 10) & 0x3fff) + 1;
+
+            break;
+
+        case 'X':
+            width = (p[24] | p[25] << 8 | p[26] << 16) + 1;
+            height = (p[27] | p[28] << 8 | p[29] << 16) + 1;
+            break;
+
+        default:
+            return NGX_DECLINED;
+        }
+
+        break;
+
     default:
 
         return NGX_DECLINED;
@@ -1043,6 +1113,15 @@ ngx_http_image_source(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
         failed = "gdImageCreateFromPngPtr() failed";
         break;
 
+    case NGX_HTTP_IMAGE_WEBP:
+#if (NGX_HAVE_GD_WEBP)
+        img = gdImageCreateFromWebpPtr(ctx->length, ctx->image);
+        failed = "gdImageCreateFromWebpPtr() failed";
+#else
+        failed = "nginx was built without GD WebP support";
+#endif
+        break;
+
     default:
         failed = "unknown image type";
         break;
@@ -1090,7 +1169,7 @@ ngx_http_image_out(ngx_http_request_t *r, ngx_uint_t type, gdImagePtr img,
 {
     char                          *failed;
     u_char                        *out;
-    ngx_int_t                      jq;
+    ngx_int_t                      q;
     ngx_http_image_filter_conf_t  *conf;
 
     out = NULL;
@@ -1100,12 +1179,12 @@ ngx_http_image_out(ngx_http_request_t *r, ngx_uint_t type, gdImagePtr img,
     case NGX_HTTP_IMAGE_JPEG:
         conf = ngx_http_get_module_loc_conf(r, ngx_http_image_filter_module);
 
-        jq = ngx_http_image_filter_get_value(r, conf->jqcv, conf->jpeg_quality);
-        if (jq <= 0) {
+        q = ngx_http_image_filter_get_value(r, conf->jqcv, conf->jpeg_quality);
+        if (q <= 0) {
             return NULL;
         }
 
-        out = gdImageJpegPtr(img, size, jq);
+        out = gdImageJpegPtr(img, size, q);
         failed = "gdImageJpegPtr() failed";
         break;
 
@@ -1119,6 +1198,22 @@ ngx_http_image_out(ngx_http_request_t *r, ngx_uint_t type, gdImagePtr img,
         failed = "gdImagePngPtr() failed";
         break;
 
+    case NGX_HTTP_IMAGE_WEBP:
+#if (NGX_HAVE_GD_WEBP)
+        conf = ngx_http_get_module_loc_conf(r, ngx_http_image_filter_module);
+
+        q = ngx_http_image_filter_get_value(r, conf->wqcv, conf->webp_quality);
+        if (q <= 0) {
+            return NULL;
+        }
+
+        out = gdImageWebpPtrEx(img, size, q);
+        failed = "gdImageWebpPtrEx() failed";
+#else
+        failed = "nginx was built without GD WebP support";
+#endif
+        break;
+
     default:
         failed = "unknown image type";
         break;
@@ -1196,11 +1291,13 @@ ngx_http_image_filter_create_conf(ngx_conf_t *cf)
      *     conf->hcv = NULL;
      *     conf->acv = NULL;
      *     conf->jqcv = NULL;
+     *     conf->wqcv = NULL;
      *     conf->shcv = NULL;
      */
 
     conf->filter = NGX_CONF_UNSET_UINT;
     conf->jpeg_quality = NGX_CONF_UNSET_UINT;
+    conf->webp_quality = NGX_CONF_UNSET_UINT;
     conf->sharpen = NGX_CONF_UNSET_UINT;
     conf->transparency = NGX_CONF_UNSET;
     conf->interlace = NGX_CONF_UNSET;
@@ -1242,6 +1339,16 @@ ngx_http_image_filter_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
+    if (conf->webp_quality == NGX_CONF_UNSET_UINT) {
+
+        /* 80 is libwebp default quality */
+        ngx_conf_merge_uint_value(conf->webp_quality, prev->webp_quality, 80);
+
+        if (conf->wqcv == NULL) {
+            conf->wqcv = prev->wqcv;
+        }
+    }
+
     if (conf->sharpen == NGX_CONF_UNSET_UINT) {
         ngx_conf_merge_uint_value(conf->sharpen, prev->sharpen, 0);
 
@@ -1461,6 +1568,53 @@ ngx_http_image_filter_jpeg_quality(ngx_conf_t *cf, ngx_command_t *cmd,
 }
 
 
+static char *
+ngx_http_image_filter_webp_quality(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    ngx_http_image_filter_conf_t *imcf = conf;
+
+    ngx_str_t                         *value;
+    ngx_int_t                          n;
+    ngx_http_complex_value_t           cv;
+    ngx_http_compile_complex_value_t   ccv;
+
+    value = cf->args->elts;
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &cv;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cv.lengths == NULL) {
+        n = ngx_http_image_filter_value(&value[1]);
+
+        if (n <= 0) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid value \"%V\"", &value[1]);
+            return NGX_CONF_ERROR;
+        }
+
+        imcf->webp_quality = (ngx_uint_t) n;
+
+    } else {
+        imcf->wqcv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+        if (imcf->wqcv == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *imcf->wqcv = cv;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 static char *
 ngx_http_image_filter_sharpen(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 2a68bae..8f2920f 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -216,6 +216,7 @@ typedef struct {
 
 
 static ngx_int_t ngx_http_mp4_handler(ngx_http_request_t *r);
+static ngx_int_t ngx_http_mp4_atofp(u_char *line, size_t n, size_t point);
 
 static ngx_int_t ngx_http_mp4_process(ngx_http_mp4_file_t *mp4);
 static ngx_int_t ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4,
@@ -537,26 +538,15 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
 
             /*
              * A Flash player may send start value with a lot of digits
-             * after dot so strtod() is used instead of atofp().  NaNs and
-             * infinities become negative numbers after (int) conversion.
+             * after dot so a custom function is used instead of ngx_atofp().
              */
 
-            ngx_set_errno(0);
-            start = (int) (strtod((char *) value.data, NULL) * 1000);
-
-            if (ngx_errno != 0) {
-                start = -1;
-            }
+            start = ngx_http_mp4_atofp(value.data, value.len, 3);
         }
 
         if (ngx_http_arg(r, (u_char *) "end", 3, &value) == NGX_OK) {
 
-            ngx_set_errno(0);
-            end = (int) (strtod((char *) value.data, NULL) * 1000);
-
-            if (ngx_errno != 0) {
-                end = -1;
-            }
+            end = ngx_http_mp4_atofp(value.data, value.len, 3);
 
             if (end > 0) {
                 if (start < 0) {
@@ -686,6 +676,62 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
 }
 
 
+static ngx_int_t
+ngx_http_mp4_atofp(u_char *line, size_t n, size_t point)
+{
+    ngx_int_t   value, cutoff, cutlim;
+    ngx_uint_t  dot;
+
+    /* same as ngx_atofp(), but allows additional digits */
+
+    if (n == 0) {
+        return NGX_ERROR;
+    }
+
+    cutoff = NGX_MAX_INT_T_VALUE / 10;
+    cutlim = NGX_MAX_INT_T_VALUE % 10;
+
+    dot = 0;
+
+    for (value = 0; n--; line++) {
+
+        if (*line == '.') {
+            if (dot) {
+                return NGX_ERROR;
+            }
+
+            dot = 1;
+            continue;
+        }
+
+        if (*line < '0' || *line > '9') {
+            return NGX_ERROR;
+        }
+
+        if (point == 0) {
+            continue;
+        }
+
+        if (value >= cutoff && (value > cutoff || *line - '0' > cutlim)) {
+            return NGX_ERROR;
+        }
+
+        value = value * 10 + (*line - '0');
+        point -= dot;
+    }
+
+    while (point--) {
+        if (value > cutoff) {
+            return NGX_ERROR;
+        }
+
+        value = value * 10;
+    }
+
+    return value;
+}
+
+
 static ngx_int_t
 ngx_http_mp4_process(ngx_http_mp4_file_t *mp4)
 {
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 4f49a52..42b6afc 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -73,7 +73,7 @@ typedef struct {
     ngx_array_t                   *cookie_domains;
     ngx_array_t                   *cookie_paths;
 
-    ngx_str_t                      method;
+    ngx_http_complex_value_t      *method;
     ngx_str_t                      location;
     ngx_str_t                      url;
 
@@ -380,7 +380,7 @@ static ngx_command_t  ngx_http_proxy_commands[] = {
 
     { ngx_string("proxy_method"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_http_set_complex_value_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_proxy_loc_conf_t, method),
       NULL },
@@ -492,6 +492,13 @@ static ngx_command_t  ngx_http_proxy_commands[] = {
       offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_min_uses),
       NULL },
 
+    { ngx_string("proxy_cache_max_range_offset"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_off_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_max_range_offset),
+      NULL },
+
     { ngx_string("proxy_cache_use_stale"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
       ngx_conf_set_bitmask_slot,
@@ -1008,16 +1015,14 @@ ngx_http_proxy_eval(ngx_http_request_t *r, ngx_http_proxy_ctx_t *ctx,
         return NGX_ERROR;
     }
 
-    if (url.addrs && url.addrs[0].sockaddr) {
+    if (url.addrs) {
         u->resolved->sockaddr = url.addrs[0].sockaddr;
         u->resolved->socklen = url.addrs[0].socklen;
+        u->resolved->name = url.addrs[0].name;
         u->resolved->naddrs = 1;
-        u->resolved->host = url.addrs[0].name;
-
-    } else {
-        u->resolved->host = url.host;
     }
 
+    u->resolved->host = url.host;
     u->resolved->port = (in_port_t) (url.no_port ? port : url.port);
     u->resolved->no_port = url.no_port;
 
@@ -1159,8 +1164,10 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
         /* HEAD was changed to GET to cache response */
         method = u->method;
 
-    } else if (plcf->method.len) {
-        method = plcf->method;
+    } else if (plcf->method) {
+        if (ngx_http_complex_value(r, plcf->method, &method) != NGX_OK) {
+            return NGX_ERROR;
+        }
 
     } else {
         method = r->method_name;
@@ -2797,7 +2804,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
      *     conf->upstream.store_values = NULL;
      *     conf->upstream.ssl_name = NULL;
      *
-     *     conf->method = { 0, NULL };
+     *     conf->method = NULL;
      *     conf->headers_source = NULL;
      *     conf->headers.lengths = NULL;
      *     conf->headers.values = NULL;
@@ -2847,6 +2854,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
 #if (NGX_HTTP_CACHE)
     conf->upstream.cache = NGX_CONF_UNSET;
     conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
+    conf->upstream.cache_max_range_offset = NGX_CONF_UNSET;
     conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR;
     conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
     conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
@@ -3108,6 +3116,10 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
                               prev->upstream.cache_min_uses, 1);
 
+    ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
+                              prev->upstream.cache_max_range_offset,
+                              NGX_MAX_OFF_T_VALUE);
+
     ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
                               prev->upstream.cache_use_stale,
                               (NGX_CONF_BITMASK_SET
@@ -3158,7 +3170,9 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #endif
 
-    ngx_conf_merge_str_value(conf->method, prev->method, "");
+    if (conf->method == NULL) {
+        conf->method = prev->method;
+    }
 
     ngx_conf_merge_value(conf->upstream.pass_request_headers,
                               prev->upstream.pass_request_headers, 1);
@@ -3357,6 +3371,20 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #endif
 
+    /*
+     * special handling to preserve conf->headers in the "http" section
+     * to inherit it to all servers
+     */
+
+    if (prev->headers.hash.buckets == NULL
+        && conf->headers_source == prev->headers_source)
+    {
+        prev->headers = conf->headers;
+#if (NGX_HTTP_CACHE)
+        prev->headers_cache = conf->headers_cache;
+#endif
+    }
+
     return NGX_CONF_OK;
 }
 
@@ -3392,14 +3420,6 @@ ngx_http_proxy_init_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
         return NGX_ERROR;
     }
 
-    if (conf->headers_source == NULL) {
-        conf->headers_source = ngx_array_create(cf->pool, 4,
-                                                sizeof(ngx_keyval_t));
-        if (conf->headers_source == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
     headers->lengths = ngx_array_create(cf->pool, 64, 1);
     if (headers->lengths == NULL) {
         return NGX_ERROR;
@@ -3410,15 +3430,18 @@ ngx_http_proxy_init_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
         return NGX_ERROR;
     }
 
-    src = conf->headers_source->elts;
-    for (i = 0; i < conf->headers_source->nelts; i++) {
+    if (conf->headers_source) {
 
-        s = ngx_array_push(&headers_merged);
-        if (s == NULL) {
-            return NGX_ERROR;
+        src = conf->headers_source->elts;
+        for (i = 0; i < conf->headers_source->nelts; i++) {
+
+            s = ngx_array_push(&headers_merged);
+            if (s == NULL) {
+                return NGX_ERROR;
+            }
+
+            *s = src[i];
         }
-
-        *s = src[i];
     }
 
     h = default_headers;
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index 095ef06..951a00d 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -224,12 +224,6 @@ parse:
 
     ctx->offset = r->headers_out.content_offset;
 
-    if (ngx_array_init(&ctx->ranges, r->pool, 1, sizeof(ngx_http_range_t))
-        != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
     ranges = r->single_range ? 1 : clcf->max_ranges;
 
     switch (ngx_http_range_parse(r, ctx, ranges)) {
@@ -291,6 +285,12 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
         }
     }
 
+    if (ngx_array_init(&ctx->ranges, r->pool, 1, sizeof(ngx_http_range_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     p = r->headers_in.range->value.data + 6;
     size = 0;
     content_length = r->headers_out.content_length_n;
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 36656ec..aa84a3d 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -270,6 +270,13 @@ static ngx_command_t ngx_http_scgi_commands[] = {
       offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_min_uses),
       NULL },
 
+    { ngx_string("scgi_cache_max_range_offset"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_off_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_max_range_offset),
+      NULL },
+
     { ngx_string("scgi_cache_use_stale"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
       ngx_conf_set_bitmask_slot,
@@ -562,16 +569,14 @@ ngx_http_scgi_eval(ngx_http_request_t *r, ngx_http_scgi_loc_conf_t * scf)
         return NGX_ERROR;
     }
 
-    if (url.addrs && url.addrs[0].sockaddr) {
+    if (url.addrs) {
         u->resolved->sockaddr = url.addrs[0].sockaddr;
         u->resolved->socklen = url.addrs[0].socklen;
+        u->resolved->name = url.addrs[0].name;
         u->resolved->naddrs = 1;
-        u->resolved->host = url.addrs[0].name;
-
-    } else {
-        u->resolved->host = url.host;
     }
 
+    u->resolved->host = url.host;
     u->resolved->port = url.port;
     u->resolved->no_port = url.no_port;
 
@@ -1206,6 +1211,7 @@ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf)
 #if (NGX_HTTP_CACHE)
     conf->upstream.cache = NGX_CONF_UNSET;
     conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
+    conf->upstream.cache_max_range_offset = NGX_CONF_UNSET;
     conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR;
     conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
     conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
@@ -1446,6 +1452,10 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
                               prev->upstream.cache_min_uses, 1);
 
+    ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
+                              prev->upstream.cache_max_range_offset,
+                              NGX_MAX_OFF_T_VALUE);
+
     ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
                               prev->upstream.cache_use_stale,
                               (NGX_CONF_BITMASK_SET
@@ -1558,6 +1568,20 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #endif
 
+    /*
+     * special handling to preserve conf->params in the "http" section
+     * to inherit it to all servers
+     */
+
+    if (prev->params.hash.buckets == NULL
+        && conf->params_source == prev->params_source)
+    {
+        prev->params = conf->params;
+#if (NGX_HTTP_CACHE)
+        prev->params_cache = conf->params_cache;
+#endif
+    }
+
     return NGX_CONF_OK;
 }
 
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index d685ae9..e75f5d8 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -298,6 +298,12 @@ static ngx_http_variable_t  ngx_http_ssl_vars[] = {
     { ngx_string("ssl_client_i_dn"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_issuer_dn, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_client_s_dn_legacy"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_subject_dn_legacy, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_i_dn_legacy"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_issuer_dn_legacy, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_client_serial"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_serial_number, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 7f916e8..b9c8dba 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -330,6 +330,13 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
       offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_min_uses),
       NULL },
 
+    { ngx_string("uwsgi_cache_max_range_offset"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_off_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_max_range_offset),
+      NULL },
+
     { ngx_string("uwsgi_cache_use_stale"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
       ngx_conf_set_bitmask_slot,
@@ -764,16 +771,14 @@ ngx_http_uwsgi_eval(ngx_http_request_t *r, ngx_http_uwsgi_loc_conf_t * uwcf)
         return NGX_ERROR;
     }
 
-    if (url.addrs && url.addrs[0].sockaddr) {
+    if (url.addrs) {
         u->resolved->sockaddr = url.addrs[0].sockaddr;
         u->resolved->socklen = url.addrs[0].socklen;
+        u->resolved->name = url.addrs[0].name;
         u->resolved->naddrs = 1;
-        u->resolved->host = url.addrs[0].name;
-
-    } else {
-        u->resolved->host = url.host;
     }
 
+    u->resolved->host = url.host;
     u->resolved->port = url.port;
     u->resolved->no_port = url.no_port;
 
@@ -1412,6 +1417,7 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
 #if (NGX_HTTP_CACHE)
     conf->upstream.cache = NGX_CONF_UNSET;
     conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
+    conf->upstream.cache_max_range_offset = NGX_CONF_UNSET;
     conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR;
     conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
     conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
@@ -1660,6 +1666,10 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
                               prev->upstream.cache_min_uses, 1);
 
+    ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
+                              prev->upstream.cache_max_range_offset,
+                              NGX_MAX_OFF_T_VALUE);
+
     ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
                               prev->upstream.cache_use_stale,
                               (NGX_CONF_BITMASK_SET
@@ -1820,6 +1830,20 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #endif
 
+    /*
+     * special handling to preserve conf->params in the "http" section
+     * to inherit it to all servers
+     */
+
+    if (prev->params.hash.buckets == NULL
+        && conf->params_source == prev->params_source)
+    {
+        prev->params = conf->params;
+#if (NGX_HTTP_CACHE)
+        prev->params_cache = conf->params_cache;
+#endif
+    }
+
     return NGX_CONF_OK;
 }
 
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index 6a8894c..f9a9a84 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -410,7 +410,7 @@ ngx_http_perl_ssi(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ssi_ctx,
 
     args = &params[NGX_HTTP_PERL_SSI_ARG];
 
-    if (args) {
+    if (args[0]) {
 
         for (i = 0; args[i]; i++) { /* void */ }
 
diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h
index 70342d0..4075f3d 100644
--- a/src/http/ngx_http_cache.h
+++ b/src/http/ngx_http_cache.h
@@ -151,7 +151,6 @@ struct ngx_http_file_cache_s {
     ngx_slab_pool_t                 *shpool;
 
     ngx_path_t                      *path;
-    ngx_path_t                      *temp_path;
 
     off_t                            max_size;
     size_t                           bsize;
@@ -171,6 +170,9 @@ struct ngx_http_file_cache_s {
     ngx_msec_t                       manager_threshold;
 
     ngx_shm_zone_t                  *shm_zone;
+
+    ngx_uint_t                       use_temp_path;
+                                     /* unsigned use_temp_path:1 */
 };
 
 
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 9da5d10..4e37cec 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -4827,8 +4827,6 @@ ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 case NGX_HTTPS_CERT_ERROR:
                 case NGX_HTTPS_NO_CERT:
                     err->overwrite = NGX_HTTP_BAD_REQUEST;
-                default:
-                    break;
             }
         }
 
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 199a901..3c8ad7d 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1920,17 +1920,18 @@ ngx_http_file_cache_manager(void *data)
     ngx_http_file_cache_t  *cache = data;
 
     off_t       size;
-    time_t      next, wait;
-    ngx_msec_t  elapsed;
+    time_t      wait;
+    ngx_msec_t  elapsed, next;
     ngx_uint_t  count, watermark;
 
     cache->last = ngx_current_msec;
     cache->files = 0;
 
-    next = ngx_http_file_cache_expire(cache);
+    next = (ngx_msec_t) ngx_http_file_cache_expire(cache) * 1000;
 
     if (next == 0) {
-        return cache->manager_sleep;
+        next = cache->manager_sleep;
+        goto done;
     }
 
     for ( ;; ) {
@@ -1947,21 +1948,23 @@ ngx_http_file_cache_manager(void *data)
                        size, count, (ngx_int_t) watermark);
 
         if (size < cache->max_size && count < watermark) {
-            return (ngx_msec_t) next * 1000;
+            break;
         }
 
         wait = ngx_http_file_cache_forced_expire(cache);
 
         if (wait > 0) {
-            return (ngx_msec_t) wait * 1000;
+            next = (ngx_msec_t) wait * 1000;
+            break;
         }
 
         if (ngx_quit || ngx_terminate) {
-            return (ngx_msec_t) next * 1000;
+            break;
         }
 
         if (++cache->files >= cache->manager_files) {
-            return cache->manager_sleep;
+            next = cache->manager_sleep;
+            break;
         }
 
         ngx_time_update();
@@ -1969,9 +1972,20 @@ ngx_http_file_cache_manager(void *data)
         elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last));
 
         if (elapsed >= cache->manager_threshold) {
-            return cache->manager_sleep;
+            next = cache->manager_sleep;
+            break;
         }
     }
+
+done:
+
+    elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last));
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "http file cache manager: %ui e:%M n:%M",
+                   cache->files, elapsed, next);
+
+    return next;
 }
 
 
@@ -2098,6 +2112,17 @@ ngx_http_file_cache_add_file(ngx_tree_ctx_t *ctx, ngx_str_t *name)
         return NGX_ERROR;
     }
 
+    /*
+     * Temporary files in cache have a suffix consisting of a dot
+     * followed by 10 digits.
+     */
+
+    if (name->len >= 2 * NGX_HTTP_CACHE_KEY_LEN + 1 + 10
+        && name->data[name->len - 10 - 1] == '.')
+    {
+        return NGX_OK;
+    }
+
     if (ctx->size < (off_t) sizeof(ngx_http_file_cache_header_t)) {
         ngx_log_error(NGX_LOG_CRIT, ctx->log, 0,
                       "cache file \"%s\" is too small", name->data);
@@ -2242,7 +2267,6 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     off_t                   max_size;
     u_char                 *last, *p;
     time_t                  inactive;
-    size_t                  len;
     ssize_t                 size;
     ngx_str_t               s, name, *value;
     ngx_int_t               loader_files, manager_files;
@@ -2515,37 +2539,6 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    if (!use_temp_path) {
-        cache->temp_path = ngx_pcalloc(cf->pool, sizeof(ngx_path_t));
-        if (cache->temp_path == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        len = cache->path->name.len + sizeof("/temp") - 1;
-
-        p = ngx_pnalloc(cf->pool, len + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        cache->temp_path->name.len = len;
-        cache->temp_path->name.data = p;
-
-        p = ngx_cpymem(p, cache->path->name.data, cache->path->name.len);
-        ngx_memcpy(p, "/temp", sizeof("/temp"));
-
-        ngx_memcpy(&cache->temp_path->level, &cache->path->level,
-                   NGX_MAX_PATH_LEVEL * sizeof(size_t));
-
-        cache->temp_path->len = cache->path->len;
-        cache->temp_path->conf_file = cf->conf_file->file.name.data;
-        cache->temp_path->line = cf->conf_file->line;
-
-        if (ngx_add_path(cf, &cache->temp_path) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
     cache->shm_zone = ngx_shared_memory_add(cf, &name, size, cmd->post);
     if (cache->shm_zone == NULL) {
         return NGX_CONF_ERROR;
@@ -2561,6 +2554,8 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     cache->shm_zone->init = ngx_http_file_cache_init;
     cache->shm_zone->data = cache;
 
+    cache->use_temp_path = use_temp_path;
+
     cache->inactive = inactive;
     cache->max_size = max_size;
 
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 7692f80..d4c39ff 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -473,7 +473,6 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
             case NGX_HTTPS_NO_CERT:
             case NGX_HTTP_REQUEST_HEADER_TOO_LARGE:
                 r->err_status = NGX_HTTP_BAD_REQUEST;
-                break;
         }
 
     } else {
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index ceb798f..ed25f43 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -17,6 +17,8 @@ static ngx_int_t ngx_http_upstream_cache_get(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_http_file_cache_t **cache);
 static ngx_int_t ngx_http_upstream_cache_send(ngx_http_request_t *r,
     ngx_http_upstream_t *u);
+static ngx_int_t ngx_http_upstream_cache_check_range(ngx_http_request_t *r,
+    ngx_http_upstream_t *u);
 static ngx_int_t ngx_http_upstream_cache_status(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_upstream_cache_last_modified(ngx_http_request_t *r,
@@ -654,6 +656,23 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
 
         host = &u->resolved->host;
 
+        umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
+
+        uscfp = umcf->upstreams.elts;
+
+        for (i = 0; i < umcf->upstreams.nelts; i++) {
+
+            uscf = uscfp[i];
+
+            if (uscf->host.len == host->len
+                && ((uscf->port == 0 && u->resolved->no_port)
+                     || uscf->port == u->resolved->port)
+                && ngx_strncasecmp(uscf->host.data, host->data, host->len) == 0)
+            {
+                goto found;
+            }
+        }
+
         if (u->resolved->sockaddr) {
 
             if (u->resolved->port == 0
@@ -679,23 +698,6 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
             return;
         }
 
-        umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
-
-        uscfp = umcf->upstreams.elts;
-
-        for (i = 0; i < umcf->upstreams.nelts; i++) {
-
-            uscf = uscfp[i];
-
-            if (uscf->host.len == host->len
-                && ((uscf->port == 0 && u->resolved->no_port)
-                     || uscf->port == u->resolved->port)
-                && ngx_strncasecmp(uscf->host.data, host->data, host->len) == 0)
-            {
-                goto found;
-            }
-        }
-
         if (u->resolved->port == 0) {
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                           "no port in upstream \"%V\"", host);
@@ -922,6 +924,10 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
         return rc;
     }
 
+    if (ngx_http_upstream_cache_check_range(r, u) == NGX_DECLINED) {
+        u->cacheable = 0;
+    }
+
     r->cached = 0;
 
     return NGX_DECLINED;
@@ -1023,6 +1029,55 @@ ngx_http_upstream_cache_send(ngx_http_request_t *r, ngx_http_upstream_t *u)
     return rc;
 }
 
+
+static ngx_int_t
+ngx_http_upstream_cache_check_range(ngx_http_request_t *r,
+    ngx_http_upstream_t *u)
+{
+    off_t             offset;
+    u_char           *p, *start;
+    ngx_table_elt_t  *h;
+
+    h = r->headers_in.range;
+
+    if (h == NULL
+        || !u->cacheable
+        || u->conf->cache_max_range_offset == NGX_MAX_OFF_T_VALUE)
+    {
+        return NGX_OK;
+    }
+
+    if (u->conf->cache_max_range_offset == 0) {
+        return NGX_DECLINED;
+    }
+
+    if (h->value.len < 7
+        || ngx_strncasecmp(h->value.data, (u_char *) "bytes=", 6) != 0)
+    {
+        return NGX_OK;
+    }
+
+    p = h->value.data + 6;
+
+    while (*p == ' ') { p++; }
+
+    if (*p == '-') {
+        return NGX_DECLINED;
+    }
+
+    start = p;
+
+    while (*p >= '0' && *p <= '9') { p++; }
+
+    offset = ngx_atoof(start, p - start);
+
+    if (offset >= u->conf->cache_max_range_offset) {
+        return NGX_DECLINED;
+    }
+
+    return NGX_OK;
+}
+
 #endif
 
 
@@ -1611,6 +1666,13 @@ ngx_http_upstream_ssl_handshake(ngx_connection_t *c)
         return;
     }
 
+    if (c->write->timedout) {
+        c = r->connection;
+        ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT);
+        ngx_http_run_posted_requests(c);
+        return;
+    }
+
 failed:
 
     c = r->connection;
@@ -1696,7 +1758,10 @@ ngx_http_upstream_ssl_name(ngx_http_request_t *r, ngx_http_upstream_t *u,
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "upstream SSL server name: \"%s\"", name.data);
 
-    if (SSL_set_tlsext_host_name(c->ssl->connection, name.data) == 0) {
+    if (SSL_set_tlsext_host_name(c->ssl->connection,
+                                 (char *) name.data)
+        == 0)
+    {
         ngx_ssl_error(NGX_LOG_ERR, r->connection->log, 0,
                       "SSL_set_tlsext_host_name(\"%s\") failed", name.data);
         return NGX_ERROR;
@@ -2702,6 +2767,15 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
     u->header_sent = 1;
 
     if (u->upgrade) {
+
+#if (NGX_HTTP_CACHE)
+
+        if (r->cache) {
+            ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
+        }
+
+#endif
+
         ngx_http_upstream_upgrade(r, u);
         return;
     }
@@ -2732,6 +2806,14 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     if (!u->buffering) {
 
+#if (NGX_HTTP_CACHE)
+
+        if (r->cache) {
+            ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
+        }
+
+#endif
+
         if (u->input_filter == NULL) {
             u->input_filter_init = ngx_http_upstream_non_buffered_filter_init;
             u->input_filter = ngx_http_upstream_non_buffered_filter;
@@ -2922,8 +3004,9 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
         p->temp_file->persistent = 1;
 
 #if (NGX_HTTP_CACHE)
-        if (r->cache && r->cache->file_cache->temp_path) {
-            p->temp_file->path = r->cache->file_cache->temp_path;
+        if (r->cache && !r->cache->file_cache->use_temp_path) {
+            p->temp_file->path = r->cache->file_cache->path;
+            p->temp_file->file.name = r->cache->file.name;
         }
 #endif
 
@@ -5757,14 +5840,9 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
             continue;
         }
 
-        if (uscfp[i]->default_port && u->default_port
-            && uscfp[i]->default_port != u->default_port)
-        {
-            continue;
-        }
-
         if (flags & NGX_HTTP_UPSTREAM_CREATE) {
             uscfp[i]->flags = flags;
+            uscfp[i]->port = 0;
         }
 
         return uscfp[i];
@@ -5780,7 +5858,6 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
     uscf->file_name = cf->conf_file->file.name.data;
     uscf->line = cf->conf_file->line;
     uscf->port = u->port;
-    uscf->default_port = u->default_port;
     uscf->no_port = u->no_port;
 
     if (u->naddrs == 1 && (u->port || u->family == AF_UNIX)) {
@@ -6021,12 +6098,7 @@ ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf,
 
         conf->hide_headers_hash = prev->hide_headers_hash;
 
-        if (conf->hide_headers_hash.buckets
-#if (NGX_HTTP_CACHE)
-            && ((conf->cache == 0) == (prev->cache == 0))
-#endif
-           )
-        {
+        if (conf->hide_headers_hash.buckets) {
             return NGX_OK;
         }
 
@@ -6111,7 +6183,23 @@ ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf,
     hash->pool = cf->pool;
     hash->temp_pool = NULL;
 
-    return ngx_hash_init(hash, hide_headers.elts, hide_headers.nelts);
+    if (ngx_hash_init(hash, hide_headers.elts, hide_headers.nelts) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    /*
+     * special handling to preserve conf->hide_headers_hash
+     * in the "http" section to inherit it to all servers
+     */
+
+    if (prev->hide_headers_hash.buckets == NULL
+        && conf->hide_headers == prev->hide_headers
+        && conf->pass_headers == prev->pass_headers)
+    {
+        prev->hide_headers_hash = conf->hide_headers_hash;
+    }
+
+    return NGX_OK;
 }
 
 
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 3d521f2..7390f2e 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -128,7 +128,6 @@ struct ngx_http_upstream_srv_conf_s {
     u_char                          *file_name;
     ngx_uint_t                       line;
     in_port_t                        port;
-    in_port_t                        default_port;
     ngx_uint_t                       no_port;  /* unsigned no_port:1 */
 
 #if (NGX_HTTP_UPSTREAM_ZONE)
@@ -199,6 +198,8 @@ typedef struct {
     ngx_uint_t                       cache_use_stale;
     ngx_uint_t                       cache_methods;
 
+    off_t                            cache_max_range_offset;
+
     ngx_flag_t                       cache_lock;
     ngx_msec_t                       cache_lock_timeout;
     ngx_msec_t                       cache_lock_age;
@@ -300,6 +301,7 @@ typedef struct {
 
     struct sockaddr                 *sockaddr;
     socklen_t                        socklen;
+    ngx_str_t                        name;
 
     ngx_resolver_ctx_t              *ctx;
 } ngx_http_upstream_resolved_t;
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index 0137bf6..f6051ae 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -337,7 +337,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
     if (ur->sockaddr) {
         peer[0].sockaddr = ur->sockaddr;
         peer[0].socklen = ur->socklen;
-        peer[0].name = ur->host;
+        peer[0].name = ur->name.data ? ur->name : ur->host;
         peer[0].weight = 1;
         peer[0].effective_weight = 1;
         peer[0].current_weight = 0;
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 235092b..8301630 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -136,6 +136,8 @@ static ngx_int_t ngx_http_v2_send_window_update(ngx_http_v2_connection_t *h2c,
     ngx_uint_t sid, size_t window);
 static ngx_int_t ngx_http_v2_send_rst_stream(ngx_http_v2_connection_t *h2c,
     ngx_uint_t sid, ngx_uint_t status);
+static ngx_int_t ngx_http_v2_send_goaway(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t status);
 
 static ngx_http_v2_out_frame_t *ngx_http_v2_get_frame(
     ngx_http_v2_connection_t *h2c, size_t length, ngx_uint_t type,
@@ -293,6 +295,8 @@ ngx_http_v2_init(ngx_event_t *rev)
     rev->handler = ngx_http_v2_read_handler;
     c->write->handler = ngx_http_v2_write_handler;
 
+    c->idle = 1;
+
     ngx_http_v2_read_handler(rev);
 }
 
@@ -320,6 +324,30 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
 
     h2c->blocked = 1;
 
+    if (c->close) {
+        c->close = 0;
+
+        if (!h2c->goaway) {
+            h2c->goaway = 1;
+
+            if (ngx_http_v2_send_goaway(h2c, NGX_HTTP_V2_NO_ERROR)
+                == NGX_ERROR)
+            {
+                ngx_http_v2_finalize_connection(h2c, 0);
+                return;
+            }
+
+            if (ngx_http_v2_send_output_queue(h2c) == NGX_ERROR) {
+                ngx_http_v2_finalize_connection(h2c, 0);
+                return;
+            }
+        }
+
+        h2c->blocked = 0;
+
+        return;
+    }
+
     h2mcf = ngx_http_get_module_main_conf(h2c->http_connection->conf_ctx,
                                           ngx_http_v2_module);
 
@@ -633,6 +661,11 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
         /* rc == NGX_OK */
     }
 
+    if (h2c->goaway) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
                                          ngx_http_v2_module);
     if (h2c->state.incomplete) {
@@ -640,11 +673,6 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
         return;
     }
 
-    if (ngx_terminate || ngx_exiting) {
-        ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
-        return;
-    }
-
     ngx_destroy_pool(h2c->pool);
 
     h2c->pool = NULL;
@@ -658,7 +686,6 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
 #endif
 
     c->destroyed = 1;
-    c->idle = 1;
     ngx_reusable_connection(c, 1);
 
     c->write->handler = ngx_http_empty_handler;
@@ -1027,6 +1054,12 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
     }
 
+    if (h2c->goaway) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "skipping http2 HEADERS frame");
+        return ngx_http_v2_state_skip(h2c, pos, end);
+    }
+
     if ((size_t) (end - pos) < size) {
         return ngx_http_v2_state_save(h2c, pos, end,
                                       ngx_http_v2_state_headers);
@@ -1149,6 +1182,15 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         ngx_http_v2_set_dependency(h2c, node, depend, excl);
     }
 
+    if (h2c->connection->requests >= h2scf->max_requests) {
+        h2c->goaway = 1;
+
+        if (ngx_http_v2_send_goaway(h2c, NGX_HTTP_V2_NO_ERROR) == NGX_ERROR) {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+    }
+
     return ngx_http_v2_state_header_block(h2c, pos, end);
 
 rst_stream:
@@ -2550,7 +2592,7 @@ ngx_http_v2_send_rst_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t sid,
     ngx_http_v2_out_frame_t  *frame;
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 send RST_STREAM frame sid:%ui, status:%uz",
+                   "http2 send RST_STREAM frame sid:%ui, status:%ui",
                    sid, status);
 
     frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_RST_STREAM_SIZE,
@@ -2576,8 +2618,9 @@ ngx_http_v2_send_goaway(ngx_http_v2_connection_t *h2c, ngx_uint_t status)
     ngx_buf_t                *buf;
     ngx_http_v2_out_frame_t  *frame;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 send GOAWAY frame, status:%uz", status);
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 send GOAWAY frame: last sid %ui, error %ui",
+                   h2c->last_sid, status);
 
     frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_GOAWAY_SIZE,
                                   NGX_HTTP_V2_GOAWAY_FRAME,
@@ -4162,7 +4205,6 @@ ngx_http_v2_idle_handler(ngx_event_t *rev)
 #endif
 
     c->destroyed = 0;
-    c->idle = 0;
     ngx_reusable_connection(c, 0);
 
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@@ -4197,8 +4239,10 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     h2c->blocked = 1;
 
-    if (!c->error && ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) {
-        (void) ngx_http_v2_send_output_queue(h2c);
+    if (!c->error && !h2c->goaway) {
+        if (ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) {
+            (void) ngx_http_v2_send_output_queue(h2c);
+        }
     }
 
     c->error = 1;
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index d712d38..63bbdad 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -146,6 +146,7 @@ struct ngx_http_v2_connection_s {
     unsigned                         closed_nodes:8;
     unsigned                         settings_ack:1;
     unsigned                         blocked:1;
+    unsigned                         goaway:1;
 };
 
 
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 4ab7791..878020e 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -1079,6 +1079,10 @@ static ngx_inline ngx_int_t
 ngx_http_v2_flow_control(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream)
 {
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2:%ui available windows: conn:%uz stream:%z",
+                   stream->node->id, h2c->send_window, stream->send_window);
+
     if (stream->send_window <= 0) {
         stream->exhausted = 1;
         return NGX_DECLINED;
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
index b7d99e0..032abcb 100644
--- a/src/http/v2/ngx_http_v2_module.c
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -73,6 +73,13 @@ static ngx_command_t  ngx_http_v2_commands[] = {
       offsetof(ngx_http_v2_srv_conf_t, concurrent_streams),
       NULL },
 
+    { ngx_string("http2_max_requests"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, max_requests),
+      NULL },
+
     { ngx_string("http2_max_field_size"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_size_slot,
@@ -322,6 +329,7 @@ ngx_http_v2_create_srv_conf(ngx_conf_t *cf)
     h2scf->pool_size = NGX_CONF_UNSET_SIZE;
 
     h2scf->concurrent_streams = NGX_CONF_UNSET_UINT;
+    h2scf->max_requests = NGX_CONF_UNSET_UINT;
 
     h2scf->max_field_size = NGX_CONF_UNSET_SIZE;
     h2scf->max_header_size = NGX_CONF_UNSET_SIZE;
@@ -347,6 +355,7 @@ ngx_http_v2_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_uint_value(conf->concurrent_streams,
                               prev->concurrent_streams, 128);
+    ngx_conf_merge_uint_value(conf->max_requests, prev->max_requests, 1000);
 
     ngx_conf_merge_size_value(conf->max_field_size, prev->max_field_size,
                               4096);
diff --git a/src/http/v2/ngx_http_v2_module.h b/src/http/v2/ngx_http_v2_module.h
index 91f97c2..540f826 100644
--- a/src/http/v2/ngx_http_v2_module.h
+++ b/src/http/v2/ngx_http_v2_module.h
@@ -23,6 +23,7 @@ typedef struct {
 typedef struct {
     size_t                          pool_size;
     ngx_uint_t                      concurrent_streams;
+    ngx_uint_t                      max_requests;
     size_t                          max_field_size;
     size_t                          max_header_size;
     size_t                          preread_size;
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index c30af35..6002508 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -132,7 +132,8 @@ typedef enum {
     ngx_pop3_auth_login_username,
     ngx_pop3_auth_login_password,
     ngx_pop3_auth_plain,
-    ngx_pop3_auth_cram_md5
+    ngx_pop3_auth_cram_md5,
+    ngx_pop3_auth_external
 } ngx_pop3_state_e;
 
 
@@ -142,6 +143,7 @@ typedef enum {
     ngx_imap_auth_login_password,
     ngx_imap_auth_plain,
     ngx_imap_auth_cram_md5,
+    ngx_imap_auth_external,
     ngx_imap_login,
     ngx_imap_user,
     ngx_imap_passwd
@@ -154,6 +156,7 @@ typedef enum {
     ngx_smtp_auth_login_password,
     ngx_smtp_auth_plain,
     ngx_smtp_auth_cram_md5,
+    ngx_smtp_auth_external,
     ngx_smtp_helo,
     ngx_smtp_helo_xclient,
     ngx_smtp_helo_from,
@@ -285,14 +288,16 @@ typedef struct {
 #define NGX_MAIL_AUTH_LOGIN_USERNAME    2
 #define NGX_MAIL_AUTH_APOP              3
 #define NGX_MAIL_AUTH_CRAM_MD5          4
-#define NGX_MAIL_AUTH_NONE              5
+#define NGX_MAIL_AUTH_EXTERNAL          5
+#define NGX_MAIL_AUTH_NONE              6
 
 
 #define NGX_MAIL_AUTH_PLAIN_ENABLED     0x0002
 #define NGX_MAIL_AUTH_LOGIN_ENABLED     0x0004
 #define NGX_MAIL_AUTH_APOP_ENABLED      0x0008
 #define NGX_MAIL_AUTH_CRAM_MD5_ENABLED  0x0010
-#define NGX_MAIL_AUTH_NONE_ENABLED      0x0020
+#define NGX_MAIL_AUTH_EXTERNAL_ENABLED  0x0020
+#define NGX_MAIL_AUTH_NONE_ENABLED      0x0040
 
 
 #define NGX_MAIL_PARSE_INVALID_COMMAND  20
@@ -377,6 +382,8 @@ ngx_int_t ngx_mail_auth_login_password(ngx_mail_session_t *s,
 ngx_int_t ngx_mail_auth_cram_md5_salt(ngx_mail_session_t *s,
     ngx_connection_t *c, char *prefix, size_t len);
 ngx_int_t ngx_mail_auth_cram_md5(ngx_mail_session_t *s, ngx_connection_t *c);
+ngx_int_t ngx_mail_auth_external(ngx_mail_session_t *s, ngx_connection_t *c,
+    ngx_uint_t n);
 ngx_int_t ngx_mail_auth_parse(ngx_mail_session_t *s, ngx_connection_t *c);
 
 void ngx_mail_send(ngx_event_t *wev);
diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c
index a94434a..6b57358 100644
--- a/src/mail/ngx_mail_auth_http_module.c
+++ b/src/mail/ngx_mail_auth_http_module.c
@@ -151,6 +151,7 @@ static ngx_str_t   ngx_mail_auth_http_method[] = {
     ngx_string("plain"),
     ngx_string("apop"),
     ngx_string("cram-md5"),
+    ngx_string("external"),
     ngx_string("none")
 };
 
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 901bb8f..9d4ef56 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -612,6 +612,40 @@ ngx_mail_auth_cram_md5(ngx_mail_session_t *s, ngx_connection_t *c)
 }
 
 
+ngx_int_t
+ngx_mail_auth_external(ngx_mail_session_t *s, ngx_connection_t *c,
+    ngx_uint_t n)
+{
+    ngx_str_t  *arg, external;
+
+    arg = s->args.elts;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
+                   "mail auth external: \"%V\"", &arg[n]);
+
+    external.data = ngx_pnalloc(c->pool, ngx_base64_decoded_length(arg[n].len));
+    if (external.data == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_decode_base64(&external, &arg[n]) != NGX_OK) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+            "client sent invalid base64 encoding in AUTH EXTERNAL command");
+        return NGX_MAIL_PARSE_INVALID_COMMAND;
+    }
+
+    s->login.len = external.len;
+    s->login.data = external.data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
+                   "mail auth external: \"%V\"", &s->login);
+
+    s->auth_method = NGX_MAIL_AUTH_EXTERNAL;
+
+    return NGX_DONE;
+}
+
+
 void
 ngx_mail_send(ngx_event_t *wev)
 {
diff --git a/src/mail/ngx_mail_imap_handler.c b/src/mail/ngx_mail_imap_handler.c
index 57e2fb7..1c54457 100644
--- a/src/mail/ngx_mail_imap_handler.c
+++ b/src/mail/ngx_mail_imap_handler.c
@@ -222,6 +222,10 @@ ngx_mail_imap_auth_state(ngx_event_t *rev)
         case ngx_imap_auth_cram_md5:
             rc = ngx_mail_auth_cram_md5(s, c);
             break;
+
+        case ngx_imap_auth_external:
+            rc = ngx_mail_auth_external(s, c, 0);
+            break;
         }
 
     } else if (rc == NGX_IMAP_NEXT) {
@@ -399,6 +403,13 @@ ngx_mail_imap_authenticate(ngx_mail_session_t *s, ngx_connection_t *c)
         }
 
         return NGX_ERROR;
+
+    case NGX_MAIL_AUTH_EXTERNAL:
+
+        ngx_str_set(&s->out, imap_username);
+        s->mail_state = ngx_imap_auth_external;
+
+        return NGX_OK;
     }
 
     return rc;
diff --git a/src/mail/ngx_mail_imap_module.c b/src/mail/ngx_mail_imap_module.c
index d281070..1f187fd 100644
--- a/src/mail/ngx_mail_imap_module.c
+++ b/src/mail/ngx_mail_imap_module.c
@@ -29,6 +29,7 @@ static ngx_conf_bitmask_t  ngx_mail_imap_auth_methods[] = {
     { ngx_string("plain"), NGX_MAIL_AUTH_PLAIN_ENABLED },
     { ngx_string("login"), NGX_MAIL_AUTH_LOGIN_ENABLED },
     { ngx_string("cram-md5"), NGX_MAIL_AUTH_CRAM_MD5_ENABLED },
+    { ngx_string("external"), NGX_MAIL_AUTH_EXTERNAL_ENABLED },
     { ngx_null_string, 0 }
 };
 
@@ -38,6 +39,7 @@ static ngx_str_t  ngx_mail_imap_auth_methods_names[] = {
     ngx_string("AUTH=LOGIN"),
     ngx_null_string,  /* APOP */
     ngx_string("AUTH=CRAM-MD5"),
+    ngx_string("AUTH=EXTERNAL"),
     ngx_null_string   /* NONE */
 };
 
@@ -179,7 +181,7 @@ ngx_mail_imap_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     }
 
     for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0;
-         m <= NGX_MAIL_AUTH_CRAM_MD5_ENABLED;
+         m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
          m <<= 1, i++)
     {
         if (m & conf->auth_methods) {
@@ -205,7 +207,7 @@ ngx_mail_imap_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     auth = p;
 
     for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0;
-         m <= NGX_MAIL_AUTH_CRAM_MD5_ENABLED;
+         m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
          m <<= 1, i++)
     {
         if (m & conf->auth_methods) {
diff --git a/src/mail/ngx_mail_parse.c b/src/mail/ngx_mail_parse.c
index b158f5a..2c2cdff 100644
--- a/src/mail/ngx_mail_parse.c
+++ b/src/mail/ngx_mail_parse.c
@@ -905,13 +905,27 @@ ngx_mail_auth_parse(ngx_mail_session_t *s, ngx_connection_t *c)
 
     if (arg[0].len == 8) {
 
-        if (s->args.nelts != 1) {
-            return NGX_MAIL_PARSE_INVALID_COMMAND;
-        }
-
         if (ngx_strncasecmp(arg[0].data, (u_char *) "CRAM-MD5", 8) == 0) {
+
+            if (s->args.nelts != 1) {
+                return NGX_MAIL_PARSE_INVALID_COMMAND;
+            }
+
             return NGX_MAIL_AUTH_CRAM_MD5;
         }
+
+        if (ngx_strncasecmp(arg[0].data, (u_char *) "EXTERNAL", 8) == 0) {
+
+            if (s->args.nelts == 1) {
+                return NGX_MAIL_AUTH_EXTERNAL;
+            }
+
+            if (s->args.nelts == 2) {
+                return ngx_mail_auth_external(s, c, 1);
+            }
+        }
+
+        return NGX_MAIL_PARSE_INVALID_COMMAND;
     }
 
     return NGX_MAIL_PARSE_INVALID_COMMAND;
diff --git a/src/mail/ngx_mail_pop3_handler.c b/src/mail/ngx_mail_pop3_handler.c
index 51bc257..a2d5658 100644
--- a/src/mail/ngx_mail_pop3_handler.c
+++ b/src/mail/ngx_mail_pop3_handler.c
@@ -240,6 +240,10 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev)
         case ngx_pop3_auth_cram_md5:
             rc = ngx_mail_auth_cram_md5(s, c);
             break;
+
+        case ngx_pop3_auth_external:
+            rc = ngx_mail_auth_external(s, c, 0);
+            break;
         }
     }
 
@@ -494,6 +498,13 @@ ngx_mail_pop3_auth(ngx_mail_session_t *s, ngx_connection_t *c)
         }
 
         return NGX_ERROR;
+
+    case NGX_MAIL_AUTH_EXTERNAL:
+
+        ngx_str_set(&s->out, pop3_username);
+        s->mail_state = ngx_pop3_auth_external;
+
+        return NGX_OK;
     }
 
     return rc;
diff --git a/src/mail/ngx_mail_pop3_module.c b/src/mail/ngx_mail_pop3_module.c
index 73f8531..bd60e0a 100644
--- a/src/mail/ngx_mail_pop3_module.c
+++ b/src/mail/ngx_mail_pop3_module.c
@@ -29,23 +29,19 @@ static ngx_conf_bitmask_t  ngx_mail_pop3_auth_methods[] = {
     { ngx_string("plain"), NGX_MAIL_AUTH_PLAIN_ENABLED },
     { ngx_string("apop"), NGX_MAIL_AUTH_APOP_ENABLED },
     { ngx_string("cram-md5"), NGX_MAIL_AUTH_CRAM_MD5_ENABLED },
+    { ngx_string("external"), NGX_MAIL_AUTH_EXTERNAL_ENABLED },
     { ngx_null_string, 0 }
 };
 
 
-static ngx_str_t  ngx_mail_pop3_auth_plain_capability =
-    ngx_string("+OK methods supported:" CRLF
-               "LOGIN" CRLF
-               "PLAIN" CRLF
-               "." CRLF);
-
-
-static ngx_str_t  ngx_mail_pop3_auth_cram_md5_capability =
-    ngx_string("+OK methods supported:" CRLF
-               "LOGIN" CRLF
-               "PLAIN" CRLF
-               "CRAM-MD5" CRLF
-               "." CRLF);
+static ngx_str_t  ngx_mail_pop3_auth_methods_names[] = {
+    ngx_string("PLAIN"),
+    ngx_string("LOGIN"),
+    ngx_null_string,  /* APOP */
+    ngx_string("CRAM-MD5"),
+    ngx_string("EXTERNAL"),
+    ngx_null_string   /* NONE */
+};
 
 
 static ngx_mail_protocol_t  ngx_mail_pop3_protocol = {
@@ -140,13 +136,17 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     u_char      *p;
     size_t       size, stls_only_size;
     ngx_str_t   *c, *d;
-    ngx_uint_t   i;
+    ngx_uint_t   i, m;
 
     ngx_conf_merge_bitmask_value(conf->auth_methods,
                                  prev->auth_methods,
                                  (NGX_CONF_BITMASK_SET
                                   |NGX_MAIL_AUTH_PLAIN_ENABLED));
 
+    if (conf->auth_methods & NGX_MAIL_AUTH_PLAIN_ENABLED) {
+        conf->auth_methods |= NGX_MAIL_AUTH_LOGIN_ENABLED;
+    }
+
     if (conf->capabilities.nelts == 0) {
         conf->capabilities = prev->capabilities;
     }
@@ -179,11 +179,15 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         stls_only_size += c[i].len + sizeof(CRLF) - 1;
     }
 
-    if (conf->auth_methods & NGX_MAIL_AUTH_CRAM_MD5_ENABLED) {
-        size += sizeof("SASL LOGIN PLAIN CRAM-MD5" CRLF) - 1;
+    size += sizeof("SASL") - 1 + sizeof(CRLF) - 1;
 
-    } else {
-        size += sizeof("SASL LOGIN PLAIN" CRLF) - 1;
+    for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0;
+         m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
+         m <<= 1, i++)
+    {
+        if (m & conf->auth_methods) {
+            size += 1 + ngx_mail_pop3_auth_methods_names[i].len;
+        }
     }
 
     p = ngx_pnalloc(cf->pool, size);
@@ -202,15 +206,21 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         *p++ = CR; *p++ = LF;
     }
 
-    if (conf->auth_methods & NGX_MAIL_AUTH_CRAM_MD5_ENABLED) {
-        p = ngx_cpymem(p, "SASL LOGIN PLAIN CRAM-MD5" CRLF,
-                       sizeof("SASL LOGIN PLAIN CRAM-MD5" CRLF) - 1);
+    p = ngx_cpymem(p, "SASL", sizeof("SASL") - 1);
 
-    } else {
-        p = ngx_cpymem(p, "SASL LOGIN PLAIN" CRLF,
-                       sizeof("SASL LOGIN PLAIN" CRLF) - 1);
+    for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0;
+         m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
+         m <<= 1, i++)
+    {
+        if (m & conf->auth_methods) {
+            *p++ = ' ';
+            p = ngx_cpymem(p, ngx_mail_pop3_auth_methods_names[i].data,
+                           ngx_mail_pop3_auth_methods_names[i].len);
+        }
     }
 
+    *p++ = CR; *p++ = LF;
+
     *p++ = '.'; *p++ = CR; *p = LF;
 
 
@@ -231,13 +241,43 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     *p++ = '.'; *p++ = CR; *p = LF;
 
 
-    if (conf->auth_methods & NGX_MAIL_AUTH_CRAM_MD5_ENABLED) {
-        conf->auth_capability = ngx_mail_pop3_auth_cram_md5_capability;
+    size = sizeof("+OK methods supported:" CRLF) - 1
+           + sizeof("." CRLF) - 1;
 
-    } else {
-        conf->auth_capability = ngx_mail_pop3_auth_plain_capability;
+    for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0;
+         m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
+         m <<= 1, i++)
+    {
+        if (m & conf->auth_methods) {
+            size += ngx_mail_pop3_auth_methods_names[i].len
+                    + sizeof(CRLF) - 1;
+        }
     }
 
+    p = ngx_pnalloc(cf->pool, size);
+    if (p == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    conf->auth_capability.data = p;
+    conf->auth_capability.len = size;
+
+    p = ngx_cpymem(p, "+OK methods supported:" CRLF,
+                   sizeof("+OK methods supported:" CRLF) - 1);
+
+    for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0;
+         m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
+         m <<= 1, i++)
+    {
+        if (m & conf->auth_methods) {
+            p = ngx_cpymem(p, ngx_mail_pop3_auth_methods_names[i].data,
+                           ngx_mail_pop3_auth_methods_names[i].len);
+            *p++ = CR; *p++ = LF;
+        }
+    }
+
+    *p++ = '.'; *p++ = CR; *p = LF;
+
 
     p = ngx_pnalloc(cf->pool, stls_only_size);
     if (p == NULL) {
diff --git a/src/mail/ngx_mail_smtp_handler.c b/src/mail/ngx_mail_smtp_handler.c
index 81cc75f..47756c3 100644
--- a/src/mail/ngx_mail_smtp_handler.c
+++ b/src/mail/ngx_mail_smtp_handler.c
@@ -485,6 +485,10 @@ ngx_mail_smtp_auth_state(ngx_event_t *rev)
         case ngx_smtp_auth_cram_md5:
             rc = ngx_mail_auth_cram_md5(s, c);
             break;
+
+        case ngx_smtp_auth_external:
+            rc = ngx_mail_auth_external(s, c, 0);
+            break;
         }
     }
 
@@ -652,6 +656,13 @@ ngx_mail_smtp_auth(ngx_mail_session_t *s, ngx_connection_t *c)
         }
 
         return NGX_ERROR;
+
+    case NGX_MAIL_AUTH_EXTERNAL:
+
+        ngx_str_set(&s->out, smtp_username);
+        s->mail_state = ngx_smtp_auth_external;
+
+        return NGX_OK;
     }
 
     return rc;
diff --git a/src/mail/ngx_mail_smtp_module.c b/src/mail/ngx_mail_smtp_module.c
index d5bb51c..f03bd90 100644
--- a/src/mail/ngx_mail_smtp_module.c
+++ b/src/mail/ngx_mail_smtp_module.c
@@ -21,6 +21,7 @@ static ngx_conf_bitmask_t  ngx_mail_smtp_auth_methods[] = {
     { ngx_string("plain"), NGX_MAIL_AUTH_PLAIN_ENABLED },
     { ngx_string("login"), NGX_MAIL_AUTH_LOGIN_ENABLED },
     { ngx_string("cram-md5"), NGX_MAIL_AUTH_CRAM_MD5_ENABLED },
+    { ngx_string("external"), NGX_MAIL_AUTH_EXTERNAL_ENABLED },
     { ngx_string("none"), NGX_MAIL_AUTH_NONE_ENABLED },
     { ngx_null_string, 0 }
 };
@@ -31,6 +32,7 @@ static ngx_str_t  ngx_mail_smtp_auth_methods_names[] = {
     ngx_string("LOGIN"),
     ngx_null_string,  /* APOP */
     ngx_string("CRAM-MD5"),
+    ngx_string("EXTERNAL"),
     ngx_null_string   /* NONE */
 };
 
@@ -207,7 +209,7 @@ ngx_mail_smtp_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     auth_enabled = 0;
 
     for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0;
-         m <= NGX_MAIL_AUTH_CRAM_MD5_ENABLED;
+         m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
          m <<= 1, i++)
     {
         if (m & conf->auth_methods) {
@@ -250,7 +252,7 @@ ngx_mail_smtp_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         *p++ = 'A'; *p++ = 'U'; *p++ = 'T'; *p++ = 'H';
 
         for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0;
-             m <= NGX_MAIL_AUTH_CRAM_MD5_ENABLED;
+             m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
              m <<= 1, i++)
         {
             if (m & conf->auth_methods) {
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 4231f97..c03b515 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -433,6 +433,23 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
 
         host = &u->resolved->host;
 
+        umcf = ngx_stream_get_module_main_conf(s, ngx_stream_upstream_module);
+
+        uscfp = umcf->upstreams.elts;
+
+        for (i = 0; i < umcf->upstreams.nelts; i++) {
+
+            uscf = uscfp[i];
+
+            if (uscf->host.len == host->len
+                && ((uscf->port == 0 && u->resolved->no_port)
+                     || uscf->port == u->resolved->port)
+                && ngx_strncasecmp(uscf->host.data, host->data, host->len) == 0)
+            {
+                goto found;
+            }
+        }
+
         if (u->resolved->sockaddr) {
 
             if (u->resolved->port == 0
@@ -456,23 +473,6 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
             return;
         }
 
-        umcf = ngx_stream_get_module_main_conf(s, ngx_stream_upstream_module);
-
-        uscfp = umcf->upstreams.elts;
-
-        for (i = 0; i < umcf->upstreams.nelts; i++) {
-
-            uscf = uscfp[i];
-
-            if (uscf->host.len == host->len
-                && ((uscf->port == 0 && u->resolved->no_port)
-                     || uscf->port == u->resolved->port)
-                && ngx_strncasecmp(uscf->host.data, host->data, host->len) == 0)
-            {
-                goto found;
-            }
-        }
-
         if (u->resolved->port == 0) {
             ngx_log_error(NGX_LOG_ERR, c->log, 0,
                           "no port in upstream \"%V\"", host);
@@ -578,16 +578,14 @@ ngx_stream_proxy_eval(ngx_stream_session_t *s,
         return NGX_ERROR;
     }
 
-    if (url.addrs && url.addrs[0].sockaddr) {
+    if (url.addrs) {
         u->resolved->sockaddr = url.addrs[0].sockaddr;
         u->resolved->socklen = url.addrs[0].socklen;
+        u->resolved->name = url.addrs[0].name;
         u->resolved->naddrs = 1;
-        u->resolved->host = url.addrs[0].name;
-
-    } else {
-        u->resolved->host = url.host;
     }
 
+    u->resolved->host = url.host;
     u->resolved->port = url.port;
     u->resolved->no_port = url.no_port;
 
@@ -1183,7 +1181,8 @@ ngx_stream_proxy_ssl_name(ngx_stream_session_t *s)
     ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
                    "upstream SSL server name: \"%s\"", name.data);
 
-    if (SSL_set_tlsext_host_name(u->peer.connection->ssl->connection, name.data)
+    if (SSL_set_tlsext_host_name(u->peer.connection->ssl->connection,
+                                 (char *) name.data)
         == 0)
     {
         ngx_ssl_error(NGX_LOG_ERR, s->connection->log, 0,
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index 764a340..ec75768 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -105,6 +105,7 @@ typedef struct {
 
     struct sockaddr                   *sockaddr;
     socklen_t                          socklen;
+    ngx_str_t                          name;
 
     ngx_resolver_ctx_t                *ctx;
 } ngx_stream_upstream_resolved_t;
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
index 3a62501..db620ef 100644
--- a/src/stream/ngx_stream_upstream_round_robin.c
+++ b/src/stream/ngx_stream_upstream_round_robin.c
@@ -344,7 +344,7 @@ ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
     if (ur->sockaddr) {
         peer[0].sockaddr = ur->sockaddr;
         peer[0].socklen = ur->socklen;
-        peer[0].name = ur->host;
+        peer[0].name = ur->name;
         peer[0].weight = 1;
         peer[0].effective_weight = 1;
         peer[0].current_weight = 0;

From 7c03e6673ba20bd34ae0795219eb2baf90825702 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 18 Nov 2016 17:17:57 +0200
Subject: [PATCH 131/600] Adjust experimental flow

We now dummy merge (-s ours) upstream into upstream-1.11 instead
of force pushing a clean branch on every release.

That way we can easier track the branch's history.
---
 debian/README.Packaging | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/README.Packaging b/debian/README.Packaging
index bbb7875..47a582f 100644
--- a/debian/README.Packaging
+++ b/debian/README.Packaging
@@ -58,11 +58,11 @@ them.
   are commited (changelog entry etc) and the build is made.
 
 * upstream-1.11
-  Force-pushed on every 1.11.x release.
+  Pushed on every 1.11.x release.
 
-  Before a new 1.11.x release the branch is reset to origin/upstream.
-  This is a technicallity so we can avoid resolving conflicts when a new 1.10.x
-  release happens between two experimental releases.
+  Before a new 1.11.x release origin/upstream is dummy merged (-s ours) into
+  ustream-1.11.  This is a technicallity so we can avoid resolving conflicts
+  when a new 1.10.x release happens between two experimental releases.
 
 Older 1.11.x releases are not referenced by any branch, but they can be found
 by the relevant debian/* tag.

From e7164cf7acc2ef081cbedc8f5c9801f53e64c1ba Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 21 Nov 2016 16:20:29 +0200
Subject: [PATCH 132/600] Change my email

---
 debian/control                                                  | 2 +-
 debian/copyright                                                | 2 +-
 debian/dh_nginx                                                 | 2 +-
 ...2-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch | 2 +-
 debian/patches/perl-use-dpkg-buildflags.patch                   | 2 +-
 debian/po/templates.pot                                         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index e553a8a..ff6aace 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@lists.alioth.debian.org>
 Uploaders: Kartik Mistry <kartik@debian.org>,
            Michael Lustfield <michael@lustfield.net>,
-           Christos Trochalakis <yatiohi@ideopolis.gr>
+           Christos Trochalakis <ctrochalakis@debian.org>
 Build-Depends: autotools-dev,
                debhelper (>= 9),
                po-debconf,
diff --git a/debian/copyright b/debian/copyright
index 019dc9d..40218cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,7 +34,7 @@ Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
            2010-2014, Michael Lustfield <michael@lustfield.net>
            2011       Dmitry E. Oboukhov <unera@debian.org>
            2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
-           2013-2014, Christos Trochalakis <yatiohi@ideopolis.gr>
+           2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
 License: BSD-2-clause
 
 Files: debian/modules/headers-more-nginx-module/*
diff --git a/debian/dh_nginx b/debian/dh_nginx
index 3be792d..8e6ce3b 100755
--- a/debian/dh_nginx
+++ b/debian/dh_nginx
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # dh_nginx - Nginx configuration helper
-# Copyright (C) 2016 Christos Trochalakis <yatiohi@ideopolis.gr>
+# Copyright (C) 2016 Christos Trochalakis <ctrochalakis@debian.org>
 #
 # This program is licensed under the terms of the GNU General
 # Public License veserion 2+
diff --git a/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch b/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
index 1bea8b2..9cc3962 100644
--- a/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
+++ b/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
@@ -1,4 +1,4 @@
-From: Christos Trochalakis <yatiohi@ideopolis.gr>
+From: Christos Trochalakis <ctrochalakis@debian.org>
 Date: Wed, 30 Mar 2016 09:47:11 +0300
 Subject: Make sure signature stays the same in all nginx builds
 
diff --git a/debian/patches/perl-use-dpkg-buildflags.patch b/debian/patches/perl-use-dpkg-buildflags.patch
index d6b6f96..5379313 100644
--- a/debian/patches/perl-use-dpkg-buildflags.patch
+++ b/debian/patches/perl-use-dpkg-buildflags.patch
@@ -1,6 +1,6 @@
 Description: Use linker flags from environment for perl (dpkg-buildflags).
  Necessary for hardening flags.
-Author: Christos Trochalakis <yatiohi@ideopolis.gr>
+Author: Christos Trochalakis <ctrochalakis@debian.org>
 --- a/src/http/modules/perl/Makefile.PL
 +++ b/src/http/modules/perl/Makefile.PL
 @@ -3,6 +3,7 @@
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index bb72383..9260ff1 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,7 +1,7 @@
 # Nginx debconf translations
 # Copyright (C) 2016 Christos Trochalakis
 # This file is distributed under the same license as the nginx package.
-# Chrirtos Trochalakis <yatiohi@ideopolis.gr>, 2016.
+# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
 #
 #, fuzzy
 msgid ""

From bf78540e31b57a79b79b54d019a2faa2f988c89c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 18 Nov 2016 16:14:24 +0200
Subject: [PATCH 133/600] debian/rules: Correctly clean patched modules

Closes: #844506
Thanks: Sven-Haegar Koch for the initial patch.
---
 debian/rules | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index f1806b1..4a8d986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,7 +145,7 @@ extras_configure_flags := \
 override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour))
 override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour))
 override_dh_strip:          $(foreach flavour,$(FLAVOURS),strip.arch.$(flavour)) $(foreach mod,$(DYN_MODS),strip.mods.$(mod))
-override_dh_clean:          $(foreach flavour,$(FLAVOURS),clean.$(flavour))
+override_dh_clean:          clean_patch_modules $(foreach flavour,$(FLAVOURS),clean.$(flavour))
 	dh_clean
 
 override_dh_install:
@@ -174,6 +174,13 @@ config_patch_modules: $(foreach mod,$(modules_with_patches),config.patch.$(mod))
 config.patch.%:
 	cd $(MODULESDIR)/$* && QUILT_PATCHES=$(MODULESPATCHDIR)/$* quilt push -a
 
+clean_patch_modules: $(foreach mod,$(modules_with_patches),clean.patch.$(mod))
+clean.patch.%:
+	if [ -s $(MODULESDIR)/$*/.pc/applied-patches ]; then \
+		cd $(MODULESDIR)/$* && QUILT_PATCHES=$(MODULESPATCHDIR)/$* quilt pop -q -a; \
+		rm -rf $(MODULESDIR)/$*/.pc; \
+	fi
+
 config.arch.%:
 	dh_testdir
 	mkdir -p $(BUILDDIR_$*)
@@ -188,4 +195,4 @@ config.arch.%:
 clean.%:
 	rm -rf $(BUILDDIR_$*)
 
-.PHONY: config_patch_modules
+.PHONY: config_patch_modules clean_patch_modules

From 4deb3d7f527d86f4d2072bb96b8090214d0bdc8a Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Sat, 3 Dec 2016 07:58:19 +0000
Subject: [PATCH 134/600] Correcting location of default php-fpm socket.

---
 debian/changelog                    | 7 +++++++
 debian/conf/sites-available/default | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 89b8f64..af0ea9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.10.2-3) UNRELEASED; urgency=medium
+
+  * debian/conf/sites-enabled/default:
+    + Correcting location of default php-fpm socket. (Closes #846145)
+
+ -- Michael Lustfield <michael@lustfield.net>  Sat, 03 Dec 2016 07:57:39 +0000
+
 nginx (1.10.2-2) unstable; urgency=medium
 
   * Build against OpenSSL 1.1.0. (Closes: #828453)
diff --git a/debian/conf/sites-available/default b/debian/conf/sites-available/default
index 890f572..c841ceb 100644
--- a/debian/conf/sites-available/default
+++ b/debian/conf/sites-available/default
@@ -57,7 +57,7 @@ server {
 	#	include snippets/fastcgi-php.conf;
 	#
 	#	# With php-fpm (or other unix sockets):
-	#	fastcgi_pass unix:/var/run/php7.0-fpm.sock;
+	#	fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
 	#	# With php-cgi (or other tcp sockets):
 	#	fastcgi_pass 127.0.0.1:9000;
 	#}

From 0b60e49e0895dcdbac7a8773359eec09d4a5f746 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 13 Dec 2016 18:47:26 +0200
Subject: [PATCH 135/600] New upstream version 1.11.7

---
 CHANGES                                      |  27 ++
 CHANGES.ru                                   |  27 ++
 auto/lib/perl/conf                           |   6 +-
 auto/make                                    |  17 +-
 auto/module                                  |   4 +
 auto/modules                                 |   4 +-
 src/core/nginx.c                             |  48 ++-
 src/core/nginx.h                             |   4 +-
 src/core/ngx_cycle.c                         |  13 +-
 src/core/ngx_output_chain.c                  |   2 +-
 src/core/ngx_slab.c                          | 338 +++++++++--------
 src/core/ngx_slab.h                          |  12 +
 src/event/modules/ngx_devpoll_module.c       |  10 +-
 src/event/modules/ngx_epoll_module.c         |  19 +-
 src/event/modules/ngx_eventport_module.c     |  10 +-
 src/event/modules/ngx_poll_module.c          |  10 +-
 src/event/ngx_event_openssl.c                | 380 ++++++++++++++++++-
 src/event/ngx_event_openssl.h                |  11 +
 src/event/ngx_event_openssl_stapling.c       |  79 ++--
 src/http/modules/ngx_http_map_module.c       |  18 +-
 src/http/modules/ngx_http_mp4_module.c       |   4 +-
 src/http/modules/ngx_http_ssl_module.c       |  15 +
 src/http/modules/perl/ngx_http_perl_module.c |   8 +
 src/http/v2/ngx_http_v2.c                    |  32 +-
 src/http/v2/ngx_http_v2.h                    |   3 +-
 src/http/v2/ngx_http_v2_filter_module.c      |  50 ++-
 src/stream/ngx_stream_map_module.c           |  18 +-
 src/stream/ngx_stream_ssl_module.c           |   6 +
 28 files changed, 866 insertions(+), 309 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1882976..99e360e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,31 @@
 
+Changes with nginx 1.11.7                                        13 Dec 2016
+
+    *) Change: now in case of a client certificate verification error the
+       $ssl_client_verify variable contains a string with the failure
+       reason, for example, "FAILED:certificate has expired".
+
+    *) Feature: the $ssl_ciphers, $ssl_curves, $ssl_client_v_start,
+       $ssl_client_v_end, and $ssl_client_v_remain variables.
+
+    *) Feature: the "volatile" parameter of the "map" directive.
+
+    *) Bugfix: dependencies specified for a module were ignored while
+       building dynamic modules.
+
+    *) Bugfix: when using HTTP/2 and the "limit_req" or "auth_request"
+       directives client request body might be corrupted; the bug had
+       appeared in 1.11.0.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2; the bug had appeared in 1.11.3.
+
+    *) Bugfix: in the ngx_http_mp4_module.
+       Thanks to Congcong Hu.
+
+    *) Bugfix: in the ngx_http_perl_module.
+
+
 Changes with nginx 1.11.6                                        15 Nov 2016
 
     *) Change: format of the $ssl_client_s_dn and $ssl_client_i_dn variables
diff --git a/CHANGES.ru b/CHANGES.ru
index 3b66b94..695547b 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,31 @@
 
+Изменения в nginx 1.11.7                                          13.12.2016
+
+    *) Изменение: переменная $ssl_client_verify теперь в случае ошибки
+       проверки клиентского сертификата содержит строку с описанием ошибки,
+       например, "FAILED:certificate has expired".
+
+    *) Добавление: переменные $ssl_ciphers, $ssl_curves,
+       $ssl_client_v_start, $ssl_client_v_end и $ssl_client_v_remain.
+
+    *) Добавление: параметр volatile директивы map.
+
+    *) Исправление: при сборке динамических модулей не учитывались заданные
+       для модуля зависимости.
+
+    *) Исправление: при использовании HTTP/2 и директив limit_req или
+       auth_request тело запроса могло быть повреждено; ошибка появилась в
+       1.11.0.
+
+    *) Исправление: при использовании HTTP/2 в рабочем процессе мог
+       произойти segmentation fault; ошибка появилась в 1.11.3.
+
+    *) Исправление: в модуле ngx_http_mp4_module.
+       Спасибо Congcong Hu.
+
+    *) Исправление: в модуле ngx_http_perl_module.
+
+
 Изменения в nginx 1.11.6                                          15.11.2016
 
     *) Изменение: формат переменных $ssl_client_s_dn и $ssl_client_i_dn
diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf
index d891d82..e16a1bc 100644
--- a/auto/lib/perl/conf
+++ b/auto/lib/perl/conf
@@ -12,9 +12,9 @@ NGX_PERL_VER=`$NGX_PERL -v 2>&1 | grep '^This is perl' 2>&1 \
 if test -n "$NGX_PERL_VER"; then
     echo " + perl version: $NGX_PERL_VER"
 
-    if [ "`$NGX_PERL -e 'use 5.006001; print "OK"'`" != "OK" ]; then
+    if [ "`$NGX_PERL -e 'use 5.008006; print "OK"'`" != "OK" ]; then
         echo
-        echo "$0: error: perl 5.6.1 or higher is required"
+        echo "$0: error: perl 5.8.6 or higher is required"
         echo
 
         exit 1;
@@ -76,7 +76,7 @@ if test -n "$NGX_PERL_VER"; then
 
 else
     echo
-    echo "$0: error: perl 5.6.1 or higher is required"
+    echo "$0: error: perl 5.8.6 or higher is required"
     echo
 
     exit 1;
diff --git a/auto/make b/auto/make
index 84d2668..7ddd100 100644
--- a/auto/make
+++ b/auto/make
@@ -156,7 +156,7 @@ fi
 ngx_all_srcs="$ngx_all_srcs $MISC_SRCS"
 
 
-if test -n "$NGX_ADDON_SRCS"; then
+if test -n "$NGX_ADDON_SRCS$DYNAMIC_MODULES"; then
 
 cat << END                                                >> $NGX_MAKEFILE
 
@@ -499,17 +499,6 @@ else
     ngx_perl_cc="$ngx_perl_cc \$(ALL_INCS)"
 fi
 
-ngx_obj_deps="\$(CORE_DEPS)"
-if [ $HTTP != NO ]; then
-    ngx_obj_deps="$ngx_obj_deps \$(HTTP_DEPS)"
-fi
-if [ $MAIL != NO ]; then
-    ngx_obj_deps="$ngx_obj_deps \$(MAIL_DEPS)"
-fi
-if [ $STREAM != NO ]; then
-    ngx_obj_deps="$ngx_obj_deps \$(STREAM_DEPS)"
-fi
-
 for ngx_module in $DYNAMIC_MODULES
 do
     eval ngx_module_srcs="\$${ngx_module}_SRCS"
@@ -665,7 +654,7 @@ END
 
             cat << END                                        >> $NGX_MAKEFILE
 
-$ngx_obj:	$ngx_obj_deps$ngx_cont$ngx_src
+$ngx_obj:	\$(ADDON_DEPS)$ngx_cont$ngx_src
 	$ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
 
 END
@@ -673,7 +662,7 @@ END
 
             cat << END                                        >> $NGX_MAKEFILE
 
-$ngx_obj:	$ngx_obj_deps$ngx_cont$ngx_src
+$ngx_obj:	\$(ADDON_DEPS)$ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
 
 END
diff --git a/auto/module b/auto/module
index 3b00a07..a2b578d 100644
--- a/auto/module
+++ b/auto/module
@@ -35,6 +35,10 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
         CORE_INCS="$CORE_INCS $ngx_module_incs"
     fi
 
+    if test -n "$ngx_module_deps"; then
+        NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_module_deps"
+    fi
+
     libs=
     for lib in $ngx_module_libs
     do
diff --git a/auto/modules b/auto/modules
index 89377bf..c664fe3 100644
--- a/auto/modules
+++ b/auto/modules
@@ -1252,7 +1252,7 @@ if [ $MAIL != NO ]; then
     elif [ $MAIL = DYNAMIC ]; then
         ngx_module_name=$MAIL_MODULES
         ngx_module_incs=
-        ngx_module_deps=$MAIL_DEPS
+        ngx_module_deps=
         ngx_module_srcs=$MAIL_SRCS
         ngx_module_libs=
         ngx_module_link=DYNAMIC
@@ -1272,7 +1272,7 @@ if [ $STREAM != NO ]; then
     elif [ $STREAM = DYNAMIC ]; then
         ngx_module_name=$STREAM_MODULES
         ngx_module_incs=
-        ngx_module_deps=$STREAM_DEPS
+        ngx_module_deps=
         ngx_module_srcs=$STREAM_SRCS
         ngx_module_libs=
         ngx_module_link=DYNAMIC
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 60f8fe7..c5f09a5 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -12,6 +12,7 @@
 
 static void ngx_show_version_info(void);
 static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle);
+static void ngx_cleanup_environment(void *data);
 static ngx_int_t ngx_get_options(int argc, char *const *argv);
 static ngx_int_t ngx_process_options(ngx_cycle_t *cycle);
 static ngx_int_t ngx_save_argv(ngx_cycle_t *cycle, int argc, char *const *argv);
@@ -495,10 +496,11 @@ ngx_add_inherited_sockets(ngx_cycle_t *cycle)
 char **
 ngx_set_environment(ngx_cycle_t *cycle, ngx_uint_t *last)
 {
-    char             **p, **env;
-    ngx_str_t         *var;
-    ngx_uint_t         i, n;
-    ngx_core_conf_t   *ccf;
+    char                **p, **env;
+    ngx_str_t            *var;
+    ngx_uint_t            i, n;
+    ngx_core_conf_t      *ccf;
+    ngx_pool_cleanup_t   *cln;
 
     ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
 
@@ -550,14 +552,25 @@ tz_found:
 
     if (last) {
         env = ngx_alloc((*last + n + 1) * sizeof(char *), cycle->log);
+        if (env == NULL) {
+            return NULL;
+        }
+
         *last = n;
 
     } else {
-        env = ngx_palloc(cycle->pool, (n + 1) * sizeof(char *));
-    }
+        cln = ngx_pool_cleanup_add(cycle->pool, 0);
+        if (cln == NULL) {
+            return NULL;
+        }
 
-    if (env == NULL) {
-        return NULL;
+        env = ngx_alloc((n + 1) * sizeof(char *), cycle->log);
+        if (env == NULL) {
+            return NULL;
+        }
+
+        cln->handler = ngx_cleanup_environment;
+        cln->data = env;
     }
 
     n = 0;
@@ -591,6 +604,25 @@ tz_found:
 }
 
 
+static void
+ngx_cleanup_environment(void *data)
+{
+    char  **env = data;
+
+    if (environ == env) {
+
+        /*
+         * if the environment is still used, as it happens on exit,
+         * the only option is to leak it
+         */
+
+        return;
+    }
+
+    ngx_free(env);
+}
+
+
 ngx_pid_t
 ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv)
 {
diff --git a/src/core/nginx.h b/src/core/nginx.h
index a75ef04..7733313 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011006
-#define NGINX_VERSION      "1.11.6"
+#define nginx_version      1011007
+#define NGINX_VERSION      "1.11.7"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index a57991c..5e95628 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -37,7 +37,7 @@ ngx_cycle_t *
 ngx_init_cycle(ngx_cycle_t *old_cycle)
 {
     void                *rv;
-    char               **senv, **env;
+    char               **senv;
     ngx_uint_t           i, n;
     ngx_log_t           *log;
     ngx_time_t          *tp;
@@ -750,20 +750,9 @@ old_shm_zone_done:
 
     if (ngx_process == NGX_PROCESS_MASTER || ngx_is_init_cycle(old_cycle)) {
 
-        /*
-         * perl_destruct() frees environ, if it is not the same as it was at
-         * perl_construct() time, therefore we save the previous cycle
-         * environment before ngx_conf_parse() where it will be changed.
-         */
-
-        env = environ;
-        environ = senv;
-
         ngx_destroy_pool(old_cycle->pool);
         cycle->old_cycle = NULL;
 
-        environ = env;
-
         return cycle;
     }
 
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index f784578..7f5dc78 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -512,7 +512,7 @@ ngx_output_chain_copy_buf(ngx_output_chain_ctx_t *ctx)
     size = ngx_buf_size(src);
     size = ngx_min(size, dst->end - dst->pos);
 
-    sendfile = ctx->sendfile & !ctx->directio;
+    sendfile = ctx->sendfile && !ctx->directio;
 
 #if (NGX_SENDFILE_LIMIT)
 
diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
index 56e7765..66faecc 100644
--- a/src/core/ngx_slab.c
+++ b/src/core/ngx_slab.c
@@ -41,6 +41,19 @@
 #endif
 
 
+#define ngx_slab_slots(pool)                                                  \
+    (ngx_slab_page_t *) ((u_char *) (pool) + sizeof(ngx_slab_pool_t))
+
+#define ngx_slab_page_type(page)   ((page)->prev & NGX_SLAB_PAGE_MASK)
+
+#define ngx_slab_page_prev(page)                                              \
+    (ngx_slab_page_t *) ((page)->prev & ~NGX_SLAB_PAGE_MASK)
+
+#define ngx_slab_page_addr(pool, page)                                        \
+    ((((page) - (pool)->pages) << ngx_pagesize_shift)                         \
+     + (uintptr_t) (pool)->start)
+
+
 #if (NGX_DEBUG_MALLOC)
 
 #define ngx_slab_junk(p, size)     ngx_memset(p, 0xA5, size)
@@ -76,7 +89,7 @@ ngx_slab_init(ngx_slab_pool_t *pool)
     size_t            size;
     ngx_int_t         m;
     ngx_uint_t        i, n, pages;
-    ngx_slab_page_t  *slots;
+    ngx_slab_page_t  *slots, *page;
 
     /* STUB */
     if (ngx_slab_max_size == 0) {
@@ -90,15 +103,17 @@ ngx_slab_init(ngx_slab_pool_t *pool)
 
     pool->min_size = 1 << pool->min_shift;
 
-    p = (u_char *) pool + sizeof(ngx_slab_pool_t);
+    slots = ngx_slab_slots(pool);
+
+    p = (u_char *) slots;
     size = pool->end - p;
 
     ngx_slab_junk(p, size);
 
-    slots = (ngx_slab_page_t *) p;
     n = ngx_pagesize_shift - pool->min_shift;
 
     for (i = 0; i < n; i++) {
+        /* only "next" is used in list head */
         slots[i].slab = 0;
         slots[i].next = &slots[i];
         slots[i].prev = 0;
@@ -106,30 +121,40 @@ ngx_slab_init(ngx_slab_pool_t *pool)
 
     p += n * sizeof(ngx_slab_page_t);
 
+    pool->stats = (ngx_slab_stat_t *) p;
+    ngx_memzero(pool->stats, n * sizeof(ngx_slab_stat_t));
+
+    p += n * sizeof(ngx_slab_stat_t);
+
+    size -= n * (sizeof(ngx_slab_page_t) + sizeof(ngx_slab_stat_t));
+
     pages = (ngx_uint_t) (size / (ngx_pagesize + sizeof(ngx_slab_page_t)));
 
-    ngx_memzero(p, pages * sizeof(ngx_slab_page_t));
-
     pool->pages = (ngx_slab_page_t *) p;
+    ngx_memzero(pool->pages, pages * sizeof(ngx_slab_page_t));
 
+    page = pool->pages;
+
+    /* only "next" is used in list head */
+    pool->free.slab = 0;
+    pool->free.next = page;
     pool->free.prev = 0;
-    pool->free.next = (ngx_slab_page_t *) p;
 
-    pool->pages->slab = pages;
-    pool->pages->next = &pool->free;
-    pool->pages->prev = (uintptr_t) &pool->free;
+    page->slab = pages;
+    page->next = &pool->free;
+    page->prev = (uintptr_t) &pool->free;
 
-    pool->start = (u_char *)
-                  ngx_align_ptr((uintptr_t) p + pages * sizeof(ngx_slab_page_t),
-                                 ngx_pagesize);
+    pool->start = ngx_align_ptr(p + pages * sizeof(ngx_slab_page_t),
+                                ngx_pagesize);
 
     m = pages - (pool->end - pool->start) / ngx_pagesize;
     if (m > 0) {
         pages -= m;
-        pool->pages->slab = pages;
+        page->slab = pages;
     }
 
     pool->last = pool->pages + pages;
+    pool->pfree = pages;
 
     pool->log_nomem = 1;
     pool->log_ctx = &pool->zero;
@@ -168,8 +193,7 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
         page = ngx_slab_alloc_pages(pool, (size >> ngx_pagesize_shift)
                                           + ((size % ngx_pagesize) ? 1 : 0));
         if (page) {
-            p = (page - pool->pages) << ngx_pagesize_shift;
-            p += (uintptr_t) pool->start;
+            p = ngx_slab_page_addr(pool, page);
 
         } else {
             p = 0;
@@ -184,166 +208,140 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
         slot = shift - pool->min_shift;
 
     } else {
-        size = pool->min_size;
         shift = pool->min_shift;
         slot = 0;
     }
 
+    pool->stats[slot].reqs++;
+
     ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
                    "slab alloc: %uz slot: %ui", size, slot);
 
-    slots = (ngx_slab_page_t *) ((u_char *) pool + sizeof(ngx_slab_pool_t));
+    slots = ngx_slab_slots(pool);
     page = slots[slot].next;
 
     if (page->next != page) {
 
         if (shift < ngx_slab_exact_shift) {
 
-            do {
-                p = (page - pool->pages) << ngx_pagesize_shift;
-                bitmap = (uintptr_t *) (pool->start + p);
+            bitmap = (uintptr_t *) ngx_slab_page_addr(pool, page);
 
-                map = (1 << (ngx_pagesize_shift - shift))
-                          / (sizeof(uintptr_t) * 8);
+            map = (ngx_pagesize >> shift) / (sizeof(uintptr_t) * 8);
 
-                for (n = 0; n < map; n++) {
+            for (n = 0; n < map; n++) {
 
-                    if (bitmap[n] != NGX_SLAB_BUSY) {
+                if (bitmap[n] != NGX_SLAB_BUSY) {
 
-                        for (m = 1, i = 0; m; m <<= 1, i++) {
-                            if ((bitmap[n] & m)) {
-                                continue;
-                            }
-
-                            bitmap[n] |= m;
-
-                            i = ((n * sizeof(uintptr_t) * 8) << shift)
-                                + (i << shift);
-
-                            if (bitmap[n] == NGX_SLAB_BUSY) {
-                                for (n = n + 1; n < map; n++) {
-                                    if (bitmap[n] != NGX_SLAB_BUSY) {
-                                        p = (uintptr_t) bitmap + i;
-
-                                        goto done;
-                                    }
-                                }
-
-                                prev = (ngx_slab_page_t *)
-                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
-                                prev->next = page->next;
-                                page->next->prev = page->prev;
-
-                                page->next = NULL;
-                                page->prev = NGX_SLAB_SMALL;
-                            }
-
-                            p = (uintptr_t) bitmap + i;
-
-                            goto done;
+                    for (m = 1, i = 0; m; m <<= 1, i++) {
+                        if (bitmap[n] & m) {
+                            continue;
                         }
+
+                        bitmap[n] |= m;
+
+                        i = (n * sizeof(uintptr_t) * 8 + i) << shift;
+
+                        p = (uintptr_t) bitmap + i;
+
+                        pool->stats[slot].used++;
+
+                        if (bitmap[n] == NGX_SLAB_BUSY) {
+                            for (n = n + 1; n < map; n++) {
+                                if (bitmap[n] != NGX_SLAB_BUSY) {
+                                    goto done;
+                                }
+                            }
+
+                            prev = ngx_slab_page_prev(page);
+                            prev->next = page->next;
+                            page->next->prev = page->prev;
+
+                            page->next = NULL;
+                            page->prev = NGX_SLAB_SMALL;
+                        }
+
+                        goto done;
                     }
                 }
-
-                page = page->next;
-
-            } while (page);
+            }
 
         } else if (shift == ngx_slab_exact_shift) {
 
-            do {
-                if (page->slab != NGX_SLAB_BUSY) {
-
-                    for (m = 1, i = 0; m; m <<= 1, i++) {
-                        if ((page->slab & m)) {
-                            continue;
-                        }
-
-                        page->slab |= m;
-
-                        if (page->slab == NGX_SLAB_BUSY) {
-                            prev = (ngx_slab_page_t *)
-                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
-                            prev->next = page->next;
-                            page->next->prev = page->prev;
-
-                            page->next = NULL;
-                            page->prev = NGX_SLAB_EXACT;
-                        }
-
-                        p = (page - pool->pages) << ngx_pagesize_shift;
-                        p += i << shift;
-                        p += (uintptr_t) pool->start;
-
-                        goto done;
-                    }
+            for (m = 1, i = 0; m; m <<= 1, i++) {
+                if (page->slab & m) {
+                    continue;
                 }
 
-                page = page->next;
+                page->slab |= m;
 
-            } while (page);
+                if (page->slab == NGX_SLAB_BUSY) {
+                    prev = ngx_slab_page_prev(page);
+                    prev->next = page->next;
+                    page->next->prev = page->prev;
+
+                    page->next = NULL;
+                    page->prev = NGX_SLAB_EXACT;
+                }
+
+                p = ngx_slab_page_addr(pool, page) + (i << shift);
+
+                pool->stats[slot].used++;
+
+                goto done;
+            }
 
         } else { /* shift > ngx_slab_exact_shift */
 
-            n = ngx_pagesize_shift - (page->slab & NGX_SLAB_SHIFT_MASK);
-            n = 1 << n;
-            n = ((uintptr_t) 1 << n) - 1;
-            mask = n << NGX_SLAB_MAP_SHIFT;
+            mask = ((uintptr_t) 1 << (ngx_pagesize >> shift)) - 1;
+            mask <<= NGX_SLAB_MAP_SHIFT;
 
-            do {
-                if ((page->slab & NGX_SLAB_MAP_MASK) != mask) {
-
-                    for (m = (uintptr_t) 1 << NGX_SLAB_MAP_SHIFT, i = 0;
-                         m & mask;
-                         m <<= 1, i++)
-                    {
-                        if ((page->slab & m)) {
-                            continue;
-                        }
-
-                        page->slab |= m;
-
-                        if ((page->slab & NGX_SLAB_MAP_MASK) == mask) {
-                            prev = (ngx_slab_page_t *)
-                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
-                            prev->next = page->next;
-                            page->next->prev = page->prev;
-
-                            page->next = NULL;
-                            page->prev = NGX_SLAB_BIG;
-                        }
-
-                        p = (page - pool->pages) << ngx_pagesize_shift;
-                        p += i << shift;
-                        p += (uintptr_t) pool->start;
-
-                        goto done;
-                    }
+            for (m = (uintptr_t) 1 << NGX_SLAB_MAP_SHIFT, i = 0;
+                 m & mask;
+                 m <<= 1, i++)
+            {
+                if (page->slab & m) {
+                    continue;
                 }
 
-                page = page->next;
+                page->slab |= m;
 
-            } while (page);
+                if ((page->slab & NGX_SLAB_MAP_MASK) == mask) {
+                    prev = ngx_slab_page_prev(page);
+                    prev->next = page->next;
+                    page->next->prev = page->prev;
+
+                    page->next = NULL;
+                    page->prev = NGX_SLAB_BIG;
+                }
+
+                p = ngx_slab_page_addr(pool, page) + (i << shift);
+
+                pool->stats[slot].used++;
+
+                goto done;
+            }
         }
+
+        ngx_slab_error(pool, NGX_LOG_ALERT, "ngx_slab_alloc(): page is busy");
+        ngx_debug_point();
     }
 
     page = ngx_slab_alloc_pages(pool, 1);
 
     if (page) {
         if (shift < ngx_slab_exact_shift) {
-            p = (page - pool->pages) << ngx_pagesize_shift;
-            bitmap = (uintptr_t *) (pool->start + p);
+            bitmap = (uintptr_t *) ngx_slab_page_addr(pool, page);
 
-            s = 1 << shift;
-            n = (1 << (ngx_pagesize_shift - shift)) / 8 / s;
+            n = (ngx_pagesize >> shift) / ((1 << shift) * 8);
 
             if (n == 0) {
                 n = 1;
             }
 
-            bitmap[0] = (2 << n) - 1;
+            /* "n" elements for bitmap, plus one requested */
+            bitmap[0] = ((uintptr_t) 2 << n) - 1;
 
-            map = (1 << (ngx_pagesize_shift - shift)) / (sizeof(uintptr_t) * 8);
+            map = (ngx_pagesize >> shift) / (sizeof(uintptr_t) * 8);
 
             for (i = 1; i < map; i++) {
                 bitmap[i] = 0;
@@ -355,8 +353,11 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 
             slots[slot].next = page;
 
-            p = ((page - pool->pages) << ngx_pagesize_shift) + s * n;
-            p += (uintptr_t) pool->start;
+            pool->stats[slot].total += (ngx_pagesize >> shift) - n;
+
+            p = ngx_slab_page_addr(pool, page) + (n << shift);
+
+            pool->stats[slot].used++;
 
             goto done;
 
@@ -368,8 +369,11 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 
             slots[slot].next = page;
 
-            p = (page - pool->pages) << ngx_pagesize_shift;
-            p += (uintptr_t) pool->start;
+            pool->stats[slot].total += sizeof(uintptr_t) * 8;
+
+            p = ngx_slab_page_addr(pool, page);
+
+            pool->stats[slot].used++;
 
             goto done;
 
@@ -381,8 +385,11 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 
             slots[slot].next = page;
 
-            p = (page - pool->pages) << ngx_pagesize_shift;
-            p += (uintptr_t) pool->start;
+            pool->stats[slot].total += ngx_pagesize >> shift;
+
+            p = ngx_slab_page_addr(pool, page);
+
+            pool->stats[slot].used++;
 
             goto done;
         }
@@ -390,6 +397,8 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 
     p = 0;
 
+    pool->stats[slot].fails++;
+
 done:
 
     ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
@@ -444,7 +453,7 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
 {
     size_t            size;
     uintptr_t         slab, m, *bitmap;
-    ngx_uint_t        n, type, slot, shift, map;
+    ngx_uint_t        i, n, type, slot, shift, map;
     ngx_slab_page_t  *slots, *page;
 
     ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0, "slab free: %p", p);
@@ -457,7 +466,7 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
     n = ((u_char *) p - pool->start) >> ngx_pagesize_shift;
     page = &pool->pages[n];
     slab = page->slab;
-    type = page->prev & NGX_SLAB_PAGE_MASK;
+    type = ngx_slab_page_type(page);
 
     switch (type) {
 
@@ -471,17 +480,16 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
         }
 
         n = ((uintptr_t) p & (ngx_pagesize - 1)) >> shift;
-        m = (uintptr_t) 1 << (n & (sizeof(uintptr_t) * 8 - 1));
-        n /= (sizeof(uintptr_t) * 8);
+        m = (uintptr_t) 1 << (n % (sizeof(uintptr_t) * 8));
+        n /= sizeof(uintptr_t) * 8;
         bitmap = (uintptr_t *)
                              ((uintptr_t) p & ~((uintptr_t) ngx_pagesize - 1));
 
         if (bitmap[n] & m) {
+            slot = shift - pool->min_shift;
 
             if (page->next == NULL) {
-                slots = (ngx_slab_page_t *)
-                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
-                slot = shift - pool->min_shift;
+                slots = ngx_slab_slots(pool);
 
                 page->next = slots[slot].next;
                 slots[slot].next = page;
@@ -492,7 +500,7 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
 
             bitmap[n] &= ~m;
 
-            n = (1 << (ngx_pagesize_shift - shift)) / 8 / (1 << shift);
+            n = (ngx_pagesize >> shift) / ((1 << shift) * 8);
 
             if (n == 0) {
                 n = 1;
@@ -502,16 +510,18 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
                 goto done;
             }
 
-            map = (1 << (ngx_pagesize_shift - shift)) / (sizeof(uintptr_t) * 8);
+            map = (ngx_pagesize >> shift) / (sizeof(uintptr_t) * 8);
 
-            for (n = 1; n < map; n++) {
-                if (bitmap[n]) {
+            for (i = 1; i < map; i++) {
+                if (bitmap[i]) {
                     goto done;
                 }
             }
 
             ngx_slab_free_pages(pool, page, 1);
 
+            pool->stats[slot].total -= (ngx_pagesize >> shift) - n;
+
             goto done;
         }
 
@@ -528,10 +538,10 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
         }
 
         if (slab & m) {
+            slot = ngx_slab_exact_shift - pool->min_shift;
+
             if (slab == NGX_SLAB_BUSY) {
-                slots = (ngx_slab_page_t *)
-                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
-                slot = ngx_slab_exact_shift - pool->min_shift;
+                slots = ngx_slab_slots(pool);
 
                 page->next = slots[slot].next;
                 slots[slot].next = page;
@@ -548,6 +558,8 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
 
             ngx_slab_free_pages(pool, page, 1);
 
+            pool->stats[slot].total -= sizeof(uintptr_t) * 8;
+
             goto done;
         }
 
@@ -566,11 +578,10 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
                               + NGX_SLAB_MAP_SHIFT);
 
         if (slab & m) {
+            slot = shift - pool->min_shift;
 
             if (page->next == NULL) {
-                slots = (ngx_slab_page_t *)
-                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
-                slot = shift - pool->min_shift;
+                slots = ngx_slab_slots(pool);
 
                 page->next = slots[slot].next;
                 slots[slot].next = page;
@@ -587,6 +598,8 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
 
             ngx_slab_free_pages(pool, page, 1);
 
+            pool->stats[slot].total -= ngx_pagesize >> shift;
+
             goto done;
         }
 
@@ -598,7 +611,7 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
             goto wrong_chunk;
         }
 
-        if (slab == NGX_SLAB_PAGE_FREE) {
+        if (!(slab & NGX_SLAB_PAGE_START)) {
             ngx_slab_error(pool, NGX_LOG_ALERT,
                            "ngx_slab_free(): page is already free");
             goto fail;
@@ -626,6 +639,8 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
 
 done:
 
+    pool->stats[slot].used--;
+
     ngx_slab_junk(p, size);
 
     return;
@@ -678,6 +693,8 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *pool, ngx_uint_t pages)
             page->next = NULL;
             page->prev = NGX_SLAB_PAGE;
 
+            pool->pfree -= pages;
+
             if (--pages == 0) {
                 return page;
             }
@@ -706,9 +723,10 @@ static void
 ngx_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
     ngx_uint_t pages)
 {
-    ngx_uint_t        type;
     ngx_slab_page_t  *prev, *join;
 
+    pool->pfree += pages;
+
     page->slab = pages--;
 
     if (pages) {
@@ -716,7 +734,7 @@ ngx_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
     }
 
     if (page->next) {
-        prev = (ngx_slab_page_t *) (page->prev & ~NGX_SLAB_PAGE_MASK);
+        prev = ngx_slab_page_prev(page);
         prev->next = page->next;
         page->next->prev = page->prev;
     }
@@ -724,15 +742,14 @@ ngx_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
     join = page + page->slab;
 
     if (join < pool->last) {
-        type = join->prev & NGX_SLAB_PAGE_MASK;
 
-        if (type == NGX_SLAB_PAGE) {
+        if (ngx_slab_page_type(join) == NGX_SLAB_PAGE) {
 
             if (join->next != NULL) {
                 pages += join->slab;
                 page->slab += join->slab;
 
-                prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
+                prev = ngx_slab_page_prev(join);
                 prev->next = join->next;
                 join->next->prev = join->prev;
 
@@ -745,19 +762,18 @@ ngx_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
 
     if (page > pool->pages) {
         join = page - 1;
-        type = join->prev & NGX_SLAB_PAGE_MASK;
 
-        if (type == NGX_SLAB_PAGE) {
+        if (ngx_slab_page_type(join) == NGX_SLAB_PAGE) {
 
             if (join->slab == NGX_SLAB_PAGE_FREE) {
-                join = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
+                join = ngx_slab_page_prev(join);
             }
 
             if (join->next != NULL) {
                 pages += join->slab;
                 join->slab += page->slab;
 
-                prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
+                prev = ngx_slab_page_prev(join);
                 prev->next = join->next;
                 join->next->prev = join->prev;
 
diff --git a/src/core/ngx_slab.h b/src/core/ngx_slab.h
index 2922a80..eff893c 100644
--- a/src/core/ngx_slab.h
+++ b/src/core/ngx_slab.h
@@ -22,6 +22,15 @@ struct ngx_slab_page_s {
 };
 
 
+typedef struct {
+    ngx_uint_t        total;
+    ngx_uint_t        used;
+
+    ngx_uint_t        reqs;
+    ngx_uint_t        fails;
+} ngx_slab_stat_t;
+
+
 typedef struct {
     ngx_shmtx_sh_t    lock;
 
@@ -32,6 +41,9 @@ typedef struct {
     ngx_slab_page_t  *last;
     ngx_slab_page_t   free;
 
+    ngx_slab_stat_t  *stats;
+    ngx_uint_t        pfree;
+
     u_char           *start;
     u_char           *end;
 
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index f985fbd..39e480e 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -481,13 +481,11 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
                           fd, event_list[i].events, revents);
         }
 
-        if ((revents & (POLLERR|POLLHUP|POLLNVAL))
-             && (revents & (POLLIN|POLLOUT)) == 0)
-        {
+        if (revents & (POLLERR|POLLHUP|POLLNVAL)) {
+
             /*
-             * if the error events were returned without POLLIN or POLLOUT,
-             * then add these flags to handle the events at least in one
-             * active handler
+             * if the error events were returned, add POLLIN and POLLOUT
+             * to handle the events at least in one active handler
              */
 
             revents |= POLLIN|POLLOUT;
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index c267fd6..760c69b 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -863,6 +863,13 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
             ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                            "epoll_wait() error on fd:%d ev:%04XD",
                            c->fd, revents);
+
+            /*
+             * if the error events were returned, add EPOLLIN and EPOLLOUT
+             * to handle the events at least in one active handler
+             */
+
+            revents |= EPOLLIN|EPOLLOUT;
         }
 
 #if 0
@@ -873,18 +880,6 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
         }
 #endif
 
-        if ((revents & (EPOLLERR|EPOLLHUP))
-             && (revents & (EPOLLIN|EPOLLOUT)) == 0)
-        {
-            /*
-             * if the error events were returned without EPOLLIN or EPOLLOUT,
-             * then add these flags to handle the events at least in one
-             * active handler
-             */
-
-            revents |= EPOLLIN|EPOLLOUT;
-        }
-
         if ((revents & EPOLLIN) && rev->active) {
 
 #if (NGX_HAVE_EPOLLRDHUP)
diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c
index dafa27f..0413599 100644
--- a/src/event/modules/ngx_eventport_module.c
+++ b/src/event/modules/ngx_eventport_module.c
@@ -540,13 +540,11 @@ ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
                               (int) event_list[i].portev_object, revents);
             }
 
-            if ((revents & (POLLERR|POLLHUP|POLLNVAL))
-                 && (revents & (POLLIN|POLLOUT)) == 0)
-            {
+            if (revents & (POLLERR|POLLHUP|POLLNVAL)) {
+
                 /*
-                 * if the error events were returned without POLLIN or POLLOUT,
-                 * then add these flags to handle the events at least in one
-                 * active handler
+                 * if the error events were returned, add POLLIN and POLLOUT
+                 * to handle the events at least in one active handler
                  */
 
                 revents |= POLLIN|POLLOUT;
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 4370950..a2a7079 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -353,13 +353,11 @@ ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
             continue;
         }
 
-        if ((revents & (POLLERR|POLLHUP|POLLNVAL))
-             && (revents & (POLLIN|POLLOUT)) == 0)
-        {
+        if (revents & (POLLERR|POLLHUP|POLLNVAL)) {
+
             /*
-             * if the error events were returned without POLLIN or POLLOUT,
-             * then add these flags to handle the events at least in one
-             * active handler
+             * if the error events were returned, add POLLIN and POLLOUT
+             * to handle the events at least in one active handler
              */
 
             revents |= POLLIN|POLLOUT;
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 5c7734d..1b39f33 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -59,6 +59,12 @@ static int ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
 static ngx_int_t ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *str);
 #endif
 
+static time_t ngx_ssl_parse_time(
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
+    const
+#endif
+    ASN1_TIME *asn1time);
+
 static void *ngx_openssl_create_conf(ngx_cycle_t *cycle);
 static char *ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 static void ngx_openssl_exit(ngx_cycle_t *cycle);
@@ -106,6 +112,7 @@ int  ngx_ssl_session_cache_index;
 int  ngx_ssl_session_ticket_keys_index;
 int  ngx_ssl_certificate_index;
 int  ngx_ssl_next_certificate_index;
+int  ngx_ssl_certificate_name_index;
 int  ngx_ssl_stapling_index;
 
 
@@ -193,6 +200,14 @@ ngx_ssl_init(ngx_log_t *log)
         return NGX_ERROR;
     }
 
+    ngx_ssl_certificate_name_index = X509_get_ex_new_index(0, NULL, NULL, NULL,
+                                                           NULL);
+
+    if (ngx_ssl_certificate_name_index == -1) {
+        ngx_ssl_error(NGX_LOG_ALERT, log, 0, "X509_get_ex_new_index() failed");
+        return NGX_ERROR;
+    }
+
     ngx_ssl_stapling_index = X509_get_ex_new_index(0, NULL, NULL, NULL, NULL);
 
     if (ngx_ssl_stapling_index == -1) {
@@ -385,6 +400,15 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
         return NGX_ERROR;
     }
 
+    if (X509_set_ex_data(x509, ngx_ssl_certificate_name_index, cert->data)
+        == 0)
+    {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0, "X509_set_ex_data() failed");
+        X509_free(x509);
+        BIO_free(bio);
+        return NGX_ERROR;
+    }
+
     if (X509_set_ex_data(x509, ngx_ssl_next_certificate_index,
                       SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index))
         == 0)
@@ -3269,6 +3293,158 @@ ngx_ssl_get_cipher_name(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 }
 
 
+ngx_int_t
+ngx_ssl_get_ciphers(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+#ifdef SSL_CTRL_GET_RAW_CIPHERLIST
+
+    int                n, i, bytes;
+    size_t             len;
+    u_char            *ciphers, *p;
+    const SSL_CIPHER  *cipher;
+
+    bytes = SSL_get0_raw_cipherlist(c->ssl->connection, NULL);
+    n = SSL_get0_raw_cipherlist(c->ssl->connection, &ciphers);
+
+    if (n <= 0) {
+        s->len = 0;
+        return NGX_OK;
+    }
+
+    len = 0;
+    n /= bytes;
+
+    for (i = 0; i < n; i++) {
+        cipher = SSL_CIPHER_find(c->ssl->connection, ciphers + i * bytes);
+
+        if (cipher) {
+            len += ngx_strlen(SSL_CIPHER_get_name(cipher));
+
+        } else {
+            len += sizeof("0x") - 1 + bytes * (sizeof("00") - 1);
+        }
+
+        len += sizeof(":") - 1;
+    }
+
+    s->data = ngx_pnalloc(pool, len);
+    if (s->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    p = s->data;
+
+    for (i = 0; i < n; i++) {
+        cipher = SSL_CIPHER_find(c->ssl->connection, ciphers + i * bytes);
+
+        if (cipher) {
+            p = ngx_sprintf(p, "%s", SSL_CIPHER_get_name(cipher));
+
+        } else {
+            p = ngx_sprintf(p, "0x");
+            p = ngx_hex_dump(p, ciphers + i * bytes, bytes);
+        }
+
+        *p++ = ':';
+    }
+
+    p--;
+
+    s->len = p - s->data;
+
+#else
+
+    u_char  buf[4096];
+
+    if (SSL_get_shared_ciphers(c->ssl->connection, (char *) buf, 4096)
+        == NULL)
+    {
+        s->len = 0;
+        return NGX_OK;
+    }
+
+    s->len = ngx_strlen(buf);
+    s->data = ngx_pnalloc(pool, s->len);
+    if (s->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(s->data, buf, s->len);
+
+#endif
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_get_curves(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+#ifdef SSL_CTRL_GET_CURVES
+
+    int         *curves, n, i, nid;
+    u_char      *p;
+    size_t       len;
+
+    n = SSL_get1_curves(c->ssl->connection, NULL);
+
+    if (n <= 0) {
+        s->len = 0;
+        return NGX_OK;
+    }
+
+    curves = ngx_palloc(pool, n * sizeof(int));
+
+    n = SSL_get1_curves(c->ssl->connection, curves);
+    len = 0;
+
+    for (i = 0; i < n; i++) {
+        nid = curves[i];
+
+        if (nid & TLSEXT_nid_unknown) {
+            len += sizeof("0x0000") - 1;
+
+        } else {
+            len += ngx_strlen(OBJ_nid2sn(nid));
+        }
+
+        len += sizeof(":") - 1;
+    }
+
+    s->data = ngx_pnalloc(pool, len);
+    if (s->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    p = s->data;
+
+    for (i = 0; i < n; i++) {
+        nid = curves[i];
+
+        if (nid & TLSEXT_nid_unknown) {
+            p = ngx_sprintf(p, "0x%04xd", nid & 0xffff);
+
+        } else {
+            p = ngx_sprintf(p, "%s", OBJ_nid2sn(nid));
+        }
+
+        *p++ = ':';
+    }
+
+    p--;
+
+    s->len = p - s->data;
+
+#else
+
+    s->len = 0;
+
+#endif
+
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 {
@@ -3699,28 +3875,210 @@ ngx_ssl_get_fingerprint(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 ngx_int_t
 ngx_ssl_get_client_verify(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 {
-    X509  *cert;
-
-    if (SSL_get_verify_result(c->ssl->connection) != X509_V_OK) {
-        ngx_str_set(s, "FAILED");
-        return NGX_OK;
-    }
+    X509        *cert;
+    long         rc;
+    const char  *str;
 
     cert = SSL_get_peer_certificate(c->ssl->connection);
-
-    if (cert) {
-        ngx_str_set(s, "SUCCESS");
-
-    } else {
+    if (cert == NULL) {
         ngx_str_set(s, "NONE");
+        return NGX_OK;
     }
 
     X509_free(cert);
 
+    rc = SSL_get_verify_result(c->ssl->connection);
+
+    if (rc == X509_V_OK) {
+        ngx_str_set(s, "SUCCESS");
+        return NGX_OK;
+    }
+
+    str = X509_verify_cert_error_string(rc);
+
+    s->data = ngx_pnalloc(pool, sizeof("FAILED:") - 1 + ngx_strlen(str));
+    if (s->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    s->len = ngx_sprintf(s->data, "FAILED:%s", str) - s->data;
+
     return NGX_OK;
 }
 
 
+ngx_int_t
+ngx_ssl_get_client_v_start(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+    BIO     *bio;
+    X509    *cert;
+    size_t   len;
+
+    s->len = 0;
+
+    cert = SSL_get_peer_certificate(c->ssl->connection);
+    if (cert == NULL) {
+        return NGX_OK;
+    }
+
+    bio = BIO_new(BIO_s_mem());
+    if (bio == NULL) {
+        X509_free(cert);
+        return NGX_ERROR;
+    }
+
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
+    ASN1_TIME_print(bio, X509_get0_notBefore(cert));
+#else
+    ASN1_TIME_print(bio, X509_get_notBefore(cert));
+#endif
+
+    len = BIO_pending(bio);
+
+    s->len = len;
+    s->data = ngx_pnalloc(pool, len);
+    if (s->data == NULL) {
+        BIO_free(bio);
+        X509_free(cert);
+        return NGX_ERROR;
+    }
+
+    BIO_read(bio, s->data, len);
+    BIO_free(bio);
+    X509_free(cert);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_get_client_v_end(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+    BIO     *bio;
+    X509    *cert;
+    size_t   len;
+
+    s->len = 0;
+
+    cert = SSL_get_peer_certificate(c->ssl->connection);
+    if (cert == NULL) {
+        return NGX_OK;
+    }
+
+    bio = BIO_new(BIO_s_mem());
+    if (bio == NULL) {
+        X509_free(cert);
+        return NGX_ERROR;
+    }
+
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
+    ASN1_TIME_print(bio, X509_get0_notAfter(cert));
+#else
+    ASN1_TIME_print(bio, X509_get_notAfter(cert));
+#endif
+
+    len = BIO_pending(bio);
+
+    s->len = len;
+    s->data = ngx_pnalloc(pool, len);
+    if (s->data == NULL) {
+        BIO_free(bio);
+        X509_free(cert);
+        return NGX_ERROR;
+    }
+
+    BIO_read(bio, s->data, len);
+    BIO_free(bio);
+    X509_free(cert);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_get_client_v_remain(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+    X509    *cert;
+    time_t   now, end;
+
+    s->len = 0;
+
+    cert = SSL_get_peer_certificate(c->ssl->connection);
+    if (cert == NULL) {
+        return NGX_OK;
+    }
+
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
+    end = ngx_ssl_parse_time(X509_get0_notAfter(cert));
+#else
+    end = ngx_ssl_parse_time(X509_get_notAfter(cert));
+#endif
+
+    if (end == (time_t) NGX_ERROR) {
+        X509_free(cert);
+        return NGX_OK;
+    }
+
+    now = ngx_time();
+
+    if (end < now + 86400) {
+        ngx_str_set(s, "0");
+        X509_free(cert);
+        return NGX_OK;
+    }
+
+    s->data = ngx_pnalloc(pool, NGX_TIME_T_LEN);
+    if (s->data == NULL) {
+        X509_free(cert);
+        return NGX_ERROR;
+    }
+
+    s->len = ngx_sprintf(s->data, "%T", (end - now) / 86400) - s->data;
+
+    X509_free(cert);
+
+    return NGX_OK;
+}
+
+
+static time_t
+ngx_ssl_parse_time(
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
+    const
+#endif
+    ASN1_TIME *asn1time)
+{
+    BIO     *bio;
+    u_char  *value;
+    size_t   len;
+    time_t   time;
+
+    /*
+     * OpenSSL doesn't provide a way to convert ASN1_TIME
+     * into time_t.  To do this, we use ASN1_TIME_print(),
+     * which uses the "MMM DD HH:MM:SS YYYY [GMT]" format (e.g.,
+     * "Feb  3 00:55:52 2015 GMT"), and parse the result.
+     */
+
+    bio = BIO_new(BIO_s_mem());
+    if (bio == NULL) {
+        return NGX_ERROR;
+    }
+
+    /* fake weekday prepended to match C asctime() format */
+
+    BIO_write(bio, "Tue ", sizeof("Tue ") - 1);
+    ASN1_TIME_print(bio, asn1time);
+    len = BIO_get_mem_data(bio, &value);
+
+    time = ngx_parse_http_time(value, len);
+
+    BIO_free(bio);
+
+    return time;
+}
+
+
 static void *
 ngx_openssl_create_conf(ngx_cycle_t *cycle)
 {
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index d233c02..c022307 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -191,6 +191,10 @@ ngx_int_t ngx_ssl_get_protocol(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_cipher_name(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
+ngx_int_t ngx_ssl_get_ciphers(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
+ngx_int_t ngx_ssl_get_curves(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
 ngx_int_t ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_session_reused(ngx_connection_t *c, ngx_pool_t *pool,
@@ -215,6 +219,12 @@ ngx_int_t ngx_ssl_get_fingerprint(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_client_verify(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
+ngx_int_t ngx_ssl_get_client_v_start(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
+ngx_int_t ngx_ssl_get_client_v_end(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
+ngx_int_t ngx_ssl_get_client_v_remain(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
 
 
 ngx_int_t ngx_ssl_handshake(ngx_connection_t *c);
@@ -236,6 +246,7 @@ extern int  ngx_ssl_session_cache_index;
 extern int  ngx_ssl_session_ticket_keys_index;
 extern int  ngx_ssl_certificate_index;
 extern int  ngx_ssl_next_certificate_index;
+extern int  ngx_ssl_certificate_name_index;
 extern int  ngx_ssl_stapling_index;
 
 
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index 09fab76..2100516 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -31,6 +31,8 @@ typedef struct {
     X509                        *cert;
     X509                        *issuer;
 
+    u_char                      *name;
+
     time_t                       valid;
     time_t                       refresh;
 
@@ -45,6 +47,8 @@ struct ngx_ssl_ocsp_ctx_s {
     X509                        *cert;
     X509                        *issuer;
 
+    u_char                      *name;
+
     ngx_uint_t                   naddrs;
 
     ngx_addr_t                  *addrs;
@@ -57,14 +61,14 @@ struct ngx_ssl_ocsp_ctx_s {
 
     ngx_msec_t                   timeout;
 
-    void                       (*handler)(ngx_ssl_ocsp_ctx_t *r);
+    void                       (*handler)(ngx_ssl_ocsp_ctx_t *ctx);
     void                        *data;
 
     ngx_buf_t                   *request;
     ngx_buf_t                   *response;
     ngx_peer_connection_t        peer;
 
-    ngx_int_t                  (*process)(ngx_ssl_ocsp_ctx_t *r);
+    ngx_int_t                  (*process)(ngx_ssl_ocsp_ctx_t *ctx);
 
     ngx_uint_t                   state;
 
@@ -173,6 +177,8 @@ ngx_ssl_stapling_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, X509 *cert,
     staple->timeout = 60000;
     staple->verify = verify;
     staple->cert = cert;
+    staple->name = X509_get_ex_data(staple->cert,
+                                    ngx_ssl_certificate_name_index);
 
     if (file->len) {
         /* use OCSP response from the file */
@@ -354,7 +360,9 @@ ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl,
 
     if (rc == 0) {
         ngx_log_error(NGX_LOG_WARN, ssl->log, 0,
-                      "\"ssl_stapling\" ignored, issuer certificate not found");
+                      "\"ssl_stapling\" ignored, "
+                      "issuer certificate not found for certificate \"%s\"",
+                      staple->name);
         X509_STORE_CTX_free(store_ctx);
         return NGX_DECLINED;
     }
@@ -374,9 +382,9 @@ static ngx_int_t
 ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_ssl_stapling_t *staple, ngx_str_t *responder)
 {
-    ngx_url_t                  u;
     char                      *s;
     ngx_str_t                  rsp;
+    ngx_url_t                  u;
     STACK_OF(OPENSSL_STRING)  *aia;
 
     if (responder->len == 0) {
@@ -387,7 +395,8 @@ ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
         if (aia == NULL) {
             ngx_log_error(NGX_LOG_WARN, ssl->log, 0,
                           "\"ssl_stapling\" ignored, "
-                          "no OCSP responder URL in the certificate");
+                          "no OCSP responder URL in the certificate \"%s\"",
+                          staple->name);
             return NGX_DECLINED;
         }
 
@@ -399,7 +408,8 @@ ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
         if (s == NULL) {
             ngx_log_error(NGX_LOG_WARN, ssl->log, 0,
                           "\"ssl_stapling\" ignored, "
-                          "no OCSP responder URL in the certificate");
+                          "no OCSP responder URL in the certificate \"%s\"",
+                          staple->name);
             X509_email_free(aia);
             return NGX_DECLINED;
         }
@@ -432,7 +442,9 @@ ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
     } else {
         ngx_log_error(NGX_LOG_WARN, ssl->log, 0,
                       "\"ssl_stapling\" ignored, "
-                      "invalid URL prefix in OCSP responder \"%V\"", &u.url);
+                      "invalid URL prefix in OCSP responder \"%V\" "
+                      "in the certificate \"%s\"",
+                      &u.url, staple->name);
         return NGX_DECLINED;
     }
 
@@ -440,7 +452,9 @@ ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
         if (u.err) {
             ngx_log_error(NGX_LOG_WARN, ssl->log, 0,
                           "\"ssl_stapling\" ignored, "
-                          "%s in OCSP responder \"%V\"", u.err, &u.url);
+                          "%s in OCSP responder \"%V\" "
+                          "in the certificate \"%s\"",
+                          u.err, &u.url, staple->name);
             return NGX_DECLINED;
         }
 
@@ -547,6 +561,7 @@ ngx_ssl_stapling_update(ngx_ssl_stapling_t *staple)
 
     ctx->cert = staple->cert;
     ctx->issuer = staple->issuer;
+    ctx->name = staple->name;
 
     ctx->addrs = staple->addrs;
     ctx->host = staple->host;
@@ -757,10 +772,10 @@ error:
 static time_t
 ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time)
 {
+    BIO     *bio;
     u_char  *value;
     size_t   len;
     time_t   time;
-    BIO     *bio;
 
     /*
      * OpenSSL doesn't provide a way to convert ASN1_GENERALIZEDTIME
@@ -1005,7 +1020,7 @@ failed:
 static void
 ngx_ssl_ocsp_connect(ngx_ssl_ocsp_ctx_t *ctx)
 {
-    ngx_int_t    rc;
+    ngx_int_t  rc;
 
     ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
                    "ssl ocsp connect");
@@ -1103,10 +1118,10 @@ ngx_ssl_ocsp_write_handler(ngx_event_t *wev)
 static void
 ngx_ssl_ocsp_read_handler(ngx_event_t *rev)
 {
-    ssize_t            n, size;
-    ngx_int_t          rc;
-    ngx_ssl_ocsp_ctx_t    *ctx;
-    ngx_connection_t  *c;
+    ssize_t              n, size;
+    ngx_int_t            rc;
+    ngx_connection_t    *c;
+    ngx_ssl_ocsp_ctx_t  *ctx;
 
     c = rev->data;
     ctx = c->data;
@@ -1310,12 +1325,11 @@ ngx_ssl_ocsp_process_status_line(ngx_ssl_ocsp_ctx_t *ctx)
     rc = ngx_ssl_ocsp_parse_status_line(ctx);
 
     if (rc == NGX_OK) {
-#if 0
-        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
-                       "ssl ocsp status line \"%*s\"",
-                       ctx->response->pos - ctx->response->start,
-                       ctx->response->start);
-#endif
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                       "ssl ocsp status %ui \"%*s\"",
+                       ctx->code,
+                       ctx->header_end - ctx->header_start,
+                       ctx->header_start);
 
         ctx->process = ngx_ssl_ocsp_process_headers;
         return ctx->process(ctx);
@@ -1476,6 +1490,7 @@ ngx_ssl_ocsp_parse_status_line(ngx_ssl_ocsp_ctx_t *ctx)
 
             if (++ctx->count == 3) {
                 state = sw_space_after_status;
+                ctx->header_start = p - 2;
             }
 
             break;
@@ -1493,6 +1508,7 @@ ngx_ssl_ocsp_parse_status_line(ngx_ssl_ocsp_ctx_t *ctx)
                 state = sw_almost_done;
                 break;
             case LF:
+                ctx->header_end = p;
                 goto done;
             default:
                 return NGX_ERROR;
@@ -1506,6 +1522,7 @@ ngx_ssl_ocsp_parse_status_line(ngx_ssl_ocsp_ctx_t *ctx)
                 state = sw_almost_done;
                 break;
             case LF:
+                ctx->header_end = p;
                 goto done;
             }
             break;
@@ -1514,6 +1531,7 @@ ngx_ssl_ocsp_parse_status_line(ngx_ssl_ocsp_ctx_t *ctx)
         case sw_almost_done:
             switch (ch) {
             case LF:
+                ctx->header_end = p - 1;
                 goto done;
             default:
                 return NGX_ERROR;
@@ -1608,10 +1626,11 @@ ngx_ssl_ocsp_process_headers(ngx_ssl_ocsp_ctx_t *ctx)
     return ctx->process(ctx);
 }
 
+
 static ngx_int_t
 ngx_ssl_ocsp_parse_header_line(ngx_ssl_ocsp_ctx_t *ctx)
 {
-    u_char      c, ch, *p;
+    u_char  c, ch, *p;
     enum {
         sw_start = 0,
         sw_name,
@@ -1821,12 +1840,27 @@ ngx_ssl_ocsp_log_error(ngx_log_t *log, u_char *buf, size_t len)
     if (log->action) {
         p = ngx_snprintf(buf, len, " while %s", log->action);
         len -= p - buf;
+        buf = p;
     }
 
     ctx = log->data;
 
     if (ctx) {
-        p = ngx_snprintf(p, len, ", responder: %V", &ctx->host);
+        p = ngx_snprintf(buf, len, ", responder: %V", &ctx->host);
+        len -= p - buf;
+        buf = p;
+    }
+
+    if (ctx && ctx->peer.name) {
+        p = ngx_snprintf(buf, len, ", peer: %V", ctx->peer.name);
+        len -= p - buf;
+        buf = p;
+    }
+
+    if (ctx && ctx->name) {
+        p = ngx_snprintf(buf, len, ", certificate: \"%s\"", ctx->name);
+        len -= p - buf;
+        buf = p;
     }
 
     return p;
@@ -1846,6 +1880,7 @@ ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file,
     return NGX_OK;
 }
 
+
 ngx_int_t
 ngx_ssl_stapling_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_resolver_t *resolver, ngx_msec_t resolver_timeout)
diff --git a/src/http/modules/ngx_http_map_module.c b/src/http/modules/ngx_http_map_module.c
index 732aa5d..2fc9be9 100644
--- a/src/http/modules/ngx_http_map_module.c
+++ b/src/http/modules/ngx_http_map_module.c
@@ -26,7 +26,8 @@ typedef struct {
 
     ngx_http_variable_value_t  *default_value;
     ngx_conf_t                 *cf;
-    ngx_uint_t                  hostnames;      /* unsigned  hostnames:1 */
+    unsigned                    hostnames:1;
+    unsigned                    no_cacheable:1;
 } ngx_http_map_conf_ctx_t;
 
 
@@ -265,6 +266,7 @@ ngx_http_map_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ctx.default_value = NULL;
     ctx.cf = &save;
     ctx.hostnames = 0;
+    ctx.no_cacheable = 0;
 
     save = *cf;
     cf->pool = pool;
@@ -281,6 +283,10 @@ ngx_http_map_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return rv;
     }
 
+    if (ctx.no_cacheable) {
+        var->flags |= NGX_HTTP_VAR_NOCACHEABLE;
+    }
+
     map->default_value = ctx.default_value ? ctx.default_value:
                                              &ngx_http_variable_null_value;
 
@@ -393,8 +399,16 @@ ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
     {
         ctx->hostnames = 1;
         return NGX_CONF_OK;
+    }
 
-    } else if (cf->args->nelts != 2) {
+    if (cf->args->nelts == 1
+        && ngx_strcmp(value[0].data, "volatile") == 0)
+    {
+        ctx->no_cacheable = 1;
+        return NGX_CONF_OK;
+    }
+
+    if (cf->args->nelts != 2) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid number of the map parameters");
         return NGX_CONF_ERROR;
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 8f2920f..f3c0fdd 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -1229,7 +1229,9 @@ ngx_http_mp4_update_mdat_atom(ngx_http_mp4_file_t *mp4, off_t start_offset,
 
     atom_header = mp4->mdat_atom_header;
 
-    if ((uint64_t) atom_data_size > (uint64_t) 0xffffffff) {
+    if ((uint64_t) atom_data_size
+        > (uint64_t) 0xffffffff - sizeof(ngx_mp4_atom_header_t))
+    {
         atom_size = 1;
         atom_header_size = sizeof(ngx_mp4_atom_header64_t);
         ngx_mp4_set_64value(atom_header + sizeof(ngx_mp4_atom_header_t),
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index e75f5d8..2771ac1 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -276,6 +276,12 @@ static ngx_http_variable_t  ngx_http_ssl_vars[] = {
     { ngx_string("ssl_cipher"), NULL, ngx_http_ssl_static_variable,
       (uintptr_t) ngx_ssl_get_cipher_name, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_ciphers"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_ciphers, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_curves"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_curves, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_session_id"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_session_id, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
@@ -313,6 +319,15 @@ static ngx_http_variable_t  ngx_http_ssl_vars[] = {
     { ngx_string("ssl_client_verify"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_client_verify, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_client_v_start"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_client_v_start, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_v_end"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_client_v_end, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_v_remain"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_client_v_remain, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
     { ngx_null_string, NULL, NULL, 0, 0, 0 }
 };
 
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index f9a9a84..2796319 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -207,6 +207,7 @@ ngx_http_perl_handle_request(ngx_http_request_t *r)
 
     dTHXa(pmcf->perl);
     PERL_SET_CONTEXT(pmcf->perl);
+    PERL_SET_INTERP(pmcf->perl);
 
     if (ctx->next == NULL) {
         plcf = ngx_http_get_module_loc_conf(r, ngx_http_perl_module);
@@ -322,6 +323,7 @@ ngx_http_perl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
 
     dTHXa(pmcf->perl);
     PERL_SET_CONTEXT(pmcf->perl);
+    PERL_SET_INTERP(pmcf->perl);
 
     rc = ngx_http_perl_call_handler(aTHX_ r, pmcf->nginx, pv->sub, NULL,
                                     &pv->handler, &value);
@@ -387,6 +389,7 @@ ngx_http_perl_ssi(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ssi_ctx,
 
     dTHXa(pmcf->perl);
     PERL_SET_CONTEXT(pmcf->perl);
+    PERL_SET_INTERP(pmcf->perl);
 
 #if 0
 
@@ -568,6 +571,7 @@ ngx_http_perl_create_interpreter(ngx_conf_t *cf,
 
     dTHXa(perl);
     PERL_SET_CONTEXT(perl);
+    PERL_SET_INTERP(perl);
 
     perl_construct(perl);
 
@@ -828,6 +832,7 @@ ngx_http_perl_cleanup_perl(void *data)
     PerlInterpreter  *perl = data;
 
     PERL_SET_CONTEXT(perl);
+    PERL_SET_INTERP(perl);
 
     (void) perl_destruct(perl);
 
@@ -936,6 +941,7 @@ ngx_http_perl(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     dTHXa(pmcf->perl);
     PERL_SET_CONTEXT(pmcf->perl);
+    PERL_SET_INTERP(pmcf->perl);
 
     ngx_http_perl_eval_anon_sub(aTHX_ &value[1], &plcf->sub);
 
@@ -1007,6 +1013,7 @@ ngx_http_perl_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     dTHXa(pmcf->perl);
     PERL_SET_CONTEXT(pmcf->perl);
+    PERL_SET_INTERP(pmcf->perl);
 
     ngx_http_perl_eval_anon_sub(aTHX_ &value[2], &pv->sub);
 
@@ -1039,6 +1046,7 @@ ngx_http_perl_init_worker(ngx_cycle_t *cycle)
     if (pmcf) {
         dTHXa(pmcf->perl);
         PERL_SET_CONTEXT(pmcf->perl);
+        PERL_SET_INTERP(pmcf->perl);
 
         /* set worker's $$ */
 
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 8301630..f3050f1 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -286,7 +286,6 @@ ngx_http_v2_init(ngx_event_t *rev)
                                             : ngx_http_v2_state_preface;
 
     ngx_queue_init(&h2c->waiting);
-    ngx_queue_init(&h2c->posted);
     ngx_queue_init(&h2c->dependencies);
     ngx_queue_init(&h2c->closed);
 
@@ -420,9 +419,7 @@ static void
 ngx_http_v2_write_handler(ngx_event_t *wev)
 {
     ngx_int_t                  rc;
-    ngx_queue_t               *q;
     ngx_connection_t          *c;
-    ngx_http_v2_stream_t      *stream;
     ngx_http_v2_connection_t  *h2c;
 
     c = wev->data;
@@ -457,26 +454,6 @@ ngx_http_v2_write_handler(ngx_event_t *wev)
         return;
     }
 
-    while (!ngx_queue_empty(&h2c->posted)) {
-        q = ngx_queue_head(&h2c->posted);
-
-        ngx_queue_remove(q);
-
-        stream = ngx_queue_data(q, ngx_http_v2_stream_t, queue);
-
-        stream->handled = 0;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "run http2 stream %ui", stream->node->id);
-
-        wev = stream->request->connection->write;
-
-        wev->active = 0;
-        wev->ready = 1;
-
-        wev->handler(wev);
-    }
-
     h2c->blocked = 0;
 
     if (rc == NGX_AGAIN) {
@@ -2254,7 +2231,7 @@ ngx_http_v2_state_window_update(ngx_http_v2_connection_t *h2c, u_char *pos,
 
         stream = ngx_queue_data(q, ngx_http_v2_stream_t, queue);
 
-        stream->handled = 0;
+        stream->waiting = 0;
 
         wev = stream->request->connection->write;
 
@@ -3575,6 +3552,11 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
         rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
 
     } else {
+        if (stream->preread) {
+            /* enforce writing preread buffer to file */
+            r->request_body_in_file_only = 1;
+        }
+
         rb->buf = ngx_calloc_buf(r->pool);
 
         if (rb->buf != NULL) {
@@ -4271,7 +4253,7 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
                 continue;
             }
 
-            stream->handled = 0;
+            stream->waiting = 0;
 
             r = stream->request;
             fc = r->connection;
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 63bbdad..cddfccd 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -137,7 +137,6 @@ struct ngx_http_v2_connection_s {
 
     ngx_http_v2_out_frame_t         *last_out;
 
-    ngx_queue_t                      posted;
     ngx_queue_t                      dependencies;
     ngx_queue_t                      closed;
 
@@ -192,7 +191,7 @@ struct ngx_http_v2_stream_s {
 
     ngx_pool_t                      *pool;
 
-    unsigned                         handled:1;
+    unsigned                         waiting:1;
     unsigned                         blocked:1;
     unsigned                         exhausted:1;
     unsigned                         in_closed:1;
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 878020e..8abca4d 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -1104,11 +1104,11 @@ ngx_http_v2_waiting_queue(ngx_http_v2_connection_t *h2c,
     ngx_queue_t           *q;
     ngx_http_v2_stream_t  *s;
 
-    if (stream->handled) {
+    if (stream->waiting) {
         return;
     }
 
-    stream->handled = 1;
+    stream->waiting = 1;
 
     for (q = ngx_queue_last(&h2c->waiting);
          q != ngx_queue_sentinel(&h2c->waiting);
@@ -1298,20 +1298,29 @@ static ngx_inline void
 ngx_http_v2_handle_stream(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream)
 {
+    ngx_event_t       *wev;
     ngx_connection_t  *fc;
 
-    if (stream->handled || stream->blocked) {
+    if (stream->waiting || stream->blocked) {
         return;
     }
 
     fc = stream->request->connection;
 
-    if (!fc->error && (stream->exhausted || fc->write->delayed)) {
+    if (!fc->error && stream->exhausted) {
         return;
     }
 
-    stream->handled = 1;
-    ngx_queue_insert_tail(&h2c->posted, &stream->queue);
+    wev = fc->write;
+
+    wev->active = 0;
+    wev->ready = 1;
+
+    if (!fc->error && wev->delayed) {
+        return;
+    }
+
+    ngx_post_event(wev, &ngx_posted_events);
 }
 
 
@@ -1321,11 +1330,13 @@ ngx_http_v2_filter_cleanup(void *data)
     ngx_http_v2_stream_t *stream = data;
 
     size_t                     window;
+    ngx_event_t               *wev;
+    ngx_queue_t               *q;
     ngx_http_v2_out_frame_t   *frame, **fn;
     ngx_http_v2_connection_t  *h2c;
 
-    if (stream->handled) {
-        stream->handled = 0;
+    if (stream->waiting) {
+        stream->waiting = 0;
         ngx_queue_remove(&stream->queue);
     }
 
@@ -1359,9 +1370,26 @@ ngx_http_v2_filter_cleanup(void *data)
         fn = &frame->next;
     }
 
-    if (h2c->send_window == 0 && window && !ngx_queue_empty(&h2c->waiting)) {
-        ngx_queue_add(&h2c->posted, &h2c->waiting);
-        ngx_queue_init(&h2c->waiting);
+    if (h2c->send_window == 0 && window) {
+
+        while (!ngx_queue_empty(&h2c->waiting)) {
+            q = ngx_queue_head(&h2c->waiting);
+
+            ngx_queue_remove(q);
+
+            stream = ngx_queue_data(q, ngx_http_v2_stream_t, queue);
+
+            stream->waiting = 0;
+
+            wev = stream->request->connection->write;
+
+            wev->active = 0;
+            wev->ready = 1;
+
+            if (!wev->delayed) {
+                ngx_post_event(wev, &ngx_posted_events);
+            }
+        }
     }
 
     h2c->send_window += window;
diff --git a/src/stream/ngx_stream_map_module.c b/src/stream/ngx_stream_map_module.c
index 47a15be..ef06b2d 100644
--- a/src/stream/ngx_stream_map_module.c
+++ b/src/stream/ngx_stream_map_module.c
@@ -26,7 +26,8 @@ typedef struct {
 
     ngx_stream_variable_value_t  *default_value;
     ngx_conf_t                   *cf;
-    ngx_uint_t                    hostnames;      /* unsigned  hostnames:1 */
+    unsigned                      hostnames:1;
+    unsigned                      no_cacheable:1;
 } ngx_stream_map_conf_ctx_t;
 
 
@@ -264,6 +265,7 @@ ngx_stream_map_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ctx.default_value = NULL;
     ctx.cf = &save;
     ctx.hostnames = 0;
+    ctx.no_cacheable = 0;
 
     save = *cf;
     cf->pool = pool;
@@ -280,6 +282,10 @@ ngx_stream_map_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return rv;
     }
 
+    if (ctx.no_cacheable) {
+        var->flags |= NGX_STREAM_VAR_NOCACHEABLE;
+    }
+
     map->default_value = ctx.default_value ? ctx.default_value:
                                              &ngx_stream_variable_null_value;
 
@@ -392,8 +398,16 @@ ngx_stream_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
     {
         ctx->hostnames = 1;
         return NGX_CONF_OK;
+    }
 
-    } else if (cf->args->nelts != 2) {
+    if (cf->args->nelts == 1
+        && ngx_strcmp(value[0].data, "volatile") == 0)
+    {
+        ctx->no_cacheable = 1;
+        return NGX_CONF_OK;
+    }
+
+    if (cf->args->nelts != 2) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid number of the map parameters");
         return NGX_CONF_ERROR;
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index d00718b..9191641 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -182,6 +182,12 @@ static ngx_stream_variable_t  ngx_stream_ssl_vars[] = {
     { ngx_string("ssl_cipher"), NULL, ngx_stream_ssl_static_variable,
       (uintptr_t) ngx_ssl_get_cipher_name, NGX_STREAM_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_ciphers"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_ciphers, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_curves"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_curves, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_session_id"), NULL, ngx_stream_ssl_variable,
       (uintptr_t) ngx_ssl_get_session_id, NGX_STREAM_VAR_CHANGEABLE, 0 },
 

From a27ccda8362f40679d80e10bd1d8f0ab138bf677 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 19 Dec 2016 17:02:11 +0200
Subject: [PATCH 136/600] Fix lintian error 'possible-missing-colon-in-closes'

Gbp-Dch: Ignore
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index af0ea9f..8e4f587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 nginx (1.10.2-3) UNRELEASED; urgency=medium
 
   * debian/conf/sites-enabled/default:
-    + Correcting location of default php-fpm socket. (Closes #846145)
+    + Correcting location of default php-fpm socket. (Closes: #846145)
 
  -- Michael Lustfield <michael@lustfield.net>  Sat, 03 Dec 2016 07:57:39 +0000
 

From 5140bc7eae4c595e8f2eb20ac3f1f8ec5d986df1 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 20 Dec 2016 16:29:48 +0200
Subject: [PATCH 137/600] mod: Upgrade nchan to 1.0.8

Closes: #844473
---
 debian/modules/README.Modules-versions        |     2 +-
 debian/modules/nchan/README.md                |   147 +-
 debian/modules/nchan/changelog.txt            |    35 +
 debian/modules/nchan/config                   |     1 +
 debian/modules/nchan/dev/.gitignore           |     6 -
 debian/modules/nchan/dev/Gemfile              |    28 -
 debian/modules/nchan/dev/authserver.rb        |    62 -
 debian/modules/nchan/dev/bench-parallel.sh    |    27 -
 debian/modules/nchan/dev/bench.rb             |   178 -
 debian/modules/nchan/dev/cert-key.pem         |    28 -
 debian/modules/nchan/dev/cert.pem             |    22 -
 debian/modules/nchan/dev/chattertest.rb       |    43 -
 debian/modules/nchan/dev/debug.sh             |    11 -
 debian/modules/nchan/dev/dev.conf             |    63 -
 debian/modules/nchan/dev/examine_coredump.sh  |    17 -
 .../modules/nchan/dev/gen_config_commands.rb  |   129 -
 debian/modules/nchan/dev/longtest.rb          |   184 -
 debian/modules/nchan/dev/memparse.lua         |   269 -
 debian/modules/nchan/dev/nginx                |     1 -
 .../modules/nchan/dev/nginx-cachemanager.conf |    67 -
 .../modules/nchan/dev/nginx-nchan/.gitignore  |     6 -
 debian/modules/nchan/dev/nginx-nchan/PKGBUILD |   225 -
 debian/modules/nchan/dev/nginx-nchan/bl.txt   |     6 -
 debian/modules/nchan/dev/nginx-nchan/install  |    11 -
 debian/modules/nchan/dev/nginx-nchan/nchan    |     1 -
 .../modules/nchan/dev/nginx-nchan/nginx.conf  |     1 -
 .../nchan/dev/nginx-nchan/nginx.logrotate     |     8 -
 .../nchan/dev/nginx-nchan/nginx.service       |    14 -
 .../nchan/dev/nginx-nchan/ngx_slab.patch      |    98 -
 debian/modules/nchan/dev/nginx-proxy.conf     |    26 -
 debian/modules/nchan/dev/nginx.conf           |   444 -
 debian/modules/nchan/dev/nginx.sh             |   277 -
 debian/modules/nchan/dev/package/.gitignore   |     1 -
 .../dev/package/nginx-nchan-static/.gitignore |     5 -
 .../dev/package/nginx-nchan-static/PKGBUILD   |   165 -
 .../dev/package/nginx-nchan-static/nginx.conf |     1 -
 .../nginx-nchan-static/nginx.logrotate        |    11 -
 .../package/nginx-nchan-static/nginx.service  |    18 -
 debian/modules/nchan/dev/package/repackage.sh |    28 -
 debian/modules/nchan/dev/pub-multi.rb         |    39 -
 debian/modules/nchan/dev/pub.rb               |    90 -
 debian/modules/nchan/dev/pubsub.rb            |  1483 -
 debian/modules/nchan/dev/rebuild.sh           |   170 -
 debian/modules/nchan/dev/redis-trib.rb        |  1696 -
 debian/modules/nchan/dev/redis.conf           |  1018 -
 .../nchan/dev/redis_clusterconf/.gitignore    |     1 -
 .../nchan/dev/redis_clusterconf/cluster.sh    |    10 -
 .../nchan/dev/redis_clusterconf/failover.sh   |    62 -
 .../dev/redis_clusterconf/redis-7000.conf     |  1018 -
 .../dev/redis_clusterconf/redis-7001.conf     |  1018 -
 .../dev/redis_clusterconf/redis-7002.conf     |  1018 -
 .../dev/redis_clusterconf/redis-7003.conf     |  1018 -
 .../dev/redis_clusterconf/redis-7004.conf     |  1018 -
 .../dev/redis_clusterconf/redis-7005.conf     |  1018 -
 .../dev/redis_clusterconf/redis-7006.conf     |  1018 -
 .../redis-cluster-node-7000.conf              |     7 -
 .../redis-cluster-node-7001.conf              |     7 -
 .../redis-cluster-node-7002.conf              |     7 -
 .../redis-cluster-node-7003.conf              |     7 -
 .../redis-cluster-node-7004.conf              |     7 -
 .../redis-cluster-node-7005.conf              |     7 -
 .../redis-cluster-node-7006.conf              |     2 -
 debian/modules/nchan/dev/redocument.rb        |   295 -
 debian/modules/nchan/dev/rsck.sh              |    67 -
 debian/modules/nchan/dev/sub.rb               |   125 -
 debian/modules/nchan/dev/test-parallel.sh     |    27 -
 debian/modules/nchan/dev/test.rb              |   875 -
 debian/modules/nchan/dev/vg.supp              | 26977 ----------------
 debian/modules/nchan/src/nchan_commands.rb    |   119 +-
 .../modules/nchan/src/nchan_config_commands.c |    30 +-
 debian/modules/nchan/src/nchan_defs.h         |     2 +-
 debian/modules/nchan/src/nchan_module.c       |   256 +-
 debian/modules/nchan/src/nchan_module.h       |     5 +-
 debian/modules/nchan/src/nchan_setup.c        |    74 +-
 debian/modules/nchan/src/nchan_types.h        |    19 +-
 .../modules/nchan/src/store/memory/memstore.c |   239 +-
 .../nchan/src/store/memory/store-private.h    |     4 +-
 debian/modules/nchan/src/store/memory/store.h |     2 +
 .../modules/nchan/src/store/redis/rdsstore.c  |    21 +-
 .../src/store/redis/redis_lua_commands.h      |    49 +-
 .../src/store/redis/scripts/find_channel.lua  |    47 +-
 debian/modules/nchan/src/store/spool.c        |    41 +-
 debian/modules/nchan/src/store/spool.h        |     6 +
 debian/modules/nchan/src/subscribers/common.c |   418 +-
 debian/modules/nchan/src/subscribers/common.h |     9 +-
 .../nchan/src/subscribers/eventsource.c       |     8 +-
 .../src/subscribers/http-multipart-mixed.c    |     8 +-
 .../modules/nchan/src/subscribers/internal.c  |    10 +-
 .../modules/nchan/src/subscribers/longpoll.c  |    38 +-
 .../nchan/src/subscribers/memstore_ipc.c      |     8 +-
 .../nchan/src/subscribers/memstore_multi.c    |     2 +-
 .../nchan/src/subscribers/memstore_redis.c    |     6 +-
 .../modules/nchan/src/subscribers/websocket.c |   615 +-
 .../nchan/src/util/nchan_channel_info.c       |    13 +-
 .../nchan/src/util/nchan_fake_request.c       |   277 +
 .../nchan/src/util/nchan_fake_request.h       |     6 +
 debian/modules/nchan/src/util/nchan_output.c  |   120 +-
 debian/modules/nchan/src/util/nchan_output.h  |     2 +
 debian/modules/nchan/src/util/nchan_reaper.c  |     2 +-
 debian/modules/nchan/src/util/nchan_reaper.h  |     2 +-
 .../modules/nchan/src/util/nchan_subrequest.c |    17 +
 .../modules/nchan/src/util/nchan_subrequest.h |     1 +
 debian/modules/nchan/src/util/nchan_util.c    |    14 +
 debian/modules/nchan/src/util/nchan_util.h    |     1 +
 .../nchan/src/util/ngx_nchan_hacked_slab.c    |    11 +-
 105 files changed, 1990 insertions(+), 43283 deletions(-)
 delete mode 100644 debian/modules/nchan/dev/.gitignore
 delete mode 100644 debian/modules/nchan/dev/Gemfile
 delete mode 100755 debian/modules/nchan/dev/authserver.rb
 delete mode 100755 debian/modules/nchan/dev/bench-parallel.sh
 delete mode 100755 debian/modules/nchan/dev/bench.rb
 delete mode 100644 debian/modules/nchan/dev/cert-key.pem
 delete mode 100644 debian/modules/nchan/dev/cert.pem
 delete mode 100755 debian/modules/nchan/dev/chattertest.rb
 delete mode 100755 debian/modules/nchan/dev/debug.sh
 delete mode 100644 debian/modules/nchan/dev/dev.conf
 delete mode 100755 debian/modules/nchan/dev/examine_coredump.sh
 delete mode 100755 debian/modules/nchan/dev/gen_config_commands.rb
 delete mode 100755 debian/modules/nchan/dev/longtest.rb
 delete mode 100755 debian/modules/nchan/dev/memparse.lua
 delete mode 120000 debian/modules/nchan/dev/nginx
 delete mode 100644 debian/modules/nchan/dev/nginx-cachemanager.conf
 delete mode 100644 debian/modules/nchan/dev/nginx-nchan/.gitignore
 delete mode 100644 debian/modules/nchan/dev/nginx-nchan/PKGBUILD
 delete mode 100644 debian/modules/nchan/dev/nginx-nchan/bl.txt
 delete mode 100644 debian/modules/nchan/dev/nginx-nchan/install
 delete mode 120000 debian/modules/nchan/dev/nginx-nchan/nchan
 delete mode 100644 debian/modules/nchan/dev/nginx-nchan/nginx.conf
 delete mode 100644 debian/modules/nchan/dev/nginx-nchan/nginx.logrotate
 delete mode 100644 debian/modules/nchan/dev/nginx-nchan/nginx.service
 delete mode 100644 debian/modules/nchan/dev/nginx-nchan/ngx_slab.patch
 delete mode 100644 debian/modules/nchan/dev/nginx-proxy.conf
 delete mode 100644 debian/modules/nchan/dev/nginx.conf
 delete mode 100755 debian/modules/nchan/dev/nginx.sh
 delete mode 100644 debian/modules/nchan/dev/package/.gitignore
 delete mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/.gitignore
 delete mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/PKGBUILD
 delete mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/nginx.conf
 delete mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/nginx.logrotate
 delete mode 100644 debian/modules/nchan/dev/package/nginx-nchan-static/nginx.service
 delete mode 100755 debian/modules/nchan/dev/package/repackage.sh
 delete mode 100755 debian/modules/nchan/dev/pub-multi.rb
 delete mode 100755 debian/modules/nchan/dev/pub.rb
 delete mode 100644 debian/modules/nchan/dev/pubsub.rb
 delete mode 100755 debian/modules/nchan/dev/rebuild.sh
 delete mode 100755 debian/modules/nchan/dev/redis-trib.rb
 delete mode 100644 debian/modules/nchan/dev/redis.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/.gitignore
 delete mode 100755 debian/modules/nchan/dev/redis_clusterconf/cluster.sh
 delete mode 100755 debian/modules/nchan/dev/redis_clusterconf/failover.sh
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7000.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7001.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7002.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7003.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7004.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7005.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-7006.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7000.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7001.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7002.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7003.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7004.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7005.conf
 delete mode 100644 debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7006.conf
 delete mode 100755 debian/modules/nchan/dev/redocument.rb
 delete mode 100755 debian/modules/nchan/dev/rsck.sh
 delete mode 100755 debian/modules/nchan/dev/sub.rb
 delete mode 100755 debian/modules/nchan/dev/test-parallel.sh
 delete mode 100755 debian/modules/nchan/dev/test.rb
 delete mode 100644 debian/modules/nchan/dev/vg.supp
 create mode 100644 debian/modules/nchan/src/util/nchan_fake_request.c
 create mode 100644 debian/modules/nchan/src/util/nchan_fake_request.h

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index a8b93ff..957ac00 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -33,7 +33,7 @@ README for Modules versions
 
  nchan
   Homepage: https://github.com/slact/nchan
-  Version: 1.0.2
+  Version: 1.0.8
 
  nginx-upload-progress
   Homepage: https://github.com/masterzen/nginx-upload-progress-module
diff --git a/debian/modules/nchan/README.md b/debian/modules/nchan/README.md
index fecd417..ee43ac9 100644
--- a/debian/modules/nchan/README.md
+++ b/debian/modules/nchan/README.md
@@ -2,20 +2,31 @@
 
 https://nchan.slact.net
 
-Nchan is a scalable, flexible pub/sub server for the modern web, built as a module for the [Nginx](http://nginx.org) web server. It can be configured as a standalone server, or as a shim between your application and tens, thousands, or millions of live subscribers. It can buffer messages in memory, on-disk, or via [Redis](http://redis.io). All connections are handled asynchronously and distributed among any number of worker processes. It can also scale to many nginx server instances with [Redis](http://redis.io).
+Nchan is a scalable, flexible pub/sub server for the modern web, built as a module for the [Nginx](http://nginx.org) web server. It can be configured as a standalone server, or as a shim between your application and hundreds, thousands, or millions of live subscribers. It can buffer messages in memory, on-disk, or via [Redis](http://redis.io). All connections are handled asynchronously and distributed among any number of worker processes. It can also scale to many Nginx servers with [Redis](http://redis.io).
 
-Messages are [published](#publisher-endpoints) to channels with HTTP `POST` requests or websockets, and [subscribed](#subscriber-endpoint) also through websockets, [long-polling](#long-polling), [EventSource](#eventsource) (SSE), old-fashioned [interval polling](#interval-polling), [and](#http-chunked-transfer) [more](#http-multipart-mixed). Each subscriber can listen to [up to 255 channels](#channel-multiplexing) per connection, and can be optionally [authenticated](https://nchan.slact.net/details#authenticate-with-nchan_authorize_request) via a custom application url. An [events](#nchan_channel_event_string) [meta channel](#nchan_channel_events_channel_id) is also available for debugging.
+Messages are [published](#publisher-endpoints) to channels with HTTP `POST` requests or Websocket, and [subscribed](#subscriber-endpoint) also through [Websocket](#websocket), [long-polling](#long-polling), [EventSource](#eventsource) (SSE), old-fashioned [interval polling](#interval-polling), [and](#http-chunked-transfer) [more](#http-multipart-mixed).
 
-For use in a web browser, you can try the [NchanSubscriber.js](https://github.com/slact/nchan/blob/master/NchanSubscriber.js) wrapper library. It supports Long-Polling, EventSource, and resumable Websockets -- or you can build your own.
+In a web browser, you can use Websocket or EventSource directly, or the [NchanSubscriber.js](https://github.com/slact/nchan/blob/master/NchanSubscriber.js) wrapper library. It supports Long-Polling, EventSource, and resumable Websockets, and has a few other added convenience options.
+
+## Features
+ - RESTful, HTTP-native API.
+ - Supports [Websocket](https://nchan.slact.net/#websocket), [EventSource (Server-Sent Events)](https://nchan.slact.net/#eventsource), [Long-Polling](https://nchan.slact.net/#long-polling) and other HTTP-based subscribers.
+ - No-repeat, no-loss message delivery guarantees with per-channel configurable message buffers.
+ - Subscribe to [hundreds of channels](#channel-multiplexing) over a single subscriber connection.
+ - HTTP request [callbacks and hooks](https://nchan.slact.net/details#application-callbacks) for easy integration.
+ - Introspection with [channel events](https://nchan.slact.net/details#channel-events) and [url for monitoring performance statistics](https://nchan.slact.net/details#nchan_stub_status).
+ - Fast ephemeral local message storage and optional, slower, persistent storage with [Redis](https://nchan.slact.net/details#connecting-to-a-redis-server).
+ - Horizontally scalable (using [Redis](https://nchan.slact.net/details#connecting-to-a-redis-server)).
+ - Highly Available with no single point of failure (using [Redis Cluster](https://nchan.slact.net/details#redis-cluster)).
+ 
+<!-- toc -->
 
 ## Status and History
 
-The latest Nchan release is v1.0.2 (August 29, 2016) ([changelog](https://nchan.slact.net/changelog)).
+The latest Nchan release is v1.0.8 (November 28, 2016) ([changelog](https://nchan.slact.net/changelog)).
 
 The first iteration of Nchan was written in 2009-2010 as the [Nginx HTTP Push Module](https://pushmodule.slact.net), and was vastly refactored into its present state in 2014-2016. The present release is in the **testing** phase. The core features and old functionality are thoroughly tested and stable. Some of the new functionality, especially Redis Cluster may be a bit buggy.
 
-Please help make the entire codebase ready for production use! Report any quirks, bugs, leaks, crashes, or larvae you find.
-
 #### Upgrade from Nginx HTTP Push Module
 
 Although Nchan is backwards-compatible with all Push Module configuration directives, some of the more unusual and rarely used settings have been disabled and will be ignored (with a warning). See the [upgrade page](https://nchan.slact.net/upgrade) for a detailed list of changes and improvements, as well as a full list of incompatibilities.
@@ -27,18 +38,19 @@ Although Nchan is backwards-compatible with all Push Module configuration direct
 
 Yes it does. Like Nginx, Nchan can easily handle as much traffic as you can throw at it. I've tried to benchmark it, but my benchmarking tools are much slower than Nchan. The data I've gathered is on how long Nchan itself takes to respond to every subscriber after publishing a message -- this excludes TCP handshake times and internal HTTP request parsing. Basically, it measures how Nchan scales assuming all other components are already tuned for scalability. The graphed data are averages of 5 runs with 50-byte messages.
 
-With a well-tuned OS and network stack on commodity server hardware, expect to handle upwards of 300K concurrent subscribers per second at minimal CPU load. Nchan can also be scaled out to multiple Nginx instances using the [Redis storage engine](#nchan_use_redis), and that too can be scaled up beyond a single-point-of-failure by using Redis Cluster.
+With a well-tuned OS and network stack on commodity server hardware, expect to handle upwards of 300K concurrent subscribers per second at minimal CPU load. Nchan can also be scaled out to multiple Nginx instances using the [Redis storage engine](#nchan_use_redis), and that too can be scaled up beyond a single-point-of-failure by using [Redis Cluster](https://nchan.slact.net/details#using-redis).
 
-Currently, Nchan's performance is limited by available memory bandwidth. This can be improved significantly in future versions with fewer allocations and the use of contiguous memory pools. Please consider supporting Nchan to speed up the work of memory cache optimization.
+Currently, Nchan's main bottleneck is not CPU load but memory bandwidth. This can be improved significantly in future versions with fewer allocations and better use of contiguous memory pools. Please consider supporting Nchan to speed up the work of memory cache optimization.
 
 ## Install
 
 #### Download Packages
  - [Arch Linux](https://archlinux.org): [nginx-nchan](https://aur.archlinux.org/packages/nginx-nchan/) and [nginx-nchan-git](https://aur.archlinux.org/packages/nginx-nchan-git/) are available in the Arch User Repository.  
  - Mac OS X: a [homebrew](http://brew.sh) package is available. `brew tap homebrew/nginx; brew install nginx-full --with-nchan-module`
- - [Debian](https://www.debian.org/): [nginx-common.deb](https://nchan.slact.net/download/nginx-common.deb) and [nginx-extras.deb](https://nchan.slact.net/download/nginx-extras.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`. These packages should soon be available directly from the Debian repository.
+ - [Debian](https://www.debian.org/): A dynamic module build for is available in the Debian package repository: [libnginx-mod-nchan](https://packages.debian.org/sid/libnginx-mod-nchan).  
+ Additionally, you can use the pre-built static module packages [nginx-common.deb](https://nchan.slact.net/download/nginx-common.deb) and [nginx-extras.deb](https://nchan.slact.net/download/nginx-extras.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`.
  - [Ubuntu](http://www.ubuntu.com/):  [nginx-common.ubuntu.deb](https://nchan.slact.net/download/nginx-common.ubuntu.deb) and [nginx-extras.ubuntu.deb](https://nchan.slact.net/download/nginx-extras.ubuntu.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`. Who knows when Ubuntu will add them to their repository?...
- - [Fedora](https://fedoraproject.org): A 64-bit binary rpm and a source rpm are available: [nginx-nchan.x86_64.rpm](https://nchan.slact.net/download/nginx-nchan.x86-64.rpm), [ngx-nchan.src.rpm](https://nchan.slact.net/download/nginx-nchan.src.rpm). 
+ - [Fedora](https://fedoraproject.org): Dynamic module builds for Nginx > 1.10.0 are available: [nginx-mod-nchan.x86_64.rpm](https://nchan.slact.net/download/nginx-mod-nchan.x86-64.rpm), [nginx-mod-nchan.src.rpm](https://nchan.slact.net/download/nginx-mod-nchan.src.rpm). 
  - A statically compiled binary and associated linux nginx installation files are also [available as a tarball](https://nchan.slact.net/download/nginx-nchan-latest.tar.gz).
 
 
@@ -52,6 +64,33 @@ If you're using Nginx  > 1.9.11, you can build Nchan as a [dynamic module](https
 
 Run `make`, `make install`, and enjoy. (Caution, contents may be hot.)
 
+## Getting Started
+
+Once you've built and installed Nchan, it's very easy to start using. Add two locations to your nginx config:
+
+```nginx
+#...
+http {  
+  server {
+    #...
+    
+    location = /sub {
+      nchan_subscriber;
+      nchan_channel_id $arg_id;
+    }
+    
+    location = /pub {
+      nchan_publisher;
+      nchan_channel_id $arg_id;
+    }
+  }
+}
+```
+
+You can now publish messages to channels by `POST`ing data to `/sub?id=channel_id` , and subscribe by pointing Websocket, EventSource, or [NchanSubscriber.js](https://github.com/slact/nchan/blob/master/NchanSubscriber.js) to `sub/?id=channel_id`. It's that simple.
+
+But Nchan is very flexible and highly configurable. So, of course, it can get a lot more complicated...
+
 ## Conceptual Overview
 
 The basic unit of most pub/sub solutions is the messaging *channel*. Nchan is no different. Publishers send messages to channels with a certain *channel id*, and subscribers subscribed to those channels receive them. Some number of messages may be buffered for a time in a channel's message buffer before they are deleted. Pretty simple, right? 
@@ -88,6 +127,8 @@ Publisher endpoints are Nginx config *locations* with the [*`nchan_publisher`*](
 
 Messages can be published to a channel by sending HTTP **POST** requests with the message contents to the *publisher endpoint* locations. You can also publish messages through a **Websocket** connection to the same location.
 
+<!-- tag:publisher -->
+
 ##### Publishing Messages
 
 Requests and websocket messages are responded to with information about the channel at time of message publication. Here's an example from publishing with `curl`:
@@ -130,7 +171,9 @@ Metadata can be added to a message when using an HTTP POST request for publishin
 
 **HTTP `DELETE`** requests delete a channel and end all subscriber connections. Like the `GET` requests, this returns a `200` status response with channel info if the channel existed, and a `404` otherwise.
 
-#### Subscriber Endpoint
+For an in-depth explanation of how settings are applied to channels from publisher locations, see the [details page](https://nchan.slact.net/details#publisher-endpoint-configs).
+
+#### Subscriber Endpoints
 
 Subscriber endpoints are Nginx config *locations* with the [*`nchan_subscriber`*](#nchan_subscriber) directive.
 
@@ -142,6 +185,7 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   The long-polling subscriber walks through a channel's message queue via the built-in cache mechanism of HTTP clients, namely with the "`Last-Modified`" and "`Etag`" headers. Explicitly, to receive the next message for given a long-poll subscriber response, send a request with the "`If-Modified-Since`" header set to the previous response's "`Last-Modified`" header, and "`If-None-Match`" likewise set to the previous response's "`Etag`" header.  
   Sending a request without a "`If-Modified-Since`" or "`If-None-Match`" headers returns the oldest message in a channel's message queue, or waits until the next published message, depending on the value of the `nchan_subscriber_first_message` config directive.  
   A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
+  <!-- tag:subscriber-longpoll -->
   
 - ##### Interval-Polling
   Works just like long-polling, except if the requested message is not yet available, immediately responds with a `304 Not Modified`.
@@ -151,7 +195,7 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   Bidirectional communication for web browsers. Part of the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html). Nchan supports the latest protocol version 13 ([RFC 6455](https://tools.ietf.org/html/rfc6455)).  
   Initiated by sending a websocket handshake to the desired subscriber endpoint location.  
   If the websocket connection is closed by the server, the `close` frame will contain the HTTP response code and status line describing the reason for closing the connection. Server-initiated keep-alive pings can be configured with the [`nchan_websocket_ping_interval`](#nchan_websocket_ping_interval) config directive. Websocket extensions are not yet supported.  
-  Messages published through a websocket connection can be forwarded to an upstream application with the [`nchan_publisher_upstream_request`](nchan_publisher_upstream_request) config directive.   
+  Messages published through a websocket connection can be forwarded to an upstream application with the [`nchan_publisher_upstream_request`](#nchan_publisher_upstream_request) config directive.   
   Websocket subscribers can use the custom `ws+meta.nchan` subprotocol to receive message metadata with messages, making websocket connections resumable. Messages received with this subprotocol are of the form
   <pre>
   id: message_id
@@ -160,6 +204,8 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   message_data
   </pre>   
   The `content-type:` line may be omitted.
+  <!-- tag:subscriber-websocket -->
+  
 - ##### EventSource
   Also known as [Server-Sent Events](https://en.wikipedia.org/wiki/Server-sent_events) or SSE, it predates Websockets in the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html), and is a [very simple protocol](http://www.w3.org/TR/eventsource/#event-stream-interpretation).  
   Initiated by sending an HTTP `GET` request to a channel subscriber endpoint with the "`Accept: text/event-stream`" header.    
@@ -167,7 +213,9 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   To resume a closed EventSource connection from the last-received message, one *should* start the connection with the "`Last-Event-ID`" header set to the last message's `id`.  
   Unfortunately, browsers [don't support setting](http://www.w3.org/TR/2011/WD-eventsource-20111020/#concept-event-stream-last-event-id) this header for an `EventSource` object, so by default the last message id is set either from the "`Last-Event-Id`" header or the `last_event_id` url query string argument.  
   This behavior can be configured via the [`nchan_subscriber_last_message_id`](#nchan_subscriber_last_message_id) config.  
-  A message's associated `event` type, if present, will be sent to this subscriber with the `event:` line.
+  A message's `content-type` will not be received by an EventSource subscriber, as the protocol makes no provisions for this metadata.
+  A message's associated `event` type, if present, will be sent to this subscriber with the `event:` line.  
+  <!-- tag:subscriber-eventsource -->
   
 - ##### HTTP [multipart/mixed](http://www.w3.org/Protocols/rfc1341/7_2_Multipart.html#z0)
   The `multipart/mixed` MIMEtype was conceived for emails, but hey, why not use it for HTTP? It's easy to parse and includes metadata with each message.  
@@ -175,9 +223,11 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   The response headers and the unused "preamble" portion of the response body are sent right away, with the boundary string generated randomly for each subscriber.  Each subsequent message will be sent as one part of the multipart message, and will include the message time and tag (`Last-Modified` and `Etag`) as well as the optional `Content-Type` headers.  
   Each message is terminated with the next multipart message's boundary **without a trailing newline**. While this conforms to the multipart spec, it is unusual as multipart messages are defined as *starting*, rather than ending with a boundary.  
   A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
+  <!-- tag:subscriber-multipart -->
   
 - ##### HTTP Raw Stream
   A simple subscription method similar to the [streaming subscriber](https://github.com/wandenberg/nginx-push-stream-module/blob/master/docs/directives/subscribers.textile#push_stream_subscriber) of the [Nginx HTTP Push Stream Module](https://github.com/wandenberg/nginx-push-stream-module). Messages are appended to the response body, separated by a newline or configurable by `nchan_subscriber_http_raw_stream_separator`.
+  <!-- tag:subscriber-rawstream -->
 
 - ##### HTTP [Chunked Transfer](http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1)
   This subscription method uses the `chunked` `Transfer-Encoding` to receive messages.   
@@ -185,7 +235,10 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   `TE: chunked` (or `TE: chunked;q=??` where the qval > 0)  
   The response headers are sent right away, and each message will be sent as an individual chunk. Note that because a zero-length chunk terminates the transfer, **zero-length messages will not be sent** to the subscriber.  
   Unlike the other subscriber types, the `chunked` subscriber cannot be used with http/2 because it dissallows chunked encoding.
-  
+  <!-- tag:subscriber-chunked -->
+
+<!-- tag:subscriber -->
+
 #### PubSub Endpoint  
 
 PubSub endpoints are Nginx config *locations* with the [*`nchan_pubsub`*](#nchan_pubsub) directive.
@@ -212,6 +265,8 @@ A more applicable setup may set different publisher and subscriber channel ids:
 
 Here, subscribers will listen for messages on channel `foo`, and publishers will publish messages to channel `bar`. This can be useful when setting up websocket proxying between web clients and your application.
 
+<!-- tag:pubsub -->
+
 ### The Channel ID
 
 So far the examples have used static channel ids, which is not very useful in practice. It can be set to any nginx *variable*, such as a querystring argument, a header value, or a part of the location url:
@@ -239,9 +294,11 @@ So far the examples have used static channel ids, which is not very useful in pr
   }
 ```
 
+<!-- tag:channel-id -->
+
 #### Channel Multiplexing
 
-Any subscriber location can be an endpoint for up to 255 channels. Messages published to all the specified channels will be delivered in-order to the subscriber. There are two ways to enable multiplexing:
+With channel multiplexing, subscribers can subscribe to up to 255 channels per connection. Messages published to all the specified channels will be delivered in-order to the subscriber. There are two ways to enable multiplexing:
 
 Up to 7 channel ids can be specified for the `nchan_channel_id` or `nchan_channel_subscriber_id` config directive:
 
@@ -268,8 +325,6 @@ For more than 7 channels, `nchan_channel_id_split_delimiter` can be used to spli
   }
 ```
 
-`DELETE` requests on any channel are forwarded to relevant multi-channel subscribers, and their connections are terminated.
-
 Publishing to multiple channels with a single request is also possible, with similar configuration:
 
 ```nginx
@@ -278,14 +333,25 @@ Publishing to multiple channels with a single request is also possible, with sim
     nchan_channel_id "$1" "$2" "another_channel";
   }
 ```
+
+`DELETE` requests to a multiplexed channel broadcast the deletion to each of the channels it multiplexes, deletes all their messages and kicks out all clients subscribed to any of the channel ids.
+
+See the [details page](https://nchan.slact.net/details#securing-channels) for more information about using good IDs and keeping channels secure.
+
+<!-- tag:channel-multiplexing -->
+
 ## Storage
 
 Nchan can stores messages in memory, on disk, or via Redis. Memory storage is much faster, whereas Redis has additional overhead as is considerably slower for publishing messages, but offers near unlimited scalability for broadcast use cases with far more subscribers than publishers.
 
+<!-- tag:storage -->
+
 ### Memory Storage
 
 This storage method uses a segment of shared memory to store messages and channel data. Large messages as determined by Nginx's caching layer are stored on-disk. The size of the memory segment is configured with `nchan_max_reserved_memory`. Data stored here is not persistent, and is lost if Nginx is restarted or reloaded.
 
+<!-- tag:memstore -->
+
 ### Redis
 
 Nchan can also store messages and channels on a Redis server, or in a Redis cluster. To use a Redis server, set `nchan_use_redis on;` and set the server url with `nchan_redis_url`. These two settings are inheritable by nested locations, so it is enough to set them within an `http { }` block to enable Redis for all Nchan locations in that block. Different locations can also use different Redis servers.
@@ -317,6 +383,10 @@ Note that `nchan_redis_pass` implies `nchan_use_redis on;`, and that this settin
 
 When connecting several Nchan servers to the same Redis server (or cluster), the servers **must have their times synced up**. Failure to do so may result in missing and duplicated messages.
 
+See the [details page](https://nchan.slact.net/details#using-redis) for more information on using Redis.
+
+<!-- tag:redis -->
+
 ## Variables
 
 Nchan makes several variables usabled in the config file:
@@ -361,12 +431,14 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   default: `(none)`  
   context: server, location, if  
   > Channel id for a publisher or subscriber location. Can have up to 4 values to subscribe to up to 4 channels.    
+  [more details](#the-channel-id)  
 
 - **nchan_channel_id_split_delimiter**  
   arguments: 1  
   default: `(none)`  
   context: server, location, if  
   > Split the channel id into several ids for multiplexing using the delimiter string provided.    
+  [more details](#channel-multiplexing)  
 
 - **nchan_eventsource_event**  
   arguments: 1  
@@ -386,6 +458,7 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   context: server, location, if  
   legacy name: push_publisher  
   > Defines a server or location as a publisher endpoint. Requests to a publisher location are treated as messages to be sent to subscribers. See the protocol documentation for a detailed description.    
+  [more details](#publisher-endpoints)  
 
 - **nchan_publisher_channel_id**  
   arguments: 1 - 7  
@@ -397,13 +470,15 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   arguments: 1  
   context: server, location, if  
   > Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.    
-  > The upstream response code determine how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.    
+  > The upstream response code determines how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.    
+  [more details](https://nchan.slact.net/details#message-publishing-callbacks)  
 
 - **nchan_pubsub** `[ http | websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
   arguments: 0 - 6  
   default: `http websocket eventsource longpoll chunked multipart-mixed`  
   context: server, location, if  
   > Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server.    
+  [more details](#pubsub-endpoint)  
 
 - **nchan_subscriber** `[ websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
   arguments: 0 - 5  
@@ -412,6 +487,7 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   legacy name: push_subscriber  
   > Defines a server or location as a channel subscriber endpoint. This location represents a subscriber's interface to a channel's message queue. The queue is traversed automatically, starting at the position defined by the `nchan_subscriber_first_message` setting.    
   >  The value is a list of permitted subscriber types.    
+  [more details](#subscriber-endpoints)  
 
 - **nchan_subscriber_channel_id**  
   arguments: 1 - 7  
@@ -426,12 +502,13 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   > Override the default behavior of using both `Last-Modified` and `Etag` headers for the message id.    
   > Enabling this option packs the entire message id into the `Etag` header, and discards  
   > `Last-Modified` and `If-Modified-Since` headers.    
+  [more details]()  
 
 - **nchan_subscriber_first_message** `[ oldest | newest | <number> ]`  
   arguments: 1  
   default: `oldest`  
   context: server, location, if  
-  > Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` start at `n`th from now). 0 is equivalent to 'newest'.    
+  > Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` starts at `n`th from now). 0 is equivalent to 'newest'.    
 
 - **nchan_subscriber_http_raw_stream_separator** `<string>`  
   arguments: 1  
@@ -468,6 +545,19 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   arguments: 1  
   context: server, location, if  
   > Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it.    
+  [more details](https://nchan.slact.net/details#request-authorization)  
+
+- **nchan_subscribe_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send GET request to internal location (which may proxy to an upstream server) after subscribing. Disabled for longpoll and interval-polling subscribers.    
+  [more details](https://nchan.slact.net/details#subsribe-and-unsubscribe-callbacks)  
+
+- **nchan_unsubscribe_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send GET request to internal location (which may proxy to an upstream server) after unsubscribing. Disabled for longpoll and interval-polling subscribers.    
+  [more details](https://nchan.slact.net/details#subsribe-and-unsubscribe-callbacks)  
 
 - **nchan_max_reserved_memory** `<size>`  
   arguments: 1  
@@ -475,20 +565,21 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   context: http  
   legacy name: push_max_reserved_memory  
   > The size of the shared memory chunk this module will use for message queuing and buffering.    
+  [more details](#memory-storage)  
 
-- **nchan_message_buffer_length** `<number>`  
+- **nchan_message_buffer_length** `[ <number> | <variable> ]`  
   arguments: 1  
   default: `10`  
   context: http, server, location  
   legacy names: push_max_message_buffer_length, push_message_buffer_length  
-  > Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages.    
+  > Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages. An Nginx variable can also be used to set the buffer length dynamically.    
 
-- **nchan_message_timeout** `<time>`  
+- **nchan_message_timeout** `[ <time> | <variable> ]`  
   arguments: 1  
   default: `1h`  
   context: http, server, location  
   legacy name: push_message_timeout  
-  > Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Applicable only if a nchan_publisher is present in this or a child context.    
+  > Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Note that messages always expire from oldest to newest, so an older message may prevent a newer one with a shorter timeout from expiring. An Nginx variable can also be used to set the timeout dynamically.    
 
 - **nchan_redis_idle_channel_cache_timeout** `<time>`  
   arguments: 1  
@@ -500,6 +591,7 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   arguments: 1  
   context: http, server, location  
   > Use an upstream config block for Redis servers.    
+  [more details](https://nchan.slact.net/details#using-redis)  
 
 - **nchan_redis_ping_interval**  
   arguments: 1  
@@ -511,12 +603,14 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   arguments: 1  
   context: upstream  
   > Used in upstream { } blocks to set redis servers.    
+  [more details](https://nchan.slact.net/details#using-redis)  
 
 - **nchan_redis_url**  
   arguments: 1  
   default: `127.0.0.1:6379`  
   context: http, server, location  
   > The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.    
+  [more details](https://nchan.slact.net/details#using-redis)  
 
 - **nchan_store_messages** `[ on | off ]`  
   arguments: 1  
@@ -530,6 +624,7 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   default: `off`  
   context: http, server, location  
   > Use redis for message storage at this location.    
+  [more details](https://nchan.slact.net/details#using-redis)  
 
 - **nchan_access_control_allow_origin** `<string>`  
   arguments: 1  
@@ -553,7 +648,7 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
 
 - **nchan_channel_event_string** `<string>`  
   arguments: 1  
-  default: `$nchan_channel_event $nchan_channel_id`  
+  default: `"$nchan_channel_event $nchan_channel_id"`  
   context: server, location, if  
   > Contents of channel event message    
 
@@ -561,11 +656,13 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   arguments: 1  
   context: server, location, if  
   > Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'.    
+  [more details](https://nchan.slact.net/details#channel-events)  
 
 - **nchan_stub_status**  
   arguments: 0  
   context: location  
   > Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc.    
+  [more details](https://nchan.slact.net/details#nchan_stub_status)  
 
 - **nchan_max_channel_id_length** `<number>`  
   arguments: 1  
@@ -579,7 +676,7 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   default: `0 (unlimited)`  
   context: http, server, location  
   legacy name: push_max_channel_subscribers  
-  > Maximum concurrent subscribers.    
+  > Maximum concurrent subscribers to the channel on this Nchan server. Does not include subscribers on other Nchan instances when using a shared Redis server.    
 
 - **nchan_channel_timeout**  
   arguments: 1  
diff --git a/debian/modules/nchan/changelog.txt b/debian/modules/nchan/changelog.txt
index 0a6bbcb..8eba621 100644
--- a/debian/modules/nchan/changelog.txt
+++ b/debian/modules/nchan/changelog.txt
@@ -1,3 +1,38 @@
+1.0.8 (Nov. 28 2016)
+ fix: possible crash under severely heavy load, introduced in 1.0.7 with stack-overflow fix
+1.0.7 (Nov. 27 2016)
+ fix: memory leak after websocket publisher uncleanly aborts connection
+ fix: misbehaving websocket publisher with nchan_publisher_upstream_request
+ fix: potential stack overflow with very large message buffers
+ fix: invalid memory access with empty nchan_publisher_upstream_request for websocket publisher
+ fix: incorrect handling of chunked response from nchan_publisher_upstream_request
+ fix: publishing through websocket too fast may result in buffered messages that never arrive
+ fix: DELETE to multiplexed channel should delete all listed channels
+ fix: abort if publishing to multiple channels while using redis
+1.0.6 (Nov. 15 2016)
+ fix: large messages were sometimes incorrectly cleaned up, leaving behind temp files
+ fix: file descriptor leak when listening on a unix socket and suddenly 
+      aborting client connections
+ fix: invalid memory access after reloading twice with redis enabled
+ fix: crash after shutting down nginx when 'master_process' set to 'off'
+ change: nchan_max_channel_subscribers now always refers to subscribers on this instance of
+      Nchan, even when using Redis.
+ feature: subscribe/unsubscribe callbacks with nchan_subscribe_request and nchan_unsubscribe_request
+1.0.4 (Oct. 28 2016)
+ security: fix crash when receiving large messages over websocket with ws+nchan subprotocol
+1.0.3 (Sept. 3 2016)
+ feature: nchan_message_timeout and nchan_message_buffer_length 
+      can now use nginx variables for dynamic values
+ fix: unsolicited websocket PONGs disconnected the subscriber in violation of RFC6455
+ fix: possible script error when getting channel from Redis
+ fix: possible incorrect message IDs when using Redis (thanks @supertong)
+ security: possible invalid memory access on publisher GET, POST, or DELETE when
+      using Redis and the publisher connection is terminated before receiving
+      a response
+ fix: correct publisher response code when nchan_authorize_request is unavailable
+      (502 instead of 500)
+ security: crash if publisher POSTs request with no Content-Length header when 
+      using nchan_authorize_request
 1.0.2 (Aug. 29 2016)
  fix: more informative missed-message warnings
  fix: invalid memory access when Redis enabled without setting server URL
diff --git a/debian/modules/nchan/config b/debian/modules/nchan/config
index c6e4db2..5776d29 100644
--- a/debian/modules/nchan/config
+++ b/debian/modules/nchan/config
@@ -59,6 +59,7 @@ _NCHAN_UTIL_SRCS=" \
   $_nchan_util_dir/nchan_reuse_queue.c \
   $_nchan_util_dir/nchan_output.c \
   $_nchan_util_dir/nchan_util.c \
+  $_nchan_util_dir/nchan_fake_request.c \
   $_nchan_util_dir/nchan_bufchainpool.c \
   $_nchan_util_dir/nchan_channel_id.c \
   $_nchan_util_dir/nchan_channel_info.c \
diff --git a/debian/modules/nchan/dev/.gitignore b/debian/modules/nchan/dev/.gitignore
deleted file mode 100644
index e8cee91..0000000
--- a/debian/modules/nchan/dev/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-coredump/*
-clang-analyzer/*
-.nginx.thisrun.conf
-Gemfile.lock
-errors*.log
-vgcore.*
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/Gemfile b/debian/modules/nchan/dev/Gemfile
deleted file mode 100644
index dc1b8dd..0000000
--- a/debian/modules/nchan/dev/Gemfile
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/ruby
-source 'https://rubygems.org'
-gem 'rack'
-gem 'typhoeus'
-gem 'json'
-gem 'nokogiri'
-gem 'pry'
-gem 'pry-debundle'
-gem 'pry-rescue'
-gem 'celluloid'
-gem 'celluloid-io'
-gem 'websocket'
-gem 'websocket-native'
-gem 'http_parser.rb'
-gem 'http-2', :github => "slact/http-2"
-
-gem 'reel', :github => "celluloid/reel"
-gem 'reel-rack', :github => "slact/reel-rack"
-
-gem "memory_profiler", :github => "slact/memory_profiler"
-
-gem 'minitest'
-gem 'minitest-reporters'
-
-
-gem 'fpm', :github => "slact/fpm"
-
-gem 'hsss'
diff --git a/debian/modules/nchan/dev/authserver.rb b/debian/modules/nchan/dev/authserver.rb
deleted file mode 100755
index 0dde4ed..0000000
--- a/debian/modules/nchan/dev/authserver.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/ruby
-require "pry"
-require 'celluloid/current'
-require 'celluloid/logger'
-require "rack"
-require "reel/rack/cli"
-require 'reel/rack'
-require "optparse"
-
-class AuthServer
-  if __FILE__ != $PROGRAM_NAME then
-    include Celluloid::IO
-  end
-  attr_accessor :app
-  def initialize(opt={})
-    @opt = opt || {}
-    @opt[:Port] ||= 8053
-    
-    @app = proc do |env|
-      resp = []
-      headers = {}
-      code = 200
-      body = env["rack.input"].read
-      
-      pp env if @opt[:verbose]
-      
-      case env["REQUEST_PATH"] || env["PATH_INFO"]
-      when "/accel_redirect"  
-        chid="foo"
-        headers["X-Accel-Redirect"]="/sub/internal/#{chid}"
-        headers["X-Accel-Buffering"] = "no"
-      when "/auth"
-        #meh
-      when "/auth_fail"
-        code = 403
-      when "/pub"
-        resp << "WEE! + #{body}"
-        headers["Content-Length"]=resp.join("").length.to_s
-      end
-      
-      [ code, headers, resp ]
-    end
-  end
-  
-  def run
-    Rack::Handler::Reel.run(app, @opt)
-  end
-end
-
-
-
-if __FILE__ == $PROGRAM_NAME then
-  opt = {}
-  opt_parser=OptionParser.new do |opts|
-    opts.on("-q", "--quiet", "Be quiet!"){ opt[:quiet] = true}
-    opts.on("-v", "--verbose", "Be loud."){ opt[:verbose] = true}
-  end
-  opt_parser.parse!
-  
-  auth = AuthServer.new opt
-  auth.run
-end
diff --git a/debian/modules/nchan/dev/bench-parallel.sh b/debian/modules/nchan/dev/bench-parallel.sh
deleted file mode 100755
index ec4c3db..0000000
--- a/debian/modules/nchan/dev/bench-parallel.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-par=$1
-if [[ -z "$par" ]]; then
-  par=5
-  echo "No parallel count given. Assuming $par."
-fi
-if ! [[ $par =~ ^[0-9]+$ ]]; then
-  echo "Parallel count isn't a number." > /dev/stderr
-  exit 1
-fi
-
-for ((i = 0; i < $par; i++)); do
-
-    echo ./bench.rb ${@:2} 
-    ./bench.rb ${@:2} &
-done
-
-jobs=$(jobs -p)
-#echo "jobs are $jobs"
-killjobs() {
-  for job_pid in $jobs; do
-    kill $job_pid
-  done
-}
-
-trap killjobs SIGINT
-wait $jobs
diff --git a/debian/modules/nchan/dev/bench.rb b/debian/modules/nchan/dev/bench.rb
deleted file mode 100755
index 178393d..0000000
--- a/debian/modules/nchan/dev/bench.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/ruby
-require "pry"
-require_relative "pubsub.rb"
-require "optparse"
-
-client=:longpoll
-threads = 100
-par = 100
-
-def short_id
-  SecureRandom.hex.to_i(16).to_s(36)[0..5]
-end
-
-myid = short_id
-$server="localhost:8082"
-sub_uri="/sub/broadcast/#{myid}"
-pub_uri="/pub/#{myid}"
-
-SUB_TIMEOUT = 1000
-START_MSG = "START"
-QUIT_MSG = "FIN"
-
-opt=OptionParser.new do |opts|
-  opts.on("-S", "--server SERVER (#{$server})", "server and port."){|v| $server=v}
-  opts.on("-t", "--threads NUM (#{threads})", "number of subscriber threads"){|v| threads = v.to_i}
-  opts.on("-p", "--parallel NUM (#{par})", "number of subscribers per thread"){|v| par = v.to_i}
-  opts.on("-l", "--client STRING (#{client})", "sub client"){|v| client = v.to_sym}
-  opts.on("--sub-uri STRING (#{sub_uri})", "sub uri"){|v| sub_uri = v}
-  opts.on("--pub-uri STRING (#{pub_uri})", "sub uri"){|v| pub_uri = v}
-end
-opt.banner="Usage: bench.rb [options]"
-opt.parse!
-
-def mkmsg(n=nil)
-  "#{Time.now.to_f}"
-end
-
-def url(part="")
-  part=part[1..-1] if part[0]=="/"
-  "http://#{$server}/#{part}"
-end
-
-class BenchDB
-  attr_accessor :db
-  def initialize
-    @db=[]
-  end
-  
-  def add(start_time, snd_time, rcv_time, measured_time)
-    if start_time && snd_time < start_time
-      #use measured time if possible
-      if measured_time
-        @db << measured_time
-      else
-        @db << rcv_time - start_time
-        #puts "approx time"
-      end
-    else
-      @db << rcv_time - snd_time
-      #puts "approx time"
-    end
-  end
-  
-  def analyze
-    return "no data" if @db.count == 0
-    
-    sum=0
-    @db.each{|v| sum += v}
-    "#{@db.count} entries, avg: #{sum/@db.count}"
-  end
-  
-  def to_s
-    @db.join ", "
-  end
-end
-
-
-
-def t
-  Time.now.to_f
-end
-
-Typhoeus.before do |req|
-
-  req.original_options[:start_time]=Time.now.to_f
-end
-
-class BenchSub
-  attr_accessor :sub, :benchdb, :startmsg_received, :msg_received
-  def initialize(url, parallel, client_type, benchdb)
-    self.sub = Subscriber.new url, parallel, timeout: SUB_TIMEOUT, client: client_type, nomsg: true, nostore: true
-    self.benchdb = benchdb
-    self.startmsg_received = 0
-    self.msg_received = 0
-    sub.on_failure do |resp|
-      puts "FAIL!!"
-      binding.pry
-    end
-    sub.on_message do |msg, req|
-      #puts "msg is: #{msg}"
-      if msg == START_MSG
-        self.startmsg_received +=1
-      elsif msg == QUIT_MSG
-        false
-      else
-        t_now = Time.now.to_f
-        t_msg = msg.to_f
-        if sub.client_class == Subscriber::LongPollClient
-          t_start = req.time_requested
-          measured_time = req.request_time
-        elsif sub.client_class == Subscriber::EventSourceClient
-          t_start = req.original_options[:last_msg_time] || req.original_options[:start_time]
-          measured_time = nil 
-          
-        elsif sub.client_class == Subscriber::WebSocketClient
-          t_start = req.last_message_time
-          measured_time = nil 
-        end
-        self.msg_received += 1
-        benchdb.add(t_start, t_msg, t_now, measured_time)
-      end
-    end
-    
-  end
-  def run
-    sub.run
-  end
-  
-  def wait
-    sub.wait
-  end
-end
-
-
-
-
-
-
-pub_url = url(pub_uri)
-sub_url = url(sub_uri)
-
-benchmark = BenchDB.new
-
-benches = []
-threads.times do 
-  benches << BenchSub.new(sub_url, par, client, benchmark)
-end
-
-pub = Publisher.new pub_url, nostore: true, nomsg: true, timeout: 30
-
-num_msgs = 20
-msgs = []
-
-puts "will publish #{num_msgs} messages to #{pub_url}"
-
-
-puts "subscribe to #{sub_url} & run #{threads} threads of #{par} #{client} subs"
-benches.each &:run
-
-sleep 20
-
-pub.post START_MSG
-num_msgs.times do
-  pub.post mkmsg
-end
-pub.post QUIT_MSG
-
-benches.each &:wait
-
-puts "done."
-
-benches.each do |b|
-  puts "STARTMSG received #{b.startmsg_received} times"
-  puts "MSG received #{b.msg_received} times"
-end
-
-puts benchmark.analyze
-
diff --git a/debian/modules/nchan/dev/cert-key.pem b/debian/modules/nchan/dev/cert-key.pem
deleted file mode 100644
index 4bcf675..0000000
--- a/debian/modules/nchan/dev/cert-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCWRtFsEEwp6eUH
-vnaaxxuYooIiCRP0Jw6217aNaz3xSFZhqQph0LpK+942Yv9+oFxneSMFl4BSncBt
-AXv68UE8y1bFxfcwqHDvjrbxqPqC2louD+f4GVNWDEiqhX2UTc8LoB0V96KuKFv9
-31y33vNjS8KE1FIHifEZFlU5C/+CpAHCGT/LJH336bPFWCEvsMUGww4bXaIym6UM
-Jrkt6leE03eJ0ZDA1uHp3TWq6L7z9iJsjKppluXDMMlAas0Rj3YkhF2XhVD/achG
-CanzIWl3i0B4c4SrcCCzHOa0UtWtDQwoks/Q41rMTVAHDBGt8tjP0utVR+Vnx7uu
-ta37lQFXAgMBAAECggEBAItMzigL224m4CUTisHiu1P7oAGIxLRX2C3pO9FPjbWx
-xlD07yjI4UdMvilQD2IDqGRKSAqQ62Sp0ou5CoINTNnb622dGoxCN534fuD4MG9H
-lLyKBg9W+ocTD/DxmPz2O2ydWRjZ2jTyOIPWnw3aX2a1/XQ/lGJkndcReqJM2ubv
-UQgT5vIJCF4OMPPYWntgFi2GbdGAl8kKCiU6wQ0q9g3Y/EmuyEpY8uVbRV7nN65i
-3YRU4EHACOZiFNfh12hFeAWMWbaEVsyx3bmdmkfI1kiu/Rddr1HzHoOR+HNN0jrr
-E6d3cyzGE7XX0lTpTjzMcHX2PmzvH7Y3Lh1Jz+WqlJECgYEAxFfutjvuJoa4yDhG
-9S/7/AoUUdY2LhxBin8QpI+XkSHGQaP22X6vwvncjnK85nq/5Wi1tKaFQ72+df9Q
-hP3s5sgVrb41FAbm6a9KuR2FGL63LH6pGrj9X6yMT+ZHIW+V/kpaA4/bVBvLh/dp
-GEYQnZGJvrgRBis46AFVi4lvm/0CgYEAw++x+IFzEEE7x5A7AcrrWYl6V2eBPWIA
-lcnFuhosKUTgAry4pmofG+kblgI89droINF/aFrJyBa2HV/WLZH5p08hplr1/FuD
-DZoyHA5CQOvp210NXOTGti0JWFtH3W7Wz32Bj/e8gDz6ZuzsXDtdP9fiA52NqSG2
-BiaFCSOLcOMCgYBFyvwPyz3cdAc7JMYUYfownWSbsomP2ntxv7kqxeAatubCboZQ
-ybewlyDPgfmj8/5CjfYJQSgd7FTHnPoCTEDpyDXsjLBRbiKm7qihJN0q7qAuMNfr
-p9ZpK+y0eibOu9uViNh2a6yLOVYf/tJczosZd6J/KO7kQnj3/4FpGHGUAQKBgCVA
-cSm6EtJIVMFAXreciNphFO2BNEUjWNEhp4IWb8b43U4n60NYccmwrBn9GvHzSKbU
-rdB9UlfEWaOEEQhg9IImvVMPgC0WiPgRFO3YmCgXskKOknfS1yTTsy8lS6iB5j1U
-s0lX5HLNJR5kdRuj/bqhpMrjLYe2bREGSczPATfZAoGBALYbnEP85H0N1iKIh/jV
-gkKzS38el73tD8kVCCfy/B//fDzcL+M8Km0nDQI/NGISkLgsle4iGOX2P/GHDeJ9
-tNtxEAYNHZxs0ueisqa1kvUjOZi2JMq8+HoymLvADGrZPLZoIl5S874ixmX+yPfu
-oICCZTZruu/op86/owdlmS43
------END PRIVATE KEY-----
diff --git a/debian/modules/nchan/dev/cert.pem b/debian/modules/nchan/dev/cert.pem
deleted file mode 100644
index 8daa790..0000000
--- a/debian/modules/nchan/dev/cert.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDpTCCAo2gAwIBAgIJAMIK26NcV4+mMA0GCSqGSIb3DQEBCwUAMGkxCzAJBgNV
-BAYTAlhYMQ0wCwYDVQQIDARub25lMSQwIgYDVQQKDBtuY2hhbiB0ZXN0aW5nIHVu
-Y29ycG9yYXRpb24xETAPBgNVBAsMCHN1aXRlIC05MRIwEAYDVQQDDAlsb2NhbGhv
-c3QwHhcNMTUxMjI5MTkwNDE5WhcNMTYxMjI4MTkwNDE5WjBpMQswCQYDVQQGEwJY
-WDENMAsGA1UECAwEbm9uZTEkMCIGA1UECgwbbmNoYW4gdGVzdGluZyB1bmNvcnBv
-cmF0aW9uMREwDwYDVQQLDAhzdWl0ZSAtOTESMBAGA1UEAwwJbG9jYWxob3N0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkbRbBBMKenlB752mscbmKKC
-IgkT9CcOtte2jWs98UhWYakKYdC6SvveNmL/fqBcZ3kjBZeAUp3AbQF7+vFBPMtW
-xcX3MKhw74628aj6gtpaLg/n+BlTVgxIqoV9lE3PC6AdFfeirihb/d9ct97zY0vC
-hNRSB4nxGRZVOQv/gqQBwhk/yyR99+mzxVghL7DFBsMOG12iMpulDCa5LepXhNN3
-idGQwNbh6d01qui+8/YibIyqaZblwzDJQGrNEY92JIRdl4VQ/2nIRgmp8yFpd4tA
-eHOEq3AgsxzmtFLVrQ0MKJLP0ONazE1QBwwRrfLYz9LrVUflZ8e7rrWt+5UBVwID
-AQABo1AwTjAdBgNVHQ4EFgQUV64KJ1He/hQ91ylmFediO7zqaGowHwYDVR0jBBgw
-FoAUV64KJ1He/hQ91ylmFediO7zqaGowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAOh6IUcVtSKix2Da9izAyJGt76rmk8wny61d6hWYbv/kBDLoWN93r
-yBrPBKHeGp8oivcofShKBMACbGttu1ZOLrvXMvtJvg8oixyODQxBKKDWKERhmZwW
-5/RYma5Uh+DHVeKyEfy8zz0Io51jksWJUZ0NIzU+PtDHSsR7sCG+HS0BUEYgzyvr
-fWvRwdKN+lXLvoaAuvEGmT5gnWtJYqrvLYq7548xl0CZbjRUlQpxt9/XdpIVRQwh
-23BucARPEgps7uv6SXXzsFLcrmjUkGJZ1itORYvT4QpaD40DAq+2hiI4u5594Stp
-Dl6MJ43WlnWQCd5FakZpvcW5ZuBbDYkxkQ==
------END CERTIFICATE-----
diff --git a/debian/modules/nchan/dev/chattertest.rb b/debian/modules/nchan/dev/chattertest.rb
deleted file mode 100755
index 8db309b..0000000
--- a/debian/modules/nchan/dev/chattertest.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/ruby
-require 'test/unit'
-require 'securerandom'
-require "./pubsub.rb"
-
-#invocation: ./chattertest.rb [channel] [pub/sub] [concurrency/message]
-role, channel, sub_concurrency, pub_msg = nil, nil, nil, nil
-#parse args
-raise "Not enough args. ./chattertest.rb [channel] [pub/sub] [concurrency/message]" if ARGV.length < 3
-channel=ARGV[0]
-role=ARGV[1]
-sub_concurrency=ARGV[2].to_i if role=="sub"
-pub_msg=ARGV[2] if role=="pub"
-
-
-def url(part)
-  "http://127.0.0.1:8082/#{part}"
-end
-def pubsub(concurrent_clients=1, opt={})
-    urlpart=opt[:urlpart] || 'broadcast'
-    timeout = opt[:timeout] || 120
-    sub_url=opt[:sub] || "sub/#{urlpart}/"
-    pub_url=opt[:pub] || "pub/"
-    chan_id = opt[:channel] || SecureRandom.hex
-    sub = Subscriber.new url("#{sub_url}#{chan_id}"), concurrent_clients, timeout: timeout, quit_message: 'FIN'
-    pub = Publisher.new url("#{pub_url}#{chan_id}")
-    return pub, sub
-end
-
-
-pub, sub = pubsub(sub_concurrency, channel: channel)
-if role=="sub"
-  puts "Subscribing #{sub_concurrency} client(s) to channel #{channel}."
-  sub.on_message do |msg|
-    puts "got message \"#{msg.to_s}\""
-  end
-  sub.run false
-elsif role=="pub"
-  puts "Publishing #{pub_msg} to channel #{channel}"
-  pub.post  pub_msg
-else
-  raise "unknown role #{role}"
-end
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/debug.sh b/debian/modules/nchan/dev/debug.sh
deleted file mode 100755
index 7dd3cf5..0000000
--- a/debian/modules/nchan/dev/debug.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/zsh
-TESTDIR=`pwd`
-SRCDIR=$(readlink -m $TESTDIR/../src)
-ln -sf $TESTDIR/nginx $SRCDIR/nginx >/dev/null
-ln -sf $TESTDIR/nginx-pushmodule/src/nginx/src/ $SRCDIR/nginx-source >/dev/null
-if [[ "$1" = <-> ]]; then
-    sudo kdbg -p $1 $SRCDIR/nginx
-else
-    kdbg $SRCDIR/nginx $1
-fi
-rm $SRCDIR/nginx $SRCDIR/nginx-source
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/dev.conf b/debian/modules/nchan/dev/dev.conf
deleted file mode 100644
index ac84f69..0000000
--- a/debian/modules/nchan/dev/dev.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh #good enough highlighting
-worker_processes  16;
-worker_rlimit_nofile 150000;
-
-#error_log  /dev/stderr debug;                                                                                                                                            
-error_log  /dev/stderr  notice;
-#error_log   err.log  notice;                                                                                                                                             
-
-pid        /tmp/nchan-test-nginx.pid;
-daemon      off;
-
-events {
-  worker_connections  50000;
-}
-
-http {
-  #include       mime.types;
-  default_type  application/octet-stream;
-
-  nchan_max_reserved_memory 1024M;
-  
-  access_log off;
-  sendfile on;
-  tcp_nopush on;
-  tcp_nodelay on;
-  keepalive_timeout 30s;
-  types_hash_max_size 2048;
-  client_max_body_size 10M;
-  server_tokens off;
-  gzip  on;
-
-  server {
-    listen 127.0.0.1:8083;
-    location ~ /action/pub/(\w+)$ {
-      nchan_publisher;
-      nchan_channel_id $1;
-      nchan_message_timeout 5s;
-      nchan_message_buffer_length 10;
-    }
-  }
-  
-  server {
-    listen 127.0.0.1:8082;
-    location /action/subauth {
-      proxy_pass http://127.0.0.1:8053/subauth;
-      proxy_pass_request_body off;
-      proxy_set_header Content-Length "";
-      proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
-      proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
-      proxy_set_header X-Channel-Id $nchan_channel_id;
-      proxy_set_header X-Original-URI $request_uri;
-      proxy_set_header X-Forwarded-For $remote_addr;
-    }
-    location ~ /action/sub/(\w+)$ {
-      nchan_subscriber;
-      nchan_channel_id $1;
-      nchan_authorize_request /action/subauth;
-      client_body_timeout 65;
-      keepalive_timeout 65;
-      send_timeout 60;
-    }
-  }
-}
diff --git a/debian/modules/nchan/dev/examine_coredump.sh b/debian/modules/nchan/dev/examine_coredump.sh
deleted file mode 100755
index 7629ac8..0000000
--- a/debian/modules/nchan/dev/examine_coredump.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/zsh
-target=$1
-core_dir="./coredump"
-if [ -z $target ]; then
-  target=$(realpath ./nginx)
-  dump=$core_dir/last.core
-else
-  dump=$core_dir/$target.core
-fi
-
-mkdir $core_dir 2>/dev/null
-
-echo "saving coredump for $target at $dump"
-
-sudo coredumpctl dump $target > $dump
-kdbg ./nginx "$dump" 2>/dev/null
-# rm "$dump" #keep it around for now
diff --git a/debian/modules/nchan/dev/gen_config_commands.rb b/debian/modules/nchan/dev/gen_config_commands.rb
deleted file mode 100755
index f7c75ab..0000000
--- a/debian/modules/nchan/dev/gen_config_commands.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/ruby
-ROOT_DIR=".."
-SRC_DIR="src"
-CONFIG_IN="nchan_commands.rb"
-CONFIG_OUT=ARGV[0]
-
-class CfCmd #let's make a DSL!
-  class OneOf
-    def initialize(arg) 
-      @arg=arg
-    end
-    def []=(k,v)
-      @arg[k]=v
-    end
-    def [](val)
-      ret=@arg[val]
-      raise "Unknown value lookup #{val}" if ret.nil?
-      ret
-    end
-  end
-  class Cmd
-    attr_accessor :name, :type, :set, :conf, :offset_name
-    attr_accessor :contexts, :args, :legacy, :alt, :disabled
-    def type_line
-      lut=OneOf.new(:main => :NGX_HTTP_MAIN_CONF, :srv => :NGX_HTTP_SRV_CONF, :upstream => :NGX_HTTP_UPS_CONF, :loc => :NGX_HTTP_LOC_CONF, :if => :NGX_HTTP_LIF_CONF)
-      args_lut= OneOf.new(0 => :NGX_CONF_NOARGS, false => :NGX_CONF_NOARGS)
-      
-      (1..7).each{|n| args_lut[n]="NGX_CONF_TAKE#{n}"}
-      
-      tl=[]
-      
-      contexts.each { |v| tl << lut[v] }
-      (Enumerable === args ? args : ([args]) ).each {|arg| tl << args_lut[arg]}
-      tl.join "|"
-    end
-    
-    def conf_line
-      OneOf.new(loc_conf: :NGX_HTTP_LOC_CONF_OFFSET, srv_conf: :NGX_HTTP_SRV_CONF_OFFSET, main_conf: :NGX_HTTP_MAIN_CONF_OFFSET)[conf]
-    end
-    def offset_line
-      tpdf=OneOf.new(main_conf: :nchan_main_conf_t, srv_conf: :nchan_srv_conf_t, loc_conf: :nchan_loc_conf_t)
-      if offset_name
-        "offsetof(#{tpdf[conf]}, #{offset_name})"
-      else
-        0
-      end
-    end
-    def initialize(name, func)
-      self.name=name
-      self.set=func
-    end
-    def conf_offset(val)
-
-    end
-    
-    def to_c_def(altname=nil, comment=nil)
-      str= <<-END.gsub(/^ {6}/, '')
-        { ngx_string("#{altname || name}"),#{comment && " //#{comment}"}
-          #{type_line},
-          #{set},
-          #{conf_line},
-          #{offset_line},
-          NULL } ,
-      END
-    end
-    def to_s
-      str=[]
-      str << to_c_def
-      if self.legacy
-        lgc = self.legacy.kind_of?(Array) ? self.legacy : [ self.legacy ]
-        lgc.each do |v|
-          str << to_c_def(v, "legacy for #{name}")
-        end
-      end
-      (alt || []).each {|v| str << to_c_def(v, "alt for #{name}")}
-      if disabled
-        str.unshift "/* DISABLED\r\n"
-        str.push "  */\r\n"
-      end
-      str << "\r\n"
-      str.join
-    end
-  end
-  def initialize(&block)
-    @cmds=[]
-    instance_eval &block
-  end
-  def method_missing(name, *args)
-    define_cmd name, *args
-  end
-  def define_cmd(name, valid_contexts, handler, conf, opt={})
-    cmd=Cmd.new name, handler
-    cmd.args= opt.has_key?(:args) ? opt[:args] : 1
-    cmd.contexts= valid_contexts
-    if Array === conf
-      cmd.conf=conf[0]
-      cmd.offset_name=conf[1]
-    else
-      cmd.conf=conf
-    end
-    cmd.legacy=opt[:legacy]
-    cmd.alt=opt[:alt]
-    cmd.disabled=opt[:disabled]
-    @cmds << cmd
-  end
-  
-  def to_s
-    str= <<-END.gsub(/^ {6}/, '')
-      //AUTOGENERATED, do not edit! see #{CONFIG_IN}
-      static ngx_command_t  nchan_commands[] = {
-        #{@cmds.join}
-        ngx_null_command
-      };
-    END
-  end
-end
-begin
-  cf=eval File.read("#{ROOT_DIR}/#{SRC_DIR}/#{CONFIG_IN}")
-rescue Exception => e
-  STDERR.puts e.message.gsub(/^\(eval\)/, "#{SRC_DIR}/#{CONFIG_IN}")
-  exit 1
-end
-
-if CONFIG_OUT
-  File.write "#{ROOT_DIR}/#{SRC_DIR}/#{CONFIG_OUT}", cf.to_s
-  puts "wrote config commands to #{SRC_DIR}/#{CONFIG_OUT}"
-else
-  puts cf.to_s
-end
diff --git a/debian/modules/nchan/dev/longtest.rb b/debian/modules/nchan/dev/longtest.rb
deleted file mode 100755
index 0e67574..0000000
--- a/debian/modules/nchan/dev/longtest.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/ruby
-require 'securerandom'
-require_relative 'pubsub.rb'
-require 'json'
-require "reel"
-
-PUB_URL="http://127.0.0.1:8083/action/pub/"
-SUB_URL="http://127.0.0.1:8082/action/sub/"
-
-AUTH_PORT=8053
-
-TIMEOUT=1000
-DEFAULT_CLIENT=:longpoll
-
-#Typhoeus::Config.verbose = true
-def short_id
-  SecureRandom.hex.to_i(16).to_s(36)[0..5]
-end
-
-def short_msg
-  SecureRandom.hex.to_i(16).to_s(36)
-end
-
-Celluloid.boot
-
-class AuthServerRunner
-  include Celluloid
-  class AuthServer < Reel::Server::HTTP
-    def initialize(host = "127.0.0.1", port = AUTH_PORT)
-      puts "init"
-      super(host, port, &method(:on_connection))
-    end
-    
-    def on_connection(connection)
-      connection.each_request do |request|
-        handle_request(request)
-      end
-    end
-    
-    def handle_request(request)
-      request.respond :ok, ""
-    end
-  end
-  
-  def run
-    AuthServer.run
-  end
-end
-
-class SubTest
-  attr_accessor :id, :sub
-  def initialize(id, out=nil)
-    @id=id
-    @out=out
-    @sub=Subscriber.new "#{SUB_URL}#{id}", 1, timeout: TIMEOUT, quit_message: 'FIN', client: DEFAULT_CLIENT, nostore: true
-    @sub.on_message do |msg|
-      if @expected != msg.message 
-        raise "unexpected message for id #{id}. expected #{@expected}, got #{msg.message}"
-      elsif @out
-        puts "received correct message for #{id}"
-      end
-    end
-  end
-  
-  def expect_msg(msg)
-    @expected=msg
-  end
-  
-  def run
-    @sub.run
-  end
-end
-
-class TestRig
-  def initialize
-    @ids=[]
-    @subs={}
-    @pub = Publisher.new '', accept: 'text/json', nostore: true
-  end
-  
-  def [](id)
-    @subs[id]
-  end
-  
-  def sub(id=nil)
-    id = short_id if id.nil?
-    raise "#{id} already running" if @subs[id]
-    @ids << id
-    @subs[id] = SubTest.new(id, @out)
-    @subs[id].run
-  end
-  
-  def pub(id)
-    raise "#{id} not subscribed" unless @subs[id]
-    msg = short_msg
-    @subs[id].expect_msg(msg)
-    @pub.with_url("#{PUB_URL}#{id}").post(msg)
-    
-    info=JSON.parse @pub.response_body
-    
-    if info["subscribers"] != 1
-      raise "subscribers != 1 for id #{id}"
-    end
-  end
-  
-  def unsub(id=nil)
-    @subs[id].terminate
-    @subs.delete id
-    @ids.delete id
-  end
-  
-  def unsub_all
-    @subs.each do |sub|
-      sub.terminate
-    end
-    @subs.empty!
-    @ids.clear
-  end
-  
-  def last_id
-    @last_id ||= random_id
-  end
-  
-  def random_id
-    @ids.sample
-  end
-  
-  def post_again
-    id=last_id
-    out "post again to #{id}"
-    pub(id)
-  end
-
-  def post_testingly
-    id = random_id
-    out "post to #{id}"
-    pub(id)
-    @last_id=id
-  end
-  
-  def out(str)
-    puts str if @out
-  end
-  
-  def output!
-    @out=true
-  end
-end
-  
-
-auth = AuthServerRunner.new
-auth.async.run
-sleep 5
-
-rig = TestRig.new
-
-class Runner 
-  def initialize(rig, count)
-    @rig = rig
-    @rig.output!
-    count.times do
-      @rig.sub
-    end
-  end
-  
-  def run
-    while true do
-      if rand(2)==1
-        @rig.post_testingly
-      else
-        @rig.post_again
-      end
-      
-      
-      t = rand(1..7)
-      puts "wait #{t} sec"
-      sleep t
-    end
-  end
-end
-
-runner = Runner.new(rig, 20)
-
-runner.run
diff --git a/debian/modules/nchan/dev/memparse.lua b/debian/modules/nchan/dev/memparse.lua
deleted file mode 100755
index 6522688..0000000
--- a/debian/modules/nchan/dev/memparse.lua
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/bin/luajit
-local lpty = require "lpty"
-
-local lines_tailed=100000
-local filename="errors.log"
-local follow=false
-
-local write=io.write
-
-local shm, size_by_label, count_by_label, weird_log
-function init()
-  print "initialize"
-  shm, size_by_label, count_by_label, weird_log={}, {}, {}, {}
-  memmap={}
-end
-
-function err(str, ...)
-  str = str or "Unknown error occurred"
-  io.stderr:write(str:format(...))
-  io.stderr:write("\n")
-end
-function printf(str, ...)
-  print(str:format(...))
-end
-
-
-local poolsize=0
-local poolstart=0
-local memmap={}
-local membuckets=1024
-local bucketsize=0
-
-local resolve_weird_log; do
-  local weirdlog={}
-  resolve_weird_log=function(line, is_weird)
-    local prev = weirdlog[1]
-    if prev and prev.ptr == line.ptr and prev.t == line.t and prev.pid ~= line.pid then
-      if prev.action == "free"  and line.action == "alloc" then
-        --oh, a free happened in a different worker and at the same time?
-        --the log was probably written out-of-sequence
-        table.remove(weirdlog, 1)
-        alloc_raw(line.ptr, line.size, line.lbl, line.t, line.pid)
-        free_raw(prev.ptr, prev.t, prev.pid)
-        printf("resolved weird free/alloc at %s", line.ptr)
-        return false
-      elseif prev.action == "alloc" and line.action == "free" then
-        --oh, an alloc happened in a different worker and at the same time?
-        --the log was probably written out-of-sequence
-        table.remove(weirdlog, 1)
-        free_raw(line.ptr, line.t, line.pid)
-        alloc_raw(prev.ptr, prev.size, prev.lbl, prev.t, prev.pid)
-        printf("resolved weird alloc/free at %s", line.ptr)
-        return false
-      end
-    end
-    if is_weird then
-      table.insert(weirdlog, 1, line)
-      return false
-    else
-      return true
-    end
-  end
-end
-
-local memmap_add
-do
-  local bucketsize=0
-  memmap_add= function(starthex, size, val)
-    if not poolsize or not poolstart then return err("poolsize or poolstart not known") end  
-    val = val or 1
-    local start=tonumber(starthex, 16)
-    if not start then return err("starthex was not a hex number") end
-    --start should be relative to pool start
-    start=start-poolstart
-    
-    if not size then
-      if shm[starthex] then
-        size=shm[starthex].size
-      else
-        err("shm[%s] is nil", starthex)
-      end
-    end
-    
-    local bstart = math.floor(start/poolsize * membuckets)
-    local bend =   math.floor((start+size)/poolsize * membuckets)
-    if bstart == math.huge then
-      return err("alloc before shm init")
-    end    
-    for i=bstart, bend do
-      memmap[i]=(memmap[i] or 0)+val
-      if memmap[i]<0 then
-        err("negative memmap at bucket %s", i)
-        memmap[i]=0
-      end
-    end
-  end
-end
-
-function alloc(ptr, size, label, time, pid)
-  size=tonumber(size)
-  local looks_weird=false
-  if shm[ptr] ~= nil then
-    err("BAD ALLOC AT ptr %s pid %i time %s", ptr, pid, time)
-    looks_weird = true
-  end
-  if resolve_weird_log({action="alloc", ptr=ptr, size=size, lbl=label, t=time, pid=pid}, looks_weird) then
-    alloc_raw(ptr, size, label, time, pid)
-  end
-end
-function alloc_raw(ptr, size, label, time, pid)
-  shm[ptr]={size=size, label=label, time=time}
-  size_by_label[label]=(size_by_label[label] or 0) + size
-  count_by_label[label]=(count_by_label[label] or 0) + 1
-  memmap_add(ptr, size)
-end
-
-function free(ptr, time, pid)
-  local looks_weird=false
-  local ref=shm[ptr]
-  if ref == nil then
-    err ("DOUBLE FREE AT ptr %s pid %i time %s", ptr, pid, time)
-    looks_weird = true
-  end
-  if resolve_weird_log({action="free", ptr=ptr, size=nil, lbl=nil, t=time, pid=pid}, looks_weird) then
-    free_raw(ptr, time, pid)
-  end
-end
-function free_raw(ptr, time, pid)
-  local ref=shm[ptr]
-  if ref==nil then
-    err("executed double free on ptr %s pid %i time %s", ptr, pid, time)
-    return
-  end
-  memmap_add(ptr, nil, -1)
-  size_by_label[ref.label]=size_by_label[ref.label]-ref.size
-  count_by_label[ref.label]=(count_by_label[ref.label] or 0) - 1
-  shm[ptr]=nil
-end
-
-function formatsize(bytes)
-  if bytes<1024 then
-    return string.format("%ib", bytes)
-  elseif bytes > 1024 and bytes < 1048576 then
-    return string.format("%.3gKb", bytes/1024)
-  else
-    return string.format("%.3gMb", bytes/1048576)
-  end
-end
-
-local alphabet={1,2,3,4,5,6,7,8,9,"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"}
-function summary()
-  local compare=function(a,b)
-    return a[2] > b[2]
-  end
-  local total=0;
-  local resort={}
-  for k,v in pairs(size_by_label) do table.insert(resort, {k, v}) end
-  table.sort(resort, compare)
-  for k,v in ipairs(resort) do
-    printf("%-40s %-10s %i", v[1], formatsize(v[2]), count_by_label[v[1]])
-    total = total + v[2]
-  end
-  print ("                                       --------      ")
-  printf("%-40s %s", "total", formatsize(total))
-  
-  --memory map
-  local n
-  for i=0,membuckets do
-    n=memmap[i]
-    if n==0 or n == nil then
-      write("-")
-    elseif n<#alphabet then
-      write(alphabet[n] or "?")
-    else
-      write("#")
-    end
-  end
-  print ""
-end
-
-
-function parse_line(str)
-  local out_of_memory
-  local time,errlevel, pid, msg=str:match("(%d+/%d+/%d+%s+%d+:%d+:%d+)%s+%[(%w+)%]%s+(%d+)#%d+:%s+(.+)")
-  if msg ~= nil then
-    local ptr, size, label, start
-
-    if errlevel == "crit" then
-      print("CRITICAL:", time, pid, msg)
-      if msg == "ngx_slab_alloc() failed: no memory" then
-        return true
-      end
-    end
-    ptr, size, label = msg:match("shpool alloc addr (%w+) size (%d+) label (.+)")
-    if ptr then
-      alloc(ptr, size, label, time, pid)
-      return ptr
-    end
-
-    ptr = msg:match("shpool free addr (%w+)")
-    if ptr then
-      free(ptr, time, pid)
-      return ptr
-    end
-    
-    start, size = msg:match("nchan_shpool start (%w+) size (%d+)")
-    if size and start then
-      init()
-      poolsize=tonumber(size)
-      poolstart = tonumber(start, 16)
-      printf("shm start %s size %s", start, formatsize(poolsize))
-    end
-  end
-end
-
-
-
-----------------------------------------------------------------
---NO FUNCTIONS DEFINED BELOW THIS LINE PLEASE (except lambdas)--
-
---handle arguments
-if arg[1] == "tail" or arg[1] == "follow" then
-  follow=true
-elseif arg[1] ~= nil then
-  filename=arg[1]
-end
-
-
-init()
-
-
-if follow then
-  local lasttime, now=os.time(), nil
-  print "follow errors.log"
-  
-  pty = lpty.new()
-  pty:startproc('tail', ("--lines=%s"):format(lines_tailed), "-F", filename)
-  
-  while true do
-    line = pty:readline(false, 1)
-    now=os.time()
-    if not line then
-      --nothing
-    elseif line:match('truncated') or
-       line:match(("‘%s’ has become inaccessible: No such file or directory"):format(filename)) then
-      --reset
-      init()
-    else
-      parse_line(line)
-    end
-    
-    if now - lasttime >= 1 then
-      summary()
-      lasttime=now
-    end
-  end
-else
-  printf("open %s", filename)
-  local f = io.open(filename, "r")
-  for line in f:lines() do
-    if parse_line(line) == true then
-      summary()
-    end
-  end
-  f:close()
-end
-
-
-summary()
diff --git a/debian/modules/nchan/dev/nginx b/debian/modules/nchan/dev/nginx
deleted file mode 120000
index fd55118..0000000
--- a/debian/modules/nchan/dev/nginx
+++ /dev/null
@@ -1 +0,0 @@
-./nginx-nchan/pkg/nginx-nchan-dev/usr/bin/nginx
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/nginx-cachemanager.conf b/debian/modules/nchan/dev/nginx-cachemanager.conf
deleted file mode 100644
index 889e061..0000000
--- a/debian/modules/nchan/dev/nginx-cachemanager.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-worker_processes  4;
-#debug_points stop;
-#error_log  /dev/stderr debug;
-error_log  /dev/stderr  notice;
-#error_log   err.log  notice;
-pid        /tmp/nginx-debug.pid;
-
-events {
-  worker_connections  90000;
-  accept_mutex on;
-}
-
-http {
-  access_log /dev/stdout;
-  proxy_cache_path /tmp levels=1:2 keys_zone=cache:1m;
-
-  server {
-      listen 8000;
-      location / {
-          proxy_cache cache;
-      }
-  }
-
-  server {
-    listen       8082;
-    #    root ./;
-    location ~ /pub/(\w+)$ {
-      set $push_channel_id $1;
-      push_publisher;
-      push_min_message_buffer_length 5;
-      push_max_message_buffer_length 20;
-      push_message_timeout 5s;
-      push_channel_group test;
-    }
-
-    location ~ /sub/broadcast/(\w+)$ {
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-      push_subscriber_concurrency broadcast;
-    }
-    location ~ /sub/first/(\w+)$ {
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-      push_subscriber_concurrency first;
-    }
-    location ~ /sub/last/(\w+)$ {
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-      push_subscriber_concurrency last;
-    }
-
-    #authorized channels only -- publishers must create the channel before subscribing
-    location ~ /sub/authorized/(\w+)$ {
-      push_authorized_channels_only on;
-      push_subscriber;
-      push_channel_group test;
-      set $push_channel_id $1;
-    }
-
-    
-    
-
-  }
-}
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/nginx-nchan/.gitignore b/debian/modules/nchan/dev/nginx-nchan/.gitignore
deleted file mode 100644
index b0a7412..0000000
--- a/debian/modules/nchan/dev/nginx-nchan/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-src
-pkg
-*.tar.gz
-*.pkg.tar*
-*no_pool.patch
-ngx_debug_pool/
diff --git a/debian/modules/nchan/dev/nginx-nchan/PKGBUILD b/debian/modules/nchan/dev/nginx-nchan/PKGBUILD
deleted file mode 100644
index 43a7c1a..0000000
--- a/debian/modules/nchan/dev/nginx-nchan/PKGBUILD
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/bin/zsh
-_nginx_ver_latest=1.11.3
-_nginx_ver_stable=1.10.1
-_nginx_ver_nopool=1.11.2
-_nginx_ver_legacy=1.8.1
-_nginx_ver_old=1.6.3
-_nginx_ver_very_old=0.8.55
-
-OPTIONS=(!strip debug docs libtool staticlibs emptydirs zipman purge !upx)
-if [[ -z $NO_DEBUG ]]; then
-  #debug build. clear cflags
-  CFLAGS=" -ggdb -fvar-tracking-assignments -O$OPTIMIZE_LEVEL"
-fi
-
-CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -Wpointer-arith -Wshadow -Wnested-externs -Wsign-compare"
-
-_include_http2=0
-
-if [[ $NO_POOL == 1 ]]; then
-  _nginx_ver=$_nginx_ver_nopool
-  _include_http2=1
-elif [[ $NGINX_LEGACYVERSION == 1 ]]; then
-  _nginx_ver=$_nginx_ver_legacy
-elif [[ $NGINX_OLDVERSION == 1 ]]; then
-  _nginx_ver=$_nginx_ver_old
-elif [[ $NGINX_VERYOLDVERSION == 1 ]]; then
-  _nginx_ver=$_nginx_ver_very_old
-elif [[ $NGINX_STABLEVERSION == 1 ]]; then
-  _nginx_ver=$_nginx_ver_stable
-  _include_spdy=1
-else
-  _nginx_ver=$_nginx_ver_latest
-  _include_http2=1
-fi
-
-_pkgname="nginx"
-PKGEXT=".pkg.tar"
-
-_user="http"
-_group="http"
-_doc_root="/usr/share/${_pkgname}/http"
-_sysconf_path="etc"
-_conf_path="${_sysconf_path}/${_pkgname}"
-_tmp_path="/tmp"
-_pid_path="/run"
-_lock_path="/var/lock"
-_access_log="/dev/stdout"
-_error_log="errors.log"
-_nchan_dir="${startdir}/nchan"
-
-_pkgver() {
-  pushd "$startdir/nchan" >/dev/null
-  printf "%s.%s.%s.%s" "$_nginx_ver" "$(git rev-parse --abbrev-ref HEAD | sed -r 's/-/_/g')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  popd >/dev/null
-}
-
-pkgname=nginx-nchan-dev
-pkgver=0
-pkgrel=1
-pkgdesc="Nginx + Nchan dev version"
-arch=('i686' 'x86_64' 'armv7h')
-install=install
-
-
-depends=('pcre' 'zlib' 'openssl')
-url="http://nginx.org"
-license=('custom')
-conflicts=('nginx' 'nginx-unstable' 'nginx-svn' 'nginx-devel' 'nginx-custom-dev' 'nginx-custom-slact') 
-provides=('nginx' 'nginx-custom')
-backup=("${_conf_path}/conf/nginx.conf"
-  "${_conf_path}/conf/koi-win"
-  "${_conf_path}/conf/koi-utf"
-  "${_conf_path}/conf/win-utf"
-  "${_conf_path}/conf/mime.types"
-  "${_conf_path}/conf/fastcgi.conf"
-  "${_conf_path}/conf/fastcgi_params"
-  "${_conf_path}/conf/scgi_params"
-  "${_conf_path}/conf/uwsgi_params"
-  "etc/logrotate.d/nginx")
-_user=http
-_group=http
-
-_nginx_source="http://nginx.org/download/nginx-${_nginx_ver}.tar.gz"
-_no_pool_patch_source="https://raw.github.com/shrimp/no-pool-nginx/master/nginx-${_nginx_ver_nopool}-no_pool.patch"
-_ngx_debug_pool_url="https://github.com/chobits/ngx_debug_pool.git"
-
-source=("$_nginx_source"
-  "nginx.conf"
-  "nginx.logrotate"
-  "nginx.service"
-  "git+${_ngx_debug_pool_url}"
-  "$_no_pool_patch_source"
-  "bl.txt")
-
-md5sums=('SKIP'
-         '1fe7a3ca0773ce13f9f92e239a99f8b9'
-         'ab1eb640c978536c1dad16674d6b3c3c'
-         '62d494d23aef31d0b867161f9fffa6eb'
-         'SKIP'
-         'SKIP'
-         'SKIP')
-
-build() {
-  local _src_dir="${srcdir}/nginx-$_nginx_ver"
-  ln -sfT "$_src_dir" "$srcdir/nginx"
-  ln -sfT "$_nchan_dir" "$srcdir/nchan"
-  local _build_dir="${_src_dir}/objs"
-  cd "$srcdir/nginx"
-  
-  if [[ -z $CONTINUE ]] && [[ -z $NO_EXTRACT_SOURCE ]]; then
-    if [[ $NO_POOL == 1 ]]; then
-      echo "using the no-pool patch"
-      patch -p1 < "${srcdir}/nginx-${_nginx_ver}-no_pool.patch"
-    fi
-    if [[ $NGX_SLAB_PATCH == 1 ]]; then
-      echo "using the ngx_slab patch to fix large alloc/frees"
-      patch -p1 < "${startdir}/ngx_slab.patch"
-    fi
-    if [[ $NGX_DEBUG_POOL == 1 ]]; then
-      echo "patch nginx to debug pools"
-      patch -p1 < "${srcdir}/ngx_debug_pool/debug_pool.patch"
-    fi
-  fi
-
-  if [[ $MUDFLAP == 1 ]]; then
-    export CFLAGS="$CFLAGS -fmudflap"
-  fi
-
-  CFLAGS="${CFLAGS/-Werror/}" #no warning-as-error
-  
-  CONFIGURE=(
-    --prefix=/${_conf_path}
-    --sbin-path=/usr/bin/nginx
-    --pid-path=${_pid_path}/nginx.pid
-    --lock-path=${_pid_path}/nginx.lock
-    --http-client-body-temp-path=${_tmp_path}/client_body_temp
-    --http-proxy-temp-path=${_tmp_path}/proxy_temp
-    --http-fastcgi-temp-path=${_tmp_path}/fastcgi_temp
-    --http-uwsgi-temp-path=${_tmp_path}/uwsgi_temp
-    --http-log-path=${_access_log}
-    --error-log-path=${_error_log}
-    --with-http_ssl_module
-  )
-
-  if [[ $DYNAMIC == 1 ]]; then
-    CONFIGURE+=( --add-dynamic-module=../nchan )
-  else
-    CONFIGURE+=( --add-module=../nchan )
-  fi
-
-  if [[ $CONFIGURE_WITH_DEBUG == 1 ]]; then
-    CONFIGURE+=( "--with-debug" )
-  fi
-  
-  if [[ -z $NO_NGINX_USER ]]; then
-    CONFIGURE+=( "--user=${_user}" "--group=${_group}" )
-  fi
-    
-  if [[ $_include_http2 == 1 ]]; then
-    CONFIGURE+=( "--with-http_v2_module" )
-  fi
-  
-  if [[ $_include_spdy == 1 ]]; then
-    CONFIGURE+=( "--with-http_spdy_module" )
-  fi
-    
-  if [[ $NGX_DEBUG_POOL == 1 ]]; then
-    CONFIGURE+=( "--add-module=../ngx_debug_pool" )
-  fi
-  
-  if [[ -z $NGINX_VERYOLDVERSION ]]; then
-    CONFIGURE+=( "--http-scgi-temp-path=${_tmp_path}/scgi_temp" )
-  fi
-
-  if [[ $CC == *clang* ]]; then
-    #not a valid clang parameter
-    CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
-    CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
-    if [[ -z $CLANG_ANALYZER ]]; then
-      CFLAGS="-ferror-limit=5 $CFLAGS"
-    fi
-  elif [[ $CC == "cc" ]] || [[ $CC == "gcc" ]] || [[ -z $CC ]] && [[ -z $NO_GCC_COLOR ]]; then
-    CFLAGS="-fdiagnostics-color=always  -Wmaybe-uninitialized $CFLAGS"
-  fi
-  
-  echo $CFLAGS
-  export CCACHE_CPP2=yes
-  if ! [[ -z $CLANG_ANALYZER ]]; then
-    scan-build -o "$CLANG_ANALYZER" ./configure ${CONFIGURE[@]}
-    scan-build -o "$CLANG_ANALYZER" make
-  elif ! [[ -z $CONTINUE ]]; then
-    make $REMAKE
-  else
-    ln -svf $srcdir/bl.txt
-
-    if [[ ! -z $EXPLICIT_CFLAGS ]]; then
-      CONFIGURE+=( "--with-cc-opt=${CFLAGS}" )
-    fi
-    echo "./configure ${CONFIGURE[@]}"
-    ./configure ${CONFIGURE[@]}
-    make
-  fi
-}
-
-package() {
-  echo "make install >/dev/null"
-  cd "${srcdir}/nginx-${_nginx_ver}"
-  make DESTDIR="$pkgdir/" install >/dev/null
-  
-  sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/$_conf_path/conf/nginx.conf
-  
-  install -d "${pkgdir}/${_tmp_path}" 
-  install -d "${pkgdir}/${_doc_root}" 
-  
-  mv "${pkgdir}/${_conf_path}/html/"* "${pkgdir}/${_doc_root}"
-  rm -rf "${pkgdir}/${_conf_path}/html"
-  
-  #install -D -m644 "${srcdir}/nginx.logrotate" "${pkgdir}/etc/logrotate.d/${_pkgname}" #no default logrotate.
-  install -D -m644 "${srcdir}/nginx.conf" "${pkgdir}/etc/conf.d/nginx"
-  install -D -m644 "${srcdir}/nginx.service" "${pkgdir}/lib/systemd/system/nginx.service"
-  install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/nginx/LICENSE"
-  if [[ -z $NGINX_VERYOLDVERSION ]]; then
-    install -D -m644 "man/nginx.8" "${pkgdir}/usr/share/man/man8/nginx.8"
-  fi
-}
diff --git a/debian/modules/nchan/dev/nginx-nchan/bl.txt b/debian/modules/nchan/dev/nginx-nchan/bl.txt
deleted file mode 100644
index 517b8fa..0000000
--- a/debian/modules/nchan/dev/nginx-nchan/bl.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-fun:ngx_regex_module_init
-fun:ngx_http_script_copy_capture_len_code
-fun:ngx_http_script_copy_capture_code
-fun:ngx_http_parse_request_line
-fun:ngx_writev
-src:*ngx_writev_chain.c
diff --git a/debian/modules/nchan/dev/nginx-nchan/install b/debian/modules/nchan/dev/nginx-nchan/install
deleted file mode 100644
index c67dbd4..0000000
--- a/debian/modules/nchan/dev/nginx-nchan/install
+++ /dev/null
@@ -1,11 +0,0 @@
-#!sh
-post_install() {
-    post_upgrade
-}
-post_upgrade() {
-    rm -fv /etc/nginx/http 2>/dev/null
-    ln -sf /usr/share/nginx/http /etc/nginx/html
-}
-post_uninstall() {
-    rm /etc/nginx/http
-}
diff --git a/debian/modules/nchan/dev/nginx-nchan/nchan b/debian/modules/nchan/dev/nginx-nchan/nchan
deleted file mode 120000
index 6581736..0000000
--- a/debian/modules/nchan/dev/nginx-nchan/nchan
+++ /dev/null
@@ -1 +0,0 @@
-../../
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/nginx-nchan/nginx.conf b/debian/modules/nchan/dev/nginx-nchan/nginx.conf
deleted file mode 100644
index 02ee838..0000000
--- a/debian/modules/nchan/dev/nginx-nchan/nginx.conf
+++ /dev/null
@@ -1 +0,0 @@
-NGINX_CONFIG=/etc/nginx/conf/nginx.conf
diff --git a/debian/modules/nchan/dev/nginx-nchan/nginx.logrotate b/debian/modules/nchan/dev/nginx-nchan/nginx.logrotate
deleted file mode 100644
index 610444d..0000000
--- a/debian/modules/nchan/dev/nginx-nchan/nginx.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-	/var/log/nginx/*log /var/log/nginx/*/*log {
-		daily
-		create 640 http log
-		compress
-		postrotate
-			[ ! -f /run/nginx.pid ] || kill -USR1 `cat /run/nginx.pid`
-		endscript
-	}
diff --git a/debian/modules/nchan/dev/nginx-nchan/nginx.service b/debian/modules/nchan/dev/nginx-nchan/nginx.service
deleted file mode 100644
index 8e28f0c..0000000
--- a/debian/modules/nchan/dev/nginx-nchan/nginx.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=A high performance web server and a reverse proxy server
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit
-
-[Install]
-WantedBy=multi-user.target
diff --git a/debian/modules/nchan/dev/nginx-nchan/ngx_slab.patch b/debian/modules/nchan/dev/nginx-nchan/ngx_slab.patch
deleted file mode 100644
index 6f42e69..0000000
--- a/debian/modules/nchan/dev/nginx-nchan/ngx_slab.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
---- a/src/core/ngx_slab.c
-+++ b/src/core/ngx_slab.c
-@@ -129,6 +129,8 @@ ngx_slab_init(ngx_slab_pool_t *pool)
-         pool->pages->slab = pages;
-     }
- 
-+    pool->last = pool->pages + pages;
-+
-     pool->log_nomem = 1;
-     pool->log_ctx = &pool->zero;
-     pool->zero = '\0';
-@@ -626,6 +628,8 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *po
-         if (page->slab >= pages) {
- 
-             if (page->slab > pages) {
-+                page[page->slab - 1].prev = (uintptr_t) &page[pages];
-+
-                 page[pages].slab = page->slab - pages;
-                 page[pages].next = page->next;
-                 page[pages].prev = page->prev;
-@@ -672,7 +676,8 @@ static void
- ngx_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
-     ngx_uint_t pages)
- {
--    ngx_slab_page_t  *prev;
-+    ngx_uint_t        type;
-+    ngx_slab_page_t  *prev, *join;
- 
-     page->slab = pages--;
- 
-@@ -686,6 +691,53 @@ ngx_slab_free_pages(ngx_slab_pool_t *poo
-         page->next->prev = page->prev;
-     }
- 
-+    join = page + page->slab;
-+
-+    if (join < pool->last) {
-+        type = join->prev & NGX_SLAB_PAGE_MASK;
-+
-+        if (type == NGX_SLAB_PAGE && join->next != NULL) {
-+            pages += join->slab;
-+            page->slab += join->slab;
-+
-+            prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
-+            prev->next = join->next;
-+            join->next->prev = join->prev;
-+
-+            join->slab = NGX_SLAB_PAGE_FREE;
-+            join->next = NULL;
-+            join->prev = NGX_SLAB_PAGE;
-+        }
-+    }
-+
-+    if (page > pool->pages) {
-+        join = page - 1;
-+        type = join->prev & NGX_SLAB_PAGE_MASK;
-+
-+        if (type == NGX_SLAB_PAGE && join->slab == NGX_SLAB_PAGE_FREE) {
-+            join = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
-+        }
-+
-+        if (type == NGX_SLAB_PAGE && join->next != NULL) {
-+            pages += join->slab;
-+            join->slab += page->slab;
-+
-+            prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
-+            prev->next = join->next;
-+            join->next->prev = join->prev;
-+
-+            page->slab = NGX_SLAB_PAGE_FREE;
-+            page->next = NULL;
-+            page->prev = NGX_SLAB_PAGE;
-+
-+            page = join;
-+        }
-+    }
-+
-+    if (pages) {
-+        page[pages].prev = (uintptr_t) page;
-+    }
-+
-     page->prev = (uintptr_t) &pool->free;
-     page->next = pool->free.next;
- 
-diff --git a/src/core/ngx_slab.h b/src/core/ngx_slab.h
---- a/src/core/ngx_slab.h
-+++ b/src/core/ngx_slab.h
-@@ -29,6 +29,7 @@ typedef struct {
-     size_t            min_shift;
- 
-     ngx_slab_page_t  *pages;
-+    ngx_slab_page_t  *last;
-     ngx_slab_page_t   free;
- 
-     u_char           *start;
-
--- 
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/nginx-proxy.conf b/debian/modules/nchan/dev/nginx-proxy.conf
deleted file mode 100644
index 97fdcc8..0000000
--- a/debian/modules/nchan/dev/nginx-proxy.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-worker_processes 3;
-pid        /tmp/pushmodule-test-nginx-proxy.pid;
-daemon     off;
-
-events {
-  worker_connections  90000;
-  accept_mutex on;
-}
-
-error_log  /dev/stderr  notice;
-
-http {
-  access_log /dev/null;
-  client_body_temp_path /tmp/ 1 2;
-  sendfile        on;
-  keepalive_timeout  65;
-  server {
-    listen       8083;
-    location / {
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header Host $http_host;
-      proxy_redirect off;
-      proxy_pass http://localhost:8082;
-    }
-  }
-}
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/nginx.conf b/debian/modules/nchan/dev/nginx.conf
deleted file mode 100644
index 69013f3..0000000
--- a/debian/modules/nchan/dev/nginx.conf
+++ /dev/null
@@ -1,444 +0,0 @@
-#!/bin/sh #good enough highlighting
-#load_module "nginx-nchan/pkg/nginx-nchan-dev/etc/nginx/modules/ngx_nchan_module.so";
-#user  nobody;
-worker_processes      20;
-working_directory     /tmp;
-
-worker_rlimit_core    1024M;
-worker_rlimit_nofile  100000;
-#debug_points stop;
-
-error_log             /dev/stderr;
-
-pid                   /tmp/nchan-test-nginx.pid;
-daemon                off;
-
-events {
-  worker_connections  50000;
-  accept_mutex on;
-}
-
-http {
-  log_format nchan '$nchan_channel_id $nchan_subscriber_type $nchan_publisher_type $nchan_message_id $nchan_prev_message_id';
-  access_log /dev/stdout;
-#  access_log /dev/stdout;
-  default_type  application/octet-stream;
-  client_body_temp_path /tmp/ 1 2;
-  sendfile        on;
-  keepalive_timeout  65;
-  nchan_subscribe_existing_channels_only off;
-  nchan_max_reserved_memory 32M;
-  #nchan_redis_fakesub_timer_interval 1s;
-  client_max_body_size 100m;
-  #client_body_in_file_only clean;
-  #client_body_buffer_size 32K;
-  
-  nchan_redis_url "redis://127.0.0.1:8537";
-  nchan_use_redis on;
-  
-  #cachetag
-  
-  #server {
-  #  listen        1443  ssl http2;
-  #  listen        8081  http2;
-  #  
-  #  ssl_certificate     cert.pem;
-  #  ssl_certificate_key cert-key.pem;
-  #  
-  #  location ~ /pubsub/(\w+)$ {
-  #    nchan_channel_id $1;
-  #    nchan_pubsub;
-  #    nchan_message_buffer_length 200;
-  #    nchan_message_timeout 240s;
-  #    nchan_channel_group test;
-  #  }
-  #  
-  #  location / {
-  #    proxy_pass http://127.0.0.1:9292$uri;
-  #    proxy_set_header    Host            $host;
-  #    proxy_set_header    X-Real-IP       $remote_addr;
-  #    proxy_set_header    X-Forwarded-For $remote_addr;
-  #    gzip on;
-  #  }
-  #}
-  
-  upstream redis_cluster {
-    nchan_redis_server redis://127.0.0.1:7000;
-    nchan_redis_server redis://127.0.0.1:7001;
-    #nchan_redis_server redis://127.0.0.1:7002;
-  }
-  
-  server {
-    listen       8082;
-    listen       8085   http2;
-    #these are all open for benchmarking with a horde of subscribers
-    #listen      18000;
-    #listen      18001;
-    #listen      18002;
-    #listen      18003;
-    #listen      18004;
-    #listen      18005;
-    #listen      18006;
-    #listen      18007;
-    #listen      18008;
-    #listen      18009;
-    #listen      18010;
-    #    root ./;
-    
-    nchan_redis_pass redis_cluster;
-    nchan_redis_pass_inheritable on;
-    
-    #nchan_channel_events_channel_id 'events';
-    
-    #nchan_access_control_allow_origin "http://localhost:8082";
-    
-    #nchan_use_redis on;
-    
-    location ~ /pubredis/(\w+)$ {
-      #nchan_redis_url "redis://127.0.0.1:8537/5";
-      nchan_publisher;
-      nchan_channel_id $1;
-      nchan_channel_group redistest;
-      #nchan_use_redis on;
-    }
-    
-    location ~ /subredis/(\w+)$ {
-      #nchan_redis_url "redis://127.0.0.1:8537/5";
-      nchan_subscriber;
-      nchan_channel_id $1;
-      nchan_channel_group redistest;
-      #nchan_use_redis on;
-    }
-    
-    location ~ /sub/events {
-      nchan_subscriber;
-      nchan_channel_group meta;
-      nchan_channel_id events;
-    }
-    
-    location ~ /sub/noid$ {
-      nchan_subscriber;  
-    }
-    
-    location ~ /sub/internal/(\w+)$ {
-      internal;
-      nchan_subscriber;
-      nchan_channel_id $1;
-      nchan_channel_group test;
-    }
-    
-    location = /upstream {
-      proxy_pass http://127.0.0.1:8053/accel;
-    }
-    
-    #'$nchan_channel_id $nchan_subscriber_type $nchan_publisher_type $nchan_message_id $nchan_prev_message_id'
-    
-    location ~ /upstream_pubsub/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_pubsub;
-      nchan_message_buffer_length 200;
-      nchan_message_timeout 240s;
-      nchan_channel_group test;
-      nchan_publisher_upstream_request /upstream_pub;
-    }
-    
-    location ~ /pubsub/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_pubsub;
-      nchan_message_buffer_length 200;
-      nchan_message_timeout 240s;
-      nchan_channel_group test;
-    }
-    
-    location ~ /pub/(\w+)$ {
-      nchan_channel_id $1;
-      #nchan_channel_events_channel_id 'events/pubftl/$1';
-      nchan_publisher;
-      nchan_message_buffer_length 200;
-      nchan_message_timeout 240s;
-      nchan_channel_group test;
-    }
-    
-    location ~ /pub_1message/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_publisher;
-      nchan_message_buffer_length 1;
-      nchan_message_timeout 240s;
-      nchan_channel_group test;
-    }
-    
-    location ~ /pubauth/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_authorize_request /auth;
-      nchan_publisher;
-      nchan_message_buffer_length 200;
-      nchan_message_timeout 240s;
-      nchan_channel_group test;
-    }
-    
-    location ~ /pub_multi/(\w+)/(\w+)/(\w+)$ {
-      nchan_channel_id $1 $2 $3;
-      #nchan_channel_events_channel_id 'events/pubftl/$1';
-      nchan_publisher;
-      nchan_message_buffer_length 200;
-      nchan_message_timeout 240s;
-      nchan_channel_group test;
-    }
-
-    location ~/pub/nobuffer/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_publisher;
-      nchan_store_messages off;
-      nchan_message_timeout 60s;
-      nchan_channel_group test;
-    }
-
-    location ~ /pub/2_sec_message_timeout/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_publisher;
-      nchan_message_buffer_length 200;
-      nchan_message_timeout 2s;
-      nchan_channel_group test;
-    }
-  
-    location ~ /sub/split/(.+)$ {
-      nchan_subscriber;
-      nchan_channel_id $1;
-      nchan_channel_group test;
-      nchan_channel_id_split_delimiter "_";
-      #nchan_use_redis on;
-    }
-    
-    location ~ /sub/broadcast/(\w+)$ {
-      #nchan_channel_events_channel_id 'events/sub/$1';
-      nchan_channel_id $1;
-      nchan_subscriber;
-      nchan_channel_group test;
-      #add_header "Content-Type" "text/plain";
-    }
-    location ~ /sub/rawstream/(\w+)$ {
-      #nchan_channel_events_channel_id 'events/sub/$1';
-      gzip on;
-      gzip_min_length 10;
-      gzip_proxied any;
-      gzip_types *;
-      nchan_channel_id $1;
-      nchan_subscriber http-raw-stream;
-      nchan_subscriber_http_raw_stream_separator "\n??";
-      nchan_channel_group test;
-      #add_header "Content-Type" "text/plain";
-    }
-    
-    location ~ /sub/from_foo\.bar/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_subscriber;
-      nchan_channel_group test;
-      nchan_access_control_allow_origin "http://foo.bar";
-    }
-    
-    location ~ /pub/from_foo\.bar/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_publisher;
-      nchan_channel_group test;
-      nchan_access_control_allow_origin "http://foo.bar";
-    }
-    
-    location ~ /sub/multipart/(\w+)$ {
-      nchan_channel_id $1;
-      
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    
-    location ~ /sub/multipart_multiplex/(\w+)/(\w+)/(\w+)$ {
-      nchan_channel_id $1 $2 $3;
-      nchan_subscriber;
-      nchan_channel_group test;
-      nchan_longpoll_multipart_response on;
-    }
-    
-    location ~ /sub/waitformsg/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_subscriber;
-      nchan_channel_group test;
-      nchan_subscriber_first_message newest;
-    }
-    
-    location ~ /sub/auth/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_authorize_request /auth;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    
-    location ~ /sub/auth_fail/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_authorize_request /auth_fail;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    
-    location = /auth_fail {
-      proxy_pass http://127.0.0.1:8053/auth_fail;
-      proxy_pass_request_body off;
-      proxy_set_header Content-Length "";
-      proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
-      proxy_set_header X-Publisher-Type $nchan_publisher_type;
-      proxy_set_header X-Message-Id $nchan_message_id;
-      proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
-      proxy_set_header X-Channel-Id $nchan_channel_id;
-      proxy_set_header X-Channel-Id2 $nchan_channel_id2;
-      proxy_set_header X-Channel-Id3 $nchan_channel_id3;
-      proxy_set_header X-Channel-Id4 $nchan_channel_id4;
-      proxy_set_header X-Original-URI $request_uri;
-    } 
-    
-    location = /auth {
-      proxy_pass http://127.0.0.1:8053/auth;
-      proxy_pass_request_body off;
-      proxy_set_header Content-Length "";
-      proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
-      proxy_set_header X-Publisher-Type $nchan_publisher_type;
-      proxy_set_header X-Message-Id $nchan_message_id;
-      proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
-      proxy_set_header X-Channel-Id $nchan_channel_id;
-      proxy_set_header X-Channel-Id2 $nchan_channel_id2;
-      proxy_set_header X-Channel-Id3 $nchan_channel_id3;
-      proxy_set_header X-Channel-Id4 $nchan_channel_id4;
-      proxy_set_header X-Original-URI $request_uri;
-    }
-    
-    location /upstream_pub {
-      proxy_pass http://127.0.0.1:8053/pub;
-      proxy_set_header X-Publisher-Type $nchan_publisher_type;
-      proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
-      proxy_set_header X-Channel-Id $nchan_channel_id;
-      proxy_set_header X-Original-URI $request_uri;
-    } 
-    
-    location ~ /sub/multi/(\w+)/(\w+)$ {
-      nchan_channel_id $1 $2;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    location ~ /sub/multi/(\w+)/(\w+)/(\w+)$ {
-      nchan_channel_id $1 $2 $3;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    location ~ /sub/multi/(\w+)/(\w+)/(\w+)/(\w+)$ {
-      nchan_channel_id $1 $2 $3 $4;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    location ~ /sub/multi/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)$ {
-      nchan_channel_id $1 $2 $3 $4 $5;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    location ~ /sub/multi/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)$ {
-      nchan_channel_id $1 $2 $3 $4 $5 $6;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    location ~ /sub/multi/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)/(\w+)$ {
-      nchan_channel_id $1 $2 $3 $4 $5 $6 $7;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    
-    
-    #location ~ /sub/first/(\w+)$ {
-    #  nchan_channel_id $1;
-    #  nchan_subscriber;
-    #  nchan_channel_group test;
-    #  nchan_subscriber_concurrency first;
-    #}
-    #location ~ /sub/last/(\w+)$ {
-    #  nchan_channel_id $1;
-    #  nchan_subscriber;
-    #  nchan_channel_group test;
-    #  nchan_subscriber_concurrency last;
-    #}
-    
-    
-    location ~ /sub/intervalpoll/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_subscriber interval-poll;
-      nchan_channel_group test;
-    }
-
-    location ~ /sub/gzip/(\w+)$ {
-      nchan_channel_id $1;
-      add_header Content-Type text/plain;
-      gzip on;
-      gzip_min_length 10;
-      gzip_proxied any;
-      gzip_types *;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-
-    #quick subscriber timeout
-    location ~ /sub/timeout/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_subscriber;
-      nchan_channel_group test;
-      nchan_subscriber_timeout 2s;
-    }
-
-    #existing channels only -- publishers must create the channel before subscribing
-    location ~ /sub/authorized/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_subscribe_existing_channels_only on;
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-
-    location ~ /sub/noid/(\w+)$ {
-      nchan_subscriber;
-      nchan_channel_group test;
-    }
-    
-    location ~ /rewrite/(.*)$ {
-      rewrite  ^/(.*)$  $1;
-    }
-    
-    location ~ /sub/websocket_only/(\w+)$ {
-      nchan_channel_id $1;
-      nchan_subscriber websocket;
-      nchan_channel_group test;
-      nchan_websocket_ping_interval 5s;
-    }
-    
-    location / {
-      proxy_pass http://127.0.0.1:9292$uri;
-      proxy_set_header    Host            $host;
-      proxy_set_header    X-Real-IP       $remote_addr;
-      proxy_set_header    X-Forwarded-For $remote_addr;
-      gzip on;
-    }
-    
-    
-    location = /subsub {
-      #public subscriber endpoint
-      proxy_pass http://127.0.0.1/internal_subscriber_redirect;
-      proxy_set_header    Host            $host;
-      proxy_set_header    X-Real-IP       $remote_addr;
-      proxy_set_header    X-Forwarded-For $remote_addr;
-    }
-    
-    location ~ /sub/internal {
-      internal;
-      #X-Accel-Redirect endpoint, inaccessible except via a redirect
-      nchan_subscriber;
-      nchan_channel_id user/$arg_user chat/$arg_chat;
-    }
-    
-    location ~ /pub/(user|chat)/(.+)$ {
-      nchan_publisher;
-      nchan_channel_id $1/$2;
-    }
-    
-  }
-}
diff --git a/debian/modules/nchan/dev/nginx.sh b/debian/modules/nchan/dev/nginx.sh
deleted file mode 100755
index b0cd60a..0000000
--- a/debian/modules/nchan/dev/nginx.sh
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/bin/zsh
-DEVDIR=`pwd`
-SRCDIR=$(readlink -m $DEVDIR/../src)
-echo $DEVDIR $SRCDIR
-
-VALGRIND_OPT=( "--tool=memcheck" "--trace-children=yes" "--track-origins=yes" "--read-var-info=yes" )
-
-VG_MEMCHECK_OPT=( "--leak-check=full" "--show-leak-kinds=all" "--leak-check-heuristics=all" "--keep-stacktraces=alloc-and-free" "--suppressions=${DEVDIR}/vg.supp" )
-
-#expensive definedness checks (newish option)
-#VALGRIND_OPT+=( "--expensive-definedness-checks=yes" )
-
-#long stack traces
-VG_MEMCHECK_OPT+=("--num-callers=20")
-
-#generate suppresions
-#VG_MEMCHECK_OPT+=("--gen-suppressions=all")
-
-#track files
-#VG_MEMCHECK_OPT+=("--track-fds=yes")
-
-
-
-WORKERS=5
-NGINX_DAEMON="off"
-NGINX_CONF=""
-ACCESS_LOG="/dev/null"
-ERROR_LOG="stderr"
-ERRLOG_LEVEL="notice"
-TMPDIR=""
-MEM="32M"
-
-DEBUGGER_NAME="kdbg"
-DEBUGGER_CMD="kdbg -p %s $SRCDIR/nginx"
-
-#DEBUGGER_NAME="nemiver"
-#DEBUGGER_CMD="nemiver --attach=%s $SRCDIR/nginx"
-
-
-REDIS_CONF="$DEVDIR/redis.conf"
-REDIS_PORT=8537
-
-_pkgdir="${DEVDIR}/nginx-nchan/pkg/nginx-nchan-dev"
-_dynamic_module="$_pkgdir/etc/nginx/modules/ngx_nchan_module.so"
-
-_cacheconf="  proxy_cache_path _CACHEDIR_ levels=1:2 keys_zone=cache:1m; \\n  server {\\n       listen 8007;\\n       location / { \\n          proxy_cache cache; \\n      }\\n  }\\n"
-
-NGINX_CONF_FILE="nginx.conf"
-
-for opt in $*; do
-  if [[ "$opt" = <-> ]]; then
-    WORKERS=$opt
-  fi
-  case $opt in
-    noredis|no-redis)
-      no_redis=1;;
-    redis-persist)
-      persist_redis=1;;
-    leak|leakcheck|valgrind|memcheck)
-      valgrind=1
-      VALGRIND_OPT+=($VG_MEMCHECK_OPT);;
-    debug-memcheck)
-      valgrind=1
-      VALGRIND_OPT+=($VG_MEMCHECK_OPT)
-      VALGRIND_OPT+=( "--vgdb=yes" "--vgdb-error=1" )
-      #ATTACH_DDD=1
-      ;;
-    massif)
-      VALGRIND_OPT=( "--tool=massif" "--heap=yes" "--stacks=yes" "--massif-out-file=massif-nginx-%p.out")
-      valgrind=1
-      ;;
-    callgrind|profile)
-      VALGRIND_OPT=( "--tool=callgrind" "--collect-jumps=yes"  "--collect-systime=yes" "--branch-sim=yes" "--cache-sim=yes" "--simulate-hwpref=yes" "--simulate-wb=yes" "--callgrind-out-file=callgrind-nginx-%p.out")
-      valgrind=1;;
-    helgrind)
-    VALGRIND_OPT=( "--tool=helgrind" "--free-is-write=yes")
-    valgrind=1
-    ;;
-    cachegrind)
-      VALGRIND_OPT=( "--tool=cachegrind" )
-      valgrind=1;;
-    alleyoop)
-      alleyoop=1;;
-    cache)
-      CACHE=1;;
-    access)
-      ACCESS_LOG="/dev/stdout";;
-    worker|one|single) 
-      WORKERS=1
-      ;;
-    debugmaster|debug-master)
-      WORKERS=1
-      debug_master=1
-      NGINX_DAEMON="off"
-      ;;
-    devconf)
-      NGINX_CONF_FILE="dev.conf"
-      ;;
-    debug)
-      WORKERS=1
-      NGINX_DAEMON="on"
-      debugger=1
-      ;;
-    altport)
-      ALTPORT=1
-      ;;
-    debuglog)
-      ERRLOG_LEVEL="debug"
-      ;;
-    errorlog)
-      ERROR_LOG="errors.log"
-      rm ./errors.log 2>/dev/null
-      ;;
-    lomem|lowmem|small)
-      MEM="5M";;
-    himem|highmem|large)
-      MEM="256M";;
-    verylowmem|tiny)
-      MEM="1M";;
-  esac
-done
-
-NGINX_CONFIG=`pwd`/$NGINX_CONF_FILE
-NGINX_TEMP_CONFIG=`pwd`/.nginx.thisrun.conf
-NGINX_OPT=( -p `pwd`/ 
-    -c $NGINX_TEMP_CONFIG
-)
-cp -fv $NGINX_CONFIG $NGINX_TEMP_CONFIG
-
-conf_replace(){
-    echo "$1 $2"
-    sed "s|^\(\s*\)\($1\)\(\s\+\).*|\1\2\3$2;|g" $NGINX_TEMP_CONFIG -i
-}
-
-ulimit -c unlimited
-
-if [[ ! -z $NGINX_CONF ]]; then
-    NGINX_OPT+=( -g "$NGINX_CONF" )
-fi
-#echo $NGINX_CONF
-#echo $NGINX_OPT
-
-export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer
-export ASAN_OPTIONS=symbolize=1
-
-echo "nginx $NGINX_OPT"
-if [[ ! -z $ALTPORT ]]; then
-  sed "s|^\(\s\+\)listen\(\s\+\)\(.*\)|\1listen\21\3|g" $NGINX_TEMP_CONFIG -i
-fi
-
-conf_replace "access_log" $ACCESS_LOG
-conf_replace "error_log" "$ERROR_LOG $ERRLOG_LEVEL"
-conf_replace "worker_processes" $WORKERS
-conf_replace "daemon" $NGINX_DAEMON
-conf_replace "working_directory" "\"$(pwd)\""
-conf_replace "push_max_reserved_memory" "$MEM"
-if [[ ! -z $CACHE ]]; then
-  sed "s|^\s*#cachetag.*|${_cacheconf}|g" $NGINX_TEMP_CONFIG -i
-  tmpdir=`pwd`"/.tmp"
-  mkdir $tmpdir 2>/dev/null
-  sed "s|_CACHEDIR_|\"$tmpdir\"|g" $NGINX_TEMP_CONFIG -i
-fi
-
-if [[ -f "$_dynamic_module" ]]; then
-  sed "s|^\s*#load_module.*|load_module \"${_dynamic_module}\";|g" $NGINX_TEMP_CONFIG -i
-fi
-
-#shutdown old redis
-old_redis_pid=`pgrep -f "redis-server 127.0.0.1:$REDIS_PORT"`
-if [[ ! -z $old_redis_pid ]] && [[ -z $persist_redis ]]; then
-  kill $old_redis_pid
-  wait $old_redis_pid
-  sleep 1
-fi
-#start redis
-if [[ -z $no_redis ]]; then
-  if [[ -z $old_redis_pid ]] || [[ -z $persist_redis ]]; then
-    if [[ -z $persist_redis ]]; then
-      redis-server $REDIS_CONF --port $REDIS_PORT &
-      redis_pid=$!
-    else
-      redis-server $REDIS_CONF --port $REDIS_PORT --daemonize yes
-      sleep 1
-      redis_pid=$(cat /tmp/redis-pushmodule.pid)
-    fi
-    echo "started redis on port $REDIS_PORT with pid $redis_pid"
-  else
-    echo "redis already running on port $REDIS_PORT with pid $old_redis_pid"
-  fi
-else
-  echo "don't start redis"
-fi
-
-
-ln -sf $DEVDIR/nginx $SRCDIR/nginx >/dev/null
-ln -sf $DEVDIR/nginx-nchan/src/nginx/src/ $SRCDIR/nginx-source >/dev/null
-
-
-debugger_pids=()
-
-TRAPINT() {
-  if [[ -z $persist_redis ]]; then
-    kill $redis_pid
-    wait $redis_pid
-  fi
-  if [[ $debugger == 1 ]]; then
-    sudo kill $debugger_pids
-  fi
-}
-
-attach_debugger() {
-  master_pid=`cat /tmp/nchan-test-nginx.pid`
-  while [[ -z $child_pids ]]; do
-    child_pids=`pgrep -P $master_pid`
-    sleep 0.1
-  done
-  while read -r line; do
-    echo "attaching $1 to $line"
-    sudo $(printf $2 $line) &
-    debugger_pids+="$!"
-  done <<< $child_pids
-  echo "$1 at $debugger_pids"
-}
-
-attach_ddd_vgdb() {
-  master_pid=$1
-  echo "attaching DDD for vgdb to master process $master_pid"
-  ddd --eval-command "set non-stop off" --eval-command "target remote | vgdb --pid=$master_pid" "$SRCDIR/nginx" 2>/dev/null &
-  debugger_pids+="$!"
-  sleep 1
-  while [[ -z $child_pids ]]; do
-    child_pids=`pgrep -P $master_pid`
-    sleep 0.3
-  done
-  echo "child pids: $child_pids"
-  
-  while read -r line; do
-    echo "attaching DDD for vgdb to $line"
-    ddd --eval-command "set non-stop off" --eval-command "target remote | vgdb --pid=$line" "$SRCDIR/nginx" 2>/dev/null &
-    debugger_pids+="$!"
-  done <<< $child_pids
-  echo "$1 at $debugger_pids"
-}
-
-if [[ $debugger == 1 ]]; then
-  ./nginx $NGINX_OPT
-  sleep 0.2
-  attach_debugger "$DEBUGGER_NAME" "$DEBUGGER_CMD"
-  wait $debugger_pids
-  kill $master_pid
-  rm -f $SRCDIR/nginx $SRCDIR/nginx-source 2>/dev/null
-elif [[ $debug_master == 1 ]]; then
-  pushd $SRCDIR
-  kdbg -a "$NGINX_OPT" "./nginx"
-  popd
-elif [[ $valgrind == 1 ]]; then
-  mkdir ./coredump 2>/dev/null
-  pushd ./coredump >/dev/null
-  if [[ $ATTACH_DDD == 1 ]]; then
-    valgrind $VALGRIND_OPT ../nginx $NGINX_OPT &
-    _master_pid=$!
-    echo "nginx at $_master_pid"
-    sleep 4
-    attach_ddd_vgdb $_master_pid
-    wait $debugger_pids
-    kill $master_pid
-  else
-    echo valgrind $VALGRIND_OPT ../nginx $NGINX_OPT
-    valgrind $VALGRIND_OPT ../nginx $NGINX_OPT
-  fi
-  popd >/dev/null
-elif [[ $alleyoop == 1 ]]; then
-  alleyoop ./nginx $NGINX_OPT
-else
-  ./nginx $NGINX_OPT &
-  wait $!
-fi
diff --git a/debian/modules/nchan/dev/package/.gitignore b/debian/modules/nchan/dev/package/.gitignore
deleted file mode 100644
index d42b353..0000000
--- a/debian/modules/nchan/dev/package/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pkgs/*
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/.gitignore b/debian/modules/nchan/dev/package/nginx-nchan-static/.gitignore
deleted file mode 100644
index 0c456f4..0000000
--- a/debian/modules/nchan/dev/package/nginx-nchan-static/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-pkg/
-src/
-nchan/
-*.tar.gz
-*.pkg.*
\ No newline at end of file
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/PKGBUILD b/debian/modules/nchan/dev/package/nginx-nchan-static/PKGBUILD
deleted file mode 100644
index 9238e95..0000000
--- a/debian/modules/nchan/dev/package/nginx-nchan-static/PKGBUILD
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/zsh
-_nginx_ver=1.10.1
-
-_openssl_ver=1.0.2h
-_pcre_ver=8.38
-_zlib_ver=1.2.8
-
-
-_nchan_tag=`git describe --abbrev=0 --tags`
-
-OPTIONS=(!strip debug) #nchan is still young, in case something goes wrong we want good coredumps
-
-if [[ ! -z $MTUNE_GENERIC ]]; then
-  CFLAGS="${CFLAGS//mtune=native/mtune=generic}"
-fi
-
-_pkgname=nginx
-
-_user=nginx
-_group=nginx
-
-_doc_root="/usr/share/${_pkgname}/http"
-_sysconf_path="etc"
-_conf_path="${_sysconf_path}/${_pkgname}"
-_log_path="/var/log/nginx"
-_cache_path="/var/cache/nginx"
-_pid_path="/var/run"
-_lock_path="/var/lock"
-_access_log="/dev/stdout"
-_error_log="errors.log"
-
-pkgver() {
-  echo "${_nginx_ver}.nchan${_nchan_tag:1}"
-}
-
-
-pkgname=nginx-nchan-static
-pkgver=1.10.0.nchan0.99.14
-pkgrel=1
-pkgdesc="Nginx + Nchan - a flexible pub/sub server"
-arch=('i686' 'x86_64')
-
-
-depends=('pcre' 'zlib' 'openssl')
-url="https://nchan.slact.net"
-license=('custom')
-conflicts=('nginx' 'nginx-unstable' 'nginx-svn' 'nginx-devel' 'nginx-custom' 'nginx-nchan-git') 
-provides=('nginx')
-backup=("${_conf_path}/nginx.conf"
-  "${_conf_path}/koi-win"
-  "${_conf_path}/koi-utf"
-  "${_conf_path}/win-utf"
-  "${_conf_path}/mime.types"
-  "${_conf_path}/fastcgi.conf"
-  "${_conf_path}/fastcgi_params"
-  "${_conf_path}/scgi_params"
-  "${_conf_path}/uwsgi_params"
-  "etc/logrotate.d/nginx")
-_user=nginx
-_group=nginx
-
-source=("http://nginx.org/download/nginx-${_nginx_ver}.tar.gz"
-  "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${_pcre_ver}.tar.gz"
-  "https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz"
-  "http://zlib.net/zlib-${_zlib_ver}.tar.gz"
-  "nginx.conf"
-  "nginx.logrotate"
-  "nginx.service"
-  "git+https://github.com/slact/nchan.git#tag=${_nchan_tag}"
-       )
-
-md5sums=('088292d9caf6059ef328aa7dda332e44'
-	 '8a353fe1450216b6655dfcf3561716d9'
-	 '9392e65072ce4b614c1392eefc1f23d0'
-	 '44d667c142d7cda120332623eab69f40'
-	 '845cab784b50f1666bbf89d7435ac7af'
-	 '79031b58828462dec53a9faed9ddb36a'
-	 '6696dc228a567506bca3096b5197c9db'
-         'SKIP')
-
-build() {
-  cd ${srcdir}/openssl-${_openssl_ver}
-  #don't install_docs
-  sed -i 's/^install: all install_docs install_sw$/install: all install_sw/' Makefile.org
-  rm Makefile #damn, openssl...
-    
-  local _src_dir="${srcdir}/nginx-$_nginx_ver"
-  local _build_dir="${_src_dir}/objs"
-  cd $_src_dir
-  
-  CONFIGURE=(
-    --prefix=/${_conf_path}
-    --sbin-path=/usr/sbin/nginx
-    --conf-path=/${_conf_path}/nginx.conf
-    --error-log-path=${_log_path}/error.log
-    --http-log-path=${_log_path}/access.log
-    --pid-path=${_pid_path}/nginx.pid
-    --lock-path=${_pid_path}/nginx.lock
-    
-    --http-client-body-temp-path=${_cache_path}/client_temp
-    --http-proxy-temp-path=${_cache_path}/proxy_temp
-    --http-fastcgi-temp-path=${_cache_path}/fastcgi_temp
-    --http-uwsgi-temp-path=${_cache_path}/uwsgi_temp
-    --http-scgi-temp-path=${_cache_path}/scgi_temp
-    
-    --user=${_user}
-    --group=${_group}
-    
-    --with-zlib="../zlib-${_zlib_ver}"
-    --with-pcre="../pcre-${_pcre_ver}"
-    --with-openssl="../openssl-${_openssl_ver}"
-    
-    --with-http_ssl_module
-    --with-http_realip_module
-    --with-http_addition_module
-    --with-http_sub_module
-    --with-http_dav_module
-    --with-http_flv_module
-    --with-http_mp4_module    
-    --with-http_gunzip_module
-    --with-http_gzip_static_module
-    --with-http_random_index_module
-    --with-http_secure_link_module
-    --with-http_stub_status_module
-    --with-http_auth_request_module
-    --with-mail
-    --with-mail_ssl_module
-    --with-file-aio
-    --with-http_v2_module
-    --with-ipv6
-    --with-debug
-    --with-ld-opt="-static-libgcc" #totally statically link everything
-    --with-cc-opt="-static"
-    --add-module="../nchan")
-
-  CFLAGS="$CFLAGS -ggdb" #make sure debug symbols are present
-  
-  ./configure ${CONFIGURE[@]}
-
-  make -j1
-}
-
-package() {
-  cd "${srcdir}/nginx-${_nginx_ver}"
-
-  mkdir -p ${pkgdir}/$_conf_path/sites-enabled/
-  mkdir -p ${pkgdir}/$_conf_path/sites-available/
-  mkdir -p ${pkgdir}${_cache_path}
-  
-  make DESTDIR="$pkgdir/" install >/dev/null
-  
-  sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/$_conf_path/nginx.conf
-  
-  install -d "${pkgdir}/${_tmp_path}" 
-  install -d "${pkgdir}/${_doc_root}" 
-  
-  mv "${pkgdir}/${_conf_path}/html/"* "${pkgdir}/${_doc_root}"
-  rm -rf "${pkgdir}/${_conf_path}/html"
-  
-  install -D -m644 "${srcdir}/nginx.logrotate" "${pkgdir}/etc/logrotate.d/${_pkgname}"
-  install -D -m644 "${srcdir}/nginx.conf" "${pkgdir}/etc/conf.d/${_pkgname}"
-  install -D -m644 "${srcdir}/nginx.service" "${pkgdir}/lib/systemd/system/nginx.service"
-  install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/nginx/LICENSE"
-
-}
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.conf b/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.conf
deleted file mode 100644
index 1b748a0..0000000
--- a/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.conf
+++ /dev/null
@@ -1 +0,0 @@
-NGINX_CONFIG=/etc/nginx/nginx.conf
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.logrotate b/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.logrotate
deleted file mode 100644
index f6f7246..0000000
--- a/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/nginx/*log
-/var/log/nginx/*/*log
-{
-  daily
-  missingok
-  create 640 http log
-  compress
-  postrotate
-    [ ! -f /run/nginx.pid ] || kill -USR1 `cat /run/nginx.pid`
-  endscript
-}
diff --git a/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.service b/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.service
deleted file mode 100644
index c237fd3..0000000
--- a/debian/modules/nchan/dev/package/nginx-nchan-static/nginx.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=A high performance web server and a reverse proxy server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-PrivateDevices=yes
-SyslogLevel=err
-
-ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; error_log stderr;'
-ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; error_log stderr;'
-ExecReload=/usr/bin/kill -HUP $MAINPID
-KillSignal=SIGQUIT
-KillMode=mixed
-
-[Install]
-WantedBy=multi-user.target
diff --git a/debian/modules/nchan/dev/package/repackage.sh b/debian/modules/nchan/dev/package/repackage.sh
deleted file mode 100755
index c3dcfe2..0000000
--- a/debian/modules/nchan/dev/package/repackage.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/zsh
-mydir=${0:a:h}
-
-pkgdir=$mydir/pkgs
-
-rm $pkgdir/* -fv >/dev/null 2>/dev/null
-
-pushd $mydir/nginx-nchan-static
-MTUNE_GENERIC=1 PKGDEST="$pkgdir" makepkg
-popd
-
-pushd $pkgdir
-archpkg=`echo *pkg.tar.xz`
-
-tarname=${archpkg:r}
-tarname=${tarname:r}
-tarname=${tarname:r}
-
-echo $tarname
-
-bundle exec fpm -s pacman -t tar -n "$tarname" $archpkg
-gzip -f "$tarname.tar"
-
-bundle exec fpm -s pacman --no-auto-depends -t deb $archpkg
-#bundle exec fpm -s pacman -t rpm $archpkg
-#bundle exec fpm -s pacman -t osxpkg $archpkg
-
-popd
diff --git a/debian/modules/nchan/dev/pub-multi.rb b/debian/modules/nchan/dev/pub-multi.rb
deleted file mode 100755
index 948bca1..0000000
--- a/debian/modules/nchan/dev/pub-multi.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/ruby
-require 'securerandom'
-require_relative 'pubsub.rb'
-require "optparse"
-server= "localhost:8082"
-msg=false
-loop=false
-repeat_sec=0.5
-content_type=nil
-on_response=Proc.new {}
-method=:POST
-runonce=false
-
-#Typhoeus::Config.verbose=true
-
-pubs = []
-ARGV.each do |v|
-  url = "http://#{server}/pub/#{v}"
-  puts "Publishing to #{url}."
-  pub = [v, Publisher.new(url, :timeout => 10000)]
-  pub[1].nofail = true
-  pubs << pub
-end
-
-repeat=true
-i=1
-
-while repeat do
-  puts "press enter to send message ##{i}"
-  STDIN.gets
-  n=0
-  pubs.each do |p|
-    n+=1
-    this_msg = "#{p.first} (#{n}) -- #{i}"
-    p.last.submit this_msg, method, content_type, &on_response
-    puts "sent #{this_msg}"
-  end
-  i+=1
-end
diff --git a/debian/modules/nchan/dev/pub.rb b/debian/modules/nchan/dev/pub.rb
deleted file mode 100755
index 6bfd32f..0000000
--- a/debian/modules/nchan/dev/pub.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/ruby
-require 'securerandom'
-require_relative 'pubsub.rb'
-require "optparse"
-server= "localhost:8082"
-msg=false
-loop=false
-repeat_sec=0.5
-content_type=nil
-msg_gen = false
-on_response=Proc.new {}
-method=:POST
-runonce=false
-accept = nil
-timeout = 3
-verbose = nil
-
-opt=OptionParser.new do |opts|
-  opts.on("-s", "--server SERVER (#{server})", "server and port."){|v| server=v}
-  opts.on("-v", "--verbose", "Blabberhttp"){verbose=true}
-  opts.on("-l", "--loop [SECONDS]", "re-send message every N seconds (#{repeat_sec})") do |v| 
-    loop=true
-    repeat_sec=Float(v) unless v.nil?
-  end
-  opts.on("-M", "--method [#{method}]", "method for request to server"){|v| method= v.upcase.to_sym}
-  opts.on("-m", "--message MSG", "publish this message instead of prompting"){|v| msg=v}
-  opts.on("-1", "--once", "run once then exit"){runonce=true}
-  opts.on("-a", "--accept TYPE", "set Accept header"){|v| accept=v}
-  opts.on("-c", "--content-type TYPE", "set content-type for all messages"){|v| content_type=v}
-  opts.on("-e",  "--eval RUBY_BLOCK", '{|n| "message #{n}" }'){|v| msg_gen = eval " Proc.new #{v} "}
-  opts.on("-d", "--delete", "delete channel via a DELETE request"){method = :DELETE}
-  opts.on("-p", "--put", "create channel without submitting message"){method = :PUT}
-  opts.on("-t", "--timeout SECONDS", "publishing timeout (sec). default #{timeout} sec"){|v| timeout = v.to_i}
-  opts.on("-r",  "--response", 'Show response code and body') do
-    on_response = Proc.new do |code, body|
-      puts code
-      puts body
-    end
-  end
-end
-opt.banner="Usage: pub.rb [options] url"
-opt.parse!
-
-url = "http://#{server}#{ARGV.last}"
-
-puts "Publishing to #{url}."
-
-
-loopmsg=("\r"*20) + "sending message #"
-
-pub = Publisher.new url, nostore: true, timeout: timeout, verbose: verbose
-pub.accept=accept
-pub.nofail=true
-repeat=true
-i=1
-if loop then
-  puts "Press enter to send message."
-end
-while repeat do
-  if msg or msg_gen
-    if loop
-      sleep repeat_sec
-      print "#{loopmsg} #{i}"
-    elsif !runonce
-      STDIN.gets
-    end
-    if msg
-      pub.submit msg, method, content_type, &on_response
-    elsif msg_gen
-      this_msg = msg_gen.call(i).to_s
-      puts this_msg
-      pub.submit this_msg, method, content_type, &on_response
-    end
-  else
-    if loop
-      puts "Can't repeat with custom message. use -m option"
-    end
-    puts "Enter message, press enter twice."
-    message = ""
-    while((line = STDIN.gets) != "\n") do #doesn't work when there are parameters. wtf?
-      message << line
-    end
-    message=message[0..-2] #remove trailing newline
-    
-    pub.submit message, method, content_type, &on_response
-    puts ""
-  end
-  i+=1
-  exit 0 if runonce
-end
diff --git a/debian/modules/nchan/dev/pubsub.rb b/debian/modules/nchan/dev/pubsub.rb
deleted file mode 100644
index dcd7760..0000000
--- a/debian/modules/nchan/dev/pubsub.rb
+++ /dev/null
@@ -1,1483 +0,0 @@
-#!/usr/bin/ruby
-require 'typhoeus'
-require 'json'
-require 'pry'
-require 'celluloid/current'
-require 'date'
-Typhoeus::Config.memoize = false
-require 'celluloid/io'
-require 'websocket'
-require 'uri'
-require "http/parser"
-require "http/2"
-
-PUBLISH_TIMEOUT=3 #seconds
-
-class Message
-  attr_accessor :content_type, :message, :times_seen, :etag, :last_modified
-  def initialize(msg, last_modified=nil, etag=nil)
-    @times_seen=1
-    @message, @last_modified, @etag = msg, last_modified, etag
-  end
-  def serverside_id
-    timestamp=nil
-    if last_modified
-      timestamp = DateTime.httpdate(last_modified).to_time.utc.to_i
-    end
-    "#{timestamp}:#{etag}"
-  end
-  def id=(val)
-    @id=val
-  end
-  def id
-    @id||=serverside_id
-  end
-  def unique_id
-    if id.include? ","
-      time, etag = id.split ":"
-      etag = etag.split(",").map{|x| x[0] == "[" ? x : "?"}.join "," #]
-      [time, etag].join ":"
-    else
-      id
-    end
-  end
-  def to_s
-    @message
-  end
-  
-  def self.each_multipart_message(content_type, body)
-    content_type = content_type.last if Array === content_type 
-    matches=/^multipart\/mixed; boundary=(?<boundary>.*)/.match content_type
-    
-    if matches
-      splat = body.split(/^--#{Regexp.escape matches[:boundary]}-?-?\r?\n?/)
-      splat.shift
-      
-      splat.each do |v|
-        mm=(/(Content-Type:\s(?<content_type>.*?)\r\n)?\r\n(?<body>.*)\r\n/m).match v
-        yield mm[:content_type], mm[:body], true
-      end
-      
-    else
-      yield content_type, body
-    end
-  end
-end
-
-class MessageStore
-  include Enumerable
-  attr_accessor :msgs, :name
-
-  def matches? (other_msg_store)
-    my_messages = messages
-    if MessageStore === other_msg_store
-      other_messages = other_msg_store.messages
-      other_name = other_msg_store.name
-    else
-      other_messages = other_msg_store
-      other_name = "?"
-    end
-    unless my_messages.count == other_messages.count 
-      err =  "Message count doesn't match:\r\n"
-      err << "#{self.name}: #{my_messages.count}\r\n"
-      err << "#{self.to_s}\r\n"
-      
-      err << "#{other_name}: #{other_messages.count}\r\n"
-      err << "#{other_msg_store.to_s}"
-      return false, err
-    end
-    other_messages.each_with_index do |msg, i|
-      return false, "Message #{i} doesn't match. (#{self.name} |#{my_messages[i].length}|, #{other_name} |#{msg.length}|) " if my_messages[i] != msg
-    end
-    true
-  end
-
-  def initialize(opt={})
-    @array||=opt[:noid]
-    clear
-  end
-
-  def messages
-    self.to_a.map{|m|m.to_s}
-  end
-
-  #remove n oldest messages
-  def remove_old(n=1)
-    n.times {@msgs.shift}
-    @msgs.count
-  end
-  
-  def clear
-    @msgs= @array ? [] : {}
-  end
-  
-  def to_a
-    @array ? @msgs : @msgs.values
-  end
-  def to_s
-    buf=""
-    each do |msg|
-      m = msg.to_s
-      m = m.length > 20 ? "#{m[0...20]}..." : m
-      buf<< "<#{msg.id}> \"#{m}\" (count: #{msg.times_seen})\r\n"
-    end
-    buf
-  end
-
-  def [](i)
-    @msgs[i]
-  end
-  
-  def each
-    if @array
-      @msgs.each {|msg| yield msg }
-    else
-      @msgs.each {|key, msg| yield msg }
-    end
-  end
-  def <<(msg)
-    if @array
-      @msgs << msg
-    else
-      if (cur_msg=@msgs[msg.unique_id])
-        #puts "Different messages with same id: #{msg.id}, \"#{msg.to_s}\" then \"#{cur_msg.to_s}\"" unless cur_msg.message == msg.message
-        cur_msg.times_seen+=1
-        cur_msg.times_seen
-      else
-        @msgs[msg.unique_id]=msg
-        1
-      end
-    end
-  end
-end
-
-class Subscriber
-  
-  class Client
-    attr_accessor :concurrency
-    class ErrorResponse
-      attr_accessor :code, :msg, :connected, :caller, :bundle
-      def initialize(code, msg, bundle=nil, what=nil, failword=nil)
-        self.code = code
-        self.msg = msg
-        if Subscriber::Client::ParserBundle === bundle
-          self.bundle=bundle
-          self.connected = bundle.connected?
-        else
-          self.connected = bundle
-        end
-        self.connected = connected
-        
-        @what = what || ["handshake", "connection"]
-        @failword = failword || " failed"
-      end
-      
-      def to_s
-        "#{(caller.class.name.split('::').last || self.class.name.split('::')[-2])} #{connected ? @what.last : @what.first}#{@failword}: #{msg} (code #{code})"
-      end  
-    
-    end
-    
-    def self.inherited(subclass)
-      @@inherited||=[]
-      @@inherited << subclass
-    end
-    
-    def self.lookup(name)
-      @@inherited.each do |klass|
-        return klass if klass.aliases.include? name
-      end
-      nil
-    end
-    def self.aliases
-      []
-    end
-      
-    def self.unique_aliases
-      uniqs=[]
-      @@inherited.each do |klass|
-        uniqs << klass.aliases.first if klass.aliases.length > 0
-      end
-      uniqs
-    end
-    
-    def provides_msgid?
-      true
-    end
-    
-    def error(code, msg, bundle=nil)
-      err=ErrorResponse.new code, msg, bundle, @error_what, @error_failword
-      err.caller=self
-      err
-    end
-    
-    class ParserBundle
-      attr_accessor :uri, :sock, :body_buf, :connected, :verbose, :parser, :subparser, :headers, :code, :last_modified, :etag
-      def initialize(uri, *arg)
-        @uri=uri
-        open_socket
-      end
-      def open_socket
-        case uri.scheme
-        when /^(ws|http|h2c)$/
-          @sock = Celluloid::IO::TCPSocket.new(uri.host, uri.port)
-        when /^(wss|https|h2)$/
-          @sock = Celluloid::IO::SSLSocket.new(Celluloid::IO::TCPSocket.new(uri.host, uri.port))
-        else
-          raise ArgumentError, "unexpected uri scheme #{uri.scheme}"
-        end
-        self
-      end
-      
-      def buffer_body!
-        @body_buf||=""
-      end
-      def connected?
-        @connected
-      end
-      def on_headers(code=nil, h=nil, &block)
-        @body_buf.clear if @body_buf
-        if block_given?
-          @on_headers = block
-        else
-          @on_headers.call(code, h) if @on_headers
-        end
-      end
-      
-      def on_chunk(ch=nil, &block)
-        if block_given?
-          @on_chunk = block
-        else
-          @body_buf << ch if @body_buf
-          @on_chunk.call(ch) if @on_chunk
-        end
-      end
-      
-      def on_response(code=nil, headers=nil, &block)
-        if block_given?
-          @on_response = block
-        else
-          @on_response.call(code, headers, @body_buf) if @on_response
-        end
-        
-      end
-      
-      def on_error(msg=nil, e=nil, &block)
-        if block_given?
-          @on_error = block
-        else
-          @on_error.call(msg, e) if @on_error
-        end
-      end
-    end
-    
-    def handle_bundle_error(bundle, msg, err)
-      if err && !(EOFError === err)
-        msg="<#{msg}>\n#{err.backtrace.join "\n"}"
-      end
-      @subscriber.on_failure error(0, msg, bundle)
-      @subscriber.finished+=1
-      close bundle
-    end
-    
-    def poke(what=nil)
-      if what == :ready
-        (@notready.nil? || @notready > 0) && @cooked_ready.wait
-      else
-        @connected > 0 && @cooked.wait
-      end
-    end
-    
-    def initialize(*arg)
-      @notready = 9000
-      @cooked_ready=Celluloid::Condition.new
-    end
-    
-  end
-  
-  class WebSocketClient < Client
-    include Celluloid::IO
-    
-    def self.aliases
-      [:websocket, :ws]
-    end
-    
-    #a little sugar for handshake errors
-    class WebSocket::Handshake::Client
-      attr_accessor :data
-      def response_code(what=:code)
-        resp=@data.match(/^HTTP\/1.1 (?<code>\d+) (?<line>[^\\\r\\\n]+)/)
-        resp[what]
-      end
-      def response_line
-        response_code :line
-      end
-    end
-    
-    class WebSocketBundle
-      attr_accessor :ws, :sock, :last_message_time
-      def initialize(handshake, sock)
-        @buf=""
-        self.ws = WebSocket::Frame::Incoming::Client.new(version: handshake.version)
-        self.sock = sock
-      end
-      
-      def read
-        @buf.clear
-        ws << sock.readpartial(4096, @buf)
-      end
-      
-      def next
-        ws.next
-      end
-    end
-    
-    def provides_msgid?
-      false
-    end
-    
-    attr_accessor :last_modified, :etag, :timeout
-    def initialize(subscr, opt={})
-      super
-      @last_modified, @etag, @timeout = opt[:last_modified], opt[:etag], opt[:timeout].to_i || 10
-      @connect_timeout = opt[:connect_timeout]
-      @subscriber=subscr
-      @url=subscr.url
-      @url = @url.gsub(/^h(ttp|2)(s)?:/, "ws\\2:")
-      
-      @concurrency=(opt[:concurrency] || opt[:clients] || 1).to_i
-      @retry_delay=opt[:retry_delay]
-      @ws = {}
-      @connected=0
-      @notready=@concurrency
-      @nomsg = opt[:nomsg]
-      @http2 = opt[:http2]
-      if @timeout
-        @timer = after(@timeout) do
-          @subscriber.on_failure error(0, "Timeout", b)
-          @ws.each do |b, v|
-            close b
-          end
-        end
-      end
-    end
-    
-    def try_halt
-      @disconnected ||= 0
-      @disconnected += 1
-      if @disconnected == @concurrency
-        halt
-      end
-    end
-    
-    def halt
-      @halting = true
-    end
-    
-    def run(was_success = nil)
-      uri = URI.parse(@url)
-      uri.port ||= (uri.scheme == "ws" ? 80 : 443)
-      @cooked=Celluloid::Condition.new
-      @connected = @concurrency
-      if @http2
-        @subscriber.on_failure error(0, "Refusing to try websocket over HTTP/2")
-        @connected = 0
-        @notready = 0
-        @cooked_ready.signal false
-        @cooked.signal true
-        return
-      end
-      raise ArgumentError, "invalid websocket scheme #{uri.scheme} in #{@url}" unless uri.scheme.match /^wss?$/
-      @concurrency.times do
-        begin
-          sock = ParserBundle.new(uri).open_socket.sock
-        rescue SystemCallError => e
-          @subscriber.on_failure error(0, e.to_s)
-          close nil
-          return
-        end
-          
-        @handshake = WebSocket::Handshake::Client.new(url: @url)
-        sock << @handshake.to_s
-        
-        #handshake response
-        loop do
-          @handshake << sock.readline
-          break if @handshake.finished?
-        end
-        
-        if @handshake.valid?
-          bundle = WebSocketBundle.new(@handshake, sock)
-          @ws[bundle]=true
-          async.listen bundle
-          @notready-=1
-          @cooked_ready.signal true if @notready == 0
-        else
-          @subscriber.on_failure error(@handshake.response_code, @handshake.response_line)
-          close nil
-        end
-      end
-    end
-    
-    def listen(bundle)
-      loop do
-        begin
-          bundle.read
-          while msg = bundle.next do
-            @timer.reset if @timer
-            if on_message(msg.data, msg.type, bundle) == false
-              close bundle
-              return 
-            end
-          end
-        rescue EOFError
-          bundle.sock.close
-          close bundle
-          return
-        end
-      end
-    end
-    
-    def on_error
-      if !@connected[ws]
-        @subscriber.on_failure error(ws.handshake.response_code, ws.handshake.response_line)
-        try_halt
-      end
-    end
-    
-    def on_message(data, type, bundle)
-      #puts "Received message: #{data} type: #{type}"
-      if type==:close
-        close_frame = WebSocket::Frame::Outgoing::Client.new(version: @handshake.version, type: :close)
-        bundle.sock << close_frame.to_s
-        #server should close the connection, just reply
-        data.match(/(\d+)\s(.*)/)
-        @subscriber.on_failure error(($~[1] || 0).to_i, $~[2] || "", true)
-      elsif type==:ping
-        ping_frame = WebSocket::Frame::Outgoing::Client.new(version: @handshake.version, data: data, type: :pong)
-        bundle.sock << ping_frame.to_s
-      elsif type==:text
-        msg= @nomsg ? data : Message.new(data)
-        bundle.last_message_time=Time.now.to_f
-        @subscriber.on_message(msg, bundle)
-      else
-        raise "unexpected websocket frame #{type} data #{data}"
-      end
-    end
-    
-    def close(bundle)
-      if bundle
-        @ws.delete bundle
-        bundle.sock.close unless bundle.sock.closed?
-      end
-      @connected -= 1
-      if @connected <= 0
-        binding.pry unless @ws.count == 0
-        #binding.pry
-        @cooked.signal true
-      end
-    end
-    
-  end
-  
-  class LongPollClient < Client
-    include Celluloid::IO
-    
-    def self.aliases
-      [:longpoll]
-    end
-    
-    def error(*args)
-      @error_what||= ["#{@http2 ? "HTTP/2" : "HTTP"} Request"]
-      super
-    end
-    
-    class HTTPBundle < ParserBundle
-      attr_accessor :parser, :sock, :last_message_time, :done, :time_requested, :request_time, :stop_after_headers
-      
-      def initialize(uri, user_agent, accept="*/*", extra_headers={})
-        super
-        @accept = accept
-        @rcvbuf=""
-        @sndbuf=""
-        @parser = Http::Parser.new
-        @done = false
-        extra_headers = extra_headers.map{|k,v| "#{k}: #{v}\n"}.join ""
-        @send_noid_str= <<-END.gsub(/^ {10}/, '')
-          GET #{uri.path} HTTP/1.1
-          Host: #{uri.host}#{uri.default_port == uri.port ? "" : ":#{uri.port}"}
-          #{extra_headers}Accept: #{@accept}
-          User-Agent: #{user_agent || "HTTPBundle"}
-          
-        END
-        
-        @send_withid_fmt= <<-END.gsub(/^ {10}/, '')
-          GET #{uri.path} HTTP/1.1
-          Host: #{uri.host}#{uri.default_port == uri.port ? "" : ":#{uri.port}"}
-          #{extra_headers}Accept: #{@accept}
-          User-Agent: #{user_agent || "HTTPBundle"}
-          If-Modified-Since: %s
-          If-None-Match: %s
-          
-        END
-        
-        @parser.on_headers_complete = proc do |h|
-          if verbose 
-            puts "< HTTP/1.1 #{@parser.status_code} [...]\r\n#{h.map {|k,v| "< #{k}: #{v}"}.join "\r\n"}"
-          end
-          @headers=h
-          @last_modified = h['Last-Modified']
-          @etag = h['Etag']
-          @chunky = h['Transfer-Encoding']=='chunked'
-          @gzipped = h['Content-Encoding']=='gzip'
-          @code=@parser.status_code
-          on_headers @parser.status_code, h
-          if @stop_after_headers
-            @bypass_parser = true
-            :stop
-          end
-        end
-        
-        @parser.on_body = proc do |chunk|
-          handle_chunk chunk
-        end
-        
-        @parser.on_message_complete = proc do
-          @chunky = nil
-          @gzipped = nil
-          on_response @parser.status_code, @parser.headers
-        end
-        
-      end
-      
-
-      def handle_chunk(chunk)
-        chunk = Zlib::GzipReader.new(StringIO.new(chunk)).read if @gzipped 
-        on_chunk chunk
-      end
-      private :handle_chunk
-      
-      def reconnect?
-        true
-      end
-      
-      def send_GET(msg_time=nil, msg_tag=nil)
-        @last_modified = msg_time.to_s if msg_time
-        @etag = msg_tag.to_s if msg_tag
-        @sndbuf.clear 
-        data = @last_modified ? sprintf(@send_withid_fmt, @last_modified, @etag) : @send_noid_str
-        @sndbuf << data
-        
-        if @headers && @headers["Connection"]=="close" && [200, 201, 202, 304, 408].member?(@parser.status_code) && reconnect?
-          sock.close
-          open_socket
-          @parser.reset!
-        end
-        
-        @time_requested=Time.now.to_f
-        if verbose
-          puts "", data.gsub(/^.*$/, "> \\0")
-        end
-        sock << @sndbuf
-      end
-      
-      def read
-        @rcvbuf.clear
-        begin
-          sock.readpartial(1024*10000, @rcvbuf)
-          unless @bypass_parser
-            @parser << @rcvbuf
-          else
-            handle_chunk @rcvbuf
-          end
-        rescue HTTP::Parser::Error => e
-          on_error "Invalid HTTP Respose - #{e}", e
-        rescue EOFError => e
-          on_error "Server closed connection...", e
-        rescue => e 
-          on_error "#{e.class}: #{e}", e
-        end
-        return false if @done || sock.closed?
-      end
-    end
-    
-    class HTTP2Bundle < ParserBundle
-      attr_accessor :stream, :sock, :last_message_time, :done, :time_requested, :request_time
-      GET_METHOD="GET"
-      def initialize(uri, user_agent, accept="*/*", extra_headers=nil)
-        super
-        @done = false
-        @rcvbuf=""
-        @head = {
-          ':scheme' => uri.scheme,
-          ':method' => GET_METHOD,
-          ':path' => uri.path,
-          ':authority' => [uri.host, uri.port].join(':'),
-          'user-agent' => "#{user_agent || "HTTP2Bundle"}",
-          'accept' => accept
-        }
-        if extra_headers
-          extra_headers.each{ |h, v| @head[h.to_s.downcase]=v }
-        end
-        @client = HTTP2::Client.new
-        @client.on(:frame) do |bytes|
-          #puts "Sending bytes: #{bytes.unpack("H*").first}"
-          @sock.print bytes
-          @sock.flush
-        end
-        
-        @client.on(:frame_sent) do |frame|
-          #puts "Sent frame: #{frame.inspect}" if verbose
-        end
-        @client.on(:frame_received) do |frame|
-          #puts "Received frame: #{frame.inspect}" if verbose
-        end
-        @resp_headers={}
-        @resp_code=nil
-      end
-      
-      def reconnect?
-        false
-      end
-      
-      def send_GET(msg_time=nil, msg_tag=nil)
-        @last_modified = msg_time.to_s if msg_time
-        @etag = msg_tag.to_s if msg_tag
-        @time_requested=Time.now.to_f
-        if msg_time
-          @head['if-modified-since'] = msg_time.to_s
-        else
-          @head.delete @head['if-modified-since']
-        end
-        
-        if msg_tag
-          @head['if-none-match'] = msg_tag.to_s
-        else
-          @head.delete @head['if-none-match']
-        end
-        
-        @stream = @client.new_stream
-        @resp_headers.clear
-        @resp_code=0
-        @stream.on(:close) do |k,v|
-          on_response @resp_code, @resp_headers
-        end
-        @stream.on(:headers) do |h|
-          h.each do |v|
-            puts "< #{v.join ': '}" if verbose
-            case v.first
-            when ":status"
-              @resp_code = v.last.to_i
-            when /^:/
-              @resp_headers[v.first] = v.last
-            else
-              @resp_headers[v.first.gsub(/(?<=^|\W)\w/) { |v| v.upcase }]=v.last
-            end
-          end
-          @headers = @resp_headers
-          @code = @resp_code
-          on_headers @resp_code, @resp_headers
-        end
-        @stream.on(:data) do |d|
-          #puts "got data chunk #{d}"
-          on_chunk d
-        end
-        
-        @stream.on(:altsvc) do |f|
-          puts "received ALTSVC #{f}"
-        end
-        
-        @stream.on(:half_close) do
-          puts "", @head.map {|k,v| "> #{k}: #{v}"}.join("\r\n") if verbose
-        end
-        
-        @stream.headers(@head, end_stream: true)
-      end
-      
-      def read
-        return false if @done || @sock.closed?
-        begin
-          @rcv = @sock.readpartial 1024
-          @client << @rcv
-        rescue EOFError => e
-          if @rcv && @rcv[0..5]=="HTTP/1"
-            on_error @rcv.match(/^HTTP\/1.*/)[0].chomp, e
-          else
-            on_error "Server closed connection...", e
-          end
-          @sock.close
-        rescue => e
-          on_error "#{e.class}: #{e.to_s}", e
-          @sock.close
-        end
-        return false if @done || @sock.closed?
-      end
-      
-    end
-    
-    attr_accessor :timeout
-    def initialize(subscr, opt={})
-      super
-      @last_modified, @etag, @timeout = opt[:last_modified], opt[:etag], opt[:timeout].to_i || 10
-      @connect_timeout = opt[:connect_timeout]
-      @subscriber=subscr
-      @url=subscr.url
-      @concurrency=opt[:concurrency] || opt[:clients] || 1
-      @gzip=opt[:gzip]
-      @retry_delay=opt[:retry_delay]
-      @nomsg=opt[:nomsg]
-      @bundles={}
-      @body_buf=""
-      @extra_headers = opt[:extra_headers]
-      @verbose=opt[:verbose]
-      @http2=opt[:http2] || opt[:h2]
-      if @timeout
-        @timer = after(@timeout) do 
-          @subscriber.on_failure error(0, "Timeout")
-          @bundles.each do |b, v|
-            close b
-          end
-        end
-      end
-    end
-    
-    def run(was_success = nil)
-      uri = URI.parse(@url)
-      uri.port||= uri.scheme.match(/^(ws|http)$/) ? 80 : 443
-      @cooked=Celluloid::Condition.new
-      @connected = @concurrency
-      @notready = @concurrency
-      @concurrency.times do |i|
-        begin
-          bundle = new_bundle(uri, "pubsub.rb #{self.class.name} #{@use_http2 ? "(http/2)" : ""} ##{i}")
-        rescue SystemCallError => e
-          @subscriber.on_failure error(0, e.to_s)
-          close nil
-          return
-        end
-        
-        @bundles[bundle]=true
-        bundle.send_GET @last_modified, @etag
-        async.listen bundle
-      end
-    end
-    
-    def request_code_ok(code, bundle)
-      if code != 200
-        if code == 304 || code == 408
-          @subscriber.on_failure error(code, "", bundle)
-          @subscriber.finished+=1
-          close bundle
-        elsif @subscriber.on_failure(error(code, "", bundle)) == false
-          @subscriber.finished+=1
-          close bundle
-        else
-          binding.pry
-          Celluloid.sleep @retry_delay if @retry_delay
-          bundle.send_GET
-        end
-        false
-      else
-        @timer.reset if @timer
-        true
-      end
-    end
-    
-    def new_bundle(uri, useragent, accept="*/*", extra_headers={})
-      if @extra_headers
-        extra_headers = extra_headers.merge @extra_headers
-      end
-      if @gzip
-        extra_headers = extra_headers.merge({ "Accept-Encoding" => "gzip, deflate"})
-      end
-      b=(@http2 ? HTTP2Bundle : HTTPBundle).new(uri, useragent, accept, extra_headers)
-      b.on_error do |msg, err|
-        handle_bundle_error b, msg, err
-      end
-      b.verbose=@verbose
-      setup_bundle b
-      b
-    end
-    
-    def setup_bundle(b)
-      b.buffer_body!
-      b.on_response do |code, headers, body|
-        @subscriber.waiting-=1
-        # Headers and body is all parsed
-        b.last_modified = headers["Last-Modified"]
-        b.etag = headers["Etag"]
-        b.request_time = Time.now.to_f - b.time_requested
-        if request_code_ok(code, b)
-          on_message_ret=nil
-          Message.each_multipart_message(headers["Content-Type"], body) do |content_type, msg_body, multi|
-            unless @nomsg
-              msg=Message.new msg_body.dup
-              msg.content_type=content_type
-              unless multi
-                msg.last_modified= headers["Last-Modified"]
-                msg.etag= headers["Etag"]
-              end
-            else
-              msg=msg_body.dup
-            end
-            
-            on_message_ret= @subscriber.on_message(msg, b)
-          end
-          
-          unless on_message_ret == false
-            @subscriber.waiting+=1
-            b.send_GET
-          else
-            @subscriber.finished+=1
-            close b
-          end
-        end
-      end
-      
-      b.on_error do |msg, err|
-        handle_bundle_error b, msg, err
-      end
-    end
-    
-    def listen(bundle)
-      loop do
-        begin
-          return false if bundle.read == false
-        rescue EOFError
-          @subscriber.on_failure error(0, "Server Closed Connection"), bundle
-          close bundle
-          return false
-        end
-      end
-    end
-    
-    def close(bundle)
-      if bundle
-        bundle.done=true
-        bundle.sock.close unless bundle.sock.closed?
-        @bundles.delete bundle
-      end
-      @connected -= 1
-      if @connected <= 0
-        @cooked.signal true
-      end
-    end
-    
-  end
-  
-  class IntervalPollClient < LongPollClient
-    def self.aliases
-      [:intervalpoll, :http, :interval, :poll]
-    end
-    
-    def request_code_ok(code, bundle)
-      if code == 304
-        if @subscriber.on_failure(error(code, "", bundle), true) == false
-          @subscriber.finished+=1
-          close bundle
-        else
-          Celluloid.sleep(@retry_delay || 1)
-          bundle.send_GET
-          false
-        end
-      else
-        super
-      end
-    end
-  end
-  
-  class EventSourceClient < LongPollClient
-    include Celluloid::IO
-    
-    def self.aliases
-      [:eventsource, :sse]
-    end
-    
-    def error(c,m,cn=nil)
-      @error_what ||= [ "#{@http2 ? 'HTTP/2' : 'HTTP'} Request failed", "connection closed" ]
-      @error_failword ||= ""
-      super
-    end
-    
-    class EventSourceParser
-      attr_accessor :buf, :on_headers, :connected
-      def initialize
-        @buf={data: "", id: "", comments: ""}
-        buf_reset
-      end
-      
-      def buf_reset
-        @buf[:data].clear
-        @buf[:id].clear
-        @buf[:comments].clear
-        @buf[:retry_timeout] = nil
-        @buf[:event] = nil
-      end
-      
-      def buf_empty?
-        @buf[:comments].length == 0 && @buf[:data].length == 0
-      end
-      
-      def parse_line(line)
-        ret = nil
-        case line
-        when /^: ?(.*)/
-          @buf[:comments] << "#{$1}\n"
-        when /^data(: (.*))?/
-          @buf[:data] << "#{$2}\n" or "\n"
-        when /^id(: (.*))?/
-          @buf[:id] = $2 or ""
-        when /^event(: (.*))?/
-          @buf[:event] = $2 or ""
-        when /^retry: (.*)/
-          @buf[:retry_timeout] = $1
-        when /^$/
-          ret = parse_event
-        end
-        ret
-      end
-      
-      def parse_event
-        
-        if @buf[:comments].length > 0
-          @on_event.call :comment, @buf[:comments].chomp!
-        elsif @buf[:data].length > 0 || @buf[:id].length > 0 || !@buf[:event].nil?
-          @on_event.call @buf[:event] || :message, @buf[:data].chomp!, @buf[:id]
-        end
-        buf_reset
-      end
-      
-      def on_event(&block)
-        @on_event=block
-      end
-      
-    end
-    
-    def new_bundle(uri, useragent=nil)
-      super uri, useragent, "text/event-stream"
-    end
-    
-    def setup_bundle(b)
-      b.on_headers do |code, headers|
-        if code != 200
-          @subscriber.on_failure error(code, "")
-          close b
-          b.on_response do |code, headers, body|
-            @subscriber.finished+=1
-            close b
-          end
-        else
-          @notready-=1
-          @cooked_ready.signal true if @notready == 0
-          b.connected = true
-        end
-      end
-      b.buffer_body!
-      b.subparser=EventSourceParser.new
-      b.on_chunk do |chunk|
-        while b.body_buf.slice! /^.*\n/ do
-          b.subparser.parse_line $~[0]
-        end
-      end
-      b.on_error do |msg, err|
-        if EOFError === err && !b.subparser.buf_empty?
-          b.subparser.parse_line "\n"
-        end
-        handle_bundle_error b, msg, err
-      end
-      
-      b.on_response do |code, headers, body|
-        if !b.subparser.buf_empty?
-          b.subparser.parse_line "\n"
-        else
-          @subscriber.on_failure error(0, "Response completed unexpectedly", b)
-        end
-        @subscriber.finished+=1
-        close b
-      end
-      
-      b.subparser.on_event do |evt, data, evt_id|
-        case evt 
-        when :message
-          @timer.reset if @timer
-          unless @nomsg
-            msg=Message.new data.dup
-            msg.id=evt_id
-          else
-            msg=data
-          end
-          
-          if @subscriber.on_message(msg, b) == false
-            @subscriber.finished+=1
-            close b
-          end
-        when :comment
-          if data.match(/^(?<code>\d+): (?<message>.*)/)
-            @subscriber.on_failure error($~[:code].to_i, $~[:message], b)
-            @subscriber.finished+=1
-            close b
-          end
-        end
-      end
-      b
-    end
-    
-  end
-  
-  class MultiparMixedClient < LongPollClient
-    include Celluloid::IO
-    
-    def self.aliases 
-      [:multipart, :multipartmixed, :mixed]
-    end
-    
-    class MultipartMixedParser
-      attr_accessor :bound, :finished, :buf
-      def initialize(multipart_header)
-        matches=/^multipart\/mixed; boundary=(?<boundary>.*)/.match multipart_header
-        raise "malformed Content-Type multipart/mixed header" unless matches[:boundary]
-        @bound = matches[:boundary]
-        @buf = ""
-        @preambled = false
-        @headered = nil
-        @headers = {}
-        @ninished = nil
-      end
-      
-      def on_part(&block)
-        @on_part = block
-      end
-      def on_finish(&block)
-        @on_finish = block
-      end
-      
-      def <<(chunk)
-        @buf << chunk
-        #puts @buf
-        repeat = true
-        while repeat do
-          if !@preambled && @buf.slice!(/^--#{Regexp.escape @bound}/)
-            @finished = nil
-            @preambled = true
-            @headered = nil
-          end
-          if @preambled && @buf.slice!(/^(\r\n(.*?))?\r\n\r\n/m)
-            @headered = true
-            ($~[2]).each_line do |l|
-              if l.match(/(?<name>[^:]+):\s(?<val>[^\r\n]*)/)
-                @headers[$~[:name]]=$~[:val]
-              end
-            end
-          else
-            repeat = false
-          end
-          
-          if @headered && @buf.slice!(/^(.*?)\r\n--#{Regexp.escape @bound}/m)
-            @on_part.call @headers, $~[1]
-            @headered = nil
-            @headers.clear
-            repeat = true
-          else
-            repeat = false
-          end
-          
-          if (@preambled && !@headered && @buf.slice!(/^--\r\n/)) ||
-            (!@preambled && @buf.slice!(/^--#{Regexp.escape @bound}--\r\n/))
-            @on_finish.call
-            repeat = false
-          end
-        end
-      end
-      
-    end
-    
-    def new_bundle(uri, useragent=nil)
-      super uri, useragent, "multipart/mixed"
-    end
-    
-    def setup_bundle b
-      super
-      b.on_headers do |code, headers|
-        if code != 200
-          @subscriber.on_failure error(code, "", b)
-          close b
-        else
-          b.connected = true
-          @notready -= 1
-          @cooked_ready.signal true if @notready == 0
-          b.subparser = MultipartMixedParser.new headers["Content-Type"]
-          b.subparser.on_part do |headers, message|
-            unless @nomsg
-              @timer.reset if @timer
-              msg=Message.new message.dup, headers["Last-Modified"], headers["Etag"]
-              msg.content_type=headers["Content-Type"]
-            else
-              msg=message
-            end
-            
-            if @subscriber.on_message(msg, b) == false
-              @subscriber.finished+=1
-              close b
-            end
-          end
-          
-          b.subparser.on_finish do
-            b.subparser.finished = true
-          end
-        end
-      end
-      
-      b.on_chunk do |chunk|
-        b.subparser << chunk if b.subparser
-        if HTTPBundle === b && b.subparser.finished
-          @subscriber.on_failure error(410, "Server Closed Connection", b)
-          @subscriber.finished+=1
-          close b
-        end
-      end
-      
-      b.on_response do |code, headers, body|
-        if b.subparser.finished
-          @subscriber.on_failure error(410, "Server Closed Connection", b)
-        else
-          @subscriber.on_failure error(0, "Response completed unexpectedly", b)
-        end
-        @subscriber.finished+=1
-        close b
-      end
-    end
-  end
-  
-  class HTTPChunkedClient < LongPollClient
-    include Celluloid::IO
-    
-    def provides_msgid?
-      false
-    end
-    
-    def run(*args)
-      if @http2
-        @subscriber.on_failure error(0, "Chunked transfer is not allowed in HTTP/2")
-        @connected = 0
-        return
-      end
-      super
-    end
-    
-    def self.aliases
-      [:chunked]
-    end
-    
-    def new_bundle(uri, user_agent)
-      super uri, user_agent, "*/*", {"TE": "Chunked"}
-    end
-    
-    def setup_bundle(b)
-      super
-      b.body_buf = nil
-      b.on_headers do |code, headers|
-        if code != 200
-          @subscriber.on_failure(error(code, "", b))
-          close b
-        elsif headers["Transfer-Encoding"] != "chunked"
-          @subscriber.on_failure error(0, "Transfer-Encoding should be 'chunked', was '#{headers["Transfer-Encoding"]}'.", b)
-          close b
-        else
-          @notready -= 1
-          @cooked_ready.signal true if @notready == 0
-          b.connected= true
-        end
-      end
-      
-      b.stop_after_headers = true
-      @inchunk = false
-      @chunksize = 0
-      @repeat = true
-      @chunkbuf = ""
-      b.on_chunk do |chunk|
-        #puts "yeah"
-        @chunkbuf << chunk
-        @repeat = true
-        while @repeat
-          @repeat = false
-          if !@inchunk && @chunkbuf.slice!(/^([a-fA-F0-9]+)\r\n/m)
-            @chunksize = $~[1].to_i(16)
-            @inchunk = true
-          end
-          
-          if @inchunk
-            if @chunkbuf.length >= @chunksize + 2
-              msgbody = @chunkbuf.slice!(0...@chunksize)
-              @chunkbuf.slice!(/^\r\n/m)
-              @timer.reset if @timer
-              unless @nomsg
-                msg=Message.new msgbody, nil, nil
-              else
-                msg=msgbody
-              end
-              if @subscriber.on_message(msg, b) == false
-                @subscriber.finished+=1
-                close b
-              end
-              @repeat = true if @chunkbuf.length > 0
-              @inchunk = false
-              @chunksize = 0
-            end
-          end
-        end
-      end
-      
-      b.on_response do |code, headers, body|
-        @subscriber.on_failure error(410, "Server Closed Connection", b)
-        close b
-      end
-      
-      b
-    end
-    
-  end
-
-  attr_accessor :url, :client, :messages, :max_round_trips, :quit_message, :errors, :concurrency, :waiting, :finished, :client_class
-  def initialize(url, concurrency=1, opt={})
-    @care_about_message_ids=opt[:use_message_id].nil? ? true : opt[:use_message_id]
-    @url=url
-    @quit_message = opt[:quit_message]
-    opt[:timeout] ||= 30
-    opt[:connect_timeout] ||= 5
-    #puts "Starting subscriber on #{url}"
-    @Client_Class = Client.lookup(opt[:client] || :longpoll)
-    if @Client_Class.nil?
-      raise "unknown client type #{opt[:client]}"
-    end
-    
-    if !opt[:nostore] && opt[:nomsg]
-      opt[:nomsg] = nil
-      puts "nomsg reverted to false because nostore is false"
-    end
-    opt[:concurrency]=concurrency
-    @concurrency = opt[:concurrency]
-    @opt=opt
-    new_client
-    reset
-  end
-  def new_client
-    @client=@Client_Class.new self, @opt
-  end
-  def reset
-    @errors=[]
-    unless @nostore
-      @messages=MessageStore.new :noid => !(client.provides_msgid? && @care_about_message_ids)
-      @messages.name="sub"
-    end
-    @waiting=0
-    @finished=0
-    new_client if terminated?
-    self
-  end
-  def abort
-    @client.terminate
-  end
-  def errors?
-    not no_errors?
-  end
-  def no_errors?
-    @errors.empty?
-  end
-  def match_errors(regex)
-    @errors.each do |err|
-      return false unless err =~ regex
-    end
-    true
-  end
-  
- 
-  def run
-    begin
-      client.current_actor
-    rescue Celluloid::DeadActorError
-      return false
-    end
-    @client.async.run
-    self
-  end
-  def terminate
-    begin
-      @client.terminate
-    rescue Celluloid::DeadActorError
-      return false
-    end
-    true
-  end
-  def terminated?
-    begin
-      client.current_actor unless client == nil
-    rescue Celluloid::DeadActorError
-      return true
-    end
-    false
-  end
-  def wait(until_what=nil)
-    @client.poke until_what
-  end
-
-  def on_message(msg=nil, req=nil, &block)
-    #puts "received message #{msg && msg.to_s[0..15]}"
-    if block_given?
-      @on_message=block
-    else
-      @messages << msg if @messages
-      if @quit_message == msg.to_s
-        @on_message.call(msg, req) if @on_message
-        return false 
-      end
-      @on_message.call(msg, req) if @on_message
-    end
-  end
-  
-  def make_error(client, what, code, msg, failword=" failed")
-    "#{client.class.name.split('::').last} #{what}#{failword}: #{msg} (code #{code})"
-  end
-  
-  def on_failure(err=nil, nostore=false, &block)
-    if block_given?
-      @on_failure=block
-    else
-      @errors << err.to_s unless nostore
-      @on_failure.call(err.to_s, err.bundle) if @on_failure.respond_to? :call
-    end
-  end
-end
-
-class Publisher
-  #include Celluloid
-  attr_accessor :messages, :response, :response_code, :response_body, :nofail, :accept, :url, :extra_headers, :verbose
-  def initialize(url, opt={})
-    @url= url
-    unless opt[:nostore]
-      @messages = MessageStore.new :noid => true
-      @messages.name = "pub"
-    end
-    @timeout = opt[:timeout]
-    @accept = opt[:accept]
-    @verbose = opt[:verbose]
-    @on_response = opt[:on_response]
-  end
-  
-  def with_url(alt_url)
-    prev_url=@url
-    @url=alt_url
-    if block_given?
-      yield
-      @url=prev_url
-    else
-      self
-    end
-  end
-  
-  def on_response(&block)
-    @on_response = block if block_given?
-    @on_response
-  end
-  
-  def on_complete(&block)
-    raise ArgumentError, "block must be given" unless block
-    @on_complete = block
-  end
-  
-  def submit(body, method=:POST, content_type= :'text/plain', &block)
-    self.response=nil
-    self.response_code=nil
-    self.response_body=nil
-
-    if Enumerable===body
-      i=0
-      body.each{|b| i+=1; submit(b, method, content_type, &block)}
-      return i
-    end
-    headers = {:'Content-Type' => content_type, :'Accept' => accept}
-    headers.merge! @extra_headers if @extra_headers
-    post = Typhoeus::Request.new(
-      @url,
-      headers: headers,
-      method: method,
-      body: body,
-      timeout: @timeout || PUBLISH_TIMEOUT,
-      connecttimeout: @timeout || PUBLISH_TIMEOUT,
-      verbose: @verbose
-    )
-    if @messages
-      msg=Message.new body
-      msg.content_type=content_type
-    end
-    if @on_complete
-      post.on_complete @on_complete
-    else
-      post.on_complete do |response|
-        self.response=response
-        self.response_code=response.response_code
-        self.response_body=response.response_body
-        if response.success?
-          #puts "published message #{msg.to_s[0..15]}"
-          @messages << msg if @messages
-        elsif response.timed_out?
-          # aw hell no
-          #puts "publisher err: timeout"
-          
-          pub_url=URI.parse(response.request.url)
-          pub_url = "#{pub_url.path}#{pub_url.query ? "?#{pub_url.query}" : nil}"
-          raise "Publisher #{response.request.options[:method]} to #{pub_url} timed out."
-        elsif response.code == 0
-          # Could not get an http response, something's wrong.
-          #puts "publisher err: #{response.return_message}"
-          errmsg="No HTTP response: #{response.return_message}"
-          unless self.nofail then
-            raise errmsg
-          end
-        else
-          # Received a non-successful http response.
-          #puts "publisher err: #{response.code.to_s}"
-          errmsg="HTTP request failed: #{response.code.to_s}"
-          unless self.nofail then
-            raise errmsg
-          end
-        end
-        block.call(self.response_code, self.response_body) if block
-        on_response.call(self.response_code, self.response_body) if on_response
-      end
-    end
-    #puts "publishing to #{@url}"
-    begin
-      post.run
-    rescue Exception => e
-      last=nil, i=0
-      e.backtrace.select! do |bt|
-        if bt.match(/(gems\/(typhoeus|ethon)|pubsub\.rb)/)
-          last=i
-          false
-        else
-          i+=1
-          true
-        end 
-      end
-      e.backtrace.insert last, "..."
-      raise e
-    end
-  end
-  
-  def get(accept_header=nil)
-    self.accept=accept_header
-    submit nil, :GET
-    self.accept=nil
-  end
-  def delete
-    submit nil, :DELETE
-  end
-  def post(body, content_type=nil, &block)
-    submit body, :POST, content_type, &block
-  end
-  def put(body, content_type=nil, &block)
-    submit body, :PUT, content_type, &block
-  end
-
-  
-end
diff --git a/debian/modules/nchan/dev/rebuild.sh b/debian/modules/nchan/dev/rebuild.sh
deleted file mode 100755
index 54d7db3..0000000
--- a/debian/modules/nchan/dev/rebuild.sh
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/bin/zsh
-#assumes PKGBUILDy nginx located at ./nginx-nchan
-MY_PATH="`dirname \"$0\"`"
-MY_PATH="`( cd \"$MY_PATH\" && pwd )`"
-
-_clang="ccache clang -Qunused-arguments -fcolor-diagnostics"
-
-#clang_memcheck="-fsanitize=address,undefined -fno-omit-frame-pointer"
-clang_sanitize_memory="-use-gold-plugins -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -fsanitize-blacklist=bl.txt"
-clang_sanitize_addres="-fsanitize=address,undefined -fno-omit-frame-pointer"
-
-optimize_level=0;
-
-export CONFIGURE_WITH_DEBUG=0
-
-for opt in $*; do
-  case $opt in
-    clang)
-      export CC=$_clang;;
-    clang-sanitize|sanitize|sanitize-memory)
-      export CC="CMAKE_LD=llvm-link $_clang -Xclang -cc1 $clang_sanitize_memory "
-      export CLINKER=$clang
-      ;;
-    sanitize-address)
-      export CC="$_clang $clang_sanitize_addres";;
-    gcc5)
-      export CC=gcc-5;;
-    gcc4|gcc47|gcc4.7)
-      export CC=gcc-4.7;;
-    nopool|no-pool|nop) 
-      export NO_POOL=1;;
-    debug-pool|debugpool) 
-      export NGX_DEBUG_POOL=1;;
-    dynamic)
-      export DYNAMIC=1;;
-    re|remake)
-      export REMAKE="-B"
-      export CONTINUE=1;;
-    c|continue|cont)
-      export CONTINUE=1;;
-    noextract)
-      export NO_EXTRACT_SOURCE=1;;
-    nomake)
-      export NO_MAKE=1;;
-    nodebug)
-      export NO_DEBUG=1;;
-    O0)
-      optimize_level=0;;
-    O1)
-      optimize_level=1;;
-    O2)
-      optimize_level=2;;
-    O3)
-      optimize_level=3;;
-    mudflap)
-      export MUDFLAP=1
-      export CC=gcc
-      ;;
-    stable|stableversion)
-      export NGINX_STABLEVERSION=1;;
-    legacyversion|legacy)
-      export NGINX_LEGACYVERSION=1;;
-    oldversion|old)
-      export NGINX_OLDVERSION=1;;
-    veryoldversion|veryold)
-      export NGINX_VERYOLDVERSION=1;;
-    slabpatch|slab)
-      export NGX_SLAB_PATCH=1;;
-    withdebug)
-      export CONFIGURE_WITH_DEBUG=1;;
-    clang-analyzer|analyzer|scan|analyze)
-      export CC="clang"
-      export CLANG_ANALYZER=$MY_PATH/clang-analyzer
-      mkdir $CLANG_ANALYZER 2>/dev/null
-      ;;
-  esac
-done
-
-export NO_WITH_DEBUG=$NO_WITH_DEBUG;
-
-_build_nginx() {
-
-  if type "makepkg" > /dev/null; then
-    if [[ $CONTINUE == 1 ]] || [[ $NO_EXTRACT_SOURCE == 1 ]]; then
-      makepkg -f -e
-    else
-      makepkg -f
-    fi
-    return 0
-  fi
-
-  export NO_NGINX_USER=1
-  export NO_GCC_COLOR=1
-  export startdir="$(pwd)"
-  export EXPLICIT_CFLAGS=1
-
-  rm "${startdir}/pkg/" -Rf
-  srcdir="${startdir}/src"
-
-  source ./PKGBUILD
-
-  pkgdir="${startdir}/pkg/${pkgname}"
-  mkdir -p "$srcdir" "$pkgdir"
-
-  echo $_nginx_source
-  echo $_no_pool_patch_source
-  
-  wget --no-clobber $_nginx_source
-  wget --no-clobber $_no_pool_patch_source
-
-  if [[ -z $NO_EXTRACT_SOURCE ]]; then
-    pushd src
-    _nginx_src_file="${_nginx_source##*/}"
-    echo $_nginx_src_file
-    tar xf "../${_nginx_src_file}"
-    cp "../${_no_pool_patch_source##*/}" ./
-    if [[ ! -d ngx_debug_pool ]]; then
-      git clone "$_ngx_debug_pool_url"
-    else
-      pushd ngx_debug_pool
-      git pull
-      popd
-    fi
-    popd
-  fi
-
-  build
-
-  pushd "${srcdir}/nginx-${_nginx_ver}"
-  ls -alh
-  make DESTDIR="$pkgdir/" install
-  popd
-}
-
-
-export OPTIMIZE_LEVEL=$optimize_level
-
-if [[ -z $NO_MAKE ]]; then
-  
-  ./redocument.rb
-
-  ./gen_config_commands.rb nchan_config_commands.c
-  if ! [ $? -eq 0 ]; then; 
-    echo "failed generating nginx directives"; 
-    exit 1
-  fi
-
-  rdstore_dir=${MY_PATH}/../src/store/redis
-  bundle exec hsss \
-     --format whole \
-     ${rdstore_dir}/scripts/*.lua > ${rdstore_dir}/redis_lua_commands.h
-  if ! [ $? -eq 0 ]; then;
-    echo "failed generating redis lua scripts";
-    exit 1
-  fi  
-  pushd ./nginx-nchan >/dev/null
-  
-  _build_nginx
-  
-  popd >/dev/null
-fi
-if ! [[ -z $CLANG_ANALYZER ]]; then
-  pushd $CLANG_ANALYZER >/dev/null
-  latest_scan=`ls -c |head -n1`
-  echo "run 'scan-view ${CLANG_ANALYZER}/${latest_scan}' for static analysis."
-  scan-view $latest_scan 2>/dev/null
-  popd >/dev/null
-fi
-
-
diff --git a/debian/modules/nchan/dev/redis-trib.rb b/debian/modules/nchan/dev/redis-trib.rb
deleted file mode 100755
index f6c17ad..0000000
--- a/debian/modules/nchan/dev/redis-trib.rb
+++ /dev/null
@@ -1,1696 +0,0 @@
-#!/usr/bin/env ruby
-
-# TODO (temporary here, we'll move this into the Github issues once
-#       redis-trib initial implementation is completed).
-#
-# - Make sure that if the rehashing fails in the middle redis-trib will try
-#   to recover.
-# - When redis-trib performs a cluster check, if it detects a slot move in
-#   progress it should prompt the user to continue the move from where it
-#   stopped.
-# - Gracefully handle Ctrl+C in move_slot to prompt the user if really stop
-#   while rehashing, and performing the best cleanup possible if the user
-#   forces the quit.
-# - When doing "fix" set a global Fix to true, and prompt the user to
-#   fix the problem if automatically fixable every time there is something
-#   to fix. For instance:
-#   1) If there is a node that pretend to receive a slot, or to migrate a
-#      slot, but has no entries in that slot, fix it.
-#   2) If there is a node having keys in slots that are not owned by it
-#      fix this condition moving the entries in the same node.
-#   3) Perform more possibly slow tests about the state of the cluster.
-#   4) When aborted slot migration is detected, fix it.
-
-require 'rubygems'
-require 'redis'
-
-ClusterHashSlots = 16384
-MigrateDefaultTimeout = 60000
-MigrateDefaultPipeline = 10
-RebalanceDefaultThreshold = 2
-
-$verbose = false
-
-def xputs(s)
-    case s[0..2]
-    when ">>>"
-        color="29;1"
-    when "[ER"
-        color="31;1"
-    when "[WA"
-        color="31;1"
-    when "[OK"
-        color="32"
-    when "[FA","***"
-        color="33"
-    else
-        color=nil
-    end
-
-    color = nil if ENV['TERM'] != "xterm"
-    print "\033[#{color}m" if color
-    print s
-    print "\033[0m" if color
-    print "\n"
-end
-
-class ClusterNode
-    def initialize(addr)
-        s = addr.split(":")
-        if s.length < 2
-           puts "Invalid IP or Port (given as #{addr}) - use IP:Port format"
-           exit 1
-        end
-        port = s.pop # removes port from split array
-        ip = s.join(":") # if s.length > 1 here, it's IPv6, so restore address
-        @r = nil
-        @info = {}
-        @info[:host] = ip
-        @info[:port] = port
-        @info[:slots] = {}
-        @info[:migrating] = {}
-        @info[:importing] = {}
-        @info[:replicate] = false
-        @dirty = false # True if we need to flush slots info into node.
-        @friends = []
-    end
-
-    def friends
-        @friends
-    end
-
-    def slots
-        @info[:slots]
-    end
-
-    def has_flag?(flag)
-        @info[:flags].index(flag)
-    end
-
-    def to_s
-        "#{@info[:host]}:#{@info[:port]}"
-    end
-
-    def connect(o={})
-        return if @r
-        print "Connecting to node #{self}: " if $verbose
-        STDOUT.flush
-        begin
-            @r = Redis.new(:host => @info[:host], :port => @info[:port], :timeout => 60)
-            @r.ping
-        rescue
-            xputs "[ERR] Sorry, can't connect to node #{self}"
-            exit 1 if o[:abort]
-            @r = nil
-        end
-        xputs "OK" if $verbose
-    end
-
-    def assert_cluster
-        info = @r.info
-        if !info["cluster_enabled"] || info["cluster_enabled"].to_i == 0
-            xputs "[ERR] Node #{self} is not configured as a cluster node."
-            exit 1
-        end
-    end
-
-    def assert_empty
-        if !(@r.cluster("info").split("\r\n").index("cluster_known_nodes:1")) ||
-            (@r.info['db0'])
-            xputs "[ERR] Node #{self} is not empty. Either the node already knows other nodes (check with CLUSTER NODES) or contains some key in database 0."
-            exit 1
-        end
-    end
-
-    def load_info(o={})
-        self.connect
-        nodes = @r.cluster("nodes").split("\n")
-        nodes.each{|n|
-            # name addr flags role ping_sent ping_recv link_status slots
-            split = n.split
-            name,addr,flags,master_id,ping_sent,ping_recv,config_epoch,link_status = split[0..6]
-            slots = split[8..-1]
-            info = {
-                :name => name,
-                :addr => addr,
-                :flags => flags.split(","),
-                :replicate => master_id,
-                :ping_sent => ping_sent.to_i,
-                :ping_recv => ping_recv.to_i,
-                :link_status => link_status
-            }
-            info[:replicate] = false if master_id == "-"
-
-            if info[:flags].index("myself")
-                @info = @info.merge(info)
-                @info[:slots] = {}
-                slots.each{|s|
-                    if s[0..0] == '['
-                        if s.index("->-") # Migrating
-                            slot,dst = s[1..-1].split("->-")
-                            @info[:migrating][slot.to_i] = dst
-                        elsif s.index("-<-") # Importing
-                            slot,src = s[1..-1].split("-<-")
-                            @info[:importing][slot.to_i] = src
-                        end
-                    elsif s.index("-")
-                        start,stop = s.split("-")
-                        self.add_slots((start.to_i)..(stop.to_i))
-                    else
-                        self.add_slots((s.to_i)..(s.to_i))
-                    end
-                } if slots
-                @dirty = false
-                @r.cluster("info").split("\n").each{|e|
-                    k,v=e.split(":")
-                    k = k.to_sym
-                    v.chop!
-                    if k != :cluster_state
-                        @info[k] = v.to_i
-                    else
-                        @info[k] = v
-                    end
-                }
-            elsif o[:getfriends]
-                @friends << info
-            end
-        }
-    end
-
-    def add_slots(slots)
-        slots.each{|s|
-            @info[:slots][s] = :new
-        }
-        @dirty = true
-    end
-
-    def set_as_replica(node_id)
-        @info[:replicate] = node_id
-        @dirty = true
-    end
-
-    def flush_node_config
-        return if !@dirty
-        if @info[:replicate]
-            begin
-                @r.cluster("replicate",@info[:replicate])
-            rescue
-                # If the cluster did not already joined it is possible that
-                # the slave does not know the master node yet. So on errors
-                # we return ASAP leaving the dirty flag set, to flush the
-                # config later.
-                return
-            end
-        else
-            new = []
-            @info[:slots].each{|s,val|
-                if val == :new
-                    new << s
-                    @info[:slots][s] = true
-                end
-            }
-            @r.cluster("addslots",*new)
-        end
-        @dirty = false
-    end
-
-    def info_string
-        # We want to display the hash slots assigned to this node
-        # as ranges, like in: "1-5,8-9,20-25,30"
-        #
-        # Note: this could be easily written without side effects,
-        # we use 'slots' just to split the computation into steps.
-
-        # First step: we want an increasing array of integers
-        # for instance: [1,2,3,4,5,8,9,20,21,22,23,24,25,30]
-        slots = @info[:slots].keys.sort
-
-        # As we want to aggregate adjacent slots we convert all the
-        # slot integers into ranges (with just one element)
-        # So we have something like [1..1,2..2, ... and so forth.
-        slots.map!{|x| x..x}
-
-        # Finally we group ranges with adjacent elements.
-        slots = slots.reduce([]) {|a,b|
-            if !a.empty? && b.first == (a[-1].last)+1
-                a[0..-2] + [(a[-1].first)..(b.last)]
-            else
-                a + [b]
-            end
-        }
-
-        # Now our task is easy, we just convert ranges with just one
-        # element into a number, and a real range into a start-end format.
-        # Finally we join the array using the comma as separator.
-        slots = slots.map{|x|
-            x.count == 1 ? x.first.to_s : "#{x.first}-#{x.last}"
-        }.join(",")
-
-        role = self.has_flag?("master") ? "M" : "S"
-
-        if self.info[:replicate] and @dirty
-            is = "S: #{self.info[:name]} #{self.to_s}"
-        else
-            is = "#{role}: #{self.info[:name]} #{self.to_s}\n"+
-            "   slots:#{slots} (#{self.slots.length} slots) "+
-            "#{(self.info[:flags]-["myself"]).join(",")}"
-        end
-        if self.info[:replicate]
-            is += "\n   replicates #{info[:replicate]}"
-        elsif self.has_flag?("master") && self.info[:replicas]
-            is += "\n   #{info[:replicas].length} additional replica(s)"
-        end
-        is
-    end
-
-    # Return a single string representing nodes and associated slots.
-    # TODO: remove slaves from config when slaves will be handled
-    # by Redis Cluster.
-    def get_config_signature
-        config = []
-        @r.cluster("nodes").each_line{|l|
-            s = l.split
-            slots = s[8..-1].select {|x| x[0..0] != "["}
-            next if slots.length == 0
-            config << s[0]+":"+(slots.sort.join(","))
-        }
-        config.sort.join("|")
-    end
-
-    def info
-        @info
-    end
-
-    def is_dirty?
-        @dirty
-    end
-
-    def r
-        @r
-    end
-end
-
-class RedisTrib
-    def initialize
-        @nodes = []
-        @fix = false
-        @errors = []
-        @timeout = MigrateDefaultTimeout
-    end
-
-    def check_arity(req_args, num_args)
-        if ((req_args > 0 and num_args != req_args) ||
-           (req_args < 0 and num_args < req_args.abs))
-           xputs "[ERR] Wrong number of arguments for specified sub command"
-           exit 1
-        end
-    end
-
-    def add_node(node)
-        @nodes << node
-    end
-
-    def reset_nodes
-        @nodes = []
-    end
-
-    def cluster_error(msg)
-        @errors << msg
-        xputs msg
-    end
-
-    # Return the node with the specified ID or Nil.
-    def get_node_by_name(name)
-        @nodes.each{|n|
-            return n if n.info[:name] == name.downcase
-        }
-        return nil
-    end
-
-    # Like get_node_by_name but the specified name can be just the first
-    # part of the node ID as long as the prefix in unique across the
-    # cluster.
-    def get_node_by_abbreviated_name(name)
-        l = name.length
-        candidates = []
-        @nodes.each{|n|
-            if n.info[:name][0...l] == name.downcase
-                candidates << n
-            end
-        }
-        return nil if candidates.length != 1
-        candidates[0]
-    end
-
-    # This function returns the master that has the least number of replicas
-    # in the cluster. If there are multiple masters with the same smaller
-    # number of replicas, one at random is returned.
-    def get_master_with_least_replicas
-        masters = @nodes.select{|n| n.has_flag? "master"}
-        sorted = masters.sort{|a,b|
-            a.info[:replicas].length <=> b.info[:replicas].length
-        }
-        sorted[0]
-    end
-
-    def check_cluster(opt={})
-        xputs ">>> Performing Cluster Check (using node #{@nodes[0]})"
-        show_nodes if !opt[:quiet]
-        check_config_consistency
-        check_open_slots
-        check_slots_coverage
-    end
-
-    def show_cluster_info
-        masters = 0
-        keys = 0
-        @nodes.each{|n|
-            if n.has_flag?("master")
-                puts "#{n} (#{n.info[:name][0...8]}...) -> #{n.r.dbsize} keys | #{n.slots.length} slots | "+
-                     "#{n.info[:replicas].length} slaves."
-                masters += 1
-                keys += n.r.dbsize
-            end
-        }
-        xputs "[OK] #{keys} keys in #{masters} masters."
-        keys_per_slot = sprintf("%.2f",keys/16384.0)
-        puts "#{keys_per_slot} keys per slot on average."
-    end
-
-    # Merge slots of every known node. If the resulting slots are equal
-    # to ClusterHashSlots, then all slots are served.
-    def covered_slots
-        slots = {}
-        @nodes.each{|n|
-            slots = slots.merge(n.slots)
-        }
-        slots
-    end
-
-    def check_slots_coverage
-        xputs ">>> Check slots coverage..."
-        slots = covered_slots
-        if slots.length == ClusterHashSlots
-            xputs "[OK] All #{ClusterHashSlots} slots covered."
-        else
-            cluster_error \
-                "[ERR] Not all #{ClusterHashSlots} slots are covered by nodes."
-            fix_slots_coverage if @fix
-        end
-    end
-
-    def check_open_slots
-        xputs ">>> Check for open slots..."
-        open_slots = []
-        @nodes.each{|n|
-            if n.info[:migrating].size > 0
-                cluster_error \
-                    "[WARNING] Node #{n} has slots in migrating state (#{n.info[:migrating].keys.join(",")})."
-                open_slots += n.info[:migrating].keys
-            end
-            if n.info[:importing].size > 0
-                cluster_error \
-                    "[WARNING] Node #{n} has slots in importing state (#{n.info[:importing].keys.join(",")})."
-                open_slots += n.info[:importing].keys
-            end
-        }
-        open_slots.uniq!
-        if open_slots.length > 0
-            xputs "[WARNING] The following slots are open: #{open_slots.join(",")}"
-        end
-        if @fix
-            open_slots.each{|slot| fix_open_slot slot}
-        end
-    end
-
-    def nodes_with_keys_in_slot(slot)
-        nodes = []
-        @nodes.each{|n|
-            next if n.has_flag?("slave")
-            nodes << n if n.r.cluster("getkeysinslot",slot,1).length > 0
-        }
-        nodes
-    end
-
-    def fix_slots_coverage
-        not_covered = (0...ClusterHashSlots).to_a - covered_slots.keys
-        xputs ">>> Fixing slots coverage..."
-        xputs "List of not covered slots: " + not_covered.join(",")
-
-        # For every slot, take action depending on the actual condition:
-        # 1) No node has keys for this slot.
-        # 2) A single node has keys for this slot.
-        # 3) Multiple nodes have keys for this slot.
-        slots = {}
-        not_covered.each{|slot|
-            nodes = nodes_with_keys_in_slot(slot)
-            slots[slot] = nodes
-            xputs "Slot #{slot} has keys in #{nodes.length} nodes: #{nodes.join(", ")}"
-        }
-
-        none = slots.select {|k,v| v.length == 0}
-        single = slots.select {|k,v| v.length == 1}
-        multi = slots.select {|k,v| v.length > 1}
-
-        # Handle case "1": keys in no node.
-        if none.length > 0
-            xputs "The folowing uncovered slots have no keys across the cluster:"
-            xputs none.keys.join(",")
-            yes_or_die "Fix these slots by covering with a random node?"
-            none.each{|slot,nodes|
-                node = @nodes.sample
-                xputs ">>> Covering slot #{slot} with #{node}"
-                node.r.cluster("addslots",slot)
-            }
-        end
-
-        # Handle case "2": keys only in one node.
-        if single.length > 0
-            xputs "The folowing uncovered slots have keys in just one node:"
-            puts single.keys.join(",")
-            yes_or_die "Fix these slots by covering with those nodes?"
-            single.each{|slot,nodes|
-                xputs ">>> Covering slot #{slot} with #{nodes[0]}"
-                nodes[0].r.cluster("addslots",slot)
-            }
-        end
-
-        # Handle case "3": keys in multiple nodes.
-        if multi.length > 0
-            xputs "The folowing uncovered slots have keys in multiple nodes:"
-            xputs multi.keys.join(",")
-            yes_or_die "Fix these slots by moving keys into a single node?"
-            multi.each{|slot,nodes|
-                target = get_node_with_most_keys_in_slot(nodes,slot)
-                xputs ">>> Covering slot #{slot} moving keys to #{target}"
-
-                target.r.cluster('addslots',slot)
-                target.r.cluster('setslot',slot,'stable')
-                nodes.each{|src|
-                    next if src == target
-                    # Set the source node in 'importing' state (even if we will
-                    # actually migrate keys away) in order to avoid receiving
-                    # redirections for MIGRATE.
-                    src.r.cluster('setslot',slot,'importing',target.info[:name])
-                    move_slot(src,target,slot,:dots=>true,:fix=>true,:cold=>true)
-                    src.r.cluster('setslot',slot,'stable')
-                }
-            }
-        end
-    end
-
-    # Return the owner of the specified slot
-    def get_slot_owners(slot)
-        owners = []
-        @nodes.each{|n|
-            next if n.has_flag?("slave")
-            n.slots.each{|s,_|
-                owners << n if s == slot
-            }
-        }
-        owners
-    end
-
-    # Return the node, among 'nodes' with the greatest number of keys
-    # in the specified slot.
-    def get_node_with_most_keys_in_slot(nodes,slot)
-        best = nil
-        best_numkeys = 0
-        @nodes.each{|n|
-            next if n.has_flag?("slave")
-            numkeys = n.r.cluster("countkeysinslot",slot)
-            if numkeys > best_numkeys || best == nil
-                best = n
-                best_numkeys = numkeys
-            end
-        }
-        return best
-    end
-
-    # Slot 'slot' was found to be in importing or migrating state in one or
-    # more nodes. This function fixes this condition by migrating keys where
-    # it seems more sensible.
-    def fix_open_slot(slot)
-        puts ">>> Fixing open slot #{slot}"
-
-        # Try to obtain the current slot owner, according to the current
-        # nodes configuration.
-        owners = get_slot_owners(slot)
-        owner = owners[0] if owners.length == 1
-
-        migrating = []
-        importing = []
-        @nodes.each{|n|
-            next if n.has_flag? "slave"
-            if n.info[:migrating][slot]
-                migrating << n
-            elsif n.info[:importing][slot]
-                importing << n
-            elsif n.r.cluster("countkeysinslot",slot) > 0 && n != owner
-                xputs "*** Found keys about slot #{slot} in node #{n}!"
-                importing << n
-            end
-        }
-        puts "Set as migrating in: #{migrating.join(",")}"
-        puts "Set as importing in: #{importing.join(",")}"
-
-        # If there is no slot owner, set as owner the slot with the biggest
-        # number of keys, among the set of migrating / importing nodes.
-        if !owner
-            xputs ">>> Nobody claims ownership, selecting an owner..."
-            owner = get_node_with_most_keys_in_slot(@nodes,slot)
-
-            # If we still don't have an owner, we can't fix it.
-            if !owner
-                xputs "[ERR] Can't select a slot owner. Impossible to fix."
-                exit 1
-            end
-
-            # Use ADDSLOTS to assign the slot.
-            puts "*** Configuring #{owner} as the slot owner"
-            owner.r.cluster("setslot",slot,"stable")
-            owner.r.cluster("addslots",slot)
-            # Make sure this information will propagate. Not strictly needed
-            # since there is no past owner, so all the other nodes will accept
-            # whatever epoch this node will claim the slot with.
-            owner.r.cluster("bumpepoch")
-
-            # Remove the owner from the list of migrating/importing
-            # nodes.
-            migrating.delete(owner)
-            importing.delete(owner)
-        end
-
-        # If there are multiple owners of the slot, we need to fix it
-        # so that a single node is the owner and all the other nodes
-        # are in importing state. Later the fix can be handled by one
-        # of the base cases above.
-        #
-        # Note that this case also covers multiple nodes having the slot
-        # in migrating state, since migrating is a valid state only for
-        # slot owners.
-        if owners.length > 1
-            owner = get_node_with_most_keys_in_slot(owners,slot)
-            owners.each{|n|
-                next if n == owner
-                n.r.cluster('delslots',slot)
-                n.r.cluster('setslot',slot,'importing',owner.info[:name])
-                importing.delete(n) # Avoid duplciates
-                importing << n
-            }
-            owner.r.cluster('bumpepoch')
-        end
-
-        # Case 1: The slot is in migrating state in one slot, and in
-        #         importing state in 1 slot. That's trivial to address.
-        if migrating.length == 1 && importing.length == 1
-            move_slot(migrating[0],importing[0],slot,:dots=>true,:fix=>true)
-        # Case 2: There are multiple nodes that claim the slot as importing,
-        # they probably got keys about the slot after a restart so opened
-        # the slot. In this case we just move all the keys to the owner
-        # according to the configuration.
-        elsif migrating.length == 0 && importing.length > 0
-            xputs ">>> Moving all the #{slot} slot keys to its owner #{owner}"
-            importing.each {|node|
-                next if node == owner
-                move_slot(node,owner,slot,:dots=>true,:fix=>true,:cold=>true)
-                xputs ">>> Setting #{slot} as STABLE in #{node}"
-                node.r.cluster("setslot",slot,"stable")
-            }
-        # Case 3: There are no slots claiming to be in importing state, but
-        # there is a migrating node that actually don't have any key. We
-        # can just close the slot, probably a reshard interrupted in the middle.
-        elsif importing.length == 0 && migrating.length == 1 &&
-              migrating[0].r.cluster("getkeysinslot",slot,10).length == 0
-            migrating[0].r.cluster("setslot",slot,"stable")
-        else
-            xputs "[ERR] Sorry, Redis-trib can't fix this slot yet (work in progress). Slot is set as migrating in #{migrating.join(",")}, as importing in #{importing.join(",")}, owner is #{owner}"
-        end
-    end
-
-    # Check if all the nodes agree about the cluster configuration
-    def check_config_consistency
-        if !is_config_consistent?
-            cluster_error "[ERR] Nodes don't agree about configuration!"
-        else
-            xputs "[OK] All nodes agree about slots configuration."
-        end
-    end
-
-    def is_config_consistent?
-        signatures=[]
-        @nodes.each{|n|
-            signatures << n.get_config_signature
-        }
-        return signatures.uniq.length == 1
-    end
-
-    def wait_cluster_join
-        print "Waiting for the cluster to join"
-        while !is_config_consistent?
-            print "."
-            STDOUT.flush
-            sleep 1
-        end
-        print "\n"
-    end
-
-    def alloc_slots
-        nodes_count = @nodes.length
-        masters_count = @nodes.length / (@replicas+1)
-        masters = []
-
-        # The first step is to split instances by IP. This is useful as
-        # we'll try to allocate master nodes in different physical machines
-        # (as much as possible) and to allocate slaves of a given master in
-        # different physical machines as well.
-        #
-        # This code assumes just that if the IP is different, than it is more
-        # likely that the instance is running in a different physical host
-        # or at least a different virtual machine.
-        ips = {}
-        @nodes.each{|n|
-            ips[n.info[:host]] = [] if !ips[n.info[:host]]
-            ips[n.info[:host]] << n
-        }
-
-        # Select master instances
-        puts "Using #{masters_count} masters:"
-        interleaved = []
-        stop = false
-        while not stop do
-            # Take one node from each IP until we run out of nodes
-            # across every IP.
-            ips.each do |ip,nodes|
-                if nodes.empty?
-                    # if this IP has no remaining nodes, check for termination
-                    if interleaved.length == nodes_count
-                        # stop when 'interleaved' has accumulated all nodes
-                        stop = true
-                        next
-                    end
-                else
-                    # else, move one node from this IP to 'interleaved'
-                    interleaved.push nodes.shift
-                end
-            end
-        end
-
-        masters = interleaved.slice!(0, masters_count)
-        nodes_count -= masters.length
-
-        masters.each{|m| puts m}
-
-        # Alloc slots on masters
-        slots_per_node = ClusterHashSlots.to_f / masters_count
-        first = 0
-        cursor = 0.0
-        masters.each_with_index{|n,masternum|
-            last = (cursor+slots_per_node-1).round
-            if last > ClusterHashSlots || masternum == masters.length-1
-                last = ClusterHashSlots-1
-            end
-            last = first if last < first # Min step is 1.
-            n.add_slots first..last
-            first = last+1
-            cursor += slots_per_node
-        }
-
-        # Select N replicas for every master.
-        # We try to split the replicas among all the IPs with spare nodes
-        # trying to avoid the host where the master is running, if possible.
-        #
-        # Note we loop two times.  The first loop assigns the requested
-        # number of replicas to each master.  The second loop assigns any
-        # remaining instances as extra replicas to masters.  Some masters
-        # may end up with more than their requested number of replicas, but
-        # all nodes will be used.
-        assignment_verbose = false
-
-        [:requested,:unused].each do |assign|
-            masters.each do |m|
-                assigned_replicas = 0
-                while assigned_replicas < @replicas
-                    break if nodes_count == 0
-                    if assignment_verbose
-                        if assign == :requested
-                            puts "Requesting total of #{@replicas} replicas " \
-                                 "(#{assigned_replicas} replicas assigned " \
-                                 "so far with #{nodes_count} total remaining)."
-                        elsif assign == :unused
-                            puts "Assigning extra instance to replication " \
-                                 "role too (#{nodes_count} remaining)."
-                        end
-                    end
-
-                    # Return the first node not matching our current master
-                    node = interleaved.find{|n| n.info[:host] != m.info[:host]}
-
-                    # If we found a node, use it as a best-first match.
-                    # Otherwise, we didn't find a node on a different IP, so we
-                    # go ahead and use a same-IP replica.
-                    if node
-                        slave = node
-                        interleaved.delete node
-                    else
-                        slave = interleaved.shift
-                    end
-                    slave.set_as_replica(m.info[:name])
-                    nodes_count -= 1
-                    assigned_replicas += 1
-                    puts "Adding replica #{slave} to #{m}"
-
-                    # If we are in the "assign extra nodes" loop,
-                    # we want to assign one extra replica to each
-                    # master before repeating masters.
-                    # This break lets us assign extra replicas to masters
-                    # in a round-robin way.
-                    break if assign == :unused
-                end
-            end
-        end
-    end
-
-    def flush_nodes_config
-        @nodes.each{|n|
-            n.flush_node_config
-        }
-    end
-
-    def show_nodes
-        @nodes.each{|n|
-            xputs n.info_string
-        }
-    end
-
-    # Redis Cluster config epoch collision resolution code is able to eventually
-    # set a different epoch to each node after a new cluster is created, but
-    # it is slow compared to assign a progressive config epoch to each node
-    # before joining the cluster. However we do just a best-effort try here
-    # since if we fail is not a problem.
-    def assign_config_epoch
-        config_epoch = 1
-        @nodes.each{|n|
-            begin
-                n.r.cluster("set-config-epoch",config_epoch)
-            rescue
-            end
-            config_epoch += 1
-        }
-    end
-
-    def join_cluster
-        # We use a brute force approach to make sure the node will meet
-        # each other, that is, sending CLUSTER MEET messages to all the nodes
-        # about the very same node.
-        # Thanks to gossip this information should propagate across all the
-        # cluster in a matter of seconds.
-        first = false
-        @nodes.each{|n|
-            if !first then first = n.info; next; end # Skip the first node
-            n.r.cluster("meet",first[:host],first[:port])
-        }
-    end
-
-    def yes_or_die(msg)
-        print "#{msg} (type 'yes' to accept): "
-        STDOUT.flush
-        if !(STDIN.gets.chomp.downcase == "yes")
-            xputs "*** Aborting..."
-            exit 1
-        end
-    end
-
-    def load_cluster_info_from_node(nodeaddr)
-        node = ClusterNode.new(nodeaddr)
-        node.connect(:abort => true)
-        node.assert_cluster
-        node.load_info(:getfriends => true)
-        add_node(node)
-        node.friends.each{|f|
-            next if f[:flags].index("noaddr") ||
-                    f[:flags].index("disconnected") ||
-                    f[:flags].index("fail")
-            fnode = ClusterNode.new(f[:addr])
-            fnode.connect()
-            next if !fnode.r
-            begin
-                fnode.load_info()
-                add_node(fnode)
-            rescue => e
-                xputs "[ERR] Unable to load info for node #{fnode}"
-            end
-        }
-        populate_nodes_replicas_info
-    end
-
-    # This function is called by load_cluster_info_from_node in order to
-    # add additional information to every node as a list of replicas.
-    def populate_nodes_replicas_info
-        # Start adding the new field to every node.
-        @nodes.each{|n|
-            n.info[:replicas] = []
-        }
-
-        # Populate the replicas field using the replicate field of slave
-        # nodes.
-        @nodes.each{|n|
-            if n.info[:replicate]
-                master = get_node_by_name(n.info[:replicate])
-                if !master
-                    xputs "*** WARNING: #{n} claims to be slave of unknown node ID #{n.info[:replicate]}."
-                else
-                    master.info[:replicas] << n
-                end
-            end
-        }
-    end
-
-    # Given a list of source nodes return a "resharding plan"
-    # with what slots to move in order to move "numslots" slots to another
-    # instance.
-    def compute_reshard_table(sources,numslots)
-        moved = []
-        # Sort from bigger to smaller instance, for two reasons:
-        # 1) If we take less slots than instances it is better to start
-        #    getting from the biggest instances.
-        # 2) We take one slot more from the first instance in the case of not
-        #    perfect divisibility. Like we have 3 nodes and need to get 10
-        #    slots, we take 4 from the first, and 3 from the rest. So the
-        #    biggest is always the first.
-        sources = sources.sort{|a,b| b.slots.length <=> a.slots.length}
-        source_tot_slots = sources.inject(0) {|sum,source|
-            sum+source.slots.length
-        }
-        sources.each_with_index{|s,i|
-            # Every node will provide a number of slots proportional to the
-            # slots it has assigned.
-            n = (numslots.to_f/source_tot_slots*s.slots.length)
-            if i == 0
-                n = n.ceil
-            else
-                n = n.floor
-            end
-            s.slots.keys.sort[(0...n)].each{|slot|
-                if moved.length < numslots
-                    moved << {:source => s, :slot => slot}
-                end
-            }
-        }
-        return moved
-    end
-
-    def show_reshard_table(table)
-        table.each{|e|
-            puts "    Moving slot #{e[:slot]} from #{e[:source].info[:name]}"
-        }
-    end
-
-    # Move slots between source and target nodes using MIGRATE.
-    #
-    # Options:
-    # :verbose -- Print a dot for every moved key.
-    # :fix     -- We are moving in the context of a fix. Use REPLACE.
-    # :cold    -- Move keys without opening slots / reconfiguring the nodes.
-    # :update  -- Update nodes.info[:slots] for source/target nodes.
-    # :quiet   -- Don't print info messages.
-    def move_slot(source,target,slot,o={})
-        o = {:pipeline => MigrateDefaultPipeline}.merge(o)
-
-        # We start marking the slot as importing in the destination node,
-        # and the slot as migrating in the target host. Note that the order of
-        # the operations is important, as otherwise a client may be redirected
-        # to the target node that does not yet know it is importing this slot.
-        if !o[:quiet]
-            print "Moving slot #{slot} from #{source} to #{target}: "
-            STDOUT.flush
-        end
-
-        if !o[:cold]
-            target.r.cluster("setslot",slot,"importing",source.info[:name])
-            source.r.cluster("setslot",slot,"migrating",target.info[:name])
-        end
-        # Migrate all the keys from source to target using the MIGRATE command
-        while true
-            keys = source.r.cluster("getkeysinslot",slot,o[:pipeline])
-            break if keys.length == 0
-            begin
-                source.r.client.call(["migrate",target.info[:host],target.info[:port],"",0,@timeout,:keys,*keys])
-            rescue => e
-                if o[:fix] && e.to_s =~ /BUSYKEY/
-                    xputs "*** Target key exists. Replacing it for FIX."
-                    source.r.client.call(["migrate",target.info[:host],target.info[:port],"",0,@timeout,:replace,:keys,*keys])
-                else
-                    puts ""
-                    xputs "[ERR] Calling MIGRATE: #{e}"
-                    exit 1
-                end
-            end
-            print "."*keys.length if o[:dots]
-            STDOUT.flush
-        end
-
-        puts if !o[:quiet]
-        # Set the new node as the owner of the slot in all the known nodes.
-        if !o[:cold]
-            @nodes.each{|n|
-                next if n.has_flag?("slave")
-                n.r.cluster("setslot",slot,"node",target.info[:name])
-            }
-        end
-
-        # Update the node logical config
-        if o[:update] then
-            source.info[:slots].delete(slot)
-            target.info[:slots][slot] = true
-        end
-    end
-
-    # redis-trib subcommands implementations.
-
-    def check_cluster_cmd(argv,opt)
-        load_cluster_info_from_node(argv[0])
-        check_cluster
-    end
-
-    def info_cluster_cmd(argv,opt)
-        load_cluster_info_from_node(argv[0])
-        show_cluster_info
-    end
-
-    def rebalance_cluster_cmd(argv,opt)
-        opt = {
-            'pipeline' => MigrateDefaultPipeline,
-            'threshold' => RebalanceDefaultThreshold
-        }.merge(opt)
-
-        # Load nodes info before parsing options, otherwise we can't
-        # handle --weight.
-        load_cluster_info_from_node(argv[0])
-
-        # Options parsing
-        threshold = opt['threshold'].to_i
-        autoweights = opt['auto-weights']
-        weights = {}
-        opt['weight'].each{|w|
-            fields = w.split("=")
-            node = get_node_by_abbreviated_name(fields[0])
-            if !node || !node.has_flag?("master")
-                puts "*** No such master node #{fields[0]}"
-                exit 1
-            end
-            weights[node.info[:name]] = fields[1].to_f
-        } if opt['weight']
-        useempty = opt['use-empty-masters']
-
-       # Assign a weight to each node, and compute the total cluster weight.
-        total_weight = 0
-        nodes_involved = 0
-        @nodes.each{|n|
-            if n.has_flag?("master")
-                next if !useempty && n.slots.length == 0
-                n.info[:w] = weights[n.info[:name]] ? weights[n.info[:name]] : 1
-                total_weight += n.info[:w]
-                nodes_involved += 1
-            end
-        }
-
-        # Check cluster, only proceed if it looks sane.
-        check_cluster(:quiet => true)
-        if @errors.length != 0
-            puts "*** Please fix your cluster problems before rebalancing"
-            exit 1
-        end
-
-        # Calculate the slots balance for each node. It's the number of
-        # slots the node should lose (if positive) or gain (if negative)
-        # in order to be balanced.
-        threshold = opt['threshold'].to_f
-        threshold_reached = false
-        @nodes.each{|n|
-            if n.has_flag?("master")
-                next if !n.info[:w]
-                expected = ((ClusterHashSlots.to_f / total_weight) *
-                            n.info[:w]).to_i
-                n.info[:balance] = n.slots.length - expected
-                # Compute the percentage of difference between the
-                # expected number of slots and the real one, to see
-                # if it's over the threshold specified by the user.
-                over_threshold = false
-                if threshold > 0
-                    if n.slots.length > 0
-                        err_perc = (100-(100.0*expected/n.slots.length)).abs
-                        over_threshold = true if err_perc > threshold
-                    elsif expected > 0
-                        over_threshold = true
-                    end
-                end
-                threshold_reached = true if over_threshold
-            end
-        }
-        if !threshold_reached
-            xputs "*** No rebalancing needed! All nodes are within the #{threshold}% threshold."
-            return
-        end
-
-        # Only consider nodes we want to change
-        sn = @nodes.select{|n|
-            n.has_flag?("master") && n.info[:w]
-        }
-
-        # Because of rounding, it is possible that the balance of all nodes
-        # summed does not give 0. Make sure that nodes that have to provide
-        # slots are always matched by nodes receiving slots.
-        total_balance = sn.map{|x| x.info[:balance]}.reduce{|a,b| a+b}
-        while total_balance > 0
-            sn.each{|n|
-                if n.info[:balance] < 0 && total_balance > 0
-                    n.info[:balance] -= 1
-                    total_balance -= 1
-                end
-            }
-        end
-
-        # Sort nodes by their slots balance.
-        sn = sn.sort{|a,b|
-            a.info[:balance] <=> b.info[:balance]
-        }
-
-        xputs ">>> Rebalancing across #{nodes_involved} nodes. Total weight = #{total_weight}"
-
-        if $verbose
-            sn.each{|n|
-                puts "#{n} balance is #{n.info[:balance]} slots"
-            }
-        end
-
-        # Now we have at the start of the 'sn' array nodes that should get
-        # slots, at the end nodes that must give slots.
-        # We take two indexes, one at the start, and one at the end,
-        # incrementing or decrementing the indexes accordingly til we
-        # find nodes that need to get/provide slots.
-        dst_idx = 0
-        src_idx = sn.length - 1
-
-        while dst_idx < src_idx
-            dst = sn[dst_idx]
-            src = sn[src_idx]
-            numslots = [dst.info[:balance],src.info[:balance]].map{|n|
-                n.abs
-            }.min
-
-            if numslots > 0
-                puts "Moving #{numslots} slots from #{src} to #{dst}"
-
-                # Actaully move the slots.
-                reshard_table = compute_reshard_table([src],numslots)
-                if reshard_table.length != numslots
-                    xputs "*** Assertio failed: Reshard table != number of slots"
-                    exit 1
-                end
-                if opt['simulate']
-                    print "#"*reshard_table.length
-                else
-                    reshard_table.each{|e|
-                        move_slot(e[:source],dst,e[:slot],
-                            :quiet=>true,
-                            :dots=>false,
-                            :update=>true,
-                            :pipeline=>opt['pipeline'])
-                        print "#"
-                        STDOUT.flush
-                    }
-                end
-                puts
-            end
-
-            # Update nodes balance.
-            dst.info[:balance] += numslots
-            src.info[:balance] -= numslots
-            dst_idx += 1 if dst.info[:balance] == 0
-            src_idx -= 1 if src.info[:balance] == 0
-        end
-    end
-
-    def fix_cluster_cmd(argv,opt)
-        @fix = true
-        @timeout = opt['timeout'].to_i if opt['timeout']
-
-        load_cluster_info_from_node(argv[0])
-        check_cluster
-    end
-
-    def reshard_cluster_cmd(argv,opt)
-        opt = {'pipeline' => MigrateDefaultPipeline}.merge(opt)
-
-        load_cluster_info_from_node(argv[0])
-        check_cluster
-        if @errors.length != 0
-            puts "*** Please fix your cluster problems before resharding"
-            exit 1
-        end
-
-        @timeout = opt['timeout'].to_i if opt['timeout'].to_i
-
-        # Get number of slots
-        if opt['slots']
-            numslots = opt['slots'].to_i
-        else
-            numslots = 0
-            while numslots <= 0 or numslots > ClusterHashSlots
-                print "How many slots do you want to move (from 1 to #{ClusterHashSlots})? "
-                numslots = STDIN.gets.to_i
-            end
-        end
-
-        # Get the target instance
-        if opt['to']
-            target = get_node_by_name(opt['to'])
-            if !target || target.has_flag?("slave")
-                xputs "*** The specified node is not known or not a master, please retry."
-                exit 1
-            end
-        else
-            target = nil
-            while not target
-                print "What is the receiving node ID? "
-                target = get_node_by_name(STDIN.gets.chop)
-                if !target || target.has_flag?("slave")
-                    xputs "*** The specified node is not known or not a master, please retry."
-                    target = nil
-                end
-            end
-        end
-
-        # Get the source instances
-        sources = []
-        if opt['from']
-            opt['from'].split(',').each{|node_id|
-                if node_id == "all"
-                    sources = "all"
-                    break
-                end
-                src = get_node_by_name(node_id)
-                if !src || src.has_flag?("slave")
-                    xputs "*** The specified node is not known or is not a master, please retry."
-                    exit 1
-                end
-                sources << src
-            }
-        else
-            xputs "Please enter all the source node IDs."
-            xputs "  Type 'all' to use all the nodes as source nodes for the hash slots."
-            xputs "  Type 'done' once you entered all the source nodes IDs."
-            while true
-                print "Source node ##{sources.length+1}:"
-                line = STDIN.gets.chop
-                src = get_node_by_name(line)
-                if line == "done"
-                    break
-                elsif line == "all"
-                    sources = "all"
-                    break
-                elsif !src || src.has_flag?("slave")
-                    xputs "*** The specified node is not known or is not a master, please retry."
-                elsif src.info[:name] == target.info[:name]
-                    xputs "*** It is not possible to use the target node as source node."
-                else
-                    sources << src
-                end
-            end
-        end
-
-        if sources.length == 0
-            puts "*** No source nodes given, operation aborted"
-            exit 1
-        end
-
-        # Handle soures == all.
-        if sources == "all"
-            sources = []
-            @nodes.each{|n|
-                next if n.info[:name] == target.info[:name]
-                next if n.has_flag?("slave")
-                sources << n
-            }
-        end
-
-        # Check if the destination node is the same of any source nodes.
-        if sources.index(target)
-            xputs "*** Target node is also listed among the source nodes!"
-            exit 1
-        end
-
-        puts "\nReady to move #{numslots} slots."
-        puts "  Source nodes:"
-        sources.each{|s| puts "    "+s.info_string}
-        puts "  Destination node:"
-        puts "    #{target.info_string}"
-        reshard_table = compute_reshard_table(sources,numslots)
-        puts "  Resharding plan:"
-        show_reshard_table(reshard_table)
-        if !opt['yes']
-            print "Do you want to proceed with the proposed reshard plan (yes/no)? "
-            yesno = STDIN.gets.chop
-            exit(1) if (yesno != "yes")
-        end
-        reshard_table.each{|e|
-            move_slot(e[:source],target,e[:slot],
-                :dots=>true,
-                :pipeline=>opt['pipeline'])
-        }
-    end
-
-    # This is an helper function for create_cluster_cmd that verifies if
-    # the number of nodes and the specified replicas have a valid configuration
-    # where there are at least three master nodes and enough replicas per node.
-    def check_create_parameters
-        masters = @nodes.length/(@replicas+1)
-        if masters < 3
-            puts "*** ERROR: Invalid configuration for cluster creation."
-            puts "*** Redis Cluster requires at least 3 master nodes."
-            puts "*** This is not possible with #{@nodes.length} nodes and #{@replicas} replicas per node."
-            puts "*** At least #{3*(@replicas+1)} nodes are required."
-            exit 1
-        end
-    end
-
-    def create_cluster_cmd(argv,opt)
-        opt = {'replicas' => 0}.merge(opt)
-        @replicas = opt['replicas'].to_i
-
-        xputs ">>> Creating cluster"
-        argv[0..-1].each{|n|
-            node = ClusterNode.new(n)
-            node.connect(:abort => true)
-            node.assert_cluster
-            node.load_info
-            node.assert_empty
-            add_node(node)
-        }
-        check_create_parameters
-        xputs ">>> Performing hash slots allocation on #{@nodes.length} nodes..."
-        alloc_slots
-        show_nodes
-        yes_or_die "Can I set the above configuration?"
-        flush_nodes_config
-        xputs ">>> Nodes configuration updated"
-        xputs ">>> Assign a different config epoch to each node"
-        assign_config_epoch
-        xputs ">>> Sending CLUSTER MEET messages to join the cluster"
-        join_cluster
-        # Give one second for the join to start, in order to avoid that
-        # wait_cluster_join will find all the nodes agree about the config as
-        # they are still empty with unassigned slots.
-        sleep 1
-        wait_cluster_join
-        flush_nodes_config # Useful for the replicas
-        check_cluster
-    end
-
-    def addnode_cluster_cmd(argv,opt)
-        xputs ">>> Adding node #{argv[0]} to cluster #{argv[1]}"
-
-        # Check the existing cluster
-        load_cluster_info_from_node(argv[1])
-        check_cluster
-
-        # If --master-id was specified, try to resolve it now so that we
-        # abort before starting with the node configuration.
-        if opt['slave']
-            if opt['master-id']
-                master = get_node_by_name(opt['master-id'])
-                if !master
-                    xputs "[ERR] No such master ID #{opt['master-id']}"
-                end
-            else
-                master = get_master_with_least_replicas
-                xputs "Automatically selected master #{master}"
-            end
-        end
-
-        # Add the new node
-        new = ClusterNode.new(argv[0])
-        new.connect(:abort => true)
-        new.assert_cluster
-        new.load_info
-        new.assert_empty
-        first = @nodes.first.info
-        add_node(new)
-
-        # Send CLUSTER MEET command to the new node
-        xputs ">>> Send CLUSTER MEET to node #{new} to make it join the cluster."
-        new.r.cluster("meet",first[:host],first[:port])
-
-        # Additional configuration is needed if the node is added as
-        # a slave.
-        if opt['slave']
-            wait_cluster_join
-            xputs ">>> Configure node as replica of #{master}."
-            new.r.cluster("replicate",master.info[:name])
-        end
-        xputs "[OK] New node added correctly."
-    end
-
-    def delnode_cluster_cmd(argv,opt)
-        id = argv[1].downcase
-        xputs ">>> Removing node #{id} from cluster #{argv[0]}"
-
-        # Load cluster information
-        load_cluster_info_from_node(argv[0])
-
-        # Check if the node exists and is not empty
-        node = get_node_by_name(id)
-
-        if !node
-            xputs "[ERR] No such node ID #{id}"
-            exit 1
-        end
-
-        if node.slots.length != 0
-            xputs "[ERR] Node #{node} is not empty! Reshard data away and try again."
-            exit 1
-        end
-
-        # Send CLUSTER FORGET to all the nodes but the node to remove
-        xputs ">>> Sending CLUSTER FORGET messages to the cluster..."
-        @nodes.each{|n|
-            next if n == node
-            if n.info[:replicate] && n.info[:replicate].downcase == id
-                # Reconfigure the slave to replicate with some other node
-                master = get_master_with_least_replicas
-                xputs ">>> #{n} as replica of #{master}"
-                n.r.cluster("replicate",master.info[:name])
-            end
-            n.r.cluster("forget",argv[1])
-        }
-
-        # Finally shutdown the node
-        xputs ">>> SHUTDOWN the node."
-        node.r.shutdown
-    end
-
-    def set_timeout_cluster_cmd(argv,opt)
-        timeout = argv[1].to_i
-        if timeout < 100
-            puts "Setting a node timeout of less than 100 milliseconds is a bad idea."
-            exit 1
-        end
-
-        # Load cluster information
-        load_cluster_info_from_node(argv[0])
-        ok_count = 0
-        err_count = 0
-
-        # Send CLUSTER FORGET to all the nodes but the node to remove
-        xputs ">>> Reconfiguring node timeout in every cluster node..."
-        @nodes.each{|n|
-            begin
-                n.r.config("set","cluster-node-timeout",timeout)
-                n.r.config("rewrite")
-                ok_count += 1
-                xputs "*** New timeout set for #{n}"
-            rescue => e
-                puts "ERR setting node-timeot for #{n}: #{e}"
-                err_count += 1
-            end
-        }
-        xputs ">>> New node timeout set. #{ok_count} OK, #{err_count} ERR."
-    end
-
-    def call_cluster_cmd(argv,opt)
-        cmd = argv[1..-1]
-        cmd[0] = cmd[0].upcase
-
-        # Load cluster information
-        load_cluster_info_from_node(argv[0])
-        xputs ">>> Calling #{cmd.join(" ")}"
-        @nodes.each{|n|
-            begin
-                res = n.r.send(*cmd)
-                puts "#{n}: #{res}"
-            rescue => e
-                puts "#{n}: #{e}"
-            end
-        }
-    end
-
-    def import_cluster_cmd(argv,opt)
-        source_addr = opt['from']
-        xputs ">>> Importing data from #{source_addr} to cluster #{argv[1]}"
-        use_copy = opt['copy']
-        use_replace = opt['replace']
-        
-        # Check the existing cluster.
-        load_cluster_info_from_node(argv[0])
-        check_cluster
-
-        # Connect to the source node.
-        xputs ">>> Connecting to the source Redis instance"
-        src_host,src_port = source_addr.split(":")
-        source = Redis.new(:host =>src_host, :port =>src_port)
-        if source.info['cluster_enabled'].to_i == 1
-            xputs "[ERR] The source node should not be a cluster node."
-        end
-        xputs "*** Importing #{source.dbsize} keys from DB 0"
-
-        # Build a slot -> node map
-        slots = {}
-        @nodes.each{|n|
-            n.slots.each{|s,_|
-                slots[s] = n
-            }
-        }
-
-        # Use SCAN to iterate over the keys, migrating to the
-        # right node as needed.
-        cursor = nil
-        while cursor != 0
-            cursor,keys = source.scan(cursor, :count => 1000)
-            cursor = cursor.to_i
-            keys.each{|k|
-                # Migrate keys using the MIGRATE command.
-                slot = key_to_slot(k)
-                target = slots[slot]
-                print "Migrating #{k} to #{target}: "
-                STDOUT.flush
-                begin
-                    cmd = ["migrate",target.info[:host],target.info[:port],k,0,@timeout]
-                    cmd << :copy if use_copy
-                    cmd << :replace if use_replace
-                    source.client.call(cmd)
-                rescue => e
-                    puts e
-                else
-                    puts "OK"
-                end
-            }
-        end
-    end
-
-    def help_cluster_cmd(argv,opt)
-        show_help
-        exit 0
-    end
-
-    # Parse the options for the specific command "cmd".
-    # Returns an hash populate with option => value pairs, and the index of
-    # the first non-option argument in ARGV.
-    def parse_options(cmd)
-        idx = 1 ; # Current index into ARGV
-        options={}
-        while idx < ARGV.length && ARGV[idx][0..1] == '--'
-            if ARGV[idx][0..1] == "--"
-                option = ARGV[idx][2..-1]
-                idx += 1
-
-                # --verbose is a global option
-                if option == "verbose"
-                    $verbose = true
-                    next
-                end
-
-                if ALLOWED_OPTIONS[cmd] == nil || ALLOWED_OPTIONS[cmd][option] == nil
-                    puts "Unknown option '#{option}' for command '#{cmd}'"
-                    exit 1
-                end
-                if ALLOWED_OPTIONS[cmd][option] != false
-                    value = ARGV[idx]
-                    idx += 1
-                else
-                    value = true
-                end
-
-                # If the option is set to [], it's a multiple arguments
-                # option. We just queue every new value into an array.
-                if ALLOWED_OPTIONS[cmd][option] == []
-                    options[option] = [] if !options[option]
-                    options[option] << value
-                else
-                    options[option] = value
-                end
-            else
-                # Remaining arguments are not options.
-                break
-            end
-        end
-
-        # Enforce mandatory options
-        if ALLOWED_OPTIONS[cmd]
-            ALLOWED_OPTIONS[cmd].each {|option,val|
-                if !options[option] && val == :required
-                    puts "Option '--#{option}' is required "+ \
-                         "for subcommand '#{cmd}'"
-                    exit 1
-                end
-            }
-        end
-        return options,idx
-    end
-end
-
-#################################################################################
-# Libraries
-#
-# We try to don't depend on external libs since this is a critical part
-# of Redis Cluster.
-#################################################################################
-
-# This is the CRC16 algorithm used by Redis Cluster to hash keys.
-# Implementation according to CCITT standards.
-#
-# This is actually the XMODEM CRC 16 algorithm, using the
-# following parameters:
-#
-# Name                       : "XMODEM", also known as "ZMODEM", "CRC-16/ACORN"
-# Width                      : 16 bit
-# Poly                       : 1021 (That is actually x^16 + x^12 + x^5 + 1)
-# Initialization             : 0000
-# Reflect Input byte         : False
-# Reflect Output CRC         : False
-# Xor constant to output CRC : 0000
-# Output for "123456789"     : 31C3
-
-module RedisClusterCRC16
-    def RedisClusterCRC16.crc16(bytes)
-        crc = 0
-        bytes.each_byte{|b|
-            crc = ((crc<<8) & 0xffff) ^ XMODEMCRC16Lookup[((crc>>8)^b) & 0xff]
-        }
-        crc
-    end
-
-private
-    XMODEMCRC16Lookup = [
-        0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
-        0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
-        0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
-        0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
-        0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
-        0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
-        0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
-        0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
-        0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
-        0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
-        0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
-        0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
-        0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
-        0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
-        0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
-        0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
-        0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
-        0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
-        0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
-        0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
-        0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
-        0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
-        0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
-        0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
-        0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
-        0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
-        0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
-        0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
-        0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
-        0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
-        0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
-        0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0
-    ]
-end
-
-# Turn a key name into the corrisponding Redis Cluster slot.
-def key_to_slot(key)
-    # Only hash what is inside {...} if there is such a pattern in the key.
-    # Note that the specification requires the content that is between
-    # the first { and the first } after the first {. If we found {} without
-    # nothing in the middle, the whole key is hashed as usually.
-    s = key.index "{"
-    if s
-        e = key.index "}",s+1
-        if e && e != s+1
-            key = key[s+1..e-1]
-        end
-    end
-    RedisClusterCRC16.crc16(key) % 16384
-end
-
-#################################################################################
-# Definition of commands
-#################################################################################
-
-COMMANDS={
-    "create"  => ["create_cluster_cmd", -2, "host1:port1 ... hostN:portN"],
-    "check"   => ["check_cluster_cmd", 2, "host:port"],
-    "info"    => ["info_cluster_cmd", 2, "host:port"],
-    "fix"     => ["fix_cluster_cmd", 2, "host:port"],
-    "reshard" => ["reshard_cluster_cmd", 2, "host:port"],
-    "rebalance" => ["rebalance_cluster_cmd", -2, "host:port"],
-    "add-node" => ["addnode_cluster_cmd", 3, "new_host:new_port existing_host:existing_port"],
-    "del-node" => ["delnode_cluster_cmd", 3, "host:port node_id"],
-    "set-timeout" => ["set_timeout_cluster_cmd", 3, "host:port milliseconds"],
-    "call" =>    ["call_cluster_cmd", -3, "host:port command arg arg .. arg"],
-    "import" =>  ["import_cluster_cmd", 2, "host:port"],
-    "help"    => ["help_cluster_cmd", 1, "(show this help)"]
-}
-
-ALLOWED_OPTIONS={
-    "create" => {"replicas" => true},
-    "add-node" => {"slave" => false, "master-id" => true},
-    "import" => {"from" => :required, "copy" => false, "replace" => false},
-    "reshard" => {"from" => true, "to" => true, "slots" => true, "yes" => false, "timeout" => true, "pipeline" => true},
-    "rebalance" => {"weight" => [], "auto-weights" => false, "use-empty-masters" => false, "timeout" => true, "simulate" => false, "pipeline" => true, "threshold" => true},
-    "fix" => {"timeout" => MigrateDefaultTimeout},
-}
-
-def show_help
-    puts "Usage: redis-trib <command> <options> <arguments ...>\n\n"
-    COMMANDS.each{|k,v|
-        o = ""
-        puts "  #{k.ljust(15)} #{v[2]}"
-        if ALLOWED_OPTIONS[k]
-            ALLOWED_OPTIONS[k].each{|optname,has_arg|
-                puts "                  --#{optname}" + (has_arg ? " <arg>" : "")
-            }
-        end
-    }
-    puts "\nFor check, fix, reshard, del-node, set-timeout you can specify the host and port of any working node in the cluster.\n"
-end
-
-# Sanity check
-if ARGV.length == 0
-    show_help
-    exit 1
-end
-
-rt = RedisTrib.new
-cmd_spec = COMMANDS[ARGV[0].downcase]
-if !cmd_spec
-    puts "Unknown redis-trib subcommand '#{ARGV[0]}'"
-    exit 1
-end
-
-# Parse options
-cmd_options,first_non_option = rt.parse_options(ARGV[0].downcase)
-rt.check_arity(cmd_spec[1],ARGV.length-(first_non_option-1))
-
-# Dispatch
-rt.send(cmd_spec[0],ARGV[first_non_option..-1],cmd_options)
diff --git a/debian/modules/nchan/dev/redis.conf b/debian/modules/nchan/dev/redis.conf
deleted file mode 100644
index 8a7b160..0000000
--- a/debian/modules/nchan/dev/redis.conf
+++ /dev/null
@@ -1,1018 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specify
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all Redis servers but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
-# from admin or Redis Sentinel. Since Redis always uses the last processed
-# line as value of a configuration directive, you'd better put includes
-# at the beginning of this file to avoid overwriting config change at runtime.
-#
-# If instead you are interested in using includes to override configuration
-# options, it is better to use include as the last line.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-
-################################## NETWORK #####################################
-
-# By default, if no "bind" configuration directive is specified, Redis listens
-# for connections from all the network interfaces available on the server.
-# It is possible to listen to just one or multiple selected interfaces using
-# the "bind" configuration directive, followed by one or more IP addresses.
-#
-# Examples:
-#
-# bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1 ::1
-#
-# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
-# internet, binding to all the interfaces is dangerous and will expose the
-# instance to everybody on the internet. So by default we uncomment the
-# following bind directive, that will force Redis to listen only into
-# the IPv4 lookback interface address (this means Redis will be able to
-# accept connections only from clients running into the same computer it
-# is running).
-#
-# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
-# JUST COMMENT THE FOLLOWING LINE.
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1
-
-# Protected mode is a layer of security protection, in order to avoid that
-# Redis instances left open on the internet are accessed and exploited.
-#
-# When protected mode is on and if:
-#
-# 1) The server is not binding explicitly to a set of addresses using the
-#    "bind" directive.
-# 2) No password is configured.
-#
-# The server only accepts connections from clients connecting from the
-# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
-# sockets.
-#
-# By default protected mode is enabled. You should disable it only if
-# you are sure you want clients from other hosts to connect to Redis
-# even if no authentication is configured, nor a specific set of interfaces
-# are explicitly listed using the "bind" directive.
-protected-mode yes
-
-# Accept connections on the specified port, default is 6379 (IANA #815344).
-# If port 0 is specified Redis will not listen on a TCP socket.
-port 8537
-
-# TCP listen() backlog.
-#
-# In high requests-per-second environments you need an high backlog in order
-# to avoid slow clients connections issues. Note that the Linux kernel
-# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
-# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
-# in order to get the desired effect.
-tcp-backlog 511
-
-# Unix socket.
-#
-# Specify the path for the Unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-unixsocket /tmp/redis-pushmodule.sock
-unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 0
-
-# TCP keepalive.
-#
-# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
-# of communication. This is useful for two reasons:
-#
-# 1) Detect dead peers.
-# 2) Take the connection alive from the point of view of network
-#    equipment in the middle.
-#
-# On Linux, the specified value (in seconds) is the period used to send ACKs.
-# Note that to close the connection the double of the time is needed.
-# On other kernels the period depends on the kernel configuration.
-#
-# A reasonable value for this option is 300 seconds, which is the new
-# Redis default starting with Redis 3.2.1.
-tcp-keepalive 60
-
-################################# GENERAL #####################################
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# If you run Redis from upstart or systemd, Redis can interact with your
-# supervision tree. Options:
-#   supervised no      - no supervision interaction
-#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
-#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
-#   supervised auto    - detect upstart or systemd method based on
-#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
-# Note: these supervision methods only signal "process is ready."
-#       They do not enable continuous liveness pings back to your supervisor.
-supervised no
-
-# If a pid file is specified, Redis writes it where specified at startup
-# and removes it at exit.
-#
-# When the server runs non daemonized, no pid file is created if none is
-# specified in the configuration. When the server is daemonized, the pid file
-# is used even if not specified, defaulting to "/var/run/redis.pid".
-#
-# Creating a pid file is best effort: if Redis is not able to create it
-# nothing bad happens, the server will start and run normally.
-pidfile /tmp/redis-pushmodule.pid
-
-# Specify the server verbosity level.
-# This can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel notice
-
-# Specify the log file name. Also the empty string can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile /dev/stdout
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-# syslog-enabled no
-
-# Specify the syslog identity.
-# syslog-ident redis
-
-# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
-# syslog-facility local0
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################ SNAPSHOTTING  ################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving completely by commenting out all "save" lines.
-#
-#   It is also possible to remove all the previously configured save
-#   points by adding a save directive with a single empty string argument
-#   like in the following example:
-#
-#   save ""
-
-#save 900 1
-#save 300 10
-#save 60 10000
-
-# By default Redis will stop accepting writes if RDB snapshots are enabled
-# (at least one save point) and the latest background save failed.
-# This will make the user aware (in a hard way) that data is not persisting
-# on disk properly, otherwise chances are that no one will notice and some
-# disaster will happen.
-#
-# If the background saving process will start working again Redis will
-# automatically allow writes again.
-#
-# However if you have setup your proper monitoring of the Redis server
-# and persistence, you may want to disable this feature so that Redis will
-# continue to work as usual even if there are problems with disk,
-# permissions, and so forth.
-stop-writes-on-bgsave-error yes
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression yes
-
-# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
-# This makes the format more resistant to corruption but there is a performance
-# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
-# for maximum performances.
-#
-# RDB files created with checksum disabled have a checksum of zero that will
-# tell the loading code to skip the check.
-rdbchecksum yes
-
-# The filename where to dump the DB
-#dbfilename dump.rdb
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# The Append Only File will also be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir ./
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. A few things to understand ASAP about Redis replication.
-#
-# 1) Redis replication is asynchronous, but you can configure a master to
-#    stop accepting writes if it appears to be not connected with at least
-#    a given number of slaves.
-# 2) Redis slaves are able to perform a partial resynchronization with the
-#    master if the replication link is lost for a relatively small amount of
-#    time. You may want to configure the replication backlog size (see the next
-#    sections of this file) with a sensible value depending on your needs.
-# 3) Replication is automatic and does not need user intervention. After a
-#    network partition slaves automatically try to reconnect to masters
-#    and resynchronize with them.
-#
-# slaveof <masterip> <masterport>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-
-# When a slave loses its connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of date data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data yes
-
-# You can configure a slave instance to accept writes or not. Writing against
-# a slave instance may be useful to store some ephemeral data (because data
-# written on a slave will be easily deleted after resync with the master) but
-# may also cause problems if clients are writing to it because of a
-# misconfiguration.
-#
-# Since Redis 2.6 by default slaves are read-only.
-#
-# Note: read only slaves are not designed to be exposed to untrusted clients
-# on the internet. It's just a protection layer against misuse of the instance.
-# Still a read only slave exports by default all the administrative commands
-# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
-# security of read only slaves using 'rename-command' to shadow all the
-# administrative / dangerous commands.
-slave-read-only no
-
-# Replication SYNC strategy: disk or socket.
-#
-# -------------------------------------------------------
-# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
-# -------------------------------------------------------
-#
-# New slaves and reconnecting slaves that are not able to continue the replication
-# process just receiving differences, need to do what is called a "full
-# synchronization". An RDB file is transmitted from the master to the slaves.
-# The transmission can happen in two different ways:
-#
-# 1) Disk-backed: The Redis master creates a new process that writes the RDB
-#                 file on disk. Later the file is transferred by the parent
-#                 process to the slaves incrementally.
-# 2) Diskless: The Redis master creates a new process that directly writes the
-#              RDB file to slave sockets, without touching the disk at all.
-#
-# With disk-backed replication, while the RDB file is generated, more slaves
-# can be queued and served with the RDB file as soon as the current child producing
-# the RDB file finishes its work. With diskless replication instead once
-# the transfer starts, new slaves arriving will be queued and a new transfer
-# will start when the current one terminates.
-#
-# When diskless replication is used, the master waits a configurable amount of
-# time (in seconds) before starting the transfer in the hope that multiple slaves
-# will arrive and the transfer can be parallelized.
-#
-# With slow disks and fast (large bandwidth) networks, diskless replication
-# works better.
-repl-diskless-sync no
-
-# When diskless replication is enabled, it is possible to configure the delay
-# the server waits in order to spawn the child that transfers the RDB via socket
-# to the slaves.
-#
-# This is important since once the transfer starts, it is not possible to serve
-# new slaves arriving, that will be queued for the next RDB transfer, so the server
-# waits a delay in order to let more slaves arrive.
-#
-# The delay is specified in seconds, and by default is 5 seconds. To disable
-# it entirely just set it to 0 seconds and the transfer will start ASAP.
-repl-diskless-sync-delay 5
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-
-# The following option sets the replication timeout for:
-#
-# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
-# 2) Master timeout from the point of view of slaves (data, pings).
-# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-
-# Disable TCP_NODELAY on the slave socket after SYNC?
-#
-# If you select "yes" Redis will use a smaller number of TCP packets and
-# less bandwidth to send data to slaves. But this can add a delay for
-# the data to appear on the slave side, up to 40 milliseconds with
-# Linux kernels using a default configuration.
-#
-# If you select "no" the delay for data to appear on the slave side will
-# be reduced but more bandwidth will be used for replication.
-#
-# By default we optimize for low latency, but in very high traffic conditions
-# or when the master and slaves are many hops away, turning this to "yes" may
-# be a good idea.
-repl-disable-tcp-nodelay no
-
-# Set the replication backlog size. The backlog is a buffer that accumulates
-# slave data when slaves are disconnected for some time, so that when a slave
-# wants to reconnect again, often a full resync is not needed, but a partial
-# resync is enough, just passing the portion of data the slave missed while
-# disconnected.
-#
-# The bigger the replication backlog, the longer the time the slave can be
-# disconnected and later be able to perform a partial resynchronization.
-#
-# The backlog is only allocated once there is at least a slave connected.
-#
-# repl-backlog-size 1mb
-
-# After a master has no longer connected slaves for some time, the backlog
-# will be freed. The following option configures the amount of seconds that
-# need to elapse, starting from the time the last slave disconnected, for
-# the backlog buffer to be freed.
-#
-# A value of 0 means to never release the backlog.
-#
-# repl-backlog-ttl 3600
-
-# The slave priority is an integer number published by Redis in the INFO output.
-# It is used by Redis Sentinel in order to select a slave to promote into a
-# master if the master is no longer working correctly.
-#
-# A slave with a low priority number is considered better for promotion, so
-# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
-# pick the one with priority 10, that is the lowest.
-#
-# However a special priority of 0 marks the slave as not able to perform the
-# role of master, so a slave with priority of 0 will never be selected by
-# Redis Sentinel for promotion.
-#
-# By default the priority is 100.
-slave-priority 100
-
-# It is possible for a master to stop accepting writes if there are less than
-# N slaves connected, having a lag less or equal than M seconds.
-#
-# The N slaves need to be in "online" state.
-#
-# The lag in seconds, that must be <= the specified value, is calculated from
-# the last ping received from the slave, that is usually sent every second.
-#
-# This option does not GUARANTEE that N replicas will accept the write, but
-# will limit the window of exposure for lost writes in case not enough slaves
-# are available, to the specified number of seconds.
-#
-# For example to require at least 3 slaves with a lag <= 10 seconds use:
-#
-# min-slaves-to-write 3
-# min-slaves-max-lag 10
-#
-# Setting one or the other to 0 disables the feature.
-#
-# By default min-slaves-to-write is set to 0 (feature disabled) and
-# min-slaves-max-lag is set to 10.
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-# requirepass foobared
-
-# Command renaming.
-#
-# It is possible to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# hard to guess so that it will still be available for internal-use tools
-# but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possible to completely kill a command by renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-#
-# Please note that changing the name of commands that are logged into the
-# AOF file or transmitted to slaves may cause problems.
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default
-# this limit is set to 10000 clients, however if the Redis server is not
-# able to configure the process file limit to allow for the specified limit
-# the max number of allowed clients is set to the current file limit
-# minus 32 (as Redis reserves a few file descriptors for internal uses).
-#
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 10000
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# according to the eviction policy selected (see maxmemory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# a hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached. You can select among five behaviors:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key according to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys-random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with any of the above policies, Redis will return an error on write
-#       operations, when there are no suitable keys for eviction.
-#
-#       At the date of writing these commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy noeviction
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can tune it for speed or
-# accuracy. For default Redis will check five keys and pick the one that was
-# used less recently, you can change the sample size using the following
-# configuration directive.
-#
-# The default of 5 produces good enough results. 10 Approximates very closely
-# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
-#
-# maxmemory-samples 5
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. This mode is
-# good enough in many applications, but an issue with the Redis process or
-# a power outage may result into a few minutes of writes lost (depending on
-# the configured save points).
-#
-# The Append Only File is an alternative persistence mode that provides
-# much better durability. For instance using the default data fsync policy
-# (see later in the config file) Redis can lose just one second of writes in a
-# dramatic event like a server power outage, or a single write if something
-# wrong with the Redis process itself happens, but the operating system is
-# still running correctly.
-#
-# AOF and RDB persistence can be enabled at the same time without problems.
-# If the AOF is enabled on startup Redis will load the AOF, that is the file
-# with the better durability guarantees.
-#
-# Please check http://redis.io/topics/persistence for more information.
-
-appendonly no
-
-# The name of the append only file (default: "appendonly.aof")
-
-appendfilename "appendonly.aof"
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead of waiting for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log. Slow, Safest.
-# everysec: fsync only one time every second. Compromise.
-#
-# The default is "everysec", as that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# More details please check the following article:
-# http://antirez.com/post/redis-persistence-demystified.html
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-appendfsync everysec
-# appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving, the durability of Redis is
-# the same as "appendfsync none". In practical terms, this means that it is
-# possible to lose up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-
-no-appendfsync-on-rewrite no
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size grows by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (if no rewrite has happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a percentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-
-# An AOF file may be found to be truncated at the end during the Redis
-# startup process, when the AOF data gets loaded back into memory.
-# This may happen when the system where Redis is running
-# crashes, especially when an ext4 filesystem is mounted without the
-# data=ordered option (however this can't happen when Redis itself
-# crashes or aborts but the operating system still works correctly).
-#
-# Redis can either exit with an error when this happens, or load as much
-# data as possible (the default now) and start if the AOF file is found
-# to be truncated at the end. The following option controls this behavior.
-#
-# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
-# the Redis server starts emitting a log to inform the user of the event.
-# Otherwise if the option is set to no, the server aborts with an error
-# and refuses to start. When the option is set to no, the user requires
-# to fix the AOF file using the "redis-check-aof" utility before to restart
-# the server.
-#
-# Note that if the AOF file will be found to be corrupted in the middle
-# the server will still exit with an error. This option only applies when
-# Redis will try to read more data from the AOF file but not enough bytes
-# will be found.
-aof-load-truncated yes
-
-################################ LUA SCRIPTING  ###############################
-
-# Max execution time of a Lua script in milliseconds.
-#
-# If the maximum execution time is reached Redis will log that a script is
-# still in execution after the maximum allowed time and will start to
-# reply to queries with an error.
-#
-# When a long running script exceeds the maximum execution time only the
-# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
-# used to stop a script that did not yet called write commands. The second
-# is the only way to shut down the server in the case a write command was
-# already issued by the script but the user doesn't want to wait for the natural
-# termination of the script.
-#
-# Set it to 0 or a negative value for unlimited execution without warnings.
-lua-time-limit 5000
-
-################################ REDIS CLUSTER  ###############################
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
-# in order to mark it as "mature" we need to wait for a non trivial percentage
-# of users to deploy it in production.
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
-# started as cluster nodes can. In order to start a Redis instance as a
-# cluster node enable the cluster support uncommenting the following:
-#
-# cluster-enabled yes
-
-# Every cluster node has a cluster configuration file. This file is not
-# intended to be edited by hand. It is created and updated by Redis nodes.
-# Every Redis Cluster node requires a different cluster configuration file.
-# Make sure that instances running in the same system do not have
-# overlapping cluster configuration file names.
-#
-# cluster-config-file redis-cluster-nodes.conf
-
-# Cluster node timeout is the amount of milliseconds a node must be unreachable
-# for it to be considered in failure state.
-# Most other internal time limits are multiple of the node timeout.
-#
-# cluster-node-timeout 15000
-
-# A slave of a failing master will avoid to start a failover if its data
-# looks too old.
-#
-# There is no simple way for a slave to actually have a exact measure of
-# its "data age", so the following two checks are performed:
-#
-# 1) If there are multiple slaves able to failover, they exchange messages
-#    in order to try to give an advantage to the slave with the best
-#    replication offset (more data from the master processed).
-#    Slaves will try to get their rank by offset, and apply to the start
-#    of the failover a delay proportional to their rank.
-#
-# 2) Every single slave computes the time of the last interaction with
-#    its master. This can be the last ping or command received (if the master
-#    is still in the "connected" state), or the time that elapsed since the
-#    disconnection with the master (if the replication link is currently down).
-#    If the last interaction is too old, the slave will not try to failover
-#    at all.
-#
-# The point "2" can be tuned by user. Specifically a slave will not perform
-# the failover if, since the last interaction with the master, the time
-# elapsed is greater than:
-#
-#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
-#
-# So for example if node-timeout is 30 seconds, and the slave-validity-factor
-# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
-# slave will not try to failover if it was not able to talk with the master
-# for longer than 310 seconds.
-#
-# A large slave-validity-factor may allow slaves with too old data to failover
-# a master, while a too small value may prevent the cluster from being able to
-# elect a slave at all.
-#
-# For maximum availability, it is possible to set the slave-validity-factor
-# to a value of 0, which means, that slaves will always try to failover the
-# master regardless of the last time they interacted with the master.
-# (However they'll always try to apply a delay proportional to their
-# offset rank).
-#
-# Zero is the only value able to guarantee that when all the partitions heal
-# the cluster will always be able to continue.
-#
-# cluster-slave-validity-factor 10
-
-# Cluster slaves are able to migrate to orphaned masters, that are masters
-# that are left without working slaves. This improves the cluster ability
-# to resist to failures as otherwise an orphaned master can't be failed over
-# in case of failure if it has no working slaves.
-#
-# Slaves migrate to orphaned masters only if there are still at least a
-# given number of other working slaves for their old master. This number
-# is the "migration barrier". A migration barrier of 1 means that a slave
-# will migrate only if there is at least 1 other working slave for its master
-# and so forth. It usually reflects the number of slaves you want for every
-# master in your cluster.
-#
-# Default is 1 (slaves migrate only if their masters remain with at least
-# one slave). To disable migration just set it to a very large value.
-# A value of 0 can be set but is useful only for debugging and dangerous
-# in production.
-#
-# cluster-migration-barrier 1
-
-# By default Redis Cluster nodes stop accepting queries if they detect there
-# is at least an hash slot uncovered (no available node is serving it).
-# This way if the cluster is partially down (for example a range of hash slots
-# are no longer covered) all the cluster becomes, eventually, unavailable.
-# It automatically returns available as soon as all the slots are covered again.
-#
-# However sometimes you want the subset of the cluster which is working,
-# to continue to accept queries for the part of the key space that is still
-# covered. In order to do so, just set the cluster-require-full-coverage
-# option to no.
-#
-# cluster-require-full-coverage yes
-
-# In order to setup your cluster make sure to read the documentation
-# available at http://redis.io web site.
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than 10000
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 128
-
-################################ LATENCY MONITOR ##############################
-
-# The Redis latency monitoring subsystem samples different operations
-# at runtime in order to collect data related to possible sources of
-# latency of a Redis instance.
-#
-# Via the LATENCY command this information is available to the user that can
-# print graphs and obtain reports.
-#
-# The system only logs operations that were performed in a time equal or
-# greater than the amount of milliseconds specified via the
-# latency-monitor-threshold configuration directive. When its value is set
-# to zero, the latency monitor is turned off.
-#
-# By default latency monitoring is disabled since it is mostly not needed
-# if you don't have latency issues, and collecting data has a performance
-# impact, that while very small, can be measured under big load. Latency
-# monitoring can easily be enabled at runtime using the command
-# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
-latency-monitor-threshold 0
-
-############################# EVENT NOTIFICATION ##############################
-
-# Redis can notify Pub/Sub clients about events happening in the key space.
-# This feature is documented at http://redis.io/topics/notifications
-#
-# For instance if keyspace events notification is enabled, and a client
-# performs a DEL operation on key "foo" stored in the Database 0, two
-# messages will be published via Pub/Sub:
-#
-# PUBLISH __keyspace@0__:foo del
-# PUBLISH __keyevent@0__:del foo
-#
-# It is possible to select the events that Redis will notify among a set
-# of classes. Every class is identified by a single character:
-#
-#  K     Keyspace events, published with __keyspace@<db>__ prefix.
-#  E     Keyevent events, published with __keyevent@<db>__ prefix.
-#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
-#  $     String commands
-#  l     List commands
-#  s     Set commands
-#  h     Hash commands
-#  z     Sorted set commands
-#  x     Expired events (events generated every time a key expires)
-#  e     Evicted events (events generated when a key is evicted for maxmemory)
-#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
-#
-#  The "notify-keyspace-events" takes as argument a string that is composed
-#  by zero or multiple characters. The empty string means that notifications
-#  are disabled at all.
-#
-#  Example: to enable list and generic events, from the point of view of the
-#           event name, use:
-#
-#  notify-keyspace-events Elg
-#
-#  Example 2: to get the stream of the expired keys subscribing to channel
-#             name __keyevent@0__:expired use:
-#
-#  notify-keyspace-events Ex
-#
-#  By default all notifications are disabled because most users don't need
-#  this feature and the feature has some overhead. Note that if you don't
-#  specify at least one of K or E, no events will be delivered.
-notify-keyspace-events ""
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded using a memory efficient data structure when they have a
-# small number of entries, and the biggest entry does not exceed a given
-# threshold. These thresholds can be configured using the following directives.
-hash-max-ziplist-entries 512
-hash-max-ziplist-value 64
-
-# Lists are also encoded in a special way to save a lot of space.
-# The number of entries allowed per internal list node can be specified
-# as a fixed maximum size or a maximum number of elements.
-# For a fixed maximum size, use -5 through -1, meaning:
-# -5: max size: 64 Kb  <-- not recommended for normal workloads
-# -4: max size: 32 Kb  <-- not recommended
-# -3: max size: 16 Kb  <-- probably not recommended
-# -2: max size: 8 Kb   <-- good
-# -1: max size: 4 Kb   <-- good
-# Positive numbers mean store up to _exactly_ that number of elements
-# per list node.
-# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
-# but if your use case is unique, adjust the settings as necessary.
-list-max-ziplist-size -2
-
-# Lists may also be compressed.
-# Compress depth is the number of quicklist ziplist nodes from *each* side of
-# the list to *exclude* from compression.  The head and tail of the list
-# are always uncompressed for fast push/pop operations.  Settings are:
-# 0: disable all list compression
-# 1: depth 1 means "don't start compressing until after 1 node into the list,
-#    going from either the head or tail"
-#    So: [head]->node->node->...->node->[tail]
-#    [head], [tail] will always be uncompressed; inner nodes will compress.
-# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
-#    2 here means: don't compress head or head->next or tail->prev or tail,
-#    but compress all nodes between them.
-# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
-# etc.
-list-compress-depth 0
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happen to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries 512
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-
-# HyperLogLog sparse representation bytes limit. The limit includes the
-# 16 bytes header. When an HyperLogLog using the sparse representation crosses
-# this limit, it is converted into the dense representation.
-#
-# A value greater than 16000 is totally useless, since at that point the
-# dense representation is more memory efficient.
-#
-# The suggested value is ~ 3000 in order to have the benefits of
-# the space efficient encoding without slowing down too much PFADD,
-# which is O(N) with the sparse encoding. The value can be raised to
-# ~ 10000 when CPU is not a concern, but space is, and the data set is
-# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
-hll-sparse-max-bytes 3000
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation Redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into a hash table
-# that is rehashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# actively rehash the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply from time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing yes
-
-# The client output buffer limits can be used to force disconnection of clients
-# that are not reading data from the server fast enough for some reason (a
-# common reason is that a Pub/Sub client can't consume messages as fast as the
-# publisher can produce them).
-#
-# The limit can be set differently for the three different classes of clients:
-#
-# normal -> normal clients including MONITOR clients
-# slave  -> slave clients
-# pubsub -> clients subscribed to at least one pubsub channel or pattern
-#
-# The syntax of every client-output-buffer-limit directive is the following:
-#
-# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
-#
-# A client is immediately disconnected once the hard limit is reached, or if
-# the soft limit is reached and remains reached for the specified number of
-# seconds (continuously).
-# So for instance if the hard limit is 32 megabytes and the soft limit is
-# 16 megabytes / 10 seconds, the client will get disconnected immediately
-# if the size of the output buffers reach 32 megabytes, but will also get
-# disconnected if the client reaches 16 megabytes and continuously overcomes
-# the limit for 10 seconds.
-#
-# By default normal clients are not limited because they don't receive data
-# without asking (in a push way), but just after a request, so only
-# asynchronous clients may create a scenario where data is requested faster
-# than it can read.
-#
-# Instead there is a default limit for pubsub and slave clients, since
-# subscribers and slaves receive data in a push fashion.
-#
-# Both the hard or the soft limit can be disabled by setting them to zero.
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit slave 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-
-# Redis calls an internal function to perform many background tasks, like
-# closing connections of clients in timeout, purging expired keys that are
-# never requested, and so forth.
-#
-# Not all tasks are performed with the same frequency, but Redis checks for
-# tasks to perform according to the specified "hz" value.
-#
-# By default "hz" is set to 10. Raising the value will use more CPU when
-# Redis is idle, but at the same time will make Redis more responsive when
-# there are many keys expiring at the same time, and timeouts may be
-# handled with more precision.
-#
-# The range is between 1 and 500, however a value over 100 is usually not
-# a good idea. Most users should use the default of 10 and raise this up to
-# 100 only in environments where very low latency is required.
-hz 10
-
-# When a child rewrites the AOF file, if the following option is enabled
-# the file will be fsync-ed every 32 MB of data generated. This is useful
-# in order to commit the file to the disk more incrementally and avoid
-# big latency spikes.
-aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/.gitignore b/debian/modules/nchan/dev/redis_clusterconf/.gitignore
deleted file mode 100644
index 58c2a9d..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.rdb
diff --git a/debian/modules/nchan/dev/redis_clusterconf/cluster.sh b/debian/modules/nchan/dev/redis_clusterconf/cluster.sh
deleted file mode 100755
index d7ab5f8..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/cluster.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/zsh
-
-for (( n=7000; n<=7005; n++ ))
-do
-  redis-server ./redis-${n}.conf &
-done
-
-echo "all redis-servers in cluster started."
-
-wait
diff --git a/debian/modules/nchan/dev/redis_clusterconf/failover.sh b/debian/modules/nchan/dev/redis_clusterconf/failover.sh
deleted file mode 100755
index a2f30c8..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/failover.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/zsh
-
-PORTMIN=7000
-PORTMAX=7005
-
-slaves=()
-node_slaves=()
-
-info=$(redis-cli --raw -p $PORTMIN cluster info)
-
-if ! echo $info | ack 'cluster_state:ok' > /dev/null; then
-  echo "cluster not ready" > /dev/stderr
-  exit 1
-fi    
-
-function is_master {
-  resp=$(redis-cli --raw -p $1 eval "return redis.call('info', 'replication'):match('role:master') and 1 or 0" 0)
-  if [[ $resp == "1" ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-for (( n=$PORTMIN; n<=$PORTMAX; n++ )); do
-  if ! (is_master $n); then
-    slaves+=($n)
-    node_slaves[$n]=1
-  fi
-done
-
-for n in $slaves; do
-  echo -n "$n:"
-  while ! (is_master $n); do
-    echo -n "."
-    redis-cli -p $n CLUSTER FAILOVER > /dev/null
-    sleep 0.2
-  done;
-  echo " ok"
-done
-
-repeat="repeat"
-while [[ $repeat == "repeat" ]]; do
-  repeat=""
-  for (( n=$PORTMIN; n<=$PORTMAX; n++ )); do
-    was_slave=${node_slaves[$n]:=0}
-    is_slave=0
-    if ! (is_master $n); then
-      is_slave=1
-    fi
-    #echo "$n slave?: was $was_slave is $is_slave"
-    if [[ was_slave == is_slave ]]; then
-      repeat="repeat"
-      echo -n "."
-    fi
-  done
-done
-echo "ready"
-
-redis-cli -p 7000 cluster info
-sleep 2
-redis-cli -p 7000 cluster nodes | sort -k 2
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7000.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7000.conf
deleted file mode 100644
index a90a9e6..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-7000.conf
+++ /dev/null
@@ -1,1018 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specify
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all Redis servers but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
-# from admin or Redis Sentinel. Since Redis always uses the last processed
-# line as value of a configuration directive, you'd better put includes
-# at the beginning of this file to avoid overwriting config change at runtime.
-#
-# If instead you are interested in using includes to override configuration
-# options, it is better to use include as the last line.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-
-################################## NETWORK #####################################
-
-# By default, if no "bind" configuration directive is specified, Redis listens
-# for connections from all the network interfaces available on the server.
-# It is possible to listen to just one or multiple selected interfaces using
-# the "bind" configuration directive, followed by one or more IP addresses.
-#
-# Examples:
-#
-# bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1 ::1
-#
-# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
-# internet, binding to all the interfaces is dangerous and will expose the
-# instance to everybody on the internet. So by default we uncomment the
-# following bind directive, that will force Redis to listen only into
-# the IPv4 lookback interface address (this means Redis will be able to
-# accept connections only from clients running into the same computer it
-# is running).
-#
-# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
-# JUST COMMENT THE FOLLOWING LINE.
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1
-
-# Protected mode is a layer of security protection, in order to avoid that
-# Redis instances left open on the internet are accessed and exploited.
-#
-# When protected mode is on and if:
-#
-# 1) The server is not binding explicitly to a set of addresses using the
-#    "bind" directive.
-# 2) No password is configured.
-#
-# The server only accepts connections from clients connecting from the
-# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
-# sockets.
-#
-# By default protected mode is enabled. You should disable it only if
-# you are sure you want clients from other hosts to connect to Redis
-# even if no authentication is configured, nor a specific set of interfaces
-# are explicitly listed using the "bind" directive.
-protected-mode yes
-
-# Accept connections on the specified port, default is 6379 (IANA #815344).
-# If port 0 is specified Redis will not listen on a TCP socket.
-port 7000
-
-# TCP listen() backlog.
-#
-# In high requests-per-second environments you need an high backlog in order
-# to avoid slow clients connections issues. Note that the Linux kernel
-# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
-# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
-# in order to get the desired effect.
-tcp-backlog 511
-
-# Unix socket.
-#
-# Specify the path for the Unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-unixsocket /tmp/redis-nchan-cluster-7000.sock
-unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 0
-
-# TCP keepalive.
-#
-# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
-# of communication. This is useful for two reasons:
-#
-# 1) Detect dead peers.
-# 2) Take the connection alive from the point of view of network
-#    equipment in the middle.
-#
-# On Linux, the specified value (in seconds) is the period used to send ACKs.
-# Note that to close the connection the double of the time is needed.
-# On other kernels the period depends on the kernel configuration.
-#
-# A reasonable value for this option is 300 seconds, which is the new
-# Redis default starting with Redis 3.2.1.
-tcp-keepalive 60
-
-################################# GENERAL #####################################
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# If you run Redis from upstart or systemd, Redis can interact with your
-# supervision tree. Options:
-#   supervised no      - no supervision interaction
-#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
-#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
-#   supervised auto    - detect upstart or systemd method based on
-#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
-# Note: these supervision methods only signal "process is ready."
-#       They do not enable continuous liveness pings back to your supervisor.
-supervised no
-
-# If a pid file is specified, Redis writes it where specified at startup
-# and removes it at exit.
-#
-# When the server runs non daemonized, no pid file is created if none is
-# specified in the configuration. When the server is daemonized, the pid file
-# is used even if not specified, defaulting to "/var/run/redis.pid".
-#
-# Creating a pid file is best effort: if Redis is not able to create it
-# nothing bad happens, the server will start and run normally.
-pidfile /tmp/redis-nchan-cluster-7000.pid
-
-# Specify the server verbosity level.
-# This can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel notice
-
-# Specify the log file name. Also the empty string can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile /dev/stdout
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-# syslog-enabled no
-
-# Specify the syslog identity.
-# syslog-ident redis
-
-# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
-# syslog-facility local0
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################ SNAPSHOTTING  ################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving completely by commenting out all "save" lines.
-#
-#   It is also possible to remove all the previously configured save
-#   points by adding a save directive with a single empty string argument
-#   like in the following example:
-#
-#   save ""
-
-#save 900 1
-#save 300 10
-#save 60 10000
-
-# By default Redis will stop accepting writes if RDB snapshots are enabled
-# (at least one save point) and the latest background save failed.
-# This will make the user aware (in a hard way) that data is not persisting
-# on disk properly, otherwise chances are that no one will notice and some
-# disaster will happen.
-#
-# If the background saving process will start working again Redis will
-# automatically allow writes again.
-#
-# However if you have setup your proper monitoring of the Redis server
-# and persistence, you may want to disable this feature so that Redis will
-# continue to work as usual even if there are problems with disk,
-# permissions, and so forth.
-stop-writes-on-bgsave-error yes
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression yes
-
-# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
-# This makes the format more resistant to corruption but there is a performance
-# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
-# for maximum performances.
-#
-# RDB files created with checksum disabled have a checksum of zero that will
-# tell the loading code to skip the check.
-rdbchecksum yes
-
-# The filename where to dump the DB
-dbfilename dump-7000.rdb
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# The Append Only File will also be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir ./
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. A few things to understand ASAP about Redis replication.
-#
-# 1) Redis replication is asynchronous, but you can configure a master to
-#    stop accepting writes if it appears to be not connected with at least
-#    a given number of slaves.
-# 2) Redis slaves are able to perform a partial resynchronization with the
-#    master if the replication link is lost for a relatively small amount of
-#    time. You may want to configure the replication backlog size (see the next
-#    sections of this file) with a sensible value depending on your needs.
-# 3) Replication is automatic and does not need user intervention. After a
-#    network partition slaves automatically try to reconnect to masters
-#    and resynchronize with them.
-#
-# slaveof <masterip> <masterport>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-
-# When a slave loses its connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of date data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data yes
-
-# You can configure a slave instance to accept writes or not. Writing against
-# a slave instance may be useful to store some ephemeral data (because data
-# written on a slave will be easily deleted after resync with the master) but
-# may also cause problems if clients are writing to it because of a
-# misconfiguration.
-#
-# Since Redis 2.6 by default slaves are read-only.
-#
-# Note: read only slaves are not designed to be exposed to untrusted clients
-# on the internet. It's just a protection layer against misuse of the instance.
-# Still a read only slave exports by default all the administrative commands
-# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
-# security of read only slaves using 'rename-command' to shadow all the
-# administrative / dangerous commands.
-slave-read-only no
-
-# Replication SYNC strategy: disk or socket.
-#
-# -------------------------------------------------------
-# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
-# -------------------------------------------------------
-#
-# New slaves and reconnecting slaves that are not able to continue the replication
-# process just receiving differences, need to do what is called a "full
-# synchronization". An RDB file is transmitted from the master to the slaves.
-# The transmission can happen in two different ways:
-#
-# 1) Disk-backed: The Redis master creates a new process that writes the RDB
-#                 file on disk. Later the file is transferred by the parent
-#                 process to the slaves incrementally.
-# 2) Diskless: The Redis master creates a new process that directly writes the
-#              RDB file to slave sockets, without touching the disk at all.
-#
-# With disk-backed replication, while the RDB file is generated, more slaves
-# can be queued and served with the RDB file as soon as the current child producing
-# the RDB file finishes its work. With diskless replication instead once
-# the transfer starts, new slaves arriving will be queued and a new transfer
-# will start when the current one terminates.
-#
-# When diskless replication is used, the master waits a configurable amount of
-# time (in seconds) before starting the transfer in the hope that multiple slaves
-# will arrive and the transfer can be parallelized.
-#
-# With slow disks and fast (large bandwidth) networks, diskless replication
-# works better.
-repl-diskless-sync no
-
-# When diskless replication is enabled, it is possible to configure the delay
-# the server waits in order to spawn the child that transfers the RDB via socket
-# to the slaves.
-#
-# This is important since once the transfer starts, it is not possible to serve
-# new slaves arriving, that will be queued for the next RDB transfer, so the server
-# waits a delay in order to let more slaves arrive.
-#
-# The delay is specified in seconds, and by default is 5 seconds. To disable
-# it entirely just set it to 0 seconds and the transfer will start ASAP.
-repl-diskless-sync-delay 5
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-
-# The following option sets the replication timeout for:
-#
-# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
-# 2) Master timeout from the point of view of slaves (data, pings).
-# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-
-# Disable TCP_NODELAY on the slave socket after SYNC?
-#
-# If you select "yes" Redis will use a smaller number of TCP packets and
-# less bandwidth to send data to slaves. But this can add a delay for
-# the data to appear on the slave side, up to 40 milliseconds with
-# Linux kernels using a default configuration.
-#
-# If you select "no" the delay for data to appear on the slave side will
-# be reduced but more bandwidth will be used for replication.
-#
-# By default we optimize for low latency, but in very high traffic conditions
-# or when the master and slaves are many hops away, turning this to "yes" may
-# be a good idea.
-repl-disable-tcp-nodelay no
-
-# Set the replication backlog size. The backlog is a buffer that accumulates
-# slave data when slaves are disconnected for some time, so that when a slave
-# wants to reconnect again, often a full resync is not needed, but a partial
-# resync is enough, just passing the portion of data the slave missed while
-# disconnected.
-#
-# The bigger the replication backlog, the longer the time the slave can be
-# disconnected and later be able to perform a partial resynchronization.
-#
-# The backlog is only allocated once there is at least a slave connected.
-#
-# repl-backlog-size 1mb
-
-# After a master has no longer connected slaves for some time, the backlog
-# will be freed. The following option configures the amount of seconds that
-# need to elapse, starting from the time the last slave disconnected, for
-# the backlog buffer to be freed.
-#
-# A value of 0 means to never release the backlog.
-#
-# repl-backlog-ttl 3600
-
-# The slave priority is an integer number published by Redis in the INFO output.
-# It is used by Redis Sentinel in order to select a slave to promote into a
-# master if the master is no longer working correctly.
-#
-# A slave with a low priority number is considered better for promotion, so
-# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
-# pick the one with priority 10, that is the lowest.
-#
-# However a special priority of 0 marks the slave as not able to perform the
-# role of master, so a slave with priority of 0 will never be selected by
-# Redis Sentinel for promotion.
-#
-# By default the priority is 100.
-slave-priority 100
-
-# It is possible for a master to stop accepting writes if there are less than
-# N slaves connected, having a lag less or equal than M seconds.
-#
-# The N slaves need to be in "online" state.
-#
-# The lag in seconds, that must be <= the specified value, is calculated from
-# the last ping received from the slave, that is usually sent every second.
-#
-# This option does not GUARANTEE that N replicas will accept the write, but
-# will limit the window of exposure for lost writes in case not enough slaves
-# are available, to the specified number of seconds.
-#
-# For example to require at least 3 slaves with a lag <= 10 seconds use:
-#
-# min-slaves-to-write 3
-# min-slaves-max-lag 10
-#
-# Setting one or the other to 0 disables the feature.
-#
-# By default min-slaves-to-write is set to 0 (feature disabled) and
-# min-slaves-max-lag is set to 10.
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-# requirepass foobared
-
-# Command renaming.
-#
-# It is possible to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# hard to guess so that it will still be available for internal-use tools
-# but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possible to completely kill a command by renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-#
-# Please note that changing the name of commands that are logged into the
-# AOF file or transmitted to slaves may cause problems.
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default
-# this limit is set to 10000 clients, however if the Redis server is not
-# able to configure the process file limit to allow for the specified limit
-# the max number of allowed clients is set to the current file limit
-# minus 32 (as Redis reserves a few file descriptors for internal uses).
-#
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 10000
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# according to the eviction policy selected (see maxmemory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# a hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached. You can select among five behaviors:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key according to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys-random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with any of the above policies, Redis will return an error on write
-#       operations, when there are no suitable keys for eviction.
-#
-#       At the date of writing these commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy noeviction
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can tune it for speed or
-# accuracy. For default Redis will check five keys and pick the one that was
-# used less recently, you can change the sample size using the following
-# configuration directive.
-#
-# The default of 5 produces good enough results. 10 Approximates very closely
-# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
-#
-# maxmemory-samples 5
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. This mode is
-# good enough in many applications, but an issue with the Redis process or
-# a power outage may result into a few minutes of writes lost (depending on
-# the configured save points).
-#
-# The Append Only File is an alternative persistence mode that provides
-# much better durability. For instance using the default data fsync policy
-# (see later in the config file) Redis can lose just one second of writes in a
-# dramatic event like a server power outage, or a single write if something
-# wrong with the Redis process itself happens, but the operating system is
-# still running correctly.
-#
-# AOF and RDB persistence can be enabled at the same time without problems.
-# If the AOF is enabled on startup Redis will load the AOF, that is the file
-# with the better durability guarantees.
-#
-# Please check http://redis.io/topics/persistence for more information.
-
-appendonly no
-
-# The name of the append only file (default: "appendonly.aof")
-
-appendfilename "appendonly.aof"
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead of waiting for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log. Slow, Safest.
-# everysec: fsync only one time every second. Compromise.
-#
-# The default is "everysec", as that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# More details please check the following article:
-# http://antirez.com/post/redis-persistence-demystified.html
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-# appendfsync everysec
-appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving, the durability of Redis is
-# the same as "appendfsync none". In practical terms, this means that it is
-# possible to lose up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-
-no-appendfsync-on-rewrite no
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size grows by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (if no rewrite has happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a percentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-
-# An AOF file may be found to be truncated at the end during the Redis
-# startup process, when the AOF data gets loaded back into memory.
-# This may happen when the system where Redis is running
-# crashes, especially when an ext4 filesystem is mounted without the
-# data=ordered option (however this can't happen when Redis itself
-# crashes or aborts but the operating system still works correctly).
-#
-# Redis can either exit with an error when this happens, or load as much
-# data as possible (the default now) and start if the AOF file is found
-# to be truncated at the end. The following option controls this behavior.
-#
-# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
-# the Redis server starts emitting a log to inform the user of the event.
-# Otherwise if the option is set to no, the server aborts with an error
-# and refuses to start. When the option is set to no, the user requires
-# to fix the AOF file using the "redis-check-aof" utility before to restart
-# the server.
-#
-# Note that if the AOF file will be found to be corrupted in the middle
-# the server will still exit with an error. This option only applies when
-# Redis will try to read more data from the AOF file but not enough bytes
-# will be found.
-aof-load-truncated yes
-
-################################ LUA SCRIPTING  ###############################
-
-# Max execution time of a Lua script in milliseconds.
-#
-# If the maximum execution time is reached Redis will log that a script is
-# still in execution after the maximum allowed time and will start to
-# reply to queries with an error.
-#
-# When a long running script exceeds the maximum execution time only the
-# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
-# used to stop a script that did not yet called write commands. The second
-# is the only way to shut down the server in the case a write command was
-# already issued by the script but the user doesn't want to wait for the natural
-# termination of the script.
-#
-# Set it to 0 or a negative value for unlimited execution without warnings.
-lua-time-limit 5000
-
-################################ REDIS CLUSTER  ###############################
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
-# in order to mark it as "mature" we need to wait for a non trivial percentage
-# of users to deploy it in production.
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
-# started as cluster nodes can. In order to start a Redis instance as a
-# cluster node enable the cluster support uncommenting the following:
-#
-cluster-enabled yes
-
-# Every cluster node has a cluster configuration file. This file is not
-# intended to be edited by hand. It is created and updated by Redis nodes.
-# Every Redis Cluster node requires a different cluster configuration file.
-# Make sure that instances running in the same system do not have
-# overlapping cluster configuration file names.
-#
-cluster-config-file redis-cluster-node-7000.conf
-
-# Cluster node timeout is the amount of milliseconds a node must be unreachable
-# for it to be considered in failure state.
-# Most other internal time limits are multiple of the node timeout.
-#
-# cluster-node-timeout 15000
-
-# A slave of a failing master will avoid to start a failover if its data
-# looks too old.
-#
-# There is no simple way for a slave to actually have a exact measure of
-# its "data age", so the following two checks are performed:
-#
-# 1) If there are multiple slaves able to failover, they exchange messages
-#    in order to try to give an advantage to the slave with the best
-#    replication offset (more data from the master processed).
-#    Slaves will try to get their rank by offset, and apply to the start
-#    of the failover a delay proportional to their rank.
-#
-# 2) Every single slave computes the time of the last interaction with
-#    its master. This can be the last ping or command received (if the master
-#    is still in the "connected" state), or the time that elapsed since the
-#    disconnection with the master (if the replication link is currently down).
-#    If the last interaction is too old, the slave will not try to failover
-#    at all.
-#
-# The point "2" can be tuned by user. Specifically a slave will not perform
-# the failover if, since the last interaction with the master, the time
-# elapsed is greater than:
-#
-#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
-#
-# So for example if node-timeout is 30 seconds, and the slave-validity-factor
-# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
-# slave will not try to failover if it was not able to talk with the master
-# for longer than 310 seconds.
-#
-# A large slave-validity-factor may allow slaves with too old data to failover
-# a master, while a too small value may prevent the cluster from being able to
-# elect a slave at all.
-#
-# For maximum availability, it is possible to set the slave-validity-factor
-# to a value of 0, which means, that slaves will always try to failover the
-# master regardless of the last time they interacted with the master.
-# (However they'll always try to apply a delay proportional to their
-# offset rank).
-#
-# Zero is the only value able to guarantee that when all the partitions heal
-# the cluster will always be able to continue.
-#
-# cluster-slave-validity-factor 10
-
-# Cluster slaves are able to migrate to orphaned masters, that are masters
-# that are left without working slaves. This improves the cluster ability
-# to resist to failures as otherwise an orphaned master can't be failed over
-# in case of failure if it has no working slaves.
-#
-# Slaves migrate to orphaned masters only if there are still at least a
-# given number of other working slaves for their old master. This number
-# is the "migration barrier". A migration barrier of 1 means that a slave
-# will migrate only if there is at least 1 other working slave for its master
-# and so forth. It usually reflects the number of slaves you want for every
-# master in your cluster.
-#
-# Default is 1 (slaves migrate only if their masters remain with at least
-# one slave). To disable migration just set it to a very large value.
-# A value of 0 can be set but is useful only for debugging and dangerous
-# in production.
-#
-# cluster-migration-barrier 1
-
-# By default Redis Cluster nodes stop accepting queries if they detect there
-# is at least an hash slot uncovered (no available node is serving it).
-# This way if the cluster is partially down (for example a range of hash slots
-# are no longer covered) all the cluster becomes, eventually, unavailable.
-# It automatically returns available as soon as all the slots are covered again.
-#
-# However sometimes you want the subset of the cluster which is working,
-# to continue to accept queries for the part of the key space that is still
-# covered. In order to do so, just set the cluster-require-full-coverage
-# option to no.
-#
-# cluster-require-full-coverage yes
-
-# In order to setup your cluster make sure to read the documentation
-# available at http://redis.io web site.
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than 10000
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 128
-
-################################ LATENCY MONITOR ##############################
-
-# The Redis latency monitoring subsystem samples different operations
-# at runtime in order to collect data related to possible sources of
-# latency of a Redis instance.
-#
-# Via the LATENCY command this information is available to the user that can
-# print graphs and obtain reports.
-#
-# The system only logs operations that were performed in a time equal or
-# greater than the amount of milliseconds specified via the
-# latency-monitor-threshold configuration directive. When its value is set
-# to zero, the latency monitor is turned off.
-#
-# By default latency monitoring is disabled since it is mostly not needed
-# if you don't have latency issues, and collecting data has a performance
-# impact, that while very small, can be measured under big load. Latency
-# monitoring can easily be enabled at runtime using the command
-# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
-latency-monitor-threshold 0
-
-############################# EVENT NOTIFICATION ##############################
-
-# Redis can notify Pub/Sub clients about events happening in the key space.
-# This feature is documented at http://redis.io/topics/notifications
-#
-# For instance if keyspace events notification is enabled, and a client
-# performs a DEL operation on key "foo" stored in the Database 0, two
-# messages will be published via Pub/Sub:
-#
-# PUBLISH __keyspace@0__:foo del
-# PUBLISH __keyevent@0__:del foo
-#
-# It is possible to select the events that Redis will notify among a set
-# of classes. Every class is identified by a single character:
-#
-#  K     Keyspace events, published with __keyspace@<db>__ prefix.
-#  E     Keyevent events, published with __keyevent@<db>__ prefix.
-#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
-#  $     String commands
-#  l     List commands
-#  s     Set commands
-#  h     Hash commands
-#  z     Sorted set commands
-#  x     Expired events (events generated every time a key expires)
-#  e     Evicted events (events generated when a key is evicted for maxmemory)
-#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
-#
-#  The "notify-keyspace-events" takes as argument a string that is composed
-#  by zero or multiple characters. The empty string means that notifications
-#  are disabled at all.
-#
-#  Example: to enable list and generic events, from the point of view of the
-#           event name, use:
-#
-#  notify-keyspace-events Elg
-#
-#  Example 2: to get the stream of the expired keys subscribing to channel
-#             name __keyevent@0__:expired use:
-#
-#  notify-keyspace-events Ex
-#
-#  By default all notifications are disabled because most users don't need
-#  this feature and the feature has some overhead. Note that if you don't
-#  specify at least one of K or E, no events will be delivered.
-notify-keyspace-events ""
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded using a memory efficient data structure when they have a
-# small number of entries, and the biggest entry does not exceed a given
-# threshold. These thresholds can be configured using the following directives.
-hash-max-ziplist-entries 512
-hash-max-ziplist-value 64
-
-# Lists are also encoded in a special way to save a lot of space.
-# The number of entries allowed per internal list node can be specified
-# as a fixed maximum size or a maximum number of elements.
-# For a fixed maximum size, use -5 through -1, meaning:
-# -5: max size: 64 Kb  <-- not recommended for normal workloads
-# -4: max size: 32 Kb  <-- not recommended
-# -3: max size: 16 Kb  <-- probably not recommended
-# -2: max size: 8 Kb   <-- good
-# -1: max size: 4 Kb   <-- good
-# Positive numbers mean store up to _exactly_ that number of elements
-# per list node.
-# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
-# but if your use case is unique, adjust the settings as necessary.
-list-max-ziplist-size -2
-
-# Lists may also be compressed.
-# Compress depth is the number of quicklist ziplist nodes from *each* side of
-# the list to *exclude* from compression.  The head and tail of the list
-# are always uncompressed for fast push/pop operations.  Settings are:
-# 0: disable all list compression
-# 1: depth 1 means "don't start compressing until after 1 node into the list,
-#    going from either the head or tail"
-#    So: [head]->node->node->...->node->[tail]
-#    [head], [tail] will always be uncompressed; inner nodes will compress.
-# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
-#    2 here means: don't compress head or head->next or tail->prev or tail,
-#    but compress all nodes between them.
-# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
-# etc.
-list-compress-depth 0
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happen to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries 512
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-
-# HyperLogLog sparse representation bytes limit. The limit includes the
-# 16 bytes header. When an HyperLogLog using the sparse representation crosses
-# this limit, it is converted into the dense representation.
-#
-# A value greater than 16000 is totally useless, since at that point the
-# dense representation is more memory efficient.
-#
-# The suggested value is ~ 3000 in order to have the benefits of
-# the space efficient encoding without slowing down too much PFADD,
-# which is O(N) with the sparse encoding. The value can be raised to
-# ~ 10000 when CPU is not a concern, but space is, and the data set is
-# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
-hll-sparse-max-bytes 3000
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation Redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into a hash table
-# that is rehashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# actively rehash the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply from time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing yes
-
-# The client output buffer limits can be used to force disconnection of clients
-# that are not reading data from the server fast enough for some reason (a
-# common reason is that a Pub/Sub client can't consume messages as fast as the
-# publisher can produce them).
-#
-# The limit can be set differently for the three different classes of clients:
-#
-# normal -> normal clients including MONITOR clients
-# slave  -> slave clients
-# pubsub -> clients subscribed to at least one pubsub channel or pattern
-#
-# The syntax of every client-output-buffer-limit directive is the following:
-#
-# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
-#
-# A client is immediately disconnected once the hard limit is reached, or if
-# the soft limit is reached and remains reached for the specified number of
-# seconds (continuously).
-# So for instance if the hard limit is 32 megabytes and the soft limit is
-# 16 megabytes / 10 seconds, the client will get disconnected immediately
-# if the size of the output buffers reach 32 megabytes, but will also get
-# disconnected if the client reaches 16 megabytes and continuously overcomes
-# the limit for 10 seconds.
-#
-# By default normal clients are not limited because they don't receive data
-# without asking (in a push way), but just after a request, so only
-# asynchronous clients may create a scenario where data is requested faster
-# than it can read.
-#
-# Instead there is a default limit for pubsub and slave clients, since
-# subscribers and slaves receive data in a push fashion.
-#
-# Both the hard or the soft limit can be disabled by setting them to zero.
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit slave 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-
-# Redis calls an internal function to perform many background tasks, like
-# closing connections of clients in timeout, purging expired keys that are
-# never requested, and so forth.
-#
-# Not all tasks are performed with the same frequency, but Redis checks for
-# tasks to perform according to the specified "hz" value.
-#
-# By default "hz" is set to 10. Raising the value will use more CPU when
-# Redis is idle, but at the same time will make Redis more responsive when
-# there are many keys expiring at the same time, and timeouts may be
-# handled with more precision.
-#
-# The range is between 1 and 500, however a value over 100 is usually not
-# a good idea. Most users should use the default of 10 and raise this up to
-# 100 only in environments where very low latency is required.
-hz 10
-
-# When a child rewrites the AOF file, if the following option is enabled
-# the file will be fsync-ed every 32 MB of data generated. This is useful
-# in order to commit the file to the disk more incrementally and avoid
-# big latency spikes.
-aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7001.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7001.conf
deleted file mode 100644
index 348a88c..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-7001.conf
+++ /dev/null
@@ -1,1018 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specify
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all Redis servers but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
-# from admin or Redis Sentinel. Since Redis always uses the last processed
-# line as value of a configuration directive, you'd better put includes
-# at the beginning of this file to avoid overwriting config change at runtime.
-#
-# If instead you are interested in using includes to override configuration
-# options, it is better to use include as the last line.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-
-################################## NETWORK #####################################
-
-# By default, if no "bind" configuration directive is specified, Redis listens
-# for connections from all the network interfaces available on the server.
-# It is possible to listen to just one or multiple selected interfaces using
-# the "bind" configuration directive, followed by one or more IP addresses.
-#
-# Examples:
-#
-# bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1 ::1
-#
-# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
-# internet, binding to all the interfaces is dangerous and will expose the
-# instance to everybody on the internet. So by default we uncomment the
-# following bind directive, that will force Redis to listen only into
-# the IPv4 lookback interface address (this means Redis will be able to
-# accept connections only from clients running into the same computer it
-# is running).
-#
-# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
-# JUST COMMENT THE FOLLOWING LINE.
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1
-
-# Protected mode is a layer of security protection, in order to avoid that
-# Redis instances left open on the internet are accessed and exploited.
-#
-# When protected mode is on and if:
-#
-# 1) The server is not binding explicitly to a set of addresses using the
-#    "bind" directive.
-# 2) No password is configured.
-#
-# The server only accepts connections from clients connecting from the
-# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
-# sockets.
-#
-# By default protected mode is enabled. You should disable it only if
-# you are sure you want clients from other hosts to connect to Redis
-# even if no authentication is configured, nor a specific set of interfaces
-# are explicitly listed using the "bind" directive.
-protected-mode yes
-
-# Accept connections on the specified port, default is 6379 (IANA #815344).
-# If port 0 is specified Redis will not listen on a TCP socket.
-port 7001
-
-# TCP listen() backlog.
-#
-# In high requests-per-second environments you need an high backlog in order
-# to avoid slow clients connections issues. Note that the Linux kernel
-# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
-# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
-# in order to get the desired effect.
-tcp-backlog 511
-
-# Unix socket.
-#
-# Specify the path for the Unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-unixsocket /tmp/redis-nchan-cluster-7001.sock
-unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 0
-
-# TCP keepalive.
-#
-# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
-# of communication. This is useful for two reasons:
-#
-# 1) Detect dead peers.
-# 2) Take the connection alive from the point of view of network
-#    equipment in the middle.
-#
-# On Linux, the specified value (in seconds) is the period used to send ACKs.
-# Note that to close the connection the double of the time is needed.
-# On other kernels the period depends on the kernel configuration.
-#
-# A reasonable value for this option is 300 seconds, which is the new
-# Redis default starting with Redis 3.2.1.
-tcp-keepalive 60
-
-################################# GENERAL #####################################
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# If you run Redis from upstart or systemd, Redis can interact with your
-# supervision tree. Options:
-#   supervised no      - no supervision interaction
-#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
-#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
-#   supervised auto    - detect upstart or systemd method based on
-#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
-# Note: these supervision methods only signal "process is ready."
-#       They do not enable continuous liveness pings back to your supervisor.
-supervised no
-
-# If a pid file is specified, Redis writes it where specified at startup
-# and removes it at exit.
-#
-# When the server runs non daemonized, no pid file is created if none is
-# specified in the configuration. When the server is daemonized, the pid file
-# is used even if not specified, defaulting to "/var/run/redis.pid".
-#
-# Creating a pid file is best effort: if Redis is not able to create it
-# nothing bad happens, the server will start and run normally.
-pidfile /tmp/redis-nchan-cluster-7001.pid
-
-# Specify the server verbosity level.
-# This can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel notice
-
-# Specify the log file name. Also the empty string can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile /dev/stdout
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-# syslog-enabled no
-
-# Specify the syslog identity.
-# syslog-ident redis
-
-# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
-# syslog-facility local0
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################ SNAPSHOTTING  ################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving completely by commenting out all "save" lines.
-#
-#   It is also possible to remove all the previously configured save
-#   points by adding a save directive with a single empty string argument
-#   like in the following example:
-#
-#   save ""
-
-#save 900 1
-#save 300 10
-#save 60 10000
-
-# By default Redis will stop accepting writes if RDB snapshots are enabled
-# (at least one save point) and the latest background save failed.
-# This will make the user aware (in a hard way) that data is not persisting
-# on disk properly, otherwise chances are that no one will notice and some
-# disaster will happen.
-#
-# If the background saving process will start working again Redis will
-# automatically allow writes again.
-#
-# However if you have setup your proper monitoring of the Redis server
-# and persistence, you may want to disable this feature so that Redis will
-# continue to work as usual even if there are problems with disk,
-# permissions, and so forth.
-stop-writes-on-bgsave-error yes
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression yes
-
-# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
-# This makes the format more resistant to corruption but there is a performance
-# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
-# for maximum performances.
-#
-# RDB files created with checksum disabled have a checksum of zero that will
-# tell the loading code to skip the check.
-rdbchecksum yes
-
-# The filename where to dump the DB
-dbfilename dump-7001.rdb
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# The Append Only File will also be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir ./
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. A few things to understand ASAP about Redis replication.
-#
-# 1) Redis replication is asynchronous, but you can configure a master to
-#    stop accepting writes if it appears to be not connected with at least
-#    a given number of slaves.
-# 2) Redis slaves are able to perform a partial resynchronization with the
-#    master if the replication link is lost for a relatively small amount of
-#    time. You may want to configure the replication backlog size (see the next
-#    sections of this file) with a sensible value depending on your needs.
-# 3) Replication is automatic and does not need user intervention. After a
-#    network partition slaves automatically try to reconnect to masters
-#    and resynchronize with them.
-#
-# slaveof <masterip> <masterport>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-
-# When a slave loses its connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of date data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data yes
-
-# You can configure a slave instance to accept writes or not. Writing against
-# a slave instance may be useful to store some ephemeral data (because data
-# written on a slave will be easily deleted after resync with the master) but
-# may also cause problems if clients are writing to it because of a
-# misconfiguration.
-#
-# Since Redis 2.6 by default slaves are read-only.
-#
-# Note: read only slaves are not designed to be exposed to untrusted clients
-# on the internet. It's just a protection layer against misuse of the instance.
-# Still a read only slave exports by default all the administrative commands
-# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
-# security of read only slaves using 'rename-command' to shadow all the
-# administrative / dangerous commands.
-slave-read-only no
-
-# Replication SYNC strategy: disk or socket.
-#
-# -------------------------------------------------------
-# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
-# -------------------------------------------------------
-#
-# New slaves and reconnecting slaves that are not able to continue the replication
-# process just receiving differences, need to do what is called a "full
-# synchronization". An RDB file is transmitted from the master to the slaves.
-# The transmission can happen in two different ways:
-#
-# 1) Disk-backed: The Redis master creates a new process that writes the RDB
-#                 file on disk. Later the file is transferred by the parent
-#                 process to the slaves incrementally.
-# 2) Diskless: The Redis master creates a new process that directly writes the
-#              RDB file to slave sockets, without touching the disk at all.
-#
-# With disk-backed replication, while the RDB file is generated, more slaves
-# can be queued and served with the RDB file as soon as the current child producing
-# the RDB file finishes its work. With diskless replication instead once
-# the transfer starts, new slaves arriving will be queued and a new transfer
-# will start when the current one terminates.
-#
-# When diskless replication is used, the master waits a configurable amount of
-# time (in seconds) before starting the transfer in the hope that multiple slaves
-# will arrive and the transfer can be parallelized.
-#
-# With slow disks and fast (large bandwidth) networks, diskless replication
-# works better.
-repl-diskless-sync no
-
-# When diskless replication is enabled, it is possible to configure the delay
-# the server waits in order to spawn the child that transfers the RDB via socket
-# to the slaves.
-#
-# This is important since once the transfer starts, it is not possible to serve
-# new slaves arriving, that will be queued for the next RDB transfer, so the server
-# waits a delay in order to let more slaves arrive.
-#
-# The delay is specified in seconds, and by default is 5 seconds. To disable
-# it entirely just set it to 0 seconds and the transfer will start ASAP.
-repl-diskless-sync-delay 5
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-
-# The following option sets the replication timeout for:
-#
-# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
-# 2) Master timeout from the point of view of slaves (data, pings).
-# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-
-# Disable TCP_NODELAY on the slave socket after SYNC?
-#
-# If you select "yes" Redis will use a smaller number of TCP packets and
-# less bandwidth to send data to slaves. But this can add a delay for
-# the data to appear on the slave side, up to 40 milliseconds with
-# Linux kernels using a default configuration.
-#
-# If you select "no" the delay for data to appear on the slave side will
-# be reduced but more bandwidth will be used for replication.
-#
-# By default we optimize for low latency, but in very high traffic conditions
-# or when the master and slaves are many hops away, turning this to "yes" may
-# be a good idea.
-repl-disable-tcp-nodelay no
-
-# Set the replication backlog size. The backlog is a buffer that accumulates
-# slave data when slaves are disconnected for some time, so that when a slave
-# wants to reconnect again, often a full resync is not needed, but a partial
-# resync is enough, just passing the portion of data the slave missed while
-# disconnected.
-#
-# The bigger the replication backlog, the longer the time the slave can be
-# disconnected and later be able to perform a partial resynchronization.
-#
-# The backlog is only allocated once there is at least a slave connected.
-#
-# repl-backlog-size 1mb
-
-# After a master has no longer connected slaves for some time, the backlog
-# will be freed. The following option configures the amount of seconds that
-# need to elapse, starting from the time the last slave disconnected, for
-# the backlog buffer to be freed.
-#
-# A value of 0 means to never release the backlog.
-#
-# repl-backlog-ttl 3600
-
-# The slave priority is an integer number published by Redis in the INFO output.
-# It is used by Redis Sentinel in order to select a slave to promote into a
-# master if the master is no longer working correctly.
-#
-# A slave with a low priority number is considered better for promotion, so
-# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
-# pick the one with priority 10, that is the lowest.
-#
-# However a special priority of 0 marks the slave as not able to perform the
-# role of master, so a slave with priority of 0 will never be selected by
-# Redis Sentinel for promotion.
-#
-# By default the priority is 100.
-slave-priority 100
-
-# It is possible for a master to stop accepting writes if there are less than
-# N slaves connected, having a lag less or equal than M seconds.
-#
-# The N slaves need to be in "online" state.
-#
-# The lag in seconds, that must be <= the specified value, is calculated from
-# the last ping received from the slave, that is usually sent every second.
-#
-# This option does not GUARANTEE that N replicas will accept the write, but
-# will limit the window of exposure for lost writes in case not enough slaves
-# are available, to the specified number of seconds.
-#
-# For example to require at least 3 slaves with a lag <= 10 seconds use:
-#
-# min-slaves-to-write 3
-# min-slaves-max-lag 10
-#
-# Setting one or the other to 0 disables the feature.
-#
-# By default min-slaves-to-write is set to 0 (feature disabled) and
-# min-slaves-max-lag is set to 10.
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-# requirepass foobared
-
-# Command renaming.
-#
-# It is possible to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# hard to guess so that it will still be available for internal-use tools
-# but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possible to completely kill a command by renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-#
-# Please note that changing the name of commands that are logged into the
-# AOF file or transmitted to slaves may cause problems.
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default
-# this limit is set to 10000 clients, however if the Redis server is not
-# able to configure the process file limit to allow for the specified limit
-# the max number of allowed clients is set to the current file limit
-# minus 32 (as Redis reserves a few file descriptors for internal uses).
-#
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 10000
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# according to the eviction policy selected (see maxmemory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# a hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached. You can select among five behaviors:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key according to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys-random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with any of the above policies, Redis will return an error on write
-#       operations, when there are no suitable keys for eviction.
-#
-#       At the date of writing these commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy noeviction
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can tune it for speed or
-# accuracy. For default Redis will check five keys and pick the one that was
-# used less recently, you can change the sample size using the following
-# configuration directive.
-#
-# The default of 5 produces good enough results. 10 Approximates very closely
-# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
-#
-# maxmemory-samples 5
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. This mode is
-# good enough in many applications, but an issue with the Redis process or
-# a power outage may result into a few minutes of writes lost (depending on
-# the configured save points).
-#
-# The Append Only File is an alternative persistence mode that provides
-# much better durability. For instance using the default data fsync policy
-# (see later in the config file) Redis can lose just one second of writes in a
-# dramatic event like a server power outage, or a single write if something
-# wrong with the Redis process itself happens, but the operating system is
-# still running correctly.
-#
-# AOF and RDB persistence can be enabled at the same time without problems.
-# If the AOF is enabled on startup Redis will load the AOF, that is the file
-# with the better durability guarantees.
-#
-# Please check http://redis.io/topics/persistence for more information.
-
-appendonly no
-
-# The name of the append only file (default: "appendonly.aof")
-
-appendfilename "appendonly.aof"
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead of waiting for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log. Slow, Safest.
-# everysec: fsync only one time every second. Compromise.
-#
-# The default is "everysec", as that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# More details please check the following article:
-# http://antirez.com/post/redis-persistence-demystified.html
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-# appendfsync everysec
-appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving, the durability of Redis is
-# the same as "appendfsync none". In practical terms, this means that it is
-# possible to lose up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-
-no-appendfsync-on-rewrite no
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size grows by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (if no rewrite has happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a percentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-
-# An AOF file may be found to be truncated at the end during the Redis
-# startup process, when the AOF data gets loaded back into memory.
-# This may happen when the system where Redis is running
-# crashes, especially when an ext4 filesystem is mounted without the
-# data=ordered option (however this can't happen when Redis itself
-# crashes or aborts but the operating system still works correctly).
-#
-# Redis can either exit with an error when this happens, or load as much
-# data as possible (the default now) and start if the AOF file is found
-# to be truncated at the end. The following option controls this behavior.
-#
-# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
-# the Redis server starts emitting a log to inform the user of the event.
-# Otherwise if the option is set to no, the server aborts with an error
-# and refuses to start. When the option is set to no, the user requires
-# to fix the AOF file using the "redis-check-aof" utility before to restart
-# the server.
-#
-# Note that if the AOF file will be found to be corrupted in the middle
-# the server will still exit with an error. This option only applies when
-# Redis will try to read more data from the AOF file but not enough bytes
-# will be found.
-aof-load-truncated yes
-
-################################ LUA SCRIPTING  ###############################
-
-# Max execution time of a Lua script in milliseconds.
-#
-# If the maximum execution time is reached Redis will log that a script is
-# still in execution after the maximum allowed time and will start to
-# reply to queries with an error.
-#
-# When a long running script exceeds the maximum execution time only the
-# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
-# used to stop a script that did not yet called write commands. The second
-# is the only way to shut down the server in the case a write command was
-# already issued by the script but the user doesn't want to wait for the natural
-# termination of the script.
-#
-# Set it to 0 or a negative value for unlimited execution without warnings.
-lua-time-limit 5000
-
-################################ REDIS CLUSTER  ###############################
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
-# in order to mark it as "mature" we need to wait for a non trivial percentage
-# of users to deploy it in production.
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
-# started as cluster nodes can. In order to start a Redis instance as a
-# cluster node enable the cluster support uncommenting the following:
-#
-cluster-enabled yes
-
-# Every cluster node has a cluster configuration file. This file is not
-# intended to be edited by hand. It is created and updated by Redis nodes.
-# Every Redis Cluster node requires a different cluster configuration file.
-# Make sure that instances running in the same system do not have
-# overlapping cluster configuration file names.
-#
-cluster-config-file redis-cluster-node-7001.conf
-
-# Cluster node timeout is the amount of milliseconds a node must be unreachable
-# for it to be considered in failure state.
-# Most other internal time limits are multiple of the node timeout.
-#
-# cluster-node-timeout 15000
-
-# A slave of a failing master will avoid to start a failover if its data
-# looks too old.
-#
-# There is no simple way for a slave to actually have a exact measure of
-# its "data age", so the following two checks are performed:
-#
-# 1) If there are multiple slaves able to failover, they exchange messages
-#    in order to try to give an advantage to the slave with the best
-#    replication offset (more data from the master processed).
-#    Slaves will try to get their rank by offset, and apply to the start
-#    of the failover a delay proportional to their rank.
-#
-# 2) Every single slave computes the time of the last interaction with
-#    its master. This can be the last ping or command received (if the master
-#    is still in the "connected" state), or the time that elapsed since the
-#    disconnection with the master (if the replication link is currently down).
-#    If the last interaction is too old, the slave will not try to failover
-#    at all.
-#
-# The point "2" can be tuned by user. Specifically a slave will not perform
-# the failover if, since the last interaction with the master, the time
-# elapsed is greater than:
-#
-#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
-#
-# So for example if node-timeout is 30 seconds, and the slave-validity-factor
-# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
-# slave will not try to failover if it was not able to talk with the master
-# for longer than 310 seconds.
-#
-# A large slave-validity-factor may allow slaves with too old data to failover
-# a master, while a too small value may prevent the cluster from being able to
-# elect a slave at all.
-#
-# For maximum availability, it is possible to set the slave-validity-factor
-# to a value of 0, which means, that slaves will always try to failover the
-# master regardless of the last time they interacted with the master.
-# (However they'll always try to apply a delay proportional to their
-# offset rank).
-#
-# Zero is the only value able to guarantee that when all the partitions heal
-# the cluster will always be able to continue.
-#
-# cluster-slave-validity-factor 10
-
-# Cluster slaves are able to migrate to orphaned masters, that are masters
-# that are left without working slaves. This improves the cluster ability
-# to resist to failures as otherwise an orphaned master can't be failed over
-# in case of failure if it has no working slaves.
-#
-# Slaves migrate to orphaned masters only if there are still at least a
-# given number of other working slaves for their old master. This number
-# is the "migration barrier". A migration barrier of 1 means that a slave
-# will migrate only if there is at least 1 other working slave for its master
-# and so forth. It usually reflects the number of slaves you want for every
-# master in your cluster.
-#
-# Default is 1 (slaves migrate only if their masters remain with at least
-# one slave). To disable migration just set it to a very large value.
-# A value of 0 can be set but is useful only for debugging and dangerous
-# in production.
-#
-# cluster-migration-barrier 1
-
-# By default Redis Cluster nodes stop accepting queries if they detect there
-# is at least an hash slot uncovered (no available node is serving it).
-# This way if the cluster is partially down (for example a range of hash slots
-# are no longer covered) all the cluster becomes, eventually, unavailable.
-# It automatically returns available as soon as all the slots are covered again.
-#
-# However sometimes you want the subset of the cluster which is working,
-# to continue to accept queries for the part of the key space that is still
-# covered. In order to do so, just set the cluster-require-full-coverage
-# option to no.
-#
-# cluster-require-full-coverage yes
-
-# In order to setup your cluster make sure to read the documentation
-# available at http://redis.io web site.
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than 10000
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 128
-
-################################ LATENCY MONITOR ##############################
-
-# The Redis latency monitoring subsystem samples different operations
-# at runtime in order to collect data related to possible sources of
-# latency of a Redis instance.
-#
-# Via the LATENCY command this information is available to the user that can
-# print graphs and obtain reports.
-#
-# The system only logs operations that were performed in a time equal or
-# greater than the amount of milliseconds specified via the
-# latency-monitor-threshold configuration directive. When its value is set
-# to zero, the latency monitor is turned off.
-#
-# By default latency monitoring is disabled since it is mostly not needed
-# if you don't have latency issues, and collecting data has a performance
-# impact, that while very small, can be measured under big load. Latency
-# monitoring can easily be enabled at runtime using the command
-# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
-latency-monitor-threshold 0
-
-############################# EVENT NOTIFICATION ##############################
-
-# Redis can notify Pub/Sub clients about events happening in the key space.
-# This feature is documented at http://redis.io/topics/notifications
-#
-# For instance if keyspace events notification is enabled, and a client
-# performs a DEL operation on key "foo" stored in the Database 0, two
-# messages will be published via Pub/Sub:
-#
-# PUBLISH __keyspace@0__:foo del
-# PUBLISH __keyevent@0__:del foo
-#
-# It is possible to select the events that Redis will notify among a set
-# of classes. Every class is identified by a single character:
-#
-#  K     Keyspace events, published with __keyspace@<db>__ prefix.
-#  E     Keyevent events, published with __keyevent@<db>__ prefix.
-#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
-#  $     String commands
-#  l     List commands
-#  s     Set commands
-#  h     Hash commands
-#  z     Sorted set commands
-#  x     Expired events (events generated every time a key expires)
-#  e     Evicted events (events generated when a key is evicted for maxmemory)
-#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
-#
-#  The "notify-keyspace-events" takes as argument a string that is composed
-#  by zero or multiple characters. The empty string means that notifications
-#  are disabled at all.
-#
-#  Example: to enable list and generic events, from the point of view of the
-#           event name, use:
-#
-#  notify-keyspace-events Elg
-#
-#  Example 2: to get the stream of the expired keys subscribing to channel
-#             name __keyevent@0__:expired use:
-#
-#  notify-keyspace-events Ex
-#
-#  By default all notifications are disabled because most users don't need
-#  this feature and the feature has some overhead. Note that if you don't
-#  specify at least one of K or E, no events will be delivered.
-notify-keyspace-events ""
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded using a memory efficient data structure when they have a
-# small number of entries, and the biggest entry does not exceed a given
-# threshold. These thresholds can be configured using the following directives.
-hash-max-ziplist-entries 512
-hash-max-ziplist-value 64
-
-# Lists are also encoded in a special way to save a lot of space.
-# The number of entries allowed per internal list node can be specified
-# as a fixed maximum size or a maximum number of elements.
-# For a fixed maximum size, use -5 through -1, meaning:
-# -5: max size: 64 Kb  <-- not recommended for normal workloads
-# -4: max size: 32 Kb  <-- not recommended
-# -3: max size: 16 Kb  <-- probably not recommended
-# -2: max size: 8 Kb   <-- good
-# -1: max size: 4 Kb   <-- good
-# Positive numbers mean store up to _exactly_ that number of elements
-# per list node.
-# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
-# but if your use case is unique, adjust the settings as necessary.
-list-max-ziplist-size -2
-
-# Lists may also be compressed.
-# Compress depth is the number of quicklist ziplist nodes from *each* side of
-# the list to *exclude* from compression.  The head and tail of the list
-# are always uncompressed for fast push/pop operations.  Settings are:
-# 0: disable all list compression
-# 1: depth 1 means "don't start compressing until after 1 node into the list,
-#    going from either the head or tail"
-#    So: [head]->node->node->...->node->[tail]
-#    [head], [tail] will always be uncompressed; inner nodes will compress.
-# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
-#    2 here means: don't compress head or head->next or tail->prev or tail,
-#    but compress all nodes between them.
-# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
-# etc.
-list-compress-depth 0
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happen to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries 512
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-
-# HyperLogLog sparse representation bytes limit. The limit includes the
-# 16 bytes header. When an HyperLogLog using the sparse representation crosses
-# this limit, it is converted into the dense representation.
-#
-# A value greater than 16000 is totally useless, since at that point the
-# dense representation is more memory efficient.
-#
-# The suggested value is ~ 3000 in order to have the benefits of
-# the space efficient encoding without slowing down too much PFADD,
-# which is O(N) with the sparse encoding. The value can be raised to
-# ~ 10000 when CPU is not a concern, but space is, and the data set is
-# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
-hll-sparse-max-bytes 3000
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation Redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into a hash table
-# that is rehashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# actively rehash the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply from time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing yes
-
-# The client output buffer limits can be used to force disconnection of clients
-# that are not reading data from the server fast enough for some reason (a
-# common reason is that a Pub/Sub client can't consume messages as fast as the
-# publisher can produce them).
-#
-# The limit can be set differently for the three different classes of clients:
-#
-# normal -> normal clients including MONITOR clients
-# slave  -> slave clients
-# pubsub -> clients subscribed to at least one pubsub channel or pattern
-#
-# The syntax of every client-output-buffer-limit directive is the following:
-#
-# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
-#
-# A client is immediately disconnected once the hard limit is reached, or if
-# the soft limit is reached and remains reached for the specified number of
-# seconds (continuously).
-# So for instance if the hard limit is 32 megabytes and the soft limit is
-# 16 megabytes / 10 seconds, the client will get disconnected immediately
-# if the size of the output buffers reach 32 megabytes, but will also get
-# disconnected if the client reaches 16 megabytes and continuously overcomes
-# the limit for 10 seconds.
-#
-# By default normal clients are not limited because they don't receive data
-# without asking (in a push way), but just after a request, so only
-# asynchronous clients may create a scenario where data is requested faster
-# than it can read.
-#
-# Instead there is a default limit for pubsub and slave clients, since
-# subscribers and slaves receive data in a push fashion.
-#
-# Both the hard or the soft limit can be disabled by setting them to zero.
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit slave 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-
-# Redis calls an internal function to perform many background tasks, like
-# closing connections of clients in timeout, purging expired keys that are
-# never requested, and so forth.
-#
-# Not all tasks are performed with the same frequency, but Redis checks for
-# tasks to perform according to the specified "hz" value.
-#
-# By default "hz" is set to 10. Raising the value will use more CPU when
-# Redis is idle, but at the same time will make Redis more responsive when
-# there are many keys expiring at the same time, and timeouts may be
-# handled with more precision.
-#
-# The range is between 1 and 500, however a value over 100 is usually not
-# a good idea. Most users should use the default of 10 and raise this up to
-# 100 only in environments where very low latency is required.
-hz 10
-
-# When a child rewrites the AOF file, if the following option is enabled
-# the file will be fsync-ed every 32 MB of data generated. This is useful
-# in order to commit the file to the disk more incrementally and avoid
-# big latency spikes.
-aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7002.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7002.conf
deleted file mode 100644
index e3c6422..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-7002.conf
+++ /dev/null
@@ -1,1018 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specify
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all Redis servers but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
-# from admin or Redis Sentinel. Since Redis always uses the last processed
-# line as value of a configuration directive, you'd better put includes
-# at the beginning of this file to avoid overwriting config change at runtime.
-#
-# If instead you are interested in using includes to override configuration
-# options, it is better to use include as the last line.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-
-################################## NETWORK #####################################
-
-# By default, if no "bind" configuration directive is specified, Redis listens
-# for connections from all the network interfaces available on the server.
-# It is possible to listen to just one or multiple selected interfaces using
-# the "bind" configuration directive, followed by one or more IP addresses.
-#
-# Examples:
-#
-# bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1 ::1
-#
-# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
-# internet, binding to all the interfaces is dangerous and will expose the
-# instance to everybody on the internet. So by default we uncomment the
-# following bind directive, that will force Redis to listen only into
-# the IPv4 lookback interface address (this means Redis will be able to
-# accept connections only from clients running into the same computer it
-# is running).
-#
-# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
-# JUST COMMENT THE FOLLOWING LINE.
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1
-
-# Protected mode is a layer of security protection, in order to avoid that
-# Redis instances left open on the internet are accessed and exploited.
-#
-# When protected mode is on and if:
-#
-# 1) The server is not binding explicitly to a set of addresses using the
-#    "bind" directive.
-# 2) No password is configured.
-#
-# The server only accepts connections from clients connecting from the
-# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
-# sockets.
-#
-# By default protected mode is enabled. You should disable it only if
-# you are sure you want clients from other hosts to connect to Redis
-# even if no authentication is configured, nor a specific set of interfaces
-# are explicitly listed using the "bind" directive.
-protected-mode yes
-
-# Accept connections on the specified port, default is 6379 (IANA #815344).
-# If port 0 is specified Redis will not listen on a TCP socket.
-port 7002
-
-# TCP listen() backlog.
-#
-# In high requests-per-second environments you need an high backlog in order
-# to avoid slow clients connections issues. Note that the Linux kernel
-# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
-# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
-# in order to get the desired effect.
-tcp-backlog 511
-
-# Unix socket.
-#
-# Specify the path for the Unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-unixsocket /tmp/redis-nchan-cluster-7002.sock
-unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 0
-
-# TCP keepalive.
-#
-# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
-# of communication. This is useful for two reasons:
-#
-# 1) Detect dead peers.
-# 2) Take the connection alive from the point of view of network
-#    equipment in the middle.
-#
-# On Linux, the specified value (in seconds) is the period used to send ACKs.
-# Note that to close the connection the double of the time is needed.
-# On other kernels the period depends on the kernel configuration.
-#
-# A reasonable value for this option is 300 seconds, which is the new
-# Redis default starting with Redis 3.2.1.
-tcp-keepalive 60
-
-################################# GENERAL #####################################
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# If you run Redis from upstart or systemd, Redis can interact with your
-# supervision tree. Options:
-#   supervised no      - no supervision interaction
-#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
-#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
-#   supervised auto    - detect upstart or systemd method based on
-#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
-# Note: these supervision methods only signal "process is ready."
-#       They do not enable continuous liveness pings back to your supervisor.
-supervised no
-
-# If a pid file is specified, Redis writes it where specified at startup
-# and removes it at exit.
-#
-# When the server runs non daemonized, no pid file is created if none is
-# specified in the configuration. When the server is daemonized, the pid file
-# is used even if not specified, defaulting to "/var/run/redis.pid".
-#
-# Creating a pid file is best effort: if Redis is not able to create it
-# nothing bad happens, the server will start and run normally.
-pidfile /tmp/redis-nchan-cluster-7002.pid
-
-# Specify the server verbosity level.
-# This can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel notice
-
-# Specify the log file name. Also the empty string can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile /dev/stdout
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-# syslog-enabled no
-
-# Specify the syslog identity.
-# syslog-ident redis
-
-# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
-# syslog-facility local0
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################ SNAPSHOTTING  ################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving completely by commenting out all "save" lines.
-#
-#   It is also possible to remove all the previously configured save
-#   points by adding a save directive with a single empty string argument
-#   like in the following example:
-#
-#   save ""
-
-#save 900 1
-#save 300 10
-#save 60 10000
-
-# By default Redis will stop accepting writes if RDB snapshots are enabled
-# (at least one save point) and the latest background save failed.
-# This will make the user aware (in a hard way) that data is not persisting
-# on disk properly, otherwise chances are that no one will notice and some
-# disaster will happen.
-#
-# If the background saving process will start working again Redis will
-# automatically allow writes again.
-#
-# However if you have setup your proper monitoring of the Redis server
-# and persistence, you may want to disable this feature so that Redis will
-# continue to work as usual even if there are problems with disk,
-# permissions, and so forth.
-stop-writes-on-bgsave-error yes
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression yes
-
-# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
-# This makes the format more resistant to corruption but there is a performance
-# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
-# for maximum performances.
-#
-# RDB files created with checksum disabled have a checksum of zero that will
-# tell the loading code to skip the check.
-rdbchecksum yes
-
-# The filename where to dump the DB
-dbfilename dump-7002.rdb
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# The Append Only File will also be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir ./
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. A few things to understand ASAP about Redis replication.
-#
-# 1) Redis replication is asynchronous, but you can configure a master to
-#    stop accepting writes if it appears to be not connected with at least
-#    a given number of slaves.
-# 2) Redis slaves are able to perform a partial resynchronization with the
-#    master if the replication link is lost for a relatively small amount of
-#    time. You may want to configure the replication backlog size (see the next
-#    sections of this file) with a sensible value depending on your needs.
-# 3) Replication is automatic and does not need user intervention. After a
-#    network partition slaves automatically try to reconnect to masters
-#    and resynchronize with them.
-#
-# slaveof <masterip> <masterport>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-
-# When a slave loses its connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of date data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data yes
-
-# You can configure a slave instance to accept writes or not. Writing against
-# a slave instance may be useful to store some ephemeral data (because data
-# written on a slave will be easily deleted after resync with the master) but
-# may also cause problems if clients are writing to it because of a
-# misconfiguration.
-#
-# Since Redis 2.6 by default slaves are read-only.
-#
-# Note: read only slaves are not designed to be exposed to untrusted clients
-# on the internet. It's just a protection layer against misuse of the instance.
-# Still a read only slave exports by default all the administrative commands
-# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
-# security of read only slaves using 'rename-command' to shadow all the
-# administrative / dangerous commands.
-slave-read-only no
-
-# Replication SYNC strategy: disk or socket.
-#
-# -------------------------------------------------------
-# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
-# -------------------------------------------------------
-#
-# New slaves and reconnecting slaves that are not able to continue the replication
-# process just receiving differences, need to do what is called a "full
-# synchronization". An RDB file is transmitted from the master to the slaves.
-# The transmission can happen in two different ways:
-#
-# 1) Disk-backed: The Redis master creates a new process that writes the RDB
-#                 file on disk. Later the file is transferred by the parent
-#                 process to the slaves incrementally.
-# 2) Diskless: The Redis master creates a new process that directly writes the
-#              RDB file to slave sockets, without touching the disk at all.
-#
-# With disk-backed replication, while the RDB file is generated, more slaves
-# can be queued and served with the RDB file as soon as the current child producing
-# the RDB file finishes its work. With diskless replication instead once
-# the transfer starts, new slaves arriving will be queued and a new transfer
-# will start when the current one terminates.
-#
-# When diskless replication is used, the master waits a configurable amount of
-# time (in seconds) before starting the transfer in the hope that multiple slaves
-# will arrive and the transfer can be parallelized.
-#
-# With slow disks and fast (large bandwidth) networks, diskless replication
-# works better.
-repl-diskless-sync no
-
-# When diskless replication is enabled, it is possible to configure the delay
-# the server waits in order to spawn the child that transfers the RDB via socket
-# to the slaves.
-#
-# This is important since once the transfer starts, it is not possible to serve
-# new slaves arriving, that will be queued for the next RDB transfer, so the server
-# waits a delay in order to let more slaves arrive.
-#
-# The delay is specified in seconds, and by default is 5 seconds. To disable
-# it entirely just set it to 0 seconds and the transfer will start ASAP.
-repl-diskless-sync-delay 5
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-
-# The following option sets the replication timeout for:
-#
-# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
-# 2) Master timeout from the point of view of slaves (data, pings).
-# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-
-# Disable TCP_NODELAY on the slave socket after SYNC?
-#
-# If you select "yes" Redis will use a smaller number of TCP packets and
-# less bandwidth to send data to slaves. But this can add a delay for
-# the data to appear on the slave side, up to 40 milliseconds with
-# Linux kernels using a default configuration.
-#
-# If you select "no" the delay for data to appear on the slave side will
-# be reduced but more bandwidth will be used for replication.
-#
-# By default we optimize for low latency, but in very high traffic conditions
-# or when the master and slaves are many hops away, turning this to "yes" may
-# be a good idea.
-repl-disable-tcp-nodelay no
-
-# Set the replication backlog size. The backlog is a buffer that accumulates
-# slave data when slaves are disconnected for some time, so that when a slave
-# wants to reconnect again, often a full resync is not needed, but a partial
-# resync is enough, just passing the portion of data the slave missed while
-# disconnected.
-#
-# The bigger the replication backlog, the longer the time the slave can be
-# disconnected and later be able to perform a partial resynchronization.
-#
-# The backlog is only allocated once there is at least a slave connected.
-#
-# repl-backlog-size 1mb
-
-# After a master has no longer connected slaves for some time, the backlog
-# will be freed. The following option configures the amount of seconds that
-# need to elapse, starting from the time the last slave disconnected, for
-# the backlog buffer to be freed.
-#
-# A value of 0 means to never release the backlog.
-#
-# repl-backlog-ttl 3600
-
-# The slave priority is an integer number published by Redis in the INFO output.
-# It is used by Redis Sentinel in order to select a slave to promote into a
-# master if the master is no longer working correctly.
-#
-# A slave with a low priority number is considered better for promotion, so
-# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
-# pick the one with priority 10, that is the lowest.
-#
-# However a special priority of 0 marks the slave as not able to perform the
-# role of master, so a slave with priority of 0 will never be selected by
-# Redis Sentinel for promotion.
-#
-# By default the priority is 100.
-slave-priority 100
-
-# It is possible for a master to stop accepting writes if there are less than
-# N slaves connected, having a lag less or equal than M seconds.
-#
-# The N slaves need to be in "online" state.
-#
-# The lag in seconds, that must be <= the specified value, is calculated from
-# the last ping received from the slave, that is usually sent every second.
-#
-# This option does not GUARANTEE that N replicas will accept the write, but
-# will limit the window of exposure for lost writes in case not enough slaves
-# are available, to the specified number of seconds.
-#
-# For example to require at least 3 slaves with a lag <= 10 seconds use:
-#
-# min-slaves-to-write 3
-# min-slaves-max-lag 10
-#
-# Setting one or the other to 0 disables the feature.
-#
-# By default min-slaves-to-write is set to 0 (feature disabled) and
-# min-slaves-max-lag is set to 10.
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-# requirepass foobared
-
-# Command renaming.
-#
-# It is possible to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# hard to guess so that it will still be available for internal-use tools
-# but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possible to completely kill a command by renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-#
-# Please note that changing the name of commands that are logged into the
-# AOF file or transmitted to slaves may cause problems.
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default
-# this limit is set to 10000 clients, however if the Redis server is not
-# able to configure the process file limit to allow for the specified limit
-# the max number of allowed clients is set to the current file limit
-# minus 32 (as Redis reserves a few file descriptors for internal uses).
-#
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 10000
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# according to the eviction policy selected (see maxmemory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# a hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached. You can select among five behaviors:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key according to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys-random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with any of the above policies, Redis will return an error on write
-#       operations, when there are no suitable keys for eviction.
-#
-#       At the date of writing these commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy noeviction
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can tune it for speed or
-# accuracy. For default Redis will check five keys and pick the one that was
-# used less recently, you can change the sample size using the following
-# configuration directive.
-#
-# The default of 5 produces good enough results. 10 Approximates very closely
-# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
-#
-# maxmemory-samples 5
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. This mode is
-# good enough in many applications, but an issue with the Redis process or
-# a power outage may result into a few minutes of writes lost (depending on
-# the configured save points).
-#
-# The Append Only File is an alternative persistence mode that provides
-# much better durability. For instance using the default data fsync policy
-# (see later in the config file) Redis can lose just one second of writes in a
-# dramatic event like a server power outage, or a single write if something
-# wrong with the Redis process itself happens, but the operating system is
-# still running correctly.
-#
-# AOF and RDB persistence can be enabled at the same time without problems.
-# If the AOF is enabled on startup Redis will load the AOF, that is the file
-# with the better durability guarantees.
-#
-# Please check http://redis.io/topics/persistence for more information.
-
-appendonly no
-
-# The name of the append only file (default: "appendonly.aof")
-
-appendfilename "appendonly.aof"
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead of waiting for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log. Slow, Safest.
-# everysec: fsync only one time every second. Compromise.
-#
-# The default is "everysec", as that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# More details please check the following article:
-# http://antirez.com/post/redis-persistence-demystified.html
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-# appendfsync everysec
-appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving, the durability of Redis is
-# the same as "appendfsync none". In practical terms, this means that it is
-# possible to lose up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-
-no-appendfsync-on-rewrite no
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size grows by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (if no rewrite has happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a percentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-
-# An AOF file may be found to be truncated at the end during the Redis
-# startup process, when the AOF data gets loaded back into memory.
-# This may happen when the system where Redis is running
-# crashes, especially when an ext4 filesystem is mounted without the
-# data=ordered option (however this can't happen when Redis itself
-# crashes or aborts but the operating system still works correctly).
-#
-# Redis can either exit with an error when this happens, or load as much
-# data as possible (the default now) and start if the AOF file is found
-# to be truncated at the end. The following option controls this behavior.
-#
-# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
-# the Redis server starts emitting a log to inform the user of the event.
-# Otherwise if the option is set to no, the server aborts with an error
-# and refuses to start. When the option is set to no, the user requires
-# to fix the AOF file using the "redis-check-aof" utility before to restart
-# the server.
-#
-# Note that if the AOF file will be found to be corrupted in the middle
-# the server will still exit with an error. This option only applies when
-# Redis will try to read more data from the AOF file but not enough bytes
-# will be found.
-aof-load-truncated yes
-
-################################ LUA SCRIPTING  ###############################
-
-# Max execution time of a Lua script in milliseconds.
-#
-# If the maximum execution time is reached Redis will log that a script is
-# still in execution after the maximum allowed time and will start to
-# reply to queries with an error.
-#
-# When a long running script exceeds the maximum execution time only the
-# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
-# used to stop a script that did not yet called write commands. The second
-# is the only way to shut down the server in the case a write command was
-# already issued by the script but the user doesn't want to wait for the natural
-# termination of the script.
-#
-# Set it to 0 or a negative value for unlimited execution without warnings.
-lua-time-limit 5000
-
-################################ REDIS CLUSTER  ###############################
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
-# in order to mark it as "mature" we need to wait for a non trivial percentage
-# of users to deploy it in production.
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
-# started as cluster nodes can. In order to start a Redis instance as a
-# cluster node enable the cluster support uncommenting the following:
-#
-cluster-enabled yes
-
-# Every cluster node has a cluster configuration file. This file is not
-# intended to be edited by hand. It is created and updated by Redis nodes.
-# Every Redis Cluster node requires a different cluster configuration file.
-# Make sure that instances running in the same system do not have
-# overlapping cluster configuration file names.
-#
-cluster-config-file redis-cluster-node-7002.conf
-
-# Cluster node timeout is the amount of milliseconds a node must be unreachable
-# for it to be considered in failure state.
-# Most other internal time limits are multiple of the node timeout.
-#
-# cluster-node-timeout 15000
-
-# A slave of a failing master will avoid to start a failover if its data
-# looks too old.
-#
-# There is no simple way for a slave to actually have a exact measure of
-# its "data age", so the following two checks are performed:
-#
-# 1) If there are multiple slaves able to failover, they exchange messages
-#    in order to try to give an advantage to the slave with the best
-#    replication offset (more data from the master processed).
-#    Slaves will try to get their rank by offset, and apply to the start
-#    of the failover a delay proportional to their rank.
-#
-# 2) Every single slave computes the time of the last interaction with
-#    its master. This can be the last ping or command received (if the master
-#    is still in the "connected" state), or the time that elapsed since the
-#    disconnection with the master (if the replication link is currently down).
-#    If the last interaction is too old, the slave will not try to failover
-#    at all.
-#
-# The point "2" can be tuned by user. Specifically a slave will not perform
-# the failover if, since the last interaction with the master, the time
-# elapsed is greater than:
-#
-#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
-#
-# So for example if node-timeout is 30 seconds, and the slave-validity-factor
-# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
-# slave will not try to failover if it was not able to talk with the master
-# for longer than 310 seconds.
-#
-# A large slave-validity-factor may allow slaves with too old data to failover
-# a master, while a too small value may prevent the cluster from being able to
-# elect a slave at all.
-#
-# For maximum availability, it is possible to set the slave-validity-factor
-# to a value of 0, which means, that slaves will always try to failover the
-# master regardless of the last time they interacted with the master.
-# (However they'll always try to apply a delay proportional to their
-# offset rank).
-#
-# Zero is the only value able to guarantee that when all the partitions heal
-# the cluster will always be able to continue.
-#
-# cluster-slave-validity-factor 10
-
-# Cluster slaves are able to migrate to orphaned masters, that are masters
-# that are left without working slaves. This improves the cluster ability
-# to resist to failures as otherwise an orphaned master can't be failed over
-# in case of failure if it has no working slaves.
-#
-# Slaves migrate to orphaned masters only if there are still at least a
-# given number of other working slaves for their old master. This number
-# is the "migration barrier". A migration barrier of 1 means that a slave
-# will migrate only if there is at least 1 other working slave for its master
-# and so forth. It usually reflects the number of slaves you want for every
-# master in your cluster.
-#
-# Default is 1 (slaves migrate only if their masters remain with at least
-# one slave). To disable migration just set it to a very large value.
-# A value of 0 can be set but is useful only for debugging and dangerous
-# in production.
-#
-# cluster-migration-barrier 1
-
-# By default Redis Cluster nodes stop accepting queries if they detect there
-# is at least an hash slot uncovered (no available node is serving it).
-# This way if the cluster is partially down (for example a range of hash slots
-# are no longer covered) all the cluster becomes, eventually, unavailable.
-# It automatically returns available as soon as all the slots are covered again.
-#
-# However sometimes you want the subset of the cluster which is working,
-# to continue to accept queries for the part of the key space that is still
-# covered. In order to do so, just set the cluster-require-full-coverage
-# option to no.
-#
-# cluster-require-full-coverage yes
-
-# In order to setup your cluster make sure to read the documentation
-# available at http://redis.io web site.
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than 10000
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 128
-
-################################ LATENCY MONITOR ##############################
-
-# The Redis latency monitoring subsystem samples different operations
-# at runtime in order to collect data related to possible sources of
-# latency of a Redis instance.
-#
-# Via the LATENCY command this information is available to the user that can
-# print graphs and obtain reports.
-#
-# The system only logs operations that were performed in a time equal or
-# greater than the amount of milliseconds specified via the
-# latency-monitor-threshold configuration directive. When its value is set
-# to zero, the latency monitor is turned off.
-#
-# By default latency monitoring is disabled since it is mostly not needed
-# if you don't have latency issues, and collecting data has a performance
-# impact, that while very small, can be measured under big load. Latency
-# monitoring can easily be enabled at runtime using the command
-# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
-latency-monitor-threshold 0
-
-############################# EVENT NOTIFICATION ##############################
-
-# Redis can notify Pub/Sub clients about events happening in the key space.
-# This feature is documented at http://redis.io/topics/notifications
-#
-# For instance if keyspace events notification is enabled, and a client
-# performs a DEL operation on key "foo" stored in the Database 0, two
-# messages will be published via Pub/Sub:
-#
-# PUBLISH __keyspace@0__:foo del
-# PUBLISH __keyevent@0__:del foo
-#
-# It is possible to select the events that Redis will notify among a set
-# of classes. Every class is identified by a single character:
-#
-#  K     Keyspace events, published with __keyspace@<db>__ prefix.
-#  E     Keyevent events, published with __keyevent@<db>__ prefix.
-#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
-#  $     String commands
-#  l     List commands
-#  s     Set commands
-#  h     Hash commands
-#  z     Sorted set commands
-#  x     Expired events (events generated every time a key expires)
-#  e     Evicted events (events generated when a key is evicted for maxmemory)
-#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
-#
-#  The "notify-keyspace-events" takes as argument a string that is composed
-#  by zero or multiple characters. The empty string means that notifications
-#  are disabled at all.
-#
-#  Example: to enable list and generic events, from the point of view of the
-#           event name, use:
-#
-#  notify-keyspace-events Elg
-#
-#  Example 2: to get the stream of the expired keys subscribing to channel
-#             name __keyevent@0__:expired use:
-#
-#  notify-keyspace-events Ex
-#
-#  By default all notifications are disabled because most users don't need
-#  this feature and the feature has some overhead. Note that if you don't
-#  specify at least one of K or E, no events will be delivered.
-notify-keyspace-events ""
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded using a memory efficient data structure when they have a
-# small number of entries, and the biggest entry does not exceed a given
-# threshold. These thresholds can be configured using the following directives.
-hash-max-ziplist-entries 512
-hash-max-ziplist-value 64
-
-# Lists are also encoded in a special way to save a lot of space.
-# The number of entries allowed per internal list node can be specified
-# as a fixed maximum size or a maximum number of elements.
-# For a fixed maximum size, use -5 through -1, meaning:
-# -5: max size: 64 Kb  <-- not recommended for normal workloads
-# -4: max size: 32 Kb  <-- not recommended
-# -3: max size: 16 Kb  <-- probably not recommended
-# -2: max size: 8 Kb   <-- good
-# -1: max size: 4 Kb   <-- good
-# Positive numbers mean store up to _exactly_ that number of elements
-# per list node.
-# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
-# but if your use case is unique, adjust the settings as necessary.
-list-max-ziplist-size -2
-
-# Lists may also be compressed.
-# Compress depth is the number of quicklist ziplist nodes from *each* side of
-# the list to *exclude* from compression.  The head and tail of the list
-# are always uncompressed for fast push/pop operations.  Settings are:
-# 0: disable all list compression
-# 1: depth 1 means "don't start compressing until after 1 node into the list,
-#    going from either the head or tail"
-#    So: [head]->node->node->...->node->[tail]
-#    [head], [tail] will always be uncompressed; inner nodes will compress.
-# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
-#    2 here means: don't compress head or head->next or tail->prev or tail,
-#    but compress all nodes between them.
-# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
-# etc.
-list-compress-depth 0
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happen to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries 512
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-
-# HyperLogLog sparse representation bytes limit. The limit includes the
-# 16 bytes header. When an HyperLogLog using the sparse representation crosses
-# this limit, it is converted into the dense representation.
-#
-# A value greater than 16000 is totally useless, since at that point the
-# dense representation is more memory efficient.
-#
-# The suggested value is ~ 3000 in order to have the benefits of
-# the space efficient encoding without slowing down too much PFADD,
-# which is O(N) with the sparse encoding. The value can be raised to
-# ~ 10000 when CPU is not a concern, but space is, and the data set is
-# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
-hll-sparse-max-bytes 3000
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation Redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into a hash table
-# that is rehashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# actively rehash the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply from time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing yes
-
-# The client output buffer limits can be used to force disconnection of clients
-# that are not reading data from the server fast enough for some reason (a
-# common reason is that a Pub/Sub client can't consume messages as fast as the
-# publisher can produce them).
-#
-# The limit can be set differently for the three different classes of clients:
-#
-# normal -> normal clients including MONITOR clients
-# slave  -> slave clients
-# pubsub -> clients subscribed to at least one pubsub channel or pattern
-#
-# The syntax of every client-output-buffer-limit directive is the following:
-#
-# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
-#
-# A client is immediately disconnected once the hard limit is reached, or if
-# the soft limit is reached and remains reached for the specified number of
-# seconds (continuously).
-# So for instance if the hard limit is 32 megabytes and the soft limit is
-# 16 megabytes / 10 seconds, the client will get disconnected immediately
-# if the size of the output buffers reach 32 megabytes, but will also get
-# disconnected if the client reaches 16 megabytes and continuously overcomes
-# the limit for 10 seconds.
-#
-# By default normal clients are not limited because they don't receive data
-# without asking (in a push way), but just after a request, so only
-# asynchronous clients may create a scenario where data is requested faster
-# than it can read.
-#
-# Instead there is a default limit for pubsub and slave clients, since
-# subscribers and slaves receive data in a push fashion.
-#
-# Both the hard or the soft limit can be disabled by setting them to zero.
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit slave 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-
-# Redis calls an internal function to perform many background tasks, like
-# closing connections of clients in timeout, purging expired keys that are
-# never requested, and so forth.
-#
-# Not all tasks are performed with the same frequency, but Redis checks for
-# tasks to perform according to the specified "hz" value.
-#
-# By default "hz" is set to 10. Raising the value will use more CPU when
-# Redis is idle, but at the same time will make Redis more responsive when
-# there are many keys expiring at the same time, and timeouts may be
-# handled with more precision.
-#
-# The range is between 1 and 500, however a value over 100 is usually not
-# a good idea. Most users should use the default of 10 and raise this up to
-# 100 only in environments where very low latency is required.
-hz 10
-
-# When a child rewrites the AOF file, if the following option is enabled
-# the file will be fsync-ed every 32 MB of data generated. This is useful
-# in order to commit the file to the disk more incrementally and avoid
-# big latency spikes.
-aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7003.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7003.conf
deleted file mode 100644
index 4a637bc..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-7003.conf
+++ /dev/null
@@ -1,1018 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specify
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all Redis servers but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
-# from admin or Redis Sentinel. Since Redis always uses the last processed
-# line as value of a configuration directive, you'd better put includes
-# at the beginning of this file to avoid overwriting config change at runtime.
-#
-# If instead you are interested in using includes to override configuration
-# options, it is better to use include as the last line.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-
-################################## NETWORK #####################################
-
-# By default, if no "bind" configuration directive is specified, Redis listens
-# for connections from all the network interfaces available on the server.
-# It is possible to listen to just one or multiple selected interfaces using
-# the "bind" configuration directive, followed by one or more IP addresses.
-#
-# Examples:
-#
-# bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1 ::1
-#
-# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
-# internet, binding to all the interfaces is dangerous and will expose the
-# instance to everybody on the internet. So by default we uncomment the
-# following bind directive, that will force Redis to listen only into
-# the IPv4 lookback interface address (this means Redis will be able to
-# accept connections only from clients running into the same computer it
-# is running).
-#
-# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
-# JUST COMMENT THE FOLLOWING LINE.
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1
-
-# Protected mode is a layer of security protection, in order to avoid that
-# Redis instances left open on the internet are accessed and exploited.
-#
-# When protected mode is on and if:
-#
-# 1) The server is not binding explicitly to a set of addresses using the
-#    "bind" directive.
-# 2) No password is configured.
-#
-# The server only accepts connections from clients connecting from the
-# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
-# sockets.
-#
-# By default protected mode is enabled. You should disable it only if
-# you are sure you want clients from other hosts to connect to Redis
-# even if no authentication is configured, nor a specific set of interfaces
-# are explicitly listed using the "bind" directive.
-protected-mode yes
-
-# Accept connections on the specified port, default is 6379 (IANA #815344).
-# If port 0 is specified Redis will not listen on a TCP socket.
-port 7003
-
-# TCP listen() backlog.
-#
-# In high requests-per-second environments you need an high backlog in order
-# to avoid slow clients connections issues. Note that the Linux kernel
-# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
-# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
-# in order to get the desired effect.
-tcp-backlog 511
-
-# Unix socket.
-#
-# Specify the path for the Unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-unixsocket /tmp/redis-nchan-cluster-7003.sock
-unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 0
-
-# TCP keepalive.
-#
-# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
-# of communication. This is useful for two reasons:
-#
-# 1) Detect dead peers.
-# 2) Take the connection alive from the point of view of network
-#    equipment in the middle.
-#
-# On Linux, the specified value (in seconds) is the period used to send ACKs.
-# Note that to close the connection the double of the time is needed.
-# On other kernels the period depends on the kernel configuration.
-#
-# A reasonable value for this option is 300 seconds, which is the new
-# Redis default starting with Redis 3.2.1.
-tcp-keepalive 60
-
-################################# GENERAL #####################################
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# If you run Redis from upstart or systemd, Redis can interact with your
-# supervision tree. Options:
-#   supervised no      - no supervision interaction
-#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
-#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
-#   supervised auto    - detect upstart or systemd method based on
-#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
-# Note: these supervision methods only signal "process is ready."
-#       They do not enable continuous liveness pings back to your supervisor.
-supervised no
-
-# If a pid file is specified, Redis writes it where specified at startup
-# and removes it at exit.
-#
-# When the server runs non daemonized, no pid file is created if none is
-# specified in the configuration. When the server is daemonized, the pid file
-# is used even if not specified, defaulting to "/var/run/redis.pid".
-#
-# Creating a pid file is best effort: if Redis is not able to create it
-# nothing bad happens, the server will start and run normally.
-pidfile /tmp/redis-nchan-cluster-7003.pid
-
-# Specify the server verbosity level.
-# This can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel notice
-
-# Specify the log file name. Also the empty string can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile /dev/stdout
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-# syslog-enabled no
-
-# Specify the syslog identity.
-# syslog-ident redis
-
-# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
-# syslog-facility local0
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################ SNAPSHOTTING  ################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving completely by commenting out all "save" lines.
-#
-#   It is also possible to remove all the previously configured save
-#   points by adding a save directive with a single empty string argument
-#   like in the following example:
-#
-#   save ""
-
-#save 900 1
-#save 300 10
-#save 60 10000
-
-# By default Redis will stop accepting writes if RDB snapshots are enabled
-# (at least one save point) and the latest background save failed.
-# This will make the user aware (in a hard way) that data is not persisting
-# on disk properly, otherwise chances are that no one will notice and some
-# disaster will happen.
-#
-# If the background saving process will start working again Redis will
-# automatically allow writes again.
-#
-# However if you have setup your proper monitoring of the Redis server
-# and persistence, you may want to disable this feature so that Redis will
-# continue to work as usual even if there are problems with disk,
-# permissions, and so forth.
-stop-writes-on-bgsave-error yes
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression yes
-
-# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
-# This makes the format more resistant to corruption but there is a performance
-# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
-# for maximum performances.
-#
-# RDB files created with checksum disabled have a checksum of zero that will
-# tell the loading code to skip the check.
-rdbchecksum yes
-
-# The filename where to dump the DB
-dbfilename dump-7003.rdb
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# The Append Only File will also be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir ./
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. A few things to understand ASAP about Redis replication.
-#
-# 1) Redis replication is asynchronous, but you can configure a master to
-#    stop accepting writes if it appears to be not connected with at least
-#    a given number of slaves.
-# 2) Redis slaves are able to perform a partial resynchronization with the
-#    master if the replication link is lost for a relatively small amount of
-#    time. You may want to configure the replication backlog size (see the next
-#    sections of this file) with a sensible value depending on your needs.
-# 3) Replication is automatic and does not need user intervention. After a
-#    network partition slaves automatically try to reconnect to masters
-#    and resynchronize with them.
-#
-# slaveof <masterip> <masterport>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-
-# When a slave loses its connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of date data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data yes
-
-# You can configure a slave instance to accept writes or not. Writing against
-# a slave instance may be useful to store some ephemeral data (because data
-# written on a slave will be easily deleted after resync with the master) but
-# may also cause problems if clients are writing to it because of a
-# misconfiguration.
-#
-# Since Redis 2.6 by default slaves are read-only.
-#
-# Note: read only slaves are not designed to be exposed to untrusted clients
-# on the internet. It's just a protection layer against misuse of the instance.
-# Still a read only slave exports by default all the administrative commands
-# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
-# security of read only slaves using 'rename-command' to shadow all the
-# administrative / dangerous commands.
-slave-read-only no
-
-# Replication SYNC strategy: disk or socket.
-#
-# -------------------------------------------------------
-# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
-# -------------------------------------------------------
-#
-# New slaves and reconnecting slaves that are not able to continue the replication
-# process just receiving differences, need to do what is called a "full
-# synchronization". An RDB file is transmitted from the master to the slaves.
-# The transmission can happen in two different ways:
-#
-# 1) Disk-backed: The Redis master creates a new process that writes the RDB
-#                 file on disk. Later the file is transferred by the parent
-#                 process to the slaves incrementally.
-# 2) Diskless: The Redis master creates a new process that directly writes the
-#              RDB file to slave sockets, without touching the disk at all.
-#
-# With disk-backed replication, while the RDB file is generated, more slaves
-# can be queued and served with the RDB file as soon as the current child producing
-# the RDB file finishes its work. With diskless replication instead once
-# the transfer starts, new slaves arriving will be queued and a new transfer
-# will start when the current one terminates.
-#
-# When diskless replication is used, the master waits a configurable amount of
-# time (in seconds) before starting the transfer in the hope that multiple slaves
-# will arrive and the transfer can be parallelized.
-#
-# With slow disks and fast (large bandwidth) networks, diskless replication
-# works better.
-repl-diskless-sync no
-
-# When diskless replication is enabled, it is possible to configure the delay
-# the server waits in order to spawn the child that transfers the RDB via socket
-# to the slaves.
-#
-# This is important since once the transfer starts, it is not possible to serve
-# new slaves arriving, that will be queued for the next RDB transfer, so the server
-# waits a delay in order to let more slaves arrive.
-#
-# The delay is specified in seconds, and by default is 5 seconds. To disable
-# it entirely just set it to 0 seconds and the transfer will start ASAP.
-repl-diskless-sync-delay 5
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-
-# The following option sets the replication timeout for:
-#
-# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
-# 2) Master timeout from the point of view of slaves (data, pings).
-# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-
-# Disable TCP_NODELAY on the slave socket after SYNC?
-#
-# If you select "yes" Redis will use a smaller number of TCP packets and
-# less bandwidth to send data to slaves. But this can add a delay for
-# the data to appear on the slave side, up to 40 milliseconds with
-# Linux kernels using a default configuration.
-#
-# If you select "no" the delay for data to appear on the slave side will
-# be reduced but more bandwidth will be used for replication.
-#
-# By default we optimize for low latency, but in very high traffic conditions
-# or when the master and slaves are many hops away, turning this to "yes" may
-# be a good idea.
-repl-disable-tcp-nodelay no
-
-# Set the replication backlog size. The backlog is a buffer that accumulates
-# slave data when slaves are disconnected for some time, so that when a slave
-# wants to reconnect again, often a full resync is not needed, but a partial
-# resync is enough, just passing the portion of data the slave missed while
-# disconnected.
-#
-# The bigger the replication backlog, the longer the time the slave can be
-# disconnected and later be able to perform a partial resynchronization.
-#
-# The backlog is only allocated once there is at least a slave connected.
-#
-# repl-backlog-size 1mb
-
-# After a master has no longer connected slaves for some time, the backlog
-# will be freed. The following option configures the amount of seconds that
-# need to elapse, starting from the time the last slave disconnected, for
-# the backlog buffer to be freed.
-#
-# A value of 0 means to never release the backlog.
-#
-# repl-backlog-ttl 3600
-
-# The slave priority is an integer number published by Redis in the INFO output.
-# It is used by Redis Sentinel in order to select a slave to promote into a
-# master if the master is no longer working correctly.
-#
-# A slave with a low priority number is considered better for promotion, so
-# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
-# pick the one with priority 10, that is the lowest.
-#
-# However a special priority of 0 marks the slave as not able to perform the
-# role of master, so a slave with priority of 0 will never be selected by
-# Redis Sentinel for promotion.
-#
-# By default the priority is 100.
-slave-priority 100
-
-# It is possible for a master to stop accepting writes if there are less than
-# N slaves connected, having a lag less or equal than M seconds.
-#
-# The N slaves need to be in "online" state.
-#
-# The lag in seconds, that must be <= the specified value, is calculated from
-# the last ping received from the slave, that is usually sent every second.
-#
-# This option does not GUARANTEE that N replicas will accept the write, but
-# will limit the window of exposure for lost writes in case not enough slaves
-# are available, to the specified number of seconds.
-#
-# For example to require at least 3 slaves with a lag <= 10 seconds use:
-#
-# min-slaves-to-write 3
-# min-slaves-max-lag 10
-#
-# Setting one or the other to 0 disables the feature.
-#
-# By default min-slaves-to-write is set to 0 (feature disabled) and
-# min-slaves-max-lag is set to 10.
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-# requirepass foobared
-
-# Command renaming.
-#
-# It is possible to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# hard to guess so that it will still be available for internal-use tools
-# but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possible to completely kill a command by renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-#
-# Please note that changing the name of commands that are logged into the
-# AOF file or transmitted to slaves may cause problems.
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default
-# this limit is set to 10000 clients, however if the Redis server is not
-# able to configure the process file limit to allow for the specified limit
-# the max number of allowed clients is set to the current file limit
-# minus 32 (as Redis reserves a few file descriptors for internal uses).
-#
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 10000
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# according to the eviction policy selected (see maxmemory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# a hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached. You can select among five behaviors:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key according to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys-random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with any of the above policies, Redis will return an error on write
-#       operations, when there are no suitable keys for eviction.
-#
-#       At the date of writing these commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy noeviction
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can tune it for speed or
-# accuracy. For default Redis will check five keys and pick the one that was
-# used less recently, you can change the sample size using the following
-# configuration directive.
-#
-# The default of 5 produces good enough results. 10 Approximates very closely
-# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
-#
-# maxmemory-samples 5
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. This mode is
-# good enough in many applications, but an issue with the Redis process or
-# a power outage may result into a few minutes of writes lost (depending on
-# the configured save points).
-#
-# The Append Only File is an alternative persistence mode that provides
-# much better durability. For instance using the default data fsync policy
-# (see later in the config file) Redis can lose just one second of writes in a
-# dramatic event like a server power outage, or a single write if something
-# wrong with the Redis process itself happens, but the operating system is
-# still running correctly.
-#
-# AOF and RDB persistence can be enabled at the same time without problems.
-# If the AOF is enabled on startup Redis will load the AOF, that is the file
-# with the better durability guarantees.
-#
-# Please check http://redis.io/topics/persistence for more information.
-
-appendonly no
-
-# The name of the append only file (default: "appendonly.aof")
-
-appendfilename "appendonly.aof"
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead of waiting for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log. Slow, Safest.
-# everysec: fsync only one time every second. Compromise.
-#
-# The default is "everysec", as that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# More details please check the following article:
-# http://antirez.com/post/redis-persistence-demystified.html
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-# appendfsync everysec
-appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving, the durability of Redis is
-# the same as "appendfsync none". In practical terms, this means that it is
-# possible to lose up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-
-no-appendfsync-on-rewrite no
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size grows by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (if no rewrite has happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a percentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-
-# An AOF file may be found to be truncated at the end during the Redis
-# startup process, when the AOF data gets loaded back into memory.
-# This may happen when the system where Redis is running
-# crashes, especially when an ext4 filesystem is mounted without the
-# data=ordered option (however this can't happen when Redis itself
-# crashes or aborts but the operating system still works correctly).
-#
-# Redis can either exit with an error when this happens, or load as much
-# data as possible (the default now) and start if the AOF file is found
-# to be truncated at the end. The following option controls this behavior.
-#
-# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
-# the Redis server starts emitting a log to inform the user of the event.
-# Otherwise if the option is set to no, the server aborts with an error
-# and refuses to start. When the option is set to no, the user requires
-# to fix the AOF file using the "redis-check-aof" utility before to restart
-# the server.
-#
-# Note that if the AOF file will be found to be corrupted in the middle
-# the server will still exit with an error. This option only applies when
-# Redis will try to read more data from the AOF file but not enough bytes
-# will be found.
-aof-load-truncated yes
-
-################################ LUA SCRIPTING  ###############################
-
-# Max execution time of a Lua script in milliseconds.
-#
-# If the maximum execution time is reached Redis will log that a script is
-# still in execution after the maximum allowed time and will start to
-# reply to queries with an error.
-#
-# When a long running script exceeds the maximum execution time only the
-# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
-# used to stop a script that did not yet called write commands. The second
-# is the only way to shut down the server in the case a write command was
-# already issued by the script but the user doesn't want to wait for the natural
-# termination of the script.
-#
-# Set it to 0 or a negative value for unlimited execution without warnings.
-lua-time-limit 5000
-
-################################ REDIS CLUSTER  ###############################
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
-# in order to mark it as "mature" we need to wait for a non trivial percentage
-# of users to deploy it in production.
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
-# started as cluster nodes can. In order to start a Redis instance as a
-# cluster node enable the cluster support uncommenting the following:
-#
-cluster-enabled yes
-
-# Every cluster node has a cluster configuration file. This file is not
-# intended to be edited by hand. It is created and updated by Redis nodes.
-# Every Redis Cluster node requires a different cluster configuration file.
-# Make sure that instances running in the same system do not have
-# overlapping cluster configuration file names.
-#
-cluster-config-file redis-cluster-node-7003.conf
-
-# Cluster node timeout is the amount of milliseconds a node must be unreachable
-# for it to be considered in failure state.
-# Most other internal time limits are multiple of the node timeout.
-#
-# cluster-node-timeout 15000
-
-# A slave of a failing master will avoid to start a failover if its data
-# looks too old.
-#
-# There is no simple way for a slave to actually have a exact measure of
-# its "data age", so the following two checks are performed:
-#
-# 1) If there are multiple slaves able to failover, they exchange messages
-#    in order to try to give an advantage to the slave with the best
-#    replication offset (more data from the master processed).
-#    Slaves will try to get their rank by offset, and apply to the start
-#    of the failover a delay proportional to their rank.
-#
-# 2) Every single slave computes the time of the last interaction with
-#    its master. This can be the last ping or command received (if the master
-#    is still in the "connected" state), or the time that elapsed since the
-#    disconnection with the master (if the replication link is currently down).
-#    If the last interaction is too old, the slave will not try to failover
-#    at all.
-#
-# The point "2" can be tuned by user. Specifically a slave will not perform
-# the failover if, since the last interaction with the master, the time
-# elapsed is greater than:
-#
-#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
-#
-# So for example if node-timeout is 30 seconds, and the slave-validity-factor
-# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
-# slave will not try to failover if it was not able to talk with the master
-# for longer than 310 seconds.
-#
-# A large slave-validity-factor may allow slaves with too old data to failover
-# a master, while a too small value may prevent the cluster from being able to
-# elect a slave at all.
-#
-# For maximum availability, it is possible to set the slave-validity-factor
-# to a value of 0, which means, that slaves will always try to failover the
-# master regardless of the last time they interacted with the master.
-# (However they'll always try to apply a delay proportional to their
-# offset rank).
-#
-# Zero is the only value able to guarantee that when all the partitions heal
-# the cluster will always be able to continue.
-#
-# cluster-slave-validity-factor 10
-
-# Cluster slaves are able to migrate to orphaned masters, that are masters
-# that are left without working slaves. This improves the cluster ability
-# to resist to failures as otherwise an orphaned master can't be failed over
-# in case of failure if it has no working slaves.
-#
-# Slaves migrate to orphaned masters only if there are still at least a
-# given number of other working slaves for their old master. This number
-# is the "migration barrier". A migration barrier of 1 means that a slave
-# will migrate only if there is at least 1 other working slave for its master
-# and so forth. It usually reflects the number of slaves you want for every
-# master in your cluster.
-#
-# Default is 1 (slaves migrate only if their masters remain with at least
-# one slave). To disable migration just set it to a very large value.
-# A value of 0 can be set but is useful only for debugging and dangerous
-# in production.
-#
-# cluster-migration-barrier 1
-
-# By default Redis Cluster nodes stop accepting queries if they detect there
-# is at least an hash slot uncovered (no available node is serving it).
-# This way if the cluster is partially down (for example a range of hash slots
-# are no longer covered) all the cluster becomes, eventually, unavailable.
-# It automatically returns available as soon as all the slots are covered again.
-#
-# However sometimes you want the subset of the cluster which is working,
-# to continue to accept queries for the part of the key space that is still
-# covered. In order to do so, just set the cluster-require-full-coverage
-# option to no.
-#
-# cluster-require-full-coverage yes
-
-# In order to setup your cluster make sure to read the documentation
-# available at http://redis.io web site.
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than 10000
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 128
-
-################################ LATENCY MONITOR ##############################
-
-# The Redis latency monitoring subsystem samples different operations
-# at runtime in order to collect data related to possible sources of
-# latency of a Redis instance.
-#
-# Via the LATENCY command this information is available to the user that can
-# print graphs and obtain reports.
-#
-# The system only logs operations that were performed in a time equal or
-# greater than the amount of milliseconds specified via the
-# latency-monitor-threshold configuration directive. When its value is set
-# to zero, the latency monitor is turned off.
-#
-# By default latency monitoring is disabled since it is mostly not needed
-# if you don't have latency issues, and collecting data has a performance
-# impact, that while very small, can be measured under big load. Latency
-# monitoring can easily be enabled at runtime using the command
-# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
-latency-monitor-threshold 0
-
-############################# EVENT NOTIFICATION ##############################
-
-# Redis can notify Pub/Sub clients about events happening in the key space.
-# This feature is documented at http://redis.io/topics/notifications
-#
-# For instance if keyspace events notification is enabled, and a client
-# performs a DEL operation on key "foo" stored in the Database 0, two
-# messages will be published via Pub/Sub:
-#
-# PUBLISH __keyspace@0__:foo del
-# PUBLISH __keyevent@0__:del foo
-#
-# It is possible to select the events that Redis will notify among a set
-# of classes. Every class is identified by a single character:
-#
-#  K     Keyspace events, published with __keyspace@<db>__ prefix.
-#  E     Keyevent events, published with __keyevent@<db>__ prefix.
-#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
-#  $     String commands
-#  l     List commands
-#  s     Set commands
-#  h     Hash commands
-#  z     Sorted set commands
-#  x     Expired events (events generated every time a key expires)
-#  e     Evicted events (events generated when a key is evicted for maxmemory)
-#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
-#
-#  The "notify-keyspace-events" takes as argument a string that is composed
-#  by zero or multiple characters. The empty string means that notifications
-#  are disabled at all.
-#
-#  Example: to enable list and generic events, from the point of view of the
-#           event name, use:
-#
-#  notify-keyspace-events Elg
-#
-#  Example 2: to get the stream of the expired keys subscribing to channel
-#             name __keyevent@0__:expired use:
-#
-#  notify-keyspace-events Ex
-#
-#  By default all notifications are disabled because most users don't need
-#  this feature and the feature has some overhead. Note that if you don't
-#  specify at least one of K or E, no events will be delivered.
-notify-keyspace-events ""
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded using a memory efficient data structure when they have a
-# small number of entries, and the biggest entry does not exceed a given
-# threshold. These thresholds can be configured using the following directives.
-hash-max-ziplist-entries 512
-hash-max-ziplist-value 64
-
-# Lists are also encoded in a special way to save a lot of space.
-# The number of entries allowed per internal list node can be specified
-# as a fixed maximum size or a maximum number of elements.
-# For a fixed maximum size, use -5 through -1, meaning:
-# -5: max size: 64 Kb  <-- not recommended for normal workloads
-# -4: max size: 32 Kb  <-- not recommended
-# -3: max size: 16 Kb  <-- probably not recommended
-# -2: max size: 8 Kb   <-- good
-# -1: max size: 4 Kb   <-- good
-# Positive numbers mean store up to _exactly_ that number of elements
-# per list node.
-# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
-# but if your use case is unique, adjust the settings as necessary.
-list-max-ziplist-size -2
-
-# Lists may also be compressed.
-# Compress depth is the number of quicklist ziplist nodes from *each* side of
-# the list to *exclude* from compression.  The head and tail of the list
-# are always uncompressed for fast push/pop operations.  Settings are:
-# 0: disable all list compression
-# 1: depth 1 means "don't start compressing until after 1 node into the list,
-#    going from either the head or tail"
-#    So: [head]->node->node->...->node->[tail]
-#    [head], [tail] will always be uncompressed; inner nodes will compress.
-# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
-#    2 here means: don't compress head or head->next or tail->prev or tail,
-#    but compress all nodes between them.
-# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
-# etc.
-list-compress-depth 0
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happen to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries 512
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-
-# HyperLogLog sparse representation bytes limit. The limit includes the
-# 16 bytes header. When an HyperLogLog using the sparse representation crosses
-# this limit, it is converted into the dense representation.
-#
-# A value greater than 16000 is totally useless, since at that point the
-# dense representation is more memory efficient.
-#
-# The suggested value is ~ 3000 in order to have the benefits of
-# the space efficient encoding without slowing down too much PFADD,
-# which is O(N) with the sparse encoding. The value can be raised to
-# ~ 10000 when CPU is not a concern, but space is, and the data set is
-# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
-hll-sparse-max-bytes 3000
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation Redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into a hash table
-# that is rehashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# actively rehash the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply from time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing yes
-
-# The client output buffer limits can be used to force disconnection of clients
-# that are not reading data from the server fast enough for some reason (a
-# common reason is that a Pub/Sub client can't consume messages as fast as the
-# publisher can produce them).
-#
-# The limit can be set differently for the three different classes of clients:
-#
-# normal -> normal clients including MONITOR clients
-# slave  -> slave clients
-# pubsub -> clients subscribed to at least one pubsub channel or pattern
-#
-# The syntax of every client-output-buffer-limit directive is the following:
-#
-# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
-#
-# A client is immediately disconnected once the hard limit is reached, or if
-# the soft limit is reached and remains reached for the specified number of
-# seconds (continuously).
-# So for instance if the hard limit is 32 megabytes and the soft limit is
-# 16 megabytes / 10 seconds, the client will get disconnected immediately
-# if the size of the output buffers reach 32 megabytes, but will also get
-# disconnected if the client reaches 16 megabytes and continuously overcomes
-# the limit for 10 seconds.
-#
-# By default normal clients are not limited because they don't receive data
-# without asking (in a push way), but just after a request, so only
-# asynchronous clients may create a scenario where data is requested faster
-# than it can read.
-#
-# Instead there is a default limit for pubsub and slave clients, since
-# subscribers and slaves receive data in a push fashion.
-#
-# Both the hard or the soft limit can be disabled by setting them to zero.
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit slave 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-
-# Redis calls an internal function to perform many background tasks, like
-# closing connections of clients in timeout, purging expired keys that are
-# never requested, and so forth.
-#
-# Not all tasks are performed with the same frequency, but Redis checks for
-# tasks to perform according to the specified "hz" value.
-#
-# By default "hz" is set to 10. Raising the value will use more CPU when
-# Redis is idle, but at the same time will make Redis more responsive when
-# there are many keys expiring at the same time, and timeouts may be
-# handled with more precision.
-#
-# The range is between 1 and 500, however a value over 100 is usually not
-# a good idea. Most users should use the default of 10 and raise this up to
-# 100 only in environments where very low latency is required.
-hz 10
-
-# When a child rewrites the AOF file, if the following option is enabled
-# the file will be fsync-ed every 32 MB of data generated. This is useful
-# in order to commit the file to the disk more incrementally and avoid
-# big latency spikes.
-aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7004.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7004.conf
deleted file mode 100644
index 810a780..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-7004.conf
+++ /dev/null
@@ -1,1018 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specify
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all Redis servers but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
-# from admin or Redis Sentinel. Since Redis always uses the last processed
-# line as value of a configuration directive, you'd better put includes
-# at the beginning of this file to avoid overwriting config change at runtime.
-#
-# If instead you are interested in using includes to override configuration
-# options, it is better to use include as the last line.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-
-################################## NETWORK #####################################
-
-# By default, if no "bind" configuration directive is specified, Redis listens
-# for connections from all the network interfaces available on the server.
-# It is possible to listen to just one or multiple selected interfaces using
-# the "bind" configuration directive, followed by one or more IP addresses.
-#
-# Examples:
-#
-# bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1 ::1
-#
-# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
-# internet, binding to all the interfaces is dangerous and will expose the
-# instance to everybody on the internet. So by default we uncomment the
-# following bind directive, that will force Redis to listen only into
-# the IPv4 lookback interface address (this means Redis will be able to
-# accept connections only from clients running into the same computer it
-# is running).
-#
-# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
-# JUST COMMENT THE FOLLOWING LINE.
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1
-
-# Protected mode is a layer of security protection, in order to avoid that
-# Redis instances left open on the internet are accessed and exploited.
-#
-# When protected mode is on and if:
-#
-# 1) The server is not binding explicitly to a set of addresses using the
-#    "bind" directive.
-# 2) No password is configured.
-#
-# The server only accepts connections from clients connecting from the
-# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
-# sockets.
-#
-# By default protected mode is enabled. You should disable it only if
-# you are sure you want clients from other hosts to connect to Redis
-# even if no authentication is configured, nor a specific set of interfaces
-# are explicitly listed using the "bind" directive.
-protected-mode yes
-
-# Accept connections on the specified port, default is 6379 (IANA #815344).
-# If port 0 is specified Redis will not listen on a TCP socket.
-port 7004
-
-# TCP listen() backlog.
-#
-# In high requests-per-second environments you need an high backlog in order
-# to avoid slow clients connections issues. Note that the Linux kernel
-# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
-# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
-# in order to get the desired effect.
-tcp-backlog 511
-
-# Unix socket.
-#
-# Specify the path for the Unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-unixsocket /tmp/redis-nchan-cluster-7004.sock
-unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 0
-
-# TCP keepalive.
-#
-# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
-# of communication. This is useful for two reasons:
-#
-# 1) Detect dead peers.
-# 2) Take the connection alive from the point of view of network
-#    equipment in the middle.
-#
-# On Linux, the specified value (in seconds) is the period used to send ACKs.
-# Note that to close the connection the double of the time is needed.
-# On other kernels the period depends on the kernel configuration.
-#
-# A reasonable value for this option is 300 seconds, which is the new
-# Redis default starting with Redis 3.2.1.
-tcp-keepalive 60
-
-################################# GENERAL #####################################
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# If you run Redis from upstart or systemd, Redis can interact with your
-# supervision tree. Options:
-#   supervised no      - no supervision interaction
-#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
-#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
-#   supervised auto    - detect upstart or systemd method based on
-#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
-# Note: these supervision methods only signal "process is ready."
-#       They do not enable continuous liveness pings back to your supervisor.
-supervised no
-
-# If a pid file is specified, Redis writes it where specified at startup
-# and removes it at exit.
-#
-# When the server runs non daemonized, no pid file is created if none is
-# specified in the configuration. When the server is daemonized, the pid file
-# is used even if not specified, defaulting to "/var/run/redis.pid".
-#
-# Creating a pid file is best effort: if Redis is not able to create it
-# nothing bad happens, the server will start and run normally.
-pidfile /tmp/redis-nchan-cluster-7004.pid
-
-# Specify the server verbosity level.
-# This can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel notice
-
-# Specify the log file name. Also the empty string can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile /dev/stdout
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-# syslog-enabled no
-
-# Specify the syslog identity.
-# syslog-ident redis
-
-# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
-# syslog-facility local0
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################ SNAPSHOTTING  ################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving completely by commenting out all "save" lines.
-#
-#   It is also possible to remove all the previously configured save
-#   points by adding a save directive with a single empty string argument
-#   like in the following example:
-#
-#   save ""
-
-#save 900 1
-#save 300 10
-#save 60 10000
-
-# By default Redis will stop accepting writes if RDB snapshots are enabled
-# (at least one save point) and the latest background save failed.
-# This will make the user aware (in a hard way) that data is not persisting
-# on disk properly, otherwise chances are that no one will notice and some
-# disaster will happen.
-#
-# If the background saving process will start working again Redis will
-# automatically allow writes again.
-#
-# However if you have setup your proper monitoring of the Redis server
-# and persistence, you may want to disable this feature so that Redis will
-# continue to work as usual even if there are problems with disk,
-# permissions, and so forth.
-stop-writes-on-bgsave-error yes
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression yes
-
-# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
-# This makes the format more resistant to corruption but there is a performance
-# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
-# for maximum performances.
-#
-# RDB files created with checksum disabled have a checksum of zero that will
-# tell the loading code to skip the check.
-rdbchecksum yes
-
-# The filename where to dump the DB
-dbfilename dump-7004.rdb
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# The Append Only File will also be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir ./
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. A few things to understand ASAP about Redis replication.
-#
-# 1) Redis replication is asynchronous, but you can configure a master to
-#    stop accepting writes if it appears to be not connected with at least
-#    a given number of slaves.
-# 2) Redis slaves are able to perform a partial resynchronization with the
-#    master if the replication link is lost for a relatively small amount of
-#    time. You may want to configure the replication backlog size (see the next
-#    sections of this file) with a sensible value depending on your needs.
-# 3) Replication is automatic and does not need user intervention. After a
-#    network partition slaves automatically try to reconnect to masters
-#    and resynchronize with them.
-#
-# slaveof <masterip> <masterport>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-
-# When a slave loses its connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of date data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data yes
-
-# You can configure a slave instance to accept writes or not. Writing against
-# a slave instance may be useful to store some ephemeral data (because data
-# written on a slave will be easily deleted after resync with the master) but
-# may also cause problems if clients are writing to it because of a
-# misconfiguration.
-#
-# Since Redis 2.6 by default slaves are read-only.
-#
-# Note: read only slaves are not designed to be exposed to untrusted clients
-# on the internet. It's just a protection layer against misuse of the instance.
-# Still a read only slave exports by default all the administrative commands
-# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
-# security of read only slaves using 'rename-command' to shadow all the
-# administrative / dangerous commands.
-slave-read-only no
-
-# Replication SYNC strategy: disk or socket.
-#
-# -------------------------------------------------------
-# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
-# -------------------------------------------------------
-#
-# New slaves and reconnecting slaves that are not able to continue the replication
-# process just receiving differences, need to do what is called a "full
-# synchronization". An RDB file is transmitted from the master to the slaves.
-# The transmission can happen in two different ways:
-#
-# 1) Disk-backed: The Redis master creates a new process that writes the RDB
-#                 file on disk. Later the file is transferred by the parent
-#                 process to the slaves incrementally.
-# 2) Diskless: The Redis master creates a new process that directly writes the
-#              RDB file to slave sockets, without touching the disk at all.
-#
-# With disk-backed replication, while the RDB file is generated, more slaves
-# can be queued and served with the RDB file as soon as the current child producing
-# the RDB file finishes its work. With diskless replication instead once
-# the transfer starts, new slaves arriving will be queued and a new transfer
-# will start when the current one terminates.
-#
-# When diskless replication is used, the master waits a configurable amount of
-# time (in seconds) before starting the transfer in the hope that multiple slaves
-# will arrive and the transfer can be parallelized.
-#
-# With slow disks and fast (large bandwidth) networks, diskless replication
-# works better.
-repl-diskless-sync no
-
-# When diskless replication is enabled, it is possible to configure the delay
-# the server waits in order to spawn the child that transfers the RDB via socket
-# to the slaves.
-#
-# This is important since once the transfer starts, it is not possible to serve
-# new slaves arriving, that will be queued for the next RDB transfer, so the server
-# waits a delay in order to let more slaves arrive.
-#
-# The delay is specified in seconds, and by default is 5 seconds. To disable
-# it entirely just set it to 0 seconds and the transfer will start ASAP.
-repl-diskless-sync-delay 5
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-
-# The following option sets the replication timeout for:
-#
-# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
-# 2) Master timeout from the point of view of slaves (data, pings).
-# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-
-# Disable TCP_NODELAY on the slave socket after SYNC?
-#
-# If you select "yes" Redis will use a smaller number of TCP packets and
-# less bandwidth to send data to slaves. But this can add a delay for
-# the data to appear on the slave side, up to 40 milliseconds with
-# Linux kernels using a default configuration.
-#
-# If you select "no" the delay for data to appear on the slave side will
-# be reduced but more bandwidth will be used for replication.
-#
-# By default we optimize for low latency, but in very high traffic conditions
-# or when the master and slaves are many hops away, turning this to "yes" may
-# be a good idea.
-repl-disable-tcp-nodelay no
-
-# Set the replication backlog size. The backlog is a buffer that accumulates
-# slave data when slaves are disconnected for some time, so that when a slave
-# wants to reconnect again, often a full resync is not needed, but a partial
-# resync is enough, just passing the portion of data the slave missed while
-# disconnected.
-#
-# The bigger the replication backlog, the longer the time the slave can be
-# disconnected and later be able to perform a partial resynchronization.
-#
-# The backlog is only allocated once there is at least a slave connected.
-#
-# repl-backlog-size 1mb
-
-# After a master has no longer connected slaves for some time, the backlog
-# will be freed. The following option configures the amount of seconds that
-# need to elapse, starting from the time the last slave disconnected, for
-# the backlog buffer to be freed.
-#
-# A value of 0 means to never release the backlog.
-#
-# repl-backlog-ttl 3600
-
-# The slave priority is an integer number published by Redis in the INFO output.
-# It is used by Redis Sentinel in order to select a slave to promote into a
-# master if the master is no longer working correctly.
-#
-# A slave with a low priority number is considered better for promotion, so
-# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
-# pick the one with priority 10, that is the lowest.
-#
-# However a special priority of 0 marks the slave as not able to perform the
-# role of master, so a slave with priority of 0 will never be selected by
-# Redis Sentinel for promotion.
-#
-# By default the priority is 100.
-slave-priority 100
-
-# It is possible for a master to stop accepting writes if there are less than
-# N slaves connected, having a lag less or equal than M seconds.
-#
-# The N slaves need to be in "online" state.
-#
-# The lag in seconds, that must be <= the specified value, is calculated from
-# the last ping received from the slave, that is usually sent every second.
-#
-# This option does not GUARANTEE that N replicas will accept the write, but
-# will limit the window of exposure for lost writes in case not enough slaves
-# are available, to the specified number of seconds.
-#
-# For example to require at least 3 slaves with a lag <= 10 seconds use:
-#
-# min-slaves-to-write 3
-# min-slaves-max-lag 10
-#
-# Setting one or the other to 0 disables the feature.
-#
-# By default min-slaves-to-write is set to 0 (feature disabled) and
-# min-slaves-max-lag is set to 10.
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-# requirepass foobared
-
-# Command renaming.
-#
-# It is possible to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# hard to guess so that it will still be available for internal-use tools
-# but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possible to completely kill a command by renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-#
-# Please note that changing the name of commands that are logged into the
-# AOF file or transmitted to slaves may cause problems.
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default
-# this limit is set to 10000 clients, however if the Redis server is not
-# able to configure the process file limit to allow for the specified limit
-# the max number of allowed clients is set to the current file limit
-# minus 32 (as Redis reserves a few file descriptors for internal uses).
-#
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 10000
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# according to the eviction policy selected (see maxmemory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# a hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached. You can select among five behaviors:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key according to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys-random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with any of the above policies, Redis will return an error on write
-#       operations, when there are no suitable keys for eviction.
-#
-#       At the date of writing these commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy noeviction
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can tune it for speed or
-# accuracy. For default Redis will check five keys and pick the one that was
-# used less recently, you can change the sample size using the following
-# configuration directive.
-#
-# The default of 5 produces good enough results. 10 Approximates very closely
-# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
-#
-# maxmemory-samples 5
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. This mode is
-# good enough in many applications, but an issue with the Redis process or
-# a power outage may result into a few minutes of writes lost (depending on
-# the configured save points).
-#
-# The Append Only File is an alternative persistence mode that provides
-# much better durability. For instance using the default data fsync policy
-# (see later in the config file) Redis can lose just one second of writes in a
-# dramatic event like a server power outage, or a single write if something
-# wrong with the Redis process itself happens, but the operating system is
-# still running correctly.
-#
-# AOF and RDB persistence can be enabled at the same time without problems.
-# If the AOF is enabled on startup Redis will load the AOF, that is the file
-# with the better durability guarantees.
-#
-# Please check http://redis.io/topics/persistence for more information.
-
-appendonly no
-
-# The name of the append only file (default: "appendonly.aof")
-
-appendfilename "appendonly.aof"
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead of waiting for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log. Slow, Safest.
-# everysec: fsync only one time every second. Compromise.
-#
-# The default is "everysec", as that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# More details please check the following article:
-# http://antirez.com/post/redis-persistence-demystified.html
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-# appendfsync everysec
-appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving, the durability of Redis is
-# the same as "appendfsync none". In practical terms, this means that it is
-# possible to lose up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-
-no-appendfsync-on-rewrite no
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size grows by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (if no rewrite has happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a percentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-
-# An AOF file may be found to be truncated at the end during the Redis
-# startup process, when the AOF data gets loaded back into memory.
-# This may happen when the system where Redis is running
-# crashes, especially when an ext4 filesystem is mounted without the
-# data=ordered option (however this can't happen when Redis itself
-# crashes or aborts but the operating system still works correctly).
-#
-# Redis can either exit with an error when this happens, or load as much
-# data as possible (the default now) and start if the AOF file is found
-# to be truncated at the end. The following option controls this behavior.
-#
-# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
-# the Redis server starts emitting a log to inform the user of the event.
-# Otherwise if the option is set to no, the server aborts with an error
-# and refuses to start. When the option is set to no, the user requires
-# to fix the AOF file using the "redis-check-aof" utility before to restart
-# the server.
-#
-# Note that if the AOF file will be found to be corrupted in the middle
-# the server will still exit with an error. This option only applies when
-# Redis will try to read more data from the AOF file but not enough bytes
-# will be found.
-aof-load-truncated yes
-
-################################ LUA SCRIPTING  ###############################
-
-# Max execution time of a Lua script in milliseconds.
-#
-# If the maximum execution time is reached Redis will log that a script is
-# still in execution after the maximum allowed time and will start to
-# reply to queries with an error.
-#
-# When a long running script exceeds the maximum execution time only the
-# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
-# used to stop a script that did not yet called write commands. The second
-# is the only way to shut down the server in the case a write command was
-# already issued by the script but the user doesn't want to wait for the natural
-# termination of the script.
-#
-# Set it to 0 or a negative value for unlimited execution without warnings.
-lua-time-limit 5000
-
-################################ REDIS CLUSTER  ###############################
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
-# in order to mark it as "mature" we need to wait for a non trivial percentage
-# of users to deploy it in production.
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
-# started as cluster nodes can. In order to start a Redis instance as a
-# cluster node enable the cluster support uncommenting the following:
-#
-cluster-enabled yes
-
-# Every cluster node has a cluster configuration file. This file is not
-# intended to be edited by hand. It is created and updated by Redis nodes.
-# Every Redis Cluster node requires a different cluster configuration file.
-# Make sure that instances running in the same system do not have
-# overlapping cluster configuration file names.
-#
-cluster-config-file redis-cluster-node-7004.conf
-
-# Cluster node timeout is the amount of milliseconds a node must be unreachable
-# for it to be considered in failure state.
-# Most other internal time limits are multiple of the node timeout.
-#
-# cluster-node-timeout 15000
-
-# A slave of a failing master will avoid to start a failover if its data
-# looks too old.
-#
-# There is no simple way for a slave to actually have a exact measure of
-# its "data age", so the following two checks are performed:
-#
-# 1) If there are multiple slaves able to failover, they exchange messages
-#    in order to try to give an advantage to the slave with the best
-#    replication offset (more data from the master processed).
-#    Slaves will try to get their rank by offset, and apply to the start
-#    of the failover a delay proportional to their rank.
-#
-# 2) Every single slave computes the time of the last interaction with
-#    its master. This can be the last ping or command received (if the master
-#    is still in the "connected" state), or the time that elapsed since the
-#    disconnection with the master (if the replication link is currently down).
-#    If the last interaction is too old, the slave will not try to failover
-#    at all.
-#
-# The point "2" can be tuned by user. Specifically a slave will not perform
-# the failover if, since the last interaction with the master, the time
-# elapsed is greater than:
-#
-#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
-#
-# So for example if node-timeout is 30 seconds, and the slave-validity-factor
-# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
-# slave will not try to failover if it was not able to talk with the master
-# for longer than 310 seconds.
-#
-# A large slave-validity-factor may allow slaves with too old data to failover
-# a master, while a too small value may prevent the cluster from being able to
-# elect a slave at all.
-#
-# For maximum availability, it is possible to set the slave-validity-factor
-# to a value of 0, which means, that slaves will always try to failover the
-# master regardless of the last time they interacted with the master.
-# (However they'll always try to apply a delay proportional to their
-# offset rank).
-#
-# Zero is the only value able to guarantee that when all the partitions heal
-# the cluster will always be able to continue.
-#
-# cluster-slave-validity-factor 10
-
-# Cluster slaves are able to migrate to orphaned masters, that are masters
-# that are left without working slaves. This improves the cluster ability
-# to resist to failures as otherwise an orphaned master can't be failed over
-# in case of failure if it has no working slaves.
-#
-# Slaves migrate to orphaned masters only if there are still at least a
-# given number of other working slaves for their old master. This number
-# is the "migration barrier". A migration barrier of 1 means that a slave
-# will migrate only if there is at least 1 other working slave for its master
-# and so forth. It usually reflects the number of slaves you want for every
-# master in your cluster.
-#
-# Default is 1 (slaves migrate only if their masters remain with at least
-# one slave). To disable migration just set it to a very large value.
-# A value of 0 can be set but is useful only for debugging and dangerous
-# in production.
-#
-# cluster-migration-barrier 1
-
-# By default Redis Cluster nodes stop accepting queries if they detect there
-# is at least an hash slot uncovered (no available node is serving it).
-# This way if the cluster is partially down (for example a range of hash slots
-# are no longer covered) all the cluster becomes, eventually, unavailable.
-# It automatically returns available as soon as all the slots are covered again.
-#
-# However sometimes you want the subset of the cluster which is working,
-# to continue to accept queries for the part of the key space that is still
-# covered. In order to do so, just set the cluster-require-full-coverage
-# option to no.
-#
-# cluster-require-full-coverage yes
-
-# In order to setup your cluster make sure to read the documentation
-# available at http://redis.io web site.
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than 10000
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 128
-
-################################ LATENCY MONITOR ##############################
-
-# The Redis latency monitoring subsystem samples different operations
-# at runtime in order to collect data related to possible sources of
-# latency of a Redis instance.
-#
-# Via the LATENCY command this information is available to the user that can
-# print graphs and obtain reports.
-#
-# The system only logs operations that were performed in a time equal or
-# greater than the amount of milliseconds specified via the
-# latency-monitor-threshold configuration directive. When its value is set
-# to zero, the latency monitor is turned off.
-#
-# By default latency monitoring is disabled since it is mostly not needed
-# if you don't have latency issues, and collecting data has a performance
-# impact, that while very small, can be measured under big load. Latency
-# monitoring can easily be enabled at runtime using the command
-# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
-latency-monitor-threshold 0
-
-############################# EVENT NOTIFICATION ##############################
-
-# Redis can notify Pub/Sub clients about events happening in the key space.
-# This feature is documented at http://redis.io/topics/notifications
-#
-# For instance if keyspace events notification is enabled, and a client
-# performs a DEL operation on key "foo" stored in the Database 0, two
-# messages will be published via Pub/Sub:
-#
-# PUBLISH __keyspace@0__:foo del
-# PUBLISH __keyevent@0__:del foo
-#
-# It is possible to select the events that Redis will notify among a set
-# of classes. Every class is identified by a single character:
-#
-#  K     Keyspace events, published with __keyspace@<db>__ prefix.
-#  E     Keyevent events, published with __keyevent@<db>__ prefix.
-#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
-#  $     String commands
-#  l     List commands
-#  s     Set commands
-#  h     Hash commands
-#  z     Sorted set commands
-#  x     Expired events (events generated every time a key expires)
-#  e     Evicted events (events generated when a key is evicted for maxmemory)
-#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
-#
-#  The "notify-keyspace-events" takes as argument a string that is composed
-#  by zero or multiple characters. The empty string means that notifications
-#  are disabled at all.
-#
-#  Example: to enable list and generic events, from the point of view of the
-#           event name, use:
-#
-#  notify-keyspace-events Elg
-#
-#  Example 2: to get the stream of the expired keys subscribing to channel
-#             name __keyevent@0__:expired use:
-#
-#  notify-keyspace-events Ex
-#
-#  By default all notifications are disabled because most users don't need
-#  this feature and the feature has some overhead. Note that if you don't
-#  specify at least one of K or E, no events will be delivered.
-notify-keyspace-events ""
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded using a memory efficient data structure when they have a
-# small number of entries, and the biggest entry does not exceed a given
-# threshold. These thresholds can be configured using the following directives.
-hash-max-ziplist-entries 512
-hash-max-ziplist-value 64
-
-# Lists are also encoded in a special way to save a lot of space.
-# The number of entries allowed per internal list node can be specified
-# as a fixed maximum size or a maximum number of elements.
-# For a fixed maximum size, use -5 through -1, meaning:
-# -5: max size: 64 Kb  <-- not recommended for normal workloads
-# -4: max size: 32 Kb  <-- not recommended
-# -3: max size: 16 Kb  <-- probably not recommended
-# -2: max size: 8 Kb   <-- good
-# -1: max size: 4 Kb   <-- good
-# Positive numbers mean store up to _exactly_ that number of elements
-# per list node.
-# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
-# but if your use case is unique, adjust the settings as necessary.
-list-max-ziplist-size -2
-
-# Lists may also be compressed.
-# Compress depth is the number of quicklist ziplist nodes from *each* side of
-# the list to *exclude* from compression.  The head and tail of the list
-# are always uncompressed for fast push/pop operations.  Settings are:
-# 0: disable all list compression
-# 1: depth 1 means "don't start compressing until after 1 node into the list,
-#    going from either the head or tail"
-#    So: [head]->node->node->...->node->[tail]
-#    [head], [tail] will always be uncompressed; inner nodes will compress.
-# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
-#    2 here means: don't compress head or head->next or tail->prev or tail,
-#    but compress all nodes between them.
-# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
-# etc.
-list-compress-depth 0
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happen to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries 512
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-
-# HyperLogLog sparse representation bytes limit. The limit includes the
-# 16 bytes header. When an HyperLogLog using the sparse representation crosses
-# this limit, it is converted into the dense representation.
-#
-# A value greater than 16000 is totally useless, since at that point the
-# dense representation is more memory efficient.
-#
-# The suggested value is ~ 3000 in order to have the benefits of
-# the space efficient encoding without slowing down too much PFADD,
-# which is O(N) with the sparse encoding. The value can be raised to
-# ~ 10000 when CPU is not a concern, but space is, and the data set is
-# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
-hll-sparse-max-bytes 3000
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation Redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into a hash table
-# that is rehashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# actively rehash the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply from time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing yes
-
-# The client output buffer limits can be used to force disconnection of clients
-# that are not reading data from the server fast enough for some reason (a
-# common reason is that a Pub/Sub client can't consume messages as fast as the
-# publisher can produce them).
-#
-# The limit can be set differently for the three different classes of clients:
-#
-# normal -> normal clients including MONITOR clients
-# slave  -> slave clients
-# pubsub -> clients subscribed to at least one pubsub channel or pattern
-#
-# The syntax of every client-output-buffer-limit directive is the following:
-#
-# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
-#
-# A client is immediately disconnected once the hard limit is reached, or if
-# the soft limit is reached and remains reached for the specified number of
-# seconds (continuously).
-# So for instance if the hard limit is 32 megabytes and the soft limit is
-# 16 megabytes / 10 seconds, the client will get disconnected immediately
-# if the size of the output buffers reach 32 megabytes, but will also get
-# disconnected if the client reaches 16 megabytes and continuously overcomes
-# the limit for 10 seconds.
-#
-# By default normal clients are not limited because they don't receive data
-# without asking (in a push way), but just after a request, so only
-# asynchronous clients may create a scenario where data is requested faster
-# than it can read.
-#
-# Instead there is a default limit for pubsub and slave clients, since
-# subscribers and slaves receive data in a push fashion.
-#
-# Both the hard or the soft limit can be disabled by setting them to zero.
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit slave 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-
-# Redis calls an internal function to perform many background tasks, like
-# closing connections of clients in timeout, purging expired keys that are
-# never requested, and so forth.
-#
-# Not all tasks are performed with the same frequency, but Redis checks for
-# tasks to perform according to the specified "hz" value.
-#
-# By default "hz" is set to 10. Raising the value will use more CPU when
-# Redis is idle, but at the same time will make Redis more responsive when
-# there are many keys expiring at the same time, and timeouts may be
-# handled with more precision.
-#
-# The range is between 1 and 500, however a value over 100 is usually not
-# a good idea. Most users should use the default of 10 and raise this up to
-# 100 only in environments where very low latency is required.
-hz 10
-
-# When a child rewrites the AOF file, if the following option is enabled
-# the file will be fsync-ed every 32 MB of data generated. This is useful
-# in order to commit the file to the disk more incrementally and avoid
-# big latency spikes.
-aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7005.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7005.conf
deleted file mode 100644
index 1b32e09..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-7005.conf
+++ /dev/null
@@ -1,1018 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specify
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all Redis servers but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
-# from admin or Redis Sentinel. Since Redis always uses the last processed
-# line as value of a configuration directive, you'd better put includes
-# at the beginning of this file to avoid overwriting config change at runtime.
-#
-# If instead you are interested in using includes to override configuration
-# options, it is better to use include as the last line.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-
-################################## NETWORK #####################################
-
-# By default, if no "bind" configuration directive is specified, Redis listens
-# for connections from all the network interfaces available on the server.
-# It is possible to listen to just one or multiple selected interfaces using
-# the "bind" configuration directive, followed by one or more IP addresses.
-#
-# Examples:
-#
-# bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1 ::1
-#
-# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
-# internet, binding to all the interfaces is dangerous and will expose the
-# instance to everybody on the internet. So by default we uncomment the
-# following bind directive, that will force Redis to listen only into
-# the IPv4 lookback interface address (this means Redis will be able to
-# accept connections only from clients running into the same computer it
-# is running).
-#
-# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
-# JUST COMMENT THE FOLLOWING LINE.
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1
-
-# Protected mode is a layer of security protection, in order to avoid that
-# Redis instances left open on the internet are accessed and exploited.
-#
-# When protected mode is on and if:
-#
-# 1) The server is not binding explicitly to a set of addresses using the
-#    "bind" directive.
-# 2) No password is configured.
-#
-# The server only accepts connections from clients connecting from the
-# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
-# sockets.
-#
-# By default protected mode is enabled. You should disable it only if
-# you are sure you want clients from other hosts to connect to Redis
-# even if no authentication is configured, nor a specific set of interfaces
-# are explicitly listed using the "bind" directive.
-protected-mode yes
-
-# Accept connections on the specified port, default is 6379 (IANA #815344).
-# If port 0 is specified Redis will not listen on a TCP socket.
-port 7005
-
-# TCP listen() backlog.
-#
-# In high requests-per-second environments you need an high backlog in order
-# to avoid slow clients connections issues. Note that the Linux kernel
-# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
-# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
-# in order to get the desired effect.
-tcp-backlog 511
-
-# Unix socket.
-#
-# Specify the path for the Unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-unixsocket /tmp/redis-nchan-cluster-7005.sock
-unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 0
-
-# TCP keepalive.
-#
-# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
-# of communication. This is useful for two reasons:
-#
-# 1) Detect dead peers.
-# 2) Take the connection alive from the point of view of network
-#    equipment in the middle.
-#
-# On Linux, the specified value (in seconds) is the period used to send ACKs.
-# Note that to close the connection the double of the time is needed.
-# On other kernels the period depends on the kernel configuration.
-#
-# A reasonable value for this option is 300 seconds, which is the new
-# Redis default starting with Redis 3.2.1.
-tcp-keepalive 60
-
-################################# GENERAL #####################################
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# If you run Redis from upstart or systemd, Redis can interact with your
-# supervision tree. Options:
-#   supervised no      - no supervision interaction
-#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
-#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
-#   supervised auto    - detect upstart or systemd method based on
-#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
-# Note: these supervision methods only signal "process is ready."
-#       They do not enable continuous liveness pings back to your supervisor.
-supervised no
-
-# If a pid file is specified, Redis writes it where specified at startup
-# and removes it at exit.
-#
-# When the server runs non daemonized, no pid file is created if none is
-# specified in the configuration. When the server is daemonized, the pid file
-# is used even if not specified, defaulting to "/var/run/redis.pid".
-#
-# Creating a pid file is best effort: if Redis is not able to create it
-# nothing bad happens, the server will start and run normally.
-pidfile /tmp/redis-nchan-cluster-7005.pid
-
-# Specify the server verbosity level.
-# This can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel notice
-
-# Specify the log file name. Also the empty string can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile /dev/stdout
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-# syslog-enabled no
-
-# Specify the syslog identity.
-# syslog-ident redis
-
-# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
-# syslog-facility local0
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################ SNAPSHOTTING  ################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving completely by commenting out all "save" lines.
-#
-#   It is also possible to remove all the previously configured save
-#   points by adding a save directive with a single empty string argument
-#   like in the following example:
-#
-#   save ""
-
-#save 900 1
-#save 300 10
-#save 60 10000
-
-# By default Redis will stop accepting writes if RDB snapshots are enabled
-# (at least one save point) and the latest background save failed.
-# This will make the user aware (in a hard way) that data is not persisting
-# on disk properly, otherwise chances are that no one will notice and some
-# disaster will happen.
-#
-# If the background saving process will start working again Redis will
-# automatically allow writes again.
-#
-# However if you have setup your proper monitoring of the Redis server
-# and persistence, you may want to disable this feature so that Redis will
-# continue to work as usual even if there are problems with disk,
-# permissions, and so forth.
-stop-writes-on-bgsave-error yes
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression yes
-
-# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
-# This makes the format more resistant to corruption but there is a performance
-# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
-# for maximum performances.
-#
-# RDB files created with checksum disabled have a checksum of zero that will
-# tell the loading code to skip the check.
-rdbchecksum yes
-
-# The filename where to dump the DB
-dbfilename dump-7005.rdb
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# The Append Only File will also be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir ./
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. A few things to understand ASAP about Redis replication.
-#
-# 1) Redis replication is asynchronous, but you can configure a master to
-#    stop accepting writes if it appears to be not connected with at least
-#    a given number of slaves.
-# 2) Redis slaves are able to perform a partial resynchronization with the
-#    master if the replication link is lost for a relatively small amount of
-#    time. You may want to configure the replication backlog size (see the next
-#    sections of this file) with a sensible value depending on your needs.
-# 3) Replication is automatic and does not need user intervention. After a
-#    network partition slaves automatically try to reconnect to masters
-#    and resynchronize with them.
-#
-# slaveof <masterip> <masterport>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-
-# When a slave loses its connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of date data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data yes
-
-# You can configure a slave instance to accept writes or not. Writing against
-# a slave instance may be useful to store some ephemeral data (because data
-# written on a slave will be easily deleted after resync with the master) but
-# may also cause problems if clients are writing to it because of a
-# misconfiguration.
-#
-# Since Redis 2.6 by default slaves are read-only.
-#
-# Note: read only slaves are not designed to be exposed to untrusted clients
-# on the internet. It's just a protection layer against misuse of the instance.
-# Still a read only slave exports by default all the administrative commands
-# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
-# security of read only slaves using 'rename-command' to shadow all the
-# administrative / dangerous commands.
-slave-read-only no
-
-# Replication SYNC strategy: disk or socket.
-#
-# -------------------------------------------------------
-# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
-# -------------------------------------------------------
-#
-# New slaves and reconnecting slaves that are not able to continue the replication
-# process just receiving differences, need to do what is called a "full
-# synchronization". An RDB file is transmitted from the master to the slaves.
-# The transmission can happen in two different ways:
-#
-# 1) Disk-backed: The Redis master creates a new process that writes the RDB
-#                 file on disk. Later the file is transferred by the parent
-#                 process to the slaves incrementally.
-# 2) Diskless: The Redis master creates a new process that directly writes the
-#              RDB file to slave sockets, without touching the disk at all.
-#
-# With disk-backed replication, while the RDB file is generated, more slaves
-# can be queued and served with the RDB file as soon as the current child producing
-# the RDB file finishes its work. With diskless replication instead once
-# the transfer starts, new slaves arriving will be queued and a new transfer
-# will start when the current one terminates.
-#
-# When diskless replication is used, the master waits a configurable amount of
-# time (in seconds) before starting the transfer in the hope that multiple slaves
-# will arrive and the transfer can be parallelized.
-#
-# With slow disks and fast (large bandwidth) networks, diskless replication
-# works better.
-repl-diskless-sync no
-
-# When diskless replication is enabled, it is possible to configure the delay
-# the server waits in order to spawn the child that transfers the RDB via socket
-# to the slaves.
-#
-# This is important since once the transfer starts, it is not possible to serve
-# new slaves arriving, that will be queued for the next RDB transfer, so the server
-# waits a delay in order to let more slaves arrive.
-#
-# The delay is specified in seconds, and by default is 5 seconds. To disable
-# it entirely just set it to 0 seconds and the transfer will start ASAP.
-repl-diskless-sync-delay 5
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-
-# The following option sets the replication timeout for:
-#
-# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
-# 2) Master timeout from the point of view of slaves (data, pings).
-# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-
-# Disable TCP_NODELAY on the slave socket after SYNC?
-#
-# If you select "yes" Redis will use a smaller number of TCP packets and
-# less bandwidth to send data to slaves. But this can add a delay for
-# the data to appear on the slave side, up to 40 milliseconds with
-# Linux kernels using a default configuration.
-#
-# If you select "no" the delay for data to appear on the slave side will
-# be reduced but more bandwidth will be used for replication.
-#
-# By default we optimize for low latency, but in very high traffic conditions
-# or when the master and slaves are many hops away, turning this to "yes" may
-# be a good idea.
-repl-disable-tcp-nodelay no
-
-# Set the replication backlog size. The backlog is a buffer that accumulates
-# slave data when slaves are disconnected for some time, so that when a slave
-# wants to reconnect again, often a full resync is not needed, but a partial
-# resync is enough, just passing the portion of data the slave missed while
-# disconnected.
-#
-# The bigger the replication backlog, the longer the time the slave can be
-# disconnected and later be able to perform a partial resynchronization.
-#
-# The backlog is only allocated once there is at least a slave connected.
-#
-# repl-backlog-size 1mb
-
-# After a master has no longer connected slaves for some time, the backlog
-# will be freed. The following option configures the amount of seconds that
-# need to elapse, starting from the time the last slave disconnected, for
-# the backlog buffer to be freed.
-#
-# A value of 0 means to never release the backlog.
-#
-# repl-backlog-ttl 3600
-
-# The slave priority is an integer number published by Redis in the INFO output.
-# It is used by Redis Sentinel in order to select a slave to promote into a
-# master if the master is no longer working correctly.
-#
-# A slave with a low priority number is considered better for promotion, so
-# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
-# pick the one with priority 10, that is the lowest.
-#
-# However a special priority of 0 marks the slave as not able to perform the
-# role of master, so a slave with priority of 0 will never be selected by
-# Redis Sentinel for promotion.
-#
-# By default the priority is 100.
-slave-priority 100
-
-# It is possible for a master to stop accepting writes if there are less than
-# N slaves connected, having a lag less or equal than M seconds.
-#
-# The N slaves need to be in "online" state.
-#
-# The lag in seconds, that must be <= the specified value, is calculated from
-# the last ping received from the slave, that is usually sent every second.
-#
-# This option does not GUARANTEE that N replicas will accept the write, but
-# will limit the window of exposure for lost writes in case not enough slaves
-# are available, to the specified number of seconds.
-#
-# For example to require at least 3 slaves with a lag <= 10 seconds use:
-#
-# min-slaves-to-write 3
-# min-slaves-max-lag 10
-#
-# Setting one or the other to 0 disables the feature.
-#
-# By default min-slaves-to-write is set to 0 (feature disabled) and
-# min-slaves-max-lag is set to 10.
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-# requirepass foobared
-
-# Command renaming.
-#
-# It is possible to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# hard to guess so that it will still be available for internal-use tools
-# but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possible to completely kill a command by renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-#
-# Please note that changing the name of commands that are logged into the
-# AOF file or transmitted to slaves may cause problems.
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default
-# this limit is set to 10000 clients, however if the Redis server is not
-# able to configure the process file limit to allow for the specified limit
-# the max number of allowed clients is set to the current file limit
-# minus 32 (as Redis reserves a few file descriptors for internal uses).
-#
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 10000
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# according to the eviction policy selected (see maxmemory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# a hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached. You can select among five behaviors:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key according to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys-random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with any of the above policies, Redis will return an error on write
-#       operations, when there are no suitable keys for eviction.
-#
-#       At the date of writing these commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy noeviction
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can tune it for speed or
-# accuracy. For default Redis will check five keys and pick the one that was
-# used less recently, you can change the sample size using the following
-# configuration directive.
-#
-# The default of 5 produces good enough results. 10 Approximates very closely
-# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
-#
-# maxmemory-samples 5
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. This mode is
-# good enough in many applications, but an issue with the Redis process or
-# a power outage may result into a few minutes of writes lost (depending on
-# the configured save points).
-#
-# The Append Only File is an alternative persistence mode that provides
-# much better durability. For instance using the default data fsync policy
-# (see later in the config file) Redis can lose just one second of writes in a
-# dramatic event like a server power outage, or a single write if something
-# wrong with the Redis process itself happens, but the operating system is
-# still running correctly.
-#
-# AOF and RDB persistence can be enabled at the same time without problems.
-# If the AOF is enabled on startup Redis will load the AOF, that is the file
-# with the better durability guarantees.
-#
-# Please check http://redis.io/topics/persistence for more information.
-
-appendonly no
-
-# The name of the append only file (default: "appendonly.aof")
-
-appendfilename "appendonly.aof"
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead of waiting for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log. Slow, Safest.
-# everysec: fsync only one time every second. Compromise.
-#
-# The default is "everysec", as that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# More details please check the following article:
-# http://antirez.com/post/redis-persistence-demystified.html
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-# appendfsync everysec
-appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving, the durability of Redis is
-# the same as "appendfsync none". In practical terms, this means that it is
-# possible to lose up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-
-no-appendfsync-on-rewrite no
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size grows by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (if no rewrite has happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a percentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-
-# An AOF file may be found to be truncated at the end during the Redis
-# startup process, when the AOF data gets loaded back into memory.
-# This may happen when the system where Redis is running
-# crashes, especially when an ext4 filesystem is mounted without the
-# data=ordered option (however this can't happen when Redis itself
-# crashes or aborts but the operating system still works correctly).
-#
-# Redis can either exit with an error when this happens, or load as much
-# data as possible (the default now) and start if the AOF file is found
-# to be truncated at the end. The following option controls this behavior.
-#
-# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
-# the Redis server starts emitting a log to inform the user of the event.
-# Otherwise if the option is set to no, the server aborts with an error
-# and refuses to start. When the option is set to no, the user requires
-# to fix the AOF file using the "redis-check-aof" utility before to restart
-# the server.
-#
-# Note that if the AOF file will be found to be corrupted in the middle
-# the server will still exit with an error. This option only applies when
-# Redis will try to read more data from the AOF file but not enough bytes
-# will be found.
-aof-load-truncated yes
-
-################################ LUA SCRIPTING  ###############################
-
-# Max execution time of a Lua script in milliseconds.
-#
-# If the maximum execution time is reached Redis will log that a script is
-# still in execution after the maximum allowed time and will start to
-# reply to queries with an error.
-#
-# When a long running script exceeds the maximum execution time only the
-# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
-# used to stop a script that did not yet called write commands. The second
-# is the only way to shut down the server in the case a write command was
-# already issued by the script but the user doesn't want to wait for the natural
-# termination of the script.
-#
-# Set it to 0 or a negative value for unlimited execution without warnings.
-lua-time-limit 5000
-
-################################ REDIS CLUSTER  ###############################
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
-# in order to mark it as "mature" we need to wait for a non trivial percentage
-# of users to deploy it in production.
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
-# started as cluster nodes can. In order to start a Redis instance as a
-# cluster node enable the cluster support uncommenting the following:
-#
-cluster-enabled yes
-
-# Every cluster node has a cluster configuration file. This file is not
-# intended to be edited by hand. It is created and updated by Redis nodes.
-# Every Redis Cluster node requires a different cluster configuration file.
-# Make sure that instances running in the same system do not have
-# overlapping cluster configuration file names.
-#
-cluster-config-file redis-cluster-node-7005.conf
-
-# Cluster node timeout is the amount of milliseconds a node must be unreachable
-# for it to be considered in failure state.
-# Most other internal time limits are multiple of the node timeout.
-#
-# cluster-node-timeout 15000
-
-# A slave of a failing master will avoid to start a failover if its data
-# looks too old.
-#
-# There is no simple way for a slave to actually have a exact measure of
-# its "data age", so the following two checks are performed:
-#
-# 1) If there are multiple slaves able to failover, they exchange messages
-#    in order to try to give an advantage to the slave with the best
-#    replication offset (more data from the master processed).
-#    Slaves will try to get their rank by offset, and apply to the start
-#    of the failover a delay proportional to their rank.
-#
-# 2) Every single slave computes the time of the last interaction with
-#    its master. This can be the last ping or command received (if the master
-#    is still in the "connected" state), or the time that elapsed since the
-#    disconnection with the master (if the replication link is currently down).
-#    If the last interaction is too old, the slave will not try to failover
-#    at all.
-#
-# The point "2" can be tuned by user. Specifically a slave will not perform
-# the failover if, since the last interaction with the master, the time
-# elapsed is greater than:
-#
-#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
-#
-# So for example if node-timeout is 30 seconds, and the slave-validity-factor
-# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
-# slave will not try to failover if it was not able to talk with the master
-# for longer than 310 seconds.
-#
-# A large slave-validity-factor may allow slaves with too old data to failover
-# a master, while a too small value may prevent the cluster from being able to
-# elect a slave at all.
-#
-# For maximum availability, it is possible to set the slave-validity-factor
-# to a value of 0, which means, that slaves will always try to failover the
-# master regardless of the last time they interacted with the master.
-# (However they'll always try to apply a delay proportional to their
-# offset rank).
-#
-# Zero is the only value able to guarantee that when all the partitions heal
-# the cluster will always be able to continue.
-#
-# cluster-slave-validity-factor 10
-
-# Cluster slaves are able to migrate to orphaned masters, that are masters
-# that are left without working slaves. This improves the cluster ability
-# to resist to failures as otherwise an orphaned master can't be failed over
-# in case of failure if it has no working slaves.
-#
-# Slaves migrate to orphaned masters only if there are still at least a
-# given number of other working slaves for their old master. This number
-# is the "migration barrier". A migration barrier of 1 means that a slave
-# will migrate only if there is at least 1 other working slave for its master
-# and so forth. It usually reflects the number of slaves you want for every
-# master in your cluster.
-#
-# Default is 1 (slaves migrate only if their masters remain with at least
-# one slave). To disable migration just set it to a very large value.
-# A value of 0 can be set but is useful only for debugging and dangerous
-# in production.
-#
-# cluster-migration-barrier 1
-
-# By default Redis Cluster nodes stop accepting queries if they detect there
-# is at least an hash slot uncovered (no available node is serving it).
-# This way if the cluster is partially down (for example a range of hash slots
-# are no longer covered) all the cluster becomes, eventually, unavailable.
-# It automatically returns available as soon as all the slots are covered again.
-#
-# However sometimes you want the subset of the cluster which is working,
-# to continue to accept queries for the part of the key space that is still
-# covered. In order to do so, just set the cluster-require-full-coverage
-# option to no.
-#
-# cluster-require-full-coverage yes
-
-# In order to setup your cluster make sure to read the documentation
-# available at http://redis.io web site.
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than 10000
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 128
-
-################################ LATENCY MONITOR ##############################
-
-# The Redis latency monitoring subsystem samples different operations
-# at runtime in order to collect data related to possible sources of
-# latency of a Redis instance.
-#
-# Via the LATENCY command this information is available to the user that can
-# print graphs and obtain reports.
-#
-# The system only logs operations that were performed in a time equal or
-# greater than the amount of milliseconds specified via the
-# latency-monitor-threshold configuration directive. When its value is set
-# to zero, the latency monitor is turned off.
-#
-# By default latency monitoring is disabled since it is mostly not needed
-# if you don't have latency issues, and collecting data has a performance
-# impact, that while very small, can be measured under big load. Latency
-# monitoring can easily be enabled at runtime using the command
-# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
-latency-monitor-threshold 0
-
-############################# EVENT NOTIFICATION ##############################
-
-# Redis can notify Pub/Sub clients about events happening in the key space.
-# This feature is documented at http://redis.io/topics/notifications
-#
-# For instance if keyspace events notification is enabled, and a client
-# performs a DEL operation on key "foo" stored in the Database 0, two
-# messages will be published via Pub/Sub:
-#
-# PUBLISH __keyspace@0__:foo del
-# PUBLISH __keyevent@0__:del foo
-#
-# It is possible to select the events that Redis will notify among a set
-# of classes. Every class is identified by a single character:
-#
-#  K     Keyspace events, published with __keyspace@<db>__ prefix.
-#  E     Keyevent events, published with __keyevent@<db>__ prefix.
-#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
-#  $     String commands
-#  l     List commands
-#  s     Set commands
-#  h     Hash commands
-#  z     Sorted set commands
-#  x     Expired events (events generated every time a key expires)
-#  e     Evicted events (events generated when a key is evicted for maxmemory)
-#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
-#
-#  The "notify-keyspace-events" takes as argument a string that is composed
-#  by zero or multiple characters. The empty string means that notifications
-#  are disabled at all.
-#
-#  Example: to enable list and generic events, from the point of view of the
-#           event name, use:
-#
-#  notify-keyspace-events Elg
-#
-#  Example 2: to get the stream of the expired keys subscribing to channel
-#             name __keyevent@0__:expired use:
-#
-#  notify-keyspace-events Ex
-#
-#  By default all notifications are disabled because most users don't need
-#  this feature and the feature has some overhead. Note that if you don't
-#  specify at least one of K or E, no events will be delivered.
-notify-keyspace-events ""
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded using a memory efficient data structure when they have a
-# small number of entries, and the biggest entry does not exceed a given
-# threshold. These thresholds can be configured using the following directives.
-hash-max-ziplist-entries 512
-hash-max-ziplist-value 64
-
-# Lists are also encoded in a special way to save a lot of space.
-# The number of entries allowed per internal list node can be specified
-# as a fixed maximum size or a maximum number of elements.
-# For a fixed maximum size, use -5 through -1, meaning:
-# -5: max size: 64 Kb  <-- not recommended for normal workloads
-# -4: max size: 32 Kb  <-- not recommended
-# -3: max size: 16 Kb  <-- probably not recommended
-# -2: max size: 8 Kb   <-- good
-# -1: max size: 4 Kb   <-- good
-# Positive numbers mean store up to _exactly_ that number of elements
-# per list node.
-# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
-# but if your use case is unique, adjust the settings as necessary.
-list-max-ziplist-size -2
-
-# Lists may also be compressed.
-# Compress depth is the number of quicklist ziplist nodes from *each* side of
-# the list to *exclude* from compression.  The head and tail of the list
-# are always uncompressed for fast push/pop operations.  Settings are:
-# 0: disable all list compression
-# 1: depth 1 means "don't start compressing until after 1 node into the list,
-#    going from either the head or tail"
-#    So: [head]->node->node->...->node->[tail]
-#    [head], [tail] will always be uncompressed; inner nodes will compress.
-# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
-#    2 here means: don't compress head or head->next or tail->prev or tail,
-#    but compress all nodes between them.
-# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
-# etc.
-list-compress-depth 0
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happen to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries 512
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-
-# HyperLogLog sparse representation bytes limit. The limit includes the
-# 16 bytes header. When an HyperLogLog using the sparse representation crosses
-# this limit, it is converted into the dense representation.
-#
-# A value greater than 16000 is totally useless, since at that point the
-# dense representation is more memory efficient.
-#
-# The suggested value is ~ 3000 in order to have the benefits of
-# the space efficient encoding without slowing down too much PFADD,
-# which is O(N) with the sparse encoding. The value can be raised to
-# ~ 10000 when CPU is not a concern, but space is, and the data set is
-# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
-hll-sparse-max-bytes 3000
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation Redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into a hash table
-# that is rehashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# actively rehash the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply from time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing yes
-
-# The client output buffer limits can be used to force disconnection of clients
-# that are not reading data from the server fast enough for some reason (a
-# common reason is that a Pub/Sub client can't consume messages as fast as the
-# publisher can produce them).
-#
-# The limit can be set differently for the three different classes of clients:
-#
-# normal -> normal clients including MONITOR clients
-# slave  -> slave clients
-# pubsub -> clients subscribed to at least one pubsub channel or pattern
-#
-# The syntax of every client-output-buffer-limit directive is the following:
-#
-# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
-#
-# A client is immediately disconnected once the hard limit is reached, or if
-# the soft limit is reached and remains reached for the specified number of
-# seconds (continuously).
-# So for instance if the hard limit is 32 megabytes and the soft limit is
-# 16 megabytes / 10 seconds, the client will get disconnected immediately
-# if the size of the output buffers reach 32 megabytes, but will also get
-# disconnected if the client reaches 16 megabytes and continuously overcomes
-# the limit for 10 seconds.
-#
-# By default normal clients are not limited because they don't receive data
-# without asking (in a push way), but just after a request, so only
-# asynchronous clients may create a scenario where data is requested faster
-# than it can read.
-#
-# Instead there is a default limit for pubsub and slave clients, since
-# subscribers and slaves receive data in a push fashion.
-#
-# Both the hard or the soft limit can be disabled by setting them to zero.
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit slave 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-
-# Redis calls an internal function to perform many background tasks, like
-# closing connections of clients in timeout, purging expired keys that are
-# never requested, and so forth.
-#
-# Not all tasks are performed with the same frequency, but Redis checks for
-# tasks to perform according to the specified "hz" value.
-#
-# By default "hz" is set to 10. Raising the value will use more CPU when
-# Redis is idle, but at the same time will make Redis more responsive when
-# there are many keys expiring at the same time, and timeouts may be
-# handled with more precision.
-#
-# The range is between 1 and 500, however a value over 100 is usually not
-# a good idea. Most users should use the default of 10 and raise this up to
-# 100 only in environments where very low latency is required.
-hz 10
-
-# When a child rewrites the AOF file, if the following option is enabled
-# the file will be fsync-ed every 32 MB of data generated. This is useful
-# in order to commit the file to the disk more incrementally and avoid
-# big latency spikes.
-aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-7006.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-7006.conf
deleted file mode 100644
index b495b23..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-7006.conf
+++ /dev/null
@@ -1,1018 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specify
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all Redis servers but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
-# from admin or Redis Sentinel. Since Redis always uses the last processed
-# line as value of a configuration directive, you'd better put includes
-# at the beginning of this file to avoid overwriting config change at runtime.
-#
-# If instead you are interested in using includes to override configuration
-# options, it is better to use include as the last line.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-
-################################## NETWORK #####################################
-
-# By default, if no "bind" configuration directive is specified, Redis listens
-# for connections from all the network interfaces available on the server.
-# It is possible to listen to just one or multiple selected interfaces using
-# the "bind" configuration directive, followed by one or more IP addresses.
-#
-# Examples:
-#
-# bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1 ::1
-#
-# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
-# internet, binding to all the interfaces is dangerous and will expose the
-# instance to everybody on the internet. So by default we uncomment the
-# following bind directive, that will force Redis to listen only into
-# the IPv4 lookback interface address (this means Redis will be able to
-# accept connections only from clients running into the same computer it
-# is running).
-#
-# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
-# JUST COMMENT THE FOLLOWING LINE.
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1
-
-# Protected mode is a layer of security protection, in order to avoid that
-# Redis instances left open on the internet are accessed and exploited.
-#
-# When protected mode is on and if:
-#
-# 1) The server is not binding explicitly to a set of addresses using the
-#    "bind" directive.
-# 2) No password is configured.
-#
-# The server only accepts connections from clients connecting from the
-# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
-# sockets.
-#
-# By default protected mode is enabled. You should disable it only if
-# you are sure you want clients from other hosts to connect to Redis
-# even if no authentication is configured, nor a specific set of interfaces
-# are explicitly listed using the "bind" directive.
-protected-mode yes
-
-# Accept connections on the specified port, default is 6379 (IANA #815344).
-# If port 0 is specified Redis will not listen on a TCP socket.
-port 7006
-
-# TCP listen() backlog.
-#
-# In high requests-per-second environments you need an high backlog in order
-# to avoid slow clients connections issues. Note that the Linux kernel
-# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
-# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
-# in order to get the desired effect.
-tcp-backlog 511
-
-# Unix socket.
-#
-# Specify the path for the Unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-unixsocket /tmp/redis-nchan-cluster-7006.sock
-unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 0
-
-# TCP keepalive.
-#
-# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
-# of communication. This is useful for two reasons:
-#
-# 1) Detect dead peers.
-# 2) Take the connection alive from the point of view of network
-#    equipment in the middle.
-#
-# On Linux, the specified value (in seconds) is the period used to send ACKs.
-# Note that to close the connection the double of the time is needed.
-# On other kernels the period depends on the kernel configuration.
-#
-# A reasonable value for this option is 300 seconds, which is the new
-# Redis default starting with Redis 3.2.1.
-tcp-keepalive 60
-
-################################# GENERAL #####################################
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
-
-# If you run Redis from upstart or systemd, Redis can interact with your
-# supervision tree. Options:
-#   supervised no      - no supervision interaction
-#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
-#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
-#   supervised auto    - detect upstart or systemd method based on
-#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
-# Note: these supervision methods only signal "process is ready."
-#       They do not enable continuous liveness pings back to your supervisor.
-supervised no
-
-# If a pid file is specified, Redis writes it where specified at startup
-# and removes it at exit.
-#
-# When the server runs non daemonized, no pid file is created if none is
-# specified in the configuration. When the server is daemonized, the pid file
-# is used even if not specified, defaulting to "/var/run/redis.pid".
-#
-# Creating a pid file is best effort: if Redis is not able to create it
-# nothing bad happens, the server will start and run normally.
-pidfile /tmp/redis-nchan-cluster-7006.pid
-
-# Specify the server verbosity level.
-# This can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel notice
-
-# Specify the log file name. Also the empty string can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile /dev/stdout
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-# syslog-enabled no
-
-# Specify the syslog identity.
-# syslog-ident redis
-
-# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
-# syslog-facility local0
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases 16
-
-################################ SNAPSHOTTING  ################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving completely by commenting out all "save" lines.
-#
-#   It is also possible to remove all the previously configured save
-#   points by adding a save directive with a single empty string argument
-#   like in the following example:
-#
-#   save ""
-
-#save 900 1
-#save 300 10
-#save 60 10000
-
-# By default Redis will stop accepting writes if RDB snapshots are enabled
-# (at least one save point) and the latest background save failed.
-# This will make the user aware (in a hard way) that data is not persisting
-# on disk properly, otherwise chances are that no one will notice and some
-# disaster will happen.
-#
-# If the background saving process will start working again Redis will
-# automatically allow writes again.
-#
-# However if you have setup your proper monitoring of the Redis server
-# and persistence, you may want to disable this feature so that Redis will
-# continue to work as usual even if there are problems with disk,
-# permissions, and so forth.
-stop-writes-on-bgsave-error yes
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression yes
-
-# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
-# This makes the format more resistant to corruption but there is a performance
-# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
-# for maximum performances.
-#
-# RDB files created with checksum disabled have a checksum of zero that will
-# tell the loading code to skip the check.
-rdbchecksum yes
-
-# The filename where to dump the DB
-dbfilename dump-7006.rdb
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# The Append Only File will also be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir ./
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. A few things to understand ASAP about Redis replication.
-#
-# 1) Redis replication is asynchronous, but you can configure a master to
-#    stop accepting writes if it appears to be not connected with at least
-#    a given number of slaves.
-# 2) Redis slaves are able to perform a partial resynchronization with the
-#    master if the replication link is lost for a relatively small amount of
-#    time. You may want to configure the replication backlog size (see the next
-#    sections of this file) with a sensible value depending on your needs.
-# 3) Replication is automatic and does not need user intervention. After a
-#    network partition slaves automatically try to reconnect to masters
-#    and resynchronize with them.
-#
-# slaveof <masterip> <masterport>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-
-# When a slave loses its connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of date data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data yes
-
-# You can configure a slave instance to accept writes or not. Writing against
-# a slave instance may be useful to store some ephemeral data (because data
-# written on a slave will be easily deleted after resync with the master) but
-# may also cause problems if clients are writing to it because of a
-# misconfiguration.
-#
-# Since Redis 2.6 by default slaves are read-only.
-#
-# Note: read only slaves are not designed to be exposed to untrusted clients
-# on the internet. It's just a protection layer against misuse of the instance.
-# Still a read only slave exports by default all the administrative commands
-# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
-# security of read only slaves using 'rename-command' to shadow all the
-# administrative / dangerous commands.
-slave-read-only no
-
-# Replication SYNC strategy: disk or socket.
-#
-# -------------------------------------------------------
-# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
-# -------------------------------------------------------
-#
-# New slaves and reconnecting slaves that are not able to continue the replication
-# process just receiving differences, need to do what is called a "full
-# synchronization". An RDB file is transmitted from the master to the slaves.
-# The transmission can happen in two different ways:
-#
-# 1) Disk-backed: The Redis master creates a new process that writes the RDB
-#                 file on disk. Later the file is transferred by the parent
-#                 process to the slaves incrementally.
-# 2) Diskless: The Redis master creates a new process that directly writes the
-#              RDB file to slave sockets, without touching the disk at all.
-#
-# With disk-backed replication, while the RDB file is generated, more slaves
-# can be queued and served with the RDB file as soon as the current child producing
-# the RDB file finishes its work. With diskless replication instead once
-# the transfer starts, new slaves arriving will be queued and a new transfer
-# will start when the current one terminates.
-#
-# When diskless replication is used, the master waits a configurable amount of
-# time (in seconds) before starting the transfer in the hope that multiple slaves
-# will arrive and the transfer can be parallelized.
-#
-# With slow disks and fast (large bandwidth) networks, diskless replication
-# works better.
-repl-diskless-sync no
-
-# When diskless replication is enabled, it is possible to configure the delay
-# the server waits in order to spawn the child that transfers the RDB via socket
-# to the slaves.
-#
-# This is important since once the transfer starts, it is not possible to serve
-# new slaves arriving, that will be queued for the next RDB transfer, so the server
-# waits a delay in order to let more slaves arrive.
-#
-# The delay is specified in seconds, and by default is 5 seconds. To disable
-# it entirely just set it to 0 seconds and the transfer will start ASAP.
-repl-diskless-sync-delay 5
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-
-# The following option sets the replication timeout for:
-#
-# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
-# 2) Master timeout from the point of view of slaves (data, pings).
-# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-
-# Disable TCP_NODELAY on the slave socket after SYNC?
-#
-# If you select "yes" Redis will use a smaller number of TCP packets and
-# less bandwidth to send data to slaves. But this can add a delay for
-# the data to appear on the slave side, up to 40 milliseconds with
-# Linux kernels using a default configuration.
-#
-# If you select "no" the delay for data to appear on the slave side will
-# be reduced but more bandwidth will be used for replication.
-#
-# By default we optimize for low latency, but in very high traffic conditions
-# or when the master and slaves are many hops away, turning this to "yes" may
-# be a good idea.
-repl-disable-tcp-nodelay no
-
-# Set the replication backlog size. The backlog is a buffer that accumulates
-# slave data when slaves are disconnected for some time, so that when a slave
-# wants to reconnect again, often a full resync is not needed, but a partial
-# resync is enough, just passing the portion of data the slave missed while
-# disconnected.
-#
-# The bigger the replication backlog, the longer the time the slave can be
-# disconnected and later be able to perform a partial resynchronization.
-#
-# The backlog is only allocated once there is at least a slave connected.
-#
-# repl-backlog-size 1mb
-
-# After a master has no longer connected slaves for some time, the backlog
-# will be freed. The following option configures the amount of seconds that
-# need to elapse, starting from the time the last slave disconnected, for
-# the backlog buffer to be freed.
-#
-# A value of 0 means to never release the backlog.
-#
-# repl-backlog-ttl 3600
-
-# The slave priority is an integer number published by Redis in the INFO output.
-# It is used by Redis Sentinel in order to select a slave to promote into a
-# master if the master is no longer working correctly.
-#
-# A slave with a low priority number is considered better for promotion, so
-# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
-# pick the one with priority 10, that is the lowest.
-#
-# However a special priority of 0 marks the slave as not able to perform the
-# role of master, so a slave with priority of 0 will never be selected by
-# Redis Sentinel for promotion.
-#
-# By default the priority is 100.
-slave-priority 100
-
-# It is possible for a master to stop accepting writes if there are less than
-# N slaves connected, having a lag less or equal than M seconds.
-#
-# The N slaves need to be in "online" state.
-#
-# The lag in seconds, that must be <= the specified value, is calculated from
-# the last ping received from the slave, that is usually sent every second.
-#
-# This option does not GUARANTEE that N replicas will accept the write, but
-# will limit the window of exposure for lost writes in case not enough slaves
-# are available, to the specified number of seconds.
-#
-# For example to require at least 3 slaves with a lag <= 10 seconds use:
-#
-# min-slaves-to-write 3
-# min-slaves-max-lag 10
-#
-# Setting one or the other to 0 disables the feature.
-#
-# By default min-slaves-to-write is set to 0 (feature disabled) and
-# min-slaves-max-lag is set to 10.
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-# requirepass foobared
-
-# Command renaming.
-#
-# It is possible to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# hard to guess so that it will still be available for internal-use tools
-# but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possible to completely kill a command by renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-#
-# Please note that changing the name of commands that are logged into the
-# AOF file or transmitted to slaves may cause problems.
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default
-# this limit is set to 10000 clients, however if the Redis server is not
-# able to configure the process file limit to allow for the specified limit
-# the max number of allowed clients is set to the current file limit
-# minus 32 (as Redis reserves a few file descriptors for internal uses).
-#
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 10000
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# according to the eviction policy selected (see maxmemory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# a hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached. You can select among five behaviors:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key according to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys-random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with any of the above policies, Redis will return an error on write
-#       operations, when there are no suitable keys for eviction.
-#
-#       At the date of writing these commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy noeviction
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can tune it for speed or
-# accuracy. For default Redis will check five keys and pick the one that was
-# used less recently, you can change the sample size using the following
-# configuration directive.
-#
-# The default of 5 produces good enough results. 10 Approximates very closely
-# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
-#
-# maxmemory-samples 5
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. This mode is
-# good enough in many applications, but an issue with the Redis process or
-# a power outage may result into a few minutes of writes lost (depending on
-# the configured save points).
-#
-# The Append Only File is an alternative persistence mode that provides
-# much better durability. For instance using the default data fsync policy
-# (see later in the config file) Redis can lose just one second of writes in a
-# dramatic event like a server power outage, or a single write if something
-# wrong with the Redis process itself happens, but the operating system is
-# still running correctly.
-#
-# AOF and RDB persistence can be enabled at the same time without problems.
-# If the AOF is enabled on startup Redis will load the AOF, that is the file
-# with the better durability guarantees.
-#
-# Please check http://redis.io/topics/persistence for more information.
-
-appendonly no
-
-# The name of the append only file (default: "appendonly.aof")
-
-appendfilename "appendonly.aof"
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead of waiting for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log. Slow, Safest.
-# everysec: fsync only one time every second. Compromise.
-#
-# The default is "everysec", as that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# More details please check the following article:
-# http://antirez.com/post/redis-persistence-demystified.html
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-# appendfsync everysec
-appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving, the durability of Redis is
-# the same as "appendfsync none". In practical terms, this means that it is
-# possible to lose up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-
-no-appendfsync-on-rewrite no
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size grows by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (if no rewrite has happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a percentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-
-# An AOF file may be found to be truncated at the end during the Redis
-# startup process, when the AOF data gets loaded back into memory.
-# This may happen when the system where Redis is running
-# crashes, especially when an ext4 filesystem is mounted without the
-# data=ordered option (however this can't happen when Redis itself
-# crashes or aborts but the operating system still works correctly).
-#
-# Redis can either exit with an error when this happens, or load as much
-# data as possible (the default now) and start if the AOF file is found
-# to be truncated at the end. The following option controls this behavior.
-#
-# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
-# the Redis server starts emitting a log to inform the user of the event.
-# Otherwise if the option is set to no, the server aborts with an error
-# and refuses to start. When the option is set to no, the user requires
-# to fix the AOF file using the "redis-check-aof" utility before to restart
-# the server.
-#
-# Note that if the AOF file will be found to be corrupted in the middle
-# the server will still exit with an error. This option only applies when
-# Redis will try to read more data from the AOF file but not enough bytes
-# will be found.
-aof-load-truncated yes
-
-################################ LUA SCRIPTING  ###############################
-
-# Max execution time of a Lua script in milliseconds.
-#
-# If the maximum execution time is reached Redis will log that a script is
-# still in execution after the maximum allowed time and will start to
-# reply to queries with an error.
-#
-# When a long running script exceeds the maximum execution time only the
-# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
-# used to stop a script that did not yet called write commands. The second
-# is the only way to shut down the server in the case a write command was
-# already issued by the script but the user doesn't want to wait for the natural
-# termination of the script.
-#
-# Set it to 0 or a negative value for unlimited execution without warnings.
-lua-time-limit 5000
-
-################################ REDIS CLUSTER  ###############################
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
-# in order to mark it as "mature" we need to wait for a non trivial percentage
-# of users to deploy it in production.
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
-# started as cluster nodes can. In order to start a Redis instance as a
-# cluster node enable the cluster support uncommenting the following:
-#
-cluster-enabled yes
-
-# Every cluster node has a cluster configuration file. This file is not
-# intended to be edited by hand. It is created and updated by Redis nodes.
-# Every Redis Cluster node requires a different cluster configuration file.
-# Make sure that instances running in the same system do not have
-# overlapping cluster configuration file names.
-#
-cluster-config-file redis-cluster-node-7006.conf
-
-# Cluster node timeout is the amount of milliseconds a node must be unreachable
-# for it to be considered in failure state.
-# Most other internal time limits are multiple of the node timeout.
-#
-# cluster-node-timeout 15000
-
-# A slave of a failing master will avoid to start a failover if its data
-# looks too old.
-#
-# There is no simple way for a slave to actually have a exact measure of
-# its "data age", so the following two checks are performed:
-#
-# 1) If there are multiple slaves able to failover, they exchange messages
-#    in order to try to give an advantage to the slave with the best
-#    replication offset (more data from the master processed).
-#    Slaves will try to get their rank by offset, and apply to the start
-#    of the failover a delay proportional to their rank.
-#
-# 2) Every single slave computes the time of the last interaction with
-#    its master. This can be the last ping or command received (if the master
-#    is still in the "connected" state), or the time that elapsed since the
-#    disconnection with the master (if the replication link is currently down).
-#    If the last interaction is too old, the slave will not try to failover
-#    at all.
-#
-# The point "2" can be tuned by user. Specifically a slave will not perform
-# the failover if, since the last interaction with the master, the time
-# elapsed is greater than:
-#
-#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
-#
-# So for example if node-timeout is 30 seconds, and the slave-validity-factor
-# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
-# slave will not try to failover if it was not able to talk with the master
-# for longer than 310 seconds.
-#
-# A large slave-validity-factor may allow slaves with too old data to failover
-# a master, while a too small value may prevent the cluster from being able to
-# elect a slave at all.
-#
-# For maximum availability, it is possible to set the slave-validity-factor
-# to a value of 0, which means, that slaves will always try to failover the
-# master regardless of the last time they interacted with the master.
-# (However they'll always try to apply a delay proportional to their
-# offset rank).
-#
-# Zero is the only value able to guarantee that when all the partitions heal
-# the cluster will always be able to continue.
-#
-# cluster-slave-validity-factor 10
-
-# Cluster slaves are able to migrate to orphaned masters, that are masters
-# that are left without working slaves. This improves the cluster ability
-# to resist to failures as otherwise an orphaned master can't be failed over
-# in case of failure if it has no working slaves.
-#
-# Slaves migrate to orphaned masters only if there are still at least a
-# given number of other working slaves for their old master. This number
-# is the "migration barrier". A migration barrier of 1 means that a slave
-# will migrate only if there is at least 1 other working slave for its master
-# and so forth. It usually reflects the number of slaves you want for every
-# master in your cluster.
-#
-# Default is 1 (slaves migrate only if their masters remain with at least
-# one slave). To disable migration just set it to a very large value.
-# A value of 0 can be set but is useful only for debugging and dangerous
-# in production.
-#
-# cluster-migration-barrier 1
-
-# By default Redis Cluster nodes stop accepting queries if they detect there
-# is at least an hash slot uncovered (no available node is serving it).
-# This way if the cluster is partially down (for example a range of hash slots
-# are no longer covered) all the cluster becomes, eventually, unavailable.
-# It automatically returns available as soon as all the slots are covered again.
-#
-# However sometimes you want the subset of the cluster which is working,
-# to continue to accept queries for the part of the key space that is still
-# covered. In order to do so, just set the cluster-require-full-coverage
-# option to no.
-#
-# cluster-require-full-coverage yes
-
-# In order to setup your cluster make sure to read the documentation
-# available at http://redis.io web site.
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than 10000
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 128
-
-################################ LATENCY MONITOR ##############################
-
-# The Redis latency monitoring subsystem samples different operations
-# at runtime in order to collect data related to possible sources of
-# latency of a Redis instance.
-#
-# Via the LATENCY command this information is available to the user that can
-# print graphs and obtain reports.
-#
-# The system only logs operations that were performed in a time equal or
-# greater than the amount of milliseconds specified via the
-# latency-monitor-threshold configuration directive. When its value is set
-# to zero, the latency monitor is turned off.
-#
-# By default latency monitoring is disabled since it is mostly not needed
-# if you don't have latency issues, and collecting data has a performance
-# impact, that while very small, can be measured under big load. Latency
-# monitoring can easily be enabled at runtime using the command
-# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
-latency-monitor-threshold 0
-
-############################# EVENT NOTIFICATION ##############################
-
-# Redis can notify Pub/Sub clients about events happening in the key space.
-# This feature is documented at http://redis.io/topics/notifications
-#
-# For instance if keyspace events notification is enabled, and a client
-# performs a DEL operation on key "foo" stored in the Database 0, two
-# messages will be published via Pub/Sub:
-#
-# PUBLISH __keyspace@0__:foo del
-# PUBLISH __keyevent@0__:del foo
-#
-# It is possible to select the events that Redis will notify among a set
-# of classes. Every class is identified by a single character:
-#
-#  K     Keyspace events, published with __keyspace@<db>__ prefix.
-#  E     Keyevent events, published with __keyevent@<db>__ prefix.
-#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
-#  $     String commands
-#  l     List commands
-#  s     Set commands
-#  h     Hash commands
-#  z     Sorted set commands
-#  x     Expired events (events generated every time a key expires)
-#  e     Evicted events (events generated when a key is evicted for maxmemory)
-#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
-#
-#  The "notify-keyspace-events" takes as argument a string that is composed
-#  by zero or multiple characters. The empty string means that notifications
-#  are disabled at all.
-#
-#  Example: to enable list and generic events, from the point of view of the
-#           event name, use:
-#
-#  notify-keyspace-events Elg
-#
-#  Example 2: to get the stream of the expired keys subscribing to channel
-#             name __keyevent@0__:expired use:
-#
-#  notify-keyspace-events Ex
-#
-#  By default all notifications are disabled because most users don't need
-#  this feature and the feature has some overhead. Note that if you don't
-#  specify at least one of K or E, no events will be delivered.
-notify-keyspace-events ""
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded using a memory efficient data structure when they have a
-# small number of entries, and the biggest entry does not exceed a given
-# threshold. These thresholds can be configured using the following directives.
-hash-max-ziplist-entries 512
-hash-max-ziplist-value 64
-
-# Lists are also encoded in a special way to save a lot of space.
-# The number of entries allowed per internal list node can be specified
-# as a fixed maximum size or a maximum number of elements.
-# For a fixed maximum size, use -5 through -1, meaning:
-# -5: max size: 64 Kb  <-- not recommended for normal workloads
-# -4: max size: 32 Kb  <-- not recommended
-# -3: max size: 16 Kb  <-- probably not recommended
-# -2: max size: 8 Kb   <-- good
-# -1: max size: 4 Kb   <-- good
-# Positive numbers mean store up to _exactly_ that number of elements
-# per list node.
-# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
-# but if your use case is unique, adjust the settings as necessary.
-list-max-ziplist-size -2
-
-# Lists may also be compressed.
-# Compress depth is the number of quicklist ziplist nodes from *each* side of
-# the list to *exclude* from compression.  The head and tail of the list
-# are always uncompressed for fast push/pop operations.  Settings are:
-# 0: disable all list compression
-# 1: depth 1 means "don't start compressing until after 1 node into the list,
-#    going from either the head or tail"
-#    So: [head]->node->node->...->node->[tail]
-#    [head], [tail] will always be uncompressed; inner nodes will compress.
-# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
-#    2 here means: don't compress head or head->next or tail->prev or tail,
-#    but compress all nodes between them.
-# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
-# etc.
-list-compress-depth 0
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happen to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries 512
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-
-# HyperLogLog sparse representation bytes limit. The limit includes the
-# 16 bytes header. When an HyperLogLog using the sparse representation crosses
-# this limit, it is converted into the dense representation.
-#
-# A value greater than 16000 is totally useless, since at that point the
-# dense representation is more memory efficient.
-#
-# The suggested value is ~ 3000 in order to have the benefits of
-# the space efficient encoding without slowing down too much PFADD,
-# which is O(N) with the sparse encoding. The value can be raised to
-# ~ 10000 when CPU is not a concern, but space is, and the data set is
-# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
-hll-sparse-max-bytes 3000
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation Redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into a hash table
-# that is rehashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# actively rehash the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply from time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing yes
-
-# The client output buffer limits can be used to force disconnection of clients
-# that are not reading data from the server fast enough for some reason (a
-# common reason is that a Pub/Sub client can't consume messages as fast as the
-# publisher can produce them).
-#
-# The limit can be set differently for the three different classes of clients:
-#
-# normal -> normal clients including MONITOR clients
-# slave  -> slave clients
-# pubsub -> clients subscribed to at least one pubsub channel or pattern
-#
-# The syntax of every client-output-buffer-limit directive is the following:
-#
-# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
-#
-# A client is immediately disconnected once the hard limit is reached, or if
-# the soft limit is reached and remains reached for the specified number of
-# seconds (continuously).
-# So for instance if the hard limit is 32 megabytes and the soft limit is
-# 16 megabytes / 10 seconds, the client will get disconnected immediately
-# if the size of the output buffers reach 32 megabytes, but will also get
-# disconnected if the client reaches 16 megabytes and continuously overcomes
-# the limit for 10 seconds.
-#
-# By default normal clients are not limited because they don't receive data
-# without asking (in a push way), but just after a request, so only
-# asynchronous clients may create a scenario where data is requested faster
-# than it can read.
-#
-# Instead there is a default limit for pubsub and slave clients, since
-# subscribers and slaves receive data in a push fashion.
-#
-# Both the hard or the soft limit can be disabled by setting them to zero.
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit slave 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-
-# Redis calls an internal function to perform many background tasks, like
-# closing connections of clients in timeout, purging expired keys that are
-# never requested, and so forth.
-#
-# Not all tasks are performed with the same frequency, but Redis checks for
-# tasks to perform according to the specified "hz" value.
-#
-# By default "hz" is set to 10. Raising the value will use more CPU when
-# Redis is idle, but at the same time will make Redis more responsive when
-# there are many keys expiring at the same time, and timeouts may be
-# handled with more precision.
-#
-# The range is between 1 and 500, however a value over 100 is usually not
-# a good idea. Most users should use the default of 10 and raise this up to
-# 100 only in environments where very low latency is required.
-hz 10
-
-# When a child rewrites the AOF file, if the following option is enabled
-# the file will be fsync-ed every 32 MB of data generated. This is useful
-# in order to commit the file to the disk more incrementally and avoid
-# big latency spikes.
-aof-rewrite-incremental-fsync yes
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7000.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7000.conf
deleted file mode 100644
index b6f83a5..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7000.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 myself,master - 0 0 1 connected 0-5460
-b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468789200637 2 connected 5461-10922
-b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468789202612 3 connected 10923-16383
-96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468789198590 4 connected
-668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203718 6 connected
-e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468789203618 5 connected
-vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7001.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7001.conf
deleted file mode 100644
index 39a11ce..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7001.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468789203614 5 connected
-96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468789202609 4 connected
-668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203715 6 connected
-b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468789199591 3 connected 10923-16383
-b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 myself,master - 0 0 2 connected 5461-10922
-f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468789200599 1 connected 0-5460
-vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7002.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7002.conf
deleted file mode 100644
index 0ffbb5a..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7002.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468789202668 2 connected
-668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203674 6 connected
-96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468789203171 4 connected
-f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468789200657 1 connected 0-5460
-b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 myself,master - 0 0 3 connected 10923-16383
-b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468789203674 2 connected 5461-10922
-vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7003.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7003.conf
deleted file mode 100644
index 2670736..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7003.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468789201991 1 connected 0-5460
-e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468789198671 5 connected
-b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468789202998 3 connected 10923-16383
-b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468789200985 2 connected 5461-10922
-96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 myself,slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 0 4 connected
-668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203700 6 connected
-vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7004.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7004.conf
deleted file mode 100644
index 8eac772..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7004.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468789201555 1 connected 0-5460
-b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468789200549 3 connected 10923-16383
-96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468789203567 4 connected
-e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 myself,slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 0 5 connected
-b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468789202562 2 connected 5461-10922
-668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 1468789203673 6 connected
-vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7005.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7005.conf
deleted file mode 100644
index 6efc1aa..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7005.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-96d24ab41b81b961a916d1db993e2e335b022160 127.0.0.1:7003 slave f13d71b1d14d8bf92b72cebee61421294e95dc72 0 1468472205940 4 connected
-668a2a00c520243b6fe7575e272b90d031c37fda 127.0.0.1:7005 myself,slave b0c818444678488e2a94ebd7f616b5a1431829e3 0 0 6 connected
-b0c818444678488e2a94ebd7f616b5a1431829e3 127.0.0.1:7002 master - 0 1468472206941 3 connected 10923-16383
-f13d71b1d14d8bf92b72cebee61421294e95dc72 127.0.0.1:7000 master - 0 1468472204937 1 connected 0-5460
-e59db751c02455cd7f413e4c6684623c07631b1f 127.0.0.1:7004 slave b768ecb4152912bed6dc927e8f70284191a79ed7 0 1468472202273 2 connected
-b768ecb4152912bed6dc927e8f70284191a79ed7 127.0.0.1:7001 master - 0 1468472203935 2 connected 5461-10922
-vars currentEpoch 6 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7006.conf b/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7006.conf
deleted file mode 100644
index 421f87e..0000000
--- a/debian/modules/nchan/dev/redis_clusterconf/redis-cluster-node-7006.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-543ac57c6d28c31d69120204b153021113d0eba0 :0 myself,master - 0 0 0 connected
-vars currentEpoch 0 lastVoteEpoch 0
diff --git a/debian/modules/nchan/dev/redocument.rb b/debian/modules/nchan/dev/redocument.rb
deleted file mode 100755
index cd3bf0c..0000000
--- a/debian/modules/nchan/dev/redocument.rb
+++ /dev/null
@@ -1,295 +0,0 @@
-#!/usr/bin/ruby
-require "date"
-require "pry"
-
-SRC_DIR="src"
-CONFIG_IN="nchan_commands.rb"
-
-
-README_FILE="README.md"
-
-if ARGV[0]
-  ROOT_DIR = ARGV[0]
-  readme_path = "#{ROOT_DIR}/#{README_FILE}"
-  readme_output_path = ARGV[1]
-  mysite = true
-else
-  ROOT_DIR = ".."
-  readme_path = "#{ROOT_DIR}/#{README_FILE}"
-  readme_output_path = readme_path
-  mysite = nil
-end
-
-current_release = nil
-current_release_date = nil
-Dir.chdir ROOT_DIR do
-  current_release=(`git describe --abbrev=0 --tags`).chomp
-  current_release_date = (`git log -1 --format=%ai #{current_release}`).chomp
-  current_release_date = DateTime.parse(current_release_date).strftime("%B %-d, %Y")
-end
-
-
-class CfCmd #let's make a DSL!
-  attr_accessor :cmds
-  class OneOf
-    def initialize(arg) 
-      @arg=arg
-    end
-    def []=(k,v)
-      @arg[k]=v
-    end
-    def [](val)
-      ret=@arg[val]
-      raise "Unknown value lookup #{val}" if ret.nil?
-      ret
-    end
-  end
-  
-  class Cmd
-    attr_accessor :name, :type, :set, :conf, :offset_name
-    attr_accessor :contexts, :args, :legacy, :alt, :disabled, :undocumented
-    attr_accessor :group, :default, :info, :value
-
-    def initialize(name, func)
-      self.name=name
-      self.set=func
-    end
-    
-    def group
-      @group || :none
-    end
-    
-    def descr(str, opt)
-      if opt[:mysite]
-        "<span class=\"description\">#{str}:</span>"
-      else
-        "#{str}:"
-      end
-    end
-    
-    def to_md(opt={})
-      lines = []
-      if value.class == Array
-        val = "[ #{value.join ' | '} ]"
-      elsif value
-        val = "#{value}"
-      end
-      
-      if opt[:mysite]
-        namestr = "<a class=\"directive\" id=\"#{name}\" href=\"##{name}\">#{name}</a>"
-      else
-        namestr = "**#{name}**"
-      end
-      
-      if val
-        lines << "- #{namestr} `#{val}`"
-      else
-        lines << "- #{namestr}"
-      end
-      
-      if Range === args
-        lines << "  #{descr 'arguments', opt} #{args.first} #{opt[:mysite] ? "&ndash;" : "-"} #{args.exclude_end? ? args.last - 1 : args.last}"
-      elsif Numeric === args
-        lines << "  #{descr 'arguments', opt} #{args}"
-      else
-        raise "invalid args: #{args}"
-      end
-      
-      if default
-        lines << "  #{descr 'default', opt} `#{Array === default ? default.join(' ') : default}`"
-      end
-      
-      ctx_lookup = { main: :http, srv: :server, loc: :location }
-      ctx = contexts.map do |c|
-        ctx_lookup[c] || c;
-      end
-      lines << "  #{descr 'context', opt} #{ctx.join ', '}"
-      
-      if legacy
-        if Array === self.legacy
-          lines << "  #{descr 'legacy names', opt} #{legacy.join ', '}"
-        else
-          lines << "  #{descr 'legacy name', opt} #{legacy}"
-        end
-      end
-      
-      if info
-        out = info.lines.map do |line|
-          "  > #{line.chomp}  "
-        end
-        lines << out.join("\n")
-      end
-      
-      lines.map! {|l| "#{l}  "}
-      lines.join "\n"
-    end
-    
-    def to_txt(opt={})
-      lines = []
-      if value.class == Array
-        val = "[ #{value.join ' | '} ]"
-      elsif value
-        val = "#{value}"
-      end
-      
-      if val
-        lines << "#{name} #{val}"
-      else
-        lines << "#{name}"
-      end
-      
-      if Range === args
-        lines << "  #{descr 'arguments', opt} #{args.first} - #{args.exclude_end? ? args.last - 1 : args.last}"
-      elsif Numeric === args
-        lines << "  #{descr 'arguments', opt} #{args}"
-      else
-        raise "invalid args: #{args}"
-      end
-      
-      if default
-        lines << "  #{descr 'default', opt} #{Array === default ? default.join(' ') : default}"
-      end
-      
-      ctx_lookup = { main: :http, srv: :server, loc: :location }
-      ctx = contexts.map do |c|
-        ctx_lookup[c] || c;
-      end
-      lines << "  #{descr 'context', opt} #{ctx.join ', '}"
-      
-      if legacy
-        if Array === self.legacy
-          lines << "  #{descr 'legacy names', opt} #{legacy.join ', '}"
-        else
-          lines << "  #{descr 'legacy name', opt} #{legacy}"
-        end
-      end
-      
-      if info
-        out = info.lines.map do |line|
-          "   #{line.chomp}  "
-        end
-        lines << out.join("\n")
-      end
-      
-      lines.map! {|l| "#{l}  "}
-      lines.join "\n"
-    end
-  end
-  
-  
-  def initialize(&block)
-    @cmds=[]
-    instance_eval &block
-  end
-  
-  def method_missing(name, *args)
-    define_cmd name, *args
-  end
-  
-  
-  def define_cmd(name, valid_contexts, handler, conf, opt={})
-    cmd=Cmd.new name, handler
-    cmd.contexts= valid_contexts
-    
-    if Array === conf
-      cmd.conf=conf[0]
-      cmd.offset_name=conf[1]
-    else
-      cmd.conf=conf
-    end
-    
-    cmd.legacy = opt[:legacy]
-    cmd.alt = opt[:alt]
-    cmd.disabled = opt[:disabled]
-    cmd.undocumented = opt[:undocumented]
-    
-    cmd.args = opt.has_key?(:args) ? opt[:args] : 1
-    cmd.group = opt[:group]
-    cmd.value = opt[:value]
-    cmd.default = opt[:default]
-    cmd.info = opt[:info]
-    
-    @cmds << cmd if !cmd.disabled && !cmd.undocumented
-  end
- 
-end
-
-
-class Order 
-  def initialize(*args)
-    @i=0
-    @ord = {}
-    args.each do |val|
-      @ord[val] = @i
-      @i+=1
-    end
-  end
-  def [](val)
-    @ord[val] || Float::INFINITY
-  end
-end
-
-begin
-  cf=eval File.read("#{ROOT_DIR}/#{SRC_DIR}/#{CONFIG_IN}")
-rescue Exception => e
-  STDERR.puts e.message.gsub(/^\(eval\)/, "#{SRC_DIR}/#{CONFIG_IN}")
-  exit 1
-end
-
-cmds = cf.cmds
-
-group_order=Order.new(:pubsub, :security, :storage, :meta, :none, :development)
-
-cmds.sort! do |c1, c2|
-  if c1.group != c2.group
-    group_order[c1] - group_order[c2]
-  else
-    (c1.name < c2.name) ? -1 : 1
-  end
-end
-
-
-
-cmds.map! do |cmd|
-  cmd.to_md(:mysite => mysite)
-end
-
-
-config_documentation= cmds.join "\n\n"
-
-#if mysite
-#  config_documentation = "<div class='configuration'><markdown>#{config_documentation}</markdown></div>"
-#end
-
-text = File.read(readme_path)
-
-if mysite
-  #remove first line
-  text.sub!(/^<.*?>$\n\n?/m, "")
-  #remove second line
-  text.sub!(/^https:\/\/nchan.slact.net$\n\n?/m, "")
-  
-  # add an #about link
-  text.prepend "<a id=\"about\"></a>\n"
-  
-  #add a table-of-contents div right before the first heading
-  text.sub! /^#/, "<div class=\"tableOfContents\"></div>\n#"
-end
-
-config_heading = "## Configuration Directives"
-text.gsub!(/(?<=^#{config_heading}$).*(?=^## )/m, "\n\n#{config_documentation}\n\n")
-
-if mysite
-  contrib_heading = "## Contribute"
-  text.gsub!(/(^#{contrib_heading}$).*(?=^## )?/m, "")
-end
-
-
-text.gsub!(/(?<=^The latest Nchan release is )\S+\s+\([^)]+\)/, "#{current_release} (#{current_release_date})")
-
-if mysite
-  text.gsub!(/https:\/\/nchan\.slact\.net\//, "/")
-end
-
-File.open(readme_output_path, "w") {|file| file.puts text }
-
diff --git a/debian/modules/nchan/dev/rsck.sh b/debian/modules/nchan/dev/rsck.sh
deleted file mode 100755
index 9cc0f32..0000000
--- a/debian/modules/nchan/dev/rsck.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-
-server="127.0.0.1"
-port="6379"
-db="0"
-dir=$(dirname $0)
-pushd $dir > /dev/null
-fulldir=$(pwd)
-popd > /dev/null
-  
-while getopts "s:p:d:t:l:h" opt; do
-  case $opt in
-    s)
-      server=$OPTARG;;
-    p)
-      port=$OPTARG;;
-    d)
-      db=$OPTARG;;
-    t)
-      interval=$OPTARG;;
-    l)  
-      logfile=$OPTARG;;
-    h)
-      echo "nchan redis server data consistency check"
-      echo " -s [server]"
-      echo " -p [port]"
-      echo " -d [db number]"
-      echo " -t [minutes]   repeat at this interval"
-      echo " -l [logfile]   log results to this file"
-      ;;
-   \?)
-     exit 1
-     ;;
-  esac
-done
-
-url="redis://$server:$port/$db"
-
-if [[ $interval ]]; then
-  echo "rsck $url every $interval minutes"
-else
-  echo "rsck $url"
-fi
-
-if [[ $logfile ]]; then
-  echo "logging to $logfile"
-fi
-
-if [[ $interval ]]; then
-  sleeptime=$(echo "$interval * 60" | bc)
-fi
-while true; do
-  ret=$(redis-cli -p 8537 --eval $dir/../src/store/redis/scripts/rsck.lua --raw)
-  echo $ret
-  
-  if [[ $logfile ]]; then
-    printf "$(date)\n$ret\n\n" >> $logfile
-  fi
-  
-  if [[ ! $interval ]]; then
-    break
-  else
-    sleep $sleeptime
-  fi
-done
- 
diff --git a/debian/modules/nchan/dev/sub.rb b/debian/modules/nchan/dev/sub.rb
deleted file mode 100755
index f4bbef9..0000000
--- a/debian/modules/nchan/dev/sub.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/ruby
-require 'securerandom'
-require_relative 'pubsub.rb'
-require "optparse"
-require 'timers'
-
-
-server= "localhost:8082"
-par=1
-
-opt = {
-  timeout:      60,
-  quit_message: 'FIN',
-  client:       :longpoll,
-  extra_headers: nil,
-  nostore:       true,
-  http2:         false
-}
-
-no_message=false
-print_content_type = false
-show_id=false
-origin = nil
-
-url = nil
-sub = nil
-
-opt_parser=OptionParser.new do |opts|
-  opts.on("-s", "--server SERVER (#{server})", "server and port."){|v| server=v}
-  opts.on("-p", "--parallel NUM (#{par})", "number of parallel clients"){|v| par = v.to_i}
-  opts.on("-t", "--timeout SEC (#{opt[:timeout]})", "Long-poll timeout"){|v| opt[:timeout] = v}
-  opts.on("-q", "--quit STRING (#{opt[:quit_message]})", "Quit message"){|v| opt[:quit_message] = v}
-  opts.on("-l", "--client STRING (#{opt[:client]})", "sub client (one of #{Subscriber::Client.unique_aliases.join ', '})") do |v|
-    opt[:client] = v.to_sym
-  end
-  opts.on("-c", "--content-type", "show received content-type"){|v| print_content_type = true}
-  opts.on("-i", "--id", "Print message id (last-modified and etag headers)."){|v| show_id = true}
-  opts.on("-n", "--no-message", "Don't output retrieved message."){|v| no_message = true}
-  opts.on("--origin STR", "Set Origin header if appplicable."){|v| origin = v}
-  opts.on("--full-url URL", "full subscriber url") do |v|
-    url = v
-  end
-  opts.on("--http2", "use HTTP/2"){opt[:http2] = true}
-  opts.on("-v", "--verbose", "somewhat rather extraneously wordful output") do
-    opt[:verbose] = true
-    Typhoeus::Config.verbose=true
-  end
-end
-opt_parser.banner="Usage: sub.rb [options] url"
-opt_parser.parse!
-
-url ||= "#{opt[:http2] ? 'h2' : 'http'}://#{server}#{ARGV.last}"
-
-puts "Subscribing #{par} #{opt[:client]} client#{par!=1 ? "s":""} to #{url}."
-puts "Timeout: #{opt[:timeout]}sec, quit msg: #{opt[:quit_message]}"
-
-if origin
-  opt[:extra_headers] ||= {}
-  opt[:extra_headers]['Origin'] = origin
-end
-
-sub = Subscriber.new url, par, opt
-
-
-NOMSGF="\r"*30 + "Received message %i, len:%i"
-if no_message
-  class OutputTimer
-    include Celluloid
-    attr_reader :fired, :timer
-
-    def initialize(interval = 0.5)
-      @count = 0
-      @last_msg_length = 0 
-      @timer = every(interval) do
-        printf NOMSGF, @count, @last_msg_length
-      end
-    end
-    
-    def incoming(msg)
-      @count += 1
-      @last_msg_length = msg.message.length
-    end
-  end
-  
-  output_timer = OutputTimer.new
-end
-
-sub.on_message do |msg|
-  if no_message
-    output_timer.incoming(msg)
-  else
-    if msg.content_type
-      out = "(#{msg.content_type}) #{msg}"
-    else
-      out = msg.to_s
-    end
-    if show_id
-      out = "<#{msg.id}> #{out}"
-    end
-    puts out
-  end
-end
-
-sub.on_failure do |err_msg|
-  if Subscriber::IntervalPollClient === sub.client
-    unless err_msg.match(/\(code 304\)/)
-      false
-    end 
-  else
-    false
-  end
-end
-
-sub.run
-sub.wait
-output_timer.terminate if output_timer
-
-
-if sub.errors.count > 0
-  puts "Errors:"
-  sub.errors.each do |err|
-    puts err
-  end
-  exit 1
-end
diff --git a/debian/modules/nchan/dev/test-parallel.sh b/debian/modules/nchan/dev/test-parallel.sh
deleted file mode 100755
index 389b2a5..0000000
--- a/debian/modules/nchan/dev/test-parallel.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-par=$1
-if [[ -z "$par" ]]; then
-  par=5
-  echo "No parallel count given. Assuming $par."
-fi
-if ! [[ $par =~ ^[0-9]+$ ]]; then
-  echo "Parallel count isn't a number." > /dev/stderr
-  exit 1
-fi
-
-for ((i = 0; i < $par; i++)); do
-
-    echo bundle exec ./test.rb ${@:2} 
-    bundle exec ./test.rb ${@:2} &
-done
-
-jobs=$(jobs -p)
-#echo "jobs are $jobs"
-killjobs() {
-  for job_pid in $jobs; do
-    kill $job_pid
-  done
-}
-
-trap killjobs SIGINT
-wait $jobs
diff --git a/debian/modules/nchan/dev/test.rb b/debian/modules/nchan/dev/test.rb
deleted file mode 100755
index 35db249..0000000
--- a/debian/modules/nchan/dev/test.rb
+++ /dev/null
@@ -1,875 +0,0 @@
-#!/usr/bin/ruby
-require 'minitest'
-require 'minitest/reporters'
-require "minitest/autorun"
-Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new(:color => true)]
-require 'securerandom'
-require_relative 'pubsub.rb'
-require_relative 'authserver.rb'
-
-SERVER=ENV["PUSHMODULE_SERVER"] || "127.0.0.1"
-PORT=ENV["PUSHMODULE_PORT"] || "8082"
-DEFAULT_CLIENT=:longpoll
-OMIT_LONGMSG=ENV["OMIT_LONGMSG"]
-#Typhoeus::Config.verbose = true
-def short_id
-  SecureRandom.hex.to_i(16).to_s(36)[0..5]
-end
-
-def url(part="")
-  part=part[1..-1] if part[0]=="/"
-  "http://#{SERVER}:#{PORT}/#{part}"
-end
-puts "Server at #{url}"
-def pubsub(concurrent_clients=1, opt={})
-  test_name = caller_locations(1,1)[0].label
-  urlpart=opt[:urlpart] || 'broadcast'
-  timeout = opt[:timeout]
-  sub_url=opt[:sub] || "sub/broadcast/"
-  pub_url=opt[:pub] || "pub/"
-  chan_id = opt[:channel] || SecureRandom.hex
-  sub = Subscriber.new url("#{sub_url}#{chan_id}?test=#{test_name}"), concurrent_clients, timeout: timeout, use_message_id: opt[:use_message_id], quit_message: 'FIN', gzip: opt[:gzip], retry_delay: opt[:retry_delay], client: opt[:client] || DEFAULT_CLIENT, extra_headers: opt[:extra_headers], verbose: opt[:verbose]
-  pub = Publisher.new url("#{pub_url}#{chan_id}?test=#{test_name}"), timeout: timeout
-  return pub, sub
-end
-def verify(pub, sub, check_errors=true)
-  assert sub.errors.empty?, "There were subscriber errors: \r\n#{sub.errors.join "\r\n"}" if check_errors
-  ret, err = sub.messages.matches?(pub.messages)
-  assert ret, err || "Messages don't match"
-  i=0
-  sub.messages.each do |msg|
-    assert_equal sub.concurrency, msg.times_seen, "Concurrent subscribers didn't all receive message #{i}."
-    i+=1
-  end
-end
-
-class PubSubTest <  Minitest::Test
-  def setup
-    Celluloid.boot
-  end
-  
-  def test_interval_poll
-    pub, sub=pubsub 1, sub: "/sub/intervalpoll/", client: :intervalpoll, quit_message: 'FIN', retry_delay: 0.5
-    ws_sub=Subscriber.new(sub.url, 1, client: :websocket, quit_message: 'FIN')
-
-    got_304s=0
-    sub.on_failure do |msg|
-      got_304s += 1
-      assert_match /code 304/, msg #handshake will be treated as intervalpoll client?...
-    end
-    
-    ws_sub.run
-    sub.run
-
-    sleep 0.4
-    assert ws_sub.match_errors(/code 403/), "expected 403 for all non-intervalpoll subscribers, got #{sub.errors.pretty_inspect}"
-    ws_sub.terminate
-    
-    pub.post ["hello this", "is a thing"]
-    sleep 0.3
-    pub.post ["oh now what", "is this even a thing?"]
-    sleep 0.1
-    
-    sleep 1.5
-    
-    pub.post "yoo"
-    pub.post "FIN"
-    
-    sub.wait
-
-    verify pub, sub
-    sub.terminate
-    assert got_304s > 0, "Expected at least one 304 response"
-  end
-  
-  def test_channel_info
-    require 'json'
-    require 'nokogiri'
-    require 'yaml'
-    
-    subs=20
-    
-    chan=SecureRandom.hex
-    pub, sub = pubsub(subs, channel: chan, client: :eventsource)
-    pub.nofail=true
-    pub.get
-    assert_equal 404, pub.response_code
-    
-    pub.post ["hello", "what is this i don't even"]
-    assert_equal 202, pub.response_code
-    pub.get
-    
-    assert_equal 200, pub.response_code
-    assert_match /last requested: -?\d+ sec/, pub.response_body
-    
-    pub.get "text/json"
-    
-    info_json=JSON.parse pub.response_body
-    assert_equal 2, info_json["messages"]
-    #assert_equal 0, info_json["requested"]
-    assert_equal 0, info_json["subscribers"]
-
-    
-    sub.run
-    sub.wait :ready
-    sleep 0.15
-    pub.get "text/json"
-
-    info_json=JSON.parse pub.response_body
-    assert_equal 2, info_json["messages"]
-    #assert_equal 0, info_json["requested"]
-    assert_equal subs, info_json["subscribers"], "text/json subscriber count"
-
-    pub.get "text/xml"
-    ix = Nokogiri::XML pub.response_body
-    assert_equal 2, ix.at_xpath('//messages').content.to_i
-    #assert_equal 0, ix.at_xpath('//requested').content.to_i
-    assert_equal subs, ix.at_xpath('//subscribers').content.to_i
-    
-    pub.get "text/yaml"
-    yaml_resp1=pub.response_body
-    pub.get "application/yaml"
-    yaml_resp2=pub.response_body
-    pub.get "application/x-yaml"
-    yaml_resp3=pub.response_body
-    yam=YAML.load pub.response_body
-    assert_equal 2, yam["messages"]
-    #assert_equal 0, yam["requested"]
-    assert_equal subs, yam["subscribers"]
-    
-    assert_equal yaml_resp1, yaml_resp2
-    assert_equal yaml_resp2, yaml_resp3
-    
-    
-    pub.accept="text/json"
-
-    pub.post "FIN"
-    #stats right before FIN was issued
-    info_json=JSON.parse pub.response_body
-    assert_equal 3, info_json["messages"]
-    #assert_equal 0, info_json["requested"]
-    assert_equal subs, info_json["subscribers"]
-    
-    sub.wait
-    
-    pub.get "text/json"
-    info_json=JSON.parse pub.response_body
-    assert_equal 3, info_json["messages"], "number of messages received by channel is wrong"
-    #assert_equal 0, info_json["requested"]
-    assert_equal 0, info_json["subscribers"], "channel should say there are no subscribers"
-    
-    sub.terminate
-  end
-  
-  def multi_sub_url(pubs, prefix="/sub/multi/", delim="/")
-    ids = pubs.map{|v| v.id}.shuffle
-    "#{prefix}#{ids.join delim}"
-  end
-  
-  class MultiCheck
-    attr_accessor :id, :pub
-    def initialize(id)
-      self.id = id
-      self.pub = Publisher.new url("/pub/#{self.id}")
-    end
-  end
-  
-  
-  def test_channel_multiplexing(n=2, delimited=false)
-    
-    pubs = []
-    n.times do |i|
-      pubs << MultiCheck.new(short_id)
-    end
-    
-    sub_url=delimited ? multi_sub_url(pubs, '/sub/split/', '_') : multi_sub_url(pubs)
-    
-    n = 15
-    scrambles = 5
-    subs = []
-    scrambles.times do |i|
-      sub = Subscriber.new(url(sub_url), n, quit_message: 'FIN', retry_delay: 1, timeout: 20)
-      sub.on_failure { false }
-      subs << sub
-    end
-    
-    subs.each &:run
-    
-    pubs.each {|p| p.pub.post "FIRST from #{p.id}" }
-    
-    10.times do |i|
-      pubs.each {|p| p.pub.post "hello #{i} from #{p.id}" }
-    end
-    
-    sleep 1
-    
-    5.times do |i|
-      pubs.first.pub.post "yes #{i} from #{pubs.first.id}"
-    end
-    
-    pubs.each do |p| 
-      10.times do |i|
-        p.pub.post "hello #{i} from #{p.id}"
-      end
-    end
-    
-    latesubs = Subscriber.new(url(sub_url), n, quit_message: 'FIN')
-    latesubs.on_failure { false }
-    subs << latesubs
-    latesubs.run
-    
-    sleep 1
-    
-    10.times do |i|
-      pubs.each {|p| p.pub.post "hello again #{i} from #{p.id}" }
-    end
-    
-    pubs.first.pub.post "FIN"
-    subs.each &:wait
-    sleep 1
-    subs.each_with_index do |sub, sub_i|
-      
-      assert_equal 0, sub.errors.count, "Subscriber encountered #{sub.errors.count} errors: #{sub.errors.join ", "}"
-      
-      msgs=[]
-      pubs.each { |p| msgs << p.pub.messages.messages }
-      
-      sub.messages.each do |msg|  
-        matched = false
-        for mm in msgs do
-          if mm.first == msg.message
-            matched = true
-            mm.shift
-            break
-          end
-        end
-        assert_equal matched, true, "message not matched"
-      end
-      
-      sub.terminate
-    end
-    
-  end
-  
-  def test_channel_multiplexing_5
-    test_channel_multiplexing 5
-  end
-  
-  def test_channel_delimitered_multiplexing_15
-    test_channel_multiplexing 15, true
-  end
-  
-  def test_message_delivery
-    pub, sub = pubsub
-    sub.run
-    sleep 0.2
-    assert_equal 0, sub.messages.messages.count
-    pub.post "hi there"
-    assert_equal 201, pub.response_code, "publisher response code"
-    sleep 0.2
-    assert_equal 1, sub.messages.messages.count, "received message count"
-    pub.post "FIN"
-    assert_equal 201, pub.response_code, "publisher response code"
-    sleep 0.2
-    assert_equal 2, sub.messages.messages.count, "recelived messages count"
-    assert sub.messages.matches? pub.messages
-    sub.terminate
-  end
-  
-  def test_publish_then_subscribe
-    pub, sub = pubsub
-    pub.post "hi there"
-    sub.run
-    pub.post "FIN"
-    sub.wait
-    assert_equal 2, sub.messages.messages.count
-    assert sub.messages.matches? pub.messages
-    sub.terminate
-  end
-
-  def test_authorized_channels
-    #must be published to before subscribing
-    n=5
-    pub, sub = pubsub n, timeout: 6, sub: "sub/authorized/"
-    sub.on_failure { false }
-    sub.run
-    sleep 1
-    sub.wait
-    assert_equal n, sub.finished
-    
-    assert sub.match_errors(/code 403/), "expected 403 for all subscribers, got #{sub.errors.pretty_inspect}"
-    sub.reset
-    
-    pub.post %w( fweep )
-    assert_match /20[12]/, pub.response_code.to_s
-    sleep 0.1
-    
-    sub.run
-    
-    sleep 0.1
-    pub.post ["fwoop", "FIN"] { assert_match /20[12]/, pub.response_code.to_s }
-    
-    
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-
-  def test_deletion
-    #delete active channel
-    par=5
-    pub, sub = pubsub par, timeout: 10
-    sub.on_failure { false }
-    sub.run
-    sleep 0.2
-    pub.delete
-    sleep 0.1
-    assert_equal 200, pub.response_code
-    assert_equal par, pub.response_body.match(/subscribers:\s+(\d)/)[1].to_i, "subscriber count after deletion"
-    sub.wait
-    assert sub.match_errors(/code 410/), "Expected subscriber code 410: Gone, instead was \"#{sub.errors.first}\""
-
-    #delete channel with no subscribers
-    pub, sub = pubsub 5, timeout: 1
-    pub.post "hello"
-    assert_equal 202, pub.response_code
-    pub.delete
-    assert_equal 200, pub.response_code
-
-    #delete nonexistent channel
-    pub, sub = pubsub
-    pub.nofail=true
-    pub.delete
-    assert_equal 404, pub.response_code
-  end
-
-  def test_no_message_buffer
-    chan_id=SecureRandom.hex
-    pub = Publisher.new url("/pub/nobuffer/#{chan_id}")
-    sub=[]
-    40.times do 
-      sub.push Subscriber.new(url("/sub/broadcast/#{chan_id}"), 1, use_message_id: false, quit_message: 'FIN')
-    end
-    
-    pub.post ["this message should not be delivered", "nor this one"]
-    
-    sub.each {|s| s.run}
-    sleep 1
-    pub.post "received1"
-    sleep 1
-    pub.post "received2"
-    sleep 1
-    pub.post "FIN"
-    sub.each {|s| s.wait}
-    sub.each do |s|
-      assert s.errors.empty?, "There were subscriber errors: \r\n#{s.errors.join "\r\n"}"
-      ret, err = s.messages.matches? ["received1", "received2", "FIN"]
-      assert ret, err || "Messages don't match"
-    end
-  end
-  
-  def test_channel_isolation
-    rands= %w( foo bar baz bax qqqqqqqqqqqqqqqqqqq eleven andsoon andsoforth feh )
-    pub=[]
-    sub=[]
-    10.times do |i|
-      pub[i], sub[i]=pubsub 15
-      sub[i].run
-    end
-    pub.each do |p|
-      rand(1..10).times do
-        p.post rands.sample
-      end
-    end
-    sleep 1
-    pub.each do |p|
-      p.post 'FIN'
-    end
-    sub.each do |s|
-      s.wait
-    end
-    pub.each_with_index do |p, i|
-      verify p, sub[i]
-    end
-    sub.each {|s| s.terminate }
-  end
-  
-  def test_broadcast_3
-    test_broadcast 3
-  end
-  
-  def test_broadcast_20
-    test_broadcast 20
-  end
-  
-  def test_longpoll_multipart
-    pub, sub = pubsub 1, sub: 'sub/multipart/', use_message_id: false
-    
-    pub.post "first", "text/x-foobar"
-    pub.post ["1", "2", "3", "4"]
-    sub.run
-    sleep 0.5
-    pub.post "FIN"
-    sub.wait
-   
-    verify pub, sub
-    sub.terminate
-  end
-  
-  def test_longpoll_multipart_extended(range=30..35)
-    range.each do |i|
-      pub, sub = pubsub 1, sub: 'sub/multipart/', use_message_id: false, timeout: 3
-      i.times do |n|
-        pub.post "#{n+1}"
-      end
-      pub.post "FIN"
-      sub.run
-      sub.wait
-      verify pub, sub
-      sleep 0.1
-    end
-  end
-  
-  def test_multiplexed_longpoll_multipart
-    chans= [short_id, short_id, short_id]
-    pub, sub = pubsub 1, sub: "sub/multipart_multiplex/#{chans.join "/"}", pub: "pub/#{chans[1]}", channel: "", use_message_id: false
-    
-    pub.post "first", "text/x-foobar"
-    pub.post ["1", "2", "3", "4"]
-    sub.run
-    sleep 0.5
-    pub.post "FIN"
-    sub.wait
-   
-    verify pub, sub
-    sub.terminate
-  end
-  
-  
-  def test_broadcast(clients=400)
-    pub, sub = pubsub clients
-    pub.post "!!"
-    sub.run #celluloid async FTW
-    #sleep 2
-    pub.post ["!!!!", "what is this", "it's nothing", "nothing at all really"]
-    pub.post "FIN"
-    sub.wait
-    sleep 0.5
-    verify pub, sub
-    sub.terminate
-  end
-  
-  #def test_broadcast_10000
-  #  test_broadcast 10000
-  #end
-  
-  def dont_test_subscriber_concurrency
-    chan=SecureRandom.hex
-    pub_first = Publisher.new url("pub/first#{chan}")
-    pub_last = Publisher.new url("pub/last#{chan}")
-    
-    sub_first, sub_last = [], []
-    { url("sub/first/first#{chan}") => sub_first, url("sub/last/last#{chan}") => sub_last }.each do |url, arr|
-      3.times do
-        sub=Subscriber.new(url, 1, quit_message: 'FIN', timeout: 20)
-        sub.on_failure do |resp, req|
-          false
-        end
-        arr << sub
-      end
-    end
-    
-    sub_first.each {|s| s.run; sleep 0.1 }
-    assert sub_first[0].no_errors?
-    sub_first[1..2].each do |s|
-      assert s.errors?
-      assert s.match_errors(/code 409/)
-    end
-
-    sub_last.each {|s| s.run; sleep 0.1 }
-    assert sub_last[2].no_errors?
-    sub_last[0..1].each do |s|
-      assert s.errors?
-      assert s.match_errors(/code 40[49]/)
-    end
-
-    pub_first.post %w( foo bar FIN )
-    pub_last.post %w( foobar baz somethingelse FIN )
-    
-    sub_first[0].wait
-    sub_last[2].wait
-    
-    verify pub_first, sub_first[0]
-    verify pub_last, sub_last[2]
-    
-    sub_first[1..2].each{ |s| assert s.messages.count == 0 }
-    sub_last[0..1].each{ |s| assert s.messages.count == 0 }
-    [sub_first, sub_last].each {|sub| sub.each{|s| s.terminate}}
-  end
-
-  def test_queueing
-    pub, sub = pubsub 1
-    pub.post %w( what is this_thing andnow 555555555555555555555 eleven FIN ), 'text/plain'
-    sleep 0.3
-    sub.run
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-  
-  def test_long_message(kb=0.5)
-    pub, sub = pubsub 10, timeout: 10
-    sub.run
-    sleep 0.2
-    pub.post ["#{"q"*((kb * 1024)-3)}end", "FIN"]
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-  
-  unless OMIT_LONGMSG
-    #[5, 9, 9.5, 9.9, 10, 11, 15, 16, 17, 18, 19, 20, 30,  50, 100, 200, 300, 600, 900, 3000].each do |n|
-    [5, 10, 20, 200, 900].each do |n|
-      define_method "test_long_message_#{n}Kb" do 
-        test_long_message n
-      end
-    end
-    
-    def test_message_length_range
-      pub, sub = pubsub 2, timeout: 15
-      sub.run
-      
-      n=5
-      while n <= 10000 do
-        pub.post "T" * n
-        n=(n*1.01) + 1
-        sleep 0.001
-      end
-      pub.post "FIN"
-      sub.wait
-      verify pub, sub
-      sub.terminate
-    end
-    
-    def generic_test_long_buffed_messages(client=:longpoll)
-      kb=2000
-      #kb=2
-      pub, sub = pubsub 1, sub: "/sub/broadcast/", timeout: 10, client: client
-      #pub, sub = pubsub 1, sub: "/sub/websocket_only/", client: :websocket
-      #sub.on_message do |msg|
-      #  puts ">>>>>>>message: #{msg.message[0...10]}...|#{msg.message.length}|"
-      #end
-      sub.run
-      sleep 1
-      m1="#{"q"*((kb * 1024)-3)}end"
-      m2="#{"r"*((kb * 1024)-3)}end"
-      i=0
-      15.times do
-        i+=1
-        pub.post "#{i}#{m1}"
-        i+=1
-        pub.post "#{i}#{m2}"
-      end
-      pub.post "FIN"
-      sub.wait
-      verify pub, sub
-      pub.delete
-      sub.terminate
-    end
-
-    [:longpoll, :multipart, :eventsource, :websocket, :chunked].each do |client|
-      define_method "test_long_buffed_messages_#{client}" do
-        generic_test_long_buffed_messages client
-      end
-    end
-    
-  end
-  
-  def test_message_timeout
-    pub, sub = pubsub 1, pub: "/pub/2_sec_message_timeout/", timeout: 10
-    pub.post %w( foo bar etcetera ) #these shouldn't get delivered
-    pub.messages.clear
-    sleep 3
-    #binding.pry
-    sub.run
-    sleep 1
-    pub.post %w( what is this even FIN )
-    sub.wait
-    verify pub, sub
-    sub.terminate
-  end
-    
-  def test_subscriber_timeout
-    chan=SecureRandom.hex
-    sub=Subscriber.new(url("sub/timeout/#{chan}"), 5, timeout: 10)
-    sub.on_failure { false }
-    pub=Publisher.new url("pub/#{chan}")
-    sub.run
-    sleep 0.1
-    pub.post "hello"
-    sub.wait
-    verify pub, sub, false
-    assert sub.match_errors(/code 408/)
-    sub.terminate
-  end
-  
-  def assert_header_includes(response, header, str)
-    assert response.headers[header].include?(str), "Response header '#{header}: #{response.headers[header]}' must contain \"#{str}\", but does not."
-  end
-  
-  def test_access_control_options
-    chan=SecureRandom.hex
-    
-    request = Typhoeus::Request.new url("sub/broadcast/#{chan}"), method: :OPTIONS, headers: { 'Origin':'example.com' }
-    resp = request.run
-    
-    assert_equal "*", resp.headers["Access-Control-Allow-Origin"]
-    %w( GET ).each do |v| 
-      assert_header_includes resp, "Access-Control-Allow-Methods", v
-      assert_header_includes resp, "Allow", v
-    end
-    %w( If-None-Match If-Modified-Since Content-Type Cache-Control X-EventSource-Event ).each {|v| assert_header_includes resp, "Access-Control-Allow-Headers", v}
-    
-    request = Typhoeus::Request.new url("sub/broadcast/#{chan}"), method: :OPTIONS
-    resp = request.run
-    %w( GET ).each do |v| 
-      assert_header_includes resp, "Allow", v
-    end
-    
-    
-    request = Typhoeus::Request.new url("pub/#{chan}"), method: :OPTIONS, headers: { 'Origin': "example.com" }
-    resp = request.run
-    assert_equal "*", resp.headers["Access-Control-Allow-Origin"]
-    %w( GET POST DELETE ).each do |v| 
-      assert_header_includes resp, "Access-Control-Allow-Methods", v
-      assert_header_includes resp, "Allow", v
-    end
-    %w( Content-Type ).each {|v| assert_header_includes resp, "Access-Control-Allow-Headers", v}
-    
-    request = Typhoeus::Request.new url("pub/#{chan}"), method: :OPTIONS
-    resp = request.run
-    %w( GET POST DELETE ).each do |v| 
-      assert_header_includes resp, "Allow", v
-    end
-  end
-  
-  def generic_test_access_control(opt)
-    pub, sub = pubsub 1, extra_headers: { Origin: opt[:origin] }, pub: opt[:pub_url], sub: opt[:sub_url]
-    
-    sub.on_message do |msg, bundle|
-      opt[:verify_sub_response].call(bundle) if opt[:verify_sub_response]
-    end
-    
-    pub.post "FIN"
-    sub.run
-    sub.wait
-    
-    yield pub, sub if block_given?
-    
-    sub.terminate
-  end
-  
-  def test_invalid_etag
-    chan_id=short_id
-    pub = Publisher.new url("/pub/#{chan_id}"), accept: 'text/json'
-    
-    pub.post "1. one!!"
-    sleep 1
-    pub.post "2. tooo"
-    pub.post "3. throo"
-    sleep 1
-    pub.post "4. fooo"
-    n = 0
-    sub = Subscriber.new(url("/sub/multipart_multiplex/#{short_id}/#{short_id}/#{chan_id}"), 1, quit_message: 'FIN', retry_delay: 1, timeout: 20)
-    sub.on_message do |msg, bundle|
-      n=n+1
-      if n == 2
-        bundle.etag="null"
-      end
-    end
-    
-    sub.on_failure do |err|
-      assert_match /code 400/, err
-      false
-    end
-    
-    sub.run
-    sleep 1
-    pub.post "5. faaa"
-    pub.post "FIN"
-    sub.wait
-  end
-  
-  #def test_expired_messages_with_subscribers
-  #  chan = short_id
-  #  pub, sub = pubsub 1, pub: "/pub/2_sec_message_timeout/", sub: "/sub/intervalpoll/", client: :intervalpoll, timeout: 9000, channel: short_id
-  #  sub.on_failure do |err|
-  #    puts "retry?!!"
-  #    true
-  #  end
-  #  sub.run
-  #  pub.post ["foo", "bar"]
-  #  
-  #  sleep 5
-  #  
-  #  pub.post ["yeah", "what", "the"]
-  #  sub.wait
-  #end
-  
-  def dont_test_auth
-    chan = short_id
-    
-    subs = [ :longpoll, :eventsource, :websocket, :multipart ]
-    
-    subs.each do |t|
-      sub = Subscriber.new(url("sub/auth_fail/#{chan}"), 1, client: t)
-      sub.on_failure { false }
-      sub.run
-      sub.wait
-      assert(sub.errors?)
-      assert /code 500/, sub.errors.first
-      sub.terminate
-    end
-    
-    auth_pid = Process.spawn("bundle exec ./authserver.rb -q")
-    while true
-      resp = Typhoeus.get("http://127.0.0.1:8053/", followlocation: true)
-      break unless resp.return_code == :couldnt_connect
-      sleep 0.20
-    end
-    
-    subs.each do |t|
-      sub = Subscriber.new(url("sub/auth_fail/#{chan}"), 1, client: t)
-      sub.on_failure { false }
-      sub.run
-      sub.wait
-      assert(sub.errors?)
-      assert /code 403/, sub.errors.first
-      sub.terminate
-    end
-    
-    pub = Publisher.new url("pub/#{chan}")
-    
-    pub.post [ "wut", "waht", "FIN" ]
-    
-    subs.each do |t|
-      sub = Subscriber.new(url("sub/auth/#{chan}"), 1, client: t, quit_message: 'FIN')
-      sub.on_failure { false }
-      sub.run
-      sub.wait
-      verify pub, sub
-    end
-    
-    Process.kill 2, auth_pid
-  end
-  
-  def test_access_control
-    
-    ver= proc do |bundle| 
-      assert_equal "*", bundle.headers["Access-Control-Allow-Origin"] 
-    end
-    generic_test_access_control(origin: "example.com", verify_sub_response: ver) do |pub, sub|
-      verify pub, sub
-    end
-    
-    ver= proc do |bundle| 
-      assert_equal "http://foo.bar", bundle.headers["Access-Control-Allow-Origin"] 
-      %w( Last-Modified Etag ).each {|v| assert_header_includes bundle, "Access-Control-Expose-Headers", v}
-    end
-    generic_test_access_control(origin: "http://foo.bar", verify_sub_response: ver, sub_url: "sub/from_foo.bar/") do |pub, sub|
-      verify pub, sub
-    end
-    
-    #test forbidding stuff
-    pub, sub = pubsub 1, extra_headers: { "Origin": "http://forbidden.com" }, pub: "pub/from_foo.bar/", sub: "sub/from_foo.bar/", timeout: 1
-    
-    pub.extra_headers={ "Origin": "http://foo.bar" }
-    pub.post "yeah"
-    
-    assert_match /20[12]/, pub.response_code.to_s
-    pub.extra_headers={ "Origin": "http://forbidden.com" }
-    post_failed = false
-    begin 
-      pub.post "yeah"
-    rescue Exception => e
-      post_failed = true
-      assert_match /request failed:\s+403/, e.message
-    end
-    assert post_failed
-    
-    sub.on_failure { false }
-    
-    sub.run
-    sub.wait
-    
-    sub.errors.each do |err|
-      assert_match /code 403/, err
-    end
-    sub.terminate
-    
-  end
-  
-  def test_gzip
-    #bug: turning on gzip cleared the response etag
-    pub, sub = pubsub 1, sub: "/sub/gzip/", gzip: true, retry_delay: 0.3
-    sub.run
-    sleep 0.1
-    pub.post ["2", "123456789A", "alsdjklsdhflsajkfhl", "boq"]
-    sleep 1
-    pub.post "foobar"
-    msg = ""
-    200.times { msg << SecureRandom.hex }
-    pub.post msg
-    pub.post "FIN"
-    sub.wait
-    verify pub, sub
-  end
-  
-  def test_issue_212 #https://github.com/slact/nchan/issues/212
-    chan1 = short_id
-    chan2 = short_id
-    sub = Subscriber.new url("/sub/multi/#{chan1}/#{chan2}"), 1, quit_message: 'FIN', client: :eventsource, timeout: 3
-    sub.on_failure { false }
-    pub = Publisher.new url("/pub/#{chan1}")
-    pub_nobuf = Publisher.new url("/pub/nobuffer/#{chan2}")
-    sub.run
-    sub.wait :ready
-
-    pub.post %w(yes what this and also)
-    sleep 1.1
-    pub_nobuf.post "WHAT?!"
-    pub.messages << pub_nobuf.messages.first
-    pub.post %W(foo bar baz bzzzt FIN)
-
-    sub.wait
-    
-    verify pub, sub
-  end
-  
-  def test_changing_buffer_length
-    chan = short_id
-    sub = Subscriber.new url("sub/broadcast/#{chan}"), 30, quit_message: 'FIN'
-    pub_delta = Publisher.new url("/pub/#{chan}")
-    pub_snapshot = Publisher.new url("/pub_1message/#{chan}")
-    
-    pub_delta.post %W(foo bar baz bzzzt FIN)
-    sub.run
-    sub.wait
-    verify pub_delta, sub
-    sub.reset
-    
-    pub_snapshot.post %W(blah anotherblah)
-    pub_snapshot.messages.clear
-    pub_snapshot.post "this is the real thing right here"
-    
-    pub_delta.messages.clear
-    pub_delta.messages << pub_snapshot.messages.first
-    pub_delta.post %W(d1 d2 d3 and_other_deltas FIN)
-    sub.run
-    sub.wait
-    
-    verify pub_delta, sub
-  end
-end
-
-
diff --git a/debian/modules/nchan/dev/vg.supp b/debian/modules/nchan/dev/vg.supp
deleted file mode 100644
index 750e584..0000000
--- a/debian/modules/nchan/dev/vg.supp
+++ /dev/null
@@ -1,26977 +0,0 @@
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_proxy_set_ssl
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_locations
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_proxy_set_ssl
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_locations
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_proxy_set_ssl
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_locations
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_proxy_set_ssl
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_locations
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_proxy_set_ssl
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_locations
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_proxy_set_ssl
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_locations
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_proxy_set_ssl
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_locations
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_proxy_set_ssl
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_locations
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_proxy_set_ssl
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_locations
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_crc32_table_init
-   fun:main
-}
-
-
-{
-   <guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_save_argv
-   fun:main
-}
-{
-   <guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_strerror_init
-   fun:main
-}
-{
-   <guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_init_setproctitle
-   fun:ngx_os_init
-   fun:main
-}
-{
-   <guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_strerror_init
-   fun:main
-}
-{
-   <pool_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:pool
-   fun:__static_initialization_and_destruction_0
-   fun:_GLOBAL__sub_I_eh_alloc.cc
-   fun:call_init.part.0
-   fun:_dl_init
-   obj:/usr/lib/ld-2.22.so
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-}
-{
-   <worker_guts>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_event_process_init
-   fun:ngx_worker_process_init
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-{
-   <worker_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_epoll_init
-   fun:ngx_event_process_init
-   fun:ngx_worker_process_init
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <core_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <core_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_regex_malloc
-   fun:pcre_study
-   fun:ngx_regex_module_init
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <core_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_list_init
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:*
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:*
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_conf_read_token
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_http_get_variable_index
-   fun:ngx_http_userid_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_log_create_main_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_hide_headers_hash
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_regex_create_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_list_create
-   fun:ngx_regex_create_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_pstrdup
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_init_connection
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_create_temp_buf
-   fun:ngx_http_wait_request_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_create_temp_buf
-   fun:ngx_http_header_filter
-   fun:ngx_http_chunked_header_filter
-   fun:ngx_http_range_header_filter
-   fun:ngx_http_gzip_header_filter
-   fun:ngx_http_ssi_header_filter
-   fun:ngx_http_charset_header_filter
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_rewrite_handler
-   fun:ngx_http_core_rewrite_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_process_request
-   fun:ngx_http_process_request_headers
-   fun:ngx_http_process_request_line
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_rewrite_handler
-   fun:ngx_http_core_rewrite_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_process_request
-   fun:ngx_http_process_request_headers
-   fun:ngx_http_process_request_line
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_list_init
-   fun:ngx_http_create_request
-   fun:ngx_http_keepalive_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_create_temp_buf
-   fun:ngx_http_header_filter
-   fun:ngx_http_chunked_header_filter
-   fun:ngx_http_range_header_filter
-   fun:ngx_http_gzip_header_filter
-   fun:ngx_http_ssi_header_filter
-   fun:ngx_http_charset_header_filter
-   fun:ngx_http_userid_filter
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_create_request
-   fun:ngx_http_keepalive_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_list_init
-   fun:ngx_http_process_request_line
-   fun:ngx_http_keepalive_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_create_request
-   fun:ngx_http_keepalive_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_keepalive_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_create_temp_buf
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_events_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_events_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_events_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_epoll_create_conf
-   fun:ngx_events_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_epoll_create_conf
-   fun:ngx_events_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_autoindex_create_loc_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_index_create_loc_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_index_create_loc_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_map_create_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_map_create_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_upstream_hash_create_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_copy_filter_create_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_copy_filter_create_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_fastcgi_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_gzip_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_gzip_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_userid_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_get_variable_index
-   fun:ngx_http_userid_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_log_set_log
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_autoindex_create_loc_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_index_create_loc_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_index_create_loc_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_upstream_hash_create_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_copy_filter_create_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_copy_filter_create_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_get_variable_index
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_crc32_table_init
-   fun:main
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_headers_add
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_headers_add
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_start_code
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_regex_compile
-   fun:ngx_http_regex_compile
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_regex_compile
-   fun:ngx_http_regex_compile
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_regex_compile
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_pstrdup
-   fun:ngx_http_core_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_get_full_name
-   fun:ngx_conf_full_name
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pool_cleanup_add
-   fun:ngx_resolver_create
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_index_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_index_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_merge_types
-   fun:ngx_http_gzip_merge_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_ssi_init_main_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_merge_types
-   fun:ngx_http_ssi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_merge_types
-   fun:ngx_http_charset_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_create_listening
-   fun:ngx_http_add_listening
-   fun:ngx_http_init_listening
-   fun:ngx_http_optimize_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_create_listening
-   fun:ngx_http_add_listening
-   fun:ngx_http_init_listening
-   fun:ngx_http_optimize_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_create_listening
-   fun:ngx_http_add_listening
-   fun:ngx_http_init_listening
-   fun:ngx_http_optimize_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_init_listening
-   fun:ngx_http_optimize_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_init_listening
-   fun:ngx_http_optimize_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_add_addrs
-   fun:ngx_http_init_listening
-   fun:ngx_http_optimize_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_core_module_init_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_core_module_init_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_set_environment
-   fun:ngx_worker_process_init
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_ssi_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_core_module_init_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pool_cleanup_add
-   fun:ngx_resolver_create
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_autoindex_create_loc_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_autoindex_create_loc_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_index_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_merge_types
-   fun:ngx_http_charset_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_add_addrs
-   fun:ngx_http_init_listening
-   fun:ngx_http_optimize_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_fastcgi_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_ssi_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push
-   fun:ngx_http_script_add_var_code
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push
-   fun:ngx_http_script_add_var_code
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_init_connection
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_regex_exec
-   fun:ngx_http_core_find_location
-   fun:ngx_http_core_find_config_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_process_request
-   fun:ngx_http_process_request_headers
-   fun:ngx_http_process_request_line
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_script_complex_value_code
-   fun:ngx_http_rewrite_handler
-   fun:ngx_http_core_rewrite_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_process_request
-   fun:ngx_http_process_request_headers
-   fun:ngx_http_process_request_line
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_alloc_chain_link
-   fun:ngx_http_write_filter
-   fun:ngx_http_header_filter
-   fun:ngx_http_chunked_header_filter
-   fun:ngx_http_range_header_filter
-   fun:ngx_http_gzip_header_filter
-   fun:ngx_http_ssi_header_filter
-   fun:ngx_http_charset_header_filter
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_alloc_chain_link
-   fun:ngx_http_write_filter
-   fun:ngx_http_header_filter
-   fun:ngx_http_chunked_header_filter
-   fun:ngx_http_range_header_filter
-   fun:ngx_http_gzip_header_filter
-   fun:ngx_http_ssi_header_filter
-   fun:ngx_http_charset_header_filter
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_process_request_headers
-   fun:ngx_http_process_request_line
-   fun:ngx_http_keepalive_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_init_connection
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_regex_exec
-   fun:ngx_http_core_find_location
-   fun:ngx_http_core_find_config_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_process_request
-   fun:ngx_http_process_request_headers
-   fun:ngx_http_process_request_line
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_script_complex_value_code
-   fun:ngx_http_rewrite_handler
-   fun:ngx_http_core_rewrite_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_process_request
-   fun:ngx_http_process_request_headers
-   fun:ngx_http_process_request_line
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_create_pool
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_create_pool
-   fun:ngx_http_create_request
-   fun:ngx_http_keepalive_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_process_request_headers
-   fun:ngx_http_process_request_line
-   fun:ngx_http_keepalive_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push
-   fun:ngx_http_script_add_var_code
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_browser_add_variable
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_pstrdup
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_pstrdup
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_fastcgi_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_core_module_init_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_get_full_name
-   fun:ngx_conf_full_name
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_conf_read_token
-   fun:ngx_conf_parse
-   fun:ngx_events_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_create_pool
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_upstream_hash_create_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_log_set_log
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_upstream_hash_create_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_headers_add
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_start_code
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_regex_compile
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_index_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_create_pool
-   fun:ngx_http_push_init_module
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push
-   fun:ngx_http_script_add_var_code
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_browser_add_variable
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_get_variable_index
-   fun:ngx_http_script_add_var_code
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_pstrdup
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_list_create
-   fun:ngx_regex_create_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_ssi_init_main_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_get_variable_index
-   fun:ngx_http_script_add_var_code
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_fastcgi_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_gzip_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_userid_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_conf_read_token
-   fun:ngx_conf_parse
-   fun:ngx_events_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_create_temp_buf
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_core_module_create_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_core_module_create_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_headers_add
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:*
-   fun:*
-   fun:*
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_userid_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:*
-   fun:*
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_rewrite_value
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_core_create_loc_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_core_create_loc_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_limit_conn_create_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_core_create_main_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_proxy_create_loc_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_proxy_create_loc_conf
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_limit_req_create_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_ssi_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push
-   fun:ngx_http_get_variable_index
-   fun:ngx_http_log_variable_compile
-   fun:ngx_http_log_compile_format
-   fun:ngx_http_log_init
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_referer_create_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_gzip_create_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_userid_create_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_regex_malloc
-   fun:pcre_compile2
-   fun:ngx_regex_compile
-   fun:ngx_http_regex_compile
-   fun:ngx_http_core_regex_location
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_init_headers_in_hash
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_conf_read_token
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_init_main_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_variables_init_vars
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_push_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_script_start_code
-   fun:ngx_http_rewrite_value
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_create_temp_buf
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_autoindex_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_proxy_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_variables_add_core_vars
-   fun:ngx_http_core_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_variables_add_core_vars
-   fun:ngx_http_core_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push
-   fun:ngx_hash_add_key
-   fun:ngx_http_variables_add_core_vars
-   fun:ngx_http_core_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_upstream_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_variables_init_vars
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_memcached_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_keys_array_init
-   fun:ngx_http_variables_add_core_vars
-   fun:ngx_http_core_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_scgi_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_uwsgi_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_fastcgi_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-{
-   <conf_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_core_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <core_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <core_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-} 
-
-{
-   <worker_guts>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_event_process_init
-   fun:ngx_worker_process_init
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_get_variable_index
-   fun:ngx_http_log_variable_compile
-   fun:ngx_http_log_compile_format
-   fun:ngx_http_log_init
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_regex_malloc
-   fun:pcre_compile2
-   fun:ngx_regex_compile
-   fun:ngx_http_regex_compile
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_conf_set_path_slot
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_conf_merge_path_value
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_conf_merge_path_value
-   fun:ngx_http_fastcgi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_conf_merge_path_value
-   fun:ngx_http_uwsgi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_conf_merge_path_value
-   fun:ngx_http_scgi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_proxy_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_event_core_create_conf
-   fun:ngx_events_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_calloc
-   fun:ngx_resolver_create
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_init_locations
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_log_set_log
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_hide_headers_hash
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_hide_headers_hash
-   fun:ngx_http_fastcgi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_hide_headers_hash
-   fun:ngx_http_uwsgi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_hide_headers_hash
-   fun:ngx_http_scgi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_list_init
-   fun:ngx_list_create
-   fun:ngx_regex_create_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_keys_array_init
-   fun:ngx_http_variables_add_core_vars
-   fun:ngx_http_core_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_keys_array_init
-   fun:ngx_http_variables_add_core_vars
-   fun:ngx_http_core_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_keys_array_init
-   fun:ngx_http_variables_add_core_vars
-   fun:ngx_http_core_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_list_push
-   fun:ngx_regex_compile
-   fun:ngx_http_regex_compile
-   fun:ngx_http_core_regex_location
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push_n
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_merge_types
-   fun:ngx_http_gzip_merge_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_merge_types
-   fun:ngx_http_ssi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_ssi_preconfiguration
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_upstream_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_regex_compile
-   fun:ngx_http_regex_compile
-   fun:ngx_http_core_regex_location
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_regex_compile
-   fun:ngx_http_regex_compile
-   fun:ngx_http_core_regex_location
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_regex_compile
-   fun:ngx_http_core_regex_location
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_start_code
-   fun:ngx_http_rewrite_value
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_rewrite_value
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_index_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_index_create_loc_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_copy_filter_create_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_copy_filter_create_conf
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_add_variable
-   fun:ngx_http_upstream_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_upstream_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_browser_add_variable
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_conf_read_token
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_conf_read_token
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_core_module_create_conf
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_array_create
-   fun:ngx_http_script_start_code
-   fun:ngx_http_rewrite
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push_n
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_init_headers_in_hash
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_init
-   fun:ngx_hash_add_key
-   fun:ngx_http_add_variable
-   fun:ngx_http_proxy_add_variables
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_conf_read_token
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_conf_read_token
-   fun:ngx_conf_parse
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_calloc
-   fun:ngx_resolver_create
-   fun:ngx_http_core_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_merge_types
-   fun:ngx_http_charset_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_init_main_conf
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_hide_headers_hash
-   fun:ngx_http_fastcgi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_hide_headers_hash
-   fun:ngx_http_uwsgi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_hash_init
-   fun:ngx_http_upstream_hide_headers_hash
-   fun:ngx_http_scgi_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_push
-   fun:ngx_http_get_variable_index
-   fun:ngx_http_script_add_var_code
-   fun:ngx_http_script_compile
-   fun:ngx_http_proxy_init_headers
-   fun:ngx_http_proxy_merge_loc_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_regex_compile
-   fun:ngx_http_core_regex_location
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_server
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_start_code
-   fun:ngx_http_rewrite_value
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-   fun:ngx_conf_handler
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_array_create
-   fun:ngx_http_script_init_arrays
-   fun:ngx_http_script_compile
-   fun:ngx_http_rewrite_value
-   fun:ngx_http_rewrite_set
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_http_core_location
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_init_connection
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_init_connection
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_create_temp_buf
-   fun:ngx_http_wait_request_handler
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_init_connection
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_create_pool
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_init_connection
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_event_accept
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_create_temp_buf
-   fun:ngx_http_wait_request_handler
-   fun:ngx_event_process_posted
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-}
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:BUF_strndup
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:BUF_strndup
-   fun:CONF_module_add
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_thread_set_item
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:BIO_set
-   fun:BIO_new
-   fun:BIO_new_file
-   fun:def_load
-   fun:CONF_modules_load_file
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:BIO_set
-   fun:BIO_new
-   fun:BIO_new_file
-   fun:def_load
-   fun:CONF_modules_load_file
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_digests
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:OBJ_NAME_add
-   fun:EVP_add_digest
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:x509_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:d2i_X509_AUX
-   fun:PEM_ASN1_read_bio
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:x509_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:d2i_X509_AUX
-   fun:PEM_ASN1_read_bio
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:RSA_new_method
-   fun:rsa_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:rsa_pub_decode
-   fun:X509_PUBKEY_get
-   fun:SSL_CTX_use_certificate
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:RSA_new_method
-   fun:rsa_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:rsa_pub_decode
-   fun:X509_PUBKEY_get
-   fun:SSL_CTX_use_certificate
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:DH_new_method
-   fun:ngx_ssl_dhparam
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:DH_new_method
-   fun:ngx_ssl_dhparam
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:engine_cleanup_add_last
-   fun:ENGINE_add
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:engine_cleanup_add_last
-   fun:ENGINE_add
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:BIO_set
-   fun:BIO_new
-   fun:BIO_new_file
-   fun:def_load
-   fun:CONF_modules_load_file
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:BIO_set
-   fun:BIO_new
-   fun:BIO_new_file
-   fun:def_load
-   fun:CONF_modules_load_file
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:x509_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:d2i_X509_AUX
-   fun:PEM_ASN1_read_bio
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:x509_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:d2i_X509_AUX
-   fun:PEM_ASN1_read_bio
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:RSA_new_method
-   fun:rsa_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:rsa_pub_decode
-   fun:X509_PUBKEY_get
-   fun:SSL_CTX_use_certificate
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:RSA_new_method
-   fun:rsa_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:rsa_pub_decode
-   fun:X509_PUBKEY_get
-   fun:SSL_CTX_use_certificate
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:DH_new_method
-   fun:ngx_ssl_dhparam
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:DH_new_method
-   fun:ngx_ssl_dhparam
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:CONF_module_add
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:realloc
-   fun:CRYPTO_realloc
-   fun:sk_insert
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_ECDH_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_RAND_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_COMP_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:int_thread_get
-   fun:int_thread_set_item
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_BUF_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_ECDSA_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_OBJ_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:int_thread_get
-   fun:int_thread_set_item
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:OBJ_NAME_init
-   fun:OBJ_NAME_add
-   fun:EVP_add_cipher
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:int_err_get
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_CRYPTO_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_UI_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_OCSP_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_DH_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_CONF_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_DSA_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_PKCS12_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_BIO_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_ENGINE_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_PKCS7_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_BN_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_PEM_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_X509_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_DSO_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_TS_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_RSA_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_X509V3_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_EVP_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_CMS_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:realloc
-   fun:CRYPTO_realloc
-   fun:lh_insert
-   fun:OBJ_NAME_add
-   fun:OpenSSL_add_all_ciphers
-   fun:OPENSSL_add_all_algorithms_noconf
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_ASN1_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_EC_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_SSL_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:realloc
-   fun:CRYPTO_realloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:BUF_strndup
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:engine_cleanup_add_last
-   fun:ENGINE_add
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:BUF_strndup
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:BUF_strndup
-   fun:CONF_module_add
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_thread_set_item
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:BIO_set
-   fun:BIO_new
-   fun:BIO_new_file
-   fun:def_load
-   fun:CONF_modules_load_file
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:BIO_set
-   fun:BIO_new
-   fun:BIO_new_file
-   fun:def_load
-   fun:CONF_modules_load_file
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:x509_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:d2i_X509_AUX
-   fun:PEM_ASN1_read_bio
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:x509_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:d2i_X509_AUX
-   fun:PEM_ASN1_read_bio
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:RSA_new_method
-   fun:rsa_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:rsa_pub_decode
-   fun:X509_PUBKEY_get
-   fun:SSL_CTX_use_certificate
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:RSA_new_method
-   fun:rsa_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:rsa_pub_decode
-   fun:X509_PUBKEY_get
-   fun:SSL_CTX_use_certificate
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:DH_new_method
-   fun:ngx_ssl_dhparam
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:DH_new_method
-   fun:ngx_ssl_dhparam
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:BIO_set
-   fun:BIO_new
-   fun:BIO_new_file
-   fun:def_load
-   fun:CONF_modules_load_file
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:BIO_set
-   fun:BIO_new
-   fun:BIO_new_file
-   fun:def_load
-   fun:CONF_modules_load_file
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:X509_STORE_new
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:x509_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:d2i_X509_AUX
-   fun:PEM_ASN1_read_bio
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:x509_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:d2i_X509_AUX
-   fun:PEM_ASN1_read_bio
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:RSA_new_method
-   fun:rsa_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:rsa_pub_decode
-   fun:X509_PUBKEY_get
-   fun:SSL_CTX_use_certificate
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:RSA_new_method
-   fun:rsa_cb
-   fun:ASN1_item_ex_new
-   fun:ASN1_item_ex_d2i
-   fun:ASN1_item_d2i
-   fun:rsa_pub_decode
-   fun:X509_PUBKEY_get
-   fun:SSL_CTX_use_certificate
-   fun:ngx_ssl_certificate
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:DH_new_method
-   fun:ngx_ssl_dhparam
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:sk_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:DH_new_method
-   fun:ngx_ssl_dhparam
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:COMP_zlib
-   fun:SSL_COMP_get_compression_methods
-   fun:SSL_library_init
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:int_get_new_index
-   fun:SSL_get_ex_data_X509_STORE_CTX_idx
-   fun:SSL_CTX_new
-   fun:ngx_ssl_create
-   fun:ngx_http_ssl_merge_srv_conf
-   fun:ngx_http_merge_servers
-   fun:ngx_http_block
-   fun:ngx_conf_handler
-   fun:ngx_conf_parse
-   fun:ngx_init_cycle
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:CONF_module_add
-   fun:OPENSSL_load_builtin_modules
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:CONF_module_add
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:realloc
-   fun:CRYPTO_realloc
-   fun:sk_insert
-   fun:int_get_new_index
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_ECDH_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_RAND_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_COMP_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:int_thread_get
-   fun:int_thread_set_item
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_BUF_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_ECDSA_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_OBJ_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:def_get_class
-   fun:int_new_ex_data
-   fun:ENGINE_new
-   fun:ENGINE_load_dynamic
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:int_thread_get
-   fun:int_thread_set_item
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_new
-   fun:int_err_get
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_CRYPTO_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_UI_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_OCSP_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_DH_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_CONF_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:ERR_get_state
-   fun:ERR_clear_error
-   fun:ENGINE_load_builtin_engines
-   fun:OPENSSL_config
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_DSA_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_PKCS12_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_BIO_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_ENGINE_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_PKCS7_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_BN_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_PEM_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_X509_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_DSO_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_TS_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_RSA_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_X509V3_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_EVP_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_CMS_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_ASN1_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_ERR_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_EC_strings
-   fun:ERR_load_crypto_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ERR_load_SSL_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:CRYPTO_malloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-
-
-
-
-
-
-
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:realloc
-   fun:CRYPTO_realloc
-   fun:lh_insert
-   fun:int_err_set_item
-   fun:ERR_load_strings
-   fun:SSL_load_error_strings
-   fun:ngx_ssl_init
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: indirect
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_upstream_process_header
-   fun:ngx_http_upstream_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: indirect
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_upstream_create
-   fun:ngx_http_proxy_handler
-   fun:ngx_http_core_content_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_run_posted_requests
-   fun:ngx_http_request_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: indirect
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_list_init
-   fun:ngx_http_upstream_process_header
-   fun:ngx_http_upstream_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: indirect
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_proxy_handler
-   fun:ngx_http_core_content_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_run_posted_requests
-   fun:ngx_http_request_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: indirect
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_proxy_handler
-   fun:ngx_http_core_content_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_run_posted_requests
-   fun:ngx_http_request_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: indirect
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-   fun:ngx_http_proxy_process_header
-   fun:ngx_http_proxy_process_status_line
-   fun:ngx_http_upstream_process_header
-   fun:ngx_http_upstream_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: indirect
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_chain_get_free_buf
-   fun:ngx_http_proxy_non_buffered_copy_filter
-   fun:ngx_http_upstream_process_header
-   fun:ngx_http_upstream_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-   fun:main
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: indirect
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-   fun:ngx_http_proxy_create_request
-   fun:ngx_http_upstream_init_request
-   fun:ngx_http_upstream_init
-   fun:ngx_http_read_client_request_body
-   fun:ngx_http_proxy_handler
-   fun:ngx_http_core_content_phase
-   fun:ngx_http_core_run_phases
-   fun:ngx_http_handler
-   fun:ngx_http_run_posted_requests
-   fun:ngx_http_request_handler
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-   fun:ngx_worker_process_cycle
-   fun:ngx_spawn_process
-   fun:ngx_start_worker_processes
-   fun:ngx_master_process_cycle
-}
-
-
-
diff --git a/debian/modules/nchan/src/nchan_commands.rb b/debian/modules/nchan/src/nchan_commands.rb
index 8f4126a..12a88f1 100644
--- a/debian/modules/nchan/src/nchan_commands.rb
+++ b/debian/modules/nchan/src/nchan_commands.rb
@@ -8,7 +8,9 @@ CfCmd.new do
       
       group: "pubsub",
       default: "(none)",
-      info: "Channel id for a publisher or subscriber location. Can have up to 4 values to subscribe to up to 4 channels."
+      tags: [ 'channel-id' ],
+      info: "Channel id for a publisher or subscriber location. Can have up to 4 values to subscribe to up to 4 channels.",
+      uri: "#the-channel-id"
   
   nchan_publisher_channel_id [:srv, :loc, :if],
       :nchan_set_pub_channel_id,
@@ -17,6 +19,7 @@ CfCmd.new do
       alt: [ :nchan_pub_channel_id ],
       
       group: "pubsub",
+      tags: [ 'pubsub', 'channel-id' ],
       default: "(none)",
       info: "Channel id for publisher location."
   
@@ -25,20 +28,24 @@ CfCmd.new do
       [:loc_conf, :publisher_upstream_request_url],
       
       group: "pubsub",
+      tags: [ 'publisher', 'hook' ],
       value: "<url>",
+      uri: "/details#message-publishing-callbacks",
       info: <<-EOS.gsub(/^ {8}/, '')
         Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.  
-        The upstream response code determine how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.
+        The upstream response code determines how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.
       EOS
+      
   
   nchan_channel_id_split_delimiter [:srv, :loc, :if],
       :ngx_conf_set_str_slot,
       [:loc_conf, :channel_id_split_delimiter],
       
       group: "pubsub",
+      tags: [ 'channel-id', 'channel-multiplexing' ],
       default: "(none)",
-      info: "Split the channel id into several ids for multiplexing using the delimiter string provided."
-      
+      info: "Split the channel id into several ids for multiplexing using the delimiter string provided.",
+      uri: "#channel-multiplexing"
   
   nchan_subscriber_channel_id [:srv, :loc, :if],
       :nchan_set_sub_channel_id,
@@ -46,6 +53,7 @@ CfCmd.new do
       args: 1..7,
       alt: [ :nchan_sub_channel_id ],
       group: "pubsub",
+      tags: ["pubsub", 'channel-id'],
       
       default: "(none)",
       info: "Channel id for subscriber location. Can have up to 4 values to subscribe to up to 4 channels."
@@ -56,9 +64,11 @@ CfCmd.new do
       args: 0..6,
       
       group: "pubsub",
+      tags: [ 'publisher', 'subscriber', 'pubsub' ],
       value: ["http", "websocket", "eventsource", "longpoll", "intervalpoll", "chunked", "multipart-mixed", "http-raw-stream"],
       default: ["http", "websocket", "eventsource", "longpoll", "chunked", "multipart-mixed"],
-      info: "Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server."
+      info: "Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server.",
+      uri: '#pubsub-endpoint'
   
   
   nchan_longpoll_multipart_response [:srv, :loc, :if],
@@ -67,6 +77,7 @@ CfCmd.new do
       args: 1,
       
       group: "pubsub",
+      tags: ['subscriber-longpoll'],
       default: "off",
       value: ["off", "on", "raw"],
       info: "when set to 'on', enable sending multiple messages in a single longpoll response, separated using the multipart/mixed content-type scheme. If there is only one available message in response to a long-poll request, it is sent unmodified. This is useful for high-latency long-polling connections as a way to minimize round-trips to the server. When set to 'raw', sends multiple messages using the http-raw-stream message separator."
@@ -77,6 +88,7 @@ CfCmd.new do
       args: 1,
       
       group: "pubsub",
+      tags: ['subscriber-eventsource'],
       default: "(none)",
       info: "Set the EventSource `event:` line to this value. When used in a publisher location, overrides the published message's `X-EventSource-Event` header and associates the message with the given value. When used in a subscriber location, overrides all messages' associated `event:` string with the given value."
       
@@ -88,9 +100,11 @@ CfCmd.new do
       legacy: "push_subscriber",
       
       group: "pubsub",
+      tags: ['subscriber'],
       value: ["websocket", "eventsource", "longpoll", "intervalpoll", "chunked", "multipart-mixed", "http-raw-stream"],
       default: ["websocket", "eventsource", "longpoll", "chunked", "multipart-mixed"],
-      info: "Defines a server or location as a channel subscriber endpoint. This location represents a subscriber's interface to a channel's message queue. The queue is traversed automatically, starting at the position defined by the `nchan_subscriber_first_message` setting.  \n The value is a list of permitted subscriber types." 
+      info: "Defines a server or location as a channel subscriber endpoint. This location represents a subscriber's interface to a channel's message queue. The queue is traversed automatically, starting at the position defined by the `nchan_subscriber_first_message` setting.  \n The value is a list of permitted subscriber types." ,
+      uri: "#subscriber-endpoints"
   
   nchan_subscriber_compound_etag_message_id [:srv, :loc, :if], 
       :ngx_conf_set_flag_slot,
@@ -98,7 +112,9 @@ CfCmd.new do
       args: 1,
       
       group: "pubsub",
+      tags: ['subscriber'],
       default: "off",
+      uri: "",
       info: <<-EOS.gsub(/^ {8}/, '')
         Override the default behavior of using both `Last-Modified` and `Etag` headers for the message id.  
         Enabling this option packs the entire message id into the `Etag` header, and discards
@@ -111,6 +127,7 @@ CfCmd.new do
       args: 1,
       
       group: "pubsub",
+      tags: ['subscriber'],
       default: "(none)",
       info: <<-EOS.gsub(/^ {8}/, '')
         Use a custom header instead of the Etag header for message ID in subscriber responses. This setting is a hack, useful when behind a caching proxy such as Cloudflare that under some conditions (like using gzip encoding) swallow the Etag header.
@@ -122,6 +139,7 @@ CfCmd.new do
       args: 1..5,
       
       group: "pubsub",
+      tags: ['subscriber'],
       default: ["$http_last_event_id", "$arg_last_event_id"],
       info: "If `If-Modified-Since` and `If-None-Match` headers are absent, set the message id to the first non-empty of these values. Used primarily as a workaround for the inability to set the first `Last-Message-Id` of a web browser's EventSource object. "
   
@@ -131,6 +149,7 @@ CfCmd.new do
       args: 1,
       
       group: "pubsub",
+      tags: ['subscriber-rawstream'],
       value: "<string>",
       default: "\\n",
       info: "Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character."
@@ -141,9 +160,10 @@ CfCmd.new do
       args: 1,
       
       group: "pubsub",
+      tags: ['subscriber'],
       value: ["oldest", "newest", "<number>"],
       default: "oldest",
-      info: "Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` start at `n`th from now). 0 is equivalent to 'newest'."
+      info: "Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` starts at `n`th from now). 0 is equivalent to 'newest'."
   
   
   #nchan_subscriber_concurrency [:main, :srv, :loc, :if],
@@ -163,6 +183,7 @@ CfCmd.new do
       [:loc_conf, :websocket_ping_interval],
       
       group: "pubsub",
+      tags: ['subscriber-websocket'],
       value: "<number> (seconds)",
       default: "0 (none)",
       info: "Interval for sending websocket ping frames. Disabled by default."
@@ -174,9 +195,11 @@ CfCmd.new do
       legacy: "push_publisher",
       
       group: "pubsub",
+      tags: ['publisher'],
       value: ["http", "websocket"],
       default: ["http", "websocket"],
-      info: "Defines a server or location as a publisher endpoint. Requests to a publisher location are treated as messages to be sent to subscribers. See the protocol documentation for a detailed description."
+      info: "Defines a server or location as a publisher endpoint. Requests to a publisher location are treated as messages to be sent to subscribers. See the protocol documentation for a detailed description.",
+      uri: "#publisher-endpoints"
   
   nchan_subscriber_timeout [:main, :srv, :loc, :if],
       :ngx_conf_set_sec_slot,
@@ -184,17 +207,41 @@ CfCmd.new do
       legacy: "push_subscriber_timeout",
       
       group: "pubsub",
+      tags: ['subscriber'],
       value: "<number> (seconds)",
       default: "0 (none)",
       info: "Maximum time a subscriber may wait for a message before being disconnected. If you don't want a subscriber's connection to timeout, set this to 0. When possible, the subscriber will get a response with a `408 Request Timeout` status; otherwise the subscriber will simply be disconnected."
+      
   
   nchan_authorize_request [:srv, :loc, :if], 
       :ngx_http_set_complex_value_slot,
       [:loc_conf, :authorize_request_url],
       
       group: "security",
+      tags: ['publisher', 'subscriber', 'hook'],
       value: "<url>",
-      info: "Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it."
+      info: "Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it.",
+      uri: "/details#request-authorization"
+  
+  nchan_subscribe_request [:srv, :loc, :if], 
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :subscribe_request_url],
+      
+      group: "pubsub",
+      tags: ['subscriber', 'hook'],
+      value: "<url>",
+      info: "Send GET request to internal location (which may proxy to an upstream server) after subscribing. Disabled for longpoll and interval-polling subscribers.",
+      uri: "/details#subsribe-and-unsubscribe-callbacks"
+  
+  nchan_unsubscribe_request [:srv, :loc, :if], 
+      :ngx_http_set_unsubscribe_request_url,
+      [:loc_conf, :unsubscribe_request_url],
+      
+      group: "pubsub",
+      tags: ['subscriber', 'hook'],
+      value: "<url>",
+      info: "Send GET request to internal location (which may proxy to an upstream server) after unsubscribing. Disabled for longpoll and interval-polling subscribers.",
+      uri: "/details#subsribe-and-unsubscribe-callbacks"
   
   nchan_store_messages [:main, :srv, :loc, :if],
       :nchan_store_messages_directive,
@@ -202,6 +249,7 @@ CfCmd.new do
       legacy: "push_store_messages",
       
       group: "storage",
+      tags: ['publisher'],
       value: [:on, :off],
       default: :on,
       info: "Publisher configuration. \"`off`\" is equivalent to setting `nchan_message_buffer_length 0`, which disables the buffering of old messages. Using this setting is not recommended when publishing very quickly, as it may result in missed messages."
@@ -212,24 +260,30 @@ CfCmd.new do
       legacy: "push_max_reserved_memory",
       
       group: "storage",
+      tags: ['memstore'],
       value: "<size>",
       default: "32M",
-      info: "The size of the shared memory chunk this module will use for message queuing and buffering."
+      info: "The size of the shared memory chunk this module will use for message queuing and buffering.",
+      uri: "#memory-storage"
     
   nchan_redis_url [:main, :srv, :loc],
       :ngx_conf_set_redis_url,
       [:loc_conf, :"redis.url"],
       
       group: "storage",
+      tags: ['redis'],
       default: "127.0.0.1:6379",
-      info: "The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted."
+      info: "The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.",
+      uri: "/details#using-redis"
   
   nchan_redis_pass [:main, :srv, :loc],
       :ngx_conf_set_redis_upstream_pass,
       [:loc_conf, :"redis"],
       
       group: "storage",
-      info: "Use an upstream config block for Redis servers."
+      tags: ['publisher', 'subscriber', 'redis'],
+      info: "Use an upstream config block for Redis servers.",
+      uri: "/details#using-redis"
   
   nchan_redis_pass_inheritable [:main, :srv, :loc],
       :ngx_conf_set_flag_slot,
@@ -248,22 +302,27 @@ CfCmd.new do
       :ngx_conf_upstream_redis_server,
       :loc_conf,
       group: "storage",
-      info: "Used in upstream { } blocks to set redis servers."
+      tags: ['redis'],
+      info: "Used in upstream { } blocks to set redis servers.",
+      uri: "/details#using-redis"
   
   nchan_use_redis [:main, :srv, :loc],
       :ngx_conf_enable_redis,
       [:loc_conf, :"redis.url_enabled"],
       
       group: "storage",
+      tags: ['redis', 'publisher', 'subscriber'],
       value: [ :on, :off ],
       default: :off,
-      info: "Use redis for message storage at this location."
+      info: "Use redis for message storage at this location.", 
+      uri: "/details#using-redis"
   
   nchan_redis_ping_interval [:main, :srv, :loc],
       :ngx_conf_set_sec_slot,
       [:loc_conf, :"redis.ping_interval"],
       
       group: "storage",
+      tags: ['redis'],
       default: "4m",
       info: "Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable."
   
@@ -280,30 +339,33 @@ CfCmd.new do
       [:loc_conf, :redis_idle_channel_cache_timeout],
       
       group: "storage",
+      tags: ['redis'],
       value: "<time>",
       default: "30s",
       info: "A Redis-stored channel and its messages are removed from memory (local cache) after this timeout, provided there are no local subscribers."
   
   nchan_message_timeout [:main, :srv, :loc], 
-      :ngx_conf_set_sec_slot, 
-      [:loc_conf, :buffer_timeout],
+      :nchan_set_message_timeout, 
+      [:loc_conf, :message_timeout],
       legacy: "push_message_timeout",
       
       group: "storage",
-      value: "<time>",
+      tags: ['publisher'],
+      value: ["<time>", "<variable>"],
       default: "1h",
-      info: "Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Applicable only if a nchan_publisher is present in this or a child context."
+      info: "Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Note that messages always expire from oldest to newest, so an older message may prevent a newer one with a shorter timeout from expiring. An Nginx variable can also be used to set the timeout dynamically."
   
   nchan_message_buffer_length [:main, :srv, :loc],
-      :ngx_conf_set_num_slot,
+      :nchan_set_message_buffer_length,
       [:loc_conf, :max_messages],
       legacy: [ "push_max_message_buffer_length", "push_message_buffer_length" ],
       alt: ["nchan_message_max_buffer_length"],
       
       group: "storage",
-      value: "<number>",
+      tags: ['publisher'],
+      value: ["<number>", "<variable>"],
       default: 10,
-      info: "Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages."
+      info: "Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages. An Nginx variable can also be used to set the buffer length dynamically."
   
   nchan_subscribe_existing_channels_only [:main, :srv, :loc],
       :ngx_conf_set_flag_slot, 
@@ -311,6 +373,7 @@ CfCmd.new do
       legacy: "push_authorized_channels_only",
       
       group: "security",
+      tags: ['subscriber'],
       value: [:on, :off],
       default: :off,
       info: "Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response."
@@ -322,6 +385,7 @@ CfCmd.new do
       
       group: "security",
       value: "<string>",
+      tags: ['publisher', 'subscriber'],
       default: "*",
       info: "Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the publisher or subscriber request's `Origin` header does not match this value, respond with a `403 Forbidden`."
   
@@ -331,6 +395,7 @@ CfCmd.new do
       legacy: "push_channel_group",
       
       group: "security",
+      tags: ['publisher', 'subscriber', 'channel-events'],
       value: "<string>",
       default: "(none)",
       info: "Because settings are bound to locations and not individual channels, it is useful to be able to have channels that can be reached only from some locations and never others. That's where this setting comes in. Think of it as a prefix string for the channel id."
@@ -341,6 +406,8 @@ CfCmd.new do
       args: 1,
       
       group: "meta",
+      tags: ['publisher', 'subscriber', 'channel-events'],
+      uri: "/details#channel-events",
       info: "Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'."
   
   nchan_stub_status [:loc],
@@ -349,15 +416,17 @@ CfCmd.new do
       args: 0,
       
       group: "meta",
-      info: "Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc."
+      info: "Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc.",
+      uri: "/details#nchan_stub_status"
   
   nchan_channel_event_string [:srv, :loc, :if], 
       :ngx_http_set_complex_value_slot,
       [:loc_conf, :channel_event_string],
       
       group: "meta",
+      tags: ['publisher', 'subscriber', 'channel-events'],
       value: "<string>",
-      default: "$nchan_channel_event $nchan_channel_id",
+      default: "\"$nchan_channel_event $nchan_channel_id\"",
       info: "Contents of channel event message"
   
   nchan_max_channel_id_length [:main, :srv, :loc],
@@ -366,6 +435,7 @@ CfCmd.new do
       legacy: "push_max_channel_id_length",
       
       group: "security",
+      tags: ['publisher', 'subscriber', 'channel-id' ],
       value: "<number>",
       default: 512,
       info: "Maximum permissible channel id length (number of characters). Longer ids will be truncated."
@@ -376,9 +446,10 @@ CfCmd.new do
       legacy: "push_max_channel_subscribers",
       
       group: "security",
+      tags: ['subscriber'],
       value: "<number>",
       default: "0 (unlimited)",
-      info: "Maximum concurrent subscribers."
+      info: "Maximum concurrent subscribers to the channel on this Nchan server. Does not include subscribers on other Nchan instances when using a shared Redis server."
   
   nchan_channel_timeout [:main, :srv, :loc],
       :ngx_conf_set_sec_slot,
diff --git a/debian/modules/nchan/src/nchan_config_commands.c b/debian/modules/nchan/src/nchan_config_commands.c
index 2b0d492..3051f09 100644
--- a/debian/modules/nchan/src/nchan_config_commands.c
+++ b/debian/modules/nchan/src/nchan_config_commands.c
@@ -162,6 +162,20 @@ static ngx_command_t  nchan_commands[] = {
     offsetof(nchan_loc_conf_t, authorize_request_url),
     NULL } ,
 
+  { ngx_string("nchan_subscribe_request"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscribe_request_url),
+    NULL } ,
+
+  { ngx_string("nchan_unsubscribe_request"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_unsubscribe_request_url,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, unsubscribe_request_url),
+    NULL } ,
+
   { ngx_string("nchan_store_messages"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
     nchan_store_messages_directive,
@@ -253,38 +267,38 @@ static ngx_command_t  nchan_commands[] = {
 
   { ngx_string("nchan_message_timeout"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
+    nchan_set_message_timeout,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, buffer_timeout),
+    offsetof(nchan_loc_conf_t, message_timeout),
     NULL } ,
   { ngx_string("push_message_timeout"), //legacy for nchan_message_timeout
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
+    nchan_set_message_timeout,
     NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, buffer_timeout),
+    offsetof(nchan_loc_conf_t, message_timeout),
     NULL } ,
 
   { ngx_string("nchan_message_buffer_length"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    nchan_set_message_buffer_length,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, max_messages),
     NULL } ,
   { ngx_string("push_max_message_buffer_length"), //legacy for nchan_message_buffer_length
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    nchan_set_message_buffer_length,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, max_messages),
     NULL } ,
   { ngx_string("push_message_buffer_length"), //legacy for nchan_message_buffer_length
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    nchan_set_message_buffer_length,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, max_messages),
     NULL } ,
   { ngx_string("nchan_message_max_buffer_length"), //alt for nchan_message_buffer_length
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
+    nchan_set_message_buffer_length,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, max_messages),
     NULL } ,
diff --git a/debian/modules/nchan/src/nchan_defs.h b/debian/modules/nchan/src/nchan_defs.h
index c67949c..8e1af05 100644
--- a/debian/modules/nchan/src/nchan_defs.h
+++ b/debian/modules/nchan/src/nchan_defs.h
@@ -2,7 +2,7 @@
 #define NCHAN_DEFS_H
 
 #define NCHAN_DEFAULT_SHM_SIZE 33554432 //32 megs
-#define NCHAN_DEFAULT_BUFFER_TIMEOUT 3600
+#define NCHAN_DEFAULT_MESSAGE_TIMEOUT 3600
 #define NCHAN_DEFAULT_REDIS_IDLE_CHANNEL_CACHE_TIMEOUT 30
 #define NCHAN_DEFAULT_SUBSCRIBER_TIMEOUT 0  //default: never timeout
 //(liucougar: this is a bit confusing, but it is what's the default behavior before this option is introducecd)
diff --git a/debian/modules/nchan/src/nchan_module.c b/debian/modules/nchan/src/nchan_module.c
index 8a93fdb..ff97852 100755
--- a/debian/modules/nchan/src/nchan_module.c
+++ b/debian/modules/nchan/src/nchan_module.c
@@ -32,8 +32,16 @@ int                 nchan_stub_status_enabled = 0;
 
 //#define DEBUG_LEVEL NGX_LOG_WARN
 //#define DEBUG_LEVEL NGX_LOG_DEBUG
+
 //#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "NCHAN:" fmt, ##args)
 
+typedef struct {
+  ngx_http_request_t    *r;
+  ngx_http_cleanup_t    *cln;
+} safe_request_ptr_t;
+static safe_request_ptr_t *nchan_set_safe_request_ptr(ngx_http_request_t *r);
+static ngx_http_request_t *nchan_get_safe_request_ptr(safe_request_ptr_t *pd);
+
 ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *r, channel_event_type_t event_type) {
   static nchan_loc_conf_t            evcf_data;
   static nchan_loc_conf_t           *evcf = NULL;
@@ -125,8 +133,10 @@ ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *r, channel_
     evcf = &evcf_data;
     ngx_memzero(evcf, sizeof(*evcf));
 
-    evcf->buffer_timeout = NCHAN_META_CHANNEL_MESSAGE_TTL;
+    evcf->message_timeout = NCHAN_META_CHANNEL_MESSAGE_TTL;
     evcf->max_messages = NCHAN_META_CHANNEL_MAX_MESSAGES;
+    evcf->complex_max_messages = NULL;
+    evcf->complex_message_timeout = NULL;
     evcf->subscriber_first_message = 0;
     evcf->channel_timeout = NCHAN_META_CHANNEL_TIMEOUT;
   }
@@ -161,6 +171,36 @@ static void memstore_pub_debug_end() {
 }
 #endif
 
+time_t nchan_loc_conf_message_timeout(nchan_loc_conf_t *cf) {
+  time_t                        timeout;
+  nchan_loc_conf_shared_data_t *shcf;
+  
+  if(!cf->complex_message_timeout) {
+    timeout = cf->message_timeout;
+  }
+  else {
+    shcf = memstore_get_conf_shared_data(cf);
+    timeout = shcf->message_timeout;
+  }
+  
+  return timeout != 0 ? timeout : 525600 * 60;
+}
+
+ngx_int_t nchan_loc_conf_max_messages(nchan_loc_conf_t *cf) {  
+  ngx_int_t                     num;
+  nchan_loc_conf_shared_data_t *shcf;
+  
+  if(!cf->complex_max_messages) {
+    num = cf->max_messages;
+  }
+  else {
+    shcf = memstore_get_conf_shared_data(cf);
+    num = shcf->max_messages;
+  }
+  
+  return num;
+}
+
 static void nchan_publisher_body_handler(ngx_http_request_t *r);
 
 static ngx_int_t nchan_http_publisher_handler(ngx_http_request_t * r) {
@@ -239,6 +279,63 @@ ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r) {
   return ngx_http_output_filter(r, &out);
 }
 
+int nchan_parse_message_buffer_config(ngx_http_request_t *r, nchan_loc_conf_t *cf, char **err) {
+  ngx_str_t                      val;
+  nchan_loc_conf_shared_data_t  *shcf;
+  
+  if(!cf->complex_message_timeout && !cf->complex_max_messages) {
+    return 1;
+  }
+  
+  if(cf->complex_message_timeout) {
+    time_t    timeout;
+    if(ngx_http_complex_value(r, cf->complex_message_timeout, &val) != NGX_OK) {
+      nchan_log_request_error(r, "cannot evaluate nchan_message_timeout value");
+      *err = NULL;
+      return 0;
+    }
+    if(val.len == 0) {
+      *err = "missing nchan_message_timeout value";
+      nchan_log_request_error(r, "%s", *err);
+      return 0;
+    }
+    
+    if((timeout = ngx_parse_time(&val, 1)) == (time_t )NGX_ERROR) {
+      *err = "invalid nchan_message_timeout value";
+      nchan_log_request_error(r, "%s '%V'", *err, &val);
+      return 0;
+    }
+    
+    shcf = memstore_get_conf_shared_data(cf);
+    shcf->message_timeout = timeout;
+  }
+  if(cf->complex_max_messages) {
+    ngx_int_t                      num;
+    if(ngx_http_complex_value(r, cf->complex_max_messages, &val) != NGX_OK) {
+      nchan_log_request_error(r, "cannot evaluate nchan_message_buffer_length value");
+      *err = NULL;
+      return 0;
+    }
+    
+    if(val.len == 0) {
+      *err = "missing nchan_message_buffer_length value";
+      nchan_log_request_error(r, "%s", *err);
+      return 0;
+    }
+    
+    num = ngx_atoi(val.data, val.len);
+    if(num == NGX_ERROR || num < 0) {
+      *err = "invalid nchan_message_buffer_length value";
+      nchan_log_request_error(r, "%s %V", *err, &val);
+      return 0;
+    }
+    
+    shcf = memstore_get_conf_shared_data(cf);
+    shcf->max_messages = num;
+  }
+  return 1;
+}
+
 ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
   nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
   ngx_str_t              *channel_id;
@@ -287,6 +384,20 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
     return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
   }
 
+  if(cf->pub.websocket || cf->pub.http) {
+    char *err;
+    if(!nchan_parse_message_buffer_config(r, cf, &err)) {
+      if(err) {
+        nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, err, 0);
+        return NGX_OK;
+      }
+      else {
+        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 0);
+        return NGX_OK;
+      }
+    }
+  }
+  
   if(nchan_detect_websocket_request(r)) {
     //want websocket?
     if(cf->sub.websocket) {
@@ -308,7 +419,6 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
     }
     else if(cf->pub.websocket) {
       //no need to subscribe, but keep a connection open for publishing
-      //not yet implemented
       nchan_create_websocket_publisher(r);
     }
     else goto forbidden;
@@ -390,32 +500,78 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
         break;
     }
   }
-  
+  ctx->request_ran_content_handler = 1;
   return rc;
   
 forbidden:
   nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, 0);
+  ctx->request_ran_content_handler = 1;
   return NGX_OK;
 
 bad_msgid:
   nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Message ID invalid", 0);
+  ctx->request_ran_content_handler = 1;
   return NGX_OK;
   
 }
 
-static ngx_int_t channel_info_callback(ngx_int_t status, void *rptr, ngx_http_request_t *r) {
-  ngx_http_finalize_request(r, nchan_response_channel_ptr_info( (nchan_channel_t *)rptr, r, 0));
+static ngx_int_t channel_info_callback(ngx_int_t status, void *rptr, void *pd) {
+  ngx_http_request_t *r = nchan_get_safe_request_ptr(pd);
+  if(r == NULL) {
+    return NGX_ERROR;
+  }
+  nchan_http_finalize_request(r, nchan_response_channel_ptr_info( (nchan_channel_t *)rptr, r, 0));
   return NGX_OK;
 }
 
-static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, ngx_http_cleanup_t *cln) {
+static void clear_request_pointer(safe_request_ptr_t *pdata) {
+  if(pdata) {
+    pdata->r = NULL;
+  }
+}
+
+static safe_request_ptr_t *nchan_set_safe_request_ptr(ngx_http_request_t *r) {
+  safe_request_ptr_t           *data = ngx_alloc(sizeof(*data), ngx_cycle->log);
+  ngx_http_cleanup_t           *cln = ngx_http_cleanup_add(r, 0);
+  
+  if(!data || !cln) {
+    nchan_log_request_error(r, "couldn't allocate request cleanup stuff.");
+    if(cln) {
+      cln->data = NULL;
+      cln->handler = (ngx_http_cleanup_pt )clear_request_pointer;
+    }
+    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    return NULL;
+  }
+  
+  data->cln = cln;
+  data->r = r;
+  
+  cln->data = data;
+  cln->handler = (ngx_http_cleanup_pt )clear_request_pointer;
+  
+  return data;
+}
+
+static ngx_http_request_t *nchan_get_safe_request_ptr(safe_request_ptr_t *d) {
+  ngx_http_request_t    *r = d->r;
+  ngx_http_cleanup_t    *cln = d->cln;
+  
+  ngx_free(d);
+  
+  if(r) {
+    cln->data = NULL;
+  }
+  
+  return r;
+}
+
+
+static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, safe_request_ptr_t *pd) {
   nchan_request_ctx_t   *ctx;
   static nchan_msg_id_t  empty_msgid = NCHAN_ZERO_MSGID;
-  ngx_http_request_t    **rptr = cln->data;
-  ngx_http_request_t    *r = *rptr;
   
-  cln->data = NULL;
-  ngx_free(rptr);
+  ngx_http_request_t    *r = nchan_get_safe_request_ptr(pd);
   
   if(r == NULL) { // the request has since disappered
     return NGX_ERROR;
@@ -430,7 +586,7 @@ static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, ngx_htt
       ctx->msg_id = ch != NULL ? ch->last_published_msg_id : empty_msgid;
       
       nchan_maybe_send_channel_event_message(r, CHAN_PUBLISH);
-      ngx_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_ACCEPTED));
+      nchan_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_ACCEPTED));
       return NGX_OK;
       
     case NCHAN_MESSAGE_RECEIVED:
@@ -439,7 +595,7 @@ static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, ngx_htt
       ctx->msg_id = ch != NULL ? ch->last_published_msg_id : empty_msgid;
       
       nchan_maybe_send_channel_event_message(r, CHAN_PUBLISH);
-      ngx_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_CREATED));
+      nchan_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_CREATED));
       return NGX_OK;
       
     case NGX_ERROR:
@@ -448,7 +604,7 @@ static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, ngx_htt
       nchan_log_request_error(r, "error publishing message");
       ctx->prev_msg_id = empty_msgid;;
       ctx->msg_id = empty_msgid;
-      ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+      nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
       return NGX_ERROR;
       
     default:
@@ -456,32 +612,25 @@ static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, ngx_htt
       ctx->prev_msg_id = empty_msgid;;
       ctx->msg_id = empty_msgid;
       nchan_log_request_error(r, "TOTALLY UNEXPECTED error publishing message, status code %i", status);
-      ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+      nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
       return NGX_ERROR;
   }
 }
 
-static void clear_request_pointer(ngx_http_request_t **rptr) {
-  if(rptr) {
-    *rptr = NULL;
-  }
-}
-
 static void nchan_publisher_post_request(ngx_http_request_t *r, ngx_str_t *content_type, size_t content_length, ngx_chain_t *request_body_chain, ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
   ngx_buf_t                      *buf;
   struct timeval                  tv;
   nchan_msg_t                    *msg;
   ngx_str_t                      *eventsource_event;
   
-  ngx_http_request_t            **rptr;
-  ngx_http_cleanup_t             *cln;
+  safe_request_ptr_t             *pd;
 
 #if FAKESHARD
   memstore_pub_debug_start();
 #endif
   if((msg = ngx_pcalloc(r->pool, sizeof(*msg))) == NULL) {
     nchan_log_request_error(r, "can't allocate msg in request pool");
-    ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
     return; 
   }
   msg->shared = 0;
@@ -507,7 +656,7 @@ static void nchan_publisher_post_request(ngx_http_request_t *r, ngx_str_t *conte
   }
   else {
     nchan_log_request_error(r, "unexpected publisher message request body buffer location. please report this to the nchan developers.");
-    ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
     return;
   }
   
@@ -526,18 +675,12 @@ static void nchan_publisher_post_request(ngx_http_request_t *r, ngx_str_t *conte
   msg->start_tv = ctx->start_tv;
 #endif
   
-  cln = ngx_http_cleanup_add(r, 0);
-  rptr = ngx_alloc(sizeof(rptr), ngx_cycle->log);
-  if(!cln || !rptr) {
-    nchan_log_request_error(r, "couldn't allocate publisher request cleanup stuff.");
-    ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+  
+  if((pd = nchan_set_safe_request_ptr(r)) == NULL) {
     return;
   }
-  *rptr = r;
-  cln->data = rptr;
-  cln->handler = (ngx_http_cleanup_pt )clear_request_pointer;
   
-  cf->storage_engine->publish(channel_id, msg, cf, (callback_pt) &publish_callback, cln);
+  cf->storage_engine->publish(channel_id, msg, cf, (callback_pt) &publish_callback, pd);
   nchan_update_stub_status(total_published_messages, 1);
 #if FAKESHARD
   memstore_pub_debug_end();
@@ -571,7 +714,7 @@ static ngx_int_t nchan_publisher_upstream_handler(ngx_http_request_t *sr, void *
       case NGX_HTTP_ACCEPTED:
         if(sr->upstream) {
           content_type = (sr->upstream->headers_in.content_type ? &sr->upstream->headers_in.content_type->value : NULL);
-          content_length = sr->upstream->headers_in.content_length_n > 0 ? sr->upstream->headers_in.content_length_n : 0;
+          content_length = nchan_subrequest_content_length(sr);
           request_chain = sr->upstream->out_bufs;
         }
         else {
@@ -590,15 +733,15 @@ static ngx_int_t nchan_publisher_upstream_handler(ngx_http_request_t *sr, void *
         
       case NGX_HTTP_NO_CONTENT:
         //cancel publication
-        ngx_http_finalize_request(r, NGX_HTTP_NO_CONTENT);
+        nchan_http_finalize_request(r, NGX_HTTP_NO_CONTENT);
         break;
       
       default:
-        ngx_http_finalize_request(r, NGX_HTTP_FORBIDDEN);
+        nchan_http_finalize_request(r, NGX_HTTP_FORBIDDEN);
     }
   }
   else {
-    ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
   }
   
   return NGX_OK;
@@ -607,10 +750,14 @@ static ngx_int_t nchan_publisher_upstream_handler(ngx_http_request_t *sr, void *
 static void nchan_publisher_body_handler_continued(ngx_http_request_t *r, ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
   ngx_http_complex_value_t       *publisher_upstream_request_url_ccv;
   static ngx_str_t                POST_REQUEST_STRING = {4, (u_char *)"POST "};
+  safe_request_ptr_t             *pd;
   
   switch(r->method) {
     case NGX_HTTP_GET:
-      cf->storage_engine->find_channel(channel_id, cf, (callback_pt) &channel_info_callback, (void *)r);
+      if((pd = nchan_set_safe_request_ptr(r)) == NULL){
+        return;
+      }
+      cf->storage_engine->find_channel(channel_id, cf, (callback_pt) &channel_info_callback, pd);
       break;
     
     case NGX_HTTP_PUT:
@@ -619,6 +766,8 @@ static void nchan_publisher_body_handler_continued(ngx_http_request_t *r, ngx_st
       if(publisher_upstream_request_url_ccv == NULL) {
         ngx_str_t    *content_type = (r->headers_in.content_type ? &r->headers_in.content_type->value : NULL);
         ngx_int_t     content_length = r->headers_in.content_length_n > 0 ? r->headers_in.content_length_n : 0;
+        // no need to check for chunked transfer-encoding, nginx automatically sets the 
+        // content-length either way.
         
         nchan_publisher_post_request(r, content_type, content_length, r->request_body->bufs, channel_id, cf);
       }
@@ -627,7 +776,7 @@ static void nchan_publisher_body_handler_continued(ngx_http_request_t *r, ngx_st
         
         if((psr_stuff = ngx_palloc(r->pool, sizeof(*psr_stuff))) == NULL) {
           nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest");
-          ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+          nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
           return;
         }
         
@@ -649,7 +798,10 @@ static void nchan_publisher_body_handler_continued(ngx_http_request_t *r, ngx_st
       break;
       
     case NGX_HTTP_DELETE:
-      cf->storage_engine->delete_channel(channel_id, cf, (callback_pt) &channel_info_callback, (void *)r);
+      if((pd = nchan_set_safe_request_ptr(r)) == NULL){
+        return;
+      }
+      cf->storage_engine->delete_channel(channel_id, cf, (callback_pt) &channel_info_callback, pd);
       nchan_maybe_send_channel_event_message(r, CHAN_DELETE);
       break;
       
@@ -680,11 +832,11 @@ static ngx_int_t nchan_publisher_body_authorize_handler(ngx_http_request_t *r, v
       nchan_publisher_body_handler_continued(r->parent, d->ch_id, cf);
     }
     else { //anything else means forbidden
-      ngx_http_finalize_request(r->parent, NGX_HTTP_FORBIDDEN);
+      nchan_http_finalize_request(r->parent, NGX_HTTP_FORBIDDEN);
     }
   }
   else {
-    ngx_http_finalize_request(r->parent, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    nchan_http_finalize_request(r->parent, rc);
   }
   return NGX_OK;
 }
@@ -696,7 +848,7 @@ static void nchan_publisher_body_handler(ngx_http_request_t *r) {
   ngx_http_complex_value_t       *authorize_request_url_ccv = cf->authorize_request_url;
   
   if((channel_id = nchan_get_channel_id(r, PUB, 1))==NULL) {
-    ngx_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
+    nchan_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
     return;
   }
   
@@ -708,7 +860,7 @@ static void nchan_publisher_body_handler(ngx_http_request_t *r) {
     
     if((psr_stuff = ngx_palloc(r->pool, sizeof(*psr_stuff))) == NULL) {
       nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest");
-      ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+      nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
       return;
     }
     
@@ -728,18 +880,22 @@ static void nchan_publisher_body_handler(ngx_http_request_t *r) {
     
     if((sr->request_body = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t))) == NULL) {
       nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest body");
-      ngx_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
+      nchan_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
       return;
     }
     if((content_length_elt = ngx_palloc(r->pool, sizeof(*content_length_elt))) == NULL) {
       nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest content-length header");
-      ngx_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
+      nchan_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
       return;
     }
-    *content_length_elt = *sr->headers_in.content_length;
-    content_length_elt->value.len=1;
-    content_length_elt->value.data=(u_char *)"0";
-    sr->headers_in.content_length = content_length_elt;
+    
+    if(sr->headers_in.content_length) {
+      *content_length_elt = *sr->headers_in.content_length;
+      content_length_elt->value.len=1;
+      content_length_elt->value.data=(u_char *)"0";
+      sr->headers_in.content_length = content_length_elt;
+    }
+    
     sr->headers_in.content_length_n = 0;
     sr->args = r->args;
     sr->header_only = 1;
diff --git a/debian/modules/nchan/src/nchan_module.h b/debian/modules/nchan/src/nchan_module.h
index b45cf5f..8c1aafb 100644
--- a/debian/modules/nchan/src/nchan_module.h
+++ b/debian/modules/nchan/src/nchan_module.h
@@ -45,6 +45,9 @@ ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r);
 ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r);
 ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type);
 
+time_t nchan_loc_conf_message_timeout(nchan_loc_conf_t *cf);
+ngx_int_t nchan_loc_conf_max_messages(nchan_loc_conf_t *cf);
+
 ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *, channel_event_type_t);
 
 #define nchan_update_stub_status(counter_name, count) __memstore_update_stub_status(offsetof(nchan_stub_status_t, counter_name), count)
@@ -68,7 +71,7 @@ int nchan_timeval_subtract(struct timeval *result, struct timeval *x, struct tim
 #define nchan_log_request_warning(request, fmt, args...) ngx_log_error(NGX_LOG_WARN, (request)->connection->log, 0, "nchan: " fmt, ##args)
 #define nchan_log_request_error(request, fmt, args...)    ngx_log_error(NGX_LOG_ERR, (request)->connection->log, 0, "nchan: " fmt, ##args)
 
-#define nchan_log(level, log, fmt, args...) ngx_log_error(level, log, 0, "nchan: " fmt, ##args)
+#define nchan_log(level, log, errno, fmt, args...) ngx_log_error(level, log, errno, "nchan: " fmt, ##args)
 
 
 #endif /*NCHAN_MODULE_H*/
diff --git a/debian/modules/nchan/src/nchan_setup.c b/debian/modules/nchan/src/nchan_setup.c
index b7485ca..e083e31 100644
--- a/debian/modules/nchan/src/nchan_setup.c
+++ b/debian/modules/nchan/src/nchan_setup.c
@@ -82,12 +82,19 @@ static void *nchan_create_loc_conf(ngx_conf_t *cf) {
   lcf->sub.websocket=0;
   lcf->sub.http_chunked=0;
   
+  lcf->shared_data_index=NGX_CONF_UNSET;
+  
   lcf->authorize_request_url = NULL;
   lcf->publisher_upstream_request_url = NULL;
+  lcf->unsubscribe_request_url = NULL;
+  lcf->subscribe_request_url = NULL;
   
-  lcf->buffer_timeout=NGX_CONF_UNSET;
+  lcf->message_timeout=NGX_CONF_UNSET;
   lcf->max_messages=NGX_CONF_UNSET;
   
+  lcf->complex_message_timeout = NULL;
+  lcf->complex_max_messages = NULL;
+  
   lcf->subscriber_first_message=NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET;
   
   lcf->subscriber_timeout=NGX_CONF_UNSET;
@@ -182,9 +189,11 @@ static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
   ngx_conf_merge_bitmask_value(conf->sub.http_chunked, prev->sub.http_chunked, 0);
   ngx_conf_merge_bitmask_value(conf->sub.websocket, prev->sub.websocket, 0);
   
-  ngx_conf_merge_sec_value(conf->buffer_timeout, prev->buffer_timeout, NCHAN_DEFAULT_BUFFER_TIMEOUT);
+  ngx_conf_merge_sec_value(conf->message_timeout, prev->message_timeout, NCHAN_DEFAULT_MESSAGE_TIMEOUT);
   ngx_conf_merge_value(conf->max_messages, prev->max_messages, NCHAN_DEFAULT_MAX_MESSAGES);
   
+  MERGE_CONF(conf, prev, complex_message_timeout);
+  MERGE_CONF(conf, prev, complex_max_messages);
   
   if (conf->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) {
     conf->subscriber_first_message = (prev->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) ? NCHAN_SUBSCRIBER_DEFAULT_FIRST_MESSAGE : prev->subscriber_first_message;
@@ -225,6 +234,8 @@ static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
 
   MERGE_CONF(conf, prev, authorize_request_url);
   MERGE_CONF(conf, prev, publisher_upstream_request_url);
+  MERGE_CONF(conf, prev, unsubscribe_request_url);
+  MERGE_CONF(conf, prev, subscribe_request_url);
   
   if(conf->pub_chid.n == 0) {
     conf->pub_chid = prev->pub_chid;
@@ -572,6 +583,57 @@ static char *nchan_store_messages_directive(ngx_conf_t *cf, ngx_command_t *cmd,
   return NGX_CONF_OK;
 }
 
+static char *nchan_set_message_buffer_length(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t    *lcf = conf;
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *arg = &val[1];
+  
+  if(memchr(arg->data, '$', arg->len)) {
+    //complex
+    lcf->max_messages = NGX_CONF_UNSET;
+    cmd->offset = offsetof(nchan_loc_conf_t, complex_max_messages);
+    ngx_http_set_complex_value_slot(cf, cmd, conf);
+    memstore_reserve_conf_shared_data(lcf);
+  }
+  else {
+    //simple
+    lcf->complex_max_messages = NULL;
+    cmd->offset = offsetof(nchan_loc_conf_t, max_messages);
+    ngx_conf_set_num_slot(cf, cmd, conf);
+  }
+  return NGX_CONF_OK;
+}
+
+static char *ngx_http_set_unsubscribe_request_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if nginx_version >= 1003015
+  return ngx_http_set_complex_value_slot(cf, cmd, conf);
+#else
+  ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "%V not available on nginx version: %s, must be at least 1.3.15", &cmd->name, NGINX_VERSION);
+  return NGX_CONF_ERROR;
+#endif
+}
+
+static char *nchan_set_message_timeout(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t    *lcf = conf;
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *arg = &val[1];
+  
+  if(memchr(arg->data, '$', arg->len)) {
+    //complex
+    lcf->message_timeout = NGX_CONF_UNSET;
+    cmd->offset = offsetof(nchan_loc_conf_t, complex_message_timeout);
+    ngx_http_set_complex_value_slot(cf, cmd, conf);
+    memstore_reserve_conf_shared_data(lcf);
+  }
+  else {
+    //simple
+    lcf->complex_message_timeout = NULL;
+    cmd->offset = offsetof(nchan_loc_conf_t, message_timeout);
+    ngx_conf_set_sec_slot(cf, cmd, conf);
+  }
+  return NGX_CONF_OK;
+}
+
 static char *nchan_ignore_obsolete_setting(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
   ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "ignoring obsolete nchan config directive '%V'.", &cmd->name);
   return NGX_CONF_OK;
@@ -669,13 +731,19 @@ static char *ngx_conf_upstream_redis_server(ngx_conf_t *cf, ngx_command_t *cmd,
   
   uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);  
   
-  
+  if(uscf->servers == NULL) {
+        uscf->servers = ngx_array_create(cf->pool, 4, sizeof(ngx_http_upstream_server_t));
+  }
   if ((usrv = ngx_array_push(uscf->servers)) == NULL) {
     return NGX_CONF_ERROR;
   }
   value = cf->args->elts;
   ngx_memzero(usrv, sizeof(*usrv));
+#if nginx_version >= 1007002
   usrv->name = value[1];
+#endif
+  usrv->addrs = ngx_pcalloc(cf->pool, sizeof(ngx_addr_t));
+  usrv->addrs->name = value[1];
   
   uscf->peer.init_upstream = nchan_upstream_dummy_roundrobin_init;
   return NGX_CONF_OK;
diff --git a/debian/modules/nchan/src/nchan_types.h b/debian/modules/nchan/src/nchan_types.h
index 1860346..58b8ee1 100644
--- a/debian/modules/nchan/src/nchan_types.h
+++ b/debian/modules/nchan/src/nchan_types.h
@@ -202,14 +202,27 @@ typedef struct {
   ngx_int_t                       n;
 } nchan_complex_value_arr_t;
 
+typedef struct {
+ ngx_atomic_uint_t               message_timeout;
+ ngx_atomic_uint_t               max_messages;
+} nchan_loc_conf_shared_data_t;
+
 struct nchan_loc_conf_s { //nchan_loc_conf_t
   
-  time_t                          buffer_timeout;
+  ngx_int_t                       shared_data_index;
+  
+  time_t                          message_timeout;
   ngx_int_t                       max_messages;
   
+  ngx_http_complex_value_t       *complex_message_timeout;
+  ngx_http_complex_value_t       *complex_max_messages;
+  
   ngx_http_complex_value_t       *authorize_request_url;
   ngx_http_complex_value_t       *publisher_upstream_request_url;
   
+  ngx_http_complex_value_t       *unsubscribe_request_url;
+  ngx_http_complex_value_t       *subscribe_request_url;
+  
   nchan_complex_value_arr_t       pub_chid;
   nchan_complex_value_arr_t       sub_chid;
   nchan_complex_value_arr_t       pubsub_chid;
@@ -322,6 +335,10 @@ typedef struct {
   ngx_str_t                      channel_id[NCHAN_MULTITAG_REQUEST_CTX_MAX];
   int                            channel_id_count;
   ngx_str_t                      request_origin_header;
+  
+  ngx_int_t                      unsubscribe_request_callback_finalize_code;
+  unsigned                       sent_unsubscribe_request:1;
+  unsigned                       request_ran_content_handler:1;
 #if NCHAN_BENCHMARK
   struct timeval                 start_tv;
 #endif
diff --git a/debian/modules/nchan/src/store/memory/memstore.c b/debian/modules/nchan/src/store/memory/memstore.c
index 03ff478..a8b309b 100755
--- a/debian/modules/nchan/src/store/memory/memstore.c
+++ b/debian/modules/nchan/src/store/memory/memstore.c
@@ -230,7 +230,7 @@ static ngx_int_t nchan_memstore_chanhead_ready_to_reap_slowly(memstore_channel_h
       DBG("get rid of idle redis cache channel %p %V (msgs: %i)", ch, &ch->id, ch->channel.messages);
       return NGX_OK;
     }
-    else if(ch->channel.messages > 0 || (ch->churn_start_time )) {
+    else if(ch->channel.messages > 0) {
       assert(ch->msg_first != NULL);
       DBG("not ready to reap %p %V, %i messages left", ch, &ch->id, ch->channel.messages);
       return NGX_DECLINED;
@@ -337,6 +337,21 @@ ipc_t *nchan_memstore_get_ipc(void){
   return ipc;
 }
 
+static ngx_int_t                  shared_loc_conf_count = 0;
+ngx_int_t memstore_reserve_conf_shared_data(nchan_loc_conf_t *cf) {
+  if(cf->shared_data_index == NGX_CONF_UNSET) {
+    cf->shared_data_index = shared_loc_conf_count++;
+  }
+  //DBG("shared_loc_conf_count is %i", shared_loc_conf_count);
+  return NGX_OK;
+}
+
+nchan_loc_conf_shared_data_t *memstore_get_conf_shared_data(nchan_loc_conf_t *cf) {
+  assert(cf->shared_data_index != NGX_CONF_UNSET);
+  return &shdata->conf_data[cf->shared_data_index];
+}
+
+
 #define CHANNEL_HASH_FIND(id_buf, p)    HASH_FIND( hh, mpt->hash, (id_buf)->data, (id_buf)->len, p)
 #define CHANNEL_HASH_ADD(chanhead)      HASH_ADD_KEYPTR( hh, mpt->hash, (chanhead->id).data, (chanhead->id).len, chanhead)
 #define CHANNEL_HASH_DEL(chanhead)      HASH_DEL( mpt->hash, chanhead)
@@ -521,6 +536,12 @@ static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
     shmtx_lock(shm);
     d->generation ++;
     d->current_active_workers = 0;
+    
+    if(d->conf_data) {
+      shm_locked_free(shm, d->conf_data);
+      d->conf_data = NULL;
+    }
+    
     ngx_memzero(&d->stats, sizeof(d->stats));
     shm_set_allocd_pages_tracker(shm, &d->shmem_pages_used);
     shmtx_unlock(shm);
@@ -541,6 +562,9 @@ static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
     shdata->total_active_workers = 0;
     shdata->current_active_workers = 0;
     shdata->reloading = 0;
+    
+    
+    
     for(i=0; i< NGX_MAX_PROCESSES; i++) {
       shdata->procslot[i]=NCHAN_INVALID_SLOT;
     }
@@ -554,6 +578,13 @@ static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
     shdata->msgdebug_head = NULL;
 #endif
   }
+  
+  if(shared_loc_conf_count > 0) {
+    d->conf_data = shm_calloc(shm, sizeof(nchan_loc_conf_shared_data_t) * shared_loc_conf_count, "shared config data");
+    if(d->conf_data == NULL) {
+      return NGX_ERROR;
+    }
+  }
   return NGX_OK;
 }
 
@@ -835,7 +866,7 @@ ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8
   }
   assert(!head->stub && head->cf);
   owner = head->owner;
-  DBG("ensure chanhead ready: chanhead %p, status %i, foreign_ipc_sub:%p", head, head->status, head->foreign_owner_ipc_sub);
+  DBG("ensure chanhead ready: chanhead %p, status %i, foreign_ipc_sub:%p", head, (ngx_int_t )head->status, head->foreign_owner_ipc_sub);
   if(head->in_gc_queue) {//recycled chanhead
     chanhead_gc_withdraw(head, "readying INACTIVE");
   }
@@ -1309,46 +1340,47 @@ static ngx_int_t delete_multi_callback_handler(ngx_int_t code, nchan_channel_t*
   return NGX_OK;
 }
 
-static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+static ngx_int_t nchan_memstore_force_delete_chanhead(memstore_channel_head_t *ch, callback_pt callback, void *privdata);
+
+static ngx_int_t nchan_store_delete_single_channel_id(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
   ngx_int_t                owner;
-  if(!is_multi_id(channel_id)) {
-    if(cf->redis.enabled) {
-      return nchan_store_redis.delete_channel(channel_id, cf, callback, privdata);
-    }
-    else if(memstore_slot() != (owner = memstore_channel_owner(channel_id))) {
-      memstore_ipc_send_delete(owner, channel_id, callback, privdata);
-    }
-    else {
-      nchan_memstore_force_delete_channel(channel_id, callback, privdata);
-    }
+
+  assert(!is_multi_id(channel_id));
+  owner = memstore_channel_owner(channel_id);
+  
+  if(cf->redis.enabled) {
+    return nchan_store_redis.delete_channel(channel_id, cf, callback, privdata);
+  }
+  else if(owner == memstore_slot()) {
+    return nchan_memstore_force_delete_channel(channel_id, callback, privdata);
   }
   else {
-    //delete a multichannel
-    ngx_int_t              i, max, slot;
+    return memstore_ipc_send_delete(owner, channel_id, callback, privdata);
+  }
+}
+
+static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  if(!is_multi_id(channel_id)) {
+    return nchan_store_delete_single_channel_id(channel_id, cf, callback, privdata);
+  }
+  else {
+    //send the delete to all the individually multiplexed channels
+    ngx_int_t             i, n = 0;
+    ngx_str_t             ids[NCHAN_MULTITAG_MAX];
+    
+    n = parse_multi_id(channel_id, ids);
+    
+
+    
     delete_multi_data_t   *d = ngx_calloc(sizeof(*d), ngx_cycle->log);
     assert(d);
     //everyone might have this multi. broadcast the delete everywhere
-#if FAKESHARD
-    max = MAX_FAKE_WORKERS;
-#else
-    max = shdata->max_workers;
-#endif
-    d->n = max;
+    d->n = n;
     d->cb = callback;
     d->pd = privdata;
-    
-    for(i=0; i < max; i++) {
-#if FAKESHARD
-      slot = i;
-#else
-      slot = shdata->procslot[i + memstore_procslot_offset];
-#endif
-      if(slot == memstore_slot()) {
-        nchan_memstore_force_delete_channel(channel_id, (callback_pt )delete_multi_callback_handler, d);
-      }
-      else {
-        memstore_ipc_send_delete(slot, channel_id, (callback_pt )delete_multi_callback_handler, d);
-      }
+
+    for(i=0; i<n; i++) {
+      nchan_store_delete_single_channel_id(&ids[i], cf, (callback_pt )delete_multi_callback_handler, d);
     }
     
   }
@@ -1357,29 +1389,41 @@ static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_con
 
 static ngx_int_t chanhead_delete_message(memstore_channel_head_t *ch, store_message_t *msg);
 
-ngx_int_t nchan_memstore_force_delete_channel(ngx_str_t *channel_id, callback_pt callback, void *privdata) {
-  memstore_channel_head_t       *ch;
+static ngx_int_t nchan_memstore_force_delete_chanhead(memstore_channel_head_t *ch, callback_pt callback, void *privdata) {
+  
   nchan_channel_t                chaninfo_copy;
   store_message_t               *msg = NULL;
   
+  assert(ch->owner == memstore_slot());
+  if(callback == NULL) {
+    callback = empty_callback;
+  }
+  chaninfo_copy.messages = ch->shared->stored_message_count;
+  chaninfo_copy.subscribers = ch->shared->sub_count;
+  chaninfo_copy.last_seen = ch->shared->last_seen;
+  chaninfo_copy.last_published_msg_id = ch->latest_msgid;
+  
+  nchan_memstore_publish_generic(ch, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+  callback(NGX_OK, &chaninfo_copy, privdata);
+  //delete all messages
+  while((msg = ch->msg_first) != NULL) {
+    chanhead_delete_message(ch, msg);
+  }
+  chanhead_gc_add(ch, "forced delete");
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_memstore_force_delete_channel(ngx_str_t *channel_id, callback_pt callback, void *privdata) {
+  memstore_channel_head_t       *ch;
+
   assert(memstore_channel_owner(channel_id) == memstore_slot());
   
   if(callback == NULL) {
     callback = empty_callback;
   }
   if((ch = nchan_memstore_find_chanhead(channel_id))) {
-    chaninfo_copy.messages = ch->shared->stored_message_count;
-    chaninfo_copy.subscribers = ch->shared->sub_count;
-    chaninfo_copy.last_seen = ch->shared->last_seen;
-    chaninfo_copy.last_published_msg_id = ch->latest_msgid;
-    
-    nchan_memstore_publish_generic(ch, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
-    callback(NGX_OK, &chaninfo_copy, privdata);
-    //delete all messages
-    while((msg = ch->msg_first) != NULL) {
-      chanhead_delete_message(ch, msg);
-    }
-    chanhead_gc_add(ch, "forced delete");
+    nchan_memstore_force_delete_chanhead(ch, callback, privdata);
   }
   else {
     callback(NGX_OK, NULL, privdata);
@@ -1488,8 +1532,10 @@ static ngx_int_t nchan_store_init_module(ngx_cycle_t *cycle) {
 
   //initialize default shared multi-channel config
   ngx_memzero(&default_multiconf, sizeof(default_multiconf));
-  default_multiconf.buffer_timeout = 0;
+  default_multiconf.complex_message_timeout = NULL;
+  default_multiconf.message_timeout = 0;
   default_multiconf.max_messages = -1;
+  default_multiconf.complex_max_messages = NULL;
   default_multiconf.max_channel_id_length = NCHAN_MAX_CHANNEL_ID_LENGTH;
   default_multiconf.max_channel_subscribers = -1;
   
@@ -1594,14 +1640,18 @@ static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
 }
 
 static void nchan_store_exit_master(ngx_cycle_t *cycle) {
+  ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  
   DBG("exit master from pid %i", ngx_pid);
   
   ipc_close(ipc, cycle);
 #if FAKESHARD
   while(memstore_fakeprocess_pop()) {  };
  #endif
-  shm_free(shm, shdata);
-  shm_destroy(shm);
+  if (ccf->master != 0) {
+    shm_free(shm, shdata);
+    shm_destroy(shm);
+  }
 }
 
 static ngx_int_t validate_chanhead_messages(memstore_channel_head_t *ch) {
@@ -1929,12 +1979,17 @@ static ngx_int_t redis_subscribe_channel_authcheck_callback(ngx_int_t status, vo
     if(channel == NULL) {
       channel_status = cf->subscribe_only_existing_channel ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
     }
-    else if(cf->max_channel_subscribers == 0) {
-      channel_status = SUB_CHANNEL_AUTHORIZED;
-    }
-    else {
+    /*
+    else if (cf->max_channel_subscribers > 0) {
+      // don't check this anymore -- a total subscribers count check is less
+      // useful as a per-instance check, which is handled in nchan_store_subscribe_continued
+      // shared total subscriber count check can be re-enabled with another config setting
       channel_status = channel->subscribers >= cf->max_channel_subscribers ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
     }
+    */
+    else {
+      channel_status = SUB_CHANNEL_AUTHORIZED;
+    }
     nchan_store_subscribe_continued(channel_status, NULL, data);
   }
   else {
@@ -1964,7 +2019,9 @@ static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void*
     
     case SUB_CHANNEL_NOTSURE:
       if(use_redis) {
-        if(cf->subscribe_only_existing_channel && cf->max_channel_subscribers == 0) {
+        if(cf->subscribe_only_existing_channel) {
+          //we used to also check if cf->max_channel_subscribers == 0 here, but that's
+          //no longer necessary, as the shared subscriber total check is now disabled
           if((chanhead = nchan_memstore_find_chanhead(d->channel_id)) != NULL) {
             break;
           }
@@ -2402,7 +2459,7 @@ static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_messag
   if(ch->msg_last && ch->msg_last->msg->id.time == msg->msg->id.time) {
     msg->msg->id.tag.fixed[0] = ch->msg_last->msg->id.tag.fixed[0] + 1;
   }
-  else {
+  else if(!ch->cf->redis.enabled) {
     msg->msg->id.tag.fixed[0] = 0;
   }
 
@@ -2494,7 +2551,7 @@ static nchan_msg_t *create_shm_msg(nchan_msg_t *m) {
     
     cur = copy_preallocated_str_to_cur(&buf->file->name, &mbuf->file->name, cur);
     //ensure last char is NUL
-    *(++cur) = '\0';
+    *(cur++) = '\0';
   }
   
   if(buf_body_size > 0) {
@@ -2652,10 +2709,6 @@ static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t
   return nchan_store_publish_message_generic(channel_id, msg, 0, cf, callback, privdata);
 }
 
-static ngx_inline time_t message_timeout(nchan_loc_conf_t *cf) {
-  return cf->buffer_timeout != 0 ? cf->buffer_timeout : 525600 * 60;
-}
-
 static void fill_message_timedata(nchan_msg_t *msg, time_t timeout) {
   //this coould be dangerous!!
   if(msg->id.time == 0) {
@@ -2666,8 +2719,29 @@ static void fill_message_timedata(nchan_msg_t *msg, time_t timeout) {
   }
 }
 
+static ngx_int_t nchan_store_publish_message_to_single_channel_id(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  if(cf->redis.enabled) {
+    assert(!msg_in_shm);
+    nchan_update_stub_status(messages, 1);
+    fill_message_timedata(msg, nchan_loc_conf_message_timeout(cf));
+    if(callback == NULL) {
+      callback = empty_callback;
+    }
+    return nchan_store_redis.publish(channel_id, msg, cf, callback, privdata);
+  }
+  else {
+    memstore_channel_head_t  *chead;
+    if((chead = nchan_memstore_get_chanhead(channel_id, cf)) == NULL) {
+      ERR("can't get chanhead for id %V", channel_id);
+      //we probably just ran out of shared memory
+      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+      return NGX_ERROR;
+    }
+    return nchan_store_chanhead_publish_message_generic(chead, msg, msg_in_shm, cf, callback, privdata);
+  }
+}
+
 ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  memstore_channel_head_t  *chead;
   
   if(is_multi_id(channel_id)) {
     ngx_int_t             i, n = 0;
@@ -2687,33 +2761,12 @@ ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t
     ngx_memzero(&pd->ch, sizeof(pd->ch));
     
     for(i=0; i<n; i++) {
-      if((chead = nchan_memstore_get_chanhead(&ids[i], cf)) == NULL) {
-        ERR("can't get chanhead for id %V", ids[i]);
-        //we probably just ran out of shared memory
-        callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
-        return NGX_ERROR;
-      }
-      nchan_store_chanhead_publish_message_generic(chead, msg, msg_in_shm, cf, publish_multi_callback, pd);
+      nchan_store_publish_message_to_single_channel_id(&ids[i], msg, msg_in_shm, cf, publish_multi_callback, pd);
     }
     return NGX_OK;
   }
   else {
-    if(cf->redis.enabled) {
-      assert(!msg_in_shm);
-      nchan_update_stub_status(messages, 1);
-      fill_message_timedata(msg, message_timeout(cf));
-      if(callback == NULL) {
-        callback = empty_callback;
-      }
-      return nchan_store_redis.publish(channel_id, msg, cf, callback, privdata);
-    }
-    
-    if((chead = nchan_memstore_get_chanhead(channel_id, cf)) == NULL) {
-      ERR("can't get chanhead for id %V", channel_id);
-      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
-      return NGX_ERROR;
-    }
-    return nchan_store_chanhead_publish_message_generic(chead, msg, msg_in_shm, cf, callback, privdata);
+    return nchan_store_publish_message_to_single_channel_id(channel_id, msg, msg_in_shm, cf, callback, privdata);
   }
 }
 
@@ -2725,7 +2778,7 @@ ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *
   nchan_msg_t                 *publish_msg;
   ngx_int_t                    owner = chead->owner;
   ngx_int_t                    rc;
-  time_t                       chan_expire, timeout = message_timeout(cf);
+  time_t                       chan_expire, timeout = nchan_loc_conf_message_timeout(cf);
   
   if(callback == NULL) {
     callback = empty_callback;
@@ -2752,7 +2805,7 @@ ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *
   }
   sub_count = chead->shared->sub_count;
   
-  chead->max_messages = cf->max_messages;
+  chead->max_messages = nchan_loc_conf_max_messages(cf);
   
   if(chead->latest_msgid.time > msg->id.time) {
     if(cf->redis.enabled) {
@@ -2764,7 +2817,7 @@ ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *
   }
   
   memstore_chanhead_messages_gc(chead);
-  if(cf->max_messages == 0) {
+  if(chead->max_messages == 0) {
     ///no buffer
     channel_copy=&chead->channel;
     
@@ -2785,7 +2838,6 @@ ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *
     }
     
     nchan_reaper_add(&mpt->nobuffer_msg_reaper, shmsg_link);
-    //DBG("publish unbuffer msg %V expire %i ", msgid_to_str(&publish_msg->id), cf->buffer_timeout);
   }
   else {
     
@@ -2816,13 +2868,6 @@ ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *
   
   //do the actual publishing
   assert(publish_msg->id.time != publish_msg->prev_id.time || ( publish_msg->id.time == publish_msg->prev_id.time && publish_msg->id.tag.fixed[0] != publish_msg->prev_id.tag.fixed[0]));
-  //DBG("publish %V expire %i", msgid_to_str(&publish_msg->id), cf->buffer_timeout);
-  //DBG("prev: %V", msgid_to_str(&publish_msg->prev_id));
-  /*
-  if(publish_msg->buf && publish_msg->buf->file) {
-    DBG("fd %i", publish_msg->buf->file->fd);
-  }
-  */
   
   nchan_update_stub_status(messages, 1);
   
diff --git a/debian/modules/nchan/src/store/memory/store-private.h b/debian/modules/nchan/src/store/memory/store-private.h
index 2221510..b8f414f 100644
--- a/debian/modules/nchan/src/store/memory/store-private.h
+++ b/debian/modules/nchan/src/store/memory/store-private.h
@@ -106,10 +106,12 @@ typedef struct {
   ngx_atomic_int_t                   reloading;
   ngx_atomic_uint_t                  generation;
   
+  nchan_loc_conf_shared_data_t      *conf_data;
+  
   nchan_stub_status_t                stats;
   
   ngx_atomic_uint_t                  shmem_pages_used;
-  
+
 #if NCHAN_MSG_LEAK_DEBUG
   nchan_msg_t                       *msgdebug_head;
 #endif
diff --git a/debian/modules/nchan/src/store/memory/store.h b/debian/modules/nchan/src/store/memory/store.h
index 4124512..b4bf5d9 100644
--- a/debian/modules/nchan/src/store/memory/store.h
+++ b/debian/modules/nchan/src/store/memory/store.h
@@ -8,4 +8,6 @@ ngx_int_t msg_release(nchan_msg_t *msg, char *lbl);
 
 ngx_int_t memstore_channel_owner(ngx_str_t *id);
 
+nchan_loc_conf_shared_data_t *memstore_get_conf_shared_data(nchan_loc_conf_t *cf);
+ngx_int_t memstore_reserve_conf_shared_data(nchan_loc_conf_t *cf);
 #endif //NCHAN_MEMSTORE_H
diff --git a/debian/modules/nchan/src/store/redis/rdsstore.c b/debian/modules/nchan/src/store/redis/rdsstore.c
index 559c297..cffffeb 100755
--- a/debian/modules/nchan/src/store/redis/rdsstore.c
+++ b/debian/modules/nchan/src/store/redis/rdsstore.c
@@ -1065,7 +1065,7 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
       unsigned    chid_present = 0;
       ngx_str_t   extracted_channel_id;
       unsigned    msgbuf_size_changed = 0;
-      int64_t     msgbuf_size;
+      int64_t     msgbuf_size = 0;
       //maybe a message?
       set_buf(&mpbuf, (u_char *)el->str, el->len);
       cmp_init(&cmp, &mpbuf, ngx_buf_reader, ngx_buf_writer);
@@ -1821,8 +1821,8 @@ static void redisChannelInfoCallback(redisAsyncContext *c, void *r, void *privda
           break;
         case NGX_ERROR:
         default:
-          d->callback(NGX_ERROR, NULL, d->privdata);
           redisEchoCallback(c, r, privdata);
+          d->callback(NGX_ERROR, NULL, d->privdata);
       }
     }
     else {
@@ -1890,7 +1890,7 @@ static void nchan_store_find_channel_send(rdstore_data_t *rdata, void *pd) {
 }
 
 static void redisChannelFindCallback(redisAsyncContext *ac, void *r, void *privdata) {
-  rdstore_data_t                 *rdata;
+  rdstore_data_t                 *rdata = NULL;
   
   if(ac) {
     rdata = ac->data;
@@ -2355,7 +2355,11 @@ static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
       ngx_str_t                   *upstream_url;
       
       for(i=0; i < servers->nelts; i++) {
+#if nginx_version >= 1007002
         upstream_url = &usrv[i].name;
+#else
+        upstream_url = &usrv[i].addrs->name;
+#endif
         redis_add_connection_data(rcf, cur->loc_conf, upstream_url);
       }
     }
@@ -2369,6 +2373,9 @@ static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
 
 static void nchan_store_create_main_conf(ngx_conf_t *cf, nchan_main_conf_t *mcf) {
   mcf->redis_publish_message_msgkey_size=NGX_CONF_UNSET_SIZE;
+  
+  //reset redis_conf_head for reloads
+  redis_conf_head = NULL;
 }
 
 void redis_store_prepare_to_exit_worker() {
@@ -2567,7 +2574,7 @@ typedef struct {
   time_t                msg_time;
   nchan_msg_t          *msg;
   unsigned              shared_msg:1;
-  time_t                buffer_timeout;
+  time_t                message_timeout;
   ngx_int_t             max_messages;
   ngx_int_t             msglen;
   callback_pt           callback;
@@ -2608,7 +2615,7 @@ static void redis_publish_message_send(rdstore_data_t *rdata, void *pd) {
   
   //input:  keys: [], values: [channel_id, time, message, content_type, eventsource_event, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]
   //output: message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
-  redis_command(rdata, &redisPublishCallback, d, "EVALSHA %s 0 %b %i %b %b %b %i %i %i", redis_lua_scripts.publish.hash, STR(d->channel_id), msg->id.time, msgstart, msglen, STR(&(msg->content_type)), STR(&(msg->eventsource_event)), d->buffer_timeout, d->max_messages, redis_publish_message_msgkey_size);
+  redis_command(rdata, &redisPublishCallback, d, "EVALSHA %s 0 %b %i %b %b %b %i %i %i", redis_lua_scripts.publish.hash, STR(d->channel_id), msg->id.time, msgstart, msglen, STR(&(msg->content_type)), STR(&(msg->eventsource_event)), d->message_timeout, d->max_messages, redis_publish_message_msgkey_size);
   if(mmapped && munmap(msgstart, msglen) == -1) {
     ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "munmap was a problem");
   }
@@ -2629,8 +2636,8 @@ static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t
   }
   d->msg = msg;
   d->shared_msg = msg->shared;
-  d->buffer_timeout = cf->buffer_timeout;
-  d->max_messages = cf->max_messages;
+  d->message_timeout = nchan_loc_conf_message_timeout(cf);
+  d->max_messages = nchan_loc_conf_max_messages(cf);
   
   assert(msg->id.tagcount == 1);
   if((rdata = redis_cluster_rdata_from_channel_id(rdata, channel_id)) == NULL) {
diff --git a/debian/modules/nchan/src/store/redis/redis_lua_commands.h b/debian/modules/nchan/src/store/redis/redis_lua_commands.h
index f1766c3..6f4477d 100644
--- a/debian/modules/nchan/src/store/redis/redis_lua_commands.h
+++ b/debian/modules/nchan/src/store/redis/redis_lua_commands.h
@@ -191,19 +191,40 @@ static redis_lua_scripts_t redis_lua_scripts = {
    "\n"
    "return nearly_departed\n"},
 
-  {"find_channel", "0954f83f54ba95b59c7b899176417ad5edfc0f12",
+  {"find_channel", "efe9c3f1dd606b1534ee6948d07c7710c604e233",
    "--input: keys: [],  values: [ channel_id ]\n"
    "--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil\n"
    "-- finds and return the info hash of a channel, or nil of channel not found\n"
    "local id = ARGV[1]\n"
-   "local chk = ('{channel:%s}'):format(id)\n"
-   "local key_channel =  chk\n"
-   "local key_messages = chk..':messages'\n"
+   "local channel_key = ('{channel:%s}'):format(id)\n"
+   "local messages_key = channel_key..':messages'\n"
    "\n"
    "redis.call('echo', ' #######  FIND_CHANNEL ######## ')\n"
    "\n"
-   "if redis.call('EXISTS', key_channel) ~= 0 then\n"
-   "  local ch = redis.call('hmget', key_channel, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')\n"
+   "--check old entries\n"
+   "local oldestmsg=function(list_key, old_fmt)\n"
+   "  local old, oldkey\n"
+   "  local n, del=0,0\n"
+   "  while true do\n"
+   "    n=n+1\n"
+   "    old=redis.call('lindex', list_key, -1)\n"
+   "    if old then\n"
+   "      oldkey=old_fmt:format(old)\n"
+   "      local ex=redis.call('exists', oldkey)\n"
+   "      if ex==1 then\n"
+   "        return oldkey\n"
+   "      else\n"
+   "        redis.call('rpop', list_key)\n"
+   "        del=del+1\n"
+   "      end\n"
+   "    else\n"
+   "      break\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "if redis.call('EXISTS', channel_key) ~= 0 then\n"
+   "  local ch = redis.call('hmget', channel_key, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')\n"
    "  if(ch[4]) then\n"
    "    --replace subscribers count with fake_subscribers\n"
    "    ch[3]=ch[4]\n"
@@ -216,19 +237,9 @@ static redis_lua_scripts_t redis_lua_scripts = {
    "    ch[5]=\"\"\n"
    "  end\n"
    "  \n"
-   "  if redis.call(\"TYPE\", key_messages)['ok'] == 'list' then\n"
-   "    local oldest_msgid;\n"
-   "    while true do\n"
-   "      oldest_msgid = redis.call('LRANGE', key_messages, -1, -1)[1]\n"
-   "      if redis.call('EXISTS', (chk..':msg:%s'):format(oldest_msgid)) ~= 0 then\n"
-   "        --key exists.\n"
-   "        break\n"
-   "      else\n"
-   "        redis.breakpoint()\n"
-   "        redis.call('RPOP', key_messages)\n"
-   "      end\n"
-   "    end\n"
-   "    table.insert(ch, tonumber(redis.call('llen', chk..\":messages\")))\n"
+   "  if redis.call(\"TYPE\", messages_key)['ok'] == 'list' then\n"
+   "    oldestmsg(messages_key, channel_key ..':msg:%s')\n"
+   "    table.insert(ch, tonumber(redis.call('llen', messages_key)))\n"
    "  else\n"
    "    table.insert(ch, 0)\n"
    "  end\n"
diff --git a/debian/modules/nchan/src/store/redis/scripts/find_channel.lua b/debian/modules/nchan/src/store/redis/scripts/find_channel.lua
index f02c6fb..882336c 100644
--- a/debian/modules/nchan/src/store/redis/scripts/find_channel.lua
+++ b/debian/modules/nchan/src/store/redis/scripts/find_channel.lua
@@ -2,14 +2,35 @@
 --output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
 -- finds and return the info hash of a channel, or nil of channel not found
 local id = ARGV[1]
-local chk = ('{channel:%s}'):format(id)
-local key_channel =  chk
-local key_messages = chk..':messages'
+local channel_key = ('{channel:%s}'):format(id)
+local messages_key = channel_key..':messages'
 
 redis.call('echo', ' #######  FIND_CHANNEL ######## ')
 
-if redis.call('EXISTS', key_channel) ~= 0 then
-  local ch = redis.call('hmget', key_channel, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')
+--check old entries
+local oldestmsg=function(list_key, old_fmt)
+  local old, oldkey
+  local n, del=0,0
+  while true do
+    n=n+1
+    old=redis.call('lindex', list_key, -1)
+    if old then
+      oldkey=old_fmt:format(old)
+      local ex=redis.call('exists', oldkey)
+      if ex==1 then
+        return oldkey
+      else
+        redis.call('rpop', list_key)
+        del=del+1
+      end
+    else
+      break
+    end
+  end
+end
+
+if redis.call('EXISTS', channel_key) ~= 0 then
+  local ch = redis.call('hmget', channel_key, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')
   if(ch[4]) then
     --replace subscribers count with fake_subscribers
     ch[3]=ch[4]
@@ -22,19 +43,9 @@ if redis.call('EXISTS', key_channel) ~= 0 then
     ch[5]=""
   end
   
-  if redis.call("TYPE", key_messages)['ok'] == 'list' then
-    local oldest_msgid;
-    while true do
-      oldest_msgid = redis.call('LRANGE', key_messages, -1, -1)[1]
-      if redis.call('EXISTS', (chk..':msg:%s'):format(oldest_msgid)) ~= 0 then
-        --key exists.
-        break
-      else
-        redis.breakpoint()
-        redis.call('RPOP', key_messages)
-      end
-    end
-    table.insert(ch, tonumber(redis.call('llen', chk..":messages")))
+  if redis.call("TYPE", messages_key)['ok'] == 'list' then
+    oldestmsg(messages_key, channel_key ..':msg:%s')
+    table.insert(ch, tonumber(redis.call('llen', messages_key)))
   else
     table.insert(ch, 0)
   end
diff --git a/debian/modules/nchan/src/store/spool.c b/debian/modules/nchan/src/store/spool.c
index 0f1dde5..984f064 100755
--- a/debian/modules/nchan/src/store/spool.c
+++ b/debian/modules/nchan/src/store/spool.c
@@ -9,6 +9,7 @@
 #define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SPOOL:" fmt, ##arg)
 
 #define NCHAN_MSG_NORESPONSE_RETRY_TIME 200
+#define NCHAN_SPOOL_FETCHMSG_MAX_TIMES 20
 
 //////// SPOOLs -- Subscriber Pools  /////////
 
@@ -140,6 +141,14 @@ ngx_event_t *spooler_add_timer(channel_spooler_t *spl, ngx_msec_t timeout, void
   return &spl_ev->ev;
 }
 
+static void fetchmsg_ev_handler(ngx_event_t *ev) {
+  subscriber_pool_t *spool = (subscriber_pool_t *)ev->data;
+  DBG("stack-overflow-buster fetchmsg event for spool %p", spool);
+  if(spool->msg_status == MSG_INVALID) {
+    spool_fetch_msg(spool);
+  }
+}
+
 static ngx_inline void init_spool(channel_spooler_t *spl, subscriber_pool_t *spool, nchan_msg_id_t *id) {
   nchan_copy_new_msg_id(&spool->id, id);
   spool->msg = NULL;
@@ -151,6 +160,10 @@ static ngx_inline void init_spool(channel_spooler_t *spl, subscriber_pool_t *spo
   spool->non_internal_sub_count = 0;
   spool->generation = 0;
   spool->responded_count = 0;
+  ngx_memzero(&spool->fetchmsg_ev, sizeof(spool->fetchmsg_ev));
+  nchan_init_timer(&spool->fetchmsg_ev, fetchmsg_ev_handler, spool);
+  spool->fetchmsg_current_count=0;
+  spool->fetchmsg_prev_msec=0;
   
   spool->spooler = spl;
 }
@@ -404,6 +417,25 @@ static ngx_int_t spool_fetch_msg_callback(nchan_msg_status_t findmsg_status, nch
 static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool) {
   fetchmsg_data_t        *data;
   channel_spooler_t      *spl = spool->spooler;
+  
+  
+  //stack overflow protector
+  //ERR("spool->fetchmsg_prev_msec %i (ngx_timeofday())->msec %i spool->fetchmsg_current_count %i", spool->fetchmsg_prev_msec, (ngx_timeofday())->msec, spool->fetchmsg_current_count);
+  if(spool->fetchmsg_prev_msec == (ngx_timeofday())->msec) {
+    if(spool->fetchmsg_current_count > NCHAN_SPOOL_FETCHMSG_MAX_TIMES) {
+      ngx_add_timer(&spool->fetchmsg_ev, 0);
+      spool->fetchmsg_current_count = 0;
+      return NGX_DONE;
+    }
+    else {
+      spool->fetchmsg_current_count++;
+    }
+  }
+  else {
+    spool->fetchmsg_current_count = 0;
+    spool->fetchmsg_prev_msec = (ngx_timeofday())->msec;
+  }
+  
   if(*spl->channel_status != READY) {
     DBG("%p wanted to fetch msg %V, but channel %V not ready", spool, msgid_to_str(&spool->id), spl->chid);
     spool->msg_status = MSG_CHANNEL_NOTREADY;
@@ -1018,7 +1050,7 @@ static ngx_int_t its_time_for_a_spooling(rbtree_seed_t *seed, subscriber_pool_t
   assert(spool->msg_status == MSG_CHANNEL_NOTREADY);
   spool->msg_status = MSG_INVALID;
   rc = spool_fetch_msg(spool);
-  assert(rc == NGX_OK);
+  assert(rc == NGX_OK || rc == NGX_DONE);
   return rc;
 }
 
@@ -1128,9 +1160,14 @@ static ngx_int_t remove_spool(subscriber_pool_t *spool) {
   DBG("remove spool node %p", node);
   
   assert(spool->spooler->running);
+  
+  if(spool->fetchmsg_ev.timer_set) {
+    ngx_del_timer(&spool->fetchmsg_ev);
+  }
+  
   nchan_free_msg_id(&spool->id);
   rbtree_remove_node(&spl->spoolseed, rbtree_node_from_data(spool));
-
+  
   //assert((node = rbtree_find_node(&spl->spoolseed, &spool->id)) == NULL);
   //double-check that it's gone 
   
diff --git a/debian/modules/nchan/src/store/spool.h b/debian/modules/nchan/src/store/spool.h
index 576d98d..097c957 100644
--- a/debian/modules/nchan/src/store/spool.h
+++ b/debian/modules/nchan/src/store/spool.h
@@ -25,6 +25,12 @@ struct subscriber_pool_s {
   nchan_msg_t                *msg;
   nchan_msg_status_t          msg_status;
   spooled_subscriber_t       *first;
+  
+  //stack overflow prevention
+  ngx_uint_t                  fetchmsg_prev_msec;
+  ngx_int_t                   fetchmsg_current_count;
+  ngx_event_t                 fetchmsg_ev;
+  
   ngx_pool_t                 *pool;
   ngx_uint_t                  sub_count;
   ngx_uint_t                  non_internal_sub_count;
diff --git a/debian/modules/nchan/src/subscribers/common.c b/debian/modules/nchan/src/subscribers/common.c
index 77d96a6..7c5cc4a 100644
--- a/debian/modules/nchan/src/subscribers/common.c
+++ b/debian/modules/nchan/src/subscribers/common.c
@@ -1,29 +1,155 @@
 #include <nchan_module.h>
 #include <assert.h>
 #include "common.h"
+//#include <util/nchan_fake_request.h>
+#include <util/nchan_subrequest.h>
 
 #if FAKESHARD
 #include <store/memory/store.h>
 #endif
 
-ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id) {
-  return sub->cf->storage_engine->subscribe(ch_id, sub);
-}
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:COMMON:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:COMMON:" fmt, ##arg)
 
 typedef struct {
   subscriber_t    *sub;
   ngx_str_t       *ch_id;
   ngx_int_t        rc;
   ngx_int_t        http_response_code;
-} nchan_auth_subrequest_data_t;
+} nchan_subrequest_data_t;
+
+
+typedef struct {
+  subscriber_t            *sub;
+  subrequest_callback_pt   cb;
+  void                    *cb_data;
+} nchan_subrequest_data_cb_t;
 
 typedef struct {
   ngx_http_post_subrequest_t     psr;
-  nchan_auth_subrequest_data_t   psr_data;
-} nchan_auth_subrequest_stuff_t;
+  nchan_subrequest_data_t        psr_data;
+} nchan_subrequest_stuff_t;
+
+static ngx_int_t subscriber_subrequest_handler(ngx_http_request_t *sr, void *pd, ngx_int_t rc) {
+  nchan_subrequest_data_cb_t    *psrd = (nchan_subrequest_data_cb_t *)pd;
+  
+  psrd->sub->fn->release(psrd->sub, 1);
+  
+  if(psrd->cb) {
+    psrd->cb(psrd->sub, sr, rc, psrd->cb_data);
+  }
+  return NGX_OK;
+}
+
+
+ngx_http_request_t *subscriber_cv_subrequest(subscriber_t *sub, ngx_http_complex_value_t *url_ccv, ngx_buf_t *body, subrequest_callback_pt cb, void *cb_data) {
+  ngx_str_t                     request_url;
+  ngx_http_complex_value(sub->request, url_ccv, &request_url);
+  return subscriber_subrequest(sub, &request_url, body, cb, cb_data);
+}
+
+
+ngx_http_request_t *subscriber_subrequest(subscriber_t *sub, ngx_str_t *url, ngx_buf_t *body, subrequest_callback_pt cb, void *cb_data) {
+  ngx_http_request_t            *r = sub->request;
+  ngx_http_post_subrequest_t    *psr = ngx_pcalloc(r->pool, sizeof(*psr));
+  nchan_subrequest_data_cb_t    *psrd = ngx_pcalloc(r->pool, sizeof(*psrd));
+  ngx_http_request_t            *sr;
+
+  sub->fn->reserve(sub);
+  
+  psr->handler = subscriber_subrequest_handler;
+  psr->data = psrd;
+  psrd->sub = sub;
+  psrd->cb_data = cb_data;
+  psrd->cb = cb;
+  
+  ngx_http_subrequest(r, url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
+  
+  if((sr->request_body = ngx_pcalloc(r->pool, sizeof(*sr->request_body))) == NULL) { //dummy request body 
+    return NULL;
+  }
+  
+  if(body && ngx_buf_size(body) > 0) {
+    static ngx_str_t                   POST_REQUEST_STRING = {4, (u_char *)"POST "};
+    size_t                             sz;
+    ngx_http_request_body_t           *sr_body = sr->request_body;
+    ngx_chain_t                       *fakebody_chain;
+    ngx_buf_t                         *fakebody_buf;
+    
+    fakebody_chain = ngx_palloc(r->pool, sizeof(*fakebody_chain));
+    fakebody_buf = ngx_palloc(r->pool, sizeof(*fakebody_buf));
+    sr_body->bufs = fakebody_chain;
+    fakebody_chain->next = NULL;
+    fakebody_chain->buf = fakebody_buf;
+    ngx_memzero(fakebody_buf, sizeof(*fakebody_buf));
+    fakebody_buf->last_buf = 1;
+    fakebody_buf->last_in_chain = 1;
+    fakebody_buf->flush = 1;
+    fakebody_buf->memory = 1;
+    
+    //just copy the buffer contents. it's inefficient but I don't care at the moment.
+    //this can and should be optimized later
+    sz = ngx_buf_size(body);
+    fakebody_buf->start = ngx_palloc(r->pool, sz); //huuh?
+    ngx_memcpy(fakebody_buf->start, body->start, sz);
+    fakebody_buf->end = fakebody_buf->start + sz;
+    fakebody_buf->pos = fakebody_buf->start;
+    fakebody_buf->last = fakebody_buf->end;
+    
+    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, sr_body, sz, NULL);
+  }
+  else {
+    sr->header_only = 1;
+  }
+  sr->args = sub->request->args;
+  
+  return sr;
+}
+
+static ngx_int_t generic_subscriber_subrequest_old(subscriber_t *sub, ngx_http_complex_value_t *url_ccv, ngx_int_t (*handler)(ngx_http_request_t *, void *, ngx_int_t), ngx_http_request_t **subrequest, ngx_str_t *chid) {
+  ngx_str_t                  request_url;
+  nchan_subrequest_stuff_t  *psr_stuff = ngx_palloc(sub->request->pool, sizeof(*psr_stuff));
+  assert(psr_stuff != NULL);
+  
+  //ngx_http_request_t            *fake_parent_req = fake_cloned_parent_request(sub->request);
+  
+  ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
+  nchan_subrequest_data_t       *psrd = &psr_stuff->psr_data;
+  ngx_http_request_t            *sr;
+  
+  ngx_http_complex_value(sub->request, url_ccv, &request_url);
+  
+  sub->fn->reserve(sub);
+  
+  psr->handler = handler;
+  psr->data = psrd;
+  
+  psrd->sub = sub;
+  if(chid) {
+    psrd->ch_id = chid;
+  }
+  
+  ngx_http_subrequest(sub->request, &request_url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
+  
+  sr->request_body = ngx_pcalloc(sub->request->pool, sizeof(ngx_http_request_body_t)); //dummy request body 
+  if (sr->request_body == NULL) {
+    return NGX_ERROR;
+  }
+  
+  sr->header_only = 1;
+  
+  sr->args = sub->request->args;
+  if(subrequest) {
+    *subrequest = sr;
+  }
+  
+  return NGX_OK;
+}
 
 static void subscriber_authorize_timer_callback_handler(ngx_event_t *ev) {
-  nchan_auth_subrequest_data_t *d = ev->data;
+  nchan_subrequest_data_t *d = ev->data;
   
   d->sub->fn->release(d->sub, 1);
   
@@ -44,7 +170,7 @@ static void subscriber_authorize_timer_callback_handler(ngx_event_t *ev) {
 }
 
 static ngx_int_t subscriber_authorize_callback(ngx_http_request_t *r, void *data, ngx_int_t rc) {
-  nchan_auth_subrequest_data_t  *d = data;
+  nchan_subrequest_data_t       *d = data;
   ngx_event_t                   *timer;
   
   if (rc == NGX_HTTP_CLIENT_CLOSED_REQUEST) {
@@ -68,50 +194,90 @@ static ngx_int_t subscriber_authorize_callback(ngx_http_request_t *r, void *data
   return NGX_OK;
 }
 
-ngx_int_t nchan_subscriber_authorize_subscribe(subscriber_t *sub, ngx_str_t *ch_id) {
+ngx_int_t nchan_subscriber_authorize_subscribe_request(subscriber_t *sub, ngx_str_t *ch_id) {
   
   ngx_http_complex_value_t  *authorize_request_url_ccv = sub->cf->authorize_request_url;
-  ngx_str_t                  auth_request_url;
   
   if(!authorize_request_url_ccv) {
     return nchan_subscriber_subscribe(sub, ch_id);
   }
   else {
-    nchan_auth_subrequest_stuff_t *psr_stuff = ngx_palloc(sub->request->pool, sizeof(*psr_stuff));
-    assert(psr_stuff != NULL);
-    
-    //ngx_http_request_t            *fake_parent_req = fake_cloned_parent_request(sub->request);
-    
-    ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
-    nchan_auth_subrequest_data_t  *psrd = &psr_stuff->psr_data;
-    ngx_http_request_t            *sr;
-    
-    ngx_http_complex_value(sub->request, authorize_request_url_ccv, &auth_request_url);
-    
-    sub->fn->reserve(sub);
-    
-    psr->handler = subscriber_authorize_callback;
-    psr->data = psrd;
-    
-    psrd->sub = sub;
-    psrd->ch_id = ch_id;
-    
-    ngx_http_subrequest(sub->request, &auth_request_url, NULL, &sr, psr, 0);
-    
-    sr->request_body = ngx_pcalloc(sub->request->pool, sizeof(ngx_http_request_body_t)); //dummy request body 
-    if (sr->request_body == NULL) {
-      return NGX_ERROR;
-    }
-    
-    sr->header_only = 1;
-    
-    sr->args = sub->request->args;
-    
+    return generic_subscriber_subrequest_old(sub, authorize_request_url_ccv, subscriber_authorize_callback, NULL, ch_id);
+  }
+}
+
+static ngx_int_t subscriber_unsubscribe_request_callback(ngx_http_request_t *r, void *data, ngx_int_t rc) {
+  nchan_subrequest_data_t       *d = data;
+  nchan_request_ctx_t           *ctx = ngx_http_get_module_ctx(d->sub->request, ngx_nchan_module);
+  ngx_int_t                      finalize_code = ctx->unsubscribe_request_callback_finalize_code;
+  DBG("callback %p %p %i", r, data, rc);
+  if(d->sub->request->main->blocked) {
+    d->sub->request->main->blocked = 0;
+  }
+  if(finalize_code != NGX_DONE) {
+    nchan_http_finalize_request(d->sub->request, finalize_code);
+  }
+  
+  ctx->unsubscribe_request_callback_finalize_code = NGX_OK;
+  d->sub->fn->release(d->sub, 0);
+  return NGX_OK;
+}
+
+
+ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub, ngx_int_t finalize_code) {
+  ngx_int_t                    ret;
+  //ngx_http_upstream_conf_t    *ucf;
+  
+  if(sub->type == LONGPOLL || sub->type == INTERVALPOLL) {
+    //don't do this for longpoll subscribers. It's still buggy and not efficient anyway
+    return NGX_OK;
+  }
+  
+  nchan_request_ctx_t         *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  ngx_http_request_t          *subrequest;
+  ctx->unsubscribe_request_callback_finalize_code = finalize_code;
+  ret = generic_subscriber_subrequest_old(sub, sub->cf->unsubscribe_request_url, subscriber_unsubscribe_request_callback, &subrequest, NULL);
+  ctx->sent_unsubscribe_request = 1;
+  
+  //ucf = ngx_http_get_module_loc_conf(subrequest, ngx_http_upstream_module);
+  //ucf->ignore_client_abort = 1;
+  
+  return ret;
+}
+
+
+static ngx_int_t subscriber_subscribe_callback(ngx_http_request_t *r, void *data, ngx_int_t rc) {
+  nchan_subrequest_data_t       *d = data;
+  d->sub->fn->release(d->sub, 0);
+  return NGX_OK;
+}
+
+
+ngx_int_t nchan_subscriber_subscribe_request(subscriber_t *sub) {
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  if(!ctx->sent_unsubscribe_request) {
+    return generic_subscriber_subrequest_old(sub, sub->cf->subscribe_request_url, subscriber_subscribe_callback, NULL, NULL);
+  }
+  else {
     return NGX_OK;
   }
 }
 
 
+ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id) {
+  ngx_int_t             ret;
+  //nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  subscriber_type_t     sub_type = sub->type;
+  nchan_loc_conf_t     *cf = sub->cf;
+  
+  ret = sub->cf->storage_engine->subscribe(ch_id, sub);
+  //don't access sub directly, it might have already been freed
+  if(ret == NGX_OK && sub_type != LONGPOLL && sub_type != INTERVALPOLL && cf->subscribe_request_url) {
+    nchan_subscriber_subscribe_request(sub);
+  }
+  return ret;
+}
+
 ngx_int_t nchan_cleverly_output_headers_only_for_later_response(ngx_http_request_t *r) {
   ngx_int_t                rc;
   static const ngx_str_t   everything_ok = ngx_string("200 OK");
@@ -314,4 +480,176 @@ void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str) {
   buf->memory = 1;
 }
 
+#if nginx_version >= 1003015
+
+static void ngx_http_close_request_dup(ngx_http_request_t *r, ngx_int_t rc) {
+  ngx_connection_t  *c;
+
+  r = r->main;
+  c = r->connection;
+
+  ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                  "http request count:%d blk:%d", r->count, r->blocked);
+
+  if (r->count == 0) {
+    ngx_log_error(NGX_LOG_ALERT, c->log, 0, "http request count is zero");
+  }
+
+  r->count--;
+
+  if (r->count || r->blocked) {
+    return;
+  }
+
+#if (NGX_HTTP_V2)
+  if (r->stream) {
+    ngx_http_v2_close_stream(r->stream, rc);
+    return;
+  }
+#endif
+
+  ngx_http_free_request(r, rc);
+  ngx_http_close_connection(c);
+}
+
+void nchan_subscriber_unsubscribe_callback_http_test_reading(ngx_http_request_t *r) {
+  int                n;
+  char               buf[1];
+  ngx_err_t          err;
+  ngx_event_t       *rev;
+  ngx_connection_t  *c;
+  
+  nchan_request_ctx_t  *nchan_ctx;
+
+  c = r->connection;
+  rev = c->read;
+
+  ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http test reading");
+
+#if (NGX_HTTP_V2)
+
+  if (r->stream) {
+    if (c->error) {
+      err = 0;
+      goto closed;
+    }
+
+    return;
+  }
+
+#endif
+#if (NGX_HTTP_SPDY)
+
+    if (r->spdy_stream) {
+        if (c->error) {
+            err = 0;
+            goto closed;
+        }
+
+        return;
+    }
+
+#endif
+
+#if (NGX_HAVE_KQUEUE)
+
+  if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
+
+    if (!rev->pending_eof) {
+        return;
+    }
+
+    rev->eof = 1;
+    c->error = 1;
+    err = rev->kq_errno;
+
+    goto closed;
+  }
+
+#endif
+
+#if (NGX_HAVE_EPOLLRDHUP)
+#if nginx_version >= 1011000
+  if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && ngx_use_epoll_rdhup) {
+    socklen_t  len;
+
+    if (!rev->pending_eof) {
+        return;
+    }
+#else
+  if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && rev->pending_eof) {
+    socklen_t  len;
+#endif
+
+    rev->eof = 1;
+    c->error = 1;
+
+    err = 0;
+    len = sizeof(ngx_err_t);
+
+    /*
+      * BSDs and Linux return 0 and set a pending error in err
+      * Solaris returns -1 and sets errno
+      */
+
+    if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len)
+        == -1)
+    {
+        err = ngx_socket_errno;
+    }
+
+    goto closed;
+  }
+
+#endif
+
+  n = recv(c->fd, buf, 1, MSG_PEEK);
+
+  if (n == 0) {
+    rev->eof = 1;
+    c->error = 1;
+    err = 0;
+
+    goto closed;
+
+  } else if (n == -1) {
+    err = ngx_socket_errno;
+
+    if (err != NGX_EAGAIN) {
+      rev->eof = 1;
+      c->error = 1;
+
+      goto closed;
+    }
+  }
+
+  /* aio does not call this handler */
+
+  if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && rev->active) {
+
+    if (ngx_del_event(rev, NGX_READ_EVENT, 0) != NGX_OK) {
+      ngx_http_close_request_dup(r, 0);
+    }
+  }
+
+  return;
+
+closed:
+
+  if (err) {
+    rev->error = 1;
+  }
+
+  ngx_log_error(NGX_LOG_INFO, c->log, err,
+                "client prematurely closed connection");
+
+  //send the unsubscribe upstream request before finalize the main request.
+  //otherwise, main request pool will have been wiped by the time we need it.
+  nchan_ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  if(!nchan_ctx->sent_unsubscribe_request && nchan_ctx->sub) {
+    nchan_subscriber_unsubscribe_request(nchan_ctx->sub, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+  }
+}
+
+#endif
 
diff --git a/debian/modules/nchan/src/subscribers/common.h b/debian/modules/nchan/src/subscribers/common.h
index b0193c4..bb4a02a 100644
--- a/debian/modules/nchan/src/subscribers/common.h
+++ b/debian/modules/nchan/src/subscribers/common.h
@@ -1,6 +1,8 @@
 ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id);
 
-ngx_int_t nchan_subscriber_authorize_subscribe(subscriber_t *sub, ngx_str_t *ch_id);
+ngx_int_t nchan_subscriber_authorize_subscribe_request(subscriber_t *sub, ngx_str_t *ch_id);
+ngx_int_t nchan_subscriber_subscribe_request(subscriber_t *sub);
+ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub, ngx_int_t finalize_code);
 
 ngx_int_t nchan_cleverly_output_headers_only_for_later_response(ngx_http_request_t *r);
 
@@ -10,12 +12,17 @@ ngx_int_t nchan_request_set_content_type_multipart_boundary_header(ngx_http_requ
 
 ngx_int_t nchan_subscriber_empty_notify(subscriber_t *, ngx_int_t code, void *data);
 
+typedef ngx_int_t (*subrequest_callback_pt)(subscriber_t *sub, ngx_http_request_t *r, ngx_int_t rc, void *);
+ngx_http_request_t *subscriber_cv_subrequest(subscriber_t *sub, ngx_http_complex_value_t *url_ccv, ngx_buf_t *body, subrequest_callback_pt cb, void *cb_data);
+ngx_http_request_t *subscriber_subrequest(subscriber_t *sub, ngx_str_t *url, ngx_buf_t *body, subrequest_callback_pt cb, void *cb_data);
+
 void nchan_subscriber_timeout_ev_handler(ngx_event_t *ev);
 void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http_request_t *r, nchan_msg_id_t *msgid);
 void nchan_subscriber_init_timeout_timer(subscriber_t *sub, ngx_event_t *ev);
 void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t dequeue_after_response);
 ngx_int_t nchan_subscriber_init_msgid_reusepool(nchan_request_ctx_t *ctx, ngx_pool_t *request_pool);
 ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
+void nchan_subscriber_unsubscribe_callback_http_test_reading(ngx_http_request_t *r);
 void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end);
 void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str);
 #define ngx_init_set_membuf_char(buf, str) \
diff --git a/debian/modules/nchan/src/subscribers/eventsource.c b/debian/modules/nchan/src/subscribers/eventsource.c
index 6ba4387..6ff437a 100644
--- a/debian/modules/nchan/src/subscribers/eventsource.c
+++ b/debian/modules/nchan/src/subscribers/eventsource.c
@@ -323,13 +323,9 @@ subscriber_t *eventsource_subscriber_create(ngx_http_request_t *r, nchan_msg_id_
 }
 
 ngx_int_t nchan_detect_eventsource_request(ngx_http_request_t *r) {
-  ngx_str_t       *accept_header;
-  if(r->headers_in.accept == NULL) {
-    return 0;
-  }
-  accept_header = &r->headers_in.accept->value;
+  ngx_str_t       *accept_header = nchan_get_accept_header_value(r);
 
-  if(ngx_strnstr(accept_header->data, "text/event-stream", accept_header->len)) {
+  if(accept_header && ngx_strnstr(accept_header->data, "text/event-stream", accept_header->len)) {
     return 1;
   }
   
diff --git a/debian/modules/nchan/src/subscribers/http-multipart-mixed.c b/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
index 4a4acb1..97b9fec 100644
--- a/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
+++ b/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
@@ -277,13 +277,9 @@ subscriber_t *http_multipart_subscriber_create(ngx_http_request_t *r, nchan_msg_
 }
 
 ngx_int_t nchan_detect_multipart_subscriber_request(ngx_http_request_t *r) {
-  ngx_str_t       *accept_header;
-  if(r->headers_in.accept == NULL) {
-    return 0;
-  }
-  accept_header = &r->headers_in.accept->value;
+  ngx_str_t       *accept_header = nchan_get_accept_header_value(r);
 
-  if(ngx_strnstr(accept_header->data, "multipart/mixed", accept_header->len)) {
+  if(accept_header && ngx_strnstr(accept_header->data, "multipart/mixed", accept_header->len)) {
     return 1;
   }
   
diff --git a/debian/modules/nchan/src/subscribers/internal.c b/debian/modules/nchan/src/subscribers/internal.c
index 7ead609..2b1f534 100644
--- a/debian/modules/nchan/src/subscribers/internal.c
+++ b/debian/modules/nchan/src/subscribers/internal.c
@@ -44,14 +44,6 @@ static ngx_str_t     subscriber_name = ngx_string("internal");
 
 subscriber_t *internal_subscriber_create(ngx_str_t *name, nchan_loc_conf_t *cf, size_t pd_size, void **pd) {
   internal_subscriber_t               *fsub;
-  /*
-  if(dummy_config_ptr == NULL) {
-    ngx_memzero(&dummy_config, sizeof(dummy_config));
-    dummy_config.buffer_timeout = 0;
-    dummy_config.max_messages = -1;
-    dummy_config_ptr = &dummy_config;
-  }
-  */
   
   if((fsub = ngx_alloc(sizeof(*fsub) + pd_size, ngx_cycle->log)) == NULL) {
     ERR("Unable to allocate");
@@ -173,7 +165,7 @@ static ngx_int_t internal_enqueue(subscriber_t *self) {
     //add timeout timer
     reset_timer(fsub);
   }
-  fsub->enqueue(fsub->sub.cf->buffer_timeout, NULL, fsub->privdata);
+  fsub->enqueue(NGX_OK, NULL, fsub->privdata);
   self->enqueued = 1;
   return NGX_OK;
 }
diff --git a/debian/modules/nchan/src/subscribers/longpoll.c b/debian/modules/nchan/src/subscribers/longpoll.c
index 99b5492..0c723a7 100644
--- a/debian/modules/nchan/src/subscribers/longpoll.c
+++ b/debian/modules/nchan/src/subscribers/longpoll.c
@@ -154,25 +154,53 @@ ngx_int_t longpoll_enqueue(subscriber_t *self) {
     //add timeout timer
     ngx_add_timer(&fsub->data.timeout_ev, self->cf->subscriber_timeout * 1000);
   }
+
+  
+#if nginx_version >= 1003015
+  if(self->cf->unsubscribe_request_url) {
+    self->request->read_event_handler = nchan_subscriber_unsubscribe_callback_http_test_reading;
+  }
+#endif
   
   return NGX_OK;
 }
 
 static ngx_int_t longpoll_dequeue(subscriber_t *self) {
   full_subscriber_t    *fsub = (full_subscriber_t  *)self;
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  ngx_http_request_t   *r = fsub->sub.request;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  int                   finalize_now = fsub->data.finalize_request;
   if(fsub->data.timeout_ev.timer_set) {
     ngx_del_timer(&fsub->data.timeout_ev);
   }
   DBG("%p dequeue", self);
   fsub->data.dequeue_handler(self, fsub->data.dequeue_handler_data);
+  
+  if(self->enqueued 
+   && (self->type != LONGPOLL && self->type != INTERVALPOLL) //disabled for longpoll & intervalpoll for now
+   && self->cf->unsubscribe_request_url 
+   && ctx->unsubscribe_request_callback_finalize_code != NGX_HTTP_CLIENT_CLOSED_REQUEST) {
+    r->main->blocked = 1;
+    if(fsub->data.finalize_request) {
+      nchan_subscriber_unsubscribe_request(self, NGX_OK);
+      self->status = DEAD;
+    }
+    else {
+      nchan_subscriber_unsubscribe_request(self, NGX_DONE);
+    }
+    if(ctx->request_ran_content_handler) {
+      ngx_http_run_posted_requests(r->connection);
+    }
+    finalize_now = 0;
+  }
+  
   self->enqueued = 0;
   
   ctx->sub = NULL;
   
-  if(fsub->data.finalize_request) {
-    DBG("finalize request %p", fsub->sub.request);
-    ngx_http_finalize_request(fsub->sub.request, NGX_OK);
+  if(finalize_now) {
+    DBG("finalize request %p", r);
+    nchan_http_finalize_request(r, NGX_OK);
     self->status = DEAD;
   }
   
@@ -520,7 +548,7 @@ static const subscriber_fn_t longpoll_fn = {
   &longpoll_reserve,
   &longpoll_release,
   &nchan_subscriber_empty_notify,
-  &nchan_subscriber_authorize_subscribe
+  &nchan_subscriber_authorize_subscribe_request
 };
 
 static ngx_str_t  sub_name = ngx_string("longpoll");
diff --git a/debian/modules/nchan/src/subscribers/memstore_ipc.c b/debian/modules/nchan/src/subscribers/memstore_ipc.c
index a84f974..87a4cdd 100644
--- a/debian/modules/nchan/src/subscribers/memstore_ipc.c
+++ b/debian/modules/nchan/src/subscribers/memstore_ipc.c
@@ -29,7 +29,7 @@ static ngx_int_t empty_callback(){
   return NGX_OK;
 }
 
-static ngx_int_t sub_enqueue(ngx_int_t timeout, void *ptr, sub_data_t *d) {
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
   DBG("%p (%V) memstore subsriber enqueued ok", d->sub, d->chid);
   return NGX_OK;
 }
@@ -127,6 +127,12 @@ static ngx_int_t keepalive_reply_handler(ngx_int_t renew, void *_, void* pd) {
 
 static void timeout_ev_handler(ngx_event_t *ev) {
   sub_data_t *d = (sub_data_t *)ev->data;
+  
+  if(!ev->timedout) {
+    return;
+  }
+  ev->timedout = 0;
+  
 #if FAKESHARD
   memstore_fakeprocess_push(d->owner);
 #endif
diff --git a/debian/modules/nchan/src/subscribers/memstore_multi.c b/debian/modules/nchan/src/subscribers/memstore_multi.c
index a9d64c6..ec723a8 100644
--- a/debian/modules/nchan/src/subscribers/memstore_multi.c
+++ b/debian/modules/nchan/src/subscribers/memstore_multi.c
@@ -42,7 +42,7 @@ static void change_sub_count(memstore_channel_head_t *ch, ngx_int_t n) {
   }
 }
 
-static ngx_int_t sub_enqueue(ngx_int_t timeout, void *ptr, sub_data_t *d) {
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
   DBG("%p enqueued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
   assert(d->multi_chanhead->multi_waiting > 0);
   d->multi_chanhead->multi_waiting --;
diff --git a/debian/modules/nchan/src/subscribers/memstore_redis.c b/debian/modules/nchan/src/subscribers/memstore_redis.c
index 0bbd4cf..fc9bf29 100644
--- a/debian/modules/nchan/src/subscribers/memstore_redis.c
+++ b/debian/modules/nchan/src/subscribers/memstore_redis.c
@@ -56,7 +56,7 @@ static void respond_msgexpected_callbacks(sub_data_t *d, nchan_msg_status_t stat
   }
 }
 
-static ngx_int_t sub_enqueue(ngx_int_t timeout, void *ptr, sub_data_t *d) {
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
   DBG("%p memstore-redis subsriber enqueued ok", d->sub);
   
   d->chanhead->status = READY;
@@ -84,7 +84,9 @@ static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d)
 
   cf.max_messages = d->chanhead->max_messages;
   cf.redis.enabled = 0;
-  cf.buffer_timeout = msg->expires - ngx_time();
+  cf.message_timeout = msg->expires - ngx_time();
+  cf.complex_max_messages = NULL;
+  cf.complex_message_timeout = NULL;
   
   lastid = &d->chanhead->latest_msgid;
   
diff --git a/debian/modules/nchan/src/subscribers/websocket.c b/debian/modules/nchan/src/subscribers/websocket.c
index e69b1e4..c5c3947 100644
--- a/debian/modules/nchan/src/subscribers/websocket.c
+++ b/debian/modules/nchan/src/subscribers/websocket.c
@@ -1,7 +1,9 @@
 #include <nchan_module.h>
 #include <subscribers/common.h>
 #include <util/nchan_subrequest.h>
+#if nginx_version >= 1000003
 #include <ngx_crypt.h>
+#endif
 #include <ngx_sha1.h>
 #include <nginx.h>
 
@@ -25,7 +27,7 @@
     
 #elif __SSE2__
   #define WEBSOCKET_OPTIMIZED_UNMASK 1
-  #include <emmintrin.h>                     // SSE2 instrinsics
+  #include <emmintrin.h>                     // SSE2 intrinsics
   
   #define __vector_size_bytes 16
   #define __vector_type __m128i
@@ -133,28 +135,26 @@ typedef struct {
 
 typedef struct full_subscriber_s full_subscriber_t;
 
-typedef struct {
-  ngx_pool_t                  *original_pool;
-  ngx_http_cleanup_t          *original_cleanup;
-  ngx_pool_t                  *tmp_pool;
-  ngx_pool_t                  *framebuf_pool;
-  ngx_http_cleanup_t          *cln;
-  full_subscriber_t           *fsub;
-  ngx_buf_t                    buf;
-  //ngx_http_request_t        *sr;
-  //ngx_http_posted_request_t *pr;
-  //ngx_chain_t                link;
-  ngx_str_t                    upstream_request_url;
-} nchan_pub_upstream_data_t;
-
-typedef struct nchan_pub_upstream_stuff_s nchan_pub_upstream_stuff_t;
-struct nchan_pub_upstream_stuff_s {
-  ngx_http_post_subrequest_t  psr;
-  nchan_pub_upstream_data_t   psr_data;
-  nchan_pub_upstream_stuff_t *prev;
-  nchan_pub_upstream_stuff_t *next;
+typedef struct nchan_pub_upstream_request_data_s nchan_pub_upstream_request_data_t;
+struct nchan_pub_upstream_request_data_s {
+  ngx_http_request_t                 *sr;
+  ngx_buf_t                           body_buf;
+  full_subscriber_t                  *fsub;
+  nchan_pub_upstream_request_data_t  *next;
+  unsigned                            sent:1;
 };
 
+typedef struct {
+  ngx_event_t                         upstream_subrequest_ev;
+  ngx_str_t                           request_url;
+  ngx_int_t                           running_upstream_request_count;
+  nchan_pub_upstream_request_data_t  *upstream_request_data_head;
+  nchan_pub_upstream_request_data_t  *upstream_request_data_tail;
+  nchan_pub_upstream_request_data_t  *upstream_request_data_received_head;
+  ngx_pool_t                         *temp_request_pool;
+  ngx_pool_t                         *real_request_pool;
+} nchan_pub_upstream_stuff_t;
+
 struct full_subscriber_s {
   subscriber_t            sub;
   ngx_http_cleanup_t     *cln;
@@ -166,7 +166,7 @@ struct full_subscriber_s {
   ws_frame_t              frame;
   
   ngx_str_t              *publish_channel_id;
-  nchan_pub_upstream_stuff_t  *upstream_stuff;
+  nchan_pub_upstream_stuff_t *publish_upstream;
   
   ngx_event_t             ping_ev;
   unsigned                awaiting_pong:1;
@@ -175,10 +175,12 @@ struct full_subscriber_s {
   unsigned                shook_hands:1;
   unsigned                connected:1;
   unsigned                closing:1;
+  unsigned                already_sent_unsub_request:1;
   unsigned                finalize_request:1;
   unsigned                awaiting_destruction:1;
 };// full_subscriber_t
 
+static void empty_handler() { }
 
 static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *chain);
 static void set_buf_to_str(ngx_buf_t *buf, const ngx_str_t *str);
@@ -188,30 +190,82 @@ static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_
 static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err);
 static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line);
 
-static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, ngx_pool_t *frame_pool);
+static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf);
 
 static ngx_int_t websocket_reserve(subscriber_t *self);
 static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy);
 
-static void aborted_ws_close_request_rev_handler(ngx_http_request_t *r) {
-  ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+static void websocket_delete_timers(full_subscriber_t *fsub);
+static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg_t *msg);
+
+ngx_int_t websocket_finalize_upstream_handler(subscriber_t *sub, ngx_http_request_t *sr, ngx_int_t rc, void *pd) {
+  ngx_http_request_t *r = sub->request;
+  DBG("websocket_finalize_upstream_handler");
+  r->main->blocked = 0;
+  websocket_release(sub, 0);
+  
+  nchan_http_finalize_request(r, NGX_HTTP_OK);
+  return NGX_OK;
 }
 
+static ngx_int_t websocket_finalize_request(full_subscriber_t *fsub) {
+  subscriber_t       *sub = &fsub->sub;
+  ngx_http_request_t *r = sub->request;
+  
+  fsub->cln->handler = (ngx_http_cleanup_pt )empty_handler;
+  if(sub->cf->unsubscribe_request_url && sub->enqueued) {
+    if(!fsub->already_sent_unsub_request) {
+      r->main->blocked = 1;
+      fsub->already_sent_unsub_request = 1;
+      websocket_reserve(&fsub->sub);
+      if(sub->enqueued) {
+        sub->fn->dequeue(sub);
+      }
+      if(subscriber_cv_subrequest(sub, sub->cf->unsubscribe_request_url, NULL, websocket_finalize_upstream_handler, NULL)) {
+        ngx_http_run_posted_requests(r->connection);
+      }
+    }
+  }
+  else {
+    if(sub->enqueued) {
+      sub->fn->dequeue(sub);
+    }
+    nchan_http_finalize_request(r, NGX_HTTP_OK);
+  }
+  return NGX_OK;
+}
+
+static void aborted_ws_close_request_rev_handler(ngx_http_request_t *r) {
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
+  if(fsub) {
+    websocket_finalize_request(fsub);
+  }
+}
 
 static void sudden_abort_handler(subscriber_t *sub) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
+  DBG("sudden abort handler for sub %p request %p", sub, sub->request);
 #if FAKESHARD
+  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
   memstore_fakeprocess_push(fsub->sub.owner);
 #endif
-  fsub->connected = 0;
   sub->request->read_event_handler = aborted_ws_close_request_rev_handler;
-  sub->status = DEAD;
   sub->fn->dequeue(sub);
 #if FAKESHARD
   memstore_fakeprocess_pop();
 #endif
 }
 
+static void ws_request_empty_handler(ngx_http_request_t *r) {
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;  
+  
+  if(r->connection->read->eof) {
+    //sudden disconnect
+    nchan_add_oneshot_timer((void (*)(void *))sudden_abort_handler, &fsub->sub, 0);
+  }
+}
+
 /*
 static void sudden_upstream_request_abort_handler(full_subscriber_t *fsub) {
   
@@ -252,7 +306,7 @@ static void websocket_unmask_frame(ws_frame_t *frame) {
   
   assert(fastlen % __vector_size_bytes == 0);
   
-  for (/*void*/; i < fastlen; i += __vector_size_bytes) {           // note that N must be multiple of [__vector_size_bytes]
+  for (/*void*/; i < fastlen; i += __vector_size_bytes) {           // note that i must be multiple of [__vector_size_bytes]
     w = __vector_load_intrinsic((__vector_type *)&payload[i]);       // load [__vector_size_bytes] bytes
     w = __vector_xor_intrinsic(w, w_mask);           // XOR with mask
     __vector_store_intrinsic((__vector_type *)&payload[i], w);   // store [__vector_size_bytes] masked bytes
@@ -277,6 +331,32 @@ static void websocket_unmask_frame(ws_frame_t *frame) {
 }
 #endif
 
+static ngx_int_t ws_output_filter(full_subscriber_t *fsub, ngx_chain_t *chain) {
+  if(fsub->publish_upstream && fsub->sub.request->pool == fsub->publish_upstream->temp_request_pool) {
+    ngx_int_t rc;
+    fsub->sub.request->pool = fsub->publish_upstream->real_request_pool;
+    rc = nchan_output_filter(fsub->sub.request, chain);
+    fsub->sub.request->pool = fsub->publish_upstream->temp_request_pool;
+    return rc;
+  }
+  else {
+    return nchan_output_filter(fsub->sub.request, chain);
+  }
+}
+
+static ngx_int_t ws_output_msg_filter(full_subscriber_t *fsub, nchan_msg_t *msg) {
+  if(fsub->publish_upstream && fsub->sub.request->pool == fsub->publish_upstream->temp_request_pool) {
+    ngx_int_t rc;
+    fsub->sub.request->pool = fsub->publish_upstream->real_request_pool;
+    rc = nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
+    fsub->sub.request->pool = fsub->publish_upstream->temp_request_pool;
+    return rc;
+  }
+  else {
+    return nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
+  }
+}
+
 static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *ch, full_subscriber_t *fsub) {
   time_t                 last_seen = 0;
   ngx_uint_t             subscribers = 0;
@@ -307,15 +387,13 @@ static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *c
         //so it should only be recieving messages
         return NGX_OK;
       }
-      if(r->headers_in.accept) {
-        accept_header = &r->headers_in.accept->value;
-      }
+      accept_header = nchan_get_accept_header_value(r);
       bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
       tmp_buf = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, NULL);
       ngx_memcpy(&bc->buf, tmp_buf, sizeof(*tmp_buf));
       bc->buf.last_buf=1;
       
-      nchan_output_filter(fsub->sub.request, websocket_frame_header_chain(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, ngx_buf_size((&bc->buf)), &bc->chain));
+      ws_output_filter(fsub, websocket_frame_header_chain(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, ngx_buf_size((&bc->buf)), &bc->chain));
       break;
     case NGX_ERROR:
     case NGX_HTTP_INTERNAL_SERVER_ERROR:
@@ -349,18 +427,11 @@ static void websocket_publish_continue(full_subscriber_t *fsub, ngx_buf_t *buf)
   
 }
 
-static void clean_upstream_sr_tmp_pools(nchan_pub_upstream_data_t *d) {
-  ngx_destroy_pool(d->tmp_pool);
-  ngx_destroy_pool(d->framebuf_pool);
-}
-
-static ngx_int_t websocket_publisher_upstream_handler(ngx_http_request_t *sr, void *data, ngx_int_t rc) {
-  ngx_http_request_t         *r = sr->parent;
-  nchan_pub_upstream_stuff_t *stuff = (nchan_pub_upstream_stuff_t *)data;
-  nchan_pub_upstream_data_t  *d = &stuff->psr_data;
-  full_subscriber_t          *fsub = d->fsub;
-  ngx_http_cleanup_t         *cln;
-  
+static ngx_int_t websocket_publisher_upstream_handler(subscriber_t *sub, ngx_http_request_t *sr, ngx_int_t rc, void *data) {
+  ngx_http_request_t                  *r = sr->parent;
+  nchan_pub_upstream_request_data_t   *d = (nchan_pub_upstream_request_data_t *)data;
+  full_subscriber_t                   *fsub = (full_subscriber_t *)sub;
+  nchan_pub_upstream_stuff_t          *sup = fsub->publish_upstream;
 #if nginx_version <= 1009004
   r->main->subrequests++; //avoid tripping up subrequest loop detection
 #endif
@@ -371,18 +442,12 @@ static ngx_int_t websocket_publisher_upstream_handler(ngx_http_request_t *sr, vo
     r->postponed = NULL;
   }
   
-  r->pool = d->original_pool;
-  //ERR("request %p orig pool %p", r, r->pool);
-  
-  //discard cleanup
-  r->cleanup = d->original_cleanup;
   r->count--;
-  //don't destroy the temp pool just yet, 
   
   if(rc == NGX_OK) {
-    ngx_int_t                 code = sr->headers_out.status;
-    ngx_int_t                 content_length;
-    ngx_chain_t              *request_chain;
+    ngx_int_t                        code = sr->headers_out.status;
+    ngx_int_t                        content_length;
+    ngx_chain_t                     *request_chain;
     
     switch(code) {
       case NGX_HTTP_OK:
@@ -390,27 +455,36 @@ static ngx_int_t websocket_publisher_upstream_handler(ngx_http_request_t *sr, vo
       case NGX_HTTP_ACCEPTED:
         if(sr->upstream) {
           ngx_buf_t    *buf;
+          ngx_buf_t     emptybuf;
           
-          content_length = sr->upstream->headers_in.content_length_n > 0 ? sr->upstream->headers_in.content_length_n : 0;
+          content_length = nchan_subrequest_content_length(sr);
           request_chain = sr->upstream->out_bufs;
           
-          if (request_chain->next != NULL) {
-            buf = nchan_chain_to_single_buffer(d->framebuf_pool, request_chain, content_length);
+          if(content_length > 0 && request_chain) {
+            if (request_chain->next != NULL) {
+              buf = nchan_chain_to_single_buffer(sup->temp_request_pool, request_chain, content_length);
+            }
+            else {
+              buf = request_chain->buf;
+              if(buf->memory) {
+                buf->start = buf->pos;
+                buf->end = buf->last;
+                buf->last_in_chain = 1;
+                buf->last_buf = 1;
+              }
+            }
           }
           else {
-            buf = request_chain->buf;
-            if(buf->memory) {
-              buf->start = buf->pos;
-              buf->end = buf->last;
-              buf->last_in_chain = 1;
-              buf->last_buf = 1;
-            }
+            ngx_memzero((&emptybuf), sizeof(emptybuf));
+            emptybuf.memory=1;
+            emptybuf.last_in_chain=1;
+            emptybuf.last_buf=1;
+            buf=&emptybuf;
           }
           
           websocket_publish_continue(fsub, buf);
         }
         else {
-          //content_length = 0;
           request_chain = NULL;
           ERR("upstream missing from upstream subrequest");
         }
@@ -418,7 +492,7 @@ static ngx_int_t websocket_publisher_upstream_handler(ngx_http_request_t *sr, vo
         break;
       
       case NGX_HTTP_NOT_MODIFIED:
-        websocket_publish_continue(fsub, &d->buf);
+        websocket_publish_continue(fsub, &d->body_buf);
         
         break;
         
@@ -435,29 +509,73 @@ static ngx_int_t websocket_publisher_upstream_handler(ngx_http_request_t *sr, vo
     websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL);
   }
   
-  if(fsub->upstream_stuff == stuff) {
-    fsub->upstream_stuff = stuff->next;
-  }
-  if(stuff->next) {
-    stuff->next->prev = stuff->prev;
+  assert(sup->upstream_request_data_head == d);
+  sup->upstream_request_data_head = d->next;
+  if(sup->upstream_request_data_tail == d) {
+    sup->upstream_request_data_tail = NULL;
   }  
-  if(stuff->prev) {
-    stuff->prev->next = stuff->next;
+  
+  sup->upstream_request_data_received_head=d;
+  
+  sup->running_upstream_request_count--;
+  if(!sup->upstream_subrequest_ev.timer_set) {
+    ngx_add_timer(&sup->upstream_subrequest_ev, 0);
   }
-
-  if((cln = ngx_http_cleanup_add(sr, 0)) == NULL) {
-    ERR("Unable to add post-request cleanup for websocket upstream request");
-    return NGX_ERROR;
-  }
-  cln->data = d;
-  cln->handler = (ngx_http_cleanup_pt )clean_upstream_sr_tmp_pools;
   
   return NGX_OK;
 }
 
-static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, ngx_pool_t *fb_pool) {
+static void send_next_publish_subrequest(full_subscriber_t *fsub) {
+  nchan_pub_upstream_stuff_t        *sup = fsub->publish_upstream;
+  nchan_pub_upstream_request_data_t *scur;
+  ngx_http_request_t                *sr;
+  
+  if(!sup || !sup->upstream_request_data_head) return;
+  
+  scur = sup->upstream_request_data_head;
+  
+  //typedef ngx_int_t (*subrequest_callback_pt)(subscriber_t *sub, ngx_http_request_t *r, ngx_int_t rc, void *);
+  
+  sr = subscriber_subrequest(&fsub->sub, &sup->request_url, &scur->body_buf, websocket_publisher_upstream_handler, scur);
+  scur->sr = sr;
+  scur->sent = 1;
+  ngx_http_run_posted_requests(fsub->sub.request->connection);
+}
+
+static void clean_after_upstream_response(full_subscriber_t *fsub, ngx_int_t force) {
+  nchan_pub_upstream_stuff_t   *sup = fsub->publish_upstream;
+  if(sup) 
+    DBG("running_upstream_request_count %i", sup->running_upstream_request_count);
+  if(sup && (sup->upstream_request_data_head == NULL || force)) {
+    if(!force) assert(sup->running_upstream_request_count == 0);
+    ngx_http_cleanup_t *cln = fsub->sub.request->cleanup;
+    while(cln && cln != fsub->cln) {
+      if (cln->handler) {
+        DBG("run handler");
+        cln->handler(cln->data);
+      }
+      cln = cln->next;
+    }
+    fsub->sub.request->cleanup = cln;
+    
+    //no need for tmp_pool anymore
+    if(sup->temp_request_pool) {
+      ngx_destroy_pool(sup->temp_request_pool);
+      fsub->sub.request->pool = sup->real_request_pool;
+      sup->temp_request_pool = NULL;
+    }
+  }
+}
+
+static void upstream_subrequest_ev_handler(ngx_event_t *ev) {
+  full_subscriber_t            *fsub = ev->data;
+  send_next_publish_subrequest(fsub);
+  clean_after_upstream_response(fsub, 0);
+  //assert(fsub->sub.request->write_event_handler == ws_request_empty_handler);
+}
+
+static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf) {
   static ngx_str_t         nopublishing = ngx_string("Publishing not allowed.");
-  static ngx_str_t         POST_REQUEST_STRING = {4, (u_char *)"POST "};
   
   if(!fsub->sub.cf->pub.websocket) {
     return websocket_send_close_frame(fsub, CLOSE_POLICY_VIOLATION, &nopublishing);
@@ -467,111 +585,59 @@ static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, ngx_
   ERR("ws request pool size: %V", ngx_http_debug_pool_str(fsub->sub.request->pool));
 #endif
   
-  ngx_http_complex_value_t        *publisher_upstream_request_url_ccv;
-  
-  publisher_upstream_request_url_ccv = fsub->sub.cf->publisher_upstream_request_url;
-  if(publisher_upstream_request_url_ccv == NULL) {
+  if(fsub->publish_upstream == NULL) { // don't need to send request upstream
     websocket_publish_continue(fsub, buf);
   }
   else {
-    nchan_pub_upstream_stuff_t    *psr_stuff;
-    ngx_http_post_subrequest_t    *psr;
-    nchan_pub_upstream_data_t     *psrd;
-    ngx_http_request_t            *r = fsub->sub.request;
-    ngx_http_request_t            *sr;
-    ngx_http_request_body_t       *fakebody;
-    ngx_chain_t                   *fakebody_chain;
-    ngx_buf_t                     *fakebody_buf;
-    size_t                         sz;
+    nchan_pub_upstream_request_data_t *psrd;
+    ngx_http_request_t                *r = fsub->sub.request;
+    size_t                             sz;
+    ngx_pool_t                        *tmp_pool;
+    nchan_pub_upstream_stuff_t        *sup = fsub->publish_upstream;
+    if(!sup->temp_request_pool) {
+      //can't use the client request's pool, it will bloat with every new upstream request
+      sup->temp_request_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, r->connection->log);
+      sup->real_request_pool = r->pool;
+      r->pool = sup->temp_request_pool;
+      //will set back to real request's pool at the end of this function
+    }
+    tmp_pool = fsub->publish_upstream->temp_request_pool;
     
-    if(!fb_pool) {
-      fb_pool = ngx_create_pool(1024, r->connection->log);
+    psrd = ngx_pcalloc(tmp_pool, sizeof(*psrd));
+    
+    if(sup->upstream_request_data_tail) {
+     sup->upstream_request_data_tail->next = psrd;
+    }
+    sup->upstream_request_data_tail = psrd;
+    if(!sup->upstream_request_data_head) {
+     sup->upstream_request_data_head = psrd;
     }
     
-    if((psr_stuff = ngx_palloc(fb_pool, sizeof(*psr_stuff))) == NULL) {
-      ERR("can't allocate memory for publisher auth subrequest");
-      websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL);
-      return NGX_ERROR;
-    }
+    psrd->next = NULL;
+    psrd->sent = 0;
+    psrd->fsub = fsub;
     
-    if(fsub->upstream_stuff) {
-     fsub->upstream_stuff->prev = psr_stuff;
-    }
-    psr_stuff->next = fsub->upstream_stuff;
-    psr_stuff->prev = NULL;
-    fsub->upstream_stuff = psr_stuff;
+    //copy body out of the websocket framebuffer to the upstream temp pool buffer
+    sz = ngx_buf_size(buf);
+    psrd->body_buf = *buf;
+    psrd->body_buf.start = ngx_palloc(tmp_pool, sz);
+    ngx_memcpy(psrd->body_buf.start, buf->start, sz);
+    psrd->body_buf.end = psrd->body_buf.start + sz;
+    psrd->body_buf.pos = psrd->body_buf.start;
+    psrd->body_buf.last = psrd->body_buf.end;
     
-    psr = &psr_stuff->psr;
-    psr->data = psr_stuff;
-    psr->handler = websocket_publisher_upstream_handler;
-    psr_stuff->psr_data.fsub = fsub;
-    
-    psr_stuff->psr_data.tmp_pool = NULL;
-    
-    ngx_http_complex_value(r, publisher_upstream_request_url_ccv, &psr_stuff->psr_data.upstream_request_url); 
-    
-    psrd = &fsub->upstream_stuff->psr_data;
-    psr = &fsub->upstream_stuff->psr;
-    
-    if(psrd->tmp_pool) {
-      //previous upstream request's pool
-      ngx_destroy_pool(psrd->tmp_pool);
-      psrd->tmp_pool = NULL;
-    }
-    
-    psrd->framebuf_pool = fb_pool;
-    
-    psrd->buf = *buf;
-    psrd->original_pool = r->pool;
-    psrd->original_cleanup = r->cleanup;
-    r->cleanup = NULL;
-    
-    psrd->tmp_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, r->connection->log);
-    
-    r->pool = psrd->tmp_pool;
     //ERR("request %p tmp pool %p", r, r->pool);
     
-    fakebody = ngx_pcalloc(r->pool, sizeof(*fakebody));
-    if(ngx_buf_size(buf) > 0) {
-      fakebody_chain = ngx_palloc(r->pool, sizeof(*fakebody_chain));
-      fakebody_buf = ngx_palloc(r->pool, sizeof(*fakebody_buf));
-      fakebody->bufs = fakebody_chain;
-      fakebody_chain->next = NULL;
-      fakebody_chain->buf = fakebody_buf;
-      init_msg_buf(fakebody_buf);
-      
-      //just copy the buffer contents. it's inefficient but I don't care at the moment.
-      //this can and should be optimized later
-      sz = ngx_buf_size(buf);
-      fakebody_buf->start = ngx_palloc(r->pool, sz); //huuh?
-      ngx_memcpy(fakebody_buf->start, buf->start, sz);
-      fakebody_buf->end = fakebody_buf->start + sz;
-      fakebody_buf->pos = fakebody_buf->start;
-      fakebody_buf->last = fakebody_buf->end;
-    }
-    else {
-      sz = 0;
-    }
     
-    ngx_http_subrequest(r, &psrd->upstream_request_url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
-    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, fakebody, sz, NULL);
-    
-    /*
-    //http request sudden close cleanup
-    if((psrd->cln = ngx_http_cleanup_add(sr, 0)) == NULL) {
-      ERR("Unable to add request cleanup for websocket upstream request");
-      return NGX_ERROR;
+    sup->running_upstream_request_count++;
+    if(!sup->upstream_subrequest_ev.timer_set) {
+      ngx_add_timer(&sup->upstream_subrequest_ev, 0);
     }
-    psrd->cln->data = fsub;
-    psrd->cln->handler = (ngx_http_cleanup_pt )sudden_upstream_request_abort_handler;
-    */
   }
   
   return NGX_OK;
 }
 
-static void empty_handler() { }
-
 static void websocket_init_frame(ws_frame_t *frame) {
   ngx_memzero(frame, sizeof(*frame)); 
   frame->step = WEBSOCKET_READ_START_STEP;
@@ -585,17 +651,21 @@ static void *framebuf_alloc(void *pd) {
 
 static void closing_ev_handler(ngx_event_t *ev) {
   full_subscriber_t *fsub = (full_subscriber_t *)ev->data;
-  ngx_http_finalize_request(fsub->sub.request, NGX_OK);
+  DBG("closing_ev timer handler for %p, delayed", fsub);
+  //fsub->connected = 0;
+  //fsub->sub.status = DEAD;
+  websocket_finalize_request(fsub);
 }
 
 subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
   nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  char                 *err;
   
   DBG("create for req %p", r);
-  full_subscriber_t  *fsub;
+  full_subscriber_t  *fsub = NULL;
   if((fsub = ngx_alloc(sizeof(*fsub), ngx_cycle->log)) == NULL) {
-    ERR("Unable to allocate");
-    return NULL;
+    err="Unable to allocate";
+    goto fail;
   }
   
   nchan_subscriber_init(&fsub->sub, &new_websocket_sub, r, msg_id);
@@ -608,6 +678,7 @@ subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t
   fsub->connected = 0;
   fsub->awaiting_pong = 0;
   fsub->closing = 0;
+  fsub->already_sent_unsub_request = 0;
   ngx_memzero(&fsub->ping_ev, sizeof(fsub->ping_ev));
   nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->timeout_ev);
   fsub->dequeue_handler = empty_handler;
@@ -632,14 +703,26 @@ subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t
     fsub->publish_channel_id = nchan_get_channel_id(r, PUB, 0);
   }
   
-  fsub->upstream_stuff = NULL;
+  if(fsub->sub.cf->publisher_upstream_request_url) {
+    if((fsub->publish_upstream = ngx_pcalloc(r->pool, sizeof(*fsub->publish_upstream))) == NULL) {
+      err="Unable to allocate websocket upstream stuff";
+      goto fail;
+    }
+    nchan_init_timer(&fsub->publish_upstream->upstream_subrequest_ev, upstream_subrequest_ev_handler, fsub);
+    ngx_http_complex_value(r, fsub->sub.cf->publisher_upstream_request_url, &fsub->publish_upstream->request_url);
+    
+    
+  }
+  else {
+    fsub->publish_upstream = NULL;
+  }
   
   websocket_init_frame(&fsub->frame);
   
   //http request sudden close cleanup
   if((fsub->cln = ngx_http_cleanup_add(r, 0)) == NULL) {
-    ERR("Unable to add request cleanup for websocket subscriber");
-    return NULL;
+    err = "Unable to add request cleanup for websocket subscriber";
+    goto fail;
   }
   fsub->cln->data = fsub;
   fsub->cln->handler = (ngx_http_cleanup_pt )sudden_abort_handler;
@@ -662,26 +745,22 @@ subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t
   nchan_bufchain_pool_init(ctx->bcp, r->pool);
   
   return &fsub->sub;
+  
+  
+fail: 
+  if(fsub) {
+    ngx_free(fsub);
+  }
+  ERR("%s", (u_char *)err);
+  return NULL;
 }
 
 ngx_int_t websocket_subscriber_destroy(subscriber_t *sub) {
   full_subscriber_t            *fsub = (full_subscriber_t  *)sub;
-  nchan_pub_upstream_stuff_t   *up_cur, *up_next;
   
   if(!fsub->awaiting_destruction) {
     fsub->ctx->sub = NULL;
   }
-  
-  for(up_cur = fsub->upstream_stuff; up_cur != NULL; up_cur = up_next) {
-    up_next = up_cur->next;
-    if(up_cur->psr_data.tmp_pool) {
-      ngx_destroy_pool(up_cur->psr_data.tmp_pool);
-    }
-    
-    if(up_cur->psr_data.framebuf_pool) {
-      ngx_destroy_pool(up_cur->psr_data.framebuf_pool);
-    }
-  }
    
   if(sub->reserved > 0) {
     DBG("%p not ready to destroy (reserved for %i) for req %p", sub, sub->reserved, fsub->sub.request);
@@ -692,8 +771,11 @@ ngx_int_t websocket_subscriber_destroy(subscriber_t *sub) {
 #if NCHAN_SUBSCRIBER_LEAK_DEBUG
     subscriber_debug_remove(&fsub->sub);
 #endif
+    clean_after_upstream_response(fsub, 0);
+    websocket_delete_timers(fsub);
     nchan_free_msg_id(&sub->last_msgid);
     //debug 
+    DBG("Begone, websocket %p", fsub);
     ngx_memset(fsub, 0x13, sizeof(*fsub));
     ngx_free(fsub);
   }
@@ -781,7 +863,7 @@ static void websocket_reading(ngx_http_request_t *r);
 static void ensure_request_hold(full_subscriber_t *fsub) {
   if(fsub->holding == 0) {
     fsub->sub.request->read_event_handler = websocket_reading;
-    fsub->sub.request->write_event_handler = ngx_http_request_empty_handler;
+    fsub->sub.request->write_event_handler = ws_request_empty_handler;
     fsub->sub.request->main->count++; //this is the right way to hold and finalize the
     fsub->holding = 1;
   }
@@ -802,14 +884,14 @@ static ngx_int_t websocket_reserve(subscriber_t *self) {
   full_subscriber_t  *fsub = (full_subscriber_t  *)self;
   ensure_request_hold(fsub);
   self->reserved++;
-  DBG("%p reserve for req %p. reservations: %i", self, fsub->sub.request, self->reserved);
+  //DBG("%p reserve for req %p. reservations: %i", self, fsub->sub.request, self->reserved);
   return NGX_OK;
 }
 static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy) {
   full_subscriber_t  *fsub = (full_subscriber_t  *)self;
   assert(self->reserved > 0);
   self->reserved--;
-  DBG("%p release for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
+  //DBG("%p release for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
   if(nodestroy == 0 && fsub->awaiting_destruction == 1 && self->reserved == 0) {
     websocket_subscriber_destroy(self);
     return NGX_ABORT;
@@ -825,7 +907,8 @@ static void ping_ev_handler(ngx_event_t *ev) {
     ev->timedout=0;
     if(fsub->awaiting_pong) {
       //never got a PONG back
-      ngx_http_finalize_request(fsub->sub.request, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+      //NGX_HTTP_CLIENT_CLOSED_REQUEST?
+      websocket_finalize_request(fsub);
     }
     else {
       fsub->awaiting_pong = 1;
@@ -855,17 +938,7 @@ static ngx_int_t websocket_enqueue(subscriber_t *self) {
   return NGX_OK;
 }
 
-static ngx_int_t websocket_dequeue(subscriber_t *self) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  DBG("%p dequeue", self);
-  fsub->dequeue_handler(&fsub->sub, fsub->dequeue_handler_data);
-  self->enqueued = 0;
-  
-  if(fsub->connected) {
-    ngx_str_t          close_msg = ngx_string("410 Gone");
-    websocket_send_close_frame(fsub, CLOSE_NORMAL, &close_msg);
-  }
-  
+static void websocket_delete_timers(full_subscriber_t *fsub) {
   if(fsub->ping_ev.timer_set) {
     ngx_del_timer(&fsub->ping_ev);
   }
@@ -877,6 +950,26 @@ static ngx_int_t websocket_dequeue(subscriber_t *self) {
   if(fsub->timeout_ev.timer_set) {
     ngx_del_timer(&fsub->timeout_ev);
   }
+  if(fsub->publish_upstream) {
+    if(fsub->publish_upstream->upstream_subrequest_ev.timer_set) {
+      ngx_del_timer(&fsub->publish_upstream->upstream_subrequest_ev);
+    }
+  }
+}
+
+static ngx_int_t websocket_dequeue(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  DBG("%p dequeue", self);
+  fsub->dequeue_handler(&fsub->sub, fsub->dequeue_handler_data);
+  
+  self->enqueued = 0;
+  
+  if(fsub->connected) {
+    ngx_str_t          close_msg = ngx_string("410 Gone");
+    websocket_send_close_frame(fsub, CLOSE_NORMAL, &close_msg);
+  }
+  
+  websocket_delete_timers(fsub);
   
   if(self->destroy_after_dequeue) {
     websocket_subscriber_destroy(self);
@@ -898,10 +991,13 @@ static ngx_int_t ws_recv(ngx_connection_t *c, ngx_event_t *rev, ngx_buf_t *buf,
   if (n == NGX_AGAIN) {
     return NGX_AGAIN;
   }
-
-  if ((n == NGX_ERROR) || (n == 0)) {
+  else if (n == NGX_ERROR || rev->eof) {
     return NGX_ERROR;
   }
+  else if (n == 0) {
+    return NGX_DONE;
+  }
+  
   buf->pos = buf->last;
   buf->last += n;
 
@@ -933,6 +1029,26 @@ static void set_buffer(ngx_buf_t *buf, u_char *start, u_char *last, ssize_t len)
   buf->memory = 1;
 }
 
+#define maybe_close_pool(pool) \
+  if (pool != NULL) {          \
+    ngx_destroy_pool(pool);    \
+    pool = NULL;               \
+  }
+
+static void websocket_reading_finalize(ngx_http_request_t *r, ngx_pool_t *temp_pool) {
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
+  
+  maybe_close_pool(temp_pool);
+  
+  //fsub->connected = 0;
+  //fsub->sub.status = DEAD;
+  if(fsub) {
+    websocket_delete_timers(fsub);
+    websocket_finalize_request(fsub);
+  }
+}
+  
 /* based on code from push stream module, written by
  * Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  * thanks, guys!
@@ -948,19 +1064,22 @@ static void websocket_reading(ngx_http_request_t *r) {
   ngx_pool_t                 *temp_pool = NULL;
   int                         free_temp_pool = 1;
   ngx_buf_t                   msgbuf;
+  //ngx_str_t                   msg_in_str;
   int                         close_code;
   ngx_str_t                   close_reason;
   
   set_buffer(&buf, frame->header, frame->last, 8);
 
-  //ERR("fsub: %p, frame: %p", fsub, frame);
+  //DBG("websocket_reading fsub: %p, frame: %p", fsub, frame);
   
   c = r->connection;
   rev = c->read;
 
   for (;;) {
-    if (c->error || c->timedout || c->close || c->destroyed || rev->closed || rev->eof) {
-      goto finalize;
+    if (c->error || c->timedout || c->close || c->destroyed || rev->closed || rev->eof || rev->pending_eof) {
+      //ERR("c->error %i c->timedout %i c->close %i c->destroyed %i rev->closed %i rev->eof %i", c->error, c->timedout, c->close, c->destroyed, rev->closed, rev->eof);
+      fsub->connected = 0;
+      return websocket_reading_finalize(r, temp_pool);
     }
     
     switch (frame->step) {
@@ -1019,7 +1138,7 @@ static void websocket_reading(ngx_http_request_t *r) {
       case WEBSOCKET_READ_GET_PAYLOAD_STEP:
         if ((frame->opcode != WEBSOCKET_OPCODE_TEXT) && (frame->opcode != WEBSOCKET_OPCODE_CLOSE) && (frame->opcode != WEBSOCKET_OPCODE_PING) && (frame->opcode != WEBSOCKET_OPCODE_PONG)) {
           websocket_send_frame(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL);
-          goto finalize;
+          return websocket_reading_finalize(r, temp_pool);
         }
         
         if (frame->payload_len > 0) {
@@ -1027,11 +1146,11 @@ static void websocket_reading(ngx_http_request_t *r) {
           if (temp_pool == NULL) {
             if ((temp_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, r->connection->log)) == NULL) {
               ERR("unable to allocate memory for temporary pool");
-              goto finalize;
+              return websocket_reading_finalize(r, temp_pool);
             }
             if ((frame->payload = ngx_pcalloc(temp_pool, frame->payload_len)) == NULL) {
               ERR("unable to allocate memory for payload");
-              goto finalize;
+              return websocket_reading_finalize(r, temp_pool);
             }
             frame->last = frame->payload;
           }
@@ -1039,6 +1158,7 @@ static void websocket_reading(ngx_http_request_t *r) {
           set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
           
           if ((rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
+            ERR("ws_recv NOT OK when receiving payload");
             goto exit;
           }
           
@@ -1051,7 +1171,7 @@ static void websocket_reading(ngx_http_request_t *r) {
         switch(frame->opcode) {
           case WEBSOCKET_OPCODE_TEXT:
             if (!is_utf8(frame->payload, frame->payload_len)) {
-              goto finalize;
+              return websocket_reading_finalize(r, temp_pool);
             }
             //intentional fall-through
           case WEBSOCKET_OPCODE_BINARY:
@@ -1062,12 +1182,12 @@ static void websocket_reading(ngx_http_request_t *r) {
             msgbuf.end = msgbuf.start + frame->payload_len;
             msgbuf.last = msgbuf.end;
             
-            //DBG("we got data %V", &msg_in_str);
+            //msg_in_str.data = msgbuf.pos;
+            //msg_in_str.len = frame->payload_len;
             
-            websocket_publish(fsub, &msgbuf, temp_pool);
-            if(fsub->upstream_stuff) {
-              free_temp_pool = 0;
-            }
+            //ERR("we got data %V", &msg_in_str);
+            
+            websocket_publish(fsub, &msgbuf);
             break;
           
           case WEBSOCKET_OPCODE_PING:
@@ -1080,10 +1200,8 @@ static void websocket_reading(ngx_http_request_t *r) {
             if(fsub->awaiting_pong) {
               fsub->awaiting_pong = 0;
             }
-            else { //unexpected PONG. quit.
-              websocket_send_frame(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL);
-              goto finalize;
-            }
+            // unsolicited pongs are ok too as per 
+            // https://tools.ietf.org/html/rfc6455#page-37
             break;
             
           case WEBSOCKET_OPCODE_CLOSE:
@@ -1100,21 +1218,21 @@ static void websocket_reading(ngx_http_request_t *r) {
             }
             DBG("%p wants to close (code %i reason \"%V\")", fsub, close_code, &close_reason);
             websocket_send_close_frame(fsub, 0, NULL);
-            goto finalize;
+            maybe_close_pool(temp_pool);
+            return websocket_reading_finalize(r, temp_pool);
             break; //good practice?
         }
         if(free_temp_pool && temp_pool != NULL) {
           ngx_destroy_pool(temp_pool);
           temp_pool = NULL;
         }
-        return;
         
+        return websocket_reading(r);
         break;
         
       default:
-        ngx_log_debug(NGX_LOG_ERR, c->log, 0, "push stream module: unknown websocket step (%d)", frame->step);
-        goto finalize;
-        break;
+        nchan_log(NGX_LOG_ERR, c->log, 0, "unknown websocket step (%d)", frame->step);
+        return websocket_reading_finalize(r, temp_pool);
     }
     
     set_buffer(&buf, frame->header, NULL, 8);
@@ -1122,16 +1240,13 @@ static void websocket_reading(ngx_http_request_t *r) {
 
 exit:
   
-  if (temp_pool != NULL) {
-    ngx_destroy_pool(temp_pool);
-    temp_pool = NULL;
-  }
+  maybe_close_pool(temp_pool);
   if (rc == NGX_AGAIN) {
     frame->last = buf.last;
     if (!c->read->ready) {
       if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-        ngx_log_error(NGX_LOG_INFO, c->log, ngx_socket_errno, "push stream module: failed to restore read events");
-        goto finalize;
+        nchan_log(NGX_LOG_INFO, c->log, ngx_socket_errno, "websocket client: failed to restore read events");
+        return websocket_reading_finalize(r, temp_pool);
       }
     }
   }
@@ -1139,21 +1254,9 @@ exit:
   if (rc == NGX_ERROR) {
     rev->eof = 1;
     c->error = 1;
-    ngx_log_error(NGX_LOG_INFO, c->log, ngx_socket_errno, "push stream module: client closed prematurely connection");
-    goto finalize;
+    nchan_log(NGX_LOG_INFO, c->log, ngx_socket_errno, "websocket client prematurely closed connection");
+    return websocket_reading_finalize(r, temp_pool);
   }
-
-  return;
-
-finalize:
-
-  if (temp_pool != NULL) {
-    ngx_destroy_pool(temp_pool);
-    temp_pool = NULL;
-  }
-  
-  ngx_http_finalize_request(r, c->error ? NGX_HTTP_CLIENT_CLOSED_REQUEST : NGX_OK);
-  
 }
 
 
@@ -1269,11 +1372,13 @@ static ngx_chain_t *websocket_frame_header_chain(full_subscriber_t *fsub, const
 }
 
 static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *msg_chain) {
-  return nchan_output_filter(fsub->sub.request, websocket_frame_header_chain(fsub, opcode, len, msg_chain));
+  return ws_output_filter(fsub, websocket_frame_header_chain(fsub, opcode, len, msg_chain));
 }
 
 static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg_t *msg) {
   nchan_buf_and_chain_t *bc;
+  ngx_file_t            *file_copy;
+  ngx_buf_t             *chained_msgbuf;
   size_t                 sz = ngx_buf_size((msg->buf));
   if(fsub->ws_meta_subprotocol) {
     static ngx_str_t          id_line = ngx_string("id: ");
@@ -1314,16 +1419,19 @@ static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg
     
     //now the message
     *cur->buf = *msg->buf;
+    chained_msgbuf = cur->buf;
     assert(cur->next == NULL);
   }
   else {
     bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
     //message first
+    chained_msgbuf = &bc->buf;
     bc->buf = *msg->buf;
   }
   
   if(msg->buf->file) {
-    nchan_msg_buf_open_fd_if_needed(&bc->buf, nchan_bufchain_pool_reserve_file(fsub->ctx->bcp), NULL);
+    file_copy = nchan_bufchain_pool_reserve_file(fsub->ctx->bcp);
+    nchan_msg_buf_open_fd_if_needed(chained_msgbuf, file_copy, NULL);
   }
   
   //now the header
@@ -1331,11 +1439,11 @@ static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg
 }
 
 static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err) {
-  nchan_output_filter(fsub->sub.request, websocket_close_frame_chain(fsub, code, err));
+  ws_output_filter(fsub, websocket_close_frame_chain(fsub, code, err));
   fsub->connected = 0;
   if(fsub->closing == 1) {
     DBG("%p already sent close frame");
-    ngx_http_finalize_request(fsub->sub.request, NGX_OK);
+    websocket_finalize_request(fsub);
   }
   else {
     fsub->closing = 1;
@@ -1385,6 +1493,7 @@ static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_
   return hdr_chain;
 }
 
+
 static ngx_int_t websocket_respond_message(subscriber_t *self, nchan_msg_t *msg) {
   ngx_int_t        rc;
   full_subscriber_t         *fsub = (full_subscriber_t *)self;
@@ -1399,7 +1508,7 @@ static ngx_int_t websocket_respond_message(subscriber_t *self, nchan_msg_t *msg)
   update_subscriber_last_msg_id(self, msg);
   fsub->ctx->msg_id = self->last_msgid;
   
-  rc = nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
+  rc = ws_output_msg_filter(fsub, msg);
   
   return rc;
 }
@@ -1485,7 +1594,7 @@ static const subscriber_fn_t websocket_fn = {
   &websocket_reserve,
   &websocket_release,
   &nchan_subscriber_empty_notify,
-  &nchan_subscriber_authorize_subscribe
+  &nchan_subscriber_authorize_subscribe_request
 };
 
 static ngx_str_t     sub_name = ngx_string("websocket");
diff --git a/debian/modules/nchan/src/util/nchan_channel_info.c b/debian/modules/nchan/src/util/nchan_channel_info.c
index 8c7f6b7..5a4fbd1 100644
--- a/debian/modules/nchan/src/util/nchan_channel_info.c
+++ b/debian/modules/nchan/src/util/nchan_channel_info.c
@@ -92,12 +92,8 @@ ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages,
 ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid) {
   ngx_buf_t                      *b;
   ngx_str_t                      *content_type;
-  ngx_str_t                      *accept_header = NULL;
-  
-  if(r->headers_in.accept) {
-    accept_header = &r->headers_in.accept->value;
-  }
-  
+  ngx_str_t                      *accept_header = nchan_get_accept_header_value(r);
+
   b = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, &content_type);
   
   return nchan_respond_membuf(r, NGX_HTTP_OK, content_type, b, 0);
@@ -123,11 +119,10 @@ ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_req
     else if (status_code == NGX_HTTP_ACCEPTED) {
       ngx_memcpy(&r->headers_out.status_line, &ACCEPTED_LINE, sizeof(ngx_str_t));
     }
-    nchan_channel_info(r, messages, subscribers, last_seen, msgid);
+    return nchan_channel_info(r, messages, subscribers, last_seen, msgid);
   }
   else {
     //404!
-    nchan_respond_status(r, NGX_HTTP_NOT_FOUND, NULL, 0);
+    return nchan_respond_status(r, NGX_HTTP_NOT_FOUND, NULL, 0);
   }
-  return NGX_OK;
 }
diff --git a/debian/modules/nchan/src/util/nchan_fake_request.c b/debian/modules/nchan/src/util/nchan_fake_request.c
new file mode 100644
index 0000000..5a36501
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_fake_request.c
@@ -0,0 +1,277 @@
+#include <nchan_module.h>
+#include "nchan_fake_request.h"
+
+//fake request and connection code adapted from lua-nginx-module by agentzh
+
+static void nchan_close_fake_request(ngx_http_request_t *r);
+
+ngx_connection_t *nchan_create_fake_connection(ngx_pool_t *pool) {
+  ngx_log_t               *log;
+  ngx_connection_t        *c;
+  ngx_connection_t        *saved_c = NULL;
+
+  /* (we temporarily use a valid fd (0) to make ngx_get_connection happy) */
+  if (ngx_cycle->files) {
+      saved_c = ngx_cycle->files[0];
+  }
+
+  c = ngx_get_connection(0, ngx_cycle->log);
+
+  if (ngx_cycle->files) {
+    ngx_cycle->files[0] = saved_c;
+  }
+
+  if (c == NULL) {
+    return NULL;
+  }
+
+  c->fd = (ngx_socket_t) -1;
+  c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+
+  if (pool) {
+    c->pool = pool;
+  } 
+  else {
+    c->pool = ngx_create_pool(128, c->log);
+    if (c->pool == NULL) {
+      goto failed;
+    }
+  }
+
+  log = ngx_pcalloc(c->pool, sizeof(ngx_log_t));
+  if (log == NULL) {
+      goto failed;
+  }
+
+  c->log = log;
+  c->log->connection = c->number;
+  c->log->action = NULL;
+  c->log->data = NULL;
+
+  c->log_error = NGX_ERROR_INFO;
+
+  c->error = 1;
+
+  return c;
+
+failed:
+
+  nchan_close_fake_connection(c);
+  return NULL;
+}
+
+void nchan_close_fake_connection(ngx_connection_t *c) {
+  ngx_pool_t          *pool;
+  ngx_connection_t    *saved_c = NULL;
+
+  ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                  "http close fake http connection %p", c);
+
+  c->destroyed = 1;
+
+  pool = c->pool;
+
+  if (c->read->timer_set) {
+    ngx_del_timer(c->read);
+  }
+
+  if (c->write->timer_set) {
+    ngx_del_timer(c->write);
+  }
+
+  c->read->closed = 1;
+  c->write->closed = 1;
+
+  /* we temporarily use a valid fd (0) to make ngx_free_connection happy */
+
+  c->fd = 0;
+
+  if (ngx_cycle->files) {
+    saved_c = ngx_cycle->files[0];
+  }
+
+  ngx_free_connection(c);
+
+  c->fd = (ngx_socket_t) -1;
+
+  if (ngx_cycle->files) {
+    ngx_cycle->files[0] = saved_c;
+  }
+
+  if (pool) {
+    ngx_destroy_pool(pool);
+  }
+}
+
+ngx_http_request_t *nchan_create_fake_request(ngx_connection_t *c) {
+  ngx_http_request_t      *r;
+
+  r = ngx_pcalloc(c->pool, sizeof(ngx_http_request_t));
+  if (r == NULL) {
+    return NULL;
+  }
+
+  c->requests++;
+
+  r->pool = c->pool;
+
+#if 0
+  hc = ngx_pcalloc(c->pool, sizeof(ngx_http_connection_t));
+  if (hc == NULL) {
+      goto failed;
+  }
+
+  r->header_in = c->buffer;
+  r->header_end = c->buffer->start;
+
+  if (ngx_list_init(&r->headers_out.headers, r->pool, 0,
+                    sizeof(ngx_table_elt_t))
+      != NGX_OK)
+  {
+      goto failed;
+  }
+
+  if (ngx_list_init(&r->headers_in.headers, r->pool, 0,
+                    sizeof(ngx_table_elt_t))
+      != NGX_OK)
+  {
+      goto failed;
+  }
+#endif
+
+  r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
+  if (r->ctx == NULL) {
+      return NULL;
+  }
+
+#if 0
+  cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+  r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts
+                              * sizeof(ngx_http_variable_value_t));
+  if (r->variables == NULL) {
+      goto failed;
+  }
+#endif
+
+  r->connection = c;
+
+  r->headers_in.content_length_n = 0;
+  c->data = r;
+#if 0
+  hc->request = r;
+  r->http_connection = hc;
+#endif
+  r->signature = NGX_HTTP_MODULE;
+  r->main = r;
+  r->count = 1;
+
+  r->method = NGX_HTTP_UNKNOWN;
+
+  r->headers_in.keep_alive_n = -1;
+  r->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
+  r->subrequests = NGX_HTTP_MAX_SUBREQUESTS + 1;
+
+  r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
+  r->discard_body = 1;
+
+  return r;
+}
+
+void nchan_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc) {
+  ngx_connection_t          *c;
+#if (NGX_HTTP_SSL)
+  ngx_ssl_conn_t            *ssl_conn;
+#endif
+
+  c = r->connection;
+
+  ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                  "http finalize fake request: %d, a:%d, c:%d",
+                  rc, r == c->data, r->main->count);
+
+  if (rc == NGX_DONE) {
+      nchan_close_fake_request(r);
+      return;
+  }
+
+  if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+
+#if (NGX_HTTP_SSL)
+
+    if (r->connection->ssl) {
+        ssl_conn = r->connection->ssl->connection;
+        if (ssl_conn) {
+          c = ngx_ssl_get_connection(ssl_conn);
+        }
+    }
+
+#endif
+
+    nchan_close_fake_request(r);
+    return;
+  }
+
+  if (c->read->timer_set) {
+    ngx_del_timer(c->read);
+  }
+
+  if (c->write->timer_set) {
+    c->write->delayed = 0;
+    ngx_del_timer(c->write);
+  }
+
+  nchan_close_fake_request(r);
+}
+
+static void nchan_close_fake_request(ngx_http_request_t *r) {
+  ngx_connection_t  *c;
+
+  r = r->main;
+  c = r->connection;
+
+  ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                  "http fake request count:%d", r->count);
+
+  if (r->count == 0) {
+    ngx_log_error(NGX_LOG_ALERT, c->log, 0, "http fake request count is zero");
+  }
+
+  r->count--;
+
+  if (r->count) {
+    return;
+  }
+
+  nchan_free_fake_request(r);
+  nchan_close_fake_connection(c);
+}
+
+void nchan_free_fake_request(ngx_http_request_t *r) {
+  ngx_log_t                 *log;
+  ngx_http_cleanup_t        *cln;
+
+  log = r->connection->log;
+
+  ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "http close fake request");
+
+  if (r->pool == NULL) {
+    ngx_log_error(NGX_LOG_ALERT, log, 0, "http fake request already closed");
+    return;
+  }
+
+  cln = r->cleanup;
+  r->cleanup = NULL;
+
+  while (cln) {
+    if (cln->handler) {
+      cln->handler(cln->data);
+    }
+
+    cln = cln->next;
+  }
+
+  r->request_line.len = 0;
+
+  r->connection->destroyed = 1;
+}
diff --git a/debian/modules/nchan/src/util/nchan_fake_request.h b/debian/modules/nchan/src/util/nchan_fake_request.h
new file mode 100644
index 0000000..2097aaa
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_fake_request.h
@@ -0,0 +1,6 @@
+
+ngx_connection_t *nchan_create_fake_connection(ngx_pool_t *pool);
+void nchan_close_fake_connection(ngx_connection_t *c);
+ngx_http_request_t *nchan_create_fake_request(ngx_connection_t *c);
+void nchan_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc);
+void nchan_free_fake_request(ngx_http_request_t *r);
diff --git a/debian/modules/nchan/src/util/nchan_output.c b/debian/modules/nchan/src/util/nchan_output.c
index fb9da38..31e2924 100644
--- a/debian/modules/nchan/src/util/nchan_output.c
+++ b/debian/modules/nchan/src/util/nchan_output.c
@@ -174,7 +174,7 @@ static void nchan_flush_pending_output(ngx_http_request_t *r) {
     if (!wev->delayed) {
       ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "request timed out");
       c->timedout = 1;
-      ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
+      nchan_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
       return;
     }
     wev->timedout = 0;
@@ -183,7 +183,7 @@ static void nchan_flush_pending_output(ngx_http_request_t *r) {
     if (!wev->ready) {
       ngx_add_timer(wev, clcf->send_timeout);
       if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-        ngx_http_finalize_request(r, 0);
+        nchan_http_finalize_request(r, 0);
       }
       return;
     }
@@ -192,7 +192,7 @@ static void nchan_flush_pending_output(ngx_http_request_t *r) {
   if (wev->delayed || r->aio) {
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer delayed");
     if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-      ngx_http_finalize_request(r, 0);
+      nchan_http_finalize_request(r, 0);
     }
     return;
   }
@@ -202,7 +202,7 @@ static void nchan_flush_pending_output(ngx_http_request_t *r) {
   //ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, "http writer output filter: %d, \"%V?%V\"", rc, &r->uri, &r->args);
 
   if (rc == NGX_ERROR) {
-    ngx_http_finalize_request(r, rc);
+    nchan_http_finalize_request(r, rc);
     return;
   }
 
@@ -211,7 +211,7 @@ static void nchan_flush_pending_output(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, 0);
+      nchan_http_finalize_request(r, 0);
       return;
     }
   }
@@ -319,7 +319,7 @@ ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, con
   
   rc= ngx_http_send_header(r);
   if(finalize) {
-    ngx_http_finalize_request(r, rc);
+    nchan_http_finalize_request(r, rc);
   }
   return rc;
 }
@@ -521,7 +521,7 @@ ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_i
   }
   
   if(finalize) {
-    ngx_http_finalize_request(r, rc);
+    nchan_http_finalize_request(r, rc);
   }
   return rc;
 }
@@ -564,12 +564,13 @@ ngx_int_t nchan_respond_string(ngx_http_request_t *r, ngx_int_t status_code, con
     b->end = body->data + body->len;
     b->last = b->end;
     
-    ngx_http_send_header(r);
-    rc= nchan_output_filter(r, chain);
+    if ((rc = ngx_http_send_header(r)) == NGX_OK) {
+      rc= nchan_output_filter(r, chain);
+    }
   }
   
   if(finalize) {
-    ngx_http_finalize_request(r, rc);
+    nchan_http_finalize_request(r, rc);
   }
   return rc;
 }
@@ -606,96 +607,13 @@ ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allow_or
   return nchan_respond_status(r, NGX_HTTP_OK, NULL, 0);
 }
 
-/*
-
-void nchan_copy_preallocated_buffer(ngx_buf_t *buf, ngx_buf_t *cbuf) {
-  if (cbuf!=NULL) {
-    ngx_memcpy(cbuf, buf, sizeof(*buf)); //overkill?
-    if(buf->temporary || buf->memory) { //we don't want to copy mmpapped memory, so no ngx_buf_in_momory(buf)
-      cbuf->pos = (u_char *) (cbuf+1);
-      cbuf->last = cbuf->pos + ngx_buf_size(buf);
-      cbuf->start=cbuf->pos;
-      cbuf->end = cbuf->start + ngx_buf_size(buf);
-      ngx_memcpy(cbuf->pos, buf->pos, ngx_buf_size(buf));
-      cbuf->memory=ngx_buf_in_memory_only(buf) ? 1 : 0;
-    }
-    if (buf->file!=NULL) {
-      cbuf->file = (ngx_file_t *) (cbuf+1) + ((buf->temporary || buf->memory) ? ngx_buf_size(buf) : 0);
-      cbuf->file->fd=buf->file->fd;
-      cbuf->file->log=ngx_cycle->log;
-      cbuf->file->offset=buf->file->offset;
-      cbuf->file->sys_offset=buf->file->sys_offset;
-      cbuf->file->name.len=buf->file->name.len;
-      cbuf->file->name.data=(u_char *) (cbuf->file+1);
-      ngx_memcpy(cbuf->file->name.data, buf->file->name.data, buf->file->name.len);
-    }
+void nchan_http_finalize_request(ngx_http_request_t *r, ngx_int_t code) {
+  if(r->connection && r->connection->write->error) {
+    r->write_event_handler = NULL;
+    //this will close the connection when request is finalized
+    ngx_http_finalize_request(r, NGX_ERROR);
+  }
+  else {
+    ngx_http_finalize_request(r, code);
   }
 }
-
-#define NGX_HTTP_BUF_ALLOC_SIZE(buf)                                         \
-(sizeof(*buf) +                                                              \
-(((buf)->temporary || (buf)->memory) ? ngx_buf_size(buf) : 0) +              \
-(((buf)->file!=NULL) ? (sizeof(*(buf)->file) + (buf)->file->name.len + 1) : 0))
-
-//buffer is _copied_
-ngx_chain_t * nchan_create_output_chain(ngx_buf_t *buf, ngx_pool_t *pool, ngx_log_t *log) {
-  ngx_chain_t                    *out;
-  ngx_file_t                     *file;
-  ngx_pool_cleanup_t             *cln = NULL;
-  ngx_pool_cleanup_file_t        *clnf = NULL;
-  if((out = ngx_pcalloc(pool, sizeof(*out)))==NULL) {
-    nchan_log(NGX_LOG_ERR, log, "can't create output chain, can't allocate chain  in pool");
-    return NULL;
-  }
-  ngx_buf_t                      *buf_copy;
-  
-  if((buf_copy = ngx_pcalloc(pool, NGX_HTTP_BUF_ALLOC_SIZE(buf)))==NULL) {
-    //TODO: don't zero the whole thing!
-    nchan_log(NGX_LOG_ERR, log, "can't create output chain, can't allocate buffer copy in pool");
-    return NULL;
-  }
-  nchan_copy_preallocated_buffer(buf, buf_copy);
-  
-  if (buf->file!=NULL) {
-    if(buf->mmap) { //just the mmap, please
-      buf->in_file=0;
-      buf->file=NULL;
-      buf->file_pos=0;
-      buf->file_last=0;
-    }
-    else {
-      file = buf_copy->file;
-      file->log=log;
-      if(file->fd==NGX_INVALID_FILE) {
-        //nchan_log(NGX_LOG_ERR, log, "opening invalid file at %s", file->name.data);
-        file->fd=ngx_open_file(file->name.data, NGX_FILE_RDONLY, NGX_FILE_OPEN, NGX_FILE_OWNER_ACCESS);
-      }
-      if(file->fd==NGX_INVALID_FILE) {
-        nchan_log(NGX_LOG_ERR, log, "can't create output chain, file in buffer is invalid");
-        return NULL;
-      }
-      else {
-        //close file on cleanup
-        if((cln = ngx_pool_cleanup_add(pool, sizeof(*clnf))) == NULL) {
-          ngx_close_file(file->fd);
-          file->fd=NGX_INVALID_FILE;
-          nchan_log(NGX_LOG_ERR, log, "can't create output chain file cleanup.");
-          return NULL;
-        }
-        cln->handler = ngx_pool_cleanup_file;
-        clnf = cln->data;
-        clnf->fd = file->fd;
-        clnf->name = file->name.data;
-        clnf->log = pool->log;
-      }
-    }
-  }
-  
-  
-  
-  buf_copy->last_buf = 1;
-  out->buf = buf_copy;
-  out->next = NULL;
-  return out;
-}
-*/
diff --git a/debian/modules/nchan/src/util/nchan_output.h b/debian/modules/nchan/src/util/nchan_output.h
index 5e585d5..f145cfd 100644
--- a/debian/modules/nchan/src/util/nchan_output.h
+++ b/debian/modules/nchan/src/util/nchan_output.h
@@ -17,6 +17,8 @@ ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allow_or
 ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_id_t *msgid, ngx_int_t finalize, char **err);
 void nchan_include_access_control_if_needed(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
 
+void nchan_http_finalize_request(ngx_http_request_t *r, ngx_int_t code);
+
 ngx_fd_t nchan_fdcache_get(ngx_str_t *filename);
 
 ngx_int_t nchan_msg_buf_open_fd_if_needed(ngx_buf_t *buf, ngx_file_t *file, ngx_http_request_t *r);
diff --git a/debian/modules/nchan/src/util/nchan_reaper.c b/debian/modules/nchan/src/util/nchan_reaper.c
index 99d6801..25604ab 100644
--- a/debian/modules/nchan/src/util/nchan_reaper.c
+++ b/debian/modules/nchan/src/util/nchan_reaper.c
@@ -193,7 +193,7 @@ static ngx_inline void reap_ready_thing(nchan_reaper_t *rp, void *cur, void *nex
   
   assert(rp->count >= 0);
   verify_reaper_list(rp, cur);
-  DBG("reaped %s %p (waiting to be reaped: %l)", rp->name, cur, rp->count);
+  DBG("reaped %s %p (waiting to be reaped: %i)", rp->name, cur, rp->count);
 }
 
 static void its_reaping_time(nchan_reaper_t *rp, uint8_t force) {
diff --git a/debian/modules/nchan/src/util/nchan_reaper.h b/debian/modules/nchan/src/util/nchan_reaper.h
index 541389a..f737874 100644
--- a/debian/modules/nchan/src/util/nchan_reaper.h
+++ b/debian/modules/nchan/src/util/nchan_reaper.h
@@ -5,7 +5,7 @@ typedef enum {RESCAN, ROTATE, KEEP_PLACE} nchan_reaper_strategy_t;
 
 typedef struct {
   char                      *name;
-  int                        count;
+  ngx_int_t                  count;
   int                        next_ptr_offset;
   int                        prev_ptr_offset;
   void                      *last;
diff --git a/debian/modules/nchan/src/util/nchan_subrequest.c b/debian/modules/nchan/src/util/nchan_subrequest.c
index 7b3287e..02a7b0d 100644
--- a/debian/modules/nchan/src/util/nchan_subrequest.c
+++ b/debian/modules/nchan/src/util/nchan_subrequest.c
@@ -248,3 +248,20 @@ ngx_int_t nchan_recover_x_accel_redirected_request_method(ngx_http_request_t *r)
 #endif
   return NGX_OK;
 }
+
+size_t nchan_subrequest_content_length(ngx_http_request_t *sr) {
+  size_t                            len = 0;
+  ngx_http_upstream_headers_in_t   *headers_in = &sr->upstream->headers_in;
+  ngx_chain_t                      *chain;
+  if(headers_in->chunked || headers_in->content_length_n == -1) {
+    //count it
+    for(chain = sr->upstream->out_bufs; chain != NULL; chain = chain->next) {
+      len += ngx_buf_size((chain->buf));
+    }
+  }
+  else {
+    len = headers_in->content_length_n > 0 ? headers_in->content_length_n : 0;
+  }
+  
+  return len;
+}
diff --git a/debian/modules/nchan/src/util/nchan_subrequest.h b/debian/modules/nchan/src/util/nchan_subrequest.h
index 437b17d..356f4a4 100644
--- a/debian/modules/nchan/src/util/nchan_subrequest.h
+++ b/debian/modules/nchan/src/util/nchan_subrequest.h
@@ -1,2 +1,3 @@
 ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n, u_char *content_len_str);
+size_t nchan_subrequest_content_length(ngx_http_request_t *sr);
 ngx_int_t nchan_recover_x_accel_redirected_request_method(ngx_http_request_t *r);
diff --git a/debian/modules/nchan/src/util/nchan_util.c b/debian/modules/nchan/src/util/nchan_util.c
index 9a1b14c..cfbe8d1 100644
--- a/debian/modules/nchan/src/util/nchan_util.c
+++ b/debian/modules/nchan/src/util/nchan_util.c
@@ -121,6 +121,20 @@ ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name)
   return NULL;
 }
 
+ngx_str_t *nchan_get_accept_header_value(ngx_http_request_t *r) {
+#if (NGX_HTTP_HEADERS)  
+  if(r->headers_in.accept == NULL) {
+    return NULL;
+  }
+  else {
+    return &r->headers_in.accept->value;
+  }
+#else
+  ngx_str_t             accept_header_name = ngx_string("Accept");
+  return nchan_get_header_value(r, accept_header_name);
+#endif
+}
+
 static int nchan_strmatch_va_list(ngx_str_t *val, ngx_int_t n, va_list args) {
   u_char   *match;
   ngx_int_t i;
diff --git a/debian/modules/nchan/src/util/nchan_util.h b/debian/modules/nchan/src/util/nchan_util.h
index 5214ca2..f7ae941 100644
--- a/debian/modules/nchan/src/util/nchan_util.h
+++ b/debian/modules/nchan/src/util/nchan_util.h
@@ -1,6 +1,7 @@
 ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen);
 u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char);
 ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name);
+ngx_str_t *nchan_get_accept_header_value(ngx_http_request_t *r);
 ngx_buf_t *nchan_chain_to_single_buffer(ngx_pool_t *pool, ngx_chain_t *chain, size_t content_length);
 ngx_str_t *ngx_http_debug_pool_str(ngx_pool_t *pool);
 int nchan_strmatch(ngx_str_t *val, ngx_int_t n, ...);
diff --git a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
index f396ce7..98b6b8d 100644
--- a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
+++ b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
@@ -661,12 +661,12 @@ nchan_slab_alloc_pages(ngx_slab_pool_t *pool, ngx_uint_t pages)
             return page;
         }
     }
-
+#if nginx_version >= 1005003
     if (pool->log_nomem) {
         ngx_slab_error(pool, NGX_LOG_CRIT,
                        "ngx_slab_alloc() failed: no memory");
     }
-
+#endif
     return NULL;
 }
 
@@ -675,9 +675,12 @@ static void
 nchan_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
     ngx_uint_t pages)
 {
+#if nginx_version >= 1007002
     ngx_uint_t        type;
     ngx_slab_page_t  *prev, *join;
-
+#else
+    ngx_slab_page_t  *prev;
+#endif
     nchan_track_slab_reserved_pages(pool, -pages);
     
     page->slab = pages--;
@@ -691,6 +694,7 @@ nchan_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
         prev->next = page->next;
         page->next->prev = page->prev;
     }
+#if nginx_version >= 1007002
 
     join = page + page->slab;
 
@@ -744,6 +748,7 @@ nchan_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
     if (pages) {
         page[pages].prev = (uintptr_t) page;
     }
+#endif
 
     page->prev = (uintptr_t) &pool->free;
     page->next = pool->free.next;

From 6cbf84df651bf744b930d360ce951868f575ff92 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 20 Dec 2016 16:29:48 +0200
Subject: [PATCH 138/600] mod: Upgrade nginx-lua to 0.10.7

---
 debian/modules/README.Modules-versions        |   2 +-
 debian/modules/nginx-lua/README.markdown      | 331 +++++++----
 debian/modules/nginx-lua/config               |  18 +
 .../modules/nginx-lua/doc/HttpLuaModule.wiki  | 320 +++++++----
 .../nginx-lua/src/api/ngx_http_lua_api.h      |   5 +-
 .../modules/nginx-lua/src/ngx_http_lua_api.c  | 138 +++++
 .../nginx-lua/src/ngx_http_lua_common.h       |   6 +
 .../nginx-lua/src/ngx_http_lua_control.c      |   8 +-
 .../nginx-lua/src/ngx_http_lua_directive.c    |  16 +-
 .../nginx-lua/src/ngx_http_lua_headers_in.c   |  10 +-
 .../nginx-lua/src/ngx_http_lua_logby.c        |  37 ++
 .../nginx-lua/src/ngx_http_lua_module.c       |  97 +++-
 .../nginx-lua/src/ngx_http_lua_shdict.c       |  48 +-
 .../nginx-lua/src/ngx_http_lua_shdict.h       |  16 +-
 .../nginx-lua/src/ngx_http_lua_socket_tcp.c   | 124 +++-
 .../nginx-lua/src/ngx_http_lua_timer.c        |   2 +-
 .../nginx-lua/t/023-rewrite/tcp-socket.t      |   2 +-
 .../nginx-lua/t/023-rewrite/uthread-exit.t    |   2 +-
 debian/modules/nginx-lua/t/024-access/exec.t  |  24 +-
 .../nginx-lua/t/024-access/uthread-exit.t     |   2 +-
 debian/modules/nginx-lua/t/028-req-header.t   |  24 +-
 debian/modules/nginx-lua/t/043-shdict.t       |  27 +-
 debian/modules/nginx-lua/t/062-count.t        |   4 +-
 debian/modules/nginx-lua/t/094-uthread-exit.t |   2 +-
 .../nginx-lua/t/128-duplex-tcp-socket.t       |   4 +-
 .../nginx-lua/t/142-ssl-session-store.t       | 264 +++++++--
 .../nginx-lua/t/143-ssl-session-fetch.t       | 224 +++++---
 debian/modules/nginx-lua/t/146-malloc-trim.t  | 337 +++++++++++
 .../nginx-lua/t/147-tcp-socket-timeouts.t     | 534 ++++++++++++++++++
 .../modules/nginx-lua/t/148-fake-shm-zone.t   | 170 ++++++
 .../nginx-lua/t/149-hup-fake-shm-zone.t       |  91 +++
 .../nginx-lua/t/data/fake-shm-module/config   |   3 +
 .../ngx_http_lua_fake_shm_module.c            | 294 ++++++++++
 debian/modules/nginx-lua/util/build.sh        |   1 +
 34 files changed, 2697 insertions(+), 490 deletions(-)
 create mode 100644 debian/modules/nginx-lua/t/146-malloc-trim.t
 create mode 100644 debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t
 create mode 100644 debian/modules/nginx-lua/t/148-fake-shm-zone.t
 create mode 100644 debian/modules/nginx-lua/t/149-hup-fake-shm-zone.t
 create mode 100644 debian/modules/nginx-lua/t/data/fake-shm-module/config
 create mode 100644 debian/modules/nginx-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 957ac00..249c847 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -22,7 +22,7 @@ README for Modules versions
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
-  Version: v0.10.6
+  Version: v0.10.7
   Patch: openssl-1.1.0.patch
 
  nginx-upstream-fair
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/nginx-lua/README.markdown
index 8065060..3699a72 100644
--- a/debian/modules/nginx-lua/README.markdown
+++ b/debian/modules/nginx-lua/README.markdown
@@ -62,7 +62,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.6](https://github.com/openresty/lua-nginx-module/tags) released on 15 August 2016.
+This document describes ngx_lua [v0.10.7](https://github.com/openresty/lua-nginx-module/tags) released on 4 November 2016.
 
 Synopsis
 ========
@@ -585,10 +585,10 @@ and then accessing it from `nginx.conf`:
 ```nginx
 
  location /lua {
-     content_by_lua '
+     content_by_lua_block {
          local mydata = require "mydata"
          ngx.say(mydata.get_age("dog"))
-     ';
+     }
  }
 ```
 
@@ -685,9 +685,9 @@ The [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi]
 ```nginx
 
  location /foo {
-     content_by_lua '
+     content_by_lua_block {
          res = ngx.location.capture("/bar")
-     ';
+     }
  }
  location /bar {
      echo_location /blah;
@@ -859,9 +859,9 @@ servers in Lua. For example,
  datagram {
      server {
          listen 1953;
-         handler_by_lua '
+         handler_by_lua_block {
              -- custom Lua code implementing the special UDP server...
-         ';
+         }
      }
  }
 ```
@@ -946,7 +946,7 @@ To run specific test files:
 
 To run a specific test block in a particular test file, add the line `--- ONLY` to the test block you want to run, and then use the `prove` utility to run that `.t` file.
 
-There are also various testing modes based on mockeagain, valgrind, and etc. Refer to the [Test::Nginx documentation](http://search.cpan.org/perldoc?Test::Nginx) for more details for various advanced testing modes. See also the test reports for the Nginx test cluster running on Amazon EC2: <http://qa.openresty.org.>
+There are also various testing modes based on mockeagain, valgrind, and etc. Refer to the [Test::Nginx documentation](http://search.cpan.org/perldoc?Test::Nginx) for more details for various advanced testing modes. See also the test reports for the Nginx test cluster running on Amazon EC2: <http://qa.openresty.org>.
 
 [Back to TOC](#table-of-contents)
 
@@ -1002,6 +1002,7 @@ Directives
 ==========
 
 * [lua_use_default_type](#lua_use_default_type)
+* [lua_malloc_trim](#lua_malloc_trim)
 * [lua_code_cache](#lua_code_cache)
 * [lua_regex_cache_max_entries](#lua_regex_cache_max_entries)
 * [lua_regex_match_limit](#lua_regex_match_limit)
@@ -1089,6 +1090,38 @@ This directive was first introduced in the `v0.9.1` release.
 
 [Back to TOC](#directives)
 
+lua_malloc_trim
+---------------
+**syntax:** *lua_malloc_trim &lt;request-count&gt;*
+
+**default:** *lua_malloc_trim 1000*
+
+**context:** *http*
+
+Asks the underlying `libc` runtime library to release its cached free memory back to the operating system every
+`N` requests processed by the NGINX core. By default, `N` is 1000. You can configure the request count
+by using your own numbers. Smaller numbers mean more frequent releases, which may introduce higher CPU time consumption and
+smaller memory footprint while larger numbers usually lead to less CPU time overhead and relatively larger memory footprint.
+Just tune the number for your own use cases.
+
+Configuring the argument to `0` essentially turns off the periodical memory trimming altogether.
+
+```nginx
+
+ lua_malloc_trim 0;  # turn off trimming completely
+```
+
+The current implementation uses an NGINX log phase handler to do the request counting. So the appearance of the
+[log_subrequest on](http://nginx.org/en/docs/http/ngx_http_core_module.html#log_subrequest) directives in `nginx.conf`
+may make the counting faster when subrequests are involved. By default, only "main requests" count.
+
+Note that this directive does *not* affect the memory allocated by LuaJIT's own allocator based on the `mmap`
+system call.
+
+This directive was first introduced in the `v0.10.7` release.
+
+[Back to TOC](#directives)
+
 lua_code_cache
 --------------
 **syntax:** *lua_code_cache on | off*
@@ -1170,7 +1203,7 @@ lua_package_path
 
 **syntax:** *lua_package_path &lt;lua-style-path-str&gt;*
 
-**default:** *The content of LUA_PATH environ variable or Lua's compiled-in defaults.*
+**default:** *The content of LUA_PATH environment variable or Lua's compiled-in defaults.*
 
 **context:** *http*
 
@@ -1223,9 +1256,9 @@ Usually you can register (true) Lua global variables or pre-load Lua modules at
 
  server {
      location = /api {
-         content_by_lua '
+         content_by_lua_block {
              ngx.say(cjson.encode({dog = 5, cat = 6}))
-         ';
+         }
      }
  }
 ```
@@ -1243,10 +1276,10 @@ You can also initialize the [lua_shared_dict](#lua_shared_dict) shm storage at t
 
  server {
      location = /api {
-         content_by_lua '
+         content_by_lua_block {
              local dogs = ngx.shared.dogs;
              ngx.say(dogs:get("Tom"))
-         ';
+         }
      }
  }
 ```
@@ -2062,7 +2095,7 @@ When the Lua code may change the length of the response body, then it is require
  location /foo {
      # fastcgi_pass/proxy_pass/...
 
-     header_filter_by_lua 'ngx.header.content_length = nil';
+     header_filter_by_lua_block { ngx.header.content_length = nil }
      body_filter_by_lua 'ngx.arg[1] = string.len(ngx.arg[1]) .. "\\n"';
  }
 ```
@@ -2172,7 +2205,7 @@ Here is an example of gathering average data for [$upstream_response_time](http:
      }
 
      location = /status {
-         content_by_lua '
+         content_by_lua_block {
              local log_dict = ngx.shared.log_dict
              local sum = log_dict:get("upstream_time-sum")
              local nb = log_dict:get("upstream_time-nb")
@@ -2183,7 +2216,7 @@ Here is an example of gathering average data for [$upstream_response_time](http:
              else
                  ngx.say("no data yet")
              end
-         ';
+         }
      }
  }
 ```
@@ -2329,15 +2362,15 @@ Determines whether to force the request body data to be read before running rewr
 To read the request body data within the [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) variable,
 [client_body_buffer_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_buffer_size) must have the same value as [client_max_body_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size). Because when the content length exceeds [client_body_buffer_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_buffer_size) but less than [client_max_body_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#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://nginx.org/en/docs/http/ngx_http_core_module.html#var_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
+If the current location includes [rewrite_by_lua*](#rewrite_by_lua) directives,
+then the request body will be read just before the [rewrite_by_lua*](#rewrite_by_lua) code is run (and also at the
 `rewrite` phase). Similarly, if only [content_by_lua](#content_by_lua) is specified,
 the request body will not be read until the content handler's Lua code is
 about to run (i.e., the request body will be read during the content phase).
 
 It is recommended however, to use the [ngx.req.read_body](#ngxreqread_body) and [ngx.req.discard_body](#ngxreqdiscard_body) functions for finer control over the request body reading process instead.
 
-This also applies to [access_by_lua](#access_by_lua) and [access_by_lua_file](#access_by_lua_file).
+This also applies to [access_by_lua*](#access_by_lua).
 
 [Back to TOC](#directives)
 
@@ -2452,7 +2485,7 @@ ssl_session_fetch_by_lua_block
 
 **syntax:** *ssl_session_fetch_by_lua_block { lua-script }*
 
-**context:** *server*
+**context:** *http*
 
 **phase:** *right-before-SSL-handshake*
 
@@ -2486,6 +2519,13 @@ SSL session resumption will happen and thus bypass the [ssl_certificate_by_lua*]
 hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua_block](#ssl_session_store_by_lua)
 hook, for obvious reasons.
 
+To easily test this hook locally with a modern web browser, you can temporarily put the following line
+in your https server block to disable the TLS session ticket support:
+
+    ssl_session_tickets off;
+
+But do not forget to comment this line out before publishing your site to the world.
+
 If you are using the [official pre-built packages](http://openresty.org/en/linux-packages.html) for [OpenResty](https://openresty.org/)
 1.11.2.1 or later, then everything should work out of the box.
 
@@ -2501,6 +2541,9 @@ apply the following patch to the standard NGINX core 1.11.2 or later:
 
 This directive was first introduced in the `v0.10.6` release.
 
+Note that: this directive is only allowed to used in **http context** from the `v0.10.7` release
+(because SSL session resumption happens before server name dispatch).
+
 [Back to TOC](#directives)
 
 ssl_session_fetch_by_lua_file
@@ -2508,7 +2551,7 @@ ssl_session_fetch_by_lua_file
 
 **syntax:** *ssl_session_fetch_by_lua_file &lt;path-to-lua-script-file&gt;*
 
-**context:** *server*
+**context:** *http*
 
 **phase:** *right-before-SSL-handshake*
 
@@ -2518,6 +2561,9 @@ When a relative path like `foo/bar.lua` is given, they will be turned into the a
 
 This directive was first introduced in the `v0.10.6` release.
 
+Note that: this directive is only allowed to used in **http context** from the `v0.10.7` release
+(because SSL session resumption happens before server name dispatch).
+
 [Back to TOC](#directives)
 
 ssl_session_store_by_lua_block
@@ -2525,7 +2571,7 @@ ssl_session_store_by_lua_block
 
 **syntax:** *ssl_session_store_by_lua_block { lua-script }*
 
-**context:** *server*
+**context:** *http*
 
 **phase:** *right-after-SSL-handshake*
 
@@ -2543,8 +2589,18 @@ is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core
 Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
 library.
 
+To easily test this hook locally with a modern web browser, you can temporarily put the following line
+in your https server block to disable the TLS session ticket support:
+
+    ssl_session_tickets off;
+
+But do not forget to comment this line out before publishing your site to the world.
+
 This directive was first introduced in the `v0.10.6` release.
 
+Note that: this directive is only allowed to used in **http context** from the `v0.10.7` release
+(because SSL session resumption happens before server name dispatch).
+
 [Back to TOC](#directives)
 
 ssl_session_store_by_lua_file
@@ -2552,7 +2608,7 @@ ssl_session_store_by_lua_file
 
 **syntax:** *ssl_session_store_by_lua_file &lt;path-to-lua-script-file&gt;*
 
-**context:** *server*
+**context:** *http*
 
 **phase:** *right-before-SSL-handshake*
 
@@ -2562,6 +2618,9 @@ When a relative path like `foo/bar.lua` is given, they will be turned into the a
 
 This directive was first introduced in the `v0.10.6` release.
 
+Note that: this directive is only allowed to used in **http context** from the `v0.10.7` release
+(because SSL session resumption happens before server name dispatch).
+
 [Back to TOC](#directives)
 
 lua_shared_dict
@@ -2607,7 +2666,7 @@ lua_socket_connect_timeout
 
 **context:** *http, server, location*
 
-This directive controls the default timeout value used in TCP/unix-domain socket object's [connect](#tcpsockconnect) method and can be overridden by the [settimeout](#tcpsocksettimeout) method.
+This directive controls the default timeout value used in TCP/unix-domain socket object's [connect](#tcpsockconnect) method and can be overridden by the [settimeout](#tcpsocksettimeout) or [settimeouts](#tcpsocksettimeouts) methods.
 
 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`.
 
@@ -2624,7 +2683,7 @@ lua_socket_send_timeout
 
 **context:** *http, server, location*
 
-Controls the default timeout value used in TCP/unix-domain socket object's [send](#tcpsocksend) method and can be overridden by the [settimeout](#tcpsocksettimeout) method.
+Controls the default timeout value used in TCP/unix-domain socket object's [send](#tcpsocksend) method and can be overridden by the [settimeout](#tcpsocksettimeout) or [settimeouts](#tcpsocksettimeouts) methods.
 
 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`.
 
@@ -2656,7 +2715,7 @@ lua_socket_read_timeout
 
 **phase:** *depends on usage*
 
-This directive controls the default timeout value used in TCP/unix-domain socket object's [receive](#tcpsockreceive) method and iterator functions returned by the [receiveuntil](#tcpsockreceiveuntil) method. This setting can be overridden by the [settimeout](#tcpsocksettimeout) method.
+This directive controls the default timeout value used in TCP/unix-domain socket object's [receive](#tcpsockreceive) method and iterator functions returned by the [receiveuntil](#tcpsockreceiveuntil) method. This setting can be overridden by the [settimeout](#tcpsocksettimeout) or [settimeouts](#tcpsocksettimeouts) methods.
 
 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`.
 
@@ -2845,7 +2904,7 @@ rewrite_by_lua_no_postpone
 
 **context:** *http*
 
-Controls whether or not to disable postponing [rewrite_by_lua](#rewrite_by_lua)* directives to run at the end of the `rewrite` request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the `rewrite` phase.
+Controls whether or not to disable postponing [rewrite_by_lua*](#rewrite_by_lua) directives to run at the end of the `rewrite` request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the `rewrite` phase.
 
 This directive was first introduced in the `v0.5.0rc29` release.
 
@@ -2860,7 +2919,7 @@ access_by_lua_no_postpone
 
 **context:** *http*
 
-Controls whether or not to disable postponing [access_by_lua](#access_by_lua)* directives to run at the end of the `access` request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the `access` phase.
+Controls whether or not to disable postponing [access_by_lua*](#access_by_lua) directives to run at the end of the `access` request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the `access` phase.
 
 This directive was first introduced in the `v0.9.20` release.
 
@@ -3066,6 +3125,7 @@ Nginx API for Lua
 * [tcpsock:receiveuntil](#tcpsockreceiveuntil)
 * [tcpsock:close](#tcpsockclose)
 * [tcpsock:settimeout](#tcpsocksettimeout)
+* [tcpsock:settimeouts](#tcpsocksettimeouts)
 * [tcpsock:setoption](#tcpsocksetoption)
 * [tcpsock:setkeepalive](#tcpsocksetkeepalive)
 * [tcpsock:getreusedtimes](#tcpsockgetreusedtimes)
@@ -3105,7 +3165,7 @@ 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 various `*_by_lua`, `*_by_lua_block` 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.
 
@@ -3146,7 +3206,7 @@ ngx.arg
 
 **context:** *set_by_lua&#42;, body_filter_by_lua&#42;*
 
-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:
+When this is used in the context of the [set_by_lua*](#set_by_lua) directives, this table is read-only and holds the input arguments to the config directives:
 
 ```lua
 
@@ -3171,7 +3231,7 @@ 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](#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.
+When this table is used in the context of [body_filter_by_lua*](#body_filter_by_lua), 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.
 
@@ -3198,10 +3258,10 @@ For example:
 
  location /foo {
      set $my_var ''; # this line is required to create $my_var at config time
-     content_by_lua '
+     content_by_lua_block {
          ngx.var.my_var = 123;
          ...
-     ';
+     }
  }
 ```
 
@@ -3238,7 +3298,7 @@ This API requires a relatively expensive metamethod call and it is recommended t
 
 Core constants
 --------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, &#42;log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, &#42;log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 ```lua
 
@@ -3264,7 +3324,7 @@ The `ngx.DECLINED` constant was first introduced in the `v0.5.0rc19` release.
 
 HTTP method constants
 ---------------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 
       ngx.HTTP_GET
@@ -3290,7 +3350,7 @@ These constants are usually used in [ngx.location.capture](#ngxlocationcapture)
 
 HTTP status constants
 ---------------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 ```nginx
 
@@ -3334,7 +3394,7 @@ HTTP status constants
 
 Nginx log level constants
 -------------------------
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 ```lua
 
@@ -3357,7 +3417,7 @@ print
 -----
 **syntax:** *print(...)*
 
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Writes argument values into the nginx `error.log` file with the `ngx.NOTICE` log level.
 
@@ -3376,7 +3436,7 @@ There is a hard coded `2048` byte limitation on error message lengths in the Ngi
 
 ngx.ctx
 -------
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;*
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;*
 
 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). 
 
@@ -3385,15 +3445,15 @@ Consider the following example,
 ```nginx
 
  location /test {
-     rewrite_by_lua '
+     rewrite_by_lua_block {
          ngx.ctx.foo = 76
-     ';
-     access_by_lua '
+     }
+     access_by_lua_block {
          ngx.ctx.foo = ngx.ctx.foo + 3
-     ';
-     content_by_lua '
+     }
+     content_by_lua_block {
          ngx.say(ngx.ctx.foo)
-     ';
+     }
  }
 ```
 
@@ -3411,21 +3471,21 @@ Every request, including subrequests, has its own copy of the table. For example
 ```nginx
 
  location /sub {
-     content_by_lua '
+     content_by_lua_block {
          ngx.say("sub pre: ", ngx.ctx.blah)
          ngx.ctx.blah = 32
          ngx.say("sub post: ", ngx.ctx.blah)
-     ';
+     }
  }
 
  location /main {
-     content_by_lua '
+     content_by_lua_block {
          ngx.ctx.blah = 73
          ngx.say("main pre: ", ngx.ctx.blah)
          local res = ngx.location.capture("/sub")
          ngx.print(res.body)
          ngx.say("main post: ", ngx.ctx.blah)
-     ';
+     }
  }
 ```
 
@@ -3446,16 +3506,16 @@ Internal redirection will destroy the original request `ngx.ctx` data (if any) a
 ```nginx
 
  location /new {
-     content_by_lua '
+     content_by_lua_block {
          ngx.say(ngx.ctx.foo)
-     ';
+     }
  }
 
  location /orig {
-     content_by_lua '
+     content_by_lua_block {
          ngx.ctx.foo = "hello"
          ngx.exec("/new")
-     ';
+     }
  }
 ```
 
@@ -3657,13 +3717,13 @@ This option is set to `false` by default
 
  location /lua {
      set $dog 'hello';
-     content_by_lua '
+     content_by_lua_block {
          res = ngx.location.capture("/other",
              { share_all_vars = true });
 
          ngx.print(res.body)
          ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-     ';
+     }
  }
 ```
 
@@ -3685,13 +3745,13 @@ The `copy_all_vars` option provides a copy of the parent request's Nginx variabl
 
  location /lua {
      set $dog 'hello';
-     content_by_lua '
+     content_by_lua_block {
          res = ngx.location.capture("/other",
              { copy_all_vars = true });
 
          ngx.print(res.body)
          ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-     ';
+     }
  }
 ```
 
@@ -3714,21 +3774,21 @@ unescaping them in the Nginx config file.
 ```nginx
 
  location /other {
-     content_by_lua '
+     content_by_lua_block {
          ngx.say("dog = ", ngx.var.dog)
          ngx.say("cat = ", ngx.var.cat)
-     ';
+     }
  }
 
  location /lua {
      set $dog '';
      set $cat '';
-     content_by_lua '
+     content_by_lua_block {
          res = ngx.location.capture("/other",
              { vars = { dog = "hello", cat = 32 }});
 
          ngx.print(res.body)
-     ';
+     }
  }
 ```
 
@@ -3744,18 +3804,18 @@ The `ctx` option can be used to specify a custom Lua table to serve as the [ngx.
 ```nginx
 
  location /sub {
-     content_by_lua '
+     content_by_lua_block {
          ngx.ctx.foo = "bar";
-     ';
+     }
  }
  location /lua {
-     content_by_lua '
+     content_by_lua_block {
          local ctx = {}
          res = ngx.location.capture("/sub", { ctx = ctx })
 
          ngx.say(ctx.foo);
          ngx.say(ngx.ctx.foo);
-     ';
+     }
  }
 ```
 
@@ -3771,15 +3831,15 @@ It is also possible to use this `ctx` option to share the same [ngx.ctx](#ngxctx
 ```nginx
 
  location /sub {
-     content_by_lua '
+     content_by_lua_block {
          ngx.ctx.foo = "bar";
-     ';
+     }
  }
  location /lua {
-     content_by_lua '
+     content_by_lua_block {
          res = ngx.location.capture("/sub", { ctx = ngx.ctx })
          ngx.say(ngx.ctx.foo);
-     ';
+     }
  }
 ```
 
@@ -3877,7 +3937,7 @@ Please also refer to restrictions on capturing locations configured by [subreque
 
 ngx.status
 ----------
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
 
 Read and write the current request's response status. This should be called
 before sending out the response headers.
@@ -3902,7 +3962,7 @@ ngx.header.HEADER
 
 **syntax:** *value = ngx.header.HEADER*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
 
 Set, add to, or clear the current request's `HEADER` response header that is to be sent.
 
@@ -3969,7 +4029,7 @@ Reading `ngx.header.HEADER` will return the value of the response header named `
 
 Underscores (`_`) in the header names will also be replaced by dashes (`-`) and the header names will be matched case-insensitively. If the response header is not present at all, `nil` will be returned.
 
-This is particularly useful in the context of [header_filter_by_lua](#header_filter_by_lua) and [header_filter_by_lua_file](#header_filter_by_lua_file), for example,
+This is particularly useful in the context of [header_filter_by_lua*](#header_filter_by_lua), for example,
 
 ```nginx
 
@@ -3978,11 +4038,11 @@ This is particularly useful in the context of [header_filter_by_lua](#header_fil
 
      proxy_pass http://some-backend;
 
-     header_filter_by_lua '
+     header_filter_by_lua_block {
          if ngx.header["X-My-Header"] == "blah" then
              ngx.var.footer = "some value"
          end
-     ';
+     }
 
      echo_after_body $footer;
  }
@@ -4014,7 +4074,7 @@ ngx.resp.get_headers
 --------------------
 **syntax:** *headers = ngx.resp.get_headers(max_headers?, raw?)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, balancer_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, balancer_by_lua&#42;*
 
 Returns a Lua table holding all the current response headers for the current request.
 
@@ -4209,17 +4269,17 @@ or equivalently,
  ngx.req.set_uri("/foo")
 ```
 
-The `jump` argument can only be set to `true` in [rewrite_by_lua](#rewrite_by_lua) and [rewrite_by_lua_file](#rewrite_by_lua_file). Use of jump in other contexts is prohibited and will throw out a Lua exception.
+The `jump` argument can only be set to `true` in [rewrite_by_lua*](#rewrite_by_lua). Use of jump in other contexts is prohibited and will throw out a Lua exception.
 
 A more sophisticated example involving regex substitutions is as follows
 
 ```nginx
 
  location /test {
-     rewrite_by_lua '
+     rewrite_by_lua_block {
          local uri = ngx.re.sub(ngx.var.uri, "^/test/(.*)", "/$1", "o")
          ngx.req.set_uri(uri)
-     ';
+     }
      proxy_pass http://my_backend;
  }
 ```
@@ -4302,14 +4362,14 @@ ngx.req.get_uri_args
 --------------------
 **syntax:** *args = ngx.req.get_uri_args(max_args?)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;, balancer_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, balancer_by_lua&#42;*
 
 Returns a Lua table holding all the current request URL query arguments.
 
 ```nginx
 
  location = /test {
-     content_by_lua '
+     content_by_lua_block {
          local args = ngx.req.get_uri_args()
          for key, val in pairs(args) do
              if type(val) == "table" then
@@ -4318,7 +4378,7 @@ Returns a Lua table holding all the current request URL query arguments.
                  ngx.say(key, ": ", val)
              end
          end
-     ';
+     }
  }
 ```
 
@@ -4398,14 +4458,14 @@ ngx.req.get_post_args
 ---------------------
 **syntax:** *args, err = ngx.req.get_post_args(max_args?)*
 
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;*
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
 
 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](#ngxreqread_body) to read the request body first or turn on the [lua_need_request_body](#lua_need_request_body) directive to avoid errors.
 
 ```nginx
 
  location = /test {
-     content_by_lua '
+     content_by_lua_block {
          ngx.req.read_body()
          local args, err = ngx.req.get_post_args()
          if not args then
@@ -4419,7 +4479,7 @@ Returns a Lua table holding all the current request POST query arguments (of the
                  ngx.say(key, ": ", val)
              end
          end
-     ';
+     }
  }
 ```
 
@@ -4500,7 +4560,7 @@ ngx.req.get_headers
 -------------------
 **syntax:** *headers = ngx.req.get_headers(max_headers?, raw?)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua, log_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
 
 Returns a Lua table holding all the current request headers.
 
@@ -4574,7 +4634,7 @@ ngx.req.set_header
 ------------------
 **syntax:** *ngx.req.set_header(header_name, header_value)*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;*
 
 Set the current request's request header named `header_name` to value `header_value`, overriding any existing ones.
 
@@ -4791,7 +4851,7 @@ The usage of this function is often like this:
  ngx.req.finish_body()
 ```
 
-This function can be used with [ngx.req.append_body](#ngxreqappend_body), [ngx.req.finish_body](#ngxreqfinish_body), and [ngx.req.socket](#ngxreqsocket) 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
+This function can be used with [ngx.req.append_body](#ngxreqappend_body), [ngx.req.finish_body](#ngxreqfinish_body), and [ngx.req.socket](#ngxreqsocket) 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
 
 This function was first introduced in the `v0.5.11` release.
 
@@ -4809,7 +4869,7 @@ When the data can no longer be hold in the memory buffer for the request body, t
 
 It is important to always call the [ngx.req.finish_body](#ngxreqfinish_body) after all the data has been appended onto the current request body.
 
-This function can be used with [ngx.req.init_body](#ngxreqinit_body), [ngx.req.finish_body](#ngxreqfinish_body), and [ngx.req.socket](#ngxreqsocket) 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
+This function can be used with [ngx.req.init_body](#ngxreqinit_body), [ngx.req.finish_body](#ngxreqfinish_body), and [ngx.req.socket](#ngxreqsocket) 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
 
 This function was first introduced in the `v0.5.11` release.
 
@@ -4825,7 +4885,7 @@ ngx.req.finish_body
 
 Completes the construction process of the new request body created by the [ngx.req.init_body](#ngxreqinit_body) and [ngx.req.append_body](#ngxreqappend_body) calls.
 
-This function can be used with [ngx.req.init_body](#ngxreqinit_body), [ngx.req.append_body](#ngxreqappend_body), and [ngx.req.socket](#ngxreqsocket) 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
+This function can be used with [ngx.req.init_body](#ngxreqinit_body), [ngx.req.append_body](#ngxreqappend_body), and [ngx.req.socket](#ngxreqsocket) 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
 
 This function was first introduced in the `v0.5.11` release.
 
@@ -4900,20 +4960,20 @@ Named locations are also supported but the second `args` argument will be ignore
 ```nginx
 
  location /foo {
-     content_by_lua '
+     content_by_lua_block {
          ngx.exec("@bar", "a=goodbye");
-     ';
+     }
  }
 
  location @bar {
-     content_by_lua '
+     content_by_lua_block {
          local args = ngx.req.get_uri_args()
          for key, val in pairs(args) do
              if key == "a" then
                  ngx.say(val)
              end
          end
-     ';
+     }
  }
 ```
 
@@ -4923,7 +4983,7 @@ it is purely an internal redirect and that no new external HTTP traffic is invol
 Also note that this method call terminates the processing of the current request and that it *must* be called before [ngx.send_headers](#ngxsend_headers) or explicit response body
 outputs by either [ngx.print](#ngxprint) or [ngx.say](#ngxsay).
 
-It is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.exec(...)` be adopted when this method call is used in contexts other than [header_filter_by_lua](#header_filter_by_lua) to reinforce the fact that the request processing is being terminated.
+It is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.exec(...)` be adopted when this method call is used in contexts other than [header_filter_by_lua*](#header_filter_by_lua) to reinforce the fact that the request processing is being terminated.
 
 [Back to TOC](#nginx-api-for-lua)
 
@@ -4935,8 +4995,13 @@ ngx.redirect
 
 Issue an `HTTP 301` or `302` redirection to `uri`.
 
-The optional `status` parameter specifies whether
-`301` or `302` to be used. It is `302` (`ngx.HTTP_MOVED_TEMPORARILY`) by default.
+The optional `status` parameter specifies the HTTP status code to be used. The following status codes are supported right now:
+
+* `301`
+* `302` (default)
+* `307`
+
+It is `302` (`ngx.HTTP_MOVED_TEMPORARILY`) by default.
 
 Here is an example assuming the current server name is `localhost` and that it is listening on port 1984:
 
@@ -5005,7 +5070,7 @@ URI arguments can be specified as well, for example:
 Note that this method call terminates the processing of the current request and that it *must* be called before [ngx.send_headers](#ngxsend_headers) or explicit response body
 outputs by either [ngx.print](#ngxprint) or [ngx.say](#ngxsay).
 
-It is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.redirect(...)` be adopted when this method call is used in contexts other than [header_filter_by_lua](#header_filter_by_lua) to reinforce the fact that the request processing is being terminated.
+It is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.redirect(...)` be adopted when this method call is used in contexts other than [header_filter_by_lua*](#header_filter_by_lua) to reinforce the fact that the request processing is being terminated.
 
 [Back to TOC](#nginx-api-for-lua)
 
@@ -5020,7 +5085,7 @@ Explicitly send out the response headers.
 Since `v0.8.3` this function returns `1` on success, or returns `nil` and a string describing the error otherwise.
 
 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](#ngxsay) or [ngx.print](#ngxprint) or when [content_by_lua](#content_by_lua) exits normally.
+before content is output with [ngx.say](#ngxsay) or [ngx.print](#ngxprint) or when [content_by_lua*](#content_by_lua) exits normally.
 
 [Back to TOC](#nginx-api-for-lua)
 
@@ -5131,7 +5196,7 @@ ngx.exit
 
 When `status >= 200` (i.e., `ngx.HTTP_OK` and above), it will interrupt the execution of the current request and return status code to nginx.
 
-When `status == 0` (i.e., `ngx.OK`), it will only quit the current phase handler (or the content handler if the [content_by_lua](#content_by_lua) directive is used) and continue to run later phases (if any) for the current request.
+When `status == 0` (i.e., `ngx.OK`), it will only quit the current phase handler (or the content handler if the [content_by_lua*](#content_by_lua) directive is used) and continue to run later phases (if any) for the current request.
 
 The `status` argument can be `ngx.OK`, `ngx.ERROR`, `ngx.HTTP_NOT_FOUND`,
 `ngx.HTTP_MOVED_TEMPORARILY`, or other [HTTP status constants](#http-status-constants).
@@ -5192,11 +5257,11 @@ When you disable the HTTP 1.1 keep-alive feature for your downstream connections
 
  location = /async {
      keepalive_timeout 0;
-     content_by_lua '
+     content_by_lua_block {
          ngx.say("got the task!")
          ngx.eof()  -- a descent HTTP client will close the connection at this point
          -- access MySQL, PostgreSQL, Redis, Memcached, and etc here...
-     ';
+     }
  }
 ```
 
@@ -5441,7 +5506,7 @@ For example,
 ```nginx
 
  location = /md5 {
-     content_by_lua 'ngx.say(ngx.md5("hello"))';
+     content_by_lua_block { ngx.say(ngx.md5("hello")) }
  }
 ```
 
@@ -6059,17 +6124,17 @@ Here is an example:
      lua_shared_dict dogs 10m;
      server {
          location /set {
-             content_by_lua '
+             content_by_lua_block {
                  local dogs = ngx.shared.dogs
                  dogs:set("Jim", 8)
                  ngx.say("STORED")
-             ';
+             }
          }
          location /get {
-             content_by_lua '
+             content_by_lua_block {
                  local dogs = ngx.shared.dogs
                  ngx.say(dogs:get("Jim"))
-             ';
+             }
          }
      }
  }
@@ -6486,7 +6551,7 @@ Here is an example for connecting to a UDP (memcached) server:
  location /test {
      resolver 8.8.8.8;
 
-     content_by_lua '
+     content_by_lua_block {
          local sock = ngx.socket.udp()
          local ok, err = sock:setpeername("my.memcached.server.domain", 11211)
          if not ok then
@@ -6495,7 +6560,7 @@ Here is an example for connecting to a UDP (memcached) server:
          end
          ngx.say("successfully connected to memcached!")
          sock:close()
-     ';
+     }
  }
 ```
 
@@ -6622,6 +6687,7 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [receive](#tcpsockreceive)
 * [close](#tcpsockclose)
 * [settimeout](#tcpsocksettimeout)
+* [settimeouts](#tcpsocksettimeouts)
 * [setoption](#tcpsocksetoption)
 * [receiveuntil](#tcpsockreceiveuntil)
 * [setkeepalive](#tcpsocksetkeepalive)
@@ -6682,7 +6748,7 @@ Here is an example for connecting to a TCP server:
  location /test {
      resolver 8.8.8.8;
 
-     content_by_lua '
+     content_by_lua_block {
          local sock = ngx.socket.tcp()
          local ok, err = sock:connect("www.google.com", 80)
          if not ok then
@@ -6691,7 +6757,7 @@ Here is an example for connecting to a TCP server:
          end
          ngx.say("successfully connected to google!")
          sock:close()
-     ';
+     }
  }
 ```
 
@@ -6983,6 +7049,25 @@ This feature was first introduced in the `v0.5.0rc1` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+tcpsock:settimeouts
+-------------------
+**syntax:** *tcpsock:settimeouts(connect_timeout, send_timeout, read_timeout)*
+
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
+
+Sets the connect timeout thresold, send timeout threshold, and read timeout threshold, respetively, in milliseconds, for subsequent socket
+operations ([connect](#tcpsockconnect), [send](#tcpsocksend), [receive](#tcpsockreceive), and iterators returned from [receiveuntil](#tcpsockreceiveuntil)).
+
+Settings done by this method takes priority over those config directives, i.e., [lua_socket_connect_timeout](#lua_socket_connect_timeout), [lua_socket_send_timeout](#lua_socket_send_timeout), and [lua_socket_read_timeout](#lua_socket_read_timeout).
+
+You are recommended to use [settimeouts](#tcpsocksettimeouts) instead of [settimeout](#tcpsocksettimeout).
+
+Note that this method does *not* affect the [lua_socket_keepalive_timeout](#lua_socket_keepalive_timeout) setting; the `timeout` argument to the [setkeepalive](#tcpsocksetkeepalive) method should be used for this purpose instead.
+
+This feature was first introduced in the `v0.10.7` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
 tcpsock:setoption
 -----------------
 **syntax:** *tcpsock:setoption(option, value?)*
@@ -7072,31 +7157,31 @@ ngx.get_phase
 Retrieves the current running phase name. Possible return values are
 
 * `init`
-	for the context of [init_by_lua](#init_by_lua) or [init_by_lua_file](#init_by_lua_file).
+	for the context of [init_by_lua*](#init_by_lua).
 * `init_worker`
-	for the context of [init_worker_by_lua](#init_worker_by_lua) or [init_worker_by_lua_file](#init_worker_by_lua_file).
+	for the context of [init_worker_by_lua*](#init_worker_by_lua).
 * `ssl_cert`
-	for the context of [ssl_certificate_by_lua_block](#ssl_certificate_by_lua_block) or [ssl_certificate_by_lua_file](#ssl_certificate_by_lua_file).
+	for the context of [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
 * `ssl_session_fetch`
 	for the context of [ssl_session_fetch_by_lua*](#ssl_session_fetch_by_lua_block).
 * `ssl_session_store`
 	for the context of [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block).
 * `set`
-	for the context of [set_by_lua](#set_by_lua) or [set_by_lua_file](#set_by_lua_file).
+	for the context of [set_by_lua*](#set_by_lua).
 * `rewrite`
-	for the context of [rewrite_by_lua](#rewrite_by_lua) or [rewrite_by_lua_file](#rewrite_by_lua_file).
+	for the context of [rewrite_by_lua*](#rewrite_by_lua).
 * `balancer`
-	for the context of [balancer_by_lua_block](#balancer_by_lua_block) or [balancer_by_lua_file](#balancer_by_lua_file).
+	for the context of [balancer_by_lua*](#balancer_by_lua_block).
 * `access`
-	for the context of [access_by_lua](#access_by_lua) or [access_by_lua_file](#access_by_lua_file).
+	for the context of [access_by_lua*](#access_by_lua).
 * `content`
-	for the context of [content_by_lua](#content_by_lua) or [content_by_lua_file](#content_by_lua_file).
+	for the context of [content_by_lua*](#content_by_lua).
 * `header_filter`
-	for the context of [header_filter_by_lua](#header_filter_by_lua) or [header_filter_by_lua_file](#header_filter_by_lua_file).
+	for the context of [header_filter_by_lua*](#header_filter_by_lua).
 * `body_filter`
-	for the context of [body_filter_by_lua](#body_filter_by_lua) or [body_filter_by_lua_file](#body_filter_by_lua_file).
+	for the context of [body_filter_by_lua*](#body_filter_by_lua).
 * `log`
-	for the context of [log_by_lua](#log_by_lua) or [log_by_lua_file](#log_by_lua_file).
+	for the context of [log_by_lua*](#log_by_lua).
 * `timer`
 	for the context of user callback functions for [ngx.timer.*](#ngxtimerat).
 
@@ -7444,7 +7529,7 @@ Here is a simple example:
 
  location / {
      ...
-     log_by_lua '
+     log_by_lua_block {
          local function push_data(premature, uri, args, status)
              -- push the data uri, args, and status to the remote
              -- via ngx.socket.tcp or ngx.socket.udp
@@ -7457,7 +7542,7 @@ Here is a simple example:
              ngx.log(ngx.ERR, "failed to create timer: ", err)
              return
          end
-     ';
+     }
  }
 ```
 
diff --git a/debian/modules/nginx-lua/config b/debian/modules/nginx-lua/config
index 0f2749d..01a6b3c 100644
--- a/debian/modules/nginx-lua/config
+++ b/debian/modules/nginx-lua/config
@@ -519,6 +519,24 @@ CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
 
 CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
 
+# ----------------------------------------
+
+ngx_feature="malloc_trim"
+ngx_feature_libs=
+ngx_feature_name="NGX_HTTP_LUA_HAVE_MALLOC_TRIM"
+ngx_feature_run=yes
+ngx_feature_incs="#include <malloc.h>
+#include <stdio.h>"
+ngx_feature_test="int rc = malloc_trim((size_t) 0); printf(\"%d\", rc);"
+SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
+
+. auto/feature
+
+CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+
+# ----------------------------------------
+
 if test -n "$ngx_module_link"; then
     ngx_module_type=HTTP_AUX_FILTER
     ngx_module_name=$ngx_addon_name
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
index 2a5b0d2..be454af 100644
--- a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.6] released on 15 August 2016.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.7] released on 4 November 2016.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -463,10 +463,10 @@ and then accessing it from <code>nginx.conf</code>:
 
 <geshi lang="nginx">
     location /lua {
-        content_by_lua '
+        content_by_lua_block {
             local mydata = require "mydata"
             ngx.say(mydata.get_age("dog"))
-        ';
+        }
     }
 </geshi>
 
@@ -545,9 +545,9 @@ The [[#ngx.location.capture|ngx.location.capture]] and [[#ngx.location.capture_m
 
 <geshi lang="nginx">
     location /foo {
-        content_by_lua '
+        content_by_lua_block {
             res = ngx.location.capture("/bar")
-        ';
+        }
     }
     location /bar {
         echo_location /blah;
@@ -693,9 +693,9 @@ servers in Lua. For example,
     datagram {
         server {
             listen 1953;
-            handler_by_lua '
+            handler_by_lua_block {
                 -- custom Lua code implementing the special UDP server...
-            ';
+            }
         }
     }
 </geshi>
@@ -840,6 +840,34 @@ This directive is turned on by default.
 
 This directive was first introduced in the <code>v0.9.1</code> release.
 
+== lua_malloc_trim ==
+'''syntax:''' ''lua_malloc_trim <request-count>''
+
+'''default:''' ''lua_malloc_trim 1000''
+
+'''context:''' ''http''
+
+Asks the underlying <code>libc</code> runtime library to release its cached free memory back to the operating system every
+<code>N</code> requests processed by the NGINX core. By default, <code>N</code> is 1000. You can configure the request count
+by using your own numbers. Smaller numbers mean more frequent releases, which may introduce higher CPU time consumption and
+smaller memory footprint while larger numbers usually lead to less CPU time overhead and relatively larger memory footprint.
+Just tune the number for your own use cases.
+
+Configuring the argument to <code>0</code> essentially turns off the periodical memory trimming altogether.
+
+<geshi lang="nginx">
+    lua_malloc_trim 0;  # turn off trimming completely
+</geshi>
+
+The current implementation uses an NGINX log phase handler to do the request counting. So the appearance of the
+[http://nginx.org/en/docs/http/ngx_http_core_module.html#log_subrequest log_subrequest on] directives in <code>nginx.conf</code>
+may make the counting faster when subrequests are involved. By default, only "main requests" count.
+
+Note that this directive does *not* affect the memory allocated by LuaJIT's own allocator based on the <code>mmap</code>
+system call.
+
+This directive was first introduced in the <code>v0.10.7</code> release.
+
 == lua_code_cache ==
 '''syntax:''' ''lua_code_cache on | off''
 
@@ -911,7 +939,7 @@ This directive was first introduced in the <code>v0.8.5</code> release.
 
 '''syntax:''' ''lua_package_path <lua-style-path-str>''
 
-'''default:''' ''The content of LUA_PATH environ variable or Lua's compiled-in defaults.''
+'''default:''' ''The content of LUA_PATH environment variable or Lua's compiled-in defaults.''
 
 '''context:''' ''http''
 
@@ -957,9 +985,9 @@ Usually you can register (true) Lua global variables or pre-load Lua modules at
 
     server {
         location = /api {
-            content_by_lua '
+            content_by_lua_block {
                 ngx.say(cjson.encode({dog = 5, cat = 6}))
-            ';
+            }
         }
     }
 </geshi>
@@ -976,10 +1004,10 @@ You can also initialize the [[#lua_shared_dict|lua_shared_dict]] shm storage at
 
     server {
         location = /api {
-            content_by_lua '
+            content_by_lua_block {
                 local dogs = ngx.shared.dogs;
                 ngx.say(dogs:get("Tom"))
-            ';
+            }
         }
     }
 </geshi>
@@ -1707,7 +1735,7 @@ When the Lua code may change the length of the response body, then it is require
     location /foo {
         # fastcgi_pass/proxy_pass/...
 
-        header_filter_by_lua 'ngx.header.content_length = nil';
+        header_filter_by_lua_block { ngx.header.content_length = nil }
         body_filter_by_lua 'ngx.arg[1] = string.len(ngx.arg[1]) .. "\\n"';
     }
 </geshi>
@@ -1806,7 +1834,7 @@ Here is an example of gathering average data for [[HttpUpstreamModule#$upstream_
         }
 
         location = /status {
-            content_by_lua '
+            content_by_lua_block {
                 local log_dict = ngx.shared.log_dict
                 local sum = log_dict:get("upstream_time-sum")
                 local nb = log_dict:get("upstream_time-nb")
@@ -1817,7 +1845,7 @@ Here is an example of gathering average data for [[HttpUpstreamModule#$upstream_
                 else
                     ngx.say("no data yet")
                 end
-            ';
+            }
         }
     }
 </geshi>
@@ -1946,15 +1974,15 @@ Determines whether to force the request body data to be read before running rewr
 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 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
+If the current location includes [[#rewrite_by_lua|rewrite_by_lua*]] directives,
+then the request body will be read just before the [[#rewrite_by_lua|rewrite_by_lua*]] code is run (and also at the
 <code>rewrite</code> phase). Similarly, if only [[#content_by_lua|content_by_lua]] is specified,
 the request body will not be read until the content handler's Lua code is
 about to run (i.e., the request body will be read during the content phase).
 
 It is recommended however, to use the [[#ngx.req.read_body|ngx.req.read_body]] and [[#ngx.req.discard_body|ngx.req.discard_body]] functions for finer control over the request body reading process instead.
 
-This also applies to [[#access_by_lua|access_by_lua]] and [[#access_by_lua_file|access_by_lua_file]].
+This also applies to [[#access_by_lua|access_by_lua*]].
 
 == ssl_certificate_by_lua_block ==
 
@@ -2059,7 +2087,7 @@ This directive was first introduced in the <code>v0.10.0</code> release.
 
 '''syntax:''' ''ssl_session_fetch_by_lua_block { lua-script }''
 
-'''context:''' ''server''
+'''context:''' ''http''
 
 '''phase:''' ''right-before-SSL-handshake''
 
@@ -2093,6 +2121,13 @@ SSL session resumption will happen and thus bypass the [[#ssl_certificate_by_lua
 hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]]
 hook, for obvious reasons.
 
+To easily test this hook locally with a modern web browser, you can temporarily put the following line
+in your https server block to disable the TLS session ticket support:
+
+    ssl_session_tickets off;
+
+But do not forget to comment this line out before publishing your site to the world.
+
 If you are using the [official pre-built packages](http://openresty.org/en/linux-packages.html) for [OpenResty](https://openresty.org/)
 1.11.2.1 or later, then everything should work out of the box.
 
@@ -2108,11 +2143,14 @@ http://openresty.org/download/nginx-1.11.2-nonblocking_ssl_handshake_hooks.patch
 
 This directive was first introduced in the <code>v0.10.6</code> release.
 
+Note that: this directive is only allowed to used in '''http context''' from the <code>v0.10.7</code> release
+(because SSL session resumption happens before server name dispatch).
+
 == ssl_session_fetch_by_lua_file ==
 
 '''syntax:''' ''ssl_session_fetch_by_lua_file <path-to-lua-script-file>''
 
-'''context:''' ''server''
+'''context:''' ''http''
 
 '''phase:''' ''right-before-SSL-handshake''
 
@@ -2122,11 +2160,14 @@ When a relative path like <code>foo/bar.lua</code> is given, they will be turned
 
 This directive was first introduced in the <code>v0.10.6</code> release.
 
+Note that: this directive is only allowed to used in '''http context''' from the <code>v0.10.7</code> release
+(because SSL session resumption happens before server name dispatch).
+
 == ssl_session_store_by_lua_block ==
 
 '''syntax:''' ''ssl_session_store_by_lua_block { lua-script }''
 
-'''context:''' ''server''
+'''context:''' ''http''
 
 '''phase:''' ''right-after-SSL-handshake''
 
@@ -2144,13 +2185,23 @@ is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core
 Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
 library.
 
+To easily test this hook locally with a modern web browser, you can temporarily put the following line
+in your https server block to disable the TLS session ticket support:
+
+    ssl_session_tickets off;
+
+But do not forget to comment this line out before publishing your site to the world.
+
 This directive was first introduced in the <code>v0.10.6</code> release.
 
+Note that: this directive is only allowed to used in '''http context''' from the <code>v0.10.7</code> release
+(because SSL session resumption happens before server name dispatch).
+
 == ssl_session_store_by_lua_file ==
 
 '''syntax:''' ''ssl_session_store_by_lua_file <path-to-lua-script-file>''
 
-'''context:''' ''server''
+'''context:''' ''http''
 
 '''phase:''' ''right-before-SSL-handshake''
 
@@ -2160,6 +2211,9 @@ When a relative path like <code>foo/bar.lua</code> is given, they will be turned
 
 This directive was first introduced in the <code>v0.10.6</code> release.
 
+Note that: this directive is only allowed to used in '''http context''' from the <code>v0.10.7</code> release
+(because SSL session resumption happens before server name dispatch).
+
 == lua_shared_dict ==
 
 '''syntax:''' ''lua_shared_dict <name> <size>''
@@ -2198,7 +2252,7 @@ This directive was first introduced in the <code>v0.3.1rc22</code> release.
 
 '''context:''' ''http, server, location''
 
-This directive controls the default timeout value used in TCP/unix-domain socket object's [[#tcpsock:connect|connect]] method and can be overridden by the [[#tcpsock:settimeout|settimeout]] method.
+This directive controls the default timeout value used in TCP/unix-domain socket object's [[#tcpsock:connect|connect]] method and can be overridden by the [[#tcpsock:settimeout|settimeout]] or [[#tcpsock:settimeouts|settimeouts]] methods.
 
 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>.
 
@@ -2212,7 +2266,7 @@ This directive was first introduced in the <code>v0.5.0rc1</code> release.
 
 '''context:''' ''http, server, location''
 
-Controls the default timeout value used in TCP/unix-domain socket object's [[#tcpsock:send|send]] method and can be overridden by the [[#tcpsock:settimeout|settimeout]] method.
+Controls the default timeout value used in TCP/unix-domain socket object's [[#tcpsock:send|send]] method and can be overridden by the [[#tcpsock:settimeout|settimeout]] or [[#tcpsock:settimeouts|settimeouts]] methods.
 
 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>.
 
@@ -2238,7 +2292,7 @@ Controls the <code>lowat</code> (low water) value for the cosocket send buffer.
 
 '''phase:''' ''depends on usage''
 
-This directive controls the default timeout value used in TCP/unix-domain socket object's [[#tcpsock:receive|receive]] method and iterator functions returned by the [[#tcpsock:receiveuntil|receiveuntil]] method. This setting can be overridden by the [[#tcpsock:settimeout|settimeout]] method.
+This directive controls the default timeout value used in TCP/unix-domain socket object's [[#tcpsock:receive|receive]] method and iterator functions returned by the [[#tcpsock:receiveuntil|receiveuntil]] method. This setting can be overridden by the [[#tcpsock:settimeout|settimeout]] or [[#tcpsock:settimeouts|settimeouts]] methods.
 
 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>.
 
@@ -2394,7 +2448,7 @@ This directive was first introduced in the <code>v0.5.0rc19</code> release.
 
 '''context:''' ''http''
 
-Controls whether or not to disable postponing [[#rewrite_by_lua|rewrite_by_lua]]* directives to run at the end of the <code>rewrite</code> request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the <code>rewrite</code> phase.
+Controls whether or not to disable postponing [[#rewrite_by_lua|rewrite_by_lua*]] directives to run at the end of the <code>rewrite</code> request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the <code>rewrite</code> phase.
 
 This directive was first introduced in the <code>v0.5.0rc29</code> release.
 
@@ -2406,7 +2460,7 @@ This directive was first introduced in the <code>v0.5.0rc29</code> release.
 
 '''context:''' ''http''
 
-Controls whether or not to disable postponing [[#access_by_lua|access_by_lua]]* directives to run at the end of the <code>access</code> request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the <code>access</code> phase.
+Controls whether or not to disable postponing [[#access_by_lua|access_by_lua*]] directives to run at the end of the <code>access</code> request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the <code>access</code> phase.
 
 This directive was first introduced in the <code>v0.9.20</code> release.
 
@@ -2490,7 +2544,7 @@ This directive was first introduced in the <code>v0.8.0</code> release.
 <!-- inline-toc -->
 
 == 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 various <code>*_by_lua</code>, <code>*_by_lua_block</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 ngx_lua and are always available within ngx_lua directives.
 
@@ -2526,7 +2580,7 @@ Network I/O operations in user code should only be done through the Nginx Lua AP
 
 '''context:''' ''set_by_lua*, body_filter_by_lua*''
 
-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:
+When this is used in the context of the [[#set_by_lua|set_by_lua*]] directives, this table is read-only and holds the input arguments to the config directives:
 
 <geshi lang="lua">
     value = ngx.arg[n]
@@ -2549,7 +2603,7 @@ 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.
+When this table is used in the context of [[#body_filter_by_lua|body_filter_by_lua*]], 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.
 
@@ -2571,10 +2625,10 @@ For example:
 <geshi lang="nginx">
     location /foo {
         set $my_var ''; # this line is required to create $my_var at config time
-        content_by_lua '
+        content_by_lua_block {
             ngx.var.my_var = 123;
             ...
-        ';
+        }
     }
 </geshi>
 
@@ -2606,7 +2660,7 @@ Undefined NGINX variables are evaluated to `nil` while uninitialized (but define
 This API requires a relatively expensive metamethod call and it is recommended to avoid using it on hot code paths.
 
 == Core constants ==
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 <geshi lang="lua">
   ngx.OK (0)
@@ -2627,7 +2681,7 @@ The <code>ngx.null</code> constant is a <code>NULL</code> light userdata usually
 The <code>ngx.DECLINED</code> constant was first introduced in the <code>v0.5.0rc19</code> release.
 
 == HTTP method constants ==
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 <geshi lang="text">
   ngx.HTTP_GET
@@ -2650,7 +2704,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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 <geshi lang="nginx">
   value = ngx.HTTP_CONTINUE (100) (first added in the v0.9.20 release)
@@ -2690,7 +2744,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*, body_filter_by_lua, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 <geshi lang="lua">
   ngx.STDERR
@@ -2709,7 +2763,7 @@ These constants are usually used by the [[#ngx.log|ngx.log]] method.
 == print ==
 '''syntax:''' ''print(...)''
 
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
 Writes argument values into the nginx <code>error.log</code> file with the <code>ngx.NOTICE</code> log level.
 
@@ -2724,7 +2778,7 @@ Lua <code>nil</code> arguments are accepted and result in literal <code>"nil"</c
 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:''' ''init_worker_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.timer.*, balancer_by_lua*''
+'''context:''' ''init_worker_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.timer.*, balancer_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). 
 
@@ -2732,15 +2786,15 @@ Consider the following example,
 
 <geshi lang="nginx">
     location /test {
-        rewrite_by_lua '
+        rewrite_by_lua_block {
             ngx.ctx.foo = 76
-        ';
-        access_by_lua '
+        }
+        access_by_lua_block {
             ngx.ctx.foo = ngx.ctx.foo + 3
-        ';
-        content_by_lua '
+        }
+        content_by_lua_block {
             ngx.say(ngx.ctx.foo)
-        ';
+        }
     }
 </geshi>
 
@@ -2756,21 +2810,21 @@ Every request, including subrequests, has its own copy of the table. For example
 
 <geshi lang="nginx">
     location /sub {
-        content_by_lua '
+        content_by_lua_block {
             ngx.say("sub pre: ", ngx.ctx.blah)
             ngx.ctx.blah = 32
             ngx.say("sub post: ", ngx.ctx.blah)
-        ';
+        }
     }
  
     location /main {
-        content_by_lua '
+        content_by_lua_block {
             ngx.ctx.blah = 73
             ngx.say("main pre: ", ngx.ctx.blah)
             local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("main post: ", ngx.ctx.blah)
-        ';
+        }
     }
 </geshi>
 
@@ -2789,16 +2843,16 @@ Internal redirection will destroy the original request <code>ngx.ctx</code> data
 
 <geshi lang="nginx">
     location /new {
-        content_by_lua '
+        content_by_lua_block {
             ngx.say(ngx.ctx.foo)
-        ';
+        }
     }
  
     location /orig {
-        content_by_lua '
+        content_by_lua_block {
             ngx.ctx.foo = "hello"
             ngx.exec("/new")
-        ';
+        }
     }
 </geshi>
 
@@ -2985,13 +3039,13 @@ This option is set to <code>false</code> by default
 
     location /lua {
         set $dog 'hello';
-        content_by_lua '
+        content_by_lua_block {
             res = ngx.location.capture("/other",
                 { share_all_vars = true });
 
             ngx.print(res.body)
             ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-        ';
+        }
     }
 </geshi>
 
@@ -3012,13 +3066,13 @@ The <code>copy_all_vars</code> option provides a copy of the parent request's Ng
 
     location /lua {
         set $dog 'hello';
-        content_by_lua '
+        content_by_lua_block {
             res = ngx.location.capture("/other",
                 { copy_all_vars = true });
 
             ngx.print(res.body)
             ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-        ';
+        }
     }
 </geshi>
 
@@ -3040,21 +3094,21 @@ unescaping them in the Nginx config file.
 
 <geshi lang="nginx">
     location /other {
-        content_by_lua '
+        content_by_lua_block {
             ngx.say("dog = ", ngx.var.dog)
             ngx.say("cat = ", ngx.var.cat)
-        ';
+        }
     }
 
     location /lua {
         set $dog '';
         set $cat '';
-        content_by_lua '
+        content_by_lua_block {
             res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
-        ';
+        }
     }
 </geshi>
 
@@ -3069,18 +3123,18 @@ 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 '
+        content_by_lua_block {
             ngx.ctx.foo = "bar";
-        ';
+        }
     }
     location /lua {
-        content_by_lua '
+        content_by_lua_block {
             local ctx = {}
             res = ngx.location.capture("/sub", { ctx = ctx })
 
             ngx.say(ctx.foo);
             ngx.say(ngx.ctx.foo);
-        ';
+        }
     }
 </geshi>
 
@@ -3095,15 +3149,15 @@ It is also possible to use this <code>ctx</code> option to share the same [[#ngx
 
 <geshi lang="nginx">
     location /sub {
-        content_by_lua '
+        content_by_lua_block {
             ngx.ctx.foo = "bar";
-        ';
+        }
     }
     location /lua {
-        content_by_lua '
+        content_by_lua_block {
             res = ngx.location.capture("/sub", { ctx = ngx.ctx })
             ngx.say(ngx.ctx.foo);
-        ';
+        }
     }
 </geshi>
 
@@ -3192,7 +3246,7 @@ of this function. Logically speaking, the [[#ngx.location.capture|ngx.location.c
 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*, body_filter_by_lua, log_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.
@@ -3213,7 +3267,7 @@ Setting <code>ngx.status</code> after the response header is sent out has no eff
 
 '''syntax:''' ''value = ngx.header.HEADER''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_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's <code>HEADER</code> response header that is to be sent.
 
@@ -3273,7 +3327,7 @@ Reading <code>ngx.header.HEADER</code> will return the value of the response hea
 
 Underscores (<code>_</code>) in the header names will also be replaced by dashes (<code>-</code>) and the header names will be matched case-insensitively. If the response header is not present at all, <code>nil</code> will be returned.
 
-This is particularly useful in the context of [[#header_filter_by_lua|header_filter_by_lua]] and [[#header_filter_by_lua_file|header_filter_by_lua_file]], for example,
+This is particularly useful in the context of [[#header_filter_by_lua|header_filter_by_lua*]], for example,
 
 <geshi lang="nginx">
     location /test {
@@ -3281,11 +3335,11 @@ This is particularly useful in the context of [[#header_filter_by_lua|header_fil
 
         proxy_pass http://some-backend;
 
-        header_filter_by_lua '
+        header_filter_by_lua_block {
             if ngx.header["X-My-Header"] == "blah" then
                 ngx.var.footer = "some value"
             end
-        ';
+        }
 
         echo_after_body $footer;
     }
@@ -3313,7 +3367,7 @@ For reading ''request'' headers, use the [[#ngx.req.get_headers|ngx.req.get_head
 == ngx.resp.get_headers ==
 '''syntax:''' ''headers = ngx.resp.get_headers(max_headers?, raw?)''
 
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_by_lua*, balancer_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*, balancer_by_lua*''
 
 Returns a Lua table holding all the current response headers for the current request.
 
@@ -3478,16 +3532,16 @@ or equivalently,
     ngx.req.set_uri("/foo")
 </geshi>
 
-The <code>jump</code> argument can only be set to <code>true</code> in [[#rewrite_by_lua|rewrite_by_lua]] and [[#rewrite_by_lua_file|rewrite_by_lua_file]]. Use of jump in other contexts is prohibited and will throw out a Lua exception.
+The <code>jump</code> argument can only be set to <code>true</code> in [[#rewrite_by_lua|rewrite_by_lua*]]. Use of jump in other contexts is prohibited and will throw out a Lua exception.
 
 A more sophisticated example involving regex substitutions is as follows
 
 <geshi lang="nginx">
     location /test {
-        rewrite_by_lua '
+        rewrite_by_lua_block {
             local uri = ngx.re.sub(ngx.var.uri, "^/test/(.*)", "/$1", "o")
             ngx.req.set_uri(uri)
-        ';
+        }
         proxy_pass http://my_backend;
     }
 </geshi>
@@ -3557,13 +3611,13 @@ 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*, body_filter_by_lua, log_by_lua*, balancer_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*, balancer_by_lua*''
 
 Returns a Lua table holding all the current request URL query arguments.
 
 <geshi lang="nginx">
     location = /test {
-        content_by_lua '
+        content_by_lua_block {
             local args = ngx.req.get_uri_args()
             for key, val in pairs(args) do
                 if type(val) == "table" then
@@ -3572,7 +3626,7 @@ Returns a Lua table holding all the current request URL query arguments.
                     ngx.say(key, ": ", val)
                 end
             end
-        ';
+        }
     }
 </geshi>
 
@@ -3641,13 +3695,13 @@ Removing the <code>max_args</code> cap is strongly discouraged.
 == ngx.req.get_post_args ==
 '''syntax:''' ''args, err = ngx.req.get_post_args(max_args?)''
 
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua, log_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 errors.
 
 <geshi lang="nginx">
     location = /test {
-        content_by_lua '
+        content_by_lua_block {
             ngx.req.read_body()
             local args, err = ngx.req.get_post_args()
             if not args then
@@ -3661,7 +3715,7 @@ Returns a Lua table holding all the current request POST query arguments (of the
                     ngx.say(key, ": ", val)
                 end
             end
-        ';
+        }
     }
 </geshi>
 
@@ -3731,7 +3785,7 @@ Removing the <code>max_args</code> cap is strongly discouraged.
 == ngx.req.get_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*, body_filter_by_lua, log_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.
 
@@ -3795,7 +3849,7 @@ The <code>__index</code> metamethod will not be added when the <code>raw</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*, body_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.
 
@@ -3981,7 +4035,7 @@ The usage of this function is often like this:
     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 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.
 
@@ -3996,7 +4050,7 @@ When the data can no longer be hold in the memory buffer for the request body, t
 
 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 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.
 
@@ -4009,7 +4063,7 @@ See also [[#ngx.req.init_body|ngx.req.init_body]].
 
 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 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.
 
@@ -4074,20 +4128,20 @@ Named locations are also supported but the second <code>args</code> argument wil
 
 <geshi lang="nginx">
     location /foo {
-        content_by_lua '
+        content_by_lua_block {
             ngx.exec("@bar", "a=goodbye");
-        ';
+        }
     }
 
     location @bar {
-        content_by_lua '
+        content_by_lua_block {
             local args = ngx.req.get_uri_args()
             for key, val in pairs(args) do
                 if key == "a" then
                     ngx.say(val)
                 end
             end
-        ';
+        }
     }
 </geshi>
 
@@ -4097,7 +4151,7 @@ it is purely an internal redirect and that no new external HTTP traffic is invol
 Also note that this method call terminates the processing of the current request and that it ''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 is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.exec(...)</code> be adopted when this method call is used in contexts other than [[#header_filter_by_lua|header_filter_by_lua]] to reinforce the fact that the request processing is being terminated.
+It is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.exec(...)</code> be adopted when this method call is used in contexts other than [[#header_filter_by_lua|header_filter_by_lua*]] to reinforce the fact that the request processing is being terminated.
 
 == ngx.redirect ==
 '''syntax:''' ''ngx.redirect(uri, status?)''
@@ -4106,8 +4160,13 @@ It is recommended that a coding style that combines this method call with the <c
 
 Issue an <code>HTTP 301</code> or <code>302</code> redirection to <code>uri</code>.
 
-The optional <code>status</code> parameter specifies whether
-<code>301</code> or <code>302</code> to be used. It is <code>302</code> (<code>ngx.HTTP_MOVED_TEMPORARILY</code>) by default.
+The optional <code>status</code> parameter specifies the HTTP status code to be used. The following status codes are supported right now:
+
+* <code>301</code>
+* <code>302</code> (default)
+* <code>307</code>
+
+It is <code>302</code> (<code>ngx.HTTP_MOVED_TEMPORARILY</code>) by default.
 
 Here is an example assuming the current server name is <code>localhost</code> and that it is listening on port 1984:
 
@@ -4167,7 +4226,7 @@ URI arguments can be specified as well, for example:
 Note that this method call terminates the processing of the current request and that it ''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 is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.redirect(...)</code> be adopted when this method call is used in contexts other than [[#header_filter_by_lua|header_filter_by_lua]] to reinforce the fact that the request processing is being terminated.
+It is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.redirect(...)</code> be adopted when this method call is used in contexts other than [[#header_filter_by_lua|header_filter_by_lua*]] to reinforce the fact that the request processing is being terminated.
 
 == ngx.send_headers ==
 '''syntax:''' ''ok, err = ngx.send_headers()''
@@ -4179,7 +4238,7 @@ Explicitly send out the response headers.
 Since <code>v0.8.3</code> this function returns <code>1</code> on success, or returns <code>nil</code> and a string describing the error otherwise.
 
 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.
+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''
@@ -4270,7 +4329,7 @@ Since <code>v0.8.3</code> this function returns <code>1</code> on success, or re
 
 When <code>status >= 200</code> (i.e., <code>ngx.HTTP_OK</code> and above), it will interrupt the execution of the current request and return status code to nginx.
 
-When <code>status == 0</code> (i.e., <code>ngx.OK</code>), it will only quit the current phase handler (or the content handler if the [[#content_by_lua|content_by_lua]] directive is used) and continue to run later phases (if any) for the current request.
+When <code>status == 0</code> (i.e., <code>ngx.OK</code>), it will only quit the current phase handler (or the content handler if the [[#content_by_lua|content_by_lua*]] directive is used) and continue to run later phases (if any) for the current request.
 
 The <code>status</code> argument can be <code>ngx.OK</code>, <code>ngx.ERROR</code>, <code>ngx.HTTP_NOT_FOUND</code>,
 <code>ngx.HTTP_MOVED_TEMPORARILY</code>, or other [[#HTTP status constants|HTTP status constants]].
@@ -4324,11 +4383,11 @@ When you disable the HTTP 1.1 keep-alive feature for your downstream connections
 <geshi lang="nginx">
     location = /async {
         keepalive_timeout 0;
-        content_by_lua '
+        content_by_lua_block {
             ngx.say("got the task!")
             ngx.eof()  -- a descent HTTP client will close the connection at this point
             -- access MySQL, PostgreSQL, Redis, Memcached, and etc here...
-        ';
+        }
     }
 </geshi>
 
@@ -4532,7 +4591,7 @@ For example,
 
 <geshi lang="nginx">
     location = /md5 {
-        content_by_lua 'ngx.say(ngx.md5("hello"))';
+        content_by_lua_block { ngx.say(ngx.md5("hello")) }
     }
 </geshi>
 
@@ -5071,17 +5130,17 @@ Here is an example:
         lua_shared_dict dogs 10m;
         server {
             location /set {
-                content_by_lua '
+                content_by_lua_block {
                     local dogs = ngx.shared.dogs
                     dogs:set("Jim", 8)
                     ngx.say("STORED")
-                ';
+                }
             }
             location /get {
-                content_by_lua '
+                content_by_lua_block {
                     local dogs = ngx.shared.dogs
                     ngx.say(dogs:get("Jim"))
-                ';
+                }
             }
         }
     }
@@ -5434,7 +5493,7 @@ Here is an example for connecting to a UDP (memcached) server:
     location /test {
         resolver 8.8.8.8;
 
-        content_by_lua '
+        content_by_lua_block {
             local sock = ngx.socket.udp()
             local ok, err = sock:setpeername("my.memcached.server.domain", 11211)
             if not ok then
@@ -5443,7 +5502,7 @@ Here is an example for connecting to a UDP (memcached) server:
             end
             ngx.say("successfully connected to memcached!")
             sock:close()
-        ';
+        }
     }
 </geshi>
 
@@ -5550,6 +5609,7 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [[#tcpsock:receive|receive]]
 * [[#tcpsock:close|close]]
 * [[#tcpsock:settimeout|settimeout]]
+* [[#tcpsock:settimeouts|settimeouts]]
 * [[#tcpsock:setoption|setoption]]
 * [[#tcpsock:receiveuntil|receiveuntil]]
 * [[#tcpsock:setkeepalive|setkeepalive]]
@@ -5605,7 +5665,7 @@ Here is an example for connecting to a TCP server:
     location /test {
         resolver 8.8.8.8;
 
-        content_by_lua '
+        content_by_lua_block {
             local sock = ngx.socket.tcp()
             local ok, err = sock:connect("www.google.com", 80)
             if not ok then
@@ -5614,7 +5674,7 @@ Here is an example for connecting to a TCP server:
             end
             ngx.say("successfully connected to google!")
             sock:close()
-        ';
+        }
     }
 </geshi>
 
@@ -5878,6 +5938,22 @@ Note that this method does ''not'' affect the [[#lua_socket_keepalive_timeout|lu
 
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
+== tcpsock:settimeouts ==
+'''syntax:''' ''tcpsock:settimeouts(connect_timeout, send_timeout, read_timeout)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
+
+Sets the connect timeout thresold, send timeout threshold, and read timeout threshold, respetively, in milliseconds, for subsequent socket
+operations ([[#tcpsock:connect|connect]], [[#tcpsock:send|send]], [[#tcpsock:receive|receive]], and iterators returned from [[#tcpsock:receiveuntil|receiveuntil]]).
+
+Settings done by this method takes priority over those config directives, i.e., [[#lua_socket_connect_timeout|lua_socket_connect_timeout]], [[#lua_socket_send_timeout|lua_socket_send_timeout]], and [[#lua_socket_read_timeout|lua_socket_read_timeout]].
+
+You are recommended to use [[#tcpsock:settimeouts|settimeouts]] instead of [[#tcpsock:settimeout|settimeout]].
+
+Note that this method does ''not'' affect the [[#lua_socket_keepalive_timeout|lua_socket_keepalive_timeout]] setting; the <code>timeout</code> argument to the [[#tcpsock:setkeepalive|setkeepalive]] method should be used for this purpose instead.
+
+This feature was first introduced in the <code>v0.10.7</code> release.
+
 == tcpsock:setoption ==
 '''syntax:''' ''tcpsock:setoption(option, value?)''
 
@@ -5953,31 +6029,31 @@ This feature was first introduced in the <code>v0.5.0rc1</code> release.
 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]].
+: for the context of [[#init_by_lua|init_by_lua*]].
 * <code>init_worker</code>
-: for the context of [[#init_worker_by_lua|init_worker_by_lua]] or [[#init_worker_by_lua_file|init_worker_by_lua_file]].
+: for the context of [[#init_worker_by_lua|init_worker_by_lua*]].
 * <code>ssl_cert</code>
-: for the context of [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua_block]] or [[#ssl_certificate_by_lua_file|ssl_certificate_by_lua_file]].
+: for the context of [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]].
 * <code>ssl_session_fetch</code>
 : for the context of [[#ssl_session_fetch_by_lua_block|ssl_session_fetch_by_lua*]].
 * <code>ssl_session_store</code>
 : for the context of [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]].
 * <code>set</code>
-: for the context of [[#set_by_lua|set_by_lua]] or [[#set_by_lua_file|set_by_lua_file]].
+: for the context of [[#set_by_lua|set_by_lua*]].
 * <code>rewrite</code>
-: for the context of [[#rewrite_by_lua|rewrite_by_lua]] or [[#rewrite_by_lua_file|rewrite_by_lua_file]].
+: for the context of [[#rewrite_by_lua|rewrite_by_lua*]].
 * <code>balancer</code>
-: for the context of [[#balancer_by_lua_block|balancer_by_lua_block]] or [[#balancer_by_lua_file|balancer_by_lua_file]].
+: for the context of [[#balancer_by_lua_block|balancer_by_lua*]].
 * <code>access</code>
-: for the context of [[#access_by_lua|access_by_lua]] or [[#access_by_lua_file|access_by_lua_file]].
+: for the context of [[#access_by_lua|access_by_lua*]].
 * <code>content</code>
-: for the context of [[#content_by_lua|content_by_lua]] or [[#content_by_lua_file|content_by_lua_file]].
+: for the context of [[#content_by_lua|content_by_lua*]].
 * <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]].
+: for the context of [[#header_filter_by_lua|header_filter_by_lua*]].
 * <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]].
+: for the context of [[#body_filter_by_lua|body_filter_by_lua*]].
 * <code>log</code>
-: for the context of [[#log_by_lua|log_by_lua]] or [[#log_by_lua_file|log_by_lua_file]].
+: for the context of [[#log_by_lua|log_by_lua*]].
 * <code>timer</code>
 : for the context of user callback functions for [[#ngx.timer.at|ngx.timer.*]].
 
@@ -6304,7 +6380,7 @@ Here is a simple example:
 <geshi lang="nginx">
     location / {
         ...
-        log_by_lua '
+        log_by_lua_block {
             local function push_data(premature, uri, args, status)
                 -- push the data uri, args, and status to the remote
                 -- via ngx.socket.tcp or ngx.socket.udp
@@ -6317,7 +6393,7 @@ Here is a simple example:
                 ngx.log(ngx.ERR, "failed to create timer: ", err)
                 return
             end
-        ';
+        }
     }
 </geshi>
 
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 88b41ad..3737149 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
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10006
+#define ngx_http_lua_version  10007
 
 
 typedef struct {
@@ -46,6 +46,9 @@ ngx_int_t ngx_http_lua_shared_dict_get(ngx_shm_zone_t *shm_zone,
 
 ngx_shm_zone_t *ngx_http_lua_find_zone(u_char *name_data, size_t name_len);
 
+ngx_shm_zone_t *ngx_http_lua_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name,
+    size_t size, void *tag);
+
 
 #endif /* _NGX_HTTP_LUA_API_H_INCLUDED_ */
 
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 fcf07ac..b72c707 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_api.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_api.c
@@ -4,10 +4,15 @@
  */
 
 
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
 #include "ddebug.h"
 
+
 #include "ngx_http_lua_common.h"
 #include "api/ngx_http_lua_api.h"
+#include "ngx_http_lua_shdict.h"
 #include "ngx_http_lua_util.h"
 
 
@@ -29,6 +34,10 @@ ngx_http_lua_get_request(lua_State *L)
 }
 
 
+static ngx_int_t ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone,
+    void *data);
+
+
 ngx_int_t
 ngx_http_lua_add_package_preload(ngx_conf_t *cf, const char *package,
     lua_CFunction func)
@@ -74,4 +83,133 @@ ngx_http_lua_add_package_preload(ngx_conf_t *cf, const char *package,
     return NGX_OK;
 }
 
+
+ngx_shm_zone_t *
+ngx_http_lua_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name, size_t size,
+    void *tag)
+{
+    ngx_http_lua_main_conf_t     *lmcf;
+    ngx_shm_zone_t              **zp;
+    ngx_shm_zone_t               *zone;
+    ngx_http_lua_shm_zone_ctx_t  *ctx;
+    ngx_int_t                     n;
+
+    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
+    if (lmcf == NULL) {
+        return NULL;
+    }
+
+    if (lmcf->shm_zones == NULL) {
+        lmcf->shm_zones = ngx_palloc(cf->pool, sizeof(ngx_array_t));
+        if (lmcf->shm_zones == NULL) {
+            return NULL;
+        }
+
+        if (ngx_array_init(lmcf->shm_zones, cf->pool, 2,
+                           sizeof(ngx_shm_zone_t *))
+            != NGX_OK)
+        {
+            return NULL;
+        }
+    }
+
+    zone = ngx_shared_memory_add(cf, name, (size_t) size, tag);
+    if (zone == NULL) {
+        return NULL;
+    }
+
+    if (zone->data) {
+        ctx = (ngx_http_lua_shm_zone_ctx_t *) zone->data;
+        return &ctx->zone;
+    }
+
+    n = sizeof(ngx_http_lua_shm_zone_ctx_t);
+
+    ctx = ngx_pcalloc(cf->pool, n);
+    if (ctx == NULL) {
+        return NULL;
+    }
+
+    ctx->lmcf = lmcf;
+    ctx->log = &cf->cycle->new_log;
+    ctx->cycle = cf->cycle;
+
+    ngx_memcpy(&ctx->zone, zone, sizeof(ngx_shm_zone_t));
+
+    zp = ngx_array_push(lmcf->shm_zones);
+    if (zp == NULL) {
+        return NULL;
+    }
+
+    *zp = zone;
+
+    /* set zone init */
+    zone->init = ngx_http_lua_shared_memory_init;
+    zone->data = ctx;
+
+    lmcf->requires_shm = 1;
+
+    return &ctx->zone;
+}
+
+
+static ngx_int_t
+ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
+{
+    ngx_http_lua_shm_zone_ctx_t *octx = data;
+    ngx_shm_zone_t              *ozone;
+    void                        *odata;
+
+    ngx_int_t                    rc;
+    volatile ngx_cycle_t        *saved_cycle;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_lua_shm_zone_ctx_t *ctx;
+    ngx_shm_zone_t              *zone;
+
+    ctx = (ngx_http_lua_shm_zone_ctx_t *) shm_zone->data;
+    zone = &ctx->zone;
+
+    odata = NULL;
+    if (octx) {
+        ozone = &octx->zone;
+        odata = ozone->data;
+    }
+
+    zone->shm = shm_zone->shm;
+    zone->noreuse = shm_zone->noreuse;
+
+    if (zone->init(zone, odata) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    dd("get lmcf");
+
+    lmcf = ctx->lmcf;
+    if (lmcf == NULL) {
+        return NGX_ERROR;
+    }
+
+    dd("lmcf->lua: %p", lmcf->lua);
+
+    lmcf->shm_zones_inited++;
+
+    if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
+        && lmcf->init_handler)
+    {
+        saved_cycle = ngx_cycle;
+        ngx_cycle = ctx->cycle;
+
+        rc = lmcf->init_handler(ctx->log, lmcf, lmcf->lua);
+
+        ngx_cycle = saved_cycle;
+
+        if (rc != NGX_OK) {
+            /* an error happened */
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
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 d5e0dc8..267952b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_common.h
@@ -172,6 +172,8 @@ struct ngx_http_lua_main_conf_s {
 
     ngx_array_t         *shm_zones;  /* of ngx_shm_zone_t* */
 
+    ngx_array_t         *shdict_zones; /* shm zones of "shdict" */
+
     ngx_array_t         *preload_hooks; /* of ngx_http_lua_preload_hook_t */
 
     ngx_flag_t           postponed_to_rewrite_phase_end;
@@ -193,6 +195,10 @@ struct ngx_http_lua_main_conf_s {
 
     ngx_http_lua_sema_mm_t         *sema_mm;
 
+    ngx_uint_t           malloc_trim_cycle;  /* a cycle is defined as the number
+                                                of reqeusts */
+    ngx_uint_t           malloc_trim_req_count;
+
     unsigned             requires_header_filter:1;
     unsigned             requires_body_filter:1;
     unsigned             requires_capture_filter:1;
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 9e78bec..249d763 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_control.c
@@ -105,10 +105,10 @@ ngx_http_lua_ngx_exec(lua_State *L)
 
     ngx_http_lua_check_if_abortable(L, ctx);
 
-    if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags)
-        != NGX_OK)
-    {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    flags = NGX_HTTP_LOG_UNSAFE;
+
+    if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags) != NGX_OK) {
+        return luaL_error(L, "unsafe uri");
     }
 
     if (n == 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 e9313db..862edda 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
@@ -26,6 +26,7 @@
 #include "ngx_http_lua_shdict.h"
 #include "ngx_http_lua_ssl_certby.h"
 #include "ngx_http_lua_lex.h"
+#include "api/ngx_http_lua_api.h"
 
 
 typedef struct ngx_http_lua_block_parser_ctx_s
@@ -78,13 +79,13 @@ ngx_http_lua_shared_dict(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_lua_shdict_ctx_t  *ctx;
     ssize_t                     size;
 
-    if (lmcf->shm_zones == NULL) {
-        lmcf->shm_zones = ngx_palloc(cf->pool, sizeof(ngx_array_t));
-        if (lmcf->shm_zones == NULL) {
+    if (lmcf->shdict_zones == NULL) {
+        lmcf->shdict_zones = ngx_palloc(cf->pool, sizeof(ngx_array_t));
+        if (lmcf->shdict_zones == NULL) {
             return NGX_CONF_ERROR;
         }
 
-        if (ngx_array_init(lmcf->shm_zones, cf->pool, 2,
+        if (ngx_array_init(lmcf->shdict_zones, cf->pool, 2,
                            sizeof(ngx_shm_zone_t *))
             != NGX_OK)
         {
@@ -120,10 +121,9 @@ 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;
-    ctx->cycle = cf->cycle;
 
-    zone = ngx_shared_memory_add(cf, &name, (size_t) size,
-                                 &ngx_http_lua_module);
+    zone = ngx_http_lua_shared_memory_add(cf, &name, (size_t) size,
+                                          &ngx_http_lua_module);
     if (zone == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -140,7 +140,7 @@ ngx_http_lua_shared_dict(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     zone->init = ngx_http_lua_shdict_init_zone;
     zone->data = ctx;
 
-    zp = ngx_array_push(lmcf->shm_zones);
+    zp = ngx_array_push(lmcf->shdict_zones);
     if (zp == NULL) {
         return NGX_CONF_ERROR;
     }
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 b0c28d5..4852b2f 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
@@ -263,11 +263,6 @@ retry:
 
 new_header:
 
-    if (r->headers_in.headers.last == NULL) {
-        /* must be 400 bad request */
-        return NGX_OK;
-    }
-
     h = ngx_list_push(&r->headers_in.headers);
 
     if (h == NULL) {
@@ -698,6 +693,11 @@ ngx_http_lua_set_input_header(ngx_http_request_t *r, ngx_str_t key,
     }
 #endif
 
+    if (r->headers_out.status == 400 || r->headers_in.headers.last == NULL) {
+        /* must be a 400 Bad Request */
+        return NGX_OK;
+    }
+
     return hv.handler(r, &hv, &value);
 }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_logby.c b/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
index 49fcd08..0f1d2f3 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_logby.c
@@ -27,6 +27,9 @@
 #include "ngx_http_lua_shdict.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_exception.h"
+#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
+#include <malloc.h>
+#endif
 
 
 static ngx_int_t ngx_http_lua_log_by_chunk(lua_State *L, ngx_http_request_t *r);
@@ -67,9 +70,43 @@ ngx_http_lua_log_by_lua_env(lua_State *L, ngx_http_request_t *r)
 ngx_int_t
 ngx_http_lua_log_handler(ngx_http_request_t *r)
 {
+#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
+    ngx_uint_t                   trim_cycle, trim_nreq;
+    ngx_http_lua_main_conf_t    *lmcf;
+#endif
     ngx_http_lua_loc_conf_t     *llcf;
     ngx_http_lua_ctx_t          *ctx;
 
+#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+    trim_cycle = lmcf->malloc_trim_cycle;
+
+    if (trim_cycle > 0) {
+
+        dd("cycle: %d", (int) trim_cycle);
+
+        trim_nreq = ++lmcf->malloc_trim_req_count;
+
+        if (trim_nreq >= trim_cycle) {
+            lmcf->malloc_trim_req_count = 0;
+
+#if (NGX_DEBUG)
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "malloc_trim(1) returned %d", malloc_trim(1));
+#else
+            (void) malloc_trim(1);
+#endif
+        }
+    }
+#   if (NGX_DEBUG)
+    else {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "malloc_trim() disabled");
+    }
+#   endif
+#endif
+
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua log handler, uri:\"%V\" c:%ud", &r->uri,
                    r->main->count);
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 c5e10f9..6e93c8e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
@@ -53,6 +53,8 @@ void ngx_http_lua_limit_data_segment(void);
 static ngx_int_t ngx_http_lua_pre_config(ngx_conf_t *cf);
 #   endif
 #endif
+static char *ngx_http_lua_malloc_trim(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 
 
 static ngx_conf_post_t  ngx_http_lua_lowat_post =
@@ -528,28 +530,28 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       (void *) ngx_http_lua_ssl_cert_handler_file },
 
     { ngx_string("ssl_session_store_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
       ngx_http_lua_ssl_sess_store_by_lua_block,
       NGX_HTTP_SRV_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_ssl_sess_store_handler_inline },
 
     { ngx_string("ssl_session_store_by_lua_file"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_http_lua_ssl_sess_store_by_lua,
       NGX_HTTP_SRV_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_ssl_sess_store_handler_file },
 
     { ngx_string("ssl_session_fetch_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
       ngx_http_lua_ssl_sess_fetch_by_lua_block,
       NGX_HTTP_SRV_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_ssl_sess_fetch_handler_inline },
 
     { ngx_string("ssl_session_fetch_by_lua_file"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_http_lua_ssl_sess_fetch_by_lua,
       NGX_HTTP_SRV_CONF_OFFSET,
       0,
@@ -578,6 +580,13 @@ static ngx_command_t ngx_http_lua_cmds[] = {
 
 #endif  /* NGX_HTTP_SSL */
 
+     { ngx_string("lua_malloc_trim"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_http_lua_malloc_trim,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
     ngx_null_command
 };
 
@@ -812,6 +821,7 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
      *      lmcf->init_handler = NULL;
      *      lmcf->init_src = { 0, NULL };
      *      lmcf->shm_zones_inited = 0;
+     *      lmcf->shdict_zones = NULL;
      *      lmcf->preload_hooks = NULL;
      *      lmcf->requires_header_filter = 0;
      *      lmcf->requires_body_filter = 0;
@@ -832,6 +842,10 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
     lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
     lmcf->postponed_to_access_phase_end = NGX_CONF_UNSET;
 
+#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
+    lmcf->malloc_trim_cycle = NGX_CONF_UNSET_UINT;
+#endif
+
 #ifndef NGX_LUA_NO_FFI_API
     rc = ngx_http_lua_sema_mm_init(cf, lmcf);
     if (rc != NGX_OK) {
@@ -868,6 +882,12 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
         lmcf->max_running_timers = 256;
     }
 
+#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
+    if (lmcf->malloc_trim_cycle == NGX_CONF_UNSET_UINT) {
+        lmcf->malloc_trim_cycle = 1000;  /* number of reqs */
+    }
+#endif
+
     lmcf->cycle = cf->cycle;
 
     return NGX_CONF_OK;
@@ -963,21 +983,18 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     if (conf->srv.ssl_sess_store_src.len) {
         sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
-        if (sscf == NULL || sscf->ssl.ctx == NULL) {
+        if (sscf && sscf->ssl.ctx) {
+#ifdef LIBRESSL_VERSION_NUMBER
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no ssl configured for the server");
+                          "LibreSSL does not support "
+                          "ssl_session_store_by_lua*");
 
             return NGX_CONF_ERROR;
-        }
-
-#ifdef LIBRESSL_VERSION_NUMBER
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "LibreSSL does not support ssl_session_store_by_lua*");
-        return NGX_CONF_ERROR;
 #else
-        SSL_CTX_sess_set_new_cb(sscf->ssl.ctx,
-                                ngx_http_lua_ssl_sess_store_handler);
+            SSL_CTX_sess_set_new_cb(sscf->ssl.ctx,
+                                    ngx_http_lua_ssl_sess_store_handler);
 #endif
+        }
     }
 
     if (conf->srv.ssl_sess_fetch_src.len == 0) {
@@ -988,21 +1005,18 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     if (conf->srv.ssl_sess_fetch_src.len) {
         sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
-        if (sscf == NULL || sscf->ssl.ctx == NULL) {
+        if (sscf && sscf->ssl.ctx) {
+#ifdef LIBRESSL_VERSION_NUMBER
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no ssl configured for the server");
+                          "LibreSSL does not support "
+                          "ssl_session_fetch_by_lua*");
 
             return NGX_CONF_ERROR;
-        }
-
-#ifdef LIBRESSL_VERSION_NUMBER
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "LibreSSL does not support ssl_session_fetch_by_lua*");
-        return NGX_CONF_ERROR;
 #else
-        SSL_CTX_sess_set_get_cb(sscf->ssl.ctx,
-                                ngx_http_lua_ssl_sess_fetch_handler);
+            SSL_CTX_sess_set_get_cb(sscf->ssl.ctx,
+                                    ngx_http_lua_ssl_sess_fetch_handler);
 #endif
+        }
     }
 
 #endif  /* NGX_HTTP_SSL */
@@ -1283,4 +1297,39 @@ ngx_http_lua_limit_data_segment(void)
 }
 #endif
 
+
+static char *
+ngx_http_lua_malloc_trim(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
+
+    ngx_int_t       nreqs;
+    ngx_str_t      *value;
+
+    ngx_http_lua_main_conf_t    *lmcf = conf;
+
+    value = cf->args->elts;
+
+    nreqs = ngx_atoi(value[1].data, value[1].len);
+    if (nreqs == NGX_ERROR) {
+        return "invalid number in the 1st argument";
+    }
+
+    lmcf->malloc_trim_cycle = (ngx_uint_t) nreqs;
+
+    if (nreqs == 0) {
+        return NGX_CONF_OK;
+    }
+
+    lmcf->requires_log = 1;
+
+#else
+
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "lua_malloc_trim is not supported "
+                       "on this platform, ignored");
+
+#endif
+    return NGX_CONF_OK;
+}
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
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 ac7f6f1..d6cad7e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
@@ -84,10 +84,7 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     ngx_http_lua_shdict_ctx_t  *octx = data;
 
     size_t                      len;
-    ngx_int_t                   rc;
-    volatile ngx_cycle_t       *saved_cycle;
     ngx_http_lua_shdict_ctx_t  *ctx;
-    ngx_http_lua_main_conf_t   *lmcf;
 
     dd("init zone");
 
@@ -97,7 +94,7 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
         ctx->sh = octx->sh;
         ctx->shpool = octx->shpool;
 
-        goto done;
+        return NGX_OK;
     }
 
     ctx->shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
@@ -105,7 +102,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;
 
-        goto done;
+        return NGX_OK;
     }
 
     ctx->sh = ngx_slab_alloc(ctx->shpool, sizeof(ngx_http_lua_shdict_shctx_t));
@@ -134,32 +131,6 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     ctx->shpool->log_nomem = 0;
 #endif
 
-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)
-    {
-        saved_cycle = ngx_cycle;
-        ngx_cycle = ctx->cycle;
-
-        rc = lmcf->init_handler(ctx->log, lmcf, lmcf->lua);
-
-        ngx_cycle = saved_cycle;
-
-        if (rc != NGX_OK) {
-            /* an error happened */
-            return NGX_ERROR;
-        }
-    }
-
     return NGX_OK;
 }
 
@@ -355,8 +326,8 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
     ngx_uint_t                   i;
     ngx_shm_zone_t             **zone;
 
-    if (lmcf->shm_zones != NULL) {
-        lua_createtable(L, 0, lmcf->shm_zones->nelts /* nrec */);
+    if (lmcf->shdict_zones != NULL) {
+        lua_createtable(L, 0, lmcf->shdict_zones->nelts /* nrec */);
                 /* ngx.shared */
 
         lua_createtable(L, 0 /* narr */, 18 /* nrec */); /* shared mt */
@@ -415,9 +386,9 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
         lua_pushvalue(L, -1); /* shared mt mt */
         lua_setfield(L, -2, "__index"); /* shared mt */
 
-        zone = lmcf->shm_zones->elts;
+        zone = lmcf->shdict_zones->elts;
 
-        for (i = 0; i < lmcf->shm_zones->nelts; i++) {
+        for (i = 0; i < lmcf->shdict_zones->nelts; i++) {
             ctx = zone[i]->data;
 
             lua_pushlstring(L, (char *) ctx->name.data, ctx->name.len);
@@ -1195,6 +1166,9 @@ insert:
         + key.len
         + value.len;
 
+    dd("overhead = %d", (int) (offsetof(ngx_rbtree_node_t, color)
+       + offsetof(ngx_http_lua_shdict_node_t, data)));
+
     node = ngx_slab_alloc_locked(ctx->shpool, n);
 
     if (node == NULL) {
@@ -2199,6 +2173,7 @@ 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;
+    ngx_http_lua_shm_zone_ctx_t     *ctx;
     volatile ngx_list_part_t        *part;
 
     part = &ngx_cycle->shared_memory.part;
@@ -2224,7 +2199,8 @@ ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
         if (name->len == name_len
             && ngx_strncmp(name->data, name_data, name_len) == 0)
         {
-            return &zone[i];
+            ctx = (ngx_http_lua_shm_zone_ctx_t *) zone[i].data;
+            return &ctx->zone;
         }
     }
 
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 5c4ff36..90a0099 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
@@ -13,12 +13,11 @@
 
 typedef struct {
     u_char                       color;
-    u_char                       dummy;
-    u_short                      key_len;
-    ngx_queue_t                  queue;
-    uint64_t                     expires;
     uint8_t                      value_type;
+    u_short                      key_len;
     uint32_t                     value_len;
+    uint64_t                     expires;
+    ngx_queue_t                  queue;
     uint32_t                     user_flags;
     u_char                       data[1];
 } ngx_http_lua_shdict_node_t;
@@ -45,10 +44,17 @@ typedef struct {
     ngx_str_t                     name;
     ngx_http_lua_main_conf_t     *main_conf;
     ngx_log_t                    *log;
-    ngx_cycle_t                  *cycle;
 } ngx_http_lua_shdict_ctx_t;
 
 
+typedef struct {
+    ngx_log_t                   *log;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_cycle_t                 *cycle;
+    ngx_shm_zone_t               zone;
+} ngx_http_lua_shm_zone_ctx_t;
+
+
 ngx_int_t ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data);
 void ngx_http_lua_shdict_rbtree_insert_value(ngx_rbtree_node_t *temp,
     ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
index fe6001f..6db6e2d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
@@ -28,6 +28,7 @@ static int ngx_http_lua_socket_tcp_send(lua_State *L);
 static int ngx_http_lua_socket_tcp_close(lua_State *L);
 static int ngx_http_lua_socket_tcp_setoption(lua_State *L);
 static int ngx_http_lua_socket_tcp_settimeout(lua_State *L);
+static int ngx_http_lua_socket_tcp_settimeouts(lua_State *L);
 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);
@@ -137,8 +138,10 @@ static void ngx_http_lua_socket_tcp_close_connection(ngx_connection_t *c);
 
 enum {
     SOCKET_CTX_INDEX = 1,
-    SOCKET_TIMEOUT_INDEX = 2,
-    SOCKET_KEY_INDEX = 3
+    SOCKET_KEY_INDEX = 3,
+    SOCKET_CONNECT_TIMEOUT_INDEX = 2,
+    SOCKET_SEND_TIMEOUT_INDEX = 4,
+    SOCKET_READ_TIMEOUT_INDEX = 5,
 };
 
 
@@ -225,7 +228,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 
     /* {{{req socket object metatable */
     lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
-    lua_createtable(L, 0 /* narr */, 4 /* nrec */);
+    lua_createtable(L, 0 /* narr */, 5 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
     lua_setfield(L, -2, "receive");
@@ -236,6 +239,9 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeout);
     lua_setfield(L, -2, "settimeout"); /* ngx socket mt */
 
+    lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeouts);
+    lua_setfield(L, -2, "settimeouts"); /* ngx socket mt */
+
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "__index");
 
@@ -244,7 +250,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 
     /* {{{raw req socket object metatable */
     lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
-    lua_createtable(L, 0 /* narr */, 5 /* nrec */);
+    lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
     lua_setfield(L, -2, "receive");
@@ -258,6 +264,9 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeout);
     lua_setfield(L, -2, "settimeout"); /* ngx socket mt */
 
+    lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeouts);
+    lua_setfield(L, -2, "settimeouts"); /* ngx socket mt */
+
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "__index");
 
@@ -266,7 +275,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 
     /* {{{tcp object metatable */
     lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
-    lua_createtable(L, 0 /* narr */, 11 /* nrec */);
+    lua_createtable(L, 0 /* narr */, 12 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_connect);
     lua_setfield(L, -2, "connect");
@@ -296,6 +305,9 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeout);
     lua_setfield(L, -2, "settimeout"); /* ngx socket mt */
 
+    lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeouts);
+    lua_setfield(L, -2, "settimeouts"); /* ngx socket mt */
+
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_getreusedtimes);
     lua_setfield(L, -2, "getreusedtimes");
 
@@ -389,7 +401,7 @@ ngx_http_lua_socket_tcp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_SSL_CERT
                                | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
-    lua_createtable(L, 3 /* narr */, 1 /* nrec */);
+    lua_createtable(L, 5 /* narr */, 1 /* nrec */);
     lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
@@ -417,7 +429,7 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
     ngx_int_t                    rc;
     ngx_http_lua_loc_conf_t     *llcf;
     ngx_peer_connection_t       *pc;
-    int                          timeout;
+    int                          connect_timeout, send_timeout, read_timeout;
     unsigned                     custom_pool;
     int                          key_index;
     const char                  *msg;
@@ -576,19 +588,35 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     dd("lua peer connection log: %p", pc->log);
 
-    lua_rawgeti(L, 1, SOCKET_TIMEOUT_INDEX);
-    timeout = (ngx_int_t) lua_tointeger(L, -1);
-    lua_pop(L, 1);
+    lua_rawgeti(L, 1, SOCKET_CONNECT_TIMEOUT_INDEX);
+    lua_rawgeti(L, 1, SOCKET_SEND_TIMEOUT_INDEX);
+    lua_rawgeti(L, 1, SOCKET_READ_TIMEOUT_INDEX);
 
-    if (timeout > 0) {
-        u->send_timeout = (ngx_msec_t) timeout;
-        u->read_timeout = (ngx_msec_t) timeout;
-        u->connect_timeout = (ngx_msec_t) timeout;
+    read_timeout = (ngx_int_t) lua_tointeger(L, -1);
+    send_timeout = (ngx_int_t) lua_tointeger(L, -2);
+    connect_timeout = (ngx_int_t) lua_tointeger(L, -3);
+
+    lua_pop(L, 3);
+
+    if (connect_timeout > 0) {
+        u->connect_timeout = (ngx_msec_t) connect_timeout;
+
+    } else {
+        u->connect_timeout = u->conf->connect_timeout;
+    }
+
+    if (send_timeout > 0) {
+        u->send_timeout = (ngx_msec_t) send_timeout;
+
+    } else {
+        u->send_timeout = u->conf->send_timeout;
+    }
+
+    if (read_timeout > 0) {
+        u->read_timeout = (ngx_msec_t) read_timeout;
 
     } else {
         u->read_timeout = u->conf->read_timeout;
-        u->send_timeout = u->conf->send_timeout;
-        u->connect_timeout = u->conf->connect_timeout;
     }
 
     rc = ngx_http_lua_get_keepalive_peer(r, L, key_index, u);
@@ -2669,14 +2697,17 @@ ngx_http_lua_socket_tcp_settimeout(lua_State *L)
     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));
+        return luaL_error(L, "ngx.socket settimout: expecting 2 arguments "
+                          "(including the object) but seen %d", lua_gettop(L));
     }
 
     timeout = (ngx_int_t) lua_tonumber(L, 2);
+    lua_pushinteger(L, timeout);
+    lua_pushinteger(L, timeout);
 
-    lua_rawseti(L, 1, SOCKET_TIMEOUT_INDEX);
+    lua_rawseti(L, 1, SOCKET_CONNECT_TIMEOUT_INDEX);
+    lua_rawseti(L, 1, SOCKET_SEND_TIMEOUT_INDEX);
+    lua_rawseti(L, 1, SOCKET_READ_TIMEOUT_INDEX);
 
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
@@ -2698,6 +2729,59 @@ ngx_http_lua_socket_tcp_settimeout(lua_State *L)
 }
 
 
+static int
+ngx_http_lua_socket_tcp_settimeouts(lua_State *L)
+{
+    int                     n;
+    ngx_int_t               connect_timeout, send_timeout, read_timeout;
+
+    ngx_http_lua_socket_tcp_upstream_t  *u;
+
+    n = lua_gettop(L);
+
+    if (n != 4) {
+        return luaL_error(L, "ngx.socket settimout: expecting 4 arguments "
+                          "(including the object) but seen %d", lua_gettop(L));
+    }
+
+    connect_timeout = (ngx_int_t) lua_tonumber(L, 2);
+    send_timeout = (ngx_int_t) lua_tonumber(L, 3);
+    read_timeout = (ngx_int_t) lua_tonumber(L, 4);
+
+    lua_rawseti(L, 1, SOCKET_READ_TIMEOUT_INDEX);
+    lua_rawseti(L, 1, SOCKET_SEND_TIMEOUT_INDEX);
+    lua_rawseti(L, 1, SOCKET_CONNECT_TIMEOUT_INDEX);
+
+    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
+    u = lua_touserdata(L, -1);
+
+    if (u) {
+        if (connect_timeout > 0) {
+            u->connect_timeout = (ngx_msec_t) connect_timeout;
+
+        } else {
+            u->connect_timeout = u->conf->connect_timeout;
+        }
+
+        if (send_timeout > 0) {
+            u->send_timeout = (ngx_msec_t) send_timeout;
+
+        } else {
+            u->send_timeout = u->conf->send_timeout;
+        }
+
+        if (read_timeout > 0) {
+            u->read_timeout = (ngx_msec_t) read_timeout;
+
+        } else {
+            u->read_timeout = u->conf->read_timeout;
+        }
+    }
+
+    return 0;
+}
+
+
 static void
 ngx_http_lua_socket_tcp_handler(ngx_event_t *ev)
 {
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
index 04dc9d0..01b4777 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
@@ -190,7 +190,7 @@ ngx_http_lua_ngx_timer_at(lua_State *L)
 
     co = lua_newthread(vm);
 
-    /* L stack: time func [args] thread */
+    /* L stack: time func [args] */
 
     ngx_http_lua_probe_user_coroutine_create(r, L, co);
 
diff --git a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
index 9b39ba1..cf9d80a 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
@@ -446,7 +446,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(?: \(\d+: Operation timed out\))?
+^failed to connect: blah-blah-not-found\.agentzh\.org could not be resolved(?: \(\d+: (?:Operation timed out|Host not found)\))?
 connected: nil
 failed to send request: closed$
 --- error_log
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
index 266d5ab..3df4683 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
@@ -521,7 +521,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("106.187.41.147", 12345)
+            local ok, err = sock:connect("106.184.1.99", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/nginx-lua/t/024-access/exec.t b/debian/modules/nginx-lua/t/024-access/exec.t
index 8bf638f..3fb87be 100644
--- a/debian/modules/nginx-lua/t/024-access/exec.t
+++ b/debian/modules/nginx-lua/t/024-access/exec.t
@@ -3,9 +3,8 @@
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
-#repeat_each(1);
 
-plan tests => blocks() * repeat_each() * 2;
+plan tests => repeat_each() * (blocks() * 2 + 2);
 
 #no_diff();
 #no_long_string();
@@ -349,3 +348,24 @@ hello
 --- response_body
 hello, bah
 
+
+
+=== TEST 16: github issue #905: unsafe uri
+--- config
+    location /read {
+        access_by_lua_block {
+            ngx.exec("/hi/../");
+        }
+    }
+    location /hi {
+        echo "Hello";
+    }
+--- request
+GET /read
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log eval
+[
+'unsafe URI "/hi/../" was detected',
+qr/runtime error: access_by_lua\(nginx.conf:\d+\):2: unsafe uri/,
+]
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-exit.t b/debian/modules/nginx-lua/t/024-access/uthread-exit.t
index c08fefc..da4a9db 100644
--- a/debian/modules/nginx-lua/t/024-access/uthread-exit.t
+++ b/debian/modules/nginx-lua/t/024-access/uthread-exit.t
@@ -502,7 +502,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("106.187.41.147", 12345)
+            local ok, err = sock:connect("106.184.1.99", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/nginx-lua/t/028-req-header.t b/debian/modules/nginx-lua/t/028-req-header.t
index 498f777..1ebcdff 100644
--- a/debian/modules/nginx-lua/t/028-req-header.t
+++ b/debian/modules/nginx-lua/t/028-req-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 30);
+plan tests => repeat_each() * (2 * blocks() + 31);
 
 #no_diff();
 #no_long_string();
@@ -1622,3 +1622,25 @@ ok
 --- no_error_log
 [error]
 --- no_check_leak
+
+
+
+=== TEST 54: for bad requests causing segfaults when setting & getting multi-value headers
+--- config
+    error_page 400 = /err;
+
+    location = /err {
+        content_by_lua_block {
+            ngx.req.set_header("Cookie", "foo=bar")
+            local test = ngx.var.cookie_bar
+
+            ngx.say("ok")
+        }
+    }
+--- raw_request
+GeT / HTTP/1.1
+--- response_body
+ok
+--- no_error_log
+[error]
+--- no_check_leak
diff --git a/debian/modules/nginx-lua/t/043-shdict.t b/debian/modules/nginx-lua/t/043-shdict.t
index a21a34a..9183bf5 100644
--- a/debian/modules/nginx-lua/t/043-shdict.t
+++ b/debian/modules/nginx-lua/t/043-shdict.t
@@ -7,7 +7,7 @@ use Test::Nginx::Socket::Lua;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 18);
+plan tests => repeat_each() * (blocks() * 3 + 17);
 
 #no_diff();
 no_long_string();
@@ -585,7 +585,7 @@ hello, world
 --- request
 GET /test
 --- response_body_like
-^true nil true\nabort at (?:139|140)$
+^true nil true\nabort at (?:141|140)$
 --- no_error_log
 [error]
 
@@ -2448,3 +2448,26 @@ GET /test
 --- error_code: 500
 --- error_log
 bad "exptime" argument
+
+
+
+=== TEST 93: duplicate zones
+--- http_config
+    lua_shared_dict dogs 1m;
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua '
+            local dogs = ngx.shared.dogs
+            ngx.say("error")
+        ';
+    }
+--- request
+    GET /test
+--- request_body_unlike
+error
+--- must_die
+--- error_log
+lua_shared_dict "dogs" is already defined as "dogs"
+--- error_log
+[emerg]
diff --git a/debian/modules/nginx-lua/t/062-count.t b/debian/modules/nginx-lua/t/062-count.t
index e16291b..c3973ad 100644
--- a/debian/modules/nginx-lua/t/062-count.t
+++ b/debian/modules/nginx-lua/t/062-count.t
@@ -259,7 +259,7 @@ n = 10
 POST /test
 hello world
 --- response_body
-n = 4
+n = 5
 --- no_error_log
 [error]
 
@@ -491,6 +491,6 @@ n = 6
 --- request
 GET /test
 --- response_body
-n = 5
+n = 6
 --- 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
index 4d1d316..cd678c0 100644
--- a/debian/modules/nginx-lua/t/094-uthread-exit.t
+++ b/debian/modules/nginx-lua/t/094-uthread-exit.t
@@ -501,7 +501,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("106.187.41.147", 12345)
+            local ok, err = sock:connect("106.184.1.99", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t b/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
index 0bf38d0..d3ef3f5 100644
--- a/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
+++ b/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
@@ -357,7 +357,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
 --- config
     server_tokens off;
     lua_socket_log_errors off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -390,7 +390,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("106.187.41.147", 12345)
+            local ok, err = sock:connect("106.184.1.99", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
diff --git a/debian/modules/nginx-lua/t/142-ssl-session-store.t b/debian/modules/nginx-lua/t/142-ssl-session-store.t
index da84a8d..5c9fad3 100644
--- a/debian/modules/nginx-lua/t/142-ssl-session-store.t
+++ b/debian/modules/nginx-lua/t/142-ssl-session-store.t
@@ -6,7 +6,7 @@ use File::Basename;
 
 repeat_each(3);
 
-plan tests => repeat_each() * (blocks() * 6 + 2);
+plan tests => repeat_each() * (blocks() * 6 - 1);
 
 $ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
 
@@ -26,10 +26,10 @@ __DATA__
 
 === TEST 1: simple logging
 --- http_config
+    ssl_session_store_by_lua_block { print("ssl session store by lua is running!") }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_session_store_by_lua_block { print("ssl session store by lua is running!") }
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
         ssl_protocols SSLv3;
@@ -92,14 +92,14 @@ ssl_session_store_by_lua_block:1: ssl session store by lua is running!
 
 === TEST 2: sleep is not allowed
 --- http_config
+    ssl_session_store_by_lua_block {
+        local begin = ngx.now()
+        ngx.sleep(0.1)
+        print("elapsed in ssl store session by lua: ", ngx.now() - begin)
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_session_store_by_lua_block {
-            local begin = ngx.now()
-            ngx.sleep(0.1)
-            print("elapsed in ssl store session by lua: ", ngx.now() - begin)
-        }
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
         ssl_protocols SSLv3;
@@ -162,21 +162,21 @@ API disabled in the context of ssl_session_store_by_lua*
 
 === TEST 3: timer
 --- http_config
+    ssl_session_store_by_lua_block {
+        local function f()
+            print("my timer run!")
+        end
+        local ok, err = ngx.timer.at(0, f)
+        if not ok then
+            ngx.log(ngx.ERR, "failed to create timer: ", err)
+            return
+        end
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_store_by_lua_block {
-            local function f()
-                print("my timer run!")
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to create timer: ", err)
-                return
-            end
-        }
         ssl_protocols SSLv3;
 
         server_tokens off;
@@ -237,34 +237,35 @@ my timer run!
 
 === TEST 4: cosocket is not allowed
 --- http_config
+    ssl_session_store_by_lua_block {
+        local sock = ngx.socket.tcp()
+
+        sock:settimeout(5000)
+
+        local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+        if not ok then
+            ngx.log(ngx.ERR, "failed to connect to memc: ", err)
+            return
+        end
+
+        local bytes, err = sock:send("flush_all\\r\\n")
+        if not bytes then
+            ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
+            return
+        end
+
+        local res, err = sock:receive()
+        if not res then
+            ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
+            return
+        end
+
+        print("received memc reply: ", res)
+    }
+
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_session_store_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeout(5000)
-
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to connect to memc: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("flush_all\\r\\n")
-            if not bytes then
-                ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
-                return
-            end
-
-            local res, err = sock:receive()
-            if not res then
-                ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
-                return
-            end
-
-            print("received memc reply: ", res)
-        }
 
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
@@ -328,12 +329,12 @@ API disabled in the context of ssl_session_store_by_lua*
 
 === TEST 5: ngx.exit(0) - no yield
 --- http_config
+    ssl_session_store_by_lua_block {
+        ngx.exit(0)
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_session_store_by_lua_block {
-            ngx.exit(0)
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -400,12 +401,12 @@ lua exit with code 0
 === TEST 6: ngx.exit(ngx.ERROR) - no yield
 ngx.exit does not yield and the error code is eaten.
 --- http_config
+    ssl_session_store_by_lua_block {
+        ngx.exit(ngx.ERROR)
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_session_store_by_lua_block {
-            ngx.exit(ngx.ERROR)
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -472,13 +473,13 @@ ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
 
 === TEST 7: lua exception - no yield
 --- http_config
+    ssl_session_store_by_lua_block {
+        error("bad bad bad")
+        ngx.log(ngx.ERR, "should never reached here...")
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_session_store_by_lua_block {
-            error("bad bad bad")
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -541,12 +542,12 @@ should never reached here
 
 === TEST 8: get phase
 --- http_config
+    ssl_session_store_by_lua_block {
+        print("get_phase: ", ngx.get_phase())
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_session_store_by_lua_block {
-            print("get_phase: ", ngx.get_phase())
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -609,6 +610,7 @@ get_phase: ssl_session_store
 
 === TEST 9: inter-operation with ssl_certificate_by_lua
 --- http_config
+    ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
@@ -617,7 +619,6 @@ get_phase: ssl_session_store
             ngx.sleep(0.1)
             print("elapsed in ssl cert by lua: ", ngx.now() - begin)
         }
-        ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
         ssl_protocols SSLv3;
@@ -683,10 +684,10 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
 
 === TEST 10: simple logging (by file)
 --- http_config
+    ssl_session_store_by_lua_file html/a.lua;
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_session_store_by_lua_file html/a.lua;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
         ssl_protocols SSLv3;
@@ -748,3 +749,152 @@ a.lua:1: ssl store session by lua is running!
 --- no_error_log
 [error]
 [alert]
+
+
+
+=== TEST 11: will crash when ssl_session_store_by_lua* is allowed in server context
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name foo.com;
+        ssl_session_store_by_lua_block {
+            print("handler in test.com")
+        }
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test.com;
+        ssl_protocols SSLv3;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+    lua_ssl_verify_depth 3;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- no_error_log
+[error]
+--- must_die
+--- error_log eval
+qr/\[emerg\] .*? "ssl_session_store_by_lua_block" directive is not allowed here .*?\bnginx\.conf:28/
+
+
+
+=== TEST 12: mixing ssl virtual servers with non-ssl virtual servers
+--- http_config
+    ssl_session_store_by_lua_block { print("ssl session store by lua is running!") }
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/https.sock ssl;
+        server_name   test.com;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/http.sock;
+        server_name   foo.com;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/https.sock")
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- error_log
+lua ssl server name: "test.com"
+ssl_session_store_by_lua_block:1: ssl session store by lua is running!
+
+--- no_error_log
+[error]
+[alert]
diff --git a/debian/modules/nginx-lua/t/143-ssl-session-fetch.t b/debian/modules/nginx-lua/t/143-ssl-session-fetch.t
index 686f671..bd800ff 100644
--- a/debian/modules/nginx-lua/t/143-ssl-session-fetch.t
+++ b/debian/modules/nginx-lua/t/143-ssl-session-fetch.t
@@ -27,10 +27,10 @@ __DATA__
 
 === TEST 1: simple logging
 --- http_config
+    ssl_session_fetch_by_lua_block { print("ssl fetch sess by lua is running!") }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_session_fetch_by_lua_block { print("ssl fetch sess by lua is running!") }
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
         ssl_protocols SSLv3;
@@ -104,14 +104,14 @@ qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
 
 === TEST 2: sleep
 --- http_config
+    ssl_session_fetch_by_lua_block {
+        local begin = ngx.now()
+        ngx.sleep(0.1)
+        print("elapsed in ssl fetch session by lua: ", ngx.now() - begin)
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_session_fetch_by_lua_block {
-            local begin = ngx.now()
-            ngx.sleep(0.1)
-            print("elapsed in ssl fetch session by lua: ", ngx.now() - begin)
-        }
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
         ssl_protocols SSLv3;
@@ -183,21 +183,21 @@ qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
 
 === TEST 3: timer
 --- http_config
+    ssl_session_fetch_by_lua_block {
+        local function f()
+            print("my timer run!")
+        end
+        local ok, err = ngx.timer.at(0, f)
+        if not ok then
+            ngx.log(ngx.ERR, "failed to create timer: ", err)
+            return
+        end
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_fetch_by_lua_block {
-            local function f()
-                print("my timer run!")
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to create timer: ", err)
-                return
-            end
-        }
         ssl_protocols SSLv3;
 
         server_tokens off;
@@ -269,34 +269,34 @@ qr/my timer run!/s
 
 === TEST 4: cosocket
 --- http_config
+    ssl_session_fetch_by_lua_block {
+        local sock = ngx.socket.tcp()
+
+        sock:settimeout(5000)
+
+        local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
+        if not ok then
+            ngx.log(ngx.ERR, "failed to connect to memc: ", err)
+            return
+        end
+
+        local bytes, err = sock:send("flush_all\r\n")
+        if not bytes then
+            ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
+            return
+        end
+
+        local res, err = sock:receive()
+        if not res then
+            ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
+            return
+        end
+
+        print("received memc reply: ", res)
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_session_fetch_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeout(5000)
-
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to connect to memc: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("flush_all\r\n")
-            if not bytes then
-                ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
-                return
-            end
-
-            local res, err = sock:receive()
-            if not res then
-                ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
-                return
-            end
-
-            print("received memc reply: ", res)
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -370,13 +370,13 @@ qr/received memc reply: OK/s
 
 === TEST 5: ngx.exit(0) - yield
 --- http_config
+    ssl_session_fetch_by_lua_block {
+        ngx.exit(0)
+        ngx.log(ngx.ERR, "should never reached here...")
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_session_fetch_by_lua_block {
-            ngx.exit(0)
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -451,13 +451,13 @@ should never reached here
 
 === TEST 6: ngx.exit(ngx.ERROR) - yield
 --- http_config
+    ssl_session_fetch_by_lua_block {
+        ngx.exit(ngx.ERROR)
+        ngx.log(ngx.ERR, "should never reached here...")
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_session_fetch_by_lua_block {
-            ngx.exit(ngx.ERROR)
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -532,14 +532,14 @@ should never reached here
 
 === TEST 7: ngx.exit(ngx.ERROR) - yield
 --- http_config
+    ssl_session_fetch_by_lua_block {
+        ngx.sleep(0.001)
+        ngx.exit(ngx.ERROR)
+        ngx.log(ngx.ERR, "should never reached here...")
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_session_fetch_by_lua_block {
-            ngx.sleep(0.001)
-            ngx.exit(ngx.ERROR)
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -614,13 +614,13 @@ should never reached here
 
 === TEST 8: lua exception - no yield
 --- http_config
+    ssl_session_fetch_by_lua_block {
+        error("bad bad bad")
+        ngx.log(ngx.ERR, "should never reached here...")
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_session_fetch_by_lua_block {
-            error("bad bad bad")
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -696,14 +696,14 @@ should never reached here
 
 === TEST 9: lua exception - yield
 --- http_config
+    ssl_session_fetch_by_lua_block {
+        ngx.sleep(0.001)
+        error("bad bad bad")
+        ngx.log(ngx.ERR, "should never reached here...")
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_session_fetch_by_lua_block {
-            ngx.sleep(0.001)
-            error("bad bad bad")
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
         ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -781,10 +781,10 @@ should never reached here
 
 === TEST 10: get phase
 --- http_config
+    ssl_session_fetch_by_lua_block { print("get_phase: ", ngx.get_phase()) }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_session_fetch_by_lua_block { print("get_phase: ", ngx.get_phase()) }
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
         ssl_protocols SSLv3;
@@ -858,6 +858,11 @@ qr/get_phase: ssl_session_fetch/s
 
 === TEST 11: inter-operation with ssl_certificate_by_lua
 --- http_config
+    ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
+    ssl_session_fetch_by_lua_block {
+        ngx.sleep(0.1)
+        print("ssl fetch session by lua is running!")
+    }
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
@@ -865,11 +870,6 @@ qr/get_phase: ssl_session_fetch/s
             ngx.sleep(0.1)
             print("ssl cert by lua is running!")
         }
-        ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
-        ssl_session_fetch_by_lua_block {
-            ngx.sleep(0.1)
-            print("ssl fetch session by lua is running!")
-        }
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
         ssl_protocols SSLv3;
@@ -950,10 +950,10 @@ ssl store session by lua is running!
 
 === TEST 12: simple logging (by file)
 --- http_config
+    ssl_session_fetch_by_lua_file html/a.lua;
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_session_fetch_by_lua_file html/a.lua;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
         ssl_protocols SSLv3;
@@ -1025,3 +1025,87 @@ qr/\S+:\d+: ssl fetch sess by lua is running!/s
 [error]
 [alert]
 [emerg]
+
+
+
+=== TEST 13: mixing ssl virtual servers with non-ssl virtual servers
+--- http_config
+    ssl_session_fetch_by_lua_block { print("ssl fetch sess by lua is running!") }
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_protocols SSLv3;
+
+        server_tokens off;
+    }
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/http.sock;
+        server_name   foo.com;
+
+        server_tokens off;
+    }
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER;
+    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(5000)
+
+                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                package.loaded.session = sess
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+close: 1 nil
+
+--- grep_error_log eval
+qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
+
+--- grep_error_log_out eval
+[
+'',
+'ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!
+',
+'ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!
+',
+]
+
+--- no_error_log
+[error]
+[alert]
+[emerg]
diff --git a/debian/modules/nginx-lua/t/146-malloc-trim.t b/debian/modules/nginx-lua/t/146-malloc-trim.t
new file mode 100644
index 0000000..45fb9f2
--- /dev/null
+++ b/debian/modules/nginx-lua/t/146-malloc-trim.t
@@ -0,0 +1,337 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_process_enabled(1);
+#log_level('warn');
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4 + 3);
+
+#no_diff();
+no_long_string();
+#master_on();
+#workers(2);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: malloc_trim() every 1 req, in subreq
+--- http_config
+    lua_malloc_trim 1;
+--- config
+    location = /t {
+        return 200 "ok\n";
+    }
+
+    location = /main {
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+    }
+--- request
+GET /main
+--- response_body
+ok
+ok
+ok
+ok
+ok
+--- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
+--- grep_error_log_out
+malloc_trim(1) returned 0
+--- wait: 0.2
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: malloc_trim() every 1 req, in subreq
+--- http_config
+    lua_malloc_trim 1;
+--- config
+    location = /t {
+        log_subrequest on;
+        return 200 "ok\n";
+    }
+
+    location = /main {
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+    }
+--- request
+GET /main
+--- response_body
+ok
+ok
+ok
+ok
+ok
+--- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
+--- grep_error_log_out
+malloc_trim(1) returned 0
+malloc_trim(1) returned 0
+malloc_trim(1) returned 0
+malloc_trim(1) returned 0
+malloc_trim(1) returned 0
+malloc_trim(1) returned 0
+--- wait: 0.2
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: malloc_trim() every 2 req, in subreq
+--- http_config
+    lua_malloc_trim 2;
+--- config
+    location = /t {
+        log_subrequest on;
+        return 200 "ok\n";
+    }
+
+    location = /main {
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+    }
+--- request
+GET /main
+--- response_body
+ok
+ok
+ok
+ok
+ok
+--- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
+--- grep_error_log_out
+malloc_trim(1) returned 0
+malloc_trim(1) returned 0
+malloc_trim(1) returned 0
+--- wait: 0.2
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: malloc_trim() every 3 req, in subreq
+--- http_config
+    lua_malloc_trim 3;
+--- config
+    location = /t {
+        log_subrequest on;
+        return 200 "ok\n";
+    }
+
+    location = /main {
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+    }
+--- request
+GET /main
+--- response_body
+ok
+ok
+ok
+ok
+ok
+--- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
+--- grep_error_log_out
+malloc_trim(1) returned 0
+malloc_trim(1) returned 0
+--- wait: 0.2
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: malloc_trim() every 2 req, in subreq, big memory usage
+--- http_config
+    lua_malloc_trim 2;
+    lua_package_path "$prefix/html/?.lua;;";
+--- config
+    location = /t {
+        log_subrequest on;
+        content_by_lua_block {
+            require("foo")()
+        }
+    }
+
+    location = /main {
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+    }
+--- user_files
+>>> foo.lua
+local ffi = require "ffi"
+
+ffi.cdef[[
+    void *malloc(size_t sz);
+    void free(void *p);
+]]
+
+return function ()
+    local t = {}
+    for i = 1, 10 do
+        t[i] = ffi.C.malloc(1024 * 128)
+    end
+    for i = 1, 10 do
+        ffi.C.free(t[i])
+    end
+    ngx.say("ok")
+end
+--- request
+GET /main
+--- response_body
+ok
+ok
+ok
+ok
+ok
+--- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
+--- grep_error_log_out
+malloc_trim(1) returned 1
+malloc_trim(1) returned 1
+malloc_trim(1) returned 1
+--- wait: 0.2
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: zero count means off
+--- http_config
+    lua_malloc_trim 0;
+    lua_package_path "$prefix/html/?.lua;;";
+--- config
+    location = /t {
+        content_by_lua_block {
+            require("foo")()
+        }
+    }
+--- user_files
+>>> foo.lua
+local ffi = require "ffi"
+
+ffi.cdef[[
+    void *malloc(size_t sz);
+    void free(void *p);
+]]
+
+return function ()
+    local t = {}
+    for i = 1, 10 do
+        t[i] = ffi.C.malloc(1024 * 128)
+    end
+    for i = 1, 10 do
+        ffi.C.free(t[i])
+    end
+    ngx.say("ok")
+end
+
+--- request
+GET /t
+--- response_body
+ok
+--- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
+--- grep_error_log_out
+--- wait: 0.2
+--- no_error_log
+malloc_trim() disabled
+[error]
+
+
+
+=== TEST 7: zero count means off, log_by_lua
+--- http_config
+    lua_malloc_trim 0;
+    lua_package_path "$prefix/html/?.lua;;";
+--- config
+    location = /t {
+        content_by_lua_block {
+            require("foo")()
+        }
+        log_by_lua_block {
+            print("Hello from log")
+        }
+    }
+--- user_files
+>>> foo.lua
+local ffi = require "ffi"
+
+ffi.cdef[[
+    void *malloc(size_t sz);
+    void free(void *p);
+]]
+
+return function ()
+    local t = {}
+    for i = 1, 10 do
+        t[i] = ffi.C.malloc(1024 * 128)
+    end
+    for i = 1, 10 do
+        ffi.C.free(t[i])
+    end
+    ngx.say("ok")
+end
+
+--- request
+GET /t
+--- response_body
+ok
+--- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
+--- grep_error_log_out
+--- wait: 0.2
+--- error_log
+Hello from log
+malloc_trim() disabled
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: malloc_trim() every 1 req
+--- http_config
+    lua_malloc_trim 1;
+--- config
+    location = /t {
+        return 200 "ok\n";
+    }
+
+    location = /main {
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+        echo_location /t;
+    }
+--- request
+GET /main
+--- response_body
+ok
+ok
+ok
+ok
+ok
+--- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
+--- grep_error_log_out
+malloc_trim(1) returned 0
+--- wait: 0.2
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t b/debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t
new file mode 100644
index 0000000..52f015a
--- /dev/null
+++ b/debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t
@@ -0,0 +1,534 @@
+# 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}";
+    }
+
+    if ($ENV{MOCKEAGAIN} eq 'r') {
+        $ENV{MOCKEAGAIN} = 'rw';
+
+    } else {
+        $ENV{MOCKEAGAIN} = 'w';
+    }
+
+    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
+    $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'slowdata';
+}
+
+use Test::Nginx::Socket::Lua;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 + 1);
+
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+
+#log_level 'warn';
+log_level 'debug';
+
+no_long_string();
+#no_diff();
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    server_tokens off;
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeouts(150, 150, 150)  -- 150ms read timeout
+
+            local port = ngx.var.server_port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            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
+
+            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()
+        }
+    }
+
+    location /foo {
+        content_by_lua_block {
+            ngx.sleep(0.01) -- 10 ms
+            ngx.say("foo")
+        }
+        more_clear_headers Date;
+    }
+
+--- request
+GET /t
+--- response_body_like
+received: foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: read timeout
+--- config
+    server_tokens off;
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeouts(150, 150, 2)  -- 2ms read timeout
+
+            local port = ngx.var.server_port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            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
+
+            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()
+        }
+    }
+
+    location /foo {
+        content_by_lua_block {
+            ngx.sleep(0.01) -- 10 ms
+            ngx.say("foo")
+        }
+        more_clear_headers Date;
+    }
+
+--- request
+GET /t
+--- response_body_like
+failed to receive a line: timeout \[\]
+--- error_log
+lua tcp socket read timed out
+
+
+
+=== TEST 3: send ok
+--- config
+    server_tokens off;
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeouts(500, 500, 500)  -- 500ms timeout
+
+            local port = ngx.var.server_port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local data = string.rep("a", 8) -- 8 bytes
+            local num = 10 -- total: 80 bytes
+
+            local req = "POST /foo HTTP/1.0\r\nHost: localhost\r\nContent-Length: "
+                        .. #data * num .. "\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
+
+            for i = 1, num do
+                local bytes, err = sock:send(data)
+                if not bytes then
+                    ngx.say("failed to send body: ", err)
+                    return
+                end
+            end
+
+            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()
+        }
+    }
+
+    location /foo {
+        content_by_lua_block {
+            local content_length = ngx.req.get_headers()["Content-Length"]
+
+            local sock = ngx.req.socket()
+
+            sock:settimeouts(500, 500, 500)
+
+            local chunk = 8
+
+            for i = 1, content_length, chunk do
+                local data, err = sock:receive(chunk)
+                if not data then
+                    ngx.say("failed to receive chunk: ", err)
+                    return
+                end
+            end
+
+            ngx.say("got len: ", content_length)
+        }
+    }
+
+--- request
+GET /t
+--- response_body_like
+received: got len: 80
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: send timeout
+--- config
+    server_tokens off;
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeouts(500, 500, 500)  -- 500ms timeout
+
+            local port = ngx.var.server_port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local data = "slowdata" -- slow data
+            local num = 10
+
+            local req = "POST /foo HTTP/1.0\r\nHost: localhost\r\nContent-Length: "
+                        .. #data * num .. "\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
+
+            for i = 1, num do
+                local bytes, err = sock:send(data)
+                if not bytes then
+                    ngx.say("failed to send body: ", err)
+                    return
+                end
+            end
+
+            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()
+        }
+    }
+
+    location /foo {
+        content_by_lua_block {
+            local content_length = ngx.req.get_headers()["Content-Length"]
+
+            local sock = ngx.req.socket()
+
+            sock:settimeouts(500, 500, 500)
+
+            local chunk = 8
+
+            for i = 1, content_length, chunk do
+                local data, err = sock:receive(chunk)
+                if not data then
+                    ngx.say("failed to receive chunk: ", err)
+                    return
+                end
+            end
+
+            ngx.say("got len: ", content_length)
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+failed to send body: timeout
+--- error_log
+lua tcp socket write timed out
+
+
+
+=== TEST 5: connection timeout (tcp)
+--- config
+    resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 3s;
+    location /test {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeouts(100, 100, 100)
+
+            local ok, err = sock:connect("agentzh.org", 12345)
+            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)
+        }
+    }
+--- 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
+--- timeout: 10
+
+
+
+=== TEST 6: different timeout with duplex socket (settimeout)
+--- config
+    server_tokens off;
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeouts(200, 200, 200)  -- 200ms timeout
+
+            local port = ngx.var.server_port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local data = string.rep("a", 4) -- 4 bytes
+            local num = 3
+
+            local req = "POST /foo HTTP/1.0\r\nHost: localhost\r\nContent-Length: "
+                        .. #data * num .. "\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
+
+            for i = 1, num do
+                local bytes, err = sock:send(data)
+                if not bytes then
+                    ngx.log(ngx.ERR, "failed to send body: ", err)
+                    return
+                end
+                ngx.sleep(0.12) -- 120ms
+            end
+
+            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()
+        }
+    }
+
+    location /foo {
+        content_by_lua_block {
+            local content_length = ngx.req.get_headers()["Content-Length"]
+
+            local sock = ngx.req.socket(true)
+
+            local chunk = 4
+
+            function read()
+                sock:settimeout(200) -- read: 200 ms
+
+                local data, err = sock:receive(content_length)
+                if not data then
+                    ngx.log(ngx.ERR, "failed to receive data: ", err)
+                    return
+                end
+            end
+
+            local co = ngx.thread.spawn(read)
+
+            sock:settimeout(100) -- send: 100ms
+            sock:send("ok\n")
+
+            local ok, err = ngx.thread.wait(co)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to wait co: ", err)
+            end
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+received: ok
+failed to receive a line: closed []
+--- error_log
+lua tcp socket read timed out
+failed to receive data: timeout
+
+
+
+=== TEST 7: different timeout with duplex socket (settimeouts)
+--- config
+    server_tokens off;
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            sock:settimeouts(200, 200, 200)  -- 200ms timeout
+
+            local port = ngx.var.server_port
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local data = string.rep("a", 4) -- 4 bytes
+            local num = 3
+
+            local req = "POST /foo HTTP/1.0\r\nHost: localhost\r\nContent-Length: "
+                        .. #data * num .. "\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
+
+            for i = 1, num do
+                local bytes, err = sock:send(data)
+                if not bytes then
+                    ngx.log(ngx.ERR, "failed to send body: ", err)
+                    return
+                end
+                ngx.sleep(0.12) -- 120ms
+            end
+
+            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()
+        }
+    }
+
+    location /foo {
+        content_by_lua_block {
+            local content_length = ngx.req.get_headers()["Content-Length"]
+
+            local sock = ngx.req.socket(true)
+
+            sock:settimeouts(0, 100, 200) -- send: 100ms, read: 200ms
+
+            local chunk = 4
+
+            function read()
+                local data, err = sock:receive(content_length)
+                if not data then
+                    ngx.log(ngx.ERR, "failed to receive data: ", err)
+                    return
+                end
+            end
+
+            local co = ngx.thread.spawn(read)
+
+            sock:send("ok\n")
+
+            local ok, err = ngx.thread.wait(co)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to wait co: ", err)
+            end
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+received: ok
+failed to receive a line: closed []
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/148-fake-shm-zone.t b/debian/modules/nginx-lua/t/148-fake-shm-zone.t
new file mode 100644
index 0000000..b8a9227
--- /dev/null
+++ b/debian/modules/nginx-lua/t/148-fake-shm-zone.t
@@ -0,0 +1,170 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_process_enabled(1);
+#log_level('warn');
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 - 1);
+
+#no_diff();
+no_long_string();
+#master_on();
+#workers(2);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: require test
+--- http_config
+    lua_fake_shm x1 1m;
+    lua_fake_shm x2 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local shm_zones = require("fake_shm_zones")
+            ngx.say(type(shm_zones))
+            local x1 = shm_zones.x1
+            ngx.say(type(x1))
+            local x2 = shm_zones.x2
+            ngx.say(type(x1))
+        }
+    }
+--- request
+GET /test
+--- response_body
+table
+table
+table
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: index shm_zone
+--- http_config
+    lua_fake_shm x1 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local shm_zones = require("fake_shm_zones")
+            local x1 = shm_zones.x1
+            ngx.say(type(x1))
+        }
+    }
+--- request
+GET /test
+--- response_body
+table
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: get_info
+--- http_config
+    lua_fake_shm x1 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local shm_zones = require("fake_shm_zones")
+            local name, size, isinit, isold
+            local x1 = shm_zones.x1
+
+            name, size, isinit, isold = x1:get_info()
+            ngx.say("name=", name)
+            ngx.say("size=", size)
+            ngx.say("isinit=", isinit)
+            ngx.say("isold=", isold)
+        }
+    }
+--- request
+GET /test
+--- response_body
+name=x1
+size=1048576
+isinit=true
+isold=false
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: multiply zones
+--- http_config
+    lua_fake_shm x1 1m;
+    lua_fake_shm x2 2m;
+    lua_fake_shm x3 3m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local shm_zones = require("fake_shm_zones")
+            local name, size, isinit, isold
+            local x1 = shm_zones.x1
+            local x2 = shm_zones.x2
+            local x3 = shm_zones.x3
+
+            name, size, isinit, isold = x1:get_info()
+            ngx.say("name=", name)
+            ngx.say("size=", size)
+            ngx.say("isinit=", isinit)
+            ngx.say("isold=", isold)
+
+            name, size, isinit, isold = x2:get_info()
+            ngx.say("name=", name)
+            ngx.say("size=", size)
+            ngx.say("isinit=", isinit)
+            ngx.say("isold=", isold)
+
+            name, size, isinit, isold = x3:get_info()
+            ngx.say("name=", name)
+            ngx.say("size=", size)
+            ngx.say("isinit=", isinit)
+            ngx.say("isold=", isold)
+        }
+    }
+--- request
+GET /test
+--- response_body
+name=x1
+size=1048576
+isinit=true
+isold=false
+name=x2
+size=2097152
+isinit=true
+isold=false
+name=x3
+size=3145728
+isinit=true
+isold=false
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: duplicate zones
+--- http_config
+    lua_fake_shm x1 1m;
+    lua_fake_shm x1 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local shm_zones = require("fake_shm_zones")
+            local x1 = shm_zones.x1
+            ngx.say("error")
+        }
+    }
+--- request
+GET /test
+--- request_body_unlike
+error
+--- must_die
+--- error_log
+lua_fake_shm "x1" is already defined as "x1"
+--- error_log
+[emerg]
diff --git a/debian/modules/nginx-lua/t/149-hup-fake-shm-zone.t b/debian/modules/nginx-lua/t/149-hup-fake-shm-zone.t
new file mode 100644
index 0000000..1b7b4b5
--- /dev/null
+++ b/debian/modules/nginx-lua/t/149-hup-fake-shm-zone.t
@@ -0,0 +1,91 @@
+# 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;
+        undef $ENV{TEST_NGINX_USE_STAP};
+    }
+}
+
+use lib 'lib';
+use Test::Nginx::Socket::Lua $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: get_info, before HUP reload
+--- http_config
+    lua_fake_shm x1 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local shm_zones = require("fake_shm_zones")
+            local name, size, isinit, isold
+            local x1 = shm_zones.x1
+
+            name, size, isinit, isold = x1:get_info()
+            ngx.say("name=", name)
+            ngx.say("size=", size)
+            ngx.say("isinit=", isinit)
+            ngx.say("isold=", isold)
+        }
+    }
+--- request
+GET /test
+--- response_body
+name=x1
+size=1048576
+isinit=true
+isold=false
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: get_info, after HUP reload
+--- http_config
+    lua_fake_shm x1 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local shm_zones = require("fake_shm_zones")
+            local name, size, isinit, isold
+            local x1 = shm_zones.x1
+
+            name, size, isinit, isold = x1:get_info()
+            ngx.say("name=", name)
+            ngx.say("size=", size)
+            ngx.say("isinit=", isinit)
+            ngx.say("isold=", isold)
+        }
+    }
+--- request
+GET /test
+--- response_body
+name=x1
+size=1048576
+isinit=true
+isold=true
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/data/fake-shm-module/config b/debian/modules/nginx-lua/t/data/fake-shm-module/config
new file mode 100644
index 0000000..0274529
--- /dev/null
+++ b/debian/modules/nginx-lua/t/data/fake-shm-module/config
@@ -0,0 +1,3 @@
+ngx_addon_name=ngx_http_lua_shm_fake_module
+HTTP_MODULES="$HTTP_MODULES ngx_http_lua_fake_shm_module"
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_lua_fake_shm_module.c"
diff --git a/debian/modules/nginx-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c b/debian/modules/nginx-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
new file mode 100644
index 0000000..0286853
--- /dev/null
+++ b/debian/modules/nginx-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
@@ -0,0 +1,294 @@
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+
+
+#include "ngx_http_lua_api.h"
+
+
+static void *ngx_http_lua_fake_shm_create_main_conf(ngx_conf_t *cf);
+static ngx_int_t ngx_http_lua_fake_shm_init(ngx_conf_t *cf);
+
+static char *ngx_http_lua_fake_shm(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static ngx_int_t ngx_http_lua_fake_shm_init_zone(ngx_shm_zone_t *shm_zone,
+    void *data);
+static int ngx_http_lua_fake_shm_preload(lua_State *L);
+static int ngx_http_lua_fake_shm_get_info(lua_State *L);
+
+
+typedef struct {
+    ngx_array_t     *shm_zones;
+} ngx_http_lua_fake_shm_main_conf_t;
+
+
+static ngx_command_t ngx_http_lua_fake_shm_cmds[] = {
+
+    { ngx_string("lua_fake_shm"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE2,
+      ngx_http_lua_fake_shm,
+      0,
+      0,
+      NULL },
+
+    ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_lua_fake_shm_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_http_lua_fake_shm_init,             /* postconfiguration */
+
+    ngx_http_lua_fake_shm_create_main_conf, /* create main configuration */
+    NULL,                                   /* init main configuration */
+
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+
+    NULL,                                   /* create location configuration */
+    NULL,                                   /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_lua_fake_shm_module = {
+    NGX_MODULE_V1,
+    &ngx_http_lua_fake_shm_module_ctx, /* module context */
+    ngx_http_lua_fake_shm_cmds,        /* module directives */
+    NGX_HTTP_MODULE,                   /* module type */
+    NULL,                              /* init master */
+    NULL,                              /* init module */
+    NULL,                              /* init process */
+    NULL,                              /* init thread */
+    NULL,                              /* exit thread */
+    NULL,                              /* exit process */
+    NULL,                              /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+typedef struct {
+    ngx_str_t   name;
+    size_t      size;
+    ngx_int_t   isold;
+    ngx_int_t   isinit;
+} ngx_http_lua_fake_shm_ctx_t;
+
+
+static void *
+ngx_http_lua_fake_shm_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_http_lua_fake_shm_main_conf_t *lfsmcf;
+
+    lfsmcf = ngx_pcalloc(cf->pool, sizeof(*lfsmcf));
+    if (lfsmcf == NULL) {
+        return NULL;
+    }
+
+    return lfsmcf;
+}
+
+
+static char *
+ngx_http_lua_fake_shm(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_lua_fake_shm_main_conf_t   *lfsmcf = conf;
+
+    ngx_str_t                   *value, name;
+    ngx_shm_zone_t              *zone;
+    ngx_shm_zone_t             **zp;
+    ngx_http_lua_fake_shm_ctx_t *ctx;
+    ssize_t                      size;
+
+    if (lfsmcf->shm_zones == NULL) {
+        lfsmcf->shm_zones = ngx_palloc(cf->pool, sizeof(ngx_array_t));
+        if (lfsmcf->shm_zones == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        if (ngx_array_init(lfsmcf->shm_zones, cf->pool, 2,
+                           sizeof(ngx_shm_zone_t *))
+            != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    value = cf->args->elts;
+
+    ctx = NULL;
+
+    if (value[1].len == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid lua fake_shm name \"%V\"", &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    name = value[1];
+
+    size = ngx_parse_size(&value[2]);
+
+    if (size <= 8191) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid lua fake_shm size \"%V\"", &value[2]);
+        return NGX_CONF_ERROR;
+    }
+
+    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_fake_shm_ctx_t));
+    if (ctx == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ctx->name = name;
+    ctx->size = size;
+
+    zone = ngx_http_lua_shared_memory_add(cf, &name, (size_t) size,
+                                          &ngx_http_lua_fake_shm_module);
+    if (zone == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (zone->data) {
+        ctx = zone->data;
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "lua_fake_shm \"%V\" is already defined as "
+                           "\"%V\"", &name, &ctx->name);
+        return NGX_CONF_ERROR;
+    }
+
+    zone->init = ngx_http_lua_fake_shm_init_zone;
+    zone->data = ctx;
+
+    zp = ngx_array_push(lfsmcf->shm_zones);
+    if (zp == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *zp = zone;
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_fake_shm_init_zone(ngx_shm_zone_t *shm_zone, void *data)
+{
+    ngx_http_lua_fake_shm_ctx_t  *octx = data;
+
+    ngx_http_lua_fake_shm_ctx_t  *ctx;
+
+    ctx = shm_zone->data;
+
+    if (octx) {
+        ctx->isold = 1;
+    }
+
+    ctx->isinit = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_fake_shm_init(ngx_conf_t *cf)
+{
+    ngx_http_lua_add_package_preload(cf, "fake_shm_zones",
+                                     ngx_http_lua_fake_shm_preload);
+    return NGX_OK;
+}
+
+
+static int
+ngx_http_lua_fake_shm_preload(lua_State *L)
+{
+    ngx_http_lua_fake_shm_main_conf_t *lfsmcf;
+    ngx_http_conf_ctx_t               *hmcf_ctx;
+    ngx_cycle_t                       *cycle;
+
+    ngx_uint_t                   i;
+    ngx_shm_zone_t             **zone;
+
+    lua_getglobal(L, "__ngx_cycle");
+    cycle = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    hmcf_ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index];
+    lfsmcf = hmcf_ctx->main_conf[ngx_http_lua_fake_shm_module.ctx_index];
+
+    if (lfsmcf->shm_zones != NULL) {
+        lua_createtable(L, 0, lfsmcf->shm_zones->nelts /* nrec */);
+
+        lua_createtable(L, 0 /* narr */, 2 /* nrec */); /* shared mt */
+
+        lua_pushcfunction(L, ngx_http_lua_fake_shm_get_info);
+        lua_setfield(L, -2, "get_info");
+
+        lua_pushvalue(L, -1); /* shared mt mt */
+        lua_setfield(L, -2, "__index"); /* shared mt */
+
+        zone = lfsmcf->shm_zones->elts;
+
+        for (i = 0; i < lfsmcf->shm_zones->nelts; i++) {
+            lua_pushlstring(L, (char *) zone[i]->shm.name.data,
+                            zone[i]->shm.name.len);
+
+            /* shared mt key */
+
+            lua_createtable(L, 1 /* narr */, 0 /* nrec */);
+                /* table of zone[i] */
+            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
+            lua_rawseti(L, -2, 1); /* {zone[i]} */
+            lua_pushvalue(L, -3); /* shared mt key ud mt */
+            lua_setmetatable(L, -2); /* shared mt key ud */
+            lua_rawset(L, -4); /* shared mt */
+        }
+
+        lua_pop(L, 1); /* shared */
+
+    } else {
+        lua_newtable(L);    /* ngx.shared */
+    }
+
+    return 1;
+}
+
+
+static int
+ngx_http_lua_fake_shm_get_info(lua_State *L)
+{
+    ngx_int_t                    n;
+    ngx_shm_zone_t              *zone;
+    ngx_http_lua_fake_shm_ctx_t *ctx;
+
+    n = lua_gettop(L);
+
+    if (n != 1) {
+        return luaL_error(L, "expecting exactly one arguments, "
+                          "but only seen %d", n);
+    }
+
+    luaL_checktype(L, 1, LUA_TTABLE);
+
+    lua_rawgeti(L, 1, 1);
+    zone = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (zone == NULL) {
+        return luaL_error(L, "bad \"zone\" argument");
+    }
+
+    ctx = (ngx_http_lua_fake_shm_ctx_t *) zone->data;
+
+    lua_pushlstring(L, (char *) zone->shm.name.data, zone->shm.name.len);
+    lua_pushnumber(L, zone->shm.size);
+    lua_pushboolean(L, ctx->isinit);
+    lua_pushboolean(L, ctx->isold);
+
+    return 4;
+}
diff --git a/debian/modules/nginx-lua/util/build.sh b/debian/modules/nginx-lua/util/build.sh
index 1185e72..7887fe9 100755
--- a/debian/modules/nginx-lua/util/build.sh
+++ b/debian/modules/nginx-lua/util/build.sh
@@ -51,6 +51,7 @@ time ngx-build $force $version \
                 --add-module=$root/../coolkit-nginx-module \
                 --add-module=$root/../redis2-nginx-module \
                 --add-module=$root/t/data/fake-module \
+                --add-module=$root/t/data/fake-shm-module \
                 --with-http_gunzip_module \
                 --with-http_dav_module \
           --with-select_module \

From 07702e95f9157f01f1c89888abc0e459253ed494 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 23 Dec 2016 10:40:18 +0200
Subject: [PATCH 139/600] Update nginx-lua OpenSSL 1.1.0 patch

---
 .../modules/nginx-lua/openssl-1.1.0.patch     | 417 ++++++++++++------
 1 file changed, 291 insertions(+), 126 deletions(-)

diff --git a/debian/patches/modules/nginx-lua/openssl-1.1.0.patch b/debian/patches/modules/nginx-lua/openssl-1.1.0.patch
index e3d0a92..a4e42e5 100644
--- a/debian/patches/modules/nginx-lua/openssl-1.1.0.patch
+++ b/debian/patches/modules/nginx-lua/openssl-1.1.0.patch
@@ -1,198 +1,247 @@
-From 61301109f812bc8af0e731cea90ed89e03b7b4aa Mon Sep 17 00:00:00 2001
+From 2f281b9def161d195da4d795fa916b686ac9fd87 Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@ghedini.me>
 Date: Tue, 13 Sep 2016 22:31:32 +0100
-Subject: [PATCH 1/5] bugfix: ssl: use TLV1.2 in tests
+Subject: [PATCH 1/6] bugfix: ssl: don't use SSLv3 in tests
 
+OpenSSL 1.1.0 disables SSLv3 by default. In order to disable SSL session
+tickets set ssl_session_tickets to off instead.
 ---
- t/142-ssl-session-store.t | 20 ++++++++++----------
- t/143-ssl-session-fetch.t | 24 ++++++++++++------------
- 2 files changed, 22 insertions(+), 22 deletions(-)
+ t/142-ssl-session-store.t | 24 +++++++++++-------------
+ t/143-ssl-session-fetch.t | 26 +++++++++++++-------------
+ 2 files changed, 24 insertions(+), 26 deletions(-)
 
 diff --git a/t/142-ssl-session-store.t b/t/142-ssl-session-store.t
-index da84a8d..d0d6080 100644
+index 5c9fad35..b5955199 100644
 --- a/t/142-ssl-session-store.t
 +++ b/t/142-ssl-session-store.t
 @@ -32,7 +32,7 @@ __DATA__
-         ssl_session_store_by_lua_block { print("ssl session store by lua is running!") }
+         server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
 @@ -102,7 +102,7 @@ ssl_session_store_by_lua_block:1: ssl session store by lua is running!
-         }
+         server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
 @@ -177,7 +177,7 @@ API disabled in the context of ssl_session_store_by_lua*
-                 return
-             end
-         }
+         server_name   test.com;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
-@@ -266,7 +266,7 @@ my timer run!
-             print("received memc reply: ", res)
-         }
+@@ -267,9 +267,9 @@ my timer run!
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name   test.com;
  
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
- 
-@@ -334,7 +334,7 @@ API disabled in the context of ssl_session_store_by_lua*
-         ssl_session_store_by_lua_block {
-             ngx.exit(0)
-         }
--        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
- 
-@@ -406,7 +406,7 @@ ngx.exit does not yield and the error code is eaten.
-         ssl_session_store_by_lua_block {
-             ngx.exit(ngx.ERROR)
-         }
--        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
- 
-@@ -479,7 +479,7 @@ ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
-             error("bad bad bad")
-             ngx.log(ngx.ERR, "should never reached here...")
-         }
--        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
- 
-@@ -547,7 +547,7 @@ should never reached here
-         ssl_session_store_by_lua_block {
-             print("get_phase: ", ngx.get_phase())
-         }
--        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
- 
-@@ -620,7 +620,7 @@ get_phase: ssl_session_store
-         ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
-@@ -689,7 +689,7 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
-         ssl_session_store_by_lua_file html/a.lua;
+@@ -335,9 +335,9 @@ API disabled in the context of ssl_session_store_by_lua*
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
+-        ssl_protocols SSLv3;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
+ 
+         server_tokens off;
+     }
+@@ -407,9 +407,9 @@ ngx.exit does not yield and the error code is eaten.
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
+-        ssl_protocols SSLv3;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
+ 
+         server_tokens off;
+     }
+@@ -480,9 +480,9 @@ ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
+-        ssl_protocols SSLv3;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
+ 
+         server_tokens off;
+     }
+@@ -548,9 +548,9 @@ should never reached here
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
+-        ssl_protocols SSLv3;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
+ 
+         server_tokens off;
+     }
+@@ -621,7 +621,7 @@ get_phase: ssl_session_store
+         }
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
+ 
+         server_tokens off;
+     }
+@@ -690,7 +690,7 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
+         server_name   test.com;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_session_tickets off;
+ 
+         server_tokens off;
+     }
+@@ -760,7 +760,6 @@ a.lua:1: ssl store session by lua is running!
+         ssl_session_store_by_lua_block {
+             print("handler in test.com")
+         }
+-        ssl_protocols SSLv3;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -770,7 +769,6 @@ a.lua:1: ssl store session by lua is running!
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
+-        ssl_protocols SSLv3;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+ 
+@@ -836,7 +834,7 @@ qr/\[emerg\] .*? "ssl_session_store_by_lua_block" directive is not allowed here
+         server_name   test.com;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
 diff --git a/t/143-ssl-session-fetch.t b/t/143-ssl-session-fetch.t
-index 686f671..fc796e8 100644
+index bd800ff8..54f7a4a3 100644
 --- a/t/143-ssl-session-fetch.t
 +++ b/t/143-ssl-session-fetch.t
 @@ -33,7 +33,7 @@ __DATA__
-         ssl_session_fetch_by_lua_block { print("ssl fetch sess by lua is running!") }
+         server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
 @@ -114,7 +114,7 @@ qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
-         }
+         server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
 @@ -198,7 +198,7 @@ qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
-                 return
-             end
-         }
+         server_name   test.com;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
-@@ -297,7 +297,7 @@ qr/my timer run!/s
- 
-             print("received memc reply: ", res)
-         }
+@@ -297,9 +297,9 @@ qr/my timer run!/s
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name   test.com;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
  
-@@ -377,7 +377,7 @@ qr/received memc reply: OK/s
-             ngx.exit(0)
-             ngx.log(ngx.ERR, "should never reached here...")
-         }
+         server_tokens off;
+     }
+@@ -377,9 +377,9 @@ qr/received memc reply: OK/s
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
  
-@@ -458,7 +458,7 @@ should never reached here
-             ngx.exit(ngx.ERROR)
-             ngx.log(ngx.ERR, "should never reached here...")
-         }
+         server_tokens off;
+     }
+@@ -458,9 +458,9 @@ should never reached here
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
  
-@@ -540,7 +540,7 @@ should never reached here
-             ngx.exit(ngx.ERROR)
-             ngx.log(ngx.ERR, "should never reached here...")
-         }
+         server_tokens off;
+     }
+@@ -540,9 +540,9 @@ should never reached here
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
  
-@@ -621,7 +621,7 @@ should never reached here
-             error("bad bad bad")
-             ngx.log(ngx.ERR, "should never reached here...")
-         }
+         server_tokens off;
+     }
+@@ -621,9 +621,9 @@ should never reached here
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
  
-@@ -704,7 +704,7 @@ should never reached here
-             error("bad bad bad")
-             ngx.log(ngx.ERR, "should never reached here...")
-         }
+         server_tokens off;
+     }
+@@ -704,9 +704,9 @@ should never reached here
+     server {
+         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+         server_name test.com;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
++        ssl_session_tickets off;
  
+         server_tokens off;
+     }
 @@ -787,7 +787,7 @@ should never reached here
-         ssl_session_fetch_by_lua_block { print("get_phase: ", ngx.get_phase()) }
+         server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
@@ -201,24 +250,36 @@ index 686f671..fc796e8 100644
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
 @@ -956,7 +956,7 @@ ssl store session by lua is running!
-         ssl_session_fetch_by_lua_file html/a.lua;
+         server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 -        ssl_protocols SSLv3;
-+        ssl_protocols TLSv1.2;
++        ssl_session_tickets off;
  
          server_tokens off;
      }
+@@ -1036,7 +1036,7 @@ qr/\S+:\d+: ssl fetch sess by lua is running!/s
+         server_name   test.com;
+         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
+         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+-        ssl_protocols SSLv3;
++        ssl_session_tickets off;
+ 
+         server_tokens off;
+     }
+-- 
+2.11.0
 
-From 7b5bd0839cde38a99408092fa53f2c376c80a8a2 Mon Sep 17 00:00:00 2001
+
+From ad8df79bccef37a0bbfd8e40283f3b81cd867760 Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@cloudflare.com>
 Date: Thu, 12 May 2016 13:12:23 +0100
-Subject: [PATCH 2/5] bugfix: ssl: do not access SSL_SESSION struct directly
+Subject: [PATCH 2/6] bugfix: ssl: do not access SSL_SESSION struct directly
 
 In OpenSSL 1.1.0 it was made opaque.
 ---
@@ -227,10 +288,10 @@ In OpenSSL 1.1.0 it was made opaque.
  2 files changed, 82 insertions(+), 85 deletions(-)
 
 diff --git a/src/ngx_http_lua_socket_tcp.c b/src/ngx_http_lua_socket_tcp.c
-index fe6001f..1861e6f 100644
+index 6db6e2da..18352bfe 100644
 --- a/src/ngx_http_lua_socket_tcp.c
 +++ b/src/ngx_http_lua_socket_tcp.c
-@@ -1283,9 +1283,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
+@@ -1311,9 +1311,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
                      return 2;
                  }
  
@@ -242,7 +303,7 @@ index fe6001f..1861e6f 100644
              }
          }
  
-@@ -1549,9 +1548,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
+@@ -1577,9 +1576,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
      } else {
          *ud = ssl_session;
  
@@ -254,7 +315,7 @@ index fe6001f..1861e6f 100644
  
          /* set up the __gc metamethod */
          lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
-@@ -5272,9 +5270,8 @@ ngx_http_lua_ssl_free_session(lua_State *L)
+@@ -5356,9 +5354,8 @@ ngx_http_lua_ssl_free_session(lua_State *L)
  
      psession = lua_touserdata(L, 1);
      if (psession && *psession != NULL) {
@@ -267,7 +328,7 @@ index fe6001f..1861e6f 100644
          ngx_ssl_free_session(*psession);
      }
 diff --git a/t/129-ssl-socket.t b/t/129-ssl-socket.t
-index 9da9a5c..98fb5a2 100644
+index 9da9a5c2..98fb5a2b 100644
 --- a/t/129-ssl-socket.t
 +++ b/t/129-ssl-socket.t
 @@ -108,10 +108,10 @@ sent http request: 59 bytes.
@@ -657,11 +718,14 @@ index 9da9a5c..98fb5a2 100644
  --- grep_error_log_out
  --- error_log
  lua ssl certificate verify error: (18: self signed certificate)
+-- 
+2.11.0
 
-From 4f7dcf142a180c817c038122eeff53148353e0fa Mon Sep 17 00:00:00 2001
+
+From ee94698edd219607adbd4807f4e5173f6e51ad51 Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@cloudflare.com>
 Date: Thu, 12 May 2016 13:17:52 +0100
-Subject: [PATCH 3/5] bugfix: ssl: do not set tlsext_status_expected flag
+Subject: [PATCH 3/6] bugfix: ssl: do not set tlsext_status_expected flag
 
 In OpenSSL 1.1.0 the SSL struct was made opaque, and setting this
 flag manually is not required anyway since OpenSSL already does that
@@ -672,7 +736,7 @@ automatically when ngx_http_lua_ssl_empty_status_callback() returns
  1 file changed, 1 deletion(-)
 
 diff --git a/src/ngx_http_lua_ssl_ocsp.c b/src/ngx_http_lua_ssl_ocsp.c
-index 3904aa8..31b4f24 100644
+index 3904aa8e..31b4f243 100644
 --- a/src/ngx_http_lua_ssl_ocsp.c
 +++ b/src/ngx_http_lua_ssl_ocsp.c
 @@ -490,7 +490,6 @@ ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
@@ -683,11 +747,14 @@ index 3904aa8..31b4f24 100644
  
      return NGX_OK;
  
+-- 
+2.11.0
 
-From 0a1a3dd1ee86732abd2f44c070292eae5064fced Mon Sep 17 00:00:00 2001
+
+From 9794d2d1ba577fe4dd8771d69d1ca4a688efe36c Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@cloudflare.com>
 Date: Fri, 10 Jun 2016 13:23:21 +0100
-Subject: [PATCH 4/5] bugfix: ssl: do not access SSL struct directly for
+Subject: [PATCH 4/6] bugfix: ssl: do not access SSL struct directly for
  tlsext_status_type
 
 In OpenSSL 1.1.0 it was made opaque, and a getter function was added.
@@ -696,7 +763,7 @@ In OpenSSL 1.1.0 it was made opaque, and a getter function was added.
  1 file changed, 4 insertions(+)
 
 diff --git a/src/ngx_http_lua_ssl_ocsp.c b/src/ngx_http_lua_ssl_ocsp.c
-index 31b4f24..9ec8b50 100644
+index 31b4f243..9ec8b509 100644
 --- a/src/ngx_http_lua_ssl_ocsp.c
 +++ b/src/ngx_http_lua_ssl_ocsp.c
 @@ -468,7 +468,11 @@ ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
@@ -711,11 +778,14 @@ index 31b4f24..9ec8b50 100644
          dd("no ocsp status req from client");
          return NGX_DECLINED;
      }
+-- 
+2.11.0
 
-From 1769df4649ed54b6cfef97de6cd7a79753be7a43 Mon Sep 17 00:00:00 2001
+
+From 4d1f5bdcdade5e3c6ac0c09446ac1dcd8b4006b0 Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@ghedini.me>
 Date: Tue, 13 Sep 2016 22:19:10 +0100
-Subject: [PATCH 5/5] bugfix: ssl: make SSL session callback build with OpenSSL
+Subject: [PATCH 5/6] bugfix: ssl: make SSL session callback build with OpenSSL
  1.1.0
 
 ---
@@ -725,7 +795,7 @@ Subject: [PATCH 5/5] bugfix: ssl: make SSL session callback build with OpenSSL
  3 files changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/src/ngx_http_lua_ssl_session_fetchby.c b/src/ngx_http_lua_ssl_session_fetchby.c
-index 4c450b5..6212c60 100644
+index 4c450b56..6212c60d 100644
 --- a/src/ngx_http_lua_ssl_session_fetchby.c
 +++ b/src/ngx_http_lua_ssl_session_fetchby.c
 @@ -171,8 +171,11 @@ ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -752,7 +822,7 @@ index 4c450b5..6212c60 100644
      cctx->entered_sess_fetch_handler = 1;
      cctx->done = 0;
 diff --git a/src/ngx_http_lua_ssl_session_fetchby.h b/src/ngx_http_lua_ssl_session_fetchby.h
-index 5a6f96f..50c6616 100644
+index 5a6f96f5..50c6616d 100644
 --- a/src/ngx_http_lua_ssl_session_fetchby.h
 +++ b/src/ngx_http_lua_ssl_session_fetchby.h
 @@ -25,7 +25,11 @@ char *ngx_http_lua_ssl_sess_fetch_by_lua_block(ngx_conf_t *cf,
@@ -769,7 +839,7 @@ index 5a6f96f..50c6616 100644
  
  
 diff --git a/src/ngx_http_lua_ssl_session_storeby.c b/src/ngx_http_lua_ssl_session_storeby.c
-index b5596bc..85dbece 100644
+index b5596bc7..85dbece1 100644
 --- a/src/ngx_http_lua_ssl_session_storeby.c
 +++ b/src/ngx_http_lua_ssl_session_storeby.c
 @@ -172,6 +172,8 @@ int
@@ -797,3 +867,98 @@ index b5596bc..85dbece 100644
      cctx->done = 0;
  
      dd("setting cctx");
+-- 
+2.11.0
+
+
+From 97ca52b469fcf4881c06ab26fbc46cbd37d8cf9f Mon Sep 17 00:00:00 2001
+From: Alessandro Ghedini <alessandro@ghedini.me>
+Date: Mon, 28 Nov 2016 21:01:00 +0000
+Subject: [PATCH 6/6] bugfix: ssl: don't use RC4 in tests
+
+RC4 ciphers are deprecated and disabled by default in OpenSSL 1.1.0.
+---
+ t/129-ssl-socket.t | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/t/129-ssl-socket.t b/t/129-ssl-socket.t
+index 98fb5a2b..1d9c5710 100644
+--- a/t/129-ssl-socket.t
++++ b/t/129-ssl-socket.t
+@@ -1129,7 +1129,7 @@ SSL reused session
+             sock:settimeout(2000)
+ 
+             do
+-                local ok, err = sock:connect("iscribblet.org", 443)
++                local ok, err = sock:connect("openresty.org", 443)
+                 if not ok then
+                     ngx.say("failed to connect: ", err)
+                     return
+@@ -1137,7 +1137,7 @@ SSL reused session
+ 
+                 ngx.say("connected: ", ok)
+ 
+-                local session, err = sock:sslhandshake(nil, "iscribblet.org")
++                local session, err = sock:sslhandshake(nil, "openresty.org")
+                 if not session then
+                     ngx.say("failed to do SSL handshake: ", err)
+                     return
+@@ -1145,7 +1145,7 @@ SSL reused session
+ 
+                 ngx.say("ssl handshake: ", type(session))
+ 
+-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
++                local req = "GET /en/ HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
+                 local bytes, err = sock:send(req)
+                 if not bytes then
+                     ngx.say("failed to send http request: ", err)
+@@ -1174,7 +1174,7 @@ GET /t
+ --- response_body
+ connected: 1
+ ssl handshake: userdata
+-sent http request: 59 bytes.
++sent http request: 61 bytes.
+ received: HTTP/1.1 200 OK
+ close: 1 nil
+ 
+@@ -1185,8 +1185,8 @@ qr/^lua ssl save session: ([0-9A-F]+)
+ lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+-lua ssl server name: "iscribblet.org"
+-SSL: TLSv1.2, cipher: "ECDHE-RSA-RC4-SHA SSLv3
++lua ssl server name: "openresty.org"
++SSL: TLSv1.2, cipher: "ECDHE-RSA-AES128-GCM-SHA256
+ --- no_error_log
+ SSL reused session
+ [error]
+@@ -1199,7 +1199,7 @@ SSL reused session
+ --- config
+     server_tokens off;
+     resolver $TEST_NGINX_RESOLVER;
+-    lua_ssl_ciphers RC4-SHA;
++    lua_ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256;
+     location /t {
+         #set $port 5000;
+         set $port $TEST_NGINX_MEMCACHED_PORT;
+@@ -1266,7 +1266,7 @@ lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+-SSL: TLSv1.2, cipher: "RC4-SHA SSLv3
++SSL: TLSv1.2, cipher: "ECDHE-RSA-AES128-GCM-SHA256
+ --- no_error_log
+ SSL reused session
+ [error]
+@@ -1346,7 +1346,7 @@ lua ssl free session: ([0-9A-F]+)
+ $/
+ --- error_log
+ lua ssl server name: "iscribblet.org"
+-SSL: TLSv1, cipher: "ECDHE-RSA-RC4-SHA SSLv3
++SSL: TLSv1
+ --- no_error_log
+ SSL reused session
+ [error]
+-- 
+2.11.0
+

From add52334d14815f2f085ad9321f87b74f1954c1a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 23 Dec 2016 22:12:16 +0200
Subject: [PATCH 140/600] Reactivate PIE

Thanks: Markus Waldeck for the suggestion
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4a8d986..4ac7747 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS)
 
 # export necessary perl hardenging flags
 # see: src/http/modules/perl/Makefile.PL
-DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS)
+DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS)
 export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras

From e8f81d1ad00d4f0d2bd4829c1fe291cdc7585a44 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 23 Dec 2016 22:42:42 +0200
Subject: [PATCH 141/600] mod: Check if nginx binary exists before reloading

Since the modules don't depend on nginx binary packages
yet, there are some edge cases that /run/nginx.pid is not empty
and /usr/sbin/nginx doesn't exist.
---
 debian/autoscripts/postinst-nginx | 4 +++-
 debian/autoscripts/postrm-nginx   | 4 +++-
 debian/autoscripts/prerm-nginx    | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/autoscripts/postinst-nginx b/debian/autoscripts/postinst-nginx
index b2efc7b..dd84df2 100644
--- a/debian/autoscripts/postinst-nginx
+++ b/debian/autoscripts/postinst-nginx
@@ -10,5 +10,7 @@ for confpair in #NAMES# ; do
 done
 
 if [ -s /run/nginx.pid ]; then
-	nginx -s reload
+	if which nginx >/dev/null 2>&1; then
+		nginx -s reload
+	fi
 fi
diff --git a/debian/autoscripts/postrm-nginx b/debian/autoscripts/postrm-nginx
index bb16a45..1776024 100644
--- a/debian/autoscripts/postrm-nginx
+++ b/debian/autoscripts/postrm-nginx
@@ -9,6 +9,8 @@ if [ "$1" = "purge" ] ; then
 	done
 
 	if [ -s /run/nginx.pid ]; then
-		nginx -s reload
+		if which nginx >/dev/null 2>&1; then
+			nginx -s reload
+		fi
         fi
 fi
diff --git a/debian/autoscripts/prerm-nginx b/debian/autoscripts/prerm-nginx
index 8bc2d25..1767437 100644
--- a/debian/autoscripts/prerm-nginx
+++ b/debian/autoscripts/prerm-nginx
@@ -9,6 +9,8 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
 	done
 
 	if [ -s /run/nginx.pid ]; then
-		nginx -s reload
-	fi
+		if which nginx >/dev/null 2>&1; then
+			nginx -s reload
+		fi
+        fi
 fi

From e5ea352290dee23c47d0edc263a74ca553fff81a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 23 Dec 2016 23:29:28 +0200
Subject: [PATCH 142/600] mod: Upgrade headers-mode to 0.32

---
 debian/modules/README.Modules-versions        |  2 +-
 .../headers-more-nginx-module/README.markdown |  2 +-
 .../src/ngx_http_headers_more_headers_in.c    |  5 +++++
 .../t/input-cookie.t                          | 19 +++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 249c847..6ce9da7 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -6,7 +6,7 @@ README for Modules versions
 
  headers-more-nginx-module
   Homepage: https://github.com/agentzh/headers-more-nginx-module
-  Version: v0.31
+  Version: v0.32
 
  nginx-development-kit
   Homepage: https://github.com/simpl/ngx_devel_kit/
diff --git a/debian/modules/headers-more-nginx-module/README.markdown b/debian/modules/headers-more-nginx-module/README.markdown
index 8ab4b26..d584461 100644
--- a/debian/modules/headers-more-nginx-module/README.markdown
+++ b/debian/modules/headers-more-nginx-module/README.markdown
@@ -36,7 +36,7 @@ Table of Contents
 Version
 =======
 
-This document describes headers-more-nginx-module [v0.31](https://github.com/openresty/headers-more-nginx-module/tags) released on 15 August 2016.
+This document describes headers-more-nginx-module [v0.32](https://github.com/openresty/headers-more-nginx-module/tags) released on 4 November 2016.
 
 Synopsis
 ========
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c
index f903908..bdea8de 100644
--- a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c
+++ b/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c
@@ -738,6 +738,11 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
     ngx_array_t       *headers;
     ngx_table_elt_t  **v, *h;
 
+    if (r->headers_out.status == 400 || r->headers_in.headers.last == NULL) {
+        /* must be a 400 Bad Request */
+        return NGX_OK;
+    }
+
     headers = (ngx_array_t *) ((char *) &r->headers_in + hv->offset);
 
     if (headers->nelts > 0) {
diff --git a/debian/modules/headers-more-nginx-module/t/input-cookie.t b/debian/modules/headers-more-nginx-module/t/input-cookie.t
index 8929be7..68db4d0 100644
--- a/debian/modules/headers-more-nginx-module/t/input-cookie.t
+++ b/debian/modules/headers-more-nginx-module/t/input-cookie.t
@@ -162,3 +162,22 @@ Cookie: boo=123
 --- no_error_log
 [error]
 
+
+
+=== TEST 5: for bad requests causing segfaults when setting & getting multi-value headers
+--- config
+    error_page 400 = /err;
+
+    location = /err {
+        more_set_input_headers "Cookie: foo=bar";
+        echo -n $cookie_foo;
+        echo ok;
+    }
+--- raw_request
+GeT / HTTP/1.1
+--- response_body
+ok
+--- no_error_log
+[error]
+[alert]
+--- no_check_leak

From c9d02dd9d6fd2a8f5dca628f1dc65cdff80a0f09 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 23 Dec 2016 23:32:26 +0200
Subject: [PATCH 143/600] mod: Upgrade development kit to 0.3.0

---
 debian/modules/README.Modules-versions                       | 2 +-
 debian/modules/nginx-development-kit/src/ndk_complex_value.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 6ce9da7..9a04d15 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -10,7 +10,7 @@ README for Modules versions
 
  nginx-development-kit
   Homepage: https://github.com/simpl/ngx_devel_kit/
-  Version: v0.3.0rc1
+  Version: v0.3.0
 
  nginx-auth-pam
   Homepage: https://github.com/stogh/ngx_http_auth_pam_module
diff --git a/debian/modules/nginx-development-kit/src/ndk_complex_value.c b/debian/modules/nginx-development-kit/src/ndk_complex_value.c
index bfca2cd..97681ff 100644
--- a/debian/modules/nginx-development-kit/src/ndk_complex_value.c
+++ b/debian/modules/nginx-development-kit/src/ndk_complex_value.c
@@ -50,7 +50,7 @@ ndk_http_complex_value_array_create (ngx_conf_t *cf, char **s, ngx_int_t n)
 ngx_int_t
 ndk_http_complex_value_array_compile (ngx_conf_t *cf, ngx_array_t *a)
 {
-    ngx_int_t                   i;
+    ngx_uint_t                  i;
     ngx_http_complex_value_t   *cv;
 
     if (a == NULL || a == NGX_CONF_UNSET_PTR) {
@@ -109,7 +109,7 @@ ndk_conf_set_http_complex_value_array_slot (ngx_conf_t *cf, ngx_command_t *cmd,
     ngx_http_complex_value_t    *cv;
     ngx_array_t                **a;
     ngx_conf_post_t             *post;
-    ngx_int_t                    i, alloc;
+    ngx_uint_t                   i, alloc;
 
     a = (ngx_array_t **) (p + cmd->offset);
 

From 34f973d82f180339a7789c15c11b80f10006c33a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 24 Dec 2016 12:12:51 +0200
Subject: [PATCH 144/600] Release 1.10.2-3

---
 debian/changelog | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e4f587..f0fcba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,22 @@
-nginx (1.10.2-3) UNRELEASED; urgency=medium
+nginx (1.10.2-3) unstable; urgency=medium
 
+  [ Michael Lustfield ]
   * debian/conf/sites-enabled/default:
     + Correcting location of default php-fpm socket. (Closes: #846145)
 
- -- Michael Lustfield <michael@lustfield.net>  Sat, 03 Dec 2016 07:57:39 +0000
+  [ Christos Trochalakis ]
+  * debian/rules: Correctly clean patched modules.
+    Thanks to Sven-Haegar Koch for the initial patch. (Closes: #844506)
+  * mod: Upgrade nchan to 1.0.8. (Closes: #844473)
+  * mod: Upgrade nginx-lua to 0.10.7.
+  * Update nginx-lua OpenSSL 1.1.0 patch.
+  * Reactivate PIE.
+    Thanks to Markus Waldeck for the suggestion.
+  * mod: Check if nginx binary exists before reloading.
+  * mod: Upgrade headers-mode to 0.32.
+  * mod: Upgrade development kit to 0.3.0.
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Sat, 24 Dec 2016 12:11:21 +0200
 
 nginx (1.10.2-2) unstable; urgency=medium
 

From 30cba18b365ff6cd947db7094b5d419cd171d928 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 27 Dec 2016 16:56:10 +0200
Subject: [PATCH 145/600] New upstream version 1.11.8

---
 CHANGES                                       |  28 ++++
 CHANGES.ru                                    |  30 ++++
 auto/lib/openssl/conf                         |  12 +-
 auto/lib/openssl/makefile.msvc                |  17 +-
 auto/lib/perl/make                            |   9 +-
 contrib/vim/ftplugin/nginx.vim                |   1 +
 src/core/nginx.h                              |   4 +-
 src/core/ngx_resolver.c                       |  29 +++-
 src/core/ngx_slab.c                           |   6 +-
 src/event/ngx_event_openssl.c                 |  62 +++++--
 src/event/ngx_event_openssl.h                 |   5 +-
 src/event/ngx_event_openssl_stapling.c        |   4 +-
 src/http/modules/ngx_http_dav_module.c        |   9 +-
 src/http/modules/ngx_http_log_module.c        |  83 +++++++++-
 src/http/modules/ngx_http_static_module.c     |   9 +-
 src/http/modules/ngx_http_sub_filter_module.c |   4 +-
 src/http/ngx_http.c                           |   5 +-
 src/http/ngx_http_core_module.c               |  16 +-
 src/http/ngx_http_core_module.h               |   1 +
 src/http/ngx_http_file_cache.c                |   6 +-
 src/http/ngx_http_header_filter_module.c      |   3 +-
 src/http/ngx_http_script.c                    |   4 +-
 src/http/ngx_http_script.h                    |  22 +--
 src/http/ngx_http_upstream.c                  |   4 +-
 src/http/ngx_http_variables.c                 |  40 ++++-
 src/http/v2/ngx_http_v2_filter_module.c       |   4 +-
 src/mail/ngx_mail_smtp_module.c               |   2 +-
 src/stream/ngx_stream_log_module.c            |  83 +++++++++-
 src/stream/ngx_stream_proxy_module.c          |   5 +
 src/stream/ngx_stream_ssl_module.c            | 151 ++++++++++++++++++
 src/stream/ngx_stream_ssl_module.h            |   6 +
 src/stream/ngx_stream_ssl_preread_module.c    |   2 +-
 src/stream/ngx_stream_upstream.h              |   3 +
 src/stream/ngx_stream_upstream_round_robin.c  |  29 ++++
 src/stream/ngx_stream_variables.c             |  42 +++--
 35 files changed, 626 insertions(+), 114 deletions(-)
 create mode 100644 contrib/vim/ftplugin/nginx.vim

diff --git a/CHANGES b/CHANGES
index 99e360e..94b27be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,32 @@
 
+Changes with nginx 1.11.8                                        27 Dec 2016
+
+    *) Feature: the "absolute_redirect" directive.
+
+    *) Feature: the "escape" parameter of the "log_format" directive.
+
+    *) Feature: client SSL certificates verification in the stream module.
+
+    *) Feature: the "ssl_session_ticket_key" directive supports AES256
+       encryption of TLS session tickets when used with 80-byte keys.
+
+    *) Feature: vim-commentary support in vim scripts.
+       Thanks to Armin Grodon.
+
+    *) Bugfix: recursion when evaluating variables was not limited.
+
+    *) Bugfix: in the ngx_stream_ssl_preread_module.
+
+    *) Bugfix: if a server in an upstream in the stream module failed, it
+       was considered alive only when a test connection sent to it after
+       fail_timeout was closed; now a successfully established connection is
+       enough.
+
+    *) Bugfix: nginx/Windows could not be built with 64-bit Visual Studio.
+
+    *) Bugfix: nginx/Windows could not be built with OpenSSL 1.1.0.
+
+
 Changes with nginx 1.11.7                                        13 Dec 2016
 
     *) Change: now in case of a client certificate verification error the
diff --git a/CHANGES.ru b/CHANGES.ru
index 695547b..e8627a2 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,34 @@
 
+Изменения в nginx 1.11.8                                          27.12.2016
+
+    *) Добавление: директива absolute_redirect.
+
+    *) Добавление: параметр escape директивы log_format.
+
+    *) Добавление: проверка клиентских SSL-сертификатов в модуле stream.
+
+    *) Добавление: директива ssl_session_ticket_key поддерживает шифрование
+       TLS session tickets с помощью AES256 при использовании с 80-байтными
+       ключами.
+
+    *) Добавление: поддержка vim-commentary в скриптах для vim.
+       Спасибо Armin Grodon.
+
+    *) Исправление: рекурсия при получении значений переменных не
+       ограничивалась.
+
+    *) Исправление: в модуле ngx_stream_ssl_preread_module.
+
+    *) Исправление: если сервер, описанный в блоке upstream в модуле stream,
+       был признан неработающим, то после истечения fail_timeout он
+       признавался работающим только после завершения тестового соединения;
+       теперь достаточно, чтобы соединение было успешно установлено.
+
+    *) Исправление: nginx/Windows не собирался с 64-битным Visual Studio.
+
+    *) Исправление: nginx/Windows не собирался с OpenSSL 1.1.0.
+
+
 Изменения в nginx 1.11.7                                          13.12.2016
 
     *) Изменение: переменная $ssl_client_verify теперь в случае ошибки
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index 39d9602..e7d3795 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -15,8 +15,16 @@ if [ $OPENSSL != NONE ]; then
 
             CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
             CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
-            CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
-            CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"
+
+            if [ -f $OPENSSL/ms/do_ms.bat ]; then
+                # before OpenSSL 1.1.0
+                CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
+                CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"
+            else
+                # OpenSSL 1.1.0+
+                CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib"
+                CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib"
+            fi
 
             # libeay32.lib requires gdi32.lib
             CORE_LIBS="$CORE_LIBS gdi32.lib"
diff --git a/auto/lib/openssl/makefile.msvc b/auto/lib/openssl/makefile.msvc
index fc9e578..5b90dcb 100644
--- a/auto/lib/openssl/makefile.msvc
+++ b/auto/lib/openssl/makefile.msvc
@@ -6,9 +6,16 @@
 all:
 	cd $(OPENSSL)
 
-	perl Configure VC-WIN32 no-shared --prefix=openssl $(OPENSSL_OPT)
+	perl Configure VC-WIN32 no-shared				\
+		--prefix="%cd%/openssl" 				\
+		--openssldir="%cd%/openssl/ssl" 			\
+		$(OPENSSL_OPT)
 
-	ms\do_ms
-
-	$(MAKE) -f ms\nt.mak
-	$(MAKE) -f ms\nt.mak install
+	if exist ms\do_ms.bat (						\
+		ms\do_ms						\
+		&& $(MAKE) -f ms\nt.mak					\
+		&& $(MAKE) -f ms\nt.mak install				\
+	) else (							\
+		$(MAKE)							\
+		&& $(MAKE) install_sw					\
+	)
diff --git a/auto/lib/perl/make b/auto/lib/perl/make
index 350090c..74e0f3a 100644
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -3,9 +3,6 @@
 # Copyright (C) Nginx, Inc.
 
 
-v=`grep 'define NGINX_VERSION' src/core/nginx.h | sed -e 's/^.*"\(.*\)".*/\1/'`
-
-
 cat << END                                                    >> $NGX_MAKEFILE
 
 $NGX_OBJS/src/http/modules/perl/ngx_http_perl_module.o: \\
@@ -27,7 +24,11 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \\
 		src/http/modules/perl/nginx.pm \\
 		src/http/modules/perl/nginx.xs \\
 		src/http/modules/perl/typemap
-	sed "s/%%VERSION%%/$v/" src/http/modules/perl/nginx.pm > \\
+	grep 'define NGINX_VERSION' src/core/nginx.h \\
+		| sed -e 's/^.*"\(.*\)".*/\1/' > \\
+		$NGX_OBJS/src/http/modules/perl/version
+	sed "s/%%VERSION%%/\`cat $NGX_OBJS/src/http/modules/perl/version\`/" \\
+		src/http/modules/perl/nginx.pm > \\
 		$NGX_OBJS/src/http/modules/perl/nginx.pm
 	cp -p src/http/modules/perl/nginx.xs $NGX_OBJS/src/http/modules/perl/
 	cp -p src/http/modules/perl/typemap $NGX_OBJS/src/http/modules/perl/
diff --git a/contrib/vim/ftplugin/nginx.vim b/contrib/vim/ftplugin/nginx.vim
new file mode 100644
index 0000000..463eea9
--- /dev/null
+++ b/contrib/vim/ftplugin/nginx.vim
@@ -0,0 +1 @@
+setlocal commentstring=#\ %s
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 7733313..983179f 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011007
-#define NGINX_VERSION      "1.11.7"
+#define nginx_version      1011008
+#define NGINX_VERSION      "1.11.8"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index bdfed88..2065f75 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -300,6 +300,10 @@ ngx_resolver_cleanup(void *data)
 #endif
 
         if (r->event) {
+            if (r->event->timer_set) {
+                ngx_del_timer(r->event);
+            }
+
             ngx_free(r->event);
         }
 
@@ -347,6 +351,10 @@ ngx_resolver_cleanup_tree(ngx_resolver_t *r, ngx_rbtree_t *tree)
             next = ctx->next;
 
             if (ctx->event) {
+                if (ctx->event->timer_set) {
+                    ngx_del_timer(ctx->event);
+                }
+
                 ngx_resolver_free(r, ctx->event);
             }
 
@@ -772,7 +780,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
 #endif
 
         if (rn->nsrvs) {
-            for (i = 0; i < rn->nsrvs; i++) {
+            for (i = 0; i < (ngx_uint_t) rn->nsrvs; i++) {
                 if (rn->u.srvs[i].name.data) {
                     ngx_resolver_free_locked(r, rn->u.srvs[i].name.data);
                 }
@@ -867,7 +875,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
         ngx_add_timer(ctx->event, ctx->timeout);
     }
 
-    if (ngx_queue_empty(resend_queue)) {
+    if (ngx_resolver_resend_empty(r)) {
         ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
     }
 
@@ -1090,7 +1098,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
         ngx_add_timer(ctx->event, ctx->timeout);
     }
 
-    if (ngx_queue_empty(resend_queue)) {
+    if (ngx_resolver_resend_empty(r)) {
         ngx_add_timer(r->event, (ngx_msec_t) (r->resend_timeout * 1000));
     }
 
@@ -1548,6 +1556,7 @@ static ngx_uint_t
 ngx_resolver_resend_empty(ngx_resolver_t *r)
 {
     return ngx_queue_empty(&r->name_resend_queue)
+           && ngx_queue_empty(&r->srv_resend_queue)
 #if (NGX_HAVE_INET6)
            && ngx_queue_empty(&r->addr6_resend_queue)
 #endif
@@ -2946,7 +2955,11 @@ ngx_resolver_resolve_srv_names(ngx_resolver_ctx_t *ctx, ngx_resolver_node_t *rn)
     ctx->srvs = srvs;
     ctx->nsrvs = rn->nsrvs;
 
-    for (i = 0; i < rn->nsrvs; i++) {
+    if (ctx->event && ctx->event->timer_set) {
+        ngx_del_timer(ctx->event);
+    }
+
+    for (i = 0; i < (ngx_uint_t) rn->nsrvs; i++) {
         srvs[i].name.data = ngx_resolver_alloc(r, rn->u.srvs[i].name.len);
         if (srvs[i].name.data == NULL) {
             goto failed;
@@ -2965,7 +2978,7 @@ ngx_resolver_resolve_srv_names(ngx_resolver_ctx_t *ctx, ngx_resolver_node_t *rn)
         cctx->handler = ngx_resolver_srv_names_handler;
         cctx->data = ctx;
         cctx->srvs = &srvs[i];
-        cctx->timeout = 0;
+        cctx->timeout = ctx->timeout;
 
         srvs[i].priority = rn->u.srvs[i].priority;
         srvs[i].weight = rn->u.srvs[i].weight;
@@ -4064,7 +4077,7 @@ ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn)
 #endif
 
     if (rn->nsrvs) {
-        for (i = 0; i < rn->nsrvs; i++) {
+        for (i = 0; i < (ngx_uint_t) rn->nsrvs; i++) {
             if (rn->u.srvs[i].name.data) {
                 ngx_resolver_free_locked(r, rn->u.srvs[i].name.data);
             }
@@ -4193,10 +4206,10 @@ ngx_resolver_export(ngx_resolver_t *r, ngx_resolver_node_t *rn,
                 d = 0;
             }
 
-            if (j == rn->naddrs) {
+            if (j == (ngx_uint_t) rn->naddrs) {
                 j = 0;
             }
-        } while (++i < rn->naddrs);
+        } while (++i < (ngx_uint_t) rn->naddrs);
     }
 
 #if (NGX_HAVE_INET6)
diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
index 66faecc..1d4ce2b 100644
--- a/src/core/ngx_slab.c
+++ b/src/core/ngx_slab.c
@@ -101,7 +101,7 @@ ngx_slab_init(ngx_slab_pool_t *pool)
     }
     /**/
 
-    pool->min_size = 1 << pool->min_shift;
+    pool->min_size = (size_t) 1 << pool->min_shift;
 
     slots = ngx_slab_slots(pool);
 
@@ -473,7 +473,7 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
     case NGX_SLAB_SMALL:
 
         shift = slab & NGX_SLAB_SHIFT_MASK;
-        size = 1 << shift;
+        size = (size_t) 1 << shift;
 
         if ((uintptr_t) p & (size - 1)) {
             goto wrong_chunk;
@@ -568,7 +568,7 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
     case NGX_SLAB_BIG:
 
         shift = slab & NGX_SLAB_SHIFT_MASK;
-        size = 1 << shift;
+        size = (size_t) 1 << shift;
 
         if ((uintptr_t) p & (size - 1)) {
             goto wrong_chunk;
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 1b39f33..3c74b7b 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -2856,7 +2856,8 @@ ngx_ssl_session_rbtree_insert_value(ngx_rbtree_node_t *temp,
 ngx_int_t
 ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
 {
-    u_char                         buf[48];
+    u_char                         buf[80];
+    size_t                         size;
     ssize_t                        n;
     ngx_str_t                     *path;
     ngx_file_t                     file;
@@ -2899,13 +2900,15 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
             goto failed;
         }
 
-        if (ngx_file_size(&fi) != 48) {
+        size = ngx_file_size(&fi);
+
+        if (size != 48 && size != 80) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "\"%V\" must be 48 bytes", &file.name);
+                               "\"%V\" must be 48 or 80 bytes", &file.name);
             goto failed;
         }
 
-        n = ngx_read_file(&file, buf, 48, 0);
+        n = ngx_read_file(&file, buf, size, 0);
 
         if (n == NGX_ERROR) {
             ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno,
@@ -2913,10 +2916,10 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
             goto failed;
         }
 
-        if (n != 48) {
+        if ((size_t) n != size) {
             ngx_conf_log_error(NGX_LOG_CRIT, cf, 0,
                                ngx_read_file_n " \"%V\" returned only "
-                               "%z bytes instead of 48", &file.name, n);
+                               "%z bytes instead of %uz", &file.name, n, size);
             goto failed;
         }
 
@@ -2925,9 +2928,18 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
             goto failed;
         }
 
-        ngx_memcpy(key->name, buf, 16);
-        ngx_memcpy(key->aes_key, buf + 16, 16);
-        ngx_memcpy(key->hmac_key, buf + 32, 16);
+        if (size == 48) {
+            key->size = 48;
+            ngx_memcpy(key->name, buf, 16);
+            ngx_memcpy(key->aes_key, buf + 16, 16);
+            ngx_memcpy(key->hmac_key, buf + 32, 16);
+
+        } else {
+            key->size = 80;
+            ngx_memcpy(key->name, buf, 16);
+            ngx_memcpy(key->hmac_key, buf + 16, 32);
+            ngx_memcpy(key->aes_key, buf + 48, 32);
+        }
 
         if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
             ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
@@ -2972,6 +2984,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     unsigned char *name, unsigned char *iv, EVP_CIPHER_CTX *ectx,
     HMAC_CTX *hctx, int enc)
 {
+    size_t                         size;
     SSL_CTX                       *ssl_ctx;
     ngx_uint_t                     i;
     ngx_array_t                   *keys;
@@ -2986,7 +2999,6 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     c = ngx_ssl_get_connection(ssl_conn);
     ssl_ctx = c->ssl->session_ctx;
 
-    cipher = EVP_aes_128_cbc();
 #ifdef OPENSSL_NO_SHA256
     digest = EVP_sha1();
 #else
@@ -3008,6 +3020,15 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
                        ngx_hex_dump(buf, key[0].name, 16) - buf, buf,
                        SSL_session_reused(ssl_conn) ? "reused" : "new");
 
+        if (key[0].size == 48) {
+            cipher = EVP_aes_128_cbc();
+            size = 16;
+
+        } else {
+            cipher = EVP_aes_256_cbc();
+            size = 32;
+        }
+
         if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) != 1) {
             ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "RAND_bytes() failed");
             return -1;
@@ -3020,12 +3041,12 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
         }
 
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-        if (HMAC_Init_ex(hctx, key[0].hmac_key, 16, digest, NULL) != 1) {
+        if (HMAC_Init_ex(hctx, key[0].hmac_key, size, digest, NULL) != 1) {
             ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "HMAC_Init_ex() failed");
             return -1;
         }
 #else
-        HMAC_Init_ex(hctx, key[0].hmac_key, 16, digest, NULL);
+        HMAC_Init_ex(hctx, key[0].hmac_key, size, digest, NULL);
 #endif
 
         ngx_memcpy(name, key[0].name, 16);
@@ -3054,13 +3075,22 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
                        ngx_hex_dump(buf, key[i].name, 16) - buf, buf,
                        (i == 0) ? " (default)" : "");
 
+        if (key[i].size == 48) {
+            cipher = EVP_aes_128_cbc();
+            size = 16;
+
+        } else {
+            cipher = EVP_aes_256_cbc();
+            size = 32;
+        }
+
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-        if (HMAC_Init_ex(hctx, key[i].hmac_key, 16, digest, NULL) != 1) {
+        if (HMAC_Init_ex(hctx, key[i].hmac_key, size, digest, NULL) != 1) {
             ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "HMAC_Init_ex() failed");
             return -1;
         }
 #else
-        HMAC_Init_ex(hctx, key[i].hmac_key, 16, digest, NULL);
+        HMAC_Init_ex(hctx, key[i].hmac_key, size, digest, NULL);
 #endif
 
         if (EVP_DecryptInit_ex(ectx, cipher, NULL, key[i].aes_key, iv) != 1) {
@@ -4049,7 +4079,7 @@ ngx_ssl_parse_time(
     ASN1_TIME *asn1time)
 {
     BIO     *bio;
-    u_char  *value;
+    char    *value;
     size_t   len;
     time_t   time;
 
@@ -4071,7 +4101,7 @@ ngx_ssl_parse_time(
     ASN1_TIME_print(bio, asn1time);
     len = BIO_get_mem_data(bio, &value);
 
-    time = ngx_parse_http_time(value, len);
+    time = ngx_parse_http_time((u_char *) value, len);
 
     BIO_free(bio);
 
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index c022307..e093e10 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -117,9 +117,10 @@ typedef struct {
 #ifdef SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB
 
 typedef struct {
+    size_t                      size;
     u_char                      name[16];
-    u_char                      aes_key[16];
-    u_char                      hmac_key[16];
+    u_char                      hmac_key[32];
+    u_char                      aes_key[32];
 } ngx_ssl_session_ticket_key_t;
 
 #endif
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index 2100516..d332c11 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -773,7 +773,7 @@ static time_t
 ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time)
 {
     BIO     *bio;
-    u_char  *value;
+    char    *value;
     size_t   len;
     time_t   time;
 
@@ -795,7 +795,7 @@ ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time)
     ASN1_GENERALIZEDTIME_print(bio, asn1time);
     len = BIO_get_mem_data(bio, &value);
 
-    time = ngx_parse_http_time(value, len);
+    time = ngx_parse_http_time((u_char *) value, len);
 
     BIO_free(bio);
 
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 012a0fb..895a52d 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -1067,7 +1067,7 @@ ngx_http_dav_location(ngx_http_request_t *r, u_char *path)
     u_char                    *location;
     ngx_http_core_loc_conf_t  *clcf;
 
-    r->headers_out.location = ngx_palloc(r->pool, sizeof(ngx_table_elt_t));
+    r->headers_out.location = ngx_list_push(&r->headers_out.headers);
     if (r->headers_out.location == NULL) {
         return NGX_ERROR;
     }
@@ -1086,11 +1086,8 @@ ngx_http_dav_location(ngx_http_request_t *r, u_char *path)
         ngx_memcpy(location, r->uri.data, r->uri.len);
     }
 
-    /*
-     * we do not need to set the r->headers_out.location->hash and
-     * r->headers_out.location->key fields
-     */
-
+    r->headers_out.location->hash = 1;
+    ngx_str_set(&r->headers_out.location->key, "Location");
     r->headers_out.location->value.len = r->uri.len;
     r->headers_out.location->value.data = location;
 
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index c42fb08..ff8572b 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -126,12 +126,16 @@ static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf,
     ngx_http_log_op_t *op);
 
 static ngx_int_t ngx_http_log_variable_compile(ngx_conf_t *cf,
-    ngx_http_log_op_t *op, ngx_str_t *value);
+    ngx_http_log_op_t *op, ngx_str_t *value, ngx_uint_t json);
 static size_t ngx_http_log_variable_getlen(ngx_http_request_t *r,
     uintptr_t data);
 static u_char *ngx_http_log_variable(ngx_http_request_t *r, u_char *buf,
     ngx_http_log_op_t *op);
 static uintptr_t ngx_http_log_escape(u_char *dst, u_char *src, size_t size);
+static size_t ngx_http_log_json_variable_getlen(ngx_http_request_t *r,
+    uintptr_t data);
+static u_char *ngx_http_log_json_variable(ngx_http_request_t *r, u_char *buf,
+    ngx_http_log_op_t *op);
 
 
 static void *ngx_http_log_create_main_conf(ngx_conf_t *cf);
@@ -909,7 +913,7 @@ ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf,
 
 static ngx_int_t
 ngx_http_log_variable_compile(ngx_conf_t *cf, ngx_http_log_op_t *op,
-    ngx_str_t *value)
+    ngx_str_t *value, ngx_uint_t json)
 {
     ngx_int_t  index;
 
@@ -919,8 +923,16 @@ ngx_http_log_variable_compile(ngx_conf_t *cf, ngx_http_log_op_t *op,
     }
 
     op->len = 0;
-    op->getlen = ngx_http_log_variable_getlen;
-    op->run = ngx_http_log_variable;
+
+    if (json) {
+        op->getlen = ngx_http_log_json_variable_getlen;
+        op->run = ngx_http_log_json_variable;
+
+    } else {
+        op->getlen = ngx_http_log_variable_getlen;
+        op->run = ngx_http_log_variable;
+    }
+
     op->data = index;
 
     return NGX_OK;
@@ -1028,6 +1040,47 @@ ngx_http_log_escape(u_char *dst, u_char *src, size_t size)
 }
 
 
+static size_t
+ngx_http_log_json_variable_getlen(ngx_http_request_t *r, uintptr_t data)
+{
+    uintptr_t                   len;
+    ngx_http_variable_value_t  *value;
+
+    value = ngx_http_get_indexed_variable(r, data);
+
+    if (value == NULL || value->not_found) {
+        return 0;
+    }
+
+    len = ngx_escape_json(NULL, value->data, value->len);
+
+    value->escape = len ? 1 : 0;
+
+    return value->len + len;
+}
+
+
+static u_char *
+ngx_http_log_json_variable(ngx_http_request_t *r, u_char *buf,
+    ngx_http_log_op_t *op)
+{
+    ngx_http_variable_value_t  *value;
+
+    value = ngx_http_get_indexed_variable(r, op->data);
+
+    if (value == NULL || value->not_found) {
+        return buf;
+    }
+
+    if (value->escape == 0) {
+        return ngx_cpymem(buf, value->data, value->len);
+
+    } else {
+        return (u_char *) ngx_escape_json(buf, value->data, value->len);
+    }
+}
+
+
 static void *
 ngx_http_log_create_main_conf(ngx_conf_t *cf)
 {
@@ -1491,12 +1544,28 @@ ngx_http_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
     size_t               i, len;
     ngx_str_t           *value, var;
     ngx_int_t           *flush;
-    ngx_uint_t           bracket;
+    ngx_uint_t           bracket, json;
     ngx_http_log_op_t   *op;
     ngx_http_log_var_t  *v;
 
+    json = 0;
     value = args->elts;
 
+    if (s < args->nelts && ngx_strncmp(value[s].data, "escape=", 7) == 0) {
+        data = value[s].data + 7;
+
+        if (ngx_strcmp(data, "json") == 0) {
+            json = 1;
+
+        } else if (ngx_strcmp(data, "default") != 0) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "unknown log format escaping \"%s\"", data);
+            return NGX_CONF_ERROR;
+        }
+
+        s++;
+    }
+
     for ( /* void */ ; s < args->nelts; s++) {
 
         i = 0;
@@ -1575,7 +1644,9 @@ ngx_http_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
                     }
                 }
 
-                if (ngx_http_log_variable_compile(cf, op, &var) != NGX_OK) {
+                if (ngx_http_log_variable_compile(cf, op, &var, json)
+                    != NGX_OK)
+                {
                     return NGX_CONF_ERROR;
                 }
 
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index f79c4ae..07b9580 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -150,7 +150,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
 
         ngx_http_clear_location(r);
 
-        r->headers_out.location = ngx_palloc(r->pool, sizeof(ngx_table_elt_t));
+        r->headers_out.location = ngx_list_push(&r->headers_out.headers);
         if (r->headers_out.location == NULL) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
@@ -182,11 +182,8 @@ ngx_http_static_handler(ngx_http_request_t *r)
             }
         }
 
-        /*
-         * we do not need to set the r->headers_out.location->hash and
-         * r->headers_out.location->key fields
-         */
-
+        r->headers_out.location->hash = 1;
+        ngx_str_set(&r->headers_out.location->key, "Location");
         r->headers_out.location->value.len = len;
         r->headers_out.location->value.data = location;
 
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index e8d1d80..de58c6f 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -645,7 +645,7 @@ ngx_http_sub_parse(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx,
 
         start = offset - (ngx_int_t) tables->min_match_len + 1;
 
-        i = ngx_max(tables->index[c], ctx->index);
+        i = ngx_max((ngx_uint_t) tables->index[c], ctx->index);
         j = tables->index[c + 1];
 
         while (i != j) {
@@ -978,7 +978,7 @@ ngx_http_sub_init_tables(ngx_http_sub_tables_t *tables,
         }
 
         c = match[i].match.data[tables->min_match_len - 1];
-        while (ch <= c) {
+        while (ch <= (ngx_uint_t) c) {
             tables->index[ch++] = (u_char) i;
         }
     }
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index ba559f2..c036389 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -457,7 +457,10 @@ ngx_http_init_phase_handlers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf)
     use_rewrite = cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers.nelts ? 1 : 0;
     use_access = cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers.nelts ? 1 : 0;
 
-    n = use_rewrite + use_access + cmcf->try_files + 1 /* find config phase */;
+    n = 1                  /* find config phase */
+        + use_rewrite      /* post rewrite phase */
+        + use_access       /* post access phase */
+        + cmcf->try_files;
 
     for (i = 0; i < NGX_HTTP_LOG_PHASE; i++) {
         n += cmcf->phases[i].handlers.nelts;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 4e37cec..666d96f 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -542,6 +542,13 @@ static ngx_command_t  ngx_http_core_commands[] = {
       offsetof(ngx_http_core_loc_conf_t, reset_timedout_connection),
       NULL },
 
+    { ngx_string("absolute_redirect"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_core_loc_conf_t, absolute_redirect),
+      NULL },
+
     { ngx_string("server_name_in_redirect"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -976,10 +983,8 @@ ngx_http_core_find_config_phase(ngx_http_request_t *r,
             return NGX_OK;
         }
 
-        /*
-         * we do not need to set the r->headers_out.location->hash and
-         * r->headers_out.location->key fields
-         */
+        r->headers_out.location->hash = 1;
+        ngx_str_set(&r->headers_out.location->key, "Location");
 
         if (r->args.len == 0) {
             r->headers_out.location->value = clcf->name;
@@ -3563,6 +3568,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
     clcf->lingering_timeout = NGX_CONF_UNSET_MSEC;
     clcf->resolver_timeout = NGX_CONF_UNSET_MSEC;
     clcf->reset_timedout_connection = NGX_CONF_UNSET;
+    clcf->absolute_redirect = NGX_CONF_UNSET;
     clcf->server_name_in_redirect = NGX_CONF_UNSET;
     clcf->port_in_redirect = NGX_CONF_UNSET;
     clcf->msie_padding = NGX_CONF_UNSET;
@@ -3825,6 +3831,8 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_value(conf->reset_timedout_connection,
                               prev->reset_timedout_connection, 0);
+    ngx_conf_merge_value(conf->absolute_redirect,
+                              prev->absolute_redirect, 1);
     ngx_conf_merge_value(conf->server_name_in_redirect,
                               prev->server_name_in_redirect, 0);
     ngx_conf_merge_value(conf->port_in_redirect, prev->port_in_redirect, 1);
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index ade9abb..237cc5c 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -385,6 +385,7 @@ struct ngx_http_core_loc_conf_s {
     ngx_flag_t    tcp_nopush;              /* tcp_nopush */
     ngx_flag_t    tcp_nodelay;             /* tcp_nodelay */
     ngx_flag_t    reset_timedout_connection; /* reset_timedout_connection */
+    ngx_flag_t    absolute_redirect;       /* absolute_redirect */
     ngx_flag_t    server_name_in_redirect; /* server_name_in_redirect */
     ngx_flag_t    port_in_redirect;        /* port_in_redirect */
     ngx_flag_t    msie_padding;            /* msie_padding */
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 3c8ad7d..a5a9300 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -553,7 +553,7 @@ ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c)
         return NGX_DECLINED;
     }
 
-    if (h->crc32 != c->crc32 || h->header_start != c->header_start) {
+    if (h->crc32 != c->crc32 || (size_t) h->header_start != c->header_start) {
         ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
                       "cache file \"%s\" has md5 collision", c->file.name.data);
         return NGX_DECLINED;
@@ -1495,8 +1495,8 @@ ngx_http_file_cache_update_header(ngx_http_request_t *r)
     if (h.version != NGX_HTTP_CACHE_VERSION
         || h.last_modified != c->last_modified
         || h.crc32 != c->crc32
-        || h.header_start != c->header_start
-        || h.body_start != c->body_start)
+        || (size_t) h.header_start != c->header_start
+        || (size_t) h.body_start != c->body_start)
     {
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "http file cache \"%s\" content changed",
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index f000b2e..88c8a61 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -309,7 +309,8 @@ ngx_http_header_filter(ngx_http_request_t *r)
 
     if (r->headers_out.location
         && r->headers_out.location->value.len
-        && r->headers_out.location->value.data[0] == '/')
+        && r->headers_out.location->value.data[0] == '/'
+        && clcf->absolute_redirect)
     {
         r->headers_out.location->hash = 0;
 
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index c2b1658..c1a0b4c 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -356,11 +356,11 @@ ngx_http_script_compile(ngx_http_script_compile_t *sc)
 
                 n = sc->source->data[i] - '0';
 
-                if (sc->captures_mask & (1 << n)) {
+                if (sc->captures_mask & ((ngx_uint_t) 1 << n)) {
                     sc->dup_capture = 1;
                 }
 
-                sc->captures_mask |= 1 << n;
+                sc->captures_mask |= (ngx_uint_t) 1 << n;
 
                 if (ngx_http_script_add_capture_code(sc, n) != NGX_OK) {
                     return NGX_ERROR;
diff --git a/src/http/ngx_http_script.h b/src/http/ngx_http_script.h
index 46592ab..a5116d7 100644
--- a/src/http/ngx_http_script.h
+++ b/src/http/ngx_http_script.h
@@ -121,16 +121,16 @@ typedef struct {
     uintptr_t                   status;
     uintptr_t                   next;
 
-    uintptr_t                   test:1;
-    uintptr_t                   negative_test:1;
-    uintptr_t                   uri:1;
-    uintptr_t                   args:1;
+    unsigned                    test:1;
+    unsigned                    negative_test:1;
+    unsigned                    uri:1;
+    unsigned                    args:1;
 
     /* add the r->args to the new arguments */
-    uintptr_t                   add_args:1;
+    unsigned                    add_args:1;
 
-    uintptr_t                   redirect:1;
-    uintptr_t                   break_cycle:1;
+    unsigned                    redirect:1;
+    unsigned                    break_cycle:1;
 
     ngx_str_t                   name;
 } ngx_http_script_regex_code_t;
@@ -139,13 +139,13 @@ typedef struct {
 typedef struct {
     ngx_http_script_code_pt     code;
 
-    uintptr_t                   uri:1;
-    uintptr_t                   args:1;
+    unsigned                    uri:1;
+    unsigned                    args:1;
 
     /* add the r->args to the new arguments */
-    uintptr_t                   add_args:1;
+    unsigned                    add_args:1;
 
-    uintptr_t                   redirect:1;
+    unsigned                    redirect:1;
 } ngx_http_script_regex_end_code_t;
 
 #endif
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index ed25f43..d0bcd29 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -4927,8 +4927,8 @@ ngx_http_upstream_rewrite_location(ngx_http_request_t *r, ngx_table_elt_t *h,
     }
 
     /*
-     * we do not set r->headers_out.location here to avoid the handling
-     * the local redirects without a host name by ngx_http_header_filter()
+     * we do not set r->headers_out.location here to avoid handling
+     * relative redirects in ngx_http_header_filter()
      */
 
     return NGX_OK;
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 7e65b2e..62006ba 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -366,6 +366,9 @@ ngx_http_variable_value_t  ngx_http_variable_true_value =
     ngx_http_variable("1");
 
 
+static ngx_uint_t  ngx_http_variable_depth = 100;
+
+
 ngx_http_variable_t *
 ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
 {
@@ -517,9 +520,20 @@ ngx_http_get_indexed_variable(ngx_http_request_t *r, ngx_uint_t index)
 
     v = cmcf->variables.elts;
 
+    if (ngx_http_variable_depth == 0) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "cycle while evaluating variable \"%V\"",
+                      &v[index].name);
+        return NULL;
+    }
+
+    ngx_http_variable_depth--;
+
     if (v[index].get_handler(r, &r->variables[index], v[index].data)
         == NGX_OK)
     {
+        ngx_http_variable_depth++;
+
         if (v[index].flags & NGX_HTTP_VAR_NOCACHEABLE) {
             r->variables[index].no_cacheable = 1;
         }
@@ -527,6 +541,8 @@ ngx_http_get_indexed_variable(ngx_http_request_t *r, ngx_uint_t index)
         return &r->variables[index];
     }
 
+    ngx_http_variable_depth++;
+
     r->variables[index].valid = 0;
     r->variables[index].not_found = 1;
 
@@ -568,17 +584,25 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
     if (v) {
         if (v->flags & NGX_HTTP_VAR_INDEXED) {
             return ngx_http_get_flushed_variable(r, v->index);
+        }
 
-        } else {
-
-            vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t));
-
-            if (vv && v->get_handler(r, vv, v->data) == NGX_OK) {
-                return vv;
-            }
-
+        if (ngx_http_variable_depth == 0) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "cycle while evaluating variable \"%V\"", name);
             return NULL;
         }
+
+        ngx_http_variable_depth--;
+
+        vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t));
+
+        if (vv && v->get_handler(r, vv, v->data) == NGX_OK) {
+            ngx_http_variable_depth++;
+            return vv;
+        }
+
+        ngx_http_variable_depth++;
+        return NULL;
     }
 
     vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t));
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 8abca4d..f2f0d1e 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -263,7 +263,9 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 
     if (r->headers_out.location && r->headers_out.location->value.len) {
 
-        if (r->headers_out.location->value.data[0] == '/') {
+        if (r->headers_out.location->value.data[0] == '/'
+            && clcf->absolute_redirect)
+        {
             if (clcf->server_name_in_redirect) {
                 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
                 host = cscf->server_name;
diff --git a/src/mail/ngx_mail_smtp_module.c b/src/mail/ngx_mail_smtp_module.c
index f03bd90..3b5a2d8 100644
--- a/src/mail/ngx_mail_smtp_module.c
+++ b/src/mail/ngx_mail_smtp_module.c
@@ -280,7 +280,7 @@ ngx_mail_smtp_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     p = ngx_cpymem(p, conf->capability.data, conf->capability.len);
 
-    p = ngx_cpymem(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1);
+    ngx_memcpy(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1);
 
     p = conf->starttls_capability.data
         + (last - conf->capability.data) + 3;
diff --git a/src/stream/ngx_stream_log_module.c b/src/stream/ngx_stream_log_module.c
index 26e6d22..a4b67d0 100644
--- a/src/stream/ngx_stream_log_module.c
+++ b/src/stream/ngx_stream_log_module.c
@@ -106,12 +106,16 @@ static void ngx_stream_log_flush(ngx_open_file_t *file, ngx_log_t *log);
 static void ngx_stream_log_flush_handler(ngx_event_t *ev);
 
 static ngx_int_t ngx_stream_log_variable_compile(ngx_conf_t *cf,
-    ngx_stream_log_op_t *op, ngx_str_t *value);
+    ngx_stream_log_op_t *op, ngx_str_t *value, ngx_uint_t json);
 static size_t ngx_stream_log_variable_getlen(ngx_stream_session_t *s,
     uintptr_t data);
 static u_char *ngx_stream_log_variable(ngx_stream_session_t *s, u_char *buf,
     ngx_stream_log_op_t *op);
 static uintptr_t ngx_stream_log_escape(u_char *dst, u_char *src, size_t size);
+static size_t ngx_stream_log_json_variable_getlen(ngx_stream_session_t *s,
+    uintptr_t data);
+static u_char *ngx_stream_log_json_variable(ngx_stream_session_t *s,
+    u_char *buf, ngx_stream_log_op_t *op);
 
 
 static void *ngx_stream_log_create_main_conf(ngx_conf_t *cf);
@@ -686,7 +690,7 @@ ngx_stream_log_copy_long(ngx_stream_session_t *s, u_char *buf,
 
 static ngx_int_t
 ngx_stream_log_variable_compile(ngx_conf_t *cf, ngx_stream_log_op_t *op,
-    ngx_str_t *value)
+    ngx_str_t *value, ngx_uint_t json)
 {
     ngx_int_t  index;
 
@@ -696,8 +700,16 @@ ngx_stream_log_variable_compile(ngx_conf_t *cf, ngx_stream_log_op_t *op,
     }
 
     op->len = 0;
-    op->getlen = ngx_stream_log_variable_getlen;
-    op->run = ngx_stream_log_variable;
+
+    if (json) {
+        op->getlen = ngx_stream_log_json_variable_getlen;
+        op->run = ngx_stream_log_json_variable;
+
+    } else {
+        op->getlen = ngx_stream_log_variable_getlen;
+        op->run = ngx_stream_log_variable;
+    }
+
     op->data = index;
 
     return NGX_OK;
@@ -806,6 +818,47 @@ ngx_stream_log_escape(u_char *dst, u_char *src, size_t size)
 }
 
 
+static size_t
+ngx_stream_log_json_variable_getlen(ngx_stream_session_t *s, uintptr_t data)
+{
+    uintptr_t                     len;
+    ngx_stream_variable_value_t  *value;
+
+    value = ngx_stream_get_indexed_variable(s, data);
+
+    if (value == NULL || value->not_found) {
+        return 0;
+    }
+
+    len = ngx_escape_json(NULL, value->data, value->len);
+
+    value->escape = len ? 1 : 0;
+
+    return value->len + len;
+}
+
+
+static u_char *
+ngx_stream_log_json_variable(ngx_stream_session_t *s, u_char *buf,
+    ngx_stream_log_op_t *op)
+{
+    ngx_stream_variable_value_t  *value;
+
+    value = ngx_stream_get_indexed_variable(s, op->data);
+
+    if (value == NULL || value->not_found) {
+        return buf;
+    }
+
+    if (value->escape == 0) {
+        return ngx_cpymem(buf, value->data, value->len);
+
+    } else {
+        return (u_char *) ngx_escape_json(buf, value->data, value->len);
+    }
+}
+
+
 static void *
 ngx_stream_log_create_main_conf(ngx_conf_t *cf)
 {
@@ -1220,11 +1273,27 @@ ngx_stream_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
     size_t                 i, len;
     ngx_str_t             *value, var;
     ngx_int_t             *flush;
-    ngx_uint_t             bracket;
+    ngx_uint_t             bracket, json;
     ngx_stream_log_op_t   *op;
 
+    json = 0;
     value = args->elts;
 
+    if (s < args->nelts && ngx_strncmp(value[s].data, "escape=", 7) == 0) {
+        data = value[s].data + 7;
+
+        if (ngx_strcmp(data, "json") == 0) {
+            json = 1;
+
+        } else if (ngx_strcmp(data, "default") != 0) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "unknown log format escaping \"%s\"", data);
+            return NGX_CONF_ERROR;
+        }
+
+        s++;
+    }
+
     for ( /* void */ ; s < args->nelts; s++) {
 
         i = 0;
@@ -1289,7 +1358,9 @@ ngx_stream_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
                     goto invalid;
                 }
 
-                if (ngx_stream_log_variable_compile(cf, op, &var) != NGX_OK) {
+                if (ngx_stream_log_variable_compile(cf, op, &var, json)
+                    != NGX_OK)
+                {
                     return NGX_CONF_ERROR;
                 }
 
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index c03b515..bfd78d5 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -808,6 +808,11 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 
     u->state->connect_time = ngx_current_msec - u->state->response_time;
 
+    if (u->peer.notify) {
+        u->peer.notify(&u->peer, u->peer.data,
+                       NGX_STREAM_UPSTREAM_NOTIFY_CONNECT);
+    }
+
     c->log->action = "proxying connection";
 
     if (u->upstream_buf.start == NULL) {
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 9191641..fb653c5 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -49,6 +49,15 @@ static ngx_conf_bitmask_t  ngx_stream_ssl_protocols[] = {
 };
 
 
+static ngx_conf_enum_t  ngx_stream_ssl_verify[] = {
+    { ngx_string("off"), 0 },
+    { ngx_string("on"), 1 },
+    { ngx_string("optional"), 2 },
+    { ngx_string("optional_no_ca"), 3 },
+    { ngx_null_string, 0 }
+};
+
+
 static ngx_command_t  ngx_stream_ssl_commands[] = {
 
     { ngx_string("ssl_handshake_timeout"),
@@ -107,6 +116,34 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
       offsetof(ngx_stream_ssl_conf_t, ciphers),
       NULL },
 
+    { ngx_string("ssl_verify_client"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_enum_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_ssl_conf_t, verify),
+      &ngx_stream_ssl_verify },
+
+    { ngx_string("ssl_verify_depth"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_ssl_conf_t, verify_depth),
+      NULL },
+
+    { ngx_string("ssl_client_certificate"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_ssl_conf_t, client_certificate),
+      NULL },
+
+    { ngx_string("ssl_trusted_certificate"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_ssl_conf_t, trusted_certificate),
+      NULL },
+
     { ngx_string("ssl_prefer_server_ciphers"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -142,6 +179,13 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
       offsetof(ngx_stream_ssl_conf_t, session_timeout),
       NULL },
 
+    { ngx_string("ssl_crl"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_ssl_conf_t, crl),
+      NULL },
+
       ngx_null_command
 };
 
@@ -197,6 +241,37 @@ static ngx_stream_variable_t  ngx_stream_ssl_vars[] = {
     { ngx_string("ssl_server_name"), NULL, ngx_stream_ssl_variable,
       (uintptr_t) ngx_ssl_get_server_name, NGX_STREAM_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_client_cert"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_certificate, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_raw_cert"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_raw_certificate,
+      NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_s_dn"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_subject_dn, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_i_dn"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_issuer_dn, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_serial"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_serial_number, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_fingerprint"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_fingerprint, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_verify"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_client_verify, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_v_start"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_client_v_start, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_v_end"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_client_v_end, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ssl_client_v_remain"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_client_v_remain, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
     { ngx_null_string, NULL, NULL, 0, 0, 0 }
 };
 
@@ -207,6 +282,8 @@ static ngx_str_t ngx_stream_ssl_sess_id_ctx = ngx_string("STREAM");
 static ngx_int_t
 ngx_stream_ssl_handler(ngx_stream_session_t *s)
 {
+    long                    rc;
+    X509                   *cert;
     ngx_connection_t       *c;
     ngx_stream_ssl_conf_t  *sslcf;
 
@@ -227,6 +304,37 @@ ngx_stream_ssl_handler(ngx_stream_session_t *s)
         return ngx_stream_ssl_init_connection(&sslcf->ssl, c);
     }
 
+    if (sslcf->verify) {
+        rc = SSL_get_verify_result(c->ssl->connection);
+
+        if (rc != X509_V_OK
+            && (sslcf->verify != 3 || !ngx_ssl_verify_error_optional(rc)))
+        {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "client SSL certificate verify error: (%l:%s)",
+                          rc, X509_verify_cert_error_string(rc));
+
+            ngx_ssl_remove_cached_session(sslcf->ssl.ctx,
+                                       (SSL_get0_session(c->ssl->connection)));
+            return NGX_ERROR;
+        }
+
+        if (sslcf->verify == 1) {
+            cert = SSL_get_peer_certificate(c->ssl->connection);
+
+            if (cert == NULL) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                              "client sent no required SSL certificate");
+
+                ngx_ssl_remove_cached_session(sslcf->ssl.ctx,
+                                       (SSL_get0_session(c->ssl->connection)));
+                return NGX_ERROR;
+            }
+
+            X509_free(cert);
+        }
+    }
+
     return NGX_OK;
 }
 
@@ -384,6 +492,9 @@ ngx_stream_ssl_create_conf(ngx_conf_t *cf)
      *     scf->protocols = 0;
      *     scf->dhparam = { 0, NULL };
      *     scf->ecdh_curve = { 0, NULL };
+     *     scf->client_certificate = { 0, NULL };
+     *     scf->trusted_certificate = { 0, NULL };
+     *     scf->crl = { 0, NULL };
      *     scf->ciphers = { 0, NULL };
      *     scf->shm_zone = NULL;
      */
@@ -393,6 +504,8 @@ ngx_stream_ssl_create_conf(ngx_conf_t *cf)
     scf->certificate_keys = NGX_CONF_UNSET_PTR;
     scf->passwords = NGX_CONF_UNSET_PTR;
     scf->prefer_server_ciphers = NGX_CONF_UNSET;
+    scf->verify = NGX_CONF_UNSET_UINT;
+    scf->verify_depth = NGX_CONF_UNSET_UINT;
     scf->builtin_session_cache = NGX_CONF_UNSET;
     scf->session_timeout = NGX_CONF_UNSET;
     scf->session_tickets = NGX_CONF_UNSET;
@@ -423,6 +536,9 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
                          (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
                           |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
 
+    ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
+    ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
+
     ngx_conf_merge_ptr_value(conf->certificates, prev->certificates, NULL);
     ngx_conf_merge_ptr_value(conf->certificate_keys, prev->certificate_keys,
                          NULL);
@@ -431,6 +547,12 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, "");
 
+    ngx_conf_merge_str_value(conf->client_certificate, prev->client_certificate,
+                         "");
+    ngx_conf_merge_str_value(conf->trusted_certificate,
+                         prev->trusted_certificate, "");
+    ngx_conf_merge_str_value(conf->crl, prev->crl, "");
+
     ngx_conf_merge_str_value(conf->ecdh_curve, prev->ecdh_curve,
                          NGX_DEFAULT_ECDH_CURVE);
 
@@ -480,6 +602,35 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
+    if (conf->verify) {
+
+        if (conf->client_certificate.len == 0 && conf->verify != 3) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no ssl_client_certificate for ssl_client_verify");
+            return NGX_CONF_ERROR;
+        }
+
+        if (ngx_ssl_client_certificate(cf, &conf->ssl,
+                                       &conf->client_certificate,
+                                       conf->verify_depth)
+            != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
+
+        if (ngx_ssl_trusted_certificate(cf, &conf->ssl,
+                                        &conf->trusted_certificate,
+                                        conf->verify_depth)
+            != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
+
+        if (ngx_ssl_crl(cf, &conf->ssl, &conf->crl) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
     if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
diff --git a/src/stream/ngx_stream_ssl_module.h b/src/stream/ngx_stream_ssl_module.h
index 9b1c41a..65f5d45 100644
--- a/src/stream/ngx_stream_ssl_module.h
+++ b/src/stream/ngx_stream_ssl_module.h
@@ -23,6 +23,9 @@ typedef struct {
 
     ngx_uint_t       protocols;
 
+    ngx_uint_t       verify;
+    ngx_uint_t       verify_depth;
+
     ssize_t          builtin_session_cache;
 
     time_t           session_timeout;
@@ -32,6 +35,9 @@ typedef struct {
 
     ngx_str_t        dhparam;
     ngx_str_t        ecdh_curve;
+    ngx_str_t        client_certificate;
+    ngx_str_t        trusted_certificate;
+    ngx_str_t        crl;
 
     ngx_str_t        ciphers;
 
diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c
index e26c518..2040b4f 100644
--- a/src/stream/ngx_stream_ssl_preread_module.c
+++ b/src/stream/ngx_stream_ssl_preread_module.c
@@ -142,7 +142,7 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
             return NGX_DECLINED;
         }
 
-        if (p[1] != 3 || p[2] == 0) {
+        if (p[1] != 3) {
             ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
                            "ssl preread: unsupported SSL version");
             return NGX_DECLINED;
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index ec75768..90076e0 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -24,6 +24,9 @@
 #define NGX_STREAM_UPSTREAM_MAX_CONNS     0x0100
 
 
+#define NGX_STREAM_UPSTREAM_NOTIFY_CONNECT     0x1
+
+
 typedef struct {
     ngx_array_t                        upstreams;
                                            /* ngx_stream_upstream_srv_conf_t */
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
index db620ef..526de3a 100644
--- a/src/stream/ngx_stream_upstream_round_robin.c
+++ b/src/stream/ngx_stream_upstream_round_robin.c
@@ -16,6 +16,8 @@
 
 static ngx_stream_upstream_rr_peer_t *ngx_stream_upstream_get_peer(
     ngx_stream_upstream_rr_peer_data_t *rrp);
+static void ngx_stream_upstream_notify_round_robin_peer(
+    ngx_peer_connection_t *pc, void *data, ngx_uint_t state);
 
 #if (NGX_STREAM_SSL)
 
@@ -288,6 +290,7 @@ ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s,
 
     s->upstream->peer.get = ngx_stream_upstream_get_round_robin_peer;
     s->upstream->peer.free = ngx_stream_upstream_free_round_robin_peer;
+    s->upstream->peer.notify = ngx_stream_upstream_notify_round_robin_peer;
     s->upstream->peer.tries = ngx_stream_upstream_tries(rrp->peers);
 #if (NGX_STREAM_SSL)
     s->upstream->peer.set_session =
@@ -659,6 +662,32 @@ ngx_stream_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, void *data,
 }
 
 
+static void
+ngx_stream_upstream_notify_round_robin_peer(ngx_peer_connection_t *pc,
+    void *data, ngx_uint_t type)
+{
+    ngx_stream_upstream_rr_peer_data_t  *rrp = data;
+
+    ngx_stream_upstream_rr_peer_t  *peer;
+
+    peer = rrp->current;
+
+    if (type == NGX_STREAM_UPSTREAM_NOTIFY_CONNECT
+        && pc->connection->type == SOCK_STREAM)
+    {
+        ngx_stream_upstream_rr_peers_rlock(rrp->peers);
+        ngx_stream_upstream_rr_peer_lock(rrp->peers, peer);
+
+        if (peer->accessed < peer->checked) {
+            peer->fails = 0;
+        }
+
+        ngx_stream_upstream_rr_peer_unlock(rrp->peers, peer);
+        ngx_stream_upstream_rr_peers_unlock(rrp->peers);
+    }
+}
+
+
 #if (NGX_STREAM_SSL)
 
 static ngx_int_t
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
index aa5361d..9dc93ee 100644
--- a/src/stream/ngx_stream_variables.c
+++ b/src/stream/ngx_stream_variables.c
@@ -119,6 +119,9 @@ ngx_stream_variable_value_t  ngx_stream_variable_true_value =
     ngx_stream_variable("1");
 
 
+static ngx_uint_t  ngx_stream_variable_depth = 100;
+
+
 ngx_stream_variable_t *
 ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
 {
@@ -270,9 +273,20 @@ ngx_stream_get_indexed_variable(ngx_stream_session_t *s, ngx_uint_t index)
 
     v = cmcf->variables.elts;
 
+    if (ngx_stream_variable_depth == 0) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "cycle while evaluating variable \"%V\"",
+                      &v[index].name);
+        return NULL;
+    }
+
+    ngx_stream_variable_depth--;
+
     if (v[index].get_handler(s, &s->variables[index], v[index].data)
         == NGX_OK)
     {
+        ngx_stream_variable_depth++;
+
         if (v[index].flags & NGX_STREAM_VAR_NOCACHEABLE) {
             s->variables[index].no_cacheable = 1;
         }
@@ -280,6 +294,8 @@ ngx_stream_get_indexed_variable(ngx_stream_session_t *s, ngx_uint_t index)
         return &s->variables[index];
     }
 
+    ngx_stream_variable_depth++;
+
     s->variables[index].valid = 0;
     s->variables[index].not_found = 1;
 
@@ -322,18 +338,26 @@ ngx_stream_get_variable(ngx_stream_session_t *s, ngx_str_t *name,
     if (v) {
         if (v->flags & NGX_STREAM_VAR_INDEXED) {
             return ngx_stream_get_flushed_variable(s, v->index);
+        }
 
-        } else {
-
-            vv = ngx_palloc(s->connection->pool,
-                            sizeof(ngx_stream_variable_value_t));
-
-            if (vv && v->get_handler(s, vv, v->data) == NGX_OK) {
-                return vv;
-            }
-
+        if (ngx_stream_variable_depth == 0) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "cycle while evaluating variable \"%V\"", name);
             return NULL;
         }
+
+        ngx_stream_variable_depth--;
+
+        vv = ngx_palloc(s->connection->pool,
+                        sizeof(ngx_stream_variable_value_t));
+
+        if (vv && v->get_handler(s, vv, v->data) == NGX_OK) {
+            ngx_stream_variable_depth++;
+            return vv;
+        }
+
+        ngx_stream_variable_depth++;
+        return NULL;
     }
 
     vv = ngx_palloc(s->connection->pool, sizeof(ngx_stream_variable_value_t));

From 006a1d393fc657125f86ef5449183f694b4e12db Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 11 Jan 2017 11:38:07 +0200
Subject: [PATCH 146/600] Merge de translation

Thanks: Chris Leick
Closes: #843770
---
 debian/po/de.po | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 debian/po/de.po

diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 0000000..d33bf66
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,57 @@
+# Nginx debconf translations
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Chrirtos Trochalakis <yatiohi@ideopolis.gr>, 2016.
+# Copyright (C)  of this file Chris Leick <c.leick@vollbio.de> 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx 1.10.2-1\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2016-11-01 10:36+0100\n"
+"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
+"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Möglicherweise unsichere Nginx-Protokolldateien"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"Die folgenden Protokolldateien unterhalb des Verzeichnisses /var/log/nginx "
+"sind symbolische Verweise, die »www-data« gehören:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Seit Nginx 1.4.4-4 gehörte /var/log/nginx »www-data«. Dies führte unter "
+"anderem dazu, dass »www-data« auf Protokolldateien an vertraulichen Stellen "
+"symbolisch verweisen konnte, was im Folgenden zu Rechteerweiterungsangriffen "
+"führen konnte. Obwohl die Rechte an /var/log/nginx nun korrigiert sind, ist "
+"es möglich, dass derartige unsichere Verweise bereits existieren. Prüfen Sie "
+"daher bitte die oben genannten Orte."

From 58a0ed368a7d698d0d86b8a74237be99cd48f00c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 11 Jan 2017 11:38:07 +0200
Subject: [PATCH 147/600] Merge fr translation

Thanks: Julien Patriarca
Closes: #844712
---
 debian/po/fr.po | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 debian/po/fr.po

diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644
index 0000000..0a937cf
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,58 @@
+# Translation of nginx debconf templates to French
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Chrirtos Trochalakis <yatiohi@ideopolis.gr>, 2016.
+# Julien Patriarca <leatherface@debian.org>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2016-11-02 09:52+0100\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Certains fichiers de journaux semblent non sécurisés"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"Les fichiers de journaux suivants se trouvant dans le dossier /var/log/nginx "
+"sont des liens symboliques qui appartiennent à www-data :"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Depuis la version 1.4.4-4 de nginx, /var/log/nginx appartient à www-data. "
+"Par conséquent www-data peut faire des liens symboliques des fichiers de "
+"journaux vers des emplacements sensibles, ce qui pourrait amener à des "
+"attaques par augmentation de droits. Même si désormais les droits de /var/"
+"log/nginx ont été sécurisés, il est possible que de tels liens existent "
+"déjà. Aussi, veuillez vous assurer d'avoir contrôlé les emplacements ci-"
+"dessus."

From 4dacd5cfa09b320d062ec225ec6662fffc17980c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 11 Jan 2017 11:38:07 +0200
Subject: [PATCH 148/600] Merge nl translation

Thanks: Frans Spiesschaert
Closes: #845693
---
 debian/po/nl.po | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 debian/po/nl.po

diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000..0fd1c5a
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,60 @@
+# Nginx debconf translation to Dutch
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Chrirtos Trochalakis <yatiohi@ideopolis.gr>, 2016.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2016-11-08 16:30+0100\n"
+"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
+"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Wellicht onveilige nginx logbestanden"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"De volgende logbestanden in de map /var/log/nginx zijn symbolische "
+"koppelingen met www-data als eigenaar:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Sinds nginx 1.4.4-4 was www-data eigenaar van /var/log/nginx. Als gevolg "
+"daarvan kon www-data een symbolische koppeling maken tussen logbestanden en "
+"gevoelige plaatsen, hetgeen op zijn beurt kon leiden tot aanvallen van het "
+"type rechtenuitbreiding (privilege escalation). De toegangsrechten voor /var/"
+"log/nginx zijn nu gerepareerd, maar het is mogelijk dat er reeds dergelijke "
+"onveilige koppelingen bestaan. U moet dus zeker bovenstaande locaties "
+"controleren."

From ead0bdc4f351fa5784adf8d005ee7b610af5a157 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 11 Jan 2017 11:38:07 +0200
Subject: [PATCH 149/600] Merge pt_BR translation

Thanks: Adriano Rafael Gomes
Closes: #846522
---
 debian/po/pt_BR.po | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 debian/po/pt_BR.po

diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
new file mode 100644
index 0000000..92d3a6a
--- /dev/null
+++ b/debian/po/pt_BR.po
@@ -0,0 +1,58 @@
+# Nginx debconf translations
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Chrirtos Trochalakis <yatiohi@ideopolis.gr>, 2016.
+# Adriano Rafael Gomes <adrianorg@debian.org>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2016-11-18 22:02-0200\n"
+"Last-Translator: Adriano Rafael Gomes <adrianorg@debian.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Possíveis arquivos de log do nginx inseguros"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"Os seguintes arquivos de log sob o diretório /var/log/nginx são links "
+"simbólicos de propriedade de www-data:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Desde a versão 1.4.4-4 do nginx, /var/log/nginx é de propriedade de www-"
+"data. Como resultado, www-data pode criar links simbólicos dos arquivos de "
+"log em locais sensíveis, o que, por sua vez, pode levar a ataques de "
+"elevação de privilégio. Embora as permissões de /var/log/nginx estejam agora "
+"corrigidas, é possível que tais links inseguros ainda existam. Portanto, por "
+"favor, certifique-se de verificar os locais acima."

From 1d0e6f6d3859cc67106dcced52cf819287fbc8c2 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 11 Jan 2017 11:38:07 +0200
Subject: [PATCH 150/600] Merge da translation

Thanks: Joe Dalton
Closes: #850857
---
 debian/po/da.po | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 debian/po/da.po

diff --git a/debian/po/da.po b/debian/po/da.po
new file mode 100644
index 0000000..fcc5115
--- /dev/null
+++ b/debian/po/da.po
@@ -0,0 +1,56 @@
+# Nginx debconf translations
+# Copyright (C) 2017 nginx og nedenstående oversættere.
+# This file is distributed under the same license as the nginx package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2017-01-10 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Nginx-logfilerne er muligvis usikre"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"De følgende logfiler under mappen /var/log/nginx er symbolske henvisninger "
+"ejet af www-data:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Siden nginx 1.4.4-4 var /var/log/nginx ejet af www-data. Www-data kunne "
+"derfor oprette logfiler med symbolske henvisninger til sensitive placeringer, "
+"som igen kunne føre til privilegerede optrapningsangreb. Selvom "
+"/var/log/nginx-rettigheder nu er rettet, så er det muligt at sådanne "
+"usikre henvisninger stadig findes. Så, husk at kontrollere ovenstående "
+"placeringer."

From 23e4b6d076582a9d9e99030212e41975fbfe0d61 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 1 Dec 2016 16:39:50 +0200
Subject: [PATCH 151/600] Backport curve list support from 1.11.x mainline

As a side-effect we move away from EC_KEY* OpenSSL API
in favor of `SSL_CTX_set1_curves_list()` which supports
X25519.

Also, the default curve changed from prime256v1, to the
OpenSSL defaults (currently X25519).

See also:
https://mta.openssl.org/pipermail/openssl-dev/2016-October/008582.html

Closes: #846085
---
 .../0004-SSL-error-messages-style.patch       |  29 ++++
 debian/patches/0005-SSL-style.patch           |  44 +++++
 ...pport-for-multiple-curves-ticket-885.patch | 151 ++++++++++++++++++
 debian/patches/series                         |   3 +
 4 files changed, 227 insertions(+)
 create mode 100644 debian/patches/0004-SSL-error-messages-style.patch
 create mode 100644 debian/patches/0005-SSL-style.patch
 create mode 100644 debian/patches/0006-SSL-support-for-multiple-curves-ticket-885.patch

diff --git a/debian/patches/0004-SSL-error-messages-style.patch b/debian/patches/0004-SSL-error-messages-style.patch
new file mode 100644
index 0000000..37ef747
--- /dev/null
+++ b/debian/patches/0004-SSL-error-messages-style.patch
@@ -0,0 +1,29 @@
+From: Maxim Dounin <mdounin@mdounin.ru>
+Date: Thu, 19 May 2016 14:46:32 +0300
+Subject: SSL: error messages style.
+
+---
+ src/event/ngx_event_openssl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
+index a3160b4..5b2e698 100644
+--- a/src/event/ngx_event_openssl.c
++++ b/src/event/ngx_event_openssl.c
+@@ -1032,14 +1032,14 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
+     nid = OBJ_sn2nid((const char *) name->data);
+     if (nid == 0) {
+         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+-                      "Unknown curve name \"%s\"", name->data);
++                      "OBJ_sn2nid(\"%s\") failed: unknown curve", name->data);
+         return NGX_ERROR;
+     }
+ 
+     ecdh = EC_KEY_new_by_curve_name(nid);
+     if (ecdh == NULL) {
+         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+-                      "Unable to create curve \"%s\"", name->data);
++                      "EC_KEY_new_by_curve_name(\"%s\") failed", name->data);
+         return NGX_ERROR;
+     }
+ 
diff --git a/debian/patches/0005-SSL-style.patch b/debian/patches/0005-SSL-style.patch
new file mode 100644
index 0000000..11bcaea
--- /dev/null
+++ b/debian/patches/0005-SSL-style.patch
@@ -0,0 +1,44 @@
+From: Maxim Dounin <mdounin@mdounin.ru>
+Date: Thu, 19 May 2016 14:46:32 +0300
+Subject: SSL: style.
+
+---
+ src/event/ngx_event_openssl.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
+index 5b2e698..e6fe3e9 100644
+--- a/src/event/ngx_event_openssl.c
++++ b/src/event/ngx_event_openssl.c
+@@ -1025,11 +1025,11 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
+     /*
+      * Elliptic-Curve Diffie-Hellman parameters are either "named curves"
+      * from RFC 4492 section 5.1.1, or explicitly described curves over
+-     * binary fields. OpenSSL only supports the "named curves", which provide
++     * binary fields.  OpenSSL only supports the "named curves", which provide
+      * maximum interoperability.
+      */
+ 
+-    nid = OBJ_sn2nid((const char *) name->data);
++    nid = OBJ_sn2nid((char *) name->data);
+     if (nid == 0) {
+         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                       "OBJ_sn2nid(\"%s\") failed: unknown curve", name->data);
+@@ -2123,7 +2123,7 @@ ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
+          * session reuse (see SSL_SESS_CACHE_OFF above), then
+          * Outlook Express fails to upload a sent email to
+          * the Sent Items folder on the IMAP server via a separate IMAP
+-         * connection in the background. Therefore we have a special
++         * connection in the background.  Therefore we have a special
+          * mode (SSL_SESS_CACHE_SERVER|SSL_SESS_CACHE_NO_INTERNAL_STORE)
+          * where the server pretends that it supports session reuse,
+          * but it does not actually store any session.
+@@ -3547,7 +3547,7 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+ 
+     value = cf->args->elts;
+ 
+-    engine = ENGINE_by_id((const char *) value[1].data);
++    engine = ENGINE_by_id((char *) value[1].data);
+ 
+     if (engine == NULL) {
+         ngx_ssl_error(NGX_LOG_WARN, cf->log, 0,
diff --git a/debian/patches/0006-SSL-support-for-multiple-curves-ticket-885.patch b/debian/patches/0006-SSL-support-for-multiple-curves-ticket-885.patch
new file mode 100644
index 0000000..1e9b0ac
--- /dev/null
+++ b/debian/patches/0006-SSL-support-for-multiple-curves-ticket-885.patch
@@ -0,0 +1,151 @@
+From: Maxim Dounin <mdounin@mdounin.ru>
+Date: Thu, 19 May 2016 14:46:32 +0300
+Subject: SSL: support for multiple curves (ticket #885).
+
+OpenSSL 1.0.2+ allows configuring a curve list instead of a single curve
+previously supported.  This allows use of different curves depending on
+what client supports (as available via the elliptic_curves extension),
+and also allows use of different curves in an ECDHE key exchange and
+in the ECDSA certificate.
+
+The special value "auto" was introduced (now the default for ssl_ecdh_curve),
+which means "use an internal list of curves as available in the OpenSSL
+library used".  For versions prior to OpenSSL 1.0.2 it maps to "prime256v1"
+as previously used.  The default in 1.0.2b+ prefers prime256v1 as well
+(and X25519 in OpenSSL 1.1.0+).
+
+As client vs. server preference of curves is controlled by the
+same option as used for ciphers (SSL_OP_CIPHER_SERVER_PREFERENCE),
+the ssl_prefer_server_ciphers directive now controls both.
+---
+ src/event/ngx_event_openssl.c          | 53 ++++++++++++++++++++++++++++++----
+ src/http/modules/ngx_http_ssl_module.c |  2 +-
+ src/mail/ngx_mail_ssl_module.c         |  2 +-
+ src/stream/ngx_stream_ssl_module.c     |  2 +-
+ 4 files changed, 51 insertions(+), 8 deletions(-)
+
+diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
+index e6fe3e9..e0364a7 100644
+--- a/src/event/ngx_event_openssl.c
++++ b/src/event/ngx_event_openssl.c
+@@ -1019,8 +1019,6 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
+ {
+ #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+ #ifndef OPENSSL_NO_ECDH
+-    int      nid;
+-    EC_KEY  *ecdh;
+ 
+     /*
+      * Elliptic-Curve Diffie-Hellman parameters are either "named curves"
+@@ -1029,17 +1027,61 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
+      * maximum interoperability.
+      */
+ 
+-    nid = OBJ_sn2nid((char *) name->data);
++#ifdef SSL_CTRL_SET_CURVES_LIST
++
++    /*
++     * OpenSSL 1.0.2+ allows configuring a curve list instead of a single
++     * curve previously supported.  By default an internal list is used,
++     * with prime256v1 being preferred by server in OpenSSL 1.0.2b+
++     * and X25519 in OpenSSL 1.1.0+.
++     *
++     * By default a curve preferred by the client will be used for
++     * key exchange.  The SSL_OP_CIPHER_SERVER_PREFERENCE option can
++     * be used to prefer server curves instead, similar to what it
++     * does for ciphers.
++     */
++
++    SSL_CTX_set_options(ssl->ctx, SSL_OP_SINGLE_ECDH_USE);
++
++#if SSL_CTRL_SET_ECDH_AUTO
++    /* not needed in OpenSSL 1.1.0+ */
++    SSL_CTX_set_ecdh_auto(ssl->ctx, 1);
++#endif
++
++    if (ngx_strcmp(name->data, "auto") == 0) {
++        return NGX_OK;
++    }
++
++    if (SSL_CTX_set1_curves_list(ssl->ctx, (char *) name->data) == 0) {
++        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
++                      "SSL_CTX_set1_curves_list(\"%s\") failed", name->data);
++        return NGX_ERROR;
++    }
++
++#else
++
++    int      nid;
++    char    *curve;
++    EC_KEY  *ecdh;
++
++    if (ngx_strcmp(name->data, "auto") == 0) {
++        curve = "prime256v1";
++
++    } else {
++        curve = (char *) name->data;
++    }
++
++    nid = OBJ_sn2nid(curve);
+     if (nid == 0) {
+         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+-                      "OBJ_sn2nid(\"%s\") failed: unknown curve", name->data);
++                      "OBJ_sn2nid(\"%s\") failed: unknown curve", curve);
+         return NGX_ERROR;
+     }
+ 
+     ecdh = EC_KEY_new_by_curve_name(nid);
+     if (ecdh == NULL) {
+         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+-                      "EC_KEY_new_by_curve_name(\"%s\") failed", name->data);
++                      "EC_KEY_new_by_curve_name(\"%s\") failed", curve);
+         return NGX_ERROR;
+     }
+ 
+@@ -1050,6 +1092,7 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
+     EC_KEY_free(ecdh);
+ #endif
+ #endif
++#endif
+ 
+     return NGX_OK;
+ }
+diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
+index 6a4108c..dc8595e 100644
+--- a/src/http/modules/ngx_http_ssl_module.c
++++ b/src/http/modules/ngx_http_ssl_module.c
+@@ -15,7 +15,7 @@ typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
+ 
+ 
+ #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
+-#define NGX_DEFAULT_ECDH_CURVE  "prime256v1"
++#define NGX_DEFAULT_ECDH_CURVE  "auto"
+ 
+ #define NGX_HTTP_NPN_ADVERTISE  "\x08http/1.1"
+ 
+diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
+index ff5c141..45a696e 100644
+--- a/src/mail/ngx_mail_ssl_module.c
++++ b/src/mail/ngx_mail_ssl_module.c
+@@ -11,7 +11,7 @@
+ 
+ 
+ #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
+-#define NGX_DEFAULT_ECDH_CURVE  "prime256v1"
++#define NGX_DEFAULT_ECDH_CURVE  "auto"
+ 
+ 
+ static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf);
+diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
+index e12da1b..2f551da 100644
+--- a/src/stream/ngx_stream_ssl_module.c
++++ b/src/stream/ngx_stream_ssl_module.c
+@@ -11,7 +11,7 @@
+ 
+ 
+ #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
+-#define NGX_DEFAULT_ECDH_CURVE  "prime256v1"
++#define NGX_DEFAULT_ECDH_CURVE  "auto"
+ 
+ 
+ static void *ngx_stream_ssl_create_conf(ngx_conf_t *cf);
diff --git a/debian/patches/series b/debian/patches/series
index f3ccceb..69175ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
 perl-use-dpkg-buildflags.patch
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
+0004-SSL-error-messages-style.patch
+0005-SSL-style.patch
+0006-SSL-support-for-multiple-curves-ticket-885.patch

From 110e1a49c2f1247494204ee49c3573c7d722ce3e Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 1 Dec 2016 16:24:06 +0200
Subject: [PATCH 152/600] Add some tests for X25519 EC

Gbp-Dch: Ignore
---
 debian/tests/control   |  4 ++++
 debian/tests/ec-x25519 | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 debian/tests/ec-x25519

diff --git a/debian/tests/control b/debian/tests/control
index 2bc571a..03cd901 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,6 +2,10 @@ Tests: light-simple
 Restrictions: allow-stderr isolation-container
 Depends: nginx-light, curl
 
+Tests: ec-x25519
+Restrictions: allow-stderr isolation-container needs-root
+Depends: nginx-light, ssl-cert, curl
+
 Tests: full-simple
 Restrictions: allow-stderr isolation-container
 Depends: nginx-full, curl
diff --git a/debian/tests/ec-x25519 b/debian/tests/ec-x25519
new file mode 100644
index 0000000..a01bc0d
--- /dev/null
+++ b/debian/tests/ec-x25519
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+
+rm /etc/nginx/sites-enabled/default
+cat <<EOF > "/etc/nginx/sites-enabled/ssl"
+server {
+	listen 443 default_server ssl;
+	include snippets/snakeoil.conf;
+
+	ssl_ecdh_curve X25519;
+	location / {
+		return 200;
+	}
+}
+EOF
+
+nginx -t
+nginx -s reload
+curl --insecure --silent --fail -o /dev/null -w "response_code: %{http_code}\n" https://127.0.0.1/

From 6672c479d645bc69990cee86f7a81b6dca84cd80 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 21 Jan 2017 22:38:49 +0200
Subject: [PATCH 153/600] Add a NEWS entry regarding dynamic modules

---
 debian/nginx-common.NEWS | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index da94a4c..d67c9d8 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,3 +1,16 @@
+nginx-common (1.10.2-4) UNRELEASED; urgency=medium
+
+  Since nginx 1.9.14 Debian has gradually switched to dynamic loadable modules
+  for all third party modules and core modules that support it. For each
+  module a new binary package is introduced under the libnginx-mod-* namespace.
+
+  The modules are loadable from all nginx flavors (light,full,extras) and are
+  automatically registered by installing a symlink under
+  /etc/nginx/modules-enabled/. If you use a modified /etc/nginx/nginx.conf make
+  sure to include that directory.
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Sat, 21 Jan 2017 22:36:12 +0200
+
 nginx-common (1.10.2-1) unstable; urgency=high
 
   In order to secure nginx against privilege escalation attacks, we are

From 72cbf89d576550c25b4afd20b474dea0f9dd4d44 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 21 Jan 2017 22:54:09 +0200
Subject: [PATCH 154/600] Drop lua reference from libnginx-mod-http-ndk
 description

Gbp-Dch: Ignore
---
 debian/control | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index ff6aace..726d903 100644
--- a/debian/control
+++ b/debian/control
@@ -283,8 +283,7 @@ Description: Nginx Development Kit module
  It has functions and macros to deal with generic tasks that don't currently
  have generic code as part of the core distribution. The NDK itself adds few
  features that are seen from a user's point of view - it's just designed to help
- reduce the code that Nginx module developers need to write.  Embed LUA runtime
- into nginx.
+ reduce the code that Nginx module developers need to write.
 
 Package: libnginx-mod-nchan
 Architecture: any

From cabaec36db4e09a253a3626e049cdbb5cb03bdc5 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 21 Jan 2017 22:55:11 +0200
Subject: [PATCH 155/600] d/control: Rename LUA to Lua

Fixes lintian capitalization-error-in-description-synopsis.

Gbp-Dch: Ignore
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 726d903..d33d5b7 100644
--- a/debian/control
+++ b/debian/control
@@ -264,8 +264,8 @@ Architecture: any
 Depends: libnginx-mod-http-ndk (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Description: LUA module for Nginx
- Embed LUA runtime into nginx.
+Description: Lua module for Nginx
+ Embed Lua runtime into nginx.
  .
  This module embeds Lua, via the standard Lua 5.1 interpreter or LuaJIT
  2.0/2.1, into Nginx and by leveraging Nginx's subrequests, allows the

From a9504afcbe3c799f3777f796fa28a4716a24b645 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sun, 22 Jan 2017 12:01:11 +0200
Subject: [PATCH 156/600] Move module patches to debian/modules/patches

Everything under debian/patches has a special meaning in various tools
like gbp-pq.
---
 .../patches}/nginx-cache-purge/dynamic-module.patch           | 0
 .../modules => modules/patches}/nginx-cache-purge/series      | 0
 .../patches}/nginx-dav-ext-module/dynamic-module.patch        | 0
 .../modules => modules/patches}/nginx-dav-ext-module/series   | 0
 .../modules => modules/patches}/nginx-lua/openssl-1.1.0.patch | 0
 debian/{patches/modules => modules/patches}/nginx-lua/series  | 0
 .../patches}/nginx-upstream-fair/dynamic-module.patch         | 0
 .../patches}/nginx-upstream-fair/openssl-1.1.0.patch          | 0
 .../modules => modules/patches}/nginx-upstream-fair/series    | 0
 .../ngx_http_substitutions_filter_module/dynamic-module.patch | 0
 .../patches}/ngx_http_substitutions_filter_module/series      | 0
 debian/rules                                                  | 4 ++--
 12 files changed, 2 insertions(+), 2 deletions(-)
 rename debian/{patches/modules => modules/patches}/nginx-cache-purge/dynamic-module.patch (100%)
 rename debian/{patches/modules => modules/patches}/nginx-cache-purge/series (100%)
 rename debian/{patches/modules => modules/patches}/nginx-dav-ext-module/dynamic-module.patch (100%)
 rename debian/{patches/modules => modules/patches}/nginx-dav-ext-module/series (100%)
 rename debian/{patches/modules => modules/patches}/nginx-lua/openssl-1.1.0.patch (100%)
 rename debian/{patches/modules => modules/patches}/nginx-lua/series (100%)
 rename debian/{patches/modules => modules/patches}/nginx-upstream-fair/dynamic-module.patch (100%)
 rename debian/{patches/modules => modules/patches}/nginx-upstream-fair/openssl-1.1.0.patch (100%)
 rename debian/{patches/modules => modules/patches}/nginx-upstream-fair/series (100%)
 rename debian/{patches/modules => modules/patches}/ngx_http_substitutions_filter_module/dynamic-module.patch (100%)
 rename debian/{patches/modules => modules/patches}/ngx_http_substitutions_filter_module/series (100%)

diff --git a/debian/patches/modules/nginx-cache-purge/dynamic-module.patch b/debian/modules/patches/nginx-cache-purge/dynamic-module.patch
similarity index 100%
rename from debian/patches/modules/nginx-cache-purge/dynamic-module.patch
rename to debian/modules/patches/nginx-cache-purge/dynamic-module.patch
diff --git a/debian/patches/modules/nginx-cache-purge/series b/debian/modules/patches/nginx-cache-purge/series
similarity index 100%
rename from debian/patches/modules/nginx-cache-purge/series
rename to debian/modules/patches/nginx-cache-purge/series
diff --git a/debian/patches/modules/nginx-dav-ext-module/dynamic-module.patch b/debian/modules/patches/nginx-dav-ext-module/dynamic-module.patch
similarity index 100%
rename from debian/patches/modules/nginx-dav-ext-module/dynamic-module.patch
rename to debian/modules/patches/nginx-dav-ext-module/dynamic-module.patch
diff --git a/debian/patches/modules/nginx-dav-ext-module/series b/debian/modules/patches/nginx-dav-ext-module/series
similarity index 100%
rename from debian/patches/modules/nginx-dav-ext-module/series
rename to debian/modules/patches/nginx-dav-ext-module/series
diff --git a/debian/patches/modules/nginx-lua/openssl-1.1.0.patch b/debian/modules/patches/nginx-lua/openssl-1.1.0.patch
similarity index 100%
rename from debian/patches/modules/nginx-lua/openssl-1.1.0.patch
rename to debian/modules/patches/nginx-lua/openssl-1.1.0.patch
diff --git a/debian/patches/modules/nginx-lua/series b/debian/modules/patches/nginx-lua/series
similarity index 100%
rename from debian/patches/modules/nginx-lua/series
rename to debian/modules/patches/nginx-lua/series
diff --git a/debian/patches/modules/nginx-upstream-fair/dynamic-module.patch b/debian/modules/patches/nginx-upstream-fair/dynamic-module.patch
similarity index 100%
rename from debian/patches/modules/nginx-upstream-fair/dynamic-module.patch
rename to debian/modules/patches/nginx-upstream-fair/dynamic-module.patch
diff --git a/debian/patches/modules/nginx-upstream-fair/openssl-1.1.0.patch b/debian/modules/patches/nginx-upstream-fair/openssl-1.1.0.patch
similarity index 100%
rename from debian/patches/modules/nginx-upstream-fair/openssl-1.1.0.patch
rename to debian/modules/patches/nginx-upstream-fair/openssl-1.1.0.patch
diff --git a/debian/patches/modules/nginx-upstream-fair/series b/debian/modules/patches/nginx-upstream-fair/series
similarity index 100%
rename from debian/patches/modules/nginx-upstream-fair/series
rename to debian/modules/patches/nginx-upstream-fair/series
diff --git a/debian/patches/modules/ngx_http_substitutions_filter_module/dynamic-module.patch b/debian/modules/patches/ngx_http_substitutions_filter_module/dynamic-module.patch
similarity index 100%
rename from debian/patches/modules/ngx_http_substitutions_filter_module/dynamic-module.patch
rename to debian/modules/patches/ngx_http_substitutions_filter_module/dynamic-module.patch
diff --git a/debian/patches/modules/ngx_http_substitutions_filter_module/series b/debian/modules/patches/ngx_http_substitutions_filter_module/series
similarity index 100%
rename from debian/patches/modules/ngx_http_substitutions_filter_module/series
rename to debian/modules/patches/ngx_http_substitutions_filter_module/series
diff --git a/debian/rules b/debian/rules
index 4ac7747..b4389c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,8 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-MODULESPATCHDIR = $(CURDIR)/debian/patches/modules
-modules_with_patches := $(notdir $(wildcard $(CURDIR)/debian/patches/modules/*))
+MODULESPATCHDIR = $(CURDIR)/debian/modules/patches
+modules_with_patches := $(notdir $(wildcard $(CURDIR)/debian/modules/patches/*))
 
 # configure flags
 common_configure_flags := \

From 12b7091e9605f15bfe5ffbc3590bf1a1195f25c6 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sun, 22 Jan 2017 00:08:19 +0200
Subject: [PATCH 157/600] Switch module reloading logic to dpkg triggers

Fixes issues during upgrades from non dynamic nginx versions (jessie).

When multiple modules are installed together for the first time,
nginx reload might fail because, at that time, the configuration
might reference directives provided by module packages that are
not yet configured.

There are also other cases where the instant reload might break,
using triggers seems like the correct way to proceed.
---
 debian/autoscripts/postinst-nginx |  7 ++++---
 debian/autoscripts/postrm-nginx   |  6 ++----
 debian/autoscripts/prerm-nginx    |  6 ------
 debian/nginx-extras.postinst      | 10 +++++++++-
 debian/nginx-extras.triggers      |  1 +
 debian/nginx-full.postinst        | 10 +++++++++-
 debian/nginx-full.triggers        |  1 +
 debian/nginx-light.postinst       | 10 +++++++++-
 debian/nginx-light.triggers       |  1 +
 9 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 debian/nginx-extras.triggers
 create mode 100644 debian/nginx-full.triggers
 create mode 100644 debian/nginx-light.triggers

diff --git a/debian/autoscripts/postinst-nginx b/debian/autoscripts/postinst-nginx
index dd84df2..0c0221d 100644
--- a/debian/autoscripts/postinst-nginx
+++ b/debian/autoscripts/postinst-nginx
@@ -9,8 +9,9 @@ for confpair in #NAMES# ; do
 	fi
 done
 
-if [ -s /run/nginx.pid ]; then
-	if which nginx >/dev/null 2>&1; then
-		nginx -s reload
+if [ "$1" = "configure" ] ; then
+	if which dpkg-trigger >/dev/null 2>&1 ; then
+		dpkg-trigger --no-await nginx-reload
 	fi
+
 fi
diff --git a/debian/autoscripts/postrm-nginx b/debian/autoscripts/postrm-nginx
index 1776024..3e81631 100644
--- a/debian/autoscripts/postrm-nginx
+++ b/debian/autoscripts/postrm-nginx
@@ -8,9 +8,7 @@ if [ "$1" = "purge" ] ; then
 		fi
 	done
 
-	if [ -s /run/nginx.pid ]; then
-		if which nginx >/dev/null 2>&1; then
-			nginx -s reload
-		fi
+        if which dpkg-trigger >/dev/null 2>&1 ; then
+                dpkg-trigger --no-await nginx-reload
         fi
 fi
diff --git a/debian/autoscripts/prerm-nginx b/debian/autoscripts/prerm-nginx
index 1767437..0087c87 100644
--- a/debian/autoscripts/prerm-nginx
+++ b/debian/autoscripts/prerm-nginx
@@ -7,10 +7,4 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
 			rm /etc/nginx/modules-enabled/$to
 		fi
 	done
-
-	if [ -s /run/nginx.pid ]; then
-		if which nginx >/dev/null 2>&1; then
-			nginx -s reload
-		fi
-        fi
 fi
diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst
index 9c2605d..2a1730f 100644
--- a/debian/nginx-extras.postinst
+++ b/debian/nginx-extras.postinst
@@ -4,7 +4,15 @@ set -e
 case "$1" in
   abort-upgrade|abort-remove|abort-deconfigure|configure)
     ;;
-
+  triggered)
+    if [ -x /etc/init.d/nginx ]; then
+      if [ -s /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
+        echo "Triggering nginx reload ..."
+        invoke-rc.d nginx reload || true
+      fi
+    fi
+    exit 0
+    ;;
   *)
     echo "postinst called with unknown argument \`$1'" >&2
     exit 1
diff --git a/debian/nginx-extras.triggers b/debian/nginx-extras.triggers
new file mode 100644
index 0000000..efb0515
--- /dev/null
+++ b/debian/nginx-extras.triggers
@@ -0,0 +1 @@
+interest-noawait nginx-reload
diff --git a/debian/nginx-full.postinst b/debian/nginx-full.postinst
index 9c2605d..2a1730f 100644
--- a/debian/nginx-full.postinst
+++ b/debian/nginx-full.postinst
@@ -4,7 +4,15 @@ set -e
 case "$1" in
   abort-upgrade|abort-remove|abort-deconfigure|configure)
     ;;
-
+  triggered)
+    if [ -x /etc/init.d/nginx ]; then
+      if [ -s /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
+        echo "Triggering nginx reload ..."
+        invoke-rc.d nginx reload || true
+      fi
+    fi
+    exit 0
+    ;;
   *)
     echo "postinst called with unknown argument \`$1'" >&2
     exit 1
diff --git a/debian/nginx-full.triggers b/debian/nginx-full.triggers
new file mode 100644
index 0000000..efb0515
--- /dev/null
+++ b/debian/nginx-full.triggers
@@ -0,0 +1 @@
+interest-noawait nginx-reload
diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst
index 9c2605d..2a1730f 100644
--- a/debian/nginx-light.postinst
+++ b/debian/nginx-light.postinst
@@ -4,7 +4,15 @@ set -e
 case "$1" in
   abort-upgrade|abort-remove|abort-deconfigure|configure)
     ;;
-
+  triggered)
+    if [ -x /etc/init.d/nginx ]; then
+      if [ -s /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
+        echo "Triggering nginx reload ..."
+        invoke-rc.d nginx reload || true
+      fi
+    fi
+    exit 0
+    ;;
   *)
     echo "postinst called with unknown argument \`$1'" >&2
     exit 1
diff --git a/debian/nginx-light.triggers b/debian/nginx-light.triggers
new file mode 100644
index 0000000..efb0515
--- /dev/null
+++ b/debian/nginx-light.triggers
@@ -0,0 +1 @@
+interest-noawait nginx-reload

From db5edb9e3c89c7fa1b57a702c23d7f395e6b43a8 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sun, 22 Jan 2017 02:27:07 +0200
Subject: [PATCH 158/600] Enable modules after a remove -> install cycle

Previously a module that was removed (not purged) and then reinstalled
did not enable itself causing some confusion. Now, we maintain state by
moving the module symlink to .removed on package removal.

If the package is reinstalled the link is restored, if purged the link
is completely dropped.
---
 debian/autoscripts/postinst-nginx | 13 +++++++++++--
 debian/autoscripts/postrm-nginx   | 16 +++++++++++++++-
 debian/autoscripts/prerm-nginx    |  4 ++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/debian/autoscripts/postinst-nginx b/debian/autoscripts/postinst-nginx
index 0c0221d..aa376d5 100644
--- a/debian/autoscripts/postinst-nginx
+++ b/debian/autoscripts/postinst-nginx
@@ -2,8 +2,17 @@ for confpair in #NAMES# ; do
 	from=$(echo $confpair | cut -d: -f1)
 	to=$(echo $confpair | cut -d: -f2)
 
-	# Symlink on fresh installations
-	if [ -z "$2" ]; then
+	if [ -L /etc/nginx/modules-enabled/$to.removed ]; then
+		rm /etc/nginx/modules-enabled/$to.removed
+		removed_link=true
+	else
+		removed_link=false
+	fi
+
+	# Symlink on
+	# 1) Fresh installations
+	# 2) Reinstalls after automatic removes (preserve admin actions)
+	if [ -z "$2" -o "$removed_link" = "true" ]; then
 		ln -sf /usr/share/nginx/modules-available/$from \
 			/etc/nginx/modules-enabled/$to
 	fi
diff --git a/debian/autoscripts/postrm-nginx b/debian/autoscripts/postrm-nginx
index 3e81631..8769983 100644
--- a/debian/autoscripts/postrm-nginx
+++ b/debian/autoscripts/postrm-nginx
@@ -3,9 +3,23 @@ if [ "$1" = "purge" ] ; then
 		from=$(echo $confpair | cut -d: -f1)
 		to=$(echo $confpair | cut -d: -f2)
 
-		if [ -e /etc/nginx/modules-enabled/$to ]; then
+		if [ -L /etc/nginx/modules-enabled/$to ]; then
 			rm /etc/nginx/modules-enabled/$to
 		fi
+		if [ -L /etc/nginx/modules-enabled/$to.removed ]; then
+			rm /etc/nginx/modules-enabled/$to.removed
+		fi
+	done
+fi
+
+if [ "$1" = "remove" ] ; then
+	for confpair in #NAMES# ; do
+		from=$(echo $confpair | cut -d: -f1)
+		to=$(echo $confpair | cut -d: -f2)
+
+		if [ -L /etc/nginx/modules-enabled/$to ]; then
+			mv /etc/nginx/modules-enabled/$to /etc/nginx/modules-enabled/$to.removed
+		fi
 	done
 
         if which dpkg-trigger >/dev/null 2>&1 ; then
diff --git a/debian/autoscripts/prerm-nginx b/debian/autoscripts/prerm-nginx
index 0087c87..c36a883 100644
--- a/debian/autoscripts/prerm-nginx
+++ b/debian/autoscripts/prerm-nginx
@@ -3,8 +3,8 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
 		from=$(echo $confpair | cut -d: -f1)
 		to=$(echo $confpair | cut -d: -f2)
 
-		if [ -e /etc/nginx/modules-enabled/$to ]; then
-			rm /etc/nginx/modules-enabled/$to
+		if [ -L /etc/nginx/modules-enabled/$to ]; then
+			mv /etc/nginx/modules-enabled/$to /etc/nginx/modules-enabled/$to.removed
 		fi
 	done
 fi

From df46fe3e5970aee7d5794446029900cb2c6066fb Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 21 Jan 2017 22:42:39 +0200
Subject: [PATCH 159/600] Release 1.10.2-4

---
 debian/changelog         | 16 ++++++++++++++++
 debian/nginx-common.NEWS |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f0fcba6..6478e46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+nginx (1.10.2-4) unstable; urgency=medium
+
+  * Switch module reloading logic to dpkg triggers.
+  * Enable modules after a remove -> install cycle.
+  * Move module patches to debian/modules/patches.
+  * Backport curve list support from 1.11.x. (Closes: #846085)
+  * Add a NEWS entry regarding dynamic modules.
+  * Merge de,fr,nl,pt_BR,da translations.
+    Thanks to Chris Leick. (Closes: #843770)
+    Thanks to Julien Patriarca. (Closes: #844712)
+    Thanks to Frans Spiesschaert. (Closes: #845693)
+    Thanks to Adriano Rafael Gomes. (Closes: #846522)
+    Thanks to Joe Dalton. (Closes: #850857)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Sun, 22 Jan 2017 12:19:30 +0200
+
 nginx (1.10.2-3) unstable; urgency=medium
 
   [ Michael Lustfield ]
diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index d67c9d8..d361983 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,4 +1,4 @@
-nginx-common (1.10.2-4) UNRELEASED; urgency=medium
+nginx-common (1.10.2-4) unstable; urgency=medium
 
   Since nginx 1.9.14 Debian has gradually switched to dynamic loadable modules
   for all third party modules and core modules that support it. For each
@@ -9,7 +9,7 @@ nginx-common (1.10.2-4) UNRELEASED; urgency=medium
   /etc/nginx/modules-enabled/. If you use a modified /etc/nginx/nginx.conf make
   sure to include that directory.
 
- -- Christos Trochalakis <ctrochalakis@debian.org>  Sat, 21 Jan 2017 22:36:12 +0200
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Sun, 22 Jan 2017 12:19:30 +0200
 
 nginx-common (1.10.2-1) unstable; urgency=high
 

From 8be20cce49a59fb0faf09160844415deb2dea019 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 25 Jan 2017 14:51:09 +0200
Subject: [PATCH 160/600] New upstream version 1.11.9

---
 CHANGES                                  | 29 ++++++++++++++++++++++++
 CHANGES.ru                               | 28 +++++++++++++++++++++++
 LICENSE                                  |  4 ++--
 src/core/nginx.h                         |  4 ++--
 src/core/ngx_buf.c                       |  3 +++
 src/core/ngx_connection.c                | 18 +++++++++------
 src/core/ngx_cycle.h                     |  1 +
 src/event/ngx_event_pipe.c               | 13 +++++++++++
 src/http/ngx_http_upstream.c             | 15 ++++++++++++
 src/mail/ngx_mail_imap_handler.c         |  8 +++++--
 src/mail/ngx_mail_pop3_handler.c         |  4 ++++
 src/mail/ngx_mail_smtp_handler.c         |  8 +++++--
 src/os/unix/ngx_darwin_sendfile_chain.c  |  2 +-
 src/os/unix/ngx_freebsd_sendfile_chain.c | 20 +++++++++++-----
 src/os/unix/ngx_thread_cond.c            | 11 ---------
 src/os/unix/ngx_thread_mutex.c           |  9 --------
 src/stream/ngx_stream_proxy_module.c     |  5 ++--
 src/stream/ngx_stream_ssl_module.c       | 13 +++++++++--
 18 files changed, 149 insertions(+), 46 deletions(-)

diff --git a/CHANGES b/CHANGES
index 94b27be..d1103a7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,33 @@
 
+Changes with nginx 1.11.9                                        24 Jan 2017
+
+    *) Bugfix: nginx might hog CPU when using the stream module; the bug had
+       appeared in 1.11.5.
+
+    *) Bugfix: EXTERNAL authentication mechanism in mail proxy was accepted
+       even if it was not enabled in the configuration.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if the
+       "ssl_verify_client" directive of the stream module was used.
+
+    *) Bugfix: the "ssl_verify_client" directive of the stream module might
+       not work.
+
+    *) Bugfix: closing keepalive connections due to no free worker
+       connections might be too aggressive.
+       Thanks to Joel Cunningham.
+
+    *) Bugfix: an incorrect response might be returned when using the
+       "sendfile" directive on FreeBSD and macOS; the bug had appeared in
+       1.7.8.
+
+    *) Bugfix: a truncated response might be stored in cache when using the
+       "aio_write" directive.
+
+    *) Bugfix: a socket leak might occur when using the "aio_write"
+       directive.
+
+
 Changes with nginx 1.11.8                                        27 Dec 2016
 
     *) Feature: the "absolute_redirect" directive.
diff --git a/CHANGES.ru b/CHANGES.ru
index e8627a2..cbafad2 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,32 @@
 
+Изменения в nginx 1.11.9                                          24.01.2017
+
+    *) Исправление: при использовании модуля stream nginx мог нагружать
+       процессор; ошибка появилась в 1.11.5.
+
+    *) Исправление: метод аутентификации EXTERNAL в почтовом прокси-сервере
+       можно было использовать, даже если он не был разрешён в конфигурации.
+
+    *) Исправление: при использовании директивы ssl_verify_client модуля
+       stream в рабочем процессе мог произойти segmentation fault.
+
+    *) Исправление: директива ssl_verify_client модуля stream могла не
+       работать.
+
+    *) Исправление: при исчерпании рабочим процессом свободных соединений
+       keepalive-соединения могли закрываться излишне агрессивно.
+       Спасибо Joel Cunningham.
+
+    *) Исправление: при использовании директивы sendfile на FreeBSD и macOS
+       мог возвращаться некорректный ответ; ошибка появилась в 1.7.8.
+
+    *) Исправление: при использовании директивы aio_write ответ мог
+       сохраняться в кэш не полностью.
+
+    *) Исправление: при использовании директивы aio_write могла происходить
+       утечка сокетов.
+
+
 Изменения в nginx 1.11.8                                          27.12.2016
 
     *) Добавление: директива absolute_redirect.
diff --git a/LICENSE b/LICENSE
index 1d3d15c..3f29d93 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2002-2016 Igor Sysoev
- * Copyright (C) 2011-2016 Nginx, Inc.
+ * Copyright (C) 2002-2017 Igor Sysoev
+ * Copyright (C) 2011-2017 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 983179f..3c06864 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011008
-#define NGINX_VERSION      "1.11.8"
+#define nginx_version      1011009
+#define NGINX_VERSION      "1.11.9"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_buf.c b/src/core/ngx_buf.c
index d30a0a4..1862a06 100644
--- a/src/core/ngx_buf.c
+++ b/src/core/ngx_buf.c
@@ -246,6 +246,9 @@ ngx_chain_coalesce_file(ngx_chain_t **in, off_t limit)
             if (aligned <= cl->buf->file_last) {
                 size = aligned - cl->buf->file_pos;
             }
+
+            total += size;
+            break;
         }
 
         total += size;
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index a789d8c..2af2876 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -13,7 +13,7 @@
 ngx_os_io_t  ngx_io;
 
 
-static void ngx_drain_connections(void);
+static void ngx_drain_connections(ngx_cycle_t *cycle);
 
 
 ngx_listening_t *
@@ -1046,7 +1046,7 @@ ngx_get_connection(ngx_socket_t s, ngx_log_t *log)
     c = ngx_cycle->free_connections;
 
     if (c == NULL) {
-        ngx_drain_connections();
+        ngx_drain_connections((ngx_cycle_t *) ngx_cycle);
         c = ngx_cycle->free_connections;
     }
 
@@ -1204,6 +1204,7 @@ ngx_reusable_connection(ngx_connection_t *c, ngx_uint_t reusable)
 
     if (c->reusable) {
         ngx_queue_remove(&c->queue);
+        ngx_cycle->reusable_connections_n--;
 
 #if (NGX_STAT_STUB)
         (void) ngx_atomic_fetch_add(ngx_stat_waiting, -1);
@@ -1217,6 +1218,7 @@ ngx_reusable_connection(ngx_connection_t *c, ngx_uint_t reusable)
 
         ngx_queue_insert_head(
             (ngx_queue_t *) &ngx_cycle->reusable_connections_queue, &c->queue);
+        ngx_cycle->reusable_connections_n++;
 
 #if (NGX_STAT_STUB)
         (void) ngx_atomic_fetch_add(ngx_stat_waiting, 1);
@@ -1226,18 +1228,20 @@ ngx_reusable_connection(ngx_connection_t *c, ngx_uint_t reusable)
 
 
 static void
-ngx_drain_connections(void)
+ngx_drain_connections(ngx_cycle_t *cycle)
 {
-    ngx_int_t          i;
+    ngx_uint_t         i, n;
     ngx_queue_t       *q;
     ngx_connection_t  *c;
 
-    for (i = 0; i < 32; i++) {
-        if (ngx_queue_empty(&ngx_cycle->reusable_connections_queue)) {
+    n = ngx_max(ngx_min(32, cycle->reusable_connections_n / 8), 1);
+
+    for (i = 0; i < n; i++) {
+        if (ngx_queue_empty(&cycle->reusable_connections_queue)) {
             break;
         }
 
-        q = ngx_queue_last(&ngx_cycle->reusable_connections_queue);
+        q = ngx_queue_last(&cycle->reusable_connections_queue);
         c = ngx_queue_data(q, ngx_connection_t, queue);
 
         ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0,
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index 5cdacf1..d804eb4 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -53,6 +53,7 @@ struct ngx_cycle_s {
     ngx_uint_t                modules_used;    /* unsigned  modules_used:1; */
 
     ngx_queue_t               reusable_connections_queue;
+    ngx_uint_t                reusable_connections_n;
 
     ngx_array_t               listening;
     ngx_array_t               paths;
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index 249433a..da7c4ee 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -113,11 +113,24 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
     }
 
 #if (NGX_THREADS)
+
     if (p->aio) {
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
                        "pipe read upstream: aio");
         return NGX_AGAIN;
     }
+
+    if (p->writing) {
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
+                       "pipe read upstream: writing");
+
+        rc = ngx_event_pipe_write_chain_to_temp_file(p);
+
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
+
 #endif
 
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index d0bcd29..74a7c64 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -3848,9 +3848,24 @@ ngx_http_upstream_process_request(ngx_http_request_t *r,
     p = u->pipe;
 
 #if (NGX_THREADS)
+
+    if (p->writing && !p->aio) {
+
+        /*
+         * make sure to call ngx_event_pipe()
+         * if there is an incomplete aio write
+         */
+
+        if (ngx_event_pipe(p, 1) == NGX_ABORT) {
+            ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
+            return;
+        }
+    }
+
     if (p->writing) {
         return;
     }
+
 #endif
 
     if (u->peer.connection) {
diff --git a/src/mail/ngx_mail_imap_handler.c b/src/mail/ngx_mail_imap_handler.c
index 1c54457..3bf09ec 100644
--- a/src/mail/ngx_mail_imap_handler.c
+++ b/src/mail/ngx_mail_imap_handler.c
@@ -356,6 +356,8 @@ ngx_mail_imap_authenticate(ngx_mail_session_t *s, ngx_connection_t *c)
     }
 #endif
 
+    iscf = ngx_mail_get_module_srv_conf(s, ngx_mail_imap_module);
+
     rc = ngx_mail_auth_parse(s, c);
 
     switch (rc) {
@@ -383,8 +385,6 @@ ngx_mail_imap_authenticate(ngx_mail_session_t *s, ngx_connection_t *c)
 
     case NGX_MAIL_AUTH_CRAM_MD5:
 
-        iscf = ngx_mail_get_module_srv_conf(s, ngx_mail_imap_module);
-
         if (!(iscf->auth_methods & NGX_MAIL_AUTH_CRAM_MD5_ENABLED)) {
             return NGX_MAIL_PARSE_INVALID_COMMAND;
         }
@@ -406,6 +406,10 @@ ngx_mail_imap_authenticate(ngx_mail_session_t *s, ngx_connection_t *c)
 
     case NGX_MAIL_AUTH_EXTERNAL:
 
+        if (!(iscf->auth_methods & NGX_MAIL_AUTH_EXTERNAL_ENABLED)) {
+            return NGX_MAIL_PARSE_INVALID_COMMAND;
+        }
+
         ngx_str_set(&s->out, imap_username);
         s->mail_state = ngx_imap_auth_external;
 
diff --git a/src/mail/ngx_mail_pop3_handler.c b/src/mail/ngx_mail_pop3_handler.c
index a2d5658..9310c27 100644
--- a/src/mail/ngx_mail_pop3_handler.c
+++ b/src/mail/ngx_mail_pop3_handler.c
@@ -501,6 +501,10 @@ ngx_mail_pop3_auth(ngx_mail_session_t *s, ngx_connection_t *c)
 
     case NGX_MAIL_AUTH_EXTERNAL:
 
+        if (!(pscf->auth_methods & NGX_MAIL_AUTH_EXTERNAL_ENABLED)) {
+            return NGX_MAIL_PARSE_INVALID_COMMAND;
+        }
+
         ngx_str_set(&s->out, pop3_username);
         s->mail_state = ngx_pop3_auth_external;
 
diff --git a/src/mail/ngx_mail_smtp_handler.c b/src/mail/ngx_mail_smtp_handler.c
index 47756c3..939fb1a 100644
--- a/src/mail/ngx_mail_smtp_handler.c
+++ b/src/mail/ngx_mail_smtp_handler.c
@@ -609,6 +609,8 @@ ngx_mail_smtp_auth(ngx_mail_session_t *s, ngx_connection_t *c)
         return NGX_OK;
     }
 
+    sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
+
     rc = ngx_mail_auth_parse(s, c);
 
     switch (rc) {
@@ -636,8 +638,6 @@ ngx_mail_smtp_auth(ngx_mail_session_t *s, ngx_connection_t *c)
 
     case NGX_MAIL_AUTH_CRAM_MD5:
 
-        sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
-
         if (!(sscf->auth_methods & NGX_MAIL_AUTH_CRAM_MD5_ENABLED)) {
             return NGX_MAIL_PARSE_INVALID_COMMAND;
         }
@@ -659,6 +659,10 @@ ngx_mail_smtp_auth(ngx_mail_session_t *s, ngx_connection_t *c)
 
     case NGX_MAIL_AUTH_EXTERNAL:
 
+        if (!(sscf->auth_methods & NGX_MAIL_AUTH_EXTERNAL_ENABLED)) {
+            return NGX_MAIL_PARSE_INVALID_COMMAND;
+        }
+
         ngx_str_set(&s->out, smtp_username);
         s->mail_state = ngx_smtp_auth_external;
 
diff --git a/src/os/unix/ngx_darwin_sendfile_chain.c b/src/os/unix/ngx_darwin_sendfile_chain.c
index c802e9f..2a76c15 100644
--- a/src/os/unix/ngx_darwin_sendfile_chain.c
+++ b/src/os/unix/ngx_darwin_sendfile_chain.c
@@ -98,7 +98,7 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
             send += file_size;
 
-            if (header.count == 0) {
+            if (header.count == 0 && send < limit) {
 
                 /*
                  * create the trailer iovec and coalesce the neighbouring bufs
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index d0299f5..4822e72 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -114,16 +114,24 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
             send += file_size;
 
-            /* create the trailer iovec and coalesce the neighbouring bufs */
+            if (send < limit) {
 
-            cl = ngx_output_chain_to_iovec(&trailer, cl, limit - send, c->log);
+                /*
+                 * create the trailer iovec and coalesce the neighbouring bufs
+                 */
 
-            if (cl == NGX_CHAIN_ERROR) {
-                return NGX_CHAIN_ERROR;
+                cl = ngx_output_chain_to_iovec(&trailer, cl, limit - send,
+                                               c->log);
+                if (cl == NGX_CHAIN_ERROR) {
+                    return NGX_CHAIN_ERROR;
+                }
+
+                send += trailer.size;
+
+            } else {
+                trailer.count = 0;
             }
 
-            send += trailer.size;
-
             if (ngx_freebsd_use_tcp_nopush
                 && c->tcp_nopush == NGX_TCP_NOPUSH_UNSET)
             {
diff --git a/src/os/unix/ngx_thread_cond.c b/src/os/unix/ngx_thread_cond.c
index f524696..2ad51b8 100644
--- a/src/os/unix/ngx_thread_cond.c
+++ b/src/os/unix/ngx_thread_cond.c
@@ -16,8 +16,6 @@ ngx_thread_cond_create(ngx_thread_cond_t *cond, ngx_log_t *log)
 
     err = pthread_cond_init(cond, NULL);
     if (err == 0) {
-        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
-                       "pthread_cond_init(%p)", cond);
         return NGX_OK;
     }
 
@@ -33,8 +31,6 @@ ngx_thread_cond_destroy(ngx_thread_cond_t *cond, ngx_log_t *log)
 
     err = pthread_cond_destroy(cond);
     if (err == 0) {
-        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
-                       "pthread_cond_destroy(%p)", cond);
         return NGX_OK;
     }
 
@@ -50,8 +46,6 @@ ngx_thread_cond_signal(ngx_thread_cond_t *cond, ngx_log_t *log)
 
     err = pthread_cond_signal(cond);
     if (err == 0) {
-        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
-                       "pthread_cond_signal(%p)", cond);
         return NGX_OK;
     }
 
@@ -66,9 +60,6 @@ ngx_thread_cond_wait(ngx_thread_cond_t *cond, ngx_thread_mutex_t *mtx,
 {
     ngx_err_t  err;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
-                   "pthread_cond_wait(%p) enter", cond);
-
     err = pthread_cond_wait(cond, mtx);
 
 #if 0
@@ -76,8 +67,6 @@ ngx_thread_cond_wait(ngx_thread_cond_t *cond, ngx_thread_mutex_t *mtx,
 #endif
 
     if (err == 0) {
-        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
-                       "pthread_cond_wait(%p) exit", cond);
         return NGX_OK;
     }
 
diff --git a/src/os/unix/ngx_thread_mutex.c b/src/os/unix/ngx_thread_mutex.c
index a0ef693..4886f49 100644
--- a/src/os/unix/ngx_thread_mutex.c
+++ b/src/os/unix/ngx_thread_mutex.c
@@ -108,8 +108,6 @@ ngx_thread_mutex_create(ngx_thread_mutex_t *mtx, ngx_log_t *log)
                       "pthread_mutexattr_destroy() failed");
     }
 
-    ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
-                   "pthread_mutex_init(%p)", mtx);
     return NGX_OK;
 }
 
@@ -126,8 +124,6 @@ ngx_thread_mutex_destroy(ngx_thread_mutex_t *mtx, ngx_log_t *log)
         return NGX_ERROR;
     }
 
-    ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
-                   "pthread_mutex_destroy(%p)", mtx);
     return NGX_OK;
 }
 
@@ -137,9 +133,6 @@ ngx_thread_mutex_lock(ngx_thread_mutex_t *mtx, ngx_log_t *log)
 {
     ngx_err_t  err;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
-                   "pthread_mutex_lock(%p) enter", mtx);
-
     err = pthread_mutex_lock(mtx);
     if (err == 0) {
         return NGX_OK;
@@ -163,8 +156,6 @@ ngx_thread_mutex_unlock(ngx_thread_mutex_t *mtx, ngx_log_t *log)
 #endif
 
     if (err == 0) {
-        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
-                       "pthread_mutex_unlock(%p) exit", mtx);
         return NGX_OK;
     }
 
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index bfd78d5..81a0891 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -1534,8 +1534,9 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 
         size = b->end - b->last;
 
-        if (size && src->read->ready && !src->read->delayed) {
-
+        if (size && src->read->ready && !src->read->delayed
+            && !src->read->error)
+        {
             if (limit_rate) {
                 limit = (off_t) limit_rate * (ngx_time() - u->start_sec + 1)
                         - *received;
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index fb653c5..2f242b6 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -284,14 +284,19 @@ ngx_stream_ssl_handler(ngx_stream_session_t *s)
 {
     long                    rc;
     X509                   *cert;
+    ngx_int_t               rv;
     ngx_connection_t       *c;
     ngx_stream_ssl_conf_t  *sslcf;
 
+    if (!s->ssl) {
+        return NGX_OK;
+    }
+
     c = s->connection;
 
     sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
 
-    if (s->ssl && c->ssl == NULL) {
+    if (c->ssl == NULL) {
         c->log->action = "SSL handshaking";
 
         if (sslcf->ssl.ctx == NULL) {
@@ -301,7 +306,11 @@ ngx_stream_ssl_handler(ngx_stream_session_t *s)
             return NGX_ERROR;
         }
 
-        return ngx_stream_ssl_init_connection(&sslcf->ssl, c);
+        rv = ngx_stream_ssl_init_connection(&sslcf->ssl, c);
+
+        if (rv != NGX_OK) {
+            return rv;
+        }
     }
 
     if (sslcf->verify) {

From 06d2f43f67038429fa68b86f2d4da5d4146a5bc7 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 31 Jan 2017 19:29:29 +0200
Subject: [PATCH 161/600] New upstream version 1.10.3

---
 CHANGES                                       | 29 +++++++
 CHANGES.ru                                    | 28 +++++++
 src/core/nginx.h                              |  4 +-
 src/core/ngx_buf.c                            |  3 +
 src/core/ngx_inet.c                           | 19 +++--
 src/event/ngx_event_pipe.c                    | 13 +++
 .../modules/ngx_http_addition_filter_module.c |  1 +
 src/http/ngx_http_upstream.c                  | 15 ++++
 src/http/v2/ngx_http_v2.c                     | 79 +++++++++++--------
 src/http/v2/ngx_http_v2.h                     |  4 +-
 src/http/v2/ngx_http_v2_filter_module.c       | 50 +++++++++---
 src/os/unix/ngx_darwin_sendfile_chain.c       |  2 +-
 src/os/unix/ngx_freebsd_sendfile_chain.c      | 20 +++--
 13 files changed, 205 insertions(+), 62 deletions(-)

diff --git a/CHANGES b/CHANGES
index 209da02..bc0ecb7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,33 @@
 
+Changes with nginx 1.10.3                                        31 Jan 2017
+
+    *) Bugfix: in the "add_after_body" directive when used with the
+       "sub_filter" directive.
+
+    *) Bugfix: unix domain listen sockets might not be inherited during
+       binary upgrade on Linux.
+
+    *) Bugfix: graceful shutdown of old worker processes might require
+       infinite time when using HTTP/2.
+
+    *) Bugfix: when using HTTP/2 and the "limit_req" or "auth_request"
+       directives client request body might be corrupted; the bug had
+       appeared in 1.10.2.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2; the bug had appeared in 1.10.2.
+
+    *) Bugfix: an incorrect response might be returned when using the
+       "sendfile" directive on FreeBSD and macOS; the bug had appeared in
+       1.7.8.
+
+    *) Bugfix: a truncated response might be stored in cache when using the
+       "aio_write" directive.
+
+    *) Bugfix: a socket leak might occur when using the "aio_write"
+       directive.
+
+
 Changes with nginx 1.10.2                                        18 Oct 2016
 
     *) Change: the "421 Misdirected Request" response now used when
diff --git a/CHANGES.ru b/CHANGES.ru
index ea46689..e2eea12 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,32 @@
 
+Изменения в nginx 1.10.3                                          31.01.2017
+
+    *) Исправление: в директиве add_after_body при использовании совместно с
+       директивой sub_filter.
+
+    *) Исправление: unix domain listen-сокеты могли не наследоваться при
+       обновлении исполняемого файла на Linux.
+
+    *) Исправление: плавное завершение старых рабочих процессов могло
+       занимать бесконечное время при использовании HTTP/2.
+
+    *) Исправление: при использовании HTTP/2 и директив limit_req или
+       auth_request тело запроса могло быть повреждено; ошибка появилась в
+       1.10.2.
+
+    *) Исправление: при использовании HTTP/2 в рабочем процессе мог
+       произойти segmentation fault; ошибка появилась в 1.10.2.
+
+    *) Исправление: при использовании директивы sendfile на FreeBSD и macOS
+       мог возвращаться некорректный ответ; ошибка появилась в 1.7.8.
+
+    *) Исправление: при использовании директивы aio_write ответ мог
+       сохраняться в кэш не полностью.
+
+    *) Исправление: при использовании директивы aio_write могла происходить
+       утечка сокетов.
+
+
 Изменения в nginx 1.10.2                                          18.10.2016
 
     *) Изменение: при попытке запросить виртуальный сервер, отличающийся от
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 95123f1..6bf1618 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1010002
-#define NGINX_VERSION      "1.10.2"
+#define nginx_version      1010003
+#define NGINX_VERSION      "1.10.3"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_buf.c b/src/core/ngx_buf.c
index 00b6644..418411b 100644
--- a/src/core/ngx_buf.c
+++ b/src/core/ngx_buf.c
@@ -244,6 +244,9 @@ ngx_chain_coalesce_file(ngx_chain_t **in, off_t limit)
             if (aligned <= cl->buf->file_last) {
                 size = aligned - cl->buf->file_pos;
             }
+
+            total += size;
+            break;
         }
 
         total += size;
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 33b303d..404f763 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -1213,6 +1213,7 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
     struct sockaddr_in6  *sin61, *sin62;
 #endif
 #if (NGX_HAVE_UNIX_DOMAIN)
+    size_t                len;
     struct sockaddr_un   *saun1, *saun2;
 #endif
 
@@ -1242,15 +1243,21 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
 #if (NGX_HAVE_UNIX_DOMAIN)
     case AF_UNIX:
 
-        /* TODO length */
-
         saun1 = (struct sockaddr_un *) sa1;
         saun2 = (struct sockaddr_un *) sa2;
 
-        if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path,
-                       sizeof(saun1->sun_path))
-            != 0)
-        {
+        if (slen1 < slen2) {
+            len = slen1 - offsetof(struct sockaddr_un, sun_path);
+
+        } else {
+            len = slen2 - offsetof(struct sockaddr_un, sun_path);
+        }
+
+        if (len > sizeof(saun1->sun_path)) {
+            len = sizeof(saun1->sun_path);
+        }
+
+        if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path, len) != 0) {
             return NGX_DECLINED;
         }
 
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index be1b475..f54e070 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -113,11 +113,24 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
     }
 
 #if (NGX_THREADS)
+
     if (p->aio) {
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
                        "pipe read upstream: aio");
         return NGX_AGAIN;
     }
+
+    if (p->writing) {
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
+                       "pipe read upstream: writing");
+
+        rc = ngx_event_pipe_write_chain_to_temp_file(p);
+
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
+
 #endif
 
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
diff --git a/src/http/modules/ngx_http_addition_filter_module.c b/src/http/modules/ngx_http_addition_filter_module.c
index db4970b..2fad0e5 100644
--- a/src/http/modules/ngx_http_addition_filter_module.c
+++ b/src/http/modules/ngx_http_addition_filter_module.c
@@ -171,6 +171,7 @@ ngx_http_addition_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     for (cl = in; cl; cl = cl->next) {
         if (cl->buf->last_buf) {
             cl->buf->last_buf = 0;
+            cl->buf->last_in_chain = 1;
             cl->buf->sync = 1;
             last = 1;
         }
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 1386bdb..168f6b4 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -3744,9 +3744,24 @@ ngx_http_upstream_process_request(ngx_http_request_t *r,
     p = u->pipe;
 
 #if (NGX_THREADS)
+
+    if (p->writing && !p->aio) {
+
+        /*
+         * make sure to call ngx_event_pipe()
+         * if there is an incomplete aio write
+         */
+
+        if (ngx_event_pipe(p, 1) == NGX_ABORT) {
+            ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
+            return;
+        }
+    }
+
     if (p->writing) {
         return;
     }
+
 #endif
 
     if (u->peer.connection) {
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index d0cd2ab..421ec6e 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -136,6 +136,8 @@ static ngx_int_t ngx_http_v2_send_window_update(ngx_http_v2_connection_t *h2c,
     ngx_uint_t sid, size_t window);
 static ngx_int_t ngx_http_v2_send_rst_stream(ngx_http_v2_connection_t *h2c,
     ngx_uint_t sid, ngx_uint_t status);
+static ngx_int_t ngx_http_v2_send_goaway(ngx_http_v2_connection_t *h2c,
+    ngx_uint_t status);
 
 static ngx_http_v2_out_frame_t *ngx_http_v2_get_frame(
     ngx_http_v2_connection_t *h2c, size_t length, ngx_uint_t type,
@@ -284,7 +286,6 @@ ngx_http_v2_init(ngx_event_t *rev)
                                             : ngx_http_v2_state_preface;
 
     ngx_queue_init(&h2c->waiting);
-    ngx_queue_init(&h2c->posted);
     ngx_queue_init(&h2c->dependencies);
     ngx_queue_init(&h2c->closed);
 
@@ -293,6 +294,8 @@ ngx_http_v2_init(ngx_event_t *rev)
     rev->handler = ngx_http_v2_read_handler;
     c->write->handler = ngx_http_v2_write_handler;
 
+    c->idle = 1;
+
     ngx_http_v2_read_handler(rev);
 }
 
@@ -320,6 +323,25 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
 
     h2c->blocked = 1;
 
+    if (c->close) {
+        c->close = 0;
+        h2c->goaway = 1;
+
+        if (ngx_http_v2_send_goaway(h2c, NGX_HTTP_V2_NO_ERROR) == NGX_ERROR) {
+            ngx_http_v2_finalize_connection(h2c, 0);
+            return;
+        }
+
+        if (ngx_http_v2_send_output_queue(h2c) == NGX_ERROR) {
+            ngx_http_v2_finalize_connection(h2c, 0);
+            return;
+        }
+
+        h2c->blocked = 0;
+
+        return;
+    }
+
     h2mcf = ngx_http_get_module_main_conf(h2c->http_connection->conf_ctx,
                                           ngx_http_v2_module);
 
@@ -392,9 +414,7 @@ static void
 ngx_http_v2_write_handler(ngx_event_t *wev)
 {
     ngx_int_t                  rc;
-    ngx_queue_t               *q;
     ngx_connection_t          *c;
-    ngx_http_v2_stream_t      *stream;
     ngx_http_v2_connection_t  *h2c;
 
     c = wev->data;
@@ -429,26 +449,6 @@ ngx_http_v2_write_handler(ngx_event_t *wev)
         return;
     }
 
-    while (!ngx_queue_empty(&h2c->posted)) {
-        q = ngx_queue_head(&h2c->posted);
-
-        ngx_queue_remove(q);
-
-        stream = ngx_queue_data(q, ngx_http_v2_stream_t, queue);
-
-        stream->handled = 0;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "run http2 stream %ui", stream->node->id);
-
-        wev = stream->request->connection->write;
-
-        wev->active = 0;
-        wev->ready = 1;
-
-        wev->handler(wev);
-    }
-
     h2c->blocked = 0;
 
     if (rc == NGX_AGAIN) {
@@ -633,6 +633,11 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
         /* rc == NGX_OK */
     }
 
+    if (h2c->goaway) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
                                          ngx_http_v2_module);
     if (h2c->state.incomplete) {
@@ -640,11 +645,6 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
         return;
     }
 
-    if (ngx_terminate || ngx_exiting) {
-        ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
-        return;
-    }
-
     ngx_destroy_pool(h2c->pool);
 
     h2c->pool = NULL;
@@ -658,7 +658,6 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
 #endif
 
     c->destroyed = 1;
-    c->idle = 1;
     ngx_reusable_connection(c, 1);
 
     c->write->handler = ngx_http_empty_handler;
@@ -1027,6 +1026,12 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
     }
 
+    if (h2c->goaway) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "skipping http2 HEADERS frame");
+        return ngx_http_v2_state_skip(h2c, pos, end);
+    }
+
     if ((size_t) (end - pos) < size) {
         return ngx_http_v2_state_save(h2c, pos, end,
                                       ngx_http_v2_state_headers);
@@ -2212,7 +2217,7 @@ ngx_http_v2_state_window_update(ngx_http_v2_connection_t *h2c, u_char *pos,
 
         stream = ngx_queue_data(q, ngx_http_v2_stream_t, queue);
 
-        stream->handled = 0;
+        stream->waiting = 0;
 
         wev = stream->request->connection->write;
 
@@ -3532,6 +3537,11 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
         rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
 
     } else {
+        if (stream->preread) {
+            /* enforce writing preread buffer to file */
+            r->request_body_in_file_only = 1;
+        }
+
         rb->buf = ngx_calloc_buf(r->pool);
 
         if (rb->buf != NULL) {
@@ -4162,7 +4172,6 @@ ngx_http_v2_idle_handler(ngx_event_t *rev)
 #endif
 
     c->destroyed = 0;
-    c->idle = 0;
     ngx_reusable_connection(c, 0);
 
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@@ -4197,8 +4206,10 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     h2c->blocked = 1;
 
-    if (!c->error && ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) {
-        (void) ngx_http_v2_send_output_queue(h2c);
+    if (!c->error && !h2c->goaway) {
+        if (ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) {
+            (void) ngx_http_v2_send_output_queue(h2c);
+        }
     }
 
     c->error = 1;
@@ -4227,7 +4238,7 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
                 continue;
             }
 
-            stream->handled = 0;
+            stream->waiting = 0;
 
             r = stream->request;
             fc = r->connection;
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 9e738aa..2f519e1 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -137,7 +137,6 @@ struct ngx_http_v2_connection_s {
 
     ngx_http_v2_out_frame_t         *last_out;
 
-    ngx_queue_t                      posted;
     ngx_queue_t                      dependencies;
     ngx_queue_t                      closed;
 
@@ -146,6 +145,7 @@ struct ngx_http_v2_connection_s {
     unsigned                         closed_nodes:8;
     unsigned                         settings_ack:1;
     unsigned                         blocked:1;
+    unsigned                         goaway:1;
 };
 
 
@@ -191,7 +191,7 @@ struct ngx_http_v2_stream_s {
 
     ngx_pool_t                      *pool;
 
-    unsigned                         handled:1;
+    unsigned                         waiting:1;
     unsigned                         blocked:1;
     unsigned                         exhausted:1;
     unsigned                         in_closed:1;
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 09ce3f6..fa53070 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -1122,11 +1122,11 @@ ngx_http_v2_waiting_queue(ngx_http_v2_connection_t *h2c,
     ngx_queue_t           *q;
     ngx_http_v2_stream_t  *s;
 
-    if (stream->handled) {
+    if (stream->waiting) {
         return;
     }
 
-    stream->handled = 1;
+    stream->waiting = 1;
 
     for (q = ngx_queue_last(&h2c->waiting);
          q != ngx_queue_sentinel(&h2c->waiting);
@@ -1317,20 +1317,29 @@ static ngx_inline void
 ngx_http_v2_handle_stream(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream)
 {
+    ngx_event_t       *wev;
     ngx_connection_t  *fc;
 
-    if (stream->handled || stream->blocked) {
+    if (stream->waiting || stream->blocked) {
         return;
     }
 
     fc = stream->request->connection;
 
-    if (!fc->error && (stream->exhausted || fc->write->delayed)) {
+    if (!fc->error && stream->exhausted) {
         return;
     }
 
-    stream->handled = 1;
-    ngx_queue_insert_tail(&h2c->posted, &stream->queue);
+    wev = fc->write;
+
+    wev->active = 0;
+    wev->ready = 1;
+
+    if (!fc->error && wev->delayed) {
+        return;
+    }
+
+    ngx_post_event(wev, &ngx_posted_events);
 }
 
 
@@ -1340,11 +1349,13 @@ ngx_http_v2_filter_cleanup(void *data)
     ngx_http_v2_stream_t *stream = data;
 
     size_t                     window;
+    ngx_event_t               *wev;
+    ngx_queue_t               *q;
     ngx_http_v2_out_frame_t   *frame, **fn;
     ngx_http_v2_connection_t  *h2c;
 
-    if (stream->handled) {
-        stream->handled = 0;
+    if (stream->waiting) {
+        stream->waiting = 0;
         ngx_queue_remove(&stream->queue);
     }
 
@@ -1378,9 +1389,26 @@ ngx_http_v2_filter_cleanup(void *data)
         fn = &frame->next;
     }
 
-    if (h2c->send_window == 0 && window && !ngx_queue_empty(&h2c->waiting)) {
-        ngx_queue_add(&h2c->posted, &h2c->waiting);
-        ngx_queue_init(&h2c->waiting);
+    if (h2c->send_window == 0 && window) {
+
+        while (!ngx_queue_empty(&h2c->waiting)) {
+            q = ngx_queue_head(&h2c->waiting);
+
+            ngx_queue_remove(q);
+
+            stream = ngx_queue_data(q, ngx_http_v2_stream_t, queue);
+
+            stream->waiting = 0;
+
+            wev = stream->request->connection->write;
+
+            wev->active = 0;
+            wev->ready = 1;
+
+            if (!wev->delayed) {
+                ngx_post_event(wev, &ngx_posted_events);
+            }
+        }
     }
 
     h2c->send_window += window;
diff --git a/src/os/unix/ngx_darwin_sendfile_chain.c b/src/os/unix/ngx_darwin_sendfile_chain.c
index c802e9f..2a76c15 100644
--- a/src/os/unix/ngx_darwin_sendfile_chain.c
+++ b/src/os/unix/ngx_darwin_sendfile_chain.c
@@ -98,7 +98,7 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
             send += file_size;
 
-            if (header.count == 0) {
+            if (header.count == 0 && send < limit) {
 
                 /*
                  * create the trailer iovec and coalesce the neighbouring bufs
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index d0299f5..4822e72 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -114,16 +114,24 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
             send += file_size;
 
-            /* create the trailer iovec and coalesce the neighbouring bufs */
+            if (send < limit) {
 
-            cl = ngx_output_chain_to_iovec(&trailer, cl, limit - send, c->log);
+                /*
+                 * create the trailer iovec and coalesce the neighbouring bufs
+                 */
 
-            if (cl == NGX_CHAIN_ERROR) {
-                return NGX_CHAIN_ERROR;
+                cl = ngx_output_chain_to_iovec(&trailer, cl, limit - send,
+                                               c->log);
+                if (cl == NGX_CHAIN_ERROR) {
+                    return NGX_CHAIN_ERROR;
+                }
+
+                send += trailer.size;
+
+            } else {
+                trailer.count = 0;
             }
 
-            send += trailer.size;
-
             if (ngx_freebsd_use_tcp_nopush
                 && c->tcp_nopush == NGX_TCP_NOPUSH_UNSET)
             {

From f4307ddb1478c4ed9717c7a954f7192541d1cf95 Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Sun, 12 Feb 2017 00:11:20 -0600
Subject: [PATCH 162/600] Configure build flags to work with other arches and
 downstreams.

---
 debian/changelog |  8 ++++++++
 debian/rules     | 10 ++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6478e46..a528cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.10.2-5) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - Configure build flags to work with other arches and downstreams.
+      Thanks to Thomas Ward.
+
+ -- Michael Lustfield <michael@lustfield.net>  Sun, 12 Feb 2017 00:10:17 -0600
+
 nginx (1.10.2-4) unstable; urgency=medium
 
   * Switch module reloading logic to dpkg triggers.
diff --git a/debian/rules b/debian/rules
index b4389c0..e8129da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,12 @@
 export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
-debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS)
+debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) -fPIC $(shell dpkg-buildflags --get CPPFLAGS)
+debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC
 
 # export necessary perl hardenging flags
-# see: src/http/modules/perl/Makefile.PL
-DEBIAN_NGINX_PERL_LDFLAGS:= $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS)
-export DEBIAN_NGINX_PERL_LDFLAGS
+#  # see: src/http/modules/perl/Makefile.PL
+DEBIAN_NGINX_PERL_LDFLAGS:=$(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS)
 
 FLAVOURS := full light extras
 DYN_MODS := \
@@ -66,7 +65,6 @@ common_configure_flags := \
 			--http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
 			--with-debug \
 			--with-pcre-jit \
-			--with-ipv6 \
 			--with-http_ssl_module \
 			--with-http_stub_status_module \
 			--with-http_realip_module \

From d92573efb62d78b44b5b899e90cbcac8fbff94d7 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 31 Jan 2017 19:28:33 +0200
Subject: [PATCH 163/600] Move Vcs repo under pkg-nginx

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index d33d5b7..89a7abc 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,8 @@ Build-Depends: autotools-dev,
                zlib1g-dev
 Standards-Version: 3.9.8.0
 Homepage: http://nginx.net
-Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/nginx.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nginx.git
+Vcs-Git: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git
 
 Package: nginx
 Architecture: all

From 0868325b3a2993b34b9b2248b10511637c8b3d05 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 15 Feb 2017 09:58:21 +0200
Subject: [PATCH 164/600] Release 1.10.3-1

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6478e46..d73f283 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.10.3-1) unstable; urgency=medium
+
+  * New upstream release. (Closes: #855113)
+  * Update Vcs fields to the new location.
+    The repo is now moved under the pkg-nginx namespace.
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 15 Feb 2017 09:58:13 +0200
+
 nginx (1.10.2-4) unstable; urgency=medium
 
   * Switch module reloading logic to dpkg triggers.

From c9e00bbe9cc1c95e56b6f392e2391bd22f3d0033 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 18 Feb 2017 20:36:23 +0200
Subject: [PATCH 165/600] New upstream version 1.11.10

---
 CHANGES                                       |  32 +++
 CHANGES.ru                                    |  34 +++
 auto/unix                                     |   0
 src/core/nginx.h                              |   4 +-
 src/event/ngx_event_openssl.c                 |  12 +-
 src/http/modules/ngx_http_fastcgi_module.c    |  11 +
 .../modules/ngx_http_gzip_filter_module.c     |  22 +-
 src/http/modules/ngx_http_proxy_module.c      |  11 +
 src/http/modules/ngx_http_rewrite_module.c    |  13 +-
 src/http/modules/ngx_http_scgi_module.c       |  11 +
 .../modules/ngx_http_slice_filter_module.c    |   5 +-
 src/http/modules/ngx_http_uwsgi_module.c      |  11 +
 src/http/ngx_http_cache.h                     |  14 +-
 src/http/ngx_http_core_module.c               |  31 ++-
 src/http/ngx_http_core_module.h               |  10 +-
 src/http/ngx_http_file_cache.c                |  10 +-
 src/http/ngx_http_header_filter_module.c      |  26 +-
 src/http/ngx_http_request.c                   |   2 +
 src/http/ngx_http_request.h                   |   5 +-
 src/http/ngx_http_request_body.c              |   4 +
 src/http/ngx_http_special_response.c          |  13 +-
 src/http/ngx_http_upstream.c                  | 156 +++++++++--
 src/http/ngx_http_upstream.h                  |  13 +-
 src/http/ngx_http_variables.c                 | 242 +++++++++---------
 src/http/ngx_http_variables.h                 |   2 +
 src/http/v2/ngx_http_v2_filter_module.c       |  45 +++-
 src/stream/ngx_stream.h                       |   3 +-
 src/stream/ngx_stream_variables.c             | 146 +++++++++--
 src/stream/ngx_stream_variables.h             |   2 +
 29 files changed, 666 insertions(+), 224 deletions(-)
 mode change 100755 => 100644 auto/unix

diff --git a/CHANGES b/CHANGES
index d1103a7..226a157 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,36 @@
 
+Changes with nginx 1.11.10                                       14 Feb 2017
+
+    *) Change: cache header format has been changed, previously cached
+       responses will be invalidated.
+
+    *) Feature: support of "stale-while-revalidate" and "stale-if-error"
+       extensions in the "Cache-Control" backend response header line.
+
+    *) Feature: the "proxy_cache_background_update",
+       "fastcgi_cache_background_update", "scgi_cache_background_update",
+       and "uwsgi_cache_background_update" directives.
+
+    *) Feature: nginx is now able to cache responses with the "Vary" header
+       line up to 128 characters long (instead of 42 characters in previous
+       versions).
+
+    *) Feature: the "build" parameter of the "server_tokens" directive.
+       Thanks to Tom Thorogood.
+
+    *) Bugfix: "[crit] SSL_write() failed" messages might appear in logs
+       when handling requests with the "Expect: 100-continue" request header
+       line.
+
+    *) Bugfix: the ngx_http_slice_module did not work in named locations.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using AIO after an "X-Accel-Redirect" redirection.
+
+    *) Bugfix: reduced memory consumption for long-lived requests using
+       gzipping.
+
+
 Changes with nginx 1.11.9                                        24 Jan 2017
 
     *) Bugfix: nginx might hog CPU when using the stream module; the bug had
diff --git a/CHANGES.ru b/CHANGES.ru
index cbafad2..d1a1dd3 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,38 @@
 
+Изменения в nginx 1.11.10                                         14.02.2017
+
+    *) Изменение: формат заголовка кэша был изменен, ранее закэшированные
+       ответы будут загружены заново.
+
+    *) Добавление: поддержка расширений stale-while-revalidate и
+       stale-if-error в строке "Cache-Control" в заголовке ответа бэкенда.
+
+    *) Добавление: директивы proxy_cache_background_update,
+       fastcgi_cache_background_update, scgi_cache_background_update и
+       uwsgi_cache_background_update.
+
+    *) Добавление: теперь nginx может кэшировать ответы со строкой Vary
+       заголовка длиной до 128 символов (вместо 42 символов в предыдущих
+       версиях).
+
+    *) Добавление: параметр build директивы server_tokens.
+       Спасибо Tom Thorogood.
+
+    *) Исправление: при обработке запросов со строкой "Expect: 100-continue"
+       в заголовке запроса в логах могли появляться сообщения "[crit]
+       SSL_write() failed".
+
+    *) Исправление: модуль ngx_http_slice_module не работал в именованных
+       location'ах.
+
+    *) Исправление: при использовании AIO после перенаправления запроса с
+       помощью X-Accel-Redirect в рабочем процессе мог произойти
+       segmentation fault.
+
+    *) Исправление: уменьшено потребление памяти для долгоживущих запросов,
+       использующих сжатие.
+
+
 Изменения в nginx 1.11.9                                          24.01.2017
 
     *) Исправление: при использовании модуля stream nginx мог нагружать
diff --git a/auto/unix b/auto/unix
old mode 100755
new mode 100644
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 3c06864..57798ee 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011009
-#define NGINX_VERSION      "1.11.9"
+#define nginx_version      1011010
+#define NGINX_VERSION      "1.11.10"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 3c74b7b..8c7c677 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -121,7 +121,17 @@ ngx_ssl_init(ngx_log_t *log)
 {
 #if OPENSSL_VERSION_NUMBER >= 0x10100003L
 
-    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
+    if (OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL) == 0) {
+        ngx_ssl_error(NGX_LOG_ALERT, log, 0, "OPENSSL_init_ssl() failed");
+        return NGX_ERROR;
+    }
+
+    /*
+     * OPENSSL_init_ssl() may leave errors in the error queue
+     * while returning success
+     */
+
+    ERR_clear_error();
 
 #else
 
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index c7c417b..afdea2d 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -469,6 +469,13 @@ static ngx_command_t  ngx_http_fastcgi_commands[] = {
       offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_revalidate),
       NULL },
 
+    { ngx_string("fastcgi_cache_background_update"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_background_update),
+      NULL },
+
 #endif
 
     { ngx_string("fastcgi_temp_path"),
@@ -2769,6 +2776,7 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
     conf->upstream.cache_revalidate = NGX_CONF_UNSET;
+    conf->upstream.cache_background_update = NGX_CONF_UNSET;
 #endif
 
     conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
@@ -3061,6 +3069,9 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->upstream.cache_revalidate,
                               prev->upstream.cache_revalidate, 0);
 
+    ngx_conf_merge_value(conf->upstream.cache_background_update,
+                              prev->upstream.cache_background_update, 0);
+
 #endif
 
     ngx_conf_merge_value(conf->upstream.pass_request_headers,
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index 536fdf8..f9652d0 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -671,6 +671,8 @@ ngx_http_gzip_filter_gzheader(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
 static ngx_int_t
 ngx_http_gzip_filter_add_data(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
 {
+    ngx_chain_t  *cl;
+
     if (ctx->zstream.avail_in || ctx->flush != Z_NO_FLUSH || ctx->redo) {
         return NGX_OK;
     }
@@ -694,13 +696,16 @@ ngx_http_gzip_filter_add_data(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
         ctx->copy_buf = NULL;
     }
 
-    ctx->in_buf = ctx->in->buf;
+    cl = ctx->in;
+    ctx->in_buf = cl->buf;
+    ctx->in = cl->next;
 
     if (ctx->in_buf->tag == (ngx_buf_tag_t) &ngx_http_gzip_filter_module) {
-        ctx->copy_buf = ctx->in;
-    }
+        ctx->copy_buf = cl;
 
-    ctx->in = ctx->in->next;
+    } else {
+        ngx_free_chain(r->pool, cl);
+    }
 
     ctx->zstream.next_in = ctx->in_buf->pos;
     ctx->zstream.avail_in = ctx->in_buf->last - ctx->in_buf->pos;
@@ -733,6 +738,7 @@ ngx_http_gzip_filter_add_data(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
 static ngx_int_t
 ngx_http_gzip_filter_get_buf(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
 {
+    ngx_chain_t           *cl;
     ngx_http_gzip_conf_t  *conf;
 
     if (ctx->zstream.avail_out) {
@@ -742,8 +748,12 @@ ngx_http_gzip_filter_get_buf(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
     conf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_filter_module);
 
     if (ctx->free) {
-        ctx->out_buf = ctx->free->buf;
-        ctx->free = ctx->free->next;
+
+        cl = ctx->free;
+        ctx->out_buf = cl->buf;
+        ctx->free = cl->next;
+
+        ngx_free_chain(r->pool, cl);
 
     } else if (ctx->bufs < conf->bufs.num) {
 
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 42b6afc..1a84d78 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -548,6 +548,13 @@ static ngx_command_t  ngx_http_proxy_commands[] = {
       offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_convert_head),
       NULL },
 
+    { ngx_string("proxy_cache_background_update"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_background_update),
+      NULL },
+
 #endif
 
     { ngx_string("proxy_temp_path"),
@@ -2863,6 +2870,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
     conf->upstream.cache_revalidate = NGX_CONF_UNSET;
     conf->upstream.cache_convert_head = NGX_CONF_UNSET;
+    conf->upstream.cache_background_update = NGX_CONF_UNSET;
 #endif
 
     conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
@@ -3168,6 +3176,9 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->upstream.cache_convert_head,
                               prev->upstream.cache_convert_head, 1);
 
+    ngx_conf_merge_value(conf->upstream.cache_background_update,
+                              prev->upstream.cache_background_update, 0);
+
 #endif
 
     if (conf->method == NULL) {
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index 6b2444c..a6f1fc8 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -917,7 +917,8 @@ ngx_http_rewrite_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     value[1].len--;
     value[1].data++;
 
-    v = ngx_http_add_variable(cf, &value[1], NGX_HTTP_VAR_CHANGEABLE);
+    v = ngx_http_add_variable(cf, &value[1],
+                              NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_WEAK);
     if (v == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -927,15 +928,7 @@ ngx_http_rewrite_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    if (v->get_handler == NULL
-        && ngx_strncasecmp(value[1].data, (u_char *) "http_", 5) != 0
-        && ngx_strncasecmp(value[1].data, (u_char *) "sent_http_", 10) != 0
-        && ngx_strncasecmp(value[1].data, (u_char *) "upstream_http_", 14) != 0
-        && ngx_strncasecmp(value[1].data, (u_char *) "cookie_", 7) != 0
-        && ngx_strncasecmp(value[1].data, (u_char *) "upstream_cookie_", 16)
-           != 0
-        && ngx_strncasecmp(value[1].data, (u_char *) "arg_", 4) != 0)
-    {
+    if (v->get_handler == NULL) {
         v->get_handler = ngx_http_rewrite_var;
         v->data = index;
     }
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index aa84a3d..288ba09 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -319,6 +319,13 @@ static ngx_command_t ngx_http_scgi_commands[] = {
       offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_revalidate),
       NULL },
 
+    { ngx_string("scgi_cache_background_update"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_background_update),
+      NULL },
+
 #endif
 
     { ngx_string("scgi_temp_path"),
@@ -1219,6 +1226,7 @@ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
     conf->upstream.cache_revalidate = NGX_CONF_UNSET;
+    conf->upstream.cache_background_update = NGX_CONF_UNSET;
 #endif
 
     conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
@@ -1506,6 +1514,9 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->upstream.cache_revalidate,
                               prev->upstream.cache_revalidate, 0);
 
+    ngx_conf_merge_value(conf->upstream.cache_background_update,
+                              prev->upstream.cache_background_update, 0);
+
 #endif
 
     ngx_conf_merge_value(conf->upstream.pass_request_headers,
diff --git a/src/http/modules/ngx_http_slice_filter_module.c b/src/http/modules/ngx_http_slice_filter_module.c
index 5e149b4..2005939 100644
--- a/src/http/modules/ngx_http_slice_filter_module.c
+++ b/src/http/modules/ngx_http_slice_filter_module.c
@@ -244,7 +244,10 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return rc;
     }
 
-    if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL, 0) != NGX_OK) {
+    if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL,
+                            NGX_HTTP_SUBREQUEST_CLONE)
+        != NGX_OK)
+    {
         return NGX_ERROR;
     }
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index b9c8dba..2ba64af 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -379,6 +379,13 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
       offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_revalidate),
       NULL },
 
+    { ngx_string("uwsgi_cache_background_update"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_background_update),
+      NULL },
+
 #endif
 
     { ngx_string("uwsgi_temp_path"),
@@ -1425,6 +1432,7 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
     conf->upstream.cache_revalidate = NGX_CONF_UNSET;
+    conf->upstream.cache_background_update = NGX_CONF_UNSET;
 #endif
 
     conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
@@ -1720,6 +1728,9 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->upstream.cache_revalidate,
                               prev->upstream.cache_revalidate, 0);
 
+    ngx_conf_merge_value(conf->upstream.cache_background_update,
+                              prev->upstream.cache_background_update, 0);
+
 #endif
 
     ngx_conf_merge_value(conf->upstream.pass_request_headers,
diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h
index 4075f3d..f9e9664 100644
--- a/src/http/ngx_http_cache.h
+++ b/src/http/ngx_http_cache.h
@@ -24,10 +24,10 @@
 #define NGX_HTTP_CACHE_SCARCE        8
 
 #define NGX_HTTP_CACHE_KEY_LEN       16
-#define NGX_HTTP_CACHE_ETAG_LEN      42
-#define NGX_HTTP_CACHE_VARY_LEN      42
+#define NGX_HTTP_CACHE_ETAG_LEN      128
+#define NGX_HTTP_CACHE_VARY_LEN      128
 
-#define NGX_HTTP_CACHE_VERSION       3
+#define NGX_HTTP_CACHE_VERSION       5
 
 
 typedef struct {
@@ -71,6 +71,8 @@ struct ngx_http_cache_s {
 
     ngx_file_uniq_t                  uniq;
     time_t                           valid_sec;
+    time_t                           updating_sec;
+    time_t                           error_sec;
     time_t                           last_modified;
     time_t                           date;
 
@@ -114,12 +116,18 @@ struct ngx_http_cache_s {
     unsigned                         purged:1;
     unsigned                         reading:1;
     unsigned                         secondary:1;
+    unsigned                         background:1;
+
+    unsigned                         stale_updating:1;
+    unsigned                         stale_error:1;
 };
 
 
 typedef struct {
     ngx_uint_t                       version;
     time_t                           valid_sec;
+    time_t                           updating_sec;
+    time_t                           error_sec;
     time_t                           last_modified;
     time_t                           date;
     uint32_t                         crc32;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 666d96f..9e12890 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -120,6 +120,14 @@ static ngx_conf_enum_t  ngx_http_core_lingering_close[] = {
 };
 
 
+static ngx_conf_enum_t  ngx_http_core_server_tokens[] = {
+    { ngx_string("off"), NGX_HTTP_SERVER_TOKENS_OFF },
+    { ngx_string("on"), NGX_HTTP_SERVER_TOKENS_ON },
+    { ngx_string("build"), NGX_HTTP_SERVER_TOKENS_BUILD },
+    { ngx_null_string, 0 }
+};
+
+
 static ngx_conf_enum_t  ngx_http_core_if_modified_since[] = {
     { ngx_string("off"), NGX_HTTP_IMS_OFF },
     { ngx_string("exact"), NGX_HTTP_IMS_EXACT },
@@ -599,11 +607,11 @@ static ngx_command_t  ngx_http_core_commands[] = {
       NULL },
 
     { ngx_string("server_tokens"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_enum_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_core_loc_conf_t, server_tokens),
-      NULL },
+      &ngx_http_core_server_tokens },
 
     { ngx_string("if_modified_since"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -2558,6 +2566,17 @@ ngx_http_subrequest(ngx_http_request_t *r,
 
     *psr = sr;
 
+    if (flags & NGX_HTTP_SUBREQUEST_CLONE) {
+        sr->method = r->method;
+        sr->method_name = r->method_name;
+        sr->loc_conf = r->loc_conf;
+        sr->valid_location = r->valid_location;
+        sr->phase_handler = r->phase_handler;
+        sr->write_event_handler = ngx_http_core_run_phases;
+
+        ngx_http_update_location_config(sr);
+    }
+
     return ngx_http_post_request(sr, NULL);
 }
 
@@ -3576,9 +3595,9 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
     clcf->log_not_found = NGX_CONF_UNSET;
     clcf->log_subrequest = NGX_CONF_UNSET;
     clcf->recursive_error_pages = NGX_CONF_UNSET;
-    clcf->server_tokens = NGX_CONF_UNSET;
     clcf->chunked_transfer_encoding = NGX_CONF_UNSET;
     clcf->etag = NGX_CONF_UNSET;
+    clcf->server_tokens = NGX_CONF_UNSET_UINT;
     clcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
     clcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
 
@@ -3842,11 +3861,13 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->log_subrequest, prev->log_subrequest, 0);
     ngx_conf_merge_value(conf->recursive_error_pages,
                               prev->recursive_error_pages, 0);
-    ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1);
     ngx_conf_merge_value(conf->chunked_transfer_encoding,
                               prev->chunked_transfer_encoding, 1);
     ngx_conf_merge_value(conf->etag, prev->etag, 1);
 
+    ngx_conf_merge_uint_value(conf->server_tokens, prev->server_tokens,
+                              NGX_HTTP_SERVER_TOKENS_ON);
+
     ngx_conf_merge_ptr_value(conf->open_file_cache,
                               prev->open_file_cache, NULL);
 
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 237cc5c..5018da0 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -55,6 +55,11 @@ typedef struct ngx_thread_pool_s  ngx_thread_pool_t;
 #define NGX_HTTP_KEEPALIVE_DISABLE_SAFARI  0x0008
 
 
+#define NGX_HTTP_SERVER_TOKENS_OFF      0
+#define NGX_HTTP_SERVER_TOKENS_ON       1
+#define NGX_HTTP_SERVER_TOKENS_BUILD    2
+
+
 typedef struct ngx_http_location_tree_node_s  ngx_http_location_tree_node_t;
 typedef struct ngx_http_core_loc_conf_s  ngx_http_core_loc_conf_t;
 
@@ -153,7 +158,8 @@ typedef struct {
 
     ngx_hash_t                 variables_hash;
 
-    ngx_array_t                variables;       /* ngx_http_variable_t */
+    ngx_array_t                variables;         /* ngx_http_variable_t */
+    ngx_array_t                prefix_variables;  /* ngx_http_variable_t */
     ngx_uint_t                 ncaptures;
 
     ngx_uint_t                 server_names_hash_max_size;
@@ -393,7 +399,7 @@ struct ngx_http_core_loc_conf_s {
     ngx_flag_t    log_not_found;           /* log_not_found */
     ngx_flag_t    log_subrequest;          /* log_subrequest */
     ngx_flag_t    recursive_error_pages;   /* recursive_error_pages */
-    ngx_flag_t    server_tokens;           /* server_tokens */
+    ngx_uint_t    server_tokens;           /* server_tokens */
     ngx_flag_t    chunked_transfer_encoding; /* chunked_transfer_encoding */
     ngx_flag_t    etag;                    /* etag */
 
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index a5a9300..8c75f95 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -601,6 +601,8 @@ ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c)
     c->buf->last += n;
 
     c->valid_sec = h->valid_sec;
+    c->updating_sec = h->updating_sec;
+    c->error_sec = h->error_sec;
     c->last_modified = h->last_modified;
     c->date = h->date;
     c->valid_msec = h->valid_msec;
@@ -632,6 +634,8 @@ ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c)
     now = ngx_time();
 
     if (c->valid_sec < now) {
+        c->stale_updating = c->valid_sec + c->updating_sec >= now;
+        c->stale_error = c->valid_sec + c->error_sec >= now;
 
         ngx_shmtx_lock(&cache->shpool->mutex);
 
@@ -1252,6 +1256,8 @@ ngx_http_file_cache_set_header(ngx_http_request_t *r, u_char *buf)
 
     h->version = NGX_HTTP_CACHE_VERSION;
     h->valid_sec = c->valid_sec;
+    h->updating_sec = c->updating_sec;
+    h->error_sec = c->error_sec;
     h->last_modified = c->last_modified;
     h->date = c->date;
     h->crc32 = c->crc32;
@@ -1513,6 +1519,8 @@ ngx_http_file_cache_update_header(ngx_http_request_t *r)
 
     h.version = NGX_HTTP_CACHE_VERSION;
     h.valid_sec = c->valid_sec;
+    h.updating_sec = c->updating_sec;
+    h.error_sec = c->error_sec;
     h.last_modified = c->last_modified;
     h.date = c->date;
     h.crc32 = c->crc32;
@@ -1680,7 +1688,7 @@ ngx_http_file_cache_cleanup(void *data)
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->file.log, 0,
                    "http file cache cleanup");
 
-    if (c->updating) {
+    if (c->updating && !c->background) {
         ngx_log_error(NGX_LOG_ALERT, c->file.log, 0,
                       "stalled cache updating, error:%ui", c->error);
     }
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index 88c8a61..ddae613 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -46,8 +46,9 @@ ngx_module_t  ngx_http_header_filter_module = {
 };
 
 
-static char ngx_http_server_string[] = "Server: nginx" CRLF;
-static char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF;
+static u_char ngx_http_server_string[] = "Server: nginx" CRLF;
+static u_char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF;
+static u_char ngx_http_server_build_string[] = "Server: " NGINX_VER_BUILD CRLF;
 
 
 static ngx_str_t ngx_http_status_lines[] = {
@@ -274,8 +275,15 @@ ngx_http_header_filter(ngx_http_request_t *r)
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     if (r->headers_out.server == NULL) {
-        len += clcf->server_tokens ? sizeof(ngx_http_server_full_string) - 1:
-                                     sizeof(ngx_http_server_string) - 1;
+        if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
+            len += sizeof(ngx_http_server_full_string) - 1;
+
+        } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) {
+            len += sizeof(ngx_http_server_build_string) - 1;
+
+        } else {
+            len += sizeof(ngx_http_server_string) - 1;
+        }
     }
 
     if (r->headers_out.date == NULL) {
@@ -436,12 +444,16 @@ ngx_http_header_filter(ngx_http_request_t *r)
     *b->last++ = CR; *b->last++ = LF;
 
     if (r->headers_out.server == NULL) {
-        if (clcf->server_tokens) {
-            p = (u_char *) ngx_http_server_full_string;
+        if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
+            p = ngx_http_server_full_string;
             len = sizeof(ngx_http_server_full_string) - 1;
 
+        } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) {
+            p = ngx_http_server_build_string;
+            len = sizeof(ngx_http_server_build_string) - 1;
+
         } else {
-            p = (u_char *) ngx_http_server_string;
+            p = ngx_http_server_string;
             len = sizeof(ngx_http_server_string) - 1;
         }
 
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 6ff7903..baf9704 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -884,6 +884,8 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 
     sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
 
+    c->ssl->buffer_size = sscf->buffer_size;
+
     if (sscf->ssl.ctx) {
         SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx);
 
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index cf9ee3c..4cda754 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -62,7 +62,9 @@
 /* unused                                  1 */
 #define NGX_HTTP_SUBREQUEST_IN_MEMORY      2
 #define NGX_HTTP_SUBREQUEST_WAITED         4
-#define NGX_HTTP_LOG_UNSAFE                8
+#define NGX_HTTP_SUBREQUEST_CLONE          8
+
+#define NGX_HTTP_LOG_UNSAFE                1
 
 
 #define NGX_HTTP_CONTINUE                  100
@@ -481,6 +483,7 @@ struct ngx_http_request_s {
 
 #if (NGX_HTTP_CACHE)
     unsigned                          cached:1;
+    unsigned                          cache_updater:1;
 #endif
 
 #if (NGX_HTTP_GZIP)
diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index 0641329..2f66484 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -835,6 +835,8 @@ ngx_http_test_expect(ngx_http_request_t *r)
 
     /* we assume that such small packet should be send successfully */
 
+    r->connection->error = 1;
+
     return NGX_ERROR;
 }
 
@@ -1085,6 +1087,7 @@ ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
 #if (NGX_DEBUG)
 
+#if 0
     for (cl = rb->bufs; cl; cl = cl->next) {
         ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
                        "http body old buf t:%d f:%d %p, pos %p, size: %z "
@@ -1095,6 +1098,7 @@ ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
                        cl->buf->file_pos,
                        cl->buf->file_last - cl->buf->file_pos);
     }
+#endif
 
     for (cl = in; cl; cl = cl->next) {
         ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index d4c39ff..9de0d15 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -25,6 +25,13 @@ static u_char ngx_http_error_full_tail[] =
 ;
 
 
+static u_char ngx_http_error_build_tail[] =
+"<hr><center>" NGINX_VER_BUILD "</center>" CRLF
+"</body>" CRLF
+"</html>" CRLF
+;
+
+
 static u_char ngx_http_error_tail[] =
 "<hr><center>nginx</center>" CRLF
 "</body>" CRLF
@@ -628,10 +635,14 @@ ngx_http_send_special_response(ngx_http_request_t *r,
     ngx_uint_t    msie_padding;
     ngx_chain_t   out[3];
 
-    if (clcf->server_tokens) {
+    if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
         len = sizeof(ngx_http_error_full_tail) - 1;
         tail = ngx_http_error_full_tail;
 
+    } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) {
+        len = sizeof(ngx_http_error_build_tail) - 1;
+        tail = ngx_http_error_build_tail;
+
     } else {
         len = sizeof(ngx_http_error_tail) - 1;
         tail = ngx_http_error_tail;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 74a7c64..04bfc72 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -17,6 +17,8 @@ static ngx_int_t ngx_http_upstream_cache_get(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_http_file_cache_t **cache);
 static ngx_int_t ngx_http_upstream_cache_send(ngx_http_request_t *r,
     ngx_http_upstream_t *u);
+static ngx_int_t ngx_http_upstream_cache_background_update(
+    ngx_http_request_t *r, ngx_http_upstream_t *u);
 static ngx_int_t ngx_http_upstream_cache_check_range(ngx_http_request_t *r,
     ngx_http_upstream_t *u);
 static ngx_int_t ngx_http_upstream_cache_status(ngx_http_request_t *r,
@@ -162,6 +164,10 @@ static ngx_int_t ngx_http_upstream_response_time_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_upstream_response_length_variable(
     ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_upstream_header_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 static char *ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy);
 static char *ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -413,6 +419,12 @@ static ngx_http_variable_t  ngx_http_upstream_vars[] = {
 
 #endif
 
+    { ngx_string("upstream_http_"), NULL, ngx_http_upstream_header_variable,
+      0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },
+
+    { ngx_string("upstream_cookie_"), NULL, ngx_http_upstream_cookie_variable,
+      0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },
+
     { ngx_null_string, NULL, NULL, 0, 0, 0 }
 };
 
@@ -568,6 +580,10 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
                 rc = NGX_DECLINED;
                 r->cached = 0;
             }
+
+            if (ngx_http_upstream_cache_background_update(r, u) != NGX_OK) {
+                rc = NGX_ERROR;
+            }
         }
 
         if (rc != NGX_DECLINED) {
@@ -859,9 +875,24 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     switch (rc) {
 
+    case NGX_HTTP_CACHE_STALE:
+
+        if (((u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING)
+             || c->stale_updating) && !r->cache_updater
+            && u->conf->cache_background_update)
+        {
+            r->cache->background = 1;
+            u->cache_status = rc;
+            rc = NGX_OK;
+        }
+
+        break;
+
     case NGX_HTTP_CACHE_UPDATING:
 
-        if (u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING) {
+        if (((u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING)
+             || c->stale_updating) && !r->cache_updater)
+        {
             u->cache_status = rc;
             rc = NGX_OK;
 
@@ -884,6 +915,9 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
     case NGX_HTTP_CACHE_STALE:
 
         c->valid_sec = 0;
+        c->updating_sec = 0;
+        c->error_sec = 0;
+
         u->buffer.start = NULL;
         u->cache_status = NGX_HTTP_CACHE_EXPIRED;
 
@@ -1030,6 +1064,30 @@ ngx_http_upstream_cache_send(ngx_http_request_t *r, ngx_http_upstream_t *u)
 }
 
 
+static ngx_int_t
+ngx_http_upstream_cache_background_update(ngx_http_request_t *r,
+    ngx_http_upstream_t *u)
+{
+    ngx_http_request_t  *sr;
+
+    if (!r->cached || !r->cache->background) {
+        return NGX_OK;
+    }
+
+    if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL,
+                            NGX_HTTP_SUBREQUEST_CLONE)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    sr->header_only = 1;
+    sr->cache_updater = 1;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_upstream_cache_check_range(ngx_http_request_t *r,
     ngx_http_upstream_t *u)
@@ -2330,7 +2388,7 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
 #if (NGX_HTTP_CACHE)
 
         if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
-            && (u->conf->cache_use_stale & un->mask))
+            && ((u->conf->cache_use_stale & un->mask) || r->cache->stale_error))
         {
             ngx_int_t  rc;
 
@@ -2354,14 +2412,17 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
         && u->cache_status == NGX_HTTP_CACHE_EXPIRED
         && u->conf->cache_revalidate)
     {
-        time_t     now, valid;
+        time_t     now, valid, updating, error;
         ngx_int_t  rc;
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "http upstream not modified");
 
         now = ngx_time();
+
         valid = r->cache->valid_sec;
+        updating = r->cache->updating_sec;
+        error = r->cache->error_sec;
 
         rc = u->reinit_request(r);
 
@@ -2375,6 +2436,8 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
         if (valid == 0) {
             valid = r->cache->valid_sec;
+            updating = r->cache->updating_sec;
+            error = r->cache->error_sec;
         }
 
         if (valid == 0) {
@@ -2387,6 +2450,9 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
         if (valid) {
             r->cache->valid_sec = valid;
+            r->cache->updating_sec = updating;
+            r->cache->error_sec = error;
+
             r->cache->date = now;
 
             ngx_http_file_cache_update_header(r);
@@ -4122,7 +4188,7 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
 #if (NGX_HTTP_CACHE)
 
         if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
-            && (u->conf->cache_use_stale & ft_type))
+            && ((u->conf->cache_use_stale & ft_type) || r->cache->stale_error))
         {
             ngx_int_t  rc;
 
@@ -4300,6 +4366,8 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
         u->buffer.last = u->buffer.pos;
     }
 
+    r->read_event_handler = ngx_http_block_reading;
+
     if (rc == NGX_DECLINED) {
         return;
     }
@@ -4497,32 +4565,76 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
         offset = 8;
     }
 
-    if (p == NULL) {
-        return NGX_OK;
-    }
+    if (p) {
+        n = 0;
 
-    n = 0;
+        for (p += offset; p < last; p++) {
+            if (*p == ',' || *p == ';' || *p == ' ') {
+                break;
+            }
 
-    for (p += offset; p < last; p++) {
-        if (*p == ',' || *p == ';' || *p == ' ') {
-            break;
+            if (*p >= '0' && *p <= '9') {
+                n = n * 10 + *p - '0';
+                continue;
+            }
+
+            u->cacheable = 0;
+            return NGX_OK;
         }
 
-        if (*p >= '0' && *p <= '9') {
-            n = n * 10 + *p - '0';
-            continue;
+        if (n == 0) {
+            u->cacheable = 0;
+            return NGX_OK;
         }
 
-        u->cacheable = 0;
-        return NGX_OK;
+        r->cache->valid_sec = ngx_time() + n;
     }
 
-    if (n == 0) {
-        u->cacheable = 0;
-        return NGX_OK;
+    p = ngx_strlcasestrn(start, last, (u_char *) "stale-while-revalidate=",
+                         23 - 1);
+
+    if (p) {
+        n = 0;
+
+        for (p += 23; p < last; p++) {
+            if (*p == ',' || *p == ';' || *p == ' ') {
+                break;
+            }
+
+            if (*p >= '0' && *p <= '9') {
+                n = n * 10 + *p - '0';
+                continue;
+            }
+
+            u->cacheable = 0;
+            return NGX_OK;
+        }
+
+        r->cache->updating_sec = n;
+        r->cache->error_sec = n;
     }
 
-    r->cache->valid_sec = ngx_time() + n;
+    p = ngx_strlcasestrn(start, last, (u_char *) "stale-if-error=", 15 - 1);
+
+    if (p) {
+        n = 0;
+
+        for (p += 15; p < last; p++) {
+            if (*p == ',' || *p == ';' || *p == ' ') {
+                break;
+            }
+
+            if (*p >= '0' && *p <= '9') {
+                n = n * 10 + *p - '0';
+                continue;
+            }
+
+            u->cacheable = 0;
+            return NGX_OK;
+        }
+
+        r->cache->error_sec = n;
+    }
     }
 #endif
 
@@ -5391,7 +5503,7 @@ ngx_http_upstream_response_length_variable(ngx_http_request_t *r,
 }
 
 
-ngx_int_t
+static ngx_int_t
 ngx_http_upstream_header_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
@@ -5406,7 +5518,7 @@ ngx_http_upstream_header_variable(ngx_http_request_t *r,
 }
 
 
-ngx_int_t
+static ngx_int_t
 ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 7390f2e..625889b 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -55,9 +55,6 @@
 
 
 typedef struct {
-    ngx_msec_t                       bl_time;
-    ngx_uint_t                       bl_state;
-
     ngx_uint_t                       status;
     ngx_msec_t                       response_time;
     ngx_msec_t                       connect_time;
@@ -151,7 +148,6 @@ typedef struct {
     ngx_msec_t                       connect_timeout;
     ngx_msec_t                       send_timeout;
     ngx_msec_t                       read_timeout;
-    ngx_msec_t                       timeout;
     ngx_msec_t                       next_upstream_timeout;
 
     size_t                           send_lowat;
@@ -206,6 +202,7 @@ typedef struct {
 
     ngx_flag_t                       cache_revalidate;
     ngx_flag_t                       cache_convert_head;
+    ngx_flag_t                       cache_background_update;
 
     ngx_array_t                     *cache_valid;
     ngx_array_t                     *cache_bypass;
@@ -390,9 +387,6 @@ struct ngx_http_upstream_s {
     unsigned                         request_sent:1;
     unsigned                         request_body_sent:1;
     unsigned                         header_sent:1;
-
-    NGX_COMPAT_BEGIN(1)
-    NGX_COMPAT_END
 };
 
 
@@ -409,11 +403,6 @@ typedef struct {
 } ngx_http_upstream_param_t;
 
 
-ngx_int_t ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-ngx_int_t ngx_http_upstream_header_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-
 ngx_int_t ngx_http_upstream_create(ngx_http_request_t *r);
 void ngx_http_upstream_init(ngx_http_request_t *r);
 ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf,
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 62006ba..6138819 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -11,6 +11,9 @@
 #include <nginx.h>
 
 
+static ngx_http_variable_t *ngx_http_add_prefix_variable(ngx_conf_t *cf,
+    ngx_str_t *name, ngx_uint_t flags);
+
 static ngx_int_t ngx_http_variable_request(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 #if 0
@@ -356,6 +359,18 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
       3, NGX_HTTP_VAR_NOCACHEABLE, 0 },
 #endif
 
+    { ngx_string("http_"), NULL, ngx_http_variable_unknown_header_in,
+      0, NGX_HTTP_VAR_PREFIX, 0 },
+
+    { ngx_string("sent_http_"), NULL, ngx_http_variable_unknown_header_out,
+      0, NGX_HTTP_VAR_PREFIX, 0 },
+
+    { ngx_string("cookie_"), NULL, ngx_http_variable_cookie,
+      0, NGX_HTTP_VAR_PREFIX, 0 },
+
+    { ngx_string("arg_"), NULL, ngx_http_variable_argument,
+      0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },
+
     { ngx_null_string, NULL, NULL, 0, 0, 0 }
 };
 
@@ -384,6 +399,10 @@ ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
         return NULL;
     }
 
+    if (flags & NGX_HTTP_VAR_PREFIX) {
+        return ngx_http_add_prefix_variable(cf, name, flags);
+    }
+
     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
 
     key = cmcf->variables_keys->keys.elts;
@@ -402,6 +421,8 @@ ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
             return NULL;
         }
 
+        v->flags &= flags | ~NGX_HTTP_VAR_WEAK;
+
         return v;
     }
 
@@ -440,6 +461,59 @@ ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
 }
 
 
+static ngx_http_variable_t *
+ngx_http_add_prefix_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
+{
+    ngx_uint_t                  i;
+    ngx_http_variable_t        *v;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+
+    v = cmcf->prefix_variables.elts;
+    for (i = 0; i < cmcf->prefix_variables.nelts; i++) {
+        if (name->len != v[i].name.len
+            || ngx_strncasecmp(name->data, v[i].name.data, name->len) != 0)
+        {
+            continue;
+        }
+
+        v = &v[i];
+
+        if (!(v->flags & NGX_HTTP_VAR_CHANGEABLE)) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "the duplicate \"%V\" variable", name);
+            return NULL;
+        }
+
+        v->flags &= flags | ~NGX_HTTP_VAR_WEAK;
+
+        return v;
+    }
+
+    v = ngx_array_push(&cmcf->prefix_variables);
+    if (v == NULL) {
+        return NULL;
+    }
+
+    v->name.len = name->len;
+    v->name.data = ngx_pnalloc(cf->pool, name->len);
+    if (v->name.data == NULL) {
+        return NULL;
+    }
+
+    ngx_strlow(v->name.data, name->data, name->len);
+
+    v->set_handler = NULL;
+    v->get_handler = NULL;
+    v->data = 0;
+    v->flags = flags;
+    v->index = 0;
+
+    return v;
+}
+
+
 ngx_int_t
 ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name)
 {
@@ -573,6 +647,8 @@ ngx_http_get_flushed_variable(ngx_http_request_t *r, ngx_uint_t index)
 ngx_http_variable_value_t *
 ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
 {
+    size_t                      len;
+    ngx_uint_t                  i, n;
     ngx_http_variable_t        *v;
     ngx_http_variable_value_t  *vv;
     ngx_http_core_main_conf_t  *cmcf;
@@ -610,64 +686,22 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
         return NULL;
     }
 
-    if (name->len >= 5 && ngx_strncmp(name->data, "http_", 5) == 0) {
+    len = 0;
 
-        if (ngx_http_variable_unknown_header_in(r, vv, (uintptr_t) name)
-            == NGX_OK)
+    v = cmcf->prefix_variables.elts;
+    n = cmcf->prefix_variables.nelts;
+
+    for (i = 0; i < cmcf->prefix_variables.nelts; i++) {
+        if (name->len >= v[i].name.len && name->len > len
+            && ngx_strncmp(name->data, v[i].name.data, v[i].name.len) == 0)
         {
-            return vv;
+            len = v[i].name.len;
+            n = i;
         }
-
-        return NULL;
     }
 
-    if (name->len >= 10 && ngx_strncmp(name->data, "sent_http_", 10) == 0) {
-
-        if (ngx_http_variable_unknown_header_out(r, vv, (uintptr_t) name)
-            == NGX_OK)
-        {
-            return vv;
-        }
-
-        return NULL;
-    }
-
-    if (name->len >= 14 && ngx_strncmp(name->data, "upstream_http_", 14) == 0) {
-
-        if (ngx_http_upstream_header_variable(r, vv, (uintptr_t) name)
-            == NGX_OK)
-        {
-            return vv;
-        }
-
-        return NULL;
-    }
-
-    if (name->len >= 7 && ngx_strncmp(name->data, "cookie_", 7) == 0) {
-
-        if (ngx_http_variable_cookie(r, vv, (uintptr_t) name) == NGX_OK) {
-            return vv;
-        }
-
-        return NULL;
-    }
-
-    if (name->len >= 16
-        && ngx_strncmp(name->data, "upstream_cookie_", 16) == 0)
-    {
-
-        if (ngx_http_upstream_cookie_variable(r, vv, (uintptr_t) name)
-            == NGX_OK)
-        {
-            return vv;
-        }
-
-        return NULL;
-    }
-
-    if (name->len >= 4 && ngx_strncmp(name->data, "arg_", 4) == 0) {
-
-        if (ngx_http_variable_argument(r, vv, (uintptr_t) name) == NGX_OK) {
+    if (n != cmcf->prefix_variables.nelts) {
+        if (v[n].get_handler(r, vv, (uintptr_t) name) == NGX_OK) {
             return vv;
         }
 
@@ -2502,7 +2536,6 @@ ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re, ngx_str_t *s)
 ngx_int_t
 ngx_http_variables_add_core_vars(ngx_conf_t *cf)
 {
-    ngx_int_t                   rc;
     ngx_http_variable_t        *cv, *v;
     ngx_http_core_main_conf_t  *cmcf;
 
@@ -2523,27 +2556,20 @@ ngx_http_variables_add_core_vars(ngx_conf_t *cf)
         return NGX_ERROR;
     }
 
+    if (ngx_array_init(&cmcf->prefix_variables, cf->pool, 8,
+                       sizeof(ngx_http_variable_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     for (cv = ngx_http_core_variables; cv->name.len; cv++) {
-        v = ngx_palloc(cf->pool, sizeof(ngx_http_variable_t));
+        v = ngx_http_add_variable(cf, &cv->name, cv->flags);
         if (v == NULL) {
             return NGX_ERROR;
         }
 
         *v = *cv;
-
-        rc = ngx_hash_add_key(cmcf->variables_keys, &v->name, v,
-                              NGX_HASH_READONLY_KEY);
-
-        if (rc == NGX_OK) {
-            continue;
-        }
-
-        if (rc == NGX_BUSY) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "conflicting variable name \"%V\"", &v->name);
-        }
-
-        return NGX_ERROR;
     }
 
     return NGX_OK;
@@ -2553,10 +2579,11 @@ ngx_http_variables_add_core_vars(ngx_conf_t *cf)
 ngx_int_t
 ngx_http_variables_init_vars(ngx_conf_t *cf)
 {
+    size_t                      len;
     ngx_uint_t                  i, n;
     ngx_hash_key_t             *key;
     ngx_hash_init_t             hash;
-    ngx_http_variable_t        *v, *av;
+    ngx_http_variable_t        *v, *av, *pv;
     ngx_http_core_main_conf_t  *cmcf;
 
     /* set the handlers for the indexed http variables */
@@ -2564,6 +2591,7 @@ ngx_http_variables_init_vars(ngx_conf_t *cf)
     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
 
     v = cmcf->variables.elts;
+    pv = cmcf->prefix_variables.elts;
     key = cmcf->variables_keys->keys.elts;
 
     for (i = 0; i < cmcf->variables.nelts; i++) {
@@ -2584,7 +2612,9 @@ ngx_http_variables_init_vars(ngx_conf_t *cf)
 
                 av->index = i;
 
-                if (av->get_handler == NULL) {
+                if (av->get_handler == NULL
+                    || (av->flags & NGX_HTTP_VAR_WEAK))
+                {
                     break;
                 }
 
@@ -2592,68 +2622,34 @@ ngx_http_variables_init_vars(ngx_conf_t *cf)
             }
         }
 
-        if (v[i].name.len >= 5
-            && ngx_strncmp(v[i].name.data, "http_", 5) == 0)
-        {
-            v[i].get_handler = ngx_http_variable_unknown_header_in;
-            v[i].data = (uintptr_t) &v[i].name;
+        len = 0;
+        av = NULL;
 
-            continue;
+        for (n = 0; n < cmcf->prefix_variables.nelts; n++) {
+            if (v[i].name.len >= pv[n].name.len && v[i].name.len > len
+                && ngx_strncmp(v[i].name.data, pv[n].name.data, pv[n].name.len)
+                   == 0)
+            {
+                av = &pv[n];
+                len = pv[n].name.len;
+            }
         }
 
-        if (v[i].name.len >= 10
-            && ngx_strncmp(v[i].name.data, "sent_http_", 10) == 0)
-        {
-            v[i].get_handler = ngx_http_variable_unknown_header_out;
+        if (av) {
+            v[i].get_handler = av->get_handler;
             v[i].data = (uintptr_t) &v[i].name;
+            v[i].flags = av->flags;
 
-            continue;
+            goto next;
         }
 
-        if (v[i].name.len >= 14
-            && ngx_strncmp(v[i].name.data, "upstream_http_", 14) == 0)
-        {
-            v[i].get_handler = ngx_http_upstream_header_variable;
-            v[i].data = (uintptr_t) &v[i].name;
-            v[i].flags = NGX_HTTP_VAR_NOCACHEABLE;
+        if (v[i].get_handler == NULL) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "unknown \"%V\" variable", &v[i].name);
 
-            continue;
+            return NGX_ERROR;
         }
 
-        if (v[i].name.len >= 7
-            && ngx_strncmp(v[i].name.data, "cookie_", 7) == 0)
-        {
-            v[i].get_handler = ngx_http_variable_cookie;
-            v[i].data = (uintptr_t) &v[i].name;
-
-            continue;
-        }
-
-        if (v[i].name.len >= 16
-            && ngx_strncmp(v[i].name.data, "upstream_cookie_", 16) == 0)
-        {
-            v[i].get_handler = ngx_http_upstream_cookie_variable;
-            v[i].data = (uintptr_t) &v[i].name;
-            v[i].flags = NGX_HTTP_VAR_NOCACHEABLE;
-
-            continue;
-        }
-
-        if (v[i].name.len >= 4
-            && ngx_strncmp(v[i].name.data, "arg_", 4) == 0)
-        {
-            v[i].get_handler = ngx_http_variable_argument;
-            v[i].data = (uintptr_t) &v[i].name;
-            v[i].flags = NGX_HTTP_VAR_NOCACHEABLE;
-
-            continue;
-        }
-
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "unknown \"%V\" variable", &v[i].name);
-
-        return NGX_ERROR;
-
     next:
         continue;
     }
diff --git a/src/http/ngx_http_variables.h b/src/http/ngx_http_variables.h
index 829fab3..df337de 100644
--- a/src/http/ngx_http_variables.h
+++ b/src/http/ngx_http_variables.h
@@ -30,6 +30,8 @@ typedef ngx_int_t (*ngx_http_get_variable_pt) (ngx_http_request_t *r,
 #define NGX_HTTP_VAR_NOCACHEABLE  2
 #define NGX_HTTP_VAR_INDEXED      4
 #define NGX_HTTP_VAR_NOHASH       8
+#define NGX_HTTP_VAR_WEAK         16
+#define NGX_HTTP_VAR_PREFIX       32
 
 
 struct ngx_http_variable_s {
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index f2f0d1e..42fa0c5 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -148,6 +148,10 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     static size_t nginx_ver_len = ngx_http_v2_literal_size(NGINX_VER);
     static u_char nginx_ver[ngx_http_v2_literal_size(NGINX_VER)];
 
+    static size_t nginx_ver_build_len =
+                                  ngx_http_v2_literal_size(NGINX_VER_BUILD);
+    static u_char nginx_ver_build[ngx_http_v2_literal_size(NGINX_VER_BUILD)];
+
     if (!r->stream) {
         return ngx_http_next_header_filter(r);
     }
@@ -232,7 +236,16 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     if (r->headers_out.server == NULL) {
-        len += 1 + (clcf->server_tokens ? nginx_ver_len : sizeof(nginx));
+
+        if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
+            len += 1 + nginx_ver_len;
+
+        } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) {
+            len += 1 + nginx_ver_build_len;
+
+        } else {
+            len += 1 + sizeof(nginx);
+        }
     }
 
     if (r->headers_out.date == NULL) {
@@ -420,13 +433,25 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     }
 
     if (r->headers_out.server == NULL) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-                       "http2 output header: \"server: %s\"",
-                       clcf->server_tokens ? NGINX_VER : "nginx");
+
+        if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                           "http2 output header: \"server: %s\"",
+                           NGINX_VER);
+
+        } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                           "http2 output header: \"server: %s\"",
+                           NGINX_VER_BUILD);
+
+        } else {
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                           "http2 output header: \"server: nginx\"");
+        }
 
         *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
 
-        if (clcf->server_tokens) {
+        if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
             if (nginx_ver[0] == '\0') {
                 p = ngx_http_v2_write_value(nginx_ver, (u_char *) NGINX_VER,
                                             sizeof(NGINX_VER) - 1, tmp);
@@ -435,6 +460,16 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 
             pos = ngx_cpymem(pos, nginx_ver, nginx_ver_len);
 
+        } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) {
+            if (nginx_ver_build[0] == '\0') {
+                p = ngx_http_v2_write_value(nginx_ver_build,
+                                            (u_char *) NGINX_VER_BUILD,
+                                            sizeof(NGINX_VER_BUILD) - 1, tmp);
+                nginx_ver_build_len = p - nginx_ver_build;
+            }
+
+            pos = ngx_cpymem(pos, nginx_ver_build, nginx_ver_build_len);
+
         } else {
             pos = ngx_cpymem(pos, nginx, sizeof(nginx));
         }
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 9e4169c..814e3b9 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -153,7 +153,8 @@ typedef struct {
 
     ngx_hash_t                     variables_hash;
 
-    ngx_array_t                    variables;   /* ngx_stream_variable_t */
+    ngx_array_t                    variables;        /* ngx_stream_variable_t */
+    ngx_array_t                    prefix_variables; /* ngx_stream_variable_t */
     ngx_uint_t                     ncaptures;
 
     ngx_uint_t                     variables_hash_max_size;
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
index 9dc93ee..5d15f3a 100644
--- a/src/stream/ngx_stream_variables.c
+++ b/src/stream/ngx_stream_variables.c
@@ -10,6 +10,8 @@
 #include <ngx_stream.h>
 #include <nginx.h>
 
+static ngx_stream_variable_t *ngx_stream_add_prefix_variable(ngx_conf_t *cf,
+    ngx_str_t *name, ngx_uint_t flags);
 
 static ngx_int_t ngx_stream_variable_binary_remote_addr(
     ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
@@ -137,6 +139,10 @@ ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
         return NULL;
     }
 
+    if (flags & NGX_STREAM_VAR_PREFIX) {
+        return ngx_stream_add_prefix_variable(cf, name, flags);
+    }
+
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
     key = cmcf->variables_keys->keys.elts;
@@ -155,6 +161,8 @@ ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
             return NULL;
         }
 
+        v->flags &= flags | ~NGX_STREAM_VAR_WEAK;
+
         return v;
     }
 
@@ -193,6 +201,60 @@ ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
 }
 
 
+static ngx_stream_variable_t *
+ngx_stream_add_prefix_variable(ngx_conf_t *cf, ngx_str_t *name,
+    ngx_uint_t flags)
+{
+    ngx_uint_t                    i;
+    ngx_stream_variable_t        *v;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    v = cmcf->prefix_variables.elts;
+    for (i = 0; i < cmcf->prefix_variables.nelts; i++) {
+        if (name->len != v[i].name.len
+            || ngx_strncasecmp(name->data, v[i].name.data, name->len) != 0)
+        {
+            continue;
+        }
+
+        v = &v[i];
+
+        if (!(v->flags & NGX_STREAM_VAR_CHANGEABLE)) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "the duplicate \"%V\" variable", name);
+            return NULL;
+        }
+
+        v->flags &= flags | ~NGX_STREAM_VAR_WEAK;
+
+        return v;
+    }
+
+    v = ngx_array_push(&cmcf->prefix_variables);
+    if (v == NULL) {
+        return NULL;
+    }
+
+    v->name.len = name->len;
+    v->name.data = ngx_pnalloc(cf->pool, name->len);
+    if (v->name.data == NULL) {
+        return NULL;
+    }
+
+    ngx_strlow(v->name.data, name->data, name->len);
+
+    v->set_handler = NULL;
+    v->get_handler = NULL;
+    v->data = 0;
+    v->flags = flags;
+    v->index = 0;
+
+    return v;
+}
+
+
 ngx_int_t
 ngx_stream_get_variable_index(ngx_conf_t *cf, ngx_str_t *name)
 {
@@ -327,6 +389,8 @@ ngx_stream_variable_value_t *
 ngx_stream_get_variable(ngx_stream_session_t *s, ngx_str_t *name,
     ngx_uint_t key)
 {
+    size_t                        len;
+    ngx_uint_t                    i, n;
     ngx_stream_variable_t        *v;
     ngx_stream_variable_value_t  *vv;
     ngx_stream_core_main_conf_t  *cmcf;
@@ -365,6 +429,28 @@ ngx_stream_get_variable(ngx_stream_session_t *s, ngx_str_t *name,
         return NULL;
     }
 
+    len = 0;
+
+    v = cmcf->prefix_variables.elts;
+    n = cmcf->prefix_variables.nelts;
+
+    for (i = 0; i < cmcf->prefix_variables.nelts; i++) {
+        if (name->len >= v[i].name.len && name->len > len
+            && ngx_strncmp(name->data, v[i].name.data, v[i].name.len) == 0)
+        {
+            len = v[i].name.len;
+            n = i;
+        }
+    }
+
+    if (n != cmcf->prefix_variables.nelts) {
+        if (v[n].get_handler(s, vv, (uintptr_t) name) == NGX_OK) {
+            return vv;
+        }
+
+        return NULL;
+    }
+
     vv->not_found = 1;
 
     return vv;
@@ -1000,7 +1086,6 @@ ngx_stream_regex_exec(ngx_stream_session_t *s, ngx_stream_regex_t *re,
 ngx_int_t
 ngx_stream_variables_add_core_vars(ngx_conf_t *cf)
 {
-    ngx_int_t                     rc;
     ngx_stream_variable_t        *cv, *v;
     ngx_stream_core_main_conf_t  *cmcf;
 
@@ -1021,27 +1106,20 @@ ngx_stream_variables_add_core_vars(ngx_conf_t *cf)
         return NGX_ERROR;
     }
 
+    if (ngx_array_init(&cmcf->prefix_variables, cf->pool, 8,
+                       sizeof(ngx_stream_variable_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     for (cv = ngx_stream_core_variables; cv->name.len; cv++) {
-        v = ngx_palloc(cf->pool, sizeof(ngx_stream_variable_t));
+        v = ngx_stream_add_variable(cf, &cv->name, cv->flags);
         if (v == NULL) {
             return NGX_ERROR;
         }
 
         *v = *cv;
-
-        rc = ngx_hash_add_key(cmcf->variables_keys, &v->name, v,
-                              NGX_HASH_READONLY_KEY);
-
-        if (rc == NGX_OK) {
-            continue;
-        }
-
-        if (rc == NGX_BUSY) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "conflicting variable name \"%V\"", &v->name);
-        }
-
-        return NGX_ERROR;
     }
 
     return NGX_OK;
@@ -1051,10 +1129,11 @@ ngx_stream_variables_add_core_vars(ngx_conf_t *cf)
 ngx_int_t
 ngx_stream_variables_init_vars(ngx_conf_t *cf)
 {
+    size_t                        len;
     ngx_uint_t                    i, n;
     ngx_hash_key_t               *key;
     ngx_hash_init_t               hash;
-    ngx_stream_variable_t        *v, *av;
+    ngx_stream_variable_t        *v, *av, *pv;
     ngx_stream_core_main_conf_t  *cmcf;
 
     /* set the handlers for the indexed stream variables */
@@ -1062,6 +1141,7 @@ ngx_stream_variables_init_vars(ngx_conf_t *cf)
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
     v = cmcf->variables.elts;
+    pv = cmcf->prefix_variables.elts;
     key = cmcf->variables_keys->keys.elts;
 
     for (i = 0; i < cmcf->variables.nelts; i++) {
@@ -1082,7 +1162,9 @@ ngx_stream_variables_init_vars(ngx_conf_t *cf)
 
                 av->index = i;
 
-                if (av->get_handler == NULL) {
+                if (av->get_handler == NULL
+                    || (av->flags & NGX_STREAM_VAR_WEAK))
+                {
                     break;
                 }
 
@@ -1090,10 +1172,32 @@ ngx_stream_variables_init_vars(ngx_conf_t *cf)
             }
         }
 
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "unknown \"%V\" variable", &v[i].name);
+        len = 0;
+        av = NULL;
 
-        return NGX_ERROR;
+        for (n = 0; n < cmcf->prefix_variables.nelts; n++) {
+            if (v[i].name.len >= pv[n].name.len && v[i].name.len > len
+                && ngx_strncmp(v[i].name.data, pv[n].name.data, pv[n].name.len)
+                   == 0)
+            {
+                av = &pv[n];
+                len = pv[n].name.len;
+            }
+        }
+
+        if (av) {
+            v[i].get_handler = av->get_handler;
+            v[i].data = (uintptr_t) &v[i].name;
+            v[i].flags = av->flags;
+
+            goto next;
+         }
+
+        if (v[i].get_handler == NULL) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "unknown \"%V\" variable", &v[i].name);
+            return NGX_ERROR;
+        }
 
     next:
         continue;
diff --git a/src/stream/ngx_stream_variables.h b/src/stream/ngx_stream_variables.h
index e4151e2..8155111 100644
--- a/src/stream/ngx_stream_variables.h
+++ b/src/stream/ngx_stream_variables.h
@@ -30,6 +30,8 @@ typedef ngx_int_t (*ngx_stream_get_variable_pt) (ngx_stream_session_t *s,
 #define NGX_STREAM_VAR_NOCACHEABLE  2
 #define NGX_STREAM_VAR_INDEXED      4
 #define NGX_STREAM_VAR_NOHASH       8
+#define NGX_STREAM_VAR_WEAK         16
+#define NGX_STREAM_VAR_PREFIX       32
 
 
 struct ngx_stream_variable_s {

From daea5d1e30eac120f3749752fabea6eb1c95a9a9 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 22 Mar 2017 10:40:51 +0200
Subject: [PATCH 166/600] New upstream version 1.11.11

---
 CHANGES                                       |   22 +
 CHANGES.ru                                    |   22 +
 auto/modules                                  | 1651 ++++++++---------
 auto/options                                  |   13 -
 contrib/vim/syntax/nginx.vim                  | 1604 ++++++++++++++--
 src/core/nginx.c                              |    9 +
 src/core/nginx.h                              |    4 +-
 src/core/ngx_cycle.c                          |   53 +
 src/core/ngx_cycle.h                          |    2 +
 src/core/ngx_parse.c                          |   10 +
 src/core/ngx_rbtree.c                         |   33 +-
 src/core/ngx_rbtree.h                         |    2 +
 src/core/ngx_resolver.c                       |    8 +-
 src/event/modules/ngx_devpoll_module.c        |    4 +-
 src/event/modules/ngx_epoll_module.c          |    2 +-
 src/event/modules/ngx_eventport_module.c      |    4 +-
 src/event/modules/ngx_kqueue_module.c         |    2 +-
 src/event/modules/ngx_poll_module.c           |    4 +-
 src/event/modules/ngx_select_module.c         |    4 +-
 src/event/modules/ngx_win32_select_module.c   |    4 +-
 src/event/ngx_event.c                         |   30 +-
 src/event/ngx_event_timer.c                   |   44 +-
 src/event/ngx_event_timer.h                   |    2 +-
 .../modules/ngx_http_charset_filter_module.c  |    2 +-
 .../modules/ngx_http_gzip_static_module.c     |    2 +-
 src/http/modules/ngx_http_log_module.c        |   15 +-
 src/http/modules/ngx_http_static_module.c     |    2 +-
 .../modules/ngx_http_xslt_filter_module.c     |    2 +-
 src/http/ngx_http_core_module.c               |    1 +
 src/http/ngx_http_request.c                   |   87 +-
 src/http/ngx_http_request.h                   |    5 +-
 src/http/ngx_http_upstream.c                  |    4 +-
 src/mail/ngx_mail_pop3_module.c               |   16 +
 src/os/unix/ngx_process.c                     |    2 +-
 src/os/unix/ngx_process_cycle.c               |    8 +-
 src/stream/ngx_stream_log_module.c            |   15 +-
 36 files changed, 2563 insertions(+), 1131 deletions(-)

diff --git a/CHANGES b/CHANGES
index 226a157..cd85f24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,26 @@
 
+Changes with nginx 1.11.11                                       21 Mar 2017
+
+    *) Feature: the "worker_shutdown_timeout" directive.
+
+    *) Feature: vim syntax highlighting scripts improvements.
+       Thanks to Wei-Ko Kao.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if the
+       $limit_rate variable was set to an empty string.
+
+    *) Bugfix: the "proxy_cache_background_update",
+       "fastcgi_cache_background_update", "scgi_cache_background_update",
+       and "uwsgi_cache_background_update" directives might work incorrectly
+       if the "if" directive was used.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if
+       number of large_client_header_buffers in a virtual server was
+       different from the one in the default server.
+
+    *) Bugfix: in the mail proxy server.
+
+
 Changes with nginx 1.11.10                                       14 Feb 2017
 
     *) Change: cache header format has been changed, previously cached
diff --git a/CHANGES.ru b/CHANGES.ru
index d1a1dd3..b140735 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,26 @@
 
+Изменения в nginx 1.11.11                                         21.03.2017
+
+    *) Добавление: директива worker_shutdown_timeout.
+
+    *) Добавление: улучшения в скриптах подсветки синтаксиса для vim.
+       Спасибо Wei-Ko Kao.
+
+    *) Исправление: при попытке установить переменную $limit_rate в пустую
+       строку в рабочем процессе мог произойти segmentation fault.
+
+    *) Исправление: директивы proxy_cache_background_update,
+       fastcgi_cache_background_update, scgi_cache_background_update и
+       uwsgi_cache_background_update могли работать некорректно, если
+       использовалась директива if.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если количество large_client_header_buffers в виртуальном сервере
+       отличалось от такового в сервере по умолчанию.
+
+    *) Исправление: в почтовом прокси-сервере.
+
+
 Изменения в nginx 1.11.10                                         14.02.2017
 
     *) Изменение: формат заголовка кэша был изменен, ранее закэшированные
diff --git a/auto/modules b/auto/modules
index c664fe3..be3561e 100644
--- a/auto/modules
+++ b/auto/modules
@@ -56,832 +56,829 @@ if [ $NGX_TEST_BUILD_SOLARIS_SENDFILEV = YES ]; then
 fi
 
 
-HTTP_MODULES=
-HTTP_DEPS=
-HTTP_INCS=
-
-ngx_module_type=HTTP
-
-if :; then
-    ngx_module_name="ngx_http_module \
-                     ngx_http_core_module \
-                     ngx_http_log_module \
-                     ngx_http_upstream_module"
-    ngx_module_incs="src/http src/http/modules"
-    ngx_module_deps="src/http/ngx_http.h \
-                     src/http/ngx_http_request.h \
-                     src/http/ngx_http_config.h \
-                     src/http/ngx_http_core_module.h \
-                     src/http/ngx_http_cache.h \
-                     src/http/ngx_http_variables.h \
-                     src/http/ngx_http_script.h \
-                     src/http/ngx_http_upstream.h \
-                     src/http/ngx_http_upstream_round_robin.h"
-    ngx_module_srcs="src/http/ngx_http.c \
-                     src/http/ngx_http_core_module.c \
-                     src/http/ngx_http_special_response.c \
-                     src/http/ngx_http_request.c \
-                     src/http/ngx_http_parse.c \
-                     src/http/modules/ngx_http_log_module.c \
-                     src/http/ngx_http_request_body.c \
-                     src/http/ngx_http_variables.c \
-                     src/http/ngx_http_script.c \
-                     src/http/ngx_http_upstream.c \
-                     src/http/ngx_http_upstream_round_robin.c"
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-
-if [ $HTTP != YES ]; then
-    have=NGX_CRYPT . auto/nohave
-    CRYPT_LIB=
-fi
-
-
-if [ $HTTP_CACHE = YES ]; then
-    have=NGX_HTTP_CACHE . auto/have
-    HTTP_SRCS="$HTTP_SRCS $HTTP_FILE_CACHE_SRCS"
-fi
-
-
-if [ $HTTP_SSI = YES ]; then
-    HTTP_POSTPONE=YES
-fi
-
-
-if [ $HTTP_SLICE = YES ]; then
-    HTTP_POSTPONE=YES
-fi
-
-
-if [ $HTTP_ADDITION = YES ]; then
-    HTTP_POSTPONE=YES
-fi
-
-
-# the module order is important
-#     ngx_http_static_module
-#     ngx_http_gzip_static_module
-#     ngx_http_dav_module
-#     ngx_http_autoindex_module
-#     ngx_http_index_module
-#     ngx_http_random_index_module
-#
-#     ngx_http_access_module
-#     ngx_http_realip_module
-#
-#
-# the filter order is important
-#     ngx_http_write_filter
-#     ngx_http_header_filter
-#     ngx_http_chunked_filter
-#     ngx_http_v2_filter
-#     ngx_http_range_header_filter
-#     ngx_http_gzip_filter
-#     ngx_http_postpone_filter
-#     ngx_http_ssi_filter
-#     ngx_http_charset_filter
-#         ngx_http_xslt_filter
-#         ngx_http_image_filter
-#         ngx_http_sub_filter
-#         ngx_http_addition_filter
-#         ngx_http_gunzip_filter
-#         ngx_http_userid_filter
-#         ngx_http_headers_filter
-#     ngx_http_copy_filter
-#     ngx_http_range_body_filter
-#     ngx_http_not_modified_filter
-#     ngx_http_slice_filter
-
-ngx_module_type=HTTP_FILTER
-HTTP_FILTER_MODULES=
-
-ngx_module_order="ngx_http_static_module \
-                  ngx_http_gzip_static_module \
-                  ngx_http_dav_module \
-                  ngx_http_autoindex_module \
-                  ngx_http_index_module \
-                  ngx_http_random_index_module \
-                  ngx_http_access_module \
-                  ngx_http_realip_module \
-                  ngx_http_write_filter_module \
-                  ngx_http_header_filter_module \
-                  ngx_http_chunked_filter_module \
-                  ngx_http_v2_filter_module \
-                  ngx_http_range_header_filter_module \
-                  ngx_http_gzip_filter_module \
-                  ngx_http_postpone_filter_module \
-                  ngx_http_ssi_filter_module \
-                  ngx_http_charset_filter_module \
-                  ngx_http_xslt_filter_module \
-                  ngx_http_image_filter_module \
-                  ngx_http_sub_filter_module \
-                  ngx_http_addition_filter_module \
-                  ngx_http_gunzip_filter_module \
-                  ngx_http_userid_filter_module \
-                  ngx_http_headers_filter_module \
-                  ngx_http_copy_filter_module \
-                  ngx_http_range_body_filter_module \
-                  ngx_http_not_modified_filter_module \
-                  ngx_http_slice_filter_module"
-
-if :; then
-    ngx_module_name=ngx_http_write_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/ngx_http_write_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-if :; then
-    ngx_module_name=ngx_http_header_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/ngx_http_header_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-if :; then
-    ngx_module_name=ngx_http_chunked_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_chunked_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-if [ $HTTP_V2 = YES ]; then
-    ngx_module_name=ngx_http_v2_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/v2/ngx_http_v2_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_V2
-
-    . auto/module
-fi
-
-if :; then
-    ngx_module_name=ngx_http_range_header_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_range_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-if [ $HTTP_GZIP = YES ]; then
-    have=NGX_HTTP_GZIP . auto/have
-    USE_ZLIB=YES
-
-    ngx_module_name=ngx_http_gzip_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_gzip_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_GZIP
-
-    . auto/module
-fi
-
-if [ $HTTP_POSTPONE = YES ]; then
-    ngx_module_name=ngx_http_postpone_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/ngx_http_postpone_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_POSTPONE
-
-    . auto/module
-fi
-
-if [ $HTTP_SSI = YES ]; then
-    have=NGX_HTTP_SSI . auto/have
-
-    ngx_module_name=ngx_http_ssi_filter_module
-    ngx_module_incs=
-    ngx_module_deps=src/http/modules/ngx_http_ssi_filter_module.h
-    ngx_module_srcs=src/http/modules/ngx_http_ssi_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_SSI
-
-    . auto/module
-fi
-
-if [ $HTTP_CHARSET = YES ]; then
-    ngx_module_name=ngx_http_charset_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_charset_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_CHARSET
-
-    . auto/module
-fi
-
-if [ $HTTP_XSLT != NO ]; then
-    ngx_module_name=ngx_http_xslt_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_xslt_filter_module.c
-    ngx_module_libs=LIBXSLT
-    ngx_module_link=$HTTP_XSLT
-
-    . auto/module
-fi
-
-if [ $HTTP_IMAGE_FILTER != NO ]; then
-    ngx_module_name=ngx_http_image_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_image_filter_module.c
-    ngx_module_libs=LIBGD
-    ngx_module_link=$HTTP_IMAGE_FILTER
-
-    . auto/module
-fi
-
-if [ $HTTP_SUB = YES ]; then
-    ngx_module_name=ngx_http_sub_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_sub_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_SUB
-
-    . auto/module
-fi
-
-if [ $HTTP_ADDITION = YES ]; then
-    ngx_module_name=ngx_http_addition_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_addition_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_ADDITION
-
-    . auto/module
-fi
-
-if [ $HTTP_GUNZIP = YES ]; then
-    have=NGX_HTTP_GZIP . auto/have
-    USE_ZLIB=YES
-
-    ngx_module_name=ngx_http_gunzip_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_gunzip_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_GUNZIP
-
-    . auto/module
-fi
-
-if [ $HTTP_USERID = YES ]; then
-    ngx_module_name=ngx_http_userid_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_userid_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_USERID
-
-    . auto/module
-fi
-
-if :; then
-    ngx_module_name=ngx_http_headers_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_headers_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-
-ngx_module_type=HTTP_INIT_FILTER
-HTTP_INIT_FILTER_MODULES=
-
-if :; then
-    ngx_module_name=ngx_http_copy_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/ngx_http_copy_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-if :; then
-    ngx_module_name=ngx_http_range_body_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-if :; then
-    ngx_module_name=ngx_http_not_modified_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_not_modified_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-if [ $HTTP_SLICE = YES ]; then
-    ngx_module_name=ngx_http_slice_filter_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_slice_filter_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_SLICE
-
-    . auto/module
-fi
-
-
-ngx_module_type=HTTP
-
-if [ $HTTP_V2 = YES ]; then
-    have=NGX_HTTP_V2 . auto/have
-
-    ngx_module_name=ngx_http_v2_module
-    ngx_module_incs=src/http/v2
-    ngx_module_deps="src/http/v2/ngx_http_v2.h src/http/v2/ngx_http_v2_module.h"
-    ngx_module_srcs="src/http/v2/ngx_http_v2.c \
-                     src/http/v2/ngx_http_v2_table.c \
-                     src/http/v2/ngx_http_v2_huff_decode.c \
-                     src/http/v2/ngx_http_v2_huff_encode.c \
-                     src/http/v2/ngx_http_v2_module.c"
-    ngx_module_libs=
-    ngx_module_link=$HTTP_V2
-
-    . auto/module
-fi
-
-if :; then
-    ngx_module_name=ngx_http_static_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_static_module.c
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-if [ $HTTP_GZIP_STATIC = YES ]; then
-    have=NGX_HTTP_GZIP . auto/have
-
-    ngx_module_name=ngx_http_gzip_static_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_gzip_static_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_GZIP_STATIC
-
-    . auto/module
-fi
-
-if [ $HTTP_DAV = YES ]; then
-    have=NGX_HTTP_DAV . auto/have
-
-    ngx_module_name=ngx_http_dav_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_dav_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_DAV
-
-    . auto/module
-fi
-
-if [ $HTTP_AUTOINDEX = YES ]; then
-    ngx_module_name=ngx_http_autoindex_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_autoindex_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_AUTOINDEX
-
-    . auto/module
-fi
-
-if :; then
-    ngx_module_name=ngx_http_index_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_index_module.c
-    ngx_module_libs=
-    ngx_module_link=YES
-
-    . auto/module
-fi
-
-if [ $HTTP_RANDOM_INDEX = YES ]; then
-    ngx_module_name=ngx_http_random_index_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_random_index_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_RANDOM_INDEX
-
-    . auto/module
-fi
-
-if [ $HTTP_AUTH_REQUEST = YES ]; then
-    ngx_module_name=ngx_http_auth_request_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_auth_request_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_AUTH_REQUEST
-
-    . auto/module
-fi
-
-if [ $HTTP_AUTH_BASIC = YES ]; then
-    have=NGX_CRYPT . auto/have
-
-    ngx_module_name=ngx_http_auth_basic_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_auth_basic_module.c
-    ngx_module_libs=$CRYPT_LIB
-    ngx_module_link=$HTTP_AUTH_BASIC
-
-    . auto/module
-fi
-
-if [ $HTTP_ACCESS = YES ]; then
-    ngx_module_name=ngx_http_access_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_access_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_ACCESS
-
-    . auto/module
-fi
-
-if [ $HTTP_LIMIT_CONN = YES ]; then
-    ngx_module_name=ngx_http_limit_conn_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_limit_conn_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_LIMIT_CONN
-
-    . auto/module
-fi
-
-if [ $HTTP_LIMIT_REQ = YES ]; then
-    ngx_module_name=ngx_http_limit_req_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_limit_req_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_LIMIT_REQ
-
-    . auto/module
-fi
-
-if [ $HTTP_REALIP = YES ]; then
-    have=NGX_HTTP_REALIP . auto/have
-    have=NGX_HTTP_X_FORWARDED_FOR . auto/have
-
-    ngx_module_name=ngx_http_realip_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_realip_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_REALIP
-
-    . auto/module
-fi
-
-if [ $HTTP_STATUS = YES ]; then
-    ngx_module_name=ngx_http_status_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_status_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_STATUS
-
-    . auto/module
-fi
-
-if [ $HTTP_GEO = YES ]; then
-    have=NGX_HTTP_X_FORWARDED_FOR . auto/have
-
-    ngx_module_name=ngx_http_geo_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_geo_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_GEO
-
-    . auto/module
-fi
-
-if [ $HTTP_GEOIP != NO ]; then
-    have=NGX_HTTP_X_FORWARDED_FOR . auto/have
-
-    ngx_module_name=ngx_http_geoip_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_geoip_module.c
-    ngx_module_libs=GEOIP
-    ngx_module_link=$HTTP_GEOIP
-
-    . auto/module
-fi
-
-if [ $HTTP_MAP = YES ]; then
-    ngx_module_name=ngx_http_map_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_map_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_MAP
-
-    . auto/module
-fi
-
-if [ $HTTP_SPLIT_CLIENTS = YES ]; then
-    ngx_module_name=ngx_http_split_clients_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_split_clients_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_SPLIT_CLIENTS
-
-    . auto/module
-fi
-
-if [ $HTTP_REFERER = YES ]; then
-    ngx_module_name=ngx_http_referer_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_referer_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_REFERER
-
-    . auto/module
-fi
-
-if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then
-    USE_PCRE=YES
-
-    ngx_module_name=ngx_http_rewrite_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_rewrite_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_REWRITE
-
-    . auto/module
-fi
-
-if [ $HTTP_SSL = YES ]; then
-    USE_OPENSSL=YES
-    have=NGX_HTTP_SSL . auto/have
-
-    ngx_module_name=ngx_http_ssl_module
-    ngx_module_incs=
-    ngx_module_deps=src/http/modules/ngx_http_ssl_module.h
-    ngx_module_srcs=src/http/modules/ngx_http_ssl_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_SSL
-
-    . auto/module
-fi
-
-if [ $HTTP_PROXY = YES ]; then
-    have=NGX_HTTP_X_FORWARDED_FOR . auto/have
-
-    ngx_module_name=ngx_http_proxy_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_proxy_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_PROXY
-
-    . auto/module
-fi
-
-if [ $HTTP_FASTCGI = YES ]; then
-    ngx_module_name=ngx_http_fastcgi_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_fastcgi_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_FASTCGI
-
-    . auto/module
-fi
-
-if [ $HTTP_UWSGI = YES ]; then
-    ngx_module_name=ngx_http_uwsgi_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_uwsgi_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_UWSGI
-
-    . auto/module
-fi
-
-if [ $HTTP_SCGI = YES ]; then
-    ngx_module_name=ngx_http_scgi_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_scgi_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_SCGI
-
-    . auto/module
-fi
-
-if [ $HTTP_PERL != NO ]; then
-    ngx_module_name=ngx_http_perl_module
-    ngx_module_incs=src/http/modules/perl
-    ngx_module_deps=src/http/modules/perl/ngx_http_perl_module.h
-    ngx_module_srcs=src/http/modules/perl/ngx_http_perl_module.c
-    ngx_module_libs=PERL
-    ngx_module_link=$HTTP_PERL
-
-    . auto/module
-fi
-
-if [ $HTTP_MEMCACHED = YES ]; then
-    ngx_module_name=ngx_http_memcached_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_memcached_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_MEMCACHED
-
-    . auto/module
-fi
-
-if [ $HTTP_EMPTY_GIF = YES ]; then
-    ngx_module_name=ngx_http_empty_gif_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_empty_gif_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_EMPTY_GIF
-
-    . auto/module
-fi
-
-if [ $HTTP_BROWSER = YES ]; then
-    ngx_module_name=ngx_http_browser_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_browser_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_BROWSER
-
-    . auto/module
-fi
-
-if [ $HTTP_SECURE_LINK = YES ]; then
-    ngx_module_name=ngx_http_secure_link_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_secure_link_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_SECURE_LINK
-
-    . auto/module
-fi
-
-if [ $HTTP_DEGRADATION = YES ]; then
-    have=NGX_HTTP_DEGRADATION . auto/have
-
-    ngx_module_name=ngx_http_degradation_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_degradation_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_DEGRADATION
-
-    . auto/module
-fi
-
-if [ $HTTP_FLV = YES ]; then
-    ngx_module_name=ngx_http_flv_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_flv_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_FLV
-
-    . auto/module
-fi
-
-if [ $HTTP_MP4 = YES ]; then
-    ngx_module_name=ngx_http_mp4_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_mp4_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_MP4
-
-    . auto/module
-fi
-
-if [ $HTTP_UPSTREAM_HASH = YES ]; then
-    ngx_module_name=ngx_http_upstream_hash_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_upstream_hash_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_UPSTREAM_HASH
-
-    . auto/module
-fi
-
-if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then
-    ngx_module_name=ngx_http_upstream_ip_hash_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_upstream_ip_hash_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_UPSTREAM_IP_HASH
-
-    . auto/module
-fi
-
-if [ $HTTP_UPSTREAM_LEAST_CONN = YES ]; then
-    ngx_module_name=ngx_http_upstream_least_conn_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_upstream_least_conn_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_UPSTREAM_LEAST_CONN
-
-    . auto/module
-fi
-
-if [ $HTTP_UPSTREAM_KEEPALIVE = YES ]; then
-    ngx_module_name=ngx_http_upstream_keepalive_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_upstream_keepalive_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_UPSTREAM_KEEPALIVE
-
-    . auto/module
-fi
-
-if [ $HTTP_UPSTREAM_ZONE = YES ]; then
-    have=NGX_HTTP_UPSTREAM_ZONE . auto/have
-
-    ngx_module_name=ngx_http_upstream_zone_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_upstream_zone_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_UPSTREAM_ZONE
-
-    . auto/module
-fi
-
-if [ $HTTP_STUB_STATUS = YES ]; then
-    have=NGX_STAT_STUB . auto/have
-
-    ngx_module_name=ngx_http_stub_status_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs=src/http/modules/ngx_http_stub_status_module.c
-    ngx_module_libs=
-    ngx_module_link=$HTTP_STUB_STATUS
-
-    . auto/module
+if [ $HTTP = YES ]; then
+    HTTP_MODULES=
+    HTTP_DEPS=
+    HTTP_INCS=
+
+    ngx_module_type=HTTP
+
+    if :; then
+        ngx_module_name="ngx_http_module \
+                         ngx_http_core_module \
+                         ngx_http_log_module \
+                         ngx_http_upstream_module"
+        ngx_module_incs="src/http src/http/modules"
+        ngx_module_deps="src/http/ngx_http.h \
+                         src/http/ngx_http_request.h \
+                         src/http/ngx_http_config.h \
+                         src/http/ngx_http_core_module.h \
+                         src/http/ngx_http_cache.h \
+                         src/http/ngx_http_variables.h \
+                         src/http/ngx_http_script.h \
+                         src/http/ngx_http_upstream.h \
+                         src/http/ngx_http_upstream_round_robin.h"
+        ngx_module_srcs="src/http/ngx_http.c \
+                         src/http/ngx_http_core_module.c \
+                         src/http/ngx_http_special_response.c \
+                         src/http/ngx_http_request.c \
+                         src/http/ngx_http_parse.c \
+                         src/http/modules/ngx_http_log_module.c \
+                         src/http/ngx_http_request_body.c \
+                         src/http/ngx_http_variables.c \
+                         src/http/ngx_http_script.c \
+                         src/http/ngx_http_upstream.c \
+                         src/http/ngx_http_upstream_round_robin.c"
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+
+    if [ $HTTP_CACHE = YES ]; then
+        have=NGX_HTTP_CACHE . auto/have
+        HTTP_SRCS="$HTTP_SRCS $HTTP_FILE_CACHE_SRCS"
+    fi
+
+
+    if [ $HTTP_SSI = YES ]; then
+        HTTP_POSTPONE=YES
+    fi
+
+
+    if [ $HTTP_SLICE = YES ]; then
+        HTTP_POSTPONE=YES
+    fi
+
+
+    if [ $HTTP_ADDITION = YES ]; then
+        HTTP_POSTPONE=YES
+    fi
+
+
+    # the module order is important
+    #     ngx_http_static_module
+    #     ngx_http_gzip_static_module
+    #     ngx_http_dav_module
+    #     ngx_http_autoindex_module
+    #     ngx_http_index_module
+    #     ngx_http_random_index_module
+    #
+    #     ngx_http_access_module
+    #     ngx_http_realip_module
+    #
+    #
+    # the filter order is important
+    #     ngx_http_write_filter
+    #     ngx_http_header_filter
+    #     ngx_http_chunked_filter
+    #     ngx_http_v2_filter
+    #     ngx_http_range_header_filter
+    #     ngx_http_gzip_filter
+    #     ngx_http_postpone_filter
+    #     ngx_http_ssi_filter
+    #     ngx_http_charset_filter
+    #         ngx_http_xslt_filter
+    #         ngx_http_image_filter
+    #         ngx_http_sub_filter
+    #         ngx_http_addition_filter
+    #         ngx_http_gunzip_filter
+    #         ngx_http_userid_filter
+    #         ngx_http_headers_filter
+    #     ngx_http_copy_filter
+    #     ngx_http_range_body_filter
+    #     ngx_http_not_modified_filter
+    #     ngx_http_slice_filter
+
+    ngx_module_type=HTTP_FILTER
+    HTTP_FILTER_MODULES=
+
+    ngx_module_order="ngx_http_static_module \
+                      ngx_http_gzip_static_module \
+                      ngx_http_dav_module \
+                      ngx_http_autoindex_module \
+                      ngx_http_index_module \
+                      ngx_http_random_index_module \
+                      ngx_http_access_module \
+                      ngx_http_realip_module \
+                      ngx_http_write_filter_module \
+                      ngx_http_header_filter_module \
+                      ngx_http_chunked_filter_module \
+                      ngx_http_v2_filter_module \
+                      ngx_http_range_header_filter_module \
+                      ngx_http_gzip_filter_module \
+                      ngx_http_postpone_filter_module \
+                      ngx_http_ssi_filter_module \
+                      ngx_http_charset_filter_module \
+                      ngx_http_xslt_filter_module \
+                      ngx_http_image_filter_module \
+                      ngx_http_sub_filter_module \
+                      ngx_http_addition_filter_module \
+                      ngx_http_gunzip_filter_module \
+                      ngx_http_userid_filter_module \
+                      ngx_http_headers_filter_module \
+                      ngx_http_copy_filter_module \
+                      ngx_http_range_body_filter_module \
+                      ngx_http_not_modified_filter_module \
+                      ngx_http_slice_filter_module"
+
+    if :; then
+        ngx_module_name=ngx_http_write_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/ngx_http_write_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+    if :; then
+        ngx_module_name=ngx_http_header_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/ngx_http_header_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+    if :; then
+        ngx_module_name=ngx_http_chunked_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_chunked_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+    if [ $HTTP_V2 = YES ]; then
+        ngx_module_name=ngx_http_v2_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/v2/ngx_http_v2_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_V2
+
+        . auto/module
+    fi
+
+    if :; then
+        ngx_module_name=ngx_http_range_header_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_range_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+    if [ $HTTP_GZIP = YES ]; then
+        have=NGX_HTTP_GZIP . auto/have
+        USE_ZLIB=YES
+
+        ngx_module_name=ngx_http_gzip_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_gzip_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_GZIP
+
+        . auto/module
+    fi
+
+    if [ $HTTP_POSTPONE = YES ]; then
+        ngx_module_name=ngx_http_postpone_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/ngx_http_postpone_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_POSTPONE
+
+        . auto/module
+    fi
+
+    if [ $HTTP_SSI = YES ]; then
+        have=NGX_HTTP_SSI . auto/have
+
+        ngx_module_name=ngx_http_ssi_filter_module
+        ngx_module_incs=
+        ngx_module_deps=src/http/modules/ngx_http_ssi_filter_module.h
+        ngx_module_srcs=src/http/modules/ngx_http_ssi_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_SSI
+
+        . auto/module
+    fi
+
+    if [ $HTTP_CHARSET = YES ]; then
+        ngx_module_name=ngx_http_charset_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_charset_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_CHARSET
+
+        . auto/module
+    fi
+
+    if [ $HTTP_XSLT != NO ]; then
+        ngx_module_name=ngx_http_xslt_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_xslt_filter_module.c
+        ngx_module_libs=LIBXSLT
+        ngx_module_link=$HTTP_XSLT
+
+        . auto/module
+    fi
+
+    if [ $HTTP_IMAGE_FILTER != NO ]; then
+        ngx_module_name=ngx_http_image_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_image_filter_module.c
+        ngx_module_libs=LIBGD
+        ngx_module_link=$HTTP_IMAGE_FILTER
+
+        . auto/module
+    fi
+
+    if [ $HTTP_SUB = YES ]; then
+        ngx_module_name=ngx_http_sub_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_sub_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_SUB
+
+        . auto/module
+    fi
+
+    if [ $HTTP_ADDITION = YES ]; then
+        ngx_module_name=ngx_http_addition_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_addition_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_ADDITION
+
+        . auto/module
+    fi
+
+    if [ $HTTP_GUNZIP = YES ]; then
+        have=NGX_HTTP_GZIP . auto/have
+        USE_ZLIB=YES
+
+        ngx_module_name=ngx_http_gunzip_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_gunzip_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_GUNZIP
+
+        . auto/module
+    fi
+
+    if [ $HTTP_USERID = YES ]; then
+        ngx_module_name=ngx_http_userid_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_userid_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_USERID
+
+        . auto/module
+    fi
+
+    if :; then
+        ngx_module_name=ngx_http_headers_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_headers_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+
+    ngx_module_type=HTTP_INIT_FILTER
+    HTTP_INIT_FILTER_MODULES=
+
+    if :; then
+        ngx_module_name=ngx_http_copy_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/ngx_http_copy_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+    if :; then
+        ngx_module_name=ngx_http_range_body_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+    if :; then
+        ngx_module_name=ngx_http_not_modified_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_not_modified_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+    if [ $HTTP_SLICE = YES ]; then
+        ngx_module_name=ngx_http_slice_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_slice_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_SLICE
+
+        . auto/module
+    fi
+
+
+    ngx_module_type=HTTP
+
+    if [ $HTTP_V2 = YES ]; then
+        have=NGX_HTTP_V2 . auto/have
+
+        ngx_module_name=ngx_http_v2_module
+        ngx_module_incs=src/http/v2
+        ngx_module_deps="src/http/v2/ngx_http_v2.h \
+                         src/http/v2/ngx_http_v2_module.h"
+        ngx_module_srcs="src/http/v2/ngx_http_v2.c \
+                         src/http/v2/ngx_http_v2_table.c \
+                         src/http/v2/ngx_http_v2_huff_decode.c \
+                         src/http/v2/ngx_http_v2_huff_encode.c \
+                         src/http/v2/ngx_http_v2_module.c"
+        ngx_module_libs=
+        ngx_module_link=$HTTP_V2
+
+        . auto/module
+    fi
+
+    if :; then
+        ngx_module_name=ngx_http_static_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_static_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+    if [ $HTTP_GZIP_STATIC = YES ]; then
+        have=NGX_HTTP_GZIP . auto/have
+
+        ngx_module_name=ngx_http_gzip_static_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_gzip_static_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_GZIP_STATIC
+
+        . auto/module
+    fi
+
+    if [ $HTTP_DAV = YES ]; then
+        have=NGX_HTTP_DAV . auto/have
+
+        ngx_module_name=ngx_http_dav_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_dav_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_DAV
+
+        . auto/module
+    fi
+
+    if [ $HTTP_AUTOINDEX = YES ]; then
+        ngx_module_name=ngx_http_autoindex_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_autoindex_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_AUTOINDEX
+
+        . auto/module
+    fi
+
+    if :; then
+        ngx_module_name=ngx_http_index_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_index_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
+    if [ $HTTP_RANDOM_INDEX = YES ]; then
+        ngx_module_name=ngx_http_random_index_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_random_index_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_RANDOM_INDEX
+
+        . auto/module
+    fi
+
+    if [ $HTTP_AUTH_REQUEST = YES ]; then
+        ngx_module_name=ngx_http_auth_request_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_auth_request_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_AUTH_REQUEST
+
+        . auto/module
+    fi
+
+    if [ $HTTP_AUTH_BASIC = YES ]; then
+        have=NGX_CRYPT . auto/have
+
+        ngx_module_name=ngx_http_auth_basic_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_auth_basic_module.c
+        ngx_module_libs=$CRYPT_LIB
+        ngx_module_link=$HTTP_AUTH_BASIC
+
+        . auto/module
+    fi
+
+    if [ $HTTP_ACCESS = YES ]; then
+        ngx_module_name=ngx_http_access_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_access_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_ACCESS
+
+        . auto/module
+    fi
+
+    if [ $HTTP_LIMIT_CONN = YES ]; then
+        ngx_module_name=ngx_http_limit_conn_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_limit_conn_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_LIMIT_CONN
+
+        . auto/module
+    fi
+
+    if [ $HTTP_LIMIT_REQ = YES ]; then
+        ngx_module_name=ngx_http_limit_req_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_limit_req_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_LIMIT_REQ
+
+        . auto/module
+    fi
+
+    if [ $HTTP_REALIP = YES ]; then
+        have=NGX_HTTP_REALIP . auto/have
+        have=NGX_HTTP_X_FORWARDED_FOR . auto/have
+
+        ngx_module_name=ngx_http_realip_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_realip_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_REALIP
+
+        . auto/module
+    fi
+
+    if [ $HTTP_STATUS = YES ]; then
+        ngx_module_name=ngx_http_status_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_status_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_STATUS
+
+        . auto/module
+    fi
+
+    if [ $HTTP_GEO = YES ]; then
+        have=NGX_HTTP_X_FORWARDED_FOR . auto/have
+
+        ngx_module_name=ngx_http_geo_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_geo_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_GEO
+
+        . auto/module
+    fi
+
+    if [ $HTTP_GEOIP != NO ]; then
+        have=NGX_HTTP_X_FORWARDED_FOR . auto/have
+
+        ngx_module_name=ngx_http_geoip_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_geoip_module.c
+        ngx_module_libs=GEOIP
+        ngx_module_link=$HTTP_GEOIP
+
+        . auto/module
+    fi
+
+    if [ $HTTP_MAP = YES ]; then
+        ngx_module_name=ngx_http_map_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_map_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_MAP
+
+        . auto/module
+    fi
+
+    if [ $HTTP_SPLIT_CLIENTS = YES ]; then
+        ngx_module_name=ngx_http_split_clients_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_split_clients_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_SPLIT_CLIENTS
+
+        . auto/module
+    fi
+
+    if [ $HTTP_REFERER = YES ]; then
+        ngx_module_name=ngx_http_referer_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_referer_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_REFERER
+
+        . auto/module
+    fi
+
+    if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then
+        USE_PCRE=YES
+
+        ngx_module_name=ngx_http_rewrite_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_rewrite_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_REWRITE
+
+        . auto/module
+    fi
+
+    if [ $HTTP_SSL = YES ]; then
+        USE_OPENSSL=YES
+        have=NGX_HTTP_SSL . auto/have
+
+        ngx_module_name=ngx_http_ssl_module
+        ngx_module_incs=
+        ngx_module_deps=src/http/modules/ngx_http_ssl_module.h
+        ngx_module_srcs=src/http/modules/ngx_http_ssl_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_SSL
+
+        . auto/module
+    fi
+
+    if [ $HTTP_PROXY = YES ]; then
+        have=NGX_HTTP_X_FORWARDED_FOR . auto/have
+
+        ngx_module_name=ngx_http_proxy_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_proxy_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_PROXY
+
+        . auto/module
+    fi
+
+    if [ $HTTP_FASTCGI = YES ]; then
+        ngx_module_name=ngx_http_fastcgi_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_fastcgi_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_FASTCGI
+
+        . auto/module
+    fi
+
+    if [ $HTTP_UWSGI = YES ]; then
+        ngx_module_name=ngx_http_uwsgi_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_uwsgi_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_UWSGI
+
+        . auto/module
+    fi
+
+    if [ $HTTP_SCGI = YES ]; then
+        ngx_module_name=ngx_http_scgi_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_scgi_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_SCGI
+
+        . auto/module
+    fi
+
+    if [ $HTTP_PERL != NO ]; then
+        ngx_module_name=ngx_http_perl_module
+        ngx_module_incs=src/http/modules/perl
+        ngx_module_deps=src/http/modules/perl/ngx_http_perl_module.h
+        ngx_module_srcs=src/http/modules/perl/ngx_http_perl_module.c
+        ngx_module_libs=PERL
+        ngx_module_link=$HTTP_PERL
+
+        . auto/module
+    fi
+
+    if [ $HTTP_MEMCACHED = YES ]; then
+        ngx_module_name=ngx_http_memcached_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_memcached_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_MEMCACHED
+
+        . auto/module
+    fi
+
+    if [ $HTTP_EMPTY_GIF = YES ]; then
+        ngx_module_name=ngx_http_empty_gif_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_empty_gif_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_EMPTY_GIF
+
+        . auto/module
+    fi
+
+    if [ $HTTP_BROWSER = YES ]; then
+        ngx_module_name=ngx_http_browser_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_browser_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_BROWSER
+
+        . auto/module
+    fi
+
+    if [ $HTTP_SECURE_LINK = YES ]; then
+        ngx_module_name=ngx_http_secure_link_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_secure_link_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_SECURE_LINK
+
+        . auto/module
+    fi
+
+    if [ $HTTP_DEGRADATION = YES ]; then
+        have=NGX_HTTP_DEGRADATION . auto/have
+
+        ngx_module_name=ngx_http_degradation_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_degradation_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_DEGRADATION
+
+        . auto/module
+    fi
+
+    if [ $HTTP_FLV = YES ]; then
+        ngx_module_name=ngx_http_flv_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_flv_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_FLV
+
+        . auto/module
+    fi
+
+    if [ $HTTP_MP4 = YES ]; then
+        ngx_module_name=ngx_http_mp4_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_mp4_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_MP4
+
+        . auto/module
+    fi
+
+    if [ $HTTP_UPSTREAM_HASH = YES ]; then
+        ngx_module_name=ngx_http_upstream_hash_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_upstream_hash_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_UPSTREAM_HASH
+
+        . auto/module
+    fi
+
+    if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then
+        ngx_module_name=ngx_http_upstream_ip_hash_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_upstream_ip_hash_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_UPSTREAM_IP_HASH
+
+        . auto/module
+    fi
+
+    if [ $HTTP_UPSTREAM_LEAST_CONN = YES ]; then
+        ngx_module_name=ngx_http_upstream_least_conn_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_upstream_least_conn_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_UPSTREAM_LEAST_CONN
+
+        . auto/module
+    fi
+
+    if [ $HTTP_UPSTREAM_KEEPALIVE = YES ]; then
+        ngx_module_name=ngx_http_upstream_keepalive_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_upstream_keepalive_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_UPSTREAM_KEEPALIVE
+
+        . auto/module
+    fi
+
+    if [ $HTTP_UPSTREAM_ZONE = YES ]; then
+        have=NGX_HTTP_UPSTREAM_ZONE . auto/have
+
+        ngx_module_name=ngx_http_upstream_zone_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_upstream_zone_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_UPSTREAM_ZONE
+
+        . auto/module
+    fi
+
+    if [ $HTTP_STUB_STATUS = YES ]; then
+        have=NGX_STAT_STUB . auto/have
+
+        ngx_module_name=ngx_http_stub_status_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_stub_status_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_STUB_STATUS
+
+        . auto/module
+    fi
 fi
 
 
@@ -966,6 +963,8 @@ if [ $STREAM != NO ]; then
     STREAM_INCS=
 
     ngx_module_type=STREAM
+    ngx_module_libs=
+    ngx_module_link=YES
 
     ngx_module_order=
 
diff --git a/auto/options b/auto/options
index 43724b1..66b822a 100644
--- a/auto/options
+++ b/auto/options
@@ -574,19 +574,6 @@ END
 fi
 
 
-if [ $HTTP = NO ]; then
-    HTTP_CHARSET=NO
-    HTTP_GZIP=NO
-    HTTP_SSI=NO
-    HTTP_USERID=NO
-    HTTP_ACCESS=NO
-    HTTP_STATUS=NO
-    HTTP_REWRITE=NO
-    HTTP_PROXY=NO
-    HTTP_FASTCGI=NO
-fi
-
-
 if [ ".$NGX_PLATFORM" = ".win32" ]; then
     NGX_WINE=$WINE
 fi
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index f1fd48a..a52891b 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -13,7 +13,7 @@ syn match ngxVariable '\$\(\w\+\|{\w\+}\)'
 syn match ngxVariableBlock '\$\(\w\+\|{\w\+}\)' contained
 syn match ngxVariableString '\$\(\w\+\|{\w\+}\)' contained
 syn region ngxBlock start=+^+ end=+{+ skip=+\${+ contains=ngxComment,ngxDirectiveBlock,ngxVariableBlock,ngxString oneline
-syn region ngxString start=+\z(["']\)+ end=+\z1+ skip=+\\\\\|\\\z1+ contains=ngxVariableString
+syn region ngxString start=+[^:a-zA-Z>!\\@]\z(["']\)+lc=1 end=+\z1+ skip=+\\\\\|\\\z1+ contains=ngxVariableString
 syn match ngxComment ' *#.*$'
 
 syn keyword ngxBoolean on
@@ -37,7 +37,8 @@ syn keyword ngxDirectiveImportant include
 syn keyword ngxDirectiveImportant root
 syn keyword ngxDirectiveImportant server
 syn keyword ngxDirectiveImportant server_name
-syn keyword ngxDirectiveImportant listen
+syn keyword ngxDirectiveImportant listen contained
+syn region  ngxDirectiveImportantListen matchgroup=ngxDirectiveImportant start=+listen+ skip=+\\\\\|\\\;+ end=+;+he=e-1 contains=ngxListenOptions,ngxString
 syn keyword ngxDirectiveImportant internal
 syn keyword ngxDirectiveImportant proxy_pass
 syn keyword ngxDirectiveImportant memcached_pass
@@ -46,6 +47,24 @@ syn keyword ngxDirectiveImportant scgi_pass
 syn keyword ngxDirectiveImportant uwsgi_pass
 syn keyword ngxDirectiveImportant try_files
 
+syn keyword ngxListenOptions default_server contained
+syn keyword ngxListenOptions ssl            contained
+syn keyword ngxListenOptions http2          contained
+syn keyword ngxListenOptions spdy           contained
+syn keyword ngxListenOptions proxy_protocol contained
+syn keyword ngxListenOptions setfib         contained
+syn keyword ngxListenOptions fastopen       contained
+syn keyword ngxListenOptions backlog        contained
+syn keyword ngxListenOptions rcvbuf         contained
+syn keyword ngxListenOptions sndbuf         contained
+syn keyword ngxListenOptions accept_filter  contained
+syn keyword ngxListenOptions deferred       contained
+syn keyword ngxListenOptions bind           contained
+syn keyword ngxListenOptions ipv6only       contained
+syn keyword ngxListenOptions reuseport      contained
+syn keyword ngxListenOptions so_keepalive   contained
+syn keyword ngxListenOptions keepidle       contained
+
 syn keyword ngxDirectiveControl break
 syn keyword ngxDirectiveControl return
 syn keyword ngxDirectiveControl rewrite
@@ -63,6 +82,7 @@ syn keyword ngxDirectiveDeprecated optimize_server_names
 syn keyword ngxDirectiveDeprecated satisfy_any
 syn keyword ngxDirectiveDeprecated so_keepalive
 
+syn keyword ngxDirective absolute_redirect
 syn keyword ngxDirective accept_mutex
 syn keyword ngxDirective accept_mutex_delay
 syn keyword ngxDirective acceptex_read
@@ -72,6 +92,7 @@ syn keyword ngxDirective add_before_body
 syn keyword ngxDirective add_header
 syn keyword ngxDirective addition_types
 syn keyword ngxDirective aio
+syn keyword ngxDirective aio_write
 syn keyword ngxDirective alias
 syn keyword ngxDirective allow
 syn keyword ngxDirective ancient_browser
@@ -80,13 +101,18 @@ syn keyword ngxDirective auth_basic
 syn keyword ngxDirective auth_basic_user_file
 syn keyword ngxDirective auth_http
 syn keyword ngxDirective auth_http_header
+syn keyword ngxDirective auth_http_pass_client_cert
 syn keyword ngxDirective auth_http_timeout
+syn keyword ngxDirective auth_jwt
+syn keyword ngxDirective auth_jwt_key_file
 syn keyword ngxDirective auth_request
 syn keyword ngxDirective auth_request_set
 syn keyword ngxDirective autoindex
 syn keyword ngxDirective autoindex_exact_size
+syn keyword ngxDirective autoindex_format
 syn keyword ngxDirective autoindex_localtime
 syn keyword ngxDirective charset
+syn keyword ngxDirective charset_map
 syn keyword ngxDirective charset_types
 syn keyword ngxDirective chunked_transfer_encoding
 syn keyword ngxDirective client_body_buffer_size
@@ -120,6 +146,8 @@ syn keyword ngxDirective error_log
 syn keyword ngxDirective etag
 syn keyword ngxDirective eventport_events
 syn keyword ngxDirective expires
+syn keyword ngxDirective f4f
+syn keyword ngxDirective f4f_buffer_size
 syn keyword ngxDirective fastcgi_bind
 syn keyword ngxDirective fastcgi_buffer_size
 syn keyword ngxDirective fastcgi_buffering
@@ -129,10 +157,13 @@ syn keyword ngxDirective fastcgi_cache
 syn keyword ngxDirective fastcgi_cache_bypass
 syn keyword ngxDirective fastcgi_cache_key
 syn keyword ngxDirective fastcgi_cache_lock
+syn keyword ngxDirective fastcgi_cache_lock_age
 syn keyword ngxDirective fastcgi_cache_lock_timeout
+syn keyword ngxDirective fastcgi_cache_max_range_offset
 syn keyword ngxDirective fastcgi_cache_methods
 syn keyword ngxDirective fastcgi_cache_min_uses
 syn keyword ngxDirective fastcgi_cache_path
+syn keyword ngxDirective fastcgi_cache_purge
 syn keyword ngxDirective fastcgi_cache_revalidate
 syn keyword ngxDirective fastcgi_cache_use_stale
 syn keyword ngxDirective fastcgi_cache_valid
@@ -145,6 +176,7 @@ syn keyword ngxDirective fastcgi_ignore_headers
 syn keyword ngxDirective fastcgi_index
 syn keyword ngxDirective fastcgi_intercept_errors
 syn keyword ngxDirective fastcgi_keep_conn
+syn keyword ngxDirective fastcgi_limit_rate
 syn keyword ngxDirective fastcgi_max_temp_file_size
 syn keyword ngxDirective fastcgi_next_upstream
 syn keyword ngxDirective fastcgi_next_upstream_timeout
@@ -155,6 +187,7 @@ syn keyword ngxDirective fastcgi_pass_header
 syn keyword ngxDirective fastcgi_pass_request_body
 syn keyword ngxDirective fastcgi_pass_request_headers
 syn keyword ngxDirective fastcgi_read_timeout
+syn keyword ngxDirective fastcgi_request_buffering
 syn keyword ngxDirective fastcgi_send_lowat
 syn keyword ngxDirective fastcgi_send_timeout
 syn keyword ngxDirective fastcgi_split_path_info
@@ -185,6 +218,23 @@ syn keyword ngxDirective gzip_types
 syn keyword ngxDirective gzip_vary
 syn keyword ngxDirective gzip_window
 syn keyword ngxDirective hash
+syn keyword ngxDirective health_check
+syn keyword ngxDirective health_check_timeout
+syn keyword ngxDirective hls
+syn keyword ngxDirective hls_buffers
+syn keyword ngxDirective hls_forward_args
+syn keyword ngxDirective hls_fragment
+syn keyword ngxDirective hls_mp4_buffer_size
+syn keyword ngxDirective hls_mp4_max_buffer_size
+syn keyword ngxDirective http2_chunk_size
+syn keyword ngxDirective http2_body_preread_size
+syn keyword ngxDirective http2_idle_timeout
+syn keyword ngxDirective http2_max_concurrent_streams
+syn keyword ngxDirective http2_max_field_size
+syn keyword ngxDirective http2_max_header_size
+syn keyword ngxDirective http2_max_requests
+syn keyword ngxDirective http2_recv_buffer_size
+syn keyword ngxDirective http2_recv_timeout
 syn keyword ngxDirective if_modified_since
 syn keyword ngxDirective ignore_invalid_headers
 syn keyword ngxDirective image_filter
@@ -193,12 +243,19 @@ syn keyword ngxDirective image_filter_interlace
 syn keyword ngxDirective image_filter_jpeg_quality
 syn keyword ngxDirective image_filter_sharpen
 syn keyword ngxDirective image_filter_transparency
+syn keyword ngxDirective image_filter_webp_quality
 syn keyword ngxDirective imap_auth
 syn keyword ngxDirective imap_capabilities
 syn keyword ngxDirective imap_client_buffer
 syn keyword ngxDirective index
 syn keyword ngxDirective iocp_threads
 syn keyword ngxDirective ip_hash
+syn keyword ngxDirective js_access
+syn keyword ngxDirective js_content
+syn keyword ngxDirective js_filter
+syn keyword ngxDirective js_include
+syn keyword ngxDirective js_preread
+syn keyword ngxDirective js_set
 syn keyword ngxDirective keepalive
 syn keyword ngxDirective keepalive_disable
 syn keyword ngxDirective keepalive_requests
@@ -207,6 +264,7 @@ syn keyword ngxDirective kqueue_changes
 syn keyword ngxDirective kqueue_events
 syn keyword ngxDirective large_client_header_buffers
 syn keyword ngxDirective least_conn
+syn keyword ngxDirective least_time
 syn keyword ngxDirective limit_conn
 syn keyword ngxDirective limit_conn_log_level
 syn keyword ngxDirective limit_conn_status
@@ -220,17 +278,20 @@ syn keyword ngxDirective limit_req_zone
 syn keyword ngxDirective lingering_close
 syn keyword ngxDirective lingering_time
 syn keyword ngxDirective lingering_timeout
+syn keyword ngxDirective load_module
 syn keyword ngxDirective lock_file
 syn keyword ngxDirective log_format
 syn keyword ngxDirective log_not_found
 syn keyword ngxDirective log_subrequest
 syn keyword ngxDirective map_hash_bucket_size
 syn keyword ngxDirective map_hash_max_size
+syn keyword ngxDirective match
 syn keyword ngxDirective master_process
 syn keyword ngxDirective max_ranges
 syn keyword ngxDirective memcached_bind
 syn keyword ngxDirective memcached_buffer_size
 syn keyword ngxDirective memcached_connect_timeout
+syn keyword ngxDirective memcached_force_ranges
 syn keyword ngxDirective memcached_gzip_flag
 syn keyword ngxDirective memcached_next_upstream
 syn keyword ngxDirective memcached_next_upstream_timeout
@@ -244,9 +305,12 @@ syn keyword ngxDirective modern_browser_value
 syn keyword ngxDirective mp4
 syn keyword ngxDirective mp4_buffer_size
 syn keyword ngxDirective mp4_max_buffer_size
+syn keyword ngxDirective mp4_limit_rate
+syn keyword ngxDirective mp4_limit_rate_after
 syn keyword ngxDirective msie_padding
 syn keyword ngxDirective msie_refresh
 syn keyword ngxDirective multi_accept
+syn keyword ngxDirective ntlm
 syn keyword ngxDirective open_file_cache
 syn keyword ngxDirective open_file_cache_errors
 syn keyword ngxDirective open_file_cache_events
@@ -267,7 +331,10 @@ syn keyword ngxDirective port_in_redirect
 syn keyword ngxDirective post_acceptex
 syn keyword ngxDirective postpone_gzipping
 syn keyword ngxDirective postpone_output
-syn keyword ngxDirective protocol
+syn keyword ngxDirective preread_buffer_size
+syn keyword ngxDirective preread_timeout
+syn keyword ngxDirective protocol nextgroup=ngxMailProtocol skipwhite
+syn keyword ngxMailProtocol imap pop3 smtp contained
 syn keyword ngxDirective proxy
 syn keyword ngxDirective proxy_bind
 syn keyword ngxDirective proxy_buffer
@@ -277,18 +344,23 @@ syn keyword ngxDirective proxy_buffers
 syn keyword ngxDirective proxy_busy_buffers_size
 syn keyword ngxDirective proxy_cache
 syn keyword ngxDirective proxy_cache_bypass
+syn keyword ngxDirective proxy_cache_convert_head
 syn keyword ngxDirective proxy_cache_key
 syn keyword ngxDirective proxy_cache_lock
+syn keyword ngxDirective proxy_cache_lock_age
 syn keyword ngxDirective proxy_cache_lock_timeout
+syn keyword ngxDirective proxy_cache_max_range_offset
 syn keyword ngxDirective proxy_cache_methods
 syn keyword ngxDirective proxy_cache_min_uses
 syn keyword ngxDirective proxy_cache_path
+syn keyword ngxDirective proxy_cache_purge
 syn keyword ngxDirective proxy_cache_revalidate
 syn keyword ngxDirective proxy_cache_use_stale
 syn keyword ngxDirective proxy_cache_valid
 syn keyword ngxDirective proxy_connect_timeout
 syn keyword ngxDirective proxy_cookie_domain
 syn keyword ngxDirective proxy_cookie_path
+syn keyword ngxDirective proxy_download_rate
 syn keyword ngxDirective proxy_force_ranges
 syn keyword ngxDirective proxy_headers_hash_bucket_size
 syn keyword ngxDirective proxy_headers_hash_max_size
@@ -297,6 +369,7 @@ syn keyword ngxDirective proxy_http_version
 syn keyword ngxDirective proxy_ignore_client_abort
 syn keyword ngxDirective proxy_ignore_headers
 syn keyword ngxDirective proxy_intercept_errors
+syn keyword ngxDirective proxy_limit_rate
 syn keyword ngxDirective proxy_max_temp_file_size
 syn keyword ngxDirective proxy_method
 syn keyword ngxDirective proxy_next_upstream
@@ -307,16 +380,23 @@ syn keyword ngxDirective proxy_pass_error_message
 syn keyword ngxDirective proxy_pass_header
 syn keyword ngxDirective proxy_pass_request_body
 syn keyword ngxDirective proxy_pass_request_headers
+syn keyword ngxDirective proxy_protocol
+syn keyword ngxDirective proxy_protocol_timeout
 syn keyword ngxDirective proxy_read_timeout
 syn keyword ngxDirective proxy_redirect
+syn keyword ngxDirective proxy_request_buffering
+syn keyword ngxDirective proxy_responses
 syn keyword ngxDirective proxy_send_lowat
 syn keyword ngxDirective proxy_send_timeout
 syn keyword ngxDirective proxy_set_body
 syn keyword ngxDirective proxy_set_header
+syn keyword ngxDirective proxy_ssl_certificate
+syn keyword ngxDirective proxy_ssl_certificate_key
 syn keyword ngxDirective proxy_ssl_ciphers
 syn keyword ngxDirective proxy_ssl_crl
 syn keyword ngxDirective proxy_ssl_name
-syn keyword ngxDirective proxy_ssl_protocols
+syn keyword ngxDirective proxy_ssl_password_file
+syn keyword ngxDirective proxy_ssl_protocols nextgroup=ngxSSLProtocol skipwhite
 syn keyword ngxDirective proxy_ssl_server_name
 syn keyword ngxDirective proxy_ssl_session_reuse
 syn keyword ngxDirective proxy_ssl_trusted_certificate
@@ -327,6 +407,8 @@ syn keyword ngxDirective proxy_store_access
 syn keyword ngxDirective proxy_temp_file_write_size
 syn keyword ngxDirective proxy_temp_path
 syn keyword ngxDirective proxy_timeout
+syn keyword ngxDirective proxy_upload_rate
+syn keyword ngxDirective queue
 syn keyword ngxDirective random_index
 syn keyword ngxDirective read_ahead
 syn keyword ngxDirective real_ip_header
@@ -353,10 +435,13 @@ syn keyword ngxDirective scgi_cache
 syn keyword ngxDirective scgi_cache_bypass
 syn keyword ngxDirective scgi_cache_key
 syn keyword ngxDirective scgi_cache_lock
+syn keyword ngxDirective scgi_cache_lock_age
 syn keyword ngxDirective scgi_cache_lock_timeout
+syn keyword ngxDirective scgi_cache_max_range_offset
 syn keyword ngxDirective scgi_cache_methods
 syn keyword ngxDirective scgi_cache_min_uses
 syn keyword ngxDirective scgi_cache_path
+syn keyword ngxDirective scgi_cache_purge
 syn keyword ngxDirective scgi_cache_revalidate
 syn keyword ngxDirective scgi_cache_use_stale
 syn keyword ngxDirective scgi_cache_valid
@@ -366,6 +451,7 @@ syn keyword ngxDirective scgi_hide_header
 syn keyword ngxDirective scgi_ignore_client_abort
 syn keyword ngxDirective scgi_ignore_headers
 syn keyword ngxDirective scgi_intercept_errors
+syn keyword ngxDirective scgi_limit_rate
 syn keyword ngxDirective scgi_max_temp_file_size
 syn keyword ngxDirective scgi_next_upstream
 syn keyword ngxDirective scgi_next_upstream_timeout
@@ -376,6 +462,7 @@ syn keyword ngxDirective scgi_pass_header
 syn keyword ngxDirective scgi_pass_request_body
 syn keyword ngxDirective scgi_pass_request_headers
 syn keyword ngxDirective scgi_read_timeout
+syn keyword ngxDirective scgi_request_buffering
 syn keyword ngxDirective scgi_send_timeout
 syn keyword ngxDirective scgi_store
 syn keyword ngxDirective scgi_store_access
@@ -392,7 +479,11 @@ syn keyword ngxDirective server_name_in_redirect
 syn keyword ngxDirective server_names_hash_bucket_size
 syn keyword ngxDirective server_names_hash_max_size
 syn keyword ngxDirective server_tokens
+syn keyword ngxDirective session_log
+syn keyword ngxDirective session_log_format
+syn keyword ngxDirective session_log_zone
 syn keyword ngxDirective set_real_ip_from
+syn keyword ngxDirective slice
 syn keyword ngxDirective smtp_auth
 syn keyword ngxDirective smtp_capabilities
 syn keyword ngxDirective smtp_client_buffer
@@ -423,9 +514,12 @@ syn keyword ngxDirective ssl_crl
 syn keyword ngxDirective ssl_dhparam
 syn keyword ngxDirective ssl_ecdh_curve
 syn keyword ngxDirective ssl_engine
+syn keyword ngxDirective ssl_handshake_timeout
 syn keyword ngxDirective ssl_password_file
 syn keyword ngxDirective ssl_prefer_server_ciphers
-syn keyword ngxDirective ssl_protocols
+syn keyword ngxDirective ssl_preread
+syn keyword ngxDirective ssl_protocols nextgroup=ngxSSLProtocol skipwhite
+syn keyword ngxSSLProtocol SSLv2 SSLv3 TLSv1 TLSv1.1 TLSv1.2 contained nextgroup=ngxSSLProtocol skipwhite
 syn keyword ngxDirective ssl_session_cache
 syn keyword ngxDirective ssl_session_ticket_key
 syn keyword ngxDirective ssl_session_tickets
@@ -438,6 +532,12 @@ syn keyword ngxDirective ssl_trusted_certificate
 syn keyword ngxDirective ssl_verify_client
 syn keyword ngxDirective ssl_verify_depth
 syn keyword ngxDirective starttls
+syn keyword ngxDirective state
+syn keyword ngxDirective status
+syn keyword ngxDirective status_format
+syn keyword ngxDirective status_zone
+syn keyword ngxDirective sticky
+syn keyword ngxDirective sticky_cookie_insert
 syn keyword ngxDirective stub_status
 syn keyword ngxDirective sub_filter
 syn keyword ngxDirective sub_filter_last_modified
@@ -445,6 +545,7 @@ syn keyword ngxDirective sub_filter_once
 syn keyword ngxDirective sub_filter_types
 syn keyword ngxDirective tcp_nodelay
 syn keyword ngxDirective tcp_nopush
+syn keyword ngxDirective thread_pool
 syn keyword ngxDirective thread_stack_size
 syn keyword ngxDirective timeout
 syn keyword ngxDirective timer_resolution
@@ -452,6 +553,7 @@ syn keyword ngxDirective types_hash_bucket_size
 syn keyword ngxDirective types_hash_max_size
 syn keyword ngxDirective underscores_in_headers
 syn keyword ngxDirective uninitialized_variable_warn
+syn keyword ngxDirective upstream_conf
 syn keyword ngxDirective use
 syn keyword ngxDirective user
 syn keyword ngxDirective userid
@@ -471,10 +573,12 @@ syn keyword ngxDirective uwsgi_cache
 syn keyword ngxDirective uwsgi_cache_bypass
 syn keyword ngxDirective uwsgi_cache_key
 syn keyword ngxDirective uwsgi_cache_lock
+syn keyword ngxDirective uwsgi_cache_lock_age
 syn keyword ngxDirective uwsgi_cache_lock_timeout
 syn keyword ngxDirective uwsgi_cache_methods
 syn keyword ngxDirective uwsgi_cache_min_uses
 syn keyword ngxDirective uwsgi_cache_path
+syn keyword ngxDirective uwsgi_cache_purge
 syn keyword ngxDirective uwsgi_cache_revalidate
 syn keyword ngxDirective uwsgi_cache_use_stale
 syn keyword ngxDirective uwsgi_cache_valid
@@ -484,6 +588,7 @@ syn keyword ngxDirective uwsgi_hide_header
 syn keyword ngxDirective uwsgi_ignore_client_abort
 syn keyword ngxDirective uwsgi_ignore_headers
 syn keyword ngxDirective uwsgi_intercept_errors
+syn keyword ngxDirective uwsgi_limit_rate
 syn keyword ngxDirective uwsgi_max_temp_file_size
 syn keyword ngxDirective uwsgi_modifier1
 syn keyword ngxDirective uwsgi_modifier2
@@ -492,15 +597,20 @@ syn keyword ngxDirective uwsgi_next_upstream_timeout
 syn keyword ngxDirective uwsgi_next_upstream_tries
 syn keyword ngxDirective uwsgi_no_cache
 syn keyword ngxDirective uwsgi_param
+syn keyword ngxDirective uwsgi_pass
 syn keyword ngxDirective uwsgi_pass_header
 syn keyword ngxDirective uwsgi_pass_request_body
 syn keyword ngxDirective uwsgi_pass_request_headers
 syn keyword ngxDirective uwsgi_read_timeout
+syn keyword ngxDirective uwsgi_request_buffering
 syn keyword ngxDirective uwsgi_send_timeout
+syn keyword ngxDirective uwsgi_ssl_certificate
+syn keyword ngxDirective uwsgi_ssl_certificate_key
 syn keyword ngxDirective uwsgi_ssl_ciphers
 syn keyword ngxDirective uwsgi_ssl_crl
 syn keyword ngxDirective uwsgi_ssl_name
-syn keyword ngxDirective uwsgi_ssl_protocols
+syn keyword ngxDirective uwsgi_ssl_password_file
+syn keyword ngxDirective uwsgi_ssl_protocols nextgroup=ngxSSLProtocol skipwhite
 syn keyword ngxDirective uwsgi_ssl_server_name
 syn keyword ngxDirective uwsgi_ssl_session_reuse
 syn keyword ngxDirective uwsgi_ssl_trusted_certificate
@@ -531,129 +641,370 @@ syn keyword ngxDirective xslt_param
 syn keyword ngxDirective xslt_string_param
 syn keyword ngxDirective xslt_stylesheet
 syn keyword ngxDirective xslt_types
+syn keyword ngxDirective zone
 
 " 3rd party module list:
-" http://wiki.nginx.org/Nginx3rdPartyModules
+" https://www.nginx.com/resources/wiki/modules/
 
-" Accept Language Module <http://wiki.nginx.org/NginxAcceptLanguageModule>
+" Accept Language Module <https://www.nginx.com/resources/wiki/modules/accept_language/>
 " Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
 syn keyword ngxDirectiveThirdParty set_from_accept_language
 
-" Access Key Module <http://wiki.nginx.org/NginxHttpAccessKeyModule>
+" Access Key Module (DEPRECATED) <http://wiki.nginx.org/NginxHttpAccessKeyModule>
 " Denies access unless the request URL contains an access key.
-syn keyword ngxDirectiveThirdParty accesskey
-syn keyword ngxDirectiveThirdParty accesskey_arg
-syn keyword ngxDirectiveThirdParty accesskey_hashmethod
-syn keyword ngxDirectiveThirdParty accesskey_signature
+syn keyword ngxDirectiveDeprecated accesskey
+syn keyword ngxDirectiveDeprecated accesskey_arg
+syn keyword ngxDirectiveDeprecated accesskey_hashmethod
+syn keyword ngxDirectiveDeprecated accesskey_signature
 
-" Auth PAM Module <http://web.iti.upv.es/~sto/nginx/>
-" HTTP Basic Authentication using PAM.
-syn keyword ngxDirectiveThirdParty auth_pam
-syn keyword ngxDirectiveThirdParty auth_pam_service_name
+" Asynchronous FastCGI Module <https://github.com/rsms/afcgi>
+" Primarily a modified version of the Nginx FastCGI module which implements multiplexing of connections, allowing a single FastCGI server to handle many concurrent requests.
+" syn keyword ngxDirectiveThirdParty fastcgi_bind
+" syn keyword ngxDirectiveThirdParty fastcgi_buffer_size
+" syn keyword ngxDirectiveThirdParty fastcgi_buffers
+" syn keyword ngxDirectiveThirdParty fastcgi_busy_buffers_size
+" syn keyword ngxDirectiveThirdParty fastcgi_cache
+" syn keyword ngxDirectiveThirdParty fastcgi_cache_key
+" syn keyword ngxDirectiveThirdParty fastcgi_cache_methods
+" syn keyword ngxDirectiveThirdParty fastcgi_cache_min_uses
+" syn keyword ngxDirectiveThirdParty fastcgi_cache_path
+" syn keyword ngxDirectiveThirdParty fastcgi_cache_use_stale
+" syn keyword ngxDirectiveThirdParty fastcgi_cache_valid
+" syn keyword ngxDirectiveThirdParty fastcgi_catch_stderr
+" syn keyword ngxDirectiveThirdParty fastcgi_connect_timeout
+" syn keyword ngxDirectiveThirdParty fastcgi_hide_header
+" syn keyword ngxDirectiveThirdParty fastcgi_ignore_client_abort
+" syn keyword ngxDirectiveThirdParty fastcgi_ignore_headers
+" syn keyword ngxDirectiveThirdParty fastcgi_index
+" syn keyword ngxDirectiveThirdParty fastcgi_intercept_errors
+" syn keyword ngxDirectiveThirdParty fastcgi_max_temp_file_size
+" syn keyword ngxDirectiveThirdParty fastcgi_next_upstream
+" syn keyword ngxDirectiveThirdParty fastcgi_param
+" syn keyword ngxDirectiveThirdParty fastcgi_pass
+" syn keyword ngxDirectiveThirdParty fastcgi_pass_header
+" syn keyword ngxDirectiveThirdParty fastcgi_pass_request_body
+" syn keyword ngxDirectiveThirdParty fastcgi_pass_request_headers
+" syn keyword ngxDirectiveThirdParty fastcgi_read_timeout
+" syn keyword ngxDirectiveThirdParty fastcgi_send_lowat
+" syn keyword ngxDirectiveThirdParty fastcgi_send_timeout
+" syn keyword ngxDirectiveThirdParty fastcgi_split_path_info
+" syn keyword ngxDirectiveThirdParty fastcgi_store
+" syn keyword ngxDirectiveThirdParty fastcgi_store_access
+" syn keyword ngxDirectiveThirdParty fastcgi_temp_file_write_size
+" syn keyword ngxDirectiveThirdParty fastcgi_temp_path
+syn keyword ngxDirectiveDeprecated fastcgi_upstream_fail_timeout
+syn keyword ngxDirectiveDeprecated fastcgi_upstream_max_fails
 
-" Cache Purge Module <http://labs.frickle.com/nginx_ngx_cache_purge/>
-" Module adding ability to purge content from FastCGI and proxy caches.
+" Akamai G2O Module <https://github.com/kaltura/nginx_mod_akamai_g2o>
+" Nginx Module for Authenticating Akamai G2O requests
+syn keyword ngxDirectiveThirdParty g2o
+syn keyword ngxDirectiveThirdParty g2o_nonce
+syn keyword ngxDirectiveThirdParty g2o_key
+
+" Lua Module <https://github.com/alacner/nginx_lua_module>
+" You can be very simple to execute lua code for nginx
+syn keyword ngxDirectiveThirdParty lua_file
+
+" Array Variable Module <https://github.com/openresty/array-var-nginx-module>
+" Add support for array-typed variables to nginx config files
+syn keyword ngxDirectiveThirdParty array_split
+syn keyword ngxDirectiveThirdParty array_join
+syn keyword ngxDirectiveThirdParty array_map
+syn keyword ngxDirectiveThirdParty array_map_op
+
+" Nginx Audio Track for HTTP Live Streaming <https://github.com/flavioribeiro/nginx-audio-track-for-hls-module>
+" This nginx module generates audio track for hls streams on the fly.
+syn keyword ngxDirectiveThirdParty ngx_hls_audio_track
+syn keyword ngxDirectiveThirdParty ngx_hls_audio_track_rootpath
+syn keyword ngxDirectiveThirdParty ngx_hls_audio_track_output_format
+syn keyword ngxDirectiveThirdParty ngx_hls_audio_track_output_header
+
+" AWS Proxy Module <https://github.com/anomalizer/ngx_aws_auth>
+" Nginx module to proxy to authenticated AWS services
+syn keyword ngxDirectiveThirdParty aws_access_key
+syn keyword ngxDirectiveThirdParty aws_key_scope
+syn keyword ngxDirectiveThirdParty aws_signing_key
+syn keyword ngxDirectiveThirdParty aws_endpoint
+syn keyword ngxDirectiveThirdParty aws_s3_bucket
+syn keyword ngxDirectiveThirdParty aws_sign
+
+" Backtrace module <https://github.com/alibaba/nginx-backtrace>
+" A Nginx module to dump backtrace when a worker process exits abnormally
+syn keyword ngxDirectiveThirdParty backtrace_log
+syn keyword ngxDirectiveThirdParty backtrace_max_stack_size
+
+" Brotli Module <https://github.com/google/ngx_brotli>
+" Nginx module for Brotli compression
+syn keyword ngxDirectiveThirdParty brotli_static
+syn keyword ngxDirectiveThirdParty brotli
+syn keyword ngxDirectiveThirdParty brotli_types
+syn keyword ngxDirectiveThirdParty brotli_buffers
+syn keyword ngxDirectiveThirdParty brotli_comp_level
+syn keyword ngxDirectiveThirdParty brotli_window
+syn keyword ngxDirectiveThirdParty brotli_min_length
+
+" Cache Purge Module <https://github.com/FRiCKLE/ngx_cache_purge>
+" Adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches.
 syn keyword ngxDirectiveThirdParty fastcgi_cache_purge
 syn keyword ngxDirectiveThirdParty proxy_cache_purge
+" syn keyword ngxDirectiveThirdParty scgi_cache_purge
+" syn keyword ngxDirectiveThirdParty uwsgi_cache_purge
 
-" Chunkin Module <http://wiki.nginx.org/NginxHttpChunkinModule>
+" Chunkin Module (DEPRECATED) <http://wiki.nginx.org/NginxHttpChunkinModule>
 " HTTP 1.1 chunked-encoding request body support for Nginx.
-syn keyword ngxDirectiveThirdParty chunkin
-syn keyword ngxDirectiveThirdParty chunkin_keepalive
-syn keyword ngxDirectiveThirdParty chunkin_max_chunks_per_buf
-syn keyword ngxDirectiveThirdParty chunkin_resume
+syn keyword ngxDirectiveDeprecated chunkin
+syn keyword ngxDirectiveDeprecated chunkin_keepalive
+syn keyword ngxDirectiveDeprecated chunkin_max_chunks_per_buf
+syn keyword ngxDirectiveDeprecated chunkin_resume
 
-" Circle GIF Module <http://wiki.nginx.org/NginxHttpCircleGifModule>
+" Circle GIF Module <https://github.com/evanmiller/nginx_circle_gif>
 " Generates simple circle images with the colors and size specified in the URL.
 syn keyword ngxDirectiveThirdParty circle_gif
 syn keyword ngxDirectiveThirdParty circle_gif_max_radius
 syn keyword ngxDirectiveThirdParty circle_gif_min_radius
 syn keyword ngxDirectiveThirdParty circle_gif_step_radius
 
-" Drizzle Module <http://github.com/chaoslawful/drizzle-nginx-module>
-" Make nginx talk directly to mysql, drizzle, and sqlite3 by libdrizzle.
-syn keyword ngxDirectiveThirdParty drizzle_connect_timeout
-syn keyword ngxDirectiveThirdParty drizzle_dbname
+" Nginx-Clojure Module <http://nginx-clojure.github.io/index.html>
+" Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
+syn keyword ngxDirectiveThirdParty jvm_path
+syn keyword ngxDirectiveThirdParty jvm_var
+syn keyword ngxDirectiveThirdParty jvm_classpath
+syn keyword ngxDirectiveThirdParty jvm_classpath_check
+syn keyword ngxDirectiveThirdParty jvm_workers
+syn keyword ngxDirectiveThirdParty jvm_options
+syn keyword ngxDirectiveThirdParty jvm_handler_type
+syn keyword ngxDirectiveThirdParty jvm_init_handler_name
+syn keyword ngxDirectiveThirdParty jvm_init_handler_code
+syn keyword ngxDirectiveThirdParty jvm_exit_handler_name
+syn keyword ngxDirectiveThirdParty jvm_exit_handler_code
+syn keyword ngxDirectiveThirdParty handlers_lazy_init
+syn keyword ngxDirectiveThirdParty auto_upgrade_ws
+syn keyword ngxDirectiveThirdParty content_handler_type
+syn keyword ngxDirectiveThirdParty content_handler_name
+syn keyword ngxDirectiveThirdParty content_handler_code
+syn keyword ngxDirectiveThirdParty rewrite_handler_type
+syn keyword ngxDirectiveThirdParty rewrite_handler_name
+syn keyword ngxDirectiveThirdParty rewrite_handler_code
+syn keyword ngxDirectiveThirdParty access_handler_type
+syn keyword ngxDirectiveThirdParty access_handler_name
+syn keyword ngxDirectiveThirdParty access_handler_code
+syn keyword ngxDirectiveThirdParty header_filter_type
+syn keyword ngxDirectiveThirdParty header_filter_name
+syn keyword ngxDirectiveThirdParty header_filter_code
+syn keyword ngxDirectiveThirdParty content_handler_property
+syn keyword ngxDirectiveThirdParty rewrite_handler_property
+syn keyword ngxDirectiveThirdParty access_handler_property
+syn keyword ngxDirectiveThirdParty header_filter_property
+syn keyword ngxDirectiveThirdParty always_read_body
+syn keyword ngxDirectiveThirdParty shared_map
+syn keyword ngxDirectiveThirdParty write_page_size
+
+" Upstream Consistent Hash <https://www.nginx.com/resources/wiki/modules/consistent_hash/>
+" A load balancer that uses an internal consistent hash ring to select the right backend node.
+syn keyword ngxDirectiveThirdParty consistent_hash
+
+" Nginx Development Kit <https://github.com/simpl/ngx_devel_kit>
+" The NDK is an Nginx module that is designed to extend the core functionality of the excellent Nginx webserver in a way that can be used as a basis of other Nginx modules.
+" NDK_UPSTREAM_LIST
+" This submodule provides a directive that creates a list of upstreams, with optional weighting. This list can then be used by other modules to hash over the upstreams however they choose.
+syn keyword ngxDirectiveThirdParty upstream_list
+
+" Drizzle Module <https://www.nginx.com/resources/wiki/modules/drizzle/>
+" Upstream module for talking to MySQL and Drizzle directly
+syn keyword ngxDirectiveThirdParty drizzle_server
 syn keyword ngxDirectiveThirdParty drizzle_keepalive
-syn keyword ngxDirectiveThirdParty drizzle_module_header
-syn keyword ngxDirectiveThirdParty drizzle_pass
 syn keyword ngxDirectiveThirdParty drizzle_query
+syn keyword ngxDirectiveThirdParty drizzle_pass
+syn keyword ngxDirectiveThirdParty drizzle_connect_timeout
+syn keyword ngxDirectiveThirdParty drizzle_send_query_timeout
 syn keyword ngxDirectiveThirdParty drizzle_recv_cols_timeout
 syn keyword ngxDirectiveThirdParty drizzle_recv_rows_timeout
-syn keyword ngxDirectiveThirdParty drizzle_send_query_timeout
-syn keyword ngxDirectiveThirdParty drizzle_server
+syn keyword ngxDirectiveThirdParty drizzle_buffer_size
+syn keyword ngxDirectiveThirdParty drizzle_module_header
+syn keyword ngxDirectiveThirdParty drizzle_status
 
-" Echo Module <http://wiki.nginx.org/NginxHttpEchoModule>
-" Brings 'echo', 'sleep', 'time', 'exec' and more shell-style goodies to Nginx config file.
+" Dynamic ETags Module <https://github.com/kali/nginx-dynamic-etags>
+" Attempt at handling ETag / If-None-Match on proxied content.
+syn keyword ngxDirectiveThirdParty dynamic_etags
+
+" Echo Module <https://www.nginx.com/resources/wiki/modules/echo/>
+" Bringing the power of "echo", "sleep", "time" and more to Nginx's config file
 syn keyword ngxDirectiveThirdParty echo
-syn keyword ngxDirectiveThirdParty echo_after_body
-syn keyword ngxDirectiveThirdParty echo_before_body
-syn keyword ngxDirectiveThirdParty echo_blocking_sleep
 syn keyword ngxDirectiveThirdParty echo_duplicate
-syn keyword ngxDirectiveThirdParty echo_end
-syn keyword ngxDirectiveThirdParty echo_exec
 syn keyword ngxDirectiveThirdParty echo_flush
-syn keyword ngxDirectiveThirdParty echo_foreach_split
-syn keyword ngxDirectiveThirdParty echo_location
-syn keyword ngxDirectiveThirdParty echo_location_async
-syn keyword ngxDirectiveThirdParty echo_read_request_body
-syn keyword ngxDirectiveThirdParty echo_request_body
-syn keyword ngxDirectiveThirdParty echo_reset_timer
 syn keyword ngxDirectiveThirdParty echo_sleep
-syn keyword ngxDirectiveThirdParty echo_subrequest
+syn keyword ngxDirectiveThirdParty echo_blocking_sleep
+syn keyword ngxDirectiveThirdParty echo_reset_timer
+syn keyword ngxDirectiveThirdParty echo_read_request_body
+syn keyword ngxDirectiveThirdParty echo_location_async
+syn keyword ngxDirectiveThirdParty echo_location
 syn keyword ngxDirectiveThirdParty echo_subrequest_async
+syn keyword ngxDirectiveThirdParty echo_subrequest
+syn keyword ngxDirectiveThirdParty echo_foreach_split
+syn keyword ngxDirectiveThirdParty echo_end
+syn keyword ngxDirectiveThirdParty echo_request_body
+syn keyword ngxDirectiveThirdParty echo_exec
+syn keyword ngxDirectiveThirdParty echo_status
+syn keyword ngxDirectiveThirdParty echo_before_body
+syn keyword ngxDirectiveThirdParty echo_after_body
 
-" Events Module <http://docs.dutov.org/nginx_modules_events_en.html>
+" Encrypted Session Module <https://github.com/openresty/encrypted-session-nginx-module>
+" Encrypt and decrypt nginx variable values
+syn keyword ngxDirectiveThirdParty encrypted_session_key
+syn keyword ngxDirectiveThirdParty encrypted_session_iv
+syn keyword ngxDirectiveThirdParty encrypted_session_expires
+syn keyword ngxDirectiveThirdParty set_encrypt_session
+syn keyword ngxDirectiveThirdParty set_decrypt_session
+
+" Enhanced Memcached Module <https://github.com/bpaquet/ngx_http_enhanced_memcached_module>
+" This module is based on the standard Nginx Memcached module, with some additonal features
+syn keyword ngxDirectiveThirdParty enhanced_memcached_pass
+syn keyword ngxDirectiveThirdParty enhanced_memcached_hash_keys_with_md5
+syn keyword ngxDirectiveThirdParty enhanced_memcached_allow_put
+syn keyword ngxDirectiveThirdParty enhanced_memcached_allow_delete
+syn keyword ngxDirectiveThirdParty enhanced_memcached_stats
+syn keyword ngxDirectiveThirdParty enhanced_memcached_flush
+syn keyword ngxDirectiveThirdParty enhanced_memcached_flush_namespace
+syn keyword ngxDirectiveThirdParty enhanced_memcached_bind
+syn keyword ngxDirectiveThirdParty enhanced_memcached_connect_timeout
+syn keyword ngxDirectiveThirdParty enhanced_memcached_send_timeout
+syn keyword ngxDirectiveThirdParty enhanced_memcached_buffer_size
+syn keyword ngxDirectiveThirdParty enhanced_memcached_read_timeout
+
+" Events Module (DEPRECATED) <http://docs.dutov.org/nginx_modules_events_en.html>
 " Provides options for start/stop events.
-syn keyword ngxDirectiveThirdParty on_start
-syn keyword ngxDirectiveThirdParty on_stop
+syn keyword ngxDirectiveDeprecated on_start
+syn keyword ngxDirectiveDeprecated on_stop
 
-" EY Balancer Module <http://github.com/ry/nginx-ey-balancer>
+" EY Balancer Module <https://github.com/ezmobius/nginx-ey-balancer>
 " Adds a request queue to Nginx that allows the limiting of concurrent requests passed to the upstream.
 syn keyword ngxDirectiveThirdParty max_connections
 syn keyword ngxDirectiveThirdParty max_connections_max_queue_length
 syn keyword ngxDirectiveThirdParty max_connections_queue_timeout
 
-" Fancy Indexes Module <https://connectical.com/projects/ngx-fancyindex/wiki>
+" Upstream Fair Balancer <https://www.nginx.com/resources/wiki/modules/fair_balancer/>
+" Sends an incoming request to the least-busy backend server, rather than distributing requests round-robin.
+syn keyword ngxDirectiveThirdParty fair
+syn keyword ngxDirectiveThirdParty upstream_fair_shm_size
+
+" Fancy Indexes Module <https://github.com/aperezdc/ngx-fancyindex>
 " Like the built-in autoindex module, but fancier.
 syn keyword ngxDirectiveThirdParty fancyindex
+syn keyword ngxDirectiveThirdParty fancyindex_default_sort
+syn keyword ngxDirectiveThirdParty fancyindex_directories_first
+syn keyword ngxDirectiveThirdParty fancyindex_css_href
 syn keyword ngxDirectiveThirdParty fancyindex_exact_size
+syn keyword ngxDirectiveThirdParty fancyindex_name_length
 syn keyword ngxDirectiveThirdParty fancyindex_footer
 syn keyword ngxDirectiveThirdParty fancyindex_header
+syn keyword ngxDirectiveThirdParty fancyindex_show_path
+syn keyword ngxDirectiveThirdParty fancyindex_ignore
+syn keyword ngxDirectiveThirdParty fancyindex_hide_symlinks
 syn keyword ngxDirectiveThirdParty fancyindex_localtime
-syn keyword ngxDirectiveThirdParty fancyindex_readme
-syn keyword ngxDirectiveThirdParty fancyindex_readme_mode
+syn keyword ngxDirectiveThirdParty fancyindex_time_format
+
+" Form Auth Module <https://github.com/veruu/ngx_form_auth>
+" Provides authentication and authorization with credentials submitted via POST request
+syn keyword ngxDirectiveThirdParty form_auth
+syn keyword ngxDirectiveThirdParty form_auth_pam_service
+syn keyword ngxDirectiveThirdParty form_auth_login
+syn keyword ngxDirectiveThirdParty form_auth_password
+syn keyword ngxDirectiveThirdParty form_auth_remote_user
+
+" Form Input Module <https://github.com/calio/form-input-nginx-module>
+" Reads HTTP POST and PUT request body encoded in "application/x-www-form-urlencoded" and parses the arguments into nginx variables.
+syn keyword ngxDirectiveThirdParty set_form_input
+syn keyword ngxDirectiveThirdParty set_form_input_multi
 
 " GeoIP Module (DEPRECATED) <http://wiki.nginx.org/NginxHttp3rdPartyGeoIPModule>
 " Country code lookups via the MaxMind GeoIP API.
-syn keyword ngxDirectiveThirdParty geoip_country_file
+syn keyword ngxDirectiveDeprecated geoip_country_file
 
-" Headers More Module <http://wiki.nginx.org/NginxHttpHeadersMoreModule>
+" GeoIP 2 Module <https://github.com/leev/ngx_http_geoip2_module>
+" Creates variables with values from the maxmind geoip2 databases based on the client IP
+syn keyword ngxDirectiveThirdParty geoip2
+
+" GridFS Module <https://github.com/mdirolf/nginx-gridfs>
+" Nginx module for serving files from MongoDB's GridFS
+syn keyword ngxDirectiveThirdParty gridfs
+
+" Headers More Module <https://github.com/openresty/headers-more-nginx-module>
 " Set and clear input and output headers...more than "add"!
 syn keyword ngxDirectiveThirdParty more_clear_headers
 syn keyword ngxDirectiveThirdParty more_clear_input_headers
 syn keyword ngxDirectiveThirdParty more_set_headers
 syn keyword ngxDirectiveThirdParty more_set_input_headers
 
-" HTTP Push Module <http://pushmodule.slact.net/>
-" Turn Nginx into an adept long-polling HTTP Push (Comet) server.
-syn keyword ngxDirectiveThirdParty push_buffer_size
-syn keyword ngxDirectiveThirdParty push_listener
-syn keyword ngxDirectiveThirdParty push_message_timeout
-syn keyword ngxDirectiveThirdParty push_queue_messages
-syn keyword ngxDirectiveThirdParty push_sender
+" Health Checks Upstreams Module <https://www.nginx.com/resources/wiki/modules/healthcheck/>
+" Polls backends and if they respond with HTTP 200 + an optional request body, they are marked good. Otherwise, they are marked bad.
+syn keyword ngxDirectiveThirdParty healthcheck_enabled
+syn keyword ngxDirectiveThirdParty healthcheck_delay
+syn keyword ngxDirectiveThirdParty healthcheck_timeout
+syn keyword ngxDirectiveThirdParty healthcheck_failcount
+syn keyword ngxDirectiveThirdParty healthcheck_send
+syn keyword ngxDirectiveThirdParty healthcheck_expected
+syn keyword ngxDirectiveThirdParty healthcheck_buffer
+syn keyword ngxDirectiveThirdParty healthcheck_status
 
-" HTTP Redis Module <http://people.FreeBSD.ORG/~osa/ngx_http_redis-0.3.1.tar.gz>>
-" Redis <http://code.google.com/p/redis/> support.>
-syn keyword ngxDirectiveThirdParty redis_bind
-syn keyword ngxDirectiveThirdParty redis_buffer_size
-syn keyword ngxDirectiveThirdParty redis_connect_timeout
-syn keyword ngxDirectiveThirdParty redis_next_upstream
-syn keyword ngxDirectiveThirdParty redis_pass
-syn keyword ngxDirectiveThirdParty redis_read_timeout
-syn keyword ngxDirectiveThirdParty redis_send_timeout
+" HTTP Accounting Module <https://github.com/Lax/ngx_http_accounting_module>
+" Add traffic stat function to nginx. Useful for http accounting based on nginx configuration logic
+syn keyword ngxDirectiveThirdParty http_accounting
+syn keyword ngxDirectiveThirdParty http_accounting_log
+syn keyword ngxDirectiveThirdParty http_accounting_id
+syn keyword ngxDirectiveThirdParty http_accounting_interval
+syn keyword ngxDirectiveThirdParty http_accounting_perturb
 
-" HTTP JavaScript Module <http://wiki.github.com/kung-fu-tzu/ngx_http_js_module>
+" Nginx Digest Authentication module <https://github.com/atomx/nginx-http-auth-digest>
+" Digest Authentication for Nginx
+syn keyword ngxDirectiveThirdParty auth_digest
+syn keyword ngxDirectiveThirdParty auth_digest_user_file
+syn keyword ngxDirectiveThirdParty auth_digest_timeout
+syn keyword ngxDirectiveThirdParty auth_digest_expires
+syn keyword ngxDirectiveThirdParty auth_digest_replays
+syn keyword ngxDirectiveThirdParty auth_digest_shm_size
+
+" Auth PAM Module <https://github.com/sto/ngx_http_auth_pam_module>
+" HTTP Basic Authentication using PAM.
+syn keyword ngxDirectiveThirdParty auth_pam
+syn keyword ngxDirectiveThirdParty auth_pam_service_name
+
+" HTTP Auth Request Module <http://nginx.org/en/docs/http/ngx_http_auth_request_module.html>
+" Implements client authorization based on the result of a subrequest
+" syn keyword ngxDirectiveThirdParty auth_request
+" syn keyword ngxDirectiveThirdParty auth_request_set
+
+" HTTP Concatenation module for Nginx <https://github.com/alibaba/nginx-http-concat>
+" A Nginx module for concatenating files in a given context: CSS and JS files usually
+syn keyword ngxDirectiveThirdParty concat
+syn keyword ngxDirectiveThirdParty concat_types
+syn keyword ngxDirectiveThirdParty concat_unique
+syn keyword ngxDirectiveThirdParty concat_max_files
+syn keyword ngxDirectiveThirdParty concat_delimiter
+syn keyword ngxDirectiveThirdParty concat_ignore_file_error
+
+" HTTP Dynamic Upstream Module <https://github.com/yzprofile/ngx_http_dyups_module>
+" Update upstreams' config by restful interface
+syn keyword ngxDirectiveThirdParty dyups_interface
+syn keyword ngxDirectiveThirdParty dyups_read_msg_timeout
+syn keyword ngxDirectiveThirdParty dyups_shm_zone_size
+syn keyword ngxDirectiveThirdParty dyups_upstream_conf
+syn keyword ngxDirectiveThirdParty dyups_trylock
+
+" HTTP Footer If Filter Module <https://github.com/flygoast/ngx_http_footer_if_filter>
+" The ngx_http_footer_if_filter_module is used to add given content to the end of the response according to the condition specified.
+syn keyword ngxDirectiveThirdParty footer_if
+
+" HTTP Footer Filter Module <https://github.com/alibaba/nginx-http-footer-filter>
+" This module implements a body filter that adds a given string to the page footer.
+syn keyword ngxDirectiveThirdParty footer
+syn keyword ngxDirectiveThirdParty footer_types
+
+" HTTP Internal Redirect Module <https://github.com/flygoast/ngx_http_internal_redirect>
+" Make an internal redirect to the uri specified according to the condition specified.
+syn keyword ngxDirectiveThirdParty internal_redirect_if
+syn keyword ngxDirectiveThirdParty internal_redirect_if_no_postponed
+
+" HTTP JavaScript Module <https://github.com/peter-leonov/ngx_http_js_module>
 " Embedding SpiderMonkey. Nearly full port on Perl module.
 syn keyword ngxDirectiveThirdParty js
 syn keyword ngxDirectiveThirdParty js_filter
@@ -664,12 +1015,152 @@ syn keyword ngxDirectiveThirdParty js_require
 syn keyword ngxDirectiveThirdParty js_set
 syn keyword ngxDirectiveThirdParty js_utf8
 
-" Log Request Speed <http://wiki.nginx.org/NginxHttpLogRequestSpeed>
-" Log the time it took to process each request.
-syn keyword ngxDirectiveThirdParty log_request_speed_filter
-syn keyword ngxDirectiveThirdParty log_request_speed_filter_timeout
+" HTTP Push Module (DEPRECATED) <http://pushmodule.slact.net/>
+" Turn Nginx into an adept long-polling HTTP Push (Comet) server.
+syn keyword ngxDirectiveDeprecated push_buffer_size
+syn keyword ngxDirectiveDeprecated push_listener
+syn keyword ngxDirectiveDeprecated push_message_timeout
+syn keyword ngxDirectiveDeprecated push_queue_messages
+syn keyword ngxDirectiveDeprecated push_sender
 
-" Memc Module <http://wiki.nginx.org/NginxHttpMemcModule>
+" HTTP Redis Module <https://www.nginx.com/resources/wiki/modules/redis/>
+" Redis <http://code.google.com/p/redis/> support.
+syn keyword ngxDirectiveThirdParty redis_bind
+syn keyword ngxDirectiveThirdParty redis_buffer_size
+syn keyword ngxDirectiveThirdParty redis_connect_timeout
+syn keyword ngxDirectiveThirdParty redis_next_upstream
+syn keyword ngxDirectiveThirdParty redis_pass
+syn keyword ngxDirectiveThirdParty redis_read_timeout
+syn keyword ngxDirectiveThirdParty redis_send_timeout
+
+" Iconv Module <https://github.com/calio/iconv-nginx-module>
+" A character conversion nginx module using libiconv
+syn keyword ngxDirectiveThirdParty set_iconv
+syn keyword ngxDirectiveThirdParty iconv_buffer_size
+syn keyword ngxDirectiveThirdParty iconv_filter
+
+" IP Blocker Module <https://github.com/tmthrgd/nginx-ip-blocker>
+" An efficient shared memory IP blocking system for nginx.
+syn keyword ngxDirectiveThirdParty ip_blocker
+
+" IP2Location Module <https://github.com/chrislim2888/ip2location-nginx>
+" Allows user to lookup for geolocation information using IP2Location database
+syn keyword ngxDirectiveThirdParty ip2location_database
+
+" JS Module <https://github.com/peter-leonov/ngx_http_js_module>
+" Reflect the nginx functionality in JS
+syn keyword ngxDirectiveThirdParty js
+syn keyword ngxDirectiveThirdParty js_access
+syn keyword ngxDirectiveThirdParty js_load
+syn keyword ngxDirectiveThirdParty js_set
+
+" Limit Upload Rate Module <https://github.com/cfsego/limit_upload_rate>
+" Limit client-upload rate when they are sending request bodies to you
+syn keyword ngxDirectiveThirdParty limit_upload_rate
+syn keyword ngxDirectiveThirdParty limit_upload_rate_after
+
+" Limit Upstream Module <https://github.com/cfsego/nginx-limit-upstream>
+" Limit the number of connections to upstream for NGINX
+syn keyword ngxDirectiveThirdParty limit_upstream_zone
+syn keyword ngxDirectiveThirdParty limit_upstream_conn
+syn keyword ngxDirectiveThirdParty limit_upstream_log_level
+
+" Log If Module <https://github.com/cfsego/ngx_log_if>
+" Conditional accesslog for nginx
+syn keyword ngxDirectiveThirdParty access_log_bypass_if
+
+" Log Request Speed (DEPRECATED) <http://wiki.nginx.org/NginxHttpLogRequestSpeed>
+" Log the time it took to process each request.
+syn keyword ngxDirectiveDeprecated log_request_speed_filter
+syn keyword ngxDirectiveDeprecated log_request_speed_filter_timeout
+
+" Log ZeroMQ Module <https://github.com/alticelabs/nginx-log-zmq>
+" ZeroMQ logger module for nginx
+syn keyword ngxDirectiveThirdParty log_zmq_server
+syn keyword ngxDirectiveThirdParty log_zmq_endpoint
+syn keyword ngxDirectiveThirdParty log_zmq_format
+syn keyword ngxDirectiveThirdParty log_zmq_off
+
+" Lower/UpperCase Module <https://github.com/replay/ngx_http_lower_upper_case>
+" This module simply uppercases or lowercases a string and saves it into a new variable.
+syn keyword ngxDirectiveThirdParty lower
+syn keyword ngxDirectiveThirdParty upper
+
+" Lua Upstream Module <https://github.com/openresty/lua-upstream-nginx-module>
+" Nginx C module to expose Lua API to ngx_lua for Nginx upstreams
+
+" Lua Module <https://github.com/openresty/lua-nginx-module>
+" Embed the Power of Lua into NGINX HTTP servers
+syn keyword ngxDirectiveThirdParty lua_use_default_type
+syn keyword ngxDirectiveThirdParty lua_malloc_trim
+syn keyword ngxDirectiveThirdParty lua_code_cache
+syn keyword ngxDirectiveThirdParty lua_regex_cache_max_entries
+syn keyword ngxDirectiveThirdParty lua_regex_match_limit
+syn keyword ngxDirectiveThirdParty lua_package_path
+syn keyword ngxDirectiveThirdParty lua_package_cpath
+syn keyword ngxDirectiveThirdParty init_by_lua
+syn keyword ngxDirectiveThirdParty init_by_lua_block
+syn keyword ngxDirectiveThirdParty init_by_lua_file
+syn keyword ngxDirectiveThirdParty init_worker_by_lua
+syn keyword ngxDirectiveThirdParty init_worker_by_lua_block
+syn keyword ngxDirectiveThirdParty init_worker_by_lua_file
+syn keyword ngxDirectiveThirdParty set_by_lua
+syn keyword ngxDirectiveThirdParty set_by_lua_block
+syn keyword ngxDirectiveThirdParty set_by_lua_file
+syn keyword ngxDirectiveThirdParty content_by_lua
+syn keyword ngxDirectiveThirdParty content_by_lua_block
+syn keyword ngxDirectiveThirdParty content_by_lua_file
+syn keyword ngxDirectiveThirdParty rewrite_by_lua
+syn keyword ngxDirectiveThirdParty rewrite_by_lua_block
+syn keyword ngxDirectiveThirdParty rewrite_by_lua_file
+syn keyword ngxDirectiveThirdParty access_by_lua
+syn keyword ngxDirectiveThirdParty access_by_lua_block
+syn keyword ngxDirectiveThirdParty access_by_lua_file
+syn keyword ngxDirectiveThirdParty header_filter_by_lua
+syn keyword ngxDirectiveThirdParty header_filter_by_lua_block
+syn keyword ngxDirectiveThirdParty header_filter_by_lua_file
+syn keyword ngxDirectiveThirdParty body_filter_by_lua
+syn keyword ngxDirectiveThirdParty body_filter_by_lua_block
+syn keyword ngxDirectiveThirdParty body_filter_by_lua_file
+syn keyword ngxDirectiveThirdParty log_by_lua
+syn keyword ngxDirectiveThirdParty log_by_lua_block
+syn keyword ngxDirectiveThirdParty log_by_lua_file
+syn keyword ngxDirectiveThirdParty balancer_by_lua_block
+syn keyword ngxDirectiveThirdParty balancer_by_lua_file
+syn keyword ngxDirectiveThirdParty lua_need_request_body
+syn keyword ngxDirectiveThirdParty ssl_certificate_by_lua_block
+syn keyword ngxDirectiveThirdParty ssl_certificate_by_lua_file
+syn keyword ngxDirectiveThirdParty ssl_session_fetch_by_lua_block
+syn keyword ngxDirectiveThirdParty ssl_session_fetch_by_lua_file
+syn keyword ngxDirectiveThirdParty ssl_session_store_by_lua_block
+syn keyword ngxDirectiveThirdParty ssl_session_store_by_lua_file
+syn keyword ngxDirectiveThirdParty lua_shared_dict
+syn keyword ngxDirectiveThirdParty lua_socket_connect_timeout
+syn keyword ngxDirectiveThirdParty lua_socket_send_timeout
+syn keyword ngxDirectiveThirdParty lua_socket_send_lowat
+syn keyword ngxDirectiveThirdParty lua_socket_read_timeout
+syn keyword ngxDirectiveThirdParty lua_socket_buffer_size
+syn keyword ngxDirectiveThirdParty lua_socket_pool_size
+syn keyword ngxDirectiveThirdParty lua_socket_keepalive_timeout
+syn keyword ngxDirectiveThirdParty lua_socket_log_errors
+syn keyword ngxDirectiveThirdParty lua_ssl_ciphers
+syn keyword ngxDirectiveThirdParty lua_ssl_crl
+syn keyword ngxDirectiveThirdParty lua_ssl_protocols
+syn keyword ngxDirectiveThirdParty lua_ssl_trusted_certificate
+syn keyword ngxDirectiveThirdParty lua_ssl_verify_depth
+syn keyword ngxDirectiveThirdParty lua_http10_buffering
+syn keyword ngxDirectiveThirdParty rewrite_by_lua_no_postpone
+syn keyword ngxDirectiveThirdParty access_by_lua_no_postpone
+syn keyword ngxDirectiveThirdParty lua_transform_underscores_in_response_headers
+syn keyword ngxDirectiveThirdParty lua_check_client_abort
+syn keyword ngxDirectiveThirdParty lua_max_pending_timers
+syn keyword ngxDirectiveThirdParty lua_max_running_timers
+
+" MD5 Filter Module <https://github.com/kainswor/nginx_md5_filter>
+" A content filter for nginx, which returns the md5 hash of the content otherwise returned.
+syn keyword ngxDirectiveThirdParty md5_filter
+
+" Memc Module <https://github.com/openresty/memc-nginx-module>
 " An extended version of the standard memcached module that supports set, add, delete, and many more memcached commands.
 syn keyword ngxDirectiveThirdParty memc_buffer_size
 syn keyword ngxDirectiveThirdParty memc_cmds_allowed
@@ -682,65 +1173,596 @@ syn keyword ngxDirectiveThirdParty memc_send_timeout
 syn keyword ngxDirectiveThirdParty memc_upstream_fail_timeout
 syn keyword ngxDirectiveThirdParty memc_upstream_max_fails
 
+" Mod Security Module <https://github.com/SpiderLabs/ModSecurity>
+" ModSecurity is an open source, cross platform web application firewall (WAF) engine
+syn keyword ngxDirectiveThirdParty ModSecurityConfig
+syn keyword ngxDirectiveThirdParty ModSecurityEnabled
+syn keyword ngxDirectiveThirdParty pool_context
+syn keyword ngxDirectiveThirdParty pool_context_hash_size
+
 " Mogilefs Module <http://www.grid.net.ru/nginx/mogilefs.en.html>
-" Implements a MogileFS client, provides a replace to the Perlbal reverse proxy of the original MogileFS.
-syn keyword ngxDirectiveThirdParty mogilefs_connect_timeout
-syn keyword ngxDirectiveThirdParty mogilefs_domain
-syn keyword ngxDirectiveThirdParty mogilefs_methods
-syn keyword ngxDirectiveThirdParty mogilefs_noverify
+" MogileFS client for nginx web server.
 syn keyword ngxDirectiveThirdParty mogilefs_pass
-syn keyword ngxDirectiveThirdParty mogilefs_read_timeout
-syn keyword ngxDirectiveThirdParty mogilefs_send_timeout
+syn keyword ngxDirectiveThirdParty mogilefs_methods
+syn keyword ngxDirectiveThirdParty mogilefs_domain
+syn keyword ngxDirectiveThirdParty mogilefs_class
 syn keyword ngxDirectiveThirdParty mogilefs_tracker
+syn keyword ngxDirectiveThirdParty mogilefs_noverify
+syn keyword ngxDirectiveThirdParty mogilefs_connect_timeout
+syn keyword ngxDirectiveThirdParty mogilefs_send_timeout
+syn keyword ngxDirectiveThirdParty mogilefs_read_timeout
 
-" MP4 Streaming Lite Module <http://wiki.nginx.org/NginxMP4StreamingLite>
+" Mongo Module <https://github.com/simpl/ngx_mongo>
+" Upstream module that allows nginx to communicate directly with MongoDB database.
+syn keyword ngxDirectiveThirdParty mongo_auth
+syn keyword ngxDirectiveThirdParty mongo_pass
+syn keyword ngxDirectiveThirdParty mongo_query
+syn keyword ngxDirectiveThirdParty mongo_json
+syn keyword ngxDirectiveThirdParty mongo_bind
+syn keyword ngxDirectiveThirdParty mongo_connect_timeout
+syn keyword ngxDirectiveThirdParty mongo_send_timeout
+syn keyword ngxDirectiveThirdParty mongo_read_timeout
+syn keyword ngxDirectiveThirdParty mongo_buffering
+syn keyword ngxDirectiveThirdParty mongo_buffer_size
+syn keyword ngxDirectiveThirdParty mongo_buffers
+syn keyword ngxDirectiveThirdParty mongo_busy_buffers_size
+syn keyword ngxDirectiveThirdParty mongo_next_upstream
+
+" MP4 Streaming Lite Module <https://www.nginx.com/resources/wiki/modules/mp4_streaming/>
 " Will seek to a certain time within H.264/MP4 files when provided with a 'start' parameter in the URL.
-syn keyword ngxDirectiveThirdParty mp4
+" syn keyword ngxDirectiveThirdParty mp4
 
-" Nginx Notice Module <http://xph.us/software/nginx-notice/>
+" NAXSI Module <https://github.com/nbs-system/naxsi>
+" NAXSI is an open-source, high performance, low rules maintenance WAF for NGINX
+syn keyword ngxDirectiveThirdParty DeniedUrl denied_url
+syn keyword ngxDirectiveThirdParty LearningMode learning_mode
+syn keyword ngxDirectiveThirdParty SecRulesEnabled rules_enabled
+syn keyword ngxDirectiveThirdParty SecRulesDisabled rules_disabled
+syn keyword ngxDirectiveThirdParty CheckRule check_rule
+syn keyword ngxDirectiveThirdParty BasicRule basic_rule
+syn keyword ngxDirectiveThirdParty MainRule main_rule
+syn keyword ngxDirectiveThirdParty LibInjectionSql libinjection_sql
+syn keyword ngxDirectiveThirdParty LibInjectionXss libinjection_xss
+
+" Nchan Module <https://nchan.slact.net/>
+" Fast, horizontally scalable, multiprocess pub/sub queuing server and proxy for HTTP, long-polling, Websockets and EventSource (SSE)
+syn keyword ngxDirectiveThirdParty nchan_channel_id
+syn keyword ngxDirectiveThirdParty nchan_channel_id_split_delimiter
+syn keyword ngxDirectiveThirdParty nchan_eventsource_event
+syn keyword ngxDirectiveThirdParty nchan_longpoll_multipart_response
+syn keyword ngxDirectiveThirdParty nchan_publisher
+syn keyword ngxDirectiveThirdParty nchan_publisher_channel_id
+syn keyword ngxDirectiveThirdParty nchan_publisher_upstream_request
+syn keyword ngxDirectiveThirdParty nchan_pubsub
+syn keyword ngxDirectiveThirdParty nchan_subscribe_request
+syn keyword ngxDirectiveThirdParty nchan_subscriber
+syn keyword ngxDirectiveThirdParty nchan_subscriber_channel_id
+syn keyword ngxDirectiveThirdParty nchan_subscriber_compound_etag_message_id
+syn keyword ngxDirectiveThirdParty nchan_subscriber_first_message
+syn keyword ngxDirectiveThirdParty nchan_subscriber_http_raw_stream_separator
+syn keyword ngxDirectiveThirdParty nchan_subscriber_last_message_id
+syn keyword ngxDirectiveThirdParty nchan_subscriber_message_id_custom_etag_header
+syn keyword ngxDirectiveThirdParty nchan_subscriber_timeout
+syn keyword ngxDirectiveThirdParty nchan_unsubscribe_request
+syn keyword ngxDirectiveThirdParty nchan_websocket_ping_interval
+syn keyword ngxDirectiveThirdParty nchan_authorize_request
+syn keyword ngxDirectiveThirdParty nchan_max_reserved_memory
+syn keyword ngxDirectiveThirdParty nchan_message_buffer_length
+syn keyword ngxDirectiveThirdParty nchan_message_timeout
+syn keyword ngxDirectiveThirdParty nchan_redis_idle_channel_cache_timeout
+syn keyword ngxDirectiveThirdParty nchan_redis_namespace
+syn keyword ngxDirectiveThirdParty nchan_redis_pass
+syn keyword ngxDirectiveThirdParty nchan_redis_ping_interval
+syn keyword ngxDirectiveThirdParty nchan_redis_server
+syn keyword ngxDirectiveThirdParty nchan_redis_storage_mode
+syn keyword ngxDirectiveThirdParty nchan_redis_url
+syn keyword ngxDirectiveThirdParty nchan_store_messages
+syn keyword ngxDirectiveThirdParty nchan_use_redis
+syn keyword ngxDirectiveThirdParty nchan_access_control_allow_origin
+syn keyword ngxDirectiveThirdParty nchan_channel_group
+syn keyword ngxDirectiveThirdParty nchan_channel_group_accounting
+syn keyword ngxDirectiveThirdParty nchan_group_location
+syn keyword ngxDirectiveThirdParty nchan_group_max_channels
+syn keyword ngxDirectiveThirdParty nchan_group_max_messages
+syn keyword ngxDirectiveThirdParty nchan_group_max_messages_disk
+syn keyword ngxDirectiveThirdParty nchan_group_max_messages_memory
+syn keyword ngxDirectiveThirdParty nchan_group_max_subscribers
+syn keyword ngxDirectiveThirdParty nchan_subscribe_existing_channels_only
+syn keyword ngxDirectiveThirdParty nchan_channel_event_string
+syn keyword ngxDirectiveThirdParty nchan_channel_events_channel_id
+syn keyword ngxDirectiveThirdParty nchan_stub_status
+syn keyword ngxDirectiveThirdParty nchan_max_channel_id_length
+syn keyword ngxDirectiveThirdParty nchan_max_channel_subscribers
+syn keyword ngxDirectiveThirdParty nchan_channel_timeout
+syn keyword ngxDirectiveThirdParty nchan_storage_engine
+
+" Nginx Notice Module <https://github.com/kr/nginx-notice>
 " Serve static file to POST requests.
 syn keyword ngxDirectiveThirdParty notice
 syn keyword ngxDirectiveThirdParty notice_type
 
-" Phusion Passenger <http://www.modrails.com/documentation.html>
-" Easy and robust deployment of Ruby on Rails application on Apache and Nginx webservers.
-syn keyword ngxDirectiveThirdParty passenger_base_uri
-syn keyword ngxDirectiveThirdParty passenger_default_user
-syn keyword ngxDirectiveThirdParty passenger_enabled
-syn keyword ngxDirectiveThirdParty passenger_log_level
-syn keyword ngxDirectiveThirdParty passenger_max_instances_per_app
-syn keyword ngxDirectiveThirdParty passenger_max_pool_size
-syn keyword ngxDirectiveThirdParty passenger_pool_idle_time
+" OCSP Proxy Module <https://github.com/kyprizel/nginx_ocsp_proxy-module>
+" Nginx OCSP processing module designed for response caching
+syn keyword ngxDirectiveThirdParty ocsp_proxy
+syn keyword ngxDirectiveThirdParty ocsp_cache_timeout
+
+" Eval Module <https://github.com/openresty/nginx-eval-module>
+" Module for nginx web server evaluates response of proxy or memcached module into variables.
+syn keyword ngxDirectiveThirdParty eval
+syn keyword ngxDirectiveThirdParty eval_escalate
+syn keyword ngxDirectiveThirdParty eval_buffer_size
+syn keyword ngxDirectiveThirdParty eval_override_content_type
+syn keyword ngxDirectiveThirdParty eval_subrequest_in_memory
+
+" OpenSSL Version Module <https://github.com/apcera/nginx-openssl-version>
+" Nginx OpenSSL version check at startup
+syn keyword ngxDirectiveThirdParty openssl_version_minimum
+syn keyword ngxDirectiveThirdParty openssl_builddate_minimum
+
+" Owner Match Module <https://www.nginx.com/resources/wiki/modules/owner_match/>
+" Control access for specific owners and groups of files
+syn keyword ngxDirectiveThirdParty omallow
+syn keyword ngxDirectiveThirdParty omdeny
+
+" Accept Language Module <https://www.nginx.com/resources/wiki/modules/accept_language/>
+" Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
+syn keyword ngxDirectiveThirdParty pagespeed
+
+" PHP Memcache Standard Balancer Module <https://github.com/replay/ngx_http_php_memcache_standard_balancer>
+" Loadbalancer that is compatible to the standard loadbalancer in the php-memcache module
+syn keyword ngxDirectiveThirdParty hash_key
+
+" PHP Session Module <https://github.com/replay/ngx_http_php_session>
+" Nginx module to parse php sessions
+syn keyword ngxDirectiveThirdParty php_session_parse
+syn keyword ngxDirectiveThirdParty php_session_strip_formatting
+
+" Phusion Passenger Module <https://www.phusionpassenger.com/library/config/nginx/>
+" Passenger is an open source web application server.
 syn keyword ngxDirectiveThirdParty passenger_root
+syn keyword ngxDirectiveThirdParty passenger_enabled
+syn keyword ngxDirectiveThirdParty passenger_base_uri
+syn keyword ngxDirectiveThirdParty passenger_document_root
 syn keyword ngxDirectiveThirdParty passenger_ruby
-syn keyword ngxDirectiveThirdParty passenger_use_global_queue
+syn keyword ngxDirectiveThirdParty passenger_python
+syn keyword ngxDirectiveThirdParty passenger_nodejs
+syn keyword ngxDirectiveThirdParty passenger_meteor_app_settings
+syn keyword ngxDirectiveThirdParty passenger_app_env
+syn keyword ngxDirectiveThirdParty passenger_app_root
+syn keyword ngxDirectiveThirdParty passenger_app_group_name
+syn keyword ngxDirectiveThirdParty passenger_app_type
+syn keyword ngxDirectiveThirdParty passenger_startup_file
+syn keyword ngxDirectiveThirdParty passenger_restart_dir
+syn keyword ngxDirectiveThirdParty passenger_spawn_method
+syn keyword ngxDirectiveThirdParty passenger_env_var
+syn keyword ngxDirectiveThirdParty passenger_load_shell_envvars
+syn keyword ngxDirectiveThirdParty passenger_rolling_restarts
+syn keyword ngxDirectiveThirdParty passenger_resist_deployment_errors
 syn keyword ngxDirectiveThirdParty passenger_user_switching
-syn keyword ngxDirectiveThirdParty rack_env
-syn keyword ngxDirectiveThirdParty rails_app_spawner_idle_time
-syn keyword ngxDirectiveThirdParty rails_env
-syn keyword ngxDirectiveThirdParty rails_framework_spawner_idle_time
-syn keyword ngxDirectiveThirdParty rails_spawn_method
+syn keyword ngxDirectiveThirdParty passenger_user
+syn keyword ngxDirectiveThirdParty passenger_group
+syn keyword ngxDirectiveThirdParty passenger_default_user
+syn keyword ngxDirectiveThirdParty passenger_default_group
+syn keyword ngxDirectiveThirdParty passenger_show_version_in_header
+syn keyword ngxDirectiveThirdParty passenger_friendly_error_pages
+syn keyword ngxDirectiveThirdParty passenger_disable_security_update_check
+syn keyword ngxDirectiveThirdParty passenger_security_update_check_proxy
+syn keyword ngxDirectiveThirdParty passenger_max_pool_size
+syn keyword ngxDirectiveThirdParty passenger_min_instances
+syn keyword ngxDirectiveThirdParty passenger_max_instances
+syn keyword ngxDirectiveThirdParty passenger_max_instances_per_app
+syn keyword ngxDirectiveThirdParty passenger_pool_idle_time
+syn keyword ngxDirectiveThirdParty passenger_max_preloader_idle_time
+syn keyword ngxDirectiveThirdParty passenger_force_max_concurrent_requests_per_process
+syn keyword ngxDirectiveThirdParty passenger_start_timeout
+syn keyword ngxDirectiveThirdParty passenger_concurrency_model
+syn keyword ngxDirectiveThirdParty passenger_thread_count
+syn keyword ngxDirectiveThirdParty passenger_max_requests
+syn keyword ngxDirectiveThirdParty passenger_max_request_time
+syn keyword ngxDirectiveThirdParty passenger_memory_limit
+syn keyword ngxDirectiveThirdParty passenger_stat_throttle_rate
+syn keyword ngxDirectiveThirdParty passenger_core_file_descriptor_ulimit
+syn keyword ngxDirectiveThirdParty passenger_app_file_descriptor_ulimit
+syn keyword ngxDirectiveThirdParty passenger_pre_start
+syn keyword ngxDirectiveThirdParty passenger_set_header
+syn keyword ngxDirectiveThirdParty passenger_max_request_queue_size
+syn keyword ngxDirectiveThirdParty passenger_request_queue_overflow_status_code
+syn keyword ngxDirectiveThirdParty passenger_sticky_sessions
+syn keyword ngxDirectiveThirdParty passenger_sticky_sessions_cookie_name
+syn keyword ngxDirectiveThirdParty passenger_abort_websockets_on_process_shutdown
+syn keyword ngxDirectiveThirdParty passenger_ignore_client_abort
+syn keyword ngxDirectiveThirdParty passenger_intercept_errors
+syn keyword ngxDirectiveThirdParty passenger_pass_header
+syn keyword ngxDirectiveThirdParty passenger_ignore_headers
+syn keyword ngxDirectiveThirdParty passenger_headers_hash_bucket_size
+syn keyword ngxDirectiveThirdParty passenger_headers_hash_max_size
+syn keyword ngxDirectiveThirdParty passenger_buffer_response
+syn keyword ngxDirectiveThirdParty passenger_response_buffer_high_watermark
+syn keyword ngxDirectiveThirdParty passenger_buffer_size, passenger_buffers, passenger_busy_buffers_size
+syn keyword ngxDirectiveThirdParty passenger_socket_backlog
+syn keyword ngxDirectiveThirdParty passenger_log_level
+syn keyword ngxDirectiveThirdParty passenger_log_file
+syn keyword ngxDirectiveThirdParty passenger_file_descriptor_log_file
+syn keyword ngxDirectiveThirdParty passenger_debugger
+syn keyword ngxDirectiveThirdParty passenger_instance_registry_dir
+syn keyword ngxDirectiveThirdParty passenger_data_buffer_dir
+syn keyword ngxDirectiveThirdParty passenger_fly_with
+syn keyword ngxDirectiveThirdParty union_station_support
+syn keyword ngxDirectiveThirdParty union_station_key
+syn keyword ngxDirectiveThirdParty union_station_proxy_address
+syn keyword ngxDirectiveThirdParty union_station_filter
+syn keyword ngxDirectiveThirdParty union_station_gateway_address
+syn keyword ngxDirectiveThirdParty union_station_gateway_port
+syn keyword ngxDirectiveThirdParty union_station_gateway_cert
+syn keyword ngxDirectiveDeprecated rails_spawn_method
+syn keyword ngxDirectiveDeprecated passenger_debug_log_file
 
-" RDS JSON Module <http://github.com/agentzh/rds-json-nginx-module>
-" Help ngx_drizzle and other DBD modules emit JSON data.
+" Postgres Module <http://labs.frickle.com/nginx_ngx_postgres/>
+" Upstream module that allows nginx to communicate directly with PostgreSQL database.
+syn keyword ngxDirectiveThirdParty postgres_server
+syn keyword ngxDirectiveThirdParty postgres_keepalive
+syn keyword ngxDirectiveThirdParty postgres_pass
+syn keyword ngxDirectiveThirdParty postgres_query
+syn keyword ngxDirectiveThirdParty postgres_rewrite
+syn keyword ngxDirectiveThirdParty postgres_output
+syn keyword ngxDirectiveThirdParty postgres_set
+syn keyword ngxDirectiveThirdParty postgres_escape
+syn keyword ngxDirectiveThirdParty postgres_connect_timeout
+syn keyword ngxDirectiveThirdParty postgres_result_timeout
+
+" Pubcookie Module <https://www.vanko.me/book/page/pubcookie-module-nginx>
+" Authorizes users using encrypted cookies
+syn keyword ngxDirectiveThirdParty pubcookie_inactive_expire
+syn keyword ngxDirectiveThirdParty pubcookie_hard_expire
+syn keyword ngxDirectiveThirdParty pubcookie_app_id
+syn keyword ngxDirectiveThirdParty pubcookie_dir_depth
+syn keyword ngxDirectiveThirdParty pubcookie_catenate_app_ids
+syn keyword ngxDirectiveThirdParty pubcookie_app_srv_id
+syn keyword ngxDirectiveThirdParty pubcookie_login
+syn keyword ngxDirectiveThirdParty pubcookie_login_method
+syn keyword ngxDirectiveThirdParty pubcookie_post
+syn keyword ngxDirectiveThirdParty pubcookie_domain
+syn keyword ngxDirectiveThirdParty pubcookie_granting_cert_file
+syn keyword ngxDirectiveThirdParty pubcookie_session_key_file
+syn keyword ngxDirectiveThirdParty pubcookie_session_cert_file
+syn keyword ngxDirectiveThirdParty pubcookie_crypt_key_file
+syn keyword ngxDirectiveThirdParty pubcookie_end_session
+syn keyword ngxDirectiveThirdParty pubcookie_encryption
+syn keyword ngxDirectiveThirdParty pubcookie_session_reauth
+syn keyword ngxDirectiveThirdParty pubcookie_auth_type_names
+syn keyword ngxDirectiveThirdParty pubcookie_no_prompt
+syn keyword ngxDirectiveThirdParty pubcookie_on_demand
+syn keyword ngxDirectiveThirdParty pubcookie_addl_request
+syn keyword ngxDirectiveThirdParty pubcookie_no_obscure_cookies
+syn keyword ngxDirectiveThirdParty pubcookie_no_clean_creds
+syn keyword ngxDirectiveThirdParty pubcookie_egd_device
+syn keyword ngxDirectiveThirdParty pubcookie_no_blank
+syn keyword ngxDirectiveThirdParty pubcookie_super_debug
+syn keyword ngxDirectiveThirdParty pubcookie_set_remote_user
+
+" Push Stream Module <https://github.com/wandenberg/nginx-push-stream-module>
+" A pure stream http push technology for your Nginx setup
+syn keyword ngxDirectiveThirdParty push_stream_channels_statistics
+syn keyword ngxDirectiveThirdParty push_stream_publisher
+syn keyword ngxDirectiveThirdParty push_stream_subscriber
+syn keyword ngxDirectiveThirdParty push_stream_shared_memory_size
+syn keyword ngxDirectiveThirdParty push_stream_channel_deleted_message_text
+syn keyword ngxDirectiveThirdParty push_stream_channel_inactivity_time
+syn keyword ngxDirectiveThirdParty push_stream_ping_message_text
+syn keyword ngxDirectiveThirdParty push_stream_timeout_with_body
+syn keyword ngxDirectiveThirdParty push_stream_message_ttl
+syn keyword ngxDirectiveThirdParty push_stream_max_subscribers_per_channel
+syn keyword ngxDirectiveThirdParty push_stream_max_messages_stored_per_channel
+syn keyword ngxDirectiveThirdParty push_stream_max_channel_id_length
+syn keyword ngxDirectiveThirdParty push_stream_max_number_of_channels
+syn keyword ngxDirectiveThirdParty push_stream_max_number_of_wildcard_channels
+syn keyword ngxDirectiveThirdParty push_stream_wildcard_channel_prefix
+syn keyword ngxDirectiveThirdParty push_stream_events_channel_id
+syn keyword ngxDirectiveThirdParty push_stream_channels_path
+syn keyword ngxDirectiveThirdParty push_stream_store_messages
+syn keyword ngxDirectiveThirdParty push_stream_channel_info_on_publish
+syn keyword ngxDirectiveThirdParty push_stream_authorized_channels_only
+syn keyword ngxDirectiveThirdParty push_stream_header_template_file
+syn keyword ngxDirectiveThirdParty push_stream_header_template
+syn keyword ngxDirectiveThirdParty push_stream_message_template
+syn keyword ngxDirectiveThirdParty push_stream_footer_template
+syn keyword ngxDirectiveThirdParty push_stream_wildcard_channel_max_qtd
+syn keyword ngxDirectiveThirdParty push_stream_ping_message_interval
+syn keyword ngxDirectiveThirdParty push_stream_subscriber_connection_ttl
+syn keyword ngxDirectiveThirdParty push_stream_longpolling_connection_ttl
+syn keyword ngxDirectiveThirdParty push_stream_websocket_allow_publish
+syn keyword ngxDirectiveThirdParty push_stream_last_received_message_time
+syn keyword ngxDirectiveThirdParty push_stream_last_received_message_tag
+syn keyword ngxDirectiveThirdParty push_stream_last_event_id
+syn keyword ngxDirectiveThirdParty push_stream_user_agent
+syn keyword ngxDirectiveThirdParty push_stream_padding_by_user_agent
+syn keyword ngxDirectiveThirdParty push_stream_allowed_origins
+syn keyword ngxDirectiveThirdParty push_stream_allow_connections_to_events_channel
+
+" rDNS Module <https://github.com/flant/nginx-http-rdns>
+" Make a reverse DNS (rDNS) lookup for incoming connection and provides simple access control of incoming hostname by allow/deny rules
+syn keyword ngxDirectiveThirdParty rdns
+syn keyword ngxDirectiveThirdParty rdns_allow
+syn keyword ngxDirectiveThirdParty rdns_deny
+
+" RDS CSV Module <https://github.com/openresty/rds-csv-nginx-module>
+" Nginx output filter module to convert Resty-DBD-Streams (RDS) to Comma-Separated Values (CSV)
+syn keyword ngxDirectiveThirdParty rds_csv
+syn keyword ngxDirectiveThirdParty rds_csv_row_terminator
+syn keyword ngxDirectiveThirdParty rds_csv_field_separator
+syn keyword ngxDirectiveThirdParty rds_csv_field_name_header
+syn keyword ngxDirectiveThirdParty rds_csv_content_type
+syn keyword ngxDirectiveThirdParty rds_csv_buffer_size
+
+" RDS JSON Module <https://github.com/openresty/rds-json-nginx-module>
+" An output filter that formats Resty DBD Streams generated by ngx_drizzle and others to JSON
 syn keyword ngxDirectiveThirdParty rds_json
-syn keyword ngxDirectiveThirdParty rds_json_content_type
+syn keyword ngxDirectiveThirdParty rds_json_buffer_size
 syn keyword ngxDirectiveThirdParty rds_json_format
+syn keyword ngxDirectiveThirdParty rds_json_root
+syn keyword ngxDirectiveThirdParty rds_json_success_property
+syn keyword ngxDirectiveThirdParty rds_json_user_property
+syn keyword ngxDirectiveThirdParty rds_json_errcode_key
+syn keyword ngxDirectiveThirdParty rds_json_errstr_key
 syn keyword ngxDirectiveThirdParty rds_json_ret
+syn keyword ngxDirectiveThirdParty rds_json_content_type
 
-" RRD Graph Module <http://wiki.nginx.org/NginxNgx_rrd_graph>
+" Redis Module <https://www.nginx.com/resources/wiki/modules/redis/>
+" Use this module to perform simple caching
+syn keyword ngxDirectiveThirdParty redis_pass
+syn keyword ngxDirectiveThirdParty redis_bind
+syn keyword ngxDirectiveThirdParty redis_connect_timeout
+syn keyword ngxDirectiveThirdParty redis_read_timeout
+syn keyword ngxDirectiveThirdParty redis_send_timeout
+syn keyword ngxDirectiveThirdParty redis_buffer_size
+syn keyword ngxDirectiveThirdParty redis_next_upstream
+syn keyword ngxDirectiveThirdParty redis_gzip_flag
+
+" Redis 2 Module <https://github.com/openresty/redis2-nginx-module>
+" Nginx upstream module for the Redis 2.0 protocol
+syn keyword ngxDirectiveThirdParty redis2_query
+syn keyword ngxDirectiveThirdParty redis2_raw_query
+syn keyword ngxDirectiveThirdParty redis2_raw_queries
+syn keyword ngxDirectiveThirdParty redis2_literal_raw_query
+syn keyword ngxDirectiveThirdParty redis2_pass
+syn keyword ngxDirectiveThirdParty redis2_connect_timeout
+syn keyword ngxDirectiveThirdParty redis2_send_timeout
+syn keyword ngxDirectiveThirdParty redis2_read_timeout
+syn keyword ngxDirectiveThirdParty redis2_buffer_size
+syn keyword ngxDirectiveThirdParty redis2_next_upstream
+
+" Replace Filter Module <https://github.com/openresty/replace-filter-nginx-module>
+" Streaming regular expression replacement in response bodies
+syn keyword ngxDirectiveThirdParty replace_filter
+syn keyword ngxDirectiveThirdParty replace_filter_types
+syn keyword ngxDirectiveThirdParty replace_filter_max_buffered_size
+syn keyword ngxDirectiveThirdParty replace_filter_last_modified
+syn keyword ngxDirectiveThirdParty replace_filter_skip
+
+" Roboo Module <https://github.com/yuri-gushin/Roboo>
+" HTTP Robot Mitigator
+
+" RRD Graph Module <https://www.nginx.com/resources/wiki/modules/rrd_graph/>
 " This module provides an HTTP interface to RRDtool's graphing facilities.
 syn keyword ngxDirectiveThirdParty rrd_graph
 syn keyword ngxDirectiveThirdParty rrd_graph_root
 
-" Secure Download <http://wiki.nginx.org/NginxHttpSecureDownload>
-" Create expiring links.
-syn keyword ngxDirectiveThirdParty secure_download
-syn keyword ngxDirectiveThirdParty secure_download_fail_location
-syn keyword ngxDirectiveThirdParty secure_download_path_mode
-syn keyword ngxDirectiveThirdParty secure_download_secret
+" RTMP Module <https://github.com/arut/nginx-rtmp-module>
+" NGINX-based Media Streaming Server
+syn keyword ngxDirectiveThirdParty rtmp
+" syn keyword ngxDirectiveThirdParty server
+" syn keyword ngxDirectiveThirdParty listen
+syn keyword ngxDirectiveThirdParty application
+" syn keyword ngxDirectiveThirdParty timeout
+syn keyword ngxDirectiveThirdParty ping
+syn keyword ngxDirectiveThirdParty ping_timeout
+syn keyword ngxDirectiveThirdParty max_streams
+syn keyword ngxDirectiveThirdParty ack_window
+syn keyword ngxDirectiveThirdParty chunk_size
+syn keyword ngxDirectiveThirdParty max_queue
+syn keyword ngxDirectiveThirdParty max_message
+syn keyword ngxDirectiveThirdParty out_queue
+syn keyword ngxDirectiveThirdParty out_cork
+" syn keyword ngxDirectiveThirdParty allow
+" syn keyword ngxDirectiveThirdParty deny
+syn keyword ngxDirectiveThirdParty exec_push
+syn keyword ngxDirectiveThirdParty exec_pull
+syn keyword ngxDirectiveThirdParty exec
+syn keyword ngxDirectiveThirdParty exec_options
+syn keyword ngxDirectiveThirdParty exec_static
+syn keyword ngxDirectiveThirdParty exec_kill_signal
+syn keyword ngxDirectiveThirdParty respawn
+syn keyword ngxDirectiveThirdParty respawn_timeout
+syn keyword ngxDirectiveThirdParty exec_publish
+syn keyword ngxDirectiveThirdParty exec_play
+syn keyword ngxDirectiveThirdParty exec_play_done
+syn keyword ngxDirectiveThirdParty exec_publish_done
+syn keyword ngxDirectiveThirdParty exec_record_done
+syn keyword ngxDirectiveThirdParty live
+syn keyword ngxDirectiveThirdParty meta
+syn keyword ngxDirectiveThirdParty interleave
+syn keyword ngxDirectiveThirdParty wait_key
+syn keyword ngxDirectiveThirdParty wait_video
+syn keyword ngxDirectiveThirdParty publish_notify
+syn keyword ngxDirectiveThirdParty drop_idle_publisher
+syn keyword ngxDirectiveThirdParty sync
+syn keyword ngxDirectiveThirdParty play_restart
+syn keyword ngxDirectiveThirdParty idle_streams
+syn keyword ngxDirectiveThirdParty record
+syn keyword ngxDirectiveThirdParty record_path
+syn keyword ngxDirectiveThirdParty record_suffix
+syn keyword ngxDirectiveThirdParty record_unique
+syn keyword ngxDirectiveThirdParty record_append
+syn keyword ngxDirectiveThirdParty record_lock
+syn keyword ngxDirectiveThirdParty record_max_size
+syn keyword ngxDirectiveThirdParty record_max_frames
+syn keyword ngxDirectiveThirdParty record_interval
+syn keyword ngxDirectiveThirdParty recorder
+syn keyword ngxDirectiveThirdParty record_notify
+syn keyword ngxDirectiveThirdParty play
+syn keyword ngxDirectiveThirdParty play_temp_path
+syn keyword ngxDirectiveThirdParty play_local_path
+syn keyword ngxDirectiveThirdParty pull
+syn keyword ngxDirectiveThirdParty push
+syn keyword ngxDirectiveThirdParty push_reconnect
+syn keyword ngxDirectiveThirdParty session_relay
+syn keyword ngxDirectiveThirdParty on_connect
+syn keyword ngxDirectiveThirdParty on_play
+syn keyword ngxDirectiveThirdParty on_publish
+syn keyword ngxDirectiveThirdParty on_done
+syn keyword ngxDirectiveThirdParty on_play_done
+syn keyword ngxDirectiveThirdParty on_publish_done
+syn keyword ngxDirectiveThirdParty on_record_done
+syn keyword ngxDirectiveThirdParty on_update
+syn keyword ngxDirectiveThirdParty notify_update_timeout
+syn keyword ngxDirectiveThirdParty notify_update_strict
+syn keyword ngxDirectiveThirdParty notify_relay_redirect
+syn keyword ngxDirectiveThirdParty notify_method
+syn keyword ngxDirectiveThirdParty hls
+syn keyword ngxDirectiveThirdParty hls_path
+syn keyword ngxDirectiveThirdParty hls_fragment
+syn keyword ngxDirectiveThirdParty hls_playlist_length
+syn keyword ngxDirectiveThirdParty hls_sync
+syn keyword ngxDirectiveThirdParty hls_continuous
+syn keyword ngxDirectiveThirdParty hls_nested
+syn keyword ngxDirectiveThirdParty hls_base_url
+syn keyword ngxDirectiveThirdParty hls_cleanup
+syn keyword ngxDirectiveThirdParty hls_fragment_naming
+syn keyword ngxDirectiveThirdParty hls_fragment_slicing
+syn keyword ngxDirectiveThirdParty hls_variant
+syn keyword ngxDirectiveThirdParty hls_type
+syn keyword ngxDirectiveThirdParty hls_keys
+syn keyword ngxDirectiveThirdParty hls_key_path
+syn keyword ngxDirectiveThirdParty hls_key_url
+syn keyword ngxDirectiveThirdParty hls_fragments_per_key
+syn keyword ngxDirectiveThirdParty dash
+syn keyword ngxDirectiveThirdParty dash_path
+syn keyword ngxDirectiveThirdParty dash_fragment
+syn keyword ngxDirectiveThirdParty dash_playlist_length
+syn keyword ngxDirectiveThirdParty dash_nested
+syn keyword ngxDirectiveThirdParty dash_cleanup
+" syn keyword ngxDirectiveThirdParty access_log
+" syn keyword ngxDirectiveThirdParty log_format
+syn keyword ngxDirectiveThirdParty max_connections
+syn keyword ngxDirectiveThirdParty rtmp_stat
+syn keyword ngxDirectiveThirdParty rtmp_stat_stylesheet
+syn keyword ngxDirectiveThirdParty rtmp_auto_push
+syn keyword ngxDirectiveThirdParty rtmp_auto_push_reconnect
+syn keyword ngxDirectiveThirdParty rtmp_socket_dir
+syn keyword ngxDirectiveThirdParty rtmp_control
 
-" SlowFS Cache Module <http://labs.frickle.com/nginx_ngx_slowfs_cache/>
+" RTMPT Module <https://github.com/kwojtek/nginx-rtmpt-proxy-module>
+" Module for nginx to proxy rtmp using http protocol
+syn keyword ngxDirectiveThirdParty rtmpt_proxy_target
+syn keyword ngxDirectiveThirdParty rtmpt_proxy_rtmp_timeout
+syn keyword ngxDirectiveThirdParty rtmpt_proxy_http_timeout
+syn keyword ngxDirectiveThirdParty rtmpt_proxy
+syn keyword ngxDirectiveThirdParty rtmpt_proxy_stat
+syn keyword ngxDirectiveThirdParty rtmpt_proxy_stylesheet
+
+" Syntactically Awesome Module <https://github.com/mneudert/sass-nginx-module>
+" Providing on-the-fly compiling of Sass files as an NGINX module.
+syn keyword ngxDirectiveThirdParty sass_compile
+syn keyword ngxDirectiveThirdParty sass_error_log
+syn keyword ngxDirectiveThirdParty sass_include_path
+syn keyword ngxDirectiveThirdParty sass_indent
+syn keyword ngxDirectiveThirdParty sass_is_indented_syntax
+syn keyword ngxDirectiveThirdParty sass_linefeed
+syn keyword ngxDirectiveThirdParty sass_precision
+syn keyword ngxDirectiveThirdParty sass_output_style
+syn keyword ngxDirectiveThirdParty sass_source_comments
+syn keyword ngxDirectiveThirdParty sass_source_map_embed
+
+" Secure Download Module <https://www.nginx.com/resources/wiki/modules/secure_download/>
+" Enables you to create links which are only valid until a certain datetime is reached
+syn keyword ngxDirectiveThirdParty secure_download
+syn keyword ngxDirectiveThirdParty secure_download_secret
+syn keyword ngxDirectiveThirdParty secure_download_path_mode
+
+" Selective Cache Purge Module <https://github.com/wandenberg/nginx-selective-cache-purge-module>
+" A module to purge cache by GLOB patterns. The supported patterns are the same as supported by Redis.
+syn keyword ngxDirectiveThirdParty selective_cache_purge_redis_unix_socket
+syn keyword ngxDirectiveThirdParty selective_cache_purge_redis_host
+syn keyword ngxDirectiveThirdParty selective_cache_purge_redis_port
+syn keyword ngxDirectiveThirdParty selective_cache_purge_redis_database
+syn keyword ngxDirectiveThirdParty selective_cache_purge_query
+
+" Set cconv Module <https://github.com/liseen/set-cconv-nginx-module>
+" Cconv rewrite set commands
+syn keyword ngxDirectiveThirdParty set_cconv_to_simp
+syn keyword ngxDirectiveThirdParty set_cconv_to_trad
+syn keyword ngxDirectiveThirdParty set_pinyin_to_normal
+
+" Set Hash Module <https://github.com/simpl/ngx_http_set_hash>
+" Nginx module that allows the setting of variables to the value of a variety of hashes
+syn keyword ngxDirectiveThirdParty set_md5
+syn keyword ngxDirectiveThirdParty set_md5_upper
+syn keyword ngxDirectiveThirdParty set_murmur2
+syn keyword ngxDirectiveThirdParty set_murmur2_upper
+syn keyword ngxDirectiveThirdParty set_sha1
+syn keyword ngxDirectiveThirdParty set_sha1_upper
+
+" Set Lang Module <https://github.com/simpl/ngx_http_set_lang>
+" Provides a variety of ways for setting a variable denoting the langauge that content should be returned in.
+syn keyword ngxDirectiveThirdParty set_lang
+syn keyword ngxDirectiveThirdParty set_lang_method
+syn keyword ngxDirectiveThirdParty lang_cookie
+syn keyword ngxDirectiveThirdParty lang_get_var
+syn keyword ngxDirectiveThirdParty lang_list
+syn keyword ngxDirectiveThirdParty lang_post_var
+syn keyword ngxDirectiveThirdParty lang_host
+syn keyword ngxDirectiveThirdParty lang_referer
+
+" Set Misc Module <https://github.com/openresty/set-misc-nginx-module>
+" Various set_xxx directives added to nginx's rewrite module
+syn keyword ngxDirectiveThirdParty set_if_empty
+syn keyword ngxDirectiveThirdParty set_quote_sql_str
+syn keyword ngxDirectiveThirdParty set_quote_pgsql_str
+syn keyword ngxDirectiveThirdParty set_quote_json_str
+syn keyword ngxDirectiveThirdParty set_unescape_uri
+syn keyword ngxDirectiveThirdParty set_escape_uri
+syn keyword ngxDirectiveThirdParty set_hashed_upstream
+syn keyword ngxDirectiveThirdParty set_encode_base32
+syn keyword ngxDirectiveThirdParty set_base32_padding
+syn keyword ngxDirectiveThirdParty set_misc_base32_padding
+syn keyword ngxDirectiveThirdParty set_base32_alphabet
+syn keyword ngxDirectiveThirdParty set_decode_base32
+syn keyword ngxDirectiveThirdParty set_encode_base64
+syn keyword ngxDirectiveThirdParty set_decode_base64
+syn keyword ngxDirectiveThirdParty set_encode_hex
+syn keyword ngxDirectiveThirdParty set_decode_hex
+syn keyword ngxDirectiveThirdParty set_sha1
+syn keyword ngxDirectiveThirdParty set_md5
+syn keyword ngxDirectiveThirdParty set_hmac_sha1
+syn keyword ngxDirectiveThirdParty set_random
+syn keyword ngxDirectiveThirdParty set_secure_random_alphanum
+syn keyword ngxDirectiveThirdParty set_secure_random_lcalpha
+syn keyword ngxDirectiveThirdParty set_rotate
+syn keyword ngxDirectiveThirdParty set_local_today
+syn keyword ngxDirectiveThirdParty set_formatted_gmt_time
+syn keyword ngxDirectiveThirdParty set_formatted_local_time
+
+" SFlow Module <https://github.com/sflow/nginx-sflow-module>
+" A binary, random-sampling nginx module designed for: lightweight, centralized, continuous, real-time monitoring of very large and very busy web farms.
+syn keyword ngxDirectiveThirdParty sflow
+
+" Shibboleth Module <https://github.com/nginx-shib/nginx-http-shibboleth>
+" Shibboleth auth request module for nginx
+syn keyword ngxDirectiveThirdParty shib_request
+syn keyword ngxDirectiveThirdParty shib_request_set
+syn keyword ngxDirectiveThirdParty shib_request_use_headers
+
+" Slice Module <https://github.com/alibaba/nginx-http-slice>
+" Nginx module for serving a file in slices (reverse byte-range)
+" syn keyword ngxDirectiveThirdParty slice
+syn keyword ngxDirectiveThirdParty slice_arg_begin
+syn keyword ngxDirectiveThirdParty slice_arg_end
+syn keyword ngxDirectiveThirdParty slice_header
+syn keyword ngxDirectiveThirdParty slice_footer
+syn keyword ngxDirectiveThirdParty slice_header_first
+syn keyword ngxDirectiveThirdParty slice_footer_last
+
+" SlowFS Cache Module <https://github.com/FRiCKLE/ngx_slowfs_cache/>
 " Module adding ability to cache static files.
 syn keyword ngxDirectiveThirdParty slowfs_big_file_size
 syn keyword ngxDirectiveThirdParty slowfs_cache
@@ -751,16 +1773,140 @@ syn keyword ngxDirectiveThirdParty slowfs_cache_purge
 syn keyword ngxDirectiveThirdParty slowfs_cache_valid
 syn keyword ngxDirectiveThirdParty slowfs_temp_path
 
-" Strip Module <http://wiki.nginx.org/NginxHttpStripModule>
+" Small Light Module <https://github.com/cubicdaiya/ngx_small_light>
+" Dynamic Image Transformation Module For nginx.
+syn keyword ngxDirectiveThirdParty small_light
+syn keyword ngxDirectiveThirdParty small_light_getparam_mode
+syn keyword ngxDirectiveThirdParty small_light_material_dir
+syn keyword ngxDirectiveThirdParty small_light_pattern_define
+syn keyword ngxDirectiveThirdParty small_light_radius_max
+syn keyword ngxDirectiveThirdParty small_light_sigma_max
+syn keyword ngxDirectiveThirdParty small_light_imlib2_temp_dir
+syn keyword ngxDirectiveThirdParty small_light_buffer
+
+" Sorted Querystring Filter Module <https://github.com/wandenberg/nginx-sorted-querystring-module>
+" Nginx module to expose querystring parameters sorted in a variable to be used on cache_key as example
+syn keyword ngxDirectiveThirdParty sorted_querystring_filter_parameter
+
+" Sphinx2 Module <https://github.com/reeteshranjan/sphinx2-nginx-module>
+" Nginx upstream module for Sphinx 2.x
+syn keyword ngxDirectiveThirdParty sphinx2_pass
+syn keyword ngxDirectiveThirdParty sphinx2_bind
+syn keyword ngxDirectiveThirdParty sphinx2_connect_timeout
+syn keyword ngxDirectiveThirdParty sphinx2_send_timeout
+syn keyword ngxDirectiveThirdParty sphinx2_buffer_size
+syn keyword ngxDirectiveThirdParty sphinx2_read_timeout
+syn keyword ngxDirectiveThirdParty sphinx2_next_upstream
+
+" HTTP SPNEGO auth Module <https://github.com/stnoonan/spnego-http-auth-nginx-module>
+" This module implements adds SPNEGO support to nginx(http://nginx.org). It currently supports only Kerberos authentication via GSSAPI
+syn keyword ngxDirectiveThirdParty auth_gss
+syn keyword ngxDirectiveThirdParty auth_gss_keytab
+syn keyword ngxDirectiveThirdParty auth_gss_realm
+syn keyword ngxDirectiveThirdParty auth_gss_service_name
+syn keyword ngxDirectiveThirdParty auth_gss_authorized_principal
+syn keyword ngxDirectiveThirdParty auth_gss_allow_basic_fallback
+
+" SR Cache Module <https://github.com/openresty/srcache-nginx-module>
+" Transparent subrequest-based caching layout for arbitrary nginx locations
+syn keyword ngxDirectiveThirdParty srcache_fetch
+syn keyword ngxDirectiveThirdParty srcache_fetch_skip
+syn keyword ngxDirectiveThirdParty srcache_store
+syn keyword ngxDirectiveThirdParty srcache_store_max_size
+syn keyword ngxDirectiveThirdParty srcache_store_skip
+syn keyword ngxDirectiveThirdParty srcache_store_statuses
+syn keyword ngxDirectiveThirdParty srcache_store_ranges
+syn keyword ngxDirectiveThirdParty srcache_header_buffer_size
+syn keyword ngxDirectiveThirdParty srcache_store_hide_header
+syn keyword ngxDirectiveThirdParty srcache_store_pass_header
+syn keyword ngxDirectiveThirdParty srcache_methods
+syn keyword ngxDirectiveThirdParty srcache_ignore_content_encoding
+syn keyword ngxDirectiveThirdParty srcache_request_cache_control
+syn keyword ngxDirectiveThirdParty srcache_response_cache_control
+syn keyword ngxDirectiveThirdParty srcache_store_no_store
+syn keyword ngxDirectiveThirdParty srcache_store_no_cache
+syn keyword ngxDirectiveThirdParty srcache_store_private
+syn keyword ngxDirectiveThirdParty srcache_default_expire
+syn keyword ngxDirectiveThirdParty srcache_max_expire
+
+" SSSD Info Module <https://github.com/veruu/ngx_sssd_info>
+" Retrives additional attributes from SSSD for current authentizated user
+syn keyword ngxDirectiveThirdParty sssd_info
+syn keyword ngxDirectiveThirdParty sssd_info_output_to
+syn keyword ngxDirectiveThirdParty sssd_info_groups
+syn keyword ngxDirectiveThirdParty sssd_info_group
+syn keyword ngxDirectiveThirdParty sssd_info_group_separator
+syn keyword ngxDirectiveThirdParty sssd_info_attributes
+syn keyword ngxDirectiveThirdParty sssd_info_attribute
+syn keyword ngxDirectiveThirdParty sssd_info_attribute_separator
+
+" Static Etags Module <https://github.com/mikewest/nginx-static-etags>
+" Generate etags for static content
+syn keyword ngxDirectiveThirdParty FileETag
+
+" Statsd Module <https://github.com/zebrafishlabs/nginx-statsd>
+" An nginx module for sending statistics to statsd
+syn keyword ngxDirectiveThirdParty statsd_server
+syn keyword ngxDirectiveThirdParty statsd_sample_rate
+syn keyword ngxDirectiveThirdParty statsd_count
+syn keyword ngxDirectiveThirdParty statsd_timing
+
+" Sticky Module <https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng>
+" Add a sticky cookie to be always forwarded to the same upstream server
+" syn keyword ngxDirectiveThirdParty sticky
+
+" Stream Echo Module <https://github.com/openresty/stream-echo-nginx-module>
+" TCP/stream echo module for NGINX (a port of ngx_http_echo_module)
+syn keyword ngxDirectiveThirdParty echo
+syn keyword ngxDirectiveThirdParty echo_duplicate
+syn keyword ngxDirectiveThirdParty echo_flush_wait
+syn keyword ngxDirectiveThirdParty echo_sleep
+syn keyword ngxDirectiveThirdParty echo_send_timeout
+syn keyword ngxDirectiveThirdParty echo_read_bytes
+syn keyword ngxDirectiveThirdParty echo_read_line
+syn keyword ngxDirectiveThirdParty echo_request_data
+syn keyword ngxDirectiveThirdParty echo_discard_request
+syn keyword ngxDirectiveThirdParty echo_read_buffer_size
+syn keyword ngxDirectiveThirdParty echo_read_timeout
+syn keyword ngxDirectiveThirdParty echo_client_error_log_level
+syn keyword ngxDirectiveThirdParty echo_lingering_close
+syn keyword ngxDirectiveThirdParty echo_lingering_time
+syn keyword ngxDirectiveThirdParty echo_lingering_timeout
+
+" Stream Lua Module <https://github.com/openresty/stream-lua-nginx-module>
+" Embed the power of Lua into Nginx stream/TCP Servers.
+syn keyword ngxDirectiveThirdParty lua_resolver
+syn keyword ngxDirectiveThirdParty lua_resolver_timeout
+syn keyword ngxDirectiveThirdParty lua_lingering_close
+syn keyword ngxDirectiveThirdParty lua_lingering_time
+syn keyword ngxDirectiveThirdParty lua_lingering_timeout
+
+" Stream Upsync Module <https://github.com/xiaokai-wang/nginx-stream-upsync-module>
+" Sync upstreams from consul or others, dynamiclly modify backend-servers attribute(weight, max_fails,...), needn't reload nginx.
+syn keyword ngxDirectiveThirdParty upsync
+syn keyword ngxDirectiveThirdParty upsync_dump_path
+syn keyword ngxDirectiveThirdParty upsync_lb
+syn keyword ngxDirectiveThirdParty upsync_show
+
+" Strip Module <https://github.com/evanmiller/mod_strip>
 " Whitespace remover.
 syn keyword ngxDirectiveThirdParty strip
 
-" Substitutions Module <http://wiki.nginx.org/NginxHttpSubsModule>
+" Subrange Module <https://github.com/Qihoo360/ngx_http_subrange_module>
+" Split one big HTTP/Range request to multiple subrange requesets
+syn keyword ngxDirectiveThirdParty subrange
+
+" Substitutions Module <https://www.nginx.com/resources/wiki/modules/substitutions/>
 " A filter module which can do both regular expression and fixed string substitutions on response bodies.
 syn keyword ngxDirectiveThirdParty subs_filter
 syn keyword ngxDirectiveThirdParty subs_filter_types
 
-" Supervisord Module <http://labs.frickle.com/nginx_ngx_supervisord/>
+" Summarizer Module <https://github.com/reeteshranjan/summarizer-nginx-module>
+" Upstream nginx module to get summaries of documents using the summarizer daemon service
+syn keyword ngxDirectiveThirdParty smrzr_filename
+syn keyword ngxDirectiveThirdParty smrzr_ratio
+
+" Supervisord Module <https://github.com/FRiCKLE/ngx_supervisord/>
 " Module providing nginx with API to communicate with supervisord and manage (start/stop) backends on-demand.
 syn keyword ngxDirectiveThirdParty supervisord
 syn keyword ngxDirectiveThirdParty supervisord_inherit_backend_status
@@ -768,52 +1914,210 @@ syn keyword ngxDirectiveThirdParty supervisord_name
 syn keyword ngxDirectiveThirdParty supervisord_start
 syn keyword ngxDirectiveThirdParty supervisord_stop
 
-" Upload Module <http://www.grid.net.ru/nginx/upload.en.html>
-" Parses multipart/form-data allowing arbitrary handling of uploaded files.
-syn keyword ngxDirectiveThirdParty upload_aggregate_form_field
-syn keyword ngxDirectiveThirdParty upload_buffer_size
-syn keyword ngxDirectiveThirdParty upload_cleanup
-syn keyword ngxDirectiveThirdParty upload_limit_rate
-syn keyword ngxDirectiveThirdParty upload_max_file_size
-syn keyword ngxDirectiveThirdParty upload_max_output_body_len
-syn keyword ngxDirectiveThirdParty upload_max_part_header_len
-syn keyword ngxDirectiveThirdParty upload_pass
-syn keyword ngxDirectiveThirdParty upload_pass_args
-syn keyword ngxDirectiveThirdParty upload_pass_form_field
-syn keyword ngxDirectiveThirdParty upload_set_form_field
-syn keyword ngxDirectiveThirdParty upload_store
-syn keyword ngxDirectiveThirdParty upload_store_access
+" Tarantool Upstream Module <https://github.com/tarantool/nginx_upstream_module>
+" Tarantool NginX upstream module (REST, JSON API, websockets, load balancing)
+syn keyword ngxDirectiveThirdParty tnt_pass
+syn keyword ngxDirectiveThirdParty tnt_http_methods
+syn keyword ngxDirectiveThirdParty tnt_http_rest_methods
+syn keyword ngxDirectiveThirdParty tnt_pass_http_request
+syn keyword ngxDirectiveThirdParty tnt_pass_http_request_buffer_size
+syn keyword ngxDirectiveThirdParty tnt_method
+syn keyword ngxDirectiveThirdParty tnt_http_allowed_methods - experemental
+syn keyword ngxDirectiveThirdParty tnt_send_timeout
+syn keyword ngxDirectiveThirdParty tnt_read_timeout
+syn keyword ngxDirectiveThirdParty tnt_buffer_size
+syn keyword ngxDirectiveThirdParty tnt_next_upstream
+syn keyword ngxDirectiveThirdParty tnt_connect_timeout
+syn keyword ngxDirectiveThirdParty tnt_next_upstream
+syn keyword ngxDirectiveThirdParty tnt_next_upstream_tries
+syn keyword ngxDirectiveThirdParty tnt_next_upstream_timeout
 
-" Upload Progress Module <http://wiki.nginx.org/NginxHttpUploadProgressModule>
-" Tracks and reports upload progress.
-syn keyword ngxDirectiveThirdParty report_uploads
-syn keyword ngxDirectiveThirdParty track_uploads
+" TCP Proxy Module <http://yaoweibin.github.io/nginx_tcp_proxy_module/>
+" Add the feature of tcp proxy with nginx, with health check and status monitor
+syn keyword ngxDirectiveBlock tcp
+" syn keyword ngxDirectiveThirdParty server
+" syn keyword ngxDirectiveThirdParty listen
+" syn keyword ngxDirectiveThirdParty allow
+" syn keyword ngxDirectiveThirdParty deny
+" syn keyword ngxDirectiveThirdParty so_keepalive
+" syn keyword ngxDirectiveThirdParty tcp_nodelay
+" syn keyword ngxDirectiveThirdParty timeout
+" syn keyword ngxDirectiveThirdParty server_name
+" syn keyword ngxDirectiveThirdParty resolver
+" syn keyword ngxDirectiveThirdParty resolver_timeout
+" syn keyword ngxDirectiveThirdParty upstream
+syn keyword ngxDirectiveThirdParty check
+syn keyword ngxDirectiveThirdParty check_http_send
+syn keyword ngxDirectiveThirdParty check_http_expect_alive
+syn keyword ngxDirectiveThirdParty check_smtp_send
+syn keyword ngxDirectiveThirdParty check_smtp_expect_alive
+syn keyword ngxDirectiveThirdParty check_shm_size
+syn keyword ngxDirectiveThirdParty check_status
+" syn keyword ngxDirectiveThirdParty ip_hash
+" syn keyword ngxDirectiveThirdParty proxy_pass
+" syn keyword ngxDirectiveThirdParty proxy_buffer
+" syn keyword ngxDirectiveThirdParty proxy_connect_timeout
+" syn keyword ngxDirectiveThirdParty proxy_read_timeout
+syn keyword ngxDirectiveThirdParty proxy_write_timeout
+
+" Testcookie Module <https://github.com/kyprizel/testcookie-nginx-module>
+" NGINX module for L7 DDoS attack mitigation
+syn keyword ngxDirectiveThirdParty testcookie
+syn keyword ngxDirectiveThirdParty testcookie_name
+syn keyword ngxDirectiveThirdParty testcookie_domain
+syn keyword ngxDirectiveThirdParty testcookie_expires
+syn keyword ngxDirectiveThirdParty testcookie_path
+syn keyword ngxDirectiveThirdParty testcookie_secret
+syn keyword ngxDirectiveThirdParty testcookie_session
+syn keyword ngxDirectiveThirdParty testcookie_arg
+syn keyword ngxDirectiveThirdParty testcookie_max_attempts
+syn keyword ngxDirectiveThirdParty testcookie_p3p
+syn keyword ngxDirectiveThirdParty testcookie_fallback
+syn keyword ngxDirectiveThirdParty testcookie_whitelist
+syn keyword ngxDirectiveThirdParty testcookie_pass
+syn keyword ngxDirectiveThirdParty testcookie_redirect_via_refresh
+syn keyword ngxDirectiveThirdParty testcookie_refresh_template
+syn keyword ngxDirectiveThirdParty testcookie_refresh_status
+syn keyword ngxDirectiveThirdParty testcookie_deny_keepalive
+syn keyword ngxDirectiveThirdParty testcookie_get_only
+syn keyword ngxDirectiveThirdParty testcookie_https_location
+syn keyword ngxDirectiveThirdParty testcookie_refresh_encrypt_cookie
+syn keyword ngxDirectiveThirdParty testcookie_refresh_encrypt_cookie_key
+syn keyword ngxDirectiveThirdParty testcookie_refresh_encrypt_iv
+syn keyword ngxDirectiveThirdParty testcookie_internal
+syn keyword ngxDirectiveThirdParty testcookie_httponly_flag
+syn keyword ngxDirectiveThirdParty testcookie_secure_flag
+
+" Types Filter Module <https://github.com/flygoast/ngx_http_types_filter>
+" Change the `Content-Type` output header depending on an extension variable according to a condition specified in the 'if' clause.
+syn keyword ngxDirectiveThirdParty types_filter
+syn keyword ngxDirectiveThirdParty types_filter_use_default
+
+" Unzip Module <https://github.com/youzee/nginx-unzip-module>
+" Enabling fetching of files that are stored in zipped archives.
+syn keyword ngxDirectiveThirdParty file_in_unzip_archivefile
+syn keyword ngxDirectiveThirdParty file_in_unzip_extract
+syn keyword ngxDirectiveThirdParty file_in_unzip
+
+" Upload Progress Module <https://www.nginx.com/resources/wiki/modules/upload_progress/>
+" An upload progress system, that monitors RFC1867 POST upload as they are transmitted to upstream servers
 syn keyword ngxDirectiveThirdParty upload_progress
+syn keyword ngxDirectiveThirdParty track_uploads
+syn keyword ngxDirectiveThirdParty report_uploads
 syn keyword ngxDirectiveThirdParty upload_progress_content_type
 syn keyword ngxDirectiveThirdParty upload_progress_header
+syn keyword ngxDirectiveThirdParty upload_progress_jsonp_parameter
 syn keyword ngxDirectiveThirdParty upload_progress_json_output
+syn keyword ngxDirectiveThirdParty upload_progress_jsonp_output
 syn keyword ngxDirectiveThirdParty upload_progress_template
 
-" Upstream Fair Balancer <http://wiki.nginx.org/NginxHttpUpstreamFairModule>
-" Sends an incoming request to the least-busy backend server, rather than distributing requests round-robin.
+" Upload Module <https://www.nginx.com/resources/wiki/modules/upload/>
+" Parses request body storing all files being uploaded to a directory specified by upload_store directive
+syn keyword ngxDirectiveThirdParty upload_pass
+syn keyword ngxDirectiveThirdParty upload_resumable
+syn keyword ngxDirectiveThirdParty upload_store
+syn keyword ngxDirectiveThirdParty upload_state_store
+syn keyword ngxDirectiveThirdParty upload_store_access
+syn keyword ngxDirectiveThirdParty upload_set_form_field
+syn keyword ngxDirectiveThirdParty upload_aggregate_form_field
+syn keyword ngxDirectiveThirdParty upload_pass_form_field
+syn keyword ngxDirectiveThirdParty upload_cleanup
+syn keyword ngxDirectiveThirdParty upload_buffer_size
+syn keyword ngxDirectiveThirdParty upload_max_part_header_len
+syn keyword ngxDirectiveThirdParty upload_max_file_size
+syn keyword ngxDirectiveThirdParty upload_limit_rate
+syn keyword ngxDirectiveThirdParty upload_max_output_body_len
+syn keyword ngxDirectiveThirdParty upload_tame_arrays
+syn keyword ngxDirectiveThirdParty upload_pass_args
+
+" Upstream Fair Module <https://github.com/gnosek/nginx-upstream-fair>
+" The fair load balancer module for nginx http://nginx.localdomain.pl
 syn keyword ngxDirectiveThirdParty fair
 syn keyword ngxDirectiveThirdParty upstream_fair_shm_size
 
-" Upstream Consistent Hash <http://wiki.nginx.org/NginxHttpUpstreamConsistentHash>
-" Select backend based on Consistent hash ring.
-syn keyword ngxDirectiveThirdParty consistent_hash
-
-" Upstream Hash Module <http://wiki.nginx.org/NginxHttpUpstreamRequestHashModule>
+" Upstream Hash Module (DEPRECATED) <http://wiki.nginx.org/NginxHttpUpstreamRequestHashModule>
 " Provides simple upstream load distribution by hashing a configurable variable.
-syn keyword ngxDirectiveThirdParty hash
-syn keyword ngxDirectiveThirdParty hash_again
+" syn keyword ngxDirectiveDeprecated hash
+syn keyword ngxDirectiveDeprecated hash_again
 
-" XSS Module <http://github.com/agentzh/xss-nginx-module>
+" Upstream Domain Resolve Module <https://www.nginx.com/resources/wiki/modules/domain_resolve/>
+" A load-balancer that resolves an upstream domain name asynchronously.
+syn keyword ngxDirectiveThirdParty jdomain
+
+" Upsync Module <https://github.com/weibocom/nginx-upsync-module>
+" Sync upstreams from consul or others, dynamiclly modify backend-servers attribute(weight, max_fails,...), needn't reload nginx
+syn keyword ngxDirectiveThirdParty upsync
+syn keyword ngxDirectiveThirdParty upsync_dump_path
+syn keyword ngxDirectiveThirdParty upsync_lb
+syn keyword ngxDirectiveThirdParty upstream_show
+
+" URL Module <https://github.com/vozlt/nginx-module-url>
+" Nginx url encoding converting module
+syn keyword ngxDirectiveThirdParty url_encoding_convert
+syn keyword ngxDirectiveThirdParty url_encoding_convert_from
+syn keyword ngxDirectiveThirdParty url_encoding_convert_to
+
+" User Agent Module <https://github.com/alibaba/nginx-http-user-agent>
+" Match browsers and crawlers
+syn keyword ngxDirectiveThirdParty user_agent
+
+" Upstrema Ketama Chash Module <https://github.com/flygoast/ngx_http_upstream_ketama_chash>
+" Nginx load-balancer module implementing ketama consistent hashing.
+syn keyword ngxDirectiveThirdParty ketama_chash
+
+" Video Thumbextractor Module <https://github.com/wandenberg/nginx-video-thumbextractor-module>
+" Extract thumbs from a video file
+syn keyword ngxDirectiveThirdParty video_thumbextractor
+syn keyword ngxDirectiveThirdParty video_thumbextractor_video_filename
+syn keyword ngxDirectiveThirdParty video_thumbextractor_video_second
+syn keyword ngxDirectiveThirdParty video_thumbextractor_image_width
+syn keyword ngxDirectiveThirdParty video_thumbextractor_image_height
+syn keyword ngxDirectiveThirdParty video_thumbextractor_only_keyframe
+syn keyword ngxDirectiveThirdParty video_thumbextractor_next_time
+syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_rows
+syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_cols
+syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_max_rows
+syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_max_cols
+syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_sample_interval
+syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_color
+syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_margin
+syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_padding
+syn keyword ngxDirectiveThirdParty video_thumbextractor_threads
+syn keyword ngxDirectiveThirdParty video_thumbextractor_processes_per_worker
+
+" Eval Module <http://www.grid.net.ru/nginx/eval.en.html>
+" Module for nginx web server evaluates response of proxy or memcached module into variables.
+syn keyword ngxDirectiveThirdParty eval
+syn keyword ngxDirectiveThirdParty eval_escalate
+syn keyword ngxDirectiveThirdParty eval_override_content_type
+
+" VTS Module <https://github.com/vozlt/nginx-module-vts>
+" Nginx virtual host traffic status module
+syn keyword ngxDirectiveThirdParty vhost_traffic_status
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_zone
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_display
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_display_format
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_display_jsonp
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_filter
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_filter_by_host
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_filter_by_set_key
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_filter_check_duplicate
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_limit
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_limit_traffic
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_limit_traffic_by_set_key
+syn keyword ngxDirectiveThirdParty vhost_traffic_status_limit_check_duplicate
+
+" XSS Module <https://github.com/openresty/xss-nginx-module>
 " Native support for cross-site scripting (XSS) in an nginx.
-syn keyword ngxDirectiveThirdParty xss_callback_arg
 syn keyword ngxDirectiveThirdParty xss_get
+syn keyword ngxDirectiveThirdParty xss_callback_arg
+syn keyword ngxDirectiveThirdParty xss_override_status
+syn keyword ngxDirectiveThirdParty xss_check_status
 syn keyword ngxDirectiveThirdParty xss_input_types
-syn keyword ngxDirectiveThirdParty xss_output_type
+
+" ZIP Module <https://www.nginx.com/resources/wiki/modules/zip/>
+" ZIP archiver for nginx
+
 
 " highlight
 
@@ -833,4 +2137,8 @@ hi link ngxDirectiveDeprecated Error
 hi link ngxDirective Identifier
 hi link ngxDirectiveThirdParty Special
 
+hi link ngxListenOptions Keyword
+hi link ngxMailProtocol Keyword
+hi link ngxSSLProtocol Keyword
+
 let b:current_syntax = "nginx"
diff --git a/src/core/nginx.c b/src/core/nginx.c
index c5f09a5..abaa50d 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -124,6 +124,13 @@ static ngx_command_t  ngx_core_commands[] = {
       offsetof(ngx_core_conf_t, rlimit_core),
       NULL },
 
+    { ngx_string("worker_shutdown_timeout"),
+      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      0,
+      offsetof(ngx_core_conf_t, shutdown_timeout),
+      NULL },
+
     { ngx_string("working_directory"),
       NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
@@ -1014,6 +1021,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
     ccf->daemon = NGX_CONF_UNSET;
     ccf->master = NGX_CONF_UNSET;
     ccf->timer_resolution = NGX_CONF_UNSET_MSEC;
+    ccf->shutdown_timeout = NGX_CONF_UNSET_MSEC;
 
     ccf->worker_processes = NGX_CONF_UNSET;
     ccf->debug_points = NGX_CONF_UNSET;
@@ -1042,6 +1050,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
     ngx_conf_init_value(ccf->daemon, 1);
     ngx_conf_init_value(ccf->master, 1);
     ngx_conf_init_msec_value(ccf->timer_resolution, 0);
+    ngx_conf_init_msec_value(ccf->shutdown_timeout, 0);
 
     ngx_conf_init_value(ccf->worker_processes, 1);
     ngx_conf_init_value(ccf->debug_points, 0);
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 57798ee..5dc1ea2 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011010
-#define NGINX_VERSION      "1.11.10"
+#define nginx_version      1011011
+#define NGINX_VERSION      "1.11.11"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 5e95628..3dfdf2e 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -15,6 +15,7 @@ static ngx_int_t ngx_init_zone_pool(ngx_cycle_t *cycle,
     ngx_shm_zone_t *shm_zone);
 static ngx_int_t ngx_test_lockfile(u_char *file, ngx_log_t *log);
 static void ngx_clean_old_cycles(ngx_event_t *ev);
+static void ngx_shutdown_timer_handler(ngx_event_t *ev);
 
 
 volatile ngx_cycle_t  *ngx_cycle;
@@ -22,6 +23,7 @@ ngx_array_t            ngx_old_cycles;
 
 static ngx_pool_t     *ngx_temp_pool;
 static ngx_event_t     ngx_cleaner_event;
+static ngx_event_t     ngx_shutdown_event;
 
 ngx_uint_t             ngx_test_config;
 ngx_uint_t             ngx_dump_config;
@@ -1333,3 +1335,54 @@ ngx_clean_old_cycles(ngx_event_t *ev)
         ngx_old_cycles.nelts = 0;
     }
 }
+
+
+void
+ngx_set_shutdown_timer(ngx_cycle_t *cycle)
+{
+    ngx_core_conf_t  *ccf;
+
+    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+
+    if (ccf->shutdown_timeout) {
+        ngx_shutdown_event.handler = ngx_shutdown_timer_handler;
+        ngx_shutdown_event.data = cycle;
+        ngx_shutdown_event.log = cycle->log;
+        ngx_shutdown_event.cancelable = 1;
+
+        ngx_add_timer(&ngx_shutdown_event, ccf->shutdown_timeout);
+    }
+}
+
+
+static void
+ngx_shutdown_timer_handler(ngx_event_t *ev)
+{
+    ngx_uint_t         i;
+    ngx_cycle_t       *cycle;
+    ngx_connection_t  *c;
+
+    cycle = ev->data;
+
+    c = cycle->connections;
+
+    for (i = 0; i < cycle->connection_n; i++) {
+
+        if (c[i].fd == (ngx_socket_t) -1
+            || c[i].read == NULL
+            || c[i].read->accept
+            || c[i].read->channel
+            || c[i].read->resolver)
+        {
+            continue;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0,
+                       "*%uA shutdown timeout", c[i].number);
+
+        c[i].close = 1;
+        c[i].error = 1;
+
+        c[i].read->handler(c[i].read);
+    }
+}
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index d804eb4..2b48ccb 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -88,6 +88,7 @@ typedef struct {
     ngx_flag_t                master;
 
     ngx_msec_t                timer_resolution;
+    ngx_msec_t                shutdown_timeout;
 
     ngx_int_t                 worker_processes;
     ngx_int_t                 debug_points;
@@ -129,6 +130,7 @@ ngx_pid_t ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv);
 ngx_cpuset_t *ngx_get_cpu_affinity(ngx_uint_t n);
 ngx_shm_zone_t *ngx_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name,
     size_t size, void *tag);
+void ngx_set_shutdown_timer(ngx_cycle_t *cycle);
 
 
 extern volatile ngx_cycle_t  *ngx_cycle;
diff --git a/src/core/ngx_parse.c b/src/core/ngx_parse.c
index 7b60c5f..d35e60f 100644
--- a/src/core/ngx_parse.c
+++ b/src/core/ngx_parse.c
@@ -17,6 +17,11 @@ ngx_parse_size(ngx_str_t *line)
     ssize_t  size, scale, max;
 
     len = line->len;
+
+    if (len == 0) {
+        return NGX_ERROR;
+    }
+
     unit = line->data[len - 1];
 
     switch (unit) {
@@ -58,6 +63,11 @@ ngx_parse_offset(ngx_str_t *line)
     size_t  len;
 
     len = line->len;
+
+    if (len == 0) {
+        return NGX_ERROR;
+    }
+
     unit = line->data[len - 1];
 
     switch (unit) {
diff --git a/src/core/ngx_rbtree.c b/src/core/ngx_rbtree.c
index 6c66f40..969d549 100644
--- a/src/core/ngx_rbtree.c
+++ b/src/core/ngx_rbtree.c
@@ -28,7 +28,7 @@ ngx_rbtree_insert(ngx_rbtree_t *tree, ngx_rbtree_node_t *node)
 
     /* a binary tree insert */
 
-    root = (ngx_rbtree_node_t **) &tree->root;
+    root = &tree->root;
     sentinel = tree->sentinel;
 
     if (*root == sentinel) {
@@ -161,7 +161,7 @@ ngx_rbtree_delete(ngx_rbtree_t *tree, ngx_rbtree_node_t *node)
 
     /* a binary tree delete */
 
-    root = (ngx_rbtree_node_t **) &tree->root;
+    root = &tree->root;
     sentinel = tree->sentinel;
 
     if (node->left == sentinel) {
@@ -378,3 +378,32 @@ ngx_rbtree_right_rotate(ngx_rbtree_node_t **root, ngx_rbtree_node_t *sentinel,
     temp->right = node;
     node->parent = temp;
 }
+
+
+ngx_rbtree_node_t *
+ngx_rbtree_next(ngx_rbtree_t *tree, ngx_rbtree_node_t *node)
+{
+    ngx_rbtree_node_t  *root, *sentinel, *parent;
+
+    sentinel = tree->sentinel;
+
+    if (node->right != sentinel) {
+        return ngx_rbtree_min(node->right, sentinel);
+    }
+
+    root = tree->root;
+
+    for ( ;; ) {
+        parent = node->parent;
+
+        if (node == root) {
+            return NULL;
+        }
+
+        if (node == parent->left) {
+            return parent;
+        }
+
+        node = parent;
+    }
+}
diff --git a/src/core/ngx_rbtree.h b/src/core/ngx_rbtree.h
index 1d33e3f..97f0e3e 100644
--- a/src/core/ngx_rbtree.h
+++ b/src/core/ngx_rbtree.h
@@ -54,6 +54,8 @@ void ngx_rbtree_insert_value(ngx_rbtree_node_t *root, ngx_rbtree_node_t *node,
     ngx_rbtree_node_t *sentinel);
 void ngx_rbtree_insert_timer_value(ngx_rbtree_node_t *root,
     ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
+ngx_rbtree_node_t *ngx_rbtree_next(ngx_rbtree_t *tree,
+    ngx_rbtree_node_t *node);
 
 
 #define ngx_rbt_red(node)               ((node)->color = 1)
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 2065f75..e140ab6 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -56,8 +56,8 @@ typedef struct {
         ((u_char *) (n) - offsetof(ngx_resolver_node_t, node))
 
 
-ngx_int_t ngx_udp_connect(ngx_resolver_connection_t *rec);
-ngx_int_t ngx_tcp_connect(ngx_resolver_connection_t *rec);
+static ngx_int_t ngx_udp_connect(ngx_resolver_connection_t *rec);
+static ngx_int_t ngx_tcp_connect(ngx_resolver_connection_t *rec);
 
 
 static void ngx_resolver_cleanup(void *data);
@@ -4379,7 +4379,7 @@ ngx_resolver_log_error(ngx_log_t *log, u_char *buf, size_t len)
 }
 
 
-ngx_int_t
+static ngx_int_t
 ngx_udp_connect(ngx_resolver_connection_t *rec)
 {
     int                rc;
@@ -4463,7 +4463,7 @@ failed:
 }
 
 
-ngx_int_t
+static ngx_int_t
 ngx_tcp_connect(ngx_resolver_connection_t *rec)
 {
     int                rc;
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index 39e480e..ee9f854 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -78,7 +78,7 @@ static ngx_command_t  ngx_devpoll_commands[] = {
 };
 
 
-ngx_event_module_t  ngx_devpoll_module_ctx = {
+static ngx_event_module_t  ngx_devpoll_module_ctx = {
     &devpoll_name,
     ngx_devpoll_create_conf,               /* create configuration */
     ngx_devpoll_init_conf,                 /* init configuration */
@@ -336,7 +336,7 @@ ngx_devpoll_set_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 }
 
 
-ngx_int_t
+static ngx_int_t
 ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     ngx_uint_t flags)
 {
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index 760c69b..76aee08 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -176,7 +176,7 @@ static ngx_command_t  ngx_epoll_commands[] = {
 };
 
 
-ngx_event_module_t  ngx_epoll_module_ctx = {
+static ngx_event_module_t  ngx_epoll_module_ctx = {
     &epoll_name,
     ngx_epoll_create_conf,               /* create configuration */
     ngx_epoll_init_conf,                 /* init configuration */
diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c
index 0413599..e723f92 100644
--- a/src/event/modules/ngx_eventport_module.c
+++ b/src/event/modules/ngx_eventport_module.c
@@ -169,7 +169,7 @@ static ngx_command_t  ngx_eventport_commands[] = {
 };
 
 
-ngx_event_module_t  ngx_eventport_module_ctx = {
+static ngx_event_module_t  ngx_eventport_module_ctx = {
     &eventport_name,
     ngx_eventport_create_conf,             /* create configuration */
     ngx_eventport_init_conf,               /* init configuration */
@@ -432,7 +432,7 @@ ngx_eventport_notify(ngx_event_handler_pt handler)
 }
 
 
-ngx_int_t
+static ngx_int_t
 ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     ngx_uint_t flags)
 {
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index ca3bfe4..9c7244c 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -73,7 +73,7 @@ static ngx_command_t  ngx_kqueue_commands[] = {
 };
 
 
-ngx_event_module_t  ngx_kqueue_module_ctx = {
+static ngx_event_module_t  ngx_kqueue_module_ctx = {
     &kqueue_name,
     ngx_kqueue_create_conf,                /* create configuration */
     ngx_kqueue_init_conf,                  /* init configuration */
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index a2a7079..4e03dab 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -25,9 +25,9 @@ static struct pollfd  *event_list;
 static ngx_uint_t      nevents;
 
 
-static ngx_str_t    poll_name = ngx_string("poll");
+static ngx_str_t           poll_name = ngx_string("poll");
 
-ngx_event_module_t  ngx_poll_module_ctx = {
+static ngx_event_module_t  ngx_poll_module_ctx = {
     &poll_name,
     NULL,                                  /* create configuration */
     ngx_poll_init_conf,                    /* init configuration */
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 5a976bd..0644621 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -33,9 +33,9 @@ static ngx_uint_t     nevents;
 static ngx_event_t  **event_index;
 
 
-static ngx_str_t    select_name = ngx_string("select");
+static ngx_str_t           select_name = ngx_string("select");
 
-ngx_event_module_t  ngx_select_module_ctx = {
+static ngx_event_module_t  ngx_select_module_ctx = {
     &select_name,
     NULL,                                  /* create configuration */
     ngx_select_init_conf,                  /* init configuration */
diff --git a/src/event/modules/ngx_win32_select_module.c b/src/event/modules/ngx_win32_select_module.c
index c671f83..a98a83f 100644
--- a/src/event/modules/ngx_win32_select_module.c
+++ b/src/event/modules/ngx_win32_select_module.c
@@ -34,9 +34,9 @@ static ngx_uint_t     nevents;
 static ngx_event_t  **event_index;
 
 
-static ngx_str_t    select_name = ngx_string("select");
+static ngx_str_t           select_name = ngx_string("select");
 
-ngx_event_module_t  ngx_select_module_ctx = {
+static ngx_event_module_t  ngx_select_module_ctx = {
     &select_name,
     NULL,                                  /* create configuration */
     ngx_select_init_conf,                  /* init configuration */
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 9d6c4c9..dca41ee 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -59,20 +59,20 @@ ngx_int_t             ngx_accept_disabled;
 
 #if (NGX_STAT_STUB)
 
-ngx_atomic_t   ngx_stat_accepted0;
-ngx_atomic_t  *ngx_stat_accepted = &ngx_stat_accepted0;
-ngx_atomic_t   ngx_stat_handled0;
-ngx_atomic_t  *ngx_stat_handled = &ngx_stat_handled0;
-ngx_atomic_t   ngx_stat_requests0;
-ngx_atomic_t  *ngx_stat_requests = &ngx_stat_requests0;
-ngx_atomic_t   ngx_stat_active0;
-ngx_atomic_t  *ngx_stat_active = &ngx_stat_active0;
-ngx_atomic_t   ngx_stat_reading0;
-ngx_atomic_t  *ngx_stat_reading = &ngx_stat_reading0;
-ngx_atomic_t   ngx_stat_writing0;
-ngx_atomic_t  *ngx_stat_writing = &ngx_stat_writing0;
-ngx_atomic_t   ngx_stat_waiting0;
-ngx_atomic_t  *ngx_stat_waiting = &ngx_stat_waiting0;
+static ngx_atomic_t   ngx_stat_accepted0;
+ngx_atomic_t         *ngx_stat_accepted = &ngx_stat_accepted0;
+static ngx_atomic_t   ngx_stat_handled0;
+ngx_atomic_t         *ngx_stat_handled = &ngx_stat_handled0;
+static ngx_atomic_t   ngx_stat_requests0;
+ngx_atomic_t         *ngx_stat_requests = &ngx_stat_requests0;
+static ngx_atomic_t   ngx_stat_active0;
+ngx_atomic_t         *ngx_stat_active = &ngx_stat_active0;
+static ngx_atomic_t   ngx_stat_reading0;
+ngx_atomic_t         *ngx_stat_reading = &ngx_stat_reading0;
+static ngx_atomic_t   ngx_stat_writing0;
+ngx_atomic_t         *ngx_stat_writing = &ngx_stat_writing0;
+static ngx_atomic_t   ngx_stat_waiting0;
+ngx_atomic_t         *ngx_stat_waiting = &ngx_stat_waiting0;
 
 #endif
 
@@ -165,7 +165,7 @@ static ngx_command_t  ngx_event_core_commands[] = {
 };
 
 
-ngx_event_module_t  ngx_event_core_module_ctx = {
+static ngx_event_module_t  ngx_event_core_module_ctx = {
     &event_core_name,
     ngx_event_core_create_conf,            /* create configuration */
     ngx_event_core_init_conf,              /* init configuration */
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
index 8f547b2..698b88f 100644
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -67,7 +67,7 @@ ngx_event_expire_timers(void)
 
         node = ngx_rbtree_min(root, sentinel);
 
-        /* node->key > ngx_current_time */
+        /* node->key > ngx_current_msec */
 
         if ((ngx_msec_int_t) (node->key - ngx_current_msec) > 0) {
             return;
@@ -96,43 +96,31 @@ ngx_event_expire_timers(void)
 }
 
 
-void
-ngx_event_cancel_timers(void)
+ngx_int_t
+ngx_event_no_timers_left(void)
 {
     ngx_event_t        *ev;
     ngx_rbtree_node_t  *node, *root, *sentinel;
 
     sentinel = ngx_event_timer_rbtree.sentinel;
+    root = ngx_event_timer_rbtree.root;
 
-    for ( ;; ) {
-        root = ngx_event_timer_rbtree.root;
-
-        if (root == sentinel) {
-            return;
-        }
-
-        node = ngx_rbtree_min(root, sentinel);
+    if (root == sentinel) {
+        return NGX_OK;
+    }
 
+    for (node = ngx_rbtree_min(root, sentinel);
+         node;
+         node = ngx_rbtree_next(&ngx_event_timer_rbtree, node))
+    {
         ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer));
 
         if (!ev->cancelable) {
-            return;
+            return NGX_AGAIN;
         }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                       "event timer cancel: %d: %M",
-                       ngx_event_ident(ev->data), ev->timer.key);
-
-        ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer);
-
-#if (NGX_DEBUG)
-        ev->timer.left = NULL;
-        ev->timer.right = NULL;
-        ev->timer.parent = NULL;
-#endif
-
-        ev->timer_set = 0;
-
-        ev->handler(ev);
     }
+
+    /* only cancelable timers left */
+
+    return NGX_OK;
 }
diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h
index 99f8a48..be81b15 100644
--- a/src/event/ngx_event_timer.h
+++ b/src/event/ngx_event_timer.h
@@ -22,7 +22,7 @@
 ngx_int_t ngx_event_timer_init(ngx_log_t *log);
 ngx_msec_t ngx_event_find_timer(void);
 void ngx_event_expire_timers(void);
-void ngx_event_cancel_timers(void);
+ngx_int_t ngx_event_no_timers_left(void);
 
 
 extern ngx_rbtree_t  ngx_event_timer_rbtree;
diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c
index 4ea9818..e52b96e 100644
--- a/src/http/modules/ngx_http_charset_filter_module.c
+++ b/src/http/modules/ngx_http_charset_filter_module.c
@@ -123,7 +123,7 @@ static char *ngx_http_charset_merge_loc_conf(ngx_conf_t *cf,
 static ngx_int_t ngx_http_charset_postconfiguration(ngx_conf_t *cf);
 
 
-ngx_str_t  ngx_http_charset_default_types[] = {
+static ngx_str_t  ngx_http_charset_default_types[] = {
     ngx_string("text/html"),
     ngx_string("text/xml"),
     ngx_string("text/plain"),
diff --git a/src/http/modules/ngx_http_gzip_static_module.c b/src/http/modules/ngx_http_gzip_static_module.c
index 4d54090..b9294dd 100644
--- a/src/http/modules/ngx_http_gzip_static_module.c
+++ b/src/http/modules/ngx_http_gzip_static_module.c
@@ -48,7 +48,7 @@ static ngx_command_t  ngx_http_gzip_static_commands[] = {
 };
 
 
-ngx_http_module_t  ngx_http_gzip_static_module_ctx = {
+static ngx_http_module_t  ngx_http_gzip_static_module_ctx = {
     NULL,                                  /* preconfiguration */
     ngx_http_gzip_static_init,             /* postconfiguration */
 
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index ff8572b..330dc7e 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -748,23 +748,10 @@ ngx_http_log_flush(ngx_open_file_t *file, ngx_log_t *log)
 static void
 ngx_http_log_flush_handler(ngx_event_t *ev)
 {
-    ngx_open_file_t     *file;
-    ngx_http_log_buf_t  *buffer;
-
     ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0,
                    "http log buffer flush handler");
 
-    if (ev->timedout) {
-        ngx_http_log_flush(ev->data, ev->log);
-        return;
-    }
-
-    /* cancel the flush timer for graceful shutdown */
-
-    file = ev->data;
-    buffer = file->data;
-
-    buffer->event = NULL;
+    ngx_http_log_flush(ev->data, ev->log);
 }
 
 
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index 07b9580..f2435a7 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -14,7 +14,7 @@ static ngx_int_t ngx_http_static_handler(ngx_http_request_t *r);
 static ngx_int_t ngx_http_static_init(ngx_conf_t *cf);
 
 
-ngx_http_module_t  ngx_http_static_module_ctx = {
+static ngx_http_module_t  ngx_http_static_module_ctx = {
     NULL,                                  /* preconfiguration */
     ngx_http_static_init,                  /* postconfiguration */
 
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index 315081e..695f3bf 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -109,7 +109,7 @@ static ngx_int_t ngx_http_xslt_filter_init(ngx_conf_t *cf);
 static void ngx_http_xslt_filter_exit(ngx_cycle_t *cycle);
 
 
-ngx_str_t  ngx_http_xslt_default_types[] = {
+static ngx_str_t  ngx_http_xslt_default_types[] = {
     ngx_string("text/xml"),
     ngx_null_string
 };
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 9e12890..6e31a2a 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2571,6 +2571,7 @@ ngx_http_subrequest(ngx_http_request_t *r,
         sr->method_name = r->method_name;
         sr->loc_conf = r->loc_conf;
         sr->valid_location = r->valid_location;
+        sr->content_handler = r->content_handler;
         sr->phase_handler = r->phase_handler;
         sr->write_event_handler = ngx_http_core_run_phases;
 
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index baf9704..1788bf3 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -549,7 +549,7 @@ ngx_http_create_request(ngx_connection_t *c)
 
     ngx_set_connection_log(r->connection, clcf->error_log);
 
-    r->header_in = hc->nbusy ? hc->busy[0] : c->buffer;
+    r->header_in = hc->busy ? hc->busy->buf : c->buffer;
 
     if (ngx_list_init(&r->headers_out.headers, r->pool, 20,
                       sizeof(ngx_table_elt_t))
@@ -1431,6 +1431,7 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
 {
     u_char                    *old, *new;
     ngx_buf_t                 *b;
+    ngx_chain_t               *cl;
     ngx_http_connection_t     *hc;
     ngx_http_core_srv_conf_t  *cscf;
 
@@ -1460,8 +1461,11 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
 
     hc = r->http_connection;
 
-    if (hc->nfree) {
-        b = hc->free[--hc->nfree];
+    if (hc->free) {
+        cl = hc->free;
+        hc->free = cl->next;
+
+        b = cl->buf;
 
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "http large header free: %p %uz",
@@ -1469,20 +1473,19 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
 
     } else if (hc->nbusy < cscf->large_client_header_buffers.num) {
 
-        if (hc->busy == NULL) {
-            hc->busy = ngx_palloc(r->connection->pool,
-                  cscf->large_client_header_buffers.num * sizeof(ngx_buf_t *));
-            if (hc->busy == NULL) {
-                return NGX_ERROR;
-            }
-        }
-
         b = ngx_create_temp_buf(r->connection->pool,
                                 cscf->large_client_header_buffers.size);
         if (b == NULL) {
             return NGX_ERROR;
         }
 
+        cl = ngx_alloc_chain_link(r->connection->pool);
+        if (cl == NULL) {
+            return NGX_ERROR;
+        }
+
+        cl->buf = b;
+
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "http large header alloc: %p %uz",
                        b->pos, b->end - b->last);
@@ -1491,7 +1494,9 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
         return NGX_DECLINED;
     }
 
-    hc->busy[hc->nbusy++] = b;
+    cl->next = hc->busy;
+    hc->busy = cl;
+    hc->nbusy++;
 
     if (r->state == 0) {
         /*
@@ -2835,12 +2840,11 @@ static void
 ngx_http_set_keepalive(ngx_http_request_t *r)
 {
     int                        tcp_nodelay;
-    ngx_int_t                  i;
     ngx_buf_t                 *b, *f;
+    ngx_chain_t               *cl, *ln;
     ngx_event_t               *rev, *wev;
     ngx_connection_t          *c;
     ngx_http_connection_t     *hc;
-    ngx_http_core_srv_conf_t  *cscf;
     ngx_http_core_loc_conf_t  *clcf;
 
     c = r->connection;
@@ -2876,26 +2880,32 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
              * Now we would move the large header buffers to the free list.
              */
 
-            cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+            for (cl = hc->busy; cl; /* void */) {
+                ln = cl;
+                cl = cl->next;
 
-            if (hc->free == NULL) {
-                hc->free = ngx_palloc(c->pool,
-                  cscf->large_client_header_buffers.num * sizeof(ngx_buf_t *));
-
-                if (hc->free == NULL) {
-                    ngx_http_close_request(r, 0);
-                    return;
+                if (ln->buf == b) {
+                    ngx_free_chain(c->pool, ln);
+                    continue;
                 }
-            }
 
-            for (i = 0; i < hc->nbusy - 1; i++) {
-                f = hc->busy[i];
-                hc->free[hc->nfree++] = f;
+                f = ln->buf;
                 f->pos = f->start;
                 f->last = f->start;
+
+                ln->next = hc->free;
+                hc->free = ln;
             }
 
-            hc->busy[0] = b;
+            cl = ngx_alloc_chain_link(c->pool);
+            if (cl == NULL) {
+                ngx_http_close_request(r, 0);
+                return;
+            }
+
+            cl->buf = b;
+
+            hc->busy = cl;
             hc->nbusy = 1;
         }
     }
@@ -2966,27 +2976,32 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
         b->last = b->start;
     }
 
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc free: %p %i",
-                   hc->free, hc->nfree);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc free: %p",
+                   hc->free);
 
     if (hc->free) {
-        for (i = 0; i < hc->nfree; i++) {
-            ngx_pfree(c->pool, hc->free[i]->start);
-            hc->free[i] = NULL;
+        for (cl = hc->free; cl; /* void */) {
+            ln = cl;
+            cl = cl->next;
+            ngx_pfree(c->pool, ln->buf->start);
+            ngx_free_chain(c->pool, ln);
         }
 
-        hc->nfree = 0;
+        hc->free = NULL;
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc busy: %p %i",
                    hc->busy, hc->nbusy);
 
     if (hc->busy) {
-        for (i = 0; i < hc->nbusy; i++) {
-            ngx_pfree(c->pool, hc->busy[i]->start);
-            hc->busy[i] = NULL;
+        for (cl = hc->busy; cl; /* void */) {
+            ln = cl;
+            cl = cl->next;
+            ngx_pfree(c->pool, ln->buf->start);
+            ngx_free_chain(c->pool, ln);
         }
 
+        hc->busy = NULL;
         hc->nbusy = 0;
     }
 
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 4cda754..780a99f 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -309,11 +309,10 @@ typedef struct {
 #endif
 #endif
 
-    ngx_buf_t                       **busy;
+    ngx_chain_t                      *busy;
     ngx_int_t                         nbusy;
 
-    ngx_buf_t                       **free;
-    ngx_int_t                         nfree;
+    ngx_chain_t                      *free;
 
     unsigned                          ssl:1;
     unsigned                          proxy_protocol:1;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 04bfc72..1404693 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -188,7 +188,7 @@ static ngx_int_t ngx_http_upstream_ssl_name(ngx_http_request_t *r,
 #endif
 
 
-ngx_http_upstream_header_t  ngx_http_upstream_headers_in[] = {
+static ngx_http_upstream_header_t  ngx_http_upstream_headers_in[] = {
 
     { ngx_string("Status"),
                  ngx_http_upstream_process_header_line,
@@ -5554,7 +5554,7 @@ ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
 
 #if (NGX_HTTP_CACHE)
 
-ngx_int_t
+static ngx_int_t
 ngx_http_upstream_cache_status(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
diff --git a/src/mail/ngx_mail_pop3_module.c b/src/mail/ngx_mail_pop3_module.c
index bd60e0a..a673070 100644
--- a/src/mail/ngx_mail_pop3_module.c
+++ b/src/mail/ngx_mail_pop3_module.c
@@ -185,6 +185,10 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
          m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
          m <<= 1, i++)
     {
+        if (ngx_mail_pop3_auth_methods_names[i].len == 0) {
+            continue;
+        }
+
         if (m & conf->auth_methods) {
             size += 1 + ngx_mail_pop3_auth_methods_names[i].len;
         }
@@ -212,6 +216,10 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
          m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
          m <<= 1, i++)
     {
+        if (ngx_mail_pop3_auth_methods_names[i].len == 0) {
+            continue;
+        }
+
         if (m & conf->auth_methods) {
             *p++ = ' ';
             p = ngx_cpymem(p, ngx_mail_pop3_auth_methods_names[i].data,
@@ -248,6 +256,10 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
          m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
          m <<= 1, i++)
     {
+        if (ngx_mail_pop3_auth_methods_names[i].len == 0) {
+            continue;
+        }
+
         if (m & conf->auth_methods) {
             size += ngx_mail_pop3_auth_methods_names[i].len
                     + sizeof(CRLF) - 1;
@@ -269,6 +281,10 @@ ngx_mail_pop3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
          m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED;
          m <<= 1, i++)
     {
+        if (ngx_mail_pop3_auth_methods_names[i].len == 0) {
+            continue;
+        }
+
         if (m & conf->auth_methods) {
             p = ngx_cpymem(p, ngx_mail_pop3_auth_methods_names[i].data,
                            ngx_mail_pop3_auth_methods_names[i].len);
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
index 24a63fb..2d37e21 100644
--- a/src/os/unix/ngx_process.c
+++ b/src/os/unix/ngx_process.c
@@ -306,7 +306,7 @@ ngx_init_signals(ngx_log_t *log)
 }
 
 
-void
+static void
 ngx_signal_handler(int signo)
 {
     char            *action;
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 5c4e21d..1710ea8 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -738,12 +738,8 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
     for ( ;; ) {
 
         if (ngx_exiting) {
-            ngx_event_cancel_timers();
-
-            if (ngx_event_timer_rbtree.root == ngx_event_timer_rbtree.sentinel)
-            {
+            if (ngx_event_no_timers_left() == NGX_OK) {
                 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
-
                 ngx_worker_process_exit(cycle);
             }
         }
@@ -754,7 +750,6 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
 
         if (ngx_terminate) {
             ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
-
             ngx_worker_process_exit(cycle);
         }
 
@@ -766,6 +761,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
 
             if (!ngx_exiting) {
                 ngx_exiting = 1;
+                ngx_set_shutdown_timer(cycle);
                 ngx_close_listening_sockets(cycle);
                 ngx_close_idle_connections(cycle);
             }
diff --git a/src/stream/ngx_stream_log_module.c b/src/stream/ngx_stream_log_module.c
index a4b67d0..6b29340 100644
--- a/src/stream/ngx_stream_log_module.c
+++ b/src/stream/ngx_stream_log_module.c
@@ -641,23 +641,10 @@ ngx_stream_log_flush(ngx_open_file_t *file, ngx_log_t *log)
 static void
 ngx_stream_log_flush_handler(ngx_event_t *ev)
 {
-    ngx_open_file_t       *file;
-    ngx_stream_log_buf_t  *buffer;
-
     ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0,
                    "stream log buffer flush handler");
 
-    if (ev->timedout) {
-        ngx_stream_log_flush(ev->data, ev->log);
-        return;
-    }
-
-    /* cancel the flush timer for graceful shutdown */
-
-    file = ev->data;
-    buffer = file->data;
-
-    buffer->event = NULL;
+    ngx_stream_log_flush(ev->data, ev->log);
 }
 
 

From 201ea3f6de3540a12710799e95ca9d8459a3cd69 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 25 Mar 2017 07:51:16 +0200
Subject: [PATCH 167/600] New upstream version 1.11.12

---
 CHANGES                         |  5 +++++
 CHANGES.ru                      |  6 ++++++
 src/core/nginx.h                |  4 ++--
 src/http/ngx_http_core_module.c | 16 +++++++---------
 src/http/ngx_http_request.c     |  1 +
 src/http/ngx_http_script.c      |  2 +-
 src/stream/ngx_stream_script.c  |  2 +-
 7 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/CHANGES b/CHANGES
index cd85f24..9ac6e69 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+Changes with nginx 1.11.12                                       24 Mar 2017
+
+    *) Bugfix: nginx might hog CPU; the bug had appeared in 1.11.11.
+
+
 Changes with nginx 1.11.11                                       21 Mar 2017
 
     *) Feature: the "worker_shutdown_timeout" directive.
diff --git a/CHANGES.ru b/CHANGES.ru
index b140735..27e490a 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,10 @@
 
+Изменения в nginx 1.11.12                                         24.03.2017
+
+    *) Исправление: nginx мог нагружать процессор; ошибка появилась в
+       1.11.11.
+
+
 Изменения в nginx 1.11.11                                         21.03.2017
 
     *) Добавление: директива worker_shutdown_timeout.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 5dc1ea2..a5581a9 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011011
-#define NGINX_VERSION      "1.11.11"
+#define nginx_version      1011012
+#define NGINX_VERSION      "1.11.12"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 6e31a2a..c3957ba 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -4405,16 +4405,14 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     if (clcf->root.data) {
 
         if ((clcf->alias != 0) == alias) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "\"%V\" directive is duplicate",
-                               &cmd->name);
-        } else {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "\"%V\" directive is duplicate, "
-                               "\"%s\" directive was specified earlier",
-                               &cmd->name, clcf->alias ? "alias" : "root");
+            return "is duplicate";
         }
 
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "\"%V\" directive is duplicate, "
+                           "\"%s\" directive was specified earlier",
+                           &cmd->name, clcf->alias ? "alias" : "root");
+
         return NGX_CONF_ERROR;
     }
 
@@ -4529,7 +4527,7 @@ ngx_http_core_limit_except(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_core_loc_conf_t  *clcf;
 
     if (pclcf->limit_except) {
-        return "duplicate";
+        return "is duplicate";
     }
 
     pclcf->limit_except = 0xffffffff;
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 1788bf3..dd54910 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2904,6 +2904,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
             }
 
             cl->buf = b;
+            cl->next = NULL;
 
             hc->busy = cl;
             hc->nbusy = 1;
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index c1a0b4c..cc4d679 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -220,7 +220,7 @@ ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     cv = (ngx_http_complex_value_t **) (p + cmd->offset);
 
     if (*cv != NULL) {
-        return "duplicate";
+        return "is duplicate";
     }
 
     *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c
index ff8e655..aa555ca 100644
--- a/src/stream/ngx_stream_script.c
+++ b/src/stream/ngx_stream_script.c
@@ -222,7 +222,7 @@ ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     cv = (ngx_stream_complex_value_t **) (p + cmd->offset);
 
     if (*cv != NULL) {
-        return "duplicate";
+        return "is duplicate";
     }
 
     *cv = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));

From 0a3c1a52085854b8b83b20b2cfe7266d833bd5fa Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 18 Apr 2017 13:14:36 +0300
Subject: [PATCH 168/600] New upstream version 1.11.13

---
 CHANGES                                       |  28 +++++
 CHANGES.ru                                    |  27 ++++
 src/core/nginx.h                              |   4 +-
 src/core/ngx_cycle.c                          |  34 +++--
 src/event/ngx_event.c                         |   3 +-
 src/http/modules/ngx_http_fastcgi_module.c    |   1 +
 src/http/modules/ngx_http_index_module.c      |   6 +-
 src/http/modules/ngx_http_limit_req_module.c  |   6 +-
 src/http/modules/ngx_http_log_module.c        |   5 +
 src/http/modules/ngx_http_proxy_module.c      |   1 +
 src/http/modules/ngx_http_scgi_module.c       |   1 +
 .../modules/ngx_http_slice_filter_module.c    |  38 ++++--
 src/http/modules/ngx_http_uwsgi_module.c      |   1 +
 src/http/modules/perl/nginx.xs                |   1 +
 src/http/modules/perl/ngx_http_perl_module.c  |  13 +-
 src/http/ngx_http_copy_filter_module.c        |  32 ++++-
 src/http/ngx_http_core_module.c               |   5 +
 src/http/ngx_http_header_filter_module.c      |  14 ++-
 src/http/ngx_http_request.c                   |  39 +++---
 src/http/ngx_http_request.h                   |   1 +
 src/http/ngx_http_script.c                    |   6 +
 src/http/ngx_http_special_response.c          |  18 ++-
 src/http/ngx_http_upstream.c                  |  78 ++++--------
 src/http/ngx_http_upstream.h                  |  12 +-
 src/http/v2/ngx_http_v2.c                     |  53 +++++---
 src/http/v2/ngx_http_v2.h                     |   4 +-
 src/http/v2/ngx_http_v2_filter_module.c       |   5 +
 src/os/unix/ngx_linux_sendfile_chain.c        | 116 ++++++++----------
 src/stream/ngx_stream_log_module.c            |   5 +
 29 files changed, 333 insertions(+), 224 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9ac6e69..e54f1b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,32 @@
 
+Changes with nginx 1.11.13                                       04 Apr 2017
+
+    *) Feature: the "http_429" parameter of the "proxy_next_upstream",
+       "fastcgi_next_upstream", "scgi_next_upstream", and
+       "uwsgi_next_upstream" directives.
+       Thanks to Piotr Sikora.
+
+    *) Bugfix: in memory allocation error handling.
+
+    *) Bugfix: requests might hang when using the "sendfile" and
+       "timer_resolution" directives on Linux.
+
+    *) Bugfix: requests might hang when using the "sendfile" and "aio_write"
+       directives with subrequests.
+
+    *) Bugfix: in the ngx_http_v2_module.
+       Thanks to Piotr Sikora.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2.
+
+    *) Bugfix: requests might hang when using the "limit_rate",
+       "sendfile_max_chunk", "limit_req" directives, or the $r->sleep()
+       embedded perl method with subrequests.
+
+    *) Bugfix: in the ngx_http_slice_module.
+
+
 Changes with nginx 1.11.12                                       24 Mar 2017
 
     *) Bugfix: nginx might hog CPU; the bug had appeared in 1.11.11.
diff --git a/CHANGES.ru b/CHANGES.ru
index 27e490a..029a2a7 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,31 @@
 
+Изменения в nginx 1.11.13                                         04.04.2017
+
+    *) Добавление: параметр http_429 в директивах proxy_next_upstream,
+       fastcgi_next_upstream, scgi_next_upstream и uwsgi_next_upstream.
+       Спасибо Piotr Sikora.
+
+    *) Исправление: в обработке ошибок выделения памяти.
+
+    *) Исправление: при использовании директив sendfile и timer_resolution
+       на Linux запросы могли зависать.
+
+    *) Исправление: при использовании с подзапросами директив sendfile и
+       aio_write запросы могли зависать.
+
+    *) Исправление: в модуле ngx_http_v2_module.
+       Спасибо Piotr Sikora.
+
+    *) Исправление: при использовании HTTP/2 в рабочем процессе мог
+       произойти segmentation fault.
+
+    *) Исправление: запросы могли зависать при использовании с подзапросами
+       директив limit_rate, sendfile_max_chunk, limit_req или метода
+       $r->sleep() встроенного перла.
+
+    *) Исправление: в модуле ngx_http_slice_module.
+
+
 Изменения в nginx 1.11.12                                         24.03.2017
 
     *) Исправление: nginx мог нагружать процессор; ошибка появилась в
diff --git a/src/core/nginx.h b/src/core/nginx.h
index a5581a9..5d3112f 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011012
-#define NGINX_VERSION      "1.11.12"
+#define nginx_version      1011013
+#define NGINX_VERSION      "1.11.13"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 3dfdf2e..aee7a58 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -115,16 +115,14 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
 
     n = old_cycle->paths.nelts ? old_cycle->paths.nelts : 10;
 
-    cycle->paths.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *));
-    if (cycle->paths.elts == NULL) {
+    if (ngx_array_init(&cycle->paths, pool, n, sizeof(ngx_path_t *))
+        != NGX_OK)
+    {
         ngx_destroy_pool(pool);
         return NULL;
     }
 
-    cycle->paths.nelts = 0;
-    cycle->paths.size = sizeof(ngx_path_t *);
-    cycle->paths.nalloc = n;
-    cycle->paths.pool = pool;
+    ngx_memzero(cycle->paths.elts, n * sizeof(ngx_path_t *));
 
 
     if (ngx_array_init(&cycle->config_dump, pool, 1, sizeof(ngx_conf_dump_t))
@@ -175,16 +173,14 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
 
     n = old_cycle->listening.nelts ? old_cycle->listening.nelts : 10;
 
-    cycle->listening.elts = ngx_pcalloc(pool, n * sizeof(ngx_listening_t));
-    if (cycle->listening.elts == NULL) {
+    if (ngx_array_init(&cycle->listening, pool, n, sizeof(ngx_listening_t))
+        != NGX_OK)
+    {
         ngx_destroy_pool(pool);
         return NULL;
     }
 
-    cycle->listening.nelts = 0;
-    cycle->listening.size = sizeof(ngx_listening_t);
-    cycle->listening.nalloc = n;
-    cycle->listening.pool = pool;
+    ngx_memzero(cycle->listening.elts, n * sizeof(ngx_listening_t));
 
 
     ngx_queue_init(&cycle->reusable_connections_queue);
@@ -768,15 +764,15 @@ old_shm_zone_done:
         }
 
         n = 10;
-        ngx_old_cycles.elts = ngx_pcalloc(ngx_temp_pool,
-                                          n * sizeof(ngx_cycle_t *));
-        if (ngx_old_cycles.elts == NULL) {
+
+        if (ngx_array_init(&ngx_old_cycles, ngx_temp_pool, n,
+                           sizeof(ngx_cycle_t *))
+            != NGX_OK)
+        {
             exit(1);
         }
-        ngx_old_cycles.nelts = 0;
-        ngx_old_cycles.size = sizeof(ngx_cycle_t *);
-        ngx_old_cycles.nalloc = n;
-        ngx_old_cycles.pool = ngx_temp_pool;
+
+        ngx_memzero(ngx_old_cycles.elts, n * sizeof(ngx_cycle_t *));
 
         ngx_cleaner_event.handler = ngx_clean_old_cycles;
         ngx_cleaner_event.log = cycle->log;
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index dca41ee..57af813 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -500,8 +500,7 @@ ngx_event_module_init(ngx_cycle_t *cycle)
 #endif
 
     shm.size = size;
-    shm.name.len = sizeof("nginx_shared_zone") - 1;
-    shm.name.data = (u_char *) "nginx_shared_zone";
+    ngx_str_set(&shm.name, "nginx_shared_zone");
     shm.log = cycle->log;
 
     if (ngx_shm_alloc(&shm) != NGX_OK) {
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index afdea2d..06c1973 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -211,6 +211,7 @@ static ngx_conf_bitmask_t  ngx_http_fastcgi_next_upstream_masks[] = {
     { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
     { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
     { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
+    { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 },
     { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING },
     { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
     { ngx_null_string, 0 }
diff --git a/src/http/modules/ngx_http_index_module.c b/src/http/modules/ngx_http_index_module.c
index d3544db..c144b31 100644
--- a/src/http/modules/ngx_http_index_module.c
+++ b/src/http/modules/ngx_http_index_module.c
@@ -217,13 +217,13 @@ ngx_http_index_handler(ngx_http_request_t *r)
         if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
             != NGX_OK)
         {
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, of.err,
-                           "%s \"%s\" failed", of.failed, path.data);
-
             if (of.err == 0) {
                 return NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
 
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, of.err,
+                           "%s \"%s\" failed", of.failed, path.data);
+
 #if (NGX_HAVE_OPENAT)
             if (of.err == NGX_EMLINK
                 || of.err == NGX_ELOOP)
diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c
index 2f695f2..579b13c 100644
--- a/src/http/modules/ngx_http_limit_req_module.c
+++ b/src/http/modules/ngx_http_limit_req_module.c
@@ -276,6 +276,8 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
 
     r->read_event_handler = ngx_http_test_reading;
     r->write_event_handler = ngx_http_limit_req_delay;
+
+    r->connection->write->delayed = 1;
     ngx_add_timer(r->connection->write, delay);
 
     return NGX_AGAIN;
@@ -292,7 +294,7 @@ ngx_http_limit_req_delay(ngx_http_request_t *r)
 
     wev = r->connection->write;
 
-    if (!wev->timedout) {
+    if (wev->delayed) {
 
         if (ngx_handle_write_event(wev, 0) != NGX_OK) {
             ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
@@ -301,8 +303,6 @@ ngx_http_limit_req_delay(ngx_http_request_t *r)
         return;
     }
 
-    wev->timedout = 0;
-
     if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
         ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
         return;
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index 330dc7e..917ed55 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -552,6 +552,11 @@ ngx_http_log_script_write(ngx_http_request_t *r, ngx_http_log_script_t *script,
     if (ngx_open_cached_file(llcf->open_file_cache, &log, &of, r->pool)
         != NGX_OK)
     {
+        if (of.err == 0) {
+            /* simulate successful logging */
+            return len;
+        }
+
         ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
                       "%s \"%s\" failed", of.failed, log.data);
         /* simulate successful logging */
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 1a84d78..e594d06 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -220,6 +220,7 @@ static ngx_conf_bitmask_t  ngx_http_proxy_next_upstream_masks[] = {
     { ngx_string("http_504"), NGX_HTTP_UPSTREAM_FT_HTTP_504 },
     { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
     { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
+    { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 },
     { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING },
     { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
     { ngx_null_string, 0 }
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 288ba09..d1e37dd 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -82,6 +82,7 @@ static ngx_conf_bitmask_t ngx_http_scgi_next_upstream_masks[] = {
     { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
     { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
     { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
+    { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 },
     { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING },
     { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
     { ngx_null_string, 0 }
diff --git a/src/http/modules/ngx_http_slice_filter_module.c b/src/http/modules/ngx_http_slice_filter_module.c
index 2005939..7758342 100644
--- a/src/http/modules/ngx_http_slice_filter_module.c
+++ b/src/http/modules/ngx_http_slice_filter_module.c
@@ -11,23 +11,25 @@
 
 
 typedef struct {
-    size_t      size;
+    size_t               size;
 } ngx_http_slice_loc_conf_t;
 
 
 typedef struct {
-    off_t       start;
-    off_t       end;
-    ngx_str_t   range;
-    ngx_str_t   etag;
-    ngx_uint_t  last;  /* unsigned  last:1; */
+    off_t                start;
+    off_t                end;
+    ngx_str_t            range;
+    ngx_str_t            etag;
+    unsigned             last:1;
+    unsigned             active:1;
+    ngx_http_request_t  *sr;
 } ngx_http_slice_ctx_t;
 
 
 typedef struct {
-    off_t       start;
-    off_t       end;
-    off_t       complete_length;
+    off_t                start;
+    off_t                end;
+    off_t                complete_length;
 } ngx_http_slice_content_range_t;
 
 
@@ -169,6 +171,7 @@ ngx_http_slice_header_filter(ngx_http_request_t *r)
     }
 
     ctx->start = end;
+    ctx->active = 1;
 
     r->headers_out.status = NGX_HTTP_OK;
     r->headers_out.status_line.len = 0;
@@ -209,7 +212,6 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 {
     ngx_int_t                   rc;
     ngx_chain_t                *cl;
-    ngx_http_request_t         *sr;
     ngx_http_slice_ctx_t       *ctx;
     ngx_http_slice_loc_conf_t  *slcf;
 
@@ -234,6 +236,16 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return rc;
     }
 
+    if (ctx->sr && !ctx->sr->done) {
+        return rc;
+    }
+
+    if (!ctx->active) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "missing slice response");
+        return NGX_ERROR;
+    }
+
     if (ctx->start >= ctx->end) {
         ngx_http_set_ctx(r, NULL, ngx_http_slice_filter_module);
         ngx_http_send_special(r, NGX_HTTP_LAST);
@@ -244,14 +256,14 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return rc;
     }
 
-    if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL,
+    if (ngx_http_subrequest(r, &r->uri, &r->args, &ctx->sr, NULL,
                             NGX_HTTP_SUBREQUEST_CLONE)
         != NGX_OK)
     {
         return NGX_ERROR;
     }
 
-    ngx_http_set_ctx(sr, ctx, ngx_http_slice_filter_module);
+    ngx_http_set_ctx(ctx->sr, ctx, ngx_http_slice_filter_module);
 
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module);
 
@@ -259,6 +271,8 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
                                  ctx->start + (off_t) slcf->size - 1)
                      - ctx->range.data;
 
+    ctx->active = 0;
+
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http slice subrequest: \"%V\"", &ctx->range);
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 2ba64af..b7e7c12 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -114,6 +114,7 @@ static ngx_conf_bitmask_t ngx_http_uwsgi_next_upstream_masks[] = {
     { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
     { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
     { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
+    { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 },
     { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING },
     { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
     { ngx_null_string, 0 }
diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs
index 6716620..cca64da 100644
--- a/src/http/modules/perl/nginx.xs
+++ b/src/http/modules/perl/nginx.xs
@@ -1001,6 +1001,7 @@ sleep(r, sleep, next)
 
     ctx->next = SvRV(ST(2));
 
+    r->connection->write->delayed = 1;
     ngx_add_timer(r->connection->write, sleep);
 
     r->write_event_handler = ngx_http_perl_sleep_handler;
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index 2796319..6d3be91 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -278,15 +278,16 @@ ngx_http_perl_sleep_handler(ngx_http_request_t *r)
 
     wev = r->connection->write;
 
-    if (wev->timedout) {
-        wev->timedout = 0;
-        ngx_http_perl_handle_request(r);
+    if (wev->delayed) {
+
+        if (ngx_handle_write_event(wev, 0) != NGX_OK) {
+            ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        }
+
         return;
     }
 
-    if (ngx_handle_write_event(wev, 0) != NGX_OK) {
-        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-    }
+    ngx_http_perl_handle_request(r);
 }
 
 
diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c
index c696fb6..c8ad5da 100644
--- a/src/http/ngx_http_copy_filter_module.c
+++ b/src/http/ngx_http_copy_filter_module.c
@@ -187,15 +187,24 @@ static void
 ngx_http_copy_aio_event_handler(ngx_event_t *ev)
 {
     ngx_event_aio_t     *aio;
+    ngx_connection_t    *c;
     ngx_http_request_t  *r;
 
     aio = ev->data;
     r = aio->data;
+    c = r->connection;
+
+    ngx_http_set_log_request(c->log, r);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http aio: \"%V?%V\"", &r->uri, &r->args);
 
     r->main->blocked--;
     r->aio = 0;
 
-    r->connection->write->handler(r->connection->write);
+    r->write_event_handler(r);
+
+    ngx_http_run_posted_requests(c);
 }
 
 
@@ -300,14 +309,33 @@ ngx_http_copy_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
 static void
 ngx_http_copy_thread_event_handler(ngx_event_t *ev)
 {
+    ngx_connection_t    *c;
     ngx_http_request_t  *r;
 
     r = ev->data;
+    c = r->connection;
+
+    ngx_http_set_log_request(c->log, r);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http thread: \"%V?%V\"", &r->uri, &r->args);
 
     r->main->blocked--;
     r->aio = 0;
 
-    r->connection->write->handler(r->connection->write);
+    if (r->done) {
+        /*
+         * trigger connection event handler if the subrequest was
+         * already finalized; this can happen if the handler is used
+         * for sendfile() in threads
+         */
+
+        c->write->handler(c->write);
+
+    } else {
+        r->write_event_handler(r);
+        ngx_http_run_posted_requests(c);
+    }
 }
 
 #endif
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index c3957ba..292671d 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1314,6 +1314,11 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
         if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
             != NGX_OK)
         {
+            if (of.err == 0) {
+                ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+                return NGX_OK;
+            }
+
             if (of.err != NGX_ENOENT
                 && of.err != NGX_ENOTDIR
                 && of.err != NGX_ENAMETOOLONG)
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index ddae613..c09c519 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -101,12 +101,16 @@ static ngx_str_t ngx_http_status_lines[] = {
     ngx_null_string,  /* "419 unused" */
     ngx_null_string,  /* "420 unused" */
     ngx_string("421 Misdirected Request"),
+    ngx_null_string,  /* "422 Unprocessable Entity" */
+    ngx_null_string,  /* "423 Locked" */
+    ngx_null_string,  /* "424 Failed Dependency" */
+    ngx_null_string,  /* "425 unused" */
+    ngx_null_string,  /* "426 Upgrade Required" */
+    ngx_null_string,  /* "427 unused" */
+    ngx_null_string,  /* "428 Precondition Required" */
+    ngx_string("429 Too Many Requests"),
 
-    /* ngx_null_string, */  /* "422 Unprocessable Entity" */
-    /* ngx_null_string, */  /* "423 Locked" */
-    /* ngx_null_string, */  /* "424 Failed Dependency" */
-
-#define NGX_HTTP_LAST_4XX  422
+#define NGX_HTTP_LAST_4XX  430
 #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
     ngx_string("500 Internal Server Error"),
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index dd54910..476f039 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2198,6 +2198,11 @@ ngx_http_request_handler(ngx_event_t *ev)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http run request: \"%V?%V\"", &r->uri, &r->args);
 
+    if (ev->delayed && ev->timedout) {
+        ev->delayed = 0;
+        ev->timedout = 0;
+    }
+
     if (ev->write) {
         r->write_event_handler(r);
 
@@ -2607,7 +2612,7 @@ ngx_http_set_write_handler(ngx_http_request_t *r)
 static void
 ngx_http_writer(ngx_http_request_t *r)
 {
-    int                        rc;
+    ngx_int_t                  rc;
     ngx_event_t               *wev;
     ngx_connection_t          *c;
     ngx_http_core_loc_conf_t  *clcf;
@@ -2621,34 +2626,22 @@ ngx_http_writer(ngx_http_request_t *r)
     clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
 
     if (wev->timedout) {
-        if (!wev->delayed) {
-            ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
-                          "client timed out");
-            c->timedout = 1;
-
-            ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
-            return;
-        }
-
-        wev->timedout = 0;
-        wev->delayed = 0;
-
-        if (!wev->ready) {
-            ngx_add_timer(wev, clcf->send_timeout);
-
-            if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-                ngx_http_close_request(r, 0);
-            }
-
-            return;
-        }
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
+                      "client timed out");
+        c->timedout = 1;
 
+        ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
+        return;
     }
 
     if (wev->delayed || r->aio) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0,
                        "http writer delayed");
 
+        if (!wev->delayed) {
+            ngx_add_timer(wev, clcf->send_timeout);
+        }
+
         if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
             ngx_http_close_request(r, 0);
         }
@@ -2659,7 +2652,7 @@ ngx_http_writer(ngx_http_request_t *r)
     rc = ngx_http_output_filter(r, NULL);
 
     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http writer output filter: %d, \"%V?%V\"",
+                   "http writer output filter: %i, \"%V?%V\"",
                    rc, &r->uri, &r->args);
 
     if (rc == NGX_ERROR) {
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 780a99f..a68b906 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -98,6 +98,7 @@
 #define NGX_HTTP_UNSUPPORTED_MEDIA_TYPE    415
 #define NGX_HTTP_RANGE_NOT_SATISFIABLE     416
 #define NGX_HTTP_MISDIRECTED_REQUEST       421
+#define NGX_HTTP_TOO_MANY_REQUESTS         429
 
 
 /* Our own HTTP codes */
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index cc4d679..96f3ec6 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -1513,6 +1513,12 @@ ngx_http_script_file_code(ngx_http_script_engine_t *e)
     if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
         != NGX_OK)
     {
+        if (of.err == 0) {
+            e->ip = ngx_http_script_exit;
+            e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
+            return;
+        }
+
         if (of.err != NGX_ENOENT
             && of.err != NGX_ENOTDIR
             && of.err != NGX_ENAMETOOLONG)
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 9de0d15..c9b1017 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -225,6 +225,14 @@ static char ngx_http_error_421_page[] =
 ;
 
 
+static char ngx_http_error_429_page[] =
+"<html>" CRLF
+"<head><title>429 Too Many Requests</title></head>" CRLF
+"<body bgcolor=\"white\">" CRLF
+"<center><h1>429 Too Many Requests</h1></center>" CRLF
+;
+
+
 static char ngx_http_error_494_page[] =
 "<html>" CRLF
 "<head><title>400 Request Header Or Cookie Too Large</title></head>"
@@ -354,8 +362,16 @@ static ngx_str_t ngx_http_error_pages[] = {
     ngx_null_string,                     /* 419 */
     ngx_null_string,                     /* 420 */
     ngx_string(ngx_http_error_421_page),
+    ngx_null_string,                     /* 422 */
+    ngx_null_string,                     /* 423 */
+    ngx_null_string,                     /* 424 */
+    ngx_null_string,                     /* 425 */
+    ngx_null_string,                     /* 426 */
+    ngx_null_string,                     /* 427 */
+    ngx_null_string,                     /* 428 */
+    ngx_string(ngx_http_error_429_page),
 
-#define NGX_HTTP_LAST_4XX  422
+#define NGX_HTTP_LAST_4XX  430
 #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
     ngx_string(ngx_http_error_494_page), /* 494, request header too large */
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 1404693..3695286 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -436,6 +436,7 @@ static ngx_http_upstream_next_t  ngx_http_upstream_next_errors[] = {
     { 504, NGX_HTTP_UPSTREAM_FT_HTTP_504 },
     { 403, NGX_HTTP_UPSTREAM_FT_HTTP_403 },
     { 404, NGX_HTTP_UPSTREAM_FT_HTTP_404 },
+    { 429, NGX_HTTP_UPSTREAM_FT_HTTP_429 },
     { 0, 0 }
 };
 
@@ -1232,6 +1233,11 @@ ngx_http_upstream_handler(ngx_event_t *ev)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http upstream request: \"%V?%V\"", &r->uri, &r->args);
 
+    if (ev->delayed && ev->timedout) {
+        ev->delayed = 0;
+        ev->timedout = 0;
+    }
+
     if (ev->write) {
         u->write_event_handler(r, u);
 
@@ -3736,9 +3742,19 @@ ngx_http_upstream_thread_event_handler(ngx_event_t *ev)
     r->main->blocked--;
     r->aio = 0;
 
-    r->write_event_handler(r);
+    if (r->done) {
+        /*
+         * trigger connection event handler if the subrequest was
+         * already finalized; this can happen if the handler is used
+         * for sendfile() in threads
+         */
 
-    ngx_http_run_posted_requests(c);
+        c->write->handler(c->write);
+
+    } else {
+        r->write_event_handler(r);
+        ngx_http_run_posted_requests(c);
+    }
 }
 
 #endif
@@ -3786,31 +3802,9 @@ ngx_http_upstream_process_downstream(ngx_http_request_t *r)
 
     if (wev->timedout) {
 
-        if (wev->delayed) {
-
-            wev->timedout = 0;
-            wev->delayed = 0;
-
-            if (!wev->ready) {
-                ngx_add_timer(wev, p->send_timeout);
-
-                if (ngx_handle_write_event(wev, p->send_lowat) != NGX_OK) {
-                    ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-                }
-
-                return;
-            }
-
-            if (ngx_event_pipe(p, wev->write) == NGX_ABORT) {
-                ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-                return;
-            }
-
-        } else {
-            p->downstream_error = 1;
-            c->timedout = 1;
-            ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out");
-        }
+        p->downstream_error = 1;
+        c->timedout = 1;
+        ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out");
 
     } else {
 
@@ -3855,30 +3849,8 @@ ngx_http_upstream_process_upstream(ngx_http_request_t *r,
 
     if (rev->timedout) {
 
-        if (rev->delayed) {
-
-            rev->timedout = 0;
-            rev->delayed = 0;
-
-            if (!rev->ready) {
-                ngx_add_timer(rev, p->read_timeout);
-
-                if (ngx_handle_read_event(rev, 0) != NGX_OK) {
-                    ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-                }
-
-                return;
-            }
-
-            if (ngx_event_pipe(p, 0) == NGX_ABORT) {
-                ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-                return;
-            }
-
-        } else {
-            p->upstream_error = 1;
-            ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
-        }
+        p->upstream_error = 1;
+        ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
 
     } else {
 
@@ -4155,6 +4127,10 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
         status = NGX_HTTP_NOT_FOUND;
         break;
 
+    case NGX_HTTP_UPSTREAM_FT_HTTP_429:
+        status = NGX_HTTP_TOO_MANY_REQUESTS;
+        break;
+
     /*
      * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING
      * never reach here
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 625889b..c552ac0 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -26,10 +26,11 @@
 #define NGX_HTTP_UPSTREAM_FT_HTTP_504        0x00000080
 #define NGX_HTTP_UPSTREAM_FT_HTTP_403        0x00000100
 #define NGX_HTTP_UPSTREAM_FT_HTTP_404        0x00000200
-#define NGX_HTTP_UPSTREAM_FT_UPDATING        0x00000400
-#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK       0x00000800
-#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING     0x00001000
-#define NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT  0x00002000
+#define NGX_HTTP_UPSTREAM_FT_HTTP_429        0x00000400
+#define NGX_HTTP_UPSTREAM_FT_UPDATING        0x00000800
+#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK       0x00001000
+#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING     0x00002000
+#define NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT  0x00004000
 #define NGX_HTTP_UPSTREAM_FT_NOLIVE          0x40000000
 #define NGX_HTTP_UPSTREAM_FT_OFF             0x80000000
 
@@ -38,7 +39,8 @@
                                              |NGX_HTTP_UPSTREAM_FT_HTTP_503  \
                                              |NGX_HTTP_UPSTREAM_FT_HTTP_504  \
                                              |NGX_HTTP_UPSTREAM_FT_HTTP_403  \
-                                             |NGX_HTTP_UPSTREAM_FT_HTTP_404)
+                                             |NGX_HTTP_UPSTREAM_FT_HTTP_404  \
+                                             |NGX_HTTP_UPSTREAM_FT_HTTP_429)
 
 #define NGX_HTTP_UPSTREAM_INVALID_HEADER     40
 
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index f3050f1..55db58e 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -783,9 +783,12 @@ ngx_http_v2_state_head(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
 static u_char *
 ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
 {
+    size_t                 size;
     ngx_http_v2_node_t    *node;
     ngx_http_v2_stream_t  *stream;
 
+    size = h2c->state.length;
+
     if (h2c->state.flags & NGX_HTTP_V2_PADDED_FLAG) {
 
         if (h2c->state.length == 0) {
@@ -802,33 +805,33 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
         }
 
         h2c->state.padding = *pos++;
-        h2c->state.length--;
 
-        if (h2c->state.padding > h2c->state.length) {
+        if (h2c->state.padding >= size) {
             ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                           "client sent padded DATA frame "
                           "with incorrect length: %uz, padding: %uz",
-                          h2c->state.length, h2c->state.padding);
+                          size, h2c->state.padding);
 
-            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_PROTOCOL_ERROR);
         }
 
-        h2c->state.length -= h2c->state.padding;
+        h2c->state.length -= 1 + h2c->state.padding;
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
                    "http2 DATA frame");
 
-    if (h2c->state.length > h2c->recv_window) {
+    if (size > h2c->recv_window) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "client violated connection flow control: "
                       "received DATA frame length %uz, available window %uz",
-                      h2c->state.length, h2c->recv_window);
+                      size, h2c->recv_window);
 
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_FLOW_CTRL_ERROR);
     }
 
-    h2c->recv_window -= h2c->state.length;
+    h2c->recv_window -= size;
 
     if (h2c->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4) {
 
@@ -854,11 +857,11 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
 
     stream = node->stream;
 
-    if (h2c->state.length > stream->recv_window) {
+    if (size > stream->recv_window) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "client violated flow control for stream %ui: "
                       "received DATA frame length %uz, available window %uz",
-                      node->id, h2c->state.length, stream->recv_window);
+                      node->id, size, stream->recv_window);
 
         if (ngx_http_v2_terminate_stream(h2c, stream,
                                          NGX_HTTP_V2_FLOW_CTRL_ERROR)
@@ -871,7 +874,7 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
-    stream->recv_window -= h2c->state.length;
+    stream->recv_window -= size;
 
     if (stream->no_flow_control
         && stream->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4)
@@ -938,7 +941,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     if (size >= h2c->state.length) {
         size = h2c->state.length;
-        stream->in_closed  = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
+        stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
     }
 
     r = stream->request;
@@ -1053,7 +1056,8 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
                           "with incorrect length: %uz, padding: %uz",
                           h2c->state.length, h2c->state.padding);
 
-            return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_PROTOCOL_ERROR);
         }
 
         h2c->state.length -= h2c->state.padding;
@@ -1901,7 +1905,7 @@ ngx_http_v2_state_rst_stream(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     if (node == NULL || node->stream == NULL) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                        "unknown http2 stream");
+                       "unknown http2 stream");
 
         return ngx_http_v2_state_complete(h2c, pos, end);
     }
@@ -2015,6 +2019,7 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
             break;
 
         case NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING:
+
             if (value > NGX_HTTP_V2_MAX_FRAME_SIZE
                 || value < NGX_HTTP_V2_DEFAULT_FRAME_SIZE)
             {
@@ -3072,7 +3077,7 @@ ngx_http_v2_pseudo_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
     }
 
     ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                  "client sent unknown pseudo header \"%V\"",
+                  "client sent unknown pseudo-header \":%V\"",
                   &header->name);
 
     return NGX_DECLINED;
@@ -3219,14 +3224,14 @@ ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_http_v2_header_t *header)
 {
     if (r->schema_start) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent duplicate :schema header");
+                      "client sent duplicate :scheme header");
 
         return NGX_DECLINED;
     }
 
     if (header->value.len == 0) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent empty :schema header");
+                      "client sent empty :scheme header");
 
         return NGX_DECLINED;
     }
@@ -4130,6 +4135,14 @@ ngx_http_v2_handle_connection_handler(ngx_event_t *rev)
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0,
                    "http2 handle connection handler");
 
+    c = rev->data;
+    h2c = c->data;
+
+    if (c->error) {
+        ngx_http_v2_finalize_connection(h2c, 0);
+        return;
+    }
+
     rev->handler = ngx_http_v2_read_handler;
 
     if (rev->ready) {
@@ -4137,9 +4150,6 @@ ngx_http_v2_handle_connection_handler(ngx_event_t *rev)
         return;
     }
 
-    c = rev->data;
-    h2c = c->data;
-
     if (h2c->last_out && ngx_http_v2_send_output_queue(h2c) == NGX_ERROR) {
         ngx_http_v2_finalize_connection(h2c, 0);
         return;
@@ -4262,7 +4272,10 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
             if (stream->queued) {
                 stream->queued = 0;
+
                 ev = fc->write;
+                ev->active = 0;
+                ev->ready = 1;
 
             } else {
                 ev = fc->read;
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index cddfccd..7d2a2ea 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -249,8 +249,8 @@ ngx_http_v2_queue_blocked_frame(ngx_http_v2_connection_t *h2c,
 {
     ngx_http_v2_out_frame_t  **out;
 
-    for (out = &h2c->last_out; *out; out = &(*out)->next)
-    {
+    for (out = &h2c->last_out; *out; out = &(*out)->next) {
+
         if ((*out)->blocked || (*out)->stream == NULL) {
             break;
         }
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 42fa0c5..dac5046 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -769,6 +769,8 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
         rest -= frame_size;
 
         if (rest) {
+            frame->length += NGX_HTTP_V2_FRAME_HEADER_SIZE;
+
             type = NGX_HTTP_V2_CONTINUATION_FRAME;
             flags = NGX_HTTP_V2_NO_FLAG;
             continue;
@@ -1209,6 +1211,9 @@ ngx_http_v2_headers_frame_handler(ngx_http_v2_connection_t *h2c,
                    "http2:%ui HEADERS frame %p was sent",
                    stream->node->id, frame);
 
+    stream->request->header_size += NGX_HTTP_V2_FRAME_HEADER_SIZE
+                                    + frame->length;
+
     ngx_http_v2_handle_frame(stream, frame);
 
     ngx_http_v2_handle_stream(h2c, stream);
diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c
index 3c0696a..b44724c 100644
--- a/src/os/unix/ngx_linux_sendfile_chain.c
+++ b/src/os/unix/ngx_linux_sendfile_chain.c
@@ -20,8 +20,8 @@ static ssize_t ngx_linux_sendfile(ngx_connection_t *c, ngx_buf_t *file,
 #error sendfile64() is required!
 #endif
 
-static ngx_int_t ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file,
-    size_t size, size_t *sent);
+static ssize_t ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file,
+    size_t size);
 static void ngx_linux_sendfile_thread_handler(void *data, ngx_log_t *log);
 #endif
 
@@ -56,10 +56,6 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
     ngx_chain_t   *cl;
     ngx_iovec_t    header;
     struct iovec   headers[NGX_IOVS_PREALLOCATE];
-#if (NGX_THREADS)
-    ngx_int_t      rc;
-    ngx_uint_t     thread_handled, thread_complete;
-#endif
 
     wev = c->write;
 
@@ -82,10 +78,6 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
     for ( ;; ) {
         prev_send = send;
-#if (NGX_THREADS)
-        thread_handled = 0;
-        thread_complete = 0;
-#endif
 
         /* create the iovec and coalesce the neighbouring bufs */
 
@@ -179,38 +171,19 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
             }
 #endif
 
-#if (NGX_THREADS)
-            if (file->file->thread_handler) {
-                rc = ngx_linux_sendfile_thread(c, file, file_size, &sent);
+            n = ngx_linux_sendfile(c, file, file_size);
 
-                switch (rc) {
-                case NGX_OK:
-                    thread_handled = 1;
-                    break;
-
-                case NGX_DONE:
-                    thread_complete = 1;
-                    break;
-
-                case NGX_AGAIN:
-                    break;
-
-                default: /* NGX_ERROR */
-                    return NGX_CHAIN_ERROR;
-                }
-
-            } else
-#endif
-            {
-                n = ngx_linux_sendfile(c, file, file_size);
-
-                if (n == NGX_ERROR) {
-                    return NGX_CHAIN_ERROR;
-                }
-
-                sent = (n == NGX_AGAIN) ? 0 : n;
+            if (n == NGX_ERROR) {
+                return NGX_CHAIN_ERROR;
             }
 
+            if (n == NGX_DONE) {
+                /* thread task posted */
+                return in;
+            }
+
+            sent = (n == NGX_AGAIN) ? 0 : n;
+
         } else {
             n = ngx_writev(c, &header);
 
@@ -225,21 +198,27 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
         in = ngx_chain_update_sent(in, sent);
 
-        if ((size_t) (send - prev_send) != sent) {
-#if (NGX_THREADS)
-            if (thread_handled) {
-                return in;
-            }
-
-            if (thread_complete) {
-                send = prev_send + sent;
-                continue;
-            }
-#endif
+        if (n == NGX_AGAIN) {
             wev->ready = 0;
             return in;
         }
 
+        if ((size_t) (send - prev_send) != sent) {
+
+            /*
+             * sendfile() on Linux 4.3+ might be interrupted at any time,
+             * and provides no indication if it was interrupted or not,
+             * so we have to retry till an explicit EAGAIN
+             *
+             * sendfile() in threads can also report less bytes written
+             * than we are prepared to send now, since it was started in
+             * some point in the past, so we again have to retry
+             */
+
+            send = prev_send + sent;
+            continue;
+        }
+
         if (send >= limit || in == NULL) {
             return in;
         }
@@ -258,6 +237,14 @@ ngx_linux_sendfile(ngx_connection_t *c, ngx_buf_t *file, size_t size)
     ssize_t    n;
     ngx_err_t  err;
 
+#if (NGX_THREADS)
+
+    if (file->file->thread_handler) {
+        return ngx_linux_sendfile_thread(c, file, size);
+    }
+
+#endif
+
 #if (NGX_HAVE_SENDFILE64)
     offset = file->file_pos;
 #else
@@ -324,9 +311,8 @@ typedef struct {
 } ngx_linux_sendfile_ctx_t;
 
 
-static ngx_int_t
-ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size,
-    size_t *sent)
+static ssize_t
+ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size)
 {
     ngx_event_t               *wev;
     ngx_thread_task_t         *task;
@@ -356,10 +342,14 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size,
         task->event.complete = 0;
 
         if (ctx->err == NGX_EAGAIN) {
-            *sent = 0;
+            /*
+             * if wev->complete is set, this means that a write event
+             * happened while we were waiting for the thread task, so
+             * we have to retry sending even on EAGAIN
+             */
 
             if (wev->complete) {
-                return NGX_DONE;
+                return 0;
             }
 
             return NGX_AGAIN;
@@ -384,13 +374,7 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size,
             return NGX_ERROR;
         }
 
-        *sent = ctx->sent;
-
-        if (ctx->sent == ctx->size || wev->complete) {
-            return NGX_DONE;
-        }
-
-        return NGX_AGAIN;
+        return ctx->sent;
     }
 
     if (task->event.active && ctx->file == file) {
@@ -399,9 +383,7 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size,
          * or multiple calls of the next body filter from a filter
          */
 
-        *sent = 0;
-
-        return NGX_OK;
+        return NGX_DONE;
     }
 
     ctx->file = file;
@@ -414,9 +396,7 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size,
         return NGX_ERROR;
     }
 
-    *sent = 0;
-
-    return NGX_OK;
+    return NGX_DONE;
 }
 
 
diff --git a/src/stream/ngx_stream_log_module.c b/src/stream/ngx_stream_log_module.c
index 6b29340..466bdda 100644
--- a/src/stream/ngx_stream_log_module.c
+++ b/src/stream/ngx_stream_log_module.c
@@ -443,6 +443,11 @@ ngx_stream_log_script_write(ngx_stream_session_t *s,
                              s->connection->pool)
         != NGX_OK)
     {
+        if (of.err == 0) {
+            /* simulate successful logging */
+            return len;
+        }
+
         ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
                       "%s \"%s\" failed", of.failed, log.data);
         /* simulate successful logging */

From 84d1abef839549db8c71f45e4c997b763f65b816 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 25 Apr 2017 10:25:48 +0300
Subject: [PATCH 169/600] Reenable ipv6, was accidentally dropped in the last
 commit

Dbp-Dch: Ignore
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index e8129da..ad788d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,7 @@ common_configure_flags := \
 			--http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
 			--with-debug \
 			--with-pcre-jit \
+			--with-ipv6 \
 			--with-http_ssl_module \
 			--with-http_stub_status_module \
 			--with-http_realip_module \

From a41879708020cb911f8ec138c7688a75fcc68d93 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 25 Apr 2017 10:23:46 +0300
Subject: [PATCH 170/600] Reuse the same build flags for the perl module

Using the same flags broke the build since -shared was not positioned
after pie/pic flags. Changing the perl LDDFLAGS patch and moving
Config{lddflags} to the end solved that issue.

As a general note, the injected -fPIC in debian/rules is not needed
since dpkg 1.18.13. We inject -fPIC so that it overrides previous -PIE
flag, but the latest dpkg automatically strips pie flags when building
shared libraries (man dpkg-buildflags).

We temporary keep the -fPIC injection for wheezy/jessie backports and
downstream Ubuntu builds.
---
 debian/patches/perl-use-dpkg-buildflags.patch | 2 +-
 debian/rules                                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/patches/perl-use-dpkg-buildflags.patch b/debian/patches/perl-use-dpkg-buildflags.patch
index 5379313..8b2b88c 100644
--- a/debian/patches/perl-use-dpkg-buildflags.patch
+++ b/debian/patches/perl-use-dpkg-buildflags.patch
@@ -17,7 +17,7 @@ Author: Christos Trochalakis <ctrochalakis@debian.org>
      CCFLAGS           => "$ENV{NGX_PM_CFLAGS}",
 +    # Pass link hardening flags
 +    # $Config{lddlflags} is the default
-+    LDDLFLAGS         => "$Config{lddlflags} $ENV{DEBIAN_NGINX_PERL_LDFLAGS}",
++    LDDLFLAGS         => "$ENV{DEBIAN_NGINX_PERL_LDFLAGS} $Config{lddlflags}",
      OPTIMIZE          => '-O',
  
      INC               => join(" ", map {
diff --git a/debian/rules b/debian/rules
index ad788d3..767f7b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,8 @@ debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC
 
 # export necessary perl hardenging flags
 #  # see: src/http/modules/perl/Makefile.PL
-DEBIAN_NGINX_PERL_LDFLAGS:=$(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS)
+DEBIAN_NGINX_PERL_LDFLAGS:=$(debian_ldflags)
+export DEBIAN_NGINX_PERL_LDFLAGS
 
 FLAVOURS := full light extras
 DYN_MODS := \

From 9cfc1d7ca826c86a3b173433094814da8b7b80ef Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 28 Apr 2017 11:08:49 +0300
Subject: [PATCH 171/600] New upstream version 1.13.0

---
 CHANGES                                       | 23 +++++
 CHANGES.ru                                    | 24 +++++
 auto/os/darwin                                |  4 +-
 auto/unix                                     | 13 +++
 src/core/nginx.h                              |  4 +-
 src/core/ngx_palloc.h                         |  3 -
 src/core/ngx_string.c                         | 47 ++++++++--
 src/event/ngx_event_openssl.c                 | 12 ++-
 src/event/ngx_event_openssl.h                 |  6 ++
 src/http/modules/ngx_http_auth_basic_module.c |  2 +
 src/http/modules/ngx_http_dav_module.c        |  1 +
 src/http/modules/ngx_http_flv_module.c        |  4 +-
 .../modules/ngx_http_gzip_filter_module.c     |  2 +-
 .../modules/ngx_http_gzip_static_module.c     |  4 +-
 .../modules/ngx_http_headers_filter_module.c  | 22 ++---
 .../modules/ngx_http_image_filter_module.c    |  6 +-
 src/http/modules/ngx_http_mp4_module.c        |  2 +-
 src/http/modules/ngx_http_proxy_module.c      |  1 +
 .../modules/ngx_http_range_filter_module.c    |  4 +
 src/http/modules/ngx_http_ssl_module.c        |  1 +
 src/http/modules/ngx_http_static_module.c     |  3 +-
 src/http/modules/ngx_http_sub_filter_module.c |  4 +-
 src/http/modules/ngx_http_uwsgi_module.c      |  1 +
 .../modules/ngx_http_xslt_filter_module.c     |  2 +-
 src/http/modules/perl/nginx.pm                |  2 +
 src/http/modules/perl/nginx.xs                |  2 +
 src/http/ngx_http_core_module.c               |  6 +-
 src/http/ngx_http_file_cache.c                |  2 +-
 src/http/ngx_http_header_filter_module.c      |  3 +-
 src/http/ngx_http_request.h                   |  1 +
 src/http/ngx_http_request_body.c              | 20 +++--
 src/http/ngx_http_special_response.c          | 14 ++-
 src/http/ngx_http_upstream.c                  | 11 +--
 src/http/v2/ngx_http_v2.c                     | 66 +++++++++-----
 src/http/v2/ngx_http_v2.h                     |  3 +-
 src/mail/ngx_mail.c                           |  2 +
 src/mail/ngx_mail.h                           |  2 +
 src/mail/ngx_mail_core_module.c               | 36 +++++++-
 src/mail/ngx_mail_ssl_module.c                |  1 +
 src/os/unix/ngx_darwin_config.h               |  3 +
 src/os/unix/ngx_process.c                     | 32 +++++--
 src/os/unix/ngx_udp_sendmsg_chain.c           | 90 +++++++++++++++++++
 src/stream/ngx_stream.c                       |  2 +
 src/stream/ngx_stream.h                       |  2 +
 src/stream/ngx_stream_core_module.c           | 36 +++++++-
 src/stream/ngx_stream_proxy_module.c          |  1 +
 src/stream/ngx_stream_ssl_module.c            |  1 +
 47 files changed, 443 insertions(+), 90 deletions(-)

diff --git a/CHANGES b/CHANGES
index e54f1b8..9aa8c03 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,27 @@
 
+Changes with nginx 1.13.0                                        25 Apr 2017
+
+    *) Change: SSL renegotiation is now allowed on backend connections.
+
+    *) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
+       directives of the mail proxy and stream modules.
+
+    *) Feature: the "return" and "error_page" directives can now be used to
+       return 308 redirections.
+       Thanks to Simon Leblanc.
+
+    *) Feature: the "TLSv1.3" parameter of the "ssl_protocols" directive.
+
+    *) Feature: when logging signals nginx now logs PID of the process which
+       sent the signal.
+
+    *) Bugfix: in memory allocation error handling.
+
+    *) Bugfix: if a server in the stream module listened on a wildcard
+       address, the source address of a response UDP datagram could differ
+       from the original datagram destination address.
+
+
 Changes with nginx 1.11.13                                       04 Apr 2017
 
     *) Feature: the "http_429" parameter of the "proxy_next_upstream",
diff --git a/CHANGES.ru b/CHANGES.ru
index 029a2a7..0e2d1aa 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,28 @@
 
+Изменения в nginx 1.13.0                                          25.04.2017
+
+    *) Изменение: теперь SSL renegotiation допускается в соединениях к
+       бэкендам.
+
+    *) Добавление: параметры rcvbuf и sndbuf директив listen в почтовом
+       прокси-сервере и модуле stream.
+
+    *) Добавление: директивы return и error_page теперь могут использоваться
+       для возврата перенаправлений с кодом 308.
+       Спасибо Simon Leblanc.
+
+    *) Добавление: параметр TLSv1.3 в директиве ssl_protocols.
+
+    *) Добавление: при логгировании сигналов теперь указывается PID
+       отправившего сигнал процесса.
+
+    *) Исправление: в обработке ошибок выделения памяти.
+
+    *) Исправление: если сервер в модуле stream слушал на wildcard-адресе,
+       исходящий адрес ответного UDP-пакета мог отличаться от адреса
+       назначения исходного пакета.
+
+
 Изменения в nginx 1.11.13                                         04.04.2017
 
     *) Добавление: параметр http_429 в директивах proxy_next_upstream,
diff --git a/auto/os/darwin b/auto/os/darwin
index b4b3ad3..429468f 100644
--- a/auto/os/darwin
+++ b/auto/os/darwin
@@ -17,6 +17,9 @@ ngx_spacer='
 MAIN_LINK=
 MODULE_LINK="-shared -Wl,-undefined,dynamic_lookup"
 
+CC_AUX_FLAGS="$CC_AUX_FLAGS -D__APPLE_USE_RFC_3542"
+
+
 # kqueue
 
 echo " + kqueue found"
@@ -86,7 +89,6 @@ ngx_feature_test="int  kq;
 
 # sendfile()
 
-CC_AUX_FLAGS="$CC_AUX_FLAGS"
 ngx_feature="sendfile()"
 ngx_feature_name="NGX_HAVE_SENDFILE"
 ngx_feature_run=yes
diff --git a/auto/unix b/auto/unix
index 5ef74d4..52060fc 100644
--- a/auto/unix
+++ b/auto/unix
@@ -394,6 +394,19 @@ ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_RECVDSTADDR, NULL, 0)"
 . auto/feature
 
 
+# BSD way to set IPv4 datagram source address
+
+ngx_feature="IP_SENDSRCADDR"
+ngx_feature_name="NGX_HAVE_IP_SENDSRCADDR"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_SENDSRCADDR, NULL, 0)"
+. auto/feature
+
+
 # Linux way to get IPv4 datagram destination address
 
 ngx_feature="IP_PKTINFO"
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 5d3112f..3d6579c 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011013
-#define NGINX_VERSION      "1.11.13"
+#define nginx_version      1013000
+#define NGINX_VERSION      "1.13.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_palloc.h b/src/core/ngx_palloc.h
index d652829..376e012 100644
--- a/src/core/ngx_palloc.h
+++ b/src/core/ngx_palloc.h
@@ -72,9 +72,6 @@ typedef struct {
 } ngx_pool_cleanup_file_t;
 
 
-void *ngx_alloc(size_t size, ngx_log_t *log);
-void *ngx_calloc(size_t size, ngx_log_t *log);
-
 ngx_pool_t *ngx_create_pool(size_t size, ngx_log_t *log);
 void ngx_destroy_pool(ngx_pool_t *pool);
 void ngx_reset_pool(ngx_pool_t *pool);
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 7a73ef5..7526f60 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -1808,7 +1808,19 @@ ngx_escape_json(u_char *dst, u_char *src, size_t size)
                 len++;
 
             } else if (ch <= 0x1f) {
-                len += sizeof("\\u001F") - 2;
+
+                switch (ch) {
+                case '\n':
+                case '\r':
+                case '\t':
+                case '\b':
+                case '\f':
+                    len++;
+                    break;
+
+                default:
+                    len += sizeof("\\u001F") - 2;
+                }
             }
 
             size--;
@@ -1829,12 +1841,37 @@ ngx_escape_json(u_char *dst, u_char *src, size_t size)
             *dst++ = ch;
 
         } else {
-            *dst++ = '\\'; *dst++ = 'u'; *dst++ = '0'; *dst++ = '0';
-            *dst++ = '0' + (ch >> 4);
+            *dst++ = '\\';
 
-            ch &= 0xf;
+            switch (ch) {
+            case '\n':
+                *dst++ = 'n';
+                break;
 
-            *dst++ = (ch < 10) ? ('0' + ch) : ('A' + ch - 10);
+            case '\r':
+                *dst++ = 'r';
+                break;
+
+            case '\t':
+                *dst++ = 't';
+                break;
+
+            case '\b':
+                *dst++ = 'b';
+                break;
+
+            case '\f':
+                *dst++ = 'f';
+                break;
+
+            default:
+                *dst++ = 'u'; *dst++ = '0'; *dst++ = '0';
+                *dst++ = '0' + (ch >> 4);
+
+                ch &= 0xf;
+
+                *dst++ = (ch < 10) ? ('0' + ch) : ('A' + ch - 10);
+            }
         }
 
         size--;
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 8c7c677..fdbd0c9 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -323,6 +323,12 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
         SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_TLSv1_2);
     }
 #endif
+#ifdef SSL_OP_NO_TLSv1_3
+    SSL_CTX_clear_options(ssl->ctx, SSL_OP_NO_TLSv1_3);
+    if (!(protocols & NGX_SSL_TLSv1_3)) {
+        SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_TLSv1_3);
+    }
+#endif
 
 #ifdef SSL_OP_NO_COMPRESSION
     SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_COMPRESSION);
@@ -831,7 +837,9 @@ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
     BIO               *rbio, *wbio;
     ngx_connection_t  *c;
 
-    if (where & SSL_CB_HANDSHAKE_START) {
+    if ((where & SSL_CB_HANDSHAKE_START)
+        && SSL_is_server((ngx_ssl_conn_t *) ssl_conn))
+    {
         c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
 
         if (c->ssl->handshaked) {
@@ -1082,7 +1090,7 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
      * maximum interoperability.
      */
 
-#ifdef SSL_CTRL_SET_CURVES_LIST
+#if (defined SSL_CTX_set1_curves_list || defined SSL_CTRL_SET_CURVES_LIST)
 
     /*
      * OpenSSL 1.0.2+ allows configuring a curve list instead of a single
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index e093e10..2a14980 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -54,6 +54,11 @@
 #define ngx_ssl_conn_t          SSL
 
 
+#if (OPENSSL_VERSION_NUMBER < 0x10002000L)
+#define SSL_is_server(s)        (s)->server
+#endif
+
+
 struct ngx_ssl_s {
     SSL_CTX                    *ctx;
     ngx_log_t                  *log;
@@ -131,6 +136,7 @@ typedef struct {
 #define NGX_SSL_TLSv1    0x0008
 #define NGX_SSL_TLSv1_1  0x0010
 #define NGX_SSL_TLSv1_2  0x0020
+#define NGX_SSL_TLSv1_3  0x0040
 
 
 #define NGX_SSL_BUFFER   1
diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c
index 1e7a0c2..4aa684f 100644
--- a/src/http/modules/ngx_http_auth_basic_module.c
+++ b/src/http/modules/ngx_http_auth_basic_module.c
@@ -361,6 +361,8 @@ ngx_http_auth_basic_set_realm(ngx_http_request_t *r, ngx_str_t *realm)
 
     basic = ngx_pnalloc(r->pool, len);
     if (basic == NULL) {
+        r->headers_out.www_authenticate->hash = 0;
+        r->headers_out.www_authenticate = NULL;
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 895a52d..566b08b 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -1080,6 +1080,7 @@ ngx_http_dav_location(ngx_http_request_t *r, u_char *path)
     } else {
         location = ngx_pnalloc(r->pool, r->uri.len);
         if (location == NULL) {
+            ngx_http_clear_location(r);
             return NGX_ERROR;
         }
 
diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c
index cc25320..7b72fae 100644
--- a/src/http/modules/ngx_http_flv_module.c
+++ b/src/http/modules/ngx_http_flv_module.c
@@ -203,7 +203,7 @@ ngx_http_flv_handler(ngx_http_request_t *r)
     }
 
     if (i == 0) {
-        b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+        b = ngx_calloc_buf(r->pool);
         if (b == NULL) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
@@ -217,7 +217,7 @@ ngx_http_flv_handler(ngx_http_request_t *r)
     }
 
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index f9652d0..287fd36 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -644,7 +644,7 @@ ngx_http_gzip_filter_gzheader(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
     static u_char  gzheader[10] =
                                { 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 };
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         return NGX_ERROR;
     }
diff --git a/src/http/modules/ngx_http_gzip_static_module.c b/src/http/modules/ngx_http_gzip_static_module.c
index b9294dd..7652a9a 100644
--- a/src/http/modules/ngx_http_gzip_static_module.c
+++ b/src/http/modules/ngx_http_gzip_static_module.c
@@ -238,7 +238,7 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
 
     h = ngx_list_push(&r->headers_out.headers);
     if (h == NULL) {
-        return NGX_ERROR;
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
     h->hash = 1;
@@ -248,7 +248,7 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
 
     /* we need to allocate all before the header would be sent */
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index 6738afe..94dc51e 100644
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -173,6 +173,7 @@ ngx_http_headers_filter(ngx_http_request_t *r)
     case NGX_HTTP_SEE_OTHER:
     case NGX_HTTP_NOT_MODIFIED:
     case NGX_HTTP_TEMPORARY_REDIRECT:
+    case NGX_HTTP_PERMANENT_REDIRECT:
         safe_status = 1;
         break;
 
@@ -270,11 +271,6 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
             return NGX_ERROR;
         }
 
-        ccp = ngx_array_push(&r->headers_out.cache_control);
-        if (ccp == NULL) {
-            return NGX_ERROR;
-        }
-
         cc = ngx_list_push(&r->headers_out.headers);
         if (cc == NULL) {
             return NGX_ERROR;
@@ -282,6 +278,12 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
 
         cc->hash = 1;
         ngx_str_set(&cc->key, "Cache-Control");
+
+        ccp = ngx_array_push(&r->headers_out.cache_control);
+        if (ccp == NULL) {
+            return NGX_ERROR;
+        }
+
         *ccp = cc;
 
     } else {
@@ -469,11 +471,6 @@ ngx_http_add_cache_control(ngx_http_request_t *r, ngx_http_header_val_t *hv,
         }
     }
 
-    ccp = ngx_array_push(&r->headers_out.cache_control);
-    if (ccp == NULL) {
-        return NGX_ERROR;
-    }
-
     cc = ngx_list_push(&r->headers_out.headers);
     if (cc == NULL) {
         return NGX_ERROR;
@@ -483,6 +480,11 @@ ngx_http_add_cache_control(ngx_http_request_t *r, ngx_http_header_val_t *hv,
     ngx_str_set(&cc->key, "Cache-Control");
     cc->value = *value;
 
+    ccp = ngx_array_push(&r->headers_out.cache_control);
+    if (ccp == NULL) {
+        return NGX_ERROR;
+    }
+
     *ccp = cc;
 
     return NGX_OK;
diff --git a/src/http/modules/ngx_http_image_filter_module.c b/src/http/modules/ngx_http_image_filter_module.c
index dbec5d8..6c03e8a 100644
--- a/src/http/modules/ngx_http_image_filter_module.c
+++ b/src/http/modules/ngx_http_image_filter_module.c
@@ -581,7 +581,7 @@ ngx_http_image_json(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
     size_t      len;
     ngx_buf_t  *b;
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         return NULL;
     }
@@ -633,7 +633,7 @@ ngx_http_image_asis(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
 {
     ngx_buf_t  *b;
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         return NULL;
     }
@@ -1067,7 +1067,7 @@ transparent:
         return NULL;
     }
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         gdFree(out);
         return NULL;
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index f3c0fdd..08a68d0 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -636,7 +636,7 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
     }
 
     if (mp4 == NULL) {
-        b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+        b = ngx_calloc_buf(r->pool);
         if (b == NULL) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index e594d06..0fee2c2 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -235,6 +235,7 @@ static ngx_conf_bitmask_t  ngx_http_proxy_ssl_protocols[] = {
     { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
     { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
     { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
+    { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
     { ngx_null_string, 0 }
 };
 
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index 951a00d..8ffca82 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -425,6 +425,8 @@ ngx_http_range_singlepart_header(ngx_http_request_t *r,
     content_range->value.data = ngx_pnalloc(r->pool,
                                     sizeof("bytes -/") - 1 + 3 * NGX_OFF_T_LEN);
     if (content_range->value.data == NULL) {
+        content_range->hash = 0;
+        r->headers_out.content_range = NULL;
         return NGX_ERROR;
     }
 
@@ -594,6 +596,8 @@ ngx_http_range_not_satisfiable(ngx_http_request_t *r)
     content_range->value.data = ngx_pnalloc(r->pool,
                                        sizeof("bytes */") - 1 + NGX_OFF_T_LEN);
     if (content_range->value.data == NULL) {
+        content_range->hash = 0;
+        r->headers_out.content_range = NULL;
         return NGX_ERROR;
     }
 
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 2771ac1..b466e5d 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -57,6 +57,7 @@ static ngx_conf_bitmask_t  ngx_http_ssl_protocols[] = {
     { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
     { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
     { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
+    { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
     { ngx_null_string, 0 }
 };
 
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index f2435a7..0e16c05 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -169,6 +169,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
 
             location = ngx_pnalloc(r->pool, len);
             if (location == NULL) {
+                ngx_http_clear_location(r);
                 return NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
 
@@ -233,7 +234,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
 
     /* we need to allocate all before the header would be sent */
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index de58c6f..6d3de59 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -248,8 +248,6 @@ ngx_http_sub_header_filter(ngx_http_request_t *r)
                                  ctx->matches->nelts);
     }
 
-    ngx_http_set_ctx(r, ctx, ngx_http_sub_filter_module);
-
     ctx->saved.data = ngx_pnalloc(r->pool, ctx->tables->max_match_len - 1);
     if (ctx->saved.data == NULL) {
         return NGX_ERROR;
@@ -260,6 +258,8 @@ ngx_http_sub_header_filter(ngx_http_request_t *r)
         return NGX_ERROR;
     }
 
+    ngx_http_set_ctx(r, ctx, ngx_http_sub_filter_module);
+
     ctx->offset = ctx->tables->min_match_len - 1;
     ctx->last_out = &ctx->out;
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index b7e7c12..26443bb 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -129,6 +129,7 @@ static ngx_conf_bitmask_t  ngx_http_uwsgi_ssl_protocols[] = {
     { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
     { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
     { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
+    { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
     { ngx_null_string, 0 }
 };
 
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index 695f3bf..fae5895 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -584,7 +584,7 @@ ngx_http_xslt_apply_stylesheet(ngx_http_request_t *r,
         return NULL;
     }
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         ngx_free(buf);
         return NULL;
diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm
index e3f7361..d4663dc 100644
--- a/src/http/modules/perl/nginx.pm
+++ b/src/http/modules/perl/nginx.pm
@@ -24,6 +24,7 @@ our @EXPORT = qw(
     HTTP_SEE_OTHER
     HTTP_NOT_MODIFIED
     HTTP_TEMPORARY_REDIRECT
+    HTTP_PERMANENT_REDIRECT
 
     HTTP_BAD_REQUEST
     HTTP_UNAUTHORIZED
@@ -72,6 +73,7 @@ use constant HTTP_REDIRECT                  => 302;
 use constant HTTP_SEE_OTHER                 => 303;
 use constant HTTP_NOT_MODIFIED              => 304;
 use constant HTTP_TEMPORARY_REDIRECT        => 307;
+use constant HTTP_PERMANENT_REDIRECT        => 308;
 
 use constant HTTP_BAD_REQUEST               => 400;
 use constant HTTP_UNAUTHORIZED              => 401;
diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs
index cca64da..ad12632 100644
--- a/src/http/modules/perl/nginx.xs
+++ b/src/http/modules/perl/nginx.xs
@@ -510,10 +510,12 @@ header_out(r, key, value)
     header->hash = 1;
 
     if (ngx_http_perl_sv2str(aTHX_ r, &header->key, key) != NGX_OK) {
+        header->hash = 0;
         XSRETURN_EMPTY;
     }
 
     if (ngx_http_perl_sv2str(aTHX_ r, &header->value, value) != NGX_OK) {
+        header->hash = 0;
         XSRETURN_EMPTY;
     }
 
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 292671d..af67b7f 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1002,6 +1002,7 @@ ngx_http_core_find_config_phase(ngx_http_request_t *r,
             p = ngx_pnalloc(r->pool, len);
 
             if (p == NULL) {
+                ngx_http_clear_location(r);
                 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
                 return NGX_OK;
             }
@@ -1894,7 +1895,8 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
     if (status == NGX_HTTP_MOVED_PERMANENTLY
         || status == NGX_HTTP_MOVED_TEMPORARILY
         || status == NGX_HTTP_SEE_OTHER
-        || status == NGX_HTTP_TEMPORARY_REDIRECT)
+        || status == NGX_HTTP_TEMPORARY_REDIRECT
+        || status == NGX_HTTP_PERMANENT_REDIRECT)
     {
         ngx_http_clear_location(r);
 
@@ -1926,7 +1928,7 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
         return ngx_http_send_header(r);
     }
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 8c75f95..b635b35 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1577,7 +1577,7 @@ ngx_http_cache_send(ngx_http_request_t *r)
 
     /* we need to allocate all before the header would be sent */
 
-    b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+    b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index c09c519..5fc7e1f 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -75,8 +75,9 @@ static ngx_str_t ngx_http_status_lines[] = {
     ngx_null_string,  /* "305 Use Proxy" */
     ngx_null_string,  /* "306 unused" */
     ngx_string("307 Temporary Redirect"),
+    ngx_string("308 Permanent Redirect"),
 
-#define NGX_HTTP_LAST_3XX  308
+#define NGX_HTTP_LAST_3XX  309
 #define NGX_HTTP_OFF_4XX   (NGX_HTTP_LAST_3XX - 301 + NGX_HTTP_OFF_3XX)
 
     ngx_string("400 Bad Request"),
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index a68b906..2c77f93 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -83,6 +83,7 @@
 #define NGX_HTTP_SEE_OTHER                 303
 #define NGX_HTTP_NOT_MODIFIED              304
 #define NGX_HTTP_TEMPORARY_REDIRECT        307
+#define NGX_HTTP_PERMANENT_REDIRECT        308
 
 #define NGX_HTTP_BAD_REQUEST               400
 #define NGX_HTTP_UNAUTHORIZED              401
diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index 2f66484..c4f092e 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -46,13 +46,6 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
         return NGX_OK;
     }
 
-#if (NGX_HTTP_V2)
-    if (r->stream) {
-        rc = ngx_http_v2_read_request_body(r, post_handler);
-        goto done;
-    }
-#endif
-
     if (ngx_http_test_expect(r) != NGX_OK) {
         rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
         goto done;
@@ -85,6 +78,13 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
         return NGX_OK;
     }
 
+#if (NGX_HTTP_V2)
+    if (r->stream) {
+        rc = ngx_http_v2_read_request_body(r);
+        goto done;
+    }
+#endif
+
     preread = r->header_in->last - r->header_in->pos;
 
     if (preread) {
@@ -805,7 +805,11 @@ ngx_http_test_expect(ngx_http_request_t *r)
 
     if (r->expect_tested
         || r->headers_in.expect == NULL
-        || r->http_version < NGX_HTTP_VERSION_11)
+        || r->http_version < NGX_HTTP_VERSION_11
+#if (NGX_HTTP_V2)
+        || r->stream != NULL
+#endif
+       )
     {
         return NGX_OK;
     }
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index c9b1017..c4c1305 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -89,6 +89,14 @@ static char ngx_http_error_307_page[] =
 ;
 
 
+static char ngx_http_error_308_page[] =
+"<html>" CRLF
+"<head><title>308 Permanent Redirect</title></head>" CRLF
+"<body bgcolor=\"white\">" CRLF
+"<center><h1>308 Permanent Redirect</h1></center>" CRLF
+;
+
+
 static char ngx_http_error_400_page[] =
 "<html>" CRLF
 "<head><title>400 Bad Request</title></head>" CRLF
@@ -336,8 +344,9 @@ static ngx_str_t ngx_http_error_pages[] = {
     ngx_null_string,                     /* 305 */
     ngx_null_string,                     /* 306 */
     ngx_string(ngx_http_error_307_page),
+    ngx_string(ngx_http_error_308_page),
 
-#define NGX_HTTP_LAST_3XX  308
+#define NGX_HTTP_LAST_3XX  309
 #define NGX_HTTP_OFF_4XX   (NGX_HTTP_LAST_3XX - 301 + NGX_HTTP_OFF_3XX)
 
     ngx_string(ngx_http_error_400_page),
@@ -615,7 +624,8 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
     if (overwrite != NGX_HTTP_MOVED_PERMANENTLY
         && overwrite != NGX_HTTP_MOVED_TEMPORARILY
         && overwrite != NGX_HTTP_SEE_OTHER
-        && overwrite != NGX_HTTP_TEMPORARY_REDIRECT)
+        && overwrite != NGX_HTTP_TEMPORARY_REDIRECT
+        && overwrite != NGX_HTTP_PERMANENT_REDIRECT)
     {
         r->err_status = NGX_HTTP_MOVED_TEMPORARILY;
     }
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 3695286..fcfa2ad 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -4897,17 +4897,18 @@ ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r,
         }
     }
 
-    ph = ngx_array_push(pa);
-    if (ph == NULL) {
-        return NGX_ERROR;
-    }
-
     ho = ngx_list_push(&r->headers_out.headers);
     if (ho == NULL) {
         return NGX_ERROR;
     }
 
     *ho = *h;
+
+    ph = ngx_array_push(pa);
+    if (ph == NULL) {
+        return NGX_ERROR;
+    }
+
     *ph = ho;
 
     return NGX_OK;
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 55db58e..1a9e521 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -2166,6 +2166,44 @@ ngx_http_v2_state_window_update(ngx_http_v2_connection_t *h2c, u_char *pos,
                    "http2 WINDOW_UPDATE frame sid:%ui window:%uz",
                    h2c->state.sid, window);
 
+    if (window == 0) {
+        if (h2c->state.sid == 0) {
+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                          "client sent WINDOW_UPDATE frame "
+                          "with incorrect window increment 0");
+
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_PROTOCOL_ERROR);
+        }
+
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent WINDOW_UPDATE frame for stream %ui "
+                      "with incorrect window increment 0", h2c->state.sid);
+
+        node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 0);
+
+        if (node && node->stream) {
+            if (ngx_http_v2_terminate_stream(h2c, node->stream,
+                                             NGX_HTTP_V2_PROTOCOL_ERROR)
+                == NGX_ERROR)
+            {
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_INTERNAL_ERROR);
+            }
+
+        } else {
+            if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid,
+                                            NGX_HTTP_V2_PROTOCOL_ERROR)
+                == NGX_ERROR)
+            {
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_INTERNAL_ERROR);
+            }
+        }
+
+        return ngx_http_v2_state_complete(h2c, pos, end);
+    }
+
     if (h2c->state.sid) {
         node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 0);
 
@@ -3484,8 +3522,7 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
 
 
 ngx_int_t
-ngx_http_v2_read_request_body(ngx_http_request_t *r,
-    ngx_http_client_body_handler_pt post_handler)
+ngx_http_v2_read_request_body(ngx_http_request_t *r)
 {
     off_t                      len;
     size_t                     size;
@@ -3498,33 +3535,14 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
     ngx_http_v2_connection_t  *h2c;
 
     stream = r->stream;
+    rb = r->request_body;
 
     if (stream->skip_data) {
         r->request_body_no_buffering = 0;
-        post_handler(r);
+        rb->post_handler(r);
         return NGX_OK;
     }
 
-    rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
-    if (rb == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    /*
-     * set by ngx_pcalloc():
-     *
-     *     rb->bufs = NULL;
-     *     rb->buf = NULL;
-     *     rb->received = 0;
-     *     rb->free = NULL;
-     *     rb->busy = NULL;
-     */
-
-    rb->rest = 1;
-    rb->post_handler = post_handler;
-
-    r->request_body = rb;
-
     h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
@@ -3574,6 +3592,8 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
+    rb->rest = 1;
+
     buf = stream->preread;
 
     if (stream->in_closed) {
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 7d2a2ea..be34a09 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -264,8 +264,7 @@ ngx_http_v2_queue_blocked_frame(ngx_http_v2_connection_t *h2c,
 void ngx_http_v2_init(ngx_event_t *rev);
 void ngx_http_v2_request_headers_init(void);
 
-ngx_int_t ngx_http_v2_read_request_body(ngx_http_request_t *r,
-    ngx_http_client_body_handler_pt post_handler);
+ngx_int_t ngx_http_v2_read_request_body(ngx_http_request_t *r);
 ngx_int_t ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r);
 
 void ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc);
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c
index 9e560bb..5fd5fa0 100644
--- a/src/mail/ngx_mail.c
+++ b/src/mail/ngx_mail.c
@@ -333,6 +333,8 @@ ngx_mail_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
             ls->log.handler = ngx_accept_log_error;
 
             ls->backlog = addr[i].opt.backlog;
+            ls->rcvbuf = addr[i].opt.rcvbuf;
+            ls->sndbuf = addr[i].opt.sndbuf;
 
             ls->keepalive = addr[i].opt.so_keepalive;
 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index 6002508..6ecfefc 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -46,6 +46,8 @@ typedef struct {
     int                     tcp_keepcnt;
 #endif
     int                     backlog;
+    int                     rcvbuf;
+    int                     sndbuf;
 } ngx_mail_listen_t;
 
 
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index b974d90..276b8ee 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -295,7 +295,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_mail_core_srv_conf_t  *cscf = conf;
 
-    ngx_str_t                  *value;
+    ngx_str_t                  *value, size;
     ngx_url_t                   u;
     ngx_uint_t                  i, m;
     ngx_mail_listen_t          *ls;
@@ -350,6 +350,8 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ls->socklen = u.socklen;
     ls->backlog = NGX_LISTEN_BACKLOG;
+    ls->rcvbuf = -1;
+    ls->sndbuf = -1;
     ls->wildcard = u.wildcard;
     ls->ctx = cf->ctx;
 
@@ -398,6 +400,38 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             continue;
         }
 
+        if (ngx_strncmp(value[i].data, "rcvbuf=", 7) == 0) {
+            size.len = value[i].len - 7;
+            size.data = value[i].data + 7;
+
+            ls->rcvbuf = ngx_parse_size(&size);
+            ls->bind = 1;
+
+            if (ls->rcvbuf == NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid rcvbuf \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "sndbuf=", 7) == 0) {
+            size.len = value[i].len - 7;
+            size.data = value[i].data + 7;
+
+            ls->sndbuf = ngx_parse_size(&size);
+            ls->bind = 1;
+
+            if (ls->sndbuf == NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid sndbuf \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
             size_t  len;
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index fbc9bc7..aebd179 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -42,6 +42,7 @@ static ngx_conf_bitmask_t  ngx_mail_ssl_protocols[] = {
     { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
     { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
     { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
+    { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
     { ngx_null_string, 0 }
 };
 
diff --git a/src/os/unix/ngx_darwin_config.h b/src/os/unix/ngx_darwin_config.h
index cfe3ce2..0dfe633 100644
--- a/src/os/unix/ngx_darwin_config.h
+++ b/src/os/unix/ngx_darwin_config.h
@@ -9,6 +9,9 @@
 #define _NGX_DARWIN_CONFIG_H_INCLUDED_
 
 
+#define __APPLE_USE_RFC_3542    /* IPV6_PKTINFO */
+
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
index 2d37e21..dd50b5c 100644
--- a/src/os/unix/ngx_process.c
+++ b/src/os/unix/ngx_process.c
@@ -15,13 +15,13 @@ typedef struct {
     int     signo;
     char   *signame;
     char   *name;
-    void  (*handler)(int signo);
+    void  (*handler)(int signo, siginfo_t *siginfo, void *ucontext);
 } ngx_signal_t;
 
 
 
 static void ngx_execute_proc(ngx_cycle_t *cycle, void *data);
-static void ngx_signal_handler(int signo);
+static void ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext);
 static void ngx_process_get_status(void);
 static void ngx_unlock_mutexes(ngx_pid_t pid);
 
@@ -75,9 +75,9 @@ ngx_signal_t  signals[] = {
 
     { SIGCHLD, "SIGCHLD", "", ngx_signal_handler },
 
-    { SIGSYS, "SIGSYS, SIG_IGN", "", SIG_IGN },
+    { SIGSYS, "SIGSYS, SIG_IGN", "", NULL },
 
-    { SIGPIPE, "SIGPIPE, SIG_IGN", "", SIG_IGN },
+    { SIGPIPE, "SIGPIPE, SIG_IGN", "", NULL },
 
     { 0, NULL, "", NULL }
 };
@@ -288,7 +288,15 @@ ngx_init_signals(ngx_log_t *log)
 
     for (sig = signals; sig->signo != 0; sig++) {
         ngx_memzero(&sa, sizeof(struct sigaction));
-        sa.sa_handler = sig->handler;
+
+        if (sig->handler) {
+            sa.sa_sigaction = sig->handler;
+            sa.sa_flags = SA_SIGINFO;
+
+        } else {
+            sa.sa_handler = SIG_IGN;
+        }
+
         sigemptyset(&sa.sa_mask);
         if (sigaction(sig->signo, &sa, NULL) == -1) {
 #if (NGX_VALGRIND)
@@ -307,7 +315,7 @@ ngx_init_signals(ngx_log_t *log)
 
 
 static void
-ngx_signal_handler(int signo)
+ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext)
 {
     char            *action;
     ngx_int_t        ignore;
@@ -431,8 +439,16 @@ ngx_signal_handler(int signo)
         break;
     }
 
-    ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
-                  "signal %d (%s) received%s", signo, sig->signame, action);
+    if (siginfo && siginfo->si_pid) {
+        ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
+                      "signal %d (%s) received from %P%s",
+                      signo, sig->signame, siginfo->si_pid, action);
+
+    } else {
+        ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
+                      "signal %d (%s) received%s",
+                      signo, sig->signame, action);
+    }
 
     if (ignore) {
         ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, 0,
diff --git a/src/os/unix/ngx_udp_sendmsg_chain.c b/src/os/unix/ngx_udp_sendmsg_chain.c
index 65bde6f..5f1cfa5 100644
--- a/src/os/unix/ngx_udp_sendmsg_chain.c
+++ b/src/os/unix/ngx_udp_sendmsg_chain.c
@@ -203,6 +203,20 @@ ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec)
     ngx_err_t      err;
     struct msghdr  msg;
 
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+
+#if (NGX_HAVE_IP_SENDSRCADDR)
+    u_char             msg_control[CMSG_SPACE(sizeof(struct in_addr))];
+#elif (NGX_HAVE_IP_PKTINFO)
+    u_char             msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))];
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+    u_char             msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+#endif
+
+#endif
+
     ngx_memzero(&msg, sizeof(struct msghdr));
 
     if (c->socklen) {
@@ -213,6 +227,82 @@ ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec)
     msg.msg_iov = vec->iovs;
     msg.msg_iovlen = vec->count;
 
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+
+    if (c->listening && c->listening->wildcard && c->local_sockaddr) {
+
+#if (NGX_HAVE_IP_SENDSRCADDR)
+
+        if (c->local_sockaddr->sa_family == AF_INET) {
+            struct cmsghdr      *cmsg;
+            struct in_addr      *addr;
+            struct sockaddr_in  *sin;
+
+            msg.msg_control = &msg_control;
+            msg.msg_controllen = sizeof(msg_control);
+
+            cmsg = CMSG_FIRSTHDR(&msg);
+            cmsg->cmsg_level = IPPROTO_IP;
+            cmsg->cmsg_type = IP_SENDSRCADDR;
+            cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
+
+            sin = (struct sockaddr_in *) c->local_sockaddr;
+
+            addr = (struct in_addr *) CMSG_DATA(cmsg);
+            *addr = sin->sin_addr;
+        }
+
+#elif (NGX_HAVE_IP_PKTINFO)
+
+        if (c->local_sockaddr->sa_family == AF_INET) {
+            struct cmsghdr      *cmsg;
+            struct in_pktinfo   *pkt;
+            struct sockaddr_in  *sin;
+
+            msg.msg_control = &msg_control;
+            msg.msg_controllen = sizeof(msg_control);
+
+            cmsg = CMSG_FIRSTHDR(&msg);
+            cmsg->cmsg_level = IPPROTO_IP;
+            cmsg->cmsg_type = IP_PKTINFO;
+            cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
+
+            sin = (struct sockaddr_in *) c->local_sockaddr;
+
+            pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
+            ngx_memzero(pkt, sizeof(struct in_pktinfo));
+            pkt->ipi_spec_dst = sin->sin_addr;
+        }
+
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+
+        if (c->local_sockaddr->sa_family == AF_INET6) {
+            struct cmsghdr       *cmsg;
+            struct in6_pktinfo   *pkt6;
+            struct sockaddr_in6  *sin6;
+
+            msg.msg_control = &msg_control6;
+            msg.msg_controllen = sizeof(msg_control6);
+
+            cmsg = CMSG_FIRSTHDR(&msg);
+            cmsg->cmsg_level = IPPROTO_IPV6;
+            cmsg->cmsg_type = IPV6_PKTINFO;
+            cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
+
+            sin6 = (struct sockaddr_in6 *) c->local_sockaddr;
+
+            pkt6 = (struct in6_pktinfo *) CMSG_DATA(cmsg);
+            ngx_memzero(pkt6, sizeof(struct in6_pktinfo));
+            pkt6->ipi6_addr = sin6->sin6_addr;
+        }
+
+#endif
+    }
+
+#endif
+
 eintr:
 
     n = sendmsg(c->fd, &msg, 0);
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index 4a394d7..0efbda8 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -494,6 +494,8 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
             ls->log.handler = ngx_accept_log_error;
 
             ls->backlog = addr[i].opt.backlog;
+            ls->rcvbuf = addr[i].opt.rcvbuf;
+            ls->sndbuf = addr[i].opt.sndbuf;
 
             ls->wildcard = addr[i].opt.wildcard;
 
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 814e3b9..09d2459 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -62,6 +62,8 @@ typedef struct {
     int                            tcp_keepcnt;
 #endif
     int                            backlog;
+    int                            rcvbuf;
+    int                            sndbuf;
     int                            type;
 } ngx_stream_listen_t;
 
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index f7870ee..db8c2a3 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -582,7 +582,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_stream_core_srv_conf_t  *cscf = conf;
 
-    ngx_str_t                    *value;
+    ngx_str_t                    *value, size;
     ngx_url_t                     u;
     ngx_uint_t                    i, backlog;
     ngx_stream_listen_t          *ls, *als;
@@ -620,6 +620,8 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ls->socklen = u.socklen;
     ls->backlog = NGX_LISTEN_BACKLOG;
+    ls->rcvbuf = -1;
+    ls->sndbuf = -1;
     ls->type = SOCK_STREAM;
     ls->wildcard = u.wildcard;
     ls->ctx = cf->ctx;
@@ -659,6 +661,38 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             continue;
         }
 
+        if (ngx_strncmp(value[i].data, "rcvbuf=", 7) == 0) {
+            size.len = value[i].len - 7;
+            size.data = value[i].data + 7;
+
+            ls->rcvbuf = ngx_parse_size(&size);
+            ls->bind = 1;
+
+            if (ls->rcvbuf == NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid rcvbuf \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "sndbuf=", 7) == 0) {
+            size.len = value[i].len - 7;
+            size.data = value[i].data + 7;
+
+            ls->sndbuf = ngx_parse_size(&size);
+            ls->bind = 1;
+
+            if (ls->sndbuf == NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid sndbuf \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
             size_t  len;
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 81a0891..fe52cb6 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -103,6 +103,7 @@ static ngx_conf_bitmask_t  ngx_stream_proxy_ssl_protocols[] = {
     { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
     { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
     { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
+    { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
     { ngx_null_string, 0 }
 };
 
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 2f242b6..593776b 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -45,6 +45,7 @@ static ngx_conf_bitmask_t  ngx_stream_ssl_protocols[] = {
     { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
     { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
     { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
+    { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
     { ngx_null_string, 0 }
 };
 

From 4a6feaae540eec666cf437807aa90f7fd8876e4c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 7 Jul 2016 11:37:59 +0300
Subject: [PATCH 172/600] Follow stable 1.12 releases

This is a temporary state to help Ubuntu follow the 1.12 release cycle.
Debian will skip 1.12 and jump straight to 1.13 (future 1.14) for buster.
---
 debian/gbp.conf | 4 +++-
 debian/watch    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index af46c8f..c725588 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,5 @@
 [DEFAULT]
 pristine-tar = True
-
+upstream-branch = upstream-1.12
+debian-branch = 1.12.x
+upstream-tag = upstream/%(version)s
diff --git a/debian/watch b/debian/watch
index d54dab0..6d86903 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-http://nginx.org/download/nginx-(1.10\.\d+)\.tar\.gz
+http://nginx.org/download/nginx-(1\.12\.\d+)\.tar\.gz

From 53995e63c7b7d68867396fb46ca99cab0842b092 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 2 May 2017 09:55:52 +0300
Subject: [PATCH 173/600] New upstream version 1.12.0

---
 CHANGES          | 5 +++++
 CHANGES.ru       | 5 +++++
 src/core/nginx.h | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e54f1b8..e6f9668 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+Changes with nginx 1.12.0                                        12 Apr 2017
+
+    *) 1.12.x stable branch.
+
+
 Changes with nginx 1.11.13                                       04 Apr 2017
 
     *) Feature: the "http_429" parameter of the "proxy_next_upstream",
diff --git a/CHANGES.ru b/CHANGES.ru
index 029a2a7..db1a941 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,9 @@
 
+Изменения в nginx 1.12.0                                          12.04.2017
+
+    *) Стабильная ветка 1.12.x.
+
+
 Изменения в nginx 1.11.13                                         04.04.2017
 
     *) Добавление: параметр http_429 в директивах proxy_next_upstream,
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 5d3112f..5151273 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011013
-#define NGINX_VERSION      "1.11.13"
+#define nginx_version      1012000
+#define NGINX_VERSION      "1.12.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD

From c3a656b1a697fc1c67d2a917cefd3a3f7c8a2c8e Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 12 Oct 2016 08:17:58 +0300
Subject: [PATCH 174/600] Drop --with-ipv6 flag, IPv6 support is enabled
 automatically

---
 debian/rules | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 767f7b3..9044b66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,6 @@ common_configure_flags := \
 			--http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
 			--with-debug \
 			--with-pcre-jit \
-			--with-ipv6 \
 			--with-http_ssl_module \
 			--with-http_stub_status_module \
 			--with-http_realip_module \

From 16f4fb2b8807d83935c9f9f118341b7b911187f4 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 12 Oct 2016 08:22:17 +0300
Subject: [PATCH 175/600] Drop perl build flags patch, it is now handled
 upstream

---
 debian/patches/perl-use-dpkg-buildflags.patch | 23 -------------------
 debian/patches/series                         |  1 -
 debian/rules                                  |  5 ----
 3 files changed, 29 deletions(-)
 delete mode 100644 debian/patches/perl-use-dpkg-buildflags.patch

diff --git a/debian/patches/perl-use-dpkg-buildflags.patch b/debian/patches/perl-use-dpkg-buildflags.patch
deleted file mode 100644
index 8b2b88c..0000000
--- a/debian/patches/perl-use-dpkg-buildflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Use linker flags from environment for perl (dpkg-buildflags).
- Necessary for hardening flags.
-Author: Christos Trochalakis <ctrochalakis@debian.org>
---- a/src/http/modules/perl/Makefile.PL
-+++ b/src/http/modules/perl/Makefile.PL
-@@ -3,6 +3,7 @@
- # Copyright (C) Nginx, Inc.
- 
- use 5.006001;
-+use Config;
- use ExtUtils::MakeMaker;
- 
- WriteMakefile(
-@@ -14,6 +15,9 @@ WriteMakefile(
-     AUTHOR            => 'Igor Sysoev',
- 
-     CCFLAGS           => "$ENV{NGX_PM_CFLAGS}",
-+    # Pass link hardening flags
-+    # $Config{lddlflags} is the default
-+    LDDLFLAGS         => "$ENV{DEBIAN_NGINX_PERL_LDFLAGS} $Config{lddlflags}",
-     OPTIMIZE          => '-O',
- 
-     INC               => join(" ", map {
diff --git a/debian/patches/series b/debian/patches/series
index 69175ec..dc0a59c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-perl-use-dpkg-buildflags.patch
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 0004-SSL-error-messages-style.patch
diff --git a/debian/rules b/debian/rules
index 9044b66..55bb9d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) -fPIC $(shell dpkg-buildflags --get CPPFLAGS)
 debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC
 
-# export necessary perl hardenging flags
-#  # see: src/http/modules/perl/Makefile.PL
-DEBIAN_NGINX_PERL_LDFLAGS:=$(debian_ldflags)
-export DEBIAN_NGINX_PERL_LDFLAGS
-
 FLAVOURS := full light extras
 DYN_MODS := \
 	http-auth-pam \

From e1c2b349a06b95ada3ebbf857fbbf44259da2bc0 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 25 Jan 2017 15:02:11 +0200
Subject: [PATCH 176/600] Drop curve list patch, is is included upstream

---
 .../0004-SSL-error-messages-style.patch       |  29 ----
 debian/patches/0005-SSL-style.patch           |  44 -----
 ...pport-for-multiple-curves-ticket-885.patch | 151 ------------------
 debian/patches/series                         |   3 -
 4 files changed, 227 deletions(-)
 delete mode 100644 debian/patches/0004-SSL-error-messages-style.patch
 delete mode 100644 debian/patches/0005-SSL-style.patch
 delete mode 100644 debian/patches/0006-SSL-support-for-multiple-curves-ticket-885.patch

diff --git a/debian/patches/0004-SSL-error-messages-style.patch b/debian/patches/0004-SSL-error-messages-style.patch
deleted file mode 100644
index 37ef747..0000000
--- a/debian/patches/0004-SSL-error-messages-style.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Maxim Dounin <mdounin@mdounin.ru>
-Date: Thu, 19 May 2016 14:46:32 +0300
-Subject: SSL: error messages style.
-
----
- src/event/ngx_event_openssl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
-index a3160b4..5b2e698 100644
---- a/src/event/ngx_event_openssl.c
-+++ b/src/event/ngx_event_openssl.c
-@@ -1032,14 +1032,14 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
-     nid = OBJ_sn2nid((const char *) name->data);
-     if (nid == 0) {
-         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
--                      "Unknown curve name \"%s\"", name->data);
-+                      "OBJ_sn2nid(\"%s\") failed: unknown curve", name->data);
-         return NGX_ERROR;
-     }
- 
-     ecdh = EC_KEY_new_by_curve_name(nid);
-     if (ecdh == NULL) {
-         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
--                      "Unable to create curve \"%s\"", name->data);
-+                      "EC_KEY_new_by_curve_name(\"%s\") failed", name->data);
-         return NGX_ERROR;
-     }
- 
diff --git a/debian/patches/0005-SSL-style.patch b/debian/patches/0005-SSL-style.patch
deleted file mode 100644
index 11bcaea..0000000
--- a/debian/patches/0005-SSL-style.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Maxim Dounin <mdounin@mdounin.ru>
-Date: Thu, 19 May 2016 14:46:32 +0300
-Subject: SSL: style.
-
----
- src/event/ngx_event_openssl.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
-index 5b2e698..e6fe3e9 100644
---- a/src/event/ngx_event_openssl.c
-+++ b/src/event/ngx_event_openssl.c
-@@ -1025,11 +1025,11 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
-     /*
-      * Elliptic-Curve Diffie-Hellman parameters are either "named curves"
-      * from RFC 4492 section 5.1.1, or explicitly described curves over
--     * binary fields. OpenSSL only supports the "named curves", which provide
-+     * binary fields.  OpenSSL only supports the "named curves", which provide
-      * maximum interoperability.
-      */
- 
--    nid = OBJ_sn2nid((const char *) name->data);
-+    nid = OBJ_sn2nid((char *) name->data);
-     if (nid == 0) {
-         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                       "OBJ_sn2nid(\"%s\") failed: unknown curve", name->data);
-@@ -2123,7 +2123,7 @@ ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
-          * session reuse (see SSL_SESS_CACHE_OFF above), then
-          * Outlook Express fails to upload a sent email to
-          * the Sent Items folder on the IMAP server via a separate IMAP
--         * connection in the background. Therefore we have a special
-+         * connection in the background.  Therefore we have a special
-          * mode (SSL_SESS_CACHE_SERVER|SSL_SESS_CACHE_NO_INTERNAL_STORE)
-          * where the server pretends that it supports session reuse,
-          * but it does not actually store any session.
-@@ -3547,7 +3547,7 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
- 
-     value = cf->args->elts;
- 
--    engine = ENGINE_by_id((const char *) value[1].data);
-+    engine = ENGINE_by_id((char *) value[1].data);
- 
-     if (engine == NULL) {
-         ngx_ssl_error(NGX_LOG_WARN, cf->log, 0,
diff --git a/debian/patches/0006-SSL-support-for-multiple-curves-ticket-885.patch b/debian/patches/0006-SSL-support-for-multiple-curves-ticket-885.patch
deleted file mode 100644
index 1e9b0ac..0000000
--- a/debian/patches/0006-SSL-support-for-multiple-curves-ticket-885.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From: Maxim Dounin <mdounin@mdounin.ru>
-Date: Thu, 19 May 2016 14:46:32 +0300
-Subject: SSL: support for multiple curves (ticket #885).
-
-OpenSSL 1.0.2+ allows configuring a curve list instead of a single curve
-previously supported.  This allows use of different curves depending on
-what client supports (as available via the elliptic_curves extension),
-and also allows use of different curves in an ECDHE key exchange and
-in the ECDSA certificate.
-
-The special value "auto" was introduced (now the default for ssl_ecdh_curve),
-which means "use an internal list of curves as available in the OpenSSL
-library used".  For versions prior to OpenSSL 1.0.2 it maps to "prime256v1"
-as previously used.  The default in 1.0.2b+ prefers prime256v1 as well
-(and X25519 in OpenSSL 1.1.0+).
-
-As client vs. server preference of curves is controlled by the
-same option as used for ciphers (SSL_OP_CIPHER_SERVER_PREFERENCE),
-the ssl_prefer_server_ciphers directive now controls both.
----
- src/event/ngx_event_openssl.c          | 53 ++++++++++++++++++++++++++++++----
- src/http/modules/ngx_http_ssl_module.c |  2 +-
- src/mail/ngx_mail_ssl_module.c         |  2 +-
- src/stream/ngx_stream_ssl_module.c     |  2 +-
- 4 files changed, 51 insertions(+), 8 deletions(-)
-
-diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
-index e6fe3e9..e0364a7 100644
---- a/src/event/ngx_event_openssl.c
-+++ b/src/event/ngx_event_openssl.c
-@@ -1019,8 +1019,6 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
- {
- #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
- #ifndef OPENSSL_NO_ECDH
--    int      nid;
--    EC_KEY  *ecdh;
- 
-     /*
-      * Elliptic-Curve Diffie-Hellman parameters are either "named curves"
-@@ -1029,17 +1027,61 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
-      * maximum interoperability.
-      */
- 
--    nid = OBJ_sn2nid((char *) name->data);
-+#ifdef SSL_CTRL_SET_CURVES_LIST
-+
-+    /*
-+     * OpenSSL 1.0.2+ allows configuring a curve list instead of a single
-+     * curve previously supported.  By default an internal list is used,
-+     * with prime256v1 being preferred by server in OpenSSL 1.0.2b+
-+     * and X25519 in OpenSSL 1.1.0+.
-+     *
-+     * By default a curve preferred by the client will be used for
-+     * key exchange.  The SSL_OP_CIPHER_SERVER_PREFERENCE option can
-+     * be used to prefer server curves instead, similar to what it
-+     * does for ciphers.
-+     */
-+
-+    SSL_CTX_set_options(ssl->ctx, SSL_OP_SINGLE_ECDH_USE);
-+
-+#if SSL_CTRL_SET_ECDH_AUTO
-+    /* not needed in OpenSSL 1.1.0+ */
-+    SSL_CTX_set_ecdh_auto(ssl->ctx, 1);
-+#endif
-+
-+    if (ngx_strcmp(name->data, "auto") == 0) {
-+        return NGX_OK;
-+    }
-+
-+    if (SSL_CTX_set1_curves_list(ssl->ctx, (char *) name->data) == 0) {
-+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-+                      "SSL_CTX_set1_curves_list(\"%s\") failed", name->data);
-+        return NGX_ERROR;
-+    }
-+
-+#else
-+
-+    int      nid;
-+    char    *curve;
-+    EC_KEY  *ecdh;
-+
-+    if (ngx_strcmp(name->data, "auto") == 0) {
-+        curve = "prime256v1";
-+
-+    } else {
-+        curve = (char *) name->data;
-+    }
-+
-+    nid = OBJ_sn2nid(curve);
-     if (nid == 0) {
-         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
--                      "OBJ_sn2nid(\"%s\") failed: unknown curve", name->data);
-+                      "OBJ_sn2nid(\"%s\") failed: unknown curve", curve);
-         return NGX_ERROR;
-     }
- 
-     ecdh = EC_KEY_new_by_curve_name(nid);
-     if (ecdh == NULL) {
-         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
--                      "EC_KEY_new_by_curve_name(\"%s\") failed", name->data);
-+                      "EC_KEY_new_by_curve_name(\"%s\") failed", curve);
-         return NGX_ERROR;
-     }
- 
-@@ -1050,6 +1092,7 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
-     EC_KEY_free(ecdh);
- #endif
- #endif
-+#endif
- 
-     return NGX_OK;
- }
-diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
-index 6a4108c..dc8595e 100644
---- a/src/http/modules/ngx_http_ssl_module.c
-+++ b/src/http/modules/ngx_http_ssl_module.c
-@@ -15,7 +15,7 @@ typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
- 
- 
- #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
--#define NGX_DEFAULT_ECDH_CURVE  "prime256v1"
-+#define NGX_DEFAULT_ECDH_CURVE  "auto"
- 
- #define NGX_HTTP_NPN_ADVERTISE  "\x08http/1.1"
- 
-diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
-index ff5c141..45a696e 100644
---- a/src/mail/ngx_mail_ssl_module.c
-+++ b/src/mail/ngx_mail_ssl_module.c
-@@ -11,7 +11,7 @@
- 
- 
- #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
--#define NGX_DEFAULT_ECDH_CURVE  "prime256v1"
-+#define NGX_DEFAULT_ECDH_CURVE  "auto"
- 
- 
- static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf);
-diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
-index e12da1b..2f551da 100644
---- a/src/stream/ngx_stream_ssl_module.c
-+++ b/src/stream/ngx_stream_ssl_module.c
-@@ -11,7 +11,7 @@
- 
- 
- #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
--#define NGX_DEFAULT_ECDH_CURVE  "prime256v1"
-+#define NGX_DEFAULT_ECDH_CURVE  "auto"
- 
- 
- static void *ngx_stream_ssl_create_conf(ngx_conf_t *cf);
diff --git a/debian/patches/series b/debian/patches/series
index dc0a59c..5b6b799 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
-0004-SSL-error-messages-style.patch
-0005-SSL-style.patch
-0006-SSL-support-for-multiple-curves-ticket-885.patch

From 36c7658ba223ab13a8be56892890fec8febe79c4 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 16 Nov 2016 10:55:58 +0200
Subject: [PATCH 177/600] Patch nginx-upstream-fair to build against nginx
 >1.11.6

---
 debian/modules/README.Modules-versions        |  1 +
 .../drop-default-port.patch                   | 37 +++++++++++++++++++
 .../patches/nginx-upstream-fair/series        |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 debian/modules/patches/nginx-upstream-fair/drop-default-port.patch

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 9a04d15..341d940 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -30,6 +30,7 @@ README for Modules versions
   Version: a18b409
   Patch: dynamic-module.patch
   Patch: openssl-1.1.0.patch
+  Patch: drop-default-port.patch
 
  nchan
   Homepage: https://github.com/slact/nchan
diff --git a/debian/modules/patches/nginx-upstream-fair/drop-default-port.patch b/debian/modules/patches/nginx-upstream-fair/drop-default-port.patch
new file mode 100644
index 0000000..708caa0
--- /dev/null
+++ b/debian/modules/patches/nginx-upstream-fair/drop-default-port.patch
@@ -0,0 +1,37 @@
+From d754c97abc103f6cb3c4d9385daa8547245a07e6 Mon Sep 17 00:00:00 2001
+From: Christos Trochalakis <yatiohi@ideopolis.gr>
+Date: Wed, 16 Nov 2016 10:52:08 +0200
+Subject: [PATCH] Don't use default_port (dropped in nginx 1.11.6)
+
+See:
+4dea01cf49e8 Upstream: removed ngx_http_upstream_srv_conf_t.default_port.
+3fa5983b6b44 Upstream: don't consider default_port when matching upstreams.
+---
+ ngx_http_upstream_fair_module.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c
+index a4419ca..5d76bb4 100644
+--- a/ngx_http_upstream_fair_module.c
++++ b/ngx_http_upstream_fair_module.c
+@@ -540,7 +540,7 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+ 
+     /* an upstream implicitly defined by proxy_pass, etc. */
+ 
+-    if (us->port == 0 && us->default_port == 0) {
++    if (us->port == 0) {
+         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                       "no port in upstream \"%V\" in %s:%ui",
+                       &us->host, us->file_name, us->line);
+@@ -550,7 +550,7 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+     ngx_memzero(&u, sizeof(ngx_url_t));
+ 
+     u.host = us->host;
+-    u.port = (in_port_t) (us->port ? us->port : us->default_port);
++    u.port = (in_port_t) us->port;
+ 
+     if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
+         if (u.err) {
+-- 
+2.10.2
+
diff --git a/debian/modules/patches/nginx-upstream-fair/series b/debian/modules/patches/nginx-upstream-fair/series
index 373a826..f8e5439 100644
--- a/debian/modules/patches/nginx-upstream-fair/series
+++ b/debian/modules/patches/nginx-upstream-fair/series
@@ -1,2 +1,3 @@
 dynamic-module.patch
 openssl-1.1.0.patch
+drop-default-port.patch

From 0421dc9335353257132426584bb1e426b6750a7d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 28 Apr 2017 11:29:28 +0300
Subject: [PATCH 178/600] Patch nginx-lua to build against nginx 1.11.11

---
 debian/modules/README.Modules-versions        |   1 +
 .../nginx-lua/build-nginx-1.1.11.patch        | 217 ++++++++++++++++++
 debian/modules/patches/nginx-lua/series       |   1 +
 3 files changed, 219 insertions(+)
 create mode 100644 debian/modules/patches/nginx-lua/build-nginx-1.1.11.patch

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 341d940..5744181 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -24,6 +24,7 @@ README for Modules versions
   Homepage: https://github.com/openresty/lua-nginx-module
   Version: v0.10.7
   Patch: openssl-1.1.0.patch
+  Patch: build-nginx-1.11.11.patch
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
diff --git a/debian/modules/patches/nginx-lua/build-nginx-1.1.11.patch b/debian/modules/patches/nginx-lua/build-nginx-1.1.11.patch
new file mode 100644
index 0000000..597cbf8
--- /dev/null
+++ b/debian/modules/patches/nginx-lua/build-nginx-1.1.11.patch
@@ -0,0 +1,217 @@
+From 0459a285ca0159d45e73da8bd1164edb5c57cde3 Mon Sep 17 00:00:00 2001
+From: Andrei Belov <defanator@gmail.com>
+Date: Wed, 22 Mar 2017 07:50:57 +0300
+Subject: [PATCH] feature: nginx 1.11.11+ can now build with this module.
+
+Note: nginx 1.11.11+ are still not an officially supported target yet.
+More work needed.
+
+Closes openresty/lua-nginx-module#1016
+
+See also:
+http://hg.nginx.org/nginx/rev/e662cbf1b932
+---
+ src/ngx_http_lua_common.h  |  6 ++++
+ src/ngx_http_lua_headers.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/ngx_http_lua_headers.h |  3 ++
+ src/ngx_http_lua_module.c  | 13 ++++++++-
+ 4 files changed, 89 insertions(+), 1 deletion(-)
+
+diff --git a/src/ngx_http_lua_common.h b/src/ngx_http_lua_common.h
+index 079a4dc3..f37d776a 100644
+--- a/src/ngx_http_lua_common.h
++++ b/src/ngx_http_lua_common.h
+@@ -199,6 +199,12 @@ struct ngx_http_lua_main_conf_s {
+                                                 of reqeusts */
+     ngx_uint_t           malloc_trim_req_count;
+ 
++#if nginx_version >= 1011011
++    /* the following 2 fields are only used by ngx.req.raw_headers() for now */
++    ngx_buf_t          **busy_buf_ptrs;
++    ngx_int_t            busy_buf_ptr_count;
++#endif
++
+     unsigned             requires_header_filter:1;
+     unsigned             requires_body_filter:1;
+     unsigned             requires_capture_filter:1;
+diff --git a/src/ngx_http_lua_headers.c b/src/ngx_http_lua_headers.c
+index 23925984..6700ce80 100644
+--- a/src/ngx_http_lua_headers.c
++++ b/src/ngx_http_lua_headers.c
+@@ -26,6 +26,9 @@ static int ngx_http_lua_ngx_req_get_headers(lua_State *L);
+ static int ngx_http_lua_ngx_req_header_clear(lua_State *L);
+ static int ngx_http_lua_ngx_req_header_set(lua_State *L);
+ static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
++#if nginx_version >= 1011011
++void ngx_http_lua_ngx_raw_header_cleanup(void *data);
++#endif
+ 
+ 
+ static int
+@@ -77,6 +80,11 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
+     size_t                       size;
+     ngx_buf_t                   *b, *first = NULL;
+     ngx_int_t                    i, j;
++#if nginx_version >= 1011011
++    ngx_buf_t                  **bb;
++    ngx_chain_t                 *cl;
++    ngx_http_lua_main_conf_t    *lmcf;
++#endif
+     ngx_connection_t            *c;
+     ngx_http_request_t          *r, *mr;
+     ngx_http_connection_t       *hc;
+@@ -93,6 +101,10 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
+         return luaL_error(L, "no request object found");
+     }
+ 
++#if nginx_version >= 1011011
++    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
++#endif
++
+     ngx_http_lua_check_fake_request(L, r);
+ 
+     mr = r->main;
+@@ -109,8 +121,13 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
+     dd("hc->nbusy: %d", (int) hc->nbusy);
+ 
+     if (hc->nbusy) {
++#if nginx_version >= 1011011
++        dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
++           hc->busy->buf->last, hc->busy->buf->end);
++#else
+         dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos,
+            hc->busy[0]->last, hc->busy[0]->end);
++#endif
+     }
+ 
+     dd("request line: %p %p", mr->request_line.data,
+@@ -146,9 +163,37 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
+     dd("size: %d", (int) size);
+ 
+     if (hc->nbusy) {
++#if nginx_version >= 1011011
++        if (hc->nbusy > lmcf->busy_buf_ptr_count) {
++            if (lmcf->busy_buf_ptrs) {
++                ngx_free(lmcf->busy_buf_ptrs);
++            }
++
++            lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
++                                            r->connection->log);
++
++            if (lmcf->busy_buf_ptrs == NULL) {
++                return luaL_error(L, "no memory");
++            }
++
++            lmcf->busy_buf_ptr_count = hc->nbusy;
++        }
++
++        bb = lmcf->busy_buf_ptrs;
++        for (cl = hc->busy; cl; cl = cl->next) {
++            *bb++ = cl->buf;
++        }
++#endif
+         b = NULL;
++
++#if nginx_version >= 1011011
++        bb = lmcf->busy_buf_ptrs;
++        for (i = hc->nbusy; i > 0; i--) {
++            b = bb[i - 1];
++#else
+         for (i = 0; i < hc->nbusy; i++) {
+             b = hc->busy[i];
++#endif
+ 
+             dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
+                b->start);
+@@ -223,8 +268,15 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
+     }
+ 
+     if (hc->nbusy) {
++
++#if nginx_version >= 1011011
++        bb = lmcf->busy_buf_ptrs;
++        for (i = hc->nbusy - 1; i >= 0; i--) {
++            b = bb[i];
++#else
+         for (i = 0; i < hc->nbusy; i++) {
+             b = hc->busy[i];
++#endif
+ 
+             if (!found) {
+                 if (b != first) {
+@@ -1431,4 +1483,20 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
+ #endif /* NGX_LUA_NO_FFI_API */
+ 
+ 
++#if nginx_version >= 1011011
++void
++ngx_http_lua_ngx_raw_header_cleanup(void *data)
++{
++    ngx_http_lua_main_conf_t  *lmcf;
++
++    lmcf = (ngx_http_lua_main_conf_t *) data;
++
++    if (lmcf->busy_buf_ptrs) {
++        ngx_free(lmcf->busy_buf_ptrs);
++        lmcf->busy_buf_ptrs = NULL;
++    }
++}
++#endif
++
++
+ /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
+diff --git a/src/ngx_http_lua_headers.h b/src/ngx_http_lua_headers.h
+index 39f1114c..ee4d21c1 100644
+--- a/src/ngx_http_lua_headers.h
++++ b/src/ngx_http_lua_headers.h
+@@ -15,6 +15,9 @@
+ 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_create_headers_metatable(ngx_log_t *log, lua_State *L);
++#if nginx_version >= 1011011
++void ngx_http_lua_ngx_raw_header_cleanup(void *data);
++#endif
+ 
+ 
+ #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */
+diff --git a/src/ngx_http_lua_module.c b/src/ngx_http_lua_module.c
+index 3dc2817b..875f9334 100644
+--- a/src/ngx_http_lua_module.c
++++ b/src/ngx_http_lua_module.c
+@@ -28,6 +28,7 @@
+ #include "ngx_http_lua_ssl_certby.h"
+ #include "ngx_http_lua_ssl_session_storeby.h"
+ #include "ngx_http_lua_ssl_session_fetchby.h"
++#include "ngx_http_lua_headers.h"
+ 
+ 
+ static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
+@@ -624,7 +625,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
+     volatile ngx_cycle_t       *saved_cycle;
+     ngx_http_core_main_conf_t  *cmcf;
+     ngx_http_lua_main_conf_t   *lmcf;
+-#ifndef NGX_LUA_NO_FFI_API
++#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
+     ngx_pool_cleanup_t         *cln;
+ #endif
+ 
+@@ -716,6 +717,16 @@ ngx_http_lua_init(ngx_conf_t *cf)
+     cln->handler = ngx_http_lua_sema_mm_cleanup;
+ #endif
+ 
++#if nginx_version >= 1011011
++    cln = ngx_pool_cleanup_add(cf->pool, 0);
++    if (cln == NULL) {
++        return NGX_ERROR;
++    }
++
++    cln->data = lmcf;
++    cln->handler = ngx_http_lua_ngx_raw_header_cleanup;
++#endif
++
+     if (lmcf->lua == NULL) {
+         dd("initializing lua vm");
+ 
+-- 
+2.11.0
+
diff --git a/debian/modules/patches/nginx-lua/series b/debian/modules/patches/nginx-lua/series
index ed0d540..bf7b34f 100644
--- a/debian/modules/patches/nginx-lua/series
+++ b/debian/modules/patches/nginx-lua/series
@@ -1 +1,2 @@
 openssl-1.1.0.patch
+build-nginx-1.1.11.patch

From 774ecad9724a9d233a2b6220c2cbbd2cb628d8b9 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 28 Apr 2017 11:29:28 +0300
Subject: [PATCH 179/600] Patch nginx-echo to build against nginx 1.11.11

---
 debian/modules/README.Modules-versions        |   1 +
 .../nginx-echo/build-nginx-1.11.11.patch      | 212 ++++++++++++++++++
 debian/modules/patches/nginx-echo/series      |   1 +
 3 files changed, 214 insertions(+)
 create mode 100644 debian/modules/patches/nginx-echo/build-nginx-1.11.11.patch
 create mode 100644 debian/modules/patches/nginx-echo/series

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 5744181..8ad843e 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -19,6 +19,7 @@ README for Modules versions
  nginx-echo
   Homepage: https://github.com/agentzh/echo-nginx-module
   Version: v0.60
+  Patch: build-nginx-1.11.11.patch
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
diff --git a/debian/modules/patches/nginx-echo/build-nginx-1.11.11.patch b/debian/modules/patches/nginx-echo/build-nginx-1.11.11.patch
new file mode 100644
index 0000000..dbb9ce7
--- /dev/null
+++ b/debian/modules/patches/nginx-echo/build-nginx-1.11.11.patch
@@ -0,0 +1,212 @@
+From 7740e11558b530b66b469c657576f5280b7cdb1b Mon Sep 17 00:00:00 2001
+From: Andrei Belov <defanator@gmail.com>
+Date: Wed, 22 Mar 2017 08:43:30 +0300
+Subject: [PATCH] feature: nginx 1.11.11+ can now build with this module.
+
+Note: nginx 1.11.11+ are still not an officially supported target yet.
+More work needed.
+
+Closes openresty/echo-nginx-module#64
+
+See also:
+http://hg.nginx.org/nginx/rev/e662cbf1b932
+
+Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
+---
+ src/ngx_http_echo_module.c       | 13 +++++++++
+ src/ngx_http_echo_module.h       |  4 +++
+ src/ngx_http_echo_request_info.c | 62 ++++++++++++++++++++++++++++++++++++++++
+ src/ngx_http_echo_request_info.h |  3 ++
+ valgrind.suppress                | 10 +++++++
+ 5 files changed, 92 insertions(+)
+
+diff --git a/src/ngx_http_echo_module.c b/src/ngx_http_echo_module.c
+index ae70479..8d736d7 100644
+--- a/src/ngx_http_echo_module.c
++++ b/src/ngx_http_echo_module.c
+@@ -632,6 +632,9 @@ ngx_http_echo_echo_exec(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+ static void *
+ ngx_http_echo_create_main_conf(ngx_conf_t *cf)
+ {
++#if nginx_version >= 1011011
++    ngx_pool_cleanup_t           *cln;
++#endif
+     ngx_http_echo_main_conf_t    *emcf;
+ 
+     emcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_echo_main_conf_t));
+@@ -643,6 +646,16 @@ ngx_http_echo_create_main_conf(ngx_conf_t *cf)
+      *      hmcf->requires_filter = 0;
+      */
+ 
++#if nginx_version >= 1011011
++    cln = ngx_pool_cleanup_add(cf->pool, 0);
++    if (cln == NULL) {
++        return NULL;
++    }
++
++    cln->data = emcf;
++    cln->handler = ngx_http_echo_request_headers_cleanup;
++#endif
++
+     return emcf;
+ }
+ 
+diff --git a/src/ngx_http_echo_module.h b/src/ngx_http_echo_module.h
+index 2d212c3..ce0a305 100644
+--- a/src/ngx_http_echo_module.h
++++ b/src/ngx_http_echo_module.h
+@@ -92,6 +92,10 @@ typedef struct {
+ 
+ typedef struct {
+     ngx_int_t       requires_filter;
++#if nginx_version >= 1011011
++    ngx_buf_t     **busy_buf_ptrs;
++    ngx_int_t       busy_buf_ptr_count;
++#endif
+ } ngx_http_echo_main_conf_t;
+ 
+ 
+diff --git a/src/ngx_http_echo_request_info.c b/src/ngx_http_echo_request_info.c
+index d28ec4d..7dd3683 100644
+--- a/src/ngx_http_echo_request_info.c
++++ b/src/ngx_http_echo_request_info.c
+@@ -17,6 +17,9 @@
+ 
+ 
+ static void ngx_http_echo_post_read_request_body(ngx_http_request_t *r);
++#if nginx_version >= 1011011
++void ngx_http_echo_request_headers_cleanup(void *data);
++#endif
+ 
+ 
+ ngx_int_t
+@@ -179,6 +182,11 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+     ngx_int_t                    i, j;
+     ngx_buf_t                   *b, *first = NULL;
+     unsigned                     found;
++#if nginx_version >= 1011011
++    ngx_buf_t                  **bb;
++    ngx_chain_t                 *cl;
++    ngx_http_echo_main_conf_t   *emcf;
++#endif
+     ngx_connection_t            *c;
+     ngx_http_request_t          *mr;
+     ngx_http_connection_t       *hc;
+@@ -195,6 +203,10 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+     }
+ #endif
+ 
++#if nginx_version >= 1011011
++    emcf = ngx_http_get_module_main_conf(r, ngx_http_echo_module);
++#endif
++
+     size = 0;
+     b = c->buffer;
+ 
+@@ -215,8 +227,35 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+ 
+     if (hc->nbusy) {
+         b = NULL;
++
++#if nginx_version >= 1011011
++        if (hc->nbusy > emcf->busy_buf_ptr_count) {
++            if (emcf->busy_buf_ptrs) {
++                ngx_free(emcf->busy_buf_ptrs);
++            }
++
++            emcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
++                                            r->connection->log);
++
++            if (emcf->busy_buf_ptrs == NULL) {
++                return NGX_ERROR;
++            }
++
++            emcf->busy_buf_ptr_count = hc->nbusy;
++        }
++
++        bb = emcf->busy_buf_ptrs;
++        for (cl = hc->busy; cl; cl = cl->next) {
++            *bb++ = cl->buf;
++        }
++
++        bb = emcf->busy_buf_ptrs;
++        for (i = hc->nbusy; i > 0; i--) {
++            b = bb[i - 1];
++#else
+         for (i = 0; i < hc->nbusy; i++) {
+             b = hc->busy[i];
++#endif
+ 
+             if (first == NULL) {
+                 if (mr->request_line.data >= b->pos
+@@ -280,8 +319,15 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+     }
+ 
+     if (hc->nbusy) {
++
++#if nginx_version >= 1011011
++        bb = emcf->busy_buf_ptrs;
++        for (i = hc->nbusy; i > 0; i--) {
++            b = bb[i - 1];
++#else
+         for (i = 0; i < hc->nbusy; i++) {
+             b = hc->busy[i];
++#endif
+ 
+             if (!found) {
+                 if (b != first) {
+@@ -457,4 +503,20 @@ ngx_http_echo_response_status_variable(ngx_http_request_t *r,
+     return NGX_OK;
+ }
+ 
++
++#if nginx_version >= 1011011
++void
++ngx_http_echo_request_headers_cleanup(void *data)
++{
++    ngx_http_echo_main_conf_t  *emcf;
++
++    emcf = (ngx_http_echo_main_conf_t *) data;
++
++    if (emcf->busy_buf_ptrs) {
++        ngx_free(emcf->busy_buf_ptrs);
++        emcf->busy_buf_ptrs = NULL;
++    }
++}
++#endif
++
+ /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
+diff --git a/src/ngx_http_echo_request_info.h b/src/ngx_http_echo_request_info.h
+index 3b3713b..aa5730b 100644
+--- a/src/ngx_http_echo_request_info.h
++++ b/src/ngx_http_echo_request_info.h
+@@ -29,5 +29,8 @@ ngx_int_t ngx_http_echo_request_uri_variable(ngx_http_request_t *r,
+ ngx_int_t ngx_http_echo_response_status_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v, uintptr_t data);
+ 
++#if nginx_version >= 1011011
++void ngx_http_echo_request_headers_cleanup(void *data);
++#endif
+ 
+ #endif /* ECHO_REQUEST_INFO_H */
+diff --git a/valgrind.suppress b/valgrind.suppress
+index 0f8e871..d4bfe63 100644
+--- a/valgrind.suppress
++++ b/valgrind.suppress
+@@ -36,3 +36,13 @@
+    fun:do_preload
+    fun:dl_main
+ }
++{
++   <insert_a_suppression_name_here>
++   Memcheck:Leak
++   match-leak-kinds: definite
++   fun:malloc
++   fun:ngx_alloc
++   fun:ngx_set_environment
++   fun:ngx_single_process_cycle
++   fun:main
++}
+-- 
+2.11.0
+
diff --git a/debian/modules/patches/nginx-echo/series b/debian/modules/patches/nginx-echo/series
new file mode 100644
index 0000000..7e5c302
--- /dev/null
+++ b/debian/modules/patches/nginx-echo/series
@@ -0,0 +1 @@
+build-nginx-1.11.11.patch

From f4299b95f443dd860b7c578f5a2d47142cc2322a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 20 Feb 2017 11:40:16 +0200
Subject: [PATCH 180/600] Enable SSL Preread builtin module on nginx-full &
 nginx-extras

Closes: #854214
---
 debian/control | 7 ++++---
 debian/rules   | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 89a7abc..252ebd2 100644
--- a/debian/control
+++ b/debian/control
@@ -102,8 +102,8 @@ Description: nginx web/proxy server (standard version)
  .
  OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip,
  Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP,
- Slice, SSI, SSL, Stream, Stub Status, Substitution, Thread Pool, Upstream,
- User ID, XSLT.
+ Slice, SSI, SSL, Stream, SSL Preread, Stub Status, Substitution, Thread  Pool,
+ Upstream, User ID, XSLT.
  .
  MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
  .
@@ -181,7 +181,8 @@ Description: nginx web/proxy server (extended version)
  OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, FLV, GeoIP,
  Gunzip, Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log,
  MP4, Embedded Perl, Random Index, Real IP, Slice, Secure Link, SSI, SSL,
- Stream, Stub Status, Substitution, Thread Pool, Upstream, User ID, XSLT.
+ Stream, SSL Preread, Stub Status, Substitution, Thread Pool, Upstream,
+ User ID, XSLT.
  .
  MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
  .
diff --git a/debian/rules b/debian/rules
index 55bb9d9..9ca4443 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,6 +94,7 @@ full_configure_flags := \
 			--with-http_xslt_module=dynamic \
 			--with-stream=dynamic \
 			--with-stream_ssl_module \
+			--with-stream_ssl_preread_module \
 			--with-mail=dynamic \
 			--with-mail_ssl_module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
@@ -120,6 +121,7 @@ extras_configure_flags := \
 			--with-mail_ssl_module \
 			--with-stream=dynamic \
 			--with-stream_ssl_module \
+			--with-stream_ssl_preread_module \
 			--add-dynamic-module=$(MODULESDIR)/headers-more-nginx-module \
 			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
 			--add-dynamic-module=$(MODULESDIR)/nginx-cache-purge \

From d21bb9f2529145e22af2574c2f0379b5c8249d6a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 28 Apr 2017 15:28:22 +0300
Subject: [PATCH 181/600] Switch to debhelper 10

No changes needed.
---
 debian/compat  | 2 +-
 debian/control | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 252ebd2..03b05ce 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Kartik Mistry <kartik@debian.org>,
            Michael Lustfield <michael@lustfield.net>,
            Christos Trochalakis <ctrochalakis@debian.org>
 Build-Depends: autotools-dev,
-               debhelper (>= 9),
+               debhelper (>= 10),
                po-debconf,
                dh-systemd (>= 1.5),
                dpkg-dev (>= 1.15.5),

From 6bd87a78b4effbbfbee912c25a870425f8b83db5 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 28 Apr 2017 11:15:36 +0300
Subject: [PATCH 182/600] Prepare 1.12.0-1

---
 debian/changelog | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4373e14..2682b93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,22 @@
-nginx (1.10.3-2) UNRELEASED; urgency=medium
+nginx (1.12.0-1) UNRELEASED; urgency=medium
 
+  [ Michael Lustfield ]
   * debian/rules:
     - Configure build flags to work with other arches and downstreams.
       Thanks to Thomas Ward.
 
- -- Michael Lustfield <michael@lustfield.net>  Sun, 12 Feb 2017 00:10:17 -0600
+  [ Christos Trochalakis ]
+  * New upstream release.
+  * Patch nginx-upstream-fair to build against nginx 1.11.6.
+  * Patch nginx-lua to build against nginx 1.11.11.
+  * Patch nginx-echo to build against nginx 1.11.11.
+  * Drop curve list patch, it's included upstream.
+  * Drop perl build flags patch, it is now handled upstream.
+  * Enable SSL Preread builtin module on nginx-full & nginx-extras.
+    (Closes: #854214)
+  * Switch to debhelper 10, no changes needed.
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 28 Apr 2017 11:14:41 +0300
 
 nginx (1.10.3-1) unstable; urgency=medium
 

From 7d61d72df84f09bdb13816293825dc5f1ab1e456 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 5 May 2017 11:56:55 +0300
Subject: [PATCH 183/600] Adapt gbp.conf for the master branch

Dbp-Dch: Ignore
---
 debian/gbp.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c725588..a14a699 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,4 @@
 [DEFAULT]
 pristine-tar = True
-upstream-branch = upstream-1.12
-debian-branch = 1.12.x
+upstream-branch = upstream
 upstream-tag = upstream/%(version)s

From 22970aea4d276d6e02c9585737705027a4f6b3bd Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 5 May 2017 11:17:00 +0300
Subject: [PATCH 184/600] Release 1.12.0-1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2682b93..7367820 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.12.0-1) UNRELEASED; urgency=medium
+nginx (1.12.0-1) experimental; urgency=medium
 
   [ Michael Lustfield ]
   * debian/rules:
@@ -16,7 +16,7 @@ nginx (1.12.0-1) UNRELEASED; urgency=medium
     (Closes: #854214)
   * Switch to debhelper 10, no changes needed.
 
- -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 28 Apr 2017 11:14:41 +0300
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 05 May 2017 11:16:30 +0300
 
 nginx (1.10.3-1) unstable; urgency=medium
 

From 0c4e8a2f2b253b941ff3ee5ea5ef371601373d3d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 7 Jul 2016 11:37:59 +0300
Subject: [PATCH 185/600] Follow nginx mainline (1.13.x)

Now that stretch is about to be released, we can directly target 1.13
that will be released in about a year as 1.14.
---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 6d86903..6fa2f3e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-http://nginx.org/download/nginx-(1\.12\.\d+)\.tar\.gz
+http://nginx.org/download/nginx-(1\.13\.\d+)\.tar\.gz

From 2e8c50ec9d34ec8bc6d551cf90812da2bbd8af60 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 5 May 2017 13:02:32 +0300
Subject: [PATCH 186/600] New upstream version

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7367820..02587ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.13.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    We now target nginx mainline (1.13.x).
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 05 May 2017 13:01:30 +0300
+
 nginx (1.12.0-1) experimental; urgency=medium
 
   [ Michael Lustfield ]

From 6687faf49fb9db4cc1fc4734223ab3df0bff69a2 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 10 May 2017 11:40:52 +0300
Subject: [PATCH 187/600] Release 1.13.0-1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02587ed..a36a3df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-nginx (1.13.0-1) UNRELEASED; urgency=medium
+nginx (1.13.0-1) experimental; urgency=medium
 
   * New upstream release.
     We now target nginx mainline (1.13.x).
 
- -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 05 May 2017 13:01:30 +0300
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 10 May 2017 11:40:38 +0300
 
 nginx (1.12.0-1) experimental; urgency=medium
 

From 501f9c7a40edb258c26f588443acf395ab89e7e8 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 May 2017 11:40:55 +0300
Subject: [PATCH 188/600] New upstream version 1.13.1

---
 CHANGES                                    |   30 +
 CHANGES.ru                                 |   29 +
 auto/cc/conf                               |   36 +-
 auto/cc/sunc                               |    5 +-
 auto/os/linux                              |   14 -
 auto/unix                                  |   12 +
 contrib/vim/syntax/nginx.vim               | 3434 ++++++++++----------
 src/core/nginx.h                           |    4 +-
 src/core/ngx_connection.c                  |   43 +
 src/core/ngx_connection.h                  |    1 +
 src/core/ngx_murmurhash.c                  |    2 +
 src/event/ngx_event_accept.c               |    2 +-
 src/event/ngx_event_openssl.c              |    2 +-
 src/http/modules/ngx_http_access_module.c  |   22 +-
 src/http/modules/ngx_http_fastcgi_module.c |    3 +
 src/http/modules/ngx_http_proxy_module.c   |    1 +
 src/http/modules/ngx_http_realip_module.c  |   83 +-
 src/http/modules/ngx_http_scgi_module.c    |    1 +
 src/http/modules/ngx_http_uwsgi_module.c   |    1 +
 src/http/ngx_http_core_module.c            |   35 +-
 src/http/ngx_http_file_cache.c             |   57 +-
 src/http/ngx_http_header_filter_module.c   |    2 +-
 src/http/ngx_http_parse.c                  |   15 +-
 src/http/ngx_http_request.c                |   99 +-
 src/http/ngx_http_request.h                |    9 +-
 src/http/ngx_http_special_response.c       |   10 +-
 src/http/ngx_http_upstream.c               |   98 +-
 src/http/v2/ngx_http_v2.c                  |   25 +-
 src/http/v2/ngx_http_v2_filter_module.c    |    4 +-
 src/mail/ngx_mail_handler.c                |    2 +-
 src/os/unix/ngx_process.c                  |    1 +
 src/stream/ngx_stream_access_module.c      |   22 +-
 src/stream/ngx_stream_core_module.c        |   19 +-
 src/stream/ngx_stream_proxy_module.c       |   19 +-
 src/stream/ngx_stream_realip_module.c      |   83 +-
 src/stream/ngx_stream_ssl_module.c         |   15 +-
 36 files changed, 2225 insertions(+), 2015 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9aa8c03..992cc70 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,34 @@
 
+Changes with nginx 1.13.1                                        30 May 2017
+
+    *) Feature: now a hostname can be used as the "set_real_ip_from"
+       directive parameter.
+
+    *) Feature: vim syntax highlighting scripts improvements.
+
+    *) Feature: the "worker_cpu_affinity" directive now works on DragonFly
+       BSD.
+       Thanks to Sepherosa Ziehau.
+
+    *) Bugfix: SSL renegotiation on backend connections did not work when
+       using OpenSSL before 1.1.0.
+
+    *) Workaround: nginx could not be built with Oracle Developer Studio
+       12.5.
+
+    *) Workaround: now cache manager ignores long locked cache entries when
+       cleaning cache based on the "max_size" parameter.
+
+    *) Bugfix: client SSL connections were immediately closed if deferred
+       accept and the "proxy_protocol" parameter of the "listen" directive
+       were used.
+
+    *) Bugfix: in the "proxy_cache_background_update" directive.
+
+    *) Workaround: now the "tcp_nodelay" directive sets the TCP_NODELAY
+       option before an SSL handshake.
+
+
 Changes with nginx 1.13.0                                        25 Apr 2017
 
     *) Change: SSL renegotiation is now allowed on backend connections.
diff --git a/CHANGES.ru b/CHANGES.ru
index 0e2d1aa..d42b90f 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,33 @@
 
+Изменения в nginx 1.13.1                                          30.05.2017
+
+    *) Добавление: теперь в качестве параметра директивы set_real_ip_from
+       можно указывать имя хоста.
+
+    *) Добавление: улучшения в скриптах подсветки синтаксиса для vim.
+
+    *) Добавление: директива worker_cpu_affinity теперь работает на
+       DragonFly BSD.
+       Спасибо Sepherosa Ziehau.
+
+    *) Исправление: SSL renegotiation в соединениях к бэкендам не работал
+       при использовании OpenSSL до 1.1.0.
+
+    *) Изменение: nginx не собирался с Oracle Developer Studio 12.5.
+
+    *) Изменение: теперь cache manager пропускает заблокированные записи при
+       очистке кэша по max_size.
+
+    *) Исправление: клиентские SSL-соединения сразу закрывались, если
+       использовался отложенный accept и параметр proxy_protocol директивы
+       listen.
+
+    *) Исправление: в директиве proxy_cache_background_update.
+
+    *) Изменение: теперь директива tcp_nodelay устанавливает опцию
+       TCP_NODELAY перед SSL handshake.
+
+
 Изменения в nginx 1.13.0                                          25.04.2017
 
     *) Изменение: теперь SSL renegotiation допускается в соединениях к
diff --git a/auto/cc/conf b/auto/cc/conf
index b3b9f92..afbca62 100644
--- a/auto/cc/conf
+++ b/auto/cc/conf
@@ -178,21 +178,25 @@ if [ "$NGX_PLATFORM" != win32 ]; then
     fi
 
 
-    ngx_feature="gcc builtin atomic operations"
-    ngx_feature_name=NGX_HAVE_GCC_ATOMIC
-    ngx_feature_run=yes
-    ngx_feature_incs=
-    ngx_feature_path=
-    ngx_feature_libs=
-    ngx_feature_test="long  n = 0;
-                      if (!__sync_bool_compare_and_swap(&n, 0, 1))
-                          return 1;
-                      if (__sync_fetch_and_add(&n, 1) != 1)
-                          return 1;
-                      if (n != 2)
-                          return 1;
-                      __sync_synchronize();"
-    . auto/feature
+    if [ "$NGX_CC_NAME" = "sunc" ]; then
+        echo "checking for gcc builtin atomic operations ... disabled"
+    else
+        ngx_feature="gcc builtin atomic operations"
+        ngx_feature_name=NGX_HAVE_GCC_ATOMIC
+        ngx_feature_run=yes
+        ngx_feature_incs=
+        ngx_feature_path=
+        ngx_feature_libs=
+        ngx_feature_test="long  n = 0;
+                          if (!__sync_bool_compare_and_swap(&n, 0, 1))
+                              return 1;
+                          if (__sync_fetch_and_add(&n, 1) != 1)
+                              return 1;
+                          if (n != 2)
+                              return 1;
+                          __sync_synchronize();"
+        . auto/feature
+    fi
 
 
     if [ "$NGX_CC_NAME" = "ccc" ]; then
@@ -209,7 +213,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
                           var(0, buf, \"%d\", 1);
                           if (buf[0] != '1') return 1"
         . auto/feature
-     fi
+    fi
 
 
     ngx_feature="gcc variadic macros"
diff --git a/auto/cc/sunc b/auto/cc/sunc
index 806ccc4..552c2d3 100644
--- a/auto/cc/sunc
+++ b/auto/cc/sunc
@@ -8,7 +8,10 @@
 # Sun C 5.9 SunOS_i386 2007/05/03         Sun Studio 12
 # Sun C 5.9 SunOS_sparc 2007/05/03
 # Sun C 5.10 SunOS_i386 2009/06/03        Sun Studio 12.1
-# Sun C 5.11 SunOS_i386 2010/08/13        Sun Studio 12.2
+# Sun C 5.11 SunOS_i386 2010/08/13        Oracle Solaris Studio 12.2
+# Sun C 5.12 SunOS_i386 2011/11/16        Oracle Solaris Studio 12.3
+# Sun C 5.13 SunOS_i386 2014/10/20        Oracle Solaris Studio 12.4
+# Sun C 5.14 SunOS_i386 2016/05/31        Oracle Developer Studio 12.5
 
 NGX_SUNC_VER=`$CC -V 2>&1 | grep 'Sun C' 2>&1 \
                           | sed -e 's/^.* Sun C \(.*\)/\1/'`
diff --git a/auto/os/linux b/auto/os/linux
index fae8842..a0c8795 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -157,20 +157,6 @@ ngx_feature_test="if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1) return 1"
 . auto/feature
 
 
-# sched_setaffinity()
-
-ngx_feature="sched_setaffinity()"
-ngx_feature_name="NGX_HAVE_SCHED_SETAFFINITY"
-ngx_feature_run=no
-ngx_feature_incs="#include <sched.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="cpu_set_t mask;
-                  CPU_ZERO(&mask);
-                  sched_setaffinity(0, sizeof(cpu_set_t), &mask)"
-. auto/feature
-
-
 # crypt_r()
 
 ngx_feature="crypt_r()"
diff --git a/auto/unix b/auto/unix
index 52060fc..7c6a855 100644
--- a/auto/unix
+++ b/auto/unix
@@ -300,6 +300,18 @@ if [ $ngx_found = no ]; then
 fi
 
 
+ngx_feature="sched_setaffinity()"
+ngx_feature_name="NGX_HAVE_SCHED_SETAFFINITY"
+ngx_feature_run=no
+ngx_feature_incs="#include <sched.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="cpu_set_t mask;
+                  CPU_ZERO(&mask);
+                  sched_setaffinity(0, sizeof(cpu_set_t), &mask)"
+. auto/feature
+
+
 ngx_feature="SO_SETFIB"
 ngx_feature_name="NGX_HAVE_SETFIB"
 ngx_feature_run=no
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index a52891b..dc8c0cb 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -5,2115 +5,2145 @@ if exists("b:current_syntax")
   finish
 end
 
-setlocal iskeyword+=.
-setlocal iskeyword+=/
-setlocal iskeyword+=:
+" general syntax
 
-syn match ngxVariable '\$\(\w\+\|{\w\+}\)'
-syn match ngxVariableBlock '\$\(\w\+\|{\w\+}\)' contained
+if has("patch-7.4.1142")
+    " except control characters, ";", "{", and "}"
+    syn iskeyword 33-58,60-122,124,126-255
+endif
+
+syn match ngxName '\([^;{} \t\\]\|\\.\)\+'
+    \ contains=@ngxDirectives
+    \ nextgroup=@ngxParams skipwhite skipempty
+syn match ngxParam '\([^;{ \t\\]\|\\.\)\+'
+    \ contained
+    \ contains=ngxVariable
+    \ nextgroup=@ngxParams skipwhite skipempty
+syn region ngxString start=+\z(["']\)+ end=+\z1+ skip=+\\\\\|\\\z1+
+    \ contains=ngxVariableString
+    \ nextgroup=@ngxParams skipwhite skipempty
+syn match ngxParamComment '#.*$'
+    \ nextgroup=@ngxParams skipwhite skipempty
+syn match ngxSemicolon ';' contained
+syn region ngxBlock start=+{+ end=+}+ contained
+    \ contains=@ngxTopLevel
+syn match ngxComment '#.*$'
+
+syn match ngxVariable '\$\w\+' contained
 syn match ngxVariableString '\$\(\w\+\|{\w\+}\)' contained
-syn region ngxBlock start=+^+ end=+{+ skip=+\${+ contains=ngxComment,ngxDirectiveBlock,ngxVariableBlock,ngxString oneline
-syn region ngxString start=+[^:a-zA-Z>!\\@]\z(["']\)+lc=1 end=+\z1+ skip=+\\\\\|\\\z1+ contains=ngxVariableString
-syn match ngxComment ' *#.*$'
 
-syn keyword ngxBoolean on
-syn keyword ngxBoolean off
+syn cluster ngxTopLevel
+    \ contains=ngxName,ngxString,ngxComment
+syn cluster ngxDirectives
+    \ contains=ngxDirective,ngxDirectiveBlock,ngxDirectiveImportant
+    \ add=ngxDirectiveControl,ngxDirectiveError,ngxDirectiveDeprecated
+    \ add=ngxDirectiveThirdParty
+syn cluster ngxParams
+    \ contains=ngxParam,ngxString,ngxParamComment,ngxSemicolon,ngxBlock
 
-syn keyword ngxDirectiveBlock http         contained
-syn keyword ngxDirectiveBlock mail         contained
-syn keyword ngxDirectiveBlock events       contained
-syn keyword ngxDirectiveBlock server       contained
-syn keyword ngxDirectiveBlock types        contained
-syn keyword ngxDirectiveBlock location     contained
-syn keyword ngxDirectiveBlock upstream     contained
-syn keyword ngxDirectiveBlock charset_map  contained
-syn keyword ngxDirectiveBlock limit_except contained
-syn keyword ngxDirectiveBlock if           contained
-syn keyword ngxDirectiveBlock geo          contained
-syn keyword ngxDirectiveBlock map          contained
-syn keyword ngxDirectiveBlock split_clients contained
+" boolean parameters
 
-syn keyword ngxDirectiveImportant include
-syn keyword ngxDirectiveImportant root
-syn keyword ngxDirectiveImportant server
-syn keyword ngxDirectiveImportant server_name
-syn keyword ngxDirectiveImportant listen contained
-syn region  ngxDirectiveImportantListen matchgroup=ngxDirectiveImportant start=+listen+ skip=+\\\\\|\\\;+ end=+;+he=e-1 contains=ngxListenOptions,ngxString
-syn keyword ngxDirectiveImportant internal
-syn keyword ngxDirectiveImportant proxy_pass
-syn keyword ngxDirectiveImportant memcached_pass
-syn keyword ngxDirectiveImportant fastcgi_pass
-syn keyword ngxDirectiveImportant scgi_pass
-syn keyword ngxDirectiveImportant uwsgi_pass
-syn keyword ngxDirectiveImportant try_files
+syn keyword ngxBoolean contained on off
+    \ nextgroup=@ngxParams skipwhite skipempty
+syn cluster ngxParams add=ngxBoolean
 
-syn keyword ngxListenOptions default_server contained
-syn keyword ngxListenOptions ssl            contained
-syn keyword ngxListenOptions http2          contained
-syn keyword ngxListenOptions spdy           contained
-syn keyword ngxListenOptions proxy_protocol contained
-syn keyword ngxListenOptions setfib         contained
-syn keyword ngxListenOptions fastopen       contained
-syn keyword ngxListenOptions backlog        contained
-syn keyword ngxListenOptions rcvbuf         contained
-syn keyword ngxListenOptions sndbuf         contained
-syn keyword ngxListenOptions accept_filter  contained
-syn keyword ngxListenOptions deferred       contained
-syn keyword ngxListenOptions bind           contained
-syn keyword ngxListenOptions ipv6only       contained
-syn keyword ngxListenOptions reuseport      contained
-syn keyword ngxListenOptions so_keepalive   contained
-syn keyword ngxListenOptions keepidle       contained
+" listen directive
 
-syn keyword ngxDirectiveControl break
-syn keyword ngxDirectiveControl return
-syn keyword ngxDirectiveControl rewrite
-syn keyword ngxDirectiveControl set
+syn cluster ngxTopLevel add=ngxDirectiveListen
+syn keyword ngxDirectiveListen listen
+    \ nextgroup=@ngxListenParams skipwhite skipempty
+syn match ngxListenParam '\([^;{ \t\\]\|\\.\)\+'
+    \ contained
+    \ nextgroup=@ngxListenParams skipwhite skipempty
+syn region ngxListenString start=+\z(["']\)+ end=+\z1+ skip=+\\\\\|\\\z1+
+    \ contained
+    \ nextgroup=@ngxListenParams skipwhite skipempty
+syn match ngxListenComment '#.*$'
+    \ contained
+    \ nextgroup=@ngxListenParams skipwhite skipempty
+syn keyword ngxListenOptions contained
+    \ default_server ssl http2 spdy proxy_protocol
+    \ setfib fastopen backlog rcvbuf sndbuf accept_filter deferred bind
+    \ ipv6only reuseport so_keepalive keepidle
+    \ nextgroup=@ngxListenParams skipwhite skipempty
+syn cluster ngxListenParams
+    \ contains=ngxListenParam,ngxListenString,ngxListenComment
+    \ add=ngxListenOptions
 
-syn keyword ngxDirectiveError error_page
-syn keyword ngxDirectiveError post_action
+syn keyword ngxDirectiveBlock contained http
+syn keyword ngxDirectiveBlock contained mail
+syn keyword ngxDirectiveBlock contained events
+syn keyword ngxDirectiveBlock contained server
+syn keyword ngxDirectiveBlock contained types
+syn keyword ngxDirectiveBlock contained location
+syn keyword ngxDirectiveBlock contained upstream
+syn keyword ngxDirectiveBlock contained charset_map
+syn keyword ngxDirectiveBlock contained limit_except
+syn keyword ngxDirectiveBlock contained if
+syn keyword ngxDirectiveBlock contained geo
+syn keyword ngxDirectiveBlock contained map
+syn keyword ngxDirectiveBlock contained split_clients
 
-syn keyword ngxDirectiveDeprecated connections
-syn keyword ngxDirectiveDeprecated imap
-syn keyword ngxDirectiveDeprecated limit_zone
-syn keyword ngxDirectiveDeprecated mysql_test
-syn keyword ngxDirectiveDeprecated open_file_cache_retest
-syn keyword ngxDirectiveDeprecated optimize_server_names
-syn keyword ngxDirectiveDeprecated satisfy_any
-syn keyword ngxDirectiveDeprecated so_keepalive
+syn keyword ngxDirectiveImportant contained include
+syn keyword ngxDirectiveImportant contained root
+"syn keyword ngxDirectiveImportant contained server
+syn keyword ngxDirectiveImportant contained server_name
+"syn keyword ngxDirectiveImportant contained listen
+syn keyword ngxDirectiveImportant contained internal
+syn keyword ngxDirectiveImportant contained proxy_pass
+syn keyword ngxDirectiveImportant contained memcached_pass
+syn keyword ngxDirectiveImportant contained fastcgi_pass
+syn keyword ngxDirectiveImportant contained scgi_pass
+syn keyword ngxDirectiveImportant contained uwsgi_pass
+syn keyword ngxDirectiveImportant contained try_files
 
-syn keyword ngxDirective absolute_redirect
-syn keyword ngxDirective accept_mutex
-syn keyword ngxDirective accept_mutex_delay
-syn keyword ngxDirective acceptex_read
-syn keyword ngxDirective access_log
-syn keyword ngxDirective add_after_body
-syn keyword ngxDirective add_before_body
-syn keyword ngxDirective add_header
-syn keyword ngxDirective addition_types
-syn keyword ngxDirective aio
-syn keyword ngxDirective aio_write
-syn keyword ngxDirective alias
-syn keyword ngxDirective allow
-syn keyword ngxDirective ancient_browser
-syn keyword ngxDirective ancient_browser_value
-syn keyword ngxDirective auth_basic
-syn keyword ngxDirective auth_basic_user_file
-syn keyword ngxDirective auth_http
-syn keyword ngxDirective auth_http_header
-syn keyword ngxDirective auth_http_pass_client_cert
-syn keyword ngxDirective auth_http_timeout
-syn keyword ngxDirective auth_jwt
-syn keyword ngxDirective auth_jwt_key_file
-syn keyword ngxDirective auth_request
-syn keyword ngxDirective auth_request_set
-syn keyword ngxDirective autoindex
-syn keyword ngxDirective autoindex_exact_size
-syn keyword ngxDirective autoindex_format
-syn keyword ngxDirective autoindex_localtime
-syn keyword ngxDirective charset
-syn keyword ngxDirective charset_map
-syn keyword ngxDirective charset_types
-syn keyword ngxDirective chunked_transfer_encoding
-syn keyword ngxDirective client_body_buffer_size
-syn keyword ngxDirective client_body_in_file_only
-syn keyword ngxDirective client_body_in_single_buffer
-syn keyword ngxDirective client_body_temp_path
-syn keyword ngxDirective client_body_timeout
-syn keyword ngxDirective client_header_buffer_size
-syn keyword ngxDirective client_header_timeout
-syn keyword ngxDirective client_max_body_size
-syn keyword ngxDirective connection_pool_size
-syn keyword ngxDirective create_full_put_path
-syn keyword ngxDirective daemon
-syn keyword ngxDirective dav_access
-syn keyword ngxDirective dav_methods
-syn keyword ngxDirective debug_connection
-syn keyword ngxDirective debug_points
-syn keyword ngxDirective default_type
-syn keyword ngxDirective degradation
-syn keyword ngxDirective degrade
-syn keyword ngxDirective deny
-syn keyword ngxDirective devpoll_changes
-syn keyword ngxDirective devpoll_events
-syn keyword ngxDirective directio
-syn keyword ngxDirective directio_alignment
-syn keyword ngxDirective disable_symlinks
-syn keyword ngxDirective empty_gif
-syn keyword ngxDirective env
-syn keyword ngxDirective epoll_events
-syn keyword ngxDirective error_log
-syn keyword ngxDirective etag
-syn keyword ngxDirective eventport_events
-syn keyword ngxDirective expires
-syn keyword ngxDirective f4f
-syn keyword ngxDirective f4f_buffer_size
-syn keyword ngxDirective fastcgi_bind
-syn keyword ngxDirective fastcgi_buffer_size
-syn keyword ngxDirective fastcgi_buffering
-syn keyword ngxDirective fastcgi_buffers
-syn keyword ngxDirective fastcgi_busy_buffers_size
-syn keyword ngxDirective fastcgi_cache
-syn keyword ngxDirective fastcgi_cache_bypass
-syn keyword ngxDirective fastcgi_cache_key
-syn keyword ngxDirective fastcgi_cache_lock
-syn keyword ngxDirective fastcgi_cache_lock_age
-syn keyword ngxDirective fastcgi_cache_lock_timeout
-syn keyword ngxDirective fastcgi_cache_max_range_offset
-syn keyword ngxDirective fastcgi_cache_methods
-syn keyword ngxDirective fastcgi_cache_min_uses
-syn keyword ngxDirective fastcgi_cache_path
-syn keyword ngxDirective fastcgi_cache_purge
-syn keyword ngxDirective fastcgi_cache_revalidate
-syn keyword ngxDirective fastcgi_cache_use_stale
-syn keyword ngxDirective fastcgi_cache_valid
-syn keyword ngxDirective fastcgi_catch_stderr
-syn keyword ngxDirective fastcgi_connect_timeout
-syn keyword ngxDirective fastcgi_force_ranges
-syn keyword ngxDirective fastcgi_hide_header
-syn keyword ngxDirective fastcgi_ignore_client_abort
-syn keyword ngxDirective fastcgi_ignore_headers
-syn keyword ngxDirective fastcgi_index
-syn keyword ngxDirective fastcgi_intercept_errors
-syn keyword ngxDirective fastcgi_keep_conn
-syn keyword ngxDirective fastcgi_limit_rate
-syn keyword ngxDirective fastcgi_max_temp_file_size
-syn keyword ngxDirective fastcgi_next_upstream
-syn keyword ngxDirective fastcgi_next_upstream_timeout
-syn keyword ngxDirective fastcgi_next_upstream_tries
-syn keyword ngxDirective fastcgi_no_cache
-syn keyword ngxDirective fastcgi_param
-syn keyword ngxDirective fastcgi_pass_header
-syn keyword ngxDirective fastcgi_pass_request_body
-syn keyword ngxDirective fastcgi_pass_request_headers
-syn keyword ngxDirective fastcgi_read_timeout
-syn keyword ngxDirective fastcgi_request_buffering
-syn keyword ngxDirective fastcgi_send_lowat
-syn keyword ngxDirective fastcgi_send_timeout
-syn keyword ngxDirective fastcgi_split_path_info
-syn keyword ngxDirective fastcgi_store
-syn keyword ngxDirective fastcgi_store_access
-syn keyword ngxDirective fastcgi_temp_file_write_size
-syn keyword ngxDirective fastcgi_temp_path
-syn keyword ngxDirective flv
-syn keyword ngxDirective geoip_city
-syn keyword ngxDirective geoip_country
-syn keyword ngxDirective geoip_org
-syn keyword ngxDirective geoip_proxy
-syn keyword ngxDirective geoip_proxy_recursive
-syn keyword ngxDirective google_perftools_profiles
-syn keyword ngxDirective gunzip
-syn keyword ngxDirective gunzip_buffers
-syn keyword ngxDirective gzip
-syn keyword ngxDirective gzip_buffers
-syn keyword ngxDirective gzip_comp_level
-syn keyword ngxDirective gzip_disable
-syn keyword ngxDirective gzip_hash
-syn keyword ngxDirective gzip_http_version
-syn keyword ngxDirective gzip_min_length
-syn keyword ngxDirective gzip_no_buffer
-syn keyword ngxDirective gzip_proxied
-syn keyword ngxDirective gzip_static
-syn keyword ngxDirective gzip_types
-syn keyword ngxDirective gzip_vary
-syn keyword ngxDirective gzip_window
-syn keyword ngxDirective hash
-syn keyword ngxDirective health_check
-syn keyword ngxDirective health_check_timeout
-syn keyword ngxDirective hls
-syn keyword ngxDirective hls_buffers
-syn keyword ngxDirective hls_forward_args
-syn keyword ngxDirective hls_fragment
-syn keyword ngxDirective hls_mp4_buffer_size
-syn keyword ngxDirective hls_mp4_max_buffer_size
-syn keyword ngxDirective http2_chunk_size
-syn keyword ngxDirective http2_body_preread_size
-syn keyword ngxDirective http2_idle_timeout
-syn keyword ngxDirective http2_max_concurrent_streams
-syn keyword ngxDirective http2_max_field_size
-syn keyword ngxDirective http2_max_header_size
-syn keyword ngxDirective http2_max_requests
-syn keyword ngxDirective http2_recv_buffer_size
-syn keyword ngxDirective http2_recv_timeout
-syn keyword ngxDirective if_modified_since
-syn keyword ngxDirective ignore_invalid_headers
-syn keyword ngxDirective image_filter
-syn keyword ngxDirective image_filter_buffer
-syn keyword ngxDirective image_filter_interlace
-syn keyword ngxDirective image_filter_jpeg_quality
-syn keyword ngxDirective image_filter_sharpen
-syn keyword ngxDirective image_filter_transparency
-syn keyword ngxDirective image_filter_webp_quality
-syn keyword ngxDirective imap_auth
-syn keyword ngxDirective imap_capabilities
-syn keyword ngxDirective imap_client_buffer
-syn keyword ngxDirective index
-syn keyword ngxDirective iocp_threads
-syn keyword ngxDirective ip_hash
-syn keyword ngxDirective js_access
-syn keyword ngxDirective js_content
-syn keyword ngxDirective js_filter
-syn keyword ngxDirective js_include
-syn keyword ngxDirective js_preread
-syn keyword ngxDirective js_set
-syn keyword ngxDirective keepalive
-syn keyword ngxDirective keepalive_disable
-syn keyword ngxDirective keepalive_requests
-syn keyword ngxDirective keepalive_timeout
-syn keyword ngxDirective kqueue_changes
-syn keyword ngxDirective kqueue_events
-syn keyword ngxDirective large_client_header_buffers
-syn keyword ngxDirective least_conn
-syn keyword ngxDirective least_time
-syn keyword ngxDirective limit_conn
-syn keyword ngxDirective limit_conn_log_level
-syn keyword ngxDirective limit_conn_status
-syn keyword ngxDirective limit_conn_zone
-syn keyword ngxDirective limit_rate
-syn keyword ngxDirective limit_rate_after
-syn keyword ngxDirective limit_req
-syn keyword ngxDirective limit_req_log_level
-syn keyword ngxDirective limit_req_status
-syn keyword ngxDirective limit_req_zone
-syn keyword ngxDirective lingering_close
-syn keyword ngxDirective lingering_time
-syn keyword ngxDirective lingering_timeout
-syn keyword ngxDirective load_module
-syn keyword ngxDirective lock_file
-syn keyword ngxDirective log_format
-syn keyword ngxDirective log_not_found
-syn keyword ngxDirective log_subrequest
-syn keyword ngxDirective map_hash_bucket_size
-syn keyword ngxDirective map_hash_max_size
-syn keyword ngxDirective match
-syn keyword ngxDirective master_process
-syn keyword ngxDirective max_ranges
-syn keyword ngxDirective memcached_bind
-syn keyword ngxDirective memcached_buffer_size
-syn keyword ngxDirective memcached_connect_timeout
-syn keyword ngxDirective memcached_force_ranges
-syn keyword ngxDirective memcached_gzip_flag
-syn keyword ngxDirective memcached_next_upstream
-syn keyword ngxDirective memcached_next_upstream_timeout
-syn keyword ngxDirective memcached_next_upstream_tries
-syn keyword ngxDirective memcached_read_timeout
-syn keyword ngxDirective memcached_send_timeout
-syn keyword ngxDirective merge_slashes
-syn keyword ngxDirective min_delete_depth
-syn keyword ngxDirective modern_browser
-syn keyword ngxDirective modern_browser_value
-syn keyword ngxDirective mp4
-syn keyword ngxDirective mp4_buffer_size
-syn keyword ngxDirective mp4_max_buffer_size
-syn keyword ngxDirective mp4_limit_rate
-syn keyword ngxDirective mp4_limit_rate_after
-syn keyword ngxDirective msie_padding
-syn keyword ngxDirective msie_refresh
-syn keyword ngxDirective multi_accept
-syn keyword ngxDirective ntlm
-syn keyword ngxDirective open_file_cache
-syn keyword ngxDirective open_file_cache_errors
-syn keyword ngxDirective open_file_cache_events
-syn keyword ngxDirective open_file_cache_min_uses
-syn keyword ngxDirective open_file_cache_valid
-syn keyword ngxDirective open_log_file_cache
-syn keyword ngxDirective output_buffers
-syn keyword ngxDirective override_charset
-syn keyword ngxDirective pcre_jit
-syn keyword ngxDirective perl
-syn keyword ngxDirective perl_modules
-syn keyword ngxDirective perl_require
-syn keyword ngxDirective perl_set
-syn keyword ngxDirective pid
-syn keyword ngxDirective pop3_auth
-syn keyword ngxDirective pop3_capabilities
-syn keyword ngxDirective port_in_redirect
-syn keyword ngxDirective post_acceptex
-syn keyword ngxDirective postpone_gzipping
-syn keyword ngxDirective postpone_output
-syn keyword ngxDirective preread_buffer_size
-syn keyword ngxDirective preread_timeout
-syn keyword ngxDirective protocol nextgroup=ngxMailProtocol skipwhite
-syn keyword ngxMailProtocol imap pop3 smtp contained
-syn keyword ngxDirective proxy
-syn keyword ngxDirective proxy_bind
-syn keyword ngxDirective proxy_buffer
-syn keyword ngxDirective proxy_buffer_size
-syn keyword ngxDirective proxy_buffering
-syn keyword ngxDirective proxy_buffers
-syn keyword ngxDirective proxy_busy_buffers_size
-syn keyword ngxDirective proxy_cache
-syn keyword ngxDirective proxy_cache_bypass
-syn keyword ngxDirective proxy_cache_convert_head
-syn keyword ngxDirective proxy_cache_key
-syn keyword ngxDirective proxy_cache_lock
-syn keyword ngxDirective proxy_cache_lock_age
-syn keyword ngxDirective proxy_cache_lock_timeout
-syn keyword ngxDirective proxy_cache_max_range_offset
-syn keyword ngxDirective proxy_cache_methods
-syn keyword ngxDirective proxy_cache_min_uses
-syn keyword ngxDirective proxy_cache_path
-syn keyword ngxDirective proxy_cache_purge
-syn keyword ngxDirective proxy_cache_revalidate
-syn keyword ngxDirective proxy_cache_use_stale
-syn keyword ngxDirective proxy_cache_valid
-syn keyword ngxDirective proxy_connect_timeout
-syn keyword ngxDirective proxy_cookie_domain
-syn keyword ngxDirective proxy_cookie_path
-syn keyword ngxDirective proxy_download_rate
-syn keyword ngxDirective proxy_force_ranges
-syn keyword ngxDirective proxy_headers_hash_bucket_size
-syn keyword ngxDirective proxy_headers_hash_max_size
-syn keyword ngxDirective proxy_hide_header
-syn keyword ngxDirective proxy_http_version
-syn keyword ngxDirective proxy_ignore_client_abort
-syn keyword ngxDirective proxy_ignore_headers
-syn keyword ngxDirective proxy_intercept_errors
-syn keyword ngxDirective proxy_limit_rate
-syn keyword ngxDirective proxy_max_temp_file_size
-syn keyword ngxDirective proxy_method
-syn keyword ngxDirective proxy_next_upstream
-syn keyword ngxDirective proxy_next_upstream_timeout
-syn keyword ngxDirective proxy_next_upstream_tries
-syn keyword ngxDirective proxy_no_cache
-syn keyword ngxDirective proxy_pass_error_message
-syn keyword ngxDirective proxy_pass_header
-syn keyword ngxDirective proxy_pass_request_body
-syn keyword ngxDirective proxy_pass_request_headers
-syn keyword ngxDirective proxy_protocol
-syn keyword ngxDirective proxy_protocol_timeout
-syn keyword ngxDirective proxy_read_timeout
-syn keyword ngxDirective proxy_redirect
-syn keyword ngxDirective proxy_request_buffering
-syn keyword ngxDirective proxy_responses
-syn keyword ngxDirective proxy_send_lowat
-syn keyword ngxDirective proxy_send_timeout
-syn keyword ngxDirective proxy_set_body
-syn keyword ngxDirective proxy_set_header
-syn keyword ngxDirective proxy_ssl_certificate
-syn keyword ngxDirective proxy_ssl_certificate_key
-syn keyword ngxDirective proxy_ssl_ciphers
-syn keyword ngxDirective proxy_ssl_crl
-syn keyword ngxDirective proxy_ssl_name
-syn keyword ngxDirective proxy_ssl_password_file
-syn keyword ngxDirective proxy_ssl_protocols nextgroup=ngxSSLProtocol skipwhite
-syn keyword ngxDirective proxy_ssl_server_name
-syn keyword ngxDirective proxy_ssl_session_reuse
-syn keyword ngxDirective proxy_ssl_trusted_certificate
-syn keyword ngxDirective proxy_ssl_verify
-syn keyword ngxDirective proxy_ssl_verify_depth
-syn keyword ngxDirective proxy_store
-syn keyword ngxDirective proxy_store_access
-syn keyword ngxDirective proxy_temp_file_write_size
-syn keyword ngxDirective proxy_temp_path
-syn keyword ngxDirective proxy_timeout
-syn keyword ngxDirective proxy_upload_rate
-syn keyword ngxDirective queue
-syn keyword ngxDirective random_index
-syn keyword ngxDirective read_ahead
-syn keyword ngxDirective real_ip_header
-syn keyword ngxDirective real_ip_recursive
-syn keyword ngxDirective recursive_error_pages
-syn keyword ngxDirective referer_hash_bucket_size
-syn keyword ngxDirective referer_hash_max_size
-syn keyword ngxDirective request_pool_size
-syn keyword ngxDirective reset_timedout_connection
-syn keyword ngxDirective resolver
-syn keyword ngxDirective resolver_timeout
-syn keyword ngxDirective rewrite_log
-syn keyword ngxDirective rtsig_overflow_events
-syn keyword ngxDirective rtsig_overflow_test
-syn keyword ngxDirective rtsig_overflow_threshold
-syn keyword ngxDirective rtsig_signo
-syn keyword ngxDirective satisfy
-syn keyword ngxDirective scgi_bind
-syn keyword ngxDirective scgi_buffer_size
-syn keyword ngxDirective scgi_buffering
-syn keyword ngxDirective scgi_buffers
-syn keyword ngxDirective scgi_busy_buffers_size
-syn keyword ngxDirective scgi_cache
-syn keyword ngxDirective scgi_cache_bypass
-syn keyword ngxDirective scgi_cache_key
-syn keyword ngxDirective scgi_cache_lock
-syn keyword ngxDirective scgi_cache_lock_age
-syn keyword ngxDirective scgi_cache_lock_timeout
-syn keyword ngxDirective scgi_cache_max_range_offset
-syn keyword ngxDirective scgi_cache_methods
-syn keyword ngxDirective scgi_cache_min_uses
-syn keyword ngxDirective scgi_cache_path
-syn keyword ngxDirective scgi_cache_purge
-syn keyword ngxDirective scgi_cache_revalidate
-syn keyword ngxDirective scgi_cache_use_stale
-syn keyword ngxDirective scgi_cache_valid
-syn keyword ngxDirective scgi_connect_timeout
-syn keyword ngxDirective scgi_force_ranges
-syn keyword ngxDirective scgi_hide_header
-syn keyword ngxDirective scgi_ignore_client_abort
-syn keyword ngxDirective scgi_ignore_headers
-syn keyword ngxDirective scgi_intercept_errors
-syn keyword ngxDirective scgi_limit_rate
-syn keyword ngxDirective scgi_max_temp_file_size
-syn keyword ngxDirective scgi_next_upstream
-syn keyword ngxDirective scgi_next_upstream_timeout
-syn keyword ngxDirective scgi_next_upstream_tries
-syn keyword ngxDirective scgi_no_cache
-syn keyword ngxDirective scgi_param
-syn keyword ngxDirective scgi_pass_header
-syn keyword ngxDirective scgi_pass_request_body
-syn keyword ngxDirective scgi_pass_request_headers
-syn keyword ngxDirective scgi_read_timeout
-syn keyword ngxDirective scgi_request_buffering
-syn keyword ngxDirective scgi_send_timeout
-syn keyword ngxDirective scgi_store
-syn keyword ngxDirective scgi_store_access
-syn keyword ngxDirective scgi_temp_file_write_size
-syn keyword ngxDirective scgi_temp_path
-syn keyword ngxDirective secure_link
-syn keyword ngxDirective secure_link_md5
-syn keyword ngxDirective secure_link_secret
-syn keyword ngxDirective send_lowat
-syn keyword ngxDirective send_timeout
-syn keyword ngxDirective sendfile
-syn keyword ngxDirective sendfile_max_chunk
-syn keyword ngxDirective server_name_in_redirect
-syn keyword ngxDirective server_names_hash_bucket_size
-syn keyword ngxDirective server_names_hash_max_size
-syn keyword ngxDirective server_tokens
-syn keyword ngxDirective session_log
-syn keyword ngxDirective session_log_format
-syn keyword ngxDirective session_log_zone
-syn keyword ngxDirective set_real_ip_from
-syn keyword ngxDirective slice
-syn keyword ngxDirective smtp_auth
-syn keyword ngxDirective smtp_capabilities
-syn keyword ngxDirective smtp_client_buffer
-syn keyword ngxDirective smtp_greeting_delay
-syn keyword ngxDirective source_charset
-syn keyword ngxDirective spdy_chunk_size
-syn keyword ngxDirective spdy_headers_comp
-syn keyword ngxDirective spdy_keepalive_timeout
-syn keyword ngxDirective spdy_max_concurrent_streams
-syn keyword ngxDirective spdy_pool_size
-syn keyword ngxDirective spdy_recv_buffer_size
-syn keyword ngxDirective spdy_recv_timeout
-syn keyword ngxDirective spdy_streams_index_size
-syn keyword ngxDirective ssi
-syn keyword ngxDirective ssi_ignore_recycled_buffers
-syn keyword ngxDirective ssi_last_modified
-syn keyword ngxDirective ssi_min_file_chunk
-syn keyword ngxDirective ssi_silent_errors
-syn keyword ngxDirective ssi_types
-syn keyword ngxDirective ssi_value_length
-syn keyword ngxDirective ssl
-syn keyword ngxDirective ssl_buffer_size
-syn keyword ngxDirective ssl_certificate
-syn keyword ngxDirective ssl_certificate_key
-syn keyword ngxDirective ssl_ciphers
-syn keyword ngxDirective ssl_client_certificate
-syn keyword ngxDirective ssl_crl
-syn keyword ngxDirective ssl_dhparam
-syn keyword ngxDirective ssl_ecdh_curve
-syn keyword ngxDirective ssl_engine
-syn keyword ngxDirective ssl_handshake_timeout
-syn keyword ngxDirective ssl_password_file
-syn keyword ngxDirective ssl_prefer_server_ciphers
-syn keyword ngxDirective ssl_preread
-syn keyword ngxDirective ssl_protocols nextgroup=ngxSSLProtocol skipwhite
-syn keyword ngxSSLProtocol SSLv2 SSLv3 TLSv1 TLSv1.1 TLSv1.2 contained nextgroup=ngxSSLProtocol skipwhite
-syn keyword ngxDirective ssl_session_cache
-syn keyword ngxDirective ssl_session_ticket_key
-syn keyword ngxDirective ssl_session_tickets
-syn keyword ngxDirective ssl_session_timeout
-syn keyword ngxDirective ssl_stapling
-syn keyword ngxDirective ssl_stapling_file
-syn keyword ngxDirective ssl_stapling_responder
-syn keyword ngxDirective ssl_stapling_verify
-syn keyword ngxDirective ssl_trusted_certificate
-syn keyword ngxDirective ssl_verify_client
-syn keyword ngxDirective ssl_verify_depth
-syn keyword ngxDirective starttls
-syn keyword ngxDirective state
-syn keyword ngxDirective status
-syn keyword ngxDirective status_format
-syn keyword ngxDirective status_zone
-syn keyword ngxDirective sticky
-syn keyword ngxDirective sticky_cookie_insert
-syn keyword ngxDirective stub_status
-syn keyword ngxDirective sub_filter
-syn keyword ngxDirective sub_filter_last_modified
-syn keyword ngxDirective sub_filter_once
-syn keyword ngxDirective sub_filter_types
-syn keyword ngxDirective tcp_nodelay
-syn keyword ngxDirective tcp_nopush
-syn keyword ngxDirective thread_pool
-syn keyword ngxDirective thread_stack_size
-syn keyword ngxDirective timeout
-syn keyword ngxDirective timer_resolution
-syn keyword ngxDirective types_hash_bucket_size
-syn keyword ngxDirective types_hash_max_size
-syn keyword ngxDirective underscores_in_headers
-syn keyword ngxDirective uninitialized_variable_warn
-syn keyword ngxDirective upstream_conf
-syn keyword ngxDirective use
-syn keyword ngxDirective user
-syn keyword ngxDirective userid
-syn keyword ngxDirective userid_domain
-syn keyword ngxDirective userid_expires
-syn keyword ngxDirective userid_mark
-syn keyword ngxDirective userid_name
-syn keyword ngxDirective userid_p3p
-syn keyword ngxDirective userid_path
-syn keyword ngxDirective userid_service
-syn keyword ngxDirective uwsgi_bind
-syn keyword ngxDirective uwsgi_buffer_size
-syn keyword ngxDirective uwsgi_buffering
-syn keyword ngxDirective uwsgi_buffers
-syn keyword ngxDirective uwsgi_busy_buffers_size
-syn keyword ngxDirective uwsgi_cache
-syn keyword ngxDirective uwsgi_cache_bypass
-syn keyword ngxDirective uwsgi_cache_key
-syn keyword ngxDirective uwsgi_cache_lock
-syn keyword ngxDirective uwsgi_cache_lock_age
-syn keyword ngxDirective uwsgi_cache_lock_timeout
-syn keyword ngxDirective uwsgi_cache_methods
-syn keyword ngxDirective uwsgi_cache_min_uses
-syn keyword ngxDirective uwsgi_cache_path
-syn keyword ngxDirective uwsgi_cache_purge
-syn keyword ngxDirective uwsgi_cache_revalidate
-syn keyword ngxDirective uwsgi_cache_use_stale
-syn keyword ngxDirective uwsgi_cache_valid
-syn keyword ngxDirective uwsgi_connect_timeout
-syn keyword ngxDirective uwsgi_force_ranges
-syn keyword ngxDirective uwsgi_hide_header
-syn keyword ngxDirective uwsgi_ignore_client_abort
-syn keyword ngxDirective uwsgi_ignore_headers
-syn keyword ngxDirective uwsgi_intercept_errors
-syn keyword ngxDirective uwsgi_limit_rate
-syn keyword ngxDirective uwsgi_max_temp_file_size
-syn keyword ngxDirective uwsgi_modifier1
-syn keyword ngxDirective uwsgi_modifier2
-syn keyword ngxDirective uwsgi_next_upstream
-syn keyword ngxDirective uwsgi_next_upstream_timeout
-syn keyword ngxDirective uwsgi_next_upstream_tries
-syn keyword ngxDirective uwsgi_no_cache
-syn keyword ngxDirective uwsgi_param
-syn keyword ngxDirective uwsgi_pass
-syn keyword ngxDirective uwsgi_pass_header
-syn keyword ngxDirective uwsgi_pass_request_body
-syn keyword ngxDirective uwsgi_pass_request_headers
-syn keyword ngxDirective uwsgi_read_timeout
-syn keyword ngxDirective uwsgi_request_buffering
-syn keyword ngxDirective uwsgi_send_timeout
-syn keyword ngxDirective uwsgi_ssl_certificate
-syn keyword ngxDirective uwsgi_ssl_certificate_key
-syn keyword ngxDirective uwsgi_ssl_ciphers
-syn keyword ngxDirective uwsgi_ssl_crl
-syn keyword ngxDirective uwsgi_ssl_name
-syn keyword ngxDirective uwsgi_ssl_password_file
-syn keyword ngxDirective uwsgi_ssl_protocols nextgroup=ngxSSLProtocol skipwhite
-syn keyword ngxDirective uwsgi_ssl_server_name
-syn keyword ngxDirective uwsgi_ssl_session_reuse
-syn keyword ngxDirective uwsgi_ssl_trusted_certificate
-syn keyword ngxDirective uwsgi_ssl_verify
-syn keyword ngxDirective uwsgi_ssl_verify_depth
-syn keyword ngxDirective uwsgi_store
-syn keyword ngxDirective uwsgi_store_access
-syn keyword ngxDirective uwsgi_string
-syn keyword ngxDirective uwsgi_temp_file_write_size
-syn keyword ngxDirective uwsgi_temp_path
-syn keyword ngxDirective valid_referers
-syn keyword ngxDirective variables_hash_bucket_size
-syn keyword ngxDirective variables_hash_max_size
-syn keyword ngxDirective worker_aio_requests
-syn keyword ngxDirective worker_connections
-syn keyword ngxDirective worker_cpu_affinity
-syn keyword ngxDirective worker_priority
-syn keyword ngxDirective worker_processes
-syn keyword ngxDirective worker_rlimit_core
-syn keyword ngxDirective worker_rlimit_nofile
-syn keyword ngxDirective worker_rlimit_sigpending
-syn keyword ngxDirective worker_threads
-syn keyword ngxDirective working_directory
-syn keyword ngxDirective xclient
-syn keyword ngxDirective xml_entities
-syn keyword ngxDirective xslt_last_modified
-syn keyword ngxDirective xslt_param
-syn keyword ngxDirective xslt_string_param
-syn keyword ngxDirective xslt_stylesheet
-syn keyword ngxDirective xslt_types
-syn keyword ngxDirective zone
+syn keyword ngxDirectiveControl contained break
+syn keyword ngxDirectiveControl contained return
+syn keyword ngxDirectiveControl contained rewrite
+syn keyword ngxDirectiveControl contained set
+
+syn keyword ngxDirectiveError contained error_page
+syn keyword ngxDirectiveError contained post_action
+
+syn keyword ngxDirectiveDeprecated contained connections
+syn keyword ngxDirectiveDeprecated contained imap
+syn keyword ngxDirectiveDeprecated contained limit_zone
+syn keyword ngxDirectiveDeprecated contained mysql_test
+syn keyword ngxDirectiveDeprecated contained open_file_cache_retest
+syn keyword ngxDirectiveDeprecated contained optimize_server_names
+syn keyword ngxDirectiveDeprecated contained satisfy_any
+syn keyword ngxDirectiveDeprecated contained so_keepalive
+
+syn keyword ngxDirective contained absolute_redirect
+syn keyword ngxDirective contained accept_mutex
+syn keyword ngxDirective contained accept_mutex_delay
+syn keyword ngxDirective contained acceptex_read
+syn keyword ngxDirective contained access_log
+syn keyword ngxDirective contained add_after_body
+syn keyword ngxDirective contained add_before_body
+syn keyword ngxDirective contained add_header
+syn keyword ngxDirective contained addition_types
+syn keyword ngxDirective contained aio
+syn keyword ngxDirective contained aio_write
+syn keyword ngxDirective contained alias
+syn keyword ngxDirective contained allow
+syn keyword ngxDirective contained ancient_browser
+syn keyword ngxDirective contained ancient_browser_value
+syn keyword ngxDirective contained auth_basic
+syn keyword ngxDirective contained auth_basic_user_file
+syn keyword ngxDirective contained auth_http
+syn keyword ngxDirective contained auth_http_header
+syn keyword ngxDirective contained auth_http_pass_client_cert
+syn keyword ngxDirective contained auth_http_timeout
+syn keyword ngxDirective contained auth_jwt
+syn keyword ngxDirective contained auth_jwt_key_file
+syn keyword ngxDirective contained auth_request
+syn keyword ngxDirective contained auth_request_set
+syn keyword ngxDirective contained autoindex
+syn keyword ngxDirective contained autoindex_exact_size
+syn keyword ngxDirective contained autoindex_format
+syn keyword ngxDirective contained autoindex_localtime
+syn keyword ngxDirective contained charset
+syn keyword ngxDirective contained charset_map
+syn keyword ngxDirective contained charset_types
+syn keyword ngxDirective contained chunked_transfer_encoding
+syn keyword ngxDirective contained client_body_buffer_size
+syn keyword ngxDirective contained client_body_in_file_only
+syn keyword ngxDirective contained client_body_in_single_buffer
+syn keyword ngxDirective contained client_body_temp_path
+syn keyword ngxDirective contained client_body_timeout
+syn keyword ngxDirective contained client_header_buffer_size
+syn keyword ngxDirective contained client_header_timeout
+syn keyword ngxDirective contained client_max_body_size
+syn keyword ngxDirective contained connection_pool_size
+syn keyword ngxDirective contained create_full_put_path
+syn keyword ngxDirective contained daemon
+syn keyword ngxDirective contained dav_access
+syn keyword ngxDirective contained dav_methods
+syn keyword ngxDirective contained debug_connection
+syn keyword ngxDirective contained debug_points
+syn keyword ngxDirective contained default_type
+syn keyword ngxDirective contained degradation
+syn keyword ngxDirective contained degrade
+syn keyword ngxDirective contained deny
+syn keyword ngxDirective contained devpoll_changes
+syn keyword ngxDirective contained devpoll_events
+syn keyword ngxDirective contained directio
+syn keyword ngxDirective contained directio_alignment
+syn keyword ngxDirective contained disable_symlinks
+syn keyword ngxDirective contained empty_gif
+syn keyword ngxDirective contained env
+syn keyword ngxDirective contained epoll_events
+syn keyword ngxDirective contained error_log
+syn keyword ngxDirective contained etag
+syn keyword ngxDirective contained eventport_events
+syn keyword ngxDirective contained expires
+syn keyword ngxDirective contained f4f
+syn keyword ngxDirective contained f4f_buffer_size
+syn keyword ngxDirective contained fastcgi_bind
+syn keyword ngxDirective contained fastcgi_buffer_size
+syn keyword ngxDirective contained fastcgi_buffering
+syn keyword ngxDirective contained fastcgi_buffers
+syn keyword ngxDirective contained fastcgi_busy_buffers_size
+syn keyword ngxDirective contained fastcgi_cache
+syn keyword ngxDirective contained fastcgi_cache_bypass
+syn keyword ngxDirective contained fastcgi_cache_key
+syn keyword ngxDirective contained fastcgi_cache_lock
+syn keyword ngxDirective contained fastcgi_cache_lock_age
+syn keyword ngxDirective contained fastcgi_cache_lock_timeout
+syn keyword ngxDirective contained fastcgi_cache_max_range_offset
+syn keyword ngxDirective contained fastcgi_cache_methods
+syn keyword ngxDirective contained fastcgi_cache_min_uses
+syn keyword ngxDirective contained fastcgi_cache_path
+syn keyword ngxDirective contained fastcgi_cache_purge
+syn keyword ngxDirective contained fastcgi_cache_revalidate
+syn keyword ngxDirective contained fastcgi_cache_use_stale
+syn keyword ngxDirective contained fastcgi_cache_valid
+syn keyword ngxDirective contained fastcgi_catch_stderr
+syn keyword ngxDirective contained fastcgi_connect_timeout
+syn keyword ngxDirective contained fastcgi_force_ranges
+syn keyword ngxDirective contained fastcgi_hide_header
+syn keyword ngxDirective contained fastcgi_ignore_client_abort
+syn keyword ngxDirective contained fastcgi_ignore_headers
+syn keyword ngxDirective contained fastcgi_index
+syn keyword ngxDirective contained fastcgi_intercept_errors
+syn keyword ngxDirective contained fastcgi_keep_conn
+syn keyword ngxDirective contained fastcgi_limit_rate
+syn keyword ngxDirective contained fastcgi_max_temp_file_size
+syn keyword ngxDirective contained fastcgi_next_upstream
+syn keyword ngxDirective contained fastcgi_next_upstream_timeout
+syn keyword ngxDirective contained fastcgi_next_upstream_tries
+syn keyword ngxDirective contained fastcgi_no_cache
+syn keyword ngxDirective contained fastcgi_param
+syn keyword ngxDirective contained fastcgi_pass_header
+syn keyword ngxDirective contained fastcgi_pass_request_body
+syn keyword ngxDirective contained fastcgi_pass_request_headers
+syn keyword ngxDirective contained fastcgi_read_timeout
+syn keyword ngxDirective contained fastcgi_request_buffering
+syn keyword ngxDirective contained fastcgi_send_lowat
+syn keyword ngxDirective contained fastcgi_send_timeout
+syn keyword ngxDirective contained fastcgi_split_path_info
+syn keyword ngxDirective contained fastcgi_store
+syn keyword ngxDirective contained fastcgi_store_access
+syn keyword ngxDirective contained fastcgi_temp_file_write_size
+syn keyword ngxDirective contained fastcgi_temp_path
+syn keyword ngxDirective contained flv
+syn keyword ngxDirective contained geoip_city
+syn keyword ngxDirective contained geoip_country
+syn keyword ngxDirective contained geoip_org
+syn keyword ngxDirective contained geoip_proxy
+syn keyword ngxDirective contained geoip_proxy_recursive
+syn keyword ngxDirective contained google_perftools_profiles
+syn keyword ngxDirective contained gunzip
+syn keyword ngxDirective contained gunzip_buffers
+syn keyword ngxDirective contained gzip
+syn keyword ngxDirective contained gzip_buffers
+syn keyword ngxDirective contained gzip_comp_level
+syn keyword ngxDirective contained gzip_disable
+syn keyword ngxDirective contained gzip_hash
+syn keyword ngxDirective contained gzip_http_version
+syn keyword ngxDirective contained gzip_min_length
+syn keyword ngxDirective contained gzip_no_buffer
+syn keyword ngxDirective contained gzip_proxied
+syn keyword ngxDirective contained gzip_static
+syn keyword ngxDirective contained gzip_types
+syn keyword ngxDirective contained gzip_vary
+syn keyword ngxDirective contained gzip_window
+syn keyword ngxDirective contained hash
+syn keyword ngxDirective contained health_check
+syn keyword ngxDirective contained health_check_timeout
+syn keyword ngxDirective contained hls
+syn keyword ngxDirective contained hls_buffers
+syn keyword ngxDirective contained hls_forward_args
+syn keyword ngxDirective contained hls_fragment
+syn keyword ngxDirective contained hls_mp4_buffer_size
+syn keyword ngxDirective contained hls_mp4_max_buffer_size
+syn keyword ngxDirective contained http2_chunk_size
+syn keyword ngxDirective contained http2_body_preread_size
+syn keyword ngxDirective contained http2_idle_timeout
+syn keyword ngxDirective contained http2_max_concurrent_streams
+syn keyword ngxDirective contained http2_max_field_size
+syn keyword ngxDirective contained http2_max_header_size
+syn keyword ngxDirective contained http2_max_requests
+syn keyword ngxDirective contained http2_recv_buffer_size
+syn keyword ngxDirective contained http2_recv_timeout
+syn keyword ngxDirective contained if_modified_since
+syn keyword ngxDirective contained ignore_invalid_headers
+syn keyword ngxDirective contained image_filter
+syn keyword ngxDirective contained image_filter_buffer
+syn keyword ngxDirective contained image_filter_interlace
+syn keyword ngxDirective contained image_filter_jpeg_quality
+syn keyword ngxDirective contained image_filter_sharpen
+syn keyword ngxDirective contained image_filter_transparency
+syn keyword ngxDirective contained image_filter_webp_quality
+syn keyword ngxDirective contained imap_auth
+syn keyword ngxDirective contained imap_capabilities
+syn keyword ngxDirective contained imap_client_buffer
+syn keyword ngxDirective contained index
+syn keyword ngxDirective contained iocp_threads
+syn keyword ngxDirective contained ip_hash
+syn keyword ngxDirective contained js_access
+syn keyword ngxDirective contained js_content
+syn keyword ngxDirective contained js_filter
+syn keyword ngxDirective contained js_include
+syn keyword ngxDirective contained js_preread
+syn keyword ngxDirective contained js_set
+syn keyword ngxDirective contained keepalive
+syn keyword ngxDirective contained keepalive_disable
+syn keyword ngxDirective contained keepalive_requests
+syn keyword ngxDirective contained keepalive_timeout
+syn keyword ngxDirective contained kqueue_changes
+syn keyword ngxDirective contained kqueue_events
+syn keyword ngxDirective contained large_client_header_buffers
+syn keyword ngxDirective contained least_conn
+syn keyword ngxDirective contained least_time
+syn keyword ngxDirective contained limit_conn
+syn keyword ngxDirective contained limit_conn_log_level
+syn keyword ngxDirective contained limit_conn_status
+syn keyword ngxDirective contained limit_conn_zone
+syn keyword ngxDirective contained limit_rate
+syn keyword ngxDirective contained limit_rate_after
+syn keyword ngxDirective contained limit_req
+syn keyword ngxDirective contained limit_req_log_level
+syn keyword ngxDirective contained limit_req_status
+syn keyword ngxDirective contained limit_req_zone
+syn keyword ngxDirective contained lingering_close
+syn keyword ngxDirective contained lingering_time
+syn keyword ngxDirective contained lingering_timeout
+syn keyword ngxDirective contained load_module
+syn keyword ngxDirective contained lock_file
+syn keyword ngxDirective contained log_format
+syn keyword ngxDirective contained log_not_found
+syn keyword ngxDirective contained log_subrequest
+syn keyword ngxDirective contained map_hash_bucket_size
+syn keyword ngxDirective contained map_hash_max_size
+syn keyword ngxDirective contained match
+syn keyword ngxDirective contained master_process
+syn keyword ngxDirective contained max_ranges
+syn keyword ngxDirective contained memcached_bind
+syn keyword ngxDirective contained memcached_buffer_size
+syn keyword ngxDirective contained memcached_connect_timeout
+syn keyword ngxDirective contained memcached_force_ranges
+syn keyword ngxDirective contained memcached_gzip_flag
+syn keyword ngxDirective contained memcached_next_upstream
+syn keyword ngxDirective contained memcached_next_upstream_timeout
+syn keyword ngxDirective contained memcached_next_upstream_tries
+syn keyword ngxDirective contained memcached_read_timeout
+syn keyword ngxDirective contained memcached_send_timeout
+syn keyword ngxDirective contained merge_slashes
+syn keyword ngxDirective contained min_delete_depth
+syn keyword ngxDirective contained modern_browser
+syn keyword ngxDirective contained modern_browser_value
+syn keyword ngxDirective contained mp4
+syn keyword ngxDirective contained mp4_buffer_size
+syn keyword ngxDirective contained mp4_max_buffer_size
+syn keyword ngxDirective contained mp4_limit_rate
+syn keyword ngxDirective contained mp4_limit_rate_after
+syn keyword ngxDirective contained msie_padding
+syn keyword ngxDirective contained msie_refresh
+syn keyword ngxDirective contained multi_accept
+syn keyword ngxDirective contained ntlm
+syn keyword ngxDirective contained open_file_cache
+syn keyword ngxDirective contained open_file_cache_errors
+syn keyword ngxDirective contained open_file_cache_events
+syn keyword ngxDirective contained open_file_cache_min_uses
+syn keyword ngxDirective contained open_file_cache_valid
+syn keyword ngxDirective contained open_log_file_cache
+syn keyword ngxDirective contained output_buffers
+syn keyword ngxDirective contained override_charset
+syn keyword ngxDirective contained pcre_jit
+syn keyword ngxDirective contained perl
+syn keyword ngxDirective contained perl_modules
+syn keyword ngxDirective contained perl_require
+syn keyword ngxDirective contained perl_set
+syn keyword ngxDirective contained pid
+syn keyword ngxDirective contained pop3_auth
+syn keyword ngxDirective contained pop3_capabilities
+syn keyword ngxDirective contained port_in_redirect
+syn keyword ngxDirective contained post_acceptex
+syn keyword ngxDirective contained postpone_gzipping
+syn keyword ngxDirective contained postpone_output
+syn keyword ngxDirective contained preread_buffer_size
+syn keyword ngxDirective contained preread_timeout
+syn keyword ngxDirective contained protocol
+syn keyword ngxDirective contained proxy
+syn keyword ngxDirective contained proxy_bind
+syn keyword ngxDirective contained proxy_buffer
+syn keyword ngxDirective contained proxy_buffer_size
+syn keyword ngxDirective contained proxy_buffering
+syn keyword ngxDirective contained proxy_buffers
+syn keyword ngxDirective contained proxy_busy_buffers_size
+syn keyword ngxDirective contained proxy_cache
+syn keyword ngxDirective contained proxy_cache_bypass
+syn keyword ngxDirective contained proxy_cache_convert_head
+syn keyword ngxDirective contained proxy_cache_key
+syn keyword ngxDirective contained proxy_cache_lock
+syn keyword ngxDirective contained proxy_cache_lock_age
+syn keyword ngxDirective contained proxy_cache_lock_timeout
+syn keyword ngxDirective contained proxy_cache_max_range_offset
+syn keyword ngxDirective contained proxy_cache_methods
+syn keyword ngxDirective contained proxy_cache_min_uses
+syn keyword ngxDirective contained proxy_cache_path
+syn keyword ngxDirective contained proxy_cache_purge
+syn keyword ngxDirective contained proxy_cache_revalidate
+syn keyword ngxDirective contained proxy_cache_use_stale
+syn keyword ngxDirective contained proxy_cache_valid
+syn keyword ngxDirective contained proxy_connect_timeout
+syn keyword ngxDirective contained proxy_cookie_domain
+syn keyword ngxDirective contained proxy_cookie_path
+syn keyword ngxDirective contained proxy_download_rate
+syn keyword ngxDirective contained proxy_force_ranges
+syn keyword ngxDirective contained proxy_headers_hash_bucket_size
+syn keyword ngxDirective contained proxy_headers_hash_max_size
+syn keyword ngxDirective contained proxy_hide_header
+syn keyword ngxDirective contained proxy_http_version
+syn keyword ngxDirective contained proxy_ignore_client_abort
+syn keyword ngxDirective contained proxy_ignore_headers
+syn keyword ngxDirective contained proxy_intercept_errors
+syn keyword ngxDirective contained proxy_limit_rate
+syn keyword ngxDirective contained proxy_max_temp_file_size
+syn keyword ngxDirective contained proxy_method
+syn keyword ngxDirective contained proxy_next_upstream
+syn keyword ngxDirective contained proxy_next_upstream_timeout
+syn keyword ngxDirective contained proxy_next_upstream_tries
+syn keyword ngxDirective contained proxy_no_cache
+syn keyword ngxDirective contained proxy_pass_error_message
+syn keyword ngxDirective contained proxy_pass_header
+syn keyword ngxDirective contained proxy_pass_request_body
+syn keyword ngxDirective contained proxy_pass_request_headers
+syn keyword ngxDirective contained proxy_protocol
+syn keyword ngxDirective contained proxy_protocol_timeout
+syn keyword ngxDirective contained proxy_read_timeout
+syn keyword ngxDirective contained proxy_redirect
+syn keyword ngxDirective contained proxy_request_buffering
+syn keyword ngxDirective contained proxy_responses
+syn keyword ngxDirective contained proxy_send_lowat
+syn keyword ngxDirective contained proxy_send_timeout
+syn keyword ngxDirective contained proxy_set_body
+syn keyword ngxDirective contained proxy_set_header
+syn keyword ngxDirective contained proxy_ssl_certificate
+syn keyword ngxDirective contained proxy_ssl_certificate_key
+syn keyword ngxDirective contained proxy_ssl_ciphers
+syn keyword ngxDirective contained proxy_ssl_crl
+syn keyword ngxDirective contained proxy_ssl_name
+syn keyword ngxDirective contained proxy_ssl_password_file
+syn keyword ngxDirective contained proxy_ssl_protocols
+syn keyword ngxDirective contained proxy_ssl_server_name
+syn keyword ngxDirective contained proxy_ssl_session_reuse
+syn keyword ngxDirective contained proxy_ssl_trusted_certificate
+syn keyword ngxDirective contained proxy_ssl_verify
+syn keyword ngxDirective contained proxy_ssl_verify_depth
+syn keyword ngxDirective contained proxy_store
+syn keyword ngxDirective contained proxy_store_access
+syn keyword ngxDirective contained proxy_temp_file_write_size
+syn keyword ngxDirective contained proxy_temp_path
+syn keyword ngxDirective contained proxy_timeout
+syn keyword ngxDirective contained proxy_upload_rate
+syn keyword ngxDirective contained queue
+syn keyword ngxDirective contained random_index
+syn keyword ngxDirective contained read_ahead
+syn keyword ngxDirective contained real_ip_header
+syn keyword ngxDirective contained real_ip_recursive
+syn keyword ngxDirective contained recursive_error_pages
+syn keyword ngxDirective contained referer_hash_bucket_size
+syn keyword ngxDirective contained referer_hash_max_size
+syn keyword ngxDirective contained request_pool_size
+syn keyword ngxDirective contained reset_timedout_connection
+syn keyword ngxDirective contained resolver
+syn keyword ngxDirective contained resolver_timeout
+syn keyword ngxDirective contained rewrite_log
+syn keyword ngxDirective contained rtsig_overflow_events
+syn keyword ngxDirective contained rtsig_overflow_test
+syn keyword ngxDirective contained rtsig_overflow_threshold
+syn keyword ngxDirective contained rtsig_signo
+syn keyword ngxDirective contained satisfy
+syn keyword ngxDirective contained scgi_bind
+syn keyword ngxDirective contained scgi_buffer_size
+syn keyword ngxDirective contained scgi_buffering
+syn keyword ngxDirective contained scgi_buffers
+syn keyword ngxDirective contained scgi_busy_buffers_size
+syn keyword ngxDirective contained scgi_cache
+syn keyword ngxDirective contained scgi_cache_bypass
+syn keyword ngxDirective contained scgi_cache_key
+syn keyword ngxDirective contained scgi_cache_lock
+syn keyword ngxDirective contained scgi_cache_lock_age
+syn keyword ngxDirective contained scgi_cache_lock_timeout
+syn keyword ngxDirective contained scgi_cache_max_range_offset
+syn keyword ngxDirective contained scgi_cache_methods
+syn keyword ngxDirective contained scgi_cache_min_uses
+syn keyword ngxDirective contained scgi_cache_path
+syn keyword ngxDirective contained scgi_cache_purge
+syn keyword ngxDirective contained scgi_cache_revalidate
+syn keyword ngxDirective contained scgi_cache_use_stale
+syn keyword ngxDirective contained scgi_cache_valid
+syn keyword ngxDirective contained scgi_connect_timeout
+syn keyword ngxDirective contained scgi_force_ranges
+syn keyword ngxDirective contained scgi_hide_header
+syn keyword ngxDirective contained scgi_ignore_client_abort
+syn keyword ngxDirective contained scgi_ignore_headers
+syn keyword ngxDirective contained scgi_intercept_errors
+syn keyword ngxDirective contained scgi_limit_rate
+syn keyword ngxDirective contained scgi_max_temp_file_size
+syn keyword ngxDirective contained scgi_next_upstream
+syn keyword ngxDirective contained scgi_next_upstream_timeout
+syn keyword ngxDirective contained scgi_next_upstream_tries
+syn keyword ngxDirective contained scgi_no_cache
+syn keyword ngxDirective contained scgi_param
+syn keyword ngxDirective contained scgi_pass_header
+syn keyword ngxDirective contained scgi_pass_request_body
+syn keyword ngxDirective contained scgi_pass_request_headers
+syn keyword ngxDirective contained scgi_read_timeout
+syn keyword ngxDirective contained scgi_request_buffering
+syn keyword ngxDirective contained scgi_send_timeout
+syn keyword ngxDirective contained scgi_store
+syn keyword ngxDirective contained scgi_store_access
+syn keyword ngxDirective contained scgi_temp_file_write_size
+syn keyword ngxDirective contained scgi_temp_path
+syn keyword ngxDirective contained secure_link
+syn keyword ngxDirective contained secure_link_md5
+syn keyword ngxDirective contained secure_link_secret
+syn keyword ngxDirective contained send_lowat
+syn keyword ngxDirective contained send_timeout
+syn keyword ngxDirective contained sendfile
+syn keyword ngxDirective contained sendfile_max_chunk
+syn keyword ngxDirective contained server_name_in_redirect
+syn keyword ngxDirective contained server_names_hash_bucket_size
+syn keyword ngxDirective contained server_names_hash_max_size
+syn keyword ngxDirective contained server_tokens
+syn keyword ngxDirective contained session_log
+syn keyword ngxDirective contained session_log_format
+syn keyword ngxDirective contained session_log_zone
+syn keyword ngxDirective contained set_real_ip_from
+syn keyword ngxDirective contained slice
+syn keyword ngxDirective contained smtp_auth
+syn keyword ngxDirective contained smtp_capabilities
+syn keyword ngxDirective contained smtp_client_buffer
+syn keyword ngxDirective contained smtp_greeting_delay
+syn keyword ngxDirective contained source_charset
+syn keyword ngxDirective contained spdy_chunk_size
+syn keyword ngxDirective contained spdy_headers_comp
+syn keyword ngxDirective contained spdy_keepalive_timeout
+syn keyword ngxDirective contained spdy_max_concurrent_streams
+syn keyword ngxDirective contained spdy_pool_size
+syn keyword ngxDirective contained spdy_recv_buffer_size
+syn keyword ngxDirective contained spdy_recv_timeout
+syn keyword ngxDirective contained spdy_streams_index_size
+syn keyword ngxDirective contained ssi
+syn keyword ngxDirective contained ssi_ignore_recycled_buffers
+syn keyword ngxDirective contained ssi_last_modified
+syn keyword ngxDirective contained ssi_min_file_chunk
+syn keyword ngxDirective contained ssi_silent_errors
+syn keyword ngxDirective contained ssi_types
+syn keyword ngxDirective contained ssi_value_length
+syn keyword ngxDirective contained ssl
+syn keyword ngxDirective contained ssl_buffer_size
+syn keyword ngxDirective contained ssl_certificate
+syn keyword ngxDirective contained ssl_certificate_key
+syn keyword ngxDirective contained ssl_ciphers
+syn keyword ngxDirective contained ssl_client_certificate
+syn keyword ngxDirective contained ssl_crl
+syn keyword ngxDirective contained ssl_dhparam
+syn keyword ngxDirective contained ssl_ecdh_curve
+syn keyword ngxDirective contained ssl_engine
+syn keyword ngxDirective contained ssl_handshake_timeout
+syn keyword ngxDirective contained ssl_password_file
+syn keyword ngxDirective contained ssl_prefer_server_ciphers
+syn keyword ngxDirective contained ssl_preread
+syn keyword ngxDirective contained ssl_protocols
+syn keyword ngxDirective contained ssl_session_cache
+syn keyword ngxDirective contained ssl_session_ticket_key
+syn keyword ngxDirective contained ssl_session_tickets
+syn keyword ngxDirective contained ssl_session_timeout
+syn keyword ngxDirective contained ssl_stapling
+syn keyword ngxDirective contained ssl_stapling_file
+syn keyword ngxDirective contained ssl_stapling_responder
+syn keyword ngxDirective contained ssl_stapling_verify
+syn keyword ngxDirective contained ssl_trusted_certificate
+syn keyword ngxDirective contained ssl_verify_client
+syn keyword ngxDirective contained ssl_verify_depth
+syn keyword ngxDirective contained starttls
+syn keyword ngxDirective contained state
+syn keyword ngxDirective contained status
+syn keyword ngxDirective contained status_format
+syn keyword ngxDirective contained status_zone
+syn keyword ngxDirective contained sticky
+syn keyword ngxDirective contained sticky_cookie_insert
+syn keyword ngxDirective contained stub_status
+syn keyword ngxDirective contained sub_filter
+syn keyword ngxDirective contained sub_filter_last_modified
+syn keyword ngxDirective contained sub_filter_once
+syn keyword ngxDirective contained sub_filter_types
+syn keyword ngxDirective contained tcp_nodelay
+syn keyword ngxDirective contained tcp_nopush
+syn keyword ngxDirective contained thread_pool
+syn keyword ngxDirective contained thread_stack_size
+syn keyword ngxDirective contained timeout
+syn keyword ngxDirective contained timer_resolution
+syn keyword ngxDirective contained types_hash_bucket_size
+syn keyword ngxDirective contained types_hash_max_size
+syn keyword ngxDirective contained underscores_in_headers
+syn keyword ngxDirective contained uninitialized_variable_warn
+syn keyword ngxDirective contained upstream_conf
+syn keyword ngxDirective contained use
+syn keyword ngxDirective contained user
+syn keyword ngxDirective contained userid
+syn keyword ngxDirective contained userid_domain
+syn keyword ngxDirective contained userid_expires
+syn keyword ngxDirective contained userid_mark
+syn keyword ngxDirective contained userid_name
+syn keyword ngxDirective contained userid_p3p
+syn keyword ngxDirective contained userid_path
+syn keyword ngxDirective contained userid_service
+syn keyword ngxDirective contained uwsgi_bind
+syn keyword ngxDirective contained uwsgi_buffer_size
+syn keyword ngxDirective contained uwsgi_buffering
+syn keyword ngxDirective contained uwsgi_buffers
+syn keyword ngxDirective contained uwsgi_busy_buffers_size
+syn keyword ngxDirective contained uwsgi_cache
+syn keyword ngxDirective contained uwsgi_cache_bypass
+syn keyword ngxDirective contained uwsgi_cache_key
+syn keyword ngxDirective contained uwsgi_cache_lock
+syn keyword ngxDirective contained uwsgi_cache_lock_age
+syn keyword ngxDirective contained uwsgi_cache_lock_timeout
+syn keyword ngxDirective contained uwsgi_cache_methods
+syn keyword ngxDirective contained uwsgi_cache_min_uses
+syn keyword ngxDirective contained uwsgi_cache_path
+syn keyword ngxDirective contained uwsgi_cache_purge
+syn keyword ngxDirective contained uwsgi_cache_revalidate
+syn keyword ngxDirective contained uwsgi_cache_use_stale
+syn keyword ngxDirective contained uwsgi_cache_valid
+syn keyword ngxDirective contained uwsgi_connect_timeout
+syn keyword ngxDirective contained uwsgi_force_ranges
+syn keyword ngxDirective contained uwsgi_hide_header
+syn keyword ngxDirective contained uwsgi_ignore_client_abort
+syn keyword ngxDirective contained uwsgi_ignore_headers
+syn keyword ngxDirective contained uwsgi_intercept_errors
+syn keyword ngxDirective contained uwsgi_limit_rate
+syn keyword ngxDirective contained uwsgi_max_temp_file_size
+syn keyword ngxDirective contained uwsgi_modifier1
+syn keyword ngxDirective contained uwsgi_modifier2
+syn keyword ngxDirective contained uwsgi_next_upstream
+syn keyword ngxDirective contained uwsgi_next_upstream_timeout
+syn keyword ngxDirective contained uwsgi_next_upstream_tries
+syn keyword ngxDirective contained uwsgi_no_cache
+syn keyword ngxDirective contained uwsgi_param
+syn keyword ngxDirective contained uwsgi_pass
+syn keyword ngxDirective contained uwsgi_pass_header
+syn keyword ngxDirective contained uwsgi_pass_request_body
+syn keyword ngxDirective contained uwsgi_pass_request_headers
+syn keyword ngxDirective contained uwsgi_read_timeout
+syn keyword ngxDirective contained uwsgi_request_buffering
+syn keyword ngxDirective contained uwsgi_send_timeout
+syn keyword ngxDirective contained uwsgi_ssl_certificate
+syn keyword ngxDirective contained uwsgi_ssl_certificate_key
+syn keyword ngxDirective contained uwsgi_ssl_ciphers
+syn keyword ngxDirective contained uwsgi_ssl_crl
+syn keyword ngxDirective contained uwsgi_ssl_name
+syn keyword ngxDirective contained uwsgi_ssl_password_file
+syn keyword ngxDirective contained uwsgi_ssl_protocols
+syn keyword ngxDirective contained uwsgi_ssl_server_name
+syn keyword ngxDirective contained uwsgi_ssl_session_reuse
+syn keyword ngxDirective contained uwsgi_ssl_trusted_certificate
+syn keyword ngxDirective contained uwsgi_ssl_verify
+syn keyword ngxDirective contained uwsgi_ssl_verify_depth
+syn keyword ngxDirective contained uwsgi_store
+syn keyword ngxDirective contained uwsgi_store_access
+syn keyword ngxDirective contained uwsgi_string
+syn keyword ngxDirective contained uwsgi_temp_file_write_size
+syn keyword ngxDirective contained uwsgi_temp_path
+syn keyword ngxDirective contained valid_referers
+syn keyword ngxDirective contained variables_hash_bucket_size
+syn keyword ngxDirective contained variables_hash_max_size
+syn keyword ngxDirective contained worker_aio_requests
+syn keyword ngxDirective contained worker_connections
+syn keyword ngxDirective contained worker_cpu_affinity
+syn keyword ngxDirective contained worker_priority
+syn keyword ngxDirective contained worker_processes
+syn keyword ngxDirective contained worker_rlimit_core
+syn keyword ngxDirective contained worker_rlimit_nofile
+syn keyword ngxDirective contained worker_rlimit_sigpending
+syn keyword ngxDirective contained worker_threads
+syn keyword ngxDirective contained working_directory
+syn keyword ngxDirective contained xclient
+syn keyword ngxDirective contained xml_entities
+syn keyword ngxDirective contained xslt_last_modified
+syn keyword ngxDirective contained xslt_param
+syn keyword ngxDirective contained xslt_string_param
+syn keyword ngxDirective contained xslt_stylesheet
+syn keyword ngxDirective contained xslt_types
+syn keyword ngxDirective contained zone
 
 " 3rd party module list:
 " https://www.nginx.com/resources/wiki/modules/
 
 " Accept Language Module <https://www.nginx.com/resources/wiki/modules/accept_language/>
 " Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
-syn keyword ngxDirectiveThirdParty set_from_accept_language
+syn keyword ngxDirectiveThirdParty contained set_from_accept_language
 
 " Access Key Module (DEPRECATED) <http://wiki.nginx.org/NginxHttpAccessKeyModule>
 " Denies access unless the request URL contains an access key.
-syn keyword ngxDirectiveDeprecated accesskey
-syn keyword ngxDirectiveDeprecated accesskey_arg
-syn keyword ngxDirectiveDeprecated accesskey_hashmethod
-syn keyword ngxDirectiveDeprecated accesskey_signature
+syn keyword ngxDirectiveDeprecated contained accesskey
+syn keyword ngxDirectiveDeprecated contained accesskey_arg
+syn keyword ngxDirectiveDeprecated contained accesskey_hashmethod
+syn keyword ngxDirectiveDeprecated contained accesskey_signature
 
 " Asynchronous FastCGI Module <https://github.com/rsms/afcgi>
 " Primarily a modified version of the Nginx FastCGI module which implements multiplexing of connections, allowing a single FastCGI server to handle many concurrent requests.
-" syn keyword ngxDirectiveThirdParty fastcgi_bind
-" syn keyword ngxDirectiveThirdParty fastcgi_buffer_size
-" syn keyword ngxDirectiveThirdParty fastcgi_buffers
-" syn keyword ngxDirectiveThirdParty fastcgi_busy_buffers_size
-" syn keyword ngxDirectiveThirdParty fastcgi_cache
-" syn keyword ngxDirectiveThirdParty fastcgi_cache_key
-" syn keyword ngxDirectiveThirdParty fastcgi_cache_methods
-" syn keyword ngxDirectiveThirdParty fastcgi_cache_min_uses
-" syn keyword ngxDirectiveThirdParty fastcgi_cache_path
-" syn keyword ngxDirectiveThirdParty fastcgi_cache_use_stale
-" syn keyword ngxDirectiveThirdParty fastcgi_cache_valid
-" syn keyword ngxDirectiveThirdParty fastcgi_catch_stderr
-" syn keyword ngxDirectiveThirdParty fastcgi_connect_timeout
-" syn keyword ngxDirectiveThirdParty fastcgi_hide_header
-" syn keyword ngxDirectiveThirdParty fastcgi_ignore_client_abort
-" syn keyword ngxDirectiveThirdParty fastcgi_ignore_headers
-" syn keyword ngxDirectiveThirdParty fastcgi_index
-" syn keyword ngxDirectiveThirdParty fastcgi_intercept_errors
-" syn keyword ngxDirectiveThirdParty fastcgi_max_temp_file_size
-" syn keyword ngxDirectiveThirdParty fastcgi_next_upstream
-" syn keyword ngxDirectiveThirdParty fastcgi_param
-" syn keyword ngxDirectiveThirdParty fastcgi_pass
-" syn keyword ngxDirectiveThirdParty fastcgi_pass_header
-" syn keyword ngxDirectiveThirdParty fastcgi_pass_request_body
-" syn keyword ngxDirectiveThirdParty fastcgi_pass_request_headers
-" syn keyword ngxDirectiveThirdParty fastcgi_read_timeout
-" syn keyword ngxDirectiveThirdParty fastcgi_send_lowat
-" syn keyword ngxDirectiveThirdParty fastcgi_send_timeout
-" syn keyword ngxDirectiveThirdParty fastcgi_split_path_info
-" syn keyword ngxDirectiveThirdParty fastcgi_store
-" syn keyword ngxDirectiveThirdParty fastcgi_store_access
-" syn keyword ngxDirectiveThirdParty fastcgi_temp_file_write_size
-" syn keyword ngxDirectiveThirdParty fastcgi_temp_path
-syn keyword ngxDirectiveDeprecated fastcgi_upstream_fail_timeout
-syn keyword ngxDirectiveDeprecated fastcgi_upstream_max_fails
+" syn keyword ngxDirectiveThirdParty contained fastcgi_bind
+" syn keyword ngxDirectiveThirdParty contained fastcgi_buffer_size
+" syn keyword ngxDirectiveThirdParty contained fastcgi_buffers
+" syn keyword ngxDirectiveThirdParty contained fastcgi_busy_buffers_size
+" syn keyword ngxDirectiveThirdParty contained fastcgi_cache
+" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_key
+" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_methods
+" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_min_uses
+" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_path
+" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_use_stale
+" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_valid
+" syn keyword ngxDirectiveThirdParty contained fastcgi_catch_stderr
+" syn keyword ngxDirectiveThirdParty contained fastcgi_connect_timeout
+" syn keyword ngxDirectiveThirdParty contained fastcgi_hide_header
+" syn keyword ngxDirectiveThirdParty contained fastcgi_ignore_client_abort
+" syn keyword ngxDirectiveThirdParty contained fastcgi_ignore_headers
+" syn keyword ngxDirectiveThirdParty contained fastcgi_index
+" syn keyword ngxDirectiveThirdParty contained fastcgi_intercept_errors
+" syn keyword ngxDirectiveThirdParty contained fastcgi_max_temp_file_size
+" syn keyword ngxDirectiveThirdParty contained fastcgi_next_upstream
+" syn keyword ngxDirectiveThirdParty contained fastcgi_param
+" syn keyword ngxDirectiveThirdParty contained fastcgi_pass
+" syn keyword ngxDirectiveThirdParty contained fastcgi_pass_header
+" syn keyword ngxDirectiveThirdParty contained fastcgi_pass_request_body
+" syn keyword ngxDirectiveThirdParty contained fastcgi_pass_request_headers
+" syn keyword ngxDirectiveThirdParty contained fastcgi_read_timeout
+" syn keyword ngxDirectiveThirdParty contained fastcgi_send_lowat
+" syn keyword ngxDirectiveThirdParty contained fastcgi_send_timeout
+" syn keyword ngxDirectiveThirdParty contained fastcgi_split_path_info
+" syn keyword ngxDirectiveThirdParty contained fastcgi_store
+" syn keyword ngxDirectiveThirdParty contained fastcgi_store_access
+" syn keyword ngxDirectiveThirdParty contained fastcgi_temp_file_write_size
+" syn keyword ngxDirectiveThirdParty contained fastcgi_temp_path
+syn keyword ngxDirectiveDeprecated contained fastcgi_upstream_fail_timeout
+syn keyword ngxDirectiveDeprecated contained fastcgi_upstream_max_fails
 
 " Akamai G2O Module <https://github.com/kaltura/nginx_mod_akamai_g2o>
 " Nginx Module for Authenticating Akamai G2O requests
-syn keyword ngxDirectiveThirdParty g2o
-syn keyword ngxDirectiveThirdParty g2o_nonce
-syn keyword ngxDirectiveThirdParty g2o_key
+syn keyword ngxDirectiveThirdParty contained g2o
+syn keyword ngxDirectiveThirdParty contained g2o_nonce
+syn keyword ngxDirectiveThirdParty contained g2o_key
 
 " Lua Module <https://github.com/alacner/nginx_lua_module>
 " You can be very simple to execute lua code for nginx
-syn keyword ngxDirectiveThirdParty lua_file
+syn keyword ngxDirectiveThirdParty contained lua_file
 
 " Array Variable Module <https://github.com/openresty/array-var-nginx-module>
 " Add support for array-typed variables to nginx config files
-syn keyword ngxDirectiveThirdParty array_split
-syn keyword ngxDirectiveThirdParty array_join
-syn keyword ngxDirectiveThirdParty array_map
-syn keyword ngxDirectiveThirdParty array_map_op
+syn keyword ngxDirectiveThirdParty contained array_split
+syn keyword ngxDirectiveThirdParty contained array_join
+syn keyword ngxDirectiveThirdParty contained array_map
+syn keyword ngxDirectiveThirdParty contained array_map_op
 
 " Nginx Audio Track for HTTP Live Streaming <https://github.com/flavioribeiro/nginx-audio-track-for-hls-module>
 " This nginx module generates audio track for hls streams on the fly.
-syn keyword ngxDirectiveThirdParty ngx_hls_audio_track
-syn keyword ngxDirectiveThirdParty ngx_hls_audio_track_rootpath
-syn keyword ngxDirectiveThirdParty ngx_hls_audio_track_output_format
-syn keyword ngxDirectiveThirdParty ngx_hls_audio_track_output_header
+syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track
+syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_rootpath
+syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_output_format
+syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_output_header
 
 " AWS Proxy Module <https://github.com/anomalizer/ngx_aws_auth>
 " Nginx module to proxy to authenticated AWS services
-syn keyword ngxDirectiveThirdParty aws_access_key
-syn keyword ngxDirectiveThirdParty aws_key_scope
-syn keyword ngxDirectiveThirdParty aws_signing_key
-syn keyword ngxDirectiveThirdParty aws_endpoint
-syn keyword ngxDirectiveThirdParty aws_s3_bucket
-syn keyword ngxDirectiveThirdParty aws_sign
+syn keyword ngxDirectiveThirdParty contained aws_access_key
+syn keyword ngxDirectiveThirdParty contained aws_key_scope
+syn keyword ngxDirectiveThirdParty contained aws_signing_key
+syn keyword ngxDirectiveThirdParty contained aws_endpoint
+syn keyword ngxDirectiveThirdParty contained aws_s3_bucket
+syn keyword ngxDirectiveThirdParty contained aws_sign
 
 " Backtrace module <https://github.com/alibaba/nginx-backtrace>
 " A Nginx module to dump backtrace when a worker process exits abnormally
-syn keyword ngxDirectiveThirdParty backtrace_log
-syn keyword ngxDirectiveThirdParty backtrace_max_stack_size
+syn keyword ngxDirectiveThirdParty contained backtrace_log
+syn keyword ngxDirectiveThirdParty contained backtrace_max_stack_size
 
 " Brotli Module <https://github.com/google/ngx_brotli>
 " Nginx module for Brotli compression
-syn keyword ngxDirectiveThirdParty brotli_static
-syn keyword ngxDirectiveThirdParty brotli
-syn keyword ngxDirectiveThirdParty brotli_types
-syn keyword ngxDirectiveThirdParty brotli_buffers
-syn keyword ngxDirectiveThirdParty brotli_comp_level
-syn keyword ngxDirectiveThirdParty brotli_window
-syn keyword ngxDirectiveThirdParty brotli_min_length
+syn keyword ngxDirectiveThirdParty contained brotli_static
+syn keyword ngxDirectiveThirdParty contained brotli
+syn keyword ngxDirectiveThirdParty contained brotli_types
+syn keyword ngxDirectiveThirdParty contained brotli_buffers
+syn keyword ngxDirectiveThirdParty contained brotli_comp_level
+syn keyword ngxDirectiveThirdParty contained brotli_window
+syn keyword ngxDirectiveThirdParty contained brotli_min_length
 
 " Cache Purge Module <https://github.com/FRiCKLE/ngx_cache_purge>
 " Adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches.
-syn keyword ngxDirectiveThirdParty fastcgi_cache_purge
-syn keyword ngxDirectiveThirdParty proxy_cache_purge
-" syn keyword ngxDirectiveThirdParty scgi_cache_purge
-" syn keyword ngxDirectiveThirdParty uwsgi_cache_purge
+syn keyword ngxDirectiveThirdParty contained fastcgi_cache_purge
+syn keyword ngxDirectiveThirdParty contained proxy_cache_purge
+" syn keyword ngxDirectiveThirdParty contained scgi_cache_purge
+" syn keyword ngxDirectiveThirdParty contained uwsgi_cache_purge
 
 " Chunkin Module (DEPRECATED) <http://wiki.nginx.org/NginxHttpChunkinModule>
 " HTTP 1.1 chunked-encoding request body support for Nginx.
-syn keyword ngxDirectiveDeprecated chunkin
-syn keyword ngxDirectiveDeprecated chunkin_keepalive
-syn keyword ngxDirectiveDeprecated chunkin_max_chunks_per_buf
-syn keyword ngxDirectiveDeprecated chunkin_resume
+syn keyword ngxDirectiveDeprecated contained chunkin
+syn keyword ngxDirectiveDeprecated contained chunkin_keepalive
+syn keyword ngxDirectiveDeprecated contained chunkin_max_chunks_per_buf
+syn keyword ngxDirectiveDeprecated contained chunkin_resume
 
 " Circle GIF Module <https://github.com/evanmiller/nginx_circle_gif>
 " Generates simple circle images with the colors and size specified in the URL.
-syn keyword ngxDirectiveThirdParty circle_gif
-syn keyword ngxDirectiveThirdParty circle_gif_max_radius
-syn keyword ngxDirectiveThirdParty circle_gif_min_radius
-syn keyword ngxDirectiveThirdParty circle_gif_step_radius
+syn keyword ngxDirectiveThirdParty contained circle_gif
+syn keyword ngxDirectiveThirdParty contained circle_gif_max_radius
+syn keyword ngxDirectiveThirdParty contained circle_gif_min_radius
+syn keyword ngxDirectiveThirdParty contained circle_gif_step_radius
 
 " Nginx-Clojure Module <http://nginx-clojure.github.io/index.html>
 " Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
-syn keyword ngxDirectiveThirdParty jvm_path
-syn keyword ngxDirectiveThirdParty jvm_var
-syn keyword ngxDirectiveThirdParty jvm_classpath
-syn keyword ngxDirectiveThirdParty jvm_classpath_check
-syn keyword ngxDirectiveThirdParty jvm_workers
-syn keyword ngxDirectiveThirdParty jvm_options
-syn keyword ngxDirectiveThirdParty jvm_handler_type
-syn keyword ngxDirectiveThirdParty jvm_init_handler_name
-syn keyword ngxDirectiveThirdParty jvm_init_handler_code
-syn keyword ngxDirectiveThirdParty jvm_exit_handler_name
-syn keyword ngxDirectiveThirdParty jvm_exit_handler_code
-syn keyword ngxDirectiveThirdParty handlers_lazy_init
-syn keyword ngxDirectiveThirdParty auto_upgrade_ws
-syn keyword ngxDirectiveThirdParty content_handler_type
-syn keyword ngxDirectiveThirdParty content_handler_name
-syn keyword ngxDirectiveThirdParty content_handler_code
-syn keyword ngxDirectiveThirdParty rewrite_handler_type
-syn keyword ngxDirectiveThirdParty rewrite_handler_name
-syn keyword ngxDirectiveThirdParty rewrite_handler_code
-syn keyword ngxDirectiveThirdParty access_handler_type
-syn keyword ngxDirectiveThirdParty access_handler_name
-syn keyword ngxDirectiveThirdParty access_handler_code
-syn keyword ngxDirectiveThirdParty header_filter_type
-syn keyword ngxDirectiveThirdParty header_filter_name
-syn keyword ngxDirectiveThirdParty header_filter_code
-syn keyword ngxDirectiveThirdParty content_handler_property
-syn keyword ngxDirectiveThirdParty rewrite_handler_property
-syn keyword ngxDirectiveThirdParty access_handler_property
-syn keyword ngxDirectiveThirdParty header_filter_property
-syn keyword ngxDirectiveThirdParty always_read_body
-syn keyword ngxDirectiveThirdParty shared_map
-syn keyword ngxDirectiveThirdParty write_page_size
+syn keyword ngxDirectiveThirdParty contained jvm_path
+syn keyword ngxDirectiveThirdParty contained jvm_var
+syn keyword ngxDirectiveThirdParty contained jvm_classpath
+syn keyword ngxDirectiveThirdParty contained jvm_classpath_check
+syn keyword ngxDirectiveThirdParty contained jvm_workers
+syn keyword ngxDirectiveThirdParty contained jvm_options
+syn keyword ngxDirectiveThirdParty contained jvm_handler_type
+syn keyword ngxDirectiveThirdParty contained jvm_init_handler_name
+syn keyword ngxDirectiveThirdParty contained jvm_init_handler_code
+syn keyword ngxDirectiveThirdParty contained jvm_exit_handler_name
+syn keyword ngxDirectiveThirdParty contained jvm_exit_handler_code
+syn keyword ngxDirectiveThirdParty contained handlers_lazy_init
+syn keyword ngxDirectiveThirdParty contained auto_upgrade_ws
+syn keyword ngxDirectiveThirdParty contained content_handler_type
+syn keyword ngxDirectiveThirdParty contained content_handler_name
+syn keyword ngxDirectiveThirdParty contained content_handler_code
+syn keyword ngxDirectiveThirdParty contained rewrite_handler_type
+syn keyword ngxDirectiveThirdParty contained rewrite_handler_name
+syn keyword ngxDirectiveThirdParty contained rewrite_handler_code
+syn keyword ngxDirectiveThirdParty contained access_handler_type
+syn keyword ngxDirectiveThirdParty contained access_handler_name
+syn keyword ngxDirectiveThirdParty contained access_handler_code
+syn keyword ngxDirectiveThirdParty contained header_filter_type
+syn keyword ngxDirectiveThirdParty contained header_filter_name
+syn keyword ngxDirectiveThirdParty contained header_filter_code
+syn keyword ngxDirectiveThirdParty contained content_handler_property
+syn keyword ngxDirectiveThirdParty contained rewrite_handler_property
+syn keyword ngxDirectiveThirdParty contained access_handler_property
+syn keyword ngxDirectiveThirdParty contained header_filter_property
+syn keyword ngxDirectiveThirdParty contained always_read_body
+syn keyword ngxDirectiveThirdParty contained shared_map
+syn keyword ngxDirectiveThirdParty contained write_page_size
 
 " Upstream Consistent Hash <https://www.nginx.com/resources/wiki/modules/consistent_hash/>
 " A load balancer that uses an internal consistent hash ring to select the right backend node.
-syn keyword ngxDirectiveThirdParty consistent_hash
+syn keyword ngxDirectiveThirdParty contained consistent_hash
 
 " Nginx Development Kit <https://github.com/simpl/ngx_devel_kit>
 " The NDK is an Nginx module that is designed to extend the core functionality of the excellent Nginx webserver in a way that can be used as a basis of other Nginx modules.
 " NDK_UPSTREAM_LIST
 " This submodule provides a directive that creates a list of upstreams, with optional weighting. This list can then be used by other modules to hash over the upstreams however they choose.
-syn keyword ngxDirectiveThirdParty upstream_list
+syn keyword ngxDirectiveThirdParty contained upstream_list
 
 " Drizzle Module <https://www.nginx.com/resources/wiki/modules/drizzle/>
 " Upstream module for talking to MySQL and Drizzle directly
-syn keyword ngxDirectiveThirdParty drizzle_server
-syn keyword ngxDirectiveThirdParty drizzle_keepalive
-syn keyword ngxDirectiveThirdParty drizzle_query
-syn keyword ngxDirectiveThirdParty drizzle_pass
-syn keyword ngxDirectiveThirdParty drizzle_connect_timeout
-syn keyword ngxDirectiveThirdParty drizzle_send_query_timeout
-syn keyword ngxDirectiveThirdParty drizzle_recv_cols_timeout
-syn keyword ngxDirectiveThirdParty drizzle_recv_rows_timeout
-syn keyword ngxDirectiveThirdParty drizzle_buffer_size
-syn keyword ngxDirectiveThirdParty drizzle_module_header
-syn keyword ngxDirectiveThirdParty drizzle_status
+syn keyword ngxDirectiveThirdParty contained drizzle_server
+syn keyword ngxDirectiveThirdParty contained drizzle_keepalive
+syn keyword ngxDirectiveThirdParty contained drizzle_query
+syn keyword ngxDirectiveThirdParty contained drizzle_pass
+syn keyword ngxDirectiveThirdParty contained drizzle_connect_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_send_query_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_recv_cols_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_recv_rows_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_buffer_size
+syn keyword ngxDirectiveThirdParty contained drizzle_module_header
+syn keyword ngxDirectiveThirdParty contained drizzle_status
 
 " Dynamic ETags Module <https://github.com/kali/nginx-dynamic-etags>
 " Attempt at handling ETag / If-None-Match on proxied content.
-syn keyword ngxDirectiveThirdParty dynamic_etags
+syn keyword ngxDirectiveThirdParty contained dynamic_etags
 
 " Echo Module <https://www.nginx.com/resources/wiki/modules/echo/>
 " Bringing the power of "echo", "sleep", "time" and more to Nginx's config file
-syn keyword ngxDirectiveThirdParty echo
-syn keyword ngxDirectiveThirdParty echo_duplicate
-syn keyword ngxDirectiveThirdParty echo_flush
-syn keyword ngxDirectiveThirdParty echo_sleep
-syn keyword ngxDirectiveThirdParty echo_blocking_sleep
-syn keyword ngxDirectiveThirdParty echo_reset_timer
-syn keyword ngxDirectiveThirdParty echo_read_request_body
-syn keyword ngxDirectiveThirdParty echo_location_async
-syn keyword ngxDirectiveThirdParty echo_location
-syn keyword ngxDirectiveThirdParty echo_subrequest_async
-syn keyword ngxDirectiveThirdParty echo_subrequest
-syn keyword ngxDirectiveThirdParty echo_foreach_split
-syn keyword ngxDirectiveThirdParty echo_end
-syn keyword ngxDirectiveThirdParty echo_request_body
-syn keyword ngxDirectiveThirdParty echo_exec
-syn keyword ngxDirectiveThirdParty echo_status
-syn keyword ngxDirectiveThirdParty echo_before_body
-syn keyword ngxDirectiveThirdParty echo_after_body
+syn keyword ngxDirectiveThirdParty contained echo
+syn keyword ngxDirectiveThirdParty contained echo_duplicate
+syn keyword ngxDirectiveThirdParty contained echo_flush
+syn keyword ngxDirectiveThirdParty contained echo_sleep
+syn keyword ngxDirectiveThirdParty contained echo_blocking_sleep
+syn keyword ngxDirectiveThirdParty contained echo_reset_timer
+syn keyword ngxDirectiveThirdParty contained echo_read_request_body
+syn keyword ngxDirectiveThirdParty contained echo_location_async
+syn keyword ngxDirectiveThirdParty contained echo_location
+syn keyword ngxDirectiveThirdParty contained echo_subrequest_async
+syn keyword ngxDirectiveThirdParty contained echo_subrequest
+syn keyword ngxDirectiveThirdParty contained echo_foreach_split
+syn keyword ngxDirectiveThirdParty contained echo_end
+syn keyword ngxDirectiveThirdParty contained echo_request_body
+syn keyword ngxDirectiveThirdParty contained echo_exec
+syn keyword ngxDirectiveThirdParty contained echo_status
+syn keyword ngxDirectiveThirdParty contained echo_before_body
+syn keyword ngxDirectiveThirdParty contained echo_after_body
 
 " Encrypted Session Module <https://github.com/openresty/encrypted-session-nginx-module>
 " Encrypt and decrypt nginx variable values
-syn keyword ngxDirectiveThirdParty encrypted_session_key
-syn keyword ngxDirectiveThirdParty encrypted_session_iv
-syn keyword ngxDirectiveThirdParty encrypted_session_expires
-syn keyword ngxDirectiveThirdParty set_encrypt_session
-syn keyword ngxDirectiveThirdParty set_decrypt_session
+syn keyword ngxDirectiveThirdParty contained encrypted_session_key
+syn keyword ngxDirectiveThirdParty contained encrypted_session_iv
+syn keyword ngxDirectiveThirdParty contained encrypted_session_expires
+syn keyword ngxDirectiveThirdParty contained set_encrypt_session
+syn keyword ngxDirectiveThirdParty contained set_decrypt_session
 
 " Enhanced Memcached Module <https://github.com/bpaquet/ngx_http_enhanced_memcached_module>
 " This module is based on the standard Nginx Memcached module, with some additonal features
-syn keyword ngxDirectiveThirdParty enhanced_memcached_pass
-syn keyword ngxDirectiveThirdParty enhanced_memcached_hash_keys_with_md5
-syn keyword ngxDirectiveThirdParty enhanced_memcached_allow_put
-syn keyword ngxDirectiveThirdParty enhanced_memcached_allow_delete
-syn keyword ngxDirectiveThirdParty enhanced_memcached_stats
-syn keyword ngxDirectiveThirdParty enhanced_memcached_flush
-syn keyword ngxDirectiveThirdParty enhanced_memcached_flush_namespace
-syn keyword ngxDirectiveThirdParty enhanced_memcached_bind
-syn keyword ngxDirectiveThirdParty enhanced_memcached_connect_timeout
-syn keyword ngxDirectiveThirdParty enhanced_memcached_send_timeout
-syn keyword ngxDirectiveThirdParty enhanced_memcached_buffer_size
-syn keyword ngxDirectiveThirdParty enhanced_memcached_read_timeout
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_pass
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_hash_keys_with_md5
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_allow_put
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_allow_delete
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_stats
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_flush
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_flush_namespace
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_bind
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_connect_timeout
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_send_timeout
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_buffer_size
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_read_timeout
 
 " Events Module (DEPRECATED) <http://docs.dutov.org/nginx_modules_events_en.html>
 " Provides options for start/stop events.
-syn keyword ngxDirectiveDeprecated on_start
-syn keyword ngxDirectiveDeprecated on_stop
+syn keyword ngxDirectiveDeprecated contained on_start
+syn keyword ngxDirectiveDeprecated contained on_stop
 
 " EY Balancer Module <https://github.com/ezmobius/nginx-ey-balancer>
 " Adds a request queue to Nginx that allows the limiting of concurrent requests passed to the upstream.
-syn keyword ngxDirectiveThirdParty max_connections
-syn keyword ngxDirectiveThirdParty max_connections_max_queue_length
-syn keyword ngxDirectiveThirdParty max_connections_queue_timeout
+syn keyword ngxDirectiveThirdParty contained max_connections
+syn keyword ngxDirectiveThirdParty contained max_connections_max_queue_length
+syn keyword ngxDirectiveThirdParty contained max_connections_queue_timeout
 
 " Upstream Fair Balancer <https://www.nginx.com/resources/wiki/modules/fair_balancer/>
 " Sends an incoming request to the least-busy backend server, rather than distributing requests round-robin.
-syn keyword ngxDirectiveThirdParty fair
-syn keyword ngxDirectiveThirdParty upstream_fair_shm_size
+syn keyword ngxDirectiveThirdParty contained fair
+syn keyword ngxDirectiveThirdParty contained upstream_fair_shm_size
 
 " Fancy Indexes Module <https://github.com/aperezdc/ngx-fancyindex>
 " Like the built-in autoindex module, but fancier.
-syn keyword ngxDirectiveThirdParty fancyindex
-syn keyword ngxDirectiveThirdParty fancyindex_default_sort
-syn keyword ngxDirectiveThirdParty fancyindex_directories_first
-syn keyword ngxDirectiveThirdParty fancyindex_css_href
-syn keyword ngxDirectiveThirdParty fancyindex_exact_size
-syn keyword ngxDirectiveThirdParty fancyindex_name_length
-syn keyword ngxDirectiveThirdParty fancyindex_footer
-syn keyword ngxDirectiveThirdParty fancyindex_header
-syn keyword ngxDirectiveThirdParty fancyindex_show_path
-syn keyword ngxDirectiveThirdParty fancyindex_ignore
-syn keyword ngxDirectiveThirdParty fancyindex_hide_symlinks
-syn keyword ngxDirectiveThirdParty fancyindex_localtime
-syn keyword ngxDirectiveThirdParty fancyindex_time_format
+syn keyword ngxDirectiveThirdParty contained fancyindex
+syn keyword ngxDirectiveThirdParty contained fancyindex_default_sort
+syn keyword ngxDirectiveThirdParty contained fancyindex_directories_first
+syn keyword ngxDirectiveThirdParty contained fancyindex_css_href
+syn keyword ngxDirectiveThirdParty contained fancyindex_exact_size
+syn keyword ngxDirectiveThirdParty contained fancyindex_name_length
+syn keyword ngxDirectiveThirdParty contained fancyindex_footer
+syn keyword ngxDirectiveThirdParty contained fancyindex_header
+syn keyword ngxDirectiveThirdParty contained fancyindex_show_path
+syn keyword ngxDirectiveThirdParty contained fancyindex_ignore
+syn keyword ngxDirectiveThirdParty contained fancyindex_hide_symlinks
+syn keyword ngxDirectiveThirdParty contained fancyindex_localtime
+syn keyword ngxDirectiveThirdParty contained fancyindex_time_format
 
 " Form Auth Module <https://github.com/veruu/ngx_form_auth>
 " Provides authentication and authorization with credentials submitted via POST request
-syn keyword ngxDirectiveThirdParty form_auth
-syn keyword ngxDirectiveThirdParty form_auth_pam_service
-syn keyword ngxDirectiveThirdParty form_auth_login
-syn keyword ngxDirectiveThirdParty form_auth_password
-syn keyword ngxDirectiveThirdParty form_auth_remote_user
+syn keyword ngxDirectiveThirdParty contained form_auth
+syn keyword ngxDirectiveThirdParty contained form_auth_pam_service
+syn keyword ngxDirectiveThirdParty contained form_auth_login
+syn keyword ngxDirectiveThirdParty contained form_auth_password
+syn keyword ngxDirectiveThirdParty contained form_auth_remote_user
 
 " Form Input Module <https://github.com/calio/form-input-nginx-module>
 " Reads HTTP POST and PUT request body encoded in "application/x-www-form-urlencoded" and parses the arguments into nginx variables.
-syn keyword ngxDirectiveThirdParty set_form_input
-syn keyword ngxDirectiveThirdParty set_form_input_multi
+syn keyword ngxDirectiveThirdParty contained set_form_input
+syn keyword ngxDirectiveThirdParty contained set_form_input_multi
 
 " GeoIP Module (DEPRECATED) <http://wiki.nginx.org/NginxHttp3rdPartyGeoIPModule>
 " Country code lookups via the MaxMind GeoIP API.
-syn keyword ngxDirectiveDeprecated geoip_country_file
+syn keyword ngxDirectiveDeprecated contained geoip_country_file
 
 " GeoIP 2 Module <https://github.com/leev/ngx_http_geoip2_module>
 " Creates variables with values from the maxmind geoip2 databases based on the client IP
-syn keyword ngxDirectiveThirdParty geoip2
+syn keyword ngxDirectiveThirdParty contained geoip2
 
 " GridFS Module <https://github.com/mdirolf/nginx-gridfs>
 " Nginx module for serving files from MongoDB's GridFS
-syn keyword ngxDirectiveThirdParty gridfs
+syn keyword ngxDirectiveThirdParty contained gridfs
 
 " Headers More Module <https://github.com/openresty/headers-more-nginx-module>
 " Set and clear input and output headers...more than "add"!
-syn keyword ngxDirectiveThirdParty more_clear_headers
-syn keyword ngxDirectiveThirdParty more_clear_input_headers
-syn keyword ngxDirectiveThirdParty more_set_headers
-syn keyword ngxDirectiveThirdParty more_set_input_headers
+syn keyword ngxDirectiveThirdParty contained more_clear_headers
+syn keyword ngxDirectiveThirdParty contained more_clear_input_headers
+syn keyword ngxDirectiveThirdParty contained more_set_headers
+syn keyword ngxDirectiveThirdParty contained more_set_input_headers
 
 " Health Checks Upstreams Module <https://www.nginx.com/resources/wiki/modules/healthcheck/>
 " Polls backends and if they respond with HTTP 200 + an optional request body, they are marked good. Otherwise, they are marked bad.
-syn keyword ngxDirectiveThirdParty healthcheck_enabled
-syn keyword ngxDirectiveThirdParty healthcheck_delay
-syn keyword ngxDirectiveThirdParty healthcheck_timeout
-syn keyword ngxDirectiveThirdParty healthcheck_failcount
-syn keyword ngxDirectiveThirdParty healthcheck_send
-syn keyword ngxDirectiveThirdParty healthcheck_expected
-syn keyword ngxDirectiveThirdParty healthcheck_buffer
-syn keyword ngxDirectiveThirdParty healthcheck_status
+syn keyword ngxDirectiveThirdParty contained healthcheck_enabled
+syn keyword ngxDirectiveThirdParty contained healthcheck_delay
+syn keyword ngxDirectiveThirdParty contained healthcheck_timeout
+syn keyword ngxDirectiveThirdParty contained healthcheck_failcount
+syn keyword ngxDirectiveThirdParty contained healthcheck_send
+syn keyword ngxDirectiveThirdParty contained healthcheck_expected
+syn keyword ngxDirectiveThirdParty contained healthcheck_buffer
+syn keyword ngxDirectiveThirdParty contained healthcheck_status
 
 " HTTP Accounting Module <https://github.com/Lax/ngx_http_accounting_module>
 " Add traffic stat function to nginx. Useful for http accounting based on nginx configuration logic
-syn keyword ngxDirectiveThirdParty http_accounting
-syn keyword ngxDirectiveThirdParty http_accounting_log
-syn keyword ngxDirectiveThirdParty http_accounting_id
-syn keyword ngxDirectiveThirdParty http_accounting_interval
-syn keyword ngxDirectiveThirdParty http_accounting_perturb
+syn keyword ngxDirectiveThirdParty contained http_accounting
+syn keyword ngxDirectiveThirdParty contained http_accounting_log
+syn keyword ngxDirectiveThirdParty contained http_accounting_id
+syn keyword ngxDirectiveThirdParty contained http_accounting_interval
+syn keyword ngxDirectiveThirdParty contained http_accounting_perturb
 
 " Nginx Digest Authentication module <https://github.com/atomx/nginx-http-auth-digest>
 " Digest Authentication for Nginx
-syn keyword ngxDirectiveThirdParty auth_digest
-syn keyword ngxDirectiveThirdParty auth_digest_user_file
-syn keyword ngxDirectiveThirdParty auth_digest_timeout
-syn keyword ngxDirectiveThirdParty auth_digest_expires
-syn keyword ngxDirectiveThirdParty auth_digest_replays
-syn keyword ngxDirectiveThirdParty auth_digest_shm_size
+syn keyword ngxDirectiveThirdParty contained auth_digest
+syn keyword ngxDirectiveThirdParty contained auth_digest_user_file
+syn keyword ngxDirectiveThirdParty contained auth_digest_timeout
+syn keyword ngxDirectiveThirdParty contained auth_digest_expires
+syn keyword ngxDirectiveThirdParty contained auth_digest_replays
+syn keyword ngxDirectiveThirdParty contained auth_digest_shm_size
 
 " Auth PAM Module <https://github.com/sto/ngx_http_auth_pam_module>
 " HTTP Basic Authentication using PAM.
-syn keyword ngxDirectiveThirdParty auth_pam
-syn keyword ngxDirectiveThirdParty auth_pam_service_name
+syn keyword ngxDirectiveThirdParty contained auth_pam
+syn keyword ngxDirectiveThirdParty contained auth_pam_service_name
 
 " HTTP Auth Request Module <http://nginx.org/en/docs/http/ngx_http_auth_request_module.html>
 " Implements client authorization based on the result of a subrequest
-" syn keyword ngxDirectiveThirdParty auth_request
-" syn keyword ngxDirectiveThirdParty auth_request_set
+" syn keyword ngxDirectiveThirdParty contained auth_request
+" syn keyword ngxDirectiveThirdParty contained auth_request_set
 
 " HTTP Concatenation module for Nginx <https://github.com/alibaba/nginx-http-concat>
 " A Nginx module for concatenating files in a given context: CSS and JS files usually
-syn keyword ngxDirectiveThirdParty concat
-syn keyword ngxDirectiveThirdParty concat_types
-syn keyword ngxDirectiveThirdParty concat_unique
-syn keyword ngxDirectiveThirdParty concat_max_files
-syn keyword ngxDirectiveThirdParty concat_delimiter
-syn keyword ngxDirectiveThirdParty concat_ignore_file_error
+syn keyword ngxDirectiveThirdParty contained concat
+syn keyword ngxDirectiveThirdParty contained concat_types
+syn keyword ngxDirectiveThirdParty contained concat_unique
+syn keyword ngxDirectiveThirdParty contained concat_max_files
+syn keyword ngxDirectiveThirdParty contained concat_delimiter
+syn keyword ngxDirectiveThirdParty contained concat_ignore_file_error
 
 " HTTP Dynamic Upstream Module <https://github.com/yzprofile/ngx_http_dyups_module>
 " Update upstreams' config by restful interface
-syn keyword ngxDirectiveThirdParty dyups_interface
-syn keyword ngxDirectiveThirdParty dyups_read_msg_timeout
-syn keyword ngxDirectiveThirdParty dyups_shm_zone_size
-syn keyword ngxDirectiveThirdParty dyups_upstream_conf
-syn keyword ngxDirectiveThirdParty dyups_trylock
+syn keyword ngxDirectiveThirdParty contained dyups_interface
+syn keyword ngxDirectiveThirdParty contained dyups_read_msg_timeout
+syn keyword ngxDirectiveThirdParty contained dyups_shm_zone_size
+syn keyword ngxDirectiveThirdParty contained dyups_upstream_conf
+syn keyword ngxDirectiveThirdParty contained dyups_trylock
 
 " HTTP Footer If Filter Module <https://github.com/flygoast/ngx_http_footer_if_filter>
 " The ngx_http_footer_if_filter_module is used to add given content to the end of the response according to the condition specified.
-syn keyword ngxDirectiveThirdParty footer_if
+syn keyword ngxDirectiveThirdParty contained footer_if
 
 " HTTP Footer Filter Module <https://github.com/alibaba/nginx-http-footer-filter>
 " This module implements a body filter that adds a given string to the page footer.
-syn keyword ngxDirectiveThirdParty footer
-syn keyword ngxDirectiveThirdParty footer_types
+syn keyword ngxDirectiveThirdParty contained footer
+syn keyword ngxDirectiveThirdParty contained footer_types
 
 " HTTP Internal Redirect Module <https://github.com/flygoast/ngx_http_internal_redirect>
 " Make an internal redirect to the uri specified according to the condition specified.
-syn keyword ngxDirectiveThirdParty internal_redirect_if
-syn keyword ngxDirectiveThirdParty internal_redirect_if_no_postponed
+syn keyword ngxDirectiveThirdParty contained internal_redirect_if
+syn keyword ngxDirectiveThirdParty contained internal_redirect_if_no_postponed
 
 " HTTP JavaScript Module <https://github.com/peter-leonov/ngx_http_js_module>
 " Embedding SpiderMonkey. Nearly full port on Perl module.
-syn keyword ngxDirectiveThirdParty js
-syn keyword ngxDirectiveThirdParty js_filter
-syn keyword ngxDirectiveThirdParty js_filter_types
-syn keyword ngxDirectiveThirdParty js_load
-syn keyword ngxDirectiveThirdParty js_maxmem
-syn keyword ngxDirectiveThirdParty js_require
-syn keyword ngxDirectiveThirdParty js_set
-syn keyword ngxDirectiveThirdParty js_utf8
+syn keyword ngxDirectiveThirdParty contained js
+syn keyword ngxDirectiveThirdParty contained js_filter
+syn keyword ngxDirectiveThirdParty contained js_filter_types
+syn keyword ngxDirectiveThirdParty contained js_load
+syn keyword ngxDirectiveThirdParty contained js_maxmem
+syn keyword ngxDirectiveThirdParty contained js_require
+syn keyword ngxDirectiveThirdParty contained js_set
+syn keyword ngxDirectiveThirdParty contained js_utf8
 
 " HTTP Push Module (DEPRECATED) <http://pushmodule.slact.net/>
 " Turn Nginx into an adept long-polling HTTP Push (Comet) server.
-syn keyword ngxDirectiveDeprecated push_buffer_size
-syn keyword ngxDirectiveDeprecated push_listener
-syn keyword ngxDirectiveDeprecated push_message_timeout
-syn keyword ngxDirectiveDeprecated push_queue_messages
-syn keyword ngxDirectiveDeprecated push_sender
+syn keyword ngxDirectiveDeprecated contained push_buffer_size
+syn keyword ngxDirectiveDeprecated contained push_listener
+syn keyword ngxDirectiveDeprecated contained push_message_timeout
+syn keyword ngxDirectiveDeprecated contained push_queue_messages
+syn keyword ngxDirectiveDeprecated contained push_sender
 
 " HTTP Redis Module <https://www.nginx.com/resources/wiki/modules/redis/>
 " Redis <http://code.google.com/p/redis/> support.
-syn keyword ngxDirectiveThirdParty redis_bind
-syn keyword ngxDirectiveThirdParty redis_buffer_size
-syn keyword ngxDirectiveThirdParty redis_connect_timeout
-syn keyword ngxDirectiveThirdParty redis_next_upstream
-syn keyword ngxDirectiveThirdParty redis_pass
-syn keyword ngxDirectiveThirdParty redis_read_timeout
-syn keyword ngxDirectiveThirdParty redis_send_timeout
+syn keyword ngxDirectiveThirdParty contained redis_bind
+syn keyword ngxDirectiveThirdParty contained redis_buffer_size
+syn keyword ngxDirectiveThirdParty contained redis_connect_timeout
+syn keyword ngxDirectiveThirdParty contained redis_next_upstream
+syn keyword ngxDirectiveThirdParty contained redis_pass
+syn keyword ngxDirectiveThirdParty contained redis_read_timeout
+syn keyword ngxDirectiveThirdParty contained redis_send_timeout
 
 " Iconv Module <https://github.com/calio/iconv-nginx-module>
 " A character conversion nginx module using libiconv
-syn keyword ngxDirectiveThirdParty set_iconv
-syn keyword ngxDirectiveThirdParty iconv_buffer_size
-syn keyword ngxDirectiveThirdParty iconv_filter
+syn keyword ngxDirectiveThirdParty contained set_iconv
+syn keyword ngxDirectiveThirdParty contained iconv_buffer_size
+syn keyword ngxDirectiveThirdParty contained iconv_filter
 
 " IP Blocker Module <https://github.com/tmthrgd/nginx-ip-blocker>
 " An efficient shared memory IP blocking system for nginx.
-syn keyword ngxDirectiveThirdParty ip_blocker
+syn keyword ngxDirectiveThirdParty contained ip_blocker
 
 " IP2Location Module <https://github.com/chrislim2888/ip2location-nginx>
 " Allows user to lookup for geolocation information using IP2Location database
-syn keyword ngxDirectiveThirdParty ip2location_database
+syn keyword ngxDirectiveThirdParty contained ip2location_database
 
 " JS Module <https://github.com/peter-leonov/ngx_http_js_module>
 " Reflect the nginx functionality in JS
-syn keyword ngxDirectiveThirdParty js
-syn keyword ngxDirectiveThirdParty js_access
-syn keyword ngxDirectiveThirdParty js_load
-syn keyword ngxDirectiveThirdParty js_set
+syn keyword ngxDirectiveThirdParty contained js
+syn keyword ngxDirectiveThirdParty contained js_access
+syn keyword ngxDirectiveThirdParty contained js_load
+syn keyword ngxDirectiveThirdParty contained js_set
 
 " Limit Upload Rate Module <https://github.com/cfsego/limit_upload_rate>
 " Limit client-upload rate when they are sending request bodies to you
-syn keyword ngxDirectiveThirdParty limit_upload_rate
-syn keyword ngxDirectiveThirdParty limit_upload_rate_after
+syn keyword ngxDirectiveThirdParty contained limit_upload_rate
+syn keyword ngxDirectiveThirdParty contained limit_upload_rate_after
 
 " Limit Upstream Module <https://github.com/cfsego/nginx-limit-upstream>
 " Limit the number of connections to upstream for NGINX
-syn keyword ngxDirectiveThirdParty limit_upstream_zone
-syn keyword ngxDirectiveThirdParty limit_upstream_conn
-syn keyword ngxDirectiveThirdParty limit_upstream_log_level
+syn keyword ngxDirectiveThirdParty contained limit_upstream_zone
+syn keyword ngxDirectiveThirdParty contained limit_upstream_conn
+syn keyword ngxDirectiveThirdParty contained limit_upstream_log_level
 
 " Log If Module <https://github.com/cfsego/ngx_log_if>
 " Conditional accesslog for nginx
-syn keyword ngxDirectiveThirdParty access_log_bypass_if
+syn keyword ngxDirectiveThirdParty contained access_log_bypass_if
 
 " Log Request Speed (DEPRECATED) <http://wiki.nginx.org/NginxHttpLogRequestSpeed>
 " Log the time it took to process each request.
-syn keyword ngxDirectiveDeprecated log_request_speed_filter
-syn keyword ngxDirectiveDeprecated log_request_speed_filter_timeout
+syn keyword ngxDirectiveDeprecated contained log_request_speed_filter
+syn keyword ngxDirectiveDeprecated contained log_request_speed_filter_timeout
 
 " Log ZeroMQ Module <https://github.com/alticelabs/nginx-log-zmq>
 " ZeroMQ logger module for nginx
-syn keyword ngxDirectiveThirdParty log_zmq_server
-syn keyword ngxDirectiveThirdParty log_zmq_endpoint
-syn keyword ngxDirectiveThirdParty log_zmq_format
-syn keyword ngxDirectiveThirdParty log_zmq_off
+syn keyword ngxDirectiveThirdParty contained log_zmq_server
+syn keyword ngxDirectiveThirdParty contained log_zmq_endpoint
+syn keyword ngxDirectiveThirdParty contained log_zmq_format
+syn keyword ngxDirectiveThirdParty contained log_zmq_off
 
 " Lower/UpperCase Module <https://github.com/replay/ngx_http_lower_upper_case>
 " This module simply uppercases or lowercases a string and saves it into a new variable.
-syn keyword ngxDirectiveThirdParty lower
-syn keyword ngxDirectiveThirdParty upper
+syn keyword ngxDirectiveThirdParty contained lower
+syn keyword ngxDirectiveThirdParty contained upper
 
 " Lua Upstream Module <https://github.com/openresty/lua-upstream-nginx-module>
 " Nginx C module to expose Lua API to ngx_lua for Nginx upstreams
 
 " Lua Module <https://github.com/openresty/lua-nginx-module>
 " Embed the Power of Lua into NGINX HTTP servers
-syn keyword ngxDirectiveThirdParty lua_use_default_type
-syn keyword ngxDirectiveThirdParty lua_malloc_trim
-syn keyword ngxDirectiveThirdParty lua_code_cache
-syn keyword ngxDirectiveThirdParty lua_regex_cache_max_entries
-syn keyword ngxDirectiveThirdParty lua_regex_match_limit
-syn keyword ngxDirectiveThirdParty lua_package_path
-syn keyword ngxDirectiveThirdParty lua_package_cpath
-syn keyword ngxDirectiveThirdParty init_by_lua
-syn keyword ngxDirectiveThirdParty init_by_lua_block
-syn keyword ngxDirectiveThirdParty init_by_lua_file
-syn keyword ngxDirectiveThirdParty init_worker_by_lua
-syn keyword ngxDirectiveThirdParty init_worker_by_lua_block
-syn keyword ngxDirectiveThirdParty init_worker_by_lua_file
-syn keyword ngxDirectiveThirdParty set_by_lua
-syn keyword ngxDirectiveThirdParty set_by_lua_block
-syn keyword ngxDirectiveThirdParty set_by_lua_file
-syn keyword ngxDirectiveThirdParty content_by_lua
-syn keyword ngxDirectiveThirdParty content_by_lua_block
-syn keyword ngxDirectiveThirdParty content_by_lua_file
-syn keyword ngxDirectiveThirdParty rewrite_by_lua
-syn keyword ngxDirectiveThirdParty rewrite_by_lua_block
-syn keyword ngxDirectiveThirdParty rewrite_by_lua_file
-syn keyword ngxDirectiveThirdParty access_by_lua
-syn keyword ngxDirectiveThirdParty access_by_lua_block
-syn keyword ngxDirectiveThirdParty access_by_lua_file
-syn keyword ngxDirectiveThirdParty header_filter_by_lua
-syn keyword ngxDirectiveThirdParty header_filter_by_lua_block
-syn keyword ngxDirectiveThirdParty header_filter_by_lua_file
-syn keyword ngxDirectiveThirdParty body_filter_by_lua
-syn keyword ngxDirectiveThirdParty body_filter_by_lua_block
-syn keyword ngxDirectiveThirdParty body_filter_by_lua_file
-syn keyword ngxDirectiveThirdParty log_by_lua
-syn keyword ngxDirectiveThirdParty log_by_lua_block
-syn keyword ngxDirectiveThirdParty log_by_lua_file
-syn keyword ngxDirectiveThirdParty balancer_by_lua_block
-syn keyword ngxDirectiveThirdParty balancer_by_lua_file
-syn keyword ngxDirectiveThirdParty lua_need_request_body
-syn keyword ngxDirectiveThirdParty ssl_certificate_by_lua_block
-syn keyword ngxDirectiveThirdParty ssl_certificate_by_lua_file
-syn keyword ngxDirectiveThirdParty ssl_session_fetch_by_lua_block
-syn keyword ngxDirectiveThirdParty ssl_session_fetch_by_lua_file
-syn keyword ngxDirectiveThirdParty ssl_session_store_by_lua_block
-syn keyword ngxDirectiveThirdParty ssl_session_store_by_lua_file
-syn keyword ngxDirectiveThirdParty lua_shared_dict
-syn keyword ngxDirectiveThirdParty lua_socket_connect_timeout
-syn keyword ngxDirectiveThirdParty lua_socket_send_timeout
-syn keyword ngxDirectiveThirdParty lua_socket_send_lowat
-syn keyword ngxDirectiveThirdParty lua_socket_read_timeout
-syn keyword ngxDirectiveThirdParty lua_socket_buffer_size
-syn keyword ngxDirectiveThirdParty lua_socket_pool_size
-syn keyword ngxDirectiveThirdParty lua_socket_keepalive_timeout
-syn keyword ngxDirectiveThirdParty lua_socket_log_errors
-syn keyword ngxDirectiveThirdParty lua_ssl_ciphers
-syn keyword ngxDirectiveThirdParty lua_ssl_crl
-syn keyword ngxDirectiveThirdParty lua_ssl_protocols
-syn keyword ngxDirectiveThirdParty lua_ssl_trusted_certificate
-syn keyword ngxDirectiveThirdParty lua_ssl_verify_depth
-syn keyword ngxDirectiveThirdParty lua_http10_buffering
-syn keyword ngxDirectiveThirdParty rewrite_by_lua_no_postpone
-syn keyword ngxDirectiveThirdParty access_by_lua_no_postpone
-syn keyword ngxDirectiveThirdParty lua_transform_underscores_in_response_headers
-syn keyword ngxDirectiveThirdParty lua_check_client_abort
-syn keyword ngxDirectiveThirdParty lua_max_pending_timers
-syn keyword ngxDirectiveThirdParty lua_max_running_timers
+syn keyword ngxDirectiveThirdParty contained lua_use_default_type
+syn keyword ngxDirectiveThirdParty contained lua_malloc_trim
+syn keyword ngxDirectiveThirdParty contained lua_code_cache
+syn keyword ngxDirectiveThirdParty contained lua_regex_cache_max_entries
+syn keyword ngxDirectiveThirdParty contained lua_regex_match_limit
+syn keyword ngxDirectiveThirdParty contained lua_package_path
+syn keyword ngxDirectiveThirdParty contained lua_package_cpath
+syn keyword ngxDirectiveThirdParty contained init_by_lua
+syn keyword ngxDirectiveThirdParty contained init_by_lua_block
+syn keyword ngxDirectiveThirdParty contained init_by_lua_file
+syn keyword ngxDirectiveThirdParty contained init_worker_by_lua
+syn keyword ngxDirectiveThirdParty contained init_worker_by_lua_block
+syn keyword ngxDirectiveThirdParty contained init_worker_by_lua_file
+syn keyword ngxDirectiveThirdParty contained set_by_lua
+syn keyword ngxDirectiveThirdParty contained set_by_lua_block
+syn keyword ngxDirectiveThirdParty contained set_by_lua_file
+syn keyword ngxDirectiveThirdParty contained content_by_lua
+syn keyword ngxDirectiveThirdParty contained content_by_lua_block
+syn keyword ngxDirectiveThirdParty contained content_by_lua_file
+syn keyword ngxDirectiveThirdParty contained rewrite_by_lua
+syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_block
+syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_file
+syn keyword ngxDirectiveThirdParty contained access_by_lua
+syn keyword ngxDirectiveThirdParty contained access_by_lua_block
+syn keyword ngxDirectiveThirdParty contained access_by_lua_file
+syn keyword ngxDirectiveThirdParty contained header_filter_by_lua
+syn keyword ngxDirectiveThirdParty contained header_filter_by_lua_block
+syn keyword ngxDirectiveThirdParty contained header_filter_by_lua_file
+syn keyword ngxDirectiveThirdParty contained body_filter_by_lua
+syn keyword ngxDirectiveThirdParty contained body_filter_by_lua_block
+syn keyword ngxDirectiveThirdParty contained body_filter_by_lua_file
+syn keyword ngxDirectiveThirdParty contained log_by_lua
+syn keyword ngxDirectiveThirdParty contained log_by_lua_block
+syn keyword ngxDirectiveThirdParty contained log_by_lua_file
+syn keyword ngxDirectiveThirdParty contained balancer_by_lua_block
+syn keyword ngxDirectiveThirdParty contained balancer_by_lua_file
+syn keyword ngxDirectiveThirdParty contained lua_need_request_body
+syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_block
+syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_file
+syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_block
+syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_file
+syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_block
+syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_file
+syn keyword ngxDirectiveThirdParty contained lua_shared_dict
+syn keyword ngxDirectiveThirdParty contained lua_socket_connect_timeout
+syn keyword ngxDirectiveThirdParty contained lua_socket_send_timeout
+syn keyword ngxDirectiveThirdParty contained lua_socket_send_lowat
+syn keyword ngxDirectiveThirdParty contained lua_socket_read_timeout
+syn keyword ngxDirectiveThirdParty contained lua_socket_buffer_size
+syn keyword ngxDirectiveThirdParty contained lua_socket_pool_size
+syn keyword ngxDirectiveThirdParty contained lua_socket_keepalive_timeout
+syn keyword ngxDirectiveThirdParty contained lua_socket_log_errors
+syn keyword ngxDirectiveThirdParty contained lua_ssl_ciphers
+syn keyword ngxDirectiveThirdParty contained lua_ssl_crl
+syn keyword ngxDirectiveThirdParty contained lua_ssl_protocols
+syn keyword ngxDirectiveThirdParty contained lua_ssl_trusted_certificate
+syn keyword ngxDirectiveThirdParty contained lua_ssl_verify_depth
+syn keyword ngxDirectiveThirdParty contained lua_http10_buffering
+syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_no_postpone
+syn keyword ngxDirectiveThirdParty contained access_by_lua_no_postpone
+syn keyword ngxDirectiveThirdParty contained lua_transform_underscores_in_response_headers
+syn keyword ngxDirectiveThirdParty contained lua_check_client_abort
+syn keyword ngxDirectiveThirdParty contained lua_max_pending_timers
+syn keyword ngxDirectiveThirdParty contained lua_max_running_timers
 
 " MD5 Filter Module <https://github.com/kainswor/nginx_md5_filter>
 " A content filter for nginx, which returns the md5 hash of the content otherwise returned.
-syn keyword ngxDirectiveThirdParty md5_filter
+syn keyword ngxDirectiveThirdParty contained md5_filter
 
 " Memc Module <https://github.com/openresty/memc-nginx-module>
 " An extended version of the standard memcached module that supports set, add, delete, and many more memcached commands.
-syn keyword ngxDirectiveThirdParty memc_buffer_size
-syn keyword ngxDirectiveThirdParty memc_cmds_allowed
-syn keyword ngxDirectiveThirdParty memc_connect_timeout
-syn keyword ngxDirectiveThirdParty memc_flags_to_last_modified
-syn keyword ngxDirectiveThirdParty memc_next_upstream
-syn keyword ngxDirectiveThirdParty memc_pass
-syn keyword ngxDirectiveThirdParty memc_read_timeout
-syn keyword ngxDirectiveThirdParty memc_send_timeout
-syn keyword ngxDirectiveThirdParty memc_upstream_fail_timeout
-syn keyword ngxDirectiveThirdParty memc_upstream_max_fails
+syn keyword ngxDirectiveThirdParty contained memc_buffer_size
+syn keyword ngxDirectiveThirdParty contained memc_cmds_allowed
+syn keyword ngxDirectiveThirdParty contained memc_connect_timeout
+syn keyword ngxDirectiveThirdParty contained memc_flags_to_last_modified
+syn keyword ngxDirectiveThirdParty contained memc_next_upstream
+syn keyword ngxDirectiveThirdParty contained memc_pass
+syn keyword ngxDirectiveThirdParty contained memc_read_timeout
+syn keyword ngxDirectiveThirdParty contained memc_send_timeout
+syn keyword ngxDirectiveThirdParty contained memc_upstream_fail_timeout
+syn keyword ngxDirectiveThirdParty contained memc_upstream_max_fails
 
 " Mod Security Module <https://github.com/SpiderLabs/ModSecurity>
 " ModSecurity is an open source, cross platform web application firewall (WAF) engine
-syn keyword ngxDirectiveThirdParty ModSecurityConfig
-syn keyword ngxDirectiveThirdParty ModSecurityEnabled
-syn keyword ngxDirectiveThirdParty pool_context
-syn keyword ngxDirectiveThirdParty pool_context_hash_size
+syn keyword ngxDirectiveThirdParty contained ModSecurityConfig
+syn keyword ngxDirectiveThirdParty contained ModSecurityEnabled
+syn keyword ngxDirectiveThirdParty contained pool_context
+syn keyword ngxDirectiveThirdParty contained pool_context_hash_size
 
 " Mogilefs Module <http://www.grid.net.ru/nginx/mogilefs.en.html>
 " MogileFS client for nginx web server.
-syn keyword ngxDirectiveThirdParty mogilefs_pass
-syn keyword ngxDirectiveThirdParty mogilefs_methods
-syn keyword ngxDirectiveThirdParty mogilefs_domain
-syn keyword ngxDirectiveThirdParty mogilefs_class
-syn keyword ngxDirectiveThirdParty mogilefs_tracker
-syn keyword ngxDirectiveThirdParty mogilefs_noverify
-syn keyword ngxDirectiveThirdParty mogilefs_connect_timeout
-syn keyword ngxDirectiveThirdParty mogilefs_send_timeout
-syn keyword ngxDirectiveThirdParty mogilefs_read_timeout
+syn keyword ngxDirectiveThirdParty contained mogilefs_pass
+syn keyword ngxDirectiveThirdParty contained mogilefs_methods
+syn keyword ngxDirectiveThirdParty contained mogilefs_domain
+syn keyword ngxDirectiveThirdParty contained mogilefs_class
+syn keyword ngxDirectiveThirdParty contained mogilefs_tracker
+syn keyword ngxDirectiveThirdParty contained mogilefs_noverify
+syn keyword ngxDirectiveThirdParty contained mogilefs_connect_timeout
+syn keyword ngxDirectiveThirdParty contained mogilefs_send_timeout
+syn keyword ngxDirectiveThirdParty contained mogilefs_read_timeout
 
 " Mongo Module <https://github.com/simpl/ngx_mongo>
 " Upstream module that allows nginx to communicate directly with MongoDB database.
-syn keyword ngxDirectiveThirdParty mongo_auth
-syn keyword ngxDirectiveThirdParty mongo_pass
-syn keyword ngxDirectiveThirdParty mongo_query
-syn keyword ngxDirectiveThirdParty mongo_json
-syn keyword ngxDirectiveThirdParty mongo_bind
-syn keyword ngxDirectiveThirdParty mongo_connect_timeout
-syn keyword ngxDirectiveThirdParty mongo_send_timeout
-syn keyword ngxDirectiveThirdParty mongo_read_timeout
-syn keyword ngxDirectiveThirdParty mongo_buffering
-syn keyword ngxDirectiveThirdParty mongo_buffer_size
-syn keyword ngxDirectiveThirdParty mongo_buffers
-syn keyword ngxDirectiveThirdParty mongo_busy_buffers_size
-syn keyword ngxDirectiveThirdParty mongo_next_upstream
+syn keyword ngxDirectiveThirdParty contained mongo_auth
+syn keyword ngxDirectiveThirdParty contained mongo_pass
+syn keyword ngxDirectiveThirdParty contained mongo_query
+syn keyword ngxDirectiveThirdParty contained mongo_json
+syn keyword ngxDirectiveThirdParty contained mongo_bind
+syn keyword ngxDirectiveThirdParty contained mongo_connect_timeout
+syn keyword ngxDirectiveThirdParty contained mongo_send_timeout
+syn keyword ngxDirectiveThirdParty contained mongo_read_timeout
+syn keyword ngxDirectiveThirdParty contained mongo_buffering
+syn keyword ngxDirectiveThirdParty contained mongo_buffer_size
+syn keyword ngxDirectiveThirdParty contained mongo_buffers
+syn keyword ngxDirectiveThirdParty contained mongo_busy_buffers_size
+syn keyword ngxDirectiveThirdParty contained mongo_next_upstream
 
 " MP4 Streaming Lite Module <https://www.nginx.com/resources/wiki/modules/mp4_streaming/>
 " Will seek to a certain time within H.264/MP4 files when provided with a 'start' parameter in the URL.
-" syn keyword ngxDirectiveThirdParty mp4
+" syn keyword ngxDirectiveThirdParty contained mp4
 
 " NAXSI Module <https://github.com/nbs-system/naxsi>
 " NAXSI is an open-source, high performance, low rules maintenance WAF for NGINX
-syn keyword ngxDirectiveThirdParty DeniedUrl denied_url
-syn keyword ngxDirectiveThirdParty LearningMode learning_mode
-syn keyword ngxDirectiveThirdParty SecRulesEnabled rules_enabled
-syn keyword ngxDirectiveThirdParty SecRulesDisabled rules_disabled
-syn keyword ngxDirectiveThirdParty CheckRule check_rule
-syn keyword ngxDirectiveThirdParty BasicRule basic_rule
-syn keyword ngxDirectiveThirdParty MainRule main_rule
-syn keyword ngxDirectiveThirdParty LibInjectionSql libinjection_sql
-syn keyword ngxDirectiveThirdParty LibInjectionXss libinjection_xss
+syn keyword ngxDirectiveThirdParty contained DeniedUrl denied_url
+syn keyword ngxDirectiveThirdParty contained LearningMode learning_mode
+syn keyword ngxDirectiveThirdParty contained SecRulesEnabled rules_enabled
+syn keyword ngxDirectiveThirdParty contained SecRulesDisabled rules_disabled
+syn keyword ngxDirectiveThirdParty contained CheckRule check_rule
+syn keyword ngxDirectiveThirdParty contained BasicRule basic_rule
+syn keyword ngxDirectiveThirdParty contained MainRule main_rule
+syn keyword ngxDirectiveThirdParty contained LibInjectionSql libinjection_sql
+syn keyword ngxDirectiveThirdParty contained LibInjectionXss libinjection_xss
 
 " Nchan Module <https://nchan.slact.net/>
 " Fast, horizontally scalable, multiprocess pub/sub queuing server and proxy for HTTP, long-polling, Websockets and EventSource (SSE)
-syn keyword ngxDirectiveThirdParty nchan_channel_id
-syn keyword ngxDirectiveThirdParty nchan_channel_id_split_delimiter
-syn keyword ngxDirectiveThirdParty nchan_eventsource_event
-syn keyword ngxDirectiveThirdParty nchan_longpoll_multipart_response
-syn keyword ngxDirectiveThirdParty nchan_publisher
-syn keyword ngxDirectiveThirdParty nchan_publisher_channel_id
-syn keyword ngxDirectiveThirdParty nchan_publisher_upstream_request
-syn keyword ngxDirectiveThirdParty nchan_pubsub
-syn keyword ngxDirectiveThirdParty nchan_subscribe_request
-syn keyword ngxDirectiveThirdParty nchan_subscriber
-syn keyword ngxDirectiveThirdParty nchan_subscriber_channel_id
-syn keyword ngxDirectiveThirdParty nchan_subscriber_compound_etag_message_id
-syn keyword ngxDirectiveThirdParty nchan_subscriber_first_message
-syn keyword ngxDirectiveThirdParty nchan_subscriber_http_raw_stream_separator
-syn keyword ngxDirectiveThirdParty nchan_subscriber_last_message_id
-syn keyword ngxDirectiveThirdParty nchan_subscriber_message_id_custom_etag_header
-syn keyword ngxDirectiveThirdParty nchan_subscriber_timeout
-syn keyword ngxDirectiveThirdParty nchan_unsubscribe_request
-syn keyword ngxDirectiveThirdParty nchan_websocket_ping_interval
-syn keyword ngxDirectiveThirdParty nchan_authorize_request
-syn keyword ngxDirectiveThirdParty nchan_max_reserved_memory
-syn keyword ngxDirectiveThirdParty nchan_message_buffer_length
-syn keyword ngxDirectiveThirdParty nchan_message_timeout
-syn keyword ngxDirectiveThirdParty nchan_redis_idle_channel_cache_timeout
-syn keyword ngxDirectiveThirdParty nchan_redis_namespace
-syn keyword ngxDirectiveThirdParty nchan_redis_pass
-syn keyword ngxDirectiveThirdParty nchan_redis_ping_interval
-syn keyword ngxDirectiveThirdParty nchan_redis_server
-syn keyword ngxDirectiveThirdParty nchan_redis_storage_mode
-syn keyword ngxDirectiveThirdParty nchan_redis_url
-syn keyword ngxDirectiveThirdParty nchan_store_messages
-syn keyword ngxDirectiveThirdParty nchan_use_redis
-syn keyword ngxDirectiveThirdParty nchan_access_control_allow_origin
-syn keyword ngxDirectiveThirdParty nchan_channel_group
-syn keyword ngxDirectiveThirdParty nchan_channel_group_accounting
-syn keyword ngxDirectiveThirdParty nchan_group_location
-syn keyword ngxDirectiveThirdParty nchan_group_max_channels
-syn keyword ngxDirectiveThirdParty nchan_group_max_messages
-syn keyword ngxDirectiveThirdParty nchan_group_max_messages_disk
-syn keyword ngxDirectiveThirdParty nchan_group_max_messages_memory
-syn keyword ngxDirectiveThirdParty nchan_group_max_subscribers
-syn keyword ngxDirectiveThirdParty nchan_subscribe_existing_channels_only
-syn keyword ngxDirectiveThirdParty nchan_channel_event_string
-syn keyword ngxDirectiveThirdParty nchan_channel_events_channel_id
-syn keyword ngxDirectiveThirdParty nchan_stub_status
-syn keyword ngxDirectiveThirdParty nchan_max_channel_id_length
-syn keyword ngxDirectiveThirdParty nchan_max_channel_subscribers
-syn keyword ngxDirectiveThirdParty nchan_channel_timeout
-syn keyword ngxDirectiveThirdParty nchan_storage_engine
+syn keyword ngxDirectiveThirdParty contained nchan_channel_id
+syn keyword ngxDirectiveThirdParty contained nchan_channel_id_split_delimiter
+syn keyword ngxDirectiveThirdParty contained nchan_eventsource_event
+syn keyword ngxDirectiveThirdParty contained nchan_longpoll_multipart_response
+syn keyword ngxDirectiveThirdParty contained nchan_publisher
+syn keyword ngxDirectiveThirdParty contained nchan_publisher_channel_id
+syn keyword ngxDirectiveThirdParty contained nchan_publisher_upstream_request
+syn keyword ngxDirectiveThirdParty contained nchan_pubsub
+syn keyword ngxDirectiveThirdParty contained nchan_subscribe_request
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_channel_id
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_compound_etag_message_id
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_first_message
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_http_raw_stream_separator
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_last_message_id
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_message_id_custom_etag_header
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_unsubscribe_request
+syn keyword ngxDirectiveThirdParty contained nchan_websocket_ping_interval
+syn keyword ngxDirectiveThirdParty contained nchan_authorize_request
+syn keyword ngxDirectiveThirdParty contained nchan_max_reserved_memory
+syn keyword ngxDirectiveThirdParty contained nchan_message_buffer_length
+syn keyword ngxDirectiveThirdParty contained nchan_message_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_cache_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_redis_namespace
+syn keyword ngxDirectiveThirdParty contained nchan_redis_pass
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ping_interval
+syn keyword ngxDirectiveThirdParty contained nchan_redis_server
+syn keyword ngxDirectiveThirdParty contained nchan_redis_storage_mode
+syn keyword ngxDirectiveThirdParty contained nchan_redis_url
+syn keyword ngxDirectiveThirdParty contained nchan_store_messages
+syn keyword ngxDirectiveThirdParty contained nchan_use_redis
+syn keyword ngxDirectiveThirdParty contained nchan_access_control_allow_origin
+syn keyword ngxDirectiveThirdParty contained nchan_channel_group
+syn keyword ngxDirectiveThirdParty contained nchan_channel_group_accounting
+syn keyword ngxDirectiveThirdParty contained nchan_group_location
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_channels
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages_disk
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages_memory
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_subscribers
+syn keyword ngxDirectiveThirdParty contained nchan_subscribe_existing_channels_only
+syn keyword ngxDirectiveThirdParty contained nchan_channel_event_string
+syn keyword ngxDirectiveThirdParty contained nchan_channel_events_channel_id
+syn keyword ngxDirectiveThirdParty contained nchan_stub_status
+syn keyword ngxDirectiveThirdParty contained nchan_max_channel_id_length
+syn keyword ngxDirectiveThirdParty contained nchan_max_channel_subscribers
+syn keyword ngxDirectiveThirdParty contained nchan_channel_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_storage_engine
 
 " Nginx Notice Module <https://github.com/kr/nginx-notice>
 " Serve static file to POST requests.
-syn keyword ngxDirectiveThirdParty notice
-syn keyword ngxDirectiveThirdParty notice_type
+syn keyword ngxDirectiveThirdParty contained notice
+syn keyword ngxDirectiveThirdParty contained notice_type
 
 " OCSP Proxy Module <https://github.com/kyprizel/nginx_ocsp_proxy-module>
 " Nginx OCSP processing module designed for response caching
-syn keyword ngxDirectiveThirdParty ocsp_proxy
-syn keyword ngxDirectiveThirdParty ocsp_cache_timeout
+syn keyword ngxDirectiveThirdParty contained ocsp_proxy
+syn keyword ngxDirectiveThirdParty contained ocsp_cache_timeout
 
 " Eval Module <https://github.com/openresty/nginx-eval-module>
 " Module for nginx web server evaluates response of proxy or memcached module into variables.
-syn keyword ngxDirectiveThirdParty eval
-syn keyword ngxDirectiveThirdParty eval_escalate
-syn keyword ngxDirectiveThirdParty eval_buffer_size
-syn keyword ngxDirectiveThirdParty eval_override_content_type
-syn keyword ngxDirectiveThirdParty eval_subrequest_in_memory
+syn keyword ngxDirectiveThirdParty contained eval
+syn keyword ngxDirectiveThirdParty contained eval_escalate
+syn keyword ngxDirectiveThirdParty contained eval_buffer_size
+syn keyword ngxDirectiveThirdParty contained eval_override_content_type
+syn keyword ngxDirectiveThirdParty contained eval_subrequest_in_memory
 
 " OpenSSL Version Module <https://github.com/apcera/nginx-openssl-version>
 " Nginx OpenSSL version check at startup
-syn keyword ngxDirectiveThirdParty openssl_version_minimum
-syn keyword ngxDirectiveThirdParty openssl_builddate_minimum
+syn keyword ngxDirectiveThirdParty contained openssl_version_minimum
+syn keyword ngxDirectiveThirdParty contained openssl_builddate_minimum
 
 " Owner Match Module <https://www.nginx.com/resources/wiki/modules/owner_match/>
 " Control access for specific owners and groups of files
-syn keyword ngxDirectiveThirdParty omallow
-syn keyword ngxDirectiveThirdParty omdeny
+syn keyword ngxDirectiveThirdParty contained omallow
+syn keyword ngxDirectiveThirdParty contained omdeny
 
 " Accept Language Module <https://www.nginx.com/resources/wiki/modules/accept_language/>
 " Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
-syn keyword ngxDirectiveThirdParty pagespeed
+syn keyword ngxDirectiveThirdParty contained pagespeed
 
 " PHP Memcache Standard Balancer Module <https://github.com/replay/ngx_http_php_memcache_standard_balancer>
 " Loadbalancer that is compatible to the standard loadbalancer in the php-memcache module
-syn keyword ngxDirectiveThirdParty hash_key
+syn keyword ngxDirectiveThirdParty contained hash_key
 
 " PHP Session Module <https://github.com/replay/ngx_http_php_session>
 " Nginx module to parse php sessions
-syn keyword ngxDirectiveThirdParty php_session_parse
-syn keyword ngxDirectiveThirdParty php_session_strip_formatting
+syn keyword ngxDirectiveThirdParty contained php_session_parse
+syn keyword ngxDirectiveThirdParty contained php_session_strip_formatting
 
 " Phusion Passenger Module <https://www.phusionpassenger.com/library/config/nginx/>
 " Passenger is an open source web application server.
-syn keyword ngxDirectiveThirdParty passenger_root
-syn keyword ngxDirectiveThirdParty passenger_enabled
-syn keyword ngxDirectiveThirdParty passenger_base_uri
-syn keyword ngxDirectiveThirdParty passenger_document_root
-syn keyword ngxDirectiveThirdParty passenger_ruby
-syn keyword ngxDirectiveThirdParty passenger_python
-syn keyword ngxDirectiveThirdParty passenger_nodejs
-syn keyword ngxDirectiveThirdParty passenger_meteor_app_settings
-syn keyword ngxDirectiveThirdParty passenger_app_env
-syn keyword ngxDirectiveThirdParty passenger_app_root
-syn keyword ngxDirectiveThirdParty passenger_app_group_name
-syn keyword ngxDirectiveThirdParty passenger_app_type
-syn keyword ngxDirectiveThirdParty passenger_startup_file
-syn keyword ngxDirectiveThirdParty passenger_restart_dir
-syn keyword ngxDirectiveThirdParty passenger_spawn_method
-syn keyword ngxDirectiveThirdParty passenger_env_var
-syn keyword ngxDirectiveThirdParty passenger_load_shell_envvars
-syn keyword ngxDirectiveThirdParty passenger_rolling_restarts
-syn keyword ngxDirectiveThirdParty passenger_resist_deployment_errors
-syn keyword ngxDirectiveThirdParty passenger_user_switching
-syn keyword ngxDirectiveThirdParty passenger_user
-syn keyword ngxDirectiveThirdParty passenger_group
-syn keyword ngxDirectiveThirdParty passenger_default_user
-syn keyword ngxDirectiveThirdParty passenger_default_group
-syn keyword ngxDirectiveThirdParty passenger_show_version_in_header
-syn keyword ngxDirectiveThirdParty passenger_friendly_error_pages
-syn keyword ngxDirectiveThirdParty passenger_disable_security_update_check
-syn keyword ngxDirectiveThirdParty passenger_security_update_check_proxy
-syn keyword ngxDirectiveThirdParty passenger_max_pool_size
-syn keyword ngxDirectiveThirdParty passenger_min_instances
-syn keyword ngxDirectiveThirdParty passenger_max_instances
-syn keyword ngxDirectiveThirdParty passenger_max_instances_per_app
-syn keyword ngxDirectiveThirdParty passenger_pool_idle_time
-syn keyword ngxDirectiveThirdParty passenger_max_preloader_idle_time
-syn keyword ngxDirectiveThirdParty passenger_force_max_concurrent_requests_per_process
-syn keyword ngxDirectiveThirdParty passenger_start_timeout
-syn keyword ngxDirectiveThirdParty passenger_concurrency_model
-syn keyword ngxDirectiveThirdParty passenger_thread_count
-syn keyword ngxDirectiveThirdParty passenger_max_requests
-syn keyword ngxDirectiveThirdParty passenger_max_request_time
-syn keyword ngxDirectiveThirdParty passenger_memory_limit
-syn keyword ngxDirectiveThirdParty passenger_stat_throttle_rate
-syn keyword ngxDirectiveThirdParty passenger_core_file_descriptor_ulimit
-syn keyword ngxDirectiveThirdParty passenger_app_file_descriptor_ulimit
-syn keyword ngxDirectiveThirdParty passenger_pre_start
-syn keyword ngxDirectiveThirdParty passenger_set_header
-syn keyword ngxDirectiveThirdParty passenger_max_request_queue_size
-syn keyword ngxDirectiveThirdParty passenger_request_queue_overflow_status_code
-syn keyword ngxDirectiveThirdParty passenger_sticky_sessions
-syn keyword ngxDirectiveThirdParty passenger_sticky_sessions_cookie_name
-syn keyword ngxDirectiveThirdParty passenger_abort_websockets_on_process_shutdown
-syn keyword ngxDirectiveThirdParty passenger_ignore_client_abort
-syn keyword ngxDirectiveThirdParty passenger_intercept_errors
-syn keyword ngxDirectiveThirdParty passenger_pass_header
-syn keyword ngxDirectiveThirdParty passenger_ignore_headers
-syn keyword ngxDirectiveThirdParty passenger_headers_hash_bucket_size
-syn keyword ngxDirectiveThirdParty passenger_headers_hash_max_size
-syn keyword ngxDirectiveThirdParty passenger_buffer_response
-syn keyword ngxDirectiveThirdParty passenger_response_buffer_high_watermark
-syn keyword ngxDirectiveThirdParty passenger_buffer_size, passenger_buffers, passenger_busy_buffers_size
-syn keyword ngxDirectiveThirdParty passenger_socket_backlog
-syn keyword ngxDirectiveThirdParty passenger_log_level
-syn keyword ngxDirectiveThirdParty passenger_log_file
-syn keyword ngxDirectiveThirdParty passenger_file_descriptor_log_file
-syn keyword ngxDirectiveThirdParty passenger_debugger
-syn keyword ngxDirectiveThirdParty passenger_instance_registry_dir
-syn keyword ngxDirectiveThirdParty passenger_data_buffer_dir
-syn keyword ngxDirectiveThirdParty passenger_fly_with
-syn keyword ngxDirectiveThirdParty union_station_support
-syn keyword ngxDirectiveThirdParty union_station_key
-syn keyword ngxDirectiveThirdParty union_station_proxy_address
-syn keyword ngxDirectiveThirdParty union_station_filter
-syn keyword ngxDirectiveThirdParty union_station_gateway_address
-syn keyword ngxDirectiveThirdParty union_station_gateway_port
-syn keyword ngxDirectiveThirdParty union_station_gateway_cert
-syn keyword ngxDirectiveDeprecated rails_spawn_method
-syn keyword ngxDirectiveDeprecated passenger_debug_log_file
+syn keyword ngxDirectiveThirdParty contained passenger_root
+syn keyword ngxDirectiveThirdParty contained passenger_enabled
+syn keyword ngxDirectiveThirdParty contained passenger_base_uri
+syn keyword ngxDirectiveThirdParty contained passenger_document_root
+syn keyword ngxDirectiveThirdParty contained passenger_ruby
+syn keyword ngxDirectiveThirdParty contained passenger_python
+syn keyword ngxDirectiveThirdParty contained passenger_nodejs
+syn keyword ngxDirectiveThirdParty contained passenger_meteor_app_settings
+syn keyword ngxDirectiveThirdParty contained passenger_app_env
+syn keyword ngxDirectiveThirdParty contained passenger_app_root
+syn keyword ngxDirectiveThirdParty contained passenger_app_group_name
+syn keyword ngxDirectiveThirdParty contained passenger_app_type
+syn keyword ngxDirectiveThirdParty contained passenger_startup_file
+syn keyword ngxDirectiveThirdParty contained passenger_restart_dir
+syn keyword ngxDirectiveThirdParty contained passenger_spawn_method
+syn keyword ngxDirectiveThirdParty contained passenger_env_var
+syn keyword ngxDirectiveThirdParty contained passenger_load_shell_envvars
+syn keyword ngxDirectiveThirdParty contained passenger_rolling_restarts
+syn keyword ngxDirectiveThirdParty contained passenger_resist_deployment_errors
+syn keyword ngxDirectiveThirdParty contained passenger_user_switching
+syn keyword ngxDirectiveThirdParty contained passenger_user
+syn keyword ngxDirectiveThirdParty contained passenger_group
+syn keyword ngxDirectiveThirdParty contained passenger_default_user
+syn keyword ngxDirectiveThirdParty contained passenger_default_group
+syn keyword ngxDirectiveThirdParty contained passenger_show_version_in_header
+syn keyword ngxDirectiveThirdParty contained passenger_friendly_error_pages
+syn keyword ngxDirectiveThirdParty contained passenger_disable_security_update_check
+syn keyword ngxDirectiveThirdParty contained passenger_security_update_check_proxy
+syn keyword ngxDirectiveThirdParty contained passenger_max_pool_size
+syn keyword ngxDirectiveThirdParty contained passenger_min_instances
+syn keyword ngxDirectiveThirdParty contained passenger_max_instances
+syn keyword ngxDirectiveThirdParty contained passenger_max_instances_per_app
+syn keyword ngxDirectiveThirdParty contained passenger_pool_idle_time
+syn keyword ngxDirectiveThirdParty contained passenger_max_preloader_idle_time
+syn keyword ngxDirectiveThirdParty contained passenger_force_max_concurrent_requests_per_process
+syn keyword ngxDirectiveThirdParty contained passenger_start_timeout
+syn keyword ngxDirectiveThirdParty contained passenger_concurrency_model
+syn keyword ngxDirectiveThirdParty contained passenger_thread_count
+syn keyword ngxDirectiveThirdParty contained passenger_max_requests
+syn keyword ngxDirectiveThirdParty contained passenger_max_request_time
+syn keyword ngxDirectiveThirdParty contained passenger_memory_limit
+syn keyword ngxDirectiveThirdParty contained passenger_stat_throttle_rate
+syn keyword ngxDirectiveThirdParty contained passenger_core_file_descriptor_ulimit
+syn keyword ngxDirectiveThirdParty contained passenger_app_file_descriptor_ulimit
+syn keyword ngxDirectiveThirdParty contained passenger_pre_start
+syn keyword ngxDirectiveThirdParty contained passenger_set_header
+syn keyword ngxDirectiveThirdParty contained passenger_max_request_queue_size
+syn keyword ngxDirectiveThirdParty contained passenger_request_queue_overflow_status_code
+syn keyword ngxDirectiveThirdParty contained passenger_sticky_sessions
+syn keyword ngxDirectiveThirdParty contained passenger_sticky_sessions_cookie_name
+syn keyword ngxDirectiveThirdParty contained passenger_abort_websockets_on_process_shutdown
+syn keyword ngxDirectiveThirdParty contained passenger_ignore_client_abort
+syn keyword ngxDirectiveThirdParty contained passenger_intercept_errors
+syn keyword ngxDirectiveThirdParty contained passenger_pass_header
+syn keyword ngxDirectiveThirdParty contained passenger_ignore_headers
+syn keyword ngxDirectiveThirdParty contained passenger_headers_hash_bucket_size
+syn keyword ngxDirectiveThirdParty contained passenger_headers_hash_max_size
+syn keyword ngxDirectiveThirdParty contained passenger_buffer_response
+syn keyword ngxDirectiveThirdParty contained passenger_response_buffer_high_watermark
+syn keyword ngxDirectiveThirdParty contained passenger_buffer_size, passenger_buffers, passenger_busy_buffers_size
+syn keyword ngxDirectiveThirdParty contained passenger_socket_backlog
+syn keyword ngxDirectiveThirdParty contained passenger_log_level
+syn keyword ngxDirectiveThirdParty contained passenger_log_file
+syn keyword ngxDirectiveThirdParty contained passenger_file_descriptor_log_file
+syn keyword ngxDirectiveThirdParty contained passenger_debugger
+syn keyword ngxDirectiveThirdParty contained passenger_instance_registry_dir
+syn keyword ngxDirectiveThirdParty contained passenger_data_buffer_dir
+syn keyword ngxDirectiveThirdParty contained passenger_fly_with
+syn keyword ngxDirectiveThirdParty contained union_station_support
+syn keyword ngxDirectiveThirdParty contained union_station_key
+syn keyword ngxDirectiveThirdParty contained union_station_proxy_address
+syn keyword ngxDirectiveThirdParty contained union_station_filter
+syn keyword ngxDirectiveThirdParty contained union_station_gateway_address
+syn keyword ngxDirectiveThirdParty contained union_station_gateway_port
+syn keyword ngxDirectiveThirdParty contained union_station_gateway_cert
+syn keyword ngxDirectiveDeprecated contained rails_spawn_method
+syn keyword ngxDirectiveDeprecated contained passenger_debug_log_file
 
 " Postgres Module <http://labs.frickle.com/nginx_ngx_postgres/>
 " Upstream module that allows nginx to communicate directly with PostgreSQL database.
-syn keyword ngxDirectiveThirdParty postgres_server
-syn keyword ngxDirectiveThirdParty postgres_keepalive
-syn keyword ngxDirectiveThirdParty postgres_pass
-syn keyword ngxDirectiveThirdParty postgres_query
-syn keyword ngxDirectiveThirdParty postgres_rewrite
-syn keyword ngxDirectiveThirdParty postgres_output
-syn keyword ngxDirectiveThirdParty postgres_set
-syn keyword ngxDirectiveThirdParty postgres_escape
-syn keyword ngxDirectiveThirdParty postgres_connect_timeout
-syn keyword ngxDirectiveThirdParty postgres_result_timeout
+syn keyword ngxDirectiveThirdParty contained postgres_server
+syn keyword ngxDirectiveThirdParty contained postgres_keepalive
+syn keyword ngxDirectiveThirdParty contained postgres_pass
+syn keyword ngxDirectiveThirdParty contained postgres_query
+syn keyword ngxDirectiveThirdParty contained postgres_rewrite
+syn keyword ngxDirectiveThirdParty contained postgres_output
+syn keyword ngxDirectiveThirdParty contained postgres_set
+syn keyword ngxDirectiveThirdParty contained postgres_escape
+syn keyword ngxDirectiveThirdParty contained postgres_connect_timeout
+syn keyword ngxDirectiveThirdParty contained postgres_result_timeout
 
 " Pubcookie Module <https://www.vanko.me/book/page/pubcookie-module-nginx>
 " Authorizes users using encrypted cookies
-syn keyword ngxDirectiveThirdParty pubcookie_inactive_expire
-syn keyword ngxDirectiveThirdParty pubcookie_hard_expire
-syn keyword ngxDirectiveThirdParty pubcookie_app_id
-syn keyword ngxDirectiveThirdParty pubcookie_dir_depth
-syn keyword ngxDirectiveThirdParty pubcookie_catenate_app_ids
-syn keyword ngxDirectiveThirdParty pubcookie_app_srv_id
-syn keyword ngxDirectiveThirdParty pubcookie_login
-syn keyword ngxDirectiveThirdParty pubcookie_login_method
-syn keyword ngxDirectiveThirdParty pubcookie_post
-syn keyword ngxDirectiveThirdParty pubcookie_domain
-syn keyword ngxDirectiveThirdParty pubcookie_granting_cert_file
-syn keyword ngxDirectiveThirdParty pubcookie_session_key_file
-syn keyword ngxDirectiveThirdParty pubcookie_session_cert_file
-syn keyword ngxDirectiveThirdParty pubcookie_crypt_key_file
-syn keyword ngxDirectiveThirdParty pubcookie_end_session
-syn keyword ngxDirectiveThirdParty pubcookie_encryption
-syn keyword ngxDirectiveThirdParty pubcookie_session_reauth
-syn keyword ngxDirectiveThirdParty pubcookie_auth_type_names
-syn keyword ngxDirectiveThirdParty pubcookie_no_prompt
-syn keyword ngxDirectiveThirdParty pubcookie_on_demand
-syn keyword ngxDirectiveThirdParty pubcookie_addl_request
-syn keyword ngxDirectiveThirdParty pubcookie_no_obscure_cookies
-syn keyword ngxDirectiveThirdParty pubcookie_no_clean_creds
-syn keyword ngxDirectiveThirdParty pubcookie_egd_device
-syn keyword ngxDirectiveThirdParty pubcookie_no_blank
-syn keyword ngxDirectiveThirdParty pubcookie_super_debug
-syn keyword ngxDirectiveThirdParty pubcookie_set_remote_user
+syn keyword ngxDirectiveThirdParty contained pubcookie_inactive_expire
+syn keyword ngxDirectiveThirdParty contained pubcookie_hard_expire
+syn keyword ngxDirectiveThirdParty contained pubcookie_app_id
+syn keyword ngxDirectiveThirdParty contained pubcookie_dir_depth
+syn keyword ngxDirectiveThirdParty contained pubcookie_catenate_app_ids
+syn keyword ngxDirectiveThirdParty contained pubcookie_app_srv_id
+syn keyword ngxDirectiveThirdParty contained pubcookie_login
+syn keyword ngxDirectiveThirdParty contained pubcookie_login_method
+syn keyword ngxDirectiveThirdParty contained pubcookie_post
+syn keyword ngxDirectiveThirdParty contained pubcookie_domain
+syn keyword ngxDirectiveThirdParty contained pubcookie_granting_cert_file
+syn keyword ngxDirectiveThirdParty contained pubcookie_session_key_file
+syn keyword ngxDirectiveThirdParty contained pubcookie_session_cert_file
+syn keyword ngxDirectiveThirdParty contained pubcookie_crypt_key_file
+syn keyword ngxDirectiveThirdParty contained pubcookie_end_session
+syn keyword ngxDirectiveThirdParty contained pubcookie_encryption
+syn keyword ngxDirectiveThirdParty contained pubcookie_session_reauth
+syn keyword ngxDirectiveThirdParty contained pubcookie_auth_type_names
+syn keyword ngxDirectiveThirdParty contained pubcookie_no_prompt
+syn keyword ngxDirectiveThirdParty contained pubcookie_on_demand
+syn keyword ngxDirectiveThirdParty contained pubcookie_addl_request
+syn keyword ngxDirectiveThirdParty contained pubcookie_no_obscure_cookies
+syn keyword ngxDirectiveThirdParty contained pubcookie_no_clean_creds
+syn keyword ngxDirectiveThirdParty contained pubcookie_egd_device
+syn keyword ngxDirectiveThirdParty contained pubcookie_no_blank
+syn keyword ngxDirectiveThirdParty contained pubcookie_super_debug
+syn keyword ngxDirectiveThirdParty contained pubcookie_set_remote_user
 
 " Push Stream Module <https://github.com/wandenberg/nginx-push-stream-module>
 " A pure stream http push technology for your Nginx setup
-syn keyword ngxDirectiveThirdParty push_stream_channels_statistics
-syn keyword ngxDirectiveThirdParty push_stream_publisher
-syn keyword ngxDirectiveThirdParty push_stream_subscriber
-syn keyword ngxDirectiveThirdParty push_stream_shared_memory_size
-syn keyword ngxDirectiveThirdParty push_stream_channel_deleted_message_text
-syn keyword ngxDirectiveThirdParty push_stream_channel_inactivity_time
-syn keyword ngxDirectiveThirdParty push_stream_ping_message_text
-syn keyword ngxDirectiveThirdParty push_stream_timeout_with_body
-syn keyword ngxDirectiveThirdParty push_stream_message_ttl
-syn keyword ngxDirectiveThirdParty push_stream_max_subscribers_per_channel
-syn keyword ngxDirectiveThirdParty push_stream_max_messages_stored_per_channel
-syn keyword ngxDirectiveThirdParty push_stream_max_channel_id_length
-syn keyword ngxDirectiveThirdParty push_stream_max_number_of_channels
-syn keyword ngxDirectiveThirdParty push_stream_max_number_of_wildcard_channels
-syn keyword ngxDirectiveThirdParty push_stream_wildcard_channel_prefix
-syn keyword ngxDirectiveThirdParty push_stream_events_channel_id
-syn keyword ngxDirectiveThirdParty push_stream_channels_path
-syn keyword ngxDirectiveThirdParty push_stream_store_messages
-syn keyword ngxDirectiveThirdParty push_stream_channel_info_on_publish
-syn keyword ngxDirectiveThirdParty push_stream_authorized_channels_only
-syn keyword ngxDirectiveThirdParty push_stream_header_template_file
-syn keyword ngxDirectiveThirdParty push_stream_header_template
-syn keyword ngxDirectiveThirdParty push_stream_message_template
-syn keyword ngxDirectiveThirdParty push_stream_footer_template
-syn keyword ngxDirectiveThirdParty push_stream_wildcard_channel_max_qtd
-syn keyword ngxDirectiveThirdParty push_stream_ping_message_interval
-syn keyword ngxDirectiveThirdParty push_stream_subscriber_connection_ttl
-syn keyword ngxDirectiveThirdParty push_stream_longpolling_connection_ttl
-syn keyword ngxDirectiveThirdParty push_stream_websocket_allow_publish
-syn keyword ngxDirectiveThirdParty push_stream_last_received_message_time
-syn keyword ngxDirectiveThirdParty push_stream_last_received_message_tag
-syn keyword ngxDirectiveThirdParty push_stream_last_event_id
-syn keyword ngxDirectiveThirdParty push_stream_user_agent
-syn keyword ngxDirectiveThirdParty push_stream_padding_by_user_agent
-syn keyword ngxDirectiveThirdParty push_stream_allowed_origins
-syn keyword ngxDirectiveThirdParty push_stream_allow_connections_to_events_channel
+syn keyword ngxDirectiveThirdParty contained push_stream_channels_statistics
+syn keyword ngxDirectiveThirdParty contained push_stream_publisher
+syn keyword ngxDirectiveThirdParty contained push_stream_subscriber
+syn keyword ngxDirectiveThirdParty contained push_stream_shared_memory_size
+syn keyword ngxDirectiveThirdParty contained push_stream_channel_deleted_message_text
+syn keyword ngxDirectiveThirdParty contained push_stream_channel_inactivity_time
+syn keyword ngxDirectiveThirdParty contained push_stream_ping_message_text
+syn keyword ngxDirectiveThirdParty contained push_stream_timeout_with_body
+syn keyword ngxDirectiveThirdParty contained push_stream_message_ttl
+syn keyword ngxDirectiveThirdParty contained push_stream_max_subscribers_per_channel
+syn keyword ngxDirectiveThirdParty contained push_stream_max_messages_stored_per_channel
+syn keyword ngxDirectiveThirdParty contained push_stream_max_channel_id_length
+syn keyword ngxDirectiveThirdParty contained push_stream_max_number_of_channels
+syn keyword ngxDirectiveThirdParty contained push_stream_max_number_of_wildcard_channels
+syn keyword ngxDirectiveThirdParty contained push_stream_wildcard_channel_prefix
+syn keyword ngxDirectiveThirdParty contained push_stream_events_channel_id
+syn keyword ngxDirectiveThirdParty contained push_stream_channels_path
+syn keyword ngxDirectiveThirdParty contained push_stream_store_messages
+syn keyword ngxDirectiveThirdParty contained push_stream_channel_info_on_publish
+syn keyword ngxDirectiveThirdParty contained push_stream_authorized_channels_only
+syn keyword ngxDirectiveThirdParty contained push_stream_header_template_file
+syn keyword ngxDirectiveThirdParty contained push_stream_header_template
+syn keyword ngxDirectiveThirdParty contained push_stream_message_template
+syn keyword ngxDirectiveThirdParty contained push_stream_footer_template
+syn keyword ngxDirectiveThirdParty contained push_stream_wildcard_channel_max_qtd
+syn keyword ngxDirectiveThirdParty contained push_stream_ping_message_interval
+syn keyword ngxDirectiveThirdParty contained push_stream_subscriber_connection_ttl
+syn keyword ngxDirectiveThirdParty contained push_stream_longpolling_connection_ttl
+syn keyword ngxDirectiveThirdParty contained push_stream_websocket_allow_publish
+syn keyword ngxDirectiveThirdParty contained push_stream_last_received_message_time
+syn keyword ngxDirectiveThirdParty contained push_stream_last_received_message_tag
+syn keyword ngxDirectiveThirdParty contained push_stream_last_event_id
+syn keyword ngxDirectiveThirdParty contained push_stream_user_agent
+syn keyword ngxDirectiveThirdParty contained push_stream_padding_by_user_agent
+syn keyword ngxDirectiveThirdParty contained push_stream_allowed_origins
+syn keyword ngxDirectiveThirdParty contained push_stream_allow_connections_to_events_channel
 
 " rDNS Module <https://github.com/flant/nginx-http-rdns>
 " Make a reverse DNS (rDNS) lookup for incoming connection and provides simple access control of incoming hostname by allow/deny rules
-syn keyword ngxDirectiveThirdParty rdns
-syn keyword ngxDirectiveThirdParty rdns_allow
-syn keyword ngxDirectiveThirdParty rdns_deny
+syn keyword ngxDirectiveThirdParty contained rdns
+syn keyword ngxDirectiveThirdParty contained rdns_allow
+syn keyword ngxDirectiveThirdParty contained rdns_deny
 
 " RDS CSV Module <https://github.com/openresty/rds-csv-nginx-module>
 " Nginx output filter module to convert Resty-DBD-Streams (RDS) to Comma-Separated Values (CSV)
-syn keyword ngxDirectiveThirdParty rds_csv
-syn keyword ngxDirectiveThirdParty rds_csv_row_terminator
-syn keyword ngxDirectiveThirdParty rds_csv_field_separator
-syn keyword ngxDirectiveThirdParty rds_csv_field_name_header
-syn keyword ngxDirectiveThirdParty rds_csv_content_type
-syn keyword ngxDirectiveThirdParty rds_csv_buffer_size
+syn keyword ngxDirectiveThirdParty contained rds_csv
+syn keyword ngxDirectiveThirdParty contained rds_csv_row_terminator
+syn keyword ngxDirectiveThirdParty contained rds_csv_field_separator
+syn keyword ngxDirectiveThirdParty contained rds_csv_field_name_header
+syn keyword ngxDirectiveThirdParty contained rds_csv_content_type
+syn keyword ngxDirectiveThirdParty contained rds_csv_buffer_size
 
 " RDS JSON Module <https://github.com/openresty/rds-json-nginx-module>
 " An output filter that formats Resty DBD Streams generated by ngx_drizzle and others to JSON
-syn keyword ngxDirectiveThirdParty rds_json
-syn keyword ngxDirectiveThirdParty rds_json_buffer_size
-syn keyword ngxDirectiveThirdParty rds_json_format
-syn keyword ngxDirectiveThirdParty rds_json_root
-syn keyword ngxDirectiveThirdParty rds_json_success_property
-syn keyword ngxDirectiveThirdParty rds_json_user_property
-syn keyword ngxDirectiveThirdParty rds_json_errcode_key
-syn keyword ngxDirectiveThirdParty rds_json_errstr_key
-syn keyword ngxDirectiveThirdParty rds_json_ret
-syn keyword ngxDirectiveThirdParty rds_json_content_type
+syn keyword ngxDirectiveThirdParty contained rds_json
+syn keyword ngxDirectiveThirdParty contained rds_json_buffer_size
+syn keyword ngxDirectiveThirdParty contained rds_json_format
+syn keyword ngxDirectiveThirdParty contained rds_json_root
+syn keyword ngxDirectiveThirdParty contained rds_json_success_property
+syn keyword ngxDirectiveThirdParty contained rds_json_user_property
+syn keyword ngxDirectiveThirdParty contained rds_json_errcode_key
+syn keyword ngxDirectiveThirdParty contained rds_json_errstr_key
+syn keyword ngxDirectiveThirdParty contained rds_json_ret
+syn keyword ngxDirectiveThirdParty contained rds_json_content_type
 
 " Redis Module <https://www.nginx.com/resources/wiki/modules/redis/>
 " Use this module to perform simple caching
-syn keyword ngxDirectiveThirdParty redis_pass
-syn keyword ngxDirectiveThirdParty redis_bind
-syn keyword ngxDirectiveThirdParty redis_connect_timeout
-syn keyword ngxDirectiveThirdParty redis_read_timeout
-syn keyword ngxDirectiveThirdParty redis_send_timeout
-syn keyword ngxDirectiveThirdParty redis_buffer_size
-syn keyword ngxDirectiveThirdParty redis_next_upstream
-syn keyword ngxDirectiveThirdParty redis_gzip_flag
+syn keyword ngxDirectiveThirdParty contained redis_pass
+syn keyword ngxDirectiveThirdParty contained redis_bind
+syn keyword ngxDirectiveThirdParty contained redis_connect_timeout
+syn keyword ngxDirectiveThirdParty contained redis_read_timeout
+syn keyword ngxDirectiveThirdParty contained redis_send_timeout
+syn keyword ngxDirectiveThirdParty contained redis_buffer_size
+syn keyword ngxDirectiveThirdParty contained redis_next_upstream
+syn keyword ngxDirectiveThirdParty contained redis_gzip_flag
 
 " Redis 2 Module <https://github.com/openresty/redis2-nginx-module>
 " Nginx upstream module for the Redis 2.0 protocol
-syn keyword ngxDirectiveThirdParty redis2_query
-syn keyword ngxDirectiveThirdParty redis2_raw_query
-syn keyword ngxDirectiveThirdParty redis2_raw_queries
-syn keyword ngxDirectiveThirdParty redis2_literal_raw_query
-syn keyword ngxDirectiveThirdParty redis2_pass
-syn keyword ngxDirectiveThirdParty redis2_connect_timeout
-syn keyword ngxDirectiveThirdParty redis2_send_timeout
-syn keyword ngxDirectiveThirdParty redis2_read_timeout
-syn keyword ngxDirectiveThirdParty redis2_buffer_size
-syn keyword ngxDirectiveThirdParty redis2_next_upstream
+syn keyword ngxDirectiveThirdParty contained redis2_query
+syn keyword ngxDirectiveThirdParty contained redis2_raw_query
+syn keyword ngxDirectiveThirdParty contained redis2_raw_queries
+syn keyword ngxDirectiveThirdParty contained redis2_literal_raw_query
+syn keyword ngxDirectiveThirdParty contained redis2_pass
+syn keyword ngxDirectiveThirdParty contained redis2_connect_timeout
+syn keyword ngxDirectiveThirdParty contained redis2_send_timeout
+syn keyword ngxDirectiveThirdParty contained redis2_read_timeout
+syn keyword ngxDirectiveThirdParty contained redis2_buffer_size
+syn keyword ngxDirectiveThirdParty contained redis2_next_upstream
 
 " Replace Filter Module <https://github.com/openresty/replace-filter-nginx-module>
 " Streaming regular expression replacement in response bodies
-syn keyword ngxDirectiveThirdParty replace_filter
-syn keyword ngxDirectiveThirdParty replace_filter_types
-syn keyword ngxDirectiveThirdParty replace_filter_max_buffered_size
-syn keyword ngxDirectiveThirdParty replace_filter_last_modified
-syn keyword ngxDirectiveThirdParty replace_filter_skip
+syn keyword ngxDirectiveThirdParty contained replace_filter
+syn keyword ngxDirectiveThirdParty contained replace_filter_types
+syn keyword ngxDirectiveThirdParty contained replace_filter_max_buffered_size
+syn keyword ngxDirectiveThirdParty contained replace_filter_last_modified
+syn keyword ngxDirectiveThirdParty contained replace_filter_skip
 
 " Roboo Module <https://github.com/yuri-gushin/Roboo>
 " HTTP Robot Mitigator
 
 " RRD Graph Module <https://www.nginx.com/resources/wiki/modules/rrd_graph/>
 " This module provides an HTTP interface to RRDtool's graphing facilities.
-syn keyword ngxDirectiveThirdParty rrd_graph
-syn keyword ngxDirectiveThirdParty rrd_graph_root
+syn keyword ngxDirectiveThirdParty contained rrd_graph
+syn keyword ngxDirectiveThirdParty contained rrd_graph_root
 
 " RTMP Module <https://github.com/arut/nginx-rtmp-module>
 " NGINX-based Media Streaming Server
-syn keyword ngxDirectiveThirdParty rtmp
-" syn keyword ngxDirectiveThirdParty server
-" syn keyword ngxDirectiveThirdParty listen
-syn keyword ngxDirectiveThirdParty application
-" syn keyword ngxDirectiveThirdParty timeout
-syn keyword ngxDirectiveThirdParty ping
-syn keyword ngxDirectiveThirdParty ping_timeout
-syn keyword ngxDirectiveThirdParty max_streams
-syn keyword ngxDirectiveThirdParty ack_window
-syn keyword ngxDirectiveThirdParty chunk_size
-syn keyword ngxDirectiveThirdParty max_queue
-syn keyword ngxDirectiveThirdParty max_message
-syn keyword ngxDirectiveThirdParty out_queue
-syn keyword ngxDirectiveThirdParty out_cork
-" syn keyword ngxDirectiveThirdParty allow
-" syn keyword ngxDirectiveThirdParty deny
-syn keyword ngxDirectiveThirdParty exec_push
-syn keyword ngxDirectiveThirdParty exec_pull
-syn keyword ngxDirectiveThirdParty exec
-syn keyword ngxDirectiveThirdParty exec_options
-syn keyword ngxDirectiveThirdParty exec_static
-syn keyword ngxDirectiveThirdParty exec_kill_signal
-syn keyword ngxDirectiveThirdParty respawn
-syn keyword ngxDirectiveThirdParty respawn_timeout
-syn keyword ngxDirectiveThirdParty exec_publish
-syn keyword ngxDirectiveThirdParty exec_play
-syn keyword ngxDirectiveThirdParty exec_play_done
-syn keyword ngxDirectiveThirdParty exec_publish_done
-syn keyword ngxDirectiveThirdParty exec_record_done
-syn keyword ngxDirectiveThirdParty live
-syn keyword ngxDirectiveThirdParty meta
-syn keyword ngxDirectiveThirdParty interleave
-syn keyword ngxDirectiveThirdParty wait_key
-syn keyword ngxDirectiveThirdParty wait_video
-syn keyword ngxDirectiveThirdParty publish_notify
-syn keyword ngxDirectiveThirdParty drop_idle_publisher
-syn keyword ngxDirectiveThirdParty sync
-syn keyword ngxDirectiveThirdParty play_restart
-syn keyword ngxDirectiveThirdParty idle_streams
-syn keyword ngxDirectiveThirdParty record
-syn keyword ngxDirectiveThirdParty record_path
-syn keyword ngxDirectiveThirdParty record_suffix
-syn keyword ngxDirectiveThirdParty record_unique
-syn keyword ngxDirectiveThirdParty record_append
-syn keyword ngxDirectiveThirdParty record_lock
-syn keyword ngxDirectiveThirdParty record_max_size
-syn keyword ngxDirectiveThirdParty record_max_frames
-syn keyword ngxDirectiveThirdParty record_interval
-syn keyword ngxDirectiveThirdParty recorder
-syn keyword ngxDirectiveThirdParty record_notify
-syn keyword ngxDirectiveThirdParty play
-syn keyword ngxDirectiveThirdParty play_temp_path
-syn keyword ngxDirectiveThirdParty play_local_path
-syn keyword ngxDirectiveThirdParty pull
-syn keyword ngxDirectiveThirdParty push
-syn keyword ngxDirectiveThirdParty push_reconnect
-syn keyword ngxDirectiveThirdParty session_relay
-syn keyword ngxDirectiveThirdParty on_connect
-syn keyword ngxDirectiveThirdParty on_play
-syn keyword ngxDirectiveThirdParty on_publish
-syn keyword ngxDirectiveThirdParty on_done
-syn keyword ngxDirectiveThirdParty on_play_done
-syn keyword ngxDirectiveThirdParty on_publish_done
-syn keyword ngxDirectiveThirdParty on_record_done
-syn keyword ngxDirectiveThirdParty on_update
-syn keyword ngxDirectiveThirdParty notify_update_timeout
-syn keyword ngxDirectiveThirdParty notify_update_strict
-syn keyword ngxDirectiveThirdParty notify_relay_redirect
-syn keyword ngxDirectiveThirdParty notify_method
-syn keyword ngxDirectiveThirdParty hls
-syn keyword ngxDirectiveThirdParty hls_path
-syn keyword ngxDirectiveThirdParty hls_fragment
-syn keyword ngxDirectiveThirdParty hls_playlist_length
-syn keyword ngxDirectiveThirdParty hls_sync
-syn keyword ngxDirectiveThirdParty hls_continuous
-syn keyword ngxDirectiveThirdParty hls_nested
-syn keyword ngxDirectiveThirdParty hls_base_url
-syn keyword ngxDirectiveThirdParty hls_cleanup
-syn keyword ngxDirectiveThirdParty hls_fragment_naming
-syn keyword ngxDirectiveThirdParty hls_fragment_slicing
-syn keyword ngxDirectiveThirdParty hls_variant
-syn keyword ngxDirectiveThirdParty hls_type
-syn keyword ngxDirectiveThirdParty hls_keys
-syn keyword ngxDirectiveThirdParty hls_key_path
-syn keyword ngxDirectiveThirdParty hls_key_url
-syn keyword ngxDirectiveThirdParty hls_fragments_per_key
-syn keyword ngxDirectiveThirdParty dash
-syn keyword ngxDirectiveThirdParty dash_path
-syn keyword ngxDirectiveThirdParty dash_fragment
-syn keyword ngxDirectiveThirdParty dash_playlist_length
-syn keyword ngxDirectiveThirdParty dash_nested
-syn keyword ngxDirectiveThirdParty dash_cleanup
-" syn keyword ngxDirectiveThirdParty access_log
-" syn keyword ngxDirectiveThirdParty log_format
-syn keyword ngxDirectiveThirdParty max_connections
-syn keyword ngxDirectiveThirdParty rtmp_stat
-syn keyword ngxDirectiveThirdParty rtmp_stat_stylesheet
-syn keyword ngxDirectiveThirdParty rtmp_auto_push
-syn keyword ngxDirectiveThirdParty rtmp_auto_push_reconnect
-syn keyword ngxDirectiveThirdParty rtmp_socket_dir
-syn keyword ngxDirectiveThirdParty rtmp_control
+syn keyword ngxDirectiveThirdParty contained rtmp
+" syn keyword ngxDirectiveThirdParty contained server
+" syn keyword ngxDirectiveThirdParty contained listen
+syn keyword ngxDirectiveThirdParty contained application
+" syn keyword ngxDirectiveThirdParty contained timeout
+syn keyword ngxDirectiveThirdParty contained ping
+syn keyword ngxDirectiveThirdParty contained ping_timeout
+syn keyword ngxDirectiveThirdParty contained max_streams
+syn keyword ngxDirectiveThirdParty contained ack_window
+syn keyword ngxDirectiveThirdParty contained chunk_size
+syn keyword ngxDirectiveThirdParty contained max_queue
+syn keyword ngxDirectiveThirdParty contained max_message
+syn keyword ngxDirectiveThirdParty contained out_queue
+syn keyword ngxDirectiveThirdParty contained out_cork
+" syn keyword ngxDirectiveThirdParty contained allow
+" syn keyword ngxDirectiveThirdParty contained deny
+syn keyword ngxDirectiveThirdParty contained exec_push
+syn keyword ngxDirectiveThirdParty contained exec_pull
+syn keyword ngxDirectiveThirdParty contained exec
+syn keyword ngxDirectiveThirdParty contained exec_options
+syn keyword ngxDirectiveThirdParty contained exec_static
+syn keyword ngxDirectiveThirdParty contained exec_kill_signal
+syn keyword ngxDirectiveThirdParty contained respawn
+syn keyword ngxDirectiveThirdParty contained respawn_timeout
+syn keyword ngxDirectiveThirdParty contained exec_publish
+syn keyword ngxDirectiveThirdParty contained exec_play
+syn keyword ngxDirectiveThirdParty contained exec_play_done
+syn keyword ngxDirectiveThirdParty contained exec_publish_done
+syn keyword ngxDirectiveThirdParty contained exec_record_done
+syn keyword ngxDirectiveThirdParty contained live
+syn keyword ngxDirectiveThirdParty contained meta
+syn keyword ngxDirectiveThirdParty contained interleave
+syn keyword ngxDirectiveThirdParty contained wait_key
+syn keyword ngxDirectiveThirdParty contained wait_video
+syn keyword ngxDirectiveThirdParty contained publish_notify
+syn keyword ngxDirectiveThirdParty contained drop_idle_publisher
+syn keyword ngxDirectiveThirdParty contained sync
+syn keyword ngxDirectiveThirdParty contained play_restart
+syn keyword ngxDirectiveThirdParty contained idle_streams
+syn keyword ngxDirectiveThirdParty contained record
+syn keyword ngxDirectiveThirdParty contained record_path
+syn keyword ngxDirectiveThirdParty contained record_suffix
+syn keyword ngxDirectiveThirdParty contained record_unique
+syn keyword ngxDirectiveThirdParty contained record_append
+syn keyword ngxDirectiveThirdParty contained record_lock
+syn keyword ngxDirectiveThirdParty contained record_max_size
+syn keyword ngxDirectiveThirdParty contained record_max_frames
+syn keyword ngxDirectiveThirdParty contained record_interval
+syn keyword ngxDirectiveThirdParty contained recorder
+syn keyword ngxDirectiveThirdParty contained record_notify
+syn keyword ngxDirectiveThirdParty contained play
+syn keyword ngxDirectiveThirdParty contained play_temp_path
+syn keyword ngxDirectiveThirdParty contained play_local_path
+syn keyword ngxDirectiveThirdParty contained pull
+syn keyword ngxDirectiveThirdParty contained push
+syn keyword ngxDirectiveThirdParty contained push_reconnect
+syn keyword ngxDirectiveThirdParty contained session_relay
+syn keyword ngxDirectiveThirdParty contained on_connect
+syn keyword ngxDirectiveThirdParty contained on_play
+syn keyword ngxDirectiveThirdParty contained on_publish
+syn keyword ngxDirectiveThirdParty contained on_done
+syn keyword ngxDirectiveThirdParty contained on_play_done
+syn keyword ngxDirectiveThirdParty contained on_publish_done
+syn keyword ngxDirectiveThirdParty contained on_record_done
+syn keyword ngxDirectiveThirdParty contained on_update
+syn keyword ngxDirectiveThirdParty contained notify_update_timeout
+syn keyword ngxDirectiveThirdParty contained notify_update_strict
+syn keyword ngxDirectiveThirdParty contained notify_relay_redirect
+syn keyword ngxDirectiveThirdParty contained notify_method
+syn keyword ngxDirectiveThirdParty contained hls
+syn keyword ngxDirectiveThirdParty contained hls_path
+syn keyword ngxDirectiveThirdParty contained hls_fragment
+syn keyword ngxDirectiveThirdParty contained hls_playlist_length
+syn keyword ngxDirectiveThirdParty contained hls_sync
+syn keyword ngxDirectiveThirdParty contained hls_continuous
+syn keyword ngxDirectiveThirdParty contained hls_nested
+syn keyword ngxDirectiveThirdParty contained hls_base_url
+syn keyword ngxDirectiveThirdParty contained hls_cleanup
+syn keyword ngxDirectiveThirdParty contained hls_fragment_naming
+syn keyword ngxDirectiveThirdParty contained hls_fragment_slicing
+syn keyword ngxDirectiveThirdParty contained hls_variant
+syn keyword ngxDirectiveThirdParty contained hls_type
+syn keyword ngxDirectiveThirdParty contained hls_keys
+syn keyword ngxDirectiveThirdParty contained hls_key_path
+syn keyword ngxDirectiveThirdParty contained hls_key_url
+syn keyword ngxDirectiveThirdParty contained hls_fragments_per_key
+syn keyword ngxDirectiveThirdParty contained dash
+syn keyword ngxDirectiveThirdParty contained dash_path
+syn keyword ngxDirectiveThirdParty contained dash_fragment
+syn keyword ngxDirectiveThirdParty contained dash_playlist_length
+syn keyword ngxDirectiveThirdParty contained dash_nested
+syn keyword ngxDirectiveThirdParty contained dash_cleanup
+" syn keyword ngxDirectiveThirdParty contained access_log
+" syn keyword ngxDirectiveThirdParty contained log_format
+syn keyword ngxDirectiveThirdParty contained max_connections
+syn keyword ngxDirectiveThirdParty contained rtmp_stat
+syn keyword ngxDirectiveThirdParty contained rtmp_stat_stylesheet
+syn keyword ngxDirectiveThirdParty contained rtmp_auto_push
+syn keyword ngxDirectiveThirdParty contained rtmp_auto_push_reconnect
+syn keyword ngxDirectiveThirdParty contained rtmp_socket_dir
+syn keyword ngxDirectiveThirdParty contained rtmp_control
 
 " RTMPT Module <https://github.com/kwojtek/nginx-rtmpt-proxy-module>
 " Module for nginx to proxy rtmp using http protocol
-syn keyword ngxDirectiveThirdParty rtmpt_proxy_target
-syn keyword ngxDirectiveThirdParty rtmpt_proxy_rtmp_timeout
-syn keyword ngxDirectiveThirdParty rtmpt_proxy_http_timeout
-syn keyword ngxDirectiveThirdParty rtmpt_proxy
-syn keyword ngxDirectiveThirdParty rtmpt_proxy_stat
-syn keyword ngxDirectiveThirdParty rtmpt_proxy_stylesheet
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_target
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_rtmp_timeout
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_http_timeout
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_stat
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_stylesheet
 
 " Syntactically Awesome Module <https://github.com/mneudert/sass-nginx-module>
 " Providing on-the-fly compiling of Sass files as an NGINX module.
-syn keyword ngxDirectiveThirdParty sass_compile
-syn keyword ngxDirectiveThirdParty sass_error_log
-syn keyword ngxDirectiveThirdParty sass_include_path
-syn keyword ngxDirectiveThirdParty sass_indent
-syn keyword ngxDirectiveThirdParty sass_is_indented_syntax
-syn keyword ngxDirectiveThirdParty sass_linefeed
-syn keyword ngxDirectiveThirdParty sass_precision
-syn keyword ngxDirectiveThirdParty sass_output_style
-syn keyword ngxDirectiveThirdParty sass_source_comments
-syn keyword ngxDirectiveThirdParty sass_source_map_embed
+syn keyword ngxDirectiveThirdParty contained sass_compile
+syn keyword ngxDirectiveThirdParty contained sass_error_log
+syn keyword ngxDirectiveThirdParty contained sass_include_path
+syn keyword ngxDirectiveThirdParty contained sass_indent
+syn keyword ngxDirectiveThirdParty contained sass_is_indented_syntax
+syn keyword ngxDirectiveThirdParty contained sass_linefeed
+syn keyword ngxDirectiveThirdParty contained sass_precision
+syn keyword ngxDirectiveThirdParty contained sass_output_style
+syn keyword ngxDirectiveThirdParty contained sass_source_comments
+syn keyword ngxDirectiveThirdParty contained sass_source_map_embed
 
 " Secure Download Module <https://www.nginx.com/resources/wiki/modules/secure_download/>
 " Enables you to create links which are only valid until a certain datetime is reached
-syn keyword ngxDirectiveThirdParty secure_download
-syn keyword ngxDirectiveThirdParty secure_download_secret
-syn keyword ngxDirectiveThirdParty secure_download_path_mode
+syn keyword ngxDirectiveThirdParty contained secure_download
+syn keyword ngxDirectiveThirdParty contained secure_download_secret
+syn keyword ngxDirectiveThirdParty contained secure_download_path_mode
 
 " Selective Cache Purge Module <https://github.com/wandenberg/nginx-selective-cache-purge-module>
 " A module to purge cache by GLOB patterns. The supported patterns are the same as supported by Redis.
-syn keyword ngxDirectiveThirdParty selective_cache_purge_redis_unix_socket
-syn keyword ngxDirectiveThirdParty selective_cache_purge_redis_host
-syn keyword ngxDirectiveThirdParty selective_cache_purge_redis_port
-syn keyword ngxDirectiveThirdParty selective_cache_purge_redis_database
-syn keyword ngxDirectiveThirdParty selective_cache_purge_query
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_unix_socket
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_host
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_port
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_database
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_query
 
 " Set cconv Module <https://github.com/liseen/set-cconv-nginx-module>
 " Cconv rewrite set commands
-syn keyword ngxDirectiveThirdParty set_cconv_to_simp
-syn keyword ngxDirectiveThirdParty set_cconv_to_trad
-syn keyword ngxDirectiveThirdParty set_pinyin_to_normal
+syn keyword ngxDirectiveThirdParty contained set_cconv_to_simp
+syn keyword ngxDirectiveThirdParty contained set_cconv_to_trad
+syn keyword ngxDirectiveThirdParty contained set_pinyin_to_normal
 
 " Set Hash Module <https://github.com/simpl/ngx_http_set_hash>
 " Nginx module that allows the setting of variables to the value of a variety of hashes
-syn keyword ngxDirectiveThirdParty set_md5
-syn keyword ngxDirectiveThirdParty set_md5_upper
-syn keyword ngxDirectiveThirdParty set_murmur2
-syn keyword ngxDirectiveThirdParty set_murmur2_upper
-syn keyword ngxDirectiveThirdParty set_sha1
-syn keyword ngxDirectiveThirdParty set_sha1_upper
+syn keyword ngxDirectiveThirdParty contained set_md5
+syn keyword ngxDirectiveThirdParty contained set_md5_upper
+syn keyword ngxDirectiveThirdParty contained set_murmur2
+syn keyword ngxDirectiveThirdParty contained set_murmur2_upper
+syn keyword ngxDirectiveThirdParty contained set_sha1
+syn keyword ngxDirectiveThirdParty contained set_sha1_upper
 
 " Set Lang Module <https://github.com/simpl/ngx_http_set_lang>
 " Provides a variety of ways for setting a variable denoting the langauge that content should be returned in.
-syn keyword ngxDirectiveThirdParty set_lang
-syn keyword ngxDirectiveThirdParty set_lang_method
-syn keyword ngxDirectiveThirdParty lang_cookie
-syn keyword ngxDirectiveThirdParty lang_get_var
-syn keyword ngxDirectiveThirdParty lang_list
-syn keyword ngxDirectiveThirdParty lang_post_var
-syn keyword ngxDirectiveThirdParty lang_host
-syn keyword ngxDirectiveThirdParty lang_referer
+syn keyword ngxDirectiveThirdParty contained set_lang
+syn keyword ngxDirectiveThirdParty contained set_lang_method
+syn keyword ngxDirectiveThirdParty contained lang_cookie
+syn keyword ngxDirectiveThirdParty contained lang_get_var
+syn keyword ngxDirectiveThirdParty contained lang_list
+syn keyword ngxDirectiveThirdParty contained lang_post_var
+syn keyword ngxDirectiveThirdParty contained lang_host
+syn keyword ngxDirectiveThirdParty contained lang_referer
 
 " Set Misc Module <https://github.com/openresty/set-misc-nginx-module>
 " Various set_xxx directives added to nginx's rewrite module
-syn keyword ngxDirectiveThirdParty set_if_empty
-syn keyword ngxDirectiveThirdParty set_quote_sql_str
-syn keyword ngxDirectiveThirdParty set_quote_pgsql_str
-syn keyword ngxDirectiveThirdParty set_quote_json_str
-syn keyword ngxDirectiveThirdParty set_unescape_uri
-syn keyword ngxDirectiveThirdParty set_escape_uri
-syn keyword ngxDirectiveThirdParty set_hashed_upstream
-syn keyword ngxDirectiveThirdParty set_encode_base32
-syn keyword ngxDirectiveThirdParty set_base32_padding
-syn keyword ngxDirectiveThirdParty set_misc_base32_padding
-syn keyword ngxDirectiveThirdParty set_base32_alphabet
-syn keyword ngxDirectiveThirdParty set_decode_base32
-syn keyword ngxDirectiveThirdParty set_encode_base64
-syn keyword ngxDirectiveThirdParty set_decode_base64
-syn keyword ngxDirectiveThirdParty set_encode_hex
-syn keyword ngxDirectiveThirdParty set_decode_hex
-syn keyword ngxDirectiveThirdParty set_sha1
-syn keyword ngxDirectiveThirdParty set_md5
-syn keyword ngxDirectiveThirdParty set_hmac_sha1
-syn keyword ngxDirectiveThirdParty set_random
-syn keyword ngxDirectiveThirdParty set_secure_random_alphanum
-syn keyword ngxDirectiveThirdParty set_secure_random_lcalpha
-syn keyword ngxDirectiveThirdParty set_rotate
-syn keyword ngxDirectiveThirdParty set_local_today
-syn keyword ngxDirectiveThirdParty set_formatted_gmt_time
-syn keyword ngxDirectiveThirdParty set_formatted_local_time
+syn keyword ngxDirectiveThirdParty contained set_if_empty
+syn keyword ngxDirectiveThirdParty contained set_quote_sql_str
+syn keyword ngxDirectiveThirdParty contained set_quote_pgsql_str
+syn keyword ngxDirectiveThirdParty contained set_quote_json_str
+syn keyword ngxDirectiveThirdParty contained set_unescape_uri
+syn keyword ngxDirectiveThirdParty contained set_escape_uri
+syn keyword ngxDirectiveThirdParty contained set_hashed_upstream
+syn keyword ngxDirectiveThirdParty contained set_encode_base32
+syn keyword ngxDirectiveThirdParty contained set_base32_padding
+syn keyword ngxDirectiveThirdParty contained set_misc_base32_padding
+syn keyword ngxDirectiveThirdParty contained set_base32_alphabet
+syn keyword ngxDirectiveThirdParty contained set_decode_base32
+syn keyword ngxDirectiveThirdParty contained set_encode_base64
+syn keyword ngxDirectiveThirdParty contained set_decode_base64
+syn keyword ngxDirectiveThirdParty contained set_encode_hex
+syn keyword ngxDirectiveThirdParty contained set_decode_hex
+syn keyword ngxDirectiveThirdParty contained set_sha1
+syn keyword ngxDirectiveThirdParty contained set_md5
+syn keyword ngxDirectiveThirdParty contained set_hmac_sha1
+syn keyword ngxDirectiveThirdParty contained set_random
+syn keyword ngxDirectiveThirdParty contained set_secure_random_alphanum
+syn keyword ngxDirectiveThirdParty contained set_secure_random_lcalpha
+syn keyword ngxDirectiveThirdParty contained set_rotate
+syn keyword ngxDirectiveThirdParty contained set_local_today
+syn keyword ngxDirectiveThirdParty contained set_formatted_gmt_time
+syn keyword ngxDirectiveThirdParty contained set_formatted_local_time
 
 " SFlow Module <https://github.com/sflow/nginx-sflow-module>
 " A binary, random-sampling nginx module designed for: lightweight, centralized, continuous, real-time monitoring of very large and very busy web farms.
-syn keyword ngxDirectiveThirdParty sflow
+syn keyword ngxDirectiveThirdParty contained sflow
 
 " Shibboleth Module <https://github.com/nginx-shib/nginx-http-shibboleth>
 " Shibboleth auth request module for nginx
-syn keyword ngxDirectiveThirdParty shib_request
-syn keyword ngxDirectiveThirdParty shib_request_set
-syn keyword ngxDirectiveThirdParty shib_request_use_headers
+syn keyword ngxDirectiveThirdParty contained shib_request
+syn keyword ngxDirectiveThirdParty contained shib_request_set
+syn keyword ngxDirectiveThirdParty contained shib_request_use_headers
 
 " Slice Module <https://github.com/alibaba/nginx-http-slice>
 " Nginx module for serving a file in slices (reverse byte-range)
-" syn keyword ngxDirectiveThirdParty slice
-syn keyword ngxDirectiveThirdParty slice_arg_begin
-syn keyword ngxDirectiveThirdParty slice_arg_end
-syn keyword ngxDirectiveThirdParty slice_header
-syn keyword ngxDirectiveThirdParty slice_footer
-syn keyword ngxDirectiveThirdParty slice_header_first
-syn keyword ngxDirectiveThirdParty slice_footer_last
+" syn keyword ngxDirectiveThirdParty contained slice
+syn keyword ngxDirectiveThirdParty contained slice_arg_begin
+syn keyword ngxDirectiveThirdParty contained slice_arg_end
+syn keyword ngxDirectiveThirdParty contained slice_header
+syn keyword ngxDirectiveThirdParty contained slice_footer
+syn keyword ngxDirectiveThirdParty contained slice_header_first
+syn keyword ngxDirectiveThirdParty contained slice_footer_last
 
 " SlowFS Cache Module <https://github.com/FRiCKLE/ngx_slowfs_cache/>
 " Module adding ability to cache static files.
-syn keyword ngxDirectiveThirdParty slowfs_big_file_size
-syn keyword ngxDirectiveThirdParty slowfs_cache
-syn keyword ngxDirectiveThirdParty slowfs_cache_key
-syn keyword ngxDirectiveThirdParty slowfs_cache_min_uses
-syn keyword ngxDirectiveThirdParty slowfs_cache_path
-syn keyword ngxDirectiveThirdParty slowfs_cache_purge
-syn keyword ngxDirectiveThirdParty slowfs_cache_valid
-syn keyword ngxDirectiveThirdParty slowfs_temp_path
+syn keyword ngxDirectiveThirdParty contained slowfs_big_file_size
+syn keyword ngxDirectiveThirdParty contained slowfs_cache
+syn keyword ngxDirectiveThirdParty contained slowfs_cache_key
+syn keyword ngxDirectiveThirdParty contained slowfs_cache_min_uses
+syn keyword ngxDirectiveThirdParty contained slowfs_cache_path
+syn keyword ngxDirectiveThirdParty contained slowfs_cache_purge
+syn keyword ngxDirectiveThirdParty contained slowfs_cache_valid
+syn keyword ngxDirectiveThirdParty contained slowfs_temp_path
 
 " Small Light Module <https://github.com/cubicdaiya/ngx_small_light>
 " Dynamic Image Transformation Module For nginx.
-syn keyword ngxDirectiveThirdParty small_light
-syn keyword ngxDirectiveThirdParty small_light_getparam_mode
-syn keyword ngxDirectiveThirdParty small_light_material_dir
-syn keyword ngxDirectiveThirdParty small_light_pattern_define
-syn keyword ngxDirectiveThirdParty small_light_radius_max
-syn keyword ngxDirectiveThirdParty small_light_sigma_max
-syn keyword ngxDirectiveThirdParty small_light_imlib2_temp_dir
-syn keyword ngxDirectiveThirdParty small_light_buffer
+syn keyword ngxDirectiveThirdParty contained small_light
+syn keyword ngxDirectiveThirdParty contained small_light_getparam_mode
+syn keyword ngxDirectiveThirdParty contained small_light_material_dir
+syn keyword ngxDirectiveThirdParty contained small_light_pattern_define
+syn keyword ngxDirectiveThirdParty contained small_light_radius_max
+syn keyword ngxDirectiveThirdParty contained small_light_sigma_max
+syn keyword ngxDirectiveThirdParty contained small_light_imlib2_temp_dir
+syn keyword ngxDirectiveThirdParty contained small_light_buffer
 
 " Sorted Querystring Filter Module <https://github.com/wandenberg/nginx-sorted-querystring-module>
 " Nginx module to expose querystring parameters sorted in a variable to be used on cache_key as example
-syn keyword ngxDirectiveThirdParty sorted_querystring_filter_parameter
+syn keyword ngxDirectiveThirdParty contained sorted_querystring_filter_parameter
 
 " Sphinx2 Module <https://github.com/reeteshranjan/sphinx2-nginx-module>
 " Nginx upstream module for Sphinx 2.x
-syn keyword ngxDirectiveThirdParty sphinx2_pass
-syn keyword ngxDirectiveThirdParty sphinx2_bind
-syn keyword ngxDirectiveThirdParty sphinx2_connect_timeout
-syn keyword ngxDirectiveThirdParty sphinx2_send_timeout
-syn keyword ngxDirectiveThirdParty sphinx2_buffer_size
-syn keyword ngxDirectiveThirdParty sphinx2_read_timeout
-syn keyword ngxDirectiveThirdParty sphinx2_next_upstream
+syn keyword ngxDirectiveThirdParty contained sphinx2_pass
+syn keyword ngxDirectiveThirdParty contained sphinx2_bind
+syn keyword ngxDirectiveThirdParty contained sphinx2_connect_timeout
+syn keyword ngxDirectiveThirdParty contained sphinx2_send_timeout
+syn keyword ngxDirectiveThirdParty contained sphinx2_buffer_size
+syn keyword ngxDirectiveThirdParty contained sphinx2_read_timeout
+syn keyword ngxDirectiveThirdParty contained sphinx2_next_upstream
 
 " HTTP SPNEGO auth Module <https://github.com/stnoonan/spnego-http-auth-nginx-module>
 " This module implements adds SPNEGO support to nginx(http://nginx.org). It currently supports only Kerberos authentication via GSSAPI
-syn keyword ngxDirectiveThirdParty auth_gss
-syn keyword ngxDirectiveThirdParty auth_gss_keytab
-syn keyword ngxDirectiveThirdParty auth_gss_realm
-syn keyword ngxDirectiveThirdParty auth_gss_service_name
-syn keyword ngxDirectiveThirdParty auth_gss_authorized_principal
-syn keyword ngxDirectiveThirdParty auth_gss_allow_basic_fallback
+syn keyword ngxDirectiveThirdParty contained auth_gss
+syn keyword ngxDirectiveThirdParty contained auth_gss_keytab
+syn keyword ngxDirectiveThirdParty contained auth_gss_realm
+syn keyword ngxDirectiveThirdParty contained auth_gss_service_name
+syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal
+syn keyword ngxDirectiveThirdParty contained auth_gss_allow_basic_fallback
 
 " SR Cache Module <https://github.com/openresty/srcache-nginx-module>
 " Transparent subrequest-based caching layout for arbitrary nginx locations
-syn keyword ngxDirectiveThirdParty srcache_fetch
-syn keyword ngxDirectiveThirdParty srcache_fetch_skip
-syn keyword ngxDirectiveThirdParty srcache_store
-syn keyword ngxDirectiveThirdParty srcache_store_max_size
-syn keyword ngxDirectiveThirdParty srcache_store_skip
-syn keyword ngxDirectiveThirdParty srcache_store_statuses
-syn keyword ngxDirectiveThirdParty srcache_store_ranges
-syn keyword ngxDirectiveThirdParty srcache_header_buffer_size
-syn keyword ngxDirectiveThirdParty srcache_store_hide_header
-syn keyword ngxDirectiveThirdParty srcache_store_pass_header
-syn keyword ngxDirectiveThirdParty srcache_methods
-syn keyword ngxDirectiveThirdParty srcache_ignore_content_encoding
-syn keyword ngxDirectiveThirdParty srcache_request_cache_control
-syn keyword ngxDirectiveThirdParty srcache_response_cache_control
-syn keyword ngxDirectiveThirdParty srcache_store_no_store
-syn keyword ngxDirectiveThirdParty srcache_store_no_cache
-syn keyword ngxDirectiveThirdParty srcache_store_private
-syn keyword ngxDirectiveThirdParty srcache_default_expire
-syn keyword ngxDirectiveThirdParty srcache_max_expire
+syn keyword ngxDirectiveThirdParty contained srcache_fetch
+syn keyword ngxDirectiveThirdParty contained srcache_fetch_skip
+syn keyword ngxDirectiveThirdParty contained srcache_store
+syn keyword ngxDirectiveThirdParty contained srcache_store_max_size
+syn keyword ngxDirectiveThirdParty contained srcache_store_skip
+syn keyword ngxDirectiveThirdParty contained srcache_store_statuses
+syn keyword ngxDirectiveThirdParty contained srcache_store_ranges
+syn keyword ngxDirectiveThirdParty contained srcache_header_buffer_size
+syn keyword ngxDirectiveThirdParty contained srcache_store_hide_header
+syn keyword ngxDirectiveThirdParty contained srcache_store_pass_header
+syn keyword ngxDirectiveThirdParty contained srcache_methods
+syn keyword ngxDirectiveThirdParty contained srcache_ignore_content_encoding
+syn keyword ngxDirectiveThirdParty contained srcache_request_cache_control
+syn keyword ngxDirectiveThirdParty contained srcache_response_cache_control
+syn keyword ngxDirectiveThirdParty contained srcache_store_no_store
+syn keyword ngxDirectiveThirdParty contained srcache_store_no_cache
+syn keyword ngxDirectiveThirdParty contained srcache_store_private
+syn keyword ngxDirectiveThirdParty contained srcache_default_expire
+syn keyword ngxDirectiveThirdParty contained srcache_max_expire
 
 " SSSD Info Module <https://github.com/veruu/ngx_sssd_info>
 " Retrives additional attributes from SSSD for current authentizated user
-syn keyword ngxDirectiveThirdParty sssd_info
-syn keyword ngxDirectiveThirdParty sssd_info_output_to
-syn keyword ngxDirectiveThirdParty sssd_info_groups
-syn keyword ngxDirectiveThirdParty sssd_info_group
-syn keyword ngxDirectiveThirdParty sssd_info_group_separator
-syn keyword ngxDirectiveThirdParty sssd_info_attributes
-syn keyword ngxDirectiveThirdParty sssd_info_attribute
-syn keyword ngxDirectiveThirdParty sssd_info_attribute_separator
+syn keyword ngxDirectiveThirdParty contained sssd_info
+syn keyword ngxDirectiveThirdParty contained sssd_info_output_to
+syn keyword ngxDirectiveThirdParty contained sssd_info_groups
+syn keyword ngxDirectiveThirdParty contained sssd_info_group
+syn keyword ngxDirectiveThirdParty contained sssd_info_group_separator
+syn keyword ngxDirectiveThirdParty contained sssd_info_attributes
+syn keyword ngxDirectiveThirdParty contained sssd_info_attribute
+syn keyword ngxDirectiveThirdParty contained sssd_info_attribute_separator
 
 " Static Etags Module <https://github.com/mikewest/nginx-static-etags>
 " Generate etags for static content
-syn keyword ngxDirectiveThirdParty FileETag
+syn keyword ngxDirectiveThirdParty contained FileETag
 
 " Statsd Module <https://github.com/zebrafishlabs/nginx-statsd>
 " An nginx module for sending statistics to statsd
-syn keyword ngxDirectiveThirdParty statsd_server
-syn keyword ngxDirectiveThirdParty statsd_sample_rate
-syn keyword ngxDirectiveThirdParty statsd_count
-syn keyword ngxDirectiveThirdParty statsd_timing
+syn keyword ngxDirectiveThirdParty contained statsd_server
+syn keyword ngxDirectiveThirdParty contained statsd_sample_rate
+syn keyword ngxDirectiveThirdParty contained statsd_count
+syn keyword ngxDirectiveThirdParty contained statsd_timing
 
 " Sticky Module <https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng>
 " Add a sticky cookie to be always forwarded to the same upstream server
-" syn keyword ngxDirectiveThirdParty sticky
+" syn keyword ngxDirectiveThirdParty contained sticky
 
 " Stream Echo Module <https://github.com/openresty/stream-echo-nginx-module>
 " TCP/stream echo module for NGINX (a port of ngx_http_echo_module)
-syn keyword ngxDirectiveThirdParty echo
-syn keyword ngxDirectiveThirdParty echo_duplicate
-syn keyword ngxDirectiveThirdParty echo_flush_wait
-syn keyword ngxDirectiveThirdParty echo_sleep
-syn keyword ngxDirectiveThirdParty echo_send_timeout
-syn keyword ngxDirectiveThirdParty echo_read_bytes
-syn keyword ngxDirectiveThirdParty echo_read_line
-syn keyword ngxDirectiveThirdParty echo_request_data
-syn keyword ngxDirectiveThirdParty echo_discard_request
-syn keyword ngxDirectiveThirdParty echo_read_buffer_size
-syn keyword ngxDirectiveThirdParty echo_read_timeout
-syn keyword ngxDirectiveThirdParty echo_client_error_log_level
-syn keyword ngxDirectiveThirdParty echo_lingering_close
-syn keyword ngxDirectiveThirdParty echo_lingering_time
-syn keyword ngxDirectiveThirdParty echo_lingering_timeout
+syn keyword ngxDirectiveThirdParty contained echo
+syn keyword ngxDirectiveThirdParty contained echo_duplicate
+syn keyword ngxDirectiveThirdParty contained echo_flush_wait
+syn keyword ngxDirectiveThirdParty contained echo_sleep
+syn keyword ngxDirectiveThirdParty contained echo_send_timeout
+syn keyword ngxDirectiveThirdParty contained echo_read_bytes
+syn keyword ngxDirectiveThirdParty contained echo_read_line
+syn keyword ngxDirectiveThirdParty contained echo_request_data
+syn keyword ngxDirectiveThirdParty contained echo_discard_request
+syn keyword ngxDirectiveThirdParty contained echo_read_buffer_size
+syn keyword ngxDirectiveThirdParty contained echo_read_timeout
+syn keyword ngxDirectiveThirdParty contained echo_client_error_log_level
+syn keyword ngxDirectiveThirdParty contained echo_lingering_close
+syn keyword ngxDirectiveThirdParty contained echo_lingering_time
+syn keyword ngxDirectiveThirdParty contained echo_lingering_timeout
 
 " Stream Lua Module <https://github.com/openresty/stream-lua-nginx-module>
 " Embed the power of Lua into Nginx stream/TCP Servers.
-syn keyword ngxDirectiveThirdParty lua_resolver
-syn keyword ngxDirectiveThirdParty lua_resolver_timeout
-syn keyword ngxDirectiveThirdParty lua_lingering_close
-syn keyword ngxDirectiveThirdParty lua_lingering_time
-syn keyword ngxDirectiveThirdParty lua_lingering_timeout
+syn keyword ngxDirectiveThirdParty contained lua_resolver
+syn keyword ngxDirectiveThirdParty contained lua_resolver_timeout
+syn keyword ngxDirectiveThirdParty contained lua_lingering_close
+syn keyword ngxDirectiveThirdParty contained lua_lingering_time
+syn keyword ngxDirectiveThirdParty contained lua_lingering_timeout
 
 " Stream Upsync Module <https://github.com/xiaokai-wang/nginx-stream-upsync-module>
 " Sync upstreams from consul or others, dynamiclly modify backend-servers attribute(weight, max_fails,...), needn't reload nginx.
-syn keyword ngxDirectiveThirdParty upsync
-syn keyword ngxDirectiveThirdParty upsync_dump_path
-syn keyword ngxDirectiveThirdParty upsync_lb
-syn keyword ngxDirectiveThirdParty upsync_show
+syn keyword ngxDirectiveThirdParty contained upsync
+syn keyword ngxDirectiveThirdParty contained upsync_dump_path
+syn keyword ngxDirectiveThirdParty contained upsync_lb
+syn keyword ngxDirectiveThirdParty contained upsync_show
 
 " Strip Module <https://github.com/evanmiller/mod_strip>
 " Whitespace remover.
-syn keyword ngxDirectiveThirdParty strip
+syn keyword ngxDirectiveThirdParty contained strip
 
 " Subrange Module <https://github.com/Qihoo360/ngx_http_subrange_module>
 " Split one big HTTP/Range request to multiple subrange requesets
-syn keyword ngxDirectiveThirdParty subrange
+syn keyword ngxDirectiveThirdParty contained subrange
 
 " Substitutions Module <https://www.nginx.com/resources/wiki/modules/substitutions/>
 " A filter module which can do both regular expression and fixed string substitutions on response bodies.
-syn keyword ngxDirectiveThirdParty subs_filter
-syn keyword ngxDirectiveThirdParty subs_filter_types
+syn keyword ngxDirectiveThirdParty contained subs_filter
+syn keyword ngxDirectiveThirdParty contained subs_filter_types
 
 " Summarizer Module <https://github.com/reeteshranjan/summarizer-nginx-module>
 " Upstream nginx module to get summaries of documents using the summarizer daemon service
-syn keyword ngxDirectiveThirdParty smrzr_filename
-syn keyword ngxDirectiveThirdParty smrzr_ratio
+syn keyword ngxDirectiveThirdParty contained smrzr_filename
+syn keyword ngxDirectiveThirdParty contained smrzr_ratio
 
 " Supervisord Module <https://github.com/FRiCKLE/ngx_supervisord/>
 " Module providing nginx with API to communicate with supervisord and manage (start/stop) backends on-demand.
-syn keyword ngxDirectiveThirdParty supervisord
-syn keyword ngxDirectiveThirdParty supervisord_inherit_backend_status
-syn keyword ngxDirectiveThirdParty supervisord_name
-syn keyword ngxDirectiveThirdParty supervisord_start
-syn keyword ngxDirectiveThirdParty supervisord_stop
+syn keyword ngxDirectiveThirdParty contained supervisord
+syn keyword ngxDirectiveThirdParty contained supervisord_inherit_backend_status
+syn keyword ngxDirectiveThirdParty contained supervisord_name
+syn keyword ngxDirectiveThirdParty contained supervisord_start
+syn keyword ngxDirectiveThirdParty contained supervisord_stop
 
 " Tarantool Upstream Module <https://github.com/tarantool/nginx_upstream_module>
 " Tarantool NginX upstream module (REST, JSON API, websockets, load balancing)
-syn keyword ngxDirectiveThirdParty tnt_pass
-syn keyword ngxDirectiveThirdParty tnt_http_methods
-syn keyword ngxDirectiveThirdParty tnt_http_rest_methods
-syn keyword ngxDirectiveThirdParty tnt_pass_http_request
-syn keyword ngxDirectiveThirdParty tnt_pass_http_request_buffer_size
-syn keyword ngxDirectiveThirdParty tnt_method
-syn keyword ngxDirectiveThirdParty tnt_http_allowed_methods - experemental
-syn keyword ngxDirectiveThirdParty tnt_send_timeout
-syn keyword ngxDirectiveThirdParty tnt_read_timeout
-syn keyword ngxDirectiveThirdParty tnt_buffer_size
-syn keyword ngxDirectiveThirdParty tnt_next_upstream
-syn keyword ngxDirectiveThirdParty tnt_connect_timeout
-syn keyword ngxDirectiveThirdParty tnt_next_upstream
-syn keyword ngxDirectiveThirdParty tnt_next_upstream_tries
-syn keyword ngxDirectiveThirdParty tnt_next_upstream_timeout
+syn keyword ngxDirectiveThirdParty contained tnt_pass
+syn keyword ngxDirectiveThirdParty contained tnt_http_methods
+syn keyword ngxDirectiveThirdParty contained tnt_http_rest_methods
+syn keyword ngxDirectiveThirdParty contained tnt_pass_http_request
+syn keyword ngxDirectiveThirdParty contained tnt_pass_http_request_buffer_size
+syn keyword ngxDirectiveThirdParty contained tnt_method
+syn keyword ngxDirectiveThirdParty contained tnt_http_allowed_methods - experemental
+syn keyword ngxDirectiveThirdParty contained tnt_send_timeout
+syn keyword ngxDirectiveThirdParty contained tnt_read_timeout
+syn keyword ngxDirectiveThirdParty contained tnt_buffer_size
+syn keyword ngxDirectiveThirdParty contained tnt_next_upstream
+syn keyword ngxDirectiveThirdParty contained tnt_connect_timeout
+syn keyword ngxDirectiveThirdParty contained tnt_next_upstream
+syn keyword ngxDirectiveThirdParty contained tnt_next_upstream_tries
+syn keyword ngxDirectiveThirdParty contained tnt_next_upstream_timeout
 
 " TCP Proxy Module <http://yaoweibin.github.io/nginx_tcp_proxy_module/>
 " Add the feature of tcp proxy with nginx, with health check and status monitor
-syn keyword ngxDirectiveBlock tcp
-" syn keyword ngxDirectiveThirdParty server
-" syn keyword ngxDirectiveThirdParty listen
-" syn keyword ngxDirectiveThirdParty allow
-" syn keyword ngxDirectiveThirdParty deny
-" syn keyword ngxDirectiveThirdParty so_keepalive
-" syn keyword ngxDirectiveThirdParty tcp_nodelay
-" syn keyword ngxDirectiveThirdParty timeout
-" syn keyword ngxDirectiveThirdParty server_name
-" syn keyword ngxDirectiveThirdParty resolver
-" syn keyword ngxDirectiveThirdParty resolver_timeout
-" syn keyword ngxDirectiveThirdParty upstream
-syn keyword ngxDirectiveThirdParty check
-syn keyword ngxDirectiveThirdParty check_http_send
-syn keyword ngxDirectiveThirdParty check_http_expect_alive
-syn keyword ngxDirectiveThirdParty check_smtp_send
-syn keyword ngxDirectiveThirdParty check_smtp_expect_alive
-syn keyword ngxDirectiveThirdParty check_shm_size
-syn keyword ngxDirectiveThirdParty check_status
-" syn keyword ngxDirectiveThirdParty ip_hash
-" syn keyword ngxDirectiveThirdParty proxy_pass
-" syn keyword ngxDirectiveThirdParty proxy_buffer
-" syn keyword ngxDirectiveThirdParty proxy_connect_timeout
-" syn keyword ngxDirectiveThirdParty proxy_read_timeout
-syn keyword ngxDirectiveThirdParty proxy_write_timeout
+syn keyword ngxDirectiveBlock contained tcp
+" syn keyword ngxDirectiveThirdParty contained server
+" syn keyword ngxDirectiveThirdParty contained listen
+" syn keyword ngxDirectiveThirdParty contained allow
+" syn keyword ngxDirectiveThirdParty contained deny
+" syn keyword ngxDirectiveThirdParty contained so_keepalive
+" syn keyword ngxDirectiveThirdParty contained tcp_nodelay
+" syn keyword ngxDirectiveThirdParty contained timeout
+" syn keyword ngxDirectiveThirdParty contained server_name
+" syn keyword ngxDirectiveThirdParty contained resolver
+" syn keyword ngxDirectiveThirdParty contained resolver_timeout
+" syn keyword ngxDirectiveThirdParty contained upstream
+syn keyword ngxDirectiveThirdParty contained check
+syn keyword ngxDirectiveThirdParty contained check_http_send
+syn keyword ngxDirectiveThirdParty contained check_http_expect_alive
+syn keyword ngxDirectiveThirdParty contained check_smtp_send
+syn keyword ngxDirectiveThirdParty contained check_smtp_expect_alive
+syn keyword ngxDirectiveThirdParty contained check_shm_size
+syn keyword ngxDirectiveThirdParty contained check_status
+" syn keyword ngxDirectiveThirdParty contained ip_hash
+" syn keyword ngxDirectiveThirdParty contained proxy_pass
+" syn keyword ngxDirectiveThirdParty contained proxy_buffer
+" syn keyword ngxDirectiveThirdParty contained proxy_connect_timeout
+" syn keyword ngxDirectiveThirdParty contained proxy_read_timeout
+syn keyword ngxDirectiveThirdParty contained proxy_write_timeout
 
 " Testcookie Module <https://github.com/kyprizel/testcookie-nginx-module>
 " NGINX module for L7 DDoS attack mitigation
-syn keyword ngxDirectiveThirdParty testcookie
-syn keyword ngxDirectiveThirdParty testcookie_name
-syn keyword ngxDirectiveThirdParty testcookie_domain
-syn keyword ngxDirectiveThirdParty testcookie_expires
-syn keyword ngxDirectiveThirdParty testcookie_path
-syn keyword ngxDirectiveThirdParty testcookie_secret
-syn keyword ngxDirectiveThirdParty testcookie_session
-syn keyword ngxDirectiveThirdParty testcookie_arg
-syn keyword ngxDirectiveThirdParty testcookie_max_attempts
-syn keyword ngxDirectiveThirdParty testcookie_p3p
-syn keyword ngxDirectiveThirdParty testcookie_fallback
-syn keyword ngxDirectiveThirdParty testcookie_whitelist
-syn keyword ngxDirectiveThirdParty testcookie_pass
-syn keyword ngxDirectiveThirdParty testcookie_redirect_via_refresh
-syn keyword ngxDirectiveThirdParty testcookie_refresh_template
-syn keyword ngxDirectiveThirdParty testcookie_refresh_status
-syn keyword ngxDirectiveThirdParty testcookie_deny_keepalive
-syn keyword ngxDirectiveThirdParty testcookie_get_only
-syn keyword ngxDirectiveThirdParty testcookie_https_location
-syn keyword ngxDirectiveThirdParty testcookie_refresh_encrypt_cookie
-syn keyword ngxDirectiveThirdParty testcookie_refresh_encrypt_cookie_key
-syn keyword ngxDirectiveThirdParty testcookie_refresh_encrypt_iv
-syn keyword ngxDirectiveThirdParty testcookie_internal
-syn keyword ngxDirectiveThirdParty testcookie_httponly_flag
-syn keyword ngxDirectiveThirdParty testcookie_secure_flag
+syn keyword ngxDirectiveThirdParty contained testcookie
+syn keyword ngxDirectiveThirdParty contained testcookie_name
+syn keyword ngxDirectiveThirdParty contained testcookie_domain
+syn keyword ngxDirectiveThirdParty contained testcookie_expires
+syn keyword ngxDirectiveThirdParty contained testcookie_path
+syn keyword ngxDirectiveThirdParty contained testcookie_secret
+syn keyword ngxDirectiveThirdParty contained testcookie_session
+syn keyword ngxDirectiveThirdParty contained testcookie_arg
+syn keyword ngxDirectiveThirdParty contained testcookie_max_attempts
+syn keyword ngxDirectiveThirdParty contained testcookie_p3p
+syn keyword ngxDirectiveThirdParty contained testcookie_fallback
+syn keyword ngxDirectiveThirdParty contained testcookie_whitelist
+syn keyword ngxDirectiveThirdParty contained testcookie_pass
+syn keyword ngxDirectiveThirdParty contained testcookie_redirect_via_refresh
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_template
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_status
+syn keyword ngxDirectiveThirdParty contained testcookie_deny_keepalive
+syn keyword ngxDirectiveThirdParty contained testcookie_get_only
+syn keyword ngxDirectiveThirdParty contained testcookie_https_location
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie_key
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_iv
+syn keyword ngxDirectiveThirdParty contained testcookie_internal
+syn keyword ngxDirectiveThirdParty contained testcookie_httponly_flag
+syn keyword ngxDirectiveThirdParty contained testcookie_secure_flag
 
 " Types Filter Module <https://github.com/flygoast/ngx_http_types_filter>
 " Change the `Content-Type` output header depending on an extension variable according to a condition specified in the 'if' clause.
-syn keyword ngxDirectiveThirdParty types_filter
-syn keyword ngxDirectiveThirdParty types_filter_use_default
+syn keyword ngxDirectiveThirdParty contained types_filter
+syn keyword ngxDirectiveThirdParty contained types_filter_use_default
 
 " Unzip Module <https://github.com/youzee/nginx-unzip-module>
 " Enabling fetching of files that are stored in zipped archives.
-syn keyword ngxDirectiveThirdParty file_in_unzip_archivefile
-syn keyword ngxDirectiveThirdParty file_in_unzip_extract
-syn keyword ngxDirectiveThirdParty file_in_unzip
+syn keyword ngxDirectiveThirdParty contained file_in_unzip_archivefile
+syn keyword ngxDirectiveThirdParty contained file_in_unzip_extract
+syn keyword ngxDirectiveThirdParty contained file_in_unzip
 
 " Upload Progress Module <https://www.nginx.com/resources/wiki/modules/upload_progress/>
 " An upload progress system, that monitors RFC1867 POST upload as they are transmitted to upstream servers
-syn keyword ngxDirectiveThirdParty upload_progress
-syn keyword ngxDirectiveThirdParty track_uploads
-syn keyword ngxDirectiveThirdParty report_uploads
-syn keyword ngxDirectiveThirdParty upload_progress_content_type
-syn keyword ngxDirectiveThirdParty upload_progress_header
-syn keyword ngxDirectiveThirdParty upload_progress_jsonp_parameter
-syn keyword ngxDirectiveThirdParty upload_progress_json_output
-syn keyword ngxDirectiveThirdParty upload_progress_jsonp_output
-syn keyword ngxDirectiveThirdParty upload_progress_template
+syn keyword ngxDirectiveThirdParty contained upload_progress
+syn keyword ngxDirectiveThirdParty contained track_uploads
+syn keyword ngxDirectiveThirdParty contained report_uploads
+syn keyword ngxDirectiveThirdParty contained upload_progress_content_type
+syn keyword ngxDirectiveThirdParty contained upload_progress_header
+syn keyword ngxDirectiveThirdParty contained upload_progress_jsonp_parameter
+syn keyword ngxDirectiveThirdParty contained upload_progress_json_output
+syn keyword ngxDirectiveThirdParty contained upload_progress_jsonp_output
+syn keyword ngxDirectiveThirdParty contained upload_progress_template
 
 " Upload Module <https://www.nginx.com/resources/wiki/modules/upload/>
 " Parses request body storing all files being uploaded to a directory specified by upload_store directive
-syn keyword ngxDirectiveThirdParty upload_pass
-syn keyword ngxDirectiveThirdParty upload_resumable
-syn keyword ngxDirectiveThirdParty upload_store
-syn keyword ngxDirectiveThirdParty upload_state_store
-syn keyword ngxDirectiveThirdParty upload_store_access
-syn keyword ngxDirectiveThirdParty upload_set_form_field
-syn keyword ngxDirectiveThirdParty upload_aggregate_form_field
-syn keyword ngxDirectiveThirdParty upload_pass_form_field
-syn keyword ngxDirectiveThirdParty upload_cleanup
-syn keyword ngxDirectiveThirdParty upload_buffer_size
-syn keyword ngxDirectiveThirdParty upload_max_part_header_len
-syn keyword ngxDirectiveThirdParty upload_max_file_size
-syn keyword ngxDirectiveThirdParty upload_limit_rate
-syn keyword ngxDirectiveThirdParty upload_max_output_body_len
-syn keyword ngxDirectiveThirdParty upload_tame_arrays
-syn keyword ngxDirectiveThirdParty upload_pass_args
+syn keyword ngxDirectiveThirdParty contained upload_pass
+syn keyword ngxDirectiveThirdParty contained upload_resumable
+syn keyword ngxDirectiveThirdParty contained upload_store
+syn keyword ngxDirectiveThirdParty contained upload_state_store
+syn keyword ngxDirectiveThirdParty contained upload_store_access
+syn keyword ngxDirectiveThirdParty contained upload_set_form_field
+syn keyword ngxDirectiveThirdParty contained upload_aggregate_form_field
+syn keyword ngxDirectiveThirdParty contained upload_pass_form_field
+syn keyword ngxDirectiveThirdParty contained upload_cleanup
+syn keyword ngxDirectiveThirdParty contained upload_buffer_size
+syn keyword ngxDirectiveThirdParty contained upload_max_part_header_len
+syn keyword ngxDirectiveThirdParty contained upload_max_file_size
+syn keyword ngxDirectiveThirdParty contained upload_limit_rate
+syn keyword ngxDirectiveThirdParty contained upload_max_output_body_len
+syn keyword ngxDirectiveThirdParty contained upload_tame_arrays
+syn keyword ngxDirectiveThirdParty contained upload_pass_args
 
 " Upstream Fair Module <https://github.com/gnosek/nginx-upstream-fair>
 " The fair load balancer module for nginx http://nginx.localdomain.pl
-syn keyword ngxDirectiveThirdParty fair
-syn keyword ngxDirectiveThirdParty upstream_fair_shm_size
+syn keyword ngxDirectiveThirdParty contained fair
+syn keyword ngxDirectiveThirdParty contained upstream_fair_shm_size
 
 " Upstream Hash Module (DEPRECATED) <http://wiki.nginx.org/NginxHttpUpstreamRequestHashModule>
 " Provides simple upstream load distribution by hashing a configurable variable.
-" syn keyword ngxDirectiveDeprecated hash
-syn keyword ngxDirectiveDeprecated hash_again
+" syn keyword ngxDirectiveDeprecated contained hash
+syn keyword ngxDirectiveDeprecated contained hash_again
 
 " Upstream Domain Resolve Module <https://www.nginx.com/resources/wiki/modules/domain_resolve/>
 " A load-balancer that resolves an upstream domain name asynchronously.
-syn keyword ngxDirectiveThirdParty jdomain
+syn keyword ngxDirectiveThirdParty contained jdomain
 
 " Upsync Module <https://github.com/weibocom/nginx-upsync-module>
 " Sync upstreams from consul or others, dynamiclly modify backend-servers attribute(weight, max_fails,...), needn't reload nginx
-syn keyword ngxDirectiveThirdParty upsync
-syn keyword ngxDirectiveThirdParty upsync_dump_path
-syn keyword ngxDirectiveThirdParty upsync_lb
-syn keyword ngxDirectiveThirdParty upstream_show
+syn keyword ngxDirectiveThirdParty contained upsync
+syn keyword ngxDirectiveThirdParty contained upsync_dump_path
+syn keyword ngxDirectiveThirdParty contained upsync_lb
+syn keyword ngxDirectiveThirdParty contained upstream_show
 
 " URL Module <https://github.com/vozlt/nginx-module-url>
 " Nginx url encoding converting module
-syn keyword ngxDirectiveThirdParty url_encoding_convert
-syn keyword ngxDirectiveThirdParty url_encoding_convert_from
-syn keyword ngxDirectiveThirdParty url_encoding_convert_to
+syn keyword ngxDirectiveThirdParty contained url_encoding_convert
+syn keyword ngxDirectiveThirdParty contained url_encoding_convert_from
+syn keyword ngxDirectiveThirdParty contained url_encoding_convert_to
 
 " User Agent Module <https://github.com/alibaba/nginx-http-user-agent>
 " Match browsers and crawlers
-syn keyword ngxDirectiveThirdParty user_agent
+syn keyword ngxDirectiveThirdParty contained user_agent
 
 " Upstrema Ketama Chash Module <https://github.com/flygoast/ngx_http_upstream_ketama_chash>
 " Nginx load-balancer module implementing ketama consistent hashing.
-syn keyword ngxDirectiveThirdParty ketama_chash
+syn keyword ngxDirectiveThirdParty contained ketama_chash
 
 " Video Thumbextractor Module <https://github.com/wandenberg/nginx-video-thumbextractor-module>
 " Extract thumbs from a video file
-syn keyword ngxDirectiveThirdParty video_thumbextractor
-syn keyword ngxDirectiveThirdParty video_thumbextractor_video_filename
-syn keyword ngxDirectiveThirdParty video_thumbextractor_video_second
-syn keyword ngxDirectiveThirdParty video_thumbextractor_image_width
-syn keyword ngxDirectiveThirdParty video_thumbextractor_image_height
-syn keyword ngxDirectiveThirdParty video_thumbextractor_only_keyframe
-syn keyword ngxDirectiveThirdParty video_thumbextractor_next_time
-syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_rows
-syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_cols
-syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_max_rows
-syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_max_cols
-syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_sample_interval
-syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_color
-syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_margin
-syn keyword ngxDirectiveThirdParty video_thumbextractor_tile_padding
-syn keyword ngxDirectiveThirdParty video_thumbextractor_threads
-syn keyword ngxDirectiveThirdParty video_thumbextractor_processes_per_worker
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_video_filename
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_video_second
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_image_width
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_image_height
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_only_keyframe
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_next_time
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_rows
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_cols
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_max_rows
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_max_cols
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_sample_interval
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_color
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_margin
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_padding
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_threads
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_processes_per_worker
 
 " Eval Module <http://www.grid.net.ru/nginx/eval.en.html>
 " Module for nginx web server evaluates response of proxy or memcached module into variables.
-syn keyword ngxDirectiveThirdParty eval
-syn keyword ngxDirectiveThirdParty eval_escalate
-syn keyword ngxDirectiveThirdParty eval_override_content_type
+syn keyword ngxDirectiveThirdParty contained eval
+syn keyword ngxDirectiveThirdParty contained eval_escalate
+syn keyword ngxDirectiveThirdParty contained eval_override_content_type
 
 " VTS Module <https://github.com/vozlt/nginx-module-vts>
 " Nginx virtual host traffic status module
-syn keyword ngxDirectiveThirdParty vhost_traffic_status
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_zone
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_display
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_display_format
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_display_jsonp
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_filter
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_filter_by_host
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_filter_by_set_key
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_filter_check_duplicate
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_limit
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_limit_traffic
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_limit_traffic_by_set_key
-syn keyword ngxDirectiveThirdParty vhost_traffic_status_limit_check_duplicate
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_zone
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display_format
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display_jsonp
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_host
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_set_key
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_check_duplicate
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_traffic
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_traffic_by_set_key
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_check_duplicate
 
 " XSS Module <https://github.com/openresty/xss-nginx-module>
 " Native support for cross-site scripting (XSS) in an nginx.
-syn keyword ngxDirectiveThirdParty xss_get
-syn keyword ngxDirectiveThirdParty xss_callback_arg
-syn keyword ngxDirectiveThirdParty xss_override_status
-syn keyword ngxDirectiveThirdParty xss_check_status
-syn keyword ngxDirectiveThirdParty xss_input_types
+syn keyword ngxDirectiveThirdParty contained xss_get
+syn keyword ngxDirectiveThirdParty contained xss_callback_arg
+syn keyword ngxDirectiveThirdParty contained xss_override_status
+syn keyword ngxDirectiveThirdParty contained xss_check_status
+syn keyword ngxDirectiveThirdParty contained xss_input_types
 
 " ZIP Module <https://www.nginx.com/resources/wiki/modules/zip/>
 " ZIP archiver for nginx
@@ -2122,15 +2152,17 @@ syn keyword ngxDirectiveThirdParty xss_input_types
 " highlight
 
 hi link ngxComment Comment
+hi link ngxParamComment Comment
+hi link ngxListenComment Comment
 hi link ngxVariable Identifier
-hi link ngxVariableBlock Identifier
 hi link ngxVariableString PreProc
-hi link ngxBlock Normal
 hi link ngxString String
+hi link ngxListenString String
 
 hi link ngxBoolean Boolean
 hi link ngxDirectiveBlock Statement
 hi link ngxDirectiveImportant Type
+hi link ngxDirectiveListen Type
 hi link ngxDirectiveControl Keyword
 hi link ngxDirectiveError Constant
 hi link ngxDirectiveDeprecated Error
@@ -2138,7 +2170,5 @@ hi link ngxDirective Identifier
 hi link ngxDirectiveThirdParty Special
 
 hi link ngxListenOptions Keyword
-hi link ngxMailProtocol Keyword
-hi link ngxSSLProtocol Keyword
 
 let b:current_syntax = "nginx"
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 3d6579c..8cc2d80 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013000
-#define NGINX_VERSION      "1.13.0"
+#define nginx_version      1013001
+#define NGINX_VERSION      "1.13.1"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 2af2876..ec4692b 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -1345,6 +1345,49 @@ ngx_connection_local_sockaddr(ngx_connection_t *c, ngx_str_t *s,
 }
 
 
+ngx_int_t
+ngx_tcp_nodelay(ngx_connection_t *c)
+{
+    int  tcp_nodelay;
+
+    if (c->tcp_nodelay != NGX_TCP_NODELAY_UNSET) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0, "tcp_nodelay");
+
+    tcp_nodelay = 1;
+
+    if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
+                   (const void *) &tcp_nodelay, sizeof(int))
+        == -1)
+    {
+#if (NGX_SOLARIS)
+        if (c->log_error == NGX_ERROR_INFO) {
+
+            /* Solaris returns EINVAL if a socket has been shut down */
+            c->log_error = NGX_ERROR_IGNORE_EINVAL;
+
+            ngx_connection_error(c, ngx_socket_errno,
+                                 "setsockopt(TCP_NODELAY) failed");
+
+            c->log_error = NGX_ERROR_INFO;
+
+            return NGX_ERROR;
+        }
+#endif
+
+        ngx_connection_error(c, ngx_socket_errno,
+                             "setsockopt(TCP_NODELAY) failed");
+        return NGX_ERROR;
+    }
+
+    c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text)
 {
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 1d3e3a3..e4dfe58 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -214,6 +214,7 @@ void ngx_close_connection(ngx_connection_t *c);
 void ngx_close_idle_connections(ngx_cycle_t *cycle);
 ngx_int_t ngx_connection_local_sockaddr(ngx_connection_t *c, ngx_str_t *s,
     ngx_uint_t port);
+ngx_int_t ngx_tcp_nodelay(ngx_connection_t *c);
 ngx_int_t ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text);
 
 ngx_connection_t *ngx_get_connection(ngx_socket_t s, ngx_log_t *log);
diff --git a/src/core/ngx_murmurhash.c b/src/core/ngx_murmurhash.c
index c31e0e0..5ade658 100644
--- a/src/core/ngx_murmurhash.c
+++ b/src/core/ngx_murmurhash.c
@@ -35,8 +35,10 @@ ngx_murmur_hash2(u_char *data, size_t len)
     switch (len) {
     case 3:
         h ^= data[2] << 16;
+        /* fall through */
     case 2:
         h ^= data[1] << 8;
+        /* fall through */
     case 1:
         h ^= data[0];
         h *= 0x5bd1e995;
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 1fce2e8..87447d0 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -238,7 +238,7 @@ ngx_event_accept(ngx_event_t *ev)
 
         if (ev->deferred_accept) {
             rev->ready = 1;
-#if (NGX_HAVE_KQUEUE)
+#if (NGX_HAVE_KQUEUE || NGX_HAVE_EPOLLRDHUP)
             rev->available = 1;
 #endif
         }
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index fdbd0c9..2c4e114 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1300,7 +1300,7 @@ ngx_ssl_handshake(ngx_connection_t *c)
 #ifdef SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
 
         /* initial handshake done, disable renegotiation (CVE-2009-3555) */
-        if (c->ssl->connection->s3) {
+        if (c->ssl->connection->s3 && SSL_is_server(c->ssl->connection)) {
             c->ssl->connection->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;
         }
 
diff --git a/src/http/modules/ngx_http_access_module.c b/src/http/modules/ngx_http_access_module.c
index c553e46..7355de9 100644
--- a/src/http/modules/ngx_http_access_module.c
+++ b/src/http/modules/ngx_http_access_module.c
@@ -309,28 +309,22 @@ ngx_http_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_access_rule_un_t  *rule_un;
 #endif
 
+    all = 0;
     ngx_memzero(&cidr, sizeof(ngx_cidr_t));
 
     value = cf->args->elts;
 
-    all = (value[1].len == 3 && ngx_strcmp(value[1].data, "all") == 0);
-
-    if (!all) {
+    if (value[1].len == 3 && ngx_strcmp(value[1].data, "all") == 0) {
+        all = 1;
 
 #if (NGX_HAVE_UNIX_DOMAIN)
-
-        if (value[1].len == 5 && ngx_strcmp(value[1].data, "unix:") == 0) {
-            cidr.family = AF_UNIX;
-            rc = NGX_OK;
-
-        } else {
-            rc = ngx_ptocidr(&value[1], &cidr);
-        }
-
-#else
-        rc = ngx_ptocidr(&value[1], &cidr);
+    } else if (value[1].len == 5 && ngx_strcmp(value[1].data, "unix:") == 0) {
+        cidr.family = AF_UNIX;
 #endif
 
+    } else {
+        rc = ngx_ptocidr(&value[1], &cidr);
+
         if (rc == NGX_ERROR) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                          "invalid parameter \"%V\"", &value[1]);
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 06c1973..741e577 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -1878,6 +1878,7 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
 
                     p = ngx_pnalloc(r->pool, size);
                     if (p == NULL) {
+                        h->hash = 0;
                         return NGX_ERROR;
                     }
 
@@ -1900,6 +1901,7 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
                         ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
                                       "invalid header after joining "
                                       "FastCGI records");
+                        h->hash = 0;
                         return NGX_ERROR;
                     }
 
@@ -1925,6 +1927,7 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
                                               h->key.len + 1 + h->value.len + 1
                                               + h->key.len);
                     if (h->key.data == NULL) {
+                        h->hash = 0;
                         return NGX_ERROR;
                     }
 
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 0fee2c2..839d479 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -1798,6 +1798,7 @@ ngx_http_proxy_process_header(ngx_http_request_t *r)
             h->key.data = ngx_pnalloc(r->pool,
                                h->key.len + 1 + h->value.len + 1 + h->key.len);
             if (h->key.data == NULL) {
+                h->hash = 0;
                 return NGX_ERROR;
             }
 
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index 5e3355c..e1839e6 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -317,9 +317,15 @@ ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_http_realip_loc_conf_t *rlcf = conf;
 
-    ngx_int_t                rc;
-    ngx_str_t               *value;
-    ngx_cidr_t              *cidr;
+    ngx_int_t             rc;
+    ngx_str_t            *value;
+    ngx_url_t             u;
+    ngx_cidr_t            c, *cidr;
+    ngx_uint_t            i;
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
 
     value = cf->args->elts;
 
@@ -331,31 +337,78 @@ ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
     }
 
-    cidr = ngx_array_push(rlcf->from);
-    if (cidr == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
 #if (NGX_HAVE_UNIX_DOMAIN)
 
     if (ngx_strcmp(value[1].data, "unix:") == 0) {
+        cidr = ngx_array_push(rlcf->from);
+        if (cidr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
         cidr->family = AF_UNIX;
         return NGX_CONF_OK;
     }
 
 #endif
 
-    rc = ngx_ptocidr(&value[1], cidr);
+    rc = ngx_ptocidr(&value[1], &c);
+
+    if (rc != NGX_ERROR) {
+        if (rc == NGX_DONE) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "low address bits of %V are meaningless",
+                               &value[1]);
+        }
+
+        cidr = ngx_array_push(rlcf->from);
+        if (cidr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *cidr = c;
+
+        return NGX_CONF_OK;
+    }
+
+    ngx_memzero(&u, sizeof(ngx_url_t));
+    u.host = value[1];
+
+    if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
+        if (u.err) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "%s in set_real_ip_from \"%V\"",
+                               u.err, &u.host);
+        }
 
-    if (rc == NGX_ERROR) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"",
-                           &value[1]);
         return NGX_CONF_ERROR;
     }
 
-    if (rc == NGX_DONE) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                           "low address bits of %V are meaningless", &value[1]);
+    cidr = ngx_array_push_n(rlcf->from, u.naddrs);
+    if (cidr == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(cidr, u.naddrs * sizeof(ngx_cidr_t));
+
+    for (i = 0; i < u.naddrs; i++) {
+        cidr[i].family = u.addrs[i].sockaddr->sa_family;
+
+        switch (cidr[i].family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            sin6 = (struct sockaddr_in6 *) u.addrs[i].sockaddr;
+            cidr[i].u.in6.addr = sin6->sin6_addr;
+            ngx_memset(cidr[i].u.in6.mask.s6_addr, 0xff, 16);
+            break;
+#endif
+
+        default: /* AF_INET */
+            sin = (struct sockaddr_in *) u.addrs[i].sockaddr;
+            cidr[i].u.in.addr = sin->sin_addr.s_addr;
+            cidr[i].u.in.mask = 0xffffffff;
+            break;
+        }
     }
 
     return NGX_CONF_OK;
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index d1e37dd..9204af4 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -1040,6 +1040,7 @@ ngx_http_scgi_process_header(ngx_http_request_t *r)
                                       h->key.len + 1 + h->value.len + 1
                                       + h->key.len);
             if (h->key.data == NULL) {
+                h->hash = 0;
                 return NGX_ERROR;
             }
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 26443bb..a2bec4c 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -1244,6 +1244,7 @@ ngx_http_uwsgi_process_header(ngx_http_request_t *r)
                                       h->key.len + 1 + h->value.len + 1
                                       + h->key.len);
             if (h->key.data == NULL) {
+                h->hash = 0;
                 return NGX_ERROR;
             }
 
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index af67b7f..7e40e78 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2518,6 +2518,7 @@ ngx_http_subrequest(ngx_http_request_t *r,
 
     sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0;
     sr->waited = (flags & NGX_HTTP_SUBREQUEST_WAITED) != 0;
+    sr->background = (flags & NGX_HTTP_SUBREQUEST_BACKGROUND) != 0;
 
     sr->unparsed_uri = r->unparsed_uri;
     sr->method_name = ngx_http_core_get_method;
@@ -2531,29 +2532,31 @@ ngx_http_subrequest(ngx_http_request_t *r,
     sr->read_event_handler = ngx_http_request_empty_handler;
     sr->write_event_handler = ngx_http_handler;
 
-    if (c->data == r && r->postponed == NULL) {
-        c->data = sr;
-    }
-
     sr->variables = r->variables;
 
     sr->log_handler = r->log_handler;
 
-    pr = ngx_palloc(r->pool, sizeof(ngx_http_postponed_request_t));
-    if (pr == NULL) {
-        return NGX_ERROR;
-    }
+    if (!sr->background) {
+        if (c->data == r && r->postponed == NULL) {
+            c->data = sr;
+        }
 
-    pr->request = sr;
-    pr->out = NULL;
-    pr->next = NULL;
+        pr = ngx_palloc(r->pool, sizeof(ngx_http_postponed_request_t));
+        if (pr == NULL) {
+            return NGX_ERROR;
+        }
 
-    if (r->postponed) {
-        for (p = r->postponed; p->next; p = p->next) { /* void */ }
-        p->next = pr;
+        pr->request = sr;
+        pr->out = NULL;
+        pr->next = NULL;
 
-    } else {
-        r->postponed = pr;
+        if (r->postponed) {
+            for (p = r->postponed; p->next; p = p->next) { /* void */ }
+            p->next = pr;
+
+        } else {
+            r->postponed = pr;
+        }
     }
 
     sr->internal = 1;
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index b635b35..a823c51 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1700,13 +1700,14 @@ ngx_http_file_cache_cleanup(void *data)
 static time_t
 ngx_http_file_cache_forced_expire(ngx_http_file_cache_t *cache)
 {
-    u_char                      *name;
+    u_char                      *name, *p;
     size_t                       len;
     time_t                       wait;
     ngx_uint_t                   tries;
     ngx_path_t                  *path;
-    ngx_queue_t                 *q;
+    ngx_queue_t                 *q, *sentinel;
     ngx_http_file_cache_node_t  *fcn;
+    u_char                       key[2 * NGX_HTTP_CACHE_KEY_LEN];
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
                    "http file cache forced expire");
@@ -1723,13 +1724,21 @@ ngx_http_file_cache_forced_expire(ngx_http_file_cache_t *cache)
 
     wait = 10;
     tries = 20;
+    sentinel = NULL;
 
     ngx_shmtx_lock(&cache->shpool->mutex);
 
-    for (q = ngx_queue_last(&cache->sh->queue);
-         q != ngx_queue_sentinel(&cache->sh->queue);
-         q = ngx_queue_prev(q))
-    {
+    for ( ;; ) {
+        if (ngx_queue_empty(&cache->sh->queue)) {
+            break;
+        }
+
+        q = ngx_queue_last(&cache->sh->queue);
+
+        if (q == sentinel) {
+            break;
+        }
+
         fcn = ngx_queue_data(q, ngx_http_file_cache_node_t, queue);
 
         ngx_log_debug6(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
@@ -1740,15 +1749,37 @@ ngx_http_file_cache_forced_expire(ngx_http_file_cache_t *cache)
         if (fcn->count == 0) {
             ngx_http_file_cache_delete(cache, q, name);
             wait = 0;
-
-        } else {
-            if (--tries) {
-                continue;
-            }
-
-            wait = 1;
+            break;
         }
 
+        p = ngx_hex_dump(key, (u_char *) &fcn->node.key,
+                         sizeof(ngx_rbtree_key_t));
+        len = NGX_HTTP_CACHE_KEY_LEN - sizeof(ngx_rbtree_key_t);
+        (void) ngx_hex_dump(p, fcn->key, len);
+
+        /*
+         * abnormally exited workers may leave locked cache entries,
+         * and although it may be safe to remove them completely,
+         * we prefer to just move them to the top of the inactive queue
+         */
+
+        ngx_queue_remove(q);
+        fcn->expire = ngx_time() + cache->inactive;
+        ngx_queue_insert_head(&cache->sh->queue, &fcn->queue);
+
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "ignore long locked inactive cache entry %*s, count:%d",
+                      (size_t) 2 * NGX_HTTP_CACHE_KEY_LEN, key, fcn->count);
+
+        if (sentinel == NULL) {
+            sentinel = q;
+        }
+
+        if (--tries) {
+            continue;
+        }
+
+        wait = 1;
         break;
     }
 
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index 5fc7e1f..9b89405 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -119,7 +119,7 @@ static ngx_str_t ngx_http_status_lines[] = {
     ngx_string("502 Bad Gateway"),
     ngx_string("503 Service Temporarily Unavailable"),
     ngx_string("504 Gateway Time-out"),
-    ngx_null_string,        /* "505 HTTP Version Not Supported" */
+    ngx_string("505 HTTP Version Not Supported"),
     ngx_null_string,        /* "506 Variant Also Negotiates" */
     ngx_string("507 Insufficient Storage"),
 
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index 9f99473..e8e5156 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -723,6 +723,11 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
             }
 
             r->http_major = ch - '0';
+
+            if (r->http_major > 1) {
+                return NGX_HTTP_PARSE_INVALID_VERSION;
+            }
+
             state = sw_major_digit;
             break;
 
@@ -737,11 +742,12 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 return NGX_HTTP_PARSE_INVALID_REQUEST;
             }
 
-            if (r->http_major > 99) {
-                return NGX_HTTP_PARSE_INVALID_REQUEST;
+            r->http_major = r->http_major * 10 + ch - '0';
+
+            if (r->http_major > 1) {
+                return NGX_HTTP_PARSE_INVALID_VERSION;
             }
 
-            r->http_major = r->http_major * 10 + ch - '0';
             break;
 
         /* first digit of minor HTTP version */
@@ -1390,6 +1396,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
                 goto done;
             case '+':
                 r->plus_in_uri = 1;
+                /* fall through */
             default:
                 state = sw_usual;
                 *u++ = ch;
@@ -1431,6 +1438,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
                 goto done;
             case '+':
                 r->plus_in_uri = 1;
+                /* fall through */
             default:
                 state = sw_usual;
                 *u++ = ch;
@@ -1478,6 +1486,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
                 goto done;
             case '+':
                 r->plus_in_uri = 1;
+                /* fall through */
             default:
                 state = sw_usual;
                 *u++ = ch;
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 476f039..cc3722f 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -72,6 +72,9 @@ static char *ngx_http_client_errors[] = {
     /* NGX_HTTP_PARSE_INVALID_REQUEST */
     "client sent invalid request",
 
+    /* NGX_HTTP_PARSE_INVALID_VERSION */
+    "client sent invalid version",
+
     /* NGX_HTTP_PARSE_INVALID_09_METHOD */
     "client sent invalid method in HTTP/0.9 request"
 };
@@ -620,14 +623,15 @@ ngx_http_create_request(ngx_connection_t *c)
 static void
 ngx_http_ssl_handshake(ngx_event_t *rev)
 {
-    u_char                   *p, buf[NGX_PROXY_PROTOCOL_MAX_HEADER + 1];
-    size_t                    size;
-    ssize_t                   n;
-    ngx_err_t                 err;
-    ngx_int_t                 rc;
-    ngx_connection_t         *c;
-    ngx_http_connection_t    *hc;
-    ngx_http_ssl_srv_conf_t  *sscf;
+    u_char                    *p, buf[NGX_PROXY_PROTOCOL_MAX_HEADER + 1];
+    size_t                     size;
+    ssize_t                    n;
+    ngx_err_t                  err;
+    ngx_int_t                  rc;
+    ngx_connection_t          *c;
+    ngx_http_connection_t     *hc;
+    ngx_http_ssl_srv_conf_t   *sscf;
+    ngx_http_core_loc_conf_t  *clcf;
 
     c = rev->data;
     hc = c->data;
@@ -709,6 +713,14 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, rev->log, 0,
                            "https ssl handshake: 0x%02Xd", buf[0]);
 
+            clcf = ngx_http_get_module_loc_conf(hc->conf_ctx,
+                                                ngx_http_core_module);
+
+            if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+                ngx_http_close_connection(c);
+                return;
+            }
+
             sscf = ngx_http_get_module_srv_conf(hc->conf_ctx,
                                                 ngx_http_ssl_module);
 
@@ -1036,7 +1048,14 @@ ngx_http_process_request_line(ngx_event_t *rev)
 
             ngx_log_error(NGX_LOG_INFO, c->log, 0,
                           ngx_http_client_errors[rc - NGX_HTTP_CLIENT_ERROR]);
-            ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+
+            if (rc == NGX_HTTP_PARSE_INVALID_VERSION) {
+                ngx_http_finalize_request(r, NGX_HTTP_VERSION_NOT_SUPPORTED);
+
+            } else {
+                ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+            }
+
             return;
         }
 
@@ -2312,10 +2331,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
             return;
         }
 
-        if (r->main->blocked) {
-            r->write_event_handler = ngx_http_request_finalizer;
-        }
-
         ngx_http_terminate_request(r, rc);
         return;
     }
@@ -2347,6 +2362,26 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
     }
 
     if (r != r->main) {
+        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+        if (r->background) {
+            if (!r->logged) {
+                if (clcf->log_subrequest) {
+                    ngx_http_log_request(r);
+                }
+
+                r->logged = 1;
+
+            } else {
+                ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                              "subrequest: \"%V?%V\" logged again",
+                              &r->uri, &r->args);
+            }
+
+            r->done = 1;
+            ngx_http_finalize_connection(r);
+            return;
+        }
 
         if (r->buffered || r->postponed) {
 
@@ -2364,9 +2399,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
             r->main->count--;
 
             if (!r->logged) {
-
-                clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
                 if (clcf->log_subrequest) {
                     ngx_http_log_request(r);
                 }
@@ -2413,7 +2445,7 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         return;
     }
 
-    if (r->buffered || c->buffered || r->postponed || r->blocked) {
+    if (r->buffered || c->buffered || r->postponed) {
 
         if (ngx_http_set_write_handler(r) != NGX_OK) {
             ngx_http_terminate_request(r, 0);
@@ -2430,6 +2462,8 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
     }
 
     r->done = 1;
+
+    r->read_event_handler = ngx_http_block_reading;
     r->write_event_handler = ngx_http_request_empty_handler;
 
     if (!r->post_action) {
@@ -2492,6 +2526,8 @@ ngx_http_terminate_request(ngx_http_request_t *r, ngx_int_t rc)
     if (mr->write_event_handler) {
 
         if (mr->blocked) {
+            r->connection->error = 1;
+            r->write_event_handler = ngx_http_request_finalizer;
             return;
         }
 
@@ -2548,6 +2584,8 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
         return;
     }
 
+    r = r->main;
+
     if (r->reading_body) {
         r->keepalive = 0;
         r->lingering_close = 1;
@@ -3030,30 +3068,9 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
         tcp_nodelay = 1;
     }
 
-    if (tcp_nodelay
-        && clcf->tcp_nodelay
-        && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
-    {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
-        if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                       (const void *) &tcp_nodelay, sizeof(int))
-            == -1)
-        {
-#if (NGX_SOLARIS)
-            /* Solaris returns EINVAL if a socket has been shut down */
-            c->log_error = NGX_ERROR_IGNORE_EINVAL;
-#endif
-
-            ngx_connection_error(c, ngx_socket_errno,
-                                 "setsockopt(TCP_NODELAY) failed");
-
-            c->log_error = NGX_ERROR_INFO;
-            ngx_http_close_connection(c);
-            return;
-        }
-
-        c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+    if (tcp_nodelay && clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+        ngx_http_close_connection(c);
+        return;
     }
 
 #if 0
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 2c77f93..283c582 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -54,15 +54,17 @@
 #define NGX_HTTP_CLIENT_ERROR              10
 #define NGX_HTTP_PARSE_INVALID_METHOD      10
 #define NGX_HTTP_PARSE_INVALID_REQUEST     11
-#define NGX_HTTP_PARSE_INVALID_09_METHOD   12
+#define NGX_HTTP_PARSE_INVALID_VERSION     12
+#define NGX_HTTP_PARSE_INVALID_09_METHOD   13
 
-#define NGX_HTTP_PARSE_INVALID_HEADER      13
+#define NGX_HTTP_PARSE_INVALID_HEADER      14
 
 
 /* unused                                  1 */
 #define NGX_HTTP_SUBREQUEST_IN_MEMORY      2
 #define NGX_HTTP_SUBREQUEST_WAITED         4
 #define NGX_HTTP_SUBREQUEST_CLONE          8
+#define NGX_HTTP_SUBREQUEST_BACKGROUND     16
 
 #define NGX_HTTP_LOG_UNSAFE                1
 
@@ -136,6 +138,7 @@
 #define NGX_HTTP_BAD_GATEWAY               502
 #define NGX_HTTP_SERVICE_UNAVAILABLE       503
 #define NGX_HTTP_GATEWAY_TIME_OUT          504
+#define NGX_HTTP_VERSION_NOT_SUPPORTED     505
 #define NGX_HTTP_INSUFFICIENT_STORAGE      507
 
 
@@ -484,7 +487,6 @@ struct ngx_http_request_s {
 
 #if (NGX_HTTP_CACHE)
     unsigned                          cached:1;
-    unsigned                          cache_updater:1;
 #endif
 
 #if (NGX_HTTP_GZIP)
@@ -541,6 +543,7 @@ struct ngx_http_request_s {
     unsigned                          stat_writing:1;
     unsigned                          stat_processing:1;
 
+    unsigned                          background:1;
     unsigned                          health_check:1;
 
     /* used to parse HTTP headers */
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index c4c1305..2c1ff17 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -321,6 +321,14 @@ static char ngx_http_error_504_page[] =
 ;
 
 
+static char ngx_http_error_505_page[] =
+"<html>" CRLF
+"<head><title>505 HTTP Version Not Supported</title></head>" CRLF
+"<body bgcolor=\"white\">" CRLF
+"<center><h1>505 HTTP Version Not Supported</h1></center>" CRLF
+;
+
+
 static char ngx_http_error_507_page[] =
 "<html>" CRLF
 "<head><title>507 Insufficient Storage</title></head>" CRLF
@@ -395,7 +403,7 @@ static ngx_str_t ngx_http_error_pages[] = {
     ngx_string(ngx_http_error_502_page),
     ngx_string(ngx_http_error_503_page),
     ngx_string(ngx_http_error_504_page),
-    ngx_null_string,                     /* 505 */
+    ngx_string(ngx_http_error_505_page),
     ngx_null_string,                     /* 506 */
     ngx_string(ngx_http_error_507_page)
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index fcfa2ad..0fc5ab5 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -879,7 +879,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
     case NGX_HTTP_CACHE_STALE:
 
         if (((u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING)
-             || c->stale_updating) && !r->cache_updater
+             || c->stale_updating) && !r->background
             && u->conf->cache_background_update)
         {
             r->cache->background = 1;
@@ -892,7 +892,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
     case NGX_HTTP_CACHE_UPDATING:
 
         if (((u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING)
-             || c->stale_updating) && !r->cache_updater)
+             || c->stale_updating) && !r->background)
         {
             u->cache_status = rc;
             rc = NGX_OK;
@@ -1076,14 +1076,14 @@ ngx_http_upstream_cache_background_update(ngx_http_request_t *r,
     }
 
     if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL,
-                            NGX_HTTP_SUBREQUEST_CLONE)
+                            NGX_HTTP_SUBREQUEST_CLONE
+                            |NGX_HTTP_SUBREQUEST_BACKGROUND)
         != NGX_OK)
     {
         return NGX_ERROR;
     }
 
     sr->header_only = 1;
-    sr->cache_updater = 1;
 
     return NGX_OK;
 }
@@ -1606,7 +1606,6 @@ static void
 ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_connection_t *c)
 {
-    int                        tcp_nodelay;
     ngx_int_t                  rc;
     ngx_http_core_loc_conf_t  *clcf;
 
@@ -1646,22 +1645,10 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
 
         clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
-        if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
-            tcp_nodelay = 1;
-
-            if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                           (const void *) &tcp_nodelay, sizeof(int)) == -1)
-            {
-                ngx_connection_error(c, ngx_socket_errno,
-                                     "setsockopt(TCP_NODELAY) failed");
-                ngx_http_upstream_finalize_request(r, u,
+        if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+            ngx_http_upstream_finalize_request(r, u,
                                                NGX_HTTP_INTERNAL_SERVER_ERROR);
-                return;
-            }
-
-            c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+            return;
         }
     }
 
@@ -2014,7 +2001,6 @@ static ngx_int_t
 ngx_http_upstream_send_request_body(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_uint_t do_write)
 {
-    int                        tcp_nodelay;
     ngx_int_t                  rc;
     ngx_chain_t               *out, *cl, *ln;
     ngx_connection_t          *c;
@@ -2051,20 +2037,8 @@ ngx_http_upstream_send_request_body(ngx_http_request_t *r,
         c = u->peer.connection;
         clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
-        if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
-            tcp_nodelay = 1;
-
-            if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                           (const void *) &tcp_nodelay, sizeof(int)) == -1)
-            {
-                ngx_connection_error(c, ngx_socket_errno,
-                                     "setsockopt(TCP_NODELAY) failed");
-                return NGX_ERROR;
-            }
-
-            c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+        if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+            return NGX_ERROR;
         }
 
         r->read_event_handler = ngx_http_upstream_read_request_handler;
@@ -2822,7 +2796,6 @@ ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r,
 static void
 ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
 {
-    int                        tcp_nodelay;
     ssize_t                    n;
     ngx_int_t                  rc;
     ngx_event_pipe_t          *p;
@@ -2903,21 +2876,9 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
             return;
         }
 
-        if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
-            tcp_nodelay = 1;
-
-            if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                               (const void *) &tcp_nodelay, sizeof(int)) == -1)
-            {
-                ngx_connection_error(c, ngx_socket_errno,
-                                     "setsockopt(TCP_NODELAY) failed");
-                ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-                return;
-            }
-
-            c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+        if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+            ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
+            return;
         }
 
         n = u->buffer.last - u->buffer.pos;
@@ -3176,7 +3137,6 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
 static void
 ngx_http_upstream_upgrade(ngx_http_request_t *r, ngx_http_upstream_t *u)
 {
-    int                        tcp_nodelay;
     ngx_connection_t          *c;
     ngx_http_core_loc_conf_t  *clcf;
 
@@ -3194,37 +3154,15 @@ ngx_http_upstream_upgrade(ngx_http_request_t *r, ngx_http_upstream_t *u)
     r->write_event_handler = ngx_http_upstream_upgraded_write_downstream;
 
     if (clcf->tcp_nodelay) {
-        tcp_nodelay = 1;
 
-        if (c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
-            if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                           (const void *) &tcp_nodelay, sizeof(int)) == -1)
-            {
-                ngx_connection_error(c, ngx_socket_errno,
-                                     "setsockopt(TCP_NODELAY) failed");
-                ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-                return;
-            }
-
-            c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+        if (ngx_tcp_nodelay(c) != NGX_OK) {
+            ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
+            return;
         }
 
-        if (u->peer.connection->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->peer.connection->log, 0,
-                           "tcp_nodelay");
-
-            if (setsockopt(u->peer.connection->fd, IPPROTO_TCP, TCP_NODELAY,
-                           (const void *) &tcp_nodelay, sizeof(int)) == -1)
-            {
-                ngx_connection_error(u->peer.connection, ngx_socket_errno,
-                                     "setsockopt(TCP_NODELAY) failed");
-                ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-                return;
-            }
-
-            u->peer.connection->tcp_nodelay = NGX_TCP_NODELAY_SET;
+        if (ngx_tcp_nodelay(u->peer.connection) != NGX_OK) {
+            ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
+            return;
         }
     }
 
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 1a9e521..ed78638 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -529,29 +529,8 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
         tcp_nodelay = 1;
     }
 
-    if (tcp_nodelay
-        && clcf->tcp_nodelay
-        && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
-    {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
-        if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                       (const void *) &tcp_nodelay, sizeof(int))
-            == -1)
-        {
-#if (NGX_SOLARIS)
-            /* Solaris returns EINVAL if a socket has been shut down */
-            c->log_error = NGX_ERROR_IGNORE_EINVAL;
-#endif
-
-            ngx_connection_error(c, ngx_socket_errno,
-                                 "setsockopt(TCP_NODELAY) failed");
-
-            c->log_error = NGX_ERROR_INFO;
-            goto error;
-        }
-
-        c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+    if (tcp_nodelay && clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+        goto error;
     }
 
     for ( /* void */ ; out; out = fn) {
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index dac5046..7276531 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -619,6 +619,8 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 
     ngx_http_v2_queue_blocked_frame(r->stream->connection, frame);
 
+    r->stream->queued = 1;
+
     cln = ngx_http_cleanup_add(r, 0);
     if (cln == NULL) {
         return NGX_ERROR;
@@ -627,8 +629,6 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     cln->handler = ngx_http_v2_filter_cleanup;
     cln->data = r->stream;
 
-    r->stream->queued = 1;
-
     fc->send_chain = ngx_http_v2_send_chain;
     fc->need_last_buf = 1;
 
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 9d4ef56..f6b26ed 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -222,7 +222,7 @@ ngx_mail_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c)
     ngx_mail_session_t        *s;
     ngx_mail_core_srv_conf_t  *cscf;
 
-    if (ngx_ssl_create_connection(ssl, c, 0) == NGX_ERROR) {
+    if (ngx_ssl_create_connection(ssl, c, 0) != NGX_OK) {
         ngx_mail_close_connection(c);
         return;
     }
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
index dd50b5c..993c032 100644
--- a/src/os/unix/ngx_process.c
+++ b/src/os/unix/ngx_process.c
@@ -413,6 +413,7 @@ ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext)
                 break;
             }
             ngx_debug_quit = 1;
+            /* fall through */
         case ngx_signal_value(NGX_SHUTDOWN_SIGNAL):
             ngx_quit = 1;
             action = ", shutting down";
diff --git a/src/stream/ngx_stream_access_module.c b/src/stream/ngx_stream_access_module.c
index 1745cdf..a3020d4 100644
--- a/src/stream/ngx_stream_access_module.c
+++ b/src/stream/ngx_stream_access_module.c
@@ -299,28 +299,22 @@ ngx_stream_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_stream_access_rule_un_t  *rule_un;
 #endif
 
+    all = 0;
     ngx_memzero(&cidr, sizeof(ngx_cidr_t));
 
     value = cf->args->elts;
 
-    all = (value[1].len == 3 && ngx_strcmp(value[1].data, "all") == 0);
-
-    if (!all) {
+    if (value[1].len == 3 && ngx_strcmp(value[1].data, "all") == 0) {
+        all = 1;
 
 #if (NGX_HAVE_UNIX_DOMAIN)
-
-        if (value[1].len == 5 && ngx_strcmp(value[1].data, "unix:") == 0) {
-            cidr.family = AF_UNIX;
-            rc = NGX_OK;
-
-        } else {
-            rc = ngx_ptocidr(&value[1], &cidr);
-        }
-
-#else
-        rc = ngx_ptocidr(&value[1], &cidr);
+    } else if (value[1].len == 5 && ngx_strcmp(value[1].data, "unix:") == 0) {
+        cidr.family = AF_UNIX;
 #endif
 
+    } else {
+        rc = ngx_ptocidr(&value[1], &cidr);
+
         if (rc == NGX_ERROR) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                          "invalid parameter \"%V\"", &value[1]);
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index db8c2a3..272708d 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -309,7 +309,6 @@ ngx_int_t
 ngx_stream_core_content_phase(ngx_stream_session_t *s,
     ngx_stream_phase_handler_t *ph)
 {
-    int                          tcp_nodelay;
     ngx_connection_t            *c;
     ngx_stream_core_srv_conf_t  *cscf;
 
@@ -321,22 +320,10 @@ ngx_stream_core_content_phase(ngx_stream_session_t *s,
 
     if (c->type == SOCK_STREAM
         && cscf->tcp_nodelay
-        && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
+        && ngx_tcp_nodelay(c) != NGX_OK)
     {
-        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0, "tcp_nodelay");
-
-        tcp_nodelay = 1;
-
-        if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                       (const void *) &tcp_nodelay, sizeof(int)) == -1)
-        {
-            ngx_connection_error(c, ngx_socket_errno,
-                                 "setsockopt(TCP_NODELAY) failed");
-            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
-            return NGX_OK;
-        }
-
-        c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+        ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return NGX_OK;
     }
 
     cscf->handler(s);
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index fe52cb6..0afde1c 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -729,7 +729,6 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
 static void
 ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 {
-    int                           tcp_nodelay;
     u_char                       *p;
     ngx_chain_t                  *cl;
     ngx_connection_t             *c, *pc;
@@ -745,22 +744,10 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 
     if (pc->type == SOCK_STREAM
         && cscf->tcp_nodelay
-        && pc->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
+        && ngx_tcp_nodelay(pc) != NGX_OK)
     {
-        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, pc->log, 0, "tcp_nodelay");
-
-        tcp_nodelay = 1;
-
-        if (setsockopt(pc->fd, IPPROTO_TCP, TCP_NODELAY,
-                       (const void *) &tcp_nodelay, sizeof(int)) == -1)
-        {
-            ngx_connection_error(pc, ngx_socket_errno,
-                                 "setsockopt(TCP_NODELAY) failed");
-            ngx_stream_proxy_next_upstream(s);
-            return;
-        }
-
-        pc->tcp_nodelay = NGX_TCP_NODELAY_SET;
+        ngx_stream_proxy_next_upstream(s);
+        return;
     }
 
     pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
diff --git a/src/stream/ngx_stream_realip_module.c b/src/stream/ngx_stream_realip_module.c
index 0740431..1266605 100644
--- a/src/stream/ngx_stream_realip_module.c
+++ b/src/stream/ngx_stream_realip_module.c
@@ -178,9 +178,15 @@ ngx_stream_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_stream_realip_srv_conf_t *rscf = conf;
 
-    ngx_int_t                rc;
-    ngx_str_t               *value;
-    ngx_cidr_t              *cidr;
+    ngx_int_t             rc;
+    ngx_str_t            *value;
+    ngx_url_t             u;
+    ngx_cidr_t            c, *cidr;
+    ngx_uint_t            i;
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
 
     value = cf->args->elts;
 
@@ -192,31 +198,78 @@ ngx_stream_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
     }
 
-    cidr = ngx_array_push(rscf->from);
-    if (cidr == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
 #if (NGX_HAVE_UNIX_DOMAIN)
 
     if (ngx_strcmp(value[1].data, "unix:") == 0) {
+        cidr = ngx_array_push(rscf->from);
+        if (cidr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
         cidr->family = AF_UNIX;
         return NGX_CONF_OK;
     }
 
 #endif
 
-    rc = ngx_ptocidr(&value[1], cidr);
+    rc = ngx_ptocidr(&value[1], &c);
+
+    if (rc != NGX_ERROR) {
+        if (rc == NGX_DONE) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "low address bits of %V are meaningless",
+                               &value[1]);
+        }
+
+        cidr = ngx_array_push(rscf->from);
+        if (cidr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *cidr = c;
+
+        return NGX_CONF_OK;
+    }
+
+    ngx_memzero(&u, sizeof(ngx_url_t));
+    u.host = value[1];
+
+    if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
+        if (u.err) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "%s in set_real_ip_from \"%V\"",
+                               u.err, &u.host);
+        }
 
-    if (rc == NGX_ERROR) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"",
-                           &value[1]);
         return NGX_CONF_ERROR;
     }
 
-    if (rc == NGX_DONE) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                           "low address bits of %V are meaningless", &value[1]);
+    cidr = ngx_array_push_n(rscf->from, u.naddrs);
+    if (cidr == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(cidr, u.naddrs * sizeof(ngx_cidr_t));
+
+    for (i = 0; i < u.naddrs; i++) {
+        cidr[i].family = u.addrs[i].sockaddr->sa_family;
+
+        switch (cidr[i].family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            sin6 = (struct sockaddr_in6 *) u.addrs[i].sockaddr;
+            cidr[i].u.in6.addr = sin6->sin6_addr;
+            ngx_memset(cidr[i].u.in6.mask.s6_addr, 0xff, 16);
+            break;
+#endif
+
+        default: /* AF_INET */
+            sin = (struct sockaddr_in *) u.addrs[i].sockaddr;
+            cidr[i].u.in.addr = sin->sin_addr.s_addr;
+            cidr[i].u.in.mask = 0xffffffff;
+            break;
+        }
     }
 
     return NGX_CONF_OK;
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 593776b..da26a41 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -352,13 +352,20 @@ ngx_stream_ssl_handler(ngx_stream_session_t *s)
 static ngx_int_t
 ngx_stream_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c)
 {
-    ngx_int_t               rc;
-    ngx_stream_session_t   *s;
-    ngx_stream_ssl_conf_t  *sslcf;
+    ngx_int_t                    rc;
+    ngx_stream_session_t        *s;
+    ngx_stream_ssl_conf_t       *sslcf;
+    ngx_stream_core_srv_conf_t  *cscf;
 
     s = c->data;
 
-    if (ngx_ssl_create_connection(ssl, c, 0) == NGX_ERROR) {
+    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
+
+    if (cscf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_ssl_create_connection(ssl, c, 0) != NGX_OK) {
         return NGX_ERROR;
     }
 

From 05b6bb9e3bec4615a5a7cc318f44b93a50f9b7ad Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 31 May 2017 11:42:21 +0300
Subject: [PATCH 189/600] Release 1.13.1-1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a36a3df..e0009f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.13.1-1) experimental; urgency=medium
+
+  * New upstream version 1.13.1.
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 31 May 2017 11:41:59 +0300
+
 nginx (1.13.0-1) experimental; urgency=medium
 
   * New upstream release.

From 1084313b41da6502ecb6b9a9cd97452d5aa8d025 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 20 Jun 2017 14:17:25 +0300
Subject: [PATCH 190/600] Release 1.13.1-2

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e0009f0..fac5d1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.13.1-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Tue, 20 Jun 2017 14:16:52 +0300
+
 nginx (1.13.1-1) experimental; urgency=medium
 
   * New upstream version 1.13.1.

From 5dcee0ba0ad487f103e55e35d526fe6e2e06f25a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 28 Jun 2017 11:05:50 +0300
Subject: [PATCH 191/600] New upstream version 1.13.2

---
 CHANGES                                       |  21 +++
 CHANGES.ru                                    |  22 +++
 auto/cc/bcc                                   |   1 -
 auto/cc/msvc                                  |   1 -
 auto/cc/owc                                   |   1 -
 auto/os/conf                                  |   8 +
 auto/os/win32                                 |   1 +
 auto/unix                                     |   5 +-
 configure                                     |   2 +-
 src/core/nginx.h                              |   4 +-
 src/core/ngx_cycle.c                          |   4 +-
 src/core/ngx_file.c                           |   4 +-
 src/core/ngx_resolver.c                       |   9 +-
 src/core/ngx_resolver.h                       |   3 +-
 src/core/ngx_rwlock.c                         |  11 +-
 src/core/ngx_rwlock.h                         |   1 +
 .../modules/ngx_http_chunked_filter_module.c  | 158 ++++++++++++----
 .../modules/ngx_http_gzip_filter_module.c     |   8 +-
 .../modules/ngx_http_headers_filter_module.c  | 170 +++++++++++++++---
 .../modules/ngx_http_range_filter_module.c    |   3 +
 src/http/modules/ngx_http_ssi_filter_module.c |   2 +-
 .../modules/ngx_http_userid_filter_module.c   |   4 +
 src/http/ngx_http_core_module.c               |   8 +
 src/http/ngx_http_request.c                   |   8 +
 src/http/ngx_http_request.h                   |   2 +
 src/http/ngx_http_upstream.c                  |  47 +++--
 src/http/ngx_http_variables.c                 |  15 ++
 src/http/v2/ngx_http_v2.c                     | 122 +++++++------
 src/http/v2/ngx_http_v2.h                     |   9 +
 src/http/v2/ngx_http_v2_filter_module.c       | 166 +++++++++++++++--
 src/os/unix/ngx_udp_sendmsg_chain.c           |   6 +-
 31 files changed, 666 insertions(+), 160 deletions(-)

diff --git a/CHANGES b/CHANGES
index 992cc70..e7126ff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,25 @@
 
+Changes with nginx 1.13.2                                        27 Jun 2017
+
+    *) Change: nginx now returns 200 instead of 416 when a range starting
+       with 0 is requested from an empty file.
+
+    *) Feature: the "add_trailer" directive.
+       Thanks to Piotr Sikora.
+
+    *) Bugfix: nginx could not be built on Cygwin and NetBSD; the bug had
+       appeared in 1.13.0.
+
+    *) Bugfix: nginx could not be built under MSYS2 / MinGW 64-bit.
+       Thanks to Orgad Shaneh.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using SSI with many includes and proxy_pass with variables.
+
+    *) Bugfix: in the ngx_http_v2_module.
+       Thanks to Piotr Sikora.
+
+
 Changes with nginx 1.13.1                                        30 May 2017
 
     *) Feature: now a hostname can be used as the "set_real_ip_from"
diff --git a/CHANGES.ru b/CHANGES.ru
index d42b90f..69e2be1 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,26 @@
 
+Изменения в nginx 1.13.2                                          27.06.2017
+
+    *) Изменение: теперь при запросе диапазона, начинающегося с 0, из
+       пустого файла nginx возвращает ответ 200 вместо 416.
+
+    *) Добавление: директива add_trailer.
+       Спасибо Piotr Sikora.
+
+    *) Исправление: nginx не собирался под Cygwin и NetBSD; ошибка появилась
+       в 1.13.0.
+
+    *) Исправление: nginx не собирался под MSYS2 / MinGW 64-bit.
+       Спасибо Orgad Shaneh.
+
+    *) Исправление: при использовании SSI с большим количеством подзапросов
+       и proxy_pass с переменными в рабочем процессе мог произойти
+       segmentation fault.
+
+    *) Исправление: в модуле ngx_http_v2_module.
+       Спасибо Piotr Sikora.
+
+
 Изменения в nginx 1.13.1                                          30.05.2017
 
     *) Добавление: теперь в качестве параметра директивы set_real_ip_from
diff --git a/auto/cc/bcc b/auto/cc/bcc
index ec82e60..e990a9f 100644
--- a/auto/cc/bcc
+++ b/auto/cc/bcc
@@ -62,7 +62,6 @@ ngx_include_opt="-I"
 ngx_objout="-o"
 ngx_binout="-e"
 ngx_objext="obj"
-ngx_binext=".exe"
 
 ngx_long_start='@&&|
 	'
diff --git a/auto/cc/msvc b/auto/cc/msvc
index 4eef101..8257252 100644
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -142,7 +142,6 @@ ngx_pic_opt=
 ngx_objout="-Fo"
 ngx_binout="-Fe"
 ngx_objext="obj"
-ngx_binext=".exe"
 
 ngx_long_start='@<<
 	'
diff --git a/auto/cc/owc b/auto/cc/owc
index a063aa3..f7fd88c 100644
--- a/auto/cc/owc
+++ b/auto/cc/owc
@@ -84,7 +84,6 @@ ngx_include_opt="-i="
 ngx_objout="-fo"
 ngx_binout="-fe="
 ngx_objext="obj"
-ngx_binext=".exe"
 
 ngx_regex_dirsep='\\'
 ngx_dirsep="\\"
diff --git a/auto/os/conf b/auto/os/conf
index 6ad0e74..6096af5 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -41,6 +41,14 @@ case "$NGX_PLATFORM" in
 '
     ;;
 
+    NetBSD:*)
+        CORE_INCS="$UNIX_INCS"
+        CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
+        CORE_SRCS="$UNIX_SRCS"
+
+        NGX_RPATH=YES
+    ;;
+
     HP-UX:*)
         # HP/UX
         have=NGX_HPUX . auto/have_headers
diff --git a/auto/os/win32 b/auto/os/win32
index 650cf49..7a82774 100644
--- a/auto/os/win32
+++ b/auto/os/win32
@@ -13,6 +13,7 @@ NGX_ICONS="$NGX_WIN32_ICONS"
 SELECT_SRCS=$WIN32_SELECT_SRCS
 
 ngx_pic_opt=
+ngx_binext=".exe"
 
 case "$NGX_CC_NAME" in
 
diff --git a/auto/unix b/auto/unix
index 7c6a855..10835f6 100644
--- a/auto/unix
+++ b/auto/unix
@@ -428,7 +428,10 @@ ngx_feature_incs="#include <sys/socket.h>
                   #include <netinet/in.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)"
+ngx_feature_test="struct in_pktinfo  pkt;
+                  pkt.ipi_spec_dst.s_addr = INADDR_ANY;
+                  (void) pkt;
+                  setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)"
 . auto/feature
 
 
diff --git a/configure b/configure
index ceff15e..7e6e33a 100755
--- a/configure
+++ b/configure
@@ -36,7 +36,7 @@ if test -z "$NGX_PLATFORM"; then
     NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE";
 
     case "$NGX_SYSTEM" in
-        MINGW32_*)
+        MINGW32_* | MINGW64_* | MSYS_*)
             NGX_PLATFORM=win32
         ;;
     esac
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 8cc2d80..37e257f 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013001
-#define NGINX_VERSION      "1.13.1"
+#define nginx_version      1013002
+#define NGINX_VERSION      "1.13.2"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index aee7a58..675a506 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -1124,9 +1124,7 @@ ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user)
         if (user != (ngx_uid_t) NGX_CONF_UNSET_UINT) {
             ngx_file_info_t  fi;
 
-            if (ngx_file_info((const char *) file[i].name.data, &fi)
-                == NGX_FILE_ERROR)
-            {
+            if (ngx_file_info(file[i].name.data, &fi) == NGX_FILE_ERROR) {
                 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                               ngx_file_info_n " \"%s\" failed",
                               file[i].name.data);
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index b7dd4bc..3a94089 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -622,9 +622,7 @@ ngx_create_paths(ngx_cycle_t *cycle, ngx_uid_t user)
         {
         ngx_file_info_t   fi;
 
-        if (ngx_file_info((const char *) path[i]->name.data, &fi)
-            == NGX_FILE_ERROR)
-        {
+        if (ngx_file_info(path[i]->name.data, &fi) == NGX_FILE_ERROR) {
             ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                           ngx_file_info_n " \"%s\" failed", path[i]->name.data);
             return NGX_ERROR;
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index e140ab6..91f8a5e 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -443,7 +443,7 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx)
 
         name.data = ngx_resolver_alloc(r, name.len);
         if (name.data == NULL) {
-            return NGX_ERROR;
+            goto failed;
         }
 
         if (slen == ctx->service.len) {
@@ -481,6 +481,8 @@ ngx_resolve_name(ngx_resolver_ctx_t *ctx)
         ngx_resolver_free(r, ctx->event);
     }
 
+failed:
+
     ngx_resolver_free(r, ctx);
 
     return NGX_ERROR;
@@ -744,6 +746,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
             last->next = rn->waiting;
             rn->waiting = ctx;
             ctx->state = NGX_AGAIN;
+            ctx->async = 1;
 
             do {
                 ctx->node = rn;
@@ -890,6 +893,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
     rn->waiting = ctx;
 
     ctx->state = NGX_AGAIN;
+    ctx->async = 1;
 
     do {
         ctx->node = rn;
@@ -1021,6 +1025,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
             ctx->next = rn->waiting;
             rn->waiting = ctx;
             ctx->state = NGX_AGAIN;
+            ctx->async = 1;
             ctx->node = rn;
 
             /* unlock addr mutex */
@@ -1117,6 +1122,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
     /* unlock addr mutex */
 
     ctx->state = NGX_AGAIN;
+    ctx->async = 1;
     ctx->node = rn;
 
     return NGX_OK;
@@ -3017,6 +3023,7 @@ ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
     srv = cctx->srvs;
 
     ctx->count--;
+    ctx->async |= cctx->async;
 
     srv->ctx = NULL;
     srv->state = cctx->state;
diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h
index a0d6fc3..6f099b7 100644
--- a/src/core/ngx_resolver.h
+++ b/src/core/ngx_resolver.h
@@ -218,7 +218,8 @@ struct ngx_resolver_ctx_s {
     void                     *data;
     ngx_msec_t                timeout;
 
-    ngx_uint_t                quick;  /* unsigned  quick:1; */
+    unsigned                  quick:1;
+    unsigned                  async:1;
     ngx_uint_t                recursion;
     ngx_event_t              *event;
 };
diff --git a/src/core/ngx_rwlock.c b/src/core/ngx_rwlock.c
index 905de78..ed2b0f8 100644
--- a/src/core/ngx_rwlock.c
+++ b/src/core/ngx_rwlock.c
@@ -94,7 +94,7 @@ ngx_rwlock_unlock(ngx_atomic_t *lock)
     readers = *lock;
 
     if (readers == NGX_RWLOCK_WLOCK) {
-        *lock = 0;
+        (void) ngx_atomic_cmp_set(lock, NGX_RWLOCK_WLOCK, 0);
         return;
     }
 
@@ -109,6 +109,15 @@ ngx_rwlock_unlock(ngx_atomic_t *lock)
 }
 
 
+void
+ngx_rwlock_downgrade(ngx_atomic_t *lock)
+{
+    if (*lock == NGX_RWLOCK_WLOCK) {
+        *lock = 1;
+    }
+}
+
+
 #else
 
 #if (NGX_HTTP_UPSTREAM_ZONE || NGX_STREAM_UPSTREAM_ZONE)
diff --git a/src/core/ngx_rwlock.h b/src/core/ngx_rwlock.h
index 8b16eca..41b42aa 100644
--- a/src/core/ngx_rwlock.h
+++ b/src/core/ngx_rwlock.h
@@ -16,6 +16,7 @@
 void ngx_rwlock_wlock(ngx_atomic_t *lock);
 void ngx_rwlock_rlock(ngx_atomic_t *lock);
 void ngx_rwlock_unlock(ngx_atomic_t *lock);
+void ngx_rwlock_downgrade(ngx_atomic_t *lock);
 
 
 #endif /* _NGX_RWLOCK_H_INCLUDED_ */
diff --git a/src/http/modules/ngx_http_chunked_filter_module.c b/src/http/modules/ngx_http_chunked_filter_module.c
index ac2e3e8..4d6fd3e 100644
--- a/src/http/modules/ngx_http_chunked_filter_module.c
+++ b/src/http/modules/ngx_http_chunked_filter_module.c
@@ -17,6 +17,8 @@ typedef struct {
 
 
 static ngx_int_t ngx_http_chunked_filter_init(ngx_conf_t *cf);
+static ngx_chain_t *ngx_http_chunked_create_trailers(ngx_http_request_t *r,
+    ngx_http_chunked_filter_ctx_t *ctx);
 
 
 static ngx_http_module_t  ngx_http_chunked_filter_module_ctx = {
@@ -69,27 +71,29 @@ ngx_http_chunked_header_filter(ngx_http_request_t *r)
         return ngx_http_next_header_filter(r);
     }
 
-    if (r->headers_out.content_length_n == -1) {
-        if (r->http_version < NGX_HTTP_VERSION_11) {
-            r->keepalive = 0;
+    if (r->headers_out.content_length_n == -1
+        || r->expect_trailers)
+    {
+        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
-        } else {
-            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-            if (clcf->chunked_transfer_encoding) {
-                r->chunked = 1;
-
-                ctx = ngx_pcalloc(r->pool,
-                                  sizeof(ngx_http_chunked_filter_ctx_t));
-                if (ctx == NULL) {
-                    return NGX_ERROR;
-                }
-
-                ngx_http_set_ctx(r, ctx, ngx_http_chunked_filter_module);
-
-            } else {
-                r->keepalive = 0;
+        if (r->http_version >= NGX_HTTP_VERSION_11
+            && clcf->chunked_transfer_encoding)
+        {
+            if (r->expect_trailers) {
+                ngx_http_clear_content_length(r);
             }
+
+            r->chunked = 1;
+
+            ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_chunked_filter_ctx_t));
+            if (ctx == NULL) {
+                return NGX_ERROR;
+            }
+
+            ngx_http_set_ctx(r, ctx, ngx_http_chunked_filter_module);
+
+        } else if (r->headers_out.content_length_n == -1) {
+            r->keepalive = 0;
         }
     }
 
@@ -179,26 +183,17 @@ ngx_http_chunked_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     }
 
     if (cl->buf->last_buf) {
-        tl = ngx_chain_get_free_buf(r->pool, &ctx->free);
+        tl = ngx_http_chunked_create_trailers(r, ctx);
         if (tl == NULL) {
             return NGX_ERROR;
         }
 
-        b = tl->buf;
-
-        b->tag = (ngx_buf_tag_t) &ngx_http_chunked_filter_module;
-        b->temporary = 0;
-        b->memory = 1;
-        b->last_buf = 1;
-        b->pos = (u_char *) CRLF "0" CRLF CRLF;
-        b->last = b->pos + 7;
-
         cl->buf->last_buf = 0;
 
         *ll = tl;
 
         if (size == 0) {
-            b->pos += 2;
+            tl->buf->pos += 2;
         }
 
     } else if (size > 0) {
@@ -230,6 +225,109 @@ ngx_http_chunked_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 }
 
 
+static ngx_chain_t *
+ngx_http_chunked_create_trailers(ngx_http_request_t *r,
+    ngx_http_chunked_filter_ctx_t *ctx)
+{
+    size_t            len;
+    ngx_buf_t        *b;
+    ngx_uint_t        i;
+    ngx_chain_t      *cl;
+    ngx_list_part_t  *part;
+    ngx_table_elt_t  *header;
+
+    len = 0;
+
+    part = &r->headers_out.trailers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        len += header[i].key.len + sizeof(": ") - 1
+               + header[i].value.len + sizeof(CRLF) - 1;
+    }
+
+    cl = ngx_chain_get_free_buf(r->pool, &ctx->free);
+    if (cl == NULL) {
+        return NULL;
+    }
+
+    b = cl->buf;
+
+    b->tag = (ngx_buf_tag_t) &ngx_http_chunked_filter_module;
+    b->temporary = 0;
+    b->memory = 1;
+    b->last_buf = 1;
+
+    if (len == 0) {
+        b->pos = (u_char *) CRLF "0" CRLF CRLF;
+        b->last = b->pos + sizeof(CRLF "0" CRLF CRLF) - 1;
+        return cl;
+    }
+
+    len += sizeof(CRLF "0" CRLF CRLF) - 1;
+
+    b->pos = ngx_palloc(r->pool, len);
+    if (b->pos == NULL) {
+        return NULL;
+    }
+
+    b->last = b->pos;
+
+    *b->last++ = CR; *b->last++ = LF;
+    *b->last++ = '0';
+    *b->last++ = CR; *b->last++ = LF;
+
+    part = &r->headers_out.trailers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http trailer: \"%V: %V\"",
+                       &header[i].key, &header[i].value);
+
+        b->last = ngx_copy(b->last, header[i].key.data, header[i].key.len);
+        *b->last++ = ':'; *b->last++ = ' ';
+
+        b->last = ngx_copy(b->last, header[i].value.data, header[i].value.len);
+        *b->last++ = CR; *b->last++ = LF;
+    }
+
+    *b->last++ = CR; *b->last++ = LF;
+
+    return cl;
+}
+
+
 static ngx_int_t
 ngx_http_chunked_filter_init(ngx_conf_t *cf)
 {
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index 287fd36..73b6d89 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -1084,10 +1084,6 @@ ngx_http_gzip_ratio_variable(ngx_http_request_t *r,
     ngx_uint_t            zint, zfrac;
     ngx_http_gzip_ctx_t  *ctx;
 
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-
     ctx = ngx_http_get_module_ctx(r, ngx_http_gzip_filter_module);
 
     if (ctx == NULL || ctx->zout == 0) {
@@ -1095,6 +1091,10 @@ ngx_http_gzip_ratio_variable(ngx_http_request_t *r,
         return NGX_OK;
     }
 
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
     v->data = ngx_pnalloc(r->pool, NGX_INT32_LEN + 3);
     if (v->data == NULL) {
         return NGX_ERROR;
diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index 94dc51e..e5f1eb5 100644
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -48,6 +48,7 @@ typedef struct {
     time_t                     expires_time;
     ngx_http_complex_value_t  *expires_value;
     ngx_array_t               *headers;
+    ngx_array_t               *trailers;
 } ngx_http_headers_conf_t;
 
 
@@ -98,15 +99,23 @@ static ngx_command_t  ngx_http_headers_filter_commands[] = {
       ngx_http_headers_expires,
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
-      NULL},
+      NULL },
 
     { ngx_string("add_header"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
                         |NGX_CONF_TAKE23,
       ngx_http_headers_add,
       NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL},
+      offsetof(ngx_http_headers_conf_t, headers),
+      NULL },
+
+    { ngx_string("add_trailer"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_TAKE23,
+      ngx_http_headers_add,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_headers_conf_t, trailers),
+      NULL },
 
       ngx_null_command
 };
@@ -144,6 +153,7 @@ ngx_module_t  ngx_http_headers_filter_module = {
 
 
 static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
+static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
 
 
 static ngx_int_t
@@ -154,10 +164,15 @@ ngx_http_headers_filter(ngx_http_request_t *r)
     ngx_http_header_val_t    *h;
     ngx_http_headers_conf_t  *conf;
 
+    if (r != r->main) {
+        return ngx_http_next_header_filter(r);
+    }
+
     conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_filter_module);
 
-    if ((conf->expires == NGX_HTTP_EXPIRES_OFF && conf->headers == NULL)
-        || r != r->main)
+    if (conf->expires == NGX_HTTP_EXPIRES_OFF
+        && conf->headers == NULL
+        && conf->trailers == NULL)
     {
         return ngx_http_next_header_filter(r);
     }
@@ -206,10 +221,100 @@ ngx_http_headers_filter(ngx_http_request_t *r)
         }
     }
 
+    if (conf->trailers) {
+        h = conf->trailers->elts;
+        for (i = 0; i < conf->trailers->nelts; i++) {
+
+            if (!safe_status && !h[i].always) {
+                continue;
+            }
+
+            r->expect_trailers = 1;
+            break;
+        }
+    }
+
     return ngx_http_next_header_filter(r);
 }
 
 
+static ngx_int_t
+ngx_http_trailers_filter(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    ngx_str_t                 value;
+    ngx_uint_t                i, safe_status;
+    ngx_chain_t              *cl;
+    ngx_table_elt_t          *t;
+    ngx_http_header_val_t    *h;
+    ngx_http_headers_conf_t  *conf;
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_filter_module);
+
+    if (in == NULL
+        || conf->trailers == NULL
+        || !r->expect_trailers
+        || r->header_only)
+    {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    for (cl = in; cl; cl = cl->next) {
+        if (cl->buf->last_buf) {
+            break;
+        }
+    }
+
+    if (cl == NULL) {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    switch (r->headers_out.status) {
+
+    case NGX_HTTP_OK:
+    case NGX_HTTP_CREATED:
+    case NGX_HTTP_NO_CONTENT:
+    case NGX_HTTP_PARTIAL_CONTENT:
+    case NGX_HTTP_MOVED_PERMANENTLY:
+    case NGX_HTTP_MOVED_TEMPORARILY:
+    case NGX_HTTP_SEE_OTHER:
+    case NGX_HTTP_NOT_MODIFIED:
+    case NGX_HTTP_TEMPORARY_REDIRECT:
+    case NGX_HTTP_PERMANENT_REDIRECT:
+        safe_status = 1;
+        break;
+
+    default:
+        safe_status = 0;
+        break;
+    }
+
+    h = conf->trailers->elts;
+    for (i = 0; i < conf->trailers->nelts; i++) {
+
+        if (!safe_status && !h[i].always) {
+            continue;
+        }
+
+        if (ngx_http_complex_value(r, &h[i].value, &value) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (value.len) {
+            t = ngx_list_push(&r->headers_out.trailers);
+            if (t == NULL) {
+                return NGX_ERROR;
+            }
+
+            t->key = h[i].key;
+            t->value = value;
+            t->hash = 1;
+        }
+    }
+
+    return ngx_http_next_body_filter(r, in);
+}
+
+
 static ngx_int_t
 ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
 {
@@ -557,6 +662,7 @@ ngx_http_headers_create_conf(ngx_conf_t *cf)
      * set by ngx_pcalloc():
      *
      *     conf->headers = NULL;
+     *     conf->trailers = NULL;
      *     conf->expires_time = 0;
      *     conf->expires_value = NULL;
      */
@@ -587,6 +693,10 @@ ngx_http_headers_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->headers = prev->headers;
     }
 
+    if (conf->trailers == NULL) {
+        conf->trailers = prev->trailers;
+    }
+
     return NGX_CONF_OK;
 }
 
@@ -597,6 +707,9 @@ ngx_http_headers_filter_init(ngx_conf_t *cf)
     ngx_http_next_header_filter = ngx_http_top_header_filter;
     ngx_http_top_header_filter = ngx_http_headers_filter;
 
+    ngx_http_next_body_filter = ngx_http_top_body_filter;
+    ngx_http_top_body_filter = ngx_http_trailers_filter;
+
     return NGX_OK;
 }
 
@@ -674,42 +787,49 @@ ngx_http_headers_add(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_http_headers_conf_t *hcf = conf;
 
-    ngx_str_t                         *value;
-    ngx_uint_t                         i;
-    ngx_http_header_val_t             *hv;
-    ngx_http_set_header_t             *set;
-    ngx_http_compile_complex_value_t   ccv;
+    ngx_str_t                          *value;
+    ngx_uint_t                          i;
+    ngx_array_t                       **headers;
+    ngx_http_header_val_t              *hv;
+    ngx_http_set_header_t              *set;
+    ngx_http_compile_complex_value_t    ccv;
 
     value = cf->args->elts;
 
-    if (hcf->headers == NULL) {
-        hcf->headers = ngx_array_create(cf->pool, 1,
-                                        sizeof(ngx_http_header_val_t));
-        if (hcf->headers == NULL) {
+    headers = (ngx_array_t **) ((char *) hcf + cmd->offset);
+
+    if (*headers == NULL) {
+        *headers = ngx_array_create(cf->pool, 1,
+                                    sizeof(ngx_http_header_val_t));
+        if (*headers == NULL) {
             return NGX_CONF_ERROR;
         }
     }
 
-    hv = ngx_array_push(hcf->headers);
+    hv = ngx_array_push(*headers);
     if (hv == NULL) {
         return NGX_CONF_ERROR;
     }
 
     hv->key = value[1];
-    hv->handler = ngx_http_add_header;
+    hv->handler = NULL;
     hv->offset = 0;
     hv->always = 0;
 
-    set = ngx_http_set_headers;
-    for (i = 0; set[i].name.len; i++) {
-        if (ngx_strcasecmp(value[1].data, set[i].name.data) != 0) {
-            continue;
+    if (headers == &hcf->headers) {
+        hv->handler = ngx_http_add_header;
+
+        set = ngx_http_set_headers;
+        for (i = 0; set[i].name.len; i++) {
+            if (ngx_strcasecmp(value[1].data, set[i].name.data) != 0) {
+                continue;
+            }
+
+            hv->offset = set[i].offset;
+            hv->handler = set[i].handler;
+
+            break;
         }
-
-        hv->offset = set[i].offset;
-        hv->handler = set[i].handler;
-
-        break;
     }
 
     if (value[2].len == 0) {
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index 8ffca82..7ad9db9 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -382,6 +382,9 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
             if (ranges-- == 0) {
                 return NGX_DECLINED;
             }
+
+        } else if (start == 0) {
+            return NGX_DECLINED;
         }
 
         if (*p++ != ',') {
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index 6fb1fbe..b92ad4c 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -2388,7 +2388,7 @@ ngx_http_ssi_config(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
         ctx->timefmt.len = value->len;
         ctx->timefmt.data = ngx_pnalloc(r->pool, value->len + 1);
         if (ctx->timefmt.data == NULL) {
-            return NGX_HTTP_SSI_ERROR;
+            return NGX_ERROR;
         }
 
         ngx_cpystrn(ctx->timefmt.data, value->data, value->len + 1);
diff --git a/src/http/modules/ngx_http_userid_filter_module.c b/src/http/modules/ngx_http_userid_filter_module.c
index 0dbacba..a1a5493 100644
--- a/src/http/modules/ngx_http_userid_filter_module.c
+++ b/src/http/modules/ngx_http_userid_filter_module.c
@@ -472,6 +472,10 @@ ngx_http_userid_create_uid(ngx_http_request_t *r, ngx_http_userid_ctx_t *ctx,
 
         vv = ngx_http_get_indexed_variable(r, ngx_http_userid_reset_index);
 
+        if (vv == NULL || vv->not_found) {
+            return NGX_ERROR;
+        }
+
         if (vv->len == 0 || (vv->len == 1 && vv->data[0] == '0')) {
 
             if (conf->mark == '\0'
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 7e40e78..02059ef 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1353,6 +1353,7 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
             r->uri.len = alias + path.len;
             r->uri.data = ngx_pnalloc(r->pool, r->uri.len);
             if (r->uri.data == NULL) {
+                r->uri.len = 0;
                 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
                 return NGX_OK;
             }
@@ -2484,6 +2485,13 @@ ngx_http_subrequest(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
+    if (ngx_list_init(&sr->headers_out.trailers, r->pool, 4,
+                      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;
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index cc3722f..de1b202 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -562,6 +562,14 @@ ngx_http_create_request(ngx_connection_t *c)
         return NULL;
     }
 
+    if (ngx_list_init(&r->headers_out.trailers, r->pool, 4,
+                      sizeof(ngx_table_elt_t))
+        != NGX_OK)
+    {
+        ngx_destroy_pool(r->pool);
+        return NULL;
+    }
+
     r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
     if (r->ctx == NULL) {
         ngx_destroy_pool(r->pool);
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 283c582..f7f3e97 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -252,6 +252,7 @@ typedef struct {
 
 typedef struct {
     ngx_list_t                        headers;
+    ngx_list_t                        trailers;
 
     ngx_uint_t                        status;
     ngx_str_t                         status_line;
@@ -514,6 +515,7 @@ struct ngx_http_request_s {
     unsigned                          pipeline:1;
     unsigned                          chunked:1;
     unsigned                          header_only:1;
+    unsigned                          expect_trailers:1;
     unsigned                          keepalive:1;
     unsigned                          lingering_close:1;
     unsigned                          discard_body:1;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 0fc5ab5..c394b29 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -182,7 +182,9 @@ static char *ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf);
 #if (NGX_HTTP_SSL)
 static void ngx_http_upstream_ssl_init_connection(ngx_http_request_t *,
     ngx_http_upstream_t *u, ngx_connection_t *c);
-static void ngx_http_upstream_ssl_handshake(ngx_connection_t *c);
+static void ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c);
+static void ngx_http_upstream_ssl_handshake(ngx_http_request_t *,
+    ngx_http_upstream_t *u, ngx_connection_t *c);
 static ngx_int_t ngx_http_upstream_ssl_name(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_connection_t *c);
 #endif
@@ -1143,11 +1145,14 @@ ngx_http_upstream_cache_check_range(ngx_http_request_t *r,
 static void
 ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
 {
+    ngx_uint_t                     run_posted;
     ngx_connection_t              *c;
     ngx_http_request_t            *r;
     ngx_http_upstream_t           *u;
     ngx_http_upstream_resolved_t  *ur;
 
+    run_posted = ctx->async;
+
     r = ctx->data;
     c = r->connection;
 
@@ -1211,7 +1216,9 @@ ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
 
 failed:
 
-    ngx_http_run_posted_requests(c);
+    if (run_posted) {
+        ngx_http_run_posted_requests(c);
+    }
 }
 
 
@@ -1662,26 +1669,43 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
             ngx_add_timer(c->write, u->conf->connect_timeout);
         }
 
-        c->ssl->handler = ngx_http_upstream_ssl_handshake;
+        c->ssl->handler = ngx_http_upstream_ssl_handshake_handler;
         return;
     }
 
-    ngx_http_upstream_ssl_handshake(c);
+    ngx_http_upstream_ssl_handshake(r, u, c);
 }
 
 
 static void
-ngx_http_upstream_ssl_handshake(ngx_connection_t *c)
+ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c)
 {
-    long                  rc;
     ngx_http_request_t   *r;
     ngx_http_upstream_t  *u;
 
     r = c->data;
+
     u = r->upstream;
+    c = r->connection;
 
     ngx_http_set_log_request(c->log, r);
 
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http upstream ssl handshake: \"%V?%V\"",
+                   &r->uri, &r->args);
+
+    ngx_http_upstream_ssl_handshake(r, u, u->peer.connection);
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+static void
+ngx_http_upstream_ssl_handshake(ngx_http_request_t *r, ngx_http_upstream_t *u,
+    ngx_connection_t *c)
+{
+    long  rc;
+
     if (c->ssl->handshaked) {
 
         if (u->conf->ssl_verify) {
@@ -1709,28 +1733,19 @@ ngx_http_upstream_ssl_handshake(ngx_connection_t *c)
         c->write->handler = ngx_http_upstream_handler;
         c->read->handler = ngx_http_upstream_handler;
 
-        c = r->connection;
-
         ngx_http_upstream_send_request(r, u, 1);
 
-        ngx_http_run_posted_requests(c);
         return;
     }
 
     if (c->write->timedout) {
-        c = r->connection;
         ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT);
-        ngx_http_run_posted_requests(c);
         return;
     }
 
 failed:
 
-    c = r->connection;
-
     ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
-
-    ngx_http_run_posted_requests(c);
 }
 
 
@@ -2729,7 +2744,7 @@ ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r,
     rev = c->read;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http upstream process body on memory");
+                   "http upstream process body in memory");
 
     if (rev->timedout) {
         ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 6138819..cfb538a 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -38,6 +38,8 @@ static ngx_int_t ngx_http_variable_unknown_header_in(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_unknown_header_out(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_variable_unknown_trailer_out(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_request_line(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_cookie(ngx_http_request_t *r,
@@ -365,6 +367,9 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("sent_http_"), NULL, ngx_http_variable_unknown_header_out,
       0, NGX_HTTP_VAR_PREFIX, 0 },
 
+    { ngx_string("sent_trailer_"), NULL, ngx_http_variable_unknown_trailer_out,
+      0, NGX_HTTP_VAR_PREFIX, 0 },
+
     { ngx_string("cookie_"), NULL, ngx_http_variable_cookie,
       0, NGX_HTTP_VAR_PREFIX, 0 },
 
@@ -934,6 +939,16 @@ ngx_http_variable_unknown_header_out(ngx_http_request_t *r,
 }
 
 
+static ngx_int_t
+ngx_http_variable_unknown_trailer_out(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
+                                            &r->headers_out.trailers.part,
+                                            sizeof("sent_trailer_") - 1);
+}
+
+
 ngx_int_t
 ngx_http_variable_unknown_header(ngx_http_variable_value_t *v, ngx_str_t *var,
     ngx_list_part_t *part, size_t prefix)
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index ed78638..7725616 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -28,6 +28,7 @@
 #define NGX_HTTP_V2_HTTP_1_1_REQUIRED            0xd
 
 /* frame sizes */
+#define NGX_HTTP_V2_SETTINGS_ACK_SIZE            0
 #define NGX_HTTP_V2_RST_STREAM_SIZE              4
 #define NGX_HTTP_V2_PRIORITY_SIZE                5
 #define NGX_HTTP_V2_PING_SIZE                    8
@@ -128,8 +129,7 @@ static ngx_http_v2_node_t *ngx_http_v2_get_closed_node(
 #define ngx_http_v2_index_size(h2scf)  (h2scf->streams_index_mask + 1)
 #define ngx_http_v2_index(h2scf, sid)  ((sid >> 1) & h2scf->streams_index_mask)
 
-static ngx_int_t ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c,
-    ngx_uint_t ack);
+static ngx_int_t ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c);
 static ngx_int_t ngx_http_v2_settings_frame_handler(
     ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
 static ngx_int_t ngx_http_v2_send_window_update(ngx_http_v2_connection_t *h2c,
@@ -269,7 +269,7 @@ ngx_http_v2_init(ngx_event_t *rev)
         return;
     }
 
-    if (ngx_http_v2_send_settings(h2c, 0) == NGX_ERROR) {
+    if (ngx_http_v2_send_settings(h2c) == NGX_ERROR) {
         ngx_http_close_connection(c);
         return;
     }
@@ -1568,6 +1568,10 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
         rc = ngx_http_v2_pseudo_header(r, header);
 
         if (rc == NGX_OK) {
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "http2 pseudo-header: \":%V: %V\"",
+                           &header->name, &header->value);
+
             return ngx_http_v2_state_header_complete(h2c, pos, end);
         }
 
@@ -1609,36 +1613,40 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
                                                 NGX_HTTP_V2_INTERNAL_ERROR);
         }
 
-        return ngx_http_v2_state_header_complete(h2c, pos, end);
-    }
+    } else {
+        h = ngx_list_push(&r->headers_in.headers);
+        if (h == NULL) {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
 
-    h = ngx_list_push(&r->headers_in.headers);
-    if (h == NULL) {
-        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
-    }
+        h->key.len = header->name.len;
+        h->key.data = header->name.data;
 
-    h->key.len = header->name.len;
-    h->key.data = header->name.data;
+        /*
+         * TODO Optimization: precalculate hash
+         * and handler for indexed headers.
+         */
+        h->hash = ngx_hash_key(h->key.data, h->key.len);
 
-    /* TODO Optimization: precalculate hash and handler for indexed headers. */
-    h->hash = ngx_hash_key(h->key.data, h->key.len);
+        h->value.len = header->value.len;
+        h->value.data = header->value.data;
 
-    h->value.len = header->value.len;
-    h->value.data = header->value.data;
+        h->lowcase_key = h->key.data;
 
-    h->lowcase_key = h->key.data;
+        cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
 
-    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+        hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
+                           h->lowcase_key, h->key.len);
 
-    hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
-                       h->lowcase_key, h->key.len);
-
-    if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
-        goto error;
+        if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
+            goto error;
+        }
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http2 http header: \"%V: %V\"", &h->key, &h->value);
+                   "http2 http header: \"%V: %V\"",
+                   &header->name, &header->value);
 
     return ngx_http_v2_state_header_complete(h2c, pos, end);
 
@@ -1951,8 +1959,6 @@ ngx_http_v2_state_settings(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
     }
 
-    ngx_http_v2_send_settings(h2c, 1);
-
     return ngx_http_v2_state_settings_params(h2c, pos, end);
 }
 
@@ -1961,7 +1967,11 @@ static u_char *
 ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    ngx_uint_t  id, value;
+    ssize_t                   window_delta;
+    ngx_uint_t                id, value;
+    ngx_http_v2_out_frame_t  *frame;
+
+    window_delta = 0;
 
     while (h2c->state.length) {
         if (end - pos < NGX_HTTP_V2_SETTINGS_PARAM_SIZE) {
@@ -1987,12 +1997,7 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
                                                   NGX_HTTP_V2_FLOW_CTRL_ERROR);
             }
 
-            if (ngx_http_v2_adjust_windows(h2c, value - h2c->init_window)
-                != NGX_OK)
-            {
-                return ngx_http_v2_connection_error(h2c,
-                                                    NGX_HTTP_V2_INTERNAL_ERROR);
-            }
+            window_delta = value - h2c->init_window;
 
             h2c->init_window = value;
             break;
@@ -2020,6 +2025,22 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
         pos += NGX_HTTP_V2_SETTINGS_PARAM_SIZE;
     }
 
+    frame = ngx_http_v2_get_frame(h2c, NGX_HTTP_V2_SETTINGS_ACK_SIZE,
+                                  NGX_HTTP_V2_SETTINGS_FRAME,
+                                  NGX_HTTP_V2_ACK_FLAG, 0);
+    if (frame == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+    }
+
+    ngx_http_v2_queue_ordered_frame(h2c, frame);
+
+    if (window_delta) {
+        if (ngx_http_v2_adjust_windows(h2c, window_delta) != NGX_OK) {
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_INTERNAL_ERROR);
+        }
+    }
+
     return ngx_http_v2_state_complete(h2c, pos, end);
 }
 
@@ -2463,7 +2484,7 @@ ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c, u_char **pos, u_char *end,
 
 
 static ngx_int_t
-ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack)
+ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c)
 {
     size_t                    len;
     ngx_buf_t                *buf;
@@ -2471,8 +2492,8 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack)
     ngx_http_v2_srv_conf_t   *h2scf;
     ngx_http_v2_out_frame_t  *frame;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 send SETTINGS frame ack:%ui", ack);
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 send SETTINGS frame");
 
     frame = ngx_palloc(h2c->pool, sizeof(ngx_http_v2_out_frame_t));
     if (frame == NULL) {
@@ -2484,7 +2505,7 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack)
         return NGX_ERROR;
     }
 
-    len = ack ? 0 : (sizeof(uint16_t) + sizeof(uint32_t)) * 3;
+    len = NGX_HTTP_V2_SETTINGS_PARAM_SIZE * 3;
 
     buf = ngx_create_temp_buf(h2c->pool, NGX_HTTP_V2_FRAME_HEADER_SIZE + len);
     if (buf == NULL) {
@@ -2508,28 +2529,26 @@ ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c, ngx_uint_t ack)
     buf->last = ngx_http_v2_write_len_and_type(buf->last, len,
                                                NGX_HTTP_V2_SETTINGS_FRAME);
 
-    *buf->last++ = ack ? NGX_HTTP_V2_ACK_FLAG : NGX_HTTP_V2_NO_FLAG;
+    *buf->last++ = NGX_HTTP_V2_NO_FLAG;
 
     buf->last = ngx_http_v2_write_sid(buf->last, 0);
 
-    if (!ack) {
-        h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
-                                             ngx_http_v2_module);
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
 
-        buf->last = ngx_http_v2_write_uint16(buf->last,
-                                             NGX_HTTP_V2_MAX_STREAMS_SETTING);
-        buf->last = ngx_http_v2_write_uint32(buf->last,
-                                             h2scf->concurrent_streams);
+    buf->last = ngx_http_v2_write_uint16(buf->last,
+                                         NGX_HTTP_V2_MAX_STREAMS_SETTING);
+    buf->last = ngx_http_v2_write_uint32(buf->last,
+                                         h2scf->concurrent_streams);
 
-        buf->last = ngx_http_v2_write_uint16(buf->last,
+    buf->last = ngx_http_v2_write_uint16(buf->last,
                                          NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING);
-        buf->last = ngx_http_v2_write_uint32(buf->last, h2scf->preread_size);
+    buf->last = ngx_http_v2_write_uint32(buf->last, h2scf->preread_size);
 
-        buf->last = ngx_http_v2_write_uint16(buf->last,
-                                           NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING);
-        buf->last = ngx_http_v2_write_uint32(buf->last,
-                                             NGX_HTTP_V2_MAX_FRAME_SIZE);
-    }
+    buf->last = ngx_http_v2_write_uint16(buf->last,
+                                         NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING);
+    buf->last = ngx_http_v2_write_uint32(buf->last,
+                                         NGX_HTTP_V2_MAX_FRAME_SIZE);
 
     ngx_http_v2_queue_blocked_frame(h2c, frame);
 
@@ -3313,6 +3332,7 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r)
     static const u_char ending[] = " HTTP/2.0";
 
     if (r->method_name.len == 0
+        || r->schema_start == NULL
         || r->unparsed_uri.len == 0)
     {
         ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index be34a09..4804658 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -261,6 +261,15 @@ ngx_http_v2_queue_blocked_frame(ngx_http_v2_connection_t *h2c,
 }
 
 
+static ngx_inline void
+ngx_http_v2_queue_ordered_frame(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_out_frame_t *frame)
+{
+    frame->next = h2c->last_out;
+    h2c->last_out = frame;
+}
+
+
 void ngx_http_v2_init(ngx_event_t *rev);
 void ngx_http_v2_request_headers_init(void);
 
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 7276531..8621e7a 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -50,13 +50,17 @@
 #define NGX_HTTP_V2_SERVER_INDEX          54
 #define NGX_HTTP_V2_VARY_INDEX            59
 
+#define NGX_HTTP_V2_NO_TRAILERS           (ngx_http_v2_out_frame_t *) -1
+
 
 static u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len,
     u_char *tmp, ngx_uint_t lower);
 static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix,
     ngx_uint_t value);
 static ngx_http_v2_out_frame_t *ngx_http_v2_create_headers_frame(
-    ngx_http_request_t *r, u_char *pos, u_char *end);
+    ngx_http_request_t *r, u_char *pos, u_char *end, ngx_uint_t fin);
+static ngx_http_v2_out_frame_t *ngx_http_v2_create_trailers_frame(
+    ngx_http_request_t *r);
 
 static ngx_chain_t *ngx_http_v2_send_chain(ngx_connection_t *fc,
     ngx_chain_t *in, off_t limit);
@@ -612,7 +616,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
                                       header[i].value.len, tmp);
     }
 
-    frame = ngx_http_v2_create_headers_frame(r, start, pos);
+    frame = ngx_http_v2_create_headers_frame(r, start, pos, r->header_only);
     if (frame == NULL) {
         return NGX_ERROR;
     }
@@ -636,6 +640,118 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 }
 
 
+static ngx_http_v2_out_frame_t *
+ngx_http_v2_create_trailers_frame(ngx_http_request_t *r)
+{
+    u_char           *pos, *start, *tmp;
+    size_t            len, tmp_len;
+    ngx_uint_t        i;
+    ngx_list_part_t  *part;
+    ngx_table_elt_t  *header;
+
+    len = 0;
+    tmp_len = 0;
+
+    part = &r->headers_out.trailers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        if (header[i].key.len > NGX_HTTP_V2_MAX_FIELD) {
+            ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
+                          "too long response trailer name: \"%V\"",
+                          &header[i].key);
+            return NULL;
+        }
+
+        if (header[i].value.len > NGX_HTTP_V2_MAX_FIELD) {
+            ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
+                          "too long response trailer value: \"%V: %V\"",
+                          &header[i].key, &header[i].value);
+            return NULL;
+        }
+
+        len += 1 + NGX_HTTP_V2_INT_OCTETS + header[i].key.len
+                 + NGX_HTTP_V2_INT_OCTETS + header[i].value.len;
+
+        if (header[i].key.len > tmp_len) {
+            tmp_len = header[i].key.len;
+        }
+
+        if (header[i].value.len > tmp_len) {
+            tmp_len = header[i].value.len;
+        }
+    }
+
+    if (len == 0) {
+        return NGX_HTTP_V2_NO_TRAILERS;
+    }
+
+    tmp = ngx_palloc(r->pool, tmp_len);
+    pos = ngx_pnalloc(r->pool, len);
+
+    if (pos == NULL || tmp == NULL) {
+        return NULL;
+    }
+
+    start = pos;
+
+    part = &r->headers_out.trailers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+#if (NGX_DEBUG)
+        if (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP) {
+            ngx_strlow(tmp, header[i].key.data, header[i].key.len);
+
+            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "http2 output trailer: \"%*s: %V\"",
+                           header[i].key.len, tmp, &header[i].value);
+        }
+#endif
+
+        *pos++ = 0;
+
+        pos = ngx_http_v2_write_name(pos, header[i].key.data,
+                                     header[i].key.len, tmp);
+
+        pos = ngx_http_v2_write_value(pos, header[i].value.data,
+                                      header[i].value.len, tmp);
+    }
+
+    return ngx_http_v2_create_headers_frame(r, start, pos, 1);
+}
+
+
 static u_char *
 ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len, u_char *tmp,
     ngx_uint_t lower)
@@ -686,7 +802,7 @@ ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value)
 
 static ngx_http_v2_out_frame_t *
 ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
-    u_char *end)
+    u_char *end, ngx_uint_t fin)
 {
     u_char                    type, flags;
     size_t                    rest, frame_size;
@@ -707,12 +823,12 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
     frame->stream = stream;
     frame->length = rest;
     frame->blocked = 1;
-    frame->fin = r->header_only;
+    frame->fin = fin;
 
     ll = &frame->first;
 
     type = NGX_HTTP_V2_HEADERS_FRAME;
-    flags = r->header_only ? NGX_HTTP_V2_END_STREAM_FLAG : NGX_HTTP_V2_NO_FLAG;
+    flags = fin ? NGX_HTTP_V2_END_STREAM_FLAG : NGX_HTTP_V2_NO_FLAG;
     frame_size = stream->connection->frame_size;
 
     for ( ;; ) {
@@ -776,7 +892,7 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
             continue;
         }
 
-        b->last_buf = r->header_only;
+        b->last_buf = fin;
         cl->next = NULL;
         frame->last = cl;
 
@@ -798,7 +914,7 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
     ngx_http_request_t        *r;
     ngx_http_v2_stream_t      *stream;
     ngx_http_v2_loc_conf_t    *h2lcf;
-    ngx_http_v2_out_frame_t   *frame;
+    ngx_http_v2_out_frame_t   *frame, *trailers;
     ngx_http_v2_connection_t  *h2c;
 
     r = fc->data;
@@ -872,6 +988,8 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
     frame_size = (h2lcf->chunk_size < h2c->frame_size)
                  ? h2lcf->chunk_size : h2c->frame_size;
 
+    trailers = NGX_HTTP_V2_NO_TRAILERS;
+
 #if (NGX_SUPPRESS_WARN)
     cl = NULL;
 #endif
@@ -934,19 +1052,39 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
             size -= rest;
         }
 
-        frame = ngx_http_v2_filter_get_data_frame(stream, frame_size, out, cl);
-        if (frame == NULL) {
-            return NGX_CHAIN_ERROR;
+        if (cl->buf->last_buf) {
+            trailers = ngx_http_v2_create_trailers_frame(r);
+            if (trailers == NULL) {
+                return NGX_CHAIN_ERROR;
+            }
+
+            if (trailers != NGX_HTTP_V2_NO_TRAILERS) {
+                cl->buf->last_buf = 0;
+            }
         }
 
-        ngx_http_v2_queue_frame(h2c, frame);
+        if (frame_size || cl->buf->last_buf) {
+            frame = ngx_http_v2_filter_get_data_frame(stream, frame_size,
+                                                      out, cl);
+            if (frame == NULL) {
+                return NGX_CHAIN_ERROR;
+            }
 
-        h2c->send_window -= frame_size;
+            ngx_http_v2_queue_frame(h2c, frame);
 
-        stream->send_window -= frame_size;
-        stream->queued++;
+            h2c->send_window -= frame_size;
+
+            stream->send_window -= frame_size;
+            stream->queued++;
+        }
 
         if (in == NULL) {
+
+            if (trailers != NGX_HTTP_V2_NO_TRAILERS) {
+                ngx_http_v2_queue_frame(h2c, trailers);
+                stream->queued++;
+            }
+
             break;
         }
 
diff --git a/src/os/unix/ngx_udp_sendmsg_chain.c b/src/os/unix/ngx_udp_sendmsg_chain.c
index 5f1cfa5..5399c79 100644
--- a/src/os/unix/ngx_udp_sendmsg_chain.c
+++ b/src/os/unix/ngx_udp_sendmsg_chain.c
@@ -206,13 +206,13 @@ ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec)
 #if (NGX_HAVE_MSGHDR_MSG_CONTROL)
 
 #if (NGX_HAVE_IP_SENDSRCADDR)
-    u_char             msg_control[CMSG_SPACE(sizeof(struct in_addr))];
+    u_char         msg_control[CMSG_SPACE(sizeof(struct in_addr))];
 #elif (NGX_HAVE_IP_PKTINFO)
-    u_char             msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))];
+    u_char         msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))];
 #endif
 
 #if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
-    u_char             msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+    u_char         msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
 #endif
 
 #endif

From 57a32c6bb8dd5f197e9746c68aa9f059cbd86b59 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 28 Jun 2017 11:16:10 +0300
Subject: [PATCH 192/600] Merge ca translations

Thanks: Alytidae
Closes: #865996
---
 debian/po/ca.po | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 debian/po/ca.po

diff --git a/debian/po/ca.po b/debian/po/ca.po
new file mode 100644
index 0000000..d9ce72d
--- /dev/null
+++ b/debian/po/ca.po
@@ -0,0 +1,56 @@
+# Nginx debconf translations
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
+# Alytidae <alytidae@riseup.net>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2017-06-19 20:26+0100\n"
+"Last-Translator: Alytidae <alytidae@riseup.net>\n"
+"Language-Team: catalan <dl10n-catalan@lists.debian.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "És possible que els fitxers de registre nginx siguin insegurs"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"Els següents fitxers de registre, sota el directori /var/log/nginx, són "
+"enllaços simbòlics propietat de www-data:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Des de la versió 1.4.4-4 de nginx, /var/log/nginx ha estat propietat de "
+"www-data. A causa d'això, www-data podria tenir enllaços simbòlics d'arxius "
+"de registre a ubicacions sensibles que, al seu torn, podrien donar lloc a "
+"atacs d'escalada de privilegis. Encara que els permisos de /var/log/nginx "
+"estan arreglats és possible que encara existeixin alguns enllaços simbòlics "
+"insegurs. Per tant, assegura't de comprovar les ubicacions esmentades."

From accf9ea73380a63d9be1dd70b6e51c33a1814aea Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 28 Jun 2017 11:18:04 +0300
Subject: [PATCH 193/600] Merge es translations

Thanks: Jonathan Bustillos
Closes: #855610
---
 debian/po/es.po | 78 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 debian/po/es.po

diff --git a/debian/po/es.po b/debian/po/es.po
new file mode 100644
index 0000000..552ab2f
--- /dev/null
+++ b/debian/po/es.po
@@ -0,0 +1,78 @@
+# Nginx debconf translations
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
+# Changes:
+# - Initial translation
+# Jonathan Bustillos <jathanblackred@openmailbox.com>, 2017.
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas y normas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2017-02-07 11:07-0600\n"
+"Last-Translator: Jonathan Bustillos <jathanblackred@openmailbox.com>\n"
+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Posibles archivos de registro inseguros de nginx"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"Los siguientes archivos de registro en el directorio /var/log/nginx son "
+"enlaces simbólicos propiedad de www-data:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Dado nginx 1.4.4-4 /var/log/nginx era propiedad de www-data. Como resultado, "
+"www-data podría enlazar archivos de registro a ubicaciones sensibles, lo que "
+"a su vez podría dar lugar a ataques de escalamiento de privilegios. Aunque "
+"los permisos de /var/log/nginx están ahora arreglados, es posible que dichos "
+"enlaces inseguros ya existan. Por lo tanto, asegúrese de comprobar las "
+"ubicaciones anteriores."

From 499c94281624967b714aed606c58ee5bd96751e2 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 28 Jun 2017 11:21:53 +0300
Subject: [PATCH 194/600] Merge pt translations

Thanks: Rui Branco
Closes: #858741
---
 debian/po/pt.po | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 debian/po/pt.po

diff --git a/debian/po/pt.po b/debian/po/pt.po
new file mode 100644
index 0000000..c552ab3
--- /dev/null
+++ b/debian/po/pt.po
@@ -0,0 +1,59 @@
+# Nginx debconf translations
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
+# Rui Branco <ruipb@debianpt.org>, initial translation 2017, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx 1.10.3-1\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2017-03-14 13:59+0000\n"
+"Last-Translator: Rui Branco <ruipb@debianpt.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Ficheiros de eventos (log) do nginx possivelmente inseguros"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"Os seguintes ficheiros de eventos da pasta /var/log/nginx são ligações "
+"simbólicas (symlinks) detidos por www-data:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Desde a versão 1.4.4-4 do nginx, o ficheiro /var/log/nginx é detido pelo www-"
+"data. Como resultado o www-data pode criar ligações simbólicas de ficheiros "
+"de eventos para locais sensíveis, o que poderá levar a uma escalada de "
+"ataques de privilégios. Apesar das permissões de /var/log/nginx estarem "
+"agora seguras, é possível que tais ligações inseguras já existam. Verifique "
+"por favor os locais acima mencionados."

From 22fe275a6565ccc88960b47a2dbe511989901d6b Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 28 Jun 2017 19:00:33 +0300
Subject: [PATCH 195/600] Bump Standards to to 4.0.0

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 03b05ce..b260ccb 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: autotools-dev,
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 3.9.8.0
+Standards-Version: 4.0.0
 Homepage: http://nginx.net
 Vcs-Git: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git

From 1dc67ccb2acbb534a1105db677fc92e9a49a41fc Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Sat, 24 Jun 2017 21:57:31 +0200
Subject: [PATCH 196/600] Introduce libnginx-mod-rtmp third party module

We choose not to include rtmp in nginx-extras for now.

Minor changes by Chistos Trochalakis

Closes: #843777
---
 debian/control                                |   14 +
 debian/copyright                              |    4 +
 debian/libnginx-mod-rtmp.docs                 |    1 +
 debian/libnginx-mod-rtmp.examples             |    1 +
 debian/libnginx-mod-rtmp.nginx                |   13 +
 debian/libnginx-mod.conf/mod-rtmp.conf        |    1 +
 debian/modules/README.Modules-versions        |    5 +
 debian/modules/nginx-rtmp/AUTHORS             |    8 +
 debian/modules/nginx-rtmp/LICENSE             |   22 +
 debian/modules/nginx-rtmp/README.md           |  332 +++
 debian/modules/nginx-rtmp/config              |  133 +
 .../nginx-rtmp/dash/ngx_rtmp_dash_module.c    | 1536 ++++++++++
 debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.c | 1167 ++++++++
 debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.h |   52 +
 debian/modules/nginx-rtmp/doc/README.md       |    2 +
 .../nginx-rtmp/hls/ngx_rtmp_hls_module.c      | 2458 ++++++++++++++++
 .../modules/nginx-rtmp/hls/ngx_rtmp_mpegts.c  |  399 +++
 .../modules/nginx-rtmp/hls/ngx_rtmp_mpegts.h  |   46 +
 debian/modules/nginx-rtmp/ngx_rtmp.c          |  861 ++++++
 debian/modules/nginx-rtmp/ngx_rtmp.h          |  622 ++++
 .../nginx-rtmp/ngx_rtmp_access_module.c       |  471 +++
 debian/modules/nginx-rtmp/ngx_rtmp_amf.c      |  645 ++++
 debian/modules/nginx-rtmp/ngx_rtmp_amf.h      |   71 +
 .../nginx-rtmp/ngx_rtmp_auto_push_module.c    |  578 ++++
 .../modules/nginx-rtmp/ngx_rtmp_bandwidth.c   |   26 +
 .../modules/nginx-rtmp/ngx_rtmp_bandwidth.h   |   31 +
 debian/modules/nginx-rtmp/ngx_rtmp_bitop.c    |   63 +
 debian/modules/nginx-rtmp/ngx_rtmp_bitop.h    |   46 +
 .../modules/nginx-rtmp/ngx_rtmp_cmd_module.c  |  856 ++++++
 .../modules/nginx-rtmp/ngx_rtmp_cmd_module.h  |  151 +
 .../nginx-rtmp/ngx_rtmp_codec_module.c        |  956 ++++++
 .../nginx-rtmp/ngx_rtmp_codec_module.h        |   87 +
 .../nginx-rtmp/ngx_rtmp_control_module.c      |  732 +++++
 .../modules/nginx-rtmp/ngx_rtmp_core_module.c |  755 +++++
 debian/modules/nginx-rtmp/ngx_rtmp_eval.c     |  282 ++
 debian/modules/nginx-rtmp/ngx_rtmp_eval.h     |   44 +
 .../modules/nginx-rtmp/ngx_rtmp_exec_module.c | 1604 ++++++++++
 .../modules/nginx-rtmp/ngx_rtmp_flv_module.c  |  675 +++++
 debian/modules/nginx-rtmp/ngx_rtmp_handler.c  |  895 ++++++
 .../modules/nginx-rtmp/ngx_rtmp_handshake.c   |  631 ++++
 debian/modules/nginx-rtmp/ngx_rtmp_init.c     |  329 +++
 .../nginx-rtmp/ngx_rtmp_limit_module.c        |  205 ++
 .../modules/nginx-rtmp/ngx_rtmp_live_module.c | 1153 ++++++++
 .../modules/nginx-rtmp/ngx_rtmp_live_module.h |   83 +
 .../modules/nginx-rtmp/ngx_rtmp_log_module.c  | 1016 +++++++
 .../modules/nginx-rtmp/ngx_rtmp_mp4_module.c  | 2591 +++++++++++++++++
 .../nginx-rtmp/ngx_rtmp_netcall_module.c      |  725 +++++
 .../nginx-rtmp/ngx_rtmp_netcall_module.h      |   67 +
 .../nginx-rtmp/ngx_rtmp_notify_module.c       | 1728 +++++++++++
 .../modules/nginx-rtmp/ngx_rtmp_play_module.c | 1278 ++++++++
 .../modules/nginx-rtmp/ngx_rtmp_play_module.h |   93 +
 .../nginx-rtmp/ngx_rtmp_proxy_protocol.c      |  197 ++
 .../nginx-rtmp/ngx_rtmp_proxy_protocol.h      |   19 +
 debian/modules/nginx-rtmp/ngx_rtmp_receive.c  |  464 +++
 .../nginx-rtmp/ngx_rtmp_record_module.c       | 1307 +++++++++
 .../nginx-rtmp/ngx_rtmp_record_module.h       |   96 +
 .../nginx-rtmp/ngx_rtmp_relay_module.c        | 1690 +++++++++++
 .../nginx-rtmp/ngx_rtmp_relay_module.h        |   72 +
 debian/modules/nginx-rtmp/ngx_rtmp_send.c     |  635 ++++
 debian/modules/nginx-rtmp/ngx_rtmp_shared.c   |  126 +
 .../modules/nginx-rtmp/ngx_rtmp_stat_module.c |  863 ++++++
 debian/modules/nginx-rtmp/ngx_rtmp_streams.h  |   19 +
 debian/modules/nginx-rtmp/ngx_rtmp_version.h  |   15 +
 debian/modules/nginx-rtmp/stat.xsl            |  355 +++
 debian/rules                                  |    2 +
 debian/tests/control                          |    3 +
 66 files changed, 32407 insertions(+)
 create mode 100644 debian/libnginx-mod-rtmp.docs
 create mode 100644 debian/libnginx-mod-rtmp.examples
 create mode 100755 debian/libnginx-mod-rtmp.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-rtmp.conf
 create mode 100644 debian/modules/nginx-rtmp/AUTHORS
 create mode 100644 debian/modules/nginx-rtmp/LICENSE
 create mode 100644 debian/modules/nginx-rtmp/README.md
 create mode 100644 debian/modules/nginx-rtmp/config
 create mode 100644 debian/modules/nginx-rtmp/dash/ngx_rtmp_dash_module.c
 create mode 100644 debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.c
 create mode 100644 debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.h
 create mode 100644 debian/modules/nginx-rtmp/doc/README.md
 create mode 100644 debian/modules/nginx-rtmp/hls/ngx_rtmp_hls_module.c
 create mode 100644 debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.c
 create mode 100644 debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_access_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_amf.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_amf.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_auto_push_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_bitop.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_bitop.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_codec_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_codec_module.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_control_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_core_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_eval.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_eval.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_exec_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_flv_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_handler.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_handshake.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_init.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_limit_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_live_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_live_module.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_log_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_mp4_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_notify_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_play_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_play_module.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_receive.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_record_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_record_module.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_relay_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_relay_module.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_send.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_shared.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_stat_module.c
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_streams.h
 create mode 100644 debian/modules/nginx-rtmp/ngx_rtmp_version.h
 create mode 100644 debian/modules/nginx-rtmp/stat.xsl

diff --git a/debian/control b/debian/control
index b260ccb..ccb769d 100644
--- a/debian/control
+++ b/debian/control
@@ -383,3 +383,17 @@ Description: WebDAV missing commands support for Nginx
  WebDAV support.
  .
  WebDAV Ext provides the missing PROPFIND & OPTIONS methods.
+
+Package: libnginx-mod-rtmp
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: RTMP support for Nginx
+ The nginx RTMP module is a fully-featured streaming solution implemented in
+ nginx.
+ .
+ It provides the following features:
+  - Live streaming with RTMP, HLS and MPEG-DASH;
+  - RTMP Video on Demand from local or HTTP sources;
+  - Stream relay support via a push or pull model;
+  - Integrated stream recording;
+  - and more.
diff --git a/debian/copyright b/debian/copyright
index 40218cb..78ea210 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -107,6 +107,10 @@ Files: debian/modules/ngx_http_substitutions_filter_module/*
 Copyright: Copyright (C) 2014 by Weibin Yao <yaoweibin@gmail.com>
 License: BSD-2-clause
 
+Files: debian/modules/nginx-rtmp/*
+Copyright: Copyright (C) 2012-2014, Roman Arutyunyan
+License: BSD-2-clause
+
 License: BSD-2-clause
  All rights reserved.
  .
diff --git a/debian/libnginx-mod-rtmp.docs b/debian/libnginx-mod-rtmp.docs
new file mode 100644
index 0000000..8bb7d17
--- /dev/null
+++ b/debian/libnginx-mod-rtmp.docs
@@ -0,0 +1 @@
+debian/modules/nginx-rtmp/README.md
diff --git a/debian/libnginx-mod-rtmp.examples b/debian/libnginx-mod-rtmp.examples
new file mode 100644
index 0000000..6748d60
--- /dev/null
+++ b/debian/libnginx-mod-rtmp.examples
@@ -0,0 +1 @@
+debian/modules/nginx-rtmp/stat.xsl
diff --git a/debian/libnginx-mod-rtmp.nginx b/debian/libnginx-mod-rtmp.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-rtmp.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-rtmp.conf b/debian/libnginx-mod.conf/mod-rtmp.conf
new file mode 100644
index 0000000..4e87e6e
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-rtmp.conf
@@ -0,0 +1 @@
+load_module modules/ngx_rtmp_module.so;
diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 8ad843e..8ed4610 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -61,3 +61,8 @@ README for Modules versions
   Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
   Version: v0.6.4
   Patch: dynamic-module.patch
+
+ nginx-rtmp
+  Homepage: https://github.com/arut/nginx-rtmp-module
+    rm -r debian/modules/nginx-rtmp-module/test
+  Version: v1.1.11
diff --git a/debian/modules/nginx-rtmp/AUTHORS b/debian/modules/nginx-rtmp/AUTHORS
new file mode 100644
index 0000000..e169dff
--- /dev/null
+++ b/debian/modules/nginx-rtmp/AUTHORS
@@ -0,0 +1,8 @@
+Project author:
+
+  Roman Arutyunyan
+    Moscow, Russia
+
+  Contacts:
+    arut@qip.ru
+    arutyunyan.roman@gmail.com
diff --git a/debian/modules/nginx-rtmp/LICENSE b/debian/modules/nginx-rtmp/LICENSE
new file mode 100644
index 0000000..15cb1e0
--- /dev/null
+++ b/debian/modules/nginx-rtmp/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2012-2014, Roman Arutyunyan
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/nginx-rtmp/README.md b/debian/modules/nginx-rtmp/README.md
new file mode 100644
index 0000000..b4c9a69
--- /dev/null
+++ b/debian/modules/nginx-rtmp/README.md
@@ -0,0 +1,332 @@
+# NGINX-based Media Streaming Server
+## nginx-rtmp-module
+
+
+### Project blog
+
+  http://nginx-rtmp.blogspot.com
+
+### Wiki manual
+
+  https://github.com/arut/nginx-rtmp-module/wiki/Directives
+
+### Google group
+
+  https://groups.google.com/group/nginx-rtmp
+
+  https://groups.google.com/group/nginx-rtmp-ru (Russian)
+
+### Donation page (Paypal etc)
+
+  http://arut.github.com/nginx-rtmp-module/
+
+### Features
+
+* RTMP/HLS/MPEG-DASH live streaming
+
+* RTMP Video on demand FLV/MP4,
+  playing from local filesystem or HTTP
+
+* Stream relay support for distributed
+  streaming: push & pull models
+
+* Recording streams in multiple FLVs
+
+* H264/AAC support
+
+* Online transcoding with FFmpeg
+
+* HTTP callbacks (publish/play/record/update etc)
+
+* Running external programs on certain events (exec)
+
+* HTTP control module for recording audio/video and dropping clients
+
+* Advanced buffering techniques
+  to keep memory allocations at a minimum
+  level for faster streaming and low
+  memory footprint
+
+* Proved to work with Wirecast, FMS, Wowza,
+  JWPlayer, FlowPlayer, StrobeMediaPlayback,
+  ffmpeg, avconv, rtmpdump, flvstreamer
+  and many more
+
+* Statistics in XML/XSL in machine- & human-
+  readable form
+
+* Linux/FreeBSD/MacOS/Windows
+
+### Build
+
+cd to NGINX source directory & run this:
+
+    ./configure --add-module=/path/to/nginx-rtmp-module
+    make
+    make install
+
+Several versions of nginx (1.3.14 - 1.5.0) require http_ssl_module to be
+added as well:
+
+    ./configure --add-module=/path/to/nginx-rtmp-module --with-http_ssl_module
+
+For building debug version of nginx add `--with-debug`
+
+    ./configure --add-module=/path/to-nginx/rtmp-module --with-debug
+
+[Read more about debug log](https://github.com/arut/nginx-rtmp-module/wiki/Debug-log)
+
+### Windows limitations
+
+Windows support is limited. These features are not supported
+
+* execs
+* static pulls
+* auto_push
+
+### RTMP URL format
+
+    rtmp://rtmp.example.com/app[/name]
+
+app -  should match one of application {}
+         blocks in config
+
+name - interpreted by each application
+         can be empty
+
+
+### Multi-worker live streaming
+
+Module supports multi-worker live
+streaming through automatic stream pushing
+to nginx workers. This option is toggled with
+rtmp_auto_push directive.
+
+
+### Example nginx.conf
+
+    rtmp {
+
+        server {
+
+            listen 1935;
+
+            chunk_size 4000;
+
+            # TV mode: one publisher, many subscribers
+            application mytv {
+
+                # enable live streaming
+                live on;
+
+                # record first 1K of stream
+                record all;
+                record_path /tmp/av;
+                record_max_size 1K;
+
+                # append current timestamp to each flv
+                record_unique on;
+
+                # publish only from localhost
+                allow publish 127.0.0.1;
+                deny publish all;
+
+                #allow play all;
+            }
+
+            # Transcoding (ffmpeg needed)
+            application big {
+                live on;
+
+                # On every pusblished stream run this command (ffmpeg)
+                # with substitutions: $app/${app}, $name/${name} for application & stream name.
+                #
+                # This ffmpeg call receives stream from this application &
+                # reduces the resolution down to 32x32. The stream is the published to
+                # 'small' application (see below) under the same name.
+                #
+                # ffmpeg can do anything with the stream like video/audio
+                # transcoding, resizing, altering container/codec params etc
+                #
+                # Multiple exec lines can be specified.
+
+                exec ffmpeg -re -i rtmp://localhost:1935/$app/$name -vcodec flv -acodec copy -s 32x32
+                            -f flv rtmp://localhost:1935/small/${name};
+            }
+
+            application small {
+                live on;
+                # Video with reduced resolution comes here from ffmpeg
+            }
+
+            application webcam {
+                live on;
+
+                # Stream from local webcam
+                exec_static ffmpeg -f video4linux2 -i /dev/video0 -c:v libx264 -an
+                                   -f flv rtmp://localhost:1935/webcam/mystream;
+            }
+
+            application mypush {
+                live on;
+
+                # Every stream published here
+                # is automatically pushed to
+                # these two machines
+                push rtmp1.example.com;
+                push rtmp2.example.com:1934;
+            }
+
+            application mypull {
+                live on;
+
+                # Pull all streams from remote machine
+                # and play locally
+                pull rtmp://rtmp3.example.com pageUrl=www.example.com/index.html;
+            }
+
+            application mystaticpull {
+                live on;
+
+                # Static pull is started at nginx start
+                pull rtmp://rtmp4.example.com pageUrl=www.example.com/index.html name=mystream static;
+            }
+
+            # video on demand
+            application vod {
+                play /var/flvs;
+            }
+
+            application vod2 {
+                play /var/mp4s;
+            }
+
+            # Many publishers, many subscribers
+            # no checks, no recording
+            application videochat {
+
+                live on;
+
+                # The following notifications receive all
+                # the session variables as well as
+                # particular call arguments in HTTP POST
+                # request
+
+                # Make HTTP request & use HTTP retcode
+                # to decide whether to allow publishing
+                # from this connection or not
+                on_publish http://localhost:8080/publish;
+
+                # Same with playing
+                on_play http://localhost:8080/play;
+
+                # Publish/play end (repeats on disconnect)
+                on_done http://localhost:8080/done;
+
+                # All above mentioned notifications receive
+                # standard connect() arguments as well as
+                # play/publish ones. If any arguments are sent
+                # with GET-style syntax to play & publish
+                # these are also included.
+                # Example URL:
+                #   rtmp://localhost/myapp/mystream?a=b&c=d
+
+                # record 10 video keyframes (no audio) every 2 minutes
+                record keyframes;
+                record_path /tmp/vc;
+                record_max_frames 10;
+                record_interval 2m;
+
+                # Async notify about an flv recorded
+                on_record_done http://localhost:8080/record_done;
+
+            }
+
+
+            # HLS
+
+            # For HLS to work please create a directory in tmpfs (/tmp/hls here)
+            # for the fragments. The directory contents is served via HTTP (see
+            # http{} section in config)
+            #
+            # Incoming stream must be in H264/AAC. For iPhones use baseline H264
+            # profile (see ffmpeg example).
+            # This example creates RTMP stream from movie ready for HLS:
+            #
+            # ffmpeg -loglevel verbose -re -i movie.avi  -vcodec libx264
+            #    -vprofile baseline -acodec libmp3lame -ar 44100 -ac 1
+            #    -f flv rtmp://localhost:1935/hls/movie
+            #
+            # If you need to transcode live stream use 'exec' feature.
+            #
+            application hls {
+                live on;
+                hls on;
+                hls_path /tmp/hls;
+            }
+
+            # MPEG-DASH is similar to HLS
+
+            application dash {
+                live on;
+                dash on;
+                dash_path /tmp/dash;
+            }
+        }
+    }
+
+    # HTTP can be used for accessing RTMP stats
+    http {
+
+        server {
+
+            listen      8080;
+
+            # This URL provides RTMP statistics in XML
+            location /stat {
+                rtmp_stat all;
+
+                # Use this stylesheet to view XML as web page
+                # in browser
+                rtmp_stat_stylesheet stat.xsl;
+            }
+
+            location /stat.xsl {
+                # XML stylesheet to view RTMP stats.
+                # Copy stat.xsl wherever you want
+                # and put the full directory path here
+                root /path/to/stat.xsl/;
+            }
+
+            location /hls {
+                # Serve HLS fragments
+                types {
+                    application/vnd.apple.mpegurl m3u8;
+                    video/mp2t ts;
+                }
+                root /tmp;
+                add_header Cache-Control no-cache;
+            }
+
+            location /dash {
+                # Serve DASH fragments
+                root /tmp;
+                add_header Cache-Control no-cache;
+            }
+        }
+    }
+
+
+### Multi-worker streaming example
+
+    rtmp_auto_push on;
+
+    rtmp {
+        server {
+            listen 1935;
+
+            application mytv {
+                live on;
+            }
+        }
+    }
diff --git a/debian/modules/nginx-rtmp/config b/debian/modules/nginx-rtmp/config
new file mode 100644
index 0000000..51176f3
--- /dev/null
+++ b/debian/modules/nginx-rtmp/config
@@ -0,0 +1,133 @@
+ngx_addon_name="ngx_rtmp_module"
+
+RTMP_CORE_MODULES="                                         \
+                ngx_rtmp_module                             \
+                ngx_rtmp_core_module                        \
+                ngx_rtmp_cmd_module                         \
+                ngx_rtmp_codec_module                       \
+                ngx_rtmp_access_module                      \
+                ngx_rtmp_record_module                      \
+                ngx_rtmp_live_module                        \
+                ngx_rtmp_play_module                        \
+                ngx_rtmp_flv_module                         \
+                ngx_rtmp_mp4_module                         \
+                ngx_rtmp_netcall_module                     \
+                ngx_rtmp_relay_module                       \
+                ngx_rtmp_exec_module                        \
+                ngx_rtmp_auto_push_module                   \
+                ngx_rtmp_auto_push_index_module             \
+                ngx_rtmp_notify_module                      \
+                ngx_rtmp_log_module                         \
+                ngx_rtmp_limit_module                       \
+                ngx_rtmp_hls_module                         \
+                ngx_rtmp_dash_module                        \
+                "
+
+
+RTMP_HTTP_MODULES="                                         \
+                ngx_rtmp_stat_module                        \
+                ngx_rtmp_control_module                     \
+                "
+
+
+RTMP_DEPS="                                                 \
+                $ngx_addon_dir/ngx_rtmp_amf.h               \
+                $ngx_addon_dir/ngx_rtmp_bandwidth.h         \
+                $ngx_addon_dir/ngx_rtmp_cmd_module.h        \
+                $ngx_addon_dir/ngx_rtmp_codec_module.h      \
+                $ngx_addon_dir/ngx_rtmp_eval.h              \
+                $ngx_addon_dir/ngx_rtmp.h                   \
+                $ngx_addon_dir/ngx_rtmp_version.h           \
+                $ngx_addon_dir/ngx_rtmp_live_module.h       \
+                $ngx_addon_dir/ngx_rtmp_netcall_module.h    \
+                $ngx_addon_dir/ngx_rtmp_play_module.h       \
+                $ngx_addon_dir/ngx_rtmp_record_module.h     \
+                $ngx_addon_dir/ngx_rtmp_relay_module.h      \
+                $ngx_addon_dir/ngx_rtmp_streams.h           \
+                $ngx_addon_dir/ngx_rtmp_bitop.h             \
+                $ngx_addon_dir/ngx_rtmp_proxy_protocol.h    \
+                $ngx_addon_dir/hls/ngx_rtmp_mpegts.h        \
+                $ngx_addon_dir/dash/ngx_rtmp_mp4.h          \
+                "
+
+
+RTMP_CORE_SRCS="                                            \
+                $ngx_addon_dir/ngx_rtmp.c                   \
+                $ngx_addon_dir/ngx_rtmp_init.c              \
+                $ngx_addon_dir/ngx_rtmp_handshake.c         \
+                $ngx_addon_dir/ngx_rtmp_handler.c           \
+                $ngx_addon_dir/ngx_rtmp_amf.c               \
+                $ngx_addon_dir/ngx_rtmp_send.c              \
+                $ngx_addon_dir/ngx_rtmp_shared.c            \
+                $ngx_addon_dir/ngx_rtmp_eval.c              \
+                $ngx_addon_dir/ngx_rtmp_receive.c           \
+                $ngx_addon_dir/ngx_rtmp_core_module.c       \
+                $ngx_addon_dir/ngx_rtmp_cmd_module.c        \
+                $ngx_addon_dir/ngx_rtmp_codec_module.c      \
+                $ngx_addon_dir/ngx_rtmp_access_module.c     \
+                $ngx_addon_dir/ngx_rtmp_record_module.c     \
+                $ngx_addon_dir/ngx_rtmp_live_module.c       \
+                $ngx_addon_dir/ngx_rtmp_play_module.c       \
+                $ngx_addon_dir/ngx_rtmp_flv_module.c        \
+                $ngx_addon_dir/ngx_rtmp_mp4_module.c        \
+                $ngx_addon_dir/ngx_rtmp_netcall_module.c    \
+                $ngx_addon_dir/ngx_rtmp_relay_module.c      \
+                $ngx_addon_dir/ngx_rtmp_bandwidth.c         \
+                $ngx_addon_dir/ngx_rtmp_exec_module.c       \
+                $ngx_addon_dir/ngx_rtmp_auto_push_module.c  \
+                $ngx_addon_dir/ngx_rtmp_notify_module.c     \
+                $ngx_addon_dir/ngx_rtmp_log_module.c        \
+                $ngx_addon_dir/ngx_rtmp_limit_module.c      \
+                $ngx_addon_dir/ngx_rtmp_bitop.c             \
+                $ngx_addon_dir/ngx_rtmp_proxy_protocol.c    \
+                $ngx_addon_dir/hls/ngx_rtmp_hls_module.c    \
+                $ngx_addon_dir/dash/ngx_rtmp_dash_module.c  \
+                $ngx_addon_dir/hls/ngx_rtmp_mpegts.c        \
+                $ngx_addon_dir/dash/ngx_rtmp_mp4.c          \
+                "
+
+
+RTMP_HTTP_SRCS="                                            \
+                $ngx_addon_dir/ngx_rtmp_stat_module.c       \
+                $ngx_addon_dir/ngx_rtmp_control_module.c    \
+                "
+
+if [ -f auto/module ] ; then
+    ngx_module_incs=$ngx_addon_dir
+    ngx_module_deps=$RTMP_DEPS
+
+    if [ $ngx_module_link = DYNAMIC ] ; then
+        ngx_module_name="$RTMP_CORE_MODULES $RTMP_HTTP_MODULES"
+        ngx_module_srcs="$RTMP_CORE_SRCS $RTMP_HTTP_SRCS"
+
+        . auto/module
+
+    else
+        ngx_module_type=CORE
+        ngx_module_name=$RTMP_CORE_MODULES
+        ngx_module_srcs=$RTMP_CORE_SRCS
+
+        . auto/module
+
+
+        ngx_module_type=HTTP
+        ngx_module_name=$RTMP_HTTP_MODULES
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=$RTMP_HTTP_SRCS
+
+        . auto/module
+    fi
+
+else
+    CORE_MODULES="$CORE_MODULES $RTMP_CORE_MODULES"
+    HTTP_MODULES="$HTTP_MODULES $RTMP_HTTP_MODULES"
+
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $RTMP_DEPS"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $RTMP_CORE_SRCS $RTMP_HTTP_SRCS"
+
+    CFLAGS="$CFLAGS -I$ngx_addon_dir"
+fi
+
+USE_OPENSSL=YES
+
diff --git a/debian/modules/nginx-rtmp/dash/ngx_rtmp_dash_module.c b/debian/modules/nginx-rtmp/dash/ngx_rtmp_dash_module.c
new file mode 100644
index 0000000..2ab294e
--- /dev/null
+++ b/debian/modules/nginx-rtmp/dash/ngx_rtmp_dash_module.c
@@ -0,0 +1,1536 @@
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_rtmp.h>
+#include <ngx_rtmp_codec_module.h>
+#include "ngx_rtmp_live_module.h"
+#include "ngx_rtmp_mp4.h"
+
+
+static ngx_rtmp_publish_pt              next_publish;
+static ngx_rtmp_close_stream_pt         next_close_stream;
+static ngx_rtmp_stream_begin_pt         next_stream_begin;
+static ngx_rtmp_stream_eof_pt           next_stream_eof;
+
+
+static ngx_int_t ngx_rtmp_dash_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_dash_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_dash_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+static ngx_int_t ngx_rtmp_dash_write_init_segments(ngx_rtmp_session_t *s);
+
+
+#define NGX_RTMP_DASH_BUFSIZE           (1024*1024)
+#define NGX_RTMP_DASH_MAX_MDAT          (10*1024*1024)
+#define NGX_RTMP_DASH_MAX_SAMPLES       1024
+#define NGX_RTMP_DASH_DIR_ACCESS        0744
+
+
+typedef struct {
+    uint32_t                            timestamp;
+    uint32_t                            duration;
+} ngx_rtmp_dash_frag_t;
+
+
+typedef struct {
+    ngx_uint_t                          id;
+    ngx_uint_t                          opened;
+    ngx_uint_t                          mdat_size;
+    ngx_uint_t                          sample_count;
+    ngx_uint_t                          sample_mask;
+    ngx_fd_t                            fd;
+    char                                type;
+    uint32_t                            earliest_pres_time;
+    uint32_t                            latest_pres_time;
+    ngx_rtmp_mp4_sample_t               samples[NGX_RTMP_DASH_MAX_SAMPLES];
+} ngx_rtmp_dash_track_t;
+
+
+typedef struct {
+    ngx_str_t                           playlist;
+    ngx_str_t                           playlist_bak;
+    ngx_str_t                           name;
+    ngx_str_t                           stream;
+    ngx_time_t                          start_time;
+
+    ngx_uint_t                          nfrags;
+    ngx_uint_t                          frag;
+    ngx_rtmp_dash_frag_t               *frags; /* circular 2 * winfrags + 1 */
+
+    unsigned                            opened:1;
+    unsigned                            has_video:1;
+    unsigned                            has_audio:1;
+
+    ngx_file_t                          video_file;
+    ngx_file_t                          audio_file;
+
+    ngx_uint_t                          id;
+
+    ngx_rtmp_dash_track_t               audio;
+    ngx_rtmp_dash_track_t               video;
+} ngx_rtmp_dash_ctx_t;
+
+
+typedef struct {
+    ngx_str_t                           path;
+    ngx_msec_t                          playlen;
+} ngx_rtmp_dash_cleanup_t;
+
+
+typedef struct {
+    ngx_flag_t                          dash;
+    ngx_msec_t                          fraglen;
+    ngx_msec_t                          playlen;
+    ngx_flag_t                          nested;
+    ngx_str_t                           path;
+    ngx_uint_t                          winfrags;
+    ngx_flag_t                          cleanup;
+    ngx_path_t                         *slot;
+} ngx_rtmp_dash_app_conf_t;
+
+
+static ngx_command_t ngx_rtmp_dash_commands[] = {
+
+    { ngx_string("dash"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_dash_app_conf_t, dash),
+      NULL },
+
+    { ngx_string("dash_fragment"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_dash_app_conf_t, fraglen),
+      NULL },
+
+    { ngx_string("dash_path"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_dash_app_conf_t, path),
+      NULL },
+
+    { ngx_string("dash_playlist_length"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_dash_app_conf_t, playlen),
+      NULL },
+
+    { ngx_string("dash_cleanup"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_dash_app_conf_t, cleanup),
+      NULL },
+
+    { ngx_string("dash_nested"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_dash_app_conf_t, nested),
+      NULL },
+
+    ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_dash_module_ctx = {
+    NULL,                               /* preconfiguration */
+    ngx_rtmp_dash_postconfiguration,    /* postconfiguration */
+
+    NULL,                               /* create main configuration */
+    NULL,                               /* init main configuration */
+
+    NULL,                               /* create server configuration */
+    NULL,                               /* merge server configuration */
+
+    ngx_rtmp_dash_create_app_conf,      /* create location configuration */
+    ngx_rtmp_dash_merge_app_conf,       /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_dash_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_dash_module_ctx,          /* module context */
+    ngx_rtmp_dash_commands,             /* module directives */
+    NGX_RTMP_MODULE,                    /* module type */
+    NULL,                               /* init master */
+    NULL,                               /* init module */
+    NULL,                               /* init process */
+    NULL,                               /* init thread */
+    NULL,                               /* exit thread */
+    NULL,                               /* exit process */
+    NULL,                               /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_rtmp_dash_frag_t *
+ngx_rtmp_dash_get_frag(ngx_rtmp_session_t *s, ngx_int_t n)
+{
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_dash_app_conf_t  *dacf;
+
+    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+
+    return &ctx->frags[(ctx->frag + n) % (dacf->winfrags * 2 + 1)];
+}
+
+
+static void
+ngx_rtmp_dash_next_frag(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_dash_app_conf_t  *dacf;
+
+    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+
+    if (ctx->nfrags == dacf->winfrags) {
+        ctx->frag++;
+    } else {
+        ctx->nfrags++;
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_rename_file(u_char *src, u_char *dst)
+{
+    /* rename file with overwrite */
+
+#if (NGX_WIN32)
+    return MoveFileEx((LPCTSTR) src, (LPCTSTR) dst, MOVEFILE_REPLACE_EXISTING);
+#else
+    return ngx_rename_file(src, dst);
+#endif
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
+{
+    char                      *sep;
+    u_char                    *p, *last;
+    ssize_t                    n;
+    ngx_fd_t                   fd;
+    struct tm                  tm;
+    ngx_str_t                  noname, *name;
+    ngx_uint_t                 i;
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_codec_ctx_t      *codec_ctx;
+    ngx_rtmp_dash_frag_t      *f;
+    ngx_rtmp_dash_app_conf_t  *dacf;
+
+    static u_char              buffer[NGX_RTMP_DASH_BUFSIZE];
+    static u_char              start_time[sizeof("1970-09-28T12:00:00+06:00")];
+    static u_char              end_time[sizeof("1970-09-28T12:00:00+06:00")];
+
+    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (dacf == NULL || ctx == NULL || codec_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ctx->id == 0) {
+        ngx_rtmp_dash_write_init_segments(s);
+    }
+
+    fd = ngx_open_file(ctx->playlist_bak.data, NGX_FILE_WRONLY,
+                       NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
+
+    if (fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: open failed: '%V'", &ctx->playlist_bak);
+        return NGX_ERROR;
+    }
+
+
+#define NGX_RTMP_DASH_MANIFEST_HEADER                                          \
+    "<?xml version=\"1.0\"?>\n"                                                \
+    "<MPD\n"                                                                   \
+    "    type=\"dynamic\"\n"                                                   \
+    "    xmlns=\"urn:mpeg:dash:schema:mpd:2011\"\n"                            \
+    "    availabilityStartTime=\"%s\"\n"                                       \
+    "    availabilityEndTime=\"%s\"\n"                                         \
+    "    minimumUpdatePeriod=\"PT%uiS\"\n"                                     \
+    "    minBufferTime=\"PT%uiS\"\n"                                           \
+    "    timeShiftBufferDepth=\"PT0H0M0.00S\"\n"                               \
+    "    suggestedPresentationDelay=\"PT%uiS\"\n"                              \
+    "    profiles=\"urn:hbbtv:dash:profile:isoff-live:2012,"                   \
+                   "urn:mpeg:dash:profile:isoff-live:2011\"\n"                 \
+    "    xmlns:xsi=\"http://www.w3.org/2011/XMLSchema-instance\"\n"            \
+    "    xsi:schemaLocation=\"urn:mpeg:DASH:schema:MPD:2011 DASH-MPD.xsd\">\n" \
+    "  <Period start=\"PT0S\" id=\"dash\">\n"
+
+
+#define NGX_RTMP_DASH_MANIFEST_VIDEO                                           \
+    "    <AdaptationSet\n"                                                     \
+    "        id=\"1\"\n"                                                       \
+    "        segmentAlignment=\"true\"\n"                                      \
+    "        maxWidth=\"%ui\"\n"                                               \
+    "        maxHeight=\"%ui\"\n"                                              \
+    "        maxFrameRate=\"%ui\">\n"                                          \
+    "      <Representation\n"                                                  \
+    "          id=\"%V_H264\"\n"                                               \
+    "          mimeType=\"video/mp4\"\n"                                       \
+    "          codecs=\"avc1.%02uxi%02uxi%02uxi\"\n"                           \
+    "          width=\"%ui\"\n"                                                \
+    "          height=\"%ui\"\n"                                               \
+    "          frameRate=\"%ui\"\n"                                            \
+    "          sar=\"1:1\"\n"                                                  \
+    "          startWithSAP=\"1\"\n"                                           \
+    "          bandwidth=\"%ui\">\n"                                           \
+    "        <SegmentTemplate\n"                                               \
+    "            presentationTimeOffset=\"0\"\n"                               \
+    "            timescale=\"1000\"\n"                                         \
+    "            media=\"%V%s$Time$.m4v\"\n"                                   \
+    "            initialization=\"%V%sinit.m4v\">\n"                           \
+    "          <SegmentTimeline>\n"
+
+
+#define NGX_RTMP_DASH_MANIFEST_VIDEO_FOOTER                                    \
+    "          </SegmentTimeline>\n"                                           \
+    "        </SegmentTemplate>\n"                                             \
+    "      </Representation>\n"                                                \
+    "    </AdaptationSet>\n"
+
+
+#define NGX_RTMP_DASH_MANIFEST_TIME                                            \
+    "             <S t=\"%uD\" d=\"%uD\"/>\n"
+
+
+#define NGX_RTMP_DASH_MANIFEST_AUDIO                                           \
+    "    <AdaptationSet\n"                                                     \
+    "        id=\"2\"\n"                                                       \
+    "        segmentAlignment=\"true\">\n"                                     \
+    "      <AudioChannelConfiguration\n"                                       \
+    "          schemeIdUri=\"urn:mpeg:dash:"                                   \
+                                "23003:3:audio_channel_configuration:2011\"\n" \
+    "          value=\"1\"/>\n"                                                \
+    "      <Representation\n"                                                  \
+    "          id=\"%V_AAC\"\n"                                                \
+    "          mimeType=\"audio/mp4\"\n"                                       \
+    "          codecs=\"mp4a.%s\"\n"                                           \
+    "          audioSamplingRate=\"%ui\"\n"                                    \
+    "          startWithSAP=\"1\"\n"                                           \
+    "          bandwidth=\"%ui\">\n"                                           \
+    "        <SegmentTemplate\n"                                               \
+    "            presentationTimeOffset=\"0\"\n"                               \
+    "            timescale=\"1000\"\n"                                         \
+    "            media=\"%V%s$Time$.m4a\"\n"                                   \
+    "            initialization=\"%V%sinit.m4a\">\n"                           \
+    "          <SegmentTimeline>\n"
+
+
+#define NGX_RTMP_DASH_MANIFEST_AUDIO_FOOTER                                    \
+    "          </SegmentTimeline>\n"                                           \
+    "        </SegmentTemplate>\n"                                             \
+    "      </Representation>\n"                                                \
+    "    </AdaptationSet>\n"
+
+
+#define NGX_RTMP_DASH_MANIFEST_FOOTER                                          \
+    "  </Period>\n"                                                            \
+    "</MPD>\n"
+
+    ngx_libc_localtime(ctx->start_time.sec +
+                       ngx_rtmp_dash_get_frag(s, 0)->timestamp / 1000, &tm);
+
+    *ngx_sprintf(start_time, "%4d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
+                 tm.tm_year + 1900, tm.tm_mon + 1,
+                 tm.tm_mday, tm.tm_hour,
+                 tm.tm_min, tm.tm_sec,
+                 ctx->start_time.gmtoff < 0 ? '-' : '+',
+                 ngx_abs(ctx->start_time.gmtoff / 60),
+                 ngx_abs(ctx->start_time.gmtoff % 60)) = 0;
+
+    ngx_libc_localtime(ctx->start_time.sec +
+                       (ngx_rtmp_dash_get_frag(s, ctx->nfrags - 1)->timestamp +
+                        ngx_rtmp_dash_get_frag(s, ctx->nfrags - 1)->duration) /
+                       1000, &tm);
+
+    *ngx_sprintf(end_time, "%4d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
+                 tm.tm_year + 1900, tm.tm_mon + 1,
+                 tm.tm_mday, tm.tm_hour,
+                 tm.tm_min, tm.tm_sec,
+                 ctx->start_time.gmtoff < 0 ? '-' : '+',
+                 ngx_abs(ctx->start_time.gmtoff / 60),
+                 ngx_abs(ctx->start_time.gmtoff % 60)) = 0;
+
+    last = buffer + sizeof(buffer);
+
+    p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_HEADER,
+                     start_time,
+                     end_time,
+                     (ngx_uint_t) (dacf->fraglen / 1000),
+                     (ngx_uint_t) (dacf->fraglen / 1000),
+                     (ngx_uint_t) (dacf->fraglen / 500));
+
+    n = ngx_write_fd(fd, buffer, p - buffer);
+
+    ngx_str_null(&noname);
+
+    name = (dacf->nested ? &noname : &ctx->name);
+    sep = (dacf->nested ? "" : "-");
+
+    if (ctx->has_video) {
+        p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_VIDEO,
+                         codec_ctx->width,
+                         codec_ctx->height,
+                         codec_ctx->frame_rate,
+                         &ctx->name,
+                         codec_ctx->avc_profile,
+                         codec_ctx->avc_compat,
+                         codec_ctx->avc_level,
+                         codec_ctx->width,
+                         codec_ctx->height,
+                         codec_ctx->frame_rate,
+                         (ngx_uint_t) (codec_ctx->video_data_rate * 1000),
+                         name, sep,
+                         name, sep);
+
+        for (i = 0; i < ctx->nfrags; i++) {
+            f = ngx_rtmp_dash_get_frag(s, i);
+            p = ngx_slprintf(p, last, NGX_RTMP_DASH_MANIFEST_TIME,
+                             f->timestamp, f->duration);
+        }
+
+        p = ngx_slprintf(p, last, NGX_RTMP_DASH_MANIFEST_VIDEO_FOOTER);
+
+        n = ngx_write_fd(fd, buffer, p - buffer);
+    }
+
+    if (ctx->has_audio) {
+        p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_AUDIO,
+                         &ctx->name,
+                         codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC ?
+                         (codec_ctx->aac_sbr ? "40.5" : "40.2") : "6b",
+                         codec_ctx->sample_rate,
+                         (ngx_uint_t) (codec_ctx->audio_data_rate * 1000),
+                         name, sep,
+                         name, sep);
+
+        for (i = 0; i < ctx->nfrags; i++) {
+            f = ngx_rtmp_dash_get_frag(s, i);
+            p = ngx_slprintf(p, last, NGX_RTMP_DASH_MANIFEST_TIME,
+                             f->timestamp, f->duration);
+        }
+
+        p = ngx_slprintf(p, last, NGX_RTMP_DASH_MANIFEST_AUDIO_FOOTER);
+
+        n = ngx_write_fd(fd, buffer, p - buffer);
+    }
+
+    p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_FOOTER);
+    n = ngx_write_fd(fd, buffer, p - buffer);
+
+    if (n < 0) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: write failed: '%V'", &ctx->playlist_bak);
+        ngx_close_file(fd);
+        return NGX_ERROR;
+    }
+
+    ngx_close_file(fd);
+
+    if (ngx_rtmp_dash_rename_file(ctx->playlist_bak.data, ctx->playlist.data)
+        == NGX_FILE_ERROR)
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: rename failed: '%V'->'%V'",
+                      &ctx->playlist_bak, &ctx->playlist);
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_write_init_segments(ngx_rtmp_session_t *s)
+{
+    ngx_fd_t               fd;
+    ngx_int_t              rc;
+    ngx_buf_t              b;
+    ngx_rtmp_dash_ctx_t   *ctx;
+    ngx_rtmp_codec_ctx_t  *codec_ctx;
+
+    static u_char          buffer[NGX_RTMP_DASH_BUFSIZE];
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (ctx == NULL || codec_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    /* init video */
+
+    *ngx_sprintf(ctx->stream.data + ctx->stream.len, "init.m4v") = 0;
+
+    fd = ngx_open_file(ctx->stream.data, NGX_FILE_RDWR, NGX_FILE_TRUNCATE,
+                       NGX_FILE_DEFAULT_ACCESS);
+
+    if (fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: error creating video init file");
+        return NGX_ERROR;
+    }
+
+    b.start = buffer;
+    b.end = b.start + sizeof(buffer);
+    b.pos = b.last = b.start;
+
+    ngx_rtmp_mp4_write_ftyp(&b);
+    ngx_rtmp_mp4_write_moov(s, &b, NGX_RTMP_MP4_VIDEO_TRACK);
+
+    rc = ngx_write_fd(fd, b.start, (size_t) (b.last - b.start));
+    if (rc == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: writing video init failed");
+    }
+
+    ngx_close_file(fd);
+
+    /* init audio */
+
+    *ngx_sprintf(ctx->stream.data + ctx->stream.len, "init.m4a") = 0;
+
+    fd = ngx_open_file(ctx->stream.data, NGX_FILE_RDWR, NGX_FILE_TRUNCATE,
+                       NGX_FILE_DEFAULT_ACCESS);
+
+    if (fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: error creating dash audio init file");
+        return NGX_ERROR;
+    }
+
+    b.pos = b.last = b.start;
+
+    ngx_rtmp_mp4_write_ftyp(&b);
+    ngx_rtmp_mp4_write_moov(s, &b, NGX_RTMP_MP4_AUDIO_TRACK);
+
+    rc = ngx_write_fd(fd, b.start, (size_t) (b.last - b.start));
+    if (rc == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: writing audio init failed");
+    }
+
+    ngx_close_file(fd);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_dash_close_fragment(ngx_rtmp_session_t *s, ngx_rtmp_dash_track_t *t)
+{
+    u_char                    *pos, *pos1;
+    size_t                     left;
+    ssize_t                    n;
+    ngx_fd_t                   fd;
+    ngx_buf_t                  b;
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_dash_frag_t      *f;
+
+    static u_char              buffer[NGX_RTMP_DASH_BUFSIZE];
+
+    if (!t->opened) {
+        return;
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "dash: close fragment id=%ui, type=%c, pts=%uD",
+                   t->id, t->type, t->earliest_pres_time);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+
+    b.start = buffer;
+    b.end = buffer + sizeof(buffer);
+    b.pos = b.last = b.start;
+
+    ngx_rtmp_mp4_write_styp(&b);
+
+    pos = b.last;
+    b.last += 44; /* leave room for sidx */
+
+    ngx_rtmp_mp4_write_moof(&b, t->earliest_pres_time, t->sample_count,
+                            t->samples, t->sample_mask, t->id);
+    pos1 = b.last;
+    b.last = pos;
+
+    ngx_rtmp_mp4_write_sidx(&b, t->mdat_size + 8 + (pos1 - (pos + 44)),
+                            t->earliest_pres_time, t->latest_pres_time);
+    b.last = pos1;
+    ngx_rtmp_mp4_write_mdat(&b, t->mdat_size + 8);
+
+    /* move the data down to make room for the headers */
+
+    f = ngx_rtmp_dash_get_frag(s, ctx->nfrags);
+
+    *ngx_sprintf(ctx->stream.data + ctx->stream.len, "%uD.m4%c",
+                 f->timestamp, t->type) = 0;
+
+    fd = ngx_open_file(ctx->stream.data, NGX_FILE_RDWR,
+                       NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
+
+    if (fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: error creating dash temp video file");
+        goto done;
+    }
+
+    if (ngx_write_fd(fd, b.pos, (size_t) (b.last - b.pos)) == NGX_ERROR) {
+        goto done;
+    }
+
+    left = (size_t) t->mdat_size;
+
+#if (NGX_WIN32)
+    if (SetFilePointer(t->fd, 0, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "dash: SetFilePointer error");
+        goto done;
+    }
+#else
+    if (lseek(t->fd, 0, SEEK_SET) == -1) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: lseek error");
+        goto done;
+    }
+#endif
+
+    while (left > 0) {
+
+        n = ngx_read_fd(t->fd, buffer, ngx_min(sizeof(buffer), left));
+        if (n == NGX_ERROR) {
+            break;
+        }
+
+        n = ngx_write_fd(fd, buffer, (size_t) n);
+        if (n == NGX_ERROR) {
+            break;
+        }
+
+        left -= n;
+    }
+
+done:
+
+    if (fd != NGX_INVALID_FILE) {
+        ngx_close_file(fd);
+    }
+
+    ngx_close_file(t->fd);
+
+    t->fd = NGX_INVALID_FILE;
+    t->opened = 0;
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_close_fragments(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_dash_ctx_t  *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+    if (ctx == NULL || !ctx->opened) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "dash: close fragments");
+
+    ngx_rtmp_dash_close_fragment(s, &ctx->video);
+    ngx_rtmp_dash_close_fragment(s, &ctx->audio);
+
+    ngx_rtmp_dash_next_frag(s);
+
+    ngx_rtmp_dash_write_playlist(s);
+
+    ctx->id++;
+    ctx->opened = 0;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_open_fragment(ngx_rtmp_session_t *s, ngx_rtmp_dash_track_t *t,
+    ngx_uint_t id, char type)
+{
+    ngx_rtmp_dash_ctx_t   *ctx;
+
+    if (t->opened) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "dash: open fragment id=%ui, type='%c'", id, type);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+
+    *ngx_sprintf(ctx->stream.data + ctx->stream.len, "raw.m4%c", type) = 0;
+
+    t->fd = ngx_open_file(ctx->stream.data, NGX_FILE_RDWR,
+                          NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
+
+    if (t->fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: error creating fragment file");
+        return NGX_ERROR;
+    }
+
+    t->id = id;
+    t->type = type;
+    t->sample_count = 0;
+    t->earliest_pres_time = 0;
+    t->latest_pres_time = 0;
+    t->mdat_size = 0;
+    t->opened = 1;
+
+    if (type == 'v') {
+        t->sample_mask = NGX_RTMP_MP4_SAMPLE_SIZE|
+                         NGX_RTMP_MP4_SAMPLE_DURATION|
+                         NGX_RTMP_MP4_SAMPLE_DELAY|
+                         NGX_RTMP_MP4_SAMPLE_KEY;
+    } else {
+        t->sample_mask = NGX_RTMP_MP4_SAMPLE_SIZE|
+                         NGX_RTMP_MP4_SAMPLE_DURATION;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_open_fragments(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_dash_ctx_t  *ctx;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "dash: open fragments");
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+
+    if (ctx->opened) {
+        return NGX_OK;
+    }
+
+    ngx_rtmp_dash_open_fragment(s, &ctx->video, ctx->id, 'v');
+
+    ngx_rtmp_dash_open_fragment(s, &ctx->audio, ctx->id, 'a');
+
+    ctx->opened = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_ensure_directory(ngx_rtmp_session_t *s)
+{
+    size_t                     len;
+    ngx_file_info_t            fi;
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_dash_app_conf_t  *dacf;
+
+    static u_char              path[NGX_MAX_PATH + 1];
+
+    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
+
+    *ngx_snprintf(path, sizeof(path) - 1, "%V", &dacf->path) = 0;
+
+    if (ngx_file_info(path, &fi) == NGX_FILE_ERROR) {
+
+        if (ngx_errno != NGX_ENOENT) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                          "dash: " ngx_file_info_n " failed on '%V'",
+                          &dacf->path);
+            return NGX_ERROR;
+        }
+
+        /* ENOENT */
+
+        if (ngx_create_dir(path, NGX_RTMP_DASH_DIR_ACCESS) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                          "dash: " ngx_create_dir_n " failed on '%V'",
+                          &dacf->path);
+            return NGX_ERROR;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "dash: directory '%V' created", &dacf->path);
+
+    } else {
+
+        if (!ngx_is_dir(&fi)) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "dash: '%V' exists and is not a directory",
+                          &dacf->path);
+            return  NGX_ERROR;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "dash: directory '%V' exists", &dacf->path);
+    }
+
+    if (!dacf->nested) {
+        return NGX_OK;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+
+    len = dacf->path.len;
+    if (dacf->path.data[len - 1] == '/') {
+        len--;
+    }
+
+    *ngx_snprintf(path, sizeof(path) - 1, "%*s/%V", len, dacf->path.data,
+                  &ctx->name) = 0;
+
+    if (ngx_file_info(path, &fi) != NGX_FILE_ERROR) {
+
+        if (ngx_is_dir(&fi)) {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "dash: directory '%s' exists", path);
+            return NGX_OK;
+        }
+
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "dash: '%s' exists and is not a directory", path);
+
+        return  NGX_ERROR;
+    }
+
+    if (ngx_errno != NGX_ENOENT) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: " ngx_file_info_n " failed on '%s'", path);
+        return NGX_ERROR;
+    }
+
+    /* NGX_ENOENT */
+
+    if (ngx_create_dir(path, NGX_RTMP_DASH_DIR_ACCESS) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: " ngx_create_dir_n " failed on '%s'", path);
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "dash: directory '%s' created", path);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    u_char                    *p;
+    size_t                     len;
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_dash_frag_t      *f;
+    ngx_rtmp_dash_app_conf_t  *dacf;
+
+    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
+    if (dacf == NULL || !dacf->dash || dacf->path.len == 0) {
+        goto next;
+    }
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "dash: publish: name='%s' type='%s'", v->name, v->type);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_dash_ctx_t));
+        if (ctx == NULL) {
+            goto next;
+        }
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_dash_module);
+
+    } else {
+        if (ctx->opened) {
+            goto next;
+        }
+
+        f = ctx->frags;
+        ngx_memzero(ctx, sizeof(ngx_rtmp_dash_ctx_t));
+        ctx->frags = f;
+    }
+
+    if (ctx->frags == NULL) {
+        ctx->frags = ngx_pcalloc(s->connection->pool,
+                                 sizeof(ngx_rtmp_dash_frag_t) *
+                                 (dacf->winfrags * 2 + 1));
+        if (ctx->frags == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    ctx->id = 0;
+
+    if (ngx_strstr(v->name, "..")) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "dash: bad stream name: '%s'", v->name);
+        return NGX_ERROR;
+    }
+
+    ctx->name.len = ngx_strlen(v->name);
+    ctx->name.data = ngx_palloc(s->connection->pool, ctx->name.len + 1);
+
+    if (ctx->name.data == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ngx_cpymem(ctx->name.data, v->name, ctx->name.len) = 0;
+
+    len = dacf->path.len + 1 + ctx->name.len + sizeof(".mpd");
+    if (dacf->nested) {
+        len += sizeof("/index") - 1;
+    }
+
+    ctx->playlist.data = ngx_palloc(s->connection->pool, len);
+    p = ngx_cpymem(ctx->playlist.data, dacf->path.data, dacf->path.len);
+
+    if (p[-1] != '/') {
+        *p++ = '/';
+    }
+
+    p = ngx_cpymem(p, ctx->name.data, ctx->name.len);
+
+    /*
+     * ctx->stream holds initial part of stream file path
+     * however the space for the whole stream path
+     * is allocated
+     */
+
+    ctx->stream.len = p - ctx->playlist.data + 1;
+    ctx->stream.data = ngx_palloc(s->connection->pool,
+                                  ctx->stream.len + NGX_INT32_LEN +
+                                  sizeof(".m4x"));
+
+    ngx_memcpy(ctx->stream.data, ctx->playlist.data, ctx->stream.len - 1);
+    ctx->stream.data[ctx->stream.len - 1] = (dacf->nested ? '/' : '-');
+
+    if (dacf->nested) {
+        p = ngx_cpymem(p, "/index.mpd", sizeof("/index.mpd") - 1);
+    } else {
+        p = ngx_cpymem(p, ".mpd", sizeof(".mpd") - 1);
+    }
+
+    ctx->playlist.len = p - ctx->playlist.data;
+
+    *p = 0;
+
+    /* playlist bak (new playlist) path */
+
+    ctx->playlist_bak.data = ngx_palloc(s->connection->pool,
+                                        ctx->playlist.len + sizeof(".bak"));
+    p = ngx_cpymem(ctx->playlist_bak.data, ctx->playlist.data,
+                   ctx->playlist.len);
+    p = ngx_cpymem(p, ".bak", sizeof(".bak") - 1);
+
+    ctx->playlist_bak.len = p - ctx->playlist_bak.data;
+
+    *p = 0;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "dash: playlist='%V' playlist_bak='%V' stream_pattern='%V'",
+                   &ctx->playlist, &ctx->playlist_bak, &ctx->stream);
+
+    ctx->start_time = *ngx_cached_time;
+
+    if (ngx_rtmp_dash_ensure_directory(s) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
+{
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_dash_app_conf_t  *dacf;
+
+    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+
+    if (dacf == NULL || !dacf->dash || ctx == NULL) {
+        goto next;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "dash: delete stream");
+
+    ngx_rtmp_dash_close_fragments(s);
+
+next:
+    return next_close_stream(s, v);
+}
+
+
+static void
+ngx_rtmp_dash_update_fragments(ngx_rtmp_session_t *s, ngx_int_t boundary,
+    uint32_t timestamp)
+{
+    int32_t                    d;
+    ngx_int_t                  hit;
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_dash_frag_t      *f;
+    ngx_rtmp_dash_app_conf_t  *dacf;
+
+    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+    f = ngx_rtmp_dash_get_frag(s, ctx->nfrags);
+
+    d = (int32_t) (timestamp - f->timestamp);
+
+    if (d >= 0) {
+
+        f->duration = timestamp - f->timestamp;
+        hit = (f->duration >= dacf->fraglen);
+
+    } else {
+
+        /* sometimes clients generate slightly unordered frames */
+
+        hit = (-d > 1000);
+    }
+
+    if (ctx->has_video && !hit) {
+        boundary = 0;
+    }
+
+    if (!ctx->has_video && ctx->has_audio) {
+        boundary = hit;
+    }
+
+    if (ctx->audio.mdat_size >= NGX_RTMP_DASH_MAX_MDAT) {
+        boundary = 1;
+    }
+
+    if (ctx->video.mdat_size >= NGX_RTMP_DASH_MAX_MDAT) {
+        boundary = 1;
+    }
+
+    if (!ctx->opened) {
+        boundary = 1;
+    }
+
+    if (boundary) {
+        ngx_rtmp_dash_close_fragments(s);
+        ngx_rtmp_dash_open_fragments(s);
+
+        f = ngx_rtmp_dash_get_frag(s, ctx->nfrags);
+        f->timestamp = timestamp;
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_append(ngx_rtmp_session_t *s, ngx_chain_t *in,
+    ngx_rtmp_dash_track_t *t, ngx_int_t key, uint32_t timestamp, uint32_t delay)
+{
+    u_char                 *p;
+    size_t                  size, bsize;
+    ngx_rtmp_mp4_sample_t  *smpl;
+
+    static u_char           buffer[NGX_RTMP_DASH_BUFSIZE];
+
+    p = buffer;
+    size = 0;
+
+    for (; in && size < sizeof(buffer); in = in->next) {
+
+        bsize = (size_t) (in->buf->last - in->buf->pos);
+        if (size + bsize > sizeof(buffer)) {
+            bsize = (size_t) (sizeof(buffer) - size);
+        }
+
+        p = ngx_cpymem(p, in->buf->pos, bsize);
+        size += bsize;
+    }
+
+    ngx_rtmp_dash_update_fragments(s, key, timestamp);
+
+    if (t->sample_count == 0) {
+        t->earliest_pres_time = timestamp;
+    }
+
+    t->latest_pres_time = timestamp;
+
+    if (t->sample_count < NGX_RTMP_DASH_MAX_SAMPLES) {
+
+        if (ngx_write_fd(t->fd, buffer, size) == NGX_ERROR) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                          "dash: " ngx_write_fd_n " failed");
+            return NGX_ERROR;
+        }
+
+        smpl = &t->samples[t->sample_count];
+
+        smpl->delay = delay;
+        smpl->size = (uint32_t) size;
+        smpl->duration = 0;
+        smpl->timestamp = timestamp;
+        smpl->key = (key ? 1 : 0);
+
+        if (t->sample_count > 0) {
+            smpl = &t->samples[t->sample_count - 1];
+            smpl->duration = timestamp - smpl->timestamp;
+        }
+
+        t->sample_count++;
+        t->mdat_size += (ngx_uint_t) size;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_audio(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+    ngx_chain_t *in)
+{
+    u_char                     htype;
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_codec_ctx_t      *codec_ctx;
+    ngx_rtmp_dash_app_conf_t  *dacf;
+
+    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (dacf == NULL || !dacf->dash || ctx == NULL ||
+        codec_ctx == NULL || h->mlen < 2)
+    {
+        return NGX_OK;
+    }
+
+    /* Only AAC is supported */
+
+    if (codec_ctx->audio_codec_id != NGX_RTMP_AUDIO_AAC ||
+        codec_ctx->aac_header == NULL)
+    {
+        return NGX_OK;
+    }
+
+    if (in->buf->last - in->buf->pos < 2) {
+        return NGX_ERROR;
+    }
+
+    /* skip AAC config */
+
+    htype = in->buf->pos[1];
+    if (htype != 1) {
+        return NGX_OK;
+    }
+
+    ctx->has_audio = 1;
+
+    /* skip RTMP & AAC headers */
+
+    in->buf->pos += 2;
+
+    return ngx_rtmp_dash_append(s, in, &ctx->audio, 0, h->timestamp, 0);
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_video(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+    ngx_chain_t *in)
+{
+    u_char                    *p;
+    uint8_t                    ftype, htype;
+    uint32_t                   delay;
+    ngx_rtmp_dash_ctx_t       *ctx;
+    ngx_rtmp_codec_ctx_t      *codec_ctx;
+    ngx_rtmp_dash_app_conf_t  *dacf;
+
+    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (dacf == NULL || !dacf->dash || ctx == NULL || codec_ctx == NULL ||
+        codec_ctx->avc_header == NULL || h->mlen < 5)
+    {
+        return NGX_OK;
+    }
+
+    /* Only H264 is supported */
+
+    if (codec_ctx->video_codec_id != NGX_RTMP_VIDEO_H264) {
+        return NGX_OK;
+    }
+
+    if (in->buf->last - in->buf->pos < 5) {
+        return NGX_ERROR;
+    }
+
+    ftype = (in->buf->pos[0] & 0xf0) >> 4;
+
+    /* skip AVC config */
+
+    htype = in->buf->pos[1];
+    if (htype != 1) {
+        return NGX_OK;
+    }
+
+    p = (u_char *) &delay;
+
+    p[0] = in->buf->pos[4];
+    p[1] = in->buf->pos[3];
+    p[2] = in->buf->pos[2];
+    p[3] = 0;
+
+    ctx->has_video = 1;
+
+    /* skip RTMP & H264 headers */
+
+    in->buf->pos += 5;
+
+    return ngx_rtmp_dash_append(s, in, &ctx->video, ftype == 1, h->timestamp,
+                                delay);
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
+{
+    return next_stream_begin(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_eof_t *v)
+{
+    ngx_rtmp_dash_close_fragments(s);
+
+    return next_stream_eof(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_cleanup_dir(ngx_str_t *ppath, ngx_msec_t playlen)
+{
+    time_t           mtime, max_age;
+    u_char          *p;
+    u_char           path[NGX_MAX_PATH + 1], mpd_path[NGX_MAX_PATH + 1];
+    ngx_dir_t        dir;
+    ngx_err_t        err;
+    ngx_str_t        name, spath, mpd;
+    ngx_int_t        nentries, nerased;
+    ngx_file_info_t  fi;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                   "dash: cleanup path='%V' playlen=%M", ppath, playlen);
+
+    if (ngx_open_dir(ppath, &dir) != NGX_OK) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, ngx_errno,
+                       "dash: cleanup open dir failed '%V'", ppath);
+        return NGX_ERROR;
+    }
+
+    nentries = 0;
+    nerased = 0;
+
+    for ( ;; ) {
+        ngx_set_errno(0);
+
+        if (ngx_read_dir(&dir) == NGX_ERROR) {
+            err = ngx_errno;
+
+            if (ngx_close_dir(&dir) == NGX_ERROR) {
+                ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, ngx_errno,
+                              "dash: cleanup " ngx_close_dir_n " \"%V\" failed",
+                              ppath);
+            }
+
+            if (err == NGX_ENOMOREFILES) {
+                return nentries - nerased;
+            }
+
+            ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, err,
+                          "dash: cleanup " ngx_read_dir_n
+                          " '%V' failed", ppath);
+            return NGX_ERROR;
+        }
+
+        name.data = ngx_de_name(&dir);
+        if (name.data[0] == '.') {
+            continue;
+        }
+
+        name.len = ngx_de_namelen(&dir);
+
+        p = ngx_snprintf(path, sizeof(path) - 1, "%V/%V", ppath, &name);
+        *p = 0;
+
+        spath.data = path;
+        spath.len = p - path;
+
+        nentries++;
+
+        if (!dir.valid_info && ngx_de_info(path, &dir) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, ngx_errno,
+                          "dash: cleanup " ngx_de_info_n " \"%V\" failed",
+                          &spath);
+
+            continue;
+        }
+
+        if (ngx_de_is_dir(&dir)) {
+
+            if (ngx_rtmp_dash_cleanup_dir(&spath, playlen) == 0) {
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                               "dash: cleanup dir '%V'", &name);
+
+                /*
+                 * null-termination gets spoiled in win32
+                 * version of ngx_open_dir
+                 */
+
+                *p = 0;
+
+                if (ngx_delete_dir(path) == NGX_FILE_ERROR) {
+                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                                  "dash: cleanup " ngx_delete_dir_n
+                                  " failed on '%V'", &spath);
+                } else {
+                    nerased++;
+                }
+            }
+
+            continue;
+        }
+
+        if (!ngx_de_is_file(&dir)) {
+            continue;
+        }
+
+        if (name.len >= 8 && name.data[name.len - 8] == 'i' &&
+                             name.data[name.len - 7] == 'n' &&
+                             name.data[name.len - 6] == 'i' &&
+                             name.data[name.len - 5] == 't' &&
+                             name.data[name.len - 4] == '.' &&
+                             name.data[name.len - 3] == 'm' &&
+                             name.data[name.len - 2] == '4')
+        {
+            if (name.len == 8) {
+                ngx_str_set(&mpd, "index");
+            } else {
+                mpd.data = name.data;
+                mpd.len = name.len - 9;
+            }
+
+            p = ngx_snprintf(mpd_path, sizeof(mpd_path) - 1, "%V/%V.mpd",
+                             ppath, &mpd);
+            *p = 0;
+
+            if (ngx_file_info(mpd_path, &fi) != NGX_FILE_ERROR) {
+                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                               "dash: cleanup '%V' delayed, mpd exists '%s'",
+                               &name, mpd_path);
+                continue;
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                           "dash: cleanup '%V' allowed, mpd missing '%s'",
+                           &name, mpd_path);
+
+            max_age = 0;
+
+        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
+                                    name.data[name.len - 3] == 'm' &&
+                                    name.data[name.len - 2] == '4' &&
+                                    name.data[name.len - 1] == 'v')
+        {
+            max_age = playlen / 500;
+
+        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
+                                    name.data[name.len - 3] == 'm' &&
+                                    name.data[name.len - 2] == '4' &&
+                                    name.data[name.len - 1] == 'a')
+        {
+            max_age = playlen / 500;
+
+        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
+                                    name.data[name.len - 3] == 'm' &&
+                                    name.data[name.len - 2] == 'p' &&
+                                    name.data[name.len - 1] == 'd')
+        {
+            max_age = playlen / 500;
+
+        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
+                                    name.data[name.len - 3] == 'r' &&
+                                    name.data[name.len - 2] == 'a' &&
+                                    name.data[name.len - 1] == 'w')
+        {
+            max_age = playlen / 1000;
+
+        } else {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                           "dash: cleanup skip unknown file type '%V'", &name);
+            continue;
+        }
+
+        mtime = ngx_de_mtime(&dir);
+        if (mtime + max_age > ngx_cached_time->sec) {
+            continue;
+        }
+
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                       "dash: cleanup '%V' mtime=%T age=%T",
+                       &name, mtime, ngx_cached_time->sec - mtime);
+
+        if (ngx_delete_file(path) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "dash: cleanup " ngx_delete_file_n " failed on '%V'",
+                          &spath);
+            continue;
+        }
+
+        nerased++;
+    }
+}
+
+
+#if (nginx_version >= 1011005)
+static ngx_msec_t
+#else
+static time_t
+#endif
+ngx_rtmp_dash_cleanup(void *data)
+{
+    ngx_rtmp_dash_cleanup_t *cleanup = data;
+
+    ngx_rtmp_dash_cleanup_dir(&cleanup->path, cleanup->playlen);
+
+#if (nginx_version >= 1011005)
+    return cleanup->playlen * 2;
+#else
+    return cleanup->playlen / 500;
+#endif
+}
+
+
+static void *
+ngx_rtmp_dash_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_dash_app_conf_t *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_dash_app_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->dash = NGX_CONF_UNSET;
+    conf->fraglen = NGX_CONF_UNSET_MSEC;
+    conf->playlen = NGX_CONF_UNSET_MSEC;
+    conf->cleanup = NGX_CONF_UNSET;
+    conf->nested = NGX_CONF_UNSET;
+
+    return conf;
+}
+
+
+static char *
+ngx_rtmp_dash_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_dash_app_conf_t    *prev = parent;
+    ngx_rtmp_dash_app_conf_t    *conf = child;
+    ngx_rtmp_dash_cleanup_t     *cleanup;
+
+    ngx_conf_merge_value(conf->dash, prev->dash, 0);
+    ngx_conf_merge_msec_value(conf->fraglen, prev->fraglen, 5000);
+    ngx_conf_merge_msec_value(conf->playlen, prev->playlen, 30000);
+    ngx_conf_merge_value(conf->cleanup, prev->cleanup, 1);
+    ngx_conf_merge_value(conf->nested, prev->nested, 0);
+
+    if (conf->fraglen) {
+        conf->winfrags = conf->playlen / conf->fraglen;
+    }
+
+    /* schedule cleanup */
+
+    if (conf->dash && conf->path.len && conf->cleanup) {
+        if (conf->path.data[conf->path.len - 1] == '/') {
+            conf->path.len--;
+        }
+
+        cleanup = ngx_pcalloc(cf->pool, sizeof(*cleanup));
+        if (cleanup == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        cleanup->path = conf->path;
+        cleanup->playlen = conf->playlen;
+
+        conf->slot = ngx_pcalloc(cf->pool, sizeof(*conf->slot));
+        if (conf->slot == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        conf->slot->manager = ngx_rtmp_dash_cleanup;
+        conf->slot->name = conf->path;
+        conf->slot->data = cleanup;
+        conf->slot->conf_file = cf->conf_file->file.name.data;
+        conf->slot->line = cf->conf_file->line;
+
+        if (ngx_add_path(cf, &conf->slot) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    ngx_conf_merge_str_value(conf->path, prev->path, "");
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_dash_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_handler_pt        *h;
+    ngx_rtmp_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
+    *h = ngx_rtmp_dash_video;
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
+    *h = ngx_rtmp_dash_audio;
+
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_dash_publish;
+
+    next_close_stream = ngx_rtmp_close_stream;
+    ngx_rtmp_close_stream = ngx_rtmp_dash_close_stream;
+
+    next_stream_begin = ngx_rtmp_stream_begin;
+    ngx_rtmp_stream_begin = ngx_rtmp_dash_stream_begin;
+
+    next_stream_eof = ngx_rtmp_stream_eof;
+    ngx_rtmp_stream_eof = ngx_rtmp_dash_stream_eof;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.c b/debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.c
new file mode 100644
index 0000000..dd680c9
--- /dev/null
+++ b/debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.c
@@ -0,0 +1,1167 @@
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_mp4.h"
+#include <ngx_rtmp_codec_module.h>
+
+
+static ngx_int_t
+ngx_rtmp_mp4_field_32(ngx_buf_t *b, uint32_t n)
+{
+    u_char  bytes[4];
+
+    bytes[0] = ((uint32_t) n >> 24) & 0xFF;
+    bytes[1] = ((uint32_t) n >> 16) & 0xFF;
+    bytes[2] = ((uint32_t) n >> 8) & 0xFF;
+    bytes[3] = (uint32_t) n & 0xFF;
+
+    if (b->last + sizeof(bytes) > b->end) {
+        return NGX_ERROR;
+    }
+
+    b->last = ngx_cpymem(b->last, bytes, sizeof(bytes));
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_field_24(ngx_buf_t *b, uint32_t n)
+{
+    u_char  bytes[3];
+
+    bytes[0] = ((uint32_t) n >> 16) & 0xFF;
+    bytes[1] = ((uint32_t) n >> 8) & 0xFF;
+    bytes[2] = (uint32_t) n & 0xFF;
+
+    if (b->last + sizeof(bytes) > b->end) {
+        return NGX_ERROR;
+    }
+
+    b->last = ngx_cpymem(b->last, bytes, sizeof(bytes));
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_field_16(ngx_buf_t *b, uint16_t n)
+{
+    u_char  bytes[2];
+
+    bytes[0] = ((uint32_t) n >> 8) & 0xFF;
+    bytes[1] = (uint32_t) n & 0xFF;
+
+    if (b->last + sizeof(bytes) > b->end) {
+        return NGX_ERROR;
+    }
+
+    b->last = ngx_cpymem(b->last, bytes, sizeof(bytes));
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_field_8(ngx_buf_t *b, uint8_t n)
+{
+    u_char  bytes[1];
+
+    bytes[0] = n & 0xFF;
+
+    if (b->last + sizeof(bytes) > b->end) {
+        return NGX_ERROR;
+    }
+
+    b->last = ngx_cpymem(b->last, bytes, sizeof(bytes));
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_put_descr(ngx_buf_t *b, int tag, size_t size)
+{
+    ngx_rtmp_mp4_field_8(b, (uint8_t) tag);
+    ngx_rtmp_mp4_field_8(b, size & 0x7F);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_data(ngx_buf_t *b, void *data, size_t n)
+{
+    if (b->last + n > b->end) {
+        return NGX_ERROR;
+    }
+
+    b->last = ngx_cpymem(b->last, (u_char *) data, n);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_box(ngx_buf_t *b, const char box[4])
+{
+    if (b->last + 4 > b->end) {
+        return NGX_ERROR;
+    }
+
+    b->last = ngx_cpymem(b->last, (u_char *) box, 4);
+
+    return NGX_OK;
+}
+
+
+static u_char *
+ngx_rtmp_mp4_start_box(ngx_buf_t *b, const char box[4])
+{
+    u_char  *p;
+
+    p = b->last;
+
+    if (ngx_rtmp_mp4_field_32(b, 0) != NGX_OK) {
+        return NULL;
+    }
+
+    if (ngx_rtmp_mp4_box(b, box) != NGX_OK) {
+        return NULL;
+    }
+
+    return p;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_update_box_size(ngx_buf_t *b, u_char *p)
+{
+    u_char  *curpos;
+
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    curpos = b->last;
+
+    b->last = p;
+
+    ngx_rtmp_mp4_field_32(b, (uint32_t) (curpos - p));
+
+    b->last = curpos;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_matrix(ngx_buf_t *buf, uint32_t a, uint32_t b, uint32_t c,
+    uint32_t d, uint32_t tx, uint32_t ty)
+{
+
+/*
+ * transformation matrix
+ * |a  b  u|
+ * |c  d  v|
+ * |tx ty w|
+ */
+
+    ngx_rtmp_mp4_field_32(buf, a << 16);  /* 16.16 format */
+    ngx_rtmp_mp4_field_32(buf, b << 16);  /* 16.16 format */
+    ngx_rtmp_mp4_field_32(buf, 0);        /* u in 2.30 format */
+    ngx_rtmp_mp4_field_32(buf, c << 16);  /* 16.16 format */
+    ngx_rtmp_mp4_field_32(buf, d << 16);  /* 16.16 format */
+    ngx_rtmp_mp4_field_32(buf, 0);        /* v in 2.30 format */
+    ngx_rtmp_mp4_field_32(buf, tx << 16); /* 16.16 format */
+    ngx_rtmp_mp4_field_32(buf, ty << 16); /* 16.16 format */
+    ngx_rtmp_mp4_field_32(buf, 1 << 30);  /* w in 2.30 format */
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_mp4_write_ftyp(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "ftyp");
+
+    /* major brand */
+    ngx_rtmp_mp4_box(b, "iso6");
+
+    /* minor version */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    /* compatible brands */
+    ngx_rtmp_mp4_box(b, "isom");
+    ngx_rtmp_mp4_box(b, "iso6");
+    ngx_rtmp_mp4_box(b, "dash");
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_mp4_write_styp(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "styp");
+
+    /* major brand */
+    ngx_rtmp_mp4_box(b, "iso6");
+
+    /* minor version */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    /* compatible brands */
+    ngx_rtmp_mp4_box(b, "isom");
+    ngx_rtmp_mp4_box(b, "iso6");
+    ngx_rtmp_mp4_box(b, "dash");
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_mvhd(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "mvhd");
+
+    /* version */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* creation time */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* modification time */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* timescale */
+    ngx_rtmp_mp4_field_32(b, 1000);
+
+    /* duration */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0x00010000);
+    ngx_rtmp_mp4_field_16(b, 0x0100);
+    ngx_rtmp_mp4_field_16(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    ngx_rtmp_mp4_write_matrix(b, 1, 0, 0, 1, 0, 0);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* next track id */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_tkhd(ngx_rtmp_session_t *s, ngx_buf_t *b,
+    ngx_rtmp_mp4_track_type_t ttype)
+{
+    u_char                *pos;
+    ngx_rtmp_codec_ctx_t  *codec_ctx;
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    pos = ngx_rtmp_mp4_start_box(b, "tkhd");
+
+    /* version */
+    ngx_rtmp_mp4_field_8(b, 0);
+
+    /* flags: TrackEnabled */
+    ngx_rtmp_mp4_field_24(b, 0x0000000f);
+
+    /* creation time */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* modification time */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* track id */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* duration */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_16(b, ttype == NGX_RTMP_MP4_VIDEO_TRACK ?  0 : 0x0100);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_16(b, 0);
+
+    ngx_rtmp_mp4_write_matrix(b, 1, 0, 0, 1, 0, 0);
+
+    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
+        ngx_rtmp_mp4_field_32(b, (uint32_t) codec_ctx->width << 16);
+        ngx_rtmp_mp4_field_32(b, (uint32_t) codec_ctx->height << 16);
+    } else {
+        ngx_rtmp_mp4_field_32(b, 0);
+        ngx_rtmp_mp4_field_32(b, 0);
+    }
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_mdhd(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "mdhd");
+
+    /* version */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* creation time */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* modification time */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* time scale*/
+    ngx_rtmp_mp4_field_32(b, 1000);
+
+    /* duration */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* lanuguage */
+    ngx_rtmp_mp4_field_16(b, 0x15C7);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_16(b, 0);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_hdlr(ngx_buf_t *b, ngx_rtmp_mp4_track_type_t ttype)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "hdlr");
+
+    /* version and flags */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* pre defined */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
+        ngx_rtmp_mp4_box(b, "vide");
+    } else {
+        ngx_rtmp_mp4_box(b, "soun");
+    }
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
+        /* video handler string, NULL-terminated */
+        ngx_rtmp_mp4_data(b, "VideoHandler", sizeof("VideoHandler"));
+    } else {
+        /* sound handler string, NULL-terminated */
+        ngx_rtmp_mp4_data(b, "SoundHandler", sizeof("SoundHandler"));
+    }
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_vmhd(ngx_buf_t *b)
+{
+    /* size is always 20, apparently */
+    ngx_rtmp_mp4_field_32(b, 20);
+
+    ngx_rtmp_mp4_box(b, "vmhd");
+
+    /* version and flags */
+    ngx_rtmp_mp4_field_32(b, 0x01);
+
+    /* reserved (graphics mode=copy) */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_smhd(ngx_buf_t *b)
+{
+    /* size is always 16, apparently */
+    ngx_rtmp_mp4_field_32(b, 16);
+
+    ngx_rtmp_mp4_box(b, "smhd");
+
+    /* version and flags */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* reserved (balance normally=0) */
+    ngx_rtmp_mp4_field_16(b, 0);
+    ngx_rtmp_mp4_field_16(b, 0);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_dref(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "dref");
+
+    /* version and flags */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* entry count */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    /* url size */
+    ngx_rtmp_mp4_field_32(b, 0xc);
+
+    ngx_rtmp_mp4_box(b, "url ");
+
+    /* version and flags */
+    ngx_rtmp_mp4_field_32(b, 0x00000001);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_dinf(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "dinf");
+
+    ngx_rtmp_mp4_write_dref(b);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_avcc(ngx_rtmp_session_t *s, ngx_buf_t *b)
+{
+    u_char                *pos, *p;
+    ngx_chain_t           *in;
+    ngx_rtmp_codec_ctx_t  *codec_ctx;
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (codec_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    in = codec_ctx->avc_header;
+    if (in == NULL) {
+        return NGX_ERROR;
+    }
+
+    pos = ngx_rtmp_mp4_start_box(b, "avcC");
+
+    /* assume config fits one chunk (highly probable) */
+
+    /*
+     * Skip:
+     * - flv fmt
+     * - H264 CONF/PICT (0x00)
+     * - 0
+     * - 0
+     * - 0
+     */
+
+    p = in->buf->pos + 5;
+
+    if (p < in->buf->last) {
+        ngx_rtmp_mp4_data(b, p, (size_t) (in->buf->last - p));
+    } else {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "dash: invalid avcc received");
+    }
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_video(ngx_rtmp_session_t *s, ngx_buf_t *b)
+{
+    u_char                *pos;
+    ngx_rtmp_codec_ctx_t  *codec_ctx;
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    pos = ngx_rtmp_mp4_start_box(b, "avc1");
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_16(b, 0);
+
+    /* data reference index */
+    ngx_rtmp_mp4_field_16(b, 1);
+
+    /* codec stream version & revision */
+    ngx_rtmp_mp4_field_16(b, 0);
+    ngx_rtmp_mp4_field_16(b, 0);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* width & height */
+    ngx_rtmp_mp4_field_16(b, (uint16_t) codec_ctx->width);
+    ngx_rtmp_mp4_field_16(b, (uint16_t) codec_ctx->height);
+
+    /* horizontal & vertical resolutions 72 dpi */
+    ngx_rtmp_mp4_field_32(b, 0x00480000);
+    ngx_rtmp_mp4_field_32(b, 0x00480000);
+
+    /* data size */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* frame count */
+    ngx_rtmp_mp4_field_16(b, 1);
+
+    /* compressor name */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_16(b, 0x18);
+    ngx_rtmp_mp4_field_16(b, 0xffff);
+
+    ngx_rtmp_mp4_write_avcc(s, b);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_esds(ngx_rtmp_session_t *s, ngx_buf_t *b)
+{
+    size_t                 dsi_len;
+    u_char                *pos, *dsi;
+    ngx_buf_t             *db;
+    ngx_rtmp_codec_ctx_t  *codec_ctx;
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (codec_ctx == NULL || codec_ctx->aac_header == NULL) {
+        return NGX_ERROR;
+    }
+
+    db = codec_ctx->aac_header->buf;
+    if (db == NULL) {
+        return NGX_ERROR;
+    }
+
+    dsi = db->pos + 2;
+    if (dsi > db->last) {
+        return NGX_ERROR;
+    }
+
+    dsi_len = db->last - dsi;
+
+    pos = ngx_rtmp_mp4_start_box(b, "esds");
+
+    /* version */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+
+    /* ES Descriptor */
+
+    ngx_rtmp_mp4_put_descr(b, 0x03, 23 + dsi_len);
+
+    /* ES_ID */
+    ngx_rtmp_mp4_field_16(b, 1);
+
+    /* flags */
+    ngx_rtmp_mp4_field_8(b, 0);
+
+
+    /* DecoderConfig Descriptor */
+
+    ngx_rtmp_mp4_put_descr(b, 0x04, 15 + dsi_len);
+
+    /* objectTypeIndication: Audio ISO/IEC 14496-3 (AAC) */
+    ngx_rtmp_mp4_field_8(b, 0x40);
+
+    /* streamType: AudioStream */
+    ngx_rtmp_mp4_field_8(b, 0x15);
+
+    /* bufferSizeDB */
+    ngx_rtmp_mp4_field_24(b, 0);
+
+    /* maxBitrate */
+    ngx_rtmp_mp4_field_32(b, 0x0001F151);
+
+    /* avgBitrate */
+    ngx_rtmp_mp4_field_32(b, 0x0001F14D);
+
+
+    /* DecoderSpecificInfo Descriptor */
+
+    ngx_rtmp_mp4_put_descr(b, 0x05, dsi_len);
+    ngx_rtmp_mp4_data(b, dsi, dsi_len);
+
+
+    /* SL Descriptor */
+
+    ngx_rtmp_mp4_put_descr(b, 0x06, 1);
+    ngx_rtmp_mp4_field_8(b, 0x02);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_audio(ngx_rtmp_session_t *s, ngx_buf_t *b)
+{
+    u_char                *pos;
+    ngx_rtmp_codec_ctx_t  *codec_ctx;
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    pos = ngx_rtmp_mp4_start_box(b, "mp4a");
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_16(b, 0);
+
+    /* data reference index */
+    ngx_rtmp_mp4_field_16(b, 1);
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* channel count */
+    ngx_rtmp_mp4_field_16(b, (uint16_t) codec_ctx->audio_channels);
+
+    /* sample size */
+    ngx_rtmp_mp4_field_16(b, (uint16_t) (codec_ctx->sample_size * 8));
+
+    /* reserved */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* time scale */
+    ngx_rtmp_mp4_field_16(b, 1000);
+
+    /* sample rate */
+    ngx_rtmp_mp4_field_16(b, (uint16_t) codec_ctx->sample_rate);
+
+    ngx_rtmp_mp4_write_esds(s, b);
+#if 0
+    /* tag size*/
+    ngx_rtmp_mp4_field_32(b, 8);
+
+    /* null tag */
+    ngx_rtmp_mp4_field_32(b, 0);
+#endif
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_stsd(ngx_rtmp_session_t *s, ngx_buf_t *b,
+    ngx_rtmp_mp4_track_type_t ttype)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "stsd");
+
+    /* version & flags */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* entry count */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
+        ngx_rtmp_mp4_write_video(s, b);
+    } else {
+        ngx_rtmp_mp4_write_audio(s, b);
+    }
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_stts(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "stts");
+
+    ngx_rtmp_mp4_field_32(b, 0); /* version */
+    ngx_rtmp_mp4_field_32(b, 0); /* entry count */
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_stsc(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "stsc");
+
+    ngx_rtmp_mp4_field_32(b, 0); /* version */
+    ngx_rtmp_mp4_field_32(b, 0); /* entry count */
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_stsz(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "stsz");
+
+    ngx_rtmp_mp4_field_32(b, 0); /* version */
+    ngx_rtmp_mp4_field_32(b, 0); /* entry count */
+    ngx_rtmp_mp4_field_32(b, 0); /* moar zeros */
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_stco(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "stco");
+
+    ngx_rtmp_mp4_field_32(b, 0); /* version */
+    ngx_rtmp_mp4_field_32(b, 0); /* entry count */
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_stbl(ngx_rtmp_session_t *s, ngx_buf_t *b,
+    ngx_rtmp_mp4_track_type_t ttype)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "stbl");
+
+    ngx_rtmp_mp4_write_stsd(s, b, ttype);
+    ngx_rtmp_mp4_write_stts(b);
+    ngx_rtmp_mp4_write_stsc(b);
+    ngx_rtmp_mp4_write_stsz(b);
+    ngx_rtmp_mp4_write_stco(b);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_minf(ngx_rtmp_session_t *s, ngx_buf_t *b,
+    ngx_rtmp_mp4_track_type_t ttype)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "minf");
+
+    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
+        ngx_rtmp_mp4_write_vmhd(b);
+    } else {
+        ngx_rtmp_mp4_write_smhd(b);
+    }
+
+    ngx_rtmp_mp4_write_dinf(b);
+    ngx_rtmp_mp4_write_stbl(s, b, ttype);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_mdia(ngx_rtmp_session_t *s, ngx_buf_t *b,
+    ngx_rtmp_mp4_track_type_t ttype)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "mdia");
+
+    ngx_rtmp_mp4_write_mdhd(b);
+    ngx_rtmp_mp4_write_hdlr(b, ttype);
+    ngx_rtmp_mp4_write_minf(s, b, ttype);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+static ngx_int_t
+ngx_rtmp_mp4_write_trak(ngx_rtmp_session_t *s, ngx_buf_t *b,
+    ngx_rtmp_mp4_track_type_t ttype)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "trak");
+
+    ngx_rtmp_mp4_write_tkhd(s, b, ttype);
+    ngx_rtmp_mp4_write_mdia(s, b, ttype);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_mvex(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "mvex");
+
+    ngx_rtmp_mp4_field_32(b, 0x20);
+
+    ngx_rtmp_mp4_box(b, "trex");
+
+    /* version & flags */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* track id */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    /* default sample description index */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    /* default sample duration */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* default sample size, 1024 for AAC */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* default sample flags, key on */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_mp4_write_moov(ngx_rtmp_session_t *s, ngx_buf_t *b,
+    ngx_rtmp_mp4_track_type_t ttype)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "moov");
+
+    ngx_rtmp_mp4_write_mvhd(b);
+    ngx_rtmp_mp4_write_mvex(b);
+    ngx_rtmp_mp4_write_trak(s, b, ttype);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_tfhd(ngx_buf_t *b)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "tfhd");
+
+    /* version & flags */
+    ngx_rtmp_mp4_field_32(b, 0x00020000);
+
+    /* track id */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_tfdt(ngx_buf_t *b, uint32_t earliest_pres_time)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "tfdt");
+
+    /* version == 1 aka 64 bit integer */
+    ngx_rtmp_mp4_field_32(b, 0x00000000);
+    ngx_rtmp_mp4_field_32(b, earliest_pres_time);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_trun(ngx_buf_t *b, uint32_t sample_count,
+    ngx_rtmp_mp4_sample_t *samples, ngx_uint_t sample_mask, u_char *moof_pos)
+{
+    u_char    *pos;
+    uint32_t   i, offset, nitems, flags;
+
+    pos = ngx_rtmp_mp4_start_box(b, "trun");
+
+    nitems = 0;
+
+    /* data offset present */
+    flags = 0x01;
+
+    if (sample_mask & NGX_RTMP_MP4_SAMPLE_DURATION) {
+        nitems++;
+        flags |= 0x000100;
+    }
+
+    if (sample_mask & NGX_RTMP_MP4_SAMPLE_SIZE) {
+        nitems++;
+        flags |= 0x000200;
+    }
+
+    if (sample_mask & NGX_RTMP_MP4_SAMPLE_KEY) {
+        nitems++;
+        flags |= 0x000400;
+    }
+
+    if (sample_mask & NGX_RTMP_MP4_SAMPLE_DELAY) {
+        nitems++;
+        flags |= 0x000800;
+    }
+
+    offset = (pos - moof_pos) + 20 + (sample_count * nitems * 4) + 8;
+
+    ngx_rtmp_mp4_field_32(b, flags);
+    ngx_rtmp_mp4_field_32(b, sample_count);
+    ngx_rtmp_mp4_field_32(b, offset);
+
+    for (i = 0; i < sample_count; i++, samples++) {
+
+        if (sample_mask & NGX_RTMP_MP4_SAMPLE_DURATION) {
+            ngx_rtmp_mp4_field_32(b, samples->duration);
+        }
+
+        if (sample_mask & NGX_RTMP_MP4_SAMPLE_SIZE) {
+            ngx_rtmp_mp4_field_32(b, samples->size);
+        }
+
+        if (sample_mask & NGX_RTMP_MP4_SAMPLE_KEY) {
+            ngx_rtmp_mp4_field_32(b, samples->key ? 0x00000000 : 0x00010000);
+        }
+
+        if (sample_mask & NGX_RTMP_MP4_SAMPLE_DELAY) {
+            ngx_rtmp_mp4_field_32(b, samples->delay);
+        }
+    }
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_traf(ngx_buf_t *b, uint32_t earliest_pres_time,
+    uint32_t sample_count, ngx_rtmp_mp4_sample_t *samples,
+    ngx_uint_t sample_mask, u_char *moof_pos)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "traf");
+
+    ngx_rtmp_mp4_write_tfhd(b);
+    ngx_rtmp_mp4_write_tfdt(b, earliest_pres_time);
+    ngx_rtmp_mp4_write_trun(b, sample_count, samples, sample_mask, moof_pos);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_write_mfhd(ngx_buf_t *b, uint32_t index)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "mfhd");
+
+    /* don't know what this is */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* fragment index. */
+    ngx_rtmp_mp4_field_32(b, index);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_mp4_write_sidx(ngx_buf_t *b, ngx_uint_t reference_size,
+    uint32_t earliest_pres_time, uint32_t latest_pres_time)
+{
+    u_char    *pos;
+    uint32_t   duration;
+
+    duration = latest_pres_time - earliest_pres_time;
+
+    pos = ngx_rtmp_mp4_start_box(b, "sidx");
+
+    /* version */
+    ngx_rtmp_mp4_field_32(b, 0);
+
+    /* reference id */
+    ngx_rtmp_mp4_field_32(b, 1);
+
+    /* timescale */
+    ngx_rtmp_mp4_field_32(b, 1000);
+
+    /* earliest presentation time */
+    ngx_rtmp_mp4_field_32(b, earliest_pres_time);
+
+    /* first offset */
+    ngx_rtmp_mp4_field_32(b, duration); /*TODO*/
+
+    /* reserved */
+    ngx_rtmp_mp4_field_16(b, 0);
+
+    /* reference count = 1 */
+    ngx_rtmp_mp4_field_16(b, 1);
+
+    /* 1st bit is reference type, the rest is reference size */
+    ngx_rtmp_mp4_field_32(b, reference_size);
+
+    /* subsegment duration */
+    ngx_rtmp_mp4_field_32(b, duration);
+
+    /* first bit is startsWithSAP (=1), next 3 bits are SAP type (=001) */
+    ngx_rtmp_mp4_field_8(b, 0x90);
+
+    /* SAP delta time */
+    ngx_rtmp_mp4_field_24(b, 0);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_mp4_write_moof(ngx_buf_t *b, uint32_t earliest_pres_time,
+    uint32_t sample_count, ngx_rtmp_mp4_sample_t *samples,
+    ngx_uint_t sample_mask, uint32_t index)
+{
+    u_char  *pos;
+
+    pos = ngx_rtmp_mp4_start_box(b, "moof");
+
+    ngx_rtmp_mp4_write_mfhd(b, index);
+    ngx_rtmp_mp4_write_traf(b, earliest_pres_time, sample_count, samples,
+                            sample_mask, pos);
+
+    ngx_rtmp_mp4_update_box_size(b, pos);
+
+    return NGX_OK;
+}
+
+
+ngx_uint_t
+ngx_rtmp_mp4_write_mdat(ngx_buf_t *b, ngx_uint_t size)
+{
+    ngx_rtmp_mp4_field_32(b, size);
+
+    ngx_rtmp_mp4_box(b, "mdat");
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.h b/debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.h
new file mode 100644
index 0000000..697b6c8
--- /dev/null
+++ b/debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.h
@@ -0,0 +1,52 @@
+
+
+#ifndef _NGX_RTMP_MP4_H_INCLUDED_
+#define _NGX_RTMP_MP4_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_rtmp.h>
+
+
+#define NGX_RTMP_MP4_SAMPLE_SIZE        0x01
+#define NGX_RTMP_MP4_SAMPLE_DURATION    0x02
+#define NGX_RTMP_MP4_SAMPLE_DELAY       0x04
+#define NGX_RTMP_MP4_SAMPLE_KEY         0x08
+
+
+typedef struct {
+    uint32_t        size;
+    uint32_t        duration;
+    uint32_t        delay;
+    uint32_t        timestamp;
+    unsigned        key:1;
+} ngx_rtmp_mp4_sample_t;
+
+
+typedef enum {
+    NGX_RTMP_MP4_FILETYPE_INIT,
+    NGX_RTMP_MP4_FILETYPE_SEG
+} ngx_rtmp_mp4_file_type_t;
+
+
+typedef enum {
+    NGX_RTMP_MP4_VIDEO_TRACK,
+    NGX_RTMP_MP4_AUDIO_TRACK
+} ngx_rtmp_mp4_track_type_t;
+
+
+ngx_int_t ngx_rtmp_mp4_write_ftyp(ngx_buf_t *b);
+ngx_int_t ngx_rtmp_mp4_write_styp(ngx_buf_t *b);
+ngx_int_t ngx_rtmp_mp4_write_moov(ngx_rtmp_session_t *s, ngx_buf_t *b,
+    ngx_rtmp_mp4_track_type_t ttype);
+ngx_int_t ngx_rtmp_mp4_write_moof(ngx_buf_t *b, uint32_t earliest_pres_time,
+    uint32_t sample_count, ngx_rtmp_mp4_sample_t *samples,
+    ngx_uint_t sample_mask, uint32_t index);
+ngx_int_t ngx_rtmp_mp4_write_sidx(ngx_buf_t *b,
+    ngx_uint_t reference_size, uint32_t earliest_pres_time,
+    uint32_t latest_pres_time);
+ngx_uint_t ngx_rtmp_mp4_write_mdat(ngx_buf_t *b, ngx_uint_t size);
+
+
+#endif /* _NGX_RTMP_MP4_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/doc/README.md b/debian/modules/nginx-rtmp/doc/README.md
new file mode 100644
index 0000000..407efa7
--- /dev/null
+++ b/debian/modules/nginx-rtmp/doc/README.md
@@ -0,0 +1,2 @@
+Documentation is available here:
+https://github.com/arut/nginx-rtmp-module/wiki
diff --git a/debian/modules/nginx-rtmp/hls/ngx_rtmp_hls_module.c b/debian/modules/nginx-rtmp/hls/ngx_rtmp_hls_module.c
new file mode 100644
index 0000000..9f6779c
--- /dev/null
+++ b/debian/modules/nginx-rtmp/hls/ngx_rtmp_hls_module.c
@@ -0,0 +1,2458 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_rtmp.h>
+#include <ngx_rtmp_cmd_module.h>
+#include <ngx_rtmp_codec_module.h>
+#include "ngx_rtmp_mpegts.h"
+
+
+static ngx_rtmp_publish_pt              next_publish;
+static ngx_rtmp_close_stream_pt         next_close_stream;
+static ngx_rtmp_stream_begin_pt         next_stream_begin;
+static ngx_rtmp_stream_eof_pt           next_stream_eof;
+
+
+static char * ngx_rtmp_hls_variant(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static ngx_int_t ngx_rtmp_hls_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_hls_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+static ngx_int_t ngx_rtmp_hls_flush_audio(ngx_rtmp_session_t *s);
+static ngx_int_t ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s,
+       ngx_str_t *path);
+
+
+#define NGX_RTMP_HLS_BUFSIZE            (1024*1024)
+#define NGX_RTMP_HLS_DIR_ACCESS         0744
+
+
+typedef struct {
+    uint64_t                            id;
+    uint64_t                            key_id;
+    double                              duration;
+    unsigned                            active:1;
+    unsigned                            discont:1; /* before */
+} ngx_rtmp_hls_frag_t;
+
+
+typedef struct {
+    ngx_str_t                           suffix;
+    ngx_array_t                         args;
+} ngx_rtmp_hls_variant_t;
+
+
+typedef struct {
+    unsigned                            opened:1;
+
+    ngx_rtmp_mpegts_file_t              file;
+
+    ngx_str_t                           playlist;
+    ngx_str_t                           playlist_bak;
+    ngx_str_t                           var_playlist;
+    ngx_str_t                           var_playlist_bak;
+    ngx_str_t                           stream;
+    ngx_str_t                           keyfile;
+    ngx_str_t                           name;
+    u_char                              key[16];
+
+    uint64_t                            frag;
+    uint64_t                            frag_ts;
+    uint64_t                            key_id;
+    ngx_uint_t                          nfrags;
+    ngx_rtmp_hls_frag_t                *frags; /* circular 2 * winfrags + 1 */
+
+    ngx_uint_t                          audio_cc;
+    ngx_uint_t                          video_cc;
+    ngx_uint_t                          key_frags;
+
+    uint64_t                            aframe_base;
+    uint64_t                            aframe_num;
+
+    ngx_buf_t                          *aframe;
+    uint64_t                            aframe_pts;
+
+    ngx_rtmp_hls_variant_t             *var;
+} ngx_rtmp_hls_ctx_t;
+
+
+typedef struct {
+    ngx_str_t                           path;
+    ngx_msec_t                          playlen;
+    ngx_uint_t                          frags_per_key;
+} ngx_rtmp_hls_cleanup_t;
+
+
+typedef struct {
+    ngx_flag_t                          hls;
+    ngx_msec_t                          fraglen;
+    ngx_msec_t                          max_fraglen;
+    ngx_msec_t                          muxdelay;
+    ngx_msec_t                          sync;
+    ngx_msec_t                          playlen;
+    ngx_uint_t                          winfrags;
+    ngx_flag_t                          continuous;
+    ngx_flag_t                          nested;
+    ngx_str_t                           path;
+    ngx_uint_t                          naming;
+    ngx_uint_t                          slicing;
+    ngx_uint_t                          type;
+    ngx_path_t                         *slot;
+    ngx_msec_t                          max_audio_delay;
+    size_t                              audio_buffer_size;
+    ngx_flag_t                          cleanup;
+    ngx_array_t                        *variant;
+    ngx_str_t                           base_url;
+    ngx_int_t                           granularity;
+    ngx_flag_t                          keys;
+    ngx_str_t                           key_path;
+    ngx_str_t                           key_url;
+    ngx_uint_t                          frags_per_key;
+} ngx_rtmp_hls_app_conf_t;
+
+
+#define NGX_RTMP_HLS_NAMING_SEQUENTIAL  1
+#define NGX_RTMP_HLS_NAMING_TIMESTAMP   2
+#define NGX_RTMP_HLS_NAMING_SYSTEM      3
+
+
+#define NGX_RTMP_HLS_SLICING_PLAIN      1
+#define NGX_RTMP_HLS_SLICING_ALIGNED    2
+
+
+#define NGX_RTMP_HLS_TYPE_LIVE          1
+#define NGX_RTMP_HLS_TYPE_EVENT         2
+
+
+static ngx_conf_enum_t                  ngx_rtmp_hls_naming_slots[] = {
+    { ngx_string("sequential"),         NGX_RTMP_HLS_NAMING_SEQUENTIAL },
+    { ngx_string("timestamp"),          NGX_RTMP_HLS_NAMING_TIMESTAMP  },
+    { ngx_string("system"),             NGX_RTMP_HLS_NAMING_SYSTEM     },
+    { ngx_null_string,                  0 }
+};
+
+
+static ngx_conf_enum_t                  ngx_rtmp_hls_slicing_slots[] = {
+    { ngx_string("plain"),              NGX_RTMP_HLS_SLICING_PLAIN },
+    { ngx_string("aligned"),            NGX_RTMP_HLS_SLICING_ALIGNED  },
+    { ngx_null_string,                  0 }
+};
+
+
+static ngx_conf_enum_t                  ngx_rtmp_hls_type_slots[] = {
+    { ngx_string("live"),               NGX_RTMP_HLS_TYPE_LIVE  },
+    { ngx_string("event"),              NGX_RTMP_HLS_TYPE_EVENT },
+    { ngx_null_string,                  0 }
+};
+
+
+static ngx_command_t ngx_rtmp_hls_commands[] = {
+
+    { ngx_string("hls"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, hls),
+      NULL },
+
+    { ngx_string("hls_fragment"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, fraglen),
+      NULL },
+
+    { ngx_string("hls_max_fragment"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, max_fraglen),
+      NULL },
+
+    { ngx_string("hls_path"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, path),
+      NULL },
+
+    { ngx_string("hls_playlist_length"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, playlen),
+      NULL },
+
+    { ngx_string("hls_muxdelay"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, muxdelay),
+      NULL },
+
+    { ngx_string("hls_sync"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, sync),
+      NULL },
+
+    { ngx_string("hls_continuous"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, continuous),
+      NULL },
+
+    { ngx_string("hls_nested"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, nested),
+      NULL },
+
+    { ngx_string("hls_fragment_naming"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_enum_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, naming),
+      &ngx_rtmp_hls_naming_slots },
+
+    { ngx_string("hls_fragment_slicing"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_enum_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, slicing),
+      &ngx_rtmp_hls_slicing_slots },
+
+    { ngx_string("hls_type"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_enum_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, type),
+      &ngx_rtmp_hls_type_slots },
+
+    { ngx_string("hls_max_audio_delay"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, max_audio_delay),
+      NULL },
+
+    { ngx_string("hls_audio_buffer_size"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, audio_buffer_size),
+      NULL },
+
+    { ngx_string("hls_cleanup"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, cleanup),
+      NULL },
+
+    { ngx_string("hls_variant"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_hls_variant,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("hls_base_url"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, base_url),
+      NULL },
+
+    { ngx_string("hls_fragment_naming_granularity"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, granularity),
+      NULL },
+
+    { ngx_string("hls_keys"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, keys),
+      NULL },
+
+    { ngx_string("hls_key_path"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, key_path),
+      NULL },
+
+    { ngx_string("hls_key_url"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, key_url),
+      NULL },
+
+    { ngx_string("hls_fragments_per_key"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_hls_app_conf_t, frags_per_key),
+      NULL },
+
+    ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_hls_module_ctx = {
+    NULL,                               /* preconfiguration */
+    ngx_rtmp_hls_postconfiguration,     /* postconfiguration */
+
+    NULL,                               /* create main configuration */
+    NULL,                               /* init main configuration */
+
+    NULL,                               /* create server configuration */
+    NULL,                               /* merge server configuration */
+
+    ngx_rtmp_hls_create_app_conf,       /* create location configuration */
+    ngx_rtmp_hls_merge_app_conf,        /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_hls_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_hls_module_ctx,           /* module context */
+    ngx_rtmp_hls_commands,              /* module directives */
+    NGX_RTMP_MODULE,                    /* module type */
+    NULL,                               /* init master */
+    NULL,                               /* init module */
+    NULL,                               /* init process */
+    NULL,                               /* init thread */
+    NULL,                               /* exit thread */
+    NULL,                               /* exit process */
+    NULL,                               /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_rtmp_hls_frag_t *
+ngx_rtmp_hls_get_frag(ngx_rtmp_session_t *s, ngx_int_t n)
+{
+    ngx_rtmp_hls_ctx_t         *ctx;
+    ngx_rtmp_hls_app_conf_t    *hacf;
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    return &ctx->frags[(ctx->frag + n) % (hacf->winfrags * 2 + 1)];
+}
+
+
+static void
+ngx_rtmp_hls_next_frag(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_hls_ctx_t         *ctx;
+    ngx_rtmp_hls_app_conf_t    *hacf;
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    if (ctx->nfrags == hacf->winfrags) {
+        ctx->frag++;
+    } else {
+        ctx->nfrags++;
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_rename_file(u_char *src, u_char *dst)
+{
+    /* rename file with overwrite */
+
+#if (NGX_WIN32)
+    return MoveFileEx((LPCTSTR) src, (LPCTSTR) dst, MOVEFILE_REPLACE_EXISTING);
+#else
+    return ngx_rename_file(src, dst);
+#endif
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_write_variant_playlist(ngx_rtmp_session_t *s)
+{
+    static u_char             buffer[1024];
+
+    u_char                   *p, *last;
+    ssize_t                   rc;
+    ngx_fd_t                  fd;
+    ngx_str_t                *arg;
+    ngx_uint_t                n, k;
+    ngx_rtmp_hls_ctx_t       *ctx;
+    ngx_rtmp_hls_variant_t   *var;
+    ngx_rtmp_hls_app_conf_t  *hacf;
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    fd = ngx_open_file(ctx->var_playlist_bak.data, NGX_FILE_WRONLY,
+                       NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
+
+    if (fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "hls: " ngx_open_file_n " failed: '%V'",
+                      &ctx->var_playlist_bak);
+
+        return NGX_ERROR;
+    }
+
+#define NGX_RTMP_HLS_VAR_HEADER "#EXTM3U\n#EXT-X-VERSION:3\n"
+
+    rc = ngx_write_fd(fd, NGX_RTMP_HLS_VAR_HEADER,
+                      sizeof(NGX_RTMP_HLS_VAR_HEADER) - 1);
+    if (rc < 0) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "hls: " ngx_write_fd_n " failed: '%V'",
+                      &ctx->var_playlist_bak);
+        ngx_close_file(fd);
+        return NGX_ERROR;
+    }
+
+    var = hacf->variant->elts;
+    for (n = 0; n < hacf->variant->nelts; n++, var++)
+    {
+        p = buffer;
+        last = buffer + sizeof(buffer);
+
+        p = ngx_slprintf(p, last, "#EXT-X-STREAM-INF:PROGRAM-ID=1");
+
+        arg = var->args.elts;
+        for (k = 0; k < var->args.nelts; k++, arg++) {
+            p = ngx_slprintf(p, last, ",%V", arg);
+        }
+
+        if (p < last) {
+            *p++ = '\n';
+        }
+
+        p = ngx_slprintf(p, last, "%V%*s%V",
+                         &hacf->base_url,
+                         ctx->name.len - ctx->var->suffix.len, ctx->name.data,
+                         &var->suffix);
+        if (hacf->nested) {
+            p = ngx_slprintf(p, last, "%s", "/index");
+        }
+
+        p = ngx_slprintf(p, last, "%s", ".m3u8\n");
+
+        rc = ngx_write_fd(fd, buffer, p - buffer);
+        if (rc < 0) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                          "hls: " ngx_write_fd_n " failed '%V'",
+                          &ctx->var_playlist_bak);
+            ngx_close_file(fd);
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_close_file(fd);
+
+    if (ngx_rtmp_hls_rename_file(ctx->var_playlist_bak.data,
+                                 ctx->var_playlist.data)
+        == NGX_FILE_ERROR)
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "hls: rename failed: '%V'->'%V'",
+                      &ctx->var_playlist_bak, &ctx->var_playlist);
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_write_playlist(ngx_rtmp_session_t *s)
+{
+    static u_char                   buffer[1024];
+    ngx_fd_t                        fd;
+    u_char                         *p, *end;
+    ngx_rtmp_hls_ctx_t             *ctx;
+    ssize_t                         n;
+    ngx_rtmp_hls_app_conf_t        *hacf;
+    ngx_rtmp_hls_frag_t            *f;
+    ngx_uint_t                      i, max_frag;
+    ngx_str_t                       name_part, key_name_part;
+    uint64_t                        prev_key_id;
+    const char                     *sep, *key_sep;
+
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    fd = ngx_open_file(ctx->playlist_bak.data, NGX_FILE_WRONLY,
+                       NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
+
+    if (fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "hls: " ngx_open_file_n " failed: '%V'",
+                      &ctx->playlist_bak);
+        return NGX_ERROR;
+    }
+
+    max_frag = hacf->fraglen / 1000;
+
+    for (i = 0; i < ctx->nfrags; i++) {
+        f = ngx_rtmp_hls_get_frag(s, i);
+        if (f->duration > max_frag) {
+            max_frag = (ngx_uint_t) (f->duration + .5);
+        }
+    }
+
+    p = buffer;
+    end = p + sizeof(buffer);
+
+    p = ngx_slprintf(p, end,
+                     "#EXTM3U\n"
+                     "#EXT-X-VERSION:3\n"
+                     "#EXT-X-MEDIA-SEQUENCE:%uL\n"
+                     "#EXT-X-TARGETDURATION:%ui\n",
+                     ctx->frag, max_frag);
+
+    if (hacf->type == NGX_RTMP_HLS_TYPE_EVENT) {
+        p = ngx_slprintf(p, end, "#EXT-X-PLAYLIST-TYPE: EVENT\n");
+    }
+
+    n = ngx_write_fd(fd, buffer, p - buffer);
+    if (n < 0) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "hls: " ngx_write_fd_n " failed: '%V'",
+                      &ctx->playlist_bak);
+        ngx_close_file(fd);
+        return NGX_ERROR;
+    }
+
+    sep = hacf->nested ? (hacf->base_url.len ? "/" : "") : "-";
+    key_sep = hacf->nested ? (hacf->key_url.len ? "/" : "") : "-";
+
+    name_part.len = 0;
+    if (!hacf->nested || hacf->base_url.len) {
+        name_part = ctx->name;
+    }
+
+    key_name_part.len = 0;
+    if (!hacf->nested || hacf->key_url.len) {
+        key_name_part = ctx->name;
+    }
+
+    prev_key_id = 0;
+
+    for (i = 0; i < ctx->nfrags; i++) {
+        f = ngx_rtmp_hls_get_frag(s, i);
+
+        p = buffer;
+        end = p + sizeof(buffer);
+
+        if (f->discont) {
+            p = ngx_slprintf(p, end, "#EXT-X-DISCONTINUITY\n");
+        }
+
+        if (hacf->keys && (i == 0 || f->key_id != prev_key_id)) {
+            p = ngx_slprintf(p, end, "#EXT-X-KEY:METHOD=AES-128,"
+                             "URI=\"%V%V%s%uL.key\",IV=0x%032XL\n",
+                             &hacf->key_url, &key_name_part,
+                             key_sep, f->key_id, f->key_id);
+        }
+
+        prev_key_id = f->key_id;
+
+        p = ngx_slprintf(p, end,
+                         "#EXTINF:%.3f,\n"
+                         "%V%V%s%uL.ts\n",
+                         f->duration, &hacf->base_url, &name_part, sep, f->id);
+
+        ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "hls: fragment frag=%uL, n=%ui/%ui, duration=%.3f, "
+                       "discont=%i",
+                       ctx->frag, i + 1, ctx->nfrags, f->duration, f->discont);
+
+        n = ngx_write_fd(fd, buffer, p - buffer);
+        if (n < 0) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                          "hls: " ngx_write_fd_n " failed '%V'",
+                          &ctx->playlist_bak);
+            ngx_close_file(fd);
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_close_file(fd);
+
+    if (ngx_rtmp_hls_rename_file(ctx->playlist_bak.data, ctx->playlist.data)
+        == NGX_FILE_ERROR)
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "hls: rename failed: '%V'->'%V'",
+                      &ctx->playlist_bak, &ctx->playlist);
+        return NGX_ERROR;
+    }
+
+    if (ctx->var) {
+        return ngx_rtmp_hls_write_variant_playlist(s);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_copy(ngx_rtmp_session_t *s, void *dst, u_char **src, size_t n,
+    ngx_chain_t **in)
+{
+    u_char  *last;
+    size_t   pn;
+
+    if (*in == NULL) {
+        return NGX_ERROR;
+    }
+
+    for ( ;; ) {
+        last = (*in)->buf->last;
+
+        if ((size_t)(last - *src) >= n) {
+            if (dst) {
+                ngx_memcpy(dst, *src, n);
+            }
+
+            *src += n;
+
+            while (*in && *src == (*in)->buf->last) {
+                *in = (*in)->next;
+                if (*in) {
+                    *src = (*in)->buf->pos;
+                }
+            }
+
+            return NGX_OK;
+        }
+
+        pn = last - *src;
+
+        if (dst) {
+            ngx_memcpy(dst, *src, pn);
+            dst = (u_char *)dst + pn;
+        }
+
+        n -= pn;
+        *in = (*in)->next;
+
+        if (*in == NULL) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "hls: failed to read %uz byte(s)", n);
+            return NGX_ERROR;
+        }
+
+        *src = (*in)->buf->pos;
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_append_aud(ngx_rtmp_session_t *s, ngx_buf_t *out)
+{
+    static u_char   aud_nal[] = { 0x00, 0x00, 0x00, 0x01, 0x09, 0xf0 };
+
+    if (out->last + sizeof(aud_nal) > out->end) {
+        return NGX_ERROR;
+    }
+
+    out->last = ngx_cpymem(out->last, aud_nal, sizeof(aud_nal));
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_append_sps_pps(ngx_rtmp_session_t *s, ngx_buf_t *out)
+{
+    ngx_rtmp_codec_ctx_t           *codec_ctx;
+    u_char                         *p;
+    ngx_chain_t                    *in;
+    ngx_rtmp_hls_ctx_t             *ctx;
+    int8_t                          nnals;
+    uint16_t                        len, rlen;
+    ngx_int_t                       n;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (ctx == NULL || codec_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    in = codec_ctx->avc_header;
+    if (in == NULL) {
+        return NGX_ERROR;
+    }
+
+    p = in->buf->pos;
+
+    /*
+     * Skip bytes:
+     * - flv fmt
+     * - H264 CONF/PICT (0x00)
+     * - 0
+     * - 0
+     * - 0
+     * - version
+     * - profile
+     * - compatibility
+     * - level
+     * - nal bytes
+     */
+
+    if (ngx_rtmp_hls_copy(s, NULL, &p, 10, &in) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    /* number of SPS NALs */
+    if (ngx_rtmp_hls_copy(s, &nnals, &p, 1, &in) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    nnals &= 0x1f; /* 5lsb */
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: SPS number: %uz", nnals);
+
+    /* SPS */
+    for (n = 0; ; ++n) {
+        for (; nnals; --nnals) {
+
+            /* NAL length */
+            if (ngx_rtmp_hls_copy(s, &rlen, &p, 2, &in) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            ngx_rtmp_rmemcpy(&len, &rlen, 2);
+
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "hls: header NAL length: %uz", (size_t) len);
+
+            /* AnnexB prefix */
+            if (out->end - out->last < 4) {
+                ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                              "hls: too small buffer for header NAL size");
+                return NGX_ERROR;
+            }
+
+            *out->last++ = 0;
+            *out->last++ = 0;
+            *out->last++ = 0;
+            *out->last++ = 1;
+
+            /* NAL body */
+            if (out->end - out->last < len) {
+                ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                              "hls: too small buffer for header NAL");
+                return NGX_ERROR;
+            }
+
+            if (ngx_rtmp_hls_copy(s, out->last, &p, len, &in) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            out->last += len;
+        }
+
+        if (n == 1) {
+            break;
+        }
+
+        /* number of PPS NALs */
+        if (ngx_rtmp_hls_copy(s, &nnals, &p, 1, &in) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "hls: PPS number: %uz", nnals);
+    }
+
+    return NGX_OK;
+}
+
+
+static uint64_t
+ngx_rtmp_hls_get_fragment_id(ngx_rtmp_session_t *s, uint64_t ts)
+{
+    ngx_rtmp_hls_ctx_t         *ctx;
+    ngx_rtmp_hls_app_conf_t    *hacf;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+
+    switch (hacf->naming) {
+
+    case NGX_RTMP_HLS_NAMING_TIMESTAMP:
+        return ts;
+
+    case NGX_RTMP_HLS_NAMING_SYSTEM:
+        return (uint64_t) ngx_cached_time->sec * 1000 + ngx_cached_time->msec;
+
+    default: /* NGX_RTMP_HLS_NAMING_SEQUENTIAL */
+        return ctx->frag + ctx->nfrags;
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_close_fragment(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_hls_ctx_t         *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+    if (ctx == NULL || !ctx->opened) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: close fragment n=%uL", ctx->frag);
+
+    ngx_rtmp_mpegts_close_file(&ctx->file);
+
+    ctx->opened = 0;
+
+    ngx_rtmp_hls_next_frag(s);
+
+    ngx_rtmp_hls_write_playlist(s);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
+    ngx_int_t discont)
+{
+    uint64_t                  id;
+    ngx_fd_t                  fd;
+    ngx_uint_t                g;
+    ngx_rtmp_hls_ctx_t       *ctx;
+    ngx_rtmp_hls_frag_t      *f;
+    ngx_rtmp_hls_app_conf_t  *hacf;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    if (ctx->opened) {
+        return NGX_OK;
+    }
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+
+    if (ngx_rtmp_hls_ensure_directory(s, &hacf->path) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (hacf->keys &&
+        ngx_rtmp_hls_ensure_directory(s, &hacf->key_path) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    id = ngx_rtmp_hls_get_fragment_id(s, ts);
+
+    if (hacf->granularity) {
+        g = (ngx_uint_t) hacf->granularity;
+        id = (uint64_t) (id / g) * g;
+    }
+
+    ngx_sprintf(ctx->stream.data + ctx->stream.len, "%uL.ts%Z", id);
+
+    if (hacf->keys) {
+        if (ctx->key_frags == 0) {
+
+            ctx->key_frags = hacf->frags_per_key - 1;
+            ctx->key_id = id;
+
+            if (RAND_bytes(ctx->key, 16) < 0) {
+                ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                              "hls: failed to create key");
+                return NGX_ERROR;
+            }
+
+            ngx_sprintf(ctx->keyfile.data + ctx->keyfile.len, "%uL.key%Z", id);
+
+            fd = ngx_open_file(ctx->keyfile.data, NGX_FILE_WRONLY,
+                               NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
+
+            if (fd == NGX_INVALID_FILE) {
+                ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                              "hls: failed to open key file '%s'",
+                              ctx->keyfile.data);
+                return NGX_ERROR;
+            }
+
+            if (ngx_write_fd(fd, ctx->key, 16) != 16) {
+                ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                              "hls: failed to write key file '%s'",
+                              ctx->keyfile.data);
+                ngx_close_file(fd);
+                return NGX_ERROR;
+            }
+
+            ngx_close_file(fd);
+
+        } else {
+            if (hacf->frags_per_key) {
+                ctx->key_frags--;
+            }
+
+            if (ngx_set_file_time(ctx->keyfile.data, 0, ngx_cached_time->sec)
+                != NGX_OK)
+            {
+                ngx_log_error(NGX_LOG_ALERT, s->connection->log, ngx_errno,
+                              ngx_set_file_time_n " '%s' failed",
+                              ctx->keyfile.data);
+            }
+        }
+    }
+
+    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: open fragment file='%s', keyfile='%s', "
+                   "frag=%uL, n=%ui, time=%uL, discont=%i",
+                   ctx->stream.data,
+                   ctx->keyfile.data ? ctx->keyfile.data : (u_char *) "",
+                   ctx->frag, ctx->nfrags, ts, discont);
+
+    if (hacf->keys &&
+        ngx_rtmp_mpegts_init_encryption(&ctx->file, ctx->key, 16, ctx->key_id)
+        != NGX_OK)
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "hls: failed to initialize hls encryption");
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_mpegts_open_file(&ctx->file, ctx->stream.data,
+                                  s->connection->log)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ctx->opened = 1;
+
+    f = ngx_rtmp_hls_get_frag(s, ctx->nfrags);
+
+    ngx_memzero(f, sizeof(*f));
+
+    f->active = 1;
+    f->discont = discont;
+    f->id = id;
+    f->key_id = ctx->key_id;
+
+    ctx->frag_ts = ts;
+
+    /* start fragment with audio to make iPhone happy */
+
+    ngx_rtmp_hls_flush_audio(s);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_hls_restore_stream(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_hls_ctx_t             *ctx;
+    ngx_file_t                      file;
+    ssize_t                         ret;
+    off_t                           offset;
+    u_char                         *p, *last, *end, *next, *pa, *pp, c;
+    ngx_rtmp_hls_frag_t            *f;
+    double                          duration;
+    ngx_int_t                       discont;
+    uint64_t                        mag, key_id, base;
+    static u_char                   buffer[4096];
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    ngx_memzero(&file, sizeof(file));
+
+    file.log = s->connection->log;
+
+    ngx_str_set(&file.name, "m3u8");
+
+    file.fd = ngx_open_file(ctx->playlist.data, NGX_FILE_RDONLY, NGX_FILE_OPEN,
+                            0);
+    if (file.fd == NGX_INVALID_FILE) {
+        return;
+    }
+
+    offset = 0;
+    ctx->nfrags = 0;
+    f = NULL;
+    duration = 0;
+    discont = 0;
+    key_id = 0;
+
+    for ( ;; ) {
+
+        ret = ngx_read_file(&file, buffer, sizeof(buffer), offset);
+        if (ret <= 0) {
+            goto done;
+        }
+
+        p = buffer;
+        end = buffer + ret;
+
+        for ( ;; ) {
+            last = ngx_strlchr(p, end, '\n');
+
+            if (last == NULL) {
+                if (p == buffer) {
+                    goto done;
+                }
+                break;
+            }
+
+            next = last + 1;
+            offset += (next - p);
+
+            if (p != last && last[-1] == '\r') {
+                last--;
+            }
+
+
+#define NGX_RTMP_MSEQ           "#EXT-X-MEDIA-SEQUENCE:"
+#define NGX_RTMP_MSEQ_LEN       (sizeof(NGX_RTMP_MSEQ) - 1)
+
+
+            if (ngx_memcmp(p, NGX_RTMP_MSEQ, NGX_RTMP_MSEQ_LEN) == 0) {
+
+                ctx->frag = (uint64_t) strtod((const char *)
+                                              &p[NGX_RTMP_MSEQ_LEN], NULL);
+
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "hls: restore sequence frag=%uL", ctx->frag);
+            }
+
+
+#define NGX_RTMP_XKEY           "#EXT-X-KEY:"
+#define NGX_RTMP_XKEY_LEN       (sizeof(NGX_RTMP_XKEY) - 1)
+
+            if (ngx_memcmp(p, NGX_RTMP_XKEY, NGX_RTMP_XKEY_LEN) == 0) {
+
+                /* recover key id from initialization vector */
+
+                key_id = 0;
+                base = 1;
+                pp = last - 1;
+
+                for ( ;; ) {
+                    if (pp < p) {
+                        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                                "hls: failed to read key id");
+                        break;
+                    }
+
+                    c = *pp;
+                    if (c == 'x') {
+                        break;
+                    }
+
+                    if (c >= '0' && c <= '9') {
+                        c -= '0';
+                        goto next;
+                    }
+
+                    c |= 0x20;
+
+                    if (c >= 'a' && c <= 'f') {
+                        c -= 'a' - 10;
+                        goto next;
+                    }
+
+                    ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                                  "hls: bad character in key id");
+                    break;
+
+                next:
+
+                    key_id += base * c;
+                    base *= 0x10;
+                    pp--;
+                }
+            }
+
+
+#define NGX_RTMP_EXTINF         "#EXTINF:"
+#define NGX_RTMP_EXTINF_LEN     (sizeof(NGX_RTMP_EXTINF) - 1)
+
+
+            if (ngx_memcmp(p, NGX_RTMP_EXTINF, NGX_RTMP_EXTINF_LEN) == 0) {
+
+                duration = strtod((const char *) &p[NGX_RTMP_EXTINF_LEN], NULL);
+
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "hls: restore durarion=%.3f", duration);
+            }
+
+
+#define NGX_RTMP_DISCONT        "#EXT-X-DISCONTINUITY"
+#define NGX_RTMP_DISCONT_LEN    (sizeof(NGX_RTMP_DISCONT) - 1)
+
+
+            if (ngx_memcmp(p, NGX_RTMP_DISCONT, NGX_RTMP_DISCONT_LEN) == 0) {
+
+                discont = 1;
+
+                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "hls: discontinuity");
+            }
+
+            /* find '.ts\r' */
+
+            if (p + 4 <= last &&
+                last[-3] == '.' && last[-2] == 't' && last[-1] == 's')
+            {
+                f = ngx_rtmp_hls_get_frag(s, ctx->nfrags);
+
+                ngx_memzero(f, sizeof(*f));
+
+                f->duration = duration;
+                f->discont = discont;
+                f->active = 1;
+                f->id = 0;
+
+                discont = 0;
+
+                mag = 1;
+                for (pa = last - 4; pa >= p; pa--) {
+                    if (*pa < '0' || *pa > '9') {
+                        break;
+                    }
+                    f->id += (*pa - '0') * mag;
+                    mag *= 10;
+                }
+
+                f->key_id = key_id;
+
+                ngx_rtmp_hls_next_frag(s);
+
+                ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "hls: restore fragment '%*s' id=%uL, "
+                               "duration=%.3f, frag=%uL, nfrags=%ui",
+                               (size_t) (last - p), p, f->id, f->duration,
+                               ctx->frag, ctx->nfrags);
+            }
+
+            p = next;
+        }
+    }
+
+done:
+    ngx_close_file(file.fd);
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s, ngx_str_t *path)
+{
+    size_t                    len;
+    ngx_file_info_t           fi;
+    ngx_rtmp_hls_ctx_t       *ctx;
+    ngx_rtmp_hls_app_conf_t  *hacf;
+
+    static u_char  zpath[NGX_MAX_PATH + 1];
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+
+    if (path->len + 1 > sizeof(zpath)) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "hls: too long path");
+        return NGX_ERROR;
+    }
+
+    ngx_snprintf(zpath, sizeof(zpath), "%V%Z", path);
+
+    if (ngx_file_info(zpath, &fi) == NGX_FILE_ERROR) {
+
+        if (ngx_errno != NGX_ENOENT) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                          "hls: " ngx_file_info_n " failed on '%V'", path);
+            return NGX_ERROR;
+        }
+
+        /* ENOENT */
+
+        if (ngx_create_dir(zpath, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                          "hls: " ngx_create_dir_n " failed on '%V'", path);
+            return NGX_ERROR;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "hls: directory '%V' created", path);
+
+    } else {
+
+        if (!ngx_is_dir(&fi)) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "hls: '%V' exists and is not a directory", path);
+            return  NGX_ERROR;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "hls: directory '%V' exists", path);
+    }
+
+    if (!hacf->nested) {
+        return NGX_OK;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    len = path->len;
+    if (path->data[len - 1] == '/') {
+        len--;
+    }
+
+    if (len + 1 + ctx->name.len + 1 > sizeof(zpath)) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "hls: too long path");
+        return NGX_ERROR;
+    }
+
+    ngx_snprintf(zpath, sizeof(zpath) - 1, "%*s/%V%Z", len, path->data,
+                 &ctx->name);
+
+    if (ngx_file_info(zpath, &fi) != NGX_FILE_ERROR) {
+
+        if (ngx_is_dir(&fi)) {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "hls: directory '%s' exists", zpath);
+            return NGX_OK;
+        }
+
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "hls: '%s' exists and is not a directory", zpath);
+
+        return  NGX_ERROR;
+    }
+
+    if (ngx_errno != NGX_ENOENT) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "hls: " ngx_file_info_n " failed on '%s'", zpath);
+        return NGX_ERROR;
+    }
+
+    /* NGX_ENOENT */
+
+    if (ngx_create_dir(zpath, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "hls: " ngx_create_dir_n " failed on '%s'", zpath);
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: directory '%s' created", zpath);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    ngx_rtmp_hls_app_conf_t        *hacf;
+    ngx_rtmp_hls_ctx_t             *ctx;
+    u_char                         *p, *pp;
+    ngx_rtmp_hls_frag_t            *f;
+    ngx_buf_t                      *b;
+    size_t                          len;
+    ngx_rtmp_hls_variant_t         *var;
+    ngx_uint_t                      n;
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+    if (hacf == NULL || !hacf->hls || hacf->path.len == 0) {
+        goto next;
+    }
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: publish: name='%s' type='%s'",
+                   v->name, v->type);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    if (ctx == NULL) {
+
+        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_hls_ctx_t));
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_hls_module);
+
+    } else {
+
+        f = ctx->frags;
+        b = ctx->aframe;
+
+        ngx_memzero(ctx, sizeof(ngx_rtmp_hls_ctx_t));
+
+        ctx->frags = f;
+        ctx->aframe = b;
+
+        if (b) {
+            b->pos = b->last = b->start;
+        }
+    }
+
+    if (ctx->frags == NULL) {
+        ctx->frags = ngx_pcalloc(s->connection->pool,
+                                 sizeof(ngx_rtmp_hls_frag_t) *
+                                 (hacf->winfrags * 2 + 1));
+        if (ctx->frags == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (ngx_strstr(v->name, "..")) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "hls: bad stream name: '%s'", v->name);
+        return NGX_ERROR;
+    }
+
+    ctx->name.len = ngx_strlen(v->name);
+    ctx->name.data = ngx_palloc(s->connection->pool, ctx->name.len + 1);
+
+    if (ctx->name.data == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ngx_cpymem(ctx->name.data, v->name, ctx->name.len) = 0;
+
+    len = hacf->path.len + 1 + ctx->name.len + sizeof(".m3u8");
+    if (hacf->nested) {
+        len += sizeof("/index") - 1;
+    }
+
+    ctx->playlist.data = ngx_palloc(s->connection->pool, len);
+    p = ngx_cpymem(ctx->playlist.data, hacf->path.data, hacf->path.len);
+
+    if (p[-1] != '/') {
+        *p++ = '/';
+    }
+
+    p = ngx_cpymem(p, ctx->name.data, ctx->name.len);
+
+    /*
+     * ctx->stream holds initial part of stream file path
+     * however the space for the whole stream path
+     * is allocated
+     */
+
+    ctx->stream.len = p - ctx->playlist.data + 1;
+    ctx->stream.data = ngx_palloc(s->connection->pool,
+                                  ctx->stream.len + NGX_INT64_LEN +
+                                  sizeof(".ts"));
+
+    ngx_memcpy(ctx->stream.data, ctx->playlist.data, ctx->stream.len - 1);
+    ctx->stream.data[ctx->stream.len - 1] = (hacf->nested ? '/' : '-');
+
+    /* varint playlist path */
+
+    if (hacf->variant) {
+        var = hacf->variant->elts;
+        for (n = 0; n < hacf->variant->nelts; n++, var++) {
+            if (ctx->name.len > var->suffix.len &&
+                ngx_memcmp(var->suffix.data,
+                           ctx->name.data + ctx->name.len - var->suffix.len,
+                           var->suffix.len)
+                == 0)
+            {
+                ctx->var = var;
+
+                len = (size_t) (p - ctx->playlist.data);
+
+                ctx->var_playlist.len = len - var->suffix.len + sizeof(".m3u8")
+                                        - 1;
+                ctx->var_playlist.data = ngx_palloc(s->connection->pool,
+                                                    ctx->var_playlist.len + 1);
+
+                pp = ngx_cpymem(ctx->var_playlist.data, ctx->playlist.data,
+                               len - var->suffix.len);
+                pp = ngx_cpymem(pp, ".m3u8", sizeof(".m3u8") - 1);
+                *pp = 0;
+
+                ctx->var_playlist_bak.len = ctx->var_playlist.len +
+                                            sizeof(".bak") - 1;
+                ctx->var_playlist_bak.data = ngx_palloc(s->connection->pool,
+                                                 ctx->var_playlist_bak.len + 1);
+
+                pp = ngx_cpymem(ctx->var_playlist_bak.data,
+                                ctx->var_playlist.data,
+                                ctx->var_playlist.len);
+                pp = ngx_cpymem(pp, ".bak", sizeof(".bak") - 1);
+                *pp = 0;
+
+                break;
+            }
+        }
+    }
+
+
+    /* playlist path */
+
+    if (hacf->nested) {
+        p = ngx_cpymem(p, "/index.m3u8", sizeof("/index.m3u8") - 1);
+    } else {
+        p = ngx_cpymem(p, ".m3u8", sizeof(".m3u8") - 1);
+    }
+
+    ctx->playlist.len = p - ctx->playlist.data;
+
+    *p = 0;
+
+    /* playlist bak (new playlist) path */
+
+    ctx->playlist_bak.data = ngx_palloc(s->connection->pool,
+                                        ctx->playlist.len + sizeof(".bak"));
+    p = ngx_cpymem(ctx->playlist_bak.data, ctx->playlist.data,
+                   ctx->playlist.len);
+    p = ngx_cpymem(p, ".bak", sizeof(".bak") - 1);
+
+    ctx->playlist_bak.len = p - ctx->playlist_bak.data;
+
+    *p = 0;
+
+    /* key path */
+
+    if (hacf->keys) {
+        len = hacf->key_path.len + 1 + ctx->name.len + 1 + NGX_INT64_LEN
+              + sizeof(".key");
+
+        ctx->keyfile.data = ngx_palloc(s->connection->pool, len);
+        if (ctx->keyfile.data == NULL) {
+            return NGX_ERROR;
+        }
+
+        p = ngx_cpymem(ctx->keyfile.data, hacf->key_path.data,
+                       hacf->key_path.len);
+
+        if (p[-1] != '/') {
+            *p++ = '/';
+        }
+
+        p = ngx_cpymem(p, ctx->name.data, ctx->name.len);
+        *p++ = (hacf->nested ? '/' : '-');
+
+        ctx->keyfile.len = p - ctx->keyfile.data;
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: playlist='%V' playlist_bak='%V' "
+                   "stream_pattern='%V' keyfile_pattern='%V'",
+                   &ctx->playlist, &ctx->playlist_bak,
+                   &ctx->stream, &ctx->keyfile);
+
+    if (hacf->continuous) {
+        ngx_rtmp_hls_restore_stream(s);
+    }
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
+{
+    ngx_rtmp_hls_app_conf_t        *hacf;
+    ngx_rtmp_hls_ctx_t             *ctx;
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    if (hacf == NULL || !hacf->hls || ctx == NULL) {
+        goto next;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: close stream");
+
+    ngx_rtmp_hls_close_fragment(s);
+
+next:
+    return next_close_stream(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_parse_aac_header(ngx_rtmp_session_t *s, ngx_uint_t *objtype,
+    ngx_uint_t *srindex, ngx_uint_t *chconf)
+{
+    ngx_rtmp_codec_ctx_t   *codec_ctx;
+    ngx_chain_t            *cl;
+    u_char                 *p, b0, b1;
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    cl = codec_ctx->aac_header;
+
+    p = cl->buf->pos;
+
+    if (ngx_rtmp_hls_copy(s, NULL, &p, 2, &cl) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_hls_copy(s, &b0, &p, 1, &cl) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_hls_copy(s, &b1, &p, 1, &cl) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    *objtype = b0 >> 3;
+    if (*objtype == 0 || *objtype == 0x1f) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "hls: unsupported adts object type:%ui", *objtype);
+        return NGX_ERROR;
+    }
+
+    if (*objtype > 4) {
+
+        /*
+         * Mark all extended profiles as LC
+         * to make Android as happy as possible.
+         */
+
+        *objtype = 2;
+    }
+
+    *srindex = ((b0 << 1) & 0x0f) | ((b1 & 0x80) >> 7);
+    if (*srindex == 0x0f) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "hls: unsupported adts sample rate:%ui", *srindex);
+        return NGX_ERROR;
+    }
+
+    *chconf = (b1 >> 3) & 0x0f;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: aac object_type:%ui, sample_rate_index:%ui, "
+                   "channel_config:%ui", *objtype, *srindex, *chconf);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_hls_update_fragment(ngx_rtmp_session_t *s, uint64_t ts,
+    ngx_int_t boundary, ngx_uint_t flush_rate)
+{
+    ngx_rtmp_hls_ctx_t         *ctx;
+    ngx_rtmp_hls_app_conf_t    *hacf;
+    ngx_rtmp_hls_frag_t        *f;
+    ngx_msec_t                  ts_frag_len;
+    ngx_int_t                   same_frag, force,discont;
+    ngx_buf_t                  *b;
+    int64_t                     d;
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+    f = NULL;
+    force = 0;
+    discont = 1;
+
+    if (ctx->opened) {
+        f = ngx_rtmp_hls_get_frag(s, ctx->nfrags);
+        d = (int64_t) (ts - ctx->frag_ts);
+
+        if (d > (int64_t) hacf->max_fraglen * 90 || d < -90000) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "hls: force fragment split: %.3f sec, ", d / 90000.);
+            force = 1;
+
+        } else {
+            f->duration = (ts - ctx->frag_ts) / 90000.;
+            discont = 0;
+        }
+    }
+
+    switch (hacf->slicing) {
+        case NGX_RTMP_HLS_SLICING_PLAIN:
+            if (f && f->duration < hacf->fraglen / 1000.) {
+                boundary = 0;
+            }
+            break;
+
+        case NGX_RTMP_HLS_SLICING_ALIGNED:
+
+            ts_frag_len = hacf->fraglen * 90;
+            same_frag = ctx->frag_ts / ts_frag_len == ts / ts_frag_len;
+
+            if (f && same_frag) {
+                boundary = 0;
+            }
+
+            if (f == NULL && (ctx->frag_ts == 0 || same_frag)) {
+                ctx->frag_ts = ts;
+                boundary = 0;
+            }
+
+            break;
+    }
+
+    if (boundary || force) {
+        ngx_rtmp_hls_close_fragment(s);
+        ngx_rtmp_hls_open_fragment(s, ts, discont);
+    }
+
+    b = ctx->aframe;
+    if (ctx->opened && b && b->last > b->pos &&
+        ctx->aframe_pts + (uint64_t) hacf->max_audio_delay * 90 / flush_rate
+        < ts)
+    {
+        ngx_rtmp_hls_flush_audio(s);
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_flush_audio(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_hls_ctx_t             *ctx;
+    ngx_rtmp_mpegts_frame_t         frame;
+    ngx_int_t                       rc;
+    ngx_buf_t                      *b;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    if (ctx == NULL || !ctx->opened) {
+        return NGX_OK;
+    }
+
+    b = ctx->aframe;
+
+    if (b == NULL || b->pos == b->last) {
+        return NGX_OK;
+    }
+
+    ngx_memzero(&frame, sizeof(frame));
+
+    frame.dts = ctx->aframe_pts;
+    frame.pts = frame.dts;
+    frame.cc = ctx->audio_cc;
+    frame.pid = 0x101;
+    frame.sid = 0xc0;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: flush audio pts=%uL", frame.pts);
+
+    rc = ngx_rtmp_mpegts_write_frame(&ctx->file, &frame, b);
+
+    if (rc != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "hls: audio flush failed");
+    }
+
+    ctx->audio_cc = frame.cc;
+    b->pos = b->last = b->start;
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_audio(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+    ngx_chain_t *in)
+{
+    ngx_rtmp_hls_app_conf_t        *hacf;
+    ngx_rtmp_hls_ctx_t             *ctx;
+    ngx_rtmp_codec_ctx_t           *codec_ctx;
+    uint64_t                        pts, est_pts;
+    int64_t                         dpts;
+    size_t                          bsize;
+    ngx_buf_t                      *b;
+    u_char                         *p;
+    ngx_uint_t                      objtype, srindex, chconf, size;
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (hacf == NULL || !hacf->hls || ctx == NULL ||
+        codec_ctx == NULL  || h->mlen < 2)
+    {
+        return NGX_OK;
+    }
+
+    if (codec_ctx->audio_codec_id != NGX_RTMP_AUDIO_AAC ||
+        codec_ctx->aac_header == NULL || ngx_rtmp_is_codec_header(in))
+    {
+        return NGX_OK;
+    }
+
+    b = ctx->aframe;
+
+    if (b == NULL) {
+
+        b = ngx_pcalloc(s->connection->pool, sizeof(ngx_buf_t));
+        if (b == NULL) {
+            return NGX_ERROR;
+        }
+
+        ctx->aframe = b;
+
+        b->start = ngx_palloc(s->connection->pool, hacf->audio_buffer_size);
+        if (b->start == NULL) {
+            return NGX_ERROR;
+        }
+
+        b->end = b->start + hacf->audio_buffer_size;
+        b->pos = b->last = b->start;
+    }
+
+    size = h->mlen - 2 + 7;
+    pts = (uint64_t) h->timestamp * 90;
+
+    if (b->start + size > b->end) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "hls: too big audio frame");
+        return NGX_OK;
+    }
+
+    /*
+     * start new fragment here if
+     * there's no video at all, otherwise
+     * do it in video handler
+     */
+
+    ngx_rtmp_hls_update_fragment(s, pts, codec_ctx->avc_header == NULL, 2);
+
+    if (b->last + size > b->end) {
+        ngx_rtmp_hls_flush_audio(s);
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: audio pts=%uL", pts);
+
+    if (b->last + 7 > b->end) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "hls: not enough buffer for audio header");
+        return NGX_OK;
+    }
+
+    p = b->last;
+    b->last += 5;
+
+    /* copy payload */
+
+    for (; in && b->last < b->end; in = in->next) {
+
+        bsize = in->buf->last - in->buf->pos;
+        if (b->last + bsize > b->end) {
+            bsize = b->end - b->last;
+        }
+
+        b->last = ngx_cpymem(b->last, in->buf->pos, bsize);
+    }
+
+    /* make up ADTS header */
+
+    if (ngx_rtmp_hls_parse_aac_header(s, &objtype, &srindex, &chconf)
+        != NGX_OK)
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "hls: aac header error");
+        return NGX_OK;
+    }
+
+    /* we have 5 free bytes + 2 bytes of RTMP frame header */
+
+    p[0] = 0xff;
+    p[1] = 0xf1;
+    p[2] = (u_char) (((objtype - 1) << 6) | (srindex << 2) |
+                     ((chconf & 0x04) >> 2));
+    p[3] = (u_char) (((chconf & 0x03) << 6) | ((size >> 11) & 0x03));
+    p[4] = (u_char) (size >> 3);
+    p[5] = (u_char) ((size << 5) | 0x1f);
+    p[6] = 0xfc;
+
+    if (p != b->start) {
+        ctx->aframe_num++;
+        return NGX_OK;
+    }
+
+    ctx->aframe_pts = pts;
+
+    if (!hacf->sync || codec_ctx->sample_rate == 0) {
+        return NGX_OK;
+    }
+
+    /* align audio frames */
+
+    /* TODO: We assume here AAC frame size is 1024
+     *       Need to handle AAC frames with frame size of 960 */
+
+    est_pts = ctx->aframe_base + ctx->aframe_num * 90000 * 1024 /
+                                 codec_ctx->sample_rate;
+    dpts = (int64_t) (est_pts - pts);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: audio sync dpts=%L (%.5fs)",
+                   dpts, dpts / 90000.);
+
+    if (dpts <= (int64_t) hacf->sync * 90 &&
+        dpts >= (int64_t) hacf->sync * -90)
+    {
+        ctx->aframe_num++;
+        ctx->aframe_pts = est_pts;
+        return NGX_OK;
+    }
+
+    ctx->aframe_base = pts;
+    ctx->aframe_num  = 1;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: audio sync gap dpts=%L (%.5fs)",
+                   dpts, dpts / 90000.);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_video(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+    ngx_chain_t *in)
+{
+    ngx_rtmp_hls_app_conf_t        *hacf;
+    ngx_rtmp_hls_ctx_t             *ctx;
+    ngx_rtmp_codec_ctx_t           *codec_ctx;
+    u_char                         *p;
+    uint8_t                         fmt, ftype, htype, nal_type, src_nal_type;
+    uint32_t                        len, rlen;
+    ngx_buf_t                       out, *b;
+    uint32_t                        cts;
+    ngx_rtmp_mpegts_frame_t         frame;
+    ngx_uint_t                      nal_bytes;
+    ngx_int_t                       aud_sent, sps_pps_sent, boundary;
+    static u_char                   buffer[NGX_RTMP_HLS_BUFSIZE];
+
+    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (hacf == NULL || !hacf->hls || ctx == NULL || codec_ctx == NULL ||
+        codec_ctx->avc_header == NULL || h->mlen < 1)
+    {
+        return NGX_OK;
+    }
+
+    /* Only H264 is supported */
+    if (codec_ctx->video_codec_id != NGX_RTMP_VIDEO_H264) {
+        return NGX_OK;
+    }
+
+    p = in->buf->pos;
+    if (ngx_rtmp_hls_copy(s, &fmt, &p, 1, &in) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    /* 1: keyframe (IDR)
+     * 2: inter frame
+     * 3: disposable inter frame */
+
+    ftype = (fmt & 0xf0) >> 4;
+
+    /* H264 HDR/PICT */
+
+    if (ngx_rtmp_hls_copy(s, &htype, &p, 1, &in) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    /* proceed only with PICT */
+
+    if (htype != 1) {
+        return NGX_OK;
+    }
+
+    /* 3 bytes: decoder delay */
+
+    if (ngx_rtmp_hls_copy(s, &cts, &p, 3, &in) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    cts = ((cts & 0x00FF0000) >> 16) | ((cts & 0x000000FF) << 16) |
+          (cts & 0x0000FF00);
+
+    ngx_memzero(&out, sizeof(out));
+
+    out.start = buffer;
+    out.end = buffer + sizeof(buffer);
+    out.pos = out.start;
+    out.last = out.pos;
+
+    nal_bytes = codec_ctx->avc_nal_bytes;
+    aud_sent = 0;
+    sps_pps_sent = 0;
+
+    while (in) {
+        if (ngx_rtmp_hls_copy(s, &rlen, &p, nal_bytes, &in) != NGX_OK) {
+            return NGX_OK;
+        }
+
+        len = 0;
+        ngx_rtmp_rmemcpy(&len, &rlen, nal_bytes);
+
+        if (len == 0) {
+            continue;
+        }
+
+        if (ngx_rtmp_hls_copy(s, &src_nal_type, &p, 1, &in) != NGX_OK) {
+            return NGX_OK;
+        }
+
+        nal_type = src_nal_type & 0x1f;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "hls: h264 NAL type=%ui, len=%uD",
+                       (ngx_uint_t) nal_type, len);
+
+        if (nal_type >= 7 && nal_type <= 9) {
+            if (ngx_rtmp_hls_copy(s, NULL, &p, len - 1, &in) != NGX_OK) {
+                return NGX_ERROR;
+            }
+            continue;
+        }
+
+        if (!aud_sent) {
+            switch (nal_type) {
+                case 1:
+                case 5:
+                case 6:
+                    if (ngx_rtmp_hls_append_aud(s, &out) != NGX_OK) {
+                        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                                      "hls: error appending AUD NAL");
+                    }
+                case 9:
+                    aud_sent = 1;
+                    break;
+            }
+        }
+
+        switch (nal_type) {
+            case 1:
+                sps_pps_sent = 0;
+                break;
+            case 5:
+                if (sps_pps_sent) {
+                    break;
+                }
+                if (ngx_rtmp_hls_append_sps_pps(s, &out) != NGX_OK) {
+                    ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                                  "hls: error appenging SPS/PPS NALs");
+                }
+                sps_pps_sent = 1;
+                break;
+        }
+
+        /* AnnexB prefix */
+
+        if (out.end - out.last < 5) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "hls: not enough buffer for AnnexB prefix");
+            return NGX_OK;
+        }
+
+        /* first AnnexB prefix is long (4 bytes) */
+
+        if (out.last == out.pos) {
+            *out.last++ = 0;
+        }
+
+        *out.last++ = 0;
+        *out.last++ = 0;
+        *out.last++ = 1;
+        *out.last++ = src_nal_type;
+
+        /* NAL body */
+
+        if (out.end - out.last < (ngx_int_t) len) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "hls: not enough buffer for NAL");
+            return NGX_OK;
+        }
+
+        if (ngx_rtmp_hls_copy(s, out.last, &p, len - 1, &in) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        out.last += (len - 1);
+    }
+
+    ngx_memzero(&frame, sizeof(frame));
+
+    frame.cc = ctx->video_cc;
+    frame.dts = (uint64_t) h->timestamp * 90;
+    frame.pts = frame.dts + cts * 90;
+    frame.pid = 0x100;
+    frame.sid = 0xe0;
+    frame.key = (ftype == 1);
+
+    /*
+     * start new fragment if
+     * - we have video key frame AND
+     * - we have audio buffered or have no audio at all or stream is closed
+     */
+
+    b = ctx->aframe;
+    boundary = frame.key && (codec_ctx->aac_header == NULL || !ctx->opened ||
+                             (b && b->last > b->pos));
+
+    ngx_rtmp_hls_update_fragment(s, frame.dts, boundary, 1);
+
+    if (!ctx->opened) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "hls: video pts=%uL, dts=%uL", frame.pts, frame.dts);
+
+    if (ngx_rtmp_mpegts_write_frame(&ctx->file, &frame, &out) != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "hls: video frame failed");
+    }
+
+    ctx->video_cc = frame.cc;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
+{
+    return next_stream_begin(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_eof_t *v)
+{
+    ngx_rtmp_hls_flush_audio(s);
+
+    ngx_rtmp_hls_close_fragment(s);
+
+    return next_stream_eof(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_cleanup_dir(ngx_str_t *ppath, ngx_msec_t playlen)
+{
+    ngx_dir_t               dir;
+    time_t                  mtime, max_age;
+    ngx_err_t               err;
+    ngx_str_t               name, spath;
+    u_char                 *p;
+    ngx_int_t               nentries, nerased;
+    u_char                  path[NGX_MAX_PATH + 1];
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                   "hls: cleanup path='%V' playlen=%M",
+                   ppath, playlen);
+
+    if (ngx_open_dir(ppath, &dir) != NGX_OK) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, ngx_errno,
+                      "hls: cleanup open dir failed '%V'", ppath);
+        return NGX_ERROR;
+    }
+
+    nentries = 0;
+    nerased = 0;
+
+    for ( ;; ) {
+        ngx_set_errno(0);
+
+        if (ngx_read_dir(&dir) == NGX_ERROR) {
+            err = ngx_errno;
+
+            if (ngx_close_dir(&dir) == NGX_ERROR) {
+                ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, ngx_errno,
+                              "hls: cleanup " ngx_close_dir_n " \"%V\" failed",
+                              ppath);
+            }
+
+            if (err == NGX_ENOMOREFILES) {
+                return nentries - nerased;
+            }
+
+            ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, err,
+                          "hls: cleanup " ngx_read_dir_n
+                          " '%V' failed", ppath);
+            return NGX_ERROR;
+        }
+
+        name.data = ngx_de_name(&dir);
+        if (name.data[0] == '.') {
+            continue;
+        }
+
+        name.len = ngx_de_namelen(&dir);
+
+        p = ngx_snprintf(path, sizeof(path) - 1, "%V/%V", ppath, &name);
+        *p = 0;
+
+        spath.data = path;
+        spath.len = p - path;
+
+        nentries++;
+
+        if (!dir.valid_info && ngx_de_info(path, &dir) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, ngx_errno,
+                          "hls: cleanup " ngx_de_info_n " \"%V\" failed",
+                          &spath);
+
+            continue;
+        }
+
+        if (ngx_de_is_dir(&dir)) {
+
+            if (ngx_rtmp_hls_cleanup_dir(&spath, playlen) == 0) {
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                               "hls: cleanup dir '%V'", &name);
+
+                /*
+                 * null-termination gets spoiled in win32
+                 * version of ngx_open_dir
+                 */
+
+                *p = 0;
+
+                if (ngx_delete_dir(path) == NGX_FILE_ERROR) {
+                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                                  "hls: cleanup " ngx_delete_dir_n
+                                  " failed on '%V'", &spath);
+                } else {
+                    nerased++;
+                }
+            }
+
+            continue;
+        }
+
+        if (!ngx_de_is_file(&dir)) {
+            continue;
+        }
+
+        if (name.len >= 3 && name.data[name.len - 3] == '.' &&
+                             name.data[name.len - 2] == 't' &&
+                             name.data[name.len - 1] == 's')
+        {
+            max_age = playlen / 500;
+
+        } else if (name.len >= 5 && name.data[name.len - 5] == '.' &&
+                                    name.data[name.len - 4] == 'm' &&
+                                    name.data[name.len - 3] == '3' &&
+                                    name.data[name.len - 2] == 'u' &&
+                                    name.data[name.len - 1] == '8')
+        {
+            max_age = playlen / 1000;
+
+        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
+                                    name.data[name.len - 3] == 'k' &&
+                                    name.data[name.len - 2] == 'e' &&
+                                    name.data[name.len - 1] == 'y')
+        {
+            max_age = playlen / 500;
+
+        } else {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                           "hls: cleanup skip unknown file type '%V'", &name);
+            continue;
+        }
+
+        mtime = ngx_de_mtime(&dir);
+        if (mtime + max_age > ngx_cached_time->sec) {
+            continue;
+        }
+
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
+                       "hls: cleanup '%V' mtime=%T age=%T",
+                       &name, mtime, ngx_cached_time->sec - mtime);
+
+        if (ngx_delete_file(path) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "hls: cleanup " ngx_delete_file_n " failed on '%V'",
+                          &spath);
+            continue;
+        }
+
+        nerased++;
+    }
+}
+
+
+#if (nginx_version >= 1011005)
+static ngx_msec_t
+#else
+static time_t
+#endif
+ngx_rtmp_hls_cleanup(void *data)
+{
+    ngx_rtmp_hls_cleanup_t *cleanup = data;
+
+    ngx_rtmp_hls_cleanup_dir(&cleanup->path, cleanup->playlen);
+
+#if (nginx_version >= 1011005)
+    return cleanup->playlen * 2;
+#else
+    return cleanup->playlen / 500;
+#endif
+}
+
+
+static char *
+ngx_rtmp_hls_variant(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_hls_app_conf_t  *hacf = conf;
+
+    ngx_str_t                *value, *arg;
+    ngx_uint_t                n;
+    ngx_rtmp_hls_variant_t   *var;
+
+    value = cf->args->elts;
+
+    if (hacf->variant == NULL) {
+        hacf->variant = ngx_array_create(cf->pool, 1,
+                                         sizeof(ngx_rtmp_hls_variant_t));
+        if (hacf->variant == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    var = ngx_array_push(hacf->variant);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(var, sizeof(ngx_rtmp_hls_variant_t));
+
+    var->suffix = value[1];
+
+    if (cf->args->nelts == 2) {
+        return NGX_CONF_OK;
+    }
+
+    if (ngx_array_init(&var->args, cf->pool, cf->args->nelts - 2,
+                       sizeof(ngx_str_t))
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    arg = ngx_array_push_n(&var->args, cf->args->nelts - 2);
+    if (arg == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    for (n = 2; n < cf->args->nelts; n++) {
+        *arg++ = value[n];
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_hls_app_conf_t *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_hls_app_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->hls = NGX_CONF_UNSET;
+    conf->fraglen = NGX_CONF_UNSET_MSEC;
+    conf->max_fraglen = NGX_CONF_UNSET_MSEC;
+    conf->muxdelay = NGX_CONF_UNSET_MSEC;
+    conf->sync = NGX_CONF_UNSET_MSEC;
+    conf->playlen = NGX_CONF_UNSET_MSEC;
+    conf->continuous = NGX_CONF_UNSET;
+    conf->nested = NGX_CONF_UNSET;
+    conf->naming = NGX_CONF_UNSET_UINT;
+    conf->slicing = NGX_CONF_UNSET_UINT;
+    conf->type = NGX_CONF_UNSET_UINT;
+    conf->max_audio_delay = NGX_CONF_UNSET_MSEC;
+    conf->audio_buffer_size = NGX_CONF_UNSET_SIZE;
+    conf->cleanup = NGX_CONF_UNSET;
+    conf->granularity = NGX_CONF_UNSET;
+    conf->keys = NGX_CONF_UNSET;
+    conf->frags_per_key = NGX_CONF_UNSET_UINT;
+
+    return conf;
+}
+
+
+static char *
+ngx_rtmp_hls_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_hls_app_conf_t    *prev = parent;
+    ngx_rtmp_hls_app_conf_t    *conf = child;
+    ngx_rtmp_hls_cleanup_t     *cleanup;
+
+    ngx_conf_merge_value(conf->hls, prev->hls, 0);
+    ngx_conf_merge_msec_value(conf->fraglen, prev->fraglen, 5000);
+    ngx_conf_merge_msec_value(conf->max_fraglen, prev->max_fraglen,
+                              conf->fraglen * 10);
+    ngx_conf_merge_msec_value(conf->muxdelay, prev->muxdelay, 700);
+    ngx_conf_merge_msec_value(conf->sync, prev->sync, 2);
+    ngx_conf_merge_msec_value(conf->playlen, prev->playlen, 30000);
+    ngx_conf_merge_value(conf->continuous, prev->continuous, 1);
+    ngx_conf_merge_value(conf->nested, prev->nested, 0);
+    ngx_conf_merge_uint_value(conf->naming, prev->naming,
+                              NGX_RTMP_HLS_NAMING_SEQUENTIAL);
+    ngx_conf_merge_uint_value(conf->slicing, prev->slicing,
+                              NGX_RTMP_HLS_SLICING_PLAIN);
+    ngx_conf_merge_uint_value(conf->type, prev->type,
+                              NGX_RTMP_HLS_TYPE_LIVE);
+    ngx_conf_merge_msec_value(conf->max_audio_delay, prev->max_audio_delay,
+                              300);
+    ngx_conf_merge_size_value(conf->audio_buffer_size, prev->audio_buffer_size,
+                              NGX_RTMP_HLS_BUFSIZE);
+    ngx_conf_merge_value(conf->cleanup, prev->cleanup, 1);
+    ngx_conf_merge_str_value(conf->base_url, prev->base_url, "");
+    ngx_conf_merge_value(conf->granularity, prev->granularity, 0);
+    ngx_conf_merge_value(conf->keys, prev->keys, 0);
+    ngx_conf_merge_str_value(conf->key_path, prev->key_path, "");
+    ngx_conf_merge_str_value(conf->key_url, prev->key_url, "");
+    ngx_conf_merge_uint_value(conf->frags_per_key, prev->frags_per_key, 0);
+
+    if (conf->fraglen) {
+        conf->winfrags = conf->playlen / conf->fraglen;
+    }
+
+    /* schedule cleanup */
+
+    if (conf->hls && conf->path.len && conf->cleanup &&
+        conf->type != NGX_RTMP_HLS_TYPE_EVENT)
+    {
+        if (conf->path.data[conf->path.len - 1] == '/') {
+            conf->path.len--;
+        }
+
+        cleanup = ngx_pcalloc(cf->pool, sizeof(*cleanup));
+        if (cleanup == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        cleanup->path = conf->path;
+        cleanup->playlen = conf->playlen;
+
+        conf->slot = ngx_pcalloc(cf->pool, sizeof(*conf->slot));
+        if (conf->slot == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        conf->slot->manager = ngx_rtmp_hls_cleanup;
+        conf->slot->name = conf->path;
+        conf->slot->data = cleanup;
+        conf->slot->conf_file = cf->conf_file->file.name.data;
+        conf->slot->line = cf->conf_file->line;
+
+        if (ngx_add_path(cf, &conf->slot) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    ngx_conf_merge_str_value(conf->path, prev->path, "");
+
+    if (conf->keys && conf->cleanup && conf->key_path.len &&
+        ngx_strcmp(conf->key_path.data, conf->path.data) != 0 &&
+        conf->type != NGX_RTMP_HLS_TYPE_EVENT)
+    {
+        if (conf->key_path.data[conf->key_path.len - 1] == '/') {
+            conf->key_path.len--;
+        }
+
+        cleanup = ngx_pcalloc(cf->pool, sizeof(*cleanup));
+        if (cleanup == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        cleanup->path = conf->key_path;
+        cleanup->playlen = conf->playlen;
+
+        conf->slot = ngx_pcalloc(cf->pool, sizeof(*conf->slot));
+        if (conf->slot == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        conf->slot->manager = ngx_rtmp_hls_cleanup;
+        conf->slot->name = conf->key_path;
+        conf->slot->data = cleanup;
+        conf->slot->conf_file = cf->conf_file->file.name.data;
+        conf->slot->line = cf->conf_file->line;
+
+        if (ngx_add_path(cf, &conf->slot) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    ngx_conf_merge_str_value(conf->key_path, prev->key_path, "");
+
+    if (conf->key_path.len == 0) {
+        conf->key_path = conf->path;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_hls_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t   *cmcf;
+    ngx_rtmp_handler_pt         *h;
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
+    *h = ngx_rtmp_hls_video;
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
+    *h = ngx_rtmp_hls_audio;
+
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_hls_publish;
+
+    next_close_stream = ngx_rtmp_close_stream;
+    ngx_rtmp_close_stream = ngx_rtmp_hls_close_stream;
+
+    next_stream_begin = ngx_rtmp_stream_begin;
+    ngx_rtmp_stream_begin = ngx_rtmp_hls_stream_begin;
+
+    next_stream_eof = ngx_rtmp_stream_eof;
+    ngx_rtmp_stream_eof = ngx_rtmp_hls_stream_eof;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.c b/debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.c
new file mode 100644
index 0000000..ae66f71
--- /dev/null
+++ b/debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.c
@@ -0,0 +1,399 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_mpegts.h"
+
+
+static u_char ngx_rtmp_mpegts_header[] = {
+
+    /* TS */
+    0x47, 0x40, 0x00, 0x10, 0x00,
+    /* PSI */
+    0x00, 0xb0, 0x0d, 0x00, 0x01, 0xc1, 0x00, 0x00,
+    /* PAT */
+    0x00, 0x01, 0xf0, 0x01,
+    /* CRC */
+    0x2e, 0x70, 0x19, 0x05,
+    /* stuffing 167 bytes */
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+
+    /* TS */
+    0x47, 0x50, 0x01, 0x10, 0x00,
+    /* PSI */
+    0x02, 0xb0, 0x17, 0x00, 0x01, 0xc1, 0x00, 0x00,
+    /* PMT */
+    0xe1, 0x00,
+    0xf0, 0x00,
+    0x1b, 0xe1, 0x00, 0xf0, 0x00, /* h264 */
+    0x0f, 0xe1, 0x01, 0xf0, 0x00, /* aac */
+    /*0x03, 0xe1, 0x01, 0xf0, 0x00,*/ /* mp3 */
+    /* CRC */
+    0x2f, 0x44, 0xb9, 0x9b, /* crc for aac */
+    /*0x4e, 0x59, 0x3d, 0x1e,*/ /* crc for mp3 */
+    /* stuffing 157 bytes */
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+
+
+/* 700 ms PCR delay */
+#define NGX_RTMP_HLS_DELAY  63000
+
+
+static ngx_int_t
+ngx_rtmp_mpegts_write_file(ngx_rtmp_mpegts_file_t *file, u_char *in,
+    size_t in_size)
+{
+    u_char   *out;
+    size_t    out_size, n;
+    ssize_t   rc;
+
+    static u_char  buf[1024];
+
+    if (!file->encrypt) {
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
+                       "mpegts: write %uz bytes", in_size);
+
+        rc = ngx_write_fd(file->fd, in, in_size);
+        if (rc < 0) {
+            return NGX_ERROR;
+        }
+
+        return NGX_OK;
+    }
+
+    /* encrypt */
+
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
+                   "mpegts: write %uz encrypted bytes", in_size);
+
+    out = buf;
+    out_size = sizeof(buf);
+
+    if (file->size > 0 && file->size + in_size >= 16) {
+        ngx_memcpy(file->buf + file->size, in, 16 - file->size);
+
+        in += 16 - file->size;
+        in_size -= 16 - file->size;
+
+        AES_cbc_encrypt(file->buf, out, 16, &file->key, file->iv, AES_ENCRYPT);
+
+        out += 16;
+        out_size -= 16;
+
+        file->size = 0;
+    }
+
+    for ( ;; ) {
+        n = in_size & ~0x0f;
+
+        if (n > 0) {
+            if (n > out_size) {
+                n = out_size;
+            }
+
+            AES_cbc_encrypt(in, out, n, &file->key, file->iv, AES_ENCRYPT);
+
+            in += n;
+            in_size -= n;
+
+        } else if (out == buf) {
+            break;
+        }
+
+        rc = ngx_write_fd(file->fd, buf, out - buf + n);
+        if (rc < 0) {
+            return NGX_ERROR;
+        }
+
+        out = buf;
+        out_size = sizeof(buf);
+    }
+
+    if (in_size) {
+        ngx_memcpy(file->buf + file->size, in, in_size);
+        file->size += in_size;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mpegts_write_header(ngx_rtmp_mpegts_file_t *file)
+{
+    return ngx_rtmp_mpegts_write_file(file, ngx_rtmp_mpegts_header,
+                                      sizeof(ngx_rtmp_mpegts_header));
+}
+
+
+static u_char *
+ngx_rtmp_mpegts_write_pcr(u_char *p, uint64_t pcr)
+{
+    *p++ = (u_char) (pcr >> 25);
+    *p++ = (u_char) (pcr >> 17);
+    *p++ = (u_char) (pcr >> 9);
+    *p++ = (u_char) (pcr >> 1);
+    *p++ = (u_char) (pcr << 7 | 0x7e);
+    *p++ = 0;
+
+    return p;
+}
+
+
+static u_char *
+ngx_rtmp_mpegts_write_pts(u_char *p, ngx_uint_t fb, uint64_t pts)
+{
+    ngx_uint_t val;
+
+    val = fb << 4 | (((pts >> 30) & 0x07) << 1) | 1;
+    *p++ = (u_char) val;
+
+    val = (((pts >> 15) & 0x7fff) << 1) | 1;
+    *p++ = (u_char) (val >> 8);
+    *p++ = (u_char) val;
+
+    val = (((pts) & 0x7fff) << 1) | 1;
+    *p++ = (u_char) (val >> 8);
+    *p++ = (u_char) val;
+
+    return p;
+}
+
+
+ngx_int_t
+ngx_rtmp_mpegts_write_frame(ngx_rtmp_mpegts_file_t *file,
+    ngx_rtmp_mpegts_frame_t *f, ngx_buf_t *b)
+{
+    ngx_uint_t  pes_size, header_size, body_size, in_size, stuff_size, flags;
+    u_char      packet[188], *p, *base;
+    ngx_int_t   first, rc;
+
+    ngx_log_debug6(NGX_LOG_DEBUG_CORE, file->log, 0,
+                   "mpegts: pid=%ui, sid=%ui, pts=%uL, "
+                   "dts=%uL, key=%ui, size=%ui",
+                   f->pid, f->sid, f->pts, f->dts,
+                   (ngx_uint_t) f->key, (size_t) (b->last - b->pos));
+
+    first = 1;
+
+    while (b->pos < b->last) {
+        p = packet;
+
+        f->cc++;
+
+        *p++ = 0x47;
+        *p++ = (u_char) (f->pid >> 8);
+
+        if (first) {
+            p[-1] |= 0x40;
+        }
+
+        *p++ = (u_char) f->pid;
+        *p++ = 0x10 | (f->cc & 0x0f); /* payload */
+
+        if (first) {
+
+            if (f->key) {
+                packet[3] |= 0x20; /* adaptation */
+
+                *p++ = 7;    /* size */
+                *p++ = 0x50; /* random access + PCR */
+
+                p = ngx_rtmp_mpegts_write_pcr(p, f->dts - NGX_RTMP_HLS_DELAY);
+            }
+
+            /* PES header */
+
+            *p++ = 0x00;
+            *p++ = 0x00;
+            *p++ = 0x01;
+            *p++ = (u_char) f->sid;
+
+            header_size = 5;
+            flags = 0x80; /* PTS */
+
+            if (f->dts != f->pts) {
+                header_size += 5;
+                flags |= 0x40; /* DTS */
+            }
+
+            pes_size = (b->last - b->pos) + header_size + 3;
+            if (pes_size > 0xffff) {
+                pes_size = 0;
+            }
+
+            *p++ = (u_char) (pes_size >> 8);
+            *p++ = (u_char) pes_size;
+            *p++ = 0x80; /* H222 */
+            *p++ = (u_char) flags;
+            *p++ = (u_char) header_size;
+
+            p = ngx_rtmp_mpegts_write_pts(p, flags >> 6, f->pts +
+                                                         NGX_RTMP_HLS_DELAY);
+
+            if (f->dts != f->pts) {
+                p = ngx_rtmp_mpegts_write_pts(p, 1, f->dts +
+                                                    NGX_RTMP_HLS_DELAY);
+            }
+
+            first = 0;
+        }
+
+        body_size = (ngx_uint_t) (packet + sizeof(packet) - p);
+        in_size = (ngx_uint_t) (b->last - b->pos);
+
+        if (body_size <= in_size) {
+            ngx_memcpy(p, b->pos, body_size);
+            b->pos += body_size;
+
+        } else {
+            stuff_size = (body_size - in_size);
+
+            if (packet[3] & 0x20) {
+
+                /* has adaptation */
+
+                base = &packet[5] + packet[4];
+                p = ngx_movemem(base + stuff_size, base, p - base);
+                ngx_memset(base, 0xff, stuff_size);
+                packet[4] += (u_char) stuff_size;
+
+            } else {
+
+                /* no adaptation */
+
+                packet[3] |= 0x20;
+                p = ngx_movemem(&packet[4] + stuff_size, &packet[4],
+                                p - &packet[4]);
+
+                packet[4] = (u_char) (stuff_size - 1);
+                if (stuff_size >= 2) {
+                    packet[5] = 0;
+                    ngx_memset(&packet[6], 0xff, stuff_size - 2);
+                }
+            }
+
+            ngx_memcpy(p, b->pos, in_size);
+            b->pos = b->last;
+        }
+
+        rc = ngx_rtmp_mpegts_write_file(file, packet, sizeof(packet));
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file,
+    u_char *key, size_t key_len, uint64_t iv)
+{
+    if (AES_set_encrypt_key(key, key_len * 8, &file->key)) {
+        return NGX_ERROR;
+    }
+
+    ngx_memzero(file->iv, 8);
+
+    file->iv[8]  = (u_char) (iv >> 56);
+    file->iv[9]  = (u_char) (iv >> 48);
+    file->iv[10] = (u_char) (iv >> 40);
+    file->iv[11] = (u_char) (iv >> 32);
+    file->iv[12] = (u_char) (iv >> 24);
+    file->iv[13] = (u_char) (iv >> 16);
+    file->iv[14] = (u_char) (iv >> 8);
+    file->iv[15] = (u_char) (iv);
+
+    file->encrypt = 1;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
+    ngx_log_t *log)
+{
+    file->log = log;
+
+    file->fd = ngx_open_file(path, NGX_FILE_WRONLY, NGX_FILE_TRUNCATE,
+                             NGX_FILE_DEFAULT_ACCESS);
+
+    if (file->fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, log, ngx_errno,
+                      "hls: error creating fragment file");
+        return NGX_ERROR;
+    }
+
+    file->size = 0;
+
+    if (ngx_rtmp_mpegts_write_header(file) != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, log, ngx_errno,
+                      "hls: error writing fragment header");
+        ngx_close_file(file->fd);
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_mpegts_close_file(ngx_rtmp_mpegts_file_t *file)
+{
+    u_char   buf[16];
+    ssize_t  rc;
+
+    if (file->encrypt) {
+        ngx_memset(file->buf + file->size, 16 - file->size, 16 - file->size);
+
+        AES_cbc_encrypt(file->buf, buf, 16, &file->key, file->iv, AES_ENCRYPT);
+
+        rc = ngx_write_fd(file->fd, buf, 16);
+        if (rc < 0) {
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_close_file(file->fd);
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.h b/debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.h
new file mode 100644
index 0000000..c128a51
--- /dev/null
+++ b/debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.h
@@ -0,0 +1,46 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_MPEGTS_H_INCLUDED_
+#define _NGX_RTMP_MPEGTS_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <openssl/aes.h>
+
+
+typedef struct {
+    ngx_fd_t    fd;
+    ngx_log_t  *log;
+    unsigned    encrypt:1;
+    unsigned    size:4;
+    u_char      buf[16];
+    u_char      iv[16];
+    AES_KEY     key;
+} ngx_rtmp_mpegts_file_t;
+
+
+typedef struct {
+    uint64_t    pts;
+    uint64_t    dts;
+    ngx_uint_t  pid;
+    ngx_uint_t  sid;
+    ngx_uint_t  cc;
+    unsigned    key:1;
+} ngx_rtmp_mpegts_frame_t;
+
+
+ngx_int_t ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file,
+    u_char *key, size_t key_len, uint64_t iv);
+ngx_int_t ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
+    ngx_log_t *log);
+ngx_int_t ngx_rtmp_mpegts_close_file(ngx_rtmp_mpegts_file_t *file);
+ngx_int_t ngx_rtmp_mpegts_write_frame(ngx_rtmp_mpegts_file_t *file,
+    ngx_rtmp_mpegts_frame_t *f, ngx_buf_t *b);
+
+
+#endif /* _NGX_RTMP_MPEGTS_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp.c b/debian/modules/nginx-rtmp/ngx_rtmp.c
new file mode 100644
index 0000000..7d504a0
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp.c
@@ -0,0 +1,861 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <nginx.h>
+#include "ngx_rtmp.h"
+
+
+static char *ngx_rtmp_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+static ngx_int_t ngx_rtmp_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
+    ngx_rtmp_listen_t *listen);
+static char *ngx_rtmp_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports);
+static ngx_int_t ngx_rtmp_add_addrs(ngx_conf_t *cf, ngx_rtmp_port_t *mport,
+    ngx_rtmp_conf_addr_t *addr);
+#if (NGX_HAVE_INET6)
+static ngx_int_t ngx_rtmp_add_addrs6(ngx_conf_t *cf, ngx_rtmp_port_t *mport,
+    ngx_rtmp_conf_addr_t *addr);
+#endif
+static ngx_int_t ngx_rtmp_cmp_conf_addrs(const void *one, const void *two);
+static ngx_int_t ngx_rtmp_init_events(ngx_conf_t *cf,
+        ngx_rtmp_core_main_conf_t *cmcf);
+static ngx_int_t ngx_rtmp_init_event_handlers(ngx_conf_t *cf,
+        ngx_rtmp_core_main_conf_t *cmcf);
+static char * ngx_rtmp_merge_applications(ngx_conf_t *cf,
+        ngx_array_t *applications, void **app_conf, ngx_rtmp_module_t *module,
+        ngx_uint_t ctx_index);
+static ngx_int_t ngx_rtmp_init_process(ngx_cycle_t *cycle);
+
+
+#if (nginx_version >= 1007011)
+ngx_queue_t                         ngx_rtmp_init_queue;
+#elif (nginx_version >= 1007005)
+ngx_thread_volatile ngx_queue_t     ngx_rtmp_init_queue;
+#else
+ngx_thread_volatile ngx_event_t    *ngx_rtmp_init_queue;
+#endif
+
+
+ngx_uint_t  ngx_rtmp_max_module;
+
+
+static ngx_command_t  ngx_rtmp_commands[] = {
+
+    { ngx_string("rtmp"),
+      NGX_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_rtmp_block,
+      0,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_core_module_t  ngx_rtmp_module_ctx = {
+    ngx_string("rtmp"),
+    NULL,
+    NULL
+};
+
+
+ngx_module_t  ngx_rtmp_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_module_ctx,                  /* module context */
+    ngx_rtmp_commands,                     /* module directives */
+    NGX_CORE_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    ngx_rtmp_init_process,                 /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static char *
+ngx_rtmp_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char                        *rv;
+    ngx_uint_t                   i, m, mi, s;
+    ngx_conf_t                   pcf;
+    ngx_array_t                  ports;
+    ngx_module_t               **modules;
+    ngx_rtmp_listen_t           *listen;
+    ngx_rtmp_module_t           *module;
+    ngx_rtmp_conf_ctx_t         *ctx;
+    ngx_rtmp_core_srv_conf_t    *cscf, **cscfp;
+    ngx_rtmp_core_main_conf_t   *cmcf;
+
+    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
+    if (ctx == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *(ngx_rtmp_conf_ctx_t **) conf = ctx;
+
+    /* count the number of the rtmp modules and set up their indices */
+
+#if (nginx_version >= 1009011)
+
+    ngx_rtmp_max_module = ngx_count_modules(cf->cycle, NGX_RTMP_MODULE);
+
+#else
+
+    ngx_rtmp_max_module = 0;
+    for (m = 0; ngx_modules[m]; m++) {
+        if (ngx_modules[m]->type != NGX_RTMP_MODULE) {
+            continue;
+        }
+
+        ngx_modules[m]->ctx_index = ngx_rtmp_max_module++;
+    }
+
+#endif
+
+
+    /* the rtmp main_conf context, it is the same in the all rtmp contexts */
+
+    ctx->main_conf = ngx_pcalloc(cf->pool,
+                                 sizeof(void *) * ngx_rtmp_max_module);
+    if (ctx->main_conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+
+    /*
+     * the rtmp null srv_conf context, it is used to merge
+     * the server{}s' srv_conf's
+     */
+
+    ctx->srv_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
+    if (ctx->srv_conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+
+    /*
+     * the rtmp null app_conf context, it is used to merge
+     * the server{}s' app_conf's
+     */
+
+    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
+    if (ctx->app_conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+
+    /*
+     * create the main_conf's, the null srv_conf's, and the null app_conf's
+     * of the all rtmp modules
+     */
+
+#if (nginx_version >= 1009011)
+    modules = cf->cycle->modules;
+#else
+    modules = ngx_modules;
+#endif
+
+    for (m = 0; modules[m]; m++) {
+        if (modules[m]->type != NGX_RTMP_MODULE) {
+            continue;
+        }
+
+        module = modules[m]->ctx;
+        mi = modules[m]->ctx_index;
+
+        if (module->create_main_conf) {
+            ctx->main_conf[mi] = module->create_main_conf(cf);
+            if (ctx->main_conf[mi] == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        }
+
+        if (module->create_srv_conf) {
+            ctx->srv_conf[mi] = module->create_srv_conf(cf);
+            if (ctx->srv_conf[mi] == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        }
+
+        if (module->create_app_conf) {
+            ctx->app_conf[mi] = module->create_app_conf(cf);
+            if (ctx->app_conf[mi] == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+    pcf = *cf;
+    cf->ctx = ctx;
+
+    for (m = 0; modules[m]; m++) {
+        if (modules[m]->type != NGX_RTMP_MODULE) {
+            continue;
+        }
+
+        module = modules[m]->ctx;
+
+        if (module->preconfiguration) {
+            if (module->preconfiguration(cf) != NGX_OK) {
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+    /* parse inside the rtmp{} block */
+
+    cf->module_type = NGX_RTMP_MODULE;
+    cf->cmd_type = NGX_RTMP_MAIN_CONF;
+    rv = ngx_conf_parse(cf, NULL);
+
+    if (rv != NGX_CONF_OK) {
+        *cf = pcf;
+        return rv;
+    }
+
+
+    /* init rtmp{} main_conf's, merge the server{}s' srv_conf's */
+
+    cmcf = ctx->main_conf[ngx_rtmp_core_module.ctx_index];
+    cscfp = cmcf->servers.elts;
+
+    for (m = 0; modules[m]; m++) {
+        if (modules[m]->type != NGX_RTMP_MODULE) {
+            continue;
+        }
+
+        module = modules[m]->ctx;
+        mi = modules[m]->ctx_index;
+
+        /* init rtmp{} main_conf's */
+
+        cf->ctx = ctx;
+
+        if (module->init_main_conf) {
+            rv = module->init_main_conf(cf, ctx->main_conf[mi]);
+            if (rv != NGX_CONF_OK) {
+                *cf = pcf;
+                return rv;
+            }
+        }
+
+        for (s = 0; s < cmcf->servers.nelts; s++) {
+
+            /* merge the server{}s' srv_conf's */
+
+            cf->ctx = cscfp[s]->ctx;
+
+            if (module->merge_srv_conf) {
+                rv = module->merge_srv_conf(cf,
+                                            ctx->srv_conf[mi],
+                                            cscfp[s]->ctx->srv_conf[mi]);
+                if (rv != NGX_CONF_OK) {
+                    *cf = pcf;
+                    return rv;
+                }
+            }
+
+            if (module->merge_app_conf) {
+
+                /* merge the server{}'s app_conf */
+
+                /*ctx->app_conf = cscfp[s]->ctx->loc_conf;*/
+
+                rv = module->merge_app_conf(cf,
+                                            ctx->app_conf[mi],
+                                            cscfp[s]->ctx->app_conf[mi]);
+                if (rv != NGX_CONF_OK) {
+                    *cf = pcf;
+                    return rv;
+                }
+
+                /* merge the applications{}' app_conf's */
+
+                cscf = cscfp[s]->ctx->srv_conf[ngx_rtmp_core_module.ctx_index];
+
+                rv = ngx_rtmp_merge_applications(cf, &cscf->applications,
+                                            cscfp[s]->ctx->app_conf,
+                                            module, mi);
+                if (rv != NGX_CONF_OK) {
+                    *cf = pcf;
+                    return rv;
+                }
+            }
+
+        }
+    }
+
+
+    if (ngx_rtmp_init_events(cf, cmcf) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    for (m = 0; modules[m]; m++) {
+        if (modules[m]->type != NGX_RTMP_MODULE) {
+            continue;
+        }
+
+        module = modules[m]->ctx;
+
+        if (module->postconfiguration) {
+            if (module->postconfiguration(cf) != NGX_OK) {
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+    *cf = pcf;
+
+    if (ngx_rtmp_init_event_handlers(cf, cmcf) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (ngx_array_init(&ports, cf->temp_pool, 4, sizeof(ngx_rtmp_conf_port_t))
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    listen = cmcf->listen.elts;
+
+    for (i = 0; i < cmcf->listen.nelts; i++) {
+        if (ngx_rtmp_add_ports(cf, &ports, &listen[i]) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    return ngx_rtmp_optimize_servers(cf, &ports);
+}
+
+
+static char *
+ngx_rtmp_merge_applications(ngx_conf_t *cf, ngx_array_t *applications,
+            void **app_conf, ngx_rtmp_module_t *module, ngx_uint_t ctx_index)
+{
+    char                           *rv;
+    ngx_rtmp_conf_ctx_t            *ctx, saved;
+    ngx_rtmp_core_app_conf_t      **cacfp;
+    ngx_uint_t                      n;
+    ngx_rtmp_core_app_conf_t       *cacf;
+
+    if (applications == NULL) {
+        return NGX_CONF_OK;
+    }
+
+    ctx = (ngx_rtmp_conf_ctx_t *) cf->ctx;
+    saved = *ctx;
+
+    cacfp = applications->elts;
+    for (n = 0; n < applications->nelts; ++n, ++cacfp) {
+
+        ctx->app_conf = (*cacfp)->app_conf;
+
+        rv = module->merge_app_conf(cf, app_conf[ctx_index],
+                (*cacfp)->app_conf[ctx_index]);
+        if (rv != NGX_CONF_OK) {
+            return rv;
+        }
+
+        cacf = (*cacfp)->app_conf[ngx_rtmp_core_module.ctx_index];
+        rv = ngx_rtmp_merge_applications(cf, &cacf->applications,
+                                         (*cacfp)->app_conf,
+                                         module, ctx_index);
+        if (rv != NGX_CONF_OK) {
+            return rv;
+        }
+    }
+
+    *ctx = saved;
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_init_events(ngx_conf_t *cf, ngx_rtmp_core_main_conf_t *cmcf)
+{
+    size_t                      n;
+
+    for(n = 0; n < NGX_RTMP_MAX_EVENT; ++n) {
+        if (ngx_array_init(&cmcf->events[n], cf->pool, 1,
+                sizeof(ngx_rtmp_handler_pt)) != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    if (ngx_array_init(&cmcf->amf, cf->pool, 1,
+                sizeof(ngx_rtmp_amf_handler_t)) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_init_event_handlers(ngx_conf_t *cf, ngx_rtmp_core_main_conf_t *cmcf)
+{
+    ngx_hash_init_t             calls_hash;
+    ngx_rtmp_handler_pt        *eh;
+    ngx_rtmp_amf_handler_t     *h;
+    ngx_hash_key_t             *ha;
+    size_t                      n, m;
+
+    static size_t               pm_events[] = {
+        NGX_RTMP_MSG_CHUNK_SIZE,
+        NGX_RTMP_MSG_ABORT,
+        NGX_RTMP_MSG_ACK,
+        NGX_RTMP_MSG_ACK_SIZE,
+        NGX_RTMP_MSG_BANDWIDTH
+    };
+
+    static size_t               amf_events[] = {
+        NGX_RTMP_MSG_AMF_CMD,
+        NGX_RTMP_MSG_AMF_META,
+        NGX_RTMP_MSG_AMF_SHARED,
+        NGX_RTMP_MSG_AMF3_CMD,
+        NGX_RTMP_MSG_AMF3_META,
+        NGX_RTMP_MSG_AMF3_SHARED
+    };
+
+    /* init standard protocol events */
+    for(n = 0; n < sizeof(pm_events) / sizeof(pm_events[0]); ++n) {
+        eh = ngx_array_push(&cmcf->events[pm_events[n]]);
+        *eh = ngx_rtmp_protocol_message_handler;
+    }
+
+    /* init amf events */
+    for(n = 0; n < sizeof(amf_events) / sizeof(amf_events[0]); ++n) {
+        eh = ngx_array_push(&cmcf->events[amf_events[n]]);
+        *eh = ngx_rtmp_amf_message_handler;
+    }
+
+    /* init user protocol events */
+    eh = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_USER]);
+    *eh = ngx_rtmp_user_message_handler;
+
+    /* aggregate to audio/video map */
+    eh = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AGGREGATE]);
+    *eh = ngx_rtmp_aggregate_message_handler;
+
+    /* init amf callbacks */
+    ngx_array_init(&cmcf->amf_arrays, cf->pool, 1, sizeof(ngx_hash_key_t));
+
+    h = cmcf->amf.elts;
+    for(n = 0; n < cmcf->amf.nelts; ++n, ++h) {
+        ha = cmcf->amf_arrays.elts;
+        for(m = 0; m < cmcf->amf_arrays.nelts; ++m, ++ha) {
+            if (h->name.len == ha->key.len
+                    && !ngx_strncmp(h->name.data, ha->key.data, ha->key.len))
+            {
+                break;
+            }
+        }
+        if (m == cmcf->amf_arrays.nelts) {
+            ha = ngx_array_push(&cmcf->amf_arrays);
+            ha->key = h->name;
+            ha->key_hash = ngx_hash_key_lc(ha->key.data, ha->key.len);
+            ha->value = ngx_array_create(cf->pool, 1,
+                    sizeof(ngx_rtmp_handler_pt));
+            if (ha->value == NULL) {
+                return NGX_ERROR;
+            }
+        }
+
+        eh = ngx_array_push((ngx_array_t*)ha->value);
+        *eh = h->handler;
+    }
+
+    calls_hash.hash = &cmcf->amf_hash;
+    calls_hash.key = ngx_hash_key_lc;
+    calls_hash.max_size = 512;
+    calls_hash.bucket_size = ngx_cacheline_size;
+    calls_hash.name = "amf_hash";
+    calls_hash.pool = cf->pool;
+    calls_hash.temp_pool = NULL;
+
+    if (ngx_hash_init(&calls_hash, cmcf->amf_arrays.elts, cmcf->amf_arrays.nelts)
+            != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
+    ngx_rtmp_listen_t *listen)
+{
+    in_port_t              p;
+    ngx_uint_t             i;
+    struct sockaddr       *sa;
+    struct sockaddr_in    *sin;
+    ngx_rtmp_conf_port_t  *port;
+    ngx_rtmp_conf_addr_t  *addr;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6   *sin6;
+#endif
+
+    sa = (struct sockaddr *) &listen->sockaddr;
+
+    switch (sa->sa_family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) sa;
+        p = sin6->sin6_port;
+        break;
+#endif
+
+    default: /* AF_INET */
+        sin = (struct sockaddr_in *) sa;
+        p = sin->sin_port;
+        break;
+    }
+
+    port = ports->elts;
+    for (i = 0; i < ports->nelts; i++) {
+        if (p == port[i].port && sa->sa_family == port[i].family) {
+
+            /* a port is already in the port list */
+
+            port = &port[i];
+            goto found;
+        }
+    }
+
+    /* add a port to the port list */
+
+    port = ngx_array_push(ports);
+    if (port == NULL) {
+        return NGX_ERROR;
+    }
+
+    port->family = sa->sa_family;
+    port->port = p;
+
+    if (ngx_array_init(&port->addrs, cf->temp_pool, 2,
+                       sizeof(ngx_rtmp_conf_addr_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+found:
+
+    addr = ngx_array_push(&port->addrs);
+    if (addr == NULL) {
+        return NGX_ERROR;
+    }
+
+    addr->sockaddr = (struct sockaddr *) &listen->sockaddr;
+    addr->socklen = listen->socklen;
+    addr->ctx = listen->ctx;
+    addr->bind = listen->bind;
+    addr->wildcard = listen->wildcard;
+    addr->so_keepalive = listen->so_keepalive;
+    addr->proxy_protocol = listen->proxy_protocol;
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+    addr->tcp_keepidle = listen->tcp_keepidle;
+    addr->tcp_keepintvl = listen->tcp_keepintvl;
+    addr->tcp_keepcnt = listen->tcp_keepcnt;
+#endif
+#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+    addr->ipv6only = listen->ipv6only;
+#endif
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_rtmp_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
+{
+    ngx_uint_t             i, p, last, bind_wildcard;
+    ngx_listening_t       *ls;
+    ngx_rtmp_port_t       *mport;
+    ngx_rtmp_conf_port_t  *port;
+    ngx_rtmp_conf_addr_t  *addr;
+
+    port = ports->elts;
+    for (p = 0; p < ports->nelts; p++) {
+
+        ngx_sort(port[p].addrs.elts, (size_t) port[p].addrs.nelts,
+                 sizeof(ngx_rtmp_conf_addr_t), ngx_rtmp_cmp_conf_addrs);
+
+        addr = port[p].addrs.elts;
+        last = port[p].addrs.nelts;
+
+        /*
+         * if there is the binding to the "*:port" then we need to bind()
+         * to the "*:port" only and ignore the other bindings
+         */
+
+        if (addr[last - 1].wildcard) {
+            addr[last - 1].bind = 1;
+            bind_wildcard = 1;
+
+        } else {
+            bind_wildcard = 0;
+        }
+
+        i = 0;
+
+        while (i < last) {
+
+            if (bind_wildcard && !addr[i].bind) {
+                i++;
+                continue;
+            }
+
+            ls = ngx_create_listening(cf, addr[i].sockaddr, addr[i].socklen);
+            if (ls == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            ls->addr_ntop = 1;
+            ls->handler = ngx_rtmp_init_connection;
+            ls->pool_size = 4096;
+
+            /* TODO: error_log directive */
+            ls->logp = &cf->cycle->new_log;
+            ls->log.data = &ls->addr_text;
+            ls->log.handler = ngx_accept_log_error;
+
+            ls->keepalive = addr[i].so_keepalive;
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+            ls->keepidle = addr[i].tcp_keepidle;
+            ls->keepintvl = addr[i].tcp_keepintvl;
+            ls->keepcnt = addr[i].tcp_keepcnt;
+#endif
+
+#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+            ls->ipv6only = addr[i].ipv6only;
+#endif
+
+            mport = ngx_palloc(cf->pool, sizeof(ngx_rtmp_port_t));
+            if (mport == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            ls->servers = mport;
+
+            if (i == last - 1) {
+                mport->naddrs = last;
+
+            } else {
+                mport->naddrs = 1;
+                i = 0;
+            }
+
+            switch (ls->sockaddr->sa_family) {
+#if (NGX_HAVE_INET6)
+            case AF_INET6:
+                if (ngx_rtmp_add_addrs6(cf, mport, addr) != NGX_OK) {
+                    return NGX_CONF_ERROR;
+                }
+                break;
+#endif
+            default: /* AF_INET */
+                if (ngx_rtmp_add_addrs(cf, mport, addr) != NGX_OK) {
+                    return NGX_CONF_ERROR;
+                }
+                break;
+            }
+
+            addr++;
+            last--;
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_add_addrs(ngx_conf_t *cf, ngx_rtmp_port_t *mport,
+    ngx_rtmp_conf_addr_t *addr)
+{
+    u_char              *p;
+    size_t               len;
+    ngx_uint_t           i;
+    ngx_rtmp_in_addr_t  *addrs;
+    struct sockaddr_in  *sin;
+    u_char               buf[NGX_SOCKADDR_STRLEN];
+
+    mport->addrs = ngx_pcalloc(cf->pool,
+                               mport->naddrs * sizeof(ngx_rtmp_in_addr_t));
+    if (mport->addrs == NULL) {
+        return NGX_ERROR;
+    }
+
+    addrs = mport->addrs;
+
+    for (i = 0; i < mport->naddrs; i++) {
+
+        sin = (struct sockaddr_in *) addr[i].sockaddr;
+        addrs[i].addr = sin->sin_addr.s_addr;
+
+        addrs[i].conf.ctx = addr[i].ctx;
+
+        len = ngx_sock_ntop(addr[i].sockaddr,
+#if (nginx_version >= 1005003)
+                            addr[i].socklen,
+#endif
+                            buf, NGX_SOCKADDR_STRLEN, 1);
+
+        p = ngx_pnalloc(cf->pool, len);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(p, buf, len);
+
+        addrs[i].conf.addr_text.len = len;
+        addrs[i].conf.addr_text.data = p;
+        addrs[i].conf.proxy_protocol = addr->proxy_protocol;
+    }
+
+    return NGX_OK;
+}
+
+
+#if (NGX_HAVE_INET6)
+
+static ngx_int_t
+ngx_rtmp_add_addrs6(ngx_conf_t *cf, ngx_rtmp_port_t *mport,
+    ngx_rtmp_conf_addr_t *addr)
+{
+    u_char               *p;
+    size_t                len;
+    ngx_uint_t            i;
+    ngx_rtmp_in6_addr_t  *addrs6;
+    struct sockaddr_in6  *sin6;
+    u_char                buf[NGX_SOCKADDR_STRLEN];
+
+    mport->addrs = ngx_pcalloc(cf->pool,
+                               mport->naddrs * sizeof(ngx_rtmp_in6_addr_t));
+    if (mport->addrs == NULL) {
+        return NGX_ERROR;
+    }
+
+    addrs6 = mport->addrs;
+
+    for (i = 0; i < mport->naddrs; i++) {
+
+        sin6 = (struct sockaddr_in6 *) addr[i].sockaddr;
+        addrs6[i].addr6 = sin6->sin6_addr;
+
+        addrs6[i].conf.ctx = addr[i].ctx;
+
+        len = ngx_sock_ntop(addr[i].sockaddr,
+#if (nginx_version >= 1005003)
+                            addr[i].socklen,
+#endif
+                            buf, NGX_SOCKADDR_STRLEN, 1);
+
+        p = ngx_pnalloc(cf->pool, len);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(p, buf, len);
+
+        addrs6[i].conf.addr_text.len = len;
+        addrs6[i].conf.addr_text.data = p;
+        addrs6[i].conf.proxy_protocol = addr->proxy_protocol;
+    }
+
+    return NGX_OK;
+}
+
+#endif
+
+
+static ngx_int_t
+ngx_rtmp_cmp_conf_addrs(const void *one, const void *two)
+{
+    ngx_rtmp_conf_addr_t  *first, *second;
+
+    first = (ngx_rtmp_conf_addr_t *) one;
+    second = (ngx_rtmp_conf_addr_t *) two;
+
+    if (first->wildcard) {
+        /* a wildcard must be the last resort, shift it to the end */
+        return 1;
+    }
+
+    if (first->bind && !second->bind) {
+        /* shift explicit bind()ed addresses to the start */
+        return -1;
+    }
+
+    if (!first->bind && second->bind) {
+        /* shift explicit bind()ed addresses to the start */
+        return 1;
+    }
+
+    /* do not sort by default */
+
+    return 0;
+}
+
+
+ngx_int_t
+ngx_rtmp_fire_event(ngx_rtmp_session_t *s, ngx_uint_t evt,
+        ngx_rtmp_header_t *h, ngx_chain_t *in)
+{
+    ngx_rtmp_core_main_conf_t      *cmcf;
+    ngx_array_t                    *ch;
+    ngx_rtmp_handler_pt            *hh;
+    size_t                          n;
+
+    cmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_core_module);
+
+    ch = &cmcf->events[evt];
+    hh = ch->elts;
+    for(n = 0; n < ch->nelts; ++n, ++hh) {
+        if (*hh && (*hh)(s, h, in) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+    return NGX_OK;
+}
+
+
+void *
+ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n)
+{
+    u_char     *d, *s;
+
+    d = dst;
+    s = (u_char*)src + n - 1;
+
+    while(s >= (u_char*)src) {
+        *d++ = *s--;
+    }
+
+    return dst;
+}
+
+
+static ngx_int_t
+ngx_rtmp_init_process(ngx_cycle_t *cycle)
+{
+#if (nginx_version >= 1007005)
+    ngx_queue_init(&ngx_rtmp_init_queue);
+#endif
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp.h b/debian/modules/nginx-rtmp/ngx_rtmp.h
new file mode 100644
index 0000000..e6c34d9
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp.h
@@ -0,0 +1,622 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_H_INCLUDED_
+#define _NGX_RTMP_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_connect.h>
+#include <nginx.h>
+
+#include "ngx_rtmp_amf.h"
+#include "ngx_rtmp_bandwidth.h"
+
+
+#if (NGX_WIN32)
+typedef __int8              int8_t;
+typedef unsigned __int8     uint8_t;
+#endif
+
+
+typedef struct {
+    void                  **main_conf;
+    void                  **srv_conf;
+    void                  **app_conf;
+} ngx_rtmp_conf_ctx_t;
+
+
+typedef struct {
+    u_char                  sockaddr[NGX_SOCKADDRLEN];
+    socklen_t               socklen;
+
+    /* server ctx */
+    ngx_rtmp_conf_ctx_t    *ctx;
+
+    unsigned                bind:1;
+    unsigned                wildcard:1;
+#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+    unsigned                ipv6only:2;
+#endif
+    unsigned                so_keepalive:2;
+    unsigned                proxy_protocol:1;
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+    int                     tcp_keepidle;
+    int                     tcp_keepintvl;
+    int                     tcp_keepcnt;
+#endif
+} ngx_rtmp_listen_t;
+
+
+typedef struct {
+    ngx_rtmp_conf_ctx_t    *ctx;
+    ngx_str_t               addr_text;
+    unsigned                proxy_protocol:1;
+} ngx_rtmp_addr_conf_t;
+
+typedef struct {
+    in_addr_t               addr;
+    ngx_rtmp_addr_conf_t    conf;
+} ngx_rtmp_in_addr_t;
+
+
+#if (NGX_HAVE_INET6)
+
+typedef struct {
+    struct in6_addr         addr6;
+    ngx_rtmp_addr_conf_t    conf;
+} ngx_rtmp_in6_addr_t;
+
+#endif
+
+
+typedef struct {
+    void                   *addrs;
+    ngx_uint_t              naddrs;
+} ngx_rtmp_port_t;
+
+
+typedef struct {
+    int                     family;
+    in_port_t               port;
+    ngx_array_t             addrs;       /* array of ngx_rtmp_conf_addr_t */
+} ngx_rtmp_conf_port_t;
+
+
+typedef struct {
+    struct sockaddr        *sockaddr;
+    socklen_t               socklen;
+
+    ngx_rtmp_conf_ctx_t    *ctx;
+
+    unsigned                bind:1;
+    unsigned                wildcard:1;
+#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+    unsigned                ipv6only:2;
+#endif
+    unsigned                so_keepalive:2;
+    unsigned                proxy_protocol:1;
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+    int                     tcp_keepidle;
+    int                     tcp_keepintvl;
+    int                     tcp_keepcnt;
+#endif
+} ngx_rtmp_conf_addr_t;
+
+
+#define NGX_RTMP_VERSION                3
+
+#define NGX_LOG_DEBUG_RTMP              NGX_LOG_DEBUG_CORE
+
+#define NGX_RTMP_DEFAULT_CHUNK_SIZE     128
+
+
+/* RTMP message types */
+#define NGX_RTMP_MSG_CHUNK_SIZE         1
+#define NGX_RTMP_MSG_ABORT              2
+#define NGX_RTMP_MSG_ACK                3
+#define NGX_RTMP_MSG_USER               4
+#define NGX_RTMP_MSG_ACK_SIZE           5
+#define NGX_RTMP_MSG_BANDWIDTH          6
+#define NGX_RTMP_MSG_EDGE               7
+#define NGX_RTMP_MSG_AUDIO              8
+#define NGX_RTMP_MSG_VIDEO              9
+#define NGX_RTMP_MSG_AMF3_META          15
+#define NGX_RTMP_MSG_AMF3_SHARED        16
+#define NGX_RTMP_MSG_AMF3_CMD           17
+#define NGX_RTMP_MSG_AMF_META           18
+#define NGX_RTMP_MSG_AMF_SHARED         19
+#define NGX_RTMP_MSG_AMF_CMD            20
+#define NGX_RTMP_MSG_AGGREGATE          22
+#define NGX_RTMP_MSG_MAX                22
+
+#define NGX_RTMP_CONNECT                NGX_RTMP_MSG_MAX + 1
+#define NGX_RTMP_DISCONNECT             NGX_RTMP_MSG_MAX + 2
+#define NGX_RTMP_HANDSHAKE_DONE         NGX_RTMP_MSG_MAX + 3
+#define NGX_RTMP_MAX_EVENT              NGX_RTMP_MSG_MAX + 4
+
+
+/* RMTP control message types */
+#define NGX_RTMP_USER_STREAM_BEGIN      0
+#define NGX_RTMP_USER_STREAM_EOF        1
+#define NGX_RTMP_USER_STREAM_DRY        2
+#define NGX_RTMP_USER_SET_BUFLEN        3
+#define NGX_RTMP_USER_RECORDED          4
+#define NGX_RTMP_USER_PING_REQUEST      6
+#define NGX_RTMP_USER_PING_RESPONSE     7
+#define NGX_RTMP_USER_UNKNOWN           8
+#define NGX_RTMP_USER_BUFFER_END        31
+
+
+/* Chunk header:
+ *   max 3  basic header
+ * + max 11 message header
+ * + max 4  extended header (timestamp) */
+#define NGX_RTMP_MAX_CHUNK_HEADER       18
+
+
+typedef struct {
+    uint32_t                csid;       /* chunk stream id */
+    uint32_t                timestamp;  /* timestamp (delta) */
+    uint32_t                mlen;       /* message length */
+    uint8_t                 type;       /* message type id */
+    uint32_t                msid;       /* message stream id */
+} ngx_rtmp_header_t;
+
+
+typedef struct {
+    ngx_rtmp_header_t       hdr;
+    uint32_t                dtime;
+    uint32_t                len;        /* current fragment length */
+    uint8_t                 ext;
+    ngx_chain_t            *in;
+} ngx_rtmp_stream_t;
+
+
+/* disable zero-sized array warning by msvc */
+
+#if (NGX_WIN32)
+#pragma warning(push)
+#pragma warning(disable:4200)
+#endif
+
+
+typedef struct {
+    uint32_t                signature;  /* "RTMP" */ /* <-- FIXME wtf */
+
+    ngx_event_t             close;
+
+    void                  **ctx;
+    void                  **main_conf;
+    void                  **srv_conf;
+    void                  **app_conf;
+
+    ngx_str_t              *addr_text;
+    int                     connected;
+
+#if (nginx_version >= 1007005)
+    ngx_queue_t             posted_dry_events;
+#else
+    ngx_event_t            *posted_dry_events;
+#endif
+
+    /* client buffer time in msec */
+    uint32_t                buflen;
+    uint32_t                ack_size;
+
+    /* connection parameters */
+    ngx_str_t               app;
+    ngx_str_t               args;
+    ngx_str_t               flashver;
+    ngx_str_t               swf_url;
+    ngx_str_t               tc_url;
+    uint32_t                acodecs;
+    uint32_t                vcodecs;
+    ngx_str_t               page_url;
+
+    /* handshake data */
+    ngx_buf_t              *hs_buf;
+    u_char                 *hs_digest;
+    unsigned                hs_old:1;
+    ngx_uint_t              hs_stage;
+
+    /* connection timestamps */
+    ngx_msec_t              epoch;
+    ngx_msec_t              peer_epoch;
+    ngx_msec_t              base_time;
+    uint32_t                current_time;
+
+    /* ping */
+    ngx_event_t             ping_evt;
+    unsigned                ping_active:1;
+    unsigned                ping_reset:1;
+
+    /* auto-pushed? */
+    unsigned                auto_pushed:1;
+    unsigned                relay:1;
+    unsigned                static_relay:1;
+
+    /* input stream 0 (reserved by RTMP spec)
+     * is used as free chain link */
+
+    ngx_rtmp_stream_t      *in_streams;
+    uint32_t                in_csid;
+    ngx_uint_t              in_chunk_size;
+    ngx_pool_t             *in_pool;
+    uint32_t                in_bytes;
+    uint32_t                in_last_ack;
+
+    ngx_pool_t             *in_old_pool;
+    ngx_int_t               in_chunk_size_changing;
+
+    ngx_connection_t       *connection;
+
+    /* circular buffer of RTMP message pointers */
+    ngx_msec_t              timeout;
+    uint32_t                out_bytes;
+    size_t                  out_pos, out_last;
+    ngx_chain_t            *out_chain;
+    u_char                 *out_bpos;
+    unsigned                out_buffer:1;
+    size_t                  out_queue;
+    size_t                  out_cork;
+    ngx_chain_t            *out[0];
+} ngx_rtmp_session_t;
+
+
+#if (NGX_WIN32)
+#pragma warning(pop)
+#endif
+
+
+/* handler result code:
+ *  NGX_ERROR - error
+ *  NGX_OK    - success, may continue
+ *  NGX_DONE  - success, input parsed, reply sent; need no
+ *      more calls on this event */
+typedef ngx_int_t (*ngx_rtmp_handler_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in);
+
+
+typedef struct {
+    ngx_str_t               name;
+    ngx_rtmp_handler_pt     handler;
+} ngx_rtmp_amf_handler_t;
+
+
+typedef struct {
+    ngx_array_t             servers;    /* ngx_rtmp_core_srv_conf_t */
+    ngx_array_t             listen;     /* ngx_rtmp_listen_t */
+
+    ngx_array_t             events[NGX_RTMP_MAX_EVENT];
+
+    ngx_hash_t              amf_hash;
+    ngx_array_t             amf_arrays;
+    ngx_array_t             amf;
+} ngx_rtmp_core_main_conf_t;
+
+
+/* global main conf for stats */
+extern ngx_rtmp_core_main_conf_t   *ngx_rtmp_core_main_conf;
+
+
+typedef struct ngx_rtmp_core_srv_conf_s {
+    ngx_array_t             applications; /* ngx_rtmp_core_app_conf_t */
+
+    ngx_msec_t              timeout;
+    ngx_msec_t              ping;
+    ngx_msec_t              ping_timeout;
+    ngx_flag_t              so_keepalive;
+    ngx_int_t               max_streams;
+
+    ngx_uint_t              ack_window;
+
+    ngx_int_t               chunk_size;
+    ngx_pool_t             *pool;
+    ngx_chain_t            *free;
+    ngx_chain_t            *free_hs;
+    size_t                  max_message;
+    ngx_flag_t              play_time_fix;
+    ngx_flag_t              publish_time_fix;
+    ngx_flag_t              busy;
+    size_t                  out_queue;
+    size_t                  out_cork;
+    ngx_msec_t              buflen;
+
+    ngx_rtmp_conf_ctx_t    *ctx;
+} ngx_rtmp_core_srv_conf_t;
+
+
+typedef struct {
+    ngx_array_t             applications; /* ngx_rtmp_core_app_conf_t */
+    ngx_str_t               name;
+    void                  **app_conf;
+} ngx_rtmp_core_app_conf_t;
+
+
+typedef struct {
+    ngx_str_t              *client;
+    ngx_rtmp_session_t     *session;
+} ngx_rtmp_error_log_ctx_t;
+
+
+typedef struct {
+    ngx_int_t             (*preconfiguration)(ngx_conf_t *cf);
+    ngx_int_t             (*postconfiguration)(ngx_conf_t *cf);
+
+    void                 *(*create_main_conf)(ngx_conf_t *cf);
+    char                 *(*init_main_conf)(ngx_conf_t *cf, void *conf);
+
+    void                 *(*create_srv_conf)(ngx_conf_t *cf);
+    char                 *(*merge_srv_conf)(ngx_conf_t *cf, void *prev,
+                                    void *conf);
+
+    void                 *(*create_app_conf)(ngx_conf_t *cf);
+    char                 *(*merge_app_conf)(ngx_conf_t *cf, void *prev,
+                                    void *conf);
+} ngx_rtmp_module_t;
+
+#define NGX_RTMP_MODULE                 0x504D5452     /* "RTMP" */
+
+#define NGX_RTMP_MAIN_CONF              0x02000000
+#define NGX_RTMP_SRV_CONF               0x04000000
+#define NGX_RTMP_APP_CONF               0x08000000
+#define NGX_RTMP_REC_CONF               0x10000000
+
+
+#define NGX_RTMP_MAIN_CONF_OFFSET  offsetof(ngx_rtmp_conf_ctx_t, main_conf)
+#define NGX_RTMP_SRV_CONF_OFFSET   offsetof(ngx_rtmp_conf_ctx_t, srv_conf)
+#define NGX_RTMP_APP_CONF_OFFSET   offsetof(ngx_rtmp_conf_ctx_t, app_conf)
+
+
+#define ngx_rtmp_get_module_ctx(s, module)     (s)->ctx[module.ctx_index]
+#define ngx_rtmp_set_ctx(s, c, module)         s->ctx[module.ctx_index] = c;
+#define ngx_rtmp_delete_ctx(s, module)         s->ctx[module.ctx_index] = NULL;
+
+
+#define ngx_rtmp_get_module_main_conf(s, module)                             \
+    (s)->main_conf[module.ctx_index]
+#define ngx_rtmp_get_module_srv_conf(s, module)  (s)->srv_conf[module.ctx_index]
+#define ngx_rtmp_get_module_app_conf(s, module)  ((s)->app_conf ? \
+    (s)->app_conf[module.ctx_index] : NULL)
+
+#define ngx_rtmp_conf_get_module_main_conf(cf, module)                       \
+    ((ngx_rtmp_conf_ctx_t *) cf->ctx)->main_conf[module.ctx_index]
+#define ngx_rtmp_conf_get_module_srv_conf(cf, module)                        \
+    ((ngx_rtmp_conf_ctx_t *) cf->ctx)->srv_conf[module.ctx_index]
+#define ngx_rtmp_conf_get_module_app_conf(cf, module)                        \
+    ((ngx_rtmp_conf_ctx_t *) cf->ctx)->app_conf[module.ctx_index]
+
+
+#ifdef NGX_DEBUG
+char* ngx_rtmp_message_type(uint8_t type);
+char* ngx_rtmp_user_message_type(uint16_t evt);
+#endif
+
+void ngx_rtmp_init_connection(ngx_connection_t *c);
+ngx_rtmp_session_t * ngx_rtmp_init_session(ngx_connection_t *c,
+     ngx_rtmp_addr_conf_t *addr_conf);
+void ngx_rtmp_finalize_session(ngx_rtmp_session_t *s);
+void ngx_rtmp_handshake(ngx_rtmp_session_t *s);
+void ngx_rtmp_client_handshake(ngx_rtmp_session_t *s, unsigned async);
+void ngx_rtmp_free_handshake_buffers(ngx_rtmp_session_t *s);
+void ngx_rtmp_cycle(ngx_rtmp_session_t *s);
+void ngx_rtmp_reset_ping(ngx_rtmp_session_t *s);
+ngx_int_t ngx_rtmp_fire_event(ngx_rtmp_session_t *s, ngx_uint_t evt,
+        ngx_rtmp_header_t *h, ngx_chain_t *in);
+
+
+ngx_int_t ngx_rtmp_set_chunk_size(ngx_rtmp_session_t *s, ngx_uint_t size);
+
+
+/* Bit reverse: we need big-endians in many places  */
+void * ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n);
+
+#define ngx_rtmp_rcpymem(dst, src, n) \
+    (((u_char*)ngx_rtmp_rmemcpy(dst, src, n)) + (n))
+
+
+static ngx_inline uint16_t
+ngx_rtmp_r16(uint16_t n)
+{
+    return (n << 8) | (n >> 8);
+}
+
+
+static ngx_inline uint32_t
+ngx_rtmp_r32(uint32_t n)
+{
+    return (n << 24) | ((n << 8) & 0xff0000) | ((n >> 8) & 0xff00) | (n >> 24);
+}
+
+
+static ngx_inline uint64_t
+ngx_rtmp_r64(uint64_t n)
+{
+    return (uint64_t) ngx_rtmp_r32((uint32_t) n) << 32 |
+                      ngx_rtmp_r32((uint32_t) (n >> 32));
+}
+
+
+/* Receiving messages */
+ngx_int_t ngx_rtmp_receive_message(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in);
+ngx_int_t ngx_rtmp_protocol_message_handler(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in);
+ngx_int_t ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in);
+ngx_int_t ngx_rtmp_aggregate_message_handler(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in);
+ngx_int_t ngx_rtmp_amf_message_handler(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in);
+ngx_int_t ngx_rtmp_amf_shared_object_handler(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in);
+
+
+/* Shared output buffers */
+
+/* Store refcount in negative bytes of shared buffer */
+
+#define NGX_RTMP_REFCOUNT_TYPE              uint32_t
+#define NGX_RTMP_REFCOUNT_BYTES             sizeof(NGX_RTMP_REFCOUNT_TYPE)
+
+#define ngx_rtmp_ref(b)                     \
+    *((NGX_RTMP_REFCOUNT_TYPE*)(b) - 1)
+
+#define ngx_rtmp_ref_set(b, v)              \
+    ngx_rtmp_ref(b) = v
+
+#define ngx_rtmp_ref_get(b)                 \
+    ++ngx_rtmp_ref(b)
+
+#define ngx_rtmp_ref_put(b)                 \
+    --ngx_rtmp_ref(b)
+
+ngx_chain_t * ngx_rtmp_alloc_shared_buf(ngx_rtmp_core_srv_conf_t *cscf);
+void ngx_rtmp_free_shared_chain(ngx_rtmp_core_srv_conf_t *cscf,
+        ngx_chain_t *in);
+ngx_chain_t * ngx_rtmp_append_shared_bufs(ngx_rtmp_core_srv_conf_t *cscf,
+        ngx_chain_t *head, ngx_chain_t *in);
+
+#define ngx_rtmp_acquire_shared_chain(in)   \
+    ngx_rtmp_ref_get(in);                   \
+
+
+/* Sending messages */
+void ngx_rtmp_prepare_message(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_rtmp_header_t *lh, ngx_chain_t *out);
+ngx_int_t ngx_rtmp_send_message(ngx_rtmp_session_t *s, ngx_chain_t *out,
+        ngx_uint_t priority);
+
+/* Note on priorities:
+ * the bigger value the lower the priority.
+ * priority=0 is the highest */
+
+
+#define NGX_RTMP_LIMIT_SOFT         0
+#define NGX_RTMP_LIMIT_HARD         1
+#define NGX_RTMP_LIMIT_DYNAMIC      2
+
+/* Protocol control messages */
+ngx_chain_t * ngx_rtmp_create_chunk_size(ngx_rtmp_session_t *s,
+        uint32_t chunk_size);
+ngx_chain_t * ngx_rtmp_create_abort(ngx_rtmp_session_t *s,
+        uint32_t csid);
+ngx_chain_t * ngx_rtmp_create_ack(ngx_rtmp_session_t *s,
+        uint32_t seq);
+ngx_chain_t * ngx_rtmp_create_ack_size(ngx_rtmp_session_t *s,
+        uint32_t ack_size);
+ngx_chain_t * ngx_rtmp_create_bandwidth(ngx_rtmp_session_t *s,
+        uint32_t ack_size, uint8_t limit_type);
+
+ngx_int_t ngx_rtmp_send_chunk_size(ngx_rtmp_session_t *s,
+        uint32_t chunk_size);
+ngx_int_t ngx_rtmp_send_abort(ngx_rtmp_session_t *s,
+        uint32_t csid);
+ngx_int_t ngx_rtmp_send_ack(ngx_rtmp_session_t *s,
+        uint32_t seq);
+ngx_int_t ngx_rtmp_send_ack_size(ngx_rtmp_session_t *s,
+        uint32_t ack_size);
+ngx_int_t ngx_rtmp_send_bandwidth(ngx_rtmp_session_t *s,
+        uint32_t ack_size, uint8_t limit_type);
+
+/* User control messages */
+ngx_chain_t * ngx_rtmp_create_stream_begin(ngx_rtmp_session_t *s,
+        uint32_t msid);
+ngx_chain_t * ngx_rtmp_create_stream_eof(ngx_rtmp_session_t *s,
+        uint32_t msid);
+ngx_chain_t * ngx_rtmp_create_stream_dry(ngx_rtmp_session_t *s,
+        uint32_t msid);
+ngx_chain_t * ngx_rtmp_create_set_buflen(ngx_rtmp_session_t *s,
+        uint32_t msid, uint32_t buflen_msec);
+ngx_chain_t * ngx_rtmp_create_recorded(ngx_rtmp_session_t *s,
+        uint32_t msid);
+ngx_chain_t * ngx_rtmp_create_ping_request(ngx_rtmp_session_t *s,
+        uint32_t timestamp);
+ngx_chain_t * ngx_rtmp_create_ping_response(ngx_rtmp_session_t *s,
+        uint32_t timestamp);
+
+ngx_int_t ngx_rtmp_send_stream_begin(ngx_rtmp_session_t *s,
+        uint32_t msid);
+ngx_int_t ngx_rtmp_send_stream_eof(ngx_rtmp_session_t *s,
+        uint32_t msid);
+ngx_int_t ngx_rtmp_send_stream_dry(ngx_rtmp_session_t *s,
+        uint32_t msid);
+ngx_int_t ngx_rtmp_send_set_buflen(ngx_rtmp_session_t *s,
+        uint32_t msid, uint32_t buflen_msec);
+ngx_int_t ngx_rtmp_send_recorded(ngx_rtmp_session_t *s,
+        uint32_t msid);
+ngx_int_t ngx_rtmp_send_ping_request(ngx_rtmp_session_t *s,
+        uint32_t timestamp);
+ngx_int_t ngx_rtmp_send_ping_response(ngx_rtmp_session_t *s,
+        uint32_t timestamp);
+
+/* AMF sender/receiver */
+ngx_int_t ngx_rtmp_append_amf(ngx_rtmp_session_t *s,
+        ngx_chain_t **first, ngx_chain_t **last,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts);
+ngx_int_t ngx_rtmp_receive_amf(ngx_rtmp_session_t *s, ngx_chain_t *in,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts);
+
+ngx_chain_t * ngx_rtmp_create_amf(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts);
+ngx_int_t ngx_rtmp_send_amf(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts);
+
+/* AMF status sender */
+ngx_chain_t * ngx_rtmp_create_status(ngx_rtmp_session_t *s, char *code,
+        char* level, char *desc);
+ngx_chain_t * ngx_rtmp_create_play_status(ngx_rtmp_session_t *s, char *code,
+        char* level, ngx_uint_t duration, ngx_uint_t bytes);
+ngx_chain_t * ngx_rtmp_create_sample_access(ngx_rtmp_session_t *s);
+
+ngx_int_t ngx_rtmp_send_status(ngx_rtmp_session_t *s, char *code,
+        char* level, char *desc);
+ngx_int_t ngx_rtmp_send_play_status(ngx_rtmp_session_t *s, char *code,
+        char* level, ngx_uint_t duration, ngx_uint_t bytes);
+ngx_int_t ngx_rtmp_send_sample_access(ngx_rtmp_session_t *s);
+
+
+/* Frame types */
+#define NGX_RTMP_VIDEO_KEY_FRAME            1
+#define NGX_RTMP_VIDEO_INTER_FRAME          2
+#define NGX_RTMP_VIDEO_DISPOSABLE_FRAME     3
+
+
+static ngx_inline ngx_int_t
+ngx_rtmp_get_video_frame_type(ngx_chain_t *in)
+{
+    return (in->buf->pos[0] & 0xf0) >> 4;
+}
+
+
+static ngx_inline ngx_int_t
+ngx_rtmp_is_codec_header(ngx_chain_t *in)
+{
+    return in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0;
+}
+
+
+extern ngx_rtmp_bandwidth_t                 ngx_rtmp_bw_out;
+extern ngx_rtmp_bandwidth_t                 ngx_rtmp_bw_in;
+
+
+extern ngx_uint_t                           ngx_rtmp_naccepted;
+#if (nginx_version >= 1007011)
+extern ngx_queue_t                          ngx_rtmp_init_queue;
+#elif (nginx_version >= 1007005)
+extern ngx_thread_volatile ngx_queue_t      ngx_rtmp_init_queue;
+#else
+extern ngx_thread_volatile ngx_event_t     *ngx_rtmp_init_queue;
+#endif
+
+extern ngx_uint_t                           ngx_rtmp_max_module;
+extern ngx_module_t                         ngx_rtmp_core_module;
+
+
+#endif /* _NGX_RTMP_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_access_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_access_module.c
new file mode 100644
index 0000000..06d3bc2
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_access_module.c
@@ -0,0 +1,471 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_cmd_module.h"
+
+
+static ngx_rtmp_publish_pt          next_publish;
+static ngx_rtmp_play_pt             next_play;
+
+
+#define NGX_RTMP_ACCESS_PUBLISH     0x01
+#define NGX_RTMP_ACCESS_PLAY        0x02
+
+
+static char * ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static ngx_int_t ngx_rtmp_access_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_access_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_access_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+
+
+typedef struct {
+    in_addr_t               mask;
+    in_addr_t               addr;
+    ngx_uint_t              deny;
+    ngx_uint_t              flags;
+} ngx_rtmp_access_rule_t;
+
+
+#if (NGX_HAVE_INET6)
+
+typedef struct {
+    struct in6_addr         addr;
+    struct in6_addr         mask;
+    ngx_uint_t              deny;
+    ngx_uint_t              flags;
+} ngx_rtmp_access_rule6_t;
+
+#endif
+
+
+typedef struct {
+    ngx_array_t             rules;     /* array of ngx_rtmp_access_rule_t */
+#if (NGX_HAVE_INET6)
+    ngx_array_t             rules6;    /* array of ngx_rtmp_access_rule6_t */
+#endif
+} ngx_rtmp_access_app_conf_t;
+
+
+static ngx_command_t  ngx_rtmp_access_commands[] = {
+
+    { ngx_string("allow"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE12,
+      ngx_rtmp_access_rule,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("deny"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE12,
+      ngx_rtmp_access_rule,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_access_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_access_postconfiguration,      /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    ngx_rtmp_access_create_app_conf,        /* create app configuration */
+    ngx_rtmp_access_merge_app_conf,         /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_access_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_access_module_ctx,            /* module context */
+    ngx_rtmp_access_commands,               /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_rtmp_access_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_access_app_conf_t      *aacf;
+
+    aacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_access_app_conf_t));
+    if (aacf == NULL) {
+        return NULL;
+    }
+
+    if (ngx_array_init(&aacf->rules, cf->pool, 1,
+                       sizeof(ngx_rtmp_access_rule_t))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+#if (NGX_HAVE_INET6)
+    if (ngx_array_init(&aacf->rules6, cf->pool, 1,
+                       sizeof(ngx_rtmp_access_rule6_t))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+#endif
+
+    return aacf;
+}
+
+
+static ngx_int_t
+ngx_rtmp_access_merge_rules(ngx_array_t *prev, ngx_array_t *rules)
+{
+    void   *p;
+
+    if (prev->nelts == 0) {
+        return NGX_OK;
+    }
+
+    if (rules->nelts == 0) {
+        *rules = *prev;
+        return NGX_OK;
+    }
+
+    p = ngx_array_push_n(rules, prev->nelts);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(p, prev->elts, prev->size * prev->nelts);
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_rtmp_access_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_access_app_conf_t *prev = parent;
+    ngx_rtmp_access_app_conf_t *conf = child;
+
+    if (ngx_rtmp_access_merge_rules(&prev->rules, &conf->rules) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+#if (NGX_HAVE_INET6)
+    if (ngx_rtmp_access_merge_rules(&prev->rules6, &conf->rules6) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+#endif
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_access_found(ngx_rtmp_session_t *s, ngx_uint_t deny)
+{
+    if (deny) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "access forbidden by rule");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_access_inet(ngx_rtmp_session_t *s, in_addr_t addr, ngx_uint_t flag)
+{
+    ngx_uint_t                  i;
+    ngx_rtmp_access_rule_t     *rule;
+    ngx_rtmp_access_app_conf_t *ascf;
+
+    ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module);
+
+    rule = ascf->rules.elts;
+    for (i = 0; i < ascf->rules.nelts; i++) {
+
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
+                       "access: %08XD %08XD %08XD",
+                       addr, rule[i].mask, rule[i].addr);
+
+        if ((addr & rule[i].mask) == rule[i].addr && (flag & rule[i].flags)) {
+            return ngx_rtmp_access_found(s, rule[i].deny);
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+#if (NGX_HAVE_INET6)
+
+static ngx_int_t
+ngx_rtmp_access_inet6(ngx_rtmp_session_t *s, u_char *p, ngx_uint_t flag)
+{
+    ngx_uint_t                  n;
+    ngx_uint_t                  i;
+    ngx_rtmp_access_rule6_t    *rule6;
+    ngx_rtmp_access_app_conf_t *ascf;
+
+    ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module);
+
+    rule6 = ascf->rules6.elts;
+    for (i = 0; i < ascf->rules6.nelts; i++) {
+
+#if (NGX_DEBUG)
+        {
+        size_t  cl, ml, al;
+        u_char  ct[NGX_INET6_ADDRSTRLEN];
+        u_char  mt[NGX_INET6_ADDRSTRLEN];
+        u_char  at[NGX_INET6_ADDRSTRLEN];
+
+        cl = ngx_inet6_ntop(p, ct, NGX_INET6_ADDRSTRLEN);
+        ml = ngx_inet6_ntop(rule6[i].mask.s6_addr, mt, NGX_INET6_ADDRSTRLEN);
+        al = ngx_inet6_ntop(rule6[i].addr.s6_addr, at, NGX_INET6_ADDRSTRLEN);
+
+        ngx_log_debug6(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
+                       "access: %*s %*s %*s", cl, ct, ml, mt, al, at);
+        }
+#endif
+
+        for (n = 0; n < 16; n++) {
+            if ((p[n] & rule6[i].mask.s6_addr[n]) != rule6[i].addr.s6_addr[n]) {
+                goto next;
+            }
+        }
+
+        if (flag & rule6[i].flags) {
+            return ngx_rtmp_access_found(s, rule6[i].deny);
+        }
+
+    next:
+        continue;
+    }
+
+    return NGX_OK;
+}
+
+#endif
+
+
+static ngx_int_t
+ngx_rtmp_access(ngx_rtmp_session_t *s, ngx_uint_t flag)
+{
+    struct sockaddr_in             *sin;
+    ngx_rtmp_access_app_conf_t     *ascf;
+#if (NGX_HAVE_INET6)
+    u_char                         *p;
+    in_addr_t                       addr;
+    struct sockaddr_in6            *sin6;
+#endif
+
+    ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module);
+    if (ascf == NULL) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
+                       "access: NULL app conf");
+        return NGX_ERROR;
+    }
+
+    /* relay etc */
+    if (s->connection->sockaddr == NULL) {
+        return NGX_OK;
+    }
+
+    switch (s->connection->sockaddr->sa_family) {
+
+    case AF_INET:
+        sin = (struct sockaddr_in *) s->connection->sockaddr;
+        return ngx_rtmp_access_inet(s, sin->sin_addr.s_addr, flag);
+
+#if (NGX_HAVE_INET6)
+
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) s->connection->sockaddr;
+        p = sin6->sin6_addr.s6_addr;
+
+        if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
+            addr  = p[12] << 24;
+            addr += p[13] << 16;
+            addr += p[14] << 8;
+            addr += p[15];
+            return ngx_rtmp_access_inet(s, htonl(addr), flag);
+        }
+
+        return ngx_rtmp_access_inet6(s, p, flag);
+
+#endif
+    }
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_access_app_conf_t         *ascf = conf;
+
+    ngx_int_t                           rc;
+    ngx_uint_t                          all;
+    ngx_str_t                          *value;
+    ngx_cidr_t                          cidr;
+    ngx_rtmp_access_rule_t             *rule;
+#if (NGX_HAVE_INET6)
+    ngx_rtmp_access_rule6_t            *rule6;
+#endif
+    size_t                              n;
+    ngx_uint_t                          flags;
+
+    ngx_memzero(&cidr, sizeof(ngx_cidr_t));
+
+    value = cf->args->elts;
+
+    n = 1;
+    flags = 0;
+
+    if (cf->args->nelts == 2) {
+
+        flags = NGX_RTMP_ACCESS_PUBLISH | NGX_RTMP_ACCESS_PLAY;
+
+    } else {
+
+        for(; n < cf->args->nelts - 1; ++n) {
+
+            if (value[n].len == sizeof("publish") - 1 &&
+                ngx_strcmp(value[1].data, "publish") == 0)
+            {
+                flags |= NGX_RTMP_ACCESS_PUBLISH;
+                continue;
+
+            }
+
+            if (value[n].len == sizeof("play") - 1 &&
+                ngx_strcmp(value[1].data, "play") == 0)
+            {
+                flags |= NGX_RTMP_ACCESS_PLAY;
+                continue;
+
+            }
+
+            ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                          "unexpected access specified: '%V'", &value[n]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    all = (value[n].len == 3 && ngx_strcmp(value[n].data, "all") == 0);
+
+    if (!all) {
+
+        rc = ngx_ptocidr(&value[n], &cidr);
+
+        if (rc == NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid parameter \"%V\"", &value[1]);
+            return NGX_CONF_ERROR;
+        }
+
+        if (rc == NGX_DONE) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "low address bits of %V are meaningless",
+                               &value[1]);
+        }
+    }
+
+    switch (cidr.family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+    case 0: /* all */
+
+        rule6 = ngx_array_push(&ascf->rules6);
+        if (rule6 == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        rule6->mask = cidr.u.in6.mask;
+        rule6->addr = cidr.u.in6.addr;
+        rule6->deny = (value[0].data[0] == 'd') ? 1 : 0;
+        rule6->flags = flags;
+
+        if (!all) {
+            break;
+        }
+
+        /* "all" passes through */
+#endif
+
+    default: /* AF_INET */
+
+        rule = ngx_array_push(&ascf->rules);
+        if (rule == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        rule->mask = cidr.u.in.mask;
+        rule->addr = cidr.u.in.addr;
+        rule->deny = (value[0].data[0] == 'd') ? 1 : 0;
+        rule->flags = flags;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_access_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    if (ngx_rtmp_access(s, NGX_RTMP_ACCESS_PUBLISH) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_access_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    if (ngx_rtmp_access(s, NGX_RTMP_ACCESS_PLAY) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return next_play(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_access_postconfiguration(ngx_conf_t *cf)
+{
+    /* chain handlers */
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_access_publish;
+
+    next_play = ngx_rtmp_play;
+    ngx_rtmp_play = ngx_rtmp_access_play;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_amf.c b/debian/modules/nginx-rtmp/ngx_rtmp_amf.c
new file mode 100644
index 0000000..f133d0e
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_amf.c
@@ -0,0 +1,645 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_amf.h"
+#include "ngx_rtmp.h"
+#include <string.h>
+
+
+static ngx_inline void*
+ngx_rtmp_amf_reverse_copy(void *dst, void* src, size_t len)
+{
+    size_t  k;
+
+    if (dst == NULL || src == NULL) {
+        return NULL;
+    }
+
+    for(k = 0; k < len; ++k) {
+        ((u_char*)dst)[k] = ((u_char*)src)[len - 1 - k];
+    }
+
+    return dst;
+}
+
+#define NGX_RTMP_AMF_DEBUG_SIZE 16
+
+#ifdef NGX_DEBUG
+static void
+ngx_rtmp_amf_debug(const char* op, ngx_log_t *log, u_char *p, size_t n)
+{
+    u_char          hstr[3 * NGX_RTMP_AMF_DEBUG_SIZE + 1];
+    u_char          str[NGX_RTMP_AMF_DEBUG_SIZE + 1];
+    u_char         *hp, *sp;
+    static u_char   hex[] = "0123456789ABCDEF";
+    size_t          i;
+
+    hp = hstr;
+    sp = str;
+
+    for(i = 0; i < n && i < NGX_RTMP_AMF_DEBUG_SIZE; ++i) {
+        *hp++ = ' ';
+        if (p) {
+            *hp++ = hex[(*p & 0xf0) >> 4];
+            *hp++ = hex[*p & 0x0f];
+            *sp++ = (*p >= 0x20 && *p <= 0x7e) ?
+                *p : (u_char)'?';
+            ++p;
+        } else {
+            *hp++ = 'X';
+            *hp++ = 'X';
+            *sp++ = '?';
+        }
+    }
+    *hp = *sp = '\0';
+
+    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, log, 0,
+            "AMF %s (%d)%s '%s'", op, n, hstr, str);
+}
+#endif
+
+static ngx_int_t
+ngx_rtmp_amf_get(ngx_rtmp_amf_ctx_t *ctx, void *p, size_t n)
+{
+    size_t          size;
+    ngx_chain_t    *l;
+    size_t          offset;
+    u_char         *pos, *last;
+#ifdef NGX_DEBUG
+    void           *op = p;
+    size_t          on = n;
+#endif
+
+    if (!n)
+        return NGX_OK;
+
+    for(l = ctx->link, offset = ctx->offset; l; l = l->next, offset = 0) {
+
+        pos  = l->buf->pos + offset;
+        last = l->buf->last;
+
+        if (last >= pos + n) {
+            if (p) {
+                p = ngx_cpymem(p, pos, n);
+            }
+            ctx->offset = offset + n;
+            ctx->link = l;
+
+#ifdef NGX_DEBUG
+            ngx_rtmp_amf_debug("read", ctx->log, (u_char*)op, on);
+#endif
+
+            return NGX_OK;
+        }
+
+        size = last - pos;
+
+        if (p) {
+            p = ngx_cpymem(p, pos, size);
+        }
+
+        n -= size;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ctx->log, 0,
+            "AMF read eof (%d)", n);
+
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_rtmp_amf_put(ngx_rtmp_amf_ctx_t *ctx, void *p, size_t n)
+{
+    ngx_buf_t       *b;
+    size_t          size;
+    ngx_chain_t    *l, *ln;
+
+#ifdef NGX_DEBUG
+    ngx_rtmp_amf_debug("write", ctx->log, (u_char*)p, n);
+#endif
+
+    l = ctx->link;
+
+    if (ctx->link && ctx->first == NULL) {
+        ctx->first = ctx->link;
+    }
+
+    while(n) {
+        b = l ? l->buf : NULL;
+
+        if (b == NULL || b->last == b->end) {
+
+            ln = ctx->alloc(ctx->arg);
+            if (ln == NULL) {
+                return NGX_ERROR;
+            }
+
+            if (ctx->first == NULL) {
+                ctx->first = ln;
+            }
+
+            if (l) {
+                l->next = ln;
+            }
+
+            l = ln;
+            ctx->link = l;
+            b = l->buf;
+        }
+
+        size = b->end - b->last;
+
+        if (size >= n) {
+            b->last = ngx_cpymem(b->last, p, n);
+            return NGX_OK;
+        }
+
+        b->last = ngx_cpymem(b->last, p, size);
+        p = (u_char*)p + size;
+        n -= size;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_amf_read_object(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
+        size_t nelts)
+{
+    uint8_t                 type;
+    uint16_t                len;
+    size_t                  n, namelen, maxlen;
+    ngx_int_t               rc;
+    u_char                  buf[2];
+
+    maxlen = 0;
+    for(n = 0; n < nelts; ++n) {
+        namelen = elts[n].name.len;
+        if (namelen > maxlen)
+            maxlen = namelen;
+    }
+
+    for( ;; ) {
+
+#if !(NGX_WIN32)
+        char    name[maxlen];
+#else
+        char    name[1024];
+        if (maxlen > sizeof(name)) {
+            return NGX_ERROR;
+        }
+#endif
+        /* read key */
+        switch (ngx_rtmp_amf_get(ctx, buf, 2)) {
+        case NGX_DONE:
+            /* Envivio sends unfinalized arrays */
+            return NGX_OK;
+        case NGX_OK:
+            break;
+        default:
+            return NGX_ERROR;
+        }
+
+        ngx_rtmp_amf_reverse_copy(&len, buf, 2);
+
+        if (!len)
+            break;
+
+        if (len <= maxlen) {
+            rc = ngx_rtmp_amf_get(ctx, name, len);
+
+        } else {
+            rc = ngx_rtmp_amf_get(ctx, name, maxlen);
+            if (rc != NGX_OK)
+                return NGX_ERROR;
+            rc = ngx_rtmp_amf_get(ctx, 0, len - maxlen);
+        }
+
+        if (rc != NGX_OK)
+            return NGX_ERROR;
+
+        /* TODO: if we require array to be sorted on name
+         * then we could be able to use binary search */
+        for(n = 0; n < nelts
+                && (len != elts[n].name.len
+                    || ngx_strncmp(name, elts[n].name.data, len));
+                ++n);
+
+        if (ngx_rtmp_amf_read(ctx, n < nelts ? &elts[n] : NULL, 1) != NGX_OK)
+            return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_amf_get(ctx, &type, 1) != NGX_OK
+        || type != NGX_RTMP_AMF_END)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_amf_read_array(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
+        size_t nelts)
+{
+    uint32_t                len;
+    size_t                  n;
+    u_char                  buf[4];
+
+    /* read length */
+    if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK)
+        return NGX_ERROR;
+
+    ngx_rtmp_amf_reverse_copy(&len, buf, 4);
+
+    for (n = 0; n < len; ++n) {
+        if (ngx_rtmp_amf_read(ctx, n < nelts ? &elts[n] : NULL, 1) != NGX_OK)
+            return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_amf_read_variant(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
+        size_t nelts)
+{
+    uint8_t                 type;
+    ngx_int_t               rc;
+    size_t                  n;
+    ngx_rtmp_amf_elt_t      elt;
+
+    rc = ngx_rtmp_amf_get(ctx, &type, 1);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_memzero(&elt, sizeof(elt));
+    for (n = 0; n < nelts; ++n, ++elts) {
+        if (type == elts->type) {
+            elt.data = elts->data;
+            elt.len  = elts->len;
+        }
+    }
+
+    elt.type = type | NGX_RTMP_AMF_TYPELESS;
+
+    return ngx_rtmp_amf_read(ctx, &elt, 1);
+}
+
+
+static ngx_int_t
+ngx_rtmp_amf_is_compatible_type(uint8_t t1, uint8_t t2)
+{
+    return t1 == t2
+        || (t1 == NGX_RTMP_AMF_OBJECT && t2 == NGX_RTMP_AMF_MIXED_ARRAY)
+        || (t2 == NGX_RTMP_AMF_OBJECT && t1 == NGX_RTMP_AMF_MIXED_ARRAY);
+}
+
+
+ngx_int_t
+ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
+        size_t nelts)
+{
+    void                       *data;
+    ngx_int_t                   type;
+    uint8_t                     type8;
+    size_t                      n;
+    uint16_t                    len;
+    ngx_int_t                   rc;
+    u_char                      buf[8];
+    uint32_t                    max_index;
+
+    for(n = 0; n < nelts; ++n) {
+
+        if (elts && elts->type & NGX_RTMP_AMF_TYPELESS) {
+            type = elts->type & ~NGX_RTMP_AMF_TYPELESS;
+            data = elts->data;
+
+        } else {
+            switch (ngx_rtmp_amf_get(ctx, &type8, 1)) {
+                case NGX_DONE:
+                    if (elts->type & NGX_RTMP_AMF_OPTIONAL) {
+                        return NGX_OK;
+                    }
+                case NGX_ERROR:
+                    return NGX_ERROR;
+            }
+            type = type8;
+            data = (elts &&
+                    ngx_rtmp_amf_is_compatible_type(
+                                 (uint8_t) (elts->type & 0xff), (uint8_t) type))
+                ? elts->data
+                : NULL;
+
+            if (elts && (elts->type & NGX_RTMP_AMF_CONTEXT)) {
+                if (data) {
+                    *(ngx_rtmp_amf_ctx_t *) data = *ctx;
+                }
+                data = NULL;
+            }
+        }
+
+        switch (type) {
+            case NGX_RTMP_AMF_NUMBER:
+                if (ngx_rtmp_amf_get(ctx, buf, 8) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                ngx_rtmp_amf_reverse_copy(data, buf, 8);
+                break;
+
+            case NGX_RTMP_AMF_BOOLEAN:
+                if (ngx_rtmp_amf_get(ctx, data, 1) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_STRING:
+                if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                ngx_rtmp_amf_reverse_copy(&len, buf, 2);
+
+                if (data == NULL) {
+                    rc = ngx_rtmp_amf_get(ctx, data, len);
+
+                } else if (elts->len <= len) {
+                    rc = ngx_rtmp_amf_get(ctx, data, elts->len - 1);
+                    if (rc != NGX_OK)
+                        return NGX_ERROR;
+                    ((char*)data)[elts->len - 1] = 0;
+                    rc = ngx_rtmp_amf_get(ctx, NULL, len - elts->len + 1);
+
+                } else {
+                    rc = ngx_rtmp_amf_get(ctx, data, len);
+                    ((char*)data)[len] = 0;
+                }
+
+                if (rc != NGX_OK) {
+                    return NGX_ERROR;
+                }
+
+                break;
+
+            case NGX_RTMP_AMF_NULL:
+            case NGX_RTMP_AMF_ARRAY_NULL:
+                break;
+
+            case NGX_RTMP_AMF_MIXED_ARRAY:
+                if (ngx_rtmp_amf_get(ctx, &max_index, 4) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+
+            case NGX_RTMP_AMF_OBJECT:
+                if (ngx_rtmp_amf_read_object(ctx, data,
+                    data && elts ? elts->len / sizeof(ngx_rtmp_amf_elt_t) : 0
+                    ) != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_ARRAY:
+                if (ngx_rtmp_amf_read_array(ctx, data,
+                    data && elts ? elts->len / sizeof(ngx_rtmp_amf_elt_t) : 0
+                    ) != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_VARIANT_:
+                if (ngx_rtmp_amf_read_variant(ctx, data,
+                    data && elts ? elts->len / sizeof(ngx_rtmp_amf_elt_t) : 0
+                    ) != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_INT8:
+                if (ngx_rtmp_amf_get(ctx, data, 1) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_INT16:
+                if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                ngx_rtmp_amf_reverse_copy(data, buf, 2);
+                break;
+
+            case NGX_RTMP_AMF_INT32:
+                if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                ngx_rtmp_amf_reverse_copy(data, buf, 4);
+                break;
+
+            case NGX_RTMP_AMF_END:
+                return NGX_OK;
+
+            default:
+                return NGX_ERROR;
+        }
+
+        if (elts) {
+            ++elts;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_amf_write_object(ngx_rtmp_amf_ctx_t *ctx,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts)
+{
+    uint16_t                len;
+    size_t                  n;
+    u_char                  buf[2];
+
+    for(n = 0; n < nelts; ++n) {
+
+        len = (uint16_t) elts[n].name.len;
+
+        if (ngx_rtmp_amf_put(ctx,
+                    ngx_rtmp_amf_reverse_copy(buf,
+                        &len, 2), 2) != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        if (ngx_rtmp_amf_put(ctx, elts[n].name.data, len) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_rtmp_amf_write(ctx, &elts[n], 1) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (ngx_rtmp_amf_put(ctx, "\0\0", 2) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_amf_write_array(ngx_rtmp_amf_ctx_t *ctx,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts)
+{
+    uint32_t                len;
+    size_t                  n;
+    u_char                  buf[4];
+
+    len = nelts;
+    if (ngx_rtmp_amf_put(ctx,
+                ngx_rtmp_amf_reverse_copy(buf,
+                    &len, 4), 4) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    for(n = 0; n < nelts; ++n) {
+        if (ngx_rtmp_amf_write(ctx, &elts[n], 1) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *ctx,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts)
+{
+    size_t                  n;
+    ngx_int_t               type;
+    uint8_t                 type8;
+    void                   *data;
+    uint16_t                len;
+    uint32_t                max_index;
+    u_char                  buf[8];
+
+    for(n = 0; n < nelts; ++n) {
+
+        type = elts[n].type;
+        data = elts[n].data;
+        len  = (uint16_t) elts[n].len;
+
+        if (type & NGX_RTMP_AMF_TYPELESS) {
+            type &= ~NGX_RTMP_AMF_TYPELESS;
+        } else {
+            type8 = (uint8_t)type;
+            if (ngx_rtmp_amf_put(ctx, &type8, 1) != NGX_OK)
+                return NGX_ERROR;
+        }
+
+        switch(type) {
+            case NGX_RTMP_AMF_NUMBER:
+                if (ngx_rtmp_amf_put(ctx,
+                            ngx_rtmp_amf_reverse_copy(buf,
+                                data, 8), 8) != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_BOOLEAN:
+                if (ngx_rtmp_amf_put(ctx, data, 1) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_STRING:
+                if (len == 0 && data) {
+                    len = (uint16_t) ngx_strlen((u_char*) data);
+                }
+
+                if (ngx_rtmp_amf_put(ctx,
+                            ngx_rtmp_amf_reverse_copy(buf,
+                                &len, 2), 2) != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+
+                if (ngx_rtmp_amf_put(ctx, data, len) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_NULL:
+            case NGX_RTMP_AMF_ARRAY_NULL:
+                break;
+
+            case NGX_RTMP_AMF_MIXED_ARRAY:
+                max_index = 0;
+                if (ngx_rtmp_amf_put(ctx, &max_index, 4) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+
+            case NGX_RTMP_AMF_OBJECT:
+                type8 = NGX_RTMP_AMF_END;
+                if (ngx_rtmp_amf_write_object(ctx, data,
+                        elts[n].len / sizeof(ngx_rtmp_amf_elt_t)) != NGX_OK
+                    || ngx_rtmp_amf_put(ctx, &type8, 1) != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_ARRAY:
+                if (ngx_rtmp_amf_write_array(ctx, data,
+                        elts[n].len / sizeof(ngx_rtmp_amf_elt_t)) != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_INT8:
+                if (ngx_rtmp_amf_put(ctx, data, 1) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_INT16:
+                if (ngx_rtmp_amf_put(ctx,
+                            ngx_rtmp_amf_reverse_copy(buf,
+                                data, 2), 2) != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+                break;
+
+            case NGX_RTMP_AMF_INT32:
+                if (ngx_rtmp_amf_put(ctx,
+                            ngx_rtmp_amf_reverse_copy(buf,
+                                data, 4), 4) != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+                break;
+
+            default:
+                return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_amf.h b/debian/modules/nginx-rtmp/ngx_rtmp_amf.h
new file mode 100644
index 0000000..8f70a12
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_amf.h
@@ -0,0 +1,71 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_AMF_H_INCLUDED_
+#define _NGX_RTMP_AMF_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+/* basic types */
+#define NGX_RTMP_AMF_NUMBER             0x00
+#define NGX_RTMP_AMF_BOOLEAN            0x01
+#define NGX_RTMP_AMF_STRING             0x02
+#define NGX_RTMP_AMF_OBJECT             0x03
+#define NGX_RTMP_AMF_NULL               0x05
+#define NGX_RTMP_AMF_ARRAY_NULL         0x06
+#define NGX_RTMP_AMF_MIXED_ARRAY        0x08
+#define NGX_RTMP_AMF_END                0x09
+#define NGX_RTMP_AMF_ARRAY              0x0a
+
+/* extended types */
+#define NGX_RTMP_AMF_INT8               0x0100
+#define NGX_RTMP_AMF_INT16              0x0101
+#define NGX_RTMP_AMF_INT32              0x0102
+#define NGX_RTMP_AMF_VARIANT_           0x0103
+
+/* r/w flags */
+#define NGX_RTMP_AMF_OPTIONAL           0x1000
+#define NGX_RTMP_AMF_TYPELESS           0x2000
+#define NGX_RTMP_AMF_CONTEXT            0x4000
+
+#define NGX_RTMP_AMF_VARIANT            (NGX_RTMP_AMF_VARIANT_\
+                                        |NGX_RTMP_AMF_TYPELESS)
+
+
+typedef struct {
+    ngx_int_t                           type;
+    ngx_str_t                           name;
+    void                               *data;
+    size_t                              len;
+} ngx_rtmp_amf_elt_t;
+
+
+typedef ngx_chain_t * (*ngx_rtmp_amf_alloc_pt)(void *arg);
+
+
+typedef struct {
+    ngx_chain_t                        *link, *first;
+    size_t                              offset;
+    ngx_rtmp_amf_alloc_pt               alloc;
+    void                               *arg;
+    ngx_log_t                          *log;
+} ngx_rtmp_amf_ctx_t;
+
+
+/* reading AMF */
+ngx_int_t ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts);
+
+/* writing AMF */
+ngx_int_t ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *ctx,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts);
+
+
+#endif /* _NGX_RTMP_AMF_H_INCLUDED_ */
+
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_auto_push_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_auto_push_module.c
new file mode 100644
index 0000000..60c85d7
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_auto_push_module.c
@@ -0,0 +1,578 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_cmd_module.h"
+#include "ngx_rtmp_relay_module.h"
+
+
+static ngx_rtmp_publish_pt          next_publish;
+static ngx_rtmp_delete_stream_pt    next_delete_stream;
+
+
+static ngx_int_t ngx_rtmp_auto_push_init_process(ngx_cycle_t *cycle);
+static void ngx_rtmp_auto_push_exit_process(ngx_cycle_t *cycle);
+static void * ngx_rtmp_auto_push_create_conf(ngx_cycle_t *cf);
+static char * ngx_rtmp_auto_push_init_conf(ngx_cycle_t *cycle, void *conf);
+#if (NGX_HAVE_UNIX_DOMAIN)
+static ngx_int_t ngx_rtmp_auto_push_publish(ngx_rtmp_session_t *s,
+       ngx_rtmp_publish_t *v);
+static ngx_int_t ngx_rtmp_auto_push_delete_stream(ngx_rtmp_session_t *s,
+       ngx_rtmp_delete_stream_t *v);
+#endif
+
+
+typedef struct ngx_rtmp_auto_push_ctx_s ngx_rtmp_auto_push_ctx_t;
+
+struct ngx_rtmp_auto_push_ctx_s {
+    ngx_int_t                      *slots; /* NGX_MAX_PROCESSES */
+    u_char                          name[NGX_RTMP_MAX_NAME];
+    u_char                          args[NGX_RTMP_MAX_ARGS];
+    ngx_event_t                     push_evt;
+};
+
+
+typedef struct {
+    ngx_flag_t                      auto_push;
+    ngx_str_t                       socket_dir;
+    ngx_msec_t                      push_reconnect;
+} ngx_rtmp_auto_push_conf_t;
+
+
+static ngx_command_t  ngx_rtmp_auto_push_commands[] = {
+
+    { ngx_string("rtmp_auto_push"),
+      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      0,
+      offsetof(ngx_rtmp_auto_push_conf_t, auto_push),
+      NULL },
+
+    { ngx_string("rtmp_auto_push_reconnect"),
+      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      0,
+      offsetof(ngx_rtmp_auto_push_conf_t, push_reconnect),
+      NULL },
+
+    { ngx_string("rtmp_socket_dir"),
+      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      0,
+      offsetof(ngx_rtmp_auto_push_conf_t, socket_dir),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_core_module_t  ngx_rtmp_auto_push_module_ctx = {
+    ngx_string("rtmp_auto_push"),
+    ngx_rtmp_auto_push_create_conf,         /* create conf */
+    ngx_rtmp_auto_push_init_conf            /* init conf */
+};
+
+
+ngx_module_t  ngx_rtmp_auto_push_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_auto_push_module_ctx,         /* module context */
+    ngx_rtmp_auto_push_commands,            /* module directives */
+    NGX_CORE_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    ngx_rtmp_auto_push_init_process,        /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    ngx_rtmp_auto_push_exit_process,        /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_auto_push_index_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    NULL,                                   /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    NULL,                                   /* create app configuration */
+    NULL                                    /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_auto_push_index_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_auto_push_index_module_ctx,   /* module context */
+    NULL,                                   /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+#define NGX_RTMP_AUTO_PUSH_SOCKNAME         "nginx-rtmp"
+
+
+static ngx_int_t
+ngx_rtmp_auto_push_init_process(ngx_cycle_t *cycle)
+{
+#if (NGX_HAVE_UNIX_DOMAIN)
+    ngx_rtmp_auto_push_conf_t  *apcf;
+    ngx_listening_t            *ls, *lss;
+    struct sockaddr_un         *saun;
+    int                         reuseaddr;
+    ngx_socket_t                s;
+    size_t                      n;
+    ngx_file_info_t             fi;
+
+    if (ngx_process != NGX_PROCESS_WORKER) {
+        return NGX_OK;
+    }
+
+    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(cycle->conf_ctx,
+                                                    ngx_rtmp_auto_push_module);
+    if (apcf->auto_push == 0) {
+        return NGX_OK;
+    }
+
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_auto_push_publish;
+
+    next_delete_stream = ngx_rtmp_delete_stream;
+    ngx_rtmp_delete_stream = ngx_rtmp_auto_push_delete_stream;
+
+    reuseaddr = 1;
+    s = (ngx_socket_t) -1;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, cycle->log, 0,
+            "auto_push: creating sockets");
+
+    /*TODO: clone all RTMP listenings? */
+    ls = cycle->listening.elts;
+    lss = NULL;
+    for (n = 0; n < cycle->listening.nelts; ++n, ++ls) {
+        if (ls->handler == ngx_rtmp_init_connection) {
+            lss = ls;
+            break;
+        }
+    }
+
+    if (lss == NULL) {
+        return NGX_OK;
+    }
+
+    ls = ngx_array_push(&cycle->listening);
+    if (ls == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ls = *lss;
+
+    /* Disable unix socket client address extraction
+     * from accept call
+     * Nginx generates bad addr_text with this enabled */
+    ls->addr_ntop = 0;
+
+    ls->socklen = sizeof(struct sockaddr_un);
+    saun = ngx_pcalloc(cycle->pool, ls->socklen);
+    ls->sockaddr = (struct sockaddr *) saun;
+    if (ls->sockaddr == NULL) {
+        return NGX_ERROR;
+    }
+    saun->sun_family = AF_UNIX;
+    *ngx_snprintf((u_char *) saun->sun_path, sizeof(saun->sun_path),
+                  "%V/" NGX_RTMP_AUTO_PUSH_SOCKNAME ".%i",
+                  &apcf->socket_dir, ngx_process_slot)
+        = 0;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, cycle->log, 0,
+                   "auto_push: create socket '%s'",
+                   saun->sun_path);
+
+    if (ngx_file_info(saun->sun_path, &fi) != ENOENT) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, cycle->log, 0,
+                       "auto_push: delete existing socket '%s'",
+                       saun->sun_path);
+        ngx_delete_file(saun->sun_path);
+    }
+
+    ngx_str_set(&ls->addr_text, "worker_socket");
+
+    s = ngx_socket(AF_UNIX, SOCK_STREAM, 0);
+    if (s == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
+                      ngx_socket_n " worker_socket failed");
+        return NGX_ERROR;
+    }
+
+    if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+                   (const void *) &reuseaddr, sizeof(int))
+        == -1)
+    {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
+                "setsockopt(SO_REUSEADDR) worker_socket failed");
+        goto sock_error;
+    }
+
+    if (!(ngx_event_flags & NGX_USE_AIO_EVENT)) {
+        if (ngx_nonblocking(s) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
+                          ngx_nonblocking_n " worker_socket failed");
+            return NGX_ERROR;
+        }
+    }
+
+    if (bind(s, (struct sockaddr *) saun, sizeof(*saun)) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
+                      ngx_nonblocking_n " worker_socket bind failed");
+        goto sock_error;
+    }
+
+    if (listen(s, NGX_LISTEN_BACKLOG) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
+                      "listen() to worker_socket, backlog %d failed",
+                      NGX_LISTEN_BACKLOG);
+        goto sock_error;
+    }
+
+    ls->fd = s;
+    ls->listen = 1;
+
+    return NGX_OK;
+
+sock_error:
+    if (s != (ngx_socket_t) -1 && ngx_close_socket(s) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
+                ngx_close_socket_n " worker_socket failed");
+    }
+    ngx_delete_file(saun->sun_path);
+
+    return NGX_ERROR;
+
+#else  /* NGX_HAVE_UNIX_DOMAIN */
+
+    return NGX_OK;
+
+#endif /* NGX_HAVE_UNIX_DOMAIN */
+}
+
+
+static void
+ngx_rtmp_auto_push_exit_process(ngx_cycle_t *cycle)
+{
+#if (NGX_HAVE_UNIX_DOMAIN)
+    ngx_rtmp_auto_push_conf_t  *apcf;
+    u_char                      path[NGX_MAX_PATH];
+
+    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(cycle->conf_ctx,
+                                                    ngx_rtmp_auto_push_module);
+    if (apcf->auto_push == 0) {
+        return;
+    }
+    *ngx_snprintf(path, sizeof(path),
+                  "%V/" NGX_RTMP_AUTO_PUSH_SOCKNAME ".%i",
+                  &apcf->socket_dir, ngx_process_slot)
+         = 0;
+
+    ngx_delete_file(path);
+
+#endif
+}
+
+
+static void *
+ngx_rtmp_auto_push_create_conf(ngx_cycle_t *cycle)
+{
+    ngx_rtmp_auto_push_conf_t       *apcf;
+
+    apcf = ngx_pcalloc(cycle->pool, sizeof(ngx_rtmp_auto_push_conf_t));
+    if (apcf == NULL) {
+        return NULL;
+    }
+
+    apcf->auto_push = NGX_CONF_UNSET;
+    apcf->push_reconnect = NGX_CONF_UNSET_MSEC;
+
+    return apcf;
+}
+
+
+static char *
+ngx_rtmp_auto_push_init_conf(ngx_cycle_t *cycle, void *conf)
+{
+    ngx_rtmp_auto_push_conf_t      *apcf = conf;
+
+    ngx_conf_init_value(apcf->auto_push, 0);
+    ngx_conf_init_msec_value(apcf->push_reconnect, 100);
+
+    if (apcf->socket_dir.len == 0) {
+        ngx_str_set(&apcf->socket_dir, "/tmp");
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+static void
+ngx_rtmp_auto_push_reconnect(ngx_event_t *ev)
+{
+    ngx_rtmp_session_t             *s = ev->data;
+
+    ngx_rtmp_auto_push_conf_t      *apcf;
+    ngx_rtmp_auto_push_ctx_t       *ctx;
+    ngx_int_t                      *slot;
+    ngx_int_t                       n;
+    ngx_rtmp_relay_target_t         at;
+    u_char                          path[sizeof("unix:") + NGX_MAX_PATH];
+    u_char                          flash_ver[sizeof("APSH ,") +
+                                              NGX_INT_T_LEN * 2];
+    u_char                          play_path[NGX_RTMP_MAX_NAME];
+    ngx_str_t                       name;
+    u_char                         *p;
+    ngx_str_t                      *u;
+    ngx_pid_t                       pid;
+    ngx_int_t                       npushed;
+    ngx_core_conf_t                *ccf;
+    ngx_file_info_t                 fi;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "auto_push: reconnect");
+
+    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                                    ngx_rtmp_auto_push_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_index_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    name.data = ctx->name;
+    name.len = ngx_strlen(name.data);
+
+    ngx_memzero(&at, sizeof(at));
+    ngx_str_set(&at.page_url, "nginx-auto-push");
+    at.tag = &ngx_rtmp_auto_push_module;
+
+    if (ctx->args[0]) {
+        at.play_path.data = play_path;
+        at.play_path.len = ngx_snprintf(play_path, sizeof(play_path),
+                                        "%s?%s", ctx->name, ctx->args) -
+                           play_path;
+    }
+
+    slot = ctx->slots;
+    npushed = 0;
+
+    for (n = 0; n < NGX_MAX_PROCESSES; ++n, ++slot) {
+        if (n == ngx_process_slot) {
+            continue;
+        }
+
+        pid = ngx_processes[n].pid;
+        if (pid == 0 || pid == NGX_INVALID_PID) {
+            continue;
+        }
+
+        if (*slot) {
+            npushed++;
+            continue;
+        }
+
+        at.data = &ngx_processes[n];
+
+        ngx_memzero(&at.url, sizeof(at.url));
+        u = &at.url.url;
+        p = ngx_snprintf(path, sizeof(path) - 1,
+                         "unix:%V/" NGX_RTMP_AUTO_PUSH_SOCKNAME ".%i",
+                         &apcf->socket_dir, n);
+        *p = 0;
+
+        if (ngx_file_info(path + sizeof("unix:") - 1, &fi) != NGX_OK) {
+            ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "auto_push: " ngx_file_info_n " failed: "
+                           "slot=%i pid=%P socket='%s'" "url='%V' name='%s'",
+                           n, pid, path, u, ctx->name);
+            continue;
+        }
+
+        u->data = path;
+        u->len = p - path;
+        if (ngx_parse_url(s->connection->pool, &at.url) != NGX_OK) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "auto_push: auto-push parse_url failed "
+                          "url='%V' name='%s'",
+                          u, ctx->name);
+            continue;
+        }
+
+        p = ngx_snprintf(flash_ver, sizeof(flash_ver) - 1, "APSH %i,%i",
+                         (ngx_int_t) ngx_process_slot, (ngx_int_t) ngx_pid);
+        at.flash_ver.data = flash_ver;
+        at.flash_ver.len = p - flash_ver;
+
+        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "auto_push: connect slot=%i pid=%P socket='%s' name='%s'",
+                       n, pid, path, ctx->name);
+
+        if (ngx_rtmp_relay_push(s, &name, &at) == NGX_OK) {
+            *slot = 1;
+            npushed++;
+            continue;
+        }
+
+        ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                      "auto_push: connect failed: slot=%i pid=%P socket='%s'"
+                      "url='%V' name='%s'",
+                      n, pid, path, u, ctx->name);
+    }
+
+    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                           ngx_core_module);
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "auto_push: pushed=%i total=%i failed=%i",
+                   npushed, ccf->worker_processes,
+                   ccf->worker_processes - 1 - npushed);
+
+    if (ccf->worker_processes == npushed + 1) {
+        return;
+    }
+
+    /* several workers failed */
+
+    slot = ctx->slots;
+
+    for (n = 0; n < NGX_MAX_PROCESSES; ++n, ++slot) {
+        pid = ngx_processes[n].pid;
+
+        if (n == ngx_process_slot || *slot == 1 ||
+            pid == 0 || pid == NGX_INVALID_PID)
+        {
+            continue;
+        }
+
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "auto_push: connect failed: slot=%i pid=%P name='%s'",
+                      n, pid, ctx->name);
+    }
+
+    if (!ctx->push_evt.timer_set) {
+        ngx_add_timer(&ctx->push_evt, apcf->push_reconnect);
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_auto_push_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    ngx_rtmp_auto_push_conf_t      *apcf;
+    ngx_rtmp_auto_push_ctx_t       *ctx;
+
+    if (s->auto_pushed || (s->relay && !s->static_relay)) {
+        goto next;
+    }
+
+    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                                    ngx_rtmp_auto_push_module);
+    if (apcf->auto_push == 0) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_index_module);
+    if (ctx == NULL) {
+        ctx = ngx_palloc(s->connection->pool,
+                         sizeof(ngx_rtmp_auto_push_ctx_t));
+        if (ctx == NULL) {
+            goto next;
+        }
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_auto_push_index_module);
+
+    }
+    ngx_memzero(ctx, sizeof(*ctx));
+
+    ctx->push_evt.data = s;
+    ctx->push_evt.log = s->connection->log;
+    ctx->push_evt.handler = ngx_rtmp_auto_push_reconnect;
+
+    ctx->slots = ngx_pcalloc(s->connection->pool,
+                             sizeof(ngx_int_t) * NGX_MAX_PROCESSES);
+    if (ctx->slots == NULL) {
+        goto next;
+    }
+
+    ngx_memcpy(ctx->name, v->name, sizeof(ctx->name));
+    ngx_memcpy(ctx->args, v->args, sizeof(ctx->args));
+
+    ngx_rtmp_auto_push_reconnect(&ctx->push_evt);
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_auto_push_delete_stream(ngx_rtmp_session_t *s,
+    ngx_rtmp_delete_stream_t *v)
+{
+    ngx_rtmp_auto_push_conf_t      *apcf;
+    ngx_rtmp_auto_push_ctx_t       *ctx, *pctx;
+    ngx_rtmp_relay_ctx_t           *rctx;
+    ngx_int_t                       slot;
+
+    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                                    ngx_rtmp_auto_push_module);
+    if (apcf->auto_push == 0) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_index_module);
+    if (ctx) {
+        if (ctx->push_evt.timer_set) {
+            ngx_del_timer(&ctx->push_evt);
+        }
+        goto next;
+    }
+
+    /* skip non-relays & publishers */
+    rctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (rctx == NULL ||
+        rctx->tag != &ngx_rtmp_auto_push_module ||
+        rctx->publish == NULL)
+    {
+        goto next;
+    }
+
+    slot = (ngx_process_t *) rctx->data - &ngx_processes[0];
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "auto_push: disconnect slot=%i app='%V' name='%V'",
+                   slot, &rctx->app, &rctx->name);
+
+    pctx = ngx_rtmp_get_module_ctx(rctx->publish->session,
+                                   ngx_rtmp_auto_push_index_module);
+    if (pctx == NULL) {
+        goto next;
+    }
+
+    pctx->slots[slot] = 0;
+
+    /* push reconnect */
+    if (!pctx->push_evt.timer_set) {
+        ngx_add_timer(&pctx->push_evt, apcf->push_reconnect);
+    }
+
+next:
+    return next_delete_stream(s, v);
+}
+#endif /* NGX_HAVE_UNIX_DOMAIN */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.c b/debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.c
new file mode 100644
index 0000000..82f9f0d
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.c
@@ -0,0 +1,26 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_bandwidth.h"
+
+
+void
+ngx_rtmp_update_bandwidth(ngx_rtmp_bandwidth_t *bw, uint32_t bytes)
+{
+    if (ngx_cached_time->sec > bw->intl_end) {
+        bw->bandwidth = ngx_cached_time->sec >
+            bw->intl_end + NGX_RTMP_BANDWIDTH_INTERVAL
+            ? 0
+            : bw->intl_bytes / NGX_RTMP_BANDWIDTH_INTERVAL;
+        bw->intl_bytes = 0;
+        bw->intl_end = ngx_cached_time->sec + NGX_RTMP_BANDWIDTH_INTERVAL;
+    }
+
+    bw->bytes += bytes;
+    bw->intl_bytes += bytes;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.h b/debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.h
new file mode 100644
index 0000000..b498482
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.h
@@ -0,0 +1,31 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_BANDWIDTH_H_INCLUDED_
+#define _NGX_RTMP_BANDWIDTH_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+/* Bandwidth update interval in seconds */
+#define NGX_RTMP_BANDWIDTH_INTERVAL     10
+
+
+typedef struct {
+    uint64_t            bytes;
+    uint64_t            bandwidth;      /* bytes/sec */
+
+    time_t              intl_end;
+    uint64_t            intl_bytes;
+} ngx_rtmp_bandwidth_t;
+
+
+void ngx_rtmp_update_bandwidth(ngx_rtmp_bandwidth_t *bw, uint32_t bytes);
+
+
+#endif /* _NGX_RTMP_BANDWIDTH_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_bitop.c b/debian/modules/nginx-rtmp/ngx_rtmp_bitop.c
new file mode 100644
index 0000000..855d425
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_bitop.c
@@ -0,0 +1,63 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_bitop.h"
+
+
+void
+ngx_rtmp_bit_init_reader(ngx_rtmp_bit_reader_t *br, u_char *pos, u_char *last)
+{
+    ngx_memzero(br, sizeof(ngx_rtmp_bit_reader_t));
+
+    br->pos = pos;
+    br->last = last;
+}
+
+
+uint64_t
+ngx_rtmp_bit_read(ngx_rtmp_bit_reader_t *br, ngx_uint_t n)
+{
+    uint64_t    v;
+    ngx_uint_t  d;
+
+    v = 0;
+
+    while (n) {
+
+        if (br->pos >= br->last) {
+            br->err = 1;
+            return 0;
+        }
+
+        d = (br->offs + n > 8 ? (ngx_uint_t) (8 - br->offs) : n);
+
+        v <<= d;
+        v += (*br->pos >> (8 - br->offs - d)) & ((u_char) 0xff >> (8 - d));
+
+        br->offs += d;
+        n -= d;
+
+        if (br->offs == 8) {
+            br->pos++;
+            br->offs = 0;
+        }
+    }
+
+    return v;
+}
+
+
+uint64_t
+ngx_rtmp_bit_read_golomb(ngx_rtmp_bit_reader_t *br)
+{
+    ngx_uint_t  n;
+
+    for (n = 0; ngx_rtmp_bit_read(br, 1) == 0 && !br->err; n++);
+
+    return ((uint64_t) 1 << n) + ngx_rtmp_bit_read(br, n) - 1;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_bitop.h b/debian/modules/nginx-rtmp/ngx_rtmp_bitop.h
new file mode 100644
index 0000000..c954a35
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_bitop.h
@@ -0,0 +1,46 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_BITOP_H_INCLUDED_
+#define _NGX_RTMP_BITOP_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+typedef struct {
+    u_char      *pos;
+    u_char      *last;
+    ngx_uint_t   offs;
+    ngx_uint_t   err;
+} ngx_rtmp_bit_reader_t;
+
+
+void ngx_rtmp_bit_init_reader(ngx_rtmp_bit_reader_t *br, u_char *pos,
+    u_char *last);
+uint64_t ngx_rtmp_bit_read(ngx_rtmp_bit_reader_t *br, ngx_uint_t n);
+uint64_t ngx_rtmp_bit_read_golomb(ngx_rtmp_bit_reader_t *br);
+
+
+#define ngx_rtmp_bit_read_err(br) ((br)->err)
+
+#define ngx_rtmp_bit_read_eof(br) ((br)->pos == (br)->last)
+
+#define ngx_rtmp_bit_read_8(br)                                               \
+    ((uint8_t) ngx_rtmp_bit_read(br, 8))
+
+#define ngx_rtmp_bit_read_16(br)                                              \
+    ((uint16_t) ngx_rtmp_bit_read(br, 16))
+
+#define ngx_rtmp_bit_read_32(br)                                              \
+    ((uint32_t) ngx_rtmp_bit_read(br, 32))
+
+#define ngx_rtmp_bit_read_64(br)                                              \
+    ((uint64_t) ngx_rtmp_read(br, 64))
+
+
+#endif /* _NGX_RTMP_BITOP_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.c
new file mode 100644
index 0000000..13f6677
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.c
@@ -0,0 +1,856 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_cmd_module.h"
+#include "ngx_rtmp_streams.h"
+
+
+#define NGX_RTMP_FMS_VERSION        "FMS/3,0,1,123"
+#define NGX_RTMP_CAPABILITIES       31
+
+
+static ngx_int_t ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s,
+       ngx_rtmp_connect_t *v);
+static ngx_int_t ngx_rtmp_cmd_disconnect(ngx_rtmp_session_t *s);
+static ngx_int_t ngx_rtmp_cmd_create_stream(ngx_rtmp_session_t *s,
+       ngx_rtmp_create_stream_t *v);
+static ngx_int_t ngx_rtmp_cmd_close_stream(ngx_rtmp_session_t *s,
+       ngx_rtmp_close_stream_t *v);
+static ngx_int_t ngx_rtmp_cmd_delete_stream(ngx_rtmp_session_t *s,
+       ngx_rtmp_delete_stream_t *v);
+static ngx_int_t ngx_rtmp_cmd_publish(ngx_rtmp_session_t *s,
+       ngx_rtmp_publish_t *v);
+static ngx_int_t ngx_rtmp_cmd_play(ngx_rtmp_session_t *s,
+       ngx_rtmp_play_t *v);
+static ngx_int_t ngx_rtmp_cmd_seek(ngx_rtmp_session_t *s,
+       ngx_rtmp_seek_t *v);
+static ngx_int_t ngx_rtmp_cmd_pause(ngx_rtmp_session_t *s,
+       ngx_rtmp_pause_t *v);
+
+
+static ngx_int_t ngx_rtmp_cmd_stream_begin(ngx_rtmp_session_t *s,
+       ngx_rtmp_stream_begin_t *v);
+static ngx_int_t ngx_rtmp_cmd_stream_eof(ngx_rtmp_session_t *s,
+       ngx_rtmp_stream_eof_t *v);
+static ngx_int_t ngx_rtmp_cmd_stream_dry(ngx_rtmp_session_t *s,
+       ngx_rtmp_stream_dry_t *v);
+static ngx_int_t ngx_rtmp_cmd_recorded(ngx_rtmp_session_t *s,
+       ngx_rtmp_recorded_t *v);
+static ngx_int_t ngx_rtmp_cmd_set_buflen(ngx_rtmp_session_t *s,
+       ngx_rtmp_set_buflen_t *v);
+
+
+ngx_rtmp_connect_pt         ngx_rtmp_connect;
+ngx_rtmp_disconnect_pt      ngx_rtmp_disconnect;
+ngx_rtmp_create_stream_pt   ngx_rtmp_create_stream;
+ngx_rtmp_close_stream_pt    ngx_rtmp_close_stream;
+ngx_rtmp_delete_stream_pt   ngx_rtmp_delete_stream;
+ngx_rtmp_publish_pt         ngx_rtmp_publish;
+ngx_rtmp_play_pt            ngx_rtmp_play;
+ngx_rtmp_seek_pt            ngx_rtmp_seek;
+ngx_rtmp_pause_pt           ngx_rtmp_pause;
+
+
+ngx_rtmp_stream_begin_pt    ngx_rtmp_stream_begin;
+ngx_rtmp_stream_eof_pt      ngx_rtmp_stream_eof;
+ngx_rtmp_stream_dry_pt      ngx_rtmp_stream_dry;
+ngx_rtmp_recorded_pt        ngx_rtmp_recorded;
+ngx_rtmp_set_buflen_pt      ngx_rtmp_set_buflen;
+
+
+static ngx_int_t ngx_rtmp_cmd_postconfiguration(ngx_conf_t *cf);
+
+
+static ngx_rtmp_module_t  ngx_rtmp_cmd_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_cmd_postconfiguration,         /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    NULL,                                   /* create app configuration */
+    NULL                                    /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_cmd_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_cmd_module_ctx,               /* module context */
+    NULL,                                   /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+void
+ngx_rtmp_cmd_fill_args(u_char name[NGX_RTMP_MAX_NAME],
+        u_char args[NGX_RTMP_MAX_ARGS])
+{
+    u_char      *p;
+
+    p = (u_char *)ngx_strchr(name, '?');
+    if (p == NULL) {
+        return;
+    }
+
+    *p++ = 0;
+    ngx_cpystrn(args, p, NGX_RTMP_MAX_ARGS);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_connect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    size_t                      len;
+
+    static ngx_rtmp_connect_t   v;
+
+    static ngx_rtmp_amf_elt_t  in_cmd[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("app"),
+          v.app, sizeof(v.app) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("flashVer"),
+          v.flashver, sizeof(v.flashver) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("swfUrl"),
+          v.swf_url, sizeof(v.swf_url) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("tcUrl"),
+          v.tc_url, sizeof(v.tc_url) },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("audioCodecs"),
+          &v.acodecs, sizeof(v.acodecs) },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("videoCodecs"),
+          &v.vcodecs, sizeof(v.vcodecs) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("pageUrl"),
+          v.page_url, sizeof(v.page_url) },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("objectEncoding"),
+          &v.object_encoding, 0},
+    };
+
+    static ngx_rtmp_amf_elt_t  in_elts[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.trans, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          in_cmd, sizeof(in_cmd) },
+    };
+
+    ngx_memzero(&v, sizeof(v));
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    len = ngx_strlen(v.app);
+    if (len > 10 && !ngx_memcmp(v.app + len - 10, "/_definst_", 10)) {
+        v.app[len - 10] = 0;
+    } else if (len && v.app[len - 1] == '/') {
+        v.app[len - 1] = 0;
+    }
+
+    ngx_rtmp_cmd_fill_args(v.app, v.args);
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+            "connect: app='%s' args='%s' flashver='%s' swf_url='%s' "
+            "tc_url='%s' page_url='%s' acodecs=%uD vcodecs=%uD "
+            "object_encoding=%ui",
+            v.app, v.args, v.flashver, v.swf_url, v.tc_url, v.page_url,
+            (uint32_t)v.acodecs, (uint32_t)v.vcodecs,
+            (ngx_int_t)v.object_encoding);
+
+    return ngx_rtmp_connect(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v)
+{
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    ngx_rtmp_core_app_conf_t  **cacfp;
+    ngx_uint_t                  n;
+    ngx_rtmp_header_t           h;
+    u_char                     *p;
+
+    static double               trans;
+    static double               capabilities = NGX_RTMP_CAPABILITIES;
+    static double               object_encoding = 0;
+
+    static ngx_rtmp_amf_elt_t  out_obj[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("fmsVer"),
+          NGX_RTMP_FMS_VERSION, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("capabilities"),
+          &capabilities, 0 },
+    };
+
+    static ngx_rtmp_amf_elt_t  out_inf[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("level"),
+          "status", 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("code"),
+          "NetConnection.Connect.Success", 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("description"),
+          "Connection succeeded.", 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("objectEncoding"),
+          &object_encoding, 0 }
+    };
+
+    static ngx_rtmp_amf_elt_t  out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "_result", 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &trans, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          out_obj, sizeof(out_obj) },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          out_inf, sizeof(out_inf) },
+    };
+
+    if (s->connected) {
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                "connect: duplicate connection");
+        return NGX_ERROR;
+    }
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    trans = v->trans;
+
+    /* fill session parameters */
+    s->connected = 1;
+
+    ngx_memzero(&h, sizeof(h));
+    h.csid = NGX_RTMP_CSID_AMF_INI;
+    h.type = NGX_RTMP_MSG_AMF_CMD;
+
+
+#define NGX_RTMP_SET_STRPAR(name)                                             \
+    s->name.len = ngx_strlen(v->name);                                        \
+    s->name.data = ngx_palloc(s->connection->pool, s->name.len);              \
+    ngx_memcpy(s->name.data, v->name, s->name.len)
+
+    NGX_RTMP_SET_STRPAR(app);
+    NGX_RTMP_SET_STRPAR(args);
+    NGX_RTMP_SET_STRPAR(flashver);
+    NGX_RTMP_SET_STRPAR(swf_url);
+    NGX_RTMP_SET_STRPAR(tc_url);
+    NGX_RTMP_SET_STRPAR(page_url);
+
+#undef NGX_RTMP_SET_STRPAR
+
+    p = ngx_strlchr(s->app.data, s->app.data + s->app.len, '?');
+    if (p) {
+        s->app.len = (p - s->app.data);
+    }
+
+    s->acodecs = (uint32_t) v->acodecs;
+    s->vcodecs = (uint32_t) v->vcodecs;
+
+    /* find application & set app_conf */
+    cacfp = cscf->applications.elts;
+    for(n = 0; n < cscf->applications.nelts; ++n, ++cacfp) {
+        if ((*cacfp)->name.len == s->app.len &&
+            ngx_strncmp((*cacfp)->name.data, s->app.data, s->app.len) == 0)
+        {
+            /* found app! */
+            s->app_conf = (*cacfp)->app_conf;
+            break;
+        }
+    }
+
+    if (s->app_conf == NULL) {
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                      "connect: application not found: '%V'", &s->app);
+        return NGX_ERROR;
+    }
+
+    object_encoding = v->object_encoding;
+
+    return ngx_rtmp_send_ack_size(s, cscf->ack_window) != NGX_OK ||
+           ngx_rtmp_send_bandwidth(s, cscf->ack_window,
+                                   NGX_RTMP_LIMIT_DYNAMIC) != NGX_OK ||
+           ngx_rtmp_send_chunk_size(s, cscf->chunk_size) != NGX_OK ||
+           ngx_rtmp_send_amf(s, &h, out_elts,
+                             sizeof(out_elts) / sizeof(out_elts[0]))
+           != NGX_OK ? NGX_ERROR : NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_create_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                                ngx_chain_t *in)
+{
+    static ngx_rtmp_create_stream_t     v;
+
+    static ngx_rtmp_amf_elt_t  in_elts[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.trans, sizeof(v.trans) },
+    };
+
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, "createStream");
+
+    return ngx_rtmp_create_stream(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_create_stream(ngx_rtmp_session_t *s, ngx_rtmp_create_stream_t *v)
+{
+    /* support one message stream per connection */
+    static double               stream;
+    static double               trans;
+    ngx_rtmp_header_t           h;
+
+    static ngx_rtmp_amf_elt_t  out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "_result", 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &trans, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &stream, sizeof(stream) },
+    };
+
+    trans = v->trans;
+    stream = NGX_RTMP_MSID;
+
+    ngx_memzero(&h, sizeof(h));
+
+    h.csid = NGX_RTMP_CSID_AMF_INI;
+    h.type = NGX_RTMP_MSG_AMF_CMD;
+
+    return ngx_rtmp_send_amf(s, &h, out_elts,
+                             sizeof(out_elts) / sizeof(out_elts[0])) == NGX_OK ?
+           NGX_DONE : NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_close_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                               ngx_chain_t *in)
+{
+    static ngx_rtmp_close_stream_t     v;
+
+    static ngx_rtmp_amf_elt_t  in_elts[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.stream, 0 },
+    };
+
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                             sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, "closeStream");
+
+    return ngx_rtmp_close_stream(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
+{
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_delete_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                                ngx_chain_t *in)
+{
+    static ngx_rtmp_delete_stream_t     v;
+
+    static ngx_rtmp_amf_elt_t  in_elts[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.stream, 0 },
+    };
+
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                             sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    return ngx_rtmp_delete_stream(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_delete_stream(ngx_rtmp_session_t *s, ngx_rtmp_delete_stream_t *v)
+{
+    ngx_rtmp_close_stream_t         cv;
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, "deleteStream");
+
+    cv.stream = 0;
+
+    return ngx_rtmp_close_stream(s, &cv);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_publish_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    static ngx_rtmp_publish_t       v;
+
+    static ngx_rtmp_amf_elt_t      in_elts[] = {
+
+        /* transaction is always 0 */
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          &v.name, sizeof(v.name) },
+
+        { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          &v.type, sizeof(v.type) },
+    };
+
+    ngx_memzero(&v, sizeof(v));
+
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                             sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_rtmp_cmd_fill_args(v.name, v.args);
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "publish: name='%s' args='%s' type=%s silent=%d",
+                  v.name, v.args, v.type, v.silent);
+
+    return ngx_rtmp_publish(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    return NGX_OK;
+}
+
+static ngx_int_t
+ngx_rtmp_cmd_play_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    static ngx_rtmp_play_t          v;
+
+    static ngx_rtmp_amf_elt_t       in_elts[] = {
+
+        /* transaction is always 0 */
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          &v.name, sizeof(v.name) },
+
+        { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.start, 0 },
+
+        { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.duration, 0 },
+
+        { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_BOOLEAN,
+          ngx_null_string,
+          &v.reset, 0 }
+    };
+
+    ngx_memzero(&v, sizeof(v));
+
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                             sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_rtmp_cmd_fill_args(v.name, v.args);
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "play: name='%s' args='%s' start=%i duration=%i "
+                  "reset=%i silent=%i",
+                  v.name, v.args, (ngx_int_t) v.start,
+                  (ngx_int_t) v.duration, (ngx_int_t) v.reset,
+                  (ngx_int_t) v.silent);
+
+    return ngx_rtmp_play(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_play2_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    static ngx_rtmp_play_t          v;
+    static ngx_rtmp_close_stream_t  vc;
+
+    static ngx_rtmp_amf_elt_t       in_obj[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("start"),
+          &v.start, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("streamName"),
+          &v.name, sizeof(v.name) },
+    };
+
+    static ngx_rtmp_amf_elt_t       in_elts[] = {
+
+        /* transaction is always 0 */
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          &in_obj, sizeof(in_obj) }
+    };
+
+    ngx_memzero(&v, sizeof(v));
+
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                             sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_rtmp_cmd_fill_args(v.name, v.args);
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "play2: name='%s' args='%s' start=%i",
+                  v.name, v.args, (ngx_int_t) v.start);
+
+    /* continue from current timestamp */
+
+    if (v.start < 0) {
+        v.start = s->current_time;
+    }
+
+    ngx_memzero(&vc, sizeof(vc));
+
+    /* close_stream should be synchronous */
+    ngx_rtmp_close_stream(s, &vc);
+
+    return ngx_rtmp_play(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_pause_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    static ngx_rtmp_pause_t     v;
+
+    static ngx_rtmp_amf_elt_t   in_elts[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_BOOLEAN,
+          ngx_null_string,
+          &v.pause, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.position, 0 },
+    };
+
+    ngx_memzero(&v, sizeof(v));
+
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "pause: pause=%i position=%i",
+                    (ngx_int_t) v.pause, (ngx_int_t) v.position);
+
+    return ngx_rtmp_pause(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_pause(ngx_rtmp_session_t *s, ngx_rtmp_pause_t *v)
+{
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_disconnect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                        ngx_chain_t *in)
+{
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, "disconnect");
+
+    return ngx_rtmp_disconnect(s);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_disconnect(ngx_rtmp_session_t *s)
+{
+    return ngx_rtmp_delete_stream(s, NULL);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_seek_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    static ngx_rtmp_seek_t         v;
+
+    static ngx_rtmp_amf_elt_t      in_elts[] = {
+
+        /* transaction is always 0 */
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.offset, sizeof(v.offset) },
+    };
+
+    ngx_memzero(&v, sizeof(v));
+
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                             sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "seek: offset=%i", (ngx_int_t) v.offset);
+
+    return ngx_rtmp_seek(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_seek(ngx_rtmp_session_t *s, ngx_rtmp_seek_t *v)
+{
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
+{
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_eof_t *v)
+{
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_stream_dry(ngx_rtmp_session_t *s, ngx_rtmp_stream_dry_t *v)
+{
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_recorded(ngx_rtmp_session_t *s,
+                      ngx_rtmp_recorded_t *v)
+{
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_cmd_set_buflen(ngx_rtmp_session_t *s, ngx_rtmp_set_buflen_t *v)
+{
+    return NGX_OK;
+}
+
+
+static ngx_rtmp_amf_handler_t ngx_rtmp_cmd_map[] = {
+    { ngx_string("connect"),            ngx_rtmp_cmd_connect_init           },
+    { ngx_string("createStream"),       ngx_rtmp_cmd_create_stream_init     },
+    { ngx_string("closeStream"),        ngx_rtmp_cmd_close_stream_init      },
+    { ngx_string("deleteStream"),       ngx_rtmp_cmd_delete_stream_init     },
+    { ngx_string("publish"),            ngx_rtmp_cmd_publish_init           },
+    { ngx_string("play"),               ngx_rtmp_cmd_play_init              },
+    { ngx_string("play2"),              ngx_rtmp_cmd_play2_init             },
+    { ngx_string("seek"),               ngx_rtmp_cmd_seek_init              },
+    { ngx_string("pause"),              ngx_rtmp_cmd_pause_init             },
+    { ngx_string("pauseraw"),           ngx_rtmp_cmd_pause_init             },
+};
+
+
+static ngx_int_t
+ngx_rtmp_cmd_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t          *cmcf;
+    ngx_rtmp_handler_pt                *h;
+    ngx_rtmp_amf_handler_t             *ch, *bh;
+    size_t                              n, ncalls;
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    /* redirect disconnects to deleteStream
+     * to free client modules from registering
+     * disconnect callback */
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_rtmp_cmd_disconnect_init;
+
+    /* register AMF callbacks */
+
+    ncalls = sizeof(ngx_rtmp_cmd_map) / sizeof(ngx_rtmp_cmd_map[0]);
+
+    ch = ngx_array_push_n(&cmcf->amf, ncalls);
+    if (ch == NULL) {
+        return NGX_ERROR;
+    }
+
+    bh = ngx_rtmp_cmd_map;
+
+    for(n = 0; n < ncalls; ++n, ++ch, ++bh) {
+        *ch = *bh;
+    }
+
+    ngx_rtmp_connect = ngx_rtmp_cmd_connect;
+    ngx_rtmp_disconnect = ngx_rtmp_cmd_disconnect;
+    ngx_rtmp_create_stream = ngx_rtmp_cmd_create_stream;
+    ngx_rtmp_close_stream = ngx_rtmp_cmd_close_stream;
+    ngx_rtmp_delete_stream = ngx_rtmp_cmd_delete_stream;
+    ngx_rtmp_publish = ngx_rtmp_cmd_publish;
+    ngx_rtmp_play = ngx_rtmp_cmd_play;
+    ngx_rtmp_seek = ngx_rtmp_cmd_seek;
+    ngx_rtmp_pause = ngx_rtmp_cmd_pause;
+
+    ngx_rtmp_stream_begin = ngx_rtmp_cmd_stream_begin;
+    ngx_rtmp_stream_eof = ngx_rtmp_cmd_stream_eof;
+    ngx_rtmp_stream_dry = ngx_rtmp_cmd_stream_dry;
+    ngx_rtmp_recorded = ngx_rtmp_cmd_recorded;
+    ngx_rtmp_set_buflen = ngx_rtmp_cmd_set_buflen;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.h b/debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.h
new file mode 100644
index 0000000..4a0b955
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.h
@@ -0,0 +1,151 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_CMD_H_INCLUDED_
+#define _NGX_RTMP_CMD_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include "ngx_rtmp.h"
+
+
+#define NGX_RTMP_MAX_NAME           256
+#define NGX_RTMP_MAX_URL            256
+#define NGX_RTMP_MAX_ARGS           NGX_RTMP_MAX_NAME
+
+
+/* Basic RTMP call support */
+
+typedef struct {
+    double                          trans;
+    u_char                          app[NGX_RTMP_MAX_NAME];
+    u_char                          args[NGX_RTMP_MAX_ARGS];
+    u_char                          flashver[32];
+    u_char                          swf_url[NGX_RTMP_MAX_URL];
+    u_char                          tc_url[NGX_RTMP_MAX_URL];
+    double                          acodecs;
+    double                          vcodecs;
+    u_char                          page_url[NGX_RTMP_MAX_URL];
+    double                          object_encoding;
+} ngx_rtmp_connect_t;
+
+
+typedef struct {
+    double                          trans;
+    double                          stream;
+} ngx_rtmp_create_stream_t;
+
+
+typedef struct {
+    double                          stream;
+} ngx_rtmp_delete_stream_t;
+
+
+typedef struct {
+    double                          stream;
+} ngx_rtmp_close_stream_t;
+
+
+typedef struct {
+    u_char                          name[NGX_RTMP_MAX_NAME];
+    u_char                          args[NGX_RTMP_MAX_ARGS];
+    u_char                          type[16];
+    int                             silent;
+} ngx_rtmp_publish_t;
+
+
+typedef struct {
+    u_char                          name[NGX_RTMP_MAX_NAME];
+    u_char                          args[NGX_RTMP_MAX_ARGS];
+    double                          start;
+    double                          duration;
+    int                             reset;
+    int                             silent;
+} ngx_rtmp_play_t;
+
+
+typedef struct {
+    double                          offset;
+} ngx_rtmp_seek_t;
+
+
+typedef struct {
+    uint8_t                         pause;
+    double                          position;
+} ngx_rtmp_pause_t;
+
+
+typedef struct {
+    uint32_t                        msid;
+} ngx_rtmp_msid_t;
+
+
+typedef ngx_rtmp_msid_t             ngx_rtmp_stream_begin_t;
+typedef ngx_rtmp_msid_t             ngx_rtmp_stream_eof_t;
+typedef ngx_rtmp_msid_t             ngx_rtmp_stream_dry_t;
+typedef ngx_rtmp_msid_t             ngx_rtmp_recorded_t;
+
+
+typedef struct {
+    uint32_t                        msid;
+    uint32_t                        buflen;
+} ngx_rtmp_set_buflen_t;
+
+
+void ngx_rtmp_cmd_fill_args(u_char name[NGX_RTMP_MAX_NAME],
+        u_char args[NGX_RTMP_MAX_ARGS]);
+
+
+typedef ngx_int_t (*ngx_rtmp_connect_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_connect_t *v);
+typedef ngx_int_t (*ngx_rtmp_disconnect_pt)(ngx_rtmp_session_t *s);
+typedef ngx_int_t (*ngx_rtmp_create_stream_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_create_stream_t *v);
+typedef ngx_int_t (*ngx_rtmp_close_stream_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_close_stream_t *v);
+typedef ngx_int_t (*ngx_rtmp_delete_stream_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_delete_stream_t *v);
+typedef ngx_int_t (*ngx_rtmp_publish_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_publish_t *v);
+typedef ngx_int_t (*ngx_rtmp_play_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_play_t *v);
+typedef ngx_int_t (*ngx_rtmp_seek_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_seek_t *v);
+typedef ngx_int_t (*ngx_rtmp_pause_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_pause_t *v);
+
+typedef ngx_int_t (*ngx_rtmp_stream_begin_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_stream_begin_t *v);
+typedef ngx_int_t (*ngx_rtmp_stream_eof_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_stream_eof_t *v);
+typedef ngx_int_t (*ngx_rtmp_stream_dry_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_stream_dry_t *v);
+typedef ngx_int_t (*ngx_rtmp_recorded_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_recorded_t *v);
+typedef ngx_int_t (*ngx_rtmp_set_buflen_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_set_buflen_t *v);
+
+
+extern ngx_rtmp_connect_pt          ngx_rtmp_connect;
+extern ngx_rtmp_disconnect_pt       ngx_rtmp_disconnect;
+extern ngx_rtmp_create_stream_pt    ngx_rtmp_create_stream;
+extern ngx_rtmp_close_stream_pt     ngx_rtmp_close_stream;
+extern ngx_rtmp_delete_stream_pt    ngx_rtmp_delete_stream;
+extern ngx_rtmp_publish_pt          ngx_rtmp_publish;
+extern ngx_rtmp_play_pt             ngx_rtmp_play;
+extern ngx_rtmp_seek_pt             ngx_rtmp_seek;
+extern ngx_rtmp_pause_pt            ngx_rtmp_pause;
+
+extern ngx_rtmp_stream_begin_pt     ngx_rtmp_stream_begin;
+extern ngx_rtmp_stream_eof_pt       ngx_rtmp_stream_eof;
+extern ngx_rtmp_stream_dry_pt       ngx_rtmp_stream_dry;
+extern ngx_rtmp_set_buflen_pt       ngx_rtmp_set_buflen;
+extern ngx_rtmp_recorded_pt         ngx_rtmp_recorded;
+
+
+#endif /*_NGX_RTMP_CMD_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_codec_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_codec_module.c
new file mode 100644
index 0000000..ddc9273
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_codec_module.c
@@ -0,0 +1,956 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_codec_module.h"
+#include "ngx_rtmp_live_module.h"
+#include "ngx_rtmp_cmd_module.h"
+#include "ngx_rtmp_bitop.h"
+
+
+#define NGX_RTMP_CODEC_META_OFF     0
+#define NGX_RTMP_CODEC_META_ON      1
+#define NGX_RTMP_CODEC_META_COPY    2
+
+
+static void * ngx_rtmp_codec_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_codec_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+static ngx_int_t ngx_rtmp_codec_postconfiguration(ngx_conf_t *cf);
+static ngx_int_t ngx_rtmp_codec_reconstruct_meta(ngx_rtmp_session_t *s);
+static ngx_int_t ngx_rtmp_codec_copy_meta(ngx_rtmp_session_t *s,
+       ngx_rtmp_header_t *h, ngx_chain_t *in);
+static ngx_int_t ngx_rtmp_codec_prepare_meta(ngx_rtmp_session_t *s,
+       uint32_t timestamp);
+static void ngx_rtmp_codec_parse_aac_header(ngx_rtmp_session_t *s,
+       ngx_chain_t *in);
+static void ngx_rtmp_codec_parse_avc_header(ngx_rtmp_session_t *s,
+       ngx_chain_t *in);
+#if (NGX_DEBUG)
+static void ngx_rtmp_codec_dump_header(ngx_rtmp_session_t *s, const char *type,
+       ngx_chain_t *in);
+#endif
+
+
+typedef struct {
+    ngx_uint_t                      meta;
+} ngx_rtmp_codec_app_conf_t;
+
+
+static ngx_conf_enum_t ngx_rtmp_codec_meta_slots[] = {
+    { ngx_string("off"),            NGX_RTMP_CODEC_META_OFF  },
+    { ngx_string("on"),             NGX_RTMP_CODEC_META_ON   },
+    { ngx_string("copy"),           NGX_RTMP_CODEC_META_COPY },
+    { ngx_null_string,              0 }
+};
+
+
+static ngx_command_t  ngx_rtmp_codec_commands[] = {
+
+    { ngx_string("meta"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_enum_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_codec_app_conf_t, meta),
+      &ngx_rtmp_codec_meta_slots },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_codec_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_codec_postconfiguration,       /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    ngx_rtmp_codec_create_app_conf,         /* create app configuration */
+    ngx_rtmp_codec_merge_app_conf           /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_codec_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_codec_module_ctx,             /* module context */
+    ngx_rtmp_codec_commands,                /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static const char *
+audio_codecs[] = {
+    "",
+    "ADPCM",
+    "MP3",
+    "LinearLE",
+    "Nellymoser16",
+    "Nellymoser8",
+    "Nellymoser",
+    "G711A",
+    "G711U",
+    "",
+    "AAC",
+    "Speex",
+    "",
+    "",
+    "MP3-8K",
+    "DeviceSpecific",
+    "Uncompressed"
+};
+
+
+static const char *
+video_codecs[] = {
+    "",
+    "Jpeg",
+    "Sorenson-H263",
+    "ScreenVideo",
+    "On2-VP6",
+    "On2-VP6-Alpha",
+    "ScreenVideo2",
+    "H264",
+};
+
+
+u_char *
+ngx_rtmp_get_audio_codec_name(ngx_uint_t id)
+{
+    return (u_char *)(id < sizeof(audio_codecs) / sizeof(audio_codecs[0])
+        ? audio_codecs[id]
+        : "");
+}
+
+
+u_char *
+ngx_rtmp_get_video_codec_name(ngx_uint_t id)
+{
+    return (u_char *)(id < sizeof(video_codecs) / sizeof(video_codecs[0])
+        ? video_codecs[id]
+        : "");
+}
+
+
+static ngx_uint_t
+ngx_rtmp_codec_get_next_version()
+{
+    ngx_uint_t          v;
+    static ngx_uint_t   version;
+
+    do {
+        v = ++version;
+    } while (v == 0);
+
+    return v;
+}
+
+
+static ngx_int_t
+ngx_rtmp_codec_disconnect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    ngx_rtmp_codec_ctx_t               *ctx;
+    ngx_rtmp_core_srv_conf_t           *cscf;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    if (ctx->avc_header) {
+        ngx_rtmp_free_shared_chain(cscf, ctx->avc_header);
+        ctx->avc_header = NULL;
+    }
+
+    if (ctx->aac_header) {
+        ngx_rtmp_free_shared_chain(cscf, ctx->aac_header);
+        ctx->aac_header = NULL;
+    }
+
+    if (ctx->meta) {
+        ngx_rtmp_free_shared_chain(cscf, ctx->meta);
+        ctx->meta = NULL;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_codec_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    ngx_rtmp_core_srv_conf_t           *cscf;
+    ngx_rtmp_codec_ctx_t               *ctx;
+    ngx_chain_t                       **header;
+    uint8_t                             fmt;
+    static ngx_uint_t                   sample_rates[] =
+                                        { 5512, 11025, 22050, 44100 };
+
+    if (h->type != NGX_RTMP_MSG_AUDIO && h->type != NGX_RTMP_MSG_VIDEO) {
+        return NGX_OK;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+    if (ctx == NULL) {
+        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_codec_ctx_t));
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_codec_module);
+    }
+
+    /* save codec */
+    if (in->buf->last - in->buf->pos < 1) {
+        return NGX_OK;
+    }
+
+    fmt =  in->buf->pos[0];
+    if (h->type == NGX_RTMP_MSG_AUDIO) {
+        ctx->audio_codec_id = (fmt & 0xf0) >> 4;
+        ctx->audio_channels = (fmt & 0x01) + 1;
+        ctx->sample_size = (fmt & 0x02) ? 2 : 1;
+
+        if (ctx->sample_rate == 0) {
+            ctx->sample_rate = sample_rates[(fmt & 0x0c) >> 2];
+        }
+    } else {
+        ctx->video_codec_id = (fmt & 0x0f);
+    }
+
+    /* save AVC/AAC header */
+    if (in->buf->last - in->buf->pos < 3) {
+        return NGX_OK;
+    }
+
+    /* no conf */
+    if (!ngx_rtmp_is_codec_header(in)) {
+        return NGX_OK;
+    }
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+    header = NULL;
+
+    if (h->type == NGX_RTMP_MSG_AUDIO) {
+        if (ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC) {
+            header = &ctx->aac_header;
+            ngx_rtmp_codec_parse_aac_header(s, in);
+        }
+    } else {
+        if (ctx->video_codec_id == NGX_RTMP_VIDEO_H264) {
+            header = &ctx->avc_header;
+            ngx_rtmp_codec_parse_avc_header(s, in);
+        }
+    }
+
+    if (header == NULL) {
+        return NGX_OK;
+    }
+
+    if (*header) {
+        ngx_rtmp_free_shared_chain(cscf, *header);
+    }
+
+    *header = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_codec_parse_aac_header(ngx_rtmp_session_t *s, ngx_chain_t *in)
+{
+    ngx_uint_t              idx;
+    ngx_rtmp_codec_ctx_t   *ctx;
+    ngx_rtmp_bit_reader_t   br;
+
+    static ngx_uint_t      aac_sample_rates[] =
+        { 96000, 88200, 64000, 48000,
+          44100, 32000, 24000, 22050,
+          16000, 12000, 11025,  8000,
+           7350,     0,     0,     0 };
+
+#if (NGX_DEBUG)
+    ngx_rtmp_codec_dump_header(s, "aac", in);
+#endif
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    ngx_rtmp_bit_init_reader(&br, in->buf->pos, in->buf->last);
+
+    ngx_rtmp_bit_read(&br, 16);
+
+    ctx->aac_profile = (ngx_uint_t) ngx_rtmp_bit_read(&br, 5);
+    if (ctx->aac_profile == 31) {
+        ctx->aac_profile = (ngx_uint_t) ngx_rtmp_bit_read(&br, 6) + 32;
+    }
+
+    idx = (ngx_uint_t) ngx_rtmp_bit_read(&br, 4);
+    if (idx == 15) {
+        ctx->sample_rate = (ngx_uint_t) ngx_rtmp_bit_read(&br, 24);
+    } else {
+        ctx->sample_rate = aac_sample_rates[idx];
+    }
+
+    ctx->aac_chan_conf = (ngx_uint_t) ngx_rtmp_bit_read(&br, 4);
+
+    if (ctx->aac_profile == 5 || ctx->aac_profile == 29) {
+        
+        if (ctx->aac_profile == 29) {
+            ctx->aac_ps = 1;
+        }
+
+        ctx->aac_sbr = 1;
+
+        idx = (ngx_uint_t) ngx_rtmp_bit_read(&br, 4);
+        if (idx == 15) {
+            ctx->sample_rate = (ngx_uint_t) ngx_rtmp_bit_read(&br, 24);
+        } else {
+            ctx->sample_rate = aac_sample_rates[idx];
+        }
+
+        ctx->aac_profile = (ngx_uint_t) ngx_rtmp_bit_read(&br, 5);
+        if (ctx->aac_profile == 31) {
+            ctx->aac_profile = (ngx_uint_t) ngx_rtmp_bit_read(&br, 6) + 32;
+        }
+    }
+
+    /* MPEG-4 Audio Specific Config
+
+       5 bits: object type
+       if (object type == 31)
+         6 bits + 32: object type
+       4 bits: frequency index
+       if (frequency index == 15)
+         24 bits: frequency
+       4 bits: channel configuration
+
+       if (object_type == 5)
+           4 bits: frequency index
+           if (frequency index == 15)
+             24 bits: frequency
+           5 bits: object type
+           if (object type == 31)
+             6 bits + 32: object type
+             
+       var bits: AOT Specific Config
+     */
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "codec: aac header profile=%ui, "
+                   "sample_rate=%ui, chan_conf=%ui",
+                   ctx->aac_profile, ctx->sample_rate, ctx->aac_chan_conf);
+}
+
+
+static void
+ngx_rtmp_codec_parse_avc_header(ngx_rtmp_session_t *s, ngx_chain_t *in)
+{
+    ngx_uint_t              profile_idc, width, height, crop_left, crop_right,
+                            crop_top, crop_bottom, frame_mbs_only, n, cf_idc,
+                            num_ref_frames;
+    ngx_rtmp_codec_ctx_t   *ctx;
+    ngx_rtmp_bit_reader_t   br;
+
+#if (NGX_DEBUG)
+    ngx_rtmp_codec_dump_header(s, "avc", in);
+#endif
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    ngx_rtmp_bit_init_reader(&br, in->buf->pos, in->buf->last);
+
+    ngx_rtmp_bit_read(&br, 48);
+
+    ctx->avc_profile = (ngx_uint_t) ngx_rtmp_bit_read_8(&br);
+    ctx->avc_compat = (ngx_uint_t) ngx_rtmp_bit_read_8(&br);
+    ctx->avc_level = (ngx_uint_t) ngx_rtmp_bit_read_8(&br);
+
+    /* nal bytes */
+    ctx->avc_nal_bytes = (ngx_uint_t) ((ngx_rtmp_bit_read_8(&br) & 0x03) + 1);
+
+    /* nnals */
+    if ((ngx_rtmp_bit_read_8(&br) & 0x1f) == 0) {
+        return;
+    }
+
+    /* nal size */
+    ngx_rtmp_bit_read(&br, 16);
+
+    /* nal type */
+    if (ngx_rtmp_bit_read_8(&br) != 0x67) {
+        return;
+    }
+
+    /* SPS */
+
+    /* profile idc */
+    profile_idc = (ngx_uint_t) ngx_rtmp_bit_read(&br, 8);
+
+    /* flags */
+    ngx_rtmp_bit_read(&br, 8);
+
+    /* level idc */
+    ngx_rtmp_bit_read(&br, 8);
+
+    /* SPS id */
+    ngx_rtmp_bit_read_golomb(&br);
+
+    if (profile_idc == 100 || profile_idc == 110 ||
+        profile_idc == 122 || profile_idc == 244 || profile_idc == 44 ||
+        profile_idc == 83 || profile_idc == 86 || profile_idc == 118)
+    {
+        /* chroma format idc */
+        cf_idc = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
+        
+        if (cf_idc == 3) {
+
+            /* separate color plane */
+            ngx_rtmp_bit_read(&br, 1);
+        }
+
+        /* bit depth luma - 8 */
+        ngx_rtmp_bit_read_golomb(&br);
+
+        /* bit depth chroma - 8 */
+        ngx_rtmp_bit_read_golomb(&br);
+
+        /* qpprime y zero transform bypass */
+        ngx_rtmp_bit_read(&br, 1);
+
+        /* seq scaling matrix present */
+        if (ngx_rtmp_bit_read(&br, 1)) {
+
+            for (n = 0; n < (cf_idc != 3 ? 8u : 12u); n++) {
+
+                /* seq scaling list present */
+                if (ngx_rtmp_bit_read(&br, 1)) {
+
+                    /* TODO: scaling_list()
+                    if (n < 6) {
+                    } else {
+                    }
+                    */
+                }
+            }
+        }
+    }
+
+    /* log2 max frame num */
+    ngx_rtmp_bit_read_golomb(&br);
+
+    /* pic order cnt type */
+    switch (ngx_rtmp_bit_read_golomb(&br)) {
+    case 0:
+
+        /* max pic order cnt */
+        ngx_rtmp_bit_read_golomb(&br);
+        break;
+
+    case 1:
+
+        /* delta pic order alwys zero */
+        ngx_rtmp_bit_read(&br, 1);
+
+        /* offset for non-ref pic */
+        ngx_rtmp_bit_read_golomb(&br);
+
+        /* offset for top to bottom field */
+        ngx_rtmp_bit_read_golomb(&br);
+
+        /* num ref frames in pic order */
+        num_ref_frames = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
+
+        for (n = 0; n < num_ref_frames; n++) {
+
+            /* offset for ref frame */
+            ngx_rtmp_bit_read_golomb(&br);
+        }
+    }
+
+    /* num ref frames */
+    ctx->avc_ref_frames = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
+
+    /* gaps in frame num allowed */
+    ngx_rtmp_bit_read(&br, 1);
+
+    /* pic width in mbs - 1 */
+    width = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
+
+    /* pic height in map units - 1 */
+    height = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
+
+    /* frame mbs only flag */
+    frame_mbs_only = (ngx_uint_t) ngx_rtmp_bit_read(&br, 1);
+
+    if (!frame_mbs_only) {
+
+        /* mbs adaprive frame field */
+        ngx_rtmp_bit_read(&br, 1);
+    }
+
+    /* direct 8x8 inference flag */
+    ngx_rtmp_bit_read(&br, 1);
+
+    /* frame cropping */
+    if (ngx_rtmp_bit_read(&br, 1)) {
+
+        crop_left = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
+        crop_right = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
+        crop_top = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
+        crop_bottom = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
+
+    } else {
+
+        crop_left = 0;
+        crop_right = 0;
+        crop_top = 0;
+        crop_bottom = 0;
+    }
+
+    ctx->width = (width + 1) * 16 - (crop_left + crop_right) * 2;
+    ctx->height = (2 - frame_mbs_only) * (height + 1) * 16 -
+                  (crop_top + crop_bottom) * 2;
+
+    ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "codec: avc header "
+                   "profile=%ui, compat=%ui, level=%ui, "
+                   "nal_bytes=%ui, ref_frames=%ui, width=%ui, height=%ui",
+                   ctx->avc_profile, ctx->avc_compat, ctx->avc_level,
+                   ctx->avc_nal_bytes, ctx->avc_ref_frames,
+                   ctx->width, ctx->height);
+}
+
+
+#if (NGX_DEBUG)
+static void
+ngx_rtmp_codec_dump_header(ngx_rtmp_session_t *s, const char *type,
+    ngx_chain_t *in)
+{
+    u_char buf[256], *p, *pp;
+    u_char hex[] = "0123456789abcdef";
+
+    for (pp = buf, p = in->buf->pos;
+         p < in->buf->last && pp < buf + sizeof(buf) - 1;
+         ++p)
+    {
+        *pp++ = hex[*p >> 4];
+        *pp++ = hex[*p & 0x0f];
+    }
+
+    *pp = 0;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "codec: %s header %s", type, buf);
+}
+#endif
+
+
+static ngx_int_t
+ngx_rtmp_codec_reconstruct_meta(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_codec_ctx_t           *ctx;
+    ngx_rtmp_core_srv_conf_t       *cscf;
+    ngx_int_t                       rc;
+
+    static struct {
+        double                      width;
+        double                      height;
+        double                      duration;
+        double                      frame_rate;
+        double                      video_data_rate;
+        double                      video_codec_id;
+        double                      audio_data_rate;
+        double                      audio_codec_id;
+        u_char                      profile[32];
+        u_char                      level[32];
+    }                               v;
+
+    static ngx_rtmp_amf_elt_t       out_inf[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("Server"),
+          "NGINX RTMP (github.com/arut/nginx-rtmp-module)", 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("width"),
+          &v.width, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("height"),
+          &v.height, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("displayWidth"),
+          &v.width, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("displayHeight"),
+          &v.height, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("duration"),
+          &v.duration, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("framerate"),
+          &v.frame_rate, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("fps"),
+          &v.frame_rate, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("videodatarate"),
+          &v.video_data_rate, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("videocodecid"),
+          &v.video_codec_id, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("audiodatarate"),
+          &v.audio_data_rate, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("audiocodecid"),
+          &v.audio_codec_id, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("profile"),
+          &v.profile, sizeof(v.profile) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("level"),
+          &v.level, sizeof(v.level) },
+    };
+
+    static ngx_rtmp_amf_elt_t       out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "onMetaData", 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          out_inf, sizeof(out_inf) },
+    };
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    if (ctx->meta) {
+        ngx_rtmp_free_shared_chain(cscf, ctx->meta);
+        ctx->meta = NULL;
+    }
+
+    v.width = ctx->width;
+    v.height = ctx->height;
+    v.duration = ctx->duration;
+    v.frame_rate = ctx->frame_rate;
+    v.video_data_rate = ctx->video_data_rate;
+    v.video_codec_id = ctx->video_codec_id;
+    v.audio_data_rate = ctx->audio_data_rate;
+    v.audio_codec_id = ctx->audio_codec_id;
+    ngx_memcpy(v.profile, ctx->profile, sizeof(ctx->profile));
+    ngx_memcpy(v.level, ctx->level, sizeof(ctx->level));
+
+    rc = ngx_rtmp_append_amf(s, &ctx->meta, NULL, out_elts,
+                             sizeof(out_elts) / sizeof(out_elts[0]));
+    if (rc != NGX_OK || ctx->meta == NULL) {
+        return NGX_ERROR;
+    }
+
+    return ngx_rtmp_codec_prepare_meta(s, 0);
+}
+
+
+static ngx_int_t
+ngx_rtmp_codec_copy_meta(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    ngx_rtmp_codec_ctx_t      *ctx;
+    ngx_rtmp_core_srv_conf_t  *cscf;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    if (ctx->meta) {
+        ngx_rtmp_free_shared_chain(cscf, ctx->meta);
+    }
+
+    ctx->meta = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
+
+    if (ctx->meta == NULL) {
+        return NGX_ERROR;
+    }
+
+    return ngx_rtmp_codec_prepare_meta(s, h->timestamp);
+}
+
+
+static ngx_int_t
+ngx_rtmp_codec_prepare_meta(ngx_rtmp_session_t *s, uint32_t timestamp)
+{
+    ngx_rtmp_header_t      h;
+    ngx_rtmp_codec_ctx_t  *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    ngx_memzero(&h, sizeof(h));
+    h.csid = NGX_RTMP_CSID_AMF;
+    h.msid = NGX_RTMP_MSID;
+    h.type = NGX_RTMP_MSG_AMF_META;
+    h.timestamp = timestamp;
+    ngx_rtmp_prepare_message(s, &h, NULL, ctx->meta);
+
+    ctx->meta_version = ngx_rtmp_codec_get_next_version();
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_codec_meta_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    ngx_rtmp_codec_app_conf_t      *cacf;
+    ngx_rtmp_codec_ctx_t           *ctx;
+    ngx_uint_t                      skip;
+
+    static struct {
+        double                      width;
+        double                      height;
+        double                      duration;
+        double                      frame_rate;
+        double                      video_data_rate;
+        double                      video_codec_id_n;
+        u_char                      video_codec_id_s[32];
+        double                      audio_data_rate;
+        double                      audio_codec_id_n;
+        u_char                      audio_codec_id_s[32];
+        u_char                      profile[32];
+        u_char                      level[32];
+    }                               v;
+
+    static ngx_rtmp_amf_elt_t       in_video_codec_id[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.video_codec_id_n, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          &v.video_codec_id_s, sizeof(v.video_codec_id_s) },
+    };
+
+    static ngx_rtmp_amf_elt_t       in_audio_codec_id[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.audio_codec_id_n, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          &v.audio_codec_id_s, sizeof(v.audio_codec_id_s) },
+    };
+
+    static ngx_rtmp_amf_elt_t       in_inf[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("width"),
+          &v.width, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("height"),
+          &v.height, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("duration"),
+          &v.duration, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("framerate"),
+          &v.frame_rate, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("fps"),
+          &v.frame_rate, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("videodatarate"),
+          &v.video_data_rate, 0 },
+
+        { NGX_RTMP_AMF_VARIANT,
+          ngx_string("videocodecid"),
+          in_video_codec_id, sizeof(in_video_codec_id) },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("audiodatarate"),
+          &v.audio_data_rate, 0 },
+
+        { NGX_RTMP_AMF_VARIANT,
+          ngx_string("audiocodecid"),
+          in_audio_codec_id, sizeof(in_audio_codec_id) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("profile"),
+          &v.profile, sizeof(v.profile) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("level"),
+          &v.level, sizeof(v.level) },
+    };
+
+    static ngx_rtmp_amf_elt_t       in_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          in_inf, sizeof(in_inf) },
+    };
+
+    cacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_codec_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+    if (ctx == NULL) {
+        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_codec_ctx_t));
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_codec_module);
+    }
+
+    ngx_memzero(&v, sizeof(v));
+
+    /* use -1 as a sign of unchanged data;
+     * 0 is a valid value for uncompressed audio */
+    v.audio_codec_id_n = -1;
+
+    /* FFmpeg sends a string in front of actal metadata; ignore it */
+    skip = !(in->buf->last > in->buf->pos
+            && *in->buf->pos == NGX_RTMP_AMF_STRING);
+    if (ngx_rtmp_receive_amf(s, in, in_elts + skip,
+                sizeof(in_elts) / sizeof(in_elts[0]) - skip))
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                "codec: error parsing data frame");
+        return NGX_OK;
+    }
+
+    ctx->width = (ngx_uint_t) v.width;
+    ctx->height = (ngx_uint_t) v.height;
+    ctx->duration = (ngx_uint_t) v.duration;
+    ctx->frame_rate = (ngx_uint_t) v.frame_rate;
+    ctx->video_data_rate = (ngx_uint_t) v.video_data_rate;
+    ctx->video_codec_id = (ngx_uint_t) v.video_codec_id_n;
+    ctx->audio_data_rate = (ngx_uint_t) v.audio_data_rate;
+    ctx->audio_codec_id = (v.audio_codec_id_n == -1
+            ? 0 : v.audio_codec_id_n == 0
+            ? NGX_RTMP_AUDIO_UNCOMPRESSED : (ngx_uint_t) v.audio_codec_id_n);
+    ngx_memcpy(ctx->profile, v.profile, sizeof(v.profile));
+    ngx_memcpy(ctx->level, v.level, sizeof(v.level));
+
+    ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "codec: data frame: "
+            "width=%ui height=%ui duration=%ui frame_rate=%ui "
+            "video=%s (%ui) audio=%s (%ui)",
+            ctx->width, ctx->height, ctx->duration, ctx->frame_rate,
+            ngx_rtmp_get_video_codec_name(ctx->video_codec_id),
+            ctx->video_codec_id,
+            ngx_rtmp_get_audio_codec_name(ctx->audio_codec_id),
+            ctx->audio_codec_id);
+
+    switch (cacf->meta) {
+        case NGX_RTMP_CODEC_META_ON:
+            return ngx_rtmp_codec_reconstruct_meta(s);
+        case NGX_RTMP_CODEC_META_COPY:
+            return ngx_rtmp_codec_copy_meta(s, h, in);
+    }
+
+    /* NGX_RTMP_CODEC_META_OFF */
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_rtmp_codec_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_codec_app_conf_t  *cacf;
+
+    cacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_codec_app_conf_t));
+    if (cacf == NULL) {
+        return NULL;
+    }
+
+    cacf->meta = NGX_CONF_UNSET_UINT;
+
+    return cacf;
+}
+
+
+static char *
+ngx_rtmp_codec_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_codec_app_conf_t *prev = parent;
+    ngx_rtmp_codec_app_conf_t *conf = child;
+
+    ngx_conf_merge_uint_value(conf->meta, prev->meta, NGX_RTMP_CODEC_META_ON);
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_codec_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t          *cmcf;
+    ngx_rtmp_handler_pt                *h;
+    ngx_rtmp_amf_handler_t             *ch;
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
+    *h = ngx_rtmp_codec_av;
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
+    *h = ngx_rtmp_codec_av;
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
+    *h = ngx_rtmp_codec_disconnect;
+
+    /* register metadata handler */
+    ch = ngx_array_push(&cmcf->amf);
+    if (ch == NULL) {
+        return NGX_ERROR;
+    }
+    ngx_str_set(&ch->name, "@setDataFrame");
+    ch->handler = ngx_rtmp_codec_meta_data;
+
+    ch = ngx_array_push(&cmcf->amf);
+    if (ch == NULL) {
+        return NGX_ERROR;
+    }
+    ngx_str_set(&ch->name, "onMetaData");
+    ch->handler = ngx_rtmp_codec_meta_data;
+
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_codec_module.h b/debian/modules/nginx-rtmp/ngx_rtmp_codec_module.h
new file mode 100644
index 0000000..ee48c1c
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_codec_module.h
@@ -0,0 +1,87 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_CODEC_H_INCLUDED_
+#define _NGX_RTMP_CODEC_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+
+
+/* Audio codecs */
+enum {
+    /* Uncompressed codec id is actually 0,
+     * but we use another value for consistency */
+    NGX_RTMP_AUDIO_UNCOMPRESSED     = 16,
+    NGX_RTMP_AUDIO_ADPCM            = 1,
+    NGX_RTMP_AUDIO_MP3              = 2,
+    NGX_RTMP_AUDIO_LINEAR_LE        = 3,
+    NGX_RTMP_AUDIO_NELLY16          = 4,
+    NGX_RTMP_AUDIO_NELLY8           = 5,
+    NGX_RTMP_AUDIO_NELLY            = 6,
+    NGX_RTMP_AUDIO_G711A            = 7,
+    NGX_RTMP_AUDIO_G711U            = 8,
+    NGX_RTMP_AUDIO_AAC              = 10,
+    NGX_RTMP_AUDIO_SPEEX            = 11,
+    NGX_RTMP_AUDIO_MP3_8            = 14,
+    NGX_RTMP_AUDIO_DEVSPEC          = 15,
+};
+
+
+/* Video codecs */
+enum {
+    NGX_RTMP_VIDEO_JPEG             = 1,
+    NGX_RTMP_VIDEO_SORENSON_H263    = 2,
+    NGX_RTMP_VIDEO_SCREEN           = 3,
+    NGX_RTMP_VIDEO_ON2_VP6          = 4,
+    NGX_RTMP_VIDEO_ON2_VP6_ALPHA    = 5,
+    NGX_RTMP_VIDEO_SCREEN2          = 6,
+    NGX_RTMP_VIDEO_H264             = 7
+};
+
+
+u_char * ngx_rtmp_get_audio_codec_name(ngx_uint_t id);
+u_char * ngx_rtmp_get_video_codec_name(ngx_uint_t id);
+
+
+typedef struct {
+    ngx_uint_t                  width;
+    ngx_uint_t                  height;
+    ngx_uint_t                  duration;
+    ngx_uint_t                  frame_rate;
+    ngx_uint_t                  video_data_rate;
+    ngx_uint_t                  video_codec_id;
+    ngx_uint_t                  audio_data_rate;
+    ngx_uint_t                  audio_codec_id;
+    ngx_uint_t                  aac_profile;
+    ngx_uint_t                  aac_chan_conf;
+    ngx_uint_t                  aac_sbr;
+    ngx_uint_t                  aac_ps;
+    ngx_uint_t                  avc_profile;
+    ngx_uint_t                  avc_compat;
+    ngx_uint_t                  avc_level;
+    ngx_uint_t                  avc_nal_bytes;
+    ngx_uint_t                  avc_ref_frames;
+    ngx_uint_t                  sample_rate;    /* 5512, 11025, 22050, 44100 */
+    ngx_uint_t                  sample_size;    /* 1=8bit, 2=16bit */
+    ngx_uint_t                  audio_channels; /* 1, 2 */
+    u_char                      profile[32];
+    u_char                      level[32];
+
+    ngx_chain_t                *avc_header;
+    ngx_chain_t                *aac_header;
+
+    ngx_chain_t                *meta;
+    ngx_uint_t                  meta_version;
+} ngx_rtmp_codec_ctx_t;
+
+
+extern ngx_module_t  ngx_rtmp_codec_module;
+
+
+#endif /* _NGX_RTMP_LIVE_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_control_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_control_module.c
new file mode 100644
index 0000000..adf3ddc
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_control_module.c
@@ -0,0 +1,732 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_live_module.h"
+#include "ngx_rtmp_record_module.h"
+
+
+static char *ngx_rtmp_control(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+static void * ngx_rtmp_control_create_loc_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_control_merge_loc_conf(ngx_conf_t *cf,
+    void *parent, void *child);
+
+
+typedef const char * (*ngx_rtmp_control_handler_t)(ngx_http_request_t *r,
+    ngx_rtmp_session_t *);
+
+
+#define NGX_RTMP_CONTROL_ALL        0xff
+#define NGX_RTMP_CONTROL_RECORD     0x01
+#define NGX_RTMP_CONTROL_DROP       0x02
+#define NGX_RTMP_CONTROL_REDIRECT   0x04
+
+
+enum {
+    NGX_RTMP_CONTROL_FILTER_CLIENT = 0,
+    NGX_RTMP_CONTROL_FILTER_PUBLISHER,
+    NGX_RTMP_CONTROL_FILTER_SUBSCRIBER
+};
+
+
+typedef struct {
+    ngx_uint_t                      count;
+    ngx_str_t                       path;
+    ngx_uint_t                      filter;
+    ngx_str_t                       method;
+    ngx_array_t                     sessions; /* ngx_rtmp_session_t * */
+} ngx_rtmp_control_ctx_t;
+
+
+typedef struct {
+    ngx_uint_t                      control;
+} ngx_rtmp_control_loc_conf_t;
+
+
+static ngx_conf_bitmask_t           ngx_rtmp_control_masks[] = {
+    { ngx_string("all"),            NGX_RTMP_CONTROL_ALL       },
+    { ngx_string("record"),         NGX_RTMP_CONTROL_RECORD    },
+    { ngx_string("drop"),           NGX_RTMP_CONTROL_DROP      },
+    { ngx_string("redirect"),       NGX_RTMP_CONTROL_REDIRECT  },
+    { ngx_null_string,              0                          }
+};
+
+
+static ngx_command_t  ngx_rtmp_control_commands[] = {
+
+    { ngx_string("rtmp_control"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_control,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_rtmp_control_loc_conf_t, control),
+      ngx_rtmp_control_masks },
+
+    ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_rtmp_control_module_ctx = {
+    NULL,                               /* preconfiguration */
+    NULL,                               /* postconfiguration */
+
+    NULL,                               /* create main configuration */
+    NULL,                               /* init main configuration */
+
+    NULL,                               /* create server configuration */
+    NULL,                               /* merge server configuration */
+
+    ngx_rtmp_control_create_loc_conf,   /* create location configuration */
+    ngx_rtmp_control_merge_loc_conf,    /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_control_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_control_module_ctx,       /* module context */
+    ngx_rtmp_control_commands,          /* module directives */
+    NGX_HTTP_MODULE,                    /* module type */
+    NULL,                               /* init master */
+    NULL,                               /* init module */
+    NULL,                               /* init process */
+    NULL,                               /* init thread */
+    NULL,                               /* exit thread */
+    NULL,                               /* exit process */
+    NULL,                               /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static const char *
+ngx_rtmp_control_record_handler(ngx_http_request_t *r, ngx_rtmp_session_t *s)
+{
+    ngx_int_t                    rc;
+    ngx_str_t                    rec;
+    ngx_uint_t                   rn;
+    ngx_rtmp_control_ctx_t      *ctx;
+    ngx_rtmp_core_app_conf_t    *cacf;
+    ngx_rtmp_record_app_conf_t  *racf;
+
+    cacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_core_module);
+    racf = cacf->app_conf[ngx_rtmp_record_module.ctx_index];
+
+    if (ngx_http_arg(r, (u_char *) "rec", sizeof("rec") - 1, &rec) != NGX_OK) {
+        rec.len = 0;
+    }
+
+    rn = ngx_rtmp_record_find(racf, &rec);
+    if (rn == NGX_CONF_UNSET_UINT) {
+        return "Recorder not found";
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
+
+    if (ctx->method.len == sizeof("start") - 1 &&
+        ngx_strncmp(ctx->method.data, "start", ctx->method.len) == 0)
+    {
+        rc = ngx_rtmp_record_open(s, rn, &ctx->path);
+
+    } else if (ctx->method.len == sizeof("stop") - 1 &&
+               ngx_strncmp(ctx->method.data, "stop", ctx->method.len) == 0)
+    {
+        rc = ngx_rtmp_record_close(s, rn, &ctx->path);
+
+    } else {
+        return "Undefined method";
+    }
+
+    if (rc == NGX_ERROR) {
+        return "Recorder error";
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static const char *
+ngx_rtmp_control_drop_handler(ngx_http_request_t *r, ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_control_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
+
+    ngx_rtmp_finalize_session(s);
+
+    ++ctx->count;
+
+    return NGX_CONF_OK;
+}
+
+
+static const char *
+ngx_rtmp_control_redirect_handler(ngx_http_request_t *r, ngx_rtmp_session_t *s)
+{
+    ngx_str_t                 name;
+    ngx_rtmp_play_t           vplay;
+    ngx_rtmp_publish_t        vpublish;
+    ngx_rtmp_live_ctx_t      *lctx;
+    ngx_rtmp_control_ctx_t   *ctx;
+    ngx_rtmp_close_stream_t   vc;
+
+    if (ngx_http_arg(r, (u_char *) "newname", sizeof("newname") - 1, &name)
+        != NGX_OK)
+    {
+        return "newname not specified";
+    }
+
+    if (name.len >= NGX_RTMP_MAX_NAME) {
+        name.len = NGX_RTMP_MAX_NAME - 1;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
+    ctx->count++;
+
+    ngx_memzero(&vc, sizeof(ngx_rtmp_close_stream_t));
+
+    /* close_stream should be synchronous */
+    ngx_rtmp_close_stream(s, &vc);
+
+    lctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+
+    if (lctx && lctx->publishing) {
+        /* publish */
+
+        ngx_memzero(&vpublish, sizeof(ngx_rtmp_publish_t));
+
+        ngx_memcpy(vpublish.name, name.data, name.len);
+
+        ngx_rtmp_cmd_fill_args(vpublish.name, vpublish.args);
+
+        if (ngx_rtmp_publish(s, &vpublish) != NGX_OK) {
+            return "publish failed";
+        }
+
+    } else {
+        /* play */
+
+        ngx_memzero(&vplay, sizeof(ngx_rtmp_play_t));
+
+        ngx_memcpy(vplay.name, name.data, name.len);
+
+        ngx_rtmp_cmd_fill_args(vplay.name, vplay.args);
+
+        if (ngx_rtmp_play(s, &vplay) != NGX_OK) {
+            return "play failed";
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static const char *
+ngx_rtmp_control_walk_session(ngx_http_request_t *r,
+    ngx_rtmp_live_ctx_t *lctx)
+{
+    ngx_str_t                addr, *paddr, clientid;
+    ngx_rtmp_session_t      *s, **ss;
+    ngx_rtmp_control_ctx_t  *ctx;
+
+    s = lctx->session;
+
+    if (s == NULL || s->connection == NULL) {
+        return NGX_CONF_OK;
+    }
+
+    if (ngx_http_arg(r, (u_char *) "addr", sizeof("addr") - 1, &addr)
+        == NGX_OK)
+    {
+        paddr = &s->connection->addr_text;
+        if (paddr->len != addr.len ||
+            ngx_strncmp(paddr->data, addr.data, addr.len))
+        {
+            return NGX_CONF_OK;
+        }
+    }
+
+    if (ngx_http_arg(r, (u_char *) "clientid", sizeof("clientid") - 1,
+                     &clientid)
+        == NGX_OK)
+    {
+        if (s->connection->number !=
+            (ngx_uint_t) ngx_atoi(clientid.data, clientid.len))
+        {
+            return NGX_CONF_OK;
+        }
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
+
+    switch (ctx->filter) {
+        case NGX_RTMP_CONTROL_FILTER_PUBLISHER:
+            if (!lctx->publishing) {
+                return NGX_CONF_OK;
+            }
+            break;
+
+        case NGX_RTMP_CONTROL_FILTER_SUBSCRIBER:
+            if (lctx->publishing) {
+                return NGX_CONF_OK;
+            }
+            break;
+
+        case NGX_RTMP_CONTROL_FILTER_CLIENT:
+            break;
+    }
+
+    ss = ngx_array_push(&ctx->sessions);
+    if (ss == NULL) {
+        return "allocation error";
+    }
+
+    *ss = s;
+
+    return NGX_CONF_OK;
+}
+
+
+static const char *
+ngx_rtmp_control_walk_stream(ngx_http_request_t *r,
+    ngx_rtmp_live_stream_t *ls)
+{
+    const char           *s;
+    ngx_rtmp_live_ctx_t  *lctx;
+
+    for (lctx = ls->ctx; lctx; lctx = lctx->next) {
+        s = ngx_rtmp_control_walk_session(r, lctx);
+        if (s != NGX_CONF_OK) {
+            return s;
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static const char *
+ngx_rtmp_control_walk_app(ngx_http_request_t *r,
+    ngx_rtmp_core_app_conf_t *cacf)
+{
+    size_t                     len;
+    ngx_str_t                  name;
+    const char                *s;
+    ngx_uint_t                 n;
+    ngx_rtmp_live_stream_t    *ls;
+    ngx_rtmp_live_app_conf_t  *lacf;
+
+    lacf = cacf->app_conf[ngx_rtmp_live_module.ctx_index];
+
+    if (ngx_http_arg(r, (u_char *) "name", sizeof("name") - 1, &name) != NGX_OK)
+    {
+        for (n = 0; n < (ngx_uint_t) lacf->nbuckets; ++n) {
+            for (ls = lacf->streams[n]; ls; ls = ls->next) {
+                s = ngx_rtmp_control_walk_stream(r, ls);
+                if (s != NGX_CONF_OK) {
+                    return s;
+                }
+            }
+        }
+
+        return NGX_CONF_OK;
+    }
+
+    for (ls = lacf->streams[ngx_hash_key(name.data, name.len) % lacf->nbuckets];
+         ls; ls = ls->next) 
+    {
+        len = ngx_strlen(ls->name);
+        if (name.len != len || ngx_strncmp(name.data, ls->name, name.len)) {
+            continue;
+        }
+
+        s = ngx_rtmp_control_walk_stream(r, ls);
+        if (s != NGX_CONF_OK) {
+            return s;
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static const char *
+ngx_rtmp_control_walk_server(ngx_http_request_t *r,
+    ngx_rtmp_core_srv_conf_t *cscf)
+{
+    ngx_str_t                   app;
+    ngx_uint_t                  n;
+    const char                 *s;
+    ngx_rtmp_core_app_conf_t  **pcacf;
+
+    if (ngx_http_arg(r, (u_char *) "app", sizeof("app") - 1, &app) != NGX_OK) {
+        app.len = 0;
+    }
+
+    pcacf = cscf->applications.elts;
+
+    for (n = 0; n < cscf->applications.nelts; ++n, ++pcacf) {
+        if (app.len && ((*pcacf)->name.len != app.len ||
+                        ngx_strncmp((*pcacf)->name.data, app.data, app.len)))
+        {
+            continue;
+        }
+
+        s = ngx_rtmp_control_walk_app(r, *pcacf);
+        if (s != NGX_CONF_OK) {
+            return s;
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static const char *
+ngx_rtmp_control_walk(ngx_http_request_t *r, ngx_rtmp_control_handler_t h)
+{
+    ngx_rtmp_core_main_conf_t  *cmcf = ngx_rtmp_core_main_conf;
+
+    ngx_str_t                   srv;
+    ngx_uint_t                  sn, n;
+    const char                 *msg;
+    ngx_rtmp_session_t        **s;
+    ngx_rtmp_control_ctx_t     *ctx;
+    ngx_rtmp_core_srv_conf_t  **pcscf;
+
+    sn = 0;
+    if (ngx_http_arg(r, (u_char *) "srv", sizeof("srv") - 1, &srv) == NGX_OK) {
+        sn = ngx_atoi(srv.data, srv.len);
+    }
+
+    if (sn >= cmcf->servers.nelts) {
+        return "Server index out of range";
+    }
+
+    pcscf  = cmcf->servers.elts;
+    pcscf += sn;
+
+    msg = ngx_rtmp_control_walk_server(r, *pcscf);
+    if (msg != NGX_CONF_OK) {
+        return msg;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
+
+    s = ctx->sessions.elts;
+    for (n = 0; n < ctx->sessions.nelts; n++) {
+        msg = h(r, s[n]);
+        if (msg != NGX_CONF_OK) {
+            return msg;
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_control_record(ngx_http_request_t *r, ngx_str_t *method)
+{
+    ngx_buf_t               *b;
+    const char              *msg;
+    ngx_chain_t              cl;
+    ngx_rtmp_control_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
+    ctx->filter = NGX_RTMP_CONTROL_FILTER_PUBLISHER;
+
+    msg = ngx_rtmp_control_walk(r, ngx_rtmp_control_record_handler);
+    if (msg != NGX_CONF_OK) {
+        goto error;
+    }
+
+    if (ctx->path.len == 0) {
+        return NGX_HTTP_NO_CONTENT;
+    }
+
+    /* output record path */
+
+    r->headers_out.status = NGX_HTTP_OK;
+    r->headers_out.content_length_n = ctx->path.len;
+
+    b = ngx_create_temp_buf(r->pool, ctx->path.len);
+    if (b == NULL) {
+        goto error;
+    }
+
+    ngx_memzero(&cl, sizeof(cl));
+    cl.buf = b;
+
+    b->last = ngx_cpymem(b->pos, ctx->path.data, ctx->path.len);
+    b->last_buf = 1;
+
+    ngx_http_send_header(r);
+
+    return ngx_http_output_filter(r, &cl);
+
+error:
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_control_drop(ngx_http_request_t *r, ngx_str_t *method)
+{
+    size_t                   len;
+    u_char                  *p;
+    ngx_buf_t               *b;
+    ngx_chain_t              cl;
+    const char              *msg;
+    ngx_rtmp_control_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
+
+    if (ctx->method.len == sizeof("publisher") - 1 &&
+        ngx_memcmp(ctx->method.data, "publisher", ctx->method.len) == 0)
+    {
+        ctx->filter = NGX_RTMP_CONTROL_FILTER_PUBLISHER;
+
+    } else if (ctx->method.len == sizeof("subscriber") - 1 &&
+               ngx_memcmp(ctx->method.data, "subscriber", ctx->method.len)
+               == 0)
+    {
+        ctx->filter = NGX_RTMP_CONTROL_FILTER_SUBSCRIBER;
+
+    } else if (method->len == sizeof("client") - 1 &&
+               ngx_memcmp(ctx->method.data, "client", ctx->method.len) == 0)
+    {
+        ctx->filter = NGX_RTMP_CONTROL_FILTER_CLIENT;
+
+    } else {
+        msg = "Undefined filter";
+        goto error;
+    }
+
+    msg = ngx_rtmp_control_walk(r, ngx_rtmp_control_drop_handler);
+    if (msg != NGX_CONF_OK) {
+        goto error;
+    }
+
+    /* output count */
+
+    len = NGX_INT_T_LEN;
+
+    p = ngx_palloc(r->connection->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    len = (size_t) (ngx_snprintf(p, len, "%ui", ctx->count) - p);
+
+    r->headers_out.status = NGX_HTTP_OK;
+    r->headers_out.content_length_n = len;
+
+    b = ngx_calloc_buf(r->pool);
+    if (b == NULL) {
+        goto error;
+    }
+
+    b->start = b->pos = p;
+    b->end = b->last = p + len;
+    b->temporary = 1;
+    b->last_buf = 1;
+
+    ngx_memzero(&cl, sizeof(cl));
+    cl.buf = b;
+
+    ngx_http_send_header(r);
+
+    return ngx_http_output_filter(r, &cl);
+
+error:
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_control_redirect(ngx_http_request_t *r, ngx_str_t *method)
+{
+    size_t                   len;
+    u_char                  *p;
+    ngx_buf_t               *b;
+    ngx_chain_t              cl;
+    const char              *msg;
+    ngx_rtmp_control_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
+
+    if (ctx->method.len == sizeof("publisher") - 1 &&
+        ngx_memcmp(ctx->method.data, "publisher", ctx->method.len) == 0)
+    {
+        ctx->filter = NGX_RTMP_CONTROL_FILTER_PUBLISHER;
+
+    } else if (ctx->method.len == sizeof("subscriber") - 1 &&
+               ngx_memcmp(ctx->method.data, "subscriber", ctx->method.len)
+               == 0)
+    {
+        ctx->filter = NGX_RTMP_CONTROL_FILTER_SUBSCRIBER;
+
+    } else if (ctx->method.len == sizeof("client") - 1 &&
+               ngx_memcmp(ctx->method.data, "client", ctx->method.len) == 0)
+    {
+        ctx->filter = NGX_RTMP_CONTROL_FILTER_CLIENT;
+
+    } else {
+        msg = "Undefined filter";
+        goto error;
+    }
+
+    msg = ngx_rtmp_control_walk(r, ngx_rtmp_control_redirect_handler);
+    if (msg != NGX_CONF_OK) {
+        goto error;
+    }
+
+    /* output count */
+
+    len = NGX_INT_T_LEN;
+
+    p = ngx_palloc(r->connection->pool, len);
+    if (p == NULL) {
+        goto error;
+    }
+
+    len = (size_t) (ngx_snprintf(p, len, "%ui", ctx->count) - p);
+
+    r->headers_out.status = NGX_HTTP_OK;
+    r->headers_out.content_length_n = len;
+
+    b = ngx_calloc_buf(r->pool);
+    if (b == NULL) {
+        goto error;
+    }
+
+    b->start = b->pos = p;
+    b->end = b->last = p + len;
+    b->temporary = 1;
+    b->last_buf = 1;
+
+    ngx_memzero(&cl, sizeof(cl));
+    cl.buf = b;
+
+    ngx_http_send_header(r);
+
+    return ngx_http_output_filter(r, &cl);
+
+error:
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_control_handler(ngx_http_request_t *r)
+{
+    u_char                       *p;
+    ngx_str_t                     section, method;
+    ngx_uint_t                    n;
+    ngx_rtmp_control_ctx_t       *ctx;
+    ngx_rtmp_control_loc_conf_t  *llcf;
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_control_module);
+    if (llcf->control == 0) {
+        return NGX_DECLINED;
+    }
+
+    /* uri format: .../section/method?args */
+
+    ngx_str_null(&section);
+    ngx_str_null(&method);
+
+    for (n = r->uri.len; n; --n) {
+        p = &r->uri.data[n - 1];
+
+        if (*p != '/') {
+            continue;
+        }
+
+        if (method.data) {
+            section.data = p + 1;
+            section.len  = method.data - section.data - 1;
+            break;
+        }
+
+        method.data = p + 1;
+        method.len  = r->uri.data + r->uri.len - method.data;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, r->connection->log, 0,
+                   "rtmp_control: section='%V' method='%V'",
+                   &section, &method);
+
+    ctx = ngx_pcalloc(r->pool, sizeof(ngx_rtmp_control_ctx_t));
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_http_set_ctx(r, ctx, ngx_rtmp_control_module);
+
+    if (ngx_array_init(&ctx->sessions, r->pool, 1, sizeof(void *)) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ctx->method = method;
+
+#define NGX_RTMP_CONTROL_SECTION(flag, secname)                             \
+    if (llcf->control & NGX_RTMP_CONTROL_##flag &&                          \
+        section.len == sizeof(#secname) - 1 &&                              \
+        ngx_strncmp(section.data, #secname, sizeof(#secname) - 1) == 0)     \
+    {                                                                       \
+        return ngx_rtmp_control_##secname(r, &method);                      \
+    }
+
+    NGX_RTMP_CONTROL_SECTION(RECORD, record);
+    NGX_RTMP_CONTROL_SECTION(DROP, drop);
+    NGX_RTMP_CONTROL_SECTION(REDIRECT, redirect);
+
+#undef NGX_RTMP_CONTROL_SECTION
+
+    return NGX_DECLINED;
+}
+
+
+static void *
+ngx_rtmp_control_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_control_loc_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_control_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->control = 0;
+
+    return conf;
+}
+
+
+static char *
+ngx_rtmp_control_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_control_loc_conf_t  *prev = parent;
+    ngx_rtmp_control_loc_conf_t  *conf = child;
+
+    ngx_conf_merge_bitmask_value(conf->control, prev->control, 0);
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_rtmp_control(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_core_loc_conf_t  *clcf;
+
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+    clcf->handler = ngx_rtmp_control_handler;
+
+    return ngx_conf_set_bitmask_slot(cf, cmd, conf);
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_core_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_core_module.c
new file mode 100644
index 0000000..a33fa16
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_core_module.c
@@ -0,0 +1,755 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <nginx.h>
+#include "ngx_rtmp.h"
+
+
+static void *ngx_rtmp_core_create_main_conf(ngx_conf_t *cf);
+static void *ngx_rtmp_core_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_rtmp_core_merge_srv_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static void *ngx_rtmp_core_create_app_conf(ngx_conf_t *cf);
+static char *ngx_rtmp_core_merge_app_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static char *ngx_rtmp_core_server(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_rtmp_core_application(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+
+ngx_rtmp_core_main_conf_t      *ngx_rtmp_core_main_conf;
+
+
+static ngx_conf_deprecated_t  ngx_conf_deprecated_so_keepalive = {
+    ngx_conf_deprecated, "so_keepalive",
+    "so_keepalive\" parameter of the \"listen"
+};
+
+
+static ngx_command_t  ngx_rtmp_core_commands[] = {
+
+    { ngx_string("server"),
+      NGX_RTMP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+      ngx_rtmp_core_server,
+      0,
+      0,
+      NULL },
+
+    { ngx_string("listen"),
+      NGX_RTMP_SRV_CONF|NGX_CONF_TAKE12,
+      ngx_rtmp_core_listen,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("application"),
+      NGX_RTMP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
+      ngx_rtmp_core_application,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("so_keepalive"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, so_keepalive),
+      &ngx_conf_deprecated_so_keepalive },
+
+    { ngx_string("timeout"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, timeout),
+      NULL },
+
+    { ngx_string("ping"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, ping),
+      NULL },
+
+    { ngx_string("ping_timeout"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, ping_timeout),
+      NULL },
+
+    { ngx_string("max_streams"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, max_streams),
+      NULL },
+
+    { ngx_string("ack_window"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, ack_window),
+      NULL },
+
+    { ngx_string("chunk_size"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, chunk_size),
+      NULL },
+
+    { ngx_string("max_message"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, max_message),
+      NULL },
+
+    { ngx_string("out_queue"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, out_queue),
+      NULL },
+
+    { ngx_string("out_cork"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, out_cork),
+      NULL },
+
+    { ngx_string("busy"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, busy),
+      NULL },
+
+    /* time fixes are needed for flash clients */
+    { ngx_string("play_time_fix"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, play_time_fix),
+      NULL },
+
+    { ngx_string("publish_time_fix"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, publish_time_fix),
+      NULL },
+
+    { ngx_string("buflen"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_core_srv_conf_t, buflen),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_core_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    NULL,                                   /* postconfiguration */
+    ngx_rtmp_core_create_main_conf,         /* create main configuration */
+    NULL,                                   /* init main configuration */
+    ngx_rtmp_core_create_srv_conf,          /* create server configuration */
+    ngx_rtmp_core_merge_srv_conf,           /* merge server configuration */
+    ngx_rtmp_core_create_app_conf,          /* create app configuration */
+    ngx_rtmp_core_merge_app_conf            /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_core_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_core_module_ctx,             /* module context */
+    ngx_rtmp_core_commands,                /* module directives */
+    NGX_RTMP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_rtmp_core_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_core_main_conf_t));
+    if (cmcf == NULL) {
+        return NULL;
+    }
+
+    ngx_rtmp_core_main_conf = cmcf;
+
+    if (ngx_array_init(&cmcf->servers, cf->pool, 4,
+                       sizeof(ngx_rtmp_core_srv_conf_t *))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    if (ngx_array_init(&cmcf->listen, cf->pool, 4, sizeof(ngx_rtmp_listen_t))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    return cmcf;
+}
+
+
+static void *
+ngx_rtmp_core_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_srv_conf_t   *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_core_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    if (ngx_array_init(&conf->applications, cf->pool, 4,
+                       sizeof(ngx_rtmp_core_app_conf_t *))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    conf->timeout = NGX_CONF_UNSET_MSEC;
+    conf->ping = NGX_CONF_UNSET_MSEC;
+    conf->ping_timeout = NGX_CONF_UNSET_MSEC;
+    conf->so_keepalive = NGX_CONF_UNSET;
+    conf->max_streams = NGX_CONF_UNSET;
+    conf->chunk_size = NGX_CONF_UNSET;
+    conf->ack_window = NGX_CONF_UNSET_UINT;
+    conf->max_message = NGX_CONF_UNSET_SIZE;
+    conf->out_queue = NGX_CONF_UNSET_SIZE;
+    conf->out_cork = NGX_CONF_UNSET_SIZE;
+    conf->play_time_fix = NGX_CONF_UNSET;
+    conf->publish_time_fix = NGX_CONF_UNSET;
+    conf->buflen = NGX_CONF_UNSET_MSEC;
+    conf->busy = NGX_CONF_UNSET;
+
+    return conf;
+}
+
+
+static char *
+ngx_rtmp_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_core_srv_conf_t *prev = parent;
+    ngx_rtmp_core_srv_conf_t *conf = child;
+
+    ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000);
+    ngx_conf_merge_msec_value(conf->ping, prev->ping, 60000);
+    ngx_conf_merge_msec_value(conf->ping_timeout, prev->ping_timeout, 30000);
+
+    ngx_conf_merge_value(conf->so_keepalive, prev->so_keepalive, 0);
+    ngx_conf_merge_value(conf->max_streams, prev->max_streams, 32);
+    ngx_conf_merge_value(conf->chunk_size, prev->chunk_size, 4096);
+    ngx_conf_merge_uint_value(conf->ack_window, prev->ack_window, 5000000);
+    ngx_conf_merge_size_value(conf->max_message, prev->max_message,
+            1 * 1024 * 1024);
+    ngx_conf_merge_size_value(conf->out_queue, prev->out_queue, 256);
+    ngx_conf_merge_size_value(conf->out_cork, prev->out_cork,
+            conf->out_queue / 8);
+    ngx_conf_merge_value(conf->play_time_fix, prev->play_time_fix, 1);
+    ngx_conf_merge_value(conf->publish_time_fix, prev->publish_time_fix, 1);
+    ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 1000);
+    ngx_conf_merge_value(conf->busy, prev->busy, 0);
+
+    if (prev->pool == NULL) {
+        prev->pool = ngx_create_pool(4096, &cf->cycle->new_log);
+        if (prev->pool == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    conf->pool = prev->pool;
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_rtmp_core_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_app_conf_t   *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_core_app_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    if (ngx_array_init(&conf->applications, cf->pool, 1,
+                       sizeof(ngx_rtmp_core_app_conf_t *))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    return conf;
+}
+
+
+static char *
+ngx_rtmp_core_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_core_app_conf_t *prev = parent;
+    ngx_rtmp_core_app_conf_t *conf = child;
+
+    (void)prev;
+    (void)conf;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_rtmp_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char                       *rv;
+    void                       *mconf;
+    ngx_uint_t                  m;
+    ngx_conf_t                  pcf;
+    ngx_module_t              **modules;
+    ngx_rtmp_module_t          *module;
+    ngx_rtmp_conf_ctx_t        *ctx, *rtmp_ctx;
+    ngx_rtmp_core_srv_conf_t   *cscf, **cscfp;
+    ngx_rtmp_core_main_conf_t  *cmcf;
+
+    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
+    if (ctx == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    rtmp_ctx = cf->ctx;
+    ctx->main_conf = rtmp_ctx->main_conf;
+
+    /* the server{}'s srv_conf */
+
+    ctx->srv_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
+    if (ctx->srv_conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
+    if (ctx->app_conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+#if (nginx_version >= 1009011)
+    modules = cf->cycle->modules;
+#else
+    modules = ngx_modules;
+#endif
+
+    for (m = 0; modules[m]; m++) {
+        if (modules[m]->type != NGX_RTMP_MODULE) {
+            continue;
+        }
+
+        module = modules[m]->ctx;
+
+        if (module->create_srv_conf) {
+            mconf = module->create_srv_conf(cf);
+            if (mconf == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            ctx->srv_conf[modules[m]->ctx_index] = mconf;
+        }
+
+        if (module->create_app_conf) {
+            mconf = module->create_app_conf(cf);
+            if (mconf == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            ctx->app_conf[modules[m]->ctx_index] = mconf;
+        }
+    }
+
+    /* the server configuration context */
+
+    cscf = ctx->srv_conf[ngx_rtmp_core_module.ctx_index];
+    cscf->ctx = ctx;
+
+    cmcf = ctx->main_conf[ngx_rtmp_core_module.ctx_index];
+
+    cscfp = ngx_array_push(&cmcf->servers);
+    if (cscfp == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *cscfp = cscf;
+
+
+    /* parse inside server{} */
+
+    pcf = *cf;
+    cf->ctx = ctx;
+    cf->cmd_type = NGX_RTMP_SRV_CONF;
+
+    rv = ngx_conf_parse(cf, NULL);
+
+    *cf = pcf;
+
+    return rv;
+}
+
+
+static char *
+ngx_rtmp_core_application(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char                       *rv;
+    ngx_int_t                   i;
+    ngx_str_t                  *value;
+    ngx_conf_t                  save;
+    ngx_module_t              **modules;
+    ngx_rtmp_module_t          *module;
+    ngx_rtmp_conf_ctx_t        *ctx, *pctx;
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    ngx_rtmp_core_app_conf_t   *cacf, **cacfp;
+
+    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
+    if (ctx == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    pctx = cf->ctx;
+    ctx->main_conf = pctx->main_conf;
+    ctx->srv_conf = pctx->srv_conf;
+
+    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
+    if (ctx->app_conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+#if (nginx_version >= 1009011)
+    modules = cf->cycle->modules;
+#else
+    modules = ngx_modules;
+#endif
+
+    for (i = 0; modules[i]; i++) {
+        if (modules[i]->type != NGX_RTMP_MODULE) {
+            continue;
+        }
+
+        module = modules[i]->ctx;
+
+        if (module->create_app_conf) {
+            ctx->app_conf[modules[i]->ctx_index] = module->create_app_conf(cf);
+            if (ctx->app_conf[modules[i]->ctx_index] == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+    cacf = ctx->app_conf[ngx_rtmp_core_module.ctx_index];
+    cacf->app_conf = ctx->app_conf;
+
+    value = cf->args->elts;
+
+    cacf->name = value[1];
+    cscf = pctx->srv_conf[ngx_rtmp_core_module.ctx_index];
+
+    cacfp = ngx_array_push(&cscf->applications);
+    if (cacfp == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *cacfp = cacf;
+
+    save = *cf;
+    cf->ctx = ctx;
+    cf->cmd_type = NGX_RTMP_APP_CONF;
+
+    rv = ngx_conf_parse(cf, NULL);
+
+    *cf= save;
+
+    return rv;
+}
+
+
+static char *
+ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    size_t                      len, off;
+    in_port_t                   port;
+    ngx_str_t                  *value;
+    ngx_url_t                   u;
+    ngx_uint_t                  i, m;
+    ngx_module_t              **modules;
+    struct sockaddr            *sa;
+    ngx_rtmp_listen_t          *ls;
+    struct sockaddr_in         *sin;
+    ngx_rtmp_core_main_conf_t  *cmcf;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6        *sin6;
+#endif
+
+    value = cf->args->elts;
+
+    ngx_memzero(&u, sizeof(ngx_url_t));
+
+    u.url = value[1];
+    u.listen = 1;
+
+    if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
+        if (u.err) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "%s in \"%V\" of the \"listen\" directive",
+                               u.err, &u.url);
+        }
+
+        return NGX_CONF_ERROR;
+    }
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    ls = cmcf->listen.elts;
+
+    for (i = 0; i < cmcf->listen.nelts; i++) {
+
+        sa = (struct sockaddr *) ls[i].sockaddr;
+
+        if (sa->sa_family != u.family) {
+            continue;
+        }
+
+        switch (sa->sa_family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            off = offsetof(struct sockaddr_in6, sin6_addr);
+            len = 16;
+            sin6 = (struct sockaddr_in6 *) sa;
+            port = sin6->sin6_port;
+            break;
+#endif
+
+        default: /* AF_INET */
+            off = offsetof(struct sockaddr_in, sin_addr);
+            len = 4;
+            sin = (struct sockaddr_in *) sa;
+            port = sin->sin_port;
+            break;
+        }
+
+        if (ngx_memcmp(ls[i].sockaddr + off, (u_char *) &u.sockaddr + off, len)
+            != 0)
+        {
+            continue;
+        }
+
+        if (port != u.port) {
+            continue;
+        }
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "duplicate \"%V\" address and port pair", &u.url);
+        return NGX_CONF_ERROR;
+    }
+
+    ls = ngx_array_push(&cmcf->listen);
+    if (ls == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(ls, sizeof(ngx_rtmp_listen_t));
+
+    ngx_memcpy(ls->sockaddr, (u_char *) &u.sockaddr, u.socklen);
+
+    ls->socklen = u.socklen;
+    ls->wildcard = u.wildcard;
+    ls->ctx = cf->ctx;
+
+#if (nginx_version >= 1009011)
+    modules = cf->cycle->modules;
+#else
+    modules = ngx_modules;
+#endif
+
+    for (m = 0; modules[m]; m++) {
+        if (modules[m]->type != NGX_RTMP_MODULE) {
+            continue;
+        }
+    }
+
+    for (i = 2; i < cf->args->nelts; i++) {
+
+        if (ngx_strcmp(value[i].data, "bind") == 0) {
+            ls->bind = 1;
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
+#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+            struct sockaddr  *sa;
+            u_char            buf[NGX_SOCKADDR_STRLEN];
+
+            sa = (struct sockaddr *) ls->sockaddr;
+
+            if (sa->sa_family == AF_INET6) {
+
+                if (ngx_strcmp(&value[i].data[10], "n") == 0) {
+                    ls->ipv6only = 1;
+
+                } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
+                    ls->ipv6only = 0;
+
+                } else {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "invalid ipv6only flags \"%s\"",
+                                       &value[i].data[9]);
+                    return NGX_CONF_ERROR;
+                }
+
+                ls->bind = 1;
+
+            } else {
+                len = ngx_sock_ntop(sa,
+#if (nginx_version >= 1005003)
+                                    ls->socklen,
+#endif
+                                    buf, NGX_SOCKADDR_STRLEN, 1);
+
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "ipv6only is not supported "
+                                   "on addr \"%*s\", ignored", len, buf);
+            }
+
+            continue;
+#else
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "bind ipv6only is not supported "
+                               "on this platform");
+            return NGX_CONF_ERROR;
+#endif
+        }
+
+        if (ngx_strncmp(value[i].data, "so_keepalive=", 13) == 0) {
+
+            if (ngx_strcmp(&value[i].data[13], "on") == 0) {
+                ls->so_keepalive = 1;
+
+            } else if (ngx_strcmp(&value[i].data[13], "off") == 0) {
+                ls->so_keepalive = 2;
+
+            } else {
+
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+                u_char     *p, *end;
+                ngx_str_t   s;
+
+                end = value[i].data + value[i].len;
+                s.data = value[i].data + 13;
+
+                p = ngx_strlchr(s.data, end, ':');
+                if (p == NULL) {
+                    p = end;
+                }
+
+                if (p > s.data) {
+                    s.len = p - s.data;
+
+                    ls->tcp_keepidle = ngx_parse_time(&s, 1);
+                    if (ls->tcp_keepidle == (time_t) NGX_ERROR) {
+                        goto invalid_so_keepalive;
+                    }
+                }
+
+                s.data = (p < end) ? (p + 1) : end;
+
+                p = ngx_strlchr(s.data, end, ':');
+                if (p == NULL) {
+                    p = end;
+                }
+
+                if (p > s.data) {
+                    s.len = p - s.data;
+
+                    ls->tcp_keepintvl = ngx_parse_time(&s, 1);
+                    if (ls->tcp_keepintvl == (time_t) NGX_ERROR) {
+                        goto invalid_so_keepalive;
+                    }
+                }
+
+                s.data = (p < end) ? (p + 1) : end;
+
+                if (s.data < end) {
+                    s.len = end - s.data;
+
+                    ls->tcp_keepcnt = ngx_atoi(s.data, s.len);
+                    if (ls->tcp_keepcnt == NGX_ERROR) {
+                        goto invalid_so_keepalive;
+                    }
+                }
+
+                if (ls->tcp_keepidle == 0 && ls->tcp_keepintvl == 0
+                    && ls->tcp_keepcnt == 0)
+                {
+                    goto invalid_so_keepalive;
+                }
+
+                ls->so_keepalive = 1;
+
+#else
+
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "the \"so_keepalive\" parameter accepts "
+                                   "only \"on\" or \"off\" on this platform");
+                return NGX_CONF_ERROR;
+
+#endif
+            }
+
+            ls->bind = 1;
+
+            continue;
+
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+        invalid_so_keepalive:
+
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid so_keepalive value: \"%s\"",
+                               &value[i].data[13]);
+            return NGX_CONF_ERROR;
+#endif
+        }
+
+        if (ngx_strcmp(value[i].data, "proxy_protocol") == 0) {
+            ls->proxy_protocol = 1;
+            continue;
+        }
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "the invalid \"%V\" parameter", &value[i]);
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_eval.c b/debian/modules/nginx-rtmp/ngx_rtmp_eval.c
new file mode 100644
index 0000000..24e1f80
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_eval.c
@@ -0,0 +1,282 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_eval.h"
+
+
+#define NGX_RTMP_EVAL_BUFLEN    16
+
+
+static void
+ngx_rtmp_eval_session_str(void *ctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
+{
+    *ret = *(ngx_str_t *) ((u_char *) ctx + e->offset);
+}
+
+
+static void
+ngx_rtmp_eval_connection_str(void *ctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
+{
+    ngx_rtmp_session_t  *s = ctx;
+
+    *ret = *(ngx_str_t *) ((u_char *) s->connection + e->offset);
+}
+
+
+ngx_rtmp_eval_t ngx_rtmp_eval_session[] = {
+
+    { ngx_string("app"),
+      ngx_rtmp_eval_session_str,
+      offsetof(ngx_rtmp_session_t, app) },
+
+    { ngx_string("flashver"),
+      ngx_rtmp_eval_session_str,
+      offsetof(ngx_rtmp_session_t, flashver) },
+
+    { ngx_string("swfurl"),
+      ngx_rtmp_eval_session_str,
+      offsetof(ngx_rtmp_session_t, swf_url) },
+
+    { ngx_string("tcurl"),
+      ngx_rtmp_eval_session_str,
+      offsetof(ngx_rtmp_session_t, tc_url) },
+
+    { ngx_string("pageurl"),
+      ngx_rtmp_eval_session_str,
+      offsetof(ngx_rtmp_session_t, page_url) },
+
+    { ngx_string("addr"),
+      ngx_rtmp_eval_connection_str,
+      offsetof(ngx_connection_t, addr_text) },
+
+    ngx_rtmp_null_eval
+};
+
+
+static void
+ngx_rtmp_eval_append(ngx_buf_t *b, void *data, size_t len, ngx_log_t *log)
+{
+    size_t  buf_len;
+
+    if (b->last + len > b->end) {
+        buf_len = 2 * (b->last - b->pos) + len;
+
+        b->start = ngx_alloc(buf_len, log);
+        if (b->start == NULL) {
+            return;
+        }
+
+        b->last = ngx_cpymem(b->start, b->pos, b->last - b->pos);
+        b->pos = b->start;
+        b->end = b->start + buf_len;
+    }
+
+    b->last = ngx_cpymem(b->last, data, len);
+}
+
+
+static void
+ngx_rtmp_eval_append_var(void *ctx, ngx_buf_t *b, ngx_rtmp_eval_t **e,
+    ngx_str_t *name, ngx_log_t *log)
+{
+    ngx_uint_t          k;
+    ngx_str_t           v;
+    ngx_rtmp_eval_t    *ee;
+
+    for (; *e; ++e) {
+        for (k = 0, ee = *e; ee->handler; ++k, ++ee) {
+            if (ee->name.len == name->len &&
+                ngx_memcmp(ee->name.data, name->data, name->len) == 0)
+            {
+                ee->handler(ctx, ee, &v);
+                ngx_rtmp_eval_append(b, v.data, v.len, log);
+            }
+        }
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e, ngx_str_t *out,
+    ngx_log_t *log)
+{
+    u_char      c, *p;
+    ngx_str_t   name;
+    ngx_buf_t   b;
+    ngx_uint_t  n;
+
+    enum {
+        NORMAL,
+        ESCAPE,
+        NAME,
+        SNAME
+    } state = NORMAL;
+
+    b.pos = b.last = b.start = ngx_alloc(NGX_RTMP_EVAL_BUFLEN, log);
+    if (b.pos == NULL) {
+        return NGX_ERROR;
+    }
+
+    b.end = b.pos + NGX_RTMP_EVAL_BUFLEN;
+    name.data = NULL;
+
+    for (n = 0; n < in->len; ++n) {
+        p = &in->data[n];
+        c = *p;
+
+        switch (state) {
+            case SNAME:
+                if (c != '}') {
+                    continue;
+                }
+
+                name.len = p - name.data;
+                ngx_rtmp_eval_append_var(ctx, &b, e, &name, log);
+
+                state = NORMAL;
+
+                continue;
+
+            case NAME:
+                if (c == '{' && name.data == p) {
+                    ++name.data;
+                    state = SNAME;
+                    continue;
+                }
+                if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+                    continue;
+                }
+
+                name.len = p - name.data;
+                ngx_rtmp_eval_append_var(ctx, &b, e, &name, log);
+
+            case NORMAL:
+                switch (c) {
+                    case '$':
+                        name.data = p + 1;
+                        state = NAME;
+                        continue;
+                    case '\\':
+                        state = ESCAPE;
+                        continue;
+                }
+
+            case ESCAPE:
+                ngx_rtmp_eval_append(&b, &c, 1, log);
+                state = NORMAL;
+                break;
+
+        }
+    }
+
+    if (state == NAME) {
+        p = &in->data[n];
+        name.len = p - name.data;
+        ngx_rtmp_eval_append_var(ctx, &b, e, &name, log);
+    }
+
+    c = 0;
+    ngx_rtmp_eval_append(&b, &c, 1, log);
+
+    out->data = b.pos;
+    out->len  = b.last - b.pos - 1;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_eval_streams(ngx_str_t *in)
+{
+#if !(NGX_WIN32)
+    ngx_int_t   mode, create, v, close_src;
+    ngx_fd_t    dst, src;
+    u_char     *path;
+
+    path = in->data;
+
+    while (*path >= '0' && *path <= '9') {
+        path++;
+    }
+
+    switch ((char) *path) {
+
+        case '>':
+
+            v = (path == in->data ? 1 : ngx_atoi(in->data, path - in->data));
+            if (v == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            dst = (ngx_fd_t) v;
+            mode = NGX_FILE_WRONLY;
+            create = NGX_FILE_TRUNCATE;
+            path++;
+
+            if (*path == (u_char) '>') {
+                mode = NGX_FILE_APPEND;
+                create = NGX_FILE_CREATE_OR_OPEN;
+                path++;
+            }
+
+            break;
+
+        case '<':
+
+            v = (path == in->data ? 0 : ngx_atoi(in->data, path - in->data));
+            if (v == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            dst = (ngx_fd_t) v;
+            mode = NGX_FILE_RDONLY;
+            create = NGX_FILE_OPEN;
+            path++;
+
+            break;
+
+        default:
+
+            return NGX_DONE;
+    }
+
+    if (*path == (u_char) '&') {
+
+        path++;
+        v = ngx_atoi(path, in->data + in->len - path);
+        if (v == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+        src = (ngx_fd_t) v;
+        close_src = 0;
+
+    } else {
+
+        src = ngx_open_file(path, mode, create, NGX_FILE_DEFAULT_ACCESS);
+        if (src == NGX_INVALID_FILE) {
+            return NGX_ERROR;
+        }
+        close_src = 1;
+
+    }
+
+    if (src == dst) {
+        return NGX_OK;
+    }
+
+    dup2(src, dst);
+
+    if (close_src) {
+        ngx_close_file(src);
+    }
+    return NGX_OK;
+
+#else
+    return NGX_DONE;
+#endif
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_eval.h b/debian/modules/nginx-rtmp/ngx_rtmp_eval.h
new file mode 100644
index 0000000..b05d16b
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_eval.h
@@ -0,0 +1,44 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_EVAL_H_INCLUDED_
+#define _NGX_RTMP_EVAL_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+
+
+typedef struct ngx_rtmp_eval_s ngx_rtmp_eval_t;
+
+
+typedef void (* ngx_rtmp_eval_pt)(void *ctx, ngx_rtmp_eval_t *e,
+                                  ngx_str_t *ret);
+
+
+struct ngx_rtmp_eval_s {
+    ngx_str_t               name;
+    ngx_rtmp_eval_pt        handler;
+    ngx_uint_t              offset;
+};
+
+
+#define ngx_rtmp_null_eval  { ngx_null_string, NULL, 0 }
+
+
+/* standard session eval variables */
+extern ngx_rtmp_eval_t      ngx_rtmp_eval_session[];
+
+
+ngx_int_t ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e,
+    ngx_str_t *out, ngx_log_t *log);
+
+
+ngx_int_t ngx_rtmp_eval_streams(ngx_str_t *in);
+
+
+#endif /* _NGX_RTMP_EVAL_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_exec_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_exec_module.c
new file mode 100644
index 0000000..fccd4ba
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_exec_module.c
@@ -0,0 +1,1604 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_cmd_module.h"
+#include "ngx_rtmp_record_module.h"
+#include "ngx_rtmp_eval.h"
+#include <stdlib.h>
+
+#ifdef NGX_LINUX
+#include <unistd.h>
+#endif
+
+
+#if !(NGX_WIN32)
+static ngx_rtmp_publish_pt              next_publish;
+static ngx_rtmp_play_pt                 next_play;
+static ngx_rtmp_close_stream_pt         next_close_stream;
+static ngx_rtmp_record_done_pt          next_record_done;
+#endif
+
+
+static ngx_int_t ngx_rtmp_exec_init_process(ngx_cycle_t *cycle);
+static ngx_int_t ngx_rtmp_exec_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_exec_create_main_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_exec_init_main_conf(ngx_conf_t *cf, void *conf);
+static void * ngx_rtmp_exec_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_exec_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+/*static char * ngx_rtmp_exec_block(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);*/
+static char * ngx_rtmp_exec_conf(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static char *ngx_rtmp_exec_kill_signal(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+
+
+#define NGX_RTMP_EXEC_RESPAWN           0x01
+#define NGX_RTMP_EXEC_KILL              0x02
+
+
+#define NGX_RTMP_EXEC_PUBLISHING        0x01
+#define NGX_RTMP_EXEC_PLAYING           0x02
+
+
+enum {
+    NGX_RTMP_EXEC_PUSH,
+    NGX_RTMP_EXEC_PULL,
+
+    NGX_RTMP_EXEC_PUBLISH,
+    NGX_RTMP_EXEC_PUBLISH_DONE,
+    NGX_RTMP_EXEC_PLAY,
+    NGX_RTMP_EXEC_PLAY_DONE,
+    NGX_RTMP_EXEC_RECORD_DONE,
+
+    NGX_RTMP_EXEC_MAX,
+
+    NGX_RTMP_EXEC_STATIC
+};
+
+
+typedef struct {
+    ngx_str_t                           id;
+    ngx_uint_t                          type;
+    ngx_str_t                           cmd;
+    ngx_array_t                         args;       /* ngx_str_t */
+    ngx_array_t                         names;
+} ngx_rtmp_exec_conf_t;
+
+
+typedef struct {
+    ngx_rtmp_exec_conf_t               *conf;
+    ngx_log_t                          *log;
+    ngx_rtmp_eval_t                   **eval;
+    void                               *eval_ctx;
+    unsigned                            active:1;
+    unsigned                            managed:1;
+    ngx_pid_t                           pid;
+    ngx_pid_t                          *save_pid;
+    int                                 pipefd;
+    ngx_connection_t                    dummy_conn;  /*needed by ngx_xxx_event*/
+    ngx_event_t                         read_evt, write_evt;
+    ngx_event_t                         respawn_evt;
+    ngx_msec_t                          respawn_timeout;
+    ngx_int_t                           kill_signal;
+} ngx_rtmp_exec_t;
+
+
+typedef struct {
+    ngx_array_t                         static_conf; /* ngx_rtmp_exec_conf_t */
+    ngx_array_t                         static_exec; /* ngx_rtmp_exec_t */
+    ngx_msec_t                          respawn_timeout;
+    ngx_int_t                           kill_signal;
+    ngx_log_t                          *log;
+} ngx_rtmp_exec_main_conf_t;
+
+
+typedef struct ngx_rtmp_exec_pull_ctx_s  ngx_rtmp_exec_pull_ctx_t;
+
+struct ngx_rtmp_exec_pull_ctx_s {
+    ngx_pool_t                         *pool;
+    ngx_uint_t                          counter;
+    ngx_str_t                           name;
+    ngx_str_t                           app;
+    ngx_array_t                         pull_exec;   /* ngx_rtmp_exec_t */
+    ngx_rtmp_exec_pull_ctx_t           *next;
+};
+
+
+typedef struct {
+    ngx_int_t                           active;
+    ngx_array_t                         conf[NGX_RTMP_EXEC_MAX];
+                                                     /* ngx_rtmp_exec_conf_t */
+    ngx_flag_t                          respawn;
+    ngx_flag_t                          options;
+    ngx_uint_t                          nbuckets;
+    ngx_rtmp_exec_pull_ctx_t          **pull;
+} ngx_rtmp_exec_app_conf_t;
+
+
+typedef struct {
+    ngx_uint_t                          flags;
+    ngx_str_t                           path;     /* /tmp/rec/myfile-123.flv */
+    ngx_str_t                           filename; /* myfile-123.flv */
+    ngx_str_t                           basename; /* myfile-123 */
+    ngx_str_t                           dirname;  /* /tmp/rec */
+    ngx_str_t                           recorder;
+    u_char                              name[NGX_RTMP_MAX_NAME];
+    u_char                              args[NGX_RTMP_MAX_ARGS];
+    ngx_array_t                         push_exec;   /* ngx_rtmp_exec_t */
+    ngx_rtmp_exec_pull_ctx_t           *pull;
+} ngx_rtmp_exec_ctx_t;
+
+
+#if !(NGX_WIN32)
+static void ngx_rtmp_exec_respawn(ngx_event_t *ev);
+static ngx_int_t ngx_rtmp_exec_kill(ngx_rtmp_exec_t *e, ngx_int_t kill_signal);
+static ngx_int_t ngx_rtmp_exec_run(ngx_rtmp_exec_t *e);
+#endif
+
+
+static ngx_command_t  ngx_rtmp_exec_commands[] = {
+/*
+    { ngx_string("exec_block"),
+      NGX_RTMP_APP_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS|NGX_CONF_TAKE1,
+      ngx_rtmp_exec_block,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+*/
+    { ngx_string("exec"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_exec_conf,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
+      NGX_RTMP_EXEC_PUSH * sizeof(ngx_array_t),
+      NULL },
+
+    { ngx_string("exec_push"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_exec_conf,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
+      NGX_RTMP_EXEC_PUSH * sizeof(ngx_array_t),
+      NULL },
+
+    { ngx_string("exec_pull"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_exec_conf,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
+      NGX_RTMP_EXEC_PULL * sizeof(ngx_array_t),
+      NULL },
+
+    { ngx_string("exec_publish"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_exec_conf,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
+      NGX_RTMP_EXEC_PUBLISH * sizeof(ngx_array_t),
+      NULL },
+
+    { ngx_string("exec_publish_done"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_exec_conf,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
+      NGX_RTMP_EXEC_PUBLISH_DONE * sizeof(ngx_array_t),
+      NULL },
+
+    { ngx_string("exec_play"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_exec_conf,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
+      NGX_RTMP_EXEC_PLAY * sizeof(ngx_array_t),
+      NULL },
+
+    { ngx_string("exec_play_done"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_exec_conf,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
+      NGX_RTMP_EXEC_PLAY_DONE * sizeof(ngx_array_t),
+      NULL },
+
+    { ngx_string("exec_record_done"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_RTMP_REC_CONF|
+                         NGX_CONF_1MORE,
+      ngx_rtmp_exec_conf,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
+      NGX_RTMP_EXEC_RECORD_DONE * sizeof(ngx_array_t),
+      NULL },
+
+    { ngx_string("exec_static"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_exec_conf,
+      NGX_RTMP_MAIN_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_main_conf_t, static_conf),
+      NULL },
+
+    { ngx_string("respawn"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, respawn),
+      NULL },
+
+    { ngx_string("respawn_timeout"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_MAIN_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_main_conf_t, respawn_timeout),
+      NULL },
+
+    { ngx_string("exec_kill_signal"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_exec_kill_signal,
+      NGX_RTMP_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("exec_options"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_exec_app_conf_t, options),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_exec_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_exec_postconfiguration,        /* postconfiguration */
+    ngx_rtmp_exec_create_main_conf,         /* create main configuration */
+    ngx_rtmp_exec_init_main_conf,           /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    ngx_rtmp_exec_create_app_conf,          /* create app configuration */
+    ngx_rtmp_exec_merge_app_conf            /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_exec_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_exec_module_ctx,              /* module context */
+    ngx_rtmp_exec_commands,                 /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    ngx_rtmp_exec_init_process,             /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void
+ngx_rtmp_exec_eval_ctx_cstr(void *sctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
+{
+    ngx_rtmp_session_t  *s = sctx;
+
+    ngx_rtmp_exec_ctx_t  *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
+    if (ctx == NULL) {
+        ret->len = 0;
+        return;
+    }
+
+    ret->data = (u_char *) ctx + e->offset;
+    ret->len = ngx_strlen(ret->data);
+}
+
+
+static void
+ngx_rtmp_exec_eval_ctx_str(void *sctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
+{
+    ngx_rtmp_session_t  *s = sctx;
+
+    ngx_rtmp_exec_ctx_t  *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
+    if (ctx == NULL) {
+        ret->len = 0;
+        return;
+    }
+
+    *ret = * (ngx_str_t *) ((u_char *) ctx + e->offset);
+}
+
+
+static void
+ngx_rtmp_exec_eval_pctx_str(void *ctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
+{
+    *ret = *(ngx_str_t *) ((u_char *) ctx + e->offset);
+}
+
+
+static ngx_rtmp_eval_t ngx_rtmp_exec_push_specific_eval[] = {
+
+    { ngx_string("name"),
+      ngx_rtmp_exec_eval_ctx_cstr,
+      offsetof(ngx_rtmp_exec_ctx_t, name) },
+
+    { ngx_string("args"),
+      ngx_rtmp_exec_eval_ctx_cstr,
+      offsetof(ngx_rtmp_exec_ctx_t, args) },
+
+    ngx_rtmp_null_eval
+};
+
+
+static ngx_rtmp_eval_t * ngx_rtmp_exec_push_eval[] = {
+    ngx_rtmp_eval_session,
+    ngx_rtmp_exec_push_specific_eval,
+    NULL
+};
+
+
+static ngx_rtmp_eval_t ngx_rtmp_exec_pull_specific_eval[] = {
+
+    { ngx_string("name"),
+      ngx_rtmp_exec_eval_pctx_str,
+      offsetof(ngx_rtmp_exec_pull_ctx_t, name) },
+
+    { ngx_string("app"),
+      ngx_rtmp_exec_eval_pctx_str,
+      offsetof(ngx_rtmp_exec_pull_ctx_t, app) },
+
+    ngx_rtmp_null_eval
+};
+
+
+static ngx_rtmp_eval_t * ngx_rtmp_exec_pull_eval[] = {
+    ngx_rtmp_exec_pull_specific_eval,
+    NULL
+};
+
+
+static ngx_rtmp_eval_t ngx_rtmp_exec_event_specific_eval[] = {
+
+    { ngx_string("name"),
+      ngx_rtmp_exec_eval_ctx_cstr,
+      offsetof(ngx_rtmp_exec_ctx_t, name) },
+
+    { ngx_string("args"),
+      ngx_rtmp_exec_eval_ctx_cstr,
+      offsetof(ngx_rtmp_exec_ctx_t, args) },
+
+    { ngx_string("path"),
+      ngx_rtmp_exec_eval_ctx_str,
+      offsetof(ngx_rtmp_exec_ctx_t, path) },
+
+    { ngx_string("filename"),
+      ngx_rtmp_exec_eval_ctx_str,
+      offsetof(ngx_rtmp_exec_ctx_t, filename) },
+
+    { ngx_string("basename"),
+      ngx_rtmp_exec_eval_ctx_str,
+      offsetof(ngx_rtmp_exec_ctx_t, basename) },
+
+    { ngx_string("dirname"),
+      ngx_rtmp_exec_eval_ctx_str,
+      offsetof(ngx_rtmp_exec_ctx_t, dirname) },
+
+    { ngx_string("recorder"),
+      ngx_rtmp_exec_eval_ctx_str,
+      offsetof(ngx_rtmp_exec_ctx_t, recorder) },
+
+    ngx_rtmp_null_eval
+};
+
+
+static ngx_rtmp_eval_t * ngx_rtmp_exec_event_eval[] = {
+    ngx_rtmp_eval_session,
+    ngx_rtmp_exec_event_specific_eval,
+    NULL
+};
+
+
+static void *
+ngx_rtmp_exec_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_exec_main_conf_t     *emcf;
+
+    emcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_exec_main_conf_t));
+    if (emcf == NULL) {
+        return NULL;
+    }
+
+    emcf->respawn_timeout = NGX_CONF_UNSET_MSEC;
+    emcf->kill_signal = NGX_CONF_UNSET;
+
+    if (ngx_array_init(&emcf->static_conf, cf->pool, 1,
+                       sizeof(ngx_rtmp_exec_conf_t)) != NGX_OK)
+    {
+        return NULL;
+    }
+
+    return emcf;
+}
+
+
+static char *
+ngx_rtmp_exec_init_main_conf(ngx_conf_t *cf, void *conf)
+{
+    ngx_rtmp_exec_main_conf_t  *emcf = conf;
+    ngx_rtmp_exec_conf_t       *ec;
+    ngx_rtmp_exec_t            *e;
+    ngx_uint_t                  n;
+
+    if (emcf->respawn_timeout == NGX_CONF_UNSET_MSEC) {
+        emcf->respawn_timeout = 5000;
+    }
+
+#if !(NGX_WIN32)
+    if (emcf->kill_signal == NGX_CONF_UNSET) {
+        emcf->kill_signal = SIGKILL;
+    }
+#endif
+
+    if (ngx_array_init(&emcf->static_exec, cf->pool,
+                       emcf->static_conf.nelts,
+                       sizeof(ngx_rtmp_exec_t)) != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    e = ngx_array_push_n(&emcf->static_exec, emcf->static_conf.nelts);
+    if (e == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    emcf->log = &cf->cycle->new_log;
+
+    ec = emcf->static_conf.elts;
+
+    for (n = 0; n < emcf->static_conf.nelts; n++, e++, ec++) {
+        ngx_memzero(e, sizeof(*e));
+        e->conf = ec;
+        e->managed = 1;
+        e->log = emcf->log;
+        e->respawn_timeout = emcf->respawn_timeout;
+        e->kill_signal = emcf->kill_signal;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_rtmp_exec_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_exec_app_conf_t      *eacf;
+
+    eacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_exec_app_conf_t));
+    if (eacf == NULL) {
+        return NULL;
+    }
+
+    eacf->respawn = NGX_CONF_UNSET;
+    eacf->options = NGX_CONF_UNSET;
+    eacf->nbuckets = NGX_CONF_UNSET_UINT;
+
+    return eacf;
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_merge_confs(ngx_array_t *conf, ngx_array_t *prev)
+{
+    size_t                 n;
+    ngx_rtmp_exec_conf_t  *ec, *pec;
+
+    if (prev->nelts == 0) {
+        return NGX_OK;
+    }
+
+    if (conf->nelts == 0) {
+        *conf = *prev;
+        return NGX_OK;
+    }
+
+    ec = ngx_array_push_n(conf, prev->nelts);
+    if (ec == NULL) {
+        return NGX_ERROR;
+    }
+
+    pec = prev->elts;
+    for (n = 0; n < prev->nelts; n++, ec++, pec++) {
+        *ec = *pec;
+    }
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_rtmp_exec_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_exec_app_conf_t   *prev = parent;
+    ngx_rtmp_exec_app_conf_t   *conf = child;
+
+    ngx_uint_t  n;
+
+    ngx_conf_merge_value(conf->respawn, prev->respawn, 1);
+    ngx_conf_merge_uint_value(conf->nbuckets, prev->nbuckets, 1024);
+
+    for (n = 0; n < NGX_RTMP_EXEC_MAX; n++) {
+        if (ngx_rtmp_exec_merge_confs(&conf->conf[n], &prev->conf[n]) != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
+
+        if (conf->conf[n].nelts) {
+            conf->active = 1;
+            prev->active = 1;
+        }
+    }
+
+    if (conf->conf[NGX_RTMP_EXEC_PULL].nelts > 0) {
+        conf->pull = ngx_pcalloc(cf->pool, sizeof(void *) * conf->nbuckets);
+        if (conf->pull == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_init_process(ngx_cycle_t *cycle)
+{
+#if !(NGX_WIN32)
+    ngx_rtmp_core_main_conf_t  *cmcf = ngx_rtmp_core_main_conf;
+    ngx_rtmp_core_srv_conf_t  **cscf;
+    ngx_rtmp_conf_ctx_t        *cctx;
+    ngx_rtmp_exec_main_conf_t  *emcf;
+    ngx_rtmp_exec_t            *e;
+    ngx_uint_t                  n;
+
+    if (cmcf == NULL || cmcf->servers.nelts == 0) {
+        return NGX_OK;
+    }
+
+    /* execs are always started by the first worker */
+    if (ngx_process_slot) {
+        return NGX_OK;
+    }
+
+    cscf = cmcf->servers.elts;
+    cctx = (*cscf)->ctx;
+    emcf = cctx->main_conf[ngx_rtmp_exec_module.ctx_index];
+
+    /* FreeBSD note:
+     * When worker is restarted, child process (ffmpeg) will
+     * not be terminated if it's connected to another
+     * (still alive) worker. That leads to starting
+     * another instance of exec_static process.
+     * Need to kill previously started processes.
+     *
+     * On Linux "prctl" syscall is used to kill child
+     * when nginx worker is terminated.
+     */
+
+    e = emcf->static_exec.elts;
+    for (n = 0; n < emcf->static_exec.nelts; ++n, ++e) {
+        e->respawn_evt.data = e;
+        e->respawn_evt.log = e->log;
+        e->respawn_evt.handler = ngx_rtmp_exec_respawn;
+        ngx_post_event((&e->respawn_evt), &ngx_rtmp_init_queue);
+    }
+#endif
+
+    return NGX_OK;
+}
+
+
+#if !(NGX_WIN32)
+static void
+ngx_rtmp_exec_respawn(ngx_event_t *ev)
+{
+    ngx_rtmp_exec_run((ngx_rtmp_exec_t *) ev->data);
+}
+
+
+static void
+ngx_rtmp_exec_child_dead(ngx_event_t *ev)
+{
+    ngx_connection_t   *dummy_conn = ev->data;
+    ngx_rtmp_exec_t    *e;
+
+    e = dummy_conn->data;
+
+    ngx_log_error(NGX_LOG_INFO, e->log, 0,
+                  "exec: child %ui exited; %s", (ngx_int_t) e->pid,
+                  e->respawn_timeout == NGX_CONF_UNSET_MSEC ? "respawning" :
+                                                               "ignoring");
+
+    ngx_rtmp_exec_kill(e, 0);
+
+    if (e->respawn_timeout == NGX_CONF_UNSET_MSEC) {
+        return;
+    }
+
+    if (e->respawn_timeout == 0) {
+        ngx_rtmp_exec_run(e);
+        return;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, e->log, 0,
+                   "exec: shedule respawn %Mmsec", e->respawn_timeout);
+
+    e->respawn_evt.data = e;
+    e->respawn_evt.log = e->log;
+    e->respawn_evt.handler = ngx_rtmp_exec_respawn;
+
+    ngx_add_timer(&e->respawn_evt, e->respawn_timeout);
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_kill(ngx_rtmp_exec_t *e, ngx_int_t kill_signal)
+{
+    if (e->respawn_evt.timer_set) {
+        ngx_del_timer(&e->respawn_evt);
+    }
+
+    if (e->read_evt.active) {
+        ngx_del_event(&e->read_evt, NGX_READ_EVENT, 0);
+    }
+
+    if (e->active == 0) {
+        return NGX_OK;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, e->log, 0,
+                  "exec: terminating child %ui", (ngx_int_t) e->pid);
+
+    e->active = 0;
+    close(e->pipefd);
+    if (e->save_pid) {
+        *e->save_pid = NGX_INVALID_PID;
+    }
+
+    if (kill_signal == 0) {
+        return NGX_OK;
+    }
+
+    if (kill(e->pid, kill_signal) == -1) {
+        ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
+                      "exec: kill failed pid=%i", (ngx_int_t) e->pid);
+    } else {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, e->log, 0,
+                       "exec: killed pid=%i", (ngx_int_t) e->pid);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_run(ngx_rtmp_exec_t *e)
+{
+    int                     fd, ret, maxfd, pipefd[2];
+    char                  **args, **arg_out;
+    ngx_pid_t               pid;
+    ngx_str_t              *arg_in, a;
+    ngx_uint_t              n;
+    ngx_rtmp_exec_conf_t   *ec;
+
+    ec = e->conf;
+
+    ngx_log_error(NGX_LOG_INFO, e->log, 0,
+                  "exec: starting %s child '%V'",
+                  e->managed ? "managed" : "unmanaged", &ec->cmd);
+
+    pipefd[0] = -1;
+    pipefd[1] = -1;
+
+    if (e->managed) {
+
+        if (e->active) {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, e->log, 0,
+                           "exec: already active '%V'", &ec->cmd);
+            return NGX_OK;
+        }
+
+        if (pipe(pipefd) == -1) {
+            ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
+                          "exec: pipe failed");
+            return NGX_ERROR;
+        }
+
+        /* make pipe write end survive through exec */
+
+        ret = fcntl(pipefd[1], F_GETFD);
+
+        if (ret != -1) {
+            ret &= ~FD_CLOEXEC;
+            ret = fcntl(pipefd[1], F_SETFD, ret);
+        }
+
+        if (ret == -1) {
+
+            close(pipefd[0]);
+            close(pipefd[1]);
+
+            ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
+                          "exec: fcntl failed");
+
+            return NGX_ERROR;
+        }
+    }
+
+    pid = fork();
+
+    switch (pid) {
+
+        case -1:
+
+            /* failure */
+
+            if (pipefd[0] != -1) {
+                close(pipefd[0]);
+            }
+
+            if (pipefd[1] != -1) {
+                close(pipefd[1]);
+            }
+
+            ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
+                          "exec: fork failed");
+
+            return NGX_ERROR;
+
+        case 0:
+
+            /* child */
+
+#if (NGX_LINUX)
+            if (e->managed) {
+                prctl(PR_SET_PDEATHSIG, e->kill_signal, 0, 0, 0);
+            }
+#endif
+
+            /* close all descriptors but pipe write end */
+
+            maxfd = sysconf(_SC_OPEN_MAX);
+            for (fd = 0; fd < maxfd; ++fd) {
+                if (fd == pipefd[1]) {
+                    continue;
+                }
+
+                close(fd);
+            }
+
+            fd = open("/dev/null", O_RDWR);
+
+            dup2(fd, STDIN_FILENO);
+            dup2(fd, STDOUT_FILENO);
+            dup2(fd, STDERR_FILENO);
+
+            args = ngx_alloc((ec->args.nelts + 2) * sizeof(char *), e->log);
+            if (args == NULL) {
+                exit(1);
+            }
+
+            arg_in = ec->args.elts;
+            arg_out = args;
+            *arg_out++ = (char *) ec->cmd.data;
+
+            for (n = 0; n < ec->args.nelts; n++, ++arg_in) {
+
+                if (e->eval == NULL) {
+                    a = *arg_in;
+                } else {
+                    ngx_rtmp_eval(e->eval_ctx, arg_in, e->eval, &a, e->log);
+                }
+
+                if (ngx_rtmp_eval_streams(&a) != NGX_DONE) {
+                    continue;
+                }
+
+                *arg_out++ = (char *) a.data;
+            }
+
+            *arg_out = NULL;
+
+#if (NGX_DEBUG)
+            {
+                char    **p;
+
+                for (p = args; *p; p++) {
+                    ngx_write_fd(STDERR_FILENO, "'", 1);
+                    ngx_write_fd(STDERR_FILENO, *p, strlen(*p));
+                    ngx_write_fd(STDERR_FILENO, "' ", 2);
+                }
+
+                ngx_write_fd(STDERR_FILENO, "\n", 1);
+            }
+#endif
+
+            if (execvp((char *) ec->cmd.data, args) == -1) {
+                char    *msg;
+
+                msg = strerror(errno);
+
+                ngx_write_fd(STDERR_FILENO, "execvp error: ", 14);
+                ngx_write_fd(STDERR_FILENO, msg, strlen(msg));
+                ngx_write_fd(STDERR_FILENO, "\n", 1);
+
+                exit(1);
+            }
+
+            break;
+
+        default:
+
+            /* parent */
+
+            if (pipefd[1] != -1) {
+                close(pipefd[1]);
+            }
+
+            if (pipefd[0] != -1) {
+
+                e->active = 1;
+                e->pid = pid;
+                e->pipefd = pipefd[0];
+
+                if (e->save_pid) {
+                    *e->save_pid = pid;
+                }
+
+                e->dummy_conn.fd = e->pipefd;
+                e->dummy_conn.data = e;
+                e->dummy_conn.read  = &e->read_evt;
+                e->dummy_conn.write = &e->write_evt;
+                e->read_evt.data  = &e->dummy_conn;
+                e->write_evt.data = &e->dummy_conn;
+
+                e->read_evt.log = e->log;
+                e->read_evt.handler = ngx_rtmp_exec_child_dead;
+
+                if (ngx_add_event(&e->read_evt, NGX_READ_EVENT, 0) != NGX_OK) {
+                    ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
+                                  "exec: failed to add child control event");
+                }
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, e->log, 0,
+                           "exec: child '%V' started pid=%i",
+                           &ec->cmd, (ngx_int_t) pid);
+            break;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_init_ctx(ngx_rtmp_session_t *s, u_char name[NGX_RTMP_MAX_NAME],
+    u_char args[NGX_RTMP_MAX_ARGS], ngx_uint_t flags)
+{
+    ngx_uint_t                  n;
+    ngx_array_t                *push_conf;
+    ngx_rtmp_exec_t            *e;
+    ngx_rtmp_exec_ctx_t        *ctx;
+    ngx_rtmp_exec_conf_t       *ec;
+    ngx_rtmp_exec_app_conf_t   *eacf;
+    ngx_rtmp_exec_main_conf_t  *emcf;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
+
+    if (ctx != NULL) {
+        goto done;
+    }
+
+    ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_exec_ctx_t));
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_exec_module);
+
+    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
+
+    emcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_exec_module);
+
+    push_conf = &eacf->conf[NGX_RTMP_EXEC_PUSH];
+
+    if (push_conf->nelts > 0) {
+
+        if (ngx_array_init(&ctx->push_exec, s->connection->pool,
+                           push_conf->nelts,
+                           sizeof(ngx_rtmp_exec_t)) != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        e = ngx_array_push_n(&ctx->push_exec, push_conf->nelts);
+
+        if (e == NULL) {
+            return NGX_ERROR;
+        }
+
+        ec = push_conf->elts;
+
+        for (n = 0; n < push_conf->nelts; n++, e++, ec++) {
+            ngx_memzero(e, sizeof(*e));
+            e->conf = ec;
+            e->managed = 1;
+            e->log = s->connection->log;
+            e->eval = ngx_rtmp_exec_push_eval;
+            e->eval_ctx = s;
+            e->kill_signal = emcf->kill_signal;
+            e->respawn_timeout = (eacf->respawn ? emcf->respawn_timeout :
+                                  NGX_CONF_UNSET_MSEC);
+        }
+    }
+
+done:
+
+    ngx_memcpy(ctx->name, name, NGX_RTMP_MAX_NAME);
+    ngx_memcpy(ctx->args, args, NGX_RTMP_MAX_ARGS);
+
+    ctx->flags |= flags;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_init_pull_ctx(ngx_rtmp_session_t *s,
+    u_char name[NGX_RTMP_MAX_NAME])
+{
+    size_t                      len;
+    ngx_uint_t                  n;
+    ngx_pool_t                 *pool;
+    ngx_array_t                *pull_conf;
+    ngx_rtmp_exec_t            *e;
+    ngx_rtmp_exec_ctx_t        *ctx;
+    ngx_rtmp_exec_conf_t       *ec;
+    ngx_rtmp_exec_pull_ctx_t   *pctx, **ppctx;
+    ngx_rtmp_exec_app_conf_t   *eacf;
+    ngx_rtmp_exec_main_conf_t  *emcf;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
+    if (ctx->pull != NULL) {
+        return NGX_OK;
+    }
+
+    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
+
+    pull_conf = &eacf->conf[NGX_RTMP_EXEC_PULL];
+
+    if (pull_conf->nelts == 0) {
+        return NGX_OK;
+    }
+
+    emcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_exec_module);
+
+    len = ngx_strlen(name);
+
+    ppctx = &eacf->pull[ngx_hash_key(name, len) % eacf->nbuckets];
+
+    for (; *ppctx; ppctx = &(*ppctx)->next) {
+        pctx = *ppctx;
+
+        if (pctx->name.len == len &&
+            ngx_strncmp(name, pctx->name.data, len) == 0)
+        {
+            goto done;
+        }
+    }
+
+    pool = ngx_create_pool(4096, emcf->log);
+    if (pool == NULL) {
+        return NGX_ERROR;
+    }
+
+    pctx = ngx_pcalloc(pool, sizeof(ngx_rtmp_exec_pull_ctx_t));
+    if (pctx == NULL) {
+        goto error;
+    }
+
+    pctx->pool = pool;
+    pctx->name.len = len;
+    pctx->name.data = ngx_palloc(pool, len);
+
+    if (pctx->name.data == NULL) {
+        goto error;
+    }
+
+    ngx_memcpy(pctx->name.data, name, len);
+
+    pctx->app.len = s->app.len;
+    pctx->app.data = ngx_palloc(pool, s->app.len);
+
+    if (pctx->app.data == NULL) {
+        goto error;
+    }
+
+    ngx_memcpy(pctx->app.data, s->app.data, s->app.len);
+
+    if (ngx_array_init(&pctx->pull_exec, pool, pull_conf->nelts,
+                       sizeof(ngx_rtmp_exec_t)) != NGX_OK)
+    {
+        goto error;
+    }
+
+    e = ngx_array_push_n(&pctx->pull_exec, pull_conf->nelts);
+    if (e == NULL) {
+        goto error;
+    }
+
+    ec = pull_conf->elts;
+    for (n = 0; n < pull_conf->nelts; n++, e++, ec++) {
+        ngx_memzero(e, sizeof(*e));
+        e->conf = ec;
+        e->managed = 1;
+        e->log = emcf->log;
+        e->eval = ngx_rtmp_exec_pull_eval;
+        e->eval_ctx = pctx;
+        e->kill_signal = emcf->kill_signal;
+        e->respawn_timeout = (eacf->respawn ? emcf->respawn_timeout :
+                                              NGX_CONF_UNSET_MSEC);
+    }
+
+    *ppctx = pctx;
+
+done:
+
+    ctx->pull = pctx;
+    ctx->pull->counter++;
+
+    return NGX_OK;
+
+error:
+
+    ngx_destroy_pool(pool);
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_filter(ngx_rtmp_session_t *s, ngx_rtmp_exec_conf_t *ec)
+{
+    size_t                len;
+    ngx_str_t            *v;
+    ngx_uint_t            n;
+    ngx_rtmp_exec_ctx_t  *ctx;
+
+    if (ec->names.nelts == 0) {
+        return NGX_OK;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
+
+    len = ngx_strlen(ctx->name);
+
+    v = ec->names.elts;
+    for (n = 0; n < ec->names.nelts; n++, s++) {
+        if (v->len == len && ngx_strncmp(v->data, ctx->name, len) == 0) {
+            return NGX_OK;
+        }
+    }
+
+    return NGX_DECLINED;
+}
+
+
+static void
+ngx_rtmp_exec_unmanaged(ngx_rtmp_session_t *s, ngx_array_t *e, const char *op)
+{
+    ngx_uint_t             n;
+    ngx_rtmp_exec_t        en;
+    ngx_rtmp_exec_conf_t  *ec;
+
+    if (e->nelts == 0) {
+        return;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "exec: %s %uz unmanaged command(s)", op, e->nelts);
+
+    ec = e->elts;
+    for (n = 0; n < e->nelts; n++, ec++) {
+        if (ngx_rtmp_exec_filter(s, ec) != NGX_OK) {
+            continue;
+        }
+
+        ngx_memzero(&en, sizeof(ngx_rtmp_exec_t));
+
+        en.conf = ec;
+        en.eval = ngx_rtmp_exec_event_eval;
+        en.eval_ctx = s;
+        en.log = s->connection->log;
+
+        ngx_rtmp_exec_run(&en);
+    }
+}
+
+
+static void
+ngx_rtmp_exec_managed(ngx_rtmp_session_t *s, ngx_array_t *e, const char *op)
+{
+    ngx_uint_t        n;
+    ngx_rtmp_exec_t  *en;
+
+    if (e->nelts == 0) {
+        return;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "exec: %s %uz managed command(s)", op, e->nelts);
+
+    en = e->elts;
+    for (n = 0; n < e->nelts; n++, en++) {
+        if (ngx_rtmp_exec_filter(s, en->conf) == NGX_OK) {
+            ngx_rtmp_exec_run(en);
+        }
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    ngx_rtmp_exec_ctx_t       *ctx;
+    ngx_rtmp_exec_app_conf_t  *eacf;
+
+    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
+
+    if (eacf == NULL || !eacf->active) {
+        goto next;
+    }
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    if (ngx_rtmp_exec_init_ctx(s, v->name, v->args, NGX_RTMP_EXEC_PUBLISHING)
+        != NGX_OK)
+    {
+        goto next;
+    }
+
+    ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_PUBLISH], "publish");
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
+
+    ngx_rtmp_exec_managed(s, &ctx->push_exec, "push");
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    ngx_rtmp_exec_ctx_t       *ctx;
+    ngx_rtmp_exec_pull_ctx_t  *pctx;
+    ngx_rtmp_exec_app_conf_t  *eacf;
+
+    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
+
+    if (eacf == NULL || !eacf->active) {
+        goto next;
+    }
+
+    if (ngx_rtmp_exec_init_ctx(s, v->name, v->args, NGX_RTMP_EXEC_PLAYING)
+        != NGX_OK)
+    {
+        goto next;
+    }
+
+    ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_PLAY], "play");
+
+    if (ngx_rtmp_exec_init_pull_ctx(s, v->name) != NGX_OK) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
+    pctx = ctx->pull;
+
+    if (pctx && pctx->counter == 1) {
+        ngx_rtmp_exec_managed(s, &pctx->pull_exec, "pull");
+    }
+
+next:
+    return next_play(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
+{
+    size_t                     n;
+    ngx_rtmp_exec_t           *e;
+    ngx_rtmp_exec_ctx_t       *ctx;
+    ngx_rtmp_exec_pull_ctx_t  *pctx, **ppctx;
+    ngx_rtmp_exec_app_conf_t  *eacf;
+
+    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
+    if (eacf == NULL) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
+    if (ctx == NULL) {
+        goto next;
+    }
+
+    if (ctx->flags & NGX_RTMP_EXEC_PUBLISHING) {
+        ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_PUBLISH_DONE],
+                                "publish_done");
+    }
+
+    if (ctx->flags & NGX_RTMP_EXEC_PLAYING) {
+        ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_PLAY_DONE],
+                                "play_done");
+    }
+
+    ctx->flags = 0;
+
+    if (ctx->push_exec.nelts > 0) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "exec: delete %uz push command(s)",
+                       ctx->push_exec.nelts);
+
+        e = ctx->push_exec.elts;
+        for (n = 0; n < ctx->push_exec.nelts; n++, e++) {
+            ngx_rtmp_exec_kill(e, e->kill_signal);
+        }
+    }
+
+    pctx = ctx->pull;
+
+    if (pctx && --pctx->counter == 0) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "exec: delete %uz pull command(s)",
+                       pctx->pull_exec.nelts);
+
+        e = pctx->pull_exec.elts;
+        for (n = 0; n < pctx->pull_exec.nelts; n++, e++) {
+            ngx_rtmp_exec_kill(e, e->kill_signal);
+        }
+
+        ppctx = &eacf->pull[ngx_hash_key(pctx->name.data, pctx->name.len) %
+                            eacf->nbuckets];
+
+        for (; *ppctx; ppctx = &(*ppctx)->next) {
+            if (pctx == *ppctx) {
+                *ppctx = pctx->next;
+                break;
+            }
+        }
+
+        ngx_destroy_pool(pctx->pool);
+    }
+
+    ctx->pull = NULL;
+
+next:
+    return next_close_stream(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_record_done(ngx_rtmp_session_t *s, ngx_rtmp_record_done_t *v)
+{
+    u_char                     c;
+    ngx_uint_t                 ext, dir;
+    ngx_rtmp_exec_ctx_t       *ctx;
+    ngx_rtmp_exec_app_conf_t  *eacf;
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
+    if (eacf == NULL || !eacf->active) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
+    if (ctx == NULL) {
+        goto next;
+    }
+
+    ctx->recorder = v->recorder;
+    ctx->path = v->path;
+
+    ctx->dirname.data = ctx->path.data;
+    ctx->dirname.len = 0;
+
+    for (dir = ctx->path.len; dir > 0; dir--) {
+        c = ctx->path.data[dir - 1];
+        if (c == '/' || c == '\\') {
+            ctx->dirname.len = dir - 1;
+            break;
+        }
+    }
+
+    ctx->filename.data = ctx->path.data + dir;
+    ctx->filename.len = ctx->path.len - dir;
+
+    ctx->basename = ctx->filename;
+
+    for (ext = ctx->filename.len; ext > 0; ext--) {
+        if (ctx->filename.data[ext - 1] == '.') {
+            ctx->basename.len = ext - 1;
+            break;
+        }
+    }
+
+    ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_RECORD_DONE],
+                            "record_done");
+
+    ngx_str_null(&v->recorder);
+    ngx_str_null(&v->path);
+
+next:
+    return next_record_done(s, v);
+}
+#endif /* NGX_WIN32 */
+
+
+static char *
+ngx_rtmp_exec_conf(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    size_t                     n, nargs;
+    ngx_str_t                 *s, *value, v;
+    ngx_array_t               *confs;
+    ngx_rtmp_exec_conf_t      *ec;
+    ngx_rtmp_exec_app_conf_t  *eacf;
+
+    confs = (ngx_array_t *) (p + cmd->offset);
+
+    eacf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_exec_module);
+
+    if (confs->nalloc == 0 && ngx_array_init(confs, cf->pool, 1,
+                                             sizeof(ngx_rtmp_exec_conf_t))
+                              != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    ec = ngx_array_push(confs);
+    if (ec == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(ec, sizeof(ngx_rtmp_exec_conf_t));
+
+    /* type is undefined for explicit execs */
+
+    ec->type = NGX_CONF_UNSET_UINT;
+    ec->cmd = value[1];
+
+    if (ngx_array_init(&ec->names, cf->pool, 1, sizeof(ngx_str_t)) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->args->nelts == 2) {
+        return NGX_CONF_OK;
+    }
+
+    nargs = cf->args->nelts - 2;
+    if (ngx_array_init(&ec->args, cf->pool, nargs, sizeof(ngx_str_t)) != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    for (n = 2; n < cf->args->nelts; n++) {
+
+        v = value[n];
+
+        if (eacf->options == 1) {
+
+            if (v.len >= 5 && ngx_strncmp(v.data, "name=", 5) == 0) {
+
+                s = ngx_array_push(&ec->names);
+                if (s == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+
+                v.data += 5;
+                v.len -= 5;
+
+                *s = v;
+
+                continue;
+            }
+        }
+
+        s = ngx_array_push(&ec->args);
+        if (s == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *s = v;
+    }
+
+    return NGX_CONF_OK;
+}
+
+/*
+static char *
+ngx_rtmp_exec_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char                       *rv;
+    ngx_str_t                  *value;
+    ngx_conf_t                  save;
+    ngx_array_t                *confs;
+    ngx_rtmp_conf_ctx_t        *ctx, *pctx;
+    ngx_rtmp_exec_conf_t       *ec, *eec;
+    ngx_rtmp_exec_app_conf_t   *eacf;
+    ngx_rtmp_exec_main_conf_t  *emcf;
+
+    value = cf->args->elts;
+
+    eacf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_exec_module);
+
+    emcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_exec_module);
+
+    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
+    if (ctx == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    pctx = cf->ctx;
+
+    ctx->main_conf = pctx->main_conf;
+    ctx->srv_conf  = pctx->srv_conf;
+
+    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
+    if (ctx->app_conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ec = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_exec_conf_t));
+    if (ec == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ec->id = value[1];
+    ec->type = NGX_CONF_UNSET_UINT;
+
+    ctx->app_conf[ngx_rtmp_exec_module.ctx_index] = ec;
+
+    save = *cf;
+
+    cf->ctx = ctx;
+    cf->cmd_type = NGX_RTMP_EXEC_CONF;
+
+    rv = ngx_conf_parse(cf, NULL);
+    *cf= save;
+
+    switch (ec->type) {
+
+        case NGX_RTMP_EXEC_STATIC:
+            confs = &emcf->static_conf;
+            break;
+
+        case NGX_CONF_UNSET_UINT:
+            return "unspecified exec type";
+
+        default:
+            confs = &eacf->conf[ec->type];
+    }
+
+    if (confs->nalloc == 0 && ngx_array_init(confs, cf->pool, 1,
+                                             sizeof(ngx_rtmp_exec_conf_t))
+                             != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    eec = ngx_array_push(confs);
+    if (eec == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *eec = *ec;
+
+    return rv;
+}
+*/
+
+static char *
+ngx_rtmp_exec_kill_signal(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_exec_main_conf_t  *emcf = conf;
+
+    ngx_str_t  *value;
+
+    value = cf->args->elts;
+    value++;
+
+    emcf->kill_signal = ngx_atoi(value->data, value->len);
+    if (emcf->kill_signal != NGX_ERROR) {
+        return NGX_CONF_OK;
+    }
+
+#define NGX_RMTP_EXEC_SIGNAL(name)                                          \
+    if (value->len == sizeof(#name) - 1 &&                                  \
+        ngx_strncasecmp(value->data, (u_char *) #name, value->len) == 0)    \
+    {                                                                       \
+        emcf->kill_signal = SIG##name;                                      \
+        return NGX_CONF_OK;                                                 \
+    }
+
+    /* POSIX.1-1990 signals */
+
+#if !(NGX_WIN32)
+    NGX_RMTP_EXEC_SIGNAL(HUP);
+    NGX_RMTP_EXEC_SIGNAL(INT);
+    NGX_RMTP_EXEC_SIGNAL(QUIT);
+    NGX_RMTP_EXEC_SIGNAL(ILL);
+    NGX_RMTP_EXEC_SIGNAL(ABRT);
+    NGX_RMTP_EXEC_SIGNAL(FPE);
+    NGX_RMTP_EXEC_SIGNAL(KILL);
+    NGX_RMTP_EXEC_SIGNAL(SEGV);
+    NGX_RMTP_EXEC_SIGNAL(PIPE);
+    NGX_RMTP_EXEC_SIGNAL(ALRM);
+    NGX_RMTP_EXEC_SIGNAL(TERM);
+    NGX_RMTP_EXEC_SIGNAL(USR1);
+    NGX_RMTP_EXEC_SIGNAL(USR2);
+    NGX_RMTP_EXEC_SIGNAL(CHLD);
+    NGX_RMTP_EXEC_SIGNAL(CONT);
+    NGX_RMTP_EXEC_SIGNAL(STOP);
+    NGX_RMTP_EXEC_SIGNAL(TSTP);
+    NGX_RMTP_EXEC_SIGNAL(TTIN);
+    NGX_RMTP_EXEC_SIGNAL(TTOU);
+#endif
+
+#undef NGX_RMTP_EXEC_SIGNAL
+
+    return "unknown signal";
+}
+
+
+static ngx_int_t
+ngx_rtmp_exec_postconfiguration(ngx_conf_t *cf)
+{
+#if !(NGX_WIN32)
+
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_exec_publish;
+
+    next_play = ngx_rtmp_play;
+    ngx_rtmp_play = ngx_rtmp_exec_play;
+
+    next_close_stream = ngx_rtmp_close_stream;
+    ngx_rtmp_close_stream = ngx_rtmp_exec_close_stream;
+
+    next_record_done = ngx_rtmp_record_done;
+    ngx_rtmp_record_done = ngx_rtmp_exec_record_done;
+
+#endif /* NGX_WIN32 */
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_flv_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_flv_module.c
new file mode 100644
index 0000000..4776e54
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_flv_module.c
@@ -0,0 +1,675 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_play_module.h"
+#include "ngx_rtmp_codec_module.h"
+#include "ngx_rtmp_streams.h"
+
+
+static ngx_int_t ngx_rtmp_flv_postconfiguration(ngx_conf_t *cf);
+static void ngx_rtmp_flv_read_meta(ngx_rtmp_session_t *s, ngx_file_t *f);
+static ngx_int_t ngx_rtmp_flv_timestamp_to_offset(ngx_rtmp_session_t *s,
+       ngx_file_t *f, ngx_int_t timestamp);
+static ngx_int_t ngx_rtmp_flv_init(ngx_rtmp_session_t *s, ngx_file_t *f,
+       ngx_int_t aindex, ngx_int_t vindex);
+static ngx_int_t ngx_rtmp_flv_start(ngx_rtmp_session_t *s, ngx_file_t *f);
+static ngx_int_t ngx_rtmp_flv_seek(ngx_rtmp_session_t *s, ngx_file_t *f,
+       ngx_uint_t offset);
+static ngx_int_t ngx_rtmp_flv_stop(ngx_rtmp_session_t *s, ngx_file_t *f);
+static ngx_int_t ngx_rtmp_flv_send(ngx_rtmp_session_t *s, ngx_file_t *f,
+                                   ngx_uint_t *ts);
+
+
+typedef struct {
+    ngx_uint_t                          nelts;
+    ngx_uint_t                          offset;
+} ngx_rtmp_flv_index_t;
+
+
+typedef struct {
+    ngx_int_t                           offset;
+    ngx_int_t                           start_timestamp;
+    ngx_event_t                         write_evt;
+    uint32_t                            last_audio;
+    uint32_t                            last_video;
+    ngx_uint_t                          msg_mask;
+    uint32_t                            epoch;
+
+    unsigned                            meta_read:1;
+    ngx_rtmp_flv_index_t                filepositions;
+    ngx_rtmp_flv_index_t                times;
+} ngx_rtmp_flv_ctx_t;
+
+
+#define NGX_RTMP_FLV_BUFFER             (1024*1024)
+#define NGX_RTMP_FLV_BUFLEN_ADDON       1000
+#define NGX_RTMP_FLV_TAG_HEADER         11
+#define NGX_RTMP_FLV_DATA_OFFSET        13
+
+
+static u_char                           ngx_rtmp_flv_buffer[
+                                        NGX_RTMP_FLV_BUFFER];
+static u_char                           ngx_rtmp_flv_header[
+                                        NGX_RTMP_FLV_TAG_HEADER];
+
+
+static ngx_rtmp_module_t  ngx_rtmp_flv_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_flv_postconfiguration,         /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    NULL,                                   /* create app configuration */
+    NULL                                    /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_flv_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_flv_module_ctx,               /* module context */
+    NULL,                                   /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_rtmp_flv_fill_index(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_flv_index_t *idx)
+{
+    uint32_t                        nelts;
+    ngx_buf_t                      *b;
+
+    /* we have AMF array pointed by context;
+     * need to extract its size (4 bytes) &
+     * save offset of actual array data */
+
+    b = ctx->link->buf;
+
+    if (b->last - b->pos < (ngx_int_t) ctx->offset + 4) {
+        return NGX_ERROR;
+    }
+
+    ngx_rtmp_rmemcpy(&nelts, b->pos + ctx->offset, 4);
+
+    idx->nelts = nelts;
+    idx->offset = ctx->offset + 4;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_flv_init_index(ngx_rtmp_session_t *s, ngx_chain_t *in)
+{
+    ngx_rtmp_flv_ctx_t             *ctx;
+
+    static ngx_rtmp_amf_ctx_t       filepositions_ctx;
+    static ngx_rtmp_amf_ctx_t       times_ctx;
+
+    static ngx_rtmp_amf_elt_t       in_keyframes[] = {
+
+        { NGX_RTMP_AMF_ARRAY | NGX_RTMP_AMF_CONTEXT,
+          ngx_string("filepositions"),
+          &filepositions_ctx, 0 },
+
+        { NGX_RTMP_AMF_ARRAY | NGX_RTMP_AMF_CONTEXT,
+          ngx_string("times"),
+          &times_ctx, 0 }
+    };
+
+    static ngx_rtmp_amf_elt_t       in_inf[] = {
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_string("keyframes"),
+          in_keyframes, sizeof(in_keyframes) }
+    };
+
+    static ngx_rtmp_amf_elt_t       in_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          in_inf, sizeof(in_inf) },
+    };
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
+
+    if (ctx == NULL || in == NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: init index");
+
+    ngx_memzero(&filepositions_ctx, sizeof(filepositions_ctx));
+    ngx_memzero(&times_ctx, sizeof(times_ctx));
+
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                             sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: init index error");
+        return NGX_OK;
+    }
+
+    if (filepositions_ctx.link && ngx_rtmp_flv_fill_index(&filepositions_ctx,
+                                                          &ctx->filepositions)
+        != NGX_OK)
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: failed to init filepositions");
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: filepositions nelts=%ui offset=%ui",
+                   ctx->filepositions.nelts, ctx->filepositions.offset);
+
+    if (times_ctx.link && ngx_rtmp_flv_fill_index(&times_ctx,
+                                                  &ctx->times)
+        != NGX_OK)
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: failed to init times");
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: times nelts=%ui offset=%ui",
+                   ctx->times.nelts, ctx->times.offset);
+
+    return  NGX_OK;
+}
+
+
+static double
+ngx_rtmp_flv_index_value(void *src)
+{
+    double      v;
+
+    ngx_rtmp_rmemcpy(&v, src, 8);
+
+    return v;
+}
+
+
+static ngx_int_t
+ngx_rtmp_flv_timestamp_to_offset(ngx_rtmp_session_t *s, ngx_file_t *f,
+    ngx_int_t timestamp)
+{
+    ngx_rtmp_flv_ctx_t             *ctx;
+    ssize_t                         n, size;
+    ngx_uint_t                      offset, index, ret, nelts;
+    double                          v;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
+
+    if (ctx == NULL) {
+        goto rewind;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: lookup index start timestamp=%i",
+                   timestamp);
+
+    if (ctx->meta_read == 0) {
+        ngx_rtmp_flv_read_meta(s, f);
+        ctx->meta_read = 1;
+    }
+
+    if (timestamp <= 0 || ctx->filepositions.nelts == 0
+                       || ctx->times.nelts == 0)
+    {
+        goto rewind;
+    }
+
+    /* read index table from file given offset */
+    offset = NGX_RTMP_FLV_DATA_OFFSET + NGX_RTMP_FLV_TAG_HEADER +
+             ctx->times.offset;
+
+    /* index should fit in the buffer */
+    nelts = ngx_min(ctx->times.nelts, sizeof(ngx_rtmp_flv_buffer) / 9);
+    size = nelts * 9;
+
+    n = ngx_read_file(f, ngx_rtmp_flv_buffer, size, offset);
+
+    if (n != size) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: could not read times index");
+        goto rewind;
+    }
+
+    /*TODO: implement binary search */
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: lookup times nelts=%ui", nelts);
+
+    for (index = 0; index < nelts - 1; ++index) {
+        v = ngx_rtmp_flv_index_value(ngx_rtmp_flv_buffer +
+                                     index * 9 + 1) * 1000;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                      "flv: lookup times index=%ui value=%ui",
+                      index, (ngx_uint_t) v);
+
+        if (timestamp < v) {
+            break;
+        }
+    }
+
+    if (index >= ctx->filepositions.nelts) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: index out of bounds: %ui>=%ui",
+                     index, ctx->filepositions.nelts);
+        goto rewind;
+    }
+
+    /* take value from filepositions */
+    offset = NGX_RTMP_FLV_DATA_OFFSET + NGX_RTMP_FLV_TAG_HEADER +
+             ctx->filepositions.offset + index * 9;
+
+    n = ngx_read_file(f, ngx_rtmp_flv_buffer, 8, offset + 1);
+
+    if (n != 8) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: could not read filepositions index");
+        goto rewind;
+    }
+
+    ret = (ngx_uint_t) ngx_rtmp_flv_index_value(ngx_rtmp_flv_buffer);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: lookup index timestamp=%i offset=%ui",
+                   timestamp, ret);
+
+    return ret;
+
+rewind:
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: lookup index timestamp=%i offset=begin",
+                   timestamp);
+
+    return NGX_RTMP_FLV_DATA_OFFSET;
+}
+
+
+static void
+ngx_rtmp_flv_read_meta(ngx_rtmp_session_t *s, ngx_file_t *f)
+{
+    ngx_rtmp_flv_ctx_t             *ctx;
+    ssize_t                         n;
+    ngx_rtmp_header_t               h;
+    ngx_chain_t                    *out, in;
+    ngx_buf_t                       in_buf;
+    ngx_rtmp_core_srv_conf_t       *cscf;
+    uint32_t                        size;
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
+
+    if (ctx == NULL) {
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: read meta");
+
+    /* read tag header */
+    n = ngx_read_file(f, ngx_rtmp_flv_header, sizeof(ngx_rtmp_flv_header),
+                      NGX_RTMP_FLV_DATA_OFFSET);
+
+    if (n != sizeof(ngx_rtmp_flv_header)) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: could not read metadata tag header");
+        return;
+    }
+
+    if (ngx_rtmp_flv_header[0] != NGX_RTMP_MSG_AMF_META) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                      "flv: first tag is not metadata, giving up");
+        return;
+    }
+
+    ngx_memzero(&h, sizeof(h));
+
+    h.type = NGX_RTMP_MSG_AMF_META;
+    h.msid = NGX_RTMP_MSID;
+    h.csid = NGX_RTMP_CSID_AMF;
+
+    size = 0;
+    ngx_rtmp_rmemcpy(&size, ngx_rtmp_flv_header + 1, 3);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: metadata size=%D", size);
+
+    if (size > sizeof(ngx_rtmp_flv_buffer)) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: too big metadata");
+        return;
+    }
+
+    /* read metadata */
+    n = ngx_read_file(f, ngx_rtmp_flv_buffer, size,
+                      sizeof(ngx_rtmp_flv_header) +
+                      NGX_RTMP_FLV_DATA_OFFSET);
+
+    if (n != (ssize_t) size) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "flv: could not read metadata");
+        return;
+    }
+
+    /* prepare input chain */
+    ngx_memzero(&in, sizeof(in));
+    ngx_memzero(&in_buf, sizeof(in_buf));
+
+    in.buf = &in_buf;
+    in_buf.pos  = ngx_rtmp_flv_buffer;
+    in_buf.last = ngx_rtmp_flv_buffer + size;
+
+    ngx_rtmp_flv_init_index(s, &in);
+
+    /* output chain */
+    out = ngx_rtmp_append_shared_bufs(cscf, NULL, &in);
+
+    ngx_rtmp_prepare_message(s, &h, NULL, out);
+    ngx_rtmp_send_message(s, out, 0);
+    ngx_rtmp_free_shared_chain(cscf, out);
+}
+
+
+static ngx_int_t
+ngx_rtmp_flv_send(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t *ts)
+{
+    ngx_rtmp_flv_ctx_t             *ctx;
+    uint32_t                        last_timestamp;
+    ngx_rtmp_header_t               h, lh;
+    ngx_rtmp_core_srv_conf_t       *cscf;
+    ngx_chain_t                    *out, in;
+    ngx_buf_t                       in_buf;
+    ngx_int_t                       rc;
+    ssize_t                         n;
+    uint32_t                        buflen, end_timestamp, size;
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ctx->offset == -1) {
+        ctx->offset = ngx_rtmp_flv_timestamp_to_offset(s, f,
+                                                       ctx->start_timestamp);
+        ctx->start_timestamp = -1; /* set later from actual timestamp */
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: read tag at offset=%i", ctx->offset);
+
+    /* read tag header */
+    n = ngx_read_file(f, ngx_rtmp_flv_header,
+                      sizeof(ngx_rtmp_flv_header), ctx->offset);
+
+    if (n != sizeof(ngx_rtmp_flv_header)) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: could not read flv tag header");
+        return NGX_DONE;
+    }
+
+    /* parse header fields */
+    ngx_memzero(&h, sizeof(h));
+
+    h.msid = NGX_RTMP_MSID;
+    h.type = ngx_rtmp_flv_header[0];
+
+    size = 0;
+
+    ngx_rtmp_rmemcpy(&size, ngx_rtmp_flv_header + 1, 3);
+    ngx_rtmp_rmemcpy(&h.timestamp, ngx_rtmp_flv_header + 4, 3);
+
+    ((u_char *) &h.timestamp)[3] = ngx_rtmp_flv_header[7];
+
+    ctx->offset += (sizeof(ngx_rtmp_flv_header) + size + 4);
+
+    last_timestamp = 0;
+
+    switch (h.type) {
+
+        case NGX_RTMP_MSG_AUDIO:
+            h.csid = NGX_RTMP_CSID_AUDIO;
+            last_timestamp = ctx->last_audio;
+            ctx->last_audio = h.timestamp;
+            break;
+
+        case NGX_RTMP_MSG_VIDEO:
+            h.csid = NGX_RTMP_CSID_VIDEO;
+            last_timestamp = ctx->last_video;
+            ctx->last_video = h.timestamp;
+            break;
+
+        default:
+            return NGX_OK;
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: read tag type=%i size=%uD timestamp=%uD "
+                  "last_timestamp=%uD",
+                  (ngx_int_t) h.type,size, h.timestamp, last_timestamp);
+
+    lh = h;
+    lh.timestamp = last_timestamp;
+
+    if (size > sizeof(ngx_rtmp_flv_buffer)) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: too big message: %D>%uz", size,
+                      sizeof(ngx_rtmp_flv_buffer));
+        goto next;
+    }
+
+    /* read tag body */
+    n = ngx_read_file(f, ngx_rtmp_flv_buffer, size,
+                      ctx->offset - size - 4);
+
+    if (n != (ssize_t) size) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "flv: could not read flv tag");
+        return NGX_ERROR;
+    }
+
+    /* prepare input chain */
+    ngx_memzero(&in, sizeof(in));
+    ngx_memzero(&in_buf, sizeof(in_buf));
+
+    in.buf = &in_buf;
+    in_buf.pos  = ngx_rtmp_flv_buffer;
+    in_buf.last = ngx_rtmp_flv_buffer + size;
+
+    /* output chain */
+    out = ngx_rtmp_append_shared_bufs(cscf, NULL, &in);
+
+    ngx_rtmp_prepare_message(s, &h, ctx->msg_mask & (1 << h.type) ?
+                             &lh : NULL, out);
+    rc = ngx_rtmp_send_message(s, out, 0);
+    ngx_rtmp_free_shared_chain(cscf, out);
+
+    if (rc == NGX_AGAIN) {
+        return NGX_AGAIN;
+    }
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ctx->msg_mask |= (1 << h.type);
+
+next:
+    if (ctx->start_timestamp == -1) {
+        ctx->start_timestamp = h.timestamp;
+        ctx->epoch = ngx_current_msec;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                      "flv: start_timestamp=%i", ctx->start_timestamp);
+        return NGX_OK;
+    }
+
+    buflen = s->buflen + NGX_RTMP_FLV_BUFLEN_ADDON;
+
+    end_timestamp = (ngx_current_msec - ctx->epoch) +
+                     ctx->start_timestamp + buflen;
+
+    ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+           "flv: %s wait=%D timestamp=%D end_timestamp=%D bufen=%i",
+            h.timestamp > end_timestamp ? "schedule" : "advance",
+            h.timestamp > end_timestamp ? h.timestamp - end_timestamp : 0,
+            h.timestamp, end_timestamp, (ngx_int_t) buflen);
+
+    s->current_time = h.timestamp;
+
+    /* too much data sent; schedule timeout */
+    if (h.timestamp > end_timestamp) {
+        return h.timestamp - end_timestamp;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_flv_init(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_int_t aindex,
+                  ngx_int_t vindex)
+{
+    ngx_rtmp_flv_ctx_t             *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_flv_ctx_t));
+
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_flv_module);
+    }
+
+    ngx_memzero(ctx, sizeof(*ctx));
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_flv_start(ngx_rtmp_session_t *s, ngx_file_t *f)
+{
+    ngx_rtmp_flv_ctx_t             *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: start");
+
+    ctx->offset = -1;
+    ctx->msg_mask = 0;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_flv_seek(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t timestamp)
+{
+    ngx_rtmp_flv_ctx_t             *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: seek timestamp=%ui", timestamp);
+
+    ctx->start_timestamp = timestamp;
+    ctx->epoch = ngx_current_msec;
+    ctx->offset = -1;
+    ctx->msg_mask = 0;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_flv_stop(ngx_rtmp_session_t *s, ngx_file_t *f)
+{
+    ngx_rtmp_flv_ctx_t             *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                  "flv: stop");
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_flv_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_play_main_conf_t      *pmcf;
+    ngx_rtmp_play_fmt_t           **pfmt, *fmt;
+
+    pmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_play_module);
+
+    pfmt = ngx_array_push(&pmcf->fmts);
+
+    if (pfmt == NULL) {
+        return NGX_ERROR;
+    }
+
+    fmt = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_fmt_t));
+
+    if (fmt == NULL) {
+        return NGX_ERROR;
+    }
+
+    *pfmt = fmt;
+
+    ngx_str_set(&fmt->name, "flv-format");
+
+    ngx_str_null(&fmt->pfx); /* default fmt */
+    ngx_str_set(&fmt->sfx, ".flv");
+
+    fmt->init  = ngx_rtmp_flv_init;
+    fmt->start = ngx_rtmp_flv_start;
+    fmt->seek  = ngx_rtmp_flv_seek;
+    fmt->stop  = ngx_rtmp_flv_stop;
+    fmt->send  = ngx_rtmp_flv_send;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_handler.c b/debian/modules/nginx-rtmp/ngx_rtmp_handler.c
new file mode 100644
index 0000000..ac78a6f
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_handler.c
@@ -0,0 +1,895 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_amf.h"
+
+
+static void ngx_rtmp_recv(ngx_event_t *rev);
+static void ngx_rtmp_send(ngx_event_t *rev);
+static void ngx_rtmp_ping(ngx_event_t *rev);
+static ngx_int_t ngx_rtmp_finalize_set_chunk_size(ngx_rtmp_session_t *s);
+
+
+ngx_uint_t                  ngx_rtmp_naccepted;
+
+
+ngx_rtmp_bandwidth_t        ngx_rtmp_bw_out;
+ngx_rtmp_bandwidth_t        ngx_rtmp_bw_in;
+
+
+#ifdef NGX_DEBUG
+char*
+ngx_rtmp_message_type(uint8_t type)
+{
+    static char*    types[] = {
+        "?",
+        "chunk_size",
+        "abort",
+        "ack",
+        "user",
+        "ack_size",
+        "bandwidth",
+        "edge",
+        "audio",
+        "video",
+        "?",
+        "?",
+        "?",
+        "?",
+        "?",
+        "amf3_meta",
+        "amf3_shared",
+        "amf3_cmd",
+        "amf_meta",
+        "amf_shared",
+        "amf_cmd",
+        "?",
+        "aggregate"
+    };
+
+    return type < sizeof(types) / sizeof(types[0])
+        ? types[type]
+        : "?";
+}
+
+
+char*
+ngx_rtmp_user_message_type(uint16_t evt)
+{
+    static char*    evts[] = {
+        "stream_begin",
+        "stream_eof",
+        "stream dry",
+        "set_buflen",
+        "recorded",
+        "",
+        "ping_request",
+        "ping_response",
+    };
+
+    return evt < sizeof(evts) / sizeof(evts[0])
+        ? evts[evt]
+        : "?";
+}
+#endif
+
+
+void
+ngx_rtmp_cycle(ngx_rtmp_session_t *s)
+{
+    ngx_connection_t           *c;
+
+    c = s->connection;
+    c->read->handler =  ngx_rtmp_recv;
+    c->write->handler = ngx_rtmp_send;
+
+    s->ping_evt.data = c;
+    s->ping_evt.log = c->log;
+    s->ping_evt.handler = ngx_rtmp_ping;
+    ngx_rtmp_reset_ping(s);
+
+    ngx_rtmp_recv(c->read);
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_alloc_in_buf(ngx_rtmp_session_t *s)
+{
+    ngx_chain_t        *cl;
+    ngx_buf_t          *b;
+    size_t              size;
+
+    if ((cl = ngx_alloc_chain_link(s->in_pool)) == NULL
+       || (cl->buf = ngx_calloc_buf(s->in_pool)) == NULL)
+    {
+        return NULL;
+    }
+
+    cl->next = NULL;
+    b = cl->buf;
+    size = s->in_chunk_size + NGX_RTMP_MAX_CHUNK_HEADER;
+
+    b->start = b->last = b->pos = ngx_palloc(s->in_pool, size);
+    if (b->start == NULL) {
+        return NULL;
+    }
+    b->end = b->start + size;
+
+    return cl;
+}
+
+
+void
+ngx_rtmp_reset_ping(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_core_srv_conf_t   *cscf;
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+    if (cscf->ping == 0) {
+        return;
+    }
+
+    s->ping_active = 0;
+    s->ping_reset = 0;
+    ngx_add_timer(&s->ping_evt, cscf->ping);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "ping: wait %Mms", cscf->ping);
+}
+
+
+static void
+ngx_rtmp_ping(ngx_event_t *pev)
+{
+    ngx_connection_t           *c;
+    ngx_rtmp_session_t         *s;
+    ngx_rtmp_core_srv_conf_t   *cscf;
+
+    c = pev->data;
+    s = c->data;
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    /* i/o event has happened; no need to ping */
+    if (s->ping_reset) {
+        ngx_rtmp_reset_ping(s);
+        return;
+    }
+
+    if (s->ping_active) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                "ping: unresponded");
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    if (cscf->busy) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                "ping: not busy between pings");
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "ping: schedule %Mms", cscf->ping_timeout);
+
+    if (ngx_rtmp_send_ping_request(s, (uint32_t)ngx_current_msec) != NGX_OK) {
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    s->ping_active = 1;
+    ngx_add_timer(pev, cscf->ping_timeout);
+}
+
+
+static void
+ngx_rtmp_recv(ngx_event_t *rev)
+{
+    ngx_int_t                   n;
+    ngx_connection_t           *c;
+    ngx_rtmp_session_t         *s;
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    ngx_rtmp_header_t          *h;
+    ngx_rtmp_stream_t          *st, *st0;
+    ngx_chain_t                *in, *head;
+    ngx_buf_t                  *b;
+    u_char                     *p, *pp, *old_pos;
+    size_t                      size, fsize, old_size;
+    uint8_t                     fmt, ext;
+    uint32_t                    csid, timestamp;
+
+    c = rev->data;
+    s = c->data;
+    b = NULL;
+    old_pos = NULL;
+    old_size = 0;
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    if (c->destroyed) {
+        return;
+    }
+
+    for( ;; ) {
+
+        st = &s->in_streams[s->in_csid];
+
+        /* allocate new buffer */
+        if (st->in == NULL) {
+            st->in = ngx_rtmp_alloc_in_buf(s);
+            if (st->in == NULL) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                        "in buf alloc failed");
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+        }
+
+        h  = &st->hdr;
+        in = st->in;
+        b  = in->buf;
+
+        if (old_size) {
+
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0,
+                    "reusing formerly read data: %d", old_size);
+
+            b->pos = b->start;
+            b->last = ngx_movemem(b->pos, old_pos, old_size);
+
+            if (s->in_chunk_size_changing) {
+                ngx_rtmp_finalize_set_chunk_size(s);
+            }
+
+        } else {
+
+            if (old_pos) {
+                b->pos = b->last = b->start;
+            }
+
+            n = c->recv(c, b->last, b->end - b->last);
+
+            if (n == NGX_ERROR || n == 0) {
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+
+            if (n == NGX_AGAIN) {
+                if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                    ngx_rtmp_finalize_session(s);
+                }
+                return;
+            }
+
+            s->ping_reset = 1;
+            ngx_rtmp_update_bandwidth(&ngx_rtmp_bw_in, n);
+            b->last += n;
+            s->in_bytes += n;
+
+            if (s->in_bytes >= 0xf0000000) {
+                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, c->log, 0,
+                               "resetting byte counter");
+                s->in_bytes = 0;
+                s->in_last_ack = 0;
+            }
+
+            if (s->ack_size && s->in_bytes - s->in_last_ack >= s->ack_size) {
+
+                s->in_last_ack = s->in_bytes;
+
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0,
+                        "sending RTMP ACK(%uD)", s->in_bytes);
+
+                if (ngx_rtmp_send_ack(s, s->in_bytes)) {
+                    ngx_rtmp_finalize_session(s);
+                    return;
+                }
+            }
+        }
+
+        old_pos = NULL;
+        old_size = 0;
+
+        /* parse headers */
+        if (b->pos == b->start) {
+            p = b->pos;
+
+            /* chunk basic header */
+            fmt  = (*p >> 6) & 0x03;
+            csid = *p++ & 0x3f;
+
+            if (csid == 0) {
+                if (b->last - p < 1)
+                    continue;
+                csid = 64;
+                csid += *(uint8_t*)p++;
+
+            } else if (csid == 1) {
+                if (b->last - p < 2)
+                    continue;
+                csid = 64;
+                csid += *(uint8_t*)p++;
+                csid += (uint32_t)256 * (*(uint8_t*)p++);
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, c->log, 0,
+                    "RTMP bheader fmt=%d csid=%D",
+                    (int)fmt, csid);
+
+            if (csid >= (uint32_t)cscf->max_streams) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                    "RTMP in chunk stream too big: %D >= %D",
+                    csid, cscf->max_streams);
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+
+            /* link orphan */
+            if (s->in_csid == 0) {
+
+                /* unlink from stream #0 */
+                st->in = st->in->next;
+
+                /* link to new stream */
+                s->in_csid = csid;
+                st = &s->in_streams[csid];
+                if (st->in == NULL) {
+                    in->next = in;
+                } else {
+                    in->next = st->in->next;
+                    st->in->next = in;
+                }
+                st->in = in;
+                h = &st->hdr;
+                h->csid = csid;
+            }
+
+            ext = st->ext;
+            timestamp = st->dtime;
+            if (fmt <= 2 ) {
+                if (b->last - p < 3)
+                    continue;
+                /* timestamp:
+                 *  big-endian 3b -> little-endian 4b */
+                pp = (u_char*)&timestamp;
+                pp[2] = *p++;
+                pp[1] = *p++;
+                pp[0] = *p++;
+                pp[3] = 0;
+
+                ext = (timestamp == 0x00ffffff);
+
+                if (fmt <= 1) {
+                    if (b->last - p < 4)
+                        continue;
+                    /* size:
+                     *  big-endian 3b -> little-endian 4b
+                     * type:
+                     *  1b -> 1b*/
+                    pp = (u_char*)&h->mlen;
+                    pp[2] = *p++;
+                    pp[1] = *p++;
+                    pp[0] = *p++;
+                    pp[3] = 0;
+                    h->type = *(uint8_t*)p++;
+
+                    if (fmt == 0) {
+                        if (b->last - p < 4)
+                            continue;
+                        /* stream:
+                         *  little-endian 4b -> little-endian 4b */
+                        pp = (u_char*)&h->msid;
+                        pp[0] = *p++;
+                        pp[1] = *p++;
+                        pp[2] = *p++;
+                        pp[3] = *p++;
+                    }
+                }
+            }
+
+            /* extended header */
+            if (ext) {
+                if (b->last - p < 4)
+                    continue;
+                pp = (u_char*)&timestamp;
+                pp[3] = *p++;
+                pp[2] = *p++;
+                pp[1] = *p++;
+                pp[0] = *p++;
+            }
+
+            if (st->len == 0) {
+                /* Messages with type=3 should
+                 * never have ext timestamp field
+                 * according to standard.
+                 * However that's not always the case
+                 * in real life */
+                st->ext = (ext && cscf->publish_time_fix);
+                if (fmt) {
+                    st->dtime = timestamp;
+                } else {
+                    h->timestamp = timestamp;
+                    st->dtime = 0;
+                }
+            }
+
+            ngx_log_debug8(NGX_LOG_DEBUG_RTMP, c->log, 0,
+                    "RTMP mheader fmt=%d %s (%d) "
+                    "time=%uD+%uD mlen=%D len=%D msid=%D",
+                    (int)fmt, ngx_rtmp_message_type(h->type), (int)h->type,
+                    h->timestamp, st->dtime, h->mlen, st->len, h->msid);
+
+            /* header done */
+            b->pos = p;
+
+            if (h->mlen > cscf->max_message) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                        "too big message: %uz", cscf->max_message);
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+        }
+
+        size = b->last - b->pos;
+        fsize = h->mlen - st->len;
+
+        if (size < ngx_min(fsize, s->in_chunk_size))
+            continue;
+
+        /* buffer is ready */
+
+        if (fsize > s->in_chunk_size) {
+            /* collect fragmented chunks */
+            st->len += s->in_chunk_size;
+            b->last = b->pos + s->in_chunk_size;
+            old_pos = b->last;
+            old_size = size - s->in_chunk_size;
+
+        } else {
+            /* handle! */
+            head = st->in->next;
+            st->in->next = NULL;
+            b->last = b->pos + fsize;
+            old_pos = b->last;
+            old_size = size - fsize;
+            st->len = 0;
+            h->timestamp += st->dtime;
+
+            if (ngx_rtmp_receive_message(s, h, head) != NGX_OK) {
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+
+            if (s->in_chunk_size_changing) {
+                /* copy old data to a new buffer */
+                if (!old_size) {
+                    ngx_rtmp_finalize_set_chunk_size(s);
+                }
+
+            } else {
+                /* add used bufs to stream #0 */
+                st0 = &s->in_streams[0];
+                st->in->next = st0->in;
+                st0->in = head;
+                st->in = NULL;
+            }
+        }
+
+        s->in_csid = 0;
+    }
+}
+
+
+static void
+ngx_rtmp_send(ngx_event_t *wev)
+{
+    ngx_connection_t           *c;
+    ngx_rtmp_session_t         *s;
+    ngx_int_t                   n;
+    ngx_rtmp_core_srv_conf_t   *cscf;
+
+    c = wev->data;
+    s = c->data;
+
+    if (c->destroyed) {
+        return;
+    }
+
+    if (wev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
+                "client timed out");
+        c->timedout = 1;
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    if (wev->timer_set) {
+        ngx_del_timer(wev);
+    }
+
+    if (s->out_chain == NULL && s->out_pos != s->out_last) {
+        s->out_chain = s->out[s->out_pos];
+        s->out_bpos = s->out_chain->buf->pos;
+    }
+
+    while (s->out_chain) {
+        n = c->send(c, s->out_bpos, s->out_chain->buf->last - s->out_bpos);
+
+        if (n == NGX_AGAIN || n == 0) {
+            ngx_add_timer(c->write, s->timeout);
+            if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+                ngx_rtmp_finalize_session(s);
+            }
+            return;
+        }
+
+        if (n < 0) {
+            ngx_rtmp_finalize_session(s);
+            return;
+        }
+
+        s->out_bytes += n;
+        s->ping_reset = 1;
+        ngx_rtmp_update_bandwidth(&ngx_rtmp_bw_out, n);
+        s->out_bpos += n;
+        if (s->out_bpos == s->out_chain->buf->last) {
+            s->out_chain = s->out_chain->next;
+            if (s->out_chain == NULL) {
+                cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+                ngx_rtmp_free_shared_chain(cscf, s->out[s->out_pos]);
+                ++s->out_pos;
+                s->out_pos %= s->out_queue;
+                if (s->out_pos == s->out_last) {
+                    break;
+                }
+                s->out_chain = s->out[s->out_pos];
+            }
+            s->out_bpos = s->out_chain->buf->pos;
+        }
+    }
+
+    if (wev->active) {
+        ngx_del_event(wev, NGX_WRITE_EVENT, 0);
+    }
+
+    ngx_event_process_posted((ngx_cycle_t *) ngx_cycle, &s->posted_dry_events);
+}
+
+
+void
+ngx_rtmp_prepare_message(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_rtmp_header_t *lh, ngx_chain_t *out)
+{
+    ngx_chain_t                *l;
+    u_char                     *p, *pp;
+    ngx_int_t                   hsize, thsize, nbufs;
+    uint32_t                    mlen, timestamp, ext_timestamp;
+    static uint8_t              hdrsize[] = { 12, 8, 4, 1 };
+    u_char                      th[7];
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    uint8_t                     fmt;
+    ngx_connection_t           *c;
+
+    c = s->connection;
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    if (h->csid >= (uint32_t)cscf->max_streams) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                "RTMP out chunk stream too big: %D >= %D",
+                h->csid, cscf->max_streams);
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    /* detect packet size */
+    mlen = 0;
+    nbufs = 0;
+    for(l = out; l; l = l->next) {
+        mlen += (l->buf->last - l->buf->pos);
+        ++nbufs;
+    }
+
+    fmt = 0;
+    if (lh && lh->csid && h->msid == lh->msid) {
+        ++fmt;
+        if (h->type == lh->type && mlen && mlen == lh->mlen) {
+            ++fmt;
+            if (h->timestamp == lh->timestamp) {
+                ++fmt;
+            }
+        }
+        timestamp = h->timestamp - lh->timestamp;
+    } else {
+        timestamp = h->timestamp;
+    }
+
+    /*if (lh) {
+        *lh = *h;
+        lh->mlen = mlen;
+    }*/
+
+    hsize = hdrsize[fmt];
+
+    ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "RTMP prep %s (%d) fmt=%d csid=%uD timestamp=%uD "
+            "mlen=%uD msid=%uD nbufs=%d",
+            ngx_rtmp_message_type(h->type), (int)h->type, (int)fmt,
+            h->csid, timestamp, mlen, h->msid, nbufs);
+
+    ext_timestamp = 0;
+    if (timestamp >= 0x00ffffff) {
+        ext_timestamp = timestamp;
+        timestamp = 0x00ffffff;
+        hsize += 4;
+    }
+
+    if (h->csid >= 64) {
+        ++hsize;
+        if (h->csid >= 320) {
+            ++hsize;
+        }
+    }
+
+    /* fill initial header */
+    out->buf->pos -= hsize;
+    p = out->buf->pos;
+
+    /* basic header */
+    *p = (fmt << 6);
+    if (h->csid >= 2 && h->csid <= 63) {
+        *p++ |= (((uint8_t)h->csid) & 0x3f);
+    } else if (h->csid >= 64 && h->csid < 320) {
+        ++p;
+        *p++ = (uint8_t)(h->csid - 64);
+    } else {
+        *p++ |= 1;
+        *p++ = (uint8_t)(h->csid - 64);
+        *p++ = (uint8_t)((h->csid - 64) >> 8);
+    }
+
+    /* create fmt3 header for successive fragments */
+    thsize = p - out->buf->pos;
+    ngx_memcpy(th, out->buf->pos, thsize);
+    th[0] |= 0xc0;
+
+    /* message header */
+    if (fmt <= 2) {
+        pp = (u_char*)&timestamp;
+        *p++ = pp[2];
+        *p++ = pp[1];
+        *p++ = pp[0];
+        if (fmt <= 1) {
+            pp = (u_char*)&mlen;
+            *p++ = pp[2];
+            *p++ = pp[1];
+            *p++ = pp[0];
+            *p++ = h->type;
+            if (fmt == 0) {
+                pp = (u_char*)&h->msid;
+                *p++ = pp[0];
+                *p++ = pp[1];
+                *p++ = pp[2];
+                *p++ = pp[3];
+            }
+        }
+    }
+
+    /* extended header */
+    if (ext_timestamp) {
+        pp = (u_char*)&ext_timestamp;
+        *p++ = pp[3];
+        *p++ = pp[2];
+        *p++ = pp[1];
+        *p++ = pp[0];
+
+        /* This CONTRADICTS the standard
+         * but that's the way flash client
+         * wants data to be encoded;
+         * ffmpeg complains */
+        if (cscf->play_time_fix) {
+            ngx_memcpy(&th[thsize], p - 4, 4);
+            thsize += 4;
+        }
+    }
+
+    /* append headers to successive fragments */
+    for(out = out->next; out; out = out->next) {
+        out->buf->pos -= thsize;
+        ngx_memcpy(out->buf->pos, th, thsize);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_message(ngx_rtmp_session_t *s, ngx_chain_t *out,
+        ngx_uint_t priority)
+{
+    ngx_uint_t                      nmsg;
+
+    nmsg = (s->out_last - s->out_pos) % s->out_queue + 1;
+
+    if (priority > 3) {
+        priority = 3;
+    }
+
+    /* drop packet?
+     * Note we always leave 1 slot free */
+    if (nmsg + priority * s->out_queue / 4 >= s->out_queue) {
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "RTMP drop message bufs=%ui, priority=%ui",
+                nmsg, priority);
+        return NGX_AGAIN;
+    }
+
+    s->out[s->out_last++] = out;
+    s->out_last %= s->out_queue;
+
+    ngx_rtmp_acquire_shared_chain(out);
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "RTMP send nmsg=%ui, priority=%ui #%ui",
+            nmsg, priority, s->out_last);
+
+    if (priority && s->out_buffer && nmsg < s->out_cork) {
+        return NGX_OK;
+    }
+
+    if (!s->connection->write->active) {
+        ngx_rtmp_send(s->connection->write);
+        /*return ngx_add_event(s->connection->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT);*/
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_receive_message(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in)
+{
+    ngx_rtmp_core_main_conf_t  *cmcf;
+    ngx_array_t                *evhs;
+    size_t                      n;
+    ngx_rtmp_handler_pt        *evh;
+
+    cmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_core_module);
+
+#ifdef NGX_DEBUG
+    {
+        int             nbufs;
+        ngx_chain_t    *ch;
+
+        for(nbufs = 1, ch = in;
+                ch->next;
+                ch = ch->next, ++nbufs);
+
+        ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "RTMP recv %s (%d) csid=%D timestamp=%D "
+                "mlen=%D msid=%D nbufs=%d",
+                ngx_rtmp_message_type(h->type), (int)h->type,
+                h->csid, h->timestamp, h->mlen, h->msid, nbufs);
+    }
+#endif
+
+    if (h->type > NGX_RTMP_MSG_MAX) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "unexpected RTMP message type: %d", (int)h->type);
+        return NGX_OK;
+    }
+
+    evhs = &cmcf->events[h->type];
+    evh = evhs->elts;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "nhandlers: %d", evhs->nelts);
+
+    for(n = 0; n < evhs->nelts; ++n, ++evh) {
+        if (!evh) {
+            continue;
+        }
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "calling handler %d", n);
+
+        switch ((*evh)(s, h, in)) {
+            case NGX_ERROR:
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                        "handler %d failed", n);
+                return NGX_ERROR;
+            case NGX_DONE:
+                return NGX_OK;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_set_chunk_size(ngx_rtmp_session_t *s, ngx_uint_t size)
+{
+    ngx_rtmp_core_srv_conf_t           *cscf;
+    ngx_chain_t                        *li, *fli, *lo, *flo;
+    ngx_buf_t                          *bi, *bo;
+    ngx_int_t                           n;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+        "setting chunk_size=%ui", size);
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    s->in_old_pool = s->in_pool;
+    s->in_chunk_size = size;
+    s->in_pool = ngx_create_pool(4096, s->connection->log);
+
+    /* copy existing chunk data */
+    if (s->in_old_pool) {
+        s->in_chunk_size_changing = 1;
+        s->in_streams[0].in = NULL;
+
+        for(n = 1; n < cscf->max_streams; ++n) {
+            /* stream buffer is circular
+             * for all streams except for the current one
+             * (which caused this chunk size change);
+             * we can simply ignore it */
+            li = s->in_streams[n].in;
+            if (li == NULL || li->next == NULL) {
+                s->in_streams[n].in = NULL;
+                continue;
+            }
+            /* move from last to the first */
+            li = li->next;
+            fli = li;
+            lo = ngx_rtmp_alloc_in_buf(s);
+            if (lo == NULL) {
+                return NGX_ERROR;
+            }
+            flo = lo;
+            for ( ;; ) {
+                bi = li->buf;
+                bo = lo->buf;
+
+                if (bo->end - bo->last >= bi->last - bi->pos) {
+                    bo->last = ngx_cpymem(bo->last, bi->pos,
+                            bi->last - bi->pos);
+                    li = li->next;
+                    if (li == fli)  {
+                        lo->next = flo;
+                        s->in_streams[n].in = lo;
+                        break;
+                    }
+                    continue;
+                }
+
+                bi->pos += (ngx_cpymem(bo->last, bi->pos,
+                            bo->end - bo->last) - bo->last);
+                lo->next = ngx_rtmp_alloc_in_buf(s);
+                lo = lo->next;
+                if (lo == NULL) {
+                    return NGX_ERROR;
+                }
+            }
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_finalize_set_chunk_size(ngx_rtmp_session_t *s)
+{
+    if (s->in_chunk_size_changing && s->in_old_pool) {
+        ngx_destroy_pool(s->in_old_pool);
+        s->in_old_pool = NULL;
+        s->in_chunk_size_changing = 0;
+    }
+    return NGX_OK;
+}
+
+
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_handshake.c b/debian/modules/nginx-rtmp/ngx_rtmp_handshake.c
new file mode 100644
index 0000000..409d9a0
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_handshake.c
@@ -0,0 +1,631 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+
+#include <openssl/hmac.h>
+#include <openssl/sha.h>
+
+
+static void ngx_rtmp_handshake_send(ngx_event_t *wev);
+static void ngx_rtmp_handshake_recv(ngx_event_t *rev);
+static void ngx_rtmp_handshake_done(ngx_rtmp_session_t *s);
+
+
+/* RTMP handshake :
+ *
+ *          =peer1=                      =peer2=
+ * challenge ----> (.....[digest1]......) ----> 1537 bytes
+ * response  <---- (...........[digest2]) <---- 1536 bytes
+ *
+ *
+ * - both packets contain random bytes except for digests
+ * - digest1 position is calculated on random packet bytes
+ * - digest2 is always at the end of the packet
+ *
+ * digest1: HMAC_SHA256(packet, peer1_partial_key)
+ * digest2: HMAC_SHA256(packet, HMAC_SHA256(digest1, peer2_full_key))
+ */
+
+
+/* Handshake keys */
+static u_char
+ngx_rtmp_server_key[] = {
+    'G', 'e', 'n', 'u', 'i', 'n', 'e', ' ', 'A', 'd', 'o', 'b', 'e', ' ',
+    'F', 'l', 'a', 's', 'h', ' ', 'M', 'e', 'd', 'i', 'a', ' ',
+    'S', 'e', 'r', 'v', 'e', 'r', ' ',
+    '0', '0', '1',
+
+    0xF0, 0xEE, 0xC2, 0x4A, 0x80, 0x68, 0xBE, 0xE8, 0x2E, 0x00, 0xD0, 0xD1,
+    0x02, 0x9E, 0x7E, 0x57, 0x6E, 0xEC, 0x5D, 0x2D, 0x29, 0x80, 0x6F, 0xAB,
+    0x93, 0xB8, 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE
+};
+
+
+static u_char
+ngx_rtmp_client_key[] = {
+    'G', 'e', 'n', 'u', 'i', 'n', 'e', ' ', 'A', 'd', 'o', 'b', 'e', ' ',
+    'F', 'l', 'a', 's', 'h', ' ', 'P', 'l', 'a', 'y', 'e', 'r', ' ',
+    '0', '0', '1',
+
+    0xF0, 0xEE, 0xC2, 0x4A, 0x80, 0x68, 0xBE, 0xE8, 0x2E, 0x00, 0xD0, 0xD1,
+    0x02, 0x9E, 0x7E, 0x57, 0x6E, 0xEC, 0x5D, 0x2D, 0x29, 0x80, 0x6F, 0xAB,
+    0x93, 0xB8, 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE
+};
+
+
+static const u_char
+ngx_rtmp_server_version[4] = {
+    0x0D, 0x0E, 0x0A, 0x0D
+};
+
+
+static const u_char
+ngx_rtmp_client_version[4] = {
+    0x0C, 0x00, 0x0D, 0x0E
+};
+
+
+#define NGX_RTMP_HANDSHAKE_KEYLEN                   SHA256_DIGEST_LENGTH
+#define NGX_RTMP_HANDSHAKE_BUFSIZE                  1537
+
+
+#define NGX_RTMP_HANDSHAKE_SERVER_RECV_CHALLENGE    1
+#define NGX_RTMP_HANDSHAKE_SERVER_SEND_CHALLENGE    2
+#define NGX_RTMP_HANDSHAKE_SERVER_SEND_RESPONSE     3
+#define NGX_RTMP_HANDSHAKE_SERVER_RECV_RESPONSE     4
+#define NGX_RTMP_HANDSHAKE_SERVER_DONE              5
+
+
+#define NGX_RTMP_HANDSHAKE_CLIENT_SEND_CHALLENGE    6
+#define NGX_RTMP_HANDSHAKE_CLIENT_RECV_CHALLENGE    7
+#define NGX_RTMP_HANDSHAKE_CLIENT_RECV_RESPONSE     8
+#define NGX_RTMP_HANDSHAKE_CLIENT_SEND_RESPONSE     9
+#define NGX_RTMP_HANDSHAKE_CLIENT_DONE              10
+
+
+static ngx_str_t            ngx_rtmp_server_full_key
+    = { sizeof(ngx_rtmp_server_key), ngx_rtmp_server_key };
+static ngx_str_t            ngx_rtmp_server_partial_key
+    = { 36, ngx_rtmp_server_key };
+
+static ngx_str_t            ngx_rtmp_client_full_key
+    = { sizeof(ngx_rtmp_client_key), ngx_rtmp_client_key };
+static ngx_str_t            ngx_rtmp_client_partial_key
+    = { 30, ngx_rtmp_client_key };
+
+
+static ngx_int_t
+ngx_rtmp_make_digest(ngx_str_t *key, ngx_buf_t *src,
+        u_char *skip, u_char *dst, ngx_log_t *log)
+{
+    static HMAC_CTX        *hmac;
+    unsigned int            len;
+
+    if (hmac == NULL) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+        static HMAC_CTX  shmac;
+        hmac = &shmac;
+        HMAC_CTX_init(hmac);
+#else
+        hmac = HMAC_CTX_new();
+        if (hmac == NULL) {
+            return NGX_ERROR;
+        }
+#endif
+    }
+
+    HMAC_Init_ex(hmac, key->data, key->len, EVP_sha256(), NULL);
+
+    if (skip && src->pos <= skip && skip <= src->last) {
+        if (skip != src->pos) {
+            HMAC_Update(hmac, src->pos, skip - src->pos);
+        }
+        if (src->last != skip + NGX_RTMP_HANDSHAKE_KEYLEN) {
+            HMAC_Update(hmac, skip + NGX_RTMP_HANDSHAKE_KEYLEN,
+                    src->last - skip - NGX_RTMP_HANDSHAKE_KEYLEN);
+        }
+    } else {
+        HMAC_Update(hmac, src->pos, src->last - src->pos);
+    }
+
+    HMAC_Final(hmac, dst, &len);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_find_digest(ngx_buf_t *b, ngx_str_t *key, size_t base, ngx_log_t *log)
+{
+    size_t                  n, offs;
+    u_char                  digest[NGX_RTMP_HANDSHAKE_KEYLEN];
+    u_char                 *p;
+
+    offs = 0;
+    for (n = 0; n < 4; ++n) {
+        offs += b->pos[base + n];
+    }
+    offs = (offs % 728) + base + 4;
+    p = b->pos + offs;
+
+    if (ngx_rtmp_make_digest(key, b, p, digest, log) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_memcmp(digest, p, NGX_RTMP_HANDSHAKE_KEYLEN) == 0) {
+        return offs;
+    }
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_write_digest(ngx_buf_t *b, ngx_str_t *key, size_t base,
+        ngx_log_t *log)
+{
+    size_t                  n, offs;
+    u_char                 *p;
+
+    offs = 0;
+    for (n = 8; n < 12; ++n) {
+        offs += b->pos[base + n];
+    }
+    offs = (offs % 728) + base + 12;
+    p = b->pos + offs;
+
+    if (ngx_rtmp_make_digest(key, b, p, p, log) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_fill_random_buffer(ngx_buf_t *b)
+{
+    for (; b->last != b->end; ++b->last) {
+        *b->last = (u_char) rand();
+    }
+}
+
+
+static ngx_buf_t *
+ngx_rtmp_alloc_handshake_buffer(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    ngx_chain_t                *cl;
+    ngx_buf_t                  *b;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "handshake: allocating buffer");
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    if (cscf->free_hs) {
+        cl = cscf->free_hs;
+        b = cl->buf;
+        cscf->free_hs = cl->next;
+        ngx_free_chain(cscf->pool, cl);
+
+    } else {
+        b = ngx_pcalloc(cscf->pool, sizeof(ngx_buf_t));
+        if (b == NULL) {
+            return NULL;
+        }
+        b->memory = 1;
+        b->start = ngx_pcalloc(cscf->pool, NGX_RTMP_HANDSHAKE_BUFSIZE);
+        if (b->start == NULL) {
+            return NULL;
+        }
+        b->end = b->start + NGX_RTMP_HANDSHAKE_BUFSIZE;
+    }
+
+    b->pos = b->last = b->start;
+
+    return b;
+}
+
+
+void
+ngx_rtmp_free_handshake_buffers(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    ngx_chain_t                *cl;
+
+    if (s->hs_buf == NULL) {
+        return;
+    }
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+    cl = ngx_alloc_chain_link(cscf->pool);
+    if (cl == NULL) {
+        return;
+    }
+    cl->buf = s->hs_buf;
+    cl->next = cscf->free_hs;
+    cscf->free_hs = cl;
+    s->hs_buf = NULL;
+}
+
+
+static ngx_int_t
+ngx_rtmp_handshake_create_challenge(ngx_rtmp_session_t *s,
+        const u_char version[4], ngx_str_t *key)
+{
+    ngx_buf_t          *b;
+
+    b = s->hs_buf;
+    b->last = b->pos = b->start;
+    *b->last++ = '\x03';
+    b->last = ngx_rtmp_rcpymem(b->last, &s->epoch, 4);
+    b->last = ngx_cpymem(b->last, version, 4);
+    ngx_rtmp_fill_random_buffer(b);
+    ++b->pos;
+    if (ngx_rtmp_write_digest(b, key, 0, s->connection->log) != NGX_OK) {
+        return NGX_ERROR;
+    }
+    --b->pos;
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_handshake_parse_challenge(ngx_rtmp_session_t *s,
+        ngx_str_t *peer_key, ngx_str_t *key)
+{
+    ngx_buf_t              *b;
+    u_char                 *p;
+    ngx_int_t               offs;
+
+    b = s->hs_buf;
+    if (*b->pos != '\x03') {
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                "handshake: unexpected RTMP version: %i",
+                (ngx_int_t)*b->pos);
+        return NGX_ERROR;
+    }
+    ++b->pos;
+    s->peer_epoch = 0;
+    ngx_rtmp_rmemcpy(&s->peer_epoch, b->pos, 4);
+
+    p = b->pos + 4;
+    ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "handshake: peer version=%i.%i.%i.%i epoch=%uD",
+            (ngx_int_t)p[3], (ngx_int_t)p[2],
+            (ngx_int_t)p[1], (ngx_int_t)p[0],
+            (uint32_t)s->peer_epoch);
+    if (*(uint32_t *)p == 0) {
+        s->hs_old = 1;
+        return NGX_OK;
+    }
+
+    offs = ngx_rtmp_find_digest(b, peer_key, 772, s->connection->log);
+    if (offs == NGX_ERROR) {
+        offs = ngx_rtmp_find_digest(b, peer_key, 8, s->connection->log);
+    }
+    if (offs == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                "handshake: digest not found");
+        s->hs_old = 1;
+        return NGX_OK;
+    }
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "handshake: digest found at pos=%i", offs);
+    b->pos += offs;
+    b->last = b->pos + NGX_RTMP_HANDSHAKE_KEYLEN;
+    s->hs_digest = ngx_palloc(s->connection->pool, NGX_RTMP_HANDSHAKE_KEYLEN);
+    if (ngx_rtmp_make_digest(key, b, NULL, s->hs_digest, s->connection->log)
+            != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_handshake_create_response(ngx_rtmp_session_t *s)
+{
+    ngx_buf_t          *b;
+    u_char             *p;
+    ngx_str_t           key;
+
+    b = s->hs_buf;
+    b->pos = b->last = b->start + 1;
+    ngx_rtmp_fill_random_buffer(b);
+    if (s->hs_digest) {
+        p = b->last - NGX_RTMP_HANDSHAKE_KEYLEN;
+        key.data = s->hs_digest;
+        key.len = NGX_RTMP_HANDSHAKE_KEYLEN;
+        if (ngx_rtmp_make_digest(&key, b, p, p, s->connection->log) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_handshake_done(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_free_handshake_buffers(s);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "handshake: done");
+
+    if (ngx_rtmp_fire_event(s, NGX_RTMP_HANDSHAKE_DONE,
+                NULL, NULL) != NGX_OK)
+    {
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    ngx_rtmp_cycle(s);
+}
+
+
+static void
+ngx_rtmp_handshake_recv(ngx_event_t *rev)
+{
+    ssize_t                     n;
+    ngx_connection_t           *c;
+    ngx_rtmp_session_t         *s;
+    ngx_buf_t                  *b;
+
+    c = rev->data;
+    s = c->data;
+
+    if (c->destroyed) {
+        return;
+    }
+
+    if (rev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
+                "handshake: recv: client timed out");
+        c->timedout = 1;
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    if (rev->timer_set) {
+        ngx_del_timer(rev);
+    }
+
+    b = s->hs_buf;
+
+    while (b->last != b->end) {
+        n = c->recv(c, b->last, b->end - b->last);
+
+        if (n == NGX_ERROR || n == 0) {
+            ngx_rtmp_finalize_session(s);
+            return;
+        }
+
+        if (n == NGX_AGAIN) {
+            ngx_add_timer(rev, s->timeout);
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                ngx_rtmp_finalize_session(s);
+            }
+            return;
+        }
+
+        b->last += n;
+    }
+
+    if (rev->active) {
+        ngx_del_event(rev, NGX_READ_EVENT, 0);
+    }
+
+    ++s->hs_stage;
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "handshake: stage %ui", s->hs_stage);
+
+    switch (s->hs_stage) {
+        case NGX_RTMP_HANDSHAKE_SERVER_SEND_CHALLENGE:
+            if (ngx_rtmp_handshake_parse_challenge(s,
+                    &ngx_rtmp_client_partial_key,
+                    &ngx_rtmp_server_full_key) != NGX_OK)
+            {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                        "handshake: error parsing challenge");
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+            if (s->hs_old) {
+                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                        "handshake: old-style challenge");
+                s->hs_buf->pos = s->hs_buf->start;
+                s->hs_buf->last = s->hs_buf->end;
+            } else if (ngx_rtmp_handshake_create_challenge(s,
+                        ngx_rtmp_server_version,
+                        &ngx_rtmp_server_partial_key) != NGX_OK)
+            {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                        "handshake: error creating challenge");
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+            ngx_rtmp_handshake_send(c->write);
+            break;
+
+        case NGX_RTMP_HANDSHAKE_SERVER_DONE:
+            ngx_rtmp_handshake_done(s);
+            break;
+
+        case NGX_RTMP_HANDSHAKE_CLIENT_RECV_RESPONSE:
+            if (ngx_rtmp_handshake_parse_challenge(s,
+                    &ngx_rtmp_server_partial_key,
+                    &ngx_rtmp_client_full_key) != NGX_OK)
+            {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                        "handshake: error parsing challenge");
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+            s->hs_buf->pos = s->hs_buf->last = s->hs_buf->start + 1;
+            ngx_rtmp_handshake_recv(c->read);
+            break;
+
+        case NGX_RTMP_HANDSHAKE_CLIENT_SEND_RESPONSE:
+            if (ngx_rtmp_handshake_create_response(s) != NGX_OK) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                        "handshake: response error");
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+            ngx_rtmp_handshake_send(c->write);
+            break;
+    }
+}
+
+
+static void
+ngx_rtmp_handshake_send(ngx_event_t *wev)
+{
+    ngx_int_t                   n;
+    ngx_connection_t           *c;
+    ngx_rtmp_session_t         *s;
+    ngx_buf_t                  *b;
+
+    c = wev->data;
+    s = c->data;
+
+    if (c->destroyed) {
+        return;
+    }
+
+    if (wev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
+                "handshake: send: client timed out");
+        c->timedout = 1;
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    if (wev->timer_set) {
+        ngx_del_timer(wev);
+    }
+
+    b = s->hs_buf;
+
+    while(b->pos != b->last) {
+        n = c->send(c, b->pos, b->last - b->pos);
+
+        if (n == NGX_ERROR) {
+            ngx_rtmp_finalize_session(s);
+            return;
+        }
+
+        if (n == NGX_AGAIN || n == 0) {
+            ngx_add_timer(c->write, s->timeout);
+            if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+                ngx_rtmp_finalize_session(s);
+            }
+            return;
+        }
+
+        b->pos += n;
+    }
+
+    if (wev->active) {
+        ngx_del_event(wev, NGX_WRITE_EVENT, 0);
+    }
+
+    ++s->hs_stage;
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "handshake: stage %ui", s->hs_stage);
+
+    switch (s->hs_stage) {
+        case NGX_RTMP_HANDSHAKE_SERVER_SEND_RESPONSE:
+            if (s->hs_old) {
+                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                        "handshake: old-style response");
+                s->hs_buf->pos = s->hs_buf->start + 1;
+                s->hs_buf->last = s->hs_buf->end;
+            } else if (ngx_rtmp_handshake_create_response(s) != NGX_OK) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                        "handshake: response error");
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+            ngx_rtmp_handshake_send(wev);
+            break;
+
+        case NGX_RTMP_HANDSHAKE_SERVER_RECV_RESPONSE:
+            s->hs_buf->pos = s->hs_buf->last = s->hs_buf->start + 1;
+            ngx_rtmp_handshake_recv(c->read);
+            break;
+
+        case NGX_RTMP_HANDSHAKE_CLIENT_RECV_CHALLENGE:
+            s->hs_buf->pos = s->hs_buf->last = s->hs_buf->start;
+            ngx_rtmp_handshake_recv(c->read);
+            break;
+
+        case NGX_RTMP_HANDSHAKE_CLIENT_DONE:
+            ngx_rtmp_handshake_done(s);
+            break;
+    }
+}
+
+
+void
+ngx_rtmp_handshake(ngx_rtmp_session_t *s)
+{
+    ngx_connection_t           *c;
+
+    c = s->connection;
+    c->read->handler =  ngx_rtmp_handshake_recv;
+    c->write->handler = ngx_rtmp_handshake_send;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "handshake: start server handshake");
+
+    s->hs_buf = ngx_rtmp_alloc_handshake_buffer(s);
+    s->hs_stage = NGX_RTMP_HANDSHAKE_SERVER_RECV_CHALLENGE;
+
+    ngx_rtmp_handshake_recv(c->read);
+}
+
+
+void
+ngx_rtmp_client_handshake(ngx_rtmp_session_t *s, unsigned async)
+{
+    ngx_connection_t           *c;
+
+    c = s->connection;
+    c->read->handler =  ngx_rtmp_handshake_recv;
+    c->write->handler = ngx_rtmp_handshake_send;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "handshake: start client handshake");
+
+    s->hs_buf = ngx_rtmp_alloc_handshake_buffer(s);
+    s->hs_stage = NGX_RTMP_HANDSHAKE_CLIENT_SEND_CHALLENGE;
+
+    if (ngx_rtmp_handshake_create_challenge(s,
+                ngx_rtmp_client_version,
+                &ngx_rtmp_client_partial_key) != NGX_OK)
+    {
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    if (async) {
+        ngx_add_timer(c->write, s->timeout);
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            ngx_rtmp_finalize_session(s);
+        }
+        return;
+    }
+
+    ngx_rtmp_handshake_send(c->write);
+}
+
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_init.c b/debian/modules/nginx-rtmp/ngx_rtmp_init.c
new file mode 100644
index 0000000..97c7e9a
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_init.c
@@ -0,0 +1,329 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_proxy_protocol.h"
+
+
+static void ngx_rtmp_close_connection(ngx_connection_t *c);
+static u_char * ngx_rtmp_log_error(ngx_log_t *log, u_char *buf, size_t len);
+
+
+void
+ngx_rtmp_init_connection(ngx_connection_t *c)
+{
+    ngx_uint_t             i;
+    ngx_rtmp_port_t       *port;
+    struct sockaddr       *sa;
+    struct sockaddr_in    *sin;
+    ngx_rtmp_in_addr_t    *addr;
+    ngx_rtmp_session_t    *s;
+    ngx_rtmp_addr_conf_t  *addr_conf;
+    ngx_int_t              unix_socket;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6   *sin6;
+    ngx_rtmp_in6_addr_t   *addr6;
+#endif
+
+    ++ngx_rtmp_naccepted;
+
+    /* find the server configuration for the address:port */
+
+    /* AF_INET only */
+
+    port = c->listening->servers;
+    unix_socket = 0;
+
+    if (port->naddrs > 1) {
+
+        /*
+         * There are several addresses on this port and one of them
+         * is the "*:port" wildcard so getsockname() is needed to determine
+         * the server address.
+         *
+         * AcceptEx() already gave this address.
+         */
+
+        if (ngx_connection_local_sockaddr(c, NULL, 0) != NGX_OK) {
+            ngx_rtmp_close_connection(c);
+            return;
+        }
+
+        sa = c->local_sockaddr;
+
+        switch (sa->sa_family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            sin6 = (struct sockaddr_in6 *) sa;
+
+            addr6 = port->addrs;
+
+            /* the last address is "*" */
+
+            for (i = 0; i < port->naddrs - 1; i++) {
+                if (ngx_memcmp(&addr6[i].addr6, &sin6->sin6_addr, 16) == 0) {
+                    break;
+                }
+            }
+
+            addr_conf = &addr6[i].conf;
+
+            break;
+#endif
+
+        case AF_UNIX:
+            unix_socket = 1;
+
+        default: /* AF_INET */
+            sin = (struct sockaddr_in *) sa;
+
+            addr = port->addrs;
+
+            /* the last address is "*" */
+
+            for (i = 0; i < port->naddrs - 1; i++) {
+                if (addr[i].addr == sin->sin_addr.s_addr) {
+                    break;
+                }
+            }
+
+            addr_conf = &addr[i].conf;
+
+            break;
+        }
+
+    } else {
+        switch (c->local_sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            addr6 = port->addrs;
+            addr_conf = &addr6[0].conf;
+            break;
+#endif
+
+        case AF_UNIX:
+            unix_socket = 1;
+
+        default: /* AF_INET */
+            addr = port->addrs;
+            addr_conf = &addr[0].conf;
+            break;
+        }
+    }
+
+    ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%ui client connected '%V'",
+                  c->number, &c->addr_text);
+
+    s = ngx_rtmp_init_session(c, addr_conf);
+    if (s == NULL) {
+        return;
+    }
+
+    /* only auto-pushed connections are
+     * done through unix socket */
+
+    s->auto_pushed = unix_socket;
+
+    if (addr_conf->proxy_protocol) {
+        ngx_rtmp_proxy_protocol(s);
+
+    } else {
+        ngx_rtmp_handshake(s);
+    }
+}
+
+
+ngx_rtmp_session_t *
+ngx_rtmp_init_session(ngx_connection_t *c, ngx_rtmp_addr_conf_t *addr_conf)
+{
+    ngx_rtmp_session_t             *s;
+    ngx_rtmp_core_srv_conf_t       *cscf;
+    ngx_rtmp_error_log_ctx_t       *ctx;
+
+    s = ngx_pcalloc(c->pool, sizeof(ngx_rtmp_session_t) +
+            sizeof(ngx_chain_t *) * ((ngx_rtmp_core_srv_conf_t *)
+                addr_conf->ctx-> srv_conf[ngx_rtmp_core_module
+                    .ctx_index])->out_queue);
+    if (s == NULL) {
+        ngx_rtmp_close_connection(c);
+        return NULL;
+    }
+
+    s->main_conf = addr_conf->ctx->main_conf;
+    s->srv_conf = addr_conf->ctx->srv_conf;
+
+    s->addr_text = &addr_conf->addr_text;
+
+    c->data = s;
+    s->connection = c;
+
+    ctx = ngx_palloc(c->pool, sizeof(ngx_rtmp_error_log_ctx_t));
+    if (ctx == NULL) {
+        ngx_rtmp_close_connection(c);
+        return NULL;
+    }
+
+    ctx->client = &c->addr_text;
+    ctx->session = s;
+
+    c->log->connection = c->number;
+    c->log->handler = ngx_rtmp_log_error;
+    c->log->data = ctx;
+    c->log->action = NULL;
+
+    c->log_error = NGX_ERROR_INFO;
+
+    s->ctx = ngx_pcalloc(c->pool, sizeof(void *) * ngx_rtmp_max_module);
+    if (s->ctx == NULL) {
+        ngx_rtmp_close_connection(c);
+        return NULL;
+    }
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    s->out_queue = cscf->out_queue;
+    s->out_cork = cscf->out_cork;
+    s->in_streams = ngx_pcalloc(c->pool, sizeof(ngx_rtmp_stream_t)
+            * cscf->max_streams);
+    if (s->in_streams == NULL) {
+        ngx_rtmp_close_connection(c);
+        return NULL;
+    }
+
+#if (nginx_version >= 1007005)
+    ngx_queue_init(&s->posted_dry_events);
+#endif
+
+    s->epoch = ngx_current_msec;
+    s->timeout = cscf->timeout;
+    s->buflen = cscf->buflen;
+    ngx_rtmp_set_chunk_size(s, NGX_RTMP_DEFAULT_CHUNK_SIZE);
+
+
+    if (ngx_rtmp_fire_event(s, NGX_RTMP_CONNECT, NULL, NULL) != NGX_OK) {
+        ngx_rtmp_finalize_session(s);
+        return NULL;
+    }
+
+    return s;
+}
+
+
+static u_char *
+ngx_rtmp_log_error(ngx_log_t *log, u_char *buf, size_t len)
+{
+    u_char                     *p;
+    ngx_rtmp_session_t         *s;
+    ngx_rtmp_error_log_ctx_t   *ctx;
+
+    if (log->action) {
+        p = ngx_snprintf(buf, len, " while %s", log->action);
+        len -= p - buf;
+        buf = p;
+    }
+
+    ctx = log->data;
+
+    p = ngx_snprintf(buf, len, ", client: %V", ctx->client);
+    len -= p - buf;
+    buf = p;
+
+    s = ctx->session;
+
+    if (s == NULL) {
+        return p;
+    }
+
+    p = ngx_snprintf(buf, len, ", server: %V", s->addr_text);
+    len -= p - buf;
+    buf = p;
+
+    return p;
+}
+
+
+static void
+ngx_rtmp_close_connection(ngx_connection_t *c)
+{
+    ngx_pool_t                         *pool;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, c->log, 0, "close connection");
+
+#if (NGX_STAT_STUB)
+    (void) ngx_atomic_fetch_add(ngx_stat_active, -1);
+#endif
+
+    pool = c->pool;
+    ngx_close_connection(c);
+    ngx_destroy_pool(pool);
+}
+
+
+static void
+ngx_rtmp_close_session_handler(ngx_event_t *e)
+{
+    ngx_rtmp_session_t                 *s;
+    ngx_connection_t                   *c;
+    ngx_rtmp_core_srv_conf_t           *cscf;
+
+    s = e->data;
+    c = s->connection;
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, c->log, 0, "close session");
+
+    ngx_rtmp_fire_event(s, NGX_RTMP_DISCONNECT, NULL, NULL);
+
+    if (s->ping_evt.timer_set) {
+        ngx_del_timer(&s->ping_evt);
+    }
+
+    if (s->in_old_pool) {
+        ngx_destroy_pool(s->in_old_pool);
+    }
+
+    if (s->in_pool) {
+        ngx_destroy_pool(s->in_pool);
+    }
+
+    ngx_rtmp_free_handshake_buffers(s);
+
+    while (s->out_pos != s->out_last) {
+        ngx_rtmp_free_shared_chain(cscf, s->out[s->out_pos++]);
+        s->out_pos %= s->out_queue;
+    }
+
+    ngx_rtmp_close_connection(c);
+}
+
+
+void
+ngx_rtmp_finalize_session(ngx_rtmp_session_t *s)
+{
+    ngx_event_t        *e;
+    ngx_connection_t   *c;
+
+    c = s->connection;
+    if (c->destroyed) {
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, c->log, 0, "finalize session");
+
+    c->destroyed = 1;
+    e = &s->close;
+    e->data = s;
+    e->handler = ngx_rtmp_close_session_handler;
+    e->log = c->log;
+
+    ngx_post_event(e, &ngx_posted_events);
+}
+
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_limit_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_limit_module.c
new file mode 100644
index 0000000..18ebc4b
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_limit_module.c
@@ -0,0 +1,205 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+
+
+typedef struct {
+    ngx_int_t       max_conn;
+    ngx_shm_zone_t *shm_zone;
+} ngx_rtmp_limit_main_conf_t;
+
+
+static ngx_str_t    shm_name = ngx_string("rtmp_limit");
+
+
+static ngx_int_t ngx_rtmp_limit_postconfiguration(ngx_conf_t *cf);
+static void *ngx_rtmp_limit_create_main_conf(ngx_conf_t *cf);
+
+
+static ngx_command_t  ngx_rtmp_limit_commands[] = {
+
+    { ngx_string("max_connections"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_RTMP_MAIN_CONF_OFFSET,
+      offsetof(ngx_rtmp_limit_main_conf_t, max_conn),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_limit_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_limit_postconfiguration,       /* postconfiguration */
+    ngx_rtmp_limit_create_main_conf,        /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    NULL,                                   /* create app configuration */
+    NULL                                    /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_limit_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_limit_module_ctx,             /* module context */
+    ngx_rtmp_limit_commands,                /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_rtmp_limit_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_limit_main_conf_t      *lmcf;
+
+    lmcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_limit_main_conf_t));
+    if (lmcf == NULL) {
+        return NULL;
+    }
+
+    lmcf->max_conn = NGX_CONF_UNSET;
+
+    return lmcf;
+}
+
+
+static ngx_int_t
+ngx_rtmp_limit_connect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+    ngx_chain_t *in)
+{
+    ngx_rtmp_limit_main_conf_t *lmcf;
+    ngx_slab_pool_t            *shpool;
+    ngx_shm_zone_t             *shm_zone;
+    uint32_t                   *nconn, n;
+    ngx_int_t                   rc;
+
+    lmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_limit_module);
+    if (lmcf->max_conn == NGX_CONF_UNSET) {
+        return NGX_OK;
+    }
+
+    shm_zone = lmcf->shm_zone;
+    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+    nconn = shm_zone->data;
+
+    ngx_shmtx_lock(&shpool->mutex);
+    n = ++*nconn;
+    ngx_shmtx_unlock(&shpool->mutex);
+
+    rc = n > (ngx_uint_t) lmcf->max_conn ? NGX_ERROR : NGX_OK;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "limit: inc conection counter: %uD", n);
+
+    if (rc != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "limit: too many connections: %uD > %i",
+                      n, lmcf->max_conn);
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_rtmp_limit_disconnect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+    ngx_chain_t *in)
+{
+    ngx_rtmp_limit_main_conf_t *lmcf;
+    ngx_slab_pool_t            *shpool;
+    ngx_shm_zone_t             *shm_zone;
+    uint32_t                   *nconn, n;
+
+    lmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_limit_module);
+    if (lmcf->max_conn == NGX_CONF_UNSET) {
+        return NGX_OK;
+    }
+
+    shm_zone = lmcf->shm_zone;
+    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+    nconn = shm_zone->data;
+
+    ngx_shmtx_lock(&shpool->mutex);
+    n = --*nconn;
+    ngx_shmtx_unlock(&shpool->mutex);
+
+    (void) n;
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "limit: dec conection counter: %uD", n);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_limit_shm_init(ngx_shm_zone_t *shm_zone, void *data)
+{
+    ngx_slab_pool_t    *shpool;
+    uint32_t           *nconn;
+
+    if (data) {
+        shm_zone->data = data;
+        return NGX_OK;
+    }
+
+    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+
+    nconn = ngx_slab_alloc(shpool, 4);
+    if (nconn == NULL) {
+        return NGX_ERROR;
+    }
+
+    *nconn = 0;
+
+    shm_zone->data = nconn;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_limit_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t  *cmcf;
+    ngx_rtmp_limit_main_conf_t *lmcf;
+    ngx_rtmp_handler_pt        *h;
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_CONNECT]);
+    *h = ngx_rtmp_limit_connect;
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
+    *h = ngx_rtmp_limit_disconnect;
+
+    lmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_limit_module);
+    if (lmcf->max_conn == NGX_CONF_UNSET) {
+        return NGX_OK;
+    }
+
+    lmcf->shm_zone = ngx_shared_memory_add(cf, &shm_name, ngx_pagesize * 2,
+                                           &ngx_rtmp_limit_module);
+    if (lmcf->shm_zone == NULL) {
+        return NGX_ERROR;
+    }
+
+    lmcf->shm_zone->init = ngx_rtmp_limit_shm_init;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_live_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_live_module.c
new file mode 100644
index 0000000..5bebb9e
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_live_module.c
@@ -0,0 +1,1153 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_live_module.h"
+#include "ngx_rtmp_cmd_module.h"
+#include "ngx_rtmp_codec_module.h"
+
+
+static ngx_rtmp_publish_pt              next_publish;
+static ngx_rtmp_play_pt                 next_play;
+static ngx_rtmp_close_stream_pt         next_close_stream;
+static ngx_rtmp_pause_pt                next_pause;
+static ngx_rtmp_stream_begin_pt         next_stream_begin;
+static ngx_rtmp_stream_eof_pt           next_stream_eof;
+
+
+static ngx_int_t ngx_rtmp_live_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_live_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+static char *ngx_rtmp_live_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static void ngx_rtmp_live_start(ngx_rtmp_session_t *s);
+static void ngx_rtmp_live_stop(ngx_rtmp_session_t *s);
+
+
+static ngx_command_t  ngx_rtmp_live_commands[] = {
+
+    { ngx_string("live"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, live),
+      NULL },
+
+    { ngx_string("stream_buckets"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, nbuckets),
+      NULL },
+
+    { ngx_string("buffer"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, buflen),
+      NULL },
+
+    { ngx_string("sync"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_live_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, sync),
+      NULL },
+
+    { ngx_string("interleave"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, interleave),
+      NULL },
+
+    { ngx_string("wait_key"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, wait_key),
+      NULL },
+
+    { ngx_string("wait_video"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, wait_video),
+      NULL },
+
+    { ngx_string("publish_notify"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, publish_notify),
+      NULL },
+
+    { ngx_string("play_restart"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, play_restart),
+      NULL },
+
+    { ngx_string("idle_streams"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, idle_streams),
+      NULL },
+
+    { ngx_string("drop_idle_publisher"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_live_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_live_app_conf_t, idle_timeout),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_live_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_live_postconfiguration,        /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    ngx_rtmp_live_create_app_conf,          /* create app configuration */
+    ngx_rtmp_live_merge_app_conf            /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_live_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_live_module_ctx,              /* module context */
+    ngx_rtmp_live_commands,                 /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_rtmp_live_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_live_app_conf_t      *lacf;
+
+    lacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_live_app_conf_t));
+    if (lacf == NULL) {
+        return NULL;
+    }
+
+    lacf->live = NGX_CONF_UNSET;
+    lacf->nbuckets = NGX_CONF_UNSET;
+    lacf->buflen = NGX_CONF_UNSET_MSEC;
+    lacf->sync = NGX_CONF_UNSET_MSEC;
+    lacf->idle_timeout = NGX_CONF_UNSET_MSEC;
+    lacf->interleave = NGX_CONF_UNSET;
+    lacf->wait_key = NGX_CONF_UNSET;
+    lacf->wait_video = NGX_CONF_UNSET;
+    lacf->publish_notify = NGX_CONF_UNSET;
+    lacf->play_restart = NGX_CONF_UNSET;
+    lacf->idle_streams = NGX_CONF_UNSET;
+
+    return lacf;
+}
+
+
+static char *
+ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_live_app_conf_t *prev = parent;
+    ngx_rtmp_live_app_conf_t *conf = child;
+
+    ngx_conf_merge_value(conf->live, prev->live, 0);
+    ngx_conf_merge_value(conf->nbuckets, prev->nbuckets, 1024);
+    ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 0);
+    ngx_conf_merge_msec_value(conf->sync, prev->sync, 300);
+    ngx_conf_merge_msec_value(conf->idle_timeout, prev->idle_timeout, 0);
+    ngx_conf_merge_value(conf->interleave, prev->interleave, 0);
+    ngx_conf_merge_value(conf->wait_key, prev->wait_key, 1);
+    ngx_conf_merge_value(conf->wait_video, prev->wait_video, 0);
+    ngx_conf_merge_value(conf->publish_notify, prev->publish_notify, 0);
+    ngx_conf_merge_value(conf->play_restart, prev->play_restart, 0);
+    ngx_conf_merge_value(conf->idle_streams, prev->idle_streams, 1);
+
+    conf->pool = ngx_create_pool(4096, &cf->cycle->new_log);
+    if (conf->pool == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    conf->streams = ngx_pcalloc(cf->pool,
+            sizeof(ngx_rtmp_live_stream_t *) * conf->nbuckets);
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_rtmp_live_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char                       *p = conf;
+    ngx_str_t                  *value;
+    ngx_msec_t                 *msp;
+
+    msp = (ngx_msec_t *) (p + cmd->offset);
+
+    value = cf->args->elts;
+
+    if (value[1].len == sizeof("off") - 1 &&
+        ngx_strncasecmp(value[1].data, (u_char *) "off", value[1].len) == 0)
+    {
+        *msp = 0;
+        return NGX_CONF_OK;
+    }
+
+    return ngx_conf_set_msec_slot(cf, cmd, conf);
+}
+
+
+static ngx_rtmp_live_stream_t **
+ngx_rtmp_live_get_stream(ngx_rtmp_session_t *s, u_char *name, int create)
+{
+    ngx_rtmp_live_app_conf_t   *lacf;
+    ngx_rtmp_live_stream_t    **stream;
+    size_t                      len;
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+    if (lacf == NULL) {
+        return NULL;
+    }
+
+    len = ngx_strlen(name);
+    stream = &lacf->streams[ngx_hash_key(name, len) % lacf->nbuckets];
+
+    for (; *stream; stream = &(*stream)->next) {
+        if (ngx_strcmp(name, (*stream)->name) == 0) {
+            return stream;
+        }
+    }
+
+    if (!create) {
+        return NULL;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "live: create stream '%s'", name);
+
+    if (lacf->free_streams) {
+        *stream = lacf->free_streams;
+        lacf->free_streams = lacf->free_streams->next;
+    } else {
+        *stream = ngx_palloc(lacf->pool, sizeof(ngx_rtmp_live_stream_t));
+    }
+    ngx_memzero(*stream, sizeof(ngx_rtmp_live_stream_t));
+    ngx_memcpy((*stream)->name, name,
+            ngx_min(sizeof((*stream)->name) - 1, len));
+    (*stream)->epoch = ngx_current_msec;
+
+    return stream;
+}
+
+
+static void
+ngx_rtmp_live_idle(ngx_event_t *pev)
+{
+    ngx_connection_t           *c;
+    ngx_rtmp_session_t         *s;
+
+    c = pev->data;
+    s = c->data;
+
+    ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                  "live: drop idle publisher");
+
+    ngx_rtmp_finalize_session(s);
+}
+
+
+static void
+ngx_rtmp_live_set_status(ngx_rtmp_session_t *s, ngx_chain_t *control,
+                         ngx_chain_t **status, size_t nstatus,
+                         unsigned active)
+{
+    ngx_rtmp_live_app_conf_t   *lacf;
+    ngx_rtmp_live_ctx_t        *ctx, *pctx;
+    ngx_chain_t               **cl;
+    ngx_event_t                *e;
+    size_t                      n;
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: set active=%ui", active);
+
+    if (ctx->active == active) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "live: unchanged active=%ui", active);
+        return;
+    }
+
+    ctx->active = active;
+
+    if (ctx->publishing) {
+
+        /* publisher */
+
+        if (lacf->idle_timeout) {
+            e = &ctx->idle_evt;
+
+            if (active && !ctx->idle_evt.timer_set) {
+                e->data = s->connection;
+                e->log = s->connection->log;
+                e->handler = ngx_rtmp_live_idle;
+
+                ngx_add_timer(e, lacf->idle_timeout);
+
+            } else if (!active && ctx->idle_evt.timer_set) {
+                ngx_del_timer(e);
+            }
+        }
+
+        ctx->stream->active = active;
+
+        for (pctx = ctx->stream->ctx; pctx; pctx = pctx->next) {
+            if (pctx->publishing == 0) {
+                ngx_rtmp_live_set_status(pctx->session, control, status,
+                                         nstatus, active);
+            }
+        }
+
+        return;
+    }
+
+    /* subscriber */
+
+    if (control && ngx_rtmp_send_message(s, control, 0) != NGX_OK) {
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    if (!ctx->silent) {
+        cl = status;
+
+        for (n = 0; n < nstatus; ++n, ++cl) {
+            if (*cl && ngx_rtmp_send_message(s, *cl, 0) != NGX_OK) {
+                ngx_rtmp_finalize_session(s);
+                return;
+            }
+        }
+    }
+
+    ctx->cs[0].active = 0;
+    ctx->cs[0].dropped = 0;
+
+    ctx->cs[1].active = 0;
+    ctx->cs[1].dropped = 0;
+}
+
+
+static void
+ngx_rtmp_live_start(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    ngx_rtmp_live_app_conf_t   *lacf;
+    ngx_chain_t                *control;
+    ngx_chain_t                *status[3];
+    size_t                      n, nstatus;
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+
+    control = ngx_rtmp_create_stream_begin(s, NGX_RTMP_MSID);
+
+    nstatus = 0;
+
+    if (lacf->play_restart) {
+        status[nstatus++] = ngx_rtmp_create_status(s, "NetStream.Play.Start",
+                                                   "status", "Start live");
+        status[nstatus++] = ngx_rtmp_create_sample_access(s);
+    }
+
+    if (lacf->publish_notify) {
+        status[nstatus++] = ngx_rtmp_create_status(s,
+                                                 "NetStream.Play.PublishNotify",
+                                                 "status", "Start publishing");
+    }
+
+    ngx_rtmp_live_set_status(s, control, status, nstatus, 1);
+
+    if (control) {
+        ngx_rtmp_free_shared_chain(cscf, control);
+    }
+
+    for (n = 0; n < nstatus; ++n) {
+        ngx_rtmp_free_shared_chain(cscf, status[n]);
+    }
+}
+
+
+static void
+ngx_rtmp_live_stop(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    ngx_rtmp_live_app_conf_t   *lacf;
+    ngx_chain_t                *control;
+    ngx_chain_t                *status[3];
+    size_t                      n, nstatus;
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+
+    control = ngx_rtmp_create_stream_eof(s, NGX_RTMP_MSID);
+
+    nstatus = 0;
+
+    if (lacf->play_restart) {
+        status[nstatus++] = ngx_rtmp_create_status(s, "NetStream.Play.Stop",
+                                                   "status", "Stop live");
+    }
+
+    if (lacf->publish_notify) {
+        status[nstatus++] = ngx_rtmp_create_status(s,
+                                               "NetStream.Play.UnpublishNotify",
+                                               "status", "Stop publishing");
+    }
+
+    ngx_rtmp_live_set_status(s, control, status, nstatus, 0);
+
+    if (control) {
+        ngx_rtmp_free_shared_chain(cscf, control);
+    }
+
+    for (n = 0; n < nstatus; ++n) {
+        ngx_rtmp_free_shared_chain(cscf, status[n]);
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_live_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
+{
+    ngx_rtmp_live_ctx_t    *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+
+    if (ctx == NULL || ctx->stream == NULL || !ctx->publishing) {
+        goto next;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: stream_begin");
+
+    ngx_rtmp_live_start(s);
+
+next:
+    return next_stream_begin(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_live_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_eof_t *v)
+{
+    ngx_rtmp_live_ctx_t    *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+
+    if (ctx == NULL || ctx->stream == NULL || !ctx->publishing) {
+        goto next;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: stream_eof");
+
+    ngx_rtmp_live_stop(s);
+
+next:
+    return next_stream_eof(s, v);
+}
+
+
+static void
+ngx_rtmp_live_join(ngx_rtmp_session_t *s, u_char *name, unsigned publisher)
+{
+    ngx_rtmp_live_ctx_t            *ctx;
+    ngx_rtmp_live_stream_t        **stream;
+    ngx_rtmp_live_app_conf_t       *lacf;
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+    if (lacf == NULL) {
+        return;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+    if (ctx && ctx->stream) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "live: already joined");
+        return;
+    }
+
+    if (ctx == NULL) {
+        ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_live_ctx_t));
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_live_module);
+    }
+
+    ngx_memzero(ctx, sizeof(*ctx));
+
+    ctx->session = s;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: join '%s'", name);
+
+    stream = ngx_rtmp_live_get_stream(s, name, publisher || lacf->idle_streams);
+
+    if (stream == NULL ||
+        !(publisher || (*stream)->publishing || lacf->idle_streams))
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "live: stream not found");
+
+        ngx_rtmp_send_status(s, "NetStream.Play.StreamNotFound", "error",
+                             "No such stream");
+
+        ngx_rtmp_finalize_session(s);
+
+        return;
+    }
+
+    if (publisher) {
+        if ((*stream)->publishing) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "live: already publishing");
+
+            ngx_rtmp_send_status(s, "NetStream.Publish.BadName", "error",
+                                 "Already publishing");
+
+            return;
+        }
+
+        (*stream)->publishing = 1;
+    }
+
+    ctx->stream = *stream;
+    ctx->publishing = publisher;
+    ctx->next = (*stream)->ctx;
+
+    (*stream)->ctx = ctx;
+
+    if (lacf->buflen) {
+        s->out_buffer = 1;
+    }
+
+    ctx->cs[0].csid = NGX_RTMP_CSID_VIDEO;
+    ctx->cs[1].csid = NGX_RTMP_CSID_AUDIO;
+
+    if (!ctx->publishing && ctx->stream->active) {
+        ngx_rtmp_live_start(s);
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_live_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
+{
+    ngx_rtmp_session_t             *ss;
+    ngx_rtmp_live_ctx_t            *ctx, **cctx, *pctx;
+    ngx_rtmp_live_stream_t        **stream;
+    ngx_rtmp_live_app_conf_t       *lacf;
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+    if (lacf == NULL) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+    if (ctx == NULL) {
+        goto next;
+    }
+
+    if (ctx->stream == NULL) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "live: not joined");
+        goto next;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: leave '%s'", ctx->stream->name);
+
+    if (ctx->stream->publishing && ctx->publishing) {
+        ctx->stream->publishing = 0;
+    }
+
+    for (cctx = &ctx->stream->ctx; *cctx; cctx = &(*cctx)->next) {
+        if (*cctx == ctx) {
+            *cctx = ctx->next;
+            break;
+        }
+    }
+
+    if (ctx->publishing || ctx->stream->active) {
+        ngx_rtmp_live_stop(s);
+    }
+
+    if (ctx->publishing) {
+        ngx_rtmp_send_status(s, "NetStream.Unpublish.Success",
+                             "status", "Stop publishing");
+        if (!lacf->idle_streams) {
+            for (pctx = ctx->stream->ctx; pctx; pctx = pctx->next) {
+                if (pctx->publishing == 0) {
+                    ss = pctx->session;
+                    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                                   "live: no publisher");
+                    ngx_rtmp_finalize_session(ss);
+                }
+            }
+        }
+    }
+
+    if (ctx->stream->ctx) {
+        ctx->stream = NULL;
+        goto next;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: delete empty stream '%s'",
+                   ctx->stream->name);
+
+    stream = ngx_rtmp_live_get_stream(s, ctx->stream->name, 0);
+    if (stream == NULL) {
+        goto next;
+    }
+    *stream = (*stream)->next;
+
+    ctx->stream->next = lacf->free_streams;
+    lacf->free_streams = ctx->stream;
+    ctx->stream = NULL;
+
+    if (!ctx->silent && !ctx->publishing && !lacf->play_restart) {
+        ngx_rtmp_send_status(s, "NetStream.Play.Stop", "status", "Stop live");
+    }
+
+next:
+    return next_close_stream(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_live_pause(ngx_rtmp_session_t *s, ngx_rtmp_pause_t *v)
+{
+    ngx_rtmp_live_ctx_t            *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+
+    if (ctx == NULL || ctx->stream == NULL) {
+        goto next;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: pause=%i timestamp=%f",
+                   (ngx_int_t) v->pause, v->position);
+
+    if (v->pause) {
+        if (ngx_rtmp_send_status(s, "NetStream.Pause.Notify", "status",
+                                 "Paused live")
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        ctx->paused = 1;
+
+        ngx_rtmp_live_stop(s);
+
+    } else {
+        if (ngx_rtmp_send_status(s, "NetStream.Unpause.Notify", "status",
+                                 "Unpaused live")
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        ctx->paused = 0;
+
+        ngx_rtmp_live_start(s);
+    }
+
+next:
+    return next_pause(s, v);
+}
+
+static ngx_int_t
+ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                 ngx_chain_t *in)
+{
+    ngx_rtmp_live_ctx_t            *ctx, *pctx;
+    ngx_rtmp_codec_ctx_t           *codec_ctx;
+    ngx_chain_t                    *header, *coheader, *meta,
+                                   *apkt, *aapkt, *acopkt, *rpkt;
+    ngx_rtmp_core_srv_conf_t       *cscf;
+    ngx_rtmp_live_app_conf_t       *lacf;
+    ngx_rtmp_session_t             *ss;
+    ngx_rtmp_header_t               ch, lh, clh;
+    ngx_int_t                       rc, mandatory, dummy_audio;
+    ngx_uint_t                      prio;
+    ngx_uint_t                      peers;
+    ngx_uint_t                      meta_version;
+    ngx_uint_t                      csidx;
+    uint32_t                        delta;
+    ngx_rtmp_live_chunk_stream_t   *cs;
+#ifdef NGX_DEBUG
+    const char                     *type_s;
+
+    type_s = (h->type == NGX_RTMP_MSG_VIDEO ? "video" : "audio");
+#endif
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+    if (lacf == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (!lacf->live || in == NULL  || in->buf == NULL) {
+        return NGX_OK;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+    if (ctx == NULL || ctx->stream == NULL) {
+        return NGX_OK;
+    }
+
+    if (ctx->publishing == 0) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "live: %s from non-publisher", type_s);
+        return NGX_OK;
+    }
+
+    if (!ctx->stream->active) {
+        ngx_rtmp_live_start(s);
+    }
+
+    if (ctx->idle_evt.timer_set) {
+        ngx_add_timer(&ctx->idle_evt, lacf->idle_timeout);
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: %s packet timestamp=%uD",
+                   type_s, h->timestamp);
+
+    s->current_time = h->timestamp;
+
+    peers = 0;
+    apkt = NULL;
+    aapkt = NULL;
+    acopkt = NULL;
+    header = NULL;
+    coheader = NULL;
+    meta = NULL;
+    meta_version = 0;
+    mandatory = 0;
+
+    prio = (h->type == NGX_RTMP_MSG_VIDEO ?
+            ngx_rtmp_get_video_frame_type(in) : 0);
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    csidx = !(lacf->interleave || h->type == NGX_RTMP_MSG_VIDEO);
+
+    cs  = &ctx->cs[csidx];
+
+    ngx_memzero(&ch, sizeof(ch));
+
+    ch.timestamp = h->timestamp;
+    ch.msid = NGX_RTMP_MSID;
+    ch.csid = cs->csid;
+    ch.type = h->type;
+
+    lh = ch;
+
+    if (cs->active) {
+        lh.timestamp = cs->timestamp;
+    }
+
+    clh = lh;
+    clh.type = (h->type == NGX_RTMP_MSG_AUDIO ? NGX_RTMP_MSG_VIDEO :
+                                                NGX_RTMP_MSG_AUDIO);
+
+    cs->active = 1;
+    cs->timestamp = ch.timestamp;
+
+    delta = ch.timestamp - lh.timestamp;
+/*
+    if (delta >> 31) {
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "live: clipping non-monotonical timestamp %uD->%uD",
+                       lh.timestamp, ch.timestamp);
+
+        delta = 0;
+
+        ch.timestamp = lh.timestamp;
+    }
+*/
+    rpkt = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
+
+    ngx_rtmp_prepare_message(s, &ch, &lh, rpkt);
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+
+    if (codec_ctx) {
+
+        if (h->type == NGX_RTMP_MSG_AUDIO) {
+            header = codec_ctx->aac_header;
+
+            if (lacf->interleave) {
+                coheader = codec_ctx->avc_header;
+            }
+
+            if (codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC &&
+                ngx_rtmp_is_codec_header(in))
+            {
+                prio = 0;
+                mandatory = 1;
+            }
+
+        } else {
+            header = codec_ctx->avc_header;
+
+            if (lacf->interleave) {
+                coheader = codec_ctx->aac_header;
+            }
+
+            if (codec_ctx->video_codec_id == NGX_RTMP_VIDEO_H264 &&
+                ngx_rtmp_is_codec_header(in))
+            {
+                prio = 0;
+                mandatory = 1;
+            }
+        }
+
+        if (codec_ctx->meta) {
+            meta = codec_ctx->meta;
+            meta_version = codec_ctx->meta_version;
+        }
+    }
+
+    /* broadcast to all subscribers */
+
+    for (pctx = ctx->stream->ctx; pctx; pctx = pctx->next) {
+        if (pctx == ctx || pctx->paused) {
+            continue;
+        }
+
+        ss = pctx->session;
+        cs = &pctx->cs[csidx];
+
+        /* send metadata */
+
+        if (meta && meta_version != pctx->meta_version) {
+            ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                           "live: meta");
+
+            if (ngx_rtmp_send_message(ss, meta, 0) == NGX_OK) {
+                pctx->meta_version = meta_version;
+            }
+        }
+
+        /* sync stream */
+
+        if (cs->active && (lacf->sync && cs->dropped > lacf->sync)) {
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                           "live: sync %s dropped=%uD", type_s, cs->dropped);
+
+            cs->active = 0;
+            cs->dropped = 0;
+        }
+
+        /* absolute packet */
+
+        if (!cs->active) {
+
+            if (mandatory) {
+                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                               "live: skipping header");
+                continue;
+            }
+
+            if (lacf->wait_video && h->type == NGX_RTMP_MSG_AUDIO &&
+                !pctx->cs[0].active)
+            {
+                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                               "live: waiting for video");
+                continue;
+            }
+
+            if (lacf->wait_key && prio != NGX_RTMP_VIDEO_KEY_FRAME &&
+               (lacf->interleave || h->type == NGX_RTMP_MSG_VIDEO))
+            {
+                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                               "live: skip non-key");
+                continue;
+            }
+
+            dummy_audio = 0;
+            if (lacf->wait_video && h->type == NGX_RTMP_MSG_VIDEO &&
+                !pctx->cs[1].active)
+            {
+                dummy_audio = 1;
+                if (aapkt == NULL) {
+                    aapkt = ngx_rtmp_alloc_shared_buf(cscf);
+                    ngx_rtmp_prepare_message(s, &clh, NULL, aapkt);
+                }
+            }
+
+            if (header || coheader) {
+
+                /* send absolute codec header */
+
+                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                               "live: abs %s header timestamp=%uD",
+                               type_s, lh.timestamp);
+
+                if (header) {
+                    if (apkt == NULL) {
+                        apkt = ngx_rtmp_append_shared_bufs(cscf, NULL, header);
+                        ngx_rtmp_prepare_message(s, &lh, NULL, apkt);
+                    }
+
+                    rc = ngx_rtmp_send_message(ss, apkt, 0);
+                    if (rc != NGX_OK) {
+                        continue;
+                    }
+                }
+
+                if (coheader) {
+                    if (acopkt == NULL) {
+                        acopkt = ngx_rtmp_append_shared_bufs(cscf, NULL, coheader);
+                        ngx_rtmp_prepare_message(s, &clh, NULL, acopkt);
+                    }
+
+                    rc = ngx_rtmp_send_message(ss, acopkt, 0);
+                    if (rc != NGX_OK) {
+                        continue;
+                    }
+
+                } else if (dummy_audio) {
+                    ngx_rtmp_send_message(ss, aapkt, 0);
+                }
+
+                cs->timestamp = lh.timestamp;
+                cs->active = 1;
+                ss->current_time = cs->timestamp;
+
+            } else {
+
+                /* send absolute packet */
+
+                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                               "live: abs %s packet timestamp=%uD",
+                               type_s, ch.timestamp);
+
+                if (apkt == NULL) {
+                    apkt = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
+                    ngx_rtmp_prepare_message(s, &ch, NULL, apkt);
+                }
+
+                rc = ngx_rtmp_send_message(ss, apkt, prio);
+                if (rc != NGX_OK) {
+                    continue;
+                }
+
+                cs->timestamp = ch.timestamp;
+                cs->active = 1;
+                ss->current_time = cs->timestamp;
+
+                ++peers;
+
+                if (dummy_audio) {
+                    ngx_rtmp_send_message(ss, aapkt, 0);
+                }
+
+                continue;
+            }
+        }
+
+        /* send relative packet */
+
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                       "live: rel %s packet delta=%uD",
+                       type_s, delta);
+
+        if (ngx_rtmp_send_message(ss, rpkt, prio) != NGX_OK) {
+            ++pctx->ndropped;
+
+            cs->dropped += delta;
+
+            if (mandatory) {
+                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
+                               "live: mandatory packet failed");
+                ngx_rtmp_finalize_session(ss);
+            }
+
+            continue;
+        }
+
+        cs->timestamp += delta;
+        ++peers;
+        ss->current_time = cs->timestamp;
+    }
+
+    if (rpkt) {
+        ngx_rtmp_free_shared_chain(cscf, rpkt);
+    }
+
+    if (apkt) {
+        ngx_rtmp_free_shared_chain(cscf, apkt);
+    }
+
+    if (aapkt) {
+        ngx_rtmp_free_shared_chain(cscf, aapkt);
+    }
+
+    if (acopkt) {
+        ngx_rtmp_free_shared_chain(cscf, acopkt);
+    }
+
+    ngx_rtmp_update_bandwidth(&ctx->stream->bw_in, h->mlen);
+    ngx_rtmp_update_bandwidth(&ctx->stream->bw_out, h->mlen * peers);
+
+    ngx_rtmp_update_bandwidth(h->type == NGX_RTMP_MSG_AUDIO ?
+                              &ctx->stream->bw_in_audio :
+                              &ctx->stream->bw_in_video,
+                              h->mlen);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_live_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    ngx_rtmp_live_app_conf_t       *lacf;
+    ngx_rtmp_live_ctx_t            *ctx;
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+
+    if (lacf == NULL || !lacf->live) {
+        goto next;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: publish: name='%s' type='%s'",
+                   v->name, v->type);
+
+    /* join stream as publisher */
+
+    ngx_rtmp_live_join(s, v->name, 1);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+    if (ctx == NULL || !ctx->publishing) {
+        goto next;
+    }
+
+    ctx->silent = v->silent;
+
+    if (!ctx->silent) {
+        ngx_rtmp_send_status(s, "NetStream.Publish.Start",
+                             "status", "Start publishing");
+    }
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_live_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    ngx_rtmp_live_app_conf_t       *lacf;
+    ngx_rtmp_live_ctx_t            *ctx;
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
+
+    if (lacf == NULL || !lacf->live) {
+        goto next;
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "live: play: name='%s' start=%uD duration=%uD reset=%d",
+                   v->name, (uint32_t) v->start,
+                   (uint32_t) v->duration, (uint32_t) v->reset);
+
+    /* join stream as subscriber */
+
+    ngx_rtmp_live_join(s, v->name, 0);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
+    if (ctx == NULL) {
+        goto next;
+    }
+
+    ctx->silent = v->silent;
+
+    if (!ctx->silent && !lacf->play_restart) {
+        ngx_rtmp_send_status(s, "NetStream.Play.Start",
+                             "status", "Start live");
+        ngx_rtmp_send_sample_access(s);
+    }
+
+next:
+    return next_play(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_live_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t          *cmcf;
+    ngx_rtmp_handler_pt                *h;
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    /* register raw event handlers */
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
+    *h = ngx_rtmp_live_av;
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
+    *h = ngx_rtmp_live_av;
+
+    /* chain handlers */
+
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_live_publish;
+
+    next_play = ngx_rtmp_play;
+    ngx_rtmp_play = ngx_rtmp_live_play;
+
+    next_close_stream = ngx_rtmp_close_stream;
+    ngx_rtmp_close_stream = ngx_rtmp_live_close_stream;
+
+    next_pause = ngx_rtmp_pause;
+    ngx_rtmp_pause = ngx_rtmp_live_pause;
+
+    next_stream_begin = ngx_rtmp_stream_begin;
+    ngx_rtmp_stream_begin = ngx_rtmp_live_stream_begin;
+
+    next_stream_eof = ngx_rtmp_stream_eof;
+    ngx_rtmp_stream_eof = ngx_rtmp_live_stream_eof;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_live_module.h b/debian/modules/nginx-rtmp/ngx_rtmp_live_module.h
new file mode 100644
index 0000000..71eca36
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_live_module.h
@@ -0,0 +1,83 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_LIVE_H_INCLUDED_
+#define _NGX_RTMP_LIVE_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_cmd_module.h"
+#include "ngx_rtmp_bandwidth.h"
+#include "ngx_rtmp_streams.h"
+
+
+typedef struct ngx_rtmp_live_ctx_s ngx_rtmp_live_ctx_t;
+typedef struct ngx_rtmp_live_stream_s ngx_rtmp_live_stream_t;
+
+
+typedef struct {
+    unsigned                            active:1;
+    uint32_t                            timestamp;
+    uint32_t                            csid;
+    uint32_t                            dropped;
+} ngx_rtmp_live_chunk_stream_t;
+
+
+struct ngx_rtmp_live_ctx_s {
+    ngx_rtmp_session_t                 *session;
+    ngx_rtmp_live_stream_t             *stream;
+    ngx_rtmp_live_ctx_t                *next;
+    ngx_uint_t                          ndropped;
+    ngx_rtmp_live_chunk_stream_t        cs[2];
+    ngx_uint_t                          meta_version;
+    ngx_event_t                         idle_evt;
+    unsigned                            active:1;
+    unsigned                            publishing:1;
+    unsigned                            silent:1;
+    unsigned                            paused:1;
+};
+
+
+struct ngx_rtmp_live_stream_s {
+    u_char                              name[NGX_RTMP_MAX_NAME];
+    ngx_rtmp_live_stream_t             *next;
+    ngx_rtmp_live_ctx_t                *ctx;
+    ngx_rtmp_bandwidth_t                bw_in;
+    ngx_rtmp_bandwidth_t                bw_in_audio;
+    ngx_rtmp_bandwidth_t                bw_in_video;
+    ngx_rtmp_bandwidth_t                bw_out;
+    ngx_msec_t                          epoch;
+    unsigned                            active:1;
+    unsigned                            publishing:1;
+};
+
+
+typedef struct {
+    ngx_int_t                           nbuckets;
+    ngx_rtmp_live_stream_t            **streams;
+    ngx_flag_t                          live;
+    ngx_flag_t                          meta;
+    ngx_msec_t                          sync;
+    ngx_msec_t                          idle_timeout;
+    ngx_flag_t                          atc;
+    ngx_flag_t                          interleave;
+    ngx_flag_t                          wait_key;
+    ngx_flag_t                          wait_video;
+    ngx_flag_t                          publish_notify;
+    ngx_flag_t                          play_restart;
+    ngx_flag_t                          idle_streams;
+    ngx_msec_t                          buflen;
+    ngx_pool_t                         *pool;
+    ngx_rtmp_live_stream_t             *free_streams;
+} ngx_rtmp_live_app_conf_t;
+
+
+extern ngx_module_t  ngx_rtmp_live_module;
+
+
+#endif /* _NGX_RTMP_LIVE_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_log_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_log_module.c
new file mode 100644
index 0000000..81016d0
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_log_module.c
@@ -0,0 +1,1016 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_cmd_module.h"
+
+
+static ngx_rtmp_publish_pt  next_publish;
+static ngx_rtmp_play_pt     next_play;
+
+
+static ngx_int_t ngx_rtmp_log_postconfiguration(ngx_conf_t *cf);
+static void *ngx_rtmp_log_create_main_conf(ngx_conf_t *cf);
+static void * ngx_rtmp_log_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_log_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+static char * ngx_rtmp_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static char * ngx_rtmp_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static char * ngx_rtmp_log_compile_format(ngx_conf_t *cf, ngx_array_t *ops,
+       ngx_array_t *args, ngx_uint_t s);
+
+
+typedef struct ngx_rtmp_log_op_s ngx_rtmp_log_op_t;
+
+
+typedef size_t (*ngx_rtmp_log_op_getlen_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_log_op_t *op);
+typedef u_char * (*ngx_rtmp_log_op_getdata_pt)(ngx_rtmp_session_t *s,
+        u_char *buf, ngx_rtmp_log_op_t *log);
+
+
+struct ngx_rtmp_log_op_s {
+    ngx_rtmp_log_op_getlen_pt   getlen;
+    ngx_rtmp_log_op_getdata_pt  getdata;
+    ngx_str_t                   value;
+    ngx_uint_t                  offset;
+};
+
+
+typedef struct {
+    ngx_str_t                   name;
+    ngx_rtmp_log_op_getlen_pt   getlen;
+    ngx_rtmp_log_op_getdata_pt  getdata;
+    ngx_uint_t                  offset;
+} ngx_rtmp_log_var_t;
+
+
+typedef struct {
+    ngx_str_t                   name;
+    ngx_array_t                *ops; /* ngx_rtmp_log_op_t */
+} ngx_rtmp_log_fmt_t;
+
+
+typedef struct {
+    ngx_open_file_t            *file;
+    time_t                      disk_full_time;
+    time_t                      error_log_time;
+    ngx_rtmp_log_fmt_t *format;
+} ngx_rtmp_log_t;
+
+
+typedef struct {
+    ngx_array_t                *logs; /* ngx_rtmp_log_t */
+    ngx_uint_t                  off;
+} ngx_rtmp_log_app_conf_t;
+
+
+typedef struct {
+    ngx_array_t                 formats; /* ngx_rtmp_log_fmt_t */
+    ngx_uint_t                  combined_used;
+} ngx_rtmp_log_main_conf_t;
+
+
+typedef struct {
+    unsigned                    play:1;
+    unsigned                    publish:1;
+    u_char                      name[NGX_RTMP_MAX_NAME];
+    u_char                      args[NGX_RTMP_MAX_ARGS];
+} ngx_rtmp_log_ctx_t;
+
+
+static ngx_str_t ngx_rtmp_access_log = ngx_string(NGX_HTTP_LOG_PATH);
+
+
+static ngx_command_t  ngx_rtmp_log_commands[] = {
+
+    { ngx_string("access_log"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE12,
+      ngx_rtmp_log_set_log,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("log_format"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_2MORE,
+      ngx_rtmp_log_set_format,
+      NGX_RTMP_MAIN_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_log_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_log_postconfiguration,         /* postconfiguration */
+    ngx_rtmp_log_create_main_conf,          /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    ngx_rtmp_log_create_app_conf,           /* create app configuration */
+    ngx_rtmp_log_merge_app_conf             /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_log_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_log_module_ctx,               /* module context */
+    ngx_rtmp_log_commands,                  /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_str_t ngx_rtmp_combined_fmt =
+    ngx_string("$remote_addr [$time_local] $command "
+               "\"$app\" \"$name\" \"$args\" - "
+               "$bytes_received $bytes_sent "
+               "\"$pageurl\" \"$flashver\" ($session_readable_time)");
+
+
+static size_t
+ngx_rtmp_log_var_default_getlen(ngx_rtmp_session_t *s, ngx_rtmp_log_op_t *op)
+{
+    return op->value.len;
+}
+
+
+static u_char *
+ngx_rtmp_log_var_default_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    return ngx_cpymem(buf, op->value.data, op->value.len);
+}
+
+
+static size_t
+ngx_rtmp_log_var_connection_getlen(ngx_rtmp_session_t *s, ngx_rtmp_log_op_t *op)
+{
+    return NGX_INT_T_LEN;
+}
+
+static u_char *
+ngx_rtmp_log_var_connection_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    return ngx_sprintf(buf, "%ui", (ngx_uint_t) s->connection->number);
+}
+
+
+static size_t
+ngx_rtmp_log_var_remote_addr_getlen(ngx_rtmp_session_t *s,
+    ngx_rtmp_log_op_t *op)
+{
+    return s->connection->addr_text.len;
+}
+
+
+static u_char *
+ngx_rtmp_log_var_remote_addr_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    return ngx_cpymem(buf, s->connection->addr_text.data,
+                           s->connection->addr_text.len);
+}
+
+
+static size_t
+ngx_rtmp_log_var_msec_getlen(ngx_rtmp_session_t *s,
+    ngx_rtmp_log_op_t *op)
+{
+    return NGX_TIME_T_LEN + 4;
+}
+
+
+static u_char *
+ngx_rtmp_log_var_msec_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    ngx_time_t  *tp;
+
+    tp = ngx_timeofday();
+    
+    return ngx_sprintf(buf, "%T.%03M", tp->sec, tp->msec);
+}
+
+
+static size_t
+ngx_rtmp_log_var_session_string_getlen(ngx_rtmp_session_t *s,
+    ngx_rtmp_log_op_t *op)
+{
+    return ((ngx_str_t *) ((u_char *) s + op->offset))->len;
+}
+
+
+static u_char *
+ngx_rtmp_log_var_session_string_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    ngx_str_t  *str;
+
+    str = (ngx_str_t *) ((u_char *) s + op->offset);
+
+    return ngx_cpymem(buf, str->data, str->len);
+}
+
+
+static size_t
+ngx_rtmp_log_var_command_getlen(ngx_rtmp_session_t *s,
+    ngx_rtmp_log_op_t *op)
+{
+    return sizeof("PLAY+PUBLISH") - 1;
+}
+
+
+static u_char *
+ngx_rtmp_log_var_command_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    ngx_rtmp_log_ctx_t *ctx;
+    ngx_str_t          *cmd;
+    ngx_uint_t          n;
+
+    static ngx_str_t    commands[] = {
+        ngx_string("NONE"),
+        ngx_string("PLAY"),
+        ngx_string("PUBLISH"),
+        ngx_string("PLAY+PUBLISH")
+    };
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_log_module);
+
+    n = ctx ? (ctx->play + ctx->publish * 2) : 0;
+
+    cmd = &commands[n];
+
+    return ngx_cpymem(buf, cmd->data, cmd->len);
+}
+
+
+static size_t
+ngx_rtmp_log_var_context_cstring_getlen(ngx_rtmp_session_t *s,
+    ngx_rtmp_log_op_t *op)
+{
+    return ngx_max(NGX_RTMP_MAX_NAME, NGX_RTMP_MAX_ARGS);
+}
+
+
+static u_char *
+ngx_rtmp_log_var_context_cstring_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    ngx_rtmp_log_ctx_t *ctx;
+    u_char             *p;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_log_module);
+    if (ctx == NULL) {
+        return buf;
+    }
+
+    p = (u_char *) ctx + op->offset;
+    while (*p) {
+        *buf++ = *p++;
+    }
+
+    return buf;
+}
+
+
+static size_t
+ngx_rtmp_log_var_session_uint32_getlen(ngx_rtmp_session_t *s,
+    ngx_rtmp_log_op_t *op)
+{
+    return NGX_INT32_LEN;
+}
+
+
+static u_char *
+ngx_rtmp_log_var_session_uint32_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    uint32_t   *v;
+
+    v = (uint32_t *) ((uint8_t *) s + op->offset);
+
+    return ngx_sprintf(buf, "%uD", *v);
+}
+
+
+static size_t
+ngx_rtmp_log_var_time_local_getlen(ngx_rtmp_session_t *s,
+    ngx_rtmp_log_op_t *op)
+{
+    return ngx_cached_http_log_time.len;
+}
+
+
+static u_char *
+ngx_rtmp_log_var_time_local_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    return ngx_cpymem(buf, ngx_cached_http_log_time.data,
+                      ngx_cached_http_log_time.len);
+}
+
+
+static size_t
+ngx_rtmp_log_var_session_time_getlen(ngx_rtmp_session_t *s,
+    ngx_rtmp_log_op_t *op)
+{
+    return NGX_INT64_LEN;
+}
+
+
+static u_char *
+ngx_rtmp_log_var_session_time_getdata(ngx_rtmp_session_t *s, u_char *buf,
+    ngx_rtmp_log_op_t *op)
+{
+    return ngx_sprintf(buf, "%L",
+                       (int64_t) (ngx_current_msec - s->epoch) / 1000);
+}
+
+
+static size_t
+ngx_rtmp_log_var_session_readable_time_getlen(ngx_rtmp_session_t *s,
+    ngx_rtmp_log_op_t *op)
+{
+    return NGX_INT_T_LEN + sizeof("d 23h 59m 59s") - 1;
+}
+
+
+static u_char *
+ngx_rtmp_log_var_session_readable_time_getdata(ngx_rtmp_session_t *s,
+    u_char *buf, ngx_rtmp_log_op_t *op)
+{
+    int64_t     v;
+    ngx_uint_t  days, hours, minutes, seconds;
+
+    v = (ngx_current_msec - s->epoch) / 1000;
+
+    days = (ngx_uint_t) (v / (60 * 60 * 24));
+    hours = (ngx_uint_t) (v / (60 * 60) % 24);
+    minutes = (ngx_uint_t) (v / 60 % 60);
+    seconds = (ngx_uint_t) (v % 60);
+
+    if (days) {
+        buf = ngx_sprintf(buf, "%uid ", days);
+    }
+
+    if (days || hours) {
+        buf = ngx_sprintf(buf, "%uih ", hours);
+    }
+
+    if (days || hours || minutes) {
+        buf = ngx_sprintf(buf, "%uim ", minutes);
+    }
+
+    buf = ngx_sprintf(buf, "%uis", seconds);
+
+    return buf;
+}
+
+
+static ngx_rtmp_log_var_t ngx_rtmp_log_vars[] = {
+    { ngx_string("connection"),
+      ngx_rtmp_log_var_connection_getlen,
+      ngx_rtmp_log_var_connection_getdata,
+      0 },
+
+    { ngx_string("remote_addr"),
+      ngx_rtmp_log_var_remote_addr_getlen,
+      ngx_rtmp_log_var_remote_addr_getdata,
+      0 },
+
+    { ngx_string("app"),
+      ngx_rtmp_log_var_session_string_getlen,
+      ngx_rtmp_log_var_session_string_getdata,
+      offsetof(ngx_rtmp_session_t, app) },
+
+    { ngx_string("flashver"),
+      ngx_rtmp_log_var_session_string_getlen,
+      ngx_rtmp_log_var_session_string_getdata,
+      offsetof(ngx_rtmp_session_t, flashver) },
+
+    { ngx_string("swfurl"),
+      ngx_rtmp_log_var_session_string_getlen,
+      ngx_rtmp_log_var_session_string_getdata,
+      offsetof(ngx_rtmp_session_t, swf_url) },
+
+    { ngx_string("tcurl"),
+      ngx_rtmp_log_var_session_string_getlen,
+      ngx_rtmp_log_var_session_string_getdata,
+      offsetof(ngx_rtmp_session_t, tc_url) },
+
+    { ngx_string("pageurl"),
+      ngx_rtmp_log_var_session_string_getlen,
+      ngx_rtmp_log_var_session_string_getdata,
+      offsetof(ngx_rtmp_session_t, page_url) },
+
+    { ngx_string("command"),
+      ngx_rtmp_log_var_command_getlen,
+      ngx_rtmp_log_var_command_getdata,
+      0 },
+
+    { ngx_string("name"),
+      ngx_rtmp_log_var_context_cstring_getlen,
+      ngx_rtmp_log_var_context_cstring_getdata,
+      offsetof(ngx_rtmp_log_ctx_t, name) },
+
+    { ngx_string("args"),
+      ngx_rtmp_log_var_context_cstring_getlen,
+      ngx_rtmp_log_var_context_cstring_getdata,
+      offsetof(ngx_rtmp_log_ctx_t, args) },
+
+    { ngx_string("bytes_sent"),
+      ngx_rtmp_log_var_session_uint32_getlen,
+      ngx_rtmp_log_var_session_uint32_getdata,
+      offsetof(ngx_rtmp_session_t, out_bytes) },
+
+    { ngx_string("bytes_received"),
+      ngx_rtmp_log_var_session_uint32_getlen,
+      ngx_rtmp_log_var_session_uint32_getdata,
+      offsetof(ngx_rtmp_session_t, in_bytes) },
+
+    { ngx_string("time_local"),
+      ngx_rtmp_log_var_time_local_getlen,
+      ngx_rtmp_log_var_time_local_getdata,
+      0 },
+
+    { ngx_string("msec"),
+      ngx_rtmp_log_var_msec_getlen,
+      ngx_rtmp_log_var_msec_getdata,
+      0 },
+
+    { ngx_string("session_time"),
+      ngx_rtmp_log_var_session_time_getlen,
+      ngx_rtmp_log_var_session_time_getdata,
+      0 },
+
+    { ngx_string("session_readable_time"),
+      ngx_rtmp_log_var_session_readable_time_getlen,
+      ngx_rtmp_log_var_session_readable_time_getdata,
+      0 },
+
+    { ngx_null_string, NULL, NULL, 0 }
+};
+
+
+static void *
+ngx_rtmp_log_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_log_main_conf_t   *lmcf;
+    ngx_rtmp_log_fmt_t         *fmt;
+
+    lmcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_log_main_conf_t));
+    if (lmcf == NULL) {
+        return NULL;
+    }
+
+    if (ngx_array_init(&lmcf->formats, cf->pool, 4, sizeof(ngx_rtmp_log_fmt_t))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    fmt = ngx_array_push(&lmcf->formats);
+    if (fmt == NULL) {
+        return NULL;
+    }
+
+    ngx_str_set(&fmt->name, "combined");
+
+    fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_rtmp_log_op_t));
+    if (fmt->ops == NULL) {
+        return NULL;
+    }
+
+    return lmcf;
+
+}
+
+
+static void *
+ngx_rtmp_log_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_log_app_conf_t *lacf;
+
+    lacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_log_app_conf_t));
+    if (lacf == NULL) {
+        return NULL;
+    }
+
+    return lacf;
+}
+
+
+static char *
+ngx_rtmp_log_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_log_app_conf_t    *prev = parent;
+    ngx_rtmp_log_app_conf_t    *conf = child;
+    ngx_rtmp_log_main_conf_t   *lmcf;
+    ngx_rtmp_log_fmt_t         *fmt;
+    ngx_rtmp_log_t             *log;
+
+    if (conf->logs || conf->off) {
+        return NGX_OK;
+    }
+
+    conf->logs = prev->logs;
+    conf->off = prev->off;
+
+    if (conf->logs || conf->off) {
+        return NGX_OK;
+    }
+
+    conf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_rtmp_log_t));
+    if (conf->logs == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    log = ngx_array_push(conf->logs);
+    if (log == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    log->file = ngx_conf_open_file(cf->cycle, &ngx_rtmp_access_log);
+    if (log->file == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    log->disk_full_time = 0;
+    log->error_log_time = 0;
+
+    lmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_log_module);
+    fmt = lmcf->formats.elts;
+
+    log->format = &fmt[0];
+    lmcf->combined_used = 1;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_rtmp_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_log_app_conf_t    *lacf = conf;
+
+    ngx_rtmp_log_main_conf_t   *lmcf;
+    ngx_rtmp_log_fmt_t         *fmt;
+    ngx_rtmp_log_t             *log;
+    ngx_str_t                  *value, name;
+    ngx_uint_t                  n;
+
+    value = cf->args->elts;
+
+    if (ngx_strcmp(value[1].data, "off") == 0) {
+        lacf->off = 1;
+        return NGX_CONF_OK;
+    }
+
+    if (lacf->logs == NULL) {
+        lacf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_rtmp_log_t));
+        if (lacf->logs == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    log = ngx_array_push(lacf->logs);
+    if (log == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(log, sizeof(*log));
+
+    lmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_log_module);
+
+    log->file = ngx_conf_open_file(cf->cycle, &value[1]);
+    if (log->file == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->args->nelts == 2) {
+        ngx_str_set(&name, "combined");
+        lmcf->combined_used = 1;
+
+    } else {
+        name = value[2];
+        if (ngx_strcmp(name.data, "combined") == 0) {
+            lmcf->combined_used = 1;
+        }
+    }
+
+    fmt = lmcf->formats.elts;
+    for (n = 0; n < lmcf->formats.nelts; ++n, ++fmt) {
+        if (fmt->name.len == name.len &&
+            ngx_strncasecmp(fmt->name.data, name.data, name.len) == 0)
+        {
+            log->format = fmt;
+            break;
+        }
+    }
+
+    if (log->format == NULL) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "unknown log format \"%V\"",
+                           &name);
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_rtmp_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_log_main_conf_t   *lmcf = conf;
+    ngx_rtmp_log_fmt_t         *fmt;
+    ngx_str_t                  *value;
+    ngx_uint_t                  i;
+
+    value = cf->args->elts;
+
+    if (cf->cmd_type != NGX_RTMP_MAIN_CONF) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "\"log_format\" directive can only be used on "
+                           "\"rtmp\" level");
+    }
+
+    fmt = lmcf->formats.elts;
+    for (i = 0; i < lmcf->formats.nelts; i++) {
+        if (fmt[i].name.len == value[1].len &&
+            ngx_strcmp(fmt[i].name.data, value[1].data) == 0)
+        {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "duplicate \"log_format\" name \"%V\"",
+                               &value[1]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    fmt = ngx_array_push(&lmcf->formats);
+    if (fmt == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    fmt->name = value[1];
+
+    fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_rtmp_log_op_t));
+    if (fmt->ops == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    return ngx_rtmp_log_compile_format(cf, fmt->ops, cf->args, 2);
+}
+
+
+static char *
+ngx_rtmp_log_compile_format(ngx_conf_t *cf, ngx_array_t *ops, ngx_array_t *args,
+                            ngx_uint_t s)
+{
+    size_t              i, len;
+    u_char             *data, *d, c;
+    ngx_uint_t          bracket;
+    ngx_str_t          *value, var;
+    ngx_rtmp_log_op_t  *op;
+    ngx_rtmp_log_var_t *v;
+
+    value = args->elts;
+
+    for (; s < args->nelts; ++s) {
+        i = 0;
+
+        len = value[s].len;
+        d = value[s].data;
+
+        while (i < len) {
+
+            op = ngx_array_push(ops);
+            if (op == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            ngx_memzero(op, sizeof(*op));
+
+            data = &d[i];
+
+            if (d[i] == '$') {
+                if (++i == len) {
+                    goto invalid;
+                }
+
+                if (d[i] == '{') {
+                    bracket = 1;
+                    if (++i == len) {
+                        goto invalid;
+                    }
+                } else {
+                    bracket = 0;
+                }
+
+                var.data = &d[i];
+
+                for (var.len = 0; i < len; ++i, ++var.len) {
+                    c = d[i];
+
+                    if (c == '}' && bracket) {
+                        ++i;
+                        bracket = 0;
+                        break;
+                    }
+
+                    if ((c >= 'A' && c <= 'Z') ||
+                        (c >= 'a' && c <= 'z') ||
+                        (c >= '0' && c <= '9') ||
+                        (c == '_'))
+                    {
+                        continue;
+                    }
+
+                    break;
+                }
+
+                if (bracket) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "missing closing bracket in \"%V\"",
+                                       &var);
+                    return NGX_CONF_ERROR;
+                }
+
+                if (var.len == 0) {
+                    goto invalid;
+                }
+
+                for (v = ngx_rtmp_log_vars; v->name.len; ++v) {
+                    if (v->name.len == var.len &&
+                        ngx_strncmp(v->name.data, var.data, var.len) == 0)
+                    {
+                        op->getlen = v->getlen;
+                        op->getdata = v->getdata;
+                        op->offset = v->offset;
+                        break;
+                    }
+                }
+
+                if (v->name.len == 0) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "unknown variable \"%V\"", &var);
+                    return NGX_CONF_ERROR;
+                }
+
+                continue;
+            }
+
+            ++i;
+
+            while (i < len && d[i] != '$') {
+                ++i;
+            }
+
+            op->getlen = ngx_rtmp_log_var_default_getlen;
+            op->getdata = ngx_rtmp_log_var_default_getdata;
+
+            op->value.len = &d[i] - data;
+
+            op->value.data = ngx_pnalloc(cf->pool, op->value.len);
+            if (op->value.data == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            ngx_memcpy(op->value.data, data, op->value.len);
+        }
+    }
+
+    return NGX_CONF_OK;
+
+invalid:
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%s\"", data);
+
+    return NGX_CONF_ERROR;
+}
+
+
+static ngx_rtmp_log_ctx_t *
+ngx_rtmp_log_set_names(ngx_rtmp_session_t *s, u_char *name, u_char *args)
+{
+    ngx_rtmp_log_ctx_t *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_log_module);
+    if (ctx == NULL) {
+        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_log_ctx_t));
+        if (ctx == NULL) {
+            return NULL;
+        }
+
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_log_module);
+    }
+
+    ngx_memcpy(ctx->name, name, NGX_RTMP_MAX_NAME);
+    ngx_memcpy(ctx->args, args, NGX_RTMP_MAX_ARGS);
+
+    return ctx;
+}
+
+
+static ngx_int_t
+ngx_rtmp_log_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    ngx_rtmp_log_ctx_t *ctx;
+
+    if (s->auto_pushed || s->relay) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_log_set_names(s, v->name, v->args);
+    if (ctx == NULL) {
+        goto next;
+    }
+
+    ctx->publish = 1;
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_log_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    ngx_rtmp_log_ctx_t *ctx;
+
+    if (s->auto_pushed || s->relay) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_log_set_names(s, v->name, v->args);
+    if (ctx == NULL) {
+        goto next;
+    }
+
+    ctx->play = 1;
+
+next:
+    return next_play(s, v);
+}
+
+
+static void
+ngx_rtmp_log_write(ngx_rtmp_session_t *s, ngx_rtmp_log_t *log, u_char *buf,
+                   size_t len)
+{
+    u_char *name;
+    time_t  now;
+    ssize_t n;
+    int     err;
+
+    err = 0;
+    name = log->file->name.data;
+    n = ngx_write_fd(log->file->fd, buf, len);
+
+    if (n == (ssize_t) len) {
+        return;
+    }
+
+    now = ngx_time();
+
+    if (n == -1) {
+        err = ngx_errno;
+
+        if (err == NGX_ENOSPC) {
+            log->disk_full_time = now;
+        }
+
+        if (now - log->error_log_time > 59) {
+            ngx_log_error(NGX_LOG_ALERT, s->connection->log, err,
+                          ngx_write_fd_n " to \"%s\" failed", name);
+            log->error_log_time = now;
+        }
+    }
+
+    if (now - log->error_log_time > 59) {
+        ngx_log_error(NGX_LOG_ALERT, s->connection->log, err,
+                      ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz",
+                      name, n, len);
+        log->error_log_time = now;
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_log_disconnect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                        ngx_chain_t *in)
+{
+    ngx_rtmp_log_app_conf_t    *lacf;
+    ngx_rtmp_log_t             *log;
+    ngx_rtmp_log_op_t          *op;
+    ngx_uint_t                  n, i;
+    u_char                     *line, *p;
+    size_t                      len;
+
+    if (s->auto_pushed || s->relay) {
+        return NGX_OK;
+    }
+
+    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_log_module);
+    if (lacf == NULL || lacf->off || lacf->logs == NULL) {
+        return NGX_OK;
+    }
+
+    log = lacf->logs->elts;
+    for (i = 0; i < lacf->logs->nelts; ++i, ++log) {
+
+        if (ngx_time() == log->disk_full_time) {
+            /* FreeBSD full disk protection;
+             * nginx http logger does the same */
+            continue;
+        }
+
+        len = 0;
+        op = log->format->ops->elts;
+        for (n = 0; n < log->format->ops->nelts; ++n, ++op) {
+            len += op->getlen(s, op);
+        }
+
+        len += NGX_LINEFEED_SIZE;
+
+        line = ngx_palloc(s->connection->pool, len);
+        if (line == NULL) {
+            return NGX_OK;
+        }
+
+        p = line;
+        op = log->format->ops->elts;
+        for (n = 0; n < log->format->ops->nelts; ++n, ++op) {
+            p = op->getdata(s, p, op);
+        }
+
+        ngx_linefeed(p);
+
+        ngx_rtmp_log_write(s, log, line, p - line);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_log_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t  *cmcf;
+    ngx_rtmp_handler_pt        *h;
+    ngx_rtmp_log_main_conf_t   *lmcf;
+    ngx_array_t                 a;
+    ngx_rtmp_log_fmt_t         *fmt;
+    ngx_str_t                  *value;
+
+    lmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_log_module);
+    if (lmcf->combined_used) {
+        if (ngx_array_init(&a, cf->pool, 1, sizeof(ngx_str_t)) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        value = ngx_array_push(&a);
+        if (value == NULL) {
+            return NGX_ERROR;
+        }
+
+        *value = ngx_rtmp_combined_fmt;
+        fmt = lmcf->formats.elts;
+
+        if (ngx_rtmp_log_compile_format(cf, fmt->ops, &a, 0)
+            != NGX_CONF_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
+    *h = ngx_rtmp_log_disconnect;
+
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_log_publish;
+
+    next_play = ngx_rtmp_play;
+    ngx_rtmp_play = ngx_rtmp_log_play;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_mp4_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_mp4_module.c
new file mode 100644
index 0000000..0259ca2
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_mp4_module.c
@@ -0,0 +1,2591 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_play_module.h"
+#include "ngx_rtmp_codec_module.h"
+#include "ngx_rtmp_streams.h"
+
+
+static ngx_int_t ngx_rtmp_mp4_postconfiguration(ngx_conf_t *cf);
+static ngx_int_t ngx_rtmp_mp4_init(ngx_rtmp_session_t *s,  ngx_file_t *f,
+       ngx_int_t aindex, ngx_int_t vindex);
+static ngx_int_t ngx_rtmp_mp4_done(ngx_rtmp_session_t *s,  ngx_file_t *f);
+static ngx_int_t ngx_rtmp_mp4_start(ngx_rtmp_session_t *s, ngx_file_t *f);
+static ngx_int_t ngx_rtmp_mp4_seek(ngx_rtmp_session_t *s,  ngx_file_t *f,
+                                   ngx_uint_t offset);
+static ngx_int_t ngx_rtmp_mp4_stop(ngx_rtmp_session_t *s,  ngx_file_t *f);
+static ngx_int_t ngx_rtmp_mp4_send(ngx_rtmp_session_t *s,  ngx_file_t *f,
+                                   ngx_uint_t *ts);
+static ngx_int_t ngx_rtmp_mp4_reset(ngx_rtmp_session_t *s);
+
+
+#define NGX_RTMP_MP4_MAX_FRAMES         8
+
+
+#pragma pack(push,4)
+
+
+/* disable zero-sized array warning by msvc */
+
+#if (NGX_WIN32)
+#pragma warning(push)
+#pragma warning(disable:4200)
+#endif
+
+
+typedef struct {
+    uint32_t                            first_chunk;
+    uint32_t                            samples_per_chunk;
+    uint32_t                            sample_descrption_index;
+} ngx_rtmp_mp4_chunk_entry_t;
+
+
+typedef struct {
+    uint32_t                            version_flags;
+    uint32_t                            entry_count;
+    ngx_rtmp_mp4_chunk_entry_t          entries[0];
+} ngx_rtmp_mp4_chunks_t;
+
+
+typedef struct {
+    uint32_t                            sample_count;
+    uint32_t                            sample_delta;
+} ngx_rtmp_mp4_time_entry_t;
+
+
+typedef struct {
+    uint32_t                            version_flags;
+    uint32_t                            entry_count;
+    ngx_rtmp_mp4_time_entry_t           entries[0];
+} ngx_rtmp_mp4_times_t;
+
+
+typedef struct {
+    uint32_t                            sample_count;
+    uint32_t                            sample_offset;
+} ngx_rtmp_mp4_delay_entry_t;
+
+
+typedef struct {
+    uint32_t                            version_flags;
+    uint32_t                            entry_count;
+    ngx_rtmp_mp4_delay_entry_t          entries[0];
+} ngx_rtmp_mp4_delays_t;
+
+
+typedef struct {
+    uint32_t                            version_flags;
+    uint32_t                            entry_count;
+    uint32_t                            entries[0];
+} ngx_rtmp_mp4_keys_t;
+
+
+typedef struct {
+    uint32_t                            version_flags;
+    uint32_t                            sample_size;
+    uint32_t                            sample_count;
+    uint32_t                            entries[0];
+} ngx_rtmp_mp4_sizes_t;
+
+
+typedef struct {
+    uint32_t                            version_flags;
+    uint32_t                            field_size;
+    uint32_t                            sample_count;
+    uint32_t                            entries[0];
+} ngx_rtmp_mp4_sizes2_t;
+
+
+typedef struct {
+    uint32_t                            version_flags;
+    uint32_t                            entry_count;
+    uint32_t                            entries[0];
+} ngx_rtmp_mp4_offsets_t;
+
+
+typedef struct {
+    uint32_t                            version_flags;
+    uint32_t                            entry_count;
+    uint64_t                            entries[0];
+} ngx_rtmp_mp4_offsets64_t;
+
+
+#if (NGX_WIN32)
+#pragma warning(pop)
+#endif
+
+
+#pragma pack(pop)
+
+
+typedef struct {
+    uint32_t                            timestamp;
+    uint32_t                            last_timestamp;
+    off_t                               offset;
+    size_t                              size;
+    ngx_int_t                           key;
+    uint32_t                            delay;
+
+    unsigned                            not_first:1;
+    unsigned                            valid:1;
+
+    ngx_uint_t                          pos;
+
+    ngx_uint_t                          key_pos;
+
+    ngx_uint_t                          chunk;
+    ngx_uint_t                          chunk_pos;
+    ngx_uint_t                          chunk_count;
+
+    ngx_uint_t                          time_pos;
+    ngx_uint_t                          time_count;
+
+    ngx_uint_t                          delay_pos;
+    ngx_uint_t                          delay_count;
+
+    ngx_uint_t                          size_pos;
+} ngx_rtmp_mp4_cursor_t;
+
+
+typedef struct {
+    ngx_uint_t                          id;
+
+    ngx_int_t                           type;
+    ngx_int_t                           codec;
+    uint32_t                            csid;
+    u_char                              fhdr;
+    ngx_int_t                           time_scale;
+    uint64_t                            duration;
+
+    u_char                             *header;
+    size_t                              header_size;
+    unsigned                            header_sent:1;
+
+    ngx_rtmp_mp4_times_t               *times;
+    ngx_rtmp_mp4_delays_t              *delays;
+    ngx_rtmp_mp4_keys_t                *keys;
+    ngx_rtmp_mp4_chunks_t              *chunks;
+    ngx_rtmp_mp4_sizes_t               *sizes;
+    ngx_rtmp_mp4_sizes2_t              *sizes2;
+    ngx_rtmp_mp4_offsets_t             *offsets;
+    ngx_rtmp_mp4_offsets64_t           *offsets64;
+    ngx_rtmp_mp4_cursor_t               cursor;
+} ngx_rtmp_mp4_track_t;
+
+
+typedef struct {
+    void                               *mmaped;
+    size_t                              mmaped_size;
+    ngx_fd_t                            extra;
+
+    unsigned                            meta_sent:1;
+
+    ngx_rtmp_mp4_track_t                tracks[2];
+    ngx_rtmp_mp4_track_t               *track;
+    ngx_uint_t                          ntracks;
+
+    ngx_uint_t                          width;
+    ngx_uint_t                          height;
+    ngx_uint_t                          nchannels;
+    ngx_uint_t                          sample_size;
+    ngx_uint_t                          sample_rate;
+
+    ngx_int_t                           atracks, vtracks;
+    ngx_int_t                           aindex, vindex;
+
+    uint32_t                            start_timestamp, epoch;
+} ngx_rtmp_mp4_ctx_t;
+
+
+#define ngx_rtmp_mp4_make_tag(a, b, c, d)  \
+    ((uint32_t)d << 24 | (uint32_t)c << 16 | (uint32_t)b << 8 | (uint32_t)a)
+
+
+static ngx_inline uint32_t
+ngx_rtmp_mp4_to_rtmp_timestamp(ngx_rtmp_mp4_track_t *t, uint64_t ts)
+{
+    return (uint32_t) (ts * 1000 / t->time_scale);
+}
+
+
+static ngx_inline uint32_t
+ngx_rtmp_mp4_from_rtmp_timestamp(ngx_rtmp_mp4_track_t *t, uint32_t ts)
+{
+    return (uint64_t) ts * t->time_scale / 1000;
+}
+
+
+#define NGX_RTMP_MP4_BUFLEN_ADDON       1000
+
+
+static u_char                           ngx_rtmp_mp4_buffer[1024*1024];
+
+
+#if (NGX_WIN32)
+static void *
+ngx_rtmp_mp4_mmap(ngx_fd_t fd, size_t size, off_t offset, ngx_fd_t *extra)
+{
+    void           *data;
+
+    *extra = CreateFileMapping(fd, NULL, PAGE_READONLY,
+                               (DWORD) ((uint64_t) size >> 32),
+                               (DWORD) (size & 0xffffffff),
+                               NULL);
+    if (*extra == NULL) {
+        return NULL;
+    }
+
+    data = MapViewOfFile(*extra, FILE_MAP_READ,
+                         (DWORD) ((uint64_t) offset >> 32),
+                         (DWORD) (offset & 0xffffffff),
+                         size);
+
+    if (data == NULL) {
+        CloseHandle(*extra);
+    }
+
+    /*
+     * non-NULL result means map view handle is open
+     * and should be closed later
+     */
+
+    return data;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_munmap(void *data, size_t size, ngx_fd_t *extra)
+{
+    ngx_int_t  rc;
+
+    rc = NGX_OK;
+
+    if (UnmapViewOfFile(data) == 0) {
+        rc = NGX_ERROR;
+    }
+
+    if (CloseHandle(*extra) == 0) {
+        rc = NGX_ERROR;
+    }
+
+    return rc;
+}
+
+#else
+
+static void *
+ngx_rtmp_mp4_mmap(ngx_fd_t fd, size_t size, off_t offset, ngx_fd_t *extra)
+{
+    void  *data;
+
+    data = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, offset);
+
+    /* valid address is never NULL since there's no MAP_FIXED */
+
+    return data == MAP_FAILED ? NULL : data;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_munmap(void *data, size_t size, ngx_fd_t *extra)
+{
+    return munmap(data, size);
+}
+
+#endif
+
+
+static ngx_int_t ngx_rtmp_mp4_parse(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_trak(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_hdlr(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_stsd(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_stsc(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_stts(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_ctts(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_stss(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_stsz(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_stz2(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_stco(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_co64(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_avc1(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_avcC(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_mp4a(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_mp4v(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_esds(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_mp3(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_nmos(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_spex(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+
+
+typedef ngx_int_t (*ngx_rtmp_mp4_box_pt)(ngx_rtmp_session_t *s, u_char *pos,
+                                         u_char *last);
+
+typedef struct {
+    uint32_t                            tag;
+    ngx_rtmp_mp4_box_pt                 handler;
+} ngx_rtmp_mp4_box_t;
+
+
+static ngx_rtmp_mp4_box_t                       ngx_rtmp_mp4_boxes[] = {
+    { ngx_rtmp_mp4_make_tag('t','r','a','k'),   ngx_rtmp_mp4_parse_trak   },
+    { ngx_rtmp_mp4_make_tag('m','d','i','a'),   ngx_rtmp_mp4_parse        },
+    { ngx_rtmp_mp4_make_tag('m','d','h','d'),   ngx_rtmp_mp4_parse_mdhd   },
+    { ngx_rtmp_mp4_make_tag('h','d','l','r'),   ngx_rtmp_mp4_parse_hdlr   },
+    { ngx_rtmp_mp4_make_tag('m','i','n','f'),   ngx_rtmp_mp4_parse        },
+    { ngx_rtmp_mp4_make_tag('s','t','b','l'),   ngx_rtmp_mp4_parse        },
+    { ngx_rtmp_mp4_make_tag('s','t','s','d'),   ngx_rtmp_mp4_parse_stsd   },
+    { ngx_rtmp_mp4_make_tag('s','t','s','c'),   ngx_rtmp_mp4_parse_stsc   },
+    { ngx_rtmp_mp4_make_tag('s','t','t','s'),   ngx_rtmp_mp4_parse_stts   },
+    { ngx_rtmp_mp4_make_tag('c','t','t','s'),   ngx_rtmp_mp4_parse_ctts   },
+    { ngx_rtmp_mp4_make_tag('s','t','s','s'),   ngx_rtmp_mp4_parse_stss   },
+    { ngx_rtmp_mp4_make_tag('s','t','s','z'),   ngx_rtmp_mp4_parse_stsz   },
+    { ngx_rtmp_mp4_make_tag('s','t','z','2'),   ngx_rtmp_mp4_parse_stz2   },
+    { ngx_rtmp_mp4_make_tag('s','t','c','o'),   ngx_rtmp_mp4_parse_stco   },
+    { ngx_rtmp_mp4_make_tag('c','o','6','4'),   ngx_rtmp_mp4_parse_co64   },
+    { ngx_rtmp_mp4_make_tag('a','v','c','1'),   ngx_rtmp_mp4_parse_avc1   },
+    { ngx_rtmp_mp4_make_tag('a','v','c','C'),   ngx_rtmp_mp4_parse_avcC   },
+    { ngx_rtmp_mp4_make_tag('m','p','4','a'),   ngx_rtmp_mp4_parse_mp4a   },
+    { ngx_rtmp_mp4_make_tag('m','p','4','v'),   ngx_rtmp_mp4_parse_mp4v   },
+    { ngx_rtmp_mp4_make_tag('e','s','d','s'),   ngx_rtmp_mp4_parse_esds   },
+    { ngx_rtmp_mp4_make_tag('.','m','p','3'),   ngx_rtmp_mp4_parse_mp3    },
+    { ngx_rtmp_mp4_make_tag('n','m','o','s'),   ngx_rtmp_mp4_parse_nmos   },
+    { ngx_rtmp_mp4_make_tag('s','p','e','x'),   ngx_rtmp_mp4_parse_spex   },
+    { ngx_rtmp_mp4_make_tag('w','a','v','e'),   ngx_rtmp_mp4_parse        }
+};
+
+
+static ngx_int_t ngx_rtmp_mp4_parse_descr(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_es(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_dc(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+static ngx_int_t ngx_rtmp_mp4_parse_ds(ngx_rtmp_session_t *s, u_char *pos,
+       u_char *last);
+
+
+typedef ngx_int_t (*ngx_rtmp_mp4_descriptor_pt)(ngx_rtmp_session_t *s,
+                                                u_char *pos, u_char *last);
+
+typedef struct {
+    uint8_t                             tag;
+    ngx_rtmp_mp4_descriptor_pt          handler;
+} ngx_rtmp_mp4_descriptor_t;
+
+
+static ngx_rtmp_mp4_descriptor_t        ngx_rtmp_mp4_descriptors[] = {
+    { 0x03,   ngx_rtmp_mp4_parse_es   },    /* MPEG ES Descriptor */
+    { 0x04,   ngx_rtmp_mp4_parse_dc   },    /* MPEG DecoderConfig Descriptor */
+    { 0x05,   ngx_rtmp_mp4_parse_ds   }     /* MPEG DecoderSpec Descriptor */
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_mp4_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_mp4_postconfiguration,         /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    NULL,                                   /* create app configuration */
+    NULL                                    /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_mp4_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_mp4_module_ctx,               /* module context */
+    NULL,                                   /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_trak(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx->track) {
+        return NGX_OK;
+    }
+
+    ctx->track = (ctx->ntracks == sizeof(ctx->tracks) / sizeof(ctx->tracks[0]))
+                 ? NULL : &ctx->tracks[ctx->ntracks];
+
+    if (ctx->track) {
+        ngx_memzero(ctx->track, sizeof(*ctx->track));
+        ctx->track->id = ctx->ntracks;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: trying track %ui", ctx->ntracks);
+    }
+
+    if (ngx_rtmp_mp4_parse(s, pos, last) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (ctx->track && ctx->track->type &&
+        (ctx->ntracks == 0 ||
+         ctx->tracks[0].type != ctx->tracks[ctx->ntracks].type))
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: adding track %ui", ctx->ntracks);
+
+        if (ctx->track->type == NGX_RTMP_MSG_AUDIO) {
+            if (ctx->atracks++ != ctx->aindex) {
+                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "mp4: skipping audio track %ui!=%ui",
+                               ctx->atracks - 1, ctx->aindex);
+                ctx->track = NULL;
+                return NGX_OK;
+            }
+
+        } else {
+            if (ctx->vtracks++ != ctx->vindex) {
+                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "mp4: skipping video track %i!=%i",
+                               ctx->vtracks - 1, ctx->vindex);
+                ctx->track = NULL;
+                return NGX_OK;
+            }
+        }
+
+        ++ctx->ntracks;
+
+    } else {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: ignoring track %ui", ctx->ntracks);
+    }
+
+    ctx->track = NULL;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    ngx_rtmp_mp4_track_t       *t;
+    uint8_t                     version;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx->track == NULL) {
+        return NGX_OK;
+    }
+
+    t = ctx->track;
+
+    if (pos + 1 > last) {
+        return NGX_ERROR;
+    }
+
+    version = *(uint8_t *) pos;
+
+    switch (version) {
+        case 0:
+            if (pos + 20 > last) {
+                return NGX_ERROR;
+            }
+
+            pos += 12;
+            t->time_scale = ngx_rtmp_r32(*(uint32_t *) pos);
+            pos += 4;
+            t->duration = ngx_rtmp_r32(*(uint32_t *) pos);
+            break;
+
+        case 1:
+            if (pos + 28 > last) {
+                return NGX_ERROR;
+            }
+
+            pos += 20;
+            t->time_scale = ngx_rtmp_r32(*(uint32_t *) pos);
+            pos += 4;
+            t->duration = ngx_rtmp_r64(*(uint64_t *) pos);
+            break;
+
+        default:
+            return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: duration time_scale=%ui duration=%uL",
+                   t->time_scale, t->duration);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_hdlr(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    uint32_t                    type;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx->track == NULL) {
+        return NGX_OK;
+    }
+
+    if (pos + 12 > last) {
+        return NGX_ERROR;
+    }
+
+    type = *(uint32_t *)(pos + 8);
+
+    if (type == ngx_rtmp_mp4_make_tag('v','i','d','e')) {
+        ctx->track->type = NGX_RTMP_MSG_VIDEO;
+        ctx->track->csid = NGX_RTMP_CSID_VIDEO;
+
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: video track");
+
+    } else if (type == ngx_rtmp_mp4_make_tag('s','o','u','n')) {
+        ctx->track->type = NGX_RTMP_MSG_AUDIO;
+        ctx->track->csid = NGX_RTMP_CSID_AUDIO;
+
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: audio track");
+    } else {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: unknown track");
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_video(ngx_rtmp_session_t *s, u_char *pos, u_char *last,
+                         ngx_int_t codec)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx->track == NULL) {
+        return NGX_OK;
+    }
+
+    ctx->track->codec = codec;
+
+    if (pos + 78 > last) {
+        return NGX_ERROR;
+    }
+
+    pos += 24;
+
+    ctx->width = ngx_rtmp_r16(*(uint16_t *) pos);
+
+    pos += 2;
+
+    ctx->height = ngx_rtmp_r16(*(uint16_t *) pos);
+
+    pos += 52;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: video settings codec=%i, width=%ui, height=%ui",
+                   codec, ctx->width, ctx->height);
+
+    if (ngx_rtmp_mp4_parse(s, pos, last) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ctx->track->fhdr = (u_char) ctx->track->codec;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_audio(ngx_rtmp_session_t *s, u_char *pos, u_char *last,
+                         ngx_int_t codec)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    u_char                     *p;
+    ngx_uint_t                  version;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx->track == NULL) {
+        return NGX_OK;
+    }
+
+    ctx->track->codec = codec;
+
+    if (pos + 28 > last) {
+        return NGX_ERROR;
+    }
+
+    pos += 8;
+
+    version = ngx_rtmp_r16(*(uint16_t *) pos);
+
+    pos += 8;
+
+    ctx->nchannels = ngx_rtmp_r16(*(uint16_t *) pos);
+
+    pos += 2;
+
+    ctx->sample_size = ngx_rtmp_r16(*(uint16_t *) pos);
+
+    pos += 6;
+
+    ctx->sample_rate = ngx_rtmp_r16(*(uint16_t *) pos);
+
+    pos += 4;
+
+    p = &ctx->track->fhdr;
+
+    *p = 0;
+
+    if (ctx->nchannels == 2) {
+        *p |= 0x01;
+    }
+
+    if (ctx->sample_size == 16) {
+        *p |= 0x02;
+    }
+
+    switch (ctx->sample_rate) {
+        case 5512:
+            break;
+
+        case 11025:
+            *p |= 0x04;
+            break;
+
+        case 22050:
+            *p |= 0x08;
+            break;
+
+        default:  /*44100 etc */
+            *p |= 0x0c;
+            break;
+    }
+
+    ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: audio settings version=%ui, codec=%i, nchannels==%ui, "
+                   "sample_size=%ui, sample_rate=%ui",
+                   version, codec, ctx->nchannels, ctx->sample_size,
+                   ctx->sample_rate);
+
+    switch (version) {
+        case 1:
+            pos += 16;
+            break;
+
+        case 2:
+            pos += 36;
+    }
+
+    if (pos > last) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_mp4_parse(s, pos, last) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    *p |= (ctx->track->codec << 4);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_avc1(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    return ngx_rtmp_mp4_parse_video(s, pos, last, NGX_RTMP_VIDEO_H264);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_mp4v(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    return ngx_rtmp_mp4_parse_video(s, pos, last, NGX_RTMP_VIDEO_H264);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_avcC(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+
+    if (pos == last) {
+        return NGX_OK;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx->track == NULL || ctx->track->codec != NGX_RTMP_VIDEO_H264) {
+        return NGX_OK;
+    }
+
+    ctx->track->header = pos;
+    ctx->track->header_size = (size_t) (last - pos);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: video h264 header size=%uz",
+                   ctx->track->header_size);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_mp4a(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    return ngx_rtmp_mp4_parse_audio(s, pos, last, NGX_RTMP_AUDIO_MP3);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_ds(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t     *ctx;
+    ngx_rtmp_mp4_track_t   *t;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    t = ctx->track;
+
+    if (t == NULL) {
+        return NGX_OK;
+    }
+
+    t->header = pos;
+    t->header_size = (size_t) (last - pos);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: decoder header size=%uz", t->header_size);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_dc(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    uint8_t                 id;
+    ngx_rtmp_mp4_ctx_t     *ctx;
+    ngx_int_t              *pc;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx->track == NULL) {
+        return NGX_OK;
+    }
+
+    if (pos + 13 > last) {
+        return NGX_ERROR;
+    }
+
+    id = * (uint8_t *) pos;
+    pos += 13;
+    pc = &ctx->track->codec;
+
+    switch (id) {
+        case 0x21:
+            *pc = NGX_RTMP_VIDEO_H264;
+            break;
+
+        case 0x40:
+        case 0x66:
+        case 0x67:
+        case 0x68:
+            *pc = NGX_RTMP_AUDIO_AAC;
+            break;
+
+        case 0x69:
+        case 0x6b:
+            *pc = NGX_RTMP_AUDIO_MP3;
+            break;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: decoder descriptor id=%i codec=%i",
+                   (ngx_int_t) id, *pc);
+
+    return ngx_rtmp_mp4_parse_descr(s, pos, last);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_es(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    uint16_t    id;
+    uint8_t     flags;
+
+    if (pos + 3 > last) {
+        return NGX_ERROR;
+    }
+
+    id = ngx_rtmp_r16(*(uint16_t *) pos);
+    pos += 2;
+
+    flags = *(uint8_t *) pos;
+    ++pos;
+
+    if (flags & 0x80) { /* streamDependenceFlag */
+        pos += 2;
+    }
+
+    if (flags & 0x40) { /* URL_FLag */
+        return NGX_OK;
+    }
+
+    if (flags & 0x20) { /* OCRstreamFlag */
+        pos += 2;
+    }
+
+    if (pos > last) {
+        return NGX_ERROR;
+    }
+
+    (void) id;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: es descriptor es id=%i flags=%i",
+                   (ngx_int_t) id, (ngx_int_t) flags);
+
+    return ngx_rtmp_mp4_parse_descr(s, pos, last);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_descr(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    uint8_t                     tag, v;
+    uint32_t                    size;
+    ngx_uint_t                  n, ndesc;
+    ngx_rtmp_mp4_descriptor_t   *ds;
+
+    ndesc = sizeof(ngx_rtmp_mp4_descriptors)
+          / sizeof(ngx_rtmp_mp4_descriptors[0]);
+
+    while (pos < last) {
+        tag = *(uint8_t *) pos++;
+
+        for (size = 0, n = 0; n < 4; ++n) {
+            if (pos == last) {
+                return NGX_ERROR;
+            }
+
+            v = *(uint8_t *) pos++;
+
+            size = (size << 7) | (v & 0x7f);
+
+            if (!(v & 0x80)) {
+                break;
+            }
+        }
+
+        if (pos + size > last) {
+            return NGX_ERROR;
+        }
+
+        ds = ngx_rtmp_mp4_descriptors;;
+
+        for (n = 0; n < ndesc; ++n, ++ds) {
+            if (tag == ds->tag) {
+                break;
+            }
+        }
+
+        if (n == ndesc) {
+            ds = NULL;
+        }
+
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "mp4: descriptor%s tag=%i size=%uD",
+                ds ? "" : " unhandled", (ngx_int_t) tag, size);
+
+        if (ds && ds->handler(s, pos, pos + size) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        pos += size;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_esds(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    if (pos + 4 > last) {
+        return NGX_ERROR;
+    }
+
+    pos += 4; /* version */
+
+    return ngx_rtmp_mp4_parse_descr(s, pos, last);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_mp3(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    return ngx_rtmp_mp4_parse_audio(s, pos, last, NGX_RTMP_AUDIO_MP3);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_nmos(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    return ngx_rtmp_mp4_parse_audio(s, pos, last, NGX_RTMP_AUDIO_NELLY);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_spex(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    return ngx_rtmp_mp4_parse_audio(s, pos, last, NGX_RTMP_AUDIO_SPEEX);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_stsd(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    if (pos + 8 > last) {
+        return NGX_ERROR;
+    }
+
+    pos += 8;
+
+    ngx_rtmp_mp4_parse(s, pos, last);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_stsc(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    ngx_rtmp_mp4_track_t       *t;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    t = ctx->track;
+
+    if (t == NULL) {
+        return NGX_OK;
+    }
+
+    t->chunks = (ngx_rtmp_mp4_chunks_t *) pos;
+
+    if (pos + sizeof(*t->chunks) + ngx_rtmp_r32(t->chunks->entry_count) *
+                                   sizeof(t->chunks->entries[0])
+        <= last)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: chunks entries=%uD",
+                       ngx_rtmp_r32(t->chunks->entry_count));
+        return NGX_OK;
+    }
+
+    t->chunks = NULL;
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_stts(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    ngx_rtmp_mp4_track_t       *t;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    t = ctx->track;
+
+    if (t == NULL) {
+        return NGX_OK;
+    }
+
+    t->times = (ngx_rtmp_mp4_times_t *) pos;
+
+    if (pos + sizeof(*t->times) + ngx_rtmp_r32(t->times->entry_count) *
+                                  sizeof(t->times->entries[0])
+        <= last)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: times entries=%uD",
+                       ngx_rtmp_r32(t->times->entry_count));
+        return NGX_OK;
+    }
+
+    t->times = NULL;
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_ctts(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    ngx_rtmp_mp4_track_t       *t;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    t = ctx->track;
+
+    if (t == NULL) {
+        return NGX_OK;
+    }
+
+    t->delays = (ngx_rtmp_mp4_delays_t *) pos;
+
+    if (pos + sizeof(*t->delays) + ngx_rtmp_r32(t->delays->entry_count) *
+                                   sizeof(t->delays->entries[0])
+        <= last)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: delays entries=%uD",
+                       ngx_rtmp_r32(t->delays->entry_count));
+        return NGX_OK;
+    }
+
+    t->delays = NULL;
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_stss(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    ngx_rtmp_mp4_track_t       *t;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    t = ctx->track;
+
+    if (t == NULL) {
+        return NGX_OK;
+    }
+
+    t->keys = (ngx_rtmp_mp4_keys_t *) pos;
+
+    if (pos + sizeof(*t->keys) + ngx_rtmp_r32(t->keys->entry_count) *
+                                  sizeof(t->keys->entries[0])
+        <= last)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: keys entries=%uD",
+                       ngx_rtmp_r32(t->keys->entry_count));
+        return NGX_OK;
+    }
+
+    t->keys = NULL;
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_stsz(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    ngx_rtmp_mp4_track_t       *t;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    t = ctx->track;
+
+    if (t == NULL) {
+        return NGX_OK;
+    }
+
+    t->sizes = (ngx_rtmp_mp4_sizes_t *) pos;
+
+    if (pos + sizeof(*t->sizes) <= last && t->sizes->sample_size) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: sizes size=%uD",
+                       ngx_rtmp_r32(t->sizes->sample_size));
+        return NGX_OK;
+    }
+
+    if (pos + sizeof(*t->sizes) + ngx_rtmp_r32(t->sizes->sample_count) *
+                                  sizeof(t->sizes->entries[0])
+        <= last)
+
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: sizes entries=%uD",
+                       ngx_rtmp_r32(t->sizes->sample_count));
+        return NGX_OK;
+    }
+
+    t->sizes = NULL;
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_stz2(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    ngx_rtmp_mp4_track_t       *t;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    t = ctx->track;
+
+    if (t == NULL) {
+        return NGX_OK;
+    }
+
+    t->sizes2 = (ngx_rtmp_mp4_sizes2_t *) pos;
+
+    if (pos + sizeof(*t->sizes) + ngx_rtmp_r32(t->sizes2->sample_count) *
+                                  ngx_rtmp_r32(t->sizes2->field_size) / 8
+        <= last)
+    {
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: sizes2 field_size=%uD entries=%uD",
+                       ngx_rtmp_r32(t->sizes2->field_size),
+                       ngx_rtmp_r32(t->sizes2->sample_count));
+        return NGX_OK;
+    }
+
+    t->sizes2 = NULL;
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_stco(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    ngx_rtmp_mp4_track_t       *t;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    t = ctx->track;
+
+    if (t == NULL) {
+        return NGX_OK;
+    }
+
+    t->offsets = (ngx_rtmp_mp4_offsets_t *) pos;
+
+    if (pos + sizeof(*t->offsets) + ngx_rtmp_r32(t->offsets->entry_count) *
+                                    sizeof(t->offsets->entries[0])
+        <= last)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: offsets entries=%uD",
+                       ngx_rtmp_r32(t->offsets->entry_count));
+        return NGX_OK;
+    }
+
+    t->offsets = NULL;
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse_co64(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    ngx_rtmp_mp4_track_t       *t;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    t = ctx->track;
+
+    if (t == NULL) {
+        return NGX_OK;
+    }
+
+    t->offsets64 = (ngx_rtmp_mp4_offsets64_t *) pos;
+
+    if (pos + sizeof(*t->offsets64) + ngx_rtmp_r32(t->offsets64->entry_count) *
+                                      sizeof(t->offsets64->entries[0])
+        <= last)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: offsets64 entries=%uD",
+                       ngx_rtmp_r32(t->offsets64->entry_count));
+        return NGX_OK;
+    }
+
+    t->offsets64 = NULL;
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_parse(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+{
+    uint32_t                   *hdr, tag;
+    size_t                      size, nboxes;
+    ngx_uint_t                  n;
+    ngx_rtmp_mp4_box_t         *b;
+
+    while (pos != last) {
+        if (pos + 8 > last) {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: too small box: size=%i", last - pos);
+            return NGX_ERROR;
+        }
+
+        hdr = (uint32_t *) pos;
+        size = ngx_rtmp_r32(hdr[0]);
+        tag  = hdr[1];
+
+        if (pos + size > last) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                          "mp4: too big box '%*s': size=%uz",
+                          4, &tag, size);
+            return NGX_ERROR;
+        }
+
+        b = ngx_rtmp_mp4_boxes;
+        nboxes = sizeof(ngx_rtmp_mp4_boxes) / sizeof(ngx_rtmp_mp4_boxes[0]);
+
+        for (n = 0; n < nboxes && b->tag != tag; ++n, ++b);
+
+        if (n == nboxes) {
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: box unhandled '%*s'", 4, &tag);
+        } else {
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: box '%*s'", 4, &tag);
+            b->handler(s, pos + 8, pos + size);
+        }
+
+        pos += size;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_next_time(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t      *cr;
+    ngx_rtmp_mp4_time_entry_t  *te;
+
+    if (t->times == NULL) {
+        return NGX_ERROR;
+    }
+
+    cr = &t->cursor;
+
+    if (cr->time_pos >= ngx_rtmp_r32(t->times->entry_count)) {
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui time[%ui/%uD] overflow",
+                       t->id, cr->time_pos,
+                       ngx_rtmp_r32(t->times->entry_count));
+
+        return NGX_ERROR;
+    }
+
+    te = &t->times->entries[cr->time_pos];
+
+    cr->last_timestamp = cr->timestamp;
+    cr->timestamp += ngx_rtmp_r32(te->sample_delta);
+
+    cr->not_first = 1;
+
+    ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: track#%ui time[%ui] [%ui/%uD][%ui/%uD]=%uD t=%uD",
+                   t->id, cr->pos, cr->time_pos,
+                   ngx_rtmp_r32(t->times->entry_count),
+                   cr->time_count, ngx_rtmp_r32(te->sample_count),
+                   ngx_rtmp_r32(te->sample_delta),
+                   cr->timestamp);
+
+    cr->time_count++;
+    cr->pos++;
+
+    if (cr->time_count >= ngx_rtmp_r32(te->sample_count)) {
+        cr->time_pos++;
+        cr->time_count = 0;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_seek_time(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t,
+                       uint32_t timestamp)
+{
+    ngx_rtmp_mp4_cursor_t      *cr;
+    ngx_rtmp_mp4_time_entry_t  *te;
+    uint32_t                    dt;
+
+    if (t->times == NULL) {
+        return NGX_ERROR;
+    }
+
+    cr = &t->cursor;
+
+    te = t->times->entries;
+
+    while (cr->time_pos < ngx_rtmp_r32(t->times->entry_count)) {
+        dt = ngx_rtmp_r32(te->sample_delta) * ngx_rtmp_r32(te->sample_count);
+
+        if (cr->timestamp + dt >= timestamp) {
+            if (te->sample_delta == 0) {
+                return NGX_ERROR;
+            }
+
+            cr->time_count = (timestamp - cr->timestamp) /
+                             ngx_rtmp_r32(te->sample_delta);
+            cr->timestamp += ngx_rtmp_r32(te->sample_delta) * cr->time_count;
+            cr->pos += cr->time_count;
+
+            break;
+        }
+
+        cr->timestamp += dt;
+        cr->pos += ngx_rtmp_r32(te->sample_count);
+        cr->time_pos++;
+        te++;
+    }
+
+    if (cr->time_pos >= ngx_rtmp_r32(t->times->entry_count)) {
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui seek time[%ui/%uD] overflow",
+                       t->id, cr->time_pos,
+                       ngx_rtmp_r32(t->times->entry_count));
+
+        return  NGX_ERROR;
+    }
+
+    ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: track#%ui seek time[%ui] [%ui/%uD][%ui/%uD]=%uD "
+                   "t=%uD",
+                   t->id, cr->pos, cr->time_pos,
+                   ngx_rtmp_r32(t->times->entry_count),
+                   cr->time_count,
+                   ngx_rtmp_r32(te->sample_count),
+                   ngx_rtmp_r32(te->sample_delta),
+                   cr->timestamp);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_update_offset(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t          *cr;
+    ngx_uint_t                      chunk;
+
+    cr = &t->cursor;
+
+    if (cr->chunk < 1) {
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui offset[%ui] underflow",
+                       t->id, cr->chunk);
+        return NGX_ERROR;
+    }
+
+    chunk = cr->chunk - 1;
+
+    if (t->offsets) {
+        if (chunk >= ngx_rtmp_r32(t->offsets->entry_count)) {
+            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: track#%ui offset[%ui/%uD] overflow",
+                           t->id, cr->chunk,
+                           ngx_rtmp_r32(t->offsets->entry_count));
+
+            return NGX_ERROR;
+        }
+
+        cr->offset = (off_t) ngx_rtmp_r32(t->offsets->entries[chunk]);
+        cr->size = 0;
+
+        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui offset[%ui/%uD]=%O",
+                       t->id, cr->chunk,
+                       ngx_rtmp_r32(t->offsets->entry_count),
+                       cr->offset);
+
+        return NGX_OK;
+    }
+
+    if (t->offsets64) {
+        if (chunk >= ngx_rtmp_r32(t->offsets64->entry_count)) {
+            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: track#%ui offset64[%ui/%uD] overflow",
+                           t->id, cr->chunk,
+                           ngx_rtmp_r32(t->offsets->entry_count));
+
+            return NGX_ERROR;
+        }
+
+        cr->offset = (off_t) ngx_rtmp_r64(t->offsets64->entries[chunk]);
+        cr->size = 0;
+
+        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui offset64[%ui/%uD]=%O",
+                       t->id, cr->chunk,
+                       ngx_rtmp_r32(t->offsets->entry_count),
+                       cr->offset);
+
+        return NGX_OK;
+    }
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_next_chunk(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t          *cr;
+    ngx_rtmp_mp4_chunk_entry_t     *ce, *nce;
+    ngx_int_t                       new_chunk;
+
+    if (t->chunks == NULL) {
+        return NGX_OK;
+    }
+
+    cr = &t->cursor;
+
+    if (cr->chunk_pos >= ngx_rtmp_r32(t->chunks->entry_count)) {
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui chunk[%ui/%uD] overflow",
+                       t->id, cr->chunk_pos,
+                       ngx_rtmp_r32(t->chunks->entry_count));
+
+        return NGX_ERROR;
+    }
+
+    ce = &t->chunks->entries[cr->chunk_pos];
+
+    cr->chunk_count++;
+
+    if (cr->chunk_count >= ngx_rtmp_r32(ce->samples_per_chunk)) {
+        cr->chunk_count = 0;
+        cr->chunk++;
+
+        if (cr->chunk_pos + 1 < ngx_rtmp_r32(t->chunks->entry_count)) {
+            nce = ce + 1;
+            if (cr->chunk >= ngx_rtmp_r32(nce->first_chunk)) {
+                cr->chunk_pos++;
+                ce = nce;
+            }
+        }
+
+        new_chunk = 1;
+
+    } else {
+        new_chunk = 0;
+    }
+
+    ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: track#%ui chunk[%ui/%uD][%uD..%ui][%ui/%uD]",
+                   t->id, cr->chunk_pos,
+                   ngx_rtmp_r32(t->chunks->entry_count),
+                   ngx_rtmp_r32(ce->first_chunk),
+                   cr->chunk, cr->chunk_count,
+                   ngx_rtmp_r32(ce->samples_per_chunk));
+
+
+    if (new_chunk) {
+        return ngx_rtmp_mp4_update_offset(s, t);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_seek_chunk(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t          *cr;
+    ngx_rtmp_mp4_chunk_entry_t     *ce, *nce;
+    ngx_uint_t                      pos, dpos, dchunk;
+
+    cr = &t->cursor;
+
+    if (t->chunks == NULL || t->chunks->entry_count == 0) {
+        cr->chunk = 1;
+        return NGX_OK;
+    }
+
+    ce = t->chunks->entries;
+    pos = 0;
+
+    while (cr->chunk_pos + 1 < ngx_rtmp_r32(t->chunks->entry_count)) {
+        nce = ce + 1;
+
+        dpos = (ngx_rtmp_r32(nce->first_chunk) -
+                ngx_rtmp_r32(ce->first_chunk)) *
+                ngx_rtmp_r32(ce->samples_per_chunk);
+
+        if (pos + dpos > cr->pos) {
+            break;
+        }
+
+        pos += dpos;
+        ce++;
+        cr->chunk_pos++;
+    }
+
+    if (ce->samples_per_chunk == 0) {
+        return NGX_ERROR;
+    }
+
+    dchunk = (cr->pos - pos) / ngx_rtmp_r32(ce->samples_per_chunk);
+
+    cr->chunk = ngx_rtmp_r32(ce->first_chunk) + dchunk;
+    cr->chunk_pos = (ngx_uint_t) (ce - t->chunks->entries);
+    cr->chunk_count = (ngx_uint_t) (cr->pos - pos - dchunk *
+                                    ngx_rtmp_r32(ce->samples_per_chunk));
+
+    ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: track#%ui seek chunk[%ui/%uD][%uD..%ui][%ui/%uD]",
+                   t->id, cr->chunk_pos,
+                   ngx_rtmp_r32(t->chunks->entry_count),
+                   ngx_rtmp_r32(ce->first_chunk),
+                   cr->chunk, cr->chunk_count,
+                   ngx_rtmp_r32(ce->samples_per_chunk));
+
+    return ngx_rtmp_mp4_update_offset(s, t);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_next_size(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t          *cr;
+
+    cr = &t->cursor;
+
+    cr->offset += cr->size;
+
+    if (t->sizes) {
+        if (t->sizes->sample_size) {
+            cr->size = ngx_rtmp_r32(t->sizes->sample_size);
+
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: track#%ui size fix=%uz",
+                           t->id, cr->size);
+
+            return NGX_OK;
+        }
+
+        cr->size_pos++;
+
+        if (cr->size_pos >= ngx_rtmp_r32(t->sizes->sample_count)) {
+            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: track#%ui size[%ui/%uD] overflow",
+                           t->id, cr->size_pos,
+                           ngx_rtmp_r32(t->sizes->sample_count));
+
+            return NGX_ERROR;
+        }
+
+        cr->size = ngx_rtmp_r32(t->sizes->entries[cr->size_pos]);
+
+        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui size[%ui/%uD]=%uz",
+                       t->id, cr->size_pos,
+                       ngx_rtmp_r32(t->sizes->sample_count),
+                       cr->size);
+
+        return NGX_OK;
+    }
+
+    if (t->sizes2) {
+        if (cr->size_pos >= ngx_rtmp_r32(t->sizes2->sample_count)) {
+            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: track#%ui size[%ui/%uD] overflow",
+                           t->id, cr->size_pos,
+                           ngx_rtmp_r32(t->sizes2->sample_count));
+
+            return NGX_ERROR;
+        }
+
+        /*TODO*/
+
+        return NGX_OK;
+    }
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_seek_size(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t      *cr;
+    ngx_uint_t                  pos;
+
+    cr = &t->cursor;
+
+    if (cr->chunk_count > cr->pos) {
+        return NGX_ERROR;
+    }
+
+    if (t->sizes) {
+        if (t->sizes->sample_size) {
+            cr->size = ngx_rtmp_r32(t->sizes->sample_size);
+
+            cr->offset += cr->size * cr->chunk_count;
+
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: track#%ui seek size fix=%uz",
+                           t->id, cr->size);
+
+            return NGX_OK;
+        }
+
+        if (cr->pos >= ngx_rtmp_r32(t->sizes->sample_count)) {
+            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: track#%ui seek size[%ui/%uD] overflow",
+                           t->id, cr->pos,
+                           ngx_rtmp_r32(t->sizes->sample_count));
+
+            return NGX_ERROR;
+        }
+
+        for (pos = 1; pos <= cr->chunk_count; ++pos) {
+            cr->offset += ngx_rtmp_r32(t->sizes->entries[cr->pos - pos]);
+        }
+
+        cr->size_pos = cr->pos;
+        cr->size = ngx_rtmp_r32(t->sizes->entries[cr->size_pos]);
+
+        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui seek size[%ui/%uD]=%uz",
+                       t->id, cr->size_pos,
+                       ngx_rtmp_r32(t->sizes->sample_count),
+                       cr->size);
+
+        return NGX_OK;
+    }
+
+    if (t->sizes2) {
+        if (cr->size_pos >= ngx_rtmp_r32(t->sizes2->sample_count)) {
+            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: track#%ui seek size2[%ui/%uD] overflow",
+                           t->id, cr->size_pos,
+                           ngx_rtmp_r32(t->sizes->sample_count));
+
+            return NGX_ERROR;
+        }
+
+        cr->size_pos = cr->pos;
+
+        /* TODO */
+        return NGX_OK;
+    }
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_next_key(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t          *cr;
+    uint32_t                       *ke;
+
+    cr = &t->cursor;
+
+    if (t->keys == NULL) {
+        return NGX_OK;
+    }
+
+    if (cr->key) {
+        cr->key_pos++;
+    }
+
+    if (cr->key_pos >= ngx_rtmp_r32(t->keys->entry_count)) {
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "mp4: track#%ui key[%ui/%uD] overflow",
+                t->id, cr->key_pos,
+                ngx_rtmp_r32(t->keys->entry_count));
+
+        cr->key = 0;
+
+        return NGX_OK;
+    }
+
+    ke = &t->keys->entries[cr->key_pos];
+    cr->key = (cr->pos + 1 == ngx_rtmp_r32(*ke));
+
+    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: track#%ui key[%ui/%uD][%ui/%uD]=%s",
+                   t->id, cr->key_pos,
+                   ngx_rtmp_r32(t->keys->entry_count),
+                   cr->pos, ngx_rtmp_r32(*ke),
+                   cr->key ? "match" : "miss");
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_seek_key(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t      *cr;
+    uint32_t                   *ke;
+    ngx_int_t                   dpos;
+
+    cr = &t->cursor;
+
+    if (t->keys == NULL) {
+        return NGX_OK;
+    }
+
+    while (cr->key_pos < ngx_rtmp_r32(t->keys->entry_count)) {
+        if (ngx_rtmp_r32(t->keys->entries[cr->key_pos]) > cr->pos) {
+            break;
+        }
+
+        cr->key_pos++;
+    }
+
+    if (cr->key_pos >= ngx_rtmp_r32(t->keys->entry_count)) {
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "mp4: track#%ui seek key[%ui/%uD] overflow",
+                t->id, cr->key_pos,
+                ngx_rtmp_r32(t->keys->entry_count));
+        return NGX_OK;
+    }
+
+    ke = &t->keys->entries[cr->key_pos];
+    /*cr->key = (cr->pos + 1 == ngx_rtmp_r32(*ke));*/
+
+    /* distance to the next keyframe */
+    dpos = ngx_rtmp_r32(*ke) - cr->pos - 1;
+    cr->key = 1;
+
+    /* TODO: range version needed */
+    for (; dpos > 0; --dpos) {
+        ngx_rtmp_mp4_next_time(s, t);
+    }
+
+/*    cr->key = (cr->pos + 1 == ngx_rtmp_r32(*ke));*/
+
+    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: track#%ui seek key[%ui/%uD][%ui/%uD]=%s",
+                   t->id, cr->key_pos,
+                   ngx_rtmp_r32(t->keys->entry_count),
+                   cr->pos, ngx_rtmp_r32(*ke),
+                   cr->key ? "match" : "miss");
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_next_delay(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t          *cr;
+    ngx_rtmp_mp4_delay_entry_t     *de;
+
+    cr = &t->cursor;
+
+    if (t->delays == NULL) {
+        return NGX_OK;
+    }
+
+    if (cr->delay_pos >= ngx_rtmp_r32(t->delays->entry_count)) {
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "mp4: track#%ui delay[%ui/%uD] overflow",
+                t->id, cr->delay_pos,
+                ngx_rtmp_r32(t->delays->entry_count));
+
+        return NGX_OK;
+    }
+
+    cr->delay_count++;
+    de = &t->delays->entries[cr->delay_pos];
+
+    if (cr->delay_count >= ngx_rtmp_r32(de->sample_count)) {
+        cr->delay_pos++;
+        de++;
+        cr->delay_count = 0;
+    }
+
+    if (cr->delay_pos >= ngx_rtmp_r32(t->delays->entry_count)) {
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "mp4: track#%ui delay[%ui/%uD] overflow",
+                t->id, cr->delay_pos,
+                ngx_rtmp_r32(t->delays->entry_count));
+
+        return NGX_OK;
+    }
+
+    cr->delay = ngx_rtmp_r32(de->sample_offset);
+
+    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: track#%ui delay[%ui/%uD][%ui/%uD]=%ui",
+                   t->id, cr->delay_pos,
+                   ngx_rtmp_r32(t->delays->entry_count),
+                   cr->delay_count,
+                   ngx_rtmp_r32(de->sample_count), cr->delay);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_seek_delay(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    ngx_rtmp_mp4_cursor_t      *cr;
+    ngx_rtmp_mp4_delay_entry_t *de;
+    uint32_t                    pos, dpos;
+
+    cr = &t->cursor;
+
+    if (t->delays == NULL) {
+        return NGX_OK;
+    }
+
+    pos = 0;
+    de = t->delays->entries;
+
+    while (cr->delay_pos < ngx_rtmp_r32(t->delays->entry_count)) {
+        dpos = ngx_rtmp_r32(de->sample_count);
+
+        if (pos + dpos > cr->pos) {
+            cr->delay_count = cr->pos - pos;
+            cr->delay = ngx_rtmp_r32(de->sample_offset);
+            break;
+        }
+
+        cr->delay_pos++;
+        pos += dpos;
+        de++;
+    }
+
+    if (cr->delay_pos >= ngx_rtmp_r32(t->delays->entry_count)) {
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "mp4: track#%ui seek delay[%ui/%uD] overflow",
+                t->id, cr->delay_pos,
+                ngx_rtmp_r32(t->delays->entry_count));
+
+        return NGX_OK;
+    }
+
+    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: track#%ui seek delay[%ui/%uD][%ui/%uD]=%ui",
+                   t->id, cr->delay_pos,
+                   ngx_rtmp_r32(t->delays->entry_count),
+                   cr->delay_count,
+                   ngx_rtmp_r32(de->sample_count), cr->delay);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_next(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+{
+    if (ngx_rtmp_mp4_next_time(s, t)  != NGX_OK ||
+        ngx_rtmp_mp4_next_key(s, t)   != NGX_OK ||
+        ngx_rtmp_mp4_next_chunk(s, t) != NGX_OK ||
+        ngx_rtmp_mp4_next_size(s, t)  != NGX_OK ||
+        ngx_rtmp_mp4_next_delay(s, t) != NGX_OK)
+    {
+        t->cursor.valid = 0;
+        return NGX_ERROR;
+    }
+
+    t->cursor.valid = 1;
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_send_meta(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_mp4_ctx_t             *ctx;
+    ngx_rtmp_core_srv_conf_t       *cscf;
+    ngx_int_t                       rc;
+    ngx_uint_t                      n;
+    ngx_rtmp_header_t               h;
+    ngx_chain_t                    *out;
+    ngx_rtmp_mp4_track_t           *t;
+    double                          d;
+
+    static struct {
+        double                      width;
+        double                      height;
+        double                      duration;
+        double                      video_codec_id;
+        double                      audio_codec_id;
+        double                      audio_sample_rate;
+    }                               v;
+
+    static ngx_rtmp_amf_elt_t       out_inf[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("width"),
+          &v.width, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("height"),
+          &v.height, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("displayWidth"),
+          &v.width, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("displayHeight"),
+          &v.height, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("duration"),
+          &v.duration, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("videocodecid"),
+          &v.video_codec_id, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("audiocodecid"),
+          &v.audio_codec_id, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("audiosamplerate"),
+          &v.audio_sample_rate, 0 },
+    };
+
+    static ngx_rtmp_amf_elt_t       out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "onMetaData", 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          out_inf, sizeof(out_inf) },
+    };
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    ngx_memzero(&v, sizeof(v));
+
+    v.width  = ctx->width;
+    v.height = ctx->height;
+    v.audio_sample_rate = ctx->sample_rate;
+
+    t = &ctx->tracks[0];
+    for (n = 0; n < ctx->ntracks; ++n, ++t) {
+        d = ngx_rtmp_mp4_to_rtmp_timestamp(t, t->duration) / 1000.;
+
+        if (v.duration < d) {
+            v.duration = d;
+        }
+
+        switch (t->type) {
+            case NGX_RTMP_MSG_AUDIO:
+                v.audio_codec_id = t->codec;
+                break;
+            case NGX_RTMP_MSG_VIDEO:
+                v.video_codec_id = t->codec;
+                break;
+        }
+    }
+
+    out = NULL;
+    rc = ngx_rtmp_append_amf(s, &out, NULL, out_elts,
+                             sizeof(out_elts) / sizeof(out_elts[0]));
+    if (rc != NGX_OK || out == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memzero(&h, sizeof(h));
+
+    h.csid = NGX_RTMP_CSID_AMF;
+    h.msid = NGX_RTMP_MSID;
+    h.type = NGX_RTMP_MSG_AMF_META;
+
+    ngx_rtmp_prepare_message(s, &h, NULL, out);
+    rc = ngx_rtmp_send_message(s, out, 0);
+    ngx_rtmp_free_shared_chain(cscf, out);
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_seek_track(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t,
+                        ngx_int_t timestamp)
+{
+    ngx_rtmp_mp4_cursor_t          *cr;
+
+    cr = &t->cursor;
+    ngx_memzero(cr, sizeof(*cr));
+
+    if (ngx_rtmp_mp4_seek_time(s, t, ngx_rtmp_mp4_from_rtmp_timestamp(
+                          t, timestamp)) != NGX_OK ||
+        ngx_rtmp_mp4_seek_key(s, t)   != NGX_OK ||
+        ngx_rtmp_mp4_seek_chunk(s, t) != NGX_OK ||
+        ngx_rtmp_mp4_seek_size(s, t)  != NGX_OK ||
+        ngx_rtmp_mp4_seek_delay(s, t) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    cr->valid = 1;
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_send(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t *ts)
+{
+    ngx_rtmp_mp4_ctx_t             *ctx;
+    ngx_buf_t                       in_buf;
+    ngx_rtmp_header_t               h, lh;
+    ngx_rtmp_core_srv_conf_t       *cscf;
+    ngx_chain_t                    *out, in;
+    ngx_rtmp_mp4_track_t           *t, *cur_t;
+    ngx_rtmp_mp4_cursor_t          *cr, *cur_cr;
+    uint32_t                        buflen, end_timestamp,
+                                    timestamp, last_timestamp, rdelay,
+                                    cur_timestamp;
+    ssize_t                         ret;
+    u_char                          fhdr[5];
+    size_t                          fhdr_size;
+    ngx_int_t                       rc;
+    ngx_uint_t                      n, counter;
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    ctx  = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (!ctx->meta_sent) {
+        rc = ngx_rtmp_mp4_send_meta(s);
+
+        if (rc == NGX_OK) {
+            ctx->meta_sent = 1;
+        }
+
+        return rc;
+    }
+
+    buflen = s->buflen + NGX_RTMP_MP4_BUFLEN_ADDON;
+
+    counter = 0;
+    last_timestamp = 0;
+    end_timestamp = ctx->start_timestamp +
+                    (ngx_current_msec - ctx->epoch) + buflen;
+
+    for ( ;; ) {
+        counter++;
+        if (counter > NGX_RTMP_MP4_MAX_FRAMES) {
+            return NGX_OK;
+        }
+
+        timestamp = 0;
+        t = NULL;
+
+        for (n = 0; n < ctx->ntracks; n++) {
+            cur_t = &ctx->tracks[n];
+            cur_cr = &cur_t->cursor;
+
+            if (!cur_cr->valid) {
+                continue;
+            }
+
+            cur_timestamp = ngx_rtmp_mp4_to_rtmp_timestamp(cur_t,
+                                                           cur_cr->timestamp);
+
+            if (t == NULL || cur_timestamp < timestamp) {
+                timestamp = cur_timestamp;
+                t = cur_t;
+            }
+        }
+
+        if (t == NULL) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                    "mp4: no track");
+            return NGX_DONE;
+        }
+
+        if (timestamp > end_timestamp) {
+            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                    "mp4: track#%ui ahead %uD > %uD",
+                    t->id, timestamp, end_timestamp);
+
+            if (ts) {
+                *ts = last_timestamp;
+            }
+
+            return (uint32_t) (timestamp - end_timestamp);
+        }
+
+        cr = &t->cursor;
+
+        last_timestamp = ngx_rtmp_mp4_to_rtmp_timestamp(t, cr->last_timestamp);
+
+        ngx_memzero(&h, sizeof(h));
+
+        h.msid = NGX_RTMP_MSID;
+        h.type = (uint8_t) t->type;
+        h.csid = t->csid;
+
+        lh = h;
+
+        h.timestamp  = timestamp;
+        lh.timestamp = last_timestamp;
+
+        ngx_memzero(&in, sizeof(in));
+        ngx_memzero(&in_buf, sizeof(in_buf));
+
+        if (t->header && !t->header_sent) {
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: track#%ui sending header of size=%uz",
+                           t->id, t->header_size);
+
+            fhdr[0] = t->fhdr;
+            fhdr[1] = 0;
+
+            if (t->type == NGX_RTMP_MSG_VIDEO) {
+                fhdr[0] |= 0x10;
+                fhdr[2] = fhdr[3] = fhdr[4] = 0;
+                fhdr_size = 5;
+            } else {
+                fhdr_size = 2;
+            }
+
+            in.buf = &in_buf;
+            in_buf.pos  = fhdr;
+            in_buf.last = fhdr + fhdr_size;
+
+            out = ngx_rtmp_append_shared_bufs(cscf, NULL, &in);
+
+            in.buf = &in_buf;
+            in_buf.pos  = t->header;
+            in_buf.last = t->header + t->header_size;
+
+            ngx_rtmp_append_shared_bufs(cscf, out, &in);
+
+            ngx_rtmp_prepare_message(s, &h, NULL, out);
+            rc = ngx_rtmp_send_message(s, out, 0);
+            ngx_rtmp_free_shared_chain(cscf, out);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            t->header_sent = 1;
+        }
+
+        ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui read frame offset=%O, size=%uz, "
+                       "timestamp=%uD, last_timestamp=%uD",
+                       t->id, cr->offset, cr->size, timestamp,
+                       last_timestamp);
+
+        ngx_rtmp_mp4_buffer[0] = t->fhdr;
+        fhdr_size = 1;
+
+        if (t->type == NGX_RTMP_MSG_VIDEO) {
+            if (cr->key) {
+                ngx_rtmp_mp4_buffer[0] |= 0x10;
+            } else if (cr->delay) {
+                ngx_rtmp_mp4_buffer[0] |= 0x20;
+            } else {
+                ngx_rtmp_mp4_buffer[0] |= 0x30;
+            }
+
+            if (t->header) {
+                fhdr_size = 5;
+
+                rdelay = ngx_rtmp_mp4_to_rtmp_timestamp(t, cr->delay);
+
+                ngx_rtmp_mp4_buffer[1] = 1;
+                ngx_rtmp_mp4_buffer[2] = (rdelay >> 16) & 0xff;
+                ngx_rtmp_mp4_buffer[3] = (rdelay >> 8)  & 0xff;
+                ngx_rtmp_mp4_buffer[4] = rdelay & 0xff;
+            }
+
+        } else { /* NGX_RTMP_MSG_AUDIO */
+            if (t->header) {
+                fhdr_size = 2;
+                ngx_rtmp_mp4_buffer[1] = 1;
+            }
+        }
+
+        if (cr->size + fhdr_size > sizeof(ngx_rtmp_mp4_buffer)) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "mp4: track#%ui too big frame: %D>%uz",
+                          t->id, cr->size, sizeof(ngx_rtmp_mp4_buffer));
+            goto next;
+        }
+
+        ret = ngx_read_file(f, ngx_rtmp_mp4_buffer + fhdr_size,
+                            cr->size, cr->offset);
+
+        if (ret != (ssize_t) cr->size) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "mp4: track#%ui could not read frame", t->id);
+            goto next;
+        }
+
+        in.buf = &in_buf;
+        in_buf.pos  = ngx_rtmp_mp4_buffer;
+        in_buf.last = ngx_rtmp_mp4_buffer + cr->size + fhdr_size;
+
+        out = ngx_rtmp_append_shared_bufs(cscf, NULL, &in);
+
+        ngx_rtmp_prepare_message(s, &h, cr->not_first ? &lh : NULL, out);
+        rc = ngx_rtmp_send_message(s, out, 0);
+        ngx_rtmp_free_shared_chain(cscf, out);
+
+        if (rc == NGX_AGAIN) {
+            return NGX_AGAIN;
+        }
+
+        s->current_time = timestamp;
+
+next:
+        if (ngx_rtmp_mp4_next(s, t) != NGX_OK) {
+            return NGX_DONE;
+        }
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_init(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_int_t aindex,
+                  ngx_int_t vindex)
+{
+    ngx_rtmp_mp4_ctx_t         *ctx;
+    uint32_t                    hdr[2];
+    ssize_t                     n;
+    size_t                      offset, page_offset, size, shift;
+    uint64_t                    extended_size;
+    ngx_file_info_t             fi;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_mp4_ctx_t));
+
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_mp4_module);
+    }
+
+    ngx_memzero(ctx, sizeof(*ctx));
+
+    ctx->aindex = aindex;
+    ctx->vindex = vindex;
+
+    offset = 0;
+    size   = 0;
+
+    for ( ;; ) {
+        n = ngx_read_file(f, (u_char *) &hdr, sizeof(hdr), offset);
+
+        if (n != sizeof(hdr)) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                          "mp4: error reading file at offset=%uz "
+                          "while searching for moov box", offset);
+            return NGX_ERROR;
+        }
+
+        size = (size_t) ngx_rtmp_r32(hdr[0]);
+        shift = sizeof(hdr);
+
+        if (size == 1) {
+            n = ngx_read_file(f, (u_char *) &extended_size,
+                              sizeof(extended_size), offset + sizeof(hdr));
+
+            if (n != sizeof(extended_size)) {
+                ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                              "mp4: error reading file at offset=%uz "
+                              "while searching for moov box", offset + 8);
+                return NGX_ERROR;
+            }
+
+            size = (size_t) ngx_rtmp_r64(extended_size);
+            shift += sizeof(extended_size);
+
+        } else if (size == 0) {
+            if (ngx_fd_info(f->fd, &fi) == NGX_FILE_ERROR) {
+                ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                              "mp4: " ngx_fd_info_n " failed");
+                return NGX_ERROR;
+            }
+            size = ngx_file_size(&fi) - offset;
+        }
+
+        if (hdr[1] == ngx_rtmp_mp4_make_tag('m','o','o','v')) {
+            ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "mp4: found moov box");
+            break;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: skipping box '%*s'", 4, hdr + 1);
+
+        offset += size;
+    }
+
+    if (size < shift) {
+        return NGX_ERROR;
+    }
+
+    size   -= shift;
+    offset += shift;
+
+    page_offset = offset & (ngx_pagesize - 1);
+    ctx->mmaped_size = page_offset + size;
+
+    ctx->mmaped = ngx_rtmp_mp4_mmap(f->fd, ctx->mmaped_size,
+                                    offset - page_offset, &ctx->extra);
+    if (ctx->mmaped == NULL) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "mp4: mmap failed at offset=%ui, size=%uz",
+                      offset, size);
+        return NGX_ERROR;
+    }
+
+    return ngx_rtmp_mp4_parse(s, (u_char *) ctx->mmaped + page_offset,
+                                 (u_char *) ctx->mmaped + page_offset + size);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_done(ngx_rtmp_session_t *s, ngx_file_t *f)
+{
+    ngx_rtmp_mp4_ctx_t            *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx == NULL || ctx->mmaped == NULL) {
+        return NGX_OK;
+    }
+
+    if (ngx_rtmp_mp4_munmap(ctx->mmaped, ctx->mmaped_size, &ctx->extra)
+        != NGX_OK)
+    {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                      "mp4: munmap failed");
+        return NGX_ERROR;
+    }
+
+    ctx->mmaped = NULL;
+    ctx->mmaped_size = 0;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_seek(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t timestamp)
+{
+    ngx_rtmp_mp4_ctx_t     *ctx;
+    ngx_rtmp_mp4_track_t   *t;
+    ngx_uint_t              n;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: seek timestamp=%ui", timestamp);
+
+    for (n = 0; n < ctx->ntracks; ++n) {
+        t = &ctx->tracks[n];
+
+        if (t->type != NGX_RTMP_MSG_VIDEO) {
+            continue;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui seek video", n);
+
+        ngx_rtmp_mp4_seek_track(s, t, timestamp);
+
+        timestamp = ngx_rtmp_mp4_to_rtmp_timestamp(t, t->cursor.timestamp);
+
+        break;
+    }
+
+    for (n = 0; n < ctx->ntracks; ++n) {
+        t = &ctx->tracks[n];
+
+        if (t->type == NGX_RTMP_MSG_VIDEO) {
+            continue;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "mp4: track#%ui seek", n);
+
+        ngx_rtmp_mp4_seek_track(s, &ctx->tracks[n], timestamp);
+    }
+
+    ctx->start_timestamp = timestamp;
+    ctx->epoch = ngx_current_msec;
+
+    return ngx_rtmp_mp4_reset(s);
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_start(ngx_rtmp_session_t *s, ngx_file_t *f)
+{
+    ngx_rtmp_mp4_ctx_t     *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: start timestamp=%uD", ctx->start_timestamp);
+
+    ctx->epoch = ngx_current_msec;
+
+    return NGX_OK;/*ngx_rtmp_mp4_reset(s);*/
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_reset(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_mp4_ctx_t     *ctx;
+    ngx_rtmp_mp4_cursor_t  *cr;
+    ngx_rtmp_mp4_track_t   *t;
+    ngx_uint_t              n;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    t = &ctx->tracks[0];
+    for (n = 0; n < ctx->ntracks; ++n, ++t) {
+        cr = &t->cursor;
+        cr->not_first = 0;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_stop(ngx_rtmp_session_t *s, ngx_file_t *f)
+{
+    ngx_rtmp_mp4_ctx_t     *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    ctx->start_timestamp += (ngx_current_msec - ctx->epoch);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "mp4: stop timestamp=%uD", ctx->start_timestamp);
+
+    return NGX_OK;/*ngx_rtmp_mp4_reset(s);*/
+}
+
+
+static ngx_int_t
+ngx_rtmp_mp4_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_play_main_conf_t      *pmcf;
+    ngx_rtmp_play_fmt_t           **pfmt, *fmt;
+
+    pmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_play_module);
+
+    pfmt = ngx_array_push(&pmcf->fmts);
+
+    if (pfmt == NULL) {
+        return NGX_ERROR;
+    }
+
+    fmt = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_fmt_t));
+
+    if (fmt == NULL) {
+        return NGX_ERROR;
+    }
+
+    *pfmt = fmt;
+
+    ngx_str_set(&fmt->name, "mp4-format");
+
+    ngx_str_set(&fmt->pfx, "mp4:");
+    ngx_str_set(&fmt->sfx, ".mp4");
+
+    fmt->init  = ngx_rtmp_mp4_init;
+    fmt->done  = ngx_rtmp_mp4_done;
+    fmt->seek  = ngx_rtmp_mp4_seek;
+    fmt->start = ngx_rtmp_mp4_start;
+    fmt->stop  = ngx_rtmp_mp4_stop;
+    fmt->send  = ngx_rtmp_mp4_send;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.c
new file mode 100644
index 0000000..f772c72
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.c
@@ -0,0 +1,725 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_netcall_module.h"
+
+
+static ngx_int_t ngx_rtmp_netcall_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_netcall_create_srv_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_netcall_merge_srv_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+
+static void ngx_rtmp_netcall_close(ngx_connection_t *cc);
+static void ngx_rtmp_netcall_detach(ngx_connection_t *cc);
+
+static void ngx_rtmp_netcall_recv(ngx_event_t *rev);
+static void ngx_rtmp_netcall_send(ngx_event_t *wev);
+
+
+typedef struct {
+    ngx_msec_t                                  timeout;
+    size_t                                      bufsize;
+    ngx_log_t                                  *log;
+} ngx_rtmp_netcall_srv_conf_t;
+
+
+typedef struct ngx_rtmp_netcall_session_s {
+    ngx_rtmp_session_t                         *session;
+    ngx_peer_connection_t                      *pc;
+    ngx_url_t                                  *url;
+    struct ngx_rtmp_netcall_session_s          *next;
+    void                                       *arg;
+    ngx_rtmp_netcall_handle_pt                  handle;
+    ngx_rtmp_netcall_filter_pt                  filter;
+    ngx_rtmp_netcall_sink_pt                    sink;
+    ngx_chain_t                                *in;
+    ngx_chain_t                                *inlast;
+    ngx_chain_t                                *out;
+    ngx_msec_t                                  timeout;
+    unsigned                                    detached:1;
+    size_t                                      bufsize;
+} ngx_rtmp_netcall_session_t;
+
+
+typedef struct {
+    ngx_rtmp_netcall_session_t                 *cs;
+} ngx_rtmp_netcall_ctx_t;
+
+
+static ngx_command_t  ngx_rtmp_netcall_commands[] = {
+
+    { ngx_string("netcall_timeout"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_netcall_srv_conf_t, timeout),
+      NULL },
+
+    { ngx_string("netcall_buffer"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      offsetof(ngx_rtmp_netcall_srv_conf_t, bufsize),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_netcall_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_netcall_postconfiguration,     /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    ngx_rtmp_netcall_create_srv_conf,       /* create server configuration */
+    ngx_rtmp_netcall_merge_srv_conf,        /* merge server configuration */
+    NULL,                                   /* create app configuration */
+    NULL                                    /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_netcall_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_netcall_module_ctx,           /* module context */
+    ngx_rtmp_netcall_commands,              /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_rtmp_netcall_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_netcall_srv_conf_t     *nscf;
+
+    nscf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_netcall_srv_conf_t));
+    if (nscf == NULL) {
+        return NULL;
+    }
+
+    nscf->timeout = NGX_CONF_UNSET_MSEC;
+    nscf->bufsize = NGX_CONF_UNSET_SIZE;
+
+    nscf->log = &cf->cycle->new_log;
+
+    return nscf;
+}
+
+
+static char *
+ngx_rtmp_netcall_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_netcall_srv_conf_t *prev = parent;
+    ngx_rtmp_netcall_srv_conf_t *conf = child;
+
+    ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 10000);
+    ngx_conf_merge_size_value(conf->bufsize, prev->bufsize, 1024);
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_netcall_disconnect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    ngx_rtmp_netcall_ctx_t         *ctx;
+    ngx_rtmp_netcall_session_t     *cs;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_netcall_module);
+
+    if (ctx) {
+        for (cs = ctx->cs; cs; cs = cs->next) {
+            ngx_rtmp_netcall_detach(cs->pc->connection);
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_netcall_get_peer(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_rtmp_netcall_session_t   *cs = data;
+
+    pc->sockaddr =(struct sockaddr *)&cs->url->sockaddr;
+    pc->socklen = cs->url->socklen;
+    pc->name = &cs->url->host;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_netcall_free_peer(ngx_peer_connection_t *pc, void *data,
+            ngx_uint_t state)
+{
+}
+
+
+ngx_int_t
+ngx_rtmp_netcall_create(ngx_rtmp_session_t *s, ngx_rtmp_netcall_init_t *ci)
+{
+    ngx_rtmp_netcall_ctx_t         *ctx;
+    ngx_peer_connection_t          *pc;
+    ngx_rtmp_netcall_session_t     *cs;
+    ngx_rtmp_netcall_srv_conf_t    *nscf;
+    ngx_connection_t               *c, *cc;
+    ngx_pool_t                     *pool;
+    ngx_int_t                       rc;
+
+    pool = NULL;
+    c = s->connection;
+
+    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_netcall_module);
+    if (nscf == NULL) {
+        goto error;
+    }
+
+    /* get module context */
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_netcall_module);
+    if (ctx == NULL) {
+        ctx = ngx_pcalloc(c->pool,
+                sizeof(ngx_rtmp_netcall_ctx_t));
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_netcall_module);
+    }
+
+    /* Create netcall pool, connection, session.
+     * Note we use shared (app-wide) log because
+     * s->connection->log might be unavailable
+     * in detached netcall when it's being closed */
+    pool = ngx_create_pool(4096, nscf->log);
+    if (pool == NULL) {
+        goto error;
+    }
+
+    pc = ngx_pcalloc(pool, sizeof(ngx_peer_connection_t));
+    if (pc == NULL) {
+        goto error;
+    }
+
+    cs = ngx_pcalloc(pool, sizeof(ngx_rtmp_netcall_session_t));
+    if (cs == NULL) {
+        goto error;
+    }
+
+    /* copy arg to connection pool */
+    if (ci->argsize) {
+        cs->arg = ngx_pcalloc(pool, ci->argsize);
+        if (cs->arg == NULL) {
+            goto error;
+        }
+        ngx_memcpy(cs->arg, ci->arg, ci->argsize);
+    }
+
+    cs->timeout = nscf->timeout;
+    cs->bufsize = nscf->bufsize;
+    cs->url = ci->url;
+    cs->session = s;
+    cs->filter = ci->filter;
+    cs->sink = ci->sink;
+    cs->handle = ci->handle;
+    if (cs->handle == NULL) {
+        cs->detached = 1;
+    }
+
+    pc->log = nscf->log;
+    pc->get = ngx_rtmp_netcall_get_peer;
+    pc->free = ngx_rtmp_netcall_free_peer;
+    pc->data = cs;
+
+    /* connect */
+    rc = ngx_event_connect_peer(pc);
+    if (rc != NGX_OK && rc != NGX_AGAIN ) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "netcall: connection failed");
+        goto error;
+    }
+
+    cc = pc->connection;
+    cc->data = cs;
+    cc->pool = pool;
+    cs->pc = pc;
+
+    cs->out = ci->create(s, ci->arg, pool);
+    if (cs->out == NULL) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "netcall: creation failed");
+        ngx_close_connection(pc->connection);
+        goto error;
+    }
+
+    cc->write->handler = ngx_rtmp_netcall_send;
+    cc->read->handler = ngx_rtmp_netcall_recv;
+
+    if (!cs->detached) {
+        cs->next = ctx->cs;
+        ctx->cs = cs;
+    }
+
+    ngx_rtmp_netcall_send(cc->write);
+
+    return c->destroyed ? NGX_ERROR : NGX_OK;
+
+error:
+    if (pool) {
+        ngx_destroy_pool(pool);
+    }
+
+    return NGX_ERROR;
+}
+
+
+static void
+ngx_rtmp_netcall_close(ngx_connection_t *cc)
+{
+    ngx_rtmp_netcall_session_t         *cs, **css;
+    ngx_pool_t                         *pool;
+    ngx_rtmp_session_t                 *s;
+    ngx_rtmp_netcall_ctx_t             *ctx;
+    ngx_buf_t                          *b;
+
+    cs = cc->data;
+
+    if (cc->destroyed) {
+        return;
+    }
+
+    cc->destroyed = 1;
+
+    if (!cs->detached) {
+        s = cs->session;
+        ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_netcall_module);
+
+        if (cs->in && cs->sink) {
+            cs->sink(cs->session, cs->in);
+
+            b = cs->in->buf;
+            b->pos = b->last = b->start;
+
+        }
+
+        for(css = &ctx->cs; *css; css = &((*css)->next)) {
+            if (*css == cs) {
+                *css = cs->next;
+                break;
+            }
+        }
+
+        if (cs->handle && cs->handle(s, cs->arg, cs->in) != NGX_OK) {
+            ngx_rtmp_finalize_session(s);
+        }
+    }
+
+    pool = cc->pool;
+    ngx_close_connection(cc);
+    ngx_destroy_pool(pool);
+}
+
+
+static void
+ngx_rtmp_netcall_detach(ngx_connection_t *cc)
+{
+    ngx_rtmp_netcall_session_t         *cs;
+
+    cs = cc->data;
+    cs->detached = 1;
+}
+
+
+static void
+ngx_rtmp_netcall_recv(ngx_event_t *rev)
+{
+    ngx_rtmp_netcall_session_t         *cs;
+    ngx_connection_t                   *cc;
+    ngx_chain_t                        *cl;
+    ngx_int_t                           n;
+    ngx_buf_t                          *b;
+
+    cc = rev->data;
+    cs = cc->data;
+
+    if (cc->destroyed) {
+        return;
+    }
+
+    if (rev->timedout) {
+        cc->timedout = 1;
+        ngx_rtmp_netcall_close(cc);
+        return;
+    }
+
+    if (rev->timer_set) {
+        ngx_del_timer(rev);
+    }
+
+    for ( ;; ) {
+
+        if (cs->inlast == NULL ||
+            cs->inlast->buf->last == cs->inlast->buf->end)
+        {
+            if (cs->in && cs->sink) {
+                if (!cs->detached) {
+                    if (cs->sink(cs->session, cs->in) != NGX_OK) {
+                        ngx_rtmp_netcall_close(cc);
+                        return;
+                    }
+                }
+
+                b = cs->in->buf;
+                b->pos = b->last = b->start;
+
+            } else {
+                cl = ngx_alloc_chain_link(cc->pool);
+                if (cl == NULL) {
+                    ngx_rtmp_netcall_close(cc);
+                    return;
+                }
+
+                cl->next = NULL;
+
+                cl->buf = ngx_create_temp_buf(cc->pool, cs->bufsize);
+                if (cl->buf == NULL) {
+                    ngx_rtmp_netcall_close(cc);
+                    return;
+                }
+
+                if (cs->in == NULL) {
+                    cs->in = cl;
+                } else {
+                    cs->inlast->next = cl;
+                }
+
+                cs->inlast = cl;
+            }
+        }
+
+        b = cs->inlast->buf;
+
+        n = cc->recv(cc, b->last, b->end - b->last);
+
+        if (n == NGX_ERROR || n == 0) {
+            ngx_rtmp_netcall_close(cc);
+            return;
+        }
+
+        if (n == NGX_AGAIN) {
+            if (cs->filter && cs->in
+                && cs->filter(cs->in) != NGX_AGAIN)
+            {
+                ngx_rtmp_netcall_close(cc);
+                return;
+            }
+
+            ngx_add_timer(rev, cs->timeout);
+            if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+                ngx_rtmp_netcall_close(cc);
+            }
+            return;
+        }
+
+        b->last += n;
+    }
+}
+
+
+static void
+ngx_rtmp_netcall_send(ngx_event_t *wev)
+{
+    ngx_rtmp_netcall_session_t         *cs;
+    ngx_connection_t                   *cc;
+    ngx_chain_t                        *cl;
+
+    cc = wev->data;
+    cs = cc->data;
+
+    if (cc->destroyed) {
+        return;
+    }
+
+    if (wev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, cc->log, NGX_ETIMEDOUT,
+                "netcall: client send timed out");
+        cc->timedout = 1;
+        ngx_rtmp_netcall_close(cc);
+        return;
+    }
+
+    if (wev->timer_set) {
+        ngx_del_timer(wev);
+    }
+
+    cl = cc->send_chain(cc, cs->out, 0);
+
+    if (cl == NGX_CHAIN_ERROR) {
+        ngx_rtmp_netcall_close(cc);
+        return;
+    }
+
+    cs->out = cl;
+
+    /* more data to send? */
+    if (cl) {
+        ngx_add_timer(wev, cs->timeout);
+        if (ngx_handle_write_event(wev, 0) != NGX_OK) {
+            ngx_rtmp_netcall_close(cc);
+        }
+        return;
+    }
+
+    /* we've sent everything we had.
+     * now receive reply */
+    ngx_del_event(wev, NGX_WRITE_EVENT, 0);
+
+    ngx_rtmp_netcall_recv(cc->read);
+}
+
+
+ngx_chain_t *
+ngx_rtmp_netcall_http_format_request(ngx_int_t method, ngx_str_t *host,
+                                     ngx_str_t *uri, ngx_chain_t *args,
+                                     ngx_chain_t *body, ngx_pool_t *pool,
+                                     ngx_str_t *content_type)
+{
+    ngx_chain_t                    *al, *bl, *ret;
+    ngx_buf_t                      *b;
+    size_t                          content_length;
+    static const char              *methods[2] = { "GET", "POST" };
+    static const char               rq_tmpl[] = " HTTP/1.0\r\n"
+                                                "Host: %V\r\n"
+                                                "Content-Type: %V\r\n"
+                                                "Connection: Close\r\n"
+                                                "Content-Length: %uz\r\n"
+                                                "\r\n";
+
+    content_length = 0;
+    for (al = body; al; al = al->next) {
+        b = al->buf;
+        content_length += (b->last - b->pos);
+    }
+
+    /* create first buffer */
+
+    al = ngx_alloc_chain_link(pool);
+    if (al == NULL) {
+        return NULL;
+    }
+
+    b = ngx_create_temp_buf(pool, sizeof("POST") + /* longest method + 1 */
+                                  uri->len);
+    if (b == NULL) {
+        return NULL;
+    }
+
+    b->last = ngx_snprintf(b->last, b->end - b->last, "%s %V",
+                           methods[method], uri);
+
+    al->buf = b;
+
+    ret = al;
+
+    if (args) {
+        *b->last++ = '?';
+        al->next = args;
+        for (al = args; al->next; al = al->next);
+    }
+
+    /* create second buffer */
+
+    bl = ngx_alloc_chain_link(pool);
+    if (bl == NULL) {
+        return NULL;
+    }
+
+    b = ngx_create_temp_buf(pool, sizeof(rq_tmpl) + host->len +
+                            content_type->len + NGX_SIZE_T_LEN);
+    if (b == NULL) {
+        return NULL;
+    }
+
+    bl->buf = b;
+
+    b->last = ngx_snprintf(b->last, b->end - b->last, rq_tmpl,
+                           host, content_type, content_length);
+
+    al->next = bl;
+    bl->next = body;
+
+    return ret;
+}
+
+
+ngx_chain_t *
+ngx_rtmp_netcall_http_format_session(ngx_rtmp_session_t *s, ngx_pool_t *pool)
+{
+    ngx_chain_t                    *cl;
+    ngx_buf_t                      *b;
+    ngx_str_t                      *addr_text;
+
+    addr_text = &s->connection->addr_text;
+
+    cl = ngx_alloc_chain_link(pool);
+    if (cl == NULL) {
+        return NULL;
+    }
+
+    b = ngx_create_temp_buf(pool,
+            sizeof("app=") - 1 + s->app.len * 3 +
+            sizeof("&flashver=") - 1 + s->flashver.len * 3 +
+            sizeof("&swfurl=") - 1 + s->swf_url.len * 3 +
+            sizeof("&tcurl=") - 1 + s->tc_url.len * 3 +
+            sizeof("&pageurl=") - 1 + s->page_url.len * 3 +
+            sizeof("&addr=") - 1 + addr_text->len * 3 +
+            sizeof("&clientid=") - 1 + NGX_INT_T_LEN
+        );
+
+    if (b == NULL) {
+        return NULL;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    b->last = ngx_cpymem(b->last, (u_char*) "app=", sizeof("app=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, s->app.data, s->app.len,
+                                       NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&flashver=",
+                         sizeof("&flashver=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, s->flashver.data,
+                                       s->flashver.len, NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&swfurl=",
+                         sizeof("&swfurl=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, s->swf_url.data,
+                                       s->swf_url.len, NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&tcurl=",
+                         sizeof("&tcurl=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, s->tc_url.data,
+                                       s->tc_url.len, NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&pageurl=",
+                         sizeof("&pageurl=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, s->page_url.data,
+                                       s->page_url.len, NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&addr=", sizeof("&addr=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, addr_text->data,
+                                       addr_text->len, NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&clientid=",
+                         sizeof("&clientid=") - 1);
+    b->last = ngx_sprintf(b->last, "%ui", (ngx_uint_t) s->connection->number);
+
+    return cl;
+}
+
+
+ngx_chain_t *
+ngx_rtmp_netcall_http_skip_header(ngx_chain_t *in)
+{
+    ngx_buf_t       *b;
+
+    /* find \n[\r]\n */
+    enum {
+        normal,
+        lf,
+        lfcr
+    } state = normal;
+
+    if (in == NULL) {
+        return NULL;
+    }
+
+    b = in->buf;
+
+    for ( ;; ) {
+
+        while (b->pos == b->last) {
+            in = in->next;
+            if (in == NULL) {
+                return NULL;
+            }
+            b = in->buf;
+        }
+
+        switch (*b->pos++) {
+            case '\r':
+                state = (state == lf) ? lfcr : normal;
+                break;
+
+            case '\n':
+                if (state != normal) {
+                    return in;
+                }
+                state = lf;
+                break;
+
+           default:
+                state = normal;
+        }
+    }
+}
+
+
+ngx_chain_t *
+ngx_rtmp_netcall_memcache_set(ngx_rtmp_session_t *s, ngx_pool_t *pool,
+        ngx_str_t *key, ngx_str_t *value, ngx_uint_t flags, ngx_uint_t sec)
+{
+    ngx_chain_t                    *cl;
+    ngx_buf_t                      *b;
+
+    cl = ngx_alloc_chain_link(pool);
+    if (cl == NULL) {
+        return NULL;
+    }
+
+    b = ngx_create_temp_buf(pool, sizeof("set ") - 1 + key->len +
+                            (1 + NGX_INT_T_LEN) * 3 +
+                            (sizeof("\r\n") - 1) * 2 + value->len);
+
+    if (b == NULL) {
+        return NULL;
+    }
+
+    cl->next = NULL;
+    cl->buf = b;
+
+    b->last = ngx_sprintf(b->pos, "set %V %ui %ui %ui\r\n%V\r\n",
+                          key, flags, sec, (ngx_uint_t) value->len, value);
+
+    return cl;
+}
+
+
+static ngx_int_t
+ngx_rtmp_netcall_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t          *cmcf;
+    ngx_rtmp_handler_pt                *h;
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
+    *h = ngx_rtmp_netcall_disconnect;
+
+    return NGX_OK;
+}
+
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.h b/debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.h
new file mode 100644
index 0000000..4dfa6c0
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.h
@@ -0,0 +1,67 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_NETCALL_H_INCLUDED_
+#define _NGX_RTMP_NETCALL_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+
+
+typedef ngx_chain_t * (*ngx_rtmp_netcall_create_pt)(ngx_rtmp_session_t *s,
+        void *arg, ngx_pool_t *pool);
+typedef ngx_int_t (*ngx_rtmp_netcall_filter_pt)(ngx_chain_t *in);
+typedef ngx_int_t (*ngx_rtmp_netcall_sink_pt)(ngx_rtmp_session_t *s,
+        ngx_chain_t *in);
+typedef ngx_int_t (*ngx_rtmp_netcall_handle_pt)(ngx_rtmp_session_t *s,
+        void *arg, ngx_chain_t *in);
+
+#define NGX_RTMP_NETCALL_HTTP_GET   0
+#define NGX_RTMP_NETCALL_HTTP_POST  1
+
+
+/* If handle is NULL then netcall is created detached
+ * which means it's completely independent of RTMP
+ * session and its result is never visible to anyone.
+ *
+ * WARNING: It's not recommended to create non-detached
+ * netcalls from disconect handlers. Netcall disconnect
+ * handler which detaches active netcalls is executed
+ * BEFORE your handler. It leads to a crash
+ * after netcall connection is closed */
+typedef struct {
+    ngx_url_t                      *url;
+    ngx_rtmp_netcall_create_pt      create;
+    ngx_rtmp_netcall_filter_pt      filter;
+    ngx_rtmp_netcall_sink_pt        sink;
+    ngx_rtmp_netcall_handle_pt      handle;
+    void                           *arg;
+    size_t                          argsize;
+} ngx_rtmp_netcall_init_t;
+
+
+ngx_int_t ngx_rtmp_netcall_create(ngx_rtmp_session_t *s,
+        ngx_rtmp_netcall_init_t *ci);
+
+
+/* HTTP handling */
+ngx_chain_t * ngx_rtmp_netcall_http_format_session(ngx_rtmp_session_t *s,
+        ngx_pool_t *pool);
+ngx_chain_t * ngx_rtmp_netcall_http_format_request(ngx_int_t method,
+        ngx_str_t *host, ngx_str_t *uri, ngx_chain_t *args, ngx_chain_t *body,
+        ngx_pool_t *pool, ngx_str_t *content_type);
+ngx_chain_t * ngx_rtmp_netcall_http_skip_header(ngx_chain_t *in);
+
+
+/* Memcache handling */
+ngx_chain_t * ngx_rtmp_netcall_memcache_set(ngx_rtmp_session_t *s,
+        ngx_pool_t *pool, ngx_str_t *key, ngx_str_t *value,
+        ngx_uint_t flags, ngx_uint_t sec);
+
+
+#endif /* _NGX_RTMP_NETCALL_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_notify_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_notify_module.c
new file mode 100644
index 0000000..2fcfffb
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_notify_module.c
@@ -0,0 +1,1728 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_md5.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_cmd_module.h"
+#include "ngx_rtmp_netcall_module.h"
+#include "ngx_rtmp_record_module.h"
+#include "ngx_rtmp_relay_module.h"
+
+
+static ngx_rtmp_connect_pt                      next_connect;
+static ngx_rtmp_disconnect_pt                   next_disconnect;
+static ngx_rtmp_publish_pt                      next_publish;
+static ngx_rtmp_play_pt                         next_play;
+static ngx_rtmp_close_stream_pt                 next_close_stream;
+static ngx_rtmp_record_done_pt                  next_record_done;
+
+
+static char *ngx_rtmp_notify_on_srv_event(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static char *ngx_rtmp_notify_on_app_event(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static char *ngx_rtmp_notify_method(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static ngx_int_t ngx_rtmp_notify_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_notify_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_notify_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+static void *ngx_rtmp_notify_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_rtmp_notify_merge_srv_conf(ngx_conf_t *cf, void *parent,
+       void *child);
+static ngx_int_t ngx_rtmp_notify_done(ngx_rtmp_session_t *s, char *cbname,
+       ngx_uint_t url_idx);
+
+
+ngx_str_t   ngx_rtmp_notify_urlencoded =
+            ngx_string("application/x-www-form-urlencoded");
+
+
+#define NGX_RTMP_NOTIFY_PUBLISHING              0x01
+#define NGX_RTMP_NOTIFY_PLAYING                 0x02
+
+
+enum {
+    NGX_RTMP_NOTIFY_PLAY,
+    NGX_RTMP_NOTIFY_PUBLISH,
+    NGX_RTMP_NOTIFY_PLAY_DONE,
+    NGX_RTMP_NOTIFY_PUBLISH_DONE,
+    NGX_RTMP_NOTIFY_DONE,
+    NGX_RTMP_NOTIFY_RECORD_DONE,
+    NGX_RTMP_NOTIFY_UPDATE,
+    NGX_RTMP_NOTIFY_APP_MAX
+};
+
+
+enum {
+    NGX_RTMP_NOTIFY_CONNECT,
+    NGX_RTMP_NOTIFY_DISCONNECT,
+    NGX_RTMP_NOTIFY_SRV_MAX
+};
+
+
+typedef struct {
+    ngx_url_t                                  *url[NGX_RTMP_NOTIFY_APP_MAX];
+    ngx_flag_t                                  active;
+    ngx_uint_t                                  method;
+    ngx_msec_t                                  update_timeout;
+    ngx_flag_t                                  update_strict;
+    ngx_flag_t                                  relay_redirect;
+} ngx_rtmp_notify_app_conf_t;
+
+
+typedef struct {
+    ngx_url_t                                  *url[NGX_RTMP_NOTIFY_SRV_MAX];
+    ngx_uint_t                                  method;
+} ngx_rtmp_notify_srv_conf_t;
+
+
+typedef struct {
+    ngx_uint_t                                  flags;
+    u_char                                      name[NGX_RTMP_MAX_NAME];
+    u_char                                      args[NGX_RTMP_MAX_ARGS];
+    ngx_event_t                                 update_evt;
+    time_t                                      start;
+} ngx_rtmp_notify_ctx_t;
+
+
+typedef struct {
+    u_char                                     *cbname;
+    ngx_uint_t                                  url_idx;
+} ngx_rtmp_notify_done_t;
+
+
+static ngx_command_t  ngx_rtmp_notify_commands[] = {
+
+    { ngx_string("on_connect"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_notify_on_srv_event,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("on_disconnect"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_notify_on_srv_event,
+      NGX_RTMP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("on_publish"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_notify_on_app_event,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("on_play"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_notify_on_app_event,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("on_publish_done"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_notify_on_app_event,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("on_play_done"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_notify_on_app_event,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("on_done"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_notify_on_app_event,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("on_record_done"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_RTMP_REC_CONF|
+                         NGX_CONF_TAKE1,
+      ngx_rtmp_notify_on_app_event,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("on_update"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_notify_on_app_event,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("notify_method"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_rtmp_notify_method,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("notify_update_timeout"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_notify_app_conf_t, update_timeout),
+      NULL },
+
+    { ngx_string("notify_update_strict"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_notify_app_conf_t, update_strict),
+      NULL },
+
+    { ngx_string("notify_relay_redirect"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_notify_app_conf_t, relay_redirect),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_notify_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_notify_postconfiguration,      /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    ngx_rtmp_notify_create_srv_conf,        /* create server configuration */
+    ngx_rtmp_notify_merge_srv_conf,         /* merge server configuration */
+    ngx_rtmp_notify_create_app_conf,        /* create app configuration */
+    ngx_rtmp_notify_merge_app_conf          /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_notify_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_notify_module_ctx,            /* module context */
+    ngx_rtmp_notify_commands,               /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_rtmp_notify_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_notify_app_conf_t     *nacf;
+    ngx_uint_t                      n;
+
+    nacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_notify_app_conf_t));
+    if (nacf == NULL) {
+        return NULL;
+    }
+
+    for (n = 0; n < NGX_RTMP_NOTIFY_APP_MAX; ++n) {
+        nacf->url[n] = NGX_CONF_UNSET_PTR;
+    }
+
+    nacf->method = NGX_CONF_UNSET_UINT;
+    nacf->update_timeout = NGX_CONF_UNSET_MSEC;
+    nacf->update_strict = NGX_CONF_UNSET;
+    nacf->relay_redirect = NGX_CONF_UNSET;
+
+    return nacf;
+}
+
+
+static char *
+ngx_rtmp_notify_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_notify_app_conf_t *prev = parent;
+    ngx_rtmp_notify_app_conf_t *conf = child;
+    ngx_uint_t                  n;
+
+    for (n = 0; n < NGX_RTMP_NOTIFY_APP_MAX; ++n) {
+        ngx_conf_merge_ptr_value(conf->url[n], prev->url[n], NULL);
+        if (conf->url[n]) {
+            conf->active = 1;
+        }
+    }
+
+    if (conf->active) {
+        prev->active = 1;
+    }
+
+    ngx_conf_merge_uint_value(conf->method, prev->method,
+                              NGX_RTMP_NETCALL_HTTP_POST);
+    ngx_conf_merge_msec_value(conf->update_timeout, prev->update_timeout,
+                              30000);
+    ngx_conf_merge_value(conf->update_strict, prev->update_strict, 0);
+    ngx_conf_merge_value(conf->relay_redirect, prev->relay_redirect, 0);
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_rtmp_notify_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_notify_srv_conf_t     *nscf;
+    ngx_uint_t                      n;
+
+    nscf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_notify_srv_conf_t));
+    if (nscf == NULL) {
+        return NULL;
+    }
+
+    for (n = 0; n < NGX_RTMP_NOTIFY_SRV_MAX; ++n) {
+        nscf->url[n] = NGX_CONF_UNSET_PTR;
+    }
+
+    nscf->method = NGX_CONF_UNSET_UINT;
+
+    return nscf;
+}
+
+
+static char *
+ngx_rtmp_notify_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_notify_srv_conf_t *prev = parent;
+    ngx_rtmp_notify_srv_conf_t *conf = child;
+    ngx_uint_t                  n;
+
+    for (n = 0; n < NGX_RTMP_NOTIFY_SRV_MAX; ++n) {
+        ngx_conf_merge_ptr_value(conf->url[n], prev->url[n], NULL);
+    }
+
+    ngx_conf_merge_uint_value(conf->method, prev->method,
+                              NGX_RTMP_NETCALL_HTTP_POST);
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_notify_create_request(ngx_rtmp_session_t *s, ngx_pool_t *pool,
+                                   ngx_uint_t url_idx, ngx_chain_t *args)
+{
+    ngx_rtmp_notify_app_conf_t *nacf;
+    ngx_chain_t                *al, *bl, *cl;
+    ngx_url_t                  *url;
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+
+    url = nacf->url[url_idx];
+
+    al = ngx_rtmp_netcall_http_format_session(s, pool);
+    if (al == NULL) {
+        return NULL;
+    }
+
+    al->next = args;
+
+    bl = NULL;
+
+    if (nacf->method == NGX_RTMP_NETCALL_HTTP_POST) {
+        cl = al;
+        al = bl;
+        bl = cl;
+    }
+
+    return ngx_rtmp_netcall_http_format_request(nacf->method, &url->host,
+                                                &url->uri, al, bl, pool,
+                                                &ngx_rtmp_notify_urlencoded);
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_notify_connect_create(ngx_rtmp_session_t *s, void *arg,
+        ngx_pool_t *pool)
+{
+    ngx_rtmp_connect_t             *v = arg;
+
+    ngx_rtmp_notify_srv_conf_t     *nscf;
+    ngx_url_t                      *url;
+    ngx_chain_t                    *al, *bl;
+    ngx_buf_t                      *b;
+    ngx_str_t                      *addr_text;
+    size_t                          app_len, args_len, flashver_len,
+                                    swf_url_len, tc_url_len, page_url_len;
+
+    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
+
+    al = ngx_alloc_chain_link(pool);
+    if (al == NULL) {
+        return NULL;
+    }
+
+    /* these values are still missing in session
+     * so we have to construct the request from
+     * connection struct */
+
+    app_len = ngx_strlen(v->app);
+    args_len = ngx_strlen(v->args);
+    flashver_len = ngx_strlen(v->flashver);
+    swf_url_len = ngx_strlen(v->swf_url);
+    tc_url_len = ngx_strlen(v->tc_url);
+    page_url_len = ngx_strlen(v->page_url);
+
+    addr_text = &s->connection->addr_text;
+
+    b = ngx_create_temp_buf(pool,
+            sizeof("call=connect") - 1 +
+            sizeof("&app=") - 1 + app_len * 3 +
+            sizeof("&flashver=") - 1 + flashver_len * 3 +
+            sizeof("&swfurl=") - 1 + swf_url_len * 3 +
+            sizeof("&tcurl=") - 1 + tc_url_len * 3 +
+            sizeof("&pageurl=") - 1 + page_url_len * 3 +
+            sizeof("&addr=") - 1 + addr_text->len * 3 +
+            sizeof("&epoch=") - 1 + NGX_INT32_LEN +
+            1 + args_len
+        );
+
+    if (b == NULL) {
+        return NULL;
+    }
+
+    al->buf = b;
+    al->next = NULL;
+
+    b->last = ngx_cpymem(b->last, (u_char*) "app=", sizeof("app=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->app, app_len,
+                                       NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&flashver=",
+                         sizeof("&flashver=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->flashver, flashver_len,
+                                       NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&swfurl=",
+                         sizeof("&swfurl=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->swf_url, swf_url_len,
+                                       NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&tcurl=",
+                         sizeof("&tcurl=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->tc_url, tc_url_len,
+                                       NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&pageurl=",
+                         sizeof("&pageurl=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->page_url, page_url_len,
+                                       NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&addr=", sizeof("&addr=") -1);
+    b->last = (u_char*) ngx_escape_uri(b->last, addr_text->data,
+                                       addr_text->len, NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&epoch=", sizeof("&epoch=") -1);
+    b->last = ngx_sprintf(b->last, "%uD", (uint32_t) s->epoch);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&call=connect",
+                         sizeof("&call=connect") - 1);
+
+    if (args_len) {
+        *b->last++ = '&';
+        b->last = (u_char *) ngx_cpymem(b->last, v->args, args_len);
+    }
+
+    url = nscf->url[NGX_RTMP_NOTIFY_CONNECT];
+
+    bl = NULL;
+
+    if (nscf->method == NGX_RTMP_NETCALL_HTTP_POST) {
+        bl = al;
+        al = NULL;
+    }
+
+    return ngx_rtmp_netcall_http_format_request(nscf->method, &url->host,
+                                                &url->uri, al, bl, pool,
+                                                &ngx_rtmp_notify_urlencoded);
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_notify_disconnect_create(ngx_rtmp_session_t *s, void *arg,
+        ngx_pool_t *pool)
+{
+    ngx_rtmp_notify_srv_conf_t     *nscf;
+    ngx_url_t                      *url;
+    ngx_chain_t                    *al, *bl, *pl;
+    ngx_buf_t                      *b;
+
+    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
+
+    pl = ngx_alloc_chain_link(pool);
+    if (pl == NULL) {
+        return NULL;
+    }
+
+    b = ngx_create_temp_buf(pool,
+                            sizeof("&call=disconnect") +
+                            sizeof("&app=") + s->app.len * 3 +
+                            1 + s->args.len);
+    if (b == NULL) {
+        return NULL;
+    }
+
+    pl->buf = b;
+    pl->next = NULL;
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&call=disconnect",
+                         sizeof("&call=disconnect") - 1);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&app=", sizeof("&app=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, s->app.data, s->app.len,
+                                       NGX_ESCAPE_ARGS);
+
+    if (s->args.len) {
+        *b->last++ = '&';
+        b->last = (u_char *) ngx_cpymem(b->last, s->args.data, s->args.len);
+    }
+
+    url = nscf->url[NGX_RTMP_NOTIFY_DISCONNECT];
+
+    al = ngx_rtmp_netcall_http_format_session(s, pool);
+    if (al == NULL) {
+        return NULL;
+    }
+
+    al->next = pl;
+
+    bl = NULL;
+
+    if (nscf->method == NGX_RTMP_NETCALL_HTTP_POST) {
+        bl = al;
+        al = NULL;
+    }
+
+    return ngx_rtmp_netcall_http_format_request(nscf->method, &url->host,
+                                                &url->uri, al, bl, pool,
+                                                &ngx_rtmp_notify_urlencoded);
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_notify_publish_create(ngx_rtmp_session_t *s, void *arg,
+        ngx_pool_t *pool)
+{
+    ngx_rtmp_publish_t             *v = arg;
+
+    ngx_chain_t                    *pl;
+    ngx_buf_t                      *b;
+    size_t                          name_len, type_len, args_len;
+
+    pl = ngx_alloc_chain_link(pool);
+    if (pl == NULL) {
+        return NULL;
+    }
+
+    name_len = ngx_strlen(v->name);
+    type_len = ngx_strlen(v->type);
+    args_len = ngx_strlen(v->args);
+
+    b = ngx_create_temp_buf(pool,
+                            sizeof("&call=publish") +
+                            sizeof("&name=") + name_len * 3 +
+                            sizeof("&type=") + type_len * 3 +
+                            1 + args_len);
+    if (b == NULL) {
+        return NULL;
+    }
+
+    pl->buf = b;
+    pl->next = NULL;
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&call=publish",
+                         sizeof("&call=publish") - 1);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->name, name_len,
+                                       NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&type=", sizeof("&type=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->type, type_len,
+                                       NGX_ESCAPE_ARGS);
+
+    if (args_len) {
+        *b->last++ = '&';
+        b->last = (u_char *) ngx_cpymem(b->last, v->args, args_len);
+    }
+
+    return ngx_rtmp_notify_create_request(s, pool, NGX_RTMP_NOTIFY_PUBLISH, pl);
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_notify_play_create(ngx_rtmp_session_t *s, void *arg,
+        ngx_pool_t *pool)
+{
+    ngx_rtmp_play_t                *v = arg;
+
+    ngx_chain_t                    *pl;
+    ngx_buf_t                      *b;
+    size_t                          name_len, args_len;
+
+    pl = ngx_alloc_chain_link(pool);
+    if (pl == NULL) {
+        return NULL;
+    }
+
+    name_len = ngx_strlen(v->name);
+    args_len = ngx_strlen(v->args);
+
+    b = ngx_create_temp_buf(pool,
+                            sizeof("&call=play") +
+                            sizeof("&name=") + name_len * 3 +
+                            sizeof("&start=&duration=&reset=") +
+                            NGX_INT32_LEN * 3 + 1 + args_len);
+    if (b == NULL) {
+        return NULL;
+    }
+
+    pl->buf = b;
+    pl->next = NULL;
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&call=play",
+                         sizeof("&call=play") - 1);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->name, name_len,
+                                       NGX_ESCAPE_ARGS);
+
+    b->last = ngx_snprintf(b->last, b->end - b->last,
+                           "&start=%uD&duration=%uD&reset=%d",
+                           (uint32_t) v->start, (uint32_t) v->duration,
+                           v->reset & 1);
+
+    if (args_len) {
+        *b->last++ = '&';
+        b->last = (u_char *) ngx_cpymem(b->last, v->args, args_len);
+    }
+
+    return ngx_rtmp_notify_create_request(s, pool, NGX_RTMP_NOTIFY_PLAY, pl);
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_notify_done_create(ngx_rtmp_session_t *s, void *arg,
+        ngx_pool_t *pool)
+{
+    ngx_rtmp_notify_done_t         *ds = arg;
+
+    ngx_chain_t                    *pl;
+    ngx_buf_t                      *b;
+    size_t                          cbname_len, name_len, args_len;
+    ngx_rtmp_notify_ctx_t          *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
+
+    pl = ngx_alloc_chain_link(pool);
+    if (pl == NULL) {
+        return NULL;
+    }
+
+    cbname_len = ngx_strlen(ds->cbname);
+    name_len = ctx ? ngx_strlen(ctx->name) : 0;
+    args_len = ctx ? ngx_strlen(ctx->args) : 0;
+
+    b = ngx_create_temp_buf(pool,
+                            sizeof("&call=") + cbname_len +
+                            sizeof("&name=") + name_len * 3 +
+                            1 + args_len);
+    if (b == NULL) {
+        return NULL;
+    }
+
+    pl->buf = b;
+    pl->next = NULL;
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&call=", sizeof("&call=") - 1);
+    b->last = ngx_cpymem(b->last, ds->cbname, cbname_len);
+
+    if (name_len) {
+        b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
+        b->last = (u_char*) ngx_escape_uri(b->last, ctx->name, name_len,
+                                           NGX_ESCAPE_ARGS);
+    }
+
+    if (args_len) {
+        *b->last++ = '&';
+        b->last = (u_char *) ngx_cpymem(b->last, ctx->args, args_len);
+    }
+
+    return ngx_rtmp_notify_create_request(s, pool, ds->url_idx, pl);
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_notify_update_create(ngx_rtmp_session_t *s, void *arg,
+        ngx_pool_t *pool)
+{
+    ngx_chain_t                    *pl;
+    ngx_buf_t                      *b;
+    size_t                          name_len, args_len;
+    ngx_rtmp_notify_ctx_t          *ctx;
+    ngx_str_t                       sfx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
+
+    pl = ngx_alloc_chain_link(pool);
+    if (pl == NULL) {
+        return NULL;
+    }
+
+    if (ctx->flags & NGX_RTMP_NOTIFY_PUBLISHING) {
+        ngx_str_set(&sfx, "_publish");
+    } else if (ctx->flags & NGX_RTMP_NOTIFY_PLAYING) {
+        ngx_str_set(&sfx, "_play");
+    } else {
+        ngx_str_null(&sfx);
+    }
+
+    name_len = ctx ? ngx_strlen(ctx->name) : 0;
+    args_len = ctx ? ngx_strlen(ctx->args) : 0;
+
+    b = ngx_create_temp_buf(pool,
+                            sizeof("&call=update") + sfx.len +
+                            sizeof("&time=") + NGX_TIME_T_LEN +
+                            sizeof("&timestamp=") + NGX_INT32_LEN +
+                            sizeof("&name=") + name_len * 3 +
+                            1 + args_len);
+    if (b == NULL) {
+        return NULL;
+    }
+
+    pl->buf = b;
+    pl->next = NULL;
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&call=update",
+                         sizeof("&call=update") - 1);
+    b->last = ngx_cpymem(b->last, sfx.data, sfx.len);
+
+    b->last = ngx_cpymem(b->last, (u_char *) "&time=",
+                         sizeof("&time=") - 1);
+    b->last = ngx_sprintf(b->last, "%T", ngx_cached_time->sec - ctx->start);
+
+    b->last = ngx_cpymem(b->last, (u_char *) "&timestamp=",
+                         sizeof("&timestamp=") - 1);
+    b->last = ngx_sprintf(b->last, "%D", s->current_time);
+
+    if (name_len) {
+        b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
+        b->last = (u_char*) ngx_escape_uri(b->last, ctx->name, name_len,
+                                           NGX_ESCAPE_ARGS);
+    }
+
+    if (args_len) {
+        *b->last++ = '&';
+        b->last = (u_char *) ngx_cpymem(b->last, ctx->args, args_len);
+    }
+
+    return ngx_rtmp_notify_create_request(s, pool, NGX_RTMP_NOTIFY_UPDATE, pl);
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_notify_record_done_create(ngx_rtmp_session_t *s, void *arg,
+                                   ngx_pool_t *pool)
+{
+    ngx_rtmp_record_done_t         *v = arg;
+
+    ngx_rtmp_notify_ctx_t          *ctx;
+    ngx_chain_t                    *pl;
+    ngx_buf_t                      *b;
+    size_t                          name_len, args_len;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
+
+    pl = ngx_alloc_chain_link(pool);
+    if (pl == NULL) {
+        return NULL;
+    }
+
+    name_len  = ngx_strlen(ctx->name);
+    args_len  = ngx_strlen(ctx->args);
+
+    b = ngx_create_temp_buf(pool,
+                            sizeof("&call=record_done") +
+                            sizeof("&recorder=") + v->recorder.len +
+                            sizeof("&name=") + name_len * 3 +
+                            sizeof("&path=") + v->path.len * 3 +
+                            1 + args_len);
+    if (b == NULL) {
+        return NULL;
+    }
+
+    pl->buf = b;
+    pl->next = NULL;
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&call=record_done",
+                         sizeof("&call=record_done") - 1);
+
+    b->last = ngx_cpymem(b->last, (u_char *) "&recorder=",
+                         sizeof("&recorder=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->recorder.data,
+                                       v->recorder.len, NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, ctx->name, name_len,
+                                       NGX_ESCAPE_ARGS);
+
+    b->last = ngx_cpymem(b->last, (u_char*) "&path=", sizeof("&path=") - 1);
+    b->last = (u_char*) ngx_escape_uri(b->last, v->path.data, v->path.len,
+                                       NGX_ESCAPE_ARGS);
+
+    if (args_len) {
+        *b->last++ = '&';
+        b->last = (u_char *) ngx_cpymem(b->last, ctx->args, args_len);
+    }
+
+    return ngx_rtmp_notify_create_request(s, pool, NGX_RTMP_NOTIFY_RECORD_DONE,
+                                          pl);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_parse_http_retcode(ngx_rtmp_session_t *s,
+        ngx_chain_t *in)
+{
+    ngx_buf_t      *b;
+    ngx_int_t       n;
+    u_char          c;
+
+    /* find 10th character */
+
+    n = 9;
+    while (in) {
+        b = in->buf;
+        if (b->last - b->pos > n) {
+            c = b->pos[n];
+            if (c >= (u_char)'0' && c <= (u_char)'9') {
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                    "notify: HTTP retcode: %dxx", (int)(c - '0'));
+                switch (c) {
+                    case (u_char) '2':
+                        return NGX_OK;
+                    case (u_char) '3':
+                        return NGX_AGAIN;
+                    default:
+                        return NGX_ERROR;
+                }
+            }
+
+            ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                    "notify: invalid HTTP retcode: %d..", (int)c);
+
+            return NGX_ERROR;
+        }
+        n -= (b->last - b->pos);
+        in = in->next;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+            "notify: empty or broken HTTP response");
+
+    /*
+     * not enough data;
+     * it can happen in case of empty or broken reply
+     */
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_parse_http_header(ngx_rtmp_session_t *s,
+        ngx_chain_t *in, ngx_str_t *name, u_char *data, size_t len)
+{
+    ngx_buf_t      *b;
+    ngx_int_t       matched;
+    u_char         *p, c;
+    ngx_uint_t      n;
+
+    enum {
+        parse_name,
+        parse_space,
+        parse_value,
+        parse_value_newline
+    } state = parse_name;
+
+    n = 0;
+    matched = 0;
+
+    while (in) {
+        b = in->buf;
+
+        for (p = b->pos; p != b->last; ++p) {
+            c = *p;
+
+            if (c == '\r') {
+                continue;
+            }
+
+            switch (state) {
+                case parse_value_newline:
+                    if (c == ' ' || c == '\t') {
+                        state = parse_space;
+                        break;
+                    }
+
+                    if (matched) {
+                        return n;
+                    }
+
+                    if (c == '\n') {
+                        return NGX_OK;
+                    }
+
+                    n = 0;
+                    state = parse_name;
+
+                case parse_name:
+                    switch (c) {
+                        case ':':
+                            matched = (n == name->len);
+                            n = 0;
+                            state = parse_space;
+                            break;
+                        case '\n':
+                            n = 0;
+                            break;
+                        default:
+                            if (n < name->len &&
+                                ngx_tolower(c) == ngx_tolower(name->data[n]))
+                            {
+                                ++n;
+                                break;
+                            }
+                            n = name->len + 1;
+                    }
+                    break;
+
+                case parse_space:
+                    if (c == ' ' || c == '\t') {
+                        break;
+                    }
+                    state = parse_value;
+
+                case parse_value:
+                    if (c == '\n') {
+                        state = parse_value_newline;
+                        break;
+                    }
+
+                    if (matched && n + 1 < len) {
+                        data[n++] = c;
+                    }
+
+                    break;
+            }
+        }
+
+        in = in->next;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_notify_clear_flag(ngx_rtmp_session_t *s, ngx_uint_t flag)
+{
+    ngx_rtmp_notify_ctx_t  *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
+
+    ctx->flags &= ~flag;
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_connect_handle(ngx_rtmp_session_t *s,
+        void *arg, ngx_chain_t *in)
+{
+    ngx_rtmp_connect_t *v = arg;
+    ngx_int_t           rc;
+    u_char              app[NGX_RTMP_MAX_NAME];
+
+    static ngx_str_t    location = ngx_string("location");
+
+    rc = ngx_rtmp_notify_parse_http_retcode(s, in);
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_AGAIN) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "notify: connect redirect received");
+
+        rc = ngx_rtmp_notify_parse_http_header(s, in, &location, app,
+                                               sizeof(app) - 1);
+        if (rc > 0) {
+            *ngx_cpymem(v->app, app, rc) = 0;
+            ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                          "notify: connect redirect to '%s'", v->app);
+        }
+    }
+
+    return next_connect(s, v);
+}
+
+
+static void
+ngx_rtmp_notify_set_name(u_char *dst, size_t dst_len, u_char *src,
+    size_t src_len)
+{
+    u_char     result[16], *p;
+    ngx_md5_t  md5;
+
+    ngx_md5_init(&md5);
+    ngx_md5_update(&md5, src, src_len);
+    ngx_md5_final(result, &md5);
+
+    p = ngx_hex_dump(dst, result, ngx_min((dst_len - 1) / 2, 16));
+    *p = '\0';
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_publish_handle(ngx_rtmp_session_t *s,
+        void *arg, ngx_chain_t *in)
+{
+    ngx_rtmp_publish_t         *v = arg;
+    ngx_int_t                   rc;
+    ngx_str_t                   local_name;
+    ngx_rtmp_relay_target_t     target;
+    ngx_url_t                  *u;
+    ngx_rtmp_notify_app_conf_t *nacf;
+    u_char                      name[NGX_RTMP_MAX_NAME];
+
+    static ngx_str_t    location = ngx_string("location");
+
+    rc = ngx_rtmp_notify_parse_http_retcode(s, in);
+    if (rc == NGX_ERROR) {
+        ngx_rtmp_notify_clear_flag(s, NGX_RTMP_NOTIFY_PUBLISHING);
+        return NGX_ERROR;
+    }
+
+    if (rc != NGX_AGAIN) {
+        goto next;
+    }
+
+    /* HTTP 3xx */
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "notify: publish redirect received");
+
+    rc = ngx_rtmp_notify_parse_http_header(s, in, &location, name,
+                                           sizeof(name) - 1);
+    if (rc <= 0) {
+        goto next;
+    }
+
+    if (ngx_strncasecmp(name, (u_char *) "rtmp://", 7)) {
+        *ngx_cpymem(v->name, name, rc) = 0;
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                      "notify: publish redirect to '%s'", v->name);
+        goto next;
+    }
+
+    /* push */
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+    if (nacf->relay_redirect) {
+        ngx_rtmp_notify_set_name(v->name, NGX_RTMP_MAX_NAME, name, (size_t) rc);
+    }
+
+    ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                  "notify: push '%s' to '%*s'", v->name, rc, name);
+
+    local_name.data = v->name;
+    local_name.len = ngx_strlen(v->name);
+
+    ngx_memzero(&target, sizeof(target));
+
+    u = &target.url;
+    u->url = local_name;
+    u->url.data = name + 7;
+    u->url.len = rc - 7;
+    u->default_port = 1935;
+    u->uri_part = 1;
+    u->no_resolve = 1; /* want ip here */
+
+    if (ngx_parse_url(s->connection->pool, u) != NGX_OK) {
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                      "notify: push failed '%V'", &local_name);
+        return NGX_ERROR;
+    }
+
+    ngx_rtmp_relay_push(s, &local_name, &target);
+
+next:
+
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_play_handle(ngx_rtmp_session_t *s,
+        void *arg, ngx_chain_t *in)
+{
+    ngx_rtmp_play_t            *v = arg;
+    ngx_int_t                   rc;
+    ngx_str_t                   local_name;
+    ngx_rtmp_relay_target_t     target;
+    ngx_url_t                  *u;
+    ngx_rtmp_notify_app_conf_t *nacf;
+    u_char                      name[NGX_RTMP_MAX_NAME];
+
+    static ngx_str_t            location = ngx_string("location");
+
+    rc = ngx_rtmp_notify_parse_http_retcode(s, in);
+    if (rc == NGX_ERROR) {
+        ngx_rtmp_notify_clear_flag(s, NGX_RTMP_NOTIFY_PLAYING);
+        return NGX_ERROR;
+    }
+
+    if (rc != NGX_AGAIN) {
+        goto next;
+    }
+
+    /* HTTP 3xx */
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "notify: play redirect received");
+
+    rc = ngx_rtmp_notify_parse_http_header(s, in, &location, name,
+                                           sizeof(name) - 1);
+    if (rc <= 0) {
+        goto next;
+    }
+
+    if (ngx_strncasecmp(name, (u_char *) "rtmp://", 7)) {
+        *ngx_cpymem(v->name, name, rc) = 0;
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                      "notify: play redirect to '%s'", v->name);
+        goto next;
+    }
+
+    /* pull */
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+    if (nacf->relay_redirect) {
+        ngx_rtmp_notify_set_name(v->name, NGX_RTMP_MAX_NAME, name, (size_t) rc);
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "notify: pull '%s' from '%*s'", v->name, rc, name);
+
+    local_name.data = v->name;
+    local_name.len = ngx_strlen(v->name);
+
+    ngx_memzero(&target, sizeof(target));
+
+    u = &target.url;
+    u->url = local_name;
+    u->url.data = name + 7;
+    u->url.len = rc - 7;
+    u->default_port = 1935;
+    u->uri_part = 1;
+    u->no_resolve = 1; /* want ip here */
+
+    if (ngx_parse_url(s->connection->pool, u) != NGX_OK) {
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                      "notify: pull failed '%V'", &local_name);
+        return NGX_ERROR;
+    }
+
+    ngx_rtmp_relay_pull(s, &local_name, &target);
+
+next:
+
+    return next_play(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_update_handle(ngx_rtmp_session_t *s,
+        void *arg, ngx_chain_t *in)
+{
+    ngx_rtmp_notify_app_conf_t *nacf;
+    ngx_rtmp_notify_ctx_t      *ctx;
+    ngx_int_t                   rc;
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+
+    rc = ngx_rtmp_notify_parse_http_retcode(s, in);
+
+    if ((!nacf->update_strict && rc == NGX_ERROR) ||
+         (nacf->update_strict && rc != NGX_OK))
+    {
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                      "notify: update failed");
+
+        return NGX_ERROR;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "notify: schedule update %Mms",
+                   nacf->update_timeout);
+
+    ngx_add_timer(&ctx->update_evt, nacf->update_timeout);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_notify_update(ngx_event_t *e)
+{
+    ngx_connection_t           *c;
+    ngx_rtmp_session_t         *s;
+    ngx_rtmp_notify_app_conf_t *nacf;
+    ngx_rtmp_netcall_init_t     ci;
+    ngx_url_t                  *url;
+
+    c = e->data;
+    s = c->data;
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+
+    url = nacf->url[NGX_RTMP_NOTIFY_UPDATE];
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "notify: update '%V'", &url->url);
+
+    ngx_memzero(&ci, sizeof(ci));
+
+    ci.url = url;
+    ci.create = ngx_rtmp_notify_update_create;
+    ci.handle = ngx_rtmp_notify_update_handle;
+
+    if (ngx_rtmp_netcall_create(s, &ci) == NGX_OK) {
+        return;
+    }
+
+    /* schedule next update on connection error */
+
+    ngx_rtmp_notify_update_handle(s, NULL, NULL);
+}
+
+
+static void
+ngx_rtmp_notify_init(ngx_rtmp_session_t *s,
+        u_char name[NGX_RTMP_MAX_NAME], u_char args[NGX_RTMP_MAX_ARGS],
+        ngx_uint_t flags)
+{
+    ngx_rtmp_notify_ctx_t          *ctx;
+    ngx_rtmp_notify_app_conf_t     *nacf;
+    ngx_event_t                    *e;
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+    if (!nacf->active) {
+        return;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
+
+    if (ctx == NULL) {
+        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_notify_ctx_t));
+        if (ctx == NULL) {
+            return;
+        }
+
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_notify_module);
+    }
+
+    ngx_memcpy(ctx->name, name, NGX_RTMP_MAX_NAME);
+    ngx_memcpy(ctx->args, args, NGX_RTMP_MAX_ARGS);
+
+    ctx->flags |= flags;
+
+    if (nacf->url[NGX_RTMP_NOTIFY_UPDATE] == NULL ||
+        nacf->update_timeout == 0)
+    {
+        return;
+    }
+
+    if (ctx->update_evt.timer_set) {
+        return;
+    }
+
+    ctx->start = ngx_cached_time->sec;
+
+    e = &ctx->update_evt;
+
+    e->data = s->connection;
+    e->log = s->connection->log;
+    e->handler = ngx_rtmp_notify_update;
+
+    ngx_add_timer(e, nacf->update_timeout);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "notify: schedule initial update %Mms",
+                   nacf->update_timeout);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_connect(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v)
+{
+    ngx_rtmp_notify_srv_conf_t     *nscf;
+    ngx_rtmp_netcall_init_t         ci;
+    ngx_url_t                      *url;
+
+    if (s->auto_pushed || s->relay) {
+        goto next;
+    }
+
+    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
+
+    url = nscf->url[NGX_RTMP_NOTIFY_CONNECT];
+    if (url == NULL) {
+        goto next;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "notify: connect '%V'", &url->url);
+
+    ngx_memzero(&ci, sizeof(ci));
+
+    ci.url = url;
+    ci.create = ngx_rtmp_notify_connect_create;
+    ci.handle = ngx_rtmp_notify_connect_handle;
+    ci.arg = v;
+    ci.argsize = sizeof(*v);
+
+    return ngx_rtmp_netcall_create(s, &ci);
+
+next:
+    return next_connect(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_disconnect(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_notify_srv_conf_t     *nscf;
+    ngx_rtmp_netcall_init_t         ci;
+    ngx_url_t                      *url;
+
+    if (s->auto_pushed || s->relay) {
+        goto next;
+    }
+
+    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
+
+    url = nscf->url[NGX_RTMP_NOTIFY_DISCONNECT];
+    if (url == NULL) {
+        goto next;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "notify: disconnect '%V'", &url->url);
+
+    ngx_memzero(&ci, sizeof(ci));
+
+    ci.url = url;
+    ci.create = ngx_rtmp_notify_disconnect_create;
+
+    ngx_rtmp_netcall_create(s, &ci);
+
+next:
+    return next_disconnect(s);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    ngx_rtmp_notify_app_conf_t     *nacf;
+    ngx_rtmp_netcall_init_t         ci;
+    ngx_url_t                      *url;
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+    if (nacf == NULL) {
+        goto next;
+    }
+
+    url = nacf->url[NGX_RTMP_NOTIFY_PUBLISH];
+
+    ngx_rtmp_notify_init(s, v->name, v->args, NGX_RTMP_NOTIFY_PUBLISHING);
+
+    if (url == NULL) {
+        goto next;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "notify: publish '%V'", &url->url);
+
+    ngx_memzero(&ci, sizeof(ci));
+
+    ci.url = url;
+    ci.create = ngx_rtmp_notify_publish_create;
+    ci.handle = ngx_rtmp_notify_publish_handle;
+    ci.arg = v;
+    ci.argsize = sizeof(*v);
+
+    return ngx_rtmp_netcall_create(s, &ci);
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    ngx_rtmp_notify_app_conf_t     *nacf;
+    ngx_rtmp_netcall_init_t         ci;
+    ngx_url_t                      *url;
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+    if (nacf == NULL) {
+        goto next;
+    }
+
+    url = nacf->url[NGX_RTMP_NOTIFY_PLAY];
+
+    ngx_rtmp_notify_init(s, v->name, v->args, NGX_RTMP_NOTIFY_PLAYING);
+
+    if (url == NULL) {
+        goto next;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "notify: play '%V'", &url->url);
+
+    ngx_memzero(&ci, sizeof(ci));
+
+    ci.url = url;
+    ci.create = ngx_rtmp_notify_play_create;
+    ci.handle = ngx_rtmp_notify_play_handle;
+    ci.arg = v;
+    ci.argsize = sizeof(*v);
+
+    return ngx_rtmp_netcall_create(s, &ci);
+
+next:
+    return next_play(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_close_stream(ngx_rtmp_session_t *s,
+                             ngx_rtmp_close_stream_t *v)
+{
+    ngx_rtmp_notify_ctx_t          *ctx;
+    ngx_rtmp_notify_app_conf_t     *nacf;
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
+
+    if (ctx == NULL) {
+        goto next;
+    }
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+
+    if (nacf == NULL) {
+        goto next;
+    }
+
+    if (ctx->flags & NGX_RTMP_NOTIFY_PUBLISHING) {
+        ngx_rtmp_notify_done(s, "publish_done", NGX_RTMP_NOTIFY_PUBLISH_DONE);
+    }
+
+    if (ctx->flags & NGX_RTMP_NOTIFY_PLAYING) {
+        ngx_rtmp_notify_done(s, "play_done", NGX_RTMP_NOTIFY_PLAY_DONE);
+    }
+
+    if (ctx->flags) {
+        ngx_rtmp_notify_done(s, "done", NGX_RTMP_NOTIFY_DONE);
+    }
+
+    if (ctx->update_evt.timer_set) {
+        ngx_del_timer(&ctx->update_evt);
+    }
+
+    ctx->flags = 0;
+
+next:
+    return next_close_stream(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_record_done(ngx_rtmp_session_t *s, ngx_rtmp_record_done_t *v)
+{
+    ngx_rtmp_netcall_init_t         ci;
+    ngx_rtmp_notify_app_conf_t     *nacf;
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+    if (nacf == NULL || nacf->url[NGX_RTMP_NOTIFY_RECORD_DONE] == NULL) {
+        goto next;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "notify: record_done recorder=%V path='%V' url='%V'",
+                  &v->recorder, &v->path,
+                  &nacf->url[NGX_RTMP_NOTIFY_RECORD_DONE]->url);
+
+    ngx_memzero(&ci, sizeof(ci));
+
+    ci.url    = nacf->url[NGX_RTMP_NOTIFY_RECORD_DONE];
+    ci.create = ngx_rtmp_notify_record_done_create;
+    ci.arg    = v;
+
+    ngx_rtmp_netcall_create(s, &ci);
+
+next:
+    return next_record_done(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_done(ngx_rtmp_session_t *s, char *cbname, ngx_uint_t url_idx)
+{
+    ngx_rtmp_netcall_init_t         ci;
+    ngx_rtmp_notify_done_t          ds;
+    ngx_rtmp_notify_app_conf_t     *nacf;
+    ngx_url_t                      *url;
+
+    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
+
+    url = nacf->url[url_idx];
+    if (url == NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "notify: %s '%V'", cbname, &url->url);
+
+    ds.cbname = (u_char *) cbname;
+    ds.url_idx = url_idx;
+
+    ngx_memzero(&ci, sizeof(ci));
+
+    ci.url = url;
+    ci.arg = &ds;
+    ci.create = ngx_rtmp_notify_done_create;
+
+    return ngx_rtmp_netcall_create(s, &ci);
+}
+
+
+static ngx_url_t *
+ngx_rtmp_notify_parse_url(ngx_conf_t *cf, ngx_str_t *url)
+{
+    ngx_url_t  *u;
+    size_t      add;
+
+    add = 0;
+
+    u = ngx_pcalloc(cf->pool, sizeof(ngx_url_t));
+    if (u == NULL) {
+        return NULL;
+    }
+
+    if (ngx_strncasecmp(url->data, (u_char *) "http://", 7) == 0) {
+        add = 7;
+    }
+
+    u->url.len = url->len - add;
+    u->url.data = url->data + add;
+    u->default_port = 80;
+    u->uri_part = 1;
+
+    if (ngx_parse_url(cf->pool, u) != NGX_OK) {
+        if (u->err) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                    "%s in url \"%V\"", u->err, &u->url);
+        }
+        return NULL;
+    }
+
+    return u;
+}
+
+
+static char *
+ngx_rtmp_notify_on_srv_event(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_notify_srv_conf_t     *nscf = conf;
+
+    ngx_str_t                      *name, *value;
+    ngx_url_t                      *u;
+    ngx_uint_t                      n;
+
+    value = cf->args->elts;
+
+    u = ngx_rtmp_notify_parse_url(cf, &value[1]);
+    if (u == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    name = &value[0];
+
+    n = 0;
+
+    switch (name->len) {
+        case sizeof("on_connect") - 1:
+            n = NGX_RTMP_NOTIFY_CONNECT;
+            break;
+
+        case sizeof("on_disconnect") - 1:
+            n = NGX_RTMP_NOTIFY_DISCONNECT;
+            break;
+    }
+
+    nscf->url[n] = u;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_rtmp_notify_on_app_event(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_notify_app_conf_t     *nacf = conf;
+
+    ngx_str_t                      *name, *value;
+    ngx_url_t                      *u;
+    ngx_uint_t                      n;
+
+    value = cf->args->elts;
+
+    u = ngx_rtmp_notify_parse_url(cf, &value[1]);
+    if (u == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    name = &value[0];
+
+    n = 0;
+
+    switch (name->len) {
+        case sizeof("on_done") - 1: /* and on_play */
+            if (name->data[3] == 'd') {
+                n = NGX_RTMP_NOTIFY_DONE;
+            } else {
+                n = NGX_RTMP_NOTIFY_PLAY;
+            }
+            break;
+
+        case sizeof("on_update") - 1:
+            n = NGX_RTMP_NOTIFY_UPDATE;
+            break;
+
+        case sizeof("on_publish") - 1:
+            n = NGX_RTMP_NOTIFY_PUBLISH;
+            break;
+
+        case sizeof("on_play_done") - 1:
+            n = NGX_RTMP_NOTIFY_PLAY_DONE;
+            break;
+
+        case sizeof("on_record_done") - 1:
+            n = NGX_RTMP_NOTIFY_RECORD_DONE;
+            break;
+
+        case sizeof("on_publish_done") - 1:
+            n = NGX_RTMP_NOTIFY_PUBLISH_DONE;
+            break;
+    }
+
+    nacf->url[n] = u;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_rtmp_notify_method(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_notify_app_conf_t     *nacf = conf;
+
+    ngx_rtmp_notify_srv_conf_t     *nscf;
+    ngx_str_t                      *value;
+
+    value = cf->args->elts;
+    value++;
+
+    if (value->len == sizeof("get") - 1 &&
+        ngx_strncasecmp(value->data, (u_char *) "get", value->len) == 0)
+    {
+        nacf->method = NGX_RTMP_NETCALL_HTTP_GET;
+
+    } else if (value->len == sizeof("post") - 1 &&
+               ngx_strncasecmp(value->data, (u_char *) "post", value->len) == 0)
+    {
+        nacf->method = NGX_RTMP_NETCALL_HTTP_POST;
+
+    } else {
+        return "got unexpected method";
+    }
+
+    nscf = ngx_rtmp_conf_get_module_srv_conf(cf, ngx_rtmp_notify_module);
+    nscf->method = nacf->method;
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_notify_postconfiguration(ngx_conf_t *cf)
+{
+    next_connect = ngx_rtmp_connect;
+    ngx_rtmp_connect = ngx_rtmp_notify_connect;
+
+    next_disconnect = ngx_rtmp_disconnect;
+    ngx_rtmp_disconnect = ngx_rtmp_notify_disconnect;
+
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_notify_publish;
+
+    next_play = ngx_rtmp_play;
+    ngx_rtmp_play = ngx_rtmp_notify_play;
+
+    next_close_stream = ngx_rtmp_close_stream;
+    ngx_rtmp_close_stream = ngx_rtmp_notify_close_stream;
+
+    next_record_done = ngx_rtmp_record_done;
+    ngx_rtmp_record_done = ngx_rtmp_notify_record_done;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_play_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_play_module.c
new file mode 100644
index 0000000..f6ea6c3
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_play_module.c
@@ -0,0 +1,1278 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <nginx.h>
+#include "ngx_rtmp_play_module.h"
+#include "ngx_rtmp_cmd_module.h"
+#include "ngx_rtmp_netcall_module.h"
+#include "ngx_rtmp_streams.h"
+
+
+static ngx_rtmp_play_pt                 next_play;
+static ngx_rtmp_close_stream_pt         next_close_stream;
+static ngx_rtmp_seek_pt                 next_seek;
+static ngx_rtmp_pause_pt                next_pause;
+
+
+static char *ngx_rtmp_play_url(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static void *ngx_rtmp_play_create_main_conf(ngx_conf_t *cf);
+static ngx_int_t ngx_rtmp_play_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_play_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_play_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+
+static ngx_int_t ngx_rtmp_play_do_init(ngx_rtmp_session_t *s);
+static ngx_int_t ngx_rtmp_play_do_done(ngx_rtmp_session_t *s);
+static ngx_int_t ngx_rtmp_play_do_start(ngx_rtmp_session_t *s);
+static ngx_int_t ngx_rtmp_play_do_stop(ngx_rtmp_session_t *s);
+static ngx_int_t ngx_rtmp_play_do_seek(ngx_rtmp_session_t *s,
+                                       ngx_uint_t timestamp);
+
+static ngx_int_t ngx_rtmp_play_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v);
+static ngx_int_t ngx_rtmp_play_seek(ngx_rtmp_session_t *s, ngx_rtmp_seek_t *v);
+static ngx_int_t ngx_rtmp_play_pause(ngx_rtmp_session_t *s,
+                                     ngx_rtmp_pause_t *v);
+static void ngx_rtmp_play_send(ngx_event_t *e);
+static ngx_int_t ngx_rtmp_play_open(ngx_rtmp_session_t *s, double start);
+static ngx_int_t ngx_rtmp_play_remote_handle(ngx_rtmp_session_t *s,
+       void *arg, ngx_chain_t *in);
+static ngx_chain_t * ngx_rtmp_play_remote_create(ngx_rtmp_session_t *s,
+       void *arg, ngx_pool_t *pool);
+static ngx_int_t ngx_rtmp_play_open_remote(ngx_rtmp_session_t *s,
+       ngx_rtmp_play_t *v);
+static ngx_int_t ngx_rtmp_play_next_entry(ngx_rtmp_session_t *s,
+       ngx_rtmp_play_t *v);
+static ngx_rtmp_play_entry_t * ngx_rtmp_play_get_current_entry(
+       ngx_rtmp_session_t *s);
+static void ngx_rtmp_play_cleanup_local_file(ngx_rtmp_session_t *s);
+static void ngx_rtmp_play_copy_local_file(ngx_rtmp_session_t *s, u_char *name);
+static u_char * ngx_rtmp_play_get_local_file_path(ngx_rtmp_session_t *s);
+
+
+static ngx_command_t  ngx_rtmp_play_commands[] = {
+
+    { ngx_string("play"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_play_url,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("play_temp_path"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_play_app_conf_t, temp_path),
+      NULL },
+
+    { ngx_string("play_local_path"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_play_app_conf_t, local_path),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_play_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_play_postconfiguration,        /* postconfiguration */
+    ngx_rtmp_play_create_main_conf,         /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    ngx_rtmp_play_create_app_conf,          /* create app configuration */
+    ngx_rtmp_play_merge_app_conf            /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_play_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_play_module_ctx,              /* module context */
+    ngx_rtmp_play_commands,                 /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+#define NGX_RTMP_PLAY_TMP_FILE              "nginx-rtmp-vod."
+
+
+static void *
+ngx_rtmp_play_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_play_main_conf_t      *pmcf;
+
+    pmcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_main_conf_t));
+    if (pmcf == NULL) {
+        return NULL;
+    }
+
+    if (ngx_array_init(&pmcf->fmts, cf->pool, 1,
+                       sizeof(ngx_rtmp_play_fmt_t *))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    return pmcf;
+}
+
+
+static void *
+ngx_rtmp_play_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_play_app_conf_t      *pacf;
+
+    pacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_app_conf_t));
+    if (pacf == NULL) {
+        return NULL;
+    }
+
+    pacf->nbuckets = 1024;
+
+    return pacf;
+}
+
+
+static char *
+ngx_rtmp_play_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_play_app_conf_t *prev = parent;
+    ngx_rtmp_play_app_conf_t *conf = child;
+    ngx_rtmp_play_entry_t   **ppe;
+
+    ngx_conf_merge_str_value(conf->temp_path, prev->temp_path, "/tmp");
+    ngx_conf_merge_str_value(conf->local_path, prev->local_path, "");
+
+    if (prev->entries.nelts == 0) {
+        goto done;
+    }
+
+    if (conf->entries.nelts == 0) {
+        conf->entries = prev->entries;
+        goto done;
+    }
+
+    ppe = ngx_array_push_n(&conf->entries, prev->entries.nelts);
+    if (ppe == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memcpy(ppe, prev->entries.elts, prev->entries.nelts * sizeof(void *));
+
+done:
+
+    if (conf->entries.nelts == 0) {
+        return NGX_CONF_OK;
+    }
+
+    conf->ctx = ngx_pcalloc(cf->pool, sizeof(void *) * conf->nbuckets);
+    if (conf->ctx == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_join(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_ctx_t        *ctx, **pctx;
+    ngx_rtmp_play_app_conf_t   *pacf;
+    ngx_uint_t                  h;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: join");
+
+    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+    if (ctx == NULL || ctx->joined) {
+        return NGX_ERROR;
+    }
+
+    h = ngx_hash_key(ctx->name, ngx_strlen(ctx->name));
+    pctx = &pacf->ctx[h % pacf->nbuckets];
+
+    while (*pctx) {
+        if (!ngx_strncmp((*pctx)->name, ctx->name, NGX_RTMP_MAX_NAME)) {
+            break;
+        }
+        pctx = &(*pctx)->next;
+    }
+
+    ctx->next = *pctx;
+    *pctx = ctx;
+    ctx->joined = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_leave(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_ctx_t        *ctx, **pctx;
+    ngx_rtmp_play_app_conf_t   *pacf;
+    ngx_uint_t                  h;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: leave");
+
+    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+    if (ctx == NULL || !ctx->joined) {
+        return NGX_ERROR;
+    }
+
+    h = ngx_hash_key(ctx->name, ngx_strlen(ctx->name));
+    pctx = &pacf->ctx[h % pacf->nbuckets];
+
+    while (*pctx && *pctx != ctx) {
+        pctx = &(*pctx)->next;
+    }
+
+    if (*pctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    *pctx = (*pctx)->next;
+    ctx->joined = 0;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_play_send(ngx_event_t *e)
+{
+    ngx_rtmp_session_t     *s = e->data;
+    ngx_rtmp_play_ctx_t    *ctx;
+    ngx_int_t               rc;
+    ngx_uint_t              ts;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx == NULL || ctx->fmt == NULL || ctx->fmt->send == NULL) {
+        return;
+    }
+
+    ts = 0;
+
+    rc = ctx->fmt->send(s, &ctx->file, &ts);
+
+    if (rc > 0) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "play: send schedule %i", rc);
+
+        ngx_add_timer(e, rc);
+        return;
+    }
+
+    if (rc == NGX_AGAIN) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "play: send buffer full");
+
+        ngx_post_event(e, &s->posted_dry_events);
+        return;
+    }
+
+    if (rc == NGX_OK) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "play: send restart");
+
+        ngx_post_event(e, &ngx_posted_events);
+        return;
+    }
+
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: send done");
+
+    ngx_rtmp_send_stream_eof(s, NGX_RTMP_MSID);
+
+    ngx_rtmp_send_play_status(s, "NetStream.Play.Complete", "status", ts, 0);
+
+    ngx_rtmp_send_status(s, "NetStream.Play.Stop", "status", "Stopped");
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_do_init(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_ctx_t            *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ctx->fmt && ctx->fmt->init &&
+        ctx->fmt->init(s, &ctx->file, ctx->aindex, ctx->vindex) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_do_done(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_ctx_t            *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ctx->fmt && ctx->fmt->done &&
+        ctx->fmt->done(s, &ctx->file) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_do_start(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_ctx_t            *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: start");
+
+    if (ctx->fmt && ctx->fmt->start &&
+        ctx->fmt->start(s, &ctx->file) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_post_event((&ctx->send_evt), &ngx_posted_events);
+
+    ctx->playing = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_do_seek(ngx_rtmp_session_t *s, ngx_uint_t timestamp)
+{
+    ngx_rtmp_play_ctx_t            *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: seek timestamp=%ui", timestamp);
+
+    if (ctx->fmt && ctx->fmt->seek &&
+        ctx->fmt->seek(s, &ctx->file, timestamp) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ctx->playing) {
+        ngx_post_event((&ctx->send_evt), &ngx_posted_events);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_do_stop(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_ctx_t            *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: stop");
+
+    if (ctx->send_evt.timer_set) {
+        ngx_del_timer(&ctx->send_evt);
+    }
+
+#if (nginx_version >= 1007005)
+    if (ctx->send_evt.posted)
+#else
+    if (ctx->send_evt.prev)
+#endif
+    {
+        ngx_delete_posted_event((&ctx->send_evt));
+    }
+
+    if (ctx->fmt && ctx->fmt->stop &&
+        ctx->fmt->stop(s, &ctx->file) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ctx->playing = 0;
+
+    return NGX_OK;
+}
+
+
+/* This function returns pointer to a static buffer */
+
+static u_char *
+ngx_rtmp_play_get_local_file_path(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_app_conf_t       *pacf;
+    ngx_rtmp_play_ctx_t            *ctx;
+    u_char                         *p;
+    static u_char                   path[NGX_MAX_PATH + 1];
+
+    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    p = ngx_snprintf(path, NGX_MAX_PATH, "%V/" NGX_RTMP_PLAY_TMP_FILE "%ui",
+                     &pacf->temp_path, ctx->file_id);
+    *p = 0;
+
+    return path;
+}
+
+
+static void
+ngx_rtmp_play_copy_local_file(ngx_rtmp_session_t *s, u_char *name)
+{
+    ngx_rtmp_play_app_conf_t   *pacf;
+    ngx_rtmp_play_ctx_t        *ctx;
+    u_char                     *path, *p;
+    static u_char               dpath[NGX_MAX_PATH + 1];
+
+    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
+    if (pacf == NULL) {
+        return;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+    if (ctx == NULL || ctx->file_id == 0) {
+        return;
+    }
+
+    path = ngx_rtmp_play_get_local_file_path(s);
+
+    p = ngx_snprintf(dpath, NGX_MAX_PATH, "%V/%s%V", &pacf->local_path,
+                     name + ctx->pfx_size, &ctx->sfx);
+    *p = 0;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: copy local file '%s' to '%s'", path, dpath);
+
+    if (ngx_rename_file(path, dpath) == 0) {
+        ctx->file_id = 0;
+        return;
+    }
+
+    ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
+                  "play: error copying local file '%s' to '%s'",
+                  path, dpath);
+
+    ngx_rtmp_play_cleanup_local_file(s);
+}
+
+
+static void
+ngx_rtmp_play_cleanup_local_file(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_ctx_t        *ctx;
+    u_char                     *path;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+    if (ctx == NULL || ctx->file_id == 0) {
+        return;
+    }
+
+    path = ngx_rtmp_play_get_local_file_path(s);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: deleting local file '%s'", path);
+
+    ctx->file_id = 0;
+
+    ngx_delete_file(path);
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
+{
+    ngx_rtmp_play_ctx_t        *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+    if (ctx == NULL) {
+        goto next;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: close_stream");
+
+    ngx_rtmp_play_do_stop(s);
+
+    ngx_rtmp_play_do_done(s);
+
+    if (ctx->file.fd != NGX_INVALID_FILE) {
+        ngx_close_file(ctx->file.fd);
+        ctx->file.fd = NGX_INVALID_FILE;
+
+        ngx_rtmp_send_stream_eof(s, NGX_RTMP_MSID);
+
+        ngx_rtmp_send_status(s, "NetStream.Play.Stop", "status",
+                             "Stop video on demand");
+    }
+
+    if (ctx->file_id) {
+        ngx_rtmp_play_cleanup_local_file(s);
+    }
+
+    ngx_rtmp_play_leave(s);
+
+next:
+    return next_close_stream(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_seek(ngx_rtmp_session_t *s, ngx_rtmp_seek_t *v)
+{
+    ngx_rtmp_play_ctx_t            *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+    if (ctx == NULL || ctx->file.fd == NGX_INVALID_FILE) {
+        goto next;
+    }
+
+    if (!ctx->opened) {
+        ctx->post_seek = (ngx_uint_t) v->offset;
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "play: post seek=%ui", ctx->post_seek);
+        goto next;
+    }
+
+    if (ngx_rtmp_send_stream_eof(s, NGX_RTMP_MSID) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ngx_rtmp_play_do_seek(s, (ngx_uint_t) v->offset);
+
+    if (ngx_rtmp_send_status(s, "NetStream.Seek.Notify", "status", "Seeking")
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_send_stream_begin(s, NGX_RTMP_MSID) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+next:
+    return next_seek(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_pause(ngx_rtmp_session_t *s, ngx_rtmp_pause_t *v)
+{
+    ngx_rtmp_play_ctx_t            *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx == NULL || ctx->file.fd == NGX_INVALID_FILE) {
+        goto next;
+    }
+
+    if (!ctx->opened) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "play: pause ignored");
+        goto next;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: pause=%i timestamp=%f",
+                   (ngx_int_t) v->pause, v->position);
+
+    if (v->pause) {
+        if (ngx_rtmp_send_status(s, "NetStream.Pause.Notify", "status",
+                                 "Paused video on demand")
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        ngx_rtmp_play_do_stop(s);
+
+    } else {
+        if (ngx_rtmp_send_status(s, "NetStream.Unpause.Notify", "status",
+                                 "Unpaused video on demand")
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        ngx_rtmp_play_do_start(s); /*TODO: v->position? */
+    }
+
+next:
+    return next_pause(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_parse_index(char type, u_char *args)
+{
+    u_char             *p, c;
+    static u_char       name[] = "xindex=";
+
+    name[0] = (u_char) type;
+
+    for ( ;; ) {
+        p = (u_char *) ngx_strstr(args, name);
+        if (p == NULL) {
+            return 0;
+        }
+
+        if (p != args) {
+            c = *(p - 1);
+            if (c != '?' && c != '&') {
+                args = p + 1;
+                continue;
+            }
+        }
+
+        return atoi((char *) p + (sizeof(name) - 1));
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    ngx_rtmp_play_main_conf_t      *pmcf;
+    ngx_rtmp_play_app_conf_t       *pacf;
+    ngx_rtmp_play_ctx_t            *ctx;
+    u_char                         *p;
+    ngx_rtmp_play_fmt_t            *fmt, **pfmt;
+    ngx_str_t                      *pfx, *sfx;
+    ngx_str_t                       name;
+    ngx_uint_t                      n;
+
+    pmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_play_module);
+
+    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
+
+    if (pacf == NULL || pacf->entries.nelts == 0) {
+        goto next;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                  "play: play name='%s' timestamp=%i",
+                  v->name, (ngx_int_t) v->start);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx && ctx->file.fd != NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                     "play: already playing");
+        goto next;
+    }
+
+    /* check for double-dot in v->name;
+     * we should not move out of play directory */
+    for (p = v->name; *p; ++p) {
+        if (ngx_path_separator(p[0]) &&
+            p[1] == '.' && p[2] == '.' &&
+            ngx_path_separator(p[3]))
+        {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                         "play: bad name '%s'", v->name);
+            return NGX_ERROR;
+        }
+    }
+
+    if (ctx == NULL) {
+        ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_play_ctx_t));
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_play_module);
+    }
+
+    ngx_memzero(ctx, sizeof(*ctx));
+
+    ctx->session = s;
+    ctx->aindex = ngx_rtmp_play_parse_index('a', v->args);
+    ctx->vindex = ngx_rtmp_play_parse_index('v', v->args);
+
+    ctx->file.log = s->connection->log;
+
+    ngx_memcpy(ctx->name, v->name, NGX_RTMP_MAX_NAME);
+
+    name.len = ngx_strlen(v->name);
+    name.data = v->name;
+
+    pfmt = pmcf->fmts.elts;
+
+    for (n = 0; n < pmcf->fmts.nelts; ++n, ++pfmt) {
+        fmt = *pfmt;
+
+        pfx = &fmt->pfx;
+        sfx = &fmt->sfx;
+
+        if (pfx->len == 0 && ctx->fmt == NULL) {
+            ctx->fmt = fmt;
+        }
+
+        if (pfx->len && name.len >= pfx->len &&
+            ngx_strncasecmp(pfx->data, name.data, pfx->len) == 0)
+        {
+            ctx->pfx_size = pfx->len;
+            ctx->fmt = fmt;
+
+            break;
+        }
+
+        if (name.len >= sfx->len &&
+            ngx_strncasecmp(sfx->data, name.data + name.len - sfx->len,
+                            sfx->len) == 0)
+        {
+            ctx->fmt = fmt;
+        }
+    }
+
+    if (ctx->fmt == NULL) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "play: fmt not found");
+        goto next;
+    }
+
+    ctx->file.fd = NGX_INVALID_FILE;
+    ctx->nentry = NGX_CONF_UNSET_UINT;
+    ctx->post_seek = NGX_CONF_UNSET_UINT;
+
+    sfx = &ctx->fmt->sfx;
+
+    if (name.len < sfx->len ||
+        ngx_strncasecmp(sfx->data, name.data + name.len - sfx->len,
+                        sfx->len))
+    {
+        ctx->sfx = *sfx;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: fmt=%V", &ctx->fmt->name);
+
+    return ngx_rtmp_play_next_entry(s, v);
+
+next:
+    return next_play(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_next_entry(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    ngx_rtmp_play_app_conf_t   *pacf;
+    ngx_rtmp_play_ctx_t        *ctx;
+    ngx_rtmp_play_entry_t      *pe;
+    u_char                     *p;
+    static u_char               path[NGX_MAX_PATH + 1];
+
+    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    for ( ;; ) {
+
+        if (ctx->file.fd != NGX_INVALID_FILE) {
+            ngx_close_file(ctx->file.fd);
+            ctx->file.fd = NGX_INVALID_FILE;
+        }
+
+        if (ctx->file_id) {
+            ngx_rtmp_play_cleanup_local_file(s);
+        }
+
+        ctx->nentry = (ctx->nentry == NGX_CONF_UNSET_UINT ?
+                       0 : ctx->nentry + 1);
+
+        if (ctx->nentry >= pacf->entries.nelts) {
+            ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "play: all entries failed");
+
+            ngx_rtmp_send_status(s, "NetStream.Play.StreamNotFound", "error",
+                                 "Video on demand stream not found");
+            break;
+        }
+
+        pe = ngx_rtmp_play_get_current_entry(s);
+
+        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "play: trying %s entry %ui/%uz '%V'",
+                       pe->url ? "remote" : "local",
+                       ctx->nentry + 1, pacf->entries.nelts,
+                       pe->url ? &pe->url->url : pe->root);
+
+        /* open remote */
+
+        if (pe->url) {
+            return ngx_rtmp_play_open_remote(s, v);
+        }
+
+        /* open local */
+
+        p = ngx_snprintf(path, NGX_MAX_PATH, "%V/%s%V",
+                         pe->root, v->name + ctx->pfx_size, &ctx->sfx);
+        *p = 0;
+
+        ctx->file.fd = ngx_open_file(path, NGX_FILE_RDONLY, NGX_FILE_OPEN,
+                                     NGX_FILE_DEFAULT_ACCESS);
+
+        if (ctx->file.fd == NGX_INVALID_FILE) {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, ngx_errno,
+                           "play: error opening file '%s'", path);
+            continue;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "play: open local file '%s'", path);
+
+        if (ngx_rtmp_play_open(s, v->start) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        break;
+    }
+
+    return next_play(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_open(ngx_rtmp_session_t *s, double start)
+{
+    ngx_rtmp_play_ctx_t    *ctx;
+    ngx_event_t            *e;
+    ngx_uint_t              timestamp;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx->file.fd == NGX_INVALID_FILE) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_send_stream_begin(s, NGX_RTMP_MSID) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_send_status(s, "NetStream.Play.Start", "status",
+                             "Start video on demand")
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_play_join(s) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    e = &ctx->send_evt;
+    e->data = s;
+    e->handler = ngx_rtmp_play_send;
+    e->log = s->connection->log;
+
+    ngx_rtmp_send_recorded(s, 1);
+
+    if (ngx_rtmp_send_sample_access(s) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_play_do_init(s) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    timestamp = ctx->post_seek != NGX_CONF_UNSET_UINT ? ctx->post_seek :
+                (start < 0 ? 0 : (ngx_uint_t) start);
+
+    if (ngx_rtmp_play_do_seek(s, timestamp) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_rtmp_play_do_start(s) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ctx->opened = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_play_remote_create(ngx_rtmp_session_t *s, void *arg, ngx_pool_t *pool)
+{
+    ngx_rtmp_play_t                *v = arg;
+
+    ngx_rtmp_play_ctx_t            *ctx;
+    ngx_rtmp_play_entry_t          *pe;
+    ngx_str_t                      *addr_text, uri;
+    u_char                         *p, *name;
+    size_t                          args_len, name_len, len;
+    static ngx_str_t                text_plain = ngx_string("text/plain");
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    pe = ngx_rtmp_play_get_current_entry(s);
+
+    name = v->name + ctx->pfx_size;
+
+    name_len = ngx_strlen(name);
+    args_len = ngx_strlen(v->args);
+    addr_text = &s->connection->addr_text;
+
+    len = pe->url->uri.len + 1 +
+          name_len + ctx->sfx.len +
+          sizeof("?addr=") + addr_text->len * 3 +
+          1 + args_len;
+
+    uri.data = ngx_palloc(pool, len);
+    if (uri.data == NULL) {
+        return NULL;
+    }
+
+    p = uri.data;
+
+    p = ngx_cpymem(p, pe->url->uri.data, pe->url->uri.len);
+
+    if (p == uri.data || p[-1] != '/') {
+        *p++ = '/';
+    }
+
+    p = ngx_cpymem(p, name, name_len);
+    p = ngx_cpymem(p, ctx->sfx.data, ctx->sfx.len);
+    p = ngx_cpymem(p, (u_char*)"?addr=", sizeof("&addr=") -1);
+    p = (u_char*)ngx_escape_uri(p, addr_text->data, addr_text->len,
+                                NGX_ESCAPE_ARGS);
+    if (args_len) {
+        *p++ = '&';
+        p = (u_char *) ngx_cpymem(p, v->args, args_len);
+    }
+
+    uri.len = p - uri.data;
+
+    return ngx_rtmp_netcall_http_format_request(NGX_RTMP_NETCALL_HTTP_GET,
+                                                &pe->url->host, &uri,
+                                                NULL, NULL, pool, &text_plain);
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_remote_handle(ngx_rtmp_session_t *s, void *arg, ngx_chain_t *in)
+{
+    ngx_rtmp_play_t        *v = arg;
+
+    ngx_rtmp_play_ctx_t    *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    if (ctx->nbody == 0) {
+        return ngx_rtmp_play_next_entry(s, v);
+    }
+
+    if (ctx->file_id) {
+        ngx_rtmp_play_copy_local_file(s, v->name);
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: open remote file");
+
+    if (ngx_rtmp_play_open(s, v->start) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return next_play(s, (ngx_rtmp_play_t *)arg);
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_remote_sink(ngx_rtmp_session_t *s, ngx_chain_t *in)
+{
+    ngx_rtmp_play_ctx_t    *ctx;
+    ngx_buf_t              *b;
+    ngx_int_t               rc;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    /* skip HTTP header */
+    while (in && ctx->ncrs != 2) {
+        b = in->buf;
+
+        for (; b->pos != b->last && ctx->ncrs != 2; ++b->pos) {
+            switch (*b->pos) {
+                case '\n':
+                    ++ctx->ncrs;
+                case '\r':
+                    break;
+                default:
+                    ctx->ncrs = 0;
+            }
+            /* 10th header byte is HTTP response header */
+            if (++ctx->nheader == 10 && *b->pos != (u_char) '2') {
+                ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                              "play: remote HTTP response code: %cxx",
+                              *b->pos);
+                return NGX_ERROR;
+            }
+        }
+
+        if (b->pos == b->last) {
+            in = in->next;
+        }
+    }
+
+    /* write to temp file */
+    for (; in; in = in->next) {
+        b = in->buf;
+
+        if (b->pos == b->last) {
+            continue;
+        }
+
+        rc = ngx_write_fd(ctx->file.fd, b->pos, b->last - b->pos);
+
+        if (rc == NGX_ERROR) {
+            ngx_log_error(NGX_LOG_INFO, s->connection->log, ngx_errno,
+                          "play: error writing to temp file");
+            return NGX_ERROR;
+        }
+
+        ctx->nbody += rc;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_rtmp_play_entry_t *
+ngx_rtmp_play_get_current_entry(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_app_conf_t   *pacf;
+    ngx_rtmp_play_ctx_t        *ctx;
+    ngx_rtmp_play_entry_t     **ppe;
+
+    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    ppe = pacf->entries.elts;
+
+    return ppe[ctx->nentry];
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_open_remote(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    ngx_rtmp_play_app_conf_t       *pacf;
+    ngx_rtmp_play_ctx_t            *ctx;
+    ngx_rtmp_play_entry_t          *pe;
+    ngx_rtmp_netcall_init_t         ci;
+    u_char                         *path;
+    ngx_err_t                       err;
+    static ngx_uint_t               file_id;
+
+    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
+
+    ctx->ncrs = 0;
+    ctx->nheader = 0;
+    ctx->nbody = 0;
+
+    for ( ;; ) {
+        ctx->file_id = ++file_id;
+
+        /* no zero after overflow */
+        if (ctx->file_id == 0) {
+            continue;
+        }
+
+        path = ngx_rtmp_play_get_local_file_path(s);
+
+        ctx->file.fd = ngx_open_tempfile(path, pacf->local_path.len, 0);
+
+        if (pacf->local_path.len == 0) {
+            ctx->file_id = 0;
+        }
+
+        if (ctx->file.fd != NGX_INVALID_FILE) {
+            break;
+        }
+
+        err = ngx_errno;
+
+        if (err != NGX_EEXIST) {
+            ctx->file_id = 0;
+
+            ngx_log_error(NGX_LOG_INFO, s->connection->log, err,
+                          "play: failed to create temp file");
+
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "play: temp file '%s' file_id=%ui",
+                   path, ctx->file_id);
+
+    pe = ngx_rtmp_play_get_current_entry(s);
+
+    ngx_memzero(&ci, sizeof(ci));
+
+    ci.url = pe->url;
+    ci.create = ngx_rtmp_play_remote_create;
+    ci.sink   = ngx_rtmp_play_remote_sink;
+    ci.handle = ngx_rtmp_play_remote_handle;
+    ci.arg = v;
+    ci.argsize = sizeof(*v);
+
+    return ngx_rtmp_netcall_create(s, &ci);
+}
+
+
+static char *
+ngx_rtmp_play_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_rtmp_play_app_conf_t       *pacf = conf;
+
+    ngx_rtmp_play_entry_t          *pe, **ppe;
+    ngx_str_t                       url;
+    ngx_url_t                      *u;
+    size_t                          add, n;
+    ngx_str_t                      *value;
+
+    if (pacf->entries.nalloc == 0 &&
+        ngx_array_init(&pacf->entries, cf->pool, 1, sizeof(void *)) != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    for (n = 1; n < cf->args->nelts; ++n) {
+
+        ppe = ngx_array_push(&pacf->entries);
+        if (ppe == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        pe = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_entry_t));
+        if (pe == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *ppe = pe;
+
+        if (ngx_strncasecmp(value[n].data, (u_char *) "http://", 7)) {
+
+            /* local file */
+
+            pe->root = ngx_palloc(cf->pool, sizeof(ngx_str_t));
+            if (pe->root == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            *pe->root = value[n];
+
+            continue;
+        }
+
+        /* http case */
+
+        url = value[n];
+
+        add = sizeof("http://") - 1;
+
+        url.data += add;
+        url.len  -= add;
+
+        u = ngx_pcalloc(cf->pool, sizeof(ngx_url_t));
+        if (u == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        u->url.len = url.len;
+        u->url.data = url.data;
+        u->default_port = 80;
+        u->uri_part = 1;
+
+        if (ngx_parse_url(cf->pool, u) != NGX_OK) {
+            if (u->err) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                        "%s in url \"%V\"", u->err, &u->url);
+            }
+            return NGX_CONF_ERROR;
+        }
+
+        pe->url = u;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_play_postconfiguration(ngx_conf_t *cf)
+{
+    next_play = ngx_rtmp_play;
+    ngx_rtmp_play = ngx_rtmp_play_play;
+
+    next_close_stream = ngx_rtmp_close_stream;
+    ngx_rtmp_close_stream = ngx_rtmp_play_close_stream;
+
+    next_seek = ngx_rtmp_seek;
+    ngx_rtmp_seek = ngx_rtmp_play_seek;
+
+    next_pause = ngx_rtmp_pause;
+    ngx_rtmp_pause = ngx_rtmp_play_pause;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_play_module.h b/debian/modules/nginx-rtmp/ngx_rtmp_play_module.h
new file mode 100644
index 0000000..b0650b5
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_play_module.h
@@ -0,0 +1,93 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_PLAY_H_INCLUDED_
+#define _NGX_RTMP_PLAY_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_cmd_module.h"
+
+
+typedef ngx_int_t (*ngx_rtmp_play_init_pt)  (ngx_rtmp_session_t *s,
+        ngx_file_t *f, ngx_int_t aindex, ngx_int_t vindex);
+typedef ngx_int_t (*ngx_rtmp_play_done_pt)  (ngx_rtmp_session_t *s,
+        ngx_file_t *f);
+typedef ngx_int_t (*ngx_rtmp_play_start_pt) (ngx_rtmp_session_t *s,
+        ngx_file_t *f);
+typedef ngx_int_t (*ngx_rtmp_play_seek_pt)  (ngx_rtmp_session_t *s,
+        ngx_file_t *f, ngx_uint_t offs);
+typedef ngx_int_t (*ngx_rtmp_play_stop_pt)  (ngx_rtmp_session_t *s,
+        ngx_file_t *f);
+typedef ngx_int_t (*ngx_rtmp_play_send_pt)  (ngx_rtmp_session_t *s,
+        ngx_file_t *f, ngx_uint_t *ts);
+
+
+typedef struct {
+    ngx_str_t               name;
+    ngx_str_t               pfx;
+    ngx_str_t               sfx;
+
+    ngx_rtmp_play_init_pt   init;
+    ngx_rtmp_play_done_pt   done;
+    ngx_rtmp_play_start_pt  start;
+    ngx_rtmp_play_seek_pt   seek;
+    ngx_rtmp_play_stop_pt   stop;
+    ngx_rtmp_play_send_pt   send;
+} ngx_rtmp_play_fmt_t;
+
+
+typedef struct ngx_rtmp_play_ctx_s ngx_rtmp_play_ctx_t;
+
+
+struct ngx_rtmp_play_ctx_s {
+    ngx_rtmp_session_t     *session;
+    ngx_file_t              file;
+    ngx_rtmp_play_fmt_t    *fmt;
+    ngx_event_t             send_evt;
+    unsigned                playing:1;
+    unsigned                opened:1;
+    unsigned                joined:1;
+    ngx_uint_t              ncrs;
+    ngx_uint_t              nheader;
+    ngx_uint_t              nbody;
+    size_t                  pfx_size;
+    ngx_str_t               sfx;
+    ngx_uint_t              file_id;
+    ngx_int_t               aindex, vindex;
+    ngx_uint_t              nentry;
+    ngx_uint_t              post_seek;
+    u_char                  name[NGX_RTMP_MAX_NAME];
+    ngx_rtmp_play_ctx_t    *next;
+};
+
+
+typedef struct {
+    ngx_str_t              *root;
+    ngx_url_t              *url;
+} ngx_rtmp_play_entry_t;
+
+
+typedef struct {
+    ngx_str_t               temp_path;
+    ngx_str_t               local_path;
+    ngx_array_t             entries; /* ngx_rtmp_play_entry_t * */
+    ngx_uint_t              nbuckets;
+    ngx_rtmp_play_ctx_t   **ctx;
+} ngx_rtmp_play_app_conf_t;
+
+
+typedef struct {
+    ngx_array_t             fmts; /* ngx_rtmp_play_fmt_t * */
+} ngx_rtmp_play_main_conf_t;
+
+
+extern ngx_module_t         ngx_rtmp_play_module;
+
+
+#endif /* _NGX_RTMP_PLAY_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.c b/debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.c
new file mode 100644
index 0000000..ffa2680
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.c
@@ -0,0 +1,197 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <nginx.h>
+#include "ngx_rtmp_proxy_protocol.h"
+
+
+static void ngx_rtmp_proxy_protocol_recv(ngx_event_t *rev);
+
+
+void
+ngx_rtmp_proxy_protocol(ngx_rtmp_session_t *s)
+{
+    ngx_event_t       *rev;
+    ngx_connection_t  *c;
+
+    c = s->connection;
+    rev = c->read;
+    rev->handler =  ngx_rtmp_proxy_protocol_recv;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "proxy_protocol: start");
+
+    if (rev->ready) {
+        /* the deferred accept(), rtsig, aio, iocp */
+
+        if (ngx_use_accept_mutex) {
+            ngx_post_event(rev, &ngx_posted_events);
+            return;
+        }
+
+        rev->handler(rev);
+        return;
+    }
+
+    ngx_add_timer(rev, s->timeout);
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+}
+
+
+static void
+ngx_rtmp_proxy_protocol_recv(ngx_event_t *rev)
+{
+    u_char               buf[107], *p, *pp, *text;
+    size_t               len;
+    ssize_t              n;
+    ngx_err_t            err;
+    ngx_int_t            i;
+    ngx_addr_t           addr;
+    ngx_connection_t    *c;
+    ngx_rtmp_session_t  *s;
+
+    c = rev->data;
+    s = c->data;
+
+    if (c->destroyed) {
+        return;
+    }
+
+    if (rev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
+                "proxy_protocol: recv: client timed out");
+        c->timedout = 1;
+        ngx_rtmp_finalize_session(s);
+        return;
+    }
+
+    if (rev->timer_set) {
+        ngx_del_timer(rev);
+    }
+
+    n = recv(c->fd, (char *) buf, sizeof(buf), MSG_PEEK);
+
+    err = ngx_socket_errno;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0, "recv(): %d", n);
+
+    if (n == -1) {
+
+        if (err == NGX_EAGAIN) {
+            ngx_add_timer(rev, s->timeout);
+
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                ngx_rtmp_finalize_session(s);
+            }
+
+            return;
+        }
+
+        ngx_rtmp_finalize_session(s);
+
+        return;
+    }
+
+    p = buf;
+
+    if (n <= 8 && ngx_strncmp(p, "PROXY ", 6) != 0) {
+        goto bad_header;
+    }
+
+    n -= 6;
+    p += 6;
+
+    ngx_memzero(&addr, sizeof(ngx_addr_t));
+
+    if (n >= 7 && ngx_strncmp(p, "UNKNOWN", 7) == 0) {
+        n -= 7;
+        p += 7;
+        goto skip;
+    }
+
+    if (n < 5 || ngx_strncmp(p, "TCP", 3) != 0
+        || (p[3] != '4' && p[3] != '6') || p[4] != ' ')
+    {
+        goto bad_header;
+    }
+
+    n -= 5;
+    p += 5;
+
+    pp = ngx_strlchr(p, p + n, ' ');
+
+    if (pp == NULL) {
+        goto bad_header;
+    }
+
+    if (ngx_parse_addr(s->connection->pool, &addr, p, pp - p) != NGX_OK) {
+        goto bad_header;
+    }
+
+    n -= pp - p;
+    p = pp;
+
+skip:
+
+    for (i = 0; i + 1 < n; i++) {
+        if (p[i] == CR && p[i + 1] == LF) {
+            break;
+        }
+    }
+
+    if (i + 1 >= n) {
+        goto bad_header;
+    }
+
+    n = p - buf + i + 2;
+
+    if (c->recv(c, buf, n) != n) {
+        goto failed;
+    }
+
+    if (addr.socklen) {
+        text = ngx_palloc(s->connection->pool, NGX_SOCKADDR_STRLEN);
+
+        if (text == NULL) {
+            goto failed;
+        }
+
+        len = ngx_sock_ntop(addr.sockaddr,
+#if (nginx_version >= 1005003)
+                            addr.socklen,
+#endif
+                            text, NGX_SOCKADDR_STRLEN, 0);
+        if (len == 0) {
+            goto failed;
+        }
+
+        c->sockaddr = addr.sockaddr;
+        c->socklen = addr.socklen;
+        c->addr_text.data = text;
+        c->addr_text.len = len;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0,
+                       "proxy_protocol: remote_addr:'%V'", &c->addr_text);
+    }
+
+    ngx_rtmp_handshake(s);
+
+    return;
+
+bad_header:
+
+    ngx_log_error(NGX_LOG_INFO, c->log, 0, "proxy_protocol: bad header");
+
+failed:
+
+    ngx_rtmp_finalize_session(s);
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.h b/debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.h
new file mode 100644
index 0000000..e873c3c
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.h
@@ -0,0 +1,19 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_PROXY_PROTOCOL_H_INCLUDED_
+#define _NGX_RTMP_PROXY_PROTOCOL_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+
+
+void ngx_rtmp_proxy_protocol(ngx_rtmp_session_t *c);
+
+
+#endif /* _NGX_RTMP_PROXY_PROTOCOL_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_receive.c b/debian/modules/nginx-rtmp/ngx_rtmp_receive.c
new file mode 100644
index 0000000..73d617c
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_receive.c
@@ -0,0 +1,464 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_amf.h"
+#include "ngx_rtmp_cmd_module.h"
+#include <string.h>
+
+
+ngx_int_t
+ngx_rtmp_protocol_message_handler(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in)
+{
+    ngx_buf_t              *b;
+    u_char                 *p;
+    uint32_t                val;
+    uint8_t                 limit;
+
+    b = in->buf;
+
+    if (b->last - b->pos < 4) {
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "too small buffer for %d message: %d",
+                (int)h->type, b->last - b->pos);
+        return NGX_OK;
+    }
+
+    p = (u_char*)&val;
+    p[0] = b->pos[3];
+    p[1] = b->pos[2];
+    p[2] = b->pos[1];
+    p[3] = b->pos[0];
+
+    switch(h->type) {
+        case NGX_RTMP_MSG_CHUNK_SIZE:
+            /* set chunk size =val */
+            ngx_rtmp_set_chunk_size(s, val);
+            break;
+
+        case NGX_RTMP_MSG_ABORT:
+            /* abort chunk stream =val */
+            break;
+
+        case NGX_RTMP_MSG_ACK:
+            /* receive ack with sequence number =val */
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "receive ack seq=%uD", val);
+            break;
+
+        case NGX_RTMP_MSG_ACK_SIZE:
+            /* receive window size =val */
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "receive ack_size=%uD", val);
+            s->ack_size = val;
+            break;
+
+        case NGX_RTMP_MSG_BANDWIDTH:
+            if (b->last - b->pos >= 5) {
+                limit = *(uint8_t*)&b->pos[4];
+
+                (void)val;
+                (void)limit;
+
+                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                    "receive bandwidth=%uD limit=%d",
+                    val, (int)limit);
+
+                /* receive window size =val
+                 * && limit */
+            }
+            break;
+
+        default:
+            return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                              ngx_chain_t *in)
+{
+    ngx_buf_t              *b;
+    u_char                 *p;
+    uint16_t                evt;
+    uint32_t                val;
+
+    b = in->buf;
+
+    if (b->last - b->pos < 6) {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "too small buffer for user message: %d",
+                       b->last - b->pos);
+        return NGX_OK;
+    }
+
+    p = (u_char*)&evt;
+
+    p[0] = b->pos[1];
+    p[1] = b->pos[0];
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "RTMP recv user evt %s (%i)",
+                   ngx_rtmp_user_message_type(evt), (ngx_int_t) evt);
+
+    p = (u_char *) &val;
+
+    p[0] = b->pos[5];
+    p[1] = b->pos[4];
+    p[2] = b->pos[3];
+    p[3] = b->pos[2];
+
+    switch(evt) {
+        case NGX_RTMP_USER_STREAM_BEGIN:
+            {
+                ngx_rtmp_stream_begin_t     v;
+
+                v.msid = val;
+
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "receive: stream_begin msid=%uD", v.msid);
+
+                return ngx_rtmp_stream_begin(s, &v);
+            }
+
+        case NGX_RTMP_USER_STREAM_EOF:
+            {
+                ngx_rtmp_stream_eof_t       v;
+
+                v.msid = val;
+
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "receive: stream_eof msid=%uD", v.msid);
+
+                return ngx_rtmp_stream_eof(s, &v);
+            }
+
+        case NGX_RTMP_USER_STREAM_DRY:
+            {
+                ngx_rtmp_stream_dry_t       v;
+
+                v.msid = val;
+
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "receive: stream_dry msid=%uD", v.msid);
+
+                return ngx_rtmp_stream_dry(s, &v);
+            }
+
+        case NGX_RTMP_USER_SET_BUFLEN:
+            {
+                ngx_rtmp_set_buflen_t       v;
+
+                v.msid = val;
+
+                if (b->last - b->pos < 10) {
+                    return NGX_OK;
+                }
+
+                p = (u_char *) &v.buflen;
+
+                p[0] = b->pos[9];
+                p[1] = b->pos[8];
+                p[2] = b->pos[7];
+                p[3] = b->pos[6];
+
+                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "receive: set_buflen msid=%uD buflen=%uD",
+                               v.msid, v.buflen);
+
+                /*TODO: move this to play module */
+                s->buflen = v.buflen;
+
+                return ngx_rtmp_set_buflen(s, &v);
+            }
+
+        case NGX_RTMP_USER_RECORDED:
+            {
+                ngx_rtmp_recorded_t       v;
+
+                v.msid = val;
+
+                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                               "receive: recorded msid=%uD", v.msid);
+
+                return ngx_rtmp_recorded(s, &v);
+            }
+
+        case NGX_RTMP_USER_PING_REQUEST:
+            return ngx_rtmp_send_ping_response(s, val);
+
+        case NGX_RTMP_USER_PING_RESPONSE:
+
+            /* val = incoming timestamp */
+
+            ngx_rtmp_reset_ping(s);
+
+            return NGX_OK;
+
+        default:
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "unexpected user event: %i", (ngx_int_t) evt);
+
+            return NGX_OK;
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_fetch(ngx_chain_t **in, u_char *ret)
+{
+    while (*in && (*in)->buf->pos >= (*in)->buf->last) {
+        *in = (*in)->next;
+    }
+
+    if (*in == NULL) {
+        return NGX_DONE;
+    }
+
+    *ret = *(*in)->buf->pos++;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_fetch_uint8(ngx_chain_t **in, uint8_t *ret)
+{
+    return ngx_rtmp_fetch(in, (u_char *) ret);
+}
+
+
+static ngx_int_t
+ngx_rtmp_fetch_uint32(ngx_chain_t **in, uint32_t *ret, ngx_int_t n)
+{
+    u_char     *r = (u_char *) ret;
+    ngx_int_t   rc;
+
+    *ret = 0;
+
+    while (--n >= 0) {
+        rc = ngx_rtmp_fetch(in, &r[n]);
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_aggregate_message_handler(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                                   ngx_chain_t *in)
+{
+    uint32_t            base_time, timestamp, prev_size;
+    size_t              len;
+    ngx_int_t           first;
+    u_char             *last;
+    ngx_int_t           rc;
+    ngx_buf_t          *b;
+    ngx_chain_t        *cl, *next;
+    ngx_rtmp_header_t   ch;
+
+    ch = *h;
+
+    first = 1;
+    base_time = 0;
+
+    while (in) {
+        if (ngx_rtmp_fetch_uint8(&in, &ch.type) != NGX_OK) {
+            return NGX_OK;
+        }
+
+        if (ngx_rtmp_fetch_uint32(&in, &ch.mlen, 3) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_rtmp_fetch_uint32(&in, &timestamp, 3) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_rtmp_fetch_uint8(&in, (uint8_t *) &timestamp + 3) != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        if (ngx_rtmp_fetch_uint32(&in, &ch.msid, 3) != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        if (first) {
+            base_time = timestamp;
+            first = 0;
+        }
+
+        ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "RTMP aggregate %s (%d) len=%uD time=%uD (+%D) msid=%uD",
+                       ngx_rtmp_message_type(ch.type),
+                       (ngx_int_t) ch.type, ch.mlen, ch.timestamp,
+                       timestamp - base_time, ch.msid);
+
+        /* limit chain */
+
+        len = 0;
+        cl = in;
+        while (cl) {
+            b = cl->buf;
+            len += (b->last - b->pos);
+            if (len > ch.mlen) {
+                break;
+            }
+            cl = cl->next;
+        }
+
+        if (cl == NULL) {
+            ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                          "RTMP error parsing aggregate");
+            return NGX_ERROR;
+        }
+
+        next = cl->next;
+        cl->next = NULL;
+        b = cl->buf;
+        last = b->last;
+        b->last -= (len - ch.mlen);
+
+        /* handle aggregated message */
+
+        ch.timestamp = h->timestamp + timestamp - base_time;
+
+        rc = ngx_rtmp_receive_message(s, &ch, in);
+
+        /* restore chain before checking the result */
+
+        in = cl;
+        in->next = next;
+        b->pos = b->last;
+        b->last = last;
+
+        if (rc != NGX_OK) {
+            return rc;
+        }
+
+        /* read 32-bit previous tag size */
+
+        if (ngx_rtmp_fetch_uint32(&in, &prev_size, 4) != NGX_OK) {
+            return NGX_OK;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "RTMP aggregate prev_size=%uD", prev_size);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_amf_message_handler(ngx_rtmp_session_t *s,
+        ngx_rtmp_header_t *h, ngx_chain_t *in)
+{
+    ngx_rtmp_amf_ctx_t          act;
+    ngx_rtmp_core_main_conf_t  *cmcf;
+    ngx_array_t                *ch;
+    ngx_rtmp_handler_pt        *ph;
+    size_t                      len, n;
+
+    static u_char               func[128];
+
+    static ngx_rtmp_amf_elt_t   elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          func,   sizeof(func) },
+    };
+
+    /* AMF command names come with string type, but shared object names
+     * come without type */
+    if (h->type == NGX_RTMP_MSG_AMF_SHARED ||
+        h->type == NGX_RTMP_MSG_AMF3_SHARED)
+    {
+        elts[0].type |= NGX_RTMP_AMF_TYPELESS;
+    } else {
+        elts[0].type &= ~NGX_RTMP_AMF_TYPELESS;
+    }
+
+    if ((h->type == NGX_RTMP_MSG_AMF3_SHARED ||
+         h->type == NGX_RTMP_MSG_AMF3_META ||
+         h->type == NGX_RTMP_MSG_AMF3_CMD)
+         && in->buf->last > in->buf->pos)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "AMF3 prefix: %ui", (ngx_int_t)*in->buf->pos);
+        ++in->buf->pos;
+    }
+
+    cmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_core_module);
+
+    /* read AMF func name & transaction id */
+    ngx_memzero(&act, sizeof(act));
+    act.link = in;
+    act.log = s->connection->log;
+    memset(func, 0, sizeof(func));
+
+    if (ngx_rtmp_amf_read(&act, elts,
+                sizeof(elts) / sizeof(elts[0])) != NGX_OK)
+    {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "AMF cmd failed");
+        return NGX_ERROR;
+    }
+
+    /* skip name */
+    in = act.link;
+    in->buf->pos += act.offset;
+
+    len = ngx_strlen(func);
+
+    ch = ngx_hash_find(&cmcf->amf_hash,
+            ngx_hash_strlow(func, func, len), func, len);
+
+    if (ch && ch->nelts) {
+        ph = ch->elts;
+        for (n = 0; n < ch->nelts; ++n, ++ph) {
+            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                "AMF func '%s' passed to handler %d/%d",
+                func, n, ch->nelts);
+            switch ((*ph)(s, h, in)) {
+                case NGX_ERROR:
+                    return NGX_ERROR;
+                case NGX_DONE:
+                    return NGX_OK;
+            }
+        }
+    } else {
+        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "AMF cmd '%s' no handler", func);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_receive_amf(ngx_rtmp_session_t *s, ngx_chain_t *in,
+        ngx_rtmp_amf_elt_t *elts, size_t nelts)
+{
+    ngx_rtmp_amf_ctx_t     act;
+
+    ngx_memzero(&act, sizeof(act));
+    act.link = in;
+    act.log = s->connection->log;
+
+    return ngx_rtmp_amf_read(&act, elts, nelts);
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_record_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_record_module.c
new file mode 100644
index 0000000..dc2de12
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_record_module.c
@@ -0,0 +1,1307 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_cmd_module.h"
+#include "ngx_rtmp_netcall_module.h"
+#include "ngx_rtmp_codec_module.h"
+#include "ngx_rtmp_record_module.h"
+
+
+ngx_rtmp_record_done_pt             ngx_rtmp_record_done;
+
+
+static ngx_rtmp_publish_pt          next_publish;
+static ngx_rtmp_close_stream_pt     next_close_stream;
+static ngx_rtmp_stream_begin_pt     next_stream_begin;
+static ngx_rtmp_stream_eof_pt       next_stream_eof;
+
+
+static char *ngx_rtmp_record_recorder(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static ngx_int_t ngx_rtmp_record_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_record_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_record_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+static ngx_int_t ngx_rtmp_record_write_frame(ngx_rtmp_session_t *s,
+       ngx_rtmp_record_rec_ctx_t *rctx,
+       ngx_rtmp_header_t *h, ngx_chain_t *in, ngx_int_t inc_nframes);
+static ngx_int_t ngx_rtmp_record_av(ngx_rtmp_session_t *s,
+       ngx_rtmp_header_t *h, ngx_chain_t *in);
+static ngx_int_t ngx_rtmp_record_node_av(ngx_rtmp_session_t *s,
+       ngx_rtmp_record_rec_ctx_t *rctx, ngx_rtmp_header_t *h, ngx_chain_t *in);
+static ngx_int_t ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
+       ngx_rtmp_record_rec_ctx_t *rctx);
+static ngx_int_t ngx_rtmp_record_node_close(ngx_rtmp_session_t *s,
+       ngx_rtmp_record_rec_ctx_t *rctx);
+static void  ngx_rtmp_record_make_path(ngx_rtmp_session_t *s,
+       ngx_rtmp_record_rec_ctx_t *rctx, ngx_str_t *path);
+static ngx_int_t ngx_rtmp_record_init(ngx_rtmp_session_t *s);
+
+
+static ngx_conf_bitmask_t  ngx_rtmp_record_mask[] = {
+    { ngx_string("off"),                NGX_RTMP_RECORD_OFF         },
+    { ngx_string("all"),                NGX_RTMP_RECORD_AUDIO       |
+                                        NGX_RTMP_RECORD_VIDEO       },
+    { ngx_string("audio"),              NGX_RTMP_RECORD_AUDIO       },
+    { ngx_string("video"),              NGX_RTMP_RECORD_VIDEO       },
+    { ngx_string("keyframes"),          NGX_RTMP_RECORD_KEYFRAMES   },
+    { ngx_string("manual"),             NGX_RTMP_RECORD_MANUAL      },
+    { ngx_null_string,                  0                           }
+};
+
+
+static ngx_command_t  ngx_rtmp_record_commands[] = {
+
+    { ngx_string("record"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_1MORE,
+      ngx_conf_set_bitmask_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, flags),
+      ngx_rtmp_record_mask },
+
+    { ngx_string("record_path"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, path),
+      NULL },
+
+    { ngx_string("record_suffix"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, suffix),
+      NULL },
+
+    { ngx_string("record_unique"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, unique),
+      NULL },
+
+    { ngx_string("record_append"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, append),
+      NULL },
+
+    { ngx_string("record_lock"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, lock_file),
+      NULL },
+
+    { ngx_string("record_max_size"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, max_size),
+      NULL },
+
+    { ngx_string("record_max_frames"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, max_frames),
+      NULL },
+
+    { ngx_string("record_interval"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, interval),
+      NULL },
+
+    { ngx_string("record_notify"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
+                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_record_app_conf_t, notify),
+      NULL },
+
+    { ngx_string("recorder"),
+      NGX_RTMP_APP_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
+      ngx_rtmp_record_recorder,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_record_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_record_postconfiguration,      /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    ngx_rtmp_record_create_app_conf,        /* create app configuration */
+    ngx_rtmp_record_merge_app_conf          /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_record_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_record_module_ctx,            /* module context */
+    ngx_rtmp_record_commands,               /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_rtmp_record_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_record_app_conf_t      *racf;
+
+    racf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_record_app_conf_t));
+
+    if (racf == NULL) {
+        return NULL;
+    }
+
+    racf->max_size = NGX_CONF_UNSET_SIZE;
+    racf->max_frames = NGX_CONF_UNSET_SIZE;
+    racf->interval = NGX_CONF_UNSET_MSEC;
+    racf->unique = NGX_CONF_UNSET;
+    racf->append = NGX_CONF_UNSET;
+    racf->lock_file = NGX_CONF_UNSET;
+    racf->notify = NGX_CONF_UNSET;
+    racf->url = NGX_CONF_UNSET_PTR;
+
+    if (ngx_array_init(&racf->rec, cf->pool, 1, sizeof(void *)) != NGX_OK) {
+        return NULL;
+    }
+
+    return racf;
+}
+
+
+static char *
+ngx_rtmp_record_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_record_app_conf_t     *prev = parent;
+    ngx_rtmp_record_app_conf_t     *conf = child;
+    ngx_rtmp_record_app_conf_t    **rracf;
+
+    ngx_conf_merge_str_value(conf->path, prev->path, "");
+    ngx_conf_merge_str_value(conf->suffix, prev->suffix, ".flv");
+    ngx_conf_merge_size_value(conf->max_size, prev->max_size, 0);
+    ngx_conf_merge_size_value(conf->max_frames, prev->max_frames, 0);
+    ngx_conf_merge_value(conf->unique, prev->unique, 0);
+    ngx_conf_merge_value(conf->append, prev->append, 0);
+    ngx_conf_merge_value(conf->lock_file, prev->lock_file, 0);
+    ngx_conf_merge_value(conf->notify, prev->notify, 0);
+    ngx_conf_merge_msec_value(conf->interval, prev->interval,
+                              (ngx_msec_t) NGX_CONF_UNSET);
+    ngx_conf_merge_bitmask_value(conf->flags, prev->flags, 0);
+    ngx_conf_merge_ptr_value(conf->url, prev->url, NULL);
+
+    if (conf->flags) {
+        rracf = ngx_array_push(&conf->rec);
+        if (rracf == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *rracf = conf;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_write_header(ngx_file_t *file)
+{
+    static u_char       flv_header[] = {
+        0x46, /* 'F' */
+        0x4c, /* 'L' */
+        0x56, /* 'V' */
+        0x01, /* version = 1 */
+        0x05, /* 00000 1 0 1 = has audio & video */
+        0x00,
+        0x00,
+        0x00,
+        0x09, /* header size */
+        0x00,
+        0x00,
+        0x00,
+        0x00  /* PreviousTagSize0 (not actually a header) */
+    };
+
+    return ngx_write_file(file, flv_header, sizeof(flv_header), 0) == NGX_ERROR
+           ? NGX_ERROR
+           : NGX_OK;
+}
+
+
+static ngx_rtmp_record_rec_ctx_t *
+ngx_rtmp_record_get_node_ctx(ngx_rtmp_session_t *s, ngx_uint_t n)
+{
+    ngx_rtmp_record_ctx_t          *ctx;
+    ngx_rtmp_record_rec_ctx_t      *rctx;
+
+    if (ngx_rtmp_record_init(s) != NGX_OK) {
+        return NULL;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
+
+    if (n >= ctx->rec.nelts) {
+        return NULL;
+    }
+
+    rctx = ctx->rec.elts;
+
+    return &rctx[n];
+}
+
+
+ngx_int_t
+ngx_rtmp_record_open(ngx_rtmp_session_t *s, ngx_uint_t n, ngx_str_t *path)
+{
+    ngx_rtmp_record_rec_ctx_t      *rctx;
+    ngx_int_t                       rc;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: #%ui manual open", n);
+
+    rctx = ngx_rtmp_record_get_node_ctx(s, n);
+
+    if (rctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_rtmp_record_node_open(s, rctx);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    if (path) {
+        ngx_rtmp_record_make_path(s, rctx, path);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_record_close(ngx_rtmp_session_t *s, ngx_uint_t n, ngx_str_t *path)
+{
+    ngx_rtmp_record_rec_ctx_t      *rctx;
+    ngx_int_t                       rc;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: #%ui manual close", n);
+
+    rctx = ngx_rtmp_record_get_node_ctx(s, n);
+
+    if (rctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_rtmp_record_node_close(s, rctx);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    if (path) {
+        ngx_rtmp_record_make_path(s, rctx, path);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_uint_t
+ngx_rtmp_record_find(ngx_rtmp_record_app_conf_t *racf, ngx_str_t *id)
+{
+    ngx_rtmp_record_app_conf_t    **pracf, *rracf;
+    ngx_uint_t                      n;
+
+    pracf = racf->rec.elts;
+
+    for (n = 0; n < racf->rec.nelts; ++n, ++pracf) {
+        rracf = *pracf;
+
+        if (rracf->id.len == id->len &&
+            ngx_strncmp(rracf->id.data, id->data, id->len) == 0)
+        {
+            return n;
+        }
+    }
+
+    return NGX_CONF_UNSET_UINT;
+}
+
+
+/* This funcion returns pointer to a static buffer */
+static void
+ngx_rtmp_record_make_path(ngx_rtmp_session_t *s,
+                          ngx_rtmp_record_rec_ctx_t *rctx, ngx_str_t *path)
+{
+    ngx_rtmp_record_ctx_t          *ctx;
+    ngx_rtmp_record_app_conf_t     *rracf;
+    u_char                         *p, *l;
+    struct tm                       tm;
+
+    static u_char                   buf[NGX_TIME_T_LEN + 1];
+    static u_char                   pbuf[NGX_MAX_PATH + 1];
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
+
+    rracf = rctx->conf;
+
+    /* create file path */
+    p = pbuf;
+    l = pbuf + sizeof(pbuf) - 1;
+
+    p = ngx_cpymem(p, rracf->path.data,
+                ngx_min(rracf->path.len, (size_t)(l - p - 1)));
+    *p++ = '/';
+    p = (u_char *)ngx_escape_uri(p, ctx->name, ngx_min(ngx_strlen(ctx->name),
+                (size_t)(l - p)), NGX_ESCAPE_URI_COMPONENT);
+
+    /* append timestamp */
+    if (rracf->unique) {
+        p = ngx_cpymem(p, buf, ngx_min(ngx_sprintf(buf, "-%T",
+                       rctx->timestamp) - buf, l - p));
+    }
+
+    if (ngx_strchr(rracf->suffix.data, '%')) {
+        ngx_libc_localtime(rctx->timestamp, &tm);
+        p += strftime((char *) p, l - p, (char *) rracf->suffix.data, &tm);
+    } else {
+        p = ngx_cpymem(p, rracf->suffix.data,
+                ngx_min(rracf->suffix.len, (size_t)(l - p)));
+    }
+
+    *p = 0;
+    path->data = pbuf;
+    path->len  = p - pbuf;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: %V path: '%V'", &rracf->id, path);
+}
+
+
+static void
+ngx_rtmp_record_notify_error(ngx_rtmp_session_t *s,
+                             ngx_rtmp_record_rec_ctx_t *rctx)
+{
+    ngx_rtmp_record_app_conf_t *rracf = rctx->conf;
+
+    rctx->failed = 1;
+
+    if (!rracf->notify) {
+        return;
+    }
+
+    ngx_rtmp_send_status(s, "NetStream.Record.Failed", "error",
+                         rracf->id.data ? (char *) rracf->id.data : "");
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
+                          ngx_rtmp_record_rec_ctx_t *rctx)
+{
+    ngx_rtmp_record_app_conf_t *rracf;
+    ngx_err_t                   err;
+    ngx_str_t                   path;
+    ngx_int_t                   mode, create_mode;
+    u_char                      buf[8], *p;
+    off_t                       file_size;
+    uint32_t                    tag_size, mlen, timestamp;
+
+    rracf = rctx->conf;
+    tag_size = 0;
+
+    if (rctx->file.fd != NGX_INVALID_FILE) {
+        return NGX_AGAIN;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: %V opening", &rracf->id);
+
+    ngx_memzero(rctx, sizeof(*rctx));
+    rctx->conf = rracf;
+    rctx->last = *ngx_cached_time;
+    rctx->timestamp = ngx_cached_time->sec;
+
+    ngx_rtmp_record_make_path(s, rctx, &path);
+
+    mode = rracf->append ? NGX_FILE_RDWR : NGX_FILE_WRONLY;
+    create_mode = rracf->append ? NGX_FILE_CREATE_OR_OPEN : NGX_FILE_TRUNCATE;
+
+    ngx_memzero(&rctx->file, sizeof(rctx->file));
+    rctx->file.offset = 0;
+    rctx->file.log = s->connection->log;
+    rctx->file.fd = ngx_open_file(path.data, mode, create_mode,
+                                  NGX_FILE_DEFAULT_ACCESS);
+    ngx_str_set(&rctx->file.name, "recorded");
+
+    if (rctx->file.fd == NGX_INVALID_FILE) {
+        err = ngx_errno;
+
+        if (err != NGX_ENOENT) {
+            ngx_log_error(NGX_LOG_CRIT, s->connection->log, err,
+                          "record: %V failed to open file '%V'",
+                          &rracf->id, &path);
+        }
+
+        ngx_rtmp_record_notify_error(s, rctx);
+
+        return NGX_OK;
+    }
+
+#if !(NGX_WIN32)
+    if (rracf->lock_file) {
+        err = ngx_lock_fd(rctx->file.fd);
+        if (err) {
+            ngx_log_error(NGX_LOG_CRIT, s->connection->log, err,
+                          "record: %V lock failed", &rracf->id);
+        }
+    }
+#endif
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: %V opened '%V'", &rracf->id, &path);
+
+    if (rracf->notify) {
+        ngx_rtmp_send_status(s, "NetStream.Record.Start", "status",
+                             rracf->id.data ? (char *) rracf->id.data : "");
+    }
+
+    if (rracf->append) {
+
+        file_size = 0;
+        timestamp = 0;
+
+#if (NGX_WIN32)
+        {
+            LONG  lo, hi;
+
+            lo = 0;
+            hi = 0;
+            lo = SetFilePointer(rctx->file.fd, lo, &hi, FILE_END);
+            file_size = (lo == INVALID_SET_FILE_POINTER ?
+                         (off_t) -1 : (off_t) hi << 32 | (off_t) lo);
+        }
+#else
+        file_size = lseek(rctx->file.fd, 0, SEEK_END);
+#endif
+        if (file_size == (off_t) -1) {
+            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
+                          "record: %V seek failed", &rracf->id);
+            goto done;
+        }
+
+        if (file_size < 4) {
+            goto done;
+        }
+
+        if (ngx_read_file(&rctx->file, buf, 4, file_size - 4) != 4) {
+            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
+                          "record: %V tag size read failed", &rracf->id);
+            goto done;
+        }
+
+        p = (u_char *) &tag_size;
+        p[0] = buf[3];
+        p[1] = buf[2];
+        p[2] = buf[1];
+        p[3] = buf[0];
+
+        if (tag_size == 0 || tag_size + 4 > file_size) {
+            file_size = 0;
+            goto done;
+        }
+
+        if (ngx_read_file(&rctx->file, buf, 8, file_size - tag_size - 4) != 8)
+        {
+            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
+                          "record: %V tag read failed", &rracf->id);
+            goto done;
+        }
+
+        p = (u_char *) &mlen;
+        p[0] = buf[3];
+        p[1] = buf[2];
+        p[2] = buf[1];
+        p[3] = 0;
+
+        if (tag_size != mlen + 11) {
+            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
+                          "record: %V tag size mismatch: "
+                          "tag_size=%uD, mlen=%uD", &rracf->id, tag_size, mlen);
+            goto done;
+        }
+
+        p = (u_char *) &timestamp;
+        p[3] = buf[7];
+        p[0] = buf[6];
+        p[1] = buf[5];
+        p[2] = buf[4];
+
+done:
+        rctx->file.offset = file_size;
+        rctx->time_shift = timestamp;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "record: append offset=%O, time=%uD, tag_size=%uD",
+                       file_size, timestamp, tag_size);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_init(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_record_app_conf_t     *racf, **rracf;
+    ngx_rtmp_record_rec_ctx_t      *rctx;
+    ngx_rtmp_record_ctx_t          *ctx;
+    ngx_uint_t                      n;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
+
+    if (ctx) {
+        return NGX_OK;
+    }
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module);
+
+    if (racf == NULL || racf->rec.nelts == 0) {
+        return NGX_OK;
+    }
+
+    ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_record_ctx_t));
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_record_module);
+
+    if (ngx_array_init(&ctx->rec, s->connection->pool, racf->rec.nelts,
+                       sizeof(ngx_rtmp_record_rec_ctx_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    rracf = racf->rec.elts;
+
+    rctx = ngx_array_push_n(&ctx->rec, racf->rec.nelts);
+
+    if (rctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    for (n = 0; n < racf->rec.nelts; ++n, ++rracf, ++rctx) {
+        ngx_memzero(rctx, sizeof(*rctx));
+
+        rctx->conf = *rracf;
+        rctx->file.fd = NGX_INVALID_FILE;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_record_start(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_record_app_conf_t     *racf;
+    ngx_rtmp_record_rec_ctx_t      *rctx;
+    ngx_rtmp_record_ctx_t          *ctx;
+    ngx_uint_t                      n;
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module);
+    if (racf == NULL || racf->rec.nelts == 0) {
+        return;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: start");
+
+    rctx = ctx->rec.elts;
+    for (n = 0; n < ctx->rec.nelts; ++n, ++rctx) {
+        if (rctx->conf->flags & (NGX_RTMP_RECORD_OFF|NGX_RTMP_RECORD_MANUAL)) {
+            continue;
+        }
+        ngx_rtmp_record_node_open(s, rctx);
+    }
+}
+
+
+static void
+ngx_rtmp_record_stop(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_record_app_conf_t     *racf;
+    ngx_rtmp_record_rec_ctx_t      *rctx;
+    ngx_rtmp_record_ctx_t          *ctx;
+    ngx_uint_t                      n;
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module);
+    if (racf == NULL || racf->rec.nelts == 0) {
+        return;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: stop");
+
+    rctx = ctx->rec.elts;
+    for (n = 0; n < ctx->rec.nelts; ++n, ++rctx) {
+        ngx_rtmp_record_node_close(s, rctx);
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    ngx_rtmp_record_app_conf_t     *racf;
+    ngx_rtmp_record_ctx_t          *ctx;
+    u_char                         *p;
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module);
+
+    if (racf == NULL || racf->rec.nelts == 0) {
+        goto next;
+    }
+
+    if (ngx_rtmp_record_init(s) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: publish %ui nodes",
+                   racf->rec.nelts);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
+
+    ngx_memcpy(ctx->name, v->name, sizeof(ctx->name));
+    ngx_memcpy(ctx->args, v->args, sizeof(ctx->args));
+
+    /* terminate name on /../ */
+    for (p = ctx->name; *p; ++p) {
+        if (ngx_path_separator(p[0]) &&
+            p[1] == '.' && p[2] == '.' &&
+            ngx_path_separator(p[3]))
+        {
+            *p = 0;
+            break;
+        }
+    }
+
+    ngx_rtmp_record_start(s);
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
+{
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: stream_begin");
+
+    ngx_rtmp_record_start(s);
+
+next:
+    return next_stream_begin(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
+{
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: stream_eof");
+
+    ngx_rtmp_record_stop(s);
+
+next:
+    return next_stream_eof(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_node_close(ngx_rtmp_session_t *s,
+                           ngx_rtmp_record_rec_ctx_t *rctx)
+{
+    ngx_rtmp_record_app_conf_t *rracf;
+    ngx_err_t                   err;
+    void                      **app_conf;
+    ngx_int_t                   rc;
+    ngx_rtmp_record_done_t      v;
+    u_char                      av;
+
+    rracf = rctx->conf;
+
+    if (rctx->file.fd == NGX_INVALID_FILE) {
+        return NGX_AGAIN;
+    }
+
+    if (rctx->initialized) {
+        av = 0;
+
+        if (rctx->video) {
+            av |= 0x01;
+        }
+
+        if (rctx->audio) {
+            av |= 0x04;
+        }
+
+        if (ngx_write_file(&rctx->file, &av, 1, 4) == NGX_ERROR) {
+            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
+                          "record: %V error writing av mask", &rracf->id);
+        }
+    }
+
+    if (ngx_close_file(rctx->file.fd) == NGX_FILE_ERROR) {
+        err = ngx_errno;
+        ngx_log_error(NGX_LOG_CRIT, s->connection->log, err,
+                      "record: %V error closing file", &rracf->id);
+
+        ngx_rtmp_record_notify_error(s, rctx);
+    }
+
+    rctx->file.fd = NGX_INVALID_FILE;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: %V closed", &rracf->id);
+
+    if (rracf->notify) {
+        ngx_rtmp_send_status(s, "NetStream.Record.Stop", "status",
+                             rracf->id.data ? (char *) rracf->id.data : "");
+    }
+
+    app_conf = s->app_conf;
+
+    if (rracf->rec_conf) {
+        s->app_conf = rracf->rec_conf;
+    }
+
+    v.recorder = rracf->id;
+    ngx_rtmp_record_make_path(s, rctx, &v.path);
+
+    rc = ngx_rtmp_record_done(s, &v);
+
+    s->app_conf = app_conf;
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_close_stream(ngx_rtmp_session_t *s,
+                             ngx_rtmp_close_stream_t *v)
+{
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: close_stream");
+
+    ngx_rtmp_record_stop(s);
+
+next:
+    return next_close_stream(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_write_frame(ngx_rtmp_session_t *s,
+                            ngx_rtmp_record_rec_ctx_t *rctx,
+                            ngx_rtmp_header_t *h, ngx_chain_t *in,
+                            ngx_int_t inc_nframes)
+{
+    u_char                      hdr[11], *p, *ph;
+    uint32_t                    timestamp, tag_size;
+    ngx_rtmp_record_app_conf_t *rracf;
+
+    rracf = rctx->conf;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "record: %V frame: mlen=%uD",
+                   &rracf->id, h->mlen);
+
+    if (h->type == NGX_RTMP_MSG_VIDEO) {
+        rctx->video = 1;
+    } else {
+        rctx->audio = 1;
+    }
+
+    timestamp = h->timestamp - rctx->epoch;
+
+    if ((int32_t) timestamp < 0) {
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                       "record: %V cut timestamp=%D", &rracf->id, timestamp);
+
+        timestamp = 0;
+    }
+
+    /* write tag header */
+    ph = hdr;
+
+    *ph++ = (u_char)h->type;
+
+    p = (u_char*)&h->mlen;
+    *ph++ = p[2];
+    *ph++ = p[1];
+    *ph++ = p[0];
+
+    p = (u_char*)&timestamp;
+    *ph++ = p[2];
+    *ph++ = p[1];
+    *ph++ = p[0];
+    *ph++ = p[3];
+
+    *ph++ = 0;
+    *ph++ = 0;
+    *ph++ = 0;
+
+    tag_size = (ph - hdr) + h->mlen;
+
+    if (ngx_write_file(&rctx->file, hdr, ph - hdr, rctx->file.offset)
+        == NGX_ERROR)
+    {
+        ngx_rtmp_record_notify_error(s, rctx);
+
+        ngx_close_file(rctx->file.fd);
+
+        return NGX_ERROR;
+    }
+
+    /* write tag body
+     * FIXME: NGINX
+     * ngx_write_chain seems to fit best
+     * but it suffers from uncontrollable
+     * allocations.
+     * we're left with plain writing */
+    for(; in; in = in->next) {
+        if (in->buf->pos == in->buf->last) {
+            continue;
+        }
+
+        if (ngx_write_file(&rctx->file, in->buf->pos, in->buf->last
+                           - in->buf->pos, rctx->file.offset)
+            == NGX_ERROR)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    /* write tag size */
+    ph = hdr;
+    p = (u_char*)&tag_size;
+
+    *ph++ = p[3];
+    *ph++ = p[2];
+    *ph++ = p[1];
+    *ph++ = p[0];
+
+    if (ngx_write_file(&rctx->file, hdr, ph - hdr,
+                       rctx->file.offset)
+        == NGX_ERROR)
+    {
+        return NGX_ERROR;
+    }
+
+    rctx->nframes += inc_nframes;
+
+    /* watch max size */
+    if ((rracf->max_size && rctx->file.offset >= (ngx_int_t) rracf->max_size) ||
+        (rracf->max_frames && rctx->nframes >= rracf->max_frames))
+    {
+        ngx_rtmp_record_node_close(s, rctx);
+    }
+
+    return NGX_OK;
+}
+
+
+static size_t
+ngx_rtmp_record_get_chain_mlen(ngx_chain_t *in)
+{
+    size_t                          ret;
+
+    for (ret = 0; in; in = in->next) {
+        ret += (in->buf->last - in->buf->pos);
+    }
+
+    return ret;
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                   ngx_chain_t *in)
+{
+    ngx_rtmp_record_ctx_t          *ctx;
+    ngx_rtmp_record_rec_ctx_t      *rctx;
+    ngx_uint_t                      n;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    rctx = ctx->rec.elts;
+
+    for (n = 0; n < ctx->rec.nelts; ++n, ++rctx) {
+        ngx_rtmp_record_node_av(s, rctx, h, in);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_node_av(ngx_rtmp_session_t *s, ngx_rtmp_record_rec_ctx_t *rctx,
+                        ngx_rtmp_header_t *h, ngx_chain_t *in)
+{
+    ngx_time_t                      next;
+    ngx_rtmp_header_t               ch;
+    ngx_rtmp_codec_ctx_t           *codec_ctx;
+    ngx_int_t                       keyframe, brkframe;
+    ngx_rtmp_record_app_conf_t     *rracf;
+
+    rracf = rctx->conf;
+
+    if (rracf->flags & NGX_RTMP_RECORD_OFF) {
+        ngx_rtmp_record_node_close(s, rctx);
+        return NGX_OK;
+    }
+
+    keyframe = (h->type == NGX_RTMP_MSG_VIDEO)
+             ? (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME)
+             : 0;
+
+    brkframe = (h->type == NGX_RTMP_MSG_VIDEO)
+             ? keyframe
+             : (rracf->flags & NGX_RTMP_RECORD_VIDEO) == 0;
+
+    if (brkframe && (rracf->flags & NGX_RTMP_RECORD_MANUAL) == 0) {
+
+        if (rracf->interval != (ngx_msec_t) NGX_CONF_UNSET) {
+
+            next = rctx->last;
+            next.msec += rracf->interval;
+            next.sec  += (next.msec / 1000);
+            next.msec %= 1000;
+
+            if (ngx_cached_time->sec  > next.sec ||
+               (ngx_cached_time->sec == next.sec &&
+                ngx_cached_time->msec > next.msec))
+            {
+                ngx_rtmp_record_node_close(s, rctx);
+                ngx_rtmp_record_node_open(s, rctx);
+            }
+
+        } else if (!rctx->failed) {
+            ngx_rtmp_record_node_open(s, rctx);
+        }
+    }
+
+    if ((rracf->flags & NGX_RTMP_RECORD_MANUAL) &&
+        !brkframe && rctx->nframes == 0)
+    {
+        return NGX_OK;
+    }
+
+    if (rctx->file.fd == NGX_INVALID_FILE) {
+        return NGX_OK;
+    }
+
+    if (h->type == NGX_RTMP_MSG_AUDIO &&
+       (rracf->flags & NGX_RTMP_RECORD_AUDIO) == 0)
+    {
+        return NGX_OK;
+    }
+
+    if (h->type == NGX_RTMP_MSG_VIDEO &&
+       (rracf->flags & NGX_RTMP_RECORD_VIDEO) == 0 &&
+       ((rracf->flags & NGX_RTMP_RECORD_KEYFRAMES) == 0 || !keyframe))
+    {
+        return NGX_OK;
+    }
+
+    if (!rctx->initialized) {
+
+        rctx->initialized = 1;
+        rctx->epoch = h->timestamp - rctx->time_shift;
+
+        if (rctx->file.offset == 0 &&
+            ngx_rtmp_record_write_header(&rctx->file) != NGX_OK)
+        {
+            ngx_rtmp_record_node_close(s, rctx);
+            return NGX_OK;
+        }
+    }
+
+    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+    if (codec_ctx) {
+        ch = *h;
+
+        /* AAC header */
+        if (!rctx->aac_header_sent && codec_ctx->aac_header &&
+           (rracf->flags & NGX_RTMP_RECORD_AUDIO))
+        {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "record: %V writing AAC header", &rracf->id);
+
+            ch.type = NGX_RTMP_MSG_AUDIO;
+            ch.mlen = ngx_rtmp_record_get_chain_mlen(codec_ctx->aac_header);
+
+            if (ngx_rtmp_record_write_frame(s, rctx, &ch,
+                                            codec_ctx->aac_header, 0)
+                != NGX_OK)
+            {
+                return NGX_OK;
+            }
+
+            rctx->aac_header_sent = 1;
+        }
+
+        /* AVC header */
+        if (!rctx->avc_header_sent && codec_ctx->avc_header &&
+           (rracf->flags & (NGX_RTMP_RECORD_VIDEO|
+                            NGX_RTMP_RECORD_KEYFRAMES)))
+        {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "record: %V writing AVC header", &rracf->id);
+
+            ch.type = NGX_RTMP_MSG_VIDEO;
+            ch.mlen = ngx_rtmp_record_get_chain_mlen(codec_ctx->avc_header);
+
+            if (ngx_rtmp_record_write_frame(s, rctx, &ch,
+                                            codec_ctx->avc_header, 0)
+                != NGX_OK)
+            {
+                return NGX_OK;
+            }
+
+            rctx->avc_header_sent = 1;
+        }
+    }
+
+    if (h->type == NGX_RTMP_MSG_VIDEO) {
+        if (codec_ctx && codec_ctx->video_codec_id == NGX_RTMP_VIDEO_H264 &&
+            !rctx->avc_header_sent)
+        {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "record: %V skipping until H264 header", &rracf->id);
+            return NGX_OK;
+        }
+
+        if (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME &&
+            ((codec_ctx && codec_ctx->video_codec_id != NGX_RTMP_VIDEO_H264) ||
+             !ngx_rtmp_is_codec_header(in)))
+        {
+            rctx->video_key_sent = 1;
+        }
+
+        if (!rctx->video_key_sent) {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "record: %V skipping until keyframe", &rracf->id);
+            return NGX_OK;
+        }
+
+    } else {
+        if (codec_ctx && codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC &&
+            !rctx->aac_header_sent)
+        {
+            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                           "record: %V skipping until AAC header", &rracf->id);
+            return NGX_OK;
+        }
+    }
+
+    return ngx_rtmp_record_write_frame(s, rctx, h, in, 1);
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_done_init(ngx_rtmp_session_t *s, ngx_rtmp_record_done_t *v)
+{
+    return NGX_OK;
+}
+
+
+static char *
+ngx_rtmp_record_recorder(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char                       *rv;
+    ngx_int_t                   i;
+    ngx_str_t                  *value;
+    ngx_conf_t                  save;
+    ngx_module_t              **modules;
+    ngx_rtmp_module_t          *module;
+    ngx_rtmp_core_app_conf_t   *cacf, **pcacf, *rcacf;
+    ngx_rtmp_record_app_conf_t *racf, **pracf, *rracf;
+    ngx_rtmp_conf_ctx_t        *ctx, *pctx;
+
+    value = cf->args->elts;
+
+    cacf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_core_module);
+
+    racf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_record_module);
+
+    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
+    if (ctx == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    pctx = cf->ctx;
+
+    ctx->main_conf = pctx->main_conf;
+    ctx->srv_conf  = pctx->srv_conf;
+
+    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
+    if (ctx->app_conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+#if (nginx_version >= 1009011)
+    modules = cf->cycle->modules;
+#else
+    modules = ngx_modules;
+#endif
+
+    for (i = 0; modules[i]; i++) {
+        if (modules[i]->type != NGX_RTMP_MODULE) {
+            continue;
+        }
+
+        module = modules[i]->ctx;
+
+        if (module->create_app_conf) {
+            ctx->app_conf[modules[i]->ctx_index] = module->create_app_conf(cf);
+            if (ctx->app_conf[modules[i]->ctx_index] == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+    /* add to sub-applications */
+    rcacf = ctx->app_conf[ngx_rtmp_core_module.ctx_index];
+    rcacf->app_conf = ctx->app_conf;
+    pcacf = ngx_array_push(&cacf->applications);
+    if (pcacf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+    *pcacf = rcacf;
+
+    /* add to recorders */
+    rracf = ctx->app_conf[ngx_rtmp_record_module.ctx_index];
+    rracf->rec_conf = ctx->app_conf;
+    pracf = ngx_array_push(&racf->rec);
+    if (pracf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+    *pracf = rracf;
+
+    rracf->id = value[1];
+
+
+    save = *cf;
+    cf->ctx = ctx;
+    cf->cmd_type = NGX_RTMP_REC_CONF;
+
+    rv = ngx_conf_parse(cf, NULL);
+    *cf= save;
+
+    return rv;
+}
+
+
+static ngx_int_t
+ngx_rtmp_record_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t          *cmcf;
+    ngx_rtmp_handler_pt                *h;
+
+    ngx_rtmp_record_done = ngx_rtmp_record_done_init;
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
+    *h = ngx_rtmp_record_av;
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
+    *h = ngx_rtmp_record_av;
+
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_record_publish;
+
+    next_close_stream = ngx_rtmp_close_stream;
+    ngx_rtmp_close_stream = ngx_rtmp_record_close_stream;
+
+    next_stream_begin = ngx_rtmp_stream_begin;
+    ngx_rtmp_stream_begin = ngx_rtmp_record_stream_begin;
+
+    next_stream_eof = ngx_rtmp_stream_eof;
+    ngx_rtmp_stream_eof = ngx_rtmp_record_stream_eof;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_record_module.h b/debian/modules/nginx-rtmp/ngx_rtmp_record_module.h
new file mode 100644
index 0000000..6450dcb
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_record_module.h
@@ -0,0 +1,96 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_RECORD_H_INCLUDED_
+#define _NGX_RTMP_RECORD_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+
+
+#define NGX_RTMP_RECORD_OFF             0x01
+#define NGX_RTMP_RECORD_AUDIO           0x02
+#define NGX_RTMP_RECORD_VIDEO           0x04
+#define NGX_RTMP_RECORD_KEYFRAMES       0x08
+#define NGX_RTMP_RECORD_MANUAL          0x10
+
+
+typedef struct {
+    ngx_str_t                           id;
+    ngx_uint_t                          flags;
+    ngx_str_t                           path;
+    size_t                              max_size;
+    size_t                              max_frames;
+    ngx_msec_t                          interval;
+    ngx_str_t                           suffix;
+    ngx_flag_t                          unique;
+    ngx_flag_t                          append;
+    ngx_flag_t                          lock_file;
+    ngx_flag_t                          notify;
+    ngx_url_t                          *url;
+
+    void                              **rec_conf;
+    ngx_array_t                         rec; /* ngx_rtmp_record_app_conf_t * */
+} ngx_rtmp_record_app_conf_t;
+
+
+typedef struct {
+    ngx_rtmp_record_app_conf_t         *conf;
+    ngx_file_t                          file;
+    ngx_uint_t                          nframes;
+    uint32_t                            epoch, time_shift;
+    ngx_time_t                          last;
+    time_t                              timestamp;
+    unsigned                            failed:1;
+    unsigned                            initialized:1;
+    unsigned                            aac_header_sent:1;
+    unsigned                            avc_header_sent:1;
+    unsigned                            video_key_sent:1;
+    unsigned                            audio:1;
+    unsigned                            video:1;
+} ngx_rtmp_record_rec_ctx_t;
+
+
+typedef struct {
+    ngx_array_t                         rec; /* ngx_rtmp_record_rec_ctx_t */
+    u_char                              name[NGX_RTMP_MAX_NAME];
+    u_char                              args[NGX_RTMP_MAX_ARGS];
+} ngx_rtmp_record_ctx_t;
+
+
+ngx_uint_t ngx_rtmp_record_find(ngx_rtmp_record_app_conf_t *racf,
+           ngx_str_t *id);
+
+
+/* Manual recording control,
+ * 'n' is record node index in config array.
+ * Note: these functions allocate path in static buffer */
+
+ngx_int_t ngx_rtmp_record_open(ngx_rtmp_session_t *s, ngx_uint_t n,
+          ngx_str_t *path);
+ngx_int_t ngx_rtmp_record_close(ngx_rtmp_session_t *s, ngx_uint_t n,
+          ngx_str_t *path);
+
+
+typedef struct {
+    ngx_str_t                           recorder;
+    ngx_str_t                           path;
+} ngx_rtmp_record_done_t;
+
+
+typedef ngx_int_t (*ngx_rtmp_record_done_pt)(ngx_rtmp_session_t *s,
+        ngx_rtmp_record_done_t *v);
+
+
+extern ngx_rtmp_record_done_pt          ngx_rtmp_record_done;
+
+
+extern ngx_module_t                     ngx_rtmp_record_module;
+
+
+#endif /* _NGX_RTMP_RECORD_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_relay_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_relay_module.c
new file mode 100644
index 0000000..b0f5fec
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_relay_module.c
@@ -0,0 +1,1690 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp_relay_module.h"
+#include "ngx_rtmp_cmd_module.h"
+
+
+static ngx_rtmp_publish_pt          next_publish;
+static ngx_rtmp_play_pt             next_play;
+static ngx_rtmp_delete_stream_pt    next_delete_stream;
+static ngx_rtmp_close_stream_pt     next_close_stream;
+
+
+static ngx_int_t ngx_rtmp_relay_init_process(ngx_cycle_t *cycle);
+static ngx_int_t ngx_rtmp_relay_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_relay_create_app_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_relay_merge_app_conf(ngx_conf_t *cf,
+       void *parent, void *child);
+static char * ngx_rtmp_relay_push_pull(ngx_conf_t *cf, ngx_command_t *cmd,
+       void *conf);
+static ngx_int_t ngx_rtmp_relay_publish(ngx_rtmp_session_t *s,
+       ngx_rtmp_publish_t *v);
+static ngx_rtmp_relay_ctx_t * ngx_rtmp_relay_create_connection(
+       ngx_rtmp_conf_ctx_t *cctx, ngx_str_t* name,
+       ngx_rtmp_relay_target_t *target);
+
+
+/*                _____
+ * =push=        |     |---publish--->
+ * ---publish--->|     |---publish--->
+ *     (src)     |     |---publish--->
+ *                -----  (next,relay)
+ *                      need reconnect
+ * =pull=         _____
+ * -----play---->|     |
+ * -----play---->|     |----play----->
+ * -----play---->|     | (src,relay)
+ *     (next)     -----
+ */
+
+
+typedef struct {
+    ngx_array_t                 pulls;         /* ngx_rtmp_relay_target_t * */
+    ngx_array_t                 pushes;        /* ngx_rtmp_relay_target_t * */
+    ngx_array_t                 static_pulls;  /* ngx_rtmp_relay_target_t * */
+    ngx_array_t                 static_events; /* ngx_event_t * */
+    ngx_log_t                  *log;
+    ngx_uint_t                  nbuckets;
+    ngx_msec_t                  buflen;
+    ngx_flag_t                  session_relay;
+    ngx_msec_t                  push_reconnect;
+    ngx_msec_t                  pull_reconnect;
+    ngx_rtmp_relay_ctx_t        **ctx;
+} ngx_rtmp_relay_app_conf_t;
+
+
+typedef struct {
+    ngx_rtmp_conf_ctx_t         cctx;
+    ngx_rtmp_relay_target_t    *target;
+} ngx_rtmp_relay_static_t;
+
+
+#define NGX_RTMP_RELAY_CONNECT_TRANS            1
+#define NGX_RTMP_RELAY_CREATE_STREAM_TRANS      2
+
+
+#define NGX_RTMP_RELAY_CSID_AMF_INI             3
+#define NGX_RTMP_RELAY_CSID_AMF                 5
+#define NGX_RTMP_RELAY_MSID                     1
+
+
+/* default flashVer */
+#define NGX_RTMP_RELAY_FLASHVER                 "LNX.11,1,102,55"
+
+
+static ngx_command_t  ngx_rtmp_relay_commands[] = {
+
+    { ngx_string("push"),
+      NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_relay_push_pull,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("pull"),
+      NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
+      ngx_rtmp_relay_push_pull,
+      NGX_RTMP_APP_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("relay_buffer"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_relay_app_conf_t, buflen),
+      NULL },
+
+    { ngx_string("push_reconnect"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_relay_app_conf_t, push_reconnect),
+      NULL },
+
+    { ngx_string("pull_reconnect"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_relay_app_conf_t, pull_reconnect),
+      NULL },
+
+    { ngx_string("session_relay"),
+      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_flag_slot,
+      NGX_RTMP_APP_CONF_OFFSET,
+      offsetof(ngx_rtmp_relay_app_conf_t, session_relay),
+      NULL },
+
+
+      ngx_null_command
+};
+
+
+static ngx_rtmp_module_t  ngx_rtmp_relay_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_rtmp_relay_postconfiguration,       /* postconfiguration */
+    NULL,                                   /* create main configuration */
+    NULL,                                   /* init main configuration */
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+    ngx_rtmp_relay_create_app_conf,         /* create app configuration */
+    ngx_rtmp_relay_merge_app_conf           /* merge app configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_relay_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_relay_module_ctx,             /* module context */
+    ngx_rtmp_relay_commands,                /* module directives */
+    NGX_RTMP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    ngx_rtmp_relay_init_process,            /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_rtmp_relay_create_app_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_relay_app_conf_t     *racf;
+
+    racf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_relay_app_conf_t));
+    if (racf == NULL) {
+        return NULL;
+    }
+
+    if (ngx_array_init(&racf->pushes, cf->pool, 1, sizeof(void *)) != NGX_OK) {
+        return NULL;
+    }
+
+    if (ngx_array_init(&racf->pulls, cf->pool, 1, sizeof(void *)) != NGX_OK) {
+        return NULL;
+    }
+
+    if (ngx_array_init(&racf->static_pulls, cf->pool, 1, sizeof(void *))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    if (ngx_array_init(&racf->static_events, cf->pool, 1, sizeof(void *))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    racf->nbuckets = 1024;
+    racf->log = &cf->cycle->new_log;
+    racf->buflen = NGX_CONF_UNSET_MSEC;
+    racf->session_relay = NGX_CONF_UNSET;
+    racf->push_reconnect = NGX_CONF_UNSET_MSEC;
+    racf->pull_reconnect = NGX_CONF_UNSET_MSEC;
+
+    return racf;
+}
+
+
+static char *
+ngx_rtmp_relay_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_relay_app_conf_t  *prev = parent;
+    ngx_rtmp_relay_app_conf_t  *conf = child;
+
+    conf->ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_relay_ctx_t *)
+            * conf->nbuckets);
+
+    ngx_conf_merge_value(conf->session_relay, prev->session_relay, 0);
+    ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 5000);
+    ngx_conf_merge_msec_value(conf->push_reconnect, prev->push_reconnect,
+            3000);
+    ngx_conf_merge_msec_value(conf->pull_reconnect, prev->pull_reconnect,
+            3000);
+
+    return NGX_CONF_OK;
+}
+
+
+static void
+ngx_rtmp_relay_static_pull_reconnect(ngx_event_t *ev)
+{
+    ngx_rtmp_relay_static_t    *rs = ev->data;
+
+    ngx_rtmp_relay_ctx_t       *ctx;
+    ngx_rtmp_relay_app_conf_t  *racf;
+
+    racf = ngx_rtmp_get_module_app_conf(&rs->cctx, ngx_rtmp_relay_module);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, racf->log, 0,
+                   "relay: reconnecting static pull");
+
+    ctx = ngx_rtmp_relay_create_connection(&rs->cctx, &rs->target->name,
+                                           rs->target);
+    if (ctx) {
+        ctx->session->static_relay = 1;
+        ctx->static_evt = ev;
+        return;
+    }
+
+    ngx_add_timer(ev, racf->pull_reconnect);
+}
+
+
+static void
+ngx_rtmp_relay_push_reconnect(ngx_event_t *ev)
+{
+    ngx_rtmp_session_t             *s = ev->data;
+
+    ngx_rtmp_relay_app_conf_t      *racf;
+    ngx_rtmp_relay_ctx_t           *ctx, *pctx;
+    ngx_uint_t                      n;
+    ngx_rtmp_relay_target_t        *target, **t;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "relay: push reconnect");
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    t = racf->pushes.elts;
+    for (n = 0; n < racf->pushes.nelts; ++n, ++t) {
+        target = *t;
+
+        if (target->name.len && (ctx->name.len != target->name.len ||
+            ngx_memcmp(ctx->name.data, target->name.data, ctx->name.len)))
+        {
+            continue;
+        }
+
+        for (pctx = ctx->play; pctx; pctx = pctx->next) {
+            if (pctx->tag == &ngx_rtmp_relay_module &&
+                pctx->data == target)
+            {
+                break;
+            }
+        }
+
+        if (pctx) {
+            continue;
+        }
+
+        if (ngx_rtmp_relay_push(s, &ctx->name, target) == NGX_OK) {
+            continue;
+        }
+
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                "relay: push reconnect failed name='%V' app='%V' "
+                "playpath='%V' url='%V'",
+                &ctx->name, &target->app, &target->play_path,
+                &target->url.url);
+
+        if (!ctx->push_evt.timer_set) {
+            ngx_add_timer(&ctx->push_evt, racf->push_reconnect);
+        }
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_get_peer(ngx_peer_connection_t *pc, void *data)
+{
+    return NGX_OK;
+}
+
+
+static void
+ngx_rtmp_relay_free_peer(ngx_peer_connection_t *pc, void *data,
+            ngx_uint_t state)
+{
+}
+
+
+typedef ngx_rtmp_relay_ctx_t * (* ngx_rtmp_relay_create_ctx_pt)
+    (ngx_rtmp_session_t *s, ngx_str_t *name, ngx_rtmp_relay_target_t *target);
+
+
+static ngx_int_t
+ngx_rtmp_relay_copy_str(ngx_pool_t *pool, ngx_str_t *dst, ngx_str_t *src)
+{
+    if (src->len == 0) {
+        return NGX_OK;
+    }
+    dst->len = src->len;
+    dst->data = ngx_palloc(pool, src->len);
+    if (dst->data == NULL) {
+        return NGX_ERROR;
+    }
+    ngx_memcpy(dst->data, src->data, src->len);
+    return NGX_OK;
+}
+
+
+static ngx_rtmp_relay_ctx_t *
+ngx_rtmp_relay_create_connection(ngx_rtmp_conf_ctx_t *cctx, ngx_str_t* name,
+        ngx_rtmp_relay_target_t *target)
+{
+    ngx_rtmp_relay_app_conf_t      *racf;
+    ngx_rtmp_relay_ctx_t           *rctx;
+    ngx_rtmp_addr_conf_t           *addr_conf;
+    ngx_rtmp_conf_ctx_t            *addr_ctx;
+    ngx_rtmp_session_t             *rs;
+    ngx_peer_connection_t          *pc;
+    ngx_connection_t               *c;
+    ngx_addr_t                     *addr;
+    ngx_pool_t                     *pool;
+    ngx_int_t                       rc;
+    ngx_str_t                       v, *uri;
+    u_char                         *first, *last, *p;
+
+    racf = ngx_rtmp_get_module_app_conf(cctx, ngx_rtmp_relay_module);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, racf->log, 0,
+                   "relay: create remote context");
+
+    pool = NULL;
+    pool = ngx_create_pool(4096, racf->log);
+    if (pool == NULL) {
+        return NULL;
+    }
+
+    rctx = ngx_pcalloc(pool, sizeof(ngx_rtmp_relay_ctx_t));
+    if (rctx == NULL) {
+        goto clear;
+    }
+
+    if (name && ngx_rtmp_relay_copy_str(pool, &rctx->name, name) != NGX_OK) {
+        goto clear;
+    }
+
+    if (ngx_rtmp_relay_copy_str(pool, &rctx->url, &target->url.url) != NGX_OK) {
+        goto clear;
+    }
+
+    rctx->tag = target->tag;
+    rctx->data = target->data;
+
+#define NGX_RTMP_RELAY_STR_COPY(to, from)                                     \
+    if (ngx_rtmp_relay_copy_str(pool, &rctx->to, &target->from) != NGX_OK) {  \
+        goto clear;                                                           \
+    }
+
+    NGX_RTMP_RELAY_STR_COPY(app,        app);
+    NGX_RTMP_RELAY_STR_COPY(tc_url,     tc_url);
+    NGX_RTMP_RELAY_STR_COPY(page_url,   page_url);
+    NGX_RTMP_RELAY_STR_COPY(swf_url,    swf_url);
+    NGX_RTMP_RELAY_STR_COPY(flash_ver,  flash_ver);
+    NGX_RTMP_RELAY_STR_COPY(play_path,  play_path);
+
+    rctx->live  = target->live;
+    rctx->start = target->start;
+    rctx->stop  = target->stop;
+
+#undef NGX_RTMP_RELAY_STR_COPY
+
+    if (rctx->app.len == 0 || rctx->play_path.len == 0) {
+        /* parse uri */
+        uri = &target->url.uri;
+        first = uri->data;
+        last  = uri->data + uri->len;
+        if (first != last && *first == '/') {
+            ++first;
+        }
+
+        if (first != last) {
+
+            /* deduce app */
+            p = ngx_strlchr(first, last, '/');
+            if (p == NULL) {
+                p = last;
+            }
+
+            if (rctx->app.len == 0 && first != p) {
+                v.data = first;
+                v.len = p - first;
+                if (ngx_rtmp_relay_copy_str(pool, &rctx->app, &v) != NGX_OK) {
+                    goto clear;
+                }
+            }
+
+            /* deduce play_path */
+            if (p != last) {
+                ++p;
+            }
+
+            if (rctx->play_path.len == 0 && p != last) {
+                v.data = p;
+                v.len = last - p;
+                if (ngx_rtmp_relay_copy_str(pool, &rctx->play_path, &v)
+                        != NGX_OK)
+                {
+                    goto clear;
+                }
+            }
+        }
+    }
+
+    pc = ngx_pcalloc(pool, sizeof(ngx_peer_connection_t));
+    if (pc == NULL) {
+        goto clear;
+    }
+
+    if (target->url.naddrs == 0) {
+        ngx_log_error(NGX_LOG_ERR, racf->log, 0,
+                      "relay: no address");
+        goto clear;
+    }
+
+    /* get address */
+    addr = &target->url.addrs[target->counter % target->url.naddrs];
+    target->counter++;
+
+    /* copy log to keep shared log unchanged */
+    rctx->log = *racf->log;
+    pc->log = &rctx->log;
+    pc->get = ngx_rtmp_relay_get_peer;
+    pc->free = ngx_rtmp_relay_free_peer;
+    pc->name = &addr->name;
+    pc->socklen = addr->socklen;
+    pc->sockaddr = (struct sockaddr *)ngx_palloc(pool, pc->socklen);
+    if (pc->sockaddr == NULL) {
+        goto clear;
+    }
+    ngx_memcpy(pc->sockaddr, addr->sockaddr, pc->socklen);
+
+    rc = ngx_event_connect_peer(pc);
+    if (rc != NGX_OK && rc != NGX_AGAIN ) {
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, racf->log, 0,
+                "relay: connection failed");
+        goto clear;
+    }
+    c = pc->connection;
+    c->pool = pool;
+    c->addr_text = rctx->url;
+
+    addr_conf = ngx_pcalloc(pool, sizeof(ngx_rtmp_addr_conf_t));
+    if (addr_conf == NULL) {
+        goto clear;
+    }
+    addr_ctx = ngx_pcalloc(pool, sizeof(ngx_rtmp_conf_ctx_t));
+    if (addr_ctx == NULL) {
+        goto clear;
+    }
+    addr_conf->ctx = addr_ctx;
+    addr_ctx->main_conf = cctx->main_conf;
+    addr_ctx->srv_conf  = cctx->srv_conf;
+    ngx_str_set(&addr_conf->addr_text, "ngx-relay");
+
+    rs = ngx_rtmp_init_session(c, addr_conf);
+    if (rs == NULL) {
+        /* no need to destroy pool */
+        return NULL;
+    }
+    rs->app_conf = cctx->app_conf;
+    rs->relay = 1;
+    rctx->session = rs;
+    ngx_rtmp_set_ctx(rs, rctx, ngx_rtmp_relay_module);
+    ngx_str_set(&rs->flashver, "ngx-local-relay");
+
+#if (NGX_STAT_STUB)
+    (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
+#endif
+
+    ngx_rtmp_client_handshake(rs, 1);
+    return rctx;
+
+clear:
+    if (pool) {
+        ngx_destroy_pool(pool);
+    }
+    return NULL;
+}
+
+
+static ngx_rtmp_relay_ctx_t *
+ngx_rtmp_relay_create_remote_ctx(ngx_rtmp_session_t *s, ngx_str_t* name,
+        ngx_rtmp_relay_target_t *target)
+{
+    ngx_rtmp_conf_ctx_t         cctx;
+
+    cctx.app_conf = s->app_conf;
+    cctx.srv_conf = s->srv_conf;
+    cctx.main_conf = s->main_conf;
+
+    return ngx_rtmp_relay_create_connection(&cctx, name, target);
+}
+
+
+static ngx_rtmp_relay_ctx_t *
+ngx_rtmp_relay_create_local_ctx(ngx_rtmp_session_t *s, ngx_str_t *name,
+        ngx_rtmp_relay_target_t *target)
+{
+    ngx_rtmp_relay_ctx_t           *ctx;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "relay: create local context");
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL) {
+        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_relay_ctx_t));
+        if (ctx == NULL) {
+            return NULL;
+        }
+        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_relay_module);
+    }
+    ctx->session = s;
+
+    ctx->push_evt.data = s;
+    ctx->push_evt.log = s->connection->log;
+    ctx->push_evt.handler = ngx_rtmp_relay_push_reconnect;
+
+    if (ctx->publish) {
+        return NULL;
+    }
+
+    if (ngx_rtmp_relay_copy_str(s->connection->pool, &ctx->name, name)
+            != NGX_OK)
+    {
+        return NULL;
+    }
+
+    return ctx;
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_create(ngx_rtmp_session_t *s, ngx_str_t *name,
+        ngx_rtmp_relay_target_t *target,
+        ngx_rtmp_relay_create_ctx_pt create_publish_ctx,
+        ngx_rtmp_relay_create_ctx_pt create_play_ctx)
+{
+    ngx_rtmp_relay_app_conf_t      *racf;
+    ngx_rtmp_relay_ctx_t           *publish_ctx, *play_ctx, **cctx;
+    ngx_uint_t                      hash;
+
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
+    if (racf == NULL) {
+        return NGX_ERROR;
+    }
+
+    play_ctx = create_play_ctx(s, name, target);
+    if (play_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    hash = ngx_hash_key(name->data, name->len);
+    cctx = &racf->ctx[hash % racf->nbuckets];
+    for (; *cctx; cctx = &(*cctx)->next) {
+        if ((*cctx)->name.len == name->len
+            && !ngx_memcmp(name->data, (*cctx)->name.data,
+                name->len))
+        {
+            break;
+        }
+    }
+
+    if (*cctx) {
+        play_ctx->publish = (*cctx)->publish;
+        play_ctx->next = (*cctx)->play;
+        (*cctx)->play = play_ctx;
+        return NGX_OK;
+    }
+
+    publish_ctx = create_publish_ctx(s, name, target);
+    if (publish_ctx == NULL) {
+        ngx_rtmp_finalize_session(play_ctx->session);
+        return NGX_ERROR;
+    }
+
+    publish_ctx->publish = publish_ctx;
+    publish_ctx->play = play_ctx;
+    play_ctx->publish = publish_ctx;
+    *cctx = publish_ctx;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_rtmp_relay_pull(ngx_rtmp_session_t *s, ngx_str_t *name,
+        ngx_rtmp_relay_target_t *target)
+{
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+            "relay: create pull name='%V' app='%V' playpath='%V' url='%V'",
+            name, &target->app, &target->play_path, &target->url.url);
+
+    return ngx_rtmp_relay_create(s, name, target,
+            ngx_rtmp_relay_create_remote_ctx,
+            ngx_rtmp_relay_create_local_ctx);
+}
+
+
+ngx_int_t
+ngx_rtmp_relay_push(ngx_rtmp_session_t *s, ngx_str_t *name,
+        ngx_rtmp_relay_target_t *target)
+{
+    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+            "relay: create push name='%V' app='%V' playpath='%V' url='%V'",
+            name, &target->app, &target->play_path, &target->url.url);
+
+    return ngx_rtmp_relay_create(s, name, target,
+            ngx_rtmp_relay_create_local_ctx,
+            ngx_rtmp_relay_create_remote_ctx);
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
+{
+    ngx_rtmp_relay_app_conf_t      *racf;
+    ngx_rtmp_relay_target_t        *target, **t;
+    ngx_str_t                       name;
+    size_t                          n;
+    ngx_rtmp_relay_ctx_t           *ctx;
+
+    if (s->auto_pushed) {
+        goto next;
+    }
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx && s->relay) {
+        goto next;
+    }
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
+    if (racf == NULL || racf->pushes.nelts == 0) {
+        goto next;
+    }
+
+    name.len = ngx_strlen(v->name);
+    name.data = v->name;
+
+    t = racf->pushes.elts;
+    for (n = 0; n < racf->pushes.nelts; ++n, ++t) {
+        target = *t;
+
+        if (target->name.len && (name.len != target->name.len ||
+            ngx_memcmp(name.data, target->name.data, name.len)))
+        {
+            continue;
+        }
+
+        if (ngx_rtmp_relay_push(s, &name, target) == NGX_OK) {
+            continue;
+        }
+
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                "relay: push failed name='%V' app='%V' "
+                "playpath='%V' url='%V'",
+                &name, &target->app, &target->play_path,
+                &target->url.url);
+
+        if (!ctx->push_evt.timer_set) {
+            ngx_add_timer(&ctx->push_evt, racf->push_reconnect);
+        }
+    }
+
+next:
+    return next_publish(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
+{
+    ngx_rtmp_relay_app_conf_t      *racf;
+    ngx_rtmp_relay_target_t        *target, **t;
+    ngx_str_t                       name;
+    size_t                          n;
+    ngx_rtmp_relay_ctx_t           *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx && s->relay) {
+        goto next;
+    }
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
+    if (racf == NULL || racf->pulls.nelts == 0) {
+        goto next;
+    }
+
+    name.len = ngx_strlen(v->name);
+    name.data = v->name;
+
+    t = racf->pulls.elts;
+    for (n = 0; n < racf->pulls.nelts; ++n, ++t) {
+        target = *t;
+
+        if (target->name.len && (name.len != target->name.len ||
+            ngx_memcmp(name.data, target->name.data, name.len)))
+        {
+            continue;
+        }
+
+        if (ngx_rtmp_relay_pull(s, &name, target) == NGX_OK) {
+            continue;
+        }
+
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                "relay: pull failed name='%V' app='%V' "
+                "playpath='%V' url='%V'",
+                &name, &target->app, &target->play_path,
+                &target->url.url);
+    }
+
+next:
+    return next_play(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_play_local(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_play_t             v;
+    ngx_rtmp_relay_ctx_t       *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memzero(&v, sizeof(ngx_rtmp_play_t));
+    v.silent = 1;
+    *(ngx_cpymem(v.name, ctx->name.data,
+            ngx_min(sizeof(v.name) - 1, ctx->name.len))) = 0;
+
+    return ngx_rtmp_play(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_publish_local(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_publish_t          v;
+    ngx_rtmp_relay_ctx_t       *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memzero(&v, sizeof(ngx_rtmp_publish_t));
+    v.silent = 1;
+    *(ngx_cpymem(v.name, ctx->name.data,
+            ngx_min(sizeof(v.name) - 1, ctx->name.len))) = 0;
+
+    return ngx_rtmp_publish(s, &v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_send_connect(ngx_rtmp_session_t *s)
+{
+    static double               trans = NGX_RTMP_RELAY_CONNECT_TRANS;
+    static double               acodecs = 3575;
+    static double               vcodecs = 252;
+
+    static ngx_rtmp_amf_elt_t   out_cmd[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("app"),
+          NULL, 0 }, /* <-- fill */
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("tcUrl"),
+          NULL, 0 }, /* <-- fill */
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("pageUrl"),
+          NULL, 0 }, /* <-- fill */
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("swfUrl"),
+          NULL, 0 }, /* <-- fill */
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("flashVer"),
+          NULL, 0 }, /* <-- fill */
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("audioCodecs"),
+          &acodecs, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("videoCodecs"),
+          &vcodecs, 0 }
+    };
+
+    static ngx_rtmp_amf_elt_t   out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "connect", 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &trans, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          out_cmd, sizeof(out_cmd) }
+    };
+
+    ngx_rtmp_core_app_conf_t   *cacf;
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    ngx_rtmp_relay_ctx_t       *ctx;
+    ngx_rtmp_header_t           h;
+    size_t                      len, url_len;
+    u_char                     *p, *url_end;
+
+
+    cacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_core_module);
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (cacf == NULL || ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    /* app */
+    if (ctx->app.len) {
+        out_cmd[0].data = ctx->app.data;
+        out_cmd[0].len  = ctx->app.len;
+    } else {
+        out_cmd[0].data = cacf->name.data;
+        out_cmd[0].len  = cacf->name.len;
+    }
+
+    /* tcUrl */
+    if (ctx->tc_url.len) {
+        out_cmd[1].data = ctx->tc_url.data;
+        out_cmd[1].len  = ctx->tc_url.len;
+    } else {
+        len = sizeof("rtmp://") - 1 + ctx->url.len +
+            sizeof("/") - 1 + ctx->app.len;
+        p = ngx_palloc(s->connection->pool, len);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+        out_cmd[1].data = p;
+        p = ngx_cpymem(p, "rtmp://", sizeof("rtmp://") - 1);
+
+        url_len = ctx->url.len;
+        url_end = ngx_strlchr(ctx->url.data, ctx->url.data + ctx->url.len, '/');
+        if (url_end) {
+            url_len = (size_t) (url_end - ctx->url.data);
+        }
+
+        p = ngx_cpymem(p, ctx->url.data, url_len);
+        *p++ = '/';
+        p = ngx_cpymem(p, ctx->app.data, ctx->app.len);
+        out_cmd[1].len = p - (u_char *)out_cmd[1].data;
+    }
+
+    /* pageUrl */
+    out_cmd[2].data = ctx->page_url.data;
+    out_cmd[2].len  = ctx->page_url.len;
+
+    /* swfUrl */
+    out_cmd[3].data = ctx->swf_url.data;
+    out_cmd[3].len  = ctx->swf_url.len;
+
+    /* flashVer */
+    if (ctx->flash_ver.len) {
+        out_cmd[4].data = ctx->flash_ver.data;
+        out_cmd[4].len  = ctx->flash_ver.len;
+    } else {
+        out_cmd[4].data = NGX_RTMP_RELAY_FLASHVER;
+        out_cmd[4].len  = sizeof(NGX_RTMP_RELAY_FLASHVER) - 1;
+    }
+
+    ngx_memzero(&h, sizeof(h));
+    h.csid = NGX_RTMP_RELAY_CSID_AMF_INI;
+    h.type = NGX_RTMP_MSG_AMF_CMD;
+
+    return ngx_rtmp_send_chunk_size(s, cscf->chunk_size) != NGX_OK
+        || ngx_rtmp_send_ack_size(s, cscf->ack_window) != NGX_OK
+        || ngx_rtmp_send_amf(s, &h, out_elts,
+            sizeof(out_elts) / sizeof(out_elts[0])) != NGX_OK
+        ? NGX_ERROR
+        : NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_send_create_stream(ngx_rtmp_session_t *s)
+{
+    static double               trans = NGX_RTMP_RELAY_CREATE_STREAM_TRANS;
+
+    static ngx_rtmp_amf_elt_t   out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "createStream", 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &trans, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 }
+    };
+
+    ngx_rtmp_header_t           h;
+
+
+    ngx_memzero(&h, sizeof(h));
+    h.csid = NGX_RTMP_RELAY_CSID_AMF_INI;
+    h.type = NGX_RTMP_MSG_AMF_CMD;
+
+    return ngx_rtmp_send_amf(s, &h, out_elts,
+            sizeof(out_elts) / sizeof(out_elts[0]));
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_send_publish(ngx_rtmp_session_t *s)
+{
+    static double               trans;
+
+    static ngx_rtmp_amf_elt_t   out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "publish", 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &trans, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          NULL, 0 }, /* <- to fill */
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "live", 0 }
+    };
+
+    ngx_rtmp_header_t           h;
+    ngx_rtmp_relay_ctx_t       *ctx;
+
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ctx->play_path.len) {
+        out_elts[3].data = ctx->play_path.data;
+        out_elts[3].len  = ctx->play_path.len;
+    } else {
+        out_elts[3].data = ctx->name.data;
+        out_elts[3].len  = ctx->name.len;
+    }
+
+    ngx_memzero(&h, sizeof(h));
+    h.csid = NGX_RTMP_RELAY_CSID_AMF;
+    h.msid = NGX_RTMP_RELAY_MSID;
+    h.type = NGX_RTMP_MSG_AMF_CMD;
+
+    return ngx_rtmp_send_amf(s, &h, out_elts,
+            sizeof(out_elts) / sizeof(out_elts[0]));
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_send_play(ngx_rtmp_session_t *s)
+{
+    static double               trans;
+    static double               start, duration;
+
+    static ngx_rtmp_amf_elt_t   out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "play", 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &trans, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          NULL, 0 }, /* <- fill */
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &start, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &duration, 0 },
+    };
+
+    ngx_rtmp_header_t           h;
+    ngx_rtmp_relay_ctx_t       *ctx;
+    ngx_rtmp_relay_app_conf_t  *racf;
+
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (racf == NULL || ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ctx->play_path.len) {
+        out_elts[3].data = ctx->play_path.data;
+        out_elts[3].len  = ctx->play_path.len;
+    } else {
+        out_elts[3].data = ctx->name.data;
+        out_elts[3].len  = ctx->name.len;
+    }
+
+    if (ctx->live) {
+        start = -1000;
+        duration = -1000;
+    } else {
+        start    = (ctx->start ? ctx->start : -2000);
+        duration = (ctx->stop  ? ctx->stop - ctx->start : -1000);
+    }
+
+    ngx_memzero(&h, sizeof(h));
+    h.csid = NGX_RTMP_RELAY_CSID_AMF;
+    h.msid = NGX_RTMP_RELAY_MSID;
+    h.type = NGX_RTMP_MSG_AMF_CMD;
+
+    return ngx_rtmp_send_amf(s, &h, out_elts,
+            sizeof(out_elts) / sizeof(out_elts[0])) != NGX_OK
+           || ngx_rtmp_send_set_buflen(s, NGX_RTMP_RELAY_MSID,
+                   racf->buflen) != NGX_OK
+           ? NGX_ERROR
+           : NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_on_result(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    ngx_rtmp_relay_ctx_t       *ctx;
+    static struct {
+        double                  trans;
+        u_char                  level[32];
+        u_char                  code[128];
+        u_char                  desc[1024];
+    } v;
+
+    static ngx_rtmp_amf_elt_t   in_inf[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("level"),
+          &v.level, sizeof(v.level) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("code"),
+          &v.code, sizeof(v.code) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("description"),
+          &v.desc, sizeof(v.desc) },
+    };
+
+    static ngx_rtmp_amf_elt_t   in_elts[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.trans, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          in_inf, sizeof(in_inf) },
+    };
+
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL || !s->relay) {
+        return NGX_OK;
+    }
+
+    ngx_memzero(&v, sizeof(v));
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "relay: _result: level='%s' code='%s' description='%s'",
+            v.level, v.code, v.desc);
+
+    switch ((ngx_int_t)v.trans) {
+        case NGX_RTMP_RELAY_CONNECT_TRANS:
+            return ngx_rtmp_relay_send_create_stream(s);
+
+        case NGX_RTMP_RELAY_CREATE_STREAM_TRANS:
+            if (ctx->publish != ctx && !s->static_relay) {
+                if (ngx_rtmp_relay_send_publish(s) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                return ngx_rtmp_relay_play_local(s);
+
+            } else {
+                if (ngx_rtmp_relay_send_play(s) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+                return ngx_rtmp_relay_publish_local(s);
+            }
+
+        default:
+            return NGX_OK;
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_on_error(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    ngx_rtmp_relay_ctx_t       *ctx;
+    static struct {
+        double                  trans;
+        u_char                  level[32];
+        u_char                  code[128];
+        u_char                  desc[1024];
+    } v;
+
+    static ngx_rtmp_amf_elt_t   in_inf[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("level"),
+          &v.level, sizeof(v.level) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("code"),
+          &v.code, sizeof(v.code) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("description"),
+          &v.desc, sizeof(v.desc) },
+    };
+
+    static ngx_rtmp_amf_elt_t   in_elts[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.trans, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          in_inf, sizeof(in_inf) },
+    };
+
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL || !s->relay) {
+        return NGX_OK;
+    }
+
+    ngx_memzero(&v, sizeof(v));
+    if (ngx_rtmp_receive_amf(s, in, in_elts,
+                sizeof(in_elts) / sizeof(in_elts[0])))
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "relay: _error: level='%s' code='%s' description='%s'",
+            v.level, v.code, v.desc);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_on_status(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    ngx_rtmp_relay_ctx_t       *ctx;
+    static struct {
+        double                  trans;
+        u_char                  level[32];
+        u_char                  code[128];
+        u_char                  desc[1024];
+    } v;
+
+    static ngx_rtmp_amf_elt_t   in_inf[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("level"),
+          &v.level, sizeof(v.level) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("code"),
+          &v.code, sizeof(v.code) },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("description"),
+          &v.desc, sizeof(v.desc) },
+    };
+
+    static ngx_rtmp_amf_elt_t   in_elts[] = {
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &v.trans, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          in_inf, sizeof(in_inf) },
+    };
+
+    static ngx_rtmp_amf_elt_t   in_elts_meta[] = {
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          in_inf, sizeof(in_inf) },
+    };
+
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL || !s->relay) {
+        return NGX_OK;
+    }
+
+    ngx_memzero(&v, sizeof(v));
+    if (h->type == NGX_RTMP_MSG_AMF_META) {
+        ngx_rtmp_receive_amf(s, in, in_elts_meta,
+                sizeof(in_elts_meta) / sizeof(in_elts_meta[0]));
+    } else {
+        ngx_rtmp_receive_amf(s, in, in_elts,
+                sizeof(in_elts) / sizeof(in_elts[0]));
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+            "relay: onStatus: level='%s' code='%s' description='%s'",
+            v.level, v.code, v.desc);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_handshake_done(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+        ngx_chain_t *in)
+{
+    ngx_rtmp_relay_ctx_t   *ctx;
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL || !s->relay) {
+        return NGX_OK;
+    }
+
+    return ngx_rtmp_relay_send_connect(s);
+}
+
+
+static void
+ngx_rtmp_relay_close(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_relay_app_conf_t          *racf;
+    ngx_rtmp_relay_ctx_t               *ctx, **cctx;
+    ngx_uint_t                          hash;
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
+
+    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    if (s->static_relay) {
+        ngx_add_timer(ctx->static_evt, racf->pull_reconnect);
+    }
+
+    if (ctx->publish == NULL) {
+        return;
+    }
+
+    /* play end disconnect? */
+    if (ctx->publish != ctx) {
+        for (cctx = &ctx->publish->play; *cctx; cctx = &(*cctx)->next) {
+            if (*cctx == ctx) {
+                *cctx = ctx->next;
+                break;
+            }
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ctx->session->connection->log, 0,
+                "relay: play disconnect app='%V' name='%V'",
+                &ctx->app, &ctx->name);
+
+        /* push reconnect */
+        if (s->relay && ctx->tag == &ngx_rtmp_relay_module &&
+            !ctx->publish->push_evt.timer_set)
+        {
+            ngx_add_timer(&ctx->publish->push_evt, racf->push_reconnect);
+        }
+
+#ifdef NGX_DEBUG
+        {
+            ngx_uint_t  n = 0;
+            for (cctx = &ctx->publish->play; *cctx; cctx = &(*cctx)->next, ++n);
+            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, ctx->session->connection->log, 0,
+                "relay: play left after disconnect app='%V' name='%V': %ui",
+                &ctx->app, &ctx->name, n);
+        }
+#endif
+
+        if (ctx->publish->play == NULL && ctx->publish->session->relay) {
+            ngx_log_debug2(NGX_LOG_DEBUG_RTMP,
+                 ctx->publish->session->connection->log, 0,
+                "relay: publish disconnect empty app='%V' name='%V'",
+                &ctx->app, &ctx->name);
+            ngx_rtmp_finalize_session(ctx->publish->session);
+        }
+
+        ctx->publish = NULL;
+
+        return;
+    }
+
+    /* publish end disconnect */
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ctx->session->connection->log, 0,
+            "relay: publish disconnect app='%V' name='%V'",
+            &ctx->app, &ctx->name);
+
+    if (ctx->push_evt.timer_set) {
+        ngx_del_timer(&ctx->push_evt);
+    }
+
+    for (cctx = &ctx->play; *cctx; cctx = &(*cctx)->next) {
+        (*cctx)->publish = NULL;
+        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, (*cctx)->session->connection->log,
+            0, "relay: play disconnect orphan app='%V' name='%V'",
+            &(*cctx)->app, &(*cctx)->name);
+        ngx_rtmp_finalize_session((*cctx)->session);
+    }
+    ctx->publish = NULL;
+
+    hash = ngx_hash_key(ctx->name.data, ctx->name.len);
+    cctx = &racf->ctx[hash % racf->nbuckets];
+    for (; *cctx && *cctx != ctx; cctx = &(*cctx)->next);
+    if (*cctx) {
+        *cctx = ctx->next;
+    }
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
+{
+    ngx_rtmp_relay_app_conf_t  *racf;
+
+    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
+    if (racf && !racf->session_relay) {
+        ngx_rtmp_relay_close(s);
+    }
+
+    return next_close_stream(s, v);
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_delete_stream(ngx_rtmp_session_t *s, ngx_rtmp_delete_stream_t *v)
+{
+    ngx_rtmp_relay_close(s);
+
+    return next_delete_stream(s, v);
+}
+
+
+static char *
+ngx_rtmp_relay_push_pull(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t                          *value, v, n;
+    ngx_rtmp_relay_app_conf_t          *racf;
+    ngx_rtmp_relay_target_t            *target, **t;
+    ngx_url_t                          *u;
+    ngx_uint_t                          i;
+    ngx_int_t                           is_pull, is_static;
+    ngx_event_t                       **ee, *e;
+    ngx_rtmp_relay_static_t            *rs;
+    u_char                             *p;
+
+    value = cf->args->elts;
+
+    racf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_relay_module);
+
+    is_pull = (value[0].data[3] == 'l');
+    is_static = 0;
+
+    target = ngx_pcalloc(cf->pool, sizeof(*target));
+    if (target == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    target->tag = &ngx_rtmp_relay_module;
+    target->data = target;
+
+    u = &target->url;
+    u->default_port = 1935;
+    u->uri_part = 1;
+    u->url = value[1];
+
+    if (ngx_strncasecmp(u->url.data, (u_char *) "rtmp://", 7) == 0) {
+        u->url.data += 7;
+        u->url.len  -= 7;
+    }
+
+    if (ngx_parse_url(cf->pool, u) != NGX_OK) {
+        if (u->err) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                    "%s in url \"%V\"", u->err, &u->url);
+        }
+        return NGX_CONF_ERROR;
+    }
+
+    value += 2;
+    for (i = 2; i < cf->args->nelts; ++i, ++value) {
+        p = ngx_strlchr(value->data, value->data + value->len, '=');
+
+        if (p == NULL) {
+            n = *value;
+            ngx_str_set(&v, "1");
+
+        } else {
+            n.data = value->data;
+            n.len  = p - value->data;
+
+            v.data = p + 1;
+            v.len  = value->data + value->len - p - 1;
+        }
+
+#define NGX_RTMP_RELAY_STR_PAR(name, var)                                     \
+        if (n.len == sizeof(name) - 1                                         \
+            && ngx_strncasecmp(n.data, (u_char *) name, n.len) == 0)          \
+        {                                                                     \
+            target->var = v;                                                  \
+            continue;                                                         \
+        }
+
+#define NGX_RTMP_RELAY_NUM_PAR(name, var)                                     \
+        if (n.len == sizeof(name) - 1                                         \
+            && ngx_strncasecmp(n.data, (u_char *) name, n.len) == 0)          \
+        {                                                                     \
+            target->var = ngx_atoi(v.data, v.len);                            \
+            continue;                                                         \
+        }
+
+        NGX_RTMP_RELAY_STR_PAR("app",         app);
+        NGX_RTMP_RELAY_STR_PAR("name",        name);
+        NGX_RTMP_RELAY_STR_PAR("tcUrl",       tc_url);
+        NGX_RTMP_RELAY_STR_PAR("pageUrl",     page_url);
+        NGX_RTMP_RELAY_STR_PAR("swfUrl",      swf_url);
+        NGX_RTMP_RELAY_STR_PAR("flashVer",    flash_ver);
+        NGX_RTMP_RELAY_STR_PAR("playPath",    play_path);
+        NGX_RTMP_RELAY_NUM_PAR("live",        live);
+        NGX_RTMP_RELAY_NUM_PAR("start",       start);
+        NGX_RTMP_RELAY_NUM_PAR("stop",        stop);
+
+#undef NGX_RTMP_RELAY_STR_PAR
+#undef NGX_RTMP_RELAY_NUM_PAR
+
+        if (n.len == sizeof("static") - 1 &&
+            ngx_strncasecmp(n.data, (u_char *) "static", n.len) == 0 &&
+            ngx_atoi(v.data, v.len))
+        {
+            is_static = 1;
+            continue;
+        }
+
+        return "unsuppored parameter";
+    }
+
+    if (is_static) {
+
+        if (!is_pull) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "static push is not allowed");
+            return NGX_CONF_ERROR;
+        }
+
+        if (target->name.len == 0) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "stream name missing in static pull "
+                               "declaration");
+            return NGX_CONF_ERROR;
+        }
+
+        ee = ngx_array_push(&racf->static_events);
+        if (ee == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        e = ngx_pcalloc(cf->pool, sizeof(ngx_event_t));
+        if (e == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *ee = e;
+
+        rs = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_relay_static_t));
+        if (rs == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        rs->target = target;
+
+        e->data = rs;
+        e->log = &cf->cycle->new_log;
+        e->handler = ngx_rtmp_relay_static_pull_reconnect;
+
+        t = ngx_array_push(&racf->static_pulls);
+
+    } else if (is_pull) {
+        t = ngx_array_push(&racf->pulls);
+
+    } else {
+        t = ngx_array_push(&racf->pushes);
+    }
+
+    if (t == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *t = target;
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_init_process(ngx_cycle_t *cycle)
+{
+#if !(NGX_WIN32)
+    ngx_rtmp_core_main_conf_t  *cmcf = ngx_rtmp_core_main_conf;
+    ngx_rtmp_core_srv_conf_t  **pcscf, *cscf;
+    ngx_rtmp_core_app_conf_t  **pcacf, *cacf;
+    ngx_rtmp_relay_app_conf_t  *racf;
+    ngx_uint_t                  n, m, k;
+    ngx_rtmp_relay_static_t    *rs;
+    ngx_rtmp_listen_t          *lst;
+    ngx_event_t               **pevent, *event;
+
+    if (cmcf == NULL || cmcf->listen.nelts == 0) {
+        return NGX_OK;
+    }
+
+    /* only first worker does static pulling */
+
+    if (ngx_process_slot) {
+        return NGX_OK;
+    }
+
+    lst = cmcf->listen.elts;
+
+    pcscf = cmcf->servers.elts;
+    for (n = 0; n < cmcf->servers.nelts; ++n, ++pcscf) {
+
+        cscf = *pcscf;
+        pcacf = cscf->applications.elts;
+
+        for (m = 0; m < cscf->applications.nelts; ++m, ++pcacf) {
+
+            cacf = *pcacf;
+            racf = cacf->app_conf[ngx_rtmp_relay_module.ctx_index];
+            pevent = racf->static_events.elts;
+
+            for (k = 0; k < racf->static_events.nelts; ++k, ++pevent) {
+                event = *pevent;
+
+                rs = event->data;
+                rs->cctx = *lst->ctx;
+                rs->cctx.app_conf = cacf->app_conf;
+
+                ngx_post_event(event, &ngx_rtmp_init_queue);
+            }
+        }
+    }
+#endif
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_rtmp_relay_postconfiguration(ngx_conf_t *cf)
+{
+    ngx_rtmp_core_main_conf_t          *cmcf;
+    ngx_rtmp_handler_pt                *h;
+    ngx_rtmp_amf_handler_t             *ch;
+
+    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
+
+
+    h = ngx_array_push(&cmcf->events[NGX_RTMP_HANDSHAKE_DONE]);
+    *h = ngx_rtmp_relay_handshake_done;
+
+
+    next_publish = ngx_rtmp_publish;
+    ngx_rtmp_publish = ngx_rtmp_relay_publish;
+
+    next_play = ngx_rtmp_play;
+    ngx_rtmp_play = ngx_rtmp_relay_play;
+
+    next_delete_stream = ngx_rtmp_delete_stream;
+    ngx_rtmp_delete_stream = ngx_rtmp_relay_delete_stream;
+
+    next_close_stream = ngx_rtmp_close_stream;
+    ngx_rtmp_close_stream = ngx_rtmp_relay_close_stream;
+
+
+    ch = ngx_array_push(&cmcf->amf);
+    ngx_str_set(&ch->name, "_result");
+    ch->handler = ngx_rtmp_relay_on_result;
+
+    ch = ngx_array_push(&cmcf->amf);
+    ngx_str_set(&ch->name, "_error");
+    ch->handler = ngx_rtmp_relay_on_error;
+
+    ch = ngx_array_push(&cmcf->amf);
+    ngx_str_set(&ch->name, "onStatus");
+    ch->handler = ngx_rtmp_relay_on_status;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_relay_module.h b/debian/modules/nginx-rtmp/ngx_rtmp_relay_module.h
new file mode 100644
index 0000000..d1baeae
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_relay_module.h
@@ -0,0 +1,72 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_RELAY_H_INCLUDED_
+#define _NGX_RTMP_RELAY_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+
+
+typedef struct {
+    ngx_url_t                       url;
+    ngx_str_t                       app;
+    ngx_str_t                       name;
+    ngx_str_t                       tc_url;
+    ngx_str_t                       page_url;
+    ngx_str_t                       swf_url;
+    ngx_str_t                       flash_ver;
+    ngx_str_t                       play_path;
+    ngx_int_t                       live;
+    ngx_int_t                       start;
+    ngx_int_t                       stop;
+
+    void                           *tag;     /* usually module reference */
+    void                           *data;    /* module-specific data */
+    ngx_uint_t                      counter; /* mutable connection counter */
+} ngx_rtmp_relay_target_t;
+
+
+typedef struct ngx_rtmp_relay_ctx_s ngx_rtmp_relay_ctx_t;
+
+struct ngx_rtmp_relay_ctx_s {
+    ngx_str_t                       name;
+    ngx_str_t                       url;
+    ngx_log_t                       log;
+    ngx_rtmp_session_t             *session;
+    ngx_rtmp_relay_ctx_t           *publish;
+    ngx_rtmp_relay_ctx_t           *play;
+    ngx_rtmp_relay_ctx_t           *next;
+
+    ngx_str_t                       app;
+    ngx_str_t                       tc_url;
+    ngx_str_t                       page_url;
+    ngx_str_t                       swf_url;
+    ngx_str_t                       flash_ver;
+    ngx_str_t                       play_path;
+    ngx_int_t                       live;
+    ngx_int_t                       start;
+    ngx_int_t                       stop;
+
+    ngx_event_t                     push_evt;
+    ngx_event_t                    *static_evt;
+    void                           *tag;
+    void                           *data;
+};
+
+
+extern ngx_module_t                 ngx_rtmp_relay_module;
+
+
+ngx_int_t ngx_rtmp_relay_pull(ngx_rtmp_session_t *s, ngx_str_t *name,
+                              ngx_rtmp_relay_target_t *target);
+ngx_int_t ngx_rtmp_relay_push(ngx_rtmp_session_t *s, ngx_str_t *name,
+                              ngx_rtmp_relay_target_t *target);
+
+
+#endif /* _NGX_RTMP_RELAY_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_send.c b/debian/modules/nginx-rtmp/ngx_rtmp_send.c
new file mode 100644
index 0000000..c65deec
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_send.c
@@ -0,0 +1,635 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_amf.h"
+#include "ngx_rtmp_streams.h"
+
+
+#define NGX_RTMP_USER_START(s, tp)                                          \
+    ngx_rtmp_header_t               __h;                                    \
+    ngx_chain_t                    *__l;                                    \
+    ngx_buf_t                      *__b;                                    \
+    ngx_rtmp_core_srv_conf_t       *__cscf;                                 \
+                                                                            \
+    __cscf = ngx_rtmp_get_module_srv_conf(                                  \
+            s, ngx_rtmp_core_module);                                       \
+    memset(&__h, 0, sizeof(__h));                                           \
+    __h.type = tp;                                                          \
+    __h.csid = 2;                                                           \
+    __l = ngx_rtmp_alloc_shared_buf(__cscf);                                \
+    if (__l == NULL) {                                                      \
+        return NULL;                                                        \
+    }                                                                       \
+    __b = __l->buf;
+
+#define NGX_RTMP_UCTL_START(s, type, utype)                                 \
+    NGX_RTMP_USER_START(s, type);                                           \
+    *(__b->last++) = (u_char)((utype) >> 8);                                \
+    *(__b->last++) = (u_char)(utype);
+
+#define NGX_RTMP_USER_OUT1(v)                                               \
+    *(__b->last++) = ((u_char*)&v)[0];
+
+#define NGX_RTMP_USER_OUT4(v)                                               \
+    *(__b->last++) = ((u_char*)&v)[3];                                      \
+    *(__b->last++) = ((u_char*)&v)[2];                                      \
+    *(__b->last++) = ((u_char*)&v)[1];                                      \
+    *(__b->last++) = ((u_char*)&v)[0];
+
+#define NGX_RTMP_USER_END(s)                                                \
+    ngx_rtmp_prepare_message(s, &__h, NULL, __l);                           \
+    return __l;
+
+
+static ngx_int_t
+ngx_rtmp_send_shared_packet(ngx_rtmp_session_t *s, ngx_chain_t *cl)
+{
+    ngx_rtmp_core_srv_conf_t       *cscf;
+    ngx_int_t                       rc;
+
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    rc = ngx_rtmp_send_message(s, cl, 0);
+
+    ngx_rtmp_free_shared_chain(cscf, cl);
+
+    return rc;
+}
+
+
+/* Protocol control messages */
+
+ngx_chain_t *
+ngx_rtmp_create_chunk_size(ngx_rtmp_session_t *s, uint32_t chunk_size)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "chunk_size=%uD", chunk_size);
+
+    {
+        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_CHUNK_SIZE);
+
+        NGX_RTMP_USER_OUT4(chunk_size);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_chunk_size(ngx_rtmp_session_t *s, uint32_t chunk_size)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_chunk_size(s, chunk_size));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_abort(ngx_rtmp_session_t *s, uint32_t csid)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: abort csid=%uD", csid);
+
+    {
+        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_CHUNK_SIZE);
+
+        NGX_RTMP_USER_OUT4(csid);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_abort(ngx_rtmp_session_t *s, uint32_t csid)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_abort(s, csid));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_ack(ngx_rtmp_session_t *s, uint32_t seq)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: ack seq=%uD", seq);
+
+    {
+        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_ACK);
+
+        NGX_RTMP_USER_OUT4(seq);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_ack(ngx_rtmp_session_t *s, uint32_t seq)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_ack(s, seq));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_ack_size(ngx_rtmp_session_t *s, uint32_t ack_size)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: ack_size=%uD", ack_size);
+
+    {
+        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_ACK_SIZE);
+
+        NGX_RTMP_USER_OUT4(ack_size);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_ack_size(ngx_rtmp_session_t *s, uint32_t ack_size)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_ack_size(s, ack_size));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_bandwidth(ngx_rtmp_session_t *s, uint32_t ack_size,
+                          uint8_t limit_type)
+{
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: bandwidth ack_size=%uD limit=%d",
+                   ack_size, (int)limit_type);
+
+    {
+        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_BANDWIDTH);
+
+        NGX_RTMP_USER_OUT4(ack_size);
+        NGX_RTMP_USER_OUT1(limit_type);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_bandwidth(ngx_rtmp_session_t *s, uint32_t ack_size,
+                        uint8_t limit_type)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_bandwidth(s, ack_size, limit_type));
+}
+
+
+/* User control messages */
+
+ngx_chain_t *
+ngx_rtmp_create_stream_begin(ngx_rtmp_session_t *s, uint32_t msid)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: stream_begin msid=%uD", msid);
+
+    {
+        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_BEGIN);
+
+        NGX_RTMP_USER_OUT4(msid);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_stream_begin(ngx_rtmp_session_t *s, uint32_t msid)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_stream_begin(s, msid));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_stream_eof(ngx_rtmp_session_t *s, uint32_t msid)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: stream_end msid=%uD", msid);
+
+    {
+        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_EOF);
+
+        NGX_RTMP_USER_OUT4(msid);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_stream_eof(ngx_rtmp_session_t *s, uint32_t msid)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_stream_eof(s, msid));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_stream_dry(ngx_rtmp_session_t *s, uint32_t msid)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: stream_dry msid=%uD", msid);
+
+    {
+        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_DRY);
+
+        NGX_RTMP_USER_OUT4(msid);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_stream_dry(ngx_rtmp_session_t *s, uint32_t msid)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_stream_dry(s, msid));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_set_buflen(ngx_rtmp_session_t *s, uint32_t msid,
+                           uint32_t buflen_msec)
+{
+    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: set_buflen msid=%uD buflen=%uD",
+                   msid, buflen_msec);
+
+    {
+        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_SET_BUFLEN);
+
+        NGX_RTMP_USER_OUT4(msid);
+        NGX_RTMP_USER_OUT4(buflen_msec);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_set_buflen(ngx_rtmp_session_t *s, uint32_t msid,
+        uint32_t buflen_msec)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_set_buflen(s, msid, buflen_msec));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_recorded(ngx_rtmp_session_t *s, uint32_t msid)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: recorded msid=%uD", msid);
+
+    {
+        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_RECORDED);
+
+        NGX_RTMP_USER_OUT4(msid);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_recorded(ngx_rtmp_session_t *s, uint32_t msid)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_recorded(s, msid));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_ping_request(ngx_rtmp_session_t *s, uint32_t timestamp)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: ping_request timestamp=%uD", timestamp);
+
+    {
+        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_PING_REQUEST);
+
+        NGX_RTMP_USER_OUT4(timestamp);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_ping_request(ngx_rtmp_session_t *s, uint32_t timestamp)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_ping_request(s, timestamp));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_ping_response(ngx_rtmp_session_t *s, uint32_t timestamp)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: ping_response timestamp=%uD", timestamp);
+
+    {
+        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_PING_RESPONSE);
+
+        NGX_RTMP_USER_OUT4(timestamp);
+
+        NGX_RTMP_USER_END(s);
+    }
+}
+
+
+ngx_int_t
+ngx_rtmp_send_ping_response(ngx_rtmp_session_t *s, uint32_t timestamp)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_ping_response(s, timestamp));
+}
+
+
+static ngx_chain_t *
+ngx_rtmp_alloc_amf_buf(void *arg)
+{
+    return ngx_rtmp_alloc_shared_buf((ngx_rtmp_core_srv_conf_t *)arg);
+}
+
+
+/* AMF sender */
+
+/* NOTE: this function does not free shared bufs on error */
+ngx_int_t
+ngx_rtmp_append_amf(ngx_rtmp_session_t *s,
+                    ngx_chain_t **first, ngx_chain_t **last,
+                    ngx_rtmp_amf_elt_t *elts, size_t nelts)
+{
+    ngx_rtmp_amf_ctx_t          act;
+    ngx_rtmp_core_srv_conf_t   *cscf;
+    ngx_int_t                   rc;
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    memset(&act, 0, sizeof(act));
+    act.arg = cscf;
+    act.alloc = ngx_rtmp_alloc_amf_buf;
+    act.log = s->connection->log;
+
+    if (first) {
+        act.first = *first;
+    }
+
+    if (last) {
+        act.link = *last;
+    }
+
+    rc = ngx_rtmp_amf_write(&act, elts, nelts);
+
+    if (first) {
+        *first = act.first;
+    }
+
+    if (last) {
+        *last = act.link;
+    }
+
+    return rc;
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_amf(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                    ngx_rtmp_amf_elt_t *elts, size_t nelts)
+{
+    ngx_chain_t                *first;
+    ngx_int_t                   rc;
+    ngx_rtmp_core_srv_conf_t   *cscf;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: amf nelts=%ui", nelts);
+
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
+    first = NULL;
+
+    rc = ngx_rtmp_append_amf(s, &first, NULL, elts, nelts);
+
+    if (rc != NGX_OK && first) {
+        ngx_rtmp_free_shared_chain(cscf, first);
+        first = NULL;
+    }
+
+    if (first) {
+        ngx_rtmp_prepare_message(s, h, NULL, first);
+    }
+
+    return first;
+}
+
+
+ngx_int_t
+ngx_rtmp_send_amf(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+                  ngx_rtmp_amf_elt_t *elts, size_t nelts)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_amf(s, h, elts, nelts));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_status(ngx_rtmp_session_t *s, char *code, char* level,
+                       char *desc)
+{
+    ngx_rtmp_header_t               h;
+    static double                   trans;
+
+    static ngx_rtmp_amf_elt_t       out_inf[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("level"),
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("code"),
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("description"),
+          NULL, 0 },
+    };
+
+    static ngx_rtmp_amf_elt_t       out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "onStatus", 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_null_string,
+          &trans, 0 },
+
+        { NGX_RTMP_AMF_NULL,
+          ngx_null_string,
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          out_inf,
+          sizeof(out_inf) },
+    };
+
+    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: status code='%s' level='%s' desc='%s'",
+                   code, level, desc);
+
+    out_inf[0].data = level;
+    out_inf[1].data = code;
+    out_inf[2].data = desc;
+
+    memset(&h, 0, sizeof(h));
+
+    h.type = NGX_RTMP_MSG_AMF_CMD;
+    h.csid = NGX_RTMP_CSID_AMF;
+    h.msid = NGX_RTMP_MSID;
+
+    return ngx_rtmp_create_amf(s, &h, out_elts,
+                               sizeof(out_elts) / sizeof(out_elts[0]));
+}
+
+
+ngx_int_t
+ngx_rtmp_send_status(ngx_rtmp_session_t *s, char *code, char* level, char *desc)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_status(s, code, level, desc));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_play_status(ngx_rtmp_session_t *s, char *code, char* level,
+                            ngx_uint_t duration, ngx_uint_t bytes)
+{
+    ngx_rtmp_header_t               h;
+    static double                   dduration;
+    static double                   dbytes;
+
+    static ngx_rtmp_amf_elt_t       out_inf[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("code"),
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_string("level"),
+          NULL, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("duration"),
+          &dduration, 0 },
+
+        { NGX_RTMP_AMF_NUMBER,
+          ngx_string("bytes"),
+          &dbytes, 0 },
+    };
+
+    static ngx_rtmp_amf_elt_t       out_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "onPlayStatus", 0 },
+
+        { NGX_RTMP_AMF_OBJECT,
+          ngx_null_string,
+          out_inf,
+          sizeof(out_inf) },
+    };
+
+    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+                   "create: play_status code='%s' level='%s' "
+                   "duration=%ui bytes=%ui",
+                   code, level, duration, bytes);
+
+    out_inf[0].data = code;
+    out_inf[1].data = level;
+
+    dduration = duration;
+    dbytes = bytes;
+
+    memset(&h, 0, sizeof(h));
+
+    h.type = NGX_RTMP_MSG_AMF_META;
+    h.csid = NGX_RTMP_CSID_AMF;
+    h.msid = NGX_RTMP_MSID;
+    h.timestamp = duration;
+
+    return ngx_rtmp_create_amf(s, &h, out_elts,
+                               sizeof(out_elts) / sizeof(out_elts[0]));
+}
+
+
+ngx_int_t
+ngx_rtmp_send_play_status(ngx_rtmp_session_t *s, char *code, char* level,
+                          ngx_uint_t duration, ngx_uint_t bytes)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_play_status(s, code, level, duration, bytes));
+}
+
+
+ngx_chain_t *
+ngx_rtmp_create_sample_access(ngx_rtmp_session_t *s)
+{
+    ngx_rtmp_header_t               h;
+
+    static int                      access = 1;
+
+    static ngx_rtmp_amf_elt_t       access_elts[] = {
+
+        { NGX_RTMP_AMF_STRING,
+          ngx_null_string,
+          "|RtmpSampleAccess", 0 },
+
+        { NGX_RTMP_AMF_BOOLEAN,
+          ngx_null_string,
+          &access, 0 },
+
+        { NGX_RTMP_AMF_BOOLEAN,
+          ngx_null_string,
+          &access, 0 },
+    };
+
+    memset(&h, 0, sizeof(h));
+
+    h.type = NGX_RTMP_MSG_AMF_META;
+    h.csid = NGX_RTMP_CSID_AMF;
+    h.msid = NGX_RTMP_MSID;
+
+    return ngx_rtmp_create_amf(s, &h, access_elts,
+                               sizeof(access_elts) / sizeof(access_elts[0]));
+}
+
+
+ngx_int_t
+ngx_rtmp_send_sample_access(ngx_rtmp_session_t *s)
+{
+    return ngx_rtmp_send_shared_packet(s,
+           ngx_rtmp_create_sample_access(s));
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_shared.c b/debian/modules/nginx-rtmp/ngx_rtmp_shared.c
new file mode 100644
index 0000000..6f6e4e8
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_shared.c
@@ -0,0 +1,126 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include "ngx_rtmp.h"
+
+
+ngx_chain_t *
+ngx_rtmp_alloc_shared_buf(ngx_rtmp_core_srv_conf_t *cscf)
+{
+    u_char                     *p;
+    ngx_chain_t                *out;
+    ngx_buf_t                  *b;
+    size_t                      size;
+
+    if (cscf->free) {
+        out = cscf->free;
+        cscf->free = out->next;
+
+    } else {
+
+        size = cscf->chunk_size + NGX_RTMP_MAX_CHUNK_HEADER;
+
+        p = ngx_pcalloc(cscf->pool, NGX_RTMP_REFCOUNT_BYTES
+                + sizeof(ngx_chain_t)
+                + sizeof(ngx_buf_t)
+                + size);
+        if (p == NULL) {
+            return NULL;
+        }
+
+        p += NGX_RTMP_REFCOUNT_BYTES;
+        out = (ngx_chain_t *)p;
+
+        p += sizeof(ngx_chain_t);
+        out->buf = (ngx_buf_t *)p;
+
+        p += sizeof(ngx_buf_t);
+        out->buf->start = p;
+        out->buf->end = p + size;
+    }
+
+    out->next = NULL;
+    b = out->buf;
+    b->pos = b->last = b->start + NGX_RTMP_MAX_CHUNK_HEADER;
+    b->memory = 1;
+
+    /* buffer has refcount =1 when created! */
+    ngx_rtmp_ref_set(out, 1);
+
+    return out;
+}
+
+
+void
+ngx_rtmp_free_shared_chain(ngx_rtmp_core_srv_conf_t *cscf, ngx_chain_t *in)
+{
+    ngx_chain_t        *cl;
+
+    if (ngx_rtmp_ref_put(in)) {
+        return;
+    }
+
+    for (cl = in; ; cl = cl->next) {
+        if (cl->next == NULL) {
+            cl->next = cscf->free;
+            cscf->free = in;
+            return;
+        }
+    }
+}
+
+
+ngx_chain_t *
+ngx_rtmp_append_shared_bufs(ngx_rtmp_core_srv_conf_t *cscf,
+        ngx_chain_t *head, ngx_chain_t *in)
+{
+    ngx_chain_t                    *l, **ll;
+    u_char                         *p;
+    size_t                          size;
+
+    ll = &head;
+    p = in->buf->pos;
+    l = head;
+
+    if (l) {
+        for(; l->next; l = l->next);
+        ll = &l->next;
+    }
+
+    for ( ;; ) {
+
+        if (l == NULL || l->buf->last == l->buf->end) {
+            l = ngx_rtmp_alloc_shared_buf(cscf);
+            if (l == NULL || l->buf == NULL) {
+                break;
+            }
+
+            *ll = l;
+            ll = &l->next;
+        }
+
+        while (l->buf->end - l->buf->last >= in->buf->last - p) {
+            l->buf->last = ngx_cpymem(l->buf->last, p,
+                    in->buf->last - p);
+            in = in->next;
+            if (in == NULL) {
+                goto done;
+            }
+            p = in->buf->pos;
+        }
+
+        size = l->buf->end - l->buf->last;
+        l->buf->last = ngx_cpymem(l->buf->last, p, size);
+        p += size;
+    }
+
+done:
+    *ll = NULL;
+
+    return head;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_stat_module.c b/debian/modules/nginx-rtmp/ngx_rtmp_stat_module.c
new file mode 100644
index 0000000..326a811
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_stat_module.c
@@ -0,0 +1,863 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+#include "ngx_rtmp.h"
+#include "ngx_rtmp_version.h"
+#include "ngx_rtmp_live_module.h"
+#include "ngx_rtmp_play_module.h"
+#include "ngx_rtmp_codec_module.h"
+
+
+static ngx_int_t ngx_rtmp_stat_init_process(ngx_cycle_t *cycle);
+static char *ngx_rtmp_stat(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+static ngx_int_t ngx_rtmp_stat_postconfiguration(ngx_conf_t *cf);
+static void * ngx_rtmp_stat_create_loc_conf(ngx_conf_t *cf);
+static char * ngx_rtmp_stat_merge_loc_conf(ngx_conf_t *cf,
+        void *parent, void *child);
+
+
+static time_t                       start_time;
+
+
+#define NGX_RTMP_STAT_ALL           0xff
+#define NGX_RTMP_STAT_GLOBAL        0x01
+#define NGX_RTMP_STAT_LIVE          0x02
+#define NGX_RTMP_STAT_CLIENTS       0x04
+#define NGX_RTMP_STAT_PLAY          0x08
+
+/*
+ * global: stat-{bufs-{total,free,used}, total bytes in/out, bw in/out} - cscf
+*/
+
+
+typedef struct {
+    ngx_uint_t                      stat;
+    ngx_str_t                       stylesheet;
+} ngx_rtmp_stat_loc_conf_t;
+
+
+static ngx_conf_bitmask_t           ngx_rtmp_stat_masks[] = {
+    { ngx_string("all"),            NGX_RTMP_STAT_ALL           },
+    { ngx_string("global"),         NGX_RTMP_STAT_GLOBAL        },
+    { ngx_string("live"),           NGX_RTMP_STAT_LIVE          },
+    { ngx_string("clients"),        NGX_RTMP_STAT_CLIENTS       },
+    { ngx_null_string,              0 }
+};
+
+
+static ngx_command_t  ngx_rtmp_stat_commands[] = {
+
+    { ngx_string("rtmp_stat"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+        ngx_rtmp_stat,
+        NGX_HTTP_LOC_CONF_OFFSET,
+        offsetof(ngx_rtmp_stat_loc_conf_t, stat),
+        ngx_rtmp_stat_masks },
+
+    { ngx_string("rtmp_stat_stylesheet"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+        ngx_conf_set_str_slot,
+        NGX_HTTP_LOC_CONF_OFFSET,
+        offsetof(ngx_rtmp_stat_loc_conf_t, stylesheet),
+        NULL },
+
+    ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_rtmp_stat_module_ctx = {
+    NULL,                               /* preconfiguration */
+    ngx_rtmp_stat_postconfiguration,    /* postconfiguration */
+
+    NULL,                               /* create main configuration */
+    NULL,                               /* init main configuration */
+
+    NULL,                               /* create server configuration */
+    NULL,                               /* merge server configuration */
+
+    ngx_rtmp_stat_create_loc_conf,      /* create location configuration */
+    ngx_rtmp_stat_merge_loc_conf,       /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_rtmp_stat_module = {
+    NGX_MODULE_V1,
+    &ngx_rtmp_stat_module_ctx,          /* module context */
+    ngx_rtmp_stat_commands,             /* module directives */
+    NGX_HTTP_MODULE,                    /* module type */
+    NULL,                               /* init master */
+    NULL,                               /* init module */
+    ngx_rtmp_stat_init_process,         /* init process */
+    NULL,                               /* init thread */
+    NULL,                               /* exit thread */
+    NULL,                               /* exit process */
+    NULL,                               /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+#define NGX_RTMP_STAT_BUFSIZE           256
+
+
+static ngx_int_t
+ngx_rtmp_stat_init_process(ngx_cycle_t *cycle)
+{
+    /*
+     * HTTP process initializer is called
+     * after event module initializer
+     * so we can run posted events here
+     */
+
+    ngx_event_process_posted(cycle, &ngx_rtmp_init_queue);
+
+    return NGX_OK;
+}
+
+
+/* ngx_escape_html does not escape characters out of ASCII range
+ * which are bad for xslt */
+
+static void *
+ngx_rtmp_stat_escape(ngx_http_request_t *r, void *data, size_t len)
+{
+    u_char *p, *np;
+    void   *new_data;
+    size_t  n;
+
+    p = data;
+
+    for (n = 0; n < len; ++n, ++p) {
+        if (*p < 0x20 || *p >= 0x7f) {
+            break;
+        }
+    }
+
+    if (n == len) {
+        return data;
+    }
+
+    new_data = ngx_palloc(r->pool, len);
+    if (new_data == NULL) {
+        return NULL;
+    }
+
+    p  = data;
+    np = new_data;
+
+    for (n = 0; n < len; ++n, ++p, ++np) {
+        *np = (*p < 0x20 || *p >= 0x7f) ? (u_char) ' ' : *p;
+    }
+
+    return new_data;
+}
+
+#if (NGX_WIN32)
+/*
+ * Fix broken MSVC memcpy optimization for 4-byte data
+ * when this function is inlined
+ */
+__declspec(noinline)
+#endif
+
+static void
+ngx_rtmp_stat_output(ngx_http_request_t *r, ngx_chain_t ***lll,
+        void *data, size_t len, ngx_uint_t escape)
+{
+    ngx_chain_t        *cl;
+    ngx_buf_t          *b;
+    size_t              real_len;
+
+    if (len == 0) {
+        return;
+    }
+
+    if (escape) {
+        data = ngx_rtmp_stat_escape(r, data, len);
+        if (data == NULL) {
+            return;
+        }
+    }
+
+    real_len = escape
+        ? len + ngx_escape_html(NULL, data, len)
+        : len;
+
+    cl = **lll;
+    if (cl && cl->buf->last + real_len > cl->buf->end) {
+        *lll = &cl->next;
+    }
+
+    if (**lll == NULL) {
+        cl = ngx_alloc_chain_link(r->pool);
+        if (cl == NULL) {
+            return;
+        }
+        b = ngx_create_temp_buf(r->pool,
+                ngx_max(NGX_RTMP_STAT_BUFSIZE, real_len));
+        if (b == NULL || b->pos == NULL) {
+            return;
+        }
+        cl->next = NULL;
+        cl->buf = b;
+        **lll = cl;
+    }
+
+    b = (**lll)->buf;
+
+    if (escape) {
+        b->last = (u_char *)ngx_escape_html(b->last, data, len);
+    } else {
+        b->last = ngx_cpymem(b->last, data, len);
+    }
+}
+
+
+/* These shortcuts assume 2 variables exist in current context:
+ *   ngx_http_request_t    *r
+ *   ngx_chain_t         ***lll */
+
+/* plain data */
+#define NGX_RTMP_STAT(data, len)    ngx_rtmp_stat_output(r, lll, data, len, 0)
+
+/* escaped data */
+#define NGX_RTMP_STAT_E(data, len)  ngx_rtmp_stat_output(r, lll, data, len, 1)
+
+/* literal */
+#define NGX_RTMP_STAT_L(s)          NGX_RTMP_STAT((s), sizeof(s) - 1)
+
+/* ngx_str_t */
+#define NGX_RTMP_STAT_S(s)          NGX_RTMP_STAT((s)->data, (s)->len)
+
+/* escaped ngx_str_t */
+#define NGX_RTMP_STAT_ES(s)         NGX_RTMP_STAT_E((s)->data, (s)->len)
+
+/* C string */
+#define NGX_RTMP_STAT_CS(s)         NGX_RTMP_STAT((s), ngx_strlen(s))
+
+/* escaped C string */
+#define NGX_RTMP_STAT_ECS(s)        NGX_RTMP_STAT_E((s), ngx_strlen(s))
+
+
+#define NGX_RTMP_STAT_BW            0x01
+#define NGX_RTMP_STAT_BYTES         0x02
+#define NGX_RTMP_STAT_BW_BYTES      0x03
+
+
+static void
+ngx_rtmp_stat_bw(ngx_http_request_t *r, ngx_chain_t ***lll,
+                 ngx_rtmp_bandwidth_t *bw, char *name,
+                 ngx_uint_t flags)
+{
+    u_char  buf[NGX_INT64_LEN + 9];
+
+    ngx_rtmp_update_bandwidth(bw, 0);
+
+    if (flags & NGX_RTMP_STAT_BW) {
+        NGX_RTMP_STAT_L("<bw_");
+        NGX_RTMP_STAT_CS(name);
+        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), ">%uL</bw_",
+                                        bw->bandwidth * 8)
+                           - buf);
+        NGX_RTMP_STAT_CS(name);
+        NGX_RTMP_STAT_L(">\r\n");
+    }
+
+    if (flags & NGX_RTMP_STAT_BYTES) {
+        NGX_RTMP_STAT_L("<bytes_");
+        NGX_RTMP_STAT_CS(name);
+        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), ">%uL</bytes_",
+                                        bw->bytes)
+                           - buf);
+        NGX_RTMP_STAT_CS(name);
+        NGX_RTMP_STAT_L(">\r\n");
+    }
+}
+
+
+#ifdef NGX_RTMP_POOL_DEBUG
+static void
+ngx_rtmp_stat_get_pool_size(ngx_pool_t *pool, ngx_uint_t *nlarge,
+        ngx_uint_t *size)
+{
+    ngx_pool_large_t       *l;
+    ngx_pool_t             *p, *n;
+
+    *nlarge = 0;
+    for (l = pool->large; l; l = l->next) {
+        ++*nlarge;
+    }
+
+    *size = 0;
+    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
+        *size += (p->d.last - (u_char *)p);
+        if (n == NULL) {
+            break;
+        }
+    }
+}
+
+
+static void
+ngx_rtmp_stat_dump_pool(ngx_http_request_t *r, ngx_chain_t ***lll,
+        ngx_pool_t *pool)
+{
+    ngx_uint_t  nlarge, size;
+    u_char      buf[NGX_INT_T_LEN];
+
+    size = 0;
+    nlarge = 0;
+    ngx_rtmp_stat_get_pool_size(pool, &nlarge, &size);
+    NGX_RTMP_STAT_L("<pool><nlarge>");
+    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%ui", nlarge) - buf);
+    NGX_RTMP_STAT_L("</nlarge><size>");
+    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%ui", size) - buf);
+    NGX_RTMP_STAT_L("</size></pool>\r\n");
+}
+#endif
+
+
+
+static void
+ngx_rtmp_stat_client(ngx_http_request_t *r, ngx_chain_t ***lll,
+    ngx_rtmp_session_t *s)
+{
+    u_char  buf[NGX_INT_T_LEN];
+
+#ifdef NGX_RTMP_POOL_DEBUG
+    ngx_rtmp_stat_dump_pool(r, lll, s->connection->pool);
+#endif
+    NGX_RTMP_STAT_L("<id>");
+    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%ui",
+                  (ngx_uint_t) s->connection->number) - buf);
+    NGX_RTMP_STAT_L("</id>");
+
+    NGX_RTMP_STAT_L("<address>");
+    NGX_RTMP_STAT_ES(&s->connection->addr_text);
+    NGX_RTMP_STAT_L("</address>");
+
+    NGX_RTMP_STAT_L("<time>");
+    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%i",
+                  (ngx_int_t) (ngx_current_msec - s->epoch)) - buf);
+    NGX_RTMP_STAT_L("</time>");
+
+    if (s->flashver.len) {
+        NGX_RTMP_STAT_L("<flashver>");
+        NGX_RTMP_STAT_ES(&s->flashver);
+        NGX_RTMP_STAT_L("</flashver>");
+    }
+
+    if (s->page_url.len) {
+        NGX_RTMP_STAT_L("<pageurl>");
+        NGX_RTMP_STAT_ES(&s->page_url);
+        NGX_RTMP_STAT_L("</pageurl>");
+    }
+
+    if (s->swf_url.len) {
+        NGX_RTMP_STAT_L("<swfurl>");
+        NGX_RTMP_STAT_ES(&s->swf_url);
+        NGX_RTMP_STAT_L("</swfurl>");
+    }
+}
+
+
+static char *
+ngx_rtmp_stat_get_aac_profile(ngx_uint_t p, ngx_uint_t sbr, ngx_uint_t ps) {
+    switch (p) {
+        case 1:
+            return "Main";
+        case 2:
+            if (ps) {
+                return "HEv2";
+            }
+            if (sbr) {
+                return "HE";
+            }
+            return "LC";
+        case 3:
+            return "SSR";
+        case 4:
+            return "LTP";
+        case 5:
+            return "SBR";
+        default:
+            return "";
+    }
+}
+
+
+static char *
+ngx_rtmp_stat_get_avc_profile(ngx_uint_t p) {
+    switch (p) {
+        case 66:
+            return "Baseline";
+        case 77:
+            return "Main";
+        case 100:
+            return "High";
+        default:
+            return "";
+    }
+}
+
+
+static void
+ngx_rtmp_stat_live(ngx_http_request_t *r, ngx_chain_t ***lll,
+        ngx_rtmp_live_app_conf_t *lacf)
+{
+    ngx_rtmp_live_stream_t         *stream;
+    ngx_rtmp_codec_ctx_t           *codec;
+    ngx_rtmp_live_ctx_t            *ctx;
+    ngx_rtmp_session_t             *s;
+    ngx_int_t                       n;
+    ngx_uint_t                      nclients, total_nclients;
+    u_char                          buf[NGX_INT_T_LEN];
+    u_char                          bbuf[NGX_INT32_LEN];
+    ngx_rtmp_stat_loc_conf_t       *slcf;
+    u_char                         *cname;
+
+    if (!lacf->live) {
+        return;
+    }
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
+
+    NGX_RTMP_STAT_L("<live>\r\n");
+
+    total_nclients = 0;
+    for (n = 0; n < lacf->nbuckets; ++n) {
+        for (stream = lacf->streams[n]; stream; stream = stream->next) {
+            NGX_RTMP_STAT_L("<stream>\r\n");
+
+            NGX_RTMP_STAT_L("<name>");
+            NGX_RTMP_STAT_ECS(stream->name);
+            NGX_RTMP_STAT_L("</name>\r\n");
+
+            NGX_RTMP_STAT_L("<time>");
+            NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%i",
+                          (ngx_int_t) (ngx_current_msec - stream->epoch))
+                          - buf);
+            NGX_RTMP_STAT_L("</time>");
+
+            ngx_rtmp_stat_bw(r, lll, &stream->bw_in, "in",
+                             NGX_RTMP_STAT_BW_BYTES);
+            ngx_rtmp_stat_bw(r, lll, &stream->bw_out, "out",
+                             NGX_RTMP_STAT_BW_BYTES);
+            ngx_rtmp_stat_bw(r, lll, &stream->bw_in_audio, "audio",
+                             NGX_RTMP_STAT_BW);
+            ngx_rtmp_stat_bw(r, lll, &stream->bw_in_video, "video",
+                             NGX_RTMP_STAT_BW);
+
+            nclients = 0;
+            codec = NULL;
+            for (ctx = stream->ctx; ctx; ctx = ctx->next, ++nclients) {
+                s = ctx->session;
+                if (slcf->stat & NGX_RTMP_STAT_CLIENTS) {
+                    NGX_RTMP_STAT_L("<client>");
+
+                    ngx_rtmp_stat_client(r, lll, s);
+
+                    NGX_RTMP_STAT_L("<dropped>");
+                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                                  "%ui", ctx->ndropped) - buf);
+                    NGX_RTMP_STAT_L("</dropped>");
+
+                    NGX_RTMP_STAT_L("<avsync>");
+                    if (!lacf->interleave) {
+                        NGX_RTMP_STAT(bbuf, ngx_snprintf(bbuf, sizeof(bbuf),
+                                      "%D", ctx->cs[1].timestamp -
+                                      ctx->cs[0].timestamp) - bbuf);
+                    }
+                    NGX_RTMP_STAT_L("</avsync>");
+
+                    NGX_RTMP_STAT_L("<timestamp>");
+                    NGX_RTMP_STAT(bbuf, ngx_snprintf(bbuf, sizeof(bbuf),
+                                  "%D", s->current_time) - bbuf);
+                    NGX_RTMP_STAT_L("</timestamp>");
+
+                    if (ctx->publishing) {
+                        NGX_RTMP_STAT_L("<publishing/>");
+                    }
+
+                    if (ctx->active) {
+                        NGX_RTMP_STAT_L("<active/>");
+                    }
+
+                    NGX_RTMP_STAT_L("</client>\r\n");
+                }
+                if (ctx->publishing) {
+                    codec = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
+                }
+            }
+            total_nclients += nclients;
+
+            if (codec) {
+                NGX_RTMP_STAT_L("<meta>");
+
+                NGX_RTMP_STAT_L("<video>");
+                NGX_RTMP_STAT_L("<width>");
+                NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                              "%ui", codec->width) - buf);
+                NGX_RTMP_STAT_L("</width><height>");
+                NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                              "%ui", codec->height) - buf);
+                NGX_RTMP_STAT_L("</height><frame_rate>");
+                NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                              "%ui", codec->frame_rate) - buf);
+                NGX_RTMP_STAT_L("</frame_rate>");
+
+                cname = ngx_rtmp_get_video_codec_name(codec->video_codec_id);
+                if (*cname) {
+                    NGX_RTMP_STAT_L("<codec>");
+                    NGX_RTMP_STAT_ECS(cname);
+                    NGX_RTMP_STAT_L("</codec>");
+                }
+                if (codec->avc_profile) {
+                    NGX_RTMP_STAT_L("<profile>");
+                    NGX_RTMP_STAT_CS(
+                            ngx_rtmp_stat_get_avc_profile(codec->avc_profile));
+                    NGX_RTMP_STAT_L("</profile>");
+                }
+                if (codec->avc_level) {
+                    NGX_RTMP_STAT_L("<compat>");
+                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                                  "%ui", codec->avc_compat) - buf);
+                    NGX_RTMP_STAT_L("</compat>");
+                }
+                if (codec->avc_level) {
+                    NGX_RTMP_STAT_L("<level>");
+                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                                  "%.1f", codec->avc_level / 10.) - buf);
+                    NGX_RTMP_STAT_L("</level>");
+                }
+                NGX_RTMP_STAT_L("</video>");
+
+                NGX_RTMP_STAT_L("<audio>");
+                cname = ngx_rtmp_get_audio_codec_name(codec->audio_codec_id);
+                if (*cname) {
+                    NGX_RTMP_STAT_L("<codec>");
+                    NGX_RTMP_STAT_ECS(cname);
+                    NGX_RTMP_STAT_L("</codec>");
+                }
+                if (codec->aac_profile) {
+                    NGX_RTMP_STAT_L("<profile>");
+                    NGX_RTMP_STAT_CS(
+                            ngx_rtmp_stat_get_aac_profile(codec->aac_profile,
+                                                          codec->aac_sbr,
+                                                          codec->aac_ps));
+                    NGX_RTMP_STAT_L("</profile>");
+                }
+                if (codec->aac_chan_conf) {
+                    NGX_RTMP_STAT_L("<channels>");
+                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                                  "%ui", codec->aac_chan_conf) - buf);
+                    NGX_RTMP_STAT_L("</channels>");
+                } else if (codec->audio_channels) {
+                    NGX_RTMP_STAT_L("<channels>");
+                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                                  "%ui", codec->audio_channels) - buf);
+                    NGX_RTMP_STAT_L("</channels>");
+                }
+                if (codec->sample_rate) {
+                    NGX_RTMP_STAT_L("<sample_rate>");
+                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                                  "%ui", codec->sample_rate) - buf);
+                    NGX_RTMP_STAT_L("</sample_rate>");
+                }
+                NGX_RTMP_STAT_L("</audio>");
+
+                NGX_RTMP_STAT_L("</meta>\r\n");
+            }
+
+            NGX_RTMP_STAT_L("<nclients>");
+            NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                          "%ui", nclients) - buf);
+            NGX_RTMP_STAT_L("</nclients>\r\n");
+
+            if (stream->publishing) {
+                NGX_RTMP_STAT_L("<publishing/>\r\n");
+            }
+
+            if (stream->active) {
+                NGX_RTMP_STAT_L("<active/>\r\n");
+            }
+
+            NGX_RTMP_STAT_L("</stream>\r\n");
+        }
+    }
+
+    NGX_RTMP_STAT_L("<nclients>");
+    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                  "%ui", total_nclients) - buf);
+    NGX_RTMP_STAT_L("</nclients>\r\n");
+
+    NGX_RTMP_STAT_L("</live>\r\n");
+}
+
+
+static void
+ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
+        ngx_rtmp_play_app_conf_t *pacf)
+{
+    ngx_rtmp_play_ctx_t            *ctx, *sctx;
+    ngx_rtmp_session_t             *s;
+    ngx_uint_t                      n, nclients, total_nclients;
+    u_char                          buf[NGX_INT_T_LEN];
+    u_char                          bbuf[NGX_INT32_LEN];
+    ngx_rtmp_stat_loc_conf_t       *slcf;
+
+    if (pacf->entries.nelts == 0) {
+        return;
+    }
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
+
+    NGX_RTMP_STAT_L("<play>\r\n");
+
+    total_nclients = 0;
+    for (n = 0; n < pacf->nbuckets; ++n) {
+        for (ctx = pacf->ctx[n]; ctx; ) {
+            NGX_RTMP_STAT_L("<stream>\r\n");
+
+            NGX_RTMP_STAT_L("<name>");
+            NGX_RTMP_STAT_ECS(ctx->name);
+            NGX_RTMP_STAT_L("</name>\r\n");
+
+            nclients = 0;
+            sctx = ctx;
+            for (; ctx; ctx = ctx->next) {
+                if (ngx_strcmp(ctx->name, sctx->name)) {
+                    break;
+                }
+
+                nclients++;
+
+                s = ctx->session;
+                if (slcf->stat & NGX_RTMP_STAT_CLIENTS) {
+                    NGX_RTMP_STAT_L("<client>");
+
+                    ngx_rtmp_stat_client(r, lll, s);
+
+                    NGX_RTMP_STAT_L("<timestamp>");
+                    NGX_RTMP_STAT(bbuf, ngx_snprintf(bbuf, sizeof(bbuf),
+                                  "%D", s->current_time) - bbuf);
+                    NGX_RTMP_STAT_L("</timestamp>");
+
+                    NGX_RTMP_STAT_L("</client>\r\n");
+                }
+            }
+            total_nclients += nclients;
+
+            NGX_RTMP_STAT_L("<active/>");
+            NGX_RTMP_STAT_L("<nclients>");
+            NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                          "%ui", nclients) - buf);
+            NGX_RTMP_STAT_L("</nclients>\r\n");
+
+            NGX_RTMP_STAT_L("</stream>\r\n");
+        }
+    }
+
+    NGX_RTMP_STAT_L("<nclients>");
+    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                  "%ui", total_nclients) - buf);
+    NGX_RTMP_STAT_L("</nclients>\r\n");
+
+    NGX_RTMP_STAT_L("</play>\r\n");
+}
+
+
+static void
+ngx_rtmp_stat_application(ngx_http_request_t *r, ngx_chain_t ***lll,
+        ngx_rtmp_core_app_conf_t *cacf)
+{
+    ngx_rtmp_stat_loc_conf_t       *slcf;
+
+    NGX_RTMP_STAT_L("<application>\r\n");
+    NGX_RTMP_STAT_L("<name>");
+    NGX_RTMP_STAT_ES(&cacf->name);
+    NGX_RTMP_STAT_L("</name>\r\n");
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
+
+    if (slcf->stat & NGX_RTMP_STAT_LIVE) {
+        ngx_rtmp_stat_live(r, lll,
+                cacf->app_conf[ngx_rtmp_live_module.ctx_index]);
+    }
+
+    if (slcf->stat & NGX_RTMP_STAT_PLAY) {
+        ngx_rtmp_stat_play(r, lll,
+                cacf->app_conf[ngx_rtmp_play_module.ctx_index]);
+    }
+
+    NGX_RTMP_STAT_L("</application>\r\n");
+}
+
+
+static void
+ngx_rtmp_stat_server(ngx_http_request_t *r, ngx_chain_t ***lll,
+        ngx_rtmp_core_srv_conf_t *cscf)
+{
+    ngx_rtmp_core_app_conf_t      **cacf;
+    size_t                          n;
+
+    NGX_RTMP_STAT_L("<server>\r\n");
+
+#ifdef NGX_RTMP_POOL_DEBUG
+    ngx_rtmp_stat_dump_pool(r, lll, cscf->pool);
+#endif
+
+    cacf = cscf->applications.elts;
+    for (n = 0; n < cscf->applications.nelts; ++n, ++cacf) {
+        ngx_rtmp_stat_application(r, lll, *cacf);
+    }
+
+    NGX_RTMP_STAT_L("</server>\r\n");
+}
+
+
+static ngx_int_t
+ngx_rtmp_stat_handler(ngx_http_request_t *r)
+{
+    ngx_rtmp_stat_loc_conf_t       *slcf;
+    ngx_rtmp_core_main_conf_t      *cmcf;
+    ngx_rtmp_core_srv_conf_t      **cscf;
+    ngx_chain_t                    *cl, *l, **ll, ***lll;
+    size_t                          n;
+    off_t                           len;
+    static u_char                   tbuf[NGX_TIME_T_LEN];
+    static u_char                   nbuf[NGX_INT_T_LEN];
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
+    if (slcf->stat == 0) {
+        return NGX_DECLINED;
+    }
+
+    cmcf = ngx_rtmp_core_main_conf;
+    if (cmcf == NULL) {
+        goto error;
+    }
+
+    cl = NULL;
+    ll = &cl;
+    lll = &ll;
+
+    NGX_RTMP_STAT_L("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n");
+    if (slcf->stylesheet.len) {
+        NGX_RTMP_STAT_L("<?xml-stylesheet type=\"text/xsl\" href=\"");
+        NGX_RTMP_STAT_ES(&slcf->stylesheet);
+        NGX_RTMP_STAT_L("\" ?>\r\n");
+    }
+
+    NGX_RTMP_STAT_L("<rtmp>\r\n");
+
+#ifdef NGINX_VERSION
+    NGX_RTMP_STAT_L("<nginx_version>" NGINX_VERSION "</nginx_version>\r\n");
+#endif
+
+#ifdef NGINX_RTMP_VERSION
+    NGX_RTMP_STAT_L("<nginx_rtmp_version>" NGINX_RTMP_VERSION "</nginx_rtmp_version>\r\n");
+#endif
+
+#ifdef NGX_COMPILER
+    NGX_RTMP_STAT_L("<compiler>" NGX_COMPILER "</compiler>\r\n");
+#endif
+    NGX_RTMP_STAT_L("<built>" __DATE__ " " __TIME__ "</built>\r\n");
+
+    NGX_RTMP_STAT_L("<pid>");
+    NGX_RTMP_STAT(nbuf, ngx_snprintf(nbuf, sizeof(nbuf),
+                  "%ui", (ngx_uint_t) ngx_getpid()) - nbuf);
+    NGX_RTMP_STAT_L("</pid>\r\n");
+
+    NGX_RTMP_STAT_L("<uptime>");
+    NGX_RTMP_STAT(tbuf, ngx_snprintf(tbuf, sizeof(tbuf),
+                  "%T", ngx_cached_time->sec - start_time) - tbuf);
+    NGX_RTMP_STAT_L("</uptime>\r\n");
+
+    NGX_RTMP_STAT_L("<naccepted>");
+    NGX_RTMP_STAT(nbuf, ngx_snprintf(nbuf, sizeof(nbuf),
+                  "%ui", ngx_rtmp_naccepted) - nbuf);
+    NGX_RTMP_STAT_L("</naccepted>\r\n");
+
+    ngx_rtmp_stat_bw(r, lll, &ngx_rtmp_bw_in, "in", NGX_RTMP_STAT_BW_BYTES);
+    ngx_rtmp_stat_bw(r, lll, &ngx_rtmp_bw_out, "out", NGX_RTMP_STAT_BW_BYTES);
+
+    cscf = cmcf->servers.elts;
+    for (n = 0; n < cmcf->servers.nelts; ++n, ++cscf) {
+        ngx_rtmp_stat_server(r, lll, *cscf);
+    }
+
+    NGX_RTMP_STAT_L("</rtmp>\r\n");
+
+    len = 0;
+    for (l = cl; l; l = l->next) {
+        len += (l->buf->last - l->buf->pos);
+    }
+    ngx_str_set(&r->headers_out.content_type, "text/xml");
+    r->headers_out.content_length_n = len;
+    r->headers_out.status = NGX_HTTP_OK;
+    ngx_http_send_header(r);
+    (*ll)->buf->last_buf = 1;
+    return ngx_http_output_filter(r, cl);
+
+error:
+    r->headers_out.status = NGX_HTTP_INTERNAL_SERVER_ERROR;
+    r->headers_out.content_length_n = 0;
+    return ngx_http_send_header(r);
+}
+
+
+static void *
+ngx_rtmp_stat_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_rtmp_stat_loc_conf_t       *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_stat_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->stat = 0;
+
+    return conf;
+}
+
+
+static char *
+ngx_rtmp_stat_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_rtmp_stat_loc_conf_t       *prev = parent;
+    ngx_rtmp_stat_loc_conf_t       *conf = child;
+
+    ngx_conf_merge_bitmask_value(conf->stat, prev->stat, 0);
+    ngx_conf_merge_str_value(conf->stylesheet, prev->stylesheet, "");
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_rtmp_stat(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_core_loc_conf_t  *clcf;
+
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+    clcf->handler = ngx_rtmp_stat_handler;
+
+    return ngx_conf_set_bitmask_slot(cf, cmd, conf);
+}
+
+
+static ngx_int_t
+ngx_rtmp_stat_postconfiguration(ngx_conf_t *cf)
+{
+    start_time = ngx_cached_time->sec;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_streams.h b/debian/modules/nginx-rtmp/ngx_rtmp_streams.h
new file mode 100644
index 0000000..d957b8e
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_streams.h
@@ -0,0 +1,19 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_STREAMS_H_INCLUDED_
+#define _NGX_RTMP_STREAMS_H_INCLUDED_
+
+
+#define NGX_RTMP_MSID                   1
+
+#define NGX_RTMP_CSID_AMF_INI           3
+#define NGX_RTMP_CSID_AMF               5
+#define NGX_RTMP_CSID_AUDIO             6
+#define NGX_RTMP_CSID_VIDEO             7
+
+
+#endif /* _NGX_RTMP_STREAMS_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_version.h b/debian/modules/nginx-rtmp/ngx_rtmp_version.h
new file mode 100644
index 0000000..1bdce49
--- /dev/null
+++ b/debian/modules/nginx-rtmp/ngx_rtmp_version.h
@@ -0,0 +1,15 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#ifndef _NGX_RTMP_VERSION_H_INCLUDED_
+#define _NGX_RTMP_VERSION_H_INCLUDED_
+
+
+#define nginx_rtmp_version  1001004
+#define NGINX_RTMP_VERSION  "1.1.4"
+
+
+#endif /* _NGX_RTMP_VERSION_H_INCLUDED_ */
diff --git a/debian/modules/nginx-rtmp/stat.xsl b/debian/modules/nginx-rtmp/stat.xsl
new file mode 100644
index 0000000..355453b
--- /dev/null
+++ b/debian/modules/nginx-rtmp/stat.xsl
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+
+<!--
+   Copyright (C) Roman Arutyunyan
+-->
+
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+
+<xsl:template match="/">
+    <html>
+        <head>
+            <title>RTMP statistics</title>
+        </head>
+        <body>
+            <xsl:apply-templates select="rtmp"/>
+            <hr/>
+            Generated by <a href='https://github.com/arut/nginx-rtmp-module'>
+            nginx-rtmp-module</a>&#160;<xsl:value-of select="/rtmp/nginx_rtmp_version"/>,
+            <a href="http://nginx.org">nginx</a>&#160;<xsl:value-of select="/rtmp/nginx_version"/>,
+            pid <xsl:value-of select="/rtmp/pid"/>,
+            built <xsl:value-of select="/rtmp/built"/>&#160;<xsl:value-of select="/rtmp/compiler"/>
+        </body>
+    </html>
+</xsl:template>
+
+<xsl:template match="rtmp">
+    <table cellspacing="1" cellpadding="5">
+        <tr bgcolor="#999999">
+            <th>RTMP</th>
+            <th>#clients</th>
+            <th colspan="4">Video</th>
+            <th colspan="4">Audio</th>
+            <th>In bytes</th>
+            <th>Out bytes</th>
+            <th>In bits/s</th>
+            <th>Out bits/s</th>
+            <th>State</th>
+            <th>Time</th>
+        </tr>
+        <tr>
+            <td colspan="2">Accepted: <xsl:value-of select="naccepted"/></td>
+            <th bgcolor="#999999">codec</th>
+            <th bgcolor="#999999">bits/s</th>
+            <th bgcolor="#999999">size</th>
+            <th bgcolor="#999999">fps</th>
+            <th bgcolor="#999999">codec</th>
+            <th bgcolor="#999999">bits/s</th>
+            <th bgcolor="#999999">freq</th>
+            <th bgcolor="#999999">chan</th>
+            <td>
+                <xsl:call-template name="showsize">
+                    <xsl:with-param name="size" select="bytes_in"/>
+                </xsl:call-template>
+            </td>
+            <td>
+                <xsl:call-template name="showsize">
+                    <xsl:with-param name="size" select="bytes_out"/>
+                </xsl:call-template>
+            </td>
+            <td>
+                <xsl:call-template name="showsize">
+                    <xsl:with-param name="size" select="bw_in"/>
+                    <xsl:with-param name="bits" select="1"/>
+                    <xsl:with-param name="persec" select="1"/>
+                </xsl:call-template>
+            </td>
+            <td>
+                <xsl:call-template name="showsize">
+                    <xsl:with-param name="size" select="bw_out"/>
+                    <xsl:with-param name="bits" select="1"/>
+                    <xsl:with-param name="persec" select="1"/>
+                </xsl:call-template>
+            </td>
+            <td/>
+            <td>
+                <xsl:call-template name="showtime">
+                    <xsl:with-param name="time" select="/rtmp/uptime * 1000"/>
+                </xsl:call-template>
+            </td>
+        </tr>
+        <xsl:apply-templates select="server"/>
+    </table>
+</xsl:template>
+
+<xsl:template match="server">
+    <xsl:apply-templates select="application"/>
+</xsl:template>
+
+<xsl:template match="application">
+    <tr bgcolor="#999999">
+        <td>
+            <b><xsl:value-of select="name"/></b>
+        </td>
+    </tr>
+    <xsl:apply-templates select="live"/>
+    <xsl:apply-templates select="play"/>
+</xsl:template>
+
+<xsl:template match="live">
+    <tr bgcolor="#aaaaaa">
+        <td>
+            <i>live streams</i>
+        </td>
+        <td align="middle">
+            <xsl:value-of select="nclients"/>
+        </td>
+    </tr>
+    <xsl:apply-templates select="stream"/>
+</xsl:template>
+
+<xsl:template match="play">
+    <tr bgcolor="#aaaaaa">
+        <td>
+            <i>vod streams</i>
+        </td>
+        <td align="middle">
+            <xsl:value-of select="nclients"/>
+        </td>
+    </tr>
+    <xsl:apply-templates select="stream"/>
+</xsl:template>
+
+<xsl:template match="stream">
+    <tr valign="top">
+        <xsl:attribute name="bgcolor">
+            <xsl:choose>
+                <xsl:when test="active">#cccccc</xsl:when>
+                <xsl:otherwise>#dddddd</xsl:otherwise>
+            </xsl:choose>
+        </xsl:attribute>
+        <td>
+            <a href="">
+                <xsl:attribute name="onclick">
+                    var d=document.getElementById('<xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>');
+                    d.style.display=d.style.display=='none'?'':'none';
+                    return false
+                </xsl:attribute>
+                <xsl:value-of select="name"/>
+                <xsl:if test="string-length(name) = 0">
+                    [EMPTY]
+                </xsl:if>
+            </a>
+        </td>
+        <td align="middle"> <xsl:value-of select="nclients"/> </td>
+        <td>
+            <xsl:value-of select="meta/video/codec"/>&#160;<xsl:value-of select="meta/video/profile"/>&#160;<xsl:value-of select="meta/video/level"/>
+        </td>
+        <td>
+            <xsl:call-template name="showsize">
+                <xsl:with-param name="size" select="bw_video"/>
+                <xsl:with-param name="bits" select="1"/>
+                <xsl:with-param name="persec" select="1"/>
+            </xsl:call-template>
+        </td>
+        <td>
+            <xsl:apply-templates select="meta/video/width"/>
+        </td>
+        <td>
+            <xsl:value-of select="meta/video/frame_rate"/>
+        </td>
+        <td>
+            <xsl:value-of select="meta/audio/codec"/>&#160;<xsl:value-of select="meta/audio/profile"/>
+        </td>
+        <td>
+            <xsl:call-template name="showsize">
+                <xsl:with-param name="size" select="bw_audio"/>
+                <xsl:with-param name="bits" select="1"/>
+                <xsl:with-param name="persec" select="1"/>
+            </xsl:call-template>
+        </td>
+        <td>
+            <xsl:apply-templates select="meta/audio/sample_rate"/>
+        </td>
+        <td>
+            <xsl:value-of select="meta/audio/channels"/>
+        </td>
+        <td>
+            <xsl:call-template name="showsize">
+               <xsl:with-param name="size" select="bytes_in"/>
+           </xsl:call-template>
+        </td>
+        <td>
+            <xsl:call-template name="showsize">
+                <xsl:with-param name="size" select="bytes_out"/>
+            </xsl:call-template>
+        </td>
+        <td>
+            <xsl:call-template name="showsize">
+                <xsl:with-param name="size" select="bw_in"/>
+                <xsl:with-param name="bits" select="1"/>
+                <xsl:with-param name="persec" select="1"/>
+            </xsl:call-template>
+        </td>
+        <td>
+            <xsl:call-template name="showsize">
+                <xsl:with-param name="size" select="bw_out"/>
+                <xsl:with-param name="bits" select="1"/>
+                <xsl:with-param name="persec" select="1"/>
+            </xsl:call-template>
+        </td>
+        <td><xsl:call-template name="streamstate"/></td>
+        <td>
+            <xsl:call-template name="showtime">
+               <xsl:with-param name="time" select="time"/>
+            </xsl:call-template>
+        </td>
+    </tr>
+    <tr style="display:none">
+        <xsl:attribute name="id">
+            <xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>
+        </xsl:attribute>
+        <td colspan="16" ngcolor="#eeeeee">
+            <table cellspacing="1" cellpadding="5">
+                <tr>
+                    <th>Id</th>
+                    <th>State</th>
+                    <th>Address</th>
+                    <th>Flash version</th>
+                    <th>Page URL</th>
+                    <th>SWF URL</th>
+                    <th>Dropped</th>
+                    <th>Timestamp</th>
+                    <th>A-V</th>
+                    <th>Time</th>
+                </tr>
+                <xsl:apply-templates select="client"/>
+            </table>
+        </td>
+    </tr>
+</xsl:template>
+
+<xsl:template name="showtime">
+    <xsl:param name="time"/>
+
+    <xsl:if test="$time &gt; 0">
+        <xsl:variable name="sec">
+            <xsl:value-of select="floor($time div 1000)"/>
+        </xsl:variable>
+
+        <xsl:if test="$sec &gt;= 86400">
+            <xsl:value-of select="floor($sec div 86400)"/>d
+        </xsl:if>
+
+        <xsl:if test="$sec &gt;= 3600">
+            <xsl:value-of select="(floor($sec div 3600)) mod 24"/>h
+        </xsl:if>
+
+        <xsl:if test="$sec &gt;= 60">
+            <xsl:value-of select="(floor($sec div 60)) mod 60"/>m
+        </xsl:if>
+
+        <xsl:value-of select="$sec mod 60"/>s
+    </xsl:if>
+</xsl:template>
+
+<xsl:template name="showsize">
+    <xsl:param name="size"/>
+    <xsl:param name="bits" select="0" />
+    <xsl:param name="persec" select="0" />
+    <xsl:variable name="sizen">
+        <xsl:value-of select="floor($size div 1024)"/>
+    </xsl:variable>
+    <xsl:choose>
+        <xsl:when test="$sizen &gt;= 1073741824">
+            <xsl:value-of select="format-number($sizen div 1073741824,'#.###')"/> T</xsl:when>
+
+        <xsl:when test="$sizen &gt;= 1048576">
+            <xsl:value-of select="format-number($sizen div 1048576,'#.###')"/> G</xsl:when>
+
+        <xsl:when test="$sizen &gt;= 1024">
+            <xsl:value-of select="format-number($sizen div 1024,'#.##')"/> M</xsl:when>
+        <xsl:when test="$sizen &gt;= 0">
+            <xsl:value-of select="$sizen"/> K</xsl:when>
+    </xsl:choose>
+    <xsl:if test="string-length($size) &gt; 0">
+        <xsl:choose>
+            <xsl:when test="$bits = 1">b</xsl:when>
+            <xsl:otherwise>B</xsl:otherwise>
+        </xsl:choose>
+        <xsl:if test="$persec = 1">/s</xsl:if>
+    </xsl:if>
+</xsl:template>
+
+<xsl:template name="streamstate">
+    <xsl:choose>
+        <xsl:when test="active">active</xsl:when>
+        <xsl:otherwise>idle</xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+
+<xsl:template name="clientstate">
+    <xsl:choose>
+        <xsl:when test="publishing">publishing</xsl:when>
+        <xsl:otherwise>playing</xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+
+<xsl:template match="client">
+    <tr>
+        <xsl:attribute name="bgcolor">
+            <xsl:choose>
+                <xsl:when test="publishing">#cccccc</xsl:when>
+                <xsl:otherwise>#eeeeee</xsl:otherwise>
+            </xsl:choose>
+        </xsl:attribute>
+        <td><xsl:value-of select="id"/></td>
+        <td><xsl:call-template name="clientstate"/></td>
+        <td>
+            <a target="_blank">
+                <xsl:attribute name="href">
+                    http://apps.db.ripe.net/search/query.html&#63;searchtext=<xsl:value-of select="address"/>
+                </xsl:attribute>
+                <xsl:attribute name="title">whois</xsl:attribute>
+                <xsl:value-of select="address"/>
+            </a>
+        </td>
+        <td><xsl:value-of select="flashver"/></td>
+        <td>
+            <a target="_blank">
+                <xsl:attribute name="href">
+                    <xsl:value-of select="pageurl"/>
+                </xsl:attribute>
+                <xsl:value-of select="pageurl"/>
+            </a>
+        </td>
+        <td><xsl:value-of select="swfurl"/></td>
+        <td><xsl:value-of select="dropped"/></td>
+        <td><xsl:value-of select="timestamp"/></td>
+        <td><xsl:value-of select="avsync"/></td>
+        <td>
+            <xsl:call-template name="showtime">
+               <xsl:with-param name="time" select="time"/>
+            </xsl:call-template>
+        </td>
+    </tr>
+</xsl:template>
+
+<xsl:template match="publishing">
+    publishing
+</xsl:template>
+
+<xsl:template match="active">
+    active
+</xsl:template>
+
+<xsl:template match="width">
+    <xsl:value-of select="."/>x<xsl:value-of select="../height"/>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/debian/rules b/debian/rules
index 9ca4443..3951529 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ DYN_MODS := \
 	http-xslt-filter \
 	mail \
 	nchan \
+	rtmp \
 	stream
 
 MODULESDIR = $(CURDIR)/debian/modules
@@ -131,6 +132,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/ngx-fancyindex \
 			--add-dynamic-module=$(MODULESDIR)/nchan \
 			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
+			--add-dynamic-module=$(MODULESDIR)/nginx-rtmp \
 			--add-dynamic-module=$(MODULESDIR)/nginx-upload-progress \
 			--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
 			--add-dynamic-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
diff --git a/debian/tests/control b/debian/tests/control
index 03cd901..d276e4f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -34,6 +34,7 @@ Depends: nginx-full,
          libnginx-mod-http-xslt-filter,
          libnginx-mod-mail,
          libnginx-mod-nchan,
+         libnginx-mod-rtmp,
          libnginx-mod-stream
 
 Tests: light-module-deps
@@ -56,6 +57,7 @@ Depends: nginx-light,
          libnginx-mod-http-xslt-filter,
          libnginx-mod-mail,
          libnginx-mod-nchan,
+         libnginx-mod-rtmp,
          libnginx-mod-stream
 
 Tests: extras-module-deps
@@ -78,4 +80,5 @@ Depends: nginx-extras,
          libnginx-mod-http-xslt-filter,
          libnginx-mod-mail,
          libnginx-mod-nchan,
+         libnginx-mod-rtmp,
          libnginx-mod-stream

From d546f527ee6fb613a571829ee50816462ceefaa6 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 30 Jun 2017 22:02:19 +0300
Subject: [PATCH 197/600] Fix nginx-cache-purge segfaults

The module copies verbatim the ngx_http_proxy_loc_conf_t struct, but the
`method` member has changed since Nginx 1.11.6.

Closes: #866750
---
 debian/modules/README.Modules-versions        |  1 +
 .../nginx-cache-purge/segfault-1.11.6.patch   | 25 +++++++++++++++++++
 .../modules/patches/nginx-cache-purge/series  |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 debian/modules/patches/nginx-cache-purge/segfault-1.11.6.patch

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 8ed4610..c336064 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -47,6 +47,7 @@ README for Modules versions
   Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
   Version: 2.3
   Patch: dynamic-module.patch
+  Patch: segfault-1.11.6.patch
 
  nginx-dav-ext-module
   Homepage: https://github.com/arut/nginx-dav-ext-module
diff --git a/debian/modules/patches/nginx-cache-purge/segfault-1.11.6.patch b/debian/modules/patches/nginx-cache-purge/segfault-1.11.6.patch
new file mode 100644
index 0000000..11972c8
--- /dev/null
+++ b/debian/modules/patches/nginx-cache-purge/segfault-1.11.6.patch
@@ -0,0 +1,25 @@
+From: Pawel Sulowicz <Pawel.Sulowicz@grupaonet.pl>
+Date: Thu, 2 Feb 2017 09:39:37 +0100
+Subject: [PATCH] Fix compatibility with nginx-1.11.6+
+Origin: other, https://github.com/FRiCKLE/ngx_cache_purge/pull/51
+
+---
+ ngx_cache_purge_module.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ngx_cache_purge_module.c b/ngx_cache_purge_module.c
+index 62d3818..fd1ebde 100644
+--- a/ngx_cache_purge_module.c
++++ b/ngx_cache_purge_module.c
+@@ -492,7 +492,11 @@ typedef struct {
+     ngx_str_t                      body_source;
+ #  endif /* nginx_version < 1007008 */
+ 
++#  if (nginx_version >= 1011006)
++    ngx_http_complex_value_t      *method;
++#  else
+     ngx_str_t                      method;
++#  endif /* nginx_version >= 1011006 */
+     ngx_str_t                      location;
+     ngx_str_t                      url;
+ 
diff --git a/debian/modules/patches/nginx-cache-purge/series b/debian/modules/patches/nginx-cache-purge/series
index f9b9360..2876b35 100644
--- a/debian/modules/patches/nginx-cache-purge/series
+++ b/debian/modules/patches/nginx-cache-purge/series
@@ -1 +1,2 @@
 dynamic-module.patch
+segfault-1.11.6.patch

From f4979c7c960b73049282ed87a07a7b7d7f72f91a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 3 Jul 2017 14:15:40 +0300
Subject: [PATCH 198/600] Switch the copyright-format URL to https

Complements the debian-policy bump to 4.0.0 (22fe275)

Gbp-Dch: Ignore
---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 78ea210..3d1b4c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: nginx
 Source: http://nginx.org/en/download.html
 

From 5ccd94c7e9f19d6815e2b27e1325b8c3a8e626fc Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 3 Jul 2017 13:45:10 +0300
Subject: [PATCH 199/600] Release 1.13.2-1

---
 debian/changelog | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fac5d1c..0b7711b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+nginx (1.13.2-1) unstable; urgency=medium
+
+  [ Christos Trochalakis ]
+  * New upstream version 1.13.2.
+  * Fix nginx-cache-purge segfaults (Closes: #866750)
+  * Merge ca translations.
+    Thanks to Alytidae (Closes: #865996)
+  * Merge es translations.
+    Thanks to Jonathan Bustillos (Closes: #855610)
+  * Merge pt translations.
+    Thanks to Rui Branco (Closes: #858741)
+  * Bump Standards to 4.0.0.
+    - Switch the copyright-format URL to https.
+
+  [ Nicolas Dandrimont ]
+  * Introduce libnginx-mod-rtmp (Closes: #843777)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Mon, 03 Jul 2017 13:44:59 +0300
+
 nginx (1.13.1-2) unstable; urgency=medium
 
   * Upload to unstable.

From ab3dccab6aae29fd6a91d77aa8fc554c34e07a8c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Fri, 7 Jul 2017 13:01:25 +0300
Subject: [PATCH 200/600] Drop gzip_disable "msie6" directive.

IE6 is really deprecated nowdays. Also, this only affected earlier IE6
versions that was later patched to fix this issue.

Closes: #867024
---
 debian/conf/nginx.conf    | 1 -
 debian/help/examples/http | 1 -
 2 files changed, 2 deletions(-)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index 6e57ea9..132f680 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -46,7 +46,6 @@ http {
 	##
 
 	gzip on;
-	gzip_disable "msie6";
 
 	# gzip_vary on;
 	# gzip_proxied any;
diff --git a/debian/help/examples/http b/debian/help/examples/http
index 89b2dde..bac9f90 100644
--- a/debian/help/examples/http
+++ b/debian/help/examples/http
@@ -38,7 +38,6 @@ http {
 	##
 
 	gzip on;
-	gzip_disable "msie6";
 
 	# gzip_vary on;
 	# gzip_proxied any;

From 3d12f812d7285ac862794e62e92098c166b741e2 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 12 Jul 2017 08:12:27 +0300
Subject: [PATCH 201/600] New upstream version 1.13.3

---
 CHANGES                                       |   7 +
 CHANGES.ru                                    |   8 +
 src/core/nginx.h                              |   4 +-
 src/core/ngx_resolver.c                       | 123 ++++++-------
 src/core/ngx_resolver.h                       |   1 +
 src/core/ngx_slab.c                           |  37 ++--
 src/http/modules/ngx_http_proxy_module.c      | 165 +++++++-----------
 .../modules/ngx_http_range_filter_module.c    |   6 +-
 src/http/ngx_http_variables.c                 |  16 +-
 9 files changed, 164 insertions(+), 203 deletions(-)

diff --git a/CHANGES b/CHANGES
index e7126ff..30b01ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,11 @@
 
+Changes with nginx 1.13.3                                        11 Jul 2017
+
+    *) Security: a specially crafted request might result in an integer
+       overflow and incorrect processing of ranges in the range filter,
+       potentially resulting in sensitive information leak (CVE-2017-7529).
+
+
 Changes with nginx 1.13.2                                        27 Jun 2017
 
     *) Change: nginx now returns 200 instead of 416 when a range starting
diff --git a/CHANGES.ru b/CHANGES.ru
index 69e2be1..dab50c9 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,12 @@
 
+Изменения в nginx 1.13.3                                          11.07.2017
+
+    *) Безопасность: специально созданный запрос мог вызвать целочисленное
+       переполнение в range-фильтре и последующую некорректную обработку
+       запрошенных диапазонов, что потенциально могло привести к утечке
+       конфиденциальной информации (CVE-2017-7529).
+
+
 Изменения в nginx 1.13.2                                          27.06.2017
 
     *) Изменение: теперь при запросе диапазона, начинающегося с 0, из
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 37e257f..1f3a369 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013002
-#define NGINX_VERSION      "1.13.2"
+#define nginx_version      1013003
+#define NGINX_VERSION      "1.13.3"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 91f8a5e..cd55520 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -105,6 +105,8 @@ static void ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
     ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
 static ngx_int_t ngx_resolver_copy(ngx_resolver_t *r, ngx_str_t *name,
     u_char *buf, u_char *src, u_char *last);
+static ngx_int_t ngx_resolver_set_timeout(ngx_resolver_t *r,
+    ngx_resolver_ctx_t *ctx);
 static void ngx_resolver_timeout_handler(ngx_event_t *ev);
 static void ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn);
 static void *ngx_resolver_alloc(ngx_resolver_t *r, size_t size);
@@ -189,6 +191,7 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
     r->event->handler = ngx_resolver_resend_handler;
     r->event->data = r;
     r->event->log = &cf->cycle->new_log;
+    r->event->cancelable = 1;
     r->ident = -1;
 
     r->resend_timeout = 5;
@@ -728,19 +731,8 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
         }
 
         if (rn->waiting) {
-
-            if (ctx->event == NULL && ctx->timeout) {
-                ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
-                if (ctx->event == NULL) {
-                    return NGX_ERROR;
-                }
-
-                ctx->event->handler = ngx_resolver_timeout_handler;
-                ctx->event->data = ctx;
-                ctx->event->log = r->log;
-                ctx->ident = -1;
-
-                ngx_add_timer(ctx->event, ctx->timeout);
+            if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
+                return NGX_ERROR;
             }
 
             last->next = rn->waiting;
@@ -864,18 +856,8 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
         goto failed;
     }
 
-    if (ctx->event == NULL && ctx->timeout) {
-        ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
-        if (ctx->event == NULL) {
-            goto failed;
-        }
-
-        ctx->event->handler = ngx_resolver_timeout_handler;
-        ctx->event->data = ctx;
-        ctx->event->log = r->log;
-        ctx->ident = -1;
-
-        ngx_add_timer(ctx->event, ctx->timeout);
+    if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
+        goto failed;
     }
 
     if (ngx_resolver_resend_empty(r)) {
@@ -1007,19 +989,8 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
         }
 
         if (rn->waiting) {
-
-            if (ctx->event == NULL && ctx->timeout) {
-                ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
-                if (ctx->event == NULL) {
-                    return NGX_ERROR;
-                }
-
-                ctx->event->handler = ngx_resolver_timeout_handler;
-                ctx->event->data = ctx;
-                ctx->event->log = r->log;
-                ctx->ident = -1;
-
-                ngx_add_timer(ctx->event, ctx->timeout);
+            if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
+                return NGX_ERROR;
             }
 
             ctx->next = rn->waiting;
@@ -1089,18 +1060,8 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
         goto failed;
     }
 
-    if (ctx->event == NULL && ctx->timeout) {
-        ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
-        if (ctx->event == NULL) {
-            goto failed;
-        }
-
-        ctx->event->handler = ngx_resolver_timeout_handler;
-        ctx->event->data = ctx;
-        ctx->event->log = r->log;
-        ctx->ident = -1;
-
-        ngx_add_timer(ctx->event, ctx->timeout);
+    if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
+        goto failed;
     }
 
     if (ngx_resolver_resend_empty(r)) {
@@ -3034,25 +2995,15 @@ ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
 
         addrs = ngx_resolver_calloc(r, cctx->naddrs * sizeof(ngx_addr_t));
         if (addrs == NULL) {
-            ngx_resolve_name_done(cctx);
-
-            ctx->state = NGX_ERROR;
-            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
-
-            ctx->handler(ctx);
-            return;
+            srv->state = NGX_ERROR;
+            goto done;
         }
 
         sockaddr = ngx_resolver_alloc(r, cctx->naddrs * sizeof(ngx_sockaddr_t));
         if (sockaddr == NULL) {
             ngx_resolver_free(r, addrs);
-            ngx_resolve_name_done(cctx);
-
-            ctx->state = NGX_ERROR;
-            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
-
-            ctx->handler(ctx);
-            return;
+            srv->state = NGX_ERROR;
+            goto done;
         }
 
         for (i = 0; i < cctx->naddrs; i++) {
@@ -3069,6 +3020,8 @@ ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
         srv->naddrs = cctx->naddrs;
     }
 
+done:
+
     ngx_resolve_name_done(cctx);
 
     if (ctx->count == 0) {
@@ -4041,6 +3994,30 @@ done:
 }
 
 
+static ngx_int_t
+ngx_resolver_set_timeout(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
+{
+    if (ctx->event || ctx->timeout == 0) {
+        return NGX_OK;
+    }
+
+    ctx->event = ngx_resolver_calloc(r, sizeof(ngx_event_t));
+    if (ctx->event == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->event->handler = ngx_resolver_timeout_handler;
+    ctx->event->data = ctx;
+    ctx->event->log = r->log;
+    ctx->event->cancelable = ctx->cancelable;
+    ctx->ident = -1;
+
+    ngx_add_timer(ctx->event, ctx->timeout);
+
+    return NGX_OK;
+}
+
+
 static void
 ngx_resolver_timeout_handler(ngx_event_t *ev)
 {
@@ -4254,10 +4231,21 @@ ngx_resolver_report_srv(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
     ngx_resolver_addr_t      *addrs;
     ngx_resolver_srv_name_t  *srvs;
 
+    srvs = ctx->srvs;
+    nsrvs = ctx->nsrvs;
+
     naddrs = 0;
 
-    for (i = 0; i < ctx->nsrvs; i++) {
-        naddrs += ctx->srvs[i].naddrs;
+    for (i = 0; i < nsrvs; i++) {
+        if (srvs[i].state == NGX_ERROR) {
+            ctx->state = NGX_ERROR;
+            ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
+
+            ctx->handler(ctx);
+            return;
+        }
+
+        naddrs += srvs[i].naddrs;
     }
 
     if (naddrs == 0) {
@@ -4277,9 +4265,6 @@ ngx_resolver_report_srv(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
         return;
     }
 
-    srvs = ctx->srvs;
-    nsrvs = ctx->nsrvs;
-
     i = 0;
     n = 0;
 
diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h
index 6f099b7..0bd3921 100644
--- a/src/core/ngx_resolver.h
+++ b/src/core/ngx_resolver.h
@@ -220,6 +220,7 @@ struct ngx_resolver_ctx_s {
 
     unsigned                  quick:1;
     unsigned                  async:1;
+    unsigned                  cancelable:1;
     ngx_uint_t                recursion;
     ngx_event_t              *event;
 };
diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
index 1d4ce2b..9e7796d 100644
--- a/src/core/ngx_slab.c
+++ b/src/core/ngx_slab.c
@@ -181,8 +181,8 @@ void *
 ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 {
     size_t            s;
-    uintptr_t         p, n, m, mask, *bitmap;
-    ngx_uint_t        i, slot, shift, map;
+    uintptr_t         p, m, mask, *bitmap;
+    ngx_uint_t        i, n, slot, shift, map;
     ngx_slab_page_t  *page, *prev, *slots;
 
     if (size > ngx_slab_max_size) {
@@ -226,7 +226,7 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 
             bitmap = (uintptr_t *) ngx_slab_page_addr(pool, page);
 
-            map = (ngx_pagesize >> shift) / (sizeof(uintptr_t) * 8);
+            map = (ngx_pagesize >> shift) / (8 * sizeof(uintptr_t));
 
             for (n = 0; n < map; n++) {
 
@@ -239,7 +239,7 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 
                         bitmap[n] |= m;
 
-                        i = (n * sizeof(uintptr_t) * 8 + i) << shift;
+                        i = (n * 8 * sizeof(uintptr_t) + i) << shift;
 
                         p = (uintptr_t) bitmap + i;
 
@@ -339,11 +339,17 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
             }
 
             /* "n" elements for bitmap, plus one requested */
-            bitmap[0] = ((uintptr_t) 2 << n) - 1;
 
-            map = (ngx_pagesize >> shift) / (sizeof(uintptr_t) * 8);
+            for (i = 0; i < (n + 1) / (8 * sizeof(uintptr_t)); i++) {
+                bitmap[i] = NGX_SLAB_BUSY;
+            }
 
-            for (i = 1; i < map; i++) {
+            m = ((uintptr_t) 1 << ((n + 1) % (8 * sizeof(uintptr_t)))) - 1;
+            bitmap[i] = m;
+
+            map = (ngx_pagesize >> shift) / (8 * sizeof(uintptr_t));
+
+            for (i = i + 1; i < map; i++) {
                 bitmap[i] = 0;
             }
 
@@ -369,7 +375,7 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
 
             slots[slot].next = page;
 
-            pool->stats[slot].total += sizeof(uintptr_t) * 8;
+            pool->stats[slot].total += 8 * sizeof(uintptr_t);
 
             p = ngx_slab_page_addr(pool, page);
 
@@ -480,8 +486,8 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
         }
 
         n = ((uintptr_t) p & (ngx_pagesize - 1)) >> shift;
-        m = (uintptr_t) 1 << (n % (sizeof(uintptr_t) * 8));
-        n /= sizeof(uintptr_t) * 8;
+        m = (uintptr_t) 1 << (n % (8 * sizeof(uintptr_t)));
+        n /= 8 * sizeof(uintptr_t);
         bitmap = (uintptr_t *)
                              ((uintptr_t) p & ~((uintptr_t) ngx_pagesize - 1));
 
@@ -506,13 +512,16 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
                 n = 1;
             }
 
-            if (bitmap[0] & ~(((uintptr_t) 1 << n) - 1)) {
+            i = n / (8 * sizeof(uintptr_t));
+            m = ((uintptr_t) 1 << (n % (8 * sizeof(uintptr_t)))) - 1;
+
+            if (bitmap[i] & ~m) {
                 goto done;
             }
 
-            map = (ngx_pagesize >> shift) / (sizeof(uintptr_t) * 8);
+            map = (ngx_pagesize >> shift) / (8 * sizeof(uintptr_t));
 
-            for (i = 1; i < map; i++) {
+            for (i = i + 1; i < map; i++) {
                 if (bitmap[i]) {
                     goto done;
                 }
@@ -558,7 +567,7 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
 
             ngx_slab_free_pages(pool, page, 1);
 
-            pool->stats[slot].total -= sizeof(uintptr_t) * 8;
+            pool->stats[slot].total -= 8 * sizeof(uintptr_t);
 
             goto done;
         }
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 839d479..61bf55c 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -1143,7 +1143,8 @@ ngx_http_proxy_create_key(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_proxy_create_request(ngx_http_request_t *r)
 {
-    size_t                        len, uri_len, loc_len, body_len;
+    size_t                        len, uri_len, loc_len, body_len,
+                                  key_len, val_len;
     uintptr_t                     escape;
     ngx_buf_t                    *b;
     ngx_str_t                     method;
@@ -1258,11 +1259,20 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
     le.flushed = 1;
 
     while (*(uintptr_t *) le.ip) {
-        while (*(uintptr_t *) le.ip) {
+
+        lcode = *(ngx_http_script_len_code_pt *) le.ip;
+        key_len = lcode(&le);
+
+        for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) {
             lcode = *(ngx_http_script_len_code_pt *) le.ip;
-            len += lcode(&le);
         }
         le.ip += sizeof(uintptr_t);
+
+        if (val_len == 0) {
+            continue;
+        }
+
+        len += key_len + sizeof(": ") - 1 + val_len + sizeof(CRLF) - 1;
     }
 
 
@@ -1362,30 +1372,41 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
     le.ip = headers->lengths->elts;
 
     while (*(uintptr_t *) le.ip) {
-        lcode = *(ngx_http_script_len_code_pt *) le.ip;
 
-        /* skip the header line name length */
+        lcode = *(ngx_http_script_len_code_pt *) le.ip;
         (void) lcode(&le);
 
-        if (*(ngx_http_script_len_code_pt *) le.ip) {
+        for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) {
+            lcode = *(ngx_http_script_len_code_pt *) le.ip;
+        }
+        le.ip += sizeof(uintptr_t);
 
-            for (len = 0; *(uintptr_t *) le.ip; len += lcode(&le)) {
-                lcode = *(ngx_http_script_len_code_pt *) le.ip;
+        if (val_len == 0) {
+            e.skip = 1;
+
+            while (*(uintptr_t *) e.ip) {
+                code = *(ngx_http_script_code_pt *) e.ip;
+                code((ngx_http_script_engine_t *) &e);
             }
+            e.ip += sizeof(uintptr_t);
 
-            e.skip = (len == sizeof(CRLF) - 1) ? 1 : 0;
-
-        } else {
             e.skip = 0;
+
+            continue;
         }
 
-        le.ip += sizeof(uintptr_t);
+        code = *(ngx_http_script_code_pt *) e.ip;
+        code((ngx_http_script_engine_t *) &e);
+
+        *e.pos++ = ':'; *e.pos++ = ' ';
 
         while (*(uintptr_t *) e.ip) {
             code = *(ngx_http_script_code_pt *) e.ip;
             code((ngx_http_script_engine_t *) &e);
         }
         e.ip += sizeof(uintptr_t);
+
+        *e.pos++ = CR; *e.pos++ = LF;
     }
 
     b->last = e.pos;
@@ -3498,108 +3519,40 @@ ngx_http_proxy_init_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
             continue;
         }
 
-        if (ngx_http_script_variables_count(&src[i].value) == 0) {
-            copy = ngx_array_push_n(headers->lengths,
-                                    sizeof(ngx_http_script_copy_code_t));
-            if (copy == NULL) {
-                return NGX_ERROR;
-            }
+        copy = ngx_array_push_n(headers->lengths,
+                                sizeof(ngx_http_script_copy_code_t));
+        if (copy == NULL) {
+            return NGX_ERROR;
+        }
 
-            copy->code = (ngx_http_script_code_pt)
-                                                 ngx_http_script_copy_len_code;
-            copy->len = src[i].key.len + sizeof(": ") - 1
-                        + src[i].value.len + sizeof(CRLF) - 1;
+        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->len = src[i].key.len;
 
+        size = (sizeof(ngx_http_script_copy_code_t)
+                + src[i].key.len + sizeof(uintptr_t) - 1)
+               & ~(sizeof(uintptr_t) - 1);
 
-            size = (sizeof(ngx_http_script_copy_code_t)
-                       + src[i].key.len + sizeof(": ") - 1
-                       + src[i].value.len + sizeof(CRLF) - 1
-                       + sizeof(uintptr_t) - 1)
-                    & ~(sizeof(uintptr_t) - 1);
+        copy = ngx_array_push_n(headers->values, size);
+        if (copy == NULL) {
+            return NGX_ERROR;
+        }
 
-            copy = ngx_array_push_n(headers->values, size);
-            if (copy == NULL) {
-                return NGX_ERROR;
-            }
+        copy->code = ngx_http_script_copy_code;
+        copy->len = src[i].key.len;
 
-            copy->code = ngx_http_script_copy_code;
-            copy->len = src[i].key.len + sizeof(": ") - 1
-                        + src[i].value.len + sizeof(CRLF) - 1;
+        p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
+        ngx_memcpy(p, src[i].key.data, src[i].key.len);
 
-            p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
+        ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
 
-            p = ngx_cpymem(p, src[i].key.data, src[i].key.len);
-            *p++ = ':'; *p++ = ' ';
-            p = ngx_cpymem(p, src[i].value.data, src[i].value.len);
-            *p++ = CR; *p = LF;
+        sc.cf = cf;
+        sc.source = &src[i].value;
+        sc.flushes = &headers->flushes;
+        sc.lengths = &headers->lengths;
+        sc.values = &headers->values;
 
-        } else {
-            copy = ngx_array_push_n(headers->lengths,
-                                    sizeof(ngx_http_script_copy_code_t));
-            if (copy == NULL) {
-                return NGX_ERROR;
-            }
-
-            copy->code = (ngx_http_script_code_pt)
-                                                 ngx_http_script_copy_len_code;
-            copy->len = src[i].key.len + sizeof(": ") - 1;
-
-
-            size = (sizeof(ngx_http_script_copy_code_t)
-                    + src[i].key.len + sizeof(": ") - 1 + sizeof(uintptr_t) - 1)
-                    & ~(sizeof(uintptr_t) - 1);
-
-            copy = ngx_array_push_n(headers->values, size);
-            if (copy == NULL) {
-                return NGX_ERROR;
-            }
-
-            copy->code = ngx_http_script_copy_code;
-            copy->len = src[i].key.len + sizeof(": ") - 1;
-
-            p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
-            p = ngx_cpymem(p, src[i].key.data, src[i].key.len);
-            *p++ = ':'; *p = ' ';
-
-
-            ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
-
-            sc.cf = cf;
-            sc.source = &src[i].value;
-            sc.flushes = &headers->flushes;
-            sc.lengths = &headers->lengths;
-            sc.values = &headers->values;
-
-            if (ngx_http_script_compile(&sc) != NGX_OK) {
-                return NGX_ERROR;
-            }
-
-
-            copy = ngx_array_push_n(headers->lengths,
-                                    sizeof(ngx_http_script_copy_code_t));
-            if (copy == NULL) {
-                return NGX_ERROR;
-            }
-
-            copy->code = (ngx_http_script_code_pt)
-                                                 ngx_http_script_copy_len_code;
-            copy->len = sizeof(CRLF) - 1;
-
-
-            size = (sizeof(ngx_http_script_copy_code_t)
-                    + sizeof(CRLF) - 1 + sizeof(uintptr_t) - 1)
-                    & ~(sizeof(uintptr_t) - 1);
-
-            copy = ngx_array_push_n(headers->values, size);
-            if (copy == NULL) {
-                return NGX_ERROR;
-            }
-
-            copy->code = ngx_http_script_copy_code;
-            copy->len = sizeof(CRLF) - 1;
-
-            p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
-            *p++ = CR; *p = LF;
+        if (ngx_http_script_compile(&sc) != NGX_OK) {
+            return NGX_ERROR;
         }
 
         code = ngx_array_push_n(headers->lengths, sizeof(uintptr_t));
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index 7ad9db9..292a2b8 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -355,7 +355,7 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
         }
 
         if (suffix) {
-            start = content_length - end;
+            start = (end < content_length) ? content_length - end : 0;
             end = content_length - 1;
         }
 
@@ -377,6 +377,10 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
             range->start = start;
             range->end = end;
 
+            if (size > NGX_MAX_OFF_T_VALUE - (end - start)) {
+                return NGX_HTTP_RANGE_NOT_SATISFIABLE;
+            }
+
             size += end - start;
 
             if (ranges-- == 0) {
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index cfb538a..fbc9ffa 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -1463,17 +1463,15 @@ static ngx_int_t
 ngx_http_variable_is_args(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-
     if (r->args.len == 0) {
-        v->len = 0;
-        v->data = NULL;
+        *v = ngx_http_variable_null_value;
         return NGX_OK;
     }
 
     v->len = 1;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
     v->data = (u_char *) "?";
 
     return NGX_OK;
@@ -1990,11 +1988,7 @@ ngx_http_variable_request_completion(ngx_http_request_t *r,
         return NGX_OK;
     }
 
-    v->len = 0;
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-    v->data = (u_char *) "";
+    *v = ngx_http_variable_null_value;
 
     return NGX_OK;
 }

From 95f7f656da1f216cba0e292813cf0889dff2dd04 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 12 Jul 2017 11:20:46 +0300
Subject: [PATCH 202/600] Release 1.13.3-1

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0b7711b..7d350cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.13.3-1) unstable; urgency=high
+
+  * New upstream version 1.13.3.
+    Fixes CVE-2017-7529 (Closes: #868109)
+  * Drop gzip_disable "msie6" directive. (Closes: #867024)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 12 Jul 2017 11:20:27 +0300
+
 nginx (1.13.2-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]

From ec292afcb9b056d4434dd393c41b52d00fccceca Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Wed, 9 Aug 2017 09:05:28 +0300
Subject: [PATCH 203/600] New upstream version 1.13.4

---
 CHANGES                                       |  20 +
 CHANGES.ru                                    |  20 +
 auto/lib/conf                                 |   2 +-
 auto/modules                                  |  22 +
 auto/options                                  |   3 +
 src/core/nginx.c                              |   6 +
 src/core/nginx.h                              |   4 +-
 src/core/ngx_connection.c                     |   4 +-
 src/core/ngx_parse_time.c                     |  16 +-
 src/core/ngx_slab.c                           |  23 +-
 src/core/ngx_slab.h                           |   1 +
 src/core/ngx_string.c                         |   8 +-
 src/event/ngx_event_openssl.c                 |   2 +-
 src/event/ngx_event_openssl_stapling.c        |   2 +-
 .../modules/ngx_http_addition_filter_module.c |   2 +
 src/http/modules/ngx_http_browser_module.c    |  45 +-
 src/http/modules/ngx_http_fastcgi_module.c    |   2 +-
 src/http/modules/ngx_http_geoip_module.c      |   2 +-
 src/http/modules/ngx_http_mirror_module.c     | 264 ++++++++++++
 src/http/modules/ngx_http_proxy_module.c      |   2 +-
 .../modules/ngx_http_range_filter_module.c    |   4 +-
 src/http/modules/ngx_http_realip_module.c     |   2 +-
 src/http/modules/ngx_http_referer_module.c    |  39 +-
 .../modules/ngx_http_slice_filter_module.c    |  10 +-
 src/http/modules/ngx_http_ssi_filter_module.c |   4 +-
 src/http/modules/ngx_http_ssl_module.c        |   2 +-
 .../modules/ngx_http_stub_status_module.c     |   2 +-
 src/http/modules/ngx_http_try_files_module.c  | 404 ++++++++++++++++++
 .../modules/ngx_http_upstream_zone_module.c   |  95 +++-
 src/http/ngx_http.c                           |  21 +-
 src/http/ngx_http_core_module.c               | 310 --------------
 src/http/ngx_http_core_module.h               |  18 +-
 src/http/ngx_http_file_cache.c                |   1 +
 src/http/ngx_http_parse.c                     |  14 +-
 src/http/ngx_http_request.h                   |   1 +
 src/http/ngx_http_upstream.c                  |  16 +-
 src/http/ngx_http_variables.c                 |   2 +-
 src/http/ngx_http_variables.h                 |   2 +
 src/http/v2/ngx_http_v2_module.c              |   2 +-
 src/misc/ngx_google_perftools_module.c        |   2 +-
 src/stream/ngx_stream_geoip_module.c          |   2 +-
 src/stream/ngx_stream_realip_module.c         |   2 +-
 src/stream/ngx_stream_ssl_module.c            |   2 +-
 src/stream/ngx_stream_ssl_preread_module.c    |   2 +-
 src/stream/ngx_stream_upstream.c              |   2 +-
 src/stream/ngx_stream_upstream_zone_module.c  |  95 +++-
 src/stream/ngx_stream_variables.c             |   2 +-
 src/stream/ngx_stream_variables.h             |   2 +
 48 files changed, 1055 insertions(+), 455 deletions(-)
 create mode 100644 src/http/modules/ngx_http_mirror_module.c
 create mode 100644 src/http/modules/ngx_http_try_files_module.c

diff --git a/CHANGES b/CHANGES
index 30b01ef..cc22571 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,24 @@
 
+Changes with nginx 1.13.4                                        08 Aug 2017
+
+    *) Feature: the ngx_http_mirror_module.
+
+    *) Bugfix: client connections might be dropped during configuration
+       testing when using the "reuseport" parameter of the "listen"
+       directive on Linux.
+
+    *) Bugfix: request body might not be available in subrequests if it was
+       saved to a file and proxying was used.
+
+    *) Bugfix: cleaning cache based on the "max_size" parameter did not work
+       on Windows.
+
+    *) Bugfix: any shared memory allocation required 4096 bytes on Windows.
+
+    *) Bugfix: nginx worker might be terminated abnormally when using the
+       "zone" directive inside the "upstream" block on Windows.
+
+
 Changes with nginx 1.13.3                                        11 Jul 2017
 
     *) Security: a specially crafted request might result in an integer
diff --git a/CHANGES.ru b/CHANGES.ru
index dab50c9..f466c4d 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,24 @@
 
+Изменения в nginx 1.13.4                                          08.08.2017
+
+    *) Добавление: модуль ngx_http_mirror_module.
+
+    *) Исправление: клиентские соединения могли сбрасываться при
+       тестировании конфигурации, если использовался параметр reuseport
+       директивы listen на Linux.
+
+    *) Исправление: тело запроса могло быть недоступно в подзапросах, если
+       оно было сохранено в файл и использовалось проксирование.
+
+    *) Исправление: очистка кэша по max_size не работала на Windows.
+
+    *) Исправление: любое выделение разделяемой памяти на Windows требовало
+       4096 байт памяти.
+
+    *) Исправление: при использовании директивы zone в блоке upstream на
+       Windows рабочий процесс мог завершаться аварийно.
+
+
 Изменения в nginx 1.13.3                                          11.07.2017
 
     *) Безопасность: специально созданный запрос мог вызвать целочисленное
diff --git a/auto/lib/conf b/auto/lib/conf
index 0b8545a..2c7af10 100644
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
     . auto/lib/pcre/conf
 
 else
-    if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then
+    if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then
 
 cat << END
 
diff --git a/auto/modules b/auto/modules
index be3561e..26b05bd 100644
--- a/auto/modules
+++ b/auto/modules
@@ -506,6 +506,28 @@ if [ $HTTP = YES ]; then
         . auto/module
     fi
 
+    if [ $HTTP_MIRROR = YES ]; then
+        ngx_module_name=ngx_http_mirror_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_mirror_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_MIRROR
+
+        . auto/module
+    fi
+
+    if :; then
+        ngx_module_name=ngx_http_try_files_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_try_files_module.c
+        ngx_module_libs=
+        ngx_module_link=YES
+
+        . auto/module
+    fi
+
     if [ $HTTP_AUTH_REQUEST = YES ]; then
         ngx_module_name=ngx_http_auth_request_module
         ngx_module_incs=
diff --git a/auto/options b/auto/options
index 66b822a..24c2618 100644
--- a/auto/options
+++ b/auto/options
@@ -70,6 +70,7 @@ HTTP_DAV=NO
 HTTP_ACCESS=YES
 HTTP_AUTH_BASIC=YES
 HTTP_AUTH_REQUEST=NO
+HTTP_MIRROR=YES
 HTTP_USERID=YES
 HTTP_SLICE=NO
 HTTP_AUTOINDEX=YES
@@ -249,6 +250,7 @@ $0: warning: the \"--with-ipv6\" option is deprecated"
         --without-http_userid_module)    HTTP_USERID=NO             ;;
         --without-http_access_module)    HTTP_ACCESS=NO             ;;
         --without-http_auth_basic_module) HTTP_AUTH_BASIC=NO        ;;
+        --without-http_mirror_module)    HTTP_MIRROR=NO             ;;
         --without-http_autoindex_module) HTTP_AUTOINDEX=NO          ;;
         --without-http_status_module)    HTTP_STATUS=NO             ;;
         --without-http_geo_module)       HTTP_GEO=NO                ;;
@@ -458,6 +460,7 @@ cat << END
   --without-http_userid_module       disable ngx_http_userid_module
   --without-http_access_module       disable ngx_http_access_module
   --without-http_auth_basic_module   disable ngx_http_auth_basic_module
+  --without-http_mirror_module       disable ngx_http_mirror_module
   --without-http_autoindex_module    disable ngx_http_autoindex_module
   --without-http_geo_module          disable ngx_http_geo_module
   --without-http_map_module          disable ngx_http_map_module
diff --git a/src/core/nginx.c b/src/core/nginx.c
index abaa50d..c3a29cc 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -273,6 +273,12 @@ main(int argc, char *const *argv)
         return 1;
     }
 
+    /*
+     * ngx_slab_sizes_init() requires ngx_pagesize set in ngx_os_init()
+     */
+
+    ngx_slab_sizes_init();
+
     if (ngx_add_inherited_sockets(&init_cycle) != NGX_OK) {
         return 1;
     }
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 1f3a369..3649945 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013003
-#define NGINX_VERSION      "1.13.3"
+#define nginx_version      1013004
+#define NGINX_VERSION      "1.13.4"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index ec4692b..392fc35 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -473,7 +473,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
 
 #if (NGX_HAVE_REUSEPORT)
 
-            if (ls[i].reuseport) {
+            if (ls[i].reuseport && !ngx_test_config) {
                 int  reuseport;
 
                 reuseport = 1;
@@ -483,7 +483,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
                     == -1)
                 {
                     ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
-                                  "setsockopt(SO_REUSEPORT) %V failed, ignored",
+                                  "setsockopt(SO_REUSEPORT) %V failed",
                                   &ls[i].addr_text);
 
                     if (ngx_close_socket(s) == -1) {
diff --git a/src/core/ngx_parse_time.c b/src/core/ngx_parse_time.c
index 13afde3..a5c5034 100644
--- a/src/core/ngx_parse_time.c
+++ b/src/core/ngx_parse_time.c
@@ -58,7 +58,7 @@ ngx_parse_http_time(u_char *value, size_t len)
             return NGX_ERROR;
         }
 
-        day = (*p - '0') * 10 + *(p + 1) - '0';
+        day = (*p - '0') * 10 + (*(p + 1) - '0');
         p += 2;
 
         if (*p == ' ') {
@@ -132,7 +132,7 @@ ngx_parse_http_time(u_char *value, size_t len)
         }
 
         year = (*p - '0') * 1000 + (*(p + 1) - '0') * 100
-               + (*(p + 2) - '0') * 10 + *(p + 3) - '0';
+               + (*(p + 2) - '0') * 10 + (*(p + 3) - '0');
         p += 4;
 
     } else if (fmt == rfc850) {
@@ -140,7 +140,7 @@ ngx_parse_http_time(u_char *value, size_t len)
             return NGX_ERROR;
         }
 
-        year = (*p - '0') * 10 + *(p + 1) - '0';
+        year = (*p - '0') * 10 + (*(p + 1) - '0');
         year += (year < 70) ? 2000 : 1900;
         p += 2;
     }
@@ -161,7 +161,7 @@ ngx_parse_http_time(u_char *value, size_t len)
                 return NGX_ERROR;
             }
 
-            day = day * 10 + *p++ - '0';
+            day = day * 10 + (*p++ - '0');
         }
 
         if (end - p < 14) {
@@ -177,7 +177,7 @@ ngx_parse_http_time(u_char *value, size_t len)
         return NGX_ERROR;
     }
 
-    hour = (*p - '0') * 10 + *(p + 1) - '0';
+    hour = (*p - '0') * 10 + (*(p + 1) - '0');
     p += 2;
 
     if (*p++ != ':') {
@@ -188,7 +188,7 @@ ngx_parse_http_time(u_char *value, size_t len)
         return NGX_ERROR;
     }
 
-    min = (*p - '0') * 10 + *(p + 1) - '0';
+    min = (*p - '0') * 10 + (*(p + 1) - '0');
     p += 2;
 
     if (*p++ != ':') {
@@ -199,7 +199,7 @@ ngx_parse_http_time(u_char *value, size_t len)
         return NGX_ERROR;
     }
 
-    sec = (*p - '0') * 10 + *(p + 1) - '0';
+    sec = (*p - '0') * 10 + (*(p + 1) - '0');
 
     if (fmt == isoc) {
         p += 2;
@@ -216,7 +216,7 @@ ngx_parse_http_time(u_char *value, size_t len)
         }
 
         year = (*p - '0') * 1000 + (*(p + 1) - '0') * 100
-               + (*(p + 2) - '0') * 10 + *(p + 3) - '0';
+               + (*(p + 2) - '0') * 10 + (*(p + 3) - '0');
     }
 
     if (hour > 23 || min > 59 || sec > 59) {
diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
index 9e7796d..4023870 100644
--- a/src/core/ngx_slab.c
+++ b/src/core/ngx_slab.c
@@ -82,6 +82,19 @@ static ngx_uint_t  ngx_slab_exact_size;
 static ngx_uint_t  ngx_slab_exact_shift;
 
 
+void
+ngx_slab_sizes_init(void)
+{
+    ngx_uint_t  n;
+
+    ngx_slab_max_size = ngx_pagesize / 2;
+    ngx_slab_exact_size = ngx_pagesize / (8 * sizeof(uintptr_t));
+    for (n = ngx_slab_exact_size; n >>= 1; ngx_slab_exact_shift++) {
+        /* void */
+    }
+}
+
+
 void
 ngx_slab_init(ngx_slab_pool_t *pool)
 {
@@ -91,16 +104,6 @@ ngx_slab_init(ngx_slab_pool_t *pool)
     ngx_uint_t        i, n, pages;
     ngx_slab_page_t  *slots, *page;
 
-    /* STUB */
-    if (ngx_slab_max_size == 0) {
-        ngx_slab_max_size = ngx_pagesize / 2;
-        ngx_slab_exact_size = ngx_pagesize / (8 * sizeof(uintptr_t));
-        for (n = ngx_slab_exact_size; n >>= 1; ngx_slab_exact_shift++) {
-            /* void */
-        }
-    }
-    /**/
-
     pool->min_size = (size_t) 1 << pool->min_shift;
 
     slots = ngx_slab_slots(pool);
diff --git a/src/core/ngx_slab.h b/src/core/ngx_slab.h
index eff893c..d1876bb 100644
--- a/src/core/ngx_slab.h
+++ b/src/core/ngx_slab.h
@@ -59,6 +59,7 @@ typedef struct {
 } ngx_slab_pool_t;
 
 
+void ngx_slab_sizes_init(void);
 void ngx_slab_init(ngx_slab_pool_t *pool);
 void *ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size);
 void *ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size);
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 7526f60..de10a06 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -178,7 +178,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
             slen = (size_t) -1;
 
             while (*fmt >= '0' && *fmt <= '9') {
-                width = width * 10 + *fmt++ - '0';
+                width = width * 10 + (*fmt++ - '0');
             }
 
 
@@ -211,7 +211,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
                     fmt++;
 
                     while (*fmt >= '0' && *fmt <= '9') {
-                        frac_width = frac_width * 10 + *fmt++ - '0';
+                        frac_width = frac_width * 10 + (*fmt++ - '0');
                     }
 
                     break;
@@ -1655,7 +1655,7 @@ ngx_unescape_uri(u_char **dst, u_char **src, size_t size, ngx_uint_t type)
             state = sw_usual;
 
             if (ch >= '0' && ch <= '9') {
-                ch = (u_char) ((decoded << 4) + ch - '0');
+                ch = (u_char) ((decoded << 4) + (ch - '0'));
 
                 if (type & NGX_UNESCAPE_REDIRECT) {
                     if (ch > '%' && ch < 0x7f) {
@@ -1675,7 +1675,7 @@ ngx_unescape_uri(u_char **dst, u_char **src, size_t size, ngx_uint_t type)
 
             c = (u_char) (ch | 0x20);
             if (c >= 'a' && c <= 'f') {
-                ch = (u_char) ((decoded << 4) + c - 'a' + 10);
+                ch = (u_char) ((decoded << 4) + (c - 'a') + 10);
 
                 if (type & NGX_UNESCAPE_URI) {
                     if (ch == '?') {
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 2c4e114..07646b6 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -3128,7 +3128,7 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
 {
     if (paths) {
         ngx_log_error(NGX_LOG_WARN, ssl->log, 0,
-                      "\"ssl_session_ticket_keys\" ignored, not supported");
+                      "\"ssl_session_ticket_key\" ignored, not supported");
     }
 
     return NGX_OK;
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index d332c11..0bea5e7 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -1486,7 +1486,7 @@ ngx_ssl_ocsp_parse_status_line(ngx_ssl_ocsp_ctx_t *ctx)
                 return NGX_ERROR;
             }
 
-            ctx->code = ctx->code * 10 + ch - '0';
+            ctx->code = ctx->code * 10 + (ch - '0');
 
             if (++ctx->count == 3) {
                 state = sw_space_after_status;
diff --git a/src/http/modules/ngx_http_addition_filter_module.c b/src/http/modules/ngx_http_addition_filter_module.c
index 2fad0e5..e546f0d 100644
--- a/src/http/modules/ngx_http_addition_filter_module.c
+++ b/src/http/modules/ngx_http_addition_filter_module.c
@@ -123,6 +123,8 @@ ngx_http_addition_header_filter(ngx_http_request_t *r)
     ngx_http_clear_accept_ranges(r);
     ngx_http_weak_etag(r);
 
+    r->preserve_body = 1;
+
     return ngx_http_next_header_filter(r);
 }
 
diff --git a/src/http/modules/ngx_http_browser_module.c b/src/http/modules/ngx_http_browser_module.c
index 80da0d8..f774254 100644
--- a/src/http/modules/ngx_http_browser_module.c
+++ b/src/http/modules/ngx_http_browser_module.c
@@ -37,13 +37,6 @@ typedef struct {
 } ngx_http_modern_browser_t;
 
 
-typedef struct {
-    ngx_str_t                   name;
-    ngx_http_get_variable_pt    handler;
-    uintptr_t                   data;
-} ngx_http_browser_variable_t;
-
-
 typedef struct {
     ngx_array_t                *modern_browsers;
     ngx_array_t                *ancient_browsers;
@@ -63,7 +56,7 @@ static ngx_int_t ngx_http_browser_variable(ngx_http_request_t *r,
 static ngx_uint_t ngx_http_browser(ngx_http_request_t *r,
     ngx_http_browser_conf_t *cf);
 
-static ngx_int_t ngx_http_browser_add_variable(ngx_conf_t *cf);
+static ngx_int_t ngx_http_browser_add_variables(ngx_conf_t *cf);
 static void *ngx_http_browser_create_conf(ngx_conf_t *cf);
 static char *ngx_http_browser_merge_conf(ngx_conf_t *cf, void *parent,
     void *child);
@@ -114,7 +107,7 @@ static ngx_command_t  ngx_http_browser_commands[] = {
 
 
 static ngx_http_module_t  ngx_http_browser_module_ctx = {
-    ngx_http_browser_add_variable,         /* preconfiguration */
+    ngx_http_browser_add_variables,        /* preconfiguration */
     NULL,                                  /* postconfiguration */
 
     NULL,                                  /* create main configuration */
@@ -218,13 +211,18 @@ static ngx_http_modern_browser_mask_t  ngx_http_modern_browser_masks[] = {
 };
 
 
-static ngx_http_browser_variable_t  ngx_http_browsers[] = {
-    { ngx_string("msie"), ngx_http_msie_variable, 0 },
-    { ngx_string("modern_browser"), ngx_http_browser_variable,
-          NGX_HTTP_MODERN_BROWSER },
-    { ngx_string("ancient_browser"), ngx_http_browser_variable,
-          NGX_HTTP_ANCIENT_BROWSER },
-    { ngx_null_string, NULL, 0 }
+static ngx_http_variable_t  ngx_http_browser_vars[] = {
+
+    { ngx_string("msie"), NULL, ngx_http_msie_variable,
+      0, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("modern_browser"), NULL, ngx_http_browser_variable,
+      NGX_HTTP_MODERN_BROWSER, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
+    { ngx_string("ancient_browser"), NULL, ngx_http_browser_variable,
+      NGX_HTTP_ANCIENT_BROWSER, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
+      ngx_http_null_variable
 };
 
 
@@ -397,20 +395,19 @@ ngx_http_msie_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
 
 
 static ngx_int_t
-ngx_http_browser_add_variable(ngx_conf_t *cf)
+ngx_http_browser_add_variables(ngx_conf_t *cf)
 {
-    ngx_http_browser_variable_t   *var;
-    ngx_http_variable_t           *v;
+    ngx_http_variable_t  *var, *v;
 
-    for (var = ngx_http_browsers; var->name.len; var++) {
+    for (v = ngx_http_browser_vars; v->name.len; v++) {
 
-        v = ngx_http_add_variable(cf, &var->name, NGX_HTTP_VAR_CHANGEABLE);
-        if (v == NULL) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
             return NGX_ERROR;
         }
 
-        v->get_handler = var->handler;
-        v->data = var->data;
+        var->get_handler = v->get_handler;
+        var->data = v->data;
     }
 
     return NGX_OK;
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 741e577..ea16eca 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -631,7 +631,7 @@ static ngx_http_variable_t  ngx_http_fastcgi_vars[] = {
       ngx_http_fastcgi_path_info_variable, 0,
       NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
diff --git a/src/http/modules/ngx_http_geoip_module.c b/src/http/modules/ngx_http_geoip_module.c
index 8e151aa..5ea4f5f 100644
--- a/src/http/modules/ngx_http_geoip_module.c
+++ b/src/http/modules/ngx_http_geoip_module.c
@@ -232,7 +232,7 @@ static ngx_http_variable_t  ngx_http_geoip_vars[] = {
       ngx_http_geoip_city_int_variable,
       offsetof(GeoIPRecord, area_code), 0, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
diff --git a/src/http/modules/ngx_http_mirror_module.c b/src/http/modules/ngx_http_mirror_module.c
new file mode 100644
index 0000000..787adb3
--- /dev/null
+++ b/src/http/modules/ngx_http_mirror_module.c
@@ -0,0 +1,264 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    ngx_array_t  *mirror;
+    ngx_flag_t    request_body;
+} ngx_http_mirror_loc_conf_t;
+
+
+typedef struct {
+    ngx_int_t     status;
+} ngx_http_mirror_ctx_t;
+
+
+static ngx_int_t ngx_http_mirror_handler(ngx_http_request_t *r);
+static void ngx_http_mirror_body_handler(ngx_http_request_t *r);
+static ngx_int_t ngx_http_mirror_handler_internal(ngx_http_request_t *r);
+static void *ngx_http_mirror_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_mirror_merge_loc_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static char *ngx_http_mirror(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+static ngx_int_t ngx_http_mirror_init(ngx_conf_t *cf);
+
+
+static ngx_command_t  ngx_http_mirror_commands[] = {
+
+    { ngx_string("mirror"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_mirror,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("mirror_request_body"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_mirror_loc_conf_t, request_body),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_mirror_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_http_mirror_init,                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    ngx_http_mirror_create_loc_conf,       /* create location configuration */
+    ngx_http_mirror_merge_loc_conf         /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_mirror_module = {
+    NGX_MODULE_V1,
+    &ngx_http_mirror_module_ctx,           /* module context */
+    ngx_http_mirror_commands,              /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_http_mirror_handler(ngx_http_request_t *r)
+{
+    ngx_int_t                    rc;
+    ngx_http_mirror_ctx_t       *ctx;
+    ngx_http_mirror_loc_conf_t  *mlcf;
+
+    if (r != r->main) {
+        return NGX_DECLINED;
+    }
+
+    mlcf = ngx_http_get_module_loc_conf(r, ngx_http_mirror_module);
+
+    if (mlcf->mirror == NULL) {
+        return NGX_DECLINED;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "mirror handler");
+
+    if (mlcf->request_body) {
+        ctx = ngx_http_get_module_ctx(r, ngx_http_mirror_module);
+
+        if (ctx) {
+            return ctx->status;
+        }
+
+        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_mirror_ctx_t));
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ctx->status = NGX_DONE;
+
+        ngx_http_set_ctx(r, ctx, ngx_http_mirror_module);
+
+        rc = ngx_http_read_client_request_body(r, ngx_http_mirror_body_handler);
+        if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+            return rc;
+        }
+
+        ngx_http_finalize_request(r, NGX_DONE);
+        return NGX_DONE;
+    }
+
+    return ngx_http_mirror_handler_internal(r);
+}
+
+
+static void
+ngx_http_mirror_body_handler(ngx_http_request_t *r)
+{
+    ngx_http_mirror_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_mirror_module);
+
+    ctx->status = ngx_http_mirror_handler_internal(r);
+
+    r->preserve_body = 1;
+
+    r->write_event_handler = ngx_http_core_run_phases;
+    ngx_http_core_run_phases(r);
+}
+
+
+static ngx_int_t
+ngx_http_mirror_handler_internal(ngx_http_request_t *r)
+{
+    ngx_str_t                   *name;
+    ngx_uint_t                   i;
+    ngx_http_request_t          *sr;
+    ngx_http_mirror_loc_conf_t  *mlcf;
+
+    mlcf = ngx_http_get_module_loc_conf(r, ngx_http_mirror_module);
+
+    name = mlcf->mirror->elts;
+
+    for (i = 0; i < mlcf->mirror->nelts; i++) {
+        if (ngx_http_subrequest(r, &name[i], &r->args, &sr, NULL,
+                                NGX_HTTP_SUBREQUEST_BACKGROUND)
+            != NGX_OK)
+        {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        sr->header_only = 1;
+        sr->method = r->method;
+        sr->method_name = r->method_name;
+    }
+
+    return NGX_DECLINED;
+}
+
+
+static void *
+ngx_http_mirror_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_mirror_loc_conf_t  *mlcf;
+
+    mlcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_mirror_loc_conf_t));
+    if (mlcf == NULL) {
+        return NULL;
+    }
+
+    mlcf->mirror = NGX_CONF_UNSET_PTR;
+    mlcf->request_body = NGX_CONF_UNSET;
+
+    return mlcf;
+}
+
+
+static char *
+ngx_http_mirror_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_mirror_loc_conf_t *prev = parent;
+    ngx_http_mirror_loc_conf_t *conf = child;
+
+    ngx_conf_merge_ptr_value(conf->mirror, prev->mirror, NULL);
+    ngx_conf_merge_value(conf->request_body, prev->request_body, 1);
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_mirror(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_mirror_loc_conf_t *mlcf = conf;
+
+    ngx_str_t  *value, *s;
+
+    value = cf->args->elts;
+
+    if (ngx_strcmp(value[1].data, "off") == 0) {
+        if (mlcf->mirror != NGX_CONF_UNSET_PTR) {
+            return "is duplicate";
+        }
+
+        mlcf->mirror = NULL;
+        return NGX_CONF_OK;
+    }
+
+    if (mlcf->mirror == NULL) {
+        return "is duplicate";
+    }
+
+    if (mlcf->mirror == NGX_CONF_UNSET_PTR) {
+        mlcf->mirror = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t));
+        if (mlcf->mirror == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    s = ngx_array_push(mlcf->mirror);
+    if (s == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *s = value[1];
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_mirror_init(ngx_conf_t *cf)
+{
+    ngx_http_handler_pt        *h;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_HTTP_PRECONTENT_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_http_mirror_handler;
+
+    return NGX_OK;
+}
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 61bf55c..b42839c 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -829,7 +829,7 @@ static ngx_http_variable_t  ngx_http_proxy_vars[] = {
       ngx_http_proxy_internal_chunked_variable, 0,
       NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index 292a2b8..6256b13 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -315,7 +315,7 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
                     return NGX_HTTP_RANGE_NOT_SATISFIABLE;
                 }
 
-                start = start * 10 + *p++ - '0';
+                start = start * 10 + (*p++ - '0');
             }
 
             while (*p == ' ') { p++; }
@@ -345,7 +345,7 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
                 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
             }
 
-            end = end * 10 + *p++ - '0';
+            end = end * 10 + (*p++ - '0');
         }
 
         while (*p == ' ') { p++; }
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index e1839e6..7d3f2a9 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -122,7 +122,7 @@ static ngx_http_variable_t  ngx_http_realip_vars[] = {
     { ngx_string("realip_remote_port"), NULL,
       ngx_http_realip_remote_port_variable, 0, 0, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
diff --git a/src/http/modules/ngx_http_referer_module.c b/src/http/modules/ngx_http_referer_module.c
index 3f0f78e..599dd3a 100644
--- a/src/http/modules/ngx_http_referer_module.c
+++ b/src/http/modules/ngx_http_referer_module.c
@@ -32,6 +32,7 @@ typedef struct {
 } ngx_http_referer_conf_t;
 
 
+static ngx_int_t ngx_http_referer_add_variables(ngx_conf_t *cf);
 static void * ngx_http_referer_create_conf(ngx_conf_t *cf);
 static char * ngx_http_referer_merge_conf(ngx_conf_t *cf, void *parent,
     void *child);
@@ -77,7 +78,7 @@ static ngx_command_t  ngx_http_referer_commands[] = {
 
 
 static ngx_http_module_t  ngx_http_referer_module_ctx = {
-    NULL,                                  /* preconfiguration */
+    ngx_http_referer_add_variables,        /* preconfiguration */
     NULL,                                  /* postconfiguration */
 
     NULL,                                  /* create main configuration */
@@ -107,6 +108,9 @@ ngx_module_t  ngx_http_referer_module = {
 };
 
 
+static ngx_str_t  ngx_http_invalid_referer_name = ngx_string("invalid_referer");
+
+
 static ngx_int_t
 ngx_http_referer_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
     uintptr_t data)
@@ -263,6 +267,23 @@ valid:
 }
 
 
+static ngx_int_t
+ngx_http_referer_add_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t  *var;
+
+    var = ngx_http_add_variable(cf, &ngx_http_invalid_referer_name,
+                                NGX_HTTP_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_ERROR;
+    }
+
+    var->get_handler = ngx_http_referer_variable;
+
+    return NGX_OK;
+}
+
+
 static void *
 ngx_http_referer_create_conf(ngx_conf_t *cf)
 {
@@ -452,19 +473,9 @@ ngx_http_valid_referers(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_http_referer_conf_t  *rlcf = conf;
 
-    u_char                    *p;
-    ngx_str_t                 *value, uri, name;
-    ngx_uint_t                 i;
-    ngx_http_variable_t       *var;
-
-    ngx_str_set(&name, "invalid_referer");
-
-    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
-    if (var == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    var->get_handler = ngx_http_referer_variable;
+    u_char      *p;
+    ngx_str_t   *value, uri;
+    ngx_uint_t   i;
 
     if (rlcf->keys == NULL) {
         rlcf->keys = ngx_pcalloc(cf->temp_pool, sizeof(ngx_hash_keys_arrays_t));
diff --git a/src/http/modules/ngx_http_slice_filter_module.c b/src/http/modules/ngx_http_slice_filter_module.c
index 7758342..c1edbca 100644
--- a/src/http/modules/ngx_http_slice_filter_module.c
+++ b/src/http/modules/ngx_http_slice_filter_module.c
@@ -190,6 +190,8 @@ ngx_http_slice_header_filter(ngx_http_request_t *r)
         return rc;
     }
 
+    r->preserve_body = 1;
+
     if (r->headers_out.status == NGX_HTTP_PARTIAL_CONTENT) {
         if (ctx->start + (off_t) slcf->size <= r->headers_out.content_offset) {
             ctx->start = slcf->size
@@ -317,7 +319,7 @@ ngx_http_slice_parse_content_range(ngx_http_request_t *r,
             return NGX_ERROR;
         }
 
-        start = start * 10 + *p++ - '0';
+        start = start * 10 + (*p++ - '0');
     }
 
     while (*p == ' ') { p++; }
@@ -337,7 +339,7 @@ ngx_http_slice_parse_content_range(ngx_http_request_t *r,
             return NGX_ERROR;
         }
 
-        end = end * 10 + *p++ - '0';
+        end = end * 10 + (*p++ - '0');
     }
 
     end++;
@@ -362,7 +364,7 @@ ngx_http_slice_parse_content_range(ngx_http_request_t *r,
                 return NGX_ERROR;
             }
 
-            complete_length = complete_length * 10 + *p++ - '0';
+            complete_length = complete_length * 10 + (*p++ - '0');
         }
 
     } else {
@@ -479,7 +481,7 @@ ngx_http_slice_get_start(ngx_http_request_t *r)
             return 0;
         }
 
-        start = start * 10 + *p++ - '0';
+        start = start * 10 + (*p++ - '0');
     }
 
     return start;
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index b92ad4c..e29e173 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -321,7 +321,7 @@ static ngx_http_variable_t  ngx_http_ssi_vars[] = {
     { ngx_string("date_gmt"), NULL, ngx_http_ssi_date_gmt_local_variable, 1,
       NGX_HTTP_VAR_NOCACHEABLE, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
@@ -370,6 +370,8 @@ ngx_http_ssi_header_filter(ngx_http_request_t *r)
         ngx_http_clear_content_length(r);
         ngx_http_clear_accept_ranges(r);
 
+        r->preserve_body = 1;
+
         if (!slcf->last_modified) {
             ngx_http_clear_last_modified(r);
             ngx_http_clear_etag(r);
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index b466e5d..4370275 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -329,7 +329,7 @@ static ngx_http_variable_t  ngx_http_ssl_vars[] = {
     { ngx_string("ssl_client_v_remain"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_client_v_remain, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
diff --git a/src/http/modules/ngx_http_stub_status_module.c b/src/http/modules/ngx_http_stub_status_module.c
index 61199f2..9bdf881 100644
--- a/src/http/modules/ngx_http_stub_status_module.c
+++ b/src/http/modules/ngx_http_stub_status_module.c
@@ -76,7 +76,7 @@ static ngx_http_variable_t  ngx_http_stub_status_vars[] = {
     { ngx_string("connections_waiting"), NULL, ngx_http_stub_status_variable,
       3, NGX_HTTP_VAR_NOCACHEABLE, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
diff --git a/src/http/modules/ngx_http_try_files_module.c b/src/http/modules/ngx_http_try_files_module.c
new file mode 100644
index 0000000..ce783a2
--- /dev/null
+++ b/src/http/modules/ngx_http_try_files_module.c
@@ -0,0 +1,404 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    ngx_array_t           *lengths;
+    ngx_array_t           *values;
+    ngx_str_t              name;
+
+    unsigned               code:10;
+    unsigned               test_dir:1;
+} ngx_http_try_file_t;
+
+
+typedef struct {
+    ngx_http_try_file_t   *try_files;
+} ngx_http_try_files_loc_conf_t;
+
+
+static ngx_int_t ngx_http_try_files_handler(ngx_http_request_t *r);
+static char *ngx_http_try_files(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+static void *ngx_http_try_files_create_loc_conf(ngx_conf_t *cf);
+static ngx_int_t ngx_http_try_files_init(ngx_conf_t *cf);
+
+
+static ngx_command_t  ngx_http_try_files_commands[] = {
+
+    { ngx_string("try_files"),
+      NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE,
+      ngx_http_try_files,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_try_files_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_http_try_files_init,               /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    ngx_http_try_files_create_loc_conf,    /* create location configuration */
+    NULL                                   /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_try_files_module = {
+    NGX_MODULE_V1,
+    &ngx_http_try_files_module_ctx,        /* module context */
+    ngx_http_try_files_commands,           /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_http_try_files_handler(ngx_http_request_t *r)
+{
+    size_t                          len, root, alias, reserve, allocated;
+    u_char                         *p, *name;
+    ngx_str_t                       path, args;
+    ngx_uint_t                      test_dir;
+    ngx_http_try_file_t            *tf;
+    ngx_open_file_info_t            of;
+    ngx_http_script_code_pt         code;
+    ngx_http_script_engine_t        e;
+    ngx_http_core_loc_conf_t       *clcf;
+    ngx_http_script_len_code_pt     lcode;
+    ngx_http_try_files_loc_conf_t  *tlcf;
+
+    tlcf = ngx_http_get_module_loc_conf(r, ngx_http_try_files_module);
+
+    if (tlcf->try_files == NULL) {
+        return NGX_DECLINED;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "try files handler");
+
+    allocated = 0;
+    root = 0;
+    name = NULL;
+    /* suppress MSVC warning */
+    path.data = NULL;
+
+    tf = tlcf->try_files;
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    alias = clcf->alias;
+
+    for ( ;; ) {
+
+        if (tf->lengths) {
+            ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
+
+            e.ip = tf->lengths->elts;
+            e.request = r;
+
+            /* 1 is for terminating '\0' as in static names */
+            len = 1;
+
+            while (*(uintptr_t *) e.ip) {
+                lcode = *(ngx_http_script_len_code_pt *) e.ip;
+                len += lcode(&e);
+            }
+
+        } else {
+            len = tf->name.len;
+        }
+
+        if (!alias) {
+            reserve = len > r->uri.len ? len - r->uri.len : 0;
+
+        } else if (alias == NGX_MAX_SIZE_T_VALUE) {
+            reserve = len;
+
+        } else {
+            reserve = len > r->uri.len - alias ? len - (r->uri.len - alias) : 0;
+        }
+
+        if (reserve > allocated || !allocated) {
+
+            /* 16 bytes are preallocation */
+            allocated = reserve + 16;
+
+            if (ngx_http_map_uri_to_path(r, &path, &root, allocated) == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            name = path.data + root;
+        }
+
+        if (tf->values == NULL) {
+
+            /* tf->name.len includes the terminating '\0' */
+
+            ngx_memcpy(name, tf->name.data, tf->name.len);
+
+            path.len = (name + tf->name.len - 1) - path.data;
+
+        } else {
+            e.ip = tf->values->elts;
+            e.pos = name;
+            e.flushed = 1;
+
+            while (*(uintptr_t *) e.ip) {
+                code = *(ngx_http_script_code_pt *) e.ip;
+                code((ngx_http_script_engine_t *) &e);
+            }
+
+            path.len = e.pos - path.data;
+
+            *e.pos = '\0';
+
+            if (alias && alias != NGX_MAX_SIZE_T_VALUE
+                && ngx_strncmp(name, r->uri.data, alias) == 0)
+            {
+                ngx_memmove(name, name + alias, len - alias);
+                path.len -= alias;
+            }
+        }
+
+        test_dir = tf->test_dir;
+
+        tf++;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "trying to use %s: \"%s\" \"%s\"",
+                       test_dir ? "dir" : "file", name, path.data);
+
+        if (tf->lengths == NULL && tf->name.len == 0) {
+
+            if (tf->code) {
+                return tf->code;
+            }
+
+            path.len -= root;
+            path.data += root;
+
+            if (path.data[0] == '@') {
+                (void) ngx_http_named_location(r, &path);
+
+            } else {
+                ngx_http_split_args(r, &path, &args);
+
+                (void) ngx_http_internal_redirect(r, &path, &args);
+            }
+
+            ngx_http_finalize_request(r, NGX_DONE);
+            return NGX_DONE;
+        }
+
+        ngx_memzero(&of, sizeof(ngx_open_file_info_t));
+
+        of.read_ahead = clcf->read_ahead;
+        of.directio = clcf->directio;
+        of.valid = clcf->open_file_cache_valid;
+        of.min_uses = clcf->open_file_cache_min_uses;
+        of.test_only = 1;
+        of.errors = clcf->open_file_cache_errors;
+        of.events = clcf->open_file_cache_events;
+
+        if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
+            != NGX_OK)
+        {
+            if (of.err == 0) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            if (of.err != NGX_ENOENT
+                && of.err != NGX_ENOTDIR
+                && of.err != NGX_ENAMETOOLONG)
+            {
+                ngx_log_error(NGX_LOG_CRIT, r->connection->log, of.err,
+                              "%s \"%s\" failed", of.failed, path.data);
+            }
+
+            continue;
+        }
+
+        if (of.is_dir != test_dir) {
+            continue;
+        }
+
+        path.len -= root;
+        path.data += root;
+
+        if (!alias) {
+            r->uri = path;
+
+        } else if (alias == NGX_MAX_SIZE_T_VALUE) {
+            if (!test_dir) {
+                r->uri = path;
+                r->add_uri_to_alias = 1;
+            }
+
+        } else {
+            name = r->uri.data;
+
+            r->uri.len = alias + path.len;
+            r->uri.data = ngx_pnalloc(r->pool, r->uri.len);
+            if (r->uri.data == NULL) {
+                r->uri.len = 0;
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            p = ngx_copy(r->uri.data, name, alias);
+            ngx_memcpy(p, path.data, path.len);
+        }
+
+        ngx_http_set_exten(r);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "try file uri: \"%V\"", &r->uri);
+
+        return NGX_DECLINED;
+    }
+
+    /* not reached */
+}
+
+
+static char *
+ngx_http_try_files(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_try_files_loc_conf_t *tlcf = conf;
+
+    ngx_str_t                  *value;
+    ngx_int_t                   code;
+    ngx_uint_t                  i, n;
+    ngx_http_try_file_t        *tf;
+    ngx_http_script_compile_t   sc;
+
+    if (tlcf->try_files) {
+        return "is duplicate";
+    }
+
+    tf = ngx_pcalloc(cf->pool, cf->args->nelts * sizeof(ngx_http_try_file_t));
+    if (tf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    tlcf->try_files = tf;
+
+    value = cf->args->elts;
+
+    for (i = 0; i < cf->args->nelts - 1; i++) {
+
+        tf[i].name = value[i + 1];
+
+        if (tf[i].name.len > 0
+            && tf[i].name.data[tf[i].name.len - 1] == '/'
+            && i + 2 < cf->args->nelts)
+        {
+            tf[i].test_dir = 1;
+            tf[i].name.len--;
+            tf[i].name.data[tf[i].name.len] = '\0';
+        }
+
+        n = ngx_http_script_variables_count(&tf[i].name);
+
+        if (n) {
+            ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
+
+            sc.cf = cf;
+            sc.source = &tf[i].name;
+            sc.lengths = &tf[i].lengths;
+            sc.values = &tf[i].values;
+            sc.variables = n;
+            sc.complete_lengths = 1;
+            sc.complete_values = 1;
+
+            if (ngx_http_script_compile(&sc) != NGX_OK) {
+                return NGX_CONF_ERROR;
+            }
+
+        } else {
+            /* add trailing '\0' to length */
+            tf[i].name.len++;
+        }
+    }
+
+    if (tf[i - 1].name.data[0] == '=') {
+
+        code = ngx_atoi(tf[i - 1].name.data + 1, tf[i - 1].name.len - 2);
+
+        if (code == NGX_ERROR || code > 999) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid code \"%*s\"",
+                               tf[i - 1].name.len - 1, tf[i - 1].name.data);
+            return NGX_CONF_ERROR;
+        }
+
+        tf[i].code = code;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_http_try_files_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_try_files_loc_conf_t  *tlcf;
+
+    tlcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_try_files_loc_conf_t));
+    if (tlcf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     tlcf->try_files = NULL;
+     */
+
+    return tlcf;
+}
+
+
+static ngx_int_t
+ngx_http_try_files_init(ngx_conf_t *cf)
+{
+    ngx_http_handler_pt        *h;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_HTTP_PRECONTENT_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_http_try_files_handler;
+
+    return NGX_OK;
+}
diff --git a/src/http/modules/ngx_http_upstream_zone_module.c b/src/http/modules/ngx_http_upstream_zone_module.c
index 7e5bd74..d340b48 100644
--- a/src/http/modules/ngx_http_upstream_zone_module.c
+++ b/src/http/modules/ngx_http_upstream_zone_module.c
@@ -16,6 +16,8 @@ static ngx_int_t ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone,
     void *data);
 static ngx_http_upstream_rr_peers_t *ngx_http_upstream_zone_copy_peers(
     ngx_slab_pool_t *shpool, ngx_http_upstream_srv_conf_t *uscf);
+static ngx_http_upstream_rr_peer_t *ngx_http_upstream_zone_copy_peer(
+    ngx_http_upstream_rr_peers_t *peers, ngx_http_upstream_rr_peer_t *src);
 
 
 static ngx_command_t  ngx_http_upstream_zone_commands[] = {
@@ -185,6 +187,7 @@ static ngx_http_upstream_rr_peers_t *
 ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
     ngx_http_upstream_srv_conf_t *uscf)
 {
+    ngx_str_t                     *name;
     ngx_http_upstream_rr_peer_t   *peer, **peerp;
     ngx_http_upstream_rr_peers_t  *peers, *backup;
 
@@ -195,18 +198,30 @@ ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
 
     ngx_memcpy(peers, uscf->peer.data, sizeof(ngx_http_upstream_rr_peers_t));
 
+    name = ngx_slab_alloc(shpool, sizeof(ngx_str_t));
+    if (name == NULL) {
+        return NULL;
+    }
+
+    name->data = ngx_slab_alloc(shpool, peers->name->len);
+    if (name->data == NULL) {
+        return NULL;
+    }
+
+    ngx_memcpy(name->data, peers->name->data, peers->name->len);
+    name->len = peers->name->len;
+
+    peers->name = name;
+
     peers->shpool = shpool;
 
     for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
         /* pool is unlocked */
-        peer = ngx_slab_calloc_locked(shpool,
-                                      sizeof(ngx_http_upstream_rr_peer_t));
+        peer = ngx_http_upstream_zone_copy_peer(peers, *peerp);
         if (peer == NULL) {
             return NULL;
         }
 
-        ngx_memcpy(peer, *peerp, sizeof(ngx_http_upstream_rr_peer_t));
-
         *peerp = peer;
     }
 
@@ -221,18 +236,17 @@ ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
 
     ngx_memcpy(backup, peers->next, sizeof(ngx_http_upstream_rr_peers_t));
 
+    backup->name = name;
+
     backup->shpool = shpool;
 
     for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
         /* pool is unlocked */
-        peer = ngx_slab_calloc_locked(shpool,
-                                      sizeof(ngx_http_upstream_rr_peer_t));
+        peer = ngx_http_upstream_zone_copy_peer(backup, *peerp);
         if (peer == NULL) {
             return NULL;
         }
 
-        ngx_memcpy(peer, *peerp, sizeof(ngx_http_upstream_rr_peer_t));
-
         *peerp = peer;
     }
 
@@ -244,3 +258,68 @@ done:
 
     return peers;
 }
+
+
+static ngx_http_upstream_rr_peer_t *
+ngx_http_upstream_zone_copy_peer(ngx_http_upstream_rr_peers_t *peers,
+    ngx_http_upstream_rr_peer_t *src)
+{
+    ngx_slab_pool_t              *pool;
+    ngx_http_upstream_rr_peer_t  *dst;
+
+    pool = peers->shpool;
+
+    dst = ngx_slab_calloc_locked(pool, sizeof(ngx_http_upstream_rr_peer_t));
+    if (dst == NULL) {
+        return NULL;
+    }
+
+    if (src) {
+        ngx_memcpy(dst, src, sizeof(ngx_http_upstream_rr_peer_t));
+        dst->sockaddr = NULL;
+        dst->name.data = NULL;
+        dst->server.data = NULL;
+    }
+
+    dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN);
+    if (dst->sockaddr == NULL) {
+        goto failed;
+    }
+
+    dst->name.data = ngx_slab_calloc_locked(pool, NGX_SOCKADDR_STRLEN);
+    if (dst->name.data == NULL) {
+        goto failed;
+    }
+
+    if (src) {
+        ngx_memcpy(dst->sockaddr, src->sockaddr, src->socklen);
+        ngx_memcpy(dst->name.data, src->name.data, src->name.len);
+
+        dst->server.data = ngx_slab_alloc_locked(pool, src->server.len);
+        if (dst->server.data == NULL) {
+            goto failed;
+        }
+
+        ngx_memcpy(dst->server.data, src->server.data, src->server.len);
+    }
+
+    return dst;
+
+failed:
+
+    if (dst->server.data) {
+        ngx_slab_free_locked(pool, dst->server.data);
+    }
+
+    if (dst->name.data) {
+        ngx_slab_free_locked(pool, dst->name.data);
+    }
+
+    if (dst->sockaddr) {
+        ngx_slab_free_locked(pool, dst->sockaddr);
+    }
+
+    ngx_slab_free_locked(pool, dst);
+
+    return NULL;
+}
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index c036389..9d8b6d7 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -382,6 +382,13 @@ ngx_http_init_phases(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf)
         return NGX_ERROR;
     }
 
+    if (ngx_array_init(&cmcf->phases[NGX_HTTP_PRECONTENT_PHASE].handlers,
+                       cf->pool, 2, sizeof(ngx_http_handler_pt))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     if (ngx_array_init(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers,
                        cf->pool, 4, sizeof(ngx_http_handler_pt))
         != NGX_OK)
@@ -459,8 +466,7 @@ ngx_http_init_phase_handlers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf)
 
     n = 1                  /* find config phase */
         + use_rewrite      /* post rewrite phase */
-        + use_access       /* post access phase */
-        + cmcf->try_files;
+        + use_access;      /* post access phase */
 
     for (i = 0; i < NGX_HTTP_LOG_PHASE; i++) {
         n += cmcf->phases[i].handlers.nelts;
@@ -529,15 +535,6 @@ ngx_http_init_phase_handlers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf)
 
             continue;
 
-        case NGX_HTTP_TRY_FILES_PHASE:
-            if (cmcf->try_files) {
-                ph->checker = ngx_http_core_try_files_phase;
-                n++;
-                ph++;
-            }
-
-            continue;
-
         case NGX_HTTP_CONTENT_PHASE:
             checker = ngx_http_core_content_phase;
             break;
@@ -548,7 +545,7 @@ ngx_http_init_phase_handlers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf)
 
         n += cmcf->phases[i].handlers.nelts;
 
-        for (j = cmcf->phases[i].handlers.nelts - 1; j >=0; j--) {
+        for (j = cmcf->phases[i].handlers.nelts - 1; j >= 0; j--) {
             ph->checker = checker;
             ph->handler = h[j];
             ph->next = n;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 02059ef..57a4742 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -61,8 +61,6 @@ static char *ngx_http_core_directio(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
-static char *ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
 static char *ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_core_error_log(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -649,13 +647,6 @@ static ngx_command_t  ngx_http_core_commands[] = {
       0,
       NULL },
 
-    { ngx_string("try_files"),
-      NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE,
-      ngx_http_core_try_files,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-
     { ngx_string("post_action"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
                         |NGX_CONF_TAKE1,
@@ -1158,223 +1149,6 @@ ngx_http_core_post_access_phase(ngx_http_request_t *r,
 }
 
 
-ngx_int_t
-ngx_http_core_try_files_phase(ngx_http_request_t *r,
-    ngx_http_phase_handler_t *ph)
-{
-    size_t                        len, root, alias, reserve, allocated;
-    u_char                       *p, *name;
-    ngx_str_t                     path, args;
-    ngx_uint_t                    test_dir;
-    ngx_http_try_file_t          *tf;
-    ngx_open_file_info_t          of;
-    ngx_http_script_code_pt       code;
-    ngx_http_script_engine_t      e;
-    ngx_http_core_loc_conf_t     *clcf;
-    ngx_http_script_len_code_pt   lcode;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "try files phase: %ui", r->phase_handler);
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-    if (clcf->try_files == NULL) {
-        r->phase_handler++;
-        return NGX_AGAIN;
-    }
-
-    allocated = 0;
-    root = 0;
-    name = NULL;
-    /* suppress MSVC warning */
-    path.data = NULL;
-
-    tf = clcf->try_files;
-
-    alias = clcf->alias;
-
-    for ( ;; ) {
-
-        if (tf->lengths) {
-            ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
-
-            e.ip = tf->lengths->elts;
-            e.request = r;
-
-            /* 1 is for terminating '\0' as in static names */
-            len = 1;
-
-            while (*(uintptr_t *) e.ip) {
-                lcode = *(ngx_http_script_len_code_pt *) e.ip;
-                len += lcode(&e);
-            }
-
-        } else {
-            len = tf->name.len;
-        }
-
-        if (!alias) {
-            reserve = len > r->uri.len ? len - r->uri.len : 0;
-
-        } else if (alias == NGX_MAX_SIZE_T_VALUE) {
-            reserve = len;
-
-        } else {
-            reserve = len > r->uri.len - alias ? len - (r->uri.len - alias) : 0;
-        }
-
-        if (reserve > allocated || !allocated) {
-
-            /* 16 bytes are preallocation */
-            allocated = reserve + 16;
-
-            if (ngx_http_map_uri_to_path(r, &path, &root, allocated) == NULL) {
-                ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                return NGX_OK;
-            }
-
-            name = path.data + root;
-        }
-
-        if (tf->values == NULL) {
-
-            /* tf->name.len includes the terminating '\0' */
-
-            ngx_memcpy(name, tf->name.data, tf->name.len);
-
-            path.len = (name + tf->name.len - 1) - path.data;
-
-        } else {
-            e.ip = tf->values->elts;
-            e.pos = name;
-            e.flushed = 1;
-
-            while (*(uintptr_t *) e.ip) {
-                code = *(ngx_http_script_code_pt *) e.ip;
-                code((ngx_http_script_engine_t *) &e);
-            }
-
-            path.len = e.pos - path.data;
-
-            *e.pos = '\0';
-
-            if (alias && alias != NGX_MAX_SIZE_T_VALUE
-                && ngx_strncmp(name, r->uri.data, alias) == 0)
-            {
-                ngx_memmove(name, name + alias, len - alias);
-                path.len -= alias;
-            }
-        }
-
-        test_dir = tf->test_dir;
-
-        tf++;
-
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "trying to use %s: \"%s\" \"%s\"",
-                       test_dir ? "dir" : "file", name, path.data);
-
-        if (tf->lengths == NULL && tf->name.len == 0) {
-
-            if (tf->code) {
-                ngx_http_finalize_request(r, tf->code);
-                return NGX_OK;
-            }
-
-            path.len -= root;
-            path.data += root;
-
-            if (path.data[0] == '@') {
-                (void) ngx_http_named_location(r, &path);
-
-            } else {
-                ngx_http_split_args(r, &path, &args);
-
-                (void) ngx_http_internal_redirect(r, &path, &args);
-            }
-
-            ngx_http_finalize_request(r, NGX_DONE);
-            return NGX_OK;
-        }
-
-        ngx_memzero(&of, sizeof(ngx_open_file_info_t));
-
-        of.read_ahead = clcf->read_ahead;
-        of.directio = clcf->directio;
-        of.valid = clcf->open_file_cache_valid;
-        of.min_uses = clcf->open_file_cache_min_uses;
-        of.test_only = 1;
-        of.errors = clcf->open_file_cache_errors;
-        of.events = clcf->open_file_cache_events;
-
-        if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) {
-            ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-            return NGX_OK;
-        }
-
-        if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
-            != NGX_OK)
-        {
-            if (of.err == 0) {
-                ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                return NGX_OK;
-            }
-
-            if (of.err != NGX_ENOENT
-                && of.err != NGX_ENOTDIR
-                && of.err != NGX_ENAMETOOLONG)
-            {
-                ngx_log_error(NGX_LOG_CRIT, r->connection->log, of.err,
-                              "%s \"%s\" failed", of.failed, path.data);
-            }
-
-            continue;
-        }
-
-        if (of.is_dir != test_dir) {
-            continue;
-        }
-
-        path.len -= root;
-        path.data += root;
-
-        if (!alias) {
-            r->uri = path;
-
-        } else if (alias == NGX_MAX_SIZE_T_VALUE) {
-            if (!test_dir) {
-                r->uri = path;
-                r->add_uri_to_alias = 1;
-            }
-
-        } else {
-            name = r->uri.data;
-
-            r->uri.len = alias + path.len;
-            r->uri.data = ngx_pnalloc(r->pool, r->uri.len);
-            if (r->uri.data == NULL) {
-                r->uri.len = 0;
-                ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                return NGX_OK;
-            }
-
-            p = ngx_copy(r->uri.data, name, alias);
-            ngx_memcpy(p, path.data, path.len);
-        }
-
-        ngx_http_set_exten(r);
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "try file uri: \"%V\"", &r->uri);
-
-        r->phase_handler++;
-        return NGX_AGAIN;
-    }
-
-    /* not reached */
-}
-
-
 ngx_int_t
 ngx_http_core_content_phase(ngx_http_request_t *r,
     ngx_http_phase_handler_t *ph)
@@ -3561,7 +3335,6 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
      *     clcf->default_type = { 0, NULL };
      *     clcf->error_log = NULL;
      *     clcf->error_pages = NULL;
-     *     clcf->try_files = NULL;
      *     clcf->client_body_path = NULL;
      *     clcf->regex = NULL;
      *     clcf->exact_match = 0;
@@ -4884,89 +4657,6 @@ ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
-static char *
-ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_core_loc_conf_t *clcf = conf;
-
-    ngx_str_t                  *value;
-    ngx_int_t                   code;
-    ngx_uint_t                  i, n;
-    ngx_http_try_file_t        *tf;
-    ngx_http_script_compile_t   sc;
-    ngx_http_core_main_conf_t  *cmcf;
-
-    if (clcf->try_files) {
-        return "is duplicate";
-    }
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    cmcf->try_files = 1;
-
-    tf = ngx_pcalloc(cf->pool, cf->args->nelts * sizeof(ngx_http_try_file_t));
-    if (tf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    clcf->try_files = tf;
-
-    value = cf->args->elts;
-
-    for (i = 0; i < cf->args->nelts - 1; i++) {
-
-        tf[i].name = value[i + 1];
-
-        if (tf[i].name.len > 0
-            && tf[i].name.data[tf[i].name.len - 1] == '/'
-            && i + 2 < cf->args->nelts)
-        {
-            tf[i].test_dir = 1;
-            tf[i].name.len--;
-            tf[i].name.data[tf[i].name.len] = '\0';
-        }
-
-        n = ngx_http_script_variables_count(&tf[i].name);
-
-        if (n) {
-            ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
-
-            sc.cf = cf;
-            sc.source = &tf[i].name;
-            sc.lengths = &tf[i].lengths;
-            sc.values = &tf[i].values;
-            sc.variables = n;
-            sc.complete_lengths = 1;
-            sc.complete_values = 1;
-
-            if (ngx_http_script_compile(&sc) != NGX_OK) {
-                return NGX_CONF_ERROR;
-            }
-
-        } else {
-            /* add trailing '\0' to length */
-            tf[i].name.len++;
-        }
-    }
-
-    if (tf[i - 1].name.data[0] == '=') {
-
-        code = ngx_atoi(tf[i - 1].name.data + 1, tf[i - 1].name.len - 2);
-
-        if (code == NGX_ERROR || code > 999) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid code \"%*s\"",
-                               tf[i - 1].name.len - 1, tf[i - 1].name.data);
-            return NGX_CONF_ERROR;
-        }
-
-        tf[i].code = code;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
 static char *
 ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 5018da0..a6128b5 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -119,7 +119,8 @@ typedef enum {
     NGX_HTTP_ACCESS_PHASE,
     NGX_HTTP_POST_ACCESS_PHASE,
 
-    NGX_HTTP_TRY_FILES_PHASE,
+    NGX_HTTP_PRECONTENT_PHASE,
+
     NGX_HTTP_CONTENT_PHASE,
 
     NGX_HTTP_LOG_PHASE
@@ -172,8 +173,6 @@ typedef struct {
 
     ngx_array_t               *ports;
 
-    ngx_uint_t                 try_files;       /* unsigned  try_files:1 */
-
     ngx_http_phase_t           phases[NGX_HTTP_LOG_PHASE + 1];
 } ngx_http_core_main_conf_t;
 
@@ -296,16 +295,6 @@ typedef struct {
 } ngx_http_err_page_t;
 
 
-typedef struct {
-    ngx_array_t               *lengths;
-    ngx_array_t               *values;
-    ngx_str_t                  name;
-
-    unsigned                   code:10;
-    unsigned                   test_dir:1;
-} ngx_http_try_file_t;
-
-
 struct ngx_http_core_loc_conf_s {
     ngx_str_t     name;          /* location name */
 
@@ -425,7 +414,6 @@ struct ngx_http_core_loc_conf_s {
 #endif
 
     ngx_array_t  *error_pages;             /* error_page */
-    ngx_http_try_file_t    *try_files;     /* try_files */
 
     ngx_path_t   *client_body_temp_path;   /* client_body_temp_path */
 
@@ -486,8 +474,6 @@ ngx_int_t ngx_http_core_access_phase(ngx_http_request_t *r,
     ngx_http_phase_handler_t *ph);
 ngx_int_t ngx_http_core_post_access_phase(ngx_http_request_t *r,
     ngx_http_phase_handler_t *ph);
-ngx_int_t ngx_http_core_try_files_phase(ngx_http_request_t *r,
-    ngx_http_phase_handler_t *ph);
 ngx_int_t ngx_http_core_content_phase(ngx_http_request_t *r,
     ngx_http_phase_handler_t *ph);
 
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index a823c51..3b2b68a 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -129,6 +129,7 @@ ngx_http_file_cache_init(ngx_shm_zone_t *shm_zone, void *data)
     if (shm_zone->shm.exists) {
         cache->sh = cache->shpool->data;
         cache->bsize = ngx_fs_bsize(cache->path->name.data);
+        cache->max_size /= cache->bsize;
 
         return NGX_OK;
     }
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index e8e5156..844054c 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -742,7 +742,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 return NGX_HTTP_PARSE_INVALID_REQUEST;
             }
 
-            r->http_major = r->http_major * 10 + ch - '0';
+            r->http_major = r->http_major * 10 + (ch - '0');
 
             if (r->http_major > 1) {
                 return NGX_HTTP_PARSE_INVALID_VERSION;
@@ -784,7 +784,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 return NGX_HTTP_PARSE_INVALID_REQUEST;
             }
 
-            r->http_minor = r->http_minor * 10 + ch - '0';
+            r->http_minor = r->http_minor * 10 + (ch - '0');
             break;
 
         case sw_spaces_after_digit:
@@ -1518,7 +1518,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
 
         case sw_quoted_second:
             if (ch >= '0' && ch <= '9') {
-                ch = (u_char) ((decoded << 4) + ch - '0');
+                ch = (u_char) ((decoded << 4) + (ch - '0'));
 
                 if (ch == '%' || ch == '#') {
                     state = sw_usual;
@@ -1536,7 +1536,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
 
             c = (u_char) (ch | 0x20);
             if (c >= 'a' && c <= 'f') {
-                ch = (u_char) ((decoded << 4) + c - 'a' + 10);
+                ch = (u_char) ((decoded << 4) + (c - 'a') + 10);
 
                 if (ch == '?') {
                     state = sw_usual;
@@ -1701,7 +1701,7 @@ ngx_http_parse_status_line(ngx_http_request_t *r, ngx_buf_t *b,
                 return NGX_ERROR;
             }
 
-            r->http_major = r->http_major * 10 + ch - '0';
+            r->http_major = r->http_major * 10 + (ch - '0');
             break;
 
         /* the first digit of minor HTTP version */
@@ -1729,7 +1729,7 @@ ngx_http_parse_status_line(ngx_http_request_t *r, ngx_buf_t *b,
                 return NGX_ERROR;
             }
 
-            r->http_minor = r->http_minor * 10 + ch - '0';
+            r->http_minor = r->http_minor * 10 + (ch - '0');
             break;
 
         /* HTTP status code */
@@ -1742,7 +1742,7 @@ ngx_http_parse_status_line(ngx_http_request_t *r, ngx_buf_t *b,
                 return NGX_ERROR;
             }
 
-            status->code = status->code * 10 + ch - '0';
+            status->code = status->code * 10 + (ch - '0');
 
             if (++status->count == 3) {
                 state = sw_space_after_status;
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index f7f3e97..421004a 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -537,6 +537,7 @@ struct ngx_http_request_s {
     unsigned                          main_filter_need_in_memory:1;
     unsigned                          filter_need_in_memory:1;
     unsigned                          filter_need_temporary:1;
+    unsigned                          preserve_body:1;
     unsigned                          allow_ranges:1;
     unsigned                          subrequest_ranges:1;
     unsigned                          single_range:1;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index c394b29..6a2b322 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -427,7 +427,7 @@ static ngx_http_variable_t  ngx_http_upstream_vars[] = {
     { ngx_string("upstream_cookie_"), NULL, ngx_http_upstream_cookie_variable,
       0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
@@ -1077,6 +1077,10 @@ ngx_http_upstream_cache_background_update(ngx_http_request_t *r,
         return NGX_OK;
     }
 
+    if (r == r->main) {
+        r->preserve_body = 1;
+    }
+
     if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL,
                             NGX_HTTP_SUBREQUEST_CLONE
                             |NGX_HTTP_SUBREQUEST_BACKGROUND)
@@ -2857,7 +2861,9 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
         u->pipe->downstream_error = 1;
     }
 
-    if (r->request_body && r->request_body->temp_file) {
+    if (r->request_body && r->request_body->temp_file
+        && r == r->main && !r->preserve_body)
+    {
         ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd);
         r->request_body->temp_file->file.fd = NGX_INVALID_FILE;
     }
@@ -4503,7 +4509,7 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
             }
 
             if (*p >= '0' && *p <= '9') {
-                n = n * 10 + *p - '0';
+                n = n * 10 + (*p - '0');
                 continue;
             }
 
@@ -4531,7 +4537,7 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
             }
 
             if (*p >= '0' && *p <= '9') {
-                n = n * 10 + *p - '0';
+                n = n * 10 + (*p - '0');
                 continue;
             }
 
@@ -4554,7 +4560,7 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
             }
 
             if (*p >= '0' && *p <= '9') {
-                n = n * 10 + *p - '0';
+                n = n * 10 + (*p - '0');
                 continue;
             }
 
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index fbc9ffa..afeb4ce 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -376,7 +376,7 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("arg_"), NULL, ngx_http_variable_argument,
       0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
diff --git a/src/http/ngx_http_variables.h b/src/http/ngx_http_variables.h
index df337de..f3f7f3c 100644
--- a/src/http/ngx_http_variables.h
+++ b/src/http/ngx_http_variables.h
@@ -43,6 +43,8 @@ struct ngx_http_variable_s {
     ngx_uint_t                    index;
 };
 
+#define ngx_http_null_variable  { ngx_null_string, NULL, NULL, 0, 0, 0 }
+
 
 ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name,
     ngx_uint_t flags);
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
index 032abcb..7f7dab2 100644
--- a/src/http/v2/ngx_http_v2_module.c
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -225,7 +225,7 @@ static ngx_http_variable_t  ngx_http_v2_vars[] = {
     { ngx_string("http2"), NULL,
       ngx_http_v2_variable, 0, 0, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_http_null_variable
 };
 
 
diff --git a/src/misc/ngx_google_perftools_module.c b/src/misc/ngx_google_perftools_module.c
index f2f8221..381f3d1 100644
--- a/src/misc/ngx_google_perftools_module.c
+++ b/src/misc/ngx_google_perftools_module.c
@@ -36,7 +36,7 @@ static ngx_command_t  ngx_google_perftools_commands[] = {
       offsetof(ngx_google_perftools_conf_t, profiles),
       NULL },
 
-    ngx_null_command
+      ngx_null_command
 };
 
 
diff --git a/src/stream/ngx_stream_geoip_module.c b/src/stream/ngx_stream_geoip_module.c
index f694033..6507b71 100644
--- a/src/stream/ngx_stream_geoip_module.c
+++ b/src/stream/ngx_stream_geoip_module.c
@@ -210,7 +210,7 @@ static ngx_stream_variable_t  ngx_stream_geoip_vars[] = {
       ngx_stream_geoip_city_int_variable,
       offsetof(GeoIPRecord, area_code), 0, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_stream_null_variable
 };
 
 
diff --git a/src/stream/ngx_stream_realip_module.c b/src/stream/ngx_stream_realip_module.c
index 1266605..57b1ac2 100644
--- a/src/stream/ngx_stream_realip_module.c
+++ b/src/stream/ngx_stream_realip_module.c
@@ -89,7 +89,7 @@ static ngx_stream_variable_t  ngx_stream_realip_vars[] = {
     { ngx_string("realip_remote_port"), NULL,
       ngx_stream_realip_remote_port_variable, 0, 0, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_stream_null_variable
 };
 
 
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index da26a41..010b98b 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -273,7 +273,7 @@ static ngx_stream_variable_t  ngx_stream_ssl_vars[] = {
     { ngx_string("ssl_client_v_remain"), NULL, ngx_stream_ssl_variable,
       (uintptr_t) ngx_ssl_get_client_v_remain, NGX_STREAM_VAR_CHANGEABLE, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_stream_null_variable
 };
 
 
diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c
index 2040b4f..e3d11fd 100644
--- a/src/stream/ngx_stream_ssl_preread_module.c
+++ b/src/stream/ngx_stream_ssl_preread_module.c
@@ -85,7 +85,7 @@ static ngx_stream_variable_t  ngx_stream_ssl_preread_vars[] = {
     { ngx_string("ssl_preread_server_name"), NULL,
       ngx_stream_ssl_preread_server_name_variable, 0, 0, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_stream_null_variable
 };
 
 
diff --git a/src/stream/ngx_stream_upstream.c b/src/stream/ngx_stream_upstream.c
index c9e1784..7feac43 100644
--- a/src/stream/ngx_stream_upstream.c
+++ b/src/stream/ngx_stream_upstream.c
@@ -100,7 +100,7 @@ static ngx_stream_variable_t  ngx_stream_upstream_vars[] = {
       ngx_stream_upstream_bytes_variable, 1,
       NGX_STREAM_VAR_NOCACHEABLE, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_stream_null_variable
 };
 
 
diff --git a/src/stream/ngx_stream_upstream_zone_module.c b/src/stream/ngx_stream_upstream_zone_module.c
index 07ab88d..4f72188 100644
--- a/src/stream/ngx_stream_upstream_zone_module.c
+++ b/src/stream/ngx_stream_upstream_zone_module.c
@@ -16,6 +16,8 @@ static ngx_int_t ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone,
     void *data);
 static ngx_stream_upstream_rr_peers_t *ngx_stream_upstream_zone_copy_peers(
     ngx_slab_pool_t *shpool, ngx_stream_upstream_srv_conf_t *uscf);
+static ngx_stream_upstream_rr_peer_t *ngx_stream_upstream_zone_copy_peer(
+    ngx_stream_upstream_rr_peers_t *peers, ngx_stream_upstream_rr_peer_t *src);
 
 
 static ngx_command_t  ngx_stream_upstream_zone_commands[] = {
@@ -182,6 +184,7 @@ static ngx_stream_upstream_rr_peers_t *
 ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
     ngx_stream_upstream_srv_conf_t *uscf)
 {
+    ngx_str_t                       *name;
     ngx_stream_upstream_rr_peer_t   *peer, **peerp;
     ngx_stream_upstream_rr_peers_t  *peers, *backup;
 
@@ -192,18 +195,30 @@ ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
 
     ngx_memcpy(peers, uscf->peer.data, sizeof(ngx_stream_upstream_rr_peers_t));
 
+    name = ngx_slab_alloc(shpool, sizeof(ngx_str_t));
+    if (name == NULL) {
+        return NULL;
+    }
+
+    name->data = ngx_slab_alloc(shpool, peers->name->len);
+    if (name->data == NULL) {
+        return NULL;
+    }
+
+    ngx_memcpy(name->data, peers->name->data, peers->name->len);
+    name->len = peers->name->len;
+
+    peers->name = name;
+
     peers->shpool = shpool;
 
     for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
         /* pool is unlocked */
-        peer = ngx_slab_calloc_locked(shpool,
-                                      sizeof(ngx_stream_upstream_rr_peer_t));
+        peer = ngx_stream_upstream_zone_copy_peer(peers, *peerp);
         if (peer == NULL) {
             return NULL;
         }
 
-        ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
-
         *peerp = peer;
     }
 
@@ -218,18 +233,17 @@ ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
 
     ngx_memcpy(backup, peers->next, sizeof(ngx_stream_upstream_rr_peers_t));
 
+    backup->name = name;
+
     backup->shpool = shpool;
 
     for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
         /* pool is unlocked */
-        peer = ngx_slab_calloc_locked(shpool,
-                                      sizeof(ngx_stream_upstream_rr_peer_t));
+        peer = ngx_stream_upstream_zone_copy_peer(backup, *peerp);
         if (peer == NULL) {
             return NULL;
         }
 
-        ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
-
         *peerp = peer;
     }
 
@@ -241,3 +255,68 @@ done:
 
     return peers;
 }
+
+
+static ngx_stream_upstream_rr_peer_t *
+ngx_stream_upstream_zone_copy_peer(ngx_stream_upstream_rr_peers_t *peers,
+    ngx_stream_upstream_rr_peer_t *src)
+{
+    ngx_slab_pool_t                *pool;
+    ngx_stream_upstream_rr_peer_t  *dst;
+
+    pool = peers->shpool;
+
+    dst = ngx_slab_calloc_locked(pool, sizeof(ngx_stream_upstream_rr_peer_t));
+    if (dst == NULL) {
+        return NULL;
+    }
+
+    if (src) {
+        ngx_memcpy(dst, src, sizeof(ngx_stream_upstream_rr_peer_t));
+        dst->sockaddr = NULL;
+        dst->name.data = NULL;
+        dst->server.data = NULL;
+    }
+
+    dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN);
+    if (dst->sockaddr == NULL) {
+        goto failed;
+    }
+
+    dst->name.data = ngx_slab_calloc_locked(pool, NGX_SOCKADDR_STRLEN);
+    if (dst->name.data == NULL) {
+        goto failed;
+    }
+
+    if (src) {
+        ngx_memcpy(dst->sockaddr, src->sockaddr, src->socklen);
+        ngx_memcpy(dst->name.data, src->name.data, src->name.len);
+
+        dst->server.data = ngx_slab_alloc_locked(pool, src->server.len);
+        if (dst->server.data == NULL) {
+            goto failed;
+        }
+
+        ngx_memcpy(dst->server.data, src->server.data, src->server.len);
+    }
+
+    return dst;
+
+failed:
+
+    if (dst->server.data) {
+        ngx_slab_free_locked(pool, dst->server.data);
+    }
+
+    if (dst->name.data) {
+        ngx_slab_free_locked(pool, dst->name.data);
+    }
+
+    if (dst->sockaddr) {
+        ngx_slab_free_locked(pool, dst->sockaddr);
+    }
+
+    ngx_slab_free_locked(pool, dst);
+
+    return NULL;
+}
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
index 5d15f3a..45d6e60 100644
--- a/src/stream/ngx_stream_variables.c
+++ b/src/stream/ngx_stream_variables.c
@@ -111,7 +111,7 @@ static ngx_stream_variable_t  ngx_stream_core_variables[] = {
     { ngx_string("protocol"), NULL,
       ngx_stream_variable_protocol, 0, 0, 0 },
 
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+      ngx_stream_null_variable
 };
 
 
diff --git a/src/stream/ngx_stream_variables.h b/src/stream/ngx_stream_variables.h
index 8155111..4ead2a6 100644
--- a/src/stream/ngx_stream_variables.h
+++ b/src/stream/ngx_stream_variables.h
@@ -43,6 +43,8 @@ struct ngx_stream_variable_s {
     ngx_uint_t                    index;
 };
 
+#define ngx_stream_null_variable  { ngx_null_string, NULL, NULL, 0, 0, 0 }
+
 
 ngx_stream_variable_t *ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name,
     ngx_uint_t flags);

From ef8a520c389d205a8e72414aedb4fe133161f41e Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Aug 2017 14:43:20 +0300
Subject: [PATCH 204/600] Add a simple lua autopkgtest

---
 debian/tests/control |  4 ++++
 debian/tests/lua     | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 debian/tests/lua

diff --git a/debian/tests/control b/debian/tests/control
index d276e4f..b491482 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -6,6 +6,10 @@ Tests: ec-x25519
 Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-light, ssl-cert, curl
 
+Tests: lua
+Restrictions: allow-stderr isolation-container needs-root
+Depends: nginx-extras, curl
+
 Tests: full-simple
 Restrictions: allow-stderr isolation-container
 Depends: nginx-full, curl
diff --git a/debian/tests/lua b/debian/tests/lua
new file mode 100644
index 0000000..396d8a9
--- /dev/null
+++ b/debian/tests/lua
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+rm /etc/nginx/sites-enabled/default
+cat <<EOF > "/etc/nginx/sites-enabled/lua"
+server {
+	listen 80 default_server;
+
+	location /ping {
+		content_by_lua 'ngx.say("PONG")';
+	}
+}
+EOF
+
+nginx -t
+nginx -s reload
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/ping

From 2a34dcb90fc48ecf0d078d6b34132dacbe387ce2 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Aug 2017 13:50:13 +0300
Subject: [PATCH 205/600] Discover LuaJIT 2.1 (FTBFS)

Closes: #873319
---
 debian/modules/README.Modules-versions        |  1 +
 .../nginx-lua/discover-luajit-2.1.patch       | 47 +++++++++++++++++++
 debian/modules/patches/nginx-lua/series       |  1 +
 3 files changed, 49 insertions(+)
 create mode 100644 debian/modules/patches/nginx-lua/discover-luajit-2.1.patch

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index c336064..ef2bb91 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -26,6 +26,7 @@ README for Modules versions
   Version: v0.10.7
   Patch: openssl-1.1.0.patch
   Patch: build-nginx-1.11.11.patch
+  Patch: discover-luajit-2.1.patch
 
  nginx-upstream-fair
   Homepage: https://github.com/gnosek/nginx-upstream-fair
diff --git a/debian/modules/patches/nginx-lua/discover-luajit-2.1.patch b/debian/modules/patches/nginx-lua/discover-luajit-2.1.patch
new file mode 100644
index 0000000..4fcbbac
--- /dev/null
+++ b/debian/modules/patches/nginx-lua/discover-luajit-2.1.patch
@@ -0,0 +1,47 @@
+From 0bb37a210d165870f7c4c9ad85e1751bdc1aec8f Mon Sep 17 00:00:00 2001
+From: Christos Trochalakis <yatiohi@ideopolis.gr>
+Date: Mon, 28 Aug 2017 13:48:08 +0300
+Subject: [PATCH] Inventorize LuaJIT 2.1
+
+---
+ config | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/config b/config
+index 01a6b3c3..5819c00f 100644
+--- a/config
++++ b/config
+@@ -281,6 +281,30 @@ END
+             fi
+             . auto/feature
+         fi
++
++        if [ $ngx_found = no ]; then
++            # LuaJIT-2.1, try with -ldl
++            ngx_feature="LuaJIT 2.1 library in /usr/"
++            ngx_feature_path="/usr/include/luajit-2.1"
++            if [ $NGX_RPATH = YES ]; then
++                ngx_feature_libs="-R/usr/lib -L/usr/lib -lm -lluajit-5.1 -ldl"
++            else
++                ngx_feature_libs="-L/usr/lib -lm -lluajit-5.1 -ldl"
++            fi
++            . auto/feature
++        fi
++
++        if [ $ngx_found = no ]; then
++            # Gentoo with LuaJIT 2.1
++            ngx_feature="LuaJIT library in /usr/"
++            ngx_feature_path="/usr/include/luajit-2.1"
++            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
+ 
+-- 
+2.14.1
+
diff --git a/debian/modules/patches/nginx-lua/series b/debian/modules/patches/nginx-lua/series
index bf7b34f..8edeaf5 100644
--- a/debian/modules/patches/nginx-lua/series
+++ b/debian/modules/patches/nginx-lua/series
@@ -1,2 +1,3 @@
 openssl-1.1.0.patch
 build-nginx-1.1.11.patch
+discover-luajit-2.1.patch

From 75a3ff5eaa1d1708d6c89940a36506860d5fbbbd Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Aug 2017 15:08:10 +0300
Subject: [PATCH 206/600] Update nginx-lua to v0.10.10

Fixes an issue with LuaJIT v2.1, luaL_getn() is no longer available.
---
 debian/modules/README.Modules-versions        |   2 +-
 debian/modules/nginx-lua/README.markdown      | 275 ++++++---
 debian/modules/nginx-lua/config               |  29 +-
 .../modules/nginx-lua/doc/HttpLuaModule.wiki  | 415 ++++++++-----
 .../nginx-lua/src/api/ngx_http_lua_api.h      |   2 +-
 .../modules/nginx-lua/src/ngx_http_lua_api.c  |   7 +-
 .../modules/nginx-lua/src/ngx_http_lua_args.c |   2 +-
 .../nginx-lua/src/ngx_http_lua_balancer.c     |  15 +-
 .../nginx-lua/src/ngx_http_lua_common.h       |  27 +-
 .../nginx-lua/src/ngx_http_lua_control.c      |   4 +-
 .../nginx-lua/src/ngx_http_lua_directive.c    |  67 ++
 .../nginx-lua/src/ngx_http_lua_directive.h    |   3 +-
 .../nginx-lua/src/ngx_http_lua_headers.c      | 124 +++-
 .../nginx-lua/src/ngx_http_lua_headers.h      |   3 +
 .../modules/nginx-lua/src/ngx_http_lua_log.c  | 117 ++++
 .../modules/nginx-lua/src/ngx_http_lua_log.h  |   4 +
 .../nginx-lua/src/ngx_http_lua_log_ringbuf.c  | 225 +++++++
 .../nginx-lua/src/ngx_http_lua_log_ringbuf.h  |  31 +
 .../nginx-lua/src/ngx_http_lua_module.c       |  70 +--
 .../nginx-lua/src/ngx_http_lua_regex.c        |  82 ++-
 .../nginx-lua/src/ngx_http_lua_regex.h        |   2 +
 .../nginx-lua/src/ngx_http_lua_semaphore.c    |  11 +-
 .../nginx-lua/src/ngx_http_lua_sleep.c        |  30 +-
 .../nginx-lua/src/ngx_http_lua_socket_tcp.c   |  25 +-
 .../modules/nginx-lua/src/ngx_http_lua_ssl.h  |   6 +-
 .../nginx-lua/src/ngx_http_lua_ssl_certby.c   |  27 +-
 .../nginx-lua/src/ngx_http_lua_ssl_ocsp.c     |   1 -
 .../src/ngx_http_lua_ssl_session_fetchby.c    |  14 +-
 .../src/ngx_http_lua_ssl_session_storeby.c    |   8 +-
 .../nginx-lua/src/ngx_http_lua_string.c       |   9 +-
 .../nginx-lua/src/ngx_http_lua_timer.c        | 209 ++++++-
 .../modules/nginx-lua/src/ngx_http_lua_util.c |  52 +-
 .../nginx-lua/src/ngx_http_lua_worker.c       |  45 ++
 debian/modules/nginx-lua/t/000--init.t        |   1 -
 debian/modules/nginx-lua/t/000-sanity.t       |   1 -
 debian/modules/nginx-lua/t/001-set.t          |   1 -
 debian/modules/nginx-lua/t/002-content.t      |   1 -
 debian/modules/nginx-lua/t/003-errors.t       |   1 -
 debian/modules/nginx-lua/t/004-require.t      |   1 -
 debian/modules/nginx-lua/t/005-exit.t         |   1 -
 debian/modules/nginx-lua/t/006-escape.t       |  20 +-
 debian/modules/nginx-lua/t/007-md5.t          |   1 -
 debian/modules/nginx-lua/t/008-today.t        |   1 -
 debian/modules/nginx-lua/t/009-log.t          |   1 -
 debian/modules/nginx-lua/t/010-request_body.t |   1 -
 debian/modules/nginx-lua/t/012-now.t          |   1 -
 debian/modules/nginx-lua/t/014-bugs.t         |   3 +-
 debian/modules/nginx-lua/t/016-resp-header.t  |  70 ++-
 debian/modules/nginx-lua/t/017-exec.t         |   1 -
 debian/modules/nginx-lua/t/018-ndk.t          |   1 -
 debian/modules/nginx-lua/t/019-const.t        |   1 -
 debian/modules/nginx-lua/t/021-cookie-time.t  |   1 -
 debian/modules/nginx-lua/t/022-redirect.t     |  53 +-
 .../nginx-lua/t/023-rewrite/client-abort.t    |   1 -
 debian/modules/nginx-lua/t/023-rewrite/exec.t |   1 -
 debian/modules/nginx-lua/t/023-rewrite/exit.t |   1 -
 .../modules/nginx-lua/t/023-rewrite/mixed.t   |   1 -
 .../nginx-lua/t/023-rewrite/multi-capture.t   |   1 -
 .../nginx-lua/t/023-rewrite/on-abort.t        |   1 -
 .../nginx-lua/t/023-rewrite/redirect.t        |   1 -
 .../nginx-lua/t/023-rewrite/req-body.t        |   1 -
 .../nginx-lua/t/023-rewrite/req-socket.t      |   1 -
 .../nginx-lua/t/023-rewrite/request_body.t    |   1 -
 .../modules/nginx-lua/t/023-rewrite/sanity.t  |   1 -
 .../modules/nginx-lua/t/023-rewrite/sleep.t   |   1 -
 .../t/023-rewrite/socket-keepalive.t          |   1 -
 .../nginx-lua/t/023-rewrite/subrequest.t      |   1 -
 .../t/023-rewrite/tcp-socket-timeout.t        |  29 +-
 .../nginx-lua/t/023-rewrite/tcp-socket.t      |   9 +-
 .../nginx-lua/t/023-rewrite/unix-socket.t     |   1 -
 .../t/023-rewrite/uthread-redirect.t          |   1 -
 .../nginx-lua/t/023-rewrite/uthread-spawn.t   |   1 -
 debian/modules/nginx-lua/t/024-access/auth.t  |   1 -
 .../nginx-lua/t/024-access/client-abort.t     |   1 -
 debian/modules/nginx-lua/t/024-access/exit.t  |   1 -
 .../nginx-lua/t/024-access/multi-capture.t    |   1 -
 .../modules/nginx-lua/t/024-access/on-abort.t |   1 -
 .../modules/nginx-lua/t/024-access/redirect.t |   1 -
 .../modules/nginx-lua/t/024-access/req-body.t |   1 -
 .../nginx-lua/t/024-access/request_body.t     |   1 -
 .../modules/nginx-lua/t/024-access/sanity.t   |   1 -
 .../modules/nginx-lua/t/024-access/satisfy.t  |   1 -
 debian/modules/nginx-lua/t/024-access/sleep.t |   1 -
 .../nginx-lua/t/024-access/subrequest.t       |   1 -
 .../nginx-lua/t/024-access/uthread-exec.t     |   1 -
 .../nginx-lua/t/024-access/uthread-exit.t     |   1 -
 .../nginx-lua/t/024-access/uthread-redirect.t |   1 -
 .../nginx-lua/t/024-access/uthread-spawn.t    |   1 -
 debian/modules/nginx-lua/t/025-codecache.t    |   1 -
 debian/modules/nginx-lua/t/026-mysql.t        |   5 +-
 .../modules/nginx-lua/t/027-multi-capture.t   |   1 -
 debian/modules/nginx-lua/t/029-http-time.t    |   1 -
 debian/modules/nginx-lua/t/030-uri-args.t     |  18 +-
 debian/modules/nginx-lua/t/031-post-args.t    |   2 +-
 debian/modules/nginx-lua/t/032-iolist.t       |   1 -
 debian/modules/nginx-lua/t/033-ctx.t          |   1 -
 debian/modules/nginx-lua/t/034-match.t        |   4 +-
 debian/modules/nginx-lua/t/035-gmatch.t       |   5 +-
 debian/modules/nginx-lua/t/036-sub.t          |   4 +-
 debian/modules/nginx-lua/t/037-gsub.t         |   4 +-
 debian/modules/nginx-lua/t/038-match-o.t      |   1 -
 debian/modules/nginx-lua/t/039-sub-o.t        |   1 -
 debian/modules/nginx-lua/t/040-gsub-o.t       |   1 -
 .../modules/nginx-lua/t/041-header-filter.t   |   1 -
 debian/modules/nginx-lua/t/042-crc32.t        |   1 -
 debian/modules/nginx-lua/t/045-ngx-var.t      |   9 +-
 debian/modules/nginx-lua/t/046-hmac.t         |   1 -
 debian/modules/nginx-lua/t/047-match-jit.t    |   1 -
 debian/modules/nginx-lua/t/048-match-dfa.t    |   1 -
 debian/modules/nginx-lua/t/049-gmatch-jit.t   |   1 -
 debian/modules/nginx-lua/t/051-sub-jit.t      |   1 -
 debian/modules/nginx-lua/t/053-gsub-jit.t     |   1 -
 debian/modules/nginx-lua/t/055-subreq-vars.t  |   1 -
 debian/modules/nginx-lua/t/056-flush.t        |   1 -
 .../modules/nginx-lua/t/057-flush-timeout.t   |   1 -
 debian/modules/nginx-lua/t/058-tcp-socket.t   |  80 ++-
 .../modules/nginx-lua/t/060-lua-memcached.t   |   1 -
 debian/modules/nginx-lua/t/061-lua-redis.t    |   1 -
 debian/modules/nginx-lua/t/062-count.t        |   2 +-
 debian/modules/nginx-lua/t/063-abort.t        |   1 -
 debian/modules/nginx-lua/t/064-pcall.t        |   1 -
 .../nginx-lua/t/065-tcp-socket-timeout.t      |  41 +-
 .../nginx-lua/t/066-socket-receiveuntil.t     |   1 -
 debian/modules/nginx-lua/t/067-req-socket.t   |   1 -
 debian/modules/nginx-lua/t/069-null.t         |   1 -
 debian/modules/nginx-lua/t/071-idle-socket.t  |   1 -
 .../modules/nginx-lua/t/072-conditional-get.t |   1 -
 debian/modules/nginx-lua/t/073-backtrace.t    |   1 -
 debian/modules/nginx-lua/t/074-prefix-var.t   |   1 -
 debian/modules/nginx-lua/t/075-logby.t        |   1 -
 debian/modules/nginx-lua/t/077-sleep.t        |  99 ++-
 debian/modules/nginx-lua/t/078-hup-vars.t     |   1 -
 .../nginx-lua/t/079-unused-directives.t       |   1 -
 debian/modules/nginx-lua/t/080-hup-shdict.t   |   1 -
 .../modules/nginx-lua/t/083-bad-sock-self.t   |   1 -
 .../nginx-lua/t/084-inclusive-receiveuntil.t  |   1 -
 debian/modules/nginx-lua/t/085-if.t           |   1 -
 debian/modules/nginx-lua/t/086-init-by.t      |  19 +-
 debian/modules/nginx-lua/t/087-udp-socket.t   |   9 +-
 debian/modules/nginx-lua/t/088-req-method.t   |   1 -
 debian/modules/nginx-lua/t/089-phase.t        |   1 -
 .../nginx-lua/t/090-log-socket-errors.t       |  19 +-
 debian/modules/nginx-lua/t/091-coroutine.t    |   9 +-
 debian/modules/nginx-lua/t/092-eof.t          |   1 -
 .../modules/nginx-lua/t/093-uthread-spawn.t   |   1 -
 debian/modules/nginx-lua/t/094-uthread-exit.t |   1 -
 debian/modules/nginx-lua/t/095-uthread-exec.t |   1 -
 .../nginx-lua/t/096-uthread-redirect.t        |   1 -
 .../modules/nginx-lua/t/097-uthread-rewrite.t |   1 -
 debian/modules/nginx-lua/t/098-uthread-wait.t |   1 -
 debian/modules/nginx-lua/t/100-client-abort.t |   1 -
 debian/modules/nginx-lua/t/101-on-abort.t     |   1 -
 .../modules/nginx-lua/t/102-req-start-time.t  |   1 -
 debian/modules/nginx-lua/t/103-req-http-ver.t |   1 -
 .../modules/nginx-lua/t/104-req-raw-header.t  |   1 -
 debian/modules/nginx-lua/t/105-pressure.t     |   1 -
 debian/modules/nginx-lua/t/106-timer.t        |   1 -
 debian/modules/nginx-lua/t/107-timer-errors.t |   1 -
 debian/modules/nginx-lua/t/108-timer-safe.t   |   1 -
 debian/modules/nginx-lua/t/109-timer-hup.t    |   1 -
 debian/modules/nginx-lua/t/110-etag.t         |   1 -
 .../modules/nginx-lua/t/111-req-header-ua.t   |   1 -
 .../modules/nginx-lua/t/112-req-header-conn.t |   1 -
 .../nginx-lua/t/113-req-header-cookie.t       |   1 -
 .../modules/nginx-lua/t/115-quote-sql-str.t   |   1 -
 .../modules/nginx-lua/t/116-raw-req-socket.t  |   1 -
 .../nginx-lua/t/117-raw-req-socket-timeout.t  |   1 -
 .../modules/nginx-lua/t/119-config-prefix.t   |   1 -
 debian/modules/nginx-lua/t/120-re-find.t      |  30 +-
 debian/modules/nginx-lua/t/121-version.t      |   1 -
 debian/modules/nginx-lua/t/122-worker.t       |   1 -
 debian/modules/nginx-lua/t/123-lua-path.t     |   1 -
 debian/modules/nginx-lua/t/124-init-worker.t  |   2 +-
 .../modules/nginx-lua/t/125-configure-args.t  |   1 -
 debian/modules/nginx-lua/t/126-shdict-frag.t  |   1 -
 debian/modules/nginx-lua/t/127-uthread-kill.t |   3 +-
 .../nginx-lua/t/128-duplex-tcp-socket.t       |  23 +-
 debian/modules/nginx-lua/t/129-ssl-socket.t   | 573 +++++++++---------
 debian/modules/nginx-lua/t/130-internal-api.t |   1 -
 debian/modules/nginx-lua/t/135-worker-id.t    |   2 +-
 debian/modules/nginx-lua/t/137-req-misc.t     |   1 -
 debian/modules/nginx-lua/t/138-balancer.t     |  99 ++-
 debian/modules/nginx-lua/t/139-ssl-cert-by.t  | 296 ++++++++-
 debian/modules/nginx-lua/t/140-ssl-c-api.t    |   8 +-
 debian/modules/nginx-lua/t/141-luajit.t       |   3 +-
 .../nginx-lua/t/142-ssl-session-store.t       |  24 +-
 .../nginx-lua/t/143-ssl-session-fetch.t       |  24 +-
 debian/modules/nginx-lua/t/146-malloc-trim.t  |  41 +-
 .../nginx-lua/t/147-tcp-socket-timeouts.t     |   2 +-
 .../nginx-lua/t/150-fake-delayed-load.t       |  56 ++
 debian/modules/nginx-lua/t/151-initby-hup.t   | 168 +++++
 debian/modules/nginx-lua/t/152-timer-every.t  | 385 ++++++++++++
 .../modules/nginx-lua/t/153-semaphore-hup.t   | 154 +++++
 debian/modules/nginx-lua/t/154-semaphore.t    | 118 ++++
 debian/modules/nginx-lua/t/cert/comodo-ca.crt |  29 +
 debian/modules/nginx-lua/t/cert/startcom.crt  |  87 ---
 .../t/data/fake-delayed-load-module/config    |   3 +
 .../ngx_http_lua_fake_delayed_load_module.c   |  77 +++
 .../t/data/fake-module/ngx_http_fake_module.c |   3 +-
 debian/modules/nginx-lua/util/build.sh        |   1 +
 debian/modules/nginx-lua/util/gdbinit         | 415 -------------
 debian/modules/nginx-lua/util/reindex         |  64 --
 debian/modules/nginx-lua/valgrind.suppress    |  15 +
 203 files changed, 3745 insertions(+), 1536 deletions(-)
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.c
 create mode 100644 debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.h
 create mode 100644 debian/modules/nginx-lua/t/150-fake-delayed-load.t
 create mode 100644 debian/modules/nginx-lua/t/151-initby-hup.t
 create mode 100644 debian/modules/nginx-lua/t/152-timer-every.t
 create mode 100644 debian/modules/nginx-lua/t/153-semaphore-hup.t
 create mode 100644 debian/modules/nginx-lua/t/154-semaphore.t
 create mode 100644 debian/modules/nginx-lua/t/cert/comodo-ca.crt
 delete mode 100644 debian/modules/nginx-lua/t/cert/startcom.crt
 create mode 100644 debian/modules/nginx-lua/t/data/fake-delayed-load-module/config
 create mode 100644 debian/modules/nginx-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c
 delete mode 100644 debian/modules/nginx-lua/util/gdbinit
 delete mode 100755 debian/modules/nginx-lua/util/reindex

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index ef2bb91..6b581cd 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -23,7 +23,7 @@ README for Modules versions
 
  nginx-lua
   Homepage: https://github.com/openresty/lua-nginx-module
-  Version: v0.10.7
+  Version: v0.10.10
   Patch: openssl-1.1.0.patch
   Patch: build-nginx-1.11.11.patch
   Patch: discover-luajit-2.1.patch
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/nginx-lua/README.markdown
index 3699a72..fac3a0d 100644
--- a/debian/modules/nginx-lua/README.markdown
+++ b/debian/modules/nginx-lua/README.markdown
@@ -62,7 +62,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.7](https://github.com/openresty/lua-nginx-module/tags) released on 4 November 2016.
+This document describes ngx_lua [v0.10.10](https://github.com/openresty/lua-nginx-module/tags) released on 8 August 2017.
 
 Synopsis
 ========
@@ -150,7 +150,7 @@ Synopsis
      }
 
      # use nginx var in code path
-     # WARNING: contents in nginx var must be carefully filtered,
+     # CAUTION: contents in nginx var must be carefully filtered,
      # otherwise there'll be great security risk!
      location ~ ^/app/([-_a-zA-Z0-9/]+) {
          set $path $1;
@@ -263,7 +263,7 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 Installation
 ============
 
-It is highly recommended to use the [OpenResty bundle](http://openresty.org) that bundles Nginx, ngx_lua,  LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: `./configure --with-luajit && make && make install`.
+It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
@@ -298,6 +298,12 @@ Build the source with this module:
          --add-module=/path/to/ngx_devel_kit \
          --add-module=/path/to/lua-nginx-module
 
+ # Note that you may also want to add `./configure` options which are used in your
+ # current nginx build.
+ # You can get usually those options using command nginx -V
+
+ # you can change the parallism number 2 below to fit the number of spare CPU cores in your
+ # machine.
  make -j2
  make install
 ```
@@ -312,8 +318,9 @@ Starting from NGINX 1.9.11, you can also compile this module as a dynamic module
 directive, for example,
 
 ```nginx
-load_module /path/to/modules/ndk_http_module.so;  # assuming NDK is built as a dynamic module too
-load_module /path/to/modules/ngx_http_lua_module.so;
+
+ load_module /path/to/modules/ndk_http_module.so;  # assuming NDK is built as a dynamic module too
+ load_module /path/to/modules/ngx_http_lua_module.so;
 ```
 
 [Back to TOC](#table-of-contents)
@@ -406,14 +413,14 @@ Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible wi
 
 ```bash
 
- /path/to/luajit/bin/luajit -b /path/to/input_file.lua /path/to/output_file.luac
+ /path/to/luajit/bin/luajit -b /path/to/input_file.lua /path/to/output_file.ljbc
 ```
 
 The `-bg` option can be used to include debug information in the LuaJIT bytecode file:
 
 ```bash
 
- /path/to/luajit/bin/luajit -bg /path/to/input_file.lua /path/to/output_file.luac
+ /path/to/luajit/bin/luajit -bg /path/to/input_file.lua /path/to/output_file.ljbc
 ```
 
 Please refer to the official LuaJIT documentation on the `-b` option for more details:
@@ -623,9 +630,9 @@ Known Issues
 
 TCP socket connect operation issues
 -----------------------------------
-The [tcpsock:connect](#tcpsockconnect) method may indicate `success` despite connection failures such as with `Connection Refused` errors. 
+The [tcpsock:connect](#tcpsockconnect) 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. 
+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.
 
@@ -656,15 +663,29 @@ instead of the old deprecated form:
 
 Here is the reason: by design, the global environment has exactly the same lifetime as the Nginx request handler associated with it. Each request handler has its own set of Lua global variables and that is the idea of request isolation. The Lua module is actually loaded by the first Nginx request handler and is cached by the `require()` built-in in the `package.loaded` table for later reference, and the `module()` builtin used by some Lua modules has the side effect of setting a global variable to the loaded module table. But this global variable will be cleared at the end of the request handler,  and every subsequent request handler all has its own (clean) global environment. So one will get Lua exception for accessing the `nil` value.
 
-Generally, use of Lua global variables is a really really bad idea in the context of ngx_lua because
+The use of Lua global variables is a generally inadvisable in the ngx_lua context as:
 
-1. misuse of Lua globals has very bad side effects for concurrent requests when these variables are actually supposed to be local only,
-1. Lua global variables require Lua table look-up in the global environment (which is just a Lua table), which is kinda expensive, and
-1. some Lua global variable references are just typos, which are hard to debug.
+1. the misuse of Lua globals has detrimental side effects on concurrent requests when such variables should instead be local in scope,
+1. Lua global variables require Lua table look-ups in the global environment which is computationally expensive, and
+1. some Lua global variable references may include typing errors which make such difficult to debug.
 
-It's *highly* recommended to always declare them via "local" in the scope that is reasonable.
+It is therefore *highly* recommended to always declare such within an appropriate local scope instead.
 
-To find out all the uses of Lua global variables in your Lua code, you can run the [lua-releng tool](https://github.com/openresty/nginx-devel-utils/blob/master/lua-releng) across all your .lua source files:
+```lua
+
+ -- Avoid
+ foo = 123
+ -- Recommended
+ local foo = 123
+
+ -- Avoid
+ function foo() return 123 end
+ -- Recommended
+ local function foo() return 123 end
+```
+
+
+To find all instances of Lua global variables in your Lua code, run the [lua-releng tool](https://github.com/openresty/nginx-devel-utils/blob/master/lua-releng) across all `.lua` source files:
 
     $ lua-releng
     Checking use of Lua global variables in file lib/foo/bar.lua ...
@@ -709,28 +730,27 @@ will not work as expected.
 Cosockets Not Available Everywhere
 ----------------------------------
 
-Due the internal limitations in the nginx core, the cosocket API are disabled in the following contexts: [set_by_lua*](#set_by_lua), [log_by_lua*](#log_by_lua), [header_filter_by_lua*](#header_filter_by_lua), and [body_filter_by_lua](#body_filter_by_lua).
+Due to internal limitations in the nginx core, the cosocket API is disabled in the following contexts: [set_by_lua*](#set_by_lua), [log_by_lua*](#log_by_lua), [header_filter_by_lua*](#header_filter_by_lua), and [body_filter_by_lua](#body_filter_by_lua).
 
 The cosockets are currently also disabled in the [init_by_lua*](#init_by_lua) and [init_worker_by_lua*](#init_worker_by_lua) directive contexts but we may add support for these contexts in the future because there is no limitation in the nginx core (or the limitation might be worked around).
 
-There exists a work-around, however, when the original context does *not* need to wait for the cosocket results. That is, creating a 0-delay timer via the [ngx.timer.at](#ngxtimerat) API and do the cosocket results in the timer handler, which runs asynchronously as to the original context creating the timer.
+There exists a work-around, however, when the original context does *not* need to wait for the cosocket results. That is, creating a zero-delay timer via the [ngx.timer.at](#ngxtimerat) API and do the cosocket results in the timer handler, which runs asynchronously as to the original context creating the timer.
 
 [Back to TOC](#table-of-contents)
 
 Special Escaping Sequences
 --------------------------
 
-**WARNING** We no longer suffer from this pitfall since the introduction of the
-`*_by_lua_block {}` configuration directives.
+**NOTE** Following the `v0.9.17` release, this pitfall can be avoided by using the `*_by_lua_block {}` configuration directives.
 
-PCRE sequences such as `\d`, `\s`, or `\w`, require special attention because in string literals, the backslash character, `\`, is stripped out by both the Lua language parser and by the Nginx config file parser before processing. So the following snippet will not work as expected:
+PCRE sequences such as `\d`, `\s`, or `\w`, require special attention because in string literals, the backslash character, `\`, is stripped out by both the Lua language parser and by the nginx config file parser before processing if not within a `*_by_lua_block {}` directive. So the following snippet will not work as expected:
 
 ```nginx
 
  # nginx.conf
  ? location /test {
  ?     content_by_lua '
- ?         local regex = "\d+"  -- THIS IS WRONG!!
+ ?         local regex = "\d+"  -- THIS IS WRONG OUTSIDE OF A *_by_lua_block DIRECTIVE
  ?         local m = ngx.re.match("hello, 1234", regex)
  ?         if m then ngx.say(m[0]) else ngx.say("not matched!") end
  ?     ';
@@ -755,7 +775,7 @@ To avoid this, *double* escape the backslash:
 
 Here, `\\\\d+` is stripped down to `\\d+` by the Nginx config file parser and this is further stripped down to `\d+` by the Lua language parser before running.
 
-Alternatively, the regex pattern can be presented as a long-bracketed Lua string literal by encasing it in "long brackets", `[[...]]`, in which case backslashes have to only be escaped once for the Nginx config file parser. 
+Alternatively, the regex pattern can be presented as a long-bracketed Lua string literal by encasing it in "long brackets", `[[...]]`, in which case backslashes have to only be escaped once for the Nginx config file parser.
 
 ```nginx
 
@@ -772,7 +792,7 @@ 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. 
+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.
 
 ```nginx
@@ -788,7 +808,7 @@ The `[=[...]=]` form may be used as the default form if desired.
  # evaluates to "1234"
 ```
 
-An alternative approach to escaping PCRE sequences is to ensure that Lua code is placed in external script files and executed using the various `*_by_lua_file` directives. 
+An alternative approach to escaping PCRE sequences is to ensure that Lua code is placed in external script files and executed using the various `*_by_lua_file` directives.
 With this approach, the backslashes are only stripped by the Lua language parser and therefore only need to be escaped once each.
 
 ```lua
@@ -800,8 +820,8 @@ With this approach, the backslashes are only stripped by the Lua language parser
  -- evaluates to "1234"
 ```
 
-Within external script files, PCRE sequences presented as long-bracketed Lua string literals do not require modification. 
- 
+Within external script files, PCRE sequences presented as long-bracketed Lua string literals do not require modification.
+
 ```lua
 
  -- test.lua
@@ -811,6 +831,22 @@ Within external script files, PCRE sequences presented as long-bracketed Lua str
  -- evaluates to "1234"
 ```
 
+As noted earlier, PCRE sequences presented within `*_by_lua_block {}` directives (available following the `v0.9.17` release) do not require modification.
+
+```nginx
+
+ # nginx.conf
+ location /test {
+     content_by_lua_block {
+         local regex = "\d+"
+         local m = ngx.re.match("hello, 1234", regex)
+         if m then ngx.say(m[0]) else ngx.say("not matched!") end
+     }
+ }
+ # evaluates to "1234"
+```
+
+
 [Back to TOC](#table-of-contents)
 
 Mixing with SSI Not Supported
@@ -871,7 +907,6 @@ servers in Lua. For example,
 * cosocket: pool-based backend concurrency level control: implement automatic `connect` queueing when the backend concurrency exceeds its connection pool limit.
 * cosocket: review and merge aviramc's [patch](https://github.com/openresty/lua-nginx-module/pull/290) for adding the `bsdrecv` method.
 * add new API function `ngx.resp.add_header` to emulate the standard `add_header` config directive.
-* review and apply Jader H. Silva's patch for `ngx.re.split()`.
 * review and apply vadim-pavlov's patch for [ngx.location.capture](#ngxlocationcapture)'s `extra_headers` option
 * use `ngx_hash_t` to optimize the built-in header look-up process for [ngx.req.set_header](#ngxreqset_header), [ngx.header.HEADER](#ngxheaderheader), and etc.
 * add configure options for different strategies of handling the cosocket connection exceeding in the pools.
@@ -879,14 +914,14 @@ servers in Lua. For example,
 * add `ignore_resp_headers`, `ignore_resp_body`, and `ignore_resp` options to [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi) methods, to allow micro performance tuning on the user side.
 * 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](https://httpd.apache.org/docs/trunk/mod/mod_lua.html).
-* cosocket: add client SSL certificiate support.
+* cosocket: add client SSL certificate support.
 
 [Back to TOC](#table-of-contents)
 
 Changes
 =======
 
-The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
+The changes made in every release of this module are listed in the change logs of the OpenResty bundle:
 
 <http://openresty.org/#Changes>
 
@@ -955,9 +990,9 @@ Copyright and License
 
 This module is licensed under the BSD license.
 
-Copyright (C) 2009-2016, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
+Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2016, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright (C) 2009-2017, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -1001,6 +1036,7 @@ See Also
 Directives
 ==========
 
+* [lua_capture_error_log](#lua_capture_error_log)
 * [lua_use_default_type](#lua_use_default_type)
 * [lua_malloc_trim](#lua_malloc_trim)
 * [lua_code_cache](#lua_code_cache)
@@ -1074,6 +1110,56 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 [Back to TOC](#table-of-contents)
 
+lua_capture_error_log
+---------------------
+**syntax:** *lua_capture_error_log size*
+
+**default:** *none*
+
+**context:** *http*
+
+Enables a buffer of the specified `size` for capturing all the nginx error log message data (not just those produced
+by this module or the nginx http subsystem, but everything) without touching files or disks.
+
+You can use units like `k` and `m` in the `size` value, as in
+
+```nginx
+
+ lua_capture_error_log 100k;
+```
+
+As a rule of thumb, a 4KB buffer can usually hold about 20 typical error log messages. So do the maths!
+
+This buffer never grows. If it is full, new error log messages will replace the oldest ones in the buffer.
+
+The size of the buffer must be bigger than the maximum length of a single error log message (which is 4K in OpenResty and 2K in stock NGINX).
+
+You can read the messages in the buffer on the Lua land via the
+[get_logs()](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#get_logs)
+function of the
+[ngx.errlog](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#readme)
+module of the [lua-resty-core](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#readme)
+library. This Lua API function will return the captured error log messages and
+also remove these already read from the global capturing buffer, making room
+for any new error log data. For this reason, the user should not configure this
+buffer to be too big if the user read the buffered error log data fast enough.
+
+Note that the log level specified in the standard [error_log](http://nginx.org/r/error_log) directive
+*does* have effect on this capturing facility. It only captures log
+messages of a level no lower than the specified log level in the [error_log](http://nginx.org/r/error_log) directive.
+The user can still choose to set an even higher filtering log level on the fly via the Lua API function
+[errlog.set_filter_level](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#set_filter_level).
+So it is more flexible than the static [error_log](http://nginx.org/r/error_log) directive.
+
+It is worth noting that there is no way to capture the debugging logs
+without building OpenResty or NGINX with the `./configure`
+option `--with-debug`. And enabling debugging logs is
+strongly discouraged in production builds due to high overhead.
+
+This directive was first introduced in the `v0.10.9` release.
+
+[Back to TOC](#directives)
+
 lua_use_default_type
 --------------------
 **syntax:** *lua_use_default_type on | off*
@@ -1082,7 +1168,7 @@ lua_use_default_type
 
 **context:** *http, server, location, location if*
 
-Specifies whether to use the MIME type specified by the [default_type](http://nginx.org/en/docs/http/ngx_http_core_module.html#default_type) directive for the default value of the `Content-Type` response header. If you do not want a default `Content-Type` response header for your Lua request handlers, then turn this directive off.
+Specifies whether to use the MIME type specified by the [default_type](http://nginx.org/en/docs/http/ngx_http_core_module.html#default_type) directive for the default value of the `Content-Type` response header. Deactivate this directive if a default `Content-Type` response header for Lua request handlers is not desired.
 
 This directive is turned on by default.
 
@@ -1153,8 +1239,8 @@ The ngx_lua module does not support the `stat` mode available with the
 Apache `mod_lua` module (yet).
 
 Disabling the Lua code cache is strongly
-discouraged for production use and should only be used during 
-development as it has a significant negative impact on overall performance. For example, the performance a "hello world" Lua example can drop by an order of magnitude after disabling the Lua code cache.
+discouraged for production use and should only be used during
+development as it has a significant negative impact on overall performance. For example, the performance of a "hello world" Lua example can drop by an order of magnitude after disabling the Lua code cache.
 
 [Back to TOC](#directives)
 
@@ -1176,6 +1262,8 @@ The default number of entries allowed is 1024 and when this limit is reached, ne
     2011/08/27 23:18:26 [warn] 31997#0: *1 lua exceeding regex cache max entries (1024), ...
 
 
+If you are using the `ngx.re.*` implementation of [lua-resty-core](https://github.com/openresty/lua-resty-core) by loading the `resty.core.regex` module (or just the `resty.core` module), then an LRU cache is used for the regex cache being used here.
+
 Do not activate the `o` option for regular expressions (and/or `replace` string arguments for [ngx.re.sub](#ngxresub) and [ngx.re.gsub](#ngxregsub)) that are generated *on the fly* and give rise to infinite variations to avoid hitting the specified limit.
 
 [Back to TOC](#directives)
@@ -1241,8 +1329,7 @@ init_by_lua
 
 **phase:** *loading-config*
 
-**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
-use the new [init_by_lua_block](#init_by_lua_block) directive instead.
+**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [init_by_lua_block](#init_by_lua_block) directive instead.
 
 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.
 
@@ -1358,7 +1445,7 @@ init_worker_by_lua
 
 **phase:** *starting-worker*
 
-**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*; use the new [init_worker_by_lua_block](#init_worker_by_lua_block) directive instead.
+**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [init_worker_by_lua_block](#init_worker_by_lua_block) directive instead.
 
 Runs the specified Lua code upon every Nginx worker process's startup when the master process is enabled. When the master process is disabled, this hook will just run after [init_by_lua*](#init_by_lua).
 
@@ -1384,8 +1471,8 @@ This hook is often used to create per-worker reoccurring timers (via the [ngx.ti
          end
      end
 
-     local ok, err = new_timer(delay, check)
-     if not ok then
+     local hdl, err = new_timer(delay, check)
+     if not hdl then
          log(ERR, "failed to create timer: ", err)
          return
      end
@@ -1447,7 +1534,7 @@ set_by_lua
 
 **phase:** *rewrite*
 
-**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*; use the new [set_by_lua_block](#set_by_lua_block) directive instead.
+**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [set_by_lua_block](#set_by_lua_block) directive instead.
 
 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](#nginx-api-for-lua) and can retrieve input arguments from the `ngx.arg` table (index starts from `1` and increases sequentially).
@@ -1537,15 +1624,15 @@ set_by_lua_file
 
 **phase:** *rewrite*
 
-Equivalent to [set_by_lua](#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](#lualuajit-bytecode-support) to be executed. 
+Equivalent to [set_by_lua](#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](#lualuajit-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 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 
+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 
+The Lua code cache can be temporarily disabled during development by
 switching [lua_code_cache](#lua_code_cache) `off` in `nginx.conf` to avoid reloading Nginx.
 
 This directive requires the [ngx_devel_kit](https://github.com/simpl/ngx_devel_kit) module.
@@ -1561,10 +1648,9 @@ content_by_lua
 
 **phase:** *content*
 
-**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
-use the new [content_by_lua_block](#content_by_lua_block) directive instead.
+**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [content_by_lua_block](#content_by_lua_block) directive instead.
 
-Acts as a "content handler" and executes Lua code string specified in `<lua-script-str>` for every request. 
+Acts as a "content handler" and executes Lua code string specified in `<lua-script-str>` for every request.
 The Lua code may make [API calls](#nginx-api-for-lua) and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
 
 Do not use this directive and other content handler directives in the same location. For example, this directive and the [proxy_pass](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass) directive should not be used in the same location.
@@ -1613,16 +1699,16 @@ Nginx variables can be used in the `<path-to-lua-script-file>` string to provide
 
 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 
+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 
+The Lua code cache can be temporarily disabled during development by
 switching [lua_code_cache](#lua_code_cache) `off` in `nginx.conf` to avoid reloading Nginx.
 
 Nginx variables are supported in the file path for dynamic dispatch, for example:
 
 ```nginx
 
- # WARNING: contents in nginx var must be carefully filtered,
+ # CAUTION: contents in nginx var must be carefully filtered,
  # otherwise there'll be great security risk!
  location ~ ^/app/([-_a-zA-Z0-9/]+) {
      set $path $1;
@@ -1643,8 +1729,7 @@ rewrite_by_lua
 
 **phase:** *rewrite tail*
 
-**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
-use the new [rewrite_by_lua_block](#rewrite_by_lua_block) directive instead.
+**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [rewrite_by_lua_block](#rewrite_by_lua_block) directive instead.
 
 Acts as a rewrite phase handler and executes Lua code string specified in `<lua-script-str>` for every request.
 The Lua code may make [API calls](#nginx-api-for-lua) and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
@@ -1820,8 +1905,7 @@ access_by_lua
 
 **phase:** *access tail*
 
-**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
-use the new [access_by_lua_block](#access_by_lua_block) directive instead.
+**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [access_by_lua_block](#access_by_lua_block) directive instead.
 
 Acts as an access phase handler and executes Lua code string specified in `<lua-script-str>` for every request.
 The Lua code may make [API calls](#nginx-api-for-lua) and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
@@ -1933,7 +2017,7 @@ Nginx variables can be used in the `<path-to-lua-script-file>` string to provide
 
 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 
+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) `off` in `nginx.conf` to avoid repeatedly reloading Nginx.
 
@@ -1950,8 +2034,7 @@ header_filter_by_lua
 
 **phase:** *output-header-filter*
 
-**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
-use the new [header_filter_by_lua_block](#header_filter_by_lua_block) directive instead.
+**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [header_filter_by_lua_block](#header_filter_by_lua_block) directive instead.
 
 Uses Lua code specified in `<lua-script-str>` to define an output header filter.
 
@@ -2029,8 +2112,7 @@ body_filter_by_lua
 
 **phase:** *output-body-filter*
 
-**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
-use the new [body_filter_by_lua_block](#body_filter_by_lua_block) directive instead.
+**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [body_filter_by_lua_block](#body_filter_by_lua_block) directive instead.
 
 Uses Lua code specified in `<lua-script-str>` to define an output body filter.
 
@@ -2166,15 +2248,14 @@ log_by_lua
 
 **phase:** *log*
 
-**WARNING** Since the `v0.9.17` release, use of this directive is *discouraged*;
-use the new [log_by_lua_block](#log_by_lua_block) directive instead.
+**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [log_by_lua_block](#log_by_lua_block) directive instead.
 
 Runs 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 before.
 
 Note that the following API functions are currently disabled within this context:
 
 * Output API functions (e.g., [ngx.say](#ngxsay) and [ngx.send_headers](#ngxsend_headers))
-* Control API functions (e.g., [ngx.exit](#ngxexit)) 
+* Control API functions (e.g., [ngx.exit](#ngxexit))
 * Subrequest API functions (e.g., [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi))
 * Cosocket API functions (e.g., [ngx.socket.tcp](#ngxsockettcp) and [ngx.req.socket](#ngxreqsocket)).
 
@@ -2883,7 +2964,7 @@ lua_http10_buffering
 
 **context:** *http, server, location, location-if*
 
-Enables or disables automatic response buffering 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 automatic response buffering for HTTP 1.0 (or older) requests. This buffering mechanism is mainly used for HTTP 1.0 keep-alive which relies on a proper `Content-Length` response header.
 
 If the Lua code explicitly sets a `Content-Length` response header before sending the headers (either explicitly via [ngx.send_headers](#ngxsend_headers) or implicitly via the first [ngx.say](#ngxsay) or [ngx.print](#ngxprint) call), then the HTTP 1.0 response buffering will be disabled even when this directive is turned on.
 
@@ -2951,7 +3032,7 @@ lua_check_client_abort
 
 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](#ngxon_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.
+When this directive is 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](#ngxon_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](#ngxreqsocket), then ngx_lua will neither stop all the running "light threads" nor call the user callback (if [ngx.on_abort](#ngxon_abort) has been called). Instead, the reading operation on [ngx.req.socket](#ngxreqsocket) will just return the error message "client aborted" as the second return value (the first return value is surely `nil`).
 
@@ -3136,6 +3217,7 @@ Nginx API for Lua
 * [ngx.thread.kill](#ngxthreadkill)
 * [ngx.on_abort](#ngxon_abort)
 * [ngx.timer.at](#ngxtimerat)
+* [ngx.timer.every](#ngxtimerevery)
 * [ngx.timer.running_count](#ngxtimerrunning_count)
 * [ngx.timer.pending_count](#ngxtimerpending_count)
 * [ngx.config.subsystem](#ngxconfigsubsystem)
@@ -3280,7 +3362,7 @@ 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,
+**CAUTION** 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,
 
 ```lua
 
@@ -3438,7 +3520,7 @@ ngx.ctx
 -------
 **context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;*
 
-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). 
+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).
 
 Consider the following example,
 
@@ -3541,7 +3623,7 @@ When being used in the context of [init_worker_by_lua*](#init_worker_by_lua), th
 
 The `ngx.ctx` lookup requires relatively expensive metamethod calls and it is much slower than explicitly passing per-request data along by your own function arguments. So do not abuse this API for saving your own function arguments because it usually has quite some performance impact.
 
-Because of the metamethod magic, never "local" the `ngx.ctx` table outside your Lua function scope on the Lua module level level due to [worker-level data sharing](#data-sharing-within-an-nginx-worker). For example, the following is bad:
+Because of the metamethod magic, never "local" the `ngx.ctx` table outside your Lua function scope on the Lua module level due to [worker-level data sharing](#data-sharing-within-an-nginx-worker). For example, the following is bad:
 
 ```lua
 
@@ -3549,7 +3631,7 @@ Because of the metamethod magic, never "local" the `ngx.ctx` table outside your
  local _M = {}
 
  -- the following line is bad since ngx.ctx is a per-request
- -- data while this `ctx` variable is on the Lua module level
+ -- data while this <code>ctx</code> variable is on the Lua module level
  -- and thus is per-nginx-worker.
  local ctx = ngx.ctx
 
@@ -3701,7 +3783,7 @@ The `args` option can also take plain query strings:
 
 This is functionally identical to the previous examples.
 
-The `share_all_vars` option controls whether to share nginx variables among the current request and its subrequests. 
+The `share_all_vars` option controls whether to share nginx variables among the current request and its subrequests.
 If this option is set to `true`, then the current request and associated subrequests will share the same Nginx variable scope. Hence, changes to Nginx variables made by a subrequest will affect the current request.
 
 Care should be taken in using this option as variable scope sharing can have unexpected side effects. The `args`, `vars`, or `copy_all_vars` options are generally preferable instead.
@@ -3768,7 +3850,7 @@ In addition to the two settings above, it is possible to specify
 values for variables in the subrequest using the `vars` option. These
 variables are set after the sharing or copying of variables has been
 evaluated, and provides a more efficient method of passing specific
-values to a subrequest over encoding them as URL arguments and 
+values to a subrequest over encoding them as URL arguments and
 unescaping them in the Nginx config file.
 
 ```nginx
@@ -3853,7 +3935,7 @@ Note that subrequests issued by [ngx.location.capture](#ngxlocationcapture) inhe
 request headers of the current request by default and that this may have unexpected side effects on the
 subrequest responses. For example, when using the standard `ngx_proxy` module to serve
 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 
+in gzipped responses that cannot be handled properly in Lua code. Original request headers should be ignored by setting
 [proxy_pass_request_headers](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass_request_headers) to `off` in subrequest locations.
 
 When the `body` option is not specified and the `always_forward_body` option is false (the default value), the `POST` and `PUT` subrequests will inherit the request bodies of the parent request (if any).
@@ -3993,7 +4075,7 @@ will yield
  Set-Cookie: b=4; path=/
 ```
 
-in the response headers. 
+in the response headers.
 
 Only Lua tables are accepted (Only the last element in the table will take effect for standard headers such as `Content-Type` that only accept a single value).
 
@@ -4025,7 +4107,7 @@ The same applies to assigning an empty table:
 
 Setting `ngx.header.HEADER` after sending out response headers (either explicitly with [ngx.send_headers](#ngxsend_headers) or implicitly with [ngx.print](#ngxprint) and similar) will throw out a Lua exception.
 
-Reading `ngx.header.HEADER` will return the value of the response header named `HEADER`. 
+Reading `ngx.header.HEADER` will return the value of the response header named `HEADER`.
 
 Underscores (`_`) in the header names will also be replaced by dashes (`-`) and the header names will be matched case-insensitively. If the response header is not present at all, `nil` will be returned.
 
@@ -4536,7 +4618,7 @@ That is, they will take Lua boolean values `true`. However, they are different f
 
 Empty key arguments are discarded. `POST /test` with body `=hello&=world` will yield empty outputs for instance.
 
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks.  
+Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks.
 
 However, the optional `max_args` function argument can be used to override this limit:
 
@@ -4597,7 +4679,7 @@ the value of `ngx.req.get_headers()["Foo"]` will be a Lua (array) table such as:
  {"foo", "bar", "baz"}
 ```
 
-Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks.  
+Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks.
 
 However, the optional `max_headers` function argument can be used to override this limit:
 
@@ -4999,6 +5081,7 @@ The optional `status` parameter specifies the HTTP status code to be used. The f
 
 * `301`
 * `302` (default)
+* `303`
 * `307`
 
 It is `302` (`ngx.HTTP_MOVED_TEMPORARILY`) by default.
@@ -5237,7 +5320,7 @@ Note that while this method accepts all [HTTP status constants](#http-status-con
 
 Also note that this method call terminates the processing of the current request and that it is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.exit(...)` be used to reinforce the fact that the request processing is being terminated.
 
-When being used in the contexts of [header_filter_by_lua](#header_filter_by_lua) and
+When being used in the contexts of [header_filter_by_lua*](#header_filter_by_lua), [balancer_by_lua*](#balancer_by_lua_block), and
 [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block), `ngx.exit()` is
 an asynchronous operation and will return immediately. This behavior may change in future and it is recommended that users always use `return` in combination as suggested above.
 
@@ -5251,7 +5334,7 @@ ngx.eof
 
 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:
+When you disable the HTTP 1.1 keep-alive feature for your downstream connections, you can rely on well written 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:
 
 ```nginx
 
@@ -5259,7 +5342,7 @@ When you disable the HTTP 1.1 keep-alive feature for your downstream connections
      keepalive_timeout 0;
      content_by_lua_block {
          ngx.say("got the task!")
-         ngx.eof()  -- a descent HTTP client will close the connection at this point
+         ngx.eof()  -- well written HTTP clients will close the connection at this point
          -- access MySQL, PostgreSQL, Redis, Memcached, and etc here...
      }
  }
@@ -5576,7 +5659,7 @@ ngx.time
 
 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](#ngxupdate_time) first.
+Updates of the Nginx time cache can be forced by calling [ngx.update_time](#ngxupdate_time) first.
 
 [Back to TOC](#nginx-api-for-lua)
 
@@ -5826,7 +5909,7 @@ The optional fourth argument, `ctx`, can be a Lua table holding an optional `pos
 
  local ctx = { pos = 2 }
  local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
-      -- m[0] = "34"
+      -- m[0] = "234"
       -- ctx.pos == 5
 ```
 
@@ -6006,7 +6089,7 @@ When the `replace` is a string, then it is treated as a special template for str
 
 where `$0` referring to the whole substring matched by the pattern and `$1` referring to the first parenthesized capturing substring.
 
-Curly braces can also be used to disambiguate variable names from the background string literals: 
+Curly braces can also be used to disambiguate variable names from the background string literals:
 
 ```lua
 
@@ -6116,6 +6199,8 @@ The resulting object `dict` has the following methods:
 * [flush_expired](#ngxshareddictflush_expired)
 * [get_keys](#ngxshareddictget_keys)
 
+All these methods are *atomic* operations, that is, safe from concurrent accesses from multiple nginx worker processes for the same `lua_shared_dict` zone.
+
 Here is an example:
 
 ```nginx
@@ -6495,7 +6580,7 @@ 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.
+**CAUTION** Avoid calling this method on dictionaries with a very large number of keys as it may lock the dictionary for significant amount of time and block Nginx worker processes trying to access the dictionary.
 
 This feature was first introduced in the `v0.7.3` release.
 
@@ -7280,7 +7365,7 @@ Then it will generate the output
     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](#ngxlocationcapture_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):
+"Light threads" are mostly useful for making concurrent upstream requests in a single Nginx request handler, much like a generalized version of [ngx.location.capture_multi](#ngxlocationcapture_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 (similar to Facebook's BigPipe model):
 
 ```lua
 
@@ -7486,7 +7571,7 @@ See also [lua_check_client_abort](#lua_check_client_abort).
 
 ngx.timer.at
 ------------
-**syntax:** *ok, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)*
+**syntax:** *hdl, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)*
 
 **context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
@@ -7512,7 +7597,7 @@ Premature timer expiration happens when the Nginx worker process is
 trying to shut down, as in an Nginx configuration reload triggered by
 the `HUP` signal or in an Nginx server shutdown. When the Nginx worker
 is trying to shut down, one can no longer call `ngx.timer.at` to
-create new timers with nonzero delays and in that case `ngx.timer.at` will return `nil` and
+create new timers with nonzero delays and in that case `ngx.timer.at` will return a "conditional false" value and
 a string describing the error, that is, "process exiting".
 
 Starting from the `v0.9.3` release, it is allowed to create zero-delay timers even when the Nginx worker process starts shutting down.
@@ -7571,6 +7656,9 @@ One can also create infinite re-occurring timers, for instance, a timer getting
  end
 ```
 
+It is recommended, however, to use the [ngx.timer.every](#ngxtimerevery) API function
+instead for creating recurring timers since it is more robust.
+
 Because timer callbacks run in the background and their running time
 will not add to any client request's response time, they can easily
 accumulate in the server and exhaust system resources due to either
@@ -7610,6 +7698,25 @@ This API was first introduced in the `v0.8.0` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+ngx.timer.every
+---------------
+**syntax:** *hdl, err = ngx.timer.every(delay, callback, user_arg1, user_arg2, ...)*
+
+**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+Similar to the [ngx.timer.at](#ngxtimerat) API function, but
+
+1. `delay` *cannot* be zero,
+1. timer will be created every `delay` seconds until the current Nginx worker process starts exiting.
+
+When success, returns a "conditional true" value (but not a `true`). Otherwise, returns a "conditional false" value and a string describing the error.
+
+This API also respect the [lua_max_pending_timers](#lua_max_pending_timers) and [lua_max_running_timers](#lua_max_running_timers).
+
+This API was first introduced in the `v0.10.9` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
 ngx.timer.running_count
 -----------------------
 **syntax:** *count = ngx.timer.running_count()*
diff --git a/debian/modules/nginx-lua/config b/debian/modules/nginx-lua/config
index 01a6b3c..044deb9 100644
--- a/debian/modules/nginx-lua/config
+++ b/debian/modules/nginx-lua/config
@@ -360,6 +360,7 @@ HTTP_LUA_SRCS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_storeby.c \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.c \
             $ngx_addon_dir/src/ngx_http_lua_ssl.c \
+            $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.c \
             "
 
 HTTP_LUA_DEPS=" \
@@ -420,6 +421,7 @@ HTTP_LUA_DEPS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_storeby.h \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.h \
             $ngx_addon_dir/src/ngx_http_lua_ssl.h \
+            $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.h \
             "
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
@@ -472,33 +474,6 @@ ngx_feature_test='setsockopt(1, SOL_SOCKET, SO_PASSCRED, NULL, 0);'
 
 . auto/feature
 
-ngx_feature="mmap(sbrk(0))"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_MMAP_SBRK"
-ngx_feature_run=yes
-ngx_feature_incs="#include <unistd.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#define align_ptr(p, a)                                                   \
-    (u_char *) (((uintptr_t) (p) + ((uintptr_t) a - 1)) & ~((uintptr_t) a - 1))
-"
-ngx_feature_test="
-#if defined(__x86_64__)
-exit(mmap(align_ptr(sbrk(0), getpagesize()), 1, PROT_READ,
-          MAP_FIXED|MAP_PRIVATE|MAP_ANON, -1, 0) < (void *) 0x40000000LL
-          ? 0 : 1);
-#else
-exit(1);
-#endif
-"
-SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
-
-. auto/feature
-
-CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-
 ngx_feature="__attribute__(constructor)"
 ngx_feature_libs=
 ngx_feature_name="NGX_HTTP_LUA_HAVE_CONSTRUCTOR"
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
index be454af..8393056 100644
--- a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/nginx-lua/doc/HttpLuaModule.wiki
@@ -10,40 +10,40 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.7] released on 4 November 2016.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.10] released on 8 August 2017.
 
 = Synopsis =
 <geshi lang="nginx">
     # set search paths for pure Lua external libraries (';;' is the default path):
     lua_package_path '/foo/bar/?.lua;/blah/?.lua;;';
- 
+
     # set search paths for Lua external libraries written in C (can also use ';;'):
     lua_package_cpath '/bar/baz/?.so;/blah/blah/?.so;;';
- 
+
     server {
         location /lua_content {
             # MIME type determined by default_type:
             default_type 'text/plain';
- 
+
             content_by_lua_block {
                 ngx.say('Hello,world!')
             }
         }
- 
+
         location /nginx_var {
             # MIME type determined by default_type:
             default_type 'text/plain';
- 
+
             # try access /nginx_var?a=hello,world
             content_by_lua_block {
                 ngx.say(ngx.var.arg_a)
             }
         }
- 
+
         location = /request_body {
             client_max_body_size 50k;
             client_body_buffer_size 50k;
- 
+
             content_by_lua_block {
                 ngx.req.read_body()  -- explicitly read the req body
                 local data = ngx.req.get_body_data()
@@ -62,13 +62,13 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
                 end
             }
         }
- 
+
         # transparent non-blocking I/O in Lua via subrequests
         # (well, a better way is to use cosockets)
         location = /lua {
             # MIME type determined by default_type:
             default_type 'text/plain';
- 
+
             content_by_lua_block {
                 local res = ngx.location.capture("/some_other_location")
                 if res then
@@ -78,51 +78,51 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
                 end
             }
         }
- 
+
         location = /foo {
             rewrite_by_lua_block {
                 res = ngx.location.capture("/memc",
                     { args = { cmd = "incr", key = ngx.var.uri } }
                 )
             }
- 
+
             proxy_pass http://blah.blah.com;
         }
- 
+
         location = /mixed {
             rewrite_by_lua_file /path/to/rewrite.lua;
             access_by_lua_file /path/to/access.lua;
             content_by_lua_file /path/to/content.lua;
         }
- 
+
         # use nginx var in code path
-        # WARNING: contents in nginx var must be carefully filtered,
+        # CAUTION: contents in nginx var must be carefully filtered,
         # otherwise there'll be great security risk!
         location ~ ^/app/([-_a-zA-Z0-9/]+) {
             set $path $1;
             content_by_lua_file /path/to/lua/app/root/$path.lua;
         }
- 
+
         location / {
            client_max_body_size 100k;
            client_body_buffer_size 100k;
- 
+
            access_by_lua_block {
                -- 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
- 
+
                -- check if the URI contains bad words
                if ngx.var.uri and
                       string.match(ngx.var.request_body, "evil")
                then
                    return ngx.redirect("/terms_of_use.html")
                end
- 
+
                -- tests passed
            }
- 
+
            # proxy_pass/fastcgi_pass/etc settings
         }
     }
@@ -197,7 +197,7 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 
 = Installation =
 
-It is highly recommended to use the [http://openresty.org OpenResty bundle] that bundles Nginx, ngx_lua,  LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: <code>./configure --with-luajit && make && make install</code>.
+It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
@@ -220,31 +220,37 @@ Build the source with this module:
     # tell nginx's build system where to find LuaJIT 2.1:
     export LUAJIT_LIB=/path/to/luajit/lib
     export LUAJIT_INC=/path/to/luajit/include/luajit-2.1
- 
+
     # 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 \
             --with-ld-opt="-Wl,-rpath,/path/to/luajit-or-lua/lib" \
             --add-module=/path/to/ngx_devel_kit \
             --add-module=/path/to/lua-nginx-module
- 
+
+    # Note that you may also want to add `./configure` options which are used in your
+    # current nginx build.
+    # You can get usually those options using command nginx -V
+
+    # you can change the parallism number 2 below to fit the number of spare CPU cores in your
+    # machine.
     make -j2
     make install
 </geshi>
 
 == Building as a dynamic module ==
 
-Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
-`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the <code>--add-dynamic-module=PATH</code> option instead of <code>--add-module=PATH</code> on the
+<code>./configure</code> command line above. And then you can explicitly load the module in your <code>nginx.conf</code> via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
 directive, for example,
 
-```nginx
+<geshi lang="nginx">
 load_module /path/to/modules/ndk_http_module.so;  # assuming NDK is built as a dynamic module too
 load_module /path/to/modules/ngx_http_lua_module.so;
-```
+</geshi>
 
 == C Macro Configurations ==
 
@@ -309,13 +315,13 @@ As from the <code>v0.5.0rc32</code> release, all <code>*_by_lua_file</code> conf
 Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 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
+    /path/to/luajit/bin/luajit -b /path/to/input_file.lua /path/to/output_file.ljbc
 </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
+    /path/to/luajit/bin/luajit -bg /path/to/input_file.lua /path/to/output_file.ljbc
 </geshi>
 
 Please refer to the official LuaJIT documentation on the <code>-b</code> option for more details:
@@ -451,7 +457,7 @@ Here is a complete small example:
         cat = 4,
         pig = 5,
     }
- 
+
     function _M.get_age(name)
         return data[name]
     end
@@ -495,9 +501,9 @@ If server-wide data sharing is required, then use one or more of the following a
 = 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. 
+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. 
+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.
 
@@ -520,15 +526,28 @@ instead of the old deprecated form:
 
 Here is the reason: by design, the global environment has exactly the same lifetime as the Nginx request handler associated with it. Each request handler has its own set of Lua global variables and that is the idea of request isolation. The Lua module is actually loaded by the first Nginx request handler and is cached by the <code>require()</code> built-in in the <code>package.loaded</code> table for later reference, and the <code>module()</code> builtin used by some Lua modules has the side effect of setting a global variable to the loaded module table. But this global variable will be cleared at the end of the request handler,  and every subsequent request handler all has its own (clean) global environment. So one will get Lua exception for accessing the <code>nil</code> value.
 
-Generally, use of Lua global variables is a really really bad idea in the context of ngx_lua because
+The use of Lua global variables is a generally inadvisable in the ngx_lua context as:
 
-# misuse of Lua globals has very bad side effects for concurrent requests when these variables are actually supposed to be local only,
-# Lua global variables require Lua table look-up in the global environment (which is just a Lua table), which is kinda expensive, and
-# some Lua global variable references are just typos, which are hard to debug.
+# the misuse of Lua globals has detrimental side effects on concurrent requests when such variables should instead be local in scope,
+# Lua global variables require Lua table look-ups in the global environment which is computationally expensive, and
+# some Lua global variable references may include typing errors which make such difficult to debug.
 
-It's *highly* recommended to always declare them via "local" in the scope that is reasonable.
+It is therefore *highly* recommended to always declare such within an appropriate local scope instead.
 
-To find out all the uses of Lua global variables in your Lua code, you can run the [https://github.com/openresty/nginx-devel-utils/blob/master/lua-releng lua-releng tool] across all your .lua source files:
+<geshi lang="lua">
+    -- Avoid
+    foo = 123
+    -- Recommended
+    local foo = 123
+
+    -- Avoid
+    function foo() return 123 end
+    -- Recommended
+    local function foo() return 123 end
+</geshi>
+
+
+To find all instances of Lua global variables in your Lua code, run the [https://github.com/openresty/nginx-devel-utils/blob/master/lua-releng lua-releng tool] across all <code>.lua</code> source files:
 <geshi lang="text">
 $ lua-releng
 Checking use of Lua global variables in file lib/foo/bar.lua ...
@@ -565,24 +584,23 @@ will not work as expected.
 
 == Cosockets Not Available Everywhere ==
 
-Due the internal limitations in the nginx core, the cosocket API are disabled in the following contexts: [[#set_by_lua|set_by_lua*]], [[#log_by_lua|log_by_lua*]], [[#header_filter_by_lua|header_filter_by_lua*]], and [[#body_filter_by_lua|body_filter_by_lua]].
+Due to internal limitations in the nginx core, the cosocket API is disabled in the following contexts: [[#set_by_lua|set_by_lua*]], [[#log_by_lua|log_by_lua*]], [[#header_filter_by_lua|header_filter_by_lua*]], and [[#body_filter_by_lua|body_filter_by_lua]].
 
 The cosockets are currently also disabled in the [[#init_by_lua|init_by_lua*]] and [[#init_worker_by_lua|init_worker_by_lua*]] directive contexts but we may add support for these contexts in the future because there is no limitation in the nginx core (or the limitation might be worked around).
 
-There exists a work-around, however, when the original context does *not* need to wait for the cosocket results. That is, creating a 0-delay timer via the [[#ngx.timer.at|ngx.timer.at]] API and do the cosocket results in the timer handler, which runs asynchronously as to the original context creating the timer.
+There exists a work-around, however, when the original context does *not* need to wait for the cosocket results. That is, creating a zero-delay timer via the [[#ngx.timer.at|ngx.timer.at]] API and do the cosocket results in the timer handler, which runs asynchronously as to the original context creating the timer.
 
 == Special Escaping Sequences ==
 
-'''WARNING''' We no longer suffer from this pitfall since the introduction of the
-<code>*_by_lua_block {}</code> configuration directives.
+'''NOTE''' Following the <code>v0.9.17</code> release, this pitfall can be avoided by using the <code>*_by_lua_block {}</code> configuration directives.
 
-PCRE sequences such as <code>\d</code>, <code>\s</code>, or <code>\w</code>, require special attention because in string literals, the backslash character, <code>\</code>, is stripped out by both the Lua language parser and by the Nginx config file parser before processing. So the following snippet will not work as expected:
+PCRE sequences such as <code>\d</code>, <code>\s</code>, or <code>\w</code>, require special attention because in string literals, the backslash character, <code>\</code>, is stripped out by both the Lua language parser and by the nginx config file parser before processing if not within a <code>*_by_lua_block {}</code> directive. So the following snippet will not work as expected:
 
 <geshi lang="nginx">
     # nginx.conf
     ? location /test {
     ?     content_by_lua '
-    ?         local regex = "\d+"  -- THIS IS WRONG!!
+    ?         local regex = "\d+"  -- THIS IS WRONG OUTSIDE OF A *_by_lua_block DIRECTIVE
     ?         local m = ngx.re.match("hello, 1234", regex)
     ?         if m then ngx.say(m[0]) else ngx.say("not matched!") end
     ?     ';
@@ -606,7 +624,7 @@ To avoid this, ''double'' escape the backslash:
 
 Here, <code>\\\\d+</code> is stripped down to <code>\\d+</code> by the Nginx config file parser and this is further stripped down to <code>\d+</code> by the Lua language parser before running.
 
-Alternatively, the regex pattern can be presented as a long-bracketed Lua string literal by encasing it in "long brackets", <code>&#91;[...]]</code>, in which case backslashes have to only be escaped once for the Nginx config file parser. 
+Alternatively, the regex pattern can be presented as a long-bracketed Lua string literal by encasing it in "long brackets", <code>&#91;[...]]</code>, in which case backslashes have to only be escaped once for the Nginx config file parser.
 
 <geshi lang="nginx">
     # nginx.conf
@@ -622,7 +640,7 @@ 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. 
+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.
 
 <geshi lang="nginx">
@@ -637,7 +655,7 @@ The <code>[=[...]=]</code> form may be used as the default form if desired.
     # evaluates to "1234"
 </geshi>
 
-An alternative approach to escaping PCRE sequences is to ensure that Lua code is placed in external script files and executed using the various <code>*_by_lua_file</code> directives. 
+An alternative approach to escaping PCRE sequences is to ensure that Lua code is placed in external script files and executed using the various <code>*_by_lua_file</code> directives.
 With this approach, the backslashes are only stripped by the Lua language parser and therefore only need to be escaped once each.
 
 <geshi lang="lua">
@@ -648,8 +666,8 @@ With this approach, the backslashes are only stripped by the Lua language parser
     -- evaluates to "1234"
 </geshi>
 
-Within external script files, PCRE sequences presented as long-bracketed Lua string literals do not require modification. 
- 
+Within external script files, PCRE sequences presented as long-bracketed Lua string literals do not require modification.
+
 <geshi lang="lua">
     -- test.lua
     local regex = [[\d+]]
@@ -658,6 +676,21 @@ Within external script files, PCRE sequences presented as long-bracketed Lua str
     -- evaluates to "1234"
 </geshi>
 
+As noted earlier, PCRE sequences presented within <code>*_by_lua_block {}</code> directives (available following the <code>v0.9.17</code> release) do not require modification.
+
+<geshi lang="nginx">
+    # nginx.conf
+    location /test {
+        content_by_lua_block {
+            local regex = "\d+"
+            local m = ngx.re.match("hello, 1234", regex)
+            if m then ngx.say(m[0]) else ngx.say("not matched!") end
+        }
+    }
+    # evaluates to "1234"
+</geshi>
+
+
 == Mixing with SSI Not Supported ==
 
 Mixing SSI with ngx_lua in the same Nginx request is not supported at all. Just use ngx_lua exclusively. Everything you can do with SSI can be done atop ngx_lua anyway and it can be more efficient when using ngx_lua.
@@ -705,7 +738,6 @@ servers in Lua. For example,
 * cosocket: pool-based backend concurrency level control: implement automatic <code>connect</code> queueing when the backend concurrency exceeds its connection pool limit.
 * cosocket: review and merge aviramc's [https://github.com/openresty/lua-nginx-module/pull/290 patch] for adding the <code>bsdrecv</code> method.
 * add new API function <code>ngx.resp.add_header</code> to emulate the standard <code>add_header</code> config directive.
-* 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.
@@ -713,11 +745,11 @@ servers in Lua. For example,
 * 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.
 * 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 [https://httpd.apache.org/docs/trunk/mod/mod_lua.html mod_lua].
-* cosocket: add client SSL certificiate support.
+* cosocket: add client SSL certificate support.
 
 = Changes =
 
-The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
+The changes made in every release of this module are listed in the change logs of the OpenResty bundle:
 
 http://openresty.org/#Changes
 
@@ -772,7 +804,7 @@ To run specific test files:
     prove -I/path/to/test-nginx/lib t/002-content.t t/003-errors.t
 </geshi>
 
-To run a specific test block in a particular test file, add the line <code>--- ONLY</code> to the test block you want to run, and then use the `prove` utility to run that <code>.t</code> file.
+To run a specific test block in a particular test file, add the line <code>--- ONLY</code> to the test block you want to run, and then use the <code>prove</code> utility to run that <code>.t</code> file.
 
 There are also various testing modes based on mockeagain, valgrind, and etc. Refer to the [http://search.cpan.org/perldoc?Test::Nginx Test::Nginx documentation] for more details for various advanced testing modes. See also the test reports for the Nginx test cluster running on Amazon EC2: http://qa.openresty.org.
 
@@ -780,9 +812,9 @@ There are also various testing modes based on mockeagain, valgrind, and etc. Ref
 
 This module is licensed under the BSD license.
 
-Copyright (C) 2009-2016, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
+Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2016, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright (C) 2009-2017, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -827,6 +859,52 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 ![Lua Nginx Modules Directives](https://cloud.githubusercontent.com/assets/2137369/15272097/77d1c09e-1a37-11e6-97ef-d9767035fc3e.png)
 
+== lua_capture_error_log ==
+'''syntax:''' ''lua_capture_error_log size''
+
+'''default:''' ''none''
+
+'''context:''' ''http''
+
+Enables a buffer of the specified <code>size</code> for capturing all the nginx error log message data (not just those produced
+by this module or the nginx http subsystem, but everything) without touching files or disks.
+
+You can use units like `k` and `m` in the <code>size</code> value, as in
+
+<geshi lang="nginx">
+    lua_capture_error_log 100k;
+</geshi>
+
+As a rule of thumb, a 4KB buffer can usually hold about 20 typical error log messages. So do the maths!
+
+This buffer never grows. If it is full, new error log messages will replace the oldest ones in the buffer.
+
+The size of the buffer must be bigger than the maximum length of a single error log message (which is 4K in OpenResty and 2K in stock NGINX).
+
+You can read the messages in the buffer on the Lua land via the
+[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#get_logs get_logs()]
+function of the
+[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#readme ngx.errlog]
+module of the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#readme lua-resty-core]
+library. This Lua API function will return the captured error log messages and
+also remove these already read from the global capturing buffer, making room
+for any new error log data. For this reason, the user should not configure this
+buffer to be too big if the user read the buffered error log data fast enough.
+
+Note that the log level specified in the standard [http://nginx.org/r/error_log error_log] directive
+''does'' have effect on this capturing facility. It only captures log
+messages of a level no lower than the specified log level in the [http://nginx.org/r/error_log error_log] directive.
+The user can still choose to set an even higher filtering log level on the fly via the Lua API function
+[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#set_filter_level errlog.set_filter_level].
+So it is more flexible than the static [http://nginx.org/r/error_log error_log] directive.
+
+It is worth noting that there is no way to capture the debugging logs
+without building OpenResty or NGINX with the <code>./configure</code>
+option <code>--with-debug</code>. And enabling debugging logs is
+strongly discouraged in production builds due to high overhead.
+
+This directive was first introduced in the <code>v0.10.9</code> release.
+
 == lua_use_default_type ==
 '''syntax:''' ''lua_use_default_type on | off''
 
@@ -834,7 +912,7 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 '''context:''' ''http, server, location, location if''
 
-Specifies whether to use the MIME type specified by the [http://nginx.org/en/docs/http/ngx_http_core_module.html#default_type default_type] directive for the default value of the <code>Content-Type</code> response header. If you do not want a default <code>Content-Type</code> response header for your Lua request handlers, then turn this directive off.
+Specifies whether to use the MIME type specified by the [http://nginx.org/en/docs/http/ngx_http_core_module.html#default_type default_type] directive for the default value of the <code>Content-Type</code> response header. Deactivate this directive if a default <code>Content-Type</code> response header for Lua request handlers is not desired.
 
 This directive is turned on by default.
 
@@ -898,8 +976,8 @@ The ngx_lua module does not support the <code>stat</code> mode available with th
 Apache <code>mod_lua</code> module (yet).
 
 Disabling the Lua code cache is strongly
-discouraged for production use and should only be used during 
-development as it has a significant negative impact on overall performance. For example, the performance a "hello world" Lua example can drop by an order of magnitude after disabling the Lua code cache.
+discouraged for production use and should only be used during
+development as it has a significant negative impact on overall performance. For example, the performance of a "hello world" Lua example can drop by an order of magnitude after disabling the Lua code cache.
 
 == lua_regex_cache_max_entries ==
 '''syntax:''' ''lua_regex_cache_max_entries <num>''
@@ -918,6 +996,8 @@ The default number of entries allowed is 1024 and when this limit is reached, ne
     2011/08/27 23:18:26 [warn] 31997#0: *1 lua exceeding regex cache max entries (1024), ...
 </geshi>
 
+If you are using the <code>ngx.re.*</code> implementation of [lua-resty-core](https://github.com/openresty/lua-resty-core) by loading the <code>resty.core.regex</code> module (or just the <code>resty.core</code> module), then an LRU cache is used for the regex cache being used here.
+
 Do not activate the <code>o</code> option for regular expressions (and/or <code>replace</code> string arguments for [[#ngx.re.sub|ngx.re.sub]] and [[#ngx.re.gsub|ngx.re.gsub]]) that are generated ''on the fly'' and give rise to infinite variations to avoid hitting the specified limit.
 
 == lua_regex_match_limit ==
@@ -971,8 +1051,7 @@ As from the <code>v0.5.0rc29</code> release, the special notation <code>$prefix<
 
 '''phase:''' ''loading-config''
 
-'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
-use the new [[#init_by_lua_block|init_by_lua_block]] directive instead.
+'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#init_by_lua_block|init_by_lua_block]] directive instead.
 
 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.
 
@@ -1041,7 +1120,7 @@ This directive was first introduced in the <code>v0.5.5</code> release.
 
 Similar to the [[#init_by_lua|init_by_lua]] directive except that this directive inlines
 the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
 special character escaping).
 
 For instance,
@@ -1076,7 +1155,7 @@ This directive was first introduced in the <code>v0.5.5</code> release.
 
 '''phase:''' ''starting-worker''
 
-'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged''; use the new [[#init_worker_by_lua_block|init_worker_by_lua_block]] directive instead.
+'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#init_worker_by_lua_block|init_worker_by_lua_block]] directive instead.
 
 Runs the specified Lua code upon every Nginx worker process's startup when the master process is enabled. When the master process is disabled, this hook will just run after [[#init_by_lua|init_by_lua*]].
 
@@ -1101,8 +1180,8 @@ This hook is often used to create per-worker reoccurring timers (via the [[#ngx.
             end
         end
 
-        local ok, err = new_timer(delay, check)
-        if not ok then
+        local hdl, err = new_timer(delay, check)
+        if not hdl then
             log(ERR, "failed to create timer: ", err)
             return
         end
@@ -1121,7 +1200,7 @@ This directive was first introduced in the <code>v0.9.5</code> release.
 
 Similar to the [[#init_worker_by_lua|init_worker_by_lua]] directive except that this directive inlines
 the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
 special character escaping).
 
 For instance,
@@ -1154,7 +1233,7 @@ This directive was first introduced in the <code>v0.9.5</code> release.
 
 '''phase:''' ''rewrite''
 
-'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged''; use the new [[#set_by_lua_block|set_by_lua_block]] directive instead.
+'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#set_by_lua_block|set_by_lua_block]] directive instead.
 
 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).
@@ -1177,15 +1256,15 @@ a time. However, a workaround is possible using the [[#ngx.var.VARIABLE|ngx.var.
 <geshi lang="nginx">
     location /foo {
         set $diff ''; # we have to predefine the $diff variable here
- 
+
         set_by_lua $sum '
             local a = 32
             local b = 56
- 
+
             ngx.var.diff = a - b;  -- write to $diff directly
             return a + b;          -- return the $sum value normally
         ';
- 
+
         echo "sum = $sum, diff = $diff";
     }
 </geshi>
@@ -1213,7 +1292,7 @@ This directive requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_ki
 Similar to the [[#set_by_lua|set_by_lua]] directive except that
 
 # this directive inlines the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
 special character escaping), and
 # this directive does not support extra arguments after the Lua script as in [[#set_by_lua|set_by_lua]].
 
@@ -1235,15 +1314,15 @@ This directive was first introduced in the <code>v0.9.17</code> release.
 
 '''phase:''' ''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, or, as from the <code>v0.5.0rc32</code> release, the [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] 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 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 
+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 
+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.
 
 This directive requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_kit] module.
@@ -1256,10 +1335,9 @@ This directive requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_ki
 
 '''phase:''' ''content''
 
-'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
-use the new [[#content_by_lua_block|content_by_lua_block]] directive instead.
+'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#content_by_lua_block|content_by_lua_block]] directive instead.
 
-Acts as a "content handler" and executes Lua code string specified in <code><lua-script-str></code> for every request. 
+Acts as a "content handler" and executes Lua code string specified in <code><lua-script-str></code> for every request.
 The Lua code may make [[#Nginx API for Lua|API calls]] and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
 
 Do not use this directive and other content handler directives in the same location. For example, this directive and the [[HttpProxyModule#proxy_pass|proxy_pass]] directive should not be used in the same location.
@@ -1274,7 +1352,7 @@ Do not use this directive and other content handler directives in the same locat
 
 Similar to the [[#content_by_lua|content_by_lua]] directive except that this directive inlines
 the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
 special character escaping).
 
 For instance,
@@ -1301,15 +1379,15 @@ Nginx variables can be used in the <code><path-to-lua-script-file></code> string
 
 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 
+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 
+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.
 
 Nginx variables are supported in the file path for dynamic dispatch, for example:
 
 <geshi lang="nginx">
-    # WARNING: contents in nginx var must be carefully filtered,
+    # CAUTION: contents in nginx var must be carefully filtered,
     # otherwise there'll be great security risk!
     location ~ ^/app/([-_a-zA-Z0-9/]+) {
         set $path $1;
@@ -1327,8 +1405,7 @@ But be very careful about malicious user inputs and always carefully validate or
 
 '''phase:''' ''rewrite tail''
 
-'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
-use the new [[#rewrite_by_lua_block|rewrite_by_lua_block]] directive instead.
+'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#rewrite_by_lua_block|rewrite_by_lua_block]] directive instead.
 
 Acts as a rewrite phase handler and executes Lua code string specified in <code><lua-script-str></code> for every request.
 The Lua code may make [[#Nginx API for Lua|API calls]] and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
@@ -1376,7 +1453,7 @@ The right way of doing this is as follows:
                 return ngx.redirect("/bar");
             end
         ';
- 
+
         echo "res = $b";
     }
 </geshi>
@@ -1388,11 +1465,11 @@ Note that the [http://www.grid.net.ru/nginx/eval.en.html ngx_eval] module can be
         eval $res {
             proxy_pass http://foo.com/check-spam;
         }
- 
+
         if ($res = 'spam') {
             rewrite ^ /terms-of-use.html redirect;
         }
- 
+
         fastcgi_pass ...;
     }
 </geshi>
@@ -1404,7 +1481,7 @@ can be implemented in ngx_lua as:
         internal;
         proxy_pass http://foo.com/check-spam;
     }
- 
+
     location / {
         rewrite_by_lua '
             local res = ngx.location.capture("/check-spam")
@@ -1412,7 +1489,7 @@ can be implemented in ngx_lua as:
                 return ngx.redirect("/terms-of-use.html")
             end
         ';
- 
+
         fastcgi_pass ...;
     }
 </geshi>
@@ -1447,7 +1524,7 @@ The <code>rewrite_by_lua</code> code will always run at the end of the <code>rew
 
 Similar to the [[#rewrite_by_lua|rewrite_by_lua]] directive except that this directive inlines
 the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
 special character escaping).
 
 For instance,
@@ -1488,8 +1565,7 @@ Nginx variables are supported in the file path for dynamic dispatch just as in [
 
 '''phase:''' ''access tail''
 
-'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
-use the new [[#access_by_lua_block|access_by_lua_block]] directive instead.
+'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#access_by_lua_block|access_by_lua_block]] directive instead.
 
 Acts as an access phase handler and executes Lua code string specified in <code><lua-script-str></code> for every request.
 The Lua code may make [[#Nginx API for Lua|API calls]] and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
@@ -1502,12 +1578,12 @@ Note that this handler always runs ''after'' the standard [[HttpAccessModule]].
         allow   192.168.1.0/24;
         allow   10.1.1.0/16;
         deny    all;
- 
+
         access_by_lua '
             local res = ngx.location.capture("/mysql", { ... })
             ...
         ';
- 
+
         # proxy_pass/fastcgi_pass/...
     }
 </geshi>
@@ -1519,7 +1595,7 @@ Note that the [http://mdounin.ru/hg/ngx_http_auth_request_module/ ngx_auth_reque
 <geshi lang="nginx">
     location / {
         auth_request /auth;
- 
+
         # proxy_pass/fastcgi_pass/postgres_pass/...
     }
 </geshi>
@@ -1530,18 +1606,18 @@ can be implemented in ngx_lua as:
     location / {
         access_by_lua '
             local res = ngx.location.capture("/auth")
- 
+
             if res.status == ngx.HTTP_OK then
                 return
             end
- 
+
             if res.status == ngx.HTTP_FORBIDDEN then
                 ngx.exit(res.status)
             end
- 
+
             ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
         ';
- 
+
         # proxy_pass/fastcgi_pass/postgres_pass/...
     }
 </geshi>
@@ -1564,7 +1640,7 @@ of NGINX.
 
 Similar to the [[#access_by_lua|access_by_lua]] directive except that this directive inlines
 the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
 special character escaping).
 
 For instance,
@@ -1591,7 +1667,7 @@ Nginx variables can be used in the <code><path-to-lua-script-file></code> string
 
 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 
+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 repeatedly reloading Nginx.
 
@@ -1605,8 +1681,7 @@ Nginx variables are supported in the file path for dynamic dispatch just as in [
 
 '''phase:''' ''output-header-filter''
 
-'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
-use the new [[#header_filter_by_lua_block|header_filter_by_lua_block]] directive instead.
+'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#header_filter_by_lua_block|header_filter_by_lua_block]] directive instead.
 
 Uses Lua code specified in <code><lua-script-str></code> to define an output header filter.
 
@@ -1638,7 +1713,7 @@ This directive was first introduced in the <code>v0.2.1rc20</code> release.
 
 Similar to the [[#header_filter_by_lua|header_filter_by_lua]] directive except that this directive inlines
 the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
 special character escaping).
 
 For instance,
@@ -1673,8 +1748,7 @@ This directive was first introduced in the <code>v0.2.1rc20</code> release.
 
 '''phase:''' ''output-body-filter''
 
-'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
-use the new [[#body_filter_by_lua_block|body_filter_by_lua_block]] directive instead.
+'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#body_filter_by_lua_block|body_filter_by_lua_block]] directive instead.
 
 Uses Lua code specified in <code><lua-script-str></code> to define an output body filter.
 
@@ -1761,7 +1835,7 @@ This directive was first introduced in the <code>v0.5.0rc32</code> release.
 
 Similar to the [[#body_filter_by_lua|body_filter_by_lua]] directive except that this directive inlines
 the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
 special character escaping).
 
 For instance,
@@ -1796,15 +1870,14 @@ This directive was first introduced in the <code>v0.5.0rc32</code> release.
 
 '''phase:''' ''log''
 
-'''WARNING''' Since the <code>v0.9.17</code> release, use of this directive is ''discouraged'';
-use the new [[#log_by_lua_block|log_by_lua_block]] directive instead.
+'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#log_by_lua_block|log_by_lua_block]] directive instead.
 
 Runs 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 before.
 
 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]])
 * 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]]).
 
@@ -1838,7 +1911,7 @@ Here is an example of gathering average data for [[HttpUpstreamModule#$upstream_
                 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)")
@@ -1862,7 +1935,7 @@ This directive was first introduced in the <code>v0.5.0rc31</code> release.
 
 Similar to the [[#log_by_lua|log_by_lua]] directive except that this directive inlines
 the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
+inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
 special character escaping).
 
 For instance,
@@ -2430,7 +2503,7 @@ See also [[#lua_ssl_trusted_certificate|lua_ssl_trusted_certificate]].
 
 '''context:''' ''http, server, location, location-if''
 
-Enables or disables automatic response buffering 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 automatic response buffering for HTTP 1.0 (or older) requests. This buffering mechanism is mainly used for HTTP 1.0 keep-alive which relies 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 explicitly via [[#ngx.send_headers|ngx.send_headers]] or implicitly via the first [[#ngx.say|ngx.say]] or [[#ngx.print|ngx.print]] call), then the HTTP 1.0 response buffering will be disabled even when this directive is turned on.
 
@@ -2486,7 +2559,7 @@ This directive was first introduced in the <code>v0.5.0rc32</code> release.
 
 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.
+When this directive is 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>).
 
@@ -2592,11 +2665,11 @@ Here is an example
     location /foo {
         set $a 32;
         set $b 56;
- 
+
         set_by_lua $sum
             'return tonumber(ngx.arg[1]) + tonumber(ngx.arg[2])'
             $a $b;
- 
+
         echo $sum;
     }
 </geshi>
@@ -2646,7 +2719,7 @@ 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,
+'''CAUTION''' 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
@@ -2655,7 +2728,7 @@ Setting <code>ngx.var.Foo</code> to a <code>nil</code> value will unset the <cod
 
 to prevent (temporary) memory leaking within the current request's lifetime. Another way of caching the result is to use the [[#ngx.ctx|ngx.ctx]] table.
 
-Undefined NGINX variables are evaluated to `nil` while uninitialized (but defined) NGINX variables are evaluated to an empty Lua string.
+Undefined NGINX variables are evaluated to <code>nil</code> while uninitialized (but defined) NGINX variables are evaluated to an empty Lua string.
 
 This API requires a relatively expensive metamethod call and it is recommended to avoid using it on hot code paths.
 
@@ -2780,7 +2853,7 @@ There is a hard coded <code>2048</code> byte limitation on error message lengths
 == ngx.ctx ==
 '''context:''' ''init_worker_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.timer.*, balancer_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). 
+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).
 
 Consider the following example,
 
@@ -2816,7 +2889,7 @@ Every request, including subrequests, has its own copy of the table. For example
             ngx.say("sub post: ", ngx.ctx.blah)
         }
     }
- 
+
     location /main {
         content_by_lua_block {
             ngx.ctx.blah = 73
@@ -2847,7 +2920,7 @@ Internal redirection will destroy the original request <code>ngx.ctx</code> data
             ngx.say(ngx.ctx.foo)
         }
     }
- 
+
     location /orig {
         content_by_lua_block {
             ngx.ctx.foo = "hello"
@@ -2876,14 +2949,14 @@ When being used in the context of [[#init_worker_by_lua|init_worker_by_lua*]], t
 
 The <code>ngx.ctx</code> lookup requires relatively expensive metamethod calls and it is much slower than explicitly passing per-request data along by your own function arguments. So do not abuse this API for saving your own function arguments because it usually has quite some performance impact.
 
-Because of the metamethod magic, never "local" the <code>ngx.ctx</code> table outside your Lua function scope on the Lua module level level due to [[#Data_Sharing_within_an_Nginx_Worker|worker-level data sharing]]. For example, the following is bad:
+Because of the metamethod magic, never "local" the <code>ngx.ctx</code> table outside your Lua function scope on the Lua module level due to [[#Data_Sharing_within_an_Nginx_Worker|worker-level data sharing]]. For example, the following is bad:
 
 <geshi lang="lua">
 -- mymodule.lua
 local _M = {}
 
 -- the following line is bad since ngx.ctx is a per-request
--- data while this `ctx` variable is on the Lua module level
+-- data while this <code>ctx</code> variable is on the Lua module level
 -- and thus is per-nginx-worker.
 local ctx = ngx.ctx
 
@@ -2907,7 +2980,7 @@ end
 return _M
 </geshi>
 
-That is, let the caller pass the `ctx` table explicitly via a function argument.
+That is, let the caller pass the <code>ctx</code> table explicitly via a function argument.
 
 == ngx.location.capture ==
 '''syntax:''' ''res = ngx.location.capture(uri, options?)''
@@ -3024,7 +3097,7 @@ The <code>args</code> option can also take plain query strings:
 
 This is functionally identical to the previous examples.
 
-The <code>share_all_vars</code> option controls whether to share nginx variables among the current request and its subrequests. 
+The <code>share_all_vars</code> option controls whether to share nginx variables among the current request and its subrequests.
 If this option is set to <code>true</code>, then the current request and associated subrequests will share the same Nginx variable scope. Hence, changes to Nginx variables made by a subrequest will affect the current request.
 
 Care should be taken in using this option as variable scope sharing can have unexpected side effects. The <code>args</code>, <code>vars</code>, or <code>copy_all_vars</code> options are generally preferable instead.
@@ -3089,7 +3162,7 @@ In addition to the two settings above, it is possible to specify
 values for variables in the subrequest using the <code>vars</code> option. These
 variables are set after the sharing or copying of variables has been
 evaluated, and provides a more efficient method of passing specific
-values to a subrequest over encoding them as URL arguments and 
+values to a subrequest over encoding them as URL arguments and
 unescaping them in the Nginx config file.
 
 <geshi lang="nginx">
@@ -3171,7 +3244,7 @@ Note that subrequests issued by [[#ngx.location.capture|ngx.location.capture]] i
 request headers of the current request by default and that this may have unexpected side effects on the
 subrequest responses. For example, when using the standard <code>ngx_proxy</code> module to serve
 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 
+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.
 
 When the <code>body</code> option is not specified and the <code>always_forward_body</code> option is false (the default value), the <code>POST</code> and <code>PUT</code> subrequests will inherit the request bodies of the parent request (if any).
@@ -3201,11 +3274,11 @@ This function issues several parallel subrequests specified by the input table a
         { "/bar" },
         { "/baz", { method = ngx.HTTP_POST, body = "hello" } },
     }
- 
+
     if res1.status == ngx.HTTP_OK then
         ...
     end
- 
+
     if res2.body == "BLAH" then
         ...
     end
@@ -3223,10 +3296,10 @@ Lua tables can be used for both requests and responses when the number of subreq
     table.insert(reqs, { "/postgres" })
     table.insert(reqs, { "/redis" })
     table.insert(reqs, { "/memcached" })
- 
+
     -- issue all the requests at once and wait until they all return
     local resps = { ngx.location.capture_multi(reqs) }
- 
+
     -- loop over the responses table
     for i, resp in ipairs(resps) do
         -- process the response table "resp"
@@ -3278,7 +3351,7 @@ The header names are matched case-insensitively.
 <geshi lang="lua">
     -- equivalent to ngx.header["Content-Type"] = 'text/plain'
     ngx.header.content_type = 'text/plain';
- 
+
     ngx.header["X-My-Header"] = 'blah blah';
 </geshi>
 
@@ -3295,7 +3368,7 @@ will yield
     Set-Cookie: b=4; path=/
 </geshi>
 
-in the response headers. 
+in the response headers.
 
 Only Lua tables are accepted (Only the last element in the table will take effect for standard headers such as <code>Content-Type</code> that only accept a single value).
 
@@ -3323,7 +3396,7 @@ The same applies to assigning an empty table:
 
 Setting <code>ngx.header.HEADER</code> after sending out response headers (either explicitly with [[#ngx.send_headers|ngx.send_headers]] or implicitly with [[#ngx.print|ngx.print]] and similar) will throw out a Lua exception.
 
-Reading <code>ngx.header.HEADER</code> will return the value of the response header named <code>HEADER</code>. 
+Reading <code>ngx.header.HEADER</code> will return the value of the response header named <code>HEADER</code>.
 
 Underscores (<code>_</code>) in the header names will also be replaced by dashes (<code>-</code>) and the header names will be matched case-insensitively. If the response header is not present at all, <code>nil</code> will be returned.
 
@@ -3655,8 +3728,8 @@ Arguments without the <code>=<value></code> parts are treated as boolean argumen
 That is, they will take Lua boolean values <code>true</code>. However, they are different from arguments taking empty string values. <code>GET /test?foo=&bar=</code> will give something like
 
 <geshi lang="bash">
-    foo: 
-    bar: 
+    foo:
+    bar:
 </geshi>
 
 Empty key arguments are discarded. <code>GET /test?=hello&=world</code> will yield an empty output for instance.
@@ -3760,13 +3833,13 @@ Arguments without the <code>=<value></code> parts are treated as boolean argumen
 That is, they will take Lua boolean values <code>true</code>. However, they are different from arguments taking empty string values. <code>POST /test</code> with request body <code>foo=&bar=</code> will return something like
 
 <geshi lang="bash">
-    foo: 
-    bar: 
+    foo:
+    bar:
 </geshi>
 
 Empty key arguments are discarded. <code>POST /test</code> with body <code>=hello&=world</code> will yield empty outputs for instance.
 
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks.  
+Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks.
 
 However, the optional <code>max_args</code> function argument can be used to override this limit:
 
@@ -3818,7 +3891,7 @@ the value of <code>ngx.req.get_headers()["Foo"]</code> will be a Lua (array) tab
     {"foo", "bar", "baz"}
 </geshi>
 
-Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks.  
+Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks.
 
 However, the optional <code>max_headers</code> function argument can be used to override this limit:
 
@@ -4164,6 +4237,7 @@ The optional <code>status</code> parameter specifies the HTTP status code to be
 
 * <code>301</code>
 * <code>302</code> (default)
+* <code>303</code>
 * <code>307</code>
 
 It is <code>302</code> (<code>ngx.HTTP_MOVED_TEMPORARILY</code>) by default.
@@ -4367,7 +4441,7 @@ Note that while this method accepts all [[#HTTP status constants|HTTP status con
 
 Also note that this method call terminates the processing of the current request and that it is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.exit(...)</code> be used to reinforce the fact that the request processing is being terminated.
 
-When being used in the contexts of [[#header_filter_by_lua|header_filter_by_lua]] and
+When being used in the contexts of [[#header_filter_by_lua|header_filter_by_lua*]], [[#balancer_by_lua_block|balancer_by_lua*]], and
 [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]], <code>ngx.exit()</code> is
 an asynchronous operation and will return immediately. This behavior may change in future and it is recommended that users always use <code>return</code> in combination as suggested above.
 
@@ -4378,14 +4452,14 @@ an asynchronous operation and will return immediately. This behavior may change
 
 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:
+When you disable the HTTP 1.1 keep-alive feature for your downstream connections, you can rely on well written 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_block {
             ngx.say("got the task!")
-            ngx.eof()  -- a descent HTTP client will close the connection at this point
+            ngx.eof()  -- well written HTTP clients will close the connection at this point
             -- access MySQL, PostgreSQL, Redis, Memcached, and etc here...
         }
     }
@@ -4646,7 +4720,7 @@ This is the local time.
 
 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.
+Updates of the Nginx time cache can be forced by calling [[#ngx.update_time|ngx.update_time]] first.
 
 == ngx.now ==
 '''syntax:''' ''secs = ngx.now()''
@@ -4858,7 +4932,7 @@ The optional fourth argument, <code>ctx</code>, can be a Lua table holding an op
 <geshi lang="lua">
     local ctx = { pos = 2 }
     local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
-         -- m[0] = "34"
+         -- m[0] = "234"
          -- ctx.pos == 5
 </geshi>
 
@@ -5024,7 +5098,7 @@ When the <code>replace</code> is a string, then it is treated as a special templ
 
 where <code>$0</code> referring to the whole substring matched by the pattern and <code>$1</code> referring to the first parenthesized capturing substring.
 
-Curly braces can also be used to disambiguate variable names from the background string literals: 
+Curly braces can also be used to disambiguate variable names from the background string literals:
 
 <geshi lang="lua">
     local newstr, n, err = ngx.re.sub("hello, 1234", "[0-9]", "${0}00")
@@ -5123,6 +5197,8 @@ The resulting object <code>dict</code> has the following methods:
 * [[#ngx.shared.DICT.flush_expired|flush_expired]]
 * [[#ngx.shared.DICT.get_keys|get_keys]]
 
+All these methods are ''atomic'' operations, that is, safe from concurrent accesses from multiple nginx worker processes for the same <code>lua_shared_dict</code> zone.
+
 Here is an example:
 
 <geshi lang="nginx">
@@ -5343,7 +5419,7 @@ The <code>value</code> argument and <code>init</code> argument can be any valid
 
 This method was first introduced in the <code>v0.3.1rc22</code> release.
 
-The optional `init` parameter was first added in the <code>v0.10.6</code> release.
+The optional <code>init</code> parameter was first added in the <code>v0.10.6</code> release.
 
 See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 
@@ -5445,7 +5521,7 @@ 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.
+'''CAUTION''' Avoid calling this method on dictionaries with a very large number of keys as it may lock the dictionary for significant amount of time and block Nginx worker processes trying to access the dictionary.
 
 This feature was first introduced in the <code>v0.7.3</code> release.
 
@@ -5724,7 +5800,7 @@ session userdata returned by a previous <code>sslhandshake</code>
 call for exactly the same target. For short-lived connections, reusing SSL
 sessions can usually speed up the handshake by one order by magnitude but it
 is not so useful if the connection pool is enabled. This argument defaults to
-`nil`. If this argument takes the boolean `false` value, no SSL session
+<code>nil</code>. If this argument takes the boolean <code>false</code> value, no SSL session
 userdata would return by this call and only a Lua boolean will be returned as
 the first return value; otherwise the current SSL session will
 always be returned as the first argument in case of successes.
@@ -5737,7 +5813,7 @@ also used to validate the server name specified in the server certificate sent f
 the remote.
 
 The optional <code>ssl_verify</code> argument takes a Lua boolean value to
-control whether to perform SSL verification. When set to `true`, the server
+control whether to perform SSL verification. When set to <code>true</code>, the server
 certificate will be verified according to the CA certificates specified by
 the [[#lua_ssl_trusted_certificate|lua_ssl_trusted_certificate]] directive.
 You may also need to adjust the [[#lua_ssl_verify_depth|lua_ssl_verify_depth]]
@@ -6148,7 +6224,7 @@ Then it will generate the output
     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):
+"Light threads" are mostly useful for making concurrent upstream requests in a single Nginx request handler, much 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 (similar to Facebook's BigPipe model):
 
 <geshi lang="lua">
     -- query mysql, memcached, and a remote http service at the same time,
@@ -6187,7 +6263,7 @@ Then it will generate the output
 
     ngx.thread.spawn(query_mysql)      -- create thread 1
     ngx.thread.spawn(query_memcached)  -- create thread 2
-    ngx.thread.spawn(query_http)       -- create thread 3 
+    ngx.thread.spawn(query_http)       -- create thread 3
 </geshi>
 
 This API was first enabled in the <code>v0.7.0</code> release.
@@ -6338,7 +6414,7 @@ This API was first introduced in the <code>v0.7.4</code> release.
 See also [[#lua_check_client_abort|lua_check_client_abort]].
 
 == ngx.timer.at ==
-'''syntax:''' ''ok, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)''
+'''syntax:''' ''hdl, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)''
 
 '''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
@@ -6364,7 +6440,7 @@ Premature timer expiration happens when the Nginx worker process is
 trying to shut down, as in an Nginx configuration reload triggered by
 the <code>HUP</code> signal or in an Nginx server shutdown. When the Nginx worker
 is trying to shut down, one can no longer call <code>ngx.timer.at</code> to
-create new timers with nonzero delays and in that case <code>ngx.timer.at</code> will return <code>nil</code> and
+create new timers with nonzero delays and in that case <code>ngx.timer.at</code> will return a "conditional false" value and
 a string describing the error, that is, "process exiting".
 
 Starting from the <code>v0.9.3</code> release, it is allowed to create zero-delay timers even when the Nginx worker process starts shutting down.
@@ -6413,7 +6489,7 @@ One can also create infinite re-occurring timers, for instance, a timer getting
             return
         end
     end
-    
+
     local ok, err = ngx.timer.at(delay, handler)
     if not ok then
         ngx.log(ngx.ERR, "failed to create the timer: ", err)
@@ -6421,6 +6497,9 @@ One can also create infinite re-occurring timers, for instance, a timer getting
     end
 </geshi>
 
+It is recommended, however, to use the [[#ngx.timer.every|ngx.timer.every]] API function
+instead for creating recurring timers since it is more robust.
+
 Because timer callbacks run in the background and their running time
 will not add to any client request's response time, they can easily
 accumulate in the server and exhaust system resources due to either
@@ -6458,6 +6537,22 @@ You can pass most of the standard Lua values (nils, booleans, numbers, strings,
 
 This API was first introduced in the <code>v0.8.0</code> release.
 
+== ngx.timer.every ==
+'''syntax:''' ''hdl, err = ngx.timer.every(delay, callback, user_arg1, user_arg2, ...)''
+
+'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+Similar to the [[#ngx.timer.at|ngx.timer.at]] API function, but
+
+# <code>delay</code> ''cannot'' be zero,
+# timer will be created every <code>delay</code> seconds until the current Nginx worker process starts exiting.
+
+When success, returns a "conditional true" value (but not a <code>true</code>). Otherwise, returns a "conditional false" value and a string describing the error.
+
+This API also respect the [[#lua_max_pending_timers|lua_max_pending_timers]] and [[#lua_max_running_timers|lua_max_running_timers]].
+
+This API was first introduced in the <code>v0.10.9</code> release.
+
 == ngx.timer.running_count ==
 '''syntax:''' ''count = ngx.timer.running_count()''
 
@@ -6481,8 +6576,8 @@ This directive was first introduced in the <code>v0.9.20</code> release.
 
 '''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.timer.*, init_by_lua*, init_worker_by_lua*''
 
-This string field indicates the current NGINX subsystem the current Lua environment is based on. For this module, this field always takes the string value `"http"`. For
-[https://github.com/openresty/stream-lua-nginx-module#readme ngx_stream_lua_module], however, this field takes the value `"stream"`.
+This string field indicates the current NGINX subsystem the current Lua environment is based on. For this module, this field always takes the string value <code>"http"</code>. For
+[https://github.com/openresty/stream-lua-nginx-module#readme ngx_stream_lua_module], however, this field takes the value <code>"stream"</code>.
 
 This field was first introduced in the <code>0.10.1</code>.
 
@@ -6563,7 +6658,7 @@ This API was first introduced in the <code>0.9.5</code> release.
 
 Returns the total number of the Nginx worker processes (i.e., the value configured
 by the [http://nginx.org/en/docs/ngx_core_module.html#worker_processes worker_processes]
-directive in `nginx.conf`).
+directive in <code>nginx.conf</code>).
 
 This API was first introduced in the <code>0.9.20</code> release.
 
@@ -6575,11 +6670,11 @@ This API was first introduced in the <code>0.9.20</code> release.
 
 Returns the ordinal number of the current Nginx worker processes (starting from number 0).
 
-So if the total number of workers is `N`, then this method may return a number between 0
-and `N - 1` (inclusive).
+So if the total number of workers is <code>N</code>, then this method may return a number between 0
+and <code>N - 1</code> (inclusive).
 
 This function returns meaningful values only for NGINX 1.9.1+. With earlier versions of NGINX, it
-always returns `nil`.
+always returns <code>nil</code>.
 
 See also [[#ngx.worker.count|ngx.worker.count]].
 
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 3737149..cd64fc8 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
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10007
+#define ngx_http_lua_version  10010
 
 
 typedef struct {
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 b72c707..7b590e7 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_api.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_api.c
@@ -56,11 +56,10 @@ ngx_http_lua_add_package_preload(ngx_conf_t *cf, const char *package,
         lua_pushcfunction(L, func);
         lua_setfield(L, -2, package);
         lua_pop(L, 2);
-
-        return NGX_OK;
     }
 
-    /* L == NULL */
+    /* we always register preload_hooks since we always create new Lua VMs
+     * when lua code cache is off. */
 
     if (lmcf->preload_hooks == NULL) {
         lmcf->preload_hooks =
@@ -176,7 +175,9 @@ ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
     }
 
     zone->shm = shm_zone->shm;
+#if defined(nginx_version) && nginx_version >= 1009000
     zone->noreuse = shm_zone->noreuse;
+#endif
 
     if (zone->init(zone, odata) != NGX_OK) {
         return NGX_ERROR;
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 0c307d6..b43697c 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_args.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_args.c
@@ -184,7 +184,7 @@ ngx_http_lua_ngx_req_get_post_args(lua_State *L)
 
     if (r->request_body->temp_file) {
         lua_pushnil(L);
-        lua_pushliteral(L, "requesty body in temp file not supported");
+        lua_pushliteral(L, "request body in temp file not supported");
         return 2;
     }
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
index 0adf787..2fa634e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
@@ -314,7 +314,13 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
 
     if (ctx->exited && ctx->exit_code != NGX_OK) {
         rc = ctx->exit_code;
-        if (rc == NGX_ERROR || rc == NGX_BUSY || rc == NGX_DECLINED) {
+        if (rc == NGX_ERROR
+            || rc == NGX_BUSY
+            || rc == NGX_DECLINED
+#ifdef HAVE_BALANCER_STATUS_CODE_PATCH
+            || rc >= NGX_HTTP_SPECIAL_RESPONSE
+#endif
+        ) {
             return rc;
         }
 
@@ -640,7 +646,7 @@ ngx_http_lua_ffi_balancer_set_more_tries(ngx_http_request_t *r,
     int count, char **err)
 {
 #if (nginx_version >= 1007005)
-    ngx_uint_t             max_tries;
+    ngx_uint_t             max_tries, total;
 #endif
     ngx_http_lua_ctx_t    *ctx;
     ngx_http_upstream_t   *u;
@@ -681,9 +687,10 @@ ngx_http_lua_ffi_balancer_set_more_tries(ngx_http_request_t *r,
 
 #if (nginx_version >= 1007005)
     max_tries = r->upstream->conf->next_upstream_tries;
+    total = bp->total_tries + r->upstream->peer.tries - 1;
 
-    if (bp->total_tries + count > max_tries) {
-        count = max_tries - bp->total_tries;
+    if (max_tries && total + count > max_tries) {
+        count = max_tries - total;
         *err = "reduced tries due to limit";
 
     } else {
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 267952b..e389783 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_common.h
@@ -22,6 +22,19 @@
 #include <lauxlib.h>
 
 
+#if (NGX_PCRE)
+
+#include <pcre.h>
+
+#if (PCRE_MAJOR > 8) || (PCRE_MAJOR == 8 && PCRE_MINOR >= 21)
+#   define LUA_HAVE_PCRE_JIT 1
+#else
+#   define LUA_HAVE_PCRE_JIT 0
+#endif
+
+#endif
+
+
 #if !defined(nginx_version) || (nginx_version < 1006000)
 #error at least nginx 1.6.0 is required but found an older version
 #endif
@@ -138,7 +151,7 @@ typedef struct ngx_http_lua_sema_mm_s  ngx_http_lua_sema_mm_t;
 typedef ngx_int_t (*ngx_http_lua_main_conf_handler_pt)(ngx_log_t *log,
     ngx_http_lua_main_conf_t *lmcf, lua_State *L);
 typedef ngx_int_t (*ngx_http_lua_srv_conf_handler_pt)(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lmcf, lua_State *L);
+    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
 
 
 typedef struct {
@@ -168,6 +181,11 @@ struct ngx_http_lua_main_conf_s {
     ngx_int_t            regex_cache_entries;
     ngx_int_t            regex_cache_max_entries;
     ngx_int_t            regex_match_limit;
+
+#if (LUA_HAVE_PCRE_JIT)
+    pcre_jit_stack      *jit_stack;
+#endif
+
 #endif
 
     ngx_array_t         *shm_zones;  /* of ngx_shm_zone_t* */
@@ -199,6 +217,12 @@ struct ngx_http_lua_main_conf_s {
                                                 of reqeusts */
     ngx_uint_t           malloc_trim_req_count;
 
+#if nginx_version >= 1011011
+    /* the following 2 fields are only used by ngx.req.raw_headers() for now */
+    ngx_buf_t          **busy_buf_ptrs;
+    ngx_int_t            busy_buf_ptr_count;
+#endif
+
     unsigned             requires_header_filter:1;
     unsigned             requires_body_filter:1;
     unsigned             requires_capture_filter:1;
@@ -206,6 +230,7 @@ struct ngx_http_lua_main_conf_s {
     unsigned             requires_access:1;
     unsigned             requires_log:1;
     unsigned             requires_shm:1;
+    unsigned             requires_capture_log:1;
 };
 
 
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 249d763..ae36505 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_control.c
@@ -212,10 +212,12 @@ ngx_http_lua_ngx_redirect(lua_State *L)
 
         if (rc != NGX_HTTP_MOVED_TEMPORARILY
             && rc != NGX_HTTP_MOVED_PERMANENTLY
+            && rc != NGX_HTTP_SEE_OTHER
             && rc != NGX_HTTP_TEMPORARY_REDIRECT)
         {
             return luaL_error(L, "only ngx.HTTP_MOVED_TEMPORARILY, "
-                              "ngx.HTTP_MOVED_PERMANENTLY, and "
+                              "ngx.HTTP_MOVED_PERMANENTLY, "
+                              "ngx.HTTP_SEE_OTHER, and "
                               "ngx.HTTP_TEMPORARY_REDIRECT are allowed");
         }
 
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 862edda..6a562f4 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.c
@@ -27,6 +27,8 @@
 #include "ngx_http_lua_ssl_certby.h"
 #include "ngx_http_lua_lex.h"
 #include "api/ngx_http_lua_api.h"
+#include "ngx_http_lua_log_ringbuf.h"
+#include "ngx_http_lua_log.h"
 
 
 typedef struct ngx_http_lua_block_parser_ctx_s
@@ -1700,6 +1702,71 @@ ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
 }
 
 
+char *
+ngx_http_lua_capture_error_log(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+#ifndef HAVE_INTERCEPT_ERROR_LOG_PATCH
+    return "not found: missing the capture error log patch for nginx";
+#else
+    ngx_str_t                     *value;
+    ssize_t                        size;
+    u_char                        *data;
+    ngx_cycle_t                   *cycle;
+    ngx_http_lua_main_conf_t      *lmcf = conf;
+    ngx_http_lua_log_ringbuf_t    *ringbuf;
+
+    value = cf->args->elts;
+    cycle = cf->cycle;
+
+    if (lmcf->requires_capture_log) {
+        return "is duplicate";
+    }
+
+    if (value[1].len == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid capture error log size \"%V\"",
+                           &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    size = ngx_parse_size(&value[1]);
+
+    if (size < NGX_MAX_ERROR_STR) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid capture error log size \"%V\", "
+                           "minimum size is %d", &value[1],
+                           NGX_MAX_ERROR_STR);
+        return NGX_CONF_ERROR;
+    }
+
+    if (cycle->intercept_error_log_handler) {
+        return "capture error log handler has been hooked";
+    }
+
+    ringbuf = (ngx_http_lua_log_ringbuf_t *)
+              ngx_palloc(cf->pool, sizeof(ngx_http_lua_log_ringbuf_t));
+    if (ringbuf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    data = ngx_palloc(cf->pool, size);
+    if (data == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_http_lua_log_ringbuf_init(ringbuf, data, size);
+
+    lmcf->requires_capture_log = 1;
+    cycle->intercept_error_log_handler = (ngx_log_intercept_pt)
+                                         ngx_http_lua_capture_log_handler;
+    cycle->intercept_error_log_data = ringbuf;
+
+    return NGX_CONF_OK;
+#endif
+}
+
+
 /*
  * ngx_http_lua_strlstrn() is intended to search for static substring
  * with known length in string until the argument last. The argument n
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 be591f3..5abfe4d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_directive.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_directive.h
@@ -67,9 +67,10 @@ ngx_int_t ngx_http_lua_filter_set_by_lua_file(ngx_http_request_t *r,
 
 char *ngx_http_lua_rewrite_no_postpone(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
-
 char *ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf,
     ngx_command_t *cmd);
+char *ngx_http_lua_capture_error_log(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 
 
 #endif /* _NGX_HTTP_LUA_DIRECTIVE_H_INCLUDED_ */
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 0af56f6..6700ce8 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers.c
@@ -26,6 +26,9 @@ static int ngx_http_lua_ngx_req_get_headers(lua_State *L);
 static int ngx_http_lua_ngx_req_header_clear(lua_State *L);
 static int ngx_http_lua_ngx_req_header_set(lua_State *L);
 static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
+#if nginx_version >= 1011011
+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
+#endif
 
 
 static int
@@ -77,6 +80,11 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
     size_t                       size;
     ngx_buf_t                   *b, *first = NULL;
     ngx_int_t                    i, j;
+#if nginx_version >= 1011011
+    ngx_buf_t                  **bb;
+    ngx_chain_t                 *cl;
+    ngx_http_lua_main_conf_t    *lmcf;
+#endif
     ngx_connection_t            *c;
     ngx_http_request_t          *r, *mr;
     ngx_http_connection_t       *hc;
@@ -93,6 +101,10 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
         return luaL_error(L, "no request object found");
     }
 
+#if nginx_version >= 1011011
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+#endif
+
     ngx_http_lua_check_fake_request(L, r);
 
     mr = r->main;
@@ -109,8 +121,13 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
     dd("hc->nbusy: %d", (int) hc->nbusy);
 
     if (hc->nbusy) {
+#if nginx_version >= 1011011
+        dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
+           hc->busy->buf->last, hc->busy->buf->end);
+#else
         dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos,
            hc->busy[0]->last, hc->busy[0]->end);
+#endif
     }
 
     dd("request line: %p %p", mr->request_line.data,
@@ -146,9 +163,37 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
     dd("size: %d", (int) size);
 
     if (hc->nbusy) {
+#if nginx_version >= 1011011
+        if (hc->nbusy > lmcf->busy_buf_ptr_count) {
+            if (lmcf->busy_buf_ptrs) {
+                ngx_free(lmcf->busy_buf_ptrs);
+            }
+
+            lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
+                                            r->connection->log);
+
+            if (lmcf->busy_buf_ptrs == NULL) {
+                return luaL_error(L, "no memory");
+            }
+
+            lmcf->busy_buf_ptr_count = hc->nbusy;
+        }
+
+        bb = lmcf->busy_buf_ptrs;
+        for (cl = hc->busy; cl; cl = cl->next) {
+            *bb++ = cl->buf;
+        }
+#endif
         b = NULL;
+
+#if nginx_version >= 1011011
+        bb = lmcf->busy_buf_ptrs;
+        for (i = hc->nbusy; i > 0; i--) {
+            b = bb[i - 1];
+#else
         for (i = 0; i < hc->nbusy; i++) {
             b = hc->busy[i];
+#endif
 
             dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
                b->start);
@@ -223,8 +268,15 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
     }
 
     if (hc->nbusy) {
+
+#if nginx_version >= 1011011
+        bb = lmcf->busy_buf_ptrs;
+        for (i = hc->nbusy - 1; i >= 0; i--) {
+            b = bb[i];
+#else
         for (i = 0; i < hc->nbusy; i++) {
             b = hc->busy[i];
+#endif
 
             if (!found) {
                 if (b != first) {
@@ -444,6 +496,8 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     ngx_list_part_t    *part;
     ngx_table_elt_t    *header;
     ngx_http_request_t *r;
+    ngx_http_lua_ctx_t *ctx;
+    ngx_int_t           rc;
     u_char             *lowcase_key = NULL;
     size_t              lowcase_key_sz = 0;
     ngx_uint_t          i;
@@ -475,6 +529,22 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
         return luaL_error(L, "no request object found");
     }
 
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no ctx found");
+    }
+
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            return luaL_error(L,
+                              "failed to set default content type: %d",
+                              (int) rc);
+        }
+
+        ctx->headers_set = 1;
+    }
+
     ngx_http_lua_check_fake_request(L, r);
 
     part = &r->headers_out.headers.part;
@@ -603,12 +673,19 @@ ngx_http_lua_ngx_header_get(lua_State *L)
     ngx_uint_t                   i;
     size_t                       len;
     ngx_http_lua_loc_conf_t     *llcf;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_int_t                    rc;
 
     r = ngx_http_lua_get_req(L);
     if (r == NULL) {
         return luaL_error(L, "no request object 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_fake_request(L, r);
 
     /* we skip the first argument that is the table */
@@ -640,6 +717,17 @@ ngx_http_lua_ngx_header_get(lua_State *L)
 
     key.len = len;
 
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            return luaL_error(L,
+                              "failed to set default content type: %d",
+                              (int) rc);
+        }
+
+        ctx->headers_set = 1;
+    }
+
     return ngx_http_lua_get_output_header(L, r, &key);
 }
 
@@ -718,7 +806,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
         ngx_str_null(&value);
 
     } else if (lua_type(L, 3) == LUA_TTABLE) {
-        n = luaL_getn(L, 3);
+        n = lua_objlen(L, 3);
         if (n == 0) {
             ngx_str_null(&value);
 
@@ -852,7 +940,7 @@ ngx_http_lua_ngx_req_header_set_helper(lua_State *L)
         ngx_str_null(&value);
 
     } else if (lua_type(L, 2) == LUA_TTABLE) {
-        n = luaL_getn(L, 2);
+        n = lua_objlen(L, 2);
         if (n == 0) {
             ngx_str_null(&value);
 
@@ -1262,6 +1350,7 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
     ngx_uint_t           i;
     ngx_table_elt_t     *h;
     ngx_list_part_t     *part;
+    ngx_http_lua_ctx_t  *ctx;
 
     ngx_http_lua_loc_conf_t     *llcf;
 
@@ -1269,6 +1358,21 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        /* *errmsg = "no ctx found"; */
+        return NGX_ERROR;
+    }
+
+    if (!ctx->headers_set) {
+        if (ngx_http_lua_set_content_type(r) != NGX_OK) {
+            /* *errmsg = "failed to set default content type"; */
+            return NGX_ERROR;
+        }
+
+        ctx->headers_set = 1;
+    }
+
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->transform_underscores_in_resp_headers
         && memchr(key, '_', key_len) != NULL)
@@ -1379,4 +1483,20 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
 #endif /* NGX_LUA_NO_FFI_API */
 
 
+#if nginx_version >= 1011011
+void
+ngx_http_lua_ngx_raw_header_cleanup(void *data)
+{
+    ngx_http_lua_main_conf_t  *lmcf;
+
+    lmcf = (ngx_http_lua_main_conf_t *) data;
+
+    if (lmcf->busy_buf_ptrs) {
+        ngx_free(lmcf->busy_buf_ptrs);
+        lmcf->busy_buf_ptrs = NULL;
+    }
+}
+#endif
+
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
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 39f1114..ee4d21c 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_headers.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_headers.h
@@ -15,6 +15,9 @@
 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_create_headers_metatable(ngx_log_t *log, lua_State *L);
+#if nginx_version >= 1011011
+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
+#endif
 
 
 #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */
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 c2b2269..c18e6b0 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_log.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_log.c
@@ -13,6 +13,7 @@
 
 #include "ngx_http_lua_log.h"
 #include "ngx_http_lua_util.h"
+#include "ngx_http_lua_log_ringbuf.h"
 
 
 static int ngx_http_lua_print(lua_State *L);
@@ -313,4 +314,120 @@ ngx_http_lua_inject_log_consts(lua_State *L)
     /* }}} */
 }
 
+
+#ifdef HAVE_INTERCEPT_ERROR_LOG_PATCH
+ngx_int_t
+ngx_http_lua_capture_log_handler(ngx_log_t *log,
+    ngx_uint_t level, u_char *buf, size_t n)
+{
+    ngx_http_lua_log_ringbuf_t  *ringbuf;
+
+    dd("enter");
+
+    ringbuf = (ngx_http_lua_log_ringbuf_t  *)
+                    ngx_cycle->intercept_error_log_data;
+
+    if (level > ringbuf->filter_level) {
+        return NGX_OK;
+    }
+
+    ngx_http_lua_log_ringbuf_write(ringbuf, level, buf, n);
+
+    dd("capture log: %s\n", buf);
+
+    return NGX_OK;
+}
+#endif
+
+
+#ifndef NGX_LUA_NO_FFI_API
+int
+ngx_http_lua_ffi_errlog_set_filter_level(int level, u_char *err, size_t *errlen)
+{
+#ifdef HAVE_INTERCEPT_ERROR_LOG_PATCH
+    ngx_http_lua_log_ringbuf_t     *ringbuf;
+
+    ringbuf = ngx_cycle->intercept_error_log_data;
+
+    if (ringbuf == NULL) {
+        *errlen = ngx_snprintf(err, *errlen,
+                               "directive \"lua_capture_error_log\" is not set")
+                  - err;
+        return NGX_ERROR;
+    }
+
+    if (level > NGX_LOG_DEBUG || level < NGX_LOG_STDERR) {
+        *errlen = ngx_snprintf(err, *errlen, "bad log level: %d", level)
+                  - err;
+        return NGX_ERROR;
+    }
+
+    ringbuf->filter_level = level;
+    return NGX_OK;
+#else
+    *errlen = ngx_snprintf(err, *errlen,
+                           "missing the capture error log patch for nginx")
+              - err;
+    return NGX_ERROR;
+#endif
+}
+
+
+int
+ngx_http_lua_ffi_errlog_get_msg(char **log, int *loglevel, u_char *err,
+    size_t *errlen, double *log_time)
+{
+#ifdef HAVE_INTERCEPT_ERROR_LOG_PATCH
+    ngx_uint_t           loglen;
+
+    ngx_http_lua_log_ringbuf_t     *ringbuf;
+
+    ringbuf = ngx_cycle->intercept_error_log_data;
+
+    if (ringbuf == NULL) {
+        *errlen = ngx_snprintf(err, *errlen,
+                               "directive \"lua_capture_error_log\" is not set")
+                  - err;
+        return NGX_ERROR;
+    }
+
+    if (ringbuf->count == 0) {
+        return NGX_DONE;
+    }
+
+    ngx_http_lua_log_ringbuf_read(ringbuf, loglevel, (void **) log, &loglen,
+                                  log_time);
+    return loglen;
+#else
+    *errlen = ngx_snprintf(err, *errlen,
+                           "missing the capture error log patch for nginx")
+              - err;
+    return NGX_ERROR;
+#endif
+}
+
+
+int
+ngx_http_lua_ffi_errlog_get_sys_filter_level(ngx_http_request_t *r)
+{
+    ngx_log_t                   *log;
+    int                          log_level;
+
+    if (r && r->connection && r->connection->log) {
+        log = r->connection->log;
+
+    } else {
+        log = ngx_cycle->log;
+    }
+
+    log_level = log->log_level;
+    if (log_level == NGX_LOG_DEBUG_ALL) {
+        log_level = NGX_LOG_DEBUG;
+    }
+
+    return log_level;
+}
+
+#endif
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_log.h b/debian/modules/nginx-lua/src/ngx_http_lua_log.h
index 42f1839..56cd771 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_log.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_log.h
@@ -13,6 +13,10 @@
 
 
 void ngx_http_lua_inject_log_api(lua_State *L);
+#ifdef HAVE_INTERCEPT_ERROR_LOG_PATCH
+ngx_int_t ngx_http_lua_capture_log_handler(ngx_log_t *log,
+    ngx_uint_t level, u_char *buf, size_t n);
+#endif
 
 
 #endif /* _NGX_HTTP_LUA_LOG_H_INCLUDED_ */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.c b/debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.c
new file mode 100644
index 0000000..0464069
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.c
@@ -0,0 +1,225 @@
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_common.h"
+#include "ngx_http_lua_log_ringbuf.h"
+
+
+typedef struct {
+    double      time;
+    unsigned    len;
+    unsigned    log_level;
+} ngx_http_lua_log_ringbuf_header_t;
+
+
+enum {
+    HEADER_LEN = sizeof(ngx_http_lua_log_ringbuf_header_t)
+};
+
+
+static void *ngx_http_lua_log_ringbuf_next_header(
+    ngx_http_lua_log_ringbuf_t *rb);
+static void ngx_http_lua_log_ringbuf_append(
+    ngx_http_lua_log_ringbuf_t *rb, int log_level, void *buf, int n);
+static size_t ngx_http_lua_log_ringbuf_free_spaces(
+    ngx_http_lua_log_ringbuf_t *rb);
+
+
+void
+ngx_http_lua_log_ringbuf_init(ngx_http_lua_log_ringbuf_t *rb, void *buf,
+    size_t len)
+{
+    rb->data = buf;
+    rb->size = len;
+
+    rb->tail = rb->data;
+    rb->head = rb->data;
+    rb->sentinel = rb->data + rb->size;
+    rb->count = 0;
+    rb->filter_level = NGX_LOG_DEBUG;
+
+    return;
+}
+
+
+void
+ngx_http_lua_log_ringbuf_reset(ngx_http_lua_log_ringbuf_t *rb)
+{
+    rb->tail = rb->data;
+    rb->head = rb->data;
+    rb->sentinel = rb->data + rb->size;
+    rb->count = 0;
+
+    return;
+}
+
+
+/*
+ * get the next data header, it'll skip the useless data space or
+ * placehold data
+ */
+static void *
+ngx_http_lua_log_ringbuf_next_header(ngx_http_lua_log_ringbuf_t *rb)
+{
+    /* useless data */
+    if (rb->size - (rb->head - rb->data) < HEADER_LEN)
+    {
+        return rb->data;
+    }
+
+    /* placehold data */
+    if (rb->head >= rb->sentinel) {
+        return rb->data;
+    }
+
+    return rb->head;
+}
+
+
+/* append data to ring buffer directly */
+static void
+ngx_http_lua_log_ringbuf_append(ngx_http_lua_log_ringbuf_t *rb,
+    int log_level, void *buf, int n)
+{
+    ngx_http_lua_log_ringbuf_header_t        *head;
+    ngx_time_t                               *tp;
+
+    head = (ngx_http_lua_log_ringbuf_header_t *) rb->tail;
+    head->len = n;
+    head->log_level = log_level;
+
+    tp = ngx_timeofday();
+    head->time = tp->sec + tp->msec / 1000.0L;
+
+    rb->tail += HEADER_LEN;
+    ngx_memcpy(rb->tail, buf, n);
+    rb->tail += n;
+    rb->count++;
+
+    if (rb->tail > rb->sentinel) {
+        rb->sentinel = rb->tail;
+    }
+
+    return;
+}
+
+
+/* throw away data at head */
+static void
+ngx_http_lua_log_ringbuf_throw_away(ngx_http_lua_log_ringbuf_t *rb)
+{
+    ngx_http_lua_log_ringbuf_header_t       *head;
+
+    if (rb->count == 0) {
+        return;
+    }
+
+    head = (ngx_http_lua_log_ringbuf_header_t *) rb->head;
+
+    rb->head += HEADER_LEN + head->len;
+    rb->count--;
+
+    if (rb->count == 0) {
+        ngx_http_lua_log_ringbuf_reset(rb);
+    }
+
+    rb->head = ngx_http_lua_log_ringbuf_next_header(rb);
+
+    return;
+}
+
+
+/* size of free spaces */
+static size_t
+ngx_http_lua_log_ringbuf_free_spaces(ngx_http_lua_log_ringbuf_t *rb)
+{
+    if (rb->count == 0) {
+        return rb->size;
+    }
+
+    if (rb->tail > rb->head) {
+        return rb->data + rb->size - rb->tail;
+    }
+
+    return rb->head - rb->tail;
+}
+
+
+/*
+ * try to write log data to ring buffer, throw away old data
+ * if there was not enough free spaces.
+ */
+ngx_int_t
+ngx_http_lua_log_ringbuf_write(ngx_http_lua_log_ringbuf_t *rb, int log_level,
+    void *buf, size_t n)
+{
+    if (n + HEADER_LEN > rb->size) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_http_lua_log_ringbuf_free_spaces(rb) < n + HEADER_LEN) {
+        /* if the right space is not enough, mark it as placehold data */
+        if ((size_t)(rb->data + rb->size - rb->tail) < n + HEADER_LEN) {
+
+            while (rb->head >= rb->tail && rb->count) {
+                /* head is after tail, so we will throw away all data between
+                 * head and sentinel */
+                ngx_http_lua_log_ringbuf_throw_away(rb);
+            }
+
+            rb->sentinel = rb->tail;
+            rb->tail = rb->data;
+        }
+
+        while (ngx_http_lua_log_ringbuf_free_spaces(rb) < n + HEADER_LEN) {
+            ngx_http_lua_log_ringbuf_throw_away(rb);
+        }
+    }
+
+    ngx_http_lua_log_ringbuf_append(rb, log_level, buf, n);
+
+    return NGX_OK;
+}
+
+
+/* read log from ring buffer, do reset if all of the logs were readed. */
+ngx_int_t
+ngx_http_lua_log_ringbuf_read(ngx_http_lua_log_ringbuf_t *rb, int *log_level,
+    void **buf, size_t *n, double *log_time)
+{
+    ngx_http_lua_log_ringbuf_header_t       *head;
+
+    if (rb->count == 0) {
+        return NGX_ERROR;
+    }
+
+    head = (ngx_http_lua_log_ringbuf_header_t *) rb->head;
+
+    if (rb->head >= rb->sentinel) {
+        return NGX_ERROR;
+    }
+
+    *log_level = head->log_level;
+    *n = head->len;
+    rb->head += HEADER_LEN;
+    *buf = rb->head;
+    rb->head += head->len;
+
+    if (log_time) {
+        *log_time = head->time;
+    }
+
+    rb->count--;
+
+    if (rb->count == 0) {
+        ngx_http_lua_log_ringbuf_reset(rb);
+    }
+
+    rb->head = ngx_http_lua_log_ringbuf_next_header(rb);
+
+    return NGX_OK;
+}
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.h b/debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.h
new file mode 100644
index 0000000..c9c2c2d
--- /dev/null
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.h
@@ -0,0 +1,31 @@
+
+#ifndef _NGX_HTTP_LUA_RINGBUF_H_INCLUDED_
+#define _NGX_HTTP_LUA_RINGBUF_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+typedef struct {
+    ngx_uint_t   filter_level;
+    char        *tail;              /* writed point */
+    char        *head;              /* readed point */
+    char        *data;              /* buffer */
+    char        *sentinel;
+    size_t       size;              /* buffer total size */
+    size_t       count;             /* count of logs */
+} ngx_http_lua_log_ringbuf_t;
+
+
+void ngx_http_lua_log_ringbuf_init(ngx_http_lua_log_ringbuf_t *rb,
+    void *buf, size_t len);
+void ngx_http_lua_log_ringbuf_reset(ngx_http_lua_log_ringbuf_t *rb);
+ngx_int_t ngx_http_lua_log_ringbuf_read(ngx_http_lua_log_ringbuf_t *rb,
+    int *log_level, void **buf, size_t *n, double *log_time);
+ngx_int_t ngx_http_lua_log_ringbuf_write(ngx_http_lua_log_ringbuf_t *rb,
+    int log_level, void *buf, size_t n);
+
+
+#endif /* _NGX_HTTP_LUA_RINGBUF_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
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 6e93c8e..9d914e8 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_module.c
@@ -28,6 +28,7 @@
 #include "ngx_http_lua_ssl_certby.h"
 #include "ngx_http_lua_ssl_session_storeby.h"
 #include "ngx_http_lua_ssl_session_fetchby.h"
+#include "ngx_http_lua_headers.h"
 
 
 static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
@@ -45,14 +46,6 @@ static char *ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data);
 static ngx_int_t ngx_http_lua_set_ssl(ngx_conf_t *cf,
     ngx_http_lua_loc_conf_t *llcf);
 #endif
-#if (NGX_HTTP_LUA_HAVE_MMAP_SBRK) && (NGX_LINUX)
-/* we cannot use "static" for this function since it may lead to compiler
- * warnings */
-void ngx_http_lua_limit_data_segment(void);
-#   if !(NGX_HTTP_LUA_HAVE_CONSTRUCTOR)
-static ngx_int_t ngx_http_lua_pre_config(ngx_conf_t *cf);
-#   endif
-#endif
 static char *ngx_http_lua_malloc_trim(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
@@ -101,6 +94,13 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       NULL },
 
+    { ngx_string("lua_capture_error_log"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_http_lua_capture_error_log,
+      0,
+      0,
+      NULL },
+
 #if (NGX_PCRE)
     { ngx_string("lua_regex_cache_max_entries"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -592,13 +592,7 @@ static ngx_command_t ngx_http_lua_cmds[] = {
 
 
 ngx_http_module_t ngx_http_lua_module_ctx = {
-#if (NGX_HTTP_LUA_HAVE_MMAP_SBRK)                                            \
-    && (NGX_LINUX)                                                           \
-    && !(NGX_HTTP_LUA_HAVE_CONSTRUCTOR)
-    ngx_http_lua_pre_config,          /*  preconfiguration */
-#else
     NULL,                             /*  preconfiguration */
-#endif
     ngx_http_lua_init,                /*  postconfiguration */
 
     ngx_http_lua_create_main_conf,    /*  create main configuration */
@@ -638,7 +632,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
     volatile ngx_cycle_t       *saved_cycle;
     ngx_http_core_main_conf_t  *cmcf;
     ngx_http_lua_main_conf_t   *lmcf;
-#ifndef NGX_LUA_NO_FFI_API
+#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
     ngx_pool_cleanup_t         *cln;
 #endif
 
@@ -730,6 +724,16 @@ ngx_http_lua_init(ngx_conf_t *cf)
     cln->handler = ngx_http_lua_sema_mm_cleanup;
 #endif
 
+#if nginx_version >= 1011011
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NGX_ERROR;
+    }
+
+    cln->data = lmcf;
+    cln->handler = ngx_http_lua_ngx_raw_header_cleanup;
+#endif
+
     if (lmcf->lua == NULL) {
         dd("initializing lua vm");
 
@@ -817,6 +821,7 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
      *      lmcf->running_timers = 0;
      *      lmcf->watcher = NULL;
      *      lmcf->regex_cache_entries = 0;
+     *      lmcf->jit_stack = NULL;
      *      lmcf->shm_zones = NULL;
      *      lmcf->init_handler = NULL;
      *      lmcf->init_src = { 0, NULL };
@@ -955,7 +960,7 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 #ifdef LIBRESSL_VERSION_NUMBER
 
         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "LibreSSL does not support ssl_ceritificate_by_lua*");
+                      "LibreSSL does not support ssl_certificate_by_lua*");
         return NGX_CONF_ERROR;
 
 #else
@@ -967,7 +972,7 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 #   else
 
         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "OpenSSL too old to support ssl_ceritificate_by_lua*");
+                      "OpenSSL too old to support ssl_certificate_by_lua*");
         return NGX_CONF_ERROR;
 
 #   endif
@@ -1267,37 +1272,6 @@ ngx_http_lua_set_ssl(ngx_conf_t *cf, ngx_http_lua_loc_conf_t *llcf)
 #endif  /* NGX_HTTP_SSL */
 
 
-#if (NGX_HTTP_LUA_HAVE_MMAP_SBRK)                                            \
-    && (NGX_LINUX)                                                           \
-    && !(NGX_HTTP_LUA_HAVE_CONSTRUCTOR)
-static ngx_int_t
-ngx_http_lua_pre_config(ngx_conf_t *cf)
-{
-    ngx_http_lua_limit_data_segment();
-    return NGX_OK;
-}
-#endif
-
-
-/*
- * we simply assume that LuaJIT is used. it does little harm when the
- * standard Lua 5.1 interpreter is used instead.
- */
-#if (NGX_HTTP_LUA_HAVE_MMAP_SBRK) && (NGX_LINUX)
-#   if (NGX_HTTP_LUA_HAVE_CONSTRUCTOR)
-__attribute__((constructor))
-#   endif
-void
-ngx_http_lua_limit_data_segment(void)
-{
-    if (sbrk(0) < (void *) 0x40000000LL) {
-        mmap(ngx_align_ptr(sbrk(0), getpagesize()), 1, PROT_READ,
-             MAP_FIXED|MAP_PRIVATE|MAP_ANON, -1, 0);
-    }
-}
-#endif
-
-
 static char *
 ngx_http_lua_malloc_trim(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
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 d882061..80519ec 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_regex.c
@@ -17,14 +17,6 @@
 #include "ngx_http_lua_script.h"
 #include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_util.h"
-#include <pcre.h>
-
-
-#if (PCRE_MAJOR > 8) || (PCRE_MAJOR == 8 && PCRE_MINOR >= 21)
-#   define LUA_HAVE_PCRE_JIT 1
-#else
-#   define LUA_HAVE_PCRE_JIT 0
-#endif
 
 
 #if (PCRE_MAJOR >= 6)
@@ -42,6 +34,8 @@
 
 #define NGX_LUA_RE_DFA_MODE_WORKSPACE_COUNT (100)
 
+#define NGX_LUA_RE_MIN_JIT_STACK_SIZE 32 * 1024
+
 
 typedef struct {
 #ifndef NGX_LUA_NO_FFI_API
@@ -364,6 +358,10 @@ ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
 
         sd = pcre_study(re_comp.regex, PCRE_STUDY_JIT_COMPILE, &msg);
 
+        if (sd && lmcf->jit_stack) {
+            pcre_assign_jit_stack(sd, NULL, lmcf->jit_stack);
+        }
+
         ngx_http_lua_pcre_malloc_done(old_pool);
 
 #   if (NGX_DEBUG)
@@ -826,6 +824,10 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
 
         sd = pcre_study(re_comp.regex, PCRE_STUDY_JIT_COMPILE, &msg);
 
+        if (sd && lmcf->jit_stack) {
+            pcre_assign_jit_stack(sd, NULL, lmcf->jit_stack);
+        }
+
         ngx_http_lua_pcre_malloc_done(old_pool);
 
 #   if (NGX_DEBUG)
@@ -1922,6 +1924,60 @@ error:
 }
 
 
+ngx_int_t
+ngx_http_lua_ffi_set_jit_stack_size(int size, u_char *errstr,
+    size_t *errstr_size)
+{
+#if LUA_HAVE_PCRE_JIT
+
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_pool_t                  *pool, *old_pool;
+
+    lmcf = ngx_http_cycle_get_module_main_conf(ngx_cycle,
+                                               ngx_http_lua_module);
+
+    if (size < NGX_LUA_RE_MIN_JIT_STACK_SIZE) {
+        size = NGX_LUA_RE_MIN_JIT_STACK_SIZE;
+    }
+
+    pool = lmcf->pool;
+
+    dd("server pool %p", lmcf->pool);
+
+    if (lmcf->jit_stack) {
+        old_pool = ngx_http_lua_pcre_malloc_init(pool);
+
+        pcre_jit_stack_free(lmcf->jit_stack);
+
+        ngx_http_lua_pcre_malloc_done(old_pool);
+    }
+
+    old_pool = ngx_http_lua_pcre_malloc_init(pool);
+
+    lmcf->jit_stack = pcre_jit_stack_alloc(NGX_LUA_RE_MIN_JIT_STACK_SIZE,
+                                           size);
+
+    ngx_http_lua_pcre_malloc_done(old_pool);
+
+    if (lmcf->jit_stack == NULL) {
+        *errstr_size = ngx_snprintf(errstr, *errstr_size,
+                                    "pcre jit stack allocation failed")
+                       - errstr;
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+
+#else  /* LUA_HAVE_PCRE_JIT */
+
+    *errstr_size = ngx_snprintf(errstr, *errstr_size,
+                                "no pcre jit support found") - errstr;
+    return NGX_ERROR;
+
+#endif /* LUA_HAVE_PCRE_JIT */
+}
+
+
 void
 ngx_http_lua_inject_regex_api(lua_State *L)
 {
@@ -2170,6 +2226,9 @@ ngx_http_lua_ffi_compile_regex(const unsigned char *pat, size_t pat_len,
         goto error;
     }
 
+    lmcf = ngx_http_cycle_get_module_main_conf(ngx_cycle,
+                                               ngx_http_lua_module);
+
 #if (LUA_HAVE_PCRE_JIT)
 
     if (flags & NGX_LUA_RE_MODE_JIT) {
@@ -2205,10 +2264,11 @@ ngx_http_lua_ffi_compile_regex(const unsigned char *pat, size_t pat_len,
         ngx_http_lua_pcre_malloc_done(old_pool);
     }
 
-#endif /* LUA_HAVE_PCRE_JIT */
+    if (sd && lmcf->jit_stack) {
+        pcre_assign_jit_stack(sd, NULL, lmcf->jit_stack);
+    }
 
-    lmcf = ngx_http_cycle_get_module_main_conf(ngx_cycle,
-                                               ngx_http_lua_module);
+#endif /* LUA_HAVE_PCRE_JIT */
 
     if (sd && lmcf && lmcf->regex_match_limit > 0) {
         sd->flags |= PCRE_EXTRA_MATCH_LIMIT;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_regex.h b/debian/modules/nginx-lua/src/ngx_http_lua_regex.h
index f5f8e2f..03dffb8 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_regex.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_regex.h
@@ -14,6 +14,8 @@
 
 #if (NGX_PCRE)
 void ngx_http_lua_inject_regex_api(lua_State *L);
+ngx_int_t ngx_http_lua_ffi_set_jit_stack_size(int size, u_char *errstr,
+    size_t *errstr_size);
 #endif
 
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
index 8a3f832..eda0141 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
@@ -387,8 +387,8 @@ ngx_http_lua_ffi_sema_wait(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    /* we keep the order, will resume the older waited firtly
-     * in ngx_http_lua_sema_handler
+    /* we keep the order, will first resume the thread waiting for the
+     * longest time in ngx_http_lua_sema_handler
      */
 
     if (ngx_queue_empty(&sem->wait_queue) && sem->resource_count > 0) {
@@ -557,8 +557,11 @@ ngx_http_lua_ffi_sema_gc(ngx_http_lua_sema_t *sem)
         return;
     }
 
-    if (!ngx_queue_empty(&sem->wait_queue)) {
-        ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, 0,
+    if (!ngx_terminate
+        && !ngx_quit
+        && !ngx_queue_empty(&sem->wait_queue))
+    {
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
                       "in lua semaphore gc wait queue is"
                       " not empty while the semaphore %p is being "
                       "destroyed", sem);
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c b/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
index 4c0d016..ffee97f 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
@@ -72,10 +72,25 @@ ngx_http_lua_ngx_sleep(lua_State *L)
     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);
+    if (delay == 0) {
+#ifdef HAVE_POSTED_DELAYED_EVENTS_PATCH
+        dd("posting 0 sec sleep event to head of delayed queue");
 
-    ngx_add_timer(&coctx->sleep, (ngx_msec_t) delay);
+        coctx->sleep.delayed = 1;
+        ngx_post_event(&coctx->sleep, &ngx_posted_delayed_events);
+#else
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, "ngx.sleep(0)"
+                      " called without delayed events patch, this will"
+                      " hurt performance");
+        ngx_add_timer(&coctx->sleep, (ngx_msec_t) delay);
+#endif
+
+    } else {
+        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);
+    }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua ready to sleep for %d ms", delay);
@@ -147,6 +162,15 @@ ngx_http_lua_sleep_cleanup(void *data)
 
         ngx_del_timer(&coctx->sleep);
     }
+
+#ifdef HAVE_POSTED_DELAYED_EVENTS_PATCH
+    if (coctx->sleep.posted) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua clean up the posted event for pending ngx.sleep");
+
+        ngx_delete_posted_event(&coctx->sleep);
+    }
+#endif
 }
 
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
index 6db6e2d..382a94d 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
@@ -69,8 +69,6 @@ static void ngx_http_lua_socket_dummy_handler(ngx_http_request_t *r,
     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_tcp_upstream_t *u);
 static int ngx_http_lua_socket_tcp_receive_retval_handler(ngx_http_request_t *r,
     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);
@@ -501,6 +499,12 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         n--;
     }
 
+    /* the fourth argument is not a table */
+    if (n == 4) {
+        lua_pop(L, 1);
+        n--;
+    }
+
     if (n == 3) {
         port = luaL_checkinteger(L, 3);
 
@@ -1208,11 +1212,12 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
 
     ngx_http_lua_socket_tcp_upstream_t  *u;
 
-    /* Lua function arguments: self [,session] [,host] [,verify] */
+    /* Lua function arguments: self [,session] [,host] [,verify]
+       [,send_status_req] */
 
     n = lua_gettop(L);
     if (n < 1 || n > 5) {
-        return luaL_error(L, "ngx.socket connect: expecting 1 ~ 5 "
+        return luaL_error(L, "ngx.socket sslhandshake: expecting 1 ~ 5 "
                           "arguments (including the object), but seen %d", n);
     }
 
@@ -1327,7 +1332,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
 
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
 
-                if (SSL_set_tlsext_host_name(c->ssl->connection, name.data)
+                if (SSL_set_tlsext_host_name(c->ssl->connection,
+                                             (char *) name.data)
                     == 0)
                 {
                     lua_pushnil(L);
@@ -4412,15 +4418,18 @@ ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r)
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
+        r->read_event_handler = ngx_http_block_reading;
         return;
     }
 
     u = ctx->downstream;
-    if (u) {
-        u->read_event_handler(r, u);
+    if (u == NULL || u->peer.connection == NULL) {
+        r->read_event_handler = ngx_http_block_reading;
+        return;
     }
-}
 
+    u->read_event_handler(r, u);
+}
 
 static int
 ngx_http_lua_socket_tcp_getreusedtimes(lua_State *L)
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl.h b/debian/modules/nginx-lua/src/ngx_http_lua_ssl.h
index 7a245ff..acb8c4b 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl.h
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl.h
@@ -12,6 +12,8 @@
 
 
 #if (NGX_HTTP_SSL)
+
+
 typedef struct {
     ngx_connection_t        *connection; /* original true connection */
     ngx_http_request_t      *request;    /* fake request */
@@ -31,7 +33,6 @@ typedef struct {
     unsigned                 entered_cert_handler:1;
     unsigned                 entered_sess_fetch_handler:1;
 } ngx_http_lua_ssl_ctx_t;
-#endif
 
 
 ngx_int_t ngx_http_lua_ssl_init(ngx_log_t *log);
@@ -40,4 +41,7 @@ ngx_int_t ngx_http_lua_ssl_init(ngx_log_t *log);
 extern int ngx_http_lua_ssl_ctx_index;
 
 
+#endif
+
+
 #endif  /* _NGX_HTTP_LUA_SSL_H_INCLUDED_ */
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
index aca4735..c3591d1 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
@@ -193,6 +193,7 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
     ngx_http_lua_srv_conf_t         *lscf;
     ngx_http_core_loc_conf_t        *clcf;
     ngx_http_lua_ssl_ctx_t          *cctx;
+    ngx_http_core_srv_conf_t        *cscf;
 
     c = ngx_ssl_get_connection(ssl_conn);
 
@@ -298,6 +299,16 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
 
     c->log->action = "loading SSL certificate by lua";
 
+    if (lscf->srv.ssl_cert_handler == NULL) {
+        cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "no ssl_certificate_by_lua* defined in "
+                      "server %V", &cscf->server_name);
+
+        goto failed;
+    }
+
     rc = lscf->srv.ssl_cert_handler(r, lscf, L);
 
     if (rc >= NGX_OK || rc == NGX_ERROR) {
@@ -453,7 +464,9 @@ ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (ctx == NULL) {
         ctx = ngx_http_lua_create_ctx(r);
         if (ctx == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            rc = NGX_ERROR;
+            ngx_http_lua_finalize_request(r, rc);
+            return rc;
         }
 
     } else {
@@ -470,7 +483,9 @@ ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "lua: failed to create new coroutine to handle request");
 
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        rc = NGX_ERROR;
+        ngx_http_lua_finalize_request(r, rc);
+        return rc;
     }
 
     /*  move code closure to new coroutine */
@@ -494,7 +509,9 @@ ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (ctx->cleanup == NULL) {
         cln = ngx_http_cleanup_add(r, 0);
         if (cln == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            rc = NGX_ERROR;
+            ngx_http_lua_finalize_request(r, rc);
+            return rc;
         }
 
         cln->handler = ngx_http_lua_request_cleanup_handler;
@@ -1129,7 +1146,11 @@ ngx_http_lua_ffi_set_cert(ngx_http_request_t *r,
 
 #   else
 
+#ifdef OPENSSL_IS_BORINGSSL
+    size_t             i;
+#else
     int                i;
+#endif
     X509              *x509 = NULL;
     ngx_ssl_conn_t    *ssl_conn;
     STACK_OF(X509)    *chain = cdata;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
index 3904aa8..31b4f24 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
@@ -490,7 +490,6 @@ ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
 
     dd("set ocsp resp: resp_len=%d", (int) resp_len);
     (void) SSL_set_tlsext_status_ocsp_resp(ssl_conn, p, resp_len);
-    ssl_conn->tlsext_status_expected = 1;
 
     return NGX_OK;
 
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c
index 4c450b5..556b732 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c
@@ -107,7 +107,7 @@ ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -468,7 +468,9 @@ ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (ctx == NULL) {
         ctx = ngx_http_lua_create_ctx(r);
         if (ctx == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            rc = NGX_ERROR;
+            ngx_http_lua_finalize_request(r, rc);
+            return rc;
         }
 
     } else {
@@ -485,7 +487,9 @@ ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L, ngx_http_request_t *r)
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "lua: failed to create new coroutine to handle request");
 
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        rc = NGX_ERROR;
+        ngx_http_lua_finalize_request(r, rc);
+        return rc;
     }
 
     /*  move code closure to new coroutine */
@@ -509,7 +513,9 @@ ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (ctx->cleanup == NULL) {
         cln = ngx_http_cleanup_add(r, 0);
         if (cln == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            rc = NGX_ERROR;
+            ngx_http_lua_finalize_request(r, rc);
+            return rc;
         }
 
         cln->handler = ngx_http_lua_request_cleanup_handler;
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
index b5596bc..bae8273 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
@@ -105,7 +105,7 @@ ngx_http_lua_ssl_sess_store_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
     dd("enter");
 
-    /*  must specifiy a content handler */
+    /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -351,7 +351,9 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
     if (ctx == NULL) {
         ctx = ngx_http_lua_create_ctx(r);
         if (ctx == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            rc = NGX_ERROR;
+            ngx_http_lua_finalize_request(r, rc);
+            return rc;
         }
 
     } else {
@@ -386,7 +388,7 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
     dd("rc == %d", (int) rc);
 
     if (rc != 0) {
-        /*  error occured when running loaded code */
+        /*  error occurred when running loaded code */
         err_msg = (u_char *) lua_tolstring(L, -1, &len);
 
         if (err_msg == NULL) {
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 22b4c00..239b232 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_string.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_string.c
@@ -125,12 +125,13 @@ ngx_http_lua_ngx_escape_uri(lua_State *L)
         return 1;
     }
 
-    escape = 2 * ngx_http_lua_escape_uri(NULL, src, len, NGX_ESCAPE_URI);
+    escape = 2 * ngx_http_lua_escape_uri(NULL, src, len,
+                                         NGX_ESCAPE_URI_COMPONENT);
 
     if (escape) {
         dlen = escape + len;
         dst = lua_newuserdata(L, dlen);
-        ngx_http_lua_escape_uri(dst, src, len, NGX_ESCAPE_URI);
+        ngx_http_lua_escape_uri(dst, src, len, NGX_ESCAPE_URI_COMPONENT);
         lua_pushlstring(L, (char *) dst, dlen);
     }
 
@@ -751,14 +752,14 @@ size_t
 ngx_http_lua_ffi_uri_escaped_length(const u_char *src, size_t len)
 {
     return len + 2 * ngx_http_lua_escape_uri(NULL, (u_char *) src, len,
-                                             NGX_ESCAPE_URI);
+                                             NGX_ESCAPE_URI_COMPONENT);
 }
 
 
 void
 ngx_http_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst)
 {
-    ngx_http_lua_escape_uri(dst, (u_char *) src, len, NGX_ESCAPE_URI);
+    ngx_http_lua_escape_uri(dst, (u_char *) src, len, NGX_ESCAPE_URI_COMPONENT);
 }
 
 #endif
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
index 01b4777..596b2f7 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_timer.c
@@ -21,11 +21,6 @@ typedef struct {
     void        **srv_conf;
     void        **loc_conf;
 
-    /* event ident must be after 3 words (i.e. 3 pointers' size) as in
-     * ngx_connection_t. and we use the Lua coroutine reference number as
-     * the event ident */
-    int           co_ref;
-    unsigned      premature;  /* :1 */
     lua_State    *co;
 
     ngx_pool_t   *pool;
@@ -36,12 +31,18 @@ typedef struct {
     ngx_http_lua_main_conf_t          *lmcf;
     ngx_http_lua_vm_state_t           *vm_state;
 
+    int           co_ref;
+    unsigned      delay:31;
+    unsigned      premature:1;
 } ngx_http_lua_timer_ctx_t;
 
 
 static int ngx_http_lua_ngx_timer_at(lua_State *L);
+static int ngx_http_lua_ngx_timer_every(lua_State *L);
+static int ngx_http_lua_ngx_timer_helper(lua_State *L, int every);
 static int ngx_http_lua_ngx_timer_running_count(lua_State *L);
 static int ngx_http_lua_ngx_timer_pending_count(lua_State *L);
+static ngx_int_t ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx);
 static void ngx_http_lua_timer_handler(ngx_event_t *ev);
 static u_char *ngx_http_lua_log_timer_error(ngx_log_t *log, u_char *buf,
     size_t len);
@@ -51,11 +52,14 @@ static void ngx_http_lua_abort_pending_timers(ngx_event_t *ev);
 void
 ngx_http_lua_inject_timer_api(lua_State *L)
 {
-    lua_createtable(L, 0 /* narr */, 3 /* nrec */);    /* ngx.timer. */
+    lua_createtable(L, 0 /* narr */, 4 /* nrec */);    /* ngx.timer. */
 
     lua_pushcfunction(L, ngx_http_lua_ngx_timer_at);
     lua_setfield(L, -2, "at");
 
+    lua_pushcfunction(L, ngx_http_lua_ngx_timer_every);
+    lua_setfield(L, -2, "every");
+
     lua_pushcfunction(L, ngx_http_lua_ngx_timer_running_count);
     lua_setfield(L, -2, "running_count");
 
@@ -106,6 +110,24 @@ ngx_http_lua_ngx_timer_pending_count(lua_State *L)
 
 static int
 ngx_http_lua_ngx_timer_at(lua_State *L)
+{
+    return ngx_http_lua_ngx_timer_helper(L, 0);
+}
+
+
+/*
+ * TODO: return a timer handler instead which can be passed to
+ * the ngx.timer.cancel method to cancel the timer.
+ */
+static int
+ngx_http_lua_ngx_timer_every(lua_State *L)
+{
+    return ngx_http_lua_ngx_timer_helper(L, 1);
+}
+
+
+static int
+ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
 {
     int                      nargs, co_ref;
     u_char                  *p;
@@ -134,6 +156,10 @@ ngx_http_lua_ngx_timer_at(lua_State *L)
 
     delay = (ngx_msec_t) (luaL_checknumber(L, 1) * 1000);
 
+    if (every && delay == 0) {
+        return luaL_error(L, "delay cannot be zero");
+    }
+
     luaL_argcheck(L, lua_isfunction(L, 2) && !lua_iscfunction(L, 2), 2,
                   "Lua function expected");
 
@@ -233,7 +259,7 @@ ngx_http_lua_ngx_timer_at(lua_State *L)
     lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
 
-    /* L stack: time func [args] thread corountines */
+    /* L stack: time func [args] thread coroutines */
 
     lua_pushvalue(L, -2);
 
@@ -265,6 +291,8 @@ ngx_http_lua_ngx_timer_at(lua_State *L)
 
     tctx = (ngx_http_lua_timer_ctx_t *) p;
 
+    tctx->delay = every ? delay : 0;
+
     tctx->premature = 0;
     tctx->co_ref = co_ref;
     tctx->co = co;
@@ -338,6 +366,164 @@ nomem:
 }
 
 
+static ngx_int_t
+ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
+{
+    int                          nargs, co_ref, i;
+    u_char                      *p;
+    lua_State                   *vm;  /* the main thread */
+    lua_State                   *co;
+    lua_State                   *L;
+    ngx_event_t                 *ev = NULL;
+    ngx_http_lua_timer_ctx_t    *tctx = NULL;
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    /* L stack: func [args] */
+    L = old_tctx->co;
+
+    lmcf = old_tctx->lmcf;
+
+    vm = old_tctx->vm_state ? old_tctx->vm_state->vm : lmcf->lua;
+
+    co = lua_newthread(vm);
+
+    lua_createtable(co, 0, 0);  /* the new globals table */
+
+    /* co stack: global_tb */
+
+    lua_createtable(co, 0, 1);  /* the metatable */
+    ngx_http_lua_get_globals_table(co);
+    lua_setfield(co, -2, "__index");
+    lua_setmetatable(co, -2);
+
+    /* co stack: global_tb */
+
+    ngx_http_lua_set_globals_table(co);
+
+    /* co stack: <empty> */
+
+    dd("stack top: %d", lua_gettop(L));
+
+    lua_xmove(vm, L, 1);    /* move coroutine from main thread to L */
+
+    /* L stack: func [args] thread */
+    /* vm stack: empty */
+
+    lua_pushvalue(L, 1);    /* copy entry function to top of L*/
+
+    /* L stack: func [args] thread func */
+
+    lua_xmove(L, co, 1);    /* move entry function from L to co */
+
+    /* L stack: func [args] thread */
+    /* co stack: func */
+
+    ngx_http_lua_get_globals_table(co);
+    lua_setfenv(co, -2);
+
+    /* co stack: func */
+
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+
+    /* L stack: func [args] thread coroutines */
+
+    lua_pushvalue(L, -2);
+
+    /* L stack: func [args] thread coroutines thread */
+
+    co_ref = luaL_ref(L, -2);
+    lua_pop(L, 2);
+
+    /* L stack: func [args] */
+
+    nargs = lua_gettop(L);
+    if (nargs > 1) {
+        for (i = 2; i <= nargs; i++) {
+            lua_pushvalue(L, i);
+        }
+
+        /* L stack: func [args] [args] */
+
+        lua_xmove(L, co, nargs - 1);
+
+        /* L stack: func [args] */
+        /* co stack: func [args] */
+    }
+
+    p = ngx_alloc(sizeof(ngx_event_t) + sizeof(ngx_http_lua_timer_ctx_t),
+                  ngx_cycle->log);
+    if (p == NULL) {
+        goto nomem;
+    }
+
+    ev = (ngx_event_t *) p;
+
+    ngx_memzero(ev, sizeof(ngx_event_t));
+
+    p += sizeof(ngx_event_t);
+
+    tctx = (ngx_http_lua_timer_ctx_t *) p;
+
+    ngx_memcpy(tctx, old_tctx, sizeof(ngx_http_lua_timer_ctx_t));
+
+    tctx->co_ref = co_ref;
+    tctx->co = co;
+
+    tctx->pool = ngx_create_pool(128, ngx_cycle->log);
+    if (tctx->pool == NULL) {
+        goto nomem;
+    }
+
+    if (tctx->client_addr_text.len) {
+        tctx->client_addr_text.data = ngx_palloc(tctx->pool,
+                                                 tctx->client_addr_text.len);
+        if (tctx->client_addr_text.data == NULL) {
+            goto nomem;
+        }
+
+        ngx_memcpy(tctx->client_addr_text.data, old_tctx->client_addr_text.data,
+                   tctx->client_addr_text.len);
+    }
+
+    if (tctx->vm_state) {
+        tctx->vm_state->count++;
+    }
+
+    ev->handler = ngx_http_lua_timer_handler;
+    ev->data = tctx;
+    ev->log = ngx_cycle->log;
+
+    lmcf->pending_timers++;
+
+    ngx_add_timer(ev, tctx->delay);
+
+    return NGX_OK;
+
+nomem:
+
+    if (tctx && tctx->pool) {
+        ngx_destroy_pool(tctx->pool);
+    }
+
+    if (ev) {
+        ngx_free(ev);
+    }
+
+    /* L stack: func [args] */
+
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    luaL_unref(L, -1, co_ref);
+
+    /* L stack: func [args] coroutines */
+
+    lua_pop(L, 1);
+
+    return NGX_ERROR;
+}
+
+
 static void
 ngx_http_lua_timer_handler(ngx_event_t *ev)
 {
@@ -364,6 +550,15 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     lmcf->pending_timers--;
 
+    if (!ngx_exiting && tctx.delay > 0) {
+        rc = ngx_http_lua_timer_copy(&tctx);
+        if (rc != NGX_OK) {
+            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                          "failed to create the next timer of delay %ud ms",
+                          (unsigned) tctx.delay);
+        }
+    }
+
     if (lmcf->running_timers >= lmcf->max_running_timers) {
         ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
                       "%i lua_max_running_timers are not enough",
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 7f59833..c7bee3e 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_util.c
@@ -51,6 +51,7 @@
 #include "ngx_http_lua_socket_tcp.h"
 #include "ngx_http_lua_ssl_certby.h"
 #include "ngx_http_lua_ssl.h"
+#include "ngx_http_lua_log_ringbuf.h"
 
 
 #if 1
@@ -918,7 +919,11 @@ ngx_http_lua_request_cleanup(ngx_http_lua_ctx_t *ctx, int forcible)
 #if 1
     if (r->connection->fd == (ngx_socket_t) -1) {
         /* being a fake request */
-        lmcf->running_timers--;
+
+        if (ctx->context == NGX_HTTP_LUA_CONTEXT_TIMER) {
+            /* being a timer handler */
+            lmcf->running_timers--;
+        }
     }
 #endif
 
@@ -1835,6 +1840,26 @@ ngx_http_lua_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
                     /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
         0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
 
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+    };
+
+                    /* not ALPHA, DIGIT, "-", ".", "_", "~" */
+
+    static uint32_t   uri_component[] = {
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+
+                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
+        0xfc00987d, /* 1111 1100 0000 0000  1001 1000 0111 1101 */
+
+                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
+        0x78000001, /* 0111 1000 0000 0000  0000 0000 0000 0001 */
+
+                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
+        0xb8000001, /* 1011 1000 0000 0000  0000 0000 0000 0001 */
+
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
@@ -1904,8 +1929,7 @@ ngx_http_lua_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
                     /* mail_auth is the same as memcached */
 
     static uint32_t  *map[] =
-        { uri, args, html, refresh, memcached, memcached };
-
+        { uri, args, uri_component, html, refresh, memcached, memcached };
 
     escape = map[type];
 
@@ -2316,7 +2340,7 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
         key = (u_char *) lua_tolstring(L, -2, &key_len);
 
         key_escape = 2 * ngx_http_lua_escape_uri(NULL, key, key_len,
-                                                 NGX_ESCAPE_URI);
+                                                 NGX_ESCAPE_URI_COMPONENT);
         total_escape += key_escape;
 
         switch (lua_type(L, -1)) {
@@ -2325,7 +2349,7 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
             value = (u_char *) lua_tolstring(L, -1, &value_len);
 
             total_escape += 2 * ngx_http_lua_escape_uri(NULL, value, value_len,
-                                                        NGX_ESCAPE_URI);
+                                                      NGX_ESCAPE_URI_COMPONENT);
 
             len += key_len + value_len + (sizeof("=") - 1);
             n++;
@@ -2366,7 +2390,7 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
                     total_escape +=
                         2 * ngx_http_lua_escape_uri(NULL, value,
                                                     value_len,
-                                                    NGX_ESCAPE_URI);
+                                                    NGX_ESCAPE_URI_COMPONENT);
 
                     len += key_len + value_len + (sizeof("=") - 1);
                 }
@@ -2423,7 +2447,8 @@ 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_COMPONENT
+                                                       );
 
             } else {
                 dd("shortcut: no escape required");
@@ -2437,7 +2462,8 @@ 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_COMPONENT
+                                                       );
 
             } else {
                 p = ngx_copy(p, value, value_len);
@@ -2456,7 +2482,7 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
             if (lua_toboolean(L, -1)) {
                 if (total_escape) {
                     p = (u_char *) ngx_http_lua_escape_uri(p, key, key_len,
-                                                           NGX_ESCAPE_URI);
+                                                NGX_ESCAPE_URI_COMPONENT);
 
                 } else {
                     dd("shortcut: no escape required");
@@ -2484,7 +2510,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_COMPONENT);
 
                         } else {
                             dd("shortcut: no escape required");
@@ -2503,7 +2529,8 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
                         p = (u_char *)
                                 ngx_http_lua_escape_uri(p, key,
                                                         key_len,
-                                                        NGX_ESCAPE_URI);
+                                                        NGX_ESCAPE_URI_COMPONENT
+                                                        );
 
                     } else {
                         dd("shortcut: no escape required");
@@ -2519,7 +2546,8 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
                         p = (u_char *)
                                 ngx_http_lua_escape_uri(p, value,
                                                         value_len,
-                                                        NGX_ESCAPE_URI);
+                                                        NGX_ESCAPE_URI_COMPONENT
+                                                        );
 
                     } else {
                         p = ngx_copy(p, value, value_len);
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_worker.c b/debian/modules/nginx-lua/src/ngx_http_lua_worker.c
index ff09b5b..e1cfec4 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_worker.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_worker.c
@@ -13,6 +13,9 @@
 #include "ngx_http_lua_worker.h"
 
 
+#define NGX_PROCESS_PRIVILEGED_AGENT    99
+
+
 static int ngx_http_lua_ngx_worker_exiting(lua_State *L);
 static int ngx_http_lua_ngx_worker_pid(lua_State *L);
 static int ngx_http_lua_ngx_worker_id(lua_State *L);
@@ -130,4 +133,46 @@ ngx_http_lua_ffi_worker_count(void)
 
     return (int) ccf->worker_processes;
 }
+
+
+int
+ngx_http_lua_ffi_get_process_type(void)
+{
+#if defined(HAVE_PRIVILEGED_PROCESS_PATCH) && !NGX_WIN32
+    if (ngx_process == NGX_PROCESS_HELPER) {
+        if (ngx_is_privileged_agent) {
+            return NGX_PROCESS_PRIVILEGED_AGENT;
+        }
+    }
+#endif
+
+    return ngx_process;
+}
+
+
+int
+ngx_http_lua_ffi_enable_privileged_agent(char **err)
+{
+#ifdef HAVE_PRIVILEGED_PROCESS_PATCH
+    ngx_core_conf_t   *ccf;
+
+    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                           ngx_core_module);
+
+    ccf->privileged_agent = 1;
+
+    return NGX_OK;
+
+#else
+    *err = "missing privileged agent process patch in the nginx core";
+    return NGX_ERROR;
+#endif
+}
+
+
+void
+ngx_http_lua_ffi_process_signal_graceful_exit(void)
+{
+    ngx_quit = 1;
+}
 #endif
diff --git a/debian/modules/nginx-lua/t/000--init.t b/debian/modules/nginx-lua/t/000--init.t
index 364334f..ad2d70e 100644
--- a/debian/modules/nginx-lua/t/000--init.t
+++ b/debian/modules/nginx-lua/t/000--init.t
@@ -84,4 +84,3 @@ GET /flush
 --- timeout: 10
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/000-sanity.t b/debian/modules/nginx-lua/t/000-sanity.t
index 3f66752..87854ef 100644
--- a/debian/modules/nginx-lua/t/000-sanity.t
+++ b/debian/modules/nginx-lua/t/000-sanity.t
@@ -31,4 +31,3 @@ GET /lua
 GET /lua
 --- response_body
 helloworld
-
diff --git a/debian/modules/nginx-lua/t/001-set.t b/debian/modules/nginx-lua/t/001-set.t
index 2295a2d..ba8f22c 100644
--- a/debian/modules/nginx-lua/t/001-set.t
+++ b/debian/modules/nginx-lua/t/001-set.t
@@ -795,4 +795,3 @@ GET /lua?a=1&b=2
 --- error_code: 500
 --- error_log eval
 qr/failed to load external Lua file ".*?test2\.lua": cannot open .*? No such file or directory/
-
diff --git a/debian/modules/nginx-lua/t/002-content.t b/debian/modules/nginx-lua/t/002-content.t
index e6cb62d..3f2460e 100644
--- a/debian/modules/nginx-lua/t/002-content.t
+++ b/debian/modules/nginx-lua/t/002-content.t
@@ -836,4 +836,3 @@ GET /lua
 --- error_code: 500
 --- error_log eval
 qr/failed to load inlined Lua code: /
-
diff --git a/debian/modules/nginx-lua/t/003-errors.t b/debian/modules/nginx-lua/t/003-errors.t
index 764300a..ad3a506 100644
--- a/debian/modules/nginx-lua/t/003-errors.t
+++ b/debian/modules/nginx-lua/t/003-errors.t
@@ -126,4 +126,3 @@ GET /main
 GET /main
 --- response_body
 500
-
diff --git a/debian/modules/nginx-lua/t/004-require.t b/debian/modules/nginx-lua/t/004-require.t
index 3250b2f..ec74116 100644
--- a/debian/modules/nginx-lua/t/004-require.t
+++ b/debian/modules/nginx-lua/t/004-require.t
@@ -208,4 +208,3 @@ GET /ndk
 GET /ndk
 --- response_body
 %20
-
diff --git a/debian/modules/nginx-lua/t/005-exit.t b/debian/modules/nginx-lua/t/005-exit.t
index 781531f..a5a28b3 100644
--- a/debian/modules/nginx-lua/t/005-exit.t
+++ b/debian/modules/nginx-lua/t/005-exit.t
@@ -723,4 +723,3 @@ GET /t
 --- response_body
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/006-escape.t b/debian/modules/nginx-lua/t/006-escape.t
index 7b26bba..a21d3cb 100644
--- a/debian/modules/nginx-lua/t/006-escape.t
+++ b/debian/modules/nginx-lua/t/006-escape.t
@@ -3,9 +3,8 @@
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
-#repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 2 + 1);
+plan tests => repeat_each() * (blocks() * 2 + 2);
 
 no_long_string();
 
@@ -181,3 +180,20 @@ GET /t
 --- response_body
 [32]
 
+
+
+=== TEST 14: reserved chars
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say(ngx.escape_uri("-_.!~*'()"))
+            ngx.say(ngx.escape_uri(",$@|`"))
+        }
+    }
+--- request
+GET /lua
+--- response_body
+-_.!~*'()
+%2C%24%40%7C%60
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/007-md5.t b/debian/modules/nginx-lua/t/007-md5.t
index 501e3af..2ae9efb 100644
--- a/debian/modules/nginx-lua/t/007-md5.t
+++ b/debian/modules/nginx-lua/t/007-md5.t
@@ -100,4 +100,3 @@ d41d8cd98f00b204e9800998ecf8427e
 GET /md5
 --- response_body
 6c8349cc7260ae62e3b1396831a8398f
-
diff --git a/debian/modules/nginx-lua/t/008-today.t b/debian/modules/nginx-lua/t/008-today.t
index 54bd949..ec2f433 100644
--- a/debian/modules/nginx-lua/t/008-today.t
+++ b/debian/modules/nginx-lua/t/008-today.t
@@ -36,4 +36,3 @@ GET /today
 --- request
 GET /today
 --- response_body_like: ^\d{4}-\d{2}-\d{2}$
-
diff --git a/debian/modules/nginx-lua/t/009-log.t b/debian/modules/nginx-lua/t/009-log.t
index 0c6a9a5..68c057f 100644
--- a/debian/modules/nginx-lua/t/009-log.t
+++ b/debian/modules/nginx-lua/t/009-log.t
@@ -542,4 +542,3 @@ ok
 [error]
 --- error_log eval
 "2: hello\0world, client: "
-
diff --git a/debian/modules/nginx-lua/t/010-request_body.t b/debian/modules/nginx-lua/t/010-request_body.t
index 2640a54..e669d94 100644
--- a/debian/modules/nginx-lua/t/010-request_body.t
+++ b/debian/modules/nginx-lua/t/010-request_body.t
@@ -270,4 +270,3 @@ Expect: 100-Continue
 http finalize request: 500, "/echo_body?" a:1, c:2
 http finalize request: 500, "/echo_body?" a:1, c:0
 --- log_level: debug
-
diff --git a/debian/modules/nginx-lua/t/012-now.t b/debian/modules/nginx-lua/t/012-now.t
index abcb735..5885187 100644
--- a/debian/modules/nginx-lua/t/012-now.t
+++ b/debian/modules/nginx-lua/t/012-now.t
@@ -116,4 +116,3 @@ GET /time
 --- request
 GET /time
 --- response_body_like: ^\d{10,}(\.\d{1,3})?$
-
diff --git a/debian/modules/nginx-lua/t/014-bugs.t b/debian/modules/nginx-lua/t/014-bugs.t
index 44337e3..9aadff0 100644
--- a/debian/modules/nginx-lua/t/014-bugs.t
+++ b/debian/modules/nginx-lua/t/014-bugs.t
@@ -849,7 +849,7 @@ ok
     "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
-        resolver $TEST_NGINX_RESOLVER;
+        resolver $TEST_NGINX_RESOLVER ipv6=off;
         set $myhost 'agentzh.org.';
         proxy_pass http://$myhost/misc/.vimrc;
     }
@@ -1018,4 +1018,3 @@ write timer set: 1
 --- no_error_log
 [error]
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/016-resp-header.t b/debian/modules/nginx-lua/t/016-resp-header.t
index 179b411..1fae292 100644
--- a/debian/modules/nginx-lua/t/016-resp-header.t
+++ b/debian/modules/nginx-lua/t/016-resp-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 38);
+plan tests => repeat_each() * (blocks() * 3 + 41);
 
 #no_diff();
 no_long_string();
@@ -1441,3 +1441,71 @@ Content-Type: ; blah
 test
 --- no_error_log
 [error]
+
+
+
+=== TEST 69: return the matched content-type instead of default_type
+--- http_config
+types {
+    image/png png;
+}
+--- config
+location /set/ {
+     default_type text/html;
+     content_by_lua_block {
+       ngx.say(ngx.header["content-type"])
+   }
+}
+--- request
+GET /set/hello.png
+--- response_headers
+Content-Type: image/png
+--- response_body
+image/png
+--- no_error_log
+[error]
+
+
+
+=== TEST 70: always return the matched content-type
+--- config
+    location /set/ {
+        default_type "image/png";
+        content_by_lua_block {
+            ngx.say(ngx.header["content-type"])
+            ngx.say(ngx.header["content-type"])
+        }
+    }
+--- request
+GET /set/hello.png
+--- response_headers
+Content-Type: image/png
+--- response_body
+image/png
+image/png
+--- no_error_log
+[error]
+
+
+
+=== TEST 71: return the matched content-type after ngx.resp.get_headers()
+--- http_config
+types {
+    image/png png;
+}
+--- config
+    location /set/ {
+        default_type text/html;
+        content_by_lua_block {
+            local h = ngx.resp.get_headers()
+            ngx.say(h["content-type"])
+        }
+    }
+--- request
+GET /set/hello.png
+--- response_headers
+Content-Type: image/png
+--- response_body
+image/png
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/017-exec.t b/debian/modules/nginx-lua/t/017-exec.t
index 4c7a918..535c4ab 100644
--- a/debian/modules/nginx-lua/t/017-exec.t
+++ b/debian/modules/nginx-lua/t/017-exec.t
@@ -572,4 +572,3 @@ hello, bah
 ["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 d68306b..1429377 100644
--- a/debian/modules/nginx-lua/t/018-ndk.t
+++ b/debian/modules/nginx-lua/t/018-ndk.t
@@ -171,4 +171,3 @@ ok
 foo = a b
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/019-const.t b/debian/modules/nginx-lua/t/019-const.t
index fe79bfb..4f9c764 100644
--- a/debian/modules/nginx-lua/t/019-const.t
+++ b/debian/modules/nginx-lua/t/019-const.t
@@ -44,4 +44,3 @@ GET /read
 GET /read
 --- response_body
 504
-
diff --git a/debian/modules/nginx-lua/t/021-cookie-time.t b/debian/modules/nginx-lua/t/021-cookie-time.t
index c00bbea..b05e401 100644
--- a/debian/modules/nginx-lua/t/021-cookie-time.t
+++ b/debian/modules/nginx-lua/t/021-cookie-time.t
@@ -43,4 +43,3 @@ Thu, 18-Nov-10 11:27:35 GMT
 GET /lua
 --- response_body
 Thu, 18-Nov-10 11:27:35 GMT
-
diff --git a/debian/modules/nginx-lua/t/022-redirect.t b/debian/modules/nginx-lua/t/022-redirect.t
index 57c7add..fae39e3 100644
--- a/debian/modules/nginx-lua/t/022-redirect.t
+++ b/debian/modules/nginx-lua/t/022-redirect.t
@@ -84,7 +84,7 @@ GET /read
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
 --- error_log
-only ngx.HTTP_MOVED_TEMPORARILY, ngx.HTTP_MOVED_PERMANENTLY, and ngx.HTTP_TEMPORARY_REDIRECT are allowed
+only ngx.HTTP_MOVED_TEMPORARILY, ngx.HTTP_MOVED_PERMANENTLY, ngx.HTTP_SEE_OTHER, and ngx.HTTP_TEMPORARY_REDIRECT are allowed
 
 
 
@@ -218,3 +218,54 @@ GET /read
 Location: http://agentzh.org/foo?a=b&c=d
 --- response_body_like: 307 Temporary Redirect
 --- error_code: 307
+
+
+
+=== TEST 12: explicit 303
+--- config
+    location /read {
+        content_by_lua_block {
+            ngx.redirect("http://agentzh.org/foo", ngx.HTTP_SEE_OTHER);
+            ngx.say("hi")
+        }
+    }
+--- request
+GET /read
+--- response_headers
+Location: http://agentzh.org/foo
+--- response_body_like: 303 See Other
+--- error_code: 303
+
+
+
+=== TEST 13: explicit 303 with args
+--- config
+    location /read {
+        content_by_lua_block {
+            ngx.redirect("http://agentzh.org/foo?a=b&c=d", ngx.HTTP_SEE_OTHER);
+            ngx.say("hi")
+        }
+    }
+--- request
+GET /read
+--- response_headers
+Location: http://agentzh.org/foo?a=b&c=d
+--- response_body_like: 303 See Other
+--- error_code: 303
+
+
+
+=== TEST 14: explicit 303
+--- config
+    location /read {
+        content_by_lua_block {
+            ngx.redirect("http://agentzh.org/foo?a=b&c=d", 303);
+            ngx.say("hi")
+        }
+    }
+--- request
+GET /read
+--- response_headers
+Location: http://agentzh.org/foo?a=b&c=d
+--- response_body_like: 303 See Other
+--- error_code: 303
diff --git a/debian/modules/nginx-lua/t/023-rewrite/client-abort.t b/debian/modules/nginx-lua/t/023-rewrite/client-abort.t
index e970802..117d17e 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/client-abort.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/client-abort.t
@@ -848,4 +848,3 @@ delete thread 1
 --- no_error_log
 [error]
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/exec.t b/debian/modules/nginx-lua/t/023-rewrite/exec.t
index a063b5b..bd97968 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/exec.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/exec.t
@@ -376,4 +376,3 @@ ngx.exec("@proxy")
     GET /main
 --- response_body
 hello, bah
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/exit.t b/debian/modules/nginx-lua/t/023-rewrite/exit.t
index 9d292f7..39ea5cb 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/exit.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/exit.t
@@ -595,4 +595,3 @@ F(ngx_http_send_header) {
 --- error_code: 204
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/mixed.t b/debian/modules/nginx-lua/t/023-rewrite/mixed.t
index 1156567..0f742b2 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/mixed.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/mixed.t
@@ -167,4 +167,3 @@ world\x03\x04\xff
 hello\x00\x01\x02
 world\x03\x04\xff
 "
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/multi-capture.t b/debian/modules/nginx-lua/t/023-rewrite/multi-capture.t
index 44629b0..083ec78 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/multi-capture.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/multi-capture.t
@@ -392,4 +392,3 @@ res4.status = 201
 res4.body = STORED\r
 
 "
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/on-abort.t b/debian/modules/nginx-lua/t/023-rewrite/on-abort.t
index aca2ab6..336b7ce 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/on-abort.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/on-abort.t
@@ -654,4 +654,3 @@ delete thread 2
 
 --- 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 8843f1a..99f3fd4 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/redirect.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/redirect.t
@@ -122,4 +122,3 @@ GET /read
 --- raw_response_headers_like: Location: /foo\r\n
 --- response_body_like: 302 Found
 --- error_code: 302
-
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 2f42e0a..13bdcb2 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/req-body.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/req-body.t
@@ -221,4 +221,3 @@ hiya, world"]
 --- no_error_log
 [error]
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/req-socket.t b/debian/modules/nginx-lua/t/023-rewrite/req-socket.t
index 34aedaa..87cbbbe 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/req-socket.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/req-socket.t
@@ -532,4 +532,3 @@ Expect: 100-Continue
 \breceived: hello\b.*?\breceived:  worl\b
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/request_body.t b/debian/modules/nginx-lua/t/023-rewrite/request_body.t
index 0594001..b867d3a 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/request_body.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/request_body.t
@@ -170,4 +170,3 @@ Expect: 100-Continue
 http finalize request: 500, "/echo_body?" a:1, c:2
 http finalize request: 500, "/echo_body?" a:1, c:0
 --- log_level: debug
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/sanity.t b/debian/modules/nginx-lua/t/023-rewrite/sanity.t
index 20b00e2..b90aa0e 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/sanity.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/sanity.t
@@ -799,4 +799,3 @@ test
 test
 --- no_error_log
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/sleep.t b/debian/modules/nginx-lua/t/023-rewrite/sleep.t
index 1719784..8d4c2da 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/sleep.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/sleep.t
@@ -219,4 +219,3 @@ 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
index 50de0b3..489a70f 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t
@@ -1007,4 +1007,3 @@ Not found, dear...
 --- error_code: 404
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/subrequest.t b/debian/modules/nginx-lua/t/023-rewrite/subrequest.t
index a307388..5d1e8f0 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/subrequest.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/subrequest.t
@@ -639,4 +639,3 @@ the nginx core requires the patch https://github.com/agentzh/ngx_openresty/blob/
     GET /t
 --- response_body
 done
-
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
index 79cd0b9..15bec7f 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t
@@ -41,7 +41,7 @@ __DATA__
 --- config
     server_tokens off;
     lua_socket_connect_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t1 {
         rewrite_by_lua '
@@ -73,7 +73,7 @@ lua tcp socket connect timed out
     server_tokens off;
     lua_socket_connect_timeout 60s;
     lua_socket_log_errors off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t2 {
         rewrite_by_lua '
@@ -108,7 +108,7 @@ lua tcp socket connect timeout: 150
     server_tokens off;
     lua_socket_log_errors off;
     lua_socket_connect_timeout 102ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     #resolver_timeout 3s;
     location /t3 {
         rewrite_by_lua '
@@ -143,7 +143,7 @@ lua tcp socket connect timeout: 102
     server_tokens off;
     lua_socket_connect_timeout 102ms;
     lua_socket_log_errors off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t4 {
         rewrite_by_lua '
@@ -179,7 +179,7 @@ lua tcp socket connect timeout: 102
     server_tokens off;
     lua_socket_connect_timeout 102ms;
     lua_socket_log_errors off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t5 {
         rewrite_by_lua '
@@ -251,7 +251,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 60s;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
@@ -292,7 +292,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
@@ -333,7 +333,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
@@ -375,7 +375,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
@@ -416,7 +416,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
@@ -455,7 +455,7 @@ lua tcp socket write timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 60s;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
@@ -496,7 +496,7 @@ lua tcp socket write timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
@@ -537,7 +537,7 @@ lua tcp socket write timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
@@ -578,7 +578,7 @@ lua tcp socket write timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
@@ -612,4 +612,3 @@ failed to send: timeout
 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
index cf9d80a..bff69a5 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
@@ -204,7 +204,7 @@ attempt to send data on a closed socket:
 --- timeout: 10
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t {
         rewrite_by_lua '
@@ -296,7 +296,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
 
 === TEST 6: connection timeout (tcp)
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_socket_connect_timeout 100ms;
     lua_socket_send_timeout 100ms;
     lua_socket_read_timeout 100ms;
@@ -372,7 +372,7 @@ connected: 1
 === TEST 8: resolver error (host not found)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t {
         rewrite_by_lua '
@@ -415,7 +415,7 @@ attempt to send data on a closed socket
 === TEST 9: resolver error (timeout)
 --- config
     server_tokens off;
-    resolver 8.8.8.8;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 1ms;
     location /t {
         rewrite_by_lua '
@@ -2390,4 +2390,3 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):16: bad request/
 
 --- no_error_log
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t b/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
index 098dd67..8a5f000 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
@@ -150,4 +150,3 @@ received:
 received: foo
 failed to receive a line: closed
 close: 1 nil
-
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t b/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
index 0f125e0..83de1a3 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
@@ -186,4 +186,3 @@ free request
 --- 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
index 58af7d0..5552107 100644
--- a/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t
+++ b/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t
@@ -1449,4 +1449,3 @@ status: 204
 --- no_error_log
 [error]
 --- timeout: 3
-
diff --git a/debian/modules/nginx-lua/t/024-access/auth.t b/debian/modules/nginx-lua/t/024-access/auth.t
index 5da09cb..56e9862 100644
--- a/debian/modules/nginx-lua/t/024-access/auth.t
+++ b/debian/modules/nginx-lua/t/024-access/auth.t
@@ -107,4 +107,3 @@ Location: /terms_of_use\.html
 GET /lua
 --- response_body_like: 403 Forbidden
 --- error_code: 403
-
diff --git a/debian/modules/nginx-lua/t/024-access/client-abort.t b/debian/modules/nginx-lua/t/024-access/client-abort.t
index a94f822..c16f4ea 100644
--- a/debian/modules/nginx-lua/t/024-access/client-abort.t
+++ b/debian/modules/nginx-lua/t/024-access/client-abort.t
@@ -850,4 +850,3 @@ delete thread 1
 --- 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 8470ab9..d6d66b8 100644
--- a/debian/modules/nginx-lua/t/024-access/exit.t
+++ b/debian/modules/nginx-lua/t/024-access/exit.t
@@ -545,4 +545,3 @@ Not found, dear...
 --- response_body
 Not found, dear...
 --- error_code: 404
-
diff --git a/debian/modules/nginx-lua/t/024-access/multi-capture.t b/debian/modules/nginx-lua/t/024-access/multi-capture.t
index 368d401..930b74d 100644
--- a/debian/modules/nginx-lua/t/024-access/multi-capture.t
+++ b/debian/modules/nginx-lua/t/024-access/multi-capture.t
@@ -392,4 +392,3 @@ res4.status = 201
 res4.body = STORED\r
 
 "
-
diff --git a/debian/modules/nginx-lua/t/024-access/on-abort.t b/debian/modules/nginx-lua/t/024-access/on-abort.t
index 0c17b55..5bb948b 100644
--- a/debian/modules/nginx-lua/t/024-access/on-abort.t
+++ b/debian/modules/nginx-lua/t/024-access/on-abort.t
@@ -649,4 +649,3 @@ delete thread 2
 
 --- 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 c7ce512..b45fac7 100644
--- a/debian/modules/nginx-lua/t/024-access/redirect.t
+++ b/debian/modules/nginx-lua/t/024-access/redirect.t
@@ -122,4 +122,3 @@ GET /read
 --- raw_response_headers_like: Location: /foo\r\n
 --- response_body_like: 302 Found
 --- error_code: 302
-
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 fd33aff..70db85c 100644
--- a/debian/modules/nginx-lua/t/024-access/req-body.t
+++ b/debian/modules/nginx-lua/t/024-access/req-body.t
@@ -218,4 +218,3 @@ hiya, world"]
 --- no_error_log
 [error]
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/024-access/request_body.t b/debian/modules/nginx-lua/t/024-access/request_body.t
index a6fead2..fa03195 100644
--- a/debian/modules/nginx-lua/t/024-access/request_body.t
+++ b/debian/modules/nginx-lua/t/024-access/request_body.t
@@ -170,4 +170,3 @@ Expect: 100-Continue
 http finalize request: 500, "/echo_body?" a:1, c:2
 http finalize request: 500, "/echo_body?" a:1, c:0
 --- log_level: debug
-
diff --git a/debian/modules/nginx-lua/t/024-access/sanity.t b/debian/modules/nginx-lua/t/024-access/sanity.t
index de63a68..7ff177f 100644
--- a/debian/modules/nginx-lua/t/024-access/sanity.t
+++ b/debian/modules/nginx-lua/t/024-access/sanity.t
@@ -741,4 +741,3 @@ test
 test
 --- no_error_log
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/024-access/satisfy.t b/debian/modules/nginx-lua/t/024-access/satisfy.t
index 10d3ece..7902f49 100644
--- a/debian/modules/nginx-lua/t/024-access/satisfy.t
+++ b/debian/modules/nginx-lua/t/024-access/satisfy.t
@@ -209,4 +209,3 @@ something important
 --- error_code: 200
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/024-access/sleep.t b/debian/modules/nginx-lua/t/024-access/sleep.t
index 2eb0822..fc1fc02 100644
--- a/debian/modules/nginx-lua/t/024-access/sleep.t
+++ b/debian/modules/nginx-lua/t/024-access/sleep.t
@@ -219,4 +219,3 @@ hello world
 hello world
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/024-access/subrequest.t b/debian/modules/nginx-lua/t/024-access/subrequest.t
index bfe96d6..b6ccf11 100644
--- a/debian/modules/nginx-lua/t/024-access/subrequest.t
+++ b/debian/modules/nginx-lua/t/024-access/subrequest.t
@@ -599,4 +599,3 @@ the nginx core requires the patch https://github.com/agentzh/ngx_openresty/blob/
     GET /t
 --- response_body
 done
-
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-exec.t b/debian/modules/nginx-lua/t/024-access/uthread-exec.t
index d7c2321..7add3d4 100644
--- a/debian/modules/nginx-lua/t/024-access/uthread-exec.t
+++ b/debian/modules/nginx-lua/t/024-access/uthread-exec.t
@@ -344,4 +344,3 @@ free request
 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
index da4a9db..7c146ae 100644
--- a/debian/modules/nginx-lua/t/024-access/uthread-exit.t
+++ b/debian/modules/nginx-lua/t/024-access/uthread-exit.t
@@ -1311,4 +1311,3 @@ free request
 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
index 8b030ac..4eb4759 100644
--- a/debian/modules/nginx-lua/t/024-access/uthread-redirect.t
+++ b/debian/modules/nginx-lua/t/024-access/uthread-redirect.t
@@ -187,4 +187,3 @@ free request
 --- 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
index 415e4c0..7c7ba3b 100644
--- a/debian/modules/nginx-lua/t/024-access/uthread-spawn.t
+++ b/debian/modules/nginx-lua/t/024-access/uthread-spawn.t
@@ -1116,4 +1116,3 @@ 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 f33452a..0b02a27 100644
--- a/debian/modules/nginx-lua/t/025-codecache.t
+++ b/debian/modules/nginx-lua/t/025-codecache.t
@@ -1244,4 +1244,3 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
 "decrementing the reference count for Lua VM: 1",
 "lua close the global Lua VM",
 ]
-
diff --git a/debian/modules/nginx-lua/t/026-mysql.t b/debian/modules/nginx-lua/t/026-mysql.t
index e14ffb6..569f96f 100644
--- a/debian/modules/nginx-lua/t/026-mysql.t
+++ b/debian/modules/nginx-lua/t/026-mysql.t
@@ -66,7 +66,7 @@ __DATA__
 ^status = 504
 thread id = \d+
 kill status = 200
-kill body = {"errcode":0}$
+kill body = \{"errcode":0\}$
 --- error_log eval
 qr{upstream timed out \(\d+: Connection timed out\) while sending query to drizzle upstream}
 
@@ -126,6 +126,5 @@ qr{upstream timed out \(\d+: Connection timed out\) while sending query to drizz
 ^status = 504
 thread id = \d+
 kill status = 200
-kill body = {"errcode":0}$
+kill body = \{"errcode":0\}$
 --- SKIP
-
diff --git a/debian/modules/nginx-lua/t/027-multi-capture.t b/debian/modules/nginx-lua/t/027-multi-capture.t
index 3588c69..9227fe5 100644
--- a/debian/modules/nginx-lua/t/027-multi-capture.t
+++ b/debian/modules/nginx-lua/t/027-multi-capture.t
@@ -752,4 +752,3 @@ proxy_cache_path conf/cache levels=1:2 keys_zone=STATIC:10m inactive=10m max_siz
     GET /foo
 --- response_body
 ok
-
diff --git a/debian/modules/nginx-lua/t/029-http-time.t b/debian/modules/nginx-lua/t/029-http-time.t
index 71a7758..ecef492 100644
--- a/debian/modules/nginx-lua/t/029-http-time.t
+++ b/debian/modules/nginx-lua/t/029-http-time.t
@@ -85,4 +85,3 @@ GET /lua
 GET /lua
 --- response_body
 nil
-
diff --git a/debian/modules/nginx-lua/t/030-uri-args.t b/debian/modules/nginx-lua/t/030-uri-args.t
index 8ee8401..96e216c 100644
--- a/debian/modules/nginx-lua/t/030-uri-args.t
+++ b/debian/modules/nginx-lua/t/030-uri-args.t
@@ -9,7 +9,7 @@ log_level('warn');
 repeat_each(2);
 #repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 2 + 17);
+plan tests => repeat_each() * (blocks() * 2 + 18);
 
 no_root_location();
 
@@ -1390,3 +1390,19 @@ GET /lua
 --- response_body_like
 ^HTTP/1.0 (a=3&b|b&a=3)$
 
+
+
+=== TEST 57: ngx.encode_args (escaping)
+--- config
+    location /lua {
+        content_by_lua_block {
+            local t = {bar = "-_.!~*'()", foo = ",$@|`"}
+            ngx.say("args: ", ngx.encode_args(t))
+        }
+    }
+--- request
+GET /lua
+--- response_body
+args: foo=%2C%24%40%7C%60&bar=-_.!~*'()
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/031-post-args.t b/debian/modules/nginx-lua/t/031-post-args.t
index c2b6b8f..62c88c1 100644
--- a/debian/modules/nginx-lua/t/031-post-args.t
+++ b/debian/modules/nginx-lua/t/031-post-args.t
@@ -351,6 +351,6 @@ CORE::join("", @k);
 POST /lua
 a=3&b=4&c
 --- response_body
-requesty body in temp file not supported
+request body in temp file not supported
 --- no_error_log
 [error]
diff --git a/debian/modules/nginx-lua/t/032-iolist.t b/debian/modules/nginx-lua/t/032-iolist.t
index ddf3d7f..3c56032 100644
--- a/debian/modules/nginx-lua/t/032-iolist.t
+++ b/debian/modules/nginx-lua/t/032-iolist.t
@@ -76,4 +76,3 @@ GET /lua
 GET /lua
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
-
diff --git a/debian/modules/nginx-lua/t/033-ctx.t b/debian/modules/nginx-lua/t/033-ctx.t
index eefb216..8fc50aa 100644
--- a/debian/modules/nginx-lua/t/033-ctx.t
+++ b/debian/modules/nginx-lua/t/033-ctx.t
@@ -440,4 +440,3 @@ lua release ngx.ctx at ref
 --- response_body
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/034-match.t b/debian/modules/nginx-lua/t/034-match.t
index 35149f1..ebe5762 100644
--- a/debian/modules/nginx-lua/t/034-match.t
+++ b/debian/modules/nginx-lua/t/034-match.t
@@ -1017,7 +1017,7 @@ exec opts: 0
 
 === TEST 45: just hit match limit
 --- http_config
-    lua_regex_match_limit 5600;
+    lua_regex_match_limit 5000;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
@@ -1057,7 +1057,7 @@ error: pcre_exec() failed: -8
 
 === TEST 46: just not hit match limit
 --- http_config
-    lua_regex_match_limit 5700;
+    lua_regex_match_limit 5100;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
diff --git a/debian/modules/nginx-lua/t/035-gmatch.t b/debian/modules/nginx-lua/t/035-gmatch.t
index 69b9512..5b63ae4 100644
--- a/debian/modules/nginx-lua/t/035-gmatch.t
+++ b/debian/modules/nginx-lua/t/035-gmatch.t
@@ -814,7 +814,7 @@ exec opts: 0
 
 === TEST 30: just hit match limit
 --- http_config
-    lua_regex_match_limit 5600;
+    lua_regex_match_limit 5000;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
@@ -860,7 +860,7 @@ error: pcre_exec() failed: -8
 
 === TEST 31: just not hit match limit
 --- http_config
-    lua_regex_match_limit 5700;
+    lua_regex_match_limit 5100;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
@@ -901,4 +901,3 @@ end
     GET /re
 --- response_body
 failed to match
-
diff --git a/debian/modules/nginx-lua/t/036-sub.t b/debian/modules/nginx-lua/t/036-sub.t
index f08c50f..2b4b075 100644
--- a/debian/modules/nginx-lua/t/036-sub.t
+++ b/debian/modules/nginx-lua/t/036-sub.t
@@ -580,7 +580,7 @@ s: a好
 
 === TEST 28: just hit match limit
 --- http_config
-    lua_regex_match_limit 5600;
+    lua_regex_match_limit 5000;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
@@ -617,7 +617,7 @@ error: pcre_exec() failed: -8
 
 === TEST 29: just not hit match limit
 --- http_config
-    lua_regex_match_limit 5700;
+    lua_regex_match_limit 5100;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
diff --git a/debian/modules/nginx-lua/t/037-gsub.t b/debian/modules/nginx-lua/t/037-gsub.t
index 2a1e00f..4c5810d 100644
--- a/debian/modules/nginx-lua/t/037-gsub.t
+++ b/debian/modules/nginx-lua/t/037-gsub.t
@@ -501,7 +501,7 @@ s: aa
 
 === TEST 23: just hit match limit
 --- http_config
-    lua_regex_match_limit 5600;
+    lua_regex_match_limit 5000;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
@@ -538,7 +538,7 @@ error: pcre_exec() failed: -8
 
 === TEST 24: just not hit match limit
 --- http_config
-    lua_regex_match_limit 5700;
+    lua_regex_match_limit 5100;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
diff --git a/debian/modules/nginx-lua/t/038-match-o.t b/debian/modules/nginx-lua/t/038-match-o.t
index 628e27f..d61ff1f 100644
--- a/debian/modules/nginx-lua/t/038-match-o.t
+++ b/debian/modules/nginx-lua/t/038-match-o.t
@@ -740,4 +740,3 @@ false
 hello
 false
 false
-
diff --git a/debian/modules/nginx-lua/t/039-sub-o.t b/debian/modules/nginx-lua/t/039-sub-o.t
index a861b6c..580a671 100644
--- a/debian/modules/nginx-lua/t/039-sub-o.t
+++ b/debian/modules/nginx-lua/t/039-sub-o.t
@@ -578,4 +578,3 @@ a [b c] [b] [c] [] [] d
 --- response_body
 a [b c] [b] [c] d
 1
-
diff --git a/debian/modules/nginx-lua/t/040-gsub-o.t b/debian/modules/nginx-lua/t/040-gsub-o.t
index 90619b0..5347266 100644
--- a/debian/modules/nginx-lua/t/040-gsub-o.t
+++ b/debian/modules/nginx-lua/t/040-gsub-o.t
@@ -198,4 +198,3 @@ hello, world
 --- response_body
 [hello,h], [world,w]
 2
-
diff --git a/debian/modules/nginx-lua/t/041-header-filter.t b/debian/modules/nginx-lua/t/041-header-filter.t
index 553ee43..9cca3b7 100644
--- a/debian/modules/nginx-lua/t/041-header-filter.t
+++ b/debian/modules/nginx-lua/t/041-header-filter.t
@@ -790,4 +790,3 @@ GET /t
 --- error_code: 302
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/042-crc32.t b/debian/modules/nginx-lua/t/042-crc32.t
index 86d9201..73aa1f4 100644
--- a/debian/modules/nginx-lua/t/042-crc32.t
+++ b/debian/modules/nginx-lua/t/042-crc32.t
@@ -54,4 +54,3 @@ GET /test
 GET /test
 --- response_body
 0
-
diff --git a/debian/modules/nginx-lua/t/045-ngx-var.t b/debian/modules/nginx-lua/t/045-ngx-var.t
index 8f2dcb3..6475f1e 100644
--- a/debian/modules/nginx-lua/t/045-ngx-var.t
+++ b/debian/modules/nginx-lua/t/045-ngx-var.t
@@ -154,14 +154,15 @@ invalid referer: 1
 
 
 
-=== TEST 8: $proxy_host & $proxy_port
+=== TEST 8: $proxy_host & $proxy_port & $proxy_add_x_forwarded_for
 --- config
     location = /t {
         proxy_pass http://127.0.0.1:$server_port/back;
-        header_filter_by_lua '
+        header_filter_by_lua_block {
             ngx.header["Proxy-Host"] = ngx.var.proxy_host
             ngx.header["Proxy-Port"] = ngx.var.proxy_port
-        ';
+            ngx.header["Proxy-Add-X-Forwarded-For"] = ngx.var.proxy_add_x_forwarded_for
+        }
     }
 
     location = /back {
@@ -172,6 +173,7 @@ GET /t
 --- raw_response_headers_like
 Proxy-Host: 127.0.0.1\:\d+\r
 Proxy-Port: \d+\r
+Proxy-Add-X-Forwarded-For: 127.0.0.1\r
 --- response_body
 hello
 --- no_error_log
@@ -226,4 +228,3 @@ GET /test?hello
 --- error_log
 variable "query_string" not changeable
 --- error_code: 500
-
diff --git a/debian/modules/nginx-lua/t/046-hmac.t b/debian/modules/nginx-lua/t/046-hmac.t
index 686b479..32e222b 100644
--- a/debian/modules/nginx-lua/t/046-hmac.t
+++ b/debian/modules/nginx-lua/t/046-hmac.t
@@ -29,4 +29,3 @@ __DATA__
 GET /lua
 --- response_body
 R/pvxzHC4NLtj7S+kXFg/NePTmk=
-
diff --git a/debian/modules/nginx-lua/t/047-match-jit.t b/debian/modules/nginx-lua/t/047-match-jit.t
index 077ebb6..2417a63 100644
--- a/debian/modules/nginx-lua/t/047-match-jit.t
+++ b/debian/modules/nginx-lua/t/047-match-jit.t
@@ -212,4 +212,3 @@ end
     GET /re
 --- response_body
 failed to match
-
diff --git a/debian/modules/nginx-lua/t/048-match-dfa.t b/debian/modules/nginx-lua/t/048-match-dfa.t
index 8a0a328..28b5a60 100644
--- a/debian/modules/nginx-lua/t/048-match-dfa.t
+++ b/debian/modules/nginx-lua/t/048-match-dfa.t
@@ -207,4 +207,3 @@ exec opts: 0
 你
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/049-gmatch-jit.t b/debian/modules/nginx-lua/t/049-gmatch-jit.t
index 614c440..5134d52 100644
--- a/debian/modules/nginx-lua/t/049-gmatch-jit.t
+++ b/debian/modules/nginx-lua/t/049-gmatch-jit.t
@@ -226,4 +226,3 @@ qr/pcre JIT compiling result: \d+/
 error: pcre_compile() failed: missing ) in "(abc"
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/051-sub-jit.t b/debian/modules/nginx-lua/t/051-sub-jit.t
index 789e897..c8a49c0 100644
--- a/debian/modules/nginx-lua/t/051-sub-jit.t
+++ b/debian/modules/nginx-lua/t/051-sub-jit.t
@@ -147,4 +147,3 @@ error: pcre_compile() failed: missing ) in "(abc"
 error: pcre_compile() failed: missing ) in "(abc"
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/053-gsub-jit.t b/debian/modules/nginx-lua/t/053-gsub-jit.t
index 3a2a1aa..3efc0a2 100644
--- a/debian/modules/nginx-lua/t/053-gsub-jit.t
+++ b/debian/modules/nginx-lua/t/053-gsub-jit.t
@@ -147,4 +147,3 @@ error: pcre_compile() failed: missing ) in "(abc"
 error: pcre_compile() failed: missing ) in "(abc"
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/055-subreq-vars.t b/debian/modules/nginx-lua/t/055-subreq-vars.t
index 2fc6960..eb5e24d 100644
--- a/debian/modules/nginx-lua/t/055-subreq-vars.t
+++ b/debian/modules/nginx-lua/t/055-subreq-vars.t
@@ -336,4 +336,3 @@ dog = hiya
 cat = 56
 parent dog: blah
 parent cat: foo
-
diff --git a/debian/modules/nginx-lua/t/056-flush.t b/debian/modules/nginx-lua/t/056-flush.t
index d189cd5..6b697a4 100644
--- a/debian/modules/nginx-lua/t/056-flush.t
+++ b/debian/modules/nginx-lua/t/056-flush.t
@@ -520,4 +520,3 @@ qr/lua flush requires waiting: buffered 0x[0-9a-f]+, delayed:1/,
 --- no_error_log
 [error]
 --- timeout: 4
-
diff --git a/debian/modules/nginx-lua/t/057-flush-timeout.t b/debian/modules/nginx-lua/t/057-flush-timeout.t
index d6e0f86..a046539 100644
--- a/debian/modules/nginx-lua/t/057-flush-timeout.t
+++ b/debian/modules/nginx-lua/t/057-flush-timeout.t
@@ -318,4 +318,3 @@ qr/failed to flush: client aborted/,
 --- timeout: 0.2
 --- abort
 --- wait: 1
-
diff --git a/debian/modules/nginx-lua/t/058-tcp-socket.t b/debian/modules/nginx-lua/t/058-tcp-socket.t
index acf69f0..1ee113b 100644
--- a/debian/modules/nginx-lua/t/058-tcp-socket.t
+++ b/debian/modules/nginx-lua/t/058-tcp-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 187;
+plan tests => repeat_each() * 190;
 
 our $HtmlDir = html_dir;
 
@@ -200,7 +200,7 @@ attempt to send data on a closed socket:
 --- timeout: 10
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t {
         content_by_lua '
@@ -290,7 +290,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
 
 === TEST 6: connection timeout (tcp)
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_socket_connect_timeout 100ms;
     lua_socket_send_timeout 100ms;
     lua_socket_read_timeout 100ms;
@@ -362,7 +362,7 @@ connected: 1
 === TEST 8: resolver error (host not found)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t {
         content_by_lua '
@@ -403,7 +403,7 @@ attempt to send data on a closed socket
 === TEST 9: resolver error (timeout)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 1ms;
     location /t {
         content_by_lua '
@@ -1995,7 +1995,7 @@ close: 1 nil
 
 === TEST 33: github issue #215: Handle the posted requests in lua cosocket api (failed to resolve)
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
 
     location = /sub {
         content_by_lua '
@@ -2038,7 +2038,7 @@ resolve name done
 
 === TEST 34: github issue #215: Handle the posted requests in lua cosocket api (successfully resolved)
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 5s;
 
     location = /sub {
@@ -2136,7 +2136,7 @@ close: nil closed
 --- config
     server_tokens off;
     lua_socket_read_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -2178,7 +2178,7 @@ lua tcp socket read timed out
 === TEST 37: successful reread after a read time out happen (receive -> receive)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -2255,7 +2255,7 @@ lua tcp socket read timed out
 === TEST 38: successful reread after a read time out happen (receive -> receiveuntil)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -2335,7 +2335,7 @@ lua tcp socket read timed out
 === TEST 39: successful reread after a read time out happen (receiveuntil -> receiveuntil)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -2417,7 +2417,7 @@ lua tcp socket read timed out
 === TEST 40: successful reread after a read time out happen (receiveuntil -> receive)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -3015,7 +3015,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):16: bad request/
 === TEST 50: cosocket resolving aborted by coroutine yielding failures (require)
 --- http_config
     lua_package_path "$prefix/html/?.lua;;";
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
 
 --- config
     location = /t {
@@ -3049,7 +3049,7 @@ runtime error: attempt to yield across C-call boundary
 === TEST 51: cosocket resolving aborted by coroutine yielding failures (xpcall err)
 --- http_config
     lua_package_path "$prefix/html/?.lua;;";
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
 
 --- config
     location = /t {
@@ -3307,7 +3307,7 @@ close: 1 nil
 --- config
     server_tokens off;
     lua_socket_connect_timeout 1s;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t {
         content_by_lua '
@@ -3640,3 +3640,53 @@ failed to receive a line: closed []
 close: 1 nil
 --- error_log
 lua http cleanup reuse
+
+
+
+=== TEST 60: options_table is nil
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port, nil)
+            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)
+        }
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+request sent: 11
+received: OK
+close: 1 nil
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/060-lua-memcached.t b/debian/modules/nginx-lua/t/060-lua-memcached.t
index e1ebb92..0751238 100644
--- a/debian/modules/nginx-lua/t/060-lua-memcached.t
+++ b/debian/modules/nginx-lua/t/060-lua-memcached.t
@@ -166,4 +166,3 @@ some_key: hello 1234
 [error]
 --- error_log
 lua reuse free buf memory
-
diff --git a/debian/modules/nginx-lua/t/061-lua-redis.t b/debian/modules/nginx-lua/t/061-lua-redis.t
index d7b1876..ebfa6d1 100644
--- a/debian/modules/nginx-lua/t/061-lua-redis.t
+++ b/debian/modules/nginx-lua/t/061-lua-redis.t
@@ -182,4 +182,3 @@ 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 c3973ad..a69c33e 100644
--- a/debian/modules/nginx-lua/t/062-count.t
+++ b/debian/modules/nginx-lua/t/062-count.t
@@ -323,7 +323,7 @@ ngx. entry count: 116
 --- request
 GET /test
 --- response_body
-n = 3
+n = 4
 --- no_error_log
 [error]
 
diff --git a/debian/modules/nginx-lua/t/063-abort.t b/debian/modules/nginx-lua/t/063-abort.t
index c112ee1..411a07e 100644
--- a/debian/modules/nginx-lua/t/063-abort.t
+++ b/debian/modules/nginx-lua/t/063-abort.t
@@ -1017,4 +1017,3 @@ foo
 --- no_error_log
 [error]
 --- timeout: 2
-
diff --git a/debian/modules/nginx-lua/t/064-pcall.t b/debian/modules/nginx-lua/t/064-pcall.t
index cf90a07..3011f3e 100644
--- a/debian/modules/nginx-lua/t/064-pcall.t
+++ b/debian/modules/nginx-lua/t/064-pcall.t
@@ -104,4 +104,3 @@ $/
 
 --- no_error_log
 [error]
-
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 ec79891..212766e 100644
--- a/debian/modules/nginx-lua/t/065-tcp-socket-timeout.t
+++ b/debian/modules/nginx-lua/t/065-tcp-socket-timeout.t
@@ -46,7 +46,7 @@ __DATA__
 --- config
     server_tokens off;
     lua_socket_connect_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t {
         content_by_lua '
@@ -75,7 +75,7 @@ lua tcp socket connect timed out
 --- config
     server_tokens off;
     lua_socket_connect_timeout 60s;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t {
         content_by_lua '
@@ -105,7 +105,7 @@ lua tcp socket connect timed out
 --- config
     server_tokens off;
     lua_socket_connect_timeout 102ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -133,7 +133,7 @@ lua tcp socket connect timed out
 --- config
     server_tokens off;
     lua_socket_connect_timeout 102ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t {
         content_by_lua '
@@ -163,7 +163,7 @@ lua tcp socket connect timed out
 --- config
     server_tokens off;
     lua_socket_connect_timeout 102ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -191,7 +191,7 @@ lua tcp socket connect timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -228,7 +228,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 60s;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -267,7 +267,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -306,7 +306,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -346,7 +346,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -385,7 +385,7 @@ lua tcp socket read timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -436,7 +436,7 @@ lua tcp socket write timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 60s;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -475,7 +475,7 @@ lua tcp socket write timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -514,7 +514,7 @@ lua tcp socket write timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -553,7 +553,7 @@ lua tcp socket write timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER;
+    #resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -686,7 +686,7 @@ after
 --- config
     server_tokens off;
     lua_socket_connect_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /t {
         content_by_lua '
@@ -724,7 +724,7 @@ lua tcp socket connect timed out
 --- config
     server_tokens off;
     lua_socket_send_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -779,7 +779,7 @@ lua tcp socket write timed out
 === TEST 19: abort when upstream sockets pending on writes
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -832,7 +832,7 @@ lua tcp socket write timed out
 === TEST 20: abort when downstream socket pending on writes
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             ngx.send_headers()
@@ -888,7 +888,7 @@ lua tcp socket write timed out
 --- config
     server_tokens off;
     lua_socket_read_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
@@ -994,4 +994,3 @@ close: 1 nil
 
 --- 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 3bf5229..ffe74aa 100644
--- a/debian/modules/nginx-lua/t/066-socket-receiveuntil.t
+++ b/debian/modules/nginx-lua/t/066-socket-receiveuntil.t
@@ -1329,4 +1329,3 @@ this exposed a memory leak in receiveuntil
 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 30a653a..229d5cc 100644
--- a/debian/modules/nginx-lua/t/067-req-socket.t
+++ b/debian/modules/nginx-lua/t/067-req-socket.t
@@ -1096,4 +1096,3 @@ done
 --- grep_error_log_out
 lua finalize socket
 GC cycle done
-
diff --git a/debian/modules/nginx-lua/t/069-null.t b/debian/modules/nginx-lua/t/069-null.t
index 7761c91..e4c26af 100644
--- a/debian/modules/nginx-lua/t/069-null.t
+++ b/debian/modules/nginx-lua/t/069-null.t
@@ -93,4 +93,3 @@ done
 ngx.null: null
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/071-idle-socket.t b/debian/modules/nginx-lua/t/071-idle-socket.t
index 55d25c6..c9002be 100644
--- a/debian/modules/nginx-lua/t/071-idle-socket.t
+++ b/debian/modules/nginx-lua/t/071-idle-socket.t
@@ -431,4 +431,3 @@ failed to set keepalive: unread data in buffer
 }
 --- 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 4bb567a..7cf2dcd 100644
--- a/debian/modules/nginx-lua/t/072-conditional-get.t
+++ b/debian/modules/nginx-lua/t/072-conditional-get.t
@@ -88,4 +88,3 @@ delete thread 1
 say failed: nginx output filter error
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/073-backtrace.t b/debian/modules/nginx-lua/t/073-backtrace.t
index aae4bae..6c54692 100644
--- a/debian/modules/nginx-lua/t/073-backtrace.t
+++ b/debian/modules/nginx-lua/t/073-backtrace.t
@@ -187,4 +187,3 @@ probe process("$LIBLUA_PATH").function("lua_concat") {
 :79: in function 'func20'
 :83: in function 'func21'
 ...
-
diff --git a/debian/modules/nginx-lua/t/074-prefix-var.t b/debian/modules/nginx-lua/t/074-prefix-var.t
index 3cc4587..c116d84 100644
--- a/debian/modules/nginx-lua/t/074-prefix-var.t
+++ b/debian/modules/nginx-lua/t/074-prefix-var.t
@@ -64,4 +64,3 @@ GET /t
 Greetings from module foo.
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/075-logby.t b/debian/modules/nginx-lua/t/075-logby.t
index f987c8e..520c62e 100644
--- a/debian/modules/nginx-lua/t/075-logby.t
+++ b/debian/modules/nginx-lua/t/075-logby.t
@@ -581,4 +581,3 @@ qr{log_by_lua\(nginx\.conf:\d+\):1: content-type: text/plain}
 
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/077-sleep.t b/debian/modules/nginx-lua/t/077-sleep.t
index a7c251a..96f04bd 100644
--- a/debian/modules/nginx-lua/t/077-sleep.t
+++ b/debian/modules/nginx-lua/t/077-sleep.t
@@ -9,10 +9,10 @@ log_level('debug');
 
 repeat_each(2);
 
-plan tests => repeat_each() * 63;
+plan tests => repeat_each() * 71;
 
 #no_diff();
-#no_long_string();
+no_long_string();
 run_tests();
 
 __DATA__
@@ -405,3 +405,98 @@ ok
 [error]
 [alert]
 
+
+
+=== TEST 16: sleep 0
+--- config
+    location /t {
+        content_by_lua_block {
+            local function f (n)
+                print("f begin ", n)
+                ngx.sleep(0)
+                print("f middle ", n)
+                ngx.sleep(0)
+                print("f end ", n)
+                ngx.sleep(0)
+            end
+
+            for i = 1, 3 do
+                assert(ngx.thread.spawn(f, i))
+            end
+
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/\bf (?:begin|middle|end)\b|\bworker cycle$|\be?poll timer: \d+$/
+--- grep_error_log_out eval
+qr/f begin
+f begin
+f begin
+worker cycle
+e?poll timer: 0
+f middle
+f middle
+f middle
+worker cycle
+e?poll timer: 0
+f end
+f end
+f end
+worker cycle
+e?poll timer: 0
+/
+
+
+
+=== TEST 17: sleep short times less than 1ms
+--- config
+    location /t {
+        content_by_lua_block {
+            local delay = 0.0005
+
+            local function f (n)
+                print("f begin ", n)
+                ngx.sleep(delay)
+                print("f middle ", n)
+                ngx.sleep(delay)
+                print("f end ", n)
+                ngx.sleep(delay)
+            end
+
+            for i = 1, 3 do
+                assert(ngx.thread.spawn(f, i))
+            end
+
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/\bf (?:begin|middle|end)\b|\bworker cycle$|\be?poll timer: \d+$/
+--- grep_error_log_out eval
+qr/f begin
+f begin
+f begin
+worker cycle
+e?poll timer: 0
+f middle
+f middle
+f middle
+worker cycle
+e?poll timer: 0
+f end
+f end
+f end
+worker cycle
+e?poll timer: 0
+/
diff --git a/debian/modules/nginx-lua/t/078-hup-vars.t b/debian/modules/nginx-lua/t/078-hup-vars.t
index 8acc346..5072c4d 100644
--- a/debian/modules/nginx-lua/t/078-hup-vars.t
+++ b/debian/modules/nginx-lua/t/078-hup-vars.t
@@ -62,4 +62,3 @@ GET /t
 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
index cba0e41..aacd0d3 100644
--- a/debian/modules/nginx-lua/t/079-unused-directives.t
+++ b/debian/modules/nginx-lua/t/079-unused-directives.t
@@ -340,4 +340,3 @@ GET /t
 sub: sub
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/080-hup-shdict.t b/debian/modules/nginx-lua/t/080-hup-shdict.t
index f9a0278..c762556 100644
--- a/debian/modules/nginx-lua/t/080-hup-shdict.t
+++ b/debian/modules/nginx-lua/t/080-hup-shdict.t
@@ -82,4 +82,3 @@ GET /test
 10502 number
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/083-bad-sock-self.t b/debian/modules/nginx-lua/t/083-bad-sock-self.t
index b93849f..7a76752 100644
--- a/debian/modules/nginx-lua/t/083-bad-sock-self.t
+++ b/debian/modules/nginx-lua/t/083-bad-sock-self.t
@@ -136,4 +136,3 @@ bad argument #1 to 'close' (table expected, got number)
 --- 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
index c966015..f7d5d3d 100644
--- a/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t
+++ b/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t
@@ -743,4 +743,3 @@ close: 1 nil
 }
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/085-if.t b/debian/modules/nginx-lua/t/085-if.t
index e08b43c..33f57ca 100644
--- a/debian/modules/nginx-lua/t/085-if.t
+++ b/debian/modules/nginx-lua/t/085-if.t
@@ -198,4 +198,3 @@ 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
index 3a474fe..bea34a4 100644
--- a/debian/modules/nginx-lua/t/086-init-by.t
+++ b/debian/modules/nginx-lua/t/086-init-by.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 3);
+plan tests => repeat_each() * (blocks() * 3 + 2);
 
 #no_diff();
 #no_long_string();
@@ -304,3 +304,20 @@ INIT 2: foo = 3
 ",
 "",
 ]
+
+
+
+=== TEST 12: error in init
+--- http_config
+    init_by_lua_block {
+        error("failed to init")
+    }
+--- config
+    location /t {
+        echo ok;
+    }
+--- must_die
+--- error_log
+failed to init
+--- 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
index 79ba452..a847031 100644
--- a/debian/modules/nginx-lua/t/087-udp-socket.t
+++ b/debian/modules/nginx-lua/t/087-udp-socket.t
@@ -596,6 +596,7 @@ received a good response.
 --- log_level: debug
 --- error_log
 lua udp socket receive buffer size: 8192
+--- no_check_leak
 
 
 
@@ -662,12 +663,14 @@ received a good response.
 --- log_level: debug
 --- error_log
 lua udp socket receive buffer size: 8192
+--- no_check_leak
 
 
 
 === TEST 12: github issue #215: Handle the posted requests in lua cosocket api (failed to resolve)
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    resolver_timeout 5s;
 
     location = /sub {
         content_by_lua '
@@ -704,12 +707,13 @@ resolve name done
 
 --- no_error_log
 [error]
+--- timeout: 10
 
 
 
 === TEST 13: github issue #215: Handle the posted requests in lua cosocket api (successfully resolved)
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 5s;
 
     location = /sub {
@@ -1100,4 +1104,3 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 --- no_error_log
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/088-req-method.t b/debian/modules/nginx-lua/t/088-req-method.t
index 9ced40c..198b3b3 100644
--- a/debian/modules/nginx-lua/t/088-req-method.t
+++ b/debian/modules/nginx-lua/t/088-req-method.t
@@ -262,4 +262,3 @@ method: PATCH
 method: TRACE
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/089-phase.t b/debian/modules/nginx-lua/t/089-phase.t
index 57921fc..94b7619 100644
--- a/debian/modules/nginx-lua/t/089-phase.t
+++ b/debian/modules/nginx-lua/t/089-phase.t
@@ -176,4 +176,3 @@ GET /lua
 init_worker
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/090-log-socket-errors.t b/debian/modules/nginx-lua/t/090-log-socket-errors.t
index a5943c2..8e498cd 100644
--- a/debian/modules/nginx-lua/t/090-log-socket-errors.t
+++ b/debian/modules/nginx-lua/t/090-log-socket-errors.t
@@ -11,6 +11,8 @@ repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 3);
 
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+
 #no_diff();
 #no_long_string();
 run_tests();
@@ -19,12 +21,14 @@ __DATA__
 
 === TEST 1: log socket errors off (tcp)
 --- config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+
     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)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say(err)
         ';
     }
@@ -39,12 +43,14 @@ timeout
 
 === TEST 2: log socket errors on (tcp)
 --- config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+
     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)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say(err)
         ';
     }
@@ -59,12 +65,14 @@ lua tcp socket connect timed out
 
 === TEST 3: log socket errors on (udp)
 --- config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+
     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)
+            local ok, err = sock:setpeername("agentzh.org", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
@@ -80,12 +88,14 @@ lua udp socket read timed out
 
 === TEST 4: log socket errors off (udp)
 --- config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+
     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)
+            local ok, err = sock:setpeername("agentzh.org", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
@@ -96,4 +106,3 @@ GET /t
 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
index b047ccb..bceb512 100644
--- a/debian/modules/nginx-lua/t/091-coroutine.t
+++ b/debian/modules/nginx-lua/t/091-coroutine.t
@@ -160,7 +160,7 @@ cc3: 2
 
 === TEST 3: basic coroutine and cosocket
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
             function worker(url)
@@ -359,7 +359,7 @@ GET /lua
 
 === TEST 7: coroutine wrap and cosocket
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
             function worker(url)
@@ -987,7 +987,7 @@ test10
 --- http_config
     init_by_lua 'return';
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
             function worker(url)
@@ -1041,7 +1041,7 @@ successfully connected to: agentzh.org
     init_by_lua_file html/init.lua;
 
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
             function worker(url)
@@ -1315,4 +1315,3 @@ co yield: 2
 
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/092-eof.t b/debian/modules/nginx-lua/t/092-eof.t
index a75711f..86778de 100644
--- a/debian/modules/nginx-lua/t/092-eof.t
+++ b/debian/modules/nginx-lua/t/092-eof.t
@@ -80,4 +80,3 @@ GET /t
 --- 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
index 772e866..b622d30 100644
--- a/debian/modules/nginx-lua/t/093-uthread-spawn.t
+++ b/debian/modules/nginx-lua/t/093-uthread-spawn.t
@@ -1672,4 +1672,3 @@ delete thread 2
 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
index cd678c0..a623773 100644
--- a/debian/modules/nginx-lua/t/094-uthread-exit.t
+++ b/debian/modules/nginx-lua/t/094-uthread-exit.t
@@ -1648,4 +1648,3 @@ free request
 [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
index 4459360..56156c4 100644
--- a/debian/modules/nginx-lua/t/095-uthread-exec.t
+++ b/debian/modules/nginx-lua/t/095-uthread-exec.t
@@ -423,4 +423,3 @@ 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
index b0258fb..003c642 100644
--- a/debian/modules/nginx-lua/t/096-uthread-redirect.t
+++ b/debian/modules/nginx-lua/t/096-uthread-redirect.t
@@ -277,4 +277,3 @@ 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
index 178a374..a93adc8 100644
--- a/debian/modules/nginx-lua/t/097-uthread-rewrite.t
+++ b/debian/modules/nginx-lua/t/097-uthread-rewrite.t
@@ -344,4 +344,3 @@ free request
 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
index aaf020a..4948596 100644
--- a/debian/modules/nginx-lua/t/098-uthread-wait.t
+++ b/debian/modules/nginx-lua/t/098-uthread-wait.t
@@ -1321,4 +1321,3 @@ $s;
 --- no_error_log
 [error]
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/100-client-abort.t b/debian/modules/nginx-lua/t/100-client-abort.t
index cd46859..89c1f6a 100644
--- a/debian/modules/nginx-lua/t/100-client-abort.t
+++ b/debian/modules/nginx-lua/t/100-client-abort.t
@@ -1064,4 +1064,3 @@ GET /t
 eof succeeded
 --- error_log
 eof failed: nginx output filter error
-
diff --git a/debian/modules/nginx-lua/t/101-on-abort.t b/debian/modules/nginx-lua/t/101-on-abort.t
index 81cec78..182d12c 100644
--- a/debian/modules/nginx-lua/t/101-on-abort.t
+++ b/debian/modules/nginx-lua/t/101-on-abort.t
@@ -846,4 +846,3 @@ done
 client prematurely closed connection
 on abort called
 main handler done
-
diff --git a/debian/modules/nginx-lua/t/102-req-start-time.t b/debian/modules/nginx-lua/t/102-req-start-time.t
index 1d5fe28..3b041af 100644
--- a/debian/modules/nginx-lua/t/102-req-start-time.t
+++ b/debian/modules/nginx-lua/t/102-req-start-time.t
@@ -113,4 +113,3 @@ true$
 --- no_error_log
 [error]
 --- SKIP
-
diff --git a/debian/modules/nginx-lua/t/103-req-http-ver.t b/debian/modules/nginx-lua/t/103-req-http-ver.t
index 6ded75a..e6de238 100644
--- a/debian/modules/nginx-lua/t/103-req-http-ver.t
+++ b/debian/modules/nginx-lua/t/103-req-http-ver.t
@@ -46,4 +46,3 @@ GET /t HTTP/1.0
 1
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/104-req-raw-header.t b/debian/modules/nginx-lua/t/104-req-raw-header.t
index 439b9de..efea03c 100644
--- a/debian/modules/nginx-lua/t/104-req-raw-header.t
+++ b/debian/modules/nginx-lua/t/104-req-raw-header.t
@@ -876,4 +876,3 @@ Foo: bar\r
 --- no_error_log
 [error]
 --- timeout: 5
-
diff --git a/debian/modules/nginx-lua/t/105-pressure.t b/debian/modules/nginx-lua/t/105-pressure.t
index 10f495e..9d1ba1f 100644
--- a/debian/modules/nginx-lua/t/105-pressure.t
+++ b/debian/modules/nginx-lua/t/105-pressure.t
@@ -51,4 +51,3 @@ $::Id = int rand 10000;
 
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/106-timer.t b/debian/modules/nginx-lua/t/106-timer.t
index d0f6f36..04a532e 100644
--- a/debian/modules/nginx-lua/t/106-timer.t
+++ b/debian/modules/nginx-lua/t/106-timer.t
@@ -2193,4 +2193,3 @@ ok
 --- error_log
 Bad bad bad
 --- skip_nginx: 4: < 1.7.1
-
diff --git a/debian/modules/nginx-lua/t/107-timer-errors.t b/debian/modules/nginx-lua/t/107-timer-errors.t
index 9ed1334..3201612 100644
--- a/debian/modules/nginx-lua/t/107-timer-errors.t
+++ b/debian/modules/nginx-lua/t/107-timer-errors.t
@@ -1420,4 +1420,3 @@ qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disable
 "lua ngx.timer expired",
 "http lua close fake http connection"
 ]
-
diff --git a/debian/modules/nginx-lua/t/108-timer-safe.t b/debian/modules/nginx-lua/t/108-timer-safe.t
index 19c9f6d..2795998 100644
--- a/debian/modules/nginx-lua/t/108-timer-safe.t
+++ b/debian/modules/nginx-lua/t/108-timer-safe.t
@@ -1395,4 +1395,3 @@ registered timer
 lua ngx.timer expired
 http lua close fake http connection
 trace: [m][f][g]
-
diff --git a/debian/modules/nginx-lua/t/109-timer-hup.t b/debian/modules/nginx-lua/t/109-timer-hup.t
index 15aaa0e..0864046 100644
--- a/debian/modules/nginx-lua/t/109-timer-hup.t
+++ b/debian/modules/nginx-lua/t/109-timer-hup.t
@@ -500,4 +500,3 @@ ok
 --- grep_error_log_out
 lua found 8191 pending timers
 --- timeout: 20
-
diff --git a/debian/modules/nginx-lua/t/110-etag.t b/debian/modules/nginx-lua/t/110-etag.t
index 351fec4..0a94d3d 100644
--- a/debian/modules/nginx-lua/t/110-etag.t
+++ b/debian/modules/nginx-lua/t/110-etag.t
@@ -81,4 +81,3 @@ If-Modified-Since: Thu, 10 May 2012 07:50:59 GMT
 --- no_error_log
 [error]
 --- skip_nginx: 3: < 1.3.3
-
diff --git a/debian/modules/nginx-lua/t/111-req-header-ua.t b/debian/modules/nginx-lua/t/111-req-header-ua.t
index 7c980d0..9e501e3 100644
--- a/debian/modules/nginx-lua/t/111-req-header-ua.t
+++ b/debian/modules/nginx-lua/t/111-req-header-ua.t
@@ -673,4 +673,3 @@ content: konqueror: 1
 User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/112-req-header-conn.t b/debian/modules/nginx-lua/t/112-req-header-conn.t
index 51df730..51bc8a4 100644
--- a/debian/modules/nginx-lua/t/112-req-header-conn.t
+++ b/debian/modules/nginx-lua/t/112-req-header-conn.t
@@ -146,4 +146,3 @@ content: conn type: 0
 connection: bad
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/113-req-header-cookie.t b/debian/modules/nginx-lua/t/113-req-header-cookie.t
index b26b709..4a93053 100644
--- a/debian/modules/nginx-lua/t/113-req-header-cookie.t
+++ b/debian/modules/nginx-lua/t/113-req-header-cookie.t
@@ -247,4 +247,3 @@ Cookie: boo=123; foo=bar
 
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/115-quote-sql-str.t b/debian/modules/nginx-lua/t/115-quote-sql-str.t
index 0c20dfb..66553b1 100644
--- a/debian/modules/nginx-lua/t/115-quote-sql-str.t
+++ b/debian/modules/nginx-lua/t/115-quote-sql-str.t
@@ -74,4 +74,3 @@ GET /set
 'a\Zb\Z'
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/116-raw-req-socket.t b/debian/modules/nginx-lua/t/116-raw-req-socket.t
index 6518f0e..ab06ee4 100644
--- a/debian/modules/nginx-lua/t/116-raw-req-socket.t
+++ b/debian/modules/nginx-lua/t/116-raw-req-socket.t
@@ -876,4 +876,3 @@ request body: hey, hello world
 --- no_error_log
 [error]
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t b/debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t
index 4e3929b..07abadc 100644
--- a/debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t
+++ b/debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t
@@ -114,4 +114,3 @@ lua tcp socket write timed out
 server: failed to send: timeout
 --- no_error_log
 [alert]
-
diff --git a/debian/modules/nginx-lua/t/119-config-prefix.t b/debian/modules/nginx-lua/t/119-config-prefix.t
index 4581aa1..3f79320 100644
--- a/debian/modules/nginx-lua/t/119-config-prefix.t
+++ b/debian/modules/nginx-lua/t/119-config-prefix.t
@@ -30,4 +30,3 @@ GET /lua
 ^prefix: \/\S+$
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/120-re-find.t b/debian/modules/nginx-lua/t/120-re-find.t
index 34c0207..73e6134 100644
--- a/debian/modules/nginx-lua/t/120-re-find.t
+++ b/debian/modules/nginx-lua/t/120-re-find.t
@@ -612,7 +612,7 @@ matched: 你
 
 === TEST 22: just hit match limit
 --- http_config
-    lua_regex_match_limit 5600;
+    lua_regex_match_limit 5000;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
@@ -654,7 +654,7 @@ error: pcre_exec() failed: -8
 
 === TEST 23: just not hit match limit
 --- http_config
-    lua_regex_match_limit 5700;
+    lua_regex_match_limit 5100;
 --- config
     location /re {
         content_by_lua_file html/a.lua;
@@ -891,3 +891,29 @@ not matched!
 --- no_error_log
 [error]
 
+
+
+=== TEST 31: match with ctx and a pos (anchored by \G)
+--- config
+    location /re {
+        content_by_lua '
+            local ctx = { pos = 3 }
+            local from, to, err = ngx.re.find("1234, hello", [[(\G[0-9]+)]], "", ctx)
+            if from then
+                ngx.say("from: ", from)
+                ngx.say("to: ", to)
+                ngx.say("pos: ", ctx.pos)
+            else
+                ngx.say("not matched!")
+                ngx.say("pos: ", ctx.pos)
+            end
+        ';
+    }
+--- request
+    GET /re
+--- response_body
+from: 3
+to: 4
+pos: 5
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/121-version.t b/debian/modules/nginx-lua/t/121-version.t
index 2b7a306..9000eb3 100644
--- a/debian/modules/nginx-lua/t/121-version.t
+++ b/debian/modules/nginx-lua/t/121-version.t
@@ -46,4 +46,3 @@ GET /lua
 ^version: \d+$
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/122-worker.t b/debian/modules/nginx-lua/t/122-worker.t
index fa42b1d..b74c81f 100644
--- a/debian/modules/nginx-lua/t/122-worker.t
+++ b/debian/modules/nginx-lua/t/122-worker.t
@@ -79,4 +79,3 @@ worker pid: \d+
 worker pid is correct\.
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/123-lua-path.t b/debian/modules/nginx-lua/t/123-lua-path.t
index da97909..23681a9 100644
--- a/debian/modules/nginx-lua/t/123-lua-path.t
+++ b/debian/modules/nginx-lua/t/123-lua-path.t
@@ -68,4 +68,3 @@ GET /lua
 [error]
 --- error_log eval
 qr/\[alert\] .*? lua_code_cache is off/
-
diff --git a/debian/modules/nginx-lua/t/124-init-worker.t b/debian/modules/nginx-lua/t/124-init-worker.t
index d6ea675..22a943e 100644
--- a/debian/modules/nginx-lua/t/124-init-worker.t
+++ b/debian/modules/nginx-lua/t/124-init-worker.t
@@ -447,7 +447,7 @@ warn(): Thu, 01 Jan 1970 01:34:38 GMT
 --- timeout: 10
 --- http_config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     init_worker_by_lua '
         -- global
diff --git a/debian/modules/nginx-lua/t/125-configure-args.t b/debian/modules/nginx-lua/t/125-configure-args.t
index adec129..4160d4e 100644
--- a/debian/modules/nginx-lua/t/125-configure-args.t
+++ b/debian/modules/nginx-lua/t/125-configure-args.t
@@ -29,4 +29,3 @@ GET /configure_args
 ^\s*\-\-[^-]+
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/126-shdict-frag.t b/debian/modules/nginx-lua/t/126-shdict-frag.t
index 94422fb..5a2aff8 100644
--- a/debian/modules/nginx-lua/t/126-shdict-frag.t
+++ b/debian/modules/nginx-lua/t/126-shdict-frag.t
@@ -1264,4 +1264,3 @@ ok
 --- no_error_log
 [error]
 --- timeout: 60
-
diff --git a/debian/modules/nginx-lua/t/127-uthread-kill.t b/debian/modules/nginx-lua/t/127-uthread-kill.t
index 2ab8abe..cc43c62 100644
--- a/debian/modules/nginx-lua/t/127-uthread-kill.t
+++ b/debian/modules/nginx-lua/t/127-uthread-kill.t
@@ -190,7 +190,7 @@ resolve name done: -2
 
 === TEST 4: kill pending connect
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
             local ready = false
@@ -505,4 +505,3 @@ thread created: zombie
 [alert]
 lua tcp socket abort resolver
 --- error_log
-
diff --git a/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t b/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
index d3ef3f5..e8434a3 100644
--- a/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
+++ b/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
@@ -315,19 +315,24 @@ failed to send request: closed)$
 
             local data = ""
             local ntm = 0
-            local done = false
+            local aborted = false
             for i = 1, 3 do
-                local res, err, part = sock:receive(1)
-                if not res then
-                    ngx.say("failed to receive: ", err)
-                    return
-                else
-                    data = data .. res
+                if not aborted then
+                    local res, err, part = sock:receive(1)
+                    if not res then
+                        ngx.say("failed to receive: ", err)
+                        aborted = true
+                    else
+                        data = data .. res
+                    end
                 end
+
                 ngx.sleep(0.001)
             end
 
-            ngx.say("received: ", data)
+            if not aborted then
+                ngx.say("received: ", data)
+            end
         ';
     }
 
@@ -350,6 +355,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
 --- tcp_query_len: 11
 --- no_error_log
 [error]
+--- wait: 0.05
 
 
 
@@ -623,4 +629,3 @@ close: 1 nil
 
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/129-ssl-socket.t b/debian/modules/nginx-lua/t/129-ssl-socket.t
index 9da9a5c..1c3f7cd 100644
--- a/debian/modules/nginx-lua/t/129-ssl-socket.t
+++ b/debian/modules/nginx-lua/t/129-ssl-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 219;
+plan tests => repeat_each() * 217;
 
 $ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
 
@@ -26,7 +26,7 @@ sub read_file {
     $cert;
 }
 
-our $StartComRootCertificate = read_file("t/cert/startcom.crt");
+our $ComodoRootCertificate = read_file("t/cert/comodo-ca.crt");
 our $EquifaxRootCertificate = read_file("t/cert/equifax.crt");
 our $TestCertificate = read_file("t/cert/test.crt");
 our $TestCertificateKey = read_file("t/cert/test.key");
@@ -125,7 +125,7 @@ SSL reused session
 === TEST 2: no SNI, no verify
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -135,7 +135,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("g.sregex.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -151,7 +151,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: g.sregex.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -179,21 +179,14 @@ SSL reused session
 GET /t
 --- response_body
 connected: 1
-ssl handshake: userdata
-sent http request: 57 bytes.
-received: HTTP/1.1 401 Unauthorized
-close: 1 nil
+failed to do SSL handshake: handshake failed
 
 --- log_level: debug
 --- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
-$/
+--- grep_error_log_out
 --- no_error_log
 lua ssl server name:
 SSL reused session
-[error]
 [alert]
 --- timeout: 5
 
@@ -202,17 +195,17 @@ SSL reused session
 === TEST 3: SNI, no verify
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
 
-        content_by_lua '
+        content_by_lua_block {
             local sock = ngx.socket.tcp()
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -220,7 +213,7 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org")
+                local session, err = sock:sslhandshake(nil, "openresty.org")
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -228,7 +221,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\r\nHost: openresty.org\r\nConnection: close\r\n\r\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -249,7 +242,7 @@ SSL reused session
                 ngx.say("close: ", ok, " ", err)
             end  -- do
             collectgarbage()
-        ';
+        }
     }
 
 --- request
@@ -257,8 +250,8 @@ GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+sent http request: 58 bytes.
+received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
@@ -268,7 +261,7 @@ qr/^lua ssl save session: ([0-9A-F]+):2
 lua ssl free session: ([0-9A-F]+):1
 $/
 --- error_log
-lua ssl server name: "iscribblet.org"
+lua ssl server name: "openresty.org"
 --- no_error_log
 SSL reused session
 [error]
@@ -280,7 +273,8 @@ SSL reused session
 === TEST 4: ssl session reuse
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    lua_ssl_protocols TLSv1.2;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -293,7 +287,7 @@ SSL reused session
 
             local session
             for i = 1, 2 do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("agentzh.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -301,7 +295,7 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                session, err = sock:sslhandshake(session, "iscribblet.org")
+                session, err = sock:sslhandshake(session, "agentzh.org")
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -309,7 +303,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -340,12 +334,12 @@ GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 59 bytes.
+sent http request: 56 bytes.
 received: HTTP/1.1 200 OK
 close: 1 nil
 connected: 1
 ssl handshake: userdata
-sent http request: 59 bytes.
+sent http request: 56 bytes.
 received: HTTP/1.1 200 OK
 close: 1 nil
 
@@ -371,10 +365,10 @@ lua ssl free session
 
 
 === TEST 5: certificate does not match host name (verify)
-The certificate for "blah.agentzh.org" does not contain the name "blah.agentzh.org".
+The certificate of "openresty.org" does not contain the name "blah.openresty.org".
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
     lua_ssl_verify_depth 5;
     location /t {
@@ -386,7 +380,7 @@ The certificate for "blah.agentzh.org" does not contain the name "blah.agentzh.o
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("agentzh.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -394,13 +388,171 @@ The certificate for "blah.agentzh.org" does not contain the name "blah.agentzh.o
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "blah.agentzh.org", true)
+                local session, err = sock:sslhandshake(nil, "blah.openresty.org", true)
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                 else
                     ngx.say("ssl handshake: ", type(session))
                 end
 
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                local line, err = sock:receive()
+                if not line then
+                    ngx.say("failed to receive response status line: ", err)
+                    return
+                end
+
+                ngx.say("received: ", line)
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            collectgarbage()
+        ';
+    }
+
+--- user_files eval
+">>> trusted.crt
+$::ComodoRootCertificate"
+
+--- request
+GET /t
+--- response_body_like chomp
+\Aconnected: 1
+failed to do SSL handshake: (?:handshake failed|certificate host mismatch)
+failed to send http request: closed
+\z
+
+--- log_level: debug
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log_out
+--- error_log
+lua ssl server name: "blah.openresty.org"
+--- no_error_log
+SSL reused session
+[alert]
+--- timeout: 5
+
+
+
+=== TEST 6: certificate does not match host name (verify, no log socket errors)
+The certificate for "openresty.org" does not contain the name "blah.openresty.org".
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    lua_ssl_trusted_certificate ../html/trusted.crt;
+    lua_socket_log_errors off;
+    lua_ssl_verify_depth 2;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua '
+            local sock = ngx.socket.tcp()
+            sock:settimeout(2000)
+
+            do
+                local ok, err = sock:connect("openresty.org", 443)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local session, err = sock:sslhandshake(nil, "blah.openresty.org", true)
+                if not session then
+                    ngx.say("failed to do SSL handshake: ", err)
+                else
+                    ngx.say("ssl handshake: ", type(session))
+                end
+
+                local req = "GET / HTTP/1.1\\r\\nHost: blah.openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                local line, err = sock:receive()
+                if not line then
+                    ngx.say("failed to receive response status line: ", err)
+                    return
+                end
+
+                ngx.say("received: ", line)
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            collectgarbage()
+        ';
+    }
+
+--- user_files eval
+">>> trusted.crt
+$::ComodoRootCertificate"
+
+--- request
+GET /t
+--- response_body_like chomp
+\Aconnected: 1
+failed to do SSL handshake: (?:handshake failed|certificate host mismatch)
+failed to send http request: closed
+\z
+
+--- log_level: debug
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log_out
+--- error_log
+lua ssl server name: "blah.openresty.org"
+--- no_error_log
+lua ssl certificate does not match host
+SSL reused session
+[alert]
+--- timeout: 5
+
+
+
+=== TEST 7: certificate does not match host name (no verify)
+--- config
+    server_tokens off;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua '
+            local sock = ngx.socket.tcp()
+            sock:settimeout(2000)
+
+            do
+                local ok, err = sock:connect("openresty.org", 443)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local session, err = sock:sslhandshake(nil, "openresty.org", false)
+                if not session then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(session))
+
                 local req = "GET / HTTP/1.1\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
@@ -425,170 +577,13 @@ The certificate for "blah.agentzh.org" does not contain the name "blah.agentzh.o
         ';
     }
 
---- user_files eval
-">>> trusted.crt
-$::StartComRootCertificate"
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: certificate host mismatch
-failed to send http request: closed
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
---- grep_error_log_out
---- error_log
-lua ssl server name: "blah.agentzh.org"
-lua ssl certificate does not match host "blah.agentzh.org"
---- no_error_log
-SSL reused session
-[alert]
---- timeout: 5
-
-
-
-=== TEST 6: certificate does not match host name (verify, no log socket errors)
-The certificate for "blah.agentzh.org" does not contain the name "blah.agentzh.org".
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_socket_log_errors off;
-    lua_ssl_verify_depth 2;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("agentzh.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "blah.agentzh.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                else
-                    ngx.say("ssl handshake: ", type(session))
-                end
-
-                local req = "GET / HTTP/1.1\\r\\nHost: blah.agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::StartComRootCertificate"
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: certificate host mismatch
-failed to send http request: closed
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
---- grep_error_log_out
---- error_log
-lua ssl server name: "blah.agentzh.org"
---- no_error_log
-lua ssl certificate does not match host
-SSL reused session
-[alert]
---- timeout: 5
-
-
-
-=== TEST 7: certificate does not match host name (no verify)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("agentzh.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "agentzh.org", false)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
 --- request
 GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+sent http request: 56 bytes.
+received: HTTP/1.1 404 Not Found
 close: 1 nil
 
 --- log_level: debug
@@ -599,7 +594,7 @@ lua ssl free session: ([0-9A-F]+):1
 $/
 
 --- error_log
-lua ssl server name: "agentzh.org"
+lua ssl server name: "openresty.org"
 --- no_error_log
 SSL reused session
 [error]
@@ -608,10 +603,10 @@ SSL reused session
 
 
 
-=== TEST 8: iscribblet.org: passing SSL verify
+=== TEST 8: openresty.org: passing SSL verify
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
     lua_ssl_verify_depth 2;
     location /t {
@@ -623,7 +618,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -631,7 +626,7 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org", true)
+                local session, err = sock:sslhandshake(nil, "openresty.org", true)
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -639,7 +634,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -665,15 +660,15 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::StartComRootCertificate"
+$::ComodoRootCertificate"
 
 --- request
 GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+sent http request: 58 bytes.
+received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
@@ -684,7 +679,7 @@ lua ssl free session: ([0-9A-F]+):1
 $/
 
 --- error_log
-lua ssl server name: "iscribblet.org"
+lua ssl server name: "openresty.org"
 --- no_error_log
 SSL reused session
 [error]
@@ -696,7 +691,7 @@ SSL reused session
 === TEST 9: ssl verify depth not enough (with automatic error logging)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
     lua_ssl_verify_depth 1;
     location /t {
@@ -708,7 +703,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -716,14 +711,14 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org", true)
+                local session, err = sock:sslhandshake(nil, "openresty.org", true)
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                 else
                     ngx.say("ssl handshake: ", type(session))
                 end
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -749,7 +744,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::StartComRootCertificate"
+$::ComodoRootCertificate"
 
 --- request
 GET /t
@@ -762,7 +757,7 @@ failed to send http request: closed
 --- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 --- grep_error_log_out
 --- error_log
-lua ssl server name: "iscribblet.org"
+lua ssl server name: "openresty.org"
 lua ssl certificate verify error: (20: unable to get local issuer certificate)
 --- no_error_log
 SSL reused session
@@ -774,7 +769,7 @@ SSL reused session
 === TEST 10: ssl verify depth not enough (without automatic error logging)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
     lua_ssl_verify_depth 1;
     lua_socket_log_errors off;
@@ -787,7 +782,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -795,14 +790,14 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org", true)
+                local session, err = sock:sslhandshake(nil, "openresty.org", true)
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                 else
                     ngx.say("ssl handshake: ", type(session))
                 end
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -828,7 +823,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::StartComRootCertificate"
+$::ComodoRootCertificate"
 
 --- request
 GET /t
@@ -841,7 +836,7 @@ failed to send http request: closed
 --- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 --- grep_error_log_out
 --- error_log
-lua ssl server name: "iscribblet.org"
+lua ssl server name: "openresty.org"
 --- no_error_log
 lua ssl certificate verify error
 SSL reused session
@@ -1010,7 +1005,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::StartComRootCertificate"
+$::ComodoRootCertificate"
 
 --- request
 GET /t
@@ -1030,10 +1025,10 @@ SSL reused session
 
 
 
-=== TEST 13: iscribblet.org: passing SSL verify with multiple certificates
+=== TEST 13: openresty.org: passing SSL verify with multiple certificates
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
     lua_ssl_verify_depth 2;
     location /t {
@@ -1045,7 +1040,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -1053,7 +1048,7 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org", true)
+                local session, err = sock:sslhandshake(nil, "openresty.org", true)
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -1061,7 +1056,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -1088,15 +1083,15 @@ SSL reused session
 --- user_files eval
 ">>> trusted.crt
 $::EquifaxRootCertificate
-$::StartComRootCertificate"
+$::ComodoRootCertificate"
 
 --- request
 GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+sent http request: 58 bytes.
+received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
@@ -1107,7 +1102,7 @@ lua ssl free session: ([0-9A-F]+):1
 $/
 
 --- error_log
-lua ssl server name: "iscribblet.org"
+lua ssl server name: "openresty.org"
 --- no_error_log
 SSL reused session
 [error]
@@ -1119,7 +1114,7 @@ SSL reused session
 === TEST 14: default cipher
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1129,7 +1124,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -1137,7 +1132,7 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org")
+                local session, err = sock:sslhandshake(nil, "openresty.org")
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -1145,7 +1140,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -1174,8 +1169,8 @@ GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+sent http request: 58 bytes.
+received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
@@ -1185,8 +1180,8 @@ qr/^lua ssl save session: ([0-9A-F]+):2
 lua ssl free session: ([0-9A-F]+):1
 $/
 --- error_log
-lua ssl server name: "iscribblet.org"
-SSL: TLSv1.2, cipher: "ECDHE-RSA-RC4-SHA SSLv3
+lua ssl server name: "openresty.org"
+SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2
 --- no_error_log
 SSL reused session
 [error]
@@ -1198,8 +1193,8 @@ SSL reused session
 === TEST 15: explicit cipher configuration
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
-    lua_ssl_ciphers RC4-SHA;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    lua_ssl_ciphers ECDHE-RSA-AES256-SHA;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1209,7 +1204,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -1217,7 +1212,7 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org")
+                local session, err = sock:sslhandshake(nil, "openresty.org")
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -1225,7 +1220,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -1254,8 +1249,8 @@ GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+sent http request: 58 bytes.
+received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
@@ -1265,8 +1260,8 @@ qr/^lua ssl save session: ([0-9A-F]+):2
 lua ssl free session: ([0-9A-F]+):1
 $/
 --- error_log
-lua ssl server name: "iscribblet.org"
-SSL: TLSv1.2, cipher: "RC4-SHA SSLv3
+lua ssl server name: "openresty.org"
+SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-SHA 
 --- no_error_log
 SSL reused session
 [error]
@@ -1278,7 +1273,7 @@ SSL reused session
 === TEST 16: explicit ssl protocol configuration
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_protocols TLSv1;
     location /t {
         #set $port 5000;
@@ -1289,7 +1284,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -1297,7 +1292,7 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org")
+                local session, err = sock:sslhandshake(nil, "openresty.org")
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -1305,7 +1300,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -1334,8 +1329,8 @@ GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+sent http request: 58 bytes.
+received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
@@ -1345,8 +1340,8 @@ qr/^lua ssl save session: ([0-9A-F]+):2
 lua ssl free session: ([0-9A-F]+):1
 $/
 --- error_log
-lua ssl server name: "iscribblet.org"
-SSL: TLSv1, cipher: "ECDHE-RSA-RC4-SHA SSLv3
+lua ssl server name: "openresty.org"
+SSL: TLSv1, cipher: "ECDHE-RSA-AES256-SHA 
 --- no_error_log
 SSL reused session
 [error]
@@ -1358,7 +1353,7 @@ SSL reused session
 === TEST 17: unsupported ssl protocol
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_protocols SSLv2;
     lua_socket_log_errors off;
     location /t {
@@ -1370,7 +1365,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -1378,14 +1373,14 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org")
+                local session, err = sock:sslhandshake(nil, "openresty.org")
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                 else
                     ngx.say("ssl handshake: ", type(session))
                 end
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -1422,7 +1417,7 @@ failed to send http request: closed
 --- error_log eval
 [
 qr/\[crit\] .*?SSL_do_handshake\(\) failed .*?unsupported protocol/,
-'lua ssl server name: "iscribblet.org"',
+'lua ssl server name: "openresty.org"',
 ]
 --- no_error_log
 SSL reused session
@@ -1432,10 +1427,10 @@ SSL reused session
 
 
 
-=== TEST 18: iscribblet.org: passing SSL verify: keepalive (reuse the ssl session)
+=== TEST 18: openresty.org: passing SSL verify: keepalive (reuse the ssl session)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
     lua_ssl_verify_depth 2;
     location /t {
@@ -1450,7 +1445,7 @@ SSL reused session
 
             local session
             for i = 1, 3 do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -1458,7 +1453,7 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                session, err = sock:sslhandshake(session, "iscribblet.org", true)
+                session, err = sock:sslhandshake(session, "openresty.org", true)
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -1477,7 +1472,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::StartComRootCertificate"
+$::ComodoRootCertificate"
 
 --- request
 GET /t
@@ -1509,10 +1504,10 @@ SSL reused session
 
 
 
-=== TEST 19: iscribblet.org: passing SSL verify: keepalive (no reusing the ssl session)
+=== TEST 19: openresty.org: passing SSL verify: keepalive (no reusing the ssl session)
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
     lua_ssl_verify_depth 2;
     location /t {
@@ -1526,7 +1521,7 @@ SSL reused session
             do
 
             for i = 1, 3 do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -1534,7 +1529,7 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local session, err = sock:sslhandshake(nil, "iscribblet.org", true)
+                local session, err = sock:sslhandshake(nil, "openresty.org", true)
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -1553,7 +1548,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::StartComRootCertificate"
+$::ComodoRootCertificate"
 
 --- request
 GET /t
@@ -1592,7 +1587,7 @@ SSL reused session
 === TEST 20: downstream cosockets do not support ssl handshake
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
     lua_ssl_verify_depth 2;
     location /t {
@@ -1612,7 +1607,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::StartComRootCertificate"
+$::ComodoRootCertificate"
 
 --- request
 POST /t
@@ -1647,7 +1642,7 @@ attempt to call method 'sslhandshake' (a nil value)
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1750,7 +1745,7 @@ SSL reused session
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/test.crt;
 
     location /t {
@@ -1854,7 +1849,7 @@ SSL reused session
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1946,7 +1941,7 @@ SSL reused session
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_crl ../html/test.crl;
     lua_ssl_trusted_certificate ../html/test.crt;
     lua_socket_log_errors off;
@@ -2031,7 +2026,7 @@ SSL reused session
 === TEST 25: multiple handshake calls
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -2042,7 +2037,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -2051,7 +2046,7 @@ SSL reused session
                 ngx.say("connected: ", ok)
 
                 for i = 1, 2 do
-                    local session, err = sock:sslhandshake(nil, "iscribblet.org")
+                    local session, err = sock:sslhandshake(nil, "openresty.org")
                     if not session then
                         ngx.say("failed to do SSL handshake: ", err)
                         return
@@ -2060,7 +2055,7 @@ SSL reused session
                     ngx.say("ssl handshake: ", type(session))
                 end
 
-                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -2090,8 +2085,8 @@ GET /t
 connected: 1
 ssl handshake: userdata
 ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
+sent http request: 58 bytes.
+received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
@@ -2103,7 +2098,7 @@ lua ssl free session: ([0-9A-F]+):2
 lua ssl free session: ([0-9A-F]+):1
 $/
 --- error_log
-lua ssl server name: "iscribblet.org"
+lua ssl server name: "openresty.org"
 --- no_error_log
 SSL reused session
 [error]
@@ -2115,7 +2110,7 @@ SSL reused session
 === TEST 26: handshake timed out
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -2126,7 +2121,7 @@ SSL reused session
             sock:settimeout(2000)
 
             do
-                local ok, err = sock:connect("iscribblet.org", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -2135,7 +2130,7 @@ SSL reused session
                 ngx.say("connected: ", ok)
 
                 sock:settimeout(1);  -- should timeout immediately
-                local session, err = sock:sslhandshake(nil, "iscribblet.org")
+                local session, err = sock:sslhandshake(nil, "openresty.org")
                 if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
@@ -2157,7 +2152,7 @@ failed to do SSL handshake: timeout
 --- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 --- grep_error_log_out
 --- error_log
-lua ssl server name: "iscribblet.org"
+lua ssl server name: "openresty.org"
 --- no_error_log
 SSL reused session
 [error]
@@ -2183,7 +2178,7 @@ SSL reused session
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -2254,7 +2249,7 @@ SSL reused session
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -2328,7 +2323,7 @@ SSL reused session
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -2405,7 +2400,7 @@ SSL reused session
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/test.crt;
 
     location /t {
@@ -2510,7 +2505,7 @@ SSL reused session
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     #lua_ssl_trusted_certificate ../html/test.crt;
 
     location /t {
@@ -2589,7 +2584,7 @@ SSL reused session
 === TEST 32: handshake, too many arguments
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -2598,7 +2593,7 @@ SSL reused session
             local sock = ngx.socket.tcp()
             sock:settimeout(2000)
 
-            local ok, err = sock:connect("g.sregex.org", 443)
+            local ok, err = sock:connect("openresty.org", 443)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -2614,7 +2609,7 @@ SSL reused session
 GET /t
 --- ignore_response
 --- error_log eval
-qr/\[error\] .* ngx.socket connect: expecting 1 ~ 5 arguments \(including the object\), but seen 0/
+qr/\[error\] .* ngx.socket sslhandshake: expecting 1 ~ 5 arguments \(including the object\), but seen 0/
 --- no_error_log
 [alert]
 --- timeout: 5
diff --git a/debian/modules/nginx-lua/t/130-internal-api.t b/debian/modules/nginx-lua/t/130-internal-api.t
index d641ab5..eba0980 100644
--- a/debian/modules/nginx-lua/t/130-internal-api.t
+++ b/debian/modules/nginx-lua/t/130-internal-api.t
@@ -47,4 +47,3 @@ content req=0x[a-f0-9]{4,}
 $
 --- no_error_log
 [error]
-
diff --git a/debian/modules/nginx-lua/t/135-worker-id.t b/debian/modules/nginx-lua/t/135-worker-id.t
index 3c1f24d..984f446 100644
--- a/debian/modules/nginx-lua/t/135-worker-id.t
+++ b/debian/modules/nginx-lua/t/135-worker-id.t
@@ -54,7 +54,7 @@ GET /lua
         content_by_lua_block {
             local counters = ngx.shared.counters
             local ok, c
-            for i = 1, 45 do
+            for i = 1, 100 do
                 c = counters:get("c")
                 if c >= 4 then
                     ok = true
diff --git a/debian/modules/nginx-lua/t/137-req-misc.t b/debian/modules/nginx-lua/t/137-req-misc.t
index 20ada3c..d56f80e 100644
--- a/debian/modules/nginx-lua/t/137-req-misc.t
+++ b/debian/modules/nginx-lua/t/137-req-misc.t
@@ -59,4 +59,3 @@ not internal
 GET /test
 --- response_body
 internal
-
diff --git a/debian/modules/nginx-lua/t/138-balancer.t b/debian/modules/nginx-lua/t/138-balancer.t
index 8d45c24..ddd0da5 100644
--- a/debian/modules/nginx-lua/t/138-balancer.t
+++ b/debian/modules/nginx-lua/t/138-balancer.t
@@ -58,8 +58,8 @@ qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\
     }
 --- request
     GET /t
---- response_body_like: 500 Internal Server Error
---- error_code: 500
+--- response_body_like: 403 Forbidden
+--- error_code: 403
 --- error_log
 [lua] balancer_by_lua:2: hello from balancer by lua! while connecting to upstream,
 --- no_error_log eval
@@ -431,3 +431,98 @@ qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\
 ]
 --- no_error_log
 [warn]
+
+
+
+=== TEST 15: test if execeed proxy_next_upstream_limit
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;;";
+
+    proxy_next_upstream_tries 5;
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            local b = require "ngx.balancer"
+
+            if not ngx.ctx.tries then
+                ngx.ctx.tries = 0
+            end
+
+            if ngx.ctx.tries >= 6 then
+                ngx.log(ngx.ERR, "retry count exceed limit")
+                ngx.exit(500)
+            end
+
+            ngx.ctx.tries = ngx.ctx.tries + 1
+            print("retry counter: ", ngx.ctx.tries)
+
+            local ok, err = b.set_more_tries(2)
+            if not ok then
+                return error("failed to set more tries: ", err)
+            elseif err then
+                ngx.log(ngx.WARN, "set more tries: ", err)
+            end
+
+            assert(b.set_current_peer("127.0.0.1", 81))
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend/back;
+    }
+
+    location = /back {
+        return 404;
+    }
+--- request
+    GET /t
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- grep_error_log eval: qr/\bretry counter: \w+/
+--- grep_error_log_out
+retry counter: 1
+retry counter: 2
+retry counter: 3
+retry counter: 4
+retry counter: 5
+
+--- error_log
+set more tries: reduced tries due to limit
+
+
+
+=== TEST 16: set_more_tries bugfix
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;;";
+	proxy_next_upstream_tries 0;
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            local balancer = require "ngx.balancer"
+			local ctx = ngx.ctx
+			if not ctx.has_run then
+				ctx.has_run = true
+				local _, err = balancer.set_more_tries(3)
+				if err then
+					ngx.log(ngx.ERR, "failed to set more tries: ", err)
+				end
+			end
+			balancer.set_current_peer("127.0.0.1", 81)
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- request
+    GET /t
+--- error_code: 502
+--- grep_error_log eval: qr/http next upstream, \d+/
+--- grep_error_log_out
+http next upstream, 2
+http next upstream, 2
+http next upstream, 2
+http next upstream, 2
+--- no_error_log
+failed to set more tries: reduced tries due to limit
+[alert]
diff --git a/debian/modules/nginx-lua/t/139-ssl-cert-by.t b/debian/modules/nginx-lua/t/139-ssl-cert-by.t
index b9fd60d..c13044f 100644
--- a/debian/modules/nginx-lua/t/139-ssl-cert-by.t
+++ b/debian/modules/nginx-lua/t/139-ssl-cert-by.t
@@ -11,7 +11,7 @@ my $openssl_version = eval { `$NginxBinary -V 2>&1` };
 if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
     plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
 } else {
-    plan tests => repeat_each() * (blocks() * 6 + 10);
+    plan tests => repeat_each() * (blocks() * 6 + 6);
 }
 
 $ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
@@ -1383,7 +1383,7 @@ uthread: done
 
 
 
-=== TEST 17: simple logging - use ssl_certificiate_by_lua* on the http {} level
+=== TEST 17: simple logging - use ssl_certificate_by_lua* on the http {} level
 GitHub openresty/lua-resty-core#42
 --- http_config
     ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
@@ -1574,3 +1574,295 @@ qr/\[error\] .*? send\(\) failed/,
 --- no_error_log
 [alert]
 ssl_certificate_by_lua:1: ssl cert by lua is running!
+
+
+
+=== TEST 19: check the count of running timers
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /timers {
+            default_type 'text/plain';
+            content_by_lua_block {
+                ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
+                ngx.timer.at(0.11, function() ngx.sleep(0.3) end)
+                ngx.timer.at(0.09, function() ngx.sleep(0.3) end)
+                ngx.sleep(0.2)
+                ngx.say(ngx.timer.running_count())
+            }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /timers HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 59 bytes.
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 2
+received: Connection: close
+received: 
+received: 3
+close: 1 nil
+
+--- error_log eval
+[
+'ssl_certificate_by_lua:1: ssl cert by lua is running!',
+'lua ssl server name: "test.com"',
+]
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 20: some server {} block missing ssl_certificate_by_lua* handlers (literal server name)
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /timers {
+            default_type 'text/plain';
+            content_by_lua_block {
+                ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
+                ngx.timer.at(0.11, function() ngx.sleep(0.3) end)
+                ngx.timer.at(0.09, function() ngx.sleep(0.3) end)
+                ngx.sleep(0.2)
+                ngx.say(ngx.timer.running_count())
+            }
+            more_clear_headers Date;
+        }
+    }
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name test2.com;
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test2.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /timers HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to do SSL handshake: handshake failed
+
+--- error_log eval
+[
+qr/\[alert\] .*? no ssl_certificate_by_lua\* defined in server test2\.com\b/,
+qr/\[crit\] .*? SSL_do_handshake\(\) failed\b/,
+]
+
+
+
+=== TEST 21: some server {} block missing ssl_certificate_by_lua* handlers (regex server name)
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /timers {
+            default_type 'text/plain';
+            content_by_lua_block {
+                ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
+                ngx.timer.at(0.11, function() ngx.sleep(0.3) end)
+                ngx.timer.at(0.09, function() ngx.sleep(0.3) end)
+                ngx.sleep(0.2)
+                ngx.say(ngx.timer.running_count())
+            }
+            more_clear_headers Date;
+        }
+    }
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name ~test2\.com;
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test2.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /timers HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+failed to do SSL handshake: handshake failed
+
+--- error_log eval
+[
+qr/\[alert\] .*? no ssl_certificate_by_lua\* defined in server ~test2\\\.com\b/,
+qr/\[crit\] .*? SSL_do_handshake\(\) failed\b/,
+]
diff --git a/debian/modules/nginx-lua/t/140-ssl-c-api.t b/debian/modules/nginx-lua/t/140-ssl-c-api.t
index 44ad93d..8734d14 100644
--- a/debian/modules/nginx-lua/t/140-ssl-c-api.t
+++ b/debian/modules/nginx-lua/t/140-ssl-c-api.t
@@ -561,7 +561,7 @@ failed to parse PEM priv key: PEM_read_bio_PrivateKey() failed
             f:close()
 
             local pkey = ffi.C.ngx_http_lua_ffi_parse_pem_priv_key(pkey_data, #pkey_data, errmsg)
-            if not pkey then
+            if pkey == nil then
                 ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
                         ffi.string(errmsg[0]))
                 return
@@ -626,7 +626,7 @@ failed to parse PEM priv key: PEM_read_bio_PrivateKey() failed
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
@@ -711,7 +711,7 @@ lua ssl server name: "test.com"
             f:close()
 
             local pkey = ffi.C.ngx_http_lua_ffi_parse_pem_priv_key(pkey_data, #pkey_data, errmsg)
-            if not pkey then
+            if pkey == nil then
                 ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
                         ffi.string(errmsg[0]))
                 return
@@ -776,7 +776,7 @@ lua ssl server name: "test.com"
                 while true do
                     local line, err = sock:receive()
                     if not line then
-                        -- ngx.say("failed to recieve response status line: ", err)
+                        -- ngx.say("failed to receive response status line: ", err)
                         break
                     end
 
diff --git a/debian/modules/nginx-lua/t/141-luajit.t b/debian/modules/nginx-lua/t/141-luajit.t
index be03fe3..36418d1 100644
--- a/debian/modules/nginx-lua/t/141-luajit.t
+++ b/debian/modules/nginx-lua/t/141-luajit.t
@@ -1,6 +1,7 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use Test::Nginx::Socket::Lua;
+use Test::Nginx::Socket::Lua
+    skip_all => 'no mmap(sbrk(0)) trick since glibc leaks memory in this case';
 
 #worker_connections(1014);
 #master_on();
diff --git a/debian/modules/nginx-lua/t/142-ssl-session-store.t b/debian/modules/nginx-lua/t/142-ssl-session-store.t
index 5c9fad3..73b6e19 100644
--- a/debian/modules/nginx-lua/t/142-ssl-session-store.t
+++ b/debian/modules/nginx-lua/t/142-ssl-session-store.t
@@ -38,7 +38,7 @@ __DATA__
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -108,7 +108,7 @@ ssl_session_store_by_lua_block:1: ssl session store by lua is running!
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -183,7 +183,7 @@ API disabled in the context of ssl_session_store_by_lua*
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -275,7 +275,7 @@ my timer run!
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -343,7 +343,7 @@ API disabled in the context of ssl_session_store_by_lua*
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -415,7 +415,7 @@ ngx.exit does not yield and the error code is eaten.
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -488,7 +488,7 @@ ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -556,7 +556,7 @@ should never reached here
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -627,7 +627,7 @@ get_phase: ssl_session_store
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -696,7 +696,7 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -778,7 +778,7 @@ a.lua:1: ssl store session by lua is running!
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -849,7 +849,7 @@ qr/\[emerg\] .*? "ssl_session_store_by_lua_block" directive is not allowed here
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
diff --git a/debian/modules/nginx-lua/t/143-ssl-session-fetch.t b/debian/modules/nginx-lua/t/143-ssl-session-fetch.t
index bd800ff..701ead7 100644
--- a/debian/modules/nginx-lua/t/143-ssl-session-fetch.t
+++ b/debian/modules/nginx-lua/t/143-ssl-session-fetch.t
@@ -39,7 +39,7 @@ __DATA__
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -120,7 +120,7 @@ qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -204,7 +204,7 @@ qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -305,7 +305,7 @@ qr/my timer run!/s
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -385,7 +385,7 @@ qr/received memc reply: OK/s
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -466,7 +466,7 @@ should never reached here
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -548,7 +548,7 @@ should never reached here
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -629,7 +629,7 @@ should never reached here
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -712,7 +712,7 @@ should never reached here
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
     lua_ssl_verify_depth 3;
 
@@ -793,7 +793,7 @@ should never reached here
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -879,7 +879,7 @@ qr/get_phase: ssl_session_fetch/s
 
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
@@ -1049,7 +1049,7 @@ qr/\S+:\d+: ssl fetch sess by lua is running!/s
     }
 --- config
     server_tokens off;
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
 
     location /t {
diff --git a/debian/modules/nginx-lua/t/146-malloc-trim.t b/debian/modules/nginx-lua/t/146-malloc-trim.t
index 45fb9f2..fc425ce 100644
--- a/debian/modules/nginx-lua/t/146-malloc-trim.t
+++ b/debian/modules/nginx-lua/t/146-malloc-trim.t
@@ -43,8 +43,9 @@ ok
 ok
 ok
 --- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out
-malloc_trim(1) returned 0
+--- grep_error_log_out eval
+qr/\Amalloc_trim\(1\) returned [01]
+\z/
 --- wait: 0.2
 --- no_error_log
 [error]
@@ -76,13 +77,14 @@ ok
 ok
 ok
 --- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out
-malloc_trim(1) returned 0
-malloc_trim(1) returned 0
-malloc_trim(1) returned 0
-malloc_trim(1) returned 0
-malloc_trim(1) returned 0
-malloc_trim(1) returned 0
+--- grep_error_log_out eval
+qr/\Amalloc_trim\(1\) returned [01]
+malloc_trim\(1\) returned [01]
+malloc_trim\(1\) returned [01]
+malloc_trim\(1\) returned [01]
+malloc_trim\(1\) returned [01]
+malloc_trim\(1\) returned [01]
+\z/
 --- wait: 0.2
 --- no_error_log
 [error]
@@ -114,10 +116,11 @@ ok
 ok
 ok
 --- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out
-malloc_trim(1) returned 0
-malloc_trim(1) returned 0
-malloc_trim(1) returned 0
+--- grep_error_log_out eval
+qr/\Amalloc_trim\(1\) returned [01]
+malloc_trim\(1\) returned [01]
+malloc_trim\(1\) returned [01]
+\z/
 --- wait: 0.2
 --- no_error_log
 [error]
@@ -149,9 +152,10 @@ ok
 ok
 ok
 --- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out
-malloc_trim(1) returned 0
-malloc_trim(1) returned 0
+--- grep_error_log_out eval
+qr/\Amalloc_trim\(1\) returned [01]
+malloc_trim\(1\) returned [01]
+\z/
 --- wait: 0.2
 --- no_error_log
 [error]
@@ -330,8 +334,9 @@ ok
 ok
 ok
 --- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out
-malloc_trim(1) returned 0
+--- grep_error_log_out eval
+qr/\Amalloc_trim\(1\) returned [01]
+\z/
 --- wait: 0.2
 --- no_error_log
 [error]
diff --git a/debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t b/debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t
index 52f015a..0689a9b 100644
--- a/debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t
+++ b/debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t
@@ -315,7 +315,7 @@ lua tcp socket write timed out
 
 === TEST 5: connection timeout (tcp)
 --- config
-    resolver $TEST_NGINX_RESOLVER;
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
     resolver_timeout 3s;
     location /test {
         content_by_lua_block {
diff --git a/debian/modules/nginx-lua/t/150-fake-delayed-load.t b/debian/modules/nginx-lua/t/150-fake-delayed-load.t
new file mode 100644
index 0000000..232bbf3
--- /dev/null
+++ b/debian/modules/nginx-lua/t/150-fake-delayed-load.t
@@ -0,0 +1,56 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket::Lua;
+
+#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);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: lua code cache on
+--- http_config
+    lua_code_cache on;
+--- config
+    location = /cache_on {
+        content_by_lua_block {
+            local delayed_load = require("ngx.delayed_load")
+            ngx.say(type(delayed_load.get_function))
+        }
+    }
+--- request
+GET /cache_on
+--- response_body
+function
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: lua code cache off
+--- http_config
+    lua_code_cache off;
+--- config
+    location = /cache_off {
+        content_by_lua_block {
+            local delayed_load = require("ngx.delayed_load")
+            ngx.say(type(delayed_load.get_function))
+        }
+    }
+--- request
+GET /cache_off
+--- response_body
+function
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/151-initby-hup.t b/debian/modules/nginx-lua/t/151-initby-hup.t
new file mode 100644
index 0000000..f278867
--- /dev/null
+++ b/debian/modules/nginx-lua/t/151-initby-hup.t
@@ -0,0 +1,168 @@
+# 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;
+        undef $ENV{TEST_NGINX_USE_STAP};
+    }
+}
+
+use Test::Nginx::Socket::Lua 'no_plan';
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(1);
+
+#plan tests => repeat_each() * (blocks() * 3 + 3);
+
+#no_diff();
+#no_long_string();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: no error in init before HUP
+--- http_config
+    init_by_lua_block {
+        foo = "hello, FOO"
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say(foo)
+        }
+    }
+--- request
+GET /lua
+--- response_body
+hello, FOO
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: error in init after HUP (master still alive, worker process still the same as before)
+--- http_config
+    init_by_lua_block {
+        error("failed to init")
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say(foo)
+        }
+    }
+--- request
+GET /lua
+--- response_body
+hello, FOO
+--- error_log
+failed to init
+--- reload_fails
+
+
+
+=== TEST 3: no error in init again
+--- http_config
+    init_by_lua_block {
+        foo = "hello, foo"
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say(foo)
+        }
+    }
+--- request
+GET /lua
+--- response_body
+hello, foo
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: no error in init before HUP, used ngx.shared.DICT
+--- http_config
+    lua_shared_dict dogs 1m;
+
+    init_by_lua_block {
+        local dogs = ngx.shared.dogs
+        dogs:set("foo", "hello, FOO")
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            local foo = dogs:get("foo")
+            ngx.say(foo)
+        }
+    }
+--- request
+GET /lua
+--- response_body
+hello, FOO
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: error in init after HUP, not reloaded but foo have changed.
+--- http_config
+    lua_shared_dict dogs 1m;
+
+    init_by_lua_block {
+        local dogs = ngx.shared.dogs
+        dogs:set("foo", "foo have changed")
+
+        error("failed to init")
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say("HUP reload failed")
+        }
+    }
+--- request
+GET /lua
+--- response_body
+foo have changed
+--- error_log
+failed to init
+--- reload_fails
+
+
+
+=== TEST 6: no error in init again, reload success and foo still have changed.
+--- http_config
+    lua_shared_dict dogs 1m;
+
+    init_by_lua_block {
+        -- do nothing
+    }
+--- config
+    location /lua {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+            local foo = dogs:get("foo")
+            ngx.say(foo)
+            ngx.say("reload success")
+        }
+    }
+--- request
+GET /lua
+--- response_body
+foo have changed
+reload success
+--- no_error_log
+[error]
diff --git a/debian/modules/nginx-lua/t/152-timer-every.t b/debian/modules/nginx-lua/t/152-timer-every.t
new file mode 100644
index 0000000..c8d62e7
--- /dev/null
+++ b/debian/modules/nginx-lua/t/152-timer-every.t
@@ -0,0 +1,385 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(1014);
+#master_on();
+#workers(2);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 7 + 2);
+
+#no_diff();
+no_long_string();
+
+our $HtmlDir = html_dir;
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
+
+worker_connections(1024);
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple very
+--- config
+    location /t {
+        content_by_lua_block {
+            local begin = ngx.now()
+            local function f(premature)
+                print("elapsed: ", ngx.now() - begin)
+                print("timer prematurely expired: ", premature)
+            end
+
+            local ok, err = ngx.timer.every(0.05, f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+
+            ngx.say("registered timer")
+        }
+    }
+--- request
+GET /t
+--- response_body
+registered timer
+--- wait: 0.11
+--- no_error_log
+[error]
+[alert]
+[crit]
+timer prematurely expired: true
+--- error_log eval
+[
+qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])\d*, context: ngx\.timer, client: \d+\.\d+\.\d+\.\d+, server: 0\.0\.0\.0:\d+/,
+qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, context: ngx\.timer, client: \d+\.\d+\.\d+\.\d+, server: 0\.0\.0\.0:\d+/,
+"lua ngx.timer expired",
+"http lua close fake http connection",
+"timer prematurely expired: false",
+]
+
+
+
+=== TEST 2: separated global env
+--- config
+    location /t {
+        content_by_lua_block {
+            local begin = ngx.now()
+            local function f()
+                foo = 3
+                print("foo in timer: ", foo)
+            end
+            local ok, err = ngx.timer.every(0.05, f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+            ngx.sleep(0.11)
+            ngx.say("foo = ", foo)
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo = nil
+--- wait: 0.12
+--- no_error_log
+[error]
+[alert]
+[crit]
+--- error_log eval
+[
+qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 3/,
+"lua ngx.timer expired",
+"http lua close fake http connection"
+]
+
+
+
+=== TEST 3: lua variable sharing via upvalue
+--- config
+    location /t {
+        content_by_lua_block {
+            local begin = ngx.now()
+            local foo = 0
+            local function f()
+                foo = foo + 3
+                print("foo in timer: ", foo)
+            end
+            local ok, err = ngx.timer.every(0.05, f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+            ngx.say("registered timer")
+            ngx.sleep(0.11)
+            ngx.say("foo = ", foo)
+        }
+    }
+--- request
+GET /t
+--- response_body
+registered timer
+foo = 6
+--- wait: 0.12
+--- no_error_log
+[error]
+[alert]
+[crit]
+--- error_log eval
+[
+qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 3/,
+qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 6/,
+"lua ngx.timer expired",
+"http lua close fake http connection"
+]
+
+
+
+=== TEST 4: create the next timer immediately when timer start running
+--- config
+    location /t {
+        content_by_lua_block {
+            local begin = ngx.now()
+            local foo = 0
+            local function f()
+                foo = foo + 3
+                print("foo in timer: ", foo)
+
+                ngx.sleep(0.1)
+            end
+            local ok, err = ngx.timer.every(0.05, f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+            ngx.say("registered timer")
+            ngx.sleep(0.11)
+            ngx.say("foo = ", foo)
+        }
+    }
+--- request
+GET /t
+--- response_body
+registered timer
+foo = 6
+--- wait: 0.12
+--- no_error_log
+[error]
+[alert]
+[crit]
+--- error_log eval
+[
+qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 3/,
+qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 6/,
+"lua ngx.timer expired",
+"http lua close fake http connection"
+]
+
+
+
+=== TEST 5: callback args
+--- config
+    location /t {
+        content_by_lua_block {
+            local n = 0
+
+            local function f(premature, a, b, c)
+                n = n + 1
+                print("the ", n, " time, args: ", a, ", ", b, ", ", c)
+
+                a, b, c = 0, 0, 0
+            end
+
+            local ok, err = ngx.timer.every(0.05, f, 1, 2)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+
+            ngx.say("registered timer")
+            ngx.sleep(0.11)
+        }
+    }
+--- request
+GET /t
+--- response_body
+registered timer
+--- wait: 0.12
+--- no_error_log
+[error]
+[alert]
+[crit]
+--- error_log eval
+[
+"the 1 time, args: 1, 2, nil",
+"the 2 time, args: 1, 2, nil",
+"lua ngx.timer expired",
+"http lua close fake http connection"
+]
+
+
+
+=== TEST 6: memory leak check
+--- config
+    location /t {
+        content_by_lua_block {
+            local function f()
+                local a = 1
+                -- do nothing
+            end
+
+            for i = 1, 100 do
+                local ok, err = ngx.timer.every(0.1, f)
+                if not ok then
+                    ngx.say("failed to set timer: ", err)
+                    return
+                end
+            end
+
+            ngx.say("registered timer")
+
+            collectgarbage("collect")
+            local start = collectgarbage("count")
+
+            ngx.sleep(0.21)
+
+            collectgarbage("collect")
+            local growth1 = collectgarbage("count") - start
+
+            ngx.sleep(0.51)
+
+            collectgarbage("collect")
+            local growth2 = collectgarbage("count") - start
+
+            ngx.say("growth1 == growth2: ", growth1 == growth2)
+        }
+    }
+--- request
+GET /t
+--- response_body
+registered timer
+growth1 == growth2: true
+--- no_error_log
+[error]
+[alert]
+[crit]
+--- timeout: 8
+
+
+
+=== TEST 7: respect lua_max_pending_timers
+--- http_config
+    lua_max_pending_timers 10;
+--- config
+    location /t {
+        content_by_lua_block {
+            local function f()
+                local a = 1
+                -- do nothing
+            end
+
+            for i = 1, 11 do
+                local ok, err = ngx.timer.every(0.1, f)
+                if not ok then
+                    ngx.say("failed to set timer: ", err)
+                    return
+                end
+            end
+
+            ngx.say("registered 10 timers")
+        }
+    }
+--- request
+GET /t
+--- response_body
+failed to set timer: too many pending timers
+--- no_error_log
+[error]
+[alert]
+[crit]
+
+
+
+=== TEST 8: respect lua_max_running_timers
+--- http_config
+    lua_max_pending_timers 100;
+    lua_max_running_timers 9;
+--- config
+    location /t {
+        content_by_lua_block {
+            local function f()
+                local a = 1
+                ngx.sleep(0.02)
+                -- do nothing
+            end
+
+            for i = 1, 10 do
+                local ok, err = ngx.timer.every(0.01, f)
+                if not ok then
+                    ngx.say("failed to set timer: ", err)
+                    return
+                end
+            end
+
+            ngx.say("registered 10 timers")
+
+            ngx.sleep(0.03)
+        }
+    }
+--- request
+GET /t
+--- response_body
+registered 10 timers
+--- no_error_log
+[error]
+[crit]
+--- error_log
+lua_max_running_timers are not enough
+
+
+
+=== TEST 9: lua_code_cache off
+FIXME: it is know that this test case leaks memory.
+so we skip it in the "check leak" testing mode.
+--- http_config
+    lua_code_cache off;
+--- config
+    location /t {
+        content_by_lua_block {
+            local function f()
+                local a = 1
+                -- do nothing
+            end
+
+            local ok, err = ngx.timer.every(0.01, f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+
+            collectgarbage("collect")
+            ngx.say("registered timer")
+
+            ngx.sleep(0.03)
+
+            collectgarbage("collect")
+
+            ngx.sleep(0.03)
+
+            collectgarbage("collect")
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+registered timer
+ok
+--- no_error_log
+[error]
+[crit]
+--- no_check_leak
diff --git a/debian/modules/nginx-lua/t/153-semaphore-hup.t b/debian/modules/nginx-lua/t/153-semaphore-hup.t
new file mode 100644
index 0000000..c85a21d
--- /dev/null
+++ b/debian/modules/nginx-lua/t/153-semaphore-hup.t
@@ -0,0 +1,154 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(10140);
+#workers(1);
+log_level('warn');
+master_process_enabled(1);
+repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+no_long_string();
+#no_diff();
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    my $http_config = $block->http_config || '';
+    $http_config .= <<'_EOC_';
+    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+    lua_shared_dict shdict 4m;
+
+    init_by_lua_block {
+        require "resty.core"
+        local process = require "ngx.process"
+        local ok, err = process.enable_privileged_agent()
+        if not ok then
+            ngx.log(ngx.ERR, "failed to enable_privileged_agent: ", err)
+        end
+    }
+
+    init_worker_by_lua_block {
+        local function test(pre)
+            if pre then
+                return
+            end
+
+            local semaphore = require "ngx.semaphore"
+            local sem = semaphore.new()
+
+            ngx.log(ngx.ERR, "created semaphore object")
+
+            local function sem_wait()
+
+                local ok, err = sem:wait(100)
+                if not ok then
+                    ngx.log(ngx.ERR, "err: ", err)
+                else
+                    ngx.log(ngx.ERR, "wait success")
+                end
+            end
+
+            while not ngx.worker.exiting() do
+                local co = ngx.thread.spawn(sem_wait)
+                ngx.thread.wait(co)
+            end
+        end
+
+        local ok, err = ngx.timer.at(0, test)
+        if not ok then
+            ngx.log(ngx.ERR, "failed to create semaphore timer err: ", err)
+        end
+
+        local function reload(pre)
+            if pre then
+                return
+            end
+
+            shdict = ngx.shared.shdict
+            local success = shdict:add("reloaded", 1)
+            if not success then
+                return
+            end
+
+            ngx.log(ngx.ERR, "try to reload nginx")
+
+            local f, err = io.open(ngx.config.prefix() .. "/logs/nginx.pid", "r")
+            if not f then
+                ngx.say("failed to open nginx.pid: ", err)
+                return
+            end
+
+            local pid = f:read()
+
+            f:close()
+            os.execute("kill -HUP " .. pid)
+        end
+
+        local typ = require "ngx.process".type
+        if typ() == "privileged agent" then
+            local ok, err = ngx.timer.at(0.1, reload)
+            if not ok then
+                ngx.log(ngx.ERR, "failed to create semaphore timer err: ", err)
+            end
+        end
+    }
+_EOC_
+    $block->set_value("http_config", $http_config);
+});
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: timer + reload
+--- config
+    location /test {
+        content_by_lua_block {
+            ngx.sleep(1)
+            ngx.say("hello")
+        }
+    }
+--- request
+GET /test
+--- response_body
+hello
+--- grep_error_log eval: qr/created semaphore object|try to reload nginx|semaphore gc wait queue is not empty/
+--- grep_error_log_out
+created semaphore object
+created semaphore object
+try to reload nginx
+created semaphore object
+created semaphore object
+--- skip_nginx: 3: < 1.11.2
+--- no_check_leak
+--- wait: 0.2
+
+
+
+=== TEST 2: timer + reload (lua code cache off)
+--- http_config
+    lua_code_cache off;
+--- config
+    location /test {
+        content_by_lua_block {
+            ngx.sleep(1)
+            ngx.say("hello")
+        }
+    }
+--- request
+GET /test
+--- response_body
+hello
+--- grep_error_log eval: qr/created semaphore object|try to reload nginx|semaphore gc wait queue is not empty/
+--- grep_error_log_out
+created semaphore object
+created semaphore object
+try to reload nginx
+created semaphore object
+created semaphore object
+--- skip_nginx: 3: < 1.11.2
+--- no_check_leak
+--- wait: 0.2
diff --git a/debian/modules/nginx-lua/t/154-semaphore.t b/debian/modules/nginx-lua/t/154-semaphore.t
new file mode 100644
index 0000000..3c1f004
--- /dev/null
+++ b/debian/modules/nginx-lua/t/154-semaphore.t
@@ -0,0 +1,118 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+use lib 'lib';
+use Test::Nginx::Socket::Lua;
+
+#worker_connections(10140);
+#workers(1);
+#log_level('warn');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3) + blocks();
+
+no_long_string();
+#no_diff();
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    my $http_config = $block->http_config || '';
+    $http_config .= <<'_EOC_';
+    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+
+    init_by_lua_block {
+        require "resty.core"
+    }
+_EOC_
+    $block->set_value("http_config", $http_config);
+});
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: timer + shutdown error log
+--- config
+    location /test {
+        content_by_lua_block {
+            local function test(pre)
+
+                local semaphore = require "ngx.semaphore"
+                local sem = semaphore.new()
+
+                local function sem_wait()
+
+                    local ok, err = sem:wait(10)
+                    if not ok then
+                        ngx.log(ngx.ERR, "err: ", err)
+                    else
+                        ngx.log(ngx.ERR, "wait success")
+                    end
+                end
+
+                while not ngx.worker.exiting() do
+                    local co = ngx.thread.spawn(sem_wait)
+                    ngx.thread.wait(co)
+                end
+            end
+
+            local ok, err = ngx.timer.at(0, test)
+            ngx.log(ngx.ERR, "hello, world")
+            ngx.say("time: ", ok)
+        }
+    }
+--- request
+GET /test
+--- response_body
+time: 1
+--- grep_error_log eval: qr/hello, world|semaphore gc wait queue is not empty/
+--- grep_error_log_out
+hello, world
+--- shutdown_error_log
+--- no_shutdown_error_log
+semaphore gc wait queue is not empty
+
+
+
+=== TEST 2: timer + shutdown error log (lua code cache off)
+--- http_config
+    lua_code_cache off;
+--- config
+    location /test {
+        content_by_lua_block {
+            local function test(pre)
+
+                local semaphore = require "ngx.semaphore"
+                local sem = semaphore.new()
+
+                local function sem_wait()
+
+                    local ok, err = sem:wait(10)
+                    if not ok then
+                        ngx.log(ngx.ERR, "err: ", err)
+                    else
+                        ngx.log(ngx.ERR, "wait success")
+                    end
+                end
+
+                while not ngx.worker.exiting() do
+                    local co = ngx.thread.spawn(sem_wait)
+                    ngx.thread.wait(co)
+                end
+            end
+
+            local ok, err = ngx.timer.at(0, test)
+            ngx.log(ngx.ERR, "hello, world")
+            ngx.say("time: ", ok)
+        }
+    }
+--- request
+GET /test
+--- response_body
+time: 1
+--- grep_error_log eval: qr/hello, world|semaphore gc wait queue is not empty/
+--- grep_error_log_out
+hello, world
+--- shutdown_error_log
+--- no_shutdown_error_log
+semaphore gc wait queue is not empty
diff --git a/debian/modules/nginx-lua/t/cert/comodo-ca.crt b/debian/modules/nginx-lua/t/cert/comodo-ca.crt
new file mode 100644
index 0000000..444461b
--- /dev/null
+++ b/debian/modules/nginx-lua/t/cert/comodo-ca.crt
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
diff --git a/debian/modules/nginx-lua/t/cert/startcom.crt b/debian/modules/nginx-lua/t/cert/startcom.crt
deleted file mode 100644
index a5185ca..0000000
--- a/debian/modules/nginx-lua/t/cert/startcom.crt
+++ /dev/null
@@ -1,87 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
-F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
-ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
-ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
-aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
-YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
-c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
-d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
-CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
-wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
-Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
-0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
-pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
-CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
-P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
-1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
-KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
-JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
-8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
-fyWl8kgAwKQB2j8=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
-ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
-LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
-BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
-dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
-cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
-YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
-dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
-bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
-YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
-TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
-9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
-jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
-FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
-ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
-ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
-EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
-L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
-O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
-um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
-NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
------END CERTIFICATE-----
diff --git a/debian/modules/nginx-lua/t/data/fake-delayed-load-module/config b/debian/modules/nginx-lua/t/data/fake-delayed-load-module/config
new file mode 100644
index 0000000..a5fa6fb
--- /dev/null
+++ b/debian/modules/nginx-lua/t/data/fake-delayed-load-module/config
@@ -0,0 +1,3 @@
+ngx_addon_name="ngx_http_lua_fake_delayed_load_module"
+HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_lua_fake_delayed_load_module"
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_lua_fake_delayed_load_module.c"
diff --git a/debian/modules/nginx-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c b/debian/modules/nginx-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c
new file mode 100644
index 0000000..2898255
--- /dev/null
+++ b/debian/modules/nginx-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c
@@ -0,0 +1,77 @@
+/*
+ * This fake_delayed_load delayed load module was used to reproduce
+ * a bug in ngx_lua's function ngx_http_lua_add_package_preload.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+#include "ngx_http_lua_api.h"
+
+
+static ngx_int_t ngx_http_lua_fake_delayed_load_init(ngx_conf_t *cf);
+static int ngx_http_lua_fake_delayed_load_preload(lua_State *L);
+static int ngx_http_lua_fake_delayed_load_function(lua_State * L);
+
+
+static ngx_http_module_t ngx_http_lua_fake_delayed_load_module_ctx = {
+    NULL,                                 /* preconfiguration */
+    ngx_http_lua_fake_delayed_load_init,  /* postconfiguration */
+
+    NULL,                                 /* create main configuration */
+    NULL,                                 /* init main configuration */
+
+    NULL,                                 /* create server configuration */
+    NULL,                                 /* merge server configuration */
+
+    NULL,                                 /* create location configuration */
+    NULL,                                 /* merge location configuration */
+};
+
+/* flow identify module struct */
+ngx_module_t  ngx_http_lua_fake_delayed_load_module = {
+    NGX_MODULE_V1,
+    &ngx_http_lua_fake_delayed_load_module_ctx,   /* module context */
+    NULL,                                         /* module directives */
+    NGX_HTTP_MODULE,                              /* module type */
+    NULL,                                         /* init master */
+    NULL,                                         /* init module */
+    NULL,                                         /* init process */
+    NULL,                                         /* init thread */
+    NULL,                                         /* exit thread */
+    NULL,                                         /* exit process */
+    NULL,                                         /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_http_lua_fake_delayed_load_init(ngx_conf_t *cf)
+{
+    ngx_http_lua_add_package_preload(cf, "ngx.delayed_load",
+                                     ngx_http_lua_fake_delayed_load_preload);
+    return NGX_OK;
+}
+
+
+static int
+ngx_http_lua_fake_delayed_load_preload(lua_State *L)
+{
+    lua_createtable(L, 0, 1);
+
+    lua_pushcfunction(L, ngx_http_lua_fake_delayed_load_function);
+    lua_setfield(L, -2, "get_function");
+
+    return 1;
+}
+
+
+static int
+ngx_http_lua_fake_delayed_load_function(lua_State * L)
+{
+    return 0;
+}
diff --git a/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c b/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
index 42cde55..650f4f7 100644
--- a/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
+++ b/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
@@ -1,5 +1,4 @@
-/* Copyright (C) ZHANG Heng (chiyouhen)
- *
+/*
  * This fake module was used to reproduce a bug in ngx_lua's
  * init_worker_by_lua implementation.
  */
diff --git a/debian/modules/nginx-lua/util/build.sh b/debian/modules/nginx-lua/util/build.sh
index 7887fe9..e45c00a 100755
--- a/debian/modules/nginx-lua/util/build.sh
+++ b/debian/modules/nginx-lua/util/build.sh
@@ -52,6 +52,7 @@ time ngx-build $force $version \
                 --add-module=$root/../redis2-nginx-module \
                 --add-module=$root/t/data/fake-module \
                 --add-module=$root/t/data/fake-shm-module \
+                --add-module=$root/t/data/fake-delayed-load-module \
                 --with-http_gunzip_module \
                 --with-http_dav_module \
           --with-select_module \
diff --git a/debian/modules/nginx-lua/util/gdbinit b/debian/modules/nginx-lua/util/gdbinit
deleted file mode 100644
index 1508c64..0000000
--- a/debian/modules/nginx-lua/util/gdbinit
+++ /dev/null
@@ -1,415 +0,0 @@
-# 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
-
-#### Lua type defines ####
-
-set $__LUA_TNONE = -1
-set $__LUA_TNIL = 0
-set $__LUA_TBOOLEAN = 1
-set $__LUA_TLIGHTUSERDATA = 2
-set $__LUA_TNUMBER = 3
-set $__LUA_TSTRING = 4
-set $__LUA_TTABLE = 5
-set $__LUA_TFUNCTION = 6
-set $__LUA_TUSERDATA = 7
-set $__LUA_TTHREAD = 8
-
-#### Lua constants ####
-
-set $__LUA_GLOBALSINDEX = -10002
-set $__LUA_ENVIRONINDEX = -10001
-set $__LUA_REGISTRYINDEX = -10000
-
-#### Auxiliary methods ####
-
-define __lua_debug_instance
-	if !$__lua_debug_instance
-		set $__lua_debug_instance = (lua_Debug*)malloc(sizeof(lua_Debug))
-	end
-end
-
-define __free_lua_debug_instance
-	if $__lua_debug_instance
-		set $rc = free($__lua_debug_instance)
-		set $__lua_debug_instance = 0
-	end
-end
-
-set $__BUCKET_SIZE = 16
-define __set_instance
-	if !$__set_instance
-		set $__set_instance = (void*(*(*))[2])malloc($__BUCKET_SIZE*sizeof(void*(*)[2]))
-		set $rc = memset($__set_instance, 0, $__BUCKET_SIZE*sizeof(void*(*)[2]))
-	end
-end
-
-define __free_set_instance
-	if $__set_instance
-		__set_clean
-		set $rc = free($__set_instance)
-		set $__set_instance = 0
-	end
-end
-
-define __set_add
-	set $p = (void*)$arg0
-	set $__bkt_idx = (int)$p%$__BUCKET_SIZE
-
-	__set_instance
-	set $__elem = (void*(*)[2])$__set_instance[$__bkt_idx]
-	set $__found = 0
-	while $__elem
-		if (*$__elem)[0] == $p
-			set $__found = 1
-			loop_break
-		end
-		set $__elem = (void*(*)[2])(*$__elem)[1]
-	end
-	if $__found
-		set $existed_in_set = 1
-	else
-		set $existed_in_set = 0
-
-		set $rc = (void*(*)[2])calloc(1, sizeof(void*)*2)
-		set (*$rc)[0] = $p
-		set (*$rc)[1] = $__set_instance[$__bkt_idx]
-		set $__set_instance[$__bkt_idx] = $rc
-	end
-end
-
-define __set_is_exist
-	set $p = (void*)$arg0
-	set $__bkt_idx = (int)$p%$__BUCKET_SIZE
-
-	__set_instance
-	set $__elem = (void*(*)[2])$__set_instance[$__bkt_idx]
-	set $__found = 0
-	while $__elem
-		if (*$__elem)[0] == $p
-			set $__found = 1
-			loop_break
-		end
-		set $__elem = (void*(*)[2])(*$__elem)[1]
-	end
-	if $__found
-		set $existed_in_set = 1
-	else
-		set $existed_in_set = 0
-	end
-end
-
-define __set_clean
-	__set_instance
-
-	set $__bkt_idx = 0
-	while $__bkt_idx < $__BUCKET_SIZE
-		set $__elem = (void*(*)[2])$__set_instance[$__bkt_idx]
-		while $__elem
-			set $__next = (void*(*)[2])(*$__elem)[1]
-			set $rc = free($__elem)
-			set $__elem = $__next
-		end
-		set $__set_instance[$__bkt_idx] = 0
-		set $__bkt_idx = $__bkt_idx+1
-	end
-end
-
-define hook-quit
-	__free_lua_debug_instance
-	__free_set_instance
-end
-
-define hook-detach
-	__free_lua_debug_instance
-	__free_set_instance
-end
-
-define hook-disconnect
-	__free_lua_debug_instance
-	__free_set_instance
-end
-
-define _lua_pop
-	set $l = (lua_State*)$arg0
-	set $_n = (int)$arg1
-	set $_rc = lua_settop($l, -$_n-1)
-end
-
-define _lua_dump_locals
-	set $l = (lua_State*)$arg0
-	set $dbg = (lua_Debug*)$arg1
-	set $idx = 1
-
-	set $rc = lua_getlocal($l, $dbg, $idx)
-	if $rc
-		printf "\t----[[ Locals ]]----\n"
-		while $rc
-			printf "\t%d:\t'%s' = ", $idx, $rc
-			__lua_dump_stack $l -1
-			printf "\n"
-
-			_lua_pop $l 1
-			set $idx = $idx + 1
-			set $rc = lua_getlocal($l, $dbg, $idx)
-		end
-	else
-		printf "\tNo locals!\n"
-	end
-	printf "\n"
-end
-
-define _lua_dump_upvalues
-	set $l = (lua_State*)$arg0
-	set $dbg = (lua_Debug*)$arg1
-	set $idx = 1
-
-	set $rc = lua_getinfo($l, "f", $dbg)
-	if $rc
-		set $rc = lua_getupvalue($l, -1, $idx)
-		if $rc
-			printf "\t----[[ Upvalues ]]----\n"
-			while $rc
-				printf "\t%d:\t'%s' = ", $idx, $rc
-				__lua_dump_stack $l -1
-				printf "\n"
-
-				_lua_pop $l 1
-				set $idx = $idx + 1
-				set $rc = lua_getupvalue($l, -1, $idx)
-			end
-		else
-			printf "\tNo upvalues!\n"
-		end
-		_lua_pop $l 1
-	else
-		printf "\tFailed to get function closure!\n"
-	end
-	printf "\n"
-end
-
-define __lua_dump_stack
-	__set_clean
-	__lua_dump_stack_aux $arg0 $arg1 0
-end
-
-define __lua_dump_stack_aux
-	set $l = (lua_State*)$arg0
-	set $nidx_$arg2 = (int)$arg1
-	set $cidx_$arg2 = (int)$arg2+1
-
-	# relative stack index to absolute index
-	if $nidx_$arg2 < 0 && $nidx_$arg2 > $__LUA_REGISTRYINDEX
-		set $nidx_$arg2 = $nidx_$arg2 + (int)lua_gettop($l) + 1
-	end
-
-	set $vt_$arg2 = (int)lua_type($l, $nidx_$arg2)
-
-	if $vt_$arg2 == $__LUA_TNONE
-		echo <invalid index>
-	end
-	if $vt_$arg2 == $__LUA_TNIL
-		echo (nil)
-	end
-	if $vt_$arg2 == $__LUA_TBOOLEAN
-		printf "(bool) %d", lua_toboolean($l, $nidx_$arg2)
-	end
-	if $vt_$arg2 == $__LUA_TLIGHTUSERDATA
-		printf "(ludata) %p", lua_touserdata($l, $nidx_$arg2)
-	end
-	if $vt_$arg2 == $__LUA_TNUMBER
-		printf "%g", lua_tonumber($l, $nidx_$arg2)
-	end
-	if $vt_$arg2 == $__LUA_TSTRING
-		set $tmplen = (size_t*)malloc(sizeof(size_t))
-		set $tmp = lua_pushvalue($l, $nidx_$arg2)
-		set $tmp = lua_tolstring($l, -1, $tmplen)
-#printf "(string:%d) ", *$tmplen
-		eval "output/r *(const char (*)[%d])$tmp", *$tmplen
-		_lua_pop $l 1
-		set $tmp = free($tmplen)
-	end
-	if $vt_$arg2 == $__LUA_TTABLE
-		set $rc = lua_topointer($l, $nidx_$arg2)
-#printf "(table) %p { ", $rc
-		printf "{ "
-		__set_add $rc
-		if $existed_in_set
-			printf "... "
-		else
-			set $rc = lua_pushnil($l)
-			set $rc = lua_next($l, $nidx_$arg2)
-			while $rc != 0
-				printf "["
-				__lua_dump_stack_aux $l -2 $cidx_$arg2
-				printf "]"
-				printf " = "
-				__lua_dump_stack_aux $l -1 $cidx_$arg2
-				printf ", "
-				_lua_pop $l 1
-				set $rc = lua_next($l, $nidx_$arg2)
-			end
-		end
-		printf "}"
-	end
-	if $vt_$arg2 == $__LUA_TFUNCTION
-		printf "(func) %p", lua_topointer($l, $nidx_$arg2)
-	end
-	if $vt_$arg2 == $__LUA_TUSERDATA
-		printf "(udata) %p", lua_topointer($l, $nidx_$arg2)
-	end
-	if $vt_$arg2 == $__LUA_TTHREAD
-		printf "(thread) %p", lua_topointer($l, $nidx_$arg2)
-	else
-		if $vt_$arg2 > $__LUA_TTHREAD || $vt_$arg2 < 0
-			echo <unknown type>
-		end
-	end
-end
-
-#### Command methods ####
-
-define lbt 
-	if $argc < 1
-		echo Please specify Lua state and/or dump flag!\n
-	else
-		set $l = (lua_State*)$arg0
-		if $argc > 1
-			set $dump_local = ($arg1&1)==1
-			set $dump_upvalue = ($arg1&2)==2
-		else
-			set $dump_local = 0
-			set $dump_upvalue = 0
-		end
-
-		__lua_debug_instance
-		set $dbg = $__lua_debug_instance
-
-		set $level = 0
-		set $rc = lua_getstack($l, $level, $dbg)
-		while $rc > 0
-			set $rc = lua_getinfo($l, "Sln", $dbg)
-			set $name = $dbg->name
-			if !$name
-				set $name = "???"
-			end
-
-			printf "#%d\t%s\t[%s]\tat %s:%d\n", $level, $name, $dbg->what, $dbg->source, $dbg->currentline
-
-			if $dump_local
-				_lua_dump_locals $l $dbg
-			end
-			if $dump_upvalue
-				_lua_dump_upvalues $l $dbg
-			end
-
-			set $level = $level+1
-			set $rc = lua_getstack($l, $level, $dbg)
-		end
-	end
-end
-
-document lbt
-lbt <lua state> [<dump>]: Dump the backtrace of the specified Lua state. <dump> is a mask value, whose bit 1/2 controls the dump of locals/upvalues at each stack frame correspondingly. So set <dump> to 1 dumps only locals; set to 2 dumps only upvalues; and set to 3 dumps both locals and upvalues.
-end
-
-define ll
-	if $argc != 2
-		echo Please specify Lua state and stack frame number (0-based)!\n
-	else
-		set $l = (lua_State*)$arg0
-		set $level = (int)$arg1
-
-		__lua_debug_instance
-		set $dbg = $__lua_debug_instance
-
-		set $rc = lua_getstack($l, $level, $dbg)
-		if $rc > 0
-			_lua_dump_locals $l $dbg
-		else
-			echo Failed to get Lua stack frame!\n
-		end
-	end
-end
-
-document ll
-ll <lua state> <frameno>: Dump all local vars in the specified Lua stack frame (0-based).
-end
-
-define lu
-	if $argc != 2
-		echo Please specify Lua state and stack frame number (0-based)!\n
-	else
-		set $l = (lua_State*)$arg0
-		set $level = (int)$arg1
-
-		__lua_debug_instance
-		set $dbg = $__lua_debug_instance
-
-		set $rc = lua_getstack($l, $level, $dbg)
-		if $rc > 0
-			_lua_dump_upvalues $l $dbg
-		else
-			echo Failed to get Lua stack frame!\n
-		end
-	end
-end
-
-document lu
-lu <lua state> <frameno>: Dump all upvalues in the specified Lua stack frame (0-based).
-end
-
-define lg
-	if $argc != 1
-		echo Please specify Lua state!\n
-	else
-		set $l = (lua_State*)$arg0
-		__lua_dump_stack $l $__LUA_GLOBALSINDEX
-		printf "\n"
-	end
-end
-
-document lg
-lg <lua state>: Dump all entries in Lua global table.
-end
-
-define lr
-	if $argc != 1
-		echo Please specify Lua state!\n
-	else
-		set $l = (lua_State*)$arg0
-		__lua_dump_stack $l $__LUA_REGISTRYINDEX
-		printf "\n"
-	end
-end
-
-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/util/reindex b/debian/modules/nginx-lua/util/reindex
deleted file mode 100755
index bd54c9d..0000000
--- a/debian/modules/nginx-lua/util/reindex
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/perl
-#: reindex.pl
-#: reindex .t files for Test::Base based test files
-#: Copyright (c) 2006 Agent Zhang
-#: 2006-04-27 2006-05-09
-
-use strict;
-use warnings;
-
-#use File::Copy;
-use Getopt::Std;
-
-my %opts;
-getopts('hb:', \%opts);
-if ($opts{h} or ! @ARGV) {
-    die "Usage: reindex [-b 0] t/*.t\n";
-}
-
-my $init = $opts{b};
-$init = 1 if not defined $init;
-
-my @files = map glob, @ARGV;
-for my $file (@files) {
-    next if -d $file or $file !~ /\.t_?$/;
-    reindex($file);
-}
-
-sub reindex {
-    my $file = $_[0];
-    open my $in, $file or
-        die "Can't open $file for reading: $!";
-    my @lines;
-    my $counter = $init;
-    my $changed;
-    while (<$in>) {
-        s/\r$//;
-        my $num;
-        s/ ^ === \s+ TEST \s+ (\d+)/$num=$1; "=== TEST " . $counter++/xie;
-        next if !defined $num;
-        if ($num != $counter-1) {
-            $changed++;
-        }
-    } continue {
-        push @lines, $_;
-    }
-    close $in;
-    my $text = join '', @lines;
-    $text =~ s/(?x) \n+ === \s+ TEST/\n\n\n\n=== TEST/ixsg;
-    $text =~ s/__(DATA|END)__\n+=== TEST/__${1}__\n\n=== TEST/;
-    #$text =~ s/\n+$/\n\n/s;
-    if (! $changed and $text eq join '', @lines) {
-        warn "reindex: $file:\tskipped.\n";
-        return;
-    }
-    #File::Copy::copy( $file, "$file.bak" );
-    open my $out, "> $file" or
-        die "Can't open $file for writing: $!";
-    binmode $out;
-    print $out $text;
-    close $out;
-
-    warn "reindex: $file:\tdone.\n";
-}
-
diff --git a/debian/modules/nginx-lua/valgrind.suppress b/debian/modules/nginx-lua/valgrind.suppress
index fe161e8..d0bcc56 100644
--- a/debian/modules/nginx-lua/valgrind.suppress
+++ b/debian/modules/nginx-lua/valgrind.suppress
@@ -149,3 +149,18 @@ fun:main
    fun:__libc_res_nquerydomain
    fun:__libc_res_nsearch
 }
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+   fun:main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   obj:*
+}

From 70cb0befe7496ee84ef10792d03e9f8adc07679b Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Aug 2017 15:16:06 +0300
Subject: [PATCH 207/600] Update OpenSSL 1.1 patch for v0.10.10

---
 .../patches/nginx-lua/openssl-1.1.0.patch     | 264 +++++-------------
 1 file changed, 69 insertions(+), 195 deletions(-)

diff --git a/debian/modules/patches/nginx-lua/openssl-1.1.0.patch b/debian/modules/patches/nginx-lua/openssl-1.1.0.patch
index a4e42e5..431031b 100644
--- a/debian/modules/patches/nginx-lua/openssl-1.1.0.patch
+++ b/debian/modules/patches/nginx-lua/openssl-1.1.0.patch
@@ -1,7 +1,7 @@
-From 2f281b9def161d195da4d795fa916b686ac9fd87 Mon Sep 17 00:00:00 2001
+From 525d5a550f5f256af01de1264358086a4cd1ac4a Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@ghedini.me>
 Date: Tue, 13 Sep 2016 22:31:32 +0100
-Subject: [PATCH 1/6] bugfix: ssl: don't use SSLv3 in tests
+Subject: [PATCH 1/4] bugfix: ssl: don't use SSLv3 in tests.
 
 OpenSSL 1.1.0 disables SSLv3 by default. In order to disable SSL session
 tickets set ssl_session_tickets to off instead.
@@ -11,7 +11,7 @@ tickets set ssl_session_tickets to off instead.
  2 files changed, 24 insertions(+), 26 deletions(-)
 
 diff --git a/t/142-ssl-session-store.t b/t/142-ssl-session-store.t
-index 5c9fad35..b5955199 100644
+index 73b6e197..260fe490 100644
 --- a/t/142-ssl-session-store.t
 +++ b/t/142-ssl-session-store.t
 @@ -32,7 +32,7 @@ __DATA__
@@ -140,7 +140,7 @@ index 5c9fad35..b5955199 100644
          server_tokens off;
      }
 diff --git a/t/143-ssl-session-fetch.t b/t/143-ssl-session-fetch.t
-index bd800ff8..54f7a4a3 100644
+index 701ead72..3626f0fb 100644
 --- a/t/143-ssl-session-fetch.t
 +++ b/t/143-ssl-session-fetch.t
 @@ -33,7 +33,7 @@ __DATA__
@@ -273,25 +273,25 @@ index bd800ff8..54f7a4a3 100644
          server_tokens off;
      }
 -- 
-2.11.0
+2.14.1
 
 
-From ad8df79bccef37a0bbfd8e40283f3b81cd867760 Mon Sep 17 00:00:00 2001
+From d308b44b3daf7702d9218e2a5620a89a5eca8389 Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@cloudflare.com>
 Date: Thu, 12 May 2016 13:12:23 +0100
-Subject: [PATCH 2/6] bugfix: ssl: do not access SSL_SESSION struct directly
+Subject: [PATCH 2/4] bugfix: ssl: do not access SSL_SESSION struct directly.
 
 In OpenSSL 1.1.0 it was made opaque.
 ---
  src/ngx_http_lua_socket_tcp.c |  15 ++---
- t/129-ssl-socket.t            | 152 +++++++++++++++++++++---------------------
- 2 files changed, 82 insertions(+), 85 deletions(-)
+ t/129-ssl-socket.t            | 148 +++++++++++++++++++++---------------------
+ 2 files changed, 80 insertions(+), 83 deletions(-)
 
 diff --git a/src/ngx_http_lua_socket_tcp.c b/src/ngx_http_lua_socket_tcp.c
-index 6db6e2da..18352bfe 100644
+index 382a94de..07164746 100644
 --- a/src/ngx_http_lua_socket_tcp.c
 +++ b/src/ngx_http_lua_socket_tcp.c
-@@ -1311,9 +1311,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
+@@ -1316,9 +1316,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
                      return 2;
                  }
  
@@ -303,7 +303,7 @@ index 6db6e2da..18352bfe 100644
              }
          }
  
-@@ -1577,9 +1576,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
+@@ -1583,9 +1582,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
      } else {
          *ud = ssl_session;
  
@@ -315,7 +315,7 @@ index 6db6e2da..18352bfe 100644
  
          /* set up the __gc metamethod */
          lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
-@@ -5356,9 +5354,8 @@ ngx_http_lua_ssl_free_session(lua_State *L)
+@@ -5365,9 +5363,8 @@ ngx_http_lua_ssl_free_session(lua_State *L)
  
      psession = lua_touserdata(L, 1);
      if (psession && *psession != NULL) {
@@ -328,7 +328,7 @@ index 6db6e2da..18352bfe 100644
          ngx_ssl_free_session(*psession);
      }
 diff --git a/t/129-ssl-socket.t b/t/129-ssl-socket.t
-index 9da9a5c2..98fb5a2b 100644
+index 1c3f7cd0..0cd1f52f 100644
 --- a/t/129-ssl-socket.t
 +++ b/t/129-ssl-socket.t
 @@ -108,10 +108,10 @@ sent http request: 59 bytes.
@@ -345,21 +345,16 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  --- no_error_log
  lua ssl server name:
-@@ -185,10 +185,10 @@ received: HTTP/1.1 401 Unauthorized
- close: 1 nil
+@@ -182,7 +182,7 @@ connected: 1
+ failed to do SSL handshake: handshake failed
  
  --- log_level: debug
 ---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 +--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
+ --- grep_error_log_out
  --- no_error_log
  lua ssl server name:
-@@ -262,10 +262,10 @@ received: HTTP/1.1 200 OK
+@@ -255,10 +255,10 @@ received: HTTP/1.1 302 Moved Temporarily
  close: 1 nil
  
  --- log_level: debug
@@ -372,8 +367,8 @@ index 9da9a5c2..98fb5a2b 100644
 +lua ssl free session: ([0-9A-F]+)
  $/
  --- error_log
- lua ssl server name: "iscribblet.org"
-@@ -349,13 +349,13 @@ sent http request: 59 bytes.
+ lua ssl server name: "openresty.org"
+@@ -343,13 +343,13 @@ sent http request: 56 bytes.
  received: HTTP/1.1 200 OK
  close: 1 nil
  
@@ -393,25 +388,25 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  
  --- error_log
-@@ -437,7 +437,7 @@ failed to do SSL handshake: certificate host mismatch
- failed to send http request: closed
+@@ -432,7 +432,7 @@ failed to send http request: closed
+ \z
  
  --- log_level: debug
 ---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 +--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
  --- grep_error_log_out
  --- error_log
- lua ssl server name: "blah.agentzh.org"
-@@ -517,7 +517,7 @@ failed to do SSL handshake: certificate host mismatch
- failed to send http request: closed
+ lua ssl server name: "blah.openresty.org"
+@@ -512,7 +512,7 @@ failed to send http request: closed
+ \z
  
  --- log_level: debug
 ---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
 +--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
  --- grep_error_log_out
  --- error_log
- lua ssl server name: "blah.agentzh.org"
-@@ -592,10 +592,10 @@ received: HTTP/1.1 200 OK
+ lua ssl server name: "blah.openresty.org"
+@@ -587,10 +587,10 @@ received: HTTP/1.1 404 Not Found
  close: 1 nil
  
  --- log_level: debug
@@ -425,7 +420,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  
  --- error_log
-@@ -677,10 +677,10 @@ received: HTTP/1.1 200 OK
+@@ -672,10 +672,10 @@ received: HTTP/1.1 302 Moved Temporarily
  close: 1 nil
  
  --- log_level: debug
@@ -439,7 +434,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  
  --- error_log
-@@ -759,7 +759,7 @@ failed to do SSL handshake: 20: unable to get local issuer certificate
+@@ -754,7 +754,7 @@ failed to do SSL handshake: 20: unable to get local issuer certificate
  failed to send http request: closed
  
  --- log_level: debug
@@ -447,8 +442,8 @@ index 9da9a5c2..98fb5a2b 100644
 +--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
  --- grep_error_log_out
  --- error_log
- lua ssl server name: "iscribblet.org"
-@@ -838,7 +838,7 @@ failed to do SSL handshake: 20: unable to get local issuer certificate
+ lua ssl server name: "openresty.org"
+@@ -833,7 +833,7 @@ failed to do SSL handshake: 20: unable to get local issuer certificate
  failed to send http request: closed
  
  --- log_level: debug
@@ -456,8 +451,8 @@ index 9da9a5c2..98fb5a2b 100644
 +--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
  --- grep_error_log_out
  --- error_log
- lua ssl server name: "iscribblet.org"
-@@ -928,10 +928,10 @@ sent http request: 59 bytes.
+ lua ssl server name: "openresty.org"
+@@ -923,10 +923,10 @@ sent http request: 59 bytes.
  received: HTTP/1.1 (?:200 OK|302 Found)
  close: 1 nil
  \z
@@ -471,7 +466,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  --- error_log
  lua ssl server name: "www.google.com"
-@@ -1018,7 +1018,7 @@ GET /t
+@@ -1013,7 +1013,7 @@ GET /t
  connected: 1
  failed to do SSL handshake: 20: unable to get local issuer certificate
  
@@ -480,7 +475,7 @@ index 9da9a5c2..98fb5a2b 100644
  --- grep_error_log_out
  --- error_log
  lua ssl server name: "www.google.com"
-@@ -1100,10 +1100,10 @@ received: HTTP/1.1 200 OK
+@@ -1095,10 +1095,10 @@ received: HTTP/1.1 302 Moved Temporarily
  close: 1 nil
  
  --- log_level: debug
@@ -494,7 +489,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  
  --- error_log
-@@ -1179,10 +1179,10 @@ received: HTTP/1.1 200 OK
+@@ -1174,10 +1174,10 @@ received: HTTP/1.1 302 Moved Temporarily
  close: 1 nil
  
  --- log_level: debug
@@ -507,8 +502,8 @@ index 9da9a5c2..98fb5a2b 100644
 +lua ssl free session: ([0-9A-F]+)
  $/
  --- error_log
- lua ssl server name: "iscribblet.org"
-@@ -1259,10 +1259,10 @@ received: HTTP/1.1 200 OK
+ lua ssl server name: "openresty.org"
+@@ -1254,10 +1254,10 @@ received: HTTP/1.1 302 Moved Temporarily
  close: 1 nil
  
  --- log_level: debug
@@ -521,8 +516,8 @@ index 9da9a5c2..98fb5a2b 100644
 +lua ssl free session: ([0-9A-F]+)
  $/
  --- error_log
- lua ssl server name: "iscribblet.org"
-@@ -1339,10 +1339,10 @@ received: HTTP/1.1 200 OK
+ lua ssl server name: "openresty.org"
+@@ -1334,10 +1334,10 @@ received: HTTP/1.1 302 Moved Temporarily
  close: 1 nil
  
  --- log_level: debug
@@ -535,8 +530,8 @@ index 9da9a5c2..98fb5a2b 100644
 +lua ssl free session: ([0-9A-F]+)
  $/
  --- error_log
- lua ssl server name: "iscribblet.org"
-@@ -1417,7 +1417,7 @@ failed to do SSL handshake: handshake failed
+ lua ssl server name: "openresty.org"
+@@ -1412,7 +1412,7 @@ failed to do SSL handshake: handshake failed
  failed to send http request: closed
  
  --- log_level: debug
@@ -545,7 +540,7 @@ index 9da9a5c2..98fb5a2b 100644
  --- grep_error_log_out
  --- error_log eval
  [
-@@ -1493,10 +1493,10 @@ ssl handshake: userdata
+@@ -1488,10 +1488,10 @@ ssl handshake: userdata
  set keepalive: 1 nil
  
  --- log_level: debug
@@ -559,7 +554,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  
  --- error_log
-@@ -1569,14 +1569,14 @@ ssl handshake: userdata
+@@ -1564,14 +1564,14 @@ ssl handshake: userdata
  set keepalive: 1 nil
  
  --- log_level: debug
@@ -581,7 +576,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  
  --- error_log
-@@ -1620,7 +1620,7 @@ hello world
+@@ -1615,7 +1615,7 @@ hello world
  --- response_body_like: 500 Internal Server Error
  --- error_code: 500
  --- log_level: debug
@@ -590,7 +585,7 @@ index 9da9a5c2..98fb5a2b 100644
  --- grep_error_log_out
  --- error_log
  attempt to call method 'sslhandshake' (a nil value)
-@@ -1719,10 +1719,10 @@ $::TestCertificateKey
+@@ -1714,10 +1714,10 @@ $::TestCertificateKey
  >>> test.crt
  $::TestCertificate"
  
@@ -604,7 +599,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  --- no_error_log
  lua ssl server name:
-@@ -1824,10 +1824,10 @@ $::TestCertificateKey
+@@ -1819,10 +1819,10 @@ $::TestCertificateKey
  >>> test.crt
  $::TestCertificate"
  
@@ -618,7 +613,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  --- error_log
  lua ssl server name: "test.com"
-@@ -1917,7 +1917,7 @@ failed to do SSL handshake: handshake failed
+@@ -1912,7 +1912,7 @@ failed to do SSL handshake: handshake failed
  ">>> test.crt
  $::TestCertificate"
  
@@ -627,7 +622,7 @@ index 9da9a5c2..98fb5a2b 100644
  --- grep_error_log_out
  --- error_log eval
  qr/SSL_do_handshake\(\) failed .*?unknown protocol/
-@@ -2016,7 +2016,7 @@ $::TestCertificate
+@@ -2011,7 +2011,7 @@ $::TestCertificate
  >>> test.crl
  $::TestCRL"
  
@@ -636,7 +631,7 @@ index 9da9a5c2..98fb5a2b 100644
  --- grep_error_log_out
  --- error_log
  lua ssl server name: "test.com"
-@@ -2095,12 +2095,12 @@ received: HTTP/1.1 200 OK
+@@ -2090,12 +2090,12 @@ received: HTTP/1.1 302 Moved Temporarily
  close: 1 nil
  
  --- log_level: debug
@@ -653,8 +648,8 @@ index 9da9a5c2..98fb5a2b 100644
 +lua ssl free session: ([0-9A-F]+)
  $/
  --- error_log
- lua ssl server name: "iscribblet.org"
-@@ -2154,7 +2154,7 @@ connected: 1
+ lua ssl server name: "openresty.org"
+@@ -2149,7 +2149,7 @@ connected: 1
  failed to do SSL handshake: timeout
  
  --- log_level: debug
@@ -662,8 +657,8 @@ index 9da9a5c2..98fb5a2b 100644
 +--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
  --- grep_error_log_out
  --- error_log
- lua ssl server name: "iscribblet.org"
-@@ -2226,7 +2226,7 @@ $::TestCertificateKey
+ lua ssl server name: "openresty.org"
+@@ -2221,7 +2221,7 @@ $::TestCertificateKey
  >>> test.crt
  $::TestCertificate"
  
@@ -672,7 +667,7 @@ index 9da9a5c2..98fb5a2b 100644
  --- grep_error_log_out
  --- no_error_log
  lua ssl server name:
-@@ -2297,10 +2297,10 @@ $::TestCertificateKey
+@@ -2292,10 +2292,10 @@ $::TestCertificateKey
  >>> test.crt
  $::TestCertificate"
  
@@ -686,7 +681,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  --- no_error_log
  lua ssl server name:
-@@ -2377,7 +2377,7 @@ $::TestCertificateKey
+@@ -2372,7 +2372,7 @@ $::TestCertificateKey
  >>> test.crt
  $::TestCertificate"
  
@@ -695,7 +690,7 @@ index 9da9a5c2..98fb5a2b 100644
  --- grep_error_log_out
  --- no_error_log
  lua ssl server name:
-@@ -2479,10 +2479,10 @@ $::TestCertificateKey
+@@ -2474,10 +2474,10 @@ $::TestCertificateKey
  >>> test.crt
  $::TestCertificate"
  
@@ -709,7 +704,7 @@ index 9da9a5c2..98fb5a2b 100644
  $/
  --- error_log
  --- no_error_log
-@@ -2575,7 +2575,7 @@ $::TestCertificateKey
+@@ -2570,7 +2570,7 @@ $::TestCertificateKey
  >>> test.crt
  $::TestCertificate"
  
@@ -719,43 +714,14 @@ index 9da9a5c2..98fb5a2b 100644
  --- error_log
  lua ssl certificate verify error: (18: self signed certificate)
 -- 
-2.11.0
+2.14.1
 
 
-From ee94698edd219607adbd4807f4e5173f6e51ad51 Mon Sep 17 00:00:00 2001
-From: Alessandro Ghedini <alessandro@cloudflare.com>
-Date: Thu, 12 May 2016 13:17:52 +0100
-Subject: [PATCH 3/6] bugfix: ssl: do not set tlsext_status_expected flag
-
-In OpenSSL 1.1.0 the SSL struct was made opaque, and setting this
-flag manually is not required anyway since OpenSSL already does that
-automatically when ngx_http_lua_ssl_empty_status_callback() returns
-"OK" (which is always), and an OCSP response has been set.
----
- src/ngx_http_lua_ssl_ocsp.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/ngx_http_lua_ssl_ocsp.c b/src/ngx_http_lua_ssl_ocsp.c
-index 3904aa8e..31b4f243 100644
---- a/src/ngx_http_lua_ssl_ocsp.c
-+++ b/src/ngx_http_lua_ssl_ocsp.c
-@@ -490,7 +490,6 @@ ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
- 
-     dd("set ocsp resp: resp_len=%d", (int) resp_len);
-     (void) SSL_set_tlsext_status_ocsp_resp(ssl_conn, p, resp_len);
--    ssl_conn->tlsext_status_expected = 1;
- 
-     return NGX_OK;
- 
--- 
-2.11.0
-
-
-From 9794d2d1ba577fe4dd8771d69d1ca4a688efe36c Mon Sep 17 00:00:00 2001
+From 473c121668c658140dffdbeb70aa7df1fc48d2a7 Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@cloudflare.com>
 Date: Fri, 10 Jun 2016 13:23:21 +0100
-Subject: [PATCH 4/6] bugfix: ssl: do not access SSL struct directly for
- tlsext_status_type
+Subject: [PATCH 3/4] bugfix: ssl: do not access SSL struct directly for
+ tlsext_status_type.
 
 In OpenSSL 1.1.0 it was made opaque, and a getter function was added.
 ---
@@ -779,14 +745,14 @@ index 31b4f243..9ec8b509 100644
          return NGX_DECLINED;
      }
 -- 
-2.11.0
+2.14.1
 
 
-From 4d1f5bdcdade5e3c6ac0c09446ac1dcd8b4006b0 Mon Sep 17 00:00:00 2001
+From 44988918835b8b41e51e75c1618250a560bc11ca Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@ghedini.me>
 Date: Tue, 13 Sep 2016 22:19:10 +0100
-Subject: [PATCH 5/6] bugfix: ssl: make SSL session callback build with OpenSSL
- 1.1.0
+Subject: [PATCH 4/4] bugfix: ssl: make SSL session callback build with OpenSSL
+ 1.1.0.
 
 ---
  src/ngx_http_lua_ssl_session_fetchby.c | 9 ++++++---
@@ -795,7 +761,7 @@ Subject: [PATCH 5/6] bugfix: ssl: make SSL session callback build with OpenSSL
  3 files changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/src/ngx_http_lua_ssl_session_fetchby.c b/src/ngx_http_lua_ssl_session_fetchby.c
-index 4c450b56..6212c60d 100644
+index 556b7320..5289cb92 100644
 --- a/src/ngx_http_lua_ssl_session_fetchby.c
 +++ b/src/ngx_http_lua_ssl_session_fetchby.c
 @@ -171,8 +171,11 @@ ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -839,7 +805,7 @@ index 5a6f96f5..50c6616d 100644
  
  
 diff --git a/src/ngx_http_lua_ssl_session_storeby.c b/src/ngx_http_lua_ssl_session_storeby.c
-index b5596bc7..85dbece1 100644
+index bae8273d..dc1fad9b 100644
 --- a/src/ngx_http_lua_ssl_session_storeby.c
 +++ b/src/ngx_http_lua_ssl_session_storeby.c
 @@ -172,6 +172,8 @@ int
@@ -868,97 +834,5 @@ index b5596bc7..85dbece1 100644
  
      dd("setting cctx");
 -- 
-2.11.0
-
-
-From 97ca52b469fcf4881c06ab26fbc46cbd37d8cf9f Mon Sep 17 00:00:00 2001
-From: Alessandro Ghedini <alessandro@ghedini.me>
-Date: Mon, 28 Nov 2016 21:01:00 +0000
-Subject: [PATCH 6/6] bugfix: ssl: don't use RC4 in tests
-
-RC4 ciphers are deprecated and disabled by default in OpenSSL 1.1.0.
----
- t/129-ssl-socket.t | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/t/129-ssl-socket.t b/t/129-ssl-socket.t
-index 98fb5a2b..1d9c5710 100644
---- a/t/129-ssl-socket.t
-+++ b/t/129-ssl-socket.t
-@@ -1129,7 +1129,7 @@ SSL reused session
-             sock:settimeout(2000)
- 
-             do
--                local ok, err = sock:connect("iscribblet.org", 443)
-+                local ok, err = sock:connect("openresty.org", 443)
-                 if not ok then
-                     ngx.say("failed to connect: ", err)
-                     return
-@@ -1137,7 +1137,7 @@ SSL reused session
- 
-                 ngx.say("connected: ", ok)
- 
--                local session, err = sock:sslhandshake(nil, "iscribblet.org")
-+                local session, err = sock:sslhandshake(nil, "openresty.org")
-                 if not session then
-                     ngx.say("failed to do SSL handshake: ", err)
-                     return
-@@ -1145,7 +1145,7 @@ SSL reused session
- 
-                 ngx.say("ssl handshake: ", type(session))
- 
--                local req = "GET / HTTP/1.1\\r\\nHost: iscribblet.org\\r\\nConnection: close\\r\\n\\r\\n"
-+                local req = "GET /en/ HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                 local bytes, err = sock:send(req)
-                 if not bytes then
-                     ngx.say("failed to send http request: ", err)
-@@ -1174,7 +1174,7 @@ GET /t
- --- response_body
- connected: 1
- ssl handshake: userdata
--sent http request: 59 bytes.
-+sent http request: 61 bytes.
- received: HTTP/1.1 200 OK
- close: 1 nil
- 
-@@ -1185,8 +1185,8 @@ qr/^lua ssl save session: ([0-9A-F]+)
- lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
--lua ssl server name: "iscribblet.org"
--SSL: TLSv1.2, cipher: "ECDHE-RSA-RC4-SHA SSLv3
-+lua ssl server name: "openresty.org"
-+SSL: TLSv1.2, cipher: "ECDHE-RSA-AES128-GCM-SHA256
- --- no_error_log
- SSL reused session
- [error]
-@@ -1199,7 +1199,7 @@ SSL reused session
- --- config
-     server_tokens off;
-     resolver $TEST_NGINX_RESOLVER;
--    lua_ssl_ciphers RC4-SHA;
-+    lua_ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256;
-     location /t {
-         #set $port 5000;
-         set $port $TEST_NGINX_MEMCACHED_PORT;
-@@ -1266,7 +1266,7 @@ lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- lua ssl server name: "iscribblet.org"
--SSL: TLSv1.2, cipher: "RC4-SHA SSLv3
-+SSL: TLSv1.2, cipher: "ECDHE-RSA-AES128-GCM-SHA256
- --- no_error_log
- SSL reused session
- [error]
-@@ -1346,7 +1346,7 @@ lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- lua ssl server name: "iscribblet.org"
--SSL: TLSv1, cipher: "ECDHE-RSA-RC4-SHA SSLv3
-+SSL: TLSv1
- --- no_error_log
- SSL reused session
- [error]
--- 
-2.11.0
+2.14.1
 

From 7614ff61a9d2985f19dea05d21bfd207bbd7d6e1 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Aug 2017 16:05:03 +0300
Subject: [PATCH 208/600] lua: Drop patch to build against nginx 1.11.11, now
 included upstream

---
 debian/modules/README.Modules-versions        |   1 -
 .../nginx-lua/build-nginx-1.1.11.patch        | 217 ------------------
 debian/modules/patches/nginx-lua/series       |   1 -
 3 files changed, 219 deletions(-)
 delete mode 100644 debian/modules/patches/nginx-lua/build-nginx-1.1.11.patch

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
index 6b581cd..ff5f63b 100644
--- a/debian/modules/README.Modules-versions
+++ b/debian/modules/README.Modules-versions
@@ -25,7 +25,6 @@ README for Modules versions
   Homepage: https://github.com/openresty/lua-nginx-module
   Version: v0.10.10
   Patch: openssl-1.1.0.patch
-  Patch: build-nginx-1.11.11.patch
   Patch: discover-luajit-2.1.patch
 
  nginx-upstream-fair
diff --git a/debian/modules/patches/nginx-lua/build-nginx-1.1.11.patch b/debian/modules/patches/nginx-lua/build-nginx-1.1.11.patch
deleted file mode 100644
index 597cbf8..0000000
--- a/debian/modules/patches/nginx-lua/build-nginx-1.1.11.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 0459a285ca0159d45e73da8bd1164edb5c57cde3 Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Wed, 22 Mar 2017 07:50:57 +0300
-Subject: [PATCH] feature: nginx 1.11.11+ can now build with this module.
-
-Note: nginx 1.11.11+ are still not an officially supported target yet.
-More work needed.
-
-Closes openresty/lua-nginx-module#1016
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- src/ngx_http_lua_common.h  |  6 ++++
- src/ngx_http_lua_headers.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
- src/ngx_http_lua_headers.h |  3 ++
- src/ngx_http_lua_module.c  | 13 ++++++++-
- 4 files changed, 89 insertions(+), 1 deletion(-)
-
-diff --git a/src/ngx_http_lua_common.h b/src/ngx_http_lua_common.h
-index 079a4dc3..f37d776a 100644
---- a/src/ngx_http_lua_common.h
-+++ b/src/ngx_http_lua_common.h
-@@ -199,6 +199,12 @@ struct ngx_http_lua_main_conf_s {
-                                                 of reqeusts */
-     ngx_uint_t           malloc_trim_req_count;
- 
-+#if nginx_version >= 1011011
-+    /* the following 2 fields are only used by ngx.req.raw_headers() for now */
-+    ngx_buf_t          **busy_buf_ptrs;
-+    ngx_int_t            busy_buf_ptr_count;
-+#endif
-+
-     unsigned             requires_header_filter:1;
-     unsigned             requires_body_filter:1;
-     unsigned             requires_capture_filter:1;
-diff --git a/src/ngx_http_lua_headers.c b/src/ngx_http_lua_headers.c
-index 23925984..6700ce80 100644
---- a/src/ngx_http_lua_headers.c
-+++ b/src/ngx_http_lua_headers.c
-@@ -26,6 +26,9 @@ static int ngx_http_lua_ngx_req_get_headers(lua_State *L);
- static int ngx_http_lua_ngx_req_header_clear(lua_State *L);
- static int ngx_http_lua_ngx_req_header_set(lua_State *L);
- static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
-+#if nginx_version >= 1011011
-+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-+#endif
- 
- 
- static int
-@@ -77,6 +80,11 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     size_t                       size;
-     ngx_buf_t                   *b, *first = NULL;
-     ngx_int_t                    i, j;
-+#if nginx_version >= 1011011
-+    ngx_buf_t                  **bb;
-+    ngx_chain_t                 *cl;
-+    ngx_http_lua_main_conf_t    *lmcf;
-+#endif
-     ngx_connection_t            *c;
-     ngx_http_request_t          *r, *mr;
-     ngx_http_connection_t       *hc;
-@@ -93,6 +101,10 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-         return luaL_error(L, "no request object found");
-     }
- 
-+#if nginx_version >= 1011011
-+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-+#endif
-+
-     ngx_http_lua_check_fake_request(L, r);
- 
-     mr = r->main;
-@@ -109,8 +121,13 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     dd("hc->nbusy: %d", (int) hc->nbusy);
- 
-     if (hc->nbusy) {
-+#if nginx_version >= 1011011
-+        dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
-+           hc->busy->buf->last, hc->busy->buf->end);
-+#else
-         dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos,
-            hc->busy[0]->last, hc->busy[0]->end);
-+#endif
-     }
- 
-     dd("request line: %p %p", mr->request_line.data,
-@@ -146,9 +163,37 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     dd("size: %d", (int) size);
- 
-     if (hc->nbusy) {
-+#if nginx_version >= 1011011
-+        if (hc->nbusy > lmcf->busy_buf_ptr_count) {
-+            if (lmcf->busy_buf_ptrs) {
-+                ngx_free(lmcf->busy_buf_ptrs);
-+            }
-+
-+            lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
-+                                            r->connection->log);
-+
-+            if (lmcf->busy_buf_ptrs == NULL) {
-+                return luaL_error(L, "no memory");
-+            }
-+
-+            lmcf->busy_buf_ptr_count = hc->nbusy;
-+        }
-+
-+        bb = lmcf->busy_buf_ptrs;
-+        for (cl = hc->busy; cl; cl = cl->next) {
-+            *bb++ = cl->buf;
-+        }
-+#endif
-         b = NULL;
-+
-+#if nginx_version >= 1011011
-+        bb = lmcf->busy_buf_ptrs;
-+        for (i = hc->nbusy; i > 0; i--) {
-+            b = bb[i - 1];
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
-                b->start);
-@@ -223,8 +268,15 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     }
- 
-     if (hc->nbusy) {
-+
-+#if nginx_version >= 1011011
-+        bb = lmcf->busy_buf_ptrs;
-+        for (i = hc->nbusy - 1; i >= 0; i--) {
-+            b = bb[i];
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             if (!found) {
-                 if (b != first) {
-@@ -1431,4 +1483,20 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
- #endif /* NGX_LUA_NO_FFI_API */
- 
- 
-+#if nginx_version >= 1011011
-+void
-+ngx_http_lua_ngx_raw_header_cleanup(void *data)
-+{
-+    ngx_http_lua_main_conf_t  *lmcf;
-+
-+    lmcf = (ngx_http_lua_main_conf_t *) data;
-+
-+    if (lmcf->busy_buf_ptrs) {
-+        ngx_free(lmcf->busy_buf_ptrs);
-+        lmcf->busy_buf_ptrs = NULL;
-+    }
-+}
-+#endif
-+
-+
- /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
-diff --git a/src/ngx_http_lua_headers.h b/src/ngx_http_lua_headers.h
-index 39f1114c..ee4d21c1 100644
---- a/src/ngx_http_lua_headers.h
-+++ b/src/ngx_http_lua_headers.h
-@@ -15,6 +15,9 @@
- 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_create_headers_metatable(ngx_log_t *log, lua_State *L);
-+#if nginx_version >= 1011011
-+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-+#endif
- 
- 
- #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */
-diff --git a/src/ngx_http_lua_module.c b/src/ngx_http_lua_module.c
-index 3dc2817b..875f9334 100644
---- a/src/ngx_http_lua_module.c
-+++ b/src/ngx_http_lua_module.c
-@@ -28,6 +28,7 @@
- #include "ngx_http_lua_ssl_certby.h"
- #include "ngx_http_lua_ssl_session_storeby.h"
- #include "ngx_http_lua_ssl_session_fetchby.h"
-+#include "ngx_http_lua_headers.h"
- 
- 
- static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
-@@ -624,7 +625,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
-     volatile ngx_cycle_t       *saved_cycle;
-     ngx_http_core_main_conf_t  *cmcf;
-     ngx_http_lua_main_conf_t   *lmcf;
--#ifndef NGX_LUA_NO_FFI_API
-+#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
-     ngx_pool_cleanup_t         *cln;
- #endif
- 
-@@ -716,6 +717,16 @@ ngx_http_lua_init(ngx_conf_t *cf)
-     cln->handler = ngx_http_lua_sema_mm_cleanup;
- #endif
- 
-+#if nginx_version >= 1011011
-+    cln = ngx_pool_cleanup_add(cf->pool, 0);
-+    if (cln == NULL) {
-+        return NGX_ERROR;
-+    }
-+
-+    cln->data = lmcf;
-+    cln->handler = ngx_http_lua_ngx_raw_header_cleanup;
-+#endif
-+
-     if (lmcf->lua == NULL) {
-         dd("initializing lua vm");
- 
--- 
-2.11.0
-
diff --git a/debian/modules/patches/nginx-lua/series b/debian/modules/patches/nginx-lua/series
index 8edeaf5..7d0f424 100644
--- a/debian/modules/patches/nginx-lua/series
+++ b/debian/modules/patches/nginx-lua/series
@@ -1,3 +1,2 @@
 openssl-1.1.0.patch
-build-nginx-1.1.11.patch
 discover-luajit-2.1.patch

From e60711fcc72e83d560fa250fba484f3d541cb5b4 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Aug 2017 16:35:53 +0300
Subject: [PATCH 209/600] tests: Fix race between reload and curl's http
 request

Restart nginx to make sure it uses the new configuration.
---
 debian/tests/ec-x25519 | 2 +-
 debian/tests/lua       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/tests/ec-x25519 b/debian/tests/ec-x25519
index a01bc0d..edd4e2f 100644
--- a/debian/tests/ec-x25519
+++ b/debian/tests/ec-x25519
@@ -17,5 +17,5 @@ server {
 EOF
 
 nginx -t
-nginx -s reload
+invoke-rc.d nginx restart
 curl --insecure --silent --fail -o /dev/null -w "response_code: %{http_code}\n" https://127.0.0.1/
diff --git a/debian/tests/lua b/debian/tests/lua
index 396d8a9..82c1820 100644
--- a/debian/tests/lua
+++ b/debian/tests/lua
@@ -14,5 +14,5 @@ server {
 EOF
 
 nginx -t
-nginx -s reload
+invoke-rc.d nginx restart
 curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/ping

From 2005e7e35d4c99863c55019cca2a4675f57d8ee0 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Aug 2017 16:53:56 +0300
Subject: [PATCH 210/600] Explicitly disable autoreconf (debhelper 10)

Since debhelper 10 systemd & autoreconf are enabled by default, we need
systemd and not autoconf so we reverse the logic.

While at it, drop not needed autotools dependency.
---
 debian/control | 3 +--
 debian/rules   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index ccb769d..9d46418 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@lists.alioth.debian.
 Uploaders: Kartik Mistry <kartik@debian.org>,
            Michael Lustfield <michael@lustfield.net>,
            Christos Trochalakis <ctrochalakis@debian.org>
-Build-Depends: autotools-dev,
-               debhelper (>= 10),
+Build-Depends: debhelper (>= 10),
                po-debconf,
                dh-systemd (>= 1.5),
                dpkg-dev (>= 1.15.5),
diff --git a/debian/rules b/debian/rules
index 3951529..a852d02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,7 +138,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
 
 %:
-	dh $@ --with systemd
+	dh $@ --without autoreconf
 
 override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour))
 override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour))

From 22aae236484ddf9ace687ee7a846e8420e9927a6 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Aug 2017 17:03:49 +0300
Subject: [PATCH 211/600] Drop Upstart configuration

Upstart was removed in Debian stretch
---
 debian/nginx-common.nginx.upstart | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 debian/nginx-common.nginx.upstart

diff --git a/debian/nginx-common.nginx.upstart b/debian/nginx-common.nginx.upstart
deleted file mode 100644
index 317bcb0..0000000
--- a/debian/nginx-common.nginx.upstart
+++ /dev/null
@@ -1,16 +0,0 @@
-description "nginx - small, powerful, scalable web/proxy server"
-
-start on filesystem and static-network-up
-stop on runlevel [016]
-
-expect fork
-respawn
-
-pre-start script
-	[ -x /usr/sbin/nginx ] || { stop; exit 0; }
-	/usr/sbin/nginx -q -t -g 'daemon on; master_process on;' || { stop; exit 0; }
-end script
-
-exec /usr/sbin/nginx -g 'daemon on; master_process on;'
-
-pre-stop exec /usr/sbin/nginx -s quit

From 9ad7cddbce6fae45691b58421e362c579a4e4370 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Mon, 28 Aug 2017 17:11:10 +0300
Subject: [PATCH 212/600] Bump Standards to 4.1.0

 o Switch all packages to Priority optional, extra is considered
   deprecated and should be treated as equivalent to optional.

   nginx-light & extras now inherit optional from the source package.
---
 debian/control | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 9d46418..e7a598a 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 10),
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 4.0.0
+Standards-Version: 4.1.0
 Homepage: http://nginx.net
 Vcs-Git: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git
@@ -111,7 +111,6 @@ Description: nginx web/proxy server (standard version)
 
 Package: nginx-light
 Architecture: any
-Priority: extra
 Depends: libnginx-mod-http-echo (= ${binary:Version}),
          nginx-common (= ${source:Version}),
          ${misc:Depends},
@@ -139,7 +138,6 @@ Description: nginx web/proxy server (basic version)
 
 Package: nginx-extras
 Architecture: any
-Priority: extra
 Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-cache-purge (= ${binary:Version}),
          libnginx-mod-http-dav-ext (= ${binary:Version}),

From ee4f08f8b48651eb584373af0bb71afd5a4d3c1d Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 29 Aug 2017 10:50:48 +0300
Subject: [PATCH 213/600] Release 1.13.4-1

---
 debian/changelog | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7d350cf..3e671b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+nginx (1.13.4-1) unstable; urgency=medium
+
+  * New upstream version 1.13.4
+  * nginx-lua:
+    + Add a simple lua autopkgtest
+    + Discover LuaJIT 2.1 (FTBFS) (Closes: #873319)
+    + Update to v0.10.10
+    + Update OpenSSL 1.1 patch
+    + Drop patch to build against Nginx 1.11.11, now included upstream
+  * tests: Fix race between reload and curl's http request
+  * Explicitly disable autoreconf (debhelper 10)
+  * Drop Upstart configuration
+  * Bump Standards to 4.1.0
+    + Switch all packages to Priority optional, extra is considered deprecated
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Tue, 29 Aug 2017 10:49:03 +0300
+
 nginx (1.13.3-1) unstable; urgency=high
 
   * New upstream version 1.13.3.

From 3ebf96c773e9685d526ebe77daaf0baa91e73e04 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 29 Aug 2017 13:04:11 +0300
Subject: [PATCH 214/600] doc: Improve example WordPress configuration

Closes: #863343
Thanks: Larry Holish
---
 debian/help/examples/wordpress | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/help/examples/wordpress b/debian/help/examples/wordpress
index 6faf918..2d4c0ab 100644
--- a/debian/help/examples/wordpress
+++ b/debian/help/examples/wordpress
@@ -34,8 +34,8 @@ server {
 	}
  
 	# This location block protects against a known attack. It happens if
-	# the attacker uploads a non-php file and attempts to run it as a
-	# php file on the server.
+	# the attacker uploads a non-PHP file and attempts to run it as a
+	# PHP file on the server.
 	location ~ \..*/.*\.php$ {
 		return 403;
 	}
@@ -43,7 +43,7 @@ server {
 	# This is our primary location block. The try_files directive will
 	# attempt to serve the data in the order listed. First try the exact
 	# request (such as an image or text file). If it doesn't exist, see if
-	# the directory exists. If not, then we move to the last options which
+	# the directory exists. If not, then we move to the last option which
 	# passes the request to /index.php with the requested query.
 	location / {
 		try_files $uri $uri/ /index.php?q=$uri&$args;
@@ -51,7 +51,7 @@ server {
  
 	# If a PHP file is served, this block will handle the request. This block
 	# works on the assumption you are using php-cgi listening on /tmp/phpcgi.socket.
-	# Please see the php example (usr/share/doc/nginx/exmaples/php) for more
+	# Please see the PHP example (/usr/share/doc/nginx-doc/php) for more
 	# information about setting up PHP.
 	# NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
 	location ~ \.php$ {
@@ -61,12 +61,11 @@ server {
 		fastcgi_intercept_errors on;
 		fastcgi_pass unix:/tmp/phpcgi.socket;
 	}
- 
-	# As mentioned above, Nignx is king of static. If we're serving a static
-	# file that ends with one of the following extensions, it is best to set
-	# a very high expires time. This will generate fewer requests for the
-	# file. These requests will be logged if found, but not if they don't
-	# exist.
+
+	# If we're serving a static file that ends with one of the following
+	# extensions, it is best to set a very high expires time. This will
+	# generate fewer requests for the file. These requests will be logged if
+	# found, but not if they don't exist.
 	location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
 		expires max;
 		log_not_found off;

From 3582062c0e7359e6fe9bd08f6b0cea332491554c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Tue, 5 Sep 2017 10:29:14 +0300
Subject: [PATCH 215/600] Remove upstart configuration file

Close: #874319
---
 debian/nginx-common.postinst | 4 ++++
 debian/nginx-common.postrm   | 4 ++++
 debian/nginx-common.preinst  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/debian/nginx-common.postinst b/debian/nginx-common.postinst
index 2b176f8..f996cec 100644
--- a/debian/nginx-common.postinst
+++ b/debian/nginx-common.postinst
@@ -13,6 +13,10 @@ dpkg-maintscript-helper rm_conffile \
 dpkg-maintscript-helper rm_conffile \
 	          /etc/nginx/naxsi-ui.conf       1.6.2-2~ -- "$@"
 
+# Handle upstart removal
+dpkg-maintscript-helper rm_conffile \
+	          /etc/init/nginx.conf           1.13.4-2~ -- "$@"
+
 case "$1" in
   configure)
     logdir="/var/log/nginx"
diff --git a/debian/nginx-common.postrm b/debian/nginx-common.postrm
index b0f2e30..9aa06d0 100644
--- a/debian/nginx-common.postrm
+++ b/debian/nginx-common.postrm
@@ -11,6 +11,10 @@ dpkg-maintscript-helper rm_conffile \
 dpkg-maintscript-helper rm_conffile \
 	          /etc/nginx/naxsi-ui.conf       1.6.2-2~ -- "$@"
 
+# Handle upstart removal
+dpkg-maintscript-helper rm_conffile \
+	          /etc/init/nginx.conf           1.13.4-2~ -- "$@"
+
 case "$1" in
   purge)
     rm -rf /var/lib/nginx /var/log/nginx /etc/nginx
diff --git a/debian/nginx-common.preinst b/debian/nginx-common.preinst
index 037c80f..0d2737f 100644
--- a/debian/nginx-common.preinst
+++ b/debian/nginx-common.preinst
@@ -11,6 +11,10 @@ dpkg-maintscript-helper rm_conffile \
 dpkg-maintscript-helper rm_conffile \
 	  /etc/nginx/naxsi-ui.conf       1.6.2-2~ -- "$@"
 
+# Handle upstart removal
+dpkg-maintscript-helper rm_conffile \
+	  /etc/init/nginx.conf           1.13.4-2~ -- "$@"
+
 case "$1" in
   install)
     # If we are doing a fresh install, then these files are no longer needed.

From 2a7340c231ffc083156ad1af0691c3f25309ecc4 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 6 Sep 2017 10:06:33 +0300
Subject: [PATCH 216/600] New upstream version 1.13.5

---
 CHANGES                                       | 15 +++++
 CHANGES.ru                                    | 15 +++++
 src/core/nginx.h                              |  4 +-
 src/core/ngx_conf_file.c                      |  1 +
 src/core/ngx_regex.c                          |  4 +-
 src/event/ngx_event.h                         |  4 +-
 src/event/ngx_event_openssl.c                 | 56 ++++++++++++++++---
 src/event/ngx_event_openssl.h                 |  2 +
 src/http/modules/ngx_http_geo_module.c        |  3 +-
 .../modules/ngx_http_range_filter_module.c    | 17 +++---
 src/http/modules/ngx_http_scgi_module.c       |  2 +-
 .../modules/ngx_http_secure_link_module.c     |  3 +-
 src/http/modules/ngx_http_ssl_module.c        |  4 ++
 src/http/modules/ngx_http_uwsgi_module.c      |  8 +--
 src/http/ngx_http_upstream.c                  | 20 +------
 src/os/unix/ngx_files.c                       |  1 +
 src/stream/ngx_stream_geo_module.c            |  3 +-
 src/stream/ngx_stream_ssl_module.c            |  4 ++
 18 files changed, 119 insertions(+), 47 deletions(-)

diff --git a/CHANGES b/CHANGES
index cc22571..e46199b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,19 @@
 
+Changes with nginx 1.13.5                                        05 Sep 2017
+
+    *) Feature: the $ssl_client_escaped_cert variable.
+
+    *) Bugfix: the "ssl_session_ticket_key" directive and the "include"
+       parameter of the "geo" directive did not work on Windows.
+
+    *) Bugfix: incorrect response length was returned on 32-bit platforms
+       when requesting more than 4 gigabytes with multiple ranges.
+
+    *) Bugfix: the "expires modified" directive and processing of the
+       "If-Range" request header line did not use the response last
+       modification time if proxying without caching was used.
+
+
 Changes with nginx 1.13.4                                        08 Aug 2017
 
     *) Feature: the ngx_http_mirror_module.
diff --git a/CHANGES.ru b/CHANGES.ru
index f466c4d..73c4164 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,19 @@
 
+Изменения в nginx 1.13.5                                          05.09.2017
+
+    *) Добавление: переменная $ssl_client_escaped_cert.
+
+    *) Исправление: директива ssl_session_ticket_key и параметр include
+       директивы geo не работали на Windows.
+
+    *) Исправление: на 32-битных платформах при запросе более 4 гигабайт с
+       помощью нескольких диапазонов возвращалась некорректная длина ответа.
+
+    *) Исправление: директива "expires modified" и обработка строки If-Range
+       заголовка запроса не учитывали время последнего изменения ответа,
+       если использовалось проксирование без кэширования.
+
+
 Изменения в nginx 1.13.4                                          08.08.2017
 
     *) Добавление: модуль ngx_http_mirror_module.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 3649945..a3c0ef8 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013004
-#define NGINX_VERSION      "1.13.4"
+#define nginx_version      1013005
+#define NGINX_VERSION      "1.13.5"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index ce8c602..fb28a5a 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -178,6 +178,7 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
         /* open configuration file */
 
         fd = ngx_open_file(filename->data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
+
         if (fd == NGX_INVALID_FILE) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
                                ngx_open_file_n " \"%s\" failed",
diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c
index 9939dce..52169f6 100644
--- a/src/core/ngx_regex.c
+++ b/src/core/ngx_regex.c
@@ -262,7 +262,7 @@ ngx_pcre_free_studies(void *data)
     part = &studies->part;
     elts = part->elts;
 
-    for (i = 0 ; /* void */ ; i++) {
+    for (i = 0; /* void */ ; i++) {
 
         if (i >= part->nelts) {
             if (part->next == NULL) {
@@ -326,7 +326,7 @@ ngx_regex_module_init(ngx_cycle_t *cycle)
     part = &ngx_pcre_studies->part;
     elts = part->elts;
 
-    for (i = 0 ; /* void */ ; i++) {
+    for (i = 0; /* void */ ; i++) {
 
         if (i >= part->nelts) {
             if (part->next == NULL) {
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 053bd16..19fec68 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -152,12 +152,12 @@ struct ngx_event_aio_s {
     ngx_event_handler_pt       handler;
     ngx_file_t                *file;
 
+    ngx_fd_t                   fd;
+
 #if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
     ssize_t                  (*preload_handler)(ngx_buf_t *file);
 #endif
 
-    ngx_fd_t                   fd;
-
 #if (NGX_HAVE_EVENTFD)
     int64_t                    res;
 #endif
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 07646b6..88a6dbe 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -924,6 +924,7 @@ ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file)
     cln->data = passwords;
 
     fd = ngx_open_file(file->data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
+
     if (fd == NGX_INVALID_FILE) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
                            ngx_open_file_n " \"%s\" failed", file->data);
@@ -2905,7 +2906,9 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
         file.name = path[i];
         file.log = cf->log;
 
-        file.fd = ngx_open_file(file.name.data, NGX_FILE_RDONLY, 0, 0);
+        file.fd = ngx_open_file(file.name.data, NGX_FILE_RDONLY,
+                                NGX_FILE_OPEN, 0);
+
         if (file.fd == NGX_INVALID_FILE) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
                                ngx_open_file_n " \"%V\" failed", &file.name);
@@ -3548,13 +3551,22 @@ ngx_ssl_get_server_name(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 {
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
 
-    const char  *servername;
+    size_t       len;
+    const char  *name;
+
+    name = SSL_get_servername(c->ssl->connection, TLSEXT_NAMETYPE_host_name);
+
+    if (name) {
+        len = ngx_strlen(name);
+
+        s->len = len;
+        s->data = ngx_pnalloc(pool, len);
+        if (s->data == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(s->data, name, len);
 
-    servername = SSL_get_servername(c->ssl->connection,
-                                    TLSEXT_NAMETYPE_host_name);
-    if (servername) {
-        s->data = (u_char *) servername;
-        s->len = ngx_strlen(servername);
         return NGX_OK;
     }
 
@@ -3659,6 +3671,36 @@ ngx_ssl_get_certificate(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 }
 
 
+ngx_int_t
+ngx_ssl_get_escaped_certificate(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s)
+{
+    ngx_str_t  cert;
+    uintptr_t  n;
+
+    if (ngx_ssl_get_raw_certificate(c, pool, &cert) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (cert.len == 0) {
+        s->len = 0;
+        return NGX_OK;
+    }
+
+    n = ngx_escape_uri(NULL, cert.data, cert.len, NGX_ESCAPE_URI_COMPONENT);
+
+    s->len = cert.len + n * 2;
+    s->data = ngx_pnalloc(pool, s->len);
+    if (s->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_escape_uri(s->data, cert.data, cert.len, NGX_ESCAPE_URI_COMPONENT);
+
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_ssl_get_subject_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 {
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 2a14980..b9a3a96 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -212,6 +212,8 @@ ngx_int_t ngx_ssl_get_raw_certificate(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_certificate(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
+ngx_int_t ngx_ssl_get_escaped_certificate(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
 ngx_int_t ngx_ssl_get_subject_dn(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_issuer_dn(ngx_connection_t *c, ngx_pool_t *pool,
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 46a8d7c..8262c9d 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -1400,7 +1400,8 @@ ngx_http_geo_include_binary_base(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
     file.name = *name;
     file.log = cf->log;
 
-    file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, 0, 0);
+    file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
+
     if (file.fd == NGX_INVALID_FILE) {
         err = ngx_errno;
         if (err != NGX_ENOENT) {
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index 6256b13..819c5c9 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -463,23 +463,24 @@ static ngx_int_t
 ngx_http_range_multipart_header(ngx_http_request_t *r,
     ngx_http_range_filter_ctx_t *ctx)
 {
-    size_t              len;
+    off_t               len;
+    size_t              size;
     ngx_uint_t          i;
     ngx_http_range_t   *range;
     ngx_atomic_uint_t   boundary;
 
-    len = sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN
-          + sizeof(CRLF "Content-Type: ") - 1
-          + r->headers_out.content_type.len
-          + sizeof(CRLF "Content-Range: bytes ") - 1;
+    size = sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN
+           + sizeof(CRLF "Content-Type: ") - 1
+           + r->headers_out.content_type.len
+           + sizeof(CRLF "Content-Range: bytes ") - 1;
 
     if (r->headers_out.content_type_len == r->headers_out.content_type.len
         && r->headers_out.charset.len)
     {
-        len += sizeof("; charset=") - 1 + r->headers_out.charset.len;
+        size += sizeof("; charset=") - 1 + r->headers_out.charset.len;
     }
 
-    ctx->boundary_header.data = ngx_pnalloc(r->pool, len);
+    ctx->boundary_header.data = ngx_pnalloc(r->pool, size);
     if (ctx->boundary_header.data == NULL) {
         return NGX_ERROR;
     }
@@ -569,7 +570,7 @@ ngx_http_range_multipart_header(ngx_http_request_t *r,
                                      - range[i].content_range.data;
 
         len += ctx->boundary_header.len + range[i].content_range.len
-                                    + (size_t) (range[i].end - range[i].start);
+                                             + (range[i].end - range[i].start);
     }
 
     r->headers_out.content_length_n = len;
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 9204af4..3fb227b 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -819,7 +819,7 @@ ngx_http_scgi_create_request(ngx_http_request_t *r)
             key = e.pos;
 #endif
             code = *(ngx_http_script_code_pt *) e.ip;
-            code((ngx_http_script_engine_t *) & e);
+            code((ngx_http_script_engine_t *) &e);
 
 #if (NGX_DEBUG)
             val = e.pos;
diff --git a/src/http/modules/ngx_http_secure_link_module.c b/src/http/modules/ngx_http_secure_link_module.c
index 907ba6e..536e09a 100644
--- a/src/http/modules/ngx_http_secure_link_module.c
+++ b/src/http/modules/ngx_http_secure_link_module.c
@@ -107,7 +107,7 @@ ngx_http_secure_link_variable(ngx_http_request_t *r,
     ngx_md5_t                     md5;
     ngx_http_secure_link_ctx_t   *ctx;
     ngx_http_secure_link_conf_t  *conf;
-    u_char                        hash_buf[16], md5_buf[16];
+    u_char                        hash_buf[18], md5_buf[16];
 
     conf = ngx_http_get_module_loc_conf(r, ngx_http_secure_link_module);
 
@@ -154,7 +154,6 @@ ngx_http_secure_link_variable(ngx_http_request_t *r,
         goto not_found;
     }
 
-    hash.len = 16;
     hash.data = hash_buf;
 
     if (ngx_decode_base64url(&hash, &val) != NGX_OK) {
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 4370275..7d62176 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -299,6 +299,10 @@ static ngx_http_variable_t  ngx_http_ssl_vars[] = {
       (uintptr_t) ngx_ssl_get_raw_certificate,
       NGX_HTTP_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_client_escaped_cert"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_escaped_certificate,
+      NGX_HTTP_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_client_s_dn"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_subject_dn, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index a2bec4c..124da4d 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -865,7 +865,7 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
             lcode = *(ngx_http_script_len_code_pt *) le.ip;
             skip_empty = lcode(&le);
 
-            for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode (&le)) {
+            for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) {
                 lcode = *(ngx_http_script_len_code_pt *) le.ip;
             }
             le.ip += sizeof(uintptr_t);
@@ -990,7 +990,7 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
         while (*(uintptr_t *) le.ip) {
 
             lcode = *(ngx_http_script_len_code_pt *) le.ip;
-            key_len = (u_char) lcode (&le);
+            key_len = (u_char) lcode(&le);
 
             lcode = *(ngx_http_script_len_code_pt *) le.ip;
             skip_empty = lcode(&le);
@@ -1018,14 +1018,14 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
             *e.pos++ = (u_char) ((key_len >> 8) & 0xff);
 
             code = *(ngx_http_script_code_pt *) e.ip;
-            code((ngx_http_script_engine_t *) & e);
+            code((ngx_http_script_engine_t *) &e);
 
             *e.pos++ = (u_char) (val_len & 0xff);
             *e.pos++ = (u_char) ((val_len >> 8) & 0xff);
 
             while (*(uintptr_t *) e.ip) {
                 code = *(ngx_http_script_code_pt *) e.ip;
-                code((ngx_http_script_engine_t *) & e);
+                code((ngx_http_script_engine_t *) &e);
             }
 
             e.ip += sizeof(uintptr_t);
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 6a2b322..73a5882 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -4390,15 +4390,8 @@ ngx_http_upstream_process_last_modified(ngx_http_request_t *r,
     u = r->upstream;
 
     u->headers_in.last_modified = h;
-
-#if (NGX_HTTP_CACHE)
-
-    if (u->cacheable) {
-        u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data,
-                                                               h->value.len);
-    }
-
-#endif
+    u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data,
+                                                           h->value.len);
 
     return NGX_OK;
 }
@@ -4940,15 +4933,8 @@ ngx_http_upstream_copy_last_modified(ngx_http_request_t *r, ngx_table_elt_t *h,
     *ho = *h;
 
     r->headers_out.last_modified = ho;
-
-#if (NGX_HTTP_CACHE)
-
-    if (r->upstream->cacheable) {
-        r->headers_out.last_modified_time =
+    r->headers_out.last_modified_time =
                                     r->upstream->headers_in.last_modified_time;
-    }
-
-#endif
 
     return NGX_OK;
 }
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 7fbb7c9..482d327 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -620,6 +620,7 @@ ngx_create_file_mapping(ngx_file_mapping_t *fm)
 {
     fm->fd = ngx_open_file(fm->name, NGX_FILE_RDWR, NGX_FILE_TRUNCATE,
                            NGX_FILE_DEFAULT_ACCESS);
+
     if (fm->fd == NGX_INVALID_FILE) {
         ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
                       ngx_open_file_n " \"%s\" failed", fm->name);
diff --git a/src/stream/ngx_stream_geo_module.c b/src/stream/ngx_stream_geo_module.c
index 2204546..632fa5a 100644
--- a/src/stream/ngx_stream_geo_module.c
+++ b/src/stream/ngx_stream_geo_module.c
@@ -1326,7 +1326,8 @@ ngx_stream_geo_include_binary_base(ngx_conf_t *cf,
     file.name = *name;
     file.log = cf->log;
 
-    file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, 0, 0);
+    file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
+
     if (file.fd == NGX_INVALID_FILE) {
         err = ngx_errno;
         if (err != NGX_ENOENT) {
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 010b98b..1e9973f 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -249,6 +249,10 @@ static ngx_stream_variable_t  ngx_stream_ssl_vars[] = {
       (uintptr_t) ngx_ssl_get_raw_certificate,
       NGX_STREAM_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_client_escaped_cert"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_escaped_certificate,
+      NGX_STREAM_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_client_s_dn"), NULL, ngx_stream_ssl_variable,
       (uintptr_t) ngx_ssl_get_subject_dn, NGX_STREAM_VAR_CHANGEABLE, 0 },
 

From 1c5a8493cae9ec2fd6f1e258d077bea1a7c01475 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 6 Sep 2017 10:09:50 +0300
Subject: [PATCH 217/600] Adjust rm_conffile to the new version

Gbp-Dch: Ignore
---
 debian/nginx-common.postinst | 2 +-
 debian/nginx-common.postrm   | 2 +-
 debian/nginx-common.preinst  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/nginx-common.postinst b/debian/nginx-common.postinst
index f996cec..f83032d 100644
--- a/debian/nginx-common.postinst
+++ b/debian/nginx-common.postinst
@@ -15,7 +15,7 @@ dpkg-maintscript-helper rm_conffile \
 
 # Handle upstart removal
 dpkg-maintscript-helper rm_conffile \
-	          /etc/init/nginx.conf           1.13.4-2~ -- "$@"
+	          /etc/init/nginx.conf           1.13.5-1~ -- "$@"
 
 case "$1" in
   configure)
diff --git a/debian/nginx-common.postrm b/debian/nginx-common.postrm
index 9aa06d0..d6f313a 100644
--- a/debian/nginx-common.postrm
+++ b/debian/nginx-common.postrm
@@ -13,7 +13,7 @@ dpkg-maintscript-helper rm_conffile \
 
 # Handle upstart removal
 dpkg-maintscript-helper rm_conffile \
-	          /etc/init/nginx.conf           1.13.4-2~ -- "$@"
+	          /etc/init/nginx.conf           1.13.5-1~ -- "$@"
 
 case "$1" in
   purge)
diff --git a/debian/nginx-common.preinst b/debian/nginx-common.preinst
index 0d2737f..27f21da 100644
--- a/debian/nginx-common.preinst
+++ b/debian/nginx-common.preinst
@@ -13,7 +13,7 @@ dpkg-maintscript-helper rm_conffile \
 
 # Handle upstart removal
 dpkg-maintscript-helper rm_conffile \
-	  /etc/init/nginx.conf           1.13.4-2~ -- "$@"
+	  /etc/init/nginx.conf           1.13.5-1~ -- "$@"
 
 case "$1" in
   install)

From cacbf319dba8b15bd02710ad5065516892148a5a Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 6 Sep 2017 10:10:41 +0300
Subject: [PATCH 218/600] Release 1.13.5-1

---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3e671b0..396226e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nginx (1.13.5-1) unstable; urgency=medium
+
+  * New upstream version 1.13.5
+  * doc: Improve example WordPress configuration
+    Thanks to Larry Holish (Closes: #863343)
+  * Remove upstart conffile (Closes: #874319)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 06 Sep 2017 10:10:24 +0300
+
 nginx (1.13.4-1) unstable; urgency=medium
 
   * New upstream version 1.13.4

From a5c72db78304846c75c7da22a26e539d4fb07874 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 11 Oct 2017 10:33:46 +0300
Subject: [PATCH 219/600] New upstream version 1.13.6

---
 CHANGES                                       |  36 ++++
 CHANGES.ru                                    |  36 ++++
 conf/mime.types                               | 166 +++++++++---------
 src/core/nginx.h                              |   4 +-
 src/core/ngx_connection.c                     |   4 +
 src/core/ngx_inet.c                           |   8 +-
 src/core/ngx_inet.h                           |   5 +-
 src/core/ngx_parse_time.c                     |   5 +-
 src/core/ngx_string.c                         |  16 ++
 src/core/ngx_string.h                         |   2 +
 src/core/ngx_times.c                          |  30 +++-
 src/event/ngx_event_accept.c                  |   8 +
 src/http/modules/ngx_http_auth_basic_module.c |  70 ++------
 .../modules/ngx_http_upstream_hash_module.c   |  24 +--
 .../modules/ngx_http_upstream_zone_module.c   |   2 +-
 src/http/ngx_http_upstream.c                  |  73 ++++++--
 src/http/ngx_http_upstream.h                  |   2 +-
 src/http/ngx_http_variables.c                 |  12 ++
 src/http/v2/ngx_http_v2.c                     |  32 ++--
 src/http/v2/ngx_http_v2.h                     |   1 +
 src/http/v2/ngx_http_v2_filter_module.c       |  16 +-
 src/http/v2/ngx_http_v2_table.c               |   6 +-
 src/os/unix/ngx_user.c                        |  10 --
 src/stream/ngx_stream_proxy_module.c          |  14 +-
 src/stream/ngx_stream_upstream.h              |   2 +-
 src/stream/ngx_stream_upstream_hash_module.c  |  24 +--
 src/stream/ngx_stream_upstream_zone_module.c  |   2 +-
 src/stream/ngx_stream_variables.c             |  14 +-
 28 files changed, 408 insertions(+), 216 deletions(-)

diff --git a/CHANGES b/CHANGES
index e46199b..6a9fdcc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,40 @@
 
+Changes with nginx 1.13.6                                        10 Oct 2017
+
+    *) Bugfix: switching to the next upstream server in the stream module
+       did not work when using the "ssl_preread" directive.
+
+    *) Bugfix: in the ngx_http_v2_module.
+       Thanks to Piotr Sikora.
+
+    *) Bugfix: nginx did not support dates after the year 2038 on 32-bit
+       platforms with 64-bit time_t.
+
+    *) Bugfix: in handling of dates prior to the year 1970 and after the
+       year 10000.
+
+    *) Bugfix: in the stream module timeouts waiting for UDP datagrams from
+       upstream servers were not logged or logged at the "info" level
+       instead of "error".
+
+    *) Bugfix: when using HTTP/2 nginx might return the 400 response without
+       logging the reason.
+
+    *) Bugfix: in processing of corrupted cache files.
+
+    *) Bugfix: cache control headers were ignored when caching errors
+       intercepted by error_page.
+
+    *) Bugfix: when using HTTP/2 client request body might be corrupted.
+
+    *) Bugfix: in handling of client addresses when using unix domain
+       sockets.
+
+    *) Bugfix: nginx hogged CPU when using the "hash ... consistent"
+       directive in the upstream block if large weights were used and all or
+       most of the servers were unavailable.
+
+
 Changes with nginx 1.13.5                                        05 Sep 2017
 
     *) Feature: the $ssl_client_escaped_cert variable.
diff --git a/CHANGES.ru b/CHANGES.ru
index 73c4164..6ea87c9 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,40 @@
 
+Изменения в nginx 1.13.6                                          10.10.2017
+
+    *) Исправление: при использовании директивы ssl_preread в модуле stream
+       не работало переключение на следующий бэкенд.
+
+    *) Исправление: в модуле ngx_http_v2_module.
+       Спасибо Piotr Sikora.
+
+    *) Исправление: nginx не поддерживал даты после 2038 года на 32-битных
+       платформах с 64-битным time_t.
+
+    *) Исправление: в обработке дат до 1970 года и после 10000 года.
+
+    *) Исправление: в модуле stream таймауты ожидания UDP-пакетов от
+       бэкендов не логгировались или логгировались на уровне info вместо
+       error.
+
+    *) Исправление: при использовании HTTP/2 nginx мог вернуть ошибку 400,
+       не указав в логе причину.
+
+    *) Исправление: в обработке повреждённых файлов кэша.
+
+    *) Исправление: при кэшировании ошибок, перехваченных error_page, не
+       учитывались заголовки управления кэшированием.
+
+    *) Исправление: при использовании HTTP/2 тело запроса могло быть
+       повреждено.
+
+    *) Исправление: в обработке адресов клиентов при использовании unix
+       domain сокетов.
+
+    *) Исправление: при использовании директивы "hash ... consistent" в
+       блоке upstream nginx нагружал процессор, если использовались большие
+       веса и все или почти все бэкенды были недоступны.
+
+
 Изменения в nginx 1.13.5                                          05.09.2017
 
     *) Добавление: переменная $ssl_client_escaped_cert.
diff --git a/conf/mime.types b/conf/mime.types
index 89be9a4..8a2348a 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -1,89 +1,95 @@
 
 types {
-    text/html                             html htm shtml;
-    text/css                              css;
-    text/xml                              xml;
-    image/gif                             gif;
-    image/jpeg                            jpeg jpg;
-    application/javascript                js;
-    application/atom+xml                  atom;
-    application/rss+xml                   rss;
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
 
-    text/mathml                           mml;
-    text/plain                            txt;
-    text/vnd.sun.j2me.app-descriptor      jad;
-    text/vnd.wap.wml                      wml;
-    text/x-component                      htc;
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
 
-    image/png                             png;
-    image/tiff                            tif tiff;
-    image/vnd.wap.wbmp                    wbmp;
-    image/x-icon                          ico;
-    image/x-jng                           jng;
-    image/x-ms-bmp                        bmp;
-    image/svg+xml                         svg svgz;
-    image/webp                            webp;
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
 
-    application/font-woff                 woff;
-    application/java-archive              jar war ear;
-    application/json                      json;
-    application/mac-binhex40              hqx;
-    application/msword                    doc;
-    application/pdf                       pdf;
-    application/postscript                ps eps ai;
-    application/rtf                       rtf;
-    application/vnd.apple.mpegurl         m3u8;
-    application/vnd.ms-excel              xls;
-    application/vnd.ms-fontobject         eot;
-    application/vnd.ms-powerpoint         ppt;
-    application/vnd.wap.wmlc              wmlc;
-    application/vnd.google-earth.kml+xml  kml;
-    application/vnd.google-earth.kmz      kmz;
-    application/x-7z-compressed           7z;
-    application/x-cocoa                   cco;
-    application/x-java-archive-diff       jardiff;
-    application/x-java-jnlp-file          jnlp;
-    application/x-makeself                run;
-    application/x-perl                    pl pm;
-    application/x-pilot                   prc pdb;
-    application/x-rar-compressed          rar;
-    application/x-redhat-package-manager  rpm;
-    application/x-sea                     sea;
-    application/x-shockwave-flash         swf;
-    application/x-stuffit                 sit;
-    application/x-tcl                     tcl tk;
-    application/x-x509-ca-cert            der pem crt;
-    application/x-xpinstall               xpi;
-    application/xhtml+xml                 xhtml;
-    application/xspf+xml                  xspf;
-    application/zip                       zip;
+    application/font-woff                            woff;
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
 
-    application/octet-stream              bin exe dll;
-    application/octet-stream              deb;
-    application/octet-stream              dmg;
-    application/octet-stream              iso img;
-    application/octet-stream              msi msp msm;
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
 
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
 
-    audio/midi                            mid midi kar;
-    audio/mpeg                            mp3;
-    audio/ogg                             ogg;
-    audio/x-m4a                           m4a;
-    audio/x-realaudio                     ra;
-
-    video/3gpp                            3gpp 3gp;
-    video/mp2t                            ts;
-    video/mp4                             mp4;
-    video/mpeg                            mpeg mpg;
-    video/quicktime                       mov;
-    video/webm                            webm;
-    video/x-flv                           flv;
-    video/x-m4v                           m4v;
-    video/x-mng                           mng;
-    video/x-ms-asf                        asx asf;
-    video/x-ms-wmv                        wmv;
-    video/x-msvideo                       avi;
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
 }
diff --git a/src/core/nginx.h b/src/core/nginx.h
index a3c0ef8..5806837 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013005
-#define NGINX_VERSION      "1.13.5"
+#define nginx_version      1013006
+#define NGINX_VERSION      "1.13.6"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 392fc35..9a74758 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -165,6 +165,10 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
             continue;
         }
 
+        if (ls[i].socklen > (socklen_t) sizeof(ngx_sockaddr_t)) {
+            ls[i].socklen = sizeof(ngx_sockaddr_t);
+        }
+
         switch (ls[i].sockaddr->sa_family) {
 
 #if (NGX_HAVE_INET6)
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 3bcd3e7..db48b93 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -182,9 +182,11 @@ ngx_sock_ntop(struct sockaddr *sa, socklen_t socklen, u_char *text, size_t len,
     ngx_uint_t port)
 {
     u_char               *p;
+#if (NGX_HAVE_INET6 || NGX_HAVE_UNIX_DOMAIN)
+    size_t                n;
+#endif
     struct sockaddr_in   *sin;
 #if (NGX_HAVE_INET6)
-    size_t                n;
     struct sockaddr_in6  *sin6;
 #endif
 #if (NGX_HAVE_UNIX_DOMAIN)
@@ -241,7 +243,9 @@ ngx_sock_ntop(struct sockaddr *sa, socklen_t socklen, u_char *text, size_t len,
             p = ngx_snprintf(text, len, "unix:%Z");
 
         } else {
-            p = ngx_snprintf(text, len, "unix:%s%Z", saun->sun_path);
+            n = ngx_strnlen((u_char *) saun->sun_path,
+                            socklen - offsetof(struct sockaddr_un, sun_path));
+            p = ngx_snprintf(text, len, "unix:%*s%Z", n, saun->sun_path);
         }
 
         /* we do not include trailing zero in address length */
diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h
index 538771e..a3b392e 100644
--- a/src/core/ngx_inet.h
+++ b/src/core/ngx_inet.h
@@ -17,10 +17,11 @@
 #define NGX_INET6_ADDRSTRLEN                                                 \
     (sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") - 1)
 #define NGX_UNIX_ADDRSTRLEN                                                  \
-    (sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path))
+    (sizeof("unix:") - 1 +                                                   \
+     sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path))
 
 #if (NGX_HAVE_UNIX_DOMAIN)
-#define NGX_SOCKADDR_STRLEN   (sizeof("unix:") - 1 + NGX_UNIX_ADDRSTRLEN)
+#define NGX_SOCKADDR_STRLEN   NGX_UNIX_ADDRSTRLEN
 #elif (NGX_HAVE_INET6)
 #define NGX_SOCKADDR_STRLEN   (NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1)
 #else
diff --git a/src/core/ngx_parse_time.c b/src/core/ngx_parse_time.c
index a5c5034..232ac91 100644
--- a/src/core/ngx_parse_time.c
+++ b/src/core/ngx_parse_time.c
@@ -44,14 +44,15 @@ ngx_parse_http_time(u_char *value, size_t len)
         }
     }
 
-    for (p++; p < end; p++)
+    for (p++; p < end; p++) {
         if (*p != ' ') {
             break;
         }
+    }
 
     if (end - p < 18) {
         return NGX_ERROR;
-        }
+    }
 
     if (fmt != isoc) {
         if (*p < '0' || *p > '9' || *(p + 1) < '0' || *(p + 1) > '9') {
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index de10a06..2ee07bf 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -29,6 +29,22 @@ ngx_strlow(u_char *dst, u_char *src, size_t n)
 }
 
 
+size_t
+ngx_strnlen(u_char *p, size_t n)
+{
+    size_t  i;
+
+    for (i = 0; i < n; i++) {
+
+        if (p[i] == '\0') {
+            return i;
+        }
+    }
+
+    return n;
+}
+
+
 u_char *
 ngx_cpystrn(u_char *dst, u_char *src, size_t n)
 {
diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 7363bd2..882ae7c 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -60,6 +60,8 @@ void ngx_strlow(u_char *dst, u_char *src, size_t n);
 #define ngx_strstr(s1, s2)  strstr((const char *) s1, (const char *) s2)
 #define ngx_strlen(s)       strlen((const char *) s)
 
+size_t ngx_strnlen(u_char *p, size_t n);
+
 #define ngx_strchr(s1, c)   strchr((const char *) s1, (int) c)
 
 static ngx_inline u_char *
diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c
index 843314a..b2edf1a 100644
--- a/src/core/ngx_times.c
+++ b/src/core/ngx_times.c
@@ -300,27 +300,39 @@ void
 ngx_gmtime(time_t t, ngx_tm_t *tp)
 {
     ngx_int_t   yday;
-    ngx_uint_t  n, sec, min, hour, mday, mon, year, wday, days, leap;
+    ngx_uint_t  sec, min, hour, mday, mon, year, wday, days, leap;
 
     /* the calculation is valid for positive time_t only */
 
-    n = (ngx_uint_t) t;
+    if (t < 0) {
+        t = 0;
+    }
 
-    days = n / 86400;
+    days = t / 86400;
+    sec = t % 86400;
+
+    /*
+     * no more than 4 year digits supported,
+     * truncate to December 31, 9999, 23:59:59
+     */
+
+    if (days > 2932896) {
+        days = 2932896;
+        sec = 86399;
+    }
 
     /* January 1, 1970 was Thursday */
 
     wday = (4 + days) % 7;
 
-    n %= 86400;
-    hour = n / 3600;
-    n %= 3600;
-    min = n / 60;
-    sec = n % 60;
+    hour = sec / 3600;
+    sec %= 3600;
+    min = sec / 60;
+    sec %= 60;
 
     /*
      * the algorithm based on Gauss' formula,
-     * see src/http/ngx_http_parse_time.c
+     * see src/core/ngx_parse_time.c
      */
 
     /* days since March 1, 1 BC */
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 87447d0..7756370 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -164,6 +164,10 @@ ngx_event_accept(ngx_event_t *ev)
             return;
         }
 
+        if (socklen > (socklen_t) sizeof(ngx_sockaddr_t)) {
+            socklen = sizeof(ngx_sockaddr_t);
+        }
+
         c->sockaddr = ngx_palloc(c->pool, socklen);
         if (c->sockaddr == NULL) {
             ngx_close_accepted_connection(c);
@@ -440,6 +444,10 @@ ngx_event_recvmsg(ngx_event_t *ev)
         c->type = SOCK_DGRAM;
         c->socklen = msg.msg_namelen;
 
+        if (c->socklen > (socklen_t) sizeof(ngx_sockaddr_t)) {
+            c->socklen = sizeof(ngx_sockaddr_t);
+        }
+
 #if (NGX_STAT_STUB)
         (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
 #endif
diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c
index 4aa684f..2f345b6 100644
--- a/src/http/modules/ngx_http_auth_basic_module.c
+++ b/src/http/modules/ngx_http_auth_basic_module.c
@@ -14,11 +14,6 @@
 #define NGX_HTTP_AUTH_BUF_SIZE  2048
 
 
-typedef struct {
-    ngx_str_t                 passwd;
-} ngx_http_auth_basic_ctx_t;
-
-
 typedef struct {
     ngx_http_complex_value_t  *realm;
     ngx_http_complex_value_t   user_file;
@@ -27,7 +22,7 @@ typedef struct {
 
 static ngx_int_t ngx_http_auth_basic_handler(ngx_http_request_t *r);
 static ngx_int_t ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r,
-    ngx_http_auth_basic_ctx_t *ctx, ngx_str_t *passwd, ngx_str_t *realm);
+    ngx_str_t *passwd, ngx_str_t *realm);
 static ngx_int_t ngx_http_auth_basic_set_realm(ngx_http_request_t *r,
     ngx_str_t *realm);
 static void ngx_http_auth_basic_close(ngx_file_t *file);
@@ -103,7 +98,6 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
     ngx_str_t                        pwd, realm, user_file;
     ngx_uint_t                       i, level, login, left, passwd;
     ngx_file_t                       file;
-    ngx_http_auth_basic_ctx_t       *ctx;
     ngx_http_auth_basic_loc_conf_t  *alcf;
     u_char                           buf[NGX_HTTP_AUTH_BUF_SIZE];
     enum {
@@ -126,13 +120,6 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
         return NGX_DECLINED;
     }
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_auth_basic_module);
-
-    if (ctx) {
-        return ngx_http_auth_basic_crypt_handler(r, ctx, &ctx->passwd,
-                                                 &realm);
-    }
-
     rc = ngx_http_auth_basic_user(r);
 
     if (rc == NGX_DECLINED) {
@@ -237,8 +224,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
                     pwd.len = i - passwd;
                     pwd.data = &buf[passwd];
 
-                    return ngx_http_auth_basic_crypt_handler(r, NULL, &pwd,
-                                                             &realm);
+                    return ngx_http_auth_basic_crypt_handler(r, &pwd, &realm);
                 }
 
                 break;
@@ -276,7 +262,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
 
         ngx_cpystrn(pwd.data, &buf[passwd], pwd.len + 1);
 
-        return ngx_http_auth_basic_crypt_handler(r, NULL, &pwd, &realm);
+        return ngx_http_auth_basic_crypt_handler(r, &pwd, &realm);
     }
 
     ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
@@ -288,8 +274,8 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
 
 
 static ngx_int_t
-ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r,
-    ngx_http_auth_basic_ctx_t *ctx, ngx_str_t *passwd, ngx_str_t *realm)
+ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r, ngx_str_t *passwd,
+    ngx_str_t *realm)
 {
     ngx_int_t   rc;
     u_char     *encrypted;
@@ -301,48 +287,22 @@ ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r,
                    "rc: %i user: \"%V\" salt: \"%s\"",
                    rc, &r->headers_in.user, passwd->data);
 
-    if (rc == NGX_OK) {
-        if (ngx_strcmp(encrypted, passwd->data) == 0) {
-            return NGX_OK;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "encrypted: \"%s\"", encrypted);
-
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "user \"%V\": password mismatch",
-                      &r->headers_in.user);
-
-        return ngx_http_auth_basic_set_realm(r, realm);
-    }
-
-    if (rc == NGX_ERROR) {
+    if (rc != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    /* rc == NGX_AGAIN */
-
-    if (ctx == NULL) {
-        ctx = ngx_palloc(r->pool, sizeof(ngx_http_auth_basic_ctx_t));
-        if (ctx == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        ngx_http_set_ctx(r, ctx, ngx_http_auth_basic_module);
-
-        ctx->passwd.len = passwd->len;
-        passwd->len++;
-
-        ctx->passwd.data = ngx_pstrdup(r->pool, passwd);
-        if (ctx->passwd.data == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
+    if (ngx_strcmp(encrypted, passwd->data) == 0) {
+        return NGX_OK;
     }
 
-    /* TODO: add mutex event */
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "encrypted: \"%s\"", encrypted);
 
-    return rc;
+    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                  "user \"%V\": password mismatch",
+                  &r->headers_in.user);
+
+    return ngx_http_auth_basic_set_realm(r, realm);
 }
 
 
diff --git a/src/http/modules/ngx_http_upstream_hash_module.c b/src/http/modules/ngx_http_upstream_hash_module.c
index 6c28c64..d67f34d 100644
--- a/src/http/modules/ngx_http_upstream_hash_module.c
+++ b/src/http/modules/ngx_http_upstream_hash_module.c
@@ -503,6 +503,11 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
 
     ngx_http_upstream_rr_peers_wlock(hp->rrp.peers);
 
+    if (hp->tries > 20 || hp->rrp.peers->single) {
+        ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
+        return hp->get_rr_peer(pc, &hp->rrp);
+    }
+
     pc->cached = 0;
     pc->connection = NULL;
 
@@ -538,13 +543,6 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
                 continue;
             }
 
-            if (peer->server.len != server->len
-                || ngx_strncmp(peer->server.data, server->data, server->len)
-                   != 0)
-            {
-                continue;
-            }
-
             if (peer->max_fails
                 && peer->fails >= peer->max_fails
                 && now - peer->checked <= peer->fail_timeout)
@@ -556,6 +554,13 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
                 continue;
             }
 
+            if (peer->server.len != server->len
+                || ngx_strncmp(peer->server.data, server->data, server->len)
+                   != 0)
+            {
+                continue;
+            }
+
             peer->current_weight += peer->effective_weight;
             total += peer->effective_weight;
 
@@ -577,10 +582,9 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
         hp->hash++;
         hp->tries++;
 
-        if (hp->tries >= points->number) {
-            pc->name = hp->rrp.peers->name;
+        if (hp->tries > 20) {
             ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
-            return NGX_BUSY;
+            return hp->get_rr_peer(pc, &hp->rrp);
         }
     }
 
diff --git a/src/http/modules/ngx_http_upstream_zone_module.c b/src/http/modules/ngx_http_upstream_zone_module.c
index d340b48..3229cfe 100644
--- a/src/http/modules/ngx_http_upstream_zone_module.c
+++ b/src/http/modules/ngx_http_upstream_zone_module.c
@@ -281,7 +281,7 @@ ngx_http_upstream_zone_copy_peer(ngx_http_upstream_rr_peers_t *peers,
         dst->server.data = NULL;
     }
 
-    dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN);
+    dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t));
     if (dst->sockaddr == NULL) {
         goto failed;
     }
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 73a5882..2ea521b 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -582,6 +582,9 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
             if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
                 rc = NGX_DECLINED;
                 r->cached = 0;
+                u->buffer.start = NULL;
+                u->cache_status = NGX_HTTP_CACHE_MISS;
+                u->request_sent = 1;
             }
 
             if (ngx_http_upstream_cache_background_update(r, u) != NGX_OK) {
@@ -1059,8 +1062,16 @@ ngx_http_upstream_cache_send(ngx_http_request_t *r, ngx_http_upstream_t *u)
         return NGX_ERROR;
     }
 
+    if (rc == NGX_AGAIN) {
+        rc = NGX_HTTP_UPSTREAM_INVALID_HEADER;
+    }
+
     /* rc == NGX_HTTP_UPSTREAM_INVALID_HEADER */
 
+    ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
+                  "cache file \"%s\" contains invalid header",
+                  c->file.name.data);
+
     /* TODO: delete file */
 
     return rc;
@@ -2393,9 +2404,20 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
             rc = u->reinit_request(r);
 
-            if (rc == NGX_OK) {
-                u->cache_status = NGX_HTTP_CACHE_STALE;
-                rc = ngx_http_upstream_cache_send(r, u);
+            if (rc != NGX_OK) {
+                ngx_http_upstream_finalize_request(r, u, rc);
+                return NGX_OK;
+            }
+
+            u->cache_status = NGX_HTTP_CACHE_STALE;
+            rc = ngx_http_upstream_cache_send(r, u);
+
+            if (rc == NGX_DONE) {
+                return NGX_OK;
+            }
+
+            if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
+                rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
 
             ngx_http_upstream_finalize_request(r, u, rc);
@@ -2433,6 +2455,14 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
         u->cache_status = NGX_HTTP_CACHE_REVALIDATED;
         rc = ngx_http_upstream_cache_send(r, u);
 
+        if (rc == NGX_DONE) {
+            return NGX_OK;
+        }
+
+        if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
+            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
         if (valid == 0) {
             valid = r->cache->valid_sec;
             updating = r->cache->updating_sec;
@@ -2518,13 +2548,23 @@ ngx_http_upstream_intercept_errors(ngx_http_request_t *r,
 #if (NGX_HTTP_CACHE)
 
             if (r->cache) {
-                time_t  valid;
 
-                valid = ngx_http_file_cache_valid(u->conf->cache_valid, status);
+                if (u->cacheable) {
+                    time_t  valid;
 
-                if (valid) {
-                    r->cache->valid_sec = ngx_time() + valid;
-                    r->cache->error = status;
+                    valid = r->cache->valid_sec;
+
+                    if (valid == 0) {
+                        valid = ngx_http_file_cache_valid(u->conf->cache_valid,
+                                                          status);
+                        if (valid) {
+                            r->cache->valid_sec = ngx_time() + valid;
+                        }
+                    }
+
+                    if (valid) {
+                        r->cache->error = status;
+                    }
                 }
 
                 ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
@@ -4129,9 +4169,20 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
 
             rc = u->reinit_request(r);
 
-            if (rc == NGX_OK) {
-                u->cache_status = NGX_HTTP_CACHE_STALE;
-                rc = ngx_http_upstream_cache_send(r, u);
+            if (rc != NGX_OK) {
+                ngx_http_upstream_finalize_request(r, u, rc);
+                return;
+            }
+
+            u->cache_status = NGX_HTTP_CACHE_STALE;
+            rc = ngx_http_upstream_cache_send(r, u);
+
+            if (rc == NGX_DONE) {
+                return;
+            }
+
+            if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {
+                rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
 
             ngx_http_upstream_finalize_request(r, u, rc);
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index c552ac0..3e714e5 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -98,8 +98,8 @@ typedef struct {
     ngx_uint_t                       max_fails;
     time_t                           fail_timeout;
     ngx_msec_t                       slow_start;
+    ngx_uint_t                       down;
 
-    unsigned                         down:1;
     unsigned                         backup:1;
 
     NGX_COMPAT_BEGIN(6)
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index afeb4ce..ab82177 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -1240,6 +1240,18 @@ ngx_http_variable_binary_remote_addr(ngx_http_request_t *r,
         break;
 #endif
 
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+
+        v->len = r->connection->addr_text.len;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = r->connection->addr_text.data;
+
+        break;
+#endif
+
     default: /* AF_INET */
         sin = (struct sockaddr_in *) r->connection->sockaddr;
 
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 7725616..2c62190 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -245,6 +245,8 @@ ngx_http_v2_init(ngx_event_t *rev)
 
     h2c->frame_size = NGX_HTTP_V2_DEFAULT_FRAME_SIZE;
 
+    h2c->table_update = 1;
+
     h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
 
     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
@@ -746,7 +748,7 @@ ngx_http_v2_state_head(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
     type = ngx_http_v2_parse_type(head);
 
     ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "process http2 frame type:%ui f:%Xd l:%uz sid:%ui",
+                   "http2 frame type:%ui f:%Xd l:%uz sid:%ui",
                    type, h2c->state.flags, h2c->state.length, h2c->state.sid);
 
     if (type >= NGX_HTTP_V2_FRAME_STATES) {
@@ -1314,7 +1316,7 @@ ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 hpack %s string length: %i",
+                   "http2 %s string, len:%i",
                    huff ? "encoded" : "raw", len);
 
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@@ -1569,7 +1571,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
 
         if (rc == NGX_OK) {
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http2 pseudo-header: \":%V: %V\"",
+                           "http2 header: \":%V: %V\"",
                            &header->name, &header->value);
 
             return ngx_http_v2_state_header_complete(h2c, pos, end);
@@ -1645,7 +1647,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http2 http header: \"%V: %V\"",
+                   "http2 header: \"%V: %V\"",
                    &header->name, &header->value);
 
     return ngx_http_v2_state_header_complete(h2c, pos, end);
@@ -3335,6 +3337,19 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r)
         || r->schema_start == NULL
         || r->unparsed_uri.len == 0)
     {
+        if (r->method_name.len == 0) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent no :method header");
+
+        } else if (r->schema_start == NULL) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent no :schema header");
+
+        } else {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent no :path header");
+        }
+
         ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
         return NGX_ERROR;
     }
@@ -3360,7 +3375,7 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r)
     ngx_memcpy(p, ending, sizeof(ending));
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http2 http request line: \"%V\"", &r->request_line);
+                   "http2 request line: \"%V\"", &r->request_line);
 
     return NGX_OK;
 }
@@ -3574,11 +3589,6 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r)
         rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
 
     } else {
-        if (stream->preread) {
-            /* enforce writing preread buffer to file */
-            r->request_body_in_file_only = 1;
-        }
-
         rb->buf = ngx_calloc_buf(r->pool);
 
         if (rb->buf != NULL) {
@@ -3679,6 +3689,8 @@ ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
             buf->pos = buf->start = pos;
             buf->last = buf->end = pos + size;
 
+            r->request_body_in_file_only = 1;
+
         } else {
             if (size > (size_t) (buf->end - buf->last)) {
                 ngx_log_error(NGX_LOG_INFO, fc->log, 0,
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 4804658..42e0eb1 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -144,6 +144,7 @@ struct ngx_http_v2_connection_s {
 
     unsigned                         closed_nodes:8;
     unsigned                         settings_ack:1;
+    unsigned                         table_update:1;
     unsigned                         blocked:1;
     unsigned                         goaway:1;
 };
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 8621e7a..9070785 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -139,6 +139,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     ngx_connection_t          *fc;
     ngx_http_cleanup_t        *cln;
     ngx_http_v2_out_frame_t   *frame;
+    ngx_http_v2_connection_t  *h2c;
     ngx_http_core_loc_conf_t  *clcf;
     ngx_http_core_srv_conf_t  *cscf;
     u_char                     addr[NGX_SOCKADDR_STRLEN];
@@ -235,7 +236,11 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         }
     }
 
-    len = status ? 1 : 1 + ngx_http_v2_literal_size("418");
+    h2c = r->stream->connection;
+
+    len = h2c->table_update ? 1 : 0;
+
+    len += status ? 1 : 1 + ngx_http_v2_literal_size("418");
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
@@ -423,6 +428,13 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 
     start = pos;
 
+    if (h2c->table_update) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 table size update: 0");
+        *pos++ = (1 << 5) | 0;
+        h2c->table_update = 0;
+    }
+
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
                    "http2 output header: \":status: %03ui\"",
                    r->headers_out.status);
@@ -1257,7 +1269,7 @@ ngx_http_v2_flow_control(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream)
 {
     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2:%ui available windows: conn:%uz stream:%z",
+                   "http2:%ui windows: conn:%uz stream:%z",
                    stream->node->id, h2c->send_window, stream->send_window);
 
     if (stream->send_window <= 0) {
diff --git a/src/http/v2/ngx_http_v2_table.c b/src/http/v2/ngx_http_v2_table.c
index a73748a..62025c4 100644
--- a/src/http/v2/ngx_http_v2_table.c
+++ b/src/http/v2/ngx_http_v2_table.c
@@ -102,7 +102,7 @@ ngx_http_v2_get_indexed_header(ngx_http_v2_connection_t *h2c, ngx_uint_t index,
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
                    "http2 get indexed %s: %ui",
-                   name_only ? "header" : "header name", index);
+                   name_only ? "name" : "header", index);
 
     index--;
 
@@ -180,7 +180,7 @@ ngx_http_v2_add_header(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_header_t  *entry, **entries;
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 add header to hpack table: \"%V: %V\"",
+                   "http2 table add: \"%V: %V\"",
                    &header->name, &header->value);
 
     if (h2c->hpack.entries == NULL) {
@@ -293,7 +293,7 @@ ngx_http_v2_table_account(ngx_http_v2_connection_t *h2c, size_t size)
     size += 32;
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 hpack table account: %uz free:%uz",
+                   "http2 table account: %uz free:%uz",
                    size, h2c->hpack.free);
 
     if (size <= h2c->hpack.free) {
diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c
index 27c76ef..7ebe2b5 100644
--- a/src/os/unix/ngx_user.c
+++ b/src/os/unix/ngx_user.c
@@ -9,16 +9,6 @@
 #include <ngx_core.h>
 
 
-/*
- * Solaris has thread-safe crypt()
- * Linux has crypt_r(); "struct crypt_data" is more than 128K
- * FreeBSD needs the mutex to protect crypt()
- *
- * TODO:
- *     ngx_crypt_init() to init mutex
- */
-
-
 #if (NGX_CRYPT)
 
 #if (NGX_HAVE_GNU_CRYPT_R)
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 0afde1c..9d4b075 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -1331,13 +1331,17 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
                     return;
                 }
 
+                ngx_connection_error(pc, NGX_ETIMEDOUT, "upstream timed out");
+
                 if (u->received == 0) {
                     ngx_stream_proxy_next_upstream(s);
                     return;
                 }
+
+            } else {
+                ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out");
             }
 
-            ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out");
             ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
             return;
         }
@@ -1665,13 +1669,17 @@ ngx_stream_proxy_next_upstream(ngx_stream_session_t *s)
     u = s->upstream;
     pc = u->peer.connection;
 
-    if (u->upstream_out || u->upstream_busy || (pc && pc->buffered)) {
+    if (pc && pc->buffered) {
         ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "pending buffers on next upstream");
+                      "buffered data on next upstream");
         ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
+    if (s->connection->type == SOCK_DGRAM) {
+        u->upstream_out = NULL;
+    }
+
     if (u->peer.sockaddr) {
         u->peer.free(&u->peer, u->peer.data, NGX_PEER_FAILED);
         u->peer.sockaddr = NULL;
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index 90076e0..73947f4 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -58,8 +58,8 @@ typedef struct {
     ngx_uint_t                         max_fails;
     time_t                             fail_timeout;
     ngx_msec_t                         slow_start;
+    ngx_uint_t                         down;
 
-    unsigned                           down:1;
     unsigned                           backup:1;
 
     NGX_COMPAT_BEGIN(4)
diff --git a/src/stream/ngx_stream_upstream_hash_module.c b/src/stream/ngx_stream_upstream_hash_module.c
index cb44fcd..79ad742 100644
--- a/src/stream/ngx_stream_upstream_hash_module.c
+++ b/src/stream/ngx_stream_upstream_hash_module.c
@@ -505,6 +505,11 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
 
     ngx_stream_upstream_rr_peers_wlock(hp->rrp.peers);
 
+    if (hp->tries > 20 || hp->rrp.peers->single) {
+        ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
+        return hp->get_rr_peer(pc, &hp->rrp);
+    }
+
     pc->connection = NULL;
 
     now = ngx_time();
@@ -539,13 +544,6 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
                 continue;
             }
 
-            if (peer->server.len != server->len
-                || ngx_strncmp(peer->server.data, server->data, server->len)
-                   != 0)
-            {
-                continue;
-            }
-
             if (peer->max_fails
                 && peer->fails >= peer->max_fails
                 && now - peer->checked <= peer->fail_timeout)
@@ -557,6 +555,13 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
                 continue;
             }
 
+            if (peer->server.len != server->len
+                || ngx_strncmp(peer->server.data, server->data, server->len)
+                   != 0)
+            {
+                continue;
+            }
+
             peer->current_weight += peer->effective_weight;
             total += peer->effective_weight;
 
@@ -578,10 +583,9 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
         hp->hash++;
         hp->tries++;
 
-        if (hp->tries >= points->number) {
-            pc->name = hp->rrp.peers->name;
+        if (hp->tries > 20) {
             ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
-            return NGX_BUSY;
+            return hp->get_rr_peer(pc, &hp->rrp);
         }
     }
 
diff --git a/src/stream/ngx_stream_upstream_zone_module.c b/src/stream/ngx_stream_upstream_zone_module.c
index 4f72188..80d42fa 100644
--- a/src/stream/ngx_stream_upstream_zone_module.c
+++ b/src/stream/ngx_stream_upstream_zone_module.c
@@ -278,7 +278,7 @@ ngx_stream_upstream_zone_copy_peer(ngx_stream_upstream_rr_peers_t *peers,
         dst->server.data = NULL;
     }
 
-    dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN);
+    dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t));
     if (dst->sockaddr == NULL) {
         goto failed;
     }
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
index 45d6e60..95ae12b 100644
--- a/src/stream/ngx_stream_variables.c
+++ b/src/stream/ngx_stream_variables.c
@@ -460,7 +460,7 @@ ngx_stream_get_variable(ngx_stream_session_t *s, ngx_str_t *name,
 static ngx_int_t
 ngx_stream_variable_binary_remote_addr(ngx_stream_session_t *s,
      ngx_stream_variable_value_t *v, uintptr_t data)
- {
+{
     struct sockaddr_in   *sin;
 #if (NGX_HAVE_INET6)
     struct sockaddr_in6  *sin6;
@@ -481,6 +481,18 @@ ngx_stream_variable_binary_remote_addr(ngx_stream_session_t *s,
         break;
 #endif
 
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+
+        v->len = s->connection->addr_text.len;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = s->connection->addr_text.data;
+
+        break;
+#endif
+
     default: /* AF_INET */
         sin = (struct sockaddr_in *) s->connection->sockaddr;
 

From 515a80bc0a2ead9c5b7b8c5db9172869c0a0eab9 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 11 Sep 2017 17:55:23 +0300
Subject: [PATCH 220/600] mod: Normalize module locations

Use the package name to infer module location. This
will make it easier to script our maintaining tasks.
---
 debian/copyright                              | 28 +++++++--------
 .../ChangeLog                                 |  0
 .../{nginx-auth-pam => http-auth-pam}/LICENSE |  0
 .../README.md                                 |  0
 .../{nginx-auth-pam => http-auth-pam}/VERSION |  0
 .../{nginx-auth-pam => http-auth-pam}/config  |  0
 .../ngx_http_auth_pam_module.c                |  0
 .../CHANGES                                   |  0
 .../LICENSE                                   |  0
 .../README.md                                 |  0
 .../TODO.md                                   |  0
 .../config                                    |  0
 .../ngx_cache_purge_module.c                  |  0
 .../t/proxy1.t                                |  0
 .../t/proxy1_vars.t                           |  0
 .../t/proxy2.t                                |  0
 .../t/proxy2_vars.t                           |  0
 .../README                                    |  0
 .../config                                    |  0
 .../ngx_http_dav_ext_module.c                 |  0
 .../modules/{nginx-echo => http-echo}/LICENSE |  0
 .../{nginx-echo => http-echo}/README.markdown |  0
 .../modules/{nginx-echo => http-echo}/config  |  0
 .../{nginx-echo => http-echo}/src/ddebug.h    |  0
 .../src/ngx_http_echo_echo.c                  |  0
 .../src/ngx_http_echo_echo.h                  |  0
 .../src/ngx_http_echo_filter.c                |  0
 .../src/ngx_http_echo_filter.h                |  0
 .../src/ngx_http_echo_foreach.c               |  0
 .../src/ngx_http_echo_foreach.h               |  0
 .../src/ngx_http_echo_handler.c               |  0
 .../src/ngx_http_echo_handler.h               |  0
 .../src/ngx_http_echo_location.c              |  0
 .../src/ngx_http_echo_location.h              |  0
 .../src/ngx_http_echo_module.c                |  0
 .../src/ngx_http_echo_module.h                |  0
 .../src/ngx_http_echo_request_info.c          |  0
 .../src/ngx_http_echo_request_info.h          |  0
 .../src/ngx_http_echo_sleep.c                 |  0
 .../src/ngx_http_echo_sleep.h                 |  0
 .../src/ngx_http_echo_subrequest.c            |  0
 .../src/ngx_http_echo_subrequest.h            |  0
 .../src/ngx_http_echo_timer.c                 |  0
 .../src/ngx_http_echo_timer.h                 |  0
 .../src/ngx_http_echo_util.c                  |  0
 .../src/ngx_http_echo_util.h                  |  0
 .../src/ngx_http_echo_var.c                   |  0
 .../src/ngx_http_echo_var.h                   |  0
 .../t/abort-parent.t                          |  0
 .../t/blocking-sleep.t                        |  0
 .../t/echo-after-body.t                       |  0
 .../t/echo-before-body.t                      |  0
 .../t/echo-duplicate.t                        |  0
 .../{nginx-echo => http-echo}/t/echo-timer.t  |  0
 .../{nginx-echo => http-echo}/t/echo.t        |  0
 .../{nginx-echo => http-echo}/t/exec.t        |  0
 .../{nginx-echo => http-echo}/t/filter-used.t |  0
 .../t/foreach-split.t                         |  0
 .../{nginx-echo => http-echo}/t/gzip.t        |  0
 .../modules/{nginx-echo => http-echo}/t/if.t  |  0
 .../{nginx-echo => http-echo}/t/incr.t        |  0
 .../t/location-async.t                        |  0
 .../{nginx-echo => http-echo}/t/location.t    |  0
 .../{nginx-echo => http-echo}/t/mixed.t       |  0
 .../t/request-body.t                          |  0
 .../t/request-info.t                          |  0
 .../{nginx-echo => http-echo}/t/sleep.t       |  0
 .../{nginx-echo => http-echo}/t/status.t      |  0
 .../t/subrequest-async.t                      |  0
 .../{nginx-echo => http-echo}/t/subrequest.t  |  0
 .../{nginx-echo => http-echo}/t/unused.t      |  0
 .../{nginx-echo => http-echo}/util/build.sh   |  0
 .../{nginx-echo => http-echo}/util/releng     |  0
 .../util/wiki2pod.pl                          |  0
 .../valgrind.suppress                         |  0
 .../CHANGELOG.md                              |  0
 .../HACKING.md                                |  0
 .../LICENSE                                   |  0
 .../README.rst                                |  0
 .../config                                    |  0
 .../nginx-0.6-support.patch                   |  0
 .../ngx_http_fancyindex_module.c              |  0
 .../t/00-build-artifacts.test                 |  0
 .../t/01-smoke-hasindex.test                  |  0
 .../t/02-smoke-indexisfancy.test              |  0
 .../t/build-and-run                           |  0
 .../t/has-index.test                          |  0
 .../t/has-index/index.html                    |  0
 .../t/nginx.conf                              |  0
 .../t/preamble                                |  0
 .../{ngx-fancyindex => http-fancyindex}/t/run |  0
 .../template.awk                              |  0
 .../template.h                                |  0
 .../template.html                             |  0
 .../README.markdown                           |  0
 .../config                                    |  0
 .../src/ddebug.h                              |  0
 .../src/ngx_http_headers_more_filter_module.c |  0
 .../src/ngx_http_headers_more_filter_module.h |  0
 .../src/ngx_http_headers_more_headers_in.c    |  0
 .../src/ngx_http_headers_more_headers_in.h    |  0
 .../src/ngx_http_headers_more_headers_out.c   |  0
 .../src/ngx_http_headers_more_headers_out.h   |  0
 .../src/ngx_http_headers_more_util.c          |  0
 .../src/ngx_http_headers_more_util.h          |  0
 .../t/bug.t                                   |  0
 .../t/builtin.t                               |  0
 .../t/eval.t                                  |  0
 .../t/input-conn.t                            |  0
 .../t/input-cookie.t                          |  0
 .../t/input-ua.t                              |  0
 .../t/input.t                                 |  0
 .../t/phase.t                                 |  0
 .../t/sanity.t                                |  0
 .../t/subrequest.t                            |  0
 .../t/unused.t                                |  0
 .../t/vars.t                                  |  0
 .../util/build.sh                             |  0
 .../valgrind.suppress                         |  0
 .../{nginx-lua => http-lua}/README.markdown   |  0
 debian/modules/{nginx-lua => http-lua}/config |  0
 .../doc/HttpLuaModule.wiki                    |  0
 .../dtrace/ngx_lua_provider.d                 |  0
 .../misc/recv-until-pm/Makefile               |  0
 .../misc/recv-until-pm/lib/RecvUntil.pm       |  0
 .../misc/recv-until-pm/t/sanity.t             |  0
 .../src/api/ngx_http_lua_api.h                |  0
 .../{nginx-lua => http-lua}/src/ddebug.h      |  0
 .../src/ngx_http_lua_accessby.c               |  0
 .../src/ngx_http_lua_accessby.h               |  0
 .../src/ngx_http_lua_api.c                    |  0
 .../src/ngx_http_lua_args.c                   |  0
 .../src/ngx_http_lua_args.h                   |  0
 .../src/ngx_http_lua_balancer.c               |  0
 .../src/ngx_http_lua_balancer.h               |  0
 .../src/ngx_http_lua_bodyfilterby.c           |  0
 .../src/ngx_http_lua_bodyfilterby.h           |  0
 .../src/ngx_http_lua_cache.c                  |  0
 .../src/ngx_http_lua_cache.h                  |  0
 .../src/ngx_http_lua_capturefilter.c          |  0
 .../src/ngx_http_lua_capturefilter.h          |  0
 .../src/ngx_http_lua_clfactory.c              |  0
 .../src/ngx_http_lua_clfactory.h              |  0
 .../src/ngx_http_lua_common.h                 |  0
 .../src/ngx_http_lua_config.c                 |  0
 .../src/ngx_http_lua_config.h                 |  0
 .../src/ngx_http_lua_consts.c                 |  0
 .../src/ngx_http_lua_consts.h                 |  0
 .../src/ngx_http_lua_contentby.c              |  0
 .../src/ngx_http_lua_contentby.h              |  0
 .../src/ngx_http_lua_control.c                |  0
 .../src/ngx_http_lua_control.h                |  0
 .../src/ngx_http_lua_coroutine.c              |  0
 .../src/ngx_http_lua_coroutine.h              |  0
 .../src/ngx_http_lua_ctx.c                    |  0
 .../src/ngx_http_lua_ctx.h                    |  0
 .../src/ngx_http_lua_directive.c              |  0
 .../src/ngx_http_lua_directive.h              |  0
 .../src/ngx_http_lua_exception.c              |  0
 .../src/ngx_http_lua_exception.h              |  0
 .../src/ngx_http_lua_headerfilterby.c         |  0
 .../src/ngx_http_lua_headerfilterby.h         |  0
 .../src/ngx_http_lua_headers.c                |  0
 .../src/ngx_http_lua_headers.h                |  0
 .../src/ngx_http_lua_headers_in.c             |  0
 .../src/ngx_http_lua_headers_in.h             |  0
 .../src/ngx_http_lua_headers_out.c            |  0
 .../src/ngx_http_lua_headers_out.h            |  0
 .../src/ngx_http_lua_initby.c                 |  0
 .../src/ngx_http_lua_initby.h                 |  0
 .../src/ngx_http_lua_initworkerby.c           |  0
 .../src/ngx_http_lua_initworkerby.h           |  0
 .../src/ngx_http_lua_lex.c                    |  0
 .../src/ngx_http_lua_lex.h                    |  0
 .../src/ngx_http_lua_log.c                    |  0
 .../src/ngx_http_lua_log.h                    |  0
 .../src/ngx_http_lua_log_ringbuf.c            |  0
 .../src/ngx_http_lua_log_ringbuf.h            |  0
 .../src/ngx_http_lua_logby.c                  |  0
 .../src/ngx_http_lua_logby.h                  |  0
 .../src/ngx_http_lua_misc.c                   |  0
 .../src/ngx_http_lua_misc.h                   |  0
 .../src/ngx_http_lua_module.c                 |  0
 .../src/ngx_http_lua_ndk.c                    |  0
 .../src/ngx_http_lua_ndk.h                    |  0
 .../src/ngx_http_lua_output.c                 |  0
 .../src/ngx_http_lua_output.h                 |  0
 .../src/ngx_http_lua_pcrefix.c                |  0
 .../src/ngx_http_lua_pcrefix.h                |  0
 .../src/ngx_http_lua_phase.c                  |  0
 .../src/ngx_http_lua_phase.h                  |  0
 .../src/ngx_http_lua_probe.h                  |  0
 .../src/ngx_http_lua_regex.c                  |  0
 .../src/ngx_http_lua_regex.h                  |  0
 .../src/ngx_http_lua_req_body.c               |  0
 .../src/ngx_http_lua_req_body.h               |  0
 .../src/ngx_http_lua_req_method.c             |  0
 .../src/ngx_http_lua_req_method.h             |  0
 .../src/ngx_http_lua_rewriteby.c              |  0
 .../src/ngx_http_lua_rewriteby.h              |  0
 .../src/ngx_http_lua_script.c                 |  0
 .../src/ngx_http_lua_script.h                 |  0
 .../src/ngx_http_lua_semaphore.c              |  0
 .../src/ngx_http_lua_semaphore.h              |  0
 .../src/ngx_http_lua_setby.c                  |  0
 .../src/ngx_http_lua_setby.h                  |  0
 .../src/ngx_http_lua_shdict.c                 |  0
 .../src/ngx_http_lua_shdict.h                 |  0
 .../src/ngx_http_lua_sleep.c                  |  0
 .../src/ngx_http_lua_sleep.h                  |  0
 .../src/ngx_http_lua_socket_tcp.c             |  0
 .../src/ngx_http_lua_socket_tcp.h             |  0
 .../src/ngx_http_lua_socket_udp.c             |  0
 .../src/ngx_http_lua_socket_udp.h             |  0
 .../src/ngx_http_lua_ssl.c                    |  0
 .../src/ngx_http_lua_ssl.h                    |  0
 .../src/ngx_http_lua_ssl_certby.c             |  0
 .../src/ngx_http_lua_ssl_certby.h             |  0
 .../src/ngx_http_lua_ssl_ocsp.c               |  0
 .../src/ngx_http_lua_ssl_session_fetchby.c    |  0
 .../src/ngx_http_lua_ssl_session_fetchby.h    |  0
 .../src/ngx_http_lua_ssl_session_storeby.c    |  0
 .../src/ngx_http_lua_ssl_session_storeby.h    |  0
 .../src/ngx_http_lua_string.c                 |  0
 .../src/ngx_http_lua_string.h                 |  0
 .../src/ngx_http_lua_subrequest.c             |  0
 .../src/ngx_http_lua_subrequest.h             |  0
 .../src/ngx_http_lua_time.c                   |  0
 .../src/ngx_http_lua_time.h                   |  0
 .../src/ngx_http_lua_timer.c                  |  0
 .../src/ngx_http_lua_timer.h                  |  0
 .../src/ngx_http_lua_uri.c                    |  0
 .../src/ngx_http_lua_uri.h                    |  0
 .../src/ngx_http_lua_uthread.c                |  0
 .../src/ngx_http_lua_uthread.h                |  0
 .../src/ngx_http_lua_util.c                   |  0
 .../src/ngx_http_lua_util.h                   |  0
 .../src/ngx_http_lua_variable.c               |  0
 .../src/ngx_http_lua_variable.h               |  0
 .../src/ngx_http_lua_worker.c                 |  0
 .../src/ngx_http_lua_worker.h                 |  0
 .../{nginx-lua => http-lua}/t/.gitignore      |  0
 .../{nginx-lua => http-lua}/t/000--init.t     |  0
 .../{nginx-lua => http-lua}/t/000-sanity.t    |  0
 .../{nginx-lua => http-lua}/t/001-set.t       |  0
 .../{nginx-lua => http-lua}/t/002-content.t   |  0
 .../{nginx-lua => http-lua}/t/003-errors.t    |  0
 .../{nginx-lua => http-lua}/t/004-require.t   |  0
 .../{nginx-lua => http-lua}/t/005-exit.t      |  0
 .../{nginx-lua => http-lua}/t/006-escape.t    |  0
 .../{nginx-lua => http-lua}/t/007-md5.t       |  0
 .../{nginx-lua => http-lua}/t/008-today.t     |  0
 .../{nginx-lua => http-lua}/t/009-log.t       |  0
 .../t/010-request_body.t                      |  0
 .../{nginx-lua => http-lua}/t/011-md5_bin.t   |  0
 .../{nginx-lua => http-lua}/t/012-now.t       |  0
 .../{nginx-lua => http-lua}/t/013-base64.t    |  0
 .../{nginx-lua => http-lua}/t/014-bugs.t      |  0
 .../{nginx-lua => http-lua}/t/015-status.t    |  0
 .../t/016-resp-header.t                       |  0
 .../{nginx-lua => http-lua}/t/017-exec.t      |  0
 .../{nginx-lua => http-lua}/t/018-ndk.t       |  0
 .../{nginx-lua => http-lua}/t/019-const.t     |  0
 .../t/020-subrequest.t                        |  0
 .../t/021-cookie-time.t                       |  0
 .../{nginx-lua => http-lua}/t/022-redirect.t  |  0
 .../t/023-rewrite/client-abort.t              |  0
 .../t/023-rewrite/exec.t                      |  0
 .../t/023-rewrite/exit.t                      |  0
 .../t/023-rewrite/mixed.t                     |  0
 .../t/023-rewrite/multi-capture.t             |  0
 .../t/023-rewrite/on-abort.t                  |  0
 .../t/023-rewrite/redirect.t                  |  0
 .../t/023-rewrite/req-body.t                  |  0
 .../t/023-rewrite/req-socket.t                |  0
 .../t/023-rewrite/request_body.t              |  0
 .../t/023-rewrite/sanity.t                    |  0
 .../t/023-rewrite/sleep.t                     |  0
 .../t/023-rewrite/socket-keepalive.t          |  0
 .../t/023-rewrite/subrequest.t                |  0
 .../t/023-rewrite/tcp-socket-timeout.t        |  0
 .../t/023-rewrite/tcp-socket.t                |  0
 .../t/023-rewrite/unix-socket.t               |  0
 .../t/023-rewrite/uthread-exec.t              |  0
 .../t/023-rewrite/uthread-exit.t              |  0
 .../t/023-rewrite/uthread-redirect.t          |  0
 .../t/023-rewrite/uthread-spawn.t             |  0
 .../t/024-access/auth.t                       |  0
 .../t/024-access/client-abort.t               |  0
 .../t/024-access/exec.t                       |  0
 .../t/024-access/exit.t                       |  0
 .../t/024-access/mixed.t                      |  0
 .../t/024-access/multi-capture.t              |  0
 .../t/024-access/on-abort.t                   |  0
 .../t/024-access/redirect.t                   |  0
 .../t/024-access/req-body.t                   |  0
 .../t/024-access/request_body.t               |  0
 .../t/024-access/sanity.t                     |  0
 .../t/024-access/satisfy.t                    |  0
 .../t/024-access/sleep.t                      |  0
 .../t/024-access/subrequest.t                 |  0
 .../t/024-access/uthread-exec.t               |  0
 .../t/024-access/uthread-exit.t               |  0
 .../t/024-access/uthread-redirect.t           |  0
 .../t/024-access/uthread-spawn.t              |  0
 .../{nginx-lua => http-lua}/t/025-codecache.t |  0
 .../{nginx-lua => http-lua}/t/026-mysql.t     |  0
 .../t/027-multi-capture.t                     |  0
 .../t/028-req-header.t                        |  0
 .../{nginx-lua => http-lua}/t/029-http-time.t |  0
 .../{nginx-lua => http-lua}/t/030-uri-args.t  |  0
 .../{nginx-lua => http-lua}/t/031-post-args.t |  0
 .../{nginx-lua => http-lua}/t/032-iolist.t    |  0
 .../{nginx-lua => http-lua}/t/033-ctx.t       |  0
 .../{nginx-lua => http-lua}/t/034-match.t     |  0
 .../{nginx-lua => http-lua}/t/035-gmatch.t    |  0
 .../{nginx-lua => http-lua}/t/036-sub.t       |  0
 .../{nginx-lua => http-lua}/t/037-gsub.t      |  0
 .../{nginx-lua => http-lua}/t/038-match-o.t   |  0
 .../{nginx-lua => http-lua}/t/039-sub-o.t     |  0
 .../{nginx-lua => http-lua}/t/040-gsub-o.t    |  0
 .../t/041-header-filter.t                     |  0
 .../{nginx-lua => http-lua}/t/042-crc32.t     |  0
 .../{nginx-lua => http-lua}/t/043-shdict.t    |  0
 .../{nginx-lua => http-lua}/t/044-req-body.t  |  0
 .../{nginx-lua => http-lua}/t/045-ngx-var.t   |  0
 .../{nginx-lua => http-lua}/t/046-hmac.t      |  0
 .../{nginx-lua => http-lua}/t/047-match-jit.t |  0
 .../{nginx-lua => http-lua}/t/048-match-dfa.t |  0
 .../t/049-gmatch-jit.t                        |  0
 .../t/050-gmatch-dfa.t                        |  0
 .../{nginx-lua => http-lua}/t/051-sub-jit.t   |  0
 .../{nginx-lua => http-lua}/t/052-sub-dfa.t   |  0
 .../{nginx-lua => http-lua}/t/053-gsub-jit.t  |  0
 .../{nginx-lua => http-lua}/t/054-gsub-dfa.t  |  0
 .../t/055-subreq-vars.t                       |  0
 .../{nginx-lua => http-lua}/t/056-flush.t     |  0
 .../t/057-flush-timeout.t                     |  0
 .../t/058-tcp-socket.t                        |  0
 .../t/059-unix-socket.t                       |  0
 .../t/060-lua-memcached.t                     |  0
 .../{nginx-lua => http-lua}/t/061-lua-redis.t |  0
 .../{nginx-lua => http-lua}/t/062-count.t     |  0
 .../{nginx-lua => http-lua}/t/063-abort.t     |  0
 .../{nginx-lua => http-lua}/t/064-pcall.t     |  0
 .../t/065-tcp-socket-timeout.t                |  0
 .../t/066-socket-receiveuntil.t               |  0
 .../t/067-req-socket.t                        |  0
 .../t/068-socket-keepalive.t                  |  0
 .../{nginx-lua => http-lua}/t/069-null.t      |  0
 .../{nginx-lua => http-lua}/t/070-sha1.t      |  0
 .../t/071-idle-socket.t                       |  0
 .../t/072-conditional-get.t                   |  0
 .../{nginx-lua => http-lua}/t/073-backtrace.t |  0
 .../t/074-prefix-var.t                        |  0
 .../{nginx-lua => http-lua}/t/075-logby.t     |  0
 .../t/076-no-postpone.t                       |  0
 .../{nginx-lua => http-lua}/t/077-sleep.t     |  0
 .../{nginx-lua => http-lua}/t/078-hup-vars.t  |  0
 .../t/079-unused-directives.t                 |  0
 .../t/080-hup-shdict.t                        |  0
 .../{nginx-lua => http-lua}/t/081-bytecode.t  |  0
 .../t/082-body-filter.t                       |  0
 .../t/083-bad-sock-self.t                     |  0
 .../t/084-inclusive-receiveuntil.t            |  0
 .../{nginx-lua => http-lua}/t/085-if.t        |  0
 .../{nginx-lua => http-lua}/t/086-init-by.t   |  0
 .../t/087-udp-socket.t                        |  0
 .../t/088-req-method.t                        |  0
 .../{nginx-lua => http-lua}/t/089-phase.t     |  0
 .../t/090-log-socket-errors.t                 |  0
 .../{nginx-lua => http-lua}/t/091-coroutine.t |  0
 .../{nginx-lua => http-lua}/t/092-eof.t       |  0
 .../t/093-uthread-spawn.t                     |  0
 .../t/094-uthread-exit.t                      |  0
 .../t/095-uthread-exec.t                      |  0
 .../t/096-uthread-redirect.t                  |  0
 .../t/097-uthread-rewrite.t                   |  0
 .../t/098-uthread-wait.t                      |  0
 .../{nginx-lua => http-lua}/t/099-c-api.t     |  0
 .../t/100-client-abort.t                      |  0
 .../{nginx-lua => http-lua}/t/101-on-abort.t  |  0
 .../t/102-req-start-time.t                    |  0
 .../t/103-req-http-ver.t                      |  0
 .../t/104-req-raw-header.t                    |  0
 .../{nginx-lua => http-lua}/t/105-pressure.t  |  0
 .../{nginx-lua => http-lua}/t/106-timer.t     |  0
 .../t/107-timer-errors.t                      |  0
 .../t/108-timer-safe.t                        |  0
 .../{nginx-lua => http-lua}/t/109-timer-hup.t |  0
 .../{nginx-lua => http-lua}/t/110-etag.t      |  0
 .../t/111-req-header-ua.t                     |  0
 .../t/112-req-header-conn.t                   |  0
 .../t/113-req-header-cookie.t                 |  0
 .../{nginx-lua => http-lua}/t/114-config.t    |  0
 .../t/115-quote-sql-str.t                     |  0
 .../t/116-raw-req-socket.t                    |  0
 .../t/117-raw-req-socket-timeout.t            |  0
 .../t/118-use-default-type.t                  |  0
 .../t/119-config-prefix.t                     |  0
 .../{nginx-lua => http-lua}/t/120-re-find.t   |  0
 .../{nginx-lua => http-lua}/t/121-version.t   |  0
 .../{nginx-lua => http-lua}/t/122-worker.t    |  0
 .../{nginx-lua => http-lua}/t/123-lua-path.t  |  0
 .../t/124-init-worker.t                       |  0
 .../t/125-configure-args.t                    |  0
 .../t/126-shdict-frag.t                       |  0
 .../t/127-uthread-kill.t                      |  0
 .../t/128-duplex-tcp-socket.t                 |  0
 .../t/129-ssl-socket.t                        |  0
 .../t/130-internal-api.t                      |  0
 .../t/131-duplex-req-socket.t                 |  0
 .../t/132-lua-blocks.t                        |  0
 .../t/133-worker-count.t                      |  0
 .../t/134-worker-count-5.t                    |  0
 .../{nginx-lua => http-lua}/t/135-worker-id.t |  0
 .../t/136-timer-counts.t                      |  0
 .../{nginx-lua => http-lua}/t/137-req-misc.t  |  0
 .../{nginx-lua => http-lua}/t/138-balancer.t  |  0
 .../t/139-ssl-cert-by.t                       |  0
 .../{nginx-lua => http-lua}/t/140-ssl-c-api.t |  0
 .../{nginx-lua => http-lua}/t/141-luajit.t    |  0
 .../t/142-ssl-session-store.t                 |  0
 .../t/143-ssl-session-fetch.t                 |  0
 .../t/144-shdict-incr-init.t                  |  0
 .../t/145-shdict-list.t                       |  0
 .../t/146-malloc-trim.t                       |  0
 .../t/147-tcp-socket-timeouts.t               |  0
 .../t/148-fake-shm-zone.t                     |  0
 .../t/149-hup-fake-shm-zone.t                 |  0
 .../t/150-fake-delayed-load.t                 |  0
 .../t/151-initby-hup.t                        |  0
 .../t/152-timer-every.t                       |  0
 .../t/153-semaphore-hup.t                     |  0
 .../{nginx-lua => http-lua}/t/154-semaphore.t |  0
 .../{nginx-lua => http-lua}/t/StapThread.pm   |  0
 .../t/cert/comodo-ca.crt                      |  0
 .../t/cert/equifax.crt                        |  0
 .../{nginx-lua => http-lua}/t/cert/test.crl   |  0
 .../{nginx-lua => http-lua}/t/cert/test.crt   |  0
 .../{nginx-lua => http-lua}/t/cert/test.key   |  0
 .../{nginx-lua => http-lua}/t/cert/test2.crt  |  0
 .../{nginx-lua => http-lua}/t/cert/test2.key  |  0
 .../t/cert/test_ecdsa.crt                     |  0
 .../t/cert/test_ecdsa.key                     |  0
 .../t/data/fake-delayed-load-module/config    |  0
 .../ngx_http_lua_fake_delayed_load_module.c   |  0
 .../t/data/fake-module/config                 |  0
 .../t/data/fake-module/ngx_http_fake_module.c |  0
 .../t/data/fake-shm-module/config             |  0
 .../ngx_http_lua_fake_shm_module.c            |  0
 .../{nginx-lua => http-lua}/t/lib/CRC32.lua   |  0
 .../t/lib/Memcached.lua                       |  0
 .../{nginx-lua => http-lua}/t/lib/Redis.lua   |  0
 .../{nginx-lua => http-lua}/t/lib/ljson.lua   |  0
 .../tapset/ngx_lua.stp                        |  0
 .../{nginx-lua => http-lua}/util/build.sh     |  0
 .../{nginx-lua => http-lua}/util/fix-comments |  0
 .../{nginx-lua => http-lua}/util/gen-lexer-c  |  0
 .../{nginx-lua => http-lua}/util/ngx-links    |  0
 .../{nginx-lua => http-lua}/util/releng       |  0
 .../{nginx-lua => http-lua}/util/retab        |  0
 .../{nginx-lua => http-lua}/util/revim        |  0
 .../{nginx-lua => http-lua}/util/run_test.sh  |  0
 .../util/update-readme.sh                     |  0
 .../{nginx-lua => http-lua}/valgrind.suppress |  0
 .../LICENSE                                   |  0
 .../README.md                                 |  0
 .../README_AUTO_LIB                           |  0
 .../{nginx-development-kit => http-ndk}/TODO  |  0
 .../auto/actions/array                        |  0
 .../auto/actions/palloc                       |  0
 .../auto/build                                |  0
 .../auto/data/action_replacements             |  0
 .../auto/data/action_types                    |  0
 .../auto/data/conf_args                       |  0
 .../auto/data/conf_locs                       |  0
 .../auto/data/conf_macros                     |  0
 .../auto/data/contexts                        |  0
 .../auto/data/header_files                    |  0
 .../auto/data/headers                         |  0
 .../auto/data/module_dependencies             |  0
 .../auto/data/modules_optional                |  0
 .../auto/data/prefixes                        |  0
 .../auto/src/array.h                          |  0
 .../auto/src/conf_cmd_basic.h                 |  0
 .../auto/src/conf_merge.h                     |  0
 .../auto/src/palloc.h                         |  0
 .../auto/text/autogen                         |  0
 .../config                                    |  0
 .../docs/core/action_macros                   |  0
 .../docs/core/conf_cmds                       |  0
 .../docs/modules/set_var                      |  0
 .../docs/patches/more_logging_info            |  0
 .../docs/upstream/list                        |  0
 .../examples/README                           |  0
 .../examples/http/set_var/config              |  0
 .../ngx_http_set_var_examples_module.c        |  0
 .../ngx_auto_lib_core                         |  0
 .../notes/CHANGES                             |  0
 .../notes/LICENSE                             |  0
 .../objs/ndk_array.h                          |  0
 .../objs/ndk_conf_cmd_basic.h                 |  0
 .../objs/ndk_conf_cmd_extra.h                 |  0
 .../objs/ndk_conf_merge.h                     |  0
 .../objs/ndk_config.c                         |  0
 .../objs/ndk_config.h                         |  0
 .../objs/ndk_includes.h                       |  0
 .../objs/ndk_palloc.h                         |  0
 .../patches/auto_config                       |  0
 .../patches/expose_rewrite_functions          |  0
 .../patches/rewrite_phase_handler             |  0
 .../src/hash/md5.h                            |  0
 .../src/hash/murmurhash2.c                    |  0
 .../src/hash/sha.h                            |  0
 .../src/ndk.c                                 |  0
 .../src/ndk.h                                 |  0
 .../src/ndk_buf.c                             |  0
 .../src/ndk_buf.h                             |  0
 .../src/ndk_complex_path.c                    |  0
 .../src/ndk_complex_path.h                    |  0
 .../src/ndk_complex_value.c                   |  0
 .../src/ndk_complex_value.h                   |  0
 .../src/ndk_conf_file.c                       |  0
 .../src/ndk_conf_file.h                       |  0
 .../src/ndk_debug.c                           |  0
 .../src/ndk_debug.h                           |  0
 .../src/ndk_encoding.c                        |  0
 .../src/ndk_encoding.h                        |  0
 .../src/ndk_hash.c                            |  0
 .../src/ndk_hash.h                            |  0
 .../src/ndk_http.c                            |  0
 .../src/ndk_http.h                            |  0
 .../src/ndk_http_headers.h                    |  0
 .../src/ndk_log.c                             |  0
 .../src/ndk_log.h                             |  0
 .../src/ndk_parse.h                           |  0
 .../src/ndk_path.c                            |  0
 .../src/ndk_path.h                            |  0
 .../src/ndk_process.c                         |  0
 .../src/ndk_process.h                         |  0
 .../src/ndk_regex.c                           |  0
 .../src/ndk_regex.h                           |  0
 .../src/ndk_rewrite.c                         |  0
 .../src/ndk_rewrite.h                         |  0
 .../src/ndk_set_var.c                         |  0
 .../src/ndk_set_var.h                         |  0
 .../src/ndk_string.c                          |  0
 .../src/ndk_string.h                          |  0
 .../src/ndk_string_util.h                     |  0
 .../src/ndk_upstream_list.c                   |  0
 .../src/ndk_upstream_list.h                   |  0
 .../src/ndk_uri.c                             |  0
 .../src/ndk_uri.h                             |  0
 .../CHANGES                                   |  0
 .../README                                    |  0
 .../config                                    |  0
 .../doc/README.google_code_home_page.wiki     |  0
 .../doc/README.html                           |  0
 .../doc/README.wiki                           |  0
 .../ngx_http_subs_filter_module.c             |  0
 .../test/README                               |  0
 .../test/inc/Module/AutoInstall.pm            |  0
 .../test/inc/Module/Install.pm                |  0
 .../test/inc/Module/Install/AutoInstall.pm    |  0
 .../test/inc/Module/Install/Base.pm           |  0
 .../test/inc/Module/Install/Can.pm            |  0
 .../test/inc/Module/Install/Fetch.pm          |  0
 .../test/inc/Module/Install/Include.pm        |  0
 .../test/inc/Module/Install/Makefile.pm       |  0
 .../test/inc/Module/Install/Metadata.pm       |  0
 .../test/inc/Module/Install/TestBase.pm       |  0
 .../test/inc/Module/Install/Win32.pm          |  0
 .../test/inc/Module/Install/WriteAll.pm       |  0
 .../test/inc/Spiffy.pm                        |  0
 .../test/inc/Test/Base.pm                     |  0
 .../test/inc/Test/Base/Filter.pm              |  0
 .../test/inc/Test/Builder.pm                  |  0
 .../test/inc/Test/Builder/Module.pm           |  0
 .../test/inc/Test/More.pm                     |  0
 .../test/lib/Test/Nginx.pm                    |  0
 .../test/lib/Test/Nginx/LWP.pm                |  0
 .../test/lib/Test/Nginx/Socket.pm             |  0
 .../test/lib/Test/Nginx/Util.pm               |  0
 .../test/t/subs.t                             |  0
 .../test/t/subs_capture.t                     |  0
 .../test/t/subs_fix_string.t                  |  0
 .../test/t/subs_regex.t                       |  0
 .../test/t/subs_types.t                       |  0
 .../test/test.sh                              |  0
 .../util/update-readme.sh                     |  0
 .../util/wiki2google_code_homepage.pl         |  0
 .../util/wiki2pod.pl                          |  0
 .../CHANGES                                   |  0
 .../LICENSE                                   |  0
 .../Makefile                                  |  0
 .../README                                    |  0
 .../config                                    |  0
 .../ngx_http_uploadprogress_module.c          |  0
 .../test/client.sh                            |  0
 .../test/stress.sh                            |  0
 .../.gdbinit                                  |  0
 .../README                                    |  0
 .../config                                    |  0
 .../ngx_http_upstream_fair_module.c           |  0
 .../dynamic-module.patch                      |  0
 .../segfault-1.11.6.patch                     |  0
 .../series                                    |  0
 .../dynamic-module.patch                      |  0
 .../series                                    |  0
 .../build-nginx-1.11.11.patch                 |  0
 .../patches/{nginx-echo => http-echo}/series  |  0
 .../discover-luajit-2.1.patch                 |  0
 .../openssl-1.1.0.patch                       |  0
 .../patches/{nginx-lua => http-lua}/series    |  0
 .../dynamic-module.patch                      |  0
 .../series                                    |  0
 .../drop-default-port.patch                   |  0
 .../dynamic-module.patch                      |  0
 .../openssl-1.1.0.patch                       |  0
 .../series                                    |  0
 debian/modules/{nginx-rtmp => rtmp}/AUTHORS   |  0
 debian/modules/{nginx-rtmp => rtmp}/LICENSE   |  0
 debian/modules/{nginx-rtmp => rtmp}/README.md |  0
 debian/modules/{nginx-rtmp => rtmp}/config    |  0
 .../dash/ngx_rtmp_dash_module.c               |  0
 .../{nginx-rtmp => rtmp}/dash/ngx_rtmp_mp4.c  |  0
 .../{nginx-rtmp => rtmp}/dash/ngx_rtmp_mp4.h  |  0
 .../{nginx-rtmp => rtmp}/doc/README.md        |  0
 .../hls/ngx_rtmp_hls_module.c                 |  0
 .../hls/ngx_rtmp_mpegts.c                     |  0
 .../hls/ngx_rtmp_mpegts.h                     |  0
 .../modules/{nginx-rtmp => rtmp}/ngx_rtmp.c   |  0
 .../modules/{nginx-rtmp => rtmp}/ngx_rtmp.h   |  0
 .../ngx_rtmp_access_module.c                  |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_amf.c       |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_amf.h       |  0
 .../ngx_rtmp_auto_push_module.c               |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_bandwidth.c |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_bandwidth.h |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_bitop.c     |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_bitop.h     |  0
 .../ngx_rtmp_cmd_module.c                     |  0
 .../ngx_rtmp_cmd_module.h                     |  0
 .../ngx_rtmp_codec_module.c                   |  0
 .../ngx_rtmp_codec_module.h                   |  0
 .../ngx_rtmp_control_module.c                 |  0
 .../ngx_rtmp_core_module.c                    |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_eval.c      |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_eval.h      |  0
 .../ngx_rtmp_exec_module.c                    |  0
 .../ngx_rtmp_flv_module.c                     |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_handler.c   |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_handshake.c |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_init.c      |  0
 .../ngx_rtmp_limit_module.c                   |  0
 .../ngx_rtmp_live_module.c                    |  0
 .../ngx_rtmp_live_module.h                    |  0
 .../ngx_rtmp_log_module.c                     |  0
 .../ngx_rtmp_mp4_module.c                     |  0
 .../ngx_rtmp_netcall_module.c                 |  0
 .../ngx_rtmp_netcall_module.h                 |  0
 .../ngx_rtmp_notify_module.c                  |  0
 .../ngx_rtmp_play_module.c                    |  0
 .../ngx_rtmp_play_module.h                    |  0
 .../ngx_rtmp_proxy_protocol.c                 |  0
 .../ngx_rtmp_proxy_protocol.h                 |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_receive.c   |  0
 .../ngx_rtmp_record_module.c                  |  0
 .../ngx_rtmp_record_module.h                  |  0
 .../ngx_rtmp_relay_module.c                   |  0
 .../ngx_rtmp_relay_module.h                   |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_send.c      |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_shared.c    |  0
 .../ngx_rtmp_stat_module.c                    |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_streams.h   |  0
 .../{nginx-rtmp => rtmp}/ngx_rtmp_version.h   |  0
 debian/modules/{nginx-rtmp => rtmp}/stat.xsl  |  0
 debian/rules                                  | 36 +++++++++----------
 679 files changed, 32 insertions(+), 32 deletions(-)
 rename debian/modules/{nginx-auth-pam => http-auth-pam}/ChangeLog (100%)
 rename debian/modules/{nginx-auth-pam => http-auth-pam}/LICENSE (100%)
 rename debian/modules/{nginx-auth-pam => http-auth-pam}/README.md (100%)
 rename debian/modules/{nginx-auth-pam => http-auth-pam}/VERSION (100%)
 rename debian/modules/{nginx-auth-pam => http-auth-pam}/config (100%)
 rename debian/modules/{nginx-auth-pam => http-auth-pam}/ngx_http_auth_pam_module.c (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/CHANGES (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/LICENSE (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/README.md (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/TODO.md (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/config (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/ngx_cache_purge_module.c (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/t/proxy1.t (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/t/proxy1_vars.t (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/t/proxy2.t (100%)
 rename debian/modules/{nginx-cache-purge => http-cache-purge}/t/proxy2_vars.t (100%)
 rename debian/modules/{nginx-dav-ext-module => http-dav-ext}/README (100%)
 rename debian/modules/{nginx-dav-ext-module => http-dav-ext}/config (100%)
 rename debian/modules/{nginx-dav-ext-module => http-dav-ext}/ngx_http_dav_ext_module.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/LICENSE (100%)
 rename debian/modules/{nginx-echo => http-echo}/README.markdown (100%)
 rename debian/modules/{nginx-echo => http-echo}/config (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ddebug.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_echo.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_echo.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_filter.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_filter.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_foreach.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_foreach.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_handler.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_handler.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_location.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_location.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_module.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_module.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_request_info.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_request_info.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_sleep.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_sleep.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_subrequest.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_subrequest.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_timer.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_timer.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_util.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_util.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_var.c (100%)
 rename debian/modules/{nginx-echo => http-echo}/src/ngx_http_echo_var.h (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/abort-parent.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/blocking-sleep.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/echo-after-body.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/echo-before-body.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/echo-duplicate.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/echo-timer.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/echo.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/exec.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/filter-used.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/foreach-split.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/gzip.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/if.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/incr.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/location-async.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/location.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/mixed.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/request-body.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/request-info.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/sleep.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/status.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/subrequest-async.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/subrequest.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/t/unused.t (100%)
 rename debian/modules/{nginx-echo => http-echo}/util/build.sh (100%)
 rename debian/modules/{nginx-echo => http-echo}/util/releng (100%)
 rename debian/modules/{nginx-echo => http-echo}/util/wiki2pod.pl (100%)
 rename debian/modules/{nginx-echo => http-echo}/valgrind.suppress (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/CHANGELOG.md (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/HACKING.md (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/LICENSE (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/README.rst (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/config (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/nginx-0.6-support.patch (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/ngx_http_fancyindex_module.c (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/t/00-build-artifacts.test (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/t/01-smoke-hasindex.test (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/t/02-smoke-indexisfancy.test (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/t/build-and-run (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/t/has-index.test (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/t/has-index/index.html (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/t/nginx.conf (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/t/preamble (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/t/run (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/template.awk (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/template.h (100%)
 rename debian/modules/{ngx-fancyindex => http-fancyindex}/template.html (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/README.markdown (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/config (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/src/ddebug.h (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/src/ngx_http_headers_more_filter_module.c (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/src/ngx_http_headers_more_filter_module.h (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/src/ngx_http_headers_more_headers_in.c (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/src/ngx_http_headers_more_headers_in.h (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/src/ngx_http_headers_more_headers_out.c (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/src/ngx_http_headers_more_headers_out.h (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/src/ngx_http_headers_more_util.c (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/src/ngx_http_headers_more_util.h (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/bug.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/builtin.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/eval.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/input-conn.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/input-cookie.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/input-ua.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/input.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/phase.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/sanity.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/subrequest.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/unused.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/t/vars.t (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/util/build.sh (100%)
 rename debian/modules/{headers-more-nginx-module => http-headers-more-filter}/valgrind.suppress (100%)
 rename debian/modules/{nginx-lua => http-lua}/README.markdown (100%)
 rename debian/modules/{nginx-lua => http-lua}/config (100%)
 rename debian/modules/{nginx-lua => http-lua}/doc/HttpLuaModule.wiki (100%)
 rename debian/modules/{nginx-lua => http-lua}/dtrace/ngx_lua_provider.d (100%)
 rename debian/modules/{nginx-lua => http-lua}/misc/recv-until-pm/Makefile (100%)
 rename debian/modules/{nginx-lua => http-lua}/misc/recv-until-pm/lib/RecvUntil.pm (100%)
 rename debian/modules/{nginx-lua => http-lua}/misc/recv-until-pm/t/sanity.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/api/ngx_http_lua_api.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ddebug.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_accessby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_accessby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_api.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_args.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_args.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_balancer.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_balancer.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_bodyfilterby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_bodyfilterby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_cache.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_cache.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_capturefilter.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_capturefilter.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_clfactory.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_clfactory.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_common.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_config.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_config.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_consts.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_consts.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_contentby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_contentby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_control.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_control.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_coroutine.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_coroutine.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ctx.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ctx.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_directive.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_directive.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_exception.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_exception.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_headerfilterby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_headerfilterby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_headers.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_headers.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_headers_in.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_headers_in.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_headers_out.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_headers_out.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_initby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_initby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_initworkerby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_initworkerby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_lex.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_lex.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_log.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_log.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_log_ringbuf.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_log_ringbuf.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_logby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_logby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_misc.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_misc.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_module.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ndk.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ndk.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_output.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_output.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_pcrefix.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_pcrefix.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_phase.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_phase.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_probe.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_regex.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_regex.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_req_body.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_req_body.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_req_method.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_req_method.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_rewriteby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_rewriteby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_script.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_script.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_semaphore.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_semaphore.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_setby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_setby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_shdict.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_shdict.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_sleep.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_sleep.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_socket_tcp.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_socket_tcp.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_socket_udp.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_socket_udp.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ssl.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ssl.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ssl_certby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ssl_certby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ssl_ocsp.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ssl_session_fetchby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ssl_session_fetchby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ssl_session_storeby.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_ssl_session_storeby.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_string.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_string.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_subrequest.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_subrequest.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_time.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_time.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_timer.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_timer.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_uri.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_uri.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_uthread.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_uthread.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_util.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_util.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_variable.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_variable.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_worker.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/src/ngx_http_lua_worker.h (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/.gitignore (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/000--init.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/000-sanity.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/001-set.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/002-content.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/003-errors.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/004-require.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/005-exit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/006-escape.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/007-md5.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/008-today.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/009-log.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/010-request_body.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/011-md5_bin.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/012-now.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/013-base64.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/014-bugs.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/015-status.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/016-resp-header.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/017-exec.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/018-ndk.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/019-const.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/020-subrequest.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/021-cookie-time.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/022-redirect.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/client-abort.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/exec.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/exit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/mixed.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/multi-capture.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/on-abort.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/redirect.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/req-body.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/req-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/request_body.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/sanity.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/sleep.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/socket-keepalive.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/subrequest.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/tcp-socket-timeout.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/tcp-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/unix-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/uthread-exec.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/uthread-exit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/uthread-redirect.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/023-rewrite/uthread-spawn.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/auth.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/client-abort.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/exec.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/exit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/mixed.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/multi-capture.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/on-abort.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/redirect.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/req-body.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/request_body.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/sanity.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/satisfy.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/sleep.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/subrequest.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/uthread-exec.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/uthread-exit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/uthread-redirect.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/024-access/uthread-spawn.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/025-codecache.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/026-mysql.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/027-multi-capture.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/028-req-header.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/029-http-time.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/030-uri-args.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/031-post-args.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/032-iolist.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/033-ctx.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/034-match.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/035-gmatch.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/036-sub.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/037-gsub.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/038-match-o.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/039-sub-o.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/040-gsub-o.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/041-header-filter.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/042-crc32.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/043-shdict.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/044-req-body.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/045-ngx-var.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/046-hmac.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/047-match-jit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/048-match-dfa.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/049-gmatch-jit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/050-gmatch-dfa.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/051-sub-jit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/052-sub-dfa.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/053-gsub-jit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/054-gsub-dfa.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/055-subreq-vars.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/056-flush.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/057-flush-timeout.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/058-tcp-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/059-unix-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/060-lua-memcached.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/061-lua-redis.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/062-count.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/063-abort.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/064-pcall.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/065-tcp-socket-timeout.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/066-socket-receiveuntil.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/067-req-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/068-socket-keepalive.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/069-null.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/070-sha1.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/071-idle-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/072-conditional-get.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/073-backtrace.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/074-prefix-var.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/075-logby.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/076-no-postpone.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/077-sleep.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/078-hup-vars.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/079-unused-directives.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/080-hup-shdict.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/081-bytecode.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/082-body-filter.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/083-bad-sock-self.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/084-inclusive-receiveuntil.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/085-if.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/086-init-by.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/087-udp-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/088-req-method.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/089-phase.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/090-log-socket-errors.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/091-coroutine.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/092-eof.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/093-uthread-spawn.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/094-uthread-exit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/095-uthread-exec.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/096-uthread-redirect.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/097-uthread-rewrite.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/098-uthread-wait.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/099-c-api.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/100-client-abort.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/101-on-abort.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/102-req-start-time.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/103-req-http-ver.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/104-req-raw-header.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/105-pressure.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/106-timer.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/107-timer-errors.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/108-timer-safe.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/109-timer-hup.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/110-etag.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/111-req-header-ua.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/112-req-header-conn.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/113-req-header-cookie.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/114-config.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/115-quote-sql-str.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/116-raw-req-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/117-raw-req-socket-timeout.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/118-use-default-type.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/119-config-prefix.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/120-re-find.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/121-version.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/122-worker.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/123-lua-path.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/124-init-worker.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/125-configure-args.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/126-shdict-frag.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/127-uthread-kill.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/128-duplex-tcp-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/129-ssl-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/130-internal-api.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/131-duplex-req-socket.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/132-lua-blocks.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/133-worker-count.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/134-worker-count-5.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/135-worker-id.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/136-timer-counts.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/137-req-misc.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/138-balancer.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/139-ssl-cert-by.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/140-ssl-c-api.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/141-luajit.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/142-ssl-session-store.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/143-ssl-session-fetch.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/144-shdict-incr-init.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/145-shdict-list.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/146-malloc-trim.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/147-tcp-socket-timeouts.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/148-fake-shm-zone.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/149-hup-fake-shm-zone.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/150-fake-delayed-load.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/151-initby-hup.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/152-timer-every.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/153-semaphore-hup.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/154-semaphore.t (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/StapThread.pm (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/cert/comodo-ca.crt (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/cert/equifax.crt (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/cert/test.crl (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/cert/test.crt (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/cert/test.key (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/cert/test2.crt (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/cert/test2.key (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/cert/test_ecdsa.crt (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/cert/test_ecdsa.key (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/data/fake-delayed-load-module/config (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/data/fake-module/config (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/data/fake-module/ngx_http_fake_module.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/data/fake-shm-module/config (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/lib/CRC32.lua (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/lib/Memcached.lua (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/lib/Redis.lua (100%)
 rename debian/modules/{nginx-lua => http-lua}/t/lib/ljson.lua (100%)
 rename debian/modules/{nginx-lua => http-lua}/tapset/ngx_lua.stp (100%)
 rename debian/modules/{nginx-lua => http-lua}/util/build.sh (100%)
 rename debian/modules/{nginx-lua => http-lua}/util/fix-comments (100%)
 rename debian/modules/{nginx-lua => http-lua}/util/gen-lexer-c (100%)
 rename debian/modules/{nginx-lua => http-lua}/util/ngx-links (100%)
 rename debian/modules/{nginx-lua => http-lua}/util/releng (100%)
 rename debian/modules/{nginx-lua => http-lua}/util/retab (100%)
 rename debian/modules/{nginx-lua => http-lua}/util/revim (100%)
 rename debian/modules/{nginx-lua => http-lua}/util/run_test.sh (100%)
 rename debian/modules/{nginx-lua => http-lua}/util/update-readme.sh (100%)
 rename debian/modules/{nginx-lua => http-lua}/valgrind.suppress (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/LICENSE (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/README.md (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/README_AUTO_LIB (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/TODO (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/actions/array (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/actions/palloc (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/build (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/action_replacements (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/action_types (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/conf_args (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/conf_locs (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/conf_macros (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/contexts (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/header_files (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/headers (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/module_dependencies (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/modules_optional (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/data/prefixes (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/src/array.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/src/conf_cmd_basic.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/src/conf_merge.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/src/palloc.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/auto/text/autogen (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/config (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/docs/core/action_macros (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/docs/core/conf_cmds (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/docs/modules/set_var (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/docs/patches/more_logging_info (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/docs/upstream/list (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/examples/README (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/examples/http/set_var/config (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/examples/http/set_var/ngx_http_set_var_examples_module.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/ngx_auto_lib_core (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/notes/CHANGES (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/notes/LICENSE (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/objs/ndk_array.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/objs/ndk_conf_cmd_basic.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/objs/ndk_conf_cmd_extra.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/objs/ndk_conf_merge.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/objs/ndk_config.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/objs/ndk_config.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/objs/ndk_includes.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/objs/ndk_palloc.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/patches/auto_config (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/patches/expose_rewrite_functions (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/patches/rewrite_phase_handler (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/hash/md5.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/hash/murmurhash2.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/hash/sha.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_buf.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_buf.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_complex_path.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_complex_path.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_complex_value.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_complex_value.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_conf_file.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_conf_file.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_debug.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_debug.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_encoding.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_encoding.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_hash.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_hash.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_http.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_http.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_http_headers.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_log.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_log.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_parse.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_path.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_path.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_process.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_process.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_regex.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_regex.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_rewrite.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_rewrite.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_set_var.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_set_var.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_string.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_string.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_string_util.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_upstream_list.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_upstream_list.h (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_uri.c (100%)
 rename debian/modules/{nginx-development-kit => http-ndk}/src/ndk_uri.h (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/CHANGES (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/README (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/config (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/doc/README.google_code_home_page.wiki (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/doc/README.html (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/doc/README.wiki (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/ngx_http_subs_filter_module.c (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/README (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/AutoInstall.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/AutoInstall.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/Base.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/Can.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/Fetch.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/Include.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/Makefile.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/Metadata.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/TestBase.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/Win32.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Module/Install/WriteAll.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Spiffy.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Test/Base.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Test/Base/Filter.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Test/Builder.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Test/Builder/Module.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/inc/Test/More.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/lib/Test/Nginx.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/lib/Test/Nginx/LWP.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/lib/Test/Nginx/Socket.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/lib/Test/Nginx/Util.pm (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/t/subs.t (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/t/subs_capture.t (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/t/subs_fix_string.t (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/t/subs_regex.t (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/t/subs_types.t (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/test/test.sh (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/util/update-readme.sh (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/util/wiki2google_code_homepage.pl (100%)
 rename debian/modules/{ngx_http_substitutions_filter_module => http-subs-filter}/util/wiki2pod.pl (100%)
 rename debian/modules/{nginx-upload-progress => http-uploadprogress}/CHANGES (100%)
 rename debian/modules/{nginx-upload-progress => http-uploadprogress}/LICENSE (100%)
 rename debian/modules/{nginx-upload-progress => http-uploadprogress}/Makefile (100%)
 rename debian/modules/{nginx-upload-progress => http-uploadprogress}/README (100%)
 rename debian/modules/{nginx-upload-progress => http-uploadprogress}/config (100%)
 rename debian/modules/{nginx-upload-progress => http-uploadprogress}/ngx_http_uploadprogress_module.c (100%)
 rename debian/modules/{nginx-upload-progress => http-uploadprogress}/test/client.sh (100%)
 rename debian/modules/{nginx-upload-progress => http-uploadprogress}/test/stress.sh (100%)
 rename debian/modules/{nginx-upstream-fair => http-upstream-fair}/.gdbinit (100%)
 rename debian/modules/{nginx-upstream-fair => http-upstream-fair}/README (100%)
 rename debian/modules/{nginx-upstream-fair => http-upstream-fair}/config (100%)
 rename debian/modules/{nginx-upstream-fair => http-upstream-fair}/ngx_http_upstream_fair_module.c (100%)
 rename debian/modules/patches/{nginx-cache-purge => http-cache-purge}/dynamic-module.patch (100%)
 rename debian/modules/patches/{nginx-cache-purge => http-cache-purge}/segfault-1.11.6.patch (100%)
 rename debian/modules/patches/{nginx-cache-purge => http-cache-purge}/series (100%)
 rename debian/modules/patches/{nginx-dav-ext-module => http-dav-ext}/dynamic-module.patch (100%)
 rename debian/modules/patches/{nginx-dav-ext-module => http-dav-ext}/series (100%)
 rename debian/modules/patches/{nginx-echo => http-echo}/build-nginx-1.11.11.patch (100%)
 rename debian/modules/patches/{nginx-echo => http-echo}/series (100%)
 rename debian/modules/patches/{nginx-lua => http-lua}/discover-luajit-2.1.patch (100%)
 rename debian/modules/patches/{nginx-lua => http-lua}/openssl-1.1.0.patch (100%)
 rename debian/modules/patches/{nginx-lua => http-lua}/series (100%)
 rename debian/modules/patches/{ngx_http_substitutions_filter_module => http-subs-filter}/dynamic-module.patch (100%)
 rename debian/modules/patches/{ngx_http_substitutions_filter_module => http-subs-filter}/series (100%)
 rename debian/modules/patches/{nginx-upstream-fair => http-upstream-fair}/drop-default-port.patch (100%)
 rename debian/modules/patches/{nginx-upstream-fair => http-upstream-fair}/dynamic-module.patch (100%)
 rename debian/modules/patches/{nginx-upstream-fair => http-upstream-fair}/openssl-1.1.0.patch (100%)
 rename debian/modules/patches/{nginx-upstream-fair => http-upstream-fair}/series (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/AUTHORS (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/LICENSE (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/README.md (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/config (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/dash/ngx_rtmp_dash_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/dash/ngx_rtmp_mp4.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/dash/ngx_rtmp_mp4.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/doc/README.md (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/hls/ngx_rtmp_hls_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/hls/ngx_rtmp_mpegts.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/hls/ngx_rtmp_mpegts.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_access_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_amf.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_amf.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_auto_push_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_bandwidth.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_bandwidth.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_bitop.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_bitop.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_cmd_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_cmd_module.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_codec_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_codec_module.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_control_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_core_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_eval.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_eval.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_exec_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_flv_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_handler.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_handshake.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_init.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_limit_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_live_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_live_module.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_log_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_mp4_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_netcall_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_netcall_module.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_notify_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_play_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_play_module.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_proxy_protocol.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_proxy_protocol.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_receive.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_record_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_record_module.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_relay_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_relay_module.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_send.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_shared.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_stat_module.c (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_streams.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/ngx_rtmp_version.h (100%)
 rename debian/modules/{nginx-rtmp => rtmp}/stat.xsl (100%)

diff --git a/debian/copyright b/debian/copyright
index 3d1b4c5..7bba41c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,35 +37,35 @@ Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
            2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
 License: BSD-2-clause
 
-Files: debian/modules/headers-more-nginx-module/*
+Files: debian/modules/http-headers-more-filter/*
 Copyright: Copyright (c) 2009-2014, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
            Copyright (c) 2010-2013, Bernd Dorn
            Copyright (c) Igor Sysoev
 License: BSD-2-clause
 
-Files: debian/modules/nginx-development-kit/*
+Files: debian/modules/http-ndk/*
 Copyright: Marcus Clyne
 License: BSD-3-clause
 
-Files: debian/modules/nginx-development-kit/src/hash/md5.h
-       debian/modules/nginx-development-kit/src/hash/sha.h
+Files: debian/modules/http-ndk/src/hash/md5.h
+       debian/modules/http-ndk/src/hash/sha.h
 Copyright: Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 License: BSD-4-clause
 
-Files: debian/modules/nginx-auth-pam/*
+Files: debian/modules/http-auth-pam/*
 Copyright: 2008-2013, Sergio Talens Oliag
 License: BSD-2-clause
 
-Files: debian/modules/nginx-echo/*
+Files: debian/modules/http-echo/*
 Copyright: Copyright (c) 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>
 License: BSD-2-clause
 
-Files: debian/modules/nginx-lua/*
+Files: debian/modules/http-lua/*
 Copyright: Copyright (C) 2009-2014, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
            Copyright (C) 2009-2014, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
 License: BSD-2-clause
 
-Files: debian/modules/nginx-upstream-fair/*
+Files: debian/modules/http-upstream-fair/*
 Copyright: Copyright (c) 2007 Grzegorz Nosek
            Igor Sysoev
 License: BSD-2-clause
@@ -85,29 +85,29 @@ Copyright: 2009-2011, Salvatore Sanfilippo
                       Jan-Erik Rediger
 License: BSD-3-clause
 
-Files: debian/modules/nginx-upload-progress/*
+Files: debian/modules/http-uploadprogress/*
 Copyright: Brice Figureau
            2002-2007, Igor Sysoev
 License: BSD-2-clause
 
-Files: debian/modules/nginx-cache-purge/*
+Files: debian/modules/http-cache-purge/*
 Copyright: 2009-2012, FRiCKLE <info@frickle.com>,
            2009-2012, Piotr Sikora <piotr.sikora@frickle.com>
 License: BSD-2-clause
 
-Files: debian/modules/nginx-dav-ext-module/*
+Files: debian/modules/http-dav-ext/*
 Copyright: Arutyunyan Roman <arut@qip.ru>
 License: BSD-2-clause
 
-Files: debian/modules/ngx-fancyindex/*
+Files: debian/modules/http-fancyindex/*
 Copyright: Copyright (c) Adrian Perez <aperez@igalia.com>
 License: BSD-2-clause
 
-Files: debian/modules/ngx_http_substitutions_filter_module/*
+Files: debian/modules/http-subs-filter/*
 Copyright: Copyright (C) 2014 by Weibin Yao <yaoweibin@gmail.com>
 License: BSD-2-clause
 
-Files: debian/modules/nginx-rtmp/*
+Files: debian/modules/rtmp/*
 Copyright: Copyright (C) 2012-2014, Roman Arutyunyan
 License: BSD-2-clause
 
diff --git a/debian/modules/nginx-auth-pam/ChangeLog b/debian/modules/http-auth-pam/ChangeLog
similarity index 100%
rename from debian/modules/nginx-auth-pam/ChangeLog
rename to debian/modules/http-auth-pam/ChangeLog
diff --git a/debian/modules/nginx-auth-pam/LICENSE b/debian/modules/http-auth-pam/LICENSE
similarity index 100%
rename from debian/modules/nginx-auth-pam/LICENSE
rename to debian/modules/http-auth-pam/LICENSE
diff --git a/debian/modules/nginx-auth-pam/README.md b/debian/modules/http-auth-pam/README.md
similarity index 100%
rename from debian/modules/nginx-auth-pam/README.md
rename to debian/modules/http-auth-pam/README.md
diff --git a/debian/modules/nginx-auth-pam/VERSION b/debian/modules/http-auth-pam/VERSION
similarity index 100%
rename from debian/modules/nginx-auth-pam/VERSION
rename to debian/modules/http-auth-pam/VERSION
diff --git a/debian/modules/nginx-auth-pam/config b/debian/modules/http-auth-pam/config
similarity index 100%
rename from debian/modules/nginx-auth-pam/config
rename to debian/modules/http-auth-pam/config
diff --git a/debian/modules/nginx-auth-pam/ngx_http_auth_pam_module.c b/debian/modules/http-auth-pam/ngx_http_auth_pam_module.c
similarity index 100%
rename from debian/modules/nginx-auth-pam/ngx_http_auth_pam_module.c
rename to debian/modules/http-auth-pam/ngx_http_auth_pam_module.c
diff --git a/debian/modules/nginx-cache-purge/CHANGES b/debian/modules/http-cache-purge/CHANGES
similarity index 100%
rename from debian/modules/nginx-cache-purge/CHANGES
rename to debian/modules/http-cache-purge/CHANGES
diff --git a/debian/modules/nginx-cache-purge/LICENSE b/debian/modules/http-cache-purge/LICENSE
similarity index 100%
rename from debian/modules/nginx-cache-purge/LICENSE
rename to debian/modules/http-cache-purge/LICENSE
diff --git a/debian/modules/nginx-cache-purge/README.md b/debian/modules/http-cache-purge/README.md
similarity index 100%
rename from debian/modules/nginx-cache-purge/README.md
rename to debian/modules/http-cache-purge/README.md
diff --git a/debian/modules/nginx-cache-purge/TODO.md b/debian/modules/http-cache-purge/TODO.md
similarity index 100%
rename from debian/modules/nginx-cache-purge/TODO.md
rename to debian/modules/http-cache-purge/TODO.md
diff --git a/debian/modules/nginx-cache-purge/config b/debian/modules/http-cache-purge/config
similarity index 100%
rename from debian/modules/nginx-cache-purge/config
rename to debian/modules/http-cache-purge/config
diff --git a/debian/modules/nginx-cache-purge/ngx_cache_purge_module.c b/debian/modules/http-cache-purge/ngx_cache_purge_module.c
similarity index 100%
rename from debian/modules/nginx-cache-purge/ngx_cache_purge_module.c
rename to debian/modules/http-cache-purge/ngx_cache_purge_module.c
diff --git a/debian/modules/nginx-cache-purge/t/proxy1.t b/debian/modules/http-cache-purge/t/proxy1.t
similarity index 100%
rename from debian/modules/nginx-cache-purge/t/proxy1.t
rename to debian/modules/http-cache-purge/t/proxy1.t
diff --git a/debian/modules/nginx-cache-purge/t/proxy1_vars.t b/debian/modules/http-cache-purge/t/proxy1_vars.t
similarity index 100%
rename from debian/modules/nginx-cache-purge/t/proxy1_vars.t
rename to debian/modules/http-cache-purge/t/proxy1_vars.t
diff --git a/debian/modules/nginx-cache-purge/t/proxy2.t b/debian/modules/http-cache-purge/t/proxy2.t
similarity index 100%
rename from debian/modules/nginx-cache-purge/t/proxy2.t
rename to debian/modules/http-cache-purge/t/proxy2.t
diff --git a/debian/modules/nginx-cache-purge/t/proxy2_vars.t b/debian/modules/http-cache-purge/t/proxy2_vars.t
similarity index 100%
rename from debian/modules/nginx-cache-purge/t/proxy2_vars.t
rename to debian/modules/http-cache-purge/t/proxy2_vars.t
diff --git a/debian/modules/nginx-dav-ext-module/README b/debian/modules/http-dav-ext/README
similarity index 100%
rename from debian/modules/nginx-dav-ext-module/README
rename to debian/modules/http-dav-ext/README
diff --git a/debian/modules/nginx-dav-ext-module/config b/debian/modules/http-dav-ext/config
similarity index 100%
rename from debian/modules/nginx-dav-ext-module/config
rename to debian/modules/http-dav-ext/config
diff --git a/debian/modules/nginx-dav-ext-module/ngx_http_dav_ext_module.c b/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
similarity index 100%
rename from debian/modules/nginx-dav-ext-module/ngx_http_dav_ext_module.c
rename to debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
diff --git a/debian/modules/nginx-echo/LICENSE b/debian/modules/http-echo/LICENSE
similarity index 100%
rename from debian/modules/nginx-echo/LICENSE
rename to debian/modules/http-echo/LICENSE
diff --git a/debian/modules/nginx-echo/README.markdown b/debian/modules/http-echo/README.markdown
similarity index 100%
rename from debian/modules/nginx-echo/README.markdown
rename to debian/modules/http-echo/README.markdown
diff --git a/debian/modules/nginx-echo/config b/debian/modules/http-echo/config
similarity index 100%
rename from debian/modules/nginx-echo/config
rename to debian/modules/http-echo/config
diff --git a/debian/modules/nginx-echo/src/ddebug.h b/debian/modules/http-echo/src/ddebug.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ddebug.h
rename to debian/modules/http-echo/src/ddebug.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_echo.c b/debian/modules/http-echo/src/ngx_http_echo_echo.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_echo.c
rename to debian/modules/http-echo/src/ngx_http_echo_echo.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_echo.h b/debian/modules/http-echo/src/ngx_http_echo_echo.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_echo.h
rename to debian/modules/http-echo/src/ngx_http_echo_echo.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_filter.c b/debian/modules/http-echo/src/ngx_http_echo_filter.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_filter.c
rename to debian/modules/http-echo/src/ngx_http_echo_filter.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_filter.h b/debian/modules/http-echo/src/ngx_http_echo_filter.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_filter.h
rename to debian/modules/http-echo/src/ngx_http_echo_filter.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_foreach.c b/debian/modules/http-echo/src/ngx_http_echo_foreach.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_foreach.c
rename to debian/modules/http-echo/src/ngx_http_echo_foreach.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_foreach.h b/debian/modules/http-echo/src/ngx_http_echo_foreach.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_foreach.h
rename to debian/modules/http-echo/src/ngx_http_echo_foreach.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_handler.c b/debian/modules/http-echo/src/ngx_http_echo_handler.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_handler.c
rename to debian/modules/http-echo/src/ngx_http_echo_handler.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_handler.h b/debian/modules/http-echo/src/ngx_http_echo_handler.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_handler.h
rename to debian/modules/http-echo/src/ngx_http_echo_handler.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_location.c b/debian/modules/http-echo/src/ngx_http_echo_location.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_location.c
rename to debian/modules/http-echo/src/ngx_http_echo_location.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_location.h b/debian/modules/http-echo/src/ngx_http_echo_location.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_location.h
rename to debian/modules/http-echo/src/ngx_http_echo_location.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_module.c b/debian/modules/http-echo/src/ngx_http_echo_module.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_module.c
rename to debian/modules/http-echo/src/ngx_http_echo_module.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_module.h b/debian/modules/http-echo/src/ngx_http_echo_module.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_module.h
rename to debian/modules/http-echo/src/ngx_http_echo_module.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_request_info.c b/debian/modules/http-echo/src/ngx_http_echo_request_info.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_request_info.c
rename to debian/modules/http-echo/src/ngx_http_echo_request_info.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_request_info.h b/debian/modules/http-echo/src/ngx_http_echo_request_info.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_request_info.h
rename to debian/modules/http-echo/src/ngx_http_echo_request_info.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_sleep.c b/debian/modules/http-echo/src/ngx_http_echo_sleep.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_sleep.c
rename to debian/modules/http-echo/src/ngx_http_echo_sleep.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_sleep.h b/debian/modules/http-echo/src/ngx_http_echo_sleep.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_sleep.h
rename to debian/modules/http-echo/src/ngx_http_echo_sleep.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_subrequest.c b/debian/modules/http-echo/src/ngx_http_echo_subrequest.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_subrequest.c
rename to debian/modules/http-echo/src/ngx_http_echo_subrequest.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_subrequest.h b/debian/modules/http-echo/src/ngx_http_echo_subrequest.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_subrequest.h
rename to debian/modules/http-echo/src/ngx_http_echo_subrequest.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_timer.c b/debian/modules/http-echo/src/ngx_http_echo_timer.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_timer.c
rename to debian/modules/http-echo/src/ngx_http_echo_timer.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_timer.h b/debian/modules/http-echo/src/ngx_http_echo_timer.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_timer.h
rename to debian/modules/http-echo/src/ngx_http_echo_timer.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_util.c b/debian/modules/http-echo/src/ngx_http_echo_util.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_util.c
rename to debian/modules/http-echo/src/ngx_http_echo_util.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_util.h b/debian/modules/http-echo/src/ngx_http_echo_util.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_util.h
rename to debian/modules/http-echo/src/ngx_http_echo_util.h
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_var.c b/debian/modules/http-echo/src/ngx_http_echo_var.c
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_var.c
rename to debian/modules/http-echo/src/ngx_http_echo_var.c
diff --git a/debian/modules/nginx-echo/src/ngx_http_echo_var.h b/debian/modules/http-echo/src/ngx_http_echo_var.h
similarity index 100%
rename from debian/modules/nginx-echo/src/ngx_http_echo_var.h
rename to debian/modules/http-echo/src/ngx_http_echo_var.h
diff --git a/debian/modules/nginx-echo/t/abort-parent.t b/debian/modules/http-echo/t/abort-parent.t
similarity index 100%
rename from debian/modules/nginx-echo/t/abort-parent.t
rename to debian/modules/http-echo/t/abort-parent.t
diff --git a/debian/modules/nginx-echo/t/blocking-sleep.t b/debian/modules/http-echo/t/blocking-sleep.t
similarity index 100%
rename from debian/modules/nginx-echo/t/blocking-sleep.t
rename to debian/modules/http-echo/t/blocking-sleep.t
diff --git a/debian/modules/nginx-echo/t/echo-after-body.t b/debian/modules/http-echo/t/echo-after-body.t
similarity index 100%
rename from debian/modules/nginx-echo/t/echo-after-body.t
rename to debian/modules/http-echo/t/echo-after-body.t
diff --git a/debian/modules/nginx-echo/t/echo-before-body.t b/debian/modules/http-echo/t/echo-before-body.t
similarity index 100%
rename from debian/modules/nginx-echo/t/echo-before-body.t
rename to debian/modules/http-echo/t/echo-before-body.t
diff --git a/debian/modules/nginx-echo/t/echo-duplicate.t b/debian/modules/http-echo/t/echo-duplicate.t
similarity index 100%
rename from debian/modules/nginx-echo/t/echo-duplicate.t
rename to debian/modules/http-echo/t/echo-duplicate.t
diff --git a/debian/modules/nginx-echo/t/echo-timer.t b/debian/modules/http-echo/t/echo-timer.t
similarity index 100%
rename from debian/modules/nginx-echo/t/echo-timer.t
rename to debian/modules/http-echo/t/echo-timer.t
diff --git a/debian/modules/nginx-echo/t/echo.t b/debian/modules/http-echo/t/echo.t
similarity index 100%
rename from debian/modules/nginx-echo/t/echo.t
rename to debian/modules/http-echo/t/echo.t
diff --git a/debian/modules/nginx-echo/t/exec.t b/debian/modules/http-echo/t/exec.t
similarity index 100%
rename from debian/modules/nginx-echo/t/exec.t
rename to debian/modules/http-echo/t/exec.t
diff --git a/debian/modules/nginx-echo/t/filter-used.t b/debian/modules/http-echo/t/filter-used.t
similarity index 100%
rename from debian/modules/nginx-echo/t/filter-used.t
rename to debian/modules/http-echo/t/filter-used.t
diff --git a/debian/modules/nginx-echo/t/foreach-split.t b/debian/modules/http-echo/t/foreach-split.t
similarity index 100%
rename from debian/modules/nginx-echo/t/foreach-split.t
rename to debian/modules/http-echo/t/foreach-split.t
diff --git a/debian/modules/nginx-echo/t/gzip.t b/debian/modules/http-echo/t/gzip.t
similarity index 100%
rename from debian/modules/nginx-echo/t/gzip.t
rename to debian/modules/http-echo/t/gzip.t
diff --git a/debian/modules/nginx-echo/t/if.t b/debian/modules/http-echo/t/if.t
similarity index 100%
rename from debian/modules/nginx-echo/t/if.t
rename to debian/modules/http-echo/t/if.t
diff --git a/debian/modules/nginx-echo/t/incr.t b/debian/modules/http-echo/t/incr.t
similarity index 100%
rename from debian/modules/nginx-echo/t/incr.t
rename to debian/modules/http-echo/t/incr.t
diff --git a/debian/modules/nginx-echo/t/location-async.t b/debian/modules/http-echo/t/location-async.t
similarity index 100%
rename from debian/modules/nginx-echo/t/location-async.t
rename to debian/modules/http-echo/t/location-async.t
diff --git a/debian/modules/nginx-echo/t/location.t b/debian/modules/http-echo/t/location.t
similarity index 100%
rename from debian/modules/nginx-echo/t/location.t
rename to debian/modules/http-echo/t/location.t
diff --git a/debian/modules/nginx-echo/t/mixed.t b/debian/modules/http-echo/t/mixed.t
similarity index 100%
rename from debian/modules/nginx-echo/t/mixed.t
rename to debian/modules/http-echo/t/mixed.t
diff --git a/debian/modules/nginx-echo/t/request-body.t b/debian/modules/http-echo/t/request-body.t
similarity index 100%
rename from debian/modules/nginx-echo/t/request-body.t
rename to debian/modules/http-echo/t/request-body.t
diff --git a/debian/modules/nginx-echo/t/request-info.t b/debian/modules/http-echo/t/request-info.t
similarity index 100%
rename from debian/modules/nginx-echo/t/request-info.t
rename to debian/modules/http-echo/t/request-info.t
diff --git a/debian/modules/nginx-echo/t/sleep.t b/debian/modules/http-echo/t/sleep.t
similarity index 100%
rename from debian/modules/nginx-echo/t/sleep.t
rename to debian/modules/http-echo/t/sleep.t
diff --git a/debian/modules/nginx-echo/t/status.t b/debian/modules/http-echo/t/status.t
similarity index 100%
rename from debian/modules/nginx-echo/t/status.t
rename to debian/modules/http-echo/t/status.t
diff --git a/debian/modules/nginx-echo/t/subrequest-async.t b/debian/modules/http-echo/t/subrequest-async.t
similarity index 100%
rename from debian/modules/nginx-echo/t/subrequest-async.t
rename to debian/modules/http-echo/t/subrequest-async.t
diff --git a/debian/modules/nginx-echo/t/subrequest.t b/debian/modules/http-echo/t/subrequest.t
similarity index 100%
rename from debian/modules/nginx-echo/t/subrequest.t
rename to debian/modules/http-echo/t/subrequest.t
diff --git a/debian/modules/nginx-echo/t/unused.t b/debian/modules/http-echo/t/unused.t
similarity index 100%
rename from debian/modules/nginx-echo/t/unused.t
rename to debian/modules/http-echo/t/unused.t
diff --git a/debian/modules/nginx-echo/util/build.sh b/debian/modules/http-echo/util/build.sh
similarity index 100%
rename from debian/modules/nginx-echo/util/build.sh
rename to debian/modules/http-echo/util/build.sh
diff --git a/debian/modules/nginx-echo/util/releng b/debian/modules/http-echo/util/releng
similarity index 100%
rename from debian/modules/nginx-echo/util/releng
rename to debian/modules/http-echo/util/releng
diff --git a/debian/modules/nginx-echo/util/wiki2pod.pl b/debian/modules/http-echo/util/wiki2pod.pl
similarity index 100%
rename from debian/modules/nginx-echo/util/wiki2pod.pl
rename to debian/modules/http-echo/util/wiki2pod.pl
diff --git a/debian/modules/nginx-echo/valgrind.suppress b/debian/modules/http-echo/valgrind.suppress
similarity index 100%
rename from debian/modules/nginx-echo/valgrind.suppress
rename to debian/modules/http-echo/valgrind.suppress
diff --git a/debian/modules/ngx-fancyindex/CHANGELOG.md b/debian/modules/http-fancyindex/CHANGELOG.md
similarity index 100%
rename from debian/modules/ngx-fancyindex/CHANGELOG.md
rename to debian/modules/http-fancyindex/CHANGELOG.md
diff --git a/debian/modules/ngx-fancyindex/HACKING.md b/debian/modules/http-fancyindex/HACKING.md
similarity index 100%
rename from debian/modules/ngx-fancyindex/HACKING.md
rename to debian/modules/http-fancyindex/HACKING.md
diff --git a/debian/modules/ngx-fancyindex/LICENSE b/debian/modules/http-fancyindex/LICENSE
similarity index 100%
rename from debian/modules/ngx-fancyindex/LICENSE
rename to debian/modules/http-fancyindex/LICENSE
diff --git a/debian/modules/ngx-fancyindex/README.rst b/debian/modules/http-fancyindex/README.rst
similarity index 100%
rename from debian/modules/ngx-fancyindex/README.rst
rename to debian/modules/http-fancyindex/README.rst
diff --git a/debian/modules/ngx-fancyindex/config b/debian/modules/http-fancyindex/config
similarity index 100%
rename from debian/modules/ngx-fancyindex/config
rename to debian/modules/http-fancyindex/config
diff --git a/debian/modules/ngx-fancyindex/nginx-0.6-support.patch b/debian/modules/http-fancyindex/nginx-0.6-support.patch
similarity index 100%
rename from debian/modules/ngx-fancyindex/nginx-0.6-support.patch
rename to debian/modules/http-fancyindex/nginx-0.6-support.patch
diff --git a/debian/modules/ngx-fancyindex/ngx_http_fancyindex_module.c b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
similarity index 100%
rename from debian/modules/ngx-fancyindex/ngx_http_fancyindex_module.c
rename to debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
diff --git a/debian/modules/ngx-fancyindex/t/00-build-artifacts.test b/debian/modules/http-fancyindex/t/00-build-artifacts.test
similarity index 100%
rename from debian/modules/ngx-fancyindex/t/00-build-artifacts.test
rename to debian/modules/http-fancyindex/t/00-build-artifacts.test
diff --git a/debian/modules/ngx-fancyindex/t/01-smoke-hasindex.test b/debian/modules/http-fancyindex/t/01-smoke-hasindex.test
similarity index 100%
rename from debian/modules/ngx-fancyindex/t/01-smoke-hasindex.test
rename to debian/modules/http-fancyindex/t/01-smoke-hasindex.test
diff --git a/debian/modules/ngx-fancyindex/t/02-smoke-indexisfancy.test b/debian/modules/http-fancyindex/t/02-smoke-indexisfancy.test
similarity index 100%
rename from debian/modules/ngx-fancyindex/t/02-smoke-indexisfancy.test
rename to debian/modules/http-fancyindex/t/02-smoke-indexisfancy.test
diff --git a/debian/modules/ngx-fancyindex/t/build-and-run b/debian/modules/http-fancyindex/t/build-and-run
similarity index 100%
rename from debian/modules/ngx-fancyindex/t/build-and-run
rename to debian/modules/http-fancyindex/t/build-and-run
diff --git a/debian/modules/ngx-fancyindex/t/has-index.test b/debian/modules/http-fancyindex/t/has-index.test
similarity index 100%
rename from debian/modules/ngx-fancyindex/t/has-index.test
rename to debian/modules/http-fancyindex/t/has-index.test
diff --git a/debian/modules/ngx-fancyindex/t/has-index/index.html b/debian/modules/http-fancyindex/t/has-index/index.html
similarity index 100%
rename from debian/modules/ngx-fancyindex/t/has-index/index.html
rename to debian/modules/http-fancyindex/t/has-index/index.html
diff --git a/debian/modules/ngx-fancyindex/t/nginx.conf b/debian/modules/http-fancyindex/t/nginx.conf
similarity index 100%
rename from debian/modules/ngx-fancyindex/t/nginx.conf
rename to debian/modules/http-fancyindex/t/nginx.conf
diff --git a/debian/modules/ngx-fancyindex/t/preamble b/debian/modules/http-fancyindex/t/preamble
similarity index 100%
rename from debian/modules/ngx-fancyindex/t/preamble
rename to debian/modules/http-fancyindex/t/preamble
diff --git a/debian/modules/ngx-fancyindex/t/run b/debian/modules/http-fancyindex/t/run
similarity index 100%
rename from debian/modules/ngx-fancyindex/t/run
rename to debian/modules/http-fancyindex/t/run
diff --git a/debian/modules/ngx-fancyindex/template.awk b/debian/modules/http-fancyindex/template.awk
similarity index 100%
rename from debian/modules/ngx-fancyindex/template.awk
rename to debian/modules/http-fancyindex/template.awk
diff --git a/debian/modules/ngx-fancyindex/template.h b/debian/modules/http-fancyindex/template.h
similarity index 100%
rename from debian/modules/ngx-fancyindex/template.h
rename to debian/modules/http-fancyindex/template.h
diff --git a/debian/modules/ngx-fancyindex/template.html b/debian/modules/http-fancyindex/template.html
similarity index 100%
rename from debian/modules/ngx-fancyindex/template.html
rename to debian/modules/http-fancyindex/template.html
diff --git a/debian/modules/headers-more-nginx-module/README.markdown b/debian/modules/http-headers-more-filter/README.markdown
similarity index 100%
rename from debian/modules/headers-more-nginx-module/README.markdown
rename to debian/modules/http-headers-more-filter/README.markdown
diff --git a/debian/modules/headers-more-nginx-module/config b/debian/modules/http-headers-more-filter/config
similarity index 100%
rename from debian/modules/headers-more-nginx-module/config
rename to debian/modules/http-headers-more-filter/config
diff --git a/debian/modules/headers-more-nginx-module/src/ddebug.h b/debian/modules/http-headers-more-filter/src/ddebug.h
similarity index 100%
rename from debian/modules/headers-more-nginx-module/src/ddebug.h
rename to debian/modules/http-headers-more-filter/src/ddebug.h
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.c b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.c
similarity index 100%
rename from debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.c
rename to debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.c
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.h b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.h
similarity index 100%
rename from debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_filter_module.h
rename to debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.h
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c
similarity index 100%
rename from debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.c
rename to debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.h b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.h
similarity index 100%
rename from debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_in.h
rename to debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.h
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.c b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.c
similarity index 100%
rename from debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.c
rename to debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.c
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.h b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.h
similarity index 100%
rename from debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_headers_out.h
rename to debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.h
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.c b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.c
similarity index 100%
rename from debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.c
rename to debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.c
diff --git a/debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.h b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.h
similarity index 100%
rename from debian/modules/headers-more-nginx-module/src/ngx_http_headers_more_util.h
rename to debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.h
diff --git a/debian/modules/headers-more-nginx-module/t/bug.t b/debian/modules/http-headers-more-filter/t/bug.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/bug.t
rename to debian/modules/http-headers-more-filter/t/bug.t
diff --git a/debian/modules/headers-more-nginx-module/t/builtin.t b/debian/modules/http-headers-more-filter/t/builtin.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/builtin.t
rename to debian/modules/http-headers-more-filter/t/builtin.t
diff --git a/debian/modules/headers-more-nginx-module/t/eval.t b/debian/modules/http-headers-more-filter/t/eval.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/eval.t
rename to debian/modules/http-headers-more-filter/t/eval.t
diff --git a/debian/modules/headers-more-nginx-module/t/input-conn.t b/debian/modules/http-headers-more-filter/t/input-conn.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/input-conn.t
rename to debian/modules/http-headers-more-filter/t/input-conn.t
diff --git a/debian/modules/headers-more-nginx-module/t/input-cookie.t b/debian/modules/http-headers-more-filter/t/input-cookie.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/input-cookie.t
rename to debian/modules/http-headers-more-filter/t/input-cookie.t
diff --git a/debian/modules/headers-more-nginx-module/t/input-ua.t b/debian/modules/http-headers-more-filter/t/input-ua.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/input-ua.t
rename to debian/modules/http-headers-more-filter/t/input-ua.t
diff --git a/debian/modules/headers-more-nginx-module/t/input.t b/debian/modules/http-headers-more-filter/t/input.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/input.t
rename to debian/modules/http-headers-more-filter/t/input.t
diff --git a/debian/modules/headers-more-nginx-module/t/phase.t b/debian/modules/http-headers-more-filter/t/phase.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/phase.t
rename to debian/modules/http-headers-more-filter/t/phase.t
diff --git a/debian/modules/headers-more-nginx-module/t/sanity.t b/debian/modules/http-headers-more-filter/t/sanity.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/sanity.t
rename to debian/modules/http-headers-more-filter/t/sanity.t
diff --git a/debian/modules/headers-more-nginx-module/t/subrequest.t b/debian/modules/http-headers-more-filter/t/subrequest.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/subrequest.t
rename to debian/modules/http-headers-more-filter/t/subrequest.t
diff --git a/debian/modules/headers-more-nginx-module/t/unused.t b/debian/modules/http-headers-more-filter/t/unused.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/unused.t
rename to debian/modules/http-headers-more-filter/t/unused.t
diff --git a/debian/modules/headers-more-nginx-module/t/vars.t b/debian/modules/http-headers-more-filter/t/vars.t
similarity index 100%
rename from debian/modules/headers-more-nginx-module/t/vars.t
rename to debian/modules/http-headers-more-filter/t/vars.t
diff --git a/debian/modules/headers-more-nginx-module/util/build.sh b/debian/modules/http-headers-more-filter/util/build.sh
similarity index 100%
rename from debian/modules/headers-more-nginx-module/util/build.sh
rename to debian/modules/http-headers-more-filter/util/build.sh
diff --git a/debian/modules/headers-more-nginx-module/valgrind.suppress b/debian/modules/http-headers-more-filter/valgrind.suppress
similarity index 100%
rename from debian/modules/headers-more-nginx-module/valgrind.suppress
rename to debian/modules/http-headers-more-filter/valgrind.suppress
diff --git a/debian/modules/nginx-lua/README.markdown b/debian/modules/http-lua/README.markdown
similarity index 100%
rename from debian/modules/nginx-lua/README.markdown
rename to debian/modules/http-lua/README.markdown
diff --git a/debian/modules/nginx-lua/config b/debian/modules/http-lua/config
similarity index 100%
rename from debian/modules/nginx-lua/config
rename to debian/modules/http-lua/config
diff --git a/debian/modules/nginx-lua/doc/HttpLuaModule.wiki b/debian/modules/http-lua/doc/HttpLuaModule.wiki
similarity index 100%
rename from debian/modules/nginx-lua/doc/HttpLuaModule.wiki
rename to debian/modules/http-lua/doc/HttpLuaModule.wiki
diff --git a/debian/modules/nginx-lua/dtrace/ngx_lua_provider.d b/debian/modules/http-lua/dtrace/ngx_lua_provider.d
similarity index 100%
rename from debian/modules/nginx-lua/dtrace/ngx_lua_provider.d
rename to debian/modules/http-lua/dtrace/ngx_lua_provider.d
diff --git a/debian/modules/nginx-lua/misc/recv-until-pm/Makefile b/debian/modules/http-lua/misc/recv-until-pm/Makefile
similarity index 100%
rename from debian/modules/nginx-lua/misc/recv-until-pm/Makefile
rename to debian/modules/http-lua/misc/recv-until-pm/Makefile
diff --git a/debian/modules/nginx-lua/misc/recv-until-pm/lib/RecvUntil.pm b/debian/modules/http-lua/misc/recv-until-pm/lib/RecvUntil.pm
similarity index 100%
rename from debian/modules/nginx-lua/misc/recv-until-pm/lib/RecvUntil.pm
rename to debian/modules/http-lua/misc/recv-until-pm/lib/RecvUntil.pm
diff --git a/debian/modules/nginx-lua/misc/recv-until-pm/t/sanity.t b/debian/modules/http-lua/misc/recv-until-pm/t/sanity.t
similarity index 100%
rename from debian/modules/nginx-lua/misc/recv-until-pm/t/sanity.t
rename to debian/modules/http-lua/misc/recv-until-pm/t/sanity.t
diff --git a/debian/modules/nginx-lua/src/api/ngx_http_lua_api.h b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
similarity index 100%
rename from debian/modules/nginx-lua/src/api/ngx_http_lua_api.h
rename to debian/modules/http-lua/src/api/ngx_http_lua_api.h
diff --git a/debian/modules/nginx-lua/src/ddebug.h b/debian/modules/http-lua/src/ddebug.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ddebug.h
rename to debian/modules/http-lua/src/ddebug.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_accessby.c b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_accessby.c
rename to debian/modules/http-lua/src/ngx_http_lua_accessby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_accessby.h b/debian/modules/http-lua/src/ngx_http_lua_accessby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_accessby.h
rename to debian/modules/http-lua/src/ngx_http_lua_accessby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_api.c b/debian/modules/http-lua/src/ngx_http_lua_api.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_api.c
rename to debian/modules/http-lua/src/ngx_http_lua_api.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_args.c b/debian/modules/http-lua/src/ngx_http_lua_args.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_args.c
rename to debian/modules/http-lua/src/ngx_http_lua_args.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_args.h b/debian/modules/http-lua/src/ngx_http_lua_args.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_args.h
rename to debian/modules/http-lua/src/ngx_http_lua_args.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.c b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_balancer.c
rename to debian/modules/http-lua/src/ngx_http_lua_balancer.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_balancer.h b/debian/modules/http-lua/src/ngx_http_lua_balancer.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_balancer.h
rename to debian/modules/http-lua/src/ngx_http_lua_balancer.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.c
rename to debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.h b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_bodyfilterby.h
rename to debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_cache.c b/debian/modules/http-lua/src/ngx_http_lua_cache.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_cache.c
rename to debian/modules/http-lua/src/ngx_http_lua_cache.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_cache.h b/debian/modules/http-lua/src/ngx_http_lua_cache.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_cache.h
rename to debian/modules/http-lua/src/ngx_http_lua_cache.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_capturefilter.c b/debian/modules/http-lua/src/ngx_http_lua_capturefilter.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_capturefilter.c
rename to debian/modules/http-lua/src/ngx_http_lua_capturefilter.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_capturefilter.h b/debian/modules/http-lua/src/ngx_http_lua_capturefilter.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_capturefilter.h
rename to debian/modules/http-lua/src/ngx_http_lua_capturefilter.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_clfactory.c
rename to debian/modules/http-lua/src/ngx_http_lua_clfactory.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_clfactory.h b/debian/modules/http-lua/src/ngx_http_lua_clfactory.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_clfactory.h
rename to debian/modules/http-lua/src/ngx_http_lua_clfactory.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_common.h b/debian/modules/http-lua/src/ngx_http_lua_common.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_common.h
rename to debian/modules/http-lua/src/ngx_http_lua_common.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_config.c b/debian/modules/http-lua/src/ngx_http_lua_config.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_config.c
rename to debian/modules/http-lua/src/ngx_http_lua_config.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_config.h b/debian/modules/http-lua/src/ngx_http_lua_config.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_config.h
rename to debian/modules/http-lua/src/ngx_http_lua_config.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_consts.c b/debian/modules/http-lua/src/ngx_http_lua_consts.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_consts.c
rename to debian/modules/http-lua/src/ngx_http_lua_consts.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_consts.h b/debian/modules/http-lua/src/ngx_http_lua_consts.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_consts.h
rename to debian/modules/http-lua/src/ngx_http_lua_consts.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_contentby.c b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_contentby.c
rename to debian/modules/http-lua/src/ngx_http_lua_contentby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_contentby.h b/debian/modules/http-lua/src/ngx_http_lua_contentby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_contentby.h
rename to debian/modules/http-lua/src/ngx_http_lua_contentby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_control.c b/debian/modules/http-lua/src/ngx_http_lua_control.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_control.c
rename to debian/modules/http-lua/src/ngx_http_lua_control.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_control.h b/debian/modules/http-lua/src/ngx_http_lua_control.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_control.h
rename to debian/modules/http-lua/src/ngx_http_lua_control.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_coroutine.c
rename to debian/modules/http-lua/src/ngx_http_lua_coroutine.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_coroutine.h b/debian/modules/http-lua/src/ngx_http_lua_coroutine.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_coroutine.h
rename to debian/modules/http-lua/src/ngx_http_lua_coroutine.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ctx.c b/debian/modules/http-lua/src/ngx_http_lua_ctx.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ctx.c
rename to debian/modules/http-lua/src/ngx_http_lua_ctx.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ctx.h b/debian/modules/http-lua/src/ngx_http_lua_ctx.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ctx.h
rename to debian/modules/http-lua/src/ngx_http_lua_ctx.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_directive.c b/debian/modules/http-lua/src/ngx_http_lua_directive.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_directive.c
rename to debian/modules/http-lua/src/ngx_http_lua_directive.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_directive.h b/debian/modules/http-lua/src/ngx_http_lua_directive.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_directive.h
rename to debian/modules/http-lua/src/ngx_http_lua_directive.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_exception.c b/debian/modules/http-lua/src/ngx_http_lua_exception.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_exception.c
rename to debian/modules/http-lua/src/ngx_http_lua_exception.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_exception.h b/debian/modules/http-lua/src/ngx_http_lua_exception.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_exception.h
rename to debian/modules/http-lua/src/ngx_http_lua_exception.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.c
rename to debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.h b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_headerfilterby.h
rename to debian/modules/http-lua/src/ngx_http_lua_headerfilterby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers.c b/debian/modules/http-lua/src/ngx_http_lua_headers.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_headers.c
rename to debian/modules/http-lua/src/ngx_http_lua_headers.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers.h b/debian/modules/http-lua/src/ngx_http_lua_headers.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_headers.h
rename to debian/modules/http-lua/src/ngx_http_lua_headers.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers_in.c b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_headers_in.c
rename to debian/modules/http-lua/src/ngx_http_lua_headers_in.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers_in.h b/debian/modules/http-lua/src/ngx_http_lua_headers_in.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_headers_in.h
rename to debian/modules/http-lua/src/ngx_http_lua_headers_in.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_headers_out.c
rename to debian/modules/http-lua/src/ngx_http_lua_headers_out.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_headers_out.h b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_headers_out.h
rename to debian/modules/http-lua/src/ngx_http_lua_headers_out.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_initby.c b/debian/modules/http-lua/src/ngx_http_lua_initby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_initby.c
rename to debian/modules/http-lua/src/ngx_http_lua_initby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_initby.h b/debian/modules/http-lua/src/ngx_http_lua_initby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_initby.h
rename to debian/modules/http-lua/src/ngx_http_lua_initby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.c
rename to debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.h b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_initworkerby.h
rename to debian/modules/http-lua/src/ngx_http_lua_initworkerby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_lex.c b/debian/modules/http-lua/src/ngx_http_lua_lex.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_lex.c
rename to debian/modules/http-lua/src/ngx_http_lua_lex.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_lex.h b/debian/modules/http-lua/src/ngx_http_lua_lex.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_lex.h
rename to debian/modules/http-lua/src/ngx_http_lua_lex.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_log.c b/debian/modules/http-lua/src/ngx_http_lua_log.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_log.c
rename to debian/modules/http-lua/src/ngx_http_lua_log.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_log.h b/debian/modules/http-lua/src/ngx_http_lua_log.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_log.h
rename to debian/modules/http-lua/src/ngx_http_lua_log.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.c b/debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.c
rename to debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.h b/debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_log_ringbuf.h
rename to debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_logby.c b/debian/modules/http-lua/src/ngx_http_lua_logby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_logby.c
rename to debian/modules/http-lua/src/ngx_http_lua_logby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_logby.h b/debian/modules/http-lua/src/ngx_http_lua_logby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_logby.h
rename to debian/modules/http-lua/src/ngx_http_lua_logby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_misc.c b/debian/modules/http-lua/src/ngx_http_lua_misc.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_misc.c
rename to debian/modules/http-lua/src/ngx_http_lua_misc.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_misc.h b/debian/modules/http-lua/src/ngx_http_lua_misc.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_misc.h
rename to debian/modules/http-lua/src/ngx_http_lua_misc.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_module.c b/debian/modules/http-lua/src/ngx_http_lua_module.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_module.c
rename to debian/modules/http-lua/src/ngx_http_lua_module.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ndk.c b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ndk.c
rename to debian/modules/http-lua/src/ngx_http_lua_ndk.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ndk.h b/debian/modules/http-lua/src/ngx_http_lua_ndk.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ndk.h
rename to debian/modules/http-lua/src/ngx_http_lua_ndk.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_output.c b/debian/modules/http-lua/src/ngx_http_lua_output.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_output.c
rename to debian/modules/http-lua/src/ngx_http_lua_output.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_output.h b/debian/modules/http-lua/src/ngx_http_lua_output.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_output.h
rename to debian/modules/http-lua/src/ngx_http_lua_output.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_pcrefix.c b/debian/modules/http-lua/src/ngx_http_lua_pcrefix.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_pcrefix.c
rename to debian/modules/http-lua/src/ngx_http_lua_pcrefix.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_pcrefix.h b/debian/modules/http-lua/src/ngx_http_lua_pcrefix.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_pcrefix.h
rename to debian/modules/http-lua/src/ngx_http_lua_pcrefix.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_phase.c b/debian/modules/http-lua/src/ngx_http_lua_phase.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_phase.c
rename to debian/modules/http-lua/src/ngx_http_lua_phase.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_phase.h b/debian/modules/http-lua/src/ngx_http_lua_phase.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_phase.h
rename to debian/modules/http-lua/src/ngx_http_lua_phase.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_probe.h b/debian/modules/http-lua/src/ngx_http_lua_probe.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_probe.h
rename to debian/modules/http-lua/src/ngx_http_lua_probe.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_regex.c b/debian/modules/http-lua/src/ngx_http_lua_regex.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_regex.c
rename to debian/modules/http-lua/src/ngx_http_lua_regex.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_regex.h b/debian/modules/http-lua/src/ngx_http_lua_regex.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_regex.h
rename to debian/modules/http-lua/src/ngx_http_lua_regex.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_req_body.c b/debian/modules/http-lua/src/ngx_http_lua_req_body.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_req_body.c
rename to debian/modules/http-lua/src/ngx_http_lua_req_body.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_req_body.h b/debian/modules/http-lua/src/ngx_http_lua_req_body.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_req_body.h
rename to debian/modules/http-lua/src/ngx_http_lua_req_body.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_req_method.c b/debian/modules/http-lua/src/ngx_http_lua_req_method.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_req_method.c
rename to debian/modules/http-lua/src/ngx_http_lua_req_method.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_req_method.h b/debian/modules/http-lua/src/ngx_http_lua_req_method.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_req_method.h
rename to debian/modules/http-lua/src/ngx_http_lua_req_method.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.c
rename to debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.h b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_rewriteby.h
rename to debian/modules/http-lua/src/ngx_http_lua_rewriteby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_script.c b/debian/modules/http-lua/src/ngx_http_lua_script.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_script.c
rename to debian/modules/http-lua/src/ngx_http_lua_script.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_script.h b/debian/modules/http-lua/src/ngx_http_lua_script.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_script.h
rename to debian/modules/http-lua/src/ngx_http_lua_script.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c b/debian/modules/http-lua/src/ngx_http_lua_semaphore.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_semaphore.c
rename to debian/modules/http-lua/src/ngx_http_lua_semaphore.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h b/debian/modules/http-lua/src/ngx_http_lua_semaphore.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_semaphore.h
rename to debian/modules/http-lua/src/ngx_http_lua_semaphore.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_setby.c b/debian/modules/http-lua/src/ngx_http_lua_setby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_setby.c
rename to debian/modules/http-lua/src/ngx_http_lua_setby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_setby.h b/debian/modules/http-lua/src/ngx_http_lua_setby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_setby.h
rename to debian/modules/http-lua/src/ngx_http_lua_setby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.c b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_shdict.c
rename to debian/modules/http-lua/src/ngx_http_lua_shdict.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_shdict.h b/debian/modules/http-lua/src/ngx_http_lua_shdict.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_shdict.h
rename to debian/modules/http-lua/src/ngx_http_lua_shdict.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_sleep.c b/debian/modules/http-lua/src/ngx_http_lua_sleep.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_sleep.c
rename to debian/modules/http-lua/src/ngx_http_lua_sleep.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_sleep.h b/debian/modules/http-lua/src/ngx_http_lua_sleep.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_sleep.h
rename to debian/modules/http-lua/src/ngx_http_lua_sleep.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.c
rename to debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_socket_tcp.h
rename to debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.c
rename to debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_socket_udp.h
rename to debian/modules/http-lua/src/ngx_http_lua_socket_udp.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl.c b/debian/modules/http-lua/src/ngx_http_lua_ssl.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ssl.c
rename to debian/modules/http-lua/src/ngx_http_lua_ssl.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl.h b/debian/modules/http-lua/src/ngx_http_lua_ssl.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ssl.h
rename to debian/modules/http-lua/src/ngx_http_lua_ssl.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.c
rename to debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ssl_certby.h
rename to debian/modules/http-lua/src/ngx_http_lua_ssl_certby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ssl_ocsp.c
rename to debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.c
rename to debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.h b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_fetchby.h
rename to debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
rename to debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.h b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.h
rename to debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_string.c b/debian/modules/http-lua/src/ngx_http_lua_string.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_string.c
rename to debian/modules/http-lua/src/ngx_http_lua_string.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_string.h b/debian/modules/http-lua/src/ngx_http_lua_string.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_string.h
rename to debian/modules/http-lua/src/ngx_http_lua_string.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_subrequest.c
rename to debian/modules/http-lua/src/ngx_http_lua_subrequest.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_subrequest.h b/debian/modules/http-lua/src/ngx_http_lua_subrequest.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_subrequest.h
rename to debian/modules/http-lua/src/ngx_http_lua_subrequest.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_time.c b/debian/modules/http-lua/src/ngx_http_lua_time.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_time.c
rename to debian/modules/http-lua/src/ngx_http_lua_time.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_time.h b/debian/modules/http-lua/src/ngx_http_lua_time.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_time.h
rename to debian/modules/http-lua/src/ngx_http_lua_time.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_timer.c b/debian/modules/http-lua/src/ngx_http_lua_timer.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_timer.c
rename to debian/modules/http-lua/src/ngx_http_lua_timer.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_timer.h b/debian/modules/http-lua/src/ngx_http_lua_timer.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_timer.h
rename to debian/modules/http-lua/src/ngx_http_lua_timer.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_uri.c b/debian/modules/http-lua/src/ngx_http_lua_uri.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_uri.c
rename to debian/modules/http-lua/src/ngx_http_lua_uri.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_uri.h b/debian/modules/http-lua/src/ngx_http_lua_uri.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_uri.h
rename to debian/modules/http-lua/src/ngx_http_lua_uri.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_uthread.c b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_uthread.c
rename to debian/modules/http-lua/src/ngx_http_lua_uthread.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_uthread.h b/debian/modules/http-lua/src/ngx_http_lua_uthread.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_uthread.h
rename to debian/modules/http-lua/src/ngx_http_lua_uthread.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_util.c b/debian/modules/http-lua/src/ngx_http_lua_util.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_util.c
rename to debian/modules/http-lua/src/ngx_http_lua_util.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_util.h b/debian/modules/http-lua/src/ngx_http_lua_util.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_util.h
rename to debian/modules/http-lua/src/ngx_http_lua_util.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_variable.c b/debian/modules/http-lua/src/ngx_http_lua_variable.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_variable.c
rename to debian/modules/http-lua/src/ngx_http_lua_variable.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_variable.h b/debian/modules/http-lua/src/ngx_http_lua_variable.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_variable.h
rename to debian/modules/http-lua/src/ngx_http_lua_variable.h
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_worker.c b/debian/modules/http-lua/src/ngx_http_lua_worker.c
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_worker.c
rename to debian/modules/http-lua/src/ngx_http_lua_worker.c
diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_worker.h b/debian/modules/http-lua/src/ngx_http_lua_worker.h
similarity index 100%
rename from debian/modules/nginx-lua/src/ngx_http_lua_worker.h
rename to debian/modules/http-lua/src/ngx_http_lua_worker.h
diff --git a/debian/modules/nginx-lua/t/.gitignore b/debian/modules/http-lua/t/.gitignore
similarity index 100%
rename from debian/modules/nginx-lua/t/.gitignore
rename to debian/modules/http-lua/t/.gitignore
diff --git a/debian/modules/nginx-lua/t/000--init.t b/debian/modules/http-lua/t/000--init.t
similarity index 100%
rename from debian/modules/nginx-lua/t/000--init.t
rename to debian/modules/http-lua/t/000--init.t
diff --git a/debian/modules/nginx-lua/t/000-sanity.t b/debian/modules/http-lua/t/000-sanity.t
similarity index 100%
rename from debian/modules/nginx-lua/t/000-sanity.t
rename to debian/modules/http-lua/t/000-sanity.t
diff --git a/debian/modules/nginx-lua/t/001-set.t b/debian/modules/http-lua/t/001-set.t
similarity index 100%
rename from debian/modules/nginx-lua/t/001-set.t
rename to debian/modules/http-lua/t/001-set.t
diff --git a/debian/modules/nginx-lua/t/002-content.t b/debian/modules/http-lua/t/002-content.t
similarity index 100%
rename from debian/modules/nginx-lua/t/002-content.t
rename to debian/modules/http-lua/t/002-content.t
diff --git a/debian/modules/nginx-lua/t/003-errors.t b/debian/modules/http-lua/t/003-errors.t
similarity index 100%
rename from debian/modules/nginx-lua/t/003-errors.t
rename to debian/modules/http-lua/t/003-errors.t
diff --git a/debian/modules/nginx-lua/t/004-require.t b/debian/modules/http-lua/t/004-require.t
similarity index 100%
rename from debian/modules/nginx-lua/t/004-require.t
rename to debian/modules/http-lua/t/004-require.t
diff --git a/debian/modules/nginx-lua/t/005-exit.t b/debian/modules/http-lua/t/005-exit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/005-exit.t
rename to debian/modules/http-lua/t/005-exit.t
diff --git a/debian/modules/nginx-lua/t/006-escape.t b/debian/modules/http-lua/t/006-escape.t
similarity index 100%
rename from debian/modules/nginx-lua/t/006-escape.t
rename to debian/modules/http-lua/t/006-escape.t
diff --git a/debian/modules/nginx-lua/t/007-md5.t b/debian/modules/http-lua/t/007-md5.t
similarity index 100%
rename from debian/modules/nginx-lua/t/007-md5.t
rename to debian/modules/http-lua/t/007-md5.t
diff --git a/debian/modules/nginx-lua/t/008-today.t b/debian/modules/http-lua/t/008-today.t
similarity index 100%
rename from debian/modules/nginx-lua/t/008-today.t
rename to debian/modules/http-lua/t/008-today.t
diff --git a/debian/modules/nginx-lua/t/009-log.t b/debian/modules/http-lua/t/009-log.t
similarity index 100%
rename from debian/modules/nginx-lua/t/009-log.t
rename to debian/modules/http-lua/t/009-log.t
diff --git a/debian/modules/nginx-lua/t/010-request_body.t b/debian/modules/http-lua/t/010-request_body.t
similarity index 100%
rename from debian/modules/nginx-lua/t/010-request_body.t
rename to debian/modules/http-lua/t/010-request_body.t
diff --git a/debian/modules/nginx-lua/t/011-md5_bin.t b/debian/modules/http-lua/t/011-md5_bin.t
similarity index 100%
rename from debian/modules/nginx-lua/t/011-md5_bin.t
rename to debian/modules/http-lua/t/011-md5_bin.t
diff --git a/debian/modules/nginx-lua/t/012-now.t b/debian/modules/http-lua/t/012-now.t
similarity index 100%
rename from debian/modules/nginx-lua/t/012-now.t
rename to debian/modules/http-lua/t/012-now.t
diff --git a/debian/modules/nginx-lua/t/013-base64.t b/debian/modules/http-lua/t/013-base64.t
similarity index 100%
rename from debian/modules/nginx-lua/t/013-base64.t
rename to debian/modules/http-lua/t/013-base64.t
diff --git a/debian/modules/nginx-lua/t/014-bugs.t b/debian/modules/http-lua/t/014-bugs.t
similarity index 100%
rename from debian/modules/nginx-lua/t/014-bugs.t
rename to debian/modules/http-lua/t/014-bugs.t
diff --git a/debian/modules/nginx-lua/t/015-status.t b/debian/modules/http-lua/t/015-status.t
similarity index 100%
rename from debian/modules/nginx-lua/t/015-status.t
rename to debian/modules/http-lua/t/015-status.t
diff --git a/debian/modules/nginx-lua/t/016-resp-header.t b/debian/modules/http-lua/t/016-resp-header.t
similarity index 100%
rename from debian/modules/nginx-lua/t/016-resp-header.t
rename to debian/modules/http-lua/t/016-resp-header.t
diff --git a/debian/modules/nginx-lua/t/017-exec.t b/debian/modules/http-lua/t/017-exec.t
similarity index 100%
rename from debian/modules/nginx-lua/t/017-exec.t
rename to debian/modules/http-lua/t/017-exec.t
diff --git a/debian/modules/nginx-lua/t/018-ndk.t b/debian/modules/http-lua/t/018-ndk.t
similarity index 100%
rename from debian/modules/nginx-lua/t/018-ndk.t
rename to debian/modules/http-lua/t/018-ndk.t
diff --git a/debian/modules/nginx-lua/t/019-const.t b/debian/modules/http-lua/t/019-const.t
similarity index 100%
rename from debian/modules/nginx-lua/t/019-const.t
rename to debian/modules/http-lua/t/019-const.t
diff --git a/debian/modules/nginx-lua/t/020-subrequest.t b/debian/modules/http-lua/t/020-subrequest.t
similarity index 100%
rename from debian/modules/nginx-lua/t/020-subrequest.t
rename to debian/modules/http-lua/t/020-subrequest.t
diff --git a/debian/modules/nginx-lua/t/021-cookie-time.t b/debian/modules/http-lua/t/021-cookie-time.t
similarity index 100%
rename from debian/modules/nginx-lua/t/021-cookie-time.t
rename to debian/modules/http-lua/t/021-cookie-time.t
diff --git a/debian/modules/nginx-lua/t/022-redirect.t b/debian/modules/http-lua/t/022-redirect.t
similarity index 100%
rename from debian/modules/nginx-lua/t/022-redirect.t
rename to debian/modules/http-lua/t/022-redirect.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/client-abort.t b/debian/modules/http-lua/t/023-rewrite/client-abort.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/client-abort.t
rename to debian/modules/http-lua/t/023-rewrite/client-abort.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/exec.t b/debian/modules/http-lua/t/023-rewrite/exec.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/exec.t
rename to debian/modules/http-lua/t/023-rewrite/exec.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/exit.t b/debian/modules/http-lua/t/023-rewrite/exit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/exit.t
rename to debian/modules/http-lua/t/023-rewrite/exit.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/mixed.t b/debian/modules/http-lua/t/023-rewrite/mixed.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/mixed.t
rename to debian/modules/http-lua/t/023-rewrite/mixed.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/multi-capture.t b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/multi-capture.t
rename to debian/modules/http-lua/t/023-rewrite/multi-capture.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/on-abort.t b/debian/modules/http-lua/t/023-rewrite/on-abort.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/on-abort.t
rename to debian/modules/http-lua/t/023-rewrite/on-abort.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/redirect.t b/debian/modules/http-lua/t/023-rewrite/redirect.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/redirect.t
rename to debian/modules/http-lua/t/023-rewrite/redirect.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/req-body.t b/debian/modules/http-lua/t/023-rewrite/req-body.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/req-body.t
rename to debian/modules/http-lua/t/023-rewrite/req-body.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/req-socket.t b/debian/modules/http-lua/t/023-rewrite/req-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/req-socket.t
rename to debian/modules/http-lua/t/023-rewrite/req-socket.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/request_body.t b/debian/modules/http-lua/t/023-rewrite/request_body.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/request_body.t
rename to debian/modules/http-lua/t/023-rewrite/request_body.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/sanity.t b/debian/modules/http-lua/t/023-rewrite/sanity.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/sanity.t
rename to debian/modules/http-lua/t/023-rewrite/sanity.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/sleep.t b/debian/modules/http-lua/t/023-rewrite/sleep.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/sleep.t
rename to debian/modules/http-lua/t/023-rewrite/sleep.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/socket-keepalive.t
rename to debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/subrequest.t b/debian/modules/http-lua/t/023-rewrite/subrequest.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/subrequest.t
rename to debian/modules/http-lua/t/023-rewrite/subrequest.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/tcp-socket-timeout.t
rename to debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/tcp-socket.t
rename to debian/modules/http-lua/t/023-rewrite/tcp-socket.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/unix-socket.t b/debian/modules/http-lua/t/023-rewrite/unix-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/unix-socket.t
rename to debian/modules/http-lua/t/023-rewrite/unix-socket.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/uthread-exec.t
rename to debian/modules/http-lua/t/023-rewrite/uthread-exec.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/uthread-exit.t
rename to debian/modules/http-lua/t/023-rewrite/uthread-exit.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/uthread-redirect.t
rename to debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
diff --git a/debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
similarity index 100%
rename from debian/modules/nginx-lua/t/023-rewrite/uthread-spawn.t
rename to debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
diff --git a/debian/modules/nginx-lua/t/024-access/auth.t b/debian/modules/http-lua/t/024-access/auth.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/auth.t
rename to debian/modules/http-lua/t/024-access/auth.t
diff --git a/debian/modules/nginx-lua/t/024-access/client-abort.t b/debian/modules/http-lua/t/024-access/client-abort.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/client-abort.t
rename to debian/modules/http-lua/t/024-access/client-abort.t
diff --git a/debian/modules/nginx-lua/t/024-access/exec.t b/debian/modules/http-lua/t/024-access/exec.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/exec.t
rename to debian/modules/http-lua/t/024-access/exec.t
diff --git a/debian/modules/nginx-lua/t/024-access/exit.t b/debian/modules/http-lua/t/024-access/exit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/exit.t
rename to debian/modules/http-lua/t/024-access/exit.t
diff --git a/debian/modules/nginx-lua/t/024-access/mixed.t b/debian/modules/http-lua/t/024-access/mixed.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/mixed.t
rename to debian/modules/http-lua/t/024-access/mixed.t
diff --git a/debian/modules/nginx-lua/t/024-access/multi-capture.t b/debian/modules/http-lua/t/024-access/multi-capture.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/multi-capture.t
rename to debian/modules/http-lua/t/024-access/multi-capture.t
diff --git a/debian/modules/nginx-lua/t/024-access/on-abort.t b/debian/modules/http-lua/t/024-access/on-abort.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/on-abort.t
rename to debian/modules/http-lua/t/024-access/on-abort.t
diff --git a/debian/modules/nginx-lua/t/024-access/redirect.t b/debian/modules/http-lua/t/024-access/redirect.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/redirect.t
rename to debian/modules/http-lua/t/024-access/redirect.t
diff --git a/debian/modules/nginx-lua/t/024-access/req-body.t b/debian/modules/http-lua/t/024-access/req-body.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/req-body.t
rename to debian/modules/http-lua/t/024-access/req-body.t
diff --git a/debian/modules/nginx-lua/t/024-access/request_body.t b/debian/modules/http-lua/t/024-access/request_body.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/request_body.t
rename to debian/modules/http-lua/t/024-access/request_body.t
diff --git a/debian/modules/nginx-lua/t/024-access/sanity.t b/debian/modules/http-lua/t/024-access/sanity.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/sanity.t
rename to debian/modules/http-lua/t/024-access/sanity.t
diff --git a/debian/modules/nginx-lua/t/024-access/satisfy.t b/debian/modules/http-lua/t/024-access/satisfy.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/satisfy.t
rename to debian/modules/http-lua/t/024-access/satisfy.t
diff --git a/debian/modules/nginx-lua/t/024-access/sleep.t b/debian/modules/http-lua/t/024-access/sleep.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/sleep.t
rename to debian/modules/http-lua/t/024-access/sleep.t
diff --git a/debian/modules/nginx-lua/t/024-access/subrequest.t b/debian/modules/http-lua/t/024-access/subrequest.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/subrequest.t
rename to debian/modules/http-lua/t/024-access/subrequest.t
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-exec.t b/debian/modules/http-lua/t/024-access/uthread-exec.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/uthread-exec.t
rename to debian/modules/http-lua/t/024-access/uthread-exec.t
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-exit.t b/debian/modules/http-lua/t/024-access/uthread-exit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/uthread-exit.t
rename to debian/modules/http-lua/t/024-access/uthread-exit.t
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-redirect.t b/debian/modules/http-lua/t/024-access/uthread-redirect.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/uthread-redirect.t
rename to debian/modules/http-lua/t/024-access/uthread-redirect.t
diff --git a/debian/modules/nginx-lua/t/024-access/uthread-spawn.t b/debian/modules/http-lua/t/024-access/uthread-spawn.t
similarity index 100%
rename from debian/modules/nginx-lua/t/024-access/uthread-spawn.t
rename to debian/modules/http-lua/t/024-access/uthread-spawn.t
diff --git a/debian/modules/nginx-lua/t/025-codecache.t b/debian/modules/http-lua/t/025-codecache.t
similarity index 100%
rename from debian/modules/nginx-lua/t/025-codecache.t
rename to debian/modules/http-lua/t/025-codecache.t
diff --git a/debian/modules/nginx-lua/t/026-mysql.t b/debian/modules/http-lua/t/026-mysql.t
similarity index 100%
rename from debian/modules/nginx-lua/t/026-mysql.t
rename to debian/modules/http-lua/t/026-mysql.t
diff --git a/debian/modules/nginx-lua/t/027-multi-capture.t b/debian/modules/http-lua/t/027-multi-capture.t
similarity index 100%
rename from debian/modules/nginx-lua/t/027-multi-capture.t
rename to debian/modules/http-lua/t/027-multi-capture.t
diff --git a/debian/modules/nginx-lua/t/028-req-header.t b/debian/modules/http-lua/t/028-req-header.t
similarity index 100%
rename from debian/modules/nginx-lua/t/028-req-header.t
rename to debian/modules/http-lua/t/028-req-header.t
diff --git a/debian/modules/nginx-lua/t/029-http-time.t b/debian/modules/http-lua/t/029-http-time.t
similarity index 100%
rename from debian/modules/nginx-lua/t/029-http-time.t
rename to debian/modules/http-lua/t/029-http-time.t
diff --git a/debian/modules/nginx-lua/t/030-uri-args.t b/debian/modules/http-lua/t/030-uri-args.t
similarity index 100%
rename from debian/modules/nginx-lua/t/030-uri-args.t
rename to debian/modules/http-lua/t/030-uri-args.t
diff --git a/debian/modules/nginx-lua/t/031-post-args.t b/debian/modules/http-lua/t/031-post-args.t
similarity index 100%
rename from debian/modules/nginx-lua/t/031-post-args.t
rename to debian/modules/http-lua/t/031-post-args.t
diff --git a/debian/modules/nginx-lua/t/032-iolist.t b/debian/modules/http-lua/t/032-iolist.t
similarity index 100%
rename from debian/modules/nginx-lua/t/032-iolist.t
rename to debian/modules/http-lua/t/032-iolist.t
diff --git a/debian/modules/nginx-lua/t/033-ctx.t b/debian/modules/http-lua/t/033-ctx.t
similarity index 100%
rename from debian/modules/nginx-lua/t/033-ctx.t
rename to debian/modules/http-lua/t/033-ctx.t
diff --git a/debian/modules/nginx-lua/t/034-match.t b/debian/modules/http-lua/t/034-match.t
similarity index 100%
rename from debian/modules/nginx-lua/t/034-match.t
rename to debian/modules/http-lua/t/034-match.t
diff --git a/debian/modules/nginx-lua/t/035-gmatch.t b/debian/modules/http-lua/t/035-gmatch.t
similarity index 100%
rename from debian/modules/nginx-lua/t/035-gmatch.t
rename to debian/modules/http-lua/t/035-gmatch.t
diff --git a/debian/modules/nginx-lua/t/036-sub.t b/debian/modules/http-lua/t/036-sub.t
similarity index 100%
rename from debian/modules/nginx-lua/t/036-sub.t
rename to debian/modules/http-lua/t/036-sub.t
diff --git a/debian/modules/nginx-lua/t/037-gsub.t b/debian/modules/http-lua/t/037-gsub.t
similarity index 100%
rename from debian/modules/nginx-lua/t/037-gsub.t
rename to debian/modules/http-lua/t/037-gsub.t
diff --git a/debian/modules/nginx-lua/t/038-match-o.t b/debian/modules/http-lua/t/038-match-o.t
similarity index 100%
rename from debian/modules/nginx-lua/t/038-match-o.t
rename to debian/modules/http-lua/t/038-match-o.t
diff --git a/debian/modules/nginx-lua/t/039-sub-o.t b/debian/modules/http-lua/t/039-sub-o.t
similarity index 100%
rename from debian/modules/nginx-lua/t/039-sub-o.t
rename to debian/modules/http-lua/t/039-sub-o.t
diff --git a/debian/modules/nginx-lua/t/040-gsub-o.t b/debian/modules/http-lua/t/040-gsub-o.t
similarity index 100%
rename from debian/modules/nginx-lua/t/040-gsub-o.t
rename to debian/modules/http-lua/t/040-gsub-o.t
diff --git a/debian/modules/nginx-lua/t/041-header-filter.t b/debian/modules/http-lua/t/041-header-filter.t
similarity index 100%
rename from debian/modules/nginx-lua/t/041-header-filter.t
rename to debian/modules/http-lua/t/041-header-filter.t
diff --git a/debian/modules/nginx-lua/t/042-crc32.t b/debian/modules/http-lua/t/042-crc32.t
similarity index 100%
rename from debian/modules/nginx-lua/t/042-crc32.t
rename to debian/modules/http-lua/t/042-crc32.t
diff --git a/debian/modules/nginx-lua/t/043-shdict.t b/debian/modules/http-lua/t/043-shdict.t
similarity index 100%
rename from debian/modules/nginx-lua/t/043-shdict.t
rename to debian/modules/http-lua/t/043-shdict.t
diff --git a/debian/modules/nginx-lua/t/044-req-body.t b/debian/modules/http-lua/t/044-req-body.t
similarity index 100%
rename from debian/modules/nginx-lua/t/044-req-body.t
rename to debian/modules/http-lua/t/044-req-body.t
diff --git a/debian/modules/nginx-lua/t/045-ngx-var.t b/debian/modules/http-lua/t/045-ngx-var.t
similarity index 100%
rename from debian/modules/nginx-lua/t/045-ngx-var.t
rename to debian/modules/http-lua/t/045-ngx-var.t
diff --git a/debian/modules/nginx-lua/t/046-hmac.t b/debian/modules/http-lua/t/046-hmac.t
similarity index 100%
rename from debian/modules/nginx-lua/t/046-hmac.t
rename to debian/modules/http-lua/t/046-hmac.t
diff --git a/debian/modules/nginx-lua/t/047-match-jit.t b/debian/modules/http-lua/t/047-match-jit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/047-match-jit.t
rename to debian/modules/http-lua/t/047-match-jit.t
diff --git a/debian/modules/nginx-lua/t/048-match-dfa.t b/debian/modules/http-lua/t/048-match-dfa.t
similarity index 100%
rename from debian/modules/nginx-lua/t/048-match-dfa.t
rename to debian/modules/http-lua/t/048-match-dfa.t
diff --git a/debian/modules/nginx-lua/t/049-gmatch-jit.t b/debian/modules/http-lua/t/049-gmatch-jit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/049-gmatch-jit.t
rename to debian/modules/http-lua/t/049-gmatch-jit.t
diff --git a/debian/modules/nginx-lua/t/050-gmatch-dfa.t b/debian/modules/http-lua/t/050-gmatch-dfa.t
similarity index 100%
rename from debian/modules/nginx-lua/t/050-gmatch-dfa.t
rename to debian/modules/http-lua/t/050-gmatch-dfa.t
diff --git a/debian/modules/nginx-lua/t/051-sub-jit.t b/debian/modules/http-lua/t/051-sub-jit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/051-sub-jit.t
rename to debian/modules/http-lua/t/051-sub-jit.t
diff --git a/debian/modules/nginx-lua/t/052-sub-dfa.t b/debian/modules/http-lua/t/052-sub-dfa.t
similarity index 100%
rename from debian/modules/nginx-lua/t/052-sub-dfa.t
rename to debian/modules/http-lua/t/052-sub-dfa.t
diff --git a/debian/modules/nginx-lua/t/053-gsub-jit.t b/debian/modules/http-lua/t/053-gsub-jit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/053-gsub-jit.t
rename to debian/modules/http-lua/t/053-gsub-jit.t
diff --git a/debian/modules/nginx-lua/t/054-gsub-dfa.t b/debian/modules/http-lua/t/054-gsub-dfa.t
similarity index 100%
rename from debian/modules/nginx-lua/t/054-gsub-dfa.t
rename to debian/modules/http-lua/t/054-gsub-dfa.t
diff --git a/debian/modules/nginx-lua/t/055-subreq-vars.t b/debian/modules/http-lua/t/055-subreq-vars.t
similarity index 100%
rename from debian/modules/nginx-lua/t/055-subreq-vars.t
rename to debian/modules/http-lua/t/055-subreq-vars.t
diff --git a/debian/modules/nginx-lua/t/056-flush.t b/debian/modules/http-lua/t/056-flush.t
similarity index 100%
rename from debian/modules/nginx-lua/t/056-flush.t
rename to debian/modules/http-lua/t/056-flush.t
diff --git a/debian/modules/nginx-lua/t/057-flush-timeout.t b/debian/modules/http-lua/t/057-flush-timeout.t
similarity index 100%
rename from debian/modules/nginx-lua/t/057-flush-timeout.t
rename to debian/modules/http-lua/t/057-flush-timeout.t
diff --git a/debian/modules/nginx-lua/t/058-tcp-socket.t b/debian/modules/http-lua/t/058-tcp-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/058-tcp-socket.t
rename to debian/modules/http-lua/t/058-tcp-socket.t
diff --git a/debian/modules/nginx-lua/t/059-unix-socket.t b/debian/modules/http-lua/t/059-unix-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/059-unix-socket.t
rename to debian/modules/http-lua/t/059-unix-socket.t
diff --git a/debian/modules/nginx-lua/t/060-lua-memcached.t b/debian/modules/http-lua/t/060-lua-memcached.t
similarity index 100%
rename from debian/modules/nginx-lua/t/060-lua-memcached.t
rename to debian/modules/http-lua/t/060-lua-memcached.t
diff --git a/debian/modules/nginx-lua/t/061-lua-redis.t b/debian/modules/http-lua/t/061-lua-redis.t
similarity index 100%
rename from debian/modules/nginx-lua/t/061-lua-redis.t
rename to debian/modules/http-lua/t/061-lua-redis.t
diff --git a/debian/modules/nginx-lua/t/062-count.t b/debian/modules/http-lua/t/062-count.t
similarity index 100%
rename from debian/modules/nginx-lua/t/062-count.t
rename to debian/modules/http-lua/t/062-count.t
diff --git a/debian/modules/nginx-lua/t/063-abort.t b/debian/modules/http-lua/t/063-abort.t
similarity index 100%
rename from debian/modules/nginx-lua/t/063-abort.t
rename to debian/modules/http-lua/t/063-abort.t
diff --git a/debian/modules/nginx-lua/t/064-pcall.t b/debian/modules/http-lua/t/064-pcall.t
similarity index 100%
rename from debian/modules/nginx-lua/t/064-pcall.t
rename to debian/modules/http-lua/t/064-pcall.t
diff --git a/debian/modules/nginx-lua/t/065-tcp-socket-timeout.t b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
similarity index 100%
rename from debian/modules/nginx-lua/t/065-tcp-socket-timeout.t
rename to debian/modules/http-lua/t/065-tcp-socket-timeout.t
diff --git a/debian/modules/nginx-lua/t/066-socket-receiveuntil.t b/debian/modules/http-lua/t/066-socket-receiveuntil.t
similarity index 100%
rename from debian/modules/nginx-lua/t/066-socket-receiveuntil.t
rename to debian/modules/http-lua/t/066-socket-receiveuntil.t
diff --git a/debian/modules/nginx-lua/t/067-req-socket.t b/debian/modules/http-lua/t/067-req-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/067-req-socket.t
rename to debian/modules/http-lua/t/067-req-socket.t
diff --git a/debian/modules/nginx-lua/t/068-socket-keepalive.t b/debian/modules/http-lua/t/068-socket-keepalive.t
similarity index 100%
rename from debian/modules/nginx-lua/t/068-socket-keepalive.t
rename to debian/modules/http-lua/t/068-socket-keepalive.t
diff --git a/debian/modules/nginx-lua/t/069-null.t b/debian/modules/http-lua/t/069-null.t
similarity index 100%
rename from debian/modules/nginx-lua/t/069-null.t
rename to debian/modules/http-lua/t/069-null.t
diff --git a/debian/modules/nginx-lua/t/070-sha1.t b/debian/modules/http-lua/t/070-sha1.t
similarity index 100%
rename from debian/modules/nginx-lua/t/070-sha1.t
rename to debian/modules/http-lua/t/070-sha1.t
diff --git a/debian/modules/nginx-lua/t/071-idle-socket.t b/debian/modules/http-lua/t/071-idle-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/071-idle-socket.t
rename to debian/modules/http-lua/t/071-idle-socket.t
diff --git a/debian/modules/nginx-lua/t/072-conditional-get.t b/debian/modules/http-lua/t/072-conditional-get.t
similarity index 100%
rename from debian/modules/nginx-lua/t/072-conditional-get.t
rename to debian/modules/http-lua/t/072-conditional-get.t
diff --git a/debian/modules/nginx-lua/t/073-backtrace.t b/debian/modules/http-lua/t/073-backtrace.t
similarity index 100%
rename from debian/modules/nginx-lua/t/073-backtrace.t
rename to debian/modules/http-lua/t/073-backtrace.t
diff --git a/debian/modules/nginx-lua/t/074-prefix-var.t b/debian/modules/http-lua/t/074-prefix-var.t
similarity index 100%
rename from debian/modules/nginx-lua/t/074-prefix-var.t
rename to debian/modules/http-lua/t/074-prefix-var.t
diff --git a/debian/modules/nginx-lua/t/075-logby.t b/debian/modules/http-lua/t/075-logby.t
similarity index 100%
rename from debian/modules/nginx-lua/t/075-logby.t
rename to debian/modules/http-lua/t/075-logby.t
diff --git a/debian/modules/nginx-lua/t/076-no-postpone.t b/debian/modules/http-lua/t/076-no-postpone.t
similarity index 100%
rename from debian/modules/nginx-lua/t/076-no-postpone.t
rename to debian/modules/http-lua/t/076-no-postpone.t
diff --git a/debian/modules/nginx-lua/t/077-sleep.t b/debian/modules/http-lua/t/077-sleep.t
similarity index 100%
rename from debian/modules/nginx-lua/t/077-sleep.t
rename to debian/modules/http-lua/t/077-sleep.t
diff --git a/debian/modules/nginx-lua/t/078-hup-vars.t b/debian/modules/http-lua/t/078-hup-vars.t
similarity index 100%
rename from debian/modules/nginx-lua/t/078-hup-vars.t
rename to debian/modules/http-lua/t/078-hup-vars.t
diff --git a/debian/modules/nginx-lua/t/079-unused-directives.t b/debian/modules/http-lua/t/079-unused-directives.t
similarity index 100%
rename from debian/modules/nginx-lua/t/079-unused-directives.t
rename to debian/modules/http-lua/t/079-unused-directives.t
diff --git a/debian/modules/nginx-lua/t/080-hup-shdict.t b/debian/modules/http-lua/t/080-hup-shdict.t
similarity index 100%
rename from debian/modules/nginx-lua/t/080-hup-shdict.t
rename to debian/modules/http-lua/t/080-hup-shdict.t
diff --git a/debian/modules/nginx-lua/t/081-bytecode.t b/debian/modules/http-lua/t/081-bytecode.t
similarity index 100%
rename from debian/modules/nginx-lua/t/081-bytecode.t
rename to debian/modules/http-lua/t/081-bytecode.t
diff --git a/debian/modules/nginx-lua/t/082-body-filter.t b/debian/modules/http-lua/t/082-body-filter.t
similarity index 100%
rename from debian/modules/nginx-lua/t/082-body-filter.t
rename to debian/modules/http-lua/t/082-body-filter.t
diff --git a/debian/modules/nginx-lua/t/083-bad-sock-self.t b/debian/modules/http-lua/t/083-bad-sock-self.t
similarity index 100%
rename from debian/modules/nginx-lua/t/083-bad-sock-self.t
rename to debian/modules/http-lua/t/083-bad-sock-self.t
diff --git a/debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
similarity index 100%
rename from debian/modules/nginx-lua/t/084-inclusive-receiveuntil.t
rename to debian/modules/http-lua/t/084-inclusive-receiveuntil.t
diff --git a/debian/modules/nginx-lua/t/085-if.t b/debian/modules/http-lua/t/085-if.t
similarity index 100%
rename from debian/modules/nginx-lua/t/085-if.t
rename to debian/modules/http-lua/t/085-if.t
diff --git a/debian/modules/nginx-lua/t/086-init-by.t b/debian/modules/http-lua/t/086-init-by.t
similarity index 100%
rename from debian/modules/nginx-lua/t/086-init-by.t
rename to debian/modules/http-lua/t/086-init-by.t
diff --git a/debian/modules/nginx-lua/t/087-udp-socket.t b/debian/modules/http-lua/t/087-udp-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/087-udp-socket.t
rename to debian/modules/http-lua/t/087-udp-socket.t
diff --git a/debian/modules/nginx-lua/t/088-req-method.t b/debian/modules/http-lua/t/088-req-method.t
similarity index 100%
rename from debian/modules/nginx-lua/t/088-req-method.t
rename to debian/modules/http-lua/t/088-req-method.t
diff --git a/debian/modules/nginx-lua/t/089-phase.t b/debian/modules/http-lua/t/089-phase.t
similarity index 100%
rename from debian/modules/nginx-lua/t/089-phase.t
rename to debian/modules/http-lua/t/089-phase.t
diff --git a/debian/modules/nginx-lua/t/090-log-socket-errors.t b/debian/modules/http-lua/t/090-log-socket-errors.t
similarity index 100%
rename from debian/modules/nginx-lua/t/090-log-socket-errors.t
rename to debian/modules/http-lua/t/090-log-socket-errors.t
diff --git a/debian/modules/nginx-lua/t/091-coroutine.t b/debian/modules/http-lua/t/091-coroutine.t
similarity index 100%
rename from debian/modules/nginx-lua/t/091-coroutine.t
rename to debian/modules/http-lua/t/091-coroutine.t
diff --git a/debian/modules/nginx-lua/t/092-eof.t b/debian/modules/http-lua/t/092-eof.t
similarity index 100%
rename from debian/modules/nginx-lua/t/092-eof.t
rename to debian/modules/http-lua/t/092-eof.t
diff --git a/debian/modules/nginx-lua/t/093-uthread-spawn.t b/debian/modules/http-lua/t/093-uthread-spawn.t
similarity index 100%
rename from debian/modules/nginx-lua/t/093-uthread-spawn.t
rename to debian/modules/http-lua/t/093-uthread-spawn.t
diff --git a/debian/modules/nginx-lua/t/094-uthread-exit.t b/debian/modules/http-lua/t/094-uthread-exit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/094-uthread-exit.t
rename to debian/modules/http-lua/t/094-uthread-exit.t
diff --git a/debian/modules/nginx-lua/t/095-uthread-exec.t b/debian/modules/http-lua/t/095-uthread-exec.t
similarity index 100%
rename from debian/modules/nginx-lua/t/095-uthread-exec.t
rename to debian/modules/http-lua/t/095-uthread-exec.t
diff --git a/debian/modules/nginx-lua/t/096-uthread-redirect.t b/debian/modules/http-lua/t/096-uthread-redirect.t
similarity index 100%
rename from debian/modules/nginx-lua/t/096-uthread-redirect.t
rename to debian/modules/http-lua/t/096-uthread-redirect.t
diff --git a/debian/modules/nginx-lua/t/097-uthread-rewrite.t b/debian/modules/http-lua/t/097-uthread-rewrite.t
similarity index 100%
rename from debian/modules/nginx-lua/t/097-uthread-rewrite.t
rename to debian/modules/http-lua/t/097-uthread-rewrite.t
diff --git a/debian/modules/nginx-lua/t/098-uthread-wait.t b/debian/modules/http-lua/t/098-uthread-wait.t
similarity index 100%
rename from debian/modules/nginx-lua/t/098-uthread-wait.t
rename to debian/modules/http-lua/t/098-uthread-wait.t
diff --git a/debian/modules/nginx-lua/t/099-c-api.t b/debian/modules/http-lua/t/099-c-api.t
similarity index 100%
rename from debian/modules/nginx-lua/t/099-c-api.t
rename to debian/modules/http-lua/t/099-c-api.t
diff --git a/debian/modules/nginx-lua/t/100-client-abort.t b/debian/modules/http-lua/t/100-client-abort.t
similarity index 100%
rename from debian/modules/nginx-lua/t/100-client-abort.t
rename to debian/modules/http-lua/t/100-client-abort.t
diff --git a/debian/modules/nginx-lua/t/101-on-abort.t b/debian/modules/http-lua/t/101-on-abort.t
similarity index 100%
rename from debian/modules/nginx-lua/t/101-on-abort.t
rename to debian/modules/http-lua/t/101-on-abort.t
diff --git a/debian/modules/nginx-lua/t/102-req-start-time.t b/debian/modules/http-lua/t/102-req-start-time.t
similarity index 100%
rename from debian/modules/nginx-lua/t/102-req-start-time.t
rename to debian/modules/http-lua/t/102-req-start-time.t
diff --git a/debian/modules/nginx-lua/t/103-req-http-ver.t b/debian/modules/http-lua/t/103-req-http-ver.t
similarity index 100%
rename from debian/modules/nginx-lua/t/103-req-http-ver.t
rename to debian/modules/http-lua/t/103-req-http-ver.t
diff --git a/debian/modules/nginx-lua/t/104-req-raw-header.t b/debian/modules/http-lua/t/104-req-raw-header.t
similarity index 100%
rename from debian/modules/nginx-lua/t/104-req-raw-header.t
rename to debian/modules/http-lua/t/104-req-raw-header.t
diff --git a/debian/modules/nginx-lua/t/105-pressure.t b/debian/modules/http-lua/t/105-pressure.t
similarity index 100%
rename from debian/modules/nginx-lua/t/105-pressure.t
rename to debian/modules/http-lua/t/105-pressure.t
diff --git a/debian/modules/nginx-lua/t/106-timer.t b/debian/modules/http-lua/t/106-timer.t
similarity index 100%
rename from debian/modules/nginx-lua/t/106-timer.t
rename to debian/modules/http-lua/t/106-timer.t
diff --git a/debian/modules/nginx-lua/t/107-timer-errors.t b/debian/modules/http-lua/t/107-timer-errors.t
similarity index 100%
rename from debian/modules/nginx-lua/t/107-timer-errors.t
rename to debian/modules/http-lua/t/107-timer-errors.t
diff --git a/debian/modules/nginx-lua/t/108-timer-safe.t b/debian/modules/http-lua/t/108-timer-safe.t
similarity index 100%
rename from debian/modules/nginx-lua/t/108-timer-safe.t
rename to debian/modules/http-lua/t/108-timer-safe.t
diff --git a/debian/modules/nginx-lua/t/109-timer-hup.t b/debian/modules/http-lua/t/109-timer-hup.t
similarity index 100%
rename from debian/modules/nginx-lua/t/109-timer-hup.t
rename to debian/modules/http-lua/t/109-timer-hup.t
diff --git a/debian/modules/nginx-lua/t/110-etag.t b/debian/modules/http-lua/t/110-etag.t
similarity index 100%
rename from debian/modules/nginx-lua/t/110-etag.t
rename to debian/modules/http-lua/t/110-etag.t
diff --git a/debian/modules/nginx-lua/t/111-req-header-ua.t b/debian/modules/http-lua/t/111-req-header-ua.t
similarity index 100%
rename from debian/modules/nginx-lua/t/111-req-header-ua.t
rename to debian/modules/http-lua/t/111-req-header-ua.t
diff --git a/debian/modules/nginx-lua/t/112-req-header-conn.t b/debian/modules/http-lua/t/112-req-header-conn.t
similarity index 100%
rename from debian/modules/nginx-lua/t/112-req-header-conn.t
rename to debian/modules/http-lua/t/112-req-header-conn.t
diff --git a/debian/modules/nginx-lua/t/113-req-header-cookie.t b/debian/modules/http-lua/t/113-req-header-cookie.t
similarity index 100%
rename from debian/modules/nginx-lua/t/113-req-header-cookie.t
rename to debian/modules/http-lua/t/113-req-header-cookie.t
diff --git a/debian/modules/nginx-lua/t/114-config.t b/debian/modules/http-lua/t/114-config.t
similarity index 100%
rename from debian/modules/nginx-lua/t/114-config.t
rename to debian/modules/http-lua/t/114-config.t
diff --git a/debian/modules/nginx-lua/t/115-quote-sql-str.t b/debian/modules/http-lua/t/115-quote-sql-str.t
similarity index 100%
rename from debian/modules/nginx-lua/t/115-quote-sql-str.t
rename to debian/modules/http-lua/t/115-quote-sql-str.t
diff --git a/debian/modules/nginx-lua/t/116-raw-req-socket.t b/debian/modules/http-lua/t/116-raw-req-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/116-raw-req-socket.t
rename to debian/modules/http-lua/t/116-raw-req-socket.t
diff --git a/debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t b/debian/modules/http-lua/t/117-raw-req-socket-timeout.t
similarity index 100%
rename from debian/modules/nginx-lua/t/117-raw-req-socket-timeout.t
rename to debian/modules/http-lua/t/117-raw-req-socket-timeout.t
diff --git a/debian/modules/nginx-lua/t/118-use-default-type.t b/debian/modules/http-lua/t/118-use-default-type.t
similarity index 100%
rename from debian/modules/nginx-lua/t/118-use-default-type.t
rename to debian/modules/http-lua/t/118-use-default-type.t
diff --git a/debian/modules/nginx-lua/t/119-config-prefix.t b/debian/modules/http-lua/t/119-config-prefix.t
similarity index 100%
rename from debian/modules/nginx-lua/t/119-config-prefix.t
rename to debian/modules/http-lua/t/119-config-prefix.t
diff --git a/debian/modules/nginx-lua/t/120-re-find.t b/debian/modules/http-lua/t/120-re-find.t
similarity index 100%
rename from debian/modules/nginx-lua/t/120-re-find.t
rename to debian/modules/http-lua/t/120-re-find.t
diff --git a/debian/modules/nginx-lua/t/121-version.t b/debian/modules/http-lua/t/121-version.t
similarity index 100%
rename from debian/modules/nginx-lua/t/121-version.t
rename to debian/modules/http-lua/t/121-version.t
diff --git a/debian/modules/nginx-lua/t/122-worker.t b/debian/modules/http-lua/t/122-worker.t
similarity index 100%
rename from debian/modules/nginx-lua/t/122-worker.t
rename to debian/modules/http-lua/t/122-worker.t
diff --git a/debian/modules/nginx-lua/t/123-lua-path.t b/debian/modules/http-lua/t/123-lua-path.t
similarity index 100%
rename from debian/modules/nginx-lua/t/123-lua-path.t
rename to debian/modules/http-lua/t/123-lua-path.t
diff --git a/debian/modules/nginx-lua/t/124-init-worker.t b/debian/modules/http-lua/t/124-init-worker.t
similarity index 100%
rename from debian/modules/nginx-lua/t/124-init-worker.t
rename to debian/modules/http-lua/t/124-init-worker.t
diff --git a/debian/modules/nginx-lua/t/125-configure-args.t b/debian/modules/http-lua/t/125-configure-args.t
similarity index 100%
rename from debian/modules/nginx-lua/t/125-configure-args.t
rename to debian/modules/http-lua/t/125-configure-args.t
diff --git a/debian/modules/nginx-lua/t/126-shdict-frag.t b/debian/modules/http-lua/t/126-shdict-frag.t
similarity index 100%
rename from debian/modules/nginx-lua/t/126-shdict-frag.t
rename to debian/modules/http-lua/t/126-shdict-frag.t
diff --git a/debian/modules/nginx-lua/t/127-uthread-kill.t b/debian/modules/http-lua/t/127-uthread-kill.t
similarity index 100%
rename from debian/modules/nginx-lua/t/127-uthread-kill.t
rename to debian/modules/http-lua/t/127-uthread-kill.t
diff --git a/debian/modules/nginx-lua/t/128-duplex-tcp-socket.t b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/128-duplex-tcp-socket.t
rename to debian/modules/http-lua/t/128-duplex-tcp-socket.t
diff --git a/debian/modules/nginx-lua/t/129-ssl-socket.t b/debian/modules/http-lua/t/129-ssl-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/129-ssl-socket.t
rename to debian/modules/http-lua/t/129-ssl-socket.t
diff --git a/debian/modules/nginx-lua/t/130-internal-api.t b/debian/modules/http-lua/t/130-internal-api.t
similarity index 100%
rename from debian/modules/nginx-lua/t/130-internal-api.t
rename to debian/modules/http-lua/t/130-internal-api.t
diff --git a/debian/modules/nginx-lua/t/131-duplex-req-socket.t b/debian/modules/http-lua/t/131-duplex-req-socket.t
similarity index 100%
rename from debian/modules/nginx-lua/t/131-duplex-req-socket.t
rename to debian/modules/http-lua/t/131-duplex-req-socket.t
diff --git a/debian/modules/nginx-lua/t/132-lua-blocks.t b/debian/modules/http-lua/t/132-lua-blocks.t
similarity index 100%
rename from debian/modules/nginx-lua/t/132-lua-blocks.t
rename to debian/modules/http-lua/t/132-lua-blocks.t
diff --git a/debian/modules/nginx-lua/t/133-worker-count.t b/debian/modules/http-lua/t/133-worker-count.t
similarity index 100%
rename from debian/modules/nginx-lua/t/133-worker-count.t
rename to debian/modules/http-lua/t/133-worker-count.t
diff --git a/debian/modules/nginx-lua/t/134-worker-count-5.t b/debian/modules/http-lua/t/134-worker-count-5.t
similarity index 100%
rename from debian/modules/nginx-lua/t/134-worker-count-5.t
rename to debian/modules/http-lua/t/134-worker-count-5.t
diff --git a/debian/modules/nginx-lua/t/135-worker-id.t b/debian/modules/http-lua/t/135-worker-id.t
similarity index 100%
rename from debian/modules/nginx-lua/t/135-worker-id.t
rename to debian/modules/http-lua/t/135-worker-id.t
diff --git a/debian/modules/nginx-lua/t/136-timer-counts.t b/debian/modules/http-lua/t/136-timer-counts.t
similarity index 100%
rename from debian/modules/nginx-lua/t/136-timer-counts.t
rename to debian/modules/http-lua/t/136-timer-counts.t
diff --git a/debian/modules/nginx-lua/t/137-req-misc.t b/debian/modules/http-lua/t/137-req-misc.t
similarity index 100%
rename from debian/modules/nginx-lua/t/137-req-misc.t
rename to debian/modules/http-lua/t/137-req-misc.t
diff --git a/debian/modules/nginx-lua/t/138-balancer.t b/debian/modules/http-lua/t/138-balancer.t
similarity index 100%
rename from debian/modules/nginx-lua/t/138-balancer.t
rename to debian/modules/http-lua/t/138-balancer.t
diff --git a/debian/modules/nginx-lua/t/139-ssl-cert-by.t b/debian/modules/http-lua/t/139-ssl-cert-by.t
similarity index 100%
rename from debian/modules/nginx-lua/t/139-ssl-cert-by.t
rename to debian/modules/http-lua/t/139-ssl-cert-by.t
diff --git a/debian/modules/nginx-lua/t/140-ssl-c-api.t b/debian/modules/http-lua/t/140-ssl-c-api.t
similarity index 100%
rename from debian/modules/nginx-lua/t/140-ssl-c-api.t
rename to debian/modules/http-lua/t/140-ssl-c-api.t
diff --git a/debian/modules/nginx-lua/t/141-luajit.t b/debian/modules/http-lua/t/141-luajit.t
similarity index 100%
rename from debian/modules/nginx-lua/t/141-luajit.t
rename to debian/modules/http-lua/t/141-luajit.t
diff --git a/debian/modules/nginx-lua/t/142-ssl-session-store.t b/debian/modules/http-lua/t/142-ssl-session-store.t
similarity index 100%
rename from debian/modules/nginx-lua/t/142-ssl-session-store.t
rename to debian/modules/http-lua/t/142-ssl-session-store.t
diff --git a/debian/modules/nginx-lua/t/143-ssl-session-fetch.t b/debian/modules/http-lua/t/143-ssl-session-fetch.t
similarity index 100%
rename from debian/modules/nginx-lua/t/143-ssl-session-fetch.t
rename to debian/modules/http-lua/t/143-ssl-session-fetch.t
diff --git a/debian/modules/nginx-lua/t/144-shdict-incr-init.t b/debian/modules/http-lua/t/144-shdict-incr-init.t
similarity index 100%
rename from debian/modules/nginx-lua/t/144-shdict-incr-init.t
rename to debian/modules/http-lua/t/144-shdict-incr-init.t
diff --git a/debian/modules/nginx-lua/t/145-shdict-list.t b/debian/modules/http-lua/t/145-shdict-list.t
similarity index 100%
rename from debian/modules/nginx-lua/t/145-shdict-list.t
rename to debian/modules/http-lua/t/145-shdict-list.t
diff --git a/debian/modules/nginx-lua/t/146-malloc-trim.t b/debian/modules/http-lua/t/146-malloc-trim.t
similarity index 100%
rename from debian/modules/nginx-lua/t/146-malloc-trim.t
rename to debian/modules/http-lua/t/146-malloc-trim.t
diff --git a/debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
similarity index 100%
rename from debian/modules/nginx-lua/t/147-tcp-socket-timeouts.t
rename to debian/modules/http-lua/t/147-tcp-socket-timeouts.t
diff --git a/debian/modules/nginx-lua/t/148-fake-shm-zone.t b/debian/modules/http-lua/t/148-fake-shm-zone.t
similarity index 100%
rename from debian/modules/nginx-lua/t/148-fake-shm-zone.t
rename to debian/modules/http-lua/t/148-fake-shm-zone.t
diff --git a/debian/modules/nginx-lua/t/149-hup-fake-shm-zone.t b/debian/modules/http-lua/t/149-hup-fake-shm-zone.t
similarity index 100%
rename from debian/modules/nginx-lua/t/149-hup-fake-shm-zone.t
rename to debian/modules/http-lua/t/149-hup-fake-shm-zone.t
diff --git a/debian/modules/nginx-lua/t/150-fake-delayed-load.t b/debian/modules/http-lua/t/150-fake-delayed-load.t
similarity index 100%
rename from debian/modules/nginx-lua/t/150-fake-delayed-load.t
rename to debian/modules/http-lua/t/150-fake-delayed-load.t
diff --git a/debian/modules/nginx-lua/t/151-initby-hup.t b/debian/modules/http-lua/t/151-initby-hup.t
similarity index 100%
rename from debian/modules/nginx-lua/t/151-initby-hup.t
rename to debian/modules/http-lua/t/151-initby-hup.t
diff --git a/debian/modules/nginx-lua/t/152-timer-every.t b/debian/modules/http-lua/t/152-timer-every.t
similarity index 100%
rename from debian/modules/nginx-lua/t/152-timer-every.t
rename to debian/modules/http-lua/t/152-timer-every.t
diff --git a/debian/modules/nginx-lua/t/153-semaphore-hup.t b/debian/modules/http-lua/t/153-semaphore-hup.t
similarity index 100%
rename from debian/modules/nginx-lua/t/153-semaphore-hup.t
rename to debian/modules/http-lua/t/153-semaphore-hup.t
diff --git a/debian/modules/nginx-lua/t/154-semaphore.t b/debian/modules/http-lua/t/154-semaphore.t
similarity index 100%
rename from debian/modules/nginx-lua/t/154-semaphore.t
rename to debian/modules/http-lua/t/154-semaphore.t
diff --git a/debian/modules/nginx-lua/t/StapThread.pm b/debian/modules/http-lua/t/StapThread.pm
similarity index 100%
rename from debian/modules/nginx-lua/t/StapThread.pm
rename to debian/modules/http-lua/t/StapThread.pm
diff --git a/debian/modules/nginx-lua/t/cert/comodo-ca.crt b/debian/modules/http-lua/t/cert/comodo-ca.crt
similarity index 100%
rename from debian/modules/nginx-lua/t/cert/comodo-ca.crt
rename to debian/modules/http-lua/t/cert/comodo-ca.crt
diff --git a/debian/modules/nginx-lua/t/cert/equifax.crt b/debian/modules/http-lua/t/cert/equifax.crt
similarity index 100%
rename from debian/modules/nginx-lua/t/cert/equifax.crt
rename to debian/modules/http-lua/t/cert/equifax.crt
diff --git a/debian/modules/nginx-lua/t/cert/test.crl b/debian/modules/http-lua/t/cert/test.crl
similarity index 100%
rename from debian/modules/nginx-lua/t/cert/test.crl
rename to debian/modules/http-lua/t/cert/test.crl
diff --git a/debian/modules/nginx-lua/t/cert/test.crt b/debian/modules/http-lua/t/cert/test.crt
similarity index 100%
rename from debian/modules/nginx-lua/t/cert/test.crt
rename to debian/modules/http-lua/t/cert/test.crt
diff --git a/debian/modules/nginx-lua/t/cert/test.key b/debian/modules/http-lua/t/cert/test.key
similarity index 100%
rename from debian/modules/nginx-lua/t/cert/test.key
rename to debian/modules/http-lua/t/cert/test.key
diff --git a/debian/modules/nginx-lua/t/cert/test2.crt b/debian/modules/http-lua/t/cert/test2.crt
similarity index 100%
rename from debian/modules/nginx-lua/t/cert/test2.crt
rename to debian/modules/http-lua/t/cert/test2.crt
diff --git a/debian/modules/nginx-lua/t/cert/test2.key b/debian/modules/http-lua/t/cert/test2.key
similarity index 100%
rename from debian/modules/nginx-lua/t/cert/test2.key
rename to debian/modules/http-lua/t/cert/test2.key
diff --git a/debian/modules/nginx-lua/t/cert/test_ecdsa.crt b/debian/modules/http-lua/t/cert/test_ecdsa.crt
similarity index 100%
rename from debian/modules/nginx-lua/t/cert/test_ecdsa.crt
rename to debian/modules/http-lua/t/cert/test_ecdsa.crt
diff --git a/debian/modules/nginx-lua/t/cert/test_ecdsa.key b/debian/modules/http-lua/t/cert/test_ecdsa.key
similarity index 100%
rename from debian/modules/nginx-lua/t/cert/test_ecdsa.key
rename to debian/modules/http-lua/t/cert/test_ecdsa.key
diff --git a/debian/modules/nginx-lua/t/data/fake-delayed-load-module/config b/debian/modules/http-lua/t/data/fake-delayed-load-module/config
similarity index 100%
rename from debian/modules/nginx-lua/t/data/fake-delayed-load-module/config
rename to debian/modules/http-lua/t/data/fake-delayed-load-module/config
diff --git a/debian/modules/nginx-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c b/debian/modules/http-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c
similarity index 100%
rename from debian/modules/nginx-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c
rename to debian/modules/http-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c
diff --git a/debian/modules/nginx-lua/t/data/fake-module/config b/debian/modules/http-lua/t/data/fake-module/config
similarity index 100%
rename from debian/modules/nginx-lua/t/data/fake-module/config
rename to debian/modules/http-lua/t/data/fake-module/config
diff --git a/debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c b/debian/modules/http-lua/t/data/fake-module/ngx_http_fake_module.c
similarity index 100%
rename from debian/modules/nginx-lua/t/data/fake-module/ngx_http_fake_module.c
rename to debian/modules/http-lua/t/data/fake-module/ngx_http_fake_module.c
diff --git a/debian/modules/nginx-lua/t/data/fake-shm-module/config b/debian/modules/http-lua/t/data/fake-shm-module/config
similarity index 100%
rename from debian/modules/nginx-lua/t/data/fake-shm-module/config
rename to debian/modules/http-lua/t/data/fake-shm-module/config
diff --git a/debian/modules/nginx-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
similarity index 100%
rename from debian/modules/nginx-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
rename to debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
diff --git a/debian/modules/nginx-lua/t/lib/CRC32.lua b/debian/modules/http-lua/t/lib/CRC32.lua
similarity index 100%
rename from debian/modules/nginx-lua/t/lib/CRC32.lua
rename to debian/modules/http-lua/t/lib/CRC32.lua
diff --git a/debian/modules/nginx-lua/t/lib/Memcached.lua b/debian/modules/http-lua/t/lib/Memcached.lua
similarity index 100%
rename from debian/modules/nginx-lua/t/lib/Memcached.lua
rename to debian/modules/http-lua/t/lib/Memcached.lua
diff --git a/debian/modules/nginx-lua/t/lib/Redis.lua b/debian/modules/http-lua/t/lib/Redis.lua
similarity index 100%
rename from debian/modules/nginx-lua/t/lib/Redis.lua
rename to debian/modules/http-lua/t/lib/Redis.lua
diff --git a/debian/modules/nginx-lua/t/lib/ljson.lua b/debian/modules/http-lua/t/lib/ljson.lua
similarity index 100%
rename from debian/modules/nginx-lua/t/lib/ljson.lua
rename to debian/modules/http-lua/t/lib/ljson.lua
diff --git a/debian/modules/nginx-lua/tapset/ngx_lua.stp b/debian/modules/http-lua/tapset/ngx_lua.stp
similarity index 100%
rename from debian/modules/nginx-lua/tapset/ngx_lua.stp
rename to debian/modules/http-lua/tapset/ngx_lua.stp
diff --git a/debian/modules/nginx-lua/util/build.sh b/debian/modules/http-lua/util/build.sh
similarity index 100%
rename from debian/modules/nginx-lua/util/build.sh
rename to debian/modules/http-lua/util/build.sh
diff --git a/debian/modules/nginx-lua/util/fix-comments b/debian/modules/http-lua/util/fix-comments
similarity index 100%
rename from debian/modules/nginx-lua/util/fix-comments
rename to debian/modules/http-lua/util/fix-comments
diff --git a/debian/modules/nginx-lua/util/gen-lexer-c b/debian/modules/http-lua/util/gen-lexer-c
similarity index 100%
rename from debian/modules/nginx-lua/util/gen-lexer-c
rename to debian/modules/http-lua/util/gen-lexer-c
diff --git a/debian/modules/nginx-lua/util/ngx-links b/debian/modules/http-lua/util/ngx-links
similarity index 100%
rename from debian/modules/nginx-lua/util/ngx-links
rename to debian/modules/http-lua/util/ngx-links
diff --git a/debian/modules/nginx-lua/util/releng b/debian/modules/http-lua/util/releng
similarity index 100%
rename from debian/modules/nginx-lua/util/releng
rename to debian/modules/http-lua/util/releng
diff --git a/debian/modules/nginx-lua/util/retab b/debian/modules/http-lua/util/retab
similarity index 100%
rename from debian/modules/nginx-lua/util/retab
rename to debian/modules/http-lua/util/retab
diff --git a/debian/modules/nginx-lua/util/revim b/debian/modules/http-lua/util/revim
similarity index 100%
rename from debian/modules/nginx-lua/util/revim
rename to debian/modules/http-lua/util/revim
diff --git a/debian/modules/nginx-lua/util/run_test.sh b/debian/modules/http-lua/util/run_test.sh
similarity index 100%
rename from debian/modules/nginx-lua/util/run_test.sh
rename to debian/modules/http-lua/util/run_test.sh
diff --git a/debian/modules/nginx-lua/util/update-readme.sh b/debian/modules/http-lua/util/update-readme.sh
similarity index 100%
rename from debian/modules/nginx-lua/util/update-readme.sh
rename to debian/modules/http-lua/util/update-readme.sh
diff --git a/debian/modules/nginx-lua/valgrind.suppress b/debian/modules/http-lua/valgrind.suppress
similarity index 100%
rename from debian/modules/nginx-lua/valgrind.suppress
rename to debian/modules/http-lua/valgrind.suppress
diff --git a/debian/modules/nginx-development-kit/LICENSE b/debian/modules/http-ndk/LICENSE
similarity index 100%
rename from debian/modules/nginx-development-kit/LICENSE
rename to debian/modules/http-ndk/LICENSE
diff --git a/debian/modules/nginx-development-kit/README.md b/debian/modules/http-ndk/README.md
similarity index 100%
rename from debian/modules/nginx-development-kit/README.md
rename to debian/modules/http-ndk/README.md
diff --git a/debian/modules/nginx-development-kit/README_AUTO_LIB b/debian/modules/http-ndk/README_AUTO_LIB
similarity index 100%
rename from debian/modules/nginx-development-kit/README_AUTO_LIB
rename to debian/modules/http-ndk/README_AUTO_LIB
diff --git a/debian/modules/nginx-development-kit/TODO b/debian/modules/http-ndk/TODO
similarity index 100%
rename from debian/modules/nginx-development-kit/TODO
rename to debian/modules/http-ndk/TODO
diff --git a/debian/modules/nginx-development-kit/auto/actions/array b/debian/modules/http-ndk/auto/actions/array
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/actions/array
rename to debian/modules/http-ndk/auto/actions/array
diff --git a/debian/modules/nginx-development-kit/auto/actions/palloc b/debian/modules/http-ndk/auto/actions/palloc
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/actions/palloc
rename to debian/modules/http-ndk/auto/actions/palloc
diff --git a/debian/modules/nginx-development-kit/auto/build b/debian/modules/http-ndk/auto/build
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/build
rename to debian/modules/http-ndk/auto/build
diff --git a/debian/modules/nginx-development-kit/auto/data/action_replacements b/debian/modules/http-ndk/auto/data/action_replacements
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/action_replacements
rename to debian/modules/http-ndk/auto/data/action_replacements
diff --git a/debian/modules/nginx-development-kit/auto/data/action_types b/debian/modules/http-ndk/auto/data/action_types
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/action_types
rename to debian/modules/http-ndk/auto/data/action_types
diff --git a/debian/modules/nginx-development-kit/auto/data/conf_args b/debian/modules/http-ndk/auto/data/conf_args
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/conf_args
rename to debian/modules/http-ndk/auto/data/conf_args
diff --git a/debian/modules/nginx-development-kit/auto/data/conf_locs b/debian/modules/http-ndk/auto/data/conf_locs
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/conf_locs
rename to debian/modules/http-ndk/auto/data/conf_locs
diff --git a/debian/modules/nginx-development-kit/auto/data/conf_macros b/debian/modules/http-ndk/auto/data/conf_macros
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/conf_macros
rename to debian/modules/http-ndk/auto/data/conf_macros
diff --git a/debian/modules/nginx-development-kit/auto/data/contexts b/debian/modules/http-ndk/auto/data/contexts
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/contexts
rename to debian/modules/http-ndk/auto/data/contexts
diff --git a/debian/modules/nginx-development-kit/auto/data/header_files b/debian/modules/http-ndk/auto/data/header_files
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/header_files
rename to debian/modules/http-ndk/auto/data/header_files
diff --git a/debian/modules/nginx-development-kit/auto/data/headers b/debian/modules/http-ndk/auto/data/headers
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/headers
rename to debian/modules/http-ndk/auto/data/headers
diff --git a/debian/modules/nginx-development-kit/auto/data/module_dependencies b/debian/modules/http-ndk/auto/data/module_dependencies
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/module_dependencies
rename to debian/modules/http-ndk/auto/data/module_dependencies
diff --git a/debian/modules/nginx-development-kit/auto/data/modules_optional b/debian/modules/http-ndk/auto/data/modules_optional
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/modules_optional
rename to debian/modules/http-ndk/auto/data/modules_optional
diff --git a/debian/modules/nginx-development-kit/auto/data/prefixes b/debian/modules/http-ndk/auto/data/prefixes
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/data/prefixes
rename to debian/modules/http-ndk/auto/data/prefixes
diff --git a/debian/modules/nginx-development-kit/auto/src/array.h b/debian/modules/http-ndk/auto/src/array.h
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/src/array.h
rename to debian/modules/http-ndk/auto/src/array.h
diff --git a/debian/modules/nginx-development-kit/auto/src/conf_cmd_basic.h b/debian/modules/http-ndk/auto/src/conf_cmd_basic.h
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/src/conf_cmd_basic.h
rename to debian/modules/http-ndk/auto/src/conf_cmd_basic.h
diff --git a/debian/modules/nginx-development-kit/auto/src/conf_merge.h b/debian/modules/http-ndk/auto/src/conf_merge.h
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/src/conf_merge.h
rename to debian/modules/http-ndk/auto/src/conf_merge.h
diff --git a/debian/modules/nginx-development-kit/auto/src/palloc.h b/debian/modules/http-ndk/auto/src/palloc.h
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/src/palloc.h
rename to debian/modules/http-ndk/auto/src/palloc.h
diff --git a/debian/modules/nginx-development-kit/auto/text/autogen b/debian/modules/http-ndk/auto/text/autogen
similarity index 100%
rename from debian/modules/nginx-development-kit/auto/text/autogen
rename to debian/modules/http-ndk/auto/text/autogen
diff --git a/debian/modules/nginx-development-kit/config b/debian/modules/http-ndk/config
similarity index 100%
rename from debian/modules/nginx-development-kit/config
rename to debian/modules/http-ndk/config
diff --git a/debian/modules/nginx-development-kit/docs/core/action_macros b/debian/modules/http-ndk/docs/core/action_macros
similarity index 100%
rename from debian/modules/nginx-development-kit/docs/core/action_macros
rename to debian/modules/http-ndk/docs/core/action_macros
diff --git a/debian/modules/nginx-development-kit/docs/core/conf_cmds b/debian/modules/http-ndk/docs/core/conf_cmds
similarity index 100%
rename from debian/modules/nginx-development-kit/docs/core/conf_cmds
rename to debian/modules/http-ndk/docs/core/conf_cmds
diff --git a/debian/modules/nginx-development-kit/docs/modules/set_var b/debian/modules/http-ndk/docs/modules/set_var
similarity index 100%
rename from debian/modules/nginx-development-kit/docs/modules/set_var
rename to debian/modules/http-ndk/docs/modules/set_var
diff --git a/debian/modules/nginx-development-kit/docs/patches/more_logging_info b/debian/modules/http-ndk/docs/patches/more_logging_info
similarity index 100%
rename from debian/modules/nginx-development-kit/docs/patches/more_logging_info
rename to debian/modules/http-ndk/docs/patches/more_logging_info
diff --git a/debian/modules/nginx-development-kit/docs/upstream/list b/debian/modules/http-ndk/docs/upstream/list
similarity index 100%
rename from debian/modules/nginx-development-kit/docs/upstream/list
rename to debian/modules/http-ndk/docs/upstream/list
diff --git a/debian/modules/nginx-development-kit/examples/README b/debian/modules/http-ndk/examples/README
similarity index 100%
rename from debian/modules/nginx-development-kit/examples/README
rename to debian/modules/http-ndk/examples/README
diff --git a/debian/modules/nginx-development-kit/examples/http/set_var/config b/debian/modules/http-ndk/examples/http/set_var/config
similarity index 100%
rename from debian/modules/nginx-development-kit/examples/http/set_var/config
rename to debian/modules/http-ndk/examples/http/set_var/config
diff --git a/debian/modules/nginx-development-kit/examples/http/set_var/ngx_http_set_var_examples_module.c b/debian/modules/http-ndk/examples/http/set_var/ngx_http_set_var_examples_module.c
similarity index 100%
rename from debian/modules/nginx-development-kit/examples/http/set_var/ngx_http_set_var_examples_module.c
rename to debian/modules/http-ndk/examples/http/set_var/ngx_http_set_var_examples_module.c
diff --git a/debian/modules/nginx-development-kit/ngx_auto_lib_core b/debian/modules/http-ndk/ngx_auto_lib_core
similarity index 100%
rename from debian/modules/nginx-development-kit/ngx_auto_lib_core
rename to debian/modules/http-ndk/ngx_auto_lib_core
diff --git a/debian/modules/nginx-development-kit/notes/CHANGES b/debian/modules/http-ndk/notes/CHANGES
similarity index 100%
rename from debian/modules/nginx-development-kit/notes/CHANGES
rename to debian/modules/http-ndk/notes/CHANGES
diff --git a/debian/modules/nginx-development-kit/notes/LICENSE b/debian/modules/http-ndk/notes/LICENSE
similarity index 100%
rename from debian/modules/nginx-development-kit/notes/LICENSE
rename to debian/modules/http-ndk/notes/LICENSE
diff --git a/debian/modules/nginx-development-kit/objs/ndk_array.h b/debian/modules/http-ndk/objs/ndk_array.h
similarity index 100%
rename from debian/modules/nginx-development-kit/objs/ndk_array.h
rename to debian/modules/http-ndk/objs/ndk_array.h
diff --git a/debian/modules/nginx-development-kit/objs/ndk_conf_cmd_basic.h b/debian/modules/http-ndk/objs/ndk_conf_cmd_basic.h
similarity index 100%
rename from debian/modules/nginx-development-kit/objs/ndk_conf_cmd_basic.h
rename to debian/modules/http-ndk/objs/ndk_conf_cmd_basic.h
diff --git a/debian/modules/nginx-development-kit/objs/ndk_conf_cmd_extra.h b/debian/modules/http-ndk/objs/ndk_conf_cmd_extra.h
similarity index 100%
rename from debian/modules/nginx-development-kit/objs/ndk_conf_cmd_extra.h
rename to debian/modules/http-ndk/objs/ndk_conf_cmd_extra.h
diff --git a/debian/modules/nginx-development-kit/objs/ndk_conf_merge.h b/debian/modules/http-ndk/objs/ndk_conf_merge.h
similarity index 100%
rename from debian/modules/nginx-development-kit/objs/ndk_conf_merge.h
rename to debian/modules/http-ndk/objs/ndk_conf_merge.h
diff --git a/debian/modules/nginx-development-kit/objs/ndk_config.c b/debian/modules/http-ndk/objs/ndk_config.c
similarity index 100%
rename from debian/modules/nginx-development-kit/objs/ndk_config.c
rename to debian/modules/http-ndk/objs/ndk_config.c
diff --git a/debian/modules/nginx-development-kit/objs/ndk_config.h b/debian/modules/http-ndk/objs/ndk_config.h
similarity index 100%
rename from debian/modules/nginx-development-kit/objs/ndk_config.h
rename to debian/modules/http-ndk/objs/ndk_config.h
diff --git a/debian/modules/nginx-development-kit/objs/ndk_includes.h b/debian/modules/http-ndk/objs/ndk_includes.h
similarity index 100%
rename from debian/modules/nginx-development-kit/objs/ndk_includes.h
rename to debian/modules/http-ndk/objs/ndk_includes.h
diff --git a/debian/modules/nginx-development-kit/objs/ndk_palloc.h b/debian/modules/http-ndk/objs/ndk_palloc.h
similarity index 100%
rename from debian/modules/nginx-development-kit/objs/ndk_palloc.h
rename to debian/modules/http-ndk/objs/ndk_palloc.h
diff --git a/debian/modules/nginx-development-kit/patches/auto_config b/debian/modules/http-ndk/patches/auto_config
similarity index 100%
rename from debian/modules/nginx-development-kit/patches/auto_config
rename to debian/modules/http-ndk/patches/auto_config
diff --git a/debian/modules/nginx-development-kit/patches/expose_rewrite_functions b/debian/modules/http-ndk/patches/expose_rewrite_functions
similarity index 100%
rename from debian/modules/nginx-development-kit/patches/expose_rewrite_functions
rename to debian/modules/http-ndk/patches/expose_rewrite_functions
diff --git a/debian/modules/nginx-development-kit/patches/rewrite_phase_handler b/debian/modules/http-ndk/patches/rewrite_phase_handler
similarity index 100%
rename from debian/modules/nginx-development-kit/patches/rewrite_phase_handler
rename to debian/modules/http-ndk/patches/rewrite_phase_handler
diff --git a/debian/modules/nginx-development-kit/src/hash/md5.h b/debian/modules/http-ndk/src/hash/md5.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/hash/md5.h
rename to debian/modules/http-ndk/src/hash/md5.h
diff --git a/debian/modules/nginx-development-kit/src/hash/murmurhash2.c b/debian/modules/http-ndk/src/hash/murmurhash2.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/hash/murmurhash2.c
rename to debian/modules/http-ndk/src/hash/murmurhash2.c
diff --git a/debian/modules/nginx-development-kit/src/hash/sha.h b/debian/modules/http-ndk/src/hash/sha.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/hash/sha.h
rename to debian/modules/http-ndk/src/hash/sha.h
diff --git a/debian/modules/nginx-development-kit/src/ndk.c b/debian/modules/http-ndk/src/ndk.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk.c
rename to debian/modules/http-ndk/src/ndk.c
diff --git a/debian/modules/nginx-development-kit/src/ndk.h b/debian/modules/http-ndk/src/ndk.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk.h
rename to debian/modules/http-ndk/src/ndk.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_buf.c b/debian/modules/http-ndk/src/ndk_buf.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_buf.c
rename to debian/modules/http-ndk/src/ndk_buf.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_buf.h b/debian/modules/http-ndk/src/ndk_buf.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_buf.h
rename to debian/modules/http-ndk/src/ndk_buf.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_complex_path.c b/debian/modules/http-ndk/src/ndk_complex_path.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_complex_path.c
rename to debian/modules/http-ndk/src/ndk_complex_path.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_complex_path.h b/debian/modules/http-ndk/src/ndk_complex_path.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_complex_path.h
rename to debian/modules/http-ndk/src/ndk_complex_path.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_complex_value.c b/debian/modules/http-ndk/src/ndk_complex_value.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_complex_value.c
rename to debian/modules/http-ndk/src/ndk_complex_value.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_complex_value.h b/debian/modules/http-ndk/src/ndk_complex_value.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_complex_value.h
rename to debian/modules/http-ndk/src/ndk_complex_value.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_conf_file.c b/debian/modules/http-ndk/src/ndk_conf_file.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_conf_file.c
rename to debian/modules/http-ndk/src/ndk_conf_file.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_conf_file.h b/debian/modules/http-ndk/src/ndk_conf_file.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_conf_file.h
rename to debian/modules/http-ndk/src/ndk_conf_file.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_debug.c b/debian/modules/http-ndk/src/ndk_debug.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_debug.c
rename to debian/modules/http-ndk/src/ndk_debug.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_debug.h b/debian/modules/http-ndk/src/ndk_debug.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_debug.h
rename to debian/modules/http-ndk/src/ndk_debug.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_encoding.c b/debian/modules/http-ndk/src/ndk_encoding.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_encoding.c
rename to debian/modules/http-ndk/src/ndk_encoding.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_encoding.h b/debian/modules/http-ndk/src/ndk_encoding.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_encoding.h
rename to debian/modules/http-ndk/src/ndk_encoding.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_hash.c b/debian/modules/http-ndk/src/ndk_hash.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_hash.c
rename to debian/modules/http-ndk/src/ndk_hash.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_hash.h b/debian/modules/http-ndk/src/ndk_hash.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_hash.h
rename to debian/modules/http-ndk/src/ndk_hash.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_http.c b/debian/modules/http-ndk/src/ndk_http.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_http.c
rename to debian/modules/http-ndk/src/ndk_http.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_http.h b/debian/modules/http-ndk/src/ndk_http.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_http.h
rename to debian/modules/http-ndk/src/ndk_http.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_http_headers.h b/debian/modules/http-ndk/src/ndk_http_headers.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_http_headers.h
rename to debian/modules/http-ndk/src/ndk_http_headers.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_log.c b/debian/modules/http-ndk/src/ndk_log.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_log.c
rename to debian/modules/http-ndk/src/ndk_log.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_log.h b/debian/modules/http-ndk/src/ndk_log.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_log.h
rename to debian/modules/http-ndk/src/ndk_log.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_parse.h b/debian/modules/http-ndk/src/ndk_parse.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_parse.h
rename to debian/modules/http-ndk/src/ndk_parse.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_path.c b/debian/modules/http-ndk/src/ndk_path.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_path.c
rename to debian/modules/http-ndk/src/ndk_path.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_path.h b/debian/modules/http-ndk/src/ndk_path.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_path.h
rename to debian/modules/http-ndk/src/ndk_path.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_process.c b/debian/modules/http-ndk/src/ndk_process.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_process.c
rename to debian/modules/http-ndk/src/ndk_process.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_process.h b/debian/modules/http-ndk/src/ndk_process.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_process.h
rename to debian/modules/http-ndk/src/ndk_process.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_regex.c b/debian/modules/http-ndk/src/ndk_regex.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_regex.c
rename to debian/modules/http-ndk/src/ndk_regex.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_regex.h b/debian/modules/http-ndk/src/ndk_regex.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_regex.h
rename to debian/modules/http-ndk/src/ndk_regex.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_rewrite.c b/debian/modules/http-ndk/src/ndk_rewrite.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_rewrite.c
rename to debian/modules/http-ndk/src/ndk_rewrite.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_rewrite.h b/debian/modules/http-ndk/src/ndk_rewrite.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_rewrite.h
rename to debian/modules/http-ndk/src/ndk_rewrite.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_set_var.c b/debian/modules/http-ndk/src/ndk_set_var.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_set_var.c
rename to debian/modules/http-ndk/src/ndk_set_var.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_set_var.h b/debian/modules/http-ndk/src/ndk_set_var.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_set_var.h
rename to debian/modules/http-ndk/src/ndk_set_var.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_string.c b/debian/modules/http-ndk/src/ndk_string.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_string.c
rename to debian/modules/http-ndk/src/ndk_string.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_string.h b/debian/modules/http-ndk/src/ndk_string.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_string.h
rename to debian/modules/http-ndk/src/ndk_string.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_string_util.h b/debian/modules/http-ndk/src/ndk_string_util.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_string_util.h
rename to debian/modules/http-ndk/src/ndk_string_util.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_upstream_list.c b/debian/modules/http-ndk/src/ndk_upstream_list.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_upstream_list.c
rename to debian/modules/http-ndk/src/ndk_upstream_list.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_upstream_list.h b/debian/modules/http-ndk/src/ndk_upstream_list.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_upstream_list.h
rename to debian/modules/http-ndk/src/ndk_upstream_list.h
diff --git a/debian/modules/nginx-development-kit/src/ndk_uri.c b/debian/modules/http-ndk/src/ndk_uri.c
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_uri.c
rename to debian/modules/http-ndk/src/ndk_uri.c
diff --git a/debian/modules/nginx-development-kit/src/ndk_uri.h b/debian/modules/http-ndk/src/ndk_uri.h
similarity index 100%
rename from debian/modules/nginx-development-kit/src/ndk_uri.h
rename to debian/modules/http-ndk/src/ndk_uri.h
diff --git a/debian/modules/ngx_http_substitutions_filter_module/CHANGES b/debian/modules/http-subs-filter/CHANGES
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/CHANGES
rename to debian/modules/http-subs-filter/CHANGES
diff --git a/debian/modules/ngx_http_substitutions_filter_module/README b/debian/modules/http-subs-filter/README
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/README
rename to debian/modules/http-subs-filter/README
diff --git a/debian/modules/ngx_http_substitutions_filter_module/config b/debian/modules/http-subs-filter/config
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/config
rename to debian/modules/http-subs-filter/config
diff --git a/debian/modules/ngx_http_substitutions_filter_module/doc/README.google_code_home_page.wiki b/debian/modules/http-subs-filter/doc/README.google_code_home_page.wiki
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/doc/README.google_code_home_page.wiki
rename to debian/modules/http-subs-filter/doc/README.google_code_home_page.wiki
diff --git a/debian/modules/ngx_http_substitutions_filter_module/doc/README.html b/debian/modules/http-subs-filter/doc/README.html
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/doc/README.html
rename to debian/modules/http-subs-filter/doc/README.html
diff --git a/debian/modules/ngx_http_substitutions_filter_module/doc/README.wiki b/debian/modules/http-subs-filter/doc/README.wiki
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/doc/README.wiki
rename to debian/modules/http-subs-filter/doc/README.wiki
diff --git a/debian/modules/ngx_http_substitutions_filter_module/ngx_http_subs_filter_module.c b/debian/modules/http-subs-filter/ngx_http_subs_filter_module.c
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/ngx_http_subs_filter_module.c
rename to debian/modules/http-subs-filter/ngx_http_subs_filter_module.c
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/README b/debian/modules/http-subs-filter/test/README
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/README
rename to debian/modules/http-subs-filter/test/README
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/AutoInstall.pm b/debian/modules/http-subs-filter/test/inc/Module/AutoInstall.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/AutoInstall.pm
rename to debian/modules/http-subs-filter/test/inc/Module/AutoInstall.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install.pm b/debian/modules/http-subs-filter/test/inc/Module/Install.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/AutoInstall.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/AutoInstall.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/AutoInstall.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/AutoInstall.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Base.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Base.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Base.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/Base.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Can.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Can.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Can.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/Can.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Fetch.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Fetch.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Fetch.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/Fetch.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Include.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Include.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Include.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/Include.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Makefile.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Makefile.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Makefile.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/Makefile.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Metadata.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Metadata.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Metadata.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/Metadata.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/TestBase.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/TestBase.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/TestBase.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/TestBase.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Win32.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Win32.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/Win32.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/Win32.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/WriteAll.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/WriteAll.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Module/Install/WriteAll.pm
rename to debian/modules/http-subs-filter/test/inc/Module/Install/WriteAll.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Spiffy.pm b/debian/modules/http-subs-filter/test/inc/Spiffy.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Spiffy.pm
rename to debian/modules/http-subs-filter/test/inc/Spiffy.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/Base.pm b/debian/modules/http-subs-filter/test/inc/Test/Base.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/Base.pm
rename to debian/modules/http-subs-filter/test/inc/Test/Base.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/Base/Filter.pm b/debian/modules/http-subs-filter/test/inc/Test/Base/Filter.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/Base/Filter.pm
rename to debian/modules/http-subs-filter/test/inc/Test/Base/Filter.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/Builder.pm b/debian/modules/http-subs-filter/test/inc/Test/Builder.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/Builder.pm
rename to debian/modules/http-subs-filter/test/inc/Test/Builder.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/Builder/Module.pm b/debian/modules/http-subs-filter/test/inc/Test/Builder/Module.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/Builder/Module.pm
rename to debian/modules/http-subs-filter/test/inc/Test/Builder/Module.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/More.pm b/debian/modules/http-subs-filter/test/inc/Test/More.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/inc/Test/More.pm
rename to debian/modules/http-subs-filter/test/inc/Test/More.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx.pm b/debian/modules/http-subs-filter/test/lib/Test/Nginx.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx.pm
rename to debian/modules/http-subs-filter/test/lib/Test/Nginx.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx/LWP.pm b/debian/modules/http-subs-filter/test/lib/Test/Nginx/LWP.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx/LWP.pm
rename to debian/modules/http-subs-filter/test/lib/Test/Nginx/LWP.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx/Socket.pm b/debian/modules/http-subs-filter/test/lib/Test/Nginx/Socket.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx/Socket.pm
rename to debian/modules/http-subs-filter/test/lib/Test/Nginx/Socket.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx/Util.pm b/debian/modules/http-subs-filter/test/lib/Test/Nginx/Util.pm
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/lib/Test/Nginx/Util.pm
rename to debian/modules/http-subs-filter/test/lib/Test/Nginx/Util.pm
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/t/subs.t b/debian/modules/http-subs-filter/test/t/subs.t
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/t/subs.t
rename to debian/modules/http-subs-filter/test/t/subs.t
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/t/subs_capture.t b/debian/modules/http-subs-filter/test/t/subs_capture.t
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/t/subs_capture.t
rename to debian/modules/http-subs-filter/test/t/subs_capture.t
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/t/subs_fix_string.t b/debian/modules/http-subs-filter/test/t/subs_fix_string.t
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/t/subs_fix_string.t
rename to debian/modules/http-subs-filter/test/t/subs_fix_string.t
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/t/subs_regex.t b/debian/modules/http-subs-filter/test/t/subs_regex.t
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/t/subs_regex.t
rename to debian/modules/http-subs-filter/test/t/subs_regex.t
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/t/subs_types.t b/debian/modules/http-subs-filter/test/t/subs_types.t
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/t/subs_types.t
rename to debian/modules/http-subs-filter/test/t/subs_types.t
diff --git a/debian/modules/ngx_http_substitutions_filter_module/test/test.sh b/debian/modules/http-subs-filter/test/test.sh
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/test/test.sh
rename to debian/modules/http-subs-filter/test/test.sh
diff --git a/debian/modules/ngx_http_substitutions_filter_module/util/update-readme.sh b/debian/modules/http-subs-filter/util/update-readme.sh
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/util/update-readme.sh
rename to debian/modules/http-subs-filter/util/update-readme.sh
diff --git a/debian/modules/ngx_http_substitutions_filter_module/util/wiki2google_code_homepage.pl b/debian/modules/http-subs-filter/util/wiki2google_code_homepage.pl
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/util/wiki2google_code_homepage.pl
rename to debian/modules/http-subs-filter/util/wiki2google_code_homepage.pl
diff --git a/debian/modules/ngx_http_substitutions_filter_module/util/wiki2pod.pl b/debian/modules/http-subs-filter/util/wiki2pod.pl
similarity index 100%
rename from debian/modules/ngx_http_substitutions_filter_module/util/wiki2pod.pl
rename to debian/modules/http-subs-filter/util/wiki2pod.pl
diff --git a/debian/modules/nginx-upload-progress/CHANGES b/debian/modules/http-uploadprogress/CHANGES
similarity index 100%
rename from debian/modules/nginx-upload-progress/CHANGES
rename to debian/modules/http-uploadprogress/CHANGES
diff --git a/debian/modules/nginx-upload-progress/LICENSE b/debian/modules/http-uploadprogress/LICENSE
similarity index 100%
rename from debian/modules/nginx-upload-progress/LICENSE
rename to debian/modules/http-uploadprogress/LICENSE
diff --git a/debian/modules/nginx-upload-progress/Makefile b/debian/modules/http-uploadprogress/Makefile
similarity index 100%
rename from debian/modules/nginx-upload-progress/Makefile
rename to debian/modules/http-uploadprogress/Makefile
diff --git a/debian/modules/nginx-upload-progress/README b/debian/modules/http-uploadprogress/README
similarity index 100%
rename from debian/modules/nginx-upload-progress/README
rename to debian/modules/http-uploadprogress/README
diff --git a/debian/modules/nginx-upload-progress/config b/debian/modules/http-uploadprogress/config
similarity index 100%
rename from debian/modules/nginx-upload-progress/config
rename to debian/modules/http-uploadprogress/config
diff --git a/debian/modules/nginx-upload-progress/ngx_http_uploadprogress_module.c b/debian/modules/http-uploadprogress/ngx_http_uploadprogress_module.c
similarity index 100%
rename from debian/modules/nginx-upload-progress/ngx_http_uploadprogress_module.c
rename to debian/modules/http-uploadprogress/ngx_http_uploadprogress_module.c
diff --git a/debian/modules/nginx-upload-progress/test/client.sh b/debian/modules/http-uploadprogress/test/client.sh
similarity index 100%
rename from debian/modules/nginx-upload-progress/test/client.sh
rename to debian/modules/http-uploadprogress/test/client.sh
diff --git a/debian/modules/nginx-upload-progress/test/stress.sh b/debian/modules/http-uploadprogress/test/stress.sh
similarity index 100%
rename from debian/modules/nginx-upload-progress/test/stress.sh
rename to debian/modules/http-uploadprogress/test/stress.sh
diff --git a/debian/modules/nginx-upstream-fair/.gdbinit b/debian/modules/http-upstream-fair/.gdbinit
similarity index 100%
rename from debian/modules/nginx-upstream-fair/.gdbinit
rename to debian/modules/http-upstream-fair/.gdbinit
diff --git a/debian/modules/nginx-upstream-fair/README b/debian/modules/http-upstream-fair/README
similarity index 100%
rename from debian/modules/nginx-upstream-fair/README
rename to debian/modules/http-upstream-fair/README
diff --git a/debian/modules/nginx-upstream-fair/config b/debian/modules/http-upstream-fair/config
similarity index 100%
rename from debian/modules/nginx-upstream-fair/config
rename to debian/modules/http-upstream-fair/config
diff --git a/debian/modules/nginx-upstream-fair/ngx_http_upstream_fair_module.c b/debian/modules/http-upstream-fair/ngx_http_upstream_fair_module.c
similarity index 100%
rename from debian/modules/nginx-upstream-fair/ngx_http_upstream_fair_module.c
rename to debian/modules/http-upstream-fair/ngx_http_upstream_fair_module.c
diff --git a/debian/modules/patches/nginx-cache-purge/dynamic-module.patch b/debian/modules/patches/http-cache-purge/dynamic-module.patch
similarity index 100%
rename from debian/modules/patches/nginx-cache-purge/dynamic-module.patch
rename to debian/modules/patches/http-cache-purge/dynamic-module.patch
diff --git a/debian/modules/patches/nginx-cache-purge/segfault-1.11.6.patch b/debian/modules/patches/http-cache-purge/segfault-1.11.6.patch
similarity index 100%
rename from debian/modules/patches/nginx-cache-purge/segfault-1.11.6.patch
rename to debian/modules/patches/http-cache-purge/segfault-1.11.6.patch
diff --git a/debian/modules/patches/nginx-cache-purge/series b/debian/modules/patches/http-cache-purge/series
similarity index 100%
rename from debian/modules/patches/nginx-cache-purge/series
rename to debian/modules/patches/http-cache-purge/series
diff --git a/debian/modules/patches/nginx-dav-ext-module/dynamic-module.patch b/debian/modules/patches/http-dav-ext/dynamic-module.patch
similarity index 100%
rename from debian/modules/patches/nginx-dav-ext-module/dynamic-module.patch
rename to debian/modules/patches/http-dav-ext/dynamic-module.patch
diff --git a/debian/modules/patches/nginx-dav-ext-module/series b/debian/modules/patches/http-dav-ext/series
similarity index 100%
rename from debian/modules/patches/nginx-dav-ext-module/series
rename to debian/modules/patches/http-dav-ext/series
diff --git a/debian/modules/patches/nginx-echo/build-nginx-1.11.11.patch b/debian/modules/patches/http-echo/build-nginx-1.11.11.patch
similarity index 100%
rename from debian/modules/patches/nginx-echo/build-nginx-1.11.11.patch
rename to debian/modules/patches/http-echo/build-nginx-1.11.11.patch
diff --git a/debian/modules/patches/nginx-echo/series b/debian/modules/patches/http-echo/series
similarity index 100%
rename from debian/modules/patches/nginx-echo/series
rename to debian/modules/patches/http-echo/series
diff --git a/debian/modules/patches/nginx-lua/discover-luajit-2.1.patch b/debian/modules/patches/http-lua/discover-luajit-2.1.patch
similarity index 100%
rename from debian/modules/patches/nginx-lua/discover-luajit-2.1.patch
rename to debian/modules/patches/http-lua/discover-luajit-2.1.patch
diff --git a/debian/modules/patches/nginx-lua/openssl-1.1.0.patch b/debian/modules/patches/http-lua/openssl-1.1.0.patch
similarity index 100%
rename from debian/modules/patches/nginx-lua/openssl-1.1.0.patch
rename to debian/modules/patches/http-lua/openssl-1.1.0.patch
diff --git a/debian/modules/patches/nginx-lua/series b/debian/modules/patches/http-lua/series
similarity index 100%
rename from debian/modules/patches/nginx-lua/series
rename to debian/modules/patches/http-lua/series
diff --git a/debian/modules/patches/ngx_http_substitutions_filter_module/dynamic-module.patch b/debian/modules/patches/http-subs-filter/dynamic-module.patch
similarity index 100%
rename from debian/modules/patches/ngx_http_substitutions_filter_module/dynamic-module.patch
rename to debian/modules/patches/http-subs-filter/dynamic-module.patch
diff --git a/debian/modules/patches/ngx_http_substitutions_filter_module/series b/debian/modules/patches/http-subs-filter/series
similarity index 100%
rename from debian/modules/patches/ngx_http_substitutions_filter_module/series
rename to debian/modules/patches/http-subs-filter/series
diff --git a/debian/modules/patches/nginx-upstream-fair/drop-default-port.patch b/debian/modules/patches/http-upstream-fair/drop-default-port.patch
similarity index 100%
rename from debian/modules/patches/nginx-upstream-fair/drop-default-port.patch
rename to debian/modules/patches/http-upstream-fair/drop-default-port.patch
diff --git a/debian/modules/patches/nginx-upstream-fair/dynamic-module.patch b/debian/modules/patches/http-upstream-fair/dynamic-module.patch
similarity index 100%
rename from debian/modules/patches/nginx-upstream-fair/dynamic-module.patch
rename to debian/modules/patches/http-upstream-fair/dynamic-module.patch
diff --git a/debian/modules/patches/nginx-upstream-fair/openssl-1.1.0.patch b/debian/modules/patches/http-upstream-fair/openssl-1.1.0.patch
similarity index 100%
rename from debian/modules/patches/nginx-upstream-fair/openssl-1.1.0.patch
rename to debian/modules/patches/http-upstream-fair/openssl-1.1.0.patch
diff --git a/debian/modules/patches/nginx-upstream-fair/series b/debian/modules/patches/http-upstream-fair/series
similarity index 100%
rename from debian/modules/patches/nginx-upstream-fair/series
rename to debian/modules/patches/http-upstream-fair/series
diff --git a/debian/modules/nginx-rtmp/AUTHORS b/debian/modules/rtmp/AUTHORS
similarity index 100%
rename from debian/modules/nginx-rtmp/AUTHORS
rename to debian/modules/rtmp/AUTHORS
diff --git a/debian/modules/nginx-rtmp/LICENSE b/debian/modules/rtmp/LICENSE
similarity index 100%
rename from debian/modules/nginx-rtmp/LICENSE
rename to debian/modules/rtmp/LICENSE
diff --git a/debian/modules/nginx-rtmp/README.md b/debian/modules/rtmp/README.md
similarity index 100%
rename from debian/modules/nginx-rtmp/README.md
rename to debian/modules/rtmp/README.md
diff --git a/debian/modules/nginx-rtmp/config b/debian/modules/rtmp/config
similarity index 100%
rename from debian/modules/nginx-rtmp/config
rename to debian/modules/rtmp/config
diff --git a/debian/modules/nginx-rtmp/dash/ngx_rtmp_dash_module.c b/debian/modules/rtmp/dash/ngx_rtmp_dash_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/dash/ngx_rtmp_dash_module.c
rename to debian/modules/rtmp/dash/ngx_rtmp_dash_module.c
diff --git a/debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.c b/debian/modules/rtmp/dash/ngx_rtmp_mp4.c
similarity index 100%
rename from debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.c
rename to debian/modules/rtmp/dash/ngx_rtmp_mp4.c
diff --git a/debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.h b/debian/modules/rtmp/dash/ngx_rtmp_mp4.h
similarity index 100%
rename from debian/modules/nginx-rtmp/dash/ngx_rtmp_mp4.h
rename to debian/modules/rtmp/dash/ngx_rtmp_mp4.h
diff --git a/debian/modules/nginx-rtmp/doc/README.md b/debian/modules/rtmp/doc/README.md
similarity index 100%
rename from debian/modules/nginx-rtmp/doc/README.md
rename to debian/modules/rtmp/doc/README.md
diff --git a/debian/modules/nginx-rtmp/hls/ngx_rtmp_hls_module.c b/debian/modules/rtmp/hls/ngx_rtmp_hls_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/hls/ngx_rtmp_hls_module.c
rename to debian/modules/rtmp/hls/ngx_rtmp_hls_module.c
diff --git a/debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.c b/debian/modules/rtmp/hls/ngx_rtmp_mpegts.c
similarity index 100%
rename from debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.c
rename to debian/modules/rtmp/hls/ngx_rtmp_mpegts.c
diff --git a/debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.h b/debian/modules/rtmp/hls/ngx_rtmp_mpegts.h
similarity index 100%
rename from debian/modules/nginx-rtmp/hls/ngx_rtmp_mpegts.h
rename to debian/modules/rtmp/hls/ngx_rtmp_mpegts.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp.c b/debian/modules/rtmp/ngx_rtmp.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp.c
rename to debian/modules/rtmp/ngx_rtmp.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp.h b/debian/modules/rtmp/ngx_rtmp.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp.h
rename to debian/modules/rtmp/ngx_rtmp.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_access_module.c b/debian/modules/rtmp/ngx_rtmp_access_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_access_module.c
rename to debian/modules/rtmp/ngx_rtmp_access_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_amf.c b/debian/modules/rtmp/ngx_rtmp_amf.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_amf.c
rename to debian/modules/rtmp/ngx_rtmp_amf.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_amf.h b/debian/modules/rtmp/ngx_rtmp_amf.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_amf.h
rename to debian/modules/rtmp/ngx_rtmp_amf.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_auto_push_module.c b/debian/modules/rtmp/ngx_rtmp_auto_push_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_auto_push_module.c
rename to debian/modules/rtmp/ngx_rtmp_auto_push_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.c b/debian/modules/rtmp/ngx_rtmp_bandwidth.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.c
rename to debian/modules/rtmp/ngx_rtmp_bandwidth.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.h b/debian/modules/rtmp/ngx_rtmp_bandwidth.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_bandwidth.h
rename to debian/modules/rtmp/ngx_rtmp_bandwidth.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_bitop.c b/debian/modules/rtmp/ngx_rtmp_bitop.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_bitop.c
rename to debian/modules/rtmp/ngx_rtmp_bitop.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_bitop.h b/debian/modules/rtmp/ngx_rtmp_bitop.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_bitop.h
rename to debian/modules/rtmp/ngx_rtmp_bitop.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.c b/debian/modules/rtmp/ngx_rtmp_cmd_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.c
rename to debian/modules/rtmp/ngx_rtmp_cmd_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.h b/debian/modules/rtmp/ngx_rtmp_cmd_module.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_cmd_module.h
rename to debian/modules/rtmp/ngx_rtmp_cmd_module.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_codec_module.c b/debian/modules/rtmp/ngx_rtmp_codec_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_codec_module.c
rename to debian/modules/rtmp/ngx_rtmp_codec_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_codec_module.h b/debian/modules/rtmp/ngx_rtmp_codec_module.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_codec_module.h
rename to debian/modules/rtmp/ngx_rtmp_codec_module.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_control_module.c b/debian/modules/rtmp/ngx_rtmp_control_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_control_module.c
rename to debian/modules/rtmp/ngx_rtmp_control_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_core_module.c b/debian/modules/rtmp/ngx_rtmp_core_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_core_module.c
rename to debian/modules/rtmp/ngx_rtmp_core_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_eval.c b/debian/modules/rtmp/ngx_rtmp_eval.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_eval.c
rename to debian/modules/rtmp/ngx_rtmp_eval.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_eval.h b/debian/modules/rtmp/ngx_rtmp_eval.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_eval.h
rename to debian/modules/rtmp/ngx_rtmp_eval.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_exec_module.c b/debian/modules/rtmp/ngx_rtmp_exec_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_exec_module.c
rename to debian/modules/rtmp/ngx_rtmp_exec_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_flv_module.c b/debian/modules/rtmp/ngx_rtmp_flv_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_flv_module.c
rename to debian/modules/rtmp/ngx_rtmp_flv_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_handler.c b/debian/modules/rtmp/ngx_rtmp_handler.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_handler.c
rename to debian/modules/rtmp/ngx_rtmp_handler.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_handshake.c b/debian/modules/rtmp/ngx_rtmp_handshake.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_handshake.c
rename to debian/modules/rtmp/ngx_rtmp_handshake.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_init.c b/debian/modules/rtmp/ngx_rtmp_init.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_init.c
rename to debian/modules/rtmp/ngx_rtmp_init.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_limit_module.c b/debian/modules/rtmp/ngx_rtmp_limit_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_limit_module.c
rename to debian/modules/rtmp/ngx_rtmp_limit_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_live_module.c b/debian/modules/rtmp/ngx_rtmp_live_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_live_module.c
rename to debian/modules/rtmp/ngx_rtmp_live_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_live_module.h b/debian/modules/rtmp/ngx_rtmp_live_module.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_live_module.h
rename to debian/modules/rtmp/ngx_rtmp_live_module.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_log_module.c b/debian/modules/rtmp/ngx_rtmp_log_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_log_module.c
rename to debian/modules/rtmp/ngx_rtmp_log_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_mp4_module.c b/debian/modules/rtmp/ngx_rtmp_mp4_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_mp4_module.c
rename to debian/modules/rtmp/ngx_rtmp_mp4_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.c b/debian/modules/rtmp/ngx_rtmp_netcall_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.c
rename to debian/modules/rtmp/ngx_rtmp_netcall_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.h b/debian/modules/rtmp/ngx_rtmp_netcall_module.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_netcall_module.h
rename to debian/modules/rtmp/ngx_rtmp_netcall_module.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_notify_module.c b/debian/modules/rtmp/ngx_rtmp_notify_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_notify_module.c
rename to debian/modules/rtmp/ngx_rtmp_notify_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_play_module.c b/debian/modules/rtmp/ngx_rtmp_play_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_play_module.c
rename to debian/modules/rtmp/ngx_rtmp_play_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_play_module.h b/debian/modules/rtmp/ngx_rtmp_play_module.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_play_module.h
rename to debian/modules/rtmp/ngx_rtmp_play_module.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.c b/debian/modules/rtmp/ngx_rtmp_proxy_protocol.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.c
rename to debian/modules/rtmp/ngx_rtmp_proxy_protocol.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.h b/debian/modules/rtmp/ngx_rtmp_proxy_protocol.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_proxy_protocol.h
rename to debian/modules/rtmp/ngx_rtmp_proxy_protocol.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_receive.c b/debian/modules/rtmp/ngx_rtmp_receive.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_receive.c
rename to debian/modules/rtmp/ngx_rtmp_receive.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_record_module.c b/debian/modules/rtmp/ngx_rtmp_record_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_record_module.c
rename to debian/modules/rtmp/ngx_rtmp_record_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_record_module.h b/debian/modules/rtmp/ngx_rtmp_record_module.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_record_module.h
rename to debian/modules/rtmp/ngx_rtmp_record_module.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_relay_module.c b/debian/modules/rtmp/ngx_rtmp_relay_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_relay_module.c
rename to debian/modules/rtmp/ngx_rtmp_relay_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_relay_module.h b/debian/modules/rtmp/ngx_rtmp_relay_module.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_relay_module.h
rename to debian/modules/rtmp/ngx_rtmp_relay_module.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_send.c b/debian/modules/rtmp/ngx_rtmp_send.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_send.c
rename to debian/modules/rtmp/ngx_rtmp_send.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_shared.c b/debian/modules/rtmp/ngx_rtmp_shared.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_shared.c
rename to debian/modules/rtmp/ngx_rtmp_shared.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_stat_module.c b/debian/modules/rtmp/ngx_rtmp_stat_module.c
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_stat_module.c
rename to debian/modules/rtmp/ngx_rtmp_stat_module.c
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_streams.h b/debian/modules/rtmp/ngx_rtmp_streams.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_streams.h
rename to debian/modules/rtmp/ngx_rtmp_streams.h
diff --git a/debian/modules/nginx-rtmp/ngx_rtmp_version.h b/debian/modules/rtmp/ngx_rtmp_version.h
similarity index 100%
rename from debian/modules/nginx-rtmp/ngx_rtmp_version.h
rename to debian/modules/rtmp/ngx_rtmp_version.h
diff --git a/debian/modules/nginx-rtmp/stat.xsl b/debian/modules/rtmp/stat.xsl
similarity index 100%
rename from debian/modules/nginx-rtmp/stat.xsl
rename to debian/modules/rtmp/stat.xsl
diff --git a/debian/rules b/debian/rules
index a852d02..981a57e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ light_configure_flags := \
 			--without-http_referer_module \
 			--without-http_split_clients_module \
 			--without-http_userid_module \
-			--add-dynamic-module=$(MODULESDIR)/nginx-echo
+			--add-dynamic-module=$(MODULESDIR)/http-echo
 
 full_configure_flags := \
 			$(common_configure_flags) \
@@ -98,11 +98,11 @@ full_configure_flags := \
 			--with-stream_ssl_preread_module \
 			--with-mail=dynamic \
 			--with-mail_ssl_module \
-			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
-			--add-dynamic-module=$(MODULESDIR)/nginx-dav-ext-module \
-			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
-			--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
-			--add-dynamic-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
+			--add-dynamic-module=$(MODULESDIR)/http-auth-pam \
+			--add-dynamic-module=$(MODULESDIR)/http-dav-ext \
+			--add-dynamic-module=$(MODULESDIR)/http-echo \
+			--add-dynamic-module=$(MODULESDIR)/http-upstream-fair \
+			--add-dynamic-module=$(MODULESDIR)/http-subs-filter
 
 extras_configure_flags := \
 			$(common_configure_flags) \
@@ -123,19 +123,19 @@ extras_configure_flags := \
 			--with-stream=dynamic \
 			--with-stream_ssl_module \
 			--with-stream_ssl_preread_module \
-			--add-dynamic-module=$(MODULESDIR)/headers-more-nginx-module \
-			--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
-			--add-dynamic-module=$(MODULESDIR)/nginx-cache-purge \
-			--add-dynamic-module=$(MODULESDIR)/nginx-dav-ext-module \
-			--add-dynamic-module=$(MODULESDIR)/nginx-development-kit \
-			--add-dynamic-module=$(MODULESDIR)/nginx-echo \
-			--add-dynamic-module=$(MODULESDIR)/ngx-fancyindex \
+			--add-dynamic-module=$(MODULESDIR)/http-headers-more-filter \
+			--add-dynamic-module=$(MODULESDIR)/http-auth-pam \
+			--add-dynamic-module=$(MODULESDIR)/http-cache-purge \
+			--add-dynamic-module=$(MODULESDIR)/http-dav-ext \
+			--add-dynamic-module=$(MODULESDIR)/http-ndk \
+			--add-dynamic-module=$(MODULESDIR)/http-echo \
+			--add-dynamic-module=$(MODULESDIR)/http-fancyindex \
 			--add-dynamic-module=$(MODULESDIR)/nchan \
-			--add-dynamic-module=$(MODULESDIR)/nginx-lua \
-			--add-dynamic-module=$(MODULESDIR)/nginx-rtmp \
-			--add-dynamic-module=$(MODULESDIR)/nginx-upload-progress \
-			--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
-			--add-dynamic-module=$(MODULESDIR)/ngx_http_substitutions_filter_module
+			--add-dynamic-module=$(MODULESDIR)/http-lua \
+			--add-dynamic-module=$(MODULESDIR)/rtmp \
+			--add-dynamic-module=$(MODULESDIR)/http-uploadprogress \
+			--add-dynamic-module=$(MODULESDIR)/http-upstream-fair \
+			--add-dynamic-module=$(MODULESDIR)/http-subs-filter
 
 %:
 	dh $@ --without autoreconf

From 0305fe8ea3e438b80a815f2ef18e6ecc77cca6b7 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 12 Oct 2017 10:37:08 +0300
Subject: [PATCH 221/600] Bump Standards-Version, no changes needed

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e7a598a..17cfaab 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 10),
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
 Homepage: http://nginx.net
 Vcs-Git: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git

From bf0c6fce6e6887b65e129f7974c3e8df69c8c627 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 12 Oct 2017 10:35:21 +0300
Subject: [PATCH 222/600] Drop dh-systemd dependency since we depend on
 debhelper >= 10

Fixes build-depends-on-obsolete-package in lintian.
---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 17cfaab..b8ae948 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Kartik Mistry <kartik@debian.org>,
            Christos Trochalakis <ctrochalakis@debian.org>
 Build-Depends: debhelper (>= 10),
                po-debconf,
-               dh-systemd (>= 1.5),
                dpkg-dev (>= 1.15.5),
                libexpat-dev,
                libgd-dev,

From f056335a382b9ef80a0e7ea390c547ddeb61061e Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 12 Oct 2017 10:44:13 +0300
Subject: [PATCH 223/600] Release 1.13.6-1

---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 396226e..8aa3e0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nginx (1.13.6-1) unstable; urgency=medium
+
+  * New upstream version
+  * Normalize module paths in packaging repository
+  * Bump Standards-Version, no changes needed
+  * Drop dh-systemd dependency since we depend on debhelper >= 10
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Thu, 12 Oct 2017 10:37:29 +0300
+
 nginx (1.13.5-1) unstable; urgency=medium
 
   * New upstream version 1.13.5

From 10af9c3beff85db4b194106586a899169e734be8 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Fri, 13 Oct 2017 12:40:11 +0300
Subject: [PATCH 224/600] rtmp: Ship docs & examples

Closes: #878368
---
 debian/libnginx-mod-rtmp.docs     | 2 +-
 debian/libnginx-mod-rtmp.examples | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/libnginx-mod-rtmp.docs b/debian/libnginx-mod-rtmp.docs
index 8bb7d17..e5c5c00 100644
--- a/debian/libnginx-mod-rtmp.docs
+++ b/debian/libnginx-mod-rtmp.docs
@@ -1 +1 @@
-debian/modules/nginx-rtmp/README.md
+debian/modules/rtmp/README.md
diff --git a/debian/libnginx-mod-rtmp.examples b/debian/libnginx-mod-rtmp.examples
index 6748d60..563f038 100644
--- a/debian/libnginx-mod-rtmp.examples
+++ b/debian/libnginx-mod-rtmp.examples
@@ -1 +1 @@
-debian/modules/nginx-rtmp/stat.xsl
+debian/modules/rtmp/stat.xsl

From 08248c9d96a3a6d83444f268219a8f8812c79f48 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Fri, 13 Oct 2017 12:59:41 +0300
Subject: [PATCH 225/600] Release 1.13.6-2

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8aa3e0a..5be779e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.13.6-2) unstable; urgency=medium
+
+  * rtmp: Ship docs & examples (Closes: #878368)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 13 Oct 2017 12:59:28 +0300
+
 nginx (1.13.6-1) unstable; urgency=medium
 
   * New upstream version

From dfa79bec5c13485c7be06718a713fe2793568160 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 22 Nov 2017 16:31:37 +0200
Subject: [PATCH 226/600] New upstream version 1.13.7

---
 CHANGES                                       | 24 ++++++++++++
 CHANGES.ru                                    | 24 ++++++++++++
 src/core/nginx.h                              |  4 +-
 src/core/ngx_conf_file.h                      |  2 +-
 src/core/ngx_cycle.c                          | 24 ++++++++----
 src/event/ngx_event_openssl.h                 |  1 +
 src/http/modules/ngx_http_fastcgi_module.c    |  1 +
 .../modules/ngx_http_gzip_filter_module.c     | 38 ++++++++++++++++---
 src/http/modules/ngx_http_ssi_filter_module.c | 15 ++++----
 .../modules/ngx_http_xslt_filter_module.c     | 15 +++++++-
 src/http/ngx_http_postpone_filter_module.c    |  9 ++++-
 src/http/ngx_http_request.c                   |  7 ++++
 src/http/ngx_http_upstream.c                  | 12 ++++++
 src/mail/ngx_mail_proxy_module.c              |  7 +++-
 src/stream/ngx_stream_proxy_module.c          |  6 +++
 15 files changed, 160 insertions(+), 29 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6a9fdcc..d93a938 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,28 @@
 
+Changes with nginx 1.13.7                                        21 Nov 2017
+
+    *) Bugfix: in the $upstream_status variable.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if a
+       backend returned a "101 Switching Protocols" response to a
+       subrequest.
+
+    *) Bugfix: a segmentation fault occurred in a master process if a shared
+       memory zone size was changed during a reconfiguration and the
+       reconfiguration failed.
+
+    *) Bugfix: in the ngx_http_fastcgi_module.
+
+    *) Bugfix: nginx returned the 500 error if parameters without variables
+       were specified in the "xslt_stylesheet" directive.
+
+    *) Workaround: "gzip filter failed to use preallocated memory" alerts
+       appeared in logs when using a zlib library variant from Intel.
+
+    *) Bugfix: the "worker_shutdown_timeout" directive did not work when
+       using mail proxy and when proxying WebSocket connections.
+
+
 Changes with nginx 1.13.6                                        10 Oct 2017
 
     *) Bugfix: switching to the next upstream server in the stream module
diff --git a/CHANGES.ru b/CHANGES.ru
index 6ea87c9..e688a5c 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,28 @@
 
+Изменения в nginx 1.13.7                                          21.11.2017
+
+    *) Исправление: в переменной $upstream_status.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если бэкенд возвращал ответ "101 Switching Protocols" на подзапрос.
+
+    *) Исправление: если при переконфигурации изменялся размер зоны
+       разделяемой памяти и переконфигурация завершалась неудачно, то в
+       главном процессе происходил segmentation fault.
+
+    *) Исправление: в модуле ngx_http_fastcgi_module.
+
+    *) Исправление: nginx возвращал ошибку 500, если в директиве
+       xslt_stylesheet были заданы параметры без использования переменных.
+
+    *) Изменение: при использовании варианта библиотеки zlib от Intel в лог
+       писались сообщения "gzip filter failed to use preallocated memory".
+
+    *) Исправление: директива worker_shutdown_timeout не работала при
+       использовании почтового прокси-сервера и при проксировании
+       WebSocket-соединений.
+
+
 Изменения в nginx 1.13.6                                          10.10.2017
 
     *) Исправление: при использовании директивы ssl_preread в модуле stream
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 5806837..02b51ab 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013006
-#define NGINX_VERSION      "1.13.6"
+#define nginx_version      1013007
+#define NGINX_VERSION      "1.13.7"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 213611f..9cd5806 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -128,7 +128,7 @@ struct ngx_conf_s {
     ngx_uint_t            cmd_type;
 
     ngx_conf_handler_pt   handler;
-    char                 *handler_conf;
+    void                 *handler_conf;
 };
 
 
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 675a506..f3ac24d 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -470,8 +470,6 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
                 goto shm_zone_found;
             }
 
-            ngx_shm_free(&oshm_zone[n].shm);
-
             break;
         }
 
@@ -662,14 +660,26 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
                 n = 0;
             }
 
-            if (oshm_zone[i].shm.name.len == shm_zone[n].shm.name.len
-                && ngx_strncmp(oshm_zone[i].shm.name.data,
-                               shm_zone[n].shm.name.data,
-                               oshm_zone[i].shm.name.len)
-                == 0)
+            if (oshm_zone[i].shm.name.len != shm_zone[n].shm.name.len) {
+                continue;
+            }
+
+            if (ngx_strncmp(oshm_zone[i].shm.name.data,
+                            shm_zone[n].shm.name.data,
+                            oshm_zone[i].shm.name.len)
+                != 0)
+            {
+                continue;
+            }
+
+            if (oshm_zone[i].tag == shm_zone[n].tag
+                && oshm_zone[i].shm.size == shm_zone[n].shm.size
+                && !oshm_zone[i].noreuse)
             {
                 goto live_shm_zone;
             }
+
+            break;
         }
 
         ngx_shm_free(&oshm_zone[i].shm);
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index b9a3a96..623d851 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -22,6 +22,7 @@
 #include <openssl/engine.h>
 #endif
 #include <openssl/evp.h>
+#include <openssl/hmac.h>
 #ifndef OPENSSL_NO_OCSP
 #include <openssl/ocsp.h>
 #endif
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index ea16eca..b4bb1d0 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -2646,6 +2646,7 @@ ngx_http_fastcgi_process_record(ngx_http_request_t *r,
         }
     }
 
+    f->pos = p;
     f->state = state;
 
     return NGX_AGAIN;
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index 73b6d89..e4c343c 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -57,6 +57,7 @@ typedef struct {
     unsigned             nomem:1;
     unsigned             gzheader:1;
     unsigned             buffering:1;
+    unsigned             intel:1;
 
     size_t               zin;
     size_t               zout;
@@ -233,6 +234,8 @@ static ngx_str_t  ngx_http_gzip_ratio = ngx_string("gzip_ratio");
 static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
 static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
 
+static ngx_uint_t  ngx_http_gzip_assume_intel;
+
 
 static ngx_int_t
 ngx_http_gzip_header_filter(ngx_http_request_t *r)
@@ -527,7 +530,27 @@ ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
      *  *) 5920 bytes on amd64 and sparc64
      */
 
-    ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9));
+    if (!ngx_http_gzip_assume_intel) {
+        ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9));
+
+    } else {
+        /*
+         * A zlib variant from Intel, https://github.com/jtkukunas/zlib.
+         * It can force window bits to 13 for fast compression level,
+         * on processors with SSE 4.2 it uses 64K hash instead of scaling
+         * it from the specified memory level, and also introduces
+         * 16-byte padding in one out of the two window-sized buffers.
+         */
+
+        if (conf->level == 1) {
+            wbits = ngx_max(wbits, 13);
+        }
+
+        ctx->allocated = 8192 + 16 + (1 << (wbits + 2))
+                         + (1 << (ngx_max(memlevel, 8) + 8))
+                         + (1 << (memlevel + 8));
+        ctx->intel = 1;
+    }
 }
 
 
@@ -1003,7 +1026,7 @@ ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
 
     alloc = items * size;
 
-    if (alloc % 512 != 0 && alloc < 8192) {
+    if (items == 1 && alloc % 512 != 0 && alloc < 8192) {
 
         /*
          * The zlib deflate_state allocation, it takes about 6K,
@@ -1025,9 +1048,14 @@ ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
         return p;
     }
 
-    ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0,
-                  "gzip filter failed to use preallocated memory: %ud of %ui",
-                  items * size, ctx->allocated);
+    if (ctx->intel) {
+        ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0,
+                      "gzip filter failed to use preallocated memory: "
+                      "%ud of %ui", items * size, ctx->allocated);
+
+    } else {
+        ngx_http_gzip_assume_intel = 1;
+    }
 
     p = ngx_palloc(ctx->request->pool, items * size);
 
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index e29e173..c799b2f 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -1630,8 +1630,7 @@ ngx_http_ssi_evaluate_string(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
     u_char                      ch, *p, **value, *data, *part_data;
     size_t                     *size, len, prefix, part_len;
     ngx_str_t                   var, *val;
-    ngx_int_t                   key;
-    ngx_uint_t                  i, n, bracket, quoted;
+    ngx_uint_t                  i, n, bracket, quoted, key;
     ngx_array_t                 lengths, values;
     ngx_http_variable_value_t  *vv;
 
@@ -1883,9 +1882,8 @@ ngx_http_ssi_regex_match(ngx_http_request_t *r, ngx_str_t *pattern,
     int                   rc, *captures;
     u_char               *p, errstr[NGX_MAX_CONF_ERRSTR];
     size_t                size;
-    ngx_int_t             key;
     ngx_str_t            *vv, name, value;
-    ngx_uint_t            i, n;
+    ngx_uint_t            i, n, key;
     ngx_http_ssi_ctx_t   *ctx;
     ngx_http_ssi_var_t   *var;
     ngx_regex_compile_t   rgc;
@@ -1988,10 +1986,10 @@ static ngx_int_t
 ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
     ngx_str_t **params)
 {
-    ngx_int_t                    rc, key;
+    ngx_int_t                    rc;
     ngx_str_t                   *uri, *file, *wait, *set, *stub, args;
     ngx_buf_t                   *b;
-    ngx_uint_t                   flags, i;
+    ngx_uint_t                   flags, i, key;
     ngx_chain_t                 *cl, *tl, **ll, *out;
     ngx_http_request_t          *sr;
     ngx_http_ssi_var_t          *var;
@@ -2248,9 +2246,9 @@ ngx_http_ssi_echo(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
 {
     u_char                     *p;
     uintptr_t                   len;
-    ngx_int_t                   key;
     ngx_buf_t                  *b;
     ngx_str_t                  *var, *value, *enc, text;
+    ngx_uint_t                  key;
     ngx_chain_t                *cl;
     ngx_http_variable_value_t  *vv;
 
@@ -2410,8 +2408,9 @@ static ngx_int_t
 ngx_http_ssi_set(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
     ngx_str_t **params)
 {
-    ngx_int_t            key, rc;
+    ngx_int_t            rc;
     ngx_str_t           *name, *value, *vv;
+    ngx_uint_t           key;
     ngx_http_ssi_var_t  *var;
     ngx_http_ssi_ctx_t  *mctx;
 
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index fae5895..ea7ce2a 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -686,8 +686,19 @@ ngx_http_xslt_params(ngx_http_request_t *r, ngx_http_xslt_filter_ctx_t *ctx,
          * specified in xslt_stylesheet directives
          */
 
-        p = string.data;
-        last = string.data + string.len;
+        if (param[i].value.lengths) {
+            p = string.data;
+
+        } else {
+            p = ngx_pnalloc(r->pool, string.len + 1);
+            if (p == NULL) {
+                return NGX_ERROR;
+            }
+
+            ngx_memcpy(p, string.data, string.len + 1);
+        }
+
+        last = p + string.len;
 
         while (p && *p) {
 
diff --git a/src/http/ngx_http_postpone_filter_module.c b/src/http/ngx_http_postpone_filter_module.c
index e893b83..55f2698 100644
--- a/src/http/ngx_http_postpone_filter_module.c
+++ b/src/http/ngx_http_postpone_filter_module.c
@@ -63,7 +63,10 @@ ngx_http_postpone_filter(ngx_http_request_t *r, ngx_chain_t *in)
     if (r != c->data) {
 
         if (in) {
-            ngx_http_postpone_filter_add(r, in);
+            if (ngx_http_postpone_filter_add(r, in) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
             return NGX_OK;
         }
 
@@ -86,7 +89,9 @@ ngx_http_postpone_filter(ngx_http_request_t *r, ngx_chain_t *in)
     }
 
     if (in) {
-        ngx_http_postpone_filter_add(r, in);
+        if (ngx_http_postpone_filter_add(r, in) != NGX_OK) {
+            return NGX_ERROR;
+        }
     }
 
     do {
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index de1b202..5668bf4 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2225,6 +2225,13 @@ ngx_http_request_handler(ngx_event_t *ev)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http run request: \"%V?%V\"", &r->uri, &r->args);
 
+    if (c->close) {
+        r->main->count++;
+        ngx_http_terminate_request(r, 0);
+        ngx_http_run_posted_requests(c);
+        return;
+    }
+
     if (ev->delayed && ev->timedout) {
         ev->delayed = 0;
         ev->timedout = 0;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 2ea521b..75f463b 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -3206,6 +3206,13 @@ ngx_http_upstream_upgrade(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     /* TODO: prevent upgrade if not requested or not possible */
 
+    if (r != r->main) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                      "connection upgrade in subrequest");
+        ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
+        return;
+    }
+
     r->keepalive = 0;
     c->log->action = "proxying upgraded connection";
 
@@ -4111,6 +4118,7 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
     switch (ft_type) {
 
     case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
+    case NGX_HTTP_UPSTREAM_FT_HTTP_504:
         status = NGX_HTTP_GATEWAY_TIME_OUT;
         break;
 
@@ -4118,6 +4126,10 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
         status = NGX_HTTP_INTERNAL_SERVER_ERROR;
         break;
 
+    case NGX_HTTP_UPSTREAM_FT_HTTP_503:
+        status = NGX_HTTP_SERVICE_UNAVAILABLE;
+        break;
+
     case NGX_HTTP_UPSTREAM_FT_HTTP_403:
         status = NGX_HTTP_FORBIDDEN;
         break;
diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c
index 007284b..1c86e54 100644
--- a/src/mail/ngx_mail_proxy_module.c
+++ b/src/mail/ngx_mail_proxy_module.c
@@ -882,10 +882,13 @@ ngx_mail_proxy_handler(ngx_event_t *ev)
     c = ev->data;
     s = c->data;
 
-    if (ev->timedout) {
+    if (ev->timedout || c->close) {
         c->log->action = "proxying";
 
-        if (c == s->connection) {
+        if (c->close) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0, "shutdown timeout");
+
+        } else if (c == s->connection) {
             ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
                           "client timed out");
             c->timedout = 1;
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 9d4b075..ad81cc8 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -1290,6 +1290,12 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
     s = c->data;
     u = s->upstream;
 
+    if (c->close) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0, "shutdown timeout");
+        ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
+        return;
+    }
+
     c = s->connection;
     pc = u->peer.connection;
 

From 9f10b314887ff633e1ef28419538980904938425 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 13 Dec 2017 10:51:58 +0200
Subject: [PATCH 227/600] Bump Standards-Version, no changes needed

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index b8ae948..38cd027 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10),
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 4.1.1
+Standards-Version: 4.1.2
 Homepage: http://nginx.net
 Vcs-Git: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git

From 08d6a8fe7a78a1d008a1e566d7bd96b317c51a93 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 14 Dec 2017 10:53:44 +0200
Subject: [PATCH 228/600] debian/watch: switch to HTTPS for the upstream check

Fixes lintian `source: debian-watch-uses-insecure-uri` info.
---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 6fa2f3e..0a39b11 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-http://nginx.org/download/nginx-(1\.13\.\d+)\.tar\.gz
+https://nginx.org/download/nginx-(1\.13\.\d+)\.tar\.gz

From 794cca0ebffcebe24c4d52eac33a961da1b79acd Mon Sep 17 00:00:00 2001
From: Mpampis Kostas <charkost.rb@gmail.com>
Date: Sat, 22 Jul 2017 16:26:21 +0300
Subject: [PATCH 229/600] Automate modules watch & upgrade process

This patch introduces the debian/ngxmod script and some helper
files which can be used to automate the modules watch & upgrade process.

The only subcommand for now is `uscan` and can be called as:
  $ debian/ngxmod uscan

The uscan subcommand runs uscan for each nginx module listed in
the newly deb822 formatted debian/modules/control using the watchfiles
in debian/modules/watch.

If a new version is available, it will ask you if you want to upgrade.
If you agree, it will download the tarball, place it in the nginx
source's parent directory and upgrade the module's source.

After the upgrade, it will remove the files listed in the
Files-Excluded module field and finally it will commit the changes.

Closes: #869499
---
 debian/modules/README.Modules-versions        |  69 --------
 debian/modules/control                        |  71 ++++++++
 debian/modules/uupdate                        |  10 ++
 debian/modules/watch/http-auth-pam            |   4 +
 debian/modules/watch/http-cache-purge         |   4 +
 debian/modules/watch/http-dav-ext             |   4 +
 debian/modules/watch/http-echo                |   4 +
 debian/modules/watch/http-fancyindex          |   4 +
 debian/modules/watch/http-headers-more-filter |   4 +
 debian/modules/watch/http-lua                 |   4 +
 debian/modules/watch/http-ndk                 |   4 +
 debian/modules/watch/http-subs-filter         |   4 +
 debian/modules/watch/http-uploadprogress      |   4 +
 debian/modules/watch/nchan                    |   4 +
 debian/modules/watch/rtmp                     |   4 +
 debian/ngxmod                                 | 156 ++++++++++++++++++
 16 files changed, 285 insertions(+), 69 deletions(-)
 delete mode 100644 debian/modules/README.Modules-versions
 create mode 100644 debian/modules/control
 create mode 100755 debian/modules/uupdate
 create mode 100644 debian/modules/watch/http-auth-pam
 create mode 100644 debian/modules/watch/http-cache-purge
 create mode 100644 debian/modules/watch/http-dav-ext
 create mode 100644 debian/modules/watch/http-echo
 create mode 100644 debian/modules/watch/http-fancyindex
 create mode 100644 debian/modules/watch/http-headers-more-filter
 create mode 100644 debian/modules/watch/http-lua
 create mode 100644 debian/modules/watch/http-ndk
 create mode 100644 debian/modules/watch/http-subs-filter
 create mode 100644 debian/modules/watch/http-uploadprogress
 create mode 100644 debian/modules/watch/nchan
 create mode 100644 debian/modules/watch/rtmp
 create mode 100755 debian/ngxmod

diff --git a/debian/modules/README.Modules-versions b/debian/modules/README.Modules-versions
deleted file mode 100644
index ff5f63b..0000000
--- a/debian/modules/README.Modules-versions
+++ /dev/null
@@ -1,69 +0,0 @@
-README for Modules versions
----------------------------
-
- This file lists third party modules built with nginx in Debian, homepage and
- version.
-
- headers-more-nginx-module
-  Homepage: https://github.com/agentzh/headers-more-nginx-module
-  Version: v0.32
-
- nginx-development-kit
-  Homepage: https://github.com/simpl/ngx_devel_kit/
-  Version: v0.3.0
-
- nginx-auth-pam
-  Homepage: https://github.com/stogh/ngx_http_auth_pam_module
-  Version: 1.5.1
-
- nginx-echo
-  Homepage: https://github.com/agentzh/echo-nginx-module
-  Version: v0.60
-  Patch: build-nginx-1.11.11.patch
-
- nginx-lua
-  Homepage: https://github.com/openresty/lua-nginx-module
-  Version: v0.10.10
-  Patch: openssl-1.1.0.patch
-  Patch: discover-luajit-2.1.patch
-
- nginx-upstream-fair
-  Homepage: https://github.com/gnosek/nginx-upstream-fair
-  Version: a18b409
-  Patch: dynamic-module.patch
-  Patch: openssl-1.1.0.patch
-  Patch: drop-default-port.patch
-
- nchan
-  Homepage: https://github.com/slact/nchan
-  Version: 1.0.8
-
- nginx-upload-progress
-  Homepage: https://github.com/masterzen/nginx-upload-progress-module
-    rm -r debian/nginx-upload-progress/test
-  Version: v0.9.2
-
- nginx-cache-purge
-  Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
-  Version: 2.3
-  Patch: dynamic-module.patch
-  Patch: segfault-1.11.6.patch
-
- nginx-dav-ext-module
-  Homepage: https://github.com/arut/nginx-dav-ext-module
-  Version: v0.0.3
-  Patch: dynamic-module.patch
-
- ngx-fancyindex
-  Homepage: https://github.com/aperezdc/ngx-fancyindex
-  Version: v0.4.1
-
- ngx_http_substitutions_filter_module
-  Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
-  Version: v0.6.4
-  Patch: dynamic-module.patch
-
- nginx-rtmp
-  Homepage: https://github.com/arut/nginx-rtmp-module
-    rm -r debian/modules/nginx-rtmp-module/test
-  Version: v1.1.11
diff --git a/debian/modules/control b/debian/modules/control
new file mode 100644
index 0000000..5f67e38
--- /dev/null
+++ b/debian/modules/control
@@ -0,0 +1,71 @@
+Module: http-headers-more-filter
+Homepage: https://github.com/agentzh/headers-more-nginx-module
+Version: v0.32
+Files-Excluded: .gitignore .gitattributes .travis.yml
+
+Module: http-ndk
+Homepage: https://github.com/simpl/ngx_devel_kit/
+Version: v0.3.0
+
+Module: http-auth-pam
+Homepage: https://github.com/stogh/ngx_http_auth_pam_module
+Version: v1.5.1
+
+Module: http-echo
+Homepage: https://github.com/agentzh/echo-nginx-module
+Version: v0.60
+Files-Excluded: .gitignore .gitattributes .travis.yml
+Patch: build-nginx-1.11.11.patch
+
+Module: http-lua
+Homepage: https://github.com/openresty/lua-nginx-module
+Version: v0.10.10
+Patch:
+  openssl-1.1.0.patch
+  discover-luajit-2.1.patch
+Files-Excluded: .gitignore .gitattributes .travis.yml .github
+
+Module: http-upstream-fair
+Homepage: https://github.com/gnosek/nginx-upstream-fair
+Version: a18b409
+Patch:
+  dynamic-module.patch
+  openssl-1.1.0.patch
+  drop-default-port.patch
+
+Module: nchan
+Homepage: https://github.com/slact/nchan
+Version: v1.0.8
+
+Module: http-uploadprogress
+Homepage: https://github.com/masterzen/nginx-upload-progress-module
+Files-Excluded: test
+Version: v0.9.2
+
+Module: http-cache-purge
+Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
+Version: 2.3
+Patch:
+  dynamic-module.patch
+  segfault-1.11.6.patch
+
+Module: http-dav-ext
+Homepage: https://github.com/arut/nginx-dav-ext-module
+Version: v0.0.3
+Patch: dynamic-module.patch
+
+Module: http-fancyindex
+Homepage: https://github.com/aperezdc/ngx-fancyindex
+Version: v0.4.1
+Files-Excluded: .gitignore .travis.yml
+
+Module: http-subs-filter
+Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
+Version: v0.6.4
+Patch: dynamic-module.patch
+
+Module: rtmp
+Homepage: https://github.com/arut/nginx-rtmp-module
+Files-Excluded: test
+Version: v1.1.11
+
diff --git a/debian/modules/uupdate b/debian/modules/uupdate
new file mode 100755
index 0000000..98a5f8b
--- /dev/null
+++ b/debian/modules/uupdate
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# debian/modules/uupdate - simple tar wrapper used by uscan to upgrade modules source
+
+MOD_TAR_NAME=$2
+MOD_TAR_VER=$4
+DESTDIR=debian/modules/$1
+
+tar --strip-components=1 -xf ../$MOD_TAR_NAME-$MOD_TAR_VER.tar.gz -C $DESTDIR
+echo $MOD_TAR_VER > /tmp/ngx_uupdate_version_$1
diff --git a/debian/modules/watch/http-auth-pam b/debian/modules/watch/http-auth-pam
new file mode 100644
index 0000000..eac2f73
--- /dev/null
+++ b/debian/modules/watch/http-auth-pam
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-http-auth-pam-$1.tar.gz%" \
+    https://github.com/stogh/ngx_http_auth_pam_module/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-auth-pam ngx-mod-http-auth-pam
diff --git a/debian/modules/watch/http-cache-purge b/debian/modules/watch/http-cache-purge
new file mode 100644
index 0000000..2566801
--- /dev/null
+++ b/debian/modules/watch/http-cache-purge
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-cache-purge-$1.tar.gz%" \
+    https://github.com/FRiCKLE/ngx_cache_purge/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-cache-purge ngx-mod-cache-purge
diff --git a/debian/modules/watch/http-dav-ext b/debian/modules/watch/http-dav-ext
new file mode 100644
index 0000000..d704cfc
--- /dev/null
+++ b/debian/modules/watch/http-dav-ext
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-dav-ext-$1.tar.gz%" \
+    https://github.com/arut/nginx-dav-ext-module/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-dav-ext ngx-mod-dav-ext
diff --git a/debian/modules/watch/http-echo b/debian/modules/watch/http-echo
new file mode 100644
index 0000000..615532b
--- /dev/null
+++ b/debian/modules/watch/http-echo
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-echo-$1.tar.gz%" \
+    https://github.com/agentzh/echo-nginx-module/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-echo ngx-mod-echo
diff --git a/debian/modules/watch/http-fancyindex b/debian/modules/watch/http-fancyindex
new file mode 100644
index 0000000..72435fd
--- /dev/null
+++ b/debian/modules/watch/http-fancyindex
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-fancyindex-$1.tar.gz%" \
+    https://github.com/aperezdc/ngx-fancyindex/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-fancyindex ngx-mod-fancyindex
diff --git a/debian/modules/watch/http-headers-more-filter b/debian/modules/watch/http-headers-more-filter
new file mode 100644
index 0000000..cfe5fc9
--- /dev/null
+++ b/debian/modules/watch/http-headers-more-filter
@@ -0,0 +1,4 @@
+version=4
+opts="uversionmangle=s/0.261/0.26.1/,dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-headers-more-$1.tar.gz%" \
+    https://github.com/agentzh/headers-more-nginx-module/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-headers-more-filter ngx-mod-headers-more
diff --git a/debian/modules/watch/http-lua b/debian/modules/watch/http-lua
new file mode 100644
index 0000000..7f1718f
--- /dev/null
+++ b/debian/modules/watch/http-lua
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%lua-nginx-module-$1.tar.gz%" \
+    https://github.com/openresty/lua-nginx-module/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-lua lua-nginx-module
diff --git a/debian/modules/watch/http-ndk b/debian/modules/watch/http-ndk
new file mode 100644
index 0000000..43f0cbd
--- /dev/null
+++ b/debian/modules/watch/http-ndk
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-devel-kit-$1.tar.gz%" \
+    https://github.com/simpl/ngx_devel_kit/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-ndk ngx-mod-devel-kit
diff --git a/debian/modules/watch/http-subs-filter b/debian/modules/watch/http-subs-filter
new file mode 100644
index 0000000..cca3e05
--- /dev/null
+++ b/debian/modules/watch/http-subs-filter
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-http-substitutions-filter-$1.tar.gz%" \
+    https://github.com/yaoweibin/ngx_http_substitutions_filter_module/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-subs-filter ngx-mod-http-substitutions-filter
diff --git a/debian/modules/watch/http-uploadprogress b/debian/modules/watch/http-uploadprogress
new file mode 100644
index 0000000..7c0b7cf
--- /dev/null
+++ b/debian/modules/watch/http-uploadprogress
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-upload-progress-$1.tar.gz%" \
+    https://github.com/masterzen/nginx-upload-progress-module/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-uploadprogress ngx-mod-upload-progress
diff --git a/debian/modules/watch/nchan b/debian/modules/watch/nchan
new file mode 100644
index 0000000..6b95884
--- /dev/null
+++ b/debian/modules/watch/nchan
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-nchan-$1.tar.gz%" \
+    https://github.com/slact/nchan/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate nchan ngx-mod-nchan
diff --git a/debian/modules/watch/rtmp b/debian/modules/watch/rtmp
new file mode 100644
index 0000000..f8137a2
--- /dev/null
+++ b/debian/modules/watch/rtmp
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-rtmp-$1.tar.gz%" \
+    https://github.com/arut/nginx-rtmp-module/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate rtmp ngx-mod-rtmp
diff --git a/debian/ngxmod b/debian/ngxmod
new file mode 100755
index 0000000..f8180d1
--- /dev/null
+++ b/debian/ngxmod
@@ -0,0 +1,156 @@
+#!/usr/bin/env python
+'''
+ngxmod - nginx modules management helper script
+
+Usage:
+  ngxmod <subcommand>
+
+Subcommands:
+
+  uscan - scan/watch upstream nginx module sources for new releases
+
+    It runs uscan for each nginx module listed in debian/modules/control.
+
+    If a new version is available, it will ask you if you want to upgrade.
+    If you agree it will use uscan to download the tarball, place it in the nginx
+    source's parent directory and unpack it using modules/uupdate to upgrade
+    the module's source.
+
+    After the upgrade, it will remove the files listed in the Files-Excluded
+    field and finally it will commit the changes.
+'''
+
+import deb822
+import os
+import sys
+import re
+from subprocess import call
+
+MODULES_PATH = 'modules/'
+MODULES_CTRL = os.path.join(MODULES_PATH, 'control')
+
+def prompt(query):
+    '''
+    Ask the given query and wait for an y/N answer.
+
+    :query: The query
+    :returns: The yes (True) or no (False) answer
+    '''
+    sys.stdout.write('%s [y/N]: ' % query)
+    choice = raw_input().lower()
+
+    return choice == 'y'
+
+
+def upgrade_module(mi, watchfile):
+    '''
+    Upgrade the given module using uscan and the custom modules/uupdate.
+    After the upgrade, remove the Files-Excluded.
+
+    :param mi: modules/control info for the module
+    :param watchfile: The watchfile of the module
+    :returns: The new module version
+    '''
+    uscan_upgrade_cmd = [
+        'uscan', '--upstream-version', mi['Version'],
+        '--watchfile', 'debian/%s' % watchfile, '--no-symlink'
+    ]
+    upgrade_ret = call(uscan_upgrade_cmd, stdout=open(os.devnull, 'w'))
+
+    if 'Files-Excluded' in mi and upgrade_ret == 0:
+        print 'Removing Files-Excluded: %s' % mi['Files-Excluded']
+
+        files = re.split('\s+', mi['Files-Excluded'])
+        files = filter(None, files)
+        abs_files = ['%s%s/%s' % (MODULES_PATH, mi['Module'], f) for f in files]
+
+        rm_cmd = ['rm', '-r']
+        rm_cmd.extend(abs_files)
+
+        call(rm_cmd)
+
+    return open('/tmp/ngx_uupdate_version_%s' % mi['Module']).read().rstrip()
+
+
+def update_module_version(mi, new_ver):
+    '''
+    Update the given module's version in modules/control.
+
+    :param mi: modules/control info for the module
+    :param new_ver: The new module version
+    '''
+    modules_info = deb822.Deb822.iter_paragraphs(file(MODULES_CTRL))
+    modules_ctrl_new = '%s%s' % (MODULES_CTRL, '.new')
+    with open(modules_ctrl_new, 'w') as c:
+        for m in modules_info:
+            if mi['Module'] == m['Module']:
+                m['Version'] = re.sub('[^v]+', new_ver, m['Version'])
+
+            c.write(m.dump() + '\n')
+    c.closed
+    os.rename(modules_ctrl_new, MODULES_CTRL)
+
+
+def commit_module(mi, new_ver):
+    '''
+    Git-commit the given module's upgraded source.
+
+    :param mi: modules/control info for the module
+    :param new_ver: The new module version
+    '''
+    module_name = mi['Module']
+    module_path = os.path.join(MODULES_PATH, module_name)
+
+    git_add_cmd = ['git', 'add', module_path, MODULES_CTRL]
+    call(git_add_cmd)
+
+    commit_msg = 'Update %s to v%s' % (module_name, new_ver)
+    git_commit_cmd = ['git', 'commit', '-m', commit_msg]
+    call(git_commit_cmd)
+
+
+def usage():
+    print("""
+Usage:
+    ngxmod <subcommand>
+
+Subcommands:
+
+    uscan - scan/watch upstream nginx module sources for new releases
+""")
+
+
+def main():
+    modules_info = deb822.Deb822.iter_paragraphs(file(MODULES_CTRL))
+
+    for mi in modules_info:
+        sys.stdout.write('Uscanning %s...' % mi['Module'])
+        sys.stdout.flush()
+
+        watchfile = os.path.join(MODULES_PATH, 'watch', mi['Module'])
+
+        if not os.path.isfile(watchfile):
+            print 'no watchfile available.'
+            continue
+
+        uscan_check_cmd = [
+            'uscan', '--upstream-version', mi['Version'],
+            '--watchfile', watchfile, '--package',
+            mi['Module']
+        ]
+        check_ret = call(uscan_check_cmd)
+
+        if check_ret == 0:
+            if prompt('Do you want to upgrade %s?' % mi['Module']):
+                new_module_ver = upgrade_module(mi, watchfile)
+                update_module_version(mi, new_module_ver)
+                commit_module(mi, new_module_ver)
+        else:
+            print 'up-to-date.'
+
+
+if __name__ == '__main__':
+	if len(sys.argv) == 2 and sys.argv[1] == 'uscan':
+		main()
+	else:
+		usage()

From 7f899937abcb400b8fc8e5d014ca16af9705eeab Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 11 Dec 2017 11:46:58 +0200
Subject: [PATCH 230/600] Bits & pieces for ngxmod

  o Drop d/m/uupdate in favor of ngxmod uupdate subcommand.
    While at it, take advantage of the canonical module
    names and drop the last argument.
  o Move unpacking & commit to uupdate subcommand, that
    way we don't to have to communicate the upstream version
    with ngxmod uscan.
  o Move around a few things, and switch to argparse.
---
 debian/modules/uupdate                        |  10 -
 debian/modules/watch/http-auth-pam            |   4 +-
 debian/modules/watch/http-cache-purge         |   4 +-
 debian/modules/watch/http-dav-ext             |   4 +-
 debian/modules/watch/http-echo                |   4 +-
 debian/modules/watch/http-fancyindex          |   4 +-
 debian/modules/watch/http-headers-more-filter |   4 +-
 debian/modules/watch/http-lua                 |   4 +-
 debian/modules/watch/http-ndk                 |   4 +-
 debian/modules/watch/http-subs-filter         |   4 +-
 debian/modules/watch/http-uploadprogress      |   4 +-
 debian/modules/watch/nchan                    |   4 +-
 debian/modules/watch/rtmp                     |   4 +-
 debian/ngxmod                                 | 278 +++++++++++-------
 14 files changed, 194 insertions(+), 142 deletions(-)
 delete mode 100755 debian/modules/uupdate

diff --git a/debian/modules/uupdate b/debian/modules/uupdate
deleted file mode 100755
index 98a5f8b..0000000
--- a/debian/modules/uupdate
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# debian/modules/uupdate - simple tar wrapper used by uscan to upgrade modules source
-
-MOD_TAR_NAME=$2
-MOD_TAR_VER=$4
-DESTDIR=debian/modules/$1
-
-tar --strip-components=1 -xf ../$MOD_TAR_NAME-$MOD_TAR_VER.tar.gz -C $DESTDIR
-echo $MOD_TAR_VER > /tmp/ngx_uupdate_version_$1
diff --git a/debian/modules/watch/http-auth-pam b/debian/modules/watch/http-auth-pam
index eac2f73..3fb5a27 100644
--- a/debian/modules/watch/http-auth-pam
+++ b/debian/modules/watch/http-auth-pam
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-http-auth-pam-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-auth-pam-$1.tar.gz%" \
     https://github.com/stogh/ngx_http_auth_pam_module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-auth-pam ngx-mod-http-auth-pam
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-auth-pam
diff --git a/debian/modules/watch/http-cache-purge b/debian/modules/watch/http-cache-purge
index 2566801..e2458f2 100644
--- a/debian/modules/watch/http-cache-purge
+++ b/debian/modules/watch/http-cache-purge
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-cache-purge-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-cache-purge-$1.tar.gz%" \
     https://github.com/FRiCKLE/ngx_cache_purge/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-cache-purge ngx-mod-cache-purge
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-cache-purge
diff --git a/debian/modules/watch/http-dav-ext b/debian/modules/watch/http-dav-ext
index d704cfc..064766a 100644
--- a/debian/modules/watch/http-dav-ext
+++ b/debian/modules/watch/http-dav-ext
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-dav-ext-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-dav-ext-$1.tar.gz%" \
     https://github.com/arut/nginx-dav-ext-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-dav-ext ngx-mod-dav-ext
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-dav-ext
diff --git a/debian/modules/watch/http-echo b/debian/modules/watch/http-echo
index 615532b..3d44f5d 100644
--- a/debian/modules/watch/http-echo
+++ b/debian/modules/watch/http-echo
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-echo-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-echo-$1.tar.gz%" \
     https://github.com/agentzh/echo-nginx-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-echo ngx-mod-echo
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-echo
diff --git a/debian/modules/watch/http-fancyindex b/debian/modules/watch/http-fancyindex
index 72435fd..5833ccd 100644
--- a/debian/modules/watch/http-fancyindex
+++ b/debian/modules/watch/http-fancyindex
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-fancyindex-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-fancyindex-$1.tar.gz%" \
     https://github.com/aperezdc/ngx-fancyindex/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-fancyindex ngx-mod-fancyindex
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-fancyindex
diff --git a/debian/modules/watch/http-headers-more-filter b/debian/modules/watch/http-headers-more-filter
index cfe5fc9..b0cae5c 100644
--- a/debian/modules/watch/http-headers-more-filter
+++ b/debian/modules/watch/http-headers-more-filter
@@ -1,4 +1,4 @@
 version=4
-opts="uversionmangle=s/0.261/0.26.1/,dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-headers-more-$1.tar.gz%" \
+opts="uversionmangle=s/0.261/0.26.1/,dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-headers-more-filter-$1.tar.gz%" \
     https://github.com/agentzh/headers-more-nginx-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-headers-more-filter ngx-mod-headers-more
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-headers-more-filter
diff --git a/debian/modules/watch/http-lua b/debian/modules/watch/http-lua
index 7f1718f..193d824 100644
--- a/debian/modules/watch/http-lua
+++ b/debian/modules/watch/http-lua
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%lua-nginx-module-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-lua-$1.tar.gz%" \
     https://github.com/openresty/lua-nginx-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-lua lua-nginx-module
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-lua
diff --git a/debian/modules/watch/http-ndk b/debian/modules/watch/http-ndk
index 43f0cbd..f359136 100644
--- a/debian/modules/watch/http-ndk
+++ b/debian/modules/watch/http-ndk
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-devel-kit-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-ndk-$1.tar.gz%" \
     https://github.com/simpl/ngx_devel_kit/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-ndk ngx-mod-devel-kit
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-ndk
diff --git a/debian/modules/watch/http-subs-filter b/debian/modules/watch/http-subs-filter
index cca3e05..2d37540 100644
--- a/debian/modules/watch/http-subs-filter
+++ b/debian/modules/watch/http-subs-filter
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-http-substitutions-filter-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-subs-filter-$1.tar.gz%" \
     https://github.com/yaoweibin/ngx_http_substitutions_filter_module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-subs-filter ngx-mod-http-substitutions-filter
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-subs-filter
diff --git a/debian/modules/watch/http-uploadprogress b/debian/modules/watch/http-uploadprogress
index 7c0b7cf..cccba98 100644
--- a/debian/modules/watch/http-uploadprogress
+++ b/debian/modules/watch/http-uploadprogress
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-upload-progress-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-uploadprogress-$1.tar.gz%" \
     https://github.com/masterzen/nginx-upload-progress-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate http-uploadprogress ngx-mod-upload-progress
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-uploadprogress
diff --git a/debian/modules/watch/nchan b/debian/modules/watch/nchan
index 6b95884..199ab19 100644
--- a/debian/modules/watch/nchan
+++ b/debian/modules/watch/nchan
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-nchan-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-nchan-$1.tar.gz%" \
     https://github.com/slact/nchan/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate nchan ngx-mod-nchan
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate nchan
diff --git a/debian/modules/watch/rtmp b/debian/modules/watch/rtmp
index f8137a2..2a95f4c 100644
--- a/debian/modules/watch/rtmp
+++ b/debian/modules/watch/rtmp
@@ -1,4 +1,4 @@
 version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ngx-mod-rtmp-$1.tar.gz%" \
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-rtmp-$1.tar.gz%" \
     https://github.com/arut/nginx-rtmp-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/modules/uupdate rtmp ngx-mod-rtmp
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate rtmp
diff --git a/debian/ngxmod b/debian/ngxmod
index f8180d1..7eacaa5 100755
--- a/debian/ngxmod
+++ b/debian/ngxmod
@@ -1,130 +1,156 @@
 #!/usr/bin/env python
-'''
-ngxmod - nginx modules management helper script
+"""
+Handy Debian nginx module management helper
+"""
 
-Usage:
-  ngxmod <subcommand>
-
-Subcommands:
-
-  uscan - scan/watch upstream nginx module sources for new releases
-
-    It runs uscan for each nginx module listed in debian/modules/control.
-
-    If a new version is available, it will ask you if you want to upgrade.
-    If you agree it will use uscan to download the tarball, place it in the nginx
-    source's parent directory and unpack it using modules/uupdate to upgrade
-    the module's source.
-
-    After the upgrade, it will remove the files listed in the Files-Excluded
-    field and finally it will commit the changes.
-'''
-
-import deb822
+import argparse
 import os
-import sys
 import re
+import shutil
+import sys
+import tarfile
+import tempfile
+
 from subprocess import call
 
-MODULES_PATH = 'modules/'
-MODULES_CTRL = os.path.join(MODULES_PATH, 'control')
+import deb822
+
+DEBIAN_PATH = os.path.dirname(os.path.realpath(__file__))
+MODULES_PATH = os.path.join(DEBIAN_PATH, 'modules')
+CTRL_PATH = os.path.join(MODULES_PATH, 'control')
+CTRL = [p for p in deb822.Deb822.iter_paragraphs(file(CTRL_PATH))]
+
+
+def ctrl(name):
+    "Return deb822 paragraph for the selected module"
+    global CTRL
+
+    for m in CTRL:
+        if m['Module'] == name:
+            return m
+
+
+def update_ctrl():
+    "Save current control to disk"
+    global CTRL
+
+    new_ctrl = CTRL_PATH + '.new'
+    with open(new_ctrl, 'w') as c:
+        for m in CTRL:
+            c.write(m.dump() + '\n')
+
+    os.rename(new_ctrl, CTRL_PATH)
+
 
 def prompt(query):
-    '''
+    """
     Ask the given query and wait for an y/N answer.
 
     :query: The query
     :returns: The yes (True) or no (False) answer
-    '''
+    """
     sys.stdout.write('%s [y/N]: ' % query)
     choice = raw_input().lower()
 
     return choice == 'y'
 
 
-def upgrade_module(mi, watchfile):
-    '''
-    Upgrade the given module using uscan and the custom modules/uupdate.
-    After the upgrade, remove the Files-Excluded.
-
-    :param mi: modules/control info for the module
-    :param watchfile: The watchfile of the module
-    :returns: The new module version
-    '''
-    uscan_upgrade_cmd = [
-        'uscan', '--upstream-version', mi['Version'],
-        '--watchfile', 'debian/%s' % watchfile, '--no-symlink'
-    ]
-    upgrade_ret = call(uscan_upgrade_cmd, stdout=open(os.devnull, 'w'))
-
-    if 'Files-Excluded' in mi and upgrade_ret == 0:
-        print 'Removing Files-Excluded: %s' % mi['Files-Excluded']
-
-        files = re.split('\s+', mi['Files-Excluded'])
-        files = filter(None, files)
-        abs_files = ['%s%s/%s' % (MODULES_PATH, mi['Module'], f) for f in files]
-
-        rm_cmd = ['rm', '-r']
-        rm_cmd.extend(abs_files)
-
-        call(rm_cmd)
-
-    return open('/tmp/ngx_uupdate_version_%s' % mi['Module']).read().rstrip()
-
-
-def update_module_version(mi, new_ver):
-    '''
-    Update the given module's version in modules/control.
-
-    :param mi: modules/control info for the module
-    :param new_ver: The new module version
-    '''
-    modules_info = deb822.Deb822.iter_paragraphs(file(MODULES_CTRL))
-    modules_ctrl_new = '%s%s' % (MODULES_CTRL, '.new')
-    with open(modules_ctrl_new, 'w') as c:
-        for m in modules_info:
-            if mi['Module'] == m['Module']:
-                m['Version'] = re.sub('[^v]+', new_ver, m['Version'])
-
-            c.write(m.dump() + '\n')
-    c.closed
-    os.rename(modules_ctrl_new, MODULES_CTRL)
-
-
-def commit_module(mi, new_ver):
-    '''
+def commit(module, version):
+    """
     Git-commit the given module's upgraded source.
 
-    :param mi: modules/control info for the module
-    :param new_ver: The new module version
-    '''
-    module_name = mi['Module']
-    module_path = os.path.join(MODULES_PATH, module_name)
+    :param module: module name
+    :param version: The updated module version
+    """
+    module_path = os.path.join(MODULES_PATH, module)
 
-    git_add_cmd = ['git', 'add', module_path, MODULES_CTRL]
+    git_add_cmd = ['git', 'add', '--all', module_path, CTRL_PATH]
     call(git_add_cmd)
 
-    commit_msg = 'Update %s to v%s' % (module_name, new_ver)
-    git_commit_cmd = ['git', 'commit', '-m', commit_msg]
+    commit_msg = '%s: Upgrade to v%s' % (module, version)
+    git_commit_cmd = [
+        'git', 'commit', '-m', commit_msg,
+        '--', module_path, CTRL_PATH]
     call(git_commit_cmd)
 
 
-def usage():
-    print("""
-Usage:
-    ngxmod <subcommand>
+def unpack(module, version, exclude):
+    "Unpack upstream tar file into module path"
 
-Subcommands:
+    tar_gz = os.path.join(
+        "..", "libnginx-mod-%s-%s.tar.gz" % (module, version))
+    if not os.path.exists(tar_gz):
+        print "%s doesn't exist!" % tar_gz
+        exit(1)
 
-    uscan - scan/watch upstream nginx module sources for new releases
-""")
+    module_path = os.path.join(MODULES_PATH, module)
+    tmpdir = tempfile.mkdtemp(prefix="libnginx-mod-%s-%s." % (module, version))
+    with tarfile.open(tar_gz) as tar:
+        members = tar.getmembers()
+
+        # stip top-level directory from tar
+        topdir = members[0]
+        if not topdir or not topdir.isdir():
+            print "No top directory found!"
+            exit(1)
+
+        topdir = members[0].path
+        if any(topdir not in ti.path for ti in members):
+            print "Not all files are under the top directory '%s'" % topdir
+            exit(1)
+
+        def remove_topdir_prefix(tarinfo):
+            "Strip top directory"
+            tarinfo.path = os.path.relpath(tarinfo.path, topdir)
+            return tarinfo
+        members = [remove_topdir_prefix(tarinfo) for tarinfo in members]
+        tar.extractall(path=tmpdir, members=members)
+
+    shutil.rmtree(module_path)
+    shutil.move(tmpdir, module_path)
+
+    for e in exclude:
+        print "Removing %s..." % e
+        abspath = os.path.join(module_path, e)
+        if os.path.isdir(abspath):
+            shutil.rmtree(abspath)
+        else:
+            os.remove(abspath)
 
 
-def main():
-    modules_info = deb822.Deb822.iter_paragraphs(file(MODULES_CTRL))
+def cmd_uupdate(args):
+    "Internal uupdate helper, upgrades & commits the given module"
+    c = ctrl(args.module)
 
-    for mi in modules_info:
-        sys.stdout.write('Uscanning %s...' % mi['Module'])
+    exclude = []
+    if 'Files-Excluded' in c:
+        exclude = c['Files-Excluded'].split()
+
+    unpack(args.module, args.upstream_version, exclude)
+
+    # change ctrl version
+    c['Version'] = re.sub('[^v]+', args.upstream_version, c['Version'])
+    update_ctrl()
+
+    commit(args.module, args.upstream_version)
+
+
+def cmd_uscan(args):
+    """
+    Run uscan for each nginx module listed in debian/modules/control.
+
+    If a new version is found, it will be downloaded & unpacked to the proper
+    debian/modules/MODULE path.
+
+    After the upgrade, all files listed in the Files-Excluded: control field
+    will be removed, debian/modules/control version will be updated and all
+    changes will be commited to git.
+    """
+    global CTRL
+
+    # For every module that has watchfile...
+    for mi in CTRL:
+        sys.stdout.write('Uscanning %s: ' % mi['Module'])
         sys.stdout.flush()
 
         watchfile = os.path.join(MODULES_PATH, 'watch', mi['Module'])
@@ -133,24 +159,60 @@ def main():
             print 'no watchfile available.'
             continue
 
+        # Check
         uscan_check_cmd = [
             'uscan', '--upstream-version', mi['Version'],
             '--watchfile', watchfile, '--package',
             mi['Module']
         ]
-        check_ret = call(uscan_check_cmd)
+        if call(uscan_check_cmd) != 0:
+            print 'up-to-date'
+            continue
 
-        if check_ret == 0:
-            if prompt('Do you want to upgrade %s?' % mi['Module']):
-                new_module_ver = upgrade_module(mi, watchfile)
-                update_module_version(mi, new_module_ver)
-                commit_module(mi, new_module_ver)
-        else:
-            print 'up-to-date.'
+        # Ask
+        if not prompt('Do you want to upgrade %s?' % mi['Module']):
+            continue
+
+        # Upgrade
+        uscan_upgrade_cmd = [
+            'uscan', '--upstream-version', mi['Version'],
+            '--watchfile', watchfile, '--no-symlink'
+        ]
+        if call(uscan_upgrade_cmd, stdout=open(os.devnull, 'w')) != 0:
+            print "Uscan for %s failed!" % mi['Module']
+            exit(1)
+
+
+def main():
+    """ngxmod main"""
+
+    parser = argparse.ArgumentParser(
+        description=__doc__)
+    cmds = parser.add_subparsers(title="Commands")
+
+    import textwrap
+    uscan_cmd = cmds.add_parser(
+        "uscan",
+        help="scan/watch upstream nginx module sources for new releases",
+        description=textwrap.dedent(cmd_uscan.__doc__),
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+    uscan_cmd.set_defaults(func=cmd_uscan)
+
+    uupdate_cmd = cmds.add_parser(
+        "uupdate",
+        help=cmd_uupdate.__doc__,
+        description=cmd_uupdate.__doc__)
+    uupdate_cmd.add_argument("module", metavar="MODULE", help="Module name")
+    uupdate_cmd.add_argument(
+        "--upstream-version",
+        required=True,
+        metavar="VERSION",
+        help="Upstream version")
+    uupdate_cmd.set_defaults(func=cmd_uupdate)
+
+    args = parser.parse_args()
+    args.func(args)
 
 
 if __name__ == '__main__':
-	if len(sys.argv) == 2 and sys.argv[1] == 'uscan':
-		main()
-	else:
-		usage()
+    main()

From 33799993fc8fbe4d3aca32b6518cc3a01d4729b7 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 13 Dec 2017 11:22:21 +0200
Subject: [PATCH 231/600] http-headers-more-filter: Upgrade to 0.33

---
 debian/modules/control                        |   2 +-
 .../http-headers-more-filter/README.markdown  |  40 ++++--
 .../src/ngx_http_headers_more_headers_in.c    |  63 +++++----
 .../http-headers-more-filter/t/builtin.t      |   1 -
 .../http-headers-more-filter/t/input-conn.t   |   1 -
 .../http-headers-more-filter/t/input-ua.t     |   1 -
 .../http-headers-more-filter/t/input.t        |  42 +++++-
 .../http-headers-more-filter/t/phase.t        |   1 -
 .../http-headers-more-filter/t/sanity.t       |   1 -
 .../http-headers-more-filter/t/subrequest.t   |   1 -
 .../http-headers-more-filter/t/unused.t       |   1 -
 .../modules/http-headers-more-filter/t/vars.t |   1 -
 .../valgrind.suppress                         | 126 ++++--------------
 13 files changed, 134 insertions(+), 147 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index 5f67e38..71c63eb 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -1,6 +1,6 @@
 Module: http-headers-more-filter
 Homepage: https://github.com/agentzh/headers-more-nginx-module
-Version: v0.32
+Version: v0.33
 Files-Excluded: .gitignore .gitattributes .travis.yml
 
 Module: http-ndk
diff --git a/debian/modules/http-headers-more-filter/README.markdown b/debian/modules/http-headers-more-filter/README.markdown
index d584461..452ef1f 100644
--- a/debian/modules/http-headers-more-filter/README.markdown
+++ b/debian/modules/http-headers-more-filter/README.markdown
@@ -36,7 +36,7 @@ Table of Contents
 Version
 =======
 
-This document describes headers-more-nginx-module [v0.32](https://github.com/openresty/headers-more-nginx-module/tags) released on 4 November 2016.
+This document describes headers-more-nginx-module [v0.33](https://github.com/openresty/headers-more-nginx-module/tags) released on 3 November 2017.
 
 Synopsis
 ========
@@ -248,7 +248,8 @@ or
 
 See [more_set_headers](#more_set_headers) for more details.
 
-Wildcard `*` can also be used to specify a header name pattern. For example, the following directive effectively clears *any* output headers starting by "`X-Hidden-`":
+The wildcard character, `*`, can also be used at the end of the header name to specify a pattern. For example, the following directive
+effectively clears *any* output headers starting by "`X-Hidden-`":
 
 ```nginx
 
@@ -298,25 +299,40 @@ In fact,
 
 ```nginx
 
-    more_clear_input_headers -s 404 -t 'text/plain' Foo Baz;
+    more_clear_input_headers -t 'text/plain' Foo Baz;
 ```
 
 is exactly equivalent to
 
 ```nginx
 
-    more_set_input_headers -s 404 -t 'text/plain' "Foo: " "Baz: ";
+    more_set_input_headers -t 'text/plain' "Foo: " "Baz: ";
 ```
 
 or
 
 ```nginx
 
-    more_set_input_headers -s 404 -t 'text/plain' Foo Baz
+    more_set_input_headers -t 'text/plain' Foo Baz
+```
+
+To remove request headers "Foo" and "Baz" for all incoming requests regardless of the content type, we can write
+
+```nginx
+
+    more_clear_input_headers "Foo" "Baz";
 ```
 
 See [more_set_input_headers](#more_set_input_headers) for more details.
 
+The wildcard character, `*`, can also be used at the end of the header name to specify a pattern. For example, the following directive
+effectively clears *any* input headers starting by "`X-Hidden-`":
+
+```nginx
+
+     more_clear_input_headers 'X-Hidden-*';
+```
+
 [Back to TOC](#table-of-contents)
 
 Limitations
@@ -331,13 +347,13 @@ Installation
 ============
 
 Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
-the version 1.11.2 (see [nginx compatibility](#compatibility)), and then build the source with this module:
+the version 1.13.6 (see [nginx compatibility](#compatibility)), and then build the source with this module:
 
 ```bash
 
- wget 'http://nginx.org/download/nginx-1.11.2.tar.gz'
- tar -xzvf nginx-1.11.2.tar.gz
- cd nginx-1.11.2/
+ wget 'http://nginx.org/download/nginx-1.13.6.tar.gz'
+ tar -xzvf nginx-1.13.6.tar.gz
+ cd nginx-1.13.6/
 
  # Here we assume you would install you nginx under /opt/nginx/.
  ./configure --prefix=/opt/nginx \
@@ -366,6 +382,8 @@ Compatibility
 
 The following versions of Nginx should work with this module:
 
+* **1.13.x**                      (last tested: 1.13.6)
+* **1.12.x**
 * **1.11.x**                      (last tested: 1.11.2)
 * **1.10.x**
 * **1.9.x**                       (last tested: 1.9.15)
@@ -479,7 +497,7 @@ You'll be very welcomed to submit patches to the [author](#author) or just ask f
 Authors
 =======
 
-* Yichun "agentzh" Zhang (章亦春) *&lt;agentzh@gmail.com&gt;*, CloudFlare Inc.
+* Yichun "agentzh" Zhang (章亦春) *&lt;agentzh@gmail.com&gt;*, OpenResty Inc.
 * Bernd Dorn ( <http://www.lovelysystems.com/> )
 
 This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
@@ -491,7 +509,7 @@ Copyright & License
 
 The code base is borrowed directly from the standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module in Nginx 0.8.24. This part of code is copyrighted by Igor Sysoev.
 
-Copyright (c) 2009-2014, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright (c) 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 Copyright (c) 2010-2013, Bernd Dorn.
 
diff --git a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c
index bdea8de..c3eb8f7 100644
--- a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c
+++ b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c
@@ -243,42 +243,59 @@ retry:
             i = 0;
         }
 
-        if (h[i].key.len == hv->key.len
+        if (!hv->wildcard
+            && h[i].key.len == hv->key.len
             && ngx_strncasecmp(h[i].key.data, hv->key.data,
                                h[i].key.len) == 0)
         {
-            if (value->len == 0 || (matched && matched != &h[i])) {
-                h[i].hash = 0;
+            goto matched;
+        }
 
-                rc = ngx_http_headers_more_rm_header_helper(
-                                            &r->headers_in.headers, part, i);
+        if (hv->wildcard
+            && value->len == 0
+            && h[i].key.len >= hv->key.len - 1
+            && ngx_strncasecmp(h[i].key.data, hv->key.data,
+                               hv->key.len - 1) == 0)
+        {
+            goto matched;
+        }
 
-                ngx_http_headers_more_assert(
-                    !(r->headers_in.headers.part.next == NULL
-                      && r->headers_in.headers.last
-                         != &r->headers_in.headers.part));
+        /* not matched */
+        continue;
 
-                if (rc == NGX_OK) {
-                    if (output_header) {
-                        *output_header = NULL;
-                    }
+matched:
 
-                    goto retry;
+        if (value->len == 0 || (matched && matched != &h[i])) {
+            h[i].hash = 0;
+
+            rc = ngx_http_headers_more_rm_header_helper(
+                                        &r->headers_in.headers, part, i);
+
+            ngx_http_headers_more_assert(
+                !(r->headers_in.headers.part.next == NULL
+                  && r->headers_in.headers.last
+                     != &r->headers_in.headers.part));
+
+            if (rc == NGX_OK) {
+                if (output_header) {
+                    *output_header = NULL;
                 }
 
-                return NGX_ERROR;
+                goto retry;
             }
 
-            h[i].value = *value;
+            return NGX_ERROR;
+        }
 
-            if (output_header) {
-                *output_header = &h[i];
-                dd("setting existing builtin input header");
-            }
+        h[i].value = *value;
 
-            if (matched == NULL) {
-                matched = &h[i];
-            }
+        if (output_header) {
+            *output_header = &h[i];
+            dd("setting existing builtin input header");
+        }
+
+        if (matched == NULL) {
+            matched = &h[i];
         }
     }
 
diff --git a/debian/modules/http-headers-more-filter/t/builtin.t b/debian/modules/http-headers-more-filter/t/builtin.t
index f2b5c34..27b20af 100644
--- a/debian/modules/http-headers-more-filter/t/builtin.t
+++ b/debian/modules/http-headers-more-filter/t/builtin.t
@@ -336,4 +336,3 @@ hello
 Vary: hello
 --- response_body
 hello
-
diff --git a/debian/modules/http-headers-more-filter/t/input-conn.t b/debian/modules/http-headers-more-filter/t/input-conn.t
index a32d4e1..f53e80f 100644
--- a/debian/modules/http-headers-more-filter/t/input-conn.t
+++ b/debian/modules/http-headers-more-filter/t/input-conn.t
@@ -135,4 +135,3 @@ content: conn type: 0
 connection: bad
 --- no_error_log
 [error]
-
diff --git a/debian/modules/http-headers-more-filter/t/input-ua.t b/debian/modules/http-headers-more-filter/t/input-ua.t
index 56d2222..da9a60d 100644
--- a/debian/modules/http-headers-more-filter/t/input-ua.t
+++ b/debian/modules/http-headers-more-filter/t/input-ua.t
@@ -626,4 +626,3 @@ content: konqueror: 1
 User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)
 --- no_error_log
 [error]
-
diff --git a/debian/modules/http-headers-more-filter/t/input.t b/debian/modules/http-headers-more-filter/t/input.t
index 0b8989f..01ae73f 100644
--- a/debian/modules/http-headers-more-filter/t/input.t
+++ b/debian/modules/http-headers-more-filter/t/input.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket; # 'no_plan';
 
 repeat_each(2);
 
-plan tests => repeat_each() * 124;
+plan tests => repeat_each() * 128;
 
 no_long_string();
 #no_diff;
@@ -1289,3 +1289,43 @@ X-Forwarded-For: 8.8.8.8
 Foo: 127.0.0.1
 --- no_error_log
 [error]
+
+
+
+=== TEST 50: clear input headers with wildcard
+--- config
+    location /hello {
+        more_clear_input_headers 'X-Hidden-*';
+        content_by_lua '
+            ngx.say("X-Hidden-One: ", ngx.var.http_x_hidden_one)
+            ngx.say("X-Hidden-Two: ", ngx.var.http_x_hidden_two)
+        ';
+    }
+--- request
+    GET /hello
+--- more_headers
+X-Hidden-One: i am hidden
+X-Hidden-Two: me 2
+--- response_body
+X-Hidden-One: nil
+X-Hidden-Two: nil
+
+
+
+=== TEST 51: make sure wildcard doesn't affect more_set_input_headers
+--- config
+    location /hello {
+        more_set_input_headers 'X-Hidden-*: lol';
+        content_by_lua '
+            ngx.say("X-Hidden-One: ", ngx.var.http_x_hidden_one)
+            ngx.say("X-Hidden-Two: ", ngx.var.http_x_hidden_two)
+        ';
+    }
+--- request
+    GET /hello
+--- more_headers
+X-Hidden-One: i am hidden
+X-Hidden-Two: me 2
+--- response_body
+X-Hidden-One: i am hidden
+X-Hidden-Two: me 2
diff --git a/debian/modules/http-headers-more-filter/t/phase.t b/debian/modules/http-headers-more-filter/t/phase.t
index 343d2e5..11183db 100644
--- a/debian/modules/http-headers-more-filter/t/phase.t
+++ b/debian/modules/http-headers-more-filter/t/phase.t
@@ -23,4 +23,3 @@ __DATA__
 X-Foo: Blah
 --- response_body_like: 403 Forbidden
 --- error_code: 403
-
diff --git a/debian/modules/http-headers-more-filter/t/sanity.t b/debian/modules/http-headers-more-filter/t/sanity.t
index e316cac..d06f5dc 100644
--- a/debian/modules/http-headers-more-filter/t/sanity.t
+++ b/debian/modules/http-headers-more-filter/t/sanity.t
@@ -565,4 +565,3 @@ hi
 --- response_body
 ok
 --- http09
-
diff --git a/debian/modules/http-headers-more-filter/t/subrequest.t b/debian/modules/http-headers-more-filter/t/subrequest.t
index 34e84c9..9443eca 100644
--- a/debian/modules/http-headers-more-filter/t/subrequest.t
+++ b/debian/modules/http-headers-more-filter/t/subrequest.t
@@ -66,4 +66,3 @@ main: dog
 --- response_headers
 ! Host
 --- skip_nginx: 3: < 0.7.46
-
diff --git a/debian/modules/http-headers-more-filter/t/unused.t b/debian/modules/http-headers-more-filter/t/unused.t
index 1f35adc..c51f91c 100644
--- a/debian/modules/http-headers-more-filter/t/unused.t
+++ b/debian/modules/http-headers-more-filter/t/unused.t
@@ -172,4 +172,3 @@ bar
 headers more header handler
 [error]
 --- log_level: debug
-
diff --git a/debian/modules/http-headers-more-filter/t/vars.t b/debian/modules/http-headers-more-filter/t/vars.t
index 426c68c..04c75c3 100644
--- a/debian/modules/http-headers-more-filter/t/vars.t
+++ b/debian/modules/http-headers-more-filter/t/vars.t
@@ -56,4 +56,3 @@ hi
 dog
 --- response_headers
 Host:
-
diff --git a/debian/modules/http-headers-more-filter/valgrind.suppress b/debian/modules/http-headers-more-filter/valgrind.suppress
index bba7217..d51de70 100644
--- a/debian/modules/http-headers-more-filter/valgrind.suppress
+++ b/debian/modules/http-headers-more-filter/valgrind.suppress
@@ -1,40 +1,9 @@
-{
-<insert_a_suppression_name_here>
-Memcheck:Cond
-fun:lj_str_new
-}
 {
    <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:lj_str_new
-   fun:lua_pushlstring
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:lj_str_new
-   fun:lua_pushlstring
-}
-{
-<insert_a_suppression_name_here>
-Memcheck:Leak
-fun:malloc
-fun:ngx_alloc
-obj:*
-}
-{
-<insert_a_suppression_name_here>
-Memcheck:Leak
-fun:malloc
-fun:ngx_alloc
-}
-{
-<insert_a_suppression_name_here>
-Memcheck:Leak
-fun:malloc
-fun:ngx_alloc
-fun:ngx_palloc_large
-fun:ngx_palloc
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   obj:*
 }
 {
    <insert_a_suppression_name_here>
@@ -44,27 +13,6 @@ fun:ngx_palloc
    fun:ngx_calloc
    fun:ngx_event_process_init
 }
-{
-<insert_a_suppression_name_here>
-Memcheck:Addr4
-fun:lj_str_new
-fun:lua_pushlstring
-fun:ngx_http_lua_get_output_header
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:lj_str_new
-   fun:lua_getfield
-   fun:ngx_http_lua_cache_load_code
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:lj_str_new
-   fun:lua_setfield
-   fun:ngx_http_lua_cache_store_code
-}
 {
    <insert_a_suppression_name_here>
    Memcheck:Leak
@@ -72,34 +20,12 @@ fun:ngx_http_lua_get_output_header
    fun:ngx_alloc
    fun:ngx_event_process_init
 }
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:(below main)
-}
 {
    <insert_a_suppression_name_here>
    Memcheck:Param
    epoll_ctl(event)
    fun:epoll_ctl
 }
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_create_pool
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc_large
-}
 {
    <insert_a_suppression_name_here>
    Memcheck:Cond
@@ -108,22 +34,6 @@ fun:ngx_http_lua_get_output_header
    fun:ngx_log_error_core
    fun:ngx_http_charset_header_filter
 }
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_pnalloc
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_malloc
-   fun:ngx_palloc
-}
 {
    nginx-core-process-init
    Memcheck:Leak
@@ -185,15 +95,6 @@ fun:ngx_http_lua_get_output_header
    fun:ngx_epoll_process_events
    fun:ngx_process_events_and_timers
 }
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:memalign
-   fun:posix_memalign
-   fun:ngx_memalign
-   fun:ngx_palloc_block
-   fun:ngx_palloc
-}
 {
    <insert_a_suppression_name_here>
    Memcheck:Addr8
@@ -213,3 +114,22 @@ fun:ngx_http_lua_get_output_header
    fun:do_preload
    fun:dl_main
 }
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+}

From 8acbe3fbc400848abfa345e8db5ffe1bebc9c0bb Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 13 Dec 2017 11:22:39 +0200
Subject: [PATCH 232/600] http-echo: Upgrade to 0.61

Drop build-nginx-1.11.11 patch now included upstream
---
 debian/modules/control                        |   3 +-
 debian/modules/http-echo/README.markdown      |  24 +-
 .../http-echo/src/ngx_http_echo_module.c      |  13 ++
 .../http-echo/src/ngx_http_echo_module.h      |   4 +
 .../src/ngx_http_echo_request_info.c          |  62 +++++
 .../src/ngx_http_echo_request_info.h          |   3 +
 debian/modules/http-echo/valgrind.suppress    |  10 +
 .../http-echo/build-nginx-1.11.11.patch       | 212 ------------------
 debian/modules/patches/http-echo/series       |   1 -
 9 files changed, 107 insertions(+), 225 deletions(-)
 delete mode 100644 debian/modules/patches/http-echo/build-nginx-1.11.11.patch
 delete mode 100644 debian/modules/patches/http-echo/series

diff --git a/debian/modules/control b/debian/modules/control
index 71c63eb..b779595 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -13,9 +13,8 @@ Version: v1.5.1
 
 Module: http-echo
 Homepage: https://github.com/agentzh/echo-nginx-module
-Version: v0.60
+Version: v0.61
 Files-Excluded: .gitignore .gitattributes .travis.yml
-Patch: build-nginx-1.11.11.patch
 
 Module: http-lua
 Homepage: https://github.com/openresty/lua-nginx-module
diff --git a/debian/modules/http-echo/README.markdown b/debian/modules/http-echo/README.markdown
index 9de2c0b..71ac080 100644
--- a/debian/modules/http-echo/README.markdown
+++ b/debian/modules/http-echo/README.markdown
@@ -68,7 +68,7 @@ This module is production ready.
 Version
 =======
 
-This document describes ngx_echo [v0.59](https://github.com/openresty/echo-nginx-module/tags) released on 15 May 2016.
+This document describes ngx_echo [v0.61](https://github.com/openresty/echo-nginx-module/tags) released on 8 August 2017.
 
 Synopsis
 ========
@@ -284,9 +284,9 @@ People will also find it useful in real-world applications that need to
 
 This is a special dual-role module that can *lazily* serve as a content handler or register itself as an output filter only upon demand. By default, this module does not do anything at all.
 
-Technially, this module has also demonstrated the following techniques that might be helpful for module writers:
+Technically, this module has also demonstrated the following techniques that might be helpful for module writers:
 
-1. Issue parallel subreqeusts directly from content handler.
+1. Issue parallel subrequests directly from content handler.
 1. Issue chained subrequests directly from content handler, by passing continuation along the subrequest chain.
 1. Issue subrequests with all HTTP 1.1 methods and even an optional faked HTTP request body.
 1. Interact with the Nginx event model directly from content handler using custom events and timers, and resume the content handler back if necessary.
@@ -395,7 +395,7 @@ The output on the client side looks like this
  world
 ```
 
-Special characters like newlines (`\n`) and tabs (`\t`) can be escaped using C-style escaping sequences. But a notable exception is the dollar sign (`$`). As of Nginx 0.8.20, there's still no clean way to esacpe this characters. (A work-around might be to use a `$echo_dollor` variable that is always evaluated to the constant `$` character. This feature will possibly be introduced in a future version of this module.)
+Special characters like newlines (`\n`) and tabs (`\t`) can be escaped using C-style escaping sequences. But a notable exception is the dollar sign (`$`). As of Nginx 0.8.20, there's still no clean way to escape this character. (A work-around might be to use a `$echo_dollor` variable that is always evaluated to the constant `$` character. This feature will possibly be introduced in a future version of this module.)
 
 As of the echo [v0.28](#v028) release, one can suppress the trailing newline character in the output by using the `-n` option, as in
 
@@ -1493,6 +1493,8 @@ Accessing `/echoback` yields
 
 Behind the scene, it recovers `r->main->header_in` (or the large header buffers, if any) on the C level and does not construct the headers itself by traversing parsed results in the request object.
 
+This varible is always evaluated to an empty value in HTTP/2 requests for now due to the current implementation.
+
 This variable was first introduced in [version 0.15](#v015).
 
 [Back to TOC](#table-of-contents)
@@ -1569,13 +1571,13 @@ You're recommended to install this module (as well as the Nginx core and many ot
 Alternatively, you can install this module manually with the Nginx source:
 
 Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
-the version 1.9.15 (see [nginx compatibility](#compatibility)), and then build the source with this module:
+the version 1.11.2 (see [nginx compatibility](#compatibility)), and then build the source with this module:
 
 ```bash
 
- $ wget 'http://nginx.org/download/nginx-1.9.15.tar.gz'
- $ tar -xzvf nginx-1.9.15.tar.gz
- $ cd nginx-1.9.15/
+ $ wget 'http://nginx.org/download/nginx-1.11.2.tar.gz'
+ $ tar -xzvf nginx-1.11.2.tar.gz
+ $ cd nginx-1.11.2/
 
  # Here we assume you would install you nginx under /opt/nginx/.
  $ ./configure --prefix=/opt/nginx \
@@ -1604,6 +1606,8 @@ Compatibility
 
 The following versions of Nginx should work with this module:
 
+* **1.11.x**                      (last tested: 1.11.2)
+* **1.10.x**
 * **1.9.x**                       (last tested: 1.9.15)
 * **1.8.x**
 * **1.7.x**                       (last tested: 1.7.10)
@@ -1796,7 +1800,7 @@ You'll be very welcomed to submit patches to the [author](#author) or just ask f
 Author
 ======
 
-Yichun "agentzh" Zhang (章亦春) *&lt;agentzh@gmail.com&gt;*, CloudFlare Inc.
+Yichun "agentzh" Zhang (章亦春) *&lt;agentzh@gmail.com&gt;*, OpenResty Inc.
 
 This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
 
@@ -1805,7 +1809,7 @@ This wiki page is also maintained by the author himself, and everybody is encour
 Copyright & License
 ===================
 
-Copyright (c) 2009-2016, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright (c) 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 This module is licensed under the terms of the BSD license.
 
diff --git a/debian/modules/http-echo/src/ngx_http_echo_module.c b/debian/modules/http-echo/src/ngx_http_echo_module.c
index ae70479..8d736d7 100644
--- a/debian/modules/http-echo/src/ngx_http_echo_module.c
+++ b/debian/modules/http-echo/src/ngx_http_echo_module.c
@@ -632,6 +632,9 @@ ngx_http_echo_echo_exec(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 static void *
 ngx_http_echo_create_main_conf(ngx_conf_t *cf)
 {
+#if nginx_version >= 1011011
+    ngx_pool_cleanup_t           *cln;
+#endif
     ngx_http_echo_main_conf_t    *emcf;
 
     emcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_echo_main_conf_t));
@@ -643,6 +646,16 @@ ngx_http_echo_create_main_conf(ngx_conf_t *cf)
      *      hmcf->requires_filter = 0;
      */
 
+#if nginx_version >= 1011011
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NULL;
+    }
+
+    cln->data = emcf;
+    cln->handler = ngx_http_echo_request_headers_cleanup;
+#endif
+
     return emcf;
 }
 
diff --git a/debian/modules/http-echo/src/ngx_http_echo_module.h b/debian/modules/http-echo/src/ngx_http_echo_module.h
index 2d212c3..ce0a305 100644
--- a/debian/modules/http-echo/src/ngx_http_echo_module.h
+++ b/debian/modules/http-echo/src/ngx_http_echo_module.h
@@ -92,6 +92,10 @@ typedef struct {
 
 typedef struct {
     ngx_int_t       requires_filter;
+#if nginx_version >= 1011011
+    ngx_buf_t     **busy_buf_ptrs;
+    ngx_int_t       busy_buf_ptr_count;
+#endif
 } ngx_http_echo_main_conf_t;
 
 
diff --git a/debian/modules/http-echo/src/ngx_http_echo_request_info.c b/debian/modules/http-echo/src/ngx_http_echo_request_info.c
index d28ec4d..7dd3683 100644
--- a/debian/modules/http-echo/src/ngx_http_echo_request_info.c
+++ b/debian/modules/http-echo/src/ngx_http_echo_request_info.c
@@ -17,6 +17,9 @@
 
 
 static void ngx_http_echo_post_read_request_body(ngx_http_request_t *r);
+#if nginx_version >= 1011011
+void ngx_http_echo_request_headers_cleanup(void *data);
+#endif
 
 
 ngx_int_t
@@ -179,6 +182,11 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
     ngx_int_t                    i, j;
     ngx_buf_t                   *b, *first = NULL;
     unsigned                     found;
+#if nginx_version >= 1011011
+    ngx_buf_t                  **bb;
+    ngx_chain_t                 *cl;
+    ngx_http_echo_main_conf_t   *emcf;
+#endif
     ngx_connection_t            *c;
     ngx_http_request_t          *mr;
     ngx_http_connection_t       *hc;
@@ -195,6 +203,10 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
     }
 #endif
 
+#if nginx_version >= 1011011
+    emcf = ngx_http_get_module_main_conf(r, ngx_http_echo_module);
+#endif
+
     size = 0;
     b = c->buffer;
 
@@ -215,8 +227,35 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
 
     if (hc->nbusy) {
         b = NULL;
+
+#if nginx_version >= 1011011
+        if (hc->nbusy > emcf->busy_buf_ptr_count) {
+            if (emcf->busy_buf_ptrs) {
+                ngx_free(emcf->busy_buf_ptrs);
+            }
+
+            emcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
+                                            r->connection->log);
+
+            if (emcf->busy_buf_ptrs == NULL) {
+                return NGX_ERROR;
+            }
+
+            emcf->busy_buf_ptr_count = hc->nbusy;
+        }
+
+        bb = emcf->busy_buf_ptrs;
+        for (cl = hc->busy; cl; cl = cl->next) {
+            *bb++ = cl->buf;
+        }
+
+        bb = emcf->busy_buf_ptrs;
+        for (i = hc->nbusy; i > 0; i--) {
+            b = bb[i - 1];
+#else
         for (i = 0; i < hc->nbusy; i++) {
             b = hc->busy[i];
+#endif
 
             if (first == NULL) {
                 if (mr->request_line.data >= b->pos
@@ -280,8 +319,15 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
     }
 
     if (hc->nbusy) {
+
+#if nginx_version >= 1011011
+        bb = emcf->busy_buf_ptrs;
+        for (i = hc->nbusy; i > 0; i--) {
+            b = bb[i - 1];
+#else
         for (i = 0; i < hc->nbusy; i++) {
             b = hc->busy[i];
+#endif
 
             if (!found) {
                 if (b != first) {
@@ -457,4 +503,20 @@ ngx_http_echo_response_status_variable(ngx_http_request_t *r,
     return NGX_OK;
 }
 
+
+#if nginx_version >= 1011011
+void
+ngx_http_echo_request_headers_cleanup(void *data)
+{
+    ngx_http_echo_main_conf_t  *emcf;
+
+    emcf = (ngx_http_echo_main_conf_t *) data;
+
+    if (emcf->busy_buf_ptrs) {
+        ngx_free(emcf->busy_buf_ptrs);
+        emcf->busy_buf_ptrs = NULL;
+    }
+}
+#endif
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-echo/src/ngx_http_echo_request_info.h b/debian/modules/http-echo/src/ngx_http_echo_request_info.h
index 3b3713b..aa5730b 100644
--- a/debian/modules/http-echo/src/ngx_http_echo_request_info.h
+++ b/debian/modules/http-echo/src/ngx_http_echo_request_info.h
@@ -29,5 +29,8 @@ ngx_int_t ngx_http_echo_request_uri_variable(ngx_http_request_t *r,
 ngx_int_t ngx_http_echo_response_status_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 
+#if nginx_version >= 1011011
+void ngx_http_echo_request_headers_cleanup(void *data);
+#endif
 
 #endif /* ECHO_REQUEST_INFO_H */
diff --git a/debian/modules/http-echo/valgrind.suppress b/debian/modules/http-echo/valgrind.suppress
index 0f8e871..d4bfe63 100644
--- a/debian/modules/http-echo/valgrind.suppress
+++ b/debian/modules/http-echo/valgrind.suppress
@@ -36,3 +36,13 @@
    fun:do_preload
    fun:dl_main
 }
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+   fun:main
+}
diff --git a/debian/modules/patches/http-echo/build-nginx-1.11.11.patch b/debian/modules/patches/http-echo/build-nginx-1.11.11.patch
deleted file mode 100644
index dbb9ce7..0000000
--- a/debian/modules/patches/http-echo/build-nginx-1.11.11.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 7740e11558b530b66b469c657576f5280b7cdb1b Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Wed, 22 Mar 2017 08:43:30 +0300
-Subject: [PATCH] feature: nginx 1.11.11+ can now build with this module.
-
-Note: nginx 1.11.11+ are still not an officially supported target yet.
-More work needed.
-
-Closes openresty/echo-nginx-module#64
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
-
-Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
----
- src/ngx_http_echo_module.c       | 13 +++++++++
- src/ngx_http_echo_module.h       |  4 +++
- src/ngx_http_echo_request_info.c | 62 ++++++++++++++++++++++++++++++++++++++++
- src/ngx_http_echo_request_info.h |  3 ++
- valgrind.suppress                | 10 +++++++
- 5 files changed, 92 insertions(+)
-
-diff --git a/src/ngx_http_echo_module.c b/src/ngx_http_echo_module.c
-index ae70479..8d736d7 100644
---- a/src/ngx_http_echo_module.c
-+++ b/src/ngx_http_echo_module.c
-@@ -632,6 +632,9 @@ ngx_http_echo_echo_exec(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
- static void *
- ngx_http_echo_create_main_conf(ngx_conf_t *cf)
- {
-+#if nginx_version >= 1011011
-+    ngx_pool_cleanup_t           *cln;
-+#endif
-     ngx_http_echo_main_conf_t    *emcf;
- 
-     emcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_echo_main_conf_t));
-@@ -643,6 +646,16 @@ ngx_http_echo_create_main_conf(ngx_conf_t *cf)
-      *      hmcf->requires_filter = 0;
-      */
- 
-+#if nginx_version >= 1011011
-+    cln = ngx_pool_cleanup_add(cf->pool, 0);
-+    if (cln == NULL) {
-+        return NULL;
-+    }
-+
-+    cln->data = emcf;
-+    cln->handler = ngx_http_echo_request_headers_cleanup;
-+#endif
-+
-     return emcf;
- }
- 
-diff --git a/src/ngx_http_echo_module.h b/src/ngx_http_echo_module.h
-index 2d212c3..ce0a305 100644
---- a/src/ngx_http_echo_module.h
-+++ b/src/ngx_http_echo_module.h
-@@ -92,6 +92,10 @@ typedef struct {
- 
- typedef struct {
-     ngx_int_t       requires_filter;
-+#if nginx_version >= 1011011
-+    ngx_buf_t     **busy_buf_ptrs;
-+    ngx_int_t       busy_buf_ptr_count;
-+#endif
- } ngx_http_echo_main_conf_t;
- 
- 
-diff --git a/src/ngx_http_echo_request_info.c b/src/ngx_http_echo_request_info.c
-index d28ec4d..7dd3683 100644
---- a/src/ngx_http_echo_request_info.c
-+++ b/src/ngx_http_echo_request_info.c
-@@ -17,6 +17,9 @@
- 
- 
- static void ngx_http_echo_post_read_request_body(ngx_http_request_t *r);
-+#if nginx_version >= 1011011
-+void ngx_http_echo_request_headers_cleanup(void *data);
-+#endif
- 
- 
- ngx_int_t
-@@ -179,6 +182,11 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-     ngx_int_t                    i, j;
-     ngx_buf_t                   *b, *first = NULL;
-     unsigned                     found;
-+#if nginx_version >= 1011011
-+    ngx_buf_t                  **bb;
-+    ngx_chain_t                 *cl;
-+    ngx_http_echo_main_conf_t   *emcf;
-+#endif
-     ngx_connection_t            *c;
-     ngx_http_request_t          *mr;
-     ngx_http_connection_t       *hc;
-@@ -195,6 +203,10 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-     }
- #endif
- 
-+#if nginx_version >= 1011011
-+    emcf = ngx_http_get_module_main_conf(r, ngx_http_echo_module);
-+#endif
-+
-     size = 0;
-     b = c->buffer;
- 
-@@ -215,8 +227,35 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
- 
-     if (hc->nbusy) {
-         b = NULL;
-+
-+#if nginx_version >= 1011011
-+        if (hc->nbusy > emcf->busy_buf_ptr_count) {
-+            if (emcf->busy_buf_ptrs) {
-+                ngx_free(emcf->busy_buf_ptrs);
-+            }
-+
-+            emcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
-+                                            r->connection->log);
-+
-+            if (emcf->busy_buf_ptrs == NULL) {
-+                return NGX_ERROR;
-+            }
-+
-+            emcf->busy_buf_ptr_count = hc->nbusy;
-+        }
-+
-+        bb = emcf->busy_buf_ptrs;
-+        for (cl = hc->busy; cl; cl = cl->next) {
-+            *bb++ = cl->buf;
-+        }
-+
-+        bb = emcf->busy_buf_ptrs;
-+        for (i = hc->nbusy; i > 0; i--) {
-+            b = bb[i - 1];
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             if (first == NULL) {
-                 if (mr->request_line.data >= b->pos
-@@ -280,8 +319,15 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-     }
- 
-     if (hc->nbusy) {
-+
-+#if nginx_version >= 1011011
-+        bb = emcf->busy_buf_ptrs;
-+        for (i = hc->nbusy; i > 0; i--) {
-+            b = bb[i - 1];
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             if (!found) {
-                 if (b != first) {
-@@ -457,4 +503,20 @@ ngx_http_echo_response_status_variable(ngx_http_request_t *r,
-     return NGX_OK;
- }
- 
-+
-+#if nginx_version >= 1011011
-+void
-+ngx_http_echo_request_headers_cleanup(void *data)
-+{
-+    ngx_http_echo_main_conf_t  *emcf;
-+
-+    emcf = (ngx_http_echo_main_conf_t *) data;
-+
-+    if (emcf->busy_buf_ptrs) {
-+        ngx_free(emcf->busy_buf_ptrs);
-+        emcf->busy_buf_ptrs = NULL;
-+    }
-+}
-+#endif
-+
- /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
-diff --git a/src/ngx_http_echo_request_info.h b/src/ngx_http_echo_request_info.h
-index 3b3713b..aa5730b 100644
---- a/src/ngx_http_echo_request_info.h
-+++ b/src/ngx_http_echo_request_info.h
-@@ -29,5 +29,8 @@ ngx_int_t ngx_http_echo_request_uri_variable(ngx_http_request_t *r,
- ngx_int_t ngx_http_echo_response_status_variable(ngx_http_request_t *r,
-     ngx_http_variable_value_t *v, uintptr_t data);
- 
-+#if nginx_version >= 1011011
-+void ngx_http_echo_request_headers_cleanup(void *data);
-+#endif
- 
- #endif /* ECHO_REQUEST_INFO_H */
-diff --git a/valgrind.suppress b/valgrind.suppress
-index 0f8e871..d4bfe63 100644
---- a/valgrind.suppress
-+++ b/valgrind.suppress
-@@ -36,3 +36,13 @@
-    fun:do_preload
-    fun:dl_main
- }
-+{
-+   <insert_a_suppression_name_here>
-+   Memcheck:Leak
-+   match-leak-kinds: definite
-+   fun:malloc
-+   fun:ngx_alloc
-+   fun:ngx_set_environment
-+   fun:ngx_single_process_cycle
-+   fun:main
-+}
--- 
-2.11.0
-
diff --git a/debian/modules/patches/http-echo/series b/debian/modules/patches/http-echo/series
deleted file mode 100644
index 7e5c302..0000000
--- a/debian/modules/patches/http-echo/series
+++ /dev/null
@@ -1 +0,0 @@
-build-nginx-1.11.11.patch

From 5fb0700fb278a7a8217233755c6e688ffc8e5e94 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 13 Dec 2017 11:22:50 +0200
Subject: [PATCH 233/600] http-lua: Upgrade to 0.10.11

Rebase openssl-1.1.0 patch
---
 debian/modules/control                        |   2 +-
 debian/modules/http-lua/README.markdown       | 182 +++++++++++++++++-
 .../modules/http-lua/doc/HttpLuaModule.wiki   | 162 +++++++++++++++-
 .../http-lua/src/api/ngx_http_lua_api.h       |   2 +-
 .../http-lua/src/ngx_http_lua_accessby.c      |  10 +-
 .../http-lua/src/ngx_http_lua_directive.c     |   2 +-
 .../http-lua/src/ngx_http_lua_output.c        |   7 +-
 .../http-lua/src/ngx_http_lua_req_body.c      |   6 +-
 .../http-lua/src/ngx_http_lua_rewriteby.c     |  10 +-
 .../http-lua/src/ngx_http_lua_semaphore.c     |   6 +-
 .../http-lua/src/ngx_http_lua_shdict.c        | 167 ++++++++++++++++
 .../modules/http-lua/src/ngx_http_lua_sleep.c |   6 +-
 .../http-lua/src/ngx_http_lua_socket_tcp.c    |  25 ++-
 .../http-lua/src/ngx_http_lua_socket_udp.c    |   6 +-
 .../http-lua/src/ngx_http_lua_ssl_certby.c    |   5 +-
 .../src/ngx_http_lua_ssl_session_fetchby.c    |   5 +-
 .../src/ngx_http_lua_ssl_session_storeby.c    |   3 +-
 .../http-lua/src/ngx_http_lua_subrequest.c    |   6 +-
 .../modules/http-lua/src/ngx_http_lua_util.c  |  10 +-
 .../modules/http-lua/src/ngx_http_lua_util.h  |   2 +-
 debian/modules/http-lua/t/000--init.t         |  73 ++++---
 debian/modules/http-lua/t/002-content.t       |   8 +-
 debian/modules/http-lua/t/004-require.t       |   1 +
 debian/modules/http-lua/t/017-exec.t          |  24 ++-
 debian/modules/http-lua/t/023-rewrite/exec.t  |  24 ++-
 .../t/023-rewrite/tcp-socket-timeout.t        |  44 ++---
 debian/modules/http-lua/t/024-access/exec.t   |  24 ++-
 debian/modules/http-lua/t/035-gmatch.t        |   1 +
 debian/modules/http-lua/t/058-tcp-socket.t    |  39 +++-
 .../http-lua/t/065-tcp-socket-timeout.t       |  68 ++++---
 .../modules/http-lua/t/097-uthread-rewrite.t  |   1 +
 debian/modules/http-lua/t/106-timer.t         |   6 +-
 debian/modules/http-lua/t/129-ssl-socket.t    |   6 +-
 debian/modules/http-lua/t/139-ssl-cert-by.t   |   8 +-
 .../http-lua/t/142-ssl-session-store.t        |   7 +-
 .../http-lua/t/143-ssl-session-fetch.t        |  19 +-
 .../http-lua/t/147-tcp-socket-timeouts.t      |  93 +++++++++
 debian/modules/http-lua/t/154-semaphore.t     |   2 +
 debian/modules/http-lua/util/build.sh         |   4 +
 debian/modules/http-lua/valgrind.suppress     |  68 +++++--
 .../patches/http-lua/openssl-1.1.0.patch      |  86 ++++-----
 41 files changed, 1007 insertions(+), 223 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index b779595..bd7cc0a 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -18,7 +18,7 @@ Files-Excluded: .gitignore .gitattributes .travis.yml
 
 Module: http-lua
 Homepage: https://github.com/openresty/lua-nginx-module
-Version: v0.10.10
+Version: v0.10.11
 Patch:
   openssl-1.1.0.patch
   discover-luajit-2.1.patch
diff --git a/debian/modules/http-lua/README.markdown b/debian/modules/http-lua/README.markdown
index fac3a0d..c42bd3e 100644
--- a/debian/modules/http-lua/README.markdown
+++ b/debian/modules/http-lua/README.markdown
@@ -62,7 +62,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.10](https://github.com/openresty/lua-nginx-module/tags) released on 8 August 2017.
+This document describes ngx_lua [v0.10.11](https://github.com/openresty/lua-nginx-module/tags) released on 3 November 2017.
 
 Synopsis
 ========
@@ -249,6 +249,7 @@ Nginx Compatibility
 
 The latest version of this module is compatible with the following versions of Nginx:
 
+* 1.13.x  (last tested: 1.13.6)
 * 1.11.x  (last tested: 1.11.2)
 * 1.10.x
 * 1.9.x (last tested: 1.9.15)
@@ -276,9 +277,9 @@ Build the source with this module:
 
 ```bash
 
- wget 'http://nginx.org/download/nginx-1.11.2.tar.gz'
- tar -xzvf nginx-1.11.2.tar.gz
- cd nginx-1.11.2/
+ wget 'http://nginx.org/download/nginx-1.13.6.tar.gz'
+ tar -xzvf nginx-1.13.6.tar.gz
+ cd nginx-1.13.6/
 
  # tell nginx's build system where to find LuaJIT 2.0:
  export LUAJIT_LIB=/path/to/luajit/lib
@@ -871,6 +872,7 @@ Nginx may terminate a request early with (at least):
 * 400 (Bad Request)
 * 405 (Not Allowed)
 * 408 (Request Timeout)
+* 413 (Request Entity Too Large)
 * 414 (Request URI Too Large)
 * 494 (Request Headers Too Large)
 * 499 (Client Closed Request)
@@ -1335,16 +1337,19 @@ Runs the Lua code specified by the argument `<lua-script-str>` on the global Lua
 
 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. In case that the [lua_code_cache](#lua_code_cache) directive is turned off (default on), the `init_by_lua` handler will run upon every request because in this special mode a standalone Lua VM is always created for each request.
 
-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:
+Usually you can pre-load Lua modules at server start-up by means of this hook and take advantage of modern operating systems' copy-on-write (COW) optimization. Here is an example for pre-loading Lua modules:
 
 ```nginx
 
- init_by_lua 'cjson = require "cjson"';
+ # this runs before forking out nginx worker processes:
+ init_by_lua_block { require "cjson" }
 
  server {
      location = /api {
          content_by_lua_block {
-             ngx.say(cjson.encode({dog = 5, cat = 6}))
+             -- the following require() will just  return
+             -- the alrady loaded module from package.loaded:
+             ngx.say(require "cjson".encode{dog = 5, cat = 6})
          }
      }
  }
@@ -1356,10 +1361,10 @@ You can also initialize the [lua_shared_dict](#lua_shared_dict) shm storage at t
 
  lua_shared_dict dogs 1m;
 
- init_by_lua '
+ init_by_lua_block {
      local dogs = ngx.shared.dogs;
      dogs:set("Tom", 56)
- ';
+ }
 
  server {
      location = /api {
@@ -2691,7 +2696,7 @@ ssl_session_store_by_lua_file
 
 **context:** *http*
 
-**phase:** *right-before-SSL-handshake*
+**phase:** *right-after-SSL-handshake*
 
 Equivalent to [ssl_session_store_by_lua_block](#ssl_session_store_by_lua_block), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or rather, the [Lua/LuaJIT bytecode](#lualuajit-bytecode-support) to be executed.
 
@@ -3188,9 +3193,13 @@ Nginx API for Lua
 * [ngx.shared.DICT.lpop](#ngxshareddictlpop)
 * [ngx.shared.DICT.rpop](#ngxshareddictrpop)
 * [ngx.shared.DICT.llen](#ngxshareddictllen)
+* [ngx.shared.DICT.ttl](#ngxshareddictttl)
+* [ngx.shared.DICT.expire](#ngxshareddictexpire)
 * [ngx.shared.DICT.flush_all](#ngxshareddictflush_all)
 * [ngx.shared.DICT.flush_expired](#ngxshareddictflush_expired)
 * [ngx.shared.DICT.get_keys](#ngxshareddictget_keys)
+* [ngx.shared.DICT.capacity](#ngxshareddictcapacity)
+* [ngx.shared.DICT.free_space](#ngxshareddictfree_space)
 * [ngx.socket.udp](#ngxsocketudp)
 * [udpsock:setpeername](#udpsocksetpeername)
 * [udpsock:send](#udpsocksend)
@@ -6195,9 +6204,13 @@ The resulting object `dict` has the following methods:
 * [lpop](#ngxshareddictlpop)
 * [rpop](#ngxshareddictrpop)
 * [llen](#ngxshareddictllen)
+* [ttl](#ngxshareddictttl)
+* [expire](#ngxshareddictexpire)
 * [flush_all](#ngxshareddictflush_all)
 * [flush_expired](#ngxshareddictflush_expired)
 * [get_keys](#ngxshareddictget_keys)
+* [capacity](#ngxshareddictcapacity)
+* [free_space](#ngxshareddictfree_space)
 
 All these methods are *atomic* operations, that is, safe from concurrent accesses from multiple nginx worker processes for the same `lua_shared_dict` zone.
 
@@ -6540,6 +6553,82 @@ See also [ngx.shared.DICT](#ngxshareddict).
 
 [Back to TOC](#nginx-api-for-lua)
 
+ngx.shared.DICT.ttl
+-------------------
+**syntax:** *ttl, err = ngx.shared.DICT:ttl(key)*
+
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+**requires:** `resty.core.shdict` or `resty.core`
+
+Retrieves the remaining TTL (time-to-live in seconds) of a key-value pair in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns the TTL as a number if the operation is successfully completed or `nil` and an error message otherwise.
+
+If the key does not exist (or has already expired), this method will return `nil` and the error string `"not found"`.
+
+The TTL is originally determined by the `exptime` argument of the [set](#ngxshareddictset), [add](#ngxshareddictadd), [replace](#ngxshareddictreplace) (and the likes) methods. It has a time resolution of `0.001` seconds. A value of `0` means that the item will never expire.
+
+Example:
+
+```lua
+
+ require "resty.core"
+
+ local cats = ngx.shared.cats
+ local succ, err = cats:set("Marry", "a nice cat", 0.5)
+
+ ngx.sleep(0.2)
+
+ local ttl, err = cats:ttl("Marry")
+ ngx.say(ttl) -- 0.3
+```
+
+This feature was first introduced in the `v0.10.11` release.
+
+**Note:** This method requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
+
+See also [ngx.shared.DICT](#ngxshareddict).
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.shared.DICT.expire
+----------------------
+**syntax:** *success, err = ngx.shared.DICT:expire(key, exptime)*
+
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+**requires:** `resty.core.shdict` or `resty.core`
+
+Updates the `exptime` (in second) of a key-value pair in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns a boolean indicating success if the operation completes or `nil` and an error message otherwise.
+
+If the key does not exist, this method will return `nil` and the error string `"not found"`.
+
+The `exptime` argument has a resolution of `0.001` seconds. If `exptime` is `0`, then the item will never expire.
+
+Example:
+
+```lua
+
+ require "resty.core"
+
+ local cats = ngx.shared.cats
+ local succ, err = cats:set("Marry", "a nice cat", 0.1)
+
+ succ, err = cats:expire("Marry", 0.5)
+
+ ngx.sleep(0.2)
+
+ local val, err = cats:get("Marry")
+ ngx.say(val) -- "a nice cat"
+```
+
+This feature was first introduced in the `v0.10.11` release.
+
+**Note:** This method requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
+
+See also [ngx.shared.DICT](#ngxshareddict).
+
+[Back to TOC](#nginx-api-for-lua)
+
 ngx.shared.DICT.flush_all
 -------------------------
 **syntax:** *ngx.shared.DICT:flush_all()*
@@ -6586,6 +6675,79 @@ This feature was first introduced in the `v0.7.3` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+ngx.shared.DICT.capacity
+------------------------
+**syntax:** *capacity_bytes = ngx.shared.DICT:capacity()*
+
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+**requires:** `resty.core.shdict` or `resty.core`
+
+Retrieves the capacity in bytes for the shm-based dictionary [ngx.shared.DICT](#ngxshareddict) declared with
+the [lua_shared_dict](#lua_shared_dict) directive.
+
+Example:
+
+```lua
+
+ require "resty.core.shdict"
+
+ local cats = ngx.shared.cats
+ local capacity_bytes = cats:capacity()
+```
+
+This feature was first introduced in the `v0.10.11` release.
+
+**Note:** This method requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
+
+This feature requires at least nginx core version `0.7.3`.
+
+See also [ngx.shared.DICT](#ngxshareddict).
+
+[Back to TOC](#nginx-api-for-lua)
+
+ngx.shared.DICT.free_space
+--------------------------
+**syntax:** *free_page_bytes = ngx.shared.DICT:free_space()*
+
+**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
+
+**requires:** `resty.core.shdict` or `resty.core`
+
+Retrieves the free page size in bytes for the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
+
+**Note:** The memory for ngx.shared.DICT is allocated via the nginx slab allocator which has each slot for
+data size ranges like \~8, 9\~16, 17\~32, ..., 1025\~2048, 2048\~ bytes. And pages are assigned to a slot if there
+is no room in already assigned pages for the slot.
+
+So even if the return value of the `free_space` method is zero, there may be room in already assigned pages, so
+you may successfully set a new key value pair to the shared dict without getting `true` for `forcible` or
+non nil `err` from the `ngx.shared.DICT.set`.
+
+On the other hand, if already assigned pages for a slot are full and a new key value pair is added to the
+slot and there is no free page, you may get `true` for `forcible` or non nil `err` from the
+`ngx.shared.DICT.set` method.
+
+Example:
+
+```lua
+
+ require "resty.core.shdict"
+
+ local cats = ngx.shared.cats
+ local free_page_bytes = cats:free_space()
+```
+
+This feature was first introduced in the `v0.10.11` release.
+
+**Note:** This method requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
+
+This feature requires at least nginx core version `1.11.7`.
+
+See also [ngx.shared.DICT](#ngxshareddict).
+
+[Back to TOC](#nginx-api-for-lua)
+
 ngx.socket.udp
 --------------
 **syntax:** *udpsock = ngx.socket.udp()*
diff --git a/debian/modules/http-lua/doc/HttpLuaModule.wiki b/debian/modules/http-lua/doc/HttpLuaModule.wiki
index 8393056..2424d39 100644
--- a/debian/modules/http-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/http-lua/doc/HttpLuaModule.wiki
@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.10] released on 8 August 2017.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.11] released on 3 November 2017.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -186,6 +186,7 @@ The Lua state (Lua VM instance) is shared across all the requests handled by a s
 
 The latest version of this module is compatible with the following versions of Nginx:
 
+* 1.13.x  (last tested: 1.13.6)
 * 1.11.x  (last tested: 1.11.2)
 * 1.10.x
 * 1.9.x (last tested: 1.9.15)
@@ -209,9 +210,9 @@ Alternatively, ngx_lua can be manually compiled into Nginx:
 Build the source with this module:
 
 <geshi lang="bash">
-    wget 'http://nginx.org/download/nginx-1.11.2.tar.gz'
-    tar -xzvf nginx-1.11.2.tar.gz
-    cd nginx-1.11.2/
+    wget 'http://nginx.org/download/nginx-1.13.6.tar.gz'
+    tar -xzvf nginx-1.13.6.tar.gz
+    cd nginx-1.13.6/
 
     # tell nginx's build system where to find LuaJIT 2.0:
     export LUAJIT_LIB=/path/to/luajit/lib
@@ -706,6 +707,7 @@ Nginx may terminate a request early with (at least):
 * 400 (Bad Request)
 * 405 (Not Allowed)
 * 408 (Request Timeout)
+* 413 (Request Entity Too Large)
 * 414 (Request URI Too Large)
 * 494 (Request Headers Too Large)
 * 499 (Client Closed Request)
@@ -1057,15 +1059,18 @@ Runs the Lua code specified by the argument <code><lua-script-str></code> on the
 
 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. In case that the [[#lua_code_cache|lua_code_cache]] directive is turned off (default on), the <code>init_by_lua</code> handler will run upon every request because in this special mode a standalone Lua VM is always created for each request.
 
-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:
+Usually you can pre-load Lua modules at server start-up by means of this hook and take advantage of modern operating systems' copy-on-write (COW) optimization. Here is an example for pre-loading Lua modules:
 
 <geshi lang="nginx">
-    init_by_lua 'cjson = require "cjson"';
+    # this runs before forking out nginx worker processes:
+    init_by_lua_block { require "cjson" }
 
     server {
         location = /api {
             content_by_lua_block {
-                ngx.say(cjson.encode({dog = 5, cat = 6}))
+                -- the following require() will just  return
+                -- the alrady loaded module from package.loaded:
+                ngx.say(require "cjson".encode{dog = 5, cat = 6})
             }
         }
     }
@@ -1076,10 +1081,10 @@ You can also initialize the [[#lua_shared_dict|lua_shared_dict]] shm storage at
 <geshi lang="nginx">
     lua_shared_dict dogs 1m;
 
-    init_by_lua '
+    init_by_lua_block {
         local dogs = ngx.shared.dogs;
         dogs:set("Tom", 56)
-    ';
+    }
 
     server {
         location = /api {
@@ -2276,7 +2281,7 @@ Note that: this directive is only allowed to used in '''http context''' from the
 
 '''context:''' ''http''
 
-'''phase:''' ''right-before-SSL-handshake''
+'''phase:''' ''right-after-SSL-handshake''
 
 Equivalent to [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua_block]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or rather, the [[#Lua/LuaJIT bytecode support|Lua/LuaJIT bytecode]] to be executed.
 
@@ -5193,9 +5198,13 @@ The resulting object <code>dict</code> has the following methods:
 * [[#ngx.shared.DICT.lpop|lpop]]
 * [[#ngx.shared.DICT.rpop|rpop]]
 * [[#ngx.shared.DICT.llen|llen]]
+* [[#ngx.shared.DICT.ttl|ttl]]
+* [[#ngx.shared.DICT.expire|expire]]
 * [[#ngx.shared.DICT.flush_all|flush_all]]
 * [[#ngx.shared.DICT.flush_expired|flush_expired]]
 * [[#ngx.shared.DICT.get_keys|get_keys]]
+* [[#ngx.shared.DICT.capacity|capacity]]
+* [[#ngx.shared.DICT.free_space|free_space]]
 
 All these methods are ''atomic'' operations, that is, safe from concurrent accesses from multiple nginx worker processes for the same <code>lua_shared_dict</code> zone.
 
@@ -5488,6 +5497,74 @@ This feature was first introduced in the <code>v0.10.6</code> release.
 
 See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 
+== ngx.shared.DICT.ttl ==
+'''syntax:''' ''ttl, err = ngx.shared.DICT:ttl(key)''
+
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+'''requires:''' <code>resty.core.shdict</code> or <code>resty.core</code>
+
+Retrieves the remaining TTL (time-to-live in seconds) of a key-value pair in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns the TTL as a number if the operation is successfully completed or <code>nil</code> and an error message otherwise.
+
+If the key does not exist (or has already expired), this method will return <code>nil</code> and the error string <code>"not found"</code>.
+
+The TTL is originally determined by the <code>exptime</code> argument of the [[#ngx.shared.DICT.set|set]], [[#ngx.shared.DICT.add|add]], [[#ngx.shared.DICT.replace|replace]] (and the likes) methods. It has a time resolution of <code>0.001</code> seconds. A value of <code>0</code> means that the item will never expire.
+
+Example:
+
+<geshi lang="lua">
+    require "resty.core"
+
+    local cats = ngx.shared.cats
+    local succ, err = cats:set("Marry", "a nice cat", 0.5)
+
+    ngx.sleep(0.2)
+
+    local ttl, err = cats:ttl("Marry")
+    ngx.say(ttl) -- 0.3
+</geshi>
+
+This feature was first introduced in the <code>v0.10.11</code> release.
+
+'''Note:''' This method requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
+
+See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+== ngx.shared.DICT.expire ==
+'''syntax:''' ''success, err = ngx.shared.DICT:expire(key, exptime)''
+
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+'''requires:''' <code>resty.core.shdict</code> or <code>resty.core</code>
+
+Updates the <code>exptime</code> (in second) of a key-value pair in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns a boolean indicating success if the operation completes or <code>nil</code> and an error message otherwise.
+
+If the key does not exist, this method will return <code>nil</code> and the error string <code>"not found"</code>.
+
+The <code>exptime</code> argument has a resolution of <code>0.001</code> seconds. If <code>exptime</code> is <code>0</code>, then the item will never expire.
+
+Example:
+
+<geshi lang="lua">
+    require "resty.core"
+
+    local cats = ngx.shared.cats
+    local succ, err = cats:set("Marry", "a nice cat", 0.1)
+
+    succ, err = cats:expire("Marry", 0.5)
+
+    ngx.sleep(0.2)
+
+    local val, err = cats:get("Marry")
+    ngx.say(val) -- "a nice cat"
+</geshi>
+
+This feature was first introduced in the <code>v0.10.11</code> release.
+
+'''Note:''' This method requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
+
+See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+
 == ngx.shared.DICT.flush_all ==
 '''syntax:''' ''ngx.shared.DICT:flush_all()''
 
@@ -5525,6 +5602,71 @@ By default, only the first 1024 keys (if any) are returned. When the <code><max_
 
 This feature was first introduced in the <code>v0.7.3</code> release.
 
+== ngx.shared.DICT.capacity ==
+'''syntax:''' ''capacity_bytes = ngx.shared.DICT:capacity()''
+
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+'''requires:''' <code>resty.core.shdict</code> or <code>resty.core</code>
+
+Retrieves the capacity in bytes for the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]] declared with
+the [[#lua_shared_dict|lua_shared_dict]] directive.
+
+Example:
+
+<geshi lang="lua">
+    require "resty.core.shdict"
+
+    local cats = ngx.shared.cats
+    local capacity_bytes = cats:capacity()
+</geshi>
+
+This feature was first introduced in the <code>v0.10.11</code> release.
+
+'''Note:''' This method requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
+
+This feature requires at least nginx core version <code>0.7.3</code>.
+
+See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+== ngx.shared.DICT.free_space ==
+'''syntax:''' ''free_page_bytes = ngx.shared.DICT:free_space()''
+
+'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
+
+'''requires:''' <code>resty.core.shdict</code> or <code>resty.core</code>
+
+Retrieves the free page size in bytes for the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
+
+'''Note:''' The memory for ngx.shared.DICT is allocated via the nginx slab allocator which has each slot for
+data size ranges like \~8, 9\~16, 17\~32, ..., 1025\~2048, 2048\~ bytes. And pages are assigned to a slot if there
+is no room in already assigned pages for the slot.
+
+So even if the return value of the <code>free_space</code> method is zero, there may be room in already assigned pages, so
+you may successfully set a new key value pair to the shared dict without getting <code>true</code> for <code>forcible</code> or
+non nil <code>err</code> from the <code>ngx.shared.DICT.set</code>.
+
+On the other hand, if already assigned pages for a slot are full and a new key value pair is added to the
+slot and there is no free page, you may get <code>true</code> for <code>forcible</code> or non nil <code>err</code> from the
+<code>ngx.shared.DICT.set</code> method.
+
+Example:
+
+<geshi lang="lua">
+    require "resty.core.shdict"
+
+    local cats = ngx.shared.cats
+    local free_page_bytes = cats:free_space()
+</geshi>
+
+This feature was first introduced in the <code>v0.10.11</code> release.
+
+'''Note:''' This method requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
+
+This feature requires at least nginx core version <code>1.11.7</code>.
+
+See also [[#ngx.shared.DICT|ngx.shared.DICT]].
+
 == ngx.socket.udp ==
 '''syntax:''' ''udpsock = ngx.socket.udp()''
 
diff --git a/debian/modules/http-lua/src/api/ngx_http_lua_api.h b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
index cd64fc8..1e07b71 100644
--- a/debian/modules/http-lua/src/api/ngx_http_lua_api.h
+++ b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10010
+#define ngx_http_lua_version  10011
 
 
 typedef struct {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_accessby.c b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
index 1a4ba6d..56bf0fa 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_accessby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
@@ -238,6 +238,7 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
 {
     int                  co_ref;
     ngx_int_t            rc;
+    ngx_uint_t           nreqs;
     lua_State           *co;
     ngx_event_t         *rev;
     ngx_connection_t    *c;
@@ -329,6 +330,9 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
         r->read_event_handler = ngx_http_block_reading;
     }
 
+    c = r->connection;
+    nreqs = c->requests;
+
     rc = ngx_http_lua_run_thread(L, r, ctx, 0);
 
     dd("returned %d", (int) rc);
@@ -337,10 +341,8 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
         return rc;
     }
 
-    c = r->connection;
-
     if (rc == NGX_AGAIN) {
-        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx);
+        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx, nreqs);
 
         if (rc == NGX_ERROR || rc == NGX_DONE || rc > NGX_OK) {
             return rc;
@@ -353,7 +355,7 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     } else if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
 
-        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx);
+        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx, nreqs);
 
         if (rc == NGX_ERROR || rc == NGX_DONE || rc > NGX_OK) {
             return rc;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_directive.c b/debian/modules/http-lua/src/ngx_http_lua_directive.c
index 6a562f4..014a472 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_directive.c
@@ -1542,7 +1542,7 @@ ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
 
 #if nginx_version >= 1009002
             if (dump) {
-                dump->last = ngx_cpymem(dump->last, b->pos, size);
+                dump->last = ngx_cpymem(dump->last, b->start + len, size);
             }
 #endif
         }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_output.c b/debian/modules/http-lua/src/ngx_http_lua_output.c
index b410ba4..0fe8840 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_output.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_output.c
@@ -724,6 +724,7 @@ ngx_http_lua_flush_resume_helper(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
     int                          n;
     lua_State                   *vm;
     ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
     ngx_connection_t            *c;
 
     c = r->connection;
@@ -748,18 +749,20 @@ ngx_http_lua_flush_resume_helper(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
     }
 
     vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
+
     rc = ngx_http_lua_run_thread(vm, r, ctx, n);
 
     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, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     /* rc == NGX_ERROR || rc >= NGX_OK */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_req_body.c b/debian/modules/http-lua/src/ngx_http_lua_req_body.c
index 6f2ae38..e6bf3c1 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_req_body.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_req_body.c
@@ -1125,6 +1125,7 @@ ngx_http_lua_read_body_resume(ngx_http_request_t *r)
 {
     lua_State                   *vm;
     ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
     ngx_connection_t            *c;
     ngx_http_lua_ctx_t          *ctx;
 
@@ -1134,6 +1135,7 @@ ngx_http_lua_read_body_resume(ngx_http_request_t *r)
 
     c = r->connection;
     vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
 
     rc = ngx_http_lua_run_thread(vm, r, ctx, 0);
 
@@ -1141,12 +1143,12 @@ ngx_http_lua_read_body_resume(ngx_http_request_t *r)
                    "lua run thread returned %d", rc);
 
     if (rc == NGX_AGAIN) {
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (ctx->entered_content_phase) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
index 44d8941..077c2d3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
@@ -235,6 +235,7 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
     int                      co_ref;
     lua_State               *co;
     ngx_int_t                rc;
+    ngx_uint_t               nreqs;
     ngx_event_t             *rev;
     ngx_connection_t        *c;
     ngx_http_lua_ctx_t      *ctx;
@@ -324,20 +325,21 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
         r->read_event_handler = ngx_http_block_reading;
     }
 
+    c = r->connection;
+    nreqs = c->requests;
+
     rc = ngx_http_lua_run_thread(L, r, ctx, 0);
 
     if (rc == NGX_ERROR || rc > NGX_OK) {
         return rc;
     }
 
-    c = r->connection;
-
     if (rc == NGX_AGAIN) {
-        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx);
+        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx, nreqs);
 
     } else if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
-        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx);
+        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx, nreqs);
     }
 
     if (rc == NGX_OK || rc == NGX_DECLINED) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_semaphore.c b/debian/modules/http-lua/src/ngx_http_lua_semaphore.c
index eda0141..0b70aea 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_semaphore.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_semaphore.c
@@ -258,6 +258,7 @@ ngx_http_lua_sema_resume(ngx_http_request_t *r)
     lua_State                   *vm;
     ngx_connection_t            *c;
     ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
     ngx_http_lua_ctx_t          *ctx;
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
@@ -269,6 +270,7 @@ ngx_http_lua_sema_resume(ngx_http_request_t *r)
 
     c = r->connection;
     vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
 
     if (ctx->cur_co_ctx->sem_resume_status == SEMAPHORE_WAIT_SUCC) {
         lua_pushboolean(ctx->cur_co_ctx->co, 1);
@@ -285,12 +287,12 @@ ngx_http_lua_sema_resume(ngx_http_request_t *r)
                    "lua run thread returned %d", rc);
 
     if (rc == NGX_AGAIN) {
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     /* rc == NGX_ERROR || rc >= NGX_OK */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_shdict.c b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
index d6cad7e..5b48eb4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
@@ -2843,6 +2843,173 @@ ngx_http_lua_ffi_shdict_flush_all(ngx_shm_zone_t *zone)
 
     return NGX_OK;
 }
+
+
+static ngx_int_t
+ngx_http_lua_shdict_peek(ngx_shm_zone_t *shm_zone, ngx_uint_t hash,
+    u_char *kdata, size_t klen, ngx_http_lua_shdict_node_t **sdp)
+{
+    ngx_int_t                    rc;
+    ngx_rbtree_node_t           *node, *sentinel;
+    ngx_http_lua_shdict_ctx_t   *ctx;
+    ngx_http_lua_shdict_node_t  *sd;
+
+    ctx = shm_zone->data;
+
+    node = ctx->sh->rbtree.root;
+    sentinel = ctx->sh->rbtree.sentinel;
+
+    while (node != sentinel) {
+
+        if (hash < node->key) {
+            node = node->left;
+            continue;
+        }
+
+        if (hash > node->key) {
+            node = node->right;
+            continue;
+        }
+
+        /* hash == node->key */
+
+        sd = (ngx_http_lua_shdict_node_t *) &node->color;
+
+        rc = ngx_memn2cmp(kdata, sd->data, klen, (size_t) sd->key_len);
+
+        if (rc == 0) {
+            *sdp = sd;
+
+            return NGX_OK;
+        }
+
+        node = (rc < 0) ? node->left : node->right;
+    }
+
+    *sdp = NULL;
+
+    return NGX_DECLINED;
+}
+
+
+int
+ngx_http_lua_ffi_shdict_get_ttl(ngx_shm_zone_t *zone, u_char *key,
+    size_t key_len)
+{
+    uint32_t                     hash;
+    uint64_t                     now;
+    uint64_t                     expires;
+    ngx_int_t                    rc;
+    ngx_time_t                  *tp;
+    ngx_http_lua_shdict_ctx_t   *ctx;
+    ngx_http_lua_shdict_node_t  *sd;
+
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx = zone->data;
+    hash = ngx_crc32_short(key, key_len);
+
+    ngx_shmtx_lock(&ctx->shpool->mutex);
+
+    rc = ngx_http_lua_shdict_peek(zone, hash, key, key_len, &sd);
+
+    if (rc == NGX_DECLINED) {
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        return NGX_DECLINED;
+    }
+
+    /* rc == NGX_OK */
+
+    expires = sd->expires;
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+    if (expires == 0) {
+        return 0;
+    }
+
+    tp = ngx_timeofday();
+    now = (uint64_t) tp->sec * 1000 + tp->msec;
+
+    return expires - now;
+}
+
+
+int
+ngx_http_lua_ffi_shdict_set_expire(ngx_shm_zone_t *zone, u_char *key,
+    size_t key_len, int exptime)
+{
+    uint32_t                     hash;
+    ngx_int_t                    rc;
+    ngx_time_t                  *tp = NULL;
+    ngx_http_lua_shdict_ctx_t   *ctx;
+    ngx_http_lua_shdict_node_t  *sd;
+
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (exptime > 0) {
+        tp = ngx_timeofday();
+    }
+
+    ctx = zone->data;
+    hash = ngx_crc32_short(key, key_len);
+
+    ngx_shmtx_lock(&ctx->shpool->mutex);
+
+    rc = ngx_http_lua_shdict_peek(zone, hash, key, key_len, &sd);
+
+    if (rc == NGX_DECLINED) {
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        return NGX_DECLINED;
+    }
+
+    /* rc == NGX_OK */
+
+    if (exptime > 0) {
+        sd->expires = (uint64_t) tp->sec * 1000 + tp->msec
+                      + (uint64_t) exptime;
+
+    } else {
+        sd->expires = 0;
+    }
+
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+    return NGX_OK;
+}
+
+
+size_t
+ngx_http_lua_ffi_shdict_capacity(ngx_shm_zone_t *zone)
+{
+    return zone->shm.size;
+}
+
+
+#    if nginx_version >= 1011007
+size_t
+ngx_http_lua_ffi_shdict_free_space(ngx_shm_zone_t *zone)
+{
+    size_t                       bytes;
+    ngx_http_lua_shdict_ctx_t   *ctx;
+
+    ctx = zone->data;
+
+    ngx_shmtx_lock(&ctx->shpool->mutex);
+    bytes = ctx->shpool->pfree * ngx_pagesize;
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+    return bytes;
+}
+#    endif /* nginx_version >= 1011007 */
+
+
 #endif /* NGX_LUA_NO_FFI_API */
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_sleep.c b/debian/modules/http-lua/src/ngx_http_lua_sleep.c
index ffee97f..09ea0f6 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_sleep.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_sleep.c
@@ -180,6 +180,7 @@ ngx_http_lua_sleep_resume(ngx_http_request_t *r)
     lua_State                   *vm;
     ngx_connection_t            *c;
     ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
     ngx_http_lua_ctx_t          *ctx;
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
@@ -191,6 +192,7 @@ ngx_http_lua_sleep_resume(ngx_http_request_t *r)
 
     c = r->connection;
     vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
 
     rc = ngx_http_lua_run_thread(vm, r, ctx, 0);
 
@@ -198,12 +200,12 @@ ngx_http_lua_sleep_resume(ngx_http_request_t *r)
                    "lua run thread returned %d", rc);
 
     if (rc == NGX_AGAIN) {
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (ctx->entered_content_phase) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
index 382a94d..f0988bc 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
@@ -474,6 +474,7 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         switch (lua_type(L, -1)) {
         case LUA_TNUMBER:
             lua_tostring(L, -1);
+            /* FALLTHROUGH */
 
         case LUA_TSTRING:
             custom_pool = 1;
@@ -743,6 +744,9 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
 
+        coctx->cleanup = NULL;
+        coctx->data = NULL;
+
         u->resolved->ctx = NULL;
         lua_pushnil(L);
         lua_pushfstring(L, "%s could not be resolved", host.data);
@@ -2708,6 +2712,10 @@ ngx_http_lua_socket_tcp_settimeout(lua_State *L)
     }
 
     timeout = (ngx_int_t) lua_tonumber(L, 2);
+    if (timeout >> 31) {
+        return luaL_error(L, "bad timeout value");
+    }
+
     lua_pushinteger(L, timeout);
     lua_pushinteger(L, timeout);
 
@@ -2751,8 +2759,19 @@ ngx_http_lua_socket_tcp_settimeouts(lua_State *L)
     }
 
     connect_timeout = (ngx_int_t) lua_tonumber(L, 2);
+    if (connect_timeout >> 31) {
+        return luaL_error(L, "bad timeout value");
+    }
+
     send_timeout = (ngx_int_t) lua_tonumber(L, 3);
+    if (send_timeout >> 31) {
+        return luaL_error(L, "bad timeout value");
+    }
+
     read_timeout = (ngx_int_t) lua_tonumber(L, 4);
+    if (read_timeout >> 31) {
+        return luaL_error(L, "bad timeout value");
+    }
 
     lua_rawseti(L, 1, SOCKET_READ_TIMEOUT_INDEX);
     lua_rawseti(L, 1, SOCKET_SEND_TIMEOUT_INDEX);
@@ -5234,6 +5253,7 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
     int                          nret;
     lua_State                   *vm;
     ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
     ngx_connection_t            *c;
     ngx_http_lua_ctx_t          *ctx;
     ngx_http_lua_co_ctx_t       *coctx;
@@ -5284,6 +5304,7 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 
     c = r->connection;
     vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
 
     rc = ngx_http_lua_run_thread(vm, r, ctx, nret);
 
@@ -5291,12 +5312,12 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
                    "lua run thread returned %d", rc);
 
     if (rc == NGX_AGAIN) {
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (ctx->entered_content_phase) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
index 1ec0c00..08ba1cc 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
@@ -1514,6 +1514,7 @@ ngx_http_lua_socket_udp_resume(ngx_http_request_t *r)
     int                          nret;
     lua_State                   *vm;
     ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
     ngx_connection_t            *c;
     ngx_http_lua_ctx_t          *ctx;
     ngx_http_lua_co_ctx_t       *coctx;
@@ -1549,6 +1550,7 @@ ngx_http_lua_socket_udp_resume(ngx_http_request_t *r)
 
     c = r->connection;
     vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
 
     rc = ngx_http_lua_run_thread(vm, r, ctx, nret);
 
@@ -1556,12 +1558,12 @@ ngx_http_lua_socket_udp_resume(ngx_http_request_t *r)
                    "lua run thread returned %d", rc);
 
     if (rc == NGX_AGAIN) {
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (ctx->entered_content_phase) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
index c3591d1..95be47f 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
@@ -197,7 +197,8 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
 
     c = ngx_ssl_get_connection(ssl_conn);
 
-    dd("c = %p", c);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "ssl cert: connection reusable: %ud", c->reusable);
 
     cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
 
@@ -220,6 +221,8 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
 
     dd("first time");
 
+    ngx_reusable_connection(c, 0);
+
     hc = c->data;
 
     fc = ngx_http_lua_create_fake_connection(NULL);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
index 556b732..3a3c1f5 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
@@ -191,7 +191,8 @@ ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
 
     c = ngx_ssl_get_connection(ssl_conn);
 
-    dd("c = %p", c);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "ssl session fetch: connection reusable: %ud", c->reusable);
 
     cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
 
@@ -224,6 +225,8 @@ ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
 
     dd("first time");
 
+    ngx_reusable_connection(c, 0);
+
     hc = c->data;
 
     fc = ngx_http_lua_create_fake_connection(NULL);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
index bae8273..f83e85d 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
@@ -183,7 +183,8 @@ ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
 
     c = ngx_ssl_get_connection(ssl_conn);
 
-    dd("c = %p", c);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "ssl session store: connection reusable: %ud", c->reusable);
 
     cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
index 6f7aa97..47096e9 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
@@ -1587,6 +1587,7 @@ ngx_http_lua_subrequest_resume(ngx_http_request_t *r)
 {
     lua_State                   *vm;
     ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
     ngx_connection_t            *c;
     ngx_http_lua_ctx_t          *ctx;
     ngx_http_lua_co_ctx_t       *coctx;
@@ -1620,6 +1621,7 @@ ngx_http_lua_subrequest_resume(ngx_http_request_t *r)
 
     c = r->connection;
     vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
 
     rc = ngx_http_lua_run_thread(vm, r, ctx, coctx->nsubreqs);
 
@@ -1627,12 +1629,12 @@ ngx_http_lua_subrequest_resume(ngx_http_request_t *r)
                    "lua run thread returned %d", rc);
 
     if (rc == NGX_AGAIN) {
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     /* rc == NGX_ERROR || rc >= NGX_OK */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.c b/debian/modules/http-lua/src/ngx_http_lua_util.c
index c7bee3e..df0aae8 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.c
@@ -3055,13 +3055,13 @@ ngx_http_lua_create_co_ctx(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 /* 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_http_request_t *r, ngx_http_lua_ctx_t *ctx, ngx_uint_t nreqs)
 {
     ngx_int_t                        rc;
     ngx_http_lua_posted_thread_t    *pt;
 
     for ( ;; ) {
-        if (c->destroyed) {
+        if (c->destroyed || c->requests != nreqs) {
             return NGX_DONE;
         }
 
@@ -3461,6 +3461,7 @@ ngx_http_lua_on_abort_resume(ngx_http_request_t *r)
 {
     lua_State                   *vm;
     ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
     ngx_connection_t            *c;
     ngx_http_lua_ctx_t          *ctx;
 
@@ -3480,6 +3481,7 @@ ngx_http_lua_on_abort_resume(ngx_http_request_t *r)
 
     c = r->connection;
     vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
 
     rc = ngx_http_lua_run_thread(vm, r, ctx, 0);
 
@@ -3487,12 +3489,12 @@ ngx_http_lua_on_abort_resume(ngx_http_request_t *r)
                    "lua run thread returned %d", rc);
 
     if (rc == NGX_AGAIN) {
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (rc == NGX_DONE) {
         ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
     }
 
     if (ctx->entered_content_phase) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.h b/debian/modules/http-lua/src/ngx_http_lua_util.h
index a37852f..2f995e0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.h
@@ -205,7 +205,7 @@ 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_http_request_t *r, ngx_http_lua_ctx_t *ctx, ngx_uint_t nreqs);
 
 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);
diff --git a/debian/modules/http-lua/t/000--init.t b/debian/modules/http-lua/t/000--init.t
index ad2d70e..dbe2c33 100644
--- a/debian/modules/http-lua/t/000--init.t
+++ b/debian/modules/http-lua/t/000--init.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 2 + 1);
+plan tests => repeat_each() * (blocks() * 3);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
@@ -14,9 +14,13 @@ our $http_config = <<'_EOC_';
         drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
     }
+
+    lua_package_path "../lua-resty-mysql/lib/?.lua;;";
 _EOC_
 
 no_shuffle();
+no_long_string();
+
 run_tests();
 
 __DATA__
@@ -25,51 +29,46 @@ __DATA__
 --- http_config eval: $::http_config
 --- config
     location = /init {
-        drizzle_pass   database;
-        drizzle_query  "DROP TABLE IF EXISTS conv_uid";
+        content_by_lua_block {
+            local mysql = require "resty.mysql"
+            local db = assert(mysql:new())
+            local ok, err, errcode, sqlstate = db:connect{
+                host = "127.0.0.1",
+                port = $TEST_NGINX_MYSQL_PORT,
+                database = "ngx_test",
+                user = "ngx_test",
+                password = "ngx_test",
+                charset = "utf8",
+            }
+
+            local queries = {
+                "DROP TABLE IF EXISTS conv_uid",
+                "CREATE TABLE conv_uid(id serial primary key, new_uid integer, old_uid integer)",
+                "INSERT INTO conv_uid(old_uid,new_uid) VALUES(32,56),(35,78)",
+            }
+
+            for _, query in ipairs(queries) do
+                local ok, err = db:query(query)
+                if not ok then
+                    ngx.say("failed to run mysql query \"", query, "\": ", err)
+                    return
+                end
+            end
+
+            ngx.say("done!")
+        }
     }
 --- request
 GET /init
---- error_code: 200
+--- response_body
+done!
 --- timeout: 10
 --- no_error_log
 [error]
 
 
 
-=== TEST 2: conv_uid - create table
---- http_config eval: $::http_config
---- config
-    location = /init {
-        drizzle_pass   database;
-        drizzle_query  "CREATE TABLE conv_uid(id serial primary key, new_uid integer, old_uid integer)";
-    }
---- request
-GET /init
---- error_code: 200
---- timeout: 10
---- no_error_log
-[error]
-
-
-
-=== TEST 3: conv_uid - insert value
---- http_config eval: $::http_config
---- config
-    location = /init {
-        drizzle_pass   database;
-        drizzle_query  "INSERT INTO conv_uid(old_uid,new_uid) VALUES(32,56),(35,78)";
-    }
---- request
-GET /init
---- error_code: 200
---- timeout: 10
---- no_error_log
-[error]
-
-
-
-=== TEST 4: flush data from memcached
+=== TEST 2: flush data from memcached
 --- config
     location /flush {
         set $memc_cmd flush_all;
diff --git a/debian/modules/http-lua/t/002-content.t b/debian/modules/http-lua/t/002-content.t
index 3f2460e..cc92d6f 100644
--- a/debian/modules/http-lua/t/002-content.t
+++ b/debian/modules/http-lua/t/002-content.t
@@ -10,7 +10,7 @@ use Test::Nginx::Socket::Lua;
 repeat_each(2);
 #repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 2 + 19);
+plan tests => repeat_each() * (blocks() * 2 + 23);
 
 #no_diff();
 #no_long_string();
@@ -539,6 +539,9 @@ GET /main
 Content-Length: 12
 --- response_body chop
 hello, world
+--- no_error_log
+[error]
+[alert]
 
 
 
@@ -761,6 +764,9 @@ Content-Length: 13
 hello,
 world
 --- timeout: 5
+--- no_error_log
+[error]
+[alert]
 
 
 
diff --git a/debian/modules/http-lua/t/004-require.t b/debian/modules/http-lua/t/004-require.t
index ec74116..35e04db 100644
--- a/debian/modules/http-lua/t/004-require.t
+++ b/debian/modules/http-lua/t/004-require.t
@@ -35,6 +35,7 @@ __DATA__
     location /load {
         content_by_lua '
             package.loaded.foo = nil;
+            collectgarbage()
             local foo = require "foo";
             foo.hi()
         ';
diff --git a/debian/modules/http-lua/t/017-exec.t b/debian/modules/http-lua/t/017-exec.t
index 535c4ab..544b8bb 100644
--- a/debian/modules/http-lua/t/017-exec.t
+++ b/debian/modules/http-lua/t/017-exec.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 4);
+plan tests => repeat_each() * (blocks() * 2 + 8);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
@@ -572,3 +572,25 @@ hello, bah
 ["dummy", "dummy"]
 --- no_error_log
 [error]
+
+
+
+=== TEST 25: pipelined requests
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.exec("@foo")
+        }
+    }
+
+    location @foo {
+        return 200;
+    }
+--- pipelined_requests eval
+["GET /t", "GET /t"]
+--- error_code eval
+[200, 200]
+--- response_body eval
+["", ""]
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/023-rewrite/exec.t b/debian/modules/http-lua/t/023-rewrite/exec.t
index bd97968..edd4607 100644
--- a/debian/modules/http-lua/t/023-rewrite/exec.t
+++ b/debian/modules/http-lua/t/023-rewrite/exec.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket::Lua;
 repeat_each(2);
 #repeat_each(1);
 
-plan tests => blocks() * repeat_each() * 2;
+plan tests => repeat_each() * (blocks() * 2 + 4);
 
 #no_diff();
 #no_long_string();
@@ -376,3 +376,25 @@ ngx.exec("@proxy")
     GET /main
 --- response_body
 hello, bah
+
+
+
+=== TEST 17: pipelined requests
+--- config
+    location /t {
+        rewrite_by_lua_block {
+            ngx.exec("@foo")
+        }
+    }
+
+    location @foo {
+        return 200;
+    }
+--- pipelined_requests eval
+["GET /t", "GET /t"]
+--- error_code eval
+[200, 200]
+--- response_body eval
+["", ""]
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
index 15bec7f..a32ed7b 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
@@ -24,7 +24,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 14);
+plan tests => repeat_each() * (blocks() * 4 + 8);
 
 our $HtmlDir = html_dir;
 
@@ -174,7 +174,7 @@ lua tcp socket connect timeout: 102
 
 
 
-=== TEST 5: sock:settimeout(-1) does not override lua_socket_connect_timeout
+=== TEST 5: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_connect_timeout 102ms;
@@ -198,14 +198,12 @@ lua tcp socket connect timeout: 102
     }
 --- request
 GET /t5
---- response_body
-failed to connect: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket connect timeout: 102
---- no_error_log
-[error]
-[alert]
+bad timeout value
 --- timeout: 10
+--- error_code: 500
 
 
 
@@ -371,7 +369,7 @@ lua tcp socket read timed out
 
 
 
-=== TEST 10: sock:settimeout(-1) does not override lua_socket_read_timeout
+=== TEST 10: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
@@ -385,8 +383,6 @@ lua tcp socket read timed out
                 return
             end
 
-            ngx.say("connected: ", ok)
-
             sock:settimeout(-1)
 
             local line
@@ -402,13 +398,12 @@ lua tcp socket read timed out
     }
 --- request
 GET /t
---- response_body
-connected: 1
-failed to receive: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket read timeout: 102
-lua tcp socket connect timeout: 60000
-lua tcp socket read timed out
+bad timeout value
+--- timeout: 10
+--- error_code: 500
 
 
 
@@ -574,7 +569,7 @@ lua tcp socket write timed out
 
 
 
-=== TEST 15: sock:settimeout(-1) does not override lua_socket_send_timeout
+=== TEST 15: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_send_timeout 102ms;
@@ -588,8 +583,6 @@ lua tcp socket write timed out
                 return
             end
 
-            ngx.say("connected: ", ok)
-
             sock:settimeout(-1)
 
             local bytes
@@ -605,10 +598,9 @@ lua tcp socket write timed out
     }
 --- request
 GET /t
---- response_body
-connected: 1
-failed to send: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket send timeout: 102
-lua tcp socket connect timeout: 60000
-lua tcp socket write timed out
+bad timeout value
+--- timeout: 10
+--- error_code: 500
diff --git a/debian/modules/http-lua/t/024-access/exec.t b/debian/modules/http-lua/t/024-access/exec.t
index 3fb87be..43c1a77 100644
--- a/debian/modules/http-lua/t/024-access/exec.t
+++ b/debian/modules/http-lua/t/024-access/exec.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 2);
+plan tests => repeat_each() * (blocks() * 2 + 6);
 
 #no_diff();
 #no_long_string();
@@ -369,3 +369,25 @@ GET /read
 'unsafe URI "/hi/../" was detected',
 qr/runtime error: access_by_lua\(nginx.conf:\d+\):2: unsafe uri/,
 ]
+
+
+
+=== TEST 17: pipelined requests
+--- config
+    location /t {
+        access_by_lua_block {
+            ngx.exec("@foo")
+        }
+    }
+
+    location @foo {
+        return 200;
+    }
+--- pipelined_requests eval
+["GET /t", "GET /t"]
+--- error_code eval
+[200, 200]
+--- response_body eval
+["", ""]
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/035-gmatch.t b/debian/modules/http-lua/t/035-gmatch.t
index 5b63ae4..0426997 100644
--- a/debian/modules/http-lua/t/035-gmatch.t
+++ b/debian/modules/http-lua/t/035-gmatch.t
@@ -440,6 +440,7 @@ done
     location /main {
         content_by_lua '
             package.loaded.foo = nil
+            collectgarbage()
 
             local res = ngx.location.capture("/t")
             if res.status == 200 then
diff --git a/debian/modules/http-lua/t/058-tcp-socket.t b/debian/modules/http-lua/t/058-tcp-socket.t
index 1ee113b..0743dd7 100644
--- a/debian/modules/http-lua/t/058-tcp-socket.t
+++ b/debian/modules/http-lua/t/058-tcp-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 190;
+plan tests => repeat_each() * 193;
 
 our $HtmlDir = html_dir;
 
@@ -3690,3 +3690,40 @@ received: OK
 close: 1 nil
 --- no_error_log
 [error]
+
+
+
+=== TEST 61: resolver send query failing immediately in connect()
+this case did not clear coctx->cleanup properly and would lead to memory invalid accesses.
+
+this test case requires the following iptables rule to work properly:
+
+sudo iptables -I OUTPUT 1 -p udp --dport 10086 -j REJECT
+
+--- config
+    location /t {
+        resolver 127.0.0.1:10086 ipv6=off;
+        resolver_timeout 10ms;
+
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+
+            for i = 1, 3 do -- retry
+                local ok, err = sock:connect("www.google.com", 80)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                end
+            end
+
+            ngx.say("hello!")
+        }
+    }
+--- request
+GET /t
+--- response_body
+failed to connect: www.google.com could not be resolved
+failed to connect: www.google.com could not be resolved
+failed to connect: www.google.com could not be resolved
+hello!
+--- error_log eval
+qr{\[alert\] .*? send\(\) failed \(\d+: Operation not permitted\) while resolving}
diff --git a/debian/modules/http-lua/t/065-tcp-socket-timeout.t b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
index 212766e..9e5460e 100644
--- a/debian/modules/http-lua/t/065-tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
@@ -28,7 +28,7 @@ our $StapScript = $t::StapThread::StapScript;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 12);
+plan tests => repeat_each() * (blocks() * 4 + 6);
 
 our $HtmlDir = html_dir;
 
@@ -159,7 +159,7 @@ lua tcp socket connect timed out
 
 
 
-=== TEST 5: sock:settimeout(-1) does not override lua_socket_connect_timeout
+=== TEST 5: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_connect_timeout 102ms;
@@ -179,11 +179,11 @@ lua tcp socket connect timed out
     }
 --- request
 GET /t
---- response_body
-failed to connect: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket connect timeout: 102
-lua tcp socket connect timed out
+bad timeout value
+--- error_code: 500
 
 
 
@@ -342,7 +342,7 @@ lua tcp socket read timed out
 
 
 
-=== TEST 10: sock:settimeout(-1) does not override lua_socket_read_timeout
+=== TEST 10: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
@@ -356,8 +356,6 @@ lua tcp socket read timed out
                 return
             end
 
-            ngx.say("connected: ", ok)
-
             sock:settimeout(-1)
 
             local line
@@ -371,13 +369,11 @@ lua tcp socket read timed out
     }
 --- request
 GET /t
---- response_body
-connected: 1
-failed to receive: timeout
+--- response_body_like chomp
+500 Internal Server Error
+--- error_code: 500
 --- error_log
-lua tcp socket read timeout: 102
-lua tcp socket connect timeout: 60000
-lua tcp socket read timed out
+bad timeout value
 
 
 
@@ -563,8 +559,6 @@ lua tcp socket write timed out
                 return
             end
 
-            ngx.say("connected: ", ok)
-
             sock:settimeout(-1)
 
             local bytes
@@ -578,13 +572,11 @@ lua tcp socket write timed out
     }
 --- request
 GET /t
---- response_body
-connected: 1
-failed to send: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket send timeout: 102
-lua tcp socket connect timeout: 60000
-lua tcp socket write timed out
+bad timeout value
+--- error_code: 500
 
 
 
@@ -994,3 +986,33 @@ close: 1 nil
 
 --- no_error_log
 [error]
+
+
+
+=== TEST 23: timeout overflow detection
+--- config
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local ok, err = pcall(sock.settimeout, sock, (2 ^ 31) - 1)
+            if not ok then
+                ngx.say("failed to set timeout: ", err)
+            else
+                ngx.say("settimeout: ok")
+            end
+
+            ok, err = pcall(sock.settimeout, sock, 2 ^ 31)
+            if not ok then
+                ngx.say("failed to set timeout: ", err)
+            else
+                ngx.say("settimeout: ok")
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body_like
+settimeout: ok
+failed to set timeout: bad timeout value
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/097-uthread-rewrite.t b/debian/modules/http-lua/t/097-uthread-rewrite.t
index a93adc8..2f0c06f 100644
--- a/debian/modules/http-lua/t/097-uthread-rewrite.t
+++ b/debian/modules/http-lua/t/097-uthread-rewrite.t
@@ -258,6 +258,7 @@ free request
 hello foo
 --- no_error_log
 [error]
+--- wait: 0.1
 
 
 
diff --git a/debian/modules/http-lua/t/106-timer.t b/debian/modules/http-lua/t/106-timer.t
index 04a532e..3e4741e 100644
--- a/debian/modules/http-lua/t/106-timer.t
+++ b/debian/modules/http-lua/t/106-timer.t
@@ -174,7 +174,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])
             local begin = ngx.now()
             local function f()
                 print("my lua timer handler")
-                ngx.sleep(0.02)
+                ngx.sleep(0.2)
                 print("elapsed: ", ngx.now() - begin)
             end
             local ok, err = ngx.timer.at(0.05, f)
@@ -199,7 +199,7 @@ delete thread 2
 --- response_body
 registered timer
 
---- wait: 0.12
+--- wait: 0.3
 --- no_error_log
 [error]
 [alert]
@@ -208,7 +208,7 @@ registered timer
 --- error_log eval
 [
 qr/\[lua\] .*? my lua timer handler/,
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
+qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:1[4-9]|2[0-6]?)/,
 "lua ngx.timer expired",
 "http lua close fake http connection"
 ]
diff --git a/debian/modules/http-lua/t/129-ssl-socket.t b/debian/modules/http-lua/t/129-ssl-socket.t
index 1c3f7cd..e7447a7 100644
--- a/debian/modules/http-lua/t/129-ssl-socket.t
+++ b/debian/modules/http-lua/t/129-ssl-socket.t
@@ -1181,7 +1181,7 @@ lua ssl free session: ([0-9A-F]+):1
 $/
 --- error_log
 lua ssl server name: "openresty.org"
-SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2
+SSL: TLSv1.2, cipher: "ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2
 --- no_error_log
 SSL reused session
 [error]
@@ -1261,7 +1261,7 @@ lua ssl free session: ([0-9A-F]+):1
 $/
 --- error_log
 lua ssl server name: "openresty.org"
-SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-SHA 
+SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-SHA SSLv3
 --- no_error_log
 SSL reused session
 [error]
@@ -1341,7 +1341,7 @@ lua ssl free session: ([0-9A-F]+):1
 $/
 --- error_log
 lua ssl server name: "openresty.org"
-SSL: TLSv1, cipher: "ECDHE-RSA-AES256-SHA 
+SSL: TLSv1, cipher: "ECDHE-RSA-AES128-SHA SSLv3
 --- no_error_log
 SSL reused session
 [error]
diff --git a/debian/modules/http-lua/t/139-ssl-cert-by.t b/debian/modules/http-lua/t/139-ssl-cert-by.t
index c13044f..b521e9e 100644
--- a/debian/modules/http-lua/t/139-ssl-cert-by.t
+++ b/debian/modules/http-lua/t/139-ssl-cert-by.t
@@ -113,11 +113,17 @@ close: 1 nil
 
 --- error_log
 lua ssl server name: "test.com"
-ssl_certificate_by_lua:1: ssl cert by lua is running!
 
 --- no_error_log
 [error]
 [alert]
+--- grep_error_log eval: qr/ssl_certificate_by_lua:.*?,|\bssl cert: connection reusable: \d+|\breusable connection: \d+/
+--- grep_error_log_out eval
+qr/reusable connection: 1
+ssl cert: connection reusable: 1
+reusable connection: 0
+ssl_certificate_by_lua:1: ssl cert by lua is running!,
+/
 
 
 
diff --git a/debian/modules/http-lua/t/142-ssl-session-store.t b/debian/modules/http-lua/t/142-ssl-session-store.t
index 73b6e19..825d016 100644
--- a/debian/modules/http-lua/t/142-ssl-session-store.t
+++ b/debian/modules/http-lua/t/142-ssl-session-store.t
@@ -82,11 +82,16 @@ close: 1 nil
 
 --- error_log
 lua ssl server name: "test.com"
-ssl_session_store_by_lua_block:1: ssl session store by lua is running!
 
 --- no_error_log
 [error]
 [alert]
+--- grep_error_log eval: qr/ssl_session_store_by_lua_block:.*?,|\bssl session store: connection reusable: \d+|\breusable connection: \d+/
+--- grep_error_log_out eval
+qr/^reusable connection: 0
+ssl session store: connection reusable: 0
+ssl_session_store_by_lua_block:1: ssl session store by lua is running!,
+/m,
 
 
 
diff --git a/debian/modules/http-lua/t/143-ssl-session-fetch.t b/debian/modules/http-lua/t/143-ssl-session-fetch.t
index 701ead7..7be180f 100644
--- a/debian/modules/http-lua/t/143-ssl-session-fetch.t
+++ b/debian/modules/http-lua/t/143-ssl-session-fetch.t
@@ -83,16 +83,21 @@ connected: 1
 ssl handshake: userdata
 close: 1 nil
 
---- grep_error_log eval
-qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
+--- grep_error_log eval: qr/ssl_session_fetch_by_lua_block:.*?,|\bssl session fetch: connection reusable: \d+|\breusable connection: \d+/
 
 --- grep_error_log_out eval
 [
-'',
-'ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!
-',
-'ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!
-',
+qr/\A(?:reusable connection: [01]\n)+\z/s,
+qr/^reusable connection: 1
+ssl session fetch: connection reusable: 1
+reusable connection: 0
+ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!,
+/m,
+qr/^reusable connection: 1
+ssl session fetch: connection reusable: 1
+reusable connection: 0
+ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!,
+/m,
 ]
 
 --- no_error_log
diff --git a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
index 0689a9b..8199e84 100644
--- a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
+++ b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
@@ -532,3 +532,96 @@ received: ok
 failed to receive a line: closed []
 --- no_error_log
 [error]
+
+
+
+=== TEST 8: connection timeout overflow detection
+--- config
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local ok, err = pcall(sock.settimeouts, sock,
+                                  (2 ^ 31) - 1, 500, 500)
+            if not ok then
+                ngx.say("failed to set timeouts: ", err)
+            else
+                ngx.say("settimeouts: ok")
+            end
+
+            ok, err = pcall(sock.settimeouts, sock, 2 ^ 31, 500, 500)
+            if not ok then
+                ngx.say("failed to set timeouts: ", err)
+            else
+                ngx.say("settimeouts: ok")
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body_like
+settimeouts: ok
+failed to set timeouts: bad timeout value
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: send timeout overflow detection
+--- config
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local ok, err = pcall(sock.settimeouts, sock,
+                                  500, (2 ^ 31) - 1, 500)
+            if not ok then
+                ngx.say("failed to set timeouts: ", err)
+            else
+                ngx.say("settimeouts: ok")
+            end
+
+            ok, err = pcall(sock.settimeouts, sock, 500, 2 ^ 31, 500)
+            if not ok then
+                ngx.say("failed to set timeouts: ", err)
+            else
+                ngx.say("settimeouts: ok")
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body_like
+settimeouts: ok
+failed to set timeouts: bad timeout value
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: read timeout overflow detection
+--- config
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local ok, err = pcall(sock.settimeouts, sock,
+                                  500, 500, (2 ^ 31) - 1)
+            if not ok then
+                ngx.say("failed to set timeouts: ", err)
+            else
+                ngx.say("settimeouts: ok")
+            end
+
+            ok, err = pcall(sock.settimeouts, sock, 500, 500, 2 ^ 31)
+            if not ok then
+                ngx.say("failed to set timeouts: ", err)
+            else
+                ngx.say("settimeouts: ok")
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body_like
+settimeouts: ok
+failed to set timeouts: bad timeout value
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/154-semaphore.t b/debian/modules/http-lua/t/154-semaphore.t
index 3c1f004..875f181 100644
--- a/debian/modules/http-lua/t/154-semaphore.t
+++ b/debian/modules/http-lua/t/154-semaphore.t
@@ -75,6 +75,7 @@ semaphore gc wait queue is not empty
 
 
 === TEST 2: timer + shutdown error log (lua code cache off)
+FIXME: this test case leaks memory.
 --- http_config
     lua_code_cache off;
 --- config
@@ -116,3 +117,4 @@ hello, world
 --- shutdown_error_log
 --- no_shutdown_error_log
 semaphore gc wait queue is not empty
+--- SKIP
diff --git a/debian/modules/http-lua/util/build.sh b/debian/modules/http-lua/util/build.sh
index e45c00a..164bf9f 100755
--- a/debian/modules/http-lua/util/build.sh
+++ b/debian/modules/http-lua/util/build.sh
@@ -23,6 +23,7 @@ force=$2
             #--with-http_spdy_module \
 
 time ngx-build $force $version \
+            --with-pcre-jit \
             --with-ipv6 \
             --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" \
             --with-http_v2_module \
@@ -35,6 +36,8 @@ time ngx-build $force $version \
             --without-mail_imap_module \
             --with-http_image_filter_module \
             --without-mail_smtp_module \
+            --with-stream \
+            --with-stream_ssl_module \
             --without-http_upstream_ip_hash_module \
             --without-http_memcached_module \
             --without-http_auth_basic_module \
@@ -50,6 +53,7 @@ time ngx-build $force $version \
                 --add-module=$root/../rds-json-nginx-module \
                 --add-module=$root/../coolkit-nginx-module \
                 --add-module=$root/../redis2-nginx-module \
+                --add-module=$root/../stream-lua-nginx-module \
                 --add-module=$root/t/data/fake-module \
                 --add-module=$root/t/data/fake-shm-module \
                 --add-module=$root/t/data/fake-delayed-load-module \
diff --git a/debian/modules/http-lua/valgrind.suppress b/debian/modules/http-lua/valgrind.suppress
index d0bcc56..7273986 100644
--- a/debian/modules/http-lua/valgrind.suppress
+++ b/debian/modules/http-lua/valgrind.suppress
@@ -1,16 +1,16 @@
 {
-<insert_a_suppression_name_here>
-Memcheck:Addr1
-fun:ngx_init_cycle
-fun:ngx_master_process_cycle
-fun:main
+   <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:Addr4
+   fun:ngx_init_cycle
+   fun:ngx_master_process_cycle
+   fun:main
 }
 {
    <insert_a_suppression_name_here>
@@ -104,11 +104,11 @@ fun:main
    fun:ngx_event_process_init
 }
 {
-    <insert_a_suppression_name_here>
-    Memcheck:Param
-    sendmsg(mmsg[0].msg_hdr)
-    fun:sendmmsg
-    fun:__libc_res_nsend
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   sendmsg(mmsg[0].msg_hdr)
+   fun:sendmmsg
+   fun:__libc_res_nsend
 }
 {
    <insert_a_suppression_name_here>
@@ -120,11 +120,11 @@ fun:main
    fun:ngx_start_cache_manager_processes
 }
 {
-    <insert_a_suppression_name_here>
-    Memcheck:Cond
-    fun:ngx_init_cycle
-    fun:ngx_master_process_cycle
-    fun:main
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:ngx_init_cycle
+   fun:ngx_master_process_cycle
+   fun:main
 }
 {
    <insert_a_suppression_name_here>
@@ -157,10 +157,36 @@ fun:main
    fun:ngx_alloc
    fun:ngx_set_environment
    fun:ngx_single_process_cycle
-   fun:main
 }
 {
    <insert_a_suppression_name_here>
    Memcheck:Cond
    obj:*
 }
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_worker_process_init
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_create_pool
+   fun:main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+}
diff --git a/debian/modules/patches/http-lua/openssl-1.1.0.patch b/debian/modules/patches/http-lua/openssl-1.1.0.patch
index 431031b..4dafce2 100644
--- a/debian/modules/patches/http-lua/openssl-1.1.0.patch
+++ b/debian/modules/patches/http-lua/openssl-1.1.0.patch
@@ -1,4 +1,4 @@
-From 525d5a550f5f256af01de1264358086a4cd1ac4a Mon Sep 17 00:00:00 2001
+From 47ab0d4eca3fa62403c798d7dfad50a5f9f7215a Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@ghedini.me>
 Date: Tue, 13 Sep 2016 22:31:32 +0100
 Subject: [PATCH 1/4] bugfix: ssl: don't use SSLv3 in tests.
@@ -11,7 +11,7 @@ tickets set ssl_session_tickets to off instead.
  2 files changed, 24 insertions(+), 26 deletions(-)
 
 diff --git a/t/142-ssl-session-store.t b/t/142-ssl-session-store.t
-index 73b6e197..260fe490 100644
+index 825d0163..cc3a664c 100644
 --- a/t/142-ssl-session-store.t
 +++ b/t/142-ssl-session-store.t
 @@ -32,7 +32,7 @@ __DATA__
@@ -23,7 +23,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -102,7 +102,7 @@ ssl_session_store_by_lua_block:1: ssl session store by lua is running!
+@@ -107,7 +107,7 @@ ssl_session_store_by_lua_block:1: ssl session store by lua is running!,
          server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -32,7 +32,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -177,7 +177,7 @@ API disabled in the context of ssl_session_store_by_lua*
+@@ -182,7 +182,7 @@ API disabled in the context of ssl_session_store_by_lua*
          server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -41,7 +41,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -267,9 +267,9 @@ my timer run!
+@@ -272,9 +272,9 @@ my timer run!
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name   test.com;
  
@@ -52,7 +52,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -335,9 +335,9 @@ API disabled in the context of ssl_session_store_by_lua*
+@@ -340,9 +340,9 @@ API disabled in the context of ssl_session_store_by_lua*
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -63,7 +63,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -407,9 +407,9 @@ ngx.exit does not yield and the error code is eaten.
+@@ -412,9 +412,9 @@ ngx.exit does not yield and the error code is eaten.
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -74,7 +74,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -480,9 +480,9 @@ ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
+@@ -485,9 +485,9 @@ ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -85,7 +85,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -548,9 +548,9 @@ should never reached here
+@@ -553,9 +553,9 @@ should never reached here
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -96,7 +96,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -621,7 +621,7 @@ get_phase: ssl_session_store
+@@ -626,7 +626,7 @@ get_phase: ssl_session_store
          }
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -105,7 +105,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -690,7 +690,7 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
+@@ -695,7 +695,7 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
          server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -114,7 +114,7 @@ index 73b6e197..260fe490 100644
  
          server_tokens off;
      }
-@@ -760,7 +760,6 @@ a.lua:1: ssl store session by lua is running!
+@@ -765,7 +765,6 @@ a.lua:1: ssl store session by lua is running!
          ssl_session_store_by_lua_block {
              print("handler in test.com")
          }
@@ -122,7 +122,7 @@ index 73b6e197..260fe490 100644
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
  
-@@ -770,7 +769,6 @@ a.lua:1: ssl store session by lua is running!
+@@ -775,7 +774,6 @@ a.lua:1: ssl store session by lua is running!
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -130,7 +130,7 @@ index 73b6e197..260fe490 100644
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
  
-@@ -836,7 +834,7 @@ qr/\[emerg\] .*? "ssl_session_store_by_lua_block" directive is not allowed here
+@@ -841,7 +839,7 @@ qr/\[emerg\] .*? "ssl_session_store_by_lua_block" directive is not allowed here
          server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -140,7 +140,7 @@ index 73b6e197..260fe490 100644
          server_tokens off;
      }
 diff --git a/t/143-ssl-session-fetch.t b/t/143-ssl-session-fetch.t
-index 701ead72..3626f0fb 100644
+index 7be180f8..4dc992d3 100644
 --- a/t/143-ssl-session-fetch.t
 +++ b/t/143-ssl-session-fetch.t
 @@ -33,7 +33,7 @@ __DATA__
@@ -152,7 +152,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -114,7 +114,7 @@ qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
+@@ -119,7 +119,7 @@ ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!,
          server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -161,7 +161,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -198,7 +198,7 @@ qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
+@@ -203,7 +203,7 @@ qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
          server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -170,7 +170,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -297,9 +297,9 @@ qr/my timer run!/s
+@@ -302,9 +302,9 @@ qr/my timer run!/s
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name   test.com;
@@ -181,7 +181,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -377,9 +377,9 @@ qr/received memc reply: OK/s
+@@ -382,9 +382,9 @@ qr/received memc reply: OK/s
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -192,7 +192,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -458,9 +458,9 @@ should never reached here
+@@ -463,9 +463,9 @@ should never reached here
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -203,7 +203,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -540,9 +540,9 @@ should never reached here
+@@ -545,9 +545,9 @@ should never reached here
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -214,7 +214,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -621,9 +621,9 @@ should never reached here
+@@ -626,9 +626,9 @@ should never reached here
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -225,7 +225,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -704,9 +704,9 @@ should never reached here
+@@ -709,9 +709,9 @@ should never reached here
      server {
          listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
          server_name test.com;
@@ -236,7 +236,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -787,7 +787,7 @@ should never reached here
+@@ -792,7 +792,7 @@ should never reached here
          server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -245,7 +245,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -872,7 +872,7 @@ qr/get_phase: ssl_session_fetch/s
+@@ -877,7 +877,7 @@ qr/get_phase: ssl_session_fetch/s
          }
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -254,7 +254,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -956,7 +956,7 @@ ssl store session by lua is running!
+@@ -961,7 +961,7 @@ ssl store session by lua is running!
          server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -263,7 +263,7 @@ index 701ead72..3626f0fb 100644
  
          server_tokens off;
      }
-@@ -1036,7 +1036,7 @@ qr/\S+:\d+: ssl fetch sess by lua is running!/s
+@@ -1041,7 +1041,7 @@ qr/\S+:\d+: ssl fetch sess by lua is running!/s
          server_name   test.com;
          ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
          ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
@@ -273,10 +273,10 @@ index 701ead72..3626f0fb 100644
          server_tokens off;
      }
 -- 
-2.14.1
+2.15.1
 
 
-From d308b44b3daf7702d9218e2a5620a89a5eca8389 Mon Sep 17 00:00:00 2001
+From 5cb24ce5eccd580d1bd6a2c44d7ea3cef5ad7740 Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@cloudflare.com>
 Date: Thu, 12 May 2016 13:12:23 +0100
 Subject: [PATCH 2/4] bugfix: ssl: do not access SSL_SESSION struct directly.
@@ -288,10 +288,10 @@ In OpenSSL 1.1.0 it was made opaque.
  2 files changed, 80 insertions(+), 83 deletions(-)
 
 diff --git a/src/ngx_http_lua_socket_tcp.c b/src/ngx_http_lua_socket_tcp.c
-index 382a94de..07164746 100644
+index f0988bc5..17d3db2e 100644
 --- a/src/ngx_http_lua_socket_tcp.c
 +++ b/src/ngx_http_lua_socket_tcp.c
-@@ -1316,9 +1316,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
+@@ -1320,9 +1320,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
                      return 2;
                  }
  
@@ -303,7 +303,7 @@ index 382a94de..07164746 100644
              }
          }
  
-@@ -1583,9 +1582,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
+@@ -1587,9 +1586,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
      } else {
          *ud = ssl_session;
  
@@ -315,7 +315,7 @@ index 382a94de..07164746 100644
  
          /* set up the __gc metamethod */
          lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
-@@ -5365,9 +5363,8 @@ ngx_http_lua_ssl_free_session(lua_State *L)
+@@ -5386,9 +5384,8 @@ ngx_http_lua_ssl_free_session(lua_State *L)
  
      psession = lua_touserdata(L, 1);
      if (psession && *psession != NULL) {
@@ -328,7 +328,7 @@ index 382a94de..07164746 100644
          ngx_ssl_free_session(*psession);
      }
 diff --git a/t/129-ssl-socket.t b/t/129-ssl-socket.t
-index 1c3f7cd0..0cd1f52f 100644
+index e7447a7c..c4bce9e0 100644
 --- a/t/129-ssl-socket.t
 +++ b/t/129-ssl-socket.t
 @@ -108,10 +108,10 @@ sent http request: 59 bytes.
@@ -714,10 +714,10 @@ index 1c3f7cd0..0cd1f52f 100644
  --- error_log
  lua ssl certificate verify error: (18: self signed certificate)
 -- 
-2.14.1
+2.15.1
 
 
-From 473c121668c658140dffdbeb70aa7df1fc48d2a7 Mon Sep 17 00:00:00 2001
+From 567bca126f4b9e71fbf9d473e85b975f190dcd3c Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@cloudflare.com>
 Date: Fri, 10 Jun 2016 13:23:21 +0100
 Subject: [PATCH 3/4] bugfix: ssl: do not access SSL struct directly for
@@ -745,10 +745,10 @@ index 31b4f243..9ec8b509 100644
          return NGX_DECLINED;
      }
 -- 
-2.14.1
+2.15.1
 
 
-From 44988918835b8b41e51e75c1618250a560bc11ca Mon Sep 17 00:00:00 2001
+From 840ad10b8447f9ea1f0ddede344916d423029e67 Mon Sep 17 00:00:00 2001
 From: Alessandro Ghedini <alessandro@ghedini.me>
 Date: Tue, 13 Sep 2016 22:19:10 +0100
 Subject: [PATCH 4/4] bugfix: ssl: make SSL session callback build with OpenSSL
@@ -761,7 +761,7 @@ Subject: [PATCH 4/4] bugfix: ssl: make SSL session callback build with OpenSSL
  3 files changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/src/ngx_http_lua_ssl_session_fetchby.c b/src/ngx_http_lua_ssl_session_fetchby.c
-index 556b7320..5289cb92 100644
+index 3a3c1f54..2c75f6a9 100644
 --- a/src/ngx_http_lua_ssl_session_fetchby.c
 +++ b/src/ngx_http_lua_ssl_session_fetchby.c
 @@ -171,8 +171,11 @@ ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -778,7 +778,7 @@ index 556b7320..5289cb92 100644
  {
      lua_State                       *L;
      ngx_int_t                        rc;
-@@ -284,7 +287,7 @@ ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
+@@ -287,7 +290,7 @@ ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
      cctx->exit_code = 1;  /* successful by default */
      cctx->connection = c;
      cctx->request = r;
@@ -805,7 +805,7 @@ index 5a6f96f5..50c6616d 100644
  
  
 diff --git a/src/ngx_http_lua_ssl_session_storeby.c b/src/ngx_http_lua_ssl_session_storeby.c
-index bae8273d..dc1fad9b 100644
+index f83e85d9..ce832ea1 100644
 --- a/src/ngx_http_lua_ssl_session_storeby.c
 +++ b/src/ngx_http_lua_ssl_session_storeby.c
 @@ -172,6 +172,8 @@ int
@@ -817,7 +817,7 @@ index bae8273d..dc1fad9b 100644
      lua_State                       *L;
      ngx_int_t                        rc;
      ngx_connection_t                *c, *fc = NULL;
-@@ -246,11 +248,13 @@ ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
+@@ -247,11 +249,13 @@ ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
          }
      }
  
@@ -834,5 +834,5 @@ index bae8273d..dc1fad9b 100644
  
      dd("setting cctx");
 -- 
-2.14.1
+2.15.1
 

From 72b4f71671c9f87f63be9db63f7f821c41aead92 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 13 Dec 2017 11:23:07 +0200
Subject: [PATCH 234/600] http-dav-ext: Upgrade to 0.1.0

Closes: #878611
---
 debian/modules/control                        |  3 +-
 debian/modules/http-dav-ext/LICENSE           | 22 ++++++++++
 debian/modules/http-dav-ext/README            | 29 -------------
 debian/modules/http-dav-ext/README.rst        | 41 +++++++++++++++++++
 debian/modules/http-dav-ext/config            | 19 ++++++---
 .../http-dav-ext/ngx_http_dav_ext_module.c    |  9 ++--
 .../patches/http-dav-ext/dynamic-module.patch | 41 -------------------
 debian/modules/patches/http-dav-ext/series    |  1 -
 8 files changed, 83 insertions(+), 82 deletions(-)
 create mode 100644 debian/modules/http-dav-ext/LICENSE
 delete mode 100644 debian/modules/http-dav-ext/README
 create mode 100644 debian/modules/http-dav-ext/README.rst
 delete mode 100644 debian/modules/patches/http-dav-ext/dynamic-module.patch
 delete mode 100644 debian/modules/patches/http-dav-ext/series

diff --git a/debian/modules/control b/debian/modules/control
index bd7cc0a..6552957 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -50,8 +50,7 @@ Patch:
 
 Module: http-dav-ext
 Homepage: https://github.com/arut/nginx-dav-ext-module
-Version: v0.0.3
-Patch: dynamic-module.patch
+Version: v0.1.0
 
 Module: http-fancyindex
 Homepage: https://github.com/aperezdc/ngx-fancyindex
diff --git a/debian/modules/http-dav-ext/LICENSE b/debian/modules/http-dav-ext/LICENSE
new file mode 100644
index 0000000..7be3135
--- /dev/null
+++ b/debian/modules/http-dav-ext/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2012-2017, Roman Arutyunyan
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/http-dav-ext/README b/debian/modules/http-dav-ext/README
deleted file mode 100644
index bc727ff..0000000
--- a/debian/modules/http-dav-ext/README
+++ /dev/null
@@ -1,29 +0,0 @@
-== nginx-dav-ext-module ==
-
-NGINX WebDAV missing commands support (PROPFIND & OPTIONS)
-
-(c) 2012 Arutyunyan Roman (arut@qip.ru)
-
-
-For full WebDAV support in NGINX you need to turn on standard NGINX 
-WebDAV module (providing partial WebDAV implementation) as well as 
-this module for missing methods
-
-./configure --with-http_dav_module --add-module=<path-to-this-module>
-
-
-
-Requirements:
-
-	libexpat-dev
-
-
-Example config:
-
-	location / {
-
-		dav_methods PUT DELETE MKCOL COPY MOVE;
-		dav_ext_methods PROPFIND OPTIONS;
-
-		root /var/root/;
-	}
diff --git a/debian/modules/http-dav-ext/README.rst b/debian/modules/http-dav-ext/README.rst
new file mode 100644
index 0000000..91c10e3
--- /dev/null
+++ b/debian/modules/http-dav-ext/README.rst
@@ -0,0 +1,41 @@
+********************
+nginx-dav-ext-module
+********************
+
+NGINX WebDAV missing commands support (PROPFIND & OPTIONS)
+
+Copyright |copy| 2012-2017 Arutyunyan Roman (arutyunyan.roman@gmail.com)
+
+.. |copy|   unicode:: U+000A9 .. COPYRIGHT SIGN
+
+For full WebDAV support in NGINX you need to enable the standard NGINX 
+WebDAV module (providing partial WebDAV implementation) as well as 
+this module for missing methods:
+
+.. code-block:: bash
+
+    $ ./configure --with-http_dav_module --add-module=/path/to/this-module
+
+The module can be built dynamically:
+
+.. code-block:: bash
+
+    $ ./configure --with-http_dav_module --add-dynamic-module=/path/to/this-module
+
+Requirements
+============
+
+``libexpat-dev``
+
+
+Example config
+==============
+
+.. code-block::
+
+	location / {
+		dav_methods PUT DELETE MKCOL COPY MOVE;
+		dav_ext_methods PROPFIND OPTIONS;
+
+		root /var/root/;
+	}
diff --git a/debian/modules/http-dav-ext/config b/debian/modules/http-dav-ext/config
index 98b2b7a..372620b 100644
--- a/debian/modules/http-dav-ext/config
+++ b/debian/modules/http-dav-ext/config
@@ -1,9 +1,16 @@
-ngx_addon_name="ngx_http_dav_ext_module"
+ngx_addon_name=ngx_http_dav_ext_module
 
-HTTP_MODULES="$HTTP_MODULES \
-		ngx_http_dav_ext_module"
+if [ -f auto/module ] ; then
 
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
-		$ngx_addon_dir/ngx_http_dav_ext_module.c"
+    ngx_module_type=HTTP
+    ngx_module_name=ngx_http_dav_ext_module
+    ngx_module_libs=-lexpat
+    ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
 
-CORE_LIBS="$CORE_LIBS -lexpat"
+    . auto/module
+
+else
+    HTTP_MODULES="$HTTP_MODULES ngx_http_dav_ext_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_dav_ext_module.c"
+    CORE_LIBS="$CORE_LIBS -lexpat"
+fi
diff --git a/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c b/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
index 73d86de..ae75fc3 100644
--- a/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
+++ b/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
@@ -1,5 +1,5 @@
 /******************************************************************************
-  Copyright (c) 2012, Roman Arutyunyan (arut@qip.ru)
+  Copyright (c) 2012-2017, Roman Arutyunyan (arutyunyan.roman@gmail.com)
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without modification, 
@@ -535,9 +535,12 @@ ngx_http_dav_ext_send_propfind(ngx_http_request_t *r)
 	u_char                    *p, *uc;
 
 	if (ngx_http_variable_unknown_header(&vv, &depth_name, 
-					&r->headers_in.headers.part, 0) == NGX_OK
-		&& vv.valid)
+					&r->headers_in.headers.part, 0) != NGX_OK)
 	{
+		return NGX_ERROR;
+	}
+
+	if (!vv.not_found) {
 		if (vv.len == sizeof("infinity") -1 
 			&& !ngx_strncasecmp(vv.data, (u_char*)"infinity", vv.len))
 		{
diff --git a/debian/modules/patches/http-dav-ext/dynamic-module.patch b/debian/modules/patches/http-dav-ext/dynamic-module.patch
deleted file mode 100644
index c865460..0000000
--- a/debian/modules/patches/http-dav-ext/dynamic-module.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0473d8d1bb63a14afe608ecf46bfc933234e3048 Mon Sep 17 00:00:00 2001
-From: Florian Kinder <florian.kinder@fankserver.com>
-Date: Fri, 28 Oct 2016 13:34:21 +0200
-Subject: [PATCH] Added dynamic module support
-Origin: other, https://github.com/Fank/nginx-dav-ext-module/pull/1
-
----
- config | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/config b/config
-index 98b2b7a..b6b65de 100644
---- a/config
-+++ b/config
-@@ -1,9 +1,21 @@
- ngx_addon_name="ngx_http_dav_ext_module"
- 
--HTTP_MODULES="$HTTP_MODULES \
--		ngx_http_dav_ext_module"
- 
--NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
--		$ngx_addon_dir/ngx_http_dav_ext_module.c"
-+if test -n "$ngx_module_link"; then
-+	ngx_module_type=HTTP
-+	ngx_module_name=ngx_http_dav_ext_module
-+	ngx_module_incs=
-+	ngx_module_deps=
-+	ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
-+	ngx_module_libs="-lexpat"
-+
-+	. auto/module
-+else
-+	CORE_LIBS="$CORE_LIBS -lexpat"
- 
--CORE_LIBS="$CORE_LIBS -lexpat"
-+	HTTP_MODULES="$HTTP_MODULES \
-+		ngx_http_dav_ext_module"
-+	
-+	NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
-+		$ngx_addon_dir/ngx_http_dav_ext_module.c"
-+fi
diff --git a/debian/modules/patches/http-dav-ext/series b/debian/modules/patches/http-dav-ext/series
deleted file mode 100644
index f9b9360..0000000
--- a/debian/modules/patches/http-dav-ext/series
+++ /dev/null
@@ -1 +0,0 @@
-dynamic-module.patch

From ee4b10edd7fc48819c2c5debcbd422af70bcd406 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 13 Dec 2017 11:23:19 +0200
Subject: [PATCH 235/600] http-fancyindex: Upgrade to 0.4.2

---
 debian/modules/control                        |  2 +-
 debian/modules/http-fancyindex/CHANGELOG.md   | 21 ++++++-
 debian/modules/http-fancyindex/README.rst     | 32 ++++++++--
 .../ngx_http_fancyindex_module.c              | 60 +++++++------------
 .../http-fancyindex/t/03-exact_size_off.test  |  8 +++
 .../t/bug61-empty-file-segfault.test          | 16 +++++
 debian/modules/http-fancyindex/t/run          |  2 +-
 debian/modules/http-fancyindex/template.h     | 25 +++-----
 debian/modules/http-fancyindex/template.html  | 25 +++-----
 9 files changed, 110 insertions(+), 81 deletions(-)
 create mode 100644 debian/modules/http-fancyindex/t/03-exact_size_off.test
 create mode 100644 debian/modules/http-fancyindex/t/bug61-empty-file-segfault.test

diff --git a/debian/modules/control b/debian/modules/control
index 6552957..a0aa9ba 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -54,7 +54,7 @@ Version: v0.1.0
 
 Module: http-fancyindex
 Homepage: https://github.com/aperezdc/ngx-fancyindex
-Version: v0.4.1
+Version: v0.4.2
 Files-Excluded: .gitignore .travis.yml
 
 Module: http-subs-filter
diff --git a/debian/modules/http-fancyindex/CHANGELOG.md b/debian/modules/http-fancyindex/CHANGELOG.md
index 9d76ae0..6acc50f 100644
--- a/debian/modules/http-fancyindex/CHANGELOG.md
+++ b/debian/modules/http-fancyindex/CHANGELOG.md
@@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.4.2] - 2017-08-19
+### Changed
+- Generated HTML from the default template is now proper HTML5, and it should
+  pass validation (#52).
+- File sizes now have decimal positions when using `fancyindex_exact_size off`.
+  (Patch by Anders Trier <<anders.trier.olesen@gmail.com>>.)
+- Multiple updates to `README.rst` (Patches by Danila Vershinin
+  <<ciapnz@gmail.com>>, Iulian Onofrei, Lilian Besson, and Nick Geoghegan
+  <<nick@nickgeoghegan.net>>.)
+
+### Fixed
+- Sorting by file size now also works correctly for directories which contain
+  files of sizes bigger than `INT_MAX`. (#74, fix suggestion by Chris Young.)
+- Custom headers which fail to declare an UTF-8 encoding no longer cause table
+  header arrows to be rendered incorrectly by browsers (#50).
+- Fix segmentation fault when opening directories with empty files (#61, patch
+  by Catgirl <<cat@wolfgirl.org>>.)
+
 ## [0.4.1] - 2016-08-18
 ### Added
 - New `fancyindex_directories_first` configuration directive (enabled by
@@ -100,7 +118,8 @@ All notable changes to this project will be documented in this file.
 - `NEWS.rst` file, to act as change log.
 
 
-[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.1...HEAD
+[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.2...HEAD
+[0.4.2]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.6...v0.4.0
 [0.3.6]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.5...v0.3.6
diff --git a/debian/modules/http-fancyindex/README.rst b/debian/modules/http-fancyindex/README.rst
index 93a8206..0e3273c 100644
--- a/debian/modules/http-fancyindex/README.rst
+++ b/debian/modules/http-fancyindex/README.rst
@@ -26,7 +26,27 @@ server written by `Igor Sysoev <http://sysoev.ru>`__.
 Requirements
 ============
 
-You will need the sources for Nginx_. Any version starting from the 0.7
+CentOS 7
+~~~~~~~~
+
+For users of the  `official stable <https://www.nginx.com/resources/wiki/start/topics/tutorials/install/>`__  Nginx repository, `extra packages repository with dynamic modules <https://www.getpagespeed.com/redhat>`__ is available and fancyindex is included.
+
+Install directly:: 
+
+    yum install https://extras.getpagespeed.com/redhat/7/x86_64/RPMS/nginx-module-fancyindex-1.12.0.0.4.1-1.el7.gps.x86_64.rpm
+
+Alternatively, add extras repository first (for future updates) and install the module::
+
+    yum install nginx-module-fancyindex
+    
+Then load the module in `/etc/nginx/nginx.conf` using
+
+   load_module "modules/ngx_http_fancyindex_module.so";
+
+Other platforms
+~~~~~~~~~~~~~~~
+
+In most other cases you will need the sources for Nginx_. Any version starting from the 0.7
 series onwards will work.  Note that the modules *might* compile with
 versions in the 0.6 series by applying ``nginx-0.6-support.patch``, but this
 is unsupported (YMMV).
@@ -58,7 +78,8 @@ Building
 
    Since version 0.4.0, the module can also be built as a
    `dynamic module <https://www.nginx.com/resources/wiki/extending/converting/>`_,
-   using ``--add-dynamic-module=…`` instead.
+   using ``--add-dynamic-module=…`` instead and ``load_module "modules/ngx_http_fancyindex_module.so";`
+   in the configuration file
 
 4. Build and install the software::
 
@@ -92,10 +113,9 @@ achieved using the module:
 * `Theme <https://github.com/TheInsomniac/Nginx-Fancyindex-Theme>`__ by
   `@TheInsomniac <https://github.com/TheInsomniac>`__. Uses custom header and
   footer.
-* `Theme <https://github.com/nwrd/Nginx-Fancyindex-Theme>`__ by
-  nwrd <https://github.com/nwrd>`__. Uses custom header and footer, the
-  header includes search field to filter by filename using JavaScript
-  (`demo <http://nwrd.sly.io/>`__).
+* `Theme <https://github.com/Naereen/Nginx-Fancyindex-Theme>`__ by
+  `Naereen <https://github.com/Naereen/>`__. Uses custom header and footer, the
+  header includes search field to filter by filename using JavaScript.
 
 
 Directives
diff --git a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
index 170167d..10331a5 100644
--- a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
+++ b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
@@ -190,6 +190,10 @@ static ngx_conf_enum_t ngx_http_fancyindex_sort_criteria[] = {
  */
 #define ngx_sizeof_ssz(_s)  (sizeof(_s) - 1)
 
+/**
+ * Compute the length of a statically allocated array
+ */
+#define DIM(x) (sizeof(x)/sizeof(*(x)))
 
 /**
  * Copy a static zero-terminated string. Useful to output template
@@ -552,16 +556,20 @@ make_content_buf(
 
     off_t        length;
     size_t       len, root, copy, allocated;
-    u_char      *filename, *last, scale;
+    int64_t      multiplier;
+    u_char      *filename, *last;
     ngx_tm_t     tm;
     ngx_array_t  entries;
     ngx_time_t  *tp;
-    ngx_uint_t   i;
-    ngx_int_t    size;
+    ngx_uint_t   i, j;
     ngx_str_t    path;
     ngx_dir_t    dir;
     ngx_buf_t   *b;
 
+    static const char    *sizes[]  = { "EiB", "PiB", "TiB", "GiB", "MiB", "KiB", "B" };
+    static const int64_t  exbibyte = 1024LL * 1024LL * 1024LL *
+                                     1024LL * 1024LL * 1024LL;
+
     /*
      * NGX_DIR_MASK_LEN is lesser than NGX_HTTP_FANCYINDEX_PREALLOCATE
      */
@@ -982,41 +990,17 @@ make_content_buf(
                 *b->last++ = '-';
             } else {
                 length = entry[i].size;
+                multiplier = exbibyte;
 
-                if (length > 1024 * 1024 * 1024 - 1) {
-                    size = (ngx_int_t) (length / (1024 * 1024 * 1024));
-                    if ((length % (1024 * 1024 * 1024))
-                                                > (1024 * 1024 * 1024 / 2 - 1))
-                    {
-                        size++;
-                    }
-                    scale = 'G';
+                for (j = 0; j < DIM(sizes) - 1 && length < multiplier; j++)
+                    multiplier /= 1024;
 
-                } else if (length > 1024 * 1024 - 1) {
-                    size = (ngx_int_t) (length / (1024 * 1024));
-                    if ((length % (1024 * 1024)) > (1024 * 1024 / 2 - 1)) {
-                        size++;
-                    }
-                    scale = 'M';
-
-                } else if (length > 9999) {
-                    size = (ngx_int_t) (length / 1024);
-                    if (length % 1024 > 511) {
-                        size++;
-                    }
-                    scale = 'K';
-
-                } else {
-                    size = (ngx_int_t) length;
-                    scale = '\0';
-                }
-
-                if (scale) {
-                    b->last = ngx_sprintf(b->last, "%6i%c", size, scale);
-
-                } else {
-                    b->last = ngx_sprintf(b->last, " %6i", size);
-                }
+                /* If we are showing the filesize in bytes, do not show a decimal */
+                if (j == DIM(sizes) - 1)
+                    b->last = ngx_sprintf(b->last, "%O %s", length, sizes[j]);
+                else
+                    b->last = ngx_sprintf(b->last, "%.1f %s", 
+                                          (float) length / multiplier, sizes[j]);
             }
         }
 
@@ -1245,7 +1229,7 @@ ngx_http_fancyindex_cmp_entries_size_desc(const void *one, const void *two)
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
     ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    return (int) (second->size - first->size);
+    return (first->size > second->size) - (first->size < second->size);
 }
 
 
@@ -1275,7 +1259,7 @@ ngx_http_fancyindex_cmp_entries_size_asc(const void *one, const void *two)
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
     ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    return (int) (first->size - second->size);
+    return (first->size > second->size) - (first->size < second->size);
 }
 
 
diff --git a/debian/modules/http-fancyindex/t/03-exact_size_off.test b/debian/modules/http-fancyindex/t/03-exact_size_off.test
new file mode 100644
index 0000000..cdc61ec
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/03-exact_size_off.test
@@ -0,0 +1,8 @@
+#! /bin/bash
+cat <<---
+We test if the output from using "fancyindex_exact_size off" looks sane
+--
+nginx_start 'fancyindex_exact_size off;'
+content=$(fetch)
+grep -e '[1-9]\.[0-9] KiB'  <<< "${content}"
+grep -E '[0-9]+ B'  <<< "${content}"
diff --git a/debian/modules/http-fancyindex/t/bug61-empty-file-segfault.test b/debian/modules/http-fancyindex/t/bug61-empty-file-segfault.test
new file mode 100644
index 0000000..d9c5a40
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/bug61-empty-file-segfault.test
@@ -0,0 +1,16 @@
+#! /bin/bash
+cat <<---
+Bug #61: Listing a directory with an empty file crashes Nginx
+https://github.com/aperezdc/ngx-fancyindex/issues/61
+--
+
+# Prepare an empty directory with an empty file
+mkdir -p "${TESTDIR}/bug61"
+touch "${TESTDIR}/bug61/bug61.txt"
+
+nginx_start 'fancyindex_exact_size off;'
+content=$(fetch /bug61/)
+test -n "${content}" || fail "Empty response"
+echo "Response:"
+echo "${content}"
+nginx_is_running || fail "Nginx died"
diff --git a/debian/modules/http-fancyindex/t/run b/debian/modules/http-fancyindex/t/run
index 2001bff..dda4c59 100755
--- a/debian/modules/http-fancyindex/t/run
+++ b/debian/modules/http-fancyindex/t/run
@@ -26,7 +26,7 @@ readonly dynamic
 declare -a t_pass=( )
 declare -a t_fail=( )
 
-for t in "$T"/*.test ; do
+for t in `ls "$T"/*.test | sort -R` ; do
 	name="t/${t##*/}"
 	name=${name%.test}
 	printf "${name} ... "
diff --git a/debian/modules/http-fancyindex/template.h b/debian/modules/http-fancyindex/template.h
index 4881ac7..e08ba01 100644
--- a/debian/modules/http-fancyindex/template.h
+++ b/debian/modules/http-fancyindex/template.h
@@ -1,12 +1,10 @@
 /* Automagically generated, do not edit! */
 static const u_char t01_head1[] = ""
-"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
-"\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\">"
-"\n"
+"<!DOCTYPE html>"
+"<html>"
 "<head>"
-"<meta name=\"viewport\" content=\"width=device-width\"/>"
-"<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/>"
+"<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">"
+"<meta name=\"viewport\" content=\"width=device-width\">"
 "<style type=\"text/css\">"
 "body,html {"
 "background:#fff;"
@@ -56,19 +54,12 @@ static const u_char t05_body2[] = ""
 "\n"
 ;
 static const u_char t06_list1[] = ""
-"<table id=\"list\" cellpadding=\"0.1em\" cellspacing=\"0\">"
-"\n"
-"<colgroup>"
-"<col width=\"55%\"/>"
-"<col width=\"20%\"/>"
-"<col width=\"25%\"/>"
-"</colgroup>"
-"\n"
+"<table id=\"list\">"
 "<thead>"
 "<tr>"
-"<th><a href=\"?C=N&O=A\">File Name</a>&nbsp;<a href=\"?C=N&O=D\">&nbsp;&#8595;&nbsp;</a></th>"
-"<th><a href=\"?C=S&O=A\">File Size</a>&nbsp;<a href=\"?C=S&O=D\">&nbsp;&#8595;&nbsp;</a></th>"
-"<th><a href=\"?C=M&O=A\">Date</a>&nbsp;<a href=\"?C=M&O=D\">&nbsp;&#8595;&nbsp;</a></th>"
+"<th style=\"width:55%\"><a href=\"?C=N&O=A\">File Name</a>&nbsp;<a href=\"?C=N&O=D\">&nbsp;&darr;&nbsp;</a></th>"
+"<th style=\"width:20%\"><a href=\"?C=S&O=A\">File Size</a>&nbsp;<a href=\"?C=S&O=D\">&nbsp;&darr;&nbsp;</a></th>"
+"<th style=\"width:25%\"><a href=\"?C=M&O=A\">Date</a>&nbsp;<a href=\"?C=M&O=D\">&nbsp;&darr;&nbsp;</a></th>"
 "</tr>"
 "</thead>"
 "\n"
diff --git a/debian/modules/http-fancyindex/template.html b/debian/modules/http-fancyindex/template.html
index bc41292..30de0a8 100644
--- a/debian/modules/http-fancyindex/template.html
+++ b/debian/modules/http-fancyindex/template.html
@@ -1,11 +1,9 @@
 <!-- var t01_head1 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
+<!DOCTYPE html>
+<html>
 	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-		<meta name="viewport" content="width=device-width"/>
+		<meta http-equiv="content-type" content="text/html; charset=utf-8">
+		<meta name="viewport" content="width=device-width">
 		<style type="text/css">
 			body,html {
 				background:#fff;
@@ -54,19 +52,12 @@
 		</h1>
 
 <!-- var t06_list1 -->
-		<table id="list" cellpadding="0.1em" cellspacing="0">
-
-			<colgroup>
-				<col width="55%"/>
-				<col width="20%"/>
-				<col width="25%"/>
-			</colgroup>
-
+		<table id="list">
 			<thead>
 				<tr>
-					<th><a href="?C=N&O=A">File Name</a>&nbsp;<a href="?C=N&O=D">&nbsp;&#8595;&nbsp;</a></th>
-					<th><a href="?C=S&O=A">File Size</a>&nbsp;<a href="?C=S&O=D">&nbsp;&#8595;&nbsp;</a></th>
-					<th><a href="?C=M&O=A">Date</a>&nbsp;<a href="?C=M&O=D">&nbsp;&#8595;&nbsp;</a></th>
+					<th style="width:55%"><a href="?C=N&O=A">File Name</a>&nbsp;<a href="?C=N&O=D">&nbsp;&darr;&nbsp;</a></th>
+					<th style="width:20%"><a href="?C=S&O=A">File Size</a>&nbsp;<a href="?C=S&O=D">&nbsp;&darr;&nbsp;</a></th>
+					<th style="width:25%"><a href="?C=M&O=A">Date</a>&nbsp;<a href="?C=M&O=D">&nbsp;&darr;&nbsp;</a></th>
 				</tr>
 			</thead>
 

From 69c46613962a510551d76c285a99cc0d43dab5d9 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 13 Dec 2017 11:23:29 +0200
Subject: [PATCH 236/600] rtmp: Upgrade to 1.2.1

Closes: #880718
---
 debian/modules/control                        |  2 +-
 .../modules/rtmp/dash/ngx_rtmp_dash_module.c  | 61 +++++++++----------
 debian/modules/rtmp/hls/ngx_rtmp_hls_module.c |  1 +
 debian/modules/rtmp/ngx_rtmp.h                |  2 +
 debian/modules/rtmp/ngx_rtmp_access_module.c  |  2 +-
 debian/modules/rtmp/ngx_rtmp_amf.c            |  3 +
 debian/modules/rtmp/ngx_rtmp_eval.c           |  1 +
 debian/modules/rtmp/ngx_rtmp_handler.c        |  6 ++
 debian/modules/rtmp/ngx_rtmp_init.c           |  2 +
 debian/modules/rtmp/ngx_rtmp_notify_module.c  |  2 +
 10 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index a0aa9ba..103555c 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -65,5 +65,5 @@ Patch: dynamic-module.patch
 Module: rtmp
 Homepage: https://github.com/arut/nginx-rtmp-module
 Files-Excluded: test
-Version: v1.1.11
+Version: v1.2.1
 
diff --git a/debian/modules/rtmp/dash/ngx_rtmp_dash_module.c b/debian/modules/rtmp/dash/ngx_rtmp_dash_module.c
index 2ab294e..81bc343 100644
--- a/debian/modules/rtmp/dash/ngx_rtmp_dash_module.c
+++ b/debian/modules/rtmp/dash/ngx_rtmp_dash_module.c
@@ -52,7 +52,7 @@ typedef struct {
     ngx_str_t                           playlist_bak;
     ngx_str_t                           name;
     ngx_str_t                           stream;
-    ngx_time_t                          start_time;
+    time_t                              start_time;
 
     ngx_uint_t                          nfrags;
     ngx_uint_t                          frag;
@@ -228,8 +228,8 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
     ngx_rtmp_dash_app_conf_t  *dacf;
 
     static u_char              buffer[NGX_RTMP_DASH_BUFSIZE];
-    static u_char              start_time[sizeof("1970-09-28T12:00:00+06:00")];
-    static u_char              end_time[sizeof("1970-09-28T12:00:00+06:00")];
+    static u_char              start_time[sizeof("1970-09-28T12:00:00Z")];
+    static u_char              pub_time[sizeof("1970-09-28T12:00:00Z")];
 
     dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
     ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
@@ -252,18 +252,16 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
         return NGX_ERROR;
     }
 
-
 #define NGX_RTMP_DASH_MANIFEST_HEADER                                          \
     "<?xml version=\"1.0\"?>\n"                                                \
     "<MPD\n"                                                                   \
     "    type=\"dynamic\"\n"                                                   \
     "    xmlns=\"urn:mpeg:dash:schema:mpd:2011\"\n"                            \
     "    availabilityStartTime=\"%s\"\n"                                       \
-    "    availabilityEndTime=\"%s\"\n"                                         \
+    "    publishTime=\"%s\"\n"                                                 \
     "    minimumUpdatePeriod=\"PT%uiS\"\n"                                     \
     "    minBufferTime=\"PT%uiS\"\n"                                           \
-    "    timeShiftBufferDepth=\"PT0H0M0.00S\"\n"                               \
-    "    suggestedPresentationDelay=\"PT%uiS\"\n"                              \
+    "    timeShiftBufferDepth=\"PT%uiS\"\n"                                    \
     "    profiles=\"urn:hbbtv:dash:profile:isoff-live:2012,"                   \
                    "urn:mpeg:dash:profile:isoff-live:2011\"\n"                 \
     "    xmlns:xsi=\"http://www.w3.org/2011/XMLSchema-instance\"\n"            \
@@ -285,11 +283,9 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
     "          width=\"%ui\"\n"                                                \
     "          height=\"%ui\"\n"                                               \
     "          frameRate=\"%ui\"\n"                                            \
-    "          sar=\"1:1\"\n"                                                  \
     "          startWithSAP=\"1\"\n"                                           \
     "          bandwidth=\"%ui\">\n"                                           \
     "        <SegmentTemplate\n"                                               \
-    "            presentationTimeOffset=\"0\"\n"                               \
     "            timescale=\"1000\"\n"                                         \
     "            media=\"%V%s$Time$.m4v\"\n"                                   \
     "            initialization=\"%V%sinit.m4v\">\n"                           \
@@ -323,7 +319,6 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
     "          startWithSAP=\"1\"\n"                                           \
     "          bandwidth=\"%ui\">\n"                                           \
     "        <SegmentTemplate\n"                                               \
-    "            presentationTimeOffset=\"0\"\n"                               \
     "            timescale=\"1000\"\n"                                         \
     "            media=\"%V%s$Time$.m4a\"\n"                                   \
     "            initialization=\"%V%sinit.m4a\">\n"                           \
@@ -341,38 +336,33 @@ ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
     "  </Period>\n"                                                            \
     "</MPD>\n"
 
-    ngx_libc_localtime(ctx->start_time.sec +
-                       ngx_rtmp_dash_get_frag(s, 0)->timestamp / 1000, &tm);
+    ngx_libc_gmtime(ctx->start_time, &tm);
 
-    *ngx_sprintf(start_time, "%4d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
-                 tm.tm_year + 1900, tm.tm_mon + 1,
-                 tm.tm_mday, tm.tm_hour,
-                 tm.tm_min, tm.tm_sec,
-                 ctx->start_time.gmtoff < 0 ? '-' : '+',
-                 ngx_abs(ctx->start_time.gmtoff / 60),
-                 ngx_abs(ctx->start_time.gmtoff % 60)) = 0;
+    ngx_sprintf(start_time, "%4d-%02d-%02dT%02d:%02d:%02dZ%Z",
+                tm.tm_year + 1900, tm.tm_mon + 1,
+                tm.tm_mday, tm.tm_hour,
+                tm.tm_min, tm.tm_sec);
 
-    ngx_libc_localtime(ctx->start_time.sec +
-                       (ngx_rtmp_dash_get_frag(s, ctx->nfrags - 1)->timestamp +
-                        ngx_rtmp_dash_get_frag(s, ctx->nfrags - 1)->duration) /
-                       1000, &tm);
+    ngx_libc_gmtime(ngx_time(), &tm);
 
-    *ngx_sprintf(end_time, "%4d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
-                 tm.tm_year + 1900, tm.tm_mon + 1,
-                 tm.tm_mday, tm.tm_hour,
-                 tm.tm_min, tm.tm_sec,
-                 ctx->start_time.gmtoff < 0 ? '-' : '+',
-                 ngx_abs(ctx->start_time.gmtoff / 60),
-                 ngx_abs(ctx->start_time.gmtoff % 60)) = 0;
+    ngx_sprintf(pub_time, "%4d-%02d-%02dT%02d:%02d:%02dZ%Z",
+                tm.tm_year + 1900, tm.tm_mon + 1,
+                tm.tm_mday, tm.tm_hour,
+                tm.tm_min, tm.tm_sec);
 
     last = buffer + sizeof(buffer);
 
     p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_HEADER,
                      start_time,
-                     end_time,
+                     pub_time,
                      (ngx_uint_t) (dacf->fraglen / 1000),
                      (ngx_uint_t) (dacf->fraglen / 1000),
-                     (ngx_uint_t) (dacf->fraglen / 500));
+                     (ngx_uint_t) (dacf->fraglen / 250 + 1));
+
+    /*
+     * timeShiftBufferDepth formula:
+     *     2 * minBufferTime + max_fragment_length + 1
+     */
 
     n = ngx_write_fd(fd, buffer, p - buffer);
 
@@ -952,7 +942,7 @@ ngx_rtmp_dash_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
                    "dash: playlist='%V' playlist_bak='%V' stream_pattern='%V'",
                    &ctx->playlist, &ctx->playlist_bak, &ctx->stream);
 
-    ctx->start_time = *ngx_cached_time;
+    ctx->start_time = ngx_time();
 
     if (ngx_rtmp_dash_ensure_directory(s) != NGX_OK) {
         return NGX_ERROR;
@@ -1008,6 +998,11 @@ ngx_rtmp_dash_update_fragments(ngx_rtmp_session_t *s, ngx_int_t boundary,
         f->duration = timestamp - f->timestamp;
         hit = (f->duration >= dacf->fraglen);
 
+        /* keep fragment lengths within 2x factor for dash.js  */
+        if (f->duration >= dacf->fraglen * 2) {
+            boundary = 1;
+        }
+
     } else {
 
         /* sometimes clients generate slightly unordered frames */
diff --git a/debian/modules/rtmp/hls/ngx_rtmp_hls_module.c b/debian/modules/rtmp/hls/ngx_rtmp_hls_module.c
index 9f6779c..25166cb 100644
--- a/debian/modules/rtmp/hls/ngx_rtmp_hls_module.c
+++ b/debian/modules/rtmp/hls/ngx_rtmp_hls_module.c
@@ -1951,6 +1951,7 @@ ngx_rtmp_hls_video(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
                         ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
                                       "hls: error appending AUD NAL");
                     }
+                    /* fall through */
                 case 9:
                     aud_sent = 1;
                     break;
diff --git a/debian/modules/rtmp/ngx_rtmp.h b/debian/modules/rtmp/ngx_rtmp.h
index e6c34d9..cbe6a93 100644
--- a/debian/modules/rtmp/ngx_rtmp.h
+++ b/debian/modules/rtmp/ngx_rtmp.h
@@ -135,6 +135,8 @@ typedef struct {
 #define NGX_RTMP_MSG_AGGREGATE          22
 #define NGX_RTMP_MSG_MAX                22
 
+#define NGX_RTMP_MAX_CHUNK_SIZE         10485760
+
 #define NGX_RTMP_CONNECT                NGX_RTMP_MSG_MAX + 1
 #define NGX_RTMP_DISCONNECT             NGX_RTMP_MSG_MAX + 2
 #define NGX_RTMP_HANDSHAKE_DONE         NGX_RTMP_MSG_MAX + 3
diff --git a/debian/modules/rtmp/ngx_rtmp_access_module.c b/debian/modules/rtmp/ngx_rtmp_access_module.c
index 06d3bc2..c4dbb19 100644
--- a/debian/modules/rtmp/ngx_rtmp_access_module.c
+++ b/debian/modules/rtmp/ngx_rtmp_access_module.c
@@ -410,8 +410,8 @@ ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             break;
         }
 
-        /* "all" passes through */
 #endif
+        /* fall through */
 
     default: /* AF_INET */
 
diff --git a/debian/modules/rtmp/ngx_rtmp_amf.c b/debian/modules/rtmp/ngx_rtmp_amf.c
index f133d0e..b20989c 100644
--- a/debian/modules/rtmp/ngx_rtmp_amf.c
+++ b/debian/modules/rtmp/ngx_rtmp_amf.c
@@ -331,6 +331,7 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
                     if (elts->type & NGX_RTMP_AMF_OPTIONAL) {
                         return NGX_OK;
                     }
+                    /* fall through */
                 case NGX_ERROR:
                     return NGX_ERROR;
             }
@@ -398,6 +399,7 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
                 if (ngx_rtmp_amf_get(ctx, &max_index, 4) != NGX_OK) {
                     return NGX_ERROR;
                 }
+                /* fall through */
 
             case NGX_RTMP_AMF_OBJECT:
                 if (ngx_rtmp_amf_read_object(ctx, data,
@@ -592,6 +594,7 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *ctx,
                 if (ngx_rtmp_amf_put(ctx, &max_index, 4) != NGX_OK) {
                     return NGX_ERROR;
                 }
+                /* fall through */
 
             case NGX_RTMP_AMF_OBJECT:
                 type8 = NGX_RTMP_AMF_END;
diff --git a/debian/modules/rtmp/ngx_rtmp_eval.c b/debian/modules/rtmp/ngx_rtmp_eval.c
index 24e1f80..1e5195a 100644
--- a/debian/modules/rtmp/ngx_rtmp_eval.c
+++ b/debian/modules/rtmp/ngx_rtmp_eval.c
@@ -154,6 +154,7 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e, ngx_str_t *out,
 
                 name.len = p - name.data;
                 ngx_rtmp_eval_append_var(ctx, &b, e, &name, log);
+                /* fall through */
 
             case NORMAL:
                 switch (c) {
diff --git a/debian/modules/rtmp/ngx_rtmp_handler.c b/debian/modules/rtmp/ngx_rtmp_handler.c
index ac78a6f..17eadee 100644
--- a/debian/modules/rtmp/ngx_rtmp_handler.c
+++ b/debian/modules/rtmp/ngx_rtmp_handler.c
@@ -821,6 +821,12 @@ ngx_rtmp_set_chunk_size(ngx_rtmp_session_t *s, ngx_uint_t size)
     ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
         "setting chunk_size=%ui", size);
 
+    if (size > NGX_RTMP_MAX_CHUNK_SIZE) {
+        ngx_log_error(NGX_LOG_ALERT, s->connection->log, 0,
+                      "too big RTMP chunk size:%ui", size);
+        return NGX_ERROR;
+    }
+
     cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
 
     s->in_old_pool = s->in_pool;
diff --git a/debian/modules/rtmp/ngx_rtmp_init.c b/debian/modules/rtmp/ngx_rtmp_init.c
index 97c7e9a..3f54169 100644
--- a/debian/modules/rtmp/ngx_rtmp_init.c
+++ b/debian/modules/rtmp/ngx_rtmp_init.c
@@ -79,6 +79,7 @@ ngx_rtmp_init_connection(ngx_connection_t *c)
 
         case AF_UNIX:
             unix_socket = 1;
+            /* fall through */
 
         default: /* AF_INET */
             sin = (struct sockaddr_in *) sa;
@@ -110,6 +111,7 @@ ngx_rtmp_init_connection(ngx_connection_t *c)
 
         case AF_UNIX:
             unix_socket = 1;
+            /* fall through */
 
         default: /* AF_INET */
             addr = port->addrs;
diff --git a/debian/modules/rtmp/ngx_rtmp_notify_module.c b/debian/modules/rtmp/ngx_rtmp_notify_module.c
index 2fcfffb..dd65e49 100644
--- a/debian/modules/rtmp/ngx_rtmp_notify_module.c
+++ b/debian/modules/rtmp/ngx_rtmp_notify_module.c
@@ -892,6 +892,7 @@ ngx_rtmp_notify_parse_http_header(ngx_rtmp_session_t *s,
 
                     n = 0;
                     state = parse_name;
+                    /* fall through */
 
                 case parse_name:
                     switch (c) {
@@ -919,6 +920,7 @@ ngx_rtmp_notify_parse_http_header(ngx_rtmp_session_t *s,
                         break;
                     }
                     state = parse_value;
+                    /* fall through */
 
                 case parse_value:
                     if (c == '\n') {

From f81b4fb99a32e4409188ba8f87da45c101f50003 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 13 Dec 2017 11:04:01 +0200
Subject: [PATCH 237/600] nchan: drop hiredis source code

We already build against Debian's libhiredis-dev, so there
is no need to ship its source.

Gbp-Dch: ignore
---
 debian/copyright                              |    7 -
 debian/modules/control                        |    1 +
 debian/modules/nchan/src/hiredis/.gitignore   |    7 -
 debian/modules/nchan/src/hiredis/.travis.yml  |   24 -
 debian/modules/nchan/src/hiredis/CHANGELOG.md |  110 --
 debian/modules/nchan/src/hiredis/COPYING      |   29 -
 debian/modules/nchan/src/hiredis/Makefile     |  217 ----
 debian/modules/nchan/src/hiredis/README.md    |  392 ------
 .../modules/nchan/src/hiredis/adapters/ae.h   |  127 --
 .../nchan/src/hiredis/adapters/libev.h        |  147 ---
 .../nchan/src/hiredis/adapters/libevent.h     |  108 --
 .../nchan/src/hiredis/adapters/libuv.h        |  121 --
 debian/modules/nchan/src/hiredis/async.c      |  687 -----------
 debian/modules/nchan/src/hiredis/async.h      |  129 --
 debian/modules/nchan/src/hiredis/dict.c       |  338 -----
 debian/modules/nchan/src/hiredis/dict.h       |  126 --
 .../nchan/src/hiredis/examples/example-ae.c   |   62 -
 .../src/hiredis/examples/example-libev.c      |   52 -
 .../src/hiredis/examples/example-libevent.c   |   53 -
 .../src/hiredis/examples/example-libuv.c      |   53 -
 .../nchan/src/hiredis/examples/example.c      |   78 --
 debian/modules/nchan/src/hiredis/fmacros.h    |   21 -
 debian/modules/nchan/src/hiredis/hiredis.c    | 1021 ---------------
 debian/modules/nchan/src/hiredis/hiredis.h    |  223 ----
 debian/modules/nchan/src/hiredis/net.c        |  458 -------
 debian/modules/nchan/src/hiredis/net.h        |   53 -
 debian/modules/nchan/src/hiredis/read.c       |  525 --------
 debian/modules/nchan/src/hiredis/read.h       |  116 --
 debian/modules/nchan/src/hiredis/sds.c        | 1095 -----------------
 debian/modules/nchan/src/hiredis/sds.h        |  105 --
 debian/modules/nchan/src/hiredis/test.c       |  807 ------------
 debian/modules/nchan/src/hiredis/win32.h      |   42 -
 32 files changed, 1 insertion(+), 7333 deletions(-)
 delete mode 100644 debian/modules/nchan/src/hiredis/.gitignore
 delete mode 100644 debian/modules/nchan/src/hiredis/.travis.yml
 delete mode 100644 debian/modules/nchan/src/hiredis/CHANGELOG.md
 delete mode 100644 debian/modules/nchan/src/hiredis/COPYING
 delete mode 100644 debian/modules/nchan/src/hiredis/Makefile
 delete mode 100644 debian/modules/nchan/src/hiredis/README.md
 delete mode 100644 debian/modules/nchan/src/hiredis/adapters/ae.h
 delete mode 100644 debian/modules/nchan/src/hiredis/adapters/libev.h
 delete mode 100644 debian/modules/nchan/src/hiredis/adapters/libevent.h
 delete mode 100644 debian/modules/nchan/src/hiredis/adapters/libuv.h
 delete mode 100644 debian/modules/nchan/src/hiredis/async.c
 delete mode 100644 debian/modules/nchan/src/hiredis/async.h
 delete mode 100644 debian/modules/nchan/src/hiredis/dict.c
 delete mode 100644 debian/modules/nchan/src/hiredis/dict.h
 delete mode 100644 debian/modules/nchan/src/hiredis/examples/example-ae.c
 delete mode 100644 debian/modules/nchan/src/hiredis/examples/example-libev.c
 delete mode 100644 debian/modules/nchan/src/hiredis/examples/example-libevent.c
 delete mode 100644 debian/modules/nchan/src/hiredis/examples/example-libuv.c
 delete mode 100644 debian/modules/nchan/src/hiredis/examples/example.c
 delete mode 100644 debian/modules/nchan/src/hiredis/fmacros.h
 delete mode 100644 debian/modules/nchan/src/hiredis/hiredis.c
 delete mode 100644 debian/modules/nchan/src/hiredis/hiredis.h
 delete mode 100644 debian/modules/nchan/src/hiredis/net.c
 delete mode 100644 debian/modules/nchan/src/hiredis/net.h
 delete mode 100644 debian/modules/nchan/src/hiredis/read.c
 delete mode 100644 debian/modules/nchan/src/hiredis/read.h
 delete mode 100644 debian/modules/nchan/src/hiredis/sds.c
 delete mode 100644 debian/modules/nchan/src/hiredis/sds.h
 delete mode 100644 debian/modules/nchan/src/hiredis/test.c
 delete mode 100644 debian/modules/nchan/src/hiredis/win32.h

diff --git a/debian/copyright b/debian/copyright
index 7bba41c..722b31b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -78,13 +78,6 @@ Files: debian/modules/nchan/src/store/redis/cmp.*
 Copyright: 2015 Charles Gunyon
 License: MIT
 
-Files: debian/modules/nchan/src/hiredis/*
-Copyright: 2009-2011, Salvatore Sanfilippo
-           2010-2011, Pieter Noordhuis
-                      Matt Stancliff
-                      Jan-Erik Rediger
-License: BSD-3-clause
-
 Files: debian/modules/http-uploadprogress/*
 Copyright: Brice Figureau
            2002-2007, Igor Sysoev
diff --git a/debian/modules/control b/debian/modules/control
index 103555c..e9a8907 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -35,6 +35,7 @@ Patch:
 Module: nchan
 Homepage: https://github.com/slact/nchan
 Version: v1.0.8
+Files-Excluded: dev nchan_logo.png NchanSubscriber.js src/hiredis
 
 Module: http-uploadprogress
 Homepage: https://github.com/masterzen/nginx-upload-progress-module
diff --git a/debian/modules/nchan/src/hiredis/.gitignore b/debian/modules/nchan/src/hiredis/.gitignore
deleted file mode 100644
index c44b5c5..0000000
--- a/debian/modules/nchan/src/hiredis/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/hiredis-test
-/examples/hiredis-example*
-/*.o
-/*.so
-/*.dylib
-/*.a
-/*.pc
diff --git a/debian/modules/nchan/src/hiredis/.travis.yml b/debian/modules/nchan/src/hiredis/.travis.yml
deleted file mode 100644
index 1e1ce30..0000000
--- a/debian/modules/nchan/src/hiredis/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-language: c
-sudo: false
-compiler:
-  - gcc
-  - clang
-
-addons:
-  apt:
-    packages:
-    - libc6-dbg
-    - libc6-dev
-    - libc6:i386
-    - libc6-dev-i386
-    - libc6-dbg:i386
-    - gcc-multilib
-    - valgrind
-
-env:
-    - CFLAGS="-Werror"
-    - PRE="valgrind --track-origins=yes --leak-check=full"
-    - TARGET="32bit" TARGET_VARS="32bit-vars" CFLAGS="-Werror"
-    - TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
-
-script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE" && make $TARGET_VARS hiredis-example
diff --git a/debian/modules/nchan/src/hiredis/CHANGELOG.md b/debian/modules/nchan/src/hiredis/CHANGELOG.md
deleted file mode 100644
index a5015c5..0000000
--- a/debian/modules/nchan/src/hiredis/CHANGELOG.md
+++ /dev/null
@@ -1,110 +0,0 @@
-### 0.13.3 (2015-09-16)
-
-* Revert "Clear `REDIS_CONNECTED` flag when connection is closed".
-* Make tests pass on FreeBSD (Thanks, Giacomo Olgeni)
-
-
-If the `REDIS_CONNECTED` flag is cleared,
-the async onDisconnect callback function will never be called.
-This causes problems as the disconnect is never reported back to the user.
-
-### 0.13.2 (2015-08-25)
-
-* Prevent crash on pending replies in async code (Thanks, @switch-st)
-* Clear `REDIS_CONNECTED` flag when connection is closed (Thanks, Jerry Jacobs)
-* Add MacOS X addapter (Thanks, @dizzus)
-* Add Qt adapter (Thanks, Pietro Cerutti)
-* Add Ivykis adapter (Thanks, Gergely Nagy)
-
-All adapters are provided as is and are only tested where possible.
-
-### 0.13.1 (2015-05-03)
-
-This is a bug fix release.
-The new `reconnect` method introduced new struct members, which clashed with pre-defined names in pre-C99 code.
-Another commit forced C99 compilation just to make it work, but of course this is not desirable for outside projects.
-Other non-C99 code can now use hiredis as usual again.
-Sorry for the inconvenience.
-
-* Fix memory leak in async reply handling (Salvatore Sanfilippo)
-* Rename struct member to avoid name clash with pre-c99 code (Alex Balashov, ncopa)
-
-### 0.13.0 (2015-04-16)
-
-This release adds a minimal Windows compatibility layer.
-The parser, standalone since v0.12.0, can now be compiled on Windows
-(and thus used in other client libraries as well)
-
-* Windows compatibility layer for parser code (tzickel)
-* Properly escape data printed to PKGCONF file (Dan Skorupski)
-* Fix tests when assert() undefined (Keith Bennett, Matt Stancliff)
-* Implement a reconnect method for the client context, this changes the structure of `redisContext` (Aaron Bedra)
-
-### 0.12.1 (2015-01-26)
-
-* Fix `make install`: DESTDIR support, install all required files, install PKGCONF in proper location
-* Fix `make test` as 32 bit build on 64 bit platform
-
-### 0.12.0 (2015-01-22)
-
-* Add optional KeepAlive support
-
-* Try again on EINTR errors
-
-* Add libuv adapter
-
-* Add IPv6 support
-
-* Remove possiblity of multiple close on same fd
-
-* Add ability to bind source address on connect
-
-* Add redisConnectFd() and redisFreeKeepFd()
-
-* Fix getaddrinfo() memory leak
-
-* Free string if it is unused (fixes memory leak)
-
-* Improve redisAppendCommandArgv performance 2.5x
-
-* Add support for SO_REUSEADDR
-
-* Fix redisvFormatCommand format parsing
-
-* Add GLib 2.0 adapter
-
-* Refactor reading code into read.c
-
-* Fix errno error buffers to not clobber errors
-
-* Generate pkgconf during build
-
-* Silence _BSD_SOURCE warnings
-
-* Improve digit counting for multibulk creation
-
-
-### 0.11.0
-
-* Increase the maximum multi-bulk reply depth to 7.
-
-* Increase the read buffer size from 2k to 16k.
-
-* Use poll(2) instead of select(2) to support large fds (>= 1024).
-
-### 0.10.1
-
-* Makefile overhaul. Important to check out if you override one or more
-  variables using environment variables or via arguments to the "make" tool.
-
-* Issue #45: Fix potential memory leak for a multi bulk reply with 0 elements
-  being created by the default reply object functions.
-
-* Issue #43: Don't crash in an asynchronous context when Redis returns an error
-  reply after the connection has been made (this happens when the maximum
-  number of connections is reached).
-
-### 0.10.0
-
-* See commit log.
-
diff --git a/debian/modules/nchan/src/hiredis/COPYING b/debian/modules/nchan/src/hiredis/COPYING
deleted file mode 100644
index a5fc973..0000000
--- a/debian/modules/nchan/src/hiredis/COPYING
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
-Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of Redis nor the names of its contributors may be used
-  to endorse or promote products derived from this software without specific
-  prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/nchan/src/hiredis/Makefile b/debian/modules/nchan/src/hiredis/Makefile
deleted file mode 100644
index cff2a84..0000000
--- a/debian/modules/nchan/src/hiredis/Makefile
+++ /dev/null
@@ -1,217 +0,0 @@
-# Hiredis Makefile
-# Copyright (C) 2010-2011 Salvatore Sanfilippo <antirez at gmail dot com>
-# Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
-# This file is released under the BSD license, see the COPYING file
-
-OBJ=net.o hiredis.o sds.o async.o read.o
-EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib
-TESTS=hiredis-test
-LIBNAME=libhiredis
-PKGCONFNAME=hiredis.pc
-
-HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}')
-HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}')
-HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | awk '{print $$3}')
-HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
-
-# Installation related variables and target
-PREFIX?=/usr/local
-INCLUDE_PATH?=include/hiredis
-LIBRARY_PATH?=lib
-PKGCONF_PATH?=pkgconfig
-INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
-INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
-INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
-
-# redis-server configuration used for testing
-REDIS_PORT=56379
-REDIS_SERVER=redis-server
-define REDIS_TEST_CONFIG
-	daemonize yes
-	pidfile /tmp/hiredis-test-redis.pid
-	port $(REDIS_PORT)
-	bind 127.0.0.1
-	unixsocket /tmp/hiredis-test-redis.sock
-endef
-export REDIS_TEST_CONFIG
-
-# Fallback to gcc when $CC is not in $PATH.
-CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
-CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
-OPTIMIZATION?=-O3
-WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
-DEBUG?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
-REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
-
-DYLIBSUFFIX=so
-STLIBSUFFIX=a
-DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
-DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
-DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
-DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
-STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
-STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
-
-# Platform-specific overrides
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
-ifeq ($(uname_S),SunOS)
-  REAL_LDFLAGS+= -ldl -lnsl -lsocket
-  DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-  INSTALL= cp -r
-endif
-ifeq ($(uname_S),Darwin)
-  DYLIBSUFFIX=dylib
-  DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
-  DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
-endif
-
-all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
-
-# Deps (use make dep to generate this)
-async.o: async.c fmacros.h async.h hiredis.h read.h sds.h net.h dict.c dict.h
-dict.o: dict.c fmacros.h dict.h
-hiredis.o: hiredis.c fmacros.h hiredis.h read.h sds.h net.h
-net.o: net.c fmacros.h net.h hiredis.h read.h sds.h
-read.o: read.c fmacros.h read.h sds.h
-sds.o: sds.c sds.h
-test.o: test.c fmacros.h hiredis.h read.h sds.h
-
-$(DYLIBNAME): $(OBJ)
-	$(DYLIB_MAKE_CMD) $(OBJ)
-
-$(STLIBNAME): $(OBJ)
-	$(STLIB_MAKE_CMD) $(OBJ)
-
-dynamic: $(DYLIBNAME)
-static: $(STLIBNAME)
-
-# Binaries:
-hiredis-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -levent $(STLIBNAME)
-
-hiredis-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -lev $(STLIBNAME)
-
-hiredis-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) $(shell pkg-config --cflags --libs glib-2.0) -I. $< $(STLIBNAME)
-
-hiredis-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -livykis $(STLIBNAME)
-
-hiredis-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME)
-
-ifndef AE_DIR
-hiredis-example-ae:
-	@echo "Please specify AE_DIR (e.g. <redis repository>/src)"
-	@false
-else
-hiredis-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(AE_DIR) $< $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o $(AE_DIR)/../deps/jemalloc/lib/libjemalloc.a -pthread $(STLIBNAME)
-endif
-
-ifndef LIBUV_DIR
-hiredis-example-libuv:
-	@echo "Please specify LIBUV_DIR (e.g. ../libuv/)"
-	@false
-else
-hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME)
-endif
-
-ifeq ($(and $(QT_MOC),$(QT_INCLUDE_DIR),$(QT_LIBRARY_DIR)),)
-hiredis-example-qt:
-	@echo "Please specify QT_MOC, QT_INCLUDE_DIR AND QT_LIBRARY_DIR"
-	@false
-else
-hiredis-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME)
-	$(QT_MOC) adapters/qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
-	    $(CXX) -x c++ -o qt-adapter-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
-	$(QT_MOC) examples/example-qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
-	    $(CXX) -x c++ -o qt-example-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
-	$(CXX) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore -L$(QT_LIBRARY_DIR) qt-adapter-moc.o qt-example-moc.o $< -pthread $(STLIBNAME) -lQtCore
-endif
-
-hiredis-example: examples/example.c $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< $(STLIBNAME)
-
-examples: $(EXAMPLES)
-
-hiredis-test: test.o $(STLIBNAME)
-
-hiredis-%: %.o $(STLIBNAME)
-	$(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
-
-test: hiredis-test
-	./hiredis-test
-
-check: hiredis-test
-	@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
-	$(PRE) ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
-			( kill `cat /tmp/hiredis-test-redis.pid` && false )
-	kill `cat /tmp/hiredis-test-redis.pid`
-
-.c.o:
-	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
-
-clean:
-	rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-
-dep:
-	$(CC) -MM *.c
-
-ifeq ($(uname_S),SunOS)
-  INSTALL?= cp -r
-endif
-
-INSTALL?= cp -a
-
-$(PKGCONFNAME): hiredis.h
-	@echo "Generating $@ for pkgconfig..."
-	@echo prefix=$(PREFIX) > $@
-	@echo exec_prefix=\$${prefix} >> $@
-	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
-	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
-	@echo >> $@
-	@echo Name: hiredis >> $@
-	@echo Description: Minimalistic C client library for Redis. >> $@
-	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
-	@echo Libs: -L\$${libdir} -lhiredis >> $@
-	@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
-
-install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
-	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-	$(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
-	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
-	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
-	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-	mkdir -p $(INSTALL_PKGCONF_PATH)
-	$(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
-
-32bit:
-	@echo ""
-	@echo "WARNING: if this fails under Linux you probably need to install libc6-dev-i386"
-	@echo ""
-	$(MAKE) CFLAGS="-m32" LDFLAGS="-m32"
-
-32bit-vars:
-	$(eval CFLAGS=-m32)
-	$(eval LDFLAGS=-m32)
-
-gprof:
-	$(MAKE) CFLAGS="-pg" LDFLAGS="-pg"
-
-gcov:
-	$(MAKE) CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs"
-
-coverage: gcov
-	make check
-	mkdir -p tmp/lcov
-	lcov -d . -c -o tmp/lcov/hiredis.info
-	genhtml --legend -o tmp/lcov/report tmp/lcov/hiredis.info
-
-noopt:
-	$(MAKE) OPTIMIZATION=""
-
-.PHONY: all test check clean dep install 32bit 32bit-vars gprof gcov noopt
diff --git a/debian/modules/nchan/src/hiredis/README.md b/debian/modules/nchan/src/hiredis/README.md
deleted file mode 100644
index 4f1a58d..0000000
--- a/debian/modules/nchan/src/hiredis/README.md
+++ /dev/null
@@ -1,392 +0,0 @@
-[![Build Status](https://travis-ci.org/redis/hiredis.png)](https://travis-ci.org/redis/hiredis)
-
-# HIREDIS
-
-Hiredis is a minimalistic C client library for the [Redis](http://redis.io/) database.
-
-It is minimalistic because it just adds minimal support for the protocol, but
-at the same time it uses a high level printf-alike API in order to make it
-much higher level than otherwise suggested by its minimal code base and the
-lack of explicit bindings for every Redis command.
-
-Apart from supporting sending commands and receiving replies, it comes with
-a reply parser that is decoupled from the I/O layer. It
-is a stream parser designed for easy reusability, which can for instance be used
-in higher level language bindings for efficient reply parsing.
-
-Hiredis only supports the binary-safe Redis protocol, so you can use it with any
-Redis version >= 1.2.0.
-
-The library comes with multiple APIs. There is the
-*synchronous API*, the *asynchronous API* and the *reply parsing API*.
-
-## UPGRADING
-
-Version 0.9.0 is a major overhaul of hiredis in every aspect. However, upgrading existing
-code using hiredis should not be a big pain. The key thing to keep in mind when
-upgrading is that hiredis >= 0.9.0 uses a `redisContext*` to keep state, in contrast to
-the stateless 0.0.1 that only has a file descriptor to work with.
-
-## Synchronous API
-
-To consume the synchronous API, there are only a few function calls that need to be introduced:
-
-```c
-redisContext *redisConnect(const char *ip, int port);
-void *redisCommand(redisContext *c, const char *format, ...);
-void freeReplyObject(void *reply);
-```
-
-### Connecting
-
-The function `redisConnect` is used to create a so-called `redisContext`. The
-context is where Hiredis holds state for a connection. The `redisContext`
-struct has an integer `err` field that is non-zero when the connection is in
-an error state. The field `errstr` will contain a string with a description of
-the error. More information on errors can be found in the **Errors** section.
-After trying to connect to Redis using `redisConnect` you should
-check the `err` field to see if establishing the connection was successful:
-```c
-redisContext *c = redisConnect("127.0.0.1", 6379);
-if (c != NULL && c->err) {
-    printf("Error: %s\n", c->errstr);
-    // handle error
-}
-```
-
-### Sending commands
-
-There are several ways to issue commands to Redis. The first that will be introduced is
-`redisCommand`. This function takes a format similar to printf. In the simplest form,
-it is used like this:
-```c
-reply = redisCommand(context, "SET foo bar");
-```
-
-The specifier `%s` interpolates a string in the command, and uses `strlen` to
-determine the length of the string:
-```c
-reply = redisCommand(context, "SET foo %s", value);
-```
-When you need to pass binary safe strings in a command, the `%b` specifier can be
-used. Together with a pointer to the string, it requires a `size_t` length argument
-of the string:
-```c
-reply = redisCommand(context, "SET foo %b", value, (size_t) valuelen);
-```
-Internally, Hiredis splits the command in different arguments and will
-convert it to the protocol used to communicate with Redis.
-One or more spaces separates arguments, so you can use the specifiers
-anywhere in an argument:
-```c
-reply = redisCommand(context, "SET key:%s %s", myid, value);
-```
-
-### Using replies
-
-The return value of `redisCommand` holds a reply when the command was
-successfully executed. When an error occurs, the return value is `NULL` and
-the `err` field in the context will be set (see section on **Errors**).
-Once an error is returned the context cannot be reused and you should set up
-a new connection.
-
-The standard replies that `redisCommand` are of the type `redisReply`. The
-`type` field in the `redisReply` should be used to test what kind of reply
-was received:
-
-* **`REDIS_REPLY_STATUS`**:
-    * The command replied with a status reply. The status string can be accessed using `reply->str`.
-      The length of this string can be accessed using `reply->len`.
-
-* **`REDIS_REPLY_ERROR`**:
-    *  The command replied with an error. The error string can be accessed identical to `REDIS_REPLY_STATUS`.
-
-* **`REDIS_REPLY_INTEGER`**:
-    * The command replied with an integer. The integer value can be accessed using the
-      `reply->integer` field of type `long long`.
-
-* **`REDIS_REPLY_NIL`**:
-    * The command replied with a **nil** object. There is no data to access.
-
-* **`REDIS_REPLY_STRING`**:
-    * A bulk (string) reply. The value of the reply can be accessed using `reply->str`.
-      The length of this string can be accessed using `reply->len`.
-
-* **`REDIS_REPLY_ARRAY`**:
-    * A multi bulk reply. The number of elements in the multi bulk reply is stored in
-      `reply->elements`. Every element in the multi bulk reply is a `redisReply` object as well
-      and can be accessed via `reply->element[..index..]`.
-      Redis may reply with nested arrays but this is fully supported.
-
-Replies should be freed using the `freeReplyObject()` function.
-Note that this function will take care of freeing sub-reply objects
-contained in arrays and nested arrays, so there is no need for the user to
-free the sub replies (it is actually harmful and will corrupt the memory).
-
-**Important:** the current version of hiredis (0.10.0) frees replies when the
-asynchronous API is used. This means you should not call `freeReplyObject` when
-you use this API. The reply is cleaned up by hiredis _after_ the callback
-returns. This behavior will probably change in future releases, so make sure to
-keep an eye on the changelog when upgrading (see issue #39).
-
-### Cleaning up
-
-To disconnect and free the context the following function can be used:
-```c
-void redisFree(redisContext *c);
-```
-This function immediately closes the socket and then frees the allocations done in
-creating the context.
-
-### Sending commands (cont'd)
-
-Together with `redisCommand`, the function `redisCommandArgv` can be used to issue commands.
-It has the following prototype:
-```c
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-```
-It takes the number of arguments `argc`, an array of strings `argv` and the lengths of the
-arguments `argvlen`. For convenience, `argvlen` may be set to `NULL` and the function will
-use `strlen(3)` on every argument to determine its length. Obviously, when any of the arguments
-need to be binary safe, the entire array of lengths `argvlen` should be provided.
-
-The return value has the same semantic as `redisCommand`.
-
-### Pipelining
-
-To explain how Hiredis supports pipelining in a blocking connection, there needs to be
-understanding of the internal execution flow.
-
-When any of the functions in the `redisCommand` family is called, Hiredis first formats the
-command according to the Redis protocol. The formatted command is then put in the output buffer
-of the context. This output buffer is dynamic, so it can hold any number of commands.
-After the command is put in the output buffer, `redisGetReply` is called. This function has the
-following two execution paths:
-
-1. The input buffer is non-empty:
-    * Try to parse a single reply from the input buffer and return it
-    * If no reply could be parsed, continue at *2*
-2. The input buffer is empty:
-    * Write the **entire** output buffer to the socket
-    * Read from the socket until a single reply could be parsed
-
-The function `redisGetReply` is exported as part of the Hiredis API and can be used when a reply
-is expected on the socket. To pipeline commands, the only things that needs to be done is
-filling up the output buffer. For this cause, two commands can be used that are identical
-to the `redisCommand` family, apart from not returning a reply:
-```c
-void redisAppendCommand(redisContext *c, const char *format, ...);
-void redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-```
-After calling either function one or more times, `redisGetReply` can be used to receive the
-subsequent replies. The return value for this function is either `REDIS_OK` or `REDIS_ERR`, where
-the latter means an error occurred while reading a reply. Just as with the other commands,
-the `err` field in the context can be used to find out what the cause of this error is.
-
-The following examples shows a simple pipeline (resulting in only a single call to `write(2)` and
-a single call to `read(2)`):
-```c
-redisReply *reply;
-redisAppendCommand(context,"SET foo bar");
-redisAppendCommand(context,"GET foo");
-redisGetReply(context,&reply); // reply for SET
-freeReplyObject(reply);
-redisGetReply(context,&reply); // reply for GET
-freeReplyObject(reply);
-```
-This API can also be used to implement a blocking subscriber:
-```c
-reply = redisCommand(context,"SUBSCRIBE foo");
-freeReplyObject(reply);
-while(redisGetReply(context,&reply) == REDIS_OK) {
-    // consume message
-    freeReplyObject(reply);
-}
-```
-### Errors
-
-When a function call is not successful, depending on the function either `NULL` or `REDIS_ERR` is
-returned. The `err` field inside the context will be non-zero and set to one of the
-following constants:
-
-* **`REDIS_ERR_IO`**:
-    There was an I/O error while creating the connection, trying to write
-    to the socket or read from the socket. If you included `errno.h` in your
-    application, you can use the global `errno` variable to find out what is
-    wrong.
-
-* **`REDIS_ERR_EOF`**:
-    The server closed the connection which resulted in an empty read.
-
-* **`REDIS_ERR_PROTOCOL`**:
-    There was an error while parsing the protocol.
-
-* **`REDIS_ERR_OTHER`**:
-    Any other error. Currently, it is only used when a specified hostname to connect
-    to cannot be resolved.
-
-In every case, the `errstr` field in the context will be set to hold a string representation
-of the error.
-
-## Asynchronous API
-
-Hiredis comes with an asynchronous API that works easily with any event library.
-Examples are bundled that show using Hiredis with [libev](http://software.schmorp.de/pkg/libev.html)
-and [libevent](http://monkey.org/~provos/libevent/).
-
-### Connecting
-
-The function `redisAsyncConnect` can be used to establish a non-blocking connection to
-Redis. It returns a pointer to the newly created `redisAsyncContext` struct. The `err` field
-should be checked after creation to see if there were errors creating the connection.
-Because the connection that will be created is non-blocking, the kernel is not able to
-instantly return if the specified host and port is able to accept a connection.
-```c
-redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-if (c->err) {
-    printf("Error: %s\n", c->errstr);
-    // handle error
-}
-```
-
-The asynchronous context can hold a disconnect callback function that is called when the
-connection is disconnected (either because of an error or per user request). This function should
-have the following prototype:
-```c
-void(const redisAsyncContext *c, int status);
-```
-On a disconnect, the `status` argument is set to `REDIS_OK` when disconnection was initiated by the
-user, or `REDIS_ERR` when the disconnection was caused by an error. When it is `REDIS_ERR`, the `err`
-field in the context can be accessed to find out the cause of the error.
-
-The context object is always freed after the disconnect callback fired. When a reconnect is needed,
-the disconnect callback is a good point to do so.
-
-Setting the disconnect callback can only be done once per context. For subsequent calls it will
-return `REDIS_ERR`. The function to set the disconnect callback has the following prototype:
-```c
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-```
-### Sending commands and their callbacks
-
-In an asynchronous context, commands are automatically pipelined due to the nature of an event loop.
-Therefore, unlike the synchronous API, there is only a single way to send commands.
-Because commands are sent to Redis asynchronously, issuing a command requires a callback function
-that is called when the reply is received. Reply callbacks should have the following prototype:
-```c
-void(redisAsyncContext *c, void *reply, void *privdata);
-```
-The `privdata` argument can be used to curry arbitrary data to the callback from the point where
-the command is initially queued for execution.
-
-The functions that can be used to issue commands in an asynchronous context are:
-```c
-int redisAsyncCommand(
-  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
-  const char *format, ...);
-int redisAsyncCommandArgv(
-  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
-  int argc, const char **argv, const size_t *argvlen);
-```
-Both functions work like their blocking counterparts. The return value is `REDIS_OK` when the command
-was successfully added to the output buffer and `REDIS_ERR` otherwise. Example: when the connection
-is being disconnected per user-request, no new commands may be added to the output buffer and `REDIS_ERR` is
-returned on calls to the `redisAsyncCommand` family.
-
-If the reply for a command with a `NULL` callback is read, it is immediately freed. When the callback
-for a command is non-`NULL`, the memory is freed immediately following the callback: the reply is only
-valid for the duration of the callback.
-
-All pending callbacks are called with a `NULL` reply when the context encountered an error.
-
-### Disconnecting
-
-An asynchronous connection can be terminated using:
-```c
-void redisAsyncDisconnect(redisAsyncContext *ac);
-```
-When this function is called, the connection is **not** immediately terminated. Instead, new
-commands are no longer accepted and the connection is only terminated when all pending commands
-have been written to the socket, their respective replies have been read and their respective
-callbacks have been executed. After this, the disconnection callback is executed with the
-`REDIS_OK` status and the context object is freed.
-
-### Hooking it up to event library *X*
-
-There are a few hooks that need to be set on the context object after it is created.
-See the `adapters/` directory for bindings to *libev* and *libevent*.
-
-## Reply parsing API
-
-Hiredis comes with a reply parsing API that makes it easy for writing higher
-level language bindings.
-
-The reply parsing API consists of the following functions:
-```c
-redisReader *redisReaderCreate(void);
-void redisReaderFree(redisReader *reader);
-int redisReaderFeed(redisReader *reader, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *reader, void **reply);
-```
-The same set of functions are used internally by hiredis when creating a
-normal Redis context, the above API just exposes it to the user for a direct
-usage.
-
-### Usage
-
-The function `redisReaderCreate` creates a `redisReader` structure that holds a
-buffer with unparsed data and state for the protocol parser.
-
-Incoming data -- most likely from a socket -- can be placed in the internal
-buffer of the `redisReader` using `redisReaderFeed`. This function will make a
-copy of the buffer pointed to by `buf` for `len` bytes. This data is parsed
-when `redisReaderGetReply` is called. This function returns an integer status
-and a reply object (as described above) via `void **reply`. The returned status
-can be either `REDIS_OK` or `REDIS_ERR`, where the latter means something went
-wrong (either a protocol error, or an out of memory error).
-
-The parser limits the level of nesting for multi bulk payloads to 7. If the
-multi bulk nesting level is higher than this, the parser returns an error.
-
-### Customizing replies
-
-The function `redisReaderGetReply` creates `redisReply` and makes the function
-argument `reply` point to the created `redisReply` variable. For instance, if
-the response of type `REDIS_REPLY_STATUS` then the `str` field of `redisReply`
-will hold the status as a vanilla C string. However, the functions that are
-responsible for creating instances of the `redisReply` can be customized by
-setting the `fn` field on the `redisReader` struct. This should be done
-immediately after creating the `redisReader`.
-
-For example, [hiredis-rb](https://github.com/pietern/hiredis-rb/blob/master/ext/hiredis_ext/reader.c)
-uses customized reply object functions to create Ruby objects.
-
-### Reader max buffer
-
-Both when using the Reader API directly or when using it indirectly via a
-normal Redis context, the redisReader structure uses a buffer in order to
-accumulate data from the server.
-Usually this buffer is destroyed when it is empty and is larger than 16
-KiB in order to avoid wasting memory in unused buffers
-
-However when working with very big payloads destroying the buffer may slow
-down performances considerably, so it is possible to modify the max size of
-an idle buffer changing the value of the `maxbuf` field of the reader structure
-to the desired value. The special value of 0 means that there is no maximum
-value for an idle buffer, so the buffer will never get freed.
-
-For instance if you have a normal Redis context you can set the maximum idle
-buffer to zero (unlimited) just with:
-```c
-context->reader->maxbuf = 0;
-```
-This should be done only in order to maximize performances when working with
-large payloads. The context should be set back to `REDIS_READER_MAX_BUF` again
-as soon as possible in order to prevent allocation of useless memory.
-
-## AUTHORS
-
-Hiredis was written by Salvatore Sanfilippo (antirez at gmail) and
-Pieter Noordhuis (pcnoordhuis at gmail) and is released under the BSD license.  
-Hiredis is currently maintained by Matt Stancliff (matt at genges dot com) and
-Jan-Erik Rediger (janerik at fnordig dot com)
diff --git a/debian/modules/nchan/src/hiredis/adapters/ae.h b/debian/modules/nchan/src/hiredis/adapters/ae.h
deleted file mode 100644
index 5c551c2..0000000
--- a/debian/modules/nchan/src/hiredis/adapters/ae.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_AE_H__
-#define __HIREDIS_AE_H__
-#include <sys/types.h>
-#include <ae.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisAeEvents {
-    redisAsyncContext *context;
-    aeEventLoop *loop;
-    int fd;
-    int reading, writing;
-} redisAeEvents;
-
-static void redisAeReadEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
-    ((void)el); ((void)fd); ((void)mask);
-
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisAeWriteEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
-    ((void)el); ((void)fd); ((void)mask);
-
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisAeAddRead(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (!e->reading) {
-        e->reading = 1;
-        aeCreateFileEvent(loop,e->fd,AE_READABLE,redisAeReadEvent,e);
-    }
-}
-
-static void redisAeDelRead(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (e->reading) {
-        e->reading = 0;
-        aeDeleteFileEvent(loop,e->fd,AE_READABLE);
-    }
-}
-
-static void redisAeAddWrite(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (!e->writing) {
-        e->writing = 1;
-        aeCreateFileEvent(loop,e->fd,AE_WRITABLE,redisAeWriteEvent,e);
-    }
-}
-
-static void redisAeDelWrite(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (e->writing) {
-        e->writing = 0;
-        aeDeleteFileEvent(loop,e->fd,AE_WRITABLE);
-    }
-}
-
-static void redisAeCleanup(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAeDelRead(privdata);
-    redisAeDelWrite(privdata);
-    free(e);
-}
-
-static int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisAeEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisAeEvents*)malloc(sizeof(*e));
-    e->context = ac;
-    e->loop = loop;
-    e->fd = c->fd;
-    e->reading = e->writing = 0;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisAeAddRead;
-    ac->ev.delRead = redisAeDelRead;
-    ac->ev.addWrite = redisAeAddWrite;
-    ac->ev.delWrite = redisAeDelWrite;
-    ac->ev.cleanup = redisAeCleanup;
-    ac->ev.data = e;
-
-    return REDIS_OK;
-}
-#endif
diff --git a/debian/modules/nchan/src/hiredis/adapters/libev.h b/debian/modules/nchan/src/hiredis/adapters/libev.h
deleted file mode 100644
index 2bf8d52..0000000
--- a/debian/modules/nchan/src/hiredis/adapters/libev.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_LIBEV_H__
-#define __HIREDIS_LIBEV_H__
-#include <stdlib.h>
-#include <sys/types.h>
-#include <ev.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisLibevEvents {
-    redisAsyncContext *context;
-    struct ev_loop *loop;
-    int reading, writing;
-    ev_io rev, wev;
-} redisLibevEvents;
-
-static void redisLibevReadEvent(EV_P_ ev_io *watcher, int revents) {
-#if EV_MULTIPLICITY
-    ((void)loop);
-#endif
-    ((void)revents);
-
-    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisLibevWriteEvent(EV_P_ ev_io *watcher, int revents) {
-#if EV_MULTIPLICITY
-    ((void)loop);
-#endif
-    ((void)revents);
-
-    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisLibevAddRead(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (!e->reading) {
-        e->reading = 1;
-        ev_io_start(EV_A_ &e->rev);
-    }
-}
-
-static void redisLibevDelRead(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (e->reading) {
-        e->reading = 0;
-        ev_io_stop(EV_A_ &e->rev);
-    }
-}
-
-static void redisLibevAddWrite(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (!e->writing) {
-        e->writing = 1;
-        ev_io_start(EV_A_ &e->wev);
-    }
-}
-
-static void redisLibevDelWrite(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (e->writing) {
-        e->writing = 0;
-        ev_io_stop(EV_A_ &e->wev);
-    }
-}
-
-static void redisLibevCleanup(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    redisLibevDelRead(privdata);
-    redisLibevDelWrite(privdata);
-    free(e);
-}
-
-static int redisLibevAttach(EV_P_ redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisLibevEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisLibevEvents*)malloc(sizeof(*e));
-    e->context = ac;
-#if EV_MULTIPLICITY
-    e->loop = loop;
-#else
-    e->loop = NULL;
-#endif
-    e->reading = e->writing = 0;
-    e->rev.data = e;
-    e->wev.data = e;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisLibevAddRead;
-    ac->ev.delRead = redisLibevDelRead;
-    ac->ev.addWrite = redisLibevAddWrite;
-    ac->ev.delWrite = redisLibevDelWrite;
-    ac->ev.cleanup = redisLibevCleanup;
-    ac->ev.data = e;
-
-    /* Initialize read/write events */
-    ev_io_init(&e->rev,redisLibevReadEvent,c->fd,EV_READ);
-    ev_io_init(&e->wev,redisLibevWriteEvent,c->fd,EV_WRITE);
-    return REDIS_OK;
-}
-
-#endif
diff --git a/debian/modules/nchan/src/hiredis/adapters/libevent.h b/debian/modules/nchan/src/hiredis/adapters/libevent.h
deleted file mode 100644
index 1c2b271..0000000
--- a/debian/modules/nchan/src/hiredis/adapters/libevent.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_LIBEVENT_H__
-#define __HIREDIS_LIBEVENT_H__
-#include <event.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisLibeventEvents {
-    redisAsyncContext *context;
-    struct event rev, wev;
-} redisLibeventEvents;
-
-static void redisLibeventReadEvent(int fd, short event, void *arg) {
-    ((void)fd); ((void)event);
-    redisLibeventEvents *e = (redisLibeventEvents*)arg;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisLibeventWriteEvent(int fd, short event, void *arg) {
-    ((void)fd); ((void)event);
-    redisLibeventEvents *e = (redisLibeventEvents*)arg;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisLibeventAddRead(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_add(&e->rev,NULL);
-}
-
-static void redisLibeventDelRead(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_del(&e->rev);
-}
-
-static void redisLibeventAddWrite(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_add(&e->wev,NULL);
-}
-
-static void redisLibeventDelWrite(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_del(&e->wev);
-}
-
-static void redisLibeventCleanup(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_del(&e->rev);
-    event_del(&e->wev);
-    free(e);
-}
-
-static int redisLibeventAttach(redisAsyncContext *ac, struct event_base *base) {
-    redisContext *c = &(ac->c);
-    redisLibeventEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisLibeventEvents*)malloc(sizeof(*e));
-    e->context = ac;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisLibeventAddRead;
-    ac->ev.delRead = redisLibeventDelRead;
-    ac->ev.addWrite = redisLibeventAddWrite;
-    ac->ev.delWrite = redisLibeventDelWrite;
-    ac->ev.cleanup = redisLibeventCleanup;
-    ac->ev.data = e;
-
-    /* Initialize and install read/write events */
-    event_set(&e->rev,c->fd,EV_READ,redisLibeventReadEvent,e);
-    event_set(&e->wev,c->fd,EV_WRITE,redisLibeventWriteEvent,e);
-    event_base_set(base,&e->rev);
-    event_base_set(base,&e->wev);
-    return REDIS_OK;
-}
-#endif
diff --git a/debian/modules/nchan/src/hiredis/adapters/libuv.h b/debian/modules/nchan/src/hiredis/adapters/libuv.h
deleted file mode 100644
index 3cdf3d3..0000000
--- a/debian/modules/nchan/src/hiredis/adapters/libuv.h
+++ /dev/null
@@ -1,121 +0,0 @@
-#ifndef __HIREDIS_LIBUV_H__
-#define __HIREDIS_LIBUV_H__
-#include <stdlib.h>
-#include <uv.h>
-#include "../hiredis.h"
-#include "../async.h"
-#include <string.h>
-
-typedef struct redisLibuvEvents {
-  redisAsyncContext* context;
-  uv_poll_t          handle;
-  int                events;
-} redisLibuvEvents;
-
-
-static void redisLibuvPoll(uv_poll_t* handle, int status, int events) {
-  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
-
-  if (status != 0) {
-    return;
-  }
-
-  if (events & UV_READABLE) {
-    redisAsyncHandleRead(p->context);
-  }
-  if (events & UV_WRITABLE) {
-    redisAsyncHandleWrite(p->context);
-  }
-}
-
-
-static void redisLibuvAddRead(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events |= UV_READABLE;
-
-  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-}
-
-
-static void redisLibuvDelRead(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events &= ~UV_READABLE;
-
-  if (p->events) {
-    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-  } else {
-    uv_poll_stop(&p->handle);
-  }
-}
-
-
-static void redisLibuvAddWrite(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events |= UV_WRITABLE;
-
-  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-}
-
-
-static void redisLibuvDelWrite(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events &= ~UV_WRITABLE;
-
-  if (p->events) {
-    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-  } else {
-    uv_poll_stop(&p->handle);
-  }
-}
-
-
-static void on_close(uv_handle_t* handle) {
-  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
-
-  free(p);
-}
-
-
-static void redisLibuvCleanup(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  uv_close((uv_handle_t*)&p->handle, on_close);
-}
-
-
-static int redisLibuvAttach(redisAsyncContext* ac, uv_loop_t* loop) {
-  redisContext *c = &(ac->c);
-
-  if (ac->ev.data != NULL) {
-    return REDIS_ERR;
-  }
-
-  ac->ev.addRead  = redisLibuvAddRead;
-  ac->ev.delRead  = redisLibuvDelRead;
-  ac->ev.addWrite = redisLibuvAddWrite;
-  ac->ev.delWrite = redisLibuvDelWrite;
-  ac->ev.cleanup  = redisLibuvCleanup;
-
-  redisLibuvEvents* p = (redisLibuvEvents*)malloc(sizeof(*p));
-
-  if (!p) {
-    return REDIS_ERR;
-  }
-
-  memset(p, 0, sizeof(*p));
-
-  if (uv_poll_init(loop, &p->handle, c->fd) != 0) {
-    return REDIS_ERR;
-  }
-
-  ac->ev.data    = p;
-  p->handle.data = p;
-  p->context     = ac;
-
-  return REDIS_OK;
-}
-#endif
diff --git a/debian/modules/nchan/src/hiredis/async.c b/debian/modules/nchan/src/hiredis/async.c
deleted file mode 100644
index d955203..0000000
--- a/debian/modules/nchan/src/hiredis/async.c
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include "async.h"
-#include "net.h"
-#include "dict.c"
-#include "sds.h"
-
-#define _EL_ADD_READ(ctx) do { \
-        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
-    } while(0)
-#define _EL_DEL_READ(ctx) do { \
-        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
-    } while(0)
-#define _EL_ADD_WRITE(ctx) do { \
-        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
-    } while(0)
-#define _EL_DEL_WRITE(ctx) do { \
-        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
-    } while(0)
-#define _EL_CLEANUP(ctx) do { \
-        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
-    } while(0);
-
-/* Forward declaration of function in hiredis.c */
-int __redisAppendCommand(redisContext *c, const char *cmd, size_t len);
-
-/* Functions managing dictionary of callbacks for pub/sub. */
-static unsigned int callbackHash(const void *key) {
-    return dictGenHashFunction((const unsigned char *)key,
-                               sdslen((const sds)key));
-}
-
-static void *callbackValDup(void *privdata, const void *src) {
-    ((void) privdata);
-    redisCallback *dup = malloc(sizeof(*dup));
-    memcpy(dup,src,sizeof(*dup));
-    return dup;
-}
-
-static int callbackKeyCompare(void *privdata, const void *key1, const void *key2) {
-    int l1, l2;
-    ((void) privdata);
-
-    l1 = sdslen((const sds)key1);
-    l2 = sdslen((const sds)key2);
-    if (l1 != l2) return 0;
-    return memcmp(key1,key2,l1) == 0;
-}
-
-static void callbackKeyDestructor(void *privdata, void *key) {
-    ((void) privdata);
-    sdsfree((sds)key);
-}
-
-static void callbackValDestructor(void *privdata, void *val) {
-    ((void) privdata);
-    free(val);
-}
-
-static dictType callbackDict = {
-    callbackHash,
-    NULL,
-    callbackValDup,
-    callbackKeyCompare,
-    callbackKeyDestructor,
-    callbackValDestructor
-};
-
-static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
-    redisAsyncContext *ac;
-
-    ac = realloc(c,sizeof(redisAsyncContext));
-    if (ac == NULL)
-        return NULL;
-
-    c = &(ac->c);
-
-    /* The regular connect functions will always set the flag REDIS_CONNECTED.
-     * For the async API, we want to wait until the first write event is
-     * received up before setting this flag, so reset it here. */
-    c->flags &= ~REDIS_CONNECTED;
-
-    ac->err = 0;
-    ac->errstr = NULL;
-    ac->data = NULL;
-
-    ac->ev.data = NULL;
-    ac->ev.addRead = NULL;
-    ac->ev.delRead = NULL;
-    ac->ev.addWrite = NULL;
-    ac->ev.delWrite = NULL;
-    ac->ev.cleanup = NULL;
-
-    ac->onConnect = NULL;
-    ac->onDisconnect = NULL;
-
-    ac->replies.head = NULL;
-    ac->replies.tail = NULL;
-    ac->sub.invalid.head = NULL;
-    ac->sub.invalid.tail = NULL;
-    ac->sub.channels = dictCreate(&callbackDict,NULL);
-    ac->sub.patterns = dictCreate(&callbackDict,NULL);
-    return ac;
-}
-
-/* We want the error field to be accessible directly instead of requiring
- * an indirection to the redisContext struct. */
-static void __redisAsyncCopyError(redisAsyncContext *ac) {
-    if (!ac)
-        return;
-
-    redisContext *c = &(ac->c);
-    ac->err = c->err;
-    ac->errstr = c->errstr;
-}
-
-redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
-    redisContext *c;
-    redisAsyncContext *ac;
-
-    c = redisConnectNonBlock(ip,port);
-    if (c == NULL)
-        return NULL;
-
-    ac = redisAsyncInitialize(c);
-    if (ac == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port,
-                                         const char *source_addr) {
-    redisContext *c = redisConnectBindNonBlock(ip,port,source_addr);
-    redisAsyncContext *ac = redisAsyncInitialize(c);
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr) {
-    redisContext *c = redisConnectBindNonBlockWithReuse(ip,port,source_addr);
-    redisAsyncContext *ac = redisAsyncInitialize(c);
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-redisAsyncContext *redisAsyncConnectUnix(const char *path) {
-    redisContext *c;
-    redisAsyncContext *ac;
-
-    c = redisConnectUnixNonBlock(path);
-    if (c == NULL)
-        return NULL;
-
-    ac = redisAsyncInitialize(c);
-    if (ac == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn) {
-    if (ac->onConnect == NULL) {
-        ac->onConnect = fn;
-
-        /* The common way to detect an established connection is to wait for
-         * the first write event to be fired. This assumes the related event
-         * library functions are already set. */
-        _EL_ADD_WRITE(ac);
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn) {
-    if (ac->onDisconnect == NULL) {
-        ac->onDisconnect = fn;
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-/* Helper functions to push/shift callbacks */
-static int __redisPushCallback(redisCallbackList *list, redisCallback *source) {
-    redisCallback *cb;
-
-    /* Copy callback from stack to heap */
-    cb = malloc(sizeof(*cb));
-    if (cb == NULL)
-        return REDIS_ERR_OOM;
-
-    if (source != NULL) {
-        memcpy(cb,source,sizeof(*cb));
-        cb->next = NULL;
-    }
-
-    /* Store callback in list */
-    if (list->head == NULL)
-        list->head = cb;
-    if (list->tail != NULL)
-        list->tail->next = cb;
-    list->tail = cb;
-    return REDIS_OK;
-}
-
-static int __redisShiftCallback(redisCallbackList *list, redisCallback *target) {
-    redisCallback *cb = list->head;
-    if (cb != NULL) {
-        list->head = cb->next;
-        if (cb == list->tail)
-            list->tail = NULL;
-
-        /* Copy callback from heap to stack */
-        if (target != NULL)
-            memcpy(target,cb,sizeof(*cb));
-        free(cb);
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisReply *reply) {
-    redisContext *c = &(ac->c);
-    if (cb->fn != NULL) {
-        c->flags |= REDIS_IN_CALLBACK;
-        cb->fn(ac,reply,cb->privdata);
-        c->flags &= ~REDIS_IN_CALLBACK;
-    }
-}
-
-/* Helper function to free the context. */
-static void __redisAsyncFree(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-    dictIterator *it;
-    dictEntry *de;
-
-    /* Execute pending callbacks with NULL reply. */
-    while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK)
-        __redisRunCallback(ac,&cb,NULL);
-
-    /* Execute callbacks for invalid commands */
-    while (__redisShiftCallback(&ac->sub.invalid,&cb) == REDIS_OK)
-        __redisRunCallback(ac,&cb,NULL);
-
-    /* Run subscription callbacks callbacks with NULL reply */
-    it = dictGetIterator(ac->sub.channels);
-    while ((de = dictNext(it)) != NULL)
-        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-    dictReleaseIterator(it);
-    dictRelease(ac->sub.channels);
-
-    it = dictGetIterator(ac->sub.patterns);
-    while ((de = dictNext(it)) != NULL)
-        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-    dictReleaseIterator(it);
-    dictRelease(ac->sub.patterns);
-
-    /* Signal event lib to clean up */
-    _EL_CLEANUP(ac);
-
-    /* Execute disconnect callback. When redisAsyncFree() initiated destroying
-     * this context, the status will always be REDIS_OK. */
-    if (ac->onDisconnect && (c->flags & REDIS_CONNECTED)) {
-        if (c->flags & REDIS_FREEING) {
-            ac->onDisconnect(ac,REDIS_OK);
-        } else {
-            ac->onDisconnect(ac,(ac->err == 0) ? REDIS_OK : REDIS_ERR);
-        }
-    }
-
-    /* Cleanup self */
-    redisFree(c);
-}
-
-/* Free the async context. When this function is called from a callback,
- * control needs to be returned to redisProcessCallbacks() before actual
- * free'ing. To do so, a flag is set on the context which is picked up by
- * redisProcessCallbacks(). Otherwise, the context is immediately free'd. */
-void redisAsyncFree(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    c->flags |= REDIS_FREEING;
-    if (!(c->flags & REDIS_IN_CALLBACK))
-        __redisAsyncFree(ac);
-}
-
-/* Helper function to make the disconnect happen and clean up. */
-static void __redisAsyncDisconnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    /* Make sure error is accessible if there is any */
-    __redisAsyncCopyError(ac);
-
-    if (ac->err == 0) {
-        /* For clean disconnects, there should be no pending callbacks. */
-        assert(__redisShiftCallback(&ac->replies,NULL) == REDIS_ERR);
-    } else {
-        /* Disconnection is caused by an error, make sure that pending
-         * callbacks cannot call new commands. */
-        c->flags |= REDIS_DISCONNECTING;
-    }
-
-    /* For non-clean disconnects, __redisAsyncFree() will execute pending
-     * callbacks with a NULL-reply. */
-    __redisAsyncFree(ac);
-}
-
-/* Tries to do a clean disconnect from Redis, meaning it stops new commands
- * from being issued, but tries to flush the output buffer and execute
- * callbacks for all remaining replies. When this function is called from a
- * callback, there might be more replies and we can safely defer disconnecting
- * to redisProcessCallbacks(). Otherwise, we can only disconnect immediately
- * when there are no pending callbacks. */
-void redisAsyncDisconnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    c->flags |= REDIS_DISCONNECTING;
-    if (!(c->flags & REDIS_IN_CALLBACK) && ac->replies.head == NULL)
-        __redisAsyncDisconnect(ac);
-}
-
-static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, redisCallback *dstcb) {
-    redisContext *c = &(ac->c);
-    dict *callbacks;
-    dictEntry *de;
-    int pvariant;
-    char *stype;
-    sds sname;
-
-    /* Custom reply functions are not supported for pub/sub. This will fail
-     * very hard when they are used... */
-    if (reply->type == REDIS_REPLY_ARRAY) {
-        assert(reply->elements >= 2);
-        assert(reply->element[0]->type == REDIS_REPLY_STRING);
-        stype = reply->element[0]->str;
-        pvariant = (tolower(stype[0]) == 'p') ? 1 : 0;
-
-        if (pvariant)
-            callbacks = ac->sub.patterns;
-        else
-            callbacks = ac->sub.channels;
-
-        /* Locate the right callback */
-        assert(reply->element[1]->type == REDIS_REPLY_STRING);
-        sname = sdsnewlen(reply->element[1]->str,reply->element[1]->len);
-        de = dictFind(callbacks,sname);
-        if (de != NULL) {
-            memcpy(dstcb,dictGetEntryVal(de),sizeof(*dstcb));
-
-            /* If this is an unsubscribe message, remove it. */
-            if (strcasecmp(stype+pvariant,"unsubscribe") == 0) {
-                dictDelete(callbacks,sname);
-
-                /* If this was the last unsubscribe message, revert to
-                 * non-subscribe mode. */
-                assert(reply->element[2]->type == REDIS_REPLY_INTEGER);
-                if (reply->element[2]->integer == 0)
-                    c->flags &= ~REDIS_SUBSCRIBED;
-            }
-        }
-        sdsfree(sname);
-    } else {
-        /* Shift callback for invalid commands. */
-        __redisShiftCallback(&ac->sub.invalid,dstcb);
-    }
-    return REDIS_OK;
-}
-
-void redisProcessCallbacks(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb = {NULL, NULL, NULL};
-    void *reply = NULL;
-    int status;
-
-    while((status = redisGetReply(c,&reply)) == REDIS_OK) {
-        if (reply == NULL) {
-            /* When the connection is being disconnected and there are
-             * no more replies, this is the cue to really disconnect. */
-            if (c->flags & REDIS_DISCONNECTING && sdslen(c->obuf) == 0
-                && ac->replies.head == NULL) {
-                __redisAsyncDisconnect(ac);
-                return;
-            }
-
-            /* If monitor mode, repush callback */
-            if(c->flags & REDIS_MONITORING) {
-                __redisPushCallback(&ac->replies,&cb);
-            }
-
-            /* When the connection is not being disconnected, simply stop
-             * trying to get replies and wait for the next loop tick. */
-            break;
-        }
-
-        /* Even if the context is subscribed, pending regular callbacks will
-         * get a reply before pub/sub messages arrive. */
-        if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
-            /*
-             * A spontaneous reply in a not-subscribed context can be the error
-             * reply that is sent when a new connection exceeds the maximum
-             * number of allowed connections on the server side.
-             *
-             * This is seen as an error instead of a regular reply because the
-             * server closes the connection after sending it.
-             *
-             * To prevent the error from being overwritten by an EOF error the
-             * connection is closed here. See issue #43.
-             *
-             * Another possibility is that the server is loading its dataset.
-             * In this case we also want to close the connection, and have the
-             * user wait until the server is ready to take our request.
-             */
-            if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
-                c->err = REDIS_ERR_OTHER;
-                snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
-                c->reader->fn->freeObject(reply);
-                __redisAsyncDisconnect(ac);
-                return;
-            }
-            /* No more regular callbacks and no errors, the context *must* be subscribed or monitoring. */
-            assert((c->flags & REDIS_SUBSCRIBED || c->flags & REDIS_MONITORING));
-            if(c->flags & REDIS_SUBSCRIBED)
-                __redisGetSubscribeCallback(ac,reply,&cb);
-        }
-
-        if (cb.fn != NULL) {
-            __redisRunCallback(ac,&cb,reply);
-            c->reader->fn->freeObject(reply);
-
-            /* Proceed with free'ing when redisAsyncFree() was called. */
-            if (c->flags & REDIS_FREEING) {
-                __redisAsyncFree(ac);
-                return;
-            }
-        } else {
-            /* No callback for this reply. This can either be a NULL callback,
-             * or there were no callbacks to begin with. Either way, don't
-             * abort with an error, but simply ignore it because the client
-             * doesn't know what the server will spit out over the wire. */
-            c->reader->fn->freeObject(reply);
-        }
-    }
-
-    /* Disconnect when there was an error reading the reply */
-    if (status != REDIS_OK)
-        __redisAsyncDisconnect(ac);
-}
-
-/* Internal helper function to detect socket status the first time a read or
- * write event fires. When connecting was not successful, the connect callback
- * is called with a REDIS_ERR status and the context is free'd. */
-static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (redisCheckSocketError(c) == REDIS_ERR) {
-        /* Try again later when connect(2) is still in progress. */
-        if (errno == EINPROGRESS)
-            return REDIS_OK;
-
-        if (ac->onConnect) ac->onConnect(ac,REDIS_ERR);
-        __redisAsyncDisconnect(ac);
-        return REDIS_ERR;
-    }
-
-    /* Mark context as connected. */
-    c->flags |= REDIS_CONNECTED;
-    if (ac->onConnect) ac->onConnect(ac,REDIS_OK);
-    return REDIS_OK;
-}
-
-/* This function should be called when the socket is readable.
- * It processes all replies that can be read and executes their callbacks.
- */
-void redisAsyncHandleRead(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (!(c->flags & REDIS_CONNECTED)) {
-        /* Abort connect was not successful. */
-        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
-            return;
-        /* Try again later when the context is still not connected. */
-        if (!(c->flags & REDIS_CONNECTED))
-            return;
-    }
-
-    if (redisBufferRead(c) == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        /* Always re-schedule reads */
-        _EL_ADD_READ(ac);
-        redisProcessCallbacks(ac);
-    }
-}
-
-void redisAsyncHandleWrite(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    int done = 0;
-
-    if (!(c->flags & REDIS_CONNECTED)) {
-        /* Abort connect was not successful. */
-        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
-            return;
-        /* Try again later when the context is still not connected. */
-        if (!(c->flags & REDIS_CONNECTED))
-            return;
-    }
-
-    if (redisBufferWrite(c,&done) == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        /* Continue writing when not done, stop writing otherwise */
-        if (!done)
-            _EL_ADD_WRITE(ac);
-        else
-            _EL_DEL_WRITE(ac);
-
-        /* Always schedule reads after writes */
-        _EL_ADD_READ(ac);
-    }
-}
-
-/* Sets a pointer to the first argument and its length starting at p. Returns
- * the number of bytes to skip to get to the following argument. */
-static const char *nextArgument(const char *start, const char **str, size_t *len) {
-    const char *p = start;
-    if (p[0] != '$') {
-        p = strchr(p,'$');
-        if (p == NULL) return NULL;
-    }
-
-    *len = (int)strtol(p+1,NULL,10);
-    p = strchr(p,'\r');
-    assert(p);
-    *str = p+2;
-    return p+2+(*len)+2;
-}
-
-/* Helper function for the redisAsyncCommand* family of functions. Writes a
- * formatted command to the output buffer and registers the provided callback
- * function with the context. */
-static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-    int pvariant, hasnext;
-    const char *cstr, *astr;
-    size_t clen, alen;
-    const char *p;
-    sds sname;
-    int ret;
-
-    /* Don't accept new commands when the connection is about to be closed. */
-    if (c->flags & (REDIS_DISCONNECTING | REDIS_FREEING)) return REDIS_ERR;
-
-    /* Setup callback */
-    cb.fn = fn;
-    cb.privdata = privdata;
-
-    /* Find out which command will be appended. */
-    p = nextArgument(cmd,&cstr,&clen);
-    assert(p != NULL);
-    hasnext = (p[0] == '$');
-    pvariant = (tolower(cstr[0]) == 'p') ? 1 : 0;
-    cstr += pvariant;
-    clen -= pvariant;
-
-    if (hasnext && strncasecmp(cstr,"subscribe\r\n",11) == 0) {
-        c->flags |= REDIS_SUBSCRIBED;
-
-        /* Add every channel/pattern to the list of subscription callbacks. */
-        while ((p = nextArgument(p,&astr,&alen)) != NULL) {
-            sname = sdsnewlen(astr,alen);
-            if (pvariant)
-                ret = dictReplace(ac->sub.patterns,sname,&cb);
-            else
-                ret = dictReplace(ac->sub.channels,sname,&cb);
-
-            if (ret == 0) sdsfree(sname);
-        }
-    } else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) {
-        /* It is only useful to call (P)UNSUBSCRIBE when the context is
-         * subscribed to one or more channels or patterns. */
-        if (!(c->flags & REDIS_SUBSCRIBED)) return REDIS_ERR;
-
-        /* (P)UNSUBSCRIBE does not have its own response: every channel or
-         * pattern that is unsubscribed will receive a message. This means we
-         * should not append a callback function for this command. */
-     } else if(strncasecmp(cstr,"monitor\r\n",9) == 0) {
-         /* Set monitor flag and push callback */
-         c->flags |= REDIS_MONITORING;
-         __redisPushCallback(&ac->replies,&cb);
-    } else {
-        if (c->flags & REDIS_SUBSCRIBED)
-            /* This will likely result in an error reply, but it needs to be
-             * received and passed to the callback. */
-            __redisPushCallback(&ac->sub.invalid,&cb);
-        else
-            __redisPushCallback(&ac->replies,&cb);
-    }
-
-    __redisAppendCommand(c,cmd,len);
-
-    /* Always schedule a write when the write buffer is non-empty */
-    _EL_ADD_WRITE(ac);
-
-    return REDIS_OK;
-}
-
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap) {
-    char *cmd;
-    int len;
-    int status;
-    len = redisvFormatCommand(&cmd,format,ap);
-
-    /* We don't want to pass -1 or -2 to future functions as a length. */
-    if (len < 0)
-        return REDIS_ERR;
-
-    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    free(cmd);
-    return status;
-}
-
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...) {
-    va_list ap;
-    int status;
-    va_start(ap,format);
-    status = redisvAsyncCommand(ac,fn,privdata,format,ap);
-    va_end(ap);
-    return status;
-}
-
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) {
-    sds cmd;
-    int len;
-    int status;
-    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
-    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    sdsfree(cmd);
-    return status;
-}
-
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
-    int status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    return status;
-}
diff --git a/debian/modules/nchan/src/hiredis/async.h b/debian/modules/nchan/src/hiredis/async.h
deleted file mode 100644
index 59cbf46..0000000
--- a/debian/modules/nchan/src/hiredis/async.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_ASYNC_H
-#define __HIREDIS_ASYNC_H
-#include "hiredis.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
-struct dict; /* dictionary header is included in async.c */
-
-/* Reply callback prototype and container */
-typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
-typedef struct redisCallback {
-    struct redisCallback *next; /* simple singly linked list */
-    redisCallbackFn *fn;
-    void *privdata;
-} redisCallback;
-
-/* List of callbacks for either regular replies or pub/sub */
-typedef struct redisCallbackList {
-    redisCallback *head, *tail;
-} redisCallbackList;
-
-/* Connection callback prototypes */
-typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
-typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
-
-/* Context for an async connection to Redis */
-typedef struct redisAsyncContext {
-    /* Hold the regular context, so it can be realloc'ed. */
-    redisContext c;
-
-    /* Setup error flags so they can be used directly. */
-    int err;
-    char *errstr;
-
-    /* Not used by hiredis */
-    void *data;
-
-    /* Event library data and hooks */
-    struct {
-        void *data;
-
-        /* Hooks that are called when the library expects to start
-         * reading/writing. These functions should be idempotent. */
-        void (*addRead)(void *privdata);
-        void (*delRead)(void *privdata);
-        void (*addWrite)(void *privdata);
-        void (*delWrite)(void *privdata);
-        void (*cleanup)(void *privdata);
-    } ev;
-
-    /* Called when either the connection is terminated due to an error or per
-     * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
-    redisDisconnectCallback *onDisconnect;
-
-    /* Called when the first write event was received. */
-    redisConnectCallback *onConnect;
-
-    /* Regular command callbacks */
-    redisCallbackList replies;
-
-    /* Subscription callbacks */
-    struct {
-        redisCallbackList invalid;
-        struct dict *channels;
-        struct dict *patterns;
-    } sub;
-} redisAsyncContext;
-
-/* Functions that proxy to hiredis */
-redisAsyncContext *redisAsyncConnect(const char *ip, int port);
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr);
-redisAsyncContext *redisAsyncConnectUnix(const char *path);
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-void redisAsyncDisconnect(redisAsyncContext *ac);
-void redisAsyncFree(redisAsyncContext *ac);
-
-/* Handle read/write events */
-void redisAsyncHandleRead(redisAsyncContext *ac);
-void redisAsyncHandleWrite(redisAsyncContext *ac);
-
-/* Command functions for an async context. Write the command to the
- * output buffer and register the provided callback. */
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/hiredis/dict.c b/debian/modules/nchan/src/hiredis/dict.c
deleted file mode 100644
index e17a625..0000000
--- a/debian/modules/nchan/src/hiredis/dict.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <stdlib.h>
-#include <assert.h>
-#include <limits.h>
-#include "dict.h"
-
-/* -------------------------- private prototypes ---------------------------- */
-
-static int _dictExpandIfNeeded(dict *ht);
-static unsigned long _dictNextPower(unsigned long size);
-static int _dictKeyIndex(dict *ht, const void *key);
-static int _dictInit(dict *ht, dictType *type, void *privDataPtr);
-
-/* -------------------------- hash functions -------------------------------- */
-
-/* Generic hash function (a popular one from Bernstein).
- * I tested a few and this was the best. */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len) {
-    unsigned int hash = 5381;
-
-    while (len--)
-        hash = ((hash << 5) + hash) + (*buf++); /* hash * 33 + c */
-    return hash;
-}
-
-/* ----------------------------- API implementation ------------------------- */
-
-/* Reset an hashtable already initialized with ht_init().
- * NOTE: This function should only called by ht_destroy(). */
-static void _dictReset(dict *ht) {
-    ht->table = NULL;
-    ht->size = 0;
-    ht->sizemask = 0;
-    ht->used = 0;
-}
-
-/* Create a new hash table */
-static dict *dictCreate(dictType *type, void *privDataPtr) {
-    dict *ht = malloc(sizeof(*ht));
-    _dictInit(ht,type,privDataPtr);
-    return ht;
-}
-
-/* Initialize the hash table */
-static int _dictInit(dict *ht, dictType *type, void *privDataPtr) {
-    _dictReset(ht);
-    ht->type = type;
-    ht->privdata = privDataPtr;
-    return DICT_OK;
-}
-
-/* Expand or create the hashtable */
-static int dictExpand(dict *ht, unsigned long size) {
-    dict n; /* the new hashtable */
-    unsigned long realsize = _dictNextPower(size), i;
-
-    /* the size is invalid if it is smaller than the number of
-     * elements already inside the hashtable */
-    if (ht->used > size)
-        return DICT_ERR;
-
-    _dictInit(&n, ht->type, ht->privdata);
-    n.size = realsize;
-    n.sizemask = realsize-1;
-    n.table = calloc(realsize,sizeof(dictEntry*));
-
-    /* Copy all the elements from the old to the new table:
-     * note that if the old hash table is empty ht->size is zero,
-     * so dictExpand just creates an hash table. */
-    n.used = ht->used;
-    for (i = 0; i < ht->size && ht->used > 0; i++) {
-        dictEntry *he, *nextHe;
-
-        if (ht->table[i] == NULL) continue;
-
-        /* For each hash entry on this slot... */
-        he = ht->table[i];
-        while(he) {
-            unsigned int h;
-
-            nextHe = he->next;
-            /* Get the new element index */
-            h = dictHashKey(ht, he->key) & n.sizemask;
-            he->next = n.table[h];
-            n.table[h] = he;
-            ht->used--;
-            /* Pass to the next element */
-            he = nextHe;
-        }
-    }
-    assert(ht->used == 0);
-    free(ht->table);
-
-    /* Remap the new hashtable in the old */
-    *ht = n;
-    return DICT_OK;
-}
-
-/* Add an element to the target hash table */
-static int dictAdd(dict *ht, void *key, void *val) {
-    int index;
-    dictEntry *entry;
-
-    /* Get the index of the new element, or -1 if
-     * the element already exists. */
-    if ((index = _dictKeyIndex(ht, key)) == -1)
-        return DICT_ERR;
-
-    /* Allocates the memory and stores key */
-    entry = malloc(sizeof(*entry));
-    entry->next = ht->table[index];
-    ht->table[index] = entry;
-
-    /* Set the hash entry fields. */
-    dictSetHashKey(ht, entry, key);
-    dictSetHashVal(ht, entry, val);
-    ht->used++;
-    return DICT_OK;
-}
-
-/* Add an element, discarding the old if the key already exists.
- * Return 1 if the key was added from scratch, 0 if there was already an
- * element with such key and dictReplace() just performed a value update
- * operation. */
-static int dictReplace(dict *ht, void *key, void *val) {
-    dictEntry *entry, auxentry;
-
-    /* Try to add the element. If the key
-     * does not exists dictAdd will succeed. */
-    if (dictAdd(ht, key, val) == DICT_OK)
-        return 1;
-    /* It already exists, get the entry */
-    entry = dictFind(ht, key);
-    /* Free the old value and set the new one */
-    /* Set the new value and free the old one. Note that it is important
-     * to do that in this order, as the value may just be exactly the same
-     * as the previous one. In this context, think to reference counting,
-     * you want to increment (set), and then decrement (free), and not the
-     * reverse. */
-    auxentry = *entry;
-    dictSetHashVal(ht, entry, val);
-    dictFreeEntryVal(ht, &auxentry);
-    return 0;
-}
-
-/* Search and remove an element */
-static int dictDelete(dict *ht, const void *key) {
-    unsigned int h;
-    dictEntry *de, *prevde;
-
-    if (ht->size == 0)
-        return DICT_ERR;
-    h = dictHashKey(ht, key) & ht->sizemask;
-    de = ht->table[h];
-
-    prevde = NULL;
-    while(de) {
-        if (dictCompareHashKeys(ht,key,de->key)) {
-            /* Unlink the element from the list */
-            if (prevde)
-                prevde->next = de->next;
-            else
-                ht->table[h] = de->next;
-
-            dictFreeEntryKey(ht,de);
-            dictFreeEntryVal(ht,de);
-            free(de);
-            ht->used--;
-            return DICT_OK;
-        }
-        prevde = de;
-        de = de->next;
-    }
-    return DICT_ERR; /* not found */
-}
-
-/* Destroy an entire hash table */
-static int _dictClear(dict *ht) {
-    unsigned long i;
-
-    /* Free all the elements */
-    for (i = 0; i < ht->size && ht->used > 0; i++) {
-        dictEntry *he, *nextHe;
-
-        if ((he = ht->table[i]) == NULL) continue;
-        while(he) {
-            nextHe = he->next;
-            dictFreeEntryKey(ht, he);
-            dictFreeEntryVal(ht, he);
-            free(he);
-            ht->used--;
-            he = nextHe;
-        }
-    }
-    /* Free the table and the allocated cache structure */
-    free(ht->table);
-    /* Re-initialize the table */
-    _dictReset(ht);
-    return DICT_OK; /* never fails */
-}
-
-/* Clear & Release the hash table */
-static void dictRelease(dict *ht) {
-    _dictClear(ht);
-    free(ht);
-}
-
-static dictEntry *dictFind(dict *ht, const void *key) {
-    dictEntry *he;
-    unsigned int h;
-
-    if (ht->size == 0) return NULL;
-    h = dictHashKey(ht, key) & ht->sizemask;
-    he = ht->table[h];
-    while(he) {
-        if (dictCompareHashKeys(ht, key, he->key))
-            return he;
-        he = he->next;
-    }
-    return NULL;
-}
-
-static dictIterator *dictGetIterator(dict *ht) {
-    dictIterator *iter = malloc(sizeof(*iter));
-
-    iter->ht = ht;
-    iter->index = -1;
-    iter->entry = NULL;
-    iter->nextEntry = NULL;
-    return iter;
-}
-
-static dictEntry *dictNext(dictIterator *iter) {
-    while (1) {
-        if (iter->entry == NULL) {
-            iter->index++;
-            if (iter->index >=
-                    (signed)iter->ht->size) break;
-            iter->entry = iter->ht->table[iter->index];
-        } else {
-            iter->entry = iter->nextEntry;
-        }
-        if (iter->entry) {
-            /* We need to save the 'next' here, the iterator user
-             * may delete the entry we are returning. */
-            iter->nextEntry = iter->entry->next;
-            return iter->entry;
-        }
-    }
-    return NULL;
-}
-
-static void dictReleaseIterator(dictIterator *iter) {
-    free(iter);
-}
-
-/* ------------------------- private functions ------------------------------ */
-
-/* Expand the hash table if needed */
-static int _dictExpandIfNeeded(dict *ht) {
-    /* If the hash table is empty expand it to the initial size,
-     * if the table is "full" dobule its size. */
-    if (ht->size == 0)
-        return dictExpand(ht, DICT_HT_INITIAL_SIZE);
-    if (ht->used == ht->size)
-        return dictExpand(ht, ht->size*2);
-    return DICT_OK;
-}
-
-/* Our hash table capability is a power of two */
-static unsigned long _dictNextPower(unsigned long size) {
-    unsigned long i = DICT_HT_INITIAL_SIZE;
-
-    if (size >= LONG_MAX) return LONG_MAX;
-    while(1) {
-        if (i >= size)
-            return i;
-        i *= 2;
-    }
-}
-
-/* Returns the index of a free slot that can be populated with
- * an hash entry for the given 'key'.
- * If the key already exists, -1 is returned. */
-static int _dictKeyIndex(dict *ht, const void *key) {
-    unsigned int h;
-    dictEntry *he;
-
-    /* Expand the hashtable if needed */
-    if (_dictExpandIfNeeded(ht) == DICT_ERR)
-        return -1;
-    /* Compute the key hash value */
-    h = dictHashKey(ht, key) & ht->sizemask;
-    /* Search if this slot does not already contain the given key */
-    he = ht->table[h];
-    while(he) {
-        if (dictCompareHashKeys(ht, key, he->key))
-            return -1;
-        he = he->next;
-    }
-    return h;
-}
-
diff --git a/debian/modules/nchan/src/hiredis/dict.h b/debian/modules/nchan/src/hiredis/dict.h
deleted file mode 100644
index 95fcd28..0000000
--- a/debian/modules/nchan/src/hiredis/dict.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __DICT_H
-#define __DICT_H
-
-#define DICT_OK 0
-#define DICT_ERR 1
-
-/* Unused arguments generate annoying warnings... */
-#define DICT_NOTUSED(V) ((void) V)
-
-typedef struct dictEntry {
-    void *key;
-    void *val;
-    struct dictEntry *next;
-} dictEntry;
-
-typedef struct dictType {
-    unsigned int (*hashFunction)(const void *key);
-    void *(*keyDup)(void *privdata, const void *key);
-    void *(*valDup)(void *privdata, const void *obj);
-    int (*keyCompare)(void *privdata, const void *key1, const void *key2);
-    void (*keyDestructor)(void *privdata, void *key);
-    void (*valDestructor)(void *privdata, void *obj);
-} dictType;
-
-typedef struct dict {
-    dictEntry **table;
-    dictType *type;
-    unsigned long size;
-    unsigned long sizemask;
-    unsigned long used;
-    void *privdata;
-} dict;
-
-typedef struct dictIterator {
-    dict *ht;
-    int index;
-    dictEntry *entry, *nextEntry;
-} dictIterator;
-
-/* This is the initial size of every hash table */
-#define DICT_HT_INITIAL_SIZE     4
-
-/* ------------------------------- Macros ------------------------------------*/
-#define dictFreeEntryVal(ht, entry) \
-    if ((ht)->type->valDestructor) \
-        (ht)->type->valDestructor((ht)->privdata, (entry)->val)
-
-#define dictSetHashVal(ht, entry, _val_) do { \
-    if ((ht)->type->valDup) \
-        entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
-    else \
-        entry->val = (_val_); \
-} while(0)
-
-#define dictFreeEntryKey(ht, entry) \
-    if ((ht)->type->keyDestructor) \
-        (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
-
-#define dictSetHashKey(ht, entry, _key_) do { \
-    if ((ht)->type->keyDup) \
-        entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
-    else \
-        entry->key = (_key_); \
-} while(0)
-
-#define dictCompareHashKeys(ht, key1, key2) \
-    (((ht)->type->keyCompare) ? \
-        (ht)->type->keyCompare((ht)->privdata, key1, key2) : \
-        (key1) == (key2))
-
-#define dictHashKey(ht, key) (ht)->type->hashFunction(key)
-
-#define dictGetEntryKey(he) ((he)->key)
-#define dictGetEntryVal(he) ((he)->val)
-#define dictSlots(ht) ((ht)->size)
-#define dictSize(ht) ((ht)->used)
-
-/* API */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
-static dict *dictCreate(dictType *type, void *privDataPtr);
-static int dictExpand(dict *ht, unsigned long size);
-static int dictAdd(dict *ht, void *key, void *val);
-static int dictReplace(dict *ht, void *key, void *val);
-static int dictDelete(dict *ht, const void *key);
-static void dictRelease(dict *ht);
-static dictEntry * dictFind(dict *ht, const void *key);
-static dictIterator *dictGetIterator(dict *ht);
-static dictEntry *dictNext(dictIterator *iter);
-static void dictReleaseIterator(dictIterator *iter);
-
-#endif /* __DICT_H */
diff --git a/debian/modules/nchan/src/hiredis/examples/example-ae.c b/debian/modules/nchan/src/hiredis/examples/example-ae.c
deleted file mode 100644
index 8efa730..0000000
--- a/debian/modules/nchan/src/hiredis/examples/example-ae.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/ae.h>
-
-/* Put event loop in the global scope, so it can be explicitly stopped */
-static aeEventLoop *loop;
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        aeStop(loop);
-        return;
-    }
-
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        aeStop(loop);
-        return;
-    }
-
-    printf("Disconnected...\n");
-    aeStop(loop);
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    loop = aeCreateEventLoop(64);
-    redisAeAttach(loop, c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    aeMain(loop);
-    return 0;
-}
-
diff --git a/debian/modules/nchan/src/hiredis/examples/example-libev.c b/debian/modules/nchan/src/hiredis/examples/example-libev.c
deleted file mode 100644
index cc8b166..0000000
--- a/debian/modules/nchan/src/hiredis/examples/example-libev.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libev.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibevAttach(EV_DEFAULT_ c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    ev_loop(EV_DEFAULT_ 0);
-    return 0;
-}
diff --git a/debian/modules/nchan/src/hiredis/examples/example-libevent.c b/debian/modules/nchan/src/hiredis/examples/example-libevent.c
deleted file mode 100644
index d333c22..0000000
--- a/debian/modules/nchan/src/hiredis/examples/example-libevent.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libevent.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-    struct event_base *base = event_base_new();
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibeventAttach(c,base);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    event_base_dispatch(base);
-    return 0;
-}
diff --git a/debian/modules/nchan/src/hiredis/examples/example-libuv.c b/debian/modules/nchan/src/hiredis/examples/example-libuv.c
deleted file mode 100644
index a5462d4..0000000
--- a/debian/modules/nchan/src/hiredis/examples/example-libuv.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libuv.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-    uv_loop_t* loop = uv_default_loop();
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibuvAttach(c,loop);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    uv_run(loop, UV_RUN_DEFAULT);
-    return 0;
-}
diff --git a/debian/modules/nchan/src/hiredis/examples/example.c b/debian/modules/nchan/src/hiredis/examples/example.c
deleted file mode 100644
index 4d494c5..0000000
--- a/debian/modules/nchan/src/hiredis/examples/example.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <hiredis.h>
-
-int main(int argc, char **argv) {
-    unsigned int j;
-    redisContext *c;
-    redisReply *reply;
-    const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1";
-    int port = (argc > 2) ? atoi(argv[2]) : 6379;
-
-    struct timeval timeout = { 1, 500000 }; // 1.5 seconds
-    c = redisConnectWithTimeout(hostname, port, timeout);
-    if (c == NULL || c->err) {
-        if (c) {
-            printf("Connection error: %s\n", c->errstr);
-            redisFree(c);
-        } else {
-            printf("Connection error: can't allocate redis context\n");
-        }
-        exit(1);
-    }
-
-    /* PING server */
-    reply = redisCommand(c,"PING");
-    printf("PING: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key */
-    reply = redisCommand(c,"SET %s %s", "foo", "hello world");
-    printf("SET: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key using binary safe API */
-    reply = redisCommand(c,"SET %b %b", "bar", (size_t) 3, "hello", (size_t) 5);
-    printf("SET (binary API): %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Try a GET and two INCR */
-    reply = redisCommand(c,"GET foo");
-    printf("GET foo: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-    /* again ... */
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-
-    /* Create a list of numbers, from 0 to 9 */
-    reply = redisCommand(c,"DEL mylist");
-    freeReplyObject(reply);
-    for (j = 0; j < 10; j++) {
-        char buf[64];
-
-        snprintf(buf,64,"%u",j);
-        reply = redisCommand(c,"LPUSH mylist element-%s", buf);
-        freeReplyObject(reply);
-    }
-
-    /* Let's check what we have inside the list */
-    reply = redisCommand(c,"LRANGE mylist 0 -1");
-    if (reply->type == REDIS_REPLY_ARRAY) {
-        for (j = 0; j < reply->elements; j++) {
-            printf("%u) %s\n", j, reply->element[j]->str);
-        }
-    }
-    freeReplyObject(reply);
-
-    /* Disconnects and frees the context */
-    redisFree(c);
-
-    return 0;
-}
diff --git a/debian/modules/nchan/src/hiredis/fmacros.h b/debian/modules/nchan/src/hiredis/fmacros.h
deleted file mode 100644
index 19d7b21..0000000
--- a/debian/modules/nchan/src/hiredis/fmacros.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __HIREDIS_FMACRO_H
-#define __HIREDIS_FMACRO_H
-
-#if defined(__linux__)
-#define _BSD_SOURCE
-#define _DEFAULT_SOURCE
-#endif
-
-#if defined(__sun__)
-#define _POSIX_C_SOURCE 200112L
-#elif defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
-#define _XOPEN_SOURCE 600
-#else
-#define _XOPEN_SOURCE
-#endif
-
-#if __APPLE__ && __MACH__
-#define _OSX
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/hiredis/hiredis.c b/debian/modules/nchan/src/hiredis/hiredis.c
deleted file mode 100644
index 2b876d9..0000000
--- a/debian/modules/nchan/src/hiredis/hiredis.c
+++ /dev/null
@@ -1,1021 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include "hiredis.h"
-#include "net.h"
-#include "sds.h"
-
-static redisReply *createReplyObject(int type);
-static void *createStringObject(const redisReadTask *task, char *str, size_t len);
-static void *createArrayObject(const redisReadTask *task, int elements);
-static void *createIntegerObject(const redisReadTask *task, long long value);
-static void *createNilObject(const redisReadTask *task);
-
-/* Default set of functions to build the reply. Keep in mind that such a
- * function returning NULL is interpreted as OOM. */
-static redisReplyObjectFunctions defaultFunctions = {
-    createStringObject,
-    createArrayObject,
-    createIntegerObject,
-    createNilObject,
-    freeReplyObject
-};
-
-/* Create a reply object */
-static redisReply *createReplyObject(int type) {
-    redisReply *r = calloc(1,sizeof(*r));
-
-    if (r == NULL)
-        return NULL;
-
-    r->type = type;
-    return r;
-}
-
-/* Free a reply object */
-void freeReplyObject(void *reply) {
-    redisReply *r = reply;
-    size_t j;
-
-    if (r == NULL)
-        return;
-
-    switch(r->type) {
-    case REDIS_REPLY_INTEGER:
-        break; /* Nothing to free */
-    case REDIS_REPLY_ARRAY:
-        if (r->element != NULL) {
-            for (j = 0; j < r->elements; j++)
-                if (r->element[j] != NULL)
-                    freeReplyObject(r->element[j]);
-            free(r->element);
-        }
-        break;
-    case REDIS_REPLY_ERROR:
-    case REDIS_REPLY_STATUS:
-    case REDIS_REPLY_STRING:
-        if (r->str != NULL)
-            free(r->str);
-        break;
-    }
-    free(r);
-}
-
-static void *createStringObject(const redisReadTask *task, char *str, size_t len) {
-    redisReply *r, *parent;
-    char *buf;
-
-    r = createReplyObject(task->type);
-    if (r == NULL)
-        return NULL;
-
-    buf = malloc(len+1);
-    if (buf == NULL) {
-        freeReplyObject(r);
-        return NULL;
-    }
-
-    assert(task->type == REDIS_REPLY_ERROR  ||
-           task->type == REDIS_REPLY_STATUS ||
-           task->type == REDIS_REPLY_STRING);
-
-    /* Copy string value */
-    memcpy(buf,str,len);
-    buf[len] = '\0';
-    r->str = buf;
-    r->len = len;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createArrayObject(const redisReadTask *task, int elements) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_ARRAY);
-    if (r == NULL)
-        return NULL;
-
-    if (elements > 0) {
-        r->element = calloc(elements,sizeof(redisReply*));
-        if (r->element == NULL) {
-            freeReplyObject(r);
-            return NULL;
-        }
-    }
-
-    r->elements = elements;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createIntegerObject(const redisReadTask *task, long long value) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_INTEGER);
-    if (r == NULL)
-        return NULL;
-
-    r->integer = value;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createNilObject(const redisReadTask *task) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_NIL);
-    if (r == NULL)
-        return NULL;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-/* Return the number of digits of 'v' when converted to string in radix 10.
- * Implementation borrowed from link in redis/src/util.c:string2ll(). */
-static uint32_t countDigits(uint64_t v) {
-  uint32_t result = 1;
-  for (;;) {
-    if (v < 10) return result;
-    if (v < 100) return result + 1;
-    if (v < 1000) return result + 2;
-    if (v < 10000) return result + 3;
-    v /= 10000U;
-    result += 4;
-  }
-}
-
-/* Helper that calculates the bulk length given a certain string length. */
-static size_t bulklen(size_t len) {
-    return 1+countDigits(len)+2+len+2;
-}
-
-int redisvFormatCommand(char **target, const char *format, va_list ap) {
-    const char *c = format;
-    char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
-    sds curarg, newarg; /* current argument */
-    int touched = 0; /* was the current argument touched? */
-    char **curargv = NULL, **newargv = NULL;
-    int argc = 0;
-    int totlen = 0;
-    int error_type = 0; /* 0 = no error; -1 = memory error; -2 = format error */
-    int j;
-
-    /* Abort if there is not target to set */
-    if (target == NULL)
-        return -1;
-
-    /* Build the command string accordingly to protocol */
-    curarg = sdsempty();
-    if (curarg == NULL)
-        return -1;
-
-    while(*c != '\0') {
-        if (*c != '%' || c[1] == '\0') {
-            if (*c == ' ') {
-                if (touched) {
-                    newargv = realloc(curargv,sizeof(char*)*(argc+1));
-                    if (newargv == NULL) goto memory_err;
-                    curargv = newargv;
-                    curargv[argc++] = curarg;
-                    totlen += bulklen(sdslen(curarg));
-
-                    /* curarg is put in argv so it can be overwritten. */
-                    curarg = sdsempty();
-                    if (curarg == NULL) goto memory_err;
-                    touched = 0;
-                }
-            } else {
-                newarg = sdscatlen(curarg,c,1);
-                if (newarg == NULL) goto memory_err;
-                curarg = newarg;
-                touched = 1;
-            }
-        } else {
-            char *arg;
-            size_t size;
-
-            /* Set newarg so it can be checked even if it is not touched. */
-            newarg = curarg;
-
-            switch(c[1]) {
-            case 's':
-                arg = va_arg(ap,char*);
-                size = strlen(arg);
-                if (size > 0)
-                    newarg = sdscatlen(curarg,arg,size);
-                break;
-            case 'b':
-                arg = va_arg(ap,char*);
-                size = va_arg(ap,size_t);
-                if (size > 0)
-                    newarg = sdscatlen(curarg,arg,size);
-                break;
-            case '%':
-                newarg = sdscat(curarg,"%");
-                break;
-            default:
-                /* Try to detect printf format */
-                {
-                    static const char intfmts[] = "diouxX";
-                    static const char flags[] = "#0-+ ";
-                    char _format[16];
-                    const char *_p = c+1;
-                    size_t _l = 0;
-                    va_list _cpy;
-
-                    /* Flags */
-                    while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++;
-
-                    /* Field width */
-                    while (*_p != '\0' && isdigit(*_p)) _p++;
-
-                    /* Precision */
-                    if (*_p == '.') {
-                        _p++;
-                        while (*_p != '\0' && isdigit(*_p)) _p++;
-                    }
-
-                    /* Copy va_list before consuming with va_arg */
-                    va_copy(_cpy,ap);
-
-                    /* Integer conversion (without modifiers) */
-                    if (strchr(intfmts,*_p) != NULL) {
-                        va_arg(ap,int);
-                        goto fmt_valid;
-                    }
-
-                    /* Double conversion (without modifiers) */
-                    if (strchr("eEfFgGaA",*_p) != NULL) {
-                        va_arg(ap,double);
-                        goto fmt_valid;
-                    }
-
-                    /* Size: char */
-                    if (_p[0] == 'h' && _p[1] == 'h') {
-                        _p += 2;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,int); /* char gets promoted to int */
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: short */
-                    if (_p[0] == 'h') {
-                        _p += 1;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,int); /* short gets promoted to int */
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: long long */
-                    if (_p[0] == 'l' && _p[1] == 'l') {
-                        _p += 2;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,long long);
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: long */
-                    if (_p[0] == 'l') {
-                        _p += 1;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,long);
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                fmt_invalid:
-                    va_end(_cpy);
-                    goto format_err;
-
-                fmt_valid:
-                    _l = (_p+1)-c;
-                    if (_l < sizeof(_format)-2) {
-                        memcpy(_format,c,_l);
-                        _format[_l] = '\0';
-                        newarg = sdscatvprintf(curarg,_format,_cpy);
-
-                        /* Update current position (note: outer blocks
-                         * increment c twice so compensate here) */
-                        c = _p-1;
-                    }
-
-                    va_end(_cpy);
-                    break;
-                }
-            }
-
-            if (newarg == NULL) goto memory_err;
-            curarg = newarg;
-
-            touched = 1;
-            c++;
-        }
-        c++;
-    }
-
-    /* Add the last argument if needed */
-    if (touched) {
-        newargv = realloc(curargv,sizeof(char*)*(argc+1));
-        if (newargv == NULL) goto memory_err;
-        curargv = newargv;
-        curargv[argc++] = curarg;
-        totlen += bulklen(sdslen(curarg));
-    } else {
-        sdsfree(curarg);
-    }
-
-    /* Clear curarg because it was put in curargv or was free'd. */
-    curarg = NULL;
-
-    /* Add bytes needed to hold multi bulk count */
-    totlen += 1+countDigits(argc)+2;
-
-    /* Build the command at protocol level */
-    cmd = malloc(totlen+1);
-    if (cmd == NULL) goto memory_err;
-
-    pos = sprintf(cmd,"*%d\r\n",argc);
-    for (j = 0; j < argc; j++) {
-        pos += sprintf(cmd+pos,"$%zu\r\n",sdslen(curargv[j]));
-        memcpy(cmd+pos,curargv[j],sdslen(curargv[j]));
-        pos += sdslen(curargv[j]);
-        sdsfree(curargv[j]);
-        cmd[pos++] = '\r';
-        cmd[pos++] = '\n';
-    }
-    assert(pos == totlen);
-    cmd[pos] = '\0';
-
-    free(curargv);
-    *target = cmd;
-    return totlen;
-
-format_err:
-    error_type = -2;
-    goto cleanup;
-
-memory_err:
-    error_type = -1;
-    goto cleanup;
-
-cleanup:
-    if (curargv) {
-        while(argc--)
-            sdsfree(curargv[argc]);
-        free(curargv);
-    }
-
-    sdsfree(curarg);
-
-    /* No need to check cmd since it is the last statement that can fail,
-     * but do it anyway to be as defensive as possible. */
-    if (cmd != NULL)
-        free(cmd);
-
-    return error_type;
-}
-
-/* Format a command according to the Redis protocol. This function
- * takes a format similar to printf:
- *
- * %s represents a C null terminated string you want to interpolate
- * %b represents a binary safe string
- *
- * When using %b you need to provide both the pointer to the string
- * and the length in bytes as a size_t. Examples:
- *
- * len = redisFormatCommand(target, "GET %s", mykey);
- * len = redisFormatCommand(target, "SET %s %b", mykey, myval, myvallen);
- */
-int redisFormatCommand(char **target, const char *format, ...) {
-    va_list ap;
-    int len;
-    va_start(ap,format);
-    len = redisvFormatCommand(target,format,ap);
-    va_end(ap);
-
-    /* The API says "-1" means bad result, but we now also return "-2" in some
-     * cases.  Force the return value to always be -1. */
-    if (len < 0)
-        len = -1;
-
-    return len;
-}
-
-/* Format a command according to the Redis protocol using an sds string and
- * sdscatfmt for the processing of arguments. This function takes the
- * number of arguments, an array with arguments and an array with their
- * lengths. If the latter is set to NULL, strlen will be used to compute the
- * argument lengths.
- */
-int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
-                              const size_t *argvlen)
-{
-    sds cmd;
-    unsigned long long totlen;
-    int j;
-    size_t len;
-
-    /* Abort on a NULL target */
-    if (target == NULL)
-        return -1;
-
-    /* Calculate our total size */
-    totlen = 1+countDigits(argc)+2;
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        totlen += bulklen(len);
-    }
-
-    /* Use an SDS string for command construction */
-    cmd = sdsempty();
-    if (cmd == NULL)
-        return -1;
-
-    /* We already know how much storage we need */
-    cmd = sdsMakeRoomFor(cmd, totlen);
-    if (cmd == NULL)
-        return -1;
-
-    /* Construct command */
-    cmd = sdscatfmt(cmd, "*%i\r\n", argc);
-    for (j=0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        cmd = sdscatfmt(cmd, "$%T\r\n", len);
-        cmd = sdscatlen(cmd, argv[j], len);
-        cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
-    }
-
-    assert(sdslen(cmd)==totlen);
-
-    *target = cmd;
-    return totlen;
-}
-
-void redisFreeSdsCommand(sds cmd) {
-    sdsfree(cmd);
-}
-
-/* Format a command according to the Redis protocol. This function takes the
- * number of arguments, an array with arguments and an array with their
- * lengths. If the latter is set to NULL, strlen will be used to compute the
- * argument lengths.
- */
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen) {
-    char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
-    size_t len;
-    int totlen, j;
-
-    /* Abort on a NULL target */
-    if (target == NULL)
-        return -1;
-
-    /* Calculate number of bytes needed for the command */
-    totlen = 1+countDigits(argc)+2;
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        totlen += bulklen(len);
-    }
-
-    /* Build the command at protocol level */
-    cmd = malloc(totlen+1);
-    if (cmd == NULL)
-        return -1;
-
-    pos = sprintf(cmd,"*%d\r\n",argc);
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        pos += sprintf(cmd+pos,"$%zu\r\n",len);
-        memcpy(cmd+pos,argv[j],len);
-        pos += len;
-        cmd[pos++] = '\r';
-        cmd[pos++] = '\n';
-    }
-    assert(pos == totlen);
-    cmd[pos] = '\0';
-
-    *target = cmd;
-    return totlen;
-}
-
-void redisFreeCommand(char *cmd) {
-    free(cmd);
-}
-
-void __redisSetError(redisContext *c, int type, const char *str) {
-    size_t len;
-
-    c->err = type;
-    if (str != NULL) {
-        len = strlen(str);
-        len = len < (sizeof(c->errstr)-1) ? len : (sizeof(c->errstr)-1);
-        memcpy(c->errstr,str,len);
-        c->errstr[len] = '\0';
-    } else {
-        /* Only REDIS_ERR_IO may lack a description! */
-        assert(type == REDIS_ERR_IO);
-        __redis_strerror_r(errno, c->errstr, sizeof(c->errstr));
-    }
-}
-
-redisReader *redisReaderCreate(void) {
-    return redisReaderCreateWithFunctions(&defaultFunctions);
-}
-
-static redisContext *redisContextInit(void) {
-    redisContext *c;
-
-    c = calloc(1,sizeof(redisContext));
-    if (c == NULL)
-        return NULL;
-
-    c->err = 0;
-    c->errstr[0] = '\0';
-    c->obuf = sdsempty();
-    c->reader = redisReaderCreate();
-    c->tcp.host = NULL;
-    c->tcp.source_addr = NULL;
-    c->unix_sock.path = NULL;
-    c->timeout = NULL;
-
-    if (c->obuf == NULL || c->reader == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    return c;
-}
-
-void redisFree(redisContext *c) {
-    if (c == NULL)
-        return;
-    if (c->fd > 0)
-        close(c->fd);
-    if (c->obuf != NULL)
-        sdsfree(c->obuf);
-    if (c->reader != NULL)
-        redisReaderFree(c->reader);
-    if (c->tcp.host)
-        free(c->tcp.host);
-    if (c->tcp.source_addr)
-        free(c->tcp.source_addr);
-    if (c->unix_sock.path)
-        free(c->unix_sock.path);
-    if (c->timeout)
-        free(c->timeout);
-    free(c);
-}
-
-int redisFreeKeepFd(redisContext *c) {
-    int fd = c->fd;
-    c->fd = -1;
-    redisFree(c);
-    return fd;
-}
-
-int redisReconnect(redisContext *c) {
-    c->err = 0;
-    memset(c->errstr, '\0', strlen(c->errstr));
-
-    if (c->fd > 0) {
-        close(c->fd);
-    }
-
-    sdsfree(c->obuf);
-    redisReaderFree(c->reader);
-
-    c->obuf = sdsempty();
-    c->reader = redisReaderCreate();
-
-    if (c->connection_type == REDIS_CONN_TCP) {
-        return redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
-                c->timeout, c->tcp.source_addr);
-    } else if (c->connection_type == REDIS_CONN_UNIX) {
-        return redisContextConnectUnix(c, c->unix_sock.path, c->timeout);
-    } else {
-        /* Something bad happened here and shouldn't have. There isn't
-           enough information in the context to reconnect. */
-        __redisSetError(c,REDIS_ERR_OTHER,"Not enough information to reconnect");
-    }
-
-    return REDIS_ERR;
-}
-
-/* Connect to a Redis instance. On error the field error in the returned
- * context will be set to the return value of the error function.
- * When no set of reply functions is given, the default set will be used. */
-redisContext *redisConnect(const char *ip, int port) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,NULL);
-    return c;
-}
-
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,&tv);
-    return c;
-}
-
-redisContext *redisConnectNonBlock(const char *ip, int port) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags &= ~REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,NULL);
-    return c;
-}
-
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr) {
-    redisContext *c = redisContextInit();
-    c->flags &= ~REDIS_BLOCK;
-    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
-    return c;
-}
-
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr) {
-    redisContext *c = redisContextInit();
-    c->flags &= ~REDIS_BLOCK;
-    c->flags |= REDIS_REUSEADDR;
-    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
-    return c;
-}
-
-redisContext *redisConnectUnix(const char *path) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectUnix(c,path,NULL);
-    return c;
-}
-
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectUnix(c,path,&tv);
-    return c;
-}
-
-redisContext *redisConnectUnixNonBlock(const char *path) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags &= ~REDIS_BLOCK;
-    redisContextConnectUnix(c,path,NULL);
-    return c;
-}
-
-redisContext *redisConnectFd(int fd) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->fd = fd;
-    c->flags |= REDIS_BLOCK | REDIS_CONNECTED;
-    return c;
-}
-
-/* Set read/write timeout on a blocking socket. */
-int redisSetTimeout(redisContext *c, const struct timeval tv) {
-    if (c->flags & REDIS_BLOCK)
-        return redisContextSetTimeout(c,tv);
-    return REDIS_ERR;
-}
-
-/* Enable connection KeepAlive. */
-int redisEnableKeepAlive(redisContext *c) {
-    if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
-        return REDIS_ERR;
-    return REDIS_OK;
-}
-
-/* Use this function to handle a read event on the descriptor. It will try
- * and read some bytes from the socket and feed them to the reply parser.
- *
- * After this function is called, you may use redisContextReadReply to
- * see if there is a reply available. */
-int redisBufferRead(redisContext *c) {
-    char buf[1024*16];
-    int nread;
-
-    /* Return early when the context has seen an error. */
-    if (c->err)
-        return REDIS_ERR;
-
-    nread = read(c->fd,buf,sizeof(buf));
-    if (nread == -1) {
-        if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-            /* Try again later */
-        } else {
-            __redisSetError(c,REDIS_ERR_IO,NULL);
-            return REDIS_ERR;
-        }
-    } else if (nread == 0) {
-        __redisSetError(c,REDIS_ERR_EOF,"Server closed the connection");
-        return REDIS_ERR;
-    } else {
-        if (redisReaderFeed(c->reader,buf,nread) != REDIS_OK) {
-            __redisSetError(c,c->reader->err,c->reader->errstr);
-            return REDIS_ERR;
-        }
-    }
-    return REDIS_OK;
-}
-
-/* Write the output buffer to the socket.
- *
- * Returns REDIS_OK when the buffer is empty, or (a part of) the buffer was
- * successfully written to the socket. When the buffer is empty after the
- * write operation, "done" is set to 1 (if given).
- *
- * Returns REDIS_ERR if an error occurred trying to write and sets
- * c->errstr to hold the appropriate error string.
- */
-int redisBufferWrite(redisContext *c, int *done) {
-    int nwritten;
-
-    /* Return early when the context has seen an error. */
-    if (c->err)
-        return REDIS_ERR;
-
-    if (sdslen(c->obuf) > 0) {
-        nwritten = write(c->fd,c->obuf,sdslen(c->obuf));
-        if (nwritten == -1) {
-            if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-                /* Try again later */
-            } else {
-                __redisSetError(c,REDIS_ERR_IO,NULL);
-                return REDIS_ERR;
-            }
-        } else if (nwritten > 0) {
-            if (nwritten == (signed)sdslen(c->obuf)) {
-                sdsfree(c->obuf);
-                c->obuf = sdsempty();
-            } else {
-                sdsrange(c->obuf,nwritten,-1);
-            }
-        }
-    }
-    if (done != NULL) *done = (sdslen(c->obuf) == 0);
-    return REDIS_OK;
-}
-
-/* Internal helper function to try and get a reply from the reader,
- * or set an error in the context otherwise. */
-int redisGetReplyFromReader(redisContext *c, void **reply) {
-    if (redisReaderGetReply(c->reader,reply) == REDIS_ERR) {
-        __redisSetError(c,c->reader->err,c->reader->errstr);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-int redisGetReply(redisContext *c, void **reply) {
-    int wdone = 0;
-    void *aux = NULL;
-
-    /* Try to read pending replies */
-    if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
-        return REDIS_ERR;
-
-    /* For the blocking context, flush output buffer and read reply */
-    if (aux == NULL && c->flags & REDIS_BLOCK) {
-        /* Write until done */
-        do {
-            if (redisBufferWrite(c,&wdone) == REDIS_ERR)
-                return REDIS_ERR;
-        } while (!wdone);
-
-        /* Read until there is a reply */
-        do {
-            if (redisBufferRead(c) == REDIS_ERR)
-                return REDIS_ERR;
-            if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
-                return REDIS_ERR;
-        } while (aux == NULL);
-    }
-
-    /* Set reply object */
-    if (reply != NULL) *reply = aux;
-    return REDIS_OK;
-}
-
-
-/* Helper function for the redisAppendCommand* family of functions.
- *
- * Write a formatted command to the output buffer. When this family
- * is used, you need to call redisGetReply yourself to retrieve
- * the reply (or replies in pub/sub).
- */
-int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) {
-    sds newbuf;
-
-    newbuf = sdscatlen(c->obuf,cmd,len);
-    if (newbuf == NULL) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    }
-
-    c->obuf = newbuf;
-    return REDIS_OK;
-}
-
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len) {
-
-    if (__redisAppendCommand(c, cmd, len) != REDIS_OK) {
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap) {
-    char *cmd;
-    int len;
-
-    len = redisvFormatCommand(&cmd,format,ap);
-    if (len == -1) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    } else if (len == -2) {
-        __redisSetError(c,REDIS_ERR_OTHER,"Invalid format string");
-        return REDIS_ERR;
-    }
-
-    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
-        free(cmd);
-        return REDIS_ERR;
-    }
-
-    free(cmd);
-    return REDIS_OK;
-}
-
-int redisAppendCommand(redisContext *c, const char *format, ...) {
-    va_list ap;
-    int ret;
-
-    va_start(ap,format);
-    ret = redisvAppendCommand(c,format,ap);
-    va_end(ap);
-    return ret;
-}
-
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
-    sds cmd;
-    int len;
-
-    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
-    if (len == -1) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    }
-
-    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
-        sdsfree(cmd);
-        return REDIS_ERR;
-    }
-
-    sdsfree(cmd);
-    return REDIS_OK;
-}
-
-/* Helper function for the redisCommand* family of functions.
- *
- * Write a formatted command to the output buffer. If the given context is
- * blocking, immediately read the reply into the "reply" pointer. When the
- * context is non-blocking, the "reply" pointer will not be used and the
- * command is simply appended to the write buffer.
- *
- * Returns the reply when a reply was successfully retrieved. Returns NULL
- * otherwise. When NULL is returned in a blocking context, the error field
- * in the context will be set.
- */
-static void *__redisBlockForReply(redisContext *c) {
-    void *reply;
-
-    if (c->flags & REDIS_BLOCK) {
-        if (redisGetReply(c,&reply) != REDIS_OK)
-            return NULL;
-        return reply;
-    }
-    return NULL;
-}
-
-void *redisvCommand(redisContext *c, const char *format, va_list ap) {
-    if (redisvAppendCommand(c,format,ap) != REDIS_OK)
-        return NULL;
-    return __redisBlockForReply(c);
-}
-
-void *redisCommand(redisContext *c, const char *format, ...) {
-    va_list ap;
-    void *reply = NULL;
-    va_start(ap,format);
-    reply = redisvCommand(c,format,ap);
-    va_end(ap);
-    return reply;
-}
-
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
-    if (redisAppendCommandArgv(c,argc,argv,argvlen) != REDIS_OK)
-        return NULL;
-    return __redisBlockForReply(c);
-}
diff --git a/debian/modules/nchan/src/hiredis/hiredis.h b/debian/modules/nchan/src/hiredis/hiredis.h
deleted file mode 100644
index edba658..0000000
--- a/debian/modules/nchan/src/hiredis/hiredis.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_H
-#define __HIREDIS_H
-#include "read.h"
-#include <stdarg.h> /* for va_list */
-#include <sys/time.h> /* for struct timeval */
-#include <stdint.h> /* uintXX_t, etc */
-#include "sds.h" /* for sds */
-
-#define HIREDIS_MAJOR 0
-#define HIREDIS_MINOR 13
-#define HIREDIS_PATCH 3
-#define HIREDIS_SONAME 0.13
-
-/* Connection type can be blocking or non-blocking and is set in the
- * least significant bit of the flags field in redisContext. */
-#define REDIS_BLOCK 0x1
-
-/* Connection may be disconnected before being free'd. The second bit
- * in the flags field is set when the context is connected. */
-#define REDIS_CONNECTED 0x2
-
-/* The async API might try to disconnect cleanly and flush the output
- * buffer and read all subsequent replies before disconnecting.
- * This flag means no new commands can come in and the connection
- * should be terminated once all replies have been read. */
-#define REDIS_DISCONNECTING 0x4
-
-/* Flag specific to the async API which means that the context should be clean
- * up as soon as possible. */
-#define REDIS_FREEING 0x8
-
-/* Flag that is set when an async callback is executed. */
-#define REDIS_IN_CALLBACK 0x10
-
-/* Flag that is set when the async context has one or more subscriptions. */
-#define REDIS_SUBSCRIBED 0x20
-
-/* Flag that is set when monitor mode is active */
-#define REDIS_MONITORING 0x40
-
-/* Flag that is set when we should set SO_REUSEADDR before calling bind() */
-#define REDIS_REUSEADDR 0x80
-
-#define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
-
-/* number of times we retry to connect in the case of EADDRNOTAVAIL and
- * SO_REUSEADDR is being used. */
-#define REDIS_CONNECT_RETRIES  10
-
-/* strerror_r has two completely different prototypes and behaviors
- * depending on system issues, so we need to operate on the error buffer
- * differently depending on which strerror_r we're using. */
-#ifndef _GNU_SOURCE
-/* "regular" POSIX strerror_r that does the right thing. */
-#define __redis_strerror_r(errno, buf, len)                                    \
-    do {                                                                       \
-        strerror_r((errno), (buf), (len));                                     \
-    } while (0)
-#else
-/* "bad" GNU strerror_r we need to clean up after. */
-#define __redis_strerror_r(errno, buf, len)                                    \
-    do {                                                                       \
-        char *err_str = strerror_r((errno), (buf), (len));                     \
-        /* If return value _isn't_ the start of the buffer we passed in,       \
-         * then GNU strerror_r returned an internal static buffer and we       \
-         * need to copy the result into our private buffer. */                 \
-        if (err_str != (buf)) {                                                \
-            buf[(len)] = '\0';                                                 \
-            strncat((buf), err_str, ((len) - 1));                              \
-        }                                                                      \
-    } while (0)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the reply object returned by redisCommand() */
-typedef struct redisReply {
-    int type; /* REDIS_REPLY_* */
-    long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
-    int len; /* Length of string */
-    char *str; /* Used for both REDIS_REPLY_ERROR and REDIS_REPLY_STRING */
-    size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
-    struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
-} redisReply;
-
-redisReader *redisReaderCreate(void);
-
-/* Function to free the reply objects hiredis returns by default. */
-void freeReplyObject(void *reply);
-
-/* Functions to format a command according to the protocol. */
-int redisvFormatCommand(char **target, const char *format, va_list ap);
-int redisFormatCommand(char **target, const char *format, ...);
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
-int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
-void redisFreeCommand(char *cmd);
-void redisFreeSdsCommand(sds cmd);
-
-enum redisConnectionType {
-    REDIS_CONN_TCP,
-    REDIS_CONN_UNIX,
-};
-
-/* Context for a connection to Redis */
-typedef struct redisContext {
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-    int fd;
-    int flags;
-    char *obuf; /* Write buffer */
-    redisReader *reader; /* Protocol reader */
-
-    enum redisConnectionType connection_type;
-    struct timeval *timeout;
-
-    struct {
-        char *host;
-        char *source_addr;
-        int port;
-    } tcp;
-
-    struct {
-        char *path;
-    } unix_sock;
-
-} redisContext;
-
-redisContext *redisConnect(const char *ip, int port);
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
-redisContext *redisConnectNonBlock(const char *ip, int port);
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr);
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr);
-redisContext *redisConnectUnix(const char *path);
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
-redisContext *redisConnectUnixNonBlock(const char *path);
-redisContext *redisConnectFd(int fd);
-
-/**
- * Reconnect the given context using the saved information.
- *
- * This re-uses the exact same connect options as in the initial connection.
- * host, ip (or path), timeout and bind address are reused,
- * flags are used unmodified from the existing context.
- *
- * Returns REDIS_OK on successful connect or REDIS_ERR otherwise.
- */
-int redisReconnect(redisContext *c);
-
-int redisSetTimeout(redisContext *c, const struct timeval tv);
-int redisEnableKeepAlive(redisContext *c);
-void redisFree(redisContext *c);
-int redisFreeKeepFd(redisContext *c);
-int redisBufferRead(redisContext *c);
-int redisBufferWrite(redisContext *c, int *done);
-
-/* In a blocking context, this function first checks if there are unconsumed
- * replies to return and returns one if so. Otherwise, it flushes the output
- * buffer to the socket and reads until it has a reply. In a non-blocking
- * context, it will return unconsumed replies until there are no more. */
-int redisGetReply(redisContext *c, void **reply);
-int redisGetReplyFromReader(redisContext *c, void **reply);
-
-/* Write a formatted command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
-
-/* Write a command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
-int redisAppendCommand(redisContext *c, const char *format, ...);
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-/* Issue a command to Redis. In a blocking context, it is identical to calling
- * redisAppendCommand, followed by redisGetReply. The function will return
- * NULL if there was an error in performing the request, otherwise it will
- * return the reply. In a non-blocking context, it is identical to calling
- * only redisAppendCommand and will always return NULL. */
-void *redisvCommand(redisContext *c, const char *format, va_list ap);
-void *redisCommand(redisContext *c, const char *format, ...);
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/hiredis/net.c b/debian/modules/nchan/src/hiredis/net.c
deleted file mode 100644
index 60a2dc7..0000000
--- a/debian/modules/nchan/src/hiredis/net.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <netdb.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <poll.h>
-#include <limits.h>
-#include <stdlib.h>
-
-#include "net.h"
-#include "sds.h"
-
-/* Defined in hiredis.c */
-void __redisSetError(redisContext *c, int type, const char *str);
-
-static void redisContextCloseFd(redisContext *c) {
-    if (c && c->fd >= 0) {
-        close(c->fd);
-        c->fd = -1;
-    }
-}
-
-static void __redisSetErrorFromErrno(redisContext *c, int type, const char *prefix) {
-    char buf[128] = { 0 };
-    size_t len = 0;
-
-    if (prefix != NULL)
-        len = snprintf(buf,sizeof(buf),"%s: ",prefix);
-    __redis_strerror_r(errno, (char *)(buf + len), sizeof(buf) - len);
-    __redisSetError(c,type,buf);
-}
-
-static int redisSetReuseAddr(redisContext *c) {
-    int on = 1;
-    if (setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        redisContextCloseFd(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-static int redisCreateSocket(redisContext *c, int type) {
-    int s;
-    if ((s = socket(type, SOCK_STREAM, 0)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        return REDIS_ERR;
-    }
-    c->fd = s;
-    if (type == AF_INET) {
-        if (redisSetReuseAddr(c) == REDIS_ERR) {
-            return REDIS_ERR;
-        }
-    }
-    return REDIS_OK;
-}
-
-static int redisSetBlocking(redisContext *c, int blocking) {
-    int flags;
-
-    /* Set the socket nonblocking.
-     * Note that fcntl(2) for F_GETFL and F_SETFL can't be
-     * interrupted by a signal. */
-    if ((flags = fcntl(c->fd, F_GETFL)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_GETFL)");
-        redisContextCloseFd(c);
-        return REDIS_ERR;
-    }
-
-    if (blocking)
-        flags &= ~O_NONBLOCK;
-    else
-        flags |= O_NONBLOCK;
-
-    if (fcntl(c->fd, F_SETFL, flags) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_SETFL)");
-        redisContextCloseFd(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-int redisKeepAlive(redisContext *c, int interval) {
-    int val = 1;
-    int fd = c->fd;
-
-    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == -1){
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = interval;
-
-#ifdef _OSX
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-#else
-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
-    val = interval;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = interval/3;
-    if (val == 0) val = 1;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = 3;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-#endif
-#endif
-
-    return REDIS_OK;
-}
-
-static int redisSetTcpNoDelay(redisContext *c) {
-    int yes = 1;
-    if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(TCP_NODELAY)");
-        redisContextCloseFd(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-#define __MAX_MSEC (((LONG_MAX) - 999) / 1000)
-
-static int redisContextWaitReady(redisContext *c, const struct timeval *timeout) {
-    struct pollfd   wfd[1];
-    long msec;
-
-    msec          = -1;
-    wfd[0].fd     = c->fd;
-    wfd[0].events = POLLOUT;
-
-    /* Only use timeout when not NULL. */
-    if (timeout != NULL) {
-        if (timeout->tv_usec > 1000000 || timeout->tv_sec > __MAX_MSEC) {
-            __redisSetErrorFromErrno(c, REDIS_ERR_IO, NULL);
-            redisContextCloseFd(c);
-            return REDIS_ERR;
-        }
-
-        msec = (timeout->tv_sec * 1000) + ((timeout->tv_usec + 999) / 1000);
-
-        if (msec < 0 || msec > INT_MAX) {
-            msec = INT_MAX;
-        }
-    }
-
-    if (errno == EINPROGRESS) {
-        int res;
-
-        if ((res = poll(wfd, 1, msec)) == -1) {
-            __redisSetErrorFromErrno(c, REDIS_ERR_IO, "poll(2)");
-            redisContextCloseFd(c);
-            return REDIS_ERR;
-        } else if (res == 0) {
-            errno = ETIMEDOUT;
-            __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-            redisContextCloseFd(c);
-            return REDIS_ERR;
-        }
-
-        if (redisCheckSocketError(c) != REDIS_OK)
-            return REDIS_ERR;
-
-        return REDIS_OK;
-    }
-
-    __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-    redisContextCloseFd(c);
-    return REDIS_ERR;
-}
-
-int redisCheckSocketError(redisContext *c) {
-    int err = 0;
-    socklen_t errlen = sizeof(err);
-
-    if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"getsockopt(SO_ERROR)");
-        return REDIS_ERR;
-    }
-
-    if (err) {
-        errno = err;
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
-    if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,&tv,sizeof(tv)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_RCVTIMEO)");
-        return REDIS_ERR;
-    }
-    if (setsockopt(c->fd,SOL_SOCKET,SO_SNDTIMEO,&tv,sizeof(tv)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_SNDTIMEO)");
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
-                                   const struct timeval *timeout,
-                                   const char *source_addr) {
-    int s, rv, n;
-    char _port[6];  /* strlen("65535"); */
-    struct addrinfo hints, *servinfo, *bservinfo, *p, *b;
-    int blocking = (c->flags & REDIS_BLOCK);
-    int reuseaddr = (c->flags & REDIS_REUSEADDR);
-    int reuses = 0;
-
-    c->connection_type = REDIS_CONN_TCP;
-    c->tcp.port = port;
-
-    /* We need to take possession of the passed parameters
-     * to make them reusable for a reconnect.
-     * We also carefully check we don't free data we already own,
-     * as in the case of the reconnect method.
-     *
-     * This is a bit ugly, but atleast it works and doesn't leak memory.
-     **/
-    if (c->tcp.host != addr) {
-        if (c->tcp.host)
-            free(c->tcp.host);
-
-        c->tcp.host = strdup(addr);
-    }
-
-    if (timeout) {
-        if (c->timeout != timeout) {
-            if (c->timeout == NULL)
-                c->timeout = malloc(sizeof(struct timeval));
-
-            memcpy(c->timeout, timeout, sizeof(struct timeval));
-        }
-    } else {
-        if (c->timeout)
-            free(c->timeout);
-        c->timeout = NULL;
-    }
-
-    if (source_addr == NULL) {
-        free(c->tcp.source_addr);
-        c->tcp.source_addr = NULL;
-    } else if (c->tcp.source_addr != source_addr) {
-        free(c->tcp.source_addr);
-        c->tcp.source_addr = strdup(source_addr);
-    }
-
-    snprintf(_port, 6, "%d", port);
-    memset(&hints,0,sizeof(hints));
-    hints.ai_family = AF_INET;
-    hints.ai_socktype = SOCK_STREAM;
-
-    /* Try with IPv6 if no IPv4 address was found. We do it in this order since
-     * in a Redis client you can't afford to test if you have IPv6 connectivity
-     * as this would add latency to every connect. Otherwise a more sensible
-     * route could be: Use IPv6 if both addresses are available and there is IPv6
-     * connectivity. */
-    if ((rv = getaddrinfo(c->tcp.host,_port,&hints,&servinfo)) != 0) {
-         hints.ai_family = AF_INET6;
-         if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) {
-            __redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv));
-            return REDIS_ERR;
-        }
-    }
-    for (p = servinfo; p != NULL; p = p->ai_next) {
-addrretry:
-        if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == -1)
-            continue;
-
-        c->fd = s;
-        if (redisSetBlocking(c,0) != REDIS_OK)
-            goto error;
-        if (c->tcp.source_addr) {
-            int bound = 0;
-            /* Using getaddrinfo saves us from self-determining IPv4 vs IPv6 */
-            if ((rv = getaddrinfo(c->tcp.source_addr, NULL, &hints, &bservinfo)) != 0) {
-                char buf[128];
-                snprintf(buf,sizeof(buf),"Can't get addr: %s",gai_strerror(rv));
-                __redisSetError(c,REDIS_ERR_OTHER,buf);
-                goto error;
-            }
-
-            if (reuseaddr) {
-                n = 1;
-                if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*) &n,
-                               sizeof(n)) < 0) {
-                    goto error;
-                }
-            }
-
-            for (b = bservinfo; b != NULL; b = b->ai_next) {
-                if (bind(s,b->ai_addr,b->ai_addrlen) != -1) {
-                    bound = 1;
-                    break;
-                }
-            }
-            freeaddrinfo(bservinfo);
-            if (!bound) {
-                char buf[128];
-                snprintf(buf,sizeof(buf),"Can't bind socket: %s",strerror(errno));
-                __redisSetError(c,REDIS_ERR_OTHER,buf);
-                goto error;
-            }
-        }
-        if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
-            if (errno == EHOSTUNREACH) {
-                redisContextCloseFd(c);
-                continue;
-            } else if (errno == EINPROGRESS && !blocking) {
-                /* This is ok. */
-            } else if (errno == EADDRNOTAVAIL && reuseaddr) {
-                if (++reuses >= REDIS_CONNECT_RETRIES) {
-                    goto error;
-                } else {
-                    goto addrretry;
-                }
-            } else {
-                if (redisContextWaitReady(c,c->timeout) != REDIS_OK)
-                    goto error;
-            }
-        }
-        if (blocking && redisSetBlocking(c,1) != REDIS_OK)
-            goto error;
-        if (redisSetTcpNoDelay(c) != REDIS_OK)
-            goto error;
-
-        c->flags |= REDIS_CONNECTED;
-        rv = REDIS_OK;
-        goto end;
-    }
-    if (p == NULL) {
-        char buf[128];
-        snprintf(buf,sizeof(buf),"Can't create socket: %s",strerror(errno));
-        __redisSetError(c,REDIS_ERR_OTHER,buf);
-        goto error;
-    }
-
-error:
-    rv = REDIS_ERR;
-end:
-    freeaddrinfo(servinfo);
-    return rv;  // Need to return REDIS_OK if alright
-}
-
-int redisContextConnectTcp(redisContext *c, const char *addr, int port,
-                           const struct timeval *timeout) {
-    return _redisContextConnectTcp(c, addr, port, timeout, NULL);
-}
-
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr) {
-    return _redisContextConnectTcp(c, addr, port, timeout, source_addr);
-}
-
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout) {
-    int blocking = (c->flags & REDIS_BLOCK);
-    struct sockaddr_un sa;
-
-    if (redisCreateSocket(c,AF_LOCAL) < 0)
-        return REDIS_ERR;
-    if (redisSetBlocking(c,0) != REDIS_OK)
-        return REDIS_ERR;
-
-    c->connection_type = REDIS_CONN_UNIX;
-    if (c->unix_sock.path != path)
-        c->unix_sock.path = strdup(path);
-
-    if (timeout) {
-        if (c->timeout != timeout) {
-            if (c->timeout == NULL)
-                c->timeout = malloc(sizeof(struct timeval));
-
-            memcpy(c->timeout, timeout, sizeof(struct timeval));
-        }
-    } else {
-        if (c->timeout)
-            free(c->timeout);
-        c->timeout = NULL;
-    }
-
-    sa.sun_family = AF_LOCAL;
-    strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
-    if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
-        if (errno == EINPROGRESS && !blocking) {
-            /* This is ok. */
-        } else {
-            if (redisContextWaitReady(c,c->timeout) != REDIS_OK)
-                return REDIS_ERR;
-        }
-    }
-
-    /* Reset socket to be blocking after connect(2). */
-    if (blocking && redisSetBlocking(c,1) != REDIS_OK)
-        return REDIS_ERR;
-
-    c->flags |= REDIS_CONNECTED;
-    return REDIS_OK;
-}
diff --git a/debian/modules/nchan/src/hiredis/net.h b/debian/modules/nchan/src/hiredis/net.h
deleted file mode 100644
index 2f1a0bf..0000000
--- a/debian/modules/nchan/src/hiredis/net.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __NET_H
-#define __NET_H
-
-#include "hiredis.h"
-
-#if defined(__sun)
-#define AF_LOCAL AF_UNIX
-#endif
-
-int redisCheckSocketError(redisContext *c);
-int redisContextSetTimeout(redisContext *c, const struct timeval tv);
-int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr);
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
-int redisKeepAlive(redisContext *c, int interval);
-
-#endif
diff --git a/debian/modules/nchan/src/hiredis/read.c b/debian/modules/nchan/src/hiredis/read.c
deleted file mode 100644
index df1a467..0000000
--- a/debian/modules/nchan/src/hiredis/read.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "fmacros.h"
-#include <string.h>
-#include <stdlib.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-#include <assert.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include "read.h"
-#include "sds.h"
-
-static void __redisReaderSetError(redisReader *r, int type, const char *str) {
-    size_t len;
-
-    if (r->reply != NULL && r->fn && r->fn->freeObject) {
-        r->fn->freeObject(r->reply);
-        r->reply = NULL;
-    }
-
-    /* Clear input buffer on errors. */
-    if (r->buf != NULL) {
-        sdsfree(r->buf);
-        r->buf = NULL;
-        r->pos = r->len = 0;
-    }
-
-    /* Reset task stack. */
-    r->ridx = -1;
-
-    /* Set error. */
-    r->err = type;
-    len = strlen(str);
-    len = len < (sizeof(r->errstr)-1) ? len : (sizeof(r->errstr)-1);
-    memcpy(r->errstr,str,len);
-    r->errstr[len] = '\0';
-}
-
-static size_t chrtos(char *buf, size_t size, char byte) {
-    size_t len = 0;
-
-    switch(byte) {
-    case '\\':
-    case '"':
-        len = snprintf(buf,size,"\"\\%c\"",byte);
-        break;
-    case '\n': len = snprintf(buf,size,"\"\\n\""); break;
-    case '\r': len = snprintf(buf,size,"\"\\r\""); break;
-    case '\t': len = snprintf(buf,size,"\"\\t\""); break;
-    case '\a': len = snprintf(buf,size,"\"\\a\""); break;
-    case '\b': len = snprintf(buf,size,"\"\\b\""); break;
-    default:
-        if (isprint(byte))
-            len = snprintf(buf,size,"\"%c\"",byte);
-        else
-            len = snprintf(buf,size,"\"\\x%02x\"",(unsigned char)byte);
-        break;
-    }
-
-    return len;
-}
-
-static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte) {
-    char cbuf[8], sbuf[128];
-
-    chrtos(cbuf,sizeof(cbuf),byte);
-    snprintf(sbuf,sizeof(sbuf),
-        "Protocol error, got %s as reply type byte", cbuf);
-    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
-}
-
-static void __redisReaderSetErrorOOM(redisReader *r) {
-    __redisReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
-}
-
-static char *readBytes(redisReader *r, unsigned int bytes) {
-    char *p;
-    if (r->len-r->pos >= bytes) {
-        p = r->buf+r->pos;
-        r->pos += bytes;
-        return p;
-    }
-    return NULL;
-}
-
-/* Find pointer to \r\n. */
-static char *seekNewline(char *s, size_t len) {
-    int pos = 0;
-    int _len = len-1;
-
-    /* Position should be < len-1 because the character at "pos" should be
-     * followed by a \n. Note that strchr cannot be used because it doesn't
-     * allow to search a limited length and the buffer that is being searched
-     * might not have a trailing NULL character. */
-    while (pos < _len) {
-        while(pos < _len && s[pos] != '\r') pos++;
-        if (s[pos] != '\r') {
-            /* Not found. */
-            return NULL;
-        } else {
-            if (s[pos+1] == '\n') {
-                /* Found. */
-                return s+pos;
-            } else {
-                /* Continue searching. */
-                pos++;
-            }
-        }
-    }
-    return NULL;
-}
-
-/* Read a long long value starting at *s, under the assumption that it will be
- * terminated by \r\n. Ambiguously returns -1 for unexpected input. */
-static long long readLongLong(char *s) {
-    long long v = 0;
-    int dec, mult = 1;
-    char c;
-
-    if (*s == '-') {
-        mult = -1;
-        s++;
-    } else if (*s == '+') {
-        mult = 1;
-        s++;
-    }
-
-    while ((c = *(s++)) != '\r') {
-        dec = c - '0';
-        if (dec >= 0 && dec < 10) {
-            v *= 10;
-            v += dec;
-        } else {
-            /* Should not happen... */
-            return -1;
-        }
-    }
-
-    return mult*v;
-}
-
-static char *readLine(redisReader *r, int *_len) {
-    char *p, *s;
-    int len;
-
-    p = r->buf+r->pos;
-    s = seekNewline(p,(r->len-r->pos));
-    if (s != NULL) {
-        len = s-(r->buf+r->pos);
-        r->pos += len+2; /* skip \r\n */
-        if (_len) *_len = len;
-        return p;
-    }
-    return NULL;
-}
-
-static void moveToNextTask(redisReader *r) {
-    redisReadTask *cur, *prv;
-    while (r->ridx >= 0) {
-        /* Return a.s.a.p. when the stack is now empty. */
-        if (r->ridx == 0) {
-            r->ridx--;
-            return;
-        }
-
-        cur = &(r->rstack[r->ridx]);
-        prv = &(r->rstack[r->ridx-1]);
-        assert(prv->type == REDIS_REPLY_ARRAY);
-        if (cur->idx == prv->elements-1) {
-            r->ridx--;
-        } else {
-            /* Reset the type because the next item can be anything */
-            assert(cur->idx < prv->elements);
-            cur->type = -1;
-            cur->elements = -1;
-            cur->idx++;
-            return;
-        }
-    }
-}
-
-static int processLineItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
-    void *obj;
-    char *p;
-    int len;
-
-    if ((p = readLine(r,&len)) != NULL) {
-        if (cur->type == REDIS_REPLY_INTEGER) {
-            if (r->fn && r->fn->createInteger)
-                obj = r->fn->createInteger(cur,readLongLong(p));
-            else
-                obj = (void*)REDIS_REPLY_INTEGER;
-        } else {
-            /* Type will be error or status. */
-            if (r->fn && r->fn->createString)
-                obj = r->fn->createString(cur,p,len);
-            else
-                obj = (void*)(size_t)(cur->type);
-        }
-
-        if (obj == NULL) {
-            __redisReaderSetErrorOOM(r);
-            return REDIS_ERR;
-        }
-
-        /* Set reply if this is the root object. */
-        if (r->ridx == 0) r->reply = obj;
-        moveToNextTask(r);
-        return REDIS_OK;
-    }
-
-    return REDIS_ERR;
-}
-
-static int processBulkItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
-    void *obj = NULL;
-    char *p, *s;
-    long len;
-    unsigned long bytelen;
-    int success = 0;
-
-    p = r->buf+r->pos;
-    s = seekNewline(p,r->len-r->pos);
-    if (s != NULL) {
-        p = r->buf+r->pos;
-        bytelen = s-(r->buf+r->pos)+2; /* include \r\n */
-        len = readLongLong(p);
-
-        if (len < 0) {
-            /* The nil object can always be created. */
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-            success = 1;
-        } else {
-            /* Only continue when the buffer contains the entire bulk item. */
-            bytelen += len+2; /* include \r\n */
-            if (r->pos+bytelen <= r->len) {
-                if (r->fn && r->fn->createString)
-                    obj = r->fn->createString(cur,s+2,len);
-                else
-                    obj = (void*)REDIS_REPLY_STRING;
-                success = 1;
-            }
-        }
-
-        /* Proceed when obj was created. */
-        if (success) {
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            r->pos += bytelen;
-
-            /* Set reply if this is the root object. */
-            if (r->ridx == 0) r->reply = obj;
-            moveToNextTask(r);
-            return REDIS_OK;
-        }
-    }
-
-    return REDIS_ERR;
-}
-
-static int processMultiBulkItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
-    void *obj;
-    char *p;
-    long elements;
-    int root = 0;
-
-    /* Set error for nested multi bulks with depth > 7 */
-    if (r->ridx == 8) {
-        __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-            "No support for nested multi bulk replies with depth > 7");
-        return REDIS_ERR;
-    }
-
-    if ((p = readLine(r,NULL)) != NULL) {
-        elements = readLongLong(p);
-        root = (r->ridx == 0);
-
-        if (elements == -1) {
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            moveToNextTask(r);
-        } else {
-            if (r->fn && r->fn->createArray)
-                obj = r->fn->createArray(cur,elements);
-            else
-                obj = (void*)REDIS_REPLY_ARRAY;
-
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            /* Modify task stack when there are more than 0 elements. */
-            if (elements > 0) {
-                cur->elements = elements;
-                cur->obj = obj;
-                r->ridx++;
-                r->rstack[r->ridx].type = -1;
-                r->rstack[r->ridx].elements = -1;
-                r->rstack[r->ridx].idx = 0;
-                r->rstack[r->ridx].obj = NULL;
-                r->rstack[r->ridx].parent = cur;
-                r->rstack[r->ridx].privdata = r->privdata;
-            } else {
-                moveToNextTask(r);
-            }
-        }
-
-        /* Set reply if this is the root object. */
-        if (root) r->reply = obj;
-        return REDIS_OK;
-    }
-
-    return REDIS_ERR;
-}
-
-static int processItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
-    char *p;
-
-    /* check if we need to read type */
-    if (cur->type < 0) {
-        if ((p = readBytes(r,1)) != NULL) {
-            switch (p[0]) {
-            case '-':
-                cur->type = REDIS_REPLY_ERROR;
-                break;
-            case '+':
-                cur->type = REDIS_REPLY_STATUS;
-                break;
-            case ':':
-                cur->type = REDIS_REPLY_INTEGER;
-                break;
-            case '$':
-                cur->type = REDIS_REPLY_STRING;
-                break;
-            case '*':
-                cur->type = REDIS_REPLY_ARRAY;
-                break;
-            default:
-                __redisReaderSetErrorProtocolByte(r,*p);
-                return REDIS_ERR;
-            }
-        } else {
-            /* could not consume 1 byte */
-            return REDIS_ERR;
-        }
-    }
-
-    /* process typed item */
-    switch(cur->type) {
-    case REDIS_REPLY_ERROR:
-    case REDIS_REPLY_STATUS:
-    case REDIS_REPLY_INTEGER:
-        return processLineItem(r);
-    case REDIS_REPLY_STRING:
-        return processBulkItem(r);
-    case REDIS_REPLY_ARRAY:
-        return processMultiBulkItem(r);
-    default:
-        assert(NULL);
-        return REDIS_ERR; /* Avoid warning. */
-    }
-}
-
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
-    redisReader *r;
-
-    r = calloc(sizeof(redisReader),1);
-    if (r == NULL)
-        return NULL;
-
-    r->err = 0;
-    r->errstr[0] = '\0';
-    r->fn = fn;
-    r->buf = sdsempty();
-    r->maxbuf = REDIS_READER_MAX_BUF;
-    if (r->buf == NULL) {
-        free(r);
-        return NULL;
-    }
-
-    r->ridx = -1;
-    return r;
-}
-
-void redisReaderFree(redisReader *r) {
-    if (r->reply != NULL && r->fn && r->fn->freeObject)
-        r->fn->freeObject(r->reply);
-    if (r->buf != NULL)
-        sdsfree(r->buf);
-    free(r);
-}
-
-int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
-    sds newbuf;
-
-    /* Return early when this reader is in an erroneous state. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* Copy the provided buffer. */
-    if (buf != NULL && len >= 1) {
-        /* Destroy internal buffer when it is empty and is quite large. */
-        if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) {
-            sdsfree(r->buf);
-            r->buf = sdsempty();
-            r->pos = 0;
-
-            /* r->buf should not be NULL since we just free'd a larger one. */
-            assert(r->buf != NULL);
-        }
-
-        newbuf = sdscatlen(r->buf,buf,len);
-        if (newbuf == NULL) {
-            __redisReaderSetErrorOOM(r);
-            return REDIS_ERR;
-        }
-
-        r->buf = newbuf;
-        r->len = sdslen(r->buf);
-    }
-
-    return REDIS_OK;
-}
-
-int redisReaderGetReply(redisReader *r, void **reply) {
-    /* Default target pointer to NULL. */
-    if (reply != NULL)
-        *reply = NULL;
-
-    /* Return early when this reader is in an erroneous state. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* When the buffer is empty, there will never be a reply. */
-    if (r->len == 0)
-        return REDIS_OK;
-
-    /* Set first item to process when the stack is empty. */
-    if (r->ridx == -1) {
-        r->rstack[0].type = -1;
-        r->rstack[0].elements = -1;
-        r->rstack[0].idx = -1;
-        r->rstack[0].obj = NULL;
-        r->rstack[0].parent = NULL;
-        r->rstack[0].privdata = r->privdata;
-        r->ridx = 0;
-    }
-
-    /* Process items in reply. */
-    while (r->ridx >= 0)
-        if (processItem(r) != REDIS_OK)
-            break;
-
-    /* Return ASAP when an error occurred. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* Discard part of the buffer when we've consumed at least 1k, to avoid
-     * doing unnecessary calls to memmove() in sds.c. */
-    if (r->pos >= 1024) {
-        sdsrange(r->buf,r->pos,-1);
-        r->pos = 0;
-        r->len = sdslen(r->buf);
-    }
-
-    /* Emit a reply when there is one. */
-    if (r->ridx == -1) {
-        if (reply != NULL)
-            *reply = r->reply;
-        r->reply = NULL;
-    }
-    return REDIS_OK;
-}
diff --git a/debian/modules/nchan/src/hiredis/read.h b/debian/modules/nchan/src/hiredis/read.h
deleted file mode 100644
index 180e6c6..0000000
--- a/debian/modules/nchan/src/hiredis/read.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef __HIREDIS_READ_H
-#define __HIREDIS_READ_H
-#include <stdio.h> /* for size_t */
-
-#define REDIS_ERR -1
-#define REDIS_OK 0
-
-/* When an error occurs, the err flag in a context is set to hold the type of
- * error that occurred. REDIS_ERR_IO means there was an I/O error and you
- * should use the "errno" variable to find out what is wrong.
- * For other values, the "errstr" field will hold a description. */
-#define REDIS_ERR_IO 1 /* Error in read or write */
-#define REDIS_ERR_EOF 3 /* End of file */
-#define REDIS_ERR_PROTOCOL 4 /* Protocol error */
-#define REDIS_ERR_OOM 5 /* Out of memory */
-#define REDIS_ERR_OTHER 2 /* Everything else... */
-
-#define REDIS_REPLY_STRING 1
-#define REDIS_REPLY_ARRAY 2
-#define REDIS_REPLY_INTEGER 3
-#define REDIS_REPLY_NIL 4
-#define REDIS_REPLY_STATUS 5
-#define REDIS_REPLY_ERROR 6
-
-#define REDIS_READER_MAX_BUF (1024*16)  /* Default max unused reader buffer. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct redisReadTask {
-    int type;
-    int elements; /* number of elements in multibulk container */
-    int idx; /* index in parent (array) object */
-    void *obj; /* holds user-generated value for a read task */
-    struct redisReadTask *parent; /* parent task */
-    void *privdata; /* user-settable arbitrary field */
-} redisReadTask;
-
-typedef struct redisReplyObjectFunctions {
-    void *(*createString)(const redisReadTask*, char*, size_t);
-    void *(*createArray)(const redisReadTask*, int);
-    void *(*createInteger)(const redisReadTask*, long long);
-    void *(*createNil)(const redisReadTask*);
-    void (*freeObject)(void*);
-} redisReplyObjectFunctions;
-
-typedef struct redisReader {
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-
-    char *buf; /* Read buffer */
-    size_t pos; /* Buffer cursor */
-    size_t len; /* Buffer length */
-    size_t maxbuf; /* Max length of unused buffer */
-
-    redisReadTask rstack[9];
-    int ridx; /* Index of current read task */
-    void *reply; /* Temporary reply pointer */
-
-    redisReplyObjectFunctions *fn;
-    void *privdata;
-} redisReader;
-
-/* Public API for the protocol parser. */
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn);
-void redisReaderFree(redisReader *r);
-int redisReaderFeed(redisReader *r, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *r, void **reply);
-
-/* Backwards compatibility, can be removed on big version bump. */
-#define redisReplyReaderCreate redisReaderCreate
-#define redisReplyReaderFree redisReaderFree
-#define redisReplyReaderFeed redisReaderFeed
-#define redisReplyReaderGetReply redisReaderGetReply
-#define redisReplyReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
-#define redisReplyReaderGetObject(_r) (((redisReader*)(_r))->reply)
-#define redisReplyReaderGetError(_r) (((redisReader*)(_r))->errstr)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/hiredis/sds.c b/debian/modules/nchan/src/hiredis/sds.c
deleted file mode 100644
index f01247d..0000000
--- a/debian/modules/nchan/src/hiredis/sds.c
+++ /dev/null
@@ -1,1095 +0,0 @@
-/* SDS (Simple Dynamic Strings), A C dynamic strings library.
- *
- * Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-
-#include "sds.h"
-
-/* Create a new sds string with the content specified by the 'init' pointer
- * and 'initlen'.
- * If NULL is used for 'init' the string is initialized with zero bytes.
- *
- * The string is always null-termined (all the sds strings are, always) so
- * even if you create an sds string with:
- *
- * mystring = sdsnewlen("abc",3");
- *
- * You can print the string with printf() as there is an implicit \0 at the
- * end of the string. However the string is binary safe and can contain
- * \0 characters in the middle, as the length is stored in the sds header. */
-sds sdsnewlen(const void *init, size_t initlen) {
-    struct sdshdr *sh;
-
-    if (init) {
-        sh = malloc(sizeof *sh+initlen+1);
-    } else {
-        sh = calloc(sizeof *sh+initlen+1,1);
-    }
-    if (sh == NULL) return NULL;
-    sh->len = initlen;
-    sh->free = 0;
-    if (initlen && init)
-        memcpy(sh->buf, init, initlen);
-    sh->buf[initlen] = '\0';
-    return (char*)sh->buf;
-}
-
-/* Create an empty (zero length) sds string. Even in this case the string
- * always has an implicit null term. */
-sds sdsempty(void) {
-    return sdsnewlen("",0);
-}
-
-/* Create a new sds string starting from a null termined C string. */
-sds sdsnew(const char *init) {
-    size_t initlen = (init == NULL) ? 0 : strlen(init);
-    return sdsnewlen(init, initlen);
-}
-
-/* Duplicate an sds string. */
-sds sdsdup(const sds s) {
-    return sdsnewlen(s, sdslen(s));
-}
-
-/* Free an sds string. No operation is performed if 's' is NULL. */
-void sdsfree(sds s) {
-    if (s == NULL) return;
-    free(s-sizeof(struct sdshdr));
-}
-
-/* Set the sds string length to the length as obtained with strlen(), so
- * considering as content only up to the first null term character.
- *
- * This function is useful when the sds string is hacked manually in some
- * way, like in the following example:
- *
- * s = sdsnew("foobar");
- * s[2] = '\0';
- * sdsupdatelen(s);
- * printf("%d\n", sdslen(s));
- *
- * The output will be "2", but if we comment out the call to sdsupdatelen()
- * the output will be "6" as the string was modified but the logical length
- * remains 6 bytes. */
-void sdsupdatelen(sds s) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-    int reallen = strlen(s);
-    sh->free += (sh->len-reallen);
-    sh->len = reallen;
-}
-
-/* Modify an sds string on-place to make it empty (zero length).
- * However all the existing buffer is not discarded but set as free space
- * so that next append operations will not require allocations up to the
- * number of bytes previously available. */
-void sdsclear(sds s) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-    sh->free += sh->len;
-    sh->len = 0;
-    sh->buf[0] = '\0';
-}
-
-/* Enlarge the free space at the end of the sds string so that the caller
- * is sure that after calling this function can overwrite up to addlen
- * bytes after the end of the string, plus one more byte for nul term.
- *
- * Note: this does not change the *length* of the sds string as returned
- * by sdslen(), but only the free buffer space we have. */
-sds sdsMakeRoomFor(sds s, size_t addlen) {
-    struct sdshdr *sh, *newsh;
-    size_t free = sdsavail(s);
-    size_t len, newlen;
-
-    if (free >= addlen) return s;
-    len = sdslen(s);
-    sh = (void*) (s-sizeof *sh);
-    newlen = (len+addlen);
-    if (newlen < SDS_MAX_PREALLOC)
-        newlen *= 2;
-    else
-        newlen += SDS_MAX_PREALLOC;
-    newsh = realloc(sh, sizeof *newsh+newlen+1);
-    if (newsh == NULL) return NULL;
-
-    newsh->free = newlen - len;
-    return newsh->buf;
-}
-
-/* Reallocate the sds string so that it has no free space at the end. The
- * contained string remains not altered, but next concatenation operations
- * will require a reallocation.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdsRemoveFreeSpace(sds s) {
-    struct sdshdr *sh;
-
-    sh = (void*) (s-sizeof *sh);
-    sh = realloc(sh, sizeof *sh+sh->len+1);
-    sh->free = 0;
-    return sh->buf;
-}
-
-/* Return the total size of the allocation of the specifed sds string,
- * including:
- * 1) The sds header before the pointer.
- * 2) The string.
- * 3) The free buffer at the end if any.
- * 4) The implicit null term.
- */
-size_t sdsAllocSize(sds s) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-
-    return sizeof(*sh)+sh->len+sh->free+1;
-}
-
-/* Increment the sds length and decrements the left free space at the
- * end of the string according to 'incr'. Also set the null term
- * in the new end of the string.
- *
- * This function is used in order to fix the string length after the
- * user calls sdsMakeRoomFor(), writes something after the end of
- * the current string, and finally needs to set the new length.
- *
- * Note: it is possible to use a negative increment in order to
- * right-trim the string.
- *
- * Usage example:
- *
- * Using sdsIncrLen() and sdsMakeRoomFor() it is possible to mount the
- * following schema, to cat bytes coming from the kernel to the end of an
- * sds string without copying into an intermediate buffer:
- *
- * oldlen = sdslen(s);
- * s = sdsMakeRoomFor(s, BUFFER_SIZE);
- * nread = read(fd, s+oldlen, BUFFER_SIZE);
- * ... check for nread <= 0 and handle it ...
- * sdsIncrLen(s, nread);
- */
-void sdsIncrLen(sds s, int incr) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-
-    assert(sh->free >= incr);
-    sh->len += incr;
-    sh->free -= incr;
-    assert(sh->free >= 0);
-    s[sh->len] = '\0';
-}
-
-/* Grow the sds to have the specified length. Bytes that were not part of
- * the original length of the sds will be set to zero.
- *
- * if the specified length is smaller than the current length, no operation
- * is performed. */
-sds sdsgrowzero(sds s, size_t len) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-    size_t totlen, curlen = sh->len;
-
-    if (len <= curlen) return s;
-    s = sdsMakeRoomFor(s,len-curlen);
-    if (s == NULL) return NULL;
-
-    /* Make sure added region doesn't contain garbage */
-    sh = (void*)(s-sizeof *sh);
-    memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */
-    totlen = sh->len+sh->free;
-    sh->len = len;
-    sh->free = totlen-sh->len;
-    return s;
-}
-
-/* Append the specified binary-safe string pointed by 't' of 'len' bytes to the
- * end of the specified sds string 's'.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatlen(sds s, const void *t, size_t len) {
-    struct sdshdr *sh;
-    size_t curlen = sdslen(s);
-
-    s = sdsMakeRoomFor(s,len);
-    if (s == NULL) return NULL;
-    sh = (void*) (s-sizeof *sh);
-    memcpy(s+curlen, t, len);
-    sh->len = curlen+len;
-    sh->free = sh->free-len;
-    s[curlen+len] = '\0';
-    return s;
-}
-
-/* Append the specified null termianted C string to the sds string 's'.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscat(sds s, const char *t) {
-    return sdscatlen(s, t, strlen(t));
-}
-
-/* Append the specified sds 't' to the existing sds 's'.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatsds(sds s, const sds t) {
-    return sdscatlen(s, t, sdslen(t));
-}
-
-/* Destructively modify the sds string 's' to hold the specified binary
- * safe string pointed by 't' of length 'len' bytes. */
-sds sdscpylen(sds s, const char *t, size_t len) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-    size_t totlen = sh->free+sh->len;
-
-    if (totlen < len) {
-        s = sdsMakeRoomFor(s,len-sh->len);
-        if (s == NULL) return NULL;
-        sh = (void*) (s-sizeof *sh);
-        totlen = sh->free+sh->len;
-    }
-    memcpy(s, t, len);
-    s[len] = '\0';
-    sh->len = len;
-    sh->free = totlen-len;
-    return s;
-}
-
-/* Like sdscpylen() but 't' must be a null-termined string so that the length
- * of the string is obtained with strlen(). */
-sds sdscpy(sds s, const char *t) {
-    return sdscpylen(s, t, strlen(t));
-}
-
-/* Helper for sdscatlonglong() doing the actual number -> string
- * conversion. 's' must point to a string with room for at least
- * SDS_LLSTR_SIZE bytes.
- *
- * The function returns the length of the null-terminated string
- * representation stored at 's'. */
-#define SDS_LLSTR_SIZE 21
-int sdsll2str(char *s, long long value) {
-    char *p, aux;
-    unsigned long long v;
-    size_t l;
-
-    /* Generate the string representation, this method produces
-     * an reversed string. */
-    v = (value < 0) ? -value : value;
-    p = s;
-    do {
-        *p++ = '0'+(v%10);
-        v /= 10;
-    } while(v);
-    if (value < 0) *p++ = '-';
-
-    /* Compute length and add null term. */
-    l = p-s;
-    *p = '\0';
-
-    /* Reverse the string. */
-    p--;
-    while(s < p) {
-        aux = *s;
-        *s = *p;
-        *p = aux;
-        s++;
-        p--;
-    }
-    return l;
-}
-
-/* Identical sdsll2str(), but for unsigned long long type. */
-int sdsull2str(char *s, unsigned long long v) {
-    char *p, aux;
-    size_t l;
-
-    /* Generate the string representation, this method produces
-     * an reversed string. */
-    p = s;
-    do {
-        *p++ = '0'+(v%10);
-        v /= 10;
-    } while(v);
-
-    /* Compute length and add null term. */
-    l = p-s;
-    *p = '\0';
-
-    /* Reverse the string. */
-    p--;
-    while(s < p) {
-        aux = *s;
-        *s = *p;
-        *p = aux;
-        s++;
-        p--;
-    }
-    return l;
-}
-
-/* Like sdscatpritf() but gets va_list instead of being variadic. */
-sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
-    va_list cpy;
-    char *buf, *t;
-    size_t buflen = 16;
-
-    while(1) {
-        buf = malloc(buflen);
-        if (buf == NULL) return NULL;
-        buf[buflen-2] = '\0';
-        va_copy(cpy,ap);
-        vsnprintf(buf, buflen, fmt, cpy);
-        if (buf[buflen-2] != '\0') {
-            free(buf);
-            buflen *= 2;
-            continue;
-        }
-        break;
-    }
-    t = sdscat(s, buf);
-    free(buf);
-    return t;
-}
-
-/* Append to the sds string 's' a string obtained using printf-alike format
- * specifier.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call.
- *
- * Example:
- *
- * s = sdsnew("Sum is: ");
- * s = sdscatprintf(s,"%d+%d = %d",a,b,a+b);
- *
- * Often you need to create a string from scratch with the printf-alike
- * format. When this is the need, just use sdsempty() as the target string:
- *
- * s = sdscatprintf(sdsempty(), "... your format ...", args);
- */
-sds sdscatprintf(sds s, const char *fmt, ...) {
-    va_list ap;
-    char *t;
-    va_start(ap, fmt);
-    t = sdscatvprintf(s,fmt,ap);
-    va_end(ap);
-    return t;
-}
-
-/* This function is similar to sdscatprintf, but much faster as it does
- * not rely on sprintf() family functions implemented by the libc that
- * are often very slow. Moreover directly handling the sds string as
- * new data is concatenated provides a performance improvement.
- *
- * However this function only handles an incompatible subset of printf-alike
- * format specifiers:
- *
- * %s - C String
- * %S - SDS string
- * %i - signed int
- * %I - 64 bit signed integer (long long, int64_t)
- * %u - unsigned int
- * %U - 64 bit unsigned integer (unsigned long long, uint64_t)
- * %T - A size_t variable.
- * %% - Verbatim "%" character.
- */
-sds sdscatfmt(sds s, char const *fmt, ...) {
-    struct sdshdr *sh = (void*) (s-(sizeof(struct sdshdr)));
-    size_t initlen = sdslen(s);
-    const char *f = fmt;
-    int i;
-    va_list ap;
-
-    va_start(ap,fmt);
-    f = fmt;    /* Next format specifier byte to process. */
-    i = initlen; /* Position of the next byte to write to dest str. */
-    while(*f) {
-        char next, *str;
-        int l;
-        long long num;
-        unsigned long long unum;
-
-        /* Make sure there is always space for at least 1 char. */
-        if (sh->free == 0) {
-            s = sdsMakeRoomFor(s,1);
-            sh = (void*) (s-(sizeof(struct sdshdr)));
-        }
-
-        switch(*f) {
-        case '%':
-            next = *(f+1);
-            f++;
-            switch(next) {
-            case 's':
-            case 'S':
-                str = va_arg(ap,char*);
-                l = (next == 's') ? strlen(str) : sdslen(str);
-                if (sh->free < l) {
-                    s = sdsMakeRoomFor(s,l);
-                    sh = (void*) (s-(sizeof(struct sdshdr)));
-                }
-                memcpy(s+i,str,l);
-                sh->len += l;
-                sh->free -= l;
-                i += l;
-                break;
-            case 'i':
-            case 'I':
-                if (next == 'i')
-                    num = va_arg(ap,int);
-                else
-                    num = va_arg(ap,long long);
-                {
-                    char buf[SDS_LLSTR_SIZE];
-                    l = sdsll2str(buf,num);
-                    if (sh->free < l) {
-                        s = sdsMakeRoomFor(s,l);
-                        sh = (void*) (s-(sizeof(struct sdshdr)));
-                    }
-                    memcpy(s+i,buf,l);
-                    sh->len += l;
-                    sh->free -= l;
-                    i += l;
-                }
-                break;
-            case 'u':
-            case 'U':
-            case 'T':
-                if (next == 'u')
-                    unum = va_arg(ap,unsigned int);
-                else if(next == 'U')
-                    unum = va_arg(ap,unsigned long long);
-                else
-                    unum = (unsigned long long)va_arg(ap,size_t);
-                {
-                    char buf[SDS_LLSTR_SIZE];
-                    l = sdsull2str(buf,unum);
-                    if (sh->free < l) {
-                        s = sdsMakeRoomFor(s,l);
-                        sh = (void*) (s-(sizeof(struct sdshdr)));
-                    }
-                    memcpy(s+i,buf,l);
-                    sh->len += l;
-                    sh->free -= l;
-                    i += l;
-                }
-                break;
-            default: /* Handle %% and generally %<unknown>. */
-                s[i++] = next;
-                sh->len += 1;
-                sh->free -= 1;
-                break;
-            }
-            break;
-        default:
-            s[i++] = *f;
-            sh->len += 1;
-            sh->free -= 1;
-            break;
-        }
-        f++;
-    }
-    va_end(ap);
-
-    /* Add null-term */
-    s[i] = '\0';
-    return s;
-}
-
-
-/* Remove the part of the string from left and from right composed just of
- * contiguous characters found in 'cset', that is a null terminted C string.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call.
- *
- * Example:
- *
- * s = sdsnew("AA...AA.a.aa.aHelloWorld     :::");
- * s = sdstrim(s,"A. :");
- * printf("%s\n", s);
- *
- * Output will be just "Hello World".
- */
-void sdstrim(sds s, const char *cset) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-    char *start, *end, *sp, *ep;
-    size_t len;
-
-    sp = start = s;
-    ep = end = s+sdslen(s)-1;
-    while(sp <= end && strchr(cset, *sp)) sp++;
-    while(ep > start && strchr(cset, *ep)) ep--;
-    len = (sp > ep) ? 0 : ((ep-sp)+1);
-    if (sh->buf != sp) memmove(sh->buf, sp, len);
-    sh->buf[len] = '\0';
-    sh->free = sh->free+(sh->len-len);
-    sh->len = len;
-}
-
-/* Turn the string into a smaller (or equal) string containing only the
- * substring specified by the 'start' and 'end' indexes.
- *
- * start and end can be negative, where -1 means the last character of the
- * string, -2 the penultimate character, and so forth.
- *
- * The interval is inclusive, so the start and end characters will be part
- * of the resulting string.
- *
- * The string is modified in-place.
- *
- * Example:
- *
- * s = sdsnew("Hello World");
- * sdsrange(s,1,-1); => "ello World"
- */
-void sdsrange(sds s, int start, int end) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-    size_t newlen, len = sdslen(s);
-
-    if (len == 0) return;
-    if (start < 0) {
-        start = len+start;
-        if (start < 0) start = 0;
-    }
-    if (end < 0) {
-        end = len+end;
-        if (end < 0) end = 0;
-    }
-    newlen = (start > end) ? 0 : (end-start)+1;
-    if (newlen != 0) {
-        if (start >= (signed)len) {
-            newlen = 0;
-        } else if (end >= (signed)len) {
-            end = len-1;
-            newlen = (start > end) ? 0 : (end-start)+1;
-        }
-    } else {
-        start = 0;
-    }
-    if (start && newlen) memmove(sh->buf, sh->buf+start, newlen);
-    sh->buf[newlen] = 0;
-    sh->free = sh->free+(sh->len-newlen);
-    sh->len = newlen;
-}
-
-/* Apply tolower() to every character of the sds string 's'. */
-void sdstolower(sds s) {
-    int len = sdslen(s), j;
-
-    for (j = 0; j < len; j++) s[j] = tolower(s[j]);
-}
-
-/* Apply toupper() to every character of the sds string 's'. */
-void sdstoupper(sds s) {
-    int len = sdslen(s), j;
-
-    for (j = 0; j < len; j++) s[j] = toupper(s[j]);
-}
-
-/* Compare two sds strings s1 and s2 with memcmp().
- *
- * Return value:
- *
- *     1 if s1 > s2.
- *    -1 if s1 < s2.
- *     0 if s1 and s2 are exactly the same binary string.
- *
- * If two strings share exactly the same prefix, but one of the two has
- * additional characters, the longer string is considered to be greater than
- * the smaller one. */
-int sdscmp(const sds s1, const sds s2) {
-    size_t l1, l2, minlen;
-    int cmp;
-
-    l1 = sdslen(s1);
-    l2 = sdslen(s2);
-    minlen = (l1 < l2) ? l1 : l2;
-    cmp = memcmp(s1,s2,minlen);
-    if (cmp == 0) return l1-l2;
-    return cmp;
-}
-
-/* Split 's' with separator in 'sep'. An array
- * of sds strings is returned. *count will be set
- * by reference to the number of tokens returned.
- *
- * On out of memory, zero length string, zero length
- * separator, NULL is returned.
- *
- * Note that 'sep' is able to split a string using
- * a multi-character separator. For example
- * sdssplit("foo_-_bar","_-_"); will return two
- * elements "foo" and "bar".
- *
- * This version of the function is binary-safe but
- * requires length arguments. sdssplit() is just the
- * same function but for zero-terminated strings.
- */
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count) {
-    int elements = 0, slots = 5, start = 0, j;
-    sds *tokens;
-
-    if (seplen < 1 || len < 0) return NULL;
-
-    tokens = malloc(sizeof(sds)*slots);
-    if (tokens == NULL) return NULL;
-
-    if (len == 0) {
-        *count = 0;
-        return tokens;
-    }
-    for (j = 0; j < (len-(seplen-1)); j++) {
-        /* make sure there is room for the next element and the final one */
-        if (slots < elements+2) {
-            sds *newtokens;
-
-            slots *= 2;
-            newtokens = realloc(tokens,sizeof(sds)*slots);
-            if (newtokens == NULL) goto cleanup;
-            tokens = newtokens;
-        }
-        /* search the separator */
-        if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
-            tokens[elements] = sdsnewlen(s+start,j-start);
-            if (tokens[elements] == NULL) goto cleanup;
-            elements++;
-            start = j+seplen;
-            j = j+seplen-1; /* skip the separator */
-        }
-    }
-    /* Add the final element. We are sure there is room in the tokens array. */
-    tokens[elements] = sdsnewlen(s+start,len-start);
-    if (tokens[elements] == NULL) goto cleanup;
-    elements++;
-    *count = elements;
-    return tokens;
-
-cleanup:
-    {
-        int i;
-        for (i = 0; i < elements; i++) sdsfree(tokens[i]);
-        free(tokens);
-        *count = 0;
-        return NULL;
-    }
-}
-
-/* Free the result returned by sdssplitlen(), or do nothing if 'tokens' is NULL. */
-void sdsfreesplitres(sds *tokens, int count) {
-    if (!tokens) return;
-    while(count--)
-        sdsfree(tokens[count]);
-    free(tokens);
-}
-
-/* Create an sds string from a long long value. It is much faster than:
- *
- * sdscatprintf(sdsempty(),"%lld\n", value);
- */
-sds sdsfromlonglong(long long value) {
-    char buf[32], *p;
-    unsigned long long v;
-
-    v = (value < 0) ? -value : value;
-    p = buf+31; /* point to the last character */
-    do {
-        *p-- = '0'+(v%10);
-        v /= 10;
-    } while(v);
-    if (value < 0) *p-- = '-';
-    p++;
-    return sdsnewlen(p,32-(p-buf));
-}
-
-/* Append to the sds string "s" an escaped string representation where
- * all the non-printable characters (tested with isprint()) are turned into
- * escapes in the form "\n\r\a...." or "\x<hex-number>".
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatrepr(sds s, const char *p, size_t len) {
-    s = sdscatlen(s,"\"",1);
-    while(len--) {
-        switch(*p) {
-        case '\\':
-        case '"':
-            s = sdscatprintf(s,"\\%c",*p);
-            break;
-        case '\n': s = sdscatlen(s,"\\n",2); break;
-        case '\r': s = sdscatlen(s,"\\r",2); break;
-        case '\t': s = sdscatlen(s,"\\t",2); break;
-        case '\a': s = sdscatlen(s,"\\a",2); break;
-        case '\b': s = sdscatlen(s,"\\b",2); break;
-        default:
-            if (isprint(*p))
-                s = sdscatprintf(s,"%c",*p);
-            else
-                s = sdscatprintf(s,"\\x%02x",(unsigned char)*p);
-            break;
-        }
-        p++;
-    }
-    return sdscatlen(s,"\"",1);
-}
-
-/* Helper function for sdssplitargs() that returns non zero if 'c'
- * is a valid hex digit. */
-int is_hex_digit(char c) {
-    return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') ||
-           (c >= 'A' && c <= 'F');
-}
-
-/* Helper function for sdssplitargs() that converts a hex digit into an
- * integer from 0 to 15 */
-int hex_digit_to_int(char c) {
-    switch(c) {
-    case '0': return 0;
-    case '1': return 1;
-    case '2': return 2;
-    case '3': return 3;
-    case '4': return 4;
-    case '5': return 5;
-    case '6': return 6;
-    case '7': return 7;
-    case '8': return 8;
-    case '9': return 9;
-    case 'a': case 'A': return 10;
-    case 'b': case 'B': return 11;
-    case 'c': case 'C': return 12;
-    case 'd': case 'D': return 13;
-    case 'e': case 'E': return 14;
-    case 'f': case 'F': return 15;
-    default: return 0;
-    }
-}
-
-/* Split a line into arguments, where every argument can be in the
- * following programming-language REPL-alike form:
- *
- * foo bar "newline are supported\n" and "\xff\x00otherstuff"
- *
- * The number of arguments is stored into *argc, and an array
- * of sds is returned.
- *
- * The caller should free the resulting array of sds strings with
- * sdsfreesplitres().
- *
- * Note that sdscatrepr() is able to convert back a string into
- * a quoted string in the same format sdssplitargs() is able to parse.
- *
- * The function returns the allocated tokens on success, even when the
- * input string is empty, or NULL if the input contains unbalanced
- * quotes or closed quotes followed by non space characters
- * as in: "foo"bar or "foo'
- */
-sds *sdssplitargs(const char *line, int *argc) {
-    const char *p = line;
-    char *current = NULL;
-    char **vector = NULL;
-
-    *argc = 0;
-    while(1) {
-        /* skip blanks */
-        while(*p && isspace(*p)) p++;
-        if (*p) {
-            /* get a token */
-            int inq=0;  /* set to 1 if we are in "quotes" */
-            int insq=0; /* set to 1 if we are in 'single quotes' */
-            int done=0;
-
-            if (current == NULL) current = sdsempty();
-            while(!done) {
-                if (inq) {
-                    if (*p == '\\' && *(p+1) == 'x' &&
-                                             is_hex_digit(*(p+2)) &&
-                                             is_hex_digit(*(p+3)))
-                    {
-                        unsigned char byte;
-
-                        byte = (hex_digit_to_int(*(p+2))*16)+
-                                hex_digit_to_int(*(p+3));
-                        current = sdscatlen(current,(char*)&byte,1);
-                        p += 3;
-                    } else if (*p == '\\' && *(p+1)) {
-                        char c;
-
-                        p++;
-                        switch(*p) {
-                        case 'n': c = '\n'; break;
-                        case 'r': c = '\r'; break;
-                        case 't': c = '\t'; break;
-                        case 'b': c = '\b'; break;
-                        case 'a': c = '\a'; break;
-                        default: c = *p; break;
-                        }
-                        current = sdscatlen(current,&c,1);
-                    } else if (*p == '"') {
-                        /* closing quote must be followed by a space or
-                         * nothing at all. */
-                        if (*(p+1) && !isspace(*(p+1))) goto err;
-                        done=1;
-                    } else if (!*p) {
-                        /* unterminated quotes */
-                        goto err;
-                    } else {
-                        current = sdscatlen(current,p,1);
-                    }
-                } else if (insq) {
-                    if (*p == '\\' && *(p+1) == '\'') {
-                        p++;
-                        current = sdscatlen(current,"'",1);
-                    } else if (*p == '\'') {
-                        /* closing quote must be followed by a space or
-                         * nothing at all. */
-                        if (*(p+1) && !isspace(*(p+1))) goto err;
-                        done=1;
-                    } else if (!*p) {
-                        /* unterminated quotes */
-                        goto err;
-                    } else {
-                        current = sdscatlen(current,p,1);
-                    }
-                } else {
-                    switch(*p) {
-                    case ' ':
-                    case '\n':
-                    case '\r':
-                    case '\t':
-                    case '\0':
-                        done=1;
-                        break;
-                    case '"':
-                        inq=1;
-                        break;
-                    case '\'':
-                        insq=1;
-                        break;
-                    default:
-                        current = sdscatlen(current,p,1);
-                        break;
-                    }
-                }
-                if (*p) p++;
-            }
-            /* add the token to the vector */
-            vector = realloc(vector,((*argc)+1)*sizeof(char*));
-            vector[*argc] = current;
-            (*argc)++;
-            current = NULL;
-        } else {
-            /* Even on empty input string return something not NULL. */
-            if (vector == NULL) vector = malloc(sizeof(void*));
-            return vector;
-        }
-    }
-
-err:
-    while((*argc)--)
-        sdsfree(vector[*argc]);
-    free(vector);
-    if (current) sdsfree(current);
-    *argc = 0;
-    return NULL;
-}
-
-/* Modify the string substituting all the occurrences of the set of
- * characters specified in the 'from' string to the corresponding character
- * in the 'to' array.
- *
- * For instance: sdsmapchars(mystring, "ho", "01", 2)
- * will have the effect of turning the string "hello" into "0ell1".
- *
- * The function returns the sds string pointer, that is always the same
- * as the input pointer since no resize is needed. */
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) {
-    size_t j, i, l = sdslen(s);
-
-    for (j = 0; j < l; j++) {
-        for (i = 0; i < setlen; i++) {
-            if (s[j] == from[i]) {
-                s[j] = to[i];
-                break;
-            }
-        }
-    }
-    return s;
-}
-
-/* Join an array of C strings using the specified separator (also a C string).
- * Returns the result as an sds string. */
-sds sdsjoin(char **argv, int argc, char *sep, size_t seplen) {
-    sds join = sdsempty();
-    int j;
-
-    for (j = 0; j < argc; j++) {
-        join = sdscat(join, argv[j]);
-        if (j != argc-1) join = sdscatlen(join,sep,seplen);
-    }
-    return join;
-}
-
-/* Like sdsjoin, but joins an array of SDS strings. */
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) {
-    sds join = sdsempty();
-    int j;
-
-    for (j = 0; j < argc; j++) {
-        join = sdscatsds(join, argv[j]);
-        if (j != argc-1) join = sdscatlen(join,sep,seplen);
-    }
-    return join;
-}
-
-#ifdef SDS_TEST_MAIN
-#include <stdio.h>
-#include "testhelp.h"
-
-int main(void) {
-    {
-        struct sdshdr *sh;
-        sds x = sdsnew("foo"), y;
-
-        test_cond("Create a string and obtain the length",
-            sdslen(x) == 3 && memcmp(x,"foo\0",4) == 0)
-
-        sdsfree(x);
-        x = sdsnewlen("foo",2);
-        test_cond("Create a string with specified length",
-            sdslen(x) == 2 && memcmp(x,"fo\0",3) == 0)
-
-        x = sdscat(x,"bar");
-        test_cond("Strings concatenation",
-            sdslen(x) == 5 && memcmp(x,"fobar\0",6) == 0);
-
-        x = sdscpy(x,"a");
-        test_cond("sdscpy() against an originally longer string",
-            sdslen(x) == 1 && memcmp(x,"a\0",2) == 0)
-
-        x = sdscpy(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk");
-        test_cond("sdscpy() against an originally shorter string",
-            sdslen(x) == 33 &&
-            memcmp(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk\0",33) == 0)
-
-        sdsfree(x);
-        x = sdscatprintf(sdsempty(),"%d",123);
-        test_cond("sdscatprintf() seems working in the base case",
-            sdslen(x) == 3 && memcmp(x,"123\0",4) ==0)
-
-        sdsfree(x);
-        x = sdsnew("xxciaoyyy");
-        sdstrim(x,"xy");
-        test_cond("sdstrim() correctly trims characters",
-            sdslen(x) == 4 && memcmp(x,"ciao\0",5) == 0)
-
-        y = sdsdup(x);
-        sdsrange(y,1,1);
-        test_cond("sdsrange(...,1,1)",
-            sdslen(y) == 1 && memcmp(y,"i\0",2) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,1,-1);
-        test_cond("sdsrange(...,1,-1)",
-            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,-2,-1);
-        test_cond("sdsrange(...,-2,-1)",
-            sdslen(y) == 2 && memcmp(y,"ao\0",3) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,2,1);
-        test_cond("sdsrange(...,2,1)",
-            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,1,100);
-        test_cond("sdsrange(...,1,100)",
-            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,100,100);
-        test_cond("sdsrange(...,100,100)",
-            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("foo");
-        y = sdsnew("foa");
-        test_cond("sdscmp(foo,foa)", sdscmp(x,y) > 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("bar");
-        y = sdsnew("bar");
-        test_cond("sdscmp(bar,bar)", sdscmp(x,y) == 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("aar");
-        y = sdsnew("bar");
-        test_cond("sdscmp(bar,bar)", sdscmp(x,y) < 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnewlen("\a\n\0foo\r",7);
-        y = sdscatrepr(sdsempty(),x,sdslen(x));
-        test_cond("sdscatrepr(...data...)",
-            memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0)
-
-        {
-            int oldfree;
-
-            sdsfree(x);
-            x = sdsnew("0");
-            sh = (void*) (x-(sizeof(struct sdshdr)));
-            test_cond("sdsnew() free/len buffers", sh->len == 1 && sh->free == 0);
-            x = sdsMakeRoomFor(x,1);
-            sh = (void*) (x-(sizeof(struct sdshdr)));
-            test_cond("sdsMakeRoomFor()", sh->len == 1 && sh->free > 0);
-            oldfree = sh->free;
-            x[1] = '1';
-            sdsIncrLen(x,1);
-            test_cond("sdsIncrLen() -- content", x[0] == '0' && x[1] == '1');
-            test_cond("sdsIncrLen() -- len", sh->len == 2);
-            test_cond("sdsIncrLen() -- free", sh->free == oldfree-1);
-        }
-    }
-    test_report()
-    return 0;
-}
-#endif
diff --git a/debian/modules/nchan/src/hiredis/sds.h b/debian/modules/nchan/src/hiredis/sds.h
deleted file mode 100644
index 19a2abd..0000000
--- a/debian/modules/nchan/src/hiredis/sds.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* SDS (Simple Dynamic Strings), A C dynamic strings library.
- *
- * Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SDS_H
-#define __SDS_H
-
-#define SDS_MAX_PREALLOC (1024*1024)
-
-#include <sys/types.h>
-#include <stdarg.h>
-#ifdef _MSC_VER
-#include "win32.h"
-#endif
-
-typedef char *sds;
-
-struct sdshdr {
-    int len;
-    int free;
-    char buf[];
-};
-
-static inline size_t sdslen(const sds s) {
-    struct sdshdr *sh = (struct sdshdr *)(s-sizeof *sh);
-    return sh->len;
-}
-
-static inline size_t sdsavail(const sds s) {
-    struct sdshdr *sh = (struct sdshdr *)(s-sizeof *sh);
-    return sh->free;
-}
-
-sds sdsnewlen(const void *init, size_t initlen);
-sds sdsnew(const char *init);
-sds sdsempty(void);
-size_t sdslen(const sds s);
-sds sdsdup(const sds s);
-void sdsfree(sds s);
-size_t sdsavail(const sds s);
-sds sdsgrowzero(sds s, size_t len);
-sds sdscatlen(sds s, const void *t, size_t len);
-sds sdscat(sds s, const char *t);
-sds sdscatsds(sds s, const sds t);
-sds sdscpylen(sds s, const char *t, size_t len);
-sds sdscpy(sds s, const char *t);
-
-sds sdscatvprintf(sds s, const char *fmt, va_list ap);
-#ifdef __GNUC__
-sds sdscatprintf(sds s, const char *fmt, ...)
-    __attribute__((format(printf, 2, 3)));
-#else
-sds sdscatprintf(sds s, const char *fmt, ...);
-#endif
-
-sds sdscatfmt(sds s, char const *fmt, ...);
-void sdstrim(sds s, const char *cset);
-void sdsrange(sds s, int start, int end);
-void sdsupdatelen(sds s);
-void sdsclear(sds s);
-int sdscmp(const sds s1, const sds s2);
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
-void sdsfreesplitres(sds *tokens, int count);
-void sdstolower(sds s);
-void sdstoupper(sds s);
-sds sdsfromlonglong(long long value);
-sds sdscatrepr(sds s, const char *p, size_t len);
-sds *sdssplitargs(const char *line, int *argc);
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
-sds sdsjoin(char **argv, int argc, char *sep, size_t seplen);
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
-
-/* Low level functions exposed to the user API */
-sds sdsMakeRoomFor(sds s, size_t addlen);
-void sdsIncrLen(sds s, int incr);
-sds sdsRemoveFreeSpace(sds s);
-size_t sdsAllocSize(sds s);
-
-#endif
diff --git a/debian/modules/nchan/src/hiredis/test.c b/debian/modules/nchan/src/hiredis/test.c
deleted file mode 100644
index d5e8217..0000000
--- a/debian/modules/nchan/src/hiredis/test.c
+++ /dev/null
@@ -1,807 +0,0 @@
-#include "fmacros.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/time.h>
-#include <assert.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-#include <limits.h>
-
-#include "hiredis.h"
-#include "net.h"
-
-enum connection_type {
-    CONN_TCP,
-    CONN_UNIX,
-    CONN_FD
-};
-
-struct config {
-    enum connection_type type;
-
-    struct {
-        const char *host;
-        int port;
-        struct timeval timeout;
-    } tcp;
-
-    struct {
-        const char *path;
-    } unix;
-};
-
-/* The following lines make up our testing "framework" :) */
-static int tests = 0, fails = 0;
-#define test(_s) { printf("#%02d ", ++tests); printf(_s); }
-#define test_cond(_c) if(_c) printf("\033[0;32mPASSED\033[0;0m\n"); else {printf("\033[0;31mFAILED\033[0;0m\n"); fails++;}
-
-static long long usec(void) {
-    struct timeval tv;
-    gettimeofday(&tv,NULL);
-    return (((long long)tv.tv_sec)*1000000)+tv.tv_usec;
-}
-
-/* The assert() calls below have side effects, so we need assert()
- * even if we are compiling without asserts (-DNDEBUG). */
-#ifdef NDEBUG
-#undef assert
-#define assert(e) (void)(e)
-#endif
-
-static redisContext *select_database(redisContext *c) {
-    redisReply *reply;
-
-    /* Switch to DB 9 for testing, now that we know we can chat. */
-    reply = redisCommand(c,"SELECT 9");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    /* Make sure the DB is emtpy */
-    reply = redisCommand(c,"DBSIZE");
-    assert(reply != NULL);
-    if (reply->type == REDIS_REPLY_INTEGER && reply->integer == 0) {
-        /* Awesome, DB 9 is empty and we can continue. */
-        freeReplyObject(reply);
-    } else {
-        printf("Database #9 is not empty, test can not continue\n");
-        exit(1);
-    }
-
-    return c;
-}
-
-static int disconnect(redisContext *c, int keep_fd) {
-    redisReply *reply;
-
-    /* Make sure we're on DB 9. */
-    reply = redisCommand(c,"SELECT 9");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-    reply = redisCommand(c,"FLUSHDB");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    /* Free the context as well, but keep the fd if requested. */
-    if (keep_fd)
-        return redisFreeKeepFd(c);
-    redisFree(c);
-    return -1;
-}
-
-static redisContext *connect(struct config config) {
-    redisContext *c = NULL;
-
-    if (config.type == CONN_TCP) {
-        c = redisConnect(config.tcp.host, config.tcp.port);
-    } else if (config.type == CONN_UNIX) {
-        c = redisConnectUnix(config.unix.path);
-    } else if (config.type == CONN_FD) {
-        /* Create a dummy connection just to get an fd to inherit */
-        redisContext *dummy_ctx = redisConnectUnix(config.unix.path);
-        if (dummy_ctx) {
-            int fd = disconnect(dummy_ctx, 1);
-            printf("Connecting to inherited fd %d\n", fd);
-            c = redisConnectFd(fd);
-        }
-    } else {
-        assert(NULL);
-    }
-
-    if (c == NULL) {
-        printf("Connection error: can't allocate redis context\n");
-        exit(1);
-    } else if (c->err) {
-        printf("Connection error: %s\n", c->errstr);
-        redisFree(c);
-        exit(1);
-    }
-
-    return select_database(c);
-}
-
-static void test_format_commands(void) {
-    char *cmd;
-    int len;
-
-    test("Format command without interpolation: ");
-    len = redisFormatCommand(&cmd,"SET foo bar");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command with %%s string interpolation: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","foo","bar");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command with %%s and an empty string: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","foo","");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    free(cmd);
-
-    test("Format command with an empty string in between proper interpolations: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","","foo");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$0\r\n\r\n$3\r\nfoo\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(0+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command with %%b string interpolation: ");
-    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"b\0r",(size_t)3);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nb\0r\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command with %%b and an empty string: ");
-    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"",(size_t)0);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    free(cmd);
-
-    test("Format command with literal %%: ");
-    len = redisFormatCommand(&cmd,"SET %% %%");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$1\r\n%\r\n$1\r\n%\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(1+2)+4+(1+2));
-    free(cmd);
-
-    /* Vararg width depends on the type. These tests make sure that the
-     * width is correctly determined using the format and subsequent varargs
-     * can correctly be interpolated. */
-#define INTEGER_WIDTH_TEST(fmt, type) do {                                                \
-    type value = 123;                                                                     \
-    test("Format command with printf-delegation (" #type "): ");                          \
-    len = redisFormatCommand(&cmd,"key:%08" fmt " str:%s", value, "hello");               \
-    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",len) == 0 && \
-        len == 4+5+(12+2)+4+(9+2));                                                       \
-    free(cmd);                                                                            \
-} while(0)
-
-#define FLOAT_WIDTH_TEST(type) do {                                                       \
-    type value = 123.0;                                                                   \
-    test("Format command with printf-delegation (" #type "): ");                          \
-    len = redisFormatCommand(&cmd,"key:%08.3f str:%s", value, "hello");                   \
-    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",len) == 0 && \
-        len == 4+5+(12+2)+4+(9+2));                                                       \
-    free(cmd);                                                                            \
-} while(0)
-
-    INTEGER_WIDTH_TEST("d", int);
-    INTEGER_WIDTH_TEST("hhd", char);
-    INTEGER_WIDTH_TEST("hd", short);
-    INTEGER_WIDTH_TEST("ld", long);
-    INTEGER_WIDTH_TEST("lld", long long);
-    INTEGER_WIDTH_TEST("u", unsigned int);
-    INTEGER_WIDTH_TEST("hhu", unsigned char);
-    INTEGER_WIDTH_TEST("hu", unsigned short);
-    INTEGER_WIDTH_TEST("lu", unsigned long);
-    INTEGER_WIDTH_TEST("llu", unsigned long long);
-    FLOAT_WIDTH_TEST(float);
-    FLOAT_WIDTH_TEST(double);
-
-    test("Format command with invalid printf format: ");
-    len = redisFormatCommand(&cmd,"key:%08p %b",(void*)1234,"foo",(size_t)3);
-    test_cond(len == -1);
-
-    const char *argv[3];
-    argv[0] = "SET";
-    argv[1] = "foo\0xxx";
-    argv[2] = "bar";
-    size_t lens[3] = { 3, 7, 3 };
-    int argc = 3;
-
-    test("Format command by passing argc/argv without lengths: ");
-    len = redisFormatCommandArgv(&cmd,argc,argv,NULL);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command by passing argc/argv with lengths: ");
-    len = redisFormatCommandArgv(&cmd,argc,argv,lens);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
-    free(cmd);
-}
-
-static void test_append_formatted_commands(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    char *cmd;
-    int len;
-
-    c = connect(config);
-
-    test("Append format command: ");
-
-    len = redisFormatCommand(&cmd, "SET foo bar");
-
-    test_cond(redisAppendFormattedCommand(c, cmd, len) == REDIS_OK);
-
-    assert(redisGetReply(c, (void*)&reply) == REDIS_OK);
-
-    free(cmd);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_reply_reader(void) {
-    redisReader *reader;
-    void *reply;
-    int ret;
-    int i;
-
-    test("Error handling in reply parser: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"@foo\r\n",6);
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
-    redisReaderFree(reader);
-
-    /* when the reply already contains multiple items, they must be free'd
-     * on an error. valgrind will bark when this doesn't happen. */
-    test("Memory cleanup in reply parser: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"*2\r\n",4);
-    redisReaderFeed(reader,(char*)"$5\r\nhello\r\n",11);
-    redisReaderFeed(reader,(char*)"@foo\r\n",6);
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
-    redisReaderFree(reader);
-
-    test("Set error on nested multi bulks with depth > 7: ");
-    reader = redisReaderCreate();
-
-    for (i = 0; i < 9; i++) {
-        redisReaderFeed(reader,(char*)"*1\r\n",4);
-    }
-
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strncasecmp(reader->errstr,"No support for",14) == 0);
-    redisReaderFree(reader);
-
-    test("Works with NULL functions for reply: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"+OK\r\n",5);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
-    redisReaderFree(reader);
-
-    test("Works when a single newline (\\r\\n) covers two calls to feed: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"+OK\r",4);
-    ret = redisReaderGetReply(reader,&reply);
-    assert(ret == REDIS_OK && reply == NULL);
-    redisReaderFeed(reader,(char*)"\n",1);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
-    redisReaderFree(reader);
-
-    test("Don't reset state after protocol error: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"x",1);
-    ret = redisReaderGetReply(reader,&reply);
-    assert(ret == REDIS_ERR);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR && reply == NULL);
-    redisReaderFree(reader);
-
-    /* Regression test for issue #45 on GitHub. */
-    test("Don't do empty allocation for empty multi bulk: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"*0\r\n",4);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
-        ((redisReply*)reply)->elements == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-}
-
-static void test_free_null(void) {
-    void *redisContext = NULL;
-    void *reply = NULL;
-
-    test("Don't fail when redisFree is passed a NULL value: ");
-    redisFree(redisContext);
-    test_cond(redisContext == NULL);
-
-    test("Don't fail when freeReplyObject is passed a NULL value: ");
-    freeReplyObject(reply);
-    test_cond(reply == NULL);
-}
-
-static void test_blocking_connection_errors(void) {
-    redisContext *c;
-
-    test("Returns error when host cannot be resolved: ");
-    c = redisConnect((char*)"idontexist.test", 6379);
-    test_cond(c->err == REDIS_ERR_OTHER &&
-        (strcmp(c->errstr,"Name or service not known") == 0 ||
-         strcmp(c->errstr,"Can't resolve: idontexist.test") == 0 ||
-         strcmp(c->errstr,"nodename nor servname provided, or not known") == 0 ||
-         strcmp(c->errstr,"No address associated with hostname") == 0 ||
-         strcmp(c->errstr,"Temporary failure in name resolution") == 0 ||
-         strcmp(c->errstr,"hostname nor servname provided, or not known") == 0 ||
-         strcmp(c->errstr,"no address associated with name") == 0));
-    redisFree(c);
-
-    test("Returns error when the port is not open: ");
-    c = redisConnect((char*)"localhost", 1);
-    test_cond(c->err == REDIS_ERR_IO &&
-        strcmp(c->errstr,"Connection refused") == 0);
-    redisFree(c);
-
-    test("Returns error when the unix socket path doesn't accept connections: ");
-    c = redisConnectUnix((char*)"/tmp/idontexist.sock");
-    test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
-    redisFree(c);
-}
-
-static void test_blocking_connection(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-
-    c = connect(config);
-
-    test("Is able to deliver commands: ");
-    reply = redisCommand(c,"PING");
-    test_cond(reply->type == REDIS_REPLY_STATUS &&
-        strcasecmp(reply->str,"pong") == 0)
-    freeReplyObject(reply);
-
-    test("Is a able to send commands verbatim: ");
-    reply = redisCommand(c,"SET foo bar");
-    test_cond (reply->type == REDIS_REPLY_STATUS &&
-        strcasecmp(reply->str,"ok") == 0)
-    freeReplyObject(reply);
-
-    test("%%s String interpolation works: ");
-    reply = redisCommand(c,"SET %s %s","foo","hello world");
-    freeReplyObject(reply);
-    reply = redisCommand(c,"GET foo");
-    test_cond(reply->type == REDIS_REPLY_STRING &&
-        strcmp(reply->str,"hello world") == 0);
-    freeReplyObject(reply);
-
-    test("%%b String interpolation works: ");
-    reply = redisCommand(c,"SET %b %b","foo",(size_t)3,"hello\x00world",(size_t)11);
-    freeReplyObject(reply);
-    reply = redisCommand(c,"GET foo");
-    test_cond(reply->type == REDIS_REPLY_STRING &&
-        memcmp(reply->str,"hello\x00world",11) == 0)
-
-    test("Binary reply length is correct: ");
-    test_cond(reply->len == 11)
-    freeReplyObject(reply);
-
-    test("Can parse nil replies: ");
-    reply = redisCommand(c,"GET nokey");
-    test_cond(reply->type == REDIS_REPLY_NIL)
-    freeReplyObject(reply);
-
-    /* test 7 */
-    test("Can parse integer replies: ");
-    reply = redisCommand(c,"INCR mycounter");
-    test_cond(reply->type == REDIS_REPLY_INTEGER && reply->integer == 1)
-    freeReplyObject(reply);
-
-    test("Can parse multi bulk replies: ");
-    freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
-    freeReplyObject(redisCommand(c,"LPUSH mylist bar"));
-    reply = redisCommand(c,"LRANGE mylist 0 -1");
-    test_cond(reply->type == REDIS_REPLY_ARRAY &&
-              reply->elements == 2 &&
-              !memcmp(reply->element[0]->str,"bar",3) &&
-              !memcmp(reply->element[1]->str,"foo",3))
-    freeReplyObject(reply);
-
-    /* m/e with multi bulk reply *before* other reply.
-     * specifically test ordering of reply items to parse. */
-    test("Can handle nested multi bulk replies: ");
-    freeReplyObject(redisCommand(c,"MULTI"));
-    freeReplyObject(redisCommand(c,"LRANGE mylist 0 -1"));
-    freeReplyObject(redisCommand(c,"PING"));
-    reply = (redisCommand(c,"EXEC"));
-    test_cond(reply->type == REDIS_REPLY_ARRAY &&
-              reply->elements == 2 &&
-              reply->element[0]->type == REDIS_REPLY_ARRAY &&
-              reply->element[0]->elements == 2 &&
-              !memcmp(reply->element[0]->element[0]->str,"bar",3) &&
-              !memcmp(reply->element[0]->element[1]->str,"foo",3) &&
-              reply->element[1]->type == REDIS_REPLY_STATUS &&
-              strcasecmp(reply->element[1]->str,"pong") == 0);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_blocking_connection_timeouts(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    ssize_t s;
-    const char *cmd = "DEBUG SLEEP 3\r\n";
-    struct timeval tv;
-
-    c = connect(config);
-    test("Successfully completes a command when the timeout is not exceeded: ");
-    reply = redisCommand(c,"SET foo fast");
-    freeReplyObject(reply);
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000;
-    redisSetTimeout(c, tv);
-    reply = redisCommand(c, "GET foo");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STRING && memcmp(reply->str, "fast", 4) == 0);
-    freeReplyObject(reply);
-    disconnect(c, 0);
-
-    c = connect(config);
-    test("Does not return a reply when the command times out: ");
-    s = write(c->fd, cmd, strlen(cmd));
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000;
-    redisSetTimeout(c, tv);
-    reply = redisCommand(c, "GET foo");
-    test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Resource temporarily unavailable") == 0);
-    freeReplyObject(reply);
-
-    test("Reconnect properly reconnects after a timeout: ");
-    redisReconnect(c);
-    reply = redisCommand(c, "PING");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
-    freeReplyObject(reply);
-
-    test("Reconnect properly uses owned parameters: ");
-    config.tcp.host = "foo";
-    config.unix.path = "foo";
-    redisReconnect(c);
-    reply = redisCommand(c, "PING");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_blocking_io_errors(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    void *_reply;
-    int major, minor;
-
-    /* Connect to target given by config. */
-    c = connect(config);
-    {
-        /* Find out Redis version to determine the path for the next test */
-        const char *field = "redis_version:";
-        char *p, *eptr;
-
-        reply = redisCommand(c,"INFO");
-        p = strstr(reply->str,field);
-        major = strtol(p+strlen(field),&eptr,10);
-        p = eptr+1; /* char next to the first "." */
-        minor = strtol(p,&eptr,10);
-        freeReplyObject(reply);
-    }
-
-    test("Returns I/O error when the connection is lost: ");
-    reply = redisCommand(c,"QUIT");
-    if (major > 2 || (major == 2 && minor > 0)) {
-        /* > 2.0 returns OK on QUIT and read() should be issued once more
-         * to know the descriptor is at EOF. */
-        test_cond(strcasecmp(reply->str,"OK") == 0 &&
-            redisGetReply(c,&_reply) == REDIS_ERR);
-        freeReplyObject(reply);
-    } else {
-        test_cond(reply == NULL);
-    }
-
-    /* On 2.0, QUIT will cause the connection to be closed immediately and
-     * the read(2) for the reply on QUIT will set the error to EOF.
-     * On >2.0, QUIT will return with OK and another read(2) needed to be
-     * issued to find out the socket was closed by the server. In both
-     * conditions, the error will be set to EOF. */
-    assert(c->err == REDIS_ERR_EOF &&
-        strcmp(c->errstr,"Server closed the connection") == 0);
-    redisFree(c);
-
-    c = connect(config);
-    test("Returns I/O error on socket timeout: ");
-    struct timeval tv = { 0, 1000 };
-    assert(redisSetTimeout(c,tv) == REDIS_OK);
-    test_cond(redisGetReply(c,&_reply) == REDIS_ERR &&
-        c->err == REDIS_ERR_IO && errno == EAGAIN);
-    redisFree(c);
-}
-
-static void test_invalid_timeout_errors(struct config config) {
-    redisContext *c;
-
-    test("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: ");
-
-    config.tcp.timeout.tv_sec = 0;
-    config.tcp.timeout.tv_usec = 10000001;
-
-    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
-
-    test_cond(c->err == REDIS_ERR_IO);
-    redisFree(c);
-
-    test("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
-
-    config.tcp.timeout.tv_sec = (((LONG_MAX) - 999) / 1000) + 1;
-    config.tcp.timeout.tv_usec = 0;
-
-    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
-
-    test_cond(c->err == REDIS_ERR_IO);
-    redisFree(c);
-}
-
-static void test_throughput(struct config config) {
-    redisContext *c = connect(config);
-    redisReply **replies;
-    int i, num;
-    long long t1, t2;
-
-    test("Throughput:\n");
-    for (i = 0; i < 500; i++)
-        freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
-
-    num = 1000;
-    replies = malloc(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c,"PING");
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx PING: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = malloc(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c,"LRANGE mylist 0 499");
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
-        assert(replies[i] != NULL && replies[i]->elements == 500);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx LRANGE with 500 elements: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    num = 10000;
-    replies = malloc(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"PING");
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx PING (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = malloc(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"LRANGE mylist 0 499");
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
-        assert(replies[i] != NULL && replies[i]->elements == 500);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    disconnect(c, 0);
-}
-
-// static long __test_callback_flags = 0;
-// static void __test_callback(redisContext *c, void *privdata) {
-//     ((void)c);
-//     /* Shift to detect execution order */
-//     __test_callback_flags <<= 8;
-//     __test_callback_flags |= (long)privdata;
-// }
-//
-// static void __test_reply_callback(redisContext *c, redisReply *reply, void *privdata) {
-//     ((void)c);
-//     /* Shift to detect execution order */
-//     __test_callback_flags <<= 8;
-//     __test_callback_flags |= (long)privdata;
-//     if (reply) freeReplyObject(reply);
-// }
-//
-// static redisContext *__connect_nonblock() {
-//     /* Reset callback flags */
-//     __test_callback_flags = 0;
-//     return redisConnectNonBlock("127.0.0.1", port, NULL);
-// }
-//
-// static void test_nonblocking_connection() {
-//     redisContext *c;
-//     int wdone = 0;
-//
-//     test("Calls command callback when command is issued: ");
-//     c = __connect_nonblock();
-//     redisSetCommandCallback(c,__test_callback,(void*)1);
-//     redisCommand(c,"PING");
-//     test_cond(__test_callback_flags == 1);
-//     redisFree(c);
-//
-//     test("Calls disconnect callback on redisDisconnect: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
-//     redisDisconnect(c);
-//     test_cond(__test_callback_flags == 2);
-//     redisFree(c);
-//
-//     test("Calls disconnect callback and free callback on redisFree: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
-//     redisSetFreeCallback(c,__test_callback,(void*)4);
-//     redisFree(c);
-//     test_cond(__test_callback_flags == ((2 << 8) | 4));
-//
-//     test("redisBufferWrite against empty write buffer: ");
-//     c = __connect_nonblock();
-//     test_cond(redisBufferWrite(c,&wdone) == REDIS_OK && wdone == 1);
-//     redisFree(c);
-//
-//     test("redisBufferWrite against not yet connected fd: ");
-//     c = __connect_nonblock();
-//     redisCommand(c,"PING");
-//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
-//               strncmp(c->error,"write:",6) == 0);
-//     redisFree(c);
-//
-//     test("redisBufferWrite against closed fd: ");
-//     c = __connect_nonblock();
-//     redisCommand(c,"PING");
-//     redisDisconnect(c);
-//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
-//               strncmp(c->error,"write:",6) == 0);
-//     redisFree(c);
-//
-//     test("Process callbacks in the right sequence: ");
-//     c = __connect_nonblock();
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)1,"PING");
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)3,"PING");
-//
-//     /* Write output buffer */
-//     wdone = 0;
-//     while(!wdone) {
-//         usleep(500);
-//         redisBufferWrite(c,&wdone);
-//     }
-//
-//     /* Read until at least one callback is executed (the 3 replies will
-//      * arrive in a single packet, causing all callbacks to be executed in
-//      * a single pass). */
-//     while(__test_callback_flags == 0) {
-//         assert(redisBufferRead(c) == REDIS_OK);
-//         redisProcessCallbacks(c);
-//     }
-//     test_cond(__test_callback_flags == 0x010203);
-//     redisFree(c);
-//
-//     test("redisDisconnect executes pending callbacks with NULL reply: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)1);
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
-//     redisDisconnect(c);
-//     test_cond(__test_callback_flags == 0x0201);
-//     redisFree(c);
-// }
-
-int main(int argc, char **argv) {
-    struct config cfg = {
-        .tcp = {
-            .host = "127.0.0.1",
-            .port = 6379
-        },
-        .unix = {
-            .path = "/tmp/redis.sock"
-        }
-    };
-    int throughput = 1;
-    int test_inherit_fd = 1;
-
-    /* Ignore broken pipe signal (for I/O error tests). */
-    signal(SIGPIPE, SIG_IGN);
-
-    /* Parse command line options. */
-    argv++; argc--;
-    while (argc) {
-        if (argc >= 2 && !strcmp(argv[0],"-h")) {
-            argv++; argc--;
-            cfg.tcp.host = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"-p")) {
-            argv++; argc--;
-            cfg.tcp.port = atoi(argv[0]);
-        } else if (argc >= 2 && !strcmp(argv[0],"-s")) {
-            argv++; argc--;
-            cfg.unix.path = argv[0];
-        } else if (argc >= 1 && !strcmp(argv[0],"--skip-throughput")) {
-            throughput = 0;
-        } else if (argc >= 1 && !strcmp(argv[0],"--skip-inherit-fd")) {
-            test_inherit_fd = 0;
-        } else {
-            fprintf(stderr, "Invalid argument: %s\n", argv[0]);
-            exit(1);
-        }
-        argv++; argc--;
-    }
-
-    test_format_commands();
-    test_reply_reader();
-    test_blocking_connection_errors();
-    test_free_null();
-
-    printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
-    cfg.type = CONN_TCP;
-    test_blocking_connection(cfg);
-    test_blocking_connection_timeouts(cfg);
-    test_blocking_io_errors(cfg);
-    test_invalid_timeout_errors(cfg);
-    test_append_formatted_commands(cfg);
-    if (throughput) test_throughput(cfg);
-
-    printf("\nTesting against Unix socket connection (%s):\n", cfg.unix.path);
-    cfg.type = CONN_UNIX;
-    test_blocking_connection(cfg);
-    test_blocking_connection_timeouts(cfg);
-    test_blocking_io_errors(cfg);
-    if (throughput) test_throughput(cfg);
-
-    if (test_inherit_fd) {
-        printf("\nTesting against inherited fd (%s):\n", cfg.unix.path);
-        cfg.type = CONN_FD;
-        test_blocking_connection(cfg);
-    }
-
-
-    if (fails) {
-        printf("*** %d TESTS FAILED ***\n", fails);
-        return 1;
-    }
-
-    printf("ALL TESTS PASSED\n");
-    return 0;
-}
diff --git a/debian/modules/nchan/src/hiredis/win32.h b/debian/modules/nchan/src/hiredis/win32.h
deleted file mode 100644
index 1a27c18..0000000
--- a/debian/modules/nchan/src/hiredis/win32.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _WIN32_HELPER_INCLUDE
-#define _WIN32_HELPER_INCLUDE
-#ifdef _MSC_VER
-
-#ifndef inline
-#define inline __inline
-#endif
-
-#ifndef va_copy
-#define va_copy(d,s) ((d) = (s))
-#endif
-
-#ifndef snprintf
-#define snprintf c99_snprintf
-
-__inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
-{
-    int count = -1;
-
-    if (size != 0)
-        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
-    if (count == -1)
-        count = _vscprintf(format, ap);
-
-    return count;
-}
-
-__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
-{
-    int count;
-    va_list ap;
-
-    va_start(ap, format);
-    count = c99_vsnprintf(str, size, format, ap);
-    va_end(ap);
-
-    return count;
-}
-#endif
-
-#endif
-#endif
\ No newline at end of file

From 6648d2471ad44f587e1ede446a634f243a258ab9 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 14 Dec 2017 08:57:49 +0200
Subject: [PATCH 238/600] Drop the 'v' part of module versions

It just complicates things, let's try to drop it and just
use a Debian compatible version.

Gbp-Dch: Ignore
---
 debian/modules/control | 20 ++++++++++----------
 debian/ngxmod          |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index e9a8907..4112d84 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -1,15 +1,15 @@
 Module: http-headers-more-filter
 Homepage: https://github.com/agentzh/headers-more-nginx-module
-Version: v0.33
+Version: 0.33
 Files-Excluded: .gitignore .gitattributes .travis.yml
 
 Module: http-ndk
 Homepage: https://github.com/simpl/ngx_devel_kit/
-Version: v0.3.0
+Version: 0.3.0
 
 Module: http-auth-pam
 Homepage: https://github.com/stogh/ngx_http_auth_pam_module
-Version: v1.5.1
+Version: 1.5.1
 
 Module: http-echo
 Homepage: https://github.com/agentzh/echo-nginx-module
@@ -18,7 +18,7 @@ Files-Excluded: .gitignore .gitattributes .travis.yml
 
 Module: http-lua
 Homepage: https://github.com/openresty/lua-nginx-module
-Version: v0.10.11
+Version: 0.10.11
 Patch:
   openssl-1.1.0.patch
   discover-luajit-2.1.patch
@@ -34,13 +34,13 @@ Patch:
 
 Module: nchan
 Homepage: https://github.com/slact/nchan
-Version: v1.0.8
+Version: 1.0.8
 Files-Excluded: dev nchan_logo.png NchanSubscriber.js src/hiredis
 
 Module: http-uploadprogress
 Homepage: https://github.com/masterzen/nginx-upload-progress-module
 Files-Excluded: test
-Version: v0.9.2
+Version: 0.9.2
 
 Module: http-cache-purge
 Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
@@ -51,20 +51,20 @@ Patch:
 
 Module: http-dav-ext
 Homepage: https://github.com/arut/nginx-dav-ext-module
-Version: v0.1.0
+Version: 0.1.0
 
 Module: http-fancyindex
 Homepage: https://github.com/aperezdc/ngx-fancyindex
-Version: v0.4.2
+Version: 0.4.2
 Files-Excluded: .gitignore .travis.yml
 
 Module: http-subs-filter
 Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
-Version: v0.6.4
+Version: 0.6.4
 Patch: dynamic-module.patch
 
 Module: rtmp
 Homepage: https://github.com/arut/nginx-rtmp-module
 Files-Excluded: test
-Version: v1.2.1
+Version: 1.2.1
 
diff --git a/debian/ngxmod b/debian/ngxmod
index 7eacaa5..dba82e8 100755
--- a/debian/ngxmod
+++ b/debian/ngxmod
@@ -67,7 +67,7 @@ def commit(module, version):
     git_add_cmd = ['git', 'add', '--all', module_path, CTRL_PATH]
     call(git_add_cmd)
 
-    commit_msg = '%s: Upgrade to v%s' % (module, version)
+    commit_msg = '%s: Upgrade to %s' % (module, version)
     git_commit_cmd = [
         'git', 'commit', '-m', commit_msg,
         '--', module_path, CTRL_PATH]
@@ -129,7 +129,7 @@ def cmd_uupdate(args):
     unpack(args.module, args.upstream_version, exclude)
 
     # change ctrl version
-    c['Version'] = re.sub('[^v]+', args.upstream_version, c['Version'])
+    c['Version'] = args.upstream_version
     update_ctrl()
 
     commit(args.module, args.upstream_version)

From 6f5e080ac841963afd7d02e23b7f2ab364101f0e Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 14 Dec 2017 11:12:46 +0200
Subject: [PATCH 239/600] Release 1.13.7-1

---
 debian/changelog | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5be779e..64d74ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+nginx (1.13.7-1) unstable; urgency=medium
+
+  [ Christos Trochalakis ]
+  * New upstream version 1.13.7
+  * Bump Standards-Version, no changes needed
+  * debian/watch: switch to HTTPS for the upstream check
+
+  [ Mpampis Kostas ]
+  * Automate modules watch & upgrade process (Closes: #869499)
+
+  [ Christos Trochalakis ]
+  * Bits & pieces for ngxmod
+  * http-headers-more-filter: Upgrade to 0.33
+  * http-echo: Upgrade to 0.61
+  * http-lua: Upgrade to 0.10.11
+  * http-dav-ext: Upgrade to 0.1.0 (Closes: #878611)
+  * http-fancyindex: Upgrade to 0.4.2
+  * rtmp: Upgrade to 1.2.1 (Closes: #880718)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Thu, 14 Dec 2017 11:04:36 +0200
+
 nginx (1.13.6-2) unstable; urgency=medium
 
   * rtmp: Ship docs & examples (Closes: #878368)

From 717fde6db4d69030c4859a29f5e34b25ada9cee0 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 27 Dec 2017 09:21:26 +0200
Subject: [PATCH 240/600] New upstream version 1.13.8

---
 CHANGES                                       | 34 +++++++++++
 CHANGES.ru                                    | 34 +++++++++++
 auto/cc/clang                                 |  2 +-
 auto/cc/name                                  |  6 +-
 auto/os/conf                                  |  5 ++
 auto/os/linux                                 | 32 +++++++++++
 auto/unix                                     | 38 ++++++++-----
 contrib/vim/syntax/nginx.vim                  | 57 +++++++++++--------
 src/core/nginx.c                              |  1 +
 src/core/nginx.h                              |  4 +-
 src/core/ngx_conf_file.c                      |  5 ++
 src/core/ngx_cycle.h                          |  2 +
 src/http/modules/ngx_http_autoindex_module.c  |  6 ++
 src/http/modules/ngx_http_proxy_module.c      |  8 +--
 .../ngx_http_upstream_keepalive_module.c      |  1 +
 src/http/ngx_http_core_module.c               |  1 +
 src/http/ngx_http_upstream.c                  |  8 ++-
 src/os/unix/ngx_daemon.c                      |  1 +
 src/os/unix/ngx_linux_config.h                |  5 ++
 src/os/unix/ngx_posix_config.h                | 20 -------
 src/os/unix/ngx_posix_init.c                  | 10 ++++
 src/os/unix/ngx_process.c                     |  7 ++-
 src/os/unix/ngx_process.h                     |  2 +
 src/os/unix/ngx_process_cycle.c               | 33 +++++++++++
 src/stream/ngx_stream_proxy_module.c          |  6 ++
 25 files changed, 258 insertions(+), 70 deletions(-)

diff --git a/CHANGES b/CHANGES
index d93a938..c1188d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,38 @@
 
+Changes with nginx 1.13.8                                        26 Dec 2017
+
+    *) Feature: now nginx automatically preserves the CAP_NET_RAW capability
+       in worker processes when using the "transparent" parameter of the
+       "proxy_bind", "fastcgi_bind", "memcached_bind", "scgi_bind", and
+       "uwsgi_bind" directives.
+
+    *) Feature: improved CPU cache line size detection.
+       Thanks to Debayan Ghosh.
+
+    *) Feature: new directives in vim syntax highlighting scripts.
+       Thanks to Gena Makhomed.
+
+    *) Bugfix: binary upgrade refused to work if nginx was re-parented to a
+       process with PID different from 1 after its parent process has
+       finished.
+
+    *) Bugfix: the ngx_http_autoindex_module incorrectly handled requests
+       with bodies.
+
+    *) Bugfix: in the "proxy_limit_rate" directive when used with the
+       "keepalive" directive.
+
+    *) Bugfix: some parts of a response might be buffered when using
+       "proxy_buffering off" if the client connection used SSL.
+       Thanks to Patryk Lesiewicz.
+
+    *) Bugfix: in the "proxy_cache_background_update" directive.
+
+    *) Bugfix: it was not possible to start a parameter with a variable in
+       the "${name}" form with the name in curly brackets without enclosing
+       the parameter into single or double quotes.
+
+
 Changes with nginx 1.13.7                                        21 Nov 2017
 
     *) Bugfix: in the $upstream_status variable.
diff --git a/CHANGES.ru b/CHANGES.ru
index e688a5c..83d3667 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,38 @@
 
+Изменения в nginx 1.13.8                                          26.12.2017
+
+    *) Добавление: теперь при использовании параметра transparent директив
+       proxy_bind, fastcgi_bind, memcached_bind, scgi_bind и uwsgi_bind
+       nginx автоматически сохраняет capability CAP_NET_RAW в рабочих
+       процессах.
+
+    *) Добавление: улучшения в определении размера строки кэша процессора.
+       Спасибо Debayan Ghosh.
+
+    *) Добавление: новые директивы в скриптах подсветки синтаксиса для vim.
+       Спасибо Геннадию Махомеду.
+
+    *) Исправление: процедура обновления исполняемого файла не работала,
+       если после завершения родительского процесса новым родительским
+       процессом nginx'а становился процесс с PID, отличным от 1.
+
+    *) Исправление: модуль ngx_http_autoindex_module неправильно обрабатывал
+       запросы с телом.
+
+    *) Исправление: в директиве proxy_limit_rate при использовании с
+       директивой keepalive.
+
+    *) Исправление: при использовании "proxy_buffering off" часть ответа
+       могла буферизироваться, если клиентское соединение использовало SSL.
+       Спасибо Patryk Lesiewicz.
+
+    *) Исправление: в директиве proxy_cache_background_update.
+
+    *) Исправление: переменную вида "${name}" с именем в фигурных скобках
+       нельзя было использовать в начале параметра не заключив весь параметр
+       в кавычки.
+
+
 Изменения в nginx 1.13.7                                          21.11.2017
 
     *) Исправление: в переменной $upstream_status.
diff --git a/auto/cc/clang b/auto/cc/clang
index 19bdaaa..9d900c2 100644
--- a/auto/cc/clang
+++ b/auto/cc/clang
@@ -5,7 +5,7 @@
 # clang
 
 
-NGX_CLANG_VER=`$CC -v 2>&1 | grep '\(clang\|LLVM\) version' 2>&1 \
+NGX_CLANG_VER=`$CC -v 2>&1 | grep 'version' 2>&1 \
                            | sed -e 's/^.* version \(.*\)/\1/'`
 
 echo " + clang version: $NGX_CLANG_VER"
diff --git a/auto/cc/name b/auto/cc/name
index 35d319e..ded93f5 100644
--- a/auto/cc/name
+++ b/auto/cc/name
@@ -44,7 +44,11 @@ elif `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
     NGX_CC_NAME=gcc
     echo " + using GNU C compiler"
 
-elif `$CC -v 2>&1 | grep '\(clang\|LLVM\) version' >/dev/null 2>&1`; then
+elif `$CC -v 2>&1 | grep 'clang version' >/dev/null 2>&1`; then
+    NGX_CC_NAME=clang
+    echo " + using Clang C compiler"
+
+elif `$CC -v 2>&1 | grep 'LLVM version' >/dev/null 2>&1`; then
     NGX_CC_NAME=clang
     echo " + using Clang C compiler"
 
diff --git a/auto/os/conf b/auto/os/conf
index 6096af5..7c6cb69 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -110,6 +110,11 @@ case "$NGX_MACHINE" in
         NGX_MACH_CACHE_LINE=64
     ;;
 
+    aarch64 )
+        have=NGX_ALIGNMENT value=16 . auto/define
+        NGX_MACH_CACHE_LINE=64
+    ;;
+
     *)
         have=NGX_ALIGNMENT value=16 . auto/define
         NGX_MACH_CACHE_LINE=32
diff --git a/auto/os/linux b/auto/os/linux
index a0c8795..2c8a9bb 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -157,6 +157,38 @@ ngx_feature_test="if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1) return 1"
 . auto/feature
 
 
+# prctl(PR_SET_KEEPCAPS)
+
+ngx_feature="prctl(PR_SET_KEEPCAPS)"
+ngx_feature_name="NGX_HAVE_PR_SET_KEEPCAPS"
+ngx_feature_run=yes
+ngx_feature_incs="#include <sys/prctl.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) == -1) return 1"
+. auto/feature
+
+
+# capabilities
+
+ngx_feature="capabilities"
+ngx_feature_name="NGX_HAVE_CAPABILITIES"
+ngx_feature_run=no
+ngx_feature_incs="#include <linux/capability.h>
+                  #include <sys/syscall.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="struct __user_cap_data_struct    data;
+                  struct __user_cap_header_struct  header;
+
+                  header.version = _LINUX_CAPABILITY_VERSION_1;
+                  data.effective = CAP_TO_MASK(CAP_NET_RAW);
+                  data.permitted = 0;
+
+                  (void) SYS_capset"
+. auto/feature
+
+
 # crypt_r()
 
 ngx_feature="crypt_r()"
diff --git a/auto/unix b/auto/unix
index 10835f6..3be8b27 100644
--- a/auto/unix
+++ b/auto/unix
@@ -342,7 +342,7 @@ ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0)"
 . auto/feature
 
 
-# NetBSD bind to any address for transparent proxying
+# OpenBSD bind to any address for transparent proxying
 
 ngx_feature="SO_BINDANY"
 ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
@@ -354,19 +354,6 @@ ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_BINDANY, NULL, 0)"
 . auto/feature
 
 
-# Linux IP_BIND_ADDRESS_NO_PORT
-
-ngx_feature="IP_BIND_ADDRESS_NO_PORT"
-ngx_feature_name="NGX_HAVE_IP_BIND_ADDRESS_NO_PORT"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, NULL, 0)"
-. auto/feature
-
-
 # Linux transparent proxying
 
 ngx_feature="IP_TRANSPARENT"
@@ -393,6 +380,19 @@ ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BINDANY, NULL, 0)"
 . auto/feature
 
 
+# Linux IP_BIND_ADDRESS_NO_PORT
+
+ngx_feature="IP_BIND_ADDRESS_NO_PORT"
+ngx_feature_name="NGX_HAVE_IP_BIND_ADDRESS_NO_PORT"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, NULL, 0)"
+. auto/feature
+
+
 # BSD way to get IPv4 datagram destination address
 
 ngx_feature="IP_RECVDSTADDR"
@@ -964,6 +964,16 @@ ngx_feature_test="sysconf(_SC_NPROCESSORS_ONLN)"
 . auto/feature
 
 
+ngx_feature="sysconf(_SC_LEVEL1_DCACHE_LINESIZE)"
+ngx_feature_name="NGX_HAVE_LEVEL1_DCACHE_LINESIZE"
+ngx_feature_run=no
+ngx_feature_incs=
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="sysconf(_SC_LEVEL1_DCACHE_LINESIZE)"
+. auto/feature
+
+
 ngx_feature="openat(), fstatat()"
 ngx_feature_name="NGX_HAVE_OPENAT"
 ngx_feature_run=no
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index dc8c0cb..3615e22 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -15,7 +15,7 @@ endif
 syn match ngxName '\([^;{} \t\\]\|\\.\)\+'
     \ contains=@ngxDirectives
     \ nextgroup=@ngxParams skipwhite skipempty
-syn match ngxParam '\([^;{ \t\\]\|\\.\)\+'
+syn match ngxParam '\(\${\|[^;{ \t\\]\|\\.\)\+'
     \ contained
     \ contains=ngxVariable
     \ nextgroup=@ngxParams skipwhite skipempty
@@ -29,7 +29,7 @@ syn region ngxBlock start=+{+ end=+}+ contained
     \ contains=@ngxTopLevel
 syn match ngxComment '#.*$'
 
-syn match ngxVariable '\$\w\+' contained
+syn match ngxVariable '\$\(\w\+\|{\w\+}\)' contained
 syn match ngxVariableString '\$\(\w\+\|{\w\+}\)' contained
 
 syn cluster ngxTopLevel
@@ -52,7 +52,7 @@ syn cluster ngxParams add=ngxBoolean
 syn cluster ngxTopLevel add=ngxDirectiveListen
 syn keyword ngxDirectiveListen listen
     \ nextgroup=@ngxListenParams skipwhite skipempty
-syn match ngxListenParam '\([^;{ \t\\]\|\\.\)\+'
+syn match ngxListenParam '\(\${\|[^;{ \t\\]\|\\.\)\+'
     \ contained
     \ nextgroup=@ngxListenParams skipwhite skipempty
 syn region ngxListenString start=+\z(["']\)+ end=+\z1+ skip=+\\\\\|\\\z1+
@@ -62,15 +62,19 @@ syn match ngxListenComment '#.*$'
     \ contained
     \ nextgroup=@ngxListenParams skipwhite skipempty
 syn keyword ngxListenOptions contained
-    \ default_server ssl http2 spdy proxy_protocol
+    \ default_server ssl http2 proxy_protocol
     \ setfib fastopen backlog rcvbuf sndbuf accept_filter deferred bind
-    \ ipv6only reuseport so_keepalive keepidle
+    \ ipv6only reuseport so_keepalive
+    \ nextgroup=@ngxListenParams skipwhite skipempty
+syn keyword ngxListenOptionsDeprecated contained
+    \ spdy
     \ nextgroup=@ngxListenParams skipwhite skipempty
 syn cluster ngxListenParams
     \ contains=ngxListenParam,ngxListenString,ngxListenComment
-    \ add=ngxListenOptions
+    \ add=ngxListenOptions,ngxListenOptionsDeprecated
 
 syn keyword ngxDirectiveBlock contained http
+syn keyword ngxDirectiveBlock contained stream
 syn keyword ngxDirectiveBlock contained mail
 syn keyword ngxDirectiveBlock contained events
 syn keyword ngxDirectiveBlock contained server
@@ -105,14 +109,16 @@ syn keyword ngxDirectiveControl contained set
 syn keyword ngxDirectiveError contained error_page
 syn keyword ngxDirectiveError contained post_action
 
-syn keyword ngxDirectiveDeprecated contained connections
-syn keyword ngxDirectiveDeprecated contained imap
-syn keyword ngxDirectiveDeprecated contained limit_zone
-syn keyword ngxDirectiveDeprecated contained mysql_test
-syn keyword ngxDirectiveDeprecated contained open_file_cache_retest
-syn keyword ngxDirectiveDeprecated contained optimize_server_names
-syn keyword ngxDirectiveDeprecated contained satisfy_any
-syn keyword ngxDirectiveDeprecated contained so_keepalive
+syn keyword ngxDirectiveDeprecated contained proxy_downstream_buffer
+syn keyword ngxDirectiveDeprecated contained proxy_upstream_buffer
+syn keyword ngxDirectiveDeprecated contained spdy_chunk_size
+syn keyword ngxDirectiveDeprecated contained spdy_headers_comp
+syn keyword ngxDirectiveDeprecated contained spdy_keepalive_timeout
+syn keyword ngxDirectiveDeprecated contained spdy_max_concurrent_streams
+syn keyword ngxDirectiveDeprecated contained spdy_pool_size
+syn keyword ngxDirectiveDeprecated contained spdy_recv_buffer_size
+syn keyword ngxDirectiveDeprecated contained spdy_recv_timeout
+syn keyword ngxDirectiveDeprecated contained spdy_streams_index_size
 
 syn keyword ngxDirective contained absolute_redirect
 syn keyword ngxDirective contained accept_mutex
@@ -122,6 +128,7 @@ syn keyword ngxDirective contained access_log
 syn keyword ngxDirective contained add_after_body
 syn keyword ngxDirective contained add_before_body
 syn keyword ngxDirective contained add_header
+syn keyword ngxDirective contained add_trailer
 syn keyword ngxDirective contained addition_types
 syn keyword ngxDirective contained aio
 syn keyword ngxDirective contained aio_write
@@ -186,6 +193,7 @@ syn keyword ngxDirective contained fastcgi_buffering
 syn keyword ngxDirective contained fastcgi_buffers
 syn keyword ngxDirective contained fastcgi_busy_buffers_size
 syn keyword ngxDirective contained fastcgi_cache
+syn keyword ngxDirective contained fastcgi_cache_background_update
 syn keyword ngxDirective contained fastcgi_cache_bypass
 syn keyword ngxDirective contained fastcgi_cache_key
 syn keyword ngxDirective contained fastcgi_cache_lock
@@ -258,15 +266,17 @@ syn keyword ngxDirective contained hls_forward_args
 syn keyword ngxDirective contained hls_fragment
 syn keyword ngxDirective contained hls_mp4_buffer_size
 syn keyword ngxDirective contained hls_mp4_max_buffer_size
-syn keyword ngxDirective contained http2_chunk_size
 syn keyword ngxDirective contained http2_body_preread_size
+syn keyword ngxDirective contained http2_chunk_size
 syn keyword ngxDirective contained http2_idle_timeout
 syn keyword ngxDirective contained http2_max_concurrent_streams
 syn keyword ngxDirective contained http2_max_field_size
 syn keyword ngxDirective contained http2_max_header_size
 syn keyword ngxDirective contained http2_max_requests
+syn keyword ngxDirective contained http2_pool_size
 syn keyword ngxDirective contained http2_recv_buffer_size
 syn keyword ngxDirective contained http2_recv_timeout
+syn keyword ngxDirective contained http2_streams_index_size
 syn keyword ngxDirective contained if_modified_since
 syn keyword ngxDirective contained ignore_invalid_headers
 syn keyword ngxDirective contained image_filter
@@ -332,6 +342,8 @@ syn keyword ngxDirective contained memcached_read_timeout
 syn keyword ngxDirective contained memcached_send_timeout
 syn keyword ngxDirective contained merge_slashes
 syn keyword ngxDirective contained min_delete_depth
+syn keyword ngxDirective contained mirror
+syn keyword ngxDirective contained mirror_request_body
 syn keyword ngxDirective contained modern_browser
 syn keyword ngxDirective contained modern_browser_value
 syn keyword ngxDirective contained mp4
@@ -374,6 +386,7 @@ syn keyword ngxDirective contained proxy_buffering
 syn keyword ngxDirective contained proxy_buffers
 syn keyword ngxDirective contained proxy_busy_buffers_size
 syn keyword ngxDirective contained proxy_cache
+syn keyword ngxDirective contained proxy_cache_background_update
 syn keyword ngxDirective contained proxy_cache_bypass
 syn keyword ngxDirective contained proxy_cache_convert_head
 syn keyword ngxDirective contained proxy_cache_key
@@ -421,6 +434,7 @@ syn keyword ngxDirective contained proxy_send_lowat
 syn keyword ngxDirective contained proxy_send_timeout
 syn keyword ngxDirective contained proxy_set_body
 syn keyword ngxDirective contained proxy_set_header
+syn keyword ngxDirective contained proxy_ssl
 syn keyword ngxDirective contained proxy_ssl_certificate
 syn keyword ngxDirective contained proxy_ssl_certificate_key
 syn keyword ngxDirective contained proxy_ssl_ciphers
@@ -463,6 +477,7 @@ syn keyword ngxDirective contained scgi_buffering
 syn keyword ngxDirective contained scgi_buffers
 syn keyword ngxDirective contained scgi_busy_buffers_size
 syn keyword ngxDirective contained scgi_cache
+syn keyword ngxDirective contained scgi_cache_background_update
 syn keyword ngxDirective contained scgi_cache_bypass
 syn keyword ngxDirective contained scgi_cache_key
 syn keyword ngxDirective contained scgi_cache_lock
@@ -520,14 +535,6 @@ syn keyword ngxDirective contained smtp_capabilities
 syn keyword ngxDirective contained smtp_client_buffer
 syn keyword ngxDirective contained smtp_greeting_delay
 syn keyword ngxDirective contained source_charset
-syn keyword ngxDirective contained spdy_chunk_size
-syn keyword ngxDirective contained spdy_headers_comp
-syn keyword ngxDirective contained spdy_keepalive_timeout
-syn keyword ngxDirective contained spdy_max_concurrent_streams
-syn keyword ngxDirective contained spdy_pool_size
-syn keyword ngxDirective contained spdy_recv_buffer_size
-syn keyword ngxDirective contained spdy_recv_timeout
-syn keyword ngxDirective contained spdy_streams_index_size
 syn keyword ngxDirective contained ssi
 syn keyword ngxDirective contained ssi_ignore_recycled_buffers
 syn keyword ngxDirective contained ssi_last_modified
@@ -600,11 +607,13 @@ syn keyword ngxDirective contained uwsgi_buffering
 syn keyword ngxDirective contained uwsgi_buffers
 syn keyword ngxDirective contained uwsgi_busy_buffers_size
 syn keyword ngxDirective contained uwsgi_cache
+syn keyword ngxDirective contained uwsgi_cache_background_update
 syn keyword ngxDirective contained uwsgi_cache_bypass
 syn keyword ngxDirective contained uwsgi_cache_key
 syn keyword ngxDirective contained uwsgi_cache_lock
 syn keyword ngxDirective contained uwsgi_cache_lock_age
 syn keyword ngxDirective contained uwsgi_cache_lock_timeout
+syn keyword ngxDirective contained uwsgi_cache_max_range_offset
 syn keyword ngxDirective contained uwsgi_cache_methods
 syn keyword ngxDirective contained uwsgi_cache_min_uses
 syn keyword ngxDirective contained uwsgi_cache_path
@@ -662,6 +671,7 @@ syn keyword ngxDirective contained worker_processes
 syn keyword ngxDirective contained worker_rlimit_core
 syn keyword ngxDirective contained worker_rlimit_nofile
 syn keyword ngxDirective contained worker_rlimit_sigpending
+syn keyword ngxDirective contained worker_shutdown_timeout
 syn keyword ngxDirective contained worker_threads
 syn keyword ngxDirective contained working_directory
 syn keyword ngxDirective contained xclient
@@ -2170,5 +2180,6 @@ hi link ngxDirective Identifier
 hi link ngxDirectiveThirdParty Special
 
 hi link ngxListenOptions Keyword
+hi link ngxListenOptionsDeprecated Error
 
 let b:current_syntax = "nginx"
diff --git a/src/core/nginx.c b/src/core/nginx.c
index c3a29cc..3894c29 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -228,6 +228,7 @@ main(int argc, char *const *argv)
 #endif
 
     ngx_pid = ngx_getpid();
+    ngx_parent = ngx_getppid();
 
     log = ngx_log_init(ngx_prefix);
     if (log == NULL) {
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 02b51ab..8fe782f 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013007
-#define NGINX_VERSION      "1.13.7"
+#define nginx_version      1013008
+#define NGINX_VERSION      "1.13.8"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index fb28a5a..ba454de 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -709,6 +709,11 @@ ngx_conf_read_token(ngx_conf_t *cf)
                 last_space = 0;
                 continue;
 
+            case '$':
+                variable = 1;
+                last_space = 0;
+                continue;
+
             default:
                 last_space = 0;
             }
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index 2b48ccb..a825da2 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -114,6 +114,8 @@ typedef struct {
 
     ngx_array_t               env;
     char                    **environment;
+
+    ngx_uint_t                transparent;  /* unsigned  transparent:1; */
 } ngx_core_conf_t;
 
 
diff --git a/src/http/modules/ngx_http_autoindex_module.c b/src/http/modules/ngx_http_autoindex_module.c
index b3bf652..94b91db 100644
--- a/src/http/modules/ngx_http_autoindex_module.c
+++ b/src/http/modules/ngx_http_autoindex_module.c
@@ -180,6 +180,12 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
         return NGX_DECLINED;
     }
 
+    rc = ngx_http_discard_request_body(r);
+
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
     /* NGX_DIR_MASK_LEN is lesser than NGX_HTTP_AUTOINDEX_PREALLOCATE */
 
     last = ngx_http_map_uri_to_path(r, &path, &root,
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index b42839c..efb4bed 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -1086,8 +1086,7 @@ ngx_http_proxy_create_key(ngx_http_request_t *r)
 
         return NGX_OK;
 
-    } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main)
-    {
+    } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri) {
         *key = r->unparsed_uri;
         u->uri = r->unparsed_uri;
 
@@ -1096,7 +1095,7 @@ ngx_http_proxy_create_key(ngx_http_request_t *r)
 
     loc_len = (r->valid_location && ctx->vars.uri.len) ? plcf->location.len : 0;
 
-    if (r->quoted_uri || r->internal) {
+    if (r->quoted_uri || r->space_in_uri || r->internal) {
         escape = 2 * ngx_escape_uri(NULL, r->uri.data + loc_len,
                                     r->uri.len - loc_len, NGX_ESCAPE_URI);
     } else {
@@ -1201,8 +1200,7 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
     if (plcf->proxy_lengths && ctx->vars.uri.len) {
         uri_len = ctx->vars.uri.len;
 
-    } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main)
-    {
+    } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri) {
         unparsed_uri = 1;
         uri_len = r->unparsed_uri.len;
 
diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index 0048e6b..90a226d 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -340,6 +340,7 @@ ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data,
     pc->connection = NULL;
 
     if (c->read->timer_set) {
+        c->read->delayed = 0;
         ngx_del_timer(c->read);
     }
     if (c->write->timer_set) {
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 57a4742..5951571 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2363,6 +2363,7 @@ ngx_http_subrequest(ngx_http_request_t *r,
         sr->method_name = r->method_name;
         sr->loc_conf = r->loc_conf;
         sr->valid_location = r->valid_location;
+        sr->valid_unparsed_uri = r->valid_unparsed_uri;
         sr->content_handler = r->content_handler;
         sr->phase_handler = r->phase_handler;
         sr->write_event_handler = ngx_http_core_run_phases;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 75f463b..f8d5707 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -3533,7 +3533,7 @@ ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
 
         if (do_write) {
 
-            if (u->out_bufs || u->busy_bufs) {
+            if (u->out_bufs || u->busy_bufs || downstream->buffered) {
                 rc = ngx_http_output_filter(r, u->out_bufs);
 
                 if (rc == NGX_ERROR) {
@@ -6078,6 +6078,12 @@ ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     if (cf->args->nelts > 2) {
         if (ngx_strcmp(value[2].data, "transparent") == 0) {
 #if (NGX_HAVE_TRANSPARENT_PROXY)
+            ngx_core_conf_t  *ccf;
+
+            ccf = (ngx_core_conf_t *) ngx_get_conf(cf->cycle->conf_ctx,
+                                                   ngx_core_module);
+
+            ccf->transparent = 1;
             local->transparent = 1;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
index ab67211..385c49b 100644
--- a/src/os/unix/ngx_daemon.c
+++ b/src/os/unix/ngx_daemon.c
@@ -26,6 +26,7 @@ ngx_daemon(ngx_log_t *log)
         exit(0);
     }
 
+    ngx_parent = ngx_pid;
     ngx_pid = ngx_getpid();
 
     if (setsid() == -1) {
diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
index 2f6129d..3036cae 100644
--- a/src/os/unix/ngx_linux_config.h
+++ b/src/os/unix/ngx_linux_config.h
@@ -99,6 +99,11 @@ typedef struct iocb  ngx_aiocb_t;
 #endif
 
 
+#if (NGX_HAVE_CAPABILITIES)
+#include <linux/capability.h>
+#endif
+
+
 #define NGX_LISTEN_BACKLOG        511
 
 
diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h
index 5d1358e..2a8c413 100644
--- a/src/os/unix/ngx_posix_config.h
+++ b/src/os/unix/ngx_posix_config.h
@@ -145,26 +145,6 @@ typedef struct aiocb  ngx_aiocb_t;
 #define ngx_debug_init()
 
 
-#if (__FreeBSD__) && (__FreeBSD_version < 400017)
-
-#include <sys/param.h>          /* ALIGN() */
-
-/*
- * FreeBSD 3.x has no CMSG_SPACE() and CMSG_LEN() and has the broken CMSG_DATA()
- */
-
-#undef  CMSG_SPACE
-#define CMSG_SPACE(l)       (ALIGN(sizeof(struct cmsghdr)) + ALIGN(l))
-
-#undef  CMSG_LEN
-#define CMSG_LEN(l)         (ALIGN(sizeof(struct cmsghdr)) + (l))
-
-#undef  CMSG_DATA
-#define CMSG_DATA(cmsg)     ((u_char *)(cmsg) + ALIGN(sizeof(struct cmsghdr)))
-
-#endif
-
-
 extern char **environ;
 
 
diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c
index 583ea4f..7824735 100644
--- a/src/os/unix/ngx_posix_init.c
+++ b/src/os/unix/ngx_posix_init.c
@@ -36,6 +36,9 @@ ngx_os_init(ngx_log_t *log)
 {
     ngx_time_t  *tp;
     ngx_uint_t   n;
+#if (NGX_HAVE_LEVEL1_DCACHE_LINESIZE)
+    long         size;
+#endif
 
 #if (NGX_HAVE_OS_SPECIFIC_INIT)
     if (ngx_os_specific_init(log) != NGX_OK) {
@@ -62,6 +65,13 @@ ngx_os_init(ngx_log_t *log)
         ngx_ncpu = 1;
     }
 
+#if (NGX_HAVE_LEVEL1_DCACHE_LINESIZE)
+    size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
+    if (size > 0) {
+        ngx_cacheline_size = size;
+    }
+#endif
+
     ngx_cpuinfo();
 
     if (getrlimit(RLIMIT_NOFILE, &rlmt) == -1) {
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
index 993c032..1568023 100644
--- a/src/os/unix/ngx_process.c
+++ b/src/os/unix/ngx_process.c
@@ -194,6 +194,7 @@ ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data,
         return NGX_INVALID_PID;
 
     case 0:
+        ngx_parent = ngx_pid;
         ngx_pid = ngx_getpid();
         proc(cycle, data);
         break;
@@ -371,12 +372,12 @@ ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext)
             break;
 
         case ngx_signal_value(NGX_CHANGEBIN_SIGNAL):
-            if (getppid() > 1 || ngx_new_binary > 0) {
+            if (ngx_getppid() == ngx_parent || ngx_new_binary > 0) {
 
                 /*
                  * Ignore the signal in the new binary if its parent is
-                 * not the init process, i.e. the old binary's process
-                 * is still running.  Or ignore the signal in the old binary's
+                 * not changed, i.e. the old binary's process is still
+                 * running.  Or ignore the signal in the old binary's
                  * process if the new binary's process is already running.
                  */
 
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
index 7b5e8c0..3986639 100644
--- a/src/os/unix/ngx_process.h
+++ b/src/os/unix/ngx_process.h
@@ -54,6 +54,7 @@ typedef struct {
 
 
 #define ngx_getpid   getpid
+#define ngx_getppid  getppid
 
 #ifndef ngx_log_pid
 #define ngx_log_pid  ngx_pid
@@ -79,6 +80,7 @@ extern char         **ngx_argv;
 extern char         **ngx_os_argv;
 
 extern ngx_pid_t      ngx_pid;
+extern ngx_pid_t      ngx_parent;
 extern ngx_socket_t   ngx_channel;
 extern ngx_int_t      ngx_process_slot;
 extern ngx_int_t      ngx_last_process;
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 1710ea8..5817a2c 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -31,6 +31,7 @@ static void ngx_cache_loader_process_handler(ngx_event_t *ev);
 ngx_uint_t    ngx_process;
 ngx_uint_t    ngx_worker;
 ngx_pid_t     ngx_pid;
+ngx_pid_t     ngx_parent;
 
 sig_atomic_t  ngx_reap;
 sig_atomic_t  ngx_sigio;
@@ -838,12 +839,44 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
                           ccf->username, ccf->group);
         }
 
+#if (NGX_HAVE_PR_SET_KEEPCAPS && NGX_HAVE_CAPABILITIES)
+        if (ccf->transparent && ccf->user) {
+            if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                              "prctl(PR_SET_KEEPCAPS, 1) failed");
+                /* fatal */
+                exit(2);
+            }
+        }
+#endif
+
         if (setuid(ccf->user) == -1) {
             ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                           "setuid(%d) failed", ccf->user);
             /* fatal */
             exit(2);
         }
+
+#if (NGX_HAVE_CAPABILITIES)
+        if (ccf->transparent && ccf->user) {
+            struct __user_cap_data_struct    data;
+            struct __user_cap_header_struct  header;
+
+            ngx_memzero(&header, sizeof(struct __user_cap_header_struct));
+            ngx_memzero(&data, sizeof(struct __user_cap_data_struct));
+
+            header.version = _LINUX_CAPABILITY_VERSION_1;
+            data.effective = CAP_TO_MASK(CAP_NET_RAW);
+            data.permitted = data.effective;
+
+            if (syscall(SYS_capset, &header, &data) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                              "capset() failed");
+                /* fatal */
+                exit(2);
+            }
+        }
+#endif
     }
 
     if (worker >= 0) {
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index ad81cc8..818d732 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -2155,6 +2155,12 @@ ngx_stream_proxy_bind(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     if (cf->args->nelts > 2) {
         if (ngx_strcmp(value[2].data, "transparent") == 0) {
 #if (NGX_HAVE_TRANSPARENT_PROXY)
+            ngx_core_conf_t  *ccf;
+
+            ccf = (ngx_core_conf_t *) ngx_get_conf(cf->cycle->conf_ctx,
+                                                   ngx_core_module);
+
+            ccf->transparent = 1;
             local->transparent = 1;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,

From 1b9fa09ac526bc1406a814b5c3fb4418364ab117 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 27 Dec 2017 09:25:06 +0200
Subject: [PATCH 241/600] Release 1.13.8-1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 64d74ca..321232e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.13.8-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 27 Dec 2017 09:24:36 +0200
+
 nginx (1.13.7-1) unstable; urgency=medium
 
   [ Christos Trochalakis ]

From 7404f8bd77b8679f85b0b7d0ec64d114c15f22ae Mon Sep 17 00:00:00 2001
From: Michael Lustfield <michael@lustfield.net>
Date: Fri, 2 Feb 2018 20:44:42 -0600
Subject: [PATCH 242/600] Remove non-uploading users.

---
 debian/control | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 38cd027..367d413 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: nginx
 Section: httpd
 Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@lists.alioth.debian.org>
-Uploaders: Kartik Mistry <kartik@debian.org>,
-           Michael Lustfield <michael@lustfield.net>,
-           Christos Trochalakis <ctrochalakis@debian.org>
+Uploaders: Christos Trochalakis <ctrochalakis@debian.org>
 Build-Depends: debhelper (>= 10),
                po-debconf,
                dpkg-dev (>= 1.15.5),

From 0490248e0f7bda100a15f97fd64fc9954d439b79 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Tue, 20 Feb 2018 18:57:58 +0200
Subject: [PATCH 243/600] New upstream version 1.13.9

---
 CHANGES                                       |   17 +
 CHANGES.ru                                    |   17 +
 LICENSE                                       |    4 +-
 auto/modules                                  |    1 +
 contrib/vim/syntax/nginx.vim                  | 2627 +++++++++--------
 src/core/nginx.h                              |    4 +-
 src/core/ngx_cycle.h                          |    1 +
 src/event/modules/ngx_eventport_module.c      |    2 +
 src/http/modules/ngx_http_dav_module.c        |   11 +-
 .../modules/ngx_http_headers_filter_module.c  |   42 +-
 src/http/ngx_http_request.c                   |    6 +-
 src/http/ngx_http_request.h                   |    3 +-
 src/http/ngx_http_upstream.c                  |   12 +-
 src/http/ngx_http_variables.c                 |    3 +
 src/http/v2/ngx_http_v2.c                     |  434 ++-
 src/http/v2/ngx_http_v2.h                     |   15 +-
 src/http/v2/ngx_http_v2_filter_module.c       |  837 +++++-
 src/http/v2/ngx_http_v2_module.c              |  101 +
 src/http/v2/ngx_http_v2_module.h              |    6 +
 src/mail/ngx_mail_handler.c                   |    4 +-
 src/stream/ngx_stream_ssl_module.c            |    4 +-
 21 files changed, 2633 insertions(+), 1518 deletions(-)

diff --git a/CHANGES b/CHANGES
index c1188d7..b5e7096 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,21 @@
 
+Changes with nginx 1.13.9                                        20 Feb 2018
+
+    *) Feature: HTTP/2 server push support; the "http2_push" and
+       "http2_push_preload" directives.
+
+    *) Bugfix: "header already sent" alerts might appear in logs when using
+       cache; the bug had appeared in 1.9.13.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if the
+       "ssl_verify_client" directive was used and no SSL certificate was
+       specified in a virtual server.
+
+    *) Bugfix: in the ngx_http_v2_module.
+
+    *) Bugfix: in the ngx_http_dav_module.
+
+
 Changes with nginx 1.13.8                                        26 Dec 2017
 
     *) Feature: now nginx automatically preserves the CAP_NET_RAW capability
diff --git a/CHANGES.ru b/CHANGES.ru
index 83d3667..75c9080 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,21 @@
 
+Изменения в nginx 1.13.9                                          20.02.2018
+
+    *) Добавление: поддержка HTTP/2 server push; директивы http2_push и
+       http2_push_preload.
+
+    *) Исправление: при использовании кэша в логах могли появляться
+       сообщения "header already sent"; ошибка появилась в 1.9.13.
+
+    *) Исправление: при использовании директивы ssl_verify_client в рабочем
+       процессе мог произойти segmentation fault, если в виртуальном сервере
+       не был указан SSL-сертификат.
+
+    *) Исправление: в модуле ngx_http_v2_module.
+
+    *) Исправление: в модуле ngx_http_dav_module.
+
+
 Изменения в nginx 1.13.8                                          26.12.2017
 
     *) Добавление: теперь при использовании параметра transparent директив
diff --git a/LICENSE b/LICENSE
index 3f29d93..9401174 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2002-2017 Igor Sysoev
- * Copyright (C) 2011-2017 Nginx, Inc.
+ * Copyright (C) 2002-2018 Igor Sysoev
+ * Copyright (C) 2011-2018 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/auto/modules b/auto/modules
index 26b05bd..b9fa3bb 100644
--- a/auto/modules
+++ b/auto/modules
@@ -420,6 +420,7 @@ if [ $HTTP = YES ]; then
 
     if [ $HTTP_V2 = YES ]; then
         have=NGX_HTTP_V2 . auto/have
+        have=NGX_HTTP_HEADERS . auto/have
 
         ngx_module_name=ngx_http_v2_module
         ngx_module_incs=src/http/v2
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 3615e22..0a21372 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -37,7 +37,7 @@ syn cluster ngxTopLevel
 syn cluster ngxDirectives
     \ contains=ngxDirective,ngxDirectiveBlock,ngxDirectiveImportant
     \ add=ngxDirectiveControl,ngxDirectiveError,ngxDirectiveDeprecated
-    \ add=ngxDirectiveThirdParty
+    \ add=ngxDirectiveThirdParty,ngxDirectiveThirdPartyDeprecated
 syn cluster ngxParams
     \ contains=ngxParam,ngxString,ngxParamComment,ngxSemicolon,ngxBlock
 
@@ -87,12 +87,11 @@ syn keyword ngxDirectiveBlock contained if
 syn keyword ngxDirectiveBlock contained geo
 syn keyword ngxDirectiveBlock contained map
 syn keyword ngxDirectiveBlock contained split_clients
+syn keyword ngxDirectiveBlock contained match
 
 syn keyword ngxDirectiveImportant contained include
 syn keyword ngxDirectiveImportant contained root
-"syn keyword ngxDirectiveImportant contained server
 syn keyword ngxDirectiveImportant contained server_name
-"syn keyword ngxDirectiveImportant contained listen
 syn keyword ngxDirectiveImportant contained internal
 syn keyword ngxDirectiveImportant contained proxy_pass
 syn keyword ngxDirectiveImportant contained memcached_pass
@@ -119,6 +118,7 @@ syn keyword ngxDirectiveDeprecated contained spdy_pool_size
 syn keyword ngxDirectiveDeprecated contained spdy_recv_buffer_size
 syn keyword ngxDirectiveDeprecated contained spdy_recv_timeout
 syn keyword ngxDirectiveDeprecated contained spdy_streams_index_size
+syn keyword ngxDirectiveDeprecated contained upstream_conf
 
 syn keyword ngxDirective contained absolute_redirect
 syn keyword ngxDirective contained accept_mutex
@@ -151,7 +151,6 @@ syn keyword ngxDirective contained autoindex_exact_size
 syn keyword ngxDirective contained autoindex_format
 syn keyword ngxDirective contained autoindex_localtime
 syn keyword ngxDirective contained charset
-syn keyword ngxDirective contained charset_map
 syn keyword ngxDirective contained charset_types
 syn keyword ngxDirective contained chunked_transfer_encoding
 syn keyword ngxDirective contained client_body_buffer_size
@@ -327,7 +326,6 @@ syn keyword ngxDirective contained log_not_found
 syn keyword ngxDirective contained log_subrequest
 syn keyword ngxDirective contained map_hash_bucket_size
 syn keyword ngxDirective contained map_hash_max_size
-syn keyword ngxDirective contained match
 syn keyword ngxDirective contained master_process
 syn keyword ngxDirective contained max_ranges
 syn keyword ngxDirective contained memcached_bind
@@ -466,10 +464,6 @@ syn keyword ngxDirective contained reset_timedout_connection
 syn keyword ngxDirective contained resolver
 syn keyword ngxDirective contained resolver_timeout
 syn keyword ngxDirective contained rewrite_log
-syn keyword ngxDirective contained rtsig_overflow_events
-syn keyword ngxDirective contained rtsig_overflow_test
-syn keyword ngxDirective contained rtsig_overflow_threshold
-syn keyword ngxDirective contained rtsig_signo
 syn keyword ngxDirective contained satisfy
 syn keyword ngxDirective contained scgi_bind
 syn keyword ngxDirective contained scgi_buffer_size
@@ -583,14 +577,12 @@ syn keyword ngxDirective contained sub_filter_types
 syn keyword ngxDirective contained tcp_nodelay
 syn keyword ngxDirective contained tcp_nopush
 syn keyword ngxDirective contained thread_pool
-syn keyword ngxDirective contained thread_stack_size
 syn keyword ngxDirective contained timeout
 syn keyword ngxDirective contained timer_resolution
 syn keyword ngxDirective contained types_hash_bucket_size
 syn keyword ngxDirective contained types_hash_max_size
 syn keyword ngxDirective contained underscores_in_headers
 syn keyword ngxDirective contained uninitialized_variable_warn
-syn keyword ngxDirective contained upstream_conf
 syn keyword ngxDirective contained use
 syn keyword ngxDirective contained user
 syn keyword ngxDirective contained userid
@@ -636,7 +628,6 @@ syn keyword ngxDirective contained uwsgi_next_upstream_timeout
 syn keyword ngxDirective contained uwsgi_next_upstream_tries
 syn keyword ngxDirective contained uwsgi_no_cache
 syn keyword ngxDirective contained uwsgi_param
-syn keyword ngxDirective contained uwsgi_pass
 syn keyword ngxDirective contained uwsgi_pass_header
 syn keyword ngxDirective contained uwsgi_pass_request_body
 syn keyword ngxDirective contained uwsgi_pass_request_headers
@@ -670,9 +661,7 @@ syn keyword ngxDirective contained worker_priority
 syn keyword ngxDirective contained worker_processes
 syn keyword ngxDirective contained worker_rlimit_core
 syn keyword ngxDirective contained worker_rlimit_nofile
-syn keyword ngxDirective contained worker_rlimit_sigpending
 syn keyword ngxDirective contained worker_shutdown_timeout
-syn keyword ngxDirective contained worker_threads
 syn keyword ngxDirective contained working_directory
 syn keyword ngxDirective contained xclient
 syn keyword ngxDirective contained xml_entities
@@ -683,597 +672,295 @@ syn keyword ngxDirective contained xslt_stylesheet
 syn keyword ngxDirective contained xslt_types
 syn keyword ngxDirective contained zone
 
-" 3rd party module list:
-" https://www.nginx.com/resources/wiki/modules/
+" 3rd party modules list taken from
+" https://github.com/freebsd/freebsd-ports/blob/master/www/nginx-devel/Makefile
+" -----------------------------------------------------------------------------
 
-" Accept Language Module <https://www.nginx.com/resources/wiki/modules/accept_language/>
-" Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
+" Accept Language
+" https://github.com/giom/nginx_accept_language_module
 syn keyword ngxDirectiveThirdParty contained set_from_accept_language
 
-" Access Key Module (DEPRECATED) <http://wiki.nginx.org/NginxHttpAccessKeyModule>
-" Denies access unless the request URL contains an access key.
-syn keyword ngxDirectiveDeprecated contained accesskey
-syn keyword ngxDirectiveDeprecated contained accesskey_arg
-syn keyword ngxDirectiveDeprecated contained accesskey_hashmethod
-syn keyword ngxDirectiveDeprecated contained accesskey_signature
+" Digest Authentication
+" https://github.com/atomx/nginx-http-auth-digest
+syn keyword ngxDirectiveThirdParty contained auth_digest
+syn keyword ngxDirectiveThirdParty contained auth_digest_drop_time
+syn keyword ngxDirectiveThirdParty contained auth_digest_evasion_time
+syn keyword ngxDirectiveThirdParty contained auth_digest_expires
+syn keyword ngxDirectiveThirdParty contained auth_digest_maxtries
+syn keyword ngxDirectiveThirdParty contained auth_digest_replays
+syn keyword ngxDirectiveThirdParty contained auth_digest_shm_size
+syn keyword ngxDirectiveThirdParty contained auth_digest_timeout
+syn keyword ngxDirectiveThirdParty contained auth_digest_user_file
 
-" Asynchronous FastCGI Module <https://github.com/rsms/afcgi>
-" Primarily a modified version of the Nginx FastCGI module which implements multiplexing of connections, allowing a single FastCGI server to handle many concurrent requests.
-" syn keyword ngxDirectiveThirdParty contained fastcgi_bind
-" syn keyword ngxDirectiveThirdParty contained fastcgi_buffer_size
-" syn keyword ngxDirectiveThirdParty contained fastcgi_buffers
-" syn keyword ngxDirectiveThirdParty contained fastcgi_busy_buffers_size
-" syn keyword ngxDirectiveThirdParty contained fastcgi_cache
-" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_key
-" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_methods
-" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_min_uses
-" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_path
-" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_use_stale
-" syn keyword ngxDirectiveThirdParty contained fastcgi_cache_valid
-" syn keyword ngxDirectiveThirdParty contained fastcgi_catch_stderr
-" syn keyword ngxDirectiveThirdParty contained fastcgi_connect_timeout
-" syn keyword ngxDirectiveThirdParty contained fastcgi_hide_header
-" syn keyword ngxDirectiveThirdParty contained fastcgi_ignore_client_abort
-" syn keyword ngxDirectiveThirdParty contained fastcgi_ignore_headers
-" syn keyword ngxDirectiveThirdParty contained fastcgi_index
-" syn keyword ngxDirectiveThirdParty contained fastcgi_intercept_errors
-" syn keyword ngxDirectiveThirdParty contained fastcgi_max_temp_file_size
-" syn keyword ngxDirectiveThirdParty contained fastcgi_next_upstream
-" syn keyword ngxDirectiveThirdParty contained fastcgi_param
-" syn keyword ngxDirectiveThirdParty contained fastcgi_pass
-" syn keyword ngxDirectiveThirdParty contained fastcgi_pass_header
-" syn keyword ngxDirectiveThirdParty contained fastcgi_pass_request_body
-" syn keyword ngxDirectiveThirdParty contained fastcgi_pass_request_headers
-" syn keyword ngxDirectiveThirdParty contained fastcgi_read_timeout
-" syn keyword ngxDirectiveThirdParty contained fastcgi_send_lowat
-" syn keyword ngxDirectiveThirdParty contained fastcgi_send_timeout
-" syn keyword ngxDirectiveThirdParty contained fastcgi_split_path_info
-" syn keyword ngxDirectiveThirdParty contained fastcgi_store
-" syn keyword ngxDirectiveThirdParty contained fastcgi_store_access
-" syn keyword ngxDirectiveThirdParty contained fastcgi_temp_file_write_size
-" syn keyword ngxDirectiveThirdParty contained fastcgi_temp_path
-syn keyword ngxDirectiveDeprecated contained fastcgi_upstream_fail_timeout
-syn keyword ngxDirectiveDeprecated contained fastcgi_upstream_max_fails
+" SPNEGO Authentication
+" https://github.com/stnoonan/spnego-http-auth-nginx-module
+syn keyword ngxDirectiveThirdParty contained auth_gss
+syn keyword ngxDirectiveThirdParty contained auth_gss_allow_basic_fallback
+syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal
+syn keyword ngxDirectiveThirdParty contained auth_gss_force_realm
+syn keyword ngxDirectiveThirdParty contained auth_gss_format_full
+syn keyword ngxDirectiveThirdParty contained auth_gss_keytab
+syn keyword ngxDirectiveThirdParty contained auth_gss_realm
+syn keyword ngxDirectiveThirdParty contained auth_gss_service_name
 
-" Akamai G2O Module <https://github.com/kaltura/nginx_mod_akamai_g2o>
-" Nginx Module for Authenticating Akamai G2O requests
-syn keyword ngxDirectiveThirdParty contained g2o
-syn keyword ngxDirectiveThirdParty contained g2o_nonce
-syn keyword ngxDirectiveThirdParty contained g2o_key
+" LDAP Authentication
+" https://github.com/kvspb/nginx-auth-ldap
+syn keyword ngxDirectiveThirdParty contained auth_ldap
+syn keyword ngxDirectiveThirdParty contained auth_ldap_cache_enabled
+syn keyword ngxDirectiveThirdParty contained auth_ldap_cache_expiration_time
+syn keyword ngxDirectiveThirdParty contained auth_ldap_cache_size
+syn keyword ngxDirectiveThirdParty contained auth_ldap_servers
+syn keyword ngxDirectiveThirdParty contained auth_ldap_servers_size
+syn keyword ngxDirectiveThirdParty contained ldap_server
 
-" Lua Module <https://github.com/alacner/nginx_lua_module>
-" You can be very simple to execute lua code for nginx
-syn keyword ngxDirectiveThirdParty contained lua_file
+" PAM Authentication
+" https://github.com/sto/ngx_http_auth_pam_module
+syn keyword ngxDirectiveThirdParty contained auth_pam
+syn keyword ngxDirectiveThirdParty contained auth_pam_service_name
+syn keyword ngxDirectiveThirdParty contained auth_pam_set_pam_env
 
-" Array Variable Module <https://github.com/openresty/array-var-nginx-module>
-" Add support for array-typed variables to nginx config files
-syn keyword ngxDirectiveThirdParty contained array_split
-syn keyword ngxDirectiveThirdParty contained array_join
-syn keyword ngxDirectiveThirdParty contained array_map
-syn keyword ngxDirectiveThirdParty contained array_map_op
+" AJP protocol proxy
+" https://github.com/yaoweibin/nginx_ajp_module
+syn keyword ngxDirectiveThirdParty contained ajp_buffer_size
+syn keyword ngxDirectiveThirdParty contained ajp_buffers
+syn keyword ngxDirectiveThirdParty contained ajp_busy_buffers_size
+syn keyword ngxDirectiveThirdParty contained ajp_cache
+syn keyword ngxDirectiveThirdParty contained ajp_cache_key
+syn keyword ngxDirectiveThirdParty contained ajp_cache_lock
+syn keyword ngxDirectiveThirdParty contained ajp_cache_lock_timeout
+syn keyword ngxDirectiveThirdParty contained ajp_cache_methods
+syn keyword ngxDirectiveThirdParty contained ajp_cache_min_uses
+syn keyword ngxDirectiveThirdParty contained ajp_cache_path
+syn keyword ngxDirectiveThirdParty contained ajp_cache_use_stale
+syn keyword ngxDirectiveThirdParty contained ajp_cache_valid
+syn keyword ngxDirectiveThirdParty contained ajp_connect_timeout
+syn keyword ngxDirectiveThirdParty contained ajp_header_packet_buffer_size
+syn keyword ngxDirectiveThirdParty contained ajp_hide_header
+syn keyword ngxDirectiveThirdParty contained ajp_ignore_client_abort
+syn keyword ngxDirectiveThirdParty contained ajp_ignore_headers
+syn keyword ngxDirectiveThirdParty contained ajp_intercept_errors
+syn keyword ngxDirectiveThirdParty contained ajp_keep_conn
+syn keyword ngxDirectiveThirdParty contained ajp_max_data_packet_size
+syn keyword ngxDirectiveThirdParty contained ajp_max_temp_file_size
+syn keyword ngxDirectiveThirdParty contained ajp_next_upstream
+syn keyword ngxDirectiveThirdParty contained ajp_pass
+syn keyword ngxDirectiveThirdParty contained ajp_pass_header
+syn keyword ngxDirectiveThirdParty contained ajp_pass_request_body
+syn keyword ngxDirectiveThirdParty contained ajp_pass_request_headers
+syn keyword ngxDirectiveThirdParty contained ajp_read_timeout
+syn keyword ngxDirectiveThirdParty contained ajp_send_lowat
+syn keyword ngxDirectiveThirdParty contained ajp_send_timeout
+syn keyword ngxDirectiveThirdParty contained ajp_store
+syn keyword ngxDirectiveThirdParty contained ajp_store_access
+syn keyword ngxDirectiveThirdParty contained ajp_temp_file_write_size
+syn keyword ngxDirectiveThirdParty contained ajp_temp_path
+syn keyword ngxDirectiveThirdParty contained ajp_upstream_fail_timeout
+syn keyword ngxDirectiveThirdParty contained ajp_upstream_max_fails
 
-" Nginx Audio Track for HTTP Live Streaming <https://github.com/flavioribeiro/nginx-audio-track-for-hls-module>
-" This nginx module generates audio track for hls streams on the fly.
-syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track
-syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_rootpath
-syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_output_format
-syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_output_header
-
-" AWS Proxy Module <https://github.com/anomalizer/ngx_aws_auth>
-" Nginx module to proxy to authenticated AWS services
+" AWS proxy
+" https://github.com/anomalizer/ngx_aws_auth
 syn keyword ngxDirectiveThirdParty contained aws_access_key
-syn keyword ngxDirectiveThirdParty contained aws_key_scope
-syn keyword ngxDirectiveThirdParty contained aws_signing_key
 syn keyword ngxDirectiveThirdParty contained aws_endpoint
+syn keyword ngxDirectiveThirdParty contained aws_key_scope
 syn keyword ngxDirectiveThirdParty contained aws_s3_bucket
 syn keyword ngxDirectiveThirdParty contained aws_sign
+syn keyword ngxDirectiveThirdParty contained aws_signing_key
 
-" Backtrace module <https://github.com/alibaba/nginx-backtrace>
-" A Nginx module to dump backtrace when a worker process exits abnormally
-syn keyword ngxDirectiveThirdParty contained backtrace_log
-syn keyword ngxDirectiveThirdParty contained backtrace_max_stack_size
-
-" Brotli Module <https://github.com/google/ngx_brotli>
-" Nginx module for Brotli compression
-syn keyword ngxDirectiveThirdParty contained brotli_static
-syn keyword ngxDirectiveThirdParty contained brotli
-syn keyword ngxDirectiveThirdParty contained brotli_types
-syn keyword ngxDirectiveThirdParty contained brotli_buffers
-syn keyword ngxDirectiveThirdParty contained brotli_comp_level
-syn keyword ngxDirectiveThirdParty contained brotli_window
-syn keyword ngxDirectiveThirdParty contained brotli_min_length
-
-" Cache Purge Module <https://github.com/FRiCKLE/ngx_cache_purge>
-" Adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches.
-syn keyword ngxDirectiveThirdParty contained fastcgi_cache_purge
-syn keyword ngxDirectiveThirdParty contained proxy_cache_purge
-" syn keyword ngxDirectiveThirdParty contained scgi_cache_purge
-" syn keyword ngxDirectiveThirdParty contained uwsgi_cache_purge
-
-" Chunkin Module (DEPRECATED) <http://wiki.nginx.org/NginxHttpChunkinModule>
-" HTTP 1.1 chunked-encoding request body support for Nginx.
-syn keyword ngxDirectiveDeprecated contained chunkin
-syn keyword ngxDirectiveDeprecated contained chunkin_keepalive
-syn keyword ngxDirectiveDeprecated contained chunkin_max_chunks_per_buf
-syn keyword ngxDirectiveDeprecated contained chunkin_resume
-
-" Circle GIF Module <https://github.com/evanmiller/nginx_circle_gif>
-" Generates simple circle images with the colors and size specified in the URL.
-syn keyword ngxDirectiveThirdParty contained circle_gif
-syn keyword ngxDirectiveThirdParty contained circle_gif_max_radius
-syn keyword ngxDirectiveThirdParty contained circle_gif_min_radius
-syn keyword ngxDirectiveThirdParty contained circle_gif_step_radius
-
-" Nginx-Clojure Module <http://nginx-clojure.github.io/index.html>
-" Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
-syn keyword ngxDirectiveThirdParty contained jvm_path
-syn keyword ngxDirectiveThirdParty contained jvm_var
+" embedding Clojure or Java or Groovy programs
+" https://github.com/nginx-clojure/nginx-clojure
+syn keyword ngxDirectiveThirdParty contained access_handler_code
+syn keyword ngxDirectiveThirdParty contained access_handler_name
+syn keyword ngxDirectiveThirdParty contained access_handler_property
+syn keyword ngxDirectiveThirdParty contained access_handler_type
+syn keyword ngxDirectiveThirdParty contained always_read_body
+syn keyword ngxDirectiveThirdParty contained auto_upgrade_ws
+syn keyword ngxDirectiveThirdParty contained body_filter_code
+syn keyword ngxDirectiveThirdParty contained body_filter_name
+syn keyword ngxDirectiveThirdParty contained body_filter_property
+syn keyword ngxDirectiveThirdParty contained body_filter_type
+syn keyword ngxDirectiveThirdParty contained content_handler_code
+syn keyword ngxDirectiveThirdParty contained content_handler_name
+syn keyword ngxDirectiveThirdParty contained content_handler_property
+syn keyword ngxDirectiveThirdParty contained content_handler_type
+syn keyword ngxDirectiveThirdParty contained handler_code
+syn keyword ngxDirectiveThirdParty contained handler_name
+syn keyword ngxDirectiveThirdParty contained handler_type
+syn keyword ngxDirectiveThirdParty contained handlers_lazy_init
+syn keyword ngxDirectiveThirdParty contained header_filter_code
+syn keyword ngxDirectiveThirdParty contained header_filter_name
+syn keyword ngxDirectiveThirdParty contained header_filter_property
+syn keyword ngxDirectiveThirdParty contained header_filter_type
 syn keyword ngxDirectiveThirdParty contained jvm_classpath
 syn keyword ngxDirectiveThirdParty contained jvm_classpath_check
-syn keyword ngxDirectiveThirdParty contained jvm_workers
-syn keyword ngxDirectiveThirdParty contained jvm_options
-syn keyword ngxDirectiveThirdParty contained jvm_handler_type
-syn keyword ngxDirectiveThirdParty contained jvm_init_handler_name
-syn keyword ngxDirectiveThirdParty contained jvm_init_handler_code
-syn keyword ngxDirectiveThirdParty contained jvm_exit_handler_name
 syn keyword ngxDirectiveThirdParty contained jvm_exit_handler_code
-syn keyword ngxDirectiveThirdParty contained handlers_lazy_init
-syn keyword ngxDirectiveThirdParty contained auto_upgrade_ws
-syn keyword ngxDirectiveThirdParty contained content_handler_type
-syn keyword ngxDirectiveThirdParty contained content_handler_name
-syn keyword ngxDirectiveThirdParty contained content_handler_code
-syn keyword ngxDirectiveThirdParty contained rewrite_handler_type
-syn keyword ngxDirectiveThirdParty contained rewrite_handler_name
+syn keyword ngxDirectiveThirdParty contained jvm_exit_handler_name
+syn keyword ngxDirectiveThirdParty contained jvm_handler_type
+syn keyword ngxDirectiveThirdParty contained jvm_init_handler_code
+syn keyword ngxDirectiveThirdParty contained jvm_init_handler_name
+syn keyword ngxDirectiveThirdParty contained jvm_options
+syn keyword ngxDirectiveThirdParty contained jvm_path
+syn keyword ngxDirectiveThirdParty contained jvm_var
+syn keyword ngxDirectiveThirdParty contained jvm_workers
+syn keyword ngxDirectiveThirdParty contained max_balanced_tcp_connections
 syn keyword ngxDirectiveThirdParty contained rewrite_handler_code
-syn keyword ngxDirectiveThirdParty contained access_handler_type
-syn keyword ngxDirectiveThirdParty contained access_handler_name
-syn keyword ngxDirectiveThirdParty contained access_handler_code
-syn keyword ngxDirectiveThirdParty contained header_filter_type
-syn keyword ngxDirectiveThirdParty contained header_filter_name
-syn keyword ngxDirectiveThirdParty contained header_filter_code
-syn keyword ngxDirectiveThirdParty contained content_handler_property
+syn keyword ngxDirectiveThirdParty contained rewrite_handler_name
 syn keyword ngxDirectiveThirdParty contained rewrite_handler_property
-syn keyword ngxDirectiveThirdParty contained access_handler_property
-syn keyword ngxDirectiveThirdParty contained header_filter_property
-syn keyword ngxDirectiveThirdParty contained always_read_body
+syn keyword ngxDirectiveThirdParty contained rewrite_handler_type
 syn keyword ngxDirectiveThirdParty contained shared_map
 syn keyword ngxDirectiveThirdParty contained write_page_size
 
-" Upstream Consistent Hash <https://www.nginx.com/resources/wiki/modules/consistent_hash/>
-" A load balancer that uses an internal consistent hash ring to select the right backend node.
-syn keyword ngxDirectiveThirdParty contained consistent_hash
+" Certificate Transparency
+" https://github.com/grahamedgecombe/nginx-ct
+syn keyword ngxDirectiveThirdParty contained ssl_ct
+syn keyword ngxDirectiveThirdParty contained ssl_ct_static_scts
 
-" Nginx Development Kit <https://github.com/simpl/ngx_devel_kit>
-" The NDK is an Nginx module that is designed to extend the core functionality of the excellent Nginx webserver in a way that can be used as a basis of other Nginx modules.
-" NDK_UPSTREAM_LIST
-" This submodule provides a directive that creates a list of upstreams, with optional weighting. This list can then be used by other modules to hash over the upstreams however they choose.
-syn keyword ngxDirectiveThirdParty contained upstream_list
-
-" Drizzle Module <https://www.nginx.com/resources/wiki/modules/drizzle/>
-" Upstream module for talking to MySQL and Drizzle directly
-syn keyword ngxDirectiveThirdParty contained drizzle_server
-syn keyword ngxDirectiveThirdParty contained drizzle_keepalive
-syn keyword ngxDirectiveThirdParty contained drizzle_query
-syn keyword ngxDirectiveThirdParty contained drizzle_pass
-syn keyword ngxDirectiveThirdParty contained drizzle_connect_timeout
-syn keyword ngxDirectiveThirdParty contained drizzle_send_query_timeout
-syn keyword ngxDirectiveThirdParty contained drizzle_recv_cols_timeout
-syn keyword ngxDirectiveThirdParty contained drizzle_recv_rows_timeout
-syn keyword ngxDirectiveThirdParty contained drizzle_buffer_size
-syn keyword ngxDirectiveThirdParty contained drizzle_module_header
-syn keyword ngxDirectiveThirdParty contained drizzle_status
-
-" Dynamic ETags Module <https://github.com/kali/nginx-dynamic-etags>
-" Attempt at handling ETag / If-None-Match on proxied content.
-syn keyword ngxDirectiveThirdParty contained dynamic_etags
-
-" Echo Module <https://www.nginx.com/resources/wiki/modules/echo/>
-" Bringing the power of "echo", "sleep", "time" and more to Nginx's config file
-syn keyword ngxDirectiveThirdParty contained echo
-syn keyword ngxDirectiveThirdParty contained echo_duplicate
-syn keyword ngxDirectiveThirdParty contained echo_flush
-syn keyword ngxDirectiveThirdParty contained echo_sleep
-syn keyword ngxDirectiveThirdParty contained echo_blocking_sleep
-syn keyword ngxDirectiveThirdParty contained echo_reset_timer
-syn keyword ngxDirectiveThirdParty contained echo_read_request_body
-syn keyword ngxDirectiveThirdParty contained echo_location_async
-syn keyword ngxDirectiveThirdParty contained echo_location
-syn keyword ngxDirectiveThirdParty contained echo_subrequest_async
-syn keyword ngxDirectiveThirdParty contained echo_subrequest
-syn keyword ngxDirectiveThirdParty contained echo_foreach_split
-syn keyword ngxDirectiveThirdParty contained echo_end
-syn keyword ngxDirectiveThirdParty contained echo_request_body
-syn keyword ngxDirectiveThirdParty contained echo_exec
-syn keyword ngxDirectiveThirdParty contained echo_status
-syn keyword ngxDirectiveThirdParty contained echo_before_body
+" ngx_echo
+" https://github.com/openresty/echo-nginx-module
+syn keyword ngxDirectiveThirdParty contained echo_abort_parent
 syn keyword ngxDirectiveThirdParty contained echo_after_body
+syn keyword ngxDirectiveThirdParty contained echo_before_body
+syn keyword ngxDirectiveThirdParty contained echo_blocking_sleep
+syn keyword ngxDirectiveThirdParty contained echo_end
+syn keyword ngxDirectiveThirdParty contained echo_exec
+syn keyword ngxDirectiveThirdParty contained echo_flush
+syn keyword ngxDirectiveThirdParty contained echo_foreach_split
+syn keyword ngxDirectiveThirdParty contained echo_location
+syn keyword ngxDirectiveThirdParty contained echo_location_async
+syn keyword ngxDirectiveThirdParty contained echo_read_request_body
+syn keyword ngxDirectiveThirdParty contained echo_request_body
+syn keyword ngxDirectiveThirdParty contained echo_reset_timer
+syn keyword ngxDirectiveThirdParty contained echo_status
+syn keyword ngxDirectiveThirdParty contained echo_subrequest
+syn keyword ngxDirectiveThirdParty contained echo_subrequest_async
 
-" Encrypted Session Module <https://github.com/openresty/encrypted-session-nginx-module>
-" Encrypt and decrypt nginx variable values
-syn keyword ngxDirectiveThirdParty contained encrypted_session_key
-syn keyword ngxDirectiveThirdParty contained encrypted_session_iv
-syn keyword ngxDirectiveThirdParty contained encrypted_session_expires
-syn keyword ngxDirectiveThirdParty contained set_encrypt_session
-syn keyword ngxDirectiveThirdParty contained set_decrypt_session
+" FastDFS
+" https://github.com/happyfish100/fastdfs-nginx-module
+syn keyword ngxDirectiveThirdParty contained ngx_fastdfs_module
 
-" Enhanced Memcached Module <https://github.com/bpaquet/ngx_http_enhanced_memcached_module>
-" This module is based on the standard Nginx Memcached module, with some additonal features
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_pass
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_hash_keys_with_md5
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_allow_put
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_allow_delete
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_stats
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_flush
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_flush_namespace
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_bind
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_connect_timeout
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_send_timeout
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_buffer_size
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_read_timeout
-
-" Events Module (DEPRECATED) <http://docs.dutov.org/nginx_modules_events_en.html>
-" Provides options for start/stop events.
-syn keyword ngxDirectiveDeprecated contained on_start
-syn keyword ngxDirectiveDeprecated contained on_stop
-
-" EY Balancer Module <https://github.com/ezmobius/nginx-ey-balancer>
-" Adds a request queue to Nginx that allows the limiting of concurrent requests passed to the upstream.
-syn keyword ngxDirectiveThirdParty contained max_connections
-syn keyword ngxDirectiveThirdParty contained max_connections_max_queue_length
-syn keyword ngxDirectiveThirdParty contained max_connections_queue_timeout
-
-" Upstream Fair Balancer <https://www.nginx.com/resources/wiki/modules/fair_balancer/>
-" Sends an incoming request to the least-busy backend server, rather than distributing requests round-robin.
-syn keyword ngxDirectiveThirdParty contained fair
-syn keyword ngxDirectiveThirdParty contained upstream_fair_shm_size
-
-" Fancy Indexes Module <https://github.com/aperezdc/ngx-fancyindex>
-" Like the built-in autoindex module, but fancier.
-syn keyword ngxDirectiveThirdParty contained fancyindex
-syn keyword ngxDirectiveThirdParty contained fancyindex_default_sort
-syn keyword ngxDirectiveThirdParty contained fancyindex_directories_first
-syn keyword ngxDirectiveThirdParty contained fancyindex_css_href
-syn keyword ngxDirectiveThirdParty contained fancyindex_exact_size
-syn keyword ngxDirectiveThirdParty contained fancyindex_name_length
-syn keyword ngxDirectiveThirdParty contained fancyindex_footer
-syn keyword ngxDirectiveThirdParty contained fancyindex_header
-syn keyword ngxDirectiveThirdParty contained fancyindex_show_path
-syn keyword ngxDirectiveThirdParty contained fancyindex_ignore
-syn keyword ngxDirectiveThirdParty contained fancyindex_hide_symlinks
-syn keyword ngxDirectiveThirdParty contained fancyindex_localtime
-syn keyword ngxDirectiveThirdParty contained fancyindex_time_format
-
-" Form Auth Module <https://github.com/veruu/ngx_form_auth>
-" Provides authentication and authorization with credentials submitted via POST request
-syn keyword ngxDirectiveThirdParty contained form_auth
-syn keyword ngxDirectiveThirdParty contained form_auth_pam_service
-syn keyword ngxDirectiveThirdParty contained form_auth_login
-syn keyword ngxDirectiveThirdParty contained form_auth_password
-syn keyword ngxDirectiveThirdParty contained form_auth_remote_user
-
-" Form Input Module <https://github.com/calio/form-input-nginx-module>
-" Reads HTTP POST and PUT request body encoded in "application/x-www-form-urlencoded" and parses the arguments into nginx variables.
-syn keyword ngxDirectiveThirdParty contained set_form_input
-syn keyword ngxDirectiveThirdParty contained set_form_input_multi
-
-" GeoIP Module (DEPRECATED) <http://wiki.nginx.org/NginxHttp3rdPartyGeoIPModule>
-" Country code lookups via the MaxMind GeoIP API.
-syn keyword ngxDirectiveDeprecated contained geoip_country_file
-
-" GeoIP 2 Module <https://github.com/leev/ngx_http_geoip2_module>
-" Creates variables with values from the maxmind geoip2 databases based on the client IP
-syn keyword ngxDirectiveThirdParty contained geoip2
-
-" GridFS Module <https://github.com/mdirolf/nginx-gridfs>
-" Nginx module for serving files from MongoDB's GridFS
-syn keyword ngxDirectiveThirdParty contained gridfs
-
-" Headers More Module <https://github.com/openresty/headers-more-nginx-module>
-" Set and clear input and output headers...more than "add"!
+" ngx_headers_more
+" https://github.com/openresty/headers-more-nginx-module
 syn keyword ngxDirectiveThirdParty contained more_clear_headers
 syn keyword ngxDirectiveThirdParty contained more_clear_input_headers
 syn keyword ngxDirectiveThirdParty contained more_set_headers
 syn keyword ngxDirectiveThirdParty contained more_set_input_headers
 
-" Health Checks Upstreams Module <https://www.nginx.com/resources/wiki/modules/healthcheck/>
-" Polls backends and if they respond with HTTP 200 + an optional request body, they are marked good. Otherwise, they are marked bad.
-syn keyword ngxDirectiveThirdParty contained healthcheck_enabled
-syn keyword ngxDirectiveThirdParty contained healthcheck_delay
-syn keyword ngxDirectiveThirdParty contained healthcheck_timeout
-syn keyword ngxDirectiveThirdParty contained healthcheck_failcount
-syn keyword ngxDirectiveThirdParty contained healthcheck_send
-syn keyword ngxDirectiveThirdParty contained healthcheck_expected
-syn keyword ngxDirectiveThirdParty contained healthcheck_buffer
-syn keyword ngxDirectiveThirdParty contained healthcheck_status
+" NGINX WebDAV missing commands support (PROPFIND & OPTIONS)
+" https://github.com/arut/nginx-dav-ext-module
+syn keyword ngxDirectiveThirdParty contained dav_ext_methods
 
-" HTTP Accounting Module <https://github.com/Lax/ngx_http_accounting_module>
-" Add traffic stat function to nginx. Useful for http accounting based on nginx configuration logic
-syn keyword ngxDirectiveThirdParty contained http_accounting
-syn keyword ngxDirectiveThirdParty contained http_accounting_log
-syn keyword ngxDirectiveThirdParty contained http_accounting_id
-syn keyword ngxDirectiveThirdParty contained http_accounting_interval
-syn keyword ngxDirectiveThirdParty contained http_accounting_perturb
+" ngx_eval
+" https://github.com/openresty/nginx-eval-module
+syn keyword ngxDirectiveThirdParty contained eval
+syn keyword ngxDirectiveThirdParty contained eval_buffer_size
+syn keyword ngxDirectiveThirdParty contained eval_escalate
+syn keyword ngxDirectiveThirdParty contained eval_override_content_type
+syn keyword ngxDirectiveThirdParty contained eval_subrequest_in_memory
 
-" Nginx Digest Authentication module <https://github.com/atomx/nginx-http-auth-digest>
-" Digest Authentication for Nginx
-syn keyword ngxDirectiveThirdParty contained auth_digest
-syn keyword ngxDirectiveThirdParty contained auth_digest_user_file
-syn keyword ngxDirectiveThirdParty contained auth_digest_timeout
-syn keyword ngxDirectiveThirdParty contained auth_digest_expires
-syn keyword ngxDirectiveThirdParty contained auth_digest_replays
-syn keyword ngxDirectiveThirdParty contained auth_digest_shm_size
+" Fancy Index
+" https://github.com/aperezdc/ngx-fancyindex
+syn keyword ngxDirectiveThirdParty contained fancyindex
+syn keyword ngxDirectiveThirdParty contained fancyindex_css_href
+syn keyword ngxDirectiveThirdParty contained fancyindex_default_sort
+syn keyword ngxDirectiveThirdParty contained fancyindex_directories_first
+syn keyword ngxDirectiveThirdParty contained fancyindex_exact_size
+syn keyword ngxDirectiveThirdParty contained fancyindex_footer
+syn keyword ngxDirectiveThirdParty contained fancyindex_header
+syn keyword ngxDirectiveThirdParty contained fancyindex_hide_symlinks
+syn keyword ngxDirectiveThirdParty contained fancyindex_ignore
+syn keyword ngxDirectiveThirdParty contained fancyindex_localtime
+syn keyword ngxDirectiveThirdParty contained fancyindex_name_length
+syn keyword ngxDirectiveThirdParty contained fancyindex_show_path
+syn keyword ngxDirectiveThirdParty contained fancyindex_time_format
 
-" Auth PAM Module <https://github.com/sto/ngx_http_auth_pam_module>
-" HTTP Basic Authentication using PAM.
-syn keyword ngxDirectiveThirdParty contained auth_pam
-syn keyword ngxDirectiveThirdParty contained auth_pam_service_name
-
-" HTTP Auth Request Module <http://nginx.org/en/docs/http/ngx_http_auth_request_module.html>
-" Implements client authorization based on the result of a subrequest
-" syn keyword ngxDirectiveThirdParty contained auth_request
-" syn keyword ngxDirectiveThirdParty contained auth_request_set
-
-" HTTP Concatenation module for Nginx <https://github.com/alibaba/nginx-http-concat>
-" A Nginx module for concatenating files in a given context: CSS and JS files usually
-syn keyword ngxDirectiveThirdParty contained concat
-syn keyword ngxDirectiveThirdParty contained concat_types
-syn keyword ngxDirectiveThirdParty contained concat_unique
-syn keyword ngxDirectiveThirdParty contained concat_max_files
-syn keyword ngxDirectiveThirdParty contained concat_delimiter
-syn keyword ngxDirectiveThirdParty contained concat_ignore_file_error
-
-" HTTP Dynamic Upstream Module <https://github.com/yzprofile/ngx_http_dyups_module>
-" Update upstreams' config by restful interface
-syn keyword ngxDirectiveThirdParty contained dyups_interface
-syn keyword ngxDirectiveThirdParty contained dyups_read_msg_timeout
-syn keyword ngxDirectiveThirdParty contained dyups_shm_zone_size
-syn keyword ngxDirectiveThirdParty contained dyups_upstream_conf
-syn keyword ngxDirectiveThirdParty contained dyups_trylock
-
-" HTTP Footer If Filter Module <https://github.com/flygoast/ngx_http_footer_if_filter>
-" The ngx_http_footer_if_filter_module is used to add given content to the end of the response according to the condition specified.
-syn keyword ngxDirectiveThirdParty contained footer_if
-
-" HTTP Footer Filter Module <https://github.com/alibaba/nginx-http-footer-filter>
-" This module implements a body filter that adds a given string to the page footer.
+" Footer filter
+" https://github.com/alibaba/nginx-http-footer-filter
 syn keyword ngxDirectiveThirdParty contained footer
 syn keyword ngxDirectiveThirdParty contained footer_types
 
-" HTTP Internal Redirect Module <https://github.com/flygoast/ngx_http_internal_redirect>
-" Make an internal redirect to the uri specified according to the condition specified.
-syn keyword ngxDirectiveThirdParty contained internal_redirect_if
-syn keyword ngxDirectiveThirdParty contained internal_redirect_if_no_postponed
+" ngx_http_geoip2_module
+" https://github.com/leev/ngx_http_geoip2_module
+syn keyword ngxDirectiveThirdParty contained geoip2
+syn keyword ngxDirectiveThirdParty contained geoip2_proxy
+syn keyword ngxDirectiveThirdParty contained geoip2_proxy_recursive
 
-" HTTP JavaScript Module <https://github.com/peter-leonov/ngx_http_js_module>
-" Embedding SpiderMonkey. Nearly full port on Perl module.
-syn keyword ngxDirectiveThirdParty contained js
-syn keyword ngxDirectiveThirdParty contained js_filter
-syn keyword ngxDirectiveThirdParty contained js_filter_types
-syn keyword ngxDirectiveThirdParty contained js_load
-syn keyword ngxDirectiveThirdParty contained js_maxmem
-syn keyword ngxDirectiveThirdParty contained js_require
-syn keyword ngxDirectiveThirdParty contained js_set
-syn keyword ngxDirectiveThirdParty contained js_utf8
+" A version of the Nginx HTTP stub status module that outputs in JSON format
+" https://github.com/nginx-modules/nginx-json-status-module
+syn keyword ngxDirectiveThirdParty contained json_status
+syn keyword ngxDirectiveThirdParty contained json_status_type
 
-" HTTP Push Module (DEPRECATED) <http://pushmodule.slact.net/>
-" Turn Nginx into an adept long-polling HTTP Push (Comet) server.
-syn keyword ngxDirectiveDeprecated contained push_buffer_size
-syn keyword ngxDirectiveDeprecated contained push_listener
-syn keyword ngxDirectiveDeprecated contained push_message_timeout
-syn keyword ngxDirectiveDeprecated contained push_queue_messages
-syn keyword ngxDirectiveDeprecated contained push_sender
-
-" HTTP Redis Module <https://www.nginx.com/resources/wiki/modules/redis/>
-" Redis <http://code.google.com/p/redis/> support.
-syn keyword ngxDirectiveThirdParty contained redis_bind
-syn keyword ngxDirectiveThirdParty contained redis_buffer_size
-syn keyword ngxDirectiveThirdParty contained redis_connect_timeout
-syn keyword ngxDirectiveThirdParty contained redis_next_upstream
-syn keyword ngxDirectiveThirdParty contained redis_pass
-syn keyword ngxDirectiveThirdParty contained redis_read_timeout
-syn keyword ngxDirectiveThirdParty contained redis_send_timeout
-
-" Iconv Module <https://github.com/calio/iconv-nginx-module>
-" A character conversion nginx module using libiconv
-syn keyword ngxDirectiveThirdParty contained set_iconv
-syn keyword ngxDirectiveThirdParty contained iconv_buffer_size
-syn keyword ngxDirectiveThirdParty contained iconv_filter
-
-" IP Blocker Module <https://github.com/tmthrgd/nginx-ip-blocker>
-" An efficient shared memory IP blocking system for nginx.
-syn keyword ngxDirectiveThirdParty contained ip_blocker
-
-" IP2Location Module <https://github.com/chrislim2888/ip2location-nginx>
-" Allows user to lookup for geolocation information using IP2Location database
-syn keyword ngxDirectiveThirdParty contained ip2location_database
-
-" JS Module <https://github.com/peter-leonov/ngx_http_js_module>
-" Reflect the nginx functionality in JS
-syn keyword ngxDirectiveThirdParty contained js
-syn keyword ngxDirectiveThirdParty contained js_access
-syn keyword ngxDirectiveThirdParty contained js_load
-syn keyword ngxDirectiveThirdParty contained js_set
-
-" Limit Upload Rate Module <https://github.com/cfsego/limit_upload_rate>
-" Limit client-upload rate when they are sending request bodies to you
-syn keyword ngxDirectiveThirdParty contained limit_upload_rate
-syn keyword ngxDirectiveThirdParty contained limit_upload_rate_after
-
-" Limit Upstream Module <https://github.com/cfsego/nginx-limit-upstream>
-" Limit the number of connections to upstream for NGINX
-syn keyword ngxDirectiveThirdParty contained limit_upstream_zone
-syn keyword ngxDirectiveThirdParty contained limit_upstream_conn
-syn keyword ngxDirectiveThirdParty contained limit_upstream_log_level
-
-" Log If Module <https://github.com/cfsego/ngx_log_if>
-" Conditional accesslog for nginx
-syn keyword ngxDirectiveThirdParty contained access_log_bypass_if
-
-" Log Request Speed (DEPRECATED) <http://wiki.nginx.org/NginxHttpLogRequestSpeed>
-" Log the time it took to process each request.
-syn keyword ngxDirectiveDeprecated contained log_request_speed_filter
-syn keyword ngxDirectiveDeprecated contained log_request_speed_filter_timeout
-
-" Log ZeroMQ Module <https://github.com/alticelabs/nginx-log-zmq>
-" ZeroMQ logger module for nginx
-syn keyword ngxDirectiveThirdParty contained log_zmq_server
-syn keyword ngxDirectiveThirdParty contained log_zmq_endpoint
-syn keyword ngxDirectiveThirdParty contained log_zmq_format
-syn keyword ngxDirectiveThirdParty contained log_zmq_off
-
-" Lower/UpperCase Module <https://github.com/replay/ngx_http_lower_upper_case>
-" This module simply uppercases or lowercases a string and saves it into a new variable.
-syn keyword ngxDirectiveThirdParty contained lower
-syn keyword ngxDirectiveThirdParty contained upper
-
-" Lua Upstream Module <https://github.com/openresty/lua-upstream-nginx-module>
-" Nginx C module to expose Lua API to ngx_lua for Nginx upstreams
-
-" Lua Module <https://github.com/openresty/lua-nginx-module>
-" Embed the Power of Lua into NGINX HTTP servers
-syn keyword ngxDirectiveThirdParty contained lua_use_default_type
-syn keyword ngxDirectiveThirdParty contained lua_malloc_trim
-syn keyword ngxDirectiveThirdParty contained lua_code_cache
-syn keyword ngxDirectiveThirdParty contained lua_regex_cache_max_entries
-syn keyword ngxDirectiveThirdParty contained lua_regex_match_limit
-syn keyword ngxDirectiveThirdParty contained lua_package_path
-syn keyword ngxDirectiveThirdParty contained lua_package_cpath
-syn keyword ngxDirectiveThirdParty contained init_by_lua
-syn keyword ngxDirectiveThirdParty contained init_by_lua_block
-syn keyword ngxDirectiveThirdParty contained init_by_lua_file
-syn keyword ngxDirectiveThirdParty contained init_worker_by_lua
-syn keyword ngxDirectiveThirdParty contained init_worker_by_lua_block
-syn keyword ngxDirectiveThirdParty contained init_worker_by_lua_file
-syn keyword ngxDirectiveThirdParty contained set_by_lua
-syn keyword ngxDirectiveThirdParty contained set_by_lua_block
-syn keyword ngxDirectiveThirdParty contained set_by_lua_file
-syn keyword ngxDirectiveThirdParty contained content_by_lua
-syn keyword ngxDirectiveThirdParty contained content_by_lua_block
-syn keyword ngxDirectiveThirdParty contained content_by_lua_file
-syn keyword ngxDirectiveThirdParty contained rewrite_by_lua
-syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_block
-syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_file
-syn keyword ngxDirectiveThirdParty contained access_by_lua
-syn keyword ngxDirectiveThirdParty contained access_by_lua_block
-syn keyword ngxDirectiveThirdParty contained access_by_lua_file
-syn keyword ngxDirectiveThirdParty contained header_filter_by_lua
-syn keyword ngxDirectiveThirdParty contained header_filter_by_lua_block
-syn keyword ngxDirectiveThirdParty contained header_filter_by_lua_file
-syn keyword ngxDirectiveThirdParty contained body_filter_by_lua
-syn keyword ngxDirectiveThirdParty contained body_filter_by_lua_block
-syn keyword ngxDirectiveThirdParty contained body_filter_by_lua_file
-syn keyword ngxDirectiveThirdParty contained log_by_lua
-syn keyword ngxDirectiveThirdParty contained log_by_lua_block
-syn keyword ngxDirectiveThirdParty contained log_by_lua_file
-syn keyword ngxDirectiveThirdParty contained balancer_by_lua_block
-syn keyword ngxDirectiveThirdParty contained balancer_by_lua_file
-syn keyword ngxDirectiveThirdParty contained lua_need_request_body
-syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_block
-syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_file
-syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_block
-syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_file
-syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_block
-syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_file
-syn keyword ngxDirectiveThirdParty contained lua_shared_dict
-syn keyword ngxDirectiveThirdParty contained lua_socket_connect_timeout
-syn keyword ngxDirectiveThirdParty contained lua_socket_send_timeout
-syn keyword ngxDirectiveThirdParty contained lua_socket_send_lowat
-syn keyword ngxDirectiveThirdParty contained lua_socket_read_timeout
-syn keyword ngxDirectiveThirdParty contained lua_socket_buffer_size
-syn keyword ngxDirectiveThirdParty contained lua_socket_pool_size
-syn keyword ngxDirectiveThirdParty contained lua_socket_keepalive_timeout
-syn keyword ngxDirectiveThirdParty contained lua_socket_log_errors
-syn keyword ngxDirectiveThirdParty contained lua_ssl_ciphers
-syn keyword ngxDirectiveThirdParty contained lua_ssl_crl
-syn keyword ngxDirectiveThirdParty contained lua_ssl_protocols
-syn keyword ngxDirectiveThirdParty contained lua_ssl_trusted_certificate
-syn keyword ngxDirectiveThirdParty contained lua_ssl_verify_depth
-syn keyword ngxDirectiveThirdParty contained lua_http10_buffering
-syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_no_postpone
-syn keyword ngxDirectiveThirdParty contained access_by_lua_no_postpone
-syn keyword ngxDirectiveThirdParty contained lua_transform_underscores_in_response_headers
-syn keyword ngxDirectiveThirdParty contained lua_check_client_abort
-syn keyword ngxDirectiveThirdParty contained lua_max_pending_timers
-syn keyword ngxDirectiveThirdParty contained lua_max_running_timers
-
-" MD5 Filter Module <https://github.com/kainswor/nginx_md5_filter>
-" A content filter for nginx, which returns the md5 hash of the content otherwise returned.
-syn keyword ngxDirectiveThirdParty contained md5_filter
-
-" Memc Module <https://github.com/openresty/memc-nginx-module>
-" An extended version of the standard memcached module that supports set, add, delete, and many more memcached commands.
-syn keyword ngxDirectiveThirdParty contained memc_buffer_size
-syn keyword ngxDirectiveThirdParty contained memc_cmds_allowed
-syn keyword ngxDirectiveThirdParty contained memc_connect_timeout
-syn keyword ngxDirectiveThirdParty contained memc_flags_to_last_modified
-syn keyword ngxDirectiveThirdParty contained memc_next_upstream
-syn keyword ngxDirectiveThirdParty contained memc_pass
-syn keyword ngxDirectiveThirdParty contained memc_read_timeout
-syn keyword ngxDirectiveThirdParty contained memc_send_timeout
-syn keyword ngxDirectiveThirdParty contained memc_upstream_fail_timeout
-syn keyword ngxDirectiveThirdParty contained memc_upstream_max_fails
-
-" Mod Security Module <https://github.com/SpiderLabs/ModSecurity>
-" ModSecurity is an open source, cross platform web application firewall (WAF) engine
-syn keyword ngxDirectiveThirdParty contained ModSecurityConfig
-syn keyword ngxDirectiveThirdParty contained ModSecurityEnabled
-syn keyword ngxDirectiveThirdParty contained pool_context
-syn keyword ngxDirectiveThirdParty contained pool_context_hash_size
-
-" Mogilefs Module <http://www.grid.net.ru/nginx/mogilefs.en.html>
-" MogileFS client for nginx web server.
-syn keyword ngxDirectiveThirdParty contained mogilefs_pass
-syn keyword ngxDirectiveThirdParty contained mogilefs_methods
-syn keyword ngxDirectiveThirdParty contained mogilefs_domain
+" MogileFS client for nginx
+" https://github.com/vkholodkov/nginx-mogilefs-module
 syn keyword ngxDirectiveThirdParty contained mogilefs_class
-syn keyword ngxDirectiveThirdParty contained mogilefs_tracker
-syn keyword ngxDirectiveThirdParty contained mogilefs_noverify
 syn keyword ngxDirectiveThirdParty contained mogilefs_connect_timeout
-syn keyword ngxDirectiveThirdParty contained mogilefs_send_timeout
+syn keyword ngxDirectiveThirdParty contained mogilefs_domain
+syn keyword ngxDirectiveThirdParty contained mogilefs_methods
+syn keyword ngxDirectiveThirdParty contained mogilefs_noverify
+syn keyword ngxDirectiveThirdParty contained mogilefs_pass
 syn keyword ngxDirectiveThirdParty contained mogilefs_read_timeout
+syn keyword ngxDirectiveThirdParty contained mogilefs_send_timeout
+syn keyword ngxDirectiveThirdParty contained mogilefs_tracker
 
-" Mongo Module <https://github.com/simpl/ngx_mongo>
-" Upstream module that allows nginx to communicate directly with MongoDB database.
-syn keyword ngxDirectiveThirdParty contained mongo_auth
-syn keyword ngxDirectiveThirdParty contained mongo_pass
-syn keyword ngxDirectiveThirdParty contained mongo_query
-syn keyword ngxDirectiveThirdParty contained mongo_json
-syn keyword ngxDirectiveThirdParty contained mongo_bind
-syn keyword ngxDirectiveThirdParty contained mongo_connect_timeout
-syn keyword ngxDirectiveThirdParty contained mongo_send_timeout
-syn keyword ngxDirectiveThirdParty contained mongo_read_timeout
-syn keyword ngxDirectiveThirdParty contained mongo_buffering
-syn keyword ngxDirectiveThirdParty contained mongo_buffer_size
-syn keyword ngxDirectiveThirdParty contained mongo_buffers
-syn keyword ngxDirectiveThirdParty contained mongo_busy_buffers_size
-syn keyword ngxDirectiveThirdParty contained mongo_next_upstream
+" Ancient nginx plugin; probably not useful to anyone
+" https://github.com/kr/nginx-notice
+syn keyword ngxDirectiveThirdParty contained notice
+syn keyword ngxDirectiveThirdParty contained notice_type
 
-" MP4 Streaming Lite Module <https://www.nginx.com/resources/wiki/modules/mp4_streaming/>
-" Will seek to a certain time within H.264/MP4 files when provided with a 'start' parameter in the URL.
-" syn keyword ngxDirectiveThirdParty contained mp4
-
-" NAXSI Module <https://github.com/nbs-system/naxsi>
-" NAXSI is an open-source, high performance, low rules maintenance WAF for NGINX
-syn keyword ngxDirectiveThirdParty contained DeniedUrl denied_url
-syn keyword ngxDirectiveThirdParty contained LearningMode learning_mode
-syn keyword ngxDirectiveThirdParty contained SecRulesEnabled rules_enabled
-syn keyword ngxDirectiveThirdParty contained SecRulesDisabled rules_disabled
-syn keyword ngxDirectiveThirdParty contained CheckRule check_rule
-syn keyword ngxDirectiveThirdParty contained BasicRule basic_rule
-syn keyword ngxDirectiveThirdParty contained MainRule main_rule
-syn keyword ngxDirectiveThirdParty contained LibInjectionSql libinjection_sql
-syn keyword ngxDirectiveThirdParty contained LibInjectionXss libinjection_xss
-
-" Nchan Module <https://nchan.slact.net/>
-" Fast, horizontally scalable, multiprocess pub/sub queuing server and proxy for HTTP, long-polling, Websockets and EventSource (SSE)
+" nchan
+" https://github.com/slact/nchan
+syn keyword ngxDirectiveThirdParty contained nchan_access_control_allow_origin
+syn keyword ngxDirectiveThirdParty contained nchan_authorize_request
+syn keyword ngxDirectiveThirdParty contained nchan_channel_event_string
+syn keyword ngxDirectiveThirdParty contained nchan_channel_events_channel_id
+syn keyword ngxDirectiveThirdParty contained nchan_channel_group
+syn keyword ngxDirectiveThirdParty contained nchan_channel_group_accounting
 syn keyword ngxDirectiveThirdParty contained nchan_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_channel_id_split_delimiter
+syn keyword ngxDirectiveThirdParty contained nchan_channel_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_deflate_message_for_websocket
 syn keyword ngxDirectiveThirdParty contained nchan_eventsource_event
+syn keyword ngxDirectiveThirdParty contained nchan_group_location
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_channels
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages_disk
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages_memory
+syn keyword ngxDirectiveThirdParty contained nchan_group_max_subscribers
 syn keyword ngxDirectiveThirdParty contained nchan_longpoll_multipart_response
+syn keyword ngxDirectiveThirdParty contained nchan_max_channel_id_length
+syn keyword ngxDirectiveThirdParty contained nchan_max_channel_subscribers
+syn keyword ngxDirectiveThirdParty contained nchan_max_reserved_memory
+syn keyword ngxDirectiveThirdParty contained nchan_message_buffer_length
+syn keyword ngxDirectiveThirdParty contained nchan_message_max_buffer_length
+syn keyword ngxDirectiveThirdParty contained nchan_message_temp_path
+syn keyword ngxDirectiveThirdParty contained nchan_message_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_permessage_deflate_compression_level
+syn keyword ngxDirectiveThirdParty contained nchan_permessage_deflate_compression_memlevel
+syn keyword ngxDirectiveThirdParty contained nchan_permessage_deflate_compression_strategy
+syn keyword ngxDirectiveThirdParty contained nchan_permessage_deflate_compression_window
+syn keyword ngxDirectiveThirdParty contained nchan_pub_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_publisher
 syn keyword ngxDirectiveThirdParty contained nchan_publisher_channel_id
+syn keyword ngxDirectiveThirdParty contained nchan_publisher_location
 syn keyword ngxDirectiveThirdParty contained nchan_publisher_upstream_request
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub
+syn keyword ngxDirectiveThirdParty contained nchan_pubsub_channel_id
+syn keyword ngxDirectiveThirdParty contained nchan_pubsub_location
+syn keyword ngxDirectiveThirdParty contained nchan_redis_fakesub_timer_interval
+syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_cache_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_redis_namespace
+syn keyword ngxDirectiveThirdParty contained nchan_redis_pass
+syn keyword ngxDirectiveThirdParty contained nchan_redis_pass_inheritable
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ping_interval
+syn keyword ngxDirectiveThirdParty contained nchan_redis_publish_msgpacked_max_size
+syn keyword ngxDirectiveThirdParty contained nchan_redis_server
+syn keyword ngxDirectiveThirdParty contained nchan_redis_storage_mode
+syn keyword ngxDirectiveThirdParty contained nchan_redis_url
+syn keyword ngxDirectiveThirdParty contained nchan_redis_wait_after_connecting
+syn keyword ngxDirectiveThirdParty contained nchan_shared_memory_size
+syn keyword ngxDirectiveThirdParty contained nchan_storage_engine
+syn keyword ngxDirectiveThirdParty contained nchan_store_messages
+syn keyword ngxDirectiveThirdParty contained nchan_stub_status
+syn keyword ngxDirectiveThirdParty contained nchan_sub_channel_id
+syn keyword ngxDirectiveThirdParty contained nchan_subscribe_existing_channels_only
 syn keyword ngxDirectiveThirdParty contained nchan_subscribe_request
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_channel_id
@@ -1281,529 +968,656 @@ syn keyword ngxDirectiveThirdParty contained nchan_subscriber_compound_etag_mess
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_first_message
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_http_raw_stream_separator
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_last_message_id
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_location
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_message_id_custom_etag_header
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_unsubscribe_request
-syn keyword ngxDirectiveThirdParty contained nchan_websocket_ping_interval
-syn keyword ngxDirectiveThirdParty contained nchan_authorize_request
-syn keyword ngxDirectiveThirdParty contained nchan_max_reserved_memory
-syn keyword ngxDirectiveThirdParty contained nchan_message_buffer_length
-syn keyword ngxDirectiveThirdParty contained nchan_message_timeout
-syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_cache_timeout
-syn keyword ngxDirectiveThirdParty contained nchan_redis_namespace
-syn keyword ngxDirectiveThirdParty contained nchan_redis_pass
-syn keyword ngxDirectiveThirdParty contained nchan_redis_ping_interval
-syn keyword ngxDirectiveThirdParty contained nchan_redis_server
-syn keyword ngxDirectiveThirdParty contained nchan_redis_storage_mode
-syn keyword ngxDirectiveThirdParty contained nchan_redis_url
-syn keyword ngxDirectiveThirdParty contained nchan_store_messages
 syn keyword ngxDirectiveThirdParty contained nchan_use_redis
-syn keyword ngxDirectiveThirdParty contained nchan_access_control_allow_origin
-syn keyword ngxDirectiveThirdParty contained nchan_channel_group
-syn keyword ngxDirectiveThirdParty contained nchan_channel_group_accounting
-syn keyword ngxDirectiveThirdParty contained nchan_group_location
-syn keyword ngxDirectiveThirdParty contained nchan_group_max_channels
-syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages
-syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages_disk
-syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages_memory
-syn keyword ngxDirectiveThirdParty contained nchan_group_max_subscribers
-syn keyword ngxDirectiveThirdParty contained nchan_subscribe_existing_channels_only
-syn keyword ngxDirectiveThirdParty contained nchan_channel_event_string
-syn keyword ngxDirectiveThirdParty contained nchan_channel_events_channel_id
-syn keyword ngxDirectiveThirdParty contained nchan_stub_status
-syn keyword ngxDirectiveThirdParty contained nchan_max_channel_id_length
-syn keyword ngxDirectiveThirdParty contained nchan_max_channel_subscribers
-syn keyword ngxDirectiveThirdParty contained nchan_channel_timeout
-syn keyword ngxDirectiveThirdParty contained nchan_storage_engine
+syn keyword ngxDirectiveThirdParty contained nchan_websocket_client_heartbeat
+syn keyword ngxDirectiveThirdParty contained nchan_websocket_ping_interval
+syn keyword ngxDirectiveThirdParty contained push_authorized_channels_only
+syn keyword ngxDirectiveThirdParty contained push_channel_group
+syn keyword ngxDirectiveThirdParty contained push_channel_timeout
+syn keyword ngxDirectiveThirdParty contained push_max_channel_id_length
+syn keyword ngxDirectiveThirdParty contained push_max_channel_subscribers
+syn keyword ngxDirectiveThirdParty contained push_max_message_buffer_length
+syn keyword ngxDirectiveThirdParty contained push_max_reserved_memory
+syn keyword ngxDirectiveThirdParty contained push_message_buffer_length
+syn keyword ngxDirectiveThirdParty contained push_message_timeout
+syn keyword ngxDirectiveThirdParty contained push_min_message_buffer_length
+syn keyword ngxDirectiveThirdParty contained push_publisher
+syn keyword ngxDirectiveThirdParty contained push_store_messages
+syn keyword ngxDirectiveThirdParty contained push_subscriber
+syn keyword ngxDirectiveThirdParty contained push_subscriber_concurrency
+syn keyword ngxDirectiveThirdParty contained push_subscriber_timeout
 
-" Nginx Notice Module <https://github.com/kr/nginx-notice>
-" Serve static file to POST requests.
-syn keyword ngxDirectiveThirdParty contained notice
-syn keyword ngxDirectiveThirdParty contained notice_type
-
-" OCSP Proxy Module <https://github.com/kyprizel/nginx_ocsp_proxy-module>
-" Nginx OCSP processing module designed for response caching
-syn keyword ngxDirectiveThirdParty contained ocsp_proxy
-syn keyword ngxDirectiveThirdParty contained ocsp_cache_timeout
-
-" Eval Module <https://github.com/openresty/nginx-eval-module>
-" Module for nginx web server evaluates response of proxy or memcached module into variables.
-syn keyword ngxDirectiveThirdParty contained eval
-syn keyword ngxDirectiveThirdParty contained eval_escalate
-syn keyword ngxDirectiveThirdParty contained eval_buffer_size
-syn keyword ngxDirectiveThirdParty contained eval_override_content_type
-syn keyword ngxDirectiveThirdParty contained eval_subrequest_in_memory
-
-" OpenSSL Version Module <https://github.com/apcera/nginx-openssl-version>
-" Nginx OpenSSL version check at startup
-syn keyword ngxDirectiveThirdParty contained openssl_version_minimum
-syn keyword ngxDirectiveThirdParty contained openssl_builddate_minimum
-
-" Owner Match Module <https://www.nginx.com/resources/wiki/modules/owner_match/>
-" Control access for specific owners and groups of files
-syn keyword ngxDirectiveThirdParty contained omallow
-syn keyword ngxDirectiveThirdParty contained omdeny
-
-" Accept Language Module <https://www.nginx.com/resources/wiki/modules/accept_language/>
-" Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
-syn keyword ngxDirectiveThirdParty contained pagespeed
-
-" PHP Memcache Standard Balancer Module <https://github.com/replay/ngx_http_php_memcache_standard_balancer>
-" Loadbalancer that is compatible to the standard loadbalancer in the php-memcache module
-syn keyword ngxDirectiveThirdParty contained hash_key
-
-" PHP Session Module <https://github.com/replay/ngx_http_php_session>
-" Nginx module to parse php sessions
-syn keyword ngxDirectiveThirdParty contained php_session_parse
-syn keyword ngxDirectiveThirdParty contained php_session_strip_formatting
-
-" Phusion Passenger Module <https://www.phusionpassenger.com/library/config/nginx/>
-" Passenger is an open source web application server.
-syn keyword ngxDirectiveThirdParty contained passenger_root
-syn keyword ngxDirectiveThirdParty contained passenger_enabled
-syn keyword ngxDirectiveThirdParty contained passenger_base_uri
-syn keyword ngxDirectiveThirdParty contained passenger_document_root
-syn keyword ngxDirectiveThirdParty contained passenger_ruby
-syn keyword ngxDirectiveThirdParty contained passenger_python
-syn keyword ngxDirectiveThirdParty contained passenger_nodejs
-syn keyword ngxDirectiveThirdParty contained passenger_meteor_app_settings
-syn keyword ngxDirectiveThirdParty contained passenger_app_env
-syn keyword ngxDirectiveThirdParty contained passenger_app_root
-syn keyword ngxDirectiveThirdParty contained passenger_app_group_name
-syn keyword ngxDirectiveThirdParty contained passenger_app_type
-syn keyword ngxDirectiveThirdParty contained passenger_startup_file
-syn keyword ngxDirectiveThirdParty contained passenger_restart_dir
-syn keyword ngxDirectiveThirdParty contained passenger_spawn_method
-syn keyword ngxDirectiveThirdParty contained passenger_env_var
-syn keyword ngxDirectiveThirdParty contained passenger_load_shell_envvars
-syn keyword ngxDirectiveThirdParty contained passenger_rolling_restarts
-syn keyword ngxDirectiveThirdParty contained passenger_resist_deployment_errors
-syn keyword ngxDirectiveThirdParty contained passenger_user_switching
-syn keyword ngxDirectiveThirdParty contained passenger_user
-syn keyword ngxDirectiveThirdParty contained passenger_group
-syn keyword ngxDirectiveThirdParty contained passenger_default_user
-syn keyword ngxDirectiveThirdParty contained passenger_default_group
-syn keyword ngxDirectiveThirdParty contained passenger_show_version_in_header
-syn keyword ngxDirectiveThirdParty contained passenger_friendly_error_pages
-syn keyword ngxDirectiveThirdParty contained passenger_disable_security_update_check
-syn keyword ngxDirectiveThirdParty contained passenger_security_update_check_proxy
-syn keyword ngxDirectiveThirdParty contained passenger_max_pool_size
-syn keyword ngxDirectiveThirdParty contained passenger_min_instances
-syn keyword ngxDirectiveThirdParty contained passenger_max_instances
-syn keyword ngxDirectiveThirdParty contained passenger_max_instances_per_app
-syn keyword ngxDirectiveThirdParty contained passenger_pool_idle_time
-syn keyword ngxDirectiveThirdParty contained passenger_max_preloader_idle_time
-syn keyword ngxDirectiveThirdParty contained passenger_force_max_concurrent_requests_per_process
-syn keyword ngxDirectiveThirdParty contained passenger_start_timeout
-syn keyword ngxDirectiveThirdParty contained passenger_concurrency_model
-syn keyword ngxDirectiveThirdParty contained passenger_thread_count
-syn keyword ngxDirectiveThirdParty contained passenger_max_requests
-syn keyword ngxDirectiveThirdParty contained passenger_max_request_time
-syn keyword ngxDirectiveThirdParty contained passenger_memory_limit
-syn keyword ngxDirectiveThirdParty contained passenger_stat_throttle_rate
-syn keyword ngxDirectiveThirdParty contained passenger_core_file_descriptor_ulimit
-syn keyword ngxDirectiveThirdParty contained passenger_app_file_descriptor_ulimit
-syn keyword ngxDirectiveThirdParty contained passenger_pre_start
-syn keyword ngxDirectiveThirdParty contained passenger_set_header
-syn keyword ngxDirectiveThirdParty contained passenger_max_request_queue_size
-syn keyword ngxDirectiveThirdParty contained passenger_request_queue_overflow_status_code
-syn keyword ngxDirectiveThirdParty contained passenger_sticky_sessions
-syn keyword ngxDirectiveThirdParty contained passenger_sticky_sessions_cookie_name
-syn keyword ngxDirectiveThirdParty contained passenger_abort_websockets_on_process_shutdown
-syn keyword ngxDirectiveThirdParty contained passenger_ignore_client_abort
-syn keyword ngxDirectiveThirdParty contained passenger_intercept_errors
-syn keyword ngxDirectiveThirdParty contained passenger_pass_header
-syn keyword ngxDirectiveThirdParty contained passenger_ignore_headers
-syn keyword ngxDirectiveThirdParty contained passenger_headers_hash_bucket_size
-syn keyword ngxDirectiveThirdParty contained passenger_headers_hash_max_size
-syn keyword ngxDirectiveThirdParty contained passenger_buffer_response
-syn keyword ngxDirectiveThirdParty contained passenger_response_buffer_high_watermark
-syn keyword ngxDirectiveThirdParty contained passenger_buffer_size, passenger_buffers, passenger_busy_buffers_size
-syn keyword ngxDirectiveThirdParty contained passenger_socket_backlog
-syn keyword ngxDirectiveThirdParty contained passenger_log_level
-syn keyword ngxDirectiveThirdParty contained passenger_log_file
-syn keyword ngxDirectiveThirdParty contained passenger_file_descriptor_log_file
-syn keyword ngxDirectiveThirdParty contained passenger_debugger
-syn keyword ngxDirectiveThirdParty contained passenger_instance_registry_dir
-syn keyword ngxDirectiveThirdParty contained passenger_data_buffer_dir
-syn keyword ngxDirectiveThirdParty contained passenger_fly_with
-syn keyword ngxDirectiveThirdParty contained union_station_support
-syn keyword ngxDirectiveThirdParty contained union_station_key
-syn keyword ngxDirectiveThirdParty contained union_station_proxy_address
-syn keyword ngxDirectiveThirdParty contained union_station_filter
-syn keyword ngxDirectiveThirdParty contained union_station_gateway_address
-syn keyword ngxDirectiveThirdParty contained union_station_gateway_port
-syn keyword ngxDirectiveThirdParty contained union_station_gateway_cert
-syn keyword ngxDirectiveDeprecated contained rails_spawn_method
-syn keyword ngxDirectiveDeprecated contained passenger_debug_log_file
-
-" Postgres Module <http://labs.frickle.com/nginx_ngx_postgres/>
-" Upstream module that allows nginx to communicate directly with PostgreSQL database.
-syn keyword ngxDirectiveThirdParty contained postgres_server
-syn keyword ngxDirectiveThirdParty contained postgres_keepalive
-syn keyword ngxDirectiveThirdParty contained postgres_pass
-syn keyword ngxDirectiveThirdParty contained postgres_query
-syn keyword ngxDirectiveThirdParty contained postgres_rewrite
-syn keyword ngxDirectiveThirdParty contained postgres_output
-syn keyword ngxDirectiveThirdParty contained postgres_set
-syn keyword ngxDirectiveThirdParty contained postgres_escape
-syn keyword ngxDirectiveThirdParty contained postgres_connect_timeout
-syn keyword ngxDirectiveThirdParty contained postgres_result_timeout
-
-" Pubcookie Module <https://www.vanko.me/book/page/pubcookie-module-nginx>
-" Authorizes users using encrypted cookies
-syn keyword ngxDirectiveThirdParty contained pubcookie_inactive_expire
-syn keyword ngxDirectiveThirdParty contained pubcookie_hard_expire
-syn keyword ngxDirectiveThirdParty contained pubcookie_app_id
-syn keyword ngxDirectiveThirdParty contained pubcookie_dir_depth
-syn keyword ngxDirectiveThirdParty contained pubcookie_catenate_app_ids
-syn keyword ngxDirectiveThirdParty contained pubcookie_app_srv_id
-syn keyword ngxDirectiveThirdParty contained pubcookie_login
-syn keyword ngxDirectiveThirdParty contained pubcookie_login_method
-syn keyword ngxDirectiveThirdParty contained pubcookie_post
-syn keyword ngxDirectiveThirdParty contained pubcookie_domain
-syn keyword ngxDirectiveThirdParty contained pubcookie_granting_cert_file
-syn keyword ngxDirectiveThirdParty contained pubcookie_session_key_file
-syn keyword ngxDirectiveThirdParty contained pubcookie_session_cert_file
-syn keyword ngxDirectiveThirdParty contained pubcookie_crypt_key_file
-syn keyword ngxDirectiveThirdParty contained pubcookie_end_session
-syn keyword ngxDirectiveThirdParty contained pubcookie_encryption
-syn keyword ngxDirectiveThirdParty contained pubcookie_session_reauth
-syn keyword ngxDirectiveThirdParty contained pubcookie_auth_type_names
-syn keyword ngxDirectiveThirdParty contained pubcookie_no_prompt
-syn keyword ngxDirectiveThirdParty contained pubcookie_on_demand
-syn keyword ngxDirectiveThirdParty contained pubcookie_addl_request
-syn keyword ngxDirectiveThirdParty contained pubcookie_no_obscure_cookies
-syn keyword ngxDirectiveThirdParty contained pubcookie_no_clean_creds
-syn keyword ngxDirectiveThirdParty contained pubcookie_egd_device
-syn keyword ngxDirectiveThirdParty contained pubcookie_no_blank
-syn keyword ngxDirectiveThirdParty contained pubcookie_super_debug
-syn keyword ngxDirectiveThirdParty contained pubcookie_set_remote_user
-
-" Push Stream Module <https://github.com/wandenberg/nginx-push-stream-module>
-" A pure stream http push technology for your Nginx setup
-syn keyword ngxDirectiveThirdParty contained push_stream_channels_statistics
-syn keyword ngxDirectiveThirdParty contained push_stream_publisher
-syn keyword ngxDirectiveThirdParty contained push_stream_subscriber
-syn keyword ngxDirectiveThirdParty contained push_stream_shared_memory_size
+" Push Stream
+" https://github.com/wandenberg/nginx-push-stream-module
+syn keyword ngxDirectiveThirdParty contained push_stream_allow_connections_to_events_channel
+syn keyword ngxDirectiveThirdParty contained push_stream_allowed_origins
+syn keyword ngxDirectiveThirdParty contained push_stream_authorized_channels_only
 syn keyword ngxDirectiveThirdParty contained push_stream_channel_deleted_message_text
 syn keyword ngxDirectiveThirdParty contained push_stream_channel_inactivity_time
-syn keyword ngxDirectiveThirdParty contained push_stream_ping_message_text
-syn keyword ngxDirectiveThirdParty contained push_stream_timeout_with_body
-syn keyword ngxDirectiveThirdParty contained push_stream_message_ttl
-syn keyword ngxDirectiveThirdParty contained push_stream_max_subscribers_per_channel
-syn keyword ngxDirectiveThirdParty contained push_stream_max_messages_stored_per_channel
+syn keyword ngxDirectiveThirdParty contained push_stream_channel_info_on_publish
+syn keyword ngxDirectiveThirdParty contained push_stream_channels_path
+syn keyword ngxDirectiveThirdParty contained push_stream_channels_statistics
+syn keyword ngxDirectiveThirdParty contained push_stream_events_channel_id
+syn keyword ngxDirectiveThirdParty contained push_stream_footer_template
+syn keyword ngxDirectiveThirdParty contained push_stream_header_template
+syn keyword ngxDirectiveThirdParty contained push_stream_header_template_file
+syn keyword ngxDirectiveThirdParty contained push_stream_last_event_id
+syn keyword ngxDirectiveThirdParty contained push_stream_last_received_message_tag
+syn keyword ngxDirectiveThirdParty contained push_stream_last_received_message_time
+syn keyword ngxDirectiveThirdParty contained push_stream_longpolling_connection_ttl
 syn keyword ngxDirectiveThirdParty contained push_stream_max_channel_id_length
+syn keyword ngxDirectiveThirdParty contained push_stream_max_messages_stored_per_channel
 syn keyword ngxDirectiveThirdParty contained push_stream_max_number_of_channels
 syn keyword ngxDirectiveThirdParty contained push_stream_max_number_of_wildcard_channels
-syn keyword ngxDirectiveThirdParty contained push_stream_wildcard_channel_prefix
-syn keyword ngxDirectiveThirdParty contained push_stream_events_channel_id
-syn keyword ngxDirectiveThirdParty contained push_stream_channels_path
-syn keyword ngxDirectiveThirdParty contained push_stream_store_messages
-syn keyword ngxDirectiveThirdParty contained push_stream_channel_info_on_publish
-syn keyword ngxDirectiveThirdParty contained push_stream_authorized_channels_only
-syn keyword ngxDirectiveThirdParty contained push_stream_header_template_file
-syn keyword ngxDirectiveThirdParty contained push_stream_header_template
+syn keyword ngxDirectiveThirdParty contained push_stream_max_subscribers_per_channel
 syn keyword ngxDirectiveThirdParty contained push_stream_message_template
-syn keyword ngxDirectiveThirdParty contained push_stream_footer_template
-syn keyword ngxDirectiveThirdParty contained push_stream_wildcard_channel_max_qtd
-syn keyword ngxDirectiveThirdParty contained push_stream_ping_message_interval
-syn keyword ngxDirectiveThirdParty contained push_stream_subscriber_connection_ttl
-syn keyword ngxDirectiveThirdParty contained push_stream_longpolling_connection_ttl
-syn keyword ngxDirectiveThirdParty contained push_stream_websocket_allow_publish
-syn keyword ngxDirectiveThirdParty contained push_stream_last_received_message_time
-syn keyword ngxDirectiveThirdParty contained push_stream_last_received_message_tag
-syn keyword ngxDirectiveThirdParty contained push_stream_last_event_id
-syn keyword ngxDirectiveThirdParty contained push_stream_user_agent
+syn keyword ngxDirectiveThirdParty contained push_stream_message_ttl
 syn keyword ngxDirectiveThirdParty contained push_stream_padding_by_user_agent
-syn keyword ngxDirectiveThirdParty contained push_stream_allowed_origins
-syn keyword ngxDirectiveThirdParty contained push_stream_allow_connections_to_events_channel
+syn keyword ngxDirectiveThirdParty contained push_stream_ping_message_interval
+syn keyword ngxDirectiveThirdParty contained push_stream_ping_message_text
+syn keyword ngxDirectiveThirdParty contained push_stream_publisher
+syn keyword ngxDirectiveThirdParty contained push_stream_shared_memory_size
+syn keyword ngxDirectiveThirdParty contained push_stream_store_messages
+syn keyword ngxDirectiveThirdParty contained push_stream_subscriber
+syn keyword ngxDirectiveThirdParty contained push_stream_subscriber_connection_ttl
+syn keyword ngxDirectiveThirdParty contained push_stream_timeout_with_body
+syn keyword ngxDirectiveThirdParty contained push_stream_user_agent
+syn keyword ngxDirectiveThirdParty contained push_stream_websocket_allow_publish
+syn keyword ngxDirectiveThirdParty contained push_stream_wildcard_channel_max_qtd
+syn keyword ngxDirectiveThirdParty contained push_stream_wildcard_channel_prefix
 
-" rDNS Module <https://github.com/flant/nginx-http-rdns>
-" Make a reverse DNS (rDNS) lookup for incoming connection and provides simple access control of incoming hostname by allow/deny rules
-syn keyword ngxDirectiveThirdParty contained rdns
-syn keyword ngxDirectiveThirdParty contained rdns_allow
-syn keyword ngxDirectiveThirdParty contained rdns_deny
+" redis module
+" https://www.nginx.com/resources/wiki/modules/redis/
+syn keyword ngxDirectiveThirdParty contained redis_bind
+syn keyword ngxDirectiveThirdParty contained redis_buffer_size
+syn keyword ngxDirectiveThirdParty contained redis_connect_timeout
+syn keyword ngxDirectiveThirdParty contained redis_gzip_flag
+syn keyword ngxDirectiveThirdParty contained redis_next_upstream
+syn keyword ngxDirectiveThirdParty contained redis_pass
+syn keyword ngxDirectiveThirdParty contained redis_read_timeout
+syn keyword ngxDirectiveThirdParty contained redis_send_timeout
 
-" RDS CSV Module <https://github.com/openresty/rds-csv-nginx-module>
-" Nginx output filter module to convert Resty-DBD-Streams (RDS) to Comma-Separated Values (CSV)
+" ngx_http_response
+" http://catap.ru/downloads/nginx/
+syn keyword ngxDirectiveThirdParty contained response
+syn keyword ngxDirectiveThirdParty contained response_type
+
+" nginx_substitutions_filter
+" https://github.com/yaoweibin/ngx_http_substitutions_filter_module
+syn keyword ngxDirectiveThirdParty contained subs_buffers
+syn keyword ngxDirectiveThirdParty contained subs_filter
+syn keyword ngxDirectiveThirdParty contained subs_filter_bypass
+syn keyword ngxDirectiveThirdParty contained subs_filter_types
+syn keyword ngxDirectiveThirdParty contained subs_line_buffer_size
+
+" Tarantool nginx upstream module
+" https://github.com/tarantool/nginx_upstream_module
+syn keyword ngxDirectiveThirdParty contained tnt_allowed_indexes
+syn keyword ngxDirectiveThirdParty contained tnt_allowed_spaces
+syn keyword ngxDirectiveThirdParty contained tnt_buffer_size
+syn keyword ngxDirectiveThirdParty contained tnt_connect_timeout
+syn keyword ngxDirectiveThirdParty contained tnt_delete
+syn keyword ngxDirectiveThirdParty contained tnt_http_methods
+syn keyword ngxDirectiveThirdParty contained tnt_http_rest_methods
+syn keyword ngxDirectiveThirdParty contained tnt_in_multiplier
+syn keyword ngxDirectiveThirdParty contained tnt_insert
+syn keyword ngxDirectiveThirdParty contained tnt_method
+syn keyword ngxDirectiveThirdParty contained tnt_multireturn_skip_count
+syn keyword ngxDirectiveThirdParty contained tnt_next_upstream
+syn keyword ngxDirectiveThirdParty contained tnt_next_upstream_timeout
+syn keyword ngxDirectiveThirdParty contained tnt_next_upstream_tries
+syn keyword ngxDirectiveThirdParty contained tnt_out_multiplier
+syn keyword ngxDirectiveThirdParty contained tnt_pass
+syn keyword ngxDirectiveThirdParty contained tnt_pass_http_request
+syn keyword ngxDirectiveThirdParty contained tnt_pass_http_request_buffer_size
+syn keyword ngxDirectiveThirdParty contained tnt_pure_result
+syn keyword ngxDirectiveThirdParty contained tnt_read_timeout
+syn keyword ngxDirectiveThirdParty contained tnt_replace
+syn keyword ngxDirectiveThirdParty contained tnt_select
+syn keyword ngxDirectiveThirdParty contained tnt_select_limit_max
+syn keyword ngxDirectiveThirdParty contained tnt_send_timeout
+syn keyword ngxDirectiveThirdParty contained tnt_set_header
+syn keyword ngxDirectiveThirdParty contained tnt_update
+syn keyword ngxDirectiveThirdParty contained tnt_upsert
+
+" A module for nginx web server for handling file uploads using multipart/form-data encoding (RFC 1867)
+" https://github.com/Austinb/nginx-upload-module
+syn keyword ngxDirectiveThirdParty contained upload_aggregate_form_field
+syn keyword ngxDirectiveThirdParty contained upload_archive_elm
+syn keyword ngxDirectiveThirdParty contained upload_archive_elm_separator
+syn keyword ngxDirectiveThirdParty contained upload_archive_path
+syn keyword ngxDirectiveThirdParty contained upload_archive_path_separator
+syn keyword ngxDirectiveThirdParty contained upload_buffer_size
+syn keyword ngxDirectiveThirdParty contained upload_cleanup
+syn keyword ngxDirectiveThirdParty contained upload_content_type
+syn keyword ngxDirectiveThirdParty contained upload_discard
+syn keyword ngxDirectiveThirdParty contained upload_field_name
+syn keyword ngxDirectiveThirdParty contained upload_file_crc32
+syn keyword ngxDirectiveThirdParty contained upload_file_md5
+syn keyword ngxDirectiveThirdParty contained upload_file_md5_uc
+syn keyword ngxDirectiveThirdParty contained upload_file_name
+syn keyword ngxDirectiveThirdParty contained upload_file_sha1
+syn keyword ngxDirectiveThirdParty contained upload_file_sha1_uc
+syn keyword ngxDirectiveThirdParty contained upload_file_size
+syn keyword ngxDirectiveThirdParty contained upload_filter
+syn keyword ngxDirectiveThirdParty contained upload_max_file_size
+syn keyword ngxDirectiveThirdParty contained upload_max_output_body_len
+syn keyword ngxDirectiveThirdParty contained upload_max_part_header_len
+syn keyword ngxDirectiveThirdParty contained upload_pass
+syn keyword ngxDirectiveThirdParty contained upload_pass_args
+syn keyword ngxDirectiveThirdParty contained upload_pass_form_field
+syn keyword ngxDirectiveThirdParty contained upload_set_form_field
+syn keyword ngxDirectiveThirdParty contained upload_store
+syn keyword ngxDirectiveThirdParty contained upload_store_access
+syn keyword ngxDirectiveThirdParty contained upload_tmp_path
+syn keyword ngxDirectiveThirdParty contained upload_unzip
+syn keyword ngxDirectiveThirdParty contained upload_unzip_buffers
+syn keyword ngxDirectiveThirdParty contained upload_unzip_hash
+syn keyword ngxDirectiveThirdParty contained upload_unzip_max_file_name_len
+syn keyword ngxDirectiveThirdParty contained upload_unzip_window
+syn keyword ngxDirectiveThirdParty contained upload_void_content_type
+
+" nginx-upload-progress-module
+" https://github.com/masterzen/nginx-upload-progress-module
+syn keyword ngxDirectiveThirdParty contained report_uploads
+syn keyword ngxDirectiveThirdParty contained track_uploads
+syn keyword ngxDirectiveThirdParty contained upload_progress
+syn keyword ngxDirectiveThirdParty contained upload_progress_content_type
+syn keyword ngxDirectiveThirdParty contained upload_progress_header
+syn keyword ngxDirectiveThirdParty contained upload_progress_java_output
+syn keyword ngxDirectiveThirdParty contained upload_progress_json_output
+syn keyword ngxDirectiveThirdParty contained upload_progress_jsonp_output
+syn keyword ngxDirectiveThirdParty contained upload_progress_jsonp_parameter
+syn keyword ngxDirectiveThirdParty contained upload_progress_template
+
+" Health checks upstreams for nginx
+" https://github.com/yaoweibin/nginx_upstream_check_module
+syn keyword ngxDirectiveThirdParty contained check
+syn keyword ngxDirectiveThirdParty contained check_fastcgi_param
+syn keyword ngxDirectiveThirdParty contained check_http_expect_alive
+syn keyword ngxDirectiveThirdParty contained check_http_send
+syn keyword ngxDirectiveThirdParty contained check_keepalive_requests
+syn keyword ngxDirectiveThirdParty contained check_shm_size
+syn keyword ngxDirectiveThirdParty contained check_status
+
+" The fair load balancer module for nginx
+" https://github.com/cryptofuture/nginx-upstream-fair
+syn keyword ngxDirectiveThirdParty contained fair
+syn keyword ngxDirectiveThirdParty contained upstream_fair_shm_size
+
+" Nginx Video Thumb Extractor Module
+" https://github.com/wandenberg/nginx-video-thumbextractor-module
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_image_height
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_image_width
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_jpeg_baseline
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_jpeg_dpi
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_jpeg_optimize
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_jpeg_progressive_mode
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_jpeg_quality
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_jpeg_smooth
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_next_time
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_only_keyframe
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_processes_per_worker
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_threads
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_color
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_cols
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_margin
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_max_cols
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_max_rows
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_padding
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_rows
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_sample_interval
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_video_filename
+syn keyword ngxDirectiveThirdParty contained video_thumbextractor_video_second
+
+" drizzle-nginx-module - Upstream module for talking to MySQL and Drizzle directly
+" https://github.com/openresty/drizzle-nginx-module
+syn keyword ngxDirectiveThirdParty contained drizzle_buffer_size
+syn keyword ngxDirectiveThirdParty contained drizzle_connect_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_dbname
+syn keyword ngxDirectiveThirdParty contained drizzle_keepalive
+syn keyword ngxDirectiveThirdParty contained drizzle_module_header
+syn keyword ngxDirectiveThirdParty contained drizzle_pass
+syn keyword ngxDirectiveThirdParty contained drizzle_query
+syn keyword ngxDirectiveThirdParty contained drizzle_recv_cols_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_recv_rows_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_send_query_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_server
+syn keyword ngxDirectiveThirdParty contained drizzle_status
+
+" ngx_dynamic_upstream
+" https://github.com/cubicdaiya/ngx_dynamic_upstream
+syn keyword ngxDirectiveThirdParty contained dynamic_upstream
+
+" encrypt and decrypt nginx variable values
+" https://github.com/openresty/encrypted-session-nginx-module
+syn keyword ngxDirectiveThirdParty contained encrypted_session_expires
+syn keyword ngxDirectiveThirdParty contained encrypted_session_iv
+syn keyword ngxDirectiveThirdParty contained encrypted_session_key
+syn keyword ngxDirectiveThirdParty contained set_decrypt_session
+syn keyword ngxDirectiveThirdParty contained set_encrypt_session
+
+" serve content directly from MongoDB's GridFS
+" https://github.com/mdirolf/nginx-gridfs
+syn keyword ngxDirectiveThirdParty contained gridfs
+syn keyword ngxDirectiveThirdParty contained mongo
+
+" Adds support for arithmetic operations to NGINX config
+" https://github.com/arut/nginx-let-module
+syn keyword ngxDirectiveThirdParty contained let
+
+" ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers
+" https://github.com/openresty/lua-nginx-module
+syn keyword ngxDirectiveThirdParty contained access_by_lua
+syn keyword ngxDirectiveThirdParty contained access_by_lua_block
+syn keyword ngxDirectiveThirdParty contained access_by_lua_file
+syn keyword ngxDirectiveThirdParty contained access_by_lua_no_postpone
+syn keyword ngxDirectiveThirdParty contained balancer_by_lua_block
+syn keyword ngxDirectiveThirdParty contained balancer_by_lua_file
+syn keyword ngxDirectiveThirdParty contained body_filter_by_lua
+syn keyword ngxDirectiveThirdParty contained body_filter_by_lua_block
+syn keyword ngxDirectiveThirdParty contained body_filter_by_lua_file
+syn keyword ngxDirectiveThirdParty contained content_by_lua
+syn keyword ngxDirectiveThirdParty contained content_by_lua_block
+syn keyword ngxDirectiveThirdParty contained content_by_lua_file
+syn keyword ngxDirectiveThirdParty contained header_filter_by_lua
+syn keyword ngxDirectiveThirdParty contained header_filter_by_lua_block
+syn keyword ngxDirectiveThirdParty contained header_filter_by_lua_file
+syn keyword ngxDirectiveThirdParty contained init_by_lua
+syn keyword ngxDirectiveThirdParty contained init_by_lua_block
+syn keyword ngxDirectiveThirdParty contained init_by_lua_file
+syn keyword ngxDirectiveThirdParty contained init_worker_by_lua
+syn keyword ngxDirectiveThirdParty contained init_worker_by_lua_block
+syn keyword ngxDirectiveThirdParty contained init_worker_by_lua_file
+syn keyword ngxDirectiveThirdParty contained log_by_lua
+syn keyword ngxDirectiveThirdParty contained log_by_lua_block
+syn keyword ngxDirectiveThirdParty contained log_by_lua_file
+syn keyword ngxDirectiveThirdParty contained lua_capture_error_log
+syn keyword ngxDirectiveThirdParty contained lua_check_client_abort
+syn keyword ngxDirectiveThirdParty contained lua_code_cache
+syn keyword ngxDirectiveThirdParty contained lua_fake_shm
+syn keyword ngxDirectiveThirdParty contained lua_http10_buffering
+syn keyword ngxDirectiveThirdParty contained lua_malloc_trim
+syn keyword ngxDirectiveThirdParty contained lua_max_pending_timers
+syn keyword ngxDirectiveThirdParty contained lua_max_running_timers
+syn keyword ngxDirectiveThirdParty contained lua_need_request_body
+syn keyword ngxDirectiveThirdParty contained lua_package_cpath
+syn keyword ngxDirectiveThirdParty contained lua_package_path
+syn keyword ngxDirectiveThirdParty contained lua_regex_cache_max_entries
+syn keyword ngxDirectiveThirdParty contained lua_regex_match_limit
+syn keyword ngxDirectiveThirdParty contained lua_shared_dict
+syn keyword ngxDirectiveThirdParty contained lua_socket_buffer_size
+syn keyword ngxDirectiveThirdParty contained lua_socket_connect_timeout
+syn keyword ngxDirectiveThirdParty contained lua_socket_keepalive_timeout
+syn keyword ngxDirectiveThirdParty contained lua_socket_log_errors
+syn keyword ngxDirectiveThirdParty contained lua_socket_pool_size
+syn keyword ngxDirectiveThirdParty contained lua_socket_read_timeout
+syn keyword ngxDirectiveThirdParty contained lua_socket_send_lowat
+syn keyword ngxDirectiveThirdParty contained lua_socket_send_timeout
+syn keyword ngxDirectiveThirdParty contained lua_ssl_ciphers
+syn keyword ngxDirectiveThirdParty contained lua_ssl_crl
+syn keyword ngxDirectiveThirdParty contained lua_ssl_protocols
+syn keyword ngxDirectiveThirdParty contained lua_ssl_trusted_certificate
+syn keyword ngxDirectiveThirdParty contained lua_ssl_verify_depth
+syn keyword ngxDirectiveThirdParty contained lua_transform_underscores_in_response_headers
+syn keyword ngxDirectiveThirdParty contained lua_use_default_type
+syn keyword ngxDirectiveThirdParty contained rewrite_by_lua
+syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_block
+syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_file
+syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_no_postpone
+syn keyword ngxDirectiveThirdParty contained set_by_lua
+syn keyword ngxDirectiveThirdParty contained set_by_lua_block
+syn keyword ngxDirectiveThirdParty contained set_by_lua_file
+syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_block
+syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_file
+syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_block
+syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_file
+syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_block
+syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_file
+
+" ngx_memc - An extended version of the standard memcached module
+" https://github.com/openresty/memc-nginx-module
+syn keyword ngxDirectiveThirdParty contained memc_buffer_size
+syn keyword ngxDirectiveThirdParty contained memc_cmds_allowed
+syn keyword ngxDirectiveThirdParty contained memc_connect_timeout
+syn keyword ngxDirectiveThirdParty contained memc_flags_to_last_modified
+syn keyword ngxDirectiveThirdParty contained memc_ignore_client_abort
+syn keyword ngxDirectiveThirdParty contained memc_next_upstream
+syn keyword ngxDirectiveThirdParty contained memc_pass
+syn keyword ngxDirectiveThirdParty contained memc_read_timeout
+syn keyword ngxDirectiveThirdParty contained memc_send_timeout
+syn keyword ngxDirectiveThirdParty contained memc_upstream_fail_timeout
+syn keyword ngxDirectiveThirdParty contained memc_upstream_max_fails
+
+" ModSecurity web application firewall
+" https://github.com/SpiderLabs/ModSecurity/tree/master
+syn keyword ngxDirectiveThirdParty contained ModSecurityConfig
+syn keyword ngxDirectiveThirdParty contained ModSecurityEnabled
+syn keyword ngxDirectiveThirdParty contained pool_context_hash_size
+
+" NAXSI is an open-source, high performance, low rules maintenance WAF for NGINX
+" https://github.com/nbs-system/naxsi
+syn keyword ngxDirectiveThirdParty contained BasicRule
+syn keyword ngxDirectiveThirdParty contained CheckRule
+syn keyword ngxDirectiveThirdParty contained DeniedUrl
+syn keyword ngxDirectiveThirdParty contained LearningMode
+syn keyword ngxDirectiveThirdParty contained LibInjectionSql
+syn keyword ngxDirectiveThirdParty contained LibInjectionXss
+syn keyword ngxDirectiveThirdParty contained MainRule
+syn keyword ngxDirectiveThirdParty contained SecRulesDisabled
+syn keyword ngxDirectiveThirdParty contained SecRulesEnabled
+syn keyword ngxDirectiveThirdParty contained basic_rule
+syn keyword ngxDirectiveThirdParty contained check_rule
+syn keyword ngxDirectiveThirdParty contained denied_url
+syn keyword ngxDirectiveThirdParty contained learning_mode
+syn keyword ngxDirectiveThirdParty contained libinjection_sql
+syn keyword ngxDirectiveThirdParty contained libinjection_xss
+syn keyword ngxDirectiveThirdParty contained main_rule
+syn keyword ngxDirectiveThirdParty contained rules_disabled
+syn keyword ngxDirectiveThirdParty contained rules_enabled
+
+" Phusion Passenger
+" https://www.phusionpassenger.com/library/config/nginx/reference/
+syn keyword ngxDirectiveThirdParty contained disable_security_update_check
+syn keyword ngxDirectiveThirdParty contained passenger_abort_on_startup_error
+syn keyword ngxDirectiveThirdParty contained passenger_abort_websockets_on_process_shutdown
+syn keyword ngxDirectiveThirdParty contained passenger_analytics_log_group
+syn keyword ngxDirectiveThirdParty contained passenger_analytics_log_user
+syn keyword ngxDirectiveThirdParty contained passenger_app_env
+syn keyword ngxDirectiveThirdParty contained passenger_app_file_descriptor_ulimit
+syn keyword ngxDirectiveThirdParty contained passenger_app_group_name
+syn keyword ngxDirectiveThirdParty contained passenger_app_rights
+syn keyword ngxDirectiveThirdParty contained passenger_app_root
+syn keyword ngxDirectiveThirdParty contained passenger_app_type
+syn keyword ngxDirectiveThirdParty contained passenger_base_uri
+syn keyword ngxDirectiveThirdParty contained passenger_buffer_response
+syn keyword ngxDirectiveThirdParty contained passenger_buffer_size
+syn keyword ngxDirectiveThirdParty contained passenger_buffers
+syn keyword ngxDirectiveThirdParty contained passenger_busy_buffers_size
+syn keyword ngxDirectiveThirdParty contained passenger_concurrency_model
+syn keyword ngxDirectiveThirdParty contained passenger_core_file_descriptor_ulimit
+syn keyword ngxDirectiveThirdParty contained passenger_ctl
+syn keyword ngxDirectiveThirdParty contained passenger_data_buffer_dir
+syn keyword ngxDirectiveThirdParty contained passenger_debugger
+syn keyword ngxDirectiveThirdParty contained passenger_default_group
+syn keyword ngxDirectiveThirdParty contained passenger_default_user
+syn keyword ngxDirectiveThirdParty contained passenger_disable_security_update_check
+syn keyword ngxDirectiveThirdParty contained passenger_document_root
+syn keyword ngxDirectiveThirdParty contained passenger_enabled
+syn keyword ngxDirectiveThirdParty contained passenger_env_var
+syn keyword ngxDirectiveThirdParty contained passenger_file_descriptor_log_file
+syn keyword ngxDirectiveThirdParty contained passenger_fly_with
+syn keyword ngxDirectiveThirdParty contained passenger_force_max_concurrent_requests_per_process
+syn keyword ngxDirectiveThirdParty contained passenger_friendly_error_pages
+syn keyword ngxDirectiveThirdParty contained passenger_group
+syn keyword ngxDirectiveThirdParty contained passenger_headers_hash_bucket_size
+syn keyword ngxDirectiveThirdParty contained passenger_headers_hash_max_size
+syn keyword ngxDirectiveThirdParty contained passenger_ignore_client_abort
+syn keyword ngxDirectiveThirdParty contained passenger_ignore_headers
+syn keyword ngxDirectiveThirdParty contained passenger_instance_registry_dir
+syn keyword ngxDirectiveThirdParty contained passenger_intercept_errors
+syn keyword ngxDirectiveThirdParty contained passenger_load_shell_envvars
+syn keyword ngxDirectiveThirdParty contained passenger_log_file
+syn keyword ngxDirectiveThirdParty contained passenger_log_level
+syn keyword ngxDirectiveThirdParty contained passenger_max_instances
+syn keyword ngxDirectiveThirdParty contained passenger_max_instances_per_app
+syn keyword ngxDirectiveThirdParty contained passenger_max_pool_size
+syn keyword ngxDirectiveThirdParty contained passenger_max_preloader_idle_time
+syn keyword ngxDirectiveThirdParty contained passenger_max_request_queue_size
+syn keyword ngxDirectiveThirdParty contained passenger_max_request_time
+syn keyword ngxDirectiveThirdParty contained passenger_max_requests
+syn keyword ngxDirectiveThirdParty contained passenger_memory_limit
+syn keyword ngxDirectiveThirdParty contained passenger_meteor_app_settings
+syn keyword ngxDirectiveThirdParty contained passenger_min_instances
+syn keyword ngxDirectiveThirdParty contained passenger_nodejs
+syn keyword ngxDirectiveThirdParty contained passenger_pass_header
+syn keyword ngxDirectiveThirdParty contained passenger_pool_idle_time
+syn keyword ngxDirectiveThirdParty contained passenger_pre_start
+syn keyword ngxDirectiveThirdParty contained passenger_python
+syn keyword ngxDirectiveThirdParty contained passenger_read_timeout
+syn keyword ngxDirectiveThirdParty contained passenger_request_queue_overflow_status_code
+syn keyword ngxDirectiveThirdParty contained passenger_resist_deployment_errors
+syn keyword ngxDirectiveThirdParty contained passenger_response_buffer_high_watermark
+syn keyword ngxDirectiveThirdParty contained passenger_restart_dir
+syn keyword ngxDirectiveThirdParty contained passenger_rolling_restarts
+syn keyword ngxDirectiveThirdParty contained passenger_root
+syn keyword ngxDirectiveThirdParty contained passenger_ruby
+syn keyword ngxDirectiveThirdParty contained passenger_security_update_check_proxy
+syn keyword ngxDirectiveThirdParty contained passenger_set_header
+syn keyword ngxDirectiveThirdParty contained passenger_show_version_in_header
+syn keyword ngxDirectiveThirdParty contained passenger_socket_backlog
+syn keyword ngxDirectiveThirdParty contained passenger_spawn_method
+syn keyword ngxDirectiveThirdParty contained passenger_start_timeout
+syn keyword ngxDirectiveThirdParty contained passenger_startup_file
+syn keyword ngxDirectiveThirdParty contained passenger_stat_throttle_rate
+syn keyword ngxDirectiveThirdParty contained passenger_sticky_sessions
+syn keyword ngxDirectiveThirdParty contained passenger_sticky_sessions_cookie_name
+syn keyword ngxDirectiveThirdParty contained passenger_thread_count
+syn keyword ngxDirectiveThirdParty contained passenger_turbocaching
+syn keyword ngxDirectiveThirdParty contained passenger_user
+syn keyword ngxDirectiveThirdParty contained passenger_user_switching
+syn keyword ngxDirectiveThirdParty contained passenger_vary_turbocache_by_cookie
+syn keyword ngxDirectiveThirdParty contained rack_env
+syn keyword ngxDirectiveThirdParty contained rails_app_spawner_idle_time
+syn keyword ngxDirectiveThirdParty contained rails_env
+syn keyword ngxDirectiveThirdParty contained security_update_check_proxy
+syn keyword ngxDirectiveThirdParty contained union_station_filter
+syn keyword ngxDirectiveThirdParty contained union_station_gateway_address
+syn keyword ngxDirectiveThirdParty contained union_station_gateway_cert
+syn keyword ngxDirectiveThirdParty contained union_station_gateway_port
+syn keyword ngxDirectiveThirdParty contained union_station_key
+syn keyword ngxDirectiveThirdParty contained union_station_proxy_address
+syn keyword ngxDirectiveThirdParty contained union_station_support
+syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_debug_log_file
+syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_use_global_queue
+syn keyword ngxDirectiveThirdPartyDeprecated contained rails_framework_spawner_idle_time
+syn keyword ngxDirectiveThirdPartyDeprecated contained rails_spawn_method
+
+" ngx_postgres is an upstream module that allows nginx to communicate directly with PostgreSQL database
+" https://github.com/FRiCKLE/ngx_postgres
+syn keyword ngxDirectiveThirdParty contained postgres_connect_timeout
+syn keyword ngxDirectiveThirdParty contained postgres_escape
+syn keyword ngxDirectiveThirdParty contained postgres_keepalive
+syn keyword ngxDirectiveThirdParty contained postgres_output
+syn keyword ngxDirectiveThirdParty contained postgres_pass
+syn keyword ngxDirectiveThirdParty contained postgres_query
+syn keyword ngxDirectiveThirdParty contained postgres_result_timeout
+syn keyword ngxDirectiveThirdParty contained postgres_rewrite
+syn keyword ngxDirectiveThirdParty contained postgres_server
+syn keyword ngxDirectiveThirdParty contained postgres_set
+
+" ngx_rds_csv - Nginx output filter module to convert Resty-DBD-Streams (RDS) to Comma-Separated Values (CSV)
+" https://github.com/openresty/rds-csv-nginx-module
 syn keyword ngxDirectiveThirdParty contained rds_csv
-syn keyword ngxDirectiveThirdParty contained rds_csv_row_terminator
-syn keyword ngxDirectiveThirdParty contained rds_csv_field_separator
-syn keyword ngxDirectiveThirdParty contained rds_csv_field_name_header
-syn keyword ngxDirectiveThirdParty contained rds_csv_content_type
 syn keyword ngxDirectiveThirdParty contained rds_csv_buffer_size
+syn keyword ngxDirectiveThirdParty contained rds_csv_content_type
+syn keyword ngxDirectiveThirdParty contained rds_csv_field_name_header
+syn keyword ngxDirectiveThirdParty contained rds_csv_field_separator
+syn keyword ngxDirectiveThirdParty contained rds_csv_row_terminator
 
-" RDS JSON Module <https://github.com/openresty/rds-json-nginx-module>
-" An output filter that formats Resty DBD Streams generated by ngx_drizzle and others to JSON
+" ngx_rds_json - an output filter that formats Resty DBD Streams generated by ngx_drizzle and others to JSON
+" https://github.com/openresty/rds-json-nginx-module
 syn keyword ngxDirectiveThirdParty contained rds_json
 syn keyword ngxDirectiveThirdParty contained rds_json_buffer_size
+syn keyword ngxDirectiveThirdParty contained rds_json_content_type
+syn keyword ngxDirectiveThirdParty contained rds_json_errcode_key
+syn keyword ngxDirectiveThirdParty contained rds_json_errstr_key
 syn keyword ngxDirectiveThirdParty contained rds_json_format
+syn keyword ngxDirectiveThirdParty contained rds_json_ret
 syn keyword ngxDirectiveThirdParty contained rds_json_root
 syn keyword ngxDirectiveThirdParty contained rds_json_success_property
 syn keyword ngxDirectiveThirdParty contained rds_json_user_property
-syn keyword ngxDirectiveThirdParty contained rds_json_errcode_key
-syn keyword ngxDirectiveThirdParty contained rds_json_errstr_key
-syn keyword ngxDirectiveThirdParty contained rds_json_ret
-syn keyword ngxDirectiveThirdParty contained rds_json_content_type
 
-" Redis Module <https://www.nginx.com/resources/wiki/modules/redis/>
-" Use this module to perform simple caching
-syn keyword ngxDirectiveThirdParty contained redis_pass
-syn keyword ngxDirectiveThirdParty contained redis_bind
-syn keyword ngxDirectiveThirdParty contained redis_connect_timeout
-syn keyword ngxDirectiveThirdParty contained redis_read_timeout
-syn keyword ngxDirectiveThirdParty contained redis_send_timeout
-syn keyword ngxDirectiveThirdParty contained redis_buffer_size
-syn keyword ngxDirectiveThirdParty contained redis_next_upstream
-syn keyword ngxDirectiveThirdParty contained redis_gzip_flag
-
-" Redis 2 Module <https://github.com/openresty/redis2-nginx-module>
-" Nginx upstream module for the Redis 2.0 protocol
-syn keyword ngxDirectiveThirdParty contained redis2_query
-syn keyword ngxDirectiveThirdParty contained redis2_raw_query
-syn keyword ngxDirectiveThirdParty contained redis2_raw_queries
-syn keyword ngxDirectiveThirdParty contained redis2_literal_raw_query
-syn keyword ngxDirectiveThirdParty contained redis2_pass
-syn keyword ngxDirectiveThirdParty contained redis2_connect_timeout
-syn keyword ngxDirectiveThirdParty contained redis2_send_timeout
-syn keyword ngxDirectiveThirdParty contained redis2_read_timeout
+" ngx_redis2 - Nginx upstream module for the Redis 2.0 protocol
+" https://github.com/openresty/redis2-nginx-module
+syn keyword ngxDirectiveThirdParty contained redis2_bind
 syn keyword ngxDirectiveThirdParty contained redis2_buffer_size
+syn keyword ngxDirectiveThirdParty contained redis2_connect_timeout
+syn keyword ngxDirectiveThirdParty contained redis2_literal_raw_query
 syn keyword ngxDirectiveThirdParty contained redis2_next_upstream
+syn keyword ngxDirectiveThirdParty contained redis2_pass
+syn keyword ngxDirectiveThirdParty contained redis2_query
+syn keyword ngxDirectiveThirdParty contained redis2_raw_queries
+syn keyword ngxDirectiveThirdParty contained redis2_raw_query
+syn keyword ngxDirectiveThirdParty contained redis2_read_timeout
+syn keyword ngxDirectiveThirdParty contained redis2_send_timeout
 
-" Replace Filter Module <https://github.com/openresty/replace-filter-nginx-module>
-" Streaming regular expression replacement in response bodies
-syn keyword ngxDirectiveThirdParty contained replace_filter
-syn keyword ngxDirectiveThirdParty contained replace_filter_types
-syn keyword ngxDirectiveThirdParty contained replace_filter_max_buffered_size
-syn keyword ngxDirectiveThirdParty contained replace_filter_last_modified
-syn keyword ngxDirectiveThirdParty contained replace_filter_skip
-
-" Roboo Module <https://github.com/yuri-gushin/Roboo>
-" HTTP Robot Mitigator
-
-" RRD Graph Module <https://www.nginx.com/resources/wiki/modules/rrd_graph/>
-" This module provides an HTTP interface to RRDtool's graphing facilities.
-syn keyword ngxDirectiveThirdParty contained rrd_graph
-syn keyword ngxDirectiveThirdParty contained rrd_graph_root
-
-" RTMP Module <https://github.com/arut/nginx-rtmp-module>
 " NGINX-based Media Streaming Server
-syn keyword ngxDirectiveThirdParty contained rtmp
-" syn keyword ngxDirectiveThirdParty contained server
-" syn keyword ngxDirectiveThirdParty contained listen
-syn keyword ngxDirectiveThirdParty contained application
-" syn keyword ngxDirectiveThirdParty contained timeout
-syn keyword ngxDirectiveThirdParty contained ping
-syn keyword ngxDirectiveThirdParty contained ping_timeout
-syn keyword ngxDirectiveThirdParty contained max_streams
+" https://github.com/arut/nginx-rtmp-module
 syn keyword ngxDirectiveThirdParty contained ack_window
+syn keyword ngxDirectiveThirdParty contained application
+syn keyword ngxDirectiveThirdParty contained buffer
+syn keyword ngxDirectiveThirdParty contained buflen
+syn keyword ngxDirectiveThirdParty contained busy
 syn keyword ngxDirectiveThirdParty contained chunk_size
-syn keyword ngxDirectiveThirdParty contained max_queue
-syn keyword ngxDirectiveThirdParty contained max_message
-syn keyword ngxDirectiveThirdParty contained out_queue
-syn keyword ngxDirectiveThirdParty contained out_cork
-" syn keyword ngxDirectiveThirdParty contained allow
-" syn keyword ngxDirectiveThirdParty contained deny
-syn keyword ngxDirectiveThirdParty contained exec_push
-syn keyword ngxDirectiveThirdParty contained exec_pull
+syn keyword ngxDirectiveThirdParty contained dash
+syn keyword ngxDirectiveThirdParty contained dash_cleanup
+syn keyword ngxDirectiveThirdParty contained dash_fragment
+syn keyword ngxDirectiveThirdParty contained dash_nested
+syn keyword ngxDirectiveThirdParty contained dash_path
+syn keyword ngxDirectiveThirdParty contained dash_playlist_length
+syn keyword ngxDirectiveThirdParty contained drop_idle_publisher
 syn keyword ngxDirectiveThirdParty contained exec
-syn keyword ngxDirectiveThirdParty contained exec_options
-syn keyword ngxDirectiveThirdParty contained exec_static
+syn keyword ngxDirectiveThirdParty contained exec_block
 syn keyword ngxDirectiveThirdParty contained exec_kill_signal
-syn keyword ngxDirectiveThirdParty contained respawn
-syn keyword ngxDirectiveThirdParty contained respawn_timeout
-syn keyword ngxDirectiveThirdParty contained exec_publish
+syn keyword ngxDirectiveThirdParty contained exec_options
 syn keyword ngxDirectiveThirdParty contained exec_play
 syn keyword ngxDirectiveThirdParty contained exec_play_done
+syn keyword ngxDirectiveThirdParty contained exec_publish
 syn keyword ngxDirectiveThirdParty contained exec_publish_done
+syn keyword ngxDirectiveThirdParty contained exec_pull
+syn keyword ngxDirectiveThirdParty contained exec_push
 syn keyword ngxDirectiveThirdParty contained exec_record_done
-syn keyword ngxDirectiveThirdParty contained live
-syn keyword ngxDirectiveThirdParty contained meta
-syn keyword ngxDirectiveThirdParty contained interleave
-syn keyword ngxDirectiveThirdParty contained wait_key
-syn keyword ngxDirectiveThirdParty contained wait_video
-syn keyword ngxDirectiveThirdParty contained publish_notify
-syn keyword ngxDirectiveThirdParty contained drop_idle_publisher
-syn keyword ngxDirectiveThirdParty contained sync
-syn keyword ngxDirectiveThirdParty contained play_restart
+syn keyword ngxDirectiveThirdParty contained exec_static
+syn keyword ngxDirectiveThirdParty contained hls_audio_buffer_size
+syn keyword ngxDirectiveThirdParty contained hls_base_url
+syn keyword ngxDirectiveThirdParty contained hls_cleanup
+syn keyword ngxDirectiveThirdParty contained hls_continuous
+syn keyword ngxDirectiveThirdParty contained hls_fragment_naming
+syn keyword ngxDirectiveThirdParty contained hls_fragment_naming_granularity
+syn keyword ngxDirectiveThirdParty contained hls_fragment_slicing
+syn keyword ngxDirectiveThirdParty contained hls_fragments_per_key
+syn keyword ngxDirectiveThirdParty contained hls_key_path
+syn keyword ngxDirectiveThirdParty contained hls_key_url
+syn keyword ngxDirectiveThirdParty contained hls_keys
+syn keyword ngxDirectiveThirdParty contained hls_max_audio_delay
+syn keyword ngxDirectiveThirdParty contained hls_max_fragment
+syn keyword ngxDirectiveThirdParty contained hls_muxdelay
+syn keyword ngxDirectiveThirdParty contained hls_nested
+syn keyword ngxDirectiveThirdParty contained hls_path
+syn keyword ngxDirectiveThirdParty contained hls_playlist_length
+syn keyword ngxDirectiveThirdParty contained hls_sync
+syn keyword ngxDirectiveThirdParty contained hls_type
+syn keyword ngxDirectiveThirdParty contained hls_variant
 syn keyword ngxDirectiveThirdParty contained idle_streams
-syn keyword ngxDirectiveThirdParty contained record
-syn keyword ngxDirectiveThirdParty contained record_path
-syn keyword ngxDirectiveThirdParty contained record_suffix
-syn keyword ngxDirectiveThirdParty contained record_unique
-syn keyword ngxDirectiveThirdParty contained record_append
-syn keyword ngxDirectiveThirdParty contained record_lock
-syn keyword ngxDirectiveThirdParty contained record_max_size
-syn keyword ngxDirectiveThirdParty contained record_max_frames
-syn keyword ngxDirectiveThirdParty contained record_interval
-syn keyword ngxDirectiveThirdParty contained recorder
-syn keyword ngxDirectiveThirdParty contained record_notify
-syn keyword ngxDirectiveThirdParty contained play
-syn keyword ngxDirectiveThirdParty contained play_temp_path
-syn keyword ngxDirectiveThirdParty contained play_local_path
-syn keyword ngxDirectiveThirdParty contained pull
-syn keyword ngxDirectiveThirdParty contained push
-syn keyword ngxDirectiveThirdParty contained push_reconnect
-syn keyword ngxDirectiveThirdParty contained session_relay
+syn keyword ngxDirectiveThirdParty contained interleave
+syn keyword ngxDirectiveThirdParty contained live
+syn keyword ngxDirectiveThirdParty contained max_connections
+syn keyword ngxDirectiveThirdParty contained max_message
+syn keyword ngxDirectiveThirdParty contained max_streams
+syn keyword ngxDirectiveThirdParty contained meta
+syn keyword ngxDirectiveThirdParty contained netcall_buffer
+syn keyword ngxDirectiveThirdParty contained netcall_timeout
+syn keyword ngxDirectiveThirdParty contained notify_method
+syn keyword ngxDirectiveThirdParty contained notify_relay_redirect
+syn keyword ngxDirectiveThirdParty contained notify_update_strict
+syn keyword ngxDirectiveThirdParty contained notify_update_timeout
 syn keyword ngxDirectiveThirdParty contained on_connect
-syn keyword ngxDirectiveThirdParty contained on_play
-syn keyword ngxDirectiveThirdParty contained on_publish
+syn keyword ngxDirectiveThirdParty contained on_disconnect
 syn keyword ngxDirectiveThirdParty contained on_done
+syn keyword ngxDirectiveThirdParty contained on_play
 syn keyword ngxDirectiveThirdParty contained on_play_done
+syn keyword ngxDirectiveThirdParty contained on_publish
 syn keyword ngxDirectiveThirdParty contained on_publish_done
 syn keyword ngxDirectiveThirdParty contained on_record_done
 syn keyword ngxDirectiveThirdParty contained on_update
-syn keyword ngxDirectiveThirdParty contained notify_update_timeout
-syn keyword ngxDirectiveThirdParty contained notify_update_strict
-syn keyword ngxDirectiveThirdParty contained notify_relay_redirect
-syn keyword ngxDirectiveThirdParty contained notify_method
-syn keyword ngxDirectiveThirdParty contained hls
-syn keyword ngxDirectiveThirdParty contained hls_path
-syn keyword ngxDirectiveThirdParty contained hls_fragment
-syn keyword ngxDirectiveThirdParty contained hls_playlist_length
-syn keyword ngxDirectiveThirdParty contained hls_sync
-syn keyword ngxDirectiveThirdParty contained hls_continuous
-syn keyword ngxDirectiveThirdParty contained hls_nested
-syn keyword ngxDirectiveThirdParty contained hls_base_url
-syn keyword ngxDirectiveThirdParty contained hls_cleanup
-syn keyword ngxDirectiveThirdParty contained hls_fragment_naming
-syn keyword ngxDirectiveThirdParty contained hls_fragment_slicing
-syn keyword ngxDirectiveThirdParty contained hls_variant
-syn keyword ngxDirectiveThirdParty contained hls_type
-syn keyword ngxDirectiveThirdParty contained hls_keys
-syn keyword ngxDirectiveThirdParty contained hls_key_path
-syn keyword ngxDirectiveThirdParty contained hls_key_url
-syn keyword ngxDirectiveThirdParty contained hls_fragments_per_key
-syn keyword ngxDirectiveThirdParty contained dash
-syn keyword ngxDirectiveThirdParty contained dash_path
-syn keyword ngxDirectiveThirdParty contained dash_fragment
-syn keyword ngxDirectiveThirdParty contained dash_playlist_length
-syn keyword ngxDirectiveThirdParty contained dash_nested
-syn keyword ngxDirectiveThirdParty contained dash_cleanup
-" syn keyword ngxDirectiveThirdParty contained access_log
-" syn keyword ngxDirectiveThirdParty contained log_format
-syn keyword ngxDirectiveThirdParty contained max_connections
-syn keyword ngxDirectiveThirdParty contained rtmp_stat
-syn keyword ngxDirectiveThirdParty contained rtmp_stat_stylesheet
+syn keyword ngxDirectiveThirdParty contained out_cork
+syn keyword ngxDirectiveThirdParty contained out_queue
+syn keyword ngxDirectiveThirdParty contained ping
+syn keyword ngxDirectiveThirdParty contained ping_timeout
+syn keyword ngxDirectiveThirdParty contained play
+syn keyword ngxDirectiveThirdParty contained play_local_path
+syn keyword ngxDirectiveThirdParty contained play_restart
+syn keyword ngxDirectiveThirdParty contained play_temp_path
+syn keyword ngxDirectiveThirdParty contained play_time_fix
+syn keyword ngxDirectiveThirdParty contained publish_notify
+syn keyword ngxDirectiveThirdParty contained publish_time_fix
+syn keyword ngxDirectiveThirdParty contained pull
+syn keyword ngxDirectiveThirdParty contained pull_reconnect
+syn keyword ngxDirectiveThirdParty contained push
+syn keyword ngxDirectiveThirdParty contained push_reconnect
+syn keyword ngxDirectiveThirdParty contained record
+syn keyword ngxDirectiveThirdParty contained record_append
+syn keyword ngxDirectiveThirdParty contained record_interval
+syn keyword ngxDirectiveThirdParty contained record_lock
+syn keyword ngxDirectiveThirdParty contained record_max_frames
+syn keyword ngxDirectiveThirdParty contained record_max_size
+syn keyword ngxDirectiveThirdParty contained record_notify
+syn keyword ngxDirectiveThirdParty contained record_path
+syn keyword ngxDirectiveThirdParty contained record_suffix
+syn keyword ngxDirectiveThirdParty contained record_unique
+syn keyword ngxDirectiveThirdParty contained recorder
+syn keyword ngxDirectiveThirdParty contained relay_buffer
+syn keyword ngxDirectiveThirdParty contained respawn
+syn keyword ngxDirectiveThirdParty contained respawn_timeout
+syn keyword ngxDirectiveThirdParty contained rtmp
 syn keyword ngxDirectiveThirdParty contained rtmp_auto_push
 syn keyword ngxDirectiveThirdParty contained rtmp_auto_push_reconnect
-syn keyword ngxDirectiveThirdParty contained rtmp_socket_dir
 syn keyword ngxDirectiveThirdParty contained rtmp_control
+syn keyword ngxDirectiveThirdParty contained rtmp_socket_dir
+syn keyword ngxDirectiveThirdParty contained rtmp_stat
+syn keyword ngxDirectiveThirdParty contained rtmp_stat_stylesheet
+syn keyword ngxDirectiveThirdParty contained session_relay
+syn keyword ngxDirectiveThirdParty contained so_keepalive
+syn keyword ngxDirectiveThirdParty contained stream_buckets
+syn keyword ngxDirectiveThirdParty contained sync
+syn keyword ngxDirectiveThirdParty contained wait_key
+syn keyword ngxDirectiveThirdParty contained wait_video
 
-" RTMPT Module <https://github.com/kwojtek/nginx-rtmpt-proxy-module>
-" Module for nginx to proxy rtmp using http protocol
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_target
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_rtmp_timeout
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_http_timeout
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_stat
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_stylesheet
-
-" Syntactically Awesome Module <https://github.com/mneudert/sass-nginx-module>
-" Providing on-the-fly compiling of Sass files as an NGINX module.
-syn keyword ngxDirectiveThirdParty contained sass_compile
-syn keyword ngxDirectiveThirdParty contained sass_error_log
-syn keyword ngxDirectiveThirdParty contained sass_include_path
-syn keyword ngxDirectiveThirdParty contained sass_indent
-syn keyword ngxDirectiveThirdParty contained sass_is_indented_syntax
-syn keyword ngxDirectiveThirdParty contained sass_linefeed
-syn keyword ngxDirectiveThirdParty contained sass_precision
-syn keyword ngxDirectiveThirdParty contained sass_output_style
-syn keyword ngxDirectiveThirdParty contained sass_source_comments
-syn keyword ngxDirectiveThirdParty contained sass_source_map_embed
-
-" Secure Download Module <https://www.nginx.com/resources/wiki/modules/secure_download/>
-" Enables you to create links which are only valid until a certain datetime is reached
-syn keyword ngxDirectiveThirdParty contained secure_download
-syn keyword ngxDirectiveThirdParty contained secure_download_secret
-syn keyword ngxDirectiveThirdParty contained secure_download_path_mode
-
-" Selective Cache Purge Module <https://github.com/wandenberg/nginx-selective-cache-purge-module>
-" A module to purge cache by GLOB patterns. The supported patterns are the same as supported by Redis.
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_unix_socket
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_host
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_port
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_database
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_query
-
-" Set cconv Module <https://github.com/liseen/set-cconv-nginx-module>
-" Cconv rewrite set commands
-syn keyword ngxDirectiveThirdParty contained set_cconv_to_simp
-syn keyword ngxDirectiveThirdParty contained set_cconv_to_trad
-syn keyword ngxDirectiveThirdParty contained set_pinyin_to_normal
-
-" Set Hash Module <https://github.com/simpl/ngx_http_set_hash>
-" Nginx module that allows the setting of variables to the value of a variety of hashes
-syn keyword ngxDirectiveThirdParty contained set_md5
-syn keyword ngxDirectiveThirdParty contained set_md5_upper
-syn keyword ngxDirectiveThirdParty contained set_murmur2
-syn keyword ngxDirectiveThirdParty contained set_murmur2_upper
-syn keyword ngxDirectiveThirdParty contained set_sha1
-syn keyword ngxDirectiveThirdParty contained set_sha1_upper
-
-" Set Lang Module <https://github.com/simpl/ngx_http_set_lang>
-" Provides a variety of ways for setting a variable denoting the langauge that content should be returned in.
-syn keyword ngxDirectiveThirdParty contained set_lang
-syn keyword ngxDirectiveThirdParty contained set_lang_method
-syn keyword ngxDirectiveThirdParty contained lang_cookie
-syn keyword ngxDirectiveThirdParty contained lang_get_var
-syn keyword ngxDirectiveThirdParty contained lang_list
-syn keyword ngxDirectiveThirdParty contained lang_post_var
-syn keyword ngxDirectiveThirdParty contained lang_host
-syn keyword ngxDirectiveThirdParty contained lang_referer
-
-" Set Misc Module <https://github.com/openresty/set-misc-nginx-module>
-" Various set_xxx directives added to nginx's rewrite module
-syn keyword ngxDirectiveThirdParty contained set_if_empty
-syn keyword ngxDirectiveThirdParty contained set_quote_sql_str
-syn keyword ngxDirectiveThirdParty contained set_quote_pgsql_str
-syn keyword ngxDirectiveThirdParty contained set_quote_json_str
-syn keyword ngxDirectiveThirdParty contained set_unescape_uri
-syn keyword ngxDirectiveThirdParty contained set_escape_uri
-syn keyword ngxDirectiveThirdParty contained set_hashed_upstream
-syn keyword ngxDirectiveThirdParty contained set_encode_base32
-syn keyword ngxDirectiveThirdParty contained set_base32_padding
-syn keyword ngxDirectiveThirdParty contained set_misc_base32_padding
+" ngx_set_misc - Various set_xxx directives added to nginx's rewrite module (md5/sha1, sql/json quoting, and many more)
+" https://github.com/openresty/set-misc-nginx-module
 syn keyword ngxDirectiveThirdParty contained set_base32_alphabet
+syn keyword ngxDirectiveThirdParty contained set_base32_padding
 syn keyword ngxDirectiveThirdParty contained set_decode_base32
-syn keyword ngxDirectiveThirdParty contained set_encode_base64
 syn keyword ngxDirectiveThirdParty contained set_decode_base64
-syn keyword ngxDirectiveThirdParty contained set_encode_hex
 syn keyword ngxDirectiveThirdParty contained set_decode_hex
-syn keyword ngxDirectiveThirdParty contained set_sha1
-syn keyword ngxDirectiveThirdParty contained set_md5
-syn keyword ngxDirectiveThirdParty contained set_hmac_sha1
-syn keyword ngxDirectiveThirdParty contained set_random
-syn keyword ngxDirectiveThirdParty contained set_secure_random_alphanum
-syn keyword ngxDirectiveThirdParty contained set_secure_random_lcalpha
-syn keyword ngxDirectiveThirdParty contained set_rotate
-syn keyword ngxDirectiveThirdParty contained set_local_today
+syn keyword ngxDirectiveThirdParty contained set_encode_base32
+syn keyword ngxDirectiveThirdParty contained set_encode_base64
+syn keyword ngxDirectiveThirdParty contained set_encode_hex
+syn keyword ngxDirectiveThirdParty contained set_escape_uri
 syn keyword ngxDirectiveThirdParty contained set_formatted_gmt_time
 syn keyword ngxDirectiveThirdParty contained set_formatted_local_time
+syn keyword ngxDirectiveThirdParty contained set_hashed_upstream
+syn keyword ngxDirectiveThirdParty contained set_hmac_sha1
+syn keyword ngxDirectiveThirdParty contained set_if_empty
+syn keyword ngxDirectiveThirdParty contained set_local_today
+syn keyword ngxDirectiveThirdParty contained set_misc_base32_padding
+syn keyword ngxDirectiveThirdParty contained set_quote_json_str
+syn keyword ngxDirectiveThirdParty contained set_quote_pgsql_str
+syn keyword ngxDirectiveThirdParty contained set_quote_sql_str
+syn keyword ngxDirectiveThirdParty contained set_random
+syn keyword ngxDirectiveThirdParty contained set_rotate
+syn keyword ngxDirectiveThirdParty contained set_secure_random_alphanum
+syn keyword ngxDirectiveThirdParty contained set_secure_random_lcalpha
+syn keyword ngxDirectiveThirdParty contained set_unescape_uri
 
-" SFlow Module <https://github.com/sflow/nginx-sflow-module>
-" A binary, random-sampling nginx module designed for: lightweight, centralized, continuous, real-time monitoring of very large and very busy web farms.
+" nginx-sflow-module
+" https://github.com/sflow/nginx-sflow-module
 syn keyword ngxDirectiveThirdParty contained sflow
 
-" Shibboleth Module <https://github.com/nginx-shib/nginx-http-shibboleth>
-" Shibboleth auth request module for nginx
+" Shibboleth auth request module for Nginx
+" https://github.com/nginx-shib/nginx-http-shibboleth
 syn keyword ngxDirectiveThirdParty contained shib_request
 syn keyword ngxDirectiveThirdParty contained shib_request_set
 syn keyword ngxDirectiveThirdParty contained shib_request_use_headers
 
-" Slice Module <https://github.com/alibaba/nginx-http-slice>
-" Nginx module for serving a file in slices (reverse byte-range)
-" syn keyword ngxDirectiveThirdParty contained slice
-syn keyword ngxDirectiveThirdParty contained slice_arg_begin
-syn keyword ngxDirectiveThirdParty contained slice_arg_end
-syn keyword ngxDirectiveThirdParty contained slice_header
-syn keyword ngxDirectiveThirdParty contained slice_footer
-syn keyword ngxDirectiveThirdParty contained slice_header_first
-syn keyword ngxDirectiveThirdParty contained slice_footer_last
-
-" SlowFS Cache Module <https://github.com/FRiCKLE/ngx_slowfs_cache/>
-" Module adding ability to cache static files.
+" nginx module which adds ability to cache static files
+" https://github.com/FRiCKLE/ngx_slowfs_cache
 syn keyword ngxDirectiveThirdParty contained slowfs_big_file_size
 syn keyword ngxDirectiveThirdParty contained slowfs_cache
 syn keyword ngxDirectiveThirdParty contained slowfs_cache_key
@@ -1813,350 +1627,588 @@ syn keyword ngxDirectiveThirdParty contained slowfs_cache_purge
 syn keyword ngxDirectiveThirdParty contained slowfs_cache_valid
 syn keyword ngxDirectiveThirdParty contained slowfs_temp_path
 
-" Small Light Module <https://github.com/cubicdaiya/ngx_small_light>
-" Dynamic Image Transformation Module For nginx.
+" Dynamic Image Transformation Module For nginx
+" https://github.com/cubicdaiya/ngx_small_light
 syn keyword ngxDirectiveThirdParty contained small_light
+syn keyword ngxDirectiveThirdParty contained small_light_buffer
 syn keyword ngxDirectiveThirdParty contained small_light_getparam_mode
+syn keyword ngxDirectiveThirdParty contained small_light_imlib2_temp_dir
 syn keyword ngxDirectiveThirdParty contained small_light_material_dir
 syn keyword ngxDirectiveThirdParty contained small_light_pattern_define
 syn keyword ngxDirectiveThirdParty contained small_light_radius_max
 syn keyword ngxDirectiveThirdParty contained small_light_sigma_max
-syn keyword ngxDirectiveThirdParty contained small_light_imlib2_temp_dir
-syn keyword ngxDirectiveThirdParty contained small_light_buffer
 
-" Sorted Querystring Filter Module <https://github.com/wandenberg/nginx-sorted-querystring-module>
-" Nginx module to expose querystring parameters sorted in a variable to be used on cache_key as example
-syn keyword ngxDirectiveThirdParty contained sorted_querystring_filter_parameter
-
-" Sphinx2 Module <https://github.com/reeteshranjan/sphinx2-nginx-module>
-" Nginx upstream module for Sphinx 2.x
-syn keyword ngxDirectiveThirdParty contained sphinx2_pass
-syn keyword ngxDirectiveThirdParty contained sphinx2_bind
-syn keyword ngxDirectiveThirdParty contained sphinx2_connect_timeout
-syn keyword ngxDirectiveThirdParty contained sphinx2_send_timeout
-syn keyword ngxDirectiveThirdParty contained sphinx2_buffer_size
-syn keyword ngxDirectiveThirdParty contained sphinx2_read_timeout
-syn keyword ngxDirectiveThirdParty contained sphinx2_next_upstream
-
-" HTTP SPNEGO auth Module <https://github.com/stnoonan/spnego-http-auth-nginx-module>
-" This module implements adds SPNEGO support to nginx(http://nginx.org). It currently supports only Kerberos authentication via GSSAPI
-syn keyword ngxDirectiveThirdParty contained auth_gss
-syn keyword ngxDirectiveThirdParty contained auth_gss_keytab
-syn keyword ngxDirectiveThirdParty contained auth_gss_realm
-syn keyword ngxDirectiveThirdParty contained auth_gss_service_name
-syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal
-syn keyword ngxDirectiveThirdParty contained auth_gss_allow_basic_fallback
-
-" SR Cache Module <https://github.com/openresty/srcache-nginx-module>
-" Transparent subrequest-based caching layout for arbitrary nginx locations
+" ngx_srcache - Transparent subrequest-based caching layout for arbitrary nginx locations
+" https://github.com/openresty/srcache-nginx-module
+syn keyword ngxDirectiveThirdParty contained srcache_buffer
+syn keyword ngxDirectiveThirdParty contained srcache_default_expire
 syn keyword ngxDirectiveThirdParty contained srcache_fetch
 syn keyword ngxDirectiveThirdParty contained srcache_fetch_skip
-syn keyword ngxDirectiveThirdParty contained srcache_store
-syn keyword ngxDirectiveThirdParty contained srcache_store_max_size
-syn keyword ngxDirectiveThirdParty contained srcache_store_skip
-syn keyword ngxDirectiveThirdParty contained srcache_store_statuses
-syn keyword ngxDirectiveThirdParty contained srcache_store_ranges
 syn keyword ngxDirectiveThirdParty contained srcache_header_buffer_size
-syn keyword ngxDirectiveThirdParty contained srcache_store_hide_header
-syn keyword ngxDirectiveThirdParty contained srcache_store_pass_header
-syn keyword ngxDirectiveThirdParty contained srcache_methods
 syn keyword ngxDirectiveThirdParty contained srcache_ignore_content_encoding
+syn keyword ngxDirectiveThirdParty contained srcache_max_expire
+syn keyword ngxDirectiveThirdParty contained srcache_methods
 syn keyword ngxDirectiveThirdParty contained srcache_request_cache_control
 syn keyword ngxDirectiveThirdParty contained srcache_response_cache_control
-syn keyword ngxDirectiveThirdParty contained srcache_store_no_store
+syn keyword ngxDirectiveThirdParty contained srcache_store
+syn keyword ngxDirectiveThirdParty contained srcache_store_hide_header
+syn keyword ngxDirectiveThirdParty contained srcache_store_max_size
 syn keyword ngxDirectiveThirdParty contained srcache_store_no_cache
+syn keyword ngxDirectiveThirdParty contained srcache_store_no_store
+syn keyword ngxDirectiveThirdParty contained srcache_store_pass_header
 syn keyword ngxDirectiveThirdParty contained srcache_store_private
-syn keyword ngxDirectiveThirdParty contained srcache_default_expire
-syn keyword ngxDirectiveThirdParty contained srcache_max_expire
+syn keyword ngxDirectiveThirdParty contained srcache_store_ranges
+syn keyword ngxDirectiveThirdParty contained srcache_store_skip
+syn keyword ngxDirectiveThirdParty contained srcache_store_statuses
 
-" SSSD Info Module <https://github.com/veruu/ngx_sssd_info>
-" Retrives additional attributes from SSSD for current authentizated user
+" NGINX-based VOD Packager
+" https://github.com/kaltura/nginx-vod-module
+syn keyword ngxDirectiveThirdParty contained vod
+syn keyword ngxDirectiveThirdParty contained vod_align_segments_to_key_frames
+syn keyword ngxDirectiveThirdParty contained vod_apply_dynamic_mapping
+syn keyword ngxDirectiveThirdParty contained vod_base_url
+syn keyword ngxDirectiveThirdParty contained vod_bootstrap_segment_durations
+syn keyword ngxDirectiveThirdParty contained vod_cache_buffer_size
+syn keyword ngxDirectiveThirdParty contained vod_clip_from_param_name
+syn keyword ngxDirectiveThirdParty contained vod_clip_to_param_name
+syn keyword ngxDirectiveThirdParty contained vod_drm_clear_lead_segment_count
+syn keyword ngxDirectiveThirdParty contained vod_drm_enabled
+syn keyword ngxDirectiveThirdParty contained vod_drm_info_cache
+syn keyword ngxDirectiveThirdParty contained vod_drm_max_info_length
+syn keyword ngxDirectiveThirdParty contained vod_drm_request_uri
+syn keyword ngxDirectiveThirdParty contained vod_drm_single_key
+syn keyword ngxDirectiveThirdParty contained vod_drm_upstream_location
+syn keyword ngxDirectiveThirdParty contained vod_dynamic_clip_map_uri
+syn keyword ngxDirectiveThirdParty contained vod_dynamic_mapping_cache
+syn keyword ngxDirectiveThirdParty contained vod_encryption_iv_seed
+syn keyword ngxDirectiveThirdParty contained vod_expires
+syn keyword ngxDirectiveThirdParty contained vod_expires_live
+syn keyword ngxDirectiveThirdParty contained vod_expires_live_time_dependent
+syn keyword ngxDirectiveThirdParty contained vod_fallback_upstream_location
+syn keyword ngxDirectiveThirdParty contained vod_force_continuous_timestamps
+syn keyword ngxDirectiveThirdParty contained vod_force_playlist_type_vod
+syn keyword ngxDirectiveThirdParty contained vod_gop_look_ahead
+syn keyword ngxDirectiveThirdParty contained vod_gop_look_behind
+syn keyword ngxDirectiveThirdParty contained vod_ignore_edit_list
+syn keyword ngxDirectiveThirdParty contained vod_initial_read_size
+syn keyword ngxDirectiveThirdParty contained vod_lang_param_name
+syn keyword ngxDirectiveThirdParty contained vod_last_modified
+syn keyword ngxDirectiveThirdParty contained vod_last_modified_types
+syn keyword ngxDirectiveThirdParty contained vod_live_mapping_cache
+syn keyword ngxDirectiveThirdParty contained vod_live_response_cache
+syn keyword ngxDirectiveThirdParty contained vod_live_window_duration
+syn keyword ngxDirectiveThirdParty contained vod_manifest_duration_policy
+syn keyword ngxDirectiveThirdParty contained vod_manifest_segment_durations_mode
+syn keyword ngxDirectiveThirdParty contained vod_mapping_cache
+syn keyword ngxDirectiveThirdParty contained vod_max_frames_size
+syn keyword ngxDirectiveThirdParty contained vod_max_mapping_response_size
+syn keyword ngxDirectiveThirdParty contained vod_max_metadata_size
+syn keyword ngxDirectiveThirdParty contained vod_max_upstream_headers_size
+syn keyword ngxDirectiveThirdParty contained vod_media_set_map_uri
+syn keyword ngxDirectiveThirdParty contained vod_media_set_override_json
+syn keyword ngxDirectiveThirdParty contained vod_metadata_cache
+syn keyword ngxDirectiveThirdParty contained vod_min_single_nalu_per_frame_segment
+syn keyword ngxDirectiveThirdParty contained vod_mode
+syn keyword ngxDirectiveThirdParty contained vod_multi_uri_suffix
+syn keyword ngxDirectiveThirdParty contained vod_notification_uri
+syn keyword ngxDirectiveThirdParty contained vod_open_file_thread_pool
+syn keyword ngxDirectiveThirdParty contained vod_output_buffer_pool
+syn keyword ngxDirectiveThirdParty contained vod_parse_hdlr_name
+syn keyword ngxDirectiveThirdParty contained vod_path_response_postfix
+syn keyword ngxDirectiveThirdParty contained vod_path_response_prefix
+syn keyword ngxDirectiveThirdParty contained vod_performance_counters
+syn keyword ngxDirectiveThirdParty contained vod_proxy_header_name
+syn keyword ngxDirectiveThirdParty contained vod_proxy_header_value
+syn keyword ngxDirectiveThirdParty contained vod_redirect_segments_url
+syn keyword ngxDirectiveThirdParty contained vod_remote_upstream_location
+syn keyword ngxDirectiveThirdParty contained vod_response_cache
+syn keyword ngxDirectiveThirdParty contained vod_secret_key
+syn keyword ngxDirectiveThirdParty contained vod_segment_count_policy
+syn keyword ngxDirectiveThirdParty contained vod_segment_duration
+syn keyword ngxDirectiveThirdParty contained vod_segments_base_url
+syn keyword ngxDirectiveThirdParty contained vod_source_clip_map_uri
+syn keyword ngxDirectiveThirdParty contained vod_speed_param_name
+syn keyword ngxDirectiveThirdParty contained vod_status
+syn keyword ngxDirectiveThirdParty contained vod_time_shift_param_name
+syn keyword ngxDirectiveThirdParty contained vod_tracks_param_name
+syn keyword ngxDirectiveThirdParty contained vod_upstream_extra_args
+syn keyword ngxDirectiveThirdParty contained vod_upstream_location
+
+" Nginx virtual host traffic status module
+" https://github.com/vozlt/nginx-module-vts
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_average_method
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_bypass_limit
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_bypass_stats
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display_format
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display_jsonp
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display_sum_key
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_dump
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_host
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_set_key
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_check_duplicate
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_check_duplicate
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_traffic
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_traffic_by_set_key
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_set_by_filter
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_zone
+
+" xss-nginx-module - Native cross-site scripting support in nginx
+" https://github.com/openresty/xss-nginx-module
+syn keyword ngxDirectiveThirdParty contained xss_callback_arg
+syn keyword ngxDirectiveThirdParty contained xss_check_status
+syn keyword ngxDirectiveThirdParty contained xss_get
+syn keyword ngxDirectiveThirdParty contained xss_input_types
+syn keyword ngxDirectiveThirdParty contained xss_output_type
+syn keyword ngxDirectiveThirdParty contained xss_override_status
+
+" Add support for array-typed variables to nginx config files
+" https://github.com/openresty/array-var-nginx-module
+syn keyword ngxDirectiveThirdParty contained array_join
+syn keyword ngxDirectiveThirdParty contained array_map
+syn keyword ngxDirectiveThirdParty contained array_map_op
+syn keyword ngxDirectiveThirdParty contained array_split
+
+" NGINX module for Brotli compression
+" https://github.com/eustas/ngx_brotli
+syn keyword ngxDirectiveThirdParty contained brotli
+syn keyword ngxDirectiveThirdParty contained brotli_buffers
+syn keyword ngxDirectiveThirdParty contained brotli_comp_level
+syn keyword ngxDirectiveThirdParty contained brotli_min_length
+syn keyword ngxDirectiveThirdParty contained brotli_static
+syn keyword ngxDirectiveThirdParty contained brotli_types
+syn keyword ngxDirectiveThirdParty contained brotli_window
+
+" form-input-nginx-module
+" https://github.com/calio/form-input-nginx-module
+syn keyword ngxDirectiveThirdParty contained set_form_input
+syn keyword ngxDirectiveThirdParty contained set_form_input_multi
+
+" character conversion nginx module using libiconv
+" https://github.com/calio/iconv-nginx-module
+syn keyword ngxDirectiveThirdParty contained iconv_buffer_size
+syn keyword ngxDirectiveThirdParty contained iconv_filter
+syn keyword ngxDirectiveThirdParty contained set_iconv
+
+" 3rd party modules list taken from
+" https://www.nginx.com/resources/wiki/modules/
+" ---------------------------------------------
+
+" Nginx Module for Authenticating Akamai G2O requests
+" https://github.com/kaltura/nginx_mod_akamai_g2o
+syn keyword ngxDirectiveThirdParty contained g2o
+syn keyword ngxDirectiveThirdParty contained g2o_data_header
+syn keyword ngxDirectiveThirdParty contained g2o_hash_function
+syn keyword ngxDirectiveThirdParty contained g2o_key
+syn keyword ngxDirectiveThirdParty contained g2o_log_level
+syn keyword ngxDirectiveThirdParty contained g2o_nonce
+syn keyword ngxDirectiveThirdParty contained g2o_sign_header
+syn keyword ngxDirectiveThirdParty contained g2o_time_window
+syn keyword ngxDirectiveThirdParty contained g2o_version
+
+" nginx_lua_module
+" https://github.com/alacner/nginx_lua_module
+syn keyword ngxDirectiveThirdParty contained lua_file
+
+" Nginx Audio Track for HTTP Live Streaming
+" https://github.com/flavioribeiro/nginx-audio-track-for-hls-module
+syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track
+syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_output_format
+syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_output_header
+syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_rootpath
+
+" A Nginx module to dump backtrace when a worker process exits abnormally
+" https://github.com/alibaba/nginx-backtrace
+syn keyword ngxDirectiveThirdParty contained backtrace_log
+syn keyword ngxDirectiveThirdParty contained backtrace_max_stack_size
+
+" circle_gif module
+" https://github.com/evanmiller/nginx_circle_gif
+syn keyword ngxDirectiveThirdParty contained circle_gif
+syn keyword ngxDirectiveThirdParty contained circle_gif_max_radius
+syn keyword ngxDirectiveThirdParty contained circle_gif_min_radius
+syn keyword ngxDirectiveThirdParty contained circle_gif_step_radius
+
+" Upstream Consistent Hash
+" https://github.com/replay/ngx_http_consistent_hash
+syn keyword ngxDirectiveThirdParty contained consistent_hash
+
+" Nginx module for etags on dynamic content
+" https://github.com/kali/nginx-dynamic-etags
+syn keyword ngxDirectiveThirdParty contained dynamic_etags
+
+" Enhanced Nginx Memcached Module
+" https://github.com/bpaquet/ngx_http_enhanced_memcached_module
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_allow_delete
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_allow_put
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_bind
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_buffer_size
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_connect_timeout
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_flush
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_flush_namespace
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_hash_keys_with_md5
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_pass
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_read_timeout
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_send_timeout
+syn keyword ngxDirectiveThirdParty contained enhanced_memcached_stats
+
+" nginx max connections queue
+" https://github.com/ezmobius/nginx-ey-balancer
+syn keyword ngxDirectiveThirdParty contained max_connections_max_queue_length
+syn keyword ngxDirectiveThirdParty contained max_connections_queue_timeout
+
+" Nginx module for POST authentication and authorization
+" https://github.com/veruu/ngx_form_auth
+syn keyword ngxDirectiveThirdParty contained form_auth
+syn keyword ngxDirectiveThirdParty contained form_auth_login
+syn keyword ngxDirectiveThirdParty contained form_auth_pam_service
+syn keyword ngxDirectiveThirdParty contained form_auth_password
+syn keyword ngxDirectiveThirdParty contained form_auth_remote_user
+
+" ngx_http_accounting_module
+" https://github.com/Lax/ngx_http_accounting_module
+syn keyword ngxDirectiveThirdParty contained http_accounting
+syn keyword ngxDirectiveThirdParty contained http_accounting_id
+syn keyword ngxDirectiveThirdParty contained http_accounting_interval
+syn keyword ngxDirectiveThirdParty contained http_accounting_log
+syn keyword ngxDirectiveThirdParty contained http_accounting_perturb
+
+" concatenating files in a given context: CSS and JS files usually
+" https://github.com/alibaba/nginx-http-concat
+syn keyword ngxDirectiveThirdParty contained concat
+syn keyword ngxDirectiveThirdParty contained concat_delimiter
+syn keyword ngxDirectiveThirdParty contained concat_ignore_file_error
+syn keyword ngxDirectiveThirdParty contained concat_max_files
+syn keyword ngxDirectiveThirdParty contained concat_types
+syn keyword ngxDirectiveThirdParty contained concat_unique
+
+" update upstreams' config by restful interface
+" https://github.com/yzprofile/ngx_http_dyups_module
+syn keyword ngxDirectiveThirdParty contained dyups_interface
+syn keyword ngxDirectiveThirdParty contained dyups_read_msg_log
+syn keyword ngxDirectiveThirdParty contained dyups_read_msg_timeout
+syn keyword ngxDirectiveThirdParty contained dyups_shm_zone_size
+syn keyword ngxDirectiveThirdParty contained dyups_trylock
+syn keyword ngxDirectiveThirdParty contained dyups_upstream_conf
+
+" add given content to the end of the response according to the condition specified
+" https://github.com/flygoast/ngx_http_footer_if_filter
+syn keyword ngxDirectiveThirdParty contained footer_if
+
+" NGINX HTTP Internal Redirect Module
+" https://github.com/flygoast/ngx_http_internal_redirect
+syn keyword ngxDirectiveThirdParty contained internal_redirect_if
+syn keyword ngxDirectiveThirdParty contained internal_redirect_if_no_postpone
+
+" nginx-ip-blocker
+" https://github.com/tmthrgd/nginx-ip-blocker
+syn keyword ngxDirectiveThirdParty contained ip_blocker
+
+" IP2Location Nginx
+" https://github.com/chrislim2888/ip2location-nginx
+syn keyword ngxDirectiveThirdParty contained ip2location_database
+
+" Limit upload rate
+" https://github.com/cfsego/limit_upload_rate
+syn keyword ngxDirectiveThirdParty contained limit_upload_rate
+syn keyword ngxDirectiveThirdParty contained limit_upload_rate_after
+syn keyword ngxDirectiveThirdParty contained limit_upload_rate_log_level
+
+" limit the number of connections to upstream
+" https://github.com/cfsego/nginx-limit-upstream
+syn keyword ngxDirectiveThirdParty contained limit_upstream_conn
+syn keyword ngxDirectiveThirdParty contained limit_upstream_log_level
+syn keyword ngxDirectiveThirdParty contained limit_upstream_zone
+
+" conditional accesslog for nginx
+" https://github.com/cfsego/ngx_log_if
+syn keyword ngxDirectiveThirdParty contained access_log_bypass_if
+
+" log messages over ZeroMQ
+" https://github.com/alticelabs/nginx-log-zmq
+syn keyword ngxDirectiveThirdParty contained log_zmq_endpoint
+syn keyword ngxDirectiveThirdParty contained log_zmq_format
+syn keyword ngxDirectiveThirdParty contained log_zmq_off
+syn keyword ngxDirectiveThirdParty contained log_zmq_server
+
+" simple module to uppercase/lowercase strings in the nginx config
+" https://github.com/replay/ngx_http_lower_upper_case
+syn keyword ngxDirectiveThirdParty contained lower
+syn keyword ngxDirectiveThirdParty contained upper
+
+" content filter for nginx, which returns the md5 hash of the content otherwise returned
+" https://github.com/kainswor/nginx_md5_filter
+syn keyword ngxDirectiveThirdParty contained md5_filter
+
+" Non-blocking upstream module for Nginx to connect to MongoDB
+" https://github.com/simpl/ngx_mongo
+syn keyword ngxDirectiveThirdParty contained mongo_auth
+syn keyword ngxDirectiveThirdParty contained mongo_bind
+syn keyword ngxDirectiveThirdParty contained mongo_buffer_size
+syn keyword ngxDirectiveThirdParty contained mongo_buffering
+syn keyword ngxDirectiveThirdParty contained mongo_buffers
+syn keyword ngxDirectiveThirdParty contained mongo_busy_buffers_size
+syn keyword ngxDirectiveThirdParty contained mongo_connect_timeout
+syn keyword ngxDirectiveThirdParty contained mongo_json
+syn keyword ngxDirectiveThirdParty contained mongo_next_upstream
+syn keyword ngxDirectiveThirdParty contained mongo_pass
+syn keyword ngxDirectiveThirdParty contained mongo_query
+syn keyword ngxDirectiveThirdParty contained mongo_read_timeout
+syn keyword ngxDirectiveThirdParty contained mongo_send_timeout
+
+" Nginx OCSP processing module designed for response caching
+" https://github.com/kyprizel/nginx_ocsp_proxy-module
+syn keyword ngxDirectiveThirdParty contained ocsp_cache_timeout
+syn keyword ngxDirectiveThirdParty contained ocsp_proxy
+
+" Nginx OpenSSL version check at startup
+" https://github.com/apcera/nginx-openssl-version
+syn keyword ngxDirectiveThirdParty contained openssl_builddate_minimum
+syn keyword ngxDirectiveThirdParty contained openssl_version_minimum
+
+" Automatic PageSpeed optimization module for Nginx
+" https://github.com/pagespeed/ngx_pagespeed
+syn keyword ngxDirectiveThirdParty contained pagespeed
+
+" PECL Memcache standard hashing compatible loadbalancer for Nginx
+" https://github.com/replay/ngx_http_php_memcache_standard_balancer
+syn keyword ngxDirectiveThirdParty contained hash_key
+
+" nginx module to parse php sessions
+" https://github.com/replay/ngx_http_php_session
+syn keyword ngxDirectiveThirdParty contained php_session_parse
+syn keyword ngxDirectiveThirdParty contained php_session_strip_formatting
+
+" Nginx HTTP rDNS module
+" https://github.com/flant/nginx-http-rdns
+syn keyword ngxDirectiveThirdParty contained rdns
+syn keyword ngxDirectiveThirdParty contained rdns_allow
+syn keyword ngxDirectiveThirdParty contained rdns_deny
+
+" Streaming regular expression replacement in response bodies
+" https://github.com/openresty/replace-filter-nginx-module
+syn keyword ngxDirectiveThirdParty contained replace_filter
+syn keyword ngxDirectiveThirdParty contained replace_filter_last_modified
+syn keyword ngxDirectiveThirdParty contained replace_filter_max_buffered_size
+syn keyword ngxDirectiveThirdParty contained replace_filter_skip
+syn keyword ngxDirectiveThirdParty contained replace_filter_types
+
+" Link RRDtool's graphing facilities directly into nginx
+" https://github.com/evanmiller/mod_rrd_graph
+syn keyword ngxDirectiveThirdParty contained rrd_graph
+syn keyword ngxDirectiveThirdParty contained rrd_graph_root
+
+" Module for nginx to proxy rtmp using http protocol
+" https://github.com/kwojtek/nginx-rtmpt-proxy-module
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_http_timeout
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_rtmp_timeout
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_stat
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_stylesheet
+syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_target
+
+" Syntactically Awesome NGINX Module
+" https://github.com/mneudert/sass-nginx-module
+syn keyword ngxDirectiveThirdParty contained sass_compile
+syn keyword ngxDirectiveThirdParty contained sass_error_log
+syn keyword ngxDirectiveThirdParty contained sass_include_path
+syn keyword ngxDirectiveThirdParty contained sass_indent
+syn keyword ngxDirectiveThirdParty contained sass_is_indented_syntax
+syn keyword ngxDirectiveThirdParty contained sass_linefeed
+syn keyword ngxDirectiveThirdParty contained sass_output_style
+syn keyword ngxDirectiveThirdParty contained sass_precision
+syn keyword ngxDirectiveThirdParty contained sass_source_comments
+syn keyword ngxDirectiveThirdParty contained sass_source_map_embed
+
+" Nginx Selective Cache Purge Module
+" https://github.com/wandenberg/nginx-selective-cache-purge-module
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_query
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_database
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_host
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_port
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_unix_socket
+
+" cconv nginx module
+" https://github.com/liseen/set-cconv-nginx-module
+syn keyword ngxDirectiveThirdParty contained set_cconv_to_simp
+syn keyword ngxDirectiveThirdParty contained set_cconv_to_trad
+syn keyword ngxDirectiveThirdParty contained set_pinyin_to_normal
+
+" Nginx module that allows the setting of variables to the value of a variety of hashes
+" https://github.com/simpl/ngx_http_set_hash
+syn keyword ngxDirectiveThirdParty contained set_md5
+syn keyword ngxDirectiveThirdParty contained set_md5_upper
+syn keyword ngxDirectiveThirdParty contained set_murmur2
+syn keyword ngxDirectiveThirdParty contained set_murmur2_upper
+syn keyword ngxDirectiveThirdParty contained set_sha1
+syn keyword ngxDirectiveThirdParty contained set_sha1_upper
+
+" Nginx module to set the language of a request based on a number of options
+" https://github.com/simpl/ngx_http_set_lang
+syn keyword ngxDirectiveThirdParty contained lang_cookie
+syn keyword ngxDirectiveThirdParty contained lang_get_var
+syn keyword ngxDirectiveThirdParty contained lang_host
+syn keyword ngxDirectiveThirdParty contained lang_list
+syn keyword ngxDirectiveThirdParty contained lang_post_var
+syn keyword ngxDirectiveThirdParty contained lang_referer
+syn keyword ngxDirectiveThirdParty contained set_lang
+syn keyword ngxDirectiveThirdParty contained set_lang_method
+
+" Nginx Sorted Querystring Module
+" https://github.com/wandenberg/nginx-sorted-querystring-module
+syn keyword ngxDirectiveThirdParty contained sorted_querysting_filter_parameter
+
+" Nginx upstream module for Sphinx 2.x search daemon
+" https://github.com/reeteshranjan/sphinx2-nginx-module
+syn keyword ngxDirectiveThirdParty contained sphinx2_bind
+syn keyword ngxDirectiveThirdParty contained sphinx2_buffer_size
+syn keyword ngxDirectiveThirdParty contained sphinx2_connect_timeout
+syn keyword ngxDirectiveThirdParty contained sphinx2_next_upstream
+syn keyword ngxDirectiveThirdParty contained sphinx2_pass
+syn keyword ngxDirectiveThirdParty contained sphinx2_read_timeout
+syn keyword ngxDirectiveThirdParty contained sphinx2_send_timeout
+
+" Nginx module for retrieving user attributes and groups from SSSD
+" https://github.com/veruu/ngx_sssd_info
 syn keyword ngxDirectiveThirdParty contained sssd_info
-syn keyword ngxDirectiveThirdParty contained sssd_info_output_to
-syn keyword ngxDirectiveThirdParty contained sssd_info_groups
-syn keyword ngxDirectiveThirdParty contained sssd_info_group
-syn keyword ngxDirectiveThirdParty contained sssd_info_group_separator
-syn keyword ngxDirectiveThirdParty contained sssd_info_attributes
 syn keyword ngxDirectiveThirdParty contained sssd_info_attribute
 syn keyword ngxDirectiveThirdParty contained sssd_info_attribute_separator
+syn keyword ngxDirectiveThirdParty contained sssd_info_attributes
+syn keyword ngxDirectiveThirdParty contained sssd_info_group
+syn keyword ngxDirectiveThirdParty contained sssd_info_group_separator
+syn keyword ngxDirectiveThirdParty contained sssd_info_groups
+syn keyword ngxDirectiveThirdParty contained sssd_info_output_to
 
-" Static Etags Module <https://github.com/mikewest/nginx-static-etags>
-" Generate etags for static content
-syn keyword ngxDirectiveThirdParty contained FileETag
-
-" Statsd Module <https://github.com/zebrafishlabs/nginx-statsd>
 " An nginx module for sending statistics to statsd
-syn keyword ngxDirectiveThirdParty contained statsd_server
-syn keyword ngxDirectiveThirdParty contained statsd_sample_rate
+" https://github.com/zebrafishlabs/nginx-statsd
 syn keyword ngxDirectiveThirdParty contained statsd_count
+syn keyword ngxDirectiveThirdParty contained statsd_sample_rate
+syn keyword ngxDirectiveThirdParty contained statsd_server
 syn keyword ngxDirectiveThirdParty contained statsd_timing
 
-" Sticky Module <https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng>
-" Add a sticky cookie to be always forwarded to the same upstream server
-" syn keyword ngxDirectiveThirdParty contained sticky
-
-" Stream Echo Module <https://github.com/openresty/stream-echo-nginx-module>
-" TCP/stream echo module for NGINX (a port of ngx_http_echo_module)
+" ngx_stream_echo - TCP/stream echo module for NGINX (a port of the ngx_http_echo module)
+" https://github.com/openresty/stream-echo-nginx-module
 syn keyword ngxDirectiveThirdParty contained echo
+syn keyword ngxDirectiveThirdParty contained echo_client_error_log_level
+syn keyword ngxDirectiveThirdParty contained echo_discard_request
 syn keyword ngxDirectiveThirdParty contained echo_duplicate
 syn keyword ngxDirectiveThirdParty contained echo_flush_wait
-syn keyword ngxDirectiveThirdParty contained echo_sleep
-syn keyword ngxDirectiveThirdParty contained echo_send_timeout
-syn keyword ngxDirectiveThirdParty contained echo_read_bytes
-syn keyword ngxDirectiveThirdParty contained echo_read_line
-syn keyword ngxDirectiveThirdParty contained echo_request_data
-syn keyword ngxDirectiveThirdParty contained echo_discard_request
-syn keyword ngxDirectiveThirdParty contained echo_read_buffer_size
-syn keyword ngxDirectiveThirdParty contained echo_read_timeout
-syn keyword ngxDirectiveThirdParty contained echo_client_error_log_level
 syn keyword ngxDirectiveThirdParty contained echo_lingering_close
 syn keyword ngxDirectiveThirdParty contained echo_lingering_time
 syn keyword ngxDirectiveThirdParty contained echo_lingering_timeout
+syn keyword ngxDirectiveThirdParty contained echo_read_buffer_size
+syn keyword ngxDirectiveThirdParty contained echo_read_bytes
+syn keyword ngxDirectiveThirdParty contained echo_read_line
+syn keyword ngxDirectiveThirdParty contained echo_read_timeout
+syn keyword ngxDirectiveThirdParty contained echo_request_data
+syn keyword ngxDirectiveThirdParty contained echo_send_timeout
+syn keyword ngxDirectiveThirdParty contained echo_sleep
 
-" Stream Lua Module <https://github.com/openresty/stream-lua-nginx-module>
-" Embed the power of Lua into Nginx stream/TCP Servers.
-syn keyword ngxDirectiveThirdParty contained lua_resolver
-syn keyword ngxDirectiveThirdParty contained lua_resolver_timeout
-syn keyword ngxDirectiveThirdParty contained lua_lingering_close
-syn keyword ngxDirectiveThirdParty contained lua_lingering_time
-syn keyword ngxDirectiveThirdParty contained lua_lingering_timeout
+" Embed the power of Lua into NGINX TCP/UDP servers
+" https://github.com/openresty/stream-lua-nginx-module
+syn keyword ngxDirectiveThirdParty contained lua_add_variable
+syn keyword ngxDirectiveThirdParty contained preread_by_lua_block
+syn keyword ngxDirectiveThirdParty contained preread_by_lua_file
+syn keyword ngxDirectiveThirdParty contained preread_by_lua_no_postpone
 
-" Stream Upsync Module <https://github.com/xiaokai-wang/nginx-stream-upsync-module>
-" Sync upstreams from consul or others, dynamiclly modify backend-servers attribute(weight, max_fails,...), needn't reload nginx.
+" nginx-upsync-module
+" https://github.com/weibocom/nginx-upsync-module
+syn keyword ngxDirectiveThirdParty contained upstream_show
 syn keyword ngxDirectiveThirdParty contained upsync
 syn keyword ngxDirectiveThirdParty contained upsync_dump_path
 syn keyword ngxDirectiveThirdParty contained upsync_lb
-syn keyword ngxDirectiveThirdParty contained upsync_show
 
-" Strip Module <https://github.com/evanmiller/mod_strip>
-" Whitespace remover.
+" Whitespace stripper for nginx
+" https://github.com/evanmiller/mod_strip
 syn keyword ngxDirectiveThirdParty contained strip
 
-" Subrange Module <https://github.com/Qihoo360/ngx_http_subrange_module>
 " Split one big HTTP/Range request to multiple subrange requesets
+" https://github.com/Qihoo360/ngx_http_subrange_module
 syn keyword ngxDirectiveThirdParty contained subrange
 
-" Substitutions Module <https://www.nginx.com/resources/wiki/modules/substitutions/>
-" A filter module which can do both regular expression and fixed string substitutions on response bodies.
-syn keyword ngxDirectiveThirdParty contained subs_filter
-syn keyword ngxDirectiveThirdParty contained subs_filter_types
+" summarizer-nginx-module
+" https://github.com/reeteshranjan/summarizer-nginx-module
+syn keyword ngxDirectiveThirdParty contained summarizer_bind
+syn keyword ngxDirectiveThirdParty contained summarizer_buffer_size
+syn keyword ngxDirectiveThirdParty contained summarizer_connect_timeout
+syn keyword ngxDirectiveThirdParty contained summarizer_next_upstream
+syn keyword ngxDirectiveThirdParty contained summarizer_pass
+syn keyword ngxDirectiveThirdParty contained summarizer_read_timeout
+syn keyword ngxDirectiveThirdParty contained summarizer_send_timeout
 
-" Summarizer Module <https://github.com/reeteshranjan/summarizer-nginx-module>
-" Upstream nginx module to get summaries of documents using the summarizer daemon service
-syn keyword ngxDirectiveThirdParty contained smrzr_filename
-syn keyword ngxDirectiveThirdParty contained smrzr_ratio
-
-" Supervisord Module <https://github.com/FRiCKLE/ngx_supervisord/>
-" Module providing nginx with API to communicate with supervisord and manage (start/stop) backends on-demand.
+" nginx module providing API to communicate with supervisord and manage (start/stop) backends on-demand
+" https://github.com/FRiCKLE/ngx_supervisord
 syn keyword ngxDirectiveThirdParty contained supervisord
 syn keyword ngxDirectiveThirdParty contained supervisord_inherit_backend_status
 syn keyword ngxDirectiveThirdParty contained supervisord_name
 syn keyword ngxDirectiveThirdParty contained supervisord_start
 syn keyword ngxDirectiveThirdParty contained supervisord_stop
 
-" Tarantool Upstream Module <https://github.com/tarantool/nginx_upstream_module>
-" Tarantool NginX upstream module (REST, JSON API, websockets, load balancing)
-syn keyword ngxDirectiveThirdParty contained tnt_pass
-syn keyword ngxDirectiveThirdParty contained tnt_http_methods
-syn keyword ngxDirectiveThirdParty contained tnt_http_rest_methods
-syn keyword ngxDirectiveThirdParty contained tnt_pass_http_request
-syn keyword ngxDirectiveThirdParty contained tnt_pass_http_request_buffer_size
-syn keyword ngxDirectiveThirdParty contained tnt_method
-syn keyword ngxDirectiveThirdParty contained tnt_http_allowed_methods - experemental
-syn keyword ngxDirectiveThirdParty contained tnt_send_timeout
-syn keyword ngxDirectiveThirdParty contained tnt_read_timeout
-syn keyword ngxDirectiveThirdParty contained tnt_buffer_size
-syn keyword ngxDirectiveThirdParty contained tnt_next_upstream
-syn keyword ngxDirectiveThirdParty contained tnt_connect_timeout
-syn keyword ngxDirectiveThirdParty contained tnt_next_upstream
-syn keyword ngxDirectiveThirdParty contained tnt_next_upstream_tries
-syn keyword ngxDirectiveThirdParty contained tnt_next_upstream_timeout
-
-" TCP Proxy Module <http://yaoweibin.github.io/nginx_tcp_proxy_module/>
-" Add the feature of tcp proxy with nginx, with health check and status monitor
-syn keyword ngxDirectiveBlock contained tcp
-" syn keyword ngxDirectiveThirdParty contained server
-" syn keyword ngxDirectiveThirdParty contained listen
-" syn keyword ngxDirectiveThirdParty contained allow
-" syn keyword ngxDirectiveThirdParty contained deny
-" syn keyword ngxDirectiveThirdParty contained so_keepalive
-" syn keyword ngxDirectiveThirdParty contained tcp_nodelay
-" syn keyword ngxDirectiveThirdParty contained timeout
-" syn keyword ngxDirectiveThirdParty contained server_name
-" syn keyword ngxDirectiveThirdParty contained resolver
-" syn keyword ngxDirectiveThirdParty contained resolver_timeout
-" syn keyword ngxDirectiveThirdParty contained upstream
-syn keyword ngxDirectiveThirdParty contained check
-syn keyword ngxDirectiveThirdParty contained check_http_send
-syn keyword ngxDirectiveThirdParty contained check_http_expect_alive
-syn keyword ngxDirectiveThirdParty contained check_smtp_send
-syn keyword ngxDirectiveThirdParty contained check_smtp_expect_alive
-syn keyword ngxDirectiveThirdParty contained check_shm_size
-syn keyword ngxDirectiveThirdParty contained check_status
-" syn keyword ngxDirectiveThirdParty contained ip_hash
-" syn keyword ngxDirectiveThirdParty contained proxy_pass
-" syn keyword ngxDirectiveThirdParty contained proxy_buffer
-" syn keyword ngxDirectiveThirdParty contained proxy_connect_timeout
-" syn keyword ngxDirectiveThirdParty contained proxy_read_timeout
-syn keyword ngxDirectiveThirdParty contained proxy_write_timeout
-
-" Testcookie Module <https://github.com/kyprizel/testcookie-nginx-module>
-" NGINX module for L7 DDoS attack mitigation
+" simple robot mitigation module using cookie based challenge/response technique. Not supported any more.
+" https://github.com/kyprizel/testcookie-nginx-module
 syn keyword ngxDirectiveThirdParty contained testcookie
-syn keyword ngxDirectiveThirdParty contained testcookie_name
+syn keyword ngxDirectiveThirdParty contained testcookie_arg
+syn keyword ngxDirectiveThirdParty contained testcookie_deny_keepalive
 syn keyword ngxDirectiveThirdParty contained testcookie_domain
 syn keyword ngxDirectiveThirdParty contained testcookie_expires
-syn keyword ngxDirectiveThirdParty contained testcookie_path
-syn keyword ngxDirectiveThirdParty contained testcookie_secret
-syn keyword ngxDirectiveThirdParty contained testcookie_session
-syn keyword ngxDirectiveThirdParty contained testcookie_arg
-syn keyword ngxDirectiveThirdParty contained testcookie_max_attempts
-syn keyword ngxDirectiveThirdParty contained testcookie_p3p
 syn keyword ngxDirectiveThirdParty contained testcookie_fallback
-syn keyword ngxDirectiveThirdParty contained testcookie_whitelist
-syn keyword ngxDirectiveThirdParty contained testcookie_pass
-syn keyword ngxDirectiveThirdParty contained testcookie_redirect_via_refresh
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_template
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_status
-syn keyword ngxDirectiveThirdParty contained testcookie_deny_keepalive
 syn keyword ngxDirectiveThirdParty contained testcookie_get_only
-syn keyword ngxDirectiveThirdParty contained testcookie_https_location
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie_key
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_iv
-syn keyword ngxDirectiveThirdParty contained testcookie_internal
 syn keyword ngxDirectiveThirdParty contained testcookie_httponly_flag
+syn keyword ngxDirectiveThirdParty contained testcookie_https_location
+syn keyword ngxDirectiveThirdParty contained testcookie_internal
+syn keyword ngxDirectiveThirdParty contained testcookie_max_attempts
+syn keyword ngxDirectiveThirdParty contained testcookie_name
+syn keyword ngxDirectiveThirdParty contained testcookie_p3p
+syn keyword ngxDirectiveThirdParty contained testcookie_pass
+syn keyword ngxDirectiveThirdParty contained testcookie_path
+syn keyword ngxDirectiveThirdParty contained testcookie_port_in_redirect
+syn keyword ngxDirectiveThirdParty contained testcookie_redirect_via_refresh
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie_iv
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie_key
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_status
+syn keyword ngxDirectiveThirdParty contained testcookie_refresh_template
+syn keyword ngxDirectiveThirdParty contained testcookie_secret
 syn keyword ngxDirectiveThirdParty contained testcookie_secure_flag
+syn keyword ngxDirectiveThirdParty contained testcookie_session
+syn keyword ngxDirectiveThirdParty contained testcookie_whitelist
 
-" Types Filter Module <https://github.com/flygoast/ngx_http_types_filter>
-" Change the `Content-Type` output header depending on an extension variable according to a condition specified in the 'if' clause.
+" ngx_http_types_filter_module
+" https://github.com/flygoast/ngx_http_types_filter
 syn keyword ngxDirectiveThirdParty contained types_filter
 syn keyword ngxDirectiveThirdParty contained types_filter_use_default
 
-" Unzip Module <https://github.com/youzee/nginx-unzip-module>
-" Enabling fetching of files that are stored in zipped archives.
+" A module allowing the nginx to use files embedded in a zip file
+" https://github.com/youzee/nginx-unzip-module
+syn keyword ngxDirectiveThirdParty contained file_in_unzip
 syn keyword ngxDirectiveThirdParty contained file_in_unzip_archivefile
 syn keyword ngxDirectiveThirdParty contained file_in_unzip_extract
-syn keyword ngxDirectiveThirdParty contained file_in_unzip
 
-" Upload Progress Module <https://www.nginx.com/resources/wiki/modules/upload_progress/>
-" An upload progress system, that monitors RFC1867 POST upload as they are transmitted to upstream servers
-syn keyword ngxDirectiveThirdParty contained upload_progress
-syn keyword ngxDirectiveThirdParty contained track_uploads
-syn keyword ngxDirectiveThirdParty contained report_uploads
-syn keyword ngxDirectiveThirdParty contained upload_progress_content_type
-syn keyword ngxDirectiveThirdParty contained upload_progress_header
-syn keyword ngxDirectiveThirdParty contained upload_progress_jsonp_parameter
-syn keyword ngxDirectiveThirdParty contained upload_progress_json_output
-syn keyword ngxDirectiveThirdParty contained upload_progress_jsonp_output
-syn keyword ngxDirectiveThirdParty contained upload_progress_template
-
-" Upload Module <https://www.nginx.com/resources/wiki/modules/upload/>
-" Parses request body storing all files being uploaded to a directory specified by upload_store directive
-syn keyword ngxDirectiveThirdParty contained upload_pass
-syn keyword ngxDirectiveThirdParty contained upload_resumable
-syn keyword ngxDirectiveThirdParty contained upload_store
-syn keyword ngxDirectiveThirdParty contained upload_state_store
-syn keyword ngxDirectiveThirdParty contained upload_store_access
-syn keyword ngxDirectiveThirdParty contained upload_set_form_field
-syn keyword ngxDirectiveThirdParty contained upload_aggregate_form_field
-syn keyword ngxDirectiveThirdParty contained upload_pass_form_field
-syn keyword ngxDirectiveThirdParty contained upload_cleanup
-syn keyword ngxDirectiveThirdParty contained upload_buffer_size
-syn keyword ngxDirectiveThirdParty contained upload_max_part_header_len
-syn keyword ngxDirectiveThirdParty contained upload_max_file_size
-syn keyword ngxDirectiveThirdParty contained upload_limit_rate
-syn keyword ngxDirectiveThirdParty contained upload_max_output_body_len
-syn keyword ngxDirectiveThirdParty contained upload_tame_arrays
-syn keyword ngxDirectiveThirdParty contained upload_pass_args
-
-" Upstream Fair Module <https://github.com/gnosek/nginx-upstream-fair>
-" The fair load balancer module for nginx http://nginx.localdomain.pl
-syn keyword ngxDirectiveThirdParty contained fair
-syn keyword ngxDirectiveThirdParty contained upstream_fair_shm_size
-
-" Upstream Hash Module (DEPRECATED) <http://wiki.nginx.org/NginxHttpUpstreamRequestHashModule>
-" Provides simple upstream load distribution by hashing a configurable variable.
-" syn keyword ngxDirectiveDeprecated contained hash
-syn keyword ngxDirectiveDeprecated contained hash_again
-
-" Upstream Domain Resolve Module <https://www.nginx.com/resources/wiki/modules/domain_resolve/>
-" A load-balancer that resolves an upstream domain name asynchronously.
+" An asynchronous domain name resolve module for nginx upstream
+" https://github.com/wdaike/ngx_upstream_jdomain
 syn keyword ngxDirectiveThirdParty contained jdomain
 
-" Upsync Module <https://github.com/weibocom/nginx-upsync-module>
-" Sync upstreams from consul or others, dynamiclly modify backend-servers attribute(weight, max_fails,...), needn't reload nginx
-syn keyword ngxDirectiveThirdParty contained upsync
-syn keyword ngxDirectiveThirdParty contained upsync_dump_path
-syn keyword ngxDirectiveThirdParty contained upsync_lb
-syn keyword ngxDirectiveThirdParty contained upstream_show
-
-" URL Module <https://github.com/vozlt/nginx-module-url>
 " Nginx url encoding converting module
+" https://github.com/vozlt/nginx-module-url
 syn keyword ngxDirectiveThirdParty contained url_encoding_convert
+syn keyword ngxDirectiveThirdParty contained url_encoding_convert_alloc_size
+syn keyword ngxDirectiveThirdParty contained url_encoding_convert_alloc_size_x
 syn keyword ngxDirectiveThirdParty contained url_encoding_convert_from
+syn keyword ngxDirectiveThirdParty contained url_encoding_convert_phase
 syn keyword ngxDirectiveThirdParty contained url_encoding_convert_to
 
-" User Agent Module <https://github.com/alibaba/nginx-http-user-agent>
-" Match browsers and crawlers
+" A nginx module to match browsers and crawlers
+" https://github.com/alibaba/nginx-http-user-agent
 syn keyword ngxDirectiveThirdParty contained user_agent
 
-" Upstrema Ketama Chash Module <https://github.com/flygoast/ngx_http_upstream_ketama_chash>
-" Nginx load-balancer module implementing ketama consistent hashing.
+" nginx load-balancer module implementing ketama consistent hashing
+" https://github.com/flygoast/ngx_http_upstream_ketama_chash
 syn keyword ngxDirectiveThirdParty contained ketama_chash
 
-" Video Thumbextractor Module <https://github.com/wandenberg/nginx-video-thumbextractor-module>
-" Extract thumbs from a video file
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_video_filename
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_video_second
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_image_width
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_image_height
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_only_keyframe
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_next_time
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_rows
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_cols
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_max_rows
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_max_cols
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_sample_interval
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_color
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_margin
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_padding
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_threads
-syn keyword ngxDirectiveThirdParty contained video_thumbextractor_processes_per_worker
 
-" Eval Module <http://www.grid.net.ru/nginx/eval.en.html>
-" Module for nginx web server evaluates response of proxy or memcached module into variables.
-syn keyword ngxDirectiveThirdParty contained eval
-syn keyword ngxDirectiveThirdParty contained eval_escalate
-syn keyword ngxDirectiveThirdParty contained eval_override_content_type
-
-" VTS Module <https://github.com/vozlt/nginx-module-vts>
-" Nginx virtual host traffic status module
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_zone
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display_format
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_display_jsonp
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_host
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_set_key
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_check_duplicate
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_traffic
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_traffic_by_set_key
-syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_check_duplicate
-
-" XSS Module <https://github.com/openresty/xss-nginx-module>
-" Native support for cross-site scripting (XSS) in an nginx.
-syn keyword ngxDirectiveThirdParty contained xss_get
-syn keyword ngxDirectiveThirdParty contained xss_callback_arg
-syn keyword ngxDirectiveThirdParty contained xss_override_status
-syn keyword ngxDirectiveThirdParty contained xss_check_status
-syn keyword ngxDirectiveThirdParty contained xss_input_types
-
-" ZIP Module <https://www.nginx.com/resources/wiki/modules/zip/>
-" ZIP archiver for nginx
 
 
 " highlight
@@ -2178,6 +2230,7 @@ hi link ngxDirectiveError Constant
 hi link ngxDirectiveDeprecated Error
 hi link ngxDirective Identifier
 hi link ngxDirectiveThirdParty Special
+hi link ngxDirectiveThirdPartyDeprecated Error
 
 hi link ngxListenOptions Keyword
 hi link ngxListenOptionsDeprecated Error
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 8fe782f..17f33a0 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013008
-#define NGINX_VERSION      "1.13.8"
+#define nginx_version      1013009
+#define NGINX_VERSION      "1.13.9"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index a825da2..54fa2e6 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -31,6 +31,7 @@ struct ngx_shm_zone_s {
     ngx_shm_t                 shm;
     ngx_shm_zone_init_pt      init;
     void                     *tag;
+    void                     *sync;
     ngx_uint_t                noreuse;  /* unsigned  noreuse:1; */
 };
 
diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c
index e723f92..01cfc97 100644
--- a/src/event/modules/ngx_eventport_module.c
+++ b/src/event/modules/ngx_eventport_module.c
@@ -19,6 +19,8 @@
 #define CLOCK_REALTIME          0
 typedef int     clockid_t;
 typedef void *  timer_t;
+#elif (NGX_DARWIN)
+typedef void *  timer_t;
 #endif
 
 /* Solaris declarations */
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 566b08b..55ad9eb 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -213,7 +213,16 @@ ngx_http_dav_put_handler(ngx_http_request_t *r)
     ngx_ext_rename_file_t     ext;
     ngx_http_dav_loc_conf_t  *dlcf;
 
-    if (r->request_body == NULL || r->request_body->temp_file == NULL) {
+    if (r->request_body == NULL) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "PUT request body is unavailable");
+        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    if (r->request_body->temp_file == NULL) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "PUT request body must be in a file");
         ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
         return;
     }
diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index e5f1eb5..a4c8cc2 100644
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -56,7 +56,7 @@ static ngx_int_t ngx_http_set_expires(ngx_http_request_t *r,
     ngx_http_headers_conf_t *conf);
 static ngx_int_t ngx_http_parse_expires(ngx_str_t *value,
     ngx_http_expires_t *expires, time_t *expires_time, char **err);
-static ngx_int_t ngx_http_add_cache_control(ngx_http_request_t *r,
+static ngx_int_t ngx_http_add_multi_header_lines(ngx_http_request_t *r,
     ngx_http_header_val_t *hv, ngx_str_t *value);
 static ngx_int_t ngx_http_add_header(ngx_http_request_t *r,
     ngx_http_header_val_t *hv, ngx_str_t *value);
@@ -77,7 +77,13 @@ static char *ngx_http_headers_add(ngx_conf_t *cf, ngx_command_t *cmd,
 
 static ngx_http_set_header_t  ngx_http_set_headers[] = {
 
-    { ngx_string("Cache-Control"), 0, ngx_http_add_cache_control },
+    { ngx_string("Cache-Control"),
+                 offsetof(ngx_http_headers_out_t, cache_control),
+                 ngx_http_add_multi_header_lines },
+
+    { ngx_string("Link"),
+                 offsetof(ngx_http_headers_out_t, link),
+                 ngx_http_add_multi_header_lines },
 
     { ngx_string("Last-Modified"),
                  offsetof(ngx_http_headers_out_t, last_modified),
@@ -555,42 +561,40 @@ ngx_http_add_header(ngx_http_request_t *r, ngx_http_header_val_t *hv,
 
 
 static ngx_int_t
-ngx_http_add_cache_control(ngx_http_request_t *r, ngx_http_header_val_t *hv,
-    ngx_str_t *value)
+ngx_http_add_multi_header_lines(ngx_http_request_t *r,
+    ngx_http_header_val_t *hv, ngx_str_t *value)
 {
-    ngx_table_elt_t  *cc, **ccp;
+    ngx_array_t      *pa;
+    ngx_table_elt_t  *h, **ph;
 
     if (value->len == 0) {
         return NGX_OK;
     }
 
-    ccp = r->headers_out.cache_control.elts;
+    pa = (ngx_array_t *) ((char *) &r->headers_out + hv->offset);
 
-    if (ccp == NULL) {
-
-        if (ngx_array_init(&r->headers_out.cache_control, r->pool,
-                           1, sizeof(ngx_table_elt_t *))
-            != NGX_OK)
+    if (pa->elts == NULL) {
+        if (ngx_array_init(pa, r->pool, 1, sizeof(ngx_table_elt_t *)) != NGX_OK)
         {
             return NGX_ERROR;
         }
     }
 
-    cc = ngx_list_push(&r->headers_out.headers);
-    if (cc == NULL) {
+    h = ngx_list_push(&r->headers_out.headers);
+    if (h == NULL) {
         return NGX_ERROR;
     }
 
-    cc->hash = 1;
-    ngx_str_set(&cc->key, "Cache-Control");
-    cc->value = *value;
+    h->hash = 1;
+    h->key = hv->key;
+    h->value = *value;
 
-    ccp = ngx_array_push(&r->headers_out.cache_control);
-    if (ccp == NULL) {
+    ph = ngx_array_push(pa);
+    if (ph == NULL) {
         return NGX_ERROR;
     }
 
-    *ccp = cc;
+    *ph = h;
 
     return NGX_OK;
 }
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 5668bf4..89cfe77 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -140,7 +140,7 @@ ngx_http_header_t  ngx_http_headers_in[] = {
                  offsetof(ngx_http_headers_in_t, upgrade),
                  ngx_http_process_header_line },
 
-#if (NGX_HTTP_GZIP)
+#if (NGX_HTTP_GZIP || NGX_HTTP_HEADERS)
     { ngx_string("Accept-Encoding"),
                  offsetof(ngx_http_headers_in_t, accept_encoding),
                  ngx_http_process_header_line },
@@ -1902,7 +1902,7 @@ ngx_http_process_request(ngx_http_request_t *r)
                               "client SSL certificate verify error: (%l:%s)",
                               rc, X509_verify_cert_error_string(rc));
 
-                ngx_ssl_remove_cached_session(sscf->ssl.ctx,
+                ngx_ssl_remove_cached_session(c->ssl->session_ctx,
                                        (SSL_get0_session(c->ssl->connection)));
 
                 ngx_http_finalize_request(r, NGX_HTTPS_CERT_ERROR);
@@ -1916,7 +1916,7 @@ ngx_http_process_request(ngx_http_request_t *r)
                     ngx_log_error(NGX_LOG_INFO, c->log, 0,
                                   "client sent no required SSL certificate");
 
-                    ngx_ssl_remove_cached_session(sscf->ssl.ctx,
+                    ngx_ssl_remove_cached_session(c->ssl->session_ctx,
                                        (SSL_get0_session(c->ssl->connection)));
 
                     ngx_http_finalize_request(r, NGX_HTTPS_NO_CERT);
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 421004a..5d44c06 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -200,7 +200,7 @@ typedef struct {
     ngx_table_elt_t                  *expect;
     ngx_table_elt_t                  *upgrade;
 
-#if (NGX_HTTP_GZIP)
+#if (NGX_HTTP_GZIP || NGX_HTTP_HEADERS)
     ngx_table_elt_t                  *accept_encoding;
     ngx_table_elt_t                  *via;
 #endif
@@ -279,6 +279,7 @@ typedef struct {
     ngx_uint_t                        content_type_hash;
 
     ngx_array_t                       cache_control;
+    ngx_array_t                       link;
 
     off_t                             content_length_n;
     off_t                             content_offset;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index f8d5707..5ddadf0 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -284,9 +284,10 @@ static ngx_http_upstream_header_t  ngx_http_upstream_headers_in[] = {
                  ngx_http_upstream_process_vary, 0,
                  ngx_http_upstream_copy_header_line, 0, 0 },
 
-    { ngx_string("X-Powered-By"),
+    { ngx_string("Link"),
                  ngx_http_upstream_ignore_header_line, 0,
-                 ngx_http_upstream_copy_header_line, 0, 0 },
+                 ngx_http_upstream_copy_multi_header_lines,
+                 offsetof(ngx_http_headers_out_t, link), 0 },
 
     { ngx_string("X-Accel-Expires"),
                  ngx_http_upstream_process_accel_expires, 0,
@@ -4374,8 +4375,7 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
 
     if (!u->header_sent
         || rc == NGX_HTTP_REQUEST_TIME_OUT
-        || rc == NGX_HTTP_CLIENT_CLOSED_REQUEST
-        || (u->pipe && u->pipe->downstream_error))
+        || rc == NGX_HTTP_CLIENT_CLOSED_REQUEST)
     {
         ngx_http_finalize_request(r, rc);
         return;
@@ -4388,7 +4388,9 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
         flush = 1;
     }
 
-    if (r->header_only) {
+    if (r->header_only
+        || (u->pipe && u->pipe->downstream_error))
+    {
         ngx_http_finalize_request(r, rc);
         return;
     }
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index ab82177..669600a 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -318,6 +318,9 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("sent_http_cache_control"), NULL, ngx_http_variable_headers,
       offsetof(ngx_http_request_t, headers_out.cache_control), 0, 0 },
 
+    { ngx_string("sent_http_link"), NULL, ngx_http_variable_headers,
+      offsetof(ngx_http_request_t, headers_out.link), 0, 0 },
+
     { ngx_string("limit_rate"), ngx_http_variable_request_set_size,
       ngx_http_variable_request_get_size,
       offsetof(ngx_http_request_t, limit_rate),
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 2c62190..7bea204 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -11,6 +11,14 @@
 #include <ngx_http_v2_module.h>
 
 
+typedef struct {
+    ngx_str_t           name;
+    ngx_uint_t          offset;
+    ngx_uint_t          hash;
+    ngx_http_header_t  *hh;
+} ngx_http_v2_parse_header_t;
+
+
 /* errors */
 #define NGX_HTTP_V2_NO_ERROR                     0x0
 #define NGX_HTTP_V2_PROTOCOL_ERROR               0x1
@@ -35,12 +43,11 @@
 #define NGX_HTTP_V2_GOAWAY_SIZE                  8
 #define NGX_HTTP_V2_WINDOW_UPDATE_SIZE           4
 
-#define NGX_HTTP_V2_STREAM_ID_SIZE               4
-
 #define NGX_HTTP_V2_SETTINGS_PARAM_SIZE          6
 
 /* settings fields */
 #define NGX_HTTP_V2_HEADER_TABLE_SIZE_SETTING    0x1
+#define NGX_HTTP_V2_ENABLE_PUSH_SETTING          0x2
 #define NGX_HTTP_V2_MAX_STREAMS_SETTING          0x3
 #define NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING     0x4
 #define NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING       0x5
@@ -121,7 +128,7 @@ static ngx_int_t ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c,
     u_char **pos, u_char *end, ngx_uint_t prefix);
 
 static ngx_http_v2_stream_t *ngx_http_v2_create_stream(
-    ngx_http_v2_connection_t *h2c);
+    ngx_http_v2_connection_t *h2c, ngx_uint_t push);
 static ngx_http_v2_node_t *ngx_http_v2_get_node_by_id(
     ngx_http_v2_connection_t *h2c, ngx_uint_t sid, ngx_uint_t alloc);
 static ngx_http_v2_node_t *ngx_http_v2_get_closed_node(
@@ -150,18 +157,21 @@ static ngx_int_t ngx_http_v2_validate_header(ngx_http_request_t *r,
 static ngx_int_t ngx_http_v2_pseudo_header(ngx_http_request_t *r,
     ngx_http_v2_header_t *header);
 static ngx_int_t ngx_http_v2_parse_path(ngx_http_request_t *r,
-    ngx_http_v2_header_t *header);
+    ngx_str_t *value);
 static ngx_int_t ngx_http_v2_parse_method(ngx_http_request_t *r,
-    ngx_http_v2_header_t *header);
+    ngx_str_t *value);
 static ngx_int_t ngx_http_v2_parse_scheme(ngx_http_request_t *r,
-    ngx_http_v2_header_t *header);
+    ngx_str_t *value);
 static ngx_int_t ngx_http_v2_parse_authority(ngx_http_request_t *r,
-    ngx_http_v2_header_t *header);
+    ngx_str_t *value);
+static ngx_int_t ngx_http_v2_parse_header(ngx_http_request_t *r,
+    ngx_http_v2_parse_header_t *header, ngx_str_t *value);
 static ngx_int_t ngx_http_v2_construct_request_line(ngx_http_request_t *r);
 static ngx_int_t ngx_http_v2_cookie(ngx_http_request_t *r,
     ngx_http_v2_header_t *header);
 static ngx_int_t ngx_http_v2_construct_cookie_header(ngx_http_request_t *r);
 static void ngx_http_v2_run_request(ngx_http_request_t *r);
+static void ngx_http_v2_run_request_handler(ngx_event_t *ev);
 static ngx_int_t ngx_http_v2_process_request_body(ngx_http_request_t *r,
     u_char *pos, size_t size, ngx_uint_t last);
 static ngx_int_t ngx_http_v2_filter_request_body(ngx_http_request_t *r);
@@ -185,22 +195,39 @@ static void ngx_http_v2_pool_cleanup(void *data);
 
 
 static ngx_http_v2_handler_pt ngx_http_v2_frame_states[] = {
-    ngx_http_v2_state_data,
-    ngx_http_v2_state_headers,
-    ngx_http_v2_state_priority,
-    ngx_http_v2_state_rst_stream,
-    ngx_http_v2_state_settings,
-    ngx_http_v2_state_push_promise,
-    ngx_http_v2_state_ping,
-    ngx_http_v2_state_goaway,
-    ngx_http_v2_state_window_update,
-    ngx_http_v2_state_continuation
+    ngx_http_v2_state_data,               /* NGX_HTTP_V2_DATA_FRAME */
+    ngx_http_v2_state_headers,            /* NGX_HTTP_V2_HEADERS_FRAME */
+    ngx_http_v2_state_priority,           /* NGX_HTTP_V2_PRIORITY_FRAME */
+    ngx_http_v2_state_rst_stream,         /* NGX_HTTP_V2_RST_STREAM_FRAME */
+    ngx_http_v2_state_settings,           /* NGX_HTTP_V2_SETTINGS_FRAME */
+    ngx_http_v2_state_push_promise,       /* NGX_HTTP_V2_PUSH_PROMISE_FRAME */
+    ngx_http_v2_state_ping,               /* NGX_HTTP_V2_PING_FRAME */
+    ngx_http_v2_state_goaway,             /* NGX_HTTP_V2_GOAWAY_FRAME */
+    ngx_http_v2_state_window_update,      /* NGX_HTTP_V2_WINDOW_UPDATE_FRAME */
+    ngx_http_v2_state_continuation        /* NGX_HTTP_V2_CONTINUATION_FRAME */
 };
 
 #define NGX_HTTP_V2_FRAME_STATES                                              \
     (sizeof(ngx_http_v2_frame_states) / sizeof(ngx_http_v2_handler_pt))
 
 
+static ngx_http_v2_parse_header_t  ngx_http_v2_parse_headers[] = {
+    { ngx_string("host"),
+      offsetof(ngx_http_headers_in_t, host), 0, NULL },
+
+    { ngx_string("accept-encoding"),
+      offsetof(ngx_http_headers_in_t, accept_encoding), 0, NULL },
+
+    { ngx_string("accept-language"),
+      offsetof(ngx_http_headers_in_t, accept_language), 0, NULL },
+
+    { ngx_string("user-agent"),
+      offsetof(ngx_http_headers_in_t, user_agent), 0, NULL },
+
+    { ngx_null_string, 0, 0, NULL }
+};
+
+
 void
 ngx_http_v2_init(ngx_event_t *rev)
 {
@@ -249,6 +276,8 @@ ngx_http_v2_init(ngx_event_t *rev)
 
     h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
 
+    h2c->concurrent_pushes = h2scf->concurrent_pushes;
+
     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
     if (h2c->pool == NULL) {
         ngx_http_close_connection(c);
@@ -366,7 +395,9 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
             break;
         }
 
-        if (n == 0 && (h2c->state.incomplete || h2c->processing)) {
+        if (n == 0
+            && (h2c->state.incomplete || h2c->processing || h2c->pushing))
+        {
             ngx_log_error(NGX_LOG_INFO, c->log, 0,
                           "client prematurely closed connection");
         }
@@ -405,7 +436,7 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
 
     h2c->blocked = 0;
 
-    if (h2c->processing) {
+    if (h2c->processing || h2c->pushing) {
         if (rev->timer_set) {
             ngx_del_timer(rev);
         }
@@ -589,7 +620,7 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
     ngx_connection_t        *c;
     ngx_http_v2_srv_conf_t  *h2scf;
 
-    if (h2c->last_out || h2c->processing) {
+    if (h2c->last_out || h2c->processing || h2c->pushing) {
         return;
     }
 
@@ -1046,7 +1077,7 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     depend = 0;
     excl = 0;
-    weight = 16;
+    weight = NGX_HTTP_V2_DEFAULT_WEIGHT;
 
     if (priority) {
         dependency = ngx_http_v2_parse_uint32(pos);
@@ -1059,7 +1090,8 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 HEADERS frame sid:%ui on %ui excl:%ui weight:%ui",
+                   "http2 HEADERS frame sid:%ui "
+                   "depends on %ui excl:%ui weight:%ui",
                    h2c->state.sid, depend, excl, weight);
 
     if (h2c->state.sid % 2 == 0 || h2c->state.sid <= h2c->last_sid) {
@@ -1122,7 +1154,7 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         h2c->closed_nodes--;
     }
 
-    stream = ngx_http_v2_create_stream(h2c);
+    stream = ngx_http_v2_create_stream(h2c, 0);
     if (stream == NULL) {
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
     }
@@ -1582,14 +1614,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
         }
 
         if (rc == NGX_DECLINED) {
-            if (ngx_http_v2_terminate_stream(h2c, h2c->state.stream,
-                                             NGX_HTTP_V2_PROTOCOL_ERROR)
-                == NGX_ERROR)
-            {
-                return ngx_http_v2_connection_error(h2c,
-                                                    NGX_HTTP_V2_INTERNAL_ERROR);
-            }
-
+            ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
             goto error;
         }
 
@@ -1788,7 +1813,8 @@ ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c, u_char *pos,
     pos += NGX_HTTP_V2_PRIORITY_SIZE;
 
     ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 PRIORITY frame sid:%ui on %ui excl:%ui weight:%ui",
+                   "http2 PRIORITY frame sid:%ui "
+                   "depends on %ui excl:%ui weight:%ui",
                    h2c->state.sid, depend, excl, weight);
 
     if (h2c->state.sid == 0) {
@@ -1914,6 +1940,11 @@ ngx_http_v2_state_rst_stream(ngx_http_v2_connection_t *h2c, u_char *pos,
                       "client canceled stream %ui", h2c->state.sid);
         break;
 
+    case NGX_HTTP_V2_REFUSED_STREAM:
+        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
+                      "client refused stream %ui", h2c->state.sid);
+        break;
+
     case NGX_HTTP_V2_INTERNAL_ERROR:
         ngx_log_error(NGX_LOG_INFO, fc->log, 0,
                       "client terminated stream %ui due to internal error",
@@ -1971,6 +2002,7 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
 {
     ssize_t                   window_delta;
     ngx_uint_t                id, value;
+    ngx_http_v2_srv_conf_t   *h2scf;
     ngx_http_v2_out_frame_t  *frame;
 
     window_delta = 0;
@@ -1986,6 +2018,9 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
         id = ngx_http_v2_parse_uint16(pos);
         value = ngx_http_v2_parse_uint32(&pos[2]);
 
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "http2 setting %ui:%ui", id, value);
+
         switch (id) {
 
         case NGX_HTTP_V2_INIT_WINDOW_SIZE_SETTING:
@@ -2000,8 +2035,6 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
             }
 
             window_delta = value - h2c->init_window;
-
-            h2c->init_window = value;
             break;
 
         case NGX_HTTP_V2_MAX_FRAME_SIZE_SETTING:
@@ -2020,6 +2053,27 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
             h2c->frame_size = value;
             break;
 
+        case NGX_HTTP_V2_ENABLE_PUSH_SETTING:
+
+            if (value > 1) {
+                ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                              "client sent SETTINGS frame with incorrect "
+                              "ENABLE_PUSH value %ui", value);
+
+                return ngx_http_v2_connection_error(h2c,
+                                                    NGX_HTTP_V2_PROTOCOL_ERROR);
+            }
+
+            h2c->push_disabled = !value;
+            break;
+
+        case NGX_HTTP_V2_MAX_STREAMS_SETTING:
+            h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                                 ngx_http_v2_module);
+
+            h2c->concurrent_pushes = ngx_min(value, h2scf->concurrent_pushes);
+            break;
+
         default:
             break;
         }
@@ -2037,6 +2091,8 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
     ngx_http_v2_queue_ordered_frame(h2c, frame);
 
     if (window_delta) {
+        h2c->init_window += window_delta;
+
         if (ngx_http_v2_adjust_windows(h2c, window_delta) != NGX_OK) {
             return ngx_http_v2_connection_error(h2c,
                                                 NGX_HTTP_V2_INTERNAL_ERROR);
@@ -2485,6 +2541,166 @@ ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c, u_char **pos, u_char *end,
 }
 
 
+ngx_http_v2_stream_t *
+ngx_http_v2_push_stream(ngx_http_v2_stream_t *parent, ngx_str_t *path)
+{
+    ngx_int_t                     rc;
+    ngx_str_t                     value;
+    ngx_pool_t                   *pool;
+    ngx_uint_t                    index;
+    ngx_table_elt_t             **h;
+    ngx_connection_t             *fc;
+    ngx_http_request_t           *r;
+    ngx_http_v2_node_t           *node;
+    ngx_http_v2_stream_t         *stream;
+    ngx_http_v2_srv_conf_t       *h2scf;
+    ngx_http_v2_connection_t     *h2c;
+    ngx_http_v2_parse_header_t   *header;
+
+    h2c = parent->connection;
+
+    pool = ngx_create_pool(1024, h2c->connection->log);
+    if (pool == NULL) {
+        goto rst_stream;
+    }
+
+    node = ngx_http_v2_get_node_by_id(h2c, h2c->last_push, 1);
+
+    if (node == NULL) {
+        ngx_destroy_pool(pool);
+        goto rst_stream;
+    }
+
+    stream = ngx_http_v2_create_stream(h2c, 1);
+    if (stream == NULL) {
+
+        if (node->parent == NULL) {
+            h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                                 ngx_http_v2_module);
+
+            index = ngx_http_v2_index(h2scf, h2c->last_push);
+            h2c->streams_index[index] = node->index;
+
+            ngx_queue_insert_tail(&h2c->closed, &node->reuse);
+            h2c->closed_nodes++;
+        }
+
+        ngx_destroy_pool(pool);
+        goto rst_stream;
+    }
+
+    if (node->parent) {
+        ngx_queue_remove(&node->reuse);
+        h2c->closed_nodes--;
+    }
+
+    stream->pool = pool;
+
+    r = stream->request;
+    fc = r->connection;
+
+    stream->in_closed = 1;
+    stream->node = node;
+
+    node->stream = stream;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 push stream sid:%ui "
+                   "depends on %ui excl:0 weight:16",
+                   h2c->last_push, parent->node->id);
+
+    node->weight = NGX_HTTP_V2_DEFAULT_WEIGHT;
+    ngx_http_v2_set_dependency(h2c, node, parent->node->id, 0);
+
+    r->method_name = ngx_http_core_get_method;
+    r->method = NGX_HTTP_GET;
+
+    r->schema_start = (u_char *) "https";
+
+#if (NGX_HTTP_SSL)
+    if (fc->ssl) {
+        r->schema_end = r->schema_start + 5;
+
+    } else
+#endif
+    {
+        r->schema_end = r->schema_start + 4;
+    }
+
+    value.data = ngx_pstrdup(pool, path);
+    if (value.data == NULL) {
+        goto close;
+    }
+
+    value.len = path->len;
+
+    rc = ngx_http_v2_parse_path(r, &value);
+
+    if (rc != NGX_OK) {
+        goto error;
+    }
+
+    for (header = ngx_http_v2_parse_headers; header->name.len; header++) {
+        h = (ngx_table_elt_t **)
+                ((char *) &parent->request->headers_in + header->offset);
+
+        if (*h == NULL) {
+            continue;
+        }
+
+        value.len = (*h)->value.len;
+
+        value.data = ngx_pnalloc(pool, value.len + 1);
+        if (value.data == NULL) {
+            goto close;
+        }
+
+        ngx_memcpy(value.data, (*h)->value.data, value.len);
+        value.data[value.len] = '\0';
+
+        rc = ngx_http_v2_parse_header(r, header, &value);
+
+        if (rc != NGX_OK) {
+            goto error;
+        }
+    }
+
+    fc->write->handler = ngx_http_v2_run_request_handler;
+    ngx_post_event(fc->write, &ngx_posted_events);
+
+    return stream;
+
+error:
+
+    if (rc == NGX_ABORT) {
+        /* header handler has already finalized request */
+        return NULL;
+    }
+
+    if (rc == NGX_DECLINED) {
+        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+        return NULL;
+    }
+
+close:
+
+    ngx_http_v2_close_stream(stream, NGX_HTTP_INTERNAL_SERVER_ERROR);
+
+    return NULL;
+
+rst_stream:
+
+    if (ngx_http_v2_send_rst_stream(h2c, h2c->last_push,
+                                    NGX_HTTP_INTERNAL_SERVER_ERROR)
+        != NGX_OK)
+    {
+        h2c->connection->error = 1;
+    }
+
+    return NULL;
+}
+
+
 static ngx_int_t
 ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c)
 {
@@ -2745,7 +2961,7 @@ ngx_http_v2_frame_handler(ngx_http_v2_connection_t *h2c,
 
 
 static ngx_http_v2_stream_t *
-ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
+ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
 {
     ngx_log_t                 *log;
     ngx_event_t               *rev, *wev;
@@ -2800,7 +3016,13 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
     ngx_memcpy(log, h2c->connection->log, sizeof(ngx_log_t));
 
     log->data = ctx;
-    log->action = "reading client request headers";
+
+    if (push) {
+        log->action = "processing pushed request headers";
+
+    } else {
+        log->action = "reading client request headers";
+    }
 
     ngx_memzero(rev, sizeof(ngx_event_t));
 
@@ -2872,7 +3094,12 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
     stream->send_window = h2c->init_window;
     stream->recv_window = h2scf->preread_size;
 
-    h2c->processing++;
+    if (push) {
+        h2c->pushing++;
+
+    } else {
+        h2c->processing++;
+    }
 
     return stream;
 }
@@ -3084,7 +3311,7 @@ ngx_http_v2_pseudo_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
         if (ngx_memcmp(header->name.data, "path", sizeof("path") - 1)
             == 0)
         {
-            return ngx_http_v2_parse_path(r, header);
+            return ngx_http_v2_parse_path(r, &header->value);
         }
 
         break;
@@ -3093,13 +3320,13 @@ ngx_http_v2_pseudo_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
         if (ngx_memcmp(header->name.data, "method", sizeof("method") - 1)
             == 0)
         {
-            return ngx_http_v2_parse_method(r, header);
+            return ngx_http_v2_parse_method(r, &header->value);
         }
 
         if (ngx_memcmp(header->name.data, "scheme", sizeof("scheme") - 1)
             == 0)
         {
-            return ngx_http_v2_parse_scheme(r, header);
+            return ngx_http_v2_parse_scheme(r, &header->value);
         }
 
         break;
@@ -3108,7 +3335,7 @@ ngx_http_v2_pseudo_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
         if (ngx_memcmp(header->name.data, "authority", sizeof("authority") - 1)
             == 0)
         {
-            return ngx_http_v2_parse_authority(r, header);
+            return ngx_http_v2_parse_authority(r, &header->value);
         }
 
         break;
@@ -3123,7 +3350,7 @@ ngx_http_v2_pseudo_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
 
 
 static ngx_int_t
-ngx_http_v2_parse_path(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+ngx_http_v2_parse_path(ngx_http_request_t *r, ngx_str_t *value)
 {
     if (r->unparsed_uri.len) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
@@ -3132,20 +3359,19 @@ ngx_http_v2_parse_path(ngx_http_request_t *r, ngx_http_v2_header_t *header)
         return NGX_DECLINED;
     }
 
-    if (header->value.len == 0) {
+    if (value->len == 0) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                       "client sent empty :path header");
 
         return NGX_DECLINED;
     }
 
-    r->uri_start = header->value.data;
-    r->uri_end = header->value.data + header->value.len;
+    r->uri_start = value->data;
+    r->uri_end = value->data + value->len;
 
     if (ngx_http_parse_uri(r) != NGX_OK) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent invalid :path header: \"%V\"",
-                      &header->value);
+                      "client sent invalid :path header: \"%V\"", value);
 
         return NGX_DECLINED;
     }
@@ -3163,7 +3389,7 @@ ngx_http_v2_parse_path(ngx_http_request_t *r, ngx_http_v2_header_t *header)
 
 
 static ngx_int_t
-ngx_http_v2_parse_method(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+ngx_http_v2_parse_method(ngx_http_request_t *r, ngx_str_t *value)
 {
     size_t         k, len;
     ngx_uint_t     n;
@@ -3203,15 +3429,15 @@ ngx_http_v2_parse_method(ngx_http_request_t *r, ngx_http_v2_header_t *header)
         return NGX_DECLINED;
     }
 
-    if (header->value.len == 0) {
+    if (value->len == 0) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                       "client sent empty :method header");
 
         return NGX_DECLINED;
     }
 
-    r->method_name.len = header->value.len;
-    r->method_name.data = header->value.data;
+    r->method_name.len = value->len;
+    r->method_name.data = value->data;
 
     len = r->method_name.len;
     n = sizeof(tests) / sizeof(tests[0]);
@@ -3258,7 +3484,7 @@ ngx_http_v2_parse_method(ngx_http_request_t *r, ngx_http_v2_header_t *header)
 
 
 static ngx_int_t
-ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_str_t *value)
 {
     if (r->schema_start) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
@@ -3267,58 +3493,62 @@ ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_http_v2_header_t *header)
         return NGX_DECLINED;
     }
 
-    if (header->value.len == 0) {
+    if (value->len == 0) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                       "client sent empty :scheme header");
 
         return NGX_DECLINED;
     }
 
-    r->schema_start = header->value.data;
-    r->schema_end = header->value.data + header->value.len;
+    r->schema_start = value->data;
+    r->schema_end = value->data + value->len;
 
     return NGX_OK;
 }
 
 
 static ngx_int_t
-ngx_http_v2_parse_authority(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+ngx_http_v2_parse_authority(ngx_http_request_t *r, ngx_str_t *value)
+{
+    return ngx_http_v2_parse_header(r, &ngx_http_v2_parse_headers[0], value);
+}
+
+
+static ngx_int_t
+ngx_http_v2_parse_header(ngx_http_request_t *r,
+    ngx_http_v2_parse_header_t *header, ngx_str_t *value)
 {
     ngx_table_elt_t            *h;
-    ngx_http_header_t          *hh;
     ngx_http_core_main_conf_t  *cmcf;
 
-    static ngx_str_t host = ngx_string("host");
-
     h = ngx_list_push(&r->headers_in.headers);
     if (h == NULL) {
         return NGX_ERROR;
     }
 
-    h->hash = ngx_hash_key(host.data, host.len);
+    h->key.len = header->name.len;
+    h->key.data = header->name.data;
+    h->lowcase_key = header->name.data;
 
-    h->key.len = host.len;
-    h->key.data = host.data;
+    if (header->hh == NULL) {
+        header->hash = ngx_hash_key(header->name.data, header->name.len);
 
-    h->value.len = header->value.len;
-    h->value.data = header->value.data;
+        cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
 
-    h->lowcase_key = host.data;
-
-    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-    hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
-                       h->lowcase_key, h->key.len);
-
-    if (hh == NULL) {
-        return NGX_ERROR;
+        header->hh = ngx_hash_find(&cmcf->headers_in_hash, header->hash,
+                                   h->lowcase_key, h->key.len);
+        if (header->hh == NULL) {
+            return NGX_ERROR;
+        }
     }
 
-    if (hh->handler(r, h, hh->offset) != NGX_OK) {
-        /*
-         * request has been finalized already
-         * in ngx_http_process_host()
-         */
+    h->hash = header->hash;
+
+    h->value.len = value->len;
+    h->value.data = value->data;
+
+    if (header->hh->handler(r, h, header->hh->offset) != NGX_OK) {
+        /* header handler has already finalized request */
         return NGX_ABORT;
     }
 
@@ -3343,7 +3573,7 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r)
 
         } else if (r->schema_start == NULL) {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                          "client sent no :schema header");
+                          "client sent no :scheme header");
 
         } else {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
@@ -3468,7 +3698,8 @@ ngx_http_v2_construct_cookie_header(ngx_http_request_t *r)
         return NGX_ERROR;
     }
 
-    h->hash = ngx_hash_key(cookie.data, cookie.len);
+    h->hash = ngx_hash(ngx_hash(ngx_hash(ngx_hash(
+                                    ngx_hash('c', 'o'), 'o'), 'k'), 'i'), 'e');
 
     h->key.len = cookie.len;
     h->key.data = cookie.data;
@@ -3535,6 +3766,22 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
 }
 
 
+static void
+ngx_http_v2_run_request_handler(ngx_event_t *ev)
+{
+    ngx_connection_t    *fc;
+    ngx_http_request_t  *r;
+
+    fc = ev->data;
+    r = fc->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 run request handler");
+
+    ngx_http_v2_run_request(r);
+}
+
+
 ngx_int_t
 ngx_http_v2_read_request_body(ngx_http_request_t *r)
 {
@@ -3694,8 +3941,8 @@ ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
         } else {
             if (size > (size_t) (buf->end - buf->last)) {
                 ngx_log_error(NGX_LOG_INFO, fc->log, 0,
-                                "client intended to send body data "
-                                "larger than declared");
+                              "client intended to send body data "
+                              "larger than declared");
 
                 return NGX_HTTP_BAD_REQUEST;
             }
@@ -4006,6 +4253,7 @@ void
 ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
 {
     ngx_pool_t                *pool;
+    ngx_uint_t                 push;
     ngx_event_t               *ev;
     ngx_connection_t          *fc;
     ngx_http_v2_node_t        *node;
@@ -4014,9 +4262,10 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
     h2c = stream->connection;
     node = stream->node;
 
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 close stream %ui, queued %ui, processing %ui",
-                   node->id, stream->queued, h2c->processing);
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 close stream %ui, queued %ui, "
+                   "processing %ui, pushing %ui",
+                   node->id, stream->queued, h2c->processing, h2c->pushing);
 
     fc = stream->request->connection;
 
@@ -4072,6 +4321,8 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
         h2c->state.stream = NULL;
     }
 
+    push = stream->node->id % 2 == 0;
+
     node->stream = NULL;
 
     ngx_queue_insert_tail(&h2c->closed, &node->reuse);
@@ -4119,9 +4370,14 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
     fc->data = h2c->free_fake_connections;
     h2c->free_fake_connections = fc;
 
-    h2c->processing--;
+    if (push) {
+        h2c->pushing--;
 
-    if (h2c->processing || h2c->blocked) {
+    } else {
+        h2c->processing--;
+    }
+
+    if (h2c->processing || h2c->pushing || h2c->blocked) {
         return;
     }
 
@@ -4270,7 +4526,7 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     c->error = 1;
 
-    if (!h2c->processing) {
+    if (!h2c->processing && !h2c->pushing) {
         ngx_http_close_connection(c);
         return;
     }
@@ -4319,7 +4575,7 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     h2c->blocked = 0;
 
-    if (h2c->processing) {
+    if (h2c->processing || h2c->pushing) {
         return;
     }
 
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 42e0eb1..d89e8fe 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -24,6 +24,8 @@
 #define NGX_HTTP_V2_MAX_FIELD                                                 \
     (127 + (1 << (NGX_HTTP_V2_INT_OCTETS - 1) * 7) - 1)
 
+#define NGX_HTTP_V2_STREAM_ID_SIZE       4
+
 #define NGX_HTTP_V2_FRAME_HEADER_SIZE    9
 
 /* frame types */
@@ -49,6 +51,8 @@
 #define NGX_HTTP_V2_MAX_WINDOW           ((1U << 31) - 1)
 #define NGX_HTTP_V2_DEFAULT_WINDOW       65535
 
+#define NGX_HTTP_V2_DEFAULT_WEIGHT       16
+
 
 typedef struct ngx_http_v2_connection_s   ngx_http_v2_connection_t;
 typedef struct ngx_http_v2_node_s         ngx_http_v2_node_t;
@@ -116,6 +120,9 @@ struct ngx_http_v2_connection_s {
 
     ngx_uint_t                       processing;
 
+    ngx_uint_t                       pushing;
+    ngx_uint_t                       concurrent_pushes;
+
     size_t                           send_window;
     size_t                           recv_window;
     size_t                           init_window;
@@ -141,12 +148,14 @@ struct ngx_http_v2_connection_s {
     ngx_queue_t                      closed;
 
     ngx_uint_t                       last_sid;
+    ngx_uint_t                       last_push;
 
     unsigned                         closed_nodes:8;
     unsigned                         settings_ack:1;
     unsigned                         table_update:1;
     unsigned                         blocked:1;
     unsigned                         goaway:1;
+    unsigned                         push_disabled:1;
 };
 
 
@@ -188,8 +197,6 @@ struct ngx_http_v2_stream_s {
 
     ngx_array_t                     *cookies;
 
-    size_t                           header_limit;
-
     ngx_pool_t                      *pool;
 
     unsigned                         waiting:1;
@@ -272,11 +279,13 @@ ngx_http_v2_queue_ordered_frame(ngx_http_v2_connection_t *h2c,
 
 
 void ngx_http_v2_init(ngx_event_t *rev);
-void ngx_http_v2_request_headers_init(void);
 
 ngx_int_t ngx_http_v2_read_request_body(ngx_http_request_t *r);
 ngx_int_t ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r);
 
+ngx_http_v2_stream_t *ngx_http_v2_push_stream(ngx_http_v2_stream_t *parent,
+    ngx_str_t *path);
+
 void ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc);
 
 ngx_int_t ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c);
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 9070785..44a0ac2 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (C) Nginx, Inc.
  * Copyright (C) Valentin V. Bartenev
+ * Copyright (C) Ruslan Ermilov
  */
 
 
@@ -33,6 +34,13 @@
 #define NGX_HTTP_V2_ENCODE_RAW            0
 #define NGX_HTTP_V2_ENCODE_HUFF           0x80
 
+#define NGX_HTTP_V2_AUTHORITY_INDEX       1
+#define NGX_HTTP_V2_METHOD_GET_INDEX      2
+#define NGX_HTTP_V2_PATH_INDEX            4
+
+#define NGX_HTTP_V2_SCHEME_HTTP_INDEX     6
+#define NGX_HTTP_V2_SCHEME_HTTPS_INDEX    7
+
 #define NGX_HTTP_V2_STATUS_INDEX          8
 #define NGX_HTTP_V2_STATUS_200_INDEX      8
 #define NGX_HTTP_V2_STATUS_204_INDEX      9
@@ -42,23 +50,57 @@
 #define NGX_HTTP_V2_STATUS_404_INDEX      13
 #define NGX_HTTP_V2_STATUS_500_INDEX      14
 
+#define NGX_HTTP_V2_ACCEPT_ENCODING_INDEX 16
+#define NGX_HTTP_V2_ACCEPT_LANGUAGE_INDEX 17
 #define NGX_HTTP_V2_CONTENT_LENGTH_INDEX  28
 #define NGX_HTTP_V2_CONTENT_TYPE_INDEX    31
 #define NGX_HTTP_V2_DATE_INDEX            33
 #define NGX_HTTP_V2_LAST_MODIFIED_INDEX   44
 #define NGX_HTTP_V2_LOCATION_INDEX        46
 #define NGX_HTTP_V2_SERVER_INDEX          54
+#define NGX_HTTP_V2_USER_AGENT_INDEX      58
 #define NGX_HTTP_V2_VARY_INDEX            59
 
 #define NGX_HTTP_V2_NO_TRAILERS           (ngx_http_v2_out_frame_t *) -1
 
 
+typedef struct {
+    ngx_str_t      name;
+    u_char         index;
+    ngx_uint_t     offset;
+} ngx_http_v2_push_header_t;
+
+
+static ngx_http_v2_push_header_t  ngx_http_v2_push_headers[] = {
+    { ngx_string(":authority"), NGX_HTTP_V2_AUTHORITY_INDEX,
+      offsetof(ngx_http_headers_in_t, host) },
+
+    { ngx_string("accept-encoding"), NGX_HTTP_V2_ACCEPT_ENCODING_INDEX,
+      offsetof(ngx_http_headers_in_t, accept_encoding) },
+
+    { ngx_string("accept-language"), NGX_HTTP_V2_ACCEPT_LANGUAGE_INDEX,
+      offsetof(ngx_http_headers_in_t, accept_language) },
+
+    { ngx_string("user-agent"), NGX_HTTP_V2_USER_AGENT_INDEX,
+      offsetof(ngx_http_headers_in_t, user_agent) },
+};
+
+#define NGX_HTTP_V2_PUSH_HEADERS                                              \
+    (sizeof(ngx_http_v2_push_headers) / sizeof(ngx_http_v2_push_header_t))
+
+
+static ngx_int_t ngx_http_v2_push_resources(ngx_http_request_t *r);
+static ngx_int_t ngx_http_v2_push_resource(ngx_http_request_t *r,
+    ngx_str_t *path, ngx_str_t *binary);
+
 static u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len,
     u_char *tmp, ngx_uint_t lower);
 static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix,
     ngx_uint_t value);
 static ngx_http_v2_out_frame_t *ngx_http_v2_create_headers_frame(
     ngx_http_request_t *r, u_char *pos, u_char *end, ngx_uint_t fin);
+static ngx_http_v2_out_frame_t *ngx_http_v2_create_push_frame(
+    ngx_http_request_t *r, u_char *pos, u_char *end);
 static ngx_http_v2_out_frame_t *ngx_http_v2_create_trailers_frame(
     ngx_http_request_t *r);
 
@@ -81,6 +123,8 @@ static ngx_inline ngx_int_t ngx_http_v2_filter_send(
 
 static ngx_int_t ngx_http_v2_headers_frame_handler(
     ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
+static ngx_int_t ngx_http_v2_push_frame_handler(
+    ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
 static ngx_int_t ngx_http_v2_data_frame_handler(
     ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
 static ngx_inline void ngx_http_v2_handle_frame(
@@ -138,6 +182,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     ngx_table_elt_t           *header;
     ngx_connection_t          *fc;
     ngx_http_cleanup_t        *cln;
+    ngx_http_v2_stream_t      *stream;
     ngx_http_v2_out_frame_t   *frame;
     ngx_http_v2_connection_t  *h2c;
     ngx_http_core_loc_conf_t  *clcf;
@@ -157,7 +202,9 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
                                   ngx_http_v2_literal_size(NGINX_VER_BUILD);
     static u_char nginx_ver_build[ngx_http_v2_literal_size(NGINX_VER_BUILD)];
 
-    if (!r->stream) {
+    stream = r->stream;
+
+    if (!stream) {
         return ngx_http_next_header_filter(r);
     }
 
@@ -236,7 +283,16 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         }
     }
 
-    h2c = r->stream->connection;
+    h2c = stream->connection;
+
+    if (!h2c->push_disabled && !h2c->goaway
+        && stream->node->id % 2 == 1
+        && r->method != NGX_HTTP_HEAD)
+    {
+        if (ngx_http_v2_push_resources(r) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
 
     len = h2c->table_update ? 1 : 0;
 
@@ -633,9 +689,9 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
         return NGX_ERROR;
     }
 
-    ngx_http_v2_queue_blocked_frame(r->stream->connection, frame);
+    ngx_http_v2_queue_blocked_frame(h2c, frame);
 
-    r->stream->queued = 1;
+    stream->queued++;
 
     cln = ngx_http_cleanup_add(r, 0);
     if (cln == NULL) {
@@ -643,124 +699,415 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     }
 
     cln->handler = ngx_http_v2_filter_cleanup;
-    cln->data = r->stream;
+    cln->data = stream;
 
     fc->send_chain = ngx_http_v2_send_chain;
     fc->need_last_buf = 1;
 
-    return ngx_http_v2_filter_send(fc, r->stream);
+    return ngx_http_v2_filter_send(fc, stream);
 }
 
 
-static ngx_http_v2_out_frame_t *
-ngx_http_v2_create_trailers_frame(ngx_http_request_t *r)
+static ngx_int_t
+ngx_http_v2_push_resources(ngx_http_request_t *r)
 {
-    u_char           *pos, *start, *tmp;
-    size_t            len, tmp_len;
-    ngx_uint_t        i;
-    ngx_list_part_t  *part;
-    ngx_table_elt_t  *header;
+    u_char                     *start, *end, *last;
+    ngx_int_t                   rc;
+    ngx_str_t                   path;
+    ngx_uint_t                  i, push;
+    ngx_table_elt_t           **h;
+    ngx_http_v2_loc_conf_t     *h2lcf;
+    ngx_http_complex_value_t   *pushes;
+    ngx_str_t                   binary[NGX_HTTP_V2_PUSH_HEADERS];
 
-    len = 0;
-    tmp_len = 0;
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http2 push resources");
 
-    part = &r->headers_out.trailers.part;
-    header = part->elts;
+    ngx_memzero(binary, NGX_HTTP_V2_PUSH_HEADERS * sizeof(ngx_str_t));
 
-    for (i = 0; /* void */; i++) {
+    h2lcf = ngx_http_get_module_loc_conf(r, ngx_http_v2_module);
 
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
+    if (h2lcf->pushes) {
+        pushes = h2lcf->pushes->elts;
+
+        for (i = 0; i < h2lcf->pushes->nelts; i++) {
+
+            if (ngx_http_complex_value(r, &pushes[i], &path) != NGX_OK) {
+                return NGX_ERROR;
             }
 
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
+            if (path.len == 0) {
+                continue;
+            }
 
-        if (header[i].hash == 0) {
+            if (path.len == 3 && ngx_strncmp(path.data, "off", 3) == 0) {
+                continue;
+            }
+
+            rc = ngx_http_v2_push_resource(r, &path, binary);
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (rc == NGX_ABORT) {
+                return NGX_OK;
+            }
+
+            /* NGX_OK, NGX_DECLINED */
+        }
+    }
+
+    if (!h2lcf->push_preload) {
+        return NGX_OK;
+    }
+
+    h = r->headers_out.link.elts;
+
+    for (i = 0; i < r->headers_out.link.nelts; i++) {
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http2 parse link: \"%V\"", &h[i]->value);
+
+        start = h[i]->value.data;
+        end = h[i]->value.data + h[i]->value.len;
+
+    next_link:
+
+        while (start < end && *start == ' ') { start++; }
+
+        if (start == end || *start++ != '<') {
             continue;
         }
 
-        if (header[i].key.len > NGX_HTTP_V2_MAX_FIELD) {
-            ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
-                          "too long response trailer name: \"%V\"",
-                          &header[i].key);
-            return NULL;
+        while (start < end && *start == ' ') { start++; }
+
+        for (last = start; last < end && *last != '>'; last++) {
+            /* void */
         }
 
-        if (header[i].value.len > NGX_HTTP_V2_MAX_FIELD) {
-            ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
-                          "too long response trailer value: \"%V: %V\"",
-                          &header[i].key, &header[i].value);
-            return NULL;
+        if (last == start || last == end) {
+            continue;
         }
 
-        len += 1 + NGX_HTTP_V2_INT_OCTETS + header[i].key.len
-                 + NGX_HTTP_V2_INT_OCTETS + header[i].value.len;
+        path.len = last - start;
+        path.data = start;
 
-        if (header[i].key.len > tmp_len) {
-            tmp_len = header[i].key.len;
+        start = last + 1;
+
+        while (start < end && *start == ' ') { start++; }
+
+        if (start == end) {
+            continue;
         }
 
-        if (header[i].value.len > tmp_len) {
-            tmp_len = header[i].value.len;
+        if (*start == ',') {
+            start++;
+            goto next_link;
+        }
+
+        if (*start++ != ';') {
+            continue;
+        }
+
+        last = ngx_strlchr(start, end, ',');
+
+        if (last == NULL) {
+            last = end;
+        }
+
+        push = 0;
+
+        for ( ;; ) {
+
+            while (start < last && *start == ' ') { start++; }
+
+            if (last - start >= 6
+                && ngx_strncasecmp(start, (u_char *) "nopush", 6) == 0)
+            {
+                start += 6;
+
+                if (start == last || *start == ' ' || *start == ';') {
+                    push = 0;
+                    break;
+                }
+
+                goto next_param;
+            }
+
+            if (last - start >= 11
+                && ngx_strncasecmp(start, (u_char *) "rel=preload", 11) == 0)
+            {
+                start += 11;
+
+                if (start == last || *start == ' ' || *start == ';') {
+                    push = 1;
+                }
+
+                goto next_param;
+            }
+
+            if (last - start >= 4
+                && ngx_strncasecmp(start, (u_char *) "rel=", 4) == 0)
+            {
+                start += 4;
+
+                while (start < last && *start == ' ') { start++; }
+
+                if (start == last || *start++ != '"') {
+                    goto next_param;
+                }
+
+                for ( ;; ) {
+
+                    while (start < last && *start == ' ') { start++; }
+
+                    if (last - start >= 7
+                        && ngx_strncasecmp(start, (u_char *) "preload", 7) == 0)
+                    {
+                        start += 7;
+
+                        if (start < last && (*start == ' ' || *start == '"')) {
+                            push = 1;
+                            break;
+                        }
+                    }
+
+                    while (start < last && *start != ' ' && *start != '"') {
+                        start++;
+                    }
+
+                    if (start == last) {
+                        break;
+                    }
+
+                    if (*start == '"') {
+                        break;
+                    }
+
+                    start++;
+                }
+            }
+
+        next_param:
+
+            start = ngx_strlchr(start, last, ';');
+
+            if (start == NULL) {
+                break;
+            }
+
+            start++;
+        }
+
+        if (push) {
+            while (path.len && path.data[path.len - 1] == ' ') {
+                path.len--;
+            }
+        }
+
+        if (push && path.len
+            && !(path.len > 1 && path.data[0] == '/' && path.data[1] == '/'))
+        {
+            rc = ngx_http_v2_push_resource(r, &path, binary);
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (rc == NGX_ABORT) {
+                return NGX_OK;
+            }
+
+            /* NGX_OK, NGX_DECLINED */
+        }
+
+        if (last < end) {
+            start = last + 1;
+            goto next_link;
         }
     }
 
-    if (len == 0) {
-        return NGX_HTTP_V2_NO_TRAILERS;
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v2_push_resource(ngx_http_request_t *r, ngx_str_t *path,
+    ngx_str_t *binary)
+{
+    u_char                      *start, *pos, *tmp;
+    size_t                       len;
+    ngx_str_t                   *value;
+    ngx_uint_t                   i;
+    ngx_table_elt_t            **h;
+    ngx_connection_t            *fc;
+    ngx_http_v2_stream_t        *stream;
+    ngx_http_v2_out_frame_t     *frame;
+    ngx_http_v2_connection_t    *h2c;
+    ngx_http_v2_push_header_t   *ph;
+
+    fc = r->connection;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0, "http2 push resource");
+
+    stream = r->stream;
+    h2c = stream->connection;
+
+    if (!ngx_path_separator(path->data[0])) {
+        ngx_log_error(NGX_LOG_WARN, fc->log, 0,
+                      "non-absolute path \"%V\" not pushed", path);
+        return NGX_DECLINED;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 pushing:%ui limit:%ui",
+                   h2c->pushing, h2c->concurrent_pushes);
+
+    if (h2c->pushing >= h2c->concurrent_pushes) {
+        return NGX_ABORT;
+    }
+
+    if (h2c->last_push == 0x7ffffffe) {
+        return NGX_ABORT;
+    }
+
+    if (path->len > NGX_HTTP_V2_MAX_FIELD) {
+        return NGX_DECLINED;
+    }
+
+    if (r->headers_in.host == NULL) {
+        return NGX_ABORT;
+    }
+
+    ph = ngx_http_v2_push_headers;
+
+    if (binary[0].len) {
+        tmp = ngx_palloc(r->pool, path->len);
+        if (tmp == NULL) {
+            return NGX_ERROR;
+        }
+
+    } else {
+        len = path->len;
+
+        for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
+            h = (ngx_table_elt_t **) ((char *) &r->headers_in + ph[i].offset);
+
+            if (*h) {
+                len = ngx_max(len, (*h)->value.len);
+            }
+        }
+
+        tmp = ngx_palloc(r->pool, len);
+        if (tmp == NULL) {
+            return NGX_ERROR;
+        }
+
+        for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
+            h = (ngx_table_elt_t **) ((char *) &r->headers_in + ph[i].offset);
+
+            if (*h == NULL) {
+                continue;
+            }
+
+            value = &(*h)->value;
+
+            len = 1 + NGX_HTTP_V2_INT_OCTETS + value->len;
+
+            pos = ngx_pnalloc(r->pool, len);
+            if (pos == NULL) {
+                return NGX_ERROR;
+            }
+
+            binary[i].data = pos;
+
+            *pos++ = ngx_http_v2_inc_indexed(ph[i].index);
+            pos = ngx_http_v2_write_value(pos, value->data, value->len, tmp);
+
+            binary[i].len = pos - binary[i].data;
+        }
+    }
+
+    len = (h2c->table_update ? 1 : 0)
+          + 1
+          + 1 + NGX_HTTP_V2_INT_OCTETS + path->len
+          + 1;
+
+    for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
+        len += binary[i].len;
     }
 
-    tmp = ngx_palloc(r->pool, tmp_len);
     pos = ngx_pnalloc(r->pool, len);
-
-    if (pos == NULL || tmp == NULL) {
-        return NULL;
+    if (pos == NULL) {
+        return NGX_ERROR;
     }
 
     start = pos;
 
-    part = &r->headers_out.trailers.part;
-    header = part->elts;
+    if (h2c->table_update) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 table size update: 0");
+        *pos++ = (1 << 5) | 0;
+        h2c->table_update = 0;
+    }
 
-    for (i = 0; /* void */; i++) {
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 push header: \":method: GET\"");
 
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
+    *pos++ = ngx_http_v2_indexed(NGX_HTTP_V2_METHOD_GET_INDEX);
 
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 push header: \":path: %V\"", path);
 
-        if (header[i].hash == 0) {
+    *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_PATH_INDEX);
+    pos = ngx_http_v2_write_value(pos, path->data, path->len, tmp);
+
+#if (NGX_HTTP_SSL)
+    if (fc->ssl) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 push header: \":scheme: https\"");
+        *pos++ = ngx_http_v2_indexed(NGX_HTTP_V2_SCHEME_HTTPS_INDEX);
+
+    } else
+#endif
+    {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 push header: \":scheme: http\"");
+        *pos++ = ngx_http_v2_indexed(NGX_HTTP_V2_SCHEME_HTTP_INDEX);
+    }
+
+    for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
+        h = (ngx_table_elt_t **) ((char *) &r->headers_in + ph[i].offset);
+
+        if (*h == NULL) {
             continue;
         }
 
-#if (NGX_DEBUG)
-        if (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP) {
-            ngx_strlow(tmp, header[i].key.data, header[i].key.len);
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 push header: \"%V: %V\"",
+                       &ph[i].name, &(*h)->value);
 
-            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http2 output trailer: \"%*s: %V\"",
-                           header[i].key.len, tmp, &header[i].value);
-        }
-#endif
-
-        *pos++ = 0;
-
-        pos = ngx_http_v2_write_name(pos, header[i].key.data,
-                                     header[i].key.len, tmp);
-
-        pos = ngx_http_v2_write_value(pos, header[i].value.data,
-                                      header[i].value.len, tmp);
+        pos = ngx_cpymem(pos, binary[i].data, binary[i].len);
     }
 
-    return ngx_http_v2_create_headers_frame(r, start, pos, 1);
+    frame = ngx_http_v2_create_push_frame(r, start, pos);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_http_v2_queue_blocked_frame(h2c, frame);
+
+    stream->queued++;
+
+    stream = ngx_http_v2_push_stream(stream, path);
+
+    if (stream) {
+        stream->request->request_length = pos - start;
+        return NGX_OK;
+    }
+
+    return NGX_ERROR;
 }
 
 
@@ -917,6 +1264,239 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
 }
 
 
+static ngx_http_v2_out_frame_t *
+ngx_http_v2_create_push_frame(ngx_http_request_t *r, u_char *pos, u_char *end)
+{
+    u_char                     type, flags;
+    size_t                     rest, frame_size, len;
+    ngx_buf_t                 *b;
+    ngx_chain_t               *cl, **ll;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_out_frame_t   *frame;
+    ngx_http_v2_connection_t  *h2c;
+
+    stream = r->stream;
+    h2c = stream->connection;
+    rest = NGX_HTTP_V2_STREAM_ID_SIZE + (end - pos);
+
+    frame = ngx_palloc(r->pool, sizeof(ngx_http_v2_out_frame_t));
+    if (frame == NULL) {
+        return NULL;
+    }
+
+    frame->handler = ngx_http_v2_push_frame_handler;
+    frame->stream = stream;
+    frame->length = rest;
+    frame->blocked = 1;
+    frame->fin = 0;
+
+    ll = &frame->first;
+
+    type = NGX_HTTP_V2_PUSH_PROMISE_FRAME;
+    flags = NGX_HTTP_V2_NO_FLAG;
+    frame_size = h2c->frame_size;
+
+    for ( ;; ) {
+        if (rest <= frame_size) {
+            frame_size = rest;
+            flags |= NGX_HTTP_V2_END_HEADERS_FLAG;
+        }
+
+        b = ngx_create_temp_buf(r->pool,
+                                NGX_HTTP_V2_FRAME_HEADER_SIZE
+                                + ((type == NGX_HTTP_V2_PUSH_PROMISE_FRAME)
+                                   ? NGX_HTTP_V2_STREAM_ID_SIZE : 0));
+        if (b == NULL) {
+            return NULL;
+        }
+
+        b->last = ngx_http_v2_write_len_and_type(b->last, frame_size, type);
+        *b->last++ = flags;
+        b->last = ngx_http_v2_write_sid(b->last, stream->node->id);
+
+        b->tag = (ngx_buf_tag_t) &ngx_http_v2_module;
+
+        if (type == NGX_HTTP_V2_PUSH_PROMISE_FRAME) {
+            h2c->last_push += 2;
+
+            b->last = ngx_http_v2_write_sid(b->last, h2c->last_push);
+            len = frame_size - NGX_HTTP_V2_STREAM_ID_SIZE;
+
+        } else {
+            len = frame_size;
+        }
+
+        cl = ngx_alloc_chain_link(r->pool);
+        if (cl == NULL) {
+            return NULL;
+        }
+
+        cl->buf = b;
+
+        *ll = cl;
+        ll = &cl->next;
+
+        b = ngx_calloc_buf(r->pool);
+        if (b == NULL) {
+            return NULL;
+        }
+
+        b->pos = pos;
+
+        pos += len;
+
+        b->last = pos;
+        b->start = b->pos;
+        b->end = b->last;
+        b->temporary = 1;
+
+        cl = ngx_alloc_chain_link(r->pool);
+        if (cl == NULL) {
+            return NULL;
+        }
+
+        cl->buf = b;
+
+        *ll = cl;
+        ll = &cl->next;
+
+        rest -= frame_size;
+
+        if (rest) {
+            frame->length += NGX_HTTP_V2_FRAME_HEADER_SIZE;
+
+            type = NGX_HTTP_V2_CONTINUATION_FRAME;
+            continue;
+        }
+
+        cl->next = NULL;
+        frame->last = cl;
+
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http2:%ui create PUSH_PROMISE frame %p: "
+                       "sid:%ui len:%uz",
+                       stream->node->id, frame, h2c->last_push,
+                       frame->length);
+
+        return frame;
+    }
+}
+
+
+static ngx_http_v2_out_frame_t *
+ngx_http_v2_create_trailers_frame(ngx_http_request_t *r)
+{
+    u_char            *pos, *start, *tmp;
+    size_t             len, tmp_len;
+    ngx_uint_t         i;
+    ngx_list_part_t   *part;
+    ngx_table_elt_t   *header;
+    ngx_connection_t  *fc;
+
+    fc = r->connection;
+    len = 0;
+    tmp_len = 0;
+
+    part = &r->headers_out.trailers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        if (header[i].key.len > NGX_HTTP_V2_MAX_FIELD) {
+            ngx_log_error(NGX_LOG_CRIT, fc->log, 0,
+                          "too long response trailer name: \"%V\"",
+                          &header[i].key);
+            return NULL;
+        }
+
+        if (header[i].value.len > NGX_HTTP_V2_MAX_FIELD) {
+            ngx_log_error(NGX_LOG_CRIT, fc->log, 0,
+                          "too long response trailer value: \"%V: %V\"",
+                          &header[i].key, &header[i].value);
+            return NULL;
+        }
+
+        len += 1 + NGX_HTTP_V2_INT_OCTETS + header[i].key.len
+                 + NGX_HTTP_V2_INT_OCTETS + header[i].value.len;
+
+        if (header[i].key.len > tmp_len) {
+            tmp_len = header[i].key.len;
+        }
+
+        if (header[i].value.len > tmp_len) {
+            tmp_len = header[i].value.len;
+        }
+    }
+
+    if (len == 0) {
+        return NGX_HTTP_V2_NO_TRAILERS;
+    }
+
+    tmp = ngx_palloc(r->pool, tmp_len);
+    pos = ngx_pnalloc(r->pool, len);
+
+    if (pos == NULL || tmp == NULL) {
+        return NULL;
+    }
+
+    start = pos;
+
+    part = &r->headers_out.trailers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+#if (NGX_DEBUG)
+        if (fc->log->log_level & NGX_LOG_DEBUG_HTTP) {
+            ngx_strlow(tmp, header[i].key.data, header[i].key.len);
+
+            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                           "http2 output trailer: \"%*s: %V\"",
+                           header[i].key.len, tmp, &header[i].value);
+        }
+#endif
+
+        *pos++ = 0;
+
+        pos = ngx_http_v2_write_name(pos, header[i].key.data,
+                                     header[i].key.len, tmp);
+
+        pos = ngx_http_v2_write_value(pos, header[i].value.data,
+                                      header[i].value.len, tmp);
+    }
+
+    return ngx_http_v2_create_headers_frame(r, start, pos, 1);
+}
+
+
 static ngx_chain_t *
 ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
 {
@@ -1239,31 +1819,6 @@ ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
 }
 
 
-static ngx_inline ngx_int_t
-ngx_http_v2_filter_send(ngx_connection_t *fc, ngx_http_v2_stream_t *stream)
-{
-    stream->blocked = 1;
-
-    if (ngx_http_v2_send_output_queue(stream->connection) == NGX_ERROR) {
-        fc->error = 1;
-        return NGX_ERROR;
-    }
-
-    stream->blocked = 0;
-
-    if (stream->queued) {
-        fc->buffered |= NGX_HTTP_V2_BUFFERED;
-        fc->write->active = 1;
-        fc->write->ready = 0;
-        return NGX_AGAIN;
-    }
-
-    fc->buffered &= ~NGX_HTTP_V2_BUFFERED;
-
-    return NGX_OK;
-}
-
-
 static ngx_inline ngx_int_t
 ngx_http_v2_flow_control(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream)
@@ -1317,6 +1872,30 @@ ngx_http_v2_waiting_queue(ngx_http_v2_connection_t *h2c,
 }
 
 
+static ngx_inline ngx_int_t
+ngx_http_v2_filter_send(ngx_connection_t *fc, ngx_http_v2_stream_t *stream)
+{
+    stream->blocked = 1;
+
+    if (ngx_http_v2_send_output_queue(stream->connection) == NGX_ERROR) {
+        fc->error = 1;
+        return NGX_ERROR;
+    }
+
+    stream->blocked = 0;
+
+    if (stream->queued) {
+        fc->buffered |= NGX_HTTP_V2_BUFFERED;
+        fc->write->active = 1;
+        fc->write->ready = 0;
+        return NGX_AGAIN;
+    }
+
+    fc->buffered &= ~NGX_HTTP_V2_BUFFERED;
+
+    return NGX_OK;
+}
+
 
 static ngx_int_t
 ngx_http_v2_headers_frame_handler(ngx_http_v2_connection_t *h2c,
@@ -1372,6 +1951,60 @@ ngx_http_v2_headers_frame_handler(ngx_http_v2_connection_t *h2c,
 }
 
 
+static ngx_int_t
+ngx_http_v2_push_frame_handler(ngx_http_v2_connection_t *h2c,
+    ngx_http_v2_out_frame_t *frame)
+{
+    ngx_chain_t           *cl, *ln;
+    ngx_http_v2_stream_t  *stream;
+
+    stream = frame->stream;
+    cl = frame->first;
+
+    for ( ;; ) {
+        if (cl->buf->pos != cl->buf->last) {
+            frame->first = cl;
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                           "http2:%ui PUSH_PROMISE frame %p was sent partially",
+                           stream->node->id, frame);
+
+            return NGX_AGAIN;
+        }
+
+        ln = cl->next;
+
+        if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_module) {
+            cl->next = stream->free_frame_headers;
+            stream->free_frame_headers = cl;
+
+        } else {
+            cl->next = stream->free_bufs;
+            stream->free_bufs = cl;
+        }
+
+        if (cl == frame->last) {
+            break;
+        }
+
+        cl = ln;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2:%ui PUSH_PROMISE frame %p was sent",
+                   stream->node->id, frame);
+
+    stream->request->header_size += NGX_HTTP_V2_FRAME_HEADER_SIZE
+                                    + frame->length;
+
+    ngx_http_v2_handle_frame(stream, frame);
+
+    ngx_http_v2_handle_stream(h2c, stream);
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_v2_data_frame_handler(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_out_frame_t *frame)
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
index 7f7dab2..c54dc10 100644
--- a/src/http/v2/ngx_http_v2_module.c
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -27,6 +27,8 @@ static void *ngx_http_v2_create_loc_conf(ngx_conf_t *cf);
 static char *ngx_http_v2_merge_loc_conf(ngx_conf_t *cf, void *parent,
     void *child);
 
+static char *ngx_http_v2_push(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
 static char *ngx_http_v2_recv_buffer_size(ngx_conf_t *cf, void *post,
     void *data);
 static char *ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data);
@@ -73,6 +75,13 @@ static ngx_command_t  ngx_http_v2_commands[] = {
       offsetof(ngx_http_v2_srv_conf_t, concurrent_streams),
       NULL },
 
+    { ngx_string("http2_max_concurrent_pushes"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, concurrent_pushes),
+      NULL },
+
     { ngx_string("http2_max_requests"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -129,6 +138,20 @@ static ngx_command_t  ngx_http_v2_commands[] = {
       offsetof(ngx_http_v2_loc_conf_t, chunk_size),
       &ngx_http_v2_chunk_size_post },
 
+    { ngx_string("http2_push_preload"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_v2_loc_conf_t, push_preload),
+      NULL },
+
+    { ngx_string("http2_push"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_v2_push,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
     { ngx_string("spdy_recv_buffer_size"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_http_v2_spdy_deprecated,
@@ -329,6 +352,7 @@ ngx_http_v2_create_srv_conf(ngx_conf_t *cf)
     h2scf->pool_size = NGX_CONF_UNSET_SIZE;
 
     h2scf->concurrent_streams = NGX_CONF_UNSET_UINT;
+    h2scf->concurrent_pushes = NGX_CONF_UNSET_UINT;
     h2scf->max_requests = NGX_CONF_UNSET_UINT;
 
     h2scf->max_field_size = NGX_CONF_UNSET_SIZE;
@@ -355,6 +379,8 @@ ngx_http_v2_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_uint_value(conf->concurrent_streams,
                               prev->concurrent_streams, 128);
+    ngx_conf_merge_uint_value(conf->concurrent_pushes,
+                              prev->concurrent_pushes, 10);
     ngx_conf_merge_uint_value(conf->max_requests, prev->max_requests, 1000);
 
     ngx_conf_merge_size_value(conf->max_field_size, prev->max_field_size,
@@ -386,8 +412,17 @@ ngx_http_v2_create_loc_conf(ngx_conf_t *cf)
         return NULL;
     }
 
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     h2lcf->pushes = NULL;
+     */
+
     h2lcf->chunk_size = NGX_CONF_UNSET_SIZE;
 
+    h2lcf->push_preload = NGX_CONF_UNSET;
+    h2lcf->push = NGX_CONF_UNSET;
+
     return h2lcf;
 }
 
@@ -400,6 +435,72 @@ ngx_http_v2_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_size_value(conf->chunk_size, prev->chunk_size, 8 * 1024);
 
+    ngx_conf_merge_value(conf->push, prev->push, 1);
+
+    if (conf->push && conf->pushes == NULL) {
+        conf->pushes = prev->pushes;
+    }
+
+    ngx_conf_merge_value(conf->push_preload, prev->push_preload, 0);
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_v2_push(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_v2_loc_conf_t *h2lcf = conf;
+
+    ngx_str_t                         *value;
+    ngx_http_complex_value_t          *cv;
+    ngx_http_compile_complex_value_t   ccv;
+
+    value = cf->args->elts;
+
+    if (ngx_strcmp(value[1].data, "off") == 0) {
+
+        if (h2lcf->pushes) {
+            return "\"off\" parameter cannot be used with URI";
+        }
+
+        if (h2lcf->push == 0) {
+            return "is duplicate";
+        }
+
+        h2lcf->push = 0;
+        return NGX_CONF_OK;
+    }
+
+    if (h2lcf->push == 0) {
+        return "URI cannot be used with \"off\" parameter";
+    }
+
+    h2lcf->push = 1;
+
+    if (h2lcf->pushes == NULL) {
+        h2lcf->pushes = ngx_array_create(cf->pool, 1,
+                                         sizeof(ngx_http_complex_value_t));
+        if (h2lcf->pushes == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    cv = ngx_array_push(h2lcf->pushes);
+    if (cv == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = cv;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     return NGX_CONF_OK;
 }
 
diff --git a/src/http/v2/ngx_http_v2_module.h b/src/http/v2/ngx_http_v2_module.h
index 540f826..cdd2921 100644
--- a/src/http/v2/ngx_http_v2_module.h
+++ b/src/http/v2/ngx_http_v2_module.h
@@ -23,6 +23,7 @@ typedef struct {
 typedef struct {
     size_t                          pool_size;
     ngx_uint_t                      concurrent_streams;
+    ngx_uint_t                      concurrent_pushes;
     ngx_uint_t                      max_requests;
     size_t                          max_field_size;
     size_t                          max_header_size;
@@ -35,6 +36,11 @@ typedef struct {
 
 typedef struct {
     size_t                          chunk_size;
+
+    ngx_flag_t                      push_preload;
+
+    ngx_flag_t                      push;
+    ngx_array_t                    *pushes;
 } ngx_http_v2_loc_conf_t;
 
 
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index f6b26ed..bc3e6b9 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -302,7 +302,7 @@ ngx_mail_verify_cert(ngx_mail_session_t *s, ngx_connection_t *c)
                       "client SSL certificate verify error: (%l:%s)",
                       rc, X509_verify_cert_error_string(rc));
 
-        ngx_ssl_remove_cached_session(sslcf->ssl.ctx,
+        ngx_ssl_remove_cached_session(c->ssl->session_ctx,
                                       (SSL_get0_session(c->ssl->connection)));
 
         cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
@@ -323,7 +323,7 @@ ngx_mail_verify_cert(ngx_mail_session_t *s, ngx_connection_t *c)
             ngx_log_error(NGX_LOG_INFO, c->log, 0,
                           "client sent no required SSL certificate");
 
-            ngx_ssl_remove_cached_session(sslcf->ssl.ctx,
+            ngx_ssl_remove_cached_session(c->ssl->session_ctx,
                                        (SSL_get0_session(c->ssl->connection)));
 
             cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 1e9973f..3e5a1f2 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -328,7 +328,7 @@ ngx_stream_ssl_handler(ngx_stream_session_t *s)
                           "client SSL certificate verify error: (%l:%s)",
                           rc, X509_verify_cert_error_string(rc));
 
-            ngx_ssl_remove_cached_session(sslcf->ssl.ctx,
+            ngx_ssl_remove_cached_session(c->ssl->session_ctx,
                                        (SSL_get0_session(c->ssl->connection)));
             return NGX_ERROR;
         }
@@ -340,7 +340,7 @@ ngx_stream_ssl_handler(ngx_stream_session_t *s)
                 ngx_log_error(NGX_LOG_INFO, c->log, 0,
                               "client sent no required SSL certificate");
 
-                ngx_ssl_remove_cached_session(sslcf->ssl.ctx,
+                ngx_ssl_remove_cached_session(c->ssl->session_ctx,
                                        (SSL_get0_session(c->ssl->connection)));
                 return NGX_ERROR;
             }

From 5b9f0b4827dc4dcc8282f29618c8aa4deb32c910 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 21 Feb 2018 10:39:13 +0200
Subject: [PATCH 244/600] Move packaging repository to salsa.debian.org

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 367d413..b4f0f29 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,8 @@ Build-Depends: debhelper (>= 10),
                zlib1g-dev
 Standards-Version: 4.1.2
 Homepage: http://nginx.net
-Vcs-Git: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nginx/nginx.git
+Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/nginx
 
 Package: nginx
 Architecture: all

From d26992910e3bd610b58fb43aa210bba45285a676 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 21 Feb 2018 10:41:05 +0200
Subject: [PATCH 245/600] Bump Standards-Version to 4.1.3, no changes needed

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index b4f0f29..bfb3a26 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 10),
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Homepage: http://nginx.net
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx

From bcf5fd16c3c523e0c44fcdc1e87094cc47d548d6 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 21 Feb 2018 11:25:00 +0200
Subject: [PATCH 246/600] Release 1.13.9-1

---
 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 321232e..af8b04d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nginx (1.13.9-1) unstable; urgency=medium
+
+  [ Michael Lustfield ]
+  * Remove non-uploading users
+
+  [ Christos Trochalakis ]
+  * New upstream version 1.13.9
+  * Move packaging repository to salsa.debian.org
+  * Bump Standards-Version to 4.1.3, no changes needed
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 21 Feb 2018 11:24:53 +0200
+
 nginx (1.13.8-1) unstable; urgency=medium
 
   * New upstream release.

From 55e1981acb6779bfb6f4e3ea2baf94b498c00a86 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 21 Mar 2018 16:14:30 +0200
Subject: [PATCH 247/600] New upstream version 1.13.10

---
 CHANGES                                       |   25 +
 CHANGES.ru                                    |   26 +
 auto/modules                                  |   12 +
 auto/options                                  |    3 +
 auto/unix                                     |   24 +
 contrib/vim/syntax/nginx.vim                  |   58 +-
 src/core/nginx.h                              |    4 +-
 src/core/ngx_times.c                          |   30 +-
 src/event/ngx_event_connect.c                 |    9 +
 src/http/modules/ngx_http_auth_basic_module.c |    4 +-
 src/http/modules/ngx_http_fastcgi_module.c    |   32 -
 src/http/modules/ngx_http_geo_module.c        |   33 +-
 src/http/modules/ngx_http_grpc_module.c       | 4640 +++++++++++++++++
 src/http/modules/ngx_http_log_module.c        |   68 +-
 src/http/modules/ngx_http_memcached_module.c  |    2 -
 src/http/modules/ngx_http_proxy_module.c      |   34 +-
 src/http/modules/ngx_http_ssi_filter_module.c |    8 +-
 src/http/ngx_http_core_module.c               |   21 +
 src/http/ngx_http_core_module.h               |    2 +
 src/http/ngx_http_postpone_filter_module.c    |   78 +
 src/http/ngx_http_request.c                   |    4 +
 src/http/ngx_http_request.h                   |    1 +
 src/http/ngx_http_upstream.c                  |  211 +-
 src/http/ngx_http_upstream.h                  |    5 +
 src/http/ngx_http_variables.c                 |    8 +-
 src/http/v2/ngx_http_v2.c                     |   34 +-
 src/http/v2/ngx_http_v2.h                     |   53 +
 src/http/v2/ngx_http_v2_encode.c              |   62 +
 src/http/v2/ngx_http_v2_filter_module.c       |  104 +-
 src/http/v2/ngx_http_v2_table.c               |   14 +
 src/os/unix/ngx_freebsd_sendfile_chain.c      |    2 +-
 src/os/unix/ngx_linux_sendfile_chain.c        |    2 +-
 src/stream/ngx_stream_geo_module.c            |   55 +-
 src/stream/ngx_stream_log_module.c            |   69 +-
 src/stream/ngx_stream_ssl_preread_module.c    |  134 +-
 src/stream/ngx_stream_variables.c             |    8 +-
 36 files changed, 5497 insertions(+), 382 deletions(-)
 create mode 100644 src/http/modules/ngx_http_grpc_module.c
 create mode 100644 src/http/v2/ngx_http_v2_encode.c

diff --git a/CHANGES b/CHANGES
index b5e7096..c8e83eb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,29 @@
 
+Changes with nginx 1.13.10                                       20 Mar 2018
+
+    *) Feature: the "set" parameter of the "include" SSI directive now
+       allows writing arbitrary responses to a variable; the
+       "subrequest_output_buffer_size" directive defines maximum response
+       size.
+
+    *) Feature: now nginx uses clock_gettime(CLOCK_MONOTONIC) if available,
+       to avoid timeouts being incorrectly triggered on system time changes.
+
+    *) Feature: the "escape=none" parameter of the "log_format" directive.
+       Thanks to Johannes Baiter and Calin Don.
+
+    *) Feature: the $ssl_preread_alpn_protocols variable in the
+       ngx_stream_ssl_preread_module.
+
+    *) Feature: the ngx_http_grpc_module.
+
+    *) Bugfix: in memory allocation error handling in the "geo" directive.
+
+    *) Bugfix: when using variables in the "auth_basic_user_file" directive
+       a null character might appear in logs.
+       Thanks to Vadim Filimonov.
+
+
 Changes with nginx 1.13.9                                        20 Feb 2018
 
     *) Feature: HTTP/2 server push support; the "http2_push" and
diff --git a/CHANGES.ru b/CHANGES.ru
index 75c9080..cd59962 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,30 @@
 
+Изменения в nginx 1.13.10                                         20.03.2018
+
+    *) Добавление: теперь параметр set в SSI-директиве include позволяет
+       сохранять в переменную любые ответы; максимальный размер ответа
+       задаётся директивой subrequest_output_buffer_size.
+
+    *) Добавление: теперь nginx использует вызов
+       clock_gettime(CLOCK_MONOTONIC), если он доступен, что позволяет
+       избежать некорректного срабатывания таймаутов при изменениях
+       системного времени.
+
+    *) Добавление: параметр "escape=none" директивы log_format.
+       Спасибо Johannes Baiter и Calin Don.
+
+    *) Добавление: переменная $ssl_preread_alpn_protocols в модуле
+       ngx_stream_ssl_preread_module.
+
+    *) Добавление: модуль ngx_http_grpc_module.
+
+    *) Исправление: в обработке ошибок выделения памяти в директиве geo.
+
+    *) Исправление: при использовании переменных в директиве
+       auth_basic_user_file в лог мог выводиться символ '\0'.
+       Спасибо Вадиму Филимонову.
+
+
 Изменения в nginx 1.13.9                                          20.02.2018
 
     *) Добавление: поддержка HTTP/2 server push; директивы http2_push и
diff --git a/auto/modules b/auto/modules
index b9fa3bb..73a9bae 100644
--- a/auto/modules
+++ b/auto/modules
@@ -428,6 +428,7 @@ if [ $HTTP = YES ]; then
                          src/http/v2/ngx_http_v2_module.h"
         ngx_module_srcs="src/http/v2/ngx_http_v2.c \
                          src/http/v2/ngx_http_v2_table.c \
+                         src/http/v2/ngx_http_v2_encode.c \
                          src/http/v2/ngx_http_v2_huff_decode.c \
                          src/http/v2/ngx_http_v2_huff_encode.c \
                          src/http/v2/ngx_http_v2_module.c"
@@ -743,6 +744,17 @@ if [ $HTTP = YES ]; then
         . auto/module
     fi
 
+    if [ $HTTP_GRPC = YES -a $HTTP_V2 = YES ]; then
+        ngx_module_name=ngx_http_grpc_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_grpc_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_GRPC
+
+        . auto/module
+    fi
+
     if [ $HTTP_PERL != NO ]; then
         ngx_module_name=ngx_http_perl_module
         ngx_module_incs=src/http/modules/perl
diff --git a/auto/options b/auto/options
index 24c2618..59f0449 100644
--- a/auto/options
+++ b/auto/options
@@ -86,6 +86,7 @@ HTTP_PROXY=YES
 HTTP_FASTCGI=YES
 HTTP_UWSGI=YES
 HTTP_SCGI=YES
+HTTP_GRPC=YES
 HTTP_PERL=NO
 HTTP_MEMCACHED=YES
 HTTP_LIMIT_CONN=YES
@@ -262,6 +263,7 @@ $0: warning: the \"--with-ipv6\" option is deprecated"
         --without-http_fastcgi_module)   HTTP_FASTCGI=NO            ;;
         --without-http_uwsgi_module)     HTTP_UWSGI=NO              ;;
         --without-http_scgi_module)      HTTP_SCGI=NO               ;;
+        --without-http_grpc_module)      HTTP_GRPC=NO               ;;
         --without-http_memcached_module) HTTP_MEMCACHED=NO          ;;
         --without-http_limit_conn_module) HTTP_LIMIT_CONN=NO        ;;
         --without-http_limit_req_module) HTTP_LIMIT_REQ=NO         ;;
@@ -471,6 +473,7 @@ cat << END
   --without-http_fastcgi_module      disable ngx_http_fastcgi_module
   --without-http_uwsgi_module        disable ngx_http_uwsgi_module
   --without-http_scgi_module         disable ngx_http_scgi_module
+  --without-http_grpc_module         disable ngx_http_grpc_module
   --without-http_memcached_module    disable ngx_http_memcached_module
   --without-http_limit_conn_module   disable ngx_http_limit_conn_module
   --without-http_limit_req_module    disable ngx_http_limit_req_module
diff --git a/auto/unix b/auto/unix
index 3be8b27..90b5894 100644
--- a/auto/unix
+++ b/auto/unix
@@ -791,6 +791,30 @@ ngx_feature_test="struct tm t; time_t c=0; localtime_r(&c, &t)"
 . auto/feature
 
 
+ngx_feature="clock_gettime(CLOCK_MONOTONIC)"
+ngx_feature_name="NGX_HAVE_CLOCK_MONOTONIC"
+ngx_feature_run=no
+ngx_feature_incs="#include <time.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts)"
+. auto/feature
+
+
+if [ $ngx_found = no ]; then
+
+    # Linux before glibc 2.17, notably CentOS 6
+
+    ngx_feature="clock_gettime(CLOCK_MONOTONIC) in librt"
+    ngx_feature_libs="-lrt"
+    . auto/feature
+
+    if [ $ngx_found = yes ]; then
+        CORE_LIBS="$CORE_LIBS -lrt"
+    fi
+fi
+
+
 ngx_feature="posix_memalign()"
 ngx_feature_name="NGX_HAVE_POSIX_MEMALIGN"
 ngx_feature_run=no
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 0a21372..075b19a 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -241,6 +241,32 @@ syn keyword ngxDirective contained geoip_org
 syn keyword ngxDirective contained geoip_proxy
 syn keyword ngxDirective contained geoip_proxy_recursive
 syn keyword ngxDirective contained google_perftools_profiles
+syn keyword ngxDirective contained grpc_bind
+syn keyword ngxDirective contained grpc_buffer_size
+syn keyword ngxDirective contained grpc_connect_timeout
+syn keyword ngxDirective contained grpc_hide_header
+syn keyword ngxDirective contained grpc_ignore_headers
+syn keyword ngxDirective contained grpc_intercept_errors
+syn keyword ngxDirective contained grpc_next_upstream
+syn keyword ngxDirective contained grpc_next_upstream_timeout
+syn keyword ngxDirective contained grpc_next_upstream_tries
+syn keyword ngxDirective contained grpc_pass
+syn keyword ngxDirective contained grpc_pass_header
+syn keyword ngxDirective contained grpc_read_timeout
+syn keyword ngxDirective contained grpc_send_timeout
+syn keyword ngxDirective contained grpc_set_header
+syn keyword ngxDirective contained grpc_ssl_certificate
+syn keyword ngxDirective contained grpc_ssl_certificate_key
+syn keyword ngxDirective contained grpc_ssl_ciphers
+syn keyword ngxDirective contained grpc_ssl_crl
+syn keyword ngxDirective contained grpc_ssl_name
+syn keyword ngxDirective contained grpc_ssl_password_file
+syn keyword ngxDirective contained grpc_ssl_protocols
+syn keyword ngxDirective contained grpc_ssl_server_name
+syn keyword ngxDirective contained grpc_ssl_session_reuse
+syn keyword ngxDirective contained grpc_ssl_trusted_certificate
+syn keyword ngxDirective contained grpc_ssl_verify
+syn keyword ngxDirective contained grpc_ssl_verify_depth
 syn keyword ngxDirective contained gunzip
 syn keyword ngxDirective contained gunzip_buffers
 syn keyword ngxDirective contained gzip
@@ -268,11 +294,14 @@ syn keyword ngxDirective contained hls_mp4_max_buffer_size
 syn keyword ngxDirective contained http2_body_preread_size
 syn keyword ngxDirective contained http2_chunk_size
 syn keyword ngxDirective contained http2_idle_timeout
+syn keyword ngxDirective contained http2_max_concurrent_pushes
 syn keyword ngxDirective contained http2_max_concurrent_streams
 syn keyword ngxDirective contained http2_max_field_size
 syn keyword ngxDirective contained http2_max_header_size
 syn keyword ngxDirective contained http2_max_requests
 syn keyword ngxDirective contained http2_pool_size
+syn keyword ngxDirective contained http2_push
+syn keyword ngxDirective contained http2_push_preload
 syn keyword ngxDirective contained http2_recv_buffer_size
 syn keyword ngxDirective contained http2_recv_timeout
 syn keyword ngxDirective contained http2_streams_index_size
@@ -574,6 +603,7 @@ syn keyword ngxDirective contained sub_filter
 syn keyword ngxDirective contained sub_filter_last_modified
 syn keyword ngxDirective contained sub_filter_once
 syn keyword ngxDirective contained sub_filter_types
+syn keyword ngxDirective contained subrequest_output_buffer_size
 syn keyword ngxDirective contained tcp_nodelay
 syn keyword ngxDirective contained tcp_nopush
 syn keyword ngxDirective contained thread_pool
@@ -1323,11 +1353,8 @@ syn keyword ngxDirectiveThirdParty contained rules_enabled
 
 " Phusion Passenger
 " https://www.phusionpassenger.com/library/config/nginx/reference/
-syn keyword ngxDirectiveThirdParty contained disable_security_update_check
 syn keyword ngxDirectiveThirdParty contained passenger_abort_on_startup_error
 syn keyword ngxDirectiveThirdParty contained passenger_abort_websockets_on_process_shutdown
-syn keyword ngxDirectiveThirdParty contained passenger_analytics_log_group
-syn keyword ngxDirectiveThirdParty contained passenger_analytics_log_user
 syn keyword ngxDirectiveThirdParty contained passenger_app_env
 syn keyword ngxDirectiveThirdParty contained passenger_app_file_descriptor_ulimit
 syn keyword ngxDirectiveThirdParty contained passenger_app_group_name
@@ -1369,6 +1396,7 @@ syn keyword ngxDirectiveThirdParty contained passenger_max_instances_per_app
 syn keyword ngxDirectiveThirdParty contained passenger_max_pool_size
 syn keyword ngxDirectiveThirdParty contained passenger_max_preloader_idle_time
 syn keyword ngxDirectiveThirdParty contained passenger_max_request_queue_size
+syn keyword ngxDirectiveThirdParty contained passenger_max_request_queue_time
 syn keyword ngxDirectiveThirdParty contained passenger_max_request_time
 syn keyword ngxDirectiveThirdParty contained passenger_max_requests
 syn keyword ngxDirectiveThirdParty contained passenger_memory_limit
@@ -1402,21 +1430,22 @@ syn keyword ngxDirectiveThirdParty contained passenger_turbocaching
 syn keyword ngxDirectiveThirdParty contained passenger_user
 syn keyword ngxDirectiveThirdParty contained passenger_user_switching
 syn keyword ngxDirectiveThirdParty contained passenger_vary_turbocache_by_cookie
-syn keyword ngxDirectiveThirdParty contained rack_env
-syn keyword ngxDirectiveThirdParty contained rails_app_spawner_idle_time
-syn keyword ngxDirectiveThirdParty contained rails_env
-syn keyword ngxDirectiveThirdParty contained security_update_check_proxy
-syn keyword ngxDirectiveThirdParty contained union_station_filter
-syn keyword ngxDirectiveThirdParty contained union_station_gateway_address
-syn keyword ngxDirectiveThirdParty contained union_station_gateway_cert
-syn keyword ngxDirectiveThirdParty contained union_station_gateway_port
-syn keyword ngxDirectiveThirdParty contained union_station_key
-syn keyword ngxDirectiveThirdParty contained union_station_proxy_address
-syn keyword ngxDirectiveThirdParty contained union_station_support
+syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_analytics_log_group
+syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_analytics_log_user
 syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_debug_log_file
 syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_use_global_queue
+syn keyword ngxDirectiveThirdPartyDeprecated contained rack_env
+syn keyword ngxDirectiveThirdPartyDeprecated contained rails_app_spawner_idle_time
+syn keyword ngxDirectiveThirdPartyDeprecated contained rails_env
 syn keyword ngxDirectiveThirdPartyDeprecated contained rails_framework_spawner_idle_time
 syn keyword ngxDirectiveThirdPartyDeprecated contained rails_spawn_method
+syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_filter
+syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_gateway_address
+syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_gateway_cert
+syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_gateway_port
+syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_key
+syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_proxy_address
+syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_support
 
 " ngx_postgres is an upstream module that allows nginx to communicate directly with PostgreSQL database
 " https://github.com/FRiCKLE/ngx_postgres
@@ -2028,6 +2057,7 @@ syn keyword ngxDirectiveThirdParty contained sass_source_map_embed
 syn keyword ngxDirectiveThirdParty contained selective_cache_purge_query
 syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_database
 syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_host
+syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_password
 syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_port
 syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_unix_socket
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 17f33a0..677d6cf 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013009
-#define NGINX_VERSION      "1.13.9"
+#define nginx_version      1013010
+#define NGINX_VERSION      "1.13.10"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c
index b2edf1a..7964b00 100644
--- a/src/core/ngx_times.c
+++ b/src/core/ngx_times.c
@@ -9,6 +9,9 @@
 #include <ngx_core.h>
 
 
+static ngx_msec_t ngx_monotonic_time(time_t sec, ngx_uint_t msec);
+
+
 /*
  * The time may be updated by signal handler or by several threads.
  * The time update operations are rare and require to hold the ngx_time_lock.
@@ -93,7 +96,7 @@ ngx_time_update(void)
     sec = tv.tv_sec;
     msec = tv.tv_usec / 1000;
 
-    ngx_current_msec = (ngx_msec_t) sec * 1000 + msec;
+    ngx_current_msec = ngx_monotonic_time(sec, msec);
 
     tp = &cached_time[slot];
 
@@ -189,6 +192,31 @@ ngx_time_update(void)
 }
 
 
+static ngx_msec_t
+ngx_monotonic_time(time_t sec, ngx_uint_t msec)
+{
+#if (NGX_HAVE_CLOCK_MONOTONIC)
+    struct timespec  ts;
+
+#if defined(CLOCK_MONOTONIC_FAST)
+    clock_gettime(CLOCK_MONOTONIC_FAST, &ts);
+
+#elif defined(CLOCK_MONOTONIC_COARSE)
+    clock_gettime(CLOCK_MONOTONIC_COARSE, &ts);
+
+#else
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+#endif
+
+    sec = ts.tv_sec;
+    msec = ts.tv_nsec / 1000000;
+
+#endif
+
+    return (ngx_msec_t) sec * 1000 + msec;
+}
+
+
 #if !(NGX_WIN32)
 
 void
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index c5bb806..e7f28c9 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -388,7 +388,16 @@ ngx_event_connect_set_transparent(ngx_peer_connection_t *pc, ngx_socket_t s)
             return NGX_ERROR;
         }
 
+#else
+
+        ngx_log_error(NGX_LOG_ALERT, pc->log, 0,
+                      "could not enable transparent proxying for IPv6 "
+                      "on this platform");
+
+        return NGX_ERROR;
+
 #endif
+
         break;
 
 #endif /* NGX_HAVE_INET6 */
diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c
index 2f345b6..a6f9ec4 100644
--- a/src/http/modules/ngx_http_auth_basic_module.c
+++ b/src/http/modules/ngx_http_auth_basic_module.c
@@ -266,8 +266,8 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
     }
 
     ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                  "user \"%V\" was not found in \"%V\"",
-                  &r->headers_in.user, &user_file);
+                  "user \"%V\" was not found in \"%s\"",
+                  &r->headers_in.user, user_file.data);
 
     return ngx_http_auth_basic_set_realm(r, &realm);
 }
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index b4bb1d0..bc43f53 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -2512,36 +2512,6 @@ ngx_http_fastcgi_non_buffered_filter(void *data, ssize_t bytes)
         break;
     }
 
-    /* provide continuous buffer for subrequests in memory */
-
-    if (r->subrequest_in_memory) {
-
-        cl = u->out_bufs;
-
-        if (cl) {
-            buf->pos = cl->buf->pos;
-        }
-
-        buf->last = buf->pos;
-
-        for (cl = u->out_bufs; cl; cl = cl->next) {
-            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http fastcgi in memory %p-%p %O",
-                           cl->buf->pos, cl->buf->last, ngx_buf_size(cl->buf));
-
-            if (buf->last == cl->buf->pos) {
-                buf->last = cl->buf->last;
-                continue;
-            }
-
-            buf->last = ngx_movemem(buf->last, cl->buf->pos,
-                                    cl->buf->last - cl->buf->pos);
-
-            cl->buf->pos = buf->last - (cl->buf->last - cl->buf->pos);
-            cl->buf->last = buf->last;
-        }
-    }
-
     return NGX_OK;
 }
 
@@ -2736,8 +2706,6 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
      *     conf->upstream.cache_methods = 0;
      *     conf->upstream.temp_path = NULL;
      *     conf->upstream.hide_headers_hash = { NULL, 0 };
-     *     conf->upstream.uri = { 0, NULL };
-     *     conf->upstream.location = NULL;
      *     conf->upstream.store_lengths = NULL;
      *     conf->upstream.store_values = NULL;
      *
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 8262c9d..c11bafa 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -439,6 +439,7 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ctx.temp_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log);
     if (ctx.temp_pool == NULL) {
+        ngx_destroy_pool(pool);
         return NGX_CONF_ERROR;
     }
 
@@ -460,6 +461,10 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     *cf = save;
 
+    if (rv != NGX_CONF_OK) {
+        goto failed;
+    }
+
     geo->proxies = ctx.proxies;
     geo->proxy_recursive = ctx.proxy_recursive;
 
@@ -482,7 +487,7 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
                 ctx.high.low[i] = ngx_palloc(cf->pool, len + sizeof(void *));
                 if (ctx.high.low[i] == NULL) {
-                    return NGX_CONF_ERROR;
+                    goto failed;
                 }
 
                 ngx_memcpy(ctx.high.low[i], a->elts, len);
@@ -508,14 +513,11 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         var->get_handler = ngx_http_geo_range_variable;
         var->data = (uintptr_t) geo;
 
-        ngx_destroy_pool(ctx.temp_pool);
-        ngx_destroy_pool(pool);
-
     } else {
         if (ctx.tree == NULL) {
             ctx.tree = ngx_radix_tree_create(cf->pool, -1);
             if (ctx.tree == NULL) {
-                return NGX_CONF_ERROR;
+                goto failed;
             }
         }
 
@@ -525,7 +527,7 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         if (ctx.tree6 == NULL) {
             ctx.tree6 = ngx_radix_tree_create(cf->pool, -1);
             if (ctx.tree6 == NULL) {
-                return NGX_CONF_ERROR;
+                goto failed;
             }
         }
 
@@ -535,14 +537,11 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         var->get_handler = ngx_http_geo_cidr_variable;
         var->data = (uintptr_t) geo;
 
-        ngx_destroy_pool(ctx.temp_pool);
-        ngx_destroy_pool(pool);
-
         if (ngx_radix32tree_insert(ctx.tree, 0, 0,
                                    (uintptr_t) &ngx_http_variable_null_value)
             == NGX_ERROR)
         {
-            return NGX_CONF_ERROR;
+            goto failed;
         }
 
         /* NGX_BUSY is okay (default was set explicitly) */
@@ -552,12 +551,22 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                                     (uintptr_t) &ngx_http_variable_null_value)
             == NGX_ERROR)
         {
-            return NGX_CONF_ERROR;
+            goto failed;
         }
 #endif
     }
 
-    return rv;
+    ngx_destroy_pool(ctx.temp_pool);
+    ngx_destroy_pool(pool);
+
+    return NGX_CONF_OK;
+
+failed:
+
+    ngx_destroy_pool(ctx.temp_pool);
+    ngx_destroy_pool(pool);
+
+    return NGX_CONF_ERROR;
 }
 
 
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
new file mode 100644
index 0000000..b6be9b8
--- /dev/null
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -0,0 +1,4640 @@
+
+/*
+ * Copyright (C) Maxim Dounin
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    ngx_array_t               *flushes;
+    ngx_array_t               *lengths;
+    ngx_array_t               *values;
+    ngx_hash_t                 hash;
+} ngx_http_grpc_headers_t;
+
+
+typedef struct {
+    ngx_http_upstream_conf_t   upstream;
+
+    ngx_http_grpc_headers_t    headers;
+    ngx_array_t               *headers_source;
+
+    ngx_str_t                  host;
+    ngx_uint_t                 host_set;
+
+#if (NGX_HTTP_SSL)
+    ngx_uint_t                 ssl;
+    ngx_uint_t                 ssl_protocols;
+    ngx_str_t                  ssl_ciphers;
+    ngx_uint_t                 ssl_verify_depth;
+    ngx_str_t                  ssl_trusted_certificate;
+    ngx_str_t                  ssl_crl;
+    ngx_str_t                  ssl_certificate;
+    ngx_str_t                  ssl_certificate_key;
+    ngx_array_t               *ssl_passwords;
+#endif
+} ngx_http_grpc_loc_conf_t;
+
+
+typedef enum {
+    ngx_http_grpc_st_start = 0,
+    ngx_http_grpc_st_length_2,
+    ngx_http_grpc_st_length_3,
+    ngx_http_grpc_st_type,
+    ngx_http_grpc_st_flags,
+    ngx_http_grpc_st_stream_id,
+    ngx_http_grpc_st_stream_id_2,
+    ngx_http_grpc_st_stream_id_3,
+    ngx_http_grpc_st_stream_id_4,
+    ngx_http_grpc_st_payload,
+    ngx_http_grpc_st_padding
+} ngx_http_grpc_state_e;
+
+
+typedef struct {
+    size_t                     init_window;
+    size_t                     send_window;
+    size_t                     recv_window;
+    ngx_uint_t                 last_stream_id;
+} ngx_http_grpc_conn_t;
+
+
+typedef struct {
+    ngx_http_grpc_state_e      state;
+    ngx_uint_t                 frame_state;
+    ngx_uint_t                 fragment_state;
+
+    ngx_chain_t               *in;
+    ngx_chain_t               *out;
+    ngx_chain_t               *free;
+    ngx_chain_t               *busy;
+
+    ngx_http_grpc_conn_t      *connection;
+
+    ngx_uint_t                 id;
+
+    ssize_t                    send_window;
+    size_t                     recv_window;
+
+    size_t                     rest;
+    ngx_uint_t                 stream_id;
+    u_char                     type;
+    u_char                     flags;
+    u_char                     padding;
+
+    ngx_uint_t                 error;
+    ngx_uint_t                 window_update;
+
+    ngx_uint_t                 setting_id;
+    ngx_uint_t                 setting_value;
+
+    u_char                     ping_data[8];
+
+    ngx_uint_t                 index;
+    ngx_str_t                  name;
+    ngx_str_t                  value;
+
+    u_char                    *field_end;
+    size_t                     field_length;
+    size_t                     field_rest;
+    u_char                     field_state;
+
+    unsigned                   literal:1;
+    unsigned                   field_huffman:1;
+
+    unsigned                   header_sent:1;
+    unsigned                   output_closed:1;
+    unsigned                   parsing_headers:1;
+    unsigned                   end_stream:1;
+    unsigned                   status:1;
+
+    ngx_http_request_t        *request;
+} ngx_http_grpc_ctx_t;
+
+
+typedef struct {
+    u_char                     length_0;
+    u_char                     length_1;
+    u_char                     length_2;
+    u_char                     type;
+    u_char                     flags;
+    u_char                     stream_id_0;
+    u_char                     stream_id_1;
+    u_char                     stream_id_2;
+    u_char                     stream_id_3;
+} ngx_http_grpc_frame_t;
+
+
+static ngx_int_t ngx_http_grpc_create_request(ngx_http_request_t *r);
+static ngx_int_t ngx_http_grpc_reinit_request(ngx_http_request_t *r);
+static ngx_int_t ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in);
+static ngx_int_t ngx_http_grpc_process_header(ngx_http_request_t *r);
+static ngx_int_t ngx_http_grpc_filter_init(void *data);
+static ngx_int_t ngx_http_grpc_filter(void *data, ssize_t bytes);
+
+static ngx_int_t ngx_http_grpc_parse_frame(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b);
+static ngx_int_t ngx_http_grpc_parse_header(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b);
+static ngx_int_t ngx_http_grpc_parse_fragment(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b);
+static ngx_int_t ngx_http_grpc_validate_header_name(ngx_http_request_t *r,
+    ngx_str_t *s);
+static ngx_int_t ngx_http_grpc_validate_header_value(ngx_http_request_t *r,
+    ngx_str_t *s);
+static ngx_int_t ngx_http_grpc_parse_rst_stream(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b);
+static ngx_int_t ngx_http_grpc_parse_goaway(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b);
+static ngx_int_t ngx_http_grpc_parse_window_update(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b);
+static ngx_int_t ngx_http_grpc_parse_settings(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b);
+static ngx_int_t ngx_http_grpc_parse_ping(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b);
+
+static ngx_int_t ngx_http_grpc_send_settings_ack(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx);
+static ngx_int_t ngx_http_grpc_send_ping_ack(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx);
+static ngx_int_t ngx_http_grpc_send_window_update(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx);
+
+static ngx_chain_t *ngx_http_grpc_get_buf(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx);
+static ngx_http_grpc_ctx_t *ngx_http_grpc_get_ctx(ngx_http_request_t *r);
+static ngx_int_t ngx_http_grpc_get_connection_data(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_peer_connection_t *pc);
+static void ngx_http_grpc_cleanup(void *data);
+
+static void ngx_http_grpc_abort_request(ngx_http_request_t *r);
+static void ngx_http_grpc_finalize_request(ngx_http_request_t *r,
+    ngx_int_t rc);
+
+static ngx_int_t ngx_http_grpc_internal_trailers_variable(
+    ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data);
+
+static ngx_int_t ngx_http_grpc_add_variables(ngx_conf_t *cf);
+static void *ngx_http_grpc_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf,
+    void *parent, void *child);
+static ngx_int_t ngx_http_grpc_init_headers(ngx_conf_t *cf,
+    ngx_http_grpc_loc_conf_t *conf, ngx_http_grpc_headers_t *headers,
+    ngx_keyval_t *default_headers);
+
+static char *ngx_http_grpc_pass(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+#if (NGX_HTTP_SSL)
+static char *ngx_http_grpc_ssl_password_file(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static ngx_int_t ngx_http_grpc_set_ssl(ngx_conf_t *cf,
+    ngx_http_grpc_loc_conf_t *glcf);
+#endif
+
+
+static ngx_conf_bitmask_t  ngx_http_grpc_next_upstream_masks[] = {
+    { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
+    { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
+    { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
+    { ngx_string("non_idempotent"), NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT },
+    { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
+    { ngx_string("http_502"), NGX_HTTP_UPSTREAM_FT_HTTP_502 },
+    { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
+    { ngx_string("http_504"), NGX_HTTP_UPSTREAM_FT_HTTP_504 },
+    { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
+    { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
+    { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 },
+    { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
+    { ngx_null_string, 0 }
+};
+
+
+#if (NGX_HTTP_SSL)
+
+static ngx_conf_bitmask_t  ngx_http_grpc_ssl_protocols[] = {
+    { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
+    { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
+    { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
+    { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
+    { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
+    { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
+    { ngx_null_string, 0 }
+};
+
+#endif
+
+
+static ngx_command_t  ngx_http_grpc_commands[] = {
+
+    { ngx_string("grpc_pass"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+      ngx_http_grpc_pass,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("grpc_bind"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
+      ngx_http_upstream_bind_set_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.local),
+      NULL },
+
+    { ngx_string("grpc_connect_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.connect_timeout),
+      NULL },
+
+    { ngx_string("grpc_send_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.send_timeout),
+      NULL },
+
+    { ngx_string("grpc_intercept_errors"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.intercept_errors),
+      NULL },
+
+    { ngx_string("grpc_buffer_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.buffer_size),
+      NULL },
+
+    { ngx_string("grpc_read_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.read_timeout),
+      NULL },
+
+    { ngx_string("grpc_next_upstream"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_conf_set_bitmask_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.next_upstream),
+      &ngx_http_grpc_next_upstream_masks },
+
+    { ngx_string("grpc_next_upstream_tries"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.next_upstream_tries),
+      NULL },
+
+    { ngx_string("grpc_next_upstream_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.next_upstream_timeout),
+      NULL },
+
+    { ngx_string("grpc_set_header"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_keyval_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, headers_source),
+      NULL },
+
+    { ngx_string("grpc_pass_header"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_array_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.pass_headers),
+      NULL },
+
+    { ngx_string("grpc_hide_header"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_array_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.hide_headers),
+      NULL },
+
+    { ngx_string("grpc_ignore_headers"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_conf_set_bitmask_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.ignore_headers),
+      &ngx_http_upstream_ignore_headers_masks },
+
+#if (NGX_HTTP_SSL)
+
+    { ngx_string("grpc_ssl_session_reuse"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.ssl_session_reuse),
+      NULL },
+
+    { ngx_string("grpc_ssl_protocols"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_conf_set_bitmask_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, ssl_protocols),
+      &ngx_http_grpc_ssl_protocols },
+
+    { ngx_string("grpc_ssl_ciphers"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, ssl_ciphers),
+      NULL },
+
+    { ngx_string("grpc_ssl_name"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_set_complex_value_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.ssl_name),
+      NULL },
+
+    { ngx_string("grpc_ssl_server_name"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.ssl_server_name),
+      NULL },
+
+    { ngx_string("grpc_ssl_verify"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.ssl_verify),
+      NULL },
+
+    { ngx_string("grpc_ssl_verify_depth"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, ssl_verify_depth),
+      NULL },
+
+    { ngx_string("grpc_ssl_trusted_certificate"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, ssl_trusted_certificate),
+      NULL },
+
+    { ngx_string("grpc_ssl_crl"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, ssl_crl),
+      NULL },
+
+    { ngx_string("grpc_ssl_certificate"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, ssl_certificate),
+      NULL },
+
+    { ngx_string("grpc_ssl_certificate_key"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, ssl_certificate_key),
+      NULL },
+
+    { ngx_string("grpc_ssl_password_file"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_grpc_ssl_password_file,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+#endif
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_grpc_module_ctx = {
+    ngx_http_grpc_add_variables,           /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    ngx_http_grpc_create_loc_conf,         /* create location configuration */
+    ngx_http_grpc_merge_loc_conf           /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_grpc_module = {
+    NGX_MODULE_V1,
+    &ngx_http_grpc_module_ctx,             /* module context */
+    ngx_http_grpc_commands,                /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static u_char  ngx_http_grpc_connection_start[] =
+    "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"         /* connection preface */
+
+    "\x00\x00\x12\x04\x00\x00\x00\x00\x00"     /* settings frame */
+    "\x00\x01\x00\x00\x00\x00"                 /* header table size */
+    "\x00\x02\x00\x00\x00\x00"                 /* disable push */
+    "\x00\x04\x7f\xff\xff\xff"                 /* initial window */
+
+    "\x00\x00\x04\x08\x00\x00\x00\x00\x00"     /* window update frame */
+    "\x7f\xff\x00\x00";
+
+
+static ngx_keyval_t  ngx_http_grpc_headers[] = {
+    { ngx_string("Content-Length"), ngx_string("$content_length") },
+    { ngx_string("TE"), ngx_string("$grpc_internal_trailers") },
+    { ngx_string("Host"), ngx_string("") },
+    { ngx_string("Connection"), ngx_string("") },
+    { ngx_string("Transfer-Encoding"), ngx_string("") },
+    { ngx_string("Keep-Alive"), ngx_string("") },
+    { ngx_string("Expect"), ngx_string("") },
+    { ngx_string("Upgrade"), ngx_string("") },
+    { ngx_null_string, ngx_null_string }
+};
+
+
+static ngx_str_t  ngx_http_grpc_hide_headers[] = {
+    ngx_string("Date"),
+    ngx_string("Server"),
+    ngx_string("X-Accel-Expires"),
+    ngx_string("X-Accel-Redirect"),
+    ngx_string("X-Accel-Limit-Rate"),
+    ngx_string("X-Accel-Buffering"),
+    ngx_string("X-Accel-Charset"),
+    ngx_null_string
+};
+
+
+static ngx_http_variable_t  ngx_http_grpc_vars[] = {
+
+    { ngx_string("grpc_internal_trailers"), NULL,
+      ngx_http_grpc_internal_trailers_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
+
+      ngx_http_null_variable
+};
+
+
+static ngx_int_t
+ngx_http_grpc_handler(ngx_http_request_t *r)
+{
+    ngx_int_t                  rc;
+    ngx_http_upstream_t       *u;
+    ngx_http_grpc_ctx_t       *ctx;
+    ngx_http_grpc_loc_conf_t  *glcf;
+
+    if (ngx_http_upstream_create(r) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    glcf = ngx_http_get_module_loc_conf(r, ngx_http_grpc_module);
+
+    u = r->upstream;
+
+#if (NGX_HTTP_SSL)
+    u->ssl = (glcf->upstream.ssl != NULL);
+
+    if (u->ssl) {
+        ngx_str_set(&u->schema, "grpcs://");
+
+    } else {
+        ngx_str_set(&u->schema, "grpc://");
+    }
+#else
+    ngx_str_set(&u->schema, "grpc://");
+#endif
+
+    u->output.tag = (ngx_buf_tag_t) &ngx_http_grpc_module;
+
+    u->conf = &glcf->upstream;
+
+    u->create_request = ngx_http_grpc_create_request;
+    u->reinit_request = ngx_http_grpc_reinit_request;
+    u->process_header = ngx_http_grpc_process_header;
+    u->abort_request = ngx_http_grpc_abort_request;
+    u->finalize_request = ngx_http_grpc_finalize_request;
+
+    ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_grpc_ctx_t));
+    if (ctx == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    ctx->request = r;
+
+    ngx_http_set_ctx(r, ctx, ngx_http_grpc_module);
+
+    u->input_filter_init = ngx_http_grpc_filter_init;
+    u->input_filter = ngx_http_grpc_filter;
+    u->input_filter_ctx = ctx;
+
+    r->request_body_no_buffering = 1;
+
+    rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init);
+
+    if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+        return rc;
+    }
+
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_create_request(ngx_http_request_t *r)
+{
+    u_char                       *p, *tmp, *key_tmp, *val_tmp, *headers_frame;
+    size_t                        len, tmp_len, key_len, val_len, uri_len;
+    uintptr_t                     escape;
+    ngx_buf_t                    *b;
+    ngx_uint_t                    i, next;
+    ngx_chain_t                  *cl, *body;
+    ngx_list_part_t              *part;
+    ngx_table_elt_t              *header;
+    ngx_http_upstream_t          *u;
+    ngx_http_grpc_frame_t        *f;
+    ngx_http_script_code_pt       code;
+    ngx_http_grpc_loc_conf_t     *glcf;
+    ngx_http_script_engine_t      e, le;
+    ngx_http_script_len_code_pt   lcode;
+
+    u = r->upstream;
+
+    glcf = ngx_http_get_module_loc_conf(r, ngx_http_grpc_module);
+
+    len = sizeof(ngx_http_grpc_connection_start) - 1
+          + sizeof(ngx_http_grpc_frame_t);             /* headers frame */
+
+    /* :method header */
+
+    if (r->method == NGX_HTTP_GET || r->method == NGX_HTTP_POST) {
+        len += 1;
+        tmp_len = 0;
+
+    } else {
+        len += 1 + NGX_HTTP_V2_INT_OCTETS + r->method_name.len;
+        tmp_len = r->method_name.len;
+    }
+
+    /* :scheme header */
+
+    len += 1;
+
+    /* :path header */
+
+    if (r->valid_unparsed_uri) {
+        escape = 0;
+        uri_len = r->unparsed_uri.len;
+
+    } else {
+        escape = 2 * ngx_escape_uri(NULL, r->uri.data, r->uri.len,
+                                    NGX_ESCAPE_URI);
+        uri_len = r->uri.len + escape + sizeof("?") - 1 + r->args.len;
+    }
+
+    len += 1 + NGX_HTTP_V2_INT_OCTETS + uri_len;
+
+    if (tmp_len < uri_len) {
+        tmp_len = uri_len;
+    }
+
+    /* :authority header */
+
+    if (!glcf->host_set) {
+        len += 1 + NGX_HTTP_V2_INT_OCTETS + glcf->host.len;
+
+        if (tmp_len < glcf->host.len) {
+            tmp_len = glcf->host.len;
+        }
+    }
+
+    /* other headers */
+
+    ngx_http_script_flush_no_cacheable_variables(r, glcf->headers.flushes);
+    ngx_memzero(&le, sizeof(ngx_http_script_engine_t));
+
+    le.ip = glcf->headers.lengths->elts;
+    le.request = r;
+    le.flushed = 1;
+
+    while (*(uintptr_t *) le.ip) {
+
+        lcode = *(ngx_http_script_len_code_pt *) le.ip;
+        key_len = lcode(&le);
+
+        for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) {
+            lcode = *(ngx_http_script_len_code_pt *) le.ip;
+        }
+        le.ip += sizeof(uintptr_t);
+
+        if (val_len == 0) {
+            continue;
+        }
+
+        len += 1 + NGX_HTTP_V2_INT_OCTETS + key_len
+                 + NGX_HTTP_V2_INT_OCTETS + val_len;
+
+        if (tmp_len < key_len) {
+            tmp_len = key_len;
+        }
+
+        if (tmp_len < val_len) {
+            tmp_len = val_len;
+        }
+    }
+
+    if (glcf->upstream.pass_request_headers) {
+        part = &r->headers_in.headers.part;
+        header = part->elts;
+
+        for (i = 0; /* void */; i++) {
+
+            if (i >= part->nelts) {
+                if (part->next == NULL) {
+                    break;
+                }
+
+                part = part->next;
+                header = part->elts;
+                i = 0;
+            }
+
+            if (ngx_hash_find(&glcf->headers.hash, header[i].hash,
+                              header[i].lowcase_key, header[i].key.len))
+            {
+                continue;
+            }
+
+            len += 1 + NGX_HTTP_V2_INT_OCTETS + header[i].key.len
+                     + NGX_HTTP_V2_INT_OCTETS + header[i].value.len;
+
+            if (tmp_len < header[i].key.len) {
+                tmp_len = header[i].key.len;
+            }
+
+            if (tmp_len < header[i].value.len) {
+                tmp_len = header[i].value.len;
+            }
+        }
+    }
+
+    /* continuation frames */
+
+    len += sizeof(ngx_http_grpc_frame_t)
+           * (len / NGX_HTTP_V2_DEFAULT_FRAME_SIZE);
+
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    tmp = ngx_palloc(r->pool, tmp_len * 3);
+    if (tmp == NULL) {
+        return NGX_ERROR;
+    }
+
+    key_tmp = tmp + tmp_len;
+    val_tmp = tmp + 2 * tmp_len;
+
+    /* connection preface */
+
+    b->last = ngx_copy(b->last, ngx_http_grpc_connection_start,
+                       sizeof(ngx_http_grpc_connection_start) - 1);
+
+    /* headers frame */
+
+    headers_frame = b->last;
+
+    f = (ngx_http_grpc_frame_t *) b->last;
+    b->last += sizeof(ngx_http_grpc_frame_t);
+
+    f->length_0 = 0;
+    f->length_1 = 0;
+    f->length_2 = 0;
+    f->type = NGX_HTTP_V2_HEADERS_FRAME;
+    f->flags = 0;
+    f->stream_id_0 = 0;
+    f->stream_id_1 = 0;
+    f->stream_id_2 = 0;
+    f->stream_id_3 = 1;
+
+    if (r->method == NGX_HTTP_GET) {
+        *b->last++ = ngx_http_v2_indexed(NGX_HTTP_V2_METHOD_GET_INDEX);
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: \":method: GET\"");
+
+    } else if (r->method == NGX_HTTP_POST) {
+        *b->last++ = ngx_http_v2_indexed(NGX_HTTP_V2_METHOD_POST_INDEX);
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: \":method: POST\"");
+
+    } else {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_METHOD_INDEX);
+        b->last = ngx_http_v2_write_value(b->last, r->method_name.data,
+                                          r->method_name.len, tmp);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: \":method: %V\"", &r->method_name);
+    }
+
+#if (NGX_HTTP_SSL)
+    if (glcf->ssl) {
+        *b->last++ = ngx_http_v2_indexed(NGX_HTTP_V2_SCHEME_HTTPS_INDEX);
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: \":scheme: https\"");
+    } else
+#endif
+    {
+        *b->last++ = ngx_http_v2_indexed(NGX_HTTP_V2_SCHEME_HTTP_INDEX);
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: \":scheme: http\"");
+    }
+
+    if (r->valid_unparsed_uri) {
+
+        if (r->unparsed_uri.len == 1 && r->unparsed_uri.data[0] == '/') {
+            *b->last++ = ngx_http_v2_indexed(NGX_HTTP_V2_PATH_ROOT_INDEX);
+
+        } else {
+            *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_PATH_INDEX);
+            b->last = ngx_http_v2_write_value(b->last, r->unparsed_uri.data,
+                                              r->unparsed_uri.len, tmp);
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: \":path: %V\"", &r->unparsed_uri);
+
+    } else if (escape || r->args.len > 0) {
+        p = val_tmp;
+
+        if (escape) {
+            p = (u_char *) ngx_escape_uri(p, r->uri.data, r->uri.len,
+                                          NGX_ESCAPE_URI);
+
+        } else {
+            p = ngx_copy(p, r->uri.data, r->uri.len);
+        }
+
+        if (r->args.len > 0) {
+            *p++ = '?';
+            p = ngx_copy(p, r->args.data, r->args.len);
+        }
+
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_PATH_INDEX);
+        b->last = ngx_http_v2_write_value(b->last, val_tmp, p - val_tmp, tmp);
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: \":path: %*s\"", p - val_tmp, val_tmp);
+
+    } else {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_PATH_INDEX);
+        b->last = ngx_http_v2_write_value(b->last, r->uri.data,
+                                          r->uri.len, tmp);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: \":path: %V\"", &r->uri);
+    }
+
+    if (!glcf->host_set) {
+        *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_AUTHORITY_INDEX);
+        b->last = ngx_http_v2_write_value(b->last, glcf->host.data,
+                                          glcf->host.len, tmp);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: \":authority: %V\"", &glcf->host);
+    }
+
+    ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
+
+    e.ip = glcf->headers.values->elts;
+    e.request = r;
+    e.flushed = 1;
+
+    le.ip = glcf->headers.lengths->elts;
+
+    while (*(uintptr_t *) le.ip) {
+
+        lcode = *(ngx_http_script_len_code_pt *) le.ip;
+        key_len = lcode(&le);
+
+        for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) {
+            lcode = *(ngx_http_script_len_code_pt *) le.ip;
+        }
+        le.ip += sizeof(uintptr_t);
+
+        if (val_len == 0) {
+            e.skip = 1;
+
+            while (*(uintptr_t *) e.ip) {
+                code = *(ngx_http_script_code_pt *) e.ip;
+                code((ngx_http_script_engine_t *) &e);
+            }
+            e.ip += sizeof(uintptr_t);
+
+            e.skip = 0;
+
+            continue;
+        }
+
+        *b->last++ = 0;
+
+        e.pos = key_tmp;
+
+        code = *(ngx_http_script_code_pt *) e.ip;
+        code((ngx_http_script_engine_t *) &e);
+
+        b->last = ngx_http_v2_write_name(b->last, key_tmp, key_len, tmp);
+
+        e.pos = val_tmp;
+
+        while (*(uintptr_t *) e.ip) {
+            code = *(ngx_http_script_code_pt *) e.ip;
+            code((ngx_http_script_engine_t *) &e);
+        }
+        e.ip += sizeof(uintptr_t);
+
+        b->last = ngx_http_v2_write_value(b->last, val_tmp, val_len, tmp);
+
+#if (NGX_DEBUG)
+        if (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP) {
+            ngx_strlow(key_tmp, key_tmp, key_len);
+
+            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc header: \"%*s: %*s\"",
+                           key_len, key_tmp, val_len, val_tmp);
+        }
+#endif
+    }
+
+    if (glcf->upstream.pass_request_headers) {
+        part = &r->headers_in.headers.part;
+        header = part->elts;
+
+        for (i = 0; /* void */; i++) {
+
+            if (i >= part->nelts) {
+                if (part->next == NULL) {
+                    break;
+                }
+
+                part = part->next;
+                header = part->elts;
+                i = 0;
+            }
+
+            if (ngx_hash_find(&glcf->headers.hash, header[i].hash,
+                              header[i].lowcase_key, header[i].key.len))
+            {
+                continue;
+            }
+
+            *b->last++ = 0;
+
+            b->last = ngx_http_v2_write_name(b->last, header[i].key.data,
+                                             header[i].key.len, tmp);
+
+            b->last = ngx_http_v2_write_value(b->last, header[i].value.data,
+                                              header[i].value.len, tmp);
+
+#if (NGX_DEBUG)
+            if (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP) {
+                ngx_strlow(tmp, header[i].key.data, header[i].key.len);
+
+                ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "grpc header: \"%*s: %V\"",
+                               header[i].key.len, tmp, &header[i].value);
+            }
+#endif
+        }
+    }
+
+    /* update headers frame length */
+
+    len = b->last - headers_frame - sizeof(ngx_http_grpc_frame_t);
+
+    if (len > NGX_HTTP_V2_DEFAULT_FRAME_SIZE) {
+        len = NGX_HTTP_V2_DEFAULT_FRAME_SIZE;
+        next = 1;
+
+    } else {
+        next = 0;
+    }
+
+    f = (ngx_http_grpc_frame_t *) headers_frame;
+
+    f->length_0 = (u_char) ((len >> 16) & 0xff);
+    f->length_1 = (u_char) ((len >> 8) & 0xff);
+    f->length_2 = (u_char) (len & 0xff);
+
+    /* create additional continuation frames */
+
+    p = headers_frame;
+
+    while (next) {
+        p += sizeof(ngx_http_grpc_frame_t) + NGX_HTTP_V2_DEFAULT_FRAME_SIZE;
+        len = b->last - p;
+
+        ngx_memmove(p + sizeof(ngx_http_grpc_frame_t), p, len);
+        b->last += sizeof(ngx_http_grpc_frame_t);
+
+        if (len > NGX_HTTP_V2_DEFAULT_FRAME_SIZE) {
+            len = NGX_HTTP_V2_DEFAULT_FRAME_SIZE;
+            next = 1;
+
+        } else {
+            next = 0;
+        }
+
+        f = (ngx_http_grpc_frame_t *) p;
+
+        f->length_0 = (u_char) ((len >> 16) & 0xff);
+        f->length_1 = (u_char) ((len >> 8) & 0xff);
+        f->length_2 = (u_char) (len & 0xff);
+        f->type = NGX_HTTP_V2_CONTINUATION_FRAME;
+        f->flags = 0;
+        f->stream_id_0 = 0;
+        f->stream_id_1 = 0;
+        f->stream_id_2 = 0;
+        f->stream_id_3 = 1;
+    }
+
+    f->flags |= NGX_HTTP_V2_END_HEADERS_FLAG;
+
+#if (NGX_DEBUG)
+    if (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP) {
+        u_char  buf[512];
+        size_t  n, m;
+
+        n = ngx_min(b->last - b->pos, 256);
+        m = ngx_hex_dump(buf, b->pos, n) - buf;
+
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header: %*s%s, len: %uz",
+                       m, buf, b->last - b->pos > 256 ? "..." : "",
+                       b->last - b->pos);
+    }
+#endif
+
+    if (r->request_body_no_buffering) {
+
+        u->request_bufs = cl;
+
+    } else {
+
+        body = u->request_bufs;
+        u->request_bufs = cl;
+
+        if (body == NULL) {
+            f = (ngx_http_grpc_frame_t *) headers_frame;
+            f->flags |= NGX_HTTP_V2_END_STREAM_FLAG;
+        }
+
+        while (body) {
+            b = ngx_alloc_buf(r->pool);
+            if (b == NULL) {
+                return NGX_ERROR;
+            }
+
+            ngx_memcpy(b, body->buf, sizeof(ngx_buf_t));
+
+            cl->next = ngx_alloc_chain_link(r->pool);
+            if (cl->next == NULL) {
+                return NGX_ERROR;
+            }
+
+            cl = cl->next;
+            cl->buf = b;
+
+            body = body->next;
+        }
+
+        b->last_buf = 1;
+    }
+
+    u->output.output_filter = ngx_http_grpc_body_output_filter;
+    u->output.filter_ctx = r;
+
+    b->flush = 1;
+    cl->next = NULL;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_reinit_request(ngx_http_request_t *r)
+{
+    ngx_http_grpc_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_grpc_module);
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    ctx->state = 0;
+    ctx->header_sent = 0;
+    ctx->output_closed = 0;
+    ctx->parsing_headers = 0;
+    ctx->end_stream = 0;
+    ctx->status = 0;
+    ctx->connection = NULL;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
+{
+    ngx_http_request_t  *r = data;
+
+    off_t                   file_pos;
+    u_char                 *p, *pos, *start;
+    size_t                  len, limit;
+    ngx_buf_t              *b;
+    ngx_int_t               rc;
+    ngx_uint_t              next, last;
+    ngx_chain_t            *cl, *out, **ll;
+    ngx_http_grpc_ctx_t    *ctx;
+    ngx_http_grpc_frame_t  *f;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc output filter");
+
+    ctx = ngx_http_grpc_get_ctx(r);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (in) {
+        if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    out = NULL;
+    ll = &out;
+
+    if (!ctx->header_sent) {
+        /* first buffer contains headers */
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc output header");
+
+        ctx->header_sent = 1;
+
+        if (ctx->id != 1) {
+            /*
+             * keepalive connection: skip connection preface,
+             * update stream identifiers
+             */
+
+            b = ctx->in->buf;
+            b->pos += sizeof(ngx_http_grpc_connection_start) - 1;
+
+            p = b->pos;
+
+            while (p < b->last) {
+                f = (ngx_http_grpc_frame_t *) p;
+                p += sizeof(ngx_http_grpc_frame_t);
+
+                f->stream_id_0 = (u_char) ((ctx->id >> 24) & 0xff);
+                f->stream_id_1 = (u_char) ((ctx->id >> 16) & 0xff);
+                f->stream_id_2 = (u_char) ((ctx->id >> 8) & 0xff);
+                f->stream_id_3 = (u_char) (ctx->id & 0xff);
+
+                p += (f->length_0 << 16) + (f->length_1 << 8) + f->length_2;
+            }
+        }
+
+        if (ctx->in->buf->last_buf) {
+            ctx->output_closed = 1;
+        }
+
+        *ll = ctx->in;
+        ll = &ctx->in->next;
+
+        ctx->in = ctx->in->next;
+    }
+
+    if (ctx->out) {
+        /* queued control frames */
+
+        *ll = ctx->out;
+
+        for (cl = ctx->out, ll = &cl->next; cl; cl = cl->next) {
+            ll = &cl->next;
+        }
+
+        ctx->out = NULL;
+    }
+
+    f = NULL;
+    last = 0;
+
+    limit = ngx_max(0, ctx->send_window);
+
+    if (limit > ctx->connection->send_window) {
+        limit = ctx->connection->send_window;
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc output limit: %uz w:%z:%uz",
+                   limit, ctx->send_window, ctx->connection->send_window);
+
+#if (NGX_SUPPRESS_WARN)
+    file_pos = 0;
+    pos = NULL;
+    cl = NULL;
+#endif
+
+    in = ctx->in;
+
+    while (in && limit > 0) {
+
+        ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
+                       "grpc output in  l:%d f:%d %p, pos %p, size: %z "
+                       "file: %O, size: %O",
+                       in->buf->last_buf,
+                       in->buf->in_file,
+                       in->buf->start, in->buf->pos,
+                       in->buf->last - in->buf->pos,
+                       in->buf->file_pos,
+                       in->buf->file_last - in->buf->file_pos);
+
+        if (ngx_buf_special(in->buf)) {
+            goto next;
+        }
+
+        if (in->buf->in_file) {
+            file_pos = in->buf->file_pos;
+
+        } else {
+            pos = in->buf->pos;
+        }
+
+        next = 0;
+
+        do {
+
+            cl = ngx_http_grpc_get_buf(r, ctx);
+            if (cl == NULL) {
+                return NGX_ERROR;
+            }
+
+            b = cl->buf;
+
+            f = (ngx_http_grpc_frame_t *) b->last;
+            b->last += sizeof(ngx_http_grpc_frame_t);
+
+            *ll = cl;
+            ll = &cl->next;
+
+            cl = ngx_chain_get_free_buf(r->pool, &ctx->free);
+            if (cl == NULL) {
+                return NGX_ERROR;
+            }
+
+            b = cl->buf;
+            start = b->start;
+
+            ngx_memcpy(b, in->buf, sizeof(ngx_buf_t));
+
+            /*
+             * restore b->start to preserve memory allocated in the buffer,
+             * to reuse it later for headers and control frames
+             */
+
+            b->start = start;
+
+            if (in->buf->in_file) {
+                b->file_pos = file_pos;
+                file_pos += ngx_min(NGX_HTTP_V2_DEFAULT_FRAME_SIZE, limit);
+
+                if (file_pos >= in->buf->file_last) {
+                    file_pos = in->buf->file_last;
+                    next = 1;
+                }
+
+                b->file_last = file_pos;
+                len = (ngx_uint_t) (file_pos - b->file_pos);
+
+            } else {
+                b->pos = pos;
+                pos += ngx_min(NGX_HTTP_V2_DEFAULT_FRAME_SIZE, limit);
+
+                if (pos >= in->buf->last) {
+                    pos = in->buf->last;
+                    next = 1;
+                }
+
+                b->last = pos;
+                len = (ngx_uint_t) (pos - b->pos);
+            }
+
+            b->tag = (ngx_buf_tag_t) &ngx_http_grpc_body_output_filter;
+            b->shadow = in->buf;
+            b->last_shadow = next;
+
+            b->last_buf = 0;
+            b->last_in_chain = 0;
+
+            *ll = cl;
+            ll = &cl->next;
+
+            f->length_0 = (u_char) ((len >> 16) & 0xff);
+            f->length_1 = (u_char) ((len >> 8) & 0xff);
+            f->length_2 = (u_char) (len & 0xff);
+            f->type = NGX_HTTP_V2_DATA_FRAME;
+            f->flags = 0;
+            f->stream_id_0 = (u_char) ((ctx->id >> 24) & 0xff);
+            f->stream_id_1 = (u_char) ((ctx->id >> 16) & 0xff);
+            f->stream_id_2 = (u_char) ((ctx->id >> 8) & 0xff);
+            f->stream_id_3 = (u_char) (ctx->id & 0xff);
+
+            limit -= len;
+            ctx->send_window -= len;
+            ctx->connection->send_window -= len;
+
+        } while (!next && limit > 0);
+
+        if (!next) {
+            /*
+             * if the buffer wasn't fully sent due to flow control limits,
+             * preserve position for future use
+             */
+
+            if (in->buf->in_file) {
+                in->buf->file_pos = file_pos;
+
+            } else {
+                in->buf->pos = pos;
+            }
+
+            break;
+        }
+
+    next:
+
+        if (in->buf->last_buf) {
+            last = 1;
+        }
+
+        in = in->next;
+    }
+
+    ctx->in = in;
+
+    if (last) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc output last");
+
+        ctx->output_closed = 1;
+
+        if (f) {
+            f->flags |= NGX_HTTP_V2_END_STREAM_FLAG;
+
+        } else {
+            cl = ngx_http_grpc_get_buf(r, ctx);
+            if (cl == NULL) {
+                return NGX_ERROR;
+            }
+
+            b = cl->buf;
+
+            f = (ngx_http_grpc_frame_t *) b->last;
+            b->last += sizeof(ngx_http_grpc_frame_t);
+
+            f->length_0 = 0;
+            f->length_1 = 0;
+            f->length_2 = 0;
+            f->type = NGX_HTTP_V2_DATA_FRAME;
+            f->flags = NGX_HTTP_V2_END_STREAM_FLAG;
+            f->stream_id_0 = (u_char) ((ctx->id >> 24) & 0xff);
+            f->stream_id_1 = (u_char) ((ctx->id >> 16) & 0xff);
+            f->stream_id_2 = (u_char) ((ctx->id >> 8) & 0xff);
+            f->stream_id_3 = (u_char) (ctx->id & 0xff);
+
+            *ll = cl;
+            ll = &cl->next;
+        }
+
+        cl->buf->last_buf = 1;
+    }
+
+    *ll = NULL;
+
+#if (NGX_DEBUG)
+
+    for (cl = out; cl; cl = cl->next) {
+        ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
+                       "grpc output out l:%d f:%d %p, pos %p, size: %z "
+                       "file: %O, size: %O",
+                       cl->buf->last_buf,
+                       cl->buf->in_file,
+                       cl->buf->start, cl->buf->pos,
+                       cl->buf->last - cl->buf->pos,
+                       cl->buf->file_pos,
+                       cl->buf->file_last - cl->buf->file_pos);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc output limit: %uz w:%z:%uz",
+                   limit, ctx->send_window, ctx->connection->send_window);
+
+#endif
+
+    rc = ngx_chain_writer(&r->upstream->writer, out);
+
+    ngx_chain_update_chains(r->pool, &ctx->free, &ctx->busy, &out,
+                            (ngx_buf_tag_t) &ngx_http_grpc_body_output_filter);
+
+    for (cl = ctx->free; cl; cl = cl->next) {
+
+        /* mark original buffers as sent */
+
+        if (cl->buf->shadow) {
+            if (cl->buf->last_shadow) {
+                b = cl->buf->shadow;
+                b->pos = b->last;
+            }
+
+            cl->buf->shadow = NULL;
+        }
+    }
+
+    if (rc == NGX_OK && ctx->in) {
+        rc = NGX_AGAIN;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_process_header(ngx_http_request_t *r)
+{
+    ngx_str_t                      *status_line;
+    ngx_int_t                       rc, status;
+    ngx_buf_t                      *b;
+    ngx_table_elt_t                *h;
+    ngx_http_upstream_t            *u;
+    ngx_http_grpc_ctx_t            *ctx;
+    ngx_http_upstream_header_t     *hh;
+    ngx_http_upstream_main_conf_t  *umcf;
+
+    u = r->upstream;
+    b = &u->buffer;
+
+#if (NGX_DEBUG)
+    if (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP) {
+        u_char  buf[512];
+        size_t  n, m;
+
+        n = ngx_min(b->last - b->pos, 256);
+        m = ngx_hex_dump(buf, b->pos, n) - buf;
+
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc response: %*s%s, len: %uz",
+                       m, buf, b->last - b->pos > 256 ? "..." : "",
+                       b->last - b->pos);
+    }
+#endif
+
+    ctx = ngx_http_grpc_get_ctx(r);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
+
+    for ( ;; ) {
+
+        if (ctx->state < ngx_http_grpc_st_payload) {
+
+            rc = ngx_http_grpc_parse_frame(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+
+                /*
+                 * there can be a lot of window update frames,
+                 * so we reset buffer if it is empty and we haven't
+                 * started parsing headers yet
+                 */
+
+                if (!ctx->parsing_headers) {
+                    b->pos = b->start;
+                    b->last = b->pos;
+                }
+
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+            }
+
+            /*
+             * RFC 7540 says that implementations MUST discard frames
+             * that have unknown or unsupported types.  However, extension
+             * frames that appear in the middle of a header block are
+             * not permitted.  Also, for obvious reasons CONTINUATION frames
+             * cannot appear before headers, and DATA frames are not expected
+             * to appear before all headers are parsed.
+             */
+
+            if (ctx->type == NGX_HTTP_V2_DATA_FRAME
+                || (ctx->type == NGX_HTTP_V2_CONTINUATION_FRAME
+                    && !ctx->parsing_headers)
+                || (ctx->type != NGX_HTTP_V2_CONTINUATION_FRAME
+                    && ctx->parsing_headers))
+            {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent unexpected http2 frame: %d",
+                              ctx->type);
+                return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+            }
+
+            if (ctx->stream_id && ctx->stream_id != ctx->id) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent frame for unknown stream %ui",
+                              ctx->stream_id);
+                return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+            }
+        }
+
+        /* frame payload */
+
+        if (ctx->type == NGX_HTTP_V2_RST_STREAM_FRAME) {
+
+            rc = ngx_http_grpc_parse_rst_stream(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+            }
+
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream rejected request with error %ui",
+                          ctx->error);
+
+            return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_GOAWAY_FRAME) {
+
+            rc = ngx_http_grpc_parse_goaway(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+            }
+
+            /*
+             * If stream_id is lower than one we use, our
+             * request won't be processed and needs to be retried.
+             * If stream_id is greater or equal to the one we use,
+             * we can continue normally (except we can't use this
+             * connection for additional requests).  If there is
+             * a real error, the connection will be closed.
+             */
+
+            if (ctx->stream_id < ctx->id) {
+
+                /* TODO: we can retry non-idempotent requests */
+
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent goaway with error %ui",
+                              ctx->error);
+
+                return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+            }
+
+            continue;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_WINDOW_UPDATE_FRAME) {
+
+            rc = ngx_http_grpc_parse_window_update(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+            }
+
+            if (ctx->in) {
+                ngx_post_event(u->peer.connection->write, &ngx_posted_events);
+            }
+
+            continue;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_SETTINGS_FRAME) {
+
+            rc = ngx_http_grpc_parse_settings(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+            }
+
+            if (ctx->in) {
+                ngx_post_event(u->peer.connection->write, &ngx_posted_events);
+            }
+
+            continue;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_PING_FRAME) {
+
+            rc = ngx_http_grpc_parse_ping(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+            }
+
+            ngx_post_event(u->peer.connection->write, &ngx_posted_events);
+            continue;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_PUSH_PROMISE_FRAME) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent unexpected push promise frame");
+            return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+        }
+
+        if (ctx->type != NGX_HTTP_V2_HEADERS_FRAME
+            && ctx->type != NGX_HTTP_V2_CONTINUATION_FRAME)
+        {
+            /* priority, unknown frames */
+
+            if (b->last - b->pos < (ssize_t) ctx->rest) {
+                ctx->rest -= b->last - b->pos;
+                b->pos = b->last;
+                return NGX_AGAIN;
+            }
+
+            b->pos += ctx->rest;
+            ctx->rest = 0;
+            ctx->state = ngx_http_grpc_st_start;
+
+            continue;
+        }
+
+        /* headers */
+
+        for ( ;; ) {
+
+            rc = ngx_http_grpc_parse_header(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                break;
+            }
+
+            if (rc == NGX_OK) {
+
+                /* a header line has been parsed successfully */
+
+                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "grpc header: \"%V: %V\"",
+                               &ctx->name, &ctx->value);
+
+                if (ctx->name.len && ctx->name.data[0] == ':') {
+
+                    if (ctx->name.len != sizeof(":status") - 1
+                        || ngx_strncmp(ctx->name.data, ":status",
+                                       sizeof(":status") - 1)
+                           != 0)
+                    {
+                        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                      "upstream sent invalid header \"%V: %V\"",
+                                      &ctx->name, &ctx->value);
+                        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+                    }
+
+                    if (ctx->status) {
+                        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                      "upstream sent duplicate :status header");
+                        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+                    }
+
+                    status_line = &ctx->value;
+
+                    if (status_line->len != 3) {
+                        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                      "upstream sent invalid :status \"%V\"",
+                                      status_line);
+                        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+                    }
+
+                    status = ngx_atoi(status_line->data, 3);
+
+                    if (status == NGX_ERROR) {
+                        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                      "upstream sent invalid :status \"%V\"",
+                                      status_line);
+                        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+                    }
+
+                    if (status < NGX_HTTP_OK) {
+                        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                      "upstream sent unexpected :status \"%V\"",
+                                      status_line);
+                        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+                    }
+
+                    u->headers_in.status_n = status;
+
+                    if (u->state && u->state->status == 0) {
+                        u->state->status = status;
+                    }
+
+                    ctx->status = 1;
+
+                    continue;
+
+                } else if (!ctx->status) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent no :status header");
+                    return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+                }
+
+                h = ngx_list_push(&u->headers_in.headers);
+                if (h == NULL) {
+                    return NGX_ERROR;
+                }
+
+                h->key = ctx->name;
+                h->value = ctx->value;
+                h->lowcase_key = h->key.data;
+                h->hash = ngx_hash_key(h->key.data, h->key.len);
+
+                hh = ngx_hash_find(&umcf->headers_in_hash, h->hash,
+                                   h->lowcase_key, h->key.len);
+
+                if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+
+                continue;
+            }
+
+            if (rc == NGX_HTTP_PARSE_HEADER_DONE) {
+
+                /* a whole header has been parsed successfully */
+
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "grpc header done");
+
+                if (ctx->end_stream) {
+                    u->headers_in.content_length_n = 0;
+
+                    if (ctx->in == NULL
+                        && ctx->out == NULL
+                        && ctx->output_closed
+                        && b->last == b->pos)
+                    {
+                        u->keepalive = 1;
+                    }
+                }
+
+                return NGX_OK;
+            }
+
+            /* there was error while a header line parsing */
+
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent invalid header");
+
+            return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+        }
+
+        /* rc == NGX_AGAIN */
+
+        if (ctx->rest == 0) {
+            ctx->state = ngx_http_grpc_st_start;
+            continue;
+        }
+
+        return NGX_AGAIN;
+    }
+}
+
+
+static ngx_int_t
+ngx_http_grpc_filter_init(void *data)
+{
+    ngx_http_grpc_ctx_t  *ctx = data;
+
+    ngx_http_request_t   *r;
+    ngx_http_upstream_t  *u;
+
+    r = ctx->request;
+    u = r->upstream;
+
+    u->length = 1;
+
+    if (ctx->end_stream) {
+        u->length = 0;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_filter(void *data, ssize_t bytes)
+{
+    ngx_http_grpc_ctx_t  *ctx = data;
+
+    ngx_int_t             rc;
+    ngx_buf_t            *b, *buf;
+    ngx_chain_t          *cl, **ll;
+    ngx_table_elt_t      *h;
+    ngx_http_request_t   *r;
+    ngx_http_upstream_t  *u;
+
+    r = ctx->request;
+    u = r->upstream;
+    b = &u->buffer;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc filter bytes:%z", bytes);
+
+    b->pos = b->last;
+    b->last += bytes;
+
+    for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
+        ll = &cl->next;
+    }
+
+    for ( ;; ) {
+
+        if (ctx->state < ngx_http_grpc_st_payload) {
+
+            rc = ngx_http_grpc_parse_frame(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if ((ctx->type == NGX_HTTP_V2_CONTINUATION_FRAME
+                 && !ctx->parsing_headers)
+                || (ctx->type != NGX_HTTP_V2_CONTINUATION_FRAME
+                    && ctx->parsing_headers))
+            {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent unexpected http2 frame: %d",
+                              ctx->type);
+                return NGX_ERROR;
+            }
+
+            if (ctx->type == NGX_HTTP_V2_DATA_FRAME) {
+
+                if (ctx->stream_id != ctx->id) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent data frame "
+                                  "for unknown stream %ui",
+                                  ctx->stream_id);
+                    return NGX_ERROR;
+                }
+
+                if (ctx->rest > ctx->recv_window) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream violated stream flow control, "
+                                  "received %uz data frame with window %uz",
+                                  ctx->rest, ctx->recv_window);
+                    return NGX_ERROR;
+                }
+
+                if (ctx->rest > ctx->connection->recv_window) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream violated connection flow control, "
+                                  "received %uz data frame with window %uz",
+                                  ctx->rest, ctx->connection->recv_window);
+                    return NGX_ERROR;
+                }
+
+                ctx->recv_window -= ctx->rest;
+                ctx->connection->recv_window -= ctx->rest;
+
+                if (ctx->connection->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4
+                    || ctx->recv_window < NGX_HTTP_V2_MAX_WINDOW / 4)
+                {
+                    if (ngx_http_grpc_send_window_update(r, ctx) != NGX_OK) {
+                        return NGX_ERROR;
+                    }
+
+                    ngx_post_event(u->peer.connection->write,
+                                   &ngx_posted_events);
+                }
+            }
+
+            if (ctx->stream_id && ctx->stream_id != ctx->id) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent frame for unknown stream %ui",
+                              ctx->stream_id);
+                return NGX_ERROR;
+            }
+
+            ctx->padding = 0;
+        }
+
+        if (ctx->state == ngx_http_grpc_st_padding) {
+
+            if (b->last - b->pos < (ssize_t) ctx->rest) {
+                ctx->rest -= b->last - b->pos;
+                b->pos = b->last;
+                return NGX_AGAIN;
+            }
+
+            b->pos += ctx->rest;
+            ctx->rest = 0;
+            ctx->state = ngx_http_grpc_st_start;
+
+            if (ctx->flags & NGX_HTTP_V2_END_STREAM_FLAG) {
+                u->length = 0;
+
+                if (ctx->in == NULL
+                    && ctx->out == NULL
+                    && ctx->output_closed
+                    && b->last == b->pos)
+                {
+                    u->keepalive = 1;
+                }
+
+                break;
+            }
+
+            continue;
+        }
+
+        /* frame payload */
+
+        if (ctx->type == NGX_HTTP_V2_RST_STREAM_FRAME) {
+
+            rc = ngx_http_grpc_parse_rst_stream(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream rejected request with error %ui",
+                          ctx->error);
+
+            return NGX_ERROR;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_GOAWAY_FRAME) {
+
+            rc = ngx_http_grpc_parse_goaway(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            /*
+             * If stream_id is lower than one we use, our
+             * request won't be processed and needs to be retried.
+             * If stream_id is greater or equal to the one we use,
+             * we can continue normally (except we can't use this
+             * connection for additional requests).  If there is
+             * a real error, the connection will be closed.
+             */
+
+            if (ctx->stream_id < ctx->id) {
+
+                /* TODO: we can retry non-idempotent requests */
+
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent goaway with error %ui",
+                              ctx->error);
+
+                return NGX_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_WINDOW_UPDATE_FRAME) {
+
+            rc = ngx_http_grpc_parse_window_update(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (ctx->in) {
+                ngx_post_event(u->peer.connection->write, &ngx_posted_events);
+            }
+
+            continue;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_SETTINGS_FRAME) {
+
+            rc = ngx_http_grpc_parse_settings(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (ctx->in) {
+                ngx_post_event(u->peer.connection->write, &ngx_posted_events);
+            }
+
+            continue;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_PING_FRAME) {
+
+            rc = ngx_http_grpc_parse_ping(r, ctx, b);
+
+            if (rc == NGX_AGAIN) {
+                return NGX_AGAIN;
+            }
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            ngx_post_event(u->peer.connection->write, &ngx_posted_events);
+            continue;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_PUSH_PROMISE_FRAME) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent unexpected push promise frame");
+            return NGX_ERROR;
+        }
+
+        if (ctx->type == NGX_HTTP_V2_HEADERS_FRAME
+            || ctx->type == NGX_HTTP_V2_CONTINUATION_FRAME)
+        {
+            for ( ;; ) {
+
+                rc = ngx_http_grpc_parse_header(r, ctx, b);
+
+                if (rc == NGX_AGAIN) {
+                    break;
+                }
+
+                if (rc == NGX_OK) {
+
+                    /* a header line has been parsed successfully */
+
+                    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                                   "grpc trailer: \"%V: %V\"",
+                                   &ctx->name, &ctx->value);
+
+                    if (ctx->name.len && ctx->name.data[0] == ':') {
+                        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                      "upstream sent invalid "
+                                      "trailer \"%V: %V\"",
+                                      &ctx->name, &ctx->value);
+                        return NGX_ERROR;
+                    }
+
+                    h = ngx_list_push(&u->headers_in.trailers);
+                    if (h == NULL) {
+                        return NGX_ERROR;
+                    }
+
+                    h->key = ctx->name;
+                    h->value = ctx->value;
+                    h->lowcase_key = h->key.data;
+                    h->hash = ngx_hash_key(h->key.data, h->key.len);
+
+                    continue;
+                }
+
+                if (rc == NGX_HTTP_PARSE_HEADER_DONE) {
+
+                    /* a whole header has been parsed successfully */
+
+                    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                                   "grpc trailer done");
+
+                    if (ctx->end_stream) {
+                        u->length = 0;
+
+                        if (ctx->in == NULL
+                            && ctx->out == NULL
+                            && ctx->output_closed
+                            && b->last == b->pos)
+                        {
+                            u->keepalive = 1;
+                        }
+
+                        return NGX_OK;
+                    }
+
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent trailer without "
+                                  "end stream flag");
+                    return NGX_ERROR;
+                }
+
+                /* there was error while a header line parsing */
+
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent invalid trailer");
+
+                return NGX_ERROR;
+            }
+
+            /* rc == NGX_AGAIN */
+
+            if (ctx->rest == 0) {
+                ctx->state = ngx_http_grpc_st_start;
+                continue;
+            }
+
+            return NGX_AGAIN;
+        }
+
+        if (ctx->type != NGX_HTTP_V2_DATA_FRAME) {
+
+            /* priority, unknown frames */
+
+            if (b->last - b->pos < (ssize_t) ctx->rest) {
+                ctx->rest -= b->last - b->pos;
+                b->pos = b->last;
+                return NGX_AGAIN;
+            }
+
+            b->pos += ctx->rest;
+            ctx->rest = 0;
+            ctx->state = ngx_http_grpc_st_start;
+
+            continue;
+        }
+
+        /*
+         * data frame:
+         *
+         * +---------------+
+         * |Pad Length? (8)|
+         * +---------------+-----------------------------------------------+
+         * |                            Data (*)                         ...
+         * +---------------------------------------------------------------+
+         * |                           Padding (*)                       ...
+         * +---------------------------------------------------------------+
+         */
+
+        if (ctx->flags & NGX_HTTP_V2_PADDED_FLAG) {
+
+            if (ctx->rest == 0) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent too short http2 frame");
+                return NGX_ERROR;
+            }
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ctx->flags &= ~NGX_HTTP_V2_PADDED_FLAG;
+            ctx->padding = *b->pos++;
+            ctx->rest -= 1;
+
+            if (ctx->padding > ctx->rest) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent http2 frame with too long "
+                              "padding: %d in frame %uz",
+                              ctx->padding, ctx->rest);
+                return NGX_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ctx->rest == ctx->padding) {
+            goto done;
+        }
+
+        if (b->pos == b->last) {
+            return NGX_AGAIN;
+        }
+
+        cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs);
+        if (cl == NULL) {
+            return NGX_ERROR;
+        }
+
+        *ll = cl;
+        ll = &cl->next;
+
+        buf = cl->buf;
+
+        buf->flush = 1;
+        buf->memory = 1;
+
+        buf->pos = b->pos;
+        buf->tag = u->output.tag;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc output buf %p", buf->pos);
+
+        if (b->last - b->pos < (ssize_t) ctx->rest - ctx->padding) {
+
+            ctx->rest -= b->last - b->pos;
+            b->pos = b->last;
+            buf->last = b->pos;
+
+            return NGX_AGAIN;
+        }
+
+        b->pos += ctx->rest - ctx->padding;
+        buf->last = b->pos;
+        ctx->rest = ctx->padding;
+
+    done:
+
+        if (ctx->padding) {
+            ctx->state = ngx_http_grpc_st_padding;
+            continue;
+        }
+
+        ctx->state = ngx_http_grpc_st_start;
+
+        if (ctx->flags & NGX_HTTP_V2_END_STREAM_FLAG) {
+            u->length = 0;
+
+            if (ctx->in == NULL
+                && ctx->out == NULL
+                && ctx->output_closed
+                && b->last == b->pos)
+            {
+                u->keepalive = 1;
+            }
+
+            break;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_parse_frame(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
+    ngx_buf_t *b)
+{
+    u_char                 ch, *p;
+    ngx_http_grpc_state_e  state;
+
+    state = ctx->state;
+
+    for (p = b->pos; p < b->last; p++) {
+        ch = *p;
+
+#if 0
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc frame byte: %02Xd, s:%d", ch, state);
+#endif
+
+        switch (state) {
+
+        case ngx_http_grpc_st_start:
+            ctx->rest = ch << 16;
+            state = ngx_http_grpc_st_length_2;
+            break;
+
+        case ngx_http_grpc_st_length_2:
+            ctx->rest |= ch << 8;
+            state = ngx_http_grpc_st_length_3;
+            break;
+
+        case ngx_http_grpc_st_length_3:
+            ctx->rest |= ch;
+
+            if (ctx->rest > NGX_HTTP_V2_DEFAULT_FRAME_SIZE) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent too large http2 frame: %uz",
+                              ctx->rest);
+                return NGX_ERROR;
+            }
+
+            state = ngx_http_grpc_st_type;
+            break;
+
+        case ngx_http_grpc_st_type:
+            ctx->type = ch;
+            state = ngx_http_grpc_st_flags;
+            break;
+
+        case ngx_http_grpc_st_flags:
+            ctx->flags = ch;
+            state = ngx_http_grpc_st_stream_id;
+            break;
+
+        case ngx_http_grpc_st_stream_id:
+            ctx->stream_id = (ch & 0x7f) << 24;
+            state = ngx_http_grpc_st_stream_id_2;
+            break;
+
+        case ngx_http_grpc_st_stream_id_2:
+            ctx->stream_id |= ch << 16;
+            state = ngx_http_grpc_st_stream_id_3;
+            break;
+
+        case ngx_http_grpc_st_stream_id_3:
+            ctx->stream_id |= ch << 8;
+            state = ngx_http_grpc_st_stream_id_4;
+            break;
+
+        case ngx_http_grpc_st_stream_id_4:
+            ctx->stream_id |= ch;
+
+            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc frame: %d, len: %uz, f:%d, i:%ui",
+                           ctx->type, ctx->rest, ctx->flags, ctx->stream_id);
+
+            b->pos = p + 1;
+
+            ctx->state = ngx_http_grpc_st_payload;
+            ctx->frame_state = 0;
+
+            return NGX_OK;
+
+        /* suppress warning */
+        case ngx_http_grpc_st_payload:
+        case ngx_http_grpc_st_padding:
+            break;
+        }
+    }
+
+    b->pos = p;
+    ctx->state = state;
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_parse_header(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
+    ngx_buf_t *b)
+{
+    u_char     ch, *p, *last;
+    size_t     min;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_padding_length,
+        sw_dependency,
+        sw_dependency_2,
+        sw_dependency_3,
+        sw_dependency_4,
+        sw_weight,
+        sw_fragment,
+        sw_padding
+    } state;
+
+    state = ctx->frame_state;
+
+    if (state == sw_start) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc parse header: start");
+
+        if (ctx->type == NGX_HTTP_V2_HEADERS_FRAME) {
+            ctx->parsing_headers = 1;
+            ctx->fragment_state = 0;
+
+            min = (ctx->flags & NGX_HTTP_V2_PADDED_FLAG ? 1 : 0)
+                  + (ctx->flags & NGX_HTTP_V2_PRIORITY_FLAG ? 5 : 0);
+
+            if (ctx->rest < min) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent headers frame "
+                              "with invalid length: %uz",
+                              ctx->rest);
+                return NGX_ERROR;
+            }
+
+            if (ctx->flags & NGX_HTTP_V2_END_STREAM_FLAG) {
+                ctx->end_stream = 1;
+            }
+
+            if (ctx->flags & NGX_HTTP_V2_PADDED_FLAG) {
+                state = sw_padding_length;
+
+            } else if (ctx->flags & NGX_HTTP_V2_PRIORITY_FLAG) {
+                state = sw_dependency;
+
+            } else {
+                state = sw_fragment;
+            }
+
+        } else if (ctx->type == NGX_HTTP_V2_CONTINUATION_FRAME) {
+            state = sw_fragment;
+        }
+
+        ctx->padding = 0;
+        ctx->frame_state = state;
+    }
+
+    if (state < sw_fragment) {
+
+        if (b->last - b->pos < (ssize_t) ctx->rest) {
+            last = b->last;
+
+        } else {
+            last = b->pos + ctx->rest;
+        }
+
+        for (p = b->pos; p < last; p++) {
+            ch = *p;
+
+#if 0
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc header byte: %02Xd s:%d", ch, state);
+#endif
+
+            /*
+             * headers frame:
+             *
+             * +---------------+
+             * |Pad Length? (8)|
+             * +-+-------------+----------------------------------------------+
+             * |E|                 Stream Dependency? (31)                    |
+             * +-+-------------+----------------------------------------------+
+             * |  Weight? (8)  |
+             * +-+-------------+----------------------------------------------+
+             * |                   Header Block Fragment (*)                ...
+             * +--------------------------------------------------------------+
+             * |                           Padding (*)                      ...
+             * +--------------------------------------------------------------+
+             */
+
+            switch (state) {
+
+            case sw_padding_length:
+
+                ctx->padding = ch;
+
+                if (ctx->flags & NGX_HTTP_V2_PRIORITY_FLAG) {
+                    state = sw_dependency;
+                    break;
+                }
+
+                goto fragment;
+
+            case sw_dependency:
+                state = sw_dependency_2;
+                break;
+
+            case sw_dependency_2:
+                state = sw_dependency_3;
+                break;
+
+            case sw_dependency_3:
+                state = sw_dependency_4;
+                break;
+
+            case sw_dependency_4:
+                state = sw_weight;
+                break;
+
+            case sw_weight:
+                goto fragment;
+
+            /* suppress warning */
+            case sw_start:
+            case sw_fragment:
+            case sw_padding:
+                break;
+            }
+        }
+
+        ctx->rest -= p - b->pos;
+        b->pos = p;
+
+        ctx->frame_state = state;
+        return NGX_AGAIN;
+
+    fragment:
+
+        p++;
+        ctx->rest -= p - b->pos;
+        b->pos = p;
+
+        if (ctx->padding > ctx->rest) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent http2 frame with too long "
+                          "padding: %d in frame %uz",
+                          ctx->padding, ctx->rest);
+            return NGX_ERROR;
+        }
+
+        state = sw_fragment;
+        ctx->frame_state = state;
+    }
+
+    if (state == sw_fragment) {
+
+        rc = ngx_http_grpc_parse_fragment(r, ctx, b);
+
+        if (rc == NGX_AGAIN) {
+            return NGX_AGAIN;
+        }
+
+        if (rc == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        if (rc == NGX_OK) {
+            return NGX_OK;
+        }
+
+        /* rc == NGX_DONE */
+
+        state = sw_padding;
+        ctx->frame_state = state;
+    }
+
+    if (state == sw_padding) {
+
+        if (b->last - b->pos < (ssize_t) ctx->rest) {
+
+            ctx->rest -= b->last - b->pos;
+            b->pos = b->last;
+
+            return NGX_AGAIN;
+        }
+
+        b->pos += ctx->rest;
+        ctx->rest = 0;
+
+        ctx->state = ngx_http_grpc_st_start;
+
+        if (ctx->flags & NGX_HTTP_V2_END_HEADERS_FLAG) {
+
+            if (ctx->fragment_state) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent truncated http2 header");
+                return NGX_ERROR;
+            }
+
+            ctx->parsing_headers = 0;
+
+            return NGX_HTTP_PARSE_HEADER_DONE;
+        }
+
+        return NGX_AGAIN;
+    }
+
+    /* unreachable */
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_parse_fragment(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
+    ngx_buf_t *b)
+{
+    u_char      ch, *p, *last;
+    size_t      size;
+    ngx_uint_t  index, size_update;
+    enum {
+        sw_start = 0,
+        sw_index,
+        sw_name_length,
+        sw_name_length_2,
+        sw_name_length_3,
+        sw_name_length_4,
+        sw_name,
+        sw_name_bytes,
+        sw_value_length,
+        sw_value_length_2,
+        sw_value_length_3,
+        sw_value_length_4,
+        sw_value,
+        sw_value_bytes
+    } state;
+
+    /* header block fragment */
+
+#if 0
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc header fragment %p:%p rest:%uz",
+                   b->pos, b->last, ctx->rest);
+#endif
+
+    if (b->last - b->pos < (ssize_t) ctx->rest - ctx->padding) {
+        last = b->last;
+
+    } else {
+        last = b->pos + ctx->rest - ctx->padding;
+    }
+
+    state = ctx->fragment_state;
+
+    for (p = b->pos; p < last; p++) {
+        ch = *p;
+
+#if 0
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc header byte: %02Xd s:%d", ch, state);
+#endif
+
+        switch (state) {
+
+        case sw_start:
+            ctx->index = 0;
+
+            if ((ch & 0x80) == 0x80) {
+                /*
+                 * indexed header:
+                 *
+                 *   0   1   2   3   4   5   6   7
+                 * +---+---+---+---+---+---+---+---+
+                 * | 1 |        Index (7+)         |
+                 * +---+---------------------------+
+                 */
+
+                index = ch & ~0x80;
+
+                if (index == 0 || index > 61) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent invalid http2 "
+                                  "table index: %ui", index);
+                    return NGX_ERROR;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "grpc indexed header: %ui", index);
+
+                ctx->index = index;
+                ctx->literal = 0;
+
+                goto done;
+
+            } else if ((ch & 0xc0) == 0x40) {
+                /*
+                 * literal header with incremental indexing:
+                 *
+                 *   0   1   2   3   4   5   6   7
+                 * +---+---+---+---+---+---+---+---+
+                 * | 0 | 1 |      Index (6+)       |
+                 * +---+---+-----------------------+
+                 * | H |     Value Length (7+)     |
+                 * +---+---------------------------+
+                 * | Value String (Length octets)  |
+                 * +-------------------------------+
+                 *
+                 *   0   1   2   3   4   5   6   7
+                 * +---+---+---+---+---+---+---+---+
+                 * | 0 | 1 |           0           |
+                 * +---+---+-----------------------+
+                 * | H |     Name Length (7+)      |
+                 * +---+---------------------------+
+                 * |  Name String (Length octets)  |
+                 * +---+---------------------------+
+                 * | H |     Value Length (7+)     |
+                 * +---+---------------------------+
+                 * | Value String (Length octets)  |
+                 * +-------------------------------+
+                 */
+
+                index = ch & ~0xc0;
+
+                if (index > 61) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent invalid http2 "
+                                  "table index: %ui", index);
+                    return NGX_ERROR;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "grpc literal header: %ui", index);
+
+                if (index == 0) {
+                    state = sw_name_length;
+                    break;
+                }
+
+                ctx->index = index;
+                ctx->literal = 1;
+
+                state = sw_value_length;
+                break;
+
+            } else if ((ch & 0xe0) == 0x20) {
+                /*
+                 * dynamic table size update:
+                 *
+                 *   0   1   2   3   4   5   6   7
+                 * +---+---+---+---+---+---+---+---+
+                 * | 0 | 0 | 1 |   Max size (5+)   |
+                 * +---+---------------------------+
+                 */
+
+                size_update = ch & ~0xe0;
+
+                if (size_update > 0) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent invalid http2 "
+                                  "dynamic table size update: %ui",
+                                  size_update);
+                    return NGX_ERROR;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "grpc table size update: %ui", size_update);
+
+                break;
+
+            } else if ((ch & 0xf0) == 0x10) {
+                /*
+                 *  literal header field never indexed:
+                 *
+                 *   0   1   2   3   4   5   6   7
+                 * +---+---+---+---+---+---+---+---+
+                 * | 0 | 0 | 0 | 1 |  Index (4+)   |
+                 * +---+---+-----------------------+
+                 * | H |     Value Length (7+)     |
+                 * +---+---------------------------+
+                 * | Value String (Length octets)  |
+                 * +-------------------------------+
+                 *
+                 *   0   1   2   3   4   5   6   7
+                 * +---+---+---+---+---+---+---+---+
+                 * | 0 | 0 | 0 | 1 |       0       |
+                 * +---+---+-----------------------+
+                 * | H |     Name Length (7+)      |
+                 * +---+---------------------------+
+                 * |  Name String (Length octets)  |
+                 * +---+---------------------------+
+                 * | H |     Value Length (7+)     |
+                 * +---+---------------------------+
+                 * | Value String (Length octets)  |
+                 * +-------------------------------+
+                 */
+
+                index = ch & ~0xf0;
+
+                if (index == 0x0f) {
+                    ctx->index = index;
+                    ctx->literal = 1;
+                    state = sw_index;
+                    break;
+                }
+
+                if (index == 0) {
+                    state = sw_name_length;
+                    break;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "grpc literal header never indexed: %ui",
+                               index);
+
+                ctx->index = index;
+                ctx->literal = 1;
+
+                state = sw_value_length;
+                break;
+
+            } else if ((ch & 0xf0) == 0x00) {
+                /*
+                 * literal header field without indexing:
+                 *
+                 *   0   1   2   3   4   5   6   7
+                 * +---+---+---+---+---+---+---+---+
+                 * | 0 | 0 | 0 | 0 |  Index (4+)   |
+                 * +---+---+-----------------------+
+                 * | H |     Value Length (7+)     |
+                 * +---+---------------------------+
+                 * | Value String (Length octets)  |
+                 * +-------------------------------+
+                 *
+                 *   0   1   2   3   4   5   6   7
+                 * +---+---+---+---+---+---+---+---+
+                 * | 0 | 0 | 0 | 0 |       0       |
+                 * +---+---+-----------------------+
+                 * | H |     Name Length (7+)      |
+                 * +---+---------------------------+
+                 * |  Name String (Length octets)  |
+                 * +---+---------------------------+
+                 * | H |     Value Length (7+)     |
+                 * +---+---------------------------+
+                 * | Value String (Length octets)  |
+                 * +-------------------------------+
+                 */
+
+                index = ch & ~0xf0;
+
+                if (index == 0x0f) {
+                    ctx->index = index;
+                    ctx->literal = 1;
+                    state = sw_index;
+                    break;
+                }
+
+                if (index == 0) {
+                    state = sw_name_length;
+                    break;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "grpc literal header without indexing: %ui",
+                               index);
+
+                ctx->index = index;
+                ctx->literal = 1;
+
+                state = sw_value_length;
+                break;
+            }
+
+            /* not reached */
+
+            return NGX_ERROR;
+
+        case sw_index:
+            ctx->index = ctx->index + (ch & ~0x80);
+
+            if (ch & 0x80) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent http2 table index "
+                              "with continuation flag");
+                return NGX_ERROR;
+            }
+
+            if (ctx->index > 61) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent invalid http2 "
+                              "table index: %ui", ctx->index);
+                return NGX_ERROR;
+            }
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc header index: %ui", ctx->index);
+
+            state = sw_value_length;
+            break;
+
+        case sw_name_length:
+            ctx->field_huffman = ch & 0x80 ? 1 : 0;
+            ctx->field_length = ch & ~0x80;
+
+            if (ctx->field_length == 0x7f) {
+                state = sw_name_length_2;
+                break;
+            }
+
+            if (ctx->field_length == 0) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent zero http2 "
+                              "header name length");
+                return NGX_ERROR;
+            }
+
+            state = sw_name;
+            break;
+
+        case sw_name_length_2:
+            ctx->field_length += ch & ~0x80;
+
+            if (ch & 0x80) {
+                state = sw_name_length_3;
+                break;
+            }
+
+            state = sw_name;
+            break;
+
+        case sw_name_length_3:
+            ctx->field_length += (ch & ~0x80) << 7;
+
+            if (ch & 0x80) {
+                state = sw_name_length_4;
+                break;
+            }
+
+            state = sw_name;
+            break;
+
+        case sw_name_length_4:
+            ctx->field_length += (ch & ~0x80) << 14;
+
+            if (ch & 0x80) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent too large http2 "
+                              "header name length");
+                return NGX_ERROR;
+            }
+
+            state = sw_name;
+            break;
+
+        case sw_name:
+            ctx->name.len = ctx->field_huffman ?
+                            ctx->field_length * 8 / 5 : ctx->field_length;
+
+            ctx->name.data = ngx_pnalloc(r->pool, ctx->name.len + 1);
+            if (ctx->name.data == NULL) {
+                return NGX_ERROR;
+            }
+
+            ctx->field_end = ctx->name.data;
+            ctx->field_rest = ctx->field_length;
+            ctx->field_state = 0;
+
+            state = sw_name_bytes;
+
+            /* fall through */
+
+        case sw_name_bytes:
+
+            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc name: len:%uz h:%d last:%uz, rest:%uz",
+                           ctx->field_length,
+                           ctx->field_huffman,
+                           last - p,
+                           ctx->rest - (p - b->pos));
+
+            size = ngx_min(last - p, (ssize_t) ctx->field_rest);
+            ctx->field_rest -= size;
+
+            if (ctx->field_huffman) {
+                if (ngx_http_v2_huff_decode(&ctx->field_state, p, size,
+                                            &ctx->field_end,
+                                            ctx->field_rest == 0,
+                                            r->connection->log)
+                    != NGX_OK)
+                {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent invalid encoded header");
+                    return NGX_ERROR;
+                }
+
+                ctx->name.len = ctx->field_end - ctx->name.data;
+                ctx->name.data[ctx->name.len] = '\0';
+
+            } else {
+                ctx->field_end = ngx_cpymem(ctx->field_end, p, size);
+                ctx->name.data[ctx->name.len] = '\0';
+            }
+
+            p += size - 1;
+
+            if (ctx->field_rest == 0) {
+                state = sw_value_length;
+            }
+
+            break;
+
+        case sw_value_length:
+            ctx->field_huffman = ch & 0x80 ? 1 : 0;
+            ctx->field_length = ch & ~0x80;
+
+            if (ctx->field_length == 0x7f) {
+                state = sw_value_length_2;
+                break;
+            }
+
+            if (ctx->field_length == 0) {
+                ngx_str_set(&ctx->value, "");
+                goto done;
+            }
+
+            state = sw_value;
+            break;
+
+        case sw_value_length_2:
+            ctx->field_length += ch & ~0x80;
+
+            if (ch & 0x80) {
+                state = sw_value_length_3;
+                break;
+            }
+
+            state = sw_value;
+            break;
+
+        case sw_value_length_3:
+            ctx->field_length += (ch & ~0x80) << 7;
+
+            if (ch & 0x80) {
+                state = sw_value_length_4;
+                break;
+            }
+
+            state = sw_value;
+            break;
+
+        case sw_value_length_4:
+            ctx->field_length += (ch & ~0x80) << 14;
+
+            if (ch & 0x80) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent too large http2 "
+                              "header value length");
+                return NGX_ERROR;
+            }
+
+            state = sw_value;
+            break;
+
+        case sw_value:
+            ctx->value.len = ctx->field_huffman ?
+                             ctx->field_length * 8 / 5 : ctx->field_length;
+
+            ctx->value.data = ngx_pnalloc(r->pool, ctx->value.len + 1);
+            if (ctx->value.data == NULL) {
+                return NGX_ERROR;
+            }
+
+            ctx->field_end = ctx->value.data;
+            ctx->field_rest = ctx->field_length;
+            ctx->field_state = 0;
+
+            state = sw_value_bytes;
+
+            /* fall through */
+
+        case sw_value_bytes:
+
+            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc value: len:%uz h:%d last:%uz, rest:%uz",
+                           ctx->field_length,
+                           ctx->field_huffman,
+                           last - p,
+                           ctx->rest - (p - b->pos));
+
+            size = ngx_min(last - p, (ssize_t) ctx->field_rest);
+            ctx->field_rest -= size;
+
+            if (ctx->field_huffman) {
+                if (ngx_http_v2_huff_decode(&ctx->field_state, p, size,
+                                            &ctx->field_end,
+                                            ctx->field_rest == 0,
+                                            r->connection->log)
+                    != NGX_OK)
+                {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent invalid encoded header");
+                    return NGX_ERROR;
+                }
+
+                ctx->value.len = ctx->field_end - ctx->value.data;
+                ctx->value.data[ctx->value.len] = '\0';
+
+            } else {
+                ctx->field_end = ngx_cpymem(ctx->field_end, p, size);
+                ctx->value.data[ctx->value.len] = '\0';
+            }
+
+            p += size - 1;
+
+            if (ctx->field_rest == 0) {
+                goto done;
+            }
+
+            break;
+        }
+
+        continue;
+
+    done:
+
+        p++;
+        ctx->rest -= p - b->pos;
+        ctx->fragment_state = sw_start;
+        b->pos = p;
+
+        if (ctx->index) {
+            ctx->name = *ngx_http_v2_get_static_name(ctx->index);
+        }
+
+        if (ctx->index && !ctx->literal) {
+            ctx->value = *ngx_http_v2_get_static_value(ctx->index);
+        }
+
+        if (!ctx->index) {
+            if (ngx_http_grpc_validate_header_name(r, &ctx->name) != NGX_OK) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent invalid header: \"%V: %V\"",
+                              &ctx->name, &ctx->value);
+                return NGX_ERROR;
+            }
+        }
+
+        if (!ctx->index || ctx->literal) {
+            if (ngx_http_grpc_validate_header_value(r, &ctx->value) != NGX_OK) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent invalid header: \"%V: %V\"",
+                              &ctx->name, &ctx->value);
+                return NGX_ERROR;
+            }
+        }
+
+        return NGX_OK;
+    }
+
+    ctx->rest -= p - b->pos;
+    ctx->fragment_state = state;
+    b->pos = p;
+
+    if (ctx->rest > ctx->padding) {
+        return NGX_AGAIN;
+    }
+
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_validate_header_name(ngx_http_request_t *r, ngx_str_t *s)
+{
+    u_char      ch;
+    ngx_uint_t  i;
+
+    for (i = 0; i < s->len; i++) {
+        ch = s->data[i];
+
+        if (ch == ':' && i > 0) {
+            return NGX_ERROR;
+        }
+
+        if (ch >= 'A' && ch <= 'Z') {
+            return NGX_ERROR;
+        }
+
+        if (ch == '\0' || ch == CR || ch == LF) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_validate_header_value(ngx_http_request_t *r, ngx_str_t *s)
+{
+    u_char      ch;
+    ngx_uint_t  i;
+
+    for (i = 0; i < s->len; i++) {
+        ch = s->data[i];
+
+        if (ch == '\0' || ch == CR || ch == LF) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_parse_rst_stream(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
+    ngx_buf_t *b)
+{
+    u_char  ch, *p, *last;
+    enum {
+        sw_start = 0,
+        sw_error_2,
+        sw_error_3,
+        sw_error_4
+    } state;
+
+    if (b->last - b->pos < (ssize_t) ctx->rest) {
+        last = b->last;
+
+    } else {
+        last = b->pos + ctx->rest;
+    }
+
+    state = ctx->frame_state;
+
+    if (state == sw_start) {
+        if (ctx->rest != 4) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent rst stream frame "
+                          "with invalid length: %uz",
+                          ctx->rest);
+            return NGX_ERROR;
+        }
+    }
+
+    for (p = b->pos; p < last; p++) {
+        ch = *p;
+
+#if 0
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc rst byte: %02Xd s:%d", ch, state);
+#endif
+
+        switch (state) {
+
+        case sw_start:
+            ctx->error = ch << 24;
+            state = sw_error_2;
+            break;
+
+        case sw_error_2:
+            ctx->error |= ch << 16;
+            state = sw_error_3;
+            break;
+
+        case sw_error_3:
+            ctx->error |= ch << 8;
+            state = sw_error_4;
+            break;
+
+        case sw_error_4:
+            ctx->error |= ch;
+            state = sw_start;
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc error: %ui", ctx->error);
+
+            break;
+        }
+    }
+
+    ctx->rest -= p - b->pos;
+    ctx->frame_state = state;
+    b->pos = p;
+
+    if (ctx->rest > 0) {
+        return NGX_AGAIN;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_parse_goaway(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
+    ngx_buf_t *b)
+{
+    u_char  ch, *p, *last;
+    enum {
+        sw_start = 0,
+        sw_last_stream_id_2,
+        sw_last_stream_id_3,
+        sw_last_stream_id_4,
+        sw_error,
+        sw_error_2,
+        sw_error_3,
+        sw_error_4,
+        sw_debug
+    } state;
+
+    if (b->last - b->pos < (ssize_t) ctx->rest) {
+        last = b->last;
+
+    } else {
+        last = b->pos + ctx->rest;
+    }
+
+    state = ctx->frame_state;
+
+    if (state == sw_start) {
+
+        if (ctx->stream_id) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent goaway frame "
+                          "with non-zero stream id: %ui",
+                          ctx->stream_id);
+            return NGX_ERROR;
+        }
+
+        if (ctx->rest < 8) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent goaway frame "
+                          "with invalid length: %uz",
+                          ctx->rest);
+            return NGX_ERROR;
+        }
+    }
+
+    for (p = b->pos; p < last; p++) {
+        ch = *p;
+
+#if 0
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc goaway byte: %02Xd s:%d", ch, state);
+#endif
+
+        switch (state) {
+
+        case sw_start:
+            ctx->stream_id = (ch & 0x7f) << 24;
+            state = sw_last_stream_id_2;
+            break;
+
+        case sw_last_stream_id_2:
+            ctx->stream_id |= ch << 16;
+            state = sw_last_stream_id_3;
+            break;
+
+        case sw_last_stream_id_3:
+            ctx->stream_id |= ch << 8;
+            state = sw_last_stream_id_4;
+            break;
+
+        case sw_last_stream_id_4:
+            ctx->stream_id |= ch;
+            state = sw_error;
+            break;
+
+        case sw_error:
+            ctx->error = ch << 24;
+            state = sw_error_2;
+            break;
+
+        case sw_error_2:
+            ctx->error |= ch << 16;
+            state = sw_error_3;
+            break;
+
+        case sw_error_3:
+            ctx->error |= ch << 8;
+            state = sw_error_4;
+            break;
+
+        case sw_error_4:
+            ctx->error |= ch;
+            state = sw_debug;
+            break;
+
+        case sw_debug:
+            break;
+        }
+    }
+
+    ctx->rest -= p - b->pos;
+    ctx->frame_state = state;
+    b->pos = p;
+
+    if (ctx->rest > 0) {
+        return NGX_AGAIN;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc goaway: %ui, stream %ui",
+                   ctx->error, ctx->stream_id);
+
+    ctx->state = ngx_http_grpc_st_start;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_parse_window_update(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b)
+{
+    u_char  ch, *p, *last;
+    enum {
+        sw_start = 0,
+        sw_size_2,
+        sw_size_3,
+        sw_size_4
+    } state;
+
+    if (b->last - b->pos < (ssize_t) ctx->rest) {
+        last = b->last;
+
+    } else {
+        last = b->pos + ctx->rest;
+    }
+
+    state = ctx->frame_state;
+
+    if (state == sw_start) {
+        if (ctx->rest != 4) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent window update frame "
+                          "with invalid length: %uz",
+                          ctx->rest);
+            return NGX_ERROR;
+        }
+    }
+
+    for (p = b->pos; p < last; p++) {
+        ch = *p;
+
+#if 0
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc window update byte: %02Xd s:%d", ch, state);
+#endif
+
+        switch (state) {
+
+        case sw_start:
+            ctx->window_update = (ch & 0x7f) << 24;
+            state = sw_size_2;
+            break;
+
+        case sw_size_2:
+            ctx->window_update |= ch << 16;
+            state = sw_size_3;
+            break;
+
+        case sw_size_3:
+            ctx->window_update |= ch << 8;
+            state = sw_size_4;
+            break;
+
+        case sw_size_4:
+            ctx->window_update |= ch;
+            state = sw_start;
+            break;
+        }
+    }
+
+    ctx->rest -= p - b->pos;
+    ctx->frame_state = state;
+    b->pos = p;
+
+    if (ctx->rest > 0) {
+        return NGX_AGAIN;
+    }
+
+    ctx->state = ngx_http_grpc_st_start;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc window update: %ui", ctx->window_update);
+
+    if (ctx->stream_id) {
+
+        if (ctx->window_update > (size_t) NGX_HTTP_V2_MAX_WINDOW
+                                 - ctx->send_window)
+        {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent too large window update");
+            return NGX_ERROR;
+        }
+
+        ctx->send_window += ctx->window_update;
+
+    } else {
+
+        if (ctx->window_update > NGX_HTTP_V2_MAX_WINDOW
+                                 - ctx->connection->send_window)
+        {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent too large window update");
+            return NGX_ERROR;
+        }
+
+        ctx->connection->send_window += ctx->window_update;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_parse_settings(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
+    ngx_buf_t *b)
+{
+    u_char   ch, *p, *last;
+    ssize_t  window_update;
+    enum {
+        sw_start = 0,
+        sw_id,
+        sw_id_2,
+        sw_value,
+        sw_value_2,
+        sw_value_3,
+        sw_value_4
+    } state;
+
+    if (b->last - b->pos < (ssize_t) ctx->rest) {
+        last = b->last;
+
+    } else {
+        last = b->pos + ctx->rest;
+    }
+
+    state = ctx->frame_state;
+
+    if (state == sw_start) {
+
+        if (ctx->stream_id) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent settings frame "
+                          "with non-zero stream id: %ui",
+                          ctx->stream_id);
+            return NGX_ERROR;
+        }
+
+        if (ctx->flags & NGX_HTTP_V2_ACK_FLAG) {
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc settings ack");
+
+            if (ctx->rest != 0) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent settings frame "
+                              "with ack flag and non-zero length: %uz",
+                              ctx->rest);
+                return NGX_ERROR;
+            }
+
+            ctx->state = ngx_http_grpc_st_start;
+
+            return NGX_OK;
+        }
+
+        if (ctx->rest % 6 != 0) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent settings frame "
+                          "with invalid length: %uz",
+                          ctx->rest);
+            return NGX_ERROR;
+        }
+    }
+
+    for (p = b->pos; p < last; p++) {
+        ch = *p;
+
+#if 0
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc settings byte: %02Xd s:%d", ch, state);
+#endif
+
+        switch (state) {
+
+        case sw_start:
+        case sw_id:
+            ctx->setting_id = ch << 8;
+            state = sw_id_2;
+            break;
+
+        case sw_id_2:
+            ctx->setting_id |= ch;
+            state = sw_value;
+            break;
+
+        case sw_value:
+            ctx->setting_value = ch << 24;
+            state = sw_value_2;
+            break;
+
+        case sw_value_2:
+            ctx->setting_value |= ch << 16;
+            state = sw_value_3;
+            break;
+
+        case sw_value_3:
+            ctx->setting_value |= ch << 8;
+            state = sw_value_4;
+            break;
+
+        case sw_value_4:
+            ctx->setting_value |= ch;
+            state = sw_id;
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc setting: %ui %ui",
+                           ctx->setting_id, ctx->setting_value);
+
+            /*
+             * The following settings are defined by the protocol:
+             *
+             * SETTINGS_HEADER_TABLE_SIZE, SETTINGS_ENABLE_PUSH,
+             * SETTINGS_MAX_CONCURRENT_STREAMS, SETTINGS_INITIAL_WINDOW_SIZE,
+             * SETTINGS_MAX_FRAME_SIZE, SETTINGS_MAX_HEADER_LIST_SIZE
+             *
+             * Only SETTINGS_INITIAL_WINDOW_SIZE seems to be needed in
+             * a simple client.
+             */
+
+            if (ctx->setting_id == 0x04) {
+                /* SETTINGS_INITIAL_WINDOW_SIZE */
+
+                if (ctx->setting_value > NGX_HTTP_V2_MAX_WINDOW) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent settings frame "
+                                  "with too large initial window size: %ui",
+                                  ctx->setting_value);
+                    return NGX_ERROR;
+                }
+
+                window_update = ctx->setting_value
+                                - ctx->connection->init_window;
+                ctx->connection->init_window = ctx->setting_value;
+
+                if (ctx->send_window > 0
+                    && window_update > (ssize_t) NGX_HTTP_V2_MAX_WINDOW
+                                       - ctx->send_window)
+                {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent settings frame "
+                                  "with too large initial window size: %ui",
+                                  ctx->setting_value);
+                    return NGX_ERROR;
+                }
+
+                ctx->send_window += window_update;
+            }
+
+            break;
+        }
+    }
+
+    ctx->rest -= p - b->pos;
+    ctx->frame_state = state;
+    b->pos = p;
+
+    if (ctx->rest > 0) {
+        return NGX_AGAIN;
+    }
+
+    ctx->state = ngx_http_grpc_st_start;
+
+    return ngx_http_grpc_send_settings_ack(r, ctx);
+}
+
+
+static ngx_int_t
+ngx_http_grpc_parse_ping(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_buf_t *b)
+{
+    u_char  ch, *p, *last;
+    enum {
+        sw_start = 0,
+        sw_data_2,
+        sw_data_3,
+        sw_data_4,
+        sw_data_5,
+        sw_data_6,
+        sw_data_7,
+        sw_data_8
+    } state;
+
+    if (b->last - b->pos < (ssize_t) ctx->rest) {
+        last = b->last;
+
+    } else {
+        last = b->pos + ctx->rest;
+    }
+
+    state = ctx->frame_state;
+
+    if (state == sw_start) {
+
+        if (ctx->stream_id) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent ping frame "
+                          "with non-zero stream id: %ui",
+                          ctx->stream_id);
+            return NGX_ERROR;
+        }
+
+        if (ctx->rest != 8) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent ping frame "
+                          "with invalid length: %uz",
+                          ctx->rest);
+            return NGX_ERROR;
+        }
+
+        if (ctx->flags & NGX_HTTP_V2_ACK_FLAG) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent ping frame with ack flag");
+            return NGX_ERROR;
+        }
+    }
+
+    for (p = b->pos; p < last; p++) {
+        ch = *p;
+
+#if 0
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "grpc ping byte: %02Xd s:%d", ch, state);
+#endif
+
+        if (state < sw_data_8) {
+            ctx->ping_data[state] = ch;
+            state++;
+
+        } else {
+            ctx->ping_data[7] = ch;
+            state = sw_start;
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "grpc ping");
+        }
+    }
+
+    ctx->rest -= p - b->pos;
+    ctx->frame_state = state;
+    b->pos = p;
+
+    if (ctx->rest > 0) {
+        return NGX_AGAIN;
+    }
+
+    ctx->state = ngx_http_grpc_st_start;
+
+    return ngx_http_grpc_send_ping_ack(r, ctx);
+}
+
+
+static ngx_int_t
+ngx_http_grpc_send_settings_ack(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx)
+{
+    ngx_chain_t            *cl, **ll;
+    ngx_http_grpc_frame_t  *f;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc send settings ack");
+
+    for (cl = ctx->out, ll = &ctx->out; cl; cl = cl->next) {
+        ll = &cl->next;
+    }
+
+    cl = ngx_http_grpc_get_buf(r, ctx);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    f = (ngx_http_grpc_frame_t *) cl->buf->last;
+    cl->buf->last += sizeof(ngx_http_grpc_frame_t);
+
+    f->length_0 = 0;
+    f->length_1 = 0;
+    f->length_2 = 0;
+    f->type = NGX_HTTP_V2_SETTINGS_FRAME;
+    f->flags = NGX_HTTP_V2_ACK_FLAG;
+    f->stream_id_0 = 0;
+    f->stream_id_1 = 0;
+    f->stream_id_2 = 0;
+    f->stream_id_3 = 0;
+
+    *ll = cl;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_send_ping_ack(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx)
+{
+    ngx_chain_t            *cl, **ll;
+    ngx_http_grpc_frame_t  *f;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc send ping ack");
+
+    for (cl = ctx->out, ll = &ctx->out; cl; cl = cl->next) {
+        ll = &cl->next;
+    }
+
+    cl = ngx_http_grpc_get_buf(r, ctx);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    f = (ngx_http_grpc_frame_t *) cl->buf->last;
+    cl->buf->last += sizeof(ngx_http_grpc_frame_t);
+
+    f->length_0 = 0;
+    f->length_1 = 0;
+    f->length_2 = 8;
+    f->type = NGX_HTTP_V2_PING_FRAME;
+    f->flags = NGX_HTTP_V2_ACK_FLAG;
+    f->stream_id_0 = 0;
+    f->stream_id_1 = 0;
+    f->stream_id_2 = 0;
+    f->stream_id_3 = 0;
+
+    cl->buf->last = ngx_copy(cl->buf->last, ctx->ping_data, 8);
+
+    *ll = cl;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_send_window_update(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx)
+{
+    size_t                  n;
+    ngx_chain_t            *cl, **ll;
+    ngx_http_grpc_frame_t  *f;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc send window update: %uz %uz",
+                   ctx->connection->recv_window, ctx->recv_window);
+
+    for (cl = ctx->out, ll = &ctx->out; cl; cl = cl->next) {
+        ll = &cl->next;
+    }
+
+    cl = ngx_http_grpc_get_buf(r, ctx);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    f = (ngx_http_grpc_frame_t *) cl->buf->last;
+    cl->buf->last += sizeof(ngx_http_grpc_frame_t);
+
+    f->length_0 = 0;
+    f->length_1 = 0;
+    f->length_2 = 4;
+    f->type = NGX_HTTP_V2_WINDOW_UPDATE_FRAME;
+    f->flags = 0;
+    f->stream_id_0 = 0;
+    f->stream_id_1 = 0;
+    f->stream_id_2 = 0;
+    f->stream_id_3 = 0;
+
+    n = NGX_HTTP_V2_MAX_WINDOW - ctx->connection->recv_window;
+    ctx->connection->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+
+    *cl->buf->last++ = (u_char) ((n >> 24) & 0xff);
+    *cl->buf->last++ = (u_char) ((n >> 16) & 0xff);
+    *cl->buf->last++ = (u_char) ((n >> 8) & 0xff);
+    *cl->buf->last++ = (u_char) (n & 0xff);
+
+    f = (ngx_http_grpc_frame_t *) cl->buf->last;
+    cl->buf->last += sizeof(ngx_http_grpc_frame_t);
+
+    f->length_0 = 0;
+    f->length_1 = 0;
+    f->length_2 = 4;
+    f->type = NGX_HTTP_V2_WINDOW_UPDATE_FRAME;
+    f->flags = 0;
+    f->stream_id_0 = (u_char) ((ctx->id >> 24) & 0xff);
+    f->stream_id_1 = (u_char) ((ctx->id >> 16) & 0xff);
+    f->stream_id_2 = (u_char) ((ctx->id >> 8) & 0xff);
+    f->stream_id_3 = (u_char) (ctx->id & 0xff);
+
+    n = NGX_HTTP_V2_MAX_WINDOW - ctx->recv_window;
+    ctx->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+
+    *cl->buf->last++ = (u_char) ((n >> 24) & 0xff);
+    *cl->buf->last++ = (u_char) ((n >> 16) & 0xff);
+    *cl->buf->last++ = (u_char) ((n >> 8) & 0xff);
+    *cl->buf->last++ = (u_char) (n & 0xff);
+
+    *ll = cl;
+
+    return NGX_OK;
+}
+
+
+static ngx_chain_t *
+ngx_http_grpc_get_buf(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx)
+{
+    ngx_buf_t    *b;
+    ngx_chain_t  *cl;
+
+    cl = ngx_chain_get_free_buf(r->pool, &ctx->free);
+    if (cl == NULL) {
+        return NULL;
+    }
+
+    b = cl->buf;
+
+    b->tag = (ngx_buf_tag_t) &ngx_http_grpc_body_output_filter;
+    b->temporary = 1;
+    b->flush = 1;
+
+    if (b->start == NULL) {
+
+        /*
+         * each buffer is large enough to hold two window update
+         * frames in a row
+         */
+
+        b->start = ngx_palloc(r->pool, 2 * sizeof(ngx_http_grpc_frame_t) + 8);
+        if (b->start == NULL) {
+            return NULL;
+        }
+
+        b->pos = b->start;
+        b->last = b->start;
+
+        b->end = b->start + 2 * sizeof(ngx_http_grpc_frame_t) + 8;
+    }
+
+    return cl;
+}
+
+
+static ngx_http_grpc_ctx_t *
+ngx_http_grpc_get_ctx(ngx_http_request_t *r)
+{
+    ngx_http_grpc_ctx_t  *ctx;
+    ngx_http_upstream_t  *u;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_grpc_module);
+
+    if (ctx->connection == NULL) {
+        u = r->upstream;
+
+        if (ngx_http_grpc_get_connection_data(r, ctx, &u->peer) != NGX_OK) {
+            return NULL;
+        }
+    }
+
+    return ctx;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_get_connection_data(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_peer_connection_t *pc)
+{
+    ngx_connection_t    *c;
+    ngx_pool_cleanup_t  *cln;
+
+    c = pc->connection;
+
+    if (pc->cached) {
+
+        /*
+         * for cached connections, connection data can be found
+         * in the cleanup handler
+         */
+
+        for (cln = c->pool->cleanup; cln; cln = cln->next) {
+            if (cln->handler == ngx_http_grpc_cleanup) {
+                ctx->connection = cln->data;
+                break;
+            }
+        }
+
+        if (ctx->connection == NULL) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                          "no connection data found for "
+                          "keepalive http2 connection");
+            return NGX_ERROR;
+        }
+
+        ctx->send_window = ctx->connection->init_window;
+        ctx->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+
+        ctx->connection->last_stream_id += 2;
+        ctx->id = ctx->connection->last_stream_id;
+
+        return NGX_OK;
+    }
+
+    cln = ngx_pool_cleanup_add(c->pool, sizeof(ngx_http_grpc_conn_t));
+    if (cln == NULL) {
+        return NGX_ERROR;
+    }
+
+    cln->handler = ngx_http_grpc_cleanup;
+    ctx->connection = cln->data;
+
+    ctx->connection->init_window = NGX_HTTP_V2_DEFAULT_WINDOW;
+    ctx->connection->send_window = NGX_HTTP_V2_DEFAULT_WINDOW;
+    ctx->connection->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+
+    ctx->send_window = NGX_HTTP_V2_DEFAULT_WINDOW;
+    ctx->recv_window = NGX_HTTP_V2_MAX_WINDOW;
+
+    ctx->id = 1;
+    ctx->connection->last_stream_id = 1;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_grpc_cleanup(void *data)
+{
+#if 0
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "grpc cleanup");
+#endif
+    return;
+}
+
+
+static void
+ngx_http_grpc_abort_request(ngx_http_request_t *r)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "abort grpc request");
+    return;
+}
+
+
+static void
+ngx_http_grpc_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "finalize grpc request");
+    return;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_internal_trailers_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_table_elt_t  *te;
+
+    te = r->headers_in.te;
+
+    if (te == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    if (ngx_strlcasestrn(te->value.data, te->value.data + te->value.len,
+                         (u_char *) "trailers", 8 - 1)
+        == NULL)
+    {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    v->data = (u_char *) "trailers";
+    v->len = sizeof("trailers") - 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_add_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t  *var, *v;
+
+    for (v = ngx_http_grpc_vars; v->name.len; v++) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_grpc_loc_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_grpc_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->upstream.ignore_headers = 0;
+     *     conf->upstream.next_upstream = 0;
+     *     conf->upstream.hide_headers_hash = { NULL, 0 };
+     *     conf->upstream.ssl_name = NULL;
+     *
+     *     conf->headers_source = NULL;
+     *     conf->headers.lengths = NULL;
+     *     conf->headers.values = NULL;
+     *     conf->headers.hash = { NULL, 0 };
+     *     conf->host = { 0, NULL };
+     *     conf->host_set = 0;
+     *     conf->ssl = 0;
+     *     conf->ssl_protocols = 0;
+     *     conf->ssl_ciphers = { 0, NULL };
+     *     conf->ssl_trusted_certificate = { 0, NULL };
+     *     conf->ssl_crl = { 0, NULL };
+     *     conf->ssl_certificate = { 0, NULL };
+     *     conf->ssl_certificate_key = { 0, NULL };
+     */
+
+    conf->upstream.local = NGX_CONF_UNSET_PTR;
+    conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
+    conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
+    conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
+    conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
+    conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC;
+
+    conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE;
+
+    conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
+    conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
+
+    conf->upstream.intercept_errors = NGX_CONF_UNSET;
+
+#if (NGX_HTTP_SSL)
+    conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
+    conf->upstream.ssl_server_name = NGX_CONF_UNSET;
+    conf->upstream.ssl_verify = NGX_CONF_UNSET;
+    conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
+    conf->ssl_passwords = NGX_CONF_UNSET_PTR;
+#endif
+
+    /* the hardcoded values */
+    conf->upstream.cyclic_temp_file = 0;
+    conf->upstream.buffering = 0;
+    conf->upstream.ignore_client_abort = 0;
+    conf->upstream.send_lowat = 0;
+    conf->upstream.bufs.num = 0;
+    conf->upstream.busy_buffers_size = 0;
+    conf->upstream.max_temp_file_size = 0;
+    conf->upstream.temp_file_write_size = 0;
+    conf->upstream.pass_request_headers = 1;
+    conf->upstream.pass_request_body = 1;
+    conf->upstream.force_ranges = 0;
+    conf->upstream.pass_trailers = 1;
+    conf->upstream.preserve_output = 1;
+
+    ngx_str_set(&conf->upstream.module, "grpc");
+
+    return conf;
+}
+
+
+static char *
+ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_grpc_loc_conf_t *prev = parent;
+    ngx_http_grpc_loc_conf_t *conf = child;
+
+    ngx_int_t                  rc;
+    ngx_hash_init_t            hash;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    ngx_conf_merge_ptr_value(conf->upstream.local,
+                              prev->upstream.local, NULL);
+
+    ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries,
+                              prev->upstream.next_upstream_tries, 0);
+
+    ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
+                              prev->upstream.connect_timeout, 60000);
+
+    ngx_conf_merge_msec_value(conf->upstream.send_timeout,
+                              prev->upstream.send_timeout, 60000);
+
+    ngx_conf_merge_msec_value(conf->upstream.read_timeout,
+                              prev->upstream.read_timeout, 60000);
+
+    ngx_conf_merge_msec_value(conf->upstream.next_upstream_timeout,
+                              prev->upstream.next_upstream_timeout, 0);
+
+    ngx_conf_merge_size_value(conf->upstream.buffer_size,
+                              prev->upstream.buffer_size,
+                              (size_t) ngx_pagesize);
+
+    ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers,
+                              prev->upstream.ignore_headers,
+                              NGX_CONF_BITMASK_SET);
+
+    ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
+                              prev->upstream.next_upstream,
+                              (NGX_CONF_BITMASK_SET
+                               |NGX_HTTP_UPSTREAM_FT_ERROR
+                               |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
+
+    if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
+        conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
+                                       |NGX_HTTP_UPSTREAM_FT_OFF;
+    }
+
+    ngx_conf_merge_value(conf->upstream.intercept_errors,
+                              prev->upstream.intercept_errors, 0);
+
+#if (NGX_HTTP_SSL)
+
+    ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
+                              prev->upstream.ssl_session_reuse, 1);
+
+    ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
+                                 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
+                                  |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
+
+    ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
+                             "DEFAULT");
+
+    if (conf->upstream.ssl_name == NULL) {
+        conf->upstream.ssl_name = prev->upstream.ssl_name;
+    }
+
+    ngx_conf_merge_value(conf->upstream.ssl_server_name,
+                              prev->upstream.ssl_server_name, 0);
+    ngx_conf_merge_value(conf->upstream.ssl_verify,
+                              prev->upstream.ssl_verify, 0);
+    ngx_conf_merge_uint_value(conf->ssl_verify_depth,
+                              prev->ssl_verify_depth, 1);
+    ngx_conf_merge_str_value(conf->ssl_trusted_certificate,
+                              prev->ssl_trusted_certificate, "");
+    ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");
+
+    ngx_conf_merge_str_value(conf->ssl_certificate,
+                              prev->ssl_certificate, "");
+    ngx_conf_merge_str_value(conf->ssl_certificate_key,
+                              prev->ssl_certificate_key, "");
+    ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
+
+    if (conf->ssl && ngx_http_grpc_set_ssl(cf, conf) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+#endif
+
+    hash.max_size = 512;
+    hash.bucket_size = ngx_align(64, ngx_cacheline_size);
+    hash.name = "grpc_headers_hash";
+
+    if (ngx_http_upstream_hide_headers_hash(cf, &conf->upstream,
+            &prev->upstream, ngx_http_grpc_hide_headers, &hash)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
+    if (clcf->noname && conf->upstream.upstream == NULL) {
+        conf->upstream.upstream = prev->upstream.upstream;
+        conf->host = prev->host;
+#if (NGX_HTTP_SSL)
+        conf->upstream.ssl = prev->upstream.ssl;
+#endif
+    }
+
+    if (clcf->lmt_excpt && clcf->handler == NULL && conf->upstream.upstream) {
+        clcf->handler = ngx_http_grpc_handler;
+    }
+
+    if (conf->headers_source == NULL) {
+        conf->headers = prev->headers;
+        conf->headers_source = prev->headers_source;
+        conf->host_set = prev->host_set;
+    }
+
+    rc = ngx_http_grpc_init_headers(cf, conf, &conf->headers,
+                                    ngx_http_grpc_headers);
+    if (rc != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    /*
+     * special handling to preserve conf->headers in the "http" section
+     * to inherit it to all servers
+     */
+
+    if (prev->headers.hash.buckets == NULL
+        && conf->headers_source == prev->headers_source)
+    {
+        prev->headers = conf->headers;
+        prev->host_set = conf->host_set;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_init_headers(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *conf,
+    ngx_http_grpc_headers_t *headers, ngx_keyval_t *default_headers)
+{
+    u_char                       *p;
+    size_t                        size;
+    uintptr_t                    *code;
+    ngx_uint_t                    i;
+    ngx_array_t                   headers_names, headers_merged;
+    ngx_keyval_t                 *src, *s, *h;
+    ngx_hash_key_t               *hk;
+    ngx_hash_init_t               hash;
+    ngx_http_script_compile_t     sc;
+    ngx_http_script_copy_code_t  *copy;
+
+    if (headers->hash.buckets) {
+        return NGX_OK;
+    }
+
+    if (ngx_array_init(&headers_names, cf->temp_pool, 4, sizeof(ngx_hash_key_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_array_init(&headers_merged, cf->temp_pool, 4, sizeof(ngx_keyval_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    headers->lengths = ngx_array_create(cf->pool, 64, 1);
+    if (headers->lengths == NULL) {
+        return NGX_ERROR;
+    }
+
+    headers->values = ngx_array_create(cf->pool, 512, 1);
+    if (headers->values == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (conf->headers_source) {
+
+        src = conf->headers_source->elts;
+        for (i = 0; i < conf->headers_source->nelts; i++) {
+
+            if (src[i].key.len == 4
+                && ngx_strncasecmp(src[i].key.data, (u_char *) "Host", 4) == 0)
+            {
+                conf->host_set = 1;
+            }
+
+            s = ngx_array_push(&headers_merged);
+            if (s == NULL) {
+                return NGX_ERROR;
+            }
+
+            *s = src[i];
+        }
+    }
+
+    h = default_headers;
+
+    while (h->key.len) {
+
+        src = headers_merged.elts;
+        for (i = 0; i < headers_merged.nelts; i++) {
+            if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) {
+                goto next;
+            }
+        }
+
+        s = ngx_array_push(&headers_merged);
+        if (s == NULL) {
+            return NGX_ERROR;
+        }
+
+        *s = *h;
+
+    next:
+
+        h++;
+    }
+
+
+    src = headers_merged.elts;
+    for (i = 0; i < headers_merged.nelts; i++) {
+
+        hk = ngx_array_push(&headers_names);
+        if (hk == NULL) {
+            return NGX_ERROR;
+        }
+
+        hk->key = src[i].key;
+        hk->key_hash = ngx_hash_key_lc(src[i].key.data, src[i].key.len);
+        hk->value = (void *) 1;
+
+        if (src[i].value.len == 0) {
+            continue;
+        }
+
+        copy = ngx_array_push_n(headers->lengths,
+                                sizeof(ngx_http_script_copy_code_t));
+        if (copy == NULL) {
+            return NGX_ERROR;
+        }
+
+        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->len = src[i].key.len;
+
+        size = (sizeof(ngx_http_script_copy_code_t)
+                + src[i].key.len + sizeof(uintptr_t) - 1)
+               & ~(sizeof(uintptr_t) - 1);
+
+        copy = ngx_array_push_n(headers->values, size);
+        if (copy == NULL) {
+            return NGX_ERROR;
+        }
+
+        copy->code = ngx_http_script_copy_code;
+        copy->len = src[i].key.len;
+
+        p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
+        ngx_memcpy(p, src[i].key.data, src[i].key.len);
+
+        ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
+
+        sc.cf = cf;
+        sc.source = &src[i].value;
+        sc.flushes = &headers->flushes;
+        sc.lengths = &headers->lengths;
+        sc.values = &headers->values;
+
+        if (ngx_http_script_compile(&sc) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        code = ngx_array_push_n(headers->lengths, sizeof(uintptr_t));
+        if (code == NULL) {
+            return NGX_ERROR;
+        }
+
+        *code = (uintptr_t) NULL;
+
+        code = ngx_array_push_n(headers->values, sizeof(uintptr_t));
+        if (code == NULL) {
+            return NGX_ERROR;
+        }
+
+        *code = (uintptr_t) NULL;
+    }
+
+    code = ngx_array_push_n(headers->lengths, sizeof(uintptr_t));
+    if (code == NULL) {
+        return NGX_ERROR;
+    }
+
+    *code = (uintptr_t) NULL;
+
+
+    hash.hash = &headers->hash;
+    hash.key = ngx_hash_key_lc;
+    hash.max_size = 512;
+    hash.bucket_size = 64;
+    hash.name = "grpc_headers_hash";
+    hash.pool = cf->pool;
+    hash.temp_pool = NULL;
+
+    return ngx_hash_init(&hash, headers_names.elts, headers_names.nelts);
+}
+
+
+static char *
+ngx_http_grpc_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_grpc_loc_conf_t *glcf = conf;
+
+    size_t                     add;
+    ngx_str_t                 *value, *url;
+    ngx_url_t                  u;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    if (glcf->upstream.upstream) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+    url = &value[1];
+
+    if (ngx_strncasecmp(url->data, (u_char *) "grpc://", 7) == 0) {
+        add = 7;
+
+    } else if (ngx_strncasecmp(url->data, (u_char *) "grpcs://", 8) == 0) {
+
+#if (NGX_HTTP_SSL)
+        glcf->ssl = 1;
+
+        add = 8;
+#else
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "grpcs protocol requires SSL support");
+        return NGX_CONF_ERROR;
+#endif
+
+    } else {
+        add = 0;
+    }
+
+    ngx_memzero(&u, sizeof(ngx_url_t));
+
+    u.url.len = url->len - add;
+    u.url.data = url->data + add;
+    u.no_resolve = 1;
+
+    glcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
+    if (glcf->upstream.upstream == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (u.family != AF_UNIX) {
+
+        if (u.no_port) {
+            glcf->host = u.host;
+
+        } else {
+            glcf->host.len = u.host.len + 1 + u.port_text.len;
+            glcf->host.data = u.host.data;
+        }
+
+    } else {
+        ngx_str_set(&glcf->host, "localhost");
+    }
+
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
+    clcf->handler = ngx_http_grpc_handler;
+
+    if (clcf->name.data[clcf->name.len - 1] == '/') {
+        clcf->auto_redirect = 1;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+#if (NGX_HTTP_SSL)
+
+static char *
+ngx_http_grpc_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_grpc_loc_conf_t *glcf = conf;
+
+    ngx_str_t  *value;
+
+    if (glcf->ssl_passwords != NGX_CONF_UNSET_PTR) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    glcf->ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
+
+    if (glcf->ssl_passwords == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
+{
+    ngx_pool_cleanup_t  *cln;
+
+    glcf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
+    if (glcf->upstream.ssl == NULL) {
+        return NGX_ERROR;
+    }
+
+    glcf->upstream.ssl->log = cf->log;
+
+    if (ngx_ssl_create(glcf->upstream.ssl, glcf->ssl_protocols, NULL)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NGX_ERROR;
+    }
+
+    cln->handler = ngx_ssl_cleanup_ctx;
+    cln->data = glcf->upstream.ssl;
+
+    if (glcf->ssl_certificate.len) {
+
+        if (glcf->ssl_certificate_key.len == 0) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no \"grpc_ssl_certificate_key\" is defined "
+                          "for certificate \"%V\"", &glcf->ssl_certificate);
+            return NGX_ERROR;
+        }
+
+        if (ngx_ssl_certificate(cf, glcf->upstream.ssl, &glcf->ssl_certificate,
+                                &glcf->ssl_certificate_key, glcf->ssl_passwords)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    if (ngx_ssl_ciphers(cf, glcf->upstream.ssl, &glcf->ssl_ciphers, 0)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (glcf->upstream.ssl_verify) {
+        if (glcf->ssl_trusted_certificate.len == 0) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "no grpc_ssl_trusted_certificate for grpc_ssl_verify");
+            return NGX_ERROR;
+        }
+
+        if (ngx_ssl_trusted_certificate(cf, glcf->upstream.ssl,
+                                        &glcf->ssl_trusted_certificate,
+                                        glcf->ssl_verify_depth)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        if (ngx_ssl_crl(cf, glcf->upstream.ssl, &glcf->ssl_crl) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+
+    if (SSL_CTX_set_alpn_protos(glcf->upstream.ssl->ctx,
+                                (u_char *) "\x02h2", 3)
+        != 0)
+    {
+        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
+                      "SSL_CTX_set_alpn_protos() failed");
+        return NGX_ERROR;
+    }
+
+#endif
+
+    return NGX_OK;
+}
+
+#endif
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index 917ed55..f7c4bd2 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -90,6 +90,11 @@ typedef struct {
 } ngx_http_log_var_t;
 
 
+#define NGX_HTTP_LOG_ESCAPE_DEFAULT  0
+#define NGX_HTTP_LOG_ESCAPE_JSON     1
+#define NGX_HTTP_LOG_ESCAPE_NONE     2
+
+
 static void ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log,
     u_char *buf, size_t len);
 static ssize_t ngx_http_log_script_write(ngx_http_request_t *r,
@@ -126,7 +131,7 @@ static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf,
     ngx_http_log_op_t *op);
 
 static ngx_int_t ngx_http_log_variable_compile(ngx_conf_t *cf,
-    ngx_http_log_op_t *op, ngx_str_t *value, ngx_uint_t json);
+    ngx_http_log_op_t *op, ngx_str_t *value, ngx_uint_t escape);
 static size_t ngx_http_log_variable_getlen(ngx_http_request_t *r,
     uintptr_t data);
 static u_char *ngx_http_log_variable(ngx_http_request_t *r, u_char *buf,
@@ -136,6 +141,10 @@ static size_t ngx_http_log_json_variable_getlen(ngx_http_request_t *r,
     uintptr_t data);
 static u_char *ngx_http_log_json_variable(ngx_http_request_t *r, u_char *buf,
     ngx_http_log_op_t *op);
+static size_t ngx_http_log_unescaped_variable_getlen(ngx_http_request_t *r,
+    uintptr_t data);
+static u_char *ngx_http_log_unescaped_variable(ngx_http_request_t *r,
+    u_char *buf, ngx_http_log_op_t *op);
 
 
 static void *ngx_http_log_create_main_conf(ngx_conf_t *cf);
@@ -905,7 +914,7 @@ ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf,
 
 static ngx_int_t
 ngx_http_log_variable_compile(ngx_conf_t *cf, ngx_http_log_op_t *op,
-    ngx_str_t *value, ngx_uint_t json)
+    ngx_str_t *value, ngx_uint_t escape)
 {
     ngx_int_t  index;
 
@@ -916,11 +925,18 @@ ngx_http_log_variable_compile(ngx_conf_t *cf, ngx_http_log_op_t *op,
 
     op->len = 0;
 
-    if (json) {
+    switch (escape) {
+    case NGX_HTTP_LOG_ESCAPE_JSON:
         op->getlen = ngx_http_log_json_variable_getlen;
         op->run = ngx_http_log_json_variable;
+        break;
 
-    } else {
+    case NGX_HTTP_LOG_ESCAPE_NONE:
+        op->getlen = ngx_http_log_unescaped_variable_getlen;
+        op->run = ngx_http_log_unescaped_variable;
+        break;
+
+    default: /* NGX_HTTP_LOG_ESCAPE_DEFAULT */
         op->getlen = ngx_http_log_variable_getlen;
         op->run = ngx_http_log_variable;
     }
@@ -1073,6 +1089,39 @@ ngx_http_log_json_variable(ngx_http_request_t *r, u_char *buf,
 }
 
 
+static size_t
+ngx_http_log_unescaped_variable_getlen(ngx_http_request_t *r, uintptr_t data)
+{
+    ngx_http_variable_value_t  *value;
+
+    value = ngx_http_get_indexed_variable(r, data);
+
+    if (value == NULL || value->not_found) {
+        return 0;
+    }
+
+    value->escape = 0;
+
+    return value->len;
+}
+
+
+static u_char *
+ngx_http_log_unescaped_variable(ngx_http_request_t *r, u_char *buf,
+    ngx_http_log_op_t *op)
+{
+    ngx_http_variable_value_t  *value;
+
+    value = ngx_http_get_indexed_variable(r, op->data);
+
+    if (value == NULL || value->not_found) {
+        return buf;
+    }
+
+    return ngx_cpymem(buf, value->data, value->len);
+}
+
+
 static void *
 ngx_http_log_create_main_conf(ngx_conf_t *cf)
 {
@@ -1536,18 +1585,21 @@ ngx_http_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
     size_t               i, len;
     ngx_str_t           *value, var;
     ngx_int_t           *flush;
-    ngx_uint_t           bracket, json;
+    ngx_uint_t           bracket, escape;
     ngx_http_log_op_t   *op;
     ngx_http_log_var_t  *v;
 
-    json = 0;
+    escape = NGX_HTTP_LOG_ESCAPE_DEFAULT;
     value = args->elts;
 
     if (s < args->nelts && ngx_strncmp(value[s].data, "escape=", 7) == 0) {
         data = value[s].data + 7;
 
         if (ngx_strcmp(data, "json") == 0) {
-            json = 1;
+            escape = NGX_HTTP_LOG_ESCAPE_JSON;
+
+        } else if (ngx_strcmp(data, "none") == 0) {
+            escape = NGX_HTTP_LOG_ESCAPE_NONE;
 
         } else if (ngx_strcmp(data, "default") != 0) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -1636,7 +1688,7 @@ ngx_http_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
                     }
                 }
 
-                if (ngx_http_log_variable_compile(cf, op, &var, json)
+                if (ngx_http_log_variable_compile(cf, op, &var, escape)
                     != NGX_OK)
                 {
                     return NGX_CONF_ERROR;
diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
index 69f28fa..82fa713 100644
--- a/src/http/modules/ngx_http_memcached_module.c
+++ b/src/http/modules/ngx_http_memcached_module.c
@@ -592,8 +592,6 @@ ngx_http_memcached_create_loc_conf(ngx_conf_t *cf)
      *     conf->upstream.bufs.num = 0;
      *     conf->upstream.next_upstream = 0;
      *     conf->upstream.temp_path = NULL;
-     *     conf->upstream.uri = { 0, NULL };
-     *     conf->upstream.location = NULL;
      */
 
     conf->upstream.local = NGX_CONF_UNSET_PTR;
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index efb4bed..c9ad638 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -2321,36 +2321,6 @@ ngx_http_proxy_non_buffered_chunked_filter(void *data, ssize_t bytes)
         return NGX_ERROR;
     }
 
-    /* provide continuous buffer for subrequests in memory */
-
-    if (r->subrequest_in_memory) {
-
-        cl = u->out_bufs;
-
-        if (cl) {
-            buf->pos = cl->buf->pos;
-        }
-
-        buf->last = buf->pos;
-
-        for (cl = u->out_bufs; cl; cl = cl->next) {
-            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http proxy in memory %p-%p %O",
-                           cl->buf->pos, cl->buf->last, ngx_buf_size(cl->buf));
-
-            if (buf->last == cl->buf->pos) {
-                buf->last = cl->buf->last;
-                continue;
-            }
-
-            buf->last = ngx_movemem(buf->last, cl->buf->pos,
-                                    cl->buf->last - cl->buf->pos);
-
-            cl->buf->pos = buf->last - (cl->buf->last - cl->buf->pos);
-            cl->buf->last = buf->last;
-        }
-    }
-
     return NGX_OK;
 }
 
@@ -2827,13 +2797,13 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
      *     conf->upstream.cache_methods = 0;
      *     conf->upstream.temp_path = NULL;
      *     conf->upstream.hide_headers_hash = { NULL, 0 };
-     *     conf->upstream.uri = { 0, NULL };
-     *     conf->upstream.location = NULL;
      *     conf->upstream.store_lengths = NULL;
      *     conf->upstream.store_values = NULL;
      *     conf->upstream.ssl_name = NULL;
      *
      *     conf->method = NULL;
+     *     conf->location = NULL;
+     *     conf->url = { 0, NULL };
      *     conf->headers_source = NULL;
      *     conf->headers.lengths = NULL;
      *     conf->headers.values = NULL;
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index c799b2f..d608df9 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -2231,9 +2231,11 @@ ngx_http_ssi_set_variable(ngx_http_request_t *r, void *data, ngx_int_t rc)
 {
     ngx_str_t  *value = data;
 
-    if (r->upstream) {
-        value->len = r->upstream->buffer.last - r->upstream->buffer.pos;
-        value->data = r->upstream->buffer.pos;
+    if (r->headers_out.status < NGX_HTTP_SPECIAL_RESPONSE
+        && r->out && r->out->buf)
+    {
+        value->len = r->out->buf->last - r->out->buf->pos;
+        value->data = r->out->buf->pos;
     }
 
     return rc;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 5951571..6b318dd 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -399,6 +399,13 @@ static ngx_command_t  ngx_http_core_commands[] = {
       offsetof(ngx_http_core_loc_conf_t, sendfile_max_chunk),
       NULL },
 
+    { ngx_string("subrequest_output_buffer_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_core_loc_conf_t, subrequest_output_buffer_size),
+      NULL },
+
     { ngx_string("aio"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_http_core_set_aio,
@@ -2237,6 +2244,12 @@ ngx_http_subrequest(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
+    if (r->subrequest_in_memory) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "nested in-memory subrequest \"%V\"", uri);
+        return NGX_ERROR;
+    }
+
     sr = ngx_pcalloc(r->pool, sizeof(ngx_http_request_t));
     if (sr == NULL) {
         return NGX_ERROR;
@@ -2318,6 +2331,10 @@ ngx_http_subrequest(ngx_http_request_t *r,
 
     sr->log_handler = r->log_handler;
 
+    if (sr->subrequest_in_memory) {
+        sr->filter_need_in_memory = 1;
+    }
+
     if (!sr->background) {
         if (c->data == r && r->postponed == NULL) {
             c->data = sr;
@@ -3356,6 +3373,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
     clcf->internal = NGX_CONF_UNSET;
     clcf->sendfile = NGX_CONF_UNSET;
     clcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE;
+    clcf->subrequest_output_buffer_size = NGX_CONF_UNSET_SIZE;
     clcf->aio = NGX_CONF_UNSET;
     clcf->aio_write = NGX_CONF_UNSET;
 #if (NGX_THREADS)
@@ -3578,6 +3596,9 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
     ngx_conf_merge_size_value(conf->sendfile_max_chunk,
                               prev->sendfile_max_chunk, 0);
+    ngx_conf_merge_size_value(conf->subrequest_output_buffer_size,
+                              prev->subrequest_output_buffer_size,
+                              (size_t) ngx_pagesize);
     ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF);
     ngx_conf_merge_value(conf->aio_write, prev->aio_write, 0);
 #if (NGX_THREADS)
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index a6128b5..d798504 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -351,6 +351,8 @@ struct ngx_http_core_loc_conf_s {
     size_t        limit_rate_after;        /* limit_rate_after */
     size_t        sendfile_max_chunk;      /* sendfile_max_chunk */
     size_t        read_ahead;              /* read_ahead */
+    size_t        subrequest_output_buffer_size;
+                                           /* subrequest_output_buffer_size */
 
     ngx_msec_t    client_body_timeout;     /* client_body_timeout */
     ngx_msec_t    send_timeout;            /* send_timeout */
diff --git a/src/http/ngx_http_postpone_filter_module.c b/src/http/ngx_http_postpone_filter_module.c
index 55f2698..599d263 100644
--- a/src/http/ngx_http_postpone_filter_module.c
+++ b/src/http/ngx_http_postpone_filter_module.c
@@ -12,6 +12,8 @@
 
 static ngx_int_t ngx_http_postpone_filter_add(ngx_http_request_t *r,
     ngx_chain_t *in);
+static ngx_int_t ngx_http_postpone_filter_in_memory(ngx_http_request_t *r,
+    ngx_chain_t *in);
 static ngx_int_t ngx_http_postpone_filter_init(ngx_conf_t *cf);
 
 
@@ -60,6 +62,10 @@ ngx_http_postpone_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http postpone filter \"%V?%V\" %p", &r->uri, &r->args, in);
 
+    if (r->subrequest_in_memory) {
+        return ngx_http_postpone_filter_in_memory(r, in);
+    }
+
     if (r != c->data) {
 
         if (in) {
@@ -171,6 +177,78 @@ found:
 }
 
 
+static ngx_int_t
+ngx_http_postpone_filter_in_memory(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    size_t                     len;
+    ngx_buf_t                 *b;
+    ngx_connection_t          *c;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    c = r->connection;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http postpone filter in memory");
+
+    if (r->out == NULL) {
+        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+        if (r->headers_out.content_length_n != -1) {
+            len = r->headers_out.content_length_n;
+
+            if (len > clcf->subrequest_output_buffer_size) {
+                ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                              "too big subrequest response: %uz", len);
+                return NGX_ERROR;
+            }
+
+        } else {
+            len = clcf->subrequest_output_buffer_size;
+        }
+
+        b = ngx_create_temp_buf(r->pool, len);
+        if (b == NULL) {
+            return NGX_ERROR;
+        }
+
+        b->last_buf = 1;
+
+        r->out = ngx_alloc_chain_link(r->pool);
+        if (r->out == NULL) {
+            return NGX_ERROR;
+        }
+
+        r->out->buf = b;
+        r->out->next = NULL;
+    }
+
+    b = r->out->buf;
+
+    for ( /* void */ ; in; in = in->next) {
+
+        if (ngx_buf_special(in->buf)) {
+            continue;
+        }
+
+        len = in->buf->last - in->buf->pos;
+
+        if (len > (size_t) (b->end - b->last)) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                          "too big subrequest response");
+            return NGX_ERROR;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http postpone filter in memory %uz bytes", len);
+
+        b->last = ngx_cpymem(b->last, in->buf->pos, len);
+        in->buf->pos = in->buf->last;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_postpone_filter_init(ngx_conf_t *cf)
 {
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 89cfe77..2db7a62 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -132,6 +132,10 @@ ngx_http_header_t  ngx_http_headers_in[] = {
                  offsetof(ngx_http_headers_in_t, transfer_encoding),
                  ngx_http_process_header_line },
 
+    { ngx_string("TE"),
+                 offsetof(ngx_http_headers_in_t, te),
+                 ngx_http_process_header_line },
+
     { ngx_string("Expect"),
                  offsetof(ngx_http_headers_in_t, expect),
                  ngx_http_process_unique_header_line },
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 5d44c06..39baa0f 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -197,6 +197,7 @@ typedef struct {
     ngx_table_elt_t                  *if_range;
 
     ngx_table_elt_t                  *transfer_encoding;
+    ngx_table_elt_t                  *te;
     ngx_table_elt_t                  *expect;
     ngx_table_elt_t                  *upgrade;
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 5ddadf0..e6f9c09 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -55,7 +55,7 @@ static ngx_int_t ngx_http_upstream_intercept_errors(ngx_http_request_t *r,
 static ngx_int_t ngx_http_upstream_test_connect(ngx_connection_t *c);
 static ngx_int_t ngx_http_upstream_process_headers(ngx_http_request_t *r,
     ngx_http_upstream_t *u);
-static void ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r,
+static ngx_int_t ngx_http_upstream_process_trailers(ngx_http_request_t *r,
     ngx_http_upstream_t *u);
 static void ngx_http_upstream_send_response(ngx_http_request_t *r,
     ngx_http_upstream_t *u);
@@ -166,6 +166,8 @@ static ngx_int_t ngx_http_upstream_response_length_variable(
     ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_upstream_header_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_upstream_trailer_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 
@@ -425,6 +427,9 @@ static ngx_http_variable_t  ngx_http_upstream_vars[] = {
     { ngx_string("upstream_http_"), NULL, ngx_http_upstream_header_variable,
       0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },
 
+    { ngx_string("upstream_trailer_"), NULL, ngx_http_upstream_trailer_variable,
+      0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },
+
     { ngx_string("upstream_cookie_"), NULL, ngx_http_upstream_cookie_variable,
       0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },
 
@@ -1048,6 +1053,13 @@ ngx_http_upstream_cache_send(ngx_http_request_t *r, ngx_http_upstream_t *u)
         return NGX_ERROR;
     }
 
+    if (ngx_list_init(&u->headers_in.trailers, r->pool, 2,
+                      sizeof(ngx_table_elt_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     rc = u->process_header(r);
 
     if (rc == NGX_OK) {
@@ -1604,6 +1616,7 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     u->request_sent = 0;
     u->request_body_sent = 0;
+    u->request_body_blocked = 0;
 
     if (rc == NGX_AGAIN) {
         ngx_add_timer(c->write, u->conf->connect_timeout);
@@ -1885,6 +1898,13 @@ ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u)
         return NGX_ERROR;
     }
 
+    if (ngx_list_init(&u->headers_in.trailers, r->pool, 2,
+                      sizeof(ngx_table_elt_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     /* reinit the request chain */
 
     file_pos = 0;
@@ -1975,7 +1995,7 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
     }
 
     if (rc == NGX_AGAIN) {
-        if (!c->write->ready) {
+        if (!c->write->ready || u->request_body_blocked) {
             ngx_add_timer(c->write, u->conf->send_timeout);
 
         } else if (c->write->timer_set) {
@@ -2000,7 +2020,7 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
     }
 
     if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
-        if (ngx_tcp_push(c->fd) == NGX_ERROR) {
+        if (ngx_tcp_push(c->fd) == -1) {
             ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
                           ngx_tcp_push_n " failed");
             ngx_http_upstream_finalize_request(r, u,
@@ -2011,7 +2031,9 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
         c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
     }
 
-    u->write_event_handler = ngx_http_upstream_dummy_handler;
+    if (!u->conf->preserve_output) {
+        u->write_event_handler = ngx_http_upstream_dummy_handler;
+    }
 
     if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
         ngx_http_upstream_finalize_request(r, u,
@@ -2052,7 +2074,16 @@ ngx_http_upstream_send_request_body(ngx_http_request_t *r,
             out = NULL;
         }
 
-        return ngx_output_chain(&u->output, out);
+        rc = ngx_output_chain(&u->output, out);
+
+        if (rc == NGX_AGAIN) {
+            u->request_body_blocked = 1;
+
+        } else {
+            u->request_body_blocked = 0;
+        }
+
+        return rc;
     }
 
     if (!u->request_sent) {
@@ -2093,6 +2124,13 @@ ngx_http_upstream_send_request_body(ngx_http_request_t *r,
                 ngx_free_chain(r->pool, ln);
             }
 
+            if (rc == NGX_AGAIN) {
+                u->request_body_blocked = 1;
+
+            } else {
+                u->request_body_blocked = 0;
+            }
+
             if (rc == NGX_OK && !r->reading_body) {
                 break;
             }
@@ -2157,7 +2195,7 @@ ngx_http_upstream_send_request_handler(ngx_http_request_t *r,
 
 #endif
 
-    if (u->header_sent) {
+    if (u->header_sent && !u->conf->preserve_output) {
         u->write_event_handler = ngx_http_upstream_dummy_handler;
 
         (void) ngx_handle_write_event(c->write, 0);
@@ -2239,6 +2277,15 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u)
             return;
         }
 
+        if (ngx_list_init(&u->headers_in.trailers, r->pool, 2,
+                          sizeof(ngx_table_elt_t))
+            != NGX_OK)
+        {
+            ngx_http_upstream_finalize_request(r, u,
+                                               NGX_HTTP_INTERNAL_SERVER_ERROR);
+            return;
+        }
+
 #if (NGX_HTTP_CACHE)
 
         if (r->cache) {
@@ -2335,45 +2382,7 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u)
         return;
     }
 
-    if (!r->subrequest_in_memory) {
-        ngx_http_upstream_send_response(r, u);
-        return;
-    }
-
-    /* subrequest content in memory */
-
-    if (u->input_filter == NULL) {
-        u->input_filter_init = ngx_http_upstream_non_buffered_filter_init;
-        u->input_filter = ngx_http_upstream_non_buffered_filter;
-        u->input_filter_ctx = r;
-    }
-
-    if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) {
-        ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-        return;
-    }
-
-    n = u->buffer.last - u->buffer.pos;
-
-    if (n) {
-        u->buffer.last = u->buffer.pos;
-
-        u->state->response_length += n;
-
-        if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
-            ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-            return;
-        }
-    }
-
-    if (u->length == 0) {
-        ngx_http_upstream_finalize_request(r, u, 0);
-        return;
-    }
-
-    u->read_event_handler = ngx_http_upstream_process_body_in_memory;
-
-    ngx_http_upstream_process_body_in_memory(r, u);
+    ngx_http_upstream_send_response(r, u);
 }
 
 
@@ -2775,81 +2784,48 @@ ngx_http_upstream_process_headers(ngx_http_request_t *r, ngx_http_upstream_t *u)
 }
 
 
-static void
-ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r,
+static ngx_int_t
+ngx_http_upstream_process_trailers(ngx_http_request_t *r,
     ngx_http_upstream_t *u)
 {
-    size_t             size;
-    ssize_t            n;
-    ngx_buf_t         *b;
-    ngx_event_t       *rev;
-    ngx_connection_t  *c;
+    ngx_uint_t        i;
+    ngx_list_part_t  *part;
+    ngx_table_elt_t  *h, *ho;
 
-    c = u->peer.connection;
-    rev = c->read;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http upstream process body in memory");
-
-    if (rev->timedout) {
-        ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
-        ngx_http_upstream_finalize_request(r, u, NGX_HTTP_GATEWAY_TIME_OUT);
-        return;
+    if (!u->conf->pass_trailers) {
+        return NGX_OK;
     }
 
-    b = &u->buffer;
+    part = &u->headers_in.trailers.part;
+    h = part->elts;
 
-    for ( ;; ) {
+    for (i = 0; /* void */; i++) {
 
-        size = b->end - b->last;
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
 
-        if (size == 0) {
-            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                          "upstream buffer is too small to read response");
-            ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-            return;
+            part = part->next;
+            h = part->elts;
+            i = 0;
         }
 
-        n = c->recv(c, b->last, size);
-
-        if (n == NGX_AGAIN) {
-            break;
+        if (ngx_hash_find(&u->conf->hide_headers_hash, h[i].hash,
+                          h[i].lowcase_key, h[i].key.len))
+        {
+            continue;
         }
 
-        if (n == 0 || n == NGX_ERROR) {
-            ngx_http_upstream_finalize_request(r, u, n);
-            return;
+        ho = ngx_list_push(&r->headers_out.trailers);
+        if (ho == NULL) {
+            return NGX_ERROR;
         }
 
-        u->state->bytes_received += n;
-        u->state->response_length += n;
-
-        if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) {
-            ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-            return;
-        }
-
-        if (!rev->ready) {
-            break;
-        }
+        *ho = h[i];
     }
 
-    if (u->length == 0) {
-        ngx_http_upstream_finalize_request(r, u, 0);
-        return;
-    }
-
-    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
-        ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
-        return;
-    }
-
-    if (rev->active) {
-        ngx_add_timer(rev, u->conf->read_timeout);
-
-    } else if (rev->timer_set) {
-        ngx_del_timer(rev);
-    }
+    return NGX_OK;
 }
 
 
@@ -4359,12 +4335,6 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
 
 #endif
 
-    if (r->subrequest_in_memory
-        && u->headers_in.status_n >= NGX_HTTP_SPECIAL_RESPONSE)
-    {
-        u->buffer.last = u->buffer.pos;
-    }
-
     r->read_event_handler = ngx_http_block_reading;
 
     if (rc == NGX_DECLINED) {
@@ -4396,6 +4366,12 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
     }
 
     if (rc == 0) {
+
+        if (ngx_http_upstream_process_trailers(r, u) != NGX_OK) {
+            ngx_http_finalize_request(r, NGX_ERROR);
+            return;
+        }
+
         rc = ngx_http_send_special(r, NGX_HTTP_LAST);
 
     } else if (flush) {
@@ -5505,6 +5481,21 @@ ngx_http_upstream_header_variable(ngx_http_request_t *r,
 }
 
 
+static ngx_int_t
+ngx_http_upstream_trailer_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    if (r->upstream == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
+                                        &r->upstream->headers_in.trailers.part,
+                                        sizeof("upstream_trailer_") - 1);
+}
+
+
 static ngx_int_t
 ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 3e714e5..c2f4dc0 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -61,6 +61,7 @@ typedef struct {
     ngx_msec_t                       response_time;
     ngx_msec_t                       connect_time;
     ngx_msec_t                       header_time;
+    ngx_msec_t                       queue_time;
     off_t                            response_length;
     off_t                            bytes_received;
 
@@ -221,6 +222,8 @@ typedef struct {
     signed                           store:2;
     unsigned                         intercept_404:1;
     unsigned                         change_buffering:1;
+    unsigned                         pass_trailers:1;
+    unsigned                         preserve_output:1;
 
 #if (NGX_HTTP_SSL || NGX_COMPAT)
     ngx_ssl_t                       *ssl;
@@ -250,6 +253,7 @@ typedef struct {
 
 typedef struct {
     ngx_list_t                       headers;
+    ngx_list_t                       trailers;
 
     ngx_uint_t                       status_n;
     ngx_str_t                        status_line;
@@ -388,6 +392,7 @@ struct ngx_http_upstream_s {
 
     unsigned                         request_sent:1;
     unsigned                         request_body_sent:1;
+    unsigned                         request_body_blocked:1;
     unsigned                         header_sent:1;
 };
 
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 669600a..2deb968 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -429,7 +429,9 @@ ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
             return NULL;
         }
 
-        v->flags &= flags | ~NGX_HTTP_VAR_WEAK;
+        if (!(flags & NGX_HTTP_VAR_WEAK)) {
+            v->flags &= ~NGX_HTTP_VAR_WEAK;
+        }
 
         return v;
     }
@@ -494,7 +496,9 @@ ngx_http_add_prefix_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
             return NULL;
         }
 
-        v->flags &= flags | ~NGX_HTTP_VAR_WEAK;
+        if (!(flags & NGX_HTTP_VAR_WEAK)) {
+            v->flags &= ~NGX_HTTP_VAR_WEAK;
+        }
 
         return v;
     }
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 7bea204..77ebb84 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -54,8 +54,6 @@ typedef struct {
 
 #define NGX_HTTP_V2_FRAME_BUFFER_SIZE            24
 
-#define NGX_HTTP_V2_DEFAULT_FRAME_SIZE           (1 << 14)
-
 #define NGX_HTTP_V2_ROOT                         (void *) -1
 
 
@@ -783,8 +781,8 @@ ngx_http_v2_state_head(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
                    type, h2c->state.flags, h2c->state.length, h2c->state.sid);
 
     if (type >= NGX_HTTP_V2_FRAME_STATES) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                       "http2 frame with unknown type %ui", type);
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent frame with unknown type %ui", type);
         return ngx_http_v2_state_skip(h2c, pos, end);
     }
 
@@ -1992,6 +1990,9 @@ ngx_http_v2_state_settings(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
     }
 
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 SETTINGS frame");
+
     return ngx_http_v2_state_settings_params(h2c, pos, end);
 }
 
@@ -2132,8 +2133,8 @@ ngx_http_v2_state_ping(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
         return ngx_http_v2_state_save(h2c, pos, end, ngx_http_v2_state_ping);
     }
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 PING frame, flags: %ud", h2c->state.flags);
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 PING frame");
 
     if (h2c->state.flags & NGX_HTTP_V2_ACK_FLAG) {
         return ngx_http_v2_state_skip(h2c, pos, end);
@@ -3257,19 +3258,9 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
             continue;
         }
 
-        switch (ch) {
-        case '\0':
-        case LF:
-        case CR:
-        case ':':
-            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                          "client sent invalid header name: \"%V\"",
-                          &header->name);
-
-            return NGX_ERROR;
-        }
-
-        if (ch >= 'A' && ch <= 'Z') {
+        if (ch == '\0' || ch == LF || ch == CR || ch == ':'
+            || (ch >= 'A' && ch <= 'Z'))
+        {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                           "client sent invalid header name: \"%V\"",
                           &header->name);
@@ -3283,10 +3274,7 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
     for (i = 0; i != header->value.len; i++) {
         ch = header->value.data[i];
 
-        switch (ch) {
-        case '\0':
-        case LF:
-        case CR:
+        if (ch == '\0' || ch == LF || ch == CR) {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                           "client sent header \"%V\" with "
                           "invalid value: \"%V\"",
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index d89e8fe..ebd0e77 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -18,6 +18,7 @@
 
 #define NGX_HTTP_V2_STATE_BUFFER_SIZE    16
 
+#define NGX_HTTP_V2_DEFAULT_FRAME_SIZE   (1 << 14)
 #define NGX_HTTP_V2_MAX_FRAME_SIZE       ((1 << 24) - 1)
 
 #define NGX_HTTP_V2_INT_OCTETS           4
@@ -291,6 +292,9 @@ void ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc);
 ngx_int_t ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c);
 
 
+ngx_str_t *ngx_http_v2_get_static_name(ngx_uint_t index);
+ngx_str_t *ngx_http_v2_get_static_value(ngx_uint_t index);
+
 ngx_int_t ngx_http_v2_get_indexed_header(ngx_http_v2_connection_t *h2c,
     ngx_uint_t index, ngx_uint_t name_only);
 ngx_int_t ngx_http_v2_add_header(ngx_http_v2_connection_t *h2c,
@@ -357,4 +361,53 @@ size_t ngx_http_v2_huff_encode(u_char *src, size_t len, u_char *dst,
 
 #define ngx_http_v2_write_sid  ngx_http_v2_write_uint32
 
+
+#define ngx_http_v2_indexed(i)      (128 + (i))
+#define ngx_http_v2_inc_indexed(i)  (64 + (i))
+
+#define ngx_http_v2_write_name(dst, src, len, tmp)                            \
+    ngx_http_v2_string_encode(dst, src, len, tmp, 1)
+#define ngx_http_v2_write_value(dst, src, len, tmp)                           \
+    ngx_http_v2_string_encode(dst, src, len, tmp, 0)
+
+#define NGX_HTTP_V2_ENCODE_RAW            0
+#define NGX_HTTP_V2_ENCODE_HUFF           0x80
+
+#define NGX_HTTP_V2_AUTHORITY_INDEX       1
+
+#define NGX_HTTP_V2_METHOD_INDEX          2
+#define NGX_HTTP_V2_METHOD_GET_INDEX      2
+#define NGX_HTTP_V2_METHOD_POST_INDEX     3
+
+#define NGX_HTTP_V2_PATH_INDEX            4
+#define NGX_HTTP_V2_PATH_ROOT_INDEX       4
+
+#define NGX_HTTP_V2_SCHEME_HTTP_INDEX     6
+#define NGX_HTTP_V2_SCHEME_HTTPS_INDEX    7
+
+#define NGX_HTTP_V2_STATUS_INDEX          8
+#define NGX_HTTP_V2_STATUS_200_INDEX      8
+#define NGX_HTTP_V2_STATUS_204_INDEX      9
+#define NGX_HTTP_V2_STATUS_206_INDEX      10
+#define NGX_HTTP_V2_STATUS_304_INDEX      11
+#define NGX_HTTP_V2_STATUS_400_INDEX      12
+#define NGX_HTTP_V2_STATUS_404_INDEX      13
+#define NGX_HTTP_V2_STATUS_500_INDEX      14
+
+#define NGX_HTTP_V2_ACCEPT_ENCODING_INDEX 16
+#define NGX_HTTP_V2_ACCEPT_LANGUAGE_INDEX 17
+#define NGX_HTTP_V2_CONTENT_LENGTH_INDEX  28
+#define NGX_HTTP_V2_CONTENT_TYPE_INDEX    31
+#define NGX_HTTP_V2_DATE_INDEX            33
+#define NGX_HTTP_V2_LAST_MODIFIED_INDEX   44
+#define NGX_HTTP_V2_LOCATION_INDEX        46
+#define NGX_HTTP_V2_SERVER_INDEX          54
+#define NGX_HTTP_V2_USER_AGENT_INDEX      58
+#define NGX_HTTP_V2_VARY_INDEX            59
+
+
+u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len,
+    u_char *tmp, ngx_uint_t lower);
+
+
 #endif /* _NGX_HTTP_V2_H_INCLUDED_ */
diff --git a/src/http/v2/ngx_http_v2_encode.c b/src/http/v2/ngx_http_v2_encode.c
new file mode 100644
index 0000000..ac79208
--- /dev/null
+++ b/src/http/v2/ngx_http_v2_encode.c
@@ -0,0 +1,62 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Valentin V. Bartenev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix,
+    ngx_uint_t value);
+
+
+u_char *
+ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len, u_char *tmp,
+    ngx_uint_t lower)
+{
+    size_t  hlen;
+
+    hlen = ngx_http_v2_huff_encode(src, len, tmp, lower);
+
+    if (hlen > 0) {
+        *dst = NGX_HTTP_V2_ENCODE_HUFF;
+        dst = ngx_http_v2_write_int(dst, ngx_http_v2_prefix(7), hlen);
+        return ngx_cpymem(dst, tmp, hlen);
+    }
+
+    *dst = NGX_HTTP_V2_ENCODE_RAW;
+    dst = ngx_http_v2_write_int(dst, ngx_http_v2_prefix(7), len);
+
+    if (lower) {
+        ngx_strlow(dst, src, len);
+        return dst + len;
+    }
+
+    return ngx_cpymem(dst, src, len);
+}
+
+
+static u_char *
+ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value)
+{
+    if (value < prefix) {
+        *pos++ |= value;
+        return pos;
+    }
+
+    *pos++ |= prefix;
+    value -= prefix;
+
+    while (value >= 128) {
+        *pos++ = value % 128 + 128;
+        value /= 128;
+    }
+
+    *pos++ = (u_char) value;
+
+    return pos;
+}
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 44a0ac2..029e8ec 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -23,43 +23,6 @@
 #define ngx_http_v2_literal_size(h)                                           \
     (ngx_http_v2_integer_octets(sizeof(h) - 1) + sizeof(h) - 1)
 
-#define ngx_http_v2_indexed(i)      (128 + (i))
-#define ngx_http_v2_inc_indexed(i)  (64 + (i))
-
-#define ngx_http_v2_write_name(dst, src, len, tmp)                            \
-    ngx_http_v2_string_encode(dst, src, len, tmp, 1)
-#define ngx_http_v2_write_value(dst, src, len, tmp)                           \
-    ngx_http_v2_string_encode(dst, src, len, tmp, 0)
-
-#define NGX_HTTP_V2_ENCODE_RAW            0
-#define NGX_HTTP_V2_ENCODE_HUFF           0x80
-
-#define NGX_HTTP_V2_AUTHORITY_INDEX       1
-#define NGX_HTTP_V2_METHOD_GET_INDEX      2
-#define NGX_HTTP_V2_PATH_INDEX            4
-
-#define NGX_HTTP_V2_SCHEME_HTTP_INDEX     6
-#define NGX_HTTP_V2_SCHEME_HTTPS_INDEX    7
-
-#define NGX_HTTP_V2_STATUS_INDEX          8
-#define NGX_HTTP_V2_STATUS_200_INDEX      8
-#define NGX_HTTP_V2_STATUS_204_INDEX      9
-#define NGX_HTTP_V2_STATUS_206_INDEX      10
-#define NGX_HTTP_V2_STATUS_304_INDEX      11
-#define NGX_HTTP_V2_STATUS_400_INDEX      12
-#define NGX_HTTP_V2_STATUS_404_INDEX      13
-#define NGX_HTTP_V2_STATUS_500_INDEX      14
-
-#define NGX_HTTP_V2_ACCEPT_ENCODING_INDEX 16
-#define NGX_HTTP_V2_ACCEPT_LANGUAGE_INDEX 17
-#define NGX_HTTP_V2_CONTENT_LENGTH_INDEX  28
-#define NGX_HTTP_V2_CONTENT_TYPE_INDEX    31
-#define NGX_HTTP_V2_DATE_INDEX            33
-#define NGX_HTTP_V2_LAST_MODIFIED_INDEX   44
-#define NGX_HTTP_V2_LOCATION_INDEX        46
-#define NGX_HTTP_V2_SERVER_INDEX          54
-#define NGX_HTTP_V2_USER_AGENT_INDEX      58
-#define NGX_HTTP_V2_VARY_INDEX            59
 
 #define NGX_HTTP_V2_NO_TRAILERS           (ngx_http_v2_out_frame_t *) -1
 
@@ -93,10 +56,6 @@ static ngx_int_t ngx_http_v2_push_resources(ngx_http_request_t *r);
 static ngx_int_t ngx_http_v2_push_resource(ngx_http_request_t *r,
     ngx_str_t *path, ngx_str_t *binary);
 
-static u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len,
-    u_char *tmp, ngx_uint_t lower);
-static u_char *ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix,
-    ngx_uint_t value);
 static ngx_http_v2_out_frame_t *ngx_http_v2_create_headers_frame(
     ngx_http_request_t *r, u_char *pos, u_char *end, ngx_uint_t fin);
 static ngx_http_v2_out_frame_t *ngx_http_v2_create_push_frame(
@@ -177,7 +136,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
     u_char                     status, *pos, *start, *p, *tmp;
     size_t                     len, tmp_len;
     ngx_str_t                  host, location;
-    ngx_uint_t                 i, port;
+    ngx_uint_t                 i, port, fin;
     ngx_list_part_t           *part;
     ngx_table_elt_t           *header;
     ngx_connection_t          *fc;
@@ -684,7 +643,10 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
                                       header[i].value.len, tmp);
     }
 
-    frame = ngx_http_v2_create_headers_frame(r, start, pos, r->header_only);
+    fin = r->header_only
+          || (r->headers_out.content_length_n == 0 && !r->expect_trailers);
+
+    frame = ngx_http_v2_create_headers_frame(r, start, pos, fin);
     if (frame == NULL) {
         return NGX_ERROR;
     }
@@ -1111,54 +1073,6 @@ ngx_http_v2_push_resource(ngx_http_request_t *r, ngx_str_t *path,
 }
 
 
-static u_char *
-ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len, u_char *tmp,
-    ngx_uint_t lower)
-{
-    size_t  hlen;
-
-    hlen = ngx_http_v2_huff_encode(src, len, tmp, lower);
-
-    if (hlen > 0) {
-        *dst = NGX_HTTP_V2_ENCODE_HUFF;
-        dst = ngx_http_v2_write_int(dst, ngx_http_v2_prefix(7), hlen);
-        return ngx_cpymem(dst, tmp, hlen);
-    }
-
-    *dst = NGX_HTTP_V2_ENCODE_RAW;
-    dst = ngx_http_v2_write_int(dst, ngx_http_v2_prefix(7), len);
-
-    if (lower) {
-        ngx_strlow(dst, src, len);
-        return dst + len;
-    }
-
-    return ngx_cpymem(dst, src, len);
-}
-
-
-static u_char *
-ngx_http_v2_write_int(u_char *pos, ngx_uint_t prefix, ngx_uint_t value)
-{
-    if (value < prefix) {
-        *pos++ |= value;
-        return pos;
-    }
-
-    *pos++ |= prefix;
-    value -= prefix;
-
-    while (value >= 128) {
-        *pos++ = value % 128 + 128;
-        value /= 128;
-    }
-
-    *pos++ = (u_char) value;
-
-    return pos;
-}
-
-
 static ngx_http_v2_out_frame_t *
 ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
     u_char *end, ngx_uint_t fin)
@@ -1255,9 +1169,9 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
         cl->next = NULL;
         frame->last = cl;
 
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http2:%ui create HEADERS frame %p: len:%uz",
-                       stream->node->id, frame, frame->length);
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http2:%ui create HEADERS frame %p: len:%uz fin:%ui",
+                       stream->node->id, frame, frame->length, fin);
 
         return frame;
     }
@@ -1526,7 +1440,7 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
         in = in->next;
     }
 
-    if (in == NULL) {
+    if (in == NULL || stream->out_closed) {
 
         if (stream->queued) {
             fc->write->active = 1;
diff --git a/src/http/v2/ngx_http_v2_table.c b/src/http/v2/ngx_http_v2_table.c
index 62025c4..7d49803 100644
--- a/src/http/v2/ngx_http_v2_table.c
+++ b/src/http/v2/ngx_http_v2_table.c
@@ -86,6 +86,20 @@ static ngx_http_v2_header_t  ngx_http_v2_static_table[] = {
      / sizeof(ngx_http_v2_header_t))
 
 
+ngx_str_t *
+ngx_http_v2_get_static_name(ngx_uint_t index)
+{
+    return &ngx_http_v2_static_table[index - 1].name;
+}
+
+
+ngx_str_t *
+ngx_http_v2_get_static_value(ngx_uint_t index)
+{
+    return &ngx_http_v2_static_table[index - 1].value;
+}
+
+
 ngx_int_t
 ngx_http_v2_get_indexed_header(ngx_http_v2_connection_t *h2c, ngx_uint_t index,
     ngx_uint_t name_only)
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index 4822e72..3d415bd 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -135,7 +135,7 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
             if (ngx_freebsd_use_tcp_nopush
                 && c->tcp_nopush == NGX_TCP_NOPUSH_UNSET)
             {
-                if (ngx_tcp_nopush(c->fd) == NGX_ERROR) {
+                if (ngx_tcp_nopush(c->fd) == -1) {
                     err = ngx_socket_errno;
 
                     /*
diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c
index b44724c..5695839 100644
--- a/src/os/unix/ngx_linux_sendfile_chain.c
+++ b/src/os/unix/ngx_linux_sendfile_chain.c
@@ -130,7 +130,7 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
             if (c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
 
-                if (ngx_tcp_nopush(c->fd) == NGX_ERROR) {
+                if (ngx_tcp_nopush(c->fd) == -1) {
                     err = ngx_socket_errno;
 
                     /*
diff --git a/src/stream/ngx_stream_geo_module.c b/src/stream/ngx_stream_geo_module.c
index 632fa5a..83f7fb4 100644
--- a/src/stream/ngx_stream_geo_module.c
+++ b/src/stream/ngx_stream_geo_module.c
@@ -341,18 +341,18 @@ ngx_stream_geo_addr(ngx_stream_session_t *s, ngx_stream_geo_ctx_t *ctx,
 static char *
 ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    char                         *rv;
-    size_t                        len;
-    ngx_str_t                    *value, name;
-    ngx_uint_t                    i;
-    ngx_conf_t                    save;
-    ngx_pool_t                   *pool;
-    ngx_array_t                  *a;
-    ngx_stream_variable_t        *var;
-    ngx_stream_geo_ctx_t         *geo;
-    ngx_stream_geo_conf_ctx_t     ctx;
+    char                       *rv;
+    size_t                      len;
+    ngx_str_t                  *value, name;
+    ngx_uint_t                  i;
+    ngx_conf_t                  save;
+    ngx_pool_t                 *pool;
+    ngx_array_t                *a;
+    ngx_stream_variable_t      *var;
+    ngx_stream_geo_ctx_t       *geo;
+    ngx_stream_geo_conf_ctx_t   ctx;
 #if (NGX_HAVE_INET6)
-    static struct in6_addr        zero;
+    static struct in6_addr      zero;
 #endif
 
     value = cf->args->elts;
@@ -409,6 +409,7 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ctx.temp_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log);
     if (ctx.temp_pool == NULL) {
+        ngx_destroy_pool(pool);
         return NGX_CONF_ERROR;
     }
 
@@ -430,6 +431,10 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     *cf = save;
 
+    if (rv != NGX_CONF_OK) {
+        goto failed;
+    }
+
     if (ctx.ranges) {
 
         if (ctx.high.low && !ctx.binary_include) {
@@ -449,7 +454,7 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
                 ctx.high.low[i] = ngx_palloc(cf->pool, len + sizeof(void *));
                 if (ctx.high.low[i] == NULL) {
-                    return NGX_CONF_ERROR;
+                    goto failed;
                 }
 
                 ngx_memcpy(ctx.high.low[i], a->elts, len);
@@ -475,14 +480,11 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         var->get_handler = ngx_stream_geo_range_variable;
         var->data = (uintptr_t) geo;
 
-        ngx_destroy_pool(ctx.temp_pool);
-        ngx_destroy_pool(pool);
-
     } else {
         if (ctx.tree == NULL) {
             ctx.tree = ngx_radix_tree_create(cf->pool, -1);
             if (ctx.tree == NULL) {
-                return NGX_CONF_ERROR;
+                goto failed;
             }
         }
 
@@ -492,7 +494,7 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         if (ctx.tree6 == NULL) {
             ctx.tree6 = ngx_radix_tree_create(cf->pool, -1);
             if (ctx.tree6 == NULL) {
-                return NGX_CONF_ERROR;
+                goto failed;
             }
         }
 
@@ -502,14 +504,11 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         var->get_handler = ngx_stream_geo_cidr_variable;
         var->data = (uintptr_t) geo;
 
-        ngx_destroy_pool(ctx.temp_pool);
-        ngx_destroy_pool(pool);
-
         if (ngx_radix32tree_insert(ctx.tree, 0, 0,
                                    (uintptr_t) &ngx_stream_variable_null_value)
             == NGX_ERROR)
         {
-            return NGX_CONF_ERROR;
+            goto failed;
         }
 
         /* NGX_BUSY is okay (default was set explicitly) */
@@ -519,12 +518,22 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                                     (uintptr_t) &ngx_stream_variable_null_value)
             == NGX_ERROR)
         {
-            return NGX_CONF_ERROR;
+            goto failed;
         }
 #endif
     }
 
-    return rv;
+    ngx_destroy_pool(ctx.temp_pool);
+    ngx_destroy_pool(pool);
+
+    return NGX_CONF_OK;
+
+failed:
+
+    ngx_destroy_pool(ctx.temp_pool);
+    ngx_destroy_pool(pool);
+
+    return NGX_CONF_ERROR;
 }
 
 
diff --git a/src/stream/ngx_stream_log_module.c b/src/stream/ngx_stream_log_module.c
index 466bdda..0ff7f42 100644
--- a/src/stream/ngx_stream_log_module.c
+++ b/src/stream/ngx_stream_log_module.c
@@ -89,6 +89,11 @@ typedef struct {
 } ngx_stream_log_var_t;
 
 
+#define NGX_STREAM_LOG_ESCAPE_DEFAULT  0
+#define NGX_STREAM_LOG_ESCAPE_JSON     1
+#define NGX_STREAM_LOG_ESCAPE_NONE     2
+
+
 static void ngx_stream_log_write(ngx_stream_session_t *s, ngx_stream_log_t *log,
     u_char *buf, size_t len);
 static ssize_t ngx_stream_log_script_write(ngx_stream_session_t *s,
@@ -106,7 +111,7 @@ static void ngx_stream_log_flush(ngx_open_file_t *file, ngx_log_t *log);
 static void ngx_stream_log_flush_handler(ngx_event_t *ev);
 
 static ngx_int_t ngx_stream_log_variable_compile(ngx_conf_t *cf,
-    ngx_stream_log_op_t *op, ngx_str_t *value, ngx_uint_t json);
+    ngx_stream_log_op_t *op, ngx_str_t *value, ngx_uint_t escape);
 static size_t ngx_stream_log_variable_getlen(ngx_stream_session_t *s,
     uintptr_t data);
 static u_char *ngx_stream_log_variable(ngx_stream_session_t *s, u_char *buf,
@@ -116,6 +121,10 @@ static size_t ngx_stream_log_json_variable_getlen(ngx_stream_session_t *s,
     uintptr_t data);
 static u_char *ngx_stream_log_json_variable(ngx_stream_session_t *s,
     u_char *buf, ngx_stream_log_op_t *op);
+static size_t ngx_stream_log_unescaped_variable_getlen(ngx_stream_session_t *s,
+    uintptr_t data);
+static u_char *ngx_stream_log_unescaped_variable(ngx_stream_session_t *s,
+    u_char *buf, ngx_stream_log_op_t *op);
 
 
 static void *ngx_stream_log_create_main_conf(ngx_conf_t *cf);
@@ -682,7 +691,7 @@ ngx_stream_log_copy_long(ngx_stream_session_t *s, u_char *buf,
 
 static ngx_int_t
 ngx_stream_log_variable_compile(ngx_conf_t *cf, ngx_stream_log_op_t *op,
-    ngx_str_t *value, ngx_uint_t json)
+    ngx_str_t *value, ngx_uint_t escape)
 {
     ngx_int_t  index;
 
@@ -693,11 +702,18 @@ ngx_stream_log_variable_compile(ngx_conf_t *cf, ngx_stream_log_op_t *op,
 
     op->len = 0;
 
-    if (json) {
+    switch (escape) {
+    case NGX_STREAM_LOG_ESCAPE_JSON:
         op->getlen = ngx_stream_log_json_variable_getlen;
         op->run = ngx_stream_log_json_variable;
+        break;
 
-    } else {
+    case NGX_STREAM_LOG_ESCAPE_NONE:
+        op->getlen = ngx_stream_log_unescaped_variable_getlen;
+        op->run = ngx_stream_log_unescaped_variable;
+        break;
+
+    default: /* NGX_STREAM_LOG_ESCAPE_DEFAULT */
         op->getlen = ngx_stream_log_variable_getlen;
         op->run = ngx_stream_log_variable;
     }
@@ -851,6 +867,40 @@ ngx_stream_log_json_variable(ngx_stream_session_t *s, u_char *buf,
 }
 
 
+static size_t
+ngx_stream_log_unescaped_variable_getlen(ngx_stream_session_t *s,
+    uintptr_t data)
+{
+    ngx_stream_variable_value_t  *value;
+
+    value = ngx_stream_get_indexed_variable(s, data);
+
+    if (value == NULL || value->not_found) {
+        return 0;
+    }
+
+    value->escape = 0;
+
+    return value->len;
+}
+
+
+static u_char *
+ngx_stream_log_unescaped_variable(ngx_stream_session_t *s, u_char *buf,
+                                  ngx_stream_log_op_t *op)
+{
+    ngx_stream_variable_value_t  *value;
+
+    value = ngx_stream_get_indexed_variable(s, op->data);
+
+    if (value == NULL || value->not_found) {
+        return buf;
+    }
+
+    return ngx_cpymem(buf, value->data, value->len);
+}
+
+
 static void *
 ngx_stream_log_create_main_conf(ngx_conf_t *cf)
 {
@@ -1265,17 +1315,20 @@ ngx_stream_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
     size_t                 i, len;
     ngx_str_t             *value, var;
     ngx_int_t             *flush;
-    ngx_uint_t             bracket, json;
+    ngx_uint_t             bracket, escape;
     ngx_stream_log_op_t   *op;
 
-    json = 0;
+    escape = NGX_STREAM_LOG_ESCAPE_DEFAULT;
     value = args->elts;
 
     if (s < args->nelts && ngx_strncmp(value[s].data, "escape=", 7) == 0) {
         data = value[s].data + 7;
 
         if (ngx_strcmp(data, "json") == 0) {
-            json = 1;
+            escape = NGX_STREAM_LOG_ESCAPE_JSON;
+
+        } else if (ngx_strcmp(data, "none") == 0) {
+            escape = NGX_STREAM_LOG_ESCAPE_NONE;
 
         } else if (ngx_strcmp(data, "default") != 0) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -1350,7 +1403,7 @@ ngx_stream_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes,
                     goto invalid;
                 }
 
-                if (ngx_stream_log_variable_compile(cf, op, &var, json)
+                if (ngx_stream_log_variable_compile(cf, op, &var, escape)
                     != NGX_OK)
                 {
                     return NGX_CONF_ERROR;
diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c
index e3d11fd..62d6524 100644
--- a/src/stream/ngx_stream_ssl_preread_module.c
+++ b/src/stream/ngx_stream_ssl_preread_module.c
@@ -17,10 +17,12 @@ typedef struct {
 typedef struct {
     size_t          left;
     size_t          size;
+    size_t          ext;
     u_char         *pos;
     u_char         *dst;
     u_char          buf[4];
     ngx_str_t       host;
+    ngx_str_t       alpn;
     ngx_log_t      *log;
     ngx_pool_t     *pool;
     ngx_uint_t      state;
@@ -32,6 +34,8 @@ static ngx_int_t ngx_stream_ssl_preread_parse_record(
     ngx_stream_ssl_preread_ctx_t *ctx, u_char *pos, u_char *last);
 static ngx_int_t ngx_stream_ssl_preread_server_name_variable(
     ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_ssl_preread_alpn_protocols_variable(
+    ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_ssl_preread_add_variables(ngx_conf_t *cf);
 static void *ngx_stream_ssl_preread_create_srv_conf(ngx_conf_t *cf);
 static char *ngx_stream_ssl_preread_merge_srv_conf(ngx_conf_t *cf, void *parent,
@@ -85,6 +89,9 @@ static ngx_stream_variable_t  ngx_stream_ssl_preread_vars[] = {
     { ngx_string("ssl_preread_server_name"), NULL,
       ngx_stream_ssl_preread_server_name_variable, 0, 0, 0 },
 
+    { ngx_string("ssl_preread_alpn_protocols"), NULL,
+      ngx_stream_ssl_preread_alpn_protocols_variable, 0, 0, 0 },
+
       ngx_stream_null_variable
 };
 
@@ -139,12 +146,14 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
         if (p[0] != 0x16) {
             ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
                            "ssl preread: not a handshake");
+            ngx_stream_set_ctx(s, NULL, ngx_stream_ssl_preread_module);
             return NGX_DECLINED;
         }
 
         if (p[1] != 3) {
             ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
                            "ssl preread: unsupported SSL version");
+            ngx_stream_set_ctx(s, NULL, ngx_stream_ssl_preread_module);
             return NGX_DECLINED;
         }
 
@@ -158,6 +167,12 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
         p += 5;
 
         rc = ngx_stream_ssl_preread_parse_record(ctx, p, p + len);
+
+        if (rc == NGX_DECLINED) {
+            ngx_stream_set_ctx(s, NULL, ngx_stream_ssl_preread_module);
+            return NGX_DECLINED;
+        }
+
         if (rc != NGX_AGAIN) {
             return rc;
         }
@@ -175,7 +190,7 @@ static ngx_int_t
 ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
     u_char *pos, u_char *last)
 {
-    size_t   left, n, size;
+    size_t   left, n, size, ext;
     u_char  *dst, *p;
 
     enum {
@@ -192,7 +207,10 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
         sw_ext_header,      /* extension_type, extension_data length */
         sw_sni_len,         /* SNI length */
         sw_sni_host_head,   /* SNI name_type, host_name length */
-        sw_sni_host         /* SNI host_name */
+        sw_sni_host,        /* SNI host_name */
+        sw_alpn_len,        /* ALPN length */
+        sw_alpn_proto_len,  /* ALPN protocol_name length */
+        sw_alpn_proto_data  /* ALPN protocol_name */
     } state;
 
     ngx_log_debug2(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
@@ -201,6 +219,7 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
     state = ctx->state;
     size = ctx->size;
     left = ctx->left;
+    ext = ctx->ext;
     dst = ctx->dst;
     p = ctx->buf;
 
@@ -299,10 +318,18 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
             break;
 
         case sw_ext_header:
-            if (p[0] == 0 && p[1] == 0) {
+            if (p[0] == 0 && p[1] == 0 && ctx->host.data == NULL) {
                 /* SNI extension */
                 state = sw_sni_len;
-                dst = NULL;
+                dst = p;
+                size = 2;
+                break;
+            }
+
+            if (p[0] == 0 && p[1] == 16 && ctx->alpn.data == NULL) {
+                /* ALPN extension */
+                state = sw_alpn_len;
+                dst = p;
                 size = 2;
                 break;
             }
@@ -313,6 +340,7 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
             break;
 
         case sw_sni_len:
+            ext = (p[0] << 8) + p[1];
             state = sw_sni_host_head;
             dst = p;
             size = 3;
@@ -325,14 +353,21 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
                 return NGX_DECLINED;
             }
 
-            state = sw_sni_host;
             size = (p[1] << 8) + p[2];
 
+            if (ext < 3 + size) {
+                ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                               "ssl preread: SNI format error");
+                return NGX_DECLINED;
+            }
+            ext -= 3 + size;
+
             ctx->host.data = ngx_pnalloc(ctx->pool, size);
             if (ctx->host.data == NULL) {
                 return NGX_ERROR;
             }
 
+            state = sw_sni_host;
             dst = ctx->host.data;
             break;
 
@@ -341,19 +376,77 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
 
             ngx_log_debug1(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
                            "ssl preread: SNI hostname \"%V\"", &ctx->host);
-            return NGX_OK;
+
+            state = sw_ext;
+            dst = NULL;
+            size = ext;
+            break;
+
+        case sw_alpn_len:
+            ext = (p[0] << 8) + p[1];
+
+            ctx->alpn.data = ngx_pnalloc(ctx->pool, ext);
+            if (ctx->alpn.data == NULL) {
+                return NGX_ERROR;
+            }
+
+            state = sw_alpn_proto_len;
+            dst = p;
+            size = 1;
+            break;
+
+        case sw_alpn_proto_len:
+            size = p[0];
+
+            if (size == 0) {
+                ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                               "ssl preread: ALPN empty protocol");
+                return NGX_DECLINED;
+            }
+
+            if (ext < 1 + size) {
+                ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                               "ssl preread: ALPN format error");
+                return NGX_DECLINED;
+            }
+            ext -= 1 + size;
+
+            state = sw_alpn_proto_data;
+            dst = ctx->alpn.data + ctx->alpn.len;
+            break;
+
+        case sw_alpn_proto_data:
+            ctx->alpn.len += p[0];
+
+            ngx_log_debug1(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                           "ssl preread: ALPN protocols \"%V\"", &ctx->alpn);
+
+            if (ext) {
+                ctx->alpn.data[ctx->alpn.len++] = ',';
+
+                state = sw_alpn_proto_len;
+                dst = p;
+                size = 1;
+                break;
+            }
+
+            state = sw_ext;
+            dst = NULL;
+            size = 0;
+            break;
         }
 
         if (left < size) {
-           ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
-                          "ssl preread: failed to parse handshake");
-           return NGX_DECLINED;
+            ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                           "ssl preread: failed to parse handshake");
+            return NGX_DECLINED;
         }
     }
 
     ctx->state = state;
     ctx->size = size;
     ctx->left = left;
+    ctx->ext = ext;
     ctx->dst = dst;
 
     return NGX_AGAIN;
@@ -383,6 +476,29 @@ ngx_stream_ssl_preread_server_name_variable(ngx_stream_session_t *s,
 }
 
 
+static ngx_int_t
+ngx_stream_ssl_preread_alpn_protocols_variable(ngx_stream_session_t *s,
+    ngx_variable_value_t *v, uintptr_t data)
+{
+    ngx_stream_ssl_preread_ctx_t  *ctx;
+
+    ctx = ngx_stream_get_module_ctx(s, ngx_stream_ssl_preread_module);
+
+    if (ctx == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->len = ctx->alpn.len;
+    v->data = ctx->alpn.data;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_ssl_preread_add_variables(ngx_conf_t *cf)
 {
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
index 95ae12b..d1526a9 100644
--- a/src/stream/ngx_stream_variables.c
+++ b/src/stream/ngx_stream_variables.c
@@ -161,7 +161,9 @@ ngx_stream_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
             return NULL;
         }
 
-        v->flags &= flags | ~NGX_STREAM_VAR_WEAK;
+        if (!(flags & NGX_STREAM_VAR_WEAK)) {
+            v->flags &= ~NGX_STREAM_VAR_WEAK;
+        }
 
         return v;
     }
@@ -227,7 +229,9 @@ ngx_stream_add_prefix_variable(ngx_conf_t *cf, ngx_str_t *name,
             return NULL;
         }
 
-        v->flags &= flags | ~NGX_STREAM_VAR_WEAK;
+        if (!(flags & NGX_STREAM_VAR_WEAK)) {
+            v->flags &= ~NGX_STREAM_VAR_WEAK;
+        }
 
         return v;
     }

From 1746e53baada5a24037cef5bb042360d7dd441da Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 21 Mar 2018 16:16:42 +0200
Subject: [PATCH 248/600] Release 1.13.10-1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index af8b04d..0f20805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.13.10-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 21 Mar 2018 16:16:22 +0200
+
 nginx (1.13.9-1) unstable; urgency=medium
 
   [ Michael Lustfield ]

From 1292f53fbcbba3c0429a845ea3972f012e4491c9 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 9 Apr 2018 08:40:16 +0300
Subject: [PATCH 249/600] New upstream version 1.13.11

---
 CHANGES                                 |  12 ++
 CHANGES.ru                              |  11 ++
 auto/lib/openssl/conf                   |  21 ++-
 auto/lib/openssl/make                   |   2 +-
 auto/threads                            |   1 +
 auto/unix                               |   1 +
 src/core/nginx.c                        |   4 +-
 src/core/nginx.h                        |   4 +-
 src/core/ngx_proxy_protocol.c           | 177 +++++++++++++++++++++++-
 src/http/modules/ngx_http_grpc_module.c |   6 +-
 src/http/ngx_http_upstream.c            |  20 ++-
 src/stream/ngx_stream_proxy_module.c    |  13 +-
 12 files changed, 252 insertions(+), 20 deletions(-)

diff --git a/CHANGES b/CHANGES
index c8e83eb..47501aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,16 @@
 
+Changes with nginx 1.13.11                                       03 Apr 2018
+
+    *) Feature: the "proxy_protocol" parameter of the "listen" directive now
+       supports the PROXY protocol version 2.
+
+    *) Bugfix: nginx could not be built with OpenSSL 1.1.1 statically on
+       Linux.
+
+    *) Bugfix: in the "http_404", "http_500", etc. parameters of the
+       "proxy_next_upstream" directive.
+
+
 Changes with nginx 1.13.10                                       20 Mar 2018
 
     *) Feature: the "set" parameter of the "include" SSI directive now
diff --git a/CHANGES.ru b/CHANGES.ru
index cd59962..70d96c9 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,15 @@
 
+Изменения в nginx 1.13.11                                         03.04.2018
+
+    *) Добавление: параметр proxy_protocol директивы listen теперь
+       поддерживает протокол PROXY версии 2.
+
+    *) Исправление: nginx не собирался с OpenSSL 1.1.1 статически на Linux.
+
+    *) Исправление: в параметрах http_404, http_500 и им подобных директивы
+       proxy_next_upstream.
+
+
 Изменения в nginx 1.13.10                                         20.03.2018
 
     *) Добавление: теперь параметр set в SSI-директиве include позволяет
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index e7d3795..4fb52df 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -41,6 +41,7 @@ if [ $OPENSSL != NONE ]; then
             CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
             CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
             CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
+            CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD"
 
             if [ "$NGX_PLATFORM" = win32 ]; then
                 CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32"
@@ -59,7 +60,7 @@ else
         ngx_feature_run=no
         ngx_feature_incs="#include <openssl/ssl.h>"
         ngx_feature_path=
-        ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
+        ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD"
         ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
         . auto/feature
 
@@ -71,11 +72,13 @@ else
             ngx_feature_path="/usr/local/include"
 
             if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto $NGX_LIBDL"
+                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto"
             else
-                ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto $NGX_LIBDL"
+                ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto"
             fi
 
+            ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
+
             . auto/feature
         fi
 
@@ -87,11 +90,13 @@ else
             ngx_feature_path="/usr/pkg/include"
 
             if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL"
+                ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto"
             else
-                ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL"
+                ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto"
             fi
 
+            ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
+
             . auto/feature
         fi
 
@@ -103,11 +108,13 @@ else
             ngx_feature_path="/opt/local/include"
 
             if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto $NGX_LIBDL"
+                ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto"
             else
-                ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto $NGX_LIBDL"
+                ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto"
             fi
 
+            ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
+
             . auto/feature
         fi
 
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index a6090c6..126a238 100644
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -51,7 +51,7 @@ END
 $OPENSSL/.openssl/include/openssl/ssl.h:	$NGX_MAKEFILE
 	cd $OPENSSL \\
 	&& if [ -f Makefile ]; then \$(MAKE) clean; fi \\
-	&& ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
+	&& ./config --prefix=$ngx_prefix no-shared no-threads $OPENSSL_OPT \\
 	&& \$(MAKE) \\
 	&& \$(MAKE) install_sw LIBDIR=lib
 
diff --git a/auto/threads b/auto/threads
index 381f07a..943127f 100644
--- a/auto/threads
+++ b/auto/threads
@@ -17,4 +17,5 @@ END
     CORE_DEPS="$CORE_DEPS $THREAD_POOL_DEPS"
     CORE_SRCS="$CORE_SRCS $THREAD_POOL_SRCS"
     CORE_LIBS="$CORE_LIBS -lpthread"
+    NGX_LIBPTHREAD="-lpthread"
 fi
diff --git a/auto/unix b/auto/unix
index 90b5894..43d3b25 100644
--- a/auto/unix
+++ b/auto/unix
@@ -901,6 +901,7 @@ if [ $ngx_found = no ]; then
 
     if [ $ngx_found = yes ]; then
         CORE_LIBS="$CORE_LIBS -lpthread"
+        NGX_LIBPTHREAD="-lpthread"
     fi
 fi
 
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 3894c29..9fcb0eb 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -985,8 +985,8 @@ ngx_process_options(ngx_cycle_t *cycle)
          p--)
     {
         if (ngx_path_separator(*p)) {
-            cycle->conf_prefix.len = p - ngx_cycle->conf_file.data + 1;
-            cycle->conf_prefix.data = ngx_cycle->conf_file.data;
+            cycle->conf_prefix.len = p - cycle->conf_file.data + 1;
+            cycle->conf_prefix.data = cycle->conf_file.data;
             break;
         }
     }
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 677d6cf..0267ea9 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013010
-#define NGINX_VERSION      "1.13.10"
+#define nginx_version      1013011
+#define NGINX_VERSION      "1.13.11"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_proxy_protocol.c b/src/core/ngx_proxy_protocol.c
index 523ec35..c3d7fd3 100644
--- a/src/core/ngx_proxy_protocol.c
+++ b/src/core/ngx_proxy_protocol.c
@@ -9,6 +9,41 @@
 #include <ngx_core.h>
 
 
+#define NGX_PROXY_PROTOCOL_AF_INET          1
+#define NGX_PROXY_PROTOCOL_AF_INET6         2
+
+
+#define ngx_proxy_protocol_parse_uint16(p)  ((p)[0] << 8 | (p)[1])
+
+
+typedef struct {
+    u_char                                  signature[12];
+    u_char                                  version_command;
+    u_char                                  family_transport;
+    u_char                                  len[2];
+} ngx_proxy_protocol_header_t;
+
+
+typedef struct {
+    u_char                                  src_addr[4];
+    u_char                                  dst_addr[4];
+    u_char                                  src_port[2];
+    u_char                                  dst_port[2];
+} ngx_proxy_protocol_inet_addrs_t;
+
+
+typedef struct {
+    u_char                                  src_addr[16];
+    u_char                                  dst_addr[16];
+    u_char                                  src_port[2];
+    u_char                                  dst_port[2];
+} ngx_proxy_protocol_inet6_addrs_t;
+
+
+static u_char *ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf,
+    u_char *last);
+
+
 u_char *
 ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last)
 {
@@ -16,9 +51,17 @@ ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last)
     u_char     ch, *p, *addr, *port;
     ngx_int_t  n;
 
+    static const u_char signature[] = "\r\n\r\n\0\r\nQUIT\n";
+
     p = buf;
     len = last - buf;
 
+    if (len >= sizeof(ngx_proxy_protocol_header_t)
+        && memcmp(p, signature, sizeof(signature) - 1) == 0)
+    {
+        return ngx_proxy_protocol_v2_read(c, buf, last);
+    }
+
     if (len < 8 || ngx_strncmp(p, "PROXY ", 6) != 0) {
         goto invalid;
     }
@@ -105,7 +148,8 @@ ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last)
     c->proxy_protocol_port = (in_port_t) n;
 
     ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0,
-                   "PROXY protocol address: %V %i", &c->proxy_protocol_addr, n);
+                   "PROXY protocol address: %V %d", &c->proxy_protocol_addr,
+                   c->proxy_protocol_port);
 
 skip:
 
@@ -166,3 +210,134 @@ ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last)
 
     return ngx_slprintf(buf, last, " %ui %ui" CRLF, port, lport);
 }
+
+
+static u_char *
+ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last)
+{
+    u_char                             *end;
+    size_t                              len;
+    socklen_t                           socklen;
+    ngx_uint_t                          version, command, family, transport;
+    ngx_sockaddr_t                      sockaddr;
+    ngx_proxy_protocol_header_t        *header;
+    ngx_proxy_protocol_inet_addrs_t    *in;
+#if (NGX_HAVE_INET6)
+    ngx_proxy_protocol_inet6_addrs_t   *in6;
+#endif
+
+    header = (ngx_proxy_protocol_header_t *) buf;
+
+    buf += sizeof(ngx_proxy_protocol_header_t);
+
+    version = header->version_command >> 4;
+
+    if (version != 2) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                      "unknown PROXY protocol version: %ui", version);
+        return NULL;
+    }
+
+    len = ngx_proxy_protocol_parse_uint16(header->len);
+
+    if ((size_t) (last - buf) < len) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0, "header is too large");
+        return NULL;
+    }
+
+    end = buf + len;
+
+    command = header->version_command & 0x0f;
+
+    /* only PROXY is supported */
+    if (command != 1) {
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
+                       "PROXY protocol v2 unsupported command %ui", command);
+        return end;
+    }
+
+    transport = header->family_transport & 0x0f;
+
+    /* only STREAM is supported */
+    if (transport != 1) {
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
+                       "PROXY protocol v2 unsupported transport %ui",
+                       transport);
+        return end;
+    }
+
+    family = header->family_transport >> 4;
+
+    switch (family) {
+
+    case NGX_PROXY_PROTOCOL_AF_INET:
+
+        if ((size_t) (end - buf) < sizeof(ngx_proxy_protocol_inet_addrs_t)) {
+            return NULL;
+        }
+
+        in = (ngx_proxy_protocol_inet_addrs_t *) buf;
+
+        sockaddr.sockaddr_in.sin_family = AF_INET;
+        sockaddr.sockaddr_in.sin_port = 0;
+        memcpy(&sockaddr.sockaddr_in.sin_addr, in->src_addr, 4);
+
+        c->proxy_protocol_port = ngx_proxy_protocol_parse_uint16(in->src_port);
+
+        socklen = sizeof(struct sockaddr_in);
+
+        buf += sizeof(ngx_proxy_protocol_inet_addrs_t);
+
+        break;
+
+#if (NGX_HAVE_INET6)
+
+    case NGX_PROXY_PROTOCOL_AF_INET6:
+
+        if ((size_t) (end - buf) < sizeof(ngx_proxy_protocol_inet6_addrs_t)) {
+            return NULL;
+        }
+
+        in6 = (ngx_proxy_protocol_inet6_addrs_t *) buf;
+
+        sockaddr.sockaddr_in6.sin6_family = AF_INET6;
+        sockaddr.sockaddr_in6.sin6_port = 0;
+        memcpy(&sockaddr.sockaddr_in6.sin6_addr, in6->src_addr, 16);
+
+        c->proxy_protocol_port = ngx_proxy_protocol_parse_uint16(in6->src_port);
+
+        socklen = sizeof(struct sockaddr_in6);
+
+        buf += sizeof(ngx_proxy_protocol_inet6_addrs_t);
+
+        break;
+
+#endif
+
+    default:
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
+                       "PROXY protocol v2 unsupported address family %ui",
+                       family);
+        return end;
+    }
+
+    c->proxy_protocol_addr.data = ngx_pnalloc(c->pool, NGX_SOCKADDR_STRLEN);
+    if (c->proxy_protocol_addr.data == NULL) {
+        return NULL;
+    }
+
+    c->proxy_protocol_addr.len = ngx_sock_ntop(&sockaddr.sockaddr, socklen,
+                                               c->proxy_protocol_addr.data,
+                                               NGX_SOCKADDR_STRLEN, 0);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0,
+                   "PROXY protocol v2 address: %V %d", &c->proxy_protocol_addr,
+                   c->proxy_protocol_port);
+
+    if (buf < end) {
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
+                       "PROXY protocol v2 %z bytes of tlv ignored", end - buf);
+    }
+
+    return end;
+}
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
index b6be9b8..837ad9a 100644
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -3212,7 +3212,7 @@ ngx_http_grpc_parse_rst_stream(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
         switch (state) {
 
         case sw_start:
-            ctx->error = ch << 24;
+            ctx->error = (ngx_uint_t) ch << 24;
             state = sw_error_2;
             break;
 
@@ -3325,7 +3325,7 @@ ngx_http_grpc_parse_goaway(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
             break;
 
         case sw_error:
-            ctx->error = ch << 24;
+            ctx->error = (ngx_uint_t) ch << 24;
             state = sw_error_2;
             break;
 
@@ -3555,7 +3555,7 @@ ngx_http_grpc_parse_settings(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
             break;
 
         case sw_value:
-            ctx->setting_value = ch << 24;
+            ctx->setting_value = (ngx_uint_t) ch << 24;
             state = sw_value_2;
             break;
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index e6f9c09..a415f58 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2389,7 +2389,8 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u)
 static ngx_int_t
 ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
 {
-    ngx_uint_t                 status;
+    ngx_msec_t                 timeout;
+    ngx_uint_t                 status, mask;
     ngx_http_upstream_next_t  *un;
 
     status = u->headers_in.status_n;
@@ -2400,7 +2401,22 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
             continue;
         }
 
-        if (u->peer.tries > 1 && (u->conf->next_upstream & un->mask)) {
+        timeout = u->conf->next_upstream_timeout;
+
+        if (u->request_sent
+            && (r->method & (NGX_HTTP_POST|NGX_HTTP_LOCK|NGX_HTTP_PATCH)))
+        {
+            mask = un->mask | NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT;
+
+        } else {
+            mask = un->mask;
+        }
+
+        if (u->peer.tries > 1
+            && ((u->conf->next_upstream & mask) == mask)
+            && !(u->request_sent && r->request_body_no_buffering)
+            && !(timeout && ngx_current_msec - u->peer.start_time >= timeout))
+        {
             ngx_http_upstream_next(r, u, un->mask);
             return NGX_OK;
         }
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 818d732..30572cd 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -801,8 +801,6 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
                        NGX_STREAM_UPSTREAM_NOTIFY_CONNECT);
     }
 
-    c->log->action = "proxying connection";
-
     if (u->upstream_buf.start == NULL) {
         p = ngx_pnalloc(c->pool, pscf->buffer_size);
         if (p == NULL) {
@@ -1449,6 +1447,7 @@ static void
 ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
     ngx_uint_t do_write)
 {
+    char                         *recv_action, *send_action;
     off_t                        *received, limit;
     size_t                        size, limit_rate;
     ssize_t                       n;
@@ -1492,6 +1491,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         received = &u->received;
         out = &u->downstream_out;
         busy = &u->downstream_busy;
+        recv_action = "proxying and reading from upstream";
+        send_action = "proxying and sending to client";
 
     } else {
         src = c;
@@ -1501,6 +1502,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         received = &s->received;
         out = &u->upstream_out;
         busy = &u->upstream_busy;
+        recv_action = "proxying and reading from client";
+        send_action = "proxying and sending to upstream";
     }
 
     for ( ;; ) {
@@ -1508,6 +1511,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         if (do_write && dst) {
 
             if (*out || *busy || dst->buffered) {
+                c->log->action = send_action;
+
                 rc = ngx_stream_top_filter(s, *out, from_upstream);
 
                 if (rc == NGX_ERROR) {
@@ -1551,6 +1556,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                 }
             }
 
+            c->log->action = recv_action;
+
             n = src->recv(src, b->last, size);
 
             if (n == NGX_AGAIN) {
@@ -1620,6 +1627,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         break;
     }
 
+    c->log->action = "proxying connection";
+
     if (src->read->eof && dst && (dst->read->eof || !dst->buffered)) {
         handler = c->log->handler;
         c->log->handler = NULL;

From 6e014f97a79265534d49951b619c797512b2a652 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Tue, 10 Apr 2018 15:13:10 +0300
Subject: [PATCH 250/600] Bump Standards-Version, no changes neeeded

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index bfb3a26..b33b45e 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 10),
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
 Homepage: http://nginx.net
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx

From 9120a3de9b4c892465c3f3401d9729bcf73228b8 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Tue, 10 Apr 2018 15:13:22 +0300
Subject: [PATCH 251/600] Release 1.13.11-1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0f20805..a9b197f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.13.11-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Tue, 10 Apr 2018 14:55:11 +0300
+
 nginx (1.13.10-1) unstable; urgency=medium
 
   * New upstream version

From a051533bf7ffbc83f80a45280d4a43c859e9ce65 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 11 Apr 2018 08:18:03 +0300
Subject: [PATCH 252/600] New upstream version 1.13.12

---
 CHANGES                      |  6 ++++++
 CHANGES.ru                   |  6 ++++++
 src/core/nginx.h             |  4 ++--
 src/http/ngx_http_upstream.c | 18 ++++++++++++------
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 47501aa..fa22ad5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+Changes with nginx 1.13.12                                       10 Apr 2018
+
+    *) Bugfix: connections with gRPC backends might be closed unexpectedly
+       when returning a large response.
+
+
 Changes with nginx 1.13.11                                       03 Apr 2018
 
     *) Feature: the "proxy_protocol" parameter of the "listen" directive now
diff --git a/CHANGES.ru b/CHANGES.ru
index 70d96c9..79746e3 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,10 @@
 
+Изменения в nginx 1.13.12                                         10.04.2018
+
+    *) Исправление: при возврате большого ответа соединения с gRPC-бэкендами
+       могли неожиданно закрываться.
+
+
 Изменения в nginx 1.13.11                                         03.04.2018
 
     *) Добавление: параметр proxy_protocol директивы listen теперь
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 0267ea9..0065464 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013011
-#define NGINX_VERSION      "1.13.11"
+#define nginx_version      1013012
+#define NGINX_VERSION      "1.13.12"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index a415f58..8fc3042 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2013,8 +2013,6 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
 
     /* rc == NGX_OK */
 
-    u->request_body_sent = 1;
-
     if (c->write->timer_set) {
         ngx_del_timer(c->write);
     }
@@ -2041,11 +2039,19 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
         return;
     }
 
-    ngx_add_timer(c->read, u->conf->read_timeout);
+    if (!u->request_body_sent) {
+        u->request_body_sent = 1;
 
-    if (c->read->ready) {
-        ngx_http_upstream_process_header(r, u);
-        return;
+        if (u->header_sent) {
+            return;
+        }
+
+        ngx_add_timer(c->read, u->conf->read_timeout);
+
+        if (c->read->ready) {
+            ngx_http_upstream_process_header(r, u);
+            return;
+        }
     }
 }
 

From 46c038d54e3d21f33c1f5e657dcd234739a0bcf7 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 11 Apr 2018 08:19:50 +0300
Subject: [PATCH 253/600] Release 1.13.12-1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a9b197f..e1ee23c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.13.12-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 11 Apr 2018 08:19:23 +0300
+
 nginx (1.13.11-1) unstable; urgency=medium
 
   * New upstream version

From 0091e68c207663ce3745496b9db8cfd8969d06e7 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 23 Apr 2018 10:53:03 +0300
Subject: [PATCH 254/600] Follow stable 1.14 series

---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 0a39b11..42f4680 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-https://nginx.org/download/nginx-(1\.13\.\d+)\.tar\.gz
+https://nginx.org/download/nginx-(1\.14\.\d+)\.tar\.gz

From 063c1e94b6d56a1344698f43352bc954439e3833 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 23 Apr 2018 10:53:36 +0300
Subject: [PATCH 255/600] New upstream version 1.14.0

---
 CHANGES          | 5 +++++
 CHANGES.ru       | 5 +++++
 src/core/nginx.h | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index fa22ad5..9d88346 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+Changes with nginx 1.14.0                                        17 Apr 2018
+
+    *) 1.14.x stable branch.
+
+
 Changes with nginx 1.13.12                                       10 Apr 2018
 
     *) Bugfix: connections with gRPC backends might be closed unexpectedly
diff --git a/CHANGES.ru b/CHANGES.ru
index 79746e3..3accd44 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,9 @@
 
+Изменения в nginx 1.14.0                                          17.04.2018
+
+    *) Стабильная ветка 1.14.x.
+
+
 Изменения в nginx 1.13.12                                         10.04.2018
 
     *) Исправление: при возврате большого ответа соединения с gRPC-бэкендами
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 0065464..be4563d 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013012
-#define NGINX_VERSION      "1.13.12"
+#define nginx_version      1014000
+#define NGINX_VERSION      "1.14.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD

From 7207dbf3b43fc2d7c4045b631f6cd95d61378778 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Sat, 2 Jun 2018 21:26:04 +0300
Subject: [PATCH 256/600] Update mailing list address to alioth-lists.d.n

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index b33b45e..9746073 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: nginx
 Section: httpd
 Priority: optional
-Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@lists.alioth.debian.org>
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>
 Build-Depends: debhelper (>= 10),
                po-debconf,

From 58f11854b65f10b9bfa6ca6b55d24d46293a3550 Mon Sep 17 00:00:00 2001
From: Kartik Mistry <kartik.mistry@gmail.com>
Date: Thu, 30 Aug 2018 13:43:10 +0530
Subject: [PATCH 257/600] Duplicate B-D removal and https in Homepage

---
 debian/changelog | 9 +++++++++
 debian/control   | 3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1ee23c..93d1da1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nginx (1.13.12-2) UNRELEASED; urgency=low
+
+  [ Kartik Mistry ]
+  * debian/control:
+    + Removed duplicate Build-Depends.
+    + Use https in Homepage.
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 30 Aug 2018 13:41:33 +0530
+
 nginx (1.13.12-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/control b/debian/control
index 9746073..eb41c42 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>
 Build-Depends: debhelper (>= 10),
-               po-debconf,
                dpkg-dev (>= 1.15.5),
                libexpat-dev,
                libgd-dev,
@@ -22,7 +21,7 @@ Build-Depends: debhelper (>= 10),
                quilt,
                zlib1g-dev
 Standards-Version: 4.1.4
-Homepage: http://nginx.net
+Homepage: https://nginx.net
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx
 

From 4918bc1382f5c9250d23dbff249a67de6f7de2e7 Mon Sep 17 00:00:00 2001
From: Kartik Mistry <kartik.mistry@gmail.com>
Date: Thu, 30 Aug 2018 16:23:20 +0530
Subject: [PATCH 258/600] Use https in copyright

---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 722b31b..66a44d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: nginx
-Source: http://nginx.org/en/download.html
+Source: https://nginx.org/en/download.html
 
 Files: *
 Copyright: 2002-2014 Igor Sysoev

From 75d123cd1b3573acfa613618cd1770c3d4d58685 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Tue, 19 Jun 2018 16:16:24 +0300
Subject: [PATCH 259/600] http-lua: Upgrade to 0.10.13

---
 debian/modules/control                        |   2 +-
 debian/modules/http-lua/README.markdown       | 137 +++--
 .../modules/http-lua/doc/HttpLuaModule.wiki   | 136 +++--
 .../http-lua/src/api/ngx_http_lua_api.h       |   9 +-
 .../modules/http-lua/src/ngx_http_lua_args.c  |  11 +-
 .../http-lua/src/ngx_http_lua_balancer.c      |   4 +-
 .../http-lua/src/ngx_http_lua_clfactory.c     |  40 +-
 .../http-lua/src/ngx_http_lua_common.h        |  12 +-
 .../http-lua/src/ngx_http_lua_consts.c        |   3 +
 .../http-lua/src/ngx_http_lua_control.c       |   2 +
 .../http-lua/src/ngx_http_lua_directive.c     |  53 +-
 .../http-lua/src/ngx_http_lua_exception.h     |   6 +-
 .../http-lua/src/ngx_http_lua_headers.c       |  81 ++-
 .../http-lua/src/ngx_http_lua_initworkerby.c  |  29 +-
 .../modules/http-lua/src/ngx_http_lua_log.c   |  23 +
 .../http-lua/src/ngx_http_lua_module.c        |   3 +
 .../modules/http-lua/src/ngx_http_lua_phase.c |  18 +
 .../modules/http-lua/src/ngx_http_lua_probe.h |   3 +-
 .../modules/http-lua/src/ngx_http_lua_regex.c |   2 +
 .../http-lua/src/ngx_http_lua_req_method.c    |   7 +-
 .../http-lua/src/ngx_http_lua_rewriteby.c     |  12 +-
 .../http-lua/src/ngx_http_lua_shdict.c        |  23 +-
 .../http-lua/src/ngx_http_lua_socket_tcp.c    | 157 ++++--
 .../http-lua/src/ngx_http_lua_socket_udp.c    |  44 +-
 .../http-lua/src/ngx_http_lua_ssl_certby.c    |  89 ++-
 .../http-lua/src/ngx_http_lua_ssl_ocsp.c      |   4 +
 .../src/ngx_http_lua_ssl_session_fetchby.c    |  21 +-
 .../src/ngx_http_lua_ssl_session_fetchby.h    |   6 +-
 .../src/ngx_http_lua_ssl_session_storeby.c    |  19 +-
 .../http-lua/src/ngx_http_lua_subrequest.c    |   6 +
 .../modules/http-lua/src/ngx_http_lua_time.c  |  71 +++
 .../modules/http-lua/src/ngx_http_lua_util.c  |  14 +-
 .../modules/http-lua/src/ngx_http_lua_util.h  |  46 +-
 .../http-lua/src/ngx_http_lua_variable.c      |  35 +-
 .../http-lua/src/ngx_http_lua_worker.c        |  15 +
 debian/modules/http-lua/t/016-resp-header.t   | 222 +++++++-
 debian/modules/http-lua/t/020-subrequest.t    |   6 +-
 debian/modules/http-lua/t/022-redirect.t      |  53 +-
 .../modules/http-lua/t/023-rewrite/redirect.t |  40 ++
 .../t/023-rewrite/tcp-socket-timeout.t        |   2 +-
 .../http-lua/t/023-rewrite/tcp-socket.t       |   2 +-
 .../http-lua/t/023-rewrite/uthread-exit.t     |   2 +-
 .../http-lua/t/024-access/uthread-exit.t      |   2 +-
 debian/modules/http-lua/t/025-codecache.t     |   2 +-
 debian/modules/http-lua/t/028-req-header.t    | 512 +++++++++++++++---
 debian/modules/http-lua/t/030-uri-args.t      | 201 ++++++-
 debian/modules/http-lua/t/031-post-args.t     |  82 ++-
 debian/modules/http-lua/t/041-header-filter.t |   6 +-
 debian/modules/http-lua/t/044-req-body.t      |   8 +-
 debian/modules/http-lua/t/058-tcp-socket.t    |  85 ++-
 debian/modules/http-lua/t/062-count.t         |  82 ++-
 .../http-lua/t/065-tcp-socket-timeout.t       |  10 +-
 debian/modules/http-lua/t/087-udp-socket.t    |  72 ++-
 .../http-lua/t/090-log-socket-errors.t        |   2 +-
 debian/modules/http-lua/t/094-uthread-exit.t  |   2 +-
 .../modules/http-lua/t/104-req-raw-header.t   | 112 ++++
 debian/modules/http-lua/t/124-init-worker.t   | 201 ++++++-
 .../http-lua/t/128-duplex-tcp-socket.t        |   2 +-
 debian/modules/http-lua/t/129-ssl-socket.t    | 427 ++++++---------
 debian/modules/http-lua/t/132-lua-blocks.t    | 125 ++++-
 debian/modules/http-lua/t/135-worker-id.t     |  62 +--
 debian/modules/http-lua/t/138-balancer.t      |   6 +-
 debian/modules/http-lua/t/139-ssl-cert-by.t   | 205 ++++++-
 .../http-lua/t/142-ssl-session-store.t        |  24 +-
 .../http-lua/t/143-ssl-session-fetch.t        |  26 +-
 .../http-lua/t/147-tcp-socket-timeouts.t      |   2 +-
 debian/modules/http-lua/t/155-tls13.t         | 106 ++++
 debian/modules/http-lua/t/cert/comodo-ca.crt  |  29 -
 debian/modules/http-lua/t/cert/dst-ca.crt     |  63 +++
 debian/modules/http-lua/valgrind.suppress     |  49 +-
 70 files changed, 3172 insertions(+), 803 deletions(-)
 create mode 100644 debian/modules/http-lua/t/155-tls13.t
 delete mode 100644 debian/modules/http-lua/t/cert/comodo-ca.crt
 create mode 100644 debian/modules/http-lua/t/cert/dst-ca.crt

diff --git a/debian/modules/control b/debian/modules/control
index 4112d84..1cb26ff 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -18,7 +18,7 @@ Files-Excluded: .gitignore .gitattributes .travis.yml
 
 Module: http-lua
 Homepage: https://github.com/openresty/lua-nginx-module
-Version: 0.10.11
+Version: 0.10.13
 Patch:
   openssl-1.1.0.patch
   discover-luajit-2.1.patch
diff --git a/debian/modules/http-lua/README.markdown b/debian/modules/http-lua/README.markdown
index c42bd3e..15ad00e 100644
--- a/debian/modules/http-lua/README.markdown
+++ b/debian/modules/http-lua/README.markdown
@@ -62,7 +62,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.11](https://github.com/openresty/lua-nginx-module/tags) released on 3 November 2017.
+This document describes ngx_lua [v0.10.13](https://github.com/openresty/lua-nginx-module/tags) released on 22 April 2018.
 
 Synopsis
 ========
@@ -250,6 +250,7 @@ Nginx Compatibility
 The latest version of this module is compatible with the following versions of Nginx:
 
 * 1.13.x  (last tested: 1.13.6)
+* 1.12.x
 * 1.11.x  (last tested: 1.11.2)
 * 1.10.x
 * 1.9.x (last tested: 1.9.15)
@@ -264,12 +265,12 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 Installation
 ============
 
-It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower.
+It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
 1. Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is *not* supported yet). LuaJIT can be downloaded from 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](https://github.com/simpl/ngx_devel_kit/tags).
+1. Download the latest version of the ngx_devel_kit (NDK) module [HERE](https://github.com/simplresty/ngx_devel_kit/tags).
 1. Download the latest version of ngx_lua [HERE](https://github.com/openresty/lua-nginx-module/tags).
 1. Download the latest version of Nginx [HERE](http://nginx.org/) (See [Nginx Compatibility](#nginx-compatibility))
 
@@ -839,7 +840,7 @@ As noted earlier, PCRE sequences presented within `*_by_lua_block {}` directives
  # nginx.conf
  location /test {
      content_by_lua_block {
-         local regex = "\d+"
+         local regex = [[\d+]]
          local m = ngx.re.match("hello, 1234", regex)
          if m then ngx.say(m[0]) else ngx.say("not matched!") end
      }
@@ -940,7 +941,7 @@ The following dependencies are required to run the test suite:
 	* Test::Nginx: <https://github.com/openresty/test-nginx>
 
 * Nginx modules:
-	* [ngx_devel_kit](https://github.com/simpl/ngx_devel_kit)
+	* [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit)
 	* [ngx_set_misc](https://github.com/openresty/set-misc-nginx-module)
 	* [ngx_auth_request](http://mdounin.ru/files/ngx_http_auth_request_module-0.2.tar.gz) (this is not needed if you're using Nginx 1.5.4+.
 	* [ngx_echo](https://github.com/openresty/echo-nginx-module)
@@ -994,7 +995,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2017, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -1025,7 +1026,7 @@ See Also
 * [Dynamic Routing Based on Redis and Lua](http://openresty.org/#DynamicRoutingBasedOnRedis)
 * [Using LuaRocks with ngx_lua](http://openresty.org/#UsingLuaRocks)
 * [Introduction to ngx_lua](https://github.com/openresty/lua-nginx-module/wiki/Introduction)
-* [ngx_devel_kit](https://github.com/simpl/ngx_devel_kit)
+* [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit)
 * [echo-nginx-module](http://github.com/openresty/echo-nginx-module)
 * [drizzle-nginx-module](http://github.com/openresty/drizzle-nginx-module)
 * [postgres-nginx-module](https://github.com/FRiCKLE/ngx_postgres)
@@ -1486,6 +1487,8 @@ This hook is often used to create per-worker reoccurring timers (via the [ngx.ti
 
 This directive was first introduced in the `v0.9.5` release.
 
+This hook no longer runs in the cache manager and cache loader processes since the `v0.10.12` release.
+
 [Back to TOC](#directives)
 
 init_worker_by_lua_block
@@ -1513,6 +1516,8 @@ For instance,
 
 This directive was first introduced in the `v0.9.17` release.
 
+This hook no longer runs in the cache manager and cache loader processes since the `v0.10.12` release.
+
 [Back to TOC](#directives)
 
 init_worker_by_lua_file
@@ -1528,6 +1533,8 @@ Similar to [init_worker_by_lua](#init_worker_by_lua), but accepts the file path
 
 This directive was first introduced in the `v0.9.5` release.
 
+This hook no longer runs in the cache manager and cache loader processes since the `v0.10.12` release.
+
 [Back to TOC](#directives)
 
 set_by_lua
@@ -1587,7 +1594,7 @@ This directive can be freely mixed with all directives of the [ngx_http_rewrite_
 
 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.
+This directive requires the [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit) module.
 
 [Back to TOC](#directives)
 
@@ -1640,7 +1647,7 @@ 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) `off` in `nginx.conf` to avoid reloading Nginx.
 
-This directive requires the [ngx_devel_kit](https://github.com/simpl/ngx_devel_kit) module.
+This directive requires the [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit) module.
 
 [Back to TOC](#directives)
 
@@ -2914,7 +2921,7 @@ This directive was first introduced in the `v0.9.11` release.
 lua_ssl_protocols
 -----------------
 
-**syntax:** *lua_ssl_protocols \[SSLv2\] \[SSLv3\] \[TLSv1\] [TLSv1.1] [TLSv1.2]*
+**syntax:** *lua_ssl_protocols \[SSLv2\] \[SSLv3\] \[TLSv1\] [TLSv1.1] [TLSv1.2] [TLSv1.3]*
 
 **default:** *lua_ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2*
 
@@ -2922,6 +2929,8 @@ lua_ssl_protocols
 
 Enables the specified protocols for requests to a SSL/TLS server in the [tcpsock:sslhandshake](#tcpsocksslhandshake) method.
 
+The support for the `TLSv1.3` parameter requires version `v0.10.12` *and* OpenSSL 1.1.1.
+
 This directive was first introduced in the `v0.9.11` release.
 
 [Back to TOC](#directives)
@@ -3400,7 +3409,7 @@ Core constants
    ngx.DECLINED (-5)
 ```
 
-Note that only three of these constants are utilized by the [Nginx API for Lua](#nginx-api-for-lua) (i.e., [ngx.exit](#ngxexit) accepts `NGX_OK`, `NGX_ERROR`, and `NGX_DECLINED` as input).
+Note that only three of these constants are utilized by the [Nginx API for Lua](#nginx-api-for-lua) (i.e., [ngx.exit](#ngxexit) accepts `ngx.OK`, `ngx.ERROR`, and `ngx.DECLINED` as input).
 
 ```lua
 
@@ -3458,6 +3467,7 @@ HTTP status constants
    value = ngx.HTTP_SEE_OTHER (303)
    value = ngx.HTTP_NOT_MODIFIED (304)
    value = ngx.HTTP_TEMPORARY_REDIRECT (307) (first added in the v0.9.20 release)
+   value = ngx.HTTP_PERMANENT_REDIRECT (308)
    value = ngx.HTTP_BAD_REQUEST (400)
    value = ngx.HTTP_UNAUTHORIZED (401)
    value = ngx.HTTP_PAYMENT_REQUIRED (402) (first added in the v0.9.20 release)
@@ -4114,7 +4124,7 @@ The same applies to assigning an empty table:
  ngx.header["X-My-Header"] = {};
 ```
 
-Setting `ngx.header.HEADER` after sending out response headers (either explicitly with [ngx.send_headers](#ngxsend_headers) or implicitly with [ngx.print](#ngxprint) and similar) will throw out a Lua exception.
+Setting `ngx.header.HEADER` after sending out response headers (either explicitly with [ngx.send_headers](#ngxsend_headers) or implicitly with [ngx.print](#ngxprint) and similar) will log an error message.
 
 Reading `ngx.header.HEADER` will return the value of the response header named `HEADER`.
 
@@ -4163,7 +4173,7 @@ For reading *request* headers, use the [ngx.req.get_headers](#ngxreqget_headers)
 
 ngx.resp.get_headers
 --------------------
-**syntax:** *headers = ngx.resp.get_headers(max_headers?, raw?)*
+**syntax:** *headers, err = ngx.resp.get_headers(max_headers?, raw?)*
 
 **context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, balancer_by_lua&#42;*
 
@@ -4171,7 +4181,12 @@ Returns a Lua table holding all the current response headers for the current req
 
 ```lua
 
- local h = ngx.resp.get_headers()
+ local h, err = ngx.resp.get_headers()
+
+ if err == "truncated" then
+     -- one can choose to ignore or reject the current response here
+ end
+
  for k, v in pairs(h) do
      ...
  end
@@ -4179,6 +4194,8 @@ Returns a Lua table holding all the current response headers for the current req
 
 This function has the same signature as [ngx.req.get_headers](#ngxreqget_headers) except getting response headers instead of request headers.
 
+Note that a maximum of 100 response headers are parsed by default (including those with the same name) and that additional response headers are silently discarded to guard against potential denial of service attacks. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
+
 This API was first introduced in the `v0.9.5` release.
 
 [Back to TOC](#nginx-api-for-lua)
@@ -4451,7 +4468,7 @@ See also [ngx.req.set_uri](#ngxreqset_uri).
 
 ngx.req.get_uri_args
 --------------------
-**syntax:** *args = ngx.req.get_uri_args(max_args?)*
+**syntax:** *args, err = ngx.req.get_uri_args(max_args?)*
 
 **context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, balancer_by_lua&#42;*
 
@@ -4461,7 +4478,12 @@ Returns a Lua table holding all the current request URL query arguments.
 
  location = /test {
      content_by_lua_block {
-         local args = ngx.req.get_uri_args()
+         local args, err = ngx.req.get_uri_args()
+
+         if err == "truncated" then
+             -- one can choose to ignore or reject the current request here
+         end
+
          for key, val in pairs(args) do
              if type(val) == "table" then
                  ngx.say(key, ": ", table.concat(val, ", "))
@@ -4513,7 +4535,7 @@ Updating query arguments via the nginx variable `$args` (or `ngx.var.args` in Lu
 ```lua
 
  ngx.var.args = "a=3&b=42"
- local args = ngx.req.get_uri_args()
+ local args, err = ngx.req.get_uri_args()
 ```
 
 Here the `args` table will always look like
@@ -4525,20 +4547,23 @@ Here the `args` table will always look like
 
 regardless of the actual request query string.
 
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks.
+Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
 
 However, the optional `max_args` function argument can be used to override this limit:
 
 ```lua
 
- local args = ngx.req.get_uri_args(10)
+ local args, err = ngx.req.get_uri_args(10)
+ if err == "truncated" then
+     -- one can choose to ignore or reject the current request here
+ end
 ```
 
 This argument can be set to zero to remove the limit and to process all request arguments received:
 
 ```lua
 
- local args = ngx.req.get_uri_args(0)
+ local args, err = ngx.req.get_uri_args(0)
 ```
 
 Removing the `max_args` cap is strongly discouraged.
@@ -4559,6 +4584,11 @@ Returns a Lua table holding all the current request POST query arguments (of the
      content_by_lua_block {
          ngx.req.read_body()
          local args, err = ngx.req.get_post_args()
+
+         if err == "truncated" then
+             -- one can choose to ignore or reject the current request here
+         end
+
          if not args then
              ngx.say("failed to get post args: ", err)
              return
@@ -4627,20 +4657,23 @@ That is, they will take Lua boolean values `true`. However, they are different f
 
 Empty key arguments are discarded. `POST /test` with body `=hello&=world` will yield empty outputs for instance.
 
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks.
+Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
 
 However, the optional `max_args` function argument can be used to override this limit:
 
 ```lua
 
- local args = ngx.req.get_post_args(10)
+ local args, err = ngx.req.get_post_args(10)
+ if err == "truncated" then
+     -- one can choose to ignore or reject the current request here
+ end
 ```
 
 This argument can be set to zero to remove the limit and to process all request arguments received:
 
 ```lua
 
- local args = ngx.req.get_post_args(0)
+ local args, err = ngx.req.get_post_args(0)
 ```
 
 Removing the `max_args` cap is strongly discouraged.
@@ -4649,7 +4682,7 @@ Removing the `max_args` cap is strongly discouraged.
 
 ngx.req.get_headers
 -------------------
-**syntax:** *headers = ngx.req.get_headers(max_headers?, raw?)*
+**syntax:** *headers, err = ngx.req.get_headers(max_headers?, raw?)*
 
 **context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
 
@@ -4657,7 +4690,12 @@ Returns a Lua table holding all the current request headers.
 
 ```lua
 
- local h = ngx.req.get_headers()
+ local h, err = ngx.req.get_headers()
+
+ if err == "truncated" then
+     -- one can choose to ignore or reject the current request here
+ end
+
  for k, v in pairs(h) do
      ...
  end
@@ -4688,20 +4726,24 @@ the value of `ngx.req.get_headers()["Foo"]` will be a Lua (array) table such as:
  {"foo", "bar", "baz"}
 ```
 
-Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks.
+Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
 
 However, the optional `max_headers` function argument can be used to override this limit:
 
 ```lua
 
- local headers = ngx.req.get_headers(10)
+ local headers, err = ngx.req.get_headers(10)
+
+ if err == "truncated" then
+     -- one can choose to ignore or reject the current request here
+ end
 ```
 
 This argument can be set to zero to remove the limit and to process all request headers received:
 
 ```lua
 
- local headers = ngx.req.get_headers(0)
+ local headers, err = ngx.req.get_headers(0)
 ```
 
 Removing the `max_headers` cap is strongly discouraged.
@@ -5092,6 +5134,7 @@ The optional `status` parameter specifies the HTTP status code to be used. The f
 * `302` (default)
 * `303`
 * `307`
+* `308`
 
 It is `302` (`ngx.HTTP_MOVED_TEMPORARILY`) by default.
 
@@ -5325,7 +5368,7 @@ Number literals can be used directly as the argument, for instance,
  ngx.exit(501)
 ```
 
-Note that while this method accepts all [HTTP status constants](#http-status-constants) as input, it only accepts `NGX_OK` and `NGX_ERROR` of the [core constants](#core-constants).
+Note that while this method accepts all [HTTP status constants](#http-status-constants) as input, it only accepts `ngx.OK` and `ngx.ERROR` of the [core constants](#core-constants).
 
 Also note that this method call terminates the processing of the current request and that it is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.exit(...)` be used to reinforce the fact that the request processing is being terminated.
 
@@ -5478,13 +5521,13 @@ This method was first introduced in the `v0.3.1rc27` release.
 
 ngx.decode_args
 ---------------
-**syntax:** *table = ngx.decode_args(str, max_args?)*
+**syntax:** *table, err = ngx.decode_args(str, max_args?)*
 
 **context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
 Decodes a URI encoded query-string into a Lua table. This is the inverse function of [ngx.encode_args](#ngxencode_args).
 
-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.
+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. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
 
 This argument can be set to zero to remove the limit and to process all request arguments received:
 
@@ -6444,10 +6487,12 @@ See also [ngx.shared.DICT](#ngxshareddict).
 
 ngx.shared.DICT.incr
 --------------------
-**syntax:** *newval, err, forcible? = ngx.shared.DICT:incr(key, value, init?)*
+**syntax:** *newval, err, forcible? = ngx.shared.DICT:incr(key, value, init?, init_ttl?)*
 
 **context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
+**optional requirement:** `resty.core.shdict` or `resty.core`
+
 Increments the (numerical) value for `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict) by the step value `value`. Returns the new resulting number if the operation is successfully completed or `nil` and an error message otherwise.
 
 When the key does not exist or has already expired in the shared dictionary,
@@ -6457,6 +6502,25 @@ When the key does not exist or has already expired in the shared dictionary,
 
 Like the [add](#ngxshareddictadd) method, it also overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone.
 
+The optional `init_ttl` argument specifies expiration time (in seconds) of the value when it is initialized via the `init` argument. The time resolution is `0.001` seconds. If `init_ttl` takes the value `0` (which is the default), then the item will never expire. This argument cannot be provided without providing the `init` argument as well, and has no effect if the value already exists (e.g., if it was previously inserted via [set](#ngxshareddictset) or the likes).
+
+**Note:** Usage of the `init_ttl` argument requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library. Example:
+
+```lua
+
+ require "resty.core"
+
+ local cats = ngx.shared.cats
+ local newval, err = cats:incr("black_cats", 1, 0, 0.1)
+
+ print(newval) -- 1
+
+ ngx.sleep(0.2)
+
+ local val, err = cats:get("black_cats")
+ print(val) -- nil
+```
+
 The `forcible` return value will always be `nil` when the `init` argument is not specified.
 
 If this method succeeds in storing the current item by forcibly removing other not-yet-expired items in the dictionary via LRU, the `forcible` return value will be `true`. If it stores the item without forcibly removing other valid items, then the return value `forcible` will be `false`.
@@ -6469,6 +6533,8 @@ This method was first introduced in the `v0.3.1rc22` release.
 
 The optional `init` parameter was first added in the `v0.10.6` release.
 
+The optional `init_ttl` parameter was introduced in the `v0.10.12rc2` release.
+
 See also [ngx.shared.DICT](#ngxshareddict).
 
 [Back to TOC](#nginx-api-for-lua)
@@ -7832,7 +7898,7 @@ timers" here mean timers that have not yet been expired and "running
 timers" are those whose user callbacks are currently running.
 
 The maximal number of pending timers allowed in an Nginx
-worker is constrolled by the [lua_max_pending_timers](#lua_max_pending_timers)
+worker is controlled by the [lua_max_pending_timers](#lua_max_pending_timers)
 directive. The maximal number of running timers is controlled by the
 [lua_max_running_timers](#lua_max_running_timers) directive.
 
@@ -8128,7 +8194,7 @@ ndk.set_var.DIRECTIVE
 
 **context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
 
-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`.
+This mechanism allows calling other nginx C modules' directives that are implemented by [Nginx Devel Kit](https://github.com/simplresty/ngx_devel_kit) (NDK)'s set_var submodule's `ndk_set_var_value`.
 
 For example, the following [set-misc-nginx-module](http://github.com/openresty/set-misc-nginx-module) directives can be invoked this way:
 
@@ -8159,7 +8225,7 @@ Similarly, the following directives provided by [encrypted-session-nginx-module]
 * [set_encrypt_session](http://github.com/openresty/encrypted-session-nginx-module#set_encrypt_session)
 * [set_decrypt_session](http://github.com/openresty/encrypted-session-nginx-module#set_decrypt_session)
 
-This feature requires the [ngx_devel_kit](https://github.com/simpl/ngx_devel_kit) module.
+This feature requires the [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit) module.
 
 [Back to TOC](#nginx-api-for-lua)
 
@@ -8264,4 +8330,3 @@ Special PCRE Sequences
 ----------------------
 
 This section has been renamed to [Special Escaping Sequences](#special-escaping-sequences).
-
diff --git a/debian/modules/http-lua/doc/HttpLuaModule.wiki b/debian/modules/http-lua/doc/HttpLuaModule.wiki
index 2424d39..e3c61e2 100644
--- a/debian/modules/http-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/http-lua/doc/HttpLuaModule.wiki
@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.11] released on 3 November 2017.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.13] released on 22 April 2018.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -187,6 +187,7 @@ The Lua state (Lua VM instance) is shared across all the requests handled by a s
 The latest version of this module is compatible with the following versions of Nginx:
 
 * 1.13.x  (last tested: 1.13.6)
+* 1.12.x
 * 1.11.x  (last tested: 1.11.2)
 * 1.10.x
 * 1.9.x (last tested: 1.9.15)
@@ -198,12 +199,12 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 
 = Installation =
 
-It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower.
+It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
 # Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is ''not'' supported yet). LuaJIT can be downloaded from the [http://luajit.org/download.html 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 [https://github.com/simpl/ngx_devel_kit/tags HERE].
+# Download the latest version of the ngx_devel_kit (NDK) module [https://github.com/simplresty/ngx_devel_kit/tags HERE].
 # Download the latest version of ngx_lua [https://github.com/openresty/lua-nginx-module/tags HERE].
 # Download the latest version of Nginx [http://nginx.org/ HERE] (See [[#Nginx Compatibility|Nginx Compatibility]])
 
@@ -683,7 +684,7 @@ As noted earlier, PCRE sequences presented within <code>*_by_lua_block {}</code>
     # nginx.conf
     location /test {
         content_by_lua_block {
-            local regex = "\d+"
+            local regex = [[\d+]]
             local m = ngx.re.match("hello, 1234", regex)
             if m then ngx.say(m[0]) else ngx.say("not matched!") end
         }
@@ -765,7 +766,7 @@ The following dependencies are required to run the test suite:
 ** Test::Nginx: https://github.com/openresty/test-nginx
 
 * Nginx modules:
-** [https://github.com/simpl/ngx_devel_kit ngx_devel_kit]
+** [https://github.com/simplresty/ngx_devel_kit ngx_devel_kit]
 ** [https://github.com/openresty/set-misc-nginx-module ngx_set_misc]
 ** [http://mdounin.ru/files/ngx_http_auth_request_module-0.2.tar.gz ngx_auth_request] (this is not needed if you're using Nginx 1.5.4+.
 ** [https://github.com/openresty/echo-nginx-module ngx_echo]
@@ -816,7 +817,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2017, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -844,7 +845,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * [http://openresty.org/#DynamicRoutingBasedOnRedis Dynamic Routing Based on Redis and Lua]
 * [http://openresty.org/#UsingLuaRocks Using LuaRocks with ngx_lua]
 * [https://github.com/openresty/lua-nginx-module/wiki/Introduction Introduction to ngx_lua]
-* [https://github.com/simpl/ngx_devel_kit ngx_devel_kit]
+* [https://github.com/simplresty/ngx_devel_kit ngx_devel_kit]
 * [[HttpEchoModule]]
 * [[HttpDrizzleModule]]
 * [https://github.com/FRiCKLE/ngx_postgres postgres-nginx-module]
@@ -1195,6 +1196,8 @@ This hook is often used to create per-worker reoccurring timers (via the [[#ngx.
 
 This directive was first introduced in the <code>v0.9.5</code> release.
 
+This hook no longer runs in the cache manager and cache loader processes since the <code>v0.10.12</code> release.
+
 == init_worker_by_lua_block ==
 
 '''syntax:''' ''init_worker_by_lua_block { lua-script }''
@@ -1218,6 +1221,8 @@ For instance,
 
 This directive was first introduced in the <code>v0.9.17</code> release.
 
+This hook no longer runs in the cache manager and cache loader processes since the <code>v0.10.12</code> release.
+
 == init_worker_by_lua_file ==
 
 '''syntax:''' ''init_worker_by_lua_file <lua-file-path>''
@@ -1230,6 +1235,8 @@ Similar to [[#init_worker_by_lua|init_worker_by_lua]], but accepts the file path
 
 This directive was first introduced in the <code>v0.9.5</code> release.
 
+This hook no longer runs in the cache manager and cache loader processes since the <code>v0.10.12</code> release.
+
 == set_by_lua ==
 
 '''syntax:''' ''set_by_lua $res <lua-script-str> [$arg1 $arg2 ...]''
@@ -1284,7 +1291,7 @@ This directive can be freely mixed with all directives of the [[HttpRewriteModul
 
 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.
+This directive requires the [https://github.com/simplresty/ngx_devel_kit ngx_devel_kit] module.
 
 == set_by_lua_block ==
 
@@ -1330,7 +1337,7 @@ 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.
 
-This directive requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_kit] module.
+This directive requires the [https://github.com/simplresty/ngx_devel_kit ngx_devel_kit] module.
 
 == content_by_lua ==
 
@@ -2462,7 +2469,7 @@ This directive was first introduced in the <code>v0.9.11</code> release.
 
 == lua_ssl_protocols ==
 
-'''syntax:''' ''lua_ssl_protocols [SSLv2] [SSLv3] [TLSv1] [TLSv1.1] [TLSv1.2]''
+'''syntax:''' ''lua_ssl_protocols [SSLv2] [SSLv3] [TLSv1] [TLSv1.1] [TLSv1.2] [TLSv1.3]''
 
 '''default:''' ''lua_ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2''
 
@@ -2470,6 +2477,8 @@ This directive was first introduced in the <code>v0.9.11</code> release.
 
 Enables the specified protocols for requests to a SSL/TLS server in the [[#tcpsock:sslhandshake|tcpsock:sslhandshake]] method.
 
+The support for the <code>TLSv1.3</code> parameter requires version <code>v0.10.12</code> *and* OpenSSL 1.1.1.
+
 This directive was first introduced in the <code>v0.9.11</code> release.
 
 == lua_ssl_trusted_certificate ==
@@ -2748,7 +2757,7 @@ This API requires a relatively expensive metamethod call and it is recommended t
   ngx.DECLINED (-5)
 </geshi>
 
-Note that only three of these constants are utilized by the [[#Nginx API for Lua|Nginx API for Lua]] (i.e., [[#ngx.exit|ngx.exit]] accepts <code>NGX_OK</code>, <code>NGX_ERROR</code>, and <code>NGX_DECLINED</code> as input).
+Note that only three of these constants are utilized by the [[#Nginx API for Lua|Nginx API for Lua]] (i.e., [[#ngx.exit|ngx.exit]] accepts <code>ngx.OK</code>, <code>ngx.ERROR</code>, and <code>ngx.DECLINED</code> as input).
 
 <geshi lang="lua">
   ngx.null
@@ -2798,6 +2807,7 @@ These constants are usually used in [[#ngx.location.capture|ngx.location.capture
   value = ngx.HTTP_SEE_OTHER (303)
   value = ngx.HTTP_NOT_MODIFIED (304)
   value = ngx.HTTP_TEMPORARY_REDIRECT (307) (first added in the v0.9.20 release)
+  value = ngx.HTTP_PERMANENT_REDIRECT (308)
   value = ngx.HTTP_BAD_REQUEST (400)
   value = ngx.HTTP_UNAUTHORIZED (401)
   value = ngx.HTTP_PAYMENT_REQUIRED (402) (first added in the v0.9.20 release)
@@ -3399,7 +3409,7 @@ The same applies to assigning an empty table:
     ngx.header["X-My-Header"] = {};
 </geshi>
 
-Setting <code>ngx.header.HEADER</code> after sending out response headers (either explicitly with [[#ngx.send_headers|ngx.send_headers]] or implicitly with [[#ngx.print|ngx.print]] and similar) will throw out a Lua exception.
+Setting <code>ngx.header.HEADER</code> after sending out response headers (either explicitly with [[#ngx.send_headers|ngx.send_headers]] or implicitly with [[#ngx.print|ngx.print]] and similar) will log an error message.
 
 Reading <code>ngx.header.HEADER</code> will return the value of the response header named <code>HEADER</code>.
 
@@ -3443,14 +3453,19 @@ 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.resp.get_headers ==
-'''syntax:''' ''headers = ngx.resp.get_headers(max_headers?, raw?)''
+'''syntax:''' ''headers, err = ngx.resp.get_headers(max_headers?, raw?)''
 
 '''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, balancer_by_lua*''
 
 Returns a Lua table holding all the current response headers for the current request.
 
 <geshi lang="lua">
-local h = ngx.resp.get_headers()
+local h, err = ngx.resp.get_headers()
+
+if err == "truncated" then
+    -- one can choose to ignore or reject the current response here
+end
+
 for k, v in pairs(h) do
     ...
 end
@@ -3458,6 +3473,8 @@ end
 
 This function has the same signature as [[#ngx.req.get_headers|ngx.req.get_headers]] except getting response headers instead of request headers.
 
+Note that a maximum of 100 response headers are parsed by default (including those with the same name) and that additional response headers are silently discarded to guard against potential denial of service attacks. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
+
 This API was first introduced in the <code>v0.9.5</code> release.
 
 == ngx.req.is_internal ==
@@ -3687,7 +3704,7 @@ This interface was first introduced in the <code>v0.3.1rc13</code> release.
 See also [[#ngx.req.set_uri|ngx.req.set_uri]].
 
 == ngx.req.get_uri_args ==
-'''syntax:''' ''args = ngx.req.get_uri_args(max_args?)''
+'''syntax:''' ''args, err = ngx.req.get_uri_args(max_args?)''
 
 '''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, balancer_by_lua*''
 
@@ -3696,7 +3713,12 @@ Returns a Lua table holding all the current request URL query arguments.
 <geshi lang="nginx">
     location = /test {
         content_by_lua_block {
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err == "truncated" then
+                -- one can choose to ignore or reject the current request here
+            end
+
             for key, val in pairs(args) do
                 if type(val) == "table" then
                     ngx.say(key, ": ", table.concat(val, ", "))
@@ -3743,7 +3765,7 @@ Updating query arguments via the nginx variable <code>$args</code> (or <code>ngx
 
 <geshi lang="lua">
     ngx.var.args = "a=3&b=42"
-    local args = ngx.req.get_uri_args()
+    local args, err = ngx.req.get_uri_args()
 </geshi>
 
 Here the <code>args</code> table will always look like
@@ -3754,18 +3776,21 @@ Here the <code>args</code> table will always look like
 
 regardless of the actual request query string.
 
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks.
+Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
 
 However, the optional <code>max_args</code> function argument can be used to override this limit:
 
 <geshi lang="lua">
-    local args = ngx.req.get_uri_args(10)
+    local args, err = ngx.req.get_uri_args(10)
+    if err == "truncated" then
+        -- one can choose to ignore or reject the current request here
+    end
 </geshi>
 
 This argument can be set to zero to remove the limit and to process all request arguments received:
 
 <geshi lang="lua">
-    local args = ngx.req.get_uri_args(0)
+    local args, err = ngx.req.get_uri_args(0)
 </geshi>
 
 Removing the <code>max_args</code> cap is strongly discouraged.
@@ -3782,6 +3807,11 @@ Returns a Lua table holding all the current request POST query arguments (of the
         content_by_lua_block {
             ngx.req.read_body()
             local args, err = ngx.req.get_post_args()
+
+            if err == "truncated" then
+                -- one can choose to ignore or reject the current request here
+            end
+
             if not args then
                 ngx.say("failed to get post args: ", err)
                 return
@@ -3844,31 +3874,39 @@ That is, they will take Lua boolean values <code>true</code>. However, they are
 
 Empty key arguments are discarded. <code>POST /test</code> with body <code>=hello&=world</code> will yield empty outputs for instance.
 
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks.
+Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
 
 However, the optional <code>max_args</code> function argument can be used to override this limit:
 
 <geshi lang="lua">
-    local args = ngx.req.get_post_args(10)
+    local args, err = ngx.req.get_post_args(10)
+    if err == "truncated" then
+        -- one can choose to ignore or reject the current request here
+    end
 </geshi>
 
 This argument can be set to zero to remove the limit and to process all request arguments received:
 
 <geshi lang="lua">
-    local args = ngx.req.get_post_args(0)
+    local args, err = ngx.req.get_post_args(0)
 </geshi>
 
 Removing the <code>max_args</code> cap is strongly discouraged.
 
 == ngx.req.get_headers ==
-'''syntax:''' ''headers = ngx.req.get_headers(max_headers?, raw?)''
+'''syntax:''' ''headers, err = ngx.req.get_headers(max_headers?, raw?)''
 
 '''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.
 
 <geshi lang="lua">
-    local h = ngx.req.get_headers()
+    local h, err = ngx.req.get_headers()
+
+    if err == "truncated" then
+        -- one can choose to ignore or reject the current request here
+    end
+
     for k, v in pairs(h) do
         ...
     end
@@ -3896,18 +3934,22 @@ the value of <code>ngx.req.get_headers()["Foo"]</code> will be a Lua (array) tab
     {"foo", "bar", "baz"}
 </geshi>
 
-Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks.
+Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
 
 However, the optional <code>max_headers</code> function argument can be used to override this limit:
 
 <geshi lang="lua">
-    local headers = ngx.req.get_headers(10)
+    local headers, err = ngx.req.get_headers(10)
+
+    if err == "truncated" then
+        -- one can choose to ignore or reject the current request here
+    end
 </geshi>
 
 This argument can be set to zero to remove the limit and to process all request headers received:
 
 <geshi lang="lua">
-    local headers = ngx.req.get_headers(0)
+    local headers, err = ngx.req.get_headers(0)
 </geshi>
 
 Removing the <code>max_headers</code> cap is strongly discouraged.
@@ -4244,6 +4286,7 @@ The optional <code>status</code> parameter specifies the HTTP status code to be
 * <code>302</code> (default)
 * <code>303</code>
 * <code>307</code>
+* <code>308</code>
 
 It is <code>302</code> (<code>ngx.HTTP_MOVED_TEMPORARILY</code>) by default.
 
@@ -4442,7 +4485,7 @@ Number literals can be used directly as the argument, for instance,
     ngx.exit(501)
 </geshi>
 
-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]].
+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]].
 
 Also note that this method call terminates the processing of the current request and that it is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.exit(...)</code> be used to reinforce the fact that the request processing is being terminated.
 
@@ -4571,13 +4614,13 @@ If the argument value is <code>false</code>, then the effect is equivalent to th
 This method was first introduced in the <code>v0.3.1rc27</code> release.
 
 == ngx.decode_args ==
-'''syntax:''' ''table = ngx.decode_args(str, max_args?)''
+'''syntax:''' ''table, err = ngx.decode_args(str, max_args?)''
 
 '''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 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.
+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. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
 
 This argument can be set to zero to remove the limit and to process all request arguments received:
 
@@ -5405,10 +5448,12 @@ This feature was first introduced in the <code>v0.3.1rc22</code> release.
 See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 
 == ngx.shared.DICT.incr ==
-'''syntax:''' ''newval, err, forcible? = ngx.shared.DICT:incr(key, value, init?)''
+'''syntax:''' ''newval, err, forcible? = ngx.shared.DICT:incr(key, value, init?, init_ttl?)''
 
 '''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
 
+'''optional requirement:''' <code>resty.core.shdict</code> or <code>resty.core</code>
+
 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.
 
 When the key does not exist or has already expired in the shared dictionary,
@@ -5418,6 +5463,24 @@ When the key does not exist or has already expired in the shared dictionary,
 
 Like the [[#ngx.shared.DICT.add|add]] method, it also overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone.
 
+The optional <code>init_ttl</code> argument specifies expiration time (in seconds) of the value when it is initialized via the <code>init</code> argument. The time resolution is <code>0.001</code> seconds. If <code>init_ttl</code> takes the value <code>0</code> (which is the default), then the item will never expire. This argument cannot be provided without providing the <code>init</code> argument as well, and has no effect if the value already exists (e.g., if it was previously inserted via [[#ngx.shared.DICT.set|set]] or the likes).
+
+'''Note:''' Usage of the <code>init_ttl</code> argument requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library. Example:
+
+<geshi lang="lua">
+    require "resty.core"
+
+    local cats = ngx.shared.cats
+    local newval, err = cats:incr("black_cats", 1, 0, 0.1)
+
+    print(newval) -- 1
+
+    ngx.sleep(0.2)
+
+    local val, err = cats:get("black_cats")
+    print(val) -- nil
+</geshi>
+
 The <code>forcible</code> return value will always be <code>nil</code> when the <code>init</code> argument is not specified.
 
 If this method succeeds in storing the current item by forcibly removing other not-yet-expired items in the dictionary via LRU, the <code>forcible</code> return value will be <code>true</code>. If it stores the item without forcibly removing other valid items, then the return value <code>forcible</code> will be <code>false</code>.
@@ -5430,6 +5493,8 @@ This method was first introduced in the <code>v0.3.1rc22</code> release.
 
 The optional <code>init</code> parameter was first added in the <code>v0.10.6</code> release.
 
+The optional <code>init_ttl</code> parameter was introduced in the <code>v0.10.12rc2</code> release.
+
 See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 
 == ngx.shared.DICT.lpush ==
@@ -6653,7 +6718,7 @@ timers" here mean timers that have not yet been expired and "running
 timers" are those whose user callbacks are currently running.
 
 The maximal number of pending timers allowed in an Nginx
-worker is constrolled by the [[#lua_max_pending_timers|lua_max_pending_timers]]
+worker is controlled by the [[#lua_max_pending_timers|lua_max_pending_timers]]
 directive. The maximal number of running timers is controlled by the
 [[#lua_max_running_timers|lua_max_running_timers]] directive.
 
@@ -6895,7 +6960,7 @@ This feature requires at least ngx_lua <code>v0.10.0</code>.
 
 '''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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>.
+This mechanism allows calling other nginx C modules' directives that are implemented by [https://github.com/simplresty/ngx_devel_kit Nginx Devel Kit] (NDK)'s set_var submodule's <code>ndk_set_var_value</code>.
 
 For example, the following [[HttpSetMiscModule]] directives can be invoked this way:
 
@@ -6925,7 +6990,7 @@ Similarly, the following directives provided by [[HttpEncryptedSessionModule]] c
 * [[HttpEncryptedSessionModule#set_encrypt_session|set_encrypt_session]]
 * [[HttpEncryptedSessionModule#set_decrypt_session|set_decrypt_session]]
 
-This feature requires the [https://github.com/simpl/ngx_devel_kit ngx_devel_kit] module.
+This feature requires the [https://github.com/simplresty/ngx_devel_kit ngx_devel_kit] module.
 
 == coroutine.create ==
 '''syntax:''' ''co = coroutine.create(f)''
@@ -7006,4 +7071,3 @@ This section is just holding obsolete documentation sections that have been eith
 == Special PCRE Sequences ==
 
 This section has been renamed to [[#Special Escaping Sequences|Special Escaping Sequences]].
-
diff --git a/debian/modules/http-lua/src/api/ngx_http_lua_api.h b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
index 1e07b71..c7c0e6b 100644
--- a/debian/modules/http-lua/src/api/ngx_http_lua_api.h
+++ b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10011
+#define ngx_http_lua_version  10013
 
 
 typedef struct {
@@ -34,6 +34,13 @@ typedef struct {
 } ngx_http_lua_value_t;
 
 
+typedef struct {
+    int          len;
+    /* this padding hole on 64-bit systems is expected */
+    u_char      *data;
+} ngx_http_lua_ffi_str_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);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_args.c b/debian/modules/http-lua/src/ngx_http_lua_args.c
index b43697c..2712bcd 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_args.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_args.c
@@ -311,10 +311,11 @@ ngx_http_lua_parse_args(lua_State *L, u_char *buf, u_char *last, int max)
             }
 
             if (max > 0 && ++count == max) {
+                lua_pushliteral(L, "truncated");
+
                 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
                                "lua hit query args limit %d", max);
-
-                return 1;
+                return 2;
             }
 
         } else {
@@ -387,7 +388,8 @@ ngx_http_lua_ffi_req_get_querystring_len(ngx_http_request_t *r)
 
 
 int
-ngx_http_lua_ffi_req_get_uri_args_count(ngx_http_request_t *r, int max)
+ngx_http_lua_ffi_req_get_uri_args_count(ngx_http_request_t *r, int max,
+    int *truncated)
 {
     int                      count;
     u_char                  *p, *last;
@@ -396,6 +398,8 @@ ngx_http_lua_ffi_req_get_uri_args_count(ngx_http_request_t *r, int max)
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
+    *truncated = 0;
+
     if (max < 0) {
         max = NGX_HTTP_LUA_MAX_ARGS;
     }
@@ -417,6 +421,7 @@ ngx_http_lua_ffi_req_get_uri_args_count(ngx_http_request_t *r, int max)
     if (count) {
         if (max > 0 && count > max) {
             count = max;
+            *truncated = 1;
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                            "lua hit query args limit %d", max);
         }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_balancer.c b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
index 2fa634e..fdf2af3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
@@ -173,13 +173,15 @@ ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
         lscf->balancer.src = value[1];
 
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        p = ngx_palloc(cf->pool,
+                       sizeof("balancer_by_lua") + NGX_HTTP_LUA_INLINE_KEY_LEN);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         lscf->balancer.src_key = p;
 
+        p = ngx_copy(p, "balancer_by_lua", sizeof("balancer_by_lua") - 1);
         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';
diff --git a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
index 89698c7..041f046 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
@@ -59,15 +59,15 @@
  * length(Instruction) = 4 or 8
  * little endian or big endian
 */
-#define    LUA_LITTLE_ENDIAN_4BYTES_CODE                                \
+#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"                  \
+#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                                   \
+#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"                  \
+#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)
@@ -156,8 +156,8 @@
 #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                       \
+#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))
 
@@ -225,24 +225,24 @@
 
 /* bytecode for luajit 2.0 */
 
-#define    LJ20_LITTLE_ENDIAN_CODE_STRIPPED                             \
-    "\x14\x03\x00\x01\x00\x01\x00\x03"                                  \
-    "\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00"                  \
+#define    LJ20_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    LJ20_BIG_ENDIAN_CODE_STRIPPED                                \
-    "\x14\x03\x00\x01\x00\x01\x00\x03"                                  \
-    "\x00\x00\x00\x31\x80\x00\x00\x30\x00\x02\x00\x48"                  \
+#define    LJ20_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    LJ20_LITTLE_ENDIAN_CODE                                      \
-    "\x15\x03\x00\x01\x00\x01\x00\x03\x00"                              \
-    "\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00"                  \
+#define    LJ20_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    LJ20_BIG_ENDIAN_CODE                                         \
-    "\x15\x03\x00\x01\x00\x01\x00\x03\x00"                              \
-    "\x00\x00\x00\x31\x80\x00\x00\x30\x00\x02\x00\x48"                  \
+#define    LJ20_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"
 
 /* bytecode for luajit 2.1 */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_common.h b/debian/modules/http-lua/src/ngx_http_lua_common.h
index e389783..01ef2be 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_common.h
@@ -54,6 +54,9 @@
 #   define NGX_HTTP_LUA_USE_OCSP 1
 #endif
 
+#ifndef NGX_HTTP_PERMANENT_REDIRECT
+#   define NGX_HTTP_PERMANENT_REDIRECT  308
+#endif
 
 #ifndef NGX_HAVE_SHA1
 #   if (nginx_version >= 1011002)
@@ -79,20 +82,20 @@
 
 #define NGX_HTTP_LUA_INLINE_TAG "nhli_"
 
-#define NGX_HTTP_LUA_INLINE_TAG_LEN \
+#define NGX_HTTP_LUA_INLINE_TAG_LEN                                          \
     (sizeof(NGX_HTTP_LUA_INLINE_TAG) - 1)
 
-#define NGX_HTTP_LUA_INLINE_KEY_LEN \
+#define NGX_HTTP_LUA_INLINE_KEY_LEN                                          \
     (NGX_HTTP_LUA_INLINE_TAG_LEN + 2 * MD5_DIGEST_LENGTH)
 
 /* Nginx HTTP Lua File tag prefix */
 
 #define NGX_HTTP_LUA_FILE_TAG "nhlf_"
 
-#define NGX_HTTP_LUA_FILE_TAG_LEN \
+#define NGX_HTTP_LUA_FILE_TAG_LEN                                            \
     (sizeof(NGX_HTTP_LUA_FILE_TAG) - 1)
 
-#define NGX_HTTP_LUA_FILE_KEY_LEN \
+#define NGX_HTTP_LUA_FILE_KEY_LEN                                            \
     (NGX_HTTP_LUA_FILE_TAG_LEN + 2 * MD5_DIGEST_LENGTH)
 
 
@@ -162,6 +165,7 @@ typedef struct {
 
 struct ngx_http_lua_main_conf_s {
     lua_State           *lua;
+    ngx_pool_cleanup_t  *vm_cleanup;
 
     ngx_str_t            lua_path;
     ngx_str_t            lua_cpath;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_consts.c b/debian/modules/http-lua/src/ngx_http_lua_consts.c
index 30a86f1..809e712 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_consts.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_consts.c
@@ -124,6 +124,9 @@ ngx_http_lua_inject_http_consts(lua_State *L)
     lua_setfield(L, -2, "HTTP_SEE_OTHER");
 #endif
 
+    lua_pushinteger(L, NGX_HTTP_PERMANENT_REDIRECT);
+    lua_setfield(L, -2, "HTTP_PERMANENT_REDIRECT");
+
     lua_pushinteger(L, NGX_HTTP_NOT_MODIFIED);
     lua_setfield(L, -2, "HTTP_NOT_MODIFIED");
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_control.c b/debian/modules/http-lua/src/ngx_http_lua_control.c
index ae36505..6ac2cbf 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_control.c
@@ -213,10 +213,12 @@ ngx_http_lua_ngx_redirect(lua_State *L)
         if (rc != NGX_HTTP_MOVED_TEMPORARILY
             && rc != NGX_HTTP_MOVED_PERMANENTLY
             && rc != NGX_HTTP_SEE_OTHER
+            && rc != NGX_HTTP_PERMANENT_REDIRECT
             && rc != NGX_HTTP_TEMPORARY_REDIRECT)
         {
             return luaL_error(L, "only ngx.HTTP_MOVED_TEMPORARILY, "
                               "ngx.HTTP_MOVED_PERMANENTLY, "
+                              "ngx.HTTP_PERMANENT_REDIRECT, "
                               "ngx.HTTP_SEE_OTHER, and "
                               "ngx.HTTP_TEMPORARY_REDIRECT are allowed");
         }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_directive.c b/debian/modules/http-lua/src/ngx_http_lua_directive.c
index 014a472..fb8c6dc 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_directive.c
@@ -43,7 +43,7 @@ static ngx_int_t ngx_http_lua_set_by_lua_init(ngx_http_request_t *r);
 #endif
 
 static u_char *ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag,
-    size_t tag_len);
+    size_t tag_len, size_t *chunkname_len);
 static ngx_int_t ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
     ngx_http_lua_block_parser_ctx_t *ctx);
 static u_char *ngx_http_lua_strlstrn(u_char *s1, u_char *last, u_char *s2,
@@ -271,13 +271,15 @@ ngx_http_lua_set_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     filter_data->size = filter.size;
 
-    p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+    p = ngx_palloc(cf->pool,
+                   sizeof("set_by_lua") + NGX_HTTP_LUA_INLINE_KEY_LEN);
     if (p == NULL) {
         return NGX_CONF_ERROR;
     }
 
     filter_data->key = p;
 
+    p = ngx_copy(p, "set_by_lua", sizeof("set_by_lua") - 1);
     p = ngx_copy(p, NGX_HTTP_LUA_INLINE_TAG, NGX_HTTP_LUA_INLINE_TAG_LEN);
     p = ngx_http_lua_digest_hex(p, value[2].data, value[2].len);
     *p = '\0';
@@ -448,6 +450,7 @@ ngx_http_lua_rewrite_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
 char *
 ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
+    size_t                       chunkname_len;
     u_char                      *p, *chunkname;
     ngx_str_t                   *value;
     ngx_http_lua_main_conf_t    *lmcf;
@@ -482,7 +485,8 @@ ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     if (cmd->post == ngx_http_lua_rewrite_handler_inline) {
         chunkname = ngx_http_lua_gen_chunk_name(cf, "rewrite_by_lua",
-                                                sizeof("rewrite_by_lua") - 1);
+                                                sizeof("rewrite_by_lua") - 1,
+                                                &chunkname_len);
         if (chunkname == NULL) {
             return NGX_CONF_ERROR;
         }
@@ -493,13 +497,15 @@ ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         llcf->rewrite_src.value = value[1];
 
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        p = ngx_palloc(cf->pool,
+                       chunkname_len + NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         llcf->rewrite_src_key = p;
 
+        p = ngx_copy(p, chunkname, chunkname_len);
         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';
@@ -562,6 +568,7 @@ ngx_http_lua_access_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
 char *
 ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
+    size_t                       chunkname_len;
     u_char                      *p, *chunkname;
     ngx_str_t                   *value;
     ngx_http_lua_main_conf_t    *lmcf;
@@ -592,7 +599,8 @@ ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     if (cmd->post == ngx_http_lua_access_handler_inline) {
         chunkname = ngx_http_lua_gen_chunk_name(cf, "access_by_lua",
-                                                sizeof("access_by_lua") - 1);
+                                                sizeof("access_by_lua") - 1,
+                                                &chunkname_len);
         if (chunkname == NULL) {
             return NGX_CONF_ERROR;
         }
@@ -603,13 +611,15 @@ ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         llcf->access_src.value = value[1];
 
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        p = ngx_palloc(cf->pool,
+                       chunkname_len + NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         llcf->access_src_key = p;
 
+        p = ngx_copy(p, chunkname, chunkname_len);
         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';
@@ -672,6 +682,7 @@ ngx_http_lua_content_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
 char *
 ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
+    size_t                       chunkname_len;
     u_char                      *p;
     u_char                      *chunkname;
     ngx_str_t                   *value;
@@ -706,7 +717,8 @@ ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     if (cmd->post == ngx_http_lua_content_handler_inline) {
         chunkname = ngx_http_lua_gen_chunk_name(cf, "content_by_lua",
-                                                sizeof("content_by_lua") - 1);
+                                                sizeof("content_by_lua") - 1,
+                                                &chunkname_len);
         if (chunkname == NULL) {
             return NGX_CONF_ERROR;
         }
@@ -719,13 +731,15 @@ ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         llcf->content_src.value = value[1];
 
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        p = ngx_palloc(cf->pool,
+                       chunkname_len + NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         llcf->content_src_key = p;
 
+        p = ngx_copy(p, chunkname, chunkname_len);
         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';
@@ -795,6 +809,7 @@ ngx_http_lua_log_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
 char *
 ngx_http_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
+    size_t                       chunkname_len;
     u_char                      *p, *chunkname;
     ngx_str_t                   *value;
     ngx_http_lua_main_conf_t    *lmcf;
@@ -825,7 +840,8 @@ ngx_http_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     if (cmd->post == ngx_http_lua_log_handler_inline) {
         chunkname = ngx_http_lua_gen_chunk_name(cf, "log_by_lua",
-                                                sizeof("log_by_lua") - 1);
+                                                sizeof("log_by_lua") - 1,
+                                                &chunkname_len);
         if (chunkname == NULL) {
             return NGX_CONF_ERROR;
         }
@@ -836,13 +852,15 @@ ngx_http_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         llcf->log_src.value = value[1];
 
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        p = ngx_palloc(cf->pool,
+                       chunkname_len + NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         llcf->log_src_key = p;
 
+        p = ngx_copy(p, chunkname, chunkname_len);
         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';
@@ -936,13 +954,17 @@ ngx_http_lua_header_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
         /* Don't eval nginx variables for inline lua code */
         llcf->header_filter_src.value = value[1];
 
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        p = ngx_palloc(cf->pool,
+                       sizeof("header_filter_by_lua") +
+                       NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         llcf->header_filter_src_key = p;
 
+        p = ngx_copy(p, "header_filter_by_lua",
+                     sizeof("header_filter_by_lua") - 1);
         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';
@@ -1036,13 +1058,16 @@ ngx_http_lua_body_filter_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
         /* 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);
+        p = ngx_palloc(cf->pool,
+                       sizeof("body_filter_by_lua") +
+                       NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         llcf->body_filter_src_key = p;
 
+        p = ngx_copy(p, "body_filter_by_lua", sizeof("body_filter_by_lua") - 1);
         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';
@@ -1248,7 +1273,8 @@ ngx_http_lua_set_by_lua_init(ngx_http_request_t *r)
 
 
 static u_char *
-ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len)
+ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
+    size_t *chunkname_len)
 {
     u_char      *p, *out;
     size_t       len;
@@ -1282,6 +1308,7 @@ found:
                  tag_len, tag, cf->conf_file->file.name.data
                                + cf->conf_file->file.name.len - p,
                  p, cf->conf_file->line);
+    *chunkname_len = len;
 
     return out;
 }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_exception.h b/debian/modules/http-lua/src/ngx_http_lua_exception.h
index a70708a..93dfb8f 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_exception.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_exception.h
@@ -12,13 +12,13 @@
 #include "ngx_http_lua_common.h"
 
 
-#define NGX_LUA_EXCEPTION_TRY                                               \
+#define NGX_LUA_EXCEPTION_TRY                                                \
     if (setjmp(ngx_http_lua_exception) == 0)
 
-#define NGX_LUA_EXCEPTION_CATCH                                             \
+#define NGX_LUA_EXCEPTION_CATCH                                              \
     else
 
-#define NGX_LUA_EXCEPTION_THROW(x)                                          \
+#define NGX_LUA_EXCEPTION_THROW(x)                                           \
     longjmp(ngx_http_lua_exception, (x))
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers.c b/debian/modules/http-lua/src/ngx_http_lua_headers.c
index 6700ce8..b833577 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers.c
@@ -113,7 +113,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
 
 #if (NGX_HTTP_V2)
     if (mr->stream) {
-        return luaL_error(L, "http v2 not supported yet");
+        return luaL_error(L, "http2 requests not supported yet");
     }
 #endif
 
@@ -245,7 +245,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
 
         if (b != mr->header_in) {
             /* skip truncated header entries (if any) */
-            while (last > data && last[-1] != LF) {
+            while (last > data && last[-1] != LF && last[-1] != '\0') {
                 last--;
             }
         }
@@ -315,7 +315,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
 
 #if 1
             /* skip truncated header entries (if any) */
-            while (last > p && last[-1] != LF) {
+            while (last > p && last[-1] != LF && last[-1] != '\0') {
                 last--;
             }
 #endif
@@ -325,8 +325,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
                 if (*p == '\0') {
                     j++;
                     if (p + 1 == last) {
-                        /* XXX this should not happen */
-                        dd("found string end!!");
+                        *p = LF;
 
                     } else if (*(p + 1) == LF) {
                         *p = CR;
@@ -398,6 +397,7 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L)
     int                           max;
     int                           raw = 0;
     int                           count = 0;
+    int                           truncated = 0;
 
     n = lua_gettop(L);
 
@@ -426,15 +426,17 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L)
 
     part = &r->headers_in.headers.part;
     count = part->nelts;
-    while (part->next) {
+    while (part->next != NULL) {
         part = part->next;
         count += part->nelts;
     }
 
     if (max > 0 && count > max) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua exceeding request header limit %d > %d", count,
+                       max);
         count = max;
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua exceeding request header limit %d", max);
+        truncated = 1;
     }
 
     lua_createtable(L, 0, count);
@@ -481,9 +483,14 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L)
                        "lua request header: \"%V: %V\"",
                        &header[i].key, &header[i].value);
 
-        if (--count == 0) {
-            return 1;
+        if (--count <= 0) {
+            break;
         }
+    }  /* for */
+
+    if (truncated) {
+        lua_pushliteral(L, "truncated");
+        return 2;
     }
 
     return 1;
@@ -505,6 +512,8 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     int                 max;
     int                 raw = 0;
     int                 count = 0;
+    int                 truncated = 0;
+    int                 extra = 0;
 
     n = lua_gettop(L);
 
@@ -549,18 +558,12 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
 
     part = &r->headers_out.headers.part;
     count = part->nelts;
-    while (part->next) {
+    while (part->next != NULL) {
         part = part->next;
         count += part->nelts;
     }
 
-    if (max > 0 && count > max) {
-        count = max;
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua exceeding request header limit %d", max);
-    }
-
-    lua_createtable(L, 0, count);
+    lua_createtable(L, 0, count + 2);
 
     if (!raw) {
         lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
@@ -570,6 +573,7 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
 
 #if 1
     if (r->headers_out.content_type.len) {
+        extra++;
         lua_pushliteral(L, "content-type");
         lua_pushlstring(L, (char *) r->headers_out.content_type.data,
                         r->headers_out.content_type.len);
@@ -579,11 +583,13 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     if (r->headers_out.content_length == NULL
         && r->headers_out.content_length_n >= 0)
     {
+        extra++;
         lua_pushliteral(L, "content-length");
         lua_pushfstring(L, "%d", (int) r->headers_out.content_length_n);
         lua_rawset(L, -3);
     }
 
+    extra++;
     lua_pushliteral(L, "connection");
     if (r->headers_out.status == NGX_HTTP_SWITCHING_PROTOCOLS) {
         lua_pushliteral(L, "upgrade");
@@ -597,12 +603,21 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     lua_rawset(L, -3);
 
     if (r->chunked) {
+        extra++;
         lua_pushliteral(L, "transfer-encoding");
         lua_pushliteral(L, "chunked");
         lua_rawset(L, -3);
     }
 #endif
 
+    if (max > 0 && count + extra > max) {
+        truncated = 1;
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua exceeding response header limit %d > %d",
+                       count + extra, max);
+        count = max - extra;
+    }
+
     part = &r->headers_out.headers.part;
     header = part->elts;
 
@@ -655,9 +670,14 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
                        "lua response header: \"%V: %V\"",
                        &header[i].key, &header[i].value);
 
-        if (--count == 0) {
-            return 1;
+        if (--count <= 0) {
+            break;
         }
+    }  /* for */
+
+    if (truncated) {
+        lua_pushliteral(L, "truncated");
+        return 2;
     }
 
     return 1;
@@ -1084,7 +1104,8 @@ ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L)
 
 #ifndef NGX_LUA_NO_FFI_API
 int
-ngx_http_lua_ffi_req_get_headers_count(ngx_http_request_t *r, int max)
+ngx_http_lua_ffi_req_get_headers_count(ngx_http_request_t *r, int max,
+    int *truncated)
 {
     int                           count;
     ngx_list_part_t              *part;
@@ -1093,21 +1114,26 @@ ngx_http_lua_ffi_req_get_headers_count(ngx_http_request_t *r, int max)
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
+    *truncated = 0;
+
     if (max < 0) {
         max = NGX_HTTP_LUA_MAX_HEADERS;
     }
 
     part = &r->headers_in.headers.part;
     count = part->nelts;
-    while (part->next) {
+    while (part->next != NULL) {
         part = part->next;
         count += part->nelts;
     }
 
     if (max > 0 && count > max) {
+        *truncated = 1;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua exceeding request header limit %d > %d", count,
+                       max);
         count = max;
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua exceeding request header limit %d", max);
     }
 
     return count;
@@ -1167,7 +1193,8 @@ ngx_http_lua_ffi_req_get_headers(ngx_http_request_t *r,
 int
 ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
     size_t key_len, int is_nil, const u_char *sval, size_t sval_len,
-    ngx_http_lua_ffi_str_t *mvals, size_t mvals_len, char **errmsg)
+    ngx_http_lua_ffi_str_t *mvals, size_t mvals_len, int override,
+    char **errmsg)
 {
     u_char                      *p;
     ngx_str_t                    value, key;
@@ -1250,7 +1277,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
                 value.len = len;
 
                 rc = ngx_http_lua_set_output_header(r, key, value,
-                                                    i == 0 /* override */);
+                                                    override && i == 0);
 
                 if (rc == NGX_ERROR) {
                     *errmsg = "failed to set header";
@@ -1275,7 +1302,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, key, value, 1 /* override */);
+    rc = ngx_http_lua_set_output_header(r, key, value, override);
 
     if (rc == NGX_ERROR) {
         *errmsg = "failed to set header";
diff --git a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
index 6754b4b..4a722a0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
@@ -40,10 +40,33 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
 
     lmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_lua_module);
 
-    if (lmcf == NULL
-        || lmcf->init_worker_handler == NULL
-        || lmcf->lua == NULL)
+    if (lmcf == NULL || lmcf->lua == NULL) {
+        return NGX_OK;
+    }
+
+    /* lmcf != NULL && lmcf->lua != NULL */
+
+#if !(NGX_WIN32)
+    if (ngx_process == NGX_PROCESS_HELPER
+#   ifdef HAVE_PRIVILEGED_PROCESS_PATCH
+        && !ngx_is_privileged_agent
+#   endif
+       )
     {
+        /* disable init_worker_by_lua* and destroy lua VM in cache processes */
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua close the global Lua VM %p in the "
+                       "cache helper process %P", lmcf->lua, ngx_pid);
+
+        lmcf->vm_cleanup->handler(lmcf->vm_cleanup->data);
+        lmcf->vm_cleanup->handler = NULL;
+
+        return NGX_OK;
+    }
+#endif  /* NGX_WIN32 */
+
+    if (lmcf->init_worker_handler == NULL) {
         return NGX_OK;
     }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_log.c b/debian/modules/http-lua/src/ngx_http_lua_log.c
index c18e6b0..0042a5e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_log.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_log.c
@@ -428,6 +428,29 @@ ngx_http_lua_ffi_errlog_get_sys_filter_level(ngx_http_request_t *r)
     return log_level;
 }
 
+
+int
+ngx_http_lua_ffi_raw_log(ngx_http_request_t *r, int level, u_char *s,
+    size_t s_len)
+{
+    ngx_log_t           *log;
+
+    if (level > NGX_LOG_DEBUG || level < NGX_LOG_STDERR) {
+        return NGX_ERROR;
+    }
+
+    if (r && r->connection && r->connection->log) {
+        log = r->connection->log;
+
+    } else {
+        log = ngx_cycle->log;
+    }
+
+    ngx_log_error((unsigned) level, log, 0, "%*s", s_len, s);
+
+    return NGX_OK;
+}
+
 #endif
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_module.c b/debian/modules/http-lua/src/ngx_http_lua_module.c
index 9d914e8..ae8bc0e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_module.c
@@ -65,6 +65,9 @@ static ngx_conf_bitmask_t  ngx_http_lua_ssl_protocols[] = {
     { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
     { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
     { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
+#ifdef NGX_SSL_TLSv1_3
+    { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
+#endif
     { ngx_null_string, 0 }
 };
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_phase.c b/debian/modules/http-lua/src/ngx_http_lua_phase.c
index 50c5311..304c88a 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_phase.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_phase.c
@@ -107,4 +107,22 @@ ngx_http_lua_inject_phase_api(lua_State *L)
     lua_setfield(L, -2, "get_phase");
 }
 
+
+#ifndef NGX_LUA_NO_FFI_API
+int
+ngx_http_lua_ffi_get_phase(ngx_http_request_t *r, char **err)
+{
+    ngx_http_lua_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        *err = "no request context";
+        return NGX_ERROR;
+    }
+
+    return ctx->context;
+}
+#endif
+
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_probe.h b/debian/modules/http-lua/src/ngx_http_lua_probe.h
index 37b2500..749fa95 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_probe.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_probe.h
@@ -44,7 +44,8 @@
 #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)\
+#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)          \
diff --git a/debian/modules/http-lua/src/ngx_http_lua_regex.c b/debian/modules/http-lua/src/ngx_http_lua_regex.c
index 80519ec..843d1e4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_regex.c
@@ -2199,6 +2199,8 @@ ngx_http_lua_ffi_compile_regex(const unsigned char *pat, size_t pat_len,
         goto error;
     }
 
+    pool->log = (ngx_log_t *) &ngx_cycle->new_log;
+
     re = ngx_palloc(pool, sizeof(ngx_http_lua_regex_t));
     if (re == NULL) {
         ngx_destroy_pool(pool);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_req_method.c b/debian/modules/http-lua/src/ngx_http_lua_req_method.c
index 0a2a154..a4969b9 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_req_method.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_req_method.c
@@ -158,15 +158,16 @@ ngx_http_lua_ffi_req_get_method(ngx_http_request_t *r)
 
 
 int
-ngx_http_lua_ffi_req_get_method_name(ngx_http_request_t *r, char *buf,
+ngx_http_lua_ffi_req_get_method_name(ngx_http_request_t *r, u_char **name,
     size_t *len)
 {
     if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
-    *len = ngx_min(r->method_name.len, *len);
-    ngx_memcpy(buf, r->method_name.data, *len);
+    *name = r->method_name.data;
+    *len = r->method_name.len;
+
     return NGX_OK;
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
index 077c2d3..1bbe87c 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
@@ -110,7 +110,7 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
             if (r->header_sent) {
                 dd("header already sent");
 
-                /* response header was already generated in access_by_lua*,
+                /* response header was already generated in rewrite_by_lua*,
                  * so it is no longer safe to proceed to later phases
                  * which may generate responses again */
 
@@ -126,6 +126,11 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
 
                 return NGX_HTTP_OK;
             }
+
+            r->write_event_handler = ngx_http_core_run_phases;
+            ctx->entered_rewrite_phase = 0;
+
+            return NGX_DECLINED;
         }
 
         return rc;
@@ -346,7 +351,7 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
         if (r->header_sent) {
             dd("header already sent");
 
-            /* response header was already generated in access_by_lua*,
+            /* response header was already generated in rewrite_by_lua*,
              * so it is no longer safe to proceed to later phases
              * which may generate responses again */
 
@@ -363,6 +368,9 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
             return NGX_HTTP_OK;
         }
 
+        r->write_event_handler = ngx_http_core_run_phases;
+        ctx->entered_rewrite_phase = 0;
+
         return NGX_DECLINED;
     }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_shdict.c b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
index 5b48eb4..5fb7930 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
@@ -2212,7 +2212,7 @@ ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
 int
 ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     size_t key_len, int value_type, u_char *str_value_buf,
-    size_t str_value_len, double num_value, int exptime, int user_flags,
+    size_t str_value_len, double num_value, long exptime, int user_flags,
     char **errmsg, int *forcible)
 {
     int                          i, n;
@@ -2229,7 +2229,7 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
         return NGX_ERROR;
     }
 
-    dd("exptime: %d", exptime);
+    dd("exptime: %ld", exptime);
 
     ctx = zone->data;
 
@@ -2623,11 +2623,12 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
 int
 ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
     size_t key_len, double *value, char **err, int has_init, double init,
-    int *forcible)
+    long init_ttl, int *forcible)
 {
     int                          i, n;
     uint32_t                     hash;
     ngx_int_t                    rc;
+    ngx_time_t                  *tp = NULL;
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
     double                       num;
@@ -2639,6 +2640,10 @@ ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
         return NGX_ERROR;
     }
 
+    if (init_ttl > 0) {
+        tp = ngx_timeofday();
+    }
+
     ctx = zone->data;
 
     *forcible = 0;
@@ -2802,7 +2807,13 @@ setvalue:
 
     sd->user_flags = 0;
 
-    sd->expires = 0;
+    if (init_ttl > 0) {
+        sd->expires = (uint64_t) tp->sec * 1000 + tp->msec
+                      + (uint64_t) init_ttl;
+
+    } else {
+        sd->expires = 0;
+    }
 
     dd("setting value type to %d", LUA_TNUMBER);
 
@@ -2892,7 +2903,7 @@ ngx_http_lua_shdict_peek(ngx_shm_zone_t *shm_zone, ngx_uint_t hash,
 }
 
 
-int
+long
 ngx_http_lua_ffi_shdict_get_ttl(ngx_shm_zone_t *zone, u_char *key,
     size_t key_len)
 {
@@ -2940,7 +2951,7 @@ ngx_http_lua_ffi_shdict_get_ttl(ngx_shm_zone_t *zone, u_char *key,
 
 int
 ngx_http_lua_ffi_shdict_set_expire(ngx_shm_zone_t *zone, u_char *key,
-    size_t key_len, int exptime)
+    size_t key_len, long exptime)
 {
     uint32_t                     hash;
     ngx_int_t                    rc;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
index f0988bc..efdf427 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
@@ -32,6 +32,8 @@ static int ngx_http_lua_socket_tcp_settimeouts(lua_State *L);
 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_init_peer_connection_addr_text(
+    ngx_peer_connection_t *pc);
 static void ngx_http_lua_socket_read_handler(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u);
 static void ngx_http_lua_socket_send_handler(ngx_http_request_t *r,
@@ -99,8 +101,6 @@ static ngx_int_t ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
 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_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,
@@ -120,7 +120,11 @@ static ngx_int_t ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r,
     int socket_op);
 static void ngx_http_lua_tcp_resolve_cleanup(void *data);
 static void ngx_http_lua_coctx_cleanup(void *data);
+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_shutdown_pool(lua_State *L);
+static void ngx_http_lua_socket_shutdown_pool_helper(
+    ngx_http_lua_socket_pool_t *spool);
 static void
     ngx_http_lua_socket_empty_resolve_handler(ngx_resolver_ctx_t *ctx);
 static int ngx_http_lua_socket_prepare_error_retvals(ngx_http_request_t *r,
@@ -509,7 +513,7 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
     if (n == 3) {
         port = luaL_checkinteger(L, 3);
 
-        if (port < 0 || port > 65536) {
+        if (port < 0 || port > 65535) {
             lua_pushnil(L);
             lua_pushfstring(L, "bad port number: %d", port);
             return 2;
@@ -938,7 +942,7 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
 #else
     /* for nginx older than 1.5.8 */
 
-    len = NGX_INET_ADDRSTRLEN + sizeof(":65536") - 1;
+    len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
 
     p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
     if (p == NULL) {
@@ -1002,6 +1006,50 @@ nomem:
 }
 
 
+static void
+ngx_http_lua_socket_init_peer_connection_addr_text(ngx_peer_connection_t *pc)
+{
+    ngx_connection_t            *c;
+    size_t                       addr_text_max_len;
+
+    c = pc->connection;
+
+    switch (pc->sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        addr_text_max_len = NGX_INET6_ADDRSTRLEN;
+        break;
+#endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+        addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
+        break;
+#endif
+
+    case AF_INET:
+        addr_text_max_len = NGX_INET_ADDRSTRLEN;
+        break;
+
+    default:
+        addr_text_max_len = NGX_SOCKADDR_STRLEN;
+        break;
+    }
+
+    c->addr_text.data = ngx_pnalloc(c->pool, addr_text_max_len);
+    if (c->addr_text.data == NULL) {
+        ngx_log_error(NGX_LOG_ERR, pc->log, 0,
+                      "init peer connection addr_text failed: no memory");
+        return;
+    }
+
+    c->addr_text.len = ngx_sock_ntop(pc->sockaddr, pc->socklen,
+                                     c->addr_text.data,
+                                     addr_text_max_len, 0);
+}
+
+
 static int
 ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
@@ -1320,9 +1368,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
                     return 2;
                 }
 
-                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                               "lua ssl set session: %p:%d",
-                               *psession, (*psession)->references);
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                               "lua ssl set session: %p", *psession);
             }
         }
 
@@ -1587,9 +1634,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
     } else {
         *ud = ssl_session;
 
-       ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                      "lua ssl save session: %p:%d", ssl_session,
-                      ssl_session->references);
+       ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                      "lua ssl save session: %p", ssl_session);
 
         /* set up the __gc metamethod */
         lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
@@ -2416,6 +2462,20 @@ ngx_http_lua_socket_tcp_send(lua_State *L)
             len = ngx_http_lua_calc_strlen_in_table(L, 2, 2, 1 /* strict */);
             break;
 
+        case LUA_TNIL:
+            len = sizeof("nil") - 1;
+            break;
+
+        case LUA_TBOOLEAN:
+            if (lua_toboolean(L, 2)) {
+                len = sizeof("true") - 1;
+
+            } else {
+                len = sizeof("false") - 1;
+            }
+
+            break;
+
         default:
             msg = lua_pushfstring(L, "string, number, boolean, nil, "
                                   "or array table expected, got %s",
@@ -2451,6 +2511,29 @@ ngx_http_lua_socket_tcp_send(lua_State *L)
             b->last = ngx_http_lua_copy_str_in_table(L, -1, b->last);
             break;
 
+        case LUA_TNIL:
+            *b->last++ = 'n';
+            *b->last++ = 'i';
+            *b->last++ = 'l';
+            break;
+
+        case LUA_TBOOLEAN:
+            if (lua_toboolean(L, 2)) {
+                *b->last++ = 't';
+                *b->last++ = 'r';
+                *b->last++ = 'u';
+                *b->last++ = 'e';
+
+            } else {
+                *b->last++ = 'f';
+                *b->last++ = 'a';
+                *b->last++ = 'l';
+                *b->last++ = 's';
+                *b->last++ = 'e';
+            }
+
+            break;
+
         default:
             return luaL_error(L, "impossible to reach here");
     }
@@ -3268,8 +3351,11 @@ ngx_http_lua_socket_connected_handler(ngx_http_request_t *r,
         llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
         if (llcf->log_socket_errors) {
+            ngx_http_lua_socket_init_peer_connection_addr_text(&u->peer);
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "lua tcp socket connect timed out");
+                          "lua tcp socket connect timed out,"
+                          " when connecting to %V:%ud",
+                          &c->addr_text, ngx_inet_get_port(u->peer.sockaddr));
         }
 
         ngx_http_lua_socket_handle_conn_error(r, u,
@@ -4341,7 +4427,7 @@ ngx_http_lua_req_socket(lua_State *L)
         r->request_body = rb;
     }
 
-    lua_createtable(L, 3 /* narr */, 1 /* nrec */); /* the object */
+    lua_createtable(L, 2 /* narr */, 3 /* nrec */); /* the object */
 
     if (raw) {
         lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
@@ -4960,19 +5046,13 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 }
 
 
-static int
-ngx_http_lua_socket_shutdown_pool(lua_State *L)
+static void
+ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
 {
     ngx_queue_t                         *q;
     ngx_connection_t                    *c;
-    ngx_http_lua_socket_pool_t          *spool;
     ngx_http_lua_socket_pool_item_t     *item;
 
-    spool = lua_touserdata(L, 1);
-    if (spool == NULL) {
-        return 0;
-    }
-
     while (!ngx_queue_empty(&spool->cache)) {
         q = ngx_queue_head(&spool->cache);
 
@@ -4986,6 +5066,19 @@ ngx_http_lua_socket_shutdown_pool(lua_State *L)
     }
 
     spool->active_connections = 0;
+}
+
+
+static int
+ngx_http_lua_socket_shutdown_pool(lua_State *L)
+{
+    ngx_http_lua_socket_pool_t          *spool;
+
+    spool = lua_touserdata(L, 1);
+
+    if (spool != NULL) {
+        ngx_http_lua_socket_shutdown_pool_helper(spool);
+    }
 
     return 0;
 }
@@ -5386,9 +5479,8 @@ ngx_http_lua_ssl_free_session(lua_State *L)
 
     psession = lua_touserdata(L, 1);
     if (psession && *psession != NULL) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua ssl free session: %p:%d", *psession,
-                       (*psession)->references);
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua ssl free session: %p", *psession);
 
         ngx_ssl_free_session(*psession);
     }
@@ -5402,10 +5494,7 @@ ngx_http_lua_ssl_free_session(lua_State *L)
 void
 ngx_http_lua_cleanup_conn_pools(lua_State *L)
 {
-    ngx_queue_t                         *q;
-    ngx_connection_t                    *c;
     ngx_http_lua_socket_pool_t          *spool;
-    ngx_http_lua_socket_pool_item_t     *item;
 
     lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
     lua_rawget(L, LUA_REGISTRYINDEX); /* table */
@@ -5415,18 +5504,12 @@ ngx_http_lua_cleanup_conn_pools(lua_State *L)
         /* tb key val */
         spool = lua_touserdata(L, -1);
 
-        if (!ngx_queue_empty(&spool->cache)) {
-            q = ngx_queue_head(&spool->cache);
-            item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
-            c = item->connection;
+        if (spool != NULL) {
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua tcp socket keepalive: free connection pool %p "
+                           "for \"%s\"", spool, spool->key);
 
-            ngx_http_lua_socket_tcp_close_connection(c);
-
-            ngx_queue_remove(q);
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "lua tcp socket keepalive: free connection pool "
-                           "for \"%s\"", spool->key);
+            ngx_http_lua_socket_shutdown_pool_helper(spool);
         }
 
         lua_pop(L, 1);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
index 08ba1cc..8927f41 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
@@ -221,7 +221,7 @@ ngx_http_lua_socket_udp_setpeername(lua_State *L)
     if (n == 3) {
         port = luaL_checkinteger(L, 3);
 
-        if (port < 0 || port > 65536) {
+        if (port < 0 || port > 65535) {
             lua_pushnil(L);
             lua_pushfstring(L, "bad port number: %d", port);
             return 2;
@@ -574,7 +574,7 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
 #else
     /* for nginx older than 1.5.8 */
 
-    len = NGX_INET_ADDRSTRLEN + sizeof(":65536") - 1;
+    len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
 
     p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
     if (p == NULL) {
@@ -845,6 +845,20 @@ ngx_http_lua_socket_udp_send(lua_State *L)
             len = ngx_http_lua_calc_strlen_in_table(L, 2, 2, 1 /* strict */);
             break;
 
+        case LUA_TNIL:
+            len = sizeof("nil") - 1;
+            break;
+
+        case LUA_TBOOLEAN:
+            if (lua_toboolean(L, 2)) {
+                len = sizeof("true") - 1;
+
+            } else {
+                len = sizeof("false") - 1;
+            }
+
+            break;
+
         default:
             msg = lua_pushfstring(L, "string, number, boolean, nil, "
                                   "or array table expected, got %s",
@@ -867,6 +881,32 @@ ngx_http_lua_socket_udp_send(lua_State *L)
             (void) ngx_http_lua_copy_str_in_table(L, 2, query.data);
             break;
 
+        case LUA_TNIL:
+            p = query.data;
+            *p++ = 'n';
+            *p++ = 'i';
+            *p++ = 'l';
+            break;
+
+        case LUA_TBOOLEAN:
+            p = query.data;
+
+            if (lua_toboolean(L, 2)) {
+                *p++ = 't';
+                *p++ = 'r';
+                *p++ = 'u';
+                *p++ = 'e';
+
+            } else {
+                *p++ = 'f';
+                *p++ = 'a';
+                *p++ = 'l';
+                *p++ = 's';
+                *p++ = 'e';
+            }
+
+            break;
+
         default:
             return luaL_error(L, "impossible to reach here");
     }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
index 95be47f..453a5c7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
@@ -163,13 +163,17 @@ ngx_http_lua_ssl_cert_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
         lscf->srv.ssl_cert_src = value[1];
 
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        p = ngx_palloc(cf->pool,
+                       sizeof("ssl_certificate_by_lua") +
+                       NGX_HTTP_LUA_INLINE_KEY_LEN);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         lscf->srv.ssl_cert_src_key = p;
 
+        p = ngx_copy(p, "ssl_certificate_by_lua",
+                     sizeof("ssl_certificate_by_lua") - 1);
         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';
@@ -549,13 +553,6 @@ ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
 int
 ngx_http_lua_ffi_ssl_get_tls1_version(ngx_http_request_t *r, char **err)
 {
-#ifndef TLS1_get_version
-
-    *err = "no TLS1 support";
-    return NGX_ERROR;
-
-#else
-
     ngx_ssl_conn_t    *ssl_conn;
 
     if (r->connection == NULL || r->connection->ssl == NULL) {
@@ -569,11 +566,9 @@ ngx_http_lua_ffi_ssl_get_tls1_version(ngx_http_request_t *r, char **err)
         return NGX_ERROR;
     }
 
-    dd("tls1 ver: %d", (int) TLS1_get_version(ssl_conn));
+    dd("tls1 ver: %d", SSL_version(ssl_conn));
 
-    return (int) TLS1_get_version(ssl_conn);
-
-#endif
+    return SSL_version(ssl_conn);
 }
 
 
@@ -747,7 +742,7 @@ ngx_http_lua_ffi_ssl_set_der_private_key(ngx_http_request_t *r,
     }
 
     if (SSL_use_PrivateKey(ssl_conn, pkey) == 0) {
-        *err = "SSL_CTX_use_PrivateKey() failed";
+        *err = "SSL_use_PrivateKey() failed";
         goto failed;
     }
 
@@ -884,6 +879,74 @@ ngx_http_lua_ffi_ssl_server_name(ngx_http_request_t *r, char **name,
 }
 
 
+int
+ngx_http_lua_ffi_ssl_raw_client_addr(ngx_http_request_t *r, char **addr,
+    size_t *addrlen, int *addrtype, char **err)
+{
+#if (NGX_HAVE_UNIX_DOMAIN)
+    struct sockaddr_un  *saun;
+#endif
+    ngx_ssl_conn_t      *ssl_conn;
+    ngx_connection_t    *c;
+    struct sockaddr_in  *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6 *sin6;
+#endif
+
+    if (r->connection == NULL || r->connection->ssl == NULL) {
+        *err = "bad request";
+        return NGX_ERROR;
+    }
+
+    ssl_conn = r->connection->ssl->connection;
+    if (ssl_conn == NULL) {
+        *err = "bad ssl conn";
+        return NGX_ERROR;
+    }
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    switch (c->sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) c->sockaddr;
+        *addrlen = 16;
+        *addr = (char *) &sin6->sin6_addr.s6_addr;
+        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_INET6;
+
+        break;
+#endif
+
+# if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+        saun = (struct sockaddr_un *)c->sockaddr;
+        /* on Linux sockaddr might not include sun_path at all */
+        if (c->socklen <= (socklen_t) offsetof(struct sockaddr_un, sun_path)) {
+            *addr = "";
+            *addrlen = 0;
+
+        } else {
+            *addr = saun->sun_path;
+            *addrlen = ngx_strlen(saun->sun_path);
+        }
+
+        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_UNIX;
+        break;
+#endif
+
+    default: /* AF_INET */
+        sin = (struct sockaddr_in *) c->sockaddr;
+        *addr = (char *) &sin->sin_addr.s_addr;
+        *addrlen = 4;
+        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_INET;
+        break;
+    }
+
+    return NGX_OK;
+}
+
+
 int
 ngx_http_lua_ffi_cert_pem_to_der(const u_char *pem, size_t pem_len, u_char *der,
     char **err)
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c
index 31b4f24..9ec8b50 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c
@@ -468,7 +468,11 @@ ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
+#ifdef SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE
+    if (SSL_get_tlsext_status_type(ssl_conn) == -1) {
+#else
     if (ssl_conn->tlsext_status_type == -1) {
+#endif
         dd("no ocsp status req from client");
         return NGX_DECLINED;
     }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
index 3a3c1f5..0b88a87 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
@@ -153,13 +153,17 @@ ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
         lscf->srv.ssl_sess_fetch_src = value[1];
 
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        p = ngx_palloc(cf->pool,
+                       sizeof("ssl_session_fetch_by_lua") +
+                       NGX_HTTP_LUA_INLINE_KEY_LEN);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         lscf->srv.ssl_sess_fetch_src_key = p;
 
+        p = ngx_copy(p, "ssl_session_fetch_by_lua",
+                     sizeof("ssl_session_fetch_by_lua") - 1);
         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';
@@ -171,8 +175,11 @@ ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
 /* cached session fetching callback to be set with SSL_CTX_sess_set_get_cb */
 ngx_ssl_session_t *
-ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
-    int len, int *copy)
+ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn,
+#if OPENSSL_VERSION_NUMBER >= 0x10100003L
+    const
+#endif
+    u_char *id, int len, int *copy)
 {
     lua_State                       *L;
     ngx_int_t                        rc;
@@ -287,7 +294,7 @@ ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
     cctx->exit_code = 1;  /* successful by default */
     cctx->connection = c;
     cctx->request = r;
-    cctx->session_id.data = id;
+    cctx->session_id.data = (u_char *) id;
     cctx->session_id.len = len;
     cctx->entered_sess_fetch_handler = 1;
     cctx->done = 0;
@@ -560,6 +567,7 @@ ngx_http_lua_ffi_ssl_set_serialized_session(ngx_http_request_t *r,
     ngx_ssl_conn_t                  *ssl_conn;
     ngx_connection_t                *c;
     ngx_ssl_session_t               *session = NULL;
+    ngx_ssl_session_t               *old_session;
     ngx_http_lua_ssl_ctx_t          *cctx;
 
     c = r->connection;
@@ -590,8 +598,13 @@ ngx_http_lua_ffi_ssl_set_serialized_session(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
+    old_session = cctx->session;
     cctx->session = session;
 
+    if (old_session != NULL) {
+        ngx_ssl_free_session(old_session);
+    }
+
     return NGX_OK;
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h
index 5a6f96f..50c6616 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h
@@ -25,7 +25,11 @@ char *ngx_http_lua_ssl_sess_fetch_by_lua_block(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
 
 ngx_ssl_session_t *ngx_http_lua_ssl_sess_fetch_handler(
-    ngx_ssl_conn_t *ssl_conn, u_char *id, int len, int *copy);
+    ngx_ssl_conn_t *ssl_conn,
+#if OPENSSL_VERSION_NUMBER >= 0x10100003L
+    const
+#endif
+    u_char *id, int len, int *copy);
 #endif
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
index f83e85d..7609c39 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
@@ -151,13 +151,17 @@ ngx_http_lua_ssl_sess_store_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
         lscf->srv.ssl_sess_store_src = value[1];
 
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
+        p = ngx_palloc(cf->pool,
+                       sizeof("ssl_session_store_by_lua") +
+                       NGX_HTTP_LUA_INLINE_KEY_LEN);
         if (p == NULL) {
             return NGX_CONF_ERROR;
         }
 
         lscf->srv.ssl_sess_store_src_key = p;
 
+        p = ngx_copy(p, "ssl_session_store_by_lua",
+                     sizeof("ssl_session_store_by_lua") - 1);
         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';
@@ -172,6 +176,8 @@ int
 ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
     ngx_ssl_session_t *sess)
 {
+    const u_char                    *sess_id;
+    unsigned int                     sess_id_len;
     lua_State                       *L;
     ngx_int_t                        rc;
     ngx_connection_t                *c, *fc = NULL;
@@ -247,11 +253,18 @@ ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
         }
     }
 
+#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
+    sess_id = SSL_SESSION_get_id(sess, &sess_id_len);
+#else
+    sess_id = sess->session_id;
+    sess_id_len = sess->session_id_length;
+#endif
+
     cctx->connection = c;
     cctx->request = r;
     cctx->session = sess;
-    cctx->session_id.data = sess->session_id;
-    cctx->session_id.len = sess->session_id_length;
+    cctx->session_id.data = (u_char *) sess_id;
+    cctx->session_id.len = sess_id_len;
     cctx->done = 0;
 
     dd("setting cctx");
diff --git a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
index 47096e9..826a43c 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
@@ -166,6 +166,12 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
         return luaL_error(L, "no request object found");
     }
 
+#if (NGX_HTTP_V2)
+    if (r->main->stream) {
+        return luaL_error(L, "http2 requests not supported yet");
+    }
+#endif
+
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
         return luaL_error(L, "no ctx found");
diff --git a/debian/modules/http-lua/src/ngx_http_lua_time.c b/debian/modules/http-lua/src/ngx_http_lua_time.c
index 3272a75..bbb6f2b 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_time.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_time.c
@@ -272,6 +272,77 @@ ngx_http_lua_ffi_time(void)
 {
     return (long) ngx_time();
 }
+
+
+void
+ngx_http_lua_ffi_update_time(void)
+{
+    ngx_time_update();
+}
+
+
+void
+ngx_http_lua_ffi_today(u_char *buf)
+{
+    ngx_tm_t                 tm;
+
+    ngx_gmtime(ngx_time() + ngx_cached_time->gmtoff * 60, &tm);
+
+    ngx_sprintf(buf, "%04d-%02d-%02d", tm.ngx_tm_year, tm.ngx_tm_mon,
+                tm.ngx_tm_mday);
+}
+
+
+void
+ngx_http_lua_ffi_localtime(u_char *buf)
+{
+    ngx_tm_t                 tm;
+
+    ngx_gmtime(ngx_time() + ngx_cached_time->gmtoff * 60, &tm);
+
+    ngx_sprintf(buf, "%04d-%02d-%02d %02d:%02d:%02d", tm.ngx_tm_year,
+                tm.ngx_tm_mon, tm.ngx_tm_mday, tm.ngx_tm_hour, tm.ngx_tm_min,
+                tm.ngx_tm_sec);
+}
+
+
+void
+ngx_http_lua_ffi_utctime(u_char *buf)
+{
+    ngx_tm_t       tm;
+
+    ngx_gmtime(ngx_time(), &tm);
+
+    ngx_sprintf(buf, "%04d-%02d-%02d %02d:%02d:%02d", tm.ngx_tm_year,
+                tm.ngx_tm_mon, tm.ngx_tm_mday, tm.ngx_tm_hour, tm.ngx_tm_min,
+                tm.ngx_tm_sec);
+}
+
+
+int
+ngx_http_lua_ffi_cookie_time(u_char *buf, long t)
+{
+    u_char                              *p;
+
+    p = ngx_http_cookie_time(buf, t);
+    return p - buf;
+}
+
+
+void
+ngx_http_lua_ffi_http_time(u_char *buf, long t)
+{
+    ngx_http_time(buf, t);
+}
+
+
+void
+ngx_http_lua_ffi_parse_http_time(const u_char *str, size_t len,
+    long *time)
+{
+    /* ngx_http_parse_time doesn't modify 'str' actually */
+    *time = ngx_http_parse_time((u_char *) str, len);
+}
 #endif /* NGX_LUA_NO_FFI_API */
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.c b/debian/modules/http-lua/src/ngx_http_lua_util.c
index df0aae8..f7a537e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.c
@@ -710,7 +710,7 @@ static void
 ngx_http_lua_inject_ngx_api(lua_State *L, ngx_http_lua_main_conf_t *lmcf,
     ngx_log_t *log)
 {
-    lua_createtable(L, 0 /* narr */, 116 /* nrec */);    /* ngx.* */
+    lua_createtable(L, 0 /* narr */, 117 /* nrec */);    /* ngx.* */
 
     lua_pushcfunction(L, ngx_http_lua_get_raw_phase_context);
     lua_setfield(L, -2, "_phase_ctx");
@@ -1055,7 +1055,8 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
                  * check if coroutine.resume or coroutine.yield called
                  * lua_yield()
                  */
-                switch(ctx->co_op) {
+                switch (ctx->co_op) {
+
                 case NGX_HTTP_LUA_USER_CORO_NOP:
                     dd("hit! it is the API yield");
 
@@ -2169,8 +2170,7 @@ ngx_http_lua_handle_exec(lua_State *L, ngx_http_request_t *r,
 #endif
 
         rc = ngx_http_named_location(r, &ctx->exec_uri);
-        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE)
-        {
+        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
             return rc;
         }
 
@@ -3768,6 +3768,12 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
 
     cln->data = state;
 
+    if (lmcf->vm_cleanup == NULL) {
+        /* this assignment will happen only once,
+         * and also only for the main Lua VM */
+        lmcf->vm_cleanup = cln;
+    }
+
     if (pcln) {
         *pcln = cln;
     }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.h b/debian/modules/http-lua/src/ngx_http_lua_util.h
index 2f995e0..7dcc6f7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.h
@@ -10,6 +10,7 @@
 
 
 #include "ngx_http_lua_common.h"
+#include "ngx_http_lua_api.h"
 
 
 #ifndef NGX_UNESCAPE_URI_COMPONENT
@@ -18,13 +19,6 @@
 
 
 #ifndef NGX_LUA_NO_FFI_API
-typedef struct {
-    int          len;
-    /* this padding hole on 64-bit systems is expected */
-    u_char      *data;
-} ngx_http_lua_ffi_str_t;
-
-
 typedef struct {
     ngx_http_lua_ffi_str_t   key;
     ngx_http_lua_ffi_str_t   value;
@@ -250,9 +244,9 @@ void ngx_http_lua_cleanup_free(ngx_http_request_t *r,
     ngx_http_cleanup_pt *cleanup);
 
 
-#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_check_if_abortable(L, ctx)                              \
+    if ((ctx)->no_abort) {                                                   \
+        return luaL_error(L, "attempt to abort with pending subrequests");   \
     }
 
 
@@ -372,7 +366,7 @@ ngx_http_lua_set_globals_table(lua_State *L)
 }
 
 
-#define ngx_http_lua_hash_literal(s)                                        \
+#define ngx_http_lua_hash_literal(s)                                         \
     ngx_http_lua_hash_str((u_char *) s, sizeof(s) - 1)
 
 
@@ -435,6 +429,36 @@ ngx_http_lua_get_flush_chain(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 }
 
 
+#if (nginx_version < 1011002)
+static ngx_inline in_port_t
+ngx_inet_get_port(struct sockaddr *sa)
+{
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
+
+    switch (sa->sa_family) {
+
+#if (NGX_HAVE_INET6)
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) sa;
+        return ntohs(sin6->sin6_port);
+#endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+        return 0;
+#endif
+
+    default: /* AF_INET */
+        sin = (struct sockaddr_in *) sa;
+        return ntohs(sin->sin_port);
+    }
+}
+#endif
+
+
 extern ngx_uint_t  ngx_http_lua_location_hash;
 extern ngx_uint_t  ngx_http_lua_content_length_hash;
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_variable.c b/debian/modules/http-lua/src/ngx_http_lua_variable.c
index b26c862..e489d9e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_variable.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_variable.c
@@ -364,7 +364,7 @@ ngx_http_lua_ffi_var_get(ngx_http_request_t *r, u_char *name_data,
 int
 ngx_http_lua_ffi_var_set(ngx_http_request_t *r, u_char *name_data,
     size_t name_len, u_char *lowcase_buf, u_char *value, size_t value_len,
-    u_char *errbuf, size_t errlen)
+    u_char *errbuf, size_t *errlen)
 {
     u_char                      *p;
     ngx_uint_t                   hash;
@@ -373,12 +373,15 @@ ngx_http_lua_ffi_var_set(ngx_http_request_t *r, u_char *name_data,
     ngx_http_core_main_conf_t   *cmcf;
 
     if (r == NULL) {
-        ngx_snprintf(errbuf, errlen, "no request object found");
+        *errlen = ngx_snprintf(errbuf, *errlen, "no request object found")
+                  - errbuf;
         return NGX_ERROR;
     }
 
     if ((r)->connection->fd == (ngx_socket_t) -1) {
-        ngx_snprintf(errbuf, errlen, "API disabled in the current context");
+        *errlen = ngx_snprintf(errbuf, *errlen,
+                               "API disabled in the current context")
+                  - errbuf;
         return NGX_ERROR;
     }
 
@@ -395,8 +398,10 @@ ngx_http_lua_ffi_var_set(ngx_http_request_t *r, u_char *name_data,
     if (v) {
         if (!(v->flags & NGX_HTTP_VAR_CHANGEABLE)) {
             dd("variable not changeable");
-            ngx_snprintf(errbuf, errlen, "variable \"%*s\" not changeable",
-                         name_len, lowcase_buf);
+            *errlen = ngx_snprintf(errbuf, *errlen,
+                                   "variable \"%*s\" not changeable",
+                                   name_len, lowcase_buf)
+                      - errbuf;
             return NGX_ERROR;
         }
 
@@ -475,23 +480,27 @@ ngx_http_lua_ffi_var_set(ngx_http_request_t *r, u_char *name_data,
             return NGX_OK;
         }
 
-        ngx_snprintf(errbuf, errlen, "variable \"%*s\" cannot be assigned "
-                     "a value", name_len, lowcase_buf);
+        *errlen = ngx_snprintf(errbuf, *errlen,
+                               "variable \"%*s\" cannot be assigned "
+                               "a value", name_len, lowcase_buf)
+                  - errbuf;
         return NGX_ERROR;
     }
 
     /* variable not found */
 
-    ngx_snprintf(errbuf, errlen, "variable \"%*s\" not found for writing; "
-                 "maybe it is a built-in variable that is not changeable "
-                 "or you forgot to use \"set $%*s '';\" "
-                 "in the config file to define it first",
-                 name_len, lowcase_buf, name_len, lowcase_buf);
+    *errlen = ngx_snprintf(errbuf, *errlen,
+                           "variable \"%*s\" not found for writing; "
+                           "maybe it is a built-in variable that is not "
+                           "changeable or you forgot to use \"set $%*s '';\" "
+                           "in the config file to define it first",
+                           name_len, lowcase_buf, name_len, lowcase_buf)
+              - errbuf;
     return NGX_ERROR;
 
 nomem:
 
-    ngx_snprintf(errbuf, errlen, "no memory");
+    *errlen = ngx_snprintf(errbuf, *errlen, "no memory") - errbuf;
     return NGX_ERROR;
 }
 #endif /* NGX_LUA_NO_FFI_API */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_worker.c b/debian/modules/http-lua/src/ngx_http_lua_worker.c
index e1cfec4..461509b 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_worker.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_worker.c
@@ -135,6 +135,21 @@ ngx_http_lua_ffi_worker_count(void)
 }
 
 
+int
+ngx_http_lua_ffi_master_pid(void)
+{
+#if (nginx_version >= 1013008)
+    if (ngx_process == NGX_PROCESS_SINGLE) {
+        return (int) ngx_pid;
+    }
+
+    return (int) ngx_parent;
+#else
+    return NGX_ERROR;
+#endif
+}
+
+
 int
 ngx_http_lua_ffi_get_process_type(void)
 {
diff --git a/debian/modules/http-lua/t/016-resp-header.t b/debian/modules/http-lua/t/016-resp-header.t
index 1fae292..72c1e05 100644
--- a/debian/modules/http-lua/t/016-resp-header.t
+++ b/debian/modules/http-lua/t/016-resp-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 41);
+plan tests => repeat_each() * (blocks() * 3 + 46);
 
 #no_diff();
 no_long_string();
@@ -1151,10 +1151,23 @@ foo: 32
         content_by_lua '
             ngx.header["Foo"] = "bar"
             ngx.header["Bar"] = "baz"
-            ngx.say("Foo: ", ngx.resp.get_headers()["Foo"] or "nil")
-            ngx.say("foo: ", ngx.resp.get_headers()["foo"] or "nil")
-            ngx.say("Bar: ", ngx.resp.get_headers()["Bar"] or "nil")
-            ngx.say("bar: ", ngx.resp.get_headers()["bar"] or "nil")
+            local headers, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("Foo: ", headers["Foo"] or "nil")
+            ngx.say("foo: ", headers["foo"] or "nil")
+            ngx.say("Bar: ", headers["Bar"] or "nil")
+
+            headers, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("bar: ", headers["bar"] or "nil")
         ';
     }
 --- request
@@ -1167,6 +1180,8 @@ Foo: bar
 foo: bar
 Bar: baz
 bar: baz
+--- no_error_log
+[error]
 
 
 
@@ -1176,8 +1191,15 @@ bar: baz
         content_by_lua '
             ngx.header["Foo"] = "bar"
             ngx.header["Bar"] = "baz"
+
+            local headers, err = ngx.resp.get_headers(nil, true)
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             local h = {}
-            for k, v in pairs(ngx.resp.get_headers(nil, true)) do
+            for k, v in pairs(headers) do
                 h[k] = v
             end
             ngx.say("Foo: ", h["Foo"] or "nil")
@@ -1206,10 +1228,17 @@ bar: nil
             ngx.header["Foo"] = "bar"
             ngx.header["Foo"] = nil
             ngx.header["Bar"] = "baz"
-            ngx.say("Foo: ", ngx.resp.get_headers()["Foo"] or "nil")
-            ngx.say("foo: ", ngx.resp.get_headers()["foo"] or "nil")
-            ngx.say("Bar: ", ngx.resp.get_headers()["Bar"] or "nil")
-            ngx.say("bar: ", ngx.resp.get_headers()["bar"] or "nil")
+
+            local headers, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("Foo: ", headers["Foo"] or "nil")
+            ngx.say("foo: ", headers["foo"] or "nil")
+            ngx.say("Bar: ", headers["Bar"] or "nil")
+            ngx.say("bar: ", headers["bar"] or "nil")
         ';
     }
 --- request
@@ -1233,7 +1262,12 @@ bar: baz
         ';
 
         header_filter_by_lua '
-            local hs = ngx.resp.get_headers()
+            local hs, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             print("my Content-Type: ", hs["Content-Type"])
             print("my content-type: ", hs["content-type"])
             print("my content_type: ", hs["content_type"])
@@ -1261,7 +1295,12 @@ my content_type: text/plain
         ';
 
         header_filter_by_lua '
-            local hs = ngx.resp.get_headers()
+            local hs, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             print("my Content-Length: ", hs["Content-Length"])
             print("my content-length: ", hs["content-length"])
             print("my content_length: ", hs.content_length)
@@ -1289,7 +1328,12 @@ my content_length: 3
         ';
 
         header_filter_by_lua '
-            local hs = ngx.resp.get_headers()
+            local hs, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             print("my Connection: ", hs["Connection"])
             print("my connection: ", hs["connection"])
         ';
@@ -1315,7 +1359,12 @@ my connection: close
         ';
 
         body_filter_by_lua '
-            local hs = ngx.resp.get_headers()
+            local hs, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             print("my Transfer-Encoding: ", hs["Transfer-Encoding"])
             print("my transfer-encoding: ", hs["transfer-encoding"])
             print("my transfer_encoding: ", hs.transfer_encoding)
@@ -1342,7 +1391,12 @@ my transfer-encoding: chunked
         ';
 
         body_filter_by_lua '
-            local hs = ngx.resp.get_headers()
+            local hs, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             print("my Transfer-Encoding: ", hs["Transfer-Encoding"])
             print("my transfer-encoding: ", hs["transfer-encoding"])
             print("my transfer_encoding: ", hs.transfer_encoding)
@@ -1497,7 +1551,12 @@ types {
     location /set/ {
         default_type text/html;
         content_by_lua_block {
-            local h = ngx.resp.get_headers()
+            local h, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             ngx.say(h["content-type"])
         }
     }
@@ -1509,3 +1568,134 @@ Content-Type: image/png
 image/png
 --- no_error_log
 [error]
+
+
+
+=== TEST 72: exceeding max header limit (default 100)
+--- config
+    location /resp-header {
+        content_by_lua_block {
+            for i = 1, 99 do
+                ngx.header["Foo" .. i] = "Foo"
+            end
+
+            local headers, err = ngx.resp.get_headers()
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local cnt = 0
+            for k, v in pairs(headers) do
+                cnt = cnt + 1
+            end
+
+            ngx.say("found ", cnt, " resp headers");
+        }
+    }
+--- request
+GET /resp-header
+--- response_body
+err: truncated
+found 100 resp headers
+--- no_error_log
+[error]
+--- log_level: debug
+--- error_log
+lua exceeding response header limit 101 > 100
+
+
+
+=== TEST 73: NOT exceeding max header limit (default 100)
+--- config
+    location /resp-header {
+        content_by_lua_block {
+            for i = 1, 98 do
+                ngx.header["Foo" .. i] = "Foo"
+            end
+
+            local headers, err = ngx.resp.get_headers()
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local cnt = 0
+            for k, v in pairs(headers) do
+                cnt = cnt + 1
+            end
+
+            ngx.say("found ", cnt, " resp headers");
+        }
+    }
+--- request
+GET /resp-header
+--- response_body
+found 100 resp headers
+--- no_error_log
+[error]
+lua exceeding response header limit
+--- log_level: debug
+
+
+
+=== TEST 74: exceeding max header limit (custom limit, 3)
+--- config
+    location /resp-header {
+        content_by_lua_block {
+            for i = 1, 2 do
+                ngx.header["Foo" .. i] = "Foo"
+            end
+
+            local headers, err = ngx.resp.get_headers(3)
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local cnt = 0
+            for k, v in pairs(headers) do
+                cnt = cnt + 1
+            end
+
+            ngx.say("found ", cnt, " resp headers");
+        }
+    }
+--- request
+GET /resp-header
+--- response_body
+err: truncated
+found 3 resp headers
+--- no_error_log
+[error]
+--- error_log
+lua exceeding response header limit 4 > 3
+--- log_level: debug
+
+
+
+=== TEST 75: NOT exceeding max header limit (custom limit, 3)
+--- config
+    location /resp-header {
+        content_by_lua_block {
+            for i = 1, 1 do
+                ngx.header["Foo" .. i] = "Foo"
+            end
+
+            local headers, err = ngx.resp.get_headers(3)
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local cnt = 0
+            for k, v in pairs(headers) do
+                cnt = cnt + 1
+            end
+
+            ngx.say("found ", cnt, " resp headers");
+        }
+    }
+--- request
+GET /resp-header
+--- response_body
+found 3 resp headers
+--- no_error_log
+[error]
+lua exceeding response header limit
diff --git a/debian/modules/http-lua/t/020-subrequest.t b/debian/modules/http-lua/t/020-subrequest.t
index 3390d64..658a1d2 100644
--- a/debian/modules/http-lua/t/020-subrequest.t
+++ b/debian/modules/http-lua/t/020-subrequest.t
@@ -1119,7 +1119,11 @@ hello world
 --- config
     location /t {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local res = ngx.location.capture("/sub", { args = args })
             ngx.print(res.body)
         ';
diff --git a/debian/modules/http-lua/t/022-redirect.t b/debian/modules/http-lua/t/022-redirect.t
index fae39e3..09374d3 100644
--- a/debian/modules/http-lua/t/022-redirect.t
+++ b/debian/modules/http-lua/t/022-redirect.t
@@ -84,7 +84,7 @@ GET /read
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
 --- error_log
-only ngx.HTTP_MOVED_TEMPORARILY, ngx.HTTP_MOVED_PERMANENTLY, ngx.HTTP_SEE_OTHER, and ngx.HTTP_TEMPORARY_REDIRECT are allowed
+only ngx.HTTP_MOVED_TEMPORARILY, ngx.HTTP_MOVED_PERMANENTLY, ngx.HTTP_PERMANENT_REDIRECT, ngx.HTTP_SEE_OTHER, and ngx.HTTP_TEMPORARY_REDIRECT are allowed
 
 
 
@@ -269,3 +269,54 @@ GET /read
 Location: http://agentzh.org/foo?a=b&c=d
 --- response_body_like: 303 See Other
 --- error_code: 303
+
+
+
+=== TEST 15: explicit 308 with args
+--- config
+    location /read {
+        content_by_lua '
+            ngx.redirect("http://agentzh.org/foo?a=b&c=d", ngx.HTTP_PERMANENT_REDIRECT);
+            ngx.say("hi")
+        ';
+    }
+--- request
+GET /read
+--- response_body_like: 308 Permanent Redirect
+--- response_headers
+Location: http://agentzh.org/foo?a=b&c=d
+--- error_code: 308
+
+
+
+=== TEST 16: explicit 308
+--- config
+    location /read {
+        content_by_lua '
+            ngx.redirect("http://agentzh.org/foo?a=b&c=d", 308);
+            ngx.say("hi")
+        ';
+    }
+--- request
+GET /read
+--- response_body_like: 308 Permanent Redirect
+--- response_headers
+Location: http://agentzh.org/foo?a=b&c=d
+--- error_code: 308
+
+
+
+=== TEST 17: explicit 308 with args
+--- config
+    location /read {
+        content_by_lua '
+            ngx.redirect("http://agentzh.org/foo?a=b&c=d", 308);
+            ngx.say("hi")
+        ';
+    }
+--- request
+GET /read
+--- response_body_like: 308 Permanent Redirect
+--- response_headers
+Location: http://agentzh.org/foo?a=b&c=d
+--- error_code: 308
diff --git a/debian/modules/http-lua/t/023-rewrite/redirect.t b/debian/modules/http-lua/t/023-rewrite/redirect.t
index 99f3fd4..8fa9aa2 100644
--- a/debian/modules/http-lua/t/023-rewrite/redirect.t
+++ b/debian/modules/http-lua/t/023-rewrite/redirect.t
@@ -122,3 +122,43 @@ GET /read
 --- raw_response_headers_like: Location: /foo\r\n
 --- response_body_like: 302 Found
 --- error_code: 302
+
+
+
+=== TEST 7: internal redirects that do not clear module ctx
+--- http_config
+    rewrite_by_lua_no_postpone on;
+--- config
+	rewrite_by_lua_block {
+        -- this is empty by intention
+	}
+
+	location /url1 {
+		rewrite ^ /url2;
+	}
+--- request
+GET /url1
+--- response_body_like: 404 Not Found
+--- error_log eval
+qr{\[error\] .*?/html/url2".*?No such file or directory}
+--- error_code: 404
+
+
+
+=== TEST 8: internal redirects that do not clear module ctx (yield in rewrite handler)
+--- http_config
+    rewrite_by_lua_no_postpone on;
+--- config
+	rewrite_by_lua_block {
+        ngx.sleep(0.001)
+	}
+
+	location /url1 {
+		rewrite ^ /url2;
+	}
+--- request
+GET /url1
+--- response_body_like: 404 Not Found
+--- error_log eval
+qr{\[error\] .*?/html/url2".*?No such file or directory}
+--- error_code: 404
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
index a32ed7b..329c045 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
@@ -63,7 +63,7 @@ GET /t1
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
index bff69a5..41aeab7 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
@@ -329,7 +329,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
index 3df4683..6ebbb67 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
@@ -521,7 +521,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("106.184.1.99", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/http-lua/t/024-access/uthread-exit.t b/debian/modules/http-lua/t/024-access/uthread-exit.t
index 7c146ae..02c2a1f 100644
--- a/debian/modules/http-lua/t/024-access/uthread-exit.t
+++ b/debian/modules/http-lua/t/024-access/uthread-exit.t
@@ -502,7 +502,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("106.184.1.99", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/http-lua/t/025-codecache.t b/debian/modules/http-lua/t/025-codecache.t
index 0b02a27..20791d7 100644
--- a/debian/modules/http-lua/t/025-codecache.t
+++ b/debian/modules/http-lua/t/025-codecache.t
@@ -1111,7 +1111,7 @@ lua tcp socket keepalive max idle timeout
 [
 qq{lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"},
 qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"lua tcp socket keepalive: free connection pool for ",
+qr/\blua tcp socket keepalive: free connection pool [0-9A-F]+ for "127.0.0.1:/,
 ]
 
 
diff --git a/debian/modules/http-lua/t/028-req-header.t b/debian/modules/http-lua/t/028-req-header.t
index 1ebcdff..ca92daa 100644
--- a/debian/modules/http-lua/t/028-req-header.t
+++ b/debian/modules/http-lua/t/028-req-header.t
@@ -8,10 +8,10 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 31);
+plan tests => repeat_each() * (2 * blocks() + 43);
 
 #no_diff();
-#no_long_string();
+no_long_string();
 
 run_tests();
 
@@ -21,8 +21,14 @@ __DATA__
 --- config
     location /req-header {
         content_by_lua '
-            ngx.say("Foo: ", ngx.req.get_headers()["Foo"] or "nil")
-            ngx.say("Bar: ", ngx.req.get_headers()["Bar"] or "nil")
+            local headers, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("Foo: ", headers["Foo"] or "nil")
+            ngx.say("Bar: ", headers["Bar"] or "nil")
         ';
     }
 --- request
@@ -43,8 +49,14 @@ lua exceeding request header limit
 --- config
     location /req-header {
         content_by_lua '
+            local headers, err = ngx.req.get_headers(nil, true)
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             local h = {}
-            for k, v in pairs(ngx.req.get_headers(nil, true)) do
+            for k, v in pairs(headers) do
                 h[k] = v
             end
             ngx.say("Foo: ", h["Foo"] or "nil")
@@ -289,16 +301,43 @@ GET /bar
 --- config
     location /foo {
         content_by_lua '
-            ngx.say("Foo: ", ngx.req.get_headers()["Foo"] or "nil")
+            local headers, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("Foo: ", headers["Foo"] or "nil")
 
             ngx.req.set_header("Foo", 32)
-            ngx.say("Foo 1: ", ngx.req.get_headers()["Foo"] or "nil")
+
+            headers, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("Foo 1: ", headers["Foo"] or "nil")
 
             ngx.req.set_header("Foo", "abc")
-            ngx.say("Foo 2: ", ngx.req.get_headers()["Foo"] or "nil")
+
+            headers, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("Foo 2: ", headers["Foo"] or "nil")
 
             ngx.req.clear_header("Foo")
-            ngx.say("Foo 3: ", ngx.req.get_headers()["Foo"] or "nil")
+
+            headers, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("Foo 3: ", headers["Foo"] or "nil")
         ';
     }
 --- more_headers
@@ -319,7 +358,13 @@ Foo 3: nil
     location /foo {
         content_by_lua '
             collectgarbage()
-            local vals = ngx.req.get_headers()["Foo"]
+            local headers, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            local vals = headers["Foo"]
             ngx.say("value is of type ", type(vals), ".")
             if type(vals) == "table" then
                 ngx.say("Foo takes ", #vals or "nil", " values.")
@@ -386,11 +431,15 @@ Content-Encoding: gzip
 
 
 
-=== TEST 19: default max 100 headers
+=== TEST 19: exceeding default max 100 header limit
 --- config
     location /lua {
         content_by_lua '
-            local headers = ngx.req.get_headers()
+            local headers, err = ngx.req.get_headers()
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(headers) do
                 table.insert(keys, key)
@@ -407,7 +456,7 @@ GET /lua
 --- more_headers eval
 my $i = 1;
 my $s;
-while ($i <= 102) {
+while ($i <= 99) {
     $s .= "X-$i:$i\n";
     $i++;
 }
@@ -427,18 +476,78 @@ for my $k (@k) {
         $k .= ": $&\n";
     }
 }
-CORE::join("", @k);
+"err: truncated\n" . CORE::join("", @k);
 --- timeout: 4
 --- error_log
-lua exceeding request header limit 100
+lua exceeding request header limit 101 > 100
 
 
 
-=== TEST 20: custom max 102 headers
+=== TEST 20: NOT exceeding default max 100 header limit
 --- config
     location /lua {
         content_by_lua '
-            local headers = ngx.req.get_headers(102)
+            local headers, err = ngx.req.get_headers()
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local keys = {}
+            for key, val in pairs(headers) do
+                table.insert(keys, key)
+            end
+
+            table.sort(keys)
+            local cnt = 0
+            for i, key in ipairs(keys) do
+                ngx.say(key, ": ", headers[key])
+                cnt = cnt + 1
+            end
+            ngx.say("found ", cnt, " headers")
+        ';
+    }
+--- request
+GET /lua
+--- more_headers eval
+my $i = 1;
+my $s;
+while ($i <= 98) {
+    $s .= "X-$i:$i\n";
+    $i++;
+}
+$s
+--- response_body eval
+my @k;
+my $i = 1;
+while ($i <= 98) {
+    push @k, "x-$i";
+    $i++;
+}
+push @k, "connection: close\n";
+push @k, "host: localhost\n";
+@k = sort @k;
+for my $k (@k) {
+    if ($k =~ /\d+/) {
+        $k .= ": $&\n";
+    }
+}
+CORE::join("", @k) . "found 100 headers\n";
+--- timeout: 4
+--- no_error_log
+[error]
+lua exceeding request header limit
+
+
+
+=== TEST 21: execeeding custom max 102 header limit
+--- config
+    location /lua {
+        content_by_lua '
+            local headers, err = ngx.req.get_headers(102)
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(headers) do
                 table.insert(keys, key)
@@ -455,7 +564,59 @@ GET /lua
 --- more_headers eval
 my $i = 1;
 my $s;
-while ($i <= 103) {
+while ($i <= 101) {
+    $s .= "X-$i:$i\n";
+    $i++;
+}
+$s
+--- response_body eval
+my @k;
+my $i = 1;
+while ($i <= 100) {
+    push @k, "x-$i";
+    $i++;
+}
+push @k, "connection: close\n";
+push @k, "host: localhost\n";
+@k = sort @k;
+for my $k (@k) {
+    if ($k =~ /\d+/) {
+        $k .= ": $&\n";
+    }
+}
+"err: truncated\n" . CORE::join("", @k);
+--- timeout: 4
+--- error_log
+lua exceeding request header limit 103 > 102
+
+
+
+=== TEST 22: NOT execeeding custom max 102 header limit
+--- config
+    location /lua {
+        content_by_lua '
+            local headers, err = ngx.req.get_headers(102)
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local keys = {}
+            for key, val in pairs(headers) do
+                table.insert(keys, key)
+            end
+
+            table.sort(keys)
+            for i, key in ipairs(keys) do
+                ngx.say(key, ": ", headers[key])
+            end
+        ';
+    }
+--- request
+GET /lua
+--- more_headers eval
+my $i = 1;
+my $s;
+while ($i <= 100) {
     $s .= "X-$i:$i\n";
     $i++;
 }
@@ -477,16 +638,21 @@ for my $k (@k) {
 }
 CORE::join("", @k);
 --- timeout: 4
---- error_log
-lua exceeding request header limit 102
+--- no_error_log
+[error]
+lua exceeding request header limit
 
 
 
-=== TEST 21: custom unlimited headers
+=== TEST 23: custom unlimited headers
 --- config
     location /lua {
         content_by_lua '
-            local headers = ngx.req.get_headers(0)
+            local headers, err = ngx.req.get_headers(0)
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(headers) do
                 table.insert(keys, key)
@@ -528,7 +694,7 @@ CORE::join("", @k);
 
 
 
-=== TEST 22: modify subrequest req headers should not affect the parent
+=== TEST 24: modify subrequest req headers should not affect the parent
 --- config
     location = /main {
         rewrite_by_lua '
@@ -584,7 +750,7 @@ Bar: []
 
 
 
-=== TEST 23: clear_header should clear all the instances of the user custom header
+=== TEST 25: clear_header should clear all the instances of the user custom header
 --- config
     location = /t {
         rewrite_by_lua '
@@ -610,7 +776,7 @@ Test-Header: [1]
 
 
 
-=== TEST 24: clear_header should clear all the instances of the builtin header
+=== TEST 26: clear_header should clear all the instances of the builtin header
 --- config
     location = /t {
         rewrite_by_lua '
@@ -637,7 +803,7 @@ Test-Header: [1]
 
 
 
-=== TEST 25: Converting POST to GET - clearing headers (bug found by Matthieu Tourne, 411 error page)
+=== TEST 27: Converting POST to GET - clearing headers (bug found by Matthieu Tourne, 411 error page)
 --- config
     location /t {
         rewrite_by_lua '
@@ -668,7 +834,7 @@ $/
 
 
 
-=== TEST 26: clear_header() does not duplicate subsequent headers (old bug)
+=== TEST 28: clear_header() does not duplicate subsequent headers (old bug)
 --- config
     location = /t {
         rewrite_by_lua '
@@ -738,13 +904,19 @@ Foo22: foo22\r
 
 
 
-=== TEST 27: iterating through headers (raw form)
+=== TEST 29: iterating through headers (raw form)
 --- config
     location /t {
         content_by_lua '
             local h = {}
             local arr = {}
-            for k, v in pairs(ngx.req.get_headers(nil, true)) do
+            local headers, err = ngx.req.get_headers(nil, true)
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            for k, v in pairs(headers) do
                 h[k] = v
                 table.insert(arr, k)
             end
@@ -767,11 +939,16 @@ My-Foo: bar
 
 
 
-=== TEST 28: __index metamethod not working for "raw" mode
+=== TEST 30: __index metamethod not working for "raw" mode
 --- config
     location /t {
         content_by_lua '
-            local h = ngx.req.get_headers(nil, true)
+            local h, err = ngx.req.get_headers(nil, true)
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             ngx.say("My-Foo-Header: ", h.my_foo_header)
         ';
     }
@@ -784,11 +961,16 @@ My-Foo-Header: nil
 
 
 
-=== TEST 29: __index metamethod not working for the default mode
+=== TEST 31: __index metamethod not working for the default mode
 --- config
     location /t {
         content_by_lua '
-            local h = ngx.req.get_headers()
+            local h, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             ngx.say("My-Foo-Header: ", h.my_foo_header)
         ';
     }
@@ -801,7 +983,7 @@ My-Foo-Header: Hello World
 
 
 
-=== TEST 30: clear input header (just more than 20 headers)
+=== TEST 32: clear input header (just more than 20 headers)
 --- config
     location = /t {
         rewrite_by_lua 'ngx.req.clear_header("R")';
@@ -849,7 +1031,7 @@ Q: q\r
 
 
 
-=== TEST 31: clear input header (just more than 20 headers, and add more)
+=== TEST 33: clear input header (just more than 20 headers, and add more)
 --- config
     location = /t {
         rewrite_by_lua '
@@ -923,7 +1105,7 @@ foo-21: 21\r
 
 
 
-=== TEST 32: clear input header (just more than 21 headers)
+=== TEST 34: clear input header (just more than 21 headers)
 --- config
     location = /t {
         rewrite_by_lua '
@@ -974,7 +1156,7 @@ P: p\r
 
 
 
-=== TEST 33: clear input header (just more than 21 headers)
+=== TEST 35: clear input header (just more than 21 headers)
 --- config
     location = /t {
         rewrite_by_lua '
@@ -1049,21 +1231,27 @@ foo-21: 21\r
 
 
 
-=== TEST 34: raw form
+=== TEST 36: raw form
 --- config
     location /t {
         content_by_lua '
-           -- get ALL the raw headers (0 == no limit, not recommended)
-           local h = {}
-           local arr = {}
-           for k, v in pairs(ngx.req.get_headers(0, true)) do
-               h[k] = v
-               table.insert(arr, k)
-           end
-           table.sort(arr)
-           for i, k in ipairs(arr) do
-               ngx.say(k, ": ", h[k])
-           end
+            local headers, err = ngx.req.get_headers(0, true)
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            -- get ALL the raw headers (0 == no limit, not recommended)
+            local h = {}
+            local arr = {}
+            for k, v in pairs(headers) do
+                h[k] = v
+                table.insert(arr, k)
+            end
+            table.sort(arr)
+            for i, k in ipairs(arr) do
+                ngx.say(k, ": ", h[k])
+            end
         ';
     }
 --- request
@@ -1081,7 +1269,7 @@ My-Foo: bar
 
 
 
-=== TEST 35: clear X-Real-IP
+=== TEST 37: clear X-Real-IP
 --- config
     location /t {
         rewrite_by_lua '
@@ -1127,7 +1315,7 @@ X-Real-IP:
 
 
 
-=== TEST 36: set custom X-Real-IP
+=== TEST 38: set custom X-Real-IP
 --- config
     location /t {
         rewrite_by_lua '
@@ -1172,7 +1360,7 @@ X-Real-IP: 8.8.4.4
 
 
 
-=== TEST 37: clear Via
+=== TEST 39: clear Via
 --- config
     location /t {
         rewrite_by_lua '
@@ -1218,7 +1406,7 @@ Via:
 
 
 
-=== TEST 38: set custom Via
+=== TEST 40: set custom Via
 --- config
     location /t {
         rewrite_by_lua '
@@ -1263,7 +1451,7 @@ Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
 
 
 
-=== TEST 39: set input header (with underscores in the header name)
+=== TEST 41: set input header (with underscores in the header name)
 --- config
     location /req-header {
         rewrite_by_lua '
@@ -1286,12 +1474,18 @@ $}
 
 
 
-=== TEST 40: HTTP 0.9 (set & get)
+=== TEST 42: HTTP 0.9 (set & get)
 --- config
     location /foo {
         content_by_lua '
             ngx.req.set_header("X-Foo", "howdy");
-            ngx.say("X-Foo: ", ngx.req.get_headers()["X-Foo"])
+            local headers, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("X-Foo: ", headers["X-Foo"])
         ';
     }
 --- raw_request eval
@@ -1306,12 +1500,18 @@ X-Foo: nil
 
 
 
-=== TEST 41: HTTP 0.9 (clear)
+=== TEST 43: HTTP 0.9 (clear)
 --- config
     location /foo {
         content_by_lua '
             ngx.req.set_header("X-Foo", "howdy");
-            ngx.say("X-Foo: ", ngx.req.get_headers()["X-Foo"])
+            local headers, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say("X-Foo: ", headers["X-Foo"])
         ';
     }
 --- raw_request eval
@@ -1326,7 +1526,7 @@ X-Foo: nil
 
 
 
-=== TEST 42: Host header with port and $host (github issue #292)
+=== TEST 44: Host header with port and $host (github issue #292)
 --- config
     location /bar {
         rewrite_by_lua '
@@ -1343,7 +1543,7 @@ http_host var: agentzh.org:1984
 
 
 
-=== TEST 43: Host header with upper case letters and $host (github issue #292)
+=== TEST 45: Host header with upper case letters and $host (github issue #292)
 --- config
     location /bar {
         rewrite_by_lua '
@@ -1360,11 +1560,16 @@ http_host var: agentZH.org:1984
 
 
 
-=== TEST 44: clear all and re-insert
+=== TEST 46: clear all and re-insert
 --- config
     location = /t {
         content_by_lua '
-            local headers = ngx.req.get_headers(100, true)
+            local headers, err = ngx.req.get_headers(100, true)
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             local n = 0
             for header, _ in pairs(headers) do
                 n = n + 1
@@ -1377,7 +1582,13 @@ http_host var: agentZH.org:1984
                 print("1: reinsert header ", header, ": ", i)
                 ngx.req.set_header(header, value)
             end
-            local headers = ngx.req.get_headers(100, true)
+
+            headers, err = ngx.req.get_headers(100, true)
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             n = 0
             for header, _ in pairs(headers) do
                 n = n + 1
@@ -1417,13 +1628,18 @@ got 8 headers
 
 
 
-=== TEST 45: github issue #314: ngx.req.set_header does not override request headers with multiple values
+=== TEST 47: github issue #314: ngx.req.set_header does not override request headers with multiple values
 --- config
     #lua_code_cache off;
     location = /t {
         content_by_lua '
             ngx.req.set_header("AAA", "111")
-            local headers = ngx.req.get_headers()
+            local headers, err = ngx.req.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
             ngx.say(headers["AAA"])
         ';
     }
@@ -1441,7 +1657,7 @@ AAA: 678
 
 
 
-=== TEST 46: clear If-Match req header
+=== TEST 48: clear If-Match req header
 --- config
     location /t {
         content_by_lua '
@@ -1463,7 +1679,7 @@ test
 
 
 
-=== TEST 47: clear If-Unmodified-Since req header
+=== TEST 49: clear If-Unmodified-Since req header
 --- config
     location /t {
         content_by_lua '
@@ -1486,7 +1702,7 @@ test
 
 
 
-=== TEST 48: clear If-None-Match req header
+=== TEST 50: clear If-None-Match req header
 --- config
     location /t {
         content_by_lua '
@@ -1509,7 +1725,7 @@ test
 
 
 
-=== TEST 49: set the Destination request header for WebDav
+=== TEST 51: set the Destination request header for WebDav
 --- config
     location = /a.txt {
         rewrite_by_lua_block {
@@ -1535,7 +1751,7 @@ client sent no "Destination" header
 
 
 
-=== TEST 50: X-Forwarded-For
+=== TEST 52: X-Forwarded-For
 --- config
     location = /t {
         access_by_lua_block {
@@ -1559,7 +1775,7 @@ Foo: 8.8.8.8, 127.0.0.1
 
 
 
-=== TEST 51: X-Forwarded-For
+=== TEST 53: X-Forwarded-For
 --- config
     location = /t {
         access_by_lua_block {
@@ -1585,7 +1801,7 @@ Foo: 127.0.0.1
 
 
 
-=== TEST 52: for bad requests (bad request method letter case)
+=== TEST 54: for bad requests (bad request method letter case)
 --- config
     error_page 400 = /err;
 
@@ -1605,7 +1821,7 @@ ok
 
 
 
-=== TEST 53: for bad requests (bad request method names)
+=== TEST 55: for bad requests (bad request method names)
 --- config
     error_page 400 = /err;
 
@@ -1625,7 +1841,7 @@ ok
 
 
 
-=== TEST 54: for bad requests causing segfaults when setting & getting multi-value headers
+=== TEST 56: for bad requests causing segfaults when setting & getting multi-value headers
 --- config
     error_page 400 = /err;
 
@@ -1644,3 +1860,151 @@ ok
 --- no_error_log
 [error]
 --- no_check_leak
+
+
+
+=== TEST 57: execeeding custom 3 header limit
+--- config
+    location /lua {
+        content_by_lua '
+            local headers, err = ngx.req.get_headers(3)
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local cnt = 0
+            for key, val in pairs(headers) do
+                cnt = cnt + 1
+            end
+
+            ngx.say("found ", cnt, " headers.");
+        ';
+    }
+--- request
+GET /lua
+--- more_headers eval
+my $i = 1;
+my $s;
+while ($i <= 2) {
+    $s .= "X-$i:$i\n";
+    $i++;
+}
+$s
+--- response_body
+err: truncated
+found 3 headers.
+--- timeout: 4
+--- error_log
+lua exceeding request header limit 4 > 3
+--- no_error_log
+[error]
+
+
+
+=== TEST 58: NOT execeeding custom 3 header limit
+--- config
+    location /lua {
+        content_by_lua '
+            local headers, err = ngx.req.get_headers(3)
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local cnt = 0
+            for key, val in pairs(headers) do
+                cnt = cnt + 1
+            end
+
+            ngx.say("found ", cnt, " headers.");
+        ';
+    }
+--- request
+GET /lua
+--- more_headers eval
+my $i = 1;
+my $s;
+while ($i <= 1) {
+    $s .= "X-$i:$i\n";
+    $i++;
+}
+$s
+--- response_body
+found 3 headers.
+--- timeout: 4
+--- no_error_log
+lua exceeding request header limit
+[error]
+
+
+
+=== TEST 59: execeeding custom 3 header limit (raw)
+--- config
+    location /lua {
+        content_by_lua '
+            local headers, err = ngx.req.get_headers(3, true)
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local cnt = 0
+            for key, val in pairs(headers) do
+                cnt = cnt + 1
+            end
+
+            ngx.say("found ", cnt, " headers.");
+        ';
+    }
+--- request
+GET /lua
+--- more_headers eval
+my $i = 1;
+my $s;
+while ($i <= 2) {
+    $s .= "X-$i:$i\n";
+    $i++;
+}
+$s
+--- response_body
+err: truncated
+found 3 headers.
+--- timeout: 4
+--- error_log
+lua exceeding request header limit 4 > 3
+--- no_error_log
+[error]
+
+
+
+=== TEST 60: NOT execeeding custom 3 header limit (raw)
+--- config
+    location /lua {
+        content_by_lua '
+            local headers, err = ngx.req.get_headers(3, true)
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            local cnt = 0
+            for key, val in pairs(headers) do
+                cnt = cnt + 1
+            end
+
+            ngx.say("found ", cnt, " headers.");
+        ';
+    }
+--- request
+GET /lua
+--- more_headers eval
+my $i = 1;
+my $s;
+while ($i <= 1) {
+    $s .= "X-$i:$i\n";
+    $i++;
+}
+$s
+--- response_body
+found 3 headers.
+--- timeout: 4
+--- no_error_log
+lua exceeding request header limit
+[error]
diff --git a/debian/modules/http-lua/t/030-uri-args.t b/debian/modules/http-lua/t/030-uri-args.t
index 96e216c..a9d46ff 100644
--- a/debian/modules/http-lua/t/030-uri-args.t
+++ b/debian/modules/http-lua/t/030-uri-args.t
@@ -24,7 +24,12 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -49,7 +54,12 @@ c = true
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -74,7 +84,12 @@ foo = true
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -87,7 +102,12 @@ foo = true
 
             ngx.say("again...")
 
-            args = ngx.req.get_uri_args()
+            args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -114,7 +134,12 @@ b r = 4a 2
 --- config
     location /t {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -139,7 +164,12 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -164,7 +194,12 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -195,7 +230,12 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -227,7 +267,12 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             -- ngx.say(args)
             for key, val in pairs(args) do
@@ -253,7 +298,12 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             -- ngx.say(args)
             for key, val in pairs(args) do
@@ -280,7 +330,12 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -305,7 +360,12 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -320,7 +380,12 @@ done
 
             ngx.var.args = "a=3&b=4"
 
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -768,7 +833,12 @@ rc: false, err: bad argument #1 to '?' (table expected, got boolean)
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args(2)
+            local args, err = ngx.req.get_uri_args(2)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -783,6 +853,7 @@ rc: false, err: bad argument #1 to '?' (table expected, got boolean)
 --- request
 GET /lua?foo=3&bar=4&baz=2
 --- response_body
+err: truncated
 bar = 4
 foo = 3
 --- error_log
@@ -795,7 +866,12 @@ lua hit query args limit 2
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args(2)
+            local args, err = ngx.req.get_uri_args(2)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -810,6 +886,7 @@ lua hit query args limit 2
 --- request
 GET /lua?foo=3&bar&baz=2
 --- response_body
+err: truncated
 bar = true
 foo = 3
 --- error_log
@@ -822,7 +899,12 @@ lua hit query args limit 2
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args(2)
+            local args, err = ngx.req.get_uri_args(2)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -839,6 +921,7 @@ lua hit query args limit 2
 --- request
 GET /lua?foo=3&=hello&=world
 --- response_body
+err: truncated
 foo = 3
 done
 --- error_log
@@ -851,7 +934,12 @@ lua hit query args limit 2
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -887,7 +975,8 @@ for my $k (@k) {
         $k .= " = $&\n";
     }
 }
-CORE::join("", @k);
+
+"err: truncated\n" . CORE::join("", @k);
 --- timeout: 4
 --- error_log
 lua hit query args limit 100
@@ -899,7 +988,12 @@ lua hit query args limit 100
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args(102)
+            local args, err = ngx.req.get_uri_args(102)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -935,7 +1029,8 @@ for my $k (@k) {
         $k .= " = $&\n";
     }
 }
-CORE::join("", @k);
+
+"err: truncated\n" . CORE::join("", @k);
 --- timeout: 4
 --- error_log
 lua hit query args limit 102
@@ -947,7 +1042,12 @@ lua hit query args limit 102
 --- config
     location /lua {
         content_by_lua '
-            local args = ngx.req.get_uri_args(0)
+            local args, err = ngx.req.get_uri_args(0)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -1013,7 +1113,12 @@ HTTP/1.0 a=3&b=5&b=6
     location /lua {
         content_by_lua '
             local args = "a=bar&b=foo"
-            args = ngx.decode_args(args)
+            args, err = ngx.decode_args(args)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             ngx.say("a = ", args.a)
             ngx.say("b = ", args.b)
         ';
@@ -1031,7 +1136,12 @@ b = foo
     location /lua {
         content_by_lua '
             local args = "a=bar&b=foo&a=baz"
-            args = ngx.decode_args(args)
+            args, err = ngx.decode_args(args)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             ngx.say("a = ", table.concat(args.a, ", "))
             ngx.say("b = ", args.b)
         ';
@@ -1049,7 +1159,11 @@ b = foo
     location /lua {
         content_by_lua '
             local args = ""
-            args = ngx.decode_args(args)
+            args, err = ngx.decode_args(args)
+            if err then
+                ngx.say("err: ", err)
+            end
+
             ngx.say("n = ", #args)
         ';
     }
@@ -1065,7 +1179,11 @@ n = 0
     location /lua {
         content_by_lua '
             local args = "a&b"
-            args = ngx.decode_args(args)
+            args, err = ngx.decode_args(args)
+            if err then
+                ngx.say("err: ", err)
+            end
+
             ngx.say("a = ", args.a)
             ngx.say("b = ", args.b)
         ';
@@ -1083,7 +1201,12 @@ b = true
     location /lua {
         content_by_lua '
             local args = "a=&b="
-            args = ngx.decode_args(args)
+            args, err = ngx.decode_args(args)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             ngx.say("a = ", args.a)
             ngx.say("b = ", args.b)
         ';
@@ -1101,7 +1224,11 @@ b =
     location /lua {
         content_by_lua '
             local args = "a=bar&b=foo"
-            args = ngx.decode_args(args, 1)
+            args, err = ngx.decode_args(args, 1)
+            if err then
+                ngx.say("err: ", err)
+            end
+
             ngx.say("a = ", args.a)
             ngx.say("b = ", args.b)
         ';
@@ -1109,6 +1236,7 @@ b =
 --- request
 GET /lua
 --- response_body
+err: truncated
 a = bar
 b = nil
 
@@ -1119,7 +1247,12 @@ b = nil
     location /lua {
         content_by_lua '
             local args = "a=bar&b=foo"
-            args = ngx.decode_args(args, -1)
+            args, err = ngx.decode_args(args, -1)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             ngx.say("a = ", args.a)
             ngx.say("b = ", args.b)
         ';
@@ -1137,7 +1270,11 @@ b = foo
     location /lua {
         content_by_lua '
             local s = "f+f=bar&B=foo"
-            args = ngx.decode_args(s)
+            args, err = ngx.decode_args(s)
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local arr = {}
             for k, v in pairs(args) do
                 table.insert(arr, k)
@@ -1183,7 +1320,11 @@ s = f+f=bar&B=foo
             local commands = split(post_data, "||")
             for _, command in pairs(commands) do
                 --command = ngx.unescape_uri(command)
-                local request_args = ngx.decode_args(command, 0)
+                local request_args, err = ngx.decode_args(command, 0)
+                if err then
+                    ngx.say("err: ", err)
+                end
+
                 local arr = {}
                 for k, v in pairs(request_args) do
                     table.insert(arr, k)
diff --git a/debian/modules/http-lua/t/031-post-args.t b/debian/modules/http-lua/t/031-post-args.t
index 62c88c1..4659f05 100644
--- a/debian/modules/http-lua/t/031-post-args.t
+++ b/debian/modules/http-lua/t/031-post-args.t
@@ -11,7 +11,7 @@ repeat_each(2);
 plan tests => repeat_each() * (blocks() * 2 + 6);
 
 #no_diff();
-#no_long_string();
+no_long_string();
 run_tests();
 
 __DATA__
@@ -21,7 +21,12 @@ __DATA__
     location /lua {
         lua_need_request_body on;
         content_by_lua '
-            local args = ngx.req.get_post_args()
+            local args, err = ngx.req.get_post_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -48,7 +53,12 @@ c = true
     location /lua {
         lua_need_request_body off;
         content_by_lua '
-            local args = ngx.req.get_post_args()
+            local args, err = ngx.req.get_post_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -73,7 +83,12 @@ a=3&b=4&c
     location /lua {
         lua_need_request_body on;
         content_by_lua '
-            local args = ngx.req.get_post_args()
+            local args, err = ngx.req.get_post_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -101,7 +116,12 @@ POST /lua
     location /lua {
         content_by_lua '
             ngx.req.read_body();
-            local args = ngx.req.get_post_args(2)
+            local args, err = ngx.req.get_post_args(2)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -117,6 +137,7 @@ POST /lua
 POST /lua
 foo=3&bar=4&baz=2
 --- response_body
+err: truncated
 bar = 4
 foo = 3
 --- error_log
@@ -129,7 +150,12 @@ lua hit query args limit 2
     location /lua {
         content_by_lua '
             ngx.req.read_body();
-            local args = ngx.req.get_post_args(2)
+            local args, err = ngx.req.get_post_args(2)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -145,6 +171,7 @@ lua hit query args limit 2
 POST /lua
 foo=3&bar&baz=2
 --- response_body
+err: truncated
 bar = true
 foo = 3
 --- error_log
@@ -157,7 +184,12 @@ lua hit query args limit 2
     location /lua {
         content_by_lua '
             ngx.req.read_body();
-            local args = ngx.req.get_post_args(2)
+            local args, err = ngx.req.get_post_args(2)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -175,6 +207,7 @@ lua hit query args limit 2
 POST /lua
 foo=3&=hello&=world
 --- response_body
+err: truncated
 foo = 3
 done
 --- error_log
@@ -187,7 +220,12 @@ lua hit query args limit 2
     location /lua {
         content_by_lua '
             ngx.req.read_body();
-            local args = ngx.req.get_post_args()
+            local args, err = ngx.req.get_post_args()
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -223,7 +261,7 @@ for my $k (@k) {
         $k .= " = $&\n";
     }
 }
-CORE::join("", @k);
+"err: truncated\n" . CORE::join("", @k);
 --- timeout: 4
 --- error_log
 lua hit query args limit 100
@@ -235,7 +273,12 @@ lua hit query args limit 100
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            local args = ngx.req.get_post_args(102)
+            local args, err = ngx.req.get_post_args(102)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -271,7 +314,7 @@ for my $k (@k) {
         $k .= " = $&\n";
     }
 }
-CORE::join("", @k);
+"err: truncated\n" . CORE::join("", @k);
 --- timeout: 4
 --- error_log
 lua hit query args limit 102
@@ -283,7 +326,12 @@ lua hit query args limit 102
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            local args = ngx.req.get_post_args(0)
+            local args, err = ngx.req.get_post_args(0)
+
+            if err then
+                ngx.say("err: ", err)
+            end
+
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
@@ -332,9 +380,11 @@ CORE::join("", @k);
         content_by_lua_block {
             local args, err = ngx.req.get_post_args()
 
-            if not args then
-                ngx.say(err)
-            else
+            if err then
+                ngx.say("err: ", err)
+            end
+
+            if args then
                 local keys = {}
                 for key, val in pairs(args) do
                     table.insert(keys, key)
@@ -351,6 +401,6 @@ CORE::join("", @k);
 POST /lua
 a=3&b=4&c
 --- response_body
-request body in temp file not supported
+err: request body in temp file not supported
 --- no_error_log
 [error]
diff --git a/debian/modules/http-lua/t/041-header-filter.t b/debian/modules/http-lua/t/041-header-filter.t
index 9cca3b7..7d8ee74 100644
--- a/debian/modules/http-lua/t/041-header-filter.t
+++ b/debian/modules/http-lua/t/041-header-filter.t
@@ -254,7 +254,11 @@ uid: 33
 
         header_filter_by_lua '
             local str = "";
-            local args = ngx.req.get_uri_args()
+            local args, err = ngx.req.get_uri_args()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
             local keys = {}
             for key, val in pairs(args) do
                 table.insert(keys, key)
diff --git a/debian/modules/http-lua/t/044-req-body.t b/debian/modules/http-lua/t/044-req-body.t
index 28fa818..e645eee 100644
--- a/debian/modules/http-lua/t/044-req-body.t
+++ b/debian/modules/http-lua/t/044-req-body.t
@@ -727,7 +727,13 @@ hello, world"]
     }
 --- user_files
 >>> myscript.lua
-    local data, data2 = ngx.req.get_post_args(), {}
+    local data, err = ngx.req.get_post_args()
+    if err then
+        ngx.log(ngx.ERR, "err: ", err)
+        return ngx.exit(500)
+    end
+
+    local data2 = {}
     for k, v in pairs(data) do
         if type(v) == "table" then
             for i, val in ipairs(v) do
diff --git a/debian/modules/http-lua/t/058-tcp-socket.t b/debian/modules/http-lua/t/058-tcp-socket.t
index 0743dd7..354a876 100644
--- a/debian/modules/http-lua/t/058-tcp-socket.t
+++ b/debian/modules/http-lua/t/058-tcp-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 193;
+plan tests => repeat_each() * 199;
 
 our $HtmlDir = html_dir;
 
@@ -321,7 +321,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -3727,3 +3727,84 @@ failed to connect: www.google.com could not be resolved
 hello!
 --- error_log eval
 qr{\[alert\] .*? send\(\) failed \(\d+: Operation not permitted\) while resolving}
+
+
+
+=== TEST 62: the upper bound of port range should be 2^16 - 1
+--- config
+    location /t {
+        content_by_lua_block {
+            local sock, err = ngx.socket.connect("127.0.0.1", 65536)
+            if not sock then
+                ngx.say("failed to connect: ", err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+failed to connect: bad port number: 65536
+--- no_error_log
+[error]
+
+
+
+=== TEST 63: send boolean and nil
+--- config
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua_block {
+            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
+
+            local function send(data)
+                local bytes, err = sock:send(data)
+                if not bytes then
+                    ngx.say("failed to send request: ", err)
+                    return
+                end
+            end
+
+            local req = "GET /foo HTTP/1.0\r\nHost: localhost\r\nConnection: close\r\nTest: "
+            send(req)
+            send(true)
+            send(false)
+            send(nil)
+            send("\r\n\r\n")
+
+            while true do
+                local line, err, part = sock:receive()
+                if line then
+                    ngx.say("received: ", line)
+                else
+                    break
+                end
+            end
+
+            ok, err = sock:close()
+        }
+    }
+
+    location /foo {
+        server_tokens off;
+        more_clear_headers Date;
+        echo $http_test;
+    }
+
+--- request
+GET /t
+--- response_body
+received: HTTP/1.1 200 OK
+received: Server: nginx
+received: Content-Type: text/plain
+received: Connection: close
+received: 
+received: truefalsenil
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/062-count.t b/debian/modules/http-lua/t/062-count.t
index a69c33e..2ad2f9f 100644
--- a/debian/modules/http-lua/t/062-count.t
+++ b/debian/modules/http-lua/t/062-count.t
@@ -34,7 +34,7 @@ __DATA__
 --- request
 GET /test
 --- response_body
-ngx: 116
+ngx: 117
 --- no_error_log
 [error]
 
@@ -55,7 +55,7 @@ ngx: 116
 --- request
 GET /test
 --- response_body
-116
+117
 --- no_error_log
 [error]
 
@@ -83,7 +83,7 @@ GET /test
 --- request
 GET /test
 --- response_body
-n = 116
+n = 117
 --- no_error_log
 [error]
 
@@ -305,7 +305,7 @@ GET /t
 --- response_body_like: 404 Not Found
 --- error_code: 404
 --- error_log
-ngx. entry count: 116
+ngx. entry count: 117
 
 
 
@@ -494,3 +494,77 @@ GET /test
 n = 6
 --- no_error_log
 [error]
+
+
+
+=== TEST 22: entries under the req raw sockets
+--- config
+        location = /test {
+            content_by_lua_block {
+                local narr = 0
+                local nrec = 0
+                ngx.req.read_body()
+                local sock, err = ngx.req.socket(true)
+                if not sock then
+                    ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
+                    return
+                end
+                sock:settimeouts(1000, 2000, 3000)
+                for k, v in ipairs(sock) do
+                    narr = narr + 1
+                end
+                for k, v in pairs(sock) do
+                    nrec = nrec + 1
+                end
+                -- include '__index'
+                nrec = nrec - narr + 1
+
+                local ok, err = sock:send("HTTP/1.1 200 OK\r\n\r\nnarr = "..narr.."\nnrec = "..nrec.."\n")
+                if not ok then
+                    ngx.log(ngx.ERR, "failed to send: ", err)
+                    return
+                end
+            }
+        }
+--- request
+GET /test
+--- response_body
+narr = 2
+nrec = 3
+--- no_error_log
+[error]
+
+
+
+=== TEST 23: entries under the req sockets
+--- config
+        location = /test {
+            content_by_lua_block {
+                local narr = 0
+                local nrec = 0
+                local sock, err = ngx.req.socket()
+                if not sock then
+                    ngx.log(ngx.ERR, "server: failed to get req socket: ", err)
+                    return
+                end
+                sock:settimeouts(1000, 2000, 3000)
+                for k, v in ipairs(sock) do
+                    narr = narr + 1
+                end
+                for k, v in pairs(sock) do
+                    nrec = nrec + 1
+                end
+                -- include '__index'
+                nrec = nrec - narr + 1
+
+                ngx.say("narr = "..narr.."\nnrec = "..nrec)
+            }
+        }
+--- request
+POST /test
+hello world
+--- response_body
+narr = 2
+nrec = 3
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/065-tcp-socket-timeout.t b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
index 9e5460e..78b8cff 100644
--- a/debian/modules/http-lua/t/065-tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
@@ -66,7 +66,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -96,7 +96,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 150
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -125,7 +125,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 
 
 
@@ -154,7 +154,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -707,7 +707,7 @@ GET /t
 2: connected: 1
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
diff --git a/debian/modules/http-lua/t/087-udp-socket.t b/debian/modules/http-lua/t/087-udp-socket.t
index a847031..8bedc32 100644
--- a/debian/modules/http-lua/t/087-udp-socket.t
+++ b/debian/modules/http-lua/t/087-udp-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (3 * blocks() + 13);
+plan tests => repeat_each() * (3 * blocks() + 14);
 
 our $HtmlDir = html_dir;
 
@@ -1104,3 +1104,73 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 --- no_error_log
 [alert]
+
+
+
+=== TEST 20: the upper bound of port range should be 2^16 - 1
+--- config
+    location /t {
+        content_by_lua_block {
+            local sock = ngx.socket.udp()
+            local ok, err = sock:setpeername("127.0.0.1", 65536)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+failed to connect: bad port number: 65536
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: send boolean and nil
+--- config
+    server_tokens off;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local socket = ngx.socket
+            local udp = socket.udp()
+            local port = ngx.var.port
+            udp:settimeout(1000) -- 1 sec
+
+            local ok, err = udp:setpeername("127.0.0.1", ngx.var.port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local function send(data)
+                local bytes, err = udp:send(data)
+                if not bytes then
+                    ngx.say("failed to send: ", err)
+                    return
+                end
+                ngx.say("sent ok")
+            end
+
+            send(true)
+            send(false)
+            send(nil)
+        }
+    }
+--- request
+GET /t
+--- response_body
+sent ok
+sent ok
+sent ok
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/send: fd:\d+ \d+ of \d+/
+--- grep_error_log_out eval
+qr/send: fd:\d+ 4 of 4
+send: fd:\d+ 5 of 5
+send: fd:\d+ 3 of 3/
+--- log_level: debug
diff --git a/debian/modules/http-lua/t/090-log-socket-errors.t b/debian/modules/http-lua/t/090-log-socket-errors.t
index 8e498cd..16576b6 100644
--- a/debian/modules/http-lua/t/090-log-socket-errors.t
+++ b/debian/modules/http-lua/t/090-log-socket-errors.t
@@ -59,7 +59,7 @@ GET /t
 --- response_body
 timeout
 --- error_log
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 
 
 
diff --git a/debian/modules/http-lua/t/094-uthread-exit.t b/debian/modules/http-lua/t/094-uthread-exit.t
index a623773..2f7d9ba 100644
--- a/debian/modules/http-lua/t/094-uthread-exit.t
+++ b/debian/modules/http-lua/t/094-uthread-exit.t
@@ -501,7 +501,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("106.184.1.99", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/http-lua/t/104-req-raw-header.t b/debian/modules/http-lua/t/104-req-raw-header.t
index efea03c..ac1f89e 100644
--- a/debian/modules/http-lua/t/104-req-raw-header.t
+++ b/debian/modules/http-lua/t/104-req-raw-header.t
@@ -876,3 +876,115 @@ Foo: bar\r
 --- no_error_log
 [error]
 --- timeout: 5
+
+
+
+=== TEST 30: large headers (using single LF as line break)
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.print(ngx.req.raw_header())
+        }
+    }
+
+--- raw_request eval
+"GET /t HTTP/1.1
+Host: localhost
+Connection: close
+".
+(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
+
+--- response_body eval
+qq{GET /t HTTP/1.1
+Host: localhost
+Connection: close
+}
+.(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
+
+--- no_error_log
+[error]
+--- timeout: 5
+
+
+
+=== TEST 31: large headers without request line (using single LF as line break)
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.print(ngx.req.raw_header(true))
+        }
+    }
+
+--- raw_request eval
+"GET /t HTTP/1.1
+Host: localhost
+Connection: close
+".
+(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
+
+--- response_body eval
+qq{Host: localhost
+Connection: close
+}
+.(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
+
+--- no_error_log
+[error]
+--- timeout: 5
+
+
+
+=== TEST 32: large headers with leading CRLF (using single LF as line break)
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.print(ngx.req.raw_header())
+        }
+    }
+
+--- raw_request eval
+"\r
+GET /t HTTP/1.1
+Host: localhost
+Connection: close
+".
+(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
+
+--- response_body eval
+qq{GET /t HTTP/1.1
+Host: localhost
+Connection: close
+}
+.(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
+
+--- no_error_log
+[error]
+--- timeout: 5
+
+
+
+=== TEST 33: large headers without request line but contains leading CRLF (using single LF as line break)
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.print(ngx.req.raw_header(true))
+        }
+    }
+
+--- raw_request eval
+"\r
+GET /t HTTP/1.1
+Host: localhost
+Connection: close
+".
+(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
+
+--- response_body eval
+qq{Host: localhost
+Connection: close
+}
+.(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
+
+--- no_error_log
+[error]
+--- timeout: 5
diff --git a/debian/modules/http-lua/t/124-init-worker.t b/debian/modules/http-lua/t/124-init-worker.t
index 22a943e..9b2a91f 100644
--- a/debian/modules/http-lua/t/124-init-worker.t
+++ b/debian/modules/http-lua/t/124-init-worker.t
@@ -3,13 +3,13 @@
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
-#master_on();
+master_on();
 #workers(2);
 #log_level('warn');
 
 repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 4);
+plan tests => repeat_each() * (blocks() * 4 + 4);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
@@ -756,3 +756,200 @@ GET /t
 ok
 --- no_error_log
 [error]
+
+
+
+=== TEST 20: destroy Lua VM in cache processes (without privileged agent or shdict)
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+
+    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
+
+    #lua_shared_dict dummy 500k;
+
+    init_by_lua_block {
+        require "resty.core.regex"
+        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
+        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
+    }
+
+--- config
+    location = /t {
+        return 200;
+    }
+--- request
+    GET /t
+--- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
+--- grep_error_log_out eval
+qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
+lua close the global Lua VM \1
+lua close the global Lua VM \1 in the cache helper process \d+
+lua close the global Lua VM \1
+|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
+lua close the global Lua VM \2 in the cache helper process \d+
+lua close the global Lua VM \2
+lua close the global Lua VM \2
+)(?:lua close the global Lua VM [0-9A-F]+
+)*\z/
+--- no_error_log
+[error]
+start privileged agent process
+
+
+
+=== TEST 21: destroy Lua VM in cache processes (without privileged agent but with shdict)
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+
+    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
+
+    lua_shared_dict dummy 500k;
+
+    init_by_lua_block {
+        require "resty.core.regex"
+        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
+        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
+    }
+
+--- config
+    location = /t {
+        return 200;
+    }
+--- request
+    GET /t
+--- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
+--- grep_error_log_out eval
+qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
+lua close the global Lua VM \1
+lua close the global Lua VM \1 in the cache helper process \d+
+lua close the global Lua VM \1
+|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
+lua close the global Lua VM \2 in the cache helper process \d+
+lua close the global Lua VM \2
+lua close the global Lua VM \2
+)(?:lua close the global Lua VM [0-9A-F]+
+)*\z/
+--- no_error_log
+[error]
+start privileged agent process
+
+
+
+=== TEST 22: destroy Lua VM in cache processes (with privileged agent)
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+
+    #lua_shared_dict dogs 1m;
+
+    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
+
+    init_by_lua_block {
+        assert(require "ngx.process".enable_privileged_agent())
+        require "resty.core.regex"
+        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
+        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
+    }
+
+--- config
+    location = /t {
+        return 200;
+    }
+--- request
+    GET /t
+--- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
+--- grep_error_log_out eval
+qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
+lua close the global Lua VM \1
+lua close the global Lua VM \1 in the cache helper process \d+
+lua close the global Lua VM \1
+|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
+lua close the global Lua VM \2 in the cache helper process \d+
+lua close the global Lua VM \2
+lua close the global Lua VM \2
+)(?:lua close the global Lua VM [0-9A-F]+
+)*\z/
+--- error_log eval
+qr/start privileged agent process \d+/
+--- no_error_log
+[error]
+
+
+
+=== TEST 23: destroy Lua VM in cache processes (with init worker and privileged agent)
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+
+    #lua_shared_dict dogs 1m;
+
+    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
+
+    init_by_lua_block {
+        assert(require "ngx.process".enable_privileged_agent())
+        require "resty.core.regex"
+        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
+        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
+    }
+
+    init_worker_by_lua_block {
+        ngx.log(ngx.WARN, "hello from init worker by lua")
+    }
+
+--- config
+    location = /t {
+        return 200;
+    }
+--- request
+    GET /t
+--- grep_error_log eval: qr/hello from init worker by lua/
+--- grep_error_log_out
+hello from init worker by lua
+hello from init worker by lua
+
+--- error_log eval
+[
+qr/start privileged agent process \d+$/,
+qr/lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+$/,
+qr/lua close the global Lua VM ([0-9A-F]+)$/,
+]
+--- no_error_log
+[error]
+
+
+
+=== TEST 24: destroy Lua VM in cache processes (with init worker but without privileged agent)
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+
+    #lua_shared_dict dogs 1m;
+
+    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
+
+    init_by_lua_block {
+        require "resty.core.regex"
+        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
+        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
+    }
+
+    init_worker_by_lua_block {
+        ngx.log(ngx.WARN, "hello from init worker by lua")
+    }
+
+--- config
+    location = /t {
+        return 200;
+    }
+--- request
+    GET /t
+
+--- grep_error_log eval: qr/hello from init worker by lua/
+--- grep_error_log_out
+hello from init worker by lua
+
+--- error_log eval
+[
+qr/lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+$/,
+qr/lua close the global Lua VM ([0-9A-F]+)$/,
+]
+--- no_error_log
+[error]
+start privileged agent process
diff --git a/debian/modules/http-lua/t/128-duplex-tcp-socket.t b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
index e8434a3..aed560c 100644
--- a/debian/modules/http-lua/t/128-duplex-tcp-socket.t
+++ b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
@@ -396,7 +396,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("106.184.1.99", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
diff --git a/debian/modules/http-lua/t/129-ssl-socket.t b/debian/modules/http-lua/t/129-ssl-socket.t
index e7447a7..3f05640 100644
--- a/debian/modules/http-lua/t/129-ssl-socket.t
+++ b/debian/modules/http-lua/t/129-ssl-socket.t
@@ -4,12 +4,13 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 217;
+plan tests => repeat_each() * 211;
 
 $ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
+$ENV{TEST_NGINX_SERVER_SSL_PORT} ||= 12345;
 
 #log_level 'warn';
 log_level 'debug';
@@ -26,7 +27,7 @@ sub read_file {
     $cert;
 }
 
-our $ComodoRootCertificate = read_file("t/cert/comodo-ca.crt");
+our $DSTRootCertificate = read_file("t/cert/dst-ca.crt");
 our $EquifaxRootCertificate = read_file("t/cert/equifax.crt");
 our $TestCertificate = read_file("t/cert/test.crt");
 our $TestCertificateKey = read_file("t/cert/test.key");
@@ -108,10 +109,10 @@ sent http request: 59 bytes.
 received: HTTP/1.1 (?:200 OK|302 Found)
 close: 1 nil
 \z
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 --- no_error_log
 lua ssl server name:
@@ -123,19 +124,27 @@ SSL reused session
 
 
 === TEST 2: no SNI, no verify
+--- http_config
+    server {
+        listen $TEST_NGINX_SERVER_SSL_PORT ssl;
+        server_name   test.com;
+        ssl_certificate ../html/test.crt;
+        ssl_certificate_key ../html/test.key;
+
+        location / {
+            content_by_lua_block {
+                ngx.exit(201)
+            }
+        }
+    }
 --- config
-    server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
+        content_by_lua_block {
             do
-                local ok, err = sock:connect("openresty.org", 443)
+                local sock = ngx.socket.tcp()
+                sock:settimeout(2000)
+                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_SSL_PORT)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -151,7 +160,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\r\nHost: test.com\r\nConnection: close\r\n\r\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -172,21 +181,32 @@ SSL reused session
                 ngx.say("close: ", ok, " ", err)
             end  -- do
             collectgarbage()
-        ';
+        }
     }
 
 --- request
 GET /t
 --- response_body
 connected: 1
-failed to do SSL handshake: handshake failed
+ssl handshake: userdata
+sent http request: 53 bytes.
+received: HTTP/1.1 201 Created
+close: 1 nil
+--- user_files eval
+">>> test.key
+$::TestCertificateKey
+>>> test.crt
+$::TestCertificate"
 
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
---- grep_error_log_out
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
+--- grep_error_log_out eval
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
+$/
 --- no_error_log
 lua ssl server name:
 SSL reused session
+[error]
 [alert]
 --- timeout: 5
 
@@ -255,10 +275,10 @@ received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 --- error_log
 lua ssl server name: "openresty.org"
@@ -343,13 +363,13 @@ sent http request: 56 bytes.
 received: HTTP/1.1 200 OK
 close: 1 nil
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl set session: \1:2
-lua ssl save session: \1:3
-lua ssl free session: \1:2
-lua ssl free session: \1:1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl set session: \1
+lua ssl save session: \1
+lua ssl free session: \1
+lua ssl free session: \1
 $/
 
 --- error_log
@@ -421,7 +441,7 @@ The certificate of "openresty.org" does not contain the name "blah.openresty.org
 
 --- user_files eval
 ">>> trusted.crt
-$::ComodoRootCertificate"
+$::DSTRootCertificate"
 
 --- request
 GET /t
@@ -432,7 +452,7 @@ failed to send http request: closed
 \z
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log
 lua ssl server name: "blah.openresty.org"
@@ -501,7 +521,7 @@ The certificate for "openresty.org" does not contain the name "blah.openresty.or
 
 --- user_files eval
 ">>> trusted.crt
-$::ComodoRootCertificate"
+$::DSTRootCertificate"
 
 --- request
 GET /t
@@ -512,7 +532,7 @@ failed to send http request: closed
 \z
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log
 lua ssl server name: "blah.openresty.org"
@@ -534,7 +554,7 @@ SSL reused session
 
         content_by_lua '
             local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
+            sock:settimeout(4000)
 
             do
                 local ok, err = sock:connect("openresty.org", 443)
@@ -587,10 +607,10 @@ received: HTTP/1.1 404 Not Found
 close: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 
 --- error_log
@@ -615,7 +635,7 @@ SSL reused session
 
         content_by_lua '
             local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
+            sock:settimeout(4000)
 
             do
                 local ok, err = sock:connect("openresty.org", 443)
@@ -660,7 +680,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::ComodoRootCertificate"
+$::DSTRootCertificate"
 
 --- request
 GET /t
@@ -672,10 +692,10 @@ received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]++/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 
 --- error_log
@@ -693,7 +713,7 @@ SSL reused session
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 1;
+    lua_ssl_verify_depth 0;
     location /t {
         #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -744,21 +764,22 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::ComodoRootCertificate"
+$::DSTRootCertificate"
 
 --- request
 GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: 20: unable to get local issuer certificate
+--- response_body eval
+qr{connected: 1
+failed to do SSL handshake: (22: certificate chain too long|20: unable to get local issuer certificate)
 failed to send http request: closed
+}
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
---- error_log
-lua ssl server name: "openresty.org"
-lua ssl certificate verify error: (20: unable to get local issuer certificate)
+--- error_log eval
+['lua ssl server name: "openresty.org"',
+qr/lua ssl certificate verify error: \((22: certificate chain too long|20: unable to get local issuer certificate)\)/]
 --- no_error_log
 SSL reused session
 [alert]
@@ -771,7 +792,7 @@ SSL reused session
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 1;
+    lua_ssl_verify_depth 0;
     lua_socket_log_errors off;
     location /t {
         #set $port 5000;
@@ -823,17 +844,18 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::ComodoRootCertificate"
+$::DSTRootCertificate"
 
 --- request
 GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: 20: unable to get local issuer certificate
+--- response_body eval
+qr/connected: 1
+failed to do SSL handshake: (22: certificate chain too long|20: unable to get local issuer certificate)
 failed to send http request: closed
+/
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log
 lua ssl server name: "openresty.org"
@@ -845,32 +867,21 @@ SSL reused session
 
 
 
-=== TEST 11: www.google.com  (SSL verify passes)
+=== TEST 11: openresty.org: SSL verify enabled and no corresponding trusted certificates
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 3;
+    lua_ssl_verify_depth 2;
     location /t {
-        #set $port 5000;
         set $port $TEST_NGINX_MEMCACHED_PORT;
 
-        content_by_lua '
-            -- avoid flushing google in "check leak" testing mode:
-            local counter = package.loaded.counter
-            if not counter then
-                counter = 1
-            elseif counter >= 2 then
-                return ngx.exit(503)
-            else
-                counter = counter + 1
-            end
-            package.loaded.counter = counter
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(4000)
 
             do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(2000)
-                local ok, err = sock:connect("www.google.com", 443)
+                local ok, err = sock:connect("openresty.org", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -878,21 +889,20 @@ SSL reused session
 
                 ngx.say("connected: ", ok)
 
-                local sess, err = sock:sslhandshake(nil, "www.google.com", true)
-                if not sess then
+                local session, err = sock:sslhandshake(nil, "openresty.org", true)
+                if not session then
                     ngx.say("failed to do SSL handshake: ", err)
                     return
                 end
 
-                ngx.say("ssl handshake: ", type(sess))
+                ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: www.google.com\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\r\nHost: openresty.org\r\nConnection: close\r\n\r\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
                     return
                 end
-
                 ngx.say("sent http request: ", bytes, " bytes.")
 
                 local line, err = sock:receive()
@@ -907,116 +917,23 @@ SSL reused session
                 ngx.say("close: ", ok, " ", err)
             end  -- do
             collectgarbage()
-        ';
+        }
     }
 
 --- user_files eval
 ">>> trusted.crt
 $::EquifaxRootCertificate"
 
---- request
-GET /t
---- response_body_like chop
-\Aconnected: 1
-ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 (?:200 OK|302 Found)
-close: 1 nil
-\z
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
-$/
---- error_log
-lua ssl server name: "www.google.com"
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 12: www.google.com  (SSL verify enabled and no corresponding trusted certificates)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 3;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            -- avoid flushing google in "check leak" testing mode:
-            local counter = package.loaded.counter
-            if not counter then
-                counter = 1
-            elseif counter >= 2 then
-                return ngx.exit(503)
-            else
-                counter = counter + 1
-            end
-            package.loaded.counter = counter
-
-            do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(2000)
-                local ok, err = sock:connect("www.google.com", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake(nil, "www.google.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: www.google.com\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::ComodoRootCertificate"
-
 --- request
 GET /t
 --- response_body
 connected: 1
 failed to do SSL handshake: 20: unable to get local issuer certificate
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log
-lua ssl server name: "www.google.com"
+lua ssl server name: "openresty.org"
 lua ssl certificate verify error: (20: unable to get local issuer certificate)
 --- no_error_log
 SSL reused session
@@ -1025,7 +942,7 @@ SSL reused session
 
 
 
-=== TEST 13: openresty.org: passing SSL verify with multiple certificates
+=== TEST 12: openresty.org: passing SSL verify with multiple certificates
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -1037,7 +954,7 @@ SSL reused session
 
         content_by_lua '
             local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
+            sock:settimeout(4000)
 
             do
                 local ok, err = sock:connect("openresty.org", 443)
@@ -1083,7 +1000,7 @@ SSL reused session
 --- user_files eval
 ">>> trusted.crt
 $::EquifaxRootCertificate
-$::ComodoRootCertificate"
+$::DSTRootCertificate"
 
 --- request
 GET /t
@@ -1095,10 +1012,10 @@ received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 
 --- error_log
@@ -1111,7 +1028,7 @@ SSL reused session
 
 
 
-=== TEST 14: default cipher
+=== TEST 13: default cipher
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -1174,10 +1091,10 @@ received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 --- error_log
 lua ssl server name: "openresty.org"
@@ -1190,7 +1107,7 @@ SSL reused session
 
 
 
-=== TEST 15: explicit cipher configuration
+=== TEST 14: explicit cipher configuration
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -1254,14 +1171,14 @@ received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
---- error_log
-lua ssl server name: "openresty.org"
-SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-SHA SSLv3
+--- error_log eval
+['lua ssl server name: "openresty.org"',
+qr/SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-SHA (SSLv3|TLSv1)/]
 --- no_error_log
 SSL reused session
 [error]
@@ -1270,7 +1187,7 @@ SSL reused session
 
 
 
-=== TEST 16: explicit ssl protocol configuration
+=== TEST 15: explicit ssl protocol configuration
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -1334,14 +1251,14 @@ received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
---- error_log
-lua ssl server name: "openresty.org"
-SSL: TLSv1, cipher: "ECDHE-RSA-AES128-SHA SSLv3
+--- error_log eval
+['lua ssl server name: "openresty.org"',
+qr/SSL: TLSv1, cipher: "ECDHE-RSA-AES128-SHA (SSLv3|TLSv1)/]
 --- no_error_log
 SSL reused session
 [error]
@@ -1350,7 +1267,7 @@ SSL reused session
 
 
 
-=== TEST 17: unsupported ssl protocol
+=== TEST 16: unsupported ssl protocol
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -1412,11 +1329,11 @@ failed to do SSL handshake: handshake failed
 failed to send http request: closed
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log eval
 [
-qr/\[crit\] .*?SSL_do_handshake\(\) failed .*?unsupported protocol/,
+qr/\[crit\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
 'lua ssl server name: "openresty.org"',
 ]
 --- no_error_log
@@ -1427,7 +1344,7 @@ SSL reused session
 
 
 
-=== TEST 18: openresty.org: passing SSL verify: keepalive (reuse the ssl session)
+=== TEST 17: openresty.org: passing SSL verify: keepalive (reuse the ssl session)
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -1472,7 +1389,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::ComodoRootCertificate"
+$::DSTRootCertificate"
 
 --- request
 GET /t
@@ -1488,10 +1405,10 @@ ssl handshake: userdata
 set keepalive: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: \1:2
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: \1
 $/
 
 --- error_log
@@ -1504,7 +1421,7 @@ SSL reused session
 
 
 
-=== TEST 19: openresty.org: passing SSL verify: keepalive (no reusing the ssl session)
+=== TEST 18: openresty.org: passing SSL verify: keepalive (no reusing the ssl session)
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -1548,7 +1465,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::ComodoRootCertificate"
+$::DSTRootCertificate"
 
 --- request
 GET /t
@@ -1564,14 +1481,14 @@ ssl handshake: userdata
 set keepalive: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl save session: \1:3
-lua ssl save session: \1:4
-lua ssl free session: \1:4
-lua ssl free session: \1:3
-lua ssl free session: \1:2
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl save session: \1
+lua ssl save session: \1
+lua ssl free session: \1
+lua ssl free session: \1
+lua ssl free session: \1
 $/
 
 --- error_log
@@ -1584,7 +1501,7 @@ SSL reused session
 
 
 
-=== TEST 20: downstream cosockets do not support ssl handshake
+=== TEST 19: downstream cosockets do not support ssl handshake
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -1607,7 +1524,7 @@ SSL reused session
 
 --- user_files eval
 ">>> trusted.crt
-$::ComodoRootCertificate"
+$::DSTRootCertificate"
 
 --- request
 POST /t
@@ -1615,7 +1532,7 @@ hello world
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log
 attempt to call method 'sslhandshake' (a nil value)
@@ -1625,7 +1542,7 @@ attempt to call method 'sslhandshake' (a nil value)
 
 
 
-=== TEST 21: unix domain ssl cosocket (no verify)
+=== TEST 20: unix domain ssl cosocket (no verify)
 --- http_config
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1714,10 +1631,10 @@ $::TestCertificateKey
 >>> test.crt
 $::TestCertificate"
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 --- no_error_log
 lua ssl server name:
@@ -1728,7 +1645,7 @@ SSL reused session
 
 
 
-=== TEST 22: unix domain ssl cosocket (verify)
+=== TEST 21: unix domain ssl cosocket (verify)
 --- http_config
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -1819,10 +1736,10 @@ $::TestCertificateKey
 >>> test.crt
 $::TestCertificate"
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 --- error_log
 lua ssl server name: "test.com"
@@ -1834,7 +1751,7 @@ SSL reused session
 
 
 
-=== TEST 23: unix domain ssl cosocket (no ssl on server)
+=== TEST 22: unix domain ssl cosocket (no ssl on server)
 --- http_config
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
@@ -1912,10 +1829,10 @@ failed to do SSL handshake: handshake failed
 ">>> test.crt
 $::TestCertificate"
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log eval
-qr/SSL_do_handshake\(\) failed .*?unknown protocol/
+qr/SSL_do_handshake\(\) failed .*?(unknown protocol|wrong version number)/
 --- no_error_log
 lua ssl server name:
 SSL reused session
@@ -1924,7 +1841,7 @@ SSL reused session
 
 
 
-=== TEST 24: lua_ssl_crl
+=== TEST 23: lua_ssl_crl
 --- http_config
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -2011,7 +1928,7 @@ $::TestCertificate
 >>> test.crl
 $::TestCRL"
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log
 lua ssl server name: "test.com"
@@ -2023,7 +1940,7 @@ SSL reused session
 
 
 
-=== TEST 25: multiple handshake calls
+=== TEST 24: multiple handshake calls
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -2090,12 +2007,12 @@ received: HTTP/1.1 302 Moved Temporarily
 close: 1 nil
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl save session: ([0-9A-F]+):3
-lua ssl free session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 --- error_log
 lua ssl server name: "openresty.org"
@@ -2107,7 +2024,7 @@ SSL reused session
 
 
 
-=== TEST 26: handshake timed out
+=== TEST 25: handshake timed out
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -2149,7 +2066,7 @@ connected: 1
 failed to do SSL handshake: timeout
 
 --- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log
 lua ssl server name: "openresty.org"
@@ -2161,7 +2078,7 @@ SSL reused session
 
 
 
-=== TEST 27: unix domain ssl cosocket (no gen session)
+=== TEST 26: unix domain ssl cosocket (no gen session)
 --- http_config
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -2221,7 +2138,7 @@ $::TestCertificateKey
 >>> test.crt
 $::TestCertificate"
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- no_error_log
 lua ssl server name:
@@ -2232,7 +2149,7 @@ SSL reused session
 
 
 
-=== TEST 28: unix domain ssl cosocket (gen session, true)
+=== TEST 27: unix domain ssl cosocket (gen session, true)
 --- http_config
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -2292,10 +2209,10 @@ $::TestCertificateKey
 >>> test.crt
 $::TestCertificate"
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 --- no_error_log
 lua ssl server name:
@@ -2306,7 +2223,7 @@ SSL reused session
 
 
 
-=== TEST 29: unix domain ssl cosocket (keepalive)
+=== TEST 28: unix domain ssl cosocket (keepalive)
 --- http_config
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -2372,7 +2289,7 @@ $::TestCertificateKey
 >>> test.crt
 $::TestCertificate"
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- no_error_log
 lua ssl server name:
@@ -2383,7 +2300,7 @@ SSL reused session
 
 
 
-=== TEST 30: unix domain ssl cosocket (verify cert but no host name check, passed)
+=== TEST 29: unix domain ssl cosocket (verify cert but no host name check, passed)
 --- http_config
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -2474,10 +2391,10 @@ $::TestCertificateKey
 >>> test.crt
 $::TestCertificate"
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+):2
-lua ssl free session: ([0-9A-F]+):1
+qr/^lua ssl save session: ([0-9A-F]+)
+lua ssl free session: ([0-9A-F]+)
 $/
 --- error_log
 --- no_error_log
@@ -2488,7 +2405,7 @@ SSL reused session
 
 
 
-=== TEST 31: unix domain ssl cosocket (verify cert but no host name check, NOT passed)
+=== TEST 30: unix domain ssl cosocket (verify cert but no host name check, NOT passed)
 --- http_config
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
@@ -2570,7 +2487,7 @@ $::TestCertificateKey
 >>> test.crt
 $::TestCertificate"
 
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
 --- grep_error_log_out
 --- error_log
 lua ssl certificate verify error: (18: self signed certificate)
@@ -2581,7 +2498,7 @@ SSL reused session
 
 
 
-=== TEST 32: handshake, too many arguments
+=== TEST 31: handshake, too many arguments
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
diff --git a/debian/modules/http-lua/t/132-lua-blocks.t b/debian/modules/http-lua/t/132-lua-blocks.t
index a57d701..292af58 100644
--- a/debian/modules/http-lua/t/132-lua-blocks.t
+++ b/debian/modules/http-lua/t/132-lua-blocks.t
@@ -10,7 +10,9 @@ use Test::Nginx::Socket::Lua;
 repeat_each(2);
 #repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 3 + 3);
+plan tests => repeat_each() * (blocks() * 3 + 13);
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
 
 #no_diff();
 no_long_string();
@@ -604,3 +606,124 @@ GET /t
 --- response_body_like: }
 --- no_error_log
 [error]
+
+
+
+=== TEST 24: inline Lua code cache should not mess up across different phases
+--- http_config
+            # The indent is enforced to generate the same hash tags
+            ssl_session_fetch_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+            ssl_session_store_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+
+        upstream backend {
+            server 0.0.0.1;
+            balancer_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+        }
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+            ssl_certificate_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+        ssl_session_tickets off;
+
+        location /foo {
+            set_by_lua_block $x {
+                ngx.log(ngx.INFO, "hello")
+            }
+            rewrite_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+            access_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+            content_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+            header_filter_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+            body_filter_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+            log_by_lua_block {
+                ngx.log(ngx.INFO, "hello")
+            }
+        }
+    }
+--- config
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location = /proxy {
+        proxy_pass http://backend;
+    }
+
+    location /t {
+        content_by_lua_block {
+            ngx.location.capture("/proxy")
+
+            local sock = ngx.socket.tcp()
+            sock:settimeout(2000)
+            local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local sess, err = sock:sslhandshake(nil, "test.com", true)
+            if not sess then
+                ngx.say("failed to do SSL handshake: ", err)
+                return
+            end
+            package.loaded.session = sess
+            sock:close()
+
+            local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            local sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+            if not sess then
+                ngx.say("failed to do SSL handshake: ", err)
+                return
+            end
+
+            local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+            local bytes, err = sock:send(req)
+            if not bytes then
+                ngx.say("failed to send http request: ", err)
+                return
+            end
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- error_log eval
+[
+qr/balancer_by_lua:\d+: hello/,
+qr/ssl_session_fetch_by_lua_block:\d+: hello/,
+qr/ssl_certificate_by_lua:\d+: hello/,
+qr/ssl_session_store_by_lua_block:\d+: hello/,
+qr/set_by_lua:\d+: hello/,
+qr/rewrite_by_lua\(nginx\.conf:\d+\):\d+: hello/,
+qr/access_by_lua\(nginx\.conf:\d+\):\d+: hello/,
+qr/content_by_lua\(nginx\.conf:\d+\):\d+: hello/,
+qr/header_filter_by_lua:\d+: hello/,
+qr/body_filter_by_lua:\d+: hello/,
+qr/log_by_lua\(nginx\.conf:\d+\):\d+: hello/,
+]
diff --git a/debian/modules/http-lua/t/135-worker-id.t b/debian/modules/http-lua/t/135-worker-id.t
index 984f446..8241157 100644
--- a/debian/modules/http-lua/t/135-worker-id.t
+++ b/debian/modules/http-lua/t/135-worker-id.t
@@ -9,7 +9,7 @@ workers(2);
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 1);
+plan tests => repeat_each() * (blocks() * 3);
 
 #no_diff();
 #no_long_string();
@@ -31,63 +31,3 @@ GET /lua
 --- no_error_log
 [error]
 --- skip_nginx: 3: <=1.9.0
-
-
-
-=== TEST 2: worker id should be nil for non-worker processes
---- http_config
-    proxy_cache_path conf/cache levels=1:2 keys_zone=my-cache:8m max_size=10m inactive=60m;
-    proxy_temp_path conf/temp;
-
-    lua_shared_dict counters 1m;
-
-    init_by_lua_block {
-        ngx.shared.counters:set("c", 0)
-    }
-
-    init_worker_by_lua_block {
-        ngx.shared.counters:incr("c", 1)
-        ngx.log(ngx.INFO, ngx.worker.pid(), ": worker id ", ngx.worker.id());
-    }
---- config
-    location = /t {
-        content_by_lua_block {
-            local counters = ngx.shared.counters
-            local ok, c
-            for i = 1, 100 do
-                c = counters:get("c")
-                if c >= 4 then
-                    ok = true
-                    break
-                end
-                local delay = 0.001 * i
-                if delay > 0.1 then
-                    delay = 0.1
-                end
-                ngx.sleep(delay)
-            end
-            if ok then
-                ngx.say("ok")
-            else
-                ngx.say("not ok: c=", c)
-            end
-        }
-    }
-    location /cache {
-        proxy_pass http://127.0.0.1:$server_port;
-        proxy_cache my-cache;
-    }
---- request
-GET /t
---- response_body
-ok
---- grep_error_log eval: qr/worker id nil/
---- grep_error_log_out
-worker id nil
-worker id nil
---- no_error_log
-[error]
---- wait: 0.1
---- skip_nginx: 3: <=1.9.0
---- log_level: info
---- timeout: 6
diff --git a/debian/modules/http-lua/t/138-balancer.t b/debian/modules/http-lua/t/138-balancer.t
index ddd0da5..0aba66d 100644
--- a/debian/modules/http-lua/t/138-balancer.t
+++ b/debian/modules/http-lua/t/138-balancer.t
@@ -160,7 +160,7 @@ qr/\[crit\] .* connect\(\) .*? failed/,
     upstream backend {
         server 0.0.0.1;
         balancer_by_lua_block {
-            print("arg foo: ", ngx.req.get_uri_args()["foo"])
+            print("arg foo: ", (ngx.req.get_uri_args())["foo"])
         }
     }
 --- config
@@ -307,7 +307,7 @@ qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\
 
 === TEST 12: code cache off
 --- http_config
-    lua_package_path "t/servroot/html/?.lua;;";
+    lua_package_path "$TEST_NGINX_SERVER_ROOT/html/?.lua;;";
 
     lua_code_cache off;
 
@@ -327,7 +327,7 @@ qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\
     location = /update {
         content_by_lua_block {
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("print('me: ', 101)")
             f:close()
             ngx.say("updated")
diff --git a/debian/modules/http-lua/t/139-ssl-cert-by.t b/debian/modules/http-lua/t/139-ssl-cert-by.t
index b521e9e..a65d703 100644
--- a/debian/modules/http-lua/t/139-ssl-cert-by.t
+++ b/debian/modules/http-lua/t/139-ssl-cert-by.t
@@ -11,7 +11,7 @@ my $openssl_version = eval { `$NginxBinary -V 2>&1` };
 if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
     plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
 } else {
-    plan tests => repeat_each() * (blocks() * 6 + 6);
+    plan tests => repeat_each() * (blocks() * 6 + 4);
 }
 
 $ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
@@ -1872,3 +1872,206 @@ failed to do SSL handshake: handshake failed
 qr/\[alert\] .*? no ssl_certificate_by_lua\* defined in server ~test2\\\.com\b/,
 qr/\[crit\] .*? SSL_do_handshake\(\) failed\b/,
 ]
+
+
+
+=== TEST 22: get raw_client_addr - IPv4
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;;";
+
+    server {
+        listen 127.0.0.1:12345 ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block {
+            local ssl = require "ngx.ssl"
+            local byte = string.byte
+            local addr, addrtype, err = ssl.raw_client_addr()
+            local ip = string.format("%d.%d.%d.%d", byte(addr, 1), byte(addr, 2),
+                       byte(addr, 3), byte(addr, 4))
+            print("client ip: ", ip)
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                local ok, err = sock:connect("127.0.0.1", 12345)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+
+                local sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+client ip: 127.0.0.1
+
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 23: get raw_client_addr - unix domain socket
+--- http_config
+    lua_package_path "../lua-resty-core/lib/?.lua;;";
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+
+        ssl_certificate_by_lua_block {
+            local ssl = require "ngx.ssl"
+            local addr, addrtyp, err = ssl.raw_client_addr()
+            print("client socket file: ", addr)
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+            more_clear_headers Date;
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    ngx.say("received: ", line)
+                end
+
+                local ok, err = sock:close()
+                ngx.say("close: ", ok, " ", err)
+            end  -- do
+            -- collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+sent http request: 56 bytes.
+received: HTTP/1.1 201 Created
+received: Server: nginx
+received: Content-Type: text/plain
+received: Content-Length: 4
+received: Connection: close
+received: 
+received: foo
+close: 1 nil
+
+--- error_log
+client socket file: 
+
+--- no_error_log
+[error]
+[alert]
diff --git a/debian/modules/http-lua/t/142-ssl-session-store.t b/debian/modules/http-lua/t/142-ssl-session-store.t
index 825d016..cc3a664 100644
--- a/debian/modules/http-lua/t/142-ssl-session-store.t
+++ b/debian/modules/http-lua/t/142-ssl-session-store.t
@@ -32,7 +32,7 @@ __DATA__
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -107,7 +107,7 @@ ssl_session_store_by_lua_block:1: ssl session store by lua is running!,
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -182,7 +182,7 @@ API disabled in the context of ssl_session_store_by_lua*
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -272,9 +272,9 @@ my timer run!
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
 
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -340,9 +340,9 @@ API disabled in the context of ssl_session_store_by_lua*
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -412,9 +412,9 @@ ngx.exit does not yield and the error code is eaten.
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -485,9 +485,9 @@ ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -553,9 +553,9 @@ should never reached here
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -626,7 +626,7 @@ get_phase: ssl_session_store
         }
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -695,7 +695,7 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -765,7 +765,6 @@ a.lua:1: ssl store session by lua is running!
         ssl_session_store_by_lua_block {
             print("handler in test.com")
         }
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 
@@ -775,7 +774,6 @@ a.lua:1: ssl store session by lua is running!
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
 
@@ -841,7 +839,7 @@ qr/\[emerg\] .*? "ssl_session_store_by_lua_block" directive is not allowed here
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
diff --git a/debian/modules/http-lua/t/143-ssl-session-fetch.t b/debian/modules/http-lua/t/143-ssl-session-fetch.t
index 7be180f..4dc992d 100644
--- a/debian/modules/http-lua/t/143-ssl-session-fetch.t
+++ b/debian/modules/http-lua/t/143-ssl-session-fetch.t
@@ -33,7 +33,7 @@ __DATA__
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -119,7 +119,7 @@ ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!,
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -203,7 +203,7 @@ qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -302,9 +302,9 @@ qr/my timer run!/s
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -382,9 +382,9 @@ qr/received memc reply: OK/s
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -463,9 +463,9 @@ should never reached here
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -545,9 +545,9 @@ should never reached here
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -626,9 +626,9 @@ should never reached here
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -709,9 +709,9 @@ should never reached here
     server {
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name test.com;
-        ssl_protocols SSLv3;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -792,7 +792,7 @@ should never reached here
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -877,7 +877,7 @@ qr/get_phase: ssl_session_fetch/s
         }
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -961,7 +961,7 @@ ssl store session by lua is running!
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
@@ -1041,7 +1041,7 @@ qr/\S+:\d+: ssl fetch sess by lua is running!/s
         server_name   test.com;
         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_protocols SSLv3;
+        ssl_session_tickets off;
 
         server_tokens off;
     }
diff --git a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
index 8199e84..4ebc8f3 100644
--- a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
+++ b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
@@ -346,7 +346,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
diff --git a/debian/modules/http-lua/t/155-tls13.t b/debian/modules/http-lua/t/155-tls13.t
new file mode 100644
index 0000000..9f7cf86
--- /dev/null
+++ b/debian/modules/http-lua/t/155-tls13.t
@@ -0,0 +1,106 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+repeat_each(3);
+
+# All these tests need to have new openssl
+my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
+my $openssl_version = eval { `$NginxBinary -V 2>&1` };
+
+if ($openssl_version =~ m/built with OpenSSL (0\S*|1\.0\S*|1\.1\.0\S*)/) {
+    plan(skip_all => "too old OpenSSL, need 1.1.1, was $1");
+} else {
+    plan tests => repeat_each() * (blocks() * 5);
+}
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+sub read_file {
+    my $infile = shift;
+    open my $in, $infile
+        or die "cannot open $infile for reading: $!";
+    my $cert = do { local $/; <$in> };
+    close $in;
+    $cert;
+}
+
+our $TestCertificate = read_file("t/cert/test.crt");
+our $TestCertificateKey = read_file("t/cert/test.key");
+
+#log_level 'warn';
+log_level 'debug';
+
+no_long_string();
+#no_diff();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: handshake, TLSv1.3
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate ../html/test.crt;
+        ssl_certificate_key ../html/test.key;
+        ssl_protocols TLSv1.2 TLSv1.3;
+
+        server_tokens off;
+        location /foo {
+            default_type 'text/plain';
+            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../html/test.crt;
+    lua_ssl_protocols TLSv1.2 TLSv1.3;
+    location /t {
+        #set $port 5000;
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(3000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                else
+                    ngx.say("ssl handshake: ", type(sess))
+                end
+            end  -- do
+            collectgarbage()
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+connected: 1
+ssl handshake: userdata
+
+--- user_files eval
+">>> test.key
+$::TestCertificateKey
+>>> test.crt
+$::TestCertificate"
+--- error_log
+SSL: TLSv1.3,
+--- no_error_log
+[error]
+[alert]
+--- timeout: 5
diff --git a/debian/modules/http-lua/t/cert/comodo-ca.crt b/debian/modules/http-lua/t/cert/comodo-ca.crt
deleted file mode 100644
index 444461b..0000000
--- a/debian/modules/http-lua/t/cert/comodo-ca.crt
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
-dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
-FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
-5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
-x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
-2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
-OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
-sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
-GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
-WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
-FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
-rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
-nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
-tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
-sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
-pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
-zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
-ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
-7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
-LaZRfyHBNVOFBkpdn627G190
------END CERTIFICATE-----
diff --git a/debian/modules/http-lua/t/cert/dst-ca.crt b/debian/modules/http-lua/t/cert/dst-ca.crt
new file mode 100644
index 0000000..738121f
--- /dev/null
+++ b/debian/modules/http-lua/t/cert/dst-ca.crt
@@ -0,0 +1,63 @@
+subject=/C=US/O=Digital Signature Trust Co./OU=TrustID Server/CN=TrustID Server CA A5
+issuer=/O=Digital Signature Trust Co./CN=DST Root CA X3
+-----BEGIN CERTIFICATE-----
+MIIGiTCCBXGgAwIBAgIRALCqqJD4YLUEJLy76IZcvf8wDQYJKoZIhvcNAQEFBQAw
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzAeFw0wNzA4MjQxNzU0MTlaFw0xNDA4MjQxNDEzMzVa
+MGsxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVz
+dCBDby4xFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMR0wGwYDVQQDExRUcnVzdElE
+IFNlcnZlciBDQSBBNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOae
+jyufM+mrKgTCpPm9ha5UBAORNLhAv3PFlmzA8n6lnEvBTJfeG5vUZYQrlZMMKmZl
+F1D3mYRFAhT/qFbBsTMlF9XsDNF40NB21ABTquuEB3Ji8mmC1Z2cZjwa4VeKxGIq
+kTdBypQgWekopNVvoOGLPbRXgYKW4UCc6pt7Q+We+eUuonp2XIRIOvmJQtXb/rNz
+4B1ahu3QB4HnystmQ9dW8BySSGDhZ/kzIcSU8GuHcL58SHsei07gjFzXRhMkkbJH
+MT8zS/hrjNsB8Z5kamI4QL7nLVNuCF1Sg9zgB1POdMPLEnm4uDx+BRLwVMGZMwza
+MNfEATnWTvLazzIDarMCAwEAAaOCA1IwggNOMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgHGMEcGA1UdJQRAMD4GCCsGAQUFBwMBBggrBgEFBQcDAwYIKwYB
+BQUHAwUGCCsGAQUFBwMGBggrBgEFBQcDBwYKKwYBBAGCNwoDATCCATIGA1UdIASC
+ASkwggElMIIBIQYKYIZIAYb5LwAGAzCCAREwSgYIKwYBBQUHAgEWPmh0dHBzOi8v
+c2VjdXJlLmlkZW50cnVzdC5jb20vY2VydGlmaWNhdGVzL3BvbGljeS90cy9pbmRl
+eC5odG1sMIHCBggrBgEFBQcCAjCBtRqBslRoaXMgVHJ1c3RJRCBTZXJ2ZXIgQ2Vy
+dGlmaWNhdGUgaGFzIGJlZW4gaXNzdWVkIGluIGFjY29yZGFuY2Ugd2l0aCBJZGVu
+VHJ1c3QncyBUcnVzdElEIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRw
+czovL3NlY3VyZS5pZGVudHJ1c3QuY29tLyBjZXJ0aWZpY2F0ZXMvcG9saWN5L3Rz
+L2luZGV4Lmh0bWwwgbkGA1UdHwSBsTCBrjAuoCygKoYoaHR0cDovL2NybC5pZGVu
+dHJ1c3QuY29tL0RTVFJPT1RDQVgzLmNybDB8oHqgeIZ2bGRhcDovL2xkYXAuaWRl
+bnRydXN0LmNvbS9jbj1EU1QlMjBSb290JTIwQ0ElMjBYMyxvPURpZ2l0YWwlMjBT
+aWduYXR1cmUlMjBUcnVzdCUyMENvLj9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0
+O2JpbmFyeTCBrwYIKwYBBQUHAQEEgaIwgZ8wJQYIKwYBBQUHMAGGGWh0dHA6Ly9v
+Y3NwLmlkZW50cnVzdC5jb20wdgYIKwYBBQUHMAKGamxkYXA6Ly9sZGFwLmlkZW50
+cnVzdC5jb20vY249RFNUJTIwUm9vdCUyMENBJTIwWDMsbz1EaWdpdGFsJTIwU2ln
+bmF0dXJlJTIwVHJ1c3QlMjBDby4/Y0FDZXJ0aWZpY2F0ZTtiaW5hcnkwHwYDVR0j
+BBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAwHQYDVR0OBBYEFLeoy2iu3EVD0tyJ
+EamBZhn5+3XpMA0GCSqGSIb3DQEBBQUAA4IBAQAtreoVqLQx+G35L8byM/IvGqNa
+MzbWYzGIidH3+hT8B2e0duWfZCDazgu272ErWL/T4HL5psUEOIHfzNxEWHA24XhY
+zBFsYR64vaTRV7T+iYKv5Nxptidk26zOZ2/F+TKZvOfhPg5IqnH3FyXHEcRDWm1/
+QJsZ4mqgUFx38pc50i1ed6XUdvBObMnGJc1fGdfVqcNqbvHACNrw+WJE9PIeMKJQ
+HC/NkE87xFP/Q1OW7hPmqQvmIIbm6BLZ7U0kxqNL3HmegxkJ2yJQntsX+5BooJqj
+/uVpwzAEei7IjKsdtomxkHCDPFGEJYBldDLBH0ScSlngQZ6V5HNM473l8bWs
+-----END CERTIFICATE-----
+
+subject=/O=Digital Signature Trust Co./CN=DST Root CA X3
+issuer=/O=Digital Signature Trust Co./CN=DST Root CA X3
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
diff --git a/debian/modules/http-lua/valgrind.suppress b/debian/modules/http-lua/valgrind.suppress
index 7273986..7fff542 100644
--- a/debian/modules/http-lua/valgrind.suppress
+++ b/debian/modules/http-lua/valgrind.suppress
@@ -22,16 +22,6 @@
    fun:ngx_epoll_process_events
    fun:ngx_process_events_and_timers
 }
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:ngx_vslprintf
-   fun:ngx_snprintf
-   fun:ngx_sock_ntop
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-}
 {
    <insert_a_suppression_name_here>
    Memcheck:Addr1
@@ -183,10 +173,37 @@
 }
 {
    <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_set_environment
-   fun:ngx_single_process_cycle
+   Memcheck:Param
+   epoll_pwait(sigmask)
+   fun:epoll_pwait
+   fun:epoll_wait
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_pwait(sigmask)
+   fun:epoll_pwait
+   fun:epoll_wait
+   fun:ngx_epoll_test_rdhup
+   fun:ngx_epoll_init
+   fun:ngx_event_process_init
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_pwait(sigmask)
+   fun:epoll_pwait
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_pwait(sigmask)
+   fun:epoll_pwait
+   fun:ngx_epoll_test_rdhup
+   fun:ngx_epoll_init
+   fun:ngx_event_process_init
 }

From 52cc96d9b8d5d6d1f544df177bf8c9a295b973d9 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Tue, 19 Jun 2018 16:27:36 +0300
Subject: [PATCH 260/600] http-lua: Drop our OpenSSL patch, OpenSSL 1.1 is now
 supported upstream

---
 .../patches/http-lua/openssl-1.1.0.patch      | 838 ------------------
 debian/modules/patches/http-lua/series        |   1 -
 2 files changed, 839 deletions(-)
 delete mode 100644 debian/modules/patches/http-lua/openssl-1.1.0.patch

diff --git a/debian/modules/patches/http-lua/openssl-1.1.0.patch b/debian/modules/patches/http-lua/openssl-1.1.0.patch
deleted file mode 100644
index 4dafce2..0000000
--- a/debian/modules/patches/http-lua/openssl-1.1.0.patch
+++ /dev/null
@@ -1,838 +0,0 @@
-From 47ab0d4eca3fa62403c798d7dfad50a5f9f7215a Mon Sep 17 00:00:00 2001
-From: Alessandro Ghedini <alessandro@ghedini.me>
-Date: Tue, 13 Sep 2016 22:31:32 +0100
-Subject: [PATCH 1/4] bugfix: ssl: don't use SSLv3 in tests.
-
-OpenSSL 1.1.0 disables SSLv3 by default. In order to disable SSL session
-tickets set ssl_session_tickets to off instead.
----
- t/142-ssl-session-store.t | 24 +++++++++++-------------
- t/143-ssl-session-fetch.t | 26 +++++++++++++-------------
- 2 files changed, 24 insertions(+), 26 deletions(-)
-
-diff --git a/t/142-ssl-session-store.t b/t/142-ssl-session-store.t
-index 825d0163..cc3a664c 100644
---- a/t/142-ssl-session-store.t
-+++ b/t/142-ssl-session-store.t
-@@ -32,7 +32,7 @@ __DATA__
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -107,7 +107,7 @@ ssl_session_store_by_lua_block:1: ssl session store by lua is running!,
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -182,7 +182,7 @@ API disabled in the context of ssl_session_store_by_lua*
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -272,9 +272,9 @@ my timer run!
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name   test.com;
- 
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -340,9 +340,9 @@ API disabled in the context of ssl_session_store_by_lua*
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -412,9 +412,9 @@ ngx.exit does not yield and the error code is eaten.
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -485,9 +485,9 @@ ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -553,9 +553,9 @@ should never reached here
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -626,7 +626,7 @@ get_phase: ssl_session_store
-         }
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -695,7 +695,7 @@ qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -765,7 +765,6 @@ a.lua:1: ssl store session by lua is running!
-         ssl_session_store_by_lua_block {
-             print("handler in test.com")
-         }
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
- 
-@@ -775,7 +774,6 @@ a.lua:1: ssl store session by lua is running!
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
- 
-@@ -841,7 +839,7 @@ qr/\[emerg\] .*? "ssl_session_store_by_lua_block" directive is not allowed here
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-diff --git a/t/143-ssl-session-fetch.t b/t/143-ssl-session-fetch.t
-index 7be180f8..4dc992d3 100644
---- a/t/143-ssl-session-fetch.t
-+++ b/t/143-ssl-session-fetch.t
-@@ -33,7 +33,7 @@ __DATA__
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -119,7 +119,7 @@ ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!,
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -203,7 +203,7 @@ qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -302,9 +302,9 @@ qr/my timer run!/s
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name   test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -382,9 +382,9 @@ qr/received memc reply: OK/s
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -463,9 +463,9 @@ should never reached here
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -545,9 +545,9 @@ should never reached here
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -626,9 +626,9 @@ should never reached here
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -709,9 +709,9 @@ should never reached here
-     server {
-         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-         server_name test.com;
--        ssl_protocols SSLv3;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -792,7 +792,7 @@ should never reached here
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -877,7 +877,7 @@ qr/get_phase: ssl_session_fetch/s
-         }
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -961,7 +961,7 @@ ssl store session by lua is running!
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
-@@ -1041,7 +1041,7 @@ qr/\S+:\d+: ssl fetch sess by lua is running!/s
-         server_name   test.com;
-         ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-         ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
--        ssl_protocols SSLv3;
-+        ssl_session_tickets off;
- 
-         server_tokens off;
-     }
--- 
-2.15.1
-
-
-From 5cb24ce5eccd580d1bd6a2c44d7ea3cef5ad7740 Mon Sep 17 00:00:00 2001
-From: Alessandro Ghedini <alessandro@cloudflare.com>
-Date: Thu, 12 May 2016 13:12:23 +0100
-Subject: [PATCH 2/4] bugfix: ssl: do not access SSL_SESSION struct directly.
-
-In OpenSSL 1.1.0 it was made opaque.
----
- src/ngx_http_lua_socket_tcp.c |  15 ++---
- t/129-ssl-socket.t            | 148 +++++++++++++++++++++---------------------
- 2 files changed, 80 insertions(+), 83 deletions(-)
-
-diff --git a/src/ngx_http_lua_socket_tcp.c b/src/ngx_http_lua_socket_tcp.c
-index f0988bc5..17d3db2e 100644
---- a/src/ngx_http_lua_socket_tcp.c
-+++ b/src/ngx_http_lua_socket_tcp.c
-@@ -1320,9 +1320,8 @@ ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
-                     return 2;
-                 }
- 
--                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
--                               "lua ssl set session: %p:%d",
--                               *psession, (*psession)->references);
-+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-+                               "lua ssl set session: %p", *psession);
-             }
-         }
- 
-@@ -1587,9 +1586,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
-     } else {
-         *ud = ssl_session;
- 
--       ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
--                      "lua ssl save session: %p:%d", ssl_session,
--                      ssl_session->references);
-+       ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-+                      "lua ssl save session: %p", ssl_session);
- 
-         /* set up the __gc metamethod */
-         lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
-@@ -5386,9 +5384,8 @@ ngx_http_lua_ssl_free_session(lua_State *L)
- 
-     psession = lua_touserdata(L, 1);
-     if (psession && *psession != NULL) {
--        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
--                       "lua ssl free session: %p:%d", *psession,
--                       (*psession)->references);
-+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-+                       "lua ssl free session: %p", *psession);
- 
-         ngx_ssl_free_session(*psession);
-     }
-diff --git a/t/129-ssl-socket.t b/t/129-ssl-socket.t
-index e7447a7c..c4bce9e0 100644
---- a/t/129-ssl-socket.t
-+++ b/t/129-ssl-socket.t
-@@ -108,10 +108,10 @@ sent http request: 59 bytes.
- received: HTTP/1.1 (?:200 OK|302 Found)
- close: 1 nil
- \z
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- no_error_log
- lua ssl server name:
-@@ -182,7 +182,7 @@ connected: 1
- failed to do SSL handshake: handshake failed
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- no_error_log
- lua ssl server name:
-@@ -255,10 +255,10 @@ received: HTTP/1.1 302 Moved Temporarily
- close: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- lua ssl server name: "openresty.org"
-@@ -343,13 +343,13 @@ sent http request: 56 bytes.
- received: HTTP/1.1 200 OK
- close: 1 nil
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl set session: \1:2
--lua ssl save session: \1:3
--lua ssl free session: \1:2
--lua ssl free session: \1:1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl set session: \1
-+lua ssl save session: \1
-+lua ssl free session: \1
-+lua ssl free session: \1
- $/
- 
- --- error_log
-@@ -432,7 +432,7 @@ failed to send http request: closed
- \z
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log
- lua ssl server name: "blah.openresty.org"
-@@ -512,7 +512,7 @@ failed to send http request: closed
- \z
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log
- lua ssl server name: "blah.openresty.org"
-@@ -587,10 +587,10 @@ received: HTTP/1.1 404 Not Found
- close: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- 
- --- error_log
-@@ -672,10 +672,10 @@ received: HTTP/1.1 302 Moved Temporarily
- close: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]++/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- 
- --- error_log
-@@ -754,7 +754,7 @@ failed to do SSL handshake: 20: unable to get local issuer certificate
- failed to send http request: closed
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log
- lua ssl server name: "openresty.org"
-@@ -833,7 +833,7 @@ failed to do SSL handshake: 20: unable to get local issuer certificate
- failed to send http request: closed
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log
- lua ssl server name: "openresty.org"
-@@ -923,10 +923,10 @@ sent http request: 59 bytes.
- received: HTTP/1.1 (?:200 OK|302 Found)
- close: 1 nil
- \z
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- lua ssl server name: "www.google.com"
-@@ -1013,7 +1013,7 @@ GET /t
- connected: 1
- failed to do SSL handshake: 20: unable to get local issuer certificate
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log
- lua ssl server name: "www.google.com"
-@@ -1095,10 +1095,10 @@ received: HTTP/1.1 302 Moved Temporarily
- close: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- 
- --- error_log
-@@ -1174,10 +1174,10 @@ received: HTTP/1.1 302 Moved Temporarily
- close: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- lua ssl server name: "openresty.org"
-@@ -1254,10 +1254,10 @@ received: HTTP/1.1 302 Moved Temporarily
- close: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- lua ssl server name: "openresty.org"
-@@ -1334,10 +1334,10 @@ received: HTTP/1.1 302 Moved Temporarily
- close: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- lua ssl server name: "openresty.org"
-@@ -1412,7 +1412,7 @@ failed to do SSL handshake: handshake failed
- failed to send http request: closed
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log eval
- [
-@@ -1488,10 +1488,10 @@ ssl handshake: userdata
- set keepalive: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: \1:2
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: \1
- $/
- 
- --- error_log
-@@ -1564,14 +1564,14 @@ ssl handshake: userdata
- set keepalive: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl save session: \1:3
--lua ssl save session: \1:4
--lua ssl free session: \1:4
--lua ssl free session: \1:3
--lua ssl free session: \1:2
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl save session: \1
-+lua ssl save session: \1
-+lua ssl free session: \1
-+lua ssl free session: \1
-+lua ssl free session: \1
- $/
- 
- --- error_log
-@@ -1615,7 +1615,7 @@ hello world
- --- response_body_like: 500 Internal Server Error
- --- error_code: 500
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log
- attempt to call method 'sslhandshake' (a nil value)
-@@ -1714,10 +1714,10 @@ $::TestCertificateKey
- >>> test.crt
- $::TestCertificate"
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- no_error_log
- lua ssl server name:
-@@ -1819,10 +1819,10 @@ $::TestCertificateKey
- >>> test.crt
- $::TestCertificate"
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- lua ssl server name: "test.com"
-@@ -1912,7 +1912,7 @@ failed to do SSL handshake: handshake failed
- ">>> test.crt
- $::TestCertificate"
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log eval
- qr/SSL_do_handshake\(\) failed .*?unknown protocol/
-@@ -2011,7 +2011,7 @@ $::TestCertificate
- >>> test.crl
- $::TestCRL"
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log
- lua ssl server name: "test.com"
-@@ -2090,12 +2090,12 @@ received: HTTP/1.1 302 Moved Temporarily
- close: 1 nil
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl save session: ([0-9A-F]+):3
--lua ssl free session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- lua ssl server name: "openresty.org"
-@@ -2149,7 +2149,7 @@ connected: 1
- failed to do SSL handshake: timeout
- 
- --- log_level: debug
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log
- lua ssl server name: "openresty.org"
-@@ -2221,7 +2221,7 @@ $::TestCertificateKey
- >>> test.crt
- $::TestCertificate"
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- no_error_log
- lua ssl server name:
-@@ -2292,10 +2292,10 @@ $::TestCertificateKey
- >>> test.crt
- $::TestCertificate"
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- no_error_log
- lua ssl server name:
-@@ -2372,7 +2372,7 @@ $::TestCertificateKey
- >>> test.crt
- $::TestCertificate"
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- no_error_log
- lua ssl server name:
-@@ -2474,10 +2474,10 @@ $::TestCertificateKey
- >>> test.crt
- $::TestCertificate"
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out eval
--qr/^lua ssl save session: ([0-9A-F]+):2
--lua ssl free session: ([0-9A-F]+):1
-+qr/^lua ssl save session: ([0-9A-F]+)
-+lua ssl free session: ([0-9A-F]+)
- $/
- --- error_log
- --- no_error_log
-@@ -2570,7 +2570,7 @@ $::TestCertificateKey
- >>> test.crt
- $::TestCertificate"
- 
----- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+:\d+/
-+--- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
- --- grep_error_log_out
- --- error_log
- lua ssl certificate verify error: (18: self signed certificate)
--- 
-2.15.1
-
-
-From 567bca126f4b9e71fbf9d473e85b975f190dcd3c Mon Sep 17 00:00:00 2001
-From: Alessandro Ghedini <alessandro@cloudflare.com>
-Date: Fri, 10 Jun 2016 13:23:21 +0100
-Subject: [PATCH 3/4] bugfix: ssl: do not access SSL struct directly for
- tlsext_status_type.
-
-In OpenSSL 1.1.0 it was made opaque, and a getter function was added.
----
- src/ngx_http_lua_ssl_ocsp.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/ngx_http_lua_ssl_ocsp.c b/src/ngx_http_lua_ssl_ocsp.c
-index 31b4f243..9ec8b509 100644
---- a/src/ngx_http_lua_ssl_ocsp.c
-+++ b/src/ngx_http_lua_ssl_ocsp.c
-@@ -468,7 +468,11 @@ ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
-         return NGX_ERROR;
-     }
- 
-+#ifdef SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE
-+    if (SSL_get_tlsext_status_type(ssl_conn) == -1) {
-+#else
-     if (ssl_conn->tlsext_status_type == -1) {
-+#endif
-         dd("no ocsp status req from client");
-         return NGX_DECLINED;
-     }
--- 
-2.15.1
-
-
-From 840ad10b8447f9ea1f0ddede344916d423029e67 Mon Sep 17 00:00:00 2001
-From: Alessandro Ghedini <alessandro@ghedini.me>
-Date: Tue, 13 Sep 2016 22:19:10 +0100
-Subject: [PATCH 4/4] bugfix: ssl: make SSL session callback build with OpenSSL
- 1.1.0.
-
----
- src/ngx_http_lua_ssl_session_fetchby.c | 9 ++++++---
- src/ngx_http_lua_ssl_session_fetchby.h | 6 +++++-
- src/ngx_http_lua_ssl_session_storeby.c | 8 ++++++--
- 3 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/src/ngx_http_lua_ssl_session_fetchby.c b/src/ngx_http_lua_ssl_session_fetchby.c
-index 3a3c1f54..2c75f6a9 100644
---- a/src/ngx_http_lua_ssl_session_fetchby.c
-+++ b/src/ngx_http_lua_ssl_session_fetchby.c
-@@ -171,8 +171,11 @@ ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
- 
- /* cached session fetching callback to be set with SSL_CTX_sess_set_get_cb */
- ngx_ssl_session_t *
--ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
--    int len, int *copy)
-+ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn,
-+#if OPENSSL_VERSION_NUMBER >= 0x10100003L
-+    const
-+#endif
-+    u_char *id, int len, int *copy)
- {
-     lua_State                       *L;
-     ngx_int_t                        rc;
-@@ -287,7 +290,7 @@ ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn, u_char *id,
-     cctx->exit_code = 1;  /* successful by default */
-     cctx->connection = c;
-     cctx->request = r;
--    cctx->session_id.data = id;
-+    cctx->session_id.data = (u_char *) id;
-     cctx->session_id.len = len;
-     cctx->entered_sess_fetch_handler = 1;
-     cctx->done = 0;
-diff --git a/src/ngx_http_lua_ssl_session_fetchby.h b/src/ngx_http_lua_ssl_session_fetchby.h
-index 5a6f96f5..50c6616d 100644
---- a/src/ngx_http_lua_ssl_session_fetchby.h
-+++ b/src/ngx_http_lua_ssl_session_fetchby.h
-@@ -25,7 +25,11 @@ char *ngx_http_lua_ssl_sess_fetch_by_lua_block(ngx_conf_t *cf,
-     ngx_command_t *cmd, void *conf);
- 
- ngx_ssl_session_t *ngx_http_lua_ssl_sess_fetch_handler(
--    ngx_ssl_conn_t *ssl_conn, u_char *id, int len, int *copy);
-+    ngx_ssl_conn_t *ssl_conn,
-+#if OPENSSL_VERSION_NUMBER >= 0x10100003L
-+    const
-+#endif
-+    u_char *id, int len, int *copy);
- #endif
- 
- 
-diff --git a/src/ngx_http_lua_ssl_session_storeby.c b/src/ngx_http_lua_ssl_session_storeby.c
-index f83e85d9..ce832ea1 100644
---- a/src/ngx_http_lua_ssl_session_storeby.c
-+++ b/src/ngx_http_lua_ssl_session_storeby.c
-@@ -172,6 +172,8 @@ int
- ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
-     ngx_ssl_session_t *sess)
- {
-+    const u_char                    *sess_id;
-+    unsigned int                     sess_id_len;
-     lua_State                       *L;
-     ngx_int_t                        rc;
-     ngx_connection_t                *c, *fc = NULL;
-@@ -247,11 +249,13 @@ ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
-         }
-     }
- 
-+    sess_id = SSL_SESSION_get_id(sess, &sess_id_len);
-+
-     cctx->connection = c;
-     cctx->request = r;
-     cctx->session = sess;
--    cctx->session_id.data = sess->session_id;
--    cctx->session_id.len = sess->session_id_length;
-+    cctx->session_id.data = (u_char *) sess_id;
-+    cctx->session_id.len = sess_id_len;
-     cctx->done = 0;
- 
-     dd("setting cctx");
--- 
-2.15.1
-
diff --git a/debian/modules/patches/http-lua/series b/debian/modules/patches/http-lua/series
index 7d0f424..6a8b245 100644
--- a/debian/modules/patches/http-lua/series
+++ b/debian/modules/patches/http-lua/series
@@ -1,2 +1 @@
-openssl-1.1.0.patch
 discover-luajit-2.1.patch

From bc3cf7aac73cedfab88a4f6b69516a98ef02e7f9 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Fri, 31 Aug 2018 15:14:55 +0300
Subject: [PATCH 261/600] http-fancyindex: Upgrade to 0.4.3

---
 debian/modules/control                        |  2 +-
 debian/modules/http-fancyindex/CHANGELOG.md   | 15 +++-
 debian/modules/http-fancyindex/README.rst     | 15 +++-
 .../ngx_http_fancyindex_module.c              | 22 ++---
 .../http-fancyindex/t/04-hasindex-html.test   | 24 ++++++
 .../http-fancyindex/t/05-sort-by-size.test    | 36 +++++++++
 debian/modules/http-fancyindex/t/get-pup      | 81 +++++++++++++++++++
 debian/modules/http-fancyindex/t/preamble     | 26 +++++-
 debian/modules/http-fancyindex/t/run          | 23 +++++-
 debian/modules/http-fancyindex/template.h     |  6 +-
 debian/modules/http-fancyindex/template.html  |  6 +-
 11 files changed, 229 insertions(+), 27 deletions(-)
 create mode 100644 debian/modules/http-fancyindex/t/04-hasindex-html.test
 create mode 100644 debian/modules/http-fancyindex/t/05-sort-by-size.test
 create mode 100755 debian/modules/http-fancyindex/t/get-pup

diff --git a/debian/modules/control b/debian/modules/control
index 1cb26ff..ec627be 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -55,7 +55,7 @@ Version: 0.1.0
 
 Module: http-fancyindex
 Homepage: https://github.com/aperezdc/ngx-fancyindex
-Version: 0.4.2
+Version: 0.4.3
 Files-Excluded: .gitignore .travis.yml
 
 Module: http-subs-filter
diff --git a/debian/modules/http-fancyindex/CHANGELOG.md b/debian/modules/http-fancyindex/CHANGELOG.md
index 6acc50f..580ec92 100644
--- a/debian/modules/http-fancyindex/CHANGELOG.md
+++ b/debian/modules/http-fancyindex/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.4.3] - 2018-07-03
+### Added
+- Table cells now have class names, which allows for better CSS styling.
+  (Patch by qjqqyy <<gyula@nyirfalvi.hu>>.)
+- The test suite now can parse and check elements from the HTML returned
+  by the module, thanks to the [pup](https://github.com/EricChiang/pup)
+  tool.
+
+### Fixed
+- Sorting by file size now works correctly.
+  (Patch by qjqqyy <<gyula@nyirfalvi.hu>>.)
+
 ## [0.4.2] - 2017-08-19
 ### Changed
 - Generated HTML from the default template is now proper HTML5, and it should
@@ -118,7 +130,8 @@ All notable changes to this project will be documented in this file.
 - `NEWS.rst` file, to act as change log.
 
 
-[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.2...HEAD
+[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.3...HEAD
+[0.4.3]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.6...v0.4.0
diff --git a/debian/modules/http-fancyindex/README.rst b/debian/modules/http-fancyindex/README.rst
index 0e3273c..b282b8b 100644
--- a/debian/modules/http-fancyindex/README.rst
+++ b/debian/modules/http-fancyindex/README.rst
@@ -39,7 +39,7 @@ Alternatively, add extras repository first (for future updates) and install the
 
     yum install nginx-module-fancyindex
     
-Then load the module in `/etc/nginx/nginx.conf` using
+Then load the module in `/etc/nginx/nginx.conf` using::
 
    load_module "modules/ngx_http_fancyindex_module.so";
 
@@ -51,7 +51,7 @@ series onwards will work.  Note that the modules *might* compile with
 versions in the 0.6 series by applying ``nginx-0.6-support.patch``, but this
 is unsupported (YMMV).
 
-In order to use the fancyindex_header_ and fancyindex_footer_ directives
+In order to use the ``fancyindex_header_`` and ``fancyindex_footer_`` directives
 you will also need the `ngx_http_addition_module <http://nginx.org/en/docs/http/ngx_http_addition_module.html>`_
 built into Nginx.
 
@@ -78,7 +78,8 @@ Building
 
    Since version 0.4.0, the module can also be built as a
    `dynamic module <https://www.nginx.com/resources/wiki/extending/converting/>`_,
-   using ``--add-dynamic-module=…`` instead and ``load_module "modules/ngx_http_fancyindex_module.so";`
+   using ``--add-dynamic-module=…`` instead and
+   ``load_module "modules/ngx_http_fancyindex_module.so";``
    in the configuration file
 
 4. Build and install the software::
@@ -114,8 +115,14 @@ achieved using the module:
   `@TheInsomniac <https://github.com/TheInsomniac>`__. Uses custom header and
   footer.
 * `Theme <https://github.com/Naereen/Nginx-Fancyindex-Theme>`__ by
-  `Naereen <https://github.com/Naereen/>`__. Uses custom header and footer, the
+  `@Naereen <https://github.com/Naereen/>`__. Uses custom header and footer, the
   header includes search field to filter by filename using JavaScript.
+* `Theme <https://github.com/fraoustin/Nginx-Fancyindex-Theme>`__ by
+  `@fraoustin <https://github.com/fraoustin>`__. Responsive theme using
+  Material Design elements.
+* `Theme <https://github.com/alehaa/nginx-fancyindex-flat-theme>`__ by
+  `@alehaa <https://github.com/alehaa>`__. Simple, flat theme based on
+  Bootstrap 4 and FontAwesome.
 
 
 Directives
diff --git a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
index 10331a5..64f98a1 100644
--- a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
+++ b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
@@ -772,7 +772,7 @@ make_content_buf(
          *     <td>size</td><td>date</td>
          *   </tr>
          */
-        len += ngx_sizeof_ssz("<tr><td><a href=\"")
+        len += ngx_sizeof_ssz("<tr><td class=\"link\"><a href=\"")
             + entry[i].name.len + entry[i].escape /* Escaped URL */
             + ngx_sizeof_ssz("?C=x&amp;O=y") /* URL sorting arguments */
             + ngx_sizeof_ssz("\" title=\"")
@@ -780,9 +780,9 @@ make_content_buf(
             + ngx_sizeof_ssz("\">")
             + entry[i].name.len + entry[i].utf_len
             + alcf->name_length + ngx_sizeof_ssz("&gt;")
-            + ngx_sizeof_ssz("</a></td><td>")
+            + ngx_sizeof_ssz("</a></td><td class=\"size\">")
             + 20 /* File size */
-            + ngx_sizeof_ssz("</td><td>")    /* Date prefix */
+            + ngx_sizeof_ssz("</td><td class=\"date\">")    /* Date prefix */
             + ngx_sizeof_ssz("</td></tr>\n") /* Date suffix */
             + 2 /* CR LF */
             ;
@@ -904,7 +904,7 @@ make_content_buf(
     if (r->uri.len > 1) {
         b->last = ngx_cpymem_ssz(b->last,
                                  "<tr>"
-                                 "<td><a href=\"../");
+                                 "<td class=\"link\"><a href=\"../");
         if (*sort_url_args) {
             b->last = ngx_cpymem(b->last,
                                  sort_url_args,
@@ -912,14 +912,14 @@ make_content_buf(
         }
         b->last = ngx_cpymem_ssz(b->last,
                                  "\">Parent directory/</a></td>"
-                                 "<td>-</td>"
-                                 "<td>-</td>"
+                                 "<td class=\"size\">-</td>"
+                                 "<td class=\"date\">-</td>"
                                  "</tr>");
     }
 
     /* Entries for directories and files */
     for (i = 0; i < entries.nelts; i++) {
-        b->last = ngx_cpymem_ssz(b->last, "<tr><td><a href=\"");
+        b->last = ngx_cpymem_ssz(b->last, "<tr><td class=\"link\"><a href=\"");
 
         if (entry[i].escape) {
             ngx_fancyindex_escape_uri(b->last,
@@ -967,7 +967,7 @@ make_content_buf(
         }
 
         if (len > alcf->name_length) {
-            b->last = ngx_cpymem_ssz(last, "..&gt;</a></td><td>");
+            b->last = ngx_cpymem_ssz(last, "..&gt;</a></td><td class=\"size\">");
 
         } else {
             if (entry[i].dir && alcf->name_length - len > 0) {
@@ -975,7 +975,7 @@ make_content_buf(
                 len++;
             }
 
-            b->last = ngx_cpymem_ssz(b->last, "</a></td><td>");
+            b->last = ngx_cpymem_ssz(b->last, "</a></td><td class=\"size\">");
         }
 
         if (alcf->exact_size) {
@@ -1005,7 +1005,7 @@ make_content_buf(
         }
 
         ngx_gmtime(entry[i].mtime + tp->gmtoff * 60 * alcf->localtime, &tm);
-        b->last = ngx_cpymem_ssz(b->last, "</td><td>");
+        b->last = ngx_cpymem_ssz(b->last, "</td><td class=\"date\">");
         b->last = ngx_fancyindex_timefmt(b->last, &alcf->time_format, &tm);
         b->last = ngx_cpymem_ssz(b->last, "</td></tr>");
 
@@ -1229,7 +1229,7 @@ ngx_http_fancyindex_cmp_entries_size_desc(const void *one, const void *two)
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
     ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    return (first->size > second->size) - (first->size < second->size);
+    return (first->size < second->size) - (first->size > second->size);
 }
 
 
diff --git a/debian/modules/http-fancyindex/t/04-hasindex-html.test b/debian/modules/http-fancyindex/t/04-hasindex-html.test
new file mode 100644
index 0000000..69ac222
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/04-hasindex-html.test
@@ -0,0 +1,24 @@
+#! /bin/bash
+cat <<---
+This test fetches the root directory served by Nginx, which has no index
+file, and checks the output contains a few HTML elements know to exist in
+a directory index.
+--
+use pup
+nginx_start
+
+content=$( fetch )
+
+# Check page title
+[[ $(pup -p title text{} <<< "${content}") = 'Index of /' ]]
+
+# Check table headers
+[[ $(pup -n body table thead th a:first-child <<< "${content}") -eq 3 ]]
+{
+	read -r name_label
+	read -r size_label
+	read -r date_label
+} < <(  pup -p body table thead th a:first-child text{} <<< "${content}" )
+[[ ${name_label} = File\ Name ]]
+[[ ${size_label} = File\ Size ]]
+[[ ${date_label} = Date ]]
diff --git a/debian/modules/http-fancyindex/t/05-sort-by-size.test b/debian/modules/http-fancyindex/t/05-sort-by-size.test
new file mode 100644
index 0000000..23fade9
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/05-sort-by-size.test
@@ -0,0 +1,36 @@
+#! /bin/bash
+cat <<---
+This test validates that the sorting by file size works.
+--
+use pup
+nginx_start
+
+# Ascending sort.
+previous=''
+while read -r size ; do
+	if [[ ${size} = - ]] ; then
+		continue
+	fi
+	if [[ -z ${previous} ]] ; then
+		previous=${size}
+		continue
+	fi
+	[[ ${previous} -le ${size} ]] || fail \
+		'Size %d should be smaller than %d\n' "${previous}" "${size}"
+done < <( fetch '/?C=S&O=A' \
+	    | pup -p body table tbody 'td:nth-child(2)' text{} )
+
+# Descending sort.
+previous=''
+while read -r size ; do
+	if [[ ${size} = - ]] ; then
+		continue
+	fi
+	if [[ -z ${previous} ]] ; then
+		previous=${size}
+		continue
+	fi
+	[[ ${previous} -ge ${size} ]] || fail \
+		'Size %d should be greater than %d\n' "${previous}" "${size}"
+done < <( fetch '/?C=S&O=D' \
+	    | pup -p body table tbody 'td:nth-child(2)' text{} )
diff --git a/debian/modules/http-fancyindex/t/get-pup b/debian/modules/http-fancyindex/t/get-pup
new file mode 100755
index 0000000..613dac7
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/get-pup
@@ -0,0 +1,81 @@
+#! /bin/bash
+set -e
+
+declare -r VERSION='0.4.0'
+declare -r SHASUMS='\
+75c27caa0008a9cc639beb7506077ad9f32facbffcc4e815e999eaf9588a527e  pup_v0.4.0_darwin_386.zip
+c539a697efee2f8e56614a54cb3b215338e00de1f6a7c2fa93144ab6e1db8ebe  pup_v0.4.0_darwin_amd64.zip
+259eee82c7d7d766f1b8f93a382be21dcfefebc855a9ce8124fd78717f9df439  pup_v0.4.0_dragonfly_amd64.zip
+ba0fe5e87a24cab818e5d2efdd7540714ddfb1b7246600135915c666fdf1a601  pup_v0.4.0_freebsd_386.zip
+1838ef84ec1f961e8009d19a4d1e6a23b926ee315da3d60c08878f3d69af5692  pup_v0.4.0_freebsd_amd64.zip
+6886a9c60a912a810d012610bc3f784f0417999ff7d7df833a0695b9af60395b  pup_v0.4.0_freebsd_arm.zip
+e486b32ca07552cd3aa713cbf2f9d1b6e210ddb51d34b3090c7643f465828057  pup_v0.4.0_linux_386.zip
+ec3d29e9fb375b87ac492c8b546ad6be84b0c0b49dab7ff4c6b582eac71ba01c  pup_v0.4.0_linux_amd64.zip
+c09b669fa8240f4f869dee7d34ee3c7ea620a0280cee1ea7d559593bcdd062c9  pup_v0.4.0_linux_arm64.zip
+ebf70b3c76c02e0202c94af7ef06dcb3ecc866d1b9b84453d43fe01fa5dd5870  pup_v0.4.0_linux_arm.zip
+a98a4d1f3c3a103e8ebe1a7aba9cb9d3cb045003208ca6f5f3d54889a225f267  pup_v0.4.0_linux_mips64le.zip
+8e471cf6cfa118b2497bb3f42a7a48c52d0096107f748f37216855c8ab94f8e5  pup_v0.4.0_linux_mips64.zip
+cfda9375eba65f710e052b1b59893c228c3fc92b0510756bb3f02c25938eee30  pup_v0.4.0_linux_ppc64le.zip
+91a1e07ffb2c373d6053252e4de732f5db78c8eace49c6e1a0ef52402ecdf56c  pup_v0.4.0_linux_ppc64.zip
+fdc9b28a3daac5ad096023e1647292a7eccea6d9b1686f871307dae9f3bd064f  pup_v0.4.0_nacl_386.zip
+c8d3c9b56783bd5a55446f4580e1835606b2b945da2d1417ed509c5927a5f8bc  pup_v0.4.0_nacl_amd64p32.zip
+48c068c4353672528c8c3447a536208b0719f1e6d0f8fab8416b38b63ad0c1d9  pup_v0.4.0_nacl_arm.zip
+7a27497b2f0be95c51bb2cbc25da12efba682c4f766bc5abc5742e9fc8d1eeb0  pup_v0.4.0_netbsd_386.zip
+71a1808eb1b6442aa45d1de9e1c4fca543b2754c1aff5ba3d62b3456f9519691  pup_v0.4.0_netbsd_amd64.zip
+928e6691b11c68ae3f28826848a13dc5c1c9673848fe7cf7f80dd76c9fb6e8a6  pup_v0.4.0_netbsd_arm.zip
+5aca20a9b3264d2fde5a8d32f213c434edf9570ee6fae18953b8fff09d2976e2  pup_v0.4.0_openbsd_386.zip
+e965c6f04b897240d84c60e2c18226deb231a657c5583680f58a61051ff5a100  pup_v0.4.0_openbsd_amd64.zip
+30bc88a1e06606f4f3449af9fbf586f97c2e958677460a72bb1a168f67c4911c  pup_v0.4.0_openbsd_arm.zip
+9d50decf4572292f187cfec84660648d648336bc6109e1f032b1699ba1d28549  pup_v0.4.0_plan9_386.zip
+1b2a6bd2388ddd691ca429497d88b2b047ec8dfb7bce9436925cb2f30632bf8e  pup_v0.4.0_plan9_amd64.zip
+0835de9c10a9e2b3b958b82d148da49eaafc695fe4a018cbaf7bb861b455583f  pup_v0.4.0_solaris_amd64.zip
+01acae220b69fb1ba8477d0e7f4d7669ef5de147966dc819cf75a845af74c5f3  pup_v0.4.0_windows_386.zip
+6755cbd43e94eaf173689e93e914c7056a2249c2977e5b90024fb397f9b45ba4  pup_v0.4.0_windows_amd64.zip
+'
+
+declare -r BASEURL="https://github.com/ericchiang/pup/releases/download/v${VERSION}"
+declare -r TDIR=$(dirname "$0")
+ARCH=''
+OS=''
+
+case $(uname -m) in
+	x86_64 | amd64 ) ARCH=amd64 ;;
+	i[3456]86 ) ARCH=386 ;;
+esac
+
+OS=$(uname -s | tr 'A-Z' 'a-z')
+case ${OS} in
+	linux | freebsd | openbsd | netbsd | darwin ) ;;
+	* ) OS=''
+esac
+
+if [[ -z ${ARCH} || -z ${OS} ]] ; then
+	echo "pup ${VERSION} is not available for $(uname -s) on $(uname -m)" 1>&2
+	exit 1
+fi
+
+declare -r ZIPFILE="pup_v${VERSION}_${OS}_${ARCH}.zip"
+EXPECT_SHA=''
+
+while read sum fname ; do
+	if [[ ${fname} = ${ZIPFILE} ]] ; then
+		EXPECT_SHA=${sum}
+		break
+	fi
+done <<< "${SHASUMS}"
+
+wget -cO "${TDIR}/${ZIPFILE}" "${BASEURL}/${ZIPFILE}"
+
+read -r GOT_SHA _ < <( sha256sum "${TDIR}/${ZIPFILE}" )
+if [[ ${EXPECT_SHA} = ${GOT_SHA} ]] ; then
+	echo "Checksum for ${ZIPFILE} verified :-)"
+else
+	rm -f "${TDIR}/${ZIPFILE}" "${TDIR}/pup"
+	echo "Checksum for ${ZIPFILE} does not match :-("
+	echo "   Expected: ${EXPECT_SHA}"
+	echo "        Got: ${GOT_SHA}"
+	exit 2
+fi 1>&2
+
+rm -f "${TDIR}/pup"
+unzip "${TDIR}/${ZIPFILE}" pup -d "${TDIR}"
diff --git a/debian/modules/http-fancyindex/t/preamble b/debian/modules/http-fancyindex/t/preamble
index a571381..d3e4e30 100644
--- a/debian/modules/http-fancyindex/t/preamble
+++ b/debian/modules/http-fancyindex/t/preamble
@@ -39,6 +39,22 @@ readonly NGINX_PID="${PREFIX}/logs/nginx.pid"
 rm -f "${NGINX_CONF}" "${NGINX_PID}"
 mkdir -p "${PREFIX}/logs"
 
+function pup () {
+	if [[ -x ${TESTDIR}/pup ]] ; then
+		"${TESTDIR}/pup" "$@"
+	else
+		skip 'Test uses "pup", which is not available'
+	fi
+}
+
+function use () {
+	case $1 in
+		pup ) [[ -x ${TESTDIR}/pup ]] \
+			|| skip 'Test uses "pup", which is unavailable\n' ;;
+		* ) warn "Invalid 'use' flag: '%s'\n'" "$1" ;;
+	esac
+}
+
 function nginx () {
 	env - PATH="${PATH}" "${PREFIX}/sbin/nginx" "$@"
 }
@@ -72,13 +88,19 @@ function fetch () {
 	wget "${opts[@]}" -O- "http://localhost:8888${1:-/}" 2>&1
 }
 
+function skip () {
+	printf '(--) '
+	printf "$@"
+	exit 111
+} 1>&2
+
 function fail () {
-	printf "(FF) "
+	printf '(FF) '
 	printf "$@"
 	exit 1
 } 1>&2
 
 function warn () {
-	printf "(WW)"
+	printf '(WW) '
 	printf "$@"
 } 1>&2
diff --git a/debian/modules/http-fancyindex/t/run b/debian/modules/http-fancyindex/t/run
index dda4c59..06cc3db 100755
--- a/debian/modules/http-fancyindex/t/run
+++ b/debian/modules/http-fancyindex/t/run
@@ -25,6 +25,7 @@ readonly dynamic
 
 declare -a t_pass=( )
 declare -a t_fail=( )
+declare -a t_skip=( )
 
 for t in `ls "$T"/*.test | sort -R` ; do
 	name="t/${t##*/}"
@@ -43,6 +44,9 @@ for t in `ls "$T"/*.test | sort -R` ; do
 	if bash -e "${shfile}" > "${outfile}" 2> "${errfile}" ; then
 		t_pass+=( "${name}" )
 		printf 'passed\n'
+	elif [[ $? -eq 111 ]] ; then
+		t_skip+=( "${name}" )
+		printf 'skipped\n'
 	else
 		t_fail+=( "${name}" )
 		printf 'failed\n'
@@ -59,8 +63,23 @@ for name in "${t_fail[@]}" ; do
 	echo
 done
 
-printf '=== passed/failed/total: %d/%d/%d\n' \
-	${#t_pass[@]} ${#t_fail[@]} $(( ${#t_pass[@]} + ${#t_fail[@]} ))
+if [[ ${#t_skip[@]} -gt 0 ]] ; then
+	echo
+	printf 'Skipped tests:\n'
+	for name in "${t_skip[@]}" ; do
+		reason=$(grep '^(\-\-) ' "${name}.err" | head -1)
+		if [[ -z ${reason} ]] ; then
+			reason='No reason given'
+		else
+			reason=${reason:5}
+		fi
+		printf ' - %s: %s\n' "${name}" "${reason:-No reason given}"
+	done
+	echo
+fi
+
+printf '=== passed/skipped/failed/total: %d/%d/%d/%d\n' \
+	${#t_pass[@]} ${#t_skip[@]} ${#t_fail[@]} $(( ${#t_pass[@]} + ${#t_fail[@]} ))
 
 if [[ ${#t_fail[@]} -gt 0 ]] ; then
 	exit 1
diff --git a/debian/modules/http-fancyindex/template.h b/debian/modules/http-fancyindex/template.h
index e08ba01..27b9500 100644
--- a/debian/modules/http-fancyindex/template.h
+++ b/debian/modules/http-fancyindex/template.h
@@ -67,9 +67,9 @@ static const u_char t06_list1[] = ""
 ;
 static const u_char t_parentdir_entry[] = ""
 "<tr>"
-"<td><a href=\"../?C=N&amp;O=A\">Parent directory/</a></td>"
-"<td>-</td>"
-"<td>-</td>"
+"<td class=\"link\"><a href=\"../?C=N&amp;O=A\">Parent directory/</a></td>"
+"<td class=\"size\">-</td>"
+"<td class=\"date\">-</td>"
 "</tr>"
 "\n"
 ;
diff --git a/debian/modules/http-fancyindex/template.html b/debian/modules/http-fancyindex/template.html
index 30de0a8..8e478f8 100644
--- a/debian/modules/http-fancyindex/template.html
+++ b/debian/modules/http-fancyindex/template.html
@@ -64,9 +64,9 @@
 			<tbody>
 <!-- var t_parentdir_entry -->
 				<tr>
-					<td><a href="../?C=N&amp;O=A">Parent directory/</a></td>
-					<td>-</td>
-					<td>-</td>
+					<td class="link"><a href="../?C=N&amp;O=A">Parent directory/</a></td>
+					<td class="size">-</td>
+					<td class="date">-</td>
 				</tr>
 
 <!-- var NONE -->

From e36dee7443a2a035b14ce25c288d620169b2c901 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Tue, 19 Jun 2018 16:54:39 +0300
Subject: [PATCH 262/600] Order nginx after nss-lookup.target to synchronize
 host/network name lookups

See systemd.special(7)

Closes: #900790
---
 debian/nginx-common.nginx.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/nginx-common.nginx.service b/debian/nginx-common.nginx.service
index a909641..2f4286f 100644
--- a/debian/nginx-common.nginx.service
+++ b/debian/nginx-common.nginx.service
@@ -13,7 +13,7 @@
 [Unit]
 Description=A high performance web server and a reverse proxy server
 Documentation=man:nginx(8)
-After=network.target
+After=network.target nss-lookup.target
 
 [Service]
 Type=forking

From 6d142fab1b08164b532f837f003fff0d78512783 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Fri, 31 Aug 2018 15:21:56 +0300
Subject: [PATCH 263/600] Merge ru translations

Thanks: Lev Lamberov
Closes: #883104
---
 debian/po/ru.po | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 debian/po/ru.po

diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 0000000..fdaa738
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,59 @@
+# Nginx debconf translations
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2017-11-29 23:17+0500\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.0.4\n"
+"Last-Translator: Lev Lamberov <dogsleg@debian.org>\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: ru\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Возможно небезопасные файлы журналов nginx"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"Следующие файлы журналов в каталоге /var/log/nginx представляют собой "
+"символьные ссылки, владельцем которых является www-data:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Начиная с версии 1.4.4-4 владельцем /var/log/nginx является www-data. В "
+"результате www-data может создавать символьные ссылки, указывающие на "
+"чувствительные файлы, что, в свою очередь, может приводить к повышению "
+"привилегий. Хотя права доступа к /var/log/nginx в настоящее время "
+"исправлены, вполне вероятно, что такие небезопасные ссылки уже существуют. "
+"Поэтому обязательно проверьте приведённый выше каталог."

From 87dc3692ff27b20a162917a9bb832f9340e2cb89 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Fri, 31 Aug 2018 15:28:27 +0300
Subject: [PATCH 264/600] Release 1.14.0-1

---
 debian/changelog | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93d1da1..2361b64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,20 @@
-nginx (1.13.12-2) UNRELEASED; urgency=low
+nginx (1.14.0-1) unstable; urgency=medium
 
   [ Kartik Mistry ]
   * debian/control:
     + Removed duplicate Build-Depends.
     + Use https in Homepage.
 
- -- Kartik Mistry <kartik@debian.org>  Thu, 30 Aug 2018 13:41:33 +0530
+  [ Christos Trochalakis ]
+  * http-lua: Upgrade to 0.10.13
+  * http-lua: Drop our OpenSSL patch, OpenSSL 1.1 is now supported upstream
+  * http-fancyindex: Upgrade to 0.4.3
+  * Order nginx after nss-lookup.target to synchronize host/network name lookups
+    (Closes: #900790)
+  * Merge ru translations.
+    Thanks to Lev Lamberov (Closes: #883104)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 31 Aug 2018 15:28:04 +0300
 
 nginx (1.13.12-1) unstable; urgency=medium
 

From 5d21039949aa4b8dd9bbfff120a1cf0bd881b786 Mon Sep 17 00:00:00 2001
From: Kartik Mistry <kartik.mistry@gmail.com>
Date: Thu, 6 Sep 2018 16:22:26 +0530
Subject: [PATCH 265/600] Fixed trailing whitespaces from changelog and removed
 unused lintian override

---
 debian/changelog                              | 24 ++++++++++++-------
 .../libnginx-mod-http-perl.lintian-overrides  |  1 -
 2 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 debian/libnginx-mod-http-perl.lintian-overrides

diff --git a/debian/changelog b/debian/changelog
index 2361b64..1ca679f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.14.0-2) UNRELEASED; urgency=low
+
+  [ Kartik Mistry ]
+  * Removed unused lintian override.
+  * Fixed trailing whitespaces in changelog.
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 06 Sep 2018 16:20:03 +0530
+
 nginx (1.14.0-1) unstable; urgency=medium
 
   [ Kartik Mistry ]
@@ -2034,14 +2042,14 @@ nginx (0.7.61-2) unstable; urgency=low
 nginx (0.7.61-1) unstable; urgency=low
 
   * New upstream version:
-    *) Bugfix: nginx could not be built --without-http-cache; the bug had 
+    *) Bugfix: nginx could not be built --without-http-cache; the bug had
        appeared in 0.7.60.
-    *) Bugfix: a segmentation fault occurred in worker process, if a 
-       backend 401 error was intercepted and the backend did not set the 
+    *) Bugfix: a segmentation fault occurred in worker process, if a
+       backend 401 error was intercepted and the backend did not set the
        "WWW-Authenticate" response header line.
        Thanks to Eugene Mychlo.
     *) Feature: the "keepalive_requests" directive.
-    *) Bugfix: in open_file_cache and proxy/fastcgi cache interaction on 
+    *) Bugfix: in open_file_cache and proxy/fastcgi cache interaction on
        start up.
     *) Bugfix: open_file_cache might cache open file descriptors too long.
     *) Bugfix: XLST filter did not work in subrequests.
@@ -2172,14 +2180,14 @@ nginx (0.5.33-1) unstable; urgency=low
   * New stable upstream release (Closes: #451173)
   * nginx now provides httpd, httpd-cgi virtual packages
     (Closes: #439468, #452025)
-  * sites-enabled/default link is now provided only on fresh 
+  * sites-enabled/default link is now provided only on fresh
     installations (Closes: #432961)
   * Updated code for online upgrading of nginx (Closes: #445246)
   * Reviewed maintainer scripts for correct behaviour on updates
     (Closes: #452787, #435965)
   * Removed debian/nginx.links and debian/preinst.
   * Changing Maintainer address to bureado@debian.org.
-  * Welcoming Fabio Tranchitella <kobold@debian.org> as an nginx 
+  * Welcoming Fabio Tranchitella <kobold@debian.org> as an nginx
     uploader for Debian. Thanks for your patches.
 
  -- Jose Parrella <bureado@debian.org>  Sat, 08 Dec 2007 11:27:54 -0400
@@ -2187,7 +2195,7 @@ nginx (0.5.33-1) unstable; urgency=low
 nginx (0.5.30-1) unstable; urgency=low
 
   * New stable upstream release.
-  * Adding mime.types (and other upstream conffiles) to the package 
+  * Adding mime.types (and other upstream conffiles) to the package
     since it was lost on 0.5.26 (Closes: #435964)
 
  -- Jose Parrella <joseparrella@cantv.net>  Sat, 04 Aug 2007 10:39:40 -0400
@@ -2217,7 +2225,7 @@ nginx (0.5.13-1) unstable; urgency=low
 
 nginx (0.5.12-2) unstable; urgency=low
 
-  * Patching src/core/ngx_shmtx.h in order to solve FTBFS problems in 
+  * Patching src/core/ngx_shmtx.h in order to solve FTBFS problems in
     non-x86 archs (Thanks to Igor Sysoev) (Closes: #410884)
 
  -- Jose Parrella <joseparrella@cantv.net>  Wed, 14 Feb 2007 13:32:01 -0400
diff --git a/debian/libnginx-mod-http-perl.lintian-overrides b/debian/libnginx-mod-http-perl.lintian-overrides
deleted file mode 100644
index cda1f30..0000000
--- a/debian/libnginx-mod-http-perl.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnginx-mod-http-perl: wrong-section-according-to-package-name libnginx-mod-http-perl => perl

From f6cff46e2297df3e1664b038fd8d3a4efb4d5222 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 7 Nov 2018 07:12:26 +0200
Subject: [PATCH 266/600] New upstream version 1.14.1

---
 CHANGES                                 | 13 +++++++++++++
 CHANGES.ru                              | 14 ++++++++++++++
 src/core/nginx.h                        |  4 ++--
 src/http/modules/ngx_http_grpc_module.c | 15 +++++++++++++++
 src/http/modules/ngx_http_mp4_module.c  |  7 +++++++
 src/http/v2/ngx_http_v2.c               | 25 +++++++++++++++++++++----
 src/http/v2/ngx_http_v2.h               |  2 ++
 7 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9d88346..590c0f4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,17 @@
 
+Changes with nginx 1.14.1                                        06 Nov 2018
+
+    *) Security: when using HTTP/2 a client might cause excessive memory
+       consumption (CVE-2018-16843) and CPU usage (CVE-2018-16844).
+
+    *) Security: processing of a specially crafted mp4 file with the
+       ngx_http_mp4_module might result in worker process memory disclosure
+       (CVE-2018-16845).
+
+    *) Bugfix: working with gRPC backends might result in excessive memory
+       consumption.
+
+
 Changes with nginx 1.14.0                                        17 Apr 2018
 
     *) 1.14.x stable branch.
diff --git a/CHANGES.ru b/CHANGES.ru
index 3accd44..32bb931 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,18 @@
 
+Изменения в nginx 1.14.1                                          06.11.2018
+
+    *) Безопасность: при использовании HTTP/2 клиент мог вызвать чрезмерное
+       потреблению памяти (CVE-2018-16843) и ресурсов процессора
+       (CVE-2018-16844).
+
+    *) Безопасность: при обработке специально созданного mp4-файла модулем
+       ngx_http_mp4_module содержимое памяти рабочего процесса могло быть
+       отправлено клиенту (CVE-2018-16845).
+
+    *) Исправление: при работе с gRPC-бэкендами могло расходоваться большое
+       количество памяти.
+
+
 Изменения в nginx 1.14.0                                          17.04.2018
 
     *) Стабильная ветка 1.14.x.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index be4563d..4f67659 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1014000
-#define NGINX_VERSION      "1.14.0"
+#define nginx_version      1014001
+#define NGINX_VERSION      "1.14.1"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
index 837ad9a..758f89e 100644
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -78,6 +78,9 @@ typedef struct {
 
     ngx_uint_t                 id;
 
+    ngx_uint_t                 pings;
+    ngx_uint_t                 settings;
+
     ssize_t                    send_window;
     size_t                     recv_window;
 
@@ -3531,6 +3534,12 @@ ngx_http_grpc_parse_settings(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
                           ctx->rest);
             return NGX_ERROR;
         }
+
+        if (ctx->free == NULL && ctx->settings++ > 1000) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent too many settings frames");
+            return NGX_ERROR;
+        }
     }
 
     for (p = b->pos; p < last; p++) {
@@ -3683,6 +3692,12 @@ ngx_http_grpc_parse_ping(ngx_http_request_t *r,
                           "upstream sent ping frame with ack flag");
             return NGX_ERROR;
         }
+
+        if (ctx->free == NULL && ctx->pings++ > 1000) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream sent too many ping frames");
+            return NGX_ERROR;
+        }
     }
 
     for (p = b->pos; p < last; p++) {
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 08a68d0..2a6fafa 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -942,6 +942,13 @@ ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4,
                 atom_size = ngx_mp4_get_64value(atom_header + 8);
                 atom_header_size = sizeof(ngx_mp4_atom_header64_t);
 
+                if (atom_size < sizeof(ngx_mp4_atom_header64_t)) {
+                    ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                                  "\"%s\" mp4 atom is too small:%uL",
+                                  mp4->file.name.data, atom_size);
+                    return NGX_ERROR;
+                }
+
             } else {
                 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
                               "\"%s\" mp4 atom is too small:%uL",
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 77ebb84..12214e1 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -664,6 +664,7 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
 
     h2c->pool = NULL;
     h2c->free_frames = NULL;
+    h2c->frames = 0;
     h2c->free_fake_connections = NULL;
 
 #if (NGX_HTTP_SSL)
@@ -2895,7 +2896,7 @@ ngx_http_v2_get_frame(ngx_http_v2_connection_t *h2c, size_t length,
 
         frame->blocked = 0;
 
-    } else {
+    } else if (h2c->frames < 10000) {
         pool = h2c->pool ? h2c->pool : h2c->connection->pool;
 
         frame = ngx_pcalloc(pool, sizeof(ngx_http_v2_out_frame_t));
@@ -2919,6 +2920,15 @@ ngx_http_v2_get_frame(ngx_http_v2_connection_t *h2c, size_t length,
         frame->last = frame->first;
 
         frame->handler = ngx_http_v2_frame_handler;
+
+        h2c->frames++;
+
+    } else {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "http2 flood detected");
+
+        h2c->connection->error = 1;
+        return NULL;
     }
 
 #if (NGX_DEBUG)
@@ -4471,12 +4481,19 @@ ngx_http_v2_idle_handler(ngx_event_t *rev)
 
 #endif
 
-    c->destroyed = 0;
-    ngx_reusable_connection(c, 0);
-
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
                                          ngx_http_v2_module);
 
+    if (h2c->idle++ > 10 * h2scf->max_requests) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "http2 flood detected");
+        ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
+        return;
+    }
+
+    c->destroyed = 0;
+    ngx_reusable_connection(c, 0);
+
     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
     if (h2c->pool == NULL) {
         ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index ebd0e77..bec2216 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -120,6 +120,8 @@ struct ngx_http_v2_connection_s {
     ngx_http_connection_t           *http_connection;
 
     ngx_uint_t                       processing;
+    ngx_uint_t                       frames;
+    ngx_uint_t                       idle;
 
     ngx_uint_t                       pushing;
     ngx_uint_t                       concurrent_pushes;

From 5f4d461c67d4664f3149a2fdf9f73631fe271645 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Wed, 7 Nov 2018 07:18:38 +0200
Subject: [PATCH 267/600] Release 1.14.1-1

---
 debian/changelog | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ca679f..d08388f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-nginx (1.14.0-2) UNRELEASED; urgency=low
+nginx (1.14.1-1) unstable; urgency=medium
 
   [ Kartik Mistry ]
   * Removed unused lintian override.
   * Fixed trailing whitespaces in changelog.
 
- -- Kartik Mistry <kartik@debian.org>  Thu, 06 Sep 2018 16:20:03 +0530
+  [ Christos Trochalakis ]
+  * New upstream version. (Closes: #913090)
+    + CVE-2018-16843 Excessive memory usage in HTTP/2
+    + CVE-2018-16844 Excessive CPU usage in HTTP/2
+    + CVE-2018-16845 Memory disclosure in the ngx_http_mp4_module
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 07 Nov 2018 07:16:00 +0200
 
 nginx (1.14.0-1) unstable; urgency=medium
 

From fd3bbc2f43a9fda3e781db2292fdfcaee1b29461 Mon Sep 17 00:00:00 2001
From: Olaf van der Spek <olafvdspek@gmail.com>
Date: Fri, 23 Nov 2018 13:34:13 +0100
Subject: [PATCH 268/600] Reference PHP 7.3 (Closes: 913250)

---
 debian/conf/sites-available/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/conf/sites-available/default b/debian/conf/sites-available/default
index c841ceb..f5c5e1b 100644
--- a/debian/conf/sites-available/default
+++ b/debian/conf/sites-available/default
@@ -57,7 +57,7 @@ server {
 	#	include snippets/fastcgi-php.conf;
 	#
 	#	# With php-fpm (or other unix sockets):
-	#	fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
+	#	fastcgi_pass unix:/run/php/php7.3-fpm.sock;
 	#	# With php-cgi (or other tcp sockets):
 	#	fastcgi_pass 127.0.0.1:9000;
 	#}

From 0b00911581718724d5fd0f03320f4eec5846e62e Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Tue, 20 Nov 2018 12:33:53 +0200
Subject: [PATCH 269/600] Adjust fastcgi_split_path_info snippet to handle the
 `/example.php/` case

We switched to regexp suggest in Nginx docs found at
https://www.nginx.com/resources/wiki/start/topics/examples/phpfcgi/

Closes: #911398
---
 debian/conf/snippets/fastcgi-php.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/conf/snippets/fastcgi-php.conf b/debian/conf/snippets/fastcgi-php.conf
index 8f8e4a2..467a9e7 100644
--- a/debian/conf/snippets/fastcgi-php.conf
+++ b/debian/conf/snippets/fastcgi-php.conf
@@ -1,5 +1,5 @@
 # regex to split $uri to $fastcgi_script_name and $fastcgi_path
-fastcgi_split_path_info ^(.+\.php)(/.+)$;
+fastcgi_split_path_info ^(.+?\.php)(/.*)$;
 
 # Check that the PHP script exists before passing it
 try_files $fastcgi_script_name =404;

From 6fac1fb9f0453cbf6539515ba78181f99de159c1 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Tue, 4 Dec 2018 17:22:42 +0200
Subject: [PATCH 270/600] New upstream version 1.14.2

---
 CHANGES                                    |  33 +++++
 CHANGES.ru                                 |  34 +++++
 src/core/nginx.h                           |   4 +-
 src/event/ngx_event_accept.c               |  12 ++
 src/event/ngx_event_openssl.c              |  30 ++++-
 src/event/ngx_event_openssl.h              |   4 +
 src/http/modules/ngx_http_fastcgi_module.c |   6 +-
 src/http/modules/ngx_http_grpc_module.c    | 142 ++++++++++++++-------
 src/http/modules/ngx_http_mp4_module.c     |   9 +-
 src/http/modules/ngx_http_proxy_module.c   |   3 +-
 src/http/modules/ngx_http_scgi_module.c    |   6 +-
 src/http/modules/ngx_http_uwsgi_module.c   |   6 +-
 src/http/ngx_http_request.c                |   2 +-
 src/http/ngx_http_script.c                 |  13 +-
 src/http/ngx_http_upstream.c               |  15 ++-
 src/os/unix/ngx_user.c                     |   4 -
 src/stream/ngx_stream_script.c             |  13 +-
 17 files changed, 263 insertions(+), 73 deletions(-)

diff --git a/CHANGES b/CHANGES
index 590c0f4..597c270 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,37 @@
 
+Changes with nginx 1.14.2                                        04 Dec 2018
+
+    *) Bugfix: nginx could not be built by gcc 8.1.
+
+    *) Bugfix: nginx could not be built on Fedora 28 Linux.
+
+    *) Bugfix: in handling of client addresses when using unix domain listen
+       sockets to work with datagrams on Linux.
+
+    *) Change: the logging level of the "http request", "https proxy
+       request", "unsupported protocol", "version too low", "no suitable key
+       share", and "no suitable signature algorithm" SSL errors has been
+       lowered from "crit" to "info".
+
+    *) Bugfix: when using OpenSSL 1.1.0 or newer it was not possible to
+       switch off "ssl_prefer_server_ciphers" in a virtual server if it was
+       switched on in the default server.
+
+    *) Bugfix: nginx could not be built with LibreSSL 2.8.0.
+
+    *) Bugfix: if nginx was built with OpenSSL 1.1.0 and used with OpenSSL
+       1.1.1, the TLS 1.3 protocol was always enabled.
+
+    *) Bugfix: sending a disk-buffered request body to a gRPC backend might
+       fail.
+
+    *) Bugfix: connections with some gRPC backends might not be cached when
+       using the "keepalive" directive.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if the
+       ngx_http_mp4_module was used on 32-bit platforms.
+
+
 Changes with nginx 1.14.1                                        06 Nov 2018
 
     *) Security: when using HTTP/2 a client might cause excessive memory
diff --git a/CHANGES.ru b/CHANGES.ru
index 32bb931..8c260fe 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,38 @@
 
+Изменения в nginx 1.14.2                                          04.12.2018
+
+    *) Исправление: nginx не собирался gcc 8.1.
+
+    *) Исправление: nginx не собирался на Fedora 28 Linux.
+
+    *) Исправление: в обработке адресов клиентов при использовании unix
+       domain listen-сокетов для работы с датаграммами на Linux.
+
+    *) Изменение: уровень логгирования ошибок SSL "http request", "https
+       proxy request", "unsupported protocol", "version too low", "no
+       suitable key share" и "no suitable signature algorithm" понижен с
+       уровня crit до info.
+
+    *) Исправление: при использовании OpenSSL 1.1.0 и новее директиву
+       ssl_prefer_server_ciphers нельзя было выключить в виртуальном
+       сервере, если она была включена в сервере по умолчанию.
+
+    *) Исправление: nginx не собирался с LibreSSL 2.8.0.
+
+    *) Исправление: если nginx был собран с OpenSSL 1.1.0, а использовался с
+       OpenSSL 1.1.1, протокол TLS 1.3 всегда был разрешён.
+
+    *) Исправление: при отправке сохранённого на диск тела запроса на
+       gRPC-бэкенд могли возникать ошибки.
+
+    *) Исправление: соединения к некоторым gRPC-бэкендам могли не
+       кэшироваться при использовании директивы keepalive.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если использовался модуль ngx_http_mp4_module на 32-битных
+       платформах.
+
+
 Изменения в nginx 1.14.1                                          06.11.2018
 
     *) Безопасность: при использовании HTTP/2 клиент мог вызвать чрезмерное
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 4f67659..4fc92ac 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1014001
-#define NGINX_VERSION      "1.14.1"
+#define nginx_version      1014002
+#define NGINX_VERSION      "1.14.2"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 7756370..7e9f742 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -448,6 +448,18 @@ ngx_event_recvmsg(ngx_event_t *ev)
             c->socklen = sizeof(ngx_sockaddr_t);
         }
 
+        if (c->socklen == 0) {
+
+            /*
+             * on Linux recvmsg() returns zero msg_namelen
+             * when receiving packets from unbound AF_UNIX sockets
+             */
+
+            c->socklen = sizeof(struct sockaddr);
+            ngx_memzero(&sa, sizeof(struct sockaddr));
+            sa.sockaddr.sa_family = ls->sockaddr->sa_family;
+        }
+
 #if (NGX_STAT_STUB)
         (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
 #endif
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 88a6dbe..c4b51b5 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -296,7 +296,7 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
 
     SSL_CTX_set_options(ssl->ctx, SSL_OP_SINGLE_DH_USE);
 
-#ifdef SSL_CTRL_CLEAR_OPTIONS
+#if OPENSSL_VERSION_NUMBER >= 0x009080dfL
     /* only in 0.9.8m+ */
     SSL_CTX_clear_options(ssl->ctx,
                           SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
@@ -330,6 +330,16 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
     }
 #endif
 
+#ifdef SSL_CTX_set_min_proto_version
+    SSL_CTX_set_min_proto_version(ssl->ctx, 0);
+    SSL_CTX_set_max_proto_version(ssl->ctx, TLS1_2_VERSION);
+#endif
+
+#ifdef TLS1_3_VERSION
+    SSL_CTX_set_min_proto_version(ssl->ctx, 0);
+    SSL_CTX_set_max_proto_version(ssl->ctx, TLS1_3_VERSION);
+#endif
+
 #ifdef SSL_OP_NO_COMPRESSION
     SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_COMPRESSION);
 #endif
@@ -2059,10 +2069,18 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
 
             /* handshake failures */
         if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC                        /*  103 */
+#ifdef SSL_R_NO_SUITABLE_KEY_SHARE
+            || n == SSL_R_NO_SUITABLE_KEY_SHARE                      /*  101 */
+#endif
+#ifdef SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM
+            || n == SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM            /*  118 */
+#endif
             || n == SSL_R_BLOCK_CIPHER_PAD_IS_WRONG                  /*  129 */
             || n == SSL_R_DIGEST_CHECK_FAILED                        /*  149 */
             || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              /*  151 */
             || n == SSL_R_EXCESSIVE_MESSAGE_SIZE                     /*  152 */
+            || n == SSL_R_HTTPS_PROXY_REQUEST                        /*  155 */
+            || n == SSL_R_HTTP_REQUEST                               /*  156 */
             || n == SSL_R_LENGTH_MISMATCH                            /*  159 */
 #ifdef SSL_R_NO_CIPHERS_PASSED
             || n == SSL_R_NO_CIPHERS_PASSED                          /*  182 */
@@ -2078,6 +2096,13 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
             || n == SSL_R_UNEXPECTED_RECORD                          /*  245 */
             || n == SSL_R_UNKNOWN_ALERT_TYPE                         /*  246 */
             || n == SSL_R_UNKNOWN_PROTOCOL                           /*  252 */
+#ifdef SSL_R_NO_COMMON_SIGNATURE_ALGORITHMS
+            || n == SSL_R_NO_COMMON_SIGNATURE_ALGORITHMS             /*  253 */
+#endif
+            || n == SSL_R_UNSUPPORTED_PROTOCOL                       /*  258 */
+#ifdef SSL_R_NO_SHARED_GROUP
+            || n == SSL_R_NO_SHARED_GROUP                            /*  266 */
+#endif
             || n == SSL_R_WRONG_VERSION_NUMBER                       /*  267 */
             || n == SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC        /*  281 */
 #ifdef SSL_R_RENEGOTIATE_EXT_TOO_LONG
@@ -2093,6 +2118,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
 #endif
 #ifdef SSL_R_INAPPROPRIATE_FALLBACK
             || n == SSL_R_INAPPROPRIATE_FALLBACK                     /*  373 */
+#endif
+#ifdef SSL_R_VERSION_TOO_LOW
+            || n == SSL_R_VERSION_TOO_LOW                            /*  396 */
 #endif
             || n == 1000 /* SSL_R_SSLV3_ALERT_CLOSE_NOTIFY */
 #ifdef SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 623d851..05d3291 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -36,8 +36,12 @@
 
 #if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
 #undef OPENSSL_VERSION_NUMBER
+#if (LIBRESSL_VERSION_NUMBER >= 0x2080000fL)
+#define OPENSSL_VERSION_NUMBER  0x1010000fL
+#else
 #define OPENSSL_VERSION_NUMBER  0x1000107fL
 #endif
+#endif
 
 
 #if (OPENSSL_VERSION_NUMBER >= 0x10100001L)
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index bc43f53..3eec1b7 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -3264,7 +3264,8 @@ ngx_http_fastcgi_init_params(ngx_conf_t *cf, ngx_http_fastcgi_loc_conf_t *conf,
             return NGX_ERROR;
         }
 
-        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->code = (ngx_http_script_code_pt) (void *)
+                                                 ngx_http_script_copy_len_code;
         copy->len = src[i].key.len;
 
         copy = ngx_array_push_n(params->lengths,
@@ -3273,7 +3274,8 @@ ngx_http_fastcgi_init_params(ngx_conf_t *cf, ngx_http_fastcgi_loc_conf_t *conf,
             return NGX_ERROR;
         }
 
-        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->code = (ngx_http_script_code_pt) (void *)
+                                                 ngx_http_script_copy_len_code;
         copy->len = src[i].skip_empty;
 
 
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
index 758f89e..62b33fd 100644
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -112,8 +112,10 @@ typedef struct {
 
     unsigned                   header_sent:1;
     unsigned                   output_closed:1;
+    unsigned                   output_blocked:1;
     unsigned                   parsing_headers:1;
     unsigned                   end_stream:1;
+    unsigned                   done:1;
     unsigned                   status:1;
 
     ngx_http_request_t        *request;
@@ -1075,8 +1077,10 @@ ngx_http_grpc_reinit_request(ngx_http_request_t *r)
     ctx->state = 0;
     ctx->header_sent = 0;
     ctx->output_closed = 0;
+    ctx->output_blocked = 0;
     ctx->parsing_headers = 0;
     ctx->end_stream = 0;
+    ctx->done = 0;
     ctx->status = 0;
     ctx->connection = NULL;
 
@@ -1096,6 +1100,7 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
     ngx_int_t               rc;
     ngx_uint_t              next, last;
     ngx_chain_t            *cl, *out, **ll;
+    ngx_http_upstream_t    *u;
     ngx_http_grpc_ctx_t    *ctx;
     ngx_http_grpc_frame_t  *f;
 
@@ -1410,6 +1415,36 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
         rc = NGX_AGAIN;
     }
 
+    if (rc == NGX_AGAIN) {
+        ctx->output_blocked = 1;
+
+    } else {
+        ctx->output_blocked = 0;
+    }
+
+    if (ctx->done) {
+
+        /*
+         * We have already got the response and were sending some additional
+         * control frames.  Even if there is still something unsent, stop
+         * here anyway.
+         */
+
+        u = r->upstream;
+        u->length = 0;
+
+        if (ctx->in == NULL
+            && ctx->out == NULL
+            && ctx->output_closed
+            && !ctx->output_blocked
+            && ctx->state == ngx_http_grpc_st_start)
+        {
+            u->keepalive = 1;
+        }
+
+        ngx_post_event(u->peer.connection->read, &ngx_posted_events);
+    }
+
     return rc;
 }
 
@@ -1752,6 +1787,7 @@ ngx_http_grpc_process_header(ngx_http_request_t *r)
                     if (ctx->in == NULL
                         && ctx->out == NULL
                         && ctx->output_closed
+                        && !ctx->output_blocked
                         && b->last == b->pos)
                     {
                         u->keepalive = 1;
@@ -1835,6 +1871,34 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
             rc = ngx_http_grpc_parse_frame(r, ctx, b);
 
             if (rc == NGX_AGAIN) {
+
+                if (ctx->done) {
+
+                    /*
+                     * We have finished parsing the response and the
+                     * remaining control frames.  If there are unsent
+                     * control frames, post a write event to send them.
+                     */
+
+                    if (ctx->out) {
+                        ngx_post_event(u->peer.connection->write,
+                                       &ngx_posted_events);
+                        return NGX_AGAIN;
+                    }
+
+                    u->length = 0;
+
+                    if (ctx->in == NULL
+                        && ctx->output_closed
+                        && !ctx->output_blocked
+                        && ctx->state == ngx_http_grpc_st_start)
+                    {
+                        u->keepalive = 1;
+                    }
+
+                    break;
+                }
+
                 return NGX_AGAIN;
             }
 
@@ -1901,6 +1965,13 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
                 return NGX_ERROR;
             }
 
+            if (ctx->stream_id && ctx->done) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent frame for closed stream %ui",
+                              ctx->stream_id);
+                return NGX_ERROR;
+            }
+
             ctx->padding = 0;
         }
 
@@ -1917,17 +1988,7 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
             ctx->state = ngx_http_grpc_st_start;
 
             if (ctx->flags & NGX_HTTP_V2_END_STREAM_FLAG) {
-                u->length = 0;
-
-                if (ctx->in == NULL
-                    && ctx->out == NULL
-                    && ctx->output_closed
-                    && b->last == b->pos)
-                {
-                    u->keepalive = 1;
-                }
-
-                break;
+                ctx->done = 1;
             }
 
             continue;
@@ -2097,17 +2158,8 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
                                    "grpc trailer done");
 
                     if (ctx->end_stream) {
-                        u->length = 0;
-
-                        if (ctx->in == NULL
-                            && ctx->out == NULL
-                            && ctx->output_closed
-                            && b->last == b->pos)
-                        {
-                            u->keepalive = 1;
-                        }
-
-                        return NGX_OK;
+                        ctx->done = 1;
+                        break;
                     }
 
                     ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
@@ -2124,6 +2176,10 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
                 return NGX_ERROR;
             }
 
+            if (rc == NGX_HTTP_PARSE_HEADER_DONE) {
+                continue;
+            }
+
             /* rc == NGX_AGAIN */
 
             if (ctx->rest == 0) {
@@ -2240,17 +2296,7 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
         ctx->state = ngx_http_grpc_st_start;
 
         if (ctx->flags & NGX_HTTP_V2_END_STREAM_FLAG) {
-            u->length = 0;
-
-            if (ctx->in == NULL
-                && ctx->out == NULL
-                && ctx->output_closed
-                && b->last == b->pos)
-            {
-                u->keepalive = 1;
-            }
-
-            break;
+            ctx->done = 1;
         }
     }
 
@@ -3883,6 +3929,7 @@ ngx_http_grpc_send_window_update(ngx_http_request_t *r,
 static ngx_chain_t *
 ngx_http_grpc_get_buf(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx)
 {
+    u_char       *start;
     ngx_buf_t    *b;
     ngx_chain_t  *cl;
 
@@ -3892,29 +3939,33 @@ ngx_http_grpc_get_buf(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx)
     }
 
     b = cl->buf;
+    start = b->start;
 
-    b->tag = (ngx_buf_tag_t) &ngx_http_grpc_body_output_filter;
-    b->temporary = 1;
-    b->flush = 1;
-
-    if (b->start == NULL) {
+    if (start == NULL) {
 
         /*
          * each buffer is large enough to hold two window update
          * frames in a row
          */
 
-        b->start = ngx_palloc(r->pool, 2 * sizeof(ngx_http_grpc_frame_t) + 8);
-        if (b->start == NULL) {
+        start = ngx_palloc(r->pool, 2 * sizeof(ngx_http_grpc_frame_t) + 8);
+        if (start == NULL) {
             return NULL;
         }
 
-        b->pos = b->start;
-        b->last = b->start;
-
-        b->end = b->start + 2 * sizeof(ngx_http_grpc_frame_t) + 8;
     }
 
+    ngx_memzero(b, sizeof(ngx_buf_t));
+
+    b->start = start;
+    b->pos = start;
+    b->last = start;
+    b->end = start + 2 * sizeof(ngx_http_grpc_frame_t) + 8;
+
+    b->tag = (ngx_buf_tag_t) &ngx_http_grpc_body_output_filter;
+    b->temporary = 1;
+    b->flush = 1;
+
     return cl;
 }
 
@@ -4404,7 +4455,8 @@ ngx_http_grpc_init_headers(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *conf,
             return NGX_ERROR;
         }
 
-        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->code = (ngx_http_script_code_pt) (void *)
+                                                 ngx_http_script_copy_len_code;
         copy->len = src[i].key.len;
 
         size = (sizeof(ngx_http_script_copy_code_t)
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 2a6fafa..618bf78 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -169,7 +169,14 @@ typedef struct {
 
 
 #define ngx_mp4_atom_next(mp4, n)                                             \
-    mp4->buffer_pos += (size_t) n;                                            \
+                                                                              \
+    if (n > (size_t) (mp4->buffer_end - mp4->buffer_pos)) {                   \
+        mp4->buffer_pos = mp4->buffer_end;                                    \
+                                                                              \
+    } else {                                                                  \
+        mp4->buffer_pos += (size_t) n;                                        \
+    }                                                                         \
+                                                                              \
     mp4->offset += n
 
 
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index c9ad638..e7f829d 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -3493,7 +3493,8 @@ ngx_http_proxy_init_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
             return NGX_ERROR;
         }
 
-        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->code = (ngx_http_script_code_pt) (void *)
+                                                 ngx_http_script_copy_len_code;
         copy->len = src[i].key.len;
 
         size = (sizeof(ngx_http_script_copy_code_t)
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 3fb227b..9bd45bd 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -1724,7 +1724,8 @@ ngx_http_scgi_init_params(ngx_conf_t *cf, ngx_http_scgi_loc_conf_t *conf,
             return NGX_ERROR;
         }
 
-        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->code = (ngx_http_script_code_pt) (void *)
+                                                 ngx_http_script_copy_len_code;
         copy->len = src[i].key.len + 1;
 
         copy = ngx_array_push_n(params->lengths,
@@ -1733,7 +1734,8 @@ ngx_http_scgi_init_params(ngx_conf_t *cf, ngx_http_scgi_loc_conf_t *conf,
             return NGX_ERROR;
         }
 
-        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->code = (ngx_http_script_code_pt) (void *)
+                                                 ngx_http_script_copy_len_code;
         copy->len = src[i].skip_empty;
 
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 124da4d..238bcf8 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -1987,7 +1987,8 @@ ngx_http_uwsgi_init_params(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *conf,
             return NGX_ERROR;
         }
 
-        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->code = (ngx_http_script_code_pt) (void *)
+                                                 ngx_http_script_copy_len_code;
         copy->len = src[i].key.len;
 
         copy = ngx_array_push_n(params->lengths,
@@ -1996,7 +1997,8 @@ ngx_http_uwsgi_init_params(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *conf,
             return NGX_ERROR;
         }
 
-        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+        copy->code = (ngx_http_script_code_pt) (void *)
+                                                 ngx_http_script_copy_len_code;
         copy->len = src[i].skip_empty;
 
 
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 2db7a62..c88c271 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -923,7 +923,7 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 
         SSL_set_verify_depth(ssl_conn, SSL_CTX_get_verify_depth(sscf->ssl.ctx));
 
-#ifdef SSL_CTRL_CLEAR_OPTIONS
+#if OPENSSL_VERSION_NUMBER >= 0x009080dfL
         /* only in 0.9.8m+ */
         SSL_clear_options(ssl_conn, SSL_get_options(ssl_conn) &
                                     ~SSL_CTX_get_options(sscf->ssl.ctx));
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 96f3ec6..1a87735 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -695,7 +695,8 @@ ngx_http_script_add_copy_code(ngx_http_script_compile_t *sc, ngx_str_t *value,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
+    code->code = (ngx_http_script_code_pt) (void *)
+                                                 ngx_http_script_copy_len_code;
     code->len = len;
 
     size = (sizeof(ngx_http_script_copy_code_t) + len + sizeof(uintptr_t) - 1)
@@ -784,7 +785,8 @@ ngx_http_script_add_var_code(ngx_http_script_compile_t *sc, ngx_str_t *name)
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_script_code_pt) ngx_http_script_copy_var_len_code;
+    code->code = (ngx_http_script_code_pt) (void *)
+                                             ngx_http_script_copy_var_len_code;
     code->index = (uintptr_t) index;
 
     code = ngx_http_script_add_code(*sc->values,
@@ -1178,8 +1180,8 @@ ngx_http_script_add_capture_code(ngx_http_script_compile_t *sc, ngx_uint_t n)
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_script_code_pt)
-                      ngx_http_script_copy_capture_len_code;
+    code->code = (ngx_http_script_code_pt) (void *)
+                                         ngx_http_script_copy_capture_len_code;
     code->n = 2 * n;
 
 
@@ -1293,7 +1295,8 @@ ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc)
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_script_code_pt) ngx_http_script_full_name_len_code;
+    code->code = (ngx_http_script_code_pt) (void *)
+                                            ngx_http_script_full_name_len_code;
     code->conf_prefix = sc->conf_prefix;
 
     code = ngx_http_script_add_code(*sc->values,
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 8fc3042..0760dc2 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2008,6 +2008,18 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
             return;
         }
 
+        if (c->write->ready && c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
+            if (ngx_tcp_push(c->fd) == -1) {
+                ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
+                              ngx_tcp_push_n " failed");
+                ngx_http_upstream_finalize_request(r, u,
+                                               NGX_HTTP_INTERNAL_SERVER_ERROR);
+                return;
+            }
+
+            c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
+        }
+
         return;
     }
 
@@ -2901,7 +2913,8 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
     }
 
     if (r->request_body && r->request_body->temp_file
-        && r == r->main && !r->preserve_body)
+        && r == r->main && !r->preserve_body
+        && !u->conf->preserve_output)
     {
         ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd);
         r->request_body->temp_file->file.fd = NGX_INVALID_FILE;
diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c
index 7ebe2b5..b3d81d0 100644
--- a/src/os/unix/ngx_user.c
+++ b/src/os/unix/ngx_user.c
@@ -21,10 +21,6 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
     struct crypt_data   cd;
 
     cd.initialized = 0;
-#ifdef __GLIBC__
-    /* work around the glibc bug */
-    cd.current_salt[0] = ~salt[0];
-#endif
 
     value = crypt_r((char *) key, (char *) salt, &cd);
 
diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c
index aa555ca..b00e708 100644
--- a/src/stream/ngx_stream_script.c
+++ b/src/stream/ngx_stream_script.c
@@ -587,7 +587,8 @@ ngx_stream_script_add_copy_code(ngx_stream_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_stream_script_code_pt) ngx_stream_script_copy_len_code;
+    code->code = (ngx_stream_script_code_pt) (void *)
+                                               ngx_stream_script_copy_len_code;
     code->len = len;
 
     size = (sizeof(ngx_stream_script_copy_code_t) + len + sizeof(uintptr_t) - 1)
@@ -677,8 +678,8 @@ ngx_stream_script_add_var_code(ngx_stream_script_compile_t *sc, ngx_str_t *name)
         return NGX_ERROR;
     }
 
-    code->code = (ngx_stream_script_code_pt)
-                      ngx_stream_script_copy_var_len_code;
+    code->code = (ngx_stream_script_code_pt) (void *)
+                                           ngx_stream_script_copy_var_len_code;
     code->index = (uintptr_t) index;
 
     code = ngx_stream_script_add_code(*sc->values,
@@ -767,8 +768,8 @@ ngx_stream_script_add_capture_code(ngx_stream_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_stream_script_code_pt)
-                      ngx_stream_script_copy_capture_len_code;
+    code->code = (ngx_stream_script_code_pt) (void *)
+                                       ngx_stream_script_copy_capture_len_code;
     code->n = 2 * n;
 
 
@@ -859,7 +860,7 @@ ngx_stream_script_add_full_name_code(ngx_stream_script_compile_t *sc)
         return NGX_ERROR;
     }
 
-    code->code = (ngx_stream_script_code_pt)
+    code->code = (ngx_stream_script_code_pt) (void *)
                                           ngx_stream_script_full_name_len_code;
     code->conf_prefix = sc->conf_prefix;
 

From 1f43924c7179cd31368a34caa6a4c14764b32097 Mon Sep 17 00:00:00 2001
From: Kartik Mistry <kartik.mistry@gmail.com>
Date: Thu, 6 Dec 2018 20:03:49 +0530
Subject: [PATCH 271/600] Added Turkish translation (Closes: #915728)

---
 debian/changelog |  9 ++++++++
 debian/po/tr.po  | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 debian/po/tr.po

diff --git a/debian/changelog b/debian/changelog
index d08388f..b2c56d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nginx (1.14.1-2) UNRELEASED; urgency=low
+
+  [ Kartik Mistry ]
+  * po/tr.po:
+    + Added Turkish translation. Thanks Atila KOÇ <koc@artielektronik.com.tr>
+      (Closes: #915728)
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 06 Dec 2018 20:01:00 +0530
+
 nginx (1.14.1-1) unstable; urgency=medium
 
   [ Kartik Mistry ]
diff --git a/debian/po/tr.po b/debian/po/tr.po
new file mode 100644
index 0000000..3e9d40b
--- /dev/null
+++ b/debian/po/tr.po
@@ -0,0 +1,57 @@
+# nginx turkish debconf translations
+# This file is distributed under the same license as the nginx package.
+# Atila KOÇ <koc@artielektronik.com.tr>, 2018.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2018-11-08 18:08+0300\n"
+"PO-Revision-Date: 2018-11-28 14:50+0300\n"
+"Last-Translator: Atila KOÇ <koc@artielektronik.com.tr>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Güvenliği sağlanmamış nginx günlük dosyaları olabilir"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"/var/log/nginx dizini altında bulunan aşağıdaki günlük dosyaları sahibi www-"
+"data olan sembolik bağlantılardır:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"nginx'in 1.4.4-4 ve sonraki sürümlerinde /var/log/nginx dizininin sahibi www-"
+"data idi. Bu nedenle www-data hassas konumlardaki sistem günlüklerine erişen "
+"sembolik bağlantılara sahip olabiliyor ve bu durum ayrıcalık kazanma yolu "
+"ile yapılabilecek saldırılara olanak sağlayabiliyordu. Artık /var/log/nginx "
+"dizininin erişim hakları düzeltilmiş olsa da güvenliği sağlanmamış "
+"bağlantılar kalmış olabilir. Lütfen yukarıdaki konumları gözden geçiriniz."

From 969f3934b102e0fab9ea0b9cc52e2e81689fa254 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 13 Dec 2018 10:05:52 +0200
Subject: [PATCH 272/600] Release 1.14.2-1

---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d08388f..504aabe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nginx (1.14.2-1) unstable; urgency=medium
+
+  [ Olaf van der Spek ]
+  * Reference PHP 7.3 (Closes: 913250)
+
+  [ Christos Trochalakis ]
+  * Adjust fastcgi_split_path_info snippet to handle the `/example.php/` case
+    (Closes: #911398)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Thu, 13 Dec 2018 10:05:37 +0200
+
 nginx (1.14.1-1) unstable; urgency=medium
 
   [ Kartik Mistry ]

From ff8b896b2bee270864cf2421e46e8dc551e3eaac Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 27 Dec 2018 12:45:01 +0200
Subject: [PATCH 273/600] http-dav-ext: Upgrade to 3.0.0

Closes: #851651
---
 debian/modules/control                        |    2 +-
 debian/modules/http-dav-ext/LICENSE           |    2 +-
 debian/modules/http-dav-ext/README.rst        |  185 +-
 debian/modules/http-dav-ext/config            |   23 +-
 .../http-dav-ext/ngx_http_dav_ext_module.c    | 2732 ++++++++++++-----
 debian/modules/http-dav-ext/t/dav_ext.t       |  141 +
 6 files changed, 2364 insertions(+), 721 deletions(-)
 create mode 100644 debian/modules/http-dav-ext/t/dav_ext.t

diff --git a/debian/modules/control b/debian/modules/control
index ec627be..a5d65a8 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -51,7 +51,7 @@ Patch:
 
 Module: http-dav-ext
 Homepage: https://github.com/arut/nginx-dav-ext-module
-Version: 0.1.0
+Version: 3.0.0
 
 Module: http-fancyindex
 Homepage: https://github.com/aperezdc/ngx-fancyindex
diff --git a/debian/modules/http-dav-ext/LICENSE b/debian/modules/http-dav-ext/LICENSE
index 7be3135..c68a7d4 100644
--- a/debian/modules/http-dav-ext/LICENSE
+++ b/debian/modules/http-dav-ext/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2017, Roman Arutyunyan
+Copyright (C) 2012-2018 Roman Arutyunyan
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/debian/modules/http-dav-ext/README.rst b/debian/modules/http-dav-ext/README.rst
index 91c10e3..092056e 100644
--- a/debian/modules/http-dav-ext/README.rst
+++ b/debian/modules/http-dav-ext/README.rst
@@ -2,40 +2,187 @@
 nginx-dav-ext-module
 ********************
 
-NGINX WebDAV missing commands support (PROPFIND & OPTIONS)
+nginx_ WebDAV_ PROPFIND,OPTIONS,LOCK,UNLOCK support.
 
-Copyright |copy| 2012-2017 Arutyunyan Roman (arutyunyan.roman@gmail.com)
+.. contents::
 
-.. |copy|   unicode:: U+000A9 .. COPYRIGHT SIGN
 
-For full WebDAV support in NGINX you need to enable the standard NGINX 
-WebDAV module (providing partial WebDAV implementation) as well as 
-this module for missing methods:
+About
+=====
+
+The standard ngx_http_dav_module_ provides partial WebDAV_ implementation and
+only supports GET,HEAD,PUT,DELETE,MKCOL,COPY,MOVE methods.
+
+For full WebDAV_ support in nginx_ you need to enable the standard
+ngx_http_dav_module_ as well as this module for the missing methods.
+
+
+Build
+=====
+
+Building nginx_ with the module:
 
 .. code-block:: bash
 
-    $ ./configure --with-http_dav_module --add-module=/path/to/this-module
+    # static module
+    $ ./configure --with-http_dav_module --add-module=/path/to/nginx-dav-ext-module
 
-The module can be built dynamically:
+    # dynamic module
+    $ ./configure --with-http_dav_module --add-dynamic-module=/path/to/nginx-dav-ext-module
 
-.. code-block:: bash
+Trying to compile nginx_ with this module but without ngx_http_dav_module_ will
+result in compilation error.
 
-    $ ./configure --with-http_dav_module --add-dynamic-module=/path/to/this-module
 
 Requirements
 ============
 
-``libexpat-dev``
+- nginx_ version >= 1.13.4
+- ``libxml2`` + ``libxslt``
+
+The ``libxslt`` library is technically redundant and is only required since this
+combination is supported by nginx_ for the xslt module.
+Using builtin nginx mechanisms for linking against third-party libraries
+brings certain compatibility benefits.
+However this redundancy can be easily eliminated in the ``config`` file.
 
 
-Example config
-==============
+Testing
+=======
 
-.. code-block::
+The module tests require standard nginx-tests_ and Perl ``HTTP::DAV`` library.
 
-	location / {
-		dav_methods PUT DELETE MKCOL COPY MOVE;
-		dav_ext_methods PROPFIND OPTIONS;
+.. code-block:: bash
 
-		root /var/root/;
-	}
+    $ export PERL5LIB=/path/to/nginx-tests/lib
+    $ export TEST_NGINX_BINARY=/path/to/nginx
+    $ prove t
+
+
+Locking
+=======
+
+- Only the exclusive write locks are supported, which is the only type of locks
+  described in the WebDAV_ specification.
+
+- All currently held locks are kept in a list.
+  Checking if an object is constrained by a lock requires O(n) operations.
+  A huge number of simultaneously held locks may degrade performance.
+  Thus it is not recommended to have a large lock timeout which would increase
+  the number of locks.
+
+
+Directives
+==========
+
+dav_ext_methods
+---------------
+
+========== ====
+*Syntax:*  ``dav_ext_methods [PROPFIND] [OPTIONS] [LOCK] [UNLOCK]``
+*Context:* http, server, location
+========== ====
+
+Enables support for the specified WebDAV methods in the current scope.
+
+dav_ext_lock_zone
+-----------------
+
+========== ====
+*Syntax:*  ``dav_ext_lock_zone zone=NAME:SIZE [timeout=TIMEOUT]``
+*Context:* http
+========== ====
+
+Defines a shared zone for WebDAV locks with specified NAME and SIZE.
+Also, defines a lock expiration TIMEOUT.
+Default lock timeout value is 1 minute.
+
+
+dav_ext_lock
+------------
+
+========== ====
+*Syntax:*  ``dav_ext_lock zone=NAME``
+*Context:* http, server, location
+========== ====
+
+Enables WebDAV locking in the specified scope.
+Locks are stored in the shared zone specified by NAME.
+This zone must be defined with the ``dav_ext_lock_zone`` directive.
+
+Note that even though this directive enables locking capabilities in the
+current scope, HTTP methods LOCK and UNLOCK should also be explicitly specified
+in the ``dav_ext_methods``.
+
+
+Example 1
+=========
+
+Simple lockless example::
+
+    location / {
+        root /data/www;
+
+        dav_methods PUT DELETE MKCOL COPY MOVE;
+        dav_ext_methods PROPFIND OPTIONS;
+    }
+
+
+Example 2
+=========
+
+WebDAV with locking::
+
+    http {
+        dav_ext_lock_zone zone=foo:10m;
+
+        ...
+
+        server {
+            ...
+
+            location / {
+                root /data/www;
+
+                dav_methods PUT DELETE MKCOL COPY MOVE;
+                dav_ext_methods PROPFIND OPTIONS LOCK UNLOCK;
+                dav_ext_lock zone=foo;
+            }
+        }
+    }
+
+
+Example 3
+=========
+
+WebDAV with locking which works with MacOS client::
+
+    http {
+        dav_ext_lock_zone zone=foo:10m;
+
+        ...
+
+        server {
+            ...
+
+            location / {
+                root /data/www;
+
+                # enable creating directories without trailing slash
+                set $x $uri$request_method;
+                if ($x ~ [^/]MKCOL$) {
+                    rewrite ^(.*)$ $1/;
+                }
+
+                dav_methods PUT DELETE MKCOL COPY MOVE;
+                dav_ext_methods PROPFIND OPTIONS LOCK UNLOCK;
+                dav_ext_lock zone=foo;
+            }
+        }
+    }
+
+.. _ngx_http_dav_module: http://nginx.org/en/docs/http/ngx_http_dav_module.html
+.. _nginx-tests: http://hg.nginx.org/nginx-tests
+.. _nginx: http://nginx.org
+.. _WebDAV: https://tools.ietf.org/html/rfc4918
+.. _`RFC4918 If Header`: https://tools.ietf.org/html/rfc4918#section-10.4
diff --git a/debian/modules/http-dav-ext/config b/debian/modules/http-dav-ext/config
index 372620b..91ae1b3 100644
--- a/debian/modules/http-dav-ext/config
+++ b/debian/modules/http-dav-ext/config
@@ -1,16 +1,17 @@
 ngx_addon_name=ngx_http_dav_ext_module
 
-if [ -f auto/module ] ; then
+ngx_module_type=HTTP
+ngx_module_name=ngx_http_dav_ext_module
 
-    ngx_module_type=HTTP
-    ngx_module_name=ngx_http_dav_ext_module
-    ngx_module_libs=-lexpat
-    ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
+# nginx has robust builtin support for linking against
+# libxml2+libxslt.  This is definitelty the right way to go if
+# building nginx with the xslt module, in which case libxslt will
+# be linked anyway.  In other cases libxslt is just redundant.
+# If that's a big deal, libxml2 can be linked directly:
+# ngx_module_libs=-lxml2
 
-    . auto/module
+ngx_module_libs=LIBXSLT
 
-else
-    HTTP_MODULES="$HTTP_MODULES ngx_http_dav_ext_module"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_dav_ext_module.c"
-    CORE_LIBS="$CORE_LIBS -lexpat"
-fi
+ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
+
+. auto/module
diff --git a/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c b/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
index ae75fc3..0d6d067 100644
--- a/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
+++ b/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
@@ -1,827 +1,2181 @@
-/******************************************************************************
-  Copyright (c) 2012-2017, Roman Arutyunyan (arutyunyan.roman@gmail.com)
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without modification, 
-  are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice, 
-  this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright notice, 
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
-  SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
-  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
-  OF SUCH DAMAGE.
- *******************************************************************************/
 
 /*
-
-  NGINX missing WebDAV commands support
-
-  *PROPFIND & OPTIONS*
-
+ * Copyright (C) Roman Arutyunyan
  */
 
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
+#include <libxml/parser.h>
 
-#include <sys/types.h>
-#include <dirent.h>
-#include <time.h>
 
-#include <expat.h>
+#define NGX_HTTP_DAV_EXT_OFF                      2
+
+#define NGX_HTTP_DAV_EXT_PREALLOCATE              50
+
+#define NGX_HTTP_DAV_EXT_NODE_PROPFIND            0x01
+#define NGX_HTTP_DAV_EXT_NODE_PROP                0x02
+#define NGX_HTTP_DAV_EXT_NODE_PROPNAME            0x04
+#define NGX_HTTP_DAV_EXT_NODE_ALLPROP             0x08
+
+#define NGX_HTTP_DAV_EXT_PROP_DISPLAYNAME         0x01
+#define NGX_HTTP_DAV_EXT_PROP_GETCONTENTLENGTH    0x02
+#define NGX_HTTP_DAV_EXT_PROP_GETLASTMODIFIED     0x04
+#define NGX_HTTP_DAV_EXT_PROP_RESOURCETYPE        0x08
+#define NGX_HTTP_DAV_EXT_PROP_LOCKDISCOVERY       0x10
+#define NGX_HTTP_DAV_EXT_PROP_SUPPORTEDLOCK       0x20
+
+#define NGX_HTTP_DAV_EXT_PROP_ALL                 0x7f
+#define NGX_HTTP_DAV_EXT_PROP_NAMES               0x80
 
-#define NGX_HTTP_DAV_EXT_OFF             2
 
 typedef struct {
+    ngx_str_t                    uri;
+    ngx_str_t                    name;
+    time_t                       mtime;
+    off_t                        size;
 
-	ngx_uint_t  methods;
+    time_t                       lock_expire;
+    ngx_str_t                    lock_root;
+    uint32_t                     lock_token;
 
+    unsigned                     dir:1;
+    unsigned                     lock_supported:1;
+    unsigned                     lock_infinite:1;
+} ngx_http_dav_ext_entry_t;
+
+
+typedef struct {
+    ngx_uint_t                   nodes;
+    ngx_uint_t                   props;
+} ngx_http_dav_ext_xml_ctx_t;
+
+
+typedef struct {
+    ngx_uint_t                   methods;
+    ngx_shm_zone_t              *shm_zone;
 } ngx_http_dav_ext_loc_conf_t;
 
+
+typedef struct {
+    ngx_queue_t                  queue;
+    uint32_t                     token;
+    time_t                       expire;
+    ngx_uint_t                   infinite; /* unsigned  infinite:1; */
+    size_t                       len;
+    u_char                       data[1];
+} ngx_http_dav_ext_node_t;
+
+
+typedef struct {
+    ngx_queue_t                  queue;
+} ngx_http_dav_ext_lock_sh_t;
+
+
+typedef struct {
+    time_t                       timeout;
+    ngx_slab_pool_t             *shpool;
+    ngx_http_dav_ext_lock_sh_t  *sh;
+} ngx_http_dav_ext_lock_t;
+
+
+static ngx_int_t ngx_http_dav_ext_precontent_handler(ngx_http_request_t *r);
+static ngx_int_t ngx_http_dav_ext_strip_uri(ngx_http_request_t *r,
+    ngx_str_t *uri);
+static ngx_int_t ngx_http_dav_ext_verify_lock(ngx_http_request_t *r,
+    ngx_str_t *uri, ngx_uint_t delete_lock);
+static ngx_http_dav_ext_node_t *ngx_http_dav_ext_lock_lookup(
+    ngx_http_request_t *r, ngx_http_dav_ext_lock_t *lock, ngx_str_t *uri,
+    ngx_int_t depth);
+
+static ngx_int_t ngx_http_dav_ext_content_handler(ngx_http_request_t *r);
+static void ngx_http_dav_ext_propfind_handler(ngx_http_request_t *r);
+static void ngx_http_dav_ext_propfind_xml_start(void *data,
+    const xmlChar *localname, const xmlChar *prefix, const xmlChar *uri,
+    int nb_namespaces, const xmlChar **namespaces, int nb_attributes,
+    int nb_defaulted, const xmlChar **attributes);
+static void ngx_http_dav_ext_propfind_xml_end(void *data,
+    const xmlChar *localname, const xmlChar *prefix, const xmlChar *uri);
+static ngx_int_t ngx_http_dav_ext_propfind(ngx_http_request_t *r,
+    ngx_uint_t props);
+static ngx_int_t ngx_http_dav_ext_set_locks(ngx_http_request_t *r,
+    ngx_http_dav_ext_entry_t *entry);
+static ngx_int_t ngx_http_dav_ext_propfind_response(ngx_http_request_t *r,
+    ngx_array_t *entries, ngx_uint_t props);
+static ngx_int_t ngx_http_dav_ext_lock_handler(ngx_http_request_t *r);
+static ngx_int_t ngx_http_dav_ext_lock_response(ngx_http_request_t *r,
+    ngx_uint_t status, time_t timeout, ngx_uint_t depth, uint32_t token);
+static ngx_int_t ngx_http_dav_ext_unlock_handler(ngx_http_request_t *r);
+
+static ngx_int_t ngx_http_dav_ext_depth(ngx_http_request_t *r,
+    ngx_int_t default_depth);
+static uint32_t ngx_http_dav_ext_lock_token(ngx_http_request_t *r);
+static uint32_t ngx_http_dav_ext_if(ngx_http_request_t *r, ngx_str_t *uri);
+static uintptr_t ngx_http_dav_ext_format_propfind(ngx_http_request_t *r,
+    u_char *dst, ngx_http_dav_ext_entry_t *entry, ngx_uint_t props);
+static uintptr_t ngx_http_dav_ext_format_lockdiscovery(ngx_http_request_t *r,
+    u_char *dst, ngx_http_dav_ext_entry_t *entry);
+static uintptr_t ngx_http_dav_ext_format_token(u_char *dst, uint32_t token,
+    ngx_uint_t brackets);
+
+static ngx_int_t ngx_http_dav_ext_init_zone(ngx_shm_zone_t *shm_zone,
+    void *data);
+static void *ngx_http_dav_ext_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_dav_ext_merge_loc_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static char *ngx_http_dav_ext_lock_zone(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_http_dav_ext_lock(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 static ngx_int_t ngx_http_dav_ext_init(ngx_conf_t *cf);
-static void * ngx_http_dav_ext_create_loc_conf(ngx_conf_t *cf);
-static char * ngx_http_dav_ext_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child);
+
 
 static ngx_conf_bitmask_t  ngx_http_dav_ext_methods_mask[] = {
-
-	{ ngx_string("off"),      NGX_HTTP_DAV_EXT_OFF },
-	{ ngx_string("propfind"), NGX_HTTP_PROPFIND    },
-	{ ngx_string("options"),  NGX_HTTP_OPTIONS     },
-	{ ngx_null_string,        0                    }
-
+    { ngx_string("off"),      NGX_HTTP_DAV_EXT_OFF },
+    { ngx_string("propfind"), NGX_HTTP_PROPFIND    },
+    { ngx_string("options"),  NGX_HTTP_OPTIONS     },
+    { ngx_string("lock"),     NGX_HTTP_LOCK        },
+    { ngx_string("unlock"),   NGX_HTTP_UNLOCK      },
+    { ngx_null_string,        0                    }
 };
 
+
 static ngx_command_t  ngx_http_dav_ext_commands[] = {
 
-	{ ngx_string("dav_ext_methods"),
-		NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-		ngx_conf_set_bitmask_slot,
-		NGX_HTTP_LOC_CONF_OFFSET,
-		offsetof(ngx_http_dav_ext_loc_conf_t, methods),
-		&ngx_http_dav_ext_methods_mask },
+    { ngx_string("dav_ext_methods"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_conf_set_bitmask_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_dav_ext_loc_conf_t, methods),
+      &ngx_http_dav_ext_methods_mask },
 
-	ngx_null_command
+    { ngx_string("dav_ext_lock_zone"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE12,
+      ngx_http_dav_ext_lock_zone,
+      0,
+      0,
+      NULL },
+
+    { ngx_string("dav_ext_lock"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_dav_ext_lock,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
 };
 
+
 static ngx_http_module_t  ngx_http_dav_ext_module_ctx = {
-	NULL,                                  /* preconfiguration */
-	ngx_http_dav_ext_init,                 /* postconfiguration */
+    NULL,                                  /* preconfiguration */
+    ngx_http_dav_ext_init,                 /* postconfiguration */
 
-	NULL,                                  /* create main configuration */
-	NULL,                                  /* init main configuration */
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
 
-	NULL,                                  /* create server configuration */
-	NULL,                                  /* merge server configuration */
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
 
-	ngx_http_dav_ext_create_loc_conf,      /* create location configuration */
-	ngx_http_dav_ext_merge_loc_conf,       /* merge location configuration */
+    ngx_http_dav_ext_create_loc_conf,      /* create location configuration */
+    ngx_http_dav_ext_merge_loc_conf,       /* merge location configuration */
 };
 
 
 ngx_module_t  ngx_http_dav_ext_module = {
-	NGX_MODULE_V1,
-	&ngx_http_dav_ext_module_ctx,          /* module context */
-	ngx_http_dav_ext_commands,             /* module directives */
-	NGX_HTTP_MODULE,                       /* module type */
-	NULL,                                  /* init master */
-	NULL,                                  /* init module */
-	NULL,                                  /* init process */
-	NULL,                                  /* init thread */
-	NULL,                                  /* exit thread */
-	NULL,                                  /* exit process */
-	NULL,                                  /* exit master */
-	NGX_MODULE_V1_PADDING
+    NGX_MODULE_V1,
+    &ngx_http_dav_ext_module_ctx,          /* module context */
+    ngx_http_dav_ext_commands,             /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
 };
 
-#define NGX_HTTP_DAV_EXT_NODE_propfind           0x001
-#define NGX_HTTP_DAV_EXT_NODE_prop               0x002
-#define NGX_HTTP_DAV_EXT_NODE_propname           0x004
-#define NGX_HTTP_DAV_EXT_NODE_allprop            0x008
-
-#define NGX_HTTP_DAV_EXT_PROP_creationdate       0x001
-#define NGX_HTTP_DAV_EXT_PROP_displayname        0x002
-#define NGX_HTTP_DAV_EXT_PROP_getcontentlanguage 0x004
-#define	NGX_HTTP_DAV_EXT_PROP_getcontentlength   0x008
-#define NGX_HTTP_DAV_EXT_PROP_getcontenttype     0x010
-#define NGX_HTTP_DAV_EXT_PROP_getetag            0x020
-#define NGX_HTTP_DAV_EXT_PROP_getlastmodified    0x040
-#define NGX_HTTP_DAV_EXT_PROP_lockdiscovery      0x080
-#define NGX_HTTP_DAV_EXT_PROP_resourcetype       0x100
-#define NGX_HTTP_DAV_EXT_PROP_source             0x200
-#define NGX_HTTP_DAV_EXT_PROP_supportedlock      0x400
-
-#define NGX_HTTP_DAV_EXT_PROPFIND_SELECTED       1
-#define NGX_HTTP_DAV_EXT_PROPFIND_NAMES          2
-#define NGX_HTTP_DAV_EXT_PROPFIND_ALL            3
-
-typedef struct {
-
-	ngx_uint_t nodes;
-
-	ngx_uint_t props;
-
-	ngx_uint_t propfind;
-
-} ngx_http_dav_ext_ctx_t;
-
-static int ngx_http_dav_ext_xmlcmp(const char *xname, const char *sname) {
-
-	const char *c;
-
-	c = strrchr(xname, ':');
-
-	return strcmp(c ? c + 1 : xname, sname);
-}
-
-static void ngx_http_dav_ext_start_xml_elt(void *user_data, 
-		const XML_Char *name, const XML_Char **atts)
-{
-	ngx_http_dav_ext_ctx_t *ctx = user_data;
-		
-#define NGX_HTTP_DAV_EXT_SET_NODE(nm) \
-	if (!ngx_http_dav_ext_xmlcmp(name, #nm)) \
-		ctx->nodes ^= NGX_HTTP_DAV_EXT_NODE_##nm
-
-	NGX_HTTP_DAV_EXT_SET_NODE(propfind);
-	NGX_HTTP_DAV_EXT_SET_NODE(prop);
-	NGX_HTTP_DAV_EXT_SET_NODE(propname);
-	NGX_HTTP_DAV_EXT_SET_NODE(allprop);
-
-}
-
-static void ngx_http_dav_ext_end_xml_elt(void *user_data, const XML_Char *name)
-{
-	ngx_http_dav_ext_ctx_t *ctx = user_data;
-
-	if (ctx->nodes & NGX_HTTP_DAV_EXT_NODE_propfind) {
-		
-		if (ctx->nodes & NGX_HTTP_DAV_EXT_NODE_prop) {
-
-			ctx->propfind = NGX_HTTP_DAV_EXT_PROPFIND_SELECTED;
-
-#define NGX_HTTP_DAV_EXT_SET_PROP(nm) \
-			if (!ngx_http_dav_ext_xmlcmp(name, #nm)) \
-				ctx->props |= NGX_HTTP_DAV_EXT_PROP_##nm
-
-			NGX_HTTP_DAV_EXT_SET_PROP(creationdate);
-			NGX_HTTP_DAV_EXT_SET_PROP(displayname);
-			NGX_HTTP_DAV_EXT_SET_PROP(getcontentlanguage);
-			NGX_HTTP_DAV_EXT_SET_PROP(getcontentlength);
-			NGX_HTTP_DAV_EXT_SET_PROP(getcontenttype);
-			NGX_HTTP_DAV_EXT_SET_PROP(getetag);
-			NGX_HTTP_DAV_EXT_SET_PROP(getlastmodified);
-			NGX_HTTP_DAV_EXT_SET_PROP(lockdiscovery);
-			NGX_HTTP_DAV_EXT_SET_PROP(resourcetype);
-			NGX_HTTP_DAV_EXT_SET_PROP(source);
-			NGX_HTTP_DAV_EXT_SET_PROP(supportedlock);
-
-		}
-
-		if (ctx->nodes & NGX_HTTP_DAV_EXT_NODE_propname) {
-
-			ctx->propfind = NGX_HTTP_DAV_EXT_PROPFIND_NAMES;
-
-		}
-
-		if (ctx->nodes & NGX_HTTP_DAV_EXT_NODE_allprop) {
-
-			ctx->propfind = NGX_HTTP_DAV_EXT_PROPFIND_ALL;
-
-		}
-		
-	}
-
-	ngx_http_dav_ext_start_xml_elt(user_data, name, NULL);
-}
-
-#define NGX_HTTP_DAV_EXT_COPY    0x01
-#define NGX_HTTP_DAV_EXT_ESCAPE  0x02
-
-static void
-ngx_http_dav_ext_output(ngx_http_request_t *r, ngx_chain_t **ll,
-	ngx_int_t flags, u_char *data, ngx_uint_t len) 
-{
-	ngx_chain_t *cl;
-	ngx_buf_t   *b;
-
-	if (!len) {
-		return; 
-	}
-
-	if (flags & NGX_HTTP_DAV_EXT_ESCAPE) {
-
-		b = ngx_create_temp_buf(r->pool, len + ngx_escape_html(NULL, data, len));
-		b->last = (u_char*)ngx_escape_html(b->pos, data, len);
-
-	} else if (flags & NGX_HTTP_DAV_EXT_COPY) {
-
-		b = ngx_create_temp_buf(r->pool, len);
-		b->last = ngx_cpymem(b->pos, data, len);
-
-	} else {
-
-		b = ngx_calloc_buf(r->pool);
-		b->memory = 1;
-		b->pos = data;
-		b->start = data;
-		b->last = b->pos + len;
-		b->end = b->last;
-	}
-
-	cl = ngx_alloc_chain_link(r->pool);
-	cl->buf = b;
-	cl->next = NULL;
-
-	if (*ll != NULL) {
-		cl->next = (*ll)->next;
-		(*ll)->next = cl;
-		*ll = cl;
-	} else {
-		*ll = cl;
-		cl->next = cl;
-	}
-}
-
-static void
-ngx_http_dav_ext_flush(ngx_http_request_t *r, ngx_chain_t **ll)
-{
-	ngx_chain_t *cl;
-
-	cl = (*ll)->next;
-	(*ll)->next = NULL;
-	ngx_http_output_filter(r, cl);
-	*ll = NULL;
-}
-
-/* output shortcuts
-
-   NB: these shortcuts assume 2 variables exist in current context:
-   r  - request ptr
-   ll - chain ptr ptr
-
-   output chains are buffered in circular list & flushed on demand
-*/
-
-/* output buffer copy */
-#define NGX_HTTP_DAV_EXT_OUTCB(data, len) \
-	ngx_http_dav_ext_output(r, ll, NGX_HTTP_DAV_EXT_COPY, (data), (len))
-
-/* output string (no copy) */
-#define NGX_HTTP_DAV_EXT_OUTS(s) \
-	ngx_http_dav_ext_output(r, ll, 0, (s)->data, (s)->len)
-
-/* output escaped string */
-#define NGX_HTTP_DAV_EXT_OUTES(s) \
-	ngx_http_dav_ext_output(r, ll, NGX_HTTP_DAV_EXT_ESCAPE, (s)->data, (s)->len)
-
-/* output literal */
-#define NGX_HTTP_DAV_EXT_OUTL(s) \
-	ngx_http_dav_ext_output(r, ll, 0, (u_char*)(s), sizeof(s) - 1)
 
 static ngx_int_t
-ngx_http_dav_ext_send_propfind_atts(ngx_http_request_t *r, 
-	char *path, ngx_str_t *uri, ngx_chain_t **ll, ngx_uint_t props)
+ngx_http_dav_ext_precontent_handler(ngx_http_request_t *r)
 {
-	struct stat   st;
-	struct tm     stm;
-	u_char        buf[256];
-	ngx_str_t     name;
+    ngx_str_t                     uri;
+    ngx_int_t                     rc;
+    ngx_uint_t                    delete_lock;
+    ngx_table_elt_t              *dest;
+    ngx_http_dav_ext_loc_conf_t  *dlcf;
 
-	if (stat(path, &st)) {
+    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
 
-		ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
-				"dav_ext stat failed on '%s'", path);
+    if (dlcf->shm_zone == NULL) {
+        return NGX_DECLINED;
+    }
 
-		return NGX_HTTP_NOT_FOUND;
-	}
+    if (r->method & (NGX_HTTP_PUT|NGX_HTTP_DELETE|NGX_HTTP_MKCOL|NGX_HTTP_MOVE))
+    {
+        delete_lock = (r->method & (NGX_HTTP_DELETE|NGX_HTTP_MOVE)) ? 1 : 0;
 
-	if (props & NGX_HTTP_DAV_EXT_PROP_creationdate) {
+        rc = ngx_http_dav_ext_verify_lock(r, &r->uri, delete_lock);
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
 
-		/* output file ctime (attr change time) as creation time */
-		if (gmtime_r(&st.st_ctime, &stm) == NULL)
-			return NGX_ERROR;
+    if (r->method & (NGX_HTTP_MOVE|NGX_HTTP_COPY)) {
+        dest = r->headers_in.destination;
+        if (dest == NULL) {
+            return NGX_DECLINED;
+        }
 
-		/* ISO 8601 time format
-		   2012-02-20T16:15:00Z */
-		NGX_HTTP_DAV_EXT_OUTCB(buf, strftime((char*)buf, sizeof(buf), 
-						"<D:creationdate>"
-							"%Y-%m-%dT%TZ"
-						"</D:creationdate>\n", 
+        uri.data = dest->value.data;
+        uri.len = dest->value.len;
 
-			&stm));
-	}
+        if (ngx_http_dav_ext_strip_uri(r, &uri) != NGX_OK) {
+            return NGX_DECLINED;
+        }
 
-	if (props & NGX_HTTP_DAV_EXT_PROP_displayname) {
-		NGX_HTTP_DAV_EXT_OUTL(
-						"<D:displayname>"
-			);
+        rc = ngx_http_dav_ext_verify_lock(r, &uri, 0);
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
 
-		if (uri->len) {
-
-			for(name.data = uri->data + uri->len;
-				name.data >= uri->data + 1 && name.data[-1] != '/'; 
-				--name.data);
-
-			name.len = uri->data + uri->len - name.data;
-
-			NGX_HTTP_DAV_EXT_OUTES(&name);
-		}
-		
-		NGX_HTTP_DAV_EXT_OUTL(
-						"</D:displayname>\n"
-			);
-	}
-
-	if (props & NGX_HTTP_DAV_EXT_PROP_getcontentlanguage) {
-		NGX_HTTP_DAV_EXT_OUTL(
-						"<D:getcontentlanguage/>\n"
-			);
-	}
-
-	if (props & NGX_HTTP_DAV_EXT_PROP_getcontentlength) {
-		NGX_HTTP_DAV_EXT_OUTCB(buf, ngx_snprintf(buf, sizeof(buf), 
-						"<D:getcontentlength>"
-							"%O"
-						"</D:getcontentlength>\n", 
-
-			st.st_size) - buf);
-	}
-	
-	if (props & NGX_HTTP_DAV_EXT_PROP_getcontenttype) {
-		NGX_HTTP_DAV_EXT_OUTL(
-						"<D:getcontenttype/>\n"
-			);
-	}
-
-	if (props & NGX_HTTP_DAV_EXT_PROP_getetag) {
-		NGX_HTTP_DAV_EXT_OUTL(
-						"<D:getetag/>\n"
-			);
-	}
-
-	if (props & NGX_HTTP_DAV_EXT_PROP_getlastmodified) {
-
-		if (gmtime_r(&st.st_mtime, &stm) == NULL)
-			return NGX_ERROR;
-
-		/* RFC 2822 time format */
-		NGX_HTTP_DAV_EXT_OUTCB(buf, strftime((char*)buf, sizeof(buf), 
-						"<D:getlastmodified>"
-							"%a, %d %b %Y %T GMT"
-						"</D:getlastmodified>\n", 
-
-			&stm));
-	}
-
-	if (props & NGX_HTTP_DAV_EXT_PROP_lockdiscovery) {
-		NGX_HTTP_DAV_EXT_OUTL(
-						"<D:lockdiscovery/>\n"
-			);
-	}
-
-	if (props & NGX_HTTP_DAV_EXT_PROP_resourcetype) {
-		if (S_ISDIR(st.st_mode)) {
-			NGX_HTTP_DAV_EXT_OUTL(
-						"<D:resourcetype>"
-							"<D:collection/>"
-						"</D:resourcetype>\n"
-				);
-		} else {
-			NGX_HTTP_DAV_EXT_OUTL(
-						"<D:resourcetype/>\n"
-				);
-		}
-	}
-
-	if (props & NGX_HTTP_DAV_EXT_PROP_source) {
-		NGX_HTTP_DAV_EXT_OUTL(
-						"<D:source/>\n"
-			);
-	}
-
-	if (props & NGX_HTTP_DAV_EXT_PROP_supportedlock) {
-		NGX_HTTP_DAV_EXT_OUTL(
-						"<D:supportedlock/>\n"
-			);
-	}
-
-	return NGX_OK;
-}
-				
-static ngx_int_t
-ngx_http_dav_ext_send_propfind_item(ngx_http_request_t *r, 
-	char *path, ngx_str_t *uri)
-{
-	ngx_http_dav_ext_ctx_t *ctx;
-	ngx_chain_t            *l = NULL, **ll = &l;
-	u_char                 vbuf[8];
-	ngx_str_t              status_line = ngx_string("200 OK");
-
-	ctx = ngx_http_get_module_ctx(r, ngx_http_dav_ext_module);
-
-	NGX_HTTP_DAV_EXT_OUTL(
-			"<D:response>\n"
-				"<D:href>"
-		);
-
-	NGX_HTTP_DAV_EXT_OUTES(uri);
-
-	NGX_HTTP_DAV_EXT_OUTL(
-				"</D:href>\n"
-				"<D:propstat>\n"
-					"<D:prop>\n"
-		);
-
-	if (ctx->propfind == NGX_HTTP_DAV_EXT_PROPFIND_NAMES) {
-
-		NGX_HTTP_DAV_EXT_OUTL(
-						"<D:creationdate/>\n"
-						"<D:displayname/>\n"
-						"<D:getcontentlanguage/>\n"
-						"<D:getcontentlength/>\n"
-						"<D:getcontenttype/>\n"
-						"<D:getetag/>\n"
-						"<D:getlastmodified/>\n"
-						"<D:lockdiscovery/>\n"
-						"<D:resourcetype/>\n"
-						"<D:source/>\n"
-						"<D:supportedlock/>\n"
-			);
-
-	} else {
-
-		switch (ngx_http_dav_ext_send_propfind_atts(r, path, uri, ll,
-				ctx->propfind == NGX_HTTP_DAV_EXT_PROPFIND_SELECTED ? 
-				ctx->props : (ngx_uint_t)-1))
-		{
-			case NGX_HTTP_NOT_FOUND:
-				ngx_str_set(&status_line, "404 Not Found");
-				break;
-
-			case NGX_OK:
-			case NGX_HTTP_OK:
-				break;
-
-			default:
-				ngx_str_set(&status_line, "500 Internal Server Error");
-		}
-	}
-
-	NGX_HTTP_DAV_EXT_OUTL(
-					"</D:prop>\n"
-					"<D:status>HTTP/"
-		);
-
-	NGX_HTTP_DAV_EXT_OUTCB(vbuf, ngx_snprintf(vbuf, sizeof(vbuf), "%d.%d ", 
-			r->http_major, r->http_minor) - vbuf);
-
-	NGX_HTTP_DAV_EXT_OUTS(&status_line);
-
-	NGX_HTTP_DAV_EXT_OUTL(
-					"</D:status>\n"
-				"</D:propstat>\n"
-			"</D:response>\n"
-
-		);
-
-	ngx_http_dav_ext_flush(r, ll);
-
-	return NGX_OK;
+    return NGX_DECLINED;
 }
 
-/* path returned by this function is terminated
-   with a hidden (out-of-len) null */
-static void ngx_http_dav_ext_make_child(ngx_pool_t *pool, ngx_str_t *parent, 
-		u_char *child, size_t chlen, ngx_str_t *path)
-{
-	u_char *s;
-
-	path->data = ngx_palloc(pool, parent->len + 2 + chlen);
-	s = path->data;
-	s = ngx_cpymem(s, parent->data, parent->len);
-	if (parent->len > 0 && s[-1] != '/')
-		*s++ = '/';
-	s = ngx_cpymem(s, child, chlen);
-	path->len = s - path->data;
-	*s = 0;
-}
-
-#define DAV_EXT_INFINITY (-1)
 
 static ngx_int_t
-ngx_http_dav_ext_send_propfind(ngx_http_request_t *r)
+ngx_http_dav_ext_strip_uri(ngx_http_request_t *r, ngx_str_t *uri)
 {
-	size_t                    root;
-	ngx_str_t                 path, spath, ruri, suri;
-	ngx_chain_t               *l = NULL, **ll = &l;
-	DIR                       *dir;
-	int                       depth;
-	struct dirent             *de;
-	size_t                    len, uc_len;
-	ngx_http_variable_value_t vv;
-	ngx_str_t                 depth_name = ngx_string("depth");
-	u_char                    *p, *uc;
+    u_char  *p, *last, *host;
+    size_t   len;
 
-	if (ngx_http_variable_unknown_header(&vv, &depth_name, 
-					&r->headers_in.headers.part, 0) != NGX_OK)
-	{
-		return NGX_ERROR;
-	}
+    if (uri->data[0] == '/') {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http dav_ext strip uri:\"%V\" unchanged", uri);
+        return NGX_OK;
+    }
 
-	if (!vv.not_found) {
-		if (vv.len == sizeof("infinity") -1 
-			&& !ngx_strncasecmp(vv.data, (u_char*)"infinity", vv.len))
-		{
-			depth = DAV_EXT_INFINITY; 
-		} else {
-			depth = ngx_atoi(vv.data, vv.len);
-		}
+    len = r->headers_in.server.len;
 
-	} else {
-		depth = DAV_EXT_INFINITY;
-	}
+    if (len == 0) {
+        goto failed;
+    }
 
-	p = ngx_http_map_uri_to_path(r, &path, &root, 0);
+#if (NGX_HTTP_SSL)
 
-	if (p == NULL || !path.len) {
+    if (r->connection->ssl) {
+        if (ngx_strncmp(uri->data, "https://", sizeof("https://") - 1) != 0) {
+            goto failed;
+        }
 
-		ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-				"dav_ext error mapping uri to path");
+        host = uri->data + sizeof("https://") - 1;
 
-		return NGX_ERROR;
-	}
+    } else
+#endif
+    {
+        if (ngx_strncmp(uri->data, "http://", sizeof("http://") - 1) != 0) {
+            goto failed;
+        }
 
-	path.len = p - path.data;
-	*p = 0;
+        host = uri->data + sizeof("http://") - 1;
+    }
 
-	ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-			"http propfind path: \"%V\"", &path);
+    if (ngx_strncmp(host, r->headers_in.server.data, len) != 0) {
+        goto failed;
+    }
 
-	NGX_HTTP_DAV_EXT_OUTL(
-		"<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
-		"<D:multistatus xmlns:D=\"DAV:\">\n"
-		);
+    last = uri->data + uri->len;
 
-	ngx_http_dav_ext_flush(r, ll);
-/*
-	ruri.data = ngx_palloc(r->pool, r->uri.len + 2 * ngx_escape_uri(NULL,
-						r->uri.data, r->uri.len, NGX_ESCAPE_URI));
-	if (ruri.data == NULL) {
-		return NGX_ERROR;
-	}
+    for (p = host + len; p != last; p++) {
+        if (*p == '/') {
+            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "http dav_ext strip uri \"%V\" \"%*s\"",
+                           uri, last - p, p);
 
-	ruri.len = (u_char *) ngx_escape_uri(ruri.data, r->uri.data, r->uri.len,
-						NGX_ESCAPE_URI) - ruri.data;
-*/
-	ruri = r->unparsed_uri;
+            uri->data = p;
+            uri->len = last - p;
 
-	ngx_http_dav_ext_send_propfind_item(r, (char*)path.data, &ruri);
+            return NGX_OK;
+        }
+    }
 
-	if (depth) {
+failed:
 
-		/* treat infinite depth as 1 for performance reasons */
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext strip uri \"%V\" failed", uri);
 
-		if ((dir = opendir((char*)path.data))) {
-
-			while((de = readdir(dir))) {
-
-				if (!strcmp(de->d_name, ".")
-					|| !strcmp(de->d_name, ".."))
-				{
-					continue;
-				}
-
-				len = strlen(de->d_name);
-
-				ngx_http_dav_ext_make_child(r->pool, &path, 
-					(u_char*)de->d_name, len, &spath);
-
-				/* escape uri component */
-
-				uc = ngx_palloc(r->pool, len + 2 * ngx_escape_uri(NULL,
-							(u_char *) de->d_name, len, NGX_ESCAPE_URI_COMPONENT));
-				if (uc == NULL) {
-					return NGX_ERROR;
-				}
-
-				uc_len = (u_char*)ngx_escape_uri(uc, (u_char *) de->d_name, len,
-							NGX_ESCAPE_URI_COMPONENT) - uc;
-
-				ngx_http_dav_ext_make_child(r->pool, &ruri, uc, uc_len, &suri);
-
-				ngx_http_dav_ext_send_propfind_item(r, (char*)spath.data, &suri);
-
-			}
-
-			closedir(dir);
-		}
-
-	}
-
-	NGX_HTTP_DAV_EXT_OUTL(
-		"</D:multistatus>\n"
-		);
-
-	if (*ll && (*ll)->buf) {
-		(*ll)->buf->last_buf = 1;
-	}
-
-	ngx_http_dav_ext_flush(r, ll);
-
-	return NGX_OK;
+    return NGX_DECLINED;
 }
 
+
+static ngx_int_t
+ngx_http_dav_ext_verify_lock(ngx_http_request_t *r, ngx_str_t *uri,
+    ngx_uint_t delete_lock)
+{
+    uint32_t                      token;
+    ngx_http_dav_ext_node_t      *node;
+    ngx_http_dav_ext_lock_t      *lock;
+    ngx_http_dav_ext_loc_conf_t  *dlcf;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext verify lock \"%V\"", uri);
+
+    token = ngx_http_dav_ext_if(r, uri);
+
+    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
+    lock = dlcf->shm_zone->data;
+
+    ngx_shmtx_lock(&lock->shpool->mutex);
+
+    node = ngx_http_dav_ext_lock_lookup(r, lock, uri, -1);
+    if (node == NULL) {
+        ngx_shmtx_unlock(&lock->shpool->mutex);
+        return NGX_OK;
+    }
+
+    if (token == 0) {
+        ngx_shmtx_unlock(&lock->shpool->mutex);
+        return 423; /* Locked */
+    }
+
+    if (token != node->token) {
+        ngx_shmtx_unlock(&lock->shpool->mutex);
+        return NGX_HTTP_PRECONDITION_FAILED;
+    }
+
+    /*
+     * RFC4918:
+     * If a request causes the lock-root of any lock to become an
+     * unmapped URL, then the lock MUST also be deleted by that request.
+     */
+
+    if (delete_lock && node->len == uri->len) {
+        ngx_queue_remove(&node->queue);
+        ngx_slab_free_locked(lock->shpool, node);
+    }
+
+    ngx_shmtx_unlock(&lock->shpool->mutex);
+
+    return NGX_OK;
+}
+
+
+static ngx_http_dav_ext_node_t *
+ngx_http_dav_ext_lock_lookup(ngx_http_request_t *r,
+    ngx_http_dav_ext_lock_t *lock, ngx_str_t *uri, ngx_int_t depth)
+{
+    time_t                    now;
+    ngx_queue_t              *q;
+    ngx_http_dav_ext_node_t  *node;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext lock lookup \"%V\"", uri);
+
+    if (uri->len == 0) {
+        return NULL;
+    }
+
+    now = ngx_time();
+
+    while (!ngx_queue_empty(&lock->sh->queue)) {
+        q = ngx_queue_head(&lock->sh->queue);
+        node = (ngx_http_dav_ext_node_t *) q;
+
+        if (node->expire >= now) {
+            break;
+        }
+
+        ngx_queue_remove(q);
+        ngx_slab_free_locked(lock->shpool, node);
+    }
+
+    for (q = ngx_queue_head(&lock->sh->queue);
+         q != ngx_queue_sentinel(&lock->sh->queue);
+         q = ngx_queue_next(q))
+    {
+        node = (ngx_http_dav_ext_node_t *) q;
+
+        if (uri->len >= node->len) {
+            if (ngx_memcmp(uri->data, node->data, node->len)) {
+                continue;
+            }
+
+            if (uri->len > node->len) {
+                if (node->data[node->len - 1] != '/') {
+                    continue;
+                }
+
+                if (!node->infinite
+                    && ngx_strlchr(uri->data + node->len,
+                                   uri->data + uri->len - 1, '/'))
+                {
+                    continue;
+                }
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "http dav_ext lock found \"%*s\"",
+                           node->len, node->data);
+
+            return node;
+        }
+
+        /* uri->len < node->len */
+
+        if (depth >= 0) {
+            if (ngx_memcmp(node->data, uri->data, uri->len)) {
+                continue;
+            }
+
+            if (uri->data[uri->len - 1] != '/') {
+                continue;
+            }
+
+            if (depth == 0
+                && ngx_strlchr(node->data + uri->len,
+                               node->data + node->len - 1, '/'))
+            {
+                continue;
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "http dav_ext lock found \"%*s\"",
+                           node->len, node->data);
+
+            return node;
+        }
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext lock not found");
+
+    return NULL;
+}
+
+
+static ngx_int_t
+ngx_http_dav_ext_content_handler(ngx_http_request_t *r)
+{
+    ngx_int_t                     rc;
+    ngx_table_elt_t              *h;
+    ngx_http_dav_ext_loc_conf_t  *dlcf;
+
+    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
+
+    if (!(r->method & dlcf->methods)) {
+        return NGX_DECLINED;
+    }
+
+    switch (r->method) {
+
+    case NGX_HTTP_PROPFIND:
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http dav_ext propfind");
+
+        rc = ngx_http_read_client_request_body(r,
+                                            ngx_http_dav_ext_propfind_handler);
+        if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+            return rc;
+        }
+
+        return NGX_DONE;
+
+    case NGX_HTTP_OPTIONS:
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http dav_ext options");
+
+        rc = ngx_http_discard_request_body(r);
+
+        if (rc != NGX_OK) {
+            return rc;
+        }
+
+        h = ngx_list_push(&r->headers_out.headers);
+        if (h == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        ngx_str_set(&h->key, "DAV");
+        h->value.len = 1;
+        h->value.data = (u_char *) (dlcf->shm_zone ? "2" : "1");
+        h->hash = 1;
+
+        h = ngx_list_push(&r->headers_out.headers);
+        if (h == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        /* XXX */
+        ngx_str_set(&h->key, "Allow");
+        ngx_str_set(&h->value,
+           "GET,HEAD,PUT,DELETE,MKCOL,COPY,MOVE,PROPFIND,OPTIONS,LOCK,UNLOCK");
+        h->hash = 1;
+
+        r->headers_out.status = NGX_HTTP_OK;
+        r->headers_out.content_length_n = 0;
+
+        rc = ngx_http_send_header(r);
+
+        if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+            return rc;
+        }
+
+        return ngx_http_send_special(r, NGX_HTTP_LAST);
+
+    case NGX_HTTP_LOCK:
+
+        if (dlcf->shm_zone == NULL) {
+            return NGX_HTTP_NOT_ALLOWED;
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http dav_ext lock");
+
+        /*
+         * Body is expected to carry the requested lock type, but
+         * since we only support write/exclusive locks, we ignore it.
+         * Ideally we could throw an error if a lock of another type
+         * is requested, but the amount of work required for that is
+         * not worth it.
+         */
+
+        rc = ngx_http_discard_request_body(r);
+
+        if (rc != NGX_OK) {
+            return rc;
+        }
+
+        return ngx_http_dav_ext_lock_handler(r);
+
+    case NGX_HTTP_UNLOCK:
+
+        if (dlcf->shm_zone == NULL) {
+            return NGX_HTTP_NOT_ALLOWED;
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http dav_ext unlock");
+
+        rc = ngx_http_discard_request_body(r);
+
+        if (rc != NGX_OK) {
+            return rc;
+        }
+
+        return ngx_http_dav_ext_unlock_handler(r);
+    }
+
+    return NGX_DECLINED;
+}
+
+
 static void
 ngx_http_dav_ext_propfind_handler(ngx_http_request_t *r)
 {
-	ngx_chain_t             *c;
-	ngx_buf_t               *b;
-	XML_Parser              parser;
-	ngx_uint_t              status;
-	ngx_http_dav_ext_ctx_t *ctx;
+    off_t                        len;
+    ngx_buf_t                   *b;
+    ngx_chain_t                 *cl;
+    xmlSAXHandler                sax;
+    xmlParserCtxtPtr             pctx;
+    ngx_http_dav_ext_xml_ctx_t   xctx;
 
-	ctx = ngx_http_get_module_ctx(r, ngx_http_dav_ext_module);
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext propfind handler");
 
-	if (ctx == NULL) {
-		ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_dav_ext_ctx_t));
-		ngx_http_set_ctx(r, ctx, ngx_http_dav_ext_module);
-	}
+    ngx_memzero(&xctx, sizeof(ngx_http_dav_ext_xml_ctx_t));
+    ngx_memzero(&sax, sizeof(xmlSAXHandler));
 
-	c = r->request_body->bufs;
+    sax.initialized = XML_SAX2_MAGIC;
+    sax.startElementNs = ngx_http_dav_ext_propfind_xml_start;
+    sax.endElementNs = ngx_http_dav_ext_propfind_xml_end;
 
-	status = NGX_OK;
+    pctx = xmlCreatePushParserCtxt(&sax, &xctx, NULL, 0, NULL);
+    if (pctx == NULL) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "xmlCreatePushParserCtxt() failed");
+        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return;
+    }
 
-	parser = XML_ParserCreate(NULL);
+    len = 0;
 
-	XML_SetUserData(parser, ctx);
+    for (cl = r->request_body->bufs; cl; cl = cl->next) {
+        b = cl->buf;
 
-	XML_SetElementHandler(parser, 
-			ngx_http_dav_ext_start_xml_elt,
-			ngx_http_dav_ext_end_xml_elt);
+        if (b->in_file) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "PROPFIND client body is in file, "
+                          "you may want to increase client_body_buffer_size");
+            xmlFreeParserCtxt(pctx);
+            ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+            return;
+        }
 
-	for(; c != NULL && c->buf != NULL && !c->buf->last_buf; c = c->next) {
+        if (ngx_buf_special(b)) {
+            continue;
+        }
 
-		b = c ->buf;
+        len += b->last - b->pos;
 
-		if (!XML_Parse(parser, (const char*)b->pos, b->last - b->pos, b->last_buf)) {
+        if (xmlParseChunk(pctx, (const char *) b->pos, b->last - b->pos,
+                          b->last_buf))
+        {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "xmlParseChunk() failed");
+            xmlFreeParserCtxt(pctx);
+            ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+            return;
+        }
+    }
 
-			ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-					"dav_ext propfind XML error");
+    xmlFreeParserCtxt(pctx);
 
-			status = NGX_ERROR;
+    if (len == 0) {
 
-			break;
-		}
+        /*
+         * For easier debugging treat bodiless requests
+         * as if they expect all properties.
+         */
 
-	}
-
-	XML_ParserFree(parser);
-
-	if (status == NGX_OK) {
-
-		r->headers_out.status = 207;
-
-		ngx_str_set(&r->headers_out.status_line, "207 Multi-Status");
-
-		ngx_http_send_header(r);
-
-		ngx_http_finalize_request(r, ngx_http_dav_ext_send_propfind(r));
-
-	} else {
-
-		r->headers_out.status = NGX_HTTP_INTERNAL_SERVER_ERROR;
-
-		r->header_only = 1;
-
-		r->headers_out.content_length_n = 0;
-
-		ngx_http_finalize_request(r, ngx_http_send_header(r));
-
-	}
+        xctx.props = NGX_HTTP_DAV_EXT_PROP_ALL;
+    }
 
+    ngx_http_finalize_request(r, ngx_http_dav_ext_propfind(r, xctx.props));
 }
 
+
+static void
+ngx_http_dav_ext_propfind_xml_start(void *data, const xmlChar *localname,
+    const xmlChar *prefix, const xmlChar *uri, int nb_namespaces,
+    const xmlChar **namespaces, int nb_attributes, int nb_defaulted,
+    const xmlChar **attributes)
+{
+    ngx_http_dav_ext_xml_ctx_t *xctx = data;
+
+    if (ngx_strcmp(localname, "propfind") == 0) {
+        xctx->nodes ^= NGX_HTTP_DAV_EXT_NODE_PROPFIND;
+    }
+
+    if (ngx_strcmp(localname, "prop") == 0) {
+        xctx->nodes ^= NGX_HTTP_DAV_EXT_NODE_PROP;
+    }
+
+    if (ngx_strcmp(localname, "propname") == 0) {
+        xctx->nodes ^= NGX_HTTP_DAV_EXT_NODE_PROPNAME;
+    }
+
+    if (ngx_strcmp(localname, "allprop") == 0) {
+        xctx->nodes ^= NGX_HTTP_DAV_EXT_NODE_ALLPROP;
+    }
+}
+
+
+static void
+ngx_http_dav_ext_propfind_xml_end(void *data, const xmlChar *localname,
+    const xmlChar *prefix, const xmlChar *uri)
+{
+    ngx_http_dav_ext_xml_ctx_t *xctx = data;
+
+    if (xctx->nodes & NGX_HTTP_DAV_EXT_NODE_PROPFIND) {
+
+        if (xctx->nodes & NGX_HTTP_DAV_EXT_NODE_PROP) {
+            if (ngx_strcmp(localname, "displayname") == 0) {
+                xctx->props |= NGX_HTTP_DAV_EXT_PROP_DISPLAYNAME;
+            }
+
+            if (ngx_strcmp(localname, "getcontentlength") == 0) {
+                xctx->props |= NGX_HTTP_DAV_EXT_PROP_GETCONTENTLENGTH;
+            }
+
+            if (ngx_strcmp(localname, "getlastmodified") == 0) {
+                xctx->props |= NGX_HTTP_DAV_EXT_PROP_GETLASTMODIFIED;
+            }
+
+            if (ngx_strcmp(localname, "resourcetype") == 0) {
+                xctx->props |= NGX_HTTP_DAV_EXT_PROP_RESOURCETYPE;
+            }
+
+            if (ngx_strcmp(localname, "lockdiscovery") == 0) {
+                xctx->props |= NGX_HTTP_DAV_EXT_PROP_LOCKDISCOVERY;
+            }
+
+            if (ngx_strcmp(localname, "supportedlock") == 0) {
+                xctx->props |= NGX_HTTP_DAV_EXT_PROP_SUPPORTEDLOCK;
+            }
+        }
+
+        if (xctx->nodes & NGX_HTTP_DAV_EXT_NODE_PROPNAME) {
+            xctx->props |= NGX_HTTP_DAV_EXT_PROP_NAMES;
+        }
+
+        if (xctx->nodes & NGX_HTTP_DAV_EXT_NODE_ALLPROP) {
+            xctx->props = NGX_HTTP_DAV_EXT_PROP_ALL;
+        }
+    }
+
+    ngx_http_dav_ext_propfind_xml_start(data, localname, prefix, uri,
+                                        0, NULL, 0, 0, NULL);
+}
+
+
 static ngx_int_t
-ngx_http_dav_ext_handler(ngx_http_request_t *r)
+ngx_http_dav_ext_propfind(ngx_http_request_t *r, ngx_uint_t props)
 {
-	ngx_int_t                    rc;
-	ngx_table_elt_t              *h;
-	ngx_http_dav_ext_loc_conf_t  *delcf;
-		    
-	delcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
+    size_t                     root, allocated;
+    u_char                    *p, *last, *filename;
+    ngx_int_t                  rc;
+    ngx_err_t                  err;
+    ngx_str_t                  path, name;
+    ngx_dir_t                  dir;
+    ngx_uint_t                 depth;
+    ngx_array_t                entries;
+    ngx_file_info_t            fi;
+    ngx_http_dav_ext_entry_t  *entry;
 
-	if (!(r->method & delcf->methods)) {
-		return NGX_DECLINED;
-	}
+    if (ngx_array_init(&entries, r->pool, 40, sizeof(ngx_http_dav_ext_entry_t))
+        != NGX_OK)
+    {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
 
-	switch (r->method) {
+    rc = ngx_http_dav_ext_depth(r, 0);
 
-		case NGX_HTTP_PROPFIND:
+    if (rc == NGX_ERROR) {
+        return NGX_HTTP_BAD_REQUEST;
+    }
 
-			ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-					"dav_ext propfind");
+    if (rc == NGX_MAX_INT_T_VALUE) {
 
-			rc = ngx_http_read_client_request_body(r, 
-						ngx_http_dav_ext_propfind_handler);
+        /*
+         * RFC4918:
+         * 403 Forbidden -  A server MAY reject PROPFIND requests on
+         * collections with depth header of "Infinity", in which case
+         * it SHOULD use this error with the precondition code
+         * 'propfind-finite-depth' inside the error body.
+         */
 
-			if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-				return rc;
-			}
+        return NGX_HTTP_FORBIDDEN;
+    }
 
-			return NGX_DONE;   
+    depth = rc;
 
-		case NGX_HTTP_OPTIONS:
+    last = ngx_http_map_uri_to_path(r, &path, &root,
+                                    NGX_HTTP_DAV_EXT_PREALLOCATE);
+    if (last == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
 
-			ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-					"dav_ext options");
+    allocated = path.len;
+    path.len = last - path.data;
 
-			h = ngx_list_push(&r->headers_out.headers);
+    if (path.len > 1 && path.data[path.len - 1] == '/') {
+        path.len--;
 
-			if (h == NULL) {
-				return NGX_HTTP_INTERNAL_SERVER_ERROR;
-			}
+    } else {
+        last++;
+    }
 
-			ngx_str_set(&h->key, "DAV");
-			ngx_str_set(&h->value, "1");
-			h->hash = 1;
+    path.data[path.len] = '\0';
 
-			h = ngx_list_push(&r->headers_out.headers);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext propfind path: \"%s\"", path.data);
 
-			if (h == NULL) {
-				return NGX_HTTP_INTERNAL_SERVER_ERROR;
-			}
+    if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) {
+        return NGX_HTTP_NOT_FOUND;
+    }
 
-			/* FIXME: it looks so ugly because I cannot access nginx dav module */
-			ngx_str_set(&h->key, "Allow");
-			ngx_str_set(&h->value, "GET,HEAD,PUT,DELETE,MKCOL,COPY,MOVE,PROPFIND,OPTIONS");
-			h->hash = 1;
+    if (r->uri.len < 2) {
+        name = r->uri;
 
-			r->headers_out.status = NGX_HTTP_OK;
-			r->header_only = 1;
-			r->headers_out.content_length_n = 0;
+    } else {
+        name.data = &r->uri.data[r->uri.len - 1];
+        name.len = (name.data[0] == '/') ? 0 : 1;
 
-			ngx_http_send_header(r);
+        while (name.data != r->uri.data) {
+            p = name.data - 1;
+            if (*p == '/') {
+                break;
+            }
 
-			return NGX_OK;
+            name.data--;
+            name.len++;
+        }
+    }
 
-	}
+    entry = ngx_array_push(&entries);
+    if (entry == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
 
-	return NGX_DECLINED;
+    ngx_memzero(entry, sizeof(ngx_http_dav_ext_entry_t));
+
+    entry->uri = r->uri;
+    entry->name = name;
+    entry->dir = ngx_is_dir(&fi);
+    entry->mtime = ngx_file_mtime(&fi);
+    entry->size = ngx_file_size(&fi);
+
+    if (ngx_http_dav_ext_set_locks(r, entry) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext propfind name:\"%V\", uri:\"%V\"",
+                   &entry->name, &entry->uri);
+
+    if (depth == 0 || !entry->dir) {
+        return ngx_http_dav_ext_propfind_response(r, &entries, props);
+    }
+
+    if (ngx_open_dir(&path, &dir) == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
+                      ngx_open_dir_n " \"%s\" failed", path.data);
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    rc = NGX_OK;
+
+    filename = path.data;
+    filename[path.len] = '/';
+
+    for ( ;; ) {
+        ngx_set_errno(0);
+
+        if (ngx_read_dir(&dir) == NGX_ERROR) {
+            err = ngx_errno;
+
+            if (err != NGX_ENOMOREFILES) {
+                ngx_log_error(NGX_LOG_CRIT, r->connection->log, err,
+                              ngx_read_dir_n " \"%V\" failed", &path);
+                rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            break;
+        }
+
+        name.len = ngx_de_namelen(&dir);
+        name.data = ngx_de_name(&dir);
+
+        if (name.data[0] == '.') {
+            continue;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http dav_ext propfind child path: \"%s\"", name.data);
+
+        entry = ngx_array_push(&entries);
+        if (entry == NULL) {
+            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+            break;
+        }
+
+        ngx_memzero(entry, sizeof(ngx_http_dav_ext_entry_t));
+
+        if (!dir.valid_info) {
+
+            if (path.len + 1 + name.len + 1 > allocated) {
+                allocated = path.len + 1 + name.len + 1
+                            + NGX_HTTP_DAV_EXT_PREALLOCATE;
+
+                filename = ngx_pnalloc(r->pool, allocated);
+                if (filename == NULL) {
+                    rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+                    break;
+                }
+
+                last = ngx_cpystrn(filename, path.data, path.len + 1);
+                *last++ = '/';
+            }
+
+            ngx_cpystrn(last, name.data, name.len + 1);
+
+            if (ngx_de_info(filename, &dir) == NGX_FILE_ERROR) {
+                ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
+                              ngx_de_info_n " \"%s\" failed", filename);
+                rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+                break;
+            }
+        }
+
+        p = ngx_pnalloc(r->pool, name.len);
+        if (p == NULL) {
+            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+            break;
+        }
+
+        ngx_memcpy(p, name.data, name.len);
+        entry->name.data = p;
+        entry->name.len = name.len;
+
+        p = ngx_pnalloc(r->pool, r->uri.len + 1 + name.len + 1);
+        if (p == NULL) {
+            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+            break;
+        }
+
+        entry->uri.data = p;
+
+        p = ngx_cpymem(p, r->uri.data, r->uri.len);
+        if (r->uri.len && r->uri.data[r->uri.len - 1] != '/') {
+            *p++ = '/';
+        }
+
+        p = ngx_cpymem(p, name.data, name.len);
+        if (ngx_de_is_dir(&dir)) {
+            *p++ = '/';
+        }
+
+        entry->uri.len = p - entry->uri.data;
+        entry->dir = ngx_de_is_dir(&dir);
+        entry->mtime = ngx_de_mtime(&dir);
+        entry->size = ngx_de_size(&dir);
+
+        if (ngx_http_dav_ext_set_locks(r, entry) != NGX_OK) {
+            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+            break;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http dav_ext propfind child name:\"%V\", uri:\"%V\"",
+                       &entry->name, &entry->uri);
+    }
+
+    if (ngx_close_dir(&dir) == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
+                      ngx_close_dir_n " \"%V\" failed", &path);
+    }
+
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    return ngx_http_dav_ext_propfind_response(r, &entries, props);
 }
 
+
+static ngx_int_t
+ngx_http_dav_ext_set_locks(ngx_http_request_t *r,
+    ngx_http_dav_ext_entry_t *entry)
+{
+    ngx_http_dav_ext_node_t      *node;
+    ngx_http_dav_ext_lock_t      *lock;
+    ngx_http_dav_ext_loc_conf_t  *dlcf;
+
+    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
+
+    if (dlcf->shm_zone == NULL) {
+        entry->lock_supported = 0;
+        return NGX_OK;
+    }
+
+    entry->lock_supported = 1;
+
+    lock = dlcf->shm_zone->data;
+
+    ngx_shmtx_lock(&lock->shpool->mutex);
+
+    node = ngx_http_dav_ext_lock_lookup(r, lock, &entry->uri, -1);
+    if (node == NULL) {
+        ngx_shmtx_unlock(&lock->shpool->mutex);
+        return NGX_OK;
+    }
+
+    entry->lock_infinite = node->infinite ? 1 : 0;
+    entry->lock_expire = node->expire;
+    entry->lock_token = node->token;
+
+    entry->lock_root.data = ngx_pnalloc(r->pool, node->len);
+    if (entry->lock_root.data == NULL) {
+        ngx_shmtx_unlock(&lock->shpool->mutex);
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(entry->lock_root.data, node->data, node->len);
+    entry->lock_root.len = node->len;
+
+    ngx_shmtx_unlock(&lock->shpool->mutex);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_dav_ext_propfind_response(ngx_http_request_t *r, ngx_array_t *entries,
+    ngx_uint_t props)
+{
+    size_t                     len;
+    u_char                    *p;
+    uintptr_t                  escape;
+    ngx_buf_t                 *b;
+    ngx_int_t                  rc;
+    ngx_uint_t                 n;
+    ngx_chain_t                cl;
+    ngx_http_dav_ext_entry_t  *entry;
+
+    static u_char head[] = 
+        "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
+        "<D:multistatus xmlns:D=\"DAV:\">\n";
+
+    static u_char tail[] = 
+        "</D:multistatus>\n";
+
+    entry = entries->elts;
+
+    for (n = 0; n < entries->nelts; n++) {
+        escape = 2 * ngx_escape_uri(NULL, entry[n].uri.data, entry[n].uri.len,
+                                    NGX_ESCAPE_URI);
+        if (escape == 0) {
+            continue;
+        }
+
+        p = ngx_pnalloc(r->pool, entry[n].uri.len + escape);
+        if (p == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        entry[n].uri.len = (u_char *) ngx_escape_uri(p, entry[n].uri.data,
+                                                     entry[n].uri.len,
+                                                     NGX_ESCAPE_URI)
+                           - p;
+        entry[n].uri.data = p;
+    }
+
+    len = sizeof(head) - 1 + sizeof(tail) - 1;
+
+    for (n = 0; n < entries->nelts; n++) {
+        len += ngx_http_dav_ext_format_propfind(r, NULL, &entry[n], props);
+    }
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    b->last = ngx_cpymem(b->last, head, sizeof(head) - 1);
+
+    for (n = 0; n < entries->nelts; n++) {
+        b->last = (u_char *) ngx_http_dav_ext_format_propfind(r, b->last,
+                                                              &entry[n], props);
+    }
+
+    b->last = ngx_cpymem(b->last, tail, sizeof(tail) - 1);
+
+    b->last_buf = (r == r->main) ? 1 : 0;
+    b->last_in_chain = 1;
+
+    cl.buf = b;
+    cl.next = NULL;
+
+    r->headers_out.status = 207;
+    ngx_str_set(&r->headers_out.status_line, "207 Multi-Status");
+
+    r->headers_out.content_length_n = b->last - b->pos;
+
+    r->headers_out.content_type_len = sizeof("text/xml") - 1;
+    ngx_str_set(&r->headers_out.content_type, "text/xml");
+    r->headers_out.content_type_lowcase = NULL;
+
+    ngx_str_set(&r->headers_out.charset, "utf-8");
+
+    rc = ngx_http_send_header(r);
+
+    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+        return rc;
+    }
+
+    return ngx_http_output_filter(r, &cl);
+}
+
+
+static ngx_int_t
+ngx_http_dav_ext_lock_handler(ngx_http_request_t *r)
+{
+    u_char                       *last;
+    size_t                        n, root;
+    time_t                        now;
+    uint32_t                      token, new_token;
+    ngx_fd_t                      fd;
+    ngx_int_t                     rc, depth;
+    ngx_str_t                     path;
+    ngx_uint_t                    status;
+    ngx_file_info_t               fi;
+    ngx_http_dav_ext_lock_t      *lock;
+    ngx_http_dav_ext_node_t      *node;
+    ngx_http_dav_ext_loc_conf_t  *dlcf;
+
+    if (r->uri.len == 0) {
+        return NGX_HTTP_BAD_REQUEST;
+    }
+
+    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
+    lock = dlcf->shm_zone->data;
+
+    /*
+     * RFC4918:
+     * If no Depth header is submitted on a LOCK request, then the request
+     * MUST act as if a "Depth:infinity" had been submitted.
+     */
+
+    rc = ngx_http_dav_ext_depth(r, NGX_MAX_INT_T_VALUE);
+
+    if (rc == NGX_ERROR || rc == 1) {
+
+        /*
+         * RFC4918:
+         * Values other than 0 or infinity MUST NOT be used with the Depth
+         * header on a LOCK method.
+         */
+
+        return NGX_HTTP_BAD_REQUEST;
+    }
+
+    depth = rc;
+
+    token = ngx_http_dav_ext_if(r, &r->uri);
+
+    do {
+        new_token = ngx_random();
+    } while (new_token == 0);
+
+    now = ngx_time();
+
+    ngx_shmtx_lock(&lock->shpool->mutex);
+
+    node = ngx_http_dav_ext_lock_lookup(r, lock, &r->uri, depth);
+
+    if (node) {
+        if (token == 0) {
+            ngx_shmtx_unlock(&lock->shpool->mutex);
+            return 423; /* Locked */
+        }
+
+        if (node->token != token) {
+            ngx_shmtx_unlock(&lock->shpool->mutex);
+            return NGX_HTTP_PRECONDITION_FAILED;
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http dav_ext refresh lock");
+
+        node->expire = now + lock->timeout;
+
+        ngx_queue_remove(&node->queue);
+        ngx_queue_insert_tail(&lock->sh->queue, &node->queue);
+
+        ngx_shmtx_unlock(&lock->shpool->mutex);
+
+        return ngx_http_dav_ext_lock_response(r, NGX_HTTP_OK, lock->timeout,
+                                              depth, token);
+    }
+
+    n = sizeof(ngx_http_dav_ext_node_t) + r->uri.len - 1;
+
+    node = ngx_slab_alloc_locked(lock->shpool, n);
+    if (node == NULL) {
+        ngx_shmtx_unlock(&lock->shpool->mutex);
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    ngx_memzero(node, sizeof(ngx_http_dav_ext_node_t));
+
+    ngx_memcpy(&node->data, r->uri.data, r->uri.len);
+
+    node->len = r->uri.len;
+    node->token = new_token;
+    node->expire = now + lock->timeout;
+    node->infinite = (depth ? 1 : 0);
+
+    ngx_queue_insert_tail(&lock->sh->queue, &node->queue);
+
+    ngx_shmtx_unlock(&lock->shpool->mutex);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext add lock");
+
+    last = ngx_http_map_uri_to_path(r, &path, &root, 0);
+    if (last == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    *last = '\0';
+
+    status = NGX_HTTP_OK;
+
+    if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) {
+
+        /*
+         * RFC4918:
+         * A successful lock request to an unmapped URL MUST result in the
+         * creation of a locked (non-collection) resource with empty content.
+         */
+
+        fd = ngx_open_file(path.data, NGX_FILE_RDONLY, NGX_FILE_CREATE_OR_OPEN,
+                           NGX_FILE_DEFAULT_ACCESS);
+
+        if (fd == NGX_INVALID_FILE) {
+
+            /*
+             * RFC4918:
+             * 409 (Conflict) - A resource cannot be created at the destination
+             * until one or more intermediate collections have been created.
+             * The server MUST NOT create those intermediate collections
+             * automatically.
+             */
+
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno,
+                          ngx_open_file_n " \"%s\" failed", path.data);
+            return NGX_HTTP_CONFLICT;
+        }
+
+        if (ngx_close_file(fd) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
+                          ngx_close_file_n " \"%s\" failed", path.data);
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        status = NGX_HTTP_CREATED;
+    }
+
+    return ngx_http_dav_ext_lock_response(r, status, lock->timeout, depth,
+                                          new_token);
+}
+
+
+static ngx_int_t
+ngx_http_dav_ext_lock_response(ngx_http_request_t *r, ngx_uint_t status,
+    time_t timeout, ngx_uint_t depth, uint32_t token)
+{
+    size_t                     len;
+    time_t                     now;
+    u_char                    *p;
+    ngx_int_t                  rc;
+    ngx_buf_t                 *b;
+    ngx_chain_t                cl;
+    ngx_table_elt_t           *h;
+    ngx_http_dav_ext_entry_t   entry;
+
+    static u_char head[] =
+        "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
+        "<D:prop xmlns:D=\"DAV:\">\n";
+
+    static u_char tail[] =
+        "</D:prop>\n";
+
+    now = ngx_time();
+
+    ngx_memzero(&entry, sizeof(ngx_http_dav_ext_entry_t));
+
+    entry.lock_expire = now + timeout;
+    entry.lock_root = r->uri;
+    entry.lock_infinite = depth ? 1 : 0;
+    entry.lock_token = token;
+
+    len = sizeof(head) - 1
+          + ngx_http_dav_ext_format_lockdiscovery(r, NULL, &entry)
+          + sizeof(tail) - 1;
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    b->last = ngx_cpymem(b->last, head, sizeof(head) - 1);
+    b->last = (u_char *) ngx_http_dav_ext_format_lockdiscovery(r, b->last,
+                                                               &entry);
+    b->last = ngx_cpymem(b->last, tail, sizeof(tail) - 1);
+
+    b->last_buf = (r == r->main) ? 1 : 0;
+    b->last_in_chain = 1;
+
+    cl.buf = b;
+    cl.next = NULL;
+
+    r->headers_out.status = status;
+    r->headers_out.content_length_n = b->last - b->pos;
+
+    r->headers_out.content_type_len = sizeof("text/xml") - 1;
+    ngx_str_set(&r->headers_out.content_type, "text/xml");
+    r->headers_out.content_type_lowcase = NULL;
+
+    ngx_str_set(&r->headers_out.charset, "utf-8");
+
+    h = ngx_list_push(&r->headers_out.headers);
+    if (h == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    ngx_str_set(&h->key, "Lock-Token");
+
+    p = ngx_pnalloc(r->pool, ngx_http_dav_ext_format_token(NULL, token, 1));
+    if (p == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    h->value.data = p;
+    h->value.len = (u_char *) ngx_http_dav_ext_format_token(p, token, 1) - p;
+    h->hash = 1;
+
+    rc = ngx_http_send_header(r);
+
+    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+        return rc;
+    }
+
+    return ngx_http_output_filter(r, &cl);
+}
+
+
+static ngx_int_t
+ngx_http_dav_ext_unlock_handler(ngx_http_request_t *r)
+{
+    uint32_t                      token;
+    ngx_http_dav_ext_lock_t      *lock;
+    ngx_http_dav_ext_node_t      *node;
+    ngx_http_dav_ext_loc_conf_t  *dlcf;
+
+    token = ngx_http_dav_ext_lock_token(r);
+
+    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
+    lock = dlcf->shm_zone->data;
+
+    ngx_shmtx_lock(&lock->shpool->mutex);
+
+    node = ngx_http_dav_ext_lock_lookup(r, lock, &r->uri, -1);
+
+    if (node == NULL || node->token != token) {
+        ngx_shmtx_unlock(&lock->shpool->mutex);
+        return NGX_HTTP_NO_CONTENT;
+    }
+
+    ngx_queue_remove(&node->queue);
+    ngx_slab_free_locked(lock->shpool, node);
+
+    ngx_shmtx_unlock(&lock->shpool->mutex);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext delete lock");
+
+    return NGX_HTTP_NO_CONTENT;
+}
+
+
+static ngx_int_t
+ngx_http_dav_ext_depth(ngx_http_request_t *r, ngx_int_t default_depth)
+{
+    ngx_table_elt_t  *depth;
+
+    depth = r->headers_in.depth;
+
+    if (depth == NULL) {
+        return default_depth;
+    }
+
+    if (depth->value.len == 1) {
+
+        if (depth->value.data[0] == '0') {
+            return 0;
+        }
+
+        if (depth->value.data[0] == '1') {
+            return 1;
+        }
+
+    } else {
+
+        if (depth->value.len == sizeof("infinity") - 1
+            && ngx_strcmp(depth->value.data, "infinity") == 0)
+        {
+            return NGX_MAX_INT_T_VALUE;
+        }
+    }
+
+    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                  "client sent invalid \"Depth\" header: \"%V\"",
+                  &depth->value);
+
+    return NGX_ERROR;
+}
+
+
+static uint32_t
+ngx_http_dav_ext_lock_token(ngx_http_request_t *r)
+{
+    u_char           *p, ch;
+    uint32_t          token;
+    ngx_uint_t        i, n;
+    ngx_list_part_t  *part;
+    ngx_table_elt_t  *header;
+
+    static u_char name[] = "lock-token";
+
+    part = &r->headers_in.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */ ; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        for (n = 0; n < sizeof(name) - 1 && n < header[i].key.len; n++) {
+            ch = header[i].key.data[n];
+
+            if (ch >= 'A' && ch <= 'Z') {
+                ch |= 0x20;
+            }
+
+            if (name[n] != ch) {
+                break;
+            }
+        }
+
+        if (n == sizeof(name) - 1 && n == header[i].key.len) {
+            p = header[i].value.data;
+
+            if (ngx_strncmp(p, "<urn:", 5)) {
+                return 0;
+            }
+
+            p += 5;
+            token = 0;
+
+            for (n = 0; n < 8; n++) {
+                ch = *p++;
+
+                if (ch >= '0' && ch <= '9') {
+                    token = token * 16 + (ch - '0');
+                    continue;
+                }
+
+                ch = (u_char) (ch | 0x20);
+
+                if (ch >= 'a' && ch <= 'f') {
+                    token = token * 16 + (ch - 'a' + 10);
+                    continue;
+                }
+
+                return 0;
+            }
+
+            if (*p != '>') {
+                return 0;
+            }
+
+            return token;
+        }
+    }
+
+    return 0;
+}
+
+
+static uint32_t
+ngx_http_dav_ext_if(ngx_http_request_t *r, ngx_str_t *uri)
+{
+    u_char           *p, ch;
+    uint32_t          token;
+    ngx_str_t         tag;
+    ngx_uint_t        i, n;
+    ngx_list_part_t  *part;
+    ngx_table_elt_t  *header;
+
+    static u_char name[] = "if";
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http dav_ext if \"%V\"", uri);
+
+    part = &r->headers_in.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */ ; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        for (n = 0; n < sizeof(name) - 1 && n < header[i].key.len; n++) {
+            ch = header[i].key.data[n];
+
+            if (ch >= 'A' && ch <= 'Z') {
+                ch |= 0x20;
+            }
+
+            if (name[n] != ch) {
+                break;
+            }
+        }
+
+        if (n == sizeof(name) - 1 && n == header[i].key.len) {
+            p = header[i].value.data;
+            tag = r->uri;
+
+            while (*p != '\0') {
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "http dav_ext if list \"%s\"", p);
+
+                while (*p == ' ') { p++; }
+
+                if (*p == '<') {
+                    tag.data = ++p;
+
+                    while (*p != '\0' && *p != '>') { p++; }
+
+                    if (*p == '\0') {
+                        break;
+                    }
+
+                    tag.len = p++ - tag.data;
+
+                    (void) ngx_http_dav_ext_strip_uri(r, &tag);
+
+                    while (*p == ' ') { p++; }
+                }
+
+                if (*p != '(') {
+                    break;
+                }
+
+                p++;
+
+                if (tag.len == 0
+                    || tag.len > uri->len
+                    || (tag.len < uri->len && tag.data[tag.len - 1] != '/')
+                    || ngx_memcmp(tag.data, uri->data, tag.len))
+                {
+                    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                                   "http dav_ext if tag mismatch \"%V\"", &tag);
+
+                    while (*p != '\0' && *p != ')') { p++; }
+
+                    if (*p == ')') {
+                        p++;
+                    }
+
+                    continue;
+                }
+
+                while (*p != '\0') {
+                    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                                   "http dav_ext if condition \"%s\"", p);
+
+                    while (*p == ' ') { p++; }
+
+                    if (ngx_strncmp(p, "Not", 3) == 0) {
+                        p += 3;
+                        while (*p == ' ') { p++; }
+                        goto next;
+                    }
+
+                    if (*p == '[') {
+                        p++;
+                        while (*p != '\0' && *p != ']') { p++; }
+                        goto next;
+                    }
+
+                    if (ngx_strncmp(p, "<urn:", 5)) {
+                        goto next;
+                    }
+
+                    p += 5;
+                    token = 0;
+
+                    for (n = 0; n < 8; n++) {
+                        ch = *p++;
+
+                        if (ch >= '0' && ch <= '9') {
+                            token = token * 16 + (ch - '0');
+                            continue;
+                        }
+
+                        ch = (u_char) (ch | 0x20);
+
+                        if (ch >= 'a' && ch <= 'f') {
+                            token = token * 16 + (ch - 'a' + 10);
+                            continue;
+                        }
+
+                        goto next;
+                    }
+
+                    if (*p != '>') {
+                        goto next;
+                    }
+
+                    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                                   "http dav_ext if token: %uxD", token);
+
+                    return token;
+
+                next:
+
+                    while (*p != '\0' && *p != ' ' && *p != ')') { p++; }
+
+                    if (*p == ')') {
+                        p++;
+                        break;
+                    }
+                }
+            }
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "http dav_ext if header mismatch");
+        }
+    }
+
+    return 0;
+}
+
+
+static uintptr_t
+ngx_http_dav_ext_format_propfind(ngx_http_request_t *r, u_char *dst,
+    ngx_http_dav_ext_entry_t *entry, ngx_uint_t props)
+{
+    size_t  len;
+
+    static u_char head[] =
+        "<D:response>\n"
+        "<D:href>";
+
+    /* uri */
+
+    static u_char prop[] =
+        "</D:href>\n"
+        "<D:propstat>\n"
+        "<D:prop>\n";
+
+    /* properties */
+
+    static u_char tail[] =
+        "</D:prop>\n"
+        "<D:status>HTTP/1.1 200 OK</D:status>\n"
+        "</D:propstat>\n"
+        "</D:response>\n";
+
+    static u_char names[] =
+        "<D:displayname/>\n"
+        "<D:getcontentlength/>\n"
+        "<D:getlastmodified/>\n"
+        "<D:resourcetype/>\n"
+        "<D:lockdiscovery/>\n"
+        "<D:supportedlock/>\n";
+
+    static u_char supportedlock[] =
+        "<D:lockentry>\n"
+        "<D:lockscope><D:exclusive/></D:lockscope>\n"
+        "<D:locktype><D:write/></D:locktype>\n"
+        "</D:lockentry>\n";
+
+    if (dst == NULL) {
+        len = sizeof(head) - 1
+              + sizeof(prop) - 1
+              + sizeof(tail) - 1;
+
+        len += entry->uri.len + ngx_escape_html(NULL, entry->uri.data,
+                                                entry->uri.len);
+
+        if (props & NGX_HTTP_DAV_EXT_PROP_NAMES) {
+            len += sizeof(names) - 1;
+
+        } else {
+            len += sizeof("<D:displayname>"
+                          "</D:displayname>\n"
+
+                          "<D:getcontentlength>"
+                          "</D:getcontentlength>\n"
+
+                          "<D:getlastmodified>"
+                          "Mon, 28 Sep 1970 06:00:00 GMT"
+                          "</D:getlastmodified>\n"
+
+                          "<D:resourcetype>"
+                          "<D:collection/>"
+                          "</D:resourcetype>\n"
+
+                          "<D:supportedlock>\n"
+                          "</D:supportedlock>\n") - 1;
+
+            /* displayname */
+            len += entry->name.len
+                   + ngx_escape_html(NULL, entry->name.data, entry->name.len);
+
+            /* getcontentlength */
+            len += NGX_OFF_T_LEN;
+
+            /* lockdiscovery */
+            len += ngx_http_dav_ext_format_lockdiscovery(r, NULL, entry);
+
+            /* supportedlock */
+            if (entry->lock_supported) {
+                len += sizeof(supportedlock) - 1;
+            }
+        }
+
+        return len;
+    }
+
+    dst = ngx_cpymem(dst, head, sizeof(head) - 1);
+    dst = (u_char *) ngx_escape_html(dst, entry->uri.data, entry->uri.len);
+    dst = ngx_cpymem(dst, prop, sizeof(prop) - 1);
+
+    if (props & NGX_HTTP_DAV_EXT_PROP_NAMES) {
+        dst = ngx_cpymem(dst, names, sizeof(names) - 1);
+
+    } else {
+        if (props & NGX_HTTP_DAV_EXT_PROP_DISPLAYNAME) {
+            dst = ngx_cpymem(dst, "<D:displayname>",
+                             sizeof("<D:displayname>") - 1);
+            dst = (u_char *) ngx_escape_html(dst, entry->name.data,
+                                             entry->name.len);
+            dst = ngx_cpymem(dst, "</D:displayname>\n",
+                             sizeof("</D:displayname>\n") - 1);
+        }
+
+        if (props & NGX_HTTP_DAV_EXT_PROP_GETCONTENTLENGTH) {
+            if (!entry->dir) {
+                dst = ngx_sprintf(dst, "<D:getcontentlength>%O"
+                                       "</D:getcontentlength>\n", entry->size);
+            }
+        }
+
+        if (props & NGX_HTTP_DAV_EXT_PROP_GETLASTMODIFIED) {
+            dst = ngx_cpymem(dst, "<D:getlastmodified>",
+                             sizeof("<D:getlastmodified>") - 1);
+            dst = ngx_http_time(dst, entry->mtime);
+            dst = ngx_cpymem(dst, "</D:getlastmodified>\n",
+                             sizeof("</D:getlastmodified>\n") - 1);
+        }
+
+        if (props & NGX_HTTP_DAV_EXT_PROP_RESOURCETYPE) {
+            dst = ngx_cpymem(dst, "<D:resourcetype>",
+                             sizeof("<D:resourcetype>") - 1);
+
+            if (entry->dir) {
+                dst = ngx_cpymem(dst, "<D:collection/>",
+                                 sizeof("<D:collection/>") - 1);
+            }
+
+            dst = ngx_cpymem(dst, "</D:resourcetype>\n",
+                             sizeof("</D:resourcetype>\n") - 1);
+        }
+
+        if (props & NGX_HTTP_DAV_EXT_PROP_LOCKDISCOVERY) {
+            dst = (u_char *) ngx_http_dav_ext_format_lockdiscovery(r, dst,
+                                                                   entry);
+        }
+
+        if (props & NGX_HTTP_DAV_EXT_PROP_SUPPORTEDLOCK) {
+            dst = ngx_cpymem(dst, "<D:supportedlock>\n",
+                             sizeof("<D:supportedlock>\n") - 1);
+
+            if (entry->lock_supported) {
+                dst = ngx_cpymem(dst, supportedlock, sizeof(supportedlock) - 1);
+            }
+
+            dst = ngx_cpymem(dst, "</D:supportedlock>\n",
+                             sizeof("</D:supportedlock>\n") - 1);
+        }
+    }
+
+    dst = ngx_cpymem(dst, tail, sizeof(tail) - 1);
+
+    return (uintptr_t) dst;
+}
+
+
+static uintptr_t
+ngx_http_dav_ext_format_lockdiscovery(ngx_http_request_t *r, u_char *dst,
+    ngx_http_dav_ext_entry_t *entry)
+{
+    size_t  len;
+    time_t  now;
+
+    if (dst == NULL) {
+        if (entry->lock_token == 0) {
+            return sizeof("<D:lockdiscovery/>\n") - 1;
+        }
+
+        len = sizeof("<D:lockdiscovery>\n"
+                     "<D:activelock>\n"
+                     "<D:locktype><D:write/></D:locktype>\n"
+                     "<D:lockscope><D:exclusive/></D:lockscope>\n"
+                     "<D:depth>infinity</D:depth>\n"
+                     "<D:timeout>Second-</D:timeout>\n"
+                     "<D:locktoken><D:href></D:href></D:locktoken>\n"
+                     "<D:lockroot><D:href></D:href></D:lockroot>\n"
+                     "</D:activelock>\n"
+                     "</D:lockdiscovery>\n") - 1;
+
+        /* timeout */
+        len += NGX_TIME_T_LEN;
+
+        /* token */
+        len += ngx_http_dav_ext_format_token(NULL, entry->lock_token, 0);
+
+        /* lockroot */
+        len += entry->lock_root.len + ngx_escape_html(NULL,
+                                                      entry->lock_root.data,
+                                                      entry->lock_root.len);
+        return len;
+    }
+
+    if (entry->lock_token == 0) {
+        dst = ngx_cpymem(dst, "<D:lockdiscovery/>\n",
+                         sizeof("<D:lockdiscovery/>\n") - 1);
+        return (uintptr_t) dst;
+    }
+
+    now = ngx_time();
+
+    dst = ngx_cpymem(dst, "<D:lockdiscovery>\n",
+                     sizeof("<D:lockdiscovery>\n") - 1);
+
+    dst = ngx_cpymem(dst, "<D:activelock>\n",
+                     sizeof("<D:activelock>\n") - 1);
+
+    dst = ngx_cpymem(dst, "<D:locktype><D:write/></D:locktype>\n",
+                     sizeof("<D:locktype><D:write/></D:locktype>\n") - 1);
+
+    dst = ngx_cpymem(dst, "<D:lockscope><D:exclusive/></D:lockscope>\n",
+                     sizeof("<D:lockscope><D:exclusive/></D:lockscope>\n") - 1);
+
+    dst = ngx_sprintf(dst, "<D:depth>%s</D:depth>\n",
+                      entry->lock_infinite ? "infinity" : "0");
+
+    dst = ngx_sprintf(dst, "<D:timeout>Second-%T</D:timeout>\n",
+                      entry->lock_expire - now);
+
+    dst = ngx_cpymem(dst, "<D:locktoken><D:href>",
+                     sizeof("<D:locktoken><D:href>") - 1);
+    dst = (u_char *) ngx_http_dav_ext_format_token(dst, entry->lock_token, 0);
+    dst = ngx_cpymem(dst, "</D:href></D:locktoken>\n",
+                     sizeof("</D:href></D:locktoken>\n") - 1);
+
+    dst = ngx_cpymem(dst, "<D:lockroot><D:href>",
+                     sizeof("<D:lockroot><D:href>") - 1);
+    dst = (u_char *) ngx_escape_html(dst, entry->lock_root.data,
+                                     entry->lock_root.len);
+    dst = ngx_cpymem(dst, "</D:href></D:lockroot>\n",
+                     sizeof("</D:href></D:lockroot>\n") - 1);
+
+    dst = ngx_cpymem(dst, "</D:activelock>\n",
+                     sizeof("</D:activelock>\n") - 1);
+
+    dst = ngx_cpymem(dst, "</D:lockdiscovery>\n",
+                     sizeof("</D:lockdiscovery>\n") - 1);
+
+    return (uintptr_t) dst;
+}
+
+
+static uintptr_t
+ngx_http_dav_ext_format_token(u_char *dst, uint32_t token, ngx_uint_t brackets)
+{
+    ngx_uint_t  n;
+
+    static u_char  hex[] = "0123456789abcdef";
+
+    if (dst == NULL) {
+        return sizeof("<urn:deadbeef>") - 1 + (brackets ? 2 : 0);
+    }
+
+    if (brackets) {
+        *dst++ = '<';
+    }
+
+    dst = ngx_cpymem(dst, "urn:", 4);
+
+    for (n = 0; n < 4; n++) {
+        *dst++ = hex[token >> 28];
+        *dst++ = hex[(token >> 24) & 0xf];
+        token <<= 8;
+    }
+
+    if (brackets) {
+        *dst++ = '>';
+    }
+
+    return (uintptr_t) dst;
+}
+
+
+static ngx_int_t
+ngx_http_dav_ext_init_zone(ngx_shm_zone_t *shm_zone, void *data)
+{
+    ngx_http_dav_ext_lock_t *olock = data;
+
+    size_t                    len;
+    ngx_http_dav_ext_lock_t  *lock;
+
+    lock = shm_zone->data;
+
+    if (olock) {
+        lock->sh = olock->sh;
+        lock->shpool = olock->shpool;
+        return NGX_OK;
+    }
+
+    lock->shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+
+    if (shm_zone->shm.exists) {
+        lock->sh = lock->shpool->data;
+        return NGX_OK;
+    }
+
+    lock->sh = ngx_slab_alloc(lock->shpool, sizeof(ngx_http_dav_ext_lock_sh_t));
+    if (lock->sh == NULL) {
+        return NGX_ERROR;
+    }
+
+    lock->shpool->data = lock->sh;
+
+    ngx_queue_init(&lock->sh->queue);
+
+    len = sizeof(" in dav_ext zone \"\"") + shm_zone->shm.name.len;
+
+    lock->shpool->log_ctx = ngx_slab_alloc(lock->shpool, len);
+    if (lock->shpool->log_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_sprintf(lock->shpool->log_ctx, " in dav_ext zone \"%V\"%Z",
+                &shm_zone->shm.name);
+
+    return NGX_OK;
+}
+
+
 static void *
 ngx_http_dav_ext_create_loc_conf(ngx_conf_t *cf)
 {
-	ngx_http_dav_ext_loc_conf_t  *conf;
+    ngx_http_dav_ext_loc_conf_t  *conf;
 
-	conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_dav_ext_loc_conf_t));
-	if (conf == NULL) {
-		return NULL;
-	}
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_dav_ext_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
 
-	return conf;
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->shm_zone = NULL;
+     */
+
+    return conf;
 }
 
+
 static char *
 ngx_http_dav_ext_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 {
-	ngx_http_dav_ext_loc_conf_t  *prev = parent;
-	ngx_http_dav_ext_loc_conf_t  *conf = child;
+    ngx_http_dav_ext_loc_conf_t  *prev = parent;
+    ngx_http_dav_ext_loc_conf_t  *conf = child;
 
-	ngx_conf_merge_bitmask_value(conf->methods, prev->methods,
-			(NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_EXT_OFF));
+    ngx_conf_merge_bitmask_value(conf->methods, prev->methods,
+                         (NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_EXT_OFF));
 
-	return NGX_CONF_OK;
+    if (conf->shm_zone == NULL) {
+        conf->shm_zone = prev->shm_zone;
+    }
+
+    return NGX_CONF_OK;
 }
 
+
+static char *
+ngx_http_dav_ext_lock_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    u_char                   *p;
+    time_t                    timeout;
+    ssize_t                   size;
+    ngx_str_t                *value, name, s;
+    ngx_uint_t                i;
+    ngx_shm_zone_t           *shm_zone;
+    ngx_http_dav_ext_lock_t  *lock;
+
+    value = cf->args->elts;
+
+    name.len = 0;
+    size = 0;
+    timeout = 60;
+
+    for (i = 1; i < cf->args->nelts; i++) {
+
+        if (ngx_strncmp(value[i].data, "zone=", 5) == 0) {
+
+            name.data = value[i].data + 5;
+
+            p = (u_char *) ngx_strchr(name.data, ':');
+
+            if (p == NULL) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid zone size \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            name.len = p - name.data;
+
+            s.data = p + 1;
+            s.len = value[i].data + value[i].len - s.data;
+
+            size = ngx_parse_size(&s);
+
+            if (size == NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid zone size \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            if (size < (ssize_t) (8 * ngx_pagesize)) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "zone \"%V\" is too small", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "timeout=", 8) == 0) {
+
+            s.len = value[i].len - 8;
+            s.data = value[i].data + 8;
+
+            timeout = ngx_parse_time(&s, 1);
+            if (timeout == (time_t) NGX_ERROR || timeout == 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid timeout value \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\"", &value[i]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (name.len == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "\"%V\" must have \"zone\" parameter",
+                           &cmd->name);
+        return NGX_CONF_ERROR;
+    }
+
+    lock = ngx_pcalloc(cf->pool, sizeof(ngx_http_dav_ext_lock_t));
+    if (lock == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    lock->timeout = timeout;
+
+    shm_zone = ngx_shared_memory_add(cf, &name, size,
+                                     &ngx_http_dav_ext_module);
+    if (shm_zone == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (shm_zone->data) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "duplicate zone \"%V\"", &name);
+        return NGX_CONF_ERROR;
+    }
+
+    shm_zone->init = ngx_http_dav_ext_init_zone;
+    shm_zone->data = lock;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_dav_ext_lock(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_dav_ext_loc_conf_t *dlcf = conf;
+
+    ngx_str_t       *value, s;
+    ngx_uint_t       i;
+    ngx_shm_zone_t  *shm_zone;
+
+    if (dlcf->shm_zone) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    shm_zone = NULL;
+
+    for (i = 1; i < cf->args->nelts; i++) {
+
+        if (ngx_strncmp(value[i].data, "zone=", 5) == 0) {
+
+            s.len = value[i].len - 5;
+            s.data = value[i].data + 5;
+
+            shm_zone = ngx_shared_memory_add(cf, &s, 0,
+                                             &ngx_http_dav_ext_module);
+            if (shm_zone == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\"", &value[i]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (shm_zone == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "\"%V\" must have \"zone\" parameter", &cmd->name);
+        return NGX_CONF_ERROR;
+    }
+
+    dlcf->shm_zone = shm_zone;
+
+    return NGX_CONF_OK;
+}
+
+
 static ngx_int_t
 ngx_http_dav_ext_init(ngx_conf_t *cf)
 {
-	ngx_http_handler_pt        *h;
-	ngx_http_core_main_conf_t  *cmcf;
+    ngx_http_handler_pt        *h;
+    ngx_http_core_main_conf_t  *cmcf;
 
-	cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
 
-	h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers);
+    h = ngx_array_push(&cmcf->phases[NGX_HTTP_PRECONTENT_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
 
-	if (h == NULL) {
-		return NGX_ERROR;
-	}
+    *h = ngx_http_dav_ext_precontent_handler;
 
-	*h = ngx_http_dav_ext_handler;
+    h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
 
-	return NGX_OK;
+    *h = ngx_http_dav_ext_content_handler;
+
+    return NGX_OK;
 }
-
diff --git a/debian/modules/http-dav-ext/t/dav_ext.t b/debian/modules/http-dav-ext/t/dav_ext.t
new file mode 100644
index 0000000..00327e2
--- /dev/null
+++ b/debian/modules/http-dav-ext/t/dav_ext.t
@@ -0,0 +1,141 @@
+#!/usr/bin/perl
+
+# (C) Roman Arutyunyan
+
+# Tests for nginx-dav-ext-module.
+
+###############################################################################
+
+use warnings;
+use strict;
+
+use Test::More;
+
+BEGIN { use FindBin; chdir($FindBin::Bin); }
+
+use lib 'lib';
+use Test::Nginx;
+use HTTP::DAV
+
+###############################################################################
+
+select STDERR; $| = 1;
+select STDOUT; $| = 1;
+
+my $t = Test::Nginx->new()->has(qw/http dav/)->plan(20);
+
+$t->write_file_expand('nginx.conf', <<'EOF');
+
+%%TEST_GLOBALS%%
+
+daemon off;
+
+events {
+}
+
+http {
+    %%TEST_GLOBALS_HTTP%%
+
+    dav_ext_lock_zone zone=foo:10m timeout=10s;
+
+    server {
+        listen       127.0.0.1:8080;
+        server_name  localhost;
+
+        location / {
+            dav_methods PUT DELETE MKCOL COPY MOVE;
+            dav_ext_methods PROPFIND OPTIONS LOCK UNLOCK;
+            dav_ext_lock zone=foo;
+        }
+    }
+}
+
+EOF
+
+$t->write_file('foo', 'foo');
+
+$t->run();
+
+###############################################################################
+
+my $url = "http://127.0.0.1:8080";
+
+my $content;
+
+my $d = HTTP::DAV->new();
+$d->open($url);
+
+my $d2 = HTTP::DAV->new();
+$d2->open($url);
+
+#debug:
+#$d->DebugLevel(3);
+#see /tmp/perldav_debug.txt.
+
+my $p = $d->propfind('/', 1);
+is($p->is_collection, 1, 'propfind dir collection');
+is($p->get_property('displayname'), '/', 'propfind dir displayname');
+is($p->get_uri(), 'http://127.0.0.1:8080/', 'propfind dir uri');
+
+$p = $d->propfind('/foo');
+is($p->is_collection, 0, 'propfind file collection');
+is($p->get_property('displayname'), 'foo', 'propfind file displayname');
+is($p->get_uri(), 'http://127.0.0.1:8080/foo', 'propfind file uri');
+is($p->get_property('getcontentlength'), '3', 'propfind file size');
+
+$d->lock('/foo');
+is($d->lock('/foo'), 0, 'prevent double lock');
+
+$d->unlock('/foo');
+is($d->lock('/foo'), 1, 'relock');
+
+$d->lock('/bar');
+$p = $d->propfind('/bar');
+is($p->get_property('displayname'), 'bar', 'lock creates a file');
+
+$d->get('/bar', \$content) or $content = 'none';
+is($content, '', 'lock creates an empty file');
+
+$content = "bar";
+$d->put(\$content, '/bar');
+$d->get('/bar', \$content) or $content = '';
+is($content, 'bar', 'put lock');
+
+$content = "qux";
+$d2->put(\$content, '/bar');
+$d2->get('/bar', \$content) or $content = '';
+isnt($content, 'qux', 'prevent put lock');
+
+$d->mkcol('/d/');
+$d->lock('/d/');
+$d->copy('/bar', '/d/bar');
+$d->get('/d/bar', \$content) or $content = '';
+is($content, 'bar', 'copy lock');
+
+$d2->copy('/bar', '/d/qux');
+$d2->get('/d/qux', \$content) or $content = '';
+isnt($content, 'bar', 'prevent copy lock');
+
+$d2->delete('/d/bar');
+$d2->get('/d/bar', \$content) or $content = '';
+is($content, 'bar', 'prevent delete lock');
+
+$d->delete('/d/bar');
+$d->get('/d/bar', \$content) or $content = '';
+is($content, '', 'delete lock');
+
+$d->mkcol('/d/c/');
+$p = $d->propfind('/d/c/');
+is($p->is_collection, 1, 'mkcol lock');
+
+$d2->mkcol('/d/e/');
+is($d2->propfind('/d/e/'), 0, 'prevent mkcol lock');
+
+$d->unlock('/d/');
+$d->lock('/d/', -depth=>"0");
+$content = 'qux';
+$d2->put(\$content, '/d/c/qux');
+$d2->get('/d/c/qux', \$content) or $content = '';
+is($content, 'qux', 'put to a depth-0-locked subdirectory');
+
+###############################################################################

From 76804da3f86a8768da221624fe4cd1754d49c3bc Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 27 Dec 2018 13:01:09 +0200
Subject: [PATCH 274/600] Use a minimal export of the upstream signing key

Exported with:
  $ gpg --finger 0x520A9993A1C052F8
  pub   rsa2048/0x520A9993A1C052F8 2011-11-27 [SC]
        Key fingerprint = B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8
  uid                   [ unknown] Maxim Dounin <mdounin@mdounin.ru>
  sub   rsa2048/0x57A82F1DD345AB09 2011-11-27 [E]
  $ gpg --export --export-options export-minimal  --armor '0x520A9993A1C052F8'
---
 debian/upstream/signing-key.asc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 45a8f7c..01a2a5f 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -6,12 +6,7 @@ hblmmUBLNgOWgLo3W+FYhl3mz1GFS2Fvid6Tfn02L8CBAj7jxbjL1Qj/OA/WmLLc
 m6BMTqI7IBlYW2vyIOIHasISGiAwZfp0ucMeXXvTtt14LGa8qXVcFnJTdwbf03AS
 ljhYrQnKnpl3VpDAoQt8C68YCwjaNJW59hKqWB+XeIJ9CW98+EOAxLAFszSyGanp
 rCqPd0numj9TIddjcRkTA/ZbmCWK+xjpVBGXABEBAAG0IU1heGltIERvdW5pbiA8
-bWRvdW5pbkBtZG91bmluLnJ1PohGBBARAgAGBQJO01Y/AAoJEOzw6QssFyCDVyQA
-n3qwTZlcZgyyzWu9Cs8gJ0CXREaSAJ92QjGLT9DijTcbB+q9OS/nl16Z/IhGBBAR
-AgAGBQJO02JDAAoJEKk3YTmlJMU+P64AnjCKEXFelSVMtgefJk3+vpyt3QX1AKCH
-9M3MbTWPeDUL+MpULlfdyfvjj4heBBARCAAGBQJRCTwgAAoJEFGFCWhsfl6CzF0B
-AJsQ3DJbtGcZ+0VIcM2a06RRQfBvIHqm1A/1WSYmObLGAP90lxWlNjSugvUUlqTk
-YEEgRTGozgixSyMWGJrNwqgMYokBOAQTAQIAIgUCTtIq7wIbAwYLCQgHAwIGFQgC
+bWRvdW5pbkBtZG91bmluLnJ1PokBOAQTAQIAIgUCTtIq7wIbAwYLCQgHAwIGFQgC
 CQoLBBYCAwECHgECF4AACgkQUgqZk6HAUvj+iwf/b4FS6zVzJ5T0v1vcQGD4ZzXe
 D5xMC4BJW414wVMU15rfX7aCdtoCYBNiApPxEd7SwiyxWRhRA9bikUq87JEgmnyV
 0iYbHZvCvc1jOkx4WR7E45t1Mi29KBoPaFXA9X5adZkYcOQLDxa2Z8m6LGXnlF6N
@@ -30,5 +25,5 @@ s0nkWxnOIidTHSXvBZfDFA4Idwte94Thrzf8Pn8UESudTiqrWoCBXk2UyVsl03gJ
 blSJAeJGYPPeo+Yj6m63OWe2+/S2VTgmbPS/RObn0Aeg7yuff0n5+ytEt2KL51gO
 QE2uIxTCawHr12PsllPkbqPk/PagIttfEJqn9b0CrqPC3HREePb2aMJ/Ctw/76CO
 wn0mtXeIXLCTvBmznXfaMKllsqbsy2nCJ2P2uJjOntw=
-=ISka
+=NeQn
 -----END PGP PUBLIC KEY BLOCK-----

From 52307bcf975e40fec93e1d800f3640cb29f5a41f Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 27 Dec 2018 13:09:24 +0200
Subject: [PATCH 275/600] Bump Standards-Version, no changes needed

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index eb41c42..409dc22 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 10),
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
 Homepage: https://nginx.net
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx

From 62a54a8ba66ee6cc1b4f8a33dab9a6f27a3fdac4 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 27 Dec 2018 12:50:00 +0200
Subject: [PATCH 276/600] Release 1.14.2-2

---
 debian/changelog | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c48775..be5df64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-nginx (1.14.2-2) UNRELEASED; urgency=low
+nginx (1.14.2-2) unstable; urgency=medium
 
   [ Kartik Mistry ]
   * po/tr.po:
     + Added Turkish translation. Thanks Atila KOÇ <koc@artielektronik.com.tr>
       (Closes: #915728)
 
- -- Kartik Mistry <kartik@debian.org>  Thu, 06 Dec 2018 20:01:00 +0530
+  [ Christos Trochalakis ]
+  * http-dav-ext: Upgrade to 3.0.0 (Closes: #851651)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Thu, 27 Dec 2018 12:49:34 +0200
 
 nginx (1.14.2-1) unstable; urgency=medium
 

From 214580d479a6ed6f923f6b985b97aa88bad59438 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Thu, 27 Dec 2018 14:44:09 +0200
Subject: [PATCH 277/600] Add missing changelog entries

Those were forgotten during the upload, but let's add them
for completeness.
---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index be5df64..93a36f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ nginx (1.14.2-2) unstable; urgency=medium
 
   [ Christos Trochalakis ]
   * http-dav-ext: Upgrade to 3.0.0 (Closes: #851651)
+  * Use a minimal export of the upstream signing key
+  * Bump Standards-Version, no changes needed
 
  -- Christos Trochalakis <ctrochalakis@debian.org>  Thu, 27 Dec 2018 12:49:34 +0200
 

From d2bacdb1cf1068437e9ac89e334c4fe130f0107c Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 19 Aug 2019 11:33:14 +0300
Subject: [PATCH 278/600] Handle CVE-2019-9511 CVE-2019-9513 CVE-2019-9516

Several security issues were identified in nginx HTTP/2
implementation, which might cause excessive memory consumption
and CPU usage (CVE-2019-9511, CVE-2019-9513, CVE-2019-9516).

The issues affect nginx compiled with the ngx_http_v2_module (not
compiled by default) if the "http2" option of the "listen" directive
is used in a configuration file.

The issues affect nginx 1.9.5 - 1.17.2.
The issues are fixed in nginx 1.17.3, 1.16.1.

Thanks to Jonathan Looney from Netflix for discovering these issues.
---
 debian/patches/CVE-2019-9511.patch | 87 ++++++++++++++++++++++++++++++
 debian/patches/CVE-2019-9513.patch | 62 +++++++++++++++++++++
 debian/patches/CVE-2019-9516.patch | 45 ++++++++++++++++
 debian/patches/series              |  3 ++
 4 files changed, 197 insertions(+)
 create mode 100644 debian/patches/CVE-2019-9511.patch
 create mode 100644 debian/patches/CVE-2019-9513.patch
 create mode 100644 debian/patches/CVE-2019-9516.patch

diff --git a/debian/patches/CVE-2019-9511.patch b/debian/patches/CVE-2019-9511.patch
new file mode 100644
index 0000000..3b48e0c
--- /dev/null
+++ b/debian/patches/CVE-2019-9511.patch
@@ -0,0 +1,87 @@
+From 3f64486e0c15414dc6368139453dcaca338ddf3e Mon Sep 17 00:00:00 2001
+From: Ruslan Ermilov <ru@nginx.com>
+Date: Tue, 13 Aug 2019 15:43:36 +0300
+Subject: [PATCH 2/3] HTTP/2: limited number of DATA frames.
+
+Fixed excessive memory growth and CPU usage if stream windows are
+manipulated in a way that results in generating many small DATA frames.
+Fix is to limit the number of simultaneously allocated DATA frames.
+---
+ src/http/v2/ngx_http_v2.c               |  2 ++
+ src/http/v2/ngx_http_v2.h               |  2 ++
+ src/http/v2/ngx_http_v2_filter_module.c | 22 +++++++++++++++++-----
+ 3 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
+index be2ef82b..1b01f271 100644
+--- a/src/http/v2/ngx_http_v2.c
++++ b/src/http/v2/ngx_http_v2.c
+@@ -4339,6 +4339,8 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
+      */
+     pool = stream->pool;
+ 
++    h2c->frames -= stream->frames;
++
+     ngx_http_free_request(stream->request, rc);
+ 
+     if (pool != h2c->state.pool) {
+diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
+index bec22160..715b7d30 100644
+--- a/src/http/v2/ngx_http_v2.h
++++ b/src/http/v2/ngx_http_v2.h
+@@ -192,6 +192,8 @@ struct ngx_http_v2_stream_s {
+ 
+     ngx_buf_t                       *preread;
+ 
++    ngx_uint_t                       frames;
++
+     ngx_http_v2_out_frame_t         *free_frames;
+     ngx_chain_t                     *free_frame_headers;
+     ngx_chain_t                     *free_bufs;
+diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
+index 029e8ece..c7ee5536 100644
+--- a/src/http/v2/ngx_http_v2_filter_module.c
++++ b/src/http/v2/ngx_http_v2_filter_module.c
+@@ -1661,22 +1661,34 @@ static ngx_http_v2_out_frame_t *
+ ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
+     size_t len, ngx_chain_t *first, ngx_chain_t *last)
+ {
+-    u_char                    flags;
+-    ngx_buf_t                *buf;
+-    ngx_chain_t              *cl;
+-    ngx_http_v2_out_frame_t  *frame;
++    u_char                     flags;
++    ngx_buf_t                 *buf;
++    ngx_chain_t               *cl;
++    ngx_http_v2_out_frame_t   *frame;
++    ngx_http_v2_connection_t  *h2c;
+ 
+     frame = stream->free_frames;
++    h2c = stream->connection;
+ 
+     if (frame) {
+         stream->free_frames = frame->next;
+ 
+-    } else {
++    } else if (h2c->frames < 10000) {
+         frame = ngx_palloc(stream->request->pool,
+                            sizeof(ngx_http_v2_out_frame_t));
+         if (frame == NULL) {
+             return NULL;
+         }
++
++        stream->frames++;
++        h2c->frames++;
++
++    } else {
++        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
++                      "http2 flood detected");
++
++        h2c->connection->error = 1;
++        return NULL;
+     }
+ 
+     flags = last->buf->last_buf ? NGX_HTTP_V2_END_STREAM_FLAG : 0;
+-- 
+2.20.1
+
diff --git a/debian/patches/CVE-2019-9513.patch b/debian/patches/CVE-2019-9513.patch
new file mode 100644
index 0000000..edc1c2b
--- /dev/null
+++ b/debian/patches/CVE-2019-9513.patch
@@ -0,0 +1,62 @@
+From bbdc81631b6d322785d8e92788fd400e25a931e6 Mon Sep 17 00:00:00 2001
+From: Ruslan Ermilov <ru@nginx.com>
+Date: Tue, 13 Aug 2019 15:43:40 +0300
+Subject: [PATCH 3/3] HTTP/2: limited number of PRIORITY frames.
+
+Fixed excessive CPU usage caused by a peer that continuously shuffles
+priority of streams.  Fix is to limit the number of PRIORITY frames.
+---
+ src/http/v2/ngx_http_v2.c | 10 ++++++++++
+ src/http/v2/ngx_http_v2.h |  1 +
+ 2 files changed, 11 insertions(+)
+
+diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
+index 1b01f271..fd6ecb05 100644
+--- a/src/http/v2/ngx_http_v2.c
++++ b/src/http/v2/ngx_http_v2.c
+@@ -275,6 +275,7 @@ ngx_http_v2_init(ngx_event_t *rev)
+     h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
+ 
+     h2c->concurrent_pushes = h2scf->concurrent_pushes;
++    h2c->priority_limit = h2scf->concurrent_streams;
+ 
+     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
+     if (h2c->pool == NULL) {
+@@ -1806,6 +1807,13 @@ ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c, u_char *pos,
+         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
+     }
+ 
++    if (--h2c->priority_limit == 0) {
++        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
++                      "client sent too many PRIORITY frames");
++
++        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
++    }
++
+     if (end - pos < NGX_HTTP_V2_PRIORITY_SIZE) {
+         return ngx_http_v2_state_save(h2c, pos, end,
+                                       ngx_http_v2_state_priority);
+@@ -3120,6 +3128,8 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
+         h2c->processing++;
+     }
+ 
++    h2c->priority_limit += h2scf->concurrent_streams;
++
+     return stream;
+ }
+ 
+diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
+index 715b7d30..69d55d1c 100644
+--- a/src/http/v2/ngx_http_v2.h
++++ b/src/http/v2/ngx_http_v2.h
+@@ -122,6 +122,7 @@ struct ngx_http_v2_connection_s {
+     ngx_uint_t                       processing;
+     ngx_uint_t                       frames;
+     ngx_uint_t                       idle;
++    ngx_uint_t                       priority_limit;
+ 
+     ngx_uint_t                       pushing;
+     ngx_uint_t                       concurrent_pushes;
+-- 
+2.20.1
+
diff --git a/debian/patches/CVE-2019-9516.patch b/debian/patches/CVE-2019-9516.patch
new file mode 100644
index 0000000..0d5ec77
--- /dev/null
+++ b/debian/patches/CVE-2019-9516.patch
@@ -0,0 +1,45 @@
+From 840d8a3e2f126384eb4ee3e5dd7ffe875a5634c5 Mon Sep 17 00:00:00 2001
+From: Sergey Kandaurov <pluknet@nginx.com>
+Date: Tue, 13 Aug 2019 15:43:32 +0300
+Subject: [PATCH 1/3] HTTP/2: reject zero length headers with PROTOCOL_ERROR.
+
+Fixed uncontrolled memory growth if peer sends a stream of
+headers with a 0-length header name and 0-length header value.
+Fix is to reject headers with zero name length.
+---
+ src/http/v2/ngx_http_v2.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
+index 12214e15..be2ef82b 100644
+--- a/src/http/v2/ngx_http_v2.c
++++ b/src/http/v2/ngx_http_v2.c
+@@ -1548,6 +1548,14 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
+         header->name.len = h2c->state.field_end - h2c->state.field_start;
+         header->name.data = h2c->state.field_start;
+ 
++        if (header->name.len == 0) {
++            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
++                          "client sent zero header name length");
++
++            return ngx_http_v2_connection_error(h2c,
++                                                NGX_HTTP_V2_PROTOCOL_ERROR);
++        }
++
+         return ngx_http_v2_state_field_len(h2c, pos, end);
+     }
+ 
+@@ -3249,10 +3257,6 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
+     ngx_uint_t                 i;
+     ngx_http_core_srv_conf_t  *cscf;
+ 
+-    if (header->name.len == 0) {
+-        return NGX_ERROR;
+-    }
+-
+     r->invalid_header = 0;
+ 
+     cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+-- 
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 5b6b799..dfc20c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,5 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
+CVE-2019-9516.patch
+CVE-2019-9511.patch
+CVE-2019-9513.patch

From 71e4915c0fcf970abed0d8c66a3cf86870ea0976 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 19 Aug 2019 11:33:27 +0300
Subject: [PATCH 279/600] Release 1.14.2-3

---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 93a36f2..509cc2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nginx (1.14.2-3) unstable; urgency=high
+
+  * Backport upstream fixes for 3 CVEs (Closes: #935037)
+    Those fixes affect Nginx HTTP/2 implementation, which might cause
+    excessive memory consumption and CPU usage.
+    (CVE-2019-9511, CVE-2019-9513, CVE-2019-9516).
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Mon, 19 Aug 2019 11:30:08 +0300
+
 nginx (1.14.2-2) unstable; urgency=medium
 
   [ Kartik Mistry ]

From deba07f09f0f530f083263c966e72331911a28a4 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Sun, 8 Sep 2019 10:33:34 +0300
Subject: [PATCH 280/600] Follow stable 1.16 releases

---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 42f4680..1aeff3e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-https://nginx.org/download/nginx-(1\.14\.\d+)\.tar\.gz
+https://nginx.org/download/nginx-(1\.16\.\d+)\.tar\.gz

From c717ecb9266f65e0bd1579588710a2782bbb8e1f Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Sun, 8 Sep 2019 10:36:13 +0300
Subject: [PATCH 281/600] New upstream version 1.16.1

---
 CHANGES                                       |  254 +++-
 CHANGES.ru                                    |  260 +++-
 LICENSE                                       |    4 +-
 auto/cc/clang                                 |    3 +-
 auto/cc/msvc                                  |    2 +-
 auto/lib/google-perftools/conf                |    3 +-
 auto/lib/libgd/conf                           |    6 +-
 auto/lib/libxslt/conf                         |    4 +-
 auto/make                                     |    2 +-
 auto/modules                                  |   21 +
 auto/options                                  |   10 +
 auto/os/linux                                 |    2 +
 auto/os/win32                                 |    8 +-
 auto/sources                                  |    2 +
 conf/mime.types                               |    4 +-
 contrib/vim/syntax/nginx.vim                  |   79 +-
 html/50x.html                                 |    2 +-
 src/core/nginx.h                              |    4 +-
 src/core/ngx_buf.c                            |    1 +
 src/core/ngx_conf_file.c                      |    9 +-
 src/core/ngx_connection.c                     |   71 +-
 src/core/ngx_connection.h                     |    7 +-
 src/core/ngx_core.h                           |    1 +
 src/core/ngx_cycle.c                          |   67 +-
 src/core/ngx_file.c                           |   27 +-
 src/core/ngx_inet.c                           |  468 +++---
 src/core/ngx_inet.h                           |    2 +
 src/core/ngx_output_chain.c                   |   64 +-
 src/core/ngx_resolver.c                       |  133 +-
 src/core/ngx_slab.c                           |    3 +-
 src/core/ngx_string.c                         |   10 +-
 src/core/ngx_string.h                         |    2 +
 src/core/ngx_syslog.c                         |   38 +-
 src/core/ngx_syslog.h                         |    1 -
 src/core/ngx_times.h                          |    4 +-
 src/event/modules/ngx_eventport_module.c      |    2 -
 src/event/modules/ngx_poll_module.c           |    2 +-
 src/event/modules/ngx_win32_poll_module.c     |  435 ++++++
 src/event/modules/ngx_win32_select_module.c   |   17 +-
 src/event/ngx_event.c                         |   40 +
 src/event/ngx_event.h                         |    9 +-
 src/event/ngx_event_accept.c                  |  346 +----
 src/event/ngx_event_connect.c                 |   16 +-
 src/event/ngx_event_connect.h                 |    2 +
 src/event/ngx_event_openssl.c                 | 1267 ++++++++++++++---
 src/event/ngx_event_openssl.h                 |   27 +-
 src/event/ngx_event_openssl_stapling.c        |    7 +-
 src/event/ngx_event_udp.c                     |  663 +++++++++
 src/http/modules/ngx_http_autoindex_module.c  |   70 +-
 src/http/modules/ngx_http_dav_module.c        |    4 +-
 src/http/modules/ngx_http_fastcgi_module.c    |   13 +-
 src/http/modules/ngx_http_geo_module.c        |   13 +
 src/http/modules/ngx_http_grpc_module.c       |   21 +-
 src/http/modules/ngx_http_limit_req_module.c  |   63 +-
 src/http/modules/ngx_http_memcached_module.c  |   13 +-
 src/http/modules/ngx_http_proxy_module.c      |   21 +-
 .../modules/ngx_http_random_index_module.c    |    2 +-
 src/http/modules/ngx_http_rewrite_module.c    |   10 +-
 src/http/modules/ngx_http_scgi_module.c       |   13 +-
 src/http/modules/ngx_http_ssl_module.c        |  190 ++-
 src/http/modules/ngx_http_ssl_module.h        |    4 +
 .../modules/ngx_http_upstream_hash_module.c   |    8 +-
 .../ngx_http_upstream_ip_hash_module.c        |    8 +-
 .../ngx_http_upstream_keepalive_module.c      |   41 +-
 .../modules/ngx_http_upstream_random_module.c |  502 +++++++
 .../modules/ngx_http_userid_filter_module.c   |    7 +
 src/http/modules/ngx_http_uwsgi_module.c      |   31 +-
 src/http/ngx_http.c                           |   38 +-
 src/http/ngx_http.h                           |    4 +
 src/http/ngx_http_core_module.c               |   87 +-
 src/http/ngx_http_core_module.h               |    8 +-
 src/http/ngx_http_file_cache.c                |   44 +-
 src/http/ngx_http_parse.c                     |    5 +
 src/http/ngx_http_request.c                   |  252 +++-
 src/http/ngx_http_request.h                   |    5 +
 src/http/ngx_http_script.c                    |   28 +
 src/http/ngx_http_script.h                    |    2 +
 src/http/ngx_http_special_response.c          |   68 +-
 src/http/ngx_http_upstream.c                  |   89 +-
 src/http/ngx_http_upstream.h                  |    4 +-
 src/http/ngx_http_upstream_round_robin.c      |    2 +-
 src/http/ngx_http_variables.c                 |    4 +-
 src/http/ngx_http_write_filter_module.c       |   40 +-
 src/http/v2/ngx_http_v2.c                     |   96 +-
 src/http/v2/ngx_http_v2.h                     |    3 +
 src/http/v2/ngx_http_v2_filter_module.c       |   48 +-
 src/mail/ngx_mail.c                           |   42 +-
 src/mail/ngx_mail.h                           |    3 +-
 src/mail/ngx_mail_core_module.c               |   92 +-
 src/mail/ngx_mail_handler.c                   |   18 +-
 src/mail/ngx_mail_ssl_module.c                |   96 +-
 src/mail/ngx_mail_ssl_module.h                |    1 +
 src/os/unix/ngx_file_aio_read.c               |    2 +-
 src/os/unix/ngx_files.h                       |    3 -
 src/os/unix/ngx_freebsd_config.h              |    6 +
 src/os/unix/ngx_thread.h                      |    4 +-
 src/stream/ngx_stream.c                       |   46 +-
 src/stream/ngx_stream.h                       |    3 +-
 src/stream/ngx_stream_core_module.c           |  121 +-
 src/stream/ngx_stream_geo_module.c            |   13 +
 src/stream/ngx_stream_proxy_module.c          |  279 +++-
 src/stream/ngx_stream_ssl_module.c            |  238 +++-
 src/stream/ngx_stream_ssl_module.h            |    7 +
 src/stream/ngx_stream_ssl_preread_module.c    |  111 +-
 src/stream/ngx_stream_upstream.c              |   16 +-
 src/stream/ngx_stream_upstream.h              |    2 +
 src/stream/ngx_stream_upstream_hash_module.c  |    8 +-
 .../ngx_stream_upstream_random_module.c       |  502 +++++++
 src/stream/ngx_stream_upstream_round_robin.c  |    2 +-
 src/stream/ngx_stream_write_filter_module.c   |   40 +-
 110 files changed, 6258 insertions(+), 1669 deletions(-)
 create mode 100644 src/event/modules/ngx_win32_poll_module.c
 create mode 100644 src/event/ngx_event_udp.c
 create mode 100644 src/http/modules/ngx_http_upstream_random_module.c
 create mode 100644 src/stream/ngx_stream_upstream_random_module.c

diff --git a/CHANGES b/CHANGES
index 597c270..8e7382b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,38 +1,99 @@
 
-Changes with nginx 1.14.2                                        04 Dec 2018
+Changes with nginx 1.16.1                                        13 Aug 2019
 
-    *) Bugfix: nginx could not be built by gcc 8.1.
+    *) Security: when using HTTP/2 a client might cause excessive memory
+       consumption and CPU usage (CVE-2019-9511, CVE-2019-9513,
+       CVE-2019-9516).
 
-    *) Bugfix: nginx could not be built on Fedora 28 Linux.
 
-    *) Bugfix: in handling of client addresses when using unix domain listen
-       sockets to work with datagrams on Linux.
+Changes with nginx 1.16.0                                        23 Apr 2019
 
-    *) Change: the logging level of the "http request", "https proxy
-       request", "unsupported protocol", "version too low", "no suitable key
-       share", and "no suitable signature algorithm" SSL errors has been
-       lowered from "crit" to "info".
+    *) 1.16.x stable branch.
 
-    *) Bugfix: when using OpenSSL 1.1.0 or newer it was not possible to
-       switch off "ssl_prefer_server_ciphers" in a virtual server if it was
-       switched on in the default server.
 
-    *) Bugfix: nginx could not be built with LibreSSL 2.8.0.
+Changes with nginx 1.15.12                                       16 Apr 2019
 
-    *) Bugfix: if nginx was built with OpenSSL 1.1.0 and used with OpenSSL
-       1.1.1, the TLS 1.3 protocol was always enabled.
+    *) Bugfix: a segmentation fault might occur in a worker process if
+       variables were used in the "ssl_certificate" or "ssl_certificate_key"
+       directives and OCSP stapling was enabled.
 
-    *) Bugfix: sending a disk-buffered request body to a gRPC backend might
-       fail.
 
-    *) Bugfix: connections with some gRPC backends might not be cached when
-       using the "keepalive" directive.
+Changes with nginx 1.15.11                                       09 Apr 2019
+
+    *) Bugfix: in the "ssl_stapling_file" directive on Windows.
+
+
+Changes with nginx 1.15.10                                       26 Mar 2019
+
+    *) Change: when using a hostname in the "listen" directive nginx now
+       creates listening sockets for all addresses the hostname resolves to
+       (previously, only the first address was used).
+
+    *) Feature: port ranges in the "listen" directive.
+
+    *) Feature: loading of SSL certificates and secret keys from variables.
+
+    *) Workaround: the $ssl_server_name variable might be empty when using
+       OpenSSL 1.1.1.
+
+    *) Bugfix: nginx/Windows could not be built with Visual Studio 2015 or
+       newer; the bug had appeared in 1.15.9.
+
+
+Changes with nginx 1.15.9                                        26 Feb 2019
+
+    *) Feature: variables support in the "ssl_certificate" and
+       "ssl_certificate_key" directives.
+
+    *) Feature: the "poll" method is now available on Windows when using
+       Windows Vista or newer.
+
+    *) Bugfix: if the "select" method was used on Windows and an error
+       occurred while establishing a backend connection, nginx waited for
+       the connection establishment timeout to expire.
+
+    *) Bugfix: the "proxy_upload_rate" and "proxy_download_rate" directives
+       in the stream module worked incorrectly when proxying UDP datagrams.
+
+
+Changes with nginx 1.15.8                                        25 Dec 2018
+
+    *) Feature: the $upstream_bytes_sent variable.
+       Thanks to Piotr Sikora.
+
+    *) Feature: new directives in vim syntax highlighting scripts.
+       Thanks to Gena Makhomed.
+
+    *) Bugfix: in the "proxy_cache_background_update" directive.
+
+    *) Bugfix: in the "geo" directive when using unix domain listen sockets.
+
+    *) Workaround: the "ignoring stale global SSL error ... bad length"
+       alerts might appear in logs when using the "ssl_early_data" directive
+       with OpenSSL.
+
+    *) Bugfix: in nginx/Windows.
+
+    *) Bugfix: in the ngx_http_autoindex_module on 32-bit platforms.
+
+
+Changes with nginx 1.15.7                                        27 Nov 2018
+
+    *) Feature: the "proxy_requests" directive in the stream module.
+
+    *) Feature: the "delay" parameter of the "limit_req" directive.
+       Thanks to Vladislav Shabanov and Peter Shchuchkin.
+
+    *) Bugfix: memory leak on errors during reconfiguration.
+
+    *) Bugfix: in the $upstream_response_time, $upstream_connect_time, and
+       $upstream_header_time variables.
 
     *) Bugfix: a segmentation fault might occur in a worker process if the
        ngx_http_mp4_module was used on 32-bit platforms.
 
 
-Changes with nginx 1.14.1                                        06 Nov 2018
+Changes with nginx 1.15.6                                        06 Nov 2018
 
     *) Security: when using HTTP/2 a client might cause excessive memory
        consumption (CVE-2018-16843) and CPU usage (CVE-2018-16844).
@@ -41,13 +102,162 @@ Changes with nginx 1.14.1                                        06 Nov 2018
        ngx_http_mp4_module might result in worker process memory disclosure
        (CVE-2018-16845).
 
+    *) Feature: the "proxy_socket_keepalive", "fastcgi_socket_keepalive",
+       "grpc_socket_keepalive", "memcached_socket_keepalive",
+       "scgi_socket_keepalive", and "uwsgi_socket_keepalive" directives.
+
+    *) Bugfix: if nginx was built with OpenSSL 1.1.0 and used with OpenSSL
+       1.1.1, the TLS 1.3 protocol was always enabled.
+
     *) Bugfix: working with gRPC backends might result in excessive memory
        consumption.
 
 
-Changes with nginx 1.14.0                                        17 Apr 2018
+Changes with nginx 1.15.5                                        02 Oct 2018
 
-    *) 1.14.x stable branch.
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using OpenSSL 1.1.0h or newer; the bug had appeared in 1.15.4.
+
+    *) Bugfix: of minor potential bugs.
+
+
+Changes with nginx 1.15.4                                        25 Sep 2018
+
+    *) Feature: now the "ssl_early_data" directive can be used with OpenSSL.
+
+    *) Bugfix: in the ngx_http_uwsgi_module.
+       Thanks to Chris Caputo.
+
+    *) Bugfix: connections with some gRPC backends might not be cached when
+       using the "keepalive" directive.
+
+    *) Bugfix: a socket leak might occur when using the "error_page"
+       directive to redirect early request processing errors, notably errors
+       with code 400.
+
+    *) Bugfix: the "return" directive did not change the response code when
+       returning errors if the request was redirected by the "error_page"
+       directive.
+
+    *) Bugfix: standard error pages and responses of the
+       ngx_http_autoindex_module module used the "bgcolor" attribute, and
+       might be displayed incorrectly when using custom color settings in
+       browsers.
+       Thanks to Nova DasSarma.
+
+    *) Change: the logging level of the "no suitable key share" and "no
+       suitable signature algorithm" SSL errors has been lowered from "crit"
+       to "info".
+
+
+Changes with nginx 1.15.3                                        28 Aug 2018
+
+    *) Feature: now TLSv1.3 can be used with BoringSSL.
+
+    *) Feature: the "ssl_early_data" directive, currently available with
+       BoringSSL.
+
+    *) Feature: the "keepalive_timeout" and "keepalive_requests" directives
+       in the "upstream" block.
+
+    *) Bugfix: the ngx_http_dav_module did not truncate destination file
+       when copying a file over an existing one with the COPY method.
+
+    *) Bugfix: the ngx_http_dav_module used zero access rights on the
+       destination file and did not preserve file modification time when
+       moving a file between different file systems with the MOVE method.
+
+    *) Bugfix: the ngx_http_dav_module used default access rights when
+       copying a file with the COPY method.
+
+    *) Workaround: some clients might not work when using HTTP/2; the bug
+       had appeared in 1.13.5.
+
+    *) Bugfix: nginx could not be built with LibreSSL 2.8.0.
+
+
+Changes with nginx 1.15.2                                        24 Jul 2018
+
+    *) Feature: the $ssl_preread_protocol variable in the
+       ngx_stream_ssl_preread_module.
+
+    *) Feature: now when using the "reset_timedout_connection" directive
+       nginx will reset connections being closed with the 444 code.
+
+    *) Change: a logging level of the "http request", "https proxy request",
+       "unsupported protocol", and "version too low" SSL errors has been
+       lowered from "crit" to "info".
+
+    *) Bugfix: DNS requests were not resent if initial sending of a request
+       failed.
+
+    *) Bugfix: the "reuseport" parameter of the "listen" directive was
+       ignored if the number of worker processes was specified after the
+       "listen" directive.
+
+    *) Bugfix: when using OpenSSL 1.1.0 or newer it was not possible to
+       switch off "ssl_prefer_server_ciphers" in a virtual server if it was
+       switched on in the default server.
+
+    *) Bugfix: SSL session reuse with upstream servers did not work with the
+       TLS 1.3 protocol.
+
+
+Changes with nginx 1.15.1                                        03 Jul 2018
+
+    *) Feature: the "random" directive inside the "upstream" block.
+
+    *) Feature: improved performance when using the "hash" and "ip_hash"
+       directives with the "zone" directive.
+
+    *) Feature: the "reuseport" parameter of the "listen" directive now uses
+       SO_REUSEPORT_LB on FreeBSD 12.
+
+    *) Bugfix: HTTP/2 server push did not work if SSL was terminated by a
+       proxy server in front of nginx.
+
+    *) Bugfix: the "tcp_nopush" directive was always used on backend
+       connections.
+
+    *) Bugfix: sending a disk-buffered request body to a gRPC backend might
+       fail.
+
+
+Changes with nginx 1.15.0                                        05 Jun 2018
+
+    *) Change: the "ssl" directive is deprecated; the "ssl" parameter of the
+       "listen" directive should be used instead.
+
+    *) Change: now nginx detects missing SSL certificates during
+       configuration testing when using the "ssl" parameter of the "listen"
+       directive.
+
+    *) Feature: now the stream module can handle multiple incoming UDP
+       datagrams from a client within a single session.
+
+    *) Bugfix: it was possible to specify an incorrect response code in the
+       "proxy_cache_valid" directive.
+
+    *) Bugfix: nginx could not be built by gcc 8.1.
+
+    *) Bugfix: logging to syslog stopped on local IP address changes.
+
+    *) Bugfix: nginx could not be built by clang with CUDA SDK installed;
+       the bug had appeared in 1.13.8.
+
+    *) Bugfix: "getsockopt(TCP_FASTOPEN) ... failed" messages might appear
+       in logs during binary upgrade when using unix domain listen sockets
+       on FreeBSD.
+
+    *) Bugfix: nginx could not be built on Fedora 28 Linux.
+
+    *) Bugfix: request processing rate might exceed configured rate when
+       using the "limit_req" directive.
+
+    *) Bugfix: in handling of client addresses when using unix domain listen
+       sockets to work with datagrams on Linux.
+
+    *) Bugfix: in memory allocation error handling.
 
 
 Changes with nginx 1.13.12                                       10 Apr 2018
diff --git a/CHANGES.ru b/CHANGES.ru
index 8c260fe..5d60f41 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,39 +1,103 @@
 
-Изменения в nginx 1.14.2                                          04.12.2018
+Изменения в nginx 1.16.1                                          13.08.2019
 
-    *) Исправление: nginx не собирался gcc 8.1.
+    *) Безопасность: при использовании HTTP/2 клиент мог вызвать чрезмерное
+       потребление памяти и ресурсов процессора (CVE-2019-9511,
+       CVE-2019-9513, CVE-2019-9516).
 
-    *) Исправление: nginx не собирался на Fedora 28 Linux.
 
-    *) Исправление: в обработке адресов клиентов при использовании unix
-       domain listen-сокетов для работы с датаграммами на Linux.
+Изменения в nginx 1.16.0                                          23.04.2019
 
-    *) Изменение: уровень логгирования ошибок SSL "http request", "https
-       proxy request", "unsupported protocol", "version too low", "no
-       suitable key share" и "no suitable signature algorithm" понижен с
-       уровня crit до info.
+    *) Стабильная ветка 1.16.x.
 
-    *) Исправление: при использовании OpenSSL 1.1.0 и новее директиву
-       ssl_prefer_server_ciphers нельзя было выключить в виртуальном
-       сервере, если она была включена в сервере по умолчанию.
 
-    *) Исправление: nginx не собирался с LibreSSL 2.8.0.
+Изменения в nginx 1.15.12                                         16.04.2019
 
-    *) Исправление: если nginx был собран с OpenSSL 1.1.0, а использовался с
-       OpenSSL 1.1.1, протокол TLS 1.3 всегда был разрешён.
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если в директивах ssl_certificate или ssl_certificate_key
+       использовались переменные и был включён OCSP stapling.
 
-    *) Исправление: при отправке сохранённого на диск тела запроса на
-       gRPC-бэкенд могли возникать ошибки.
 
-    *) Исправление: соединения к некоторым gRPC-бэкендам могли не
-       кэшироваться при использовании директивы keepalive.
+Изменения в nginx 1.15.11                                         09.04.2019
+
+    *) Исправление: в директиве ssl_stapling_file на Windows.
+
+
+Изменения в nginx 1.15.10                                         26.03.2019
+
+    *) Изменение: теперь при использовании имени хоста в директиве listen
+       nginx создаёт listen-сокеты для всех адресов, соответствующих этому
+       имени (ранее использовался только первый адрес).
+
+    *) Добавление: диапазоны портов в директиве listen.
+
+    *) Добавление: возможность загрузки SSL-сертификатов и секретных ключей
+       из переменных.
+
+    *) Изменение: переменная $ssl_server_name могла быть пустой при
+       использовании OpenSSL 1.1.1.
+
+    *) Исправление: nginx/Windows не собирался с Visual Studio 2015 и новее;
+       ошибка появилась в 1.15.9.
+
+
+Изменения в nginx 1.15.9                                          26.02.2019
+
+    *) Добавление: директивы ssl_certificate и ssl_certificate_key
+       поддерживают переменные.
+
+    *) Добавление: метод poll теперь доступен на Windows при использовании
+       Windows Vista и новее.
+
+    *) Исправление: если при использовании метода select на Windows
+       происходила ошибка при установлении соединения с бэкендом, nginx
+       ожидал истечения таймаута на установление соединения.
+
+    *) Исправление: директивы proxy_upload_rate и proxy_download_rate в
+       модуле stream работали некорректно при проксировании UDP-пакетов.
+
+
+Изменения в nginx 1.15.8                                          25.12.2018
+
+    *) Добавление: переменная $upstream_bytes_sent.
+       Спасибо Piotr Sikora.
+
+    *) Добавление: новые директивы в скриптах подсветки синтаксиса для vim.
+       Спасибо Геннадию Махомеду.
+
+    *) Исправление: в директиве proxy_cache_background_update.
+
+    *) Исправление: в директиве geo при использовании unix domain
+       listen-сокетов.
+
+    *) Изменение: при использовании директивы ssl_early_data с OpenSSL в
+       логах могли появляться сообщения "ignoring stale global SSL error ...
+       bad length".
+
+    *) Исправление: в nginx/Windows.
+
+    *) Исправление: в модуле ngx_http_autoindex_module на 32-битных
+       платформах.
+
+
+Изменения в nginx 1.15.7                                          27.11.2018
+
+    *) Добавление: директива proxy_requests в модуле stream.
+
+    *) Добавление: параметр "delay" директивы "limit_req".
+       Спасибо Владиславу Шабанову и Петру Щучкину.
+
+    *) Исправление: утечки памяти в случае ошибок при переконфигурации.
+
+    *) Исправление: в переменных $upstream_response_time,
+       $upstream_connect_time и $upstream_header_time.
 
     *) Исправление: в рабочем процессе мог произойти segmentation fault,
        если использовался модуль ngx_http_mp4_module на 32-битных
        платформах.
 
 
-Изменения в nginx 1.14.1                                          06.11.2018
+Изменения в nginx 1.15.6                                          06.11.2018
 
     *) Безопасность: при использовании HTTP/2 клиент мог вызвать чрезмерное
        потреблению памяти (CVE-2018-16843) и ресурсов процессора
@@ -43,13 +107,165 @@
        ngx_http_mp4_module содержимое памяти рабочего процесса могло быть
        отправлено клиенту (CVE-2018-16845).
 
+    *) Добавление: директивы proxy_socket_keepalive,
+       fastcgi_socket_keepalive, grpc_socket_keepalive,
+       memcached_socket_keepalive, scgi_socket_keepalive и
+       uwsgi_socket_keepalive.
+
+    *) Исправление: если nginx был собран с OpenSSL 1.1.0, а использовался с
+       OpenSSL 1.1.1, протокол TLS 1.3 всегда был разрешён.
+
     *) Исправление: при работе с gRPC-бэкендами могло расходоваться большое
        количество памяти.
 
 
-Изменения в nginx 1.14.0                                          17.04.2018
+Изменения в nginx 1.15.5                                          02.10.2018
 
-    *) Стабильная ветка 1.14.x.
+    *) Исправление: при использовании OpenSSL 1.1.0h и новее в рабочем
+       процессе мог произойти segmentation fault; ошибка появилась в 1.15.4.
+
+    *) Исправление: незначительных потенциальных ошибок.
+
+
+Изменения в nginx 1.15.4                                          25.09.2018
+
+    *) Добавление: теперь директиву ssl_early_data можно использовать с
+       OpenSSL.
+
+    *) Исправление: в модуле ngx_http_uwsgi_module.
+       Спасибо Chris Caputo.
+
+    *) Исправление: соединения к некоторым gRPC-бэкендам могли не
+       кэшироваться при использовании директивы keepalive.
+
+    *) Исправление: при использовании директивы error_page для
+       перенаправления ошибок, возникающих на ранних этапах обработки
+       запроса, в частности ошибок с кодом 400, могла происходить утечка
+       сокетов.
+
+    *) Исправление: директива return при возврате ошибок не изменяла код
+       ответа, если запрос был перенаправлен с помощью директивы error_page.
+
+    *) Исправление: стандартные сообщения об ошибках и ответы модуля
+       ngx_http_autoindex_module содержали атрибут bgcolor, что могло
+       приводить к их некорректному отображению при использовании
+       пользовательских настроек цветов в браузерах.
+       Спасибо Nova DasSarma.
+
+    *) Изменение: уровень логгирования ошибок SSL "no suitable key share" и
+       "no suitable signature algorithm" понижен с уровня crit до info.
+
+
+Изменения в nginx 1.15.3                                          28.08.2018
+
+    *) Добавление: теперь TLSv1.3 можно использовать с BoringSSL.
+
+    *) Добавление: директива ssl_early_data, сейчас доступна при
+       использовании BoringSSL.
+
+    *) Добавление: директивы keepalive_timeout и keepalive_requests в блоке
+       upstream.
+
+    *) Исправление: модуль ngx_http_dav_module при копировании файла поверх
+       существующего файла с помощью метода COPY не обнулял целевой файл.
+
+    *) Исправление: модуль ngx_http_dav_module при перемещении файла между
+       файловыми системами с помощью метода MOVE устанавливал нулевые права
+       доступа на результирующий файл и не сохранял время изменения файла.
+
+    *) Исправление: модуль ngx_http_dav_module при копировании файла с
+       помощью метода COPY для результирующего файла использовал права
+       доступа по умолчанию.
+
+    *) Изменение: некоторые клиенты могли не работать при использовании
+       HTTP/2; ошибка появилась в 1.13.5.
+
+    *) Исправление: nginx не собирался с LibreSSL 2.8.0.
+
+
+Изменения в nginx 1.15.2                                          24.07.2018
+
+    *) Добавление: переменная $ssl_preread_protocol в модуле
+       ngx_stream_ssl_preread_module.
+
+    *) Добавление: теперь при использовании директивы
+       reset_timedout_connection nginx сбрасывает соединения, закрываемые с
+       кодом 444.
+
+    *) Изменение: уровень логгирования ошибок SSL "http request", "https
+       proxy request", "unsupported protocol" и "version too low" понижен с
+       уровня crit до info.
+
+    *) Исправление: запросы к DNS-серверу не отправлялись повторно, если при
+       первой попытке отправки происходила ошибка.
+
+    *) Исправление: параметр reuseport директивы listen игнорировался, если
+       количество рабочих процессов было задано после директивы listen.
+
+    *) Исправление: при использовании OpenSSL 1.1.0 и новее директиву
+       ssl_prefer_server_ciphers нельзя было выключить в виртуальном
+       сервере, если она была включена в сервере по умолчанию.
+
+    *) Исправление: повторное использование SSL-сессий к бэкендам не
+       работало с протоколом TLS 1.3.
+
+
+Изменения в nginx 1.15.1                                          03.07.2018
+
+    *) Добавление: директива random в блоке upstream.
+
+    *) Добавление: улучшена производительность при использовании директив
+       hash и ip_hash совместно с директивой zone.
+
+    *) Добавление: параметр reuseport директивы listen теперь использует
+       SO_REUSEPORT_LB на FreeBSD 12.
+
+    *) Исправление: HTTP/2 server push не работал, если SSL терминировался
+       прокси-сервером перед nginx'ом.
+
+    *) Исправление: директива tcp_nopush всегда использовалась для
+       соединений к бэкендам.
+
+    *) Исправление: при отправке сохранённого на диск тела запроса на
+       gRPC-бэкенд могли возникать ошибки.
+
+
+Изменения в nginx 1.15.0                                          05.06.2018
+
+    *) Изменение: директива "ssl" теперь считается устаревшей; вместо неё
+       следует использовать параметр ssl директивы listen.
+
+    *) Изменение: теперь при использовании директивы listen с параметром ssl
+       nginx определяет отсутствие SSL-сертификатов при тестировании
+       конфигурации.
+
+    *) Добавление: теперь модуль stream умеет обрабатывать несколько
+       входящих UDP-пакетов от клиента в рамках одной сессии.
+
+    *) Исправление: в директиве proxy_cache_valid можно было указать
+       некорректный код ответа.
+
+    *) Исправление: nginx не собирался gcc 8.1.
+
+    *) Исправление: логгирование в syslog останавливалось при изменении
+       локального IP-адреса.
+
+    *) Исправление: nginx не собирался компилятором clang, если был
+       установлен CUDA SDK; ошибка появилась в 1.13.8.
+
+    *) Исправление: при использовании unix domain listen-сокетов на FreeBSD
+       в процессе обновления исполняемого файла в логе могли появляться
+       сообщения "getsockopt(TCP_FASTOPEN) ... failed".
+
+    *) Исправление: nginx не собирался на Fedora 28 Linux.
+
+    *) Исправление: при использовании директивы limit_req заданная скорость
+       обработки запросов могла не соблюдаться.
+
+    *) Исправление: в обработке адресов клиентов при использовании unix
+       domain listen-сокетов для работы с датаграммами на Linux.
+
+    *) Исправление: в обработке ошибок выделения памяти.
 
 
 Изменения в nginx 1.13.12                                         10.04.2018
diff --git a/LICENSE b/LICENSE
index 9401174..c63e0ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2002-2018 Igor Sysoev
- * Copyright (C) 2011-2018 Nginx, Inc.
+ * Copyright (C) 2002-2019 Igor Sysoev
+ * Copyright (C) 2011-2019 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/auto/cc/clang b/auto/cc/clang
index 9d900c2..a962ee2 100644
--- a/auto/cc/clang
+++ b/auto/cc/clang
@@ -6,7 +6,8 @@
 
 
 NGX_CLANG_VER=`$CC -v 2>&1 | grep 'version' 2>&1 \
-                           | sed -e 's/^.* version \(.*\)/\1/'`
+                           | sed -n -e 's/^.*clang version \(.*\)/\1/p' \
+                                    -e 's/^.*LLVM version \(.*\)/\1/p'`
 
 echo " + clang version: $NGX_CLANG_VER"
 
diff --git a/auto/cc/msvc b/auto/cc/msvc
index 8257252..68435ff 100644
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -108,7 +108,7 @@ CORE_LIBS="$CORE_LIBS kernel32.lib user32.lib"
 # msvc under Wine issues
 # C1902: Program database manager mismatch; please check your installation
 if [ -z "$NGX_WINE" ]; then
-   CFLAGS="$CFLAGS -Zi"
+   CFLAGS="$CFLAGS -Zi -Fd$NGX_OBJS/nginx.pdb"
    CORE_LINK="$CORE_LINK -debug"
 fi
 
diff --git a/auto/lib/google-perftools/conf b/auto/lib/google-perftools/conf
index 5d5ddae..7f1a911 100644
--- a/auto/lib/google-perftools/conf
+++ b/auto/lib/google-perftools/conf
@@ -9,7 +9,8 @@
     ngx_feature_incs=
     ngx_feature_path=
     ngx_feature_libs="-lprofiler"
-    ngx_feature_test="ProfilerStop()"
+    ngx_feature_test="void ProfilerStop(void);
+                      ProfilerStop()"
     . auto/feature
 
 
diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf
index 87761f1..6786397 100644
--- a/auto/lib/libgd/conf
+++ b/auto/lib/libgd/conf
@@ -9,7 +9,8 @@
     ngx_feature_incs="#include <gd.h>"
     ngx_feature_path=
     ngx_feature_libs="-lgd"
-    ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);"
+    ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);
+                      (void) img"
     . auto/feature
 
 
@@ -76,7 +77,8 @@ if [ $ngx_found = yes ]; then
 
     ngx_feature="GD WebP support"
     ngx_feature_name="NGX_HAVE_GD_WEBP"
-    ngx_feature_test="gdImagePtr img = gdImageCreateFromWebpPtr(1, NULL);"
+    ngx_feature_test="gdImagePtr img = gdImageCreateFromWebpPtr(1, NULL);
+                      (void) img"
     . auto/feature
 
 else
diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
index 3a0f37b..3063ac7 100644
--- a/auto/lib/libxslt/conf
+++ b/auto/lib/libxslt/conf
@@ -16,8 +16,8 @@
     ngx_feature_libs="-lxml2 -lxslt"
     ngx_feature_test="xmlParserCtxtPtr    ctxt = NULL;
                       xsltStylesheetPtr   sheet = NULL;
-                      xmlDocPtr           doc;
-                      doc = xmlParseChunk(ctxt, NULL, 0, 0);
+                      xmlDocPtr           doc = NULL;
+                      xmlParseChunk(ctxt, NULL, 0, 0);
                       xsltApplyStylesheet(sheet, doc, NULL);"
     . auto/feature
 
diff --git a/auto/make b/auto/make
index 7ddd100..34c40cd 100644
--- a/auto/make
+++ b/auto/make
@@ -229,7 +229,7 @@ build:	binary modules manpage
 binary:	$NGX_OBJS${ngx_dirsep}nginx$ngx_binext
 
 $NGX_OBJS${ngx_dirsep}nginx$ngx_binext:	$ngx_deps$ngx_spacer
-	\$(LINK) $ngx_long_start$ngx_binout$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
+	\$(LINK) $ngx_long_start$ngx_binout$NGX_OBJS${ngx_dirsep}nginx$ngx_binext$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
 	$ngx_rcc
 $ngx_long_end
 
diff --git a/auto/modules b/auto/modules
index 73a9bae..09bfcb0 100644
--- a/auto/modules
+++ b/auto/modules
@@ -878,6 +878,17 @@ if [ $HTTP = YES ]; then
         . auto/module
     fi
 
+    if [ $HTTP_UPSTREAM_RANDOM = YES ]; then
+        ngx_module_name=ngx_http_upstream_random_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/modules/ngx_http_upstream_random_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_UPSTREAM_RANDOM
+
+        . auto/module
+    fi
+
     if [ $HTTP_UPSTREAM_KEEPALIVE = YES ]; then
         ngx_module_name=ngx_http_upstream_keepalive_module
         ngx_module_incs=
@@ -1143,6 +1154,16 @@ if [ $STREAM != NO ]; then
         . auto/module
     fi
 
+    if [ $STREAM_UPSTREAM_RANDOM = YES ]; then
+        ngx_module_name=ngx_stream_upstream_random_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_upstream_random_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_UPSTREAM_RANDOM
+
+        . auto/module
+    fi
+
     if [ $STREAM_UPSTREAM_ZONE = YES ]; then
         have=NGX_STREAM_UPSTREAM_ZONE . auto/have
 
diff --git a/auto/options b/auto/options
index 59f0449..d8b421b 100644
--- a/auto/options
+++ b/auto/options
@@ -102,6 +102,7 @@ HTTP_GZIP_STATIC=NO
 HTTP_UPSTREAM_HASH=YES
 HTTP_UPSTREAM_IP_HASH=YES
 HTTP_UPSTREAM_LEAST_CONN=YES
+HTTP_UPSTREAM_RANDOM=YES
 HTTP_UPSTREAM_KEEPALIVE=YES
 HTTP_UPSTREAM_ZONE=YES
 
@@ -126,6 +127,7 @@ STREAM_SPLIT_CLIENTS=YES
 STREAM_RETURN=YES
 STREAM_UPSTREAM_HASH=YES
 STREAM_UPSTREAM_LEAST_CONN=YES
+STREAM_UPSTREAM_RANDOM=YES
 STREAM_UPSTREAM_ZONE=YES
 STREAM_SSL_PREREAD=NO
 
@@ -273,6 +275,8 @@ $0: warning: the \"--with-ipv6\" option is deprecated"
         --without-http_upstream_ip_hash_module) HTTP_UPSTREAM_IP_HASH=NO ;;
         --without-http_upstream_least_conn_module)
                                          HTTP_UPSTREAM_LEAST_CONN=NO ;;
+        --without-http_upstream_random_module)
+                                         HTTP_UPSTREAM_RANDOM=NO    ;;
         --without-http_upstream_keepalive_module) HTTP_UPSTREAM_KEEPALIVE=NO ;;
         --without-http_upstream_zone_module) HTTP_UPSTREAM_ZONE=NO  ;;
 
@@ -325,6 +329,8 @@ use the \"--with-mail_ssl_module\" option instead"
                                          STREAM_UPSTREAM_HASH=NO    ;;
         --without-stream_upstream_least_conn_module)
                                          STREAM_UPSTREAM_LEAST_CONN=NO ;;
+        --without-stream_upstream_random_module)
+                                         STREAM_UPSTREAM_RANDOM=NO  ;;
         --without-stream_upstream_zone_module)
                                          STREAM_UPSTREAM_ZONE=NO    ;;
 
@@ -485,6 +491,8 @@ cat << END
                                      disable ngx_http_upstream_ip_hash_module
   --without-http_upstream_least_conn_module
                                      disable ngx_http_upstream_least_conn_module
+  --without-http_upstream_random_module
+                                     disable ngx_http_upstream_random_module
   --without-http_upstream_keepalive_module
                                      disable ngx_http_upstream_keepalive_module
   --without-http_upstream_zone_module
@@ -535,6 +543,8 @@ cat << END
                                      disable ngx_stream_upstream_hash_module
   --without-stream_upstream_least_conn_module
                                      disable ngx_stream_upstream_least_conn_module
+  --without-stream_upstream_random_module
+                                     disable ngx_stream_upstream_random_module
   --without-stream_upstream_zone_module
                                      disable ngx_stream_upstream_zone_module
 
diff --git a/auto/os/linux b/auto/os/linux
index 2c8a9bb..5e280ec 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -185,6 +185,8 @@ ngx_feature_test="struct __user_cap_data_struct    data;
                   data.effective = CAP_TO_MASK(CAP_NET_RAW);
                   data.permitted = 0;
 
+                  (void) header;
+                  (void) data;
                   (void) SYS_capset"
 . auto/feature
 
diff --git a/auto/os/win32 b/auto/os/win32
index 7a82774..b821ae6 100644
--- a/auto/os/win32
+++ b/auto/os/win32
@@ -11,6 +11,7 @@ CORE_SRCS="$WIN32_SRCS $IOCP_SRCS"
 OS_CONFIG="$WIN32_CONFIG"
 NGX_ICONS="$NGX_WIN32_ICONS"
 SELECT_SRCS=$WIN32_SELECT_SRCS
+POLL_SRCS=$WIN32_POLL_SRCS
 
 ngx_pic_opt=
 ngx_binext=".exe"
@@ -31,12 +32,7 @@ case "$NGX_CC_NAME" in
 esac
 
 EVENT_MODULES="$EVENT_MODULES $IOCP_MODULE"
-EVENT_FOUND=YES
-
-if [ $EVENT_SELECT = NO ]; then
-    CORE_SRCS="$CORE_SRCS $SELECT_SRCS"
-    EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
-fi
+#EVENT_FOUND=YES
 
 have=NGX_HAVE_INET6 . auto/have
 
diff --git a/auto/sources b/auto/sources
index 1398147..3dad111 100644
--- a/auto/sources
+++ b/auto/sources
@@ -95,6 +95,7 @@ EVENT_SRCS="src/event/ngx_event.c \
             src/event/ngx_event_timer.c \
             src/event/ngx_event_posted.c \
             src/event/ngx_event_accept.c \
+            src/event/ngx_event_udp.c \
             src/event/ngx_event_connect.c \
             src/event/ngx_event_pipe.c"
 
@@ -105,6 +106,7 @@ WIN32_SELECT_SRCS=src/event/modules/ngx_win32_select_module.c
 
 POLL_MODULE=ngx_poll_module
 POLL_SRCS=src/event/modules/ngx_poll_module.c
+WIN32_POLL_SRCS=src/event/modules/ngx_win32_poll_module.c
 
 KQUEUE_MODULE=ngx_kqueue_module
 KQUEUE_SRCS=src/event/modules/ngx_kqueue_module.c
diff --git a/conf/mime.types b/conf/mime.types
index 8a2348a..2961256 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -24,7 +24,9 @@ types {
     image/x-jng                                      jng;
     image/x-ms-bmp                                   bmp;
 
-    application/font-woff                            woff;
+    font/woff                                        woff;
+    font/woff2                                       woff2;
+
     application/java-archive                         jar war ear;
     application/json                                 json;
     application/mac-binhex40                         hqx;
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 075b19a..6bee7a2 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -108,6 +108,7 @@ syn keyword ngxDirectiveControl contained set
 syn keyword ngxDirectiveError contained error_page
 syn keyword ngxDirectiveError contained post_action
 
+syn keyword ngxDirectiveDeprecated contained limit_zone
 syn keyword ngxDirectiveDeprecated contained proxy_downstream_buffer
 syn keyword ngxDirectiveDeprecated contained proxy_upstream_buffer
 syn keyword ngxDirectiveDeprecated contained spdy_chunk_size
@@ -118,6 +119,7 @@ syn keyword ngxDirectiveDeprecated contained spdy_pool_size
 syn keyword ngxDirectiveDeprecated contained spdy_recv_buffer_size
 syn keyword ngxDirectiveDeprecated contained spdy_recv_timeout
 syn keyword ngxDirectiveDeprecated contained spdy_streams_index_size
+syn keyword ngxDirectiveDeprecated contained ssl
 syn keyword ngxDirectiveDeprecated contained upstream_conf
 
 syn keyword ngxDirective contained absolute_redirect
@@ -136,6 +138,7 @@ syn keyword ngxDirective contained alias
 syn keyword ngxDirective contained allow
 syn keyword ngxDirective contained ancient_browser
 syn keyword ngxDirective contained ancient_browser_value
+syn keyword ngxDirective contained api
 syn keyword ngxDirective contained auth_basic
 syn keyword ngxDirective contained auth_basic_user_file
 syn keyword ngxDirective contained auth_http
@@ -143,7 +146,11 @@ syn keyword ngxDirective contained auth_http_header
 syn keyword ngxDirective contained auth_http_pass_client_cert
 syn keyword ngxDirective contained auth_http_timeout
 syn keyword ngxDirective contained auth_jwt
+syn keyword ngxDirective contained auth_jwt_claim_set
+syn keyword ngxDirective contained auth_jwt_header_set
 syn keyword ngxDirective contained auth_jwt_key_file
+syn keyword ngxDirective contained auth_jwt_key_request
+syn keyword ngxDirective contained auth_jwt_leeway
 syn keyword ngxDirective contained auth_request
 syn keyword ngxDirective contained auth_request_set
 syn keyword ngxDirective contained autoindex
@@ -229,6 +236,7 @@ syn keyword ngxDirective contained fastcgi_read_timeout
 syn keyword ngxDirective contained fastcgi_request_buffering
 syn keyword ngxDirective contained fastcgi_send_lowat
 syn keyword ngxDirective contained fastcgi_send_timeout
+syn keyword ngxDirective contained fastcgi_socket_keepalive
 syn keyword ngxDirective contained fastcgi_split_path_info
 syn keyword ngxDirective contained fastcgi_store
 syn keyword ngxDirective contained fastcgi_store_access
@@ -255,6 +263,7 @@ syn keyword ngxDirective contained grpc_pass_header
 syn keyword ngxDirective contained grpc_read_timeout
 syn keyword ngxDirective contained grpc_send_timeout
 syn keyword ngxDirective contained grpc_set_header
+syn keyword ngxDirective contained grpc_socket_keepalive
 syn keyword ngxDirective contained grpc_ssl_certificate
 syn keyword ngxDirective contained grpc_ssl_certificate_key
 syn keyword ngxDirective contained grpc_ssl_ciphers
@@ -330,6 +339,8 @@ syn keyword ngxDirective contained keepalive
 syn keyword ngxDirective contained keepalive_disable
 syn keyword ngxDirective contained keepalive_requests
 syn keyword ngxDirective contained keepalive_timeout
+syn keyword ngxDirective contained keyval
+syn keyword ngxDirective contained keyval_zone
 syn keyword ngxDirective contained kqueue_changes
 syn keyword ngxDirective contained kqueue_events
 syn keyword ngxDirective contained large_client_header_buffers
@@ -367,6 +378,7 @@ syn keyword ngxDirective contained memcached_next_upstream_timeout
 syn keyword ngxDirective contained memcached_next_upstream_tries
 syn keyword ngxDirective contained memcached_read_timeout
 syn keyword ngxDirective contained memcached_send_timeout
+syn keyword ngxDirective contained memcached_socket_keepalive
 syn keyword ngxDirective contained merge_slashes
 syn keyword ngxDirective contained min_delete_depth
 syn keyword ngxDirective contained mirror
@@ -375,9 +387,9 @@ syn keyword ngxDirective contained modern_browser
 syn keyword ngxDirective contained modern_browser_value
 syn keyword ngxDirective contained mp4
 syn keyword ngxDirective contained mp4_buffer_size
-syn keyword ngxDirective contained mp4_max_buffer_size
 syn keyword ngxDirective contained mp4_limit_rate
 syn keyword ngxDirective contained mp4_limit_rate_after
+syn keyword ngxDirective contained mp4_max_buffer_size
 syn keyword ngxDirective contained msie_padding
 syn keyword ngxDirective contained msie_refresh
 syn keyword ngxDirective contained multi_accept
@@ -456,11 +468,13 @@ syn keyword ngxDirective contained proxy_protocol_timeout
 syn keyword ngxDirective contained proxy_read_timeout
 syn keyword ngxDirective contained proxy_redirect
 syn keyword ngxDirective contained proxy_request_buffering
+syn keyword ngxDirective contained proxy_requests
 syn keyword ngxDirective contained proxy_responses
 syn keyword ngxDirective contained proxy_send_lowat
 syn keyword ngxDirective contained proxy_send_timeout
 syn keyword ngxDirective contained proxy_set_body
 syn keyword ngxDirective contained proxy_set_header
+syn keyword ngxDirective contained proxy_socket_keepalive
 syn keyword ngxDirective contained proxy_ssl
 syn keyword ngxDirective contained proxy_ssl_certificate
 syn keyword ngxDirective contained proxy_ssl_certificate_key
@@ -481,6 +495,7 @@ syn keyword ngxDirective contained proxy_temp_path
 syn keyword ngxDirective contained proxy_timeout
 syn keyword ngxDirective contained proxy_upload_rate
 syn keyword ngxDirective contained queue
+syn keyword ngxDirective contained random
 syn keyword ngxDirective contained random_index
 syn keyword ngxDirective contained read_ahead
 syn keyword ngxDirective contained real_ip_header
@@ -533,6 +548,7 @@ syn keyword ngxDirective contained scgi_pass_request_headers
 syn keyword ngxDirective contained scgi_read_timeout
 syn keyword ngxDirective contained scgi_request_buffering
 syn keyword ngxDirective contained scgi_send_timeout
+syn keyword ngxDirective contained scgi_socket_keepalive
 syn keyword ngxDirective contained scgi_store
 syn keyword ngxDirective contained scgi_store_access
 syn keyword ngxDirective contained scgi_temp_file_write_size
@@ -565,7 +581,6 @@ syn keyword ngxDirective contained ssi_min_file_chunk
 syn keyword ngxDirective contained ssi_silent_errors
 syn keyword ngxDirective contained ssi_types
 syn keyword ngxDirective contained ssi_value_length
-syn keyword ngxDirective contained ssl
 syn keyword ngxDirective contained ssl_buffer_size
 syn keyword ngxDirective contained ssl_certificate
 syn keyword ngxDirective contained ssl_certificate_key
@@ -573,6 +588,7 @@ syn keyword ngxDirective contained ssl_ciphers
 syn keyword ngxDirective contained ssl_client_certificate
 syn keyword ngxDirective contained ssl_crl
 syn keyword ngxDirective contained ssl_dhparam
+syn keyword ngxDirective contained ssl_early_data
 syn keyword ngxDirective contained ssl_ecdh_curve
 syn keyword ngxDirective contained ssl_engine
 syn keyword ngxDirective contained ssl_handshake_timeout
@@ -664,6 +680,7 @@ syn keyword ngxDirective contained uwsgi_pass_request_headers
 syn keyword ngxDirective contained uwsgi_read_timeout
 syn keyword ngxDirective contained uwsgi_request_buffering
 syn keyword ngxDirective contained uwsgi_send_timeout
+syn keyword ngxDirective contained uwsgi_socket_keepalive
 syn keyword ngxDirective contained uwsgi_ssl_certificate
 syn keyword ngxDirective contained uwsgi_ssl_certificate_key
 syn keyword ngxDirective contained uwsgi_ssl_ciphers
@@ -701,6 +718,26 @@ syn keyword ngxDirective contained xslt_string_param
 syn keyword ngxDirective contained xslt_stylesheet
 syn keyword ngxDirective contained xslt_types
 syn keyword ngxDirective contained zone
+syn keyword ngxDirective contained zone_sync
+syn keyword ngxDirective contained zone_sync_buffers
+syn keyword ngxDirective contained zone_sync_connect_retry_interval
+syn keyword ngxDirective contained zone_sync_connect_timeout
+syn keyword ngxDirective contained zone_sync_interval
+syn keyword ngxDirective contained zone_sync_recv_buffer_size
+syn keyword ngxDirective contained zone_sync_server
+syn keyword ngxDirective contained zone_sync_ssl
+syn keyword ngxDirective contained zone_sync_ssl_certificate
+syn keyword ngxDirective contained zone_sync_ssl_certificate_key
+syn keyword ngxDirective contained zone_sync_ssl_ciphers
+syn keyword ngxDirective contained zone_sync_ssl_crl
+syn keyword ngxDirective contained zone_sync_ssl_name
+syn keyword ngxDirective contained zone_sync_ssl_password_file
+syn keyword ngxDirective contained zone_sync_ssl_protocols
+syn keyword ngxDirective contained zone_sync_ssl_server_name
+syn keyword ngxDirective contained zone_sync_ssl_trusted_certificate
+syn keyword ngxDirective contained zone_sync_ssl_verify
+syn keyword ngxDirective contained zone_sync_ssl_verify_depth
+syn keyword ngxDirective contained zone_sync_timeout
 
 " 3rd party modules list taken from
 " https://github.com/freebsd/freebsd-ports/blob/master/www/nginx-devel/Makefile
@@ -876,6 +913,8 @@ syn keyword ngxDirectiveThirdParty contained more_set_input_headers
 
 " NGINX WebDAV missing commands support (PROPFIND & OPTIONS)
 " https://github.com/arut/nginx-dav-ext-module
+syn keyword ngxDirectiveThirdParty contained dav_ext_lock
+syn keyword ngxDirectiveThirdParty contained dav_ext_lock_zone
 syn keyword ngxDirectiveThirdParty contained dav_ext_methods
 
 " ngx_eval
@@ -895,6 +934,7 @@ syn keyword ngxDirectiveThirdParty contained fancyindex_directories_first
 syn keyword ngxDirectiveThirdParty contained fancyindex_exact_size
 syn keyword ngxDirectiveThirdParty contained fancyindex_footer
 syn keyword ngxDirectiveThirdParty contained fancyindex_header
+syn keyword ngxDirectiveThirdParty contained fancyindex_hide_parent_dir
 syn keyword ngxDirectiveThirdParty contained fancyindex_hide_symlinks
 syn keyword ngxDirectiveThirdParty contained fancyindex_ignore
 syn keyword ngxDirectiveThirdParty contained fancyindex_localtime
@@ -937,8 +977,17 @@ syn keyword ngxDirectiveThirdParty contained notice_type
 
 " nchan
 " https://github.com/slact/nchan
+syn keyword ngxDirectiveThirdParty contained nchan_access_control_allow_credentials
 syn keyword ngxDirectiveThirdParty contained nchan_access_control_allow_origin
 syn keyword ngxDirectiveThirdParty contained nchan_authorize_request
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_channels
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_message_padding_bytes
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_messages_per_channel_per_minute
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_publisher_distribution
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_subscriber_distribution
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_subscribers_per_channel
+syn keyword ngxDirectiveThirdParty contained nchan_benchmark_time
 syn keyword ngxDirectiveThirdParty contained nchan_channel_event_string
 syn keyword ngxDirectiveThirdParty contained nchan_channel_events_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_channel_group
@@ -974,15 +1023,19 @@ syn keyword ngxDirectiveThirdParty contained nchan_publisher_upstream_request
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_location
+syn keyword ngxDirectiveThirdParty contained nchan_redis_connect_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_redis_fakesub_timer_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_cache_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_redis_namespace
+syn keyword ngxDirectiveThirdParty contained nchan_redis_nostore_fastpublish
+syn keyword ngxDirectiveThirdParty contained nchan_redis_optimize_target
 syn keyword ngxDirectiveThirdParty contained nchan_redis_pass
 syn keyword ngxDirectiveThirdParty contained nchan_redis_pass_inheritable
 syn keyword ngxDirectiveThirdParty contained nchan_redis_ping_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_publish_msgpacked_max_size
 syn keyword ngxDirectiveThirdParty contained nchan_redis_server
 syn keyword ngxDirectiveThirdParty contained nchan_redis_storage_mode
+syn keyword ngxDirectiveThirdParty contained nchan_redis_subscribe_weights
 syn keyword ngxDirectiveThirdParty contained nchan_redis_url
 syn keyword ngxDirectiveThirdParty contained nchan_redis_wait_after_connecting
 syn keyword ngxDirectiveThirdParty contained nchan_shared_memory_size
@@ -1280,6 +1333,7 @@ syn keyword ngxDirectiveThirdParty contained lua_package_cpath
 syn keyword ngxDirectiveThirdParty contained lua_package_path
 syn keyword ngxDirectiveThirdParty contained lua_regex_cache_max_entries
 syn keyword ngxDirectiveThirdParty contained lua_regex_match_limit
+syn keyword ngxDirectiveThirdParty contained lua_sa_restart
 syn keyword ngxDirectiveThirdParty contained lua_shared_dict
 syn keyword ngxDirectiveThirdParty contained lua_socket_buffer_size
 syn keyword ngxDirectiveThirdParty contained lua_socket_connect_timeout
@@ -1355,9 +1409,15 @@ syn keyword ngxDirectiveThirdParty contained rules_enabled
 " https://www.phusionpassenger.com/library/config/nginx/reference/
 syn keyword ngxDirectiveThirdParty contained passenger_abort_on_startup_error
 syn keyword ngxDirectiveThirdParty contained passenger_abort_websockets_on_process_shutdown
+syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_auth_type
+syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_password
+syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_url
+syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_username
+syn keyword ngxDirectiveThirdParty contained passenger_anonymous_telemetry_proxy
 syn keyword ngxDirectiveThirdParty contained passenger_app_env
 syn keyword ngxDirectiveThirdParty contained passenger_app_file_descriptor_ulimit
 syn keyword ngxDirectiveThirdParty contained passenger_app_group_name
+syn keyword ngxDirectiveThirdParty contained passenger_app_log_file
 syn keyword ngxDirectiveThirdParty contained passenger_app_rights
 syn keyword ngxDirectiveThirdParty contained passenger_app_root
 syn keyword ngxDirectiveThirdParty contained passenger_app_type
@@ -1373,8 +1433,10 @@ syn keyword ngxDirectiveThirdParty contained passenger_data_buffer_dir
 syn keyword ngxDirectiveThirdParty contained passenger_debugger
 syn keyword ngxDirectiveThirdParty contained passenger_default_group
 syn keyword ngxDirectiveThirdParty contained passenger_default_user
+syn keyword ngxDirectiveThirdParty contained passenger_disable_anonymous_telemetry
 syn keyword ngxDirectiveThirdParty contained passenger_disable_security_update_check
 syn keyword ngxDirectiveThirdParty contained passenger_document_root
+syn keyword ngxDirectiveThirdParty contained passenger_dump_config_manifest
 syn keyword ngxDirectiveThirdParty contained passenger_enabled
 syn keyword ngxDirectiveThirdParty contained passenger_env_var
 syn keyword ngxDirectiveThirdParty contained passenger_file_descriptor_log_file
@@ -1402,6 +1464,7 @@ syn keyword ngxDirectiveThirdParty contained passenger_max_requests
 syn keyword ngxDirectiveThirdParty contained passenger_memory_limit
 syn keyword ngxDirectiveThirdParty contained passenger_meteor_app_settings
 syn keyword ngxDirectiveThirdParty contained passenger_min_instances
+syn keyword ngxDirectiveThirdParty contained passenger_monitor_log_file
 syn keyword ngxDirectiveThirdParty contained passenger_nodejs
 syn keyword ngxDirectiveThirdParty contained passenger_pass_header
 syn keyword ngxDirectiveThirdParty contained passenger_pool_idle_time
@@ -1778,6 +1841,8 @@ syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_host
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_by_set_key
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_check_duplicate
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_filter_max_node
+syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_histogram_buckets
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_check_duplicate
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_traffic
@@ -1899,11 +1964,11 @@ syn keyword ngxDirectiveThirdParty contained form_auth_remote_user
 
 " ngx_http_accounting_module
 " https://github.com/Lax/ngx_http_accounting_module
-syn keyword ngxDirectiveThirdParty contained http_accounting
-syn keyword ngxDirectiveThirdParty contained http_accounting_id
-syn keyword ngxDirectiveThirdParty contained http_accounting_interval
-syn keyword ngxDirectiveThirdParty contained http_accounting_log
-syn keyword ngxDirectiveThirdParty contained http_accounting_perturb
+syn keyword ngxDirectiveThirdParty contained accounting
+syn keyword ngxDirectiveThirdParty contained accounting_id
+syn keyword ngxDirectiveThirdParty contained accounting_interval
+syn keyword ngxDirectiveThirdParty contained accounting_log
+syn keyword ngxDirectiveThirdParty contained accounting_perturb
 
 " concatenating files in a given context: CSS and JS files usually
 " https://github.com/alibaba/nginx-http-concat
diff --git a/html/50x.html b/html/50x.html
index f60f5e7..9071e0a 100644
--- a/html/50x.html
+++ b/html/50x.html
@@ -15,7 +15,7 @@
 <p>Sorry, the page you are looking for is currently unavailable.<br/>
 Please try again later.</p>
 <p>If you are the system administrator of this resource then you should check
-the <a href="http://nginx.org/r/error_log">error log</a> for details.</p>
+the error log for details.</p>
 <p><em>Faithfully yours, nginx.</em></p>
 </body>
 </html>
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 4fc92ac..c59a0e7 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1014002
-#define NGINX_VERSION      "1.14.2"
+#define nginx_version      1016001
+#define NGINX_VERSION      "1.16.1"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_buf.c b/src/core/ngx_buf.c
index 1862a06..c3783c4 100644
--- a/src/core/ngx_buf.c
+++ b/src/core/ngx_buf.c
@@ -137,6 +137,7 @@ ngx_chain_add_copy(ngx_pool_t *pool, ngx_chain_t **chain, ngx_chain_t *in)
     while (in) {
         cl = ngx_alloc_chain_link(pool);
         if (cl == NULL) {
+            *ll = NULL;
             return NGX_ERROR;
         }
 
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index ba454de..6d1629e 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -310,7 +310,7 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
                 goto failed;
             }
 
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, rv);
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%s", rv);
 
             goto failed;
         }
@@ -656,13 +656,14 @@ ngx_conf_read_token(ngx_conf_t *cf)
         }
 
         if (last_space) {
-            if (ch == ' ' || ch == '\t' || ch == CR || ch == LF) {
-                continue;
-            }
 
             start = b->pos - 1;
             start_line = cf->conf_file->line;
 
+            if (ch == ' ' || ch == '\t' || ch == CR || ch == LF) {
+                continue;
+            }
+
             switch (ch) {
 
             case ';':
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 9a74758..3368253 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -72,6 +72,10 @@ ngx_create_listening(ngx_conf_t *cf, struct sockaddr *sockaddr,
 
     ngx_memcpy(ls->addr_text.data, text, len);
 
+#if !(NGX_WIN32)
+    ngx_rbtree_init(&ls->rbtree, &ls->sentinel, ngx_udp_rbtree_insert_value);
+#endif
+
     ls->fd = (ngx_socket_t) -1;
     ls->type = SOCK_STREAM;
 
@@ -92,7 +96,7 @@ ngx_create_listening(ngx_conf_t *cf, struct sockaddr *sockaddr,
 
 
 ngx_int_t
-ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls)
+ngx_clone_listening(ngx_cycle_t *cycle, ngx_listening_t *ls)
 {
 #if (NGX_HAVE_REUSEPORT)
 
@@ -100,20 +104,19 @@ ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls)
     ngx_core_conf_t  *ccf;
     ngx_listening_t   ols;
 
-    if (!ls->reuseport) {
+    if (!ls->reuseport || ls->worker != 0) {
         return NGX_OK;
     }
 
     ols = *ls;
 
-    ccf = (ngx_core_conf_t *) ngx_get_conf(cf->cycle->conf_ctx,
-                                           ngx_core_module);
+    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
 
     for (n = 1; n < ccf->worker_processes; n++) {
 
         /* create a socket for each worker process */
 
-        ls = ngx_array_push(&cf->cycle->listening);
+        ls = ngx_array_push(&cycle->listening);
         if (ls == NULL) {
             return NGX_ERROR;
         }
@@ -277,6 +280,22 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
         reuseport = 0;
         olen = sizeof(int);
 
+#ifdef SO_REUSEPORT_LB
+
+        if (getsockopt(ls[i].fd, SOL_SOCKET, SO_REUSEPORT_LB,
+                       (void *) &reuseport, &olen)
+            == -1)
+        {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
+                          "getsockopt(SO_REUSEPORT_LB) %V failed, ignored",
+                          &ls[i].addr_text);
+
+        } else {
+            ls[i].reuseport = reuseport ? 1 : 0;
+        }
+
+#else
+
         if (getsockopt(ls[i].fd, SOL_SOCKET, SO_REUSEPORT,
                        (void *) &reuseport, &olen)
             == -1)
@@ -288,6 +307,7 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
         } else {
             ls[i].reuseport = reuseport ? 1 : 0;
         }
+#endif
 
 #endif
 
@@ -305,7 +325,9 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
         {
             err = ngx_socket_errno;
 
-            if (err != NGX_EOPNOTSUPP && err != NGX_ENOPROTOOPT) {
+            if (err != NGX_EOPNOTSUPP && err != NGX_ENOPROTOOPT
+                && err != NGX_EINVAL)
+            {
                 ngx_log_error(NGX_LOG_NOTICE, cycle->log, err,
                               "getsockopt(TCP_FASTOPEN) %V failed, ignored",
                               &ls[i].addr_text);
@@ -424,6 +446,20 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
 
                 int  reuseport = 1;
 
+#ifdef SO_REUSEPORT_LB
+
+                if (setsockopt(ls[i].fd, SOL_SOCKET, SO_REUSEPORT_LB,
+                               (const void *) &reuseport, sizeof(int))
+                    == -1)
+                {
+                    ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
+                                  "setsockopt(SO_REUSEPORT_LB) %V failed, "
+                                  "ignored",
+                                  &ls[i].addr_text);
+                }
+
+#else
+
                 if (setsockopt(ls[i].fd, SOL_SOCKET, SO_REUSEPORT,
                                (const void *) &reuseport, sizeof(int))
                     == -1)
@@ -432,6 +468,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
                                   "setsockopt(SO_REUSEPORT) %V failed, ignored",
                                   &ls[i].addr_text);
                 }
+#endif
 
                 ls[i].add_reuseport = 0;
             }
@@ -482,6 +519,27 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
 
                 reuseport = 1;
 
+#ifdef SO_REUSEPORT_LB
+
+                if (setsockopt(s, SOL_SOCKET, SO_REUSEPORT_LB,
+                               (const void *) &reuseport, sizeof(int))
+                    == -1)
+                {
+                    ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
+                                  "setsockopt(SO_REUSEPORT_LB) %V failed",
+                                  &ls[i].addr_text);
+
+                    if (ngx_close_socket(s) == -1) {
+                        ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
+                                      ngx_close_socket_n " %V failed",
+                                      &ls[i].addr_text);
+                    }
+
+                    return NGX_ERROR;
+                }
+
+#else
+
                 if (setsockopt(s, SOL_SOCKET, SO_REUSEPORT,
                                (const void *) &reuseport, sizeof(int))
                     == -1)
@@ -498,6 +556,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
 
                     return NGX_ERROR;
                 }
+#endif
             }
 #endif
 
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index e4dfe58..5405962 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -51,6 +51,9 @@ struct ngx_listening_s {
     ngx_listening_t    *previous;
     ngx_connection_t   *connection;
 
+    ngx_rbtree_t        rbtree;
+    ngx_rbtree_node_t   sentinel;
+
     ngx_uint_t          worker;
 
     unsigned            open:1;
@@ -151,6 +154,8 @@ struct ngx_connection_s {
     ngx_ssl_connection_t  *ssl;
 #endif
 
+    ngx_udp_connection_t  *udp;
+
     struct sockaddr    *local_sockaddr;
     socklen_t           local_socklen;
 
@@ -205,7 +210,7 @@ struct ngx_connection_s {
 
 ngx_listening_t *ngx_create_listening(ngx_conf_t *cf, struct sockaddr *sockaddr,
     socklen_t socklen);
-ngx_int_t ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls);
+ngx_int_t ngx_clone_listening(ngx_cycle_t *cycle, ngx_listening_t *ls);
 ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle);
 ngx_int_t ngx_open_listening_sockets(ngx_cycle_t *cycle);
 void ngx_configure_listening_sockets(ngx_cycle_t *cycle);
diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index 2069373..93ca917 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -27,6 +27,7 @@ typedef struct ngx_connection_s      ngx_connection_t;
 typedef struct ngx_thread_task_s     ngx_thread_task_t;
 typedef struct ngx_ssl_s             ngx_ssl_t;
 typedef struct ngx_ssl_connection_s  ngx_ssl_connection_t;
+typedef struct ngx_udp_connection_s  ngx_udp_connection_t;
 
 typedef void (*ngx_event_handler_pt)(ngx_event_t *ev);
 typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index f3ac24d..95f4bdf 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -843,6 +843,69 @@ failed:
         }
     }
 
+    /* free the newly created shared memory */
+
+    part = &cycle->shared_memory.part;
+    shm_zone = part->elts;
+
+    for (i = 0; /* void */ ; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+            part = part->next;
+            shm_zone = part->elts;
+            i = 0;
+        }
+
+        if (shm_zone[i].shm.addr == NULL) {
+            continue;
+        }
+
+        opart = &old_cycle->shared_memory.part;
+        oshm_zone = opart->elts;
+
+        for (n = 0; /* void */ ; n++) {
+
+            if (n >= opart->nelts) {
+                if (opart->next == NULL) {
+                    break;
+                }
+                opart = opart->next;
+                oshm_zone = opart->elts;
+                n = 0;
+            }
+
+            if (shm_zone[i].shm.name.len != oshm_zone[n].shm.name.len) {
+                continue;
+            }
+
+            if (ngx_strncmp(shm_zone[i].shm.name.data,
+                            oshm_zone[n].shm.name.data,
+                            shm_zone[i].shm.name.len)
+                != 0)
+            {
+                continue;
+            }
+
+            if (shm_zone[i].tag == oshm_zone[n].tag
+                && shm_zone[i].shm.size == oshm_zone[n].shm.size
+                && !shm_zone[i].noreuse)
+            {
+                goto old_shm_zone_found;
+            }
+
+            break;
+        }
+
+        ngx_shm_free(&shm_zone[i].shm);
+
+    old_shm_zone_found:
+
+        continue;
+    }
+
     if (ngx_test_config) {
         ngx_destroy_cycle_pools(&conf);
         return NULL;
@@ -921,7 +984,8 @@ ngx_init_zone_pool(ngx_cycle_t *cycle, ngx_shm_zone_t *zn)
 
 #else
 
-    file = ngx_pnalloc(cycle->pool, cycle->lock_file.len + zn->shm.name.len);
+    file = ngx_pnalloc(cycle->pool,
+                       cycle->lock_file.len + zn->shm.name.len + 1);
     if (file == NULL) {
         return NGX_ERROR;
     }
@@ -1273,6 +1337,7 @@ ngx_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name, size_t size, void *tag)
 
     shm_zone->data = NULL;
     shm_zone->shm.log = cf->cycle->log;
+    shm_zone->shm.addr = NULL;
     shm_zone->shm.size = size;
     shm_zone->shm.name = *name;
     shm_zone->shm.exists = 0;
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 3a94089..63ada85 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -796,10 +796,12 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf)
 {
     char             *buf;
     off_t             size;
+    time_t            time;
     size_t            len;
     ssize_t           n;
     ngx_fd_t          fd, nfd;
     ngx_int_t         rc;
+    ngx_uint_t        access;
     ngx_file_info_t   fi;
 
     rc = NGX_ERROR;
@@ -814,8 +816,10 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf)
         goto failed;
     }
 
-    if (cf->size != -1) {
+    if (cf->size != -1 && cf->access != 0 && cf->time != -1) {
         size = cf->size;
+        access = cf->access;
+        time = cf->time;
 
     } else {
         if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) {
@@ -825,7 +829,9 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf)
             goto failed;
         }
 
-        size = ngx_file_size(&fi);
+        size = (cf->size != -1) ? cf->size : ngx_file_size(&fi);
+        access = cf->access ? cf->access : ngx_file_access(&fi);
+        time = (cf->time != -1) ? cf->time : ngx_file_mtime(&fi);
     }
 
     len = cf->buf_size ? cf->buf_size : 65536;
@@ -839,8 +845,7 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf)
         goto failed;
     }
 
-    nfd = ngx_open_file(to, NGX_FILE_WRONLY, NGX_FILE_CREATE_OR_OPEN,
-                        cf->access);
+    nfd = ngx_open_file(to, NGX_FILE_WRONLY, NGX_FILE_TRUNCATE, access);
 
     if (nfd == NGX_INVALID_FILE) {
         ngx_log_error(NGX_LOG_CRIT, cf->log, ngx_errno,
@@ -887,12 +892,10 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf)
         size -= n;
     }
 
-    if (cf->time != -1) {
-        if (ngx_set_file_time(to, nfd, cf->time) != NGX_OK) {
-            ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
-                          ngx_set_file_time_n " \"%s\" failed", to);
-            goto failed;
-        }
+    if (ngx_set_file_time(to, nfd, time) != NGX_OK) {
+        ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
+                      ngx_set_file_time_n " \"%s\" failed", to);
+        goto failed;
     }
 
     rc = NGX_OK;
@@ -1014,13 +1017,13 @@ ngx_walk_tree(ngx_tree_ctx_t *ctx, ngx_str_t *tree)
 
         file.len = tree->len + 1 + len;
 
-        if (file.len + NGX_DIR_MASK_LEN > buf.len) {
+        if (file.len > buf.len) {
 
             if (buf.len) {
                 ngx_free(buf.data);
             }
 
-            buf.len = tree->len + 1 + len + NGX_DIR_MASK_LEN;
+            buf.len = tree->len + 1 + len;
 
             buf.data = ngx_alloc(buf.len + 1, ctx->log);
             if (buf.data == NULL) {
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index db48b93..4228504 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -12,6 +12,8 @@
 static ngx_int_t ngx_parse_unix_domain_url(ngx_pool_t *pool, ngx_url_t *u);
 static ngx_int_t ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u);
 static ngx_int_t ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u);
+static ngx_int_t ngx_inet_add_addr(ngx_pool_t *pool, ngx_url_t *u,
+    struct sockaddr *sockaddr, socklen_t socklen, ngx_uint_t total);
 
 
 in_addr_t
@@ -780,13 +782,10 @@ ngx_parse_unix_domain_url(ngx_pool_t *pool, ngx_url_t *u)
 static ngx_int_t
 ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
 {
-    u_char               *p, *host, *port, *last, *uri, *args;
-    size_t                len;
-    ngx_int_t             n;
-    struct sockaddr_in   *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6  *sin6;
-#endif
+    u_char              *host, *port, *last, *uri, *args, *dash;
+    size_t               len;
+    ngx_int_t            n;
+    struct sockaddr_in  *sin;
 
     u->socklen = sizeof(struct sockaddr_in);
     sin = (struct sockaddr_in *) &u->sockaddr;
@@ -831,6 +830,25 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
 
         len = last - port;
 
+        if (u->listen) {
+            dash = ngx_strlchr(port, last, '-');
+
+            if (dash) {
+                dash++;
+
+                n = ngx_atoi(dash, last - dash);
+
+                if (n < 1 || n > 65535) {
+                    u->err = "invalid port";
+                    return NGX_ERROR;
+                }
+
+                u->last_port = (in_port_t) n;
+
+                len = dash - port - 1;
+            }
+        }
+
         n = ngx_atoi(port, len);
 
         if (n < 1 || n > 65535) {
@@ -838,10 +856,15 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
             return NGX_ERROR;
         }
 
+        if (u->last_port && n > u->last_port) {
+            u->err = "invalid port range";
+            return NGX_ERROR;
+        }
+
         u->port = (in_port_t) n;
         sin->sin_port = htons((in_port_t) n);
 
-        u->port_text.len = len;
+        u->port_text.len = last - port;
         u->port_text.data = port;
 
         last = port - 1;
@@ -853,31 +876,69 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
 
                 /* test value as port only */
 
-                n = ngx_atoi(host, last - host);
+                len = last - host;
+
+                dash = ngx_strlchr(host, last, '-');
+
+                if (dash) {
+                    dash++;
+
+                    n = ngx_atoi(dash, last - dash);
+
+                    if (n == NGX_ERROR) {
+                        goto no_port;
+                    }
+
+                    if (n < 1 || n > 65535) {
+                        u->err = "invalid port";
+
+                    } else {
+                        u->last_port = (in_port_t) n;
+                    }
+
+                    len = dash - host - 1;
+                }
+
+                n = ngx_atoi(host, len);
 
                 if (n != NGX_ERROR) {
 
+                    if (u->err) {
+                        return NGX_ERROR;
+                    }
+
                     if (n < 1 || n > 65535) {
                         u->err = "invalid port";
                         return NGX_ERROR;
                     }
 
+                    if (u->last_port && n > u->last_port) {
+                        u->err = "invalid port range";
+                        return NGX_ERROR;
+                    }
+
                     u->port = (in_port_t) n;
                     sin->sin_port = htons((in_port_t) n);
+                    sin->sin_addr.s_addr = INADDR_ANY;
 
                     u->port_text.len = last - host;
                     u->port_text.data = host;
 
                     u->wildcard = 1;
 
-                    return NGX_OK;
+                    return ngx_inet_add_addr(pool, u, &u->sockaddr.sockaddr,
+                                             u->socklen, 1);
                 }
             }
         }
 
+no_port:
+
+        u->err = NULL;
         u->no_port = 1;
         u->port = u->default_port;
         sin->sin_port = htons(u->default_port);
+        u->last_port = 0;
     }
 
     len = last - host;
@@ -893,7 +954,7 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
     if (u->listen && len == 1 && *host == '*') {
         sin->sin_addr.s_addr = INADDR_ANY;
         u->wildcard = 1;
-        return NGX_OK;
+        return ngx_inet_add_addr(pool, u, &u->sockaddr.sockaddr, u->socklen, 1);
     }
 
     sin->sin_addr.s_addr = ngx_inet_addr(host, len);
@@ -904,33 +965,7 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
             u->wildcard = 1;
         }
 
-        u->naddrs = 1;
-
-        u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t));
-        if (u->addrs == NULL) {
-            return NGX_ERROR;
-        }
-
-        sin = ngx_pcalloc(pool, sizeof(struct sockaddr_in));
-        if (sin == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(sin, &u->sockaddr, sizeof(struct sockaddr_in));
-
-        u->addrs[0].sockaddr = (struct sockaddr *) sin;
-        u->addrs[0].socklen = sizeof(struct sockaddr_in);
-
-        p = ngx_pnalloc(pool, u->host.len + sizeof(":65535") - 1);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        u->addrs[0].name.len = ngx_sprintf(p, "%V:%d",
-                                           &u->host, u->port) - p;
-        u->addrs[0].name.data = p;
-
-        return NGX_OK;
+        return ngx_inet_add_addr(pool, u, &u->sockaddr.sockaddr, u->socklen, 1);
     }
 
     if (u->no_resolve) {
@@ -944,29 +979,7 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u)
     u->family = u->addrs[0].sockaddr->sa_family;
     u->socklen = u->addrs[0].socklen;
     ngx_memcpy(&u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen);
-
-    switch (u->family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) &u->sockaddr;
-
-        if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-            u->wildcard = 1;
-        }
-
-        break;
-#endif
-
-    default: /* AF_INET */
-        sin = (struct sockaddr_in *) &u->sockaddr;
-
-        if (sin->sin_addr.s_addr == INADDR_ANY) {
-            u->wildcard = 1;
-        }
-
-        break;
-    }
+    u->wildcard = ngx_inet_wildcard(&u->sockaddr.sockaddr);
 
     return NGX_OK;
 }
@@ -976,7 +989,7 @@ static ngx_int_t
 ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u)
 {
 #if (NGX_HAVE_INET6)
-    u_char               *p, *host, *port, *last, *uri;
+    u_char               *p, *host, *port, *last, *uri, *dash;
     size_t                len;
     ngx_int_t             n;
     struct sockaddr_in6  *sin6;
@@ -1022,6 +1035,25 @@ ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u)
 
         len = last - port;
 
+        if (u->listen) {
+            dash = ngx_strlchr(port, last, '-');
+
+            if (dash) {
+                dash++;
+
+                n = ngx_atoi(dash, last - dash);
+
+                if (n < 1 || n > 65535) {
+                    u->err = "invalid port";
+                    return NGX_ERROR;
+                }
+
+                u->last_port = (in_port_t) n;
+
+                len = dash - port - 1;
+            }
+        }
+
         n = ngx_atoi(port, len);
 
         if (n < 1 || n > 65535) {
@@ -1029,10 +1061,15 @@ ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u)
             return NGX_ERROR;
         }
 
+        if (u->last_port && n > u->last_port) {
+            u->err = "invalid port range";
+            return NGX_ERROR;
+        }
+
         u->port = (in_port_t) n;
         sin6->sin6_port = htons((in_port_t) n);
 
-        u->port_text.len = len;
+        u->port_text.len = last - port;
         u->port_text.data = port;
 
     } else {
@@ -1061,33 +1098,8 @@ ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u)
     }
 
     u->family = AF_INET6;
-    u->naddrs = 1;
 
-    u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t));
-    if (u->addrs == NULL) {
-        return NGX_ERROR;
-    }
-
-    sin6 = ngx_pcalloc(pool, sizeof(struct sockaddr_in6));
-    if (sin6 == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_memcpy(sin6, &u->sockaddr, sizeof(struct sockaddr_in6));
-
-    u->addrs[0].sockaddr = (struct sockaddr *) sin6;
-    u->addrs[0].socklen = sizeof(struct sockaddr_in6);
-
-    p = ngx_pnalloc(pool, u->host.len + sizeof(":65535") - 1);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    u->addrs[0].name.len = ngx_sprintf(p, "%V:%d",
-                                       &u->host, u->port) - p;
-    u->addrs[0].name.data = p;
-
-    return NGX_OK;
+    return ngx_inet_add_addr(pool, u, &u->sockaddr.sockaddr, u->socklen, 1);
 
 #else
 
@@ -1104,15 +1116,9 @@ ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u)
 ngx_int_t
 ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
 {
-    u_char               *p, *host;
-    size_t                len;
-    in_port_t             port;
-    ngx_uint_t            i;
-    struct addrinfo       hints, *res, *rp;
-    struct sockaddr_in   *sin;
-    struct sockaddr_in6  *sin6;
-
-    port = htons(u->port);
+    u_char           *host;
+    ngx_uint_t        n;
+    struct addrinfo   hints, *res, *rp;
 
     host = ngx_alloc(u->host.len + 1, pool->log);
     if (host == NULL) {
@@ -1136,7 +1142,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
 
     ngx_free(host);
 
-    for (i = 0, rp = res; rp != NULL; rp = rp->ai_next) {
+    for (n = 0, rp = res; rp != NULL; rp = rp->ai_next) {
 
         switch (rp->ai_family) {
 
@@ -1148,92 +1154,33 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
             continue;
         }
 
-        i++;
+        n++;
     }
 
-    if (i == 0) {
+    if (n == 0) {
         u->err = "host not found";
         goto failed;
     }
 
     /* MP: ngx_shared_palloc() */
 
-    u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_addr_t));
-    if (u->addrs == NULL) {
-        goto failed;
-    }
-
-    u->naddrs = i;
-
-    i = 0;
-
-    /* AF_INET addresses first */
-
     for (rp = res; rp != NULL; rp = rp->ai_next) {
 
-        if (rp->ai_family != AF_INET) {
+        switch (rp->ai_family) {
+
+        case AF_INET:
+        case AF_INET6:
+            break;
+
+        default:
             continue;
         }
 
-        sin = ngx_pcalloc(pool, rp->ai_addrlen);
-        if (sin == NULL) {
+        if (ngx_inet_add_addr(pool, u, rp->ai_addr, rp->ai_addrlen, n)
+            != NGX_OK)
+        {
             goto failed;
         }
-
-        ngx_memcpy(sin, rp->ai_addr, rp->ai_addrlen);
-
-        sin->sin_port = port;
-
-        u->addrs[i].sockaddr = (struct sockaddr *) sin;
-        u->addrs[i].socklen = rp->ai_addrlen;
-
-        len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
-
-        p = ngx_pnalloc(pool, len);
-        if (p == NULL) {
-            goto failed;
-        }
-
-        len = ngx_sock_ntop((struct sockaddr *) sin, rp->ai_addrlen, p, len, 1);
-
-        u->addrs[i].name.len = len;
-        u->addrs[i].name.data = p;
-
-        i++;
-    }
-
-    for (rp = res; rp != NULL; rp = rp->ai_next) {
-
-        if (rp->ai_family != AF_INET6) {
-            continue;
-        }
-
-        sin6 = ngx_pcalloc(pool, rp->ai_addrlen);
-        if (sin6 == NULL) {
-            goto failed;
-        }
-
-        ngx_memcpy(sin6, rp->ai_addr, rp->ai_addrlen);
-
-        sin6->sin6_port = port;
-
-        u->addrs[i].sockaddr = (struct sockaddr *) sin6;
-        u->addrs[i].socklen = rp->ai_addrlen;
-
-        len = NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1;
-
-        p = ngx_pnalloc(pool, len);
-        if (p == NULL) {
-            goto failed;
-        }
-
-        len = ngx_sock_ntop((struct sockaddr *) sin6, rp->ai_addrlen, p,
-                            len, 1);
-
-        u->addrs[i].name.len = len;
-        u->addrs[i].name.data = p;
-
-        i++;
     }
 
     freeaddrinfo(res);
@@ -1250,21 +1197,19 @@ failed:
 ngx_int_t
 ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
 {
-    u_char              *p, *host;
-    size_t               len;
-    in_port_t            port;
-    in_addr_t            in_addr;
-    ngx_uint_t           i;
+    u_char              *host;
+    ngx_uint_t           i, n;
     struct hostent      *h;
-    struct sockaddr_in  *sin;
+    struct sockaddr_in   sin;
 
     /* AF_INET only */
 
-    port = htons(u->port);
+    ngx_memzero(&sin, sizeof(struct sockaddr_in));
 
-    in_addr = ngx_inet_addr(u->host.data, u->host.len);
+    sin.sin_family = AF_INET;
+    sin.sin_addr.s_addr = ngx_inet_addr(u->host.data, u->host.len);
 
-    if (in_addr == INADDR_NONE) {
+    if (sin.sin_addr.s_addr == INADDR_NONE) {
         host = ngx_alloc(u->host.len + 1, pool->log);
         if (host == NULL) {
             return NGX_ERROR;
@@ -1281,76 +1226,31 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
             return NGX_ERROR;
         }
 
-        for (i = 0; h->h_addr_list[i] != NULL; i++) { /* void */ }
+        for (n = 0; h->h_addr_list[n] != NULL; n++) { /* void */ }
 
         /* MP: ngx_shared_palloc() */
 
-        u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_addr_t));
-        if (u->addrs == NULL) {
-            return NGX_ERROR;
-        }
+        for (i = 0; i < n; i++) {
+            sin.sin_addr.s_addr = *(in_addr_t *) (h->h_addr_list[i]);
 
-        u->naddrs = i;
-
-        for (i = 0; i < u->naddrs; i++) {
-
-            sin = ngx_pcalloc(pool, sizeof(struct sockaddr_in));
-            if (sin == NULL) {
+            if (ngx_inet_add_addr(pool, u, (struct sockaddr *) &sin,
+                                  sizeof(struct sockaddr_in), n)
+                != NGX_OK)
+            {
                 return NGX_ERROR;
             }
-
-            sin->sin_family = AF_INET;
-            sin->sin_port = port;
-            sin->sin_addr.s_addr = *(in_addr_t *) (h->h_addr_list[i]);
-
-            u->addrs[i].sockaddr = (struct sockaddr *) sin;
-            u->addrs[i].socklen = sizeof(struct sockaddr_in);
-
-            len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
-
-            p = ngx_pnalloc(pool, len);
-            if (p == NULL) {
-                return NGX_ERROR;
-            }
-
-            len = ngx_sock_ntop((struct sockaddr *) sin,
-                                sizeof(struct sockaddr_in), p, len, 1);
-
-            u->addrs[i].name.len = len;
-            u->addrs[i].name.data = p;
         }
 
     } else {
 
         /* MP: ngx_shared_palloc() */
 
-        u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t));
-        if (u->addrs == NULL) {
+        if (ngx_inet_add_addr(pool, u, (struct sockaddr *) &sin,
+                              sizeof(struct sockaddr_in), 1)
+            != NGX_OK)
+        {
             return NGX_ERROR;
         }
-
-        sin = ngx_pcalloc(pool, sizeof(struct sockaddr_in));
-        if (sin == NULL) {
-            return NGX_ERROR;
-        }
-
-        u->naddrs = 1;
-
-        sin->sin_family = AF_INET;
-        sin->sin_port = port;
-        sin->sin_addr.s_addr = in_addr;
-
-        u->addrs[0].sockaddr = (struct sockaddr *) sin;
-        u->addrs[0].socklen = sizeof(struct sockaddr_in);
-
-        p = ngx_pnalloc(pool, u->host.len + sizeof(":65535") - 1);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        u->addrs[0].name.len = ngx_sprintf(p, "%V:%d",
-                                           &u->host, ntohs(port)) - p;
-        u->addrs[0].name.data = p;
     }
 
     return NGX_OK;
@@ -1359,6 +1259,67 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
 #endif /* NGX_HAVE_GETADDRINFO && NGX_HAVE_INET6 */
 
 
+static ngx_int_t
+ngx_inet_add_addr(ngx_pool_t *pool, ngx_url_t *u, struct sockaddr *sockaddr,
+    socklen_t socklen, ngx_uint_t total)
+{
+    u_char           *p;
+    size_t            len;
+    ngx_uint_t        i, nports;
+    ngx_addr_t       *addr;
+    struct sockaddr  *sa;
+
+    nports = u->last_port ? u->last_port - u->port + 1 : 1;
+
+    if (u->addrs == NULL) {
+        u->addrs = ngx_palloc(pool, total * nports * sizeof(ngx_addr_t));
+        if (u->addrs == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    for (i = 0; i < nports; i++) {
+        sa = ngx_pcalloc(pool, socklen);
+        if (sa == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(sa, sockaddr, socklen);
+
+        ngx_inet_set_port(sa, u->port + i);
+
+        switch (sa->sa_family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            len = NGX_INET6_ADDRSTRLEN + sizeof("[]:65536") - 1;
+            break;
+#endif
+
+        default: /* AF_INET */
+            len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
+        }
+
+        p = ngx_pnalloc(pool, len);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        len = ngx_sock_ntop(sa, socklen, p, len, 1);
+
+        addr = &u->addrs[u->naddrs++];
+
+        addr->sockaddr = sa;
+        addr->socklen = socklen;
+
+        addr->name.len = len;
+        addr->name.data = p;
+    }
+
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
     struct sockaddr *sa2, socklen_t slen2, ngx_uint_t cmp_port)
@@ -1495,3 +1456,40 @@ ngx_inet_set_port(struct sockaddr *sa, in_port_t port)
         break;
     }
 }
+
+
+ngx_uint_t
+ngx_inet_wildcard(struct sockaddr *sa)
+{
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
+
+    switch (sa->sa_family) {
+
+    case AF_INET:
+        sin = (struct sockaddr_in *) sa;
+
+        if (sin->sin_addr.s_addr == INADDR_ANY) {
+            return 1;
+        }
+
+        break;
+
+#if (NGX_HAVE_INET6)
+
+    case AF_INET6:
+        sin6 = (struct sockaddr_in6 *) sa;
+
+        if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
+            return 1;
+        }
+
+        break;
+
+#endif
+    }
+
+    return 0;
+}
diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h
index a3b392e..19050fc 100644
--- a/src/core/ngx_inet.h
+++ b/src/core/ngx_inet.h
@@ -86,6 +86,7 @@ typedef struct {
 
     in_port_t                 port;
     in_port_t                 default_port;
+    in_port_t                 last_port;
     int                       family;
 
     unsigned                  listen:1;
@@ -125,6 +126,7 @@ ngx_int_t ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
     struct sockaddr *sa2, socklen_t slen2, ngx_uint_t cmp_port);
 in_port_t ngx_inet_get_port(struct sockaddr *sa);
 void ngx_inet_set_port(struct sockaddr *sa, in_port_t port);
+ngx_uint_t ngx_inet_wildcard(struct sockaddr *sa);
 
 
 #endif /* _NGX_INET_H_INCLUDED_ */
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index 7f5dc78..5c3dbe8 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -126,6 +126,26 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
                 continue;
             }
 
+            if (bsize < 0) {
+
+                ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0,
+                              "negative size buf in output "
+                              "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                              ctx->in->buf->temporary,
+                              ctx->in->buf->recycled,
+                              ctx->in->buf->in_file,
+                              ctx->in->buf->start,
+                              ctx->in->buf->pos,
+                              ctx->in->buf->last,
+                              ctx->in->buf->file,
+                              ctx->in->buf->file_pos,
+                              ctx->in->buf->file_last);
+
+                ngx_debug_point();
+
+                return NGX_ERROR;
+            }
+
             if (ngx_output_chain_as_is(ctx, ctx->in->buf)) {
 
                 /* move the chain link to the output chain */
@@ -665,7 +685,6 @@ ngx_chain_writer(void *data, ngx_chain_t *in)
 
     for (size = 0; in; in = in->next) {
 
-#if 1
         if (ngx_buf_size(in->buf) == 0 && !ngx_buf_special(in->buf)) {
 
             ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0,
@@ -685,7 +704,26 @@ ngx_chain_writer(void *data, ngx_chain_t *in)
 
             continue;
         }
-#endif
+
+        if (ngx_buf_size(in->buf) < 0) {
+
+            ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0,
+                          "negative size buf in chain writer "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          in->buf->temporary,
+                          in->buf->recycled,
+                          in->buf->in_file,
+                          in->buf->start,
+                          in->buf->pos,
+                          in->buf->last,
+                          in->buf->file,
+                          in->buf->file_pos,
+                          in->buf->file_last);
+
+            ngx_debug_point();
+
+            return NGX_ERROR;
+        }
 
         size += ngx_buf_size(in->buf);
 
@@ -709,7 +747,6 @@ ngx_chain_writer(void *data, ngx_chain_t *in)
 
     for (cl = ctx->out; cl; cl = cl->next) {
 
-#if 1
         if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) {
 
             ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0,
@@ -729,7 +766,26 @@ ngx_chain_writer(void *data, ngx_chain_t *in)
 
             continue;
         }
-#endif
+
+        if (ngx_buf_size(cl->buf) < 0) {
+
+            ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0,
+                          "negative size buf in chain writer "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          cl->buf->temporary,
+                          cl->buf->recycled,
+                          cl->buf->in_file,
+                          cl->buf->start,
+                          cl->buf->pos,
+                          cl->buf->last,
+                          cl->buf->file,
+                          cl->buf->file_pos,
+                          cl->buf->file_last);
+
+            ngx_debug_point();
+
+            return NGX_ERROR;
+        }
 
         size += ngx_buf_size(cl->buf);
     }
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index cd55520..593645d 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -141,25 +141,24 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
     ngx_pool_cleanup_t         *cln;
     ngx_resolver_connection_t  *rec;
 
+    r = ngx_pcalloc(cf->pool, sizeof(ngx_resolver_t));
+    if (r == NULL) {
+        return NULL;
+    }
+
+    r->event = ngx_pcalloc(cf->pool, sizeof(ngx_event_t));
+    if (r->event == NULL) {
+        return NULL;
+    }
+
     cln = ngx_pool_cleanup_add(cf->pool, 0);
     if (cln == NULL) {
         return NULL;
     }
 
     cln->handler = ngx_resolver_cleanup;
-
-    r = ngx_calloc(sizeof(ngx_resolver_t), cf->log);
-    if (r == NULL) {
-        return NULL;
-    }
-
     cln->data = r;
 
-    r->event = ngx_calloc(sizeof(ngx_event_t), cf->log);
-    if (r->event == NULL) {
-        return NULL;
-    }
-
     ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel,
                     ngx_resolver_rbtree_insert_value);
 
@@ -276,6 +275,11 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
         }
     }
 
+    if (n && r->connections.nelts == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "no name servers defined");
+        return NULL;
+    }
+
     return r;
 }
 
@@ -288,52 +292,42 @@ ngx_resolver_cleanup(void *data)
     ngx_uint_t                  i;
     ngx_resolver_connection_t  *rec;
 
-    if (r) {
-        ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,
-                       "cleanup resolver");
+    ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, "cleanup resolver");
 
-        ngx_resolver_cleanup_tree(r, &r->name_rbtree);
+    ngx_resolver_cleanup_tree(r, &r->name_rbtree);
 
-        ngx_resolver_cleanup_tree(r, &r->srv_rbtree);
+    ngx_resolver_cleanup_tree(r, &r->srv_rbtree);
 
-        ngx_resolver_cleanup_tree(r, &r->addr_rbtree);
+    ngx_resolver_cleanup_tree(r, &r->addr_rbtree);
 
 #if (NGX_HAVE_INET6)
-        ngx_resolver_cleanup_tree(r, &r->addr6_rbtree);
+    ngx_resolver_cleanup_tree(r, &r->addr6_rbtree);
 #endif
 
-        if (r->event) {
-            if (r->event->timer_set) {
-                ngx_del_timer(r->event);
-            }
+    if (r->event->timer_set) {
+        ngx_del_timer(r->event);
+    }
 
-            ngx_free(r->event);
+    rec = r->connections.elts;
+
+    for (i = 0; i < r->connections.nelts; i++) {
+        if (rec[i].udp) {
+            ngx_close_connection(rec[i].udp);
         }
 
-
-        rec = r->connections.elts;
-
-        for (i = 0; i < r->connections.nelts; i++) {
-            if (rec[i].udp) {
-                ngx_close_connection(rec[i].udp);
-            }
-
-            if (rec[i].tcp) {
-                ngx_close_connection(rec[i].tcp);
-            }
-
-            if (rec[i].read_buf) {
-                ngx_resolver_free(r, rec[i].read_buf->start);
-                ngx_resolver_free(r, rec[i].read_buf);
-            }
-
-            if (rec[i].write_buf) {
-                ngx_resolver_free(r, rec[i].write_buf->start);
-                ngx_resolver_free(r, rec[i].write_buf);
-            }
+        if (rec[i].tcp) {
+            ngx_close_connection(rec[i].tcp);
         }
 
-        ngx_free(r);
+        if (rec[i].read_buf) {
+            ngx_resolver_free(r, rec[i].read_buf->start);
+            ngx_resolver_free(r, rec[i].read_buf);
+        }
+
+        if (rec[i].write_buf) {
+            ngx_resolver_free(r, rec[i].write_buf->start);
+            ngx_resolver_free(r, rec[i].write_buf);
+        }
     }
 }
 
@@ -853,7 +847,15 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
     rn->nsrvs = 0;
 
     if (ngx_resolver_send_query(r, rn) != NGX_OK) {
-        goto failed;
+
+        /* immediately retry once on failure */
+
+        rn->last_connection++;
+        if (rn->last_connection == r->connections.nelts) {
+            rn->last_connection = 0;
+        }
+
+        (void) ngx_resolver_send_query(r, rn);
     }
 
     if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
@@ -1057,7 +1059,15 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
     rn->nsrvs = 0;
 
     if (ngx_resolver_send_query(r, rn) != NGX_OK) {
-        goto failed;
+
+        /* immediately retry once on failure */
+
+        rn->last_connection++;
+        if (rn->last_connection == r->connections.nelts) {
+            rn->last_connection = 0;
+        }
+
+        (void) ngx_resolver_send_query(r, rn);
     }
 
     if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
@@ -1299,16 +1309,23 @@ ngx_resolver_send_udp_query(ngx_resolver_t *r, ngx_resolver_connection_t  *rec,
 
     n = ngx_send(rec->udp, query, qlen);
 
-    if (n == -1) {
-        return NGX_ERROR;
+    if (n == NGX_ERROR) {
+        goto failed;
     }
 
     if ((size_t) n != (size_t) qlen) {
         ngx_log_error(NGX_LOG_CRIT, &rec->log, 0, "send() incomplete");
-        return NGX_ERROR;
+        goto failed;
     }
 
     return NGX_OK;
+
+failed:
+
+    ngx_close_connection(rec->udp);
+    rec->udp = NULL;
+
+    return NGX_ERROR;
 }
 
 
@@ -4249,7 +4266,15 @@ ngx_resolver_report_srv(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
     }
 
     if (naddrs == 0) {
-        ctx->state = NGX_RESOLVE_NXDOMAIN;
+        ctx->state = srvs[0].state;
+
+        for (i = 0; i < nsrvs; i++) {
+            if (srvs[i].state == NGX_RESOLVE_NXDOMAIN) {
+                ctx->state = NGX_RESOLVE_NXDOMAIN;
+                break;
+            }
+        }
+
         ctx->valid = ngx_time() + (r->valid ? r->valid : 10);
 
         ctx->handler(ctx);
@@ -4395,7 +4420,7 @@ ngx_udp_connect(ngx_resolver_connection_t *rec)
     if (c == NULL) {
         if (ngx_close_socket(s) == -1) {
             ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
-                          ngx_close_socket_n "failed");
+                          ngx_close_socket_n " failed");
         }
 
         return NGX_ERROR;
@@ -4481,7 +4506,7 @@ ngx_tcp_connect(ngx_resolver_connection_t *rec)
     if (c == NULL) {
         if (ngx_close_socket(s) == -1) {
             ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
-                          ngx_close_socket_n "failed");
+                          ngx_close_socket_n " failed");
         }
 
         return NGX_ERROR;
@@ -4546,7 +4571,7 @@ ngx_tcp_connect(ngx_resolver_connection_t *rec)
                 level = NGX_LOG_CRIT;
             }
 
-            ngx_log_error(level, c->log, err, "connect() to %V failed",
+            ngx_log_error(level, &rec->log, err, "connect() to %V failed",
                           &rec->server);
 
             ngx_close_connection(c);
diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
index 4023870..b8577ce 100644
--- a/src/core/ngx_slab.c
+++ b/src/core/ngx_slab.c
@@ -635,10 +635,9 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
             goto fail;
         }
 
-        n = ((u_char *) p - pool->start) >> ngx_pagesize_shift;
         size = slab & ~NGX_SLAB_PAGE_START;
 
-        ngx_slab_free_pages(pool, &pool->pages[n], size);
+        ngx_slab_free_pages(pool, page, size);
 
         ngx_slab_junk(p, size << ngx_pagesize_shift);
 
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 2ee07bf..468e960 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -1381,7 +1381,7 @@ ngx_utf8_length(u_char *p, size_t n)
             continue;
         }
 
-        if (ngx_utf8_decode(&p, n) > 0x10ffff) {
+        if (ngx_utf8_decode(&p, last - p) > 0x10ffff) {
             /* invalid UTF-8 */
             return n;
         }
@@ -2013,6 +2013,14 @@ ngx_sort(void *base, size_t n, size_t size,
 }
 
 
+void
+ngx_explicit_memzero(void *buf, size_t n)
+{
+    ngx_memzero(buf, n);
+    ngx_memory_barrier();
+}
+
+
 #if (NGX_MEMCPY_LIMIT)
 
 void *
diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 882ae7c..0fb9be7 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -88,6 +88,8 @@ ngx_strlchr(u_char *p, u_char *last, u_char c)
 #define ngx_memzero(buf, n)       (void) memset(buf, 0, n)
 #define ngx_memset(buf, c, n)     (void) memset(buf, c, n)
 
+void ngx_explicit_memzero(void *buf, size_t n);
+
 
 #if (NGX_MEMCPY_LIMIT)
 
diff --git a/src/core/ngx_syslog.c b/src/core/ngx_syslog.c
index 0a67928..3c7b63a 100644
--- a/src/core/ngx_syslog.c
+++ b/src/core/ngx_syslog.c
@@ -39,7 +39,8 @@ static ngx_event_t  ngx_syslog_dummy_event;
 char *
 ngx_syslog_process_conf(ngx_conf_t *cf, ngx_syslog_peer_t *peer)
 {
-    peer->pool = cf->pool;
+    ngx_pool_cleanup_t  *cln;
+
     peer->facility = NGX_CONF_UNSET_UINT;
     peer->severity = NGX_CONF_UNSET_UINT;
 
@@ -67,6 +68,19 @@ ngx_syslog_process_conf(ngx_conf_t *cf, ngx_syslog_peer_t *peer)
 
     peer->conn.fd = (ngx_socket_t) -1;
 
+    peer->conn.read = &ngx_syslog_dummy_event;
+    peer->conn.write = &ngx_syslog_dummy_event;
+
+    ngx_syslog_dummy_event.log = &ngx_syslog_dummy_log;
+
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    cln->data = peer;
+    cln->handler = ngx_syslog_cleanup;
+
     return NGX_CONF_OK;
 }
 
@@ -289,9 +303,7 @@ ngx_syslog_send(ngx_syslog_peer_t *peer, u_char *buf, size_t len)
         n = ngx_os_io.send(&peer->conn, buf, len);
     }
 
-#if (NGX_HAVE_UNIX_DOMAIN)
-
-    if (n == NGX_ERROR && peer->server.sockaddr->sa_family == AF_UNIX) {
+    if (n == NGX_ERROR) {
 
         if (ngx_close_socket(peer->conn.fd) == -1) {
             ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
@@ -301,8 +313,6 @@ ngx_syslog_send(ngx_syslog_peer_t *peer, u_char *buf, size_t len)
         peer->conn.fd = (ngx_socket_t) -1;
     }
 
-#endif
-
     return n;
 }
 
@@ -310,13 +320,7 @@ ngx_syslog_send(ngx_syslog_peer_t *peer, u_char *buf, size_t len)
 static ngx_int_t
 ngx_syslog_init_peer(ngx_syslog_peer_t *peer)
 {
-    ngx_socket_t         fd;
-    ngx_pool_cleanup_t  *cln;
-
-    peer->conn.read = &ngx_syslog_dummy_event;
-    peer->conn.write = &ngx_syslog_dummy_event;
-
-    ngx_syslog_dummy_event.log = &ngx_syslog_dummy_log;
+    ngx_socket_t  fd;
 
     fd = ngx_socket(peer->server.sockaddr->sa_family, SOCK_DGRAM, 0);
     if (fd == (ngx_socket_t) -1) {
@@ -337,14 +341,6 @@ ngx_syslog_init_peer(ngx_syslog_peer_t *peer)
         goto failed;
     }
 
-    cln = ngx_pool_cleanup_add(peer->pool, 0);
-    if (cln == NULL) {
-        goto failed;
-    }
-
-    cln->data = peer;
-    cln->handler = ngx_syslog_cleanup;
-
     peer->conn.fd = fd;
 
     /* UDP sockets are always ready to write */
diff --git a/src/core/ngx_syslog.h b/src/core/ngx_syslog.h
index cc4c842..50dcd35 100644
--- a/src/core/ngx_syslog.h
+++ b/src/core/ngx_syslog.h
@@ -9,7 +9,6 @@
 
 
 typedef struct {
-    ngx_pool_t       *pool;
     ngx_uint_t        facility;
     ngx_uint_t        severity;
     ngx_str_t         tag;
diff --git a/src/core/ngx_times.h b/src/core/ngx_times.h
index 94aedcd..49e0a8c 100644
--- a/src/core/ngx_times.h
+++ b/src/core/ngx_times.h
@@ -43,8 +43,8 @@ extern volatile ngx_str_t    ngx_cached_http_log_iso8601;
 extern volatile ngx_str_t    ngx_cached_syslog_time;
 
 /*
- * milliseconds elapsed since epoch and truncated to ngx_msec_t,
- * used in event timers
+ * milliseconds elapsed since some unspecified point in the past
+ * and truncated to ngx_msec_t, used in event timers
  */
 extern volatile ngx_msec_t  ngx_current_msec;
 
diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c
index 01cfc97..11ad093 100644
--- a/src/event/modules/ngx_eventport_module.c
+++ b/src/event/modules/ngx_eventport_module.c
@@ -250,9 +250,7 @@ ngx_eventport_init(ngx_cycle_t *cycle, ngx_msec_t timer)
 
         ngx_memzero(&sev, sizeof(struct sigevent));
         sev.sigev_notify = SIGEV_PORT;
-#if !(NGX_TEST_BUILD_EVENTPORT)
         sev.sigev_value.sival_ptr = &pn;
-#endif
 
         if (timer_create(CLOCK_REALTIME, &sev, &event_timer) == -1) {
             ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 4e03dab..b46ab53 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -84,7 +84,7 @@ ngx_poll_init(ngx_cycle_t *cycle, ngx_msec_t timer)
         }
 
         if (event_list) {
-            ngx_memcpy(list, event_list, sizeof(ngx_event_t *) * nevents);
+            ngx_memcpy(list, event_list, sizeof(struct pollfd) * nevents);
             ngx_free(event_list);
         }
 
diff --git a/src/event/modules/ngx_win32_poll_module.c b/src/event/modules/ngx_win32_poll_module.c
new file mode 100644
index 0000000..9fe867f
--- /dev/null
+++ b/src/event/modules/ngx_win32_poll_module.c
@@ -0,0 +1,435 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Maxim Dounin
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+static ngx_int_t ngx_poll_init(ngx_cycle_t *cycle, ngx_msec_t timer);
+static void ngx_poll_done(ngx_cycle_t *cycle);
+static ngx_int_t ngx_poll_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_poll_del_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
+    ngx_uint_t flags);
+static char *ngx_poll_init_conf(ngx_cycle_t *cycle, void *conf);
+
+
+static struct pollfd      *event_list;
+static ngx_connection_t  **event_index;
+static ngx_uint_t          nevents;
+
+
+static ngx_str_t           poll_name = ngx_string("poll");
+
+static ngx_event_module_t  ngx_poll_module_ctx = {
+    &poll_name,
+    NULL,                                  /* create configuration */
+    ngx_poll_init_conf,                    /* init configuration */
+
+    {
+        ngx_poll_add_event,                /* add an event */
+        ngx_poll_del_event,                /* delete an event */
+        ngx_poll_add_event,                /* enable an event */
+        ngx_poll_del_event,                /* disable an event */
+        NULL,                              /* add an connection */
+        NULL,                              /* delete an connection */
+        NULL,                              /* trigger a notify */
+        ngx_poll_process_events,           /* process the events */
+        ngx_poll_init,                     /* init the events */
+        ngx_poll_done                      /* done the events */
+    }
+
+};
+
+ngx_module_t  ngx_poll_module = {
+    NGX_MODULE_V1,
+    &ngx_poll_module_ctx,                  /* module context */
+    NULL,                                  /* module directives */
+    NGX_EVENT_MODULE,                      /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+
+static ngx_int_t
+ngx_poll_init(ngx_cycle_t *cycle, ngx_msec_t timer)
+{
+    struct pollfd      *list;
+    ngx_connection_t  **index;
+
+    if (event_list == NULL) {
+        nevents = 0;
+    }
+
+    if (ngx_process >= NGX_PROCESS_WORKER
+        || cycle->old_cycle == NULL
+        || cycle->old_cycle->connection_n < cycle->connection_n)
+    {
+        list = ngx_alloc(sizeof(struct pollfd) * cycle->connection_n,
+                         cycle->log);
+        if (list == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (event_list) {
+            ngx_memcpy(list, event_list, sizeof(struct pollfd) * nevents);
+            ngx_free(event_list);
+        }
+
+        event_list = list;
+
+        index = ngx_alloc(sizeof(ngx_connection_t *) * cycle->connection_n,
+                          cycle->log);
+        if (index == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (event_index) {
+            ngx_memcpy(index, event_index,
+                       sizeof(ngx_connection_t *) * nevents);
+            ngx_free(event_index);
+        }
+
+        event_index = index;
+    }
+
+    ngx_io = ngx_os_io;
+
+    ngx_event_actions = ngx_poll_module_ctx.actions;
+
+    ngx_event_flags = NGX_USE_LEVEL_EVENT;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_poll_done(ngx_cycle_t *cycle)
+{
+    ngx_free(event_list);
+    ngx_free(event_index);
+
+    event_list = NULL;
+    event_index = NULL;
+}
+
+
+static ngx_int_t
+ngx_poll_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
+{
+    ngx_event_t       *e;
+    ngx_connection_t  *c;
+
+    c = ev->data;
+
+    ev->active = 1;
+
+    if (ev->index != NGX_INVALID_INDEX) {
+        ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
+                      "poll event fd:%d ev:%i is already set", c->fd, event);
+        return NGX_OK;
+    }
+
+    if (event == NGX_READ_EVENT) {
+        e = c->write;
+#if (NGX_READ_EVENT != POLLIN)
+        event = POLLIN;
+#endif
+
+    } else {
+        e = c->read;
+#if (NGX_WRITE_EVENT != POLLOUT)
+        event = POLLOUT;
+#endif
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                   "poll add event: fd:%d ev:%i", c->fd, event);
+
+    if (e == NULL || e->index == NGX_INVALID_INDEX) {
+
+        event_list[nevents].fd = c->fd;
+        event_list[nevents].events = (short) event;
+        event_list[nevents].revents = 0;
+
+        event_index[nevents] = c;
+
+        ev->index = nevents;
+        nevents++;
+
+    } else {
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                       "poll add index: %i", e->index);
+
+        event_list[e->index].events |= (short) event;
+        ev->index = e->index;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_poll_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
+{
+    ngx_event_t       *e;
+    ngx_connection_t  *c;
+
+    c = ev->data;
+
+    ev->active = 0;
+
+    if (ev->index == NGX_INVALID_INDEX) {
+        ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
+                      "poll event fd:%d ev:%i is already deleted",
+                      c->fd, event);
+        return NGX_OK;
+    }
+
+    if (event == NGX_READ_EVENT) {
+        e = c->write;
+#if (NGX_READ_EVENT != POLLIN)
+        event = POLLIN;
+#endif
+
+    } else {
+        e = c->read;
+#if (NGX_WRITE_EVENT != POLLOUT)
+        event = POLLOUT;
+#endif
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                   "poll del event: fd:%d ev:%i", c->fd, event);
+
+    if (e == NULL || e->index == NGX_INVALID_INDEX) {
+        nevents--;
+
+        if (ev->index < nevents) {
+
+            ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                           "index: copy event %ui to %i", nevents, ev->index);
+
+            event_list[ev->index] = event_list[nevents];
+            event_index[ev->index] = event_index[nevents];
+
+            c = event_index[ev->index];
+
+            if (c->fd == (ngx_socket_t) -1) {
+                ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
+                              "unexpected last event");
+
+            } else {
+                if (c->read->index == nevents) {
+                    c->read->index = ev->index;
+                }
+
+                if (c->write->index == nevents) {
+                    c->write->index = ev->index;
+                }
+            }
+        }
+
+    } else {
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                       "poll del index: %i", e->index);
+
+        event_list[e->index].events &= (short) ~event;
+    }
+
+    ev->index = NGX_INVALID_INDEX;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
+{
+    int                 ready, revents;
+    ngx_err_t           err;
+    ngx_uint_t          i, found;
+    ngx_event_t        *ev;
+    ngx_queue_t        *queue;
+    ngx_connection_t   *c;
+
+    /* NGX_TIMER_INFINITE == INFTIM */
+
+#if (NGX_DEBUG0)
+    if (cycle->log->log_level & NGX_LOG_DEBUG_ALL) {
+        for (i = 0; i < nevents; i++) {
+            ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                           "poll: %ui: fd:%d ev:%04Xd",
+                           i, event_list[i].fd, event_list[i].events);
+        }
+    }
+#endif
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "poll timer: %M", timer);
+
+    ready = WSAPoll(event_list, (u_int) nevents, (int) timer);
+
+    err = (ready == -1) ? ngx_errno : 0;
+
+    if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) {
+        ngx_time_update();
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                   "poll ready %d of %ui", ready, nevents);
+
+    if (err) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, err, "WSAPoll() failed");
+        return NGX_ERROR;
+    }
+
+    if (ready == 0) {
+        if (timer != NGX_TIMER_INFINITE) {
+            return NGX_OK;
+        }
+
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                      "WSAPoll() returned no events without timeout");
+        return NGX_ERROR;
+    }
+
+    for (i = 0; i < nevents && ready; i++) {
+
+        revents = event_list[i].revents;
+
+#if 1
+        ngx_log_debug4(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                       "poll: %ui: fd:%d ev:%04Xd rev:%04Xd",
+                       i, event_list[i].fd, event_list[i].events, revents);
+#else
+        if (revents) {
+            ngx_log_debug4(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                           "poll: %ui: fd:%d ev:%04Xd rev:%04Xd",
+                           i, event_list[i].fd, event_list[i].events, revents);
+        }
+#endif
+
+        if (revents & POLLNVAL) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                          "poll() error fd:%d ev:%04Xd rev:%04Xd",
+                          event_list[i].fd, event_list[i].events, revents);
+        }
+
+        if (revents & ~(POLLIN|POLLOUT|POLLERR|POLLHUP|POLLNVAL)) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                          "strange poll() events fd:%d ev:%04Xd rev:%04Xd",
+                          event_list[i].fd, event_list[i].events, revents);
+        }
+
+        if (event_list[i].fd == (ngx_socket_t) -1) {
+            /*
+             * the disabled event, a workaround for our possible bug,
+             * see the comment below
+             */
+            continue;
+        }
+
+        c = event_index[i];
+
+        if (c->fd == (ngx_socket_t) -1) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "unexpected event");
+
+            /*
+             * it is certainly our fault and it should be investigated,
+             * in the meantime we disable this event to avoid a CPU spinning
+             */
+
+            if (i == nevents - 1) {
+                nevents--;
+            } else {
+                event_list[i].fd = (ngx_socket_t) -1;
+            }
+
+            continue;
+        }
+
+        if (revents & (POLLERR|POLLHUP|POLLNVAL)) {
+
+            /*
+             * if the error events were returned, add POLLIN and POLLOUT
+             * to handle the events at least in one active handler
+             */
+
+            revents |= POLLIN|POLLOUT;
+        }
+
+        found = 0;
+
+        if ((revents & POLLIN) && c->read->active) {
+            found = 1;
+
+            ev = c->read;
+            ev->ready = 1;
+
+            queue = ev->accept ? &ngx_posted_accept_events
+                               : &ngx_posted_events;
+
+            ngx_post_event(ev, queue);
+        }
+
+        if ((revents & POLLOUT) && c->write->active) {
+            found = 1;
+
+            ev = c->write;
+            ev->ready = 1;
+
+            ngx_post_event(ev, &ngx_posted_events);
+        }
+
+        if (found) {
+            ready--;
+            continue;
+        }
+    }
+
+    if (ready != 0) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "poll ready != events");
+    }
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_poll_init_conf(ngx_cycle_t *cycle, void *conf)
+{
+    ngx_event_conf_t  *ecf;
+
+    ecf = ngx_event_get_conf(cycle->conf_ctx, ngx_event_core_module);
+
+    if (ecf->use != ngx_poll_module.ctx_index) {
+        return NGX_CONF_OK;
+    }
+
+#if (NGX_LOAD_WSAPOLL)
+
+    if (!ngx_have_wsapoll) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+                      "poll is not available on this platform");
+        return NGX_CONF_ERROR;
+    }
+
+#endif
+
+    return NGX_CONF_OK;
+}
diff --git a/src/event/modules/ngx_win32_select_module.c b/src/event/modules/ngx_win32_select_module.c
index a98a83f..8093a60 100644
--- a/src/event/modules/ngx_win32_select_module.c
+++ b/src/event/modules/ngx_win32_select_module.c
@@ -26,6 +26,7 @@ static fd_set         master_read_fd_set;
 static fd_set         master_write_fd_set;
 static fd_set         work_read_fd_set;
 static fd_set         work_write_fd_set;
+static fd_set         work_except_fd_set;
 
 static ngx_uint_t     max_read;
 static ngx_uint_t     max_write;
@@ -251,9 +252,11 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
     work_read_fd_set = master_read_fd_set;
     work_write_fd_set = master_write_fd_set;
+    work_except_fd_set = master_write_fd_set;
 
     if (max_read || max_write) {
-        ready = select(0, &work_read_fd_set, &work_write_fd_set, NULL, tp);
+        ready = select(0, &work_read_fd_set, &work_write_fd_set,
+                       &work_except_fd_set, tp);
 
     } else {
 
@@ -306,14 +309,20 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
         if (ev->write) {
             if (FD_ISSET(c->fd, &work_write_fd_set)) {
-                found = 1;
+                found++;
                 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                                "select write %d", c->fd);
             }
 
+            if (FD_ISSET(c->fd, &work_except_fd_set)) {
+                found++;
+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                               "select except %d", c->fd);
+            }
+
         } else {
             if (FD_ISSET(c->fd, &work_read_fd_set)) {
-                found = 1;
+                found++;
                 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                                "select read %d", c->fd);
             }
@@ -327,7 +336,7 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
             ngx_post_event(ev, queue);
 
-            nready++;
+            nready += found;
         }
     }
 
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 57af813..69c55d7 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -410,12 +410,52 @@ ngx_handle_write_event(ngx_event_t *wev, size_t lowat)
 static char *
 ngx_event_init_conf(ngx_cycle_t *cycle, void *conf)
 {
+#if (NGX_HAVE_REUSEPORT)
+    ngx_uint_t        i;
+    ngx_listening_t  *ls;
+#endif
+
     if (ngx_get_conf(cycle->conf_ctx, ngx_events_module) == NULL) {
         ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
                       "no \"events\" section in configuration");
         return NGX_CONF_ERROR;
     }
 
+    if (cycle->connection_n < cycle->listening.nelts + 1) {
+
+        /*
+         * there should be at least one connection for each listening
+         * socket, plus an additional connection for channel
+         */
+
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+                      "%ui worker_connections are not enough "
+                      "for %ui listening sockets",
+                      cycle->connection_n, cycle->listening.nelts);
+
+        return NGX_CONF_ERROR;
+    }
+
+#if (NGX_HAVE_REUSEPORT)
+
+    ls = cycle->listening.elts;
+    for (i = 0; i < cycle->listening.nelts; i++) {
+
+        if (!ls[i].reuseport || ls[i].worker != 0) {
+            continue;
+        }
+
+        if (ngx_clone_listening(cycle, &ls[i]) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+
+        /* cloning may change cycle->listening.elts */
+
+        ls = cycle->listening.elts;
+    }
+
+#endif
+
     return NGX_CONF_OK;
 }
 
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 19fec68..bb77c4a 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -499,16 +499,23 @@ extern ngx_module_t           ngx_event_core_module;
 
 
 #define ngx_event_get_conf(conf_ctx, module)                                  \
-             (*(ngx_get_conf(conf_ctx, ngx_events_module))) [module.ctx_index];
+             (*(ngx_get_conf(conf_ctx, ngx_events_module))) [module.ctx_index]
 
 
 
 void ngx_event_accept(ngx_event_t *ev);
 #if !(NGX_WIN32)
 void ngx_event_recvmsg(ngx_event_t *ev);
+void ngx_udp_rbtree_insert_value(ngx_rbtree_node_t *temp,
+    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
 #endif
+void ngx_delete_udp_connection(void *data);
 ngx_int_t ngx_trylock_accept_mutex(ngx_cycle_t *cycle);
+ngx_int_t ngx_enable_accept_events(ngx_cycle_t *cycle);
 u_char *ngx_accept_log_error(ngx_log_t *log, u_char *buf, size_t len);
+#if (NGX_DEBUG)
+void ngx_debug_accepted_connection(ngx_event_conf_t *ecf, ngx_connection_t *c);
+#endif
 
 
 void ngx_process_events_and_timers(ngx_cycle_t *cycle);
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 7e9f742..4364240 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -10,13 +10,8 @@
 #include <ngx_event.h>
 
 
-static ngx_int_t ngx_enable_accept_events(ngx_cycle_t *cycle);
 static ngx_int_t ngx_disable_accept_events(ngx_cycle_t *cycle, ngx_uint_t all);
 static void ngx_close_accepted_connection(ngx_connection_t *c);
-#if (NGX_DEBUG)
-static void ngx_debug_accepted_connection(ngx_event_conf_t *ecf,
-    ngx_connection_t *c);
-#endif
 
 
 void
@@ -320,341 +315,6 @@ ngx_event_accept(ngx_event_t *ev)
 }
 
 
-#if !(NGX_WIN32)
-
-void
-ngx_event_recvmsg(ngx_event_t *ev)
-{
-    ssize_t            n;
-    ngx_log_t         *log;
-    ngx_err_t          err;
-    ngx_event_t       *rev, *wev;
-    struct iovec       iov[1];
-    struct msghdr      msg;
-    ngx_sockaddr_t     sa;
-    ngx_listening_t   *ls;
-    ngx_event_conf_t  *ecf;
-    ngx_connection_t  *c, *lc;
-    static u_char      buffer[65535];
-
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
-
-#if (NGX_HAVE_IP_RECVDSTADDR)
-    u_char             msg_control[CMSG_SPACE(sizeof(struct in_addr))];
-#elif (NGX_HAVE_IP_PKTINFO)
-    u_char             msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))];
-#endif
-
-#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
-    u_char             msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
-#endif
-
-#endif
-
-    if (ev->timedout) {
-        if (ngx_enable_accept_events((ngx_cycle_t *) ngx_cycle) != NGX_OK) {
-            return;
-        }
-
-        ev->timedout = 0;
-    }
-
-    ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module);
-
-    if (!(ngx_event_flags & NGX_USE_KQUEUE_EVENT)) {
-        ev->available = ecf->multi_accept;
-    }
-
-    lc = ev->data;
-    ls = lc->listening;
-    ev->ready = 0;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "recvmsg on %V, ready: %d", &ls->addr_text, ev->available);
-
-    do {
-        ngx_memzero(&msg, sizeof(struct msghdr));
-
-        iov[0].iov_base = (void *) buffer;
-        iov[0].iov_len = sizeof(buffer);
-
-        msg.msg_name = &sa;
-        msg.msg_namelen = sizeof(ngx_sockaddr_t);
-        msg.msg_iov = iov;
-        msg.msg_iovlen = 1;
-
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
-
-        if (ls->wildcard) {
-
-#if (NGX_HAVE_IP_RECVDSTADDR || NGX_HAVE_IP_PKTINFO)
-            if (ls->sockaddr->sa_family == AF_INET) {
-                msg.msg_control = &msg_control;
-                msg.msg_controllen = sizeof(msg_control);
-            }
-#endif
-
-#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
-            if (ls->sockaddr->sa_family == AF_INET6) {
-                msg.msg_control = &msg_control6;
-                msg.msg_controllen = sizeof(msg_control6);
-            }
-#endif
-        }
-
-#endif
-
-        n = recvmsg(lc->fd, &msg, 0);
-
-        if (n == -1) {
-            err = ngx_socket_errno;
-
-            if (err == NGX_EAGAIN) {
-                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, err,
-                               "recvmsg() not ready");
-                return;
-            }
-
-            ngx_log_error(NGX_LOG_ALERT, ev->log, err, "recvmsg() failed");
-
-            return;
-        }
-
-#if (NGX_STAT_STUB)
-        (void) ngx_atomic_fetch_add(ngx_stat_accepted, 1);
-#endif
-
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
-        if (msg.msg_flags & (MSG_TRUNC|MSG_CTRUNC)) {
-            ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
-                          "recvmsg() truncated data");
-            continue;
-        }
-#endif
-
-        ngx_accept_disabled = ngx_cycle->connection_n / 8
-                              - ngx_cycle->free_connection_n;
-
-        c = ngx_get_connection(lc->fd, ev->log);
-        if (c == NULL) {
-            return;
-        }
-
-        c->shared = 1;
-        c->type = SOCK_DGRAM;
-        c->socklen = msg.msg_namelen;
-
-        if (c->socklen > (socklen_t) sizeof(ngx_sockaddr_t)) {
-            c->socklen = sizeof(ngx_sockaddr_t);
-        }
-
-        if (c->socklen == 0) {
-
-            /*
-             * on Linux recvmsg() returns zero msg_namelen
-             * when receiving packets from unbound AF_UNIX sockets
-             */
-
-            c->socklen = sizeof(struct sockaddr);
-            ngx_memzero(&sa, sizeof(struct sockaddr));
-            sa.sockaddr.sa_family = ls->sockaddr->sa_family;
-        }
-
-#if (NGX_STAT_STUB)
-        (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
-#endif
-
-        c->pool = ngx_create_pool(ls->pool_size, ev->log);
-        if (c->pool == NULL) {
-            ngx_close_accepted_connection(c);
-            return;
-        }
-
-        c->sockaddr = ngx_palloc(c->pool, c->socklen);
-        if (c->sockaddr == NULL) {
-            ngx_close_accepted_connection(c);
-            return;
-        }
-
-        ngx_memcpy(c->sockaddr, msg.msg_name, c->socklen);
-
-        log = ngx_palloc(c->pool, sizeof(ngx_log_t));
-        if (log == NULL) {
-            ngx_close_accepted_connection(c);
-            return;
-        }
-
-        *log = ls->log;
-
-        c->send = ngx_udp_send;
-        c->send_chain = ngx_udp_send_chain;
-
-        c->log = log;
-        c->pool->log = log;
-
-        c->listening = ls;
-        c->local_sockaddr = ls->sockaddr;
-        c->local_socklen = ls->socklen;
-
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
-
-        if (ls->wildcard) {
-            struct cmsghdr   *cmsg;
-            struct sockaddr  *sockaddr;
-
-            sockaddr = ngx_palloc(c->pool, c->local_socklen);
-            if (sockaddr == NULL) {
-                ngx_close_accepted_connection(c);
-                return;
-            }
-
-            ngx_memcpy(sockaddr, c->local_sockaddr, c->local_socklen);
-            c->local_sockaddr = sockaddr;
-
-            for (cmsg = CMSG_FIRSTHDR(&msg);
-                 cmsg != NULL;
-                 cmsg = CMSG_NXTHDR(&msg, cmsg))
-            {
-
-#if (NGX_HAVE_IP_RECVDSTADDR)
-
-                if (cmsg->cmsg_level == IPPROTO_IP
-                    && cmsg->cmsg_type == IP_RECVDSTADDR
-                    && sockaddr->sa_family == AF_INET)
-                {
-                    struct in_addr      *addr;
-                    struct sockaddr_in  *sin;
-
-                    addr = (struct in_addr *) CMSG_DATA(cmsg);
-                    sin = (struct sockaddr_in *) sockaddr;
-                    sin->sin_addr = *addr;
-
-                    break;
-                }
-
-#elif (NGX_HAVE_IP_PKTINFO)
-
-                if (cmsg->cmsg_level == IPPROTO_IP
-                    && cmsg->cmsg_type == IP_PKTINFO
-                    && sockaddr->sa_family == AF_INET)
-                {
-                    struct in_pktinfo   *pkt;
-                    struct sockaddr_in  *sin;
-
-                    pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
-                    sin = (struct sockaddr_in *) sockaddr;
-                    sin->sin_addr = pkt->ipi_addr;
-
-                    break;
-                }
-
-#endif
-
-#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
-
-                if (cmsg->cmsg_level == IPPROTO_IPV6
-                    && cmsg->cmsg_type == IPV6_PKTINFO
-                    && sockaddr->sa_family == AF_INET6)
-                {
-                    struct in6_pktinfo   *pkt6;
-                    struct sockaddr_in6  *sin6;
-
-                    pkt6 = (struct in6_pktinfo *) CMSG_DATA(cmsg);
-                    sin6 = (struct sockaddr_in6 *) sockaddr;
-                    sin6->sin6_addr = pkt6->ipi6_addr;
-
-                    break;
-                }
-
-#endif
-
-            }
-        }
-
-#endif
-
-        c->buffer = ngx_create_temp_buf(c->pool, n);
-        if (c->buffer == NULL) {
-            ngx_close_accepted_connection(c);
-            return;
-        }
-
-        c->buffer->last = ngx_cpymem(c->buffer->last, buffer, n);
-
-        rev = c->read;
-        wev = c->write;
-
-        wev->ready = 1;
-
-        rev->log = log;
-        wev->log = log;
-
-        /*
-         * TODO: MT: - ngx_atomic_fetch_add()
-         *             or protection by critical section or light mutex
-         *
-         * TODO: MP: - allocated in a shared memory
-         *           - ngx_atomic_fetch_add()
-         *             or protection by critical section or light mutex
-         */
-
-        c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
-
-#if (NGX_STAT_STUB)
-        (void) ngx_atomic_fetch_add(ngx_stat_handled, 1);
-#endif
-
-        if (ls->addr_ntop) {
-            c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
-            if (c->addr_text.data == NULL) {
-                ngx_close_accepted_connection(c);
-                return;
-            }
-
-            c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->socklen,
-                                             c->addr_text.data,
-                                             ls->addr_text_max_len, 0);
-            if (c->addr_text.len == 0) {
-                ngx_close_accepted_connection(c);
-                return;
-            }
-        }
-
-#if (NGX_DEBUG)
-        {
-        ngx_str_t  addr;
-        u_char     text[NGX_SOCKADDR_STRLEN];
-
-        ngx_debug_accepted_connection(ecf, c);
-
-        if (log->log_level & NGX_LOG_DEBUG_EVENT) {
-            addr.data = text;
-            addr.len = ngx_sock_ntop(c->sockaddr, c->socklen, text,
-                                     NGX_SOCKADDR_STRLEN, 1);
-
-            ngx_log_debug4(NGX_LOG_DEBUG_EVENT, log, 0,
-                           "*%uA recvmsg: %V fd:%d n:%z",
-                           c->number, &addr, c->fd, n);
-        }
-
-        }
-#endif
-
-        log->data = NULL;
-        log->handler = NULL;
-
-        ls->handler(c);
-
-        if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
-            ev->available -= n;
-        }
-
-    } while (ev->available);
-}
-
-#endif
-
-
 ngx_int_t
 ngx_trylock_accept_mutex(ngx_cycle_t *cycle)
 {
@@ -693,7 +353,7 @@ ngx_trylock_accept_mutex(ngx_cycle_t *cycle)
 }
 
 
-static ngx_int_t
+ngx_int_t
 ngx_enable_accept_events(ngx_cycle_t *cycle)
 {
     ngx_uint_t         i;
@@ -768,7 +428,7 @@ ngx_close_accepted_connection(ngx_connection_t *c)
     fd = c->fd;
     c->fd = (ngx_socket_t) -1;
 
-    if (!c->shared && ngx_close_socket(fd) == -1) {
+    if (ngx_close_socket(fd) == -1) {
         ngx_log_error(NGX_LOG_ALERT, c->log, ngx_socket_errno,
                       ngx_close_socket_n " failed");
     }
@@ -793,7 +453,7 @@ ngx_accept_log_error(ngx_log_t *log, u_char *buf, size_t len)
 
 #if (NGX_DEBUG)
 
-static void
+void
 ngx_debug_accepted_connection(ngx_event_conf_t *ecf, ngx_connection_t *c)
 {
     struct sockaddr_in   *sin;
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index e7f28c9..1ffa798 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -20,7 +20,7 @@ static ngx_int_t ngx_event_connect_set_transparent(ngx_peer_connection_t *pc,
 ngx_int_t
 ngx_event_connect_peer(ngx_peer_connection_t *pc)
 {
-    int                rc, type;
+    int                rc, type, value;
 #if (NGX_HAVE_IP_BIND_ADDRESS_NO_PORT || NGX_LINUX)
     in_port_t          port;
 #endif
@@ -55,7 +55,7 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
     if (c == NULL) {
         if (ngx_close_socket(s) == -1) {
             ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
-                          ngx_close_socket_n "failed");
+                          ngx_close_socket_n " failed");
         }
 
         return NGX_ERROR;
@@ -73,6 +73,18 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
         }
     }
 
+    if (pc->so_keepalive) {
+        value = 1;
+
+        if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,
+                       (const void *) &value, sizeof(int))
+            == -1)
+        {
+            ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
+                          "setsockopt(SO_KEEPALIVE) failed, ignored");
+        }
+    }
+
     if (ngx_nonblocking(s) == -1) {
         ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
                       ngx_nonblocking_n " failed");
diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h
index 72d21d7..d3b2378 100644
--- a/src/event/ngx_event_connect.h
+++ b/src/event/ngx_event_connect.h
@@ -62,6 +62,8 @@ struct ngx_peer_connection_s {
 
     unsigned                         cached:1;
     unsigned                         transparent:1;
+    unsigned                         so_keepalive:1;
+    unsigned                         down:1;
 
                                      /* ngx_connection_log_error_e */
     unsigned                         log_error:2;
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index c4b51b5..7be4fb4 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -18,15 +18,35 @@ typedef struct {
 } ngx_openssl_conf_t;
 
 
+static X509 *ngx_ssl_load_certificate(ngx_pool_t *pool, char **err,
+    ngx_str_t *cert, STACK_OF(X509) **chain);
+static EVP_PKEY *ngx_ssl_load_certificate_key(ngx_pool_t *pool, char **err,
+    ngx_str_t *key, ngx_array_t *passwords);
 static int ngx_ssl_password_callback(char *buf, int size, int rwflag,
     void *userdata);
 static int ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store);
 static void ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where,
     int ret);
 static void ngx_ssl_passwords_cleanup(void *data);
+static int ngx_ssl_new_client_session(ngx_ssl_conn_t *ssl_conn,
+    ngx_ssl_session_t *sess);
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+static ngx_int_t ngx_ssl_try_early_data(ngx_connection_t *c);
+#endif
+#if (NGX_DEBUG)
+static void ngx_ssl_handshake_log(ngx_connection_t *c);
+#endif
 static void ngx_ssl_handshake_handler(ngx_event_t *ev);
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+static ssize_t ngx_ssl_recv_early(ngx_connection_t *c, u_char *buf,
+    size_t size);
+#endif
 static ngx_int_t ngx_ssl_handle_recv(ngx_connection_t *c, int n);
 static void ngx_ssl_write_handler(ngx_event_t *wev);
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+static ssize_t ngx_ssl_write_early(ngx_connection_t *c, u_char *data,
+    size_t size);
+#endif
 static void ngx_ssl_read_handler(ngx_event_t *rev);
 static void ngx_ssl_shutdown_handler(ngx_event_t *ev);
 static void ngx_ssl_connection_error(ngx_connection_t *c, int sslerr,
@@ -34,8 +54,7 @@ static void ngx_ssl_connection_error(ngx_connection_t *c, int sslerr,
 static void ngx_ssl_clear_error(ngx_log_t *log);
 
 static ngx_int_t ngx_ssl_session_id_context(ngx_ssl_t *ssl,
-    ngx_str_t *sess_ctx);
-ngx_int_t ngx_ssl_session_cache_init(ngx_shm_zone_t *shm_zone, void *data);
+    ngx_str_t *sess_ctx, ngx_array_t *certificates);
 static int ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn,
     ngx_ssl_session_t *sess);
 static ngx_ssl_session_t *ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn,
@@ -53,6 +72,7 @@ static void ngx_ssl_session_rbtree_insert_value(ngx_rbtree_node_t *temp,
 static int ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     unsigned char *name, unsigned char *iv, EVP_CIPHER_CTX *ectx,
     HMAC_CTX *hctx, int enc);
+static void ngx_ssl_session_ticket_keys_cleanup(void *data);
 #endif
 
 #ifndef X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT
@@ -344,6 +364,14 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
     SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_COMPRESSION);
 #endif
 
+#ifdef SSL_OP_NO_ANTI_REPLAY
+    SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_ANTI_REPLAY);
+#endif
+
+#ifdef SSL_OP_NO_CLIENT_RENEGOTIATION
+    SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_CLIENT_RENEGOTIATION);
+#endif
+
 #ifdef SSL_MODE_RELEASE_BUFFERS
     SSL_CTX_set_mode(ssl->ctx, SSL_MODE_RELEASE_BUFFERS);
 #endif
@@ -387,34 +415,19 @@ ngx_int_t
 ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
     ngx_str_t *key, ngx_array_t *passwords)
 {
-    BIO         *bio;
-    X509        *x509;
-    u_long       n;
-    ngx_str_t   *pwd;
-    ngx_uint_t   tries;
+    char            *err;
+    X509            *x509;
+    EVP_PKEY        *pkey;
+    STACK_OF(X509)  *chain;
 
-    if (ngx_conf_full_name(cf->cycle, cert, 1) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    /*
-     * we can't use SSL_CTX_use_certificate_chain_file() as it doesn't
-     * allow to access certificate later from SSL_CTX, so we reimplement
-     * it here
-     */
-
-    bio = BIO_new_file((char *) cert->data, "r");
-    if (bio == NULL) {
-        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "BIO_new_file(\"%s\") failed", cert->data);
-        return NGX_ERROR;
-    }
-
-    x509 = PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL);
+    x509 = ngx_ssl_load_certificate(cf->pool, &err, cert, &chain);
     if (x509 == NULL) {
-        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "PEM_read_bio_X509_AUX(\"%s\") failed", cert->data);
-        BIO_free(bio);
+        if (err != NULL) {
+            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                          "cannot load certificate \"%s\": %s",
+                          cert->data, err);
+        }
+
         return NGX_ERROR;
     }
 
@@ -422,7 +435,7 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                       "SSL_CTX_use_certificate(\"%s\") failed", cert->data);
         X509_free(x509);
-        BIO_free(bio);
+        sk_X509_pop_free(chain, X509_free);
         return NGX_ERROR;
     }
 
@@ -431,7 +444,7 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
     {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0, "X509_set_ex_data() failed");
         X509_free(x509);
-        BIO_free(bio);
+        sk_X509_pop_free(chain, X509_free);
         return NGX_ERROR;
     }
 
@@ -441,26 +454,211 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
     {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0, "X509_set_ex_data() failed");
         X509_free(x509);
-        BIO_free(bio);
+        sk_X509_pop_free(chain, X509_free);
         return NGX_ERROR;
     }
 
-    if (SSL_CTX_set_ex_data(ssl->ctx, ngx_ssl_certificate_index, x509)
-        == 0)
-    {
+    if (SSL_CTX_set_ex_data(ssl->ctx, ngx_ssl_certificate_index, x509) == 0) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                       "SSL_CTX_set_ex_data() failed");
         X509_free(x509);
-        BIO_free(bio);
+        sk_X509_pop_free(chain, X509_free);
         return NGX_ERROR;
     }
 
-    /* read rest of the chain */
+    /*
+     * Note that x509 is not freed here, but will be instead freed in
+     * ngx_ssl_cleanup_ctx().  This is because we need to preserve all
+     * certificates to be able to iterate all of them through exdata
+     * (ngx_ssl_certificate_index, ngx_ssl_next_certificate_index),
+     * while OpenSSL can free a certificate if it is replaced with another
+     * certificate of the same type.
+     */
+
+#ifdef SSL_CTX_set0_chain
+
+    if (SSL_CTX_set0_chain(ssl->ctx, chain) == 0) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CTX_set0_chain(\"%s\") failed", cert->data);
+        sk_X509_pop_free(chain, X509_free);
+        return NGX_ERROR;
+    }
+
+#else
+    {
+    int  n;
+
+    /* SSL_CTX_set0_chain() is only available in OpenSSL 1.0.2+ */
+
+    n = sk_X509_num(chain);
+
+    while (n--) {
+        x509 = sk_X509_shift(chain);
+
+        if (SSL_CTX_add_extra_chain_cert(ssl->ctx, x509) == 0) {
+            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                          "SSL_CTX_add_extra_chain_cert(\"%s\") failed",
+                          cert->data);
+            sk_X509_pop_free(chain, X509_free);
+            return NGX_ERROR;
+        }
+    }
+
+    sk_X509_free(chain);
+    }
+#endif
+
+    pkey = ngx_ssl_load_certificate_key(cf->pool, &err, key, passwords);
+    if (pkey == NULL) {
+        if (err != NULL) {
+            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                          "cannot load certificate key \"%s\": %s",
+                          key->data, err);
+        }
+
+        return NGX_ERROR;
+    }
+
+    if (SSL_CTX_use_PrivateKey(ssl->ctx, pkey) == 0) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CTX_use_PrivateKey(\"%s\") failed", key->data);
+        EVP_PKEY_free(pkey);
+        return NGX_ERROR;
+    }
+
+    EVP_PKEY_free(pkey);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_connection_certificate(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *cert, ngx_str_t *key, ngx_array_t *passwords)
+{
+    char            *err;
+    X509            *x509;
+    EVP_PKEY        *pkey;
+    STACK_OF(X509)  *chain;
+
+    x509 = ngx_ssl_load_certificate(pool, &err, cert, &chain);
+    if (x509 == NULL) {
+        if (err != NULL) {
+            ngx_ssl_error(NGX_LOG_ERR, c->log, 0,
+                          "cannot load certificate \"%s\": %s",
+                          cert->data, err);
+        }
+
+        return NGX_ERROR;
+    }
+
+    if (SSL_use_certificate(c->ssl->connection, x509) == 0) {
+        ngx_ssl_error(NGX_LOG_ERR, c->log, 0,
+                      "SSL_use_certificate(\"%s\") failed", cert->data);
+        X509_free(x509);
+        sk_X509_pop_free(chain, X509_free);
+        return NGX_ERROR;
+    }
+
+    X509_free(x509);
+
+#ifdef SSL_set0_chain
+
+    /*
+     * SSL_set0_chain() is only available in OpenSSL 1.0.2+,
+     * but this function is only called via certificate callback,
+     * which is only available in OpenSSL 1.0.2+ as well
+     */
+
+    if (SSL_set0_chain(c->ssl->connection, chain) == 0) {
+        ngx_ssl_error(NGX_LOG_ERR, c->log, 0,
+                      "SSL_set0_chain(\"%s\") failed", cert->data);
+        sk_X509_pop_free(chain, X509_free);
+        return NGX_ERROR;
+    }
+
+#endif
+
+    pkey = ngx_ssl_load_certificate_key(pool, &err, key, passwords);
+    if (pkey == NULL) {
+        if (err != NULL) {
+            ngx_ssl_error(NGX_LOG_ERR, c->log, 0,
+                          "cannot load certificate key \"%s\": %s",
+                          key->data, err);
+        }
+
+        return NGX_ERROR;
+    }
+
+    if (SSL_use_PrivateKey(c->ssl->connection, pkey) == 0) {
+        ngx_ssl_error(NGX_LOG_ERR, c->log, 0,
+                      "SSL_use_PrivateKey(\"%s\") failed", key->data);
+        EVP_PKEY_free(pkey);
+        return NGX_ERROR;
+    }
+
+    EVP_PKEY_free(pkey);
+
+    return NGX_OK;
+}
+
+
+static X509 *
+ngx_ssl_load_certificate(ngx_pool_t *pool, char **err, ngx_str_t *cert,
+    STACK_OF(X509) **chain)
+{
+    BIO     *bio;
+    X509    *x509, *temp;
+    u_long   n;
+
+    if (ngx_strncmp(cert->data, "data:", sizeof("data:") - 1) == 0) {
+
+        bio = BIO_new_mem_buf(cert->data + sizeof("data:") - 1,
+                              cert->len - (sizeof("data:") - 1));
+        if (bio == NULL) {
+            *err = "BIO_new_mem_buf() failed";
+            return NULL;
+        }
+
+    } else {
+
+        if (ngx_get_full_name(pool, (ngx_str_t *) &ngx_cycle->conf_prefix, cert)
+            != NGX_OK)
+        {
+            *err = NULL;
+            return NULL;
+        }
+
+        bio = BIO_new_file((char *) cert->data, "r");
+        if (bio == NULL) {
+            *err = "BIO_new_file() failed";
+            return NULL;
+        }
+    }
+
+    /* certificate itself */
+
+    x509 = PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL);
+    if (x509 == NULL) {
+        *err = "PEM_read_bio_X509_AUX() failed";
+        BIO_free(bio);
+        return NULL;
+    }
+
+    /* rest of the chain */
+
+    *chain = sk_X509_new_null();
+    if (*chain == NULL) {
+        *err = "sk_X509_new_null() failed";
+        BIO_free(bio);
+        X509_free(x509);
+        return NULL;
+    }
 
     for ( ;; ) {
 
-        x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
-        if (x509 == NULL) {
+        temp = PEM_read_bio_X509(bio, NULL, NULL, NULL);
+        if (temp == NULL) {
             n = ERR_peek_last_error();
 
             if (ERR_GET_LIB(n) == ERR_LIB_PEM
@@ -473,58 +671,51 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
 
             /* some real error */
 
-            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                          "PEM_read_bio_X509(\"%s\") failed", cert->data);
+            *err = "PEM_read_bio_X509() failed";
             BIO_free(bio);
-            return NGX_ERROR;
-        }
-
-#ifdef SSL_CTRL_CHAIN_CERT
-
-        /*
-         * SSL_CTX_add0_chain_cert() is needed to add chain to
-         * a particular certificate when multiple certificates are used;
-         * only available in OpenSSL 1.0.2+
-         */
-
-        if (SSL_CTX_add0_chain_cert(ssl->ctx, x509) == 0) {
-            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                          "SSL_CTX_add0_chain_cert(\"%s\") failed",
-                          cert->data);
             X509_free(x509);
-            BIO_free(bio);
-            return NGX_ERROR;
+            sk_X509_pop_free(*chain, X509_free);
+            return NULL;
         }
 
-#else
-        if (SSL_CTX_add_extra_chain_cert(ssl->ctx, x509) == 0) {
-            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                          "SSL_CTX_add_extra_chain_cert(\"%s\") failed",
-                          cert->data);
-            X509_free(x509);
+        if (sk_X509_push(*chain, temp) == 0) {
+            *err = "sk_X509_push() failed";
             BIO_free(bio);
-            return NGX_ERROR;
+            X509_free(x509);
+            sk_X509_pop_free(*chain, X509_free);
+            return NULL;
         }
-#endif
     }
 
     BIO_free(bio);
 
+    return x509;
+}
+
+
+static EVP_PKEY *
+ngx_ssl_load_certificate_key(ngx_pool_t *pool, char **err,
+    ngx_str_t *key, ngx_array_t *passwords)
+{
+    BIO              *bio;
+    EVP_PKEY         *pkey;
+    ngx_str_t        *pwd;
+    ngx_uint_t        tries;
+    pem_password_cb  *cb;
+
     if (ngx_strncmp(key->data, "engine:", sizeof("engine:") - 1) == 0) {
 
 #ifndef OPENSSL_NO_ENGINE
 
-        u_char      *p, *last;
-        ENGINE      *engine;
-        EVP_PKEY    *pkey;
+        u_char  *p, *last;
+        ENGINE  *engine;
 
         p = key->data + sizeof("engine:") - 1;
         last = (u_char *) ngx_strchr(p, ':');
 
         if (last == NULL) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid syntax in \"%V\"", key);
-            return NGX_ERROR;
+            *err = "invalid syntax";
+            return NULL;
         }
 
         *last = '\0';
@@ -532,9 +723,8 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
         engine = ENGINE_by_id((char *) p);
 
         if (engine == NULL) {
-            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                          "ENGINE_by_id(\"%s\") failed", p);
-            return NGX_ERROR;
+            *err = "ENGINE_by_id() failed";
+            return NULL;
         }
 
         *last++ = ':';
@@ -542,76 +732,81 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
         pkey = ENGINE_load_private_key(engine, (char *) last, 0, 0);
 
         if (pkey == NULL) {
-            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                          "ENGINE_load_private_key(\"%s\") failed", last);
+            *err = "ENGINE_load_private_key() failed";
             ENGINE_free(engine);
-            return NGX_ERROR;
+            return NULL;
         }
 
         ENGINE_free(engine);
 
-        if (SSL_CTX_use_PrivateKey(ssl->ctx, pkey) == 0) {
-            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                          "SSL_CTX_use_PrivateKey(\"%s\") failed", last);
-            EVP_PKEY_free(pkey);
-            return NGX_ERROR;
-        }
-
-        EVP_PKEY_free(pkey);
-
-        return NGX_OK;
+        return pkey;
 
 #else
 
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "loading \"engine:...\" certificate keys "
-                           "is not supported");
-        return NGX_ERROR;
+        *err = "loading \"engine:...\" certificate keys is not supported";
+        return NULL;
 
 #endif
     }
 
-    if (ngx_conf_full_name(cf->cycle, key, 1) != NGX_OK) {
-        return NGX_ERROR;
+    if (ngx_strncmp(key->data, "data:", sizeof("data:") - 1) == 0) {
+
+        bio = BIO_new_mem_buf(key->data + sizeof("data:") - 1,
+                              key->len - (sizeof("data:") - 1));
+        if (bio == NULL) {
+            *err = "BIO_new_mem_buf() failed";
+            return NULL;
+        }
+
+    } else {
+
+        if (ngx_get_full_name(pool, (ngx_str_t *) &ngx_cycle->conf_prefix, key)
+            != NGX_OK)
+        {
+            *err = NULL;
+            return NULL;
+        }
+
+        bio = BIO_new_file((char *) key->data, "r");
+        if (bio == NULL) {
+            *err = "BIO_new_file() failed";
+            return NULL;
+        }
     }
 
     if (passwords) {
         tries = passwords->nelts;
         pwd = passwords->elts;
-
-        SSL_CTX_set_default_passwd_cb(ssl->ctx, ngx_ssl_password_callback);
-        SSL_CTX_set_default_passwd_cb_userdata(ssl->ctx, pwd);
+        cb = ngx_ssl_password_callback;
 
     } else {
         tries = 1;
-#if (NGX_SUPPRESS_WARN)
         pwd = NULL;
-#endif
+        cb = NULL;
     }
 
     for ( ;; ) {
 
-        if (SSL_CTX_use_PrivateKey_file(ssl->ctx, (char *) key->data,
-                                        SSL_FILETYPE_PEM)
-            != 0)
-        {
+        pkey = PEM_read_bio_PrivateKey(bio, NULL, cb, pwd);
+        if (pkey != NULL) {
             break;
         }
 
-        if (--tries) {
+        if (tries-- > 1) {
             ERR_clear_error();
-            SSL_CTX_set_default_passwd_cb_userdata(ssl->ctx, ++pwd);
+            (void) BIO_reset(bio);
+            pwd++;
             continue;
         }
 
-        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "SSL_CTX_use_PrivateKey_file(\"%s\") failed", key->data);
-        return NGX_ERROR;
+        *err = "PEM_read_bio_PrivateKey() failed";
+        BIO_free(bio);
+        return NULL;
     }
 
-    SSL_CTX_set_default_passwd_cb(ssl->ctx, NULL);
+    BIO_free(bio);
 
-    return NGX_OK;
+    return pkey;
 }
 
 
@@ -626,6 +821,10 @@ ngx_ssl_password_callback(char *buf, int size, int rwflag, void *userdata)
         return 0;
     }
 
+    if (pwd == NULL) {
+        return 0;
+    }
+
     if (pwd->len > (size_t) size) {
         ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
                       "password is truncated to %d bytes", size);
@@ -847,6 +1046,8 @@ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
     BIO               *rbio, *wbio;
     ngx_connection_t  *c;
 
+#ifndef SSL_OP_NO_RENEGOTIATION
+
     if ((where & SSL_CB_HANDSHAKE_START)
         && SSL_is_server((ngx_ssl_conn_t *) ssl_conn))
     {
@@ -858,6 +1059,8 @@ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
         }
     }
 
+#endif
+
     if ((where & SSL_CB_ACCEPT_LOOP) == SSL_CB_ACCEPT_LOOP) {
         c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
 
@@ -923,10 +1126,13 @@ ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file)
         return NULL;
     }
 
-    cln = ngx_pool_cleanup_add(cf->temp_pool, 0);
     passwords = ngx_array_create(cf->temp_pool, 4, sizeof(ngx_str_t));
+    if (passwords == NULL) {
+        return NULL;
+    }
 
-    if (cln == NULL || passwords == NULL) {
+    cln = ngx_pool_cleanup_add(cf->temp_pool, 0);
+    if (cln == NULL) {
         return NULL;
     }
 
@@ -1028,12 +1234,75 @@ cleanup:
                            ngx_close_file_n " \"%s\" failed", file->data);
     }
 
-    ngx_memzero(buf, NGX_SSL_PASSWORD_BUFFER_SIZE);
+    ngx_explicit_memzero(buf, NGX_SSL_PASSWORD_BUFFER_SIZE);
 
     return passwords;
 }
 
 
+ngx_array_t *
+ngx_ssl_preserve_passwords(ngx_conf_t *cf, ngx_array_t *passwords)
+{
+    ngx_str_t           *opwd, *pwd;
+    ngx_uint_t           i;
+    ngx_array_t         *pwds;
+    ngx_pool_cleanup_t  *cln;
+    static ngx_array_t   empty_passwords;
+
+    if (passwords == NULL) {
+
+        /*
+         * If there are no passwords, an empty array is used
+         * to make sure OpenSSL's default password callback
+         * won't block on reading from stdin.
+         */
+
+        return &empty_passwords;
+    }
+
+    /*
+     * Passwords are normally allocated from the temporary pool
+     * and cleared after parsing configuration.  To be used at
+     * runtime they have to be copied to the configuration pool.
+     */
+
+    pwds = ngx_array_create(cf->pool, passwords->nelts, sizeof(ngx_str_t));
+    if (pwds == NULL) {
+        return NULL;
+    }
+
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NULL;
+    }
+
+    cln->handler = ngx_ssl_passwords_cleanup;
+    cln->data = pwds;
+
+    opwd = passwords->elts;
+
+    for (i = 0; i < passwords->nelts; i++) {
+
+        pwd = ngx_array_push(pwds);
+        if (pwd == NULL) {
+            return NULL;
+        }
+
+        pwd->len = opwd[i].len;
+        pwd->data = ngx_pnalloc(cf->pool, pwd->len);
+
+        if (pwd->data == NULL) {
+            pwds->nelts--;
+            return NULL;
+        }
+
+        ngx_memcpy(pwd->data, opwd[i].data, opwd[i].len);
+    }
+
+    return pwds;
+}
+
+
 static void
 ngx_ssl_passwords_cleanup(void *data)
 {
@@ -1045,7 +1314,7 @@ ngx_ssl_passwords_cleanup(void *data)
     pwd = passwords->elts;
 
     for (i = 0; i < passwords->nelts; i++) {
-        ngx_memzero(pwd[i].data, pwd[i].len);
+        ngx_explicit_memzero(pwd[i].data, pwd[i].len);
     }
 }
 
@@ -1172,6 +1441,71 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
 }
 
 
+ngx_int_t
+ngx_ssl_early_data(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_uint_t enable)
+{
+    if (!enable) {
+        return NGX_OK;
+    }
+
+#ifdef SSL_ERROR_EARLY_DATA_REJECTED
+
+    /* BoringSSL */
+
+    SSL_CTX_set_early_data_enabled(ssl->ctx, 1);
+
+#elif defined SSL_READ_EARLY_DATA_SUCCESS
+
+    /* OpenSSL */
+
+    SSL_CTX_set_max_early_data(ssl->ctx, NGX_SSL_BUFSIZE);
+
+#else
+    ngx_log_error(NGX_LOG_WARN, ssl->log, 0,
+                  "\"ssl_early_data\" is not supported on this platform, "
+                  "ignored");
+#endif
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_client_session_cache(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_uint_t enable)
+{
+    if (!enable) {
+        return NGX_OK;
+    }
+
+    SSL_CTX_set_session_cache_mode(ssl->ctx,
+                                   SSL_SESS_CACHE_CLIENT
+                                   |SSL_SESS_CACHE_NO_INTERNAL);
+
+    SSL_CTX_sess_set_new_cb(ssl->ctx, ngx_ssl_new_client_session);
+
+    return NGX_OK;
+}
+
+
+static int
+ngx_ssl_new_client_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
+{
+    ngx_connection_t  *c;
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    if (c->ssl->save_session) {
+        c->ssl->session = sess;
+
+        c->ssl->save_session(c);
+
+        c->ssl->session = NULL;
+    }
+
+    return 0;
+}
+
+
 ngx_int_t
 ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags)
 {
@@ -1187,6 +1521,12 @@ ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags)
 
     sc->session_ctx = ssl->ctx;
 
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+    if (SSL_CTX_get_max_early_data(ssl->ctx)) {
+        sc->try_early_data = 1;
+    }
+#endif
+
     sc->connection = SSL_new(ssl->ctx);
 
     if (sc->connection == NULL) {
@@ -1204,6 +1544,10 @@ ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags)
 
     } else {
         SSL_set_accept_state(sc->connection);
+
+#ifdef SSL_OP_NO_RENEGOTIATION
+        SSL_set_options(sc->connection, SSL_OP_NO_RENEGOTIATION);
+#endif
     }
 
     if (SSL_set_ex_data(sc->connection, ngx_ssl_connection_index, c) == 0) {
@@ -1217,6 +1561,31 @@ ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags)
 }
 
 
+ngx_ssl_session_t *
+ngx_ssl_get_session(ngx_connection_t *c)
+{
+#ifdef TLS1_3_VERSION
+    if (c->ssl->session) {
+        SSL_SESSION_up_ref(c->ssl->session);
+        return c->ssl->session;
+    }
+#endif
+
+    return SSL_get1_session(c->ssl->connection);
+}
+
+
+ngx_ssl_session_t *
+ngx_ssl_get0_session(ngx_connection_t *c)
+{
+    if (c->ssl->session) {
+        return c->ssl->session;
+    }
+
+    return SSL_get0_session(c->ssl->connection);
+}
+
+
 ngx_int_t
 ngx_ssl_set_session(ngx_connection_t *c, ngx_ssl_session_t *session)
 {
@@ -1237,6 +1606,12 @@ ngx_ssl_handshake(ngx_connection_t *c)
     int        n, sslerr;
     ngx_err_t  err;
 
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+    if (c->ssl->try_early_data) {
+        return ngx_ssl_try_early_data(c);
+    }
+#endif
+
     ngx_ssl_clear_error(c->log);
 
     n = SSL_do_handshake(c->ssl->connection);
@@ -1254,50 +1629,7 @@ ngx_ssl_handshake(ngx_connection_t *c)
         }
 
 #if (NGX_DEBUG)
-        {
-        char         buf[129], *s, *d;
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-        const
-#endif
-        SSL_CIPHER  *cipher;
-
-        cipher = SSL_get_current_cipher(c->ssl->connection);
-
-        if (cipher) {
-            SSL_CIPHER_description(cipher, &buf[1], 128);
-
-            for (s = &buf[1], d = buf; *s; s++) {
-                if (*s == ' ' && *d == ' ') {
-                    continue;
-                }
-
-                if (*s == LF || *s == CR) {
-                    continue;
-                }
-
-                *++d = *s;
-            }
-
-            if (*d != ' ') {
-                d++;
-            }
-
-            *d = '\0';
-
-            ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                           "SSL: %s, cipher: \"%s\"",
-                           SSL_get_version(c->ssl->connection), &buf[1]);
-
-            if (SSL_session_reused(c->ssl->connection)) {
-                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                               "SSL reused session");
-            }
-
-        } else {
-            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                           "SSL no shared ciphers");
-        }
-        }
+        ngx_ssl_handshake_log(c);
 #endif
 
         c->ssl->handshaked = 1;
@@ -1307,6 +1639,7 @@ ngx_ssl_handshake(ngx_connection_t *c)
         c->recv_chain = ngx_ssl_recv_chain;
         c->send_chain = ngx_ssl_send_chain;
 
+#ifndef SSL_OP_NO_RENEGOTIATION
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 #ifdef SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
 
@@ -1315,6 +1648,7 @@ ngx_ssl_handshake(ngx_connection_t *c)
             c->ssl->connection->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;
         }
 
+#endif
 #endif
 #endif
 
@@ -1378,6 +1712,173 @@ ngx_ssl_handshake(ngx_connection_t *c)
 }
 
 
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+
+static ngx_int_t
+ngx_ssl_try_early_data(ngx_connection_t *c)
+{
+    int        n, sslerr;
+    u_char     buf;
+    size_t     readbytes;
+    ngx_err_t  err;
+
+    ngx_ssl_clear_error(c->log);
+
+    readbytes = 0;
+
+    n = SSL_read_early_data(c->ssl->connection, &buf, 1, &readbytes);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "SSL_read_early_data: %d, %uz", n, readbytes);
+
+    if (n == SSL_READ_EARLY_DATA_FINISH) {
+        c->ssl->try_early_data = 0;
+        return ngx_ssl_handshake(c);
+    }
+
+    if (n == SSL_READ_EARLY_DATA_SUCCESS) {
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+#if (NGX_DEBUG)
+        ngx_ssl_handshake_log(c);
+#endif
+
+        c->ssl->try_early_data = 0;
+
+        c->ssl->early_buf = buf;
+        c->ssl->early_preread = 1;
+
+        c->ssl->handshaked = 1;
+        c->ssl->in_early = 1;
+
+        c->recv = ngx_ssl_recv;
+        c->send = ngx_ssl_write;
+        c->recv_chain = ngx_ssl_recv_chain;
+        c->send_chain = ngx_ssl_send_chain;
+
+        return NGX_OK;
+    }
+
+    /* SSL_READ_EARLY_DATA_ERROR */
+
+    sslerr = SSL_get_error(c->ssl->connection, n);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d", sslerr);
+
+    if (sslerr == SSL_ERROR_WANT_READ) {
+        c->read->ready = 0;
+        c->read->handler = ngx_ssl_handshake_handler;
+        c->write->handler = ngx_ssl_handshake_handler;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        return NGX_AGAIN;
+    }
+
+    if (sslerr == SSL_ERROR_WANT_WRITE) {
+        c->write->ready = 0;
+        c->read->handler = ngx_ssl_handshake_handler;
+        c->write->handler = ngx_ssl_handshake_handler;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        return NGX_AGAIN;
+    }
+
+    err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
+
+    c->ssl->no_wait_shutdown = 1;
+    c->ssl->no_send_shutdown = 1;
+    c->read->eof = 1;
+
+    if (sslerr == SSL_ERROR_ZERO_RETURN || ERR_peek_error() == 0) {
+        ngx_connection_error(c, err,
+                             "peer closed connection in SSL handshake");
+
+        return NGX_ERROR;
+    }
+
+    c->read->error = 1;
+
+    ngx_ssl_connection_error(c, sslerr, err, "SSL_read_early_data() failed");
+
+    return NGX_ERROR;
+}
+
+#endif
+
+
+#if (NGX_DEBUG)
+
+static void
+ngx_ssl_handshake_log(ngx_connection_t *c)
+{
+    char         buf[129], *s, *d;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const
+#endif
+    SSL_CIPHER  *cipher;
+
+    cipher = SSL_get_current_cipher(c->ssl->connection);
+
+    if (cipher) {
+        SSL_CIPHER_description(cipher, &buf[1], 128);
+
+        for (s = &buf[1], d = buf; *s; s++) {
+            if (*s == ' ' && *d == ' ') {
+                continue;
+            }
+
+            if (*s == LF || *s == CR) {
+                continue;
+            }
+
+            *++d = *s;
+        }
+
+        if (*d != ' ') {
+            d++;
+        }
+
+        *d = '\0';
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "SSL: %s, cipher: \"%s\"",
+                       SSL_get_version(c->ssl->connection), &buf[1]);
+
+        if (SSL_session_reused(c->ssl->connection)) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "SSL reused session");
+        }
+
+    } else {
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "SSL no shared ciphers");
+    }
+}
+
+#endif
+
+
 static void
 ngx_ssl_handshake_handler(ngx_event_t *ev)
 {
@@ -1465,6 +1966,12 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
 {
     int  n, bytes;
 
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+    if (c->ssl->in_early) {
+        return ngx_ssl_recv_early(c, buf, size);
+    }
+#endif
+
     if (c->ssl->last == NGX_ERROR) {
         c->read->error = 1;
         return NGX_ERROR;
@@ -1538,12 +2045,135 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
 }
 
 
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+
+static ssize_t
+ngx_ssl_recv_early(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    int        n, bytes;
+    size_t     readbytes;
+
+    if (c->ssl->last == NGX_ERROR) {
+        c->read->error = 1;
+        return NGX_ERROR;
+    }
+
+    if (c->ssl->last == NGX_DONE) {
+        c->read->ready = 0;
+        c->read->eof = 1;
+        return 0;
+    }
+
+    bytes = 0;
+
+    ngx_ssl_clear_error(c->log);
+
+    if (c->ssl->early_preread) {
+
+        if (size == 0) {
+            c->read->ready = 0;
+            c->read->eof = 1;
+            return 0;
+        }
+
+        *buf = c->ssl->early_buf;
+
+        c->ssl->early_preread = 0;
+
+        bytes = 1;
+        size -= 1;
+        buf += 1;
+    }
+
+    if (c->ssl->write_blocked) {
+        return NGX_AGAIN;
+    }
+
+    /*
+     * SSL_read_early_data() may return data in parts, so try to read
+     * until SSL_read_early_data() would return no data
+     */
+
+    for ( ;; ) {
+
+        readbytes = 0;
+
+        n = SSL_read_early_data(c->ssl->connection, buf, size, &readbytes);
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "SSL_read_early_data: %d, %uz", n, readbytes);
+
+        if (n == SSL_READ_EARLY_DATA_SUCCESS) {
+
+            c->ssl->last = ngx_ssl_handle_recv(c, 1);
+
+            bytes += readbytes;
+            size -= readbytes;
+
+            if (size == 0) {
+                c->read->ready = 1;
+                return bytes;
+            }
+
+            buf += readbytes;
+
+            continue;
+        }
+
+        if (n == SSL_READ_EARLY_DATA_FINISH) {
+
+            c->ssl->last = ngx_ssl_handle_recv(c, 1);
+            c->ssl->in_early = 0;
+
+            if (bytes) {
+                c->read->ready = 1;
+                return bytes;
+            }
+
+            return ngx_ssl_recv(c, buf, size);
+        }
+
+        /* SSL_READ_EARLY_DATA_ERROR */
+
+        c->ssl->last = ngx_ssl_handle_recv(c, 0);
+
+        if (bytes) {
+            if (c->ssl->last != NGX_AGAIN) {
+                c->read->ready = 1;
+            }
+
+            return bytes;
+        }
+
+        switch (c->ssl->last) {
+
+        case NGX_DONE:
+            c->read->ready = 0;
+            c->read->eof = 1;
+            return 0;
+
+        case NGX_ERROR:
+            c->read->error = 1;
+
+            /* fall through */
+
+        case NGX_AGAIN:
+            return c->ssl->last;
+        }
+    }
+}
+
+#endif
+
+
 static ngx_int_t
 ngx_ssl_handle_recv(ngx_connection_t *c, int n)
 {
     int        sslerr;
     ngx_err_t  err;
 
+#ifndef SSL_OP_NO_RENEGOTIATION
+
     if (c->ssl->renegotiation) {
         /*
          * disable renegotiation (CVE-2009-3555):
@@ -1566,6 +2196,8 @@ ngx_ssl_handle_recv(ngx_connection_t *c, int n)
         return NGX_ERROR;
     }
 
+#endif
+
     if (n > 0) {
 
         if (c->ssl->saved_write_handler) {
@@ -1591,14 +2223,28 @@ ngx_ssl_handle_recv(ngx_connection_t *c, int n)
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d", sslerr);
 
     if (sslerr == SSL_ERROR_WANT_READ) {
+
+        if (c->ssl->saved_write_handler) {
+
+            c->write->handler = c->ssl->saved_write_handler;
+            c->ssl->saved_write_handler = NULL;
+            c->write->ready = 1;
+
+            if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            ngx_post_event(c->write, &ngx_posted_events);
+        }
+
         c->read->ready = 0;
         return NGX_AGAIN;
     }
 
     if (sslerr == SSL_ERROR_WANT_WRITE) {
 
-        ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "peer started SSL renegotiation");
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "SSL_read: want write");
 
         c->write->ready = 0;
 
@@ -1640,6 +2286,8 @@ ngx_ssl_write_handler(ngx_event_t *wev)
 
     c = wev->data;
 
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL write handler");
+
     c->read->handler(c->read);
 }
 
@@ -1813,6 +2461,12 @@ ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size)
     int        n, sslerr;
     ngx_err_t  err;
 
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+    if (c->ssl->in_early) {
+        return ngx_ssl_write_early(c, data, size);
+    }
+#endif
+
     ngx_ssl_clear_error(c->log);
 
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL to write: %uz", size);
@@ -1848,14 +2502,28 @@ ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size)
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d", sslerr);
 
     if (sslerr == SSL_ERROR_WANT_WRITE) {
+
+        if (c->ssl->saved_read_handler) {
+
+            c->read->handler = c->ssl->saved_read_handler;
+            c->ssl->saved_read_handler = NULL;
+            c->read->ready = 1;
+
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            ngx_post_event(c->read, &ngx_posted_events);
+        }
+
         c->write->ready = 0;
         return NGX_AGAIN;
     }
 
     if (sslerr == SSL_ERROR_WANT_READ) {
 
-        ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "peer started SSL renegotiation");
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "SSL_write: want read");
 
         c->read->ready = 0;
 
@@ -1886,6 +2554,123 @@ ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size)
 }
 
 
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
+
+ssize_t
+ngx_ssl_write_early(ngx_connection_t *c, u_char *data, size_t size)
+{
+    int        n, sslerr;
+    size_t     written;
+    ngx_err_t  err;
+
+    ngx_ssl_clear_error(c->log);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL to write: %uz", size);
+
+    written = 0;
+
+    n = SSL_write_early_data(c->ssl->connection, data, size, &written);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "SSL_write_early_data: %d, %uz", n, written);
+
+    if (n > 0) {
+
+        if (c->ssl->saved_read_handler) {
+
+            c->read->handler = c->ssl->saved_read_handler;
+            c->ssl->saved_read_handler = NULL;
+            c->read->ready = 1;
+
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            ngx_post_event(c->read, &ngx_posted_events);
+        }
+
+        if (c->ssl->write_blocked) {
+            c->ssl->write_blocked = 0;
+            ngx_post_event(c->read, &ngx_posted_events);
+        }
+
+        c->sent += written;
+
+        return written;
+    }
+
+    sslerr = SSL_get_error(c->ssl->connection, n);
+
+    err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d", sslerr);
+
+    if (sslerr == SSL_ERROR_WANT_WRITE) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "SSL_write_early_data: want write");
+
+        if (c->ssl->saved_read_handler) {
+
+            c->read->handler = c->ssl->saved_read_handler;
+            c->ssl->saved_read_handler = NULL;
+            c->read->ready = 1;
+
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            ngx_post_event(c->read, &ngx_posted_events);
+        }
+
+        /*
+         * OpenSSL 1.1.1a fails to handle SSL_read_early_data()
+         * if an SSL_write_early_data() call blocked on writing,
+         * see https://github.com/openssl/openssl/issues/7757
+         */
+
+        c->ssl->write_blocked = 1;
+
+        c->write->ready = 0;
+        return NGX_AGAIN;
+    }
+
+    if (sslerr == SSL_ERROR_WANT_READ) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "SSL_write_early_data: want read");
+
+        c->read->ready = 0;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        /*
+         * we do not set the timer because there is already
+         * the write event timer
+         */
+
+        if (c->ssl->saved_read_handler == NULL) {
+            c->ssl->saved_read_handler = c->read->handler;
+            c->read->handler = ngx_ssl_read_handler;
+        }
+
+        return NGX_AGAIN;
+    }
+
+    c->ssl->no_wait_shutdown = 1;
+    c->ssl->no_send_shutdown = 1;
+    c->write->error = 1;
+
+    ngx_ssl_connection_error(c, sslerr, err, "SSL_write_early_data() failed");
+
+    return NGX_ERROR;
+}
+
+#endif
+
+
 static void
 ngx_ssl_read_handler(ngx_event_t *rev)
 {
@@ -1893,6 +2678,8 @@ ngx_ssl_read_handler(ngx_event_t *rev)
 
     c = rev->data;
 
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL read handler");
+
     c->write->handler(c->write);
 }
 
@@ -2089,8 +2876,14 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
             || n == SSL_R_NO_COMPRESSION_SPECIFIED                   /*  187 */
             || n == SSL_R_NO_SHARED_CIPHER                           /*  193 */
             || n == SSL_R_RECORD_LENGTH_MISMATCH                     /*  213 */
+#ifdef SSL_R_CLIENTHELLO_TLSEXT
+            || n == SSL_R_CLIENTHELLO_TLSEXT                         /*  226 */
+#endif
 #ifdef SSL_R_PARSE_TLSEXT
             || n == SSL_R_PARSE_TLSEXT                               /*  227 */
+#endif
+#ifdef SSL_R_CALLBACK_FAILED
+            || n == SSL_R_CALLBACK_FAILED                            /*  234 */
 #endif
             || n == SSL_R_UNEXPECTED_MESSAGE                         /*  244 */
             || n == SSL_R_UNEXPECTED_RECORD                          /*  245 */
@@ -2119,6 +2912,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
 #ifdef SSL_R_INAPPROPRIATE_FALLBACK
             || n == SSL_R_INAPPROPRIATE_FALLBACK                     /*  373 */
 #endif
+#ifdef SSL_R_CERT_CB_ERROR
+            || n == SSL_R_CERT_CB_ERROR                              /*  377 */
+#endif
 #ifdef SSL_R_VERSION_TOO_LOW
             || n == SSL_R_VERSION_TOO_LOW                            /*  396 */
 #endif
@@ -2198,53 +2994,60 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, char *fmt, ...)
     p = ngx_vslprintf(errstr, last - 1, fmt, args);
     va_end(args);
 
-    p = ngx_cpystrn(p, (u_char *) " (SSL:", last - p);
+    if (ERR_peek_error()) {
+        p = ngx_cpystrn(p, (u_char *) " (SSL:", last - p);
 
-    for ( ;; ) {
+        for ( ;; ) {
 
-        n = ERR_peek_error_line_data(NULL, NULL, &data, &flags);
+            n = ERR_peek_error_line_data(NULL, NULL, &data, &flags);
 
-        if (n == 0) {
-            break;
+            if (n == 0) {
+                break;
+            }
+
+            /* ERR_error_string_n() requires at least one byte */
+
+            if (p >= last - 1) {
+                goto next;
+            }
+
+            *p++ = ' ';
+
+            ERR_error_string_n(n, (char *) p, last - p);
+
+            while (p < last && *p) {
+                p++;
+            }
+
+            if (p < last && *data && (flags & ERR_TXT_STRING)) {
+                *p++ = ':';
+                p = ngx_cpystrn(p, (u_char *) data, last - p);
+            }
+
+        next:
+
+            (void) ERR_get_error();
         }
 
-        /* ERR_error_string_n() requires at least one byte */
-
-        if (p >= last - 1) {
-            goto next;
+        if (p < last) {
+            *p++ = ')';
         }
-
-        *p++ = ' ';
-
-        ERR_error_string_n(n, (char *) p, last - p);
-
-        while (p < last && *p) {
-            p++;
-        }
-
-        if (p < last && *data && (flags & ERR_TXT_STRING)) {
-            *p++ = ':';
-            p = ngx_cpystrn(p, (u_char *) data, last - p);
-        }
-
-    next:
-
-        (void) ERR_get_error();
     }
 
-    ngx_log_error(level, log, err, "%*s)", p - errstr, errstr);
+    ngx_log_error(level, log, err, "%*s", p - errstr, errstr);
 }
 
 
 ngx_int_t
 ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
-    ssize_t builtin_session_cache, ngx_shm_zone_t *shm_zone, time_t timeout)
+    ngx_array_t *certificates, ssize_t builtin_session_cache,
+    ngx_shm_zone_t *shm_zone, time_t timeout)
 {
     long  cache_mode;
 
     SSL_CTX_set_timeout(ssl->ctx, (long) timeout);
 
-    if (ngx_ssl_session_id_context(ssl, sess_ctx) != NGX_OK) {
+    if (ngx_ssl_session_id_context(ssl, sess_ctx, certificates) != NGX_OK) {
         return NGX_ERROR;
     }
 
@@ -2310,11 +3113,14 @@ ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
 
 
 static ngx_int_t
-ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
+ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
+    ngx_array_t *certificates)
 {
     int                   n, i;
     X509                 *cert;
     X509_NAME            *name;
+    ngx_str_t            *certs;
+    ngx_uint_t            k;
     EVP_MD_CTX           *md;
     unsigned int          len;
     STACK_OF(X509_NAME)  *list;
@@ -2359,6 +3165,24 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
         }
     }
 
+    if (SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index) == NULL) {
+
+        /*
+         * If certificates are loaded dynamically, we use certificate
+         * names as specified in the configuration (with variables).
+         */
+
+        certs = certificates->elts;
+        for (k = 0; k < certificates->nelts; k++) {
+
+            if (EVP_DigestUpdate(md, certs[k].data, certs[k].len) == 0) {
+                ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                              "EVP_DigestUpdate() failed");
+                goto failed;
+            }
+        }
+    }
+
     list = SSL_CTX_get_client_CA_list(ssl->ctx);
 
     if (list != NULL) {
@@ -2383,7 +3207,7 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx)
 
     if (EVP_DigestFinal_ex(md, buf, &len) == 0) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "EVP_DigestUpdate() failed");
+                      "EVP_DigestFinal_ex() failed");
         goto failed;
     }
 
@@ -2630,6 +3454,7 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn,
     const
 #endif
     u_char                   *p;
+    size_t                    slen;
     uint32_t                  hash;
     ngx_int_t                 rc;
     ngx_shm_zone_t           *shm_zone;
@@ -2685,12 +3510,14 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn,
         if (rc == 0) {
 
             if (sess_id->expire > ngx_time()) {
-                ngx_memcpy(buf, sess_id->session, sess_id->len);
+                slen = sess_id->len;
+
+                ngx_memcpy(buf, sess_id->session, slen);
 
                 ngx_shmtx_unlock(&shpool->mutex);
 
                 p = buf;
-                sess = d2i_SSL_SESSION(NULL, &p, sess_id->len);
+                sess = d2i_SSL_SESSION(NULL, &p, slen);
 
                 return sess;
             }
@@ -2911,6 +3738,7 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
     ngx_uint_t                     i;
     ngx_array_t                   *keys;
     ngx_file_info_t                fi;
+    ngx_pool_cleanup_t            *cln;
     ngx_ssl_session_ticket_key_t  *key;
 
     if (paths == NULL) {
@@ -2923,6 +3751,14 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
         return NGX_ERROR;
     }
 
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NGX_ERROR;
+    }
+
+    cln->handler = ngx_ssl_session_ticket_keys_cleanup;
+    cln->data = keys;
+
     path = paths->elts;
     for (i = 0; i < paths->nelts; i++) {
 
@@ -2994,6 +3830,8 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
             ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
                           ngx_close_file_n " \"%V\" failed", &file.name);
         }
+
+        ngx_explicit_memzero(&buf, 80);
     }
 
     if (SSL_CTX_set_ex_data(ssl->ctx, ngx_ssl_session_ticket_keys_index, keys)
@@ -3024,6 +3862,8 @@ failed:
                       ngx_close_file_n " \"%V\" failed", &file.name);
     }
 
+    ngx_explicit_memzero(&buf, 80);
+
     return NGX_ERROR;
 }
 
@@ -3152,6 +3992,16 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     }
 }
 
+
+static void
+ngx_ssl_session_ticket_keys_cleanup(void *data)
+{
+    ngx_array_t  *keys = data;
+
+    ngx_explicit_memzero(keys->elts,
+                         keys->nelts * sizeof(ngx_ssl_session_ticket_key_t));
+}
+
 #else
 
 ngx_int_t
@@ -3574,6 +4424,33 @@ ngx_ssl_get_session_reused(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 }
 
 
+ngx_int_t
+ngx_ssl_get_early_data(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+    s->len = 0;
+
+#ifdef SSL_ERROR_EARLY_DATA_REJECTED
+
+    /* BoringSSL */
+
+    if (SSL_in_early_data(c->ssl->connection)) {
+        ngx_str_set(s, "1");
+    }
+
+#elif defined SSL_READ_EARLY_DATA_SUCCESS
+
+    /* OpenSSL */
+
+    if (!SSL_is_init_finished(c->ssl->connection)) {
+        ngx_str_set(s, "1");
+    }
+
+#endif
+
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_ssl_get_server_name(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 {
@@ -3745,6 +4622,7 @@ ngx_ssl_get_subject_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 
     name = X509_get_subject_name(cert);
     if (name == NULL) {
+        X509_free(cert);
         return NGX_ERROR;
     }
 
@@ -3796,6 +4674,7 @@ ngx_ssl_get_issuer_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 
     name = X509_get_issuer_name(cert);
     if (name == NULL) {
+        X509_free(cert);
         return NGX_ERROR;
     }
 
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 05d3291..61da0c5 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -81,15 +81,24 @@ struct ngx_ssl_connection_s {
 
     ngx_connection_handler_pt   handler;
 
+    ngx_ssl_session_t          *session;
+    ngx_connection_handler_pt   save_session;
+
     ngx_event_handler_pt        saved_read_handler;
     ngx_event_handler_pt        saved_write_handler;
 
+    u_char                      early_buf;
+
     unsigned                    handshaked:1;
     unsigned                    renegotiation:1;
     unsigned                    buffer:1;
     unsigned                    no_wait_shutdown:1;
     unsigned                    no_send_shutdown:1;
     unsigned                    handshake_buffer_set:1;
+    unsigned                    try_early_data:1;
+    unsigned                    in_early:1;
+    unsigned                    early_preread:1;
+    unsigned                    write_blocked:1;
 };
 
 
@@ -152,10 +161,14 @@ typedef struct {
 
 ngx_int_t ngx_ssl_init(ngx_log_t *log);
 ngx_int_t ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data);
+
 ngx_int_t ngx_ssl_certificates(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_array_t *certs, ngx_array_t *keys, ngx_array_t *passwords);
 ngx_int_t ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_str_t *cert, ngx_str_t *key, ngx_array_t *passwords);
+ngx_int_t ngx_ssl_connection_certificate(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *cert, ngx_str_t *key, ngx_array_t *passwords);
+
 ngx_int_t ngx_ssl_ciphers(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *ciphers,
     ngx_uint_t prefer_server_ciphers);
 ngx_int_t ngx_ssl_client_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
@@ -170,10 +183,17 @@ ngx_int_t ngx_ssl_stapling_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
 RSA *ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export,
     int key_length);
 ngx_array_t *ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file);
+ngx_array_t *ngx_ssl_preserve_passwords(ngx_conf_t *cf,
+    ngx_array_t *passwords);
 ngx_int_t ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file);
 ngx_int_t ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name);
+ngx_int_t ngx_ssl_early_data(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_uint_t enable);
+ngx_int_t ngx_ssl_client_session_cache(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_uint_t enable);
 ngx_int_t ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
-    ssize_t builtin_session_cache, ngx_shm_zone_t *shm_zone, time_t timeout);
+    ngx_array_t *certificates, ssize_t builtin_session_cache,
+    ngx_shm_zone_t *shm_zone, time_t timeout);
 ngx_int_t ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_array_t *paths);
 ngx_int_t ngx_ssl_session_cache_init(ngx_shm_zone_t *shm_zone, void *data);
@@ -182,7 +202,8 @@ ngx_int_t ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c,
 
 void ngx_ssl_remove_cached_session(SSL_CTX *ssl, ngx_ssl_session_t *sess);
 ngx_int_t ngx_ssl_set_session(ngx_connection_t *c, ngx_ssl_session_t *session);
-#define ngx_ssl_get_session(c)      SSL_get1_session(c->ssl->connection)
+ngx_ssl_session_t *ngx_ssl_get_session(ngx_connection_t *c);
+ngx_ssl_session_t *ngx_ssl_get0_session(ngx_connection_t *c);
 #define ngx_ssl_free_session        SSL_SESSION_free
 #define ngx_ssl_get_connection(ssl_conn)                                      \
     SSL_get_ex_data(ssl_conn, ngx_ssl_connection_index)
@@ -211,6 +232,8 @@ ngx_int_t ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_session_reused(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
+ngx_int_t ngx_ssl_get_early_data(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
 ngx_int_t ngx_ssl_get_server_name(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_raw_certificate(ngx_connection_t *c, ngx_pool_t *pool,
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index 0bea5e7..c832aa0 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -227,7 +227,7 @@ ngx_ssl_stapling_file(ngx_conf_t *cf, ngx_ssl_t *ssl,
         return NGX_ERROR;
     }
 
-    bio = BIO_new_file((char *) file->data, "r");
+    bio = BIO_new_file((char *) file->data, "rb");
     if (bio == NULL) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                       "BIO_new_file(\"%s\") failed", file->data);
@@ -511,6 +511,11 @@ ngx_ssl_certificate_status_callback(ngx_ssl_conn_t *ssl_conn, void *data)
     rc = SSL_TLSEXT_ERR_NOACK;
 
     cert = SSL_get_certificate(ssl_conn);
+
+    if (cert == NULL) {
+        return rc;
+    }
+
     staple = X509_get_ex_data(cert, ngx_ssl_stapling_index);
 
     if (staple == NULL) {
diff --git a/src/event/ngx_event_udp.c b/src/event/ngx_event_udp.c
new file mode 100644
index 0000000..5572830
--- /dev/null
+++ b/src/event/ngx_event_udp.c
@@ -0,0 +1,663 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+#if !(NGX_WIN32)
+
+struct ngx_udp_connection_s {
+    ngx_rbtree_node_t   node;
+    ngx_connection_t   *connection;
+    ngx_buf_t          *buffer;
+};
+
+
+static void ngx_close_accepted_udp_connection(ngx_connection_t *c);
+static ssize_t ngx_udp_shared_recv(ngx_connection_t *c, u_char *buf,
+    size_t size);
+static ngx_int_t ngx_insert_udp_connection(ngx_connection_t *c);
+static ngx_connection_t *ngx_lookup_udp_connection(ngx_listening_t *ls,
+    struct sockaddr *sockaddr, socklen_t socklen,
+    struct sockaddr *local_sockaddr, socklen_t local_socklen);
+
+
+void
+ngx_event_recvmsg(ngx_event_t *ev)
+{
+    ssize_t            n;
+    ngx_buf_t          buf;
+    ngx_log_t         *log;
+    ngx_err_t          err;
+    socklen_t          socklen, local_socklen;
+    ngx_event_t       *rev, *wev;
+    struct iovec       iov[1];
+    struct msghdr      msg;
+    ngx_sockaddr_t     sa, lsa;
+    struct sockaddr   *sockaddr, *local_sockaddr;
+    ngx_listening_t   *ls;
+    ngx_event_conf_t  *ecf;
+    ngx_connection_t  *c, *lc;
+    static u_char      buffer[65535];
+
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+
+#if (NGX_HAVE_IP_RECVDSTADDR)
+    u_char             msg_control[CMSG_SPACE(sizeof(struct in_addr))];
+#elif (NGX_HAVE_IP_PKTINFO)
+    u_char             msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))];
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+    u_char             msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+#endif
+
+#endif
+
+    if (ev->timedout) {
+        if (ngx_enable_accept_events((ngx_cycle_t *) ngx_cycle) != NGX_OK) {
+            return;
+        }
+
+        ev->timedout = 0;
+    }
+
+    ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module);
+
+    if (!(ngx_event_flags & NGX_USE_KQUEUE_EVENT)) {
+        ev->available = ecf->multi_accept;
+    }
+
+    lc = ev->data;
+    ls = lc->listening;
+    ev->ready = 0;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                   "recvmsg on %V, ready: %d", &ls->addr_text, ev->available);
+
+    do {
+        ngx_memzero(&msg, sizeof(struct msghdr));
+
+        iov[0].iov_base = (void *) buffer;
+        iov[0].iov_len = sizeof(buffer);
+
+        msg.msg_name = &sa;
+        msg.msg_namelen = sizeof(ngx_sockaddr_t);
+        msg.msg_iov = iov;
+        msg.msg_iovlen = 1;
+
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+
+        if (ls->wildcard) {
+
+#if (NGX_HAVE_IP_RECVDSTADDR || NGX_HAVE_IP_PKTINFO)
+            if (ls->sockaddr->sa_family == AF_INET) {
+                msg.msg_control = &msg_control;
+                msg.msg_controllen = sizeof(msg_control);
+            }
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+            if (ls->sockaddr->sa_family == AF_INET6) {
+                msg.msg_control = &msg_control6;
+                msg.msg_controllen = sizeof(msg_control6);
+            }
+#endif
+        }
+
+#endif
+
+        n = recvmsg(lc->fd, &msg, 0);
+
+        if (n == -1) {
+            err = ngx_socket_errno;
+
+            if (err == NGX_EAGAIN) {
+                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, err,
+                               "recvmsg() not ready");
+                return;
+            }
+
+            ngx_log_error(NGX_LOG_ALERT, ev->log, err, "recvmsg() failed");
+
+            return;
+        }
+
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+        if (msg.msg_flags & (MSG_TRUNC|MSG_CTRUNC)) {
+            ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
+                          "recvmsg() truncated data");
+            continue;
+        }
+#endif
+
+        sockaddr = msg.msg_name;
+        socklen = msg.msg_namelen;
+
+        if (socklen > (socklen_t) sizeof(ngx_sockaddr_t)) {
+            socklen = sizeof(ngx_sockaddr_t);
+        }
+
+        if (socklen == 0) {
+
+            /*
+             * on Linux recvmsg() returns zero msg_namelen
+             * when receiving packets from unbound AF_UNIX sockets
+             */
+
+            socklen = sizeof(struct sockaddr);
+            ngx_memzero(&sa, sizeof(struct sockaddr));
+            sa.sockaddr.sa_family = ls->sockaddr->sa_family;
+        }
+
+        local_sockaddr = ls->sockaddr;
+        local_socklen = ls->socklen;
+
+#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+
+        if (ls->wildcard) {
+            struct cmsghdr  *cmsg;
+
+            ngx_memcpy(&lsa, local_sockaddr, local_socklen);
+            local_sockaddr = &lsa.sockaddr;
+
+            for (cmsg = CMSG_FIRSTHDR(&msg);
+                 cmsg != NULL;
+                 cmsg = CMSG_NXTHDR(&msg, cmsg))
+            {
+
+#if (NGX_HAVE_IP_RECVDSTADDR)
+
+                if (cmsg->cmsg_level == IPPROTO_IP
+                    && cmsg->cmsg_type == IP_RECVDSTADDR
+                    && local_sockaddr->sa_family == AF_INET)
+                {
+                    struct in_addr      *addr;
+                    struct sockaddr_in  *sin;
+
+                    addr = (struct in_addr *) CMSG_DATA(cmsg);
+                    sin = (struct sockaddr_in *) local_sockaddr;
+                    sin->sin_addr = *addr;
+
+                    break;
+                }
+
+#elif (NGX_HAVE_IP_PKTINFO)
+
+                if (cmsg->cmsg_level == IPPROTO_IP
+                    && cmsg->cmsg_type == IP_PKTINFO
+                    && local_sockaddr->sa_family == AF_INET)
+                {
+                    struct in_pktinfo   *pkt;
+                    struct sockaddr_in  *sin;
+
+                    pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
+                    sin = (struct sockaddr_in *) local_sockaddr;
+                    sin->sin_addr = pkt->ipi_addr;
+
+                    break;
+                }
+
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+
+                if (cmsg->cmsg_level == IPPROTO_IPV6
+                    && cmsg->cmsg_type == IPV6_PKTINFO
+                    && local_sockaddr->sa_family == AF_INET6)
+                {
+                    struct in6_pktinfo   *pkt6;
+                    struct sockaddr_in6  *sin6;
+
+                    pkt6 = (struct in6_pktinfo *) CMSG_DATA(cmsg);
+                    sin6 = (struct sockaddr_in6 *) local_sockaddr;
+                    sin6->sin6_addr = pkt6->ipi6_addr;
+
+                    break;
+                }
+
+#endif
+
+            }
+        }
+
+#endif
+
+        c = ngx_lookup_udp_connection(ls, sockaddr, socklen, local_sockaddr,
+                                      local_socklen);
+
+        if (c) {
+
+#if (NGX_DEBUG)
+            if (c->log->log_level & NGX_LOG_DEBUG_EVENT) {
+                ngx_log_handler_pt  handler;
+
+                handler = c->log->handler;
+                c->log->handler = NULL;
+
+                ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                               "recvmsg: fd:%d n:%z", c->fd, n);
+
+                c->log->handler = handler;
+            }
+#endif
+
+            ngx_memzero(&buf, sizeof(ngx_buf_t));
+
+            buf.pos = buffer;
+            buf.last = buffer + n;
+
+            rev = c->read;
+
+            c->udp->buffer = &buf;
+
+            rev->ready = 1;
+            rev->active = 0;
+
+            rev->handler(rev);
+
+            if (c->udp) {
+                c->udp->buffer = NULL;
+            }
+
+            rev->ready = 0;
+            rev->active = 1;
+
+            goto next;
+        }
+
+#if (NGX_STAT_STUB)
+        (void) ngx_atomic_fetch_add(ngx_stat_accepted, 1);
+#endif
+
+        ngx_accept_disabled = ngx_cycle->connection_n / 8
+                              - ngx_cycle->free_connection_n;
+
+        c = ngx_get_connection(lc->fd, ev->log);
+        if (c == NULL) {
+            return;
+        }
+
+        c->shared = 1;
+        c->type = SOCK_DGRAM;
+        c->socklen = socklen;
+
+#if (NGX_STAT_STUB)
+        (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
+#endif
+
+        c->pool = ngx_create_pool(ls->pool_size, ev->log);
+        if (c->pool == NULL) {
+            ngx_close_accepted_udp_connection(c);
+            return;
+        }
+
+        c->sockaddr = ngx_palloc(c->pool, socklen);
+        if (c->sockaddr == NULL) {
+            ngx_close_accepted_udp_connection(c);
+            return;
+        }
+
+        ngx_memcpy(c->sockaddr, sockaddr, socklen);
+
+        log = ngx_palloc(c->pool, sizeof(ngx_log_t));
+        if (log == NULL) {
+            ngx_close_accepted_udp_connection(c);
+            return;
+        }
+
+        *log = ls->log;
+
+        c->recv = ngx_udp_shared_recv;
+        c->send = ngx_udp_send;
+        c->send_chain = ngx_udp_send_chain;
+
+        c->log = log;
+        c->pool->log = log;
+        c->listening = ls;
+
+        if (local_sockaddr == &lsa.sockaddr) {
+            local_sockaddr = ngx_palloc(c->pool, local_socklen);
+            if (local_sockaddr == NULL) {
+                ngx_close_accepted_udp_connection(c);
+                return;
+            }
+
+            ngx_memcpy(local_sockaddr, &lsa, local_socklen);
+        }
+
+        c->local_sockaddr = local_sockaddr;
+        c->local_socklen = local_socklen;
+
+        c->buffer = ngx_create_temp_buf(c->pool, n);
+        if (c->buffer == NULL) {
+            ngx_close_accepted_udp_connection(c);
+            return;
+        }
+
+        c->buffer->last = ngx_cpymem(c->buffer->last, buffer, n);
+
+        rev = c->read;
+        wev = c->write;
+
+        rev->active = 1;
+        wev->ready = 1;
+
+        rev->log = log;
+        wev->log = log;
+
+        /*
+         * TODO: MT: - ngx_atomic_fetch_add()
+         *             or protection by critical section or light mutex
+         *
+         * TODO: MP: - allocated in a shared memory
+         *           - ngx_atomic_fetch_add()
+         *             or protection by critical section or light mutex
+         */
+
+        c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+
+#if (NGX_STAT_STUB)
+        (void) ngx_atomic_fetch_add(ngx_stat_handled, 1);
+#endif
+
+        if (ls->addr_ntop) {
+            c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
+            if (c->addr_text.data == NULL) {
+                ngx_close_accepted_udp_connection(c);
+                return;
+            }
+
+            c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->socklen,
+                                             c->addr_text.data,
+                                             ls->addr_text_max_len, 0);
+            if (c->addr_text.len == 0) {
+                ngx_close_accepted_udp_connection(c);
+                return;
+            }
+        }
+
+#if (NGX_DEBUG)
+        {
+        ngx_str_t  addr;
+        u_char     text[NGX_SOCKADDR_STRLEN];
+
+        ngx_debug_accepted_connection(ecf, c);
+
+        if (log->log_level & NGX_LOG_DEBUG_EVENT) {
+            addr.data = text;
+            addr.len = ngx_sock_ntop(c->sockaddr, c->socklen, text,
+                                     NGX_SOCKADDR_STRLEN, 1);
+
+            ngx_log_debug4(NGX_LOG_DEBUG_EVENT, log, 0,
+                           "*%uA recvmsg: %V fd:%d n:%z",
+                           c->number, &addr, c->fd, n);
+        }
+
+        }
+#endif
+
+        if (ngx_insert_udp_connection(c) != NGX_OK) {
+            ngx_close_accepted_udp_connection(c);
+            return;
+        }
+
+        log->data = NULL;
+        log->handler = NULL;
+
+        ls->handler(c);
+
+    next:
+
+        if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
+            ev->available -= n;
+        }
+
+    } while (ev->available);
+}
+
+
+static void
+ngx_close_accepted_udp_connection(ngx_connection_t *c)
+{
+    ngx_free_connection(c);
+
+    c->fd = (ngx_socket_t) -1;
+
+    if (c->pool) {
+        ngx_destroy_pool(c->pool);
+    }
+
+#if (NGX_STAT_STUB)
+    (void) ngx_atomic_fetch_add(ngx_stat_active, -1);
+#endif
+}
+
+
+static ssize_t
+ngx_udp_shared_recv(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ssize_t     n;
+    ngx_buf_t  *b;
+
+    if (c->udp == NULL || c->udp->buffer == NULL) {
+        return NGX_AGAIN;
+    }
+
+    b = c->udp->buffer;
+
+    n = ngx_min(b->last - b->pos, (ssize_t) size);
+
+    ngx_memcpy(buf, b->pos, n);
+
+    c->udp->buffer = NULL;
+
+    c->read->ready = 0;
+    c->read->active = 1;
+
+    return n;
+}
+
+
+void
+ngx_udp_rbtree_insert_value(ngx_rbtree_node_t *temp,
+    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel)
+{
+    ngx_int_t               rc;
+    ngx_connection_t       *c, *ct;
+    ngx_rbtree_node_t     **p;
+    ngx_udp_connection_t   *udp, *udpt;
+
+    for ( ;; ) {
+
+        if (node->key < temp->key) {
+
+            p = &temp->left;
+
+        } else if (node->key > temp->key) {
+
+            p = &temp->right;
+
+        } else { /* node->key == temp->key */
+
+            udp = (ngx_udp_connection_t *) node;
+            c = udp->connection;
+
+            udpt = (ngx_udp_connection_t *) temp;
+            ct = udpt->connection;
+
+            rc = ngx_cmp_sockaddr(c->sockaddr, c->socklen,
+                                  ct->sockaddr, ct->socklen, 1);
+
+            if (rc == 0 && c->listening->wildcard) {
+                rc = ngx_cmp_sockaddr(c->local_sockaddr, c->local_socklen,
+                                      ct->local_sockaddr, ct->local_socklen, 1);
+            }
+
+            p = (rc < 0) ? &temp->left : &temp->right;
+        }
+
+        if (*p == sentinel) {
+            break;
+        }
+
+        temp = *p;
+    }
+
+    *p = node;
+    node->parent = temp;
+    node->left = sentinel;
+    node->right = sentinel;
+    ngx_rbt_red(node);
+}
+
+
+static ngx_int_t
+ngx_insert_udp_connection(ngx_connection_t *c)
+{
+    uint32_t               hash;
+    ngx_pool_cleanup_t    *cln;
+    ngx_udp_connection_t  *udp;
+
+    if (c->udp) {
+        return NGX_OK;
+    }
+
+    udp = ngx_pcalloc(c->pool, sizeof(ngx_udp_connection_t));
+    if (udp == NULL) {
+        return NGX_ERROR;
+    }
+
+    udp->connection = c;
+
+    ngx_crc32_init(hash);
+    ngx_crc32_update(&hash, (u_char *) c->sockaddr, c->socklen);
+
+    if (c->listening->wildcard) {
+        ngx_crc32_update(&hash, (u_char *) c->local_sockaddr, c->local_socklen);
+    }
+
+    ngx_crc32_final(hash);
+
+    udp->node.key = hash;
+
+    cln = ngx_pool_cleanup_add(c->pool, 0);
+    if (cln == NULL) {
+        return NGX_ERROR;
+    }
+
+    cln->data = c;
+    cln->handler = ngx_delete_udp_connection;
+
+    ngx_rbtree_insert(&c->listening->rbtree, &udp->node);
+
+    c->udp = udp;
+
+    return NGX_OK;
+}
+
+
+void
+ngx_delete_udp_connection(void *data)
+{
+    ngx_connection_t  *c = data;
+
+    if (c->udp == NULL) {
+        return;
+    }
+
+    ngx_rbtree_delete(&c->listening->rbtree, &c->udp->node);
+
+    c->udp = NULL;
+}
+
+
+static ngx_connection_t *
+ngx_lookup_udp_connection(ngx_listening_t *ls, struct sockaddr *sockaddr,
+    socklen_t socklen, struct sockaddr *local_sockaddr, socklen_t local_socklen)
+{
+    uint32_t               hash;
+    ngx_int_t              rc;
+    ngx_connection_t      *c;
+    ngx_rbtree_node_t     *node, *sentinel;
+    ngx_udp_connection_t  *udp;
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+
+    if (sockaddr->sa_family == AF_UNIX) {
+        struct sockaddr_un *saun = (struct sockaddr_un *) sockaddr;
+
+        if (socklen <= (socklen_t) offsetof(struct sockaddr_un, sun_path)
+            || saun->sun_path[0] == '\0')
+        {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
+                           "unbound unix socket");
+            return NULL;
+        }
+    }
+
+#endif
+
+    node = ls->rbtree.root;
+    sentinel = ls->rbtree.sentinel;
+
+    ngx_crc32_init(hash);
+    ngx_crc32_update(&hash, (u_char *) sockaddr, socklen);
+
+    if (ls->wildcard) {
+        ngx_crc32_update(&hash, (u_char *) local_sockaddr, local_socklen);
+    }
+
+    ngx_crc32_final(hash);
+
+    while (node != sentinel) {
+
+        if (hash < node->key) {
+            node = node->left;
+            continue;
+        }
+
+        if (hash > node->key) {
+            node = node->right;
+            continue;
+        }
+
+        /* hash == node->key */
+
+        udp = (ngx_udp_connection_t *) node;
+
+        c = udp->connection;
+
+        rc = ngx_cmp_sockaddr(sockaddr, socklen,
+                              c->sockaddr, c->socklen, 1);
+
+        if (rc == 0 && ls->wildcard) {
+            rc = ngx_cmp_sockaddr(local_sockaddr, local_socklen,
+                                  c->local_sockaddr, c->local_socklen, 1);
+        }
+
+        if (rc == 0) {
+            return c;
+        }
+
+        node = (rc < 0) ? node->left : node->right;
+    }
+
+    return NULL;
+}
+
+#else
+
+void
+ngx_delete_udp_connection(void *data)
+{
+    return;
+}
+
+#endif
diff --git a/src/http/modules/ngx_http_autoindex_module.c b/src/http/modules/ngx_http_autoindex_module.c
index 94b91db..082bcb5 100644
--- a/src/http/modules/ngx_http_autoindex_module.c
+++ b/src/http/modules/ngx_http_autoindex_module.c
@@ -186,8 +186,6 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
         return rc;
     }
 
-    /* NGX_DIR_MASK_LEN is lesser than NGX_HTTP_AUTOINDEX_PREALLOCATE */
-
     last = ngx_http_map_uri_to_path(r, &path, &root,
                                     NGX_HTTP_AUTOINDEX_PREALLOCATE);
     if (last == NULL) {
@@ -436,7 +434,7 @@ ngx_http_autoindex_html(ngx_http_request_t *r, ngx_array_t *entries)
 {
     u_char                         *last, scale;
     off_t                           length;
-    size_t                          len, char_len, escape_html;
+    size_t                          len, entry_len, char_len, escape_html;
     ngx_tm_t                        tm;
     ngx_buf_t                      *b;
     ngx_int_t                       size;
@@ -452,7 +450,7 @@ ngx_http_autoindex_html(ngx_http_request_t *r, ngx_array_t *entries)
 
     static u_char  header[] =
         "</title></head>" CRLF
-        "<body bgcolor=\"white\">" CRLF
+        "<body>" CRLF
         "<h1>Index of "
     ;
 
@@ -501,17 +499,23 @@ ngx_http_autoindex_html(ngx_http_request_t *r, ngx_array_t *entries)
             entry[i].utf_len = entry[i].name.len;
         }
 
-        len += sizeof("<a href=\"") - 1
-            + entry[i].name.len + entry[i].escape
-            + 1                                          /* 1 is for "/" */
-            + sizeof("\">") - 1
-            + entry[i].name.len - entry[i].utf_len
-            + entry[i].escape_html
-            + NGX_HTTP_AUTOINDEX_NAME_LEN + sizeof("&gt;") - 2
-            + sizeof("</a>") - 1
-            + sizeof(" 28-Sep-1970 12:00 ") - 1
-            + 20                                         /* the file size */
-            + 2;
+        entry_len = sizeof("<a href=\"") - 1
+                  + entry[i].name.len + entry[i].escape
+                  + 1                                    /* 1 is for "/" */
+                  + sizeof("\">") - 1
+                  + entry[i].name.len - entry[i].utf_len
+                  + entry[i].escape_html
+                  + NGX_HTTP_AUTOINDEX_NAME_LEN + sizeof("&gt;") - 2
+                  + sizeof("</a>") - 1
+                  + sizeof(" 28-Sep-1970 12:00 ") - 1
+                  + 20                                   /* the file size */
+                  + 2;
+
+        if (len > NGX_MAX_SIZE_T_VALUE - entry_len) {
+            return NULL;
+        }
+
+        len += entry_len;
     }
 
     b = ngx_create_temp_buf(r->pool, len);
@@ -699,7 +703,7 @@ static ngx_buf_t *
 ngx_http_autoindex_json(ngx_http_request_t *r, ngx_array_t *entries,
     ngx_str_t *callback)
 {
-    size_t                       len;
+    size_t                       len, entry_len;
     ngx_buf_t                   *b;
     ngx_uint_t                   i;
     ngx_http_autoindex_entry_t  *entry;
@@ -716,15 +720,21 @@ ngx_http_autoindex_json(ngx_http_request_t *r, ngx_array_t *entries,
         entry[i].escape = ngx_escape_json(NULL, entry[i].name.data,
                                           entry[i].name.len);
 
-        len += sizeof("{  }," CRLF) - 1
-            + sizeof("\"name\":\"\"") - 1
-            + entry[i].name.len + entry[i].escape
-            + sizeof(", \"type\":\"directory\"") - 1
-            + sizeof(", \"mtime\":\"Wed, 31 Dec 1986 10:00:00 GMT\"") - 1;
+        entry_len = sizeof("{  }," CRLF) - 1
+                  + sizeof("\"name\":\"\"") - 1
+                  + entry[i].name.len + entry[i].escape
+                  + sizeof(", \"type\":\"directory\"") - 1
+                  + sizeof(", \"mtime\":\"Wed, 31 Dec 1986 10:00:00 GMT\"") - 1;
 
         if (entry[i].file) {
-            len += sizeof(", \"size\":") - 1 + NGX_OFF_T_LEN;
+            entry_len += sizeof(", \"size\":") - 1 + NGX_OFF_T_LEN;
         }
+
+        if (len > NGX_MAX_SIZE_T_VALUE - entry_len) {
+            return NULL;
+        }
+
+        len += entry_len;
     }
 
     b = ngx_create_temp_buf(r->pool, len);
@@ -843,7 +853,7 @@ ngx_http_autoindex_jsonp_callback(ngx_http_request_t *r, ngx_str_t *callback)
 static ngx_buf_t *
 ngx_http_autoindex_xml(ngx_http_request_t *r, ngx_array_t *entries)
 {
-    size_t                          len;
+    size_t                          len, entry_len;
     ngx_tm_t                        tm;
     ngx_buf_t                      *b;
     ngx_str_t                       type;
@@ -861,13 +871,19 @@ ngx_http_autoindex_xml(ngx_http_request_t *r, ngx_array_t *entries)
         entry[i].escape = ngx_escape_html(NULL, entry[i].name.data,
                                           entry[i].name.len);
 
-        len += sizeof("<directory></directory>" CRLF) - 1
-            + entry[i].name.len + entry[i].escape
-            + sizeof(" mtime=\"1986-12-31T10:00:00Z\"") - 1;
+        entry_len = sizeof("<directory></directory>" CRLF) - 1
+                  + entry[i].name.len + entry[i].escape
+                  + sizeof(" mtime=\"1986-12-31T10:00:00Z\"") - 1;
 
         if (entry[i].file) {
-            len += sizeof(" size=\"\"") - 1 + NGX_OFF_T_LEN;
+            entry_len += sizeof(" size=\"\"") - 1 + NGX_OFF_T_LEN;
         }
+
+        if (len > NGX_MAX_SIZE_T_VALUE - entry_len) {
+            return NULL;
+        }
+
+        len += entry_len;
     }
 
     b = ngx_create_temp_buf(r->pool, len);
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 55ad9eb..95c7b32 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -841,11 +841,9 @@ overwrite_done:
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
 
-        dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_module);
-
         cf.size = ngx_file_size(&fi);
         cf.buf_size = 0;
-        cf.access = dlcf->access;
+        cf.access = ngx_file_access(&fi);
         cf.time = ngx_file_mtime(&fi);
         cf.log = r->connection->log;
 
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 3eec1b7..2be0672 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -286,6 +286,13 @@ static ngx_command_t  ngx_http_fastcgi_commands[] = {
       offsetof(ngx_http_fastcgi_loc_conf_t, upstream.local),
       NULL },
 
+    { ngx_string("fastcgi_socket_keepalive"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fastcgi_loc_conf_t, upstream.socket_keepalive),
+      NULL },
+
     { ngx_string("fastcgi_connect_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_msec_slot,
@@ -2721,6 +2728,7 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.force_ranges = NGX_CONF_UNSET;
 
     conf->upstream.local = NGX_CONF_UNSET_PTR;
+    conf->upstream.socket_keepalive = NGX_CONF_UNSET;
 
     conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
@@ -2824,6 +2832,9 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_ptr_value(conf->upstream.local,
                               prev->upstream.local, NULL);
 
+    ngx_conf_merge_value(conf->upstream.socket_keepalive,
+                              prev->upstream.socket_keepalive, 0);
+
     ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
                               prev->upstream.connect_timeout, 60000);
 
@@ -3501,7 +3512,7 @@ ngx_http_fastcgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     clcf->handler = ngx_http_fastcgi_handler;
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index c11bafa..153b6aa 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -215,6 +215,13 @@ ngx_http_geo_cidr_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
         break;
 #endif
 
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+        vv = (ngx_http_variable_value_t *)
+                  ngx_radix32tree_find(ctx->u.trees.tree, INADDR_NONE);
+        break;
+#endif
+
     default: /* AF_INET */
         sin = (struct sockaddr_in *) addr.sockaddr;
         inaddr = ntohl(sin->sin_addr.s_addr);
@@ -277,6 +284,12 @@ ngx_http_geo_range_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
             break;
 #endif
 
+#if (NGX_HAVE_UNIX_DOMAIN)
+        case AF_UNIX:
+            inaddr = INADDR_NONE;
+            break;
+#endif
+
         default: /* AF_INET */
             sin = (struct sockaddr_in *) addr.sockaddr;
             inaddr = ntohl(sin->sin_addr.s_addr);
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
index 62b33fd..f59ecbd 100644
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -251,6 +251,13 @@ static ngx_command_t  ngx_http_grpc_commands[] = {
       offsetof(ngx_http_grpc_loc_conf_t, upstream.local),
       NULL },
 
+    { ngx_string("grpc_socket_keepalive"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.socket_keepalive),
+      NULL },
+
     { ngx_string("grpc_connect_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_msec_slot,
@@ -4165,6 +4172,7 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
      */
 
     conf->upstream.local = NGX_CONF_UNSET_PTR;
+    conf->upstream.socket_keepalive = NGX_CONF_UNSET;
     conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
     conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
@@ -4220,6 +4228,9 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_ptr_value(conf->upstream.local,
                               prev->upstream.local, NULL);
 
+    ngx_conf_merge_value(conf->upstream.socket_keepalive,
+                              prev->upstream.socket_keepalive, 0);
+
     ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries,
                               prev->upstream.next_upstream_tries, 0);
 
@@ -4586,7 +4597,7 @@ ngx_http_grpc_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     clcf->handler = ngx_http_grpc_handler;
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
@@ -4639,6 +4650,7 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
 
     cln = ngx_pool_cleanup_add(cf->pool, 0);
     if (cln == NULL) {
+        ngx_ssl_cleanup_ctx(glcf->upstream.ssl);
         return NGX_ERROR;
     }
 
@@ -4688,6 +4700,13 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
         }
     }
 
+    if (ngx_ssl_client_session_cache(cf, glcf->upstream.ssl,
+                                     glcf->upstream.ssl_session_reuse)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
 #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
 
     if (SSL_CTX_set_alpn_protos(glcf->upstream.ssl->ctx,
diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c
index 579b13c..e81d57f 100644
--- a/src/http/modules/ngx_http_limit_req_module.c
+++ b/src/http/modules/ngx_http_limit_req_module.c
@@ -44,7 +44,7 @@ typedef struct {
     ngx_shm_zone_t              *shm_zone;
     /* integer value, 1 corresponds to 0.001 r/s */
     ngx_uint_t                   burst;
-    ngx_uint_t                   nodelay; /* unsigned  nodelay:1 */
+    ngx_uint_t                   delay;
 } ngx_http_limit_req_limit_t;
 
 
@@ -399,7 +399,14 @@ ngx_http_limit_req_lookup(ngx_http_limit_req_limit_t *limit, ngx_uint_t hash,
 
             ms = (ngx_msec_int_t) (now - lr->last);
 
-            excess = lr->excess - ctx->rate * ngx_abs(ms) / 1000 + 1000;
+            if (ms < -60000) {
+                ms = 1;
+
+            } else if (ms < 0) {
+                ms = 0;
+            }
+
+            excess = lr->excess - ctx->rate * ms / 1000 + 1000;
 
             if (excess < 0) {
                 excess = 0;
@@ -413,7 +420,11 @@ ngx_http_limit_req_lookup(ngx_http_limit_req_limit_t *limit, ngx_uint_t hash,
 
             if (account) {
                 lr->excess = excess;
-                lr->last = now;
+
+                if (ms) {
+                    lr->last = now;
+                }
+
                 return NGX_OK;
             }
 
@@ -488,12 +499,12 @@ ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits, ngx_uint_t n,
 
     excess = *ep;
 
-    if (excess == 0 || (*limit)->nodelay) {
+    if ((ngx_uint_t) excess <= (*limit)->delay) {
         max_delay = 0;
 
     } else {
         ctx = (*limit)->shm_zone->data;
-        max_delay = excess * 1000 / ctx->rate;
+        max_delay = (excess - (*limit)->delay) * 1000 / ctx->rate;
     }
 
     while (n--) {
@@ -509,13 +520,23 @@ ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits, ngx_uint_t n,
         now = ngx_current_msec;
         ms = (ngx_msec_int_t) (now - lr->last);
 
-        excess = lr->excess - ctx->rate * ngx_abs(ms) / 1000 + 1000;
+        if (ms < -60000) {
+            ms = 1;
+
+        } else if (ms < 0) {
+            ms = 0;
+        }
+
+        excess = lr->excess - ctx->rate * ms / 1000 + 1000;
 
         if (excess < 0) {
             excess = 0;
         }
 
-        lr->last = now;
+        if (ms) {
+            lr->last = now;
+        }
+
         lr->excess = excess;
         lr->count--;
 
@@ -523,11 +544,11 @@ ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits, ngx_uint_t n,
 
         ctx->node = NULL;
 
-        if (limits[n].nodelay) {
+        if ((ngx_uint_t) excess <= limits[n].delay) {
             continue;
         }
 
-        delay = excess * 1000 / ctx->rate;
+        delay = (excess - limits[n].delay) * 1000 / ctx->rate;
 
         if (delay > max_delay) {
             max_delay = delay;
@@ -854,9 +875,9 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_http_limit_req_conf_t  *lrcf = conf;
 
-    ngx_int_t                    burst;
+    ngx_int_t                    burst, delay;
     ngx_str_t                   *value, s;
-    ngx_uint_t                   i, nodelay;
+    ngx_uint_t                   i;
     ngx_shm_zone_t              *shm_zone;
     ngx_http_limit_req_limit_t  *limit, *limits;
 
@@ -864,7 +885,7 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     shm_zone = NULL;
     burst = 0;
-    nodelay = 0;
+    delay = 0;
 
     for (i = 1; i < cf->args->nelts; i++) {
 
@@ -887,7 +908,19 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             burst = ngx_atoi(value[i].data + 6, value[i].len - 6);
             if (burst <= 0) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "invalid burst rate \"%V\"", &value[i]);
+                                   "invalid burst value \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (ngx_strncmp(value[i].data, "delay=", 6) == 0) {
+
+            delay = ngx_atoi(value[i].data + 6, value[i].len - 6);
+            if (delay <= 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid delay value \"%V\"", &value[i]);
                 return NGX_CONF_ERROR;
             }
 
@@ -895,7 +928,7 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
 
         if (ngx_strcmp(value[i].data, "nodelay") == 0) {
-            nodelay = 1;
+            delay = NGX_MAX_INT_T_VALUE / 1000;
             continue;
         }
 
@@ -935,7 +968,7 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     limit->shm_zone = shm_zone;
     limit->burst = burst * 1000;
-    limit->nodelay = nodelay;
+    limit->delay = delay * 1000;
 
     return NGX_CONF_OK;
 }
diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
index 82fa713..775bd7e 100644
--- a/src/http/modules/ngx_http_memcached_module.c
+++ b/src/http/modules/ngx_http_memcached_module.c
@@ -67,6 +67,13 @@ static ngx_command_t  ngx_http_memcached_commands[] = {
       offsetof(ngx_http_memcached_loc_conf_t, upstream.local),
       NULL },
 
+    { ngx_string("memcached_socket_keepalive"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_memcached_loc_conf_t, upstream.socket_keepalive),
+      NULL },
+
     { ngx_string("memcached_connect_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_msec_slot,
@@ -595,6 +602,7 @@ ngx_http_memcached_create_loc_conf(ngx_conf_t *cf)
      */
 
     conf->upstream.local = NGX_CONF_UNSET_PTR;
+    conf->upstream.socket_keepalive = NGX_CONF_UNSET;
     conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
     conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
@@ -634,6 +642,9 @@ ngx_http_memcached_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_ptr_value(conf->upstream.local,
                               prev->upstream.local, NULL);
 
+    ngx_conf_merge_value(conf->upstream.socket_keepalive,
+                              prev->upstream.socket_keepalive, 0);
+
     ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries,
                               prev->upstream.next_upstream_tries, 0);
 
@@ -707,7 +718,7 @@ ngx_http_memcached_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     clcf->handler = ngx_http_memcached_handler;
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index e7f829d..3aafb99 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -324,6 +324,13 @@ static ngx_command_t  ngx_http_proxy_commands[] = {
       offsetof(ngx_http_proxy_loc_conf_t, upstream.local),
       NULL },
 
+    { ngx_string("proxy_socket_keepalive"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_proxy_loc_conf_t, upstream.socket_keepalive),
+      NULL },
+
     { ngx_string("proxy_connect_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_msec_slot,
@@ -2833,6 +2840,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.force_ranges = NGX_CONF_UNSET;
 
     conf->upstream.local = NGX_CONF_UNSET_PTR;
+    conf->upstream.socket_keepalive = NGX_CONF_UNSET;
 
     conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
@@ -2953,6 +2961,9 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_ptr_value(conf->upstream.local,
                               prev->upstream.local, NULL);
 
+    ngx_conf_merge_value(conf->upstream.socket_keepalive,
+                              prev->upstream.socket_keepalive, 0);
+
     ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
                               prev->upstream.connect_timeout, 60000);
 
@@ -3580,7 +3591,7 @@ ngx_http_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     clcf->handler = ngx_http_proxy_handler;
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
@@ -4259,6 +4270,7 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
 
     cln = ngx_pool_cleanup_add(cf->pool, 0);
     if (cln == NULL) {
+        ngx_ssl_cleanup_ctx(plcf->upstream.ssl);
         return NGX_ERROR;
     }
 
@@ -4308,6 +4320,13 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
         }
     }
 
+    if (ngx_ssl_client_session_cache(cf, plcf->upstream.ssl,
+                                     plcf->upstream.ssl_session_reuse)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     return NGX_OK;
 }
 
diff --git a/src/http/modules/ngx_http_random_index_module.c b/src/http/modules/ngx_http_random_index_module.c
index b47ee4f..ed00ad5 100644
--- a/src/http/modules/ngx_http_random_index_module.c
+++ b/src/http/modules/ngx_http_random_index_module.c
@@ -98,7 +98,7 @@ ngx_http_random_index_handler(ngx_http_request_t *r)
     }
 
 #if (NGX_HAVE_D_TYPE)
-    len = NGX_DIR_MASK_LEN;
+    len = 0;
 #else
     len = NGX_HTTP_RANDOM_INDEX_PREALLOCATE;
 #endif
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index a6f1fc8..3b49c45 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -180,15 +180,7 @@ ngx_http_rewrite_handler(ngx_http_request_t *r)
         code(e);
     }
 
-    if (e->status < NGX_HTTP_BAD_REQUEST) {
-        return e->status;
-    }
-
-    if (r->err_status == 0) {
-        return e->status;
-    }
-
-    return r->err_status;
+    return e->status;
 }
 
 
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 9bd45bd..7216f78 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -143,6 +143,13 @@ static ngx_command_t ngx_http_scgi_commands[] = {
       offsetof(ngx_http_scgi_loc_conf_t, upstream.local),
       NULL },
 
+    { ngx_string("scgi_socket_keepalive"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_scgi_loc_conf_t, upstream.socket_keepalive),
+      NULL },
+
     { ngx_string("scgi_connect_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_msec_slot,
@@ -1200,6 +1207,7 @@ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.force_ranges = NGX_CONF_UNSET;
 
     conf->upstream.local = NGX_CONF_UNSET_PTR;
+    conf->upstream.socket_keepalive = NGX_CONF_UNSET;
 
     conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
@@ -1298,6 +1306,9 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_ptr_value(conf->upstream.local,
                               prev->upstream.local, NULL);
 
+    ngx_conf_merge_value(conf->upstream.socket_keepalive,
+                              prev->upstream.socket_keepalive, 0);
+
     ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
                               prev->upstream.connect_timeout, 60000);
 
@@ -1857,7 +1868,7 @@ ngx_http_scgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 7d62176..b3f8f47 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -41,6 +41,9 @@ static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf);
 static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf,
     void *parent, void *child);
 
+static ngx_int_t ngx_http_ssl_compile_certificates(ngx_conf_t *cf,
+    ngx_http_ssl_srv_conf_t *conf);
+
 static char *ngx_http_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -71,6 +74,11 @@ static ngx_conf_enum_t  ngx_http_ssl_verify[] = {
 };
 
 
+static ngx_conf_deprecated_t  ngx_http_ssl_deprecated = {
+    ngx_conf_deprecated, "ssl", "listen ... ssl"
+};
+
+
 static ngx_command_t  ngx_http_ssl_commands[] = {
 
     { ngx_string("ssl"),
@@ -78,7 +86,7 @@ static ngx_command_t  ngx_http_ssl_commands[] = {
       ngx_http_ssl_enable,
       NGX_HTTP_SRV_CONF_OFFSET,
       offsetof(ngx_http_ssl_srv_conf_t, enable),
-      NULL },
+      &ngx_http_ssl_deprecated },
 
     { ngx_string("ssl_certificate"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
@@ -234,6 +242,13 @@ static ngx_command_t  ngx_http_ssl_commands[] = {
       offsetof(ngx_http_ssl_srv_conf_t, stapling_verify),
       NULL },
 
+    { ngx_string("ssl_early_data"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, early_data),
+      NULL },
+
       ngx_null_command
 };
 
@@ -289,6 +304,10 @@ static ngx_http_variable_t  ngx_http_ssl_vars[] = {
     { ngx_string("ssl_session_reused"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_session_reused, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_early_data"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_early_data,
+      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
     { ngx_string("ssl_server_name"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_server_name, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
@@ -534,6 +553,7 @@ ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
      * set by ngx_pcalloc():
      *
      *     sscf->protocols = 0;
+     *     sscf->certificate_values = NULL;
      *     sscf->dhparam = { 0, NULL };
      *     sscf->ecdh_curve = { 0, NULL };
      *     sscf->client_certificate = { 0, NULL };
@@ -547,6 +567,7 @@ ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
 
     sscf->enable = NGX_CONF_UNSET;
     sscf->prefer_server_ciphers = NGX_CONF_UNSET;
+    sscf->early_data = NGX_CONF_UNSET;
     sscf->buffer_size = NGX_CONF_UNSET_SIZE;
     sscf->verify = NGX_CONF_UNSET_UINT;
     sscf->verify_depth = NGX_CONF_UNSET_UINT;
@@ -589,6 +610,8 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->prefer_server_ciphers,
                          prev->prefer_server_ciphers, 0);
 
+    ngx_conf_merge_value(conf->early_data, prev->early_data, 0);
+
     ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
                          (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
                           |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
@@ -677,6 +700,15 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        ngx_ssl_cleanup_ctx(&conf->ssl);
+        return NGX_CONF_ERROR;
+    }
+
+    cln->handler = ngx_ssl_cleanup_ctx;
+    cln->data = &conf->ssl;
+
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
 
     if (SSL_CTX_set_tlsext_servername_callback(conf->ssl.ctx,
@@ -700,19 +732,36 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
                                           ngx_http_ssl_npn_advertised, NULL);
 #endif
 
-    cln = ngx_pool_cleanup_add(cf->pool, 0);
-    if (cln == NULL) {
+    if (ngx_http_ssl_compile_certificates(cf, conf) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
-    cln->handler = ngx_ssl_cleanup_ctx;
-    cln->data = &conf->ssl;
+    if (conf->certificate_values) {
 
-    if (ngx_ssl_certificates(cf, &conf->ssl, conf->certificates,
-                             conf->certificate_keys, conf->passwords)
-        != NGX_OK)
-    {
+#ifdef SSL_R_CERT_CB_ERROR
+
+        /* install callback to lookup certificates */
+
+        SSL_CTX_set_cert_cb(conf->ssl.ctx, ngx_http_ssl_certificate, conf);
+
+#else
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "variables in "
+                      "\"ssl_certificate\" and \"ssl_certificate_key\" "
+                      "directives are not supported on this platform");
         return NGX_CONF_ERROR;
+#endif
+
+    } else {
+
+        /* configure certificates */
+
+        if (ngx_ssl_certificates(cf, &conf->ssl, conf->certificates,
+                                 conf->certificate_keys, conf->passwords)
+            != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
     }
 
     if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
@@ -769,7 +818,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     }
 
     if (ngx_ssl_session_cache(&conf->ssl, &ngx_http_ssl_sess_id_ctx,
-                              conf->builtin_session_cache,
+                              conf->certificates, conf->builtin_session_cache,
                               conf->shm_zone, conf->session_timeout)
         != NGX_OK)
     {
@@ -804,10 +853,98 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     }
 
+    if (ngx_ssl_early_data(cf, &conf->ssl, conf->early_data) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     return NGX_CONF_OK;
 }
 
 
+static ngx_int_t
+ngx_http_ssl_compile_certificates(ngx_conf_t *cf,
+    ngx_http_ssl_srv_conf_t *conf)
+{
+    ngx_str_t                         *cert, *key;
+    ngx_uint_t                         i, nelts;
+    ngx_http_complex_value_t          *cv;
+    ngx_http_compile_complex_value_t   ccv;
+
+    cert = conf->certificates->elts;
+    key = conf->certificate_keys->elts;
+    nelts = conf->certificates->nelts;
+
+    for (i = 0; i < nelts; i++) {
+
+        if (ngx_http_script_variables_count(&cert[i])) {
+            goto found;
+        }
+
+        if (ngx_http_script_variables_count(&key[i])) {
+            goto found;
+        }
+    }
+
+    return NGX_OK;
+
+found:
+
+    conf->certificate_values = ngx_array_create(cf->pool, nelts,
+                                             sizeof(ngx_http_complex_value_t));
+    if (conf->certificate_values == NULL) {
+        return NGX_ERROR;
+    }
+
+    conf->certificate_key_values = ngx_array_create(cf->pool, nelts,
+                                             sizeof(ngx_http_complex_value_t));
+    if (conf->certificate_key_values == NULL) {
+        return NGX_ERROR;
+    }
+
+    for (i = 0; i < nelts; i++) {
+
+        cv = ngx_array_push(conf->certificate_values);
+        if (cv == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+        ccv.cf = cf;
+        ccv.value = &cert[i];
+        ccv.complex_value = cv;
+        ccv.zero = 1;
+
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        cv = ngx_array_push(conf->certificate_key_values);
+        if (cv == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+        ccv.cf = cf;
+        ccv.value = &key[i];
+        ccv.complex_value = cv;
+        ccv.zero = 1;
+
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    conf->passwords = ngx_ssl_preserve_passwords(cf, conf->passwords);
+    if (conf->passwords == NULL) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
 static char *
 ngx_http_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -966,10 +1103,12 @@ invalid:
 static ngx_int_t
 ngx_http_ssl_init(ngx_conf_t *cf)
 {
-    ngx_uint_t                   s;
+    ngx_uint_t                   a, p, s;
+    ngx_http_conf_addr_t        *addr;
+    ngx_http_conf_port_t        *port;
     ngx_http_ssl_srv_conf_t     *sscf;
     ngx_http_core_loc_conf_t    *clcf;
-    ngx_http_core_srv_conf_t   **cscfp;
+    ngx_http_core_srv_conf_t   **cscfp, *cscf;
     ngx_http_core_main_conf_t   *cmcf;
 
     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
@@ -993,5 +1132,32 @@ ngx_http_ssl_init(ngx_conf_t *cf)
         }
     }
 
+    if (cmcf->ports == NULL) {
+        return NGX_OK;
+    }
+
+    port = cmcf->ports->elts;
+    for (p = 0; p < cmcf->ports->nelts; p++) {
+
+        addr = port[p].addrs.elts;
+        for (a = 0; a < port[p].addrs.nelts; a++) {
+
+            if (!addr[a].opt.ssl) {
+                continue;
+            }
+
+            cscf = addr[a].default_server;
+            sscf = cscf->ctx->srv_conf[ngx_http_ssl_module.ctx_index];
+
+            if (sscf->certificates == NULL) {
+                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                              "no \"ssl_certificate\" is defined for "
+                              "the \"listen ... ssl\" directive in %s:%ui",
+                              cscf->file_name, cscf->line);
+                return NGX_ERROR;
+            }
+        }
+    }
+
     return NGX_OK;
 }
diff --git a/src/http/modules/ngx_http_ssl_module.h b/src/http/modules/ngx_http_ssl_module.h
index 57f5941..26fdccf 100644
--- a/src/http/modules/ngx_http_ssl_module.h
+++ b/src/http/modules/ngx_http_ssl_module.h
@@ -20,6 +20,7 @@ typedef struct {
     ngx_ssl_t                       ssl;
 
     ngx_flag_t                      prefer_server_ciphers;
+    ngx_flag_t                      early_data;
 
     ngx_uint_t                      protocols;
 
@@ -35,6 +36,9 @@ typedef struct {
     ngx_array_t                    *certificates;
     ngx_array_t                    *certificate_keys;
 
+    ngx_array_t                    *certificate_values;
+    ngx_array_t                    *certificate_key_values;
+
     ngx_str_t                       dhparam;
     ngx_str_t                       ecdh_curve;
     ngx_str_t                       client_certificate;
diff --git a/src/http/modules/ngx_http_upstream_hash_module.c b/src/http/modules/ngx_http_upstream_hash_module.c
index d67f34d..6c247b5 100644
--- a/src/http/modules/ngx_http_upstream_hash_module.c
+++ b/src/http/modules/ngx_http_upstream_hash_module.c
@@ -176,7 +176,7 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "get hash peer, try: %ui", pc->tries);
 
-    ngx_http_upstream_rr_peers_wlock(hp->rrp.peers);
+    ngx_http_upstream_rr_peers_rlock(hp->rrp.peers);
 
     if (hp->tries > 20 || hp->rrp.peers->single) {
         ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
@@ -228,10 +228,13 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
             goto next;
         }
 
+        ngx_http_upstream_rr_peer_lock(hp->rrp.peers, peer);
+
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                        "get hash peer, value:%uD, peer:%ui", hp->hash, p);
 
         if (peer->down) {
+            ngx_http_upstream_rr_peer_unlock(hp->rrp.peers, peer);
             goto next;
         }
 
@@ -239,10 +242,12 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
             && peer->fails >= peer->max_fails
             && now - peer->checked <= peer->fail_timeout)
         {
+            ngx_http_upstream_rr_peer_unlock(hp->rrp.peers, peer);
             goto next;
         }
 
         if (peer->max_conns && peer->conns >= peer->max_conns) {
+            ngx_http_upstream_rr_peer_unlock(hp->rrp.peers, peer);
             goto next;
         }
 
@@ -268,6 +273,7 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
         peer->checked = now;
     }
 
+    ngx_http_upstream_rr_peer_unlock(hp->rrp.peers, peer);
     ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
 
     hp->rrp.tried[n] |= m;
diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c
index 296108f..1fa01d9 100644
--- a/src/http/modules/ngx_http_upstream_ip_hash_module.c
+++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c
@@ -161,7 +161,7 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
 
     /* TODO: cached */
 
-    ngx_http_upstream_rr_peers_wlock(iphp->rrp.peers);
+    ngx_http_upstream_rr_peers_rlock(iphp->rrp.peers);
 
     if (iphp->tries > 20 || iphp->rrp.peers->single) {
         ngx_http_upstream_rr_peers_unlock(iphp->rrp.peers);
@@ -201,7 +201,10 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                        "get ip hash peer, hash: %ui %04XL", p, (uint64_t) m);
 
+        ngx_http_upstream_rr_peer_lock(iphp->rrp.peers, peer);
+
         if (peer->down) {
+            ngx_http_upstream_rr_peer_unlock(iphp->rrp.peers, peer);
             goto next;
         }
 
@@ -209,10 +212,12 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
             && peer->fails >= peer->max_fails
             && now - peer->checked <= peer->fail_timeout)
         {
+            ngx_http_upstream_rr_peer_unlock(iphp->rrp.peers, peer);
             goto next;
         }
 
         if (peer->max_conns && peer->conns >= peer->max_conns) {
+            ngx_http_upstream_rr_peer_unlock(iphp->rrp.peers, peer);
             goto next;
         }
 
@@ -238,6 +243,7 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
         peer->checked = now;
     }
 
+    ngx_http_upstream_rr_peer_unlock(iphp->rrp.peers, peer);
     ngx_http_upstream_rr_peers_unlock(iphp->rrp.peers);
 
     iphp->rrp.tried[n] |= m;
diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index 90a226d..bdc4ae5 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -12,6 +12,8 @@
 
 typedef struct {
     ngx_uint_t                         max_cached;
+    ngx_uint_t                         requests;
+    ngx_msec_t                         timeout;
 
     ngx_queue_t                        cache;
     ngx_queue_t                        free;
@@ -84,6 +86,20 @@ static ngx_command_t  ngx_http_upstream_keepalive_commands[] = {
       0,
       NULL },
 
+    { ngx_string("keepalive_timeout"),
+      NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_upstream_keepalive_srv_conf_t, timeout),
+      NULL },
+
+    { ngx_string("keepalive_requests"),
+      NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_upstream_keepalive_srv_conf_t, requests),
+      NULL },
+
       ngx_null_command
 };
 
@@ -133,6 +149,9 @@ ngx_http_upstream_init_keepalive(ngx_conf_t *cf,
     kcf = ngx_http_conf_upstream_srv_conf(us,
                                           ngx_http_upstream_keepalive_module);
 
+    ngx_conf_init_msec_value(kcf->timeout, 60000);
+    ngx_conf_init_uint_value(kcf->requests, 100);
+
     if (kcf->original_init_upstream(cf, us) != NGX_OK) {
         return NGX_ERROR;
     }
@@ -261,6 +280,10 @@ found:
     c->write->log = pc->log;
     c->pool->log = pc->log;
 
+    if (c->read->timer_set) {
+        ngx_del_timer(c->read);
+    }
+
     pc->connection = c;
     pc->cached = 1;
 
@@ -298,6 +321,10 @@ ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data,
         goto invalid;
     }
 
+    if (c->requests >= kp->conf->requests) {
+        goto invalid;
+    }
+
     if (!u->keepalive) {
         goto invalid;
     }
@@ -339,10 +366,9 @@ ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data,
 
     pc->connection = NULL;
 
-    if (c->read->timer_set) {
-        c->read->delayed = 0;
-        ngx_del_timer(c->read);
-    }
+    c->read->delayed = 0;
+    ngx_add_timer(c->read, kp->conf->timeout);
+
     if (c->write->timer_set) {
         ngx_del_timer(c->write);
     }
@@ -393,7 +419,7 @@ ngx_http_upstream_keepalive_close_handler(ngx_event_t *ev)
 
     c = ev->data;
 
-    if (c->close) {
+    if (c->close || c->read->timedout) {
         goto close;
     }
 
@@ -486,6 +512,9 @@ ngx_http_upstream_keepalive_create_conf(ngx_conf_t *cf)
      *     conf->max_cached = 0;
      */
 
+    conf->timeout = NGX_CONF_UNSET_MSEC;
+    conf->requests = NGX_CONF_UNSET_UINT;
+
     return conf;
 }
 
@@ -518,6 +547,8 @@ ngx_http_upstream_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     kcf->max_cached = n;
 
+    /* init upstream handler */
+
     uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);
 
     kcf->original_init_upstream = uscf->peer.init_upstream
diff --git a/src/http/modules/ngx_http_upstream_random_module.c b/src/http/modules/ngx_http_upstream_random_module.c
new file mode 100644
index 0000000..6f169c8
--- /dev/null
+++ b/src/http/modules/ngx_http_upstream_random_module.c
@@ -0,0 +1,502 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    ngx_http_upstream_rr_peer_t          *peer;
+    ngx_uint_t                            range;
+} ngx_http_upstream_random_range_t;
+
+
+typedef struct {
+    ngx_uint_t                            two;
+    ngx_http_upstream_random_range_t     *ranges;
+} ngx_http_upstream_random_srv_conf_t;
+
+
+typedef struct {
+    /* the round robin data must be first */
+    ngx_http_upstream_rr_peer_data_t      rrp;
+
+    ngx_http_upstream_random_srv_conf_t  *conf;
+    u_char                                tries;
+} ngx_http_upstream_random_peer_data_t;
+
+
+static ngx_int_t ngx_http_upstream_init_random(ngx_conf_t *cf,
+    ngx_http_upstream_srv_conf_t *us);
+static ngx_int_t ngx_http_upstream_update_random(ngx_pool_t *pool,
+    ngx_http_upstream_srv_conf_t *us);
+
+static ngx_int_t ngx_http_upstream_init_random_peer(ngx_http_request_t *r,
+    ngx_http_upstream_srv_conf_t *us);
+static ngx_int_t ngx_http_upstream_get_random_peer(ngx_peer_connection_t *pc,
+    void *data);
+static ngx_int_t ngx_http_upstream_get_random2_peer(ngx_peer_connection_t *pc,
+    void *data);
+static ngx_uint_t ngx_http_upstream_peek_random_peer(
+    ngx_http_upstream_rr_peers_t *peers,
+    ngx_http_upstream_random_peer_data_t *rp);
+static void *ngx_http_upstream_random_create_conf(ngx_conf_t *cf);
+static char *ngx_http_upstream_random(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+
+static ngx_command_t  ngx_http_upstream_random_commands[] = {
+
+    { ngx_string("random"),
+      NGX_HTTP_UPS_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE12,
+      ngx_http_upstream_random,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_upstream_random_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    ngx_http_upstream_random_create_conf,  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    NULL,                                  /* create location configuration */
+    NULL                                   /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_upstream_random_module = {
+    NGX_MODULE_V1,
+    &ngx_http_upstream_random_module_ctx,  /* module context */
+    ngx_http_upstream_random_commands,     /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_http_upstream_init_random(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "init random");
+
+    if (ngx_http_upstream_init_round_robin(cf, us) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    us->peer.init = ngx_http_upstream_init_random_peer;
+
+#if (NGX_HTTP_UPSTREAM_ZONE)
+    if (us->shm_zone) {
+        return NGX_OK;
+    }
+#endif
+
+    return ngx_http_upstream_update_random(cf->pool, us);
+}
+
+
+static ngx_int_t
+ngx_http_upstream_update_random(ngx_pool_t *pool,
+    ngx_http_upstream_srv_conf_t *us)
+{
+    size_t                                size;
+    ngx_uint_t                            i, total_weight;
+    ngx_http_upstream_rr_peer_t          *peer;
+    ngx_http_upstream_rr_peers_t         *peers;
+    ngx_http_upstream_random_range_t     *ranges;
+    ngx_http_upstream_random_srv_conf_t  *rcf;
+
+    rcf = ngx_http_conf_upstream_srv_conf(us, ngx_http_upstream_random_module);
+
+    peers = us->peer.data;
+
+    size = peers->number * sizeof(ngx_http_upstream_random_range_t);
+
+    ranges = pool ? ngx_palloc(pool, size) : ngx_alloc(size, ngx_cycle->log);
+    if (ranges == NULL) {
+        return NGX_ERROR;
+    }
+
+    total_weight = 0;
+
+    for (peer = peers->peer, i = 0; peer; peer = peer->next, i++) {
+        ranges[i].peer = peer;
+        ranges[i].range = total_weight;
+        total_weight += peer->weight;
+    }
+
+    rcf->ranges = ranges;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_upstream_init_random_peer(ngx_http_request_t *r,
+    ngx_http_upstream_srv_conf_t *us)
+{
+    ngx_http_upstream_random_srv_conf_t   *rcf;
+    ngx_http_upstream_random_peer_data_t  *rp;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "init random peer");
+
+    rcf = ngx_http_conf_upstream_srv_conf(us, ngx_http_upstream_random_module);
+
+    rp = ngx_palloc(r->pool, sizeof(ngx_http_upstream_random_peer_data_t));
+    if (rp == NULL) {
+        return NGX_ERROR;
+    }
+
+    r->upstream->peer.data = &rp->rrp;
+
+    if (ngx_http_upstream_init_round_robin_peer(r, us) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (rcf->two) {
+        r->upstream->peer.get = ngx_http_upstream_get_random2_peer;
+
+    } else {
+        r->upstream->peer.get = ngx_http_upstream_get_random_peer;
+    }
+
+    rp->conf = rcf;
+    rp->tries = 0;
+
+    ngx_http_upstream_rr_peers_rlock(rp->rrp.peers);
+
+#if (NGX_HTTP_UPSTREAM_ZONE)
+    if (rp->rrp.peers->shpool && rcf->ranges == NULL) {
+        if (ngx_http_upstream_update_random(NULL, us) != NGX_OK) {
+            ngx_http_upstream_rr_peers_unlock(rp->rrp.peers);
+            return NGX_ERROR;
+        }
+    }
+#endif
+
+    ngx_http_upstream_rr_peers_unlock(rp->rrp.peers);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_upstream_get_random_peer(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_http_upstream_random_peer_data_t  *rp = data;
+
+    time_t                             now;
+    uintptr_t                          m;
+    ngx_uint_t                         i, n;
+    ngx_http_upstream_rr_peer_t       *peer;
+    ngx_http_upstream_rr_peers_t      *peers;
+    ngx_http_upstream_rr_peer_data_t  *rrp;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                   "get random peer, try: %ui", pc->tries);
+
+    rrp = &rp->rrp;
+    peers = rrp->peers;
+
+    ngx_http_upstream_rr_peers_rlock(peers);
+
+    if (rp->tries > 20 || peers->single) {
+        ngx_http_upstream_rr_peers_unlock(peers);
+        return ngx_http_upstream_get_round_robin_peer(pc, rrp);
+    }
+
+    pc->cached = 0;
+    pc->connection = NULL;
+
+    now = ngx_time();
+
+    for ( ;; ) {
+
+        i = ngx_http_upstream_peek_random_peer(peers, rp);
+
+        peer = rp->conf->ranges[i].peer;
+
+        n = i / (8 * sizeof(uintptr_t));
+        m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
+
+        if (rrp->tried[n] & m) {
+            goto next;
+        }
+
+        ngx_http_upstream_rr_peer_lock(peers, peer);
+
+        if (peer->down) {
+            ngx_http_upstream_rr_peer_unlock(peers, peer);
+            goto next;
+        }
+
+        if (peer->max_fails
+            && peer->fails >= peer->max_fails
+            && now - peer->checked <= peer->fail_timeout)
+        {
+            ngx_http_upstream_rr_peer_unlock(peers, peer);
+            goto next;
+        }
+
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            ngx_http_upstream_rr_peer_unlock(peers, peer);
+            goto next;
+        }
+
+        break;
+
+    next:
+
+        if (++rp->tries > 20) {
+            ngx_http_upstream_rr_peers_unlock(peers);
+            return ngx_http_upstream_get_round_robin_peer(pc, rrp);
+        }
+    }
+
+    rrp->current = peer;
+
+    if (now - peer->checked > peer->fail_timeout) {
+        peer->checked = now;
+    }
+
+    pc->sockaddr = peer->sockaddr;
+    pc->socklen = peer->socklen;
+    pc->name = &peer->name;
+
+    peer->conns++;
+
+    ngx_http_upstream_rr_peer_unlock(peers, peer);
+    ngx_http_upstream_rr_peers_unlock(peers);
+
+    rrp->tried[n] |= m;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_upstream_get_random2_peer(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_http_upstream_random_peer_data_t  *rp = data;
+
+    time_t                             now;
+    uintptr_t                          m;
+    ngx_uint_t                         i, n, p;
+    ngx_http_upstream_rr_peer_t       *peer, *prev;
+    ngx_http_upstream_rr_peers_t      *peers;
+    ngx_http_upstream_rr_peer_data_t  *rrp;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                   "get random2 peer, try: %ui", pc->tries);
+
+    rrp = &rp->rrp;
+    peers = rrp->peers;
+
+    ngx_http_upstream_rr_peers_wlock(peers);
+
+    if (rp->tries > 20 || peers->single) {
+        ngx_http_upstream_rr_peers_unlock(peers);
+        return ngx_http_upstream_get_round_robin_peer(pc, rrp);
+    }
+
+    pc->cached = 0;
+    pc->connection = NULL;
+
+    now = ngx_time();
+
+    prev = NULL;
+
+#if (NGX_SUPPRESS_WARN)
+    p = 0;
+#endif
+
+    for ( ;; ) {
+
+        i = ngx_http_upstream_peek_random_peer(peers, rp);
+
+        peer = rp->conf->ranges[i].peer;
+
+        if (peer == prev) {
+            goto next;
+        }
+
+        n = i / (8 * sizeof(uintptr_t));
+        m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
+
+        if (rrp->tried[n] & m) {
+            goto next;
+        }
+
+        if (peer->down) {
+            goto next;
+        }
+
+        if (peer->max_fails
+            && peer->fails >= peer->max_fails
+            && now - peer->checked <= peer->fail_timeout)
+        {
+            goto next;
+        }
+
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            goto next;
+        }
+
+        if (prev) {
+            if (peer->conns * prev->weight > prev->conns * peer->weight) {
+                peer = prev;
+                n = p / (8 * sizeof(uintptr_t));
+                m = (uintptr_t) 1 << p % (8 * sizeof(uintptr_t));
+            }
+
+            break;
+        }
+
+        prev = peer;
+        p = i;
+
+    next:
+
+        if (++rp->tries > 20) {
+            ngx_http_upstream_rr_peers_unlock(peers);
+            return ngx_http_upstream_get_round_robin_peer(pc, rrp);
+        }
+    }
+
+    rrp->current = peer;
+
+    if (now - peer->checked > peer->fail_timeout) {
+        peer->checked = now;
+    }
+
+    pc->sockaddr = peer->sockaddr;
+    pc->socklen = peer->socklen;
+    pc->name = &peer->name;
+
+    peer->conns++;
+
+    ngx_http_upstream_rr_peers_unlock(peers);
+
+    rrp->tried[n] |= m;
+
+    return NGX_OK;
+}
+
+
+static ngx_uint_t
+ngx_http_upstream_peek_random_peer(ngx_http_upstream_rr_peers_t *peers,
+    ngx_http_upstream_random_peer_data_t *rp)
+{
+    ngx_uint_t  i, j, k, x;
+
+    x = ngx_random() % peers->total_weight;
+
+    i = 0;
+    j = peers->number;
+
+    while (j - i > 1) {
+        k = (i + j) / 2;
+
+        if (x < rp->conf->ranges[k].range) {
+            j = k;
+
+        } else {
+            i = k;
+        }
+    }
+
+    return i;
+}
+
+
+static void *
+ngx_http_upstream_random_create_conf(ngx_conf_t *cf)
+{
+    ngx_http_upstream_random_srv_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_random_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->two = 0;
+     */
+
+    return conf;
+}
+
+
+static char *
+ngx_http_upstream_random(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_upstream_random_srv_conf_t  *rcf = conf;
+
+    ngx_str_t                     *value;
+    ngx_http_upstream_srv_conf_t  *uscf;
+
+    uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);
+
+    if (uscf->peer.init_upstream) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "load balancing method redefined");
+    }
+
+    uscf->peer.init_upstream = ngx_http_upstream_init_random;
+
+    uscf->flags = NGX_HTTP_UPSTREAM_CREATE
+                  |NGX_HTTP_UPSTREAM_WEIGHT
+                  |NGX_HTTP_UPSTREAM_MAX_CONNS
+                  |NGX_HTTP_UPSTREAM_MAX_FAILS
+                  |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
+                  |NGX_HTTP_UPSTREAM_DOWN;
+
+    if (cf->args->nelts == 1) {
+        return NGX_CONF_OK;
+    }
+
+    value = cf->args->elts;
+
+    if (ngx_strcmp(value[1].data, "two") == 0) {
+        rcf->two = 1;
+
+    } else {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\"", &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->args->nelts == 2) {
+        return NGX_CONF_OK;
+    }
+
+    if (ngx_strcmp(value[2].data, "least_conn") != 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\"", &value[2]);
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
diff --git a/src/http/modules/ngx_http_userid_filter_module.c b/src/http/modules/ngx_http_userid_filter_module.c
index a1a5493..31cf402 100644
--- a/src/http/modules/ngx_http_userid_filter_module.c
+++ b/src/http/modules/ngx_http_userid_filter_module.c
@@ -545,6 +545,13 @@ ngx_http_userid_create_uid(ngx_http_request_t *r, ngx_http_userid_ctx_t *ctx,
 
                 break;
 #endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+            case AF_UNIX:
+                ctx->uid_set[0] = 0;
+                break;
+#endif
+
             default: /* AF_INET */
                 sin = (struct sockaddr_in *) c->local_sockaddr;
                 ctx->uid_set[0] = sin->sin_addr.s_addr;
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 238bcf8..56dc236 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -204,6 +204,13 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
       offsetof(ngx_http_uwsgi_loc_conf_t, upstream.local),
       NULL },
 
+    { ngx_string("uwsgi_socket_keepalive"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_uwsgi_loc_conf_t, upstream.socket_keepalive),
+      NULL },
+
     { ngx_string("uwsgi_connect_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_msec_slot,
@@ -954,12 +961,18 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
 #if 0
     /* allow custom uwsgi packet */
     if (len > 0 && len < 2) {
-        ngx_log_error (NGX_LOG_ALERT, r->connection->log, 0,
-                       "uwsgi request is too little: %uz", len);
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "uwsgi request is too little: %uz", len);
         return NGX_ERROR;
     }
 #endif
 
+    if (len > 65535) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "uwsgi request is too big: %uz", len);
+        return NGX_ERROR;
+    }
+
     b = ngx_create_temp_buf(r->pool, len + 4);
     if (b == NULL) {
         return NGX_ERROR;
@@ -1407,6 +1420,7 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.force_ranges = NGX_CONF_UNSET;
 
     conf->upstream.local = NGX_CONF_UNSET_PTR;
+    conf->upstream.socket_keepalive = NGX_CONF_UNSET;
 
     conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
@@ -1513,6 +1527,9 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_ptr_value(conf->upstream.local,
                               prev->upstream.local, NULL);
 
+    ngx_conf_merge_value(conf->upstream.socket_keepalive,
+                              prev->upstream.socket_keepalive, 0);
+
     ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
                               prev->upstream.connect_timeout, 60000);
 
@@ -2144,7 +2161,7 @@ ngx_http_uwsgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
@@ -2342,6 +2359,7 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
 
     cln = ngx_pool_cleanup_add(cf->pool, 0);
     if (cln == NULL) {
+        ngx_ssl_cleanup_ctx(uwcf->upstream.ssl);
         return NGX_ERROR;
     }
 
@@ -2391,6 +2409,13 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
         }
     }
 
+    if (ngx_ssl_client_session_cache(cf, uwcf->upstream.ssl,
+                                     uwcf->upstream.ssl_session_reuse)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     return NGX_OK;
 }
 
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 9d8b6d7..79ef9c6 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1157,7 +1157,7 @@ ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
         }
     }
 
-    sa = &lsopt->sockaddr.sockaddr;
+    sa = lsopt->sockaddr;
     p = ngx_inet_get_port(sa);
 
     port = cmcf->ports->elts;
@@ -1209,8 +1209,8 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 
     for (i = 0; i < port->addrs.nelts; i++) {
 
-        if (ngx_cmp_sockaddr(&lsopt->sockaddr.sockaddr, lsopt->socklen,
-                             &addr[i].opt.sockaddr.sockaddr,
+        if (ngx_cmp_sockaddr(lsopt->sockaddr, lsopt->socklen,
+                             addr[i].opt.sockaddr,
                              addr[i].opt.socklen, 0)
             != NGX_OK)
         {
@@ -1239,7 +1239,8 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 
             if (addr[i].opt.set) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                        "duplicate listen options for %s", addr[i].opt.addr);
+                                   "duplicate listen options for %V",
+                                   &addr[i].opt.addr_text);
                 return NGX_ERROR;
             }
 
@@ -1252,7 +1253,8 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 
             if (default_server) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                        "a duplicate default server for %s", addr[i].opt.addr);
+                                   "a duplicate default server for %V",
+                                   &addr[i].opt.addr_text);
                 return NGX_ERROR;
             }
 
@@ -1305,8 +1307,8 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
     if (lsopt->http2 && lsopt->ssl) {
         ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
                            "nginx was built with OpenSSL that lacks ALPN "
-                           "and NPN support, HTTP/2 is not enabled for %s",
-                           lsopt->addr);
+                           "and NPN support, HTTP/2 is not enabled for %V",
+                           &lsopt->addr_text);
     }
 
 #endif
@@ -1354,7 +1356,8 @@ ngx_http_add_server(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
         for (i = 0; i < addr->servers.nelts; i++) {
             if (server[i] == cscf) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "a duplicate listen %s", addr->opt.addr);
+                                   "a duplicate listen %V",
+                                   &addr->opt.addr_text);
                 return NGX_ERROR;
             }
         }
@@ -1471,15 +1474,15 @@ ngx_http_server_names(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf,
 
             if (rc == NGX_DECLINED) {
                 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                              "invalid server name or wildcard \"%V\" on %s",
-                              &name[n].name, addr->opt.addr);
+                              "invalid server name or wildcard \"%V\" on %V",
+                              &name[n].name, &addr->opt.addr_text);
                 return NGX_ERROR;
             }
 
             if (rc == NGX_BUSY) {
                 ngx_log_error(NGX_LOG_WARN, cf->log, 0,
-                              "conflicting server name \"%V\" on %s, ignored",
-                              &name[n].name, addr->opt.addr);
+                              "conflicting server name \"%V\" on %V, ignored",
+                              &name[n].name, &addr->opt.addr_text);
             }
         }
     }
@@ -1685,10 +1688,6 @@ ngx_http_init_listening(ngx_conf_t *cf, ngx_http_conf_port_t *port)
             break;
         }
 
-        if (ngx_clone_listening(cf, ls) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
         addr++;
         last--;
     }
@@ -1704,8 +1703,7 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
     ngx_http_core_loc_conf_t  *clcf;
     ngx_http_core_srv_conf_t  *cscf;
 
-    ls = ngx_create_listening(cf, &addr->opt.sockaddr.sockaddr,
-                              addr->opt.socklen);
+    ls = ngx_create_listening(cf, addr->opt.sockaddr, addr->opt.socklen);
     if (ls == NULL) {
         return NULL;
     }
@@ -1795,7 +1793,7 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport,
 
     for (i = 0; i < hport->naddrs; i++) {
 
-        sin = &addr[i].opt.sockaddr.sockaddr_in;
+        sin = (struct sockaddr_in *) addr[i].opt.sockaddr;
         addrs[i].addr = sin->sin_addr.s_addr;
         addrs[i].conf.default_server = addr[i].default_server;
 #if (NGX_HTTP_SSL)
@@ -1860,7 +1858,7 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
 
     for (i = 0; i < hport->naddrs; i++) {
 
-        sin6 = &addr[i].opt.sockaddr.sockaddr_in6;
+        sin6 = (struct sockaddr_in6 *) addr[i].opt.sockaddr;
         addrs6[i].addr6 = sin6->sin6_addr;
         addrs6[i].conf.default_server = addr[i].default_server;
 #if (NGX_HTTP_SSL)
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index afab4f6..8b43857 100644
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -88,6 +88,10 @@ void ngx_http_close_connection(ngx_connection_t *c);
 #if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME)
 int ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg);
 #endif
+#if (NGX_HTTP_SSL && defined SSL_R_CERT_CB_ERROR)
+int ngx_http_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg);
+#endif
+
 
 ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b);
 ngx_int_t ngx_http_parse_uri(ngx_http_request_t *r);
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 6b318dd..cb49ef7 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2318,6 +2318,7 @@ ngx_http_subrequest(ngx_http_request_t *r,
     sr->unparsed_uri = r->unparsed_uri;
     sr->method_name = ngx_http_core_get_method;
     sr->http_protocol = r->http_protocol;
+    sr->schema = r->schema;
 
     ngx_http_set_exten(sr);
 
@@ -2385,6 +2386,14 @@ ngx_http_subrequest(ngx_http_request_t *r,
         sr->phase_handler = r->phase_handler;
         sr->write_event_handler = ngx_http_core_run_phases;
 
+#if (NGX_PCRE)
+        sr->ncaptures = r->ncaptures;
+        sr->captures = r->captures;
+        sr->captures_data = r->captures_data;
+        sr->realloc_captures = 1;
+        r->realloc_captures = 1;
+#endif
+
         ngx_http_update_location_config(sr);
     }
 
@@ -2706,6 +2715,8 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
 {
     char                        *rv;
     void                        *mconf;
+    size_t                       len;
+    u_char                      *p;
     ngx_uint_t                   i;
     ngx_conf_t                   pcf;
     ngx_http_module_t           *module;
@@ -2793,7 +2804,14 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
     if (rv == NGX_CONF_OK && !cscf->listen) {
         ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t));
 
-        sin = &lsopt.sockaddr.sockaddr_in;
+        p = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in));
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lsopt.sockaddr = (struct sockaddr *) p;
+
+        sin = (struct sockaddr_in *) p;
 
         sin->sin_family = AF_INET;
 #if (NGX_WIN32)
@@ -2816,8 +2834,16 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
 #endif
         lsopt.wildcard = 1;
 
-        (void) ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen,
-                             lsopt.addr, NGX_SOCKADDR_STRLEN, 1);
+        len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
+
+        p = ngx_pnalloc(cf->pool, len);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        lsopt.addr_text.data = p;
+        lsopt.addr_text.len = ngx_sock_ntop(lsopt.sockaddr, lsopt.socklen, p,
+                                            len, 1);
 
         if (ngx_http_add_listen(cf, cscf, &lsopt) != NGX_OK) {
             return NGX_CONF_ERROR;
@@ -3256,6 +3282,9 @@ ngx_http_core_create_srv_conf(ngx_conf_t *cf)
     cscf->merge_slashes = NGX_CONF_UNSET;
     cscf->underscores_in_headers = NGX_CONF_UNSET;
 
+    cscf->file_name = cf->conf_file->file.name.data;
+    cscf->line = cf->conf_file->line;
+
     return cscf;
 }
 
@@ -3767,9 +3796,6 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t));
 
-    ngx_memcpy(&lsopt.sockaddr.sockaddr, &u.sockaddr, u.socklen);
-
-    lsopt.socklen = u.socklen;
     lsopt.backlog = NGX_LISTEN_BACKLOG;
     lsopt.rcvbuf = -1;
     lsopt.sndbuf = -1;
@@ -3779,14 +3805,10 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #if (NGX_HAVE_TCP_FASTOPEN)
     lsopt.fastopen = -1;
 #endif
-    lsopt.wildcard = u.wildcard;
 #if (NGX_HAVE_INET6)
     lsopt.ipv6only = 1;
 #endif
 
-    (void) ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen, lsopt.addr,
-                         NGX_SOCKADDR_STRLEN, 1);
-
     for (n = 2; n < cf->args->nelts; n++) {
 
         if (ngx_strcmp(value[n].data, "default_server") == 0
@@ -3911,34 +3933,22 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strncmp(value[n].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-            struct sockaddr  *sa;
+            if (ngx_strcmp(&value[n].data[10], "n") == 0) {
+                lsopt.ipv6only = 1;
 
-            sa = &lsopt.sockaddr.sockaddr;
-
-            if (sa->sa_family == AF_INET6) {
-
-                if (ngx_strcmp(&value[n].data[10], "n") == 0) {
-                    lsopt.ipv6only = 1;
-
-                } else if (ngx_strcmp(&value[n].data[10], "ff") == 0) {
-                    lsopt.ipv6only = 0;
-
-                } else {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "invalid ipv6only flags \"%s\"",
-                                       &value[n].data[9]);
-                    return NGX_CONF_ERROR;
-                }
-
-                lsopt.set = 1;
-                lsopt.bind = 1;
+            } else if (ngx_strcmp(&value[n].data[10], "ff") == 0) {
+                lsopt.ipv6only = 0;
 
             } else {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "ipv6only is not supported "
-                                   "on addr \"%s\", ignored", lsopt.addr);
+                                   "invalid ipv6only flags \"%s\"",
+                                   &value[n].data[9]);
+                return NGX_CONF_ERROR;
             }
 
+            lsopt.set = 1;
+            lsopt.bind = 1;
+
             continue;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -4094,11 +4104,18 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    if (ngx_http_add_listen(cf, cscf, &lsopt) == NGX_OK) {
-        return NGX_CONF_OK;
+    for (n = 0; n < u.naddrs; n++) {
+        lsopt.sockaddr = u.addrs[n].sockaddr;
+        lsopt.socklen = u.addrs[n].socklen;
+        lsopt.addr_text = u.addrs[n].name;
+        lsopt.wildcard = ngx_inet_wildcard(lsopt.sockaddr);
+
+        if (ngx_http_add_listen(cf, cscf, &lsopt) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
     }
 
-    return NGX_CONF_ERROR;
+    return NGX_CONF_OK;
 }
 
 
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index d798504..85f6d66 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -65,8 +65,9 @@ typedef struct ngx_http_core_loc_conf_s  ngx_http_core_loc_conf_t;
 
 
 typedef struct {
-    ngx_sockaddr_t             sockaddr;
+    struct sockaddr           *sockaddr;
     socklen_t                  socklen;
+    ngx_str_t                  addr_text;
 
     unsigned                   set:1;
     unsigned                   default_server:1;
@@ -100,8 +101,6 @@ typedef struct {
 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
     char                      *accept_filter;
 #endif
-
-    u_char                     addr[NGX_SOCKADDR_STRLEN + 1];
 } ngx_http_listen_opt_t;
 
 
@@ -184,6 +183,9 @@ typedef struct {
     /* server ctx */
     ngx_http_conf_ctx_t        *ctx;
 
+    u_char                     *file_name;
+    ngx_uint_t                  line;
+
     ngx_str_t                   server_name;
 
     size_t                      connection_pool_size;
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 3b2b68a..ecdf11e 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -2418,23 +2418,32 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
             p = (u_char *) ngx_strchr(name.data, ':');
 
-            if (p) {
-                name.len = p - name.data;
-
-                p++;
-
-                s.len = value[i].data + value[i].len - p;
-                s.data = p;
-
-                size = ngx_parse_size(&s);
-                if (size > 8191) {
-                    continue;
-                }
+            if (p == NULL) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid keys zone size \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
             }
 
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid keys zone size \"%V\"", &value[i]);
-            return NGX_CONF_ERROR;
+            name.len = p - name.data;
+
+            s.data = p + 1;
+            s.len = value[i].data + value[i].len - s.data;
+
+            size = ngx_parse_size(&s);
+
+            if (size == NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid keys zone size \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            if (size < (ssize_t) (2 * ngx_pagesize)) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "keys zone \"%V\" is too small", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
         }
 
         if (ngx_strncmp(value[i].data, "inactive=", 9) == 0) {
@@ -2620,7 +2629,8 @@ ngx_http_file_cache_valid_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 
     time_t                    valid;
     ngx_str_t                *value;
-    ngx_uint_t                i, n, status;
+    ngx_int_t                 status;
+    ngx_uint_t                i, n;
     ngx_array_t             **a;
     ngx_http_cache_valid_t   *v;
     static ngx_uint_t         statuses[] = { 200, 301, 302 };
@@ -2668,7 +2678,7 @@ ngx_http_file_cache_valid_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
         } else {
 
             status = ngx_atoi(value[i].data, value[i].len);
-            if (status < 100) {
+            if (status < 100 || status > 599) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                    "invalid status \"%V\"", &value[i]);
                 return NGX_CONF_ERROR;
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index 844054c..d9a1dbe 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -307,6 +307,11 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 break;
             }
 
+            if ((ch >= '0' && ch <= '9') || ch == '+' || ch == '-' || ch == '.')
+            {
+                break;
+            }
+
             switch (ch) {
             case ':':
                 r->schema_end = p;
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index c88c271..80c1965 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -11,6 +11,7 @@
 
 
 static void ngx_http_wait_request_handler(ngx_event_t *ev);
+static ngx_http_request_t *ngx_http_alloc_request(ngx_connection_t *c);
 static void ngx_http_process_request_line(ngx_event_t *rev);
 static void ngx_http_process_request_headers(ngx_event_t *rev);
 static ssize_t ngx_http_read_request_header(ngx_http_request_t *r);
@@ -336,19 +337,8 @@ ngx_http_init_connection(ngx_connection_t *c)
     sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
 
     if (sscf->enable || hc->addr_conf->ssl) {
-
-        c->log->action = "SSL handshaking";
-
-        if (hc->addr_conf->ssl && sscf->ssl.ctx == NULL) {
-            ngx_log_error(NGX_LOG_ERR, c->log, 0,
-                          "no \"ssl_certificate\" is defined "
-                          "in server listening on SSL port");
-            ngx_http_close_connection(c);
-            return;
-        }
-
         hc->ssl = 1;
-
+        c->log->action = "SSL handshaking";
         rev->handler = ngx_http_ssl_handshake;
     }
     }
@@ -513,18 +503,46 @@ ngx_http_wait_request_handler(ngx_event_t *rev)
 
 ngx_http_request_t *
 ngx_http_create_request(ngx_connection_t *c)
+{
+    ngx_http_request_t        *r;
+    ngx_http_log_ctx_t        *ctx;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    r = ngx_http_alloc_request(c);
+    if (r == NULL) {
+        return NULL;
+    }
+
+    c->requests++;
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    ngx_set_connection_log(c, clcf->error_log);
+
+    ctx = c->log->data;
+    ctx->request = r;
+    ctx->current_request = r;
+
+#if (NGX_STAT_STUB)
+    (void) ngx_atomic_fetch_add(ngx_stat_reading, 1);
+    r->stat_reading = 1;
+    (void) ngx_atomic_fetch_add(ngx_stat_requests, 1);
+#endif
+
+    return r;
+}
+
+
+static ngx_http_request_t *
+ngx_http_alloc_request(ngx_connection_t *c)
 {
     ngx_pool_t                 *pool;
     ngx_time_t                 *tp;
     ngx_http_request_t         *r;
-    ngx_http_log_ctx_t         *ctx;
     ngx_http_connection_t      *hc;
     ngx_http_core_srv_conf_t   *cscf;
-    ngx_http_core_loc_conf_t   *clcf;
     ngx_http_core_main_conf_t  *cmcf;
 
-    c->requests++;
-
     hc = c->data;
 
     cscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_core_module);
@@ -552,10 +570,6 @@ ngx_http_create_request(ngx_connection_t *c)
 
     r->read_event_handler = ngx_http_block_reading;
 
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-    ngx_set_connection_log(r->connection, clcf->error_log);
-
     r->header_in = hc->busy ? hc->busy->buf : c->buffer;
 
     if (ngx_list_init(&r->headers_out.headers, r->pool, 20,
@@ -615,17 +629,8 @@ ngx_http_create_request(ngx_connection_t *c)
 
     r->http_state = NGX_HTTP_READING_REQUEST_STATE;
 
-    ctx = c->log->data;
-    ctx->request = r;
-    ctx->current_request = r;
     r->log_handler = ngx_http_log_error_handler;
 
-#if (NGX_STAT_STUB)
-    (void) ngx_atomic_fetch_add(ngx_stat_reading, 1);
-    r->stat_reading = 1;
-    (void) ngx_atomic_fetch_add(ngx_stat_requests, 1);
-#endif
-
     return r;
 }
 
@@ -844,11 +849,13 @@ ngx_http_ssl_handshake_handler(ngx_connection_t *c)
     ngx_http_close_connection(c);
 }
 
+
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
 
 int
 ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 {
+    ngx_int_t                  rc;
     ngx_str_t                  host;
     const char                *servername;
     ngx_connection_t          *c;
@@ -857,16 +864,17 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
     ngx_http_core_loc_conf_t  *clcf;
     ngx_http_core_srv_conf_t  *cscf;
 
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    if (c->ssl->handshaked) {
+        *ad = SSL_AD_NO_RENEGOTIATION;
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
     servername = SSL_get_servername(ssl_conn, TLSEXT_NAMETYPE_host_name);
 
     if (servername == NULL) {
-        return SSL_TLSEXT_ERR_NOACK;
-    }
-
-    c = ngx_ssl_get_connection(ssl_conn);
-
-    if (c->ssl->renegotiation) {
-        return SSL_TLSEXT_ERR_NOACK;
+        return SSL_TLSEXT_ERR_OK;
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
@@ -875,27 +883,40 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
     host.len = ngx_strlen(servername);
 
     if (host.len == 0) {
-        return SSL_TLSEXT_ERR_NOACK;
+        return SSL_TLSEXT_ERR_OK;
     }
 
     host.data = (u_char *) servername;
 
-    if (ngx_http_validate_host(&host, c->pool, 1) != NGX_OK) {
-        return SSL_TLSEXT_ERR_NOACK;
+    rc = ngx_http_validate_host(&host, c->pool, 1);
+
+    if (rc == NGX_ERROR) {
+        *ad = SSL_AD_INTERNAL_ERROR;
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
+    if (rc == NGX_DECLINED) {
+        return SSL_TLSEXT_ERR_OK;
     }
 
     hc = c->data;
 
-    if (ngx_http_find_virtual_server(c, hc->addr_conf->virtual_names, &host,
-                                     NULL, &cscf)
-        != NGX_OK)
-    {
-        return SSL_TLSEXT_ERR_NOACK;
+    rc = ngx_http_find_virtual_server(c, hc->addr_conf->virtual_names, &host,
+                                      NULL, &cscf);
+
+    if (rc == NGX_ERROR) {
+        *ad = SSL_AD_INTERNAL_ERROR;
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
+    if (rc == NGX_DECLINED) {
+        return SSL_TLSEXT_ERR_OK;
     }
 
     hc->ssl_servername = ngx_palloc(c->pool, sizeof(ngx_str_t));
     if (hc->ssl_servername == NULL) {
-        return SSL_TLSEXT_ERR_NOACK;
+        *ad = SSL_AD_INTERNAL_ERROR;
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
     }
 
     *hc->ssl_servername = host;
@@ -930,6 +951,10 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 #endif
 
         SSL_set_options(ssl_conn, SSL_CTX_get_options(sscf->ssl.ctx));
+
+#ifdef SSL_OP_NO_RENEGOTIATION
+        SSL_set_options(ssl_conn, SSL_OP_NO_RENEGOTIATION);
+#endif
     }
 
     return SSL_TLSEXT_ERR_OK;
@@ -937,6 +962,75 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 
 #endif
 
+
+#ifdef SSL_R_CERT_CB_ERROR
+
+int
+ngx_http_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg)
+{
+    ngx_str_t                  cert, key;
+    ngx_uint_t                 i, nelts;
+    ngx_connection_t          *c;
+    ngx_http_request_t        *r;
+    ngx_http_ssl_srv_conf_t   *sscf;
+    ngx_http_complex_value_t  *certs, *keys;
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    if (c->ssl->handshaked) {
+        return 0;
+    }
+
+    r = ngx_http_alloc_request(c);
+    if (r == NULL) {
+        return 0;
+    }
+
+    r->logged = 1;
+
+    sscf = arg;
+
+    nelts = sscf->certificate_values->nelts;
+    certs = sscf->certificate_values->elts;
+    keys = sscf->certificate_key_values->elts;
+
+    for (i = 0; i < nelts; i++) {
+
+        if (ngx_http_complex_value(r, &certs[i], &cert) != NGX_OK) {
+            goto failed;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "ssl cert: \"%s\"", cert.data);
+
+        if (ngx_http_complex_value(r, &keys[i], &key) != NGX_OK) {
+            goto failed;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "ssl key: \"%s\"", key.data);
+
+        if (ngx_ssl_connection_certificate(c, r->pool, &cert, &key,
+                                           sscf->passwords)
+            != NGX_OK)
+        {
+            goto failed;
+        }
+    }
+
+    ngx_http_free_request(r, 0);
+    c->destroyed = 0;
+    return 1;
+
+failed:
+
+    ngx_http_free_request(r, 0);
+    c->destroyed = 0;
+    return 0;
+}
+
+#endif
+
 #endif
 
 
@@ -970,7 +1064,7 @@ ngx_http_process_request_line(ngx_event_t *rev)
             n = ngx_http_read_request_header(r);
 
             if (n == NGX_AGAIN || n == NGX_ERROR) {
-                return;
+                break;
             }
         }
 
@@ -995,10 +1089,15 @@ ngx_http_process_request_line(ngx_event_t *rev)
             }
 
             if (ngx_http_process_request_uri(r) != NGX_OK) {
-                return;
+                break;
             }
 
-            if (r->host_start && r->host_end) {
+            if (r->schema_end) {
+                r->schema.len = r->schema_end - r->schema_start;
+                r->schema.data = r->schema_start;
+            }
+
+            if (r->host_end) {
 
                 host.len = r->host_end - r->host_start;
                 host.data = r->host_start;
@@ -1009,16 +1108,16 @@ ngx_http_process_request_line(ngx_event_t *rev)
                     ngx_log_error(NGX_LOG_INFO, c->log, 0,
                                   "client sent invalid host in request line");
                     ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-                    return;
+                    break;
                 }
 
                 if (rc == NGX_ERROR) {
                     ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                    return;
+                    break;
                 }
 
                 if (ngx_http_set_virtual_server(r, &host) == NGX_ERROR) {
-                    return;
+                    break;
                 }
 
                 r->headers_in.server = host;
@@ -1030,11 +1129,11 @@ ngx_http_process_request_line(ngx_event_t *rev)
                     && ngx_http_set_virtual_server(r, &r->headers_in.server)
                        == NGX_ERROR)
                 {
-                    return;
+                    break;
                 }
 
                 ngx_http_process_request(r);
-                return;
+                break;
             }
 
 
@@ -1043,7 +1142,7 @@ ngx_http_process_request_line(ngx_event_t *rev)
                 != NGX_OK)
             {
                 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                return;
+                break;
             }
 
             c->log->action = "reading client request headers";
@@ -1051,7 +1150,7 @@ ngx_http_process_request_line(ngx_event_t *rev)
             rev->handler = ngx_http_process_request_headers;
             ngx_http_process_request_headers(rev);
 
-            return;
+            break;
         }
 
         if (rc != NGX_AGAIN) {
@@ -1068,7 +1167,7 @@ ngx_http_process_request_line(ngx_event_t *rev)
                 ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
             }
 
-            return;
+            break;
         }
 
         /* NGX_AGAIN: a request line parsing is still incomplete */
@@ -1079,7 +1178,7 @@ ngx_http_process_request_line(ngx_event_t *rev)
 
             if (rv == NGX_ERROR) {
                 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                return;
+                break;
             }
 
             if (rv == NGX_DECLINED) {
@@ -1089,10 +1188,12 @@ ngx_http_process_request_line(ngx_event_t *rev)
                 ngx_log_error(NGX_LOG_INFO, c->log, 0,
                               "client sent too long URI");
                 ngx_http_finalize_request(r, NGX_HTTP_REQUEST_URI_TOO_LARGE);
-                return;
+                break;
             }
         }
     }
+
+    ngx_http_run_posted_requests(c);
 }
 
 
@@ -1254,7 +1355,7 @@ ngx_http_process_request_headers(ngx_event_t *rev)
 
                 if (rv == NGX_ERROR) {
                     ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                    return;
+                    break;
                 }
 
                 if (rv == NGX_DECLINED) {
@@ -1267,7 +1368,7 @@ ngx_http_process_request_headers(ngx_event_t *rev)
                                       "client sent too large request");
                         ngx_http_finalize_request(r,
                                             NGX_HTTP_REQUEST_HEADER_TOO_LARGE);
-                        return;
+                        break;
                     }
 
                     len = r->header_in->end - p;
@@ -1282,14 +1383,14 @@ ngx_http_process_request_headers(ngx_event_t *rev)
 
                     ngx_http_finalize_request(r,
                                             NGX_HTTP_REQUEST_HEADER_TOO_LARGE);
-                    return;
+                    break;
                 }
             }
 
             n = ngx_http_read_request_header(r);
 
             if (n == NGX_AGAIN || n == NGX_ERROR) {
-                return;
+                break;
             }
         }
 
@@ -1319,7 +1420,7 @@ ngx_http_process_request_headers(ngx_event_t *rev)
             h = ngx_list_push(&r->headers_in.headers);
             if (h == NULL) {
                 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                return;
+                break;
             }
 
             h->hash = r->header_hash;
@@ -1335,7 +1436,7 @@ ngx_http_process_request_headers(ngx_event_t *rev)
             h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
             if (h->lowcase_key == NULL) {
                 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                return;
+                break;
             }
 
             if (h->key.len == r->lowcase_index) {
@@ -1349,7 +1450,7 @@ ngx_http_process_request_headers(ngx_event_t *rev)
                                h->lowcase_key, h->key.len);
 
             if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
-                return;
+                break;
             }
 
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -1373,12 +1474,12 @@ ngx_http_process_request_headers(ngx_event_t *rev)
             rc = ngx_http_process_request_header(r);
 
             if (rc != NGX_OK) {
-                return;
+                break;
             }
 
             ngx_http_process_request(r);
 
-            return;
+            break;
         }
 
         if (rc == NGX_AGAIN) {
@@ -1394,8 +1495,10 @@ ngx_http_process_request_headers(ngx_event_t *rev)
                       "client sent invalid header line");
 
         ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-        return;
+        break;
     }
+
+    ngx_http_run_posted_requests(c);
 }
 
 
@@ -1950,8 +2053,6 @@ ngx_http_process_request(ngx_http_request_t *r)
     r->read_event_handler = ngx_http_block_reading;
 
     ngx_http_handler(r);
-
-    ngx_http_run_posted_requests(c);
 }
 
 
@@ -2359,6 +2460,7 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         || rc == NGX_HTTP_NO_CONTENT)
     {
         if (rc == NGX_HTTP_CLOSE) {
+            c->timedout = 1;
             ngx_http_terminate_request(r, rc);
             return;
         }
@@ -3316,6 +3418,10 @@ ngx_http_lingering_close_handler(ngx_event_t *rev)
 
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "lingering read: %z", n);
 
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
         if (n == NGX_ERROR || n == 0) {
             ngx_http_close_request(r, 0);
             return;
@@ -3508,9 +3614,11 @@ ngx_http_free_request(ngx_http_request_t *r, ngx_int_t rc)
         r->headers_out.status = rc;
     }
 
-    log->action = "logging request";
+    if (!r->logged) {
+        log->action = "logging request";
 
-    ngx_http_log_request(r);
+        ngx_http_log_request(r);
+    }
 
     log->action = "closing request";
 
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 39baa0f..fce70ef 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -412,6 +412,7 @@ struct ngx_http_request_s {
 
     ngx_str_t                         method_name;
     ngx_str_t                         http_protocol;
+    ngx_str_t                         schema;
 
     ngx_chain_t                      *out;
     ngx_http_request_t               *main;
@@ -498,6 +499,10 @@ struct ngx_http_request_s {
     unsigned                          gzip_vary:1;
 #endif
 
+#if (NGX_PCRE)
+    unsigned                          realloc_captures:1;
+#endif
+
     unsigned                          proxy:1;
     unsigned                          bypass_cache:1;
     unsigned                          no_cache:1;
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 1a87735..4153889 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -271,6 +271,34 @@ ngx_http_test_predicates(ngx_http_request_t *r, ngx_array_t *predicates)
 }
 
 
+ngx_int_t
+ngx_http_test_required_predicates(ngx_http_request_t *r,
+    ngx_array_t *predicates)
+{
+    ngx_str_t                  val;
+    ngx_uint_t                 i;
+    ngx_http_complex_value_t  *cv;
+
+    if (predicates == NULL) {
+        return NGX_OK;
+    }
+
+    cv = predicates->elts;
+
+    for (i = 0; i < predicates->nelts; i++) {
+        if (ngx_http_complex_value(r, &cv[i], &val) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (val.len == 0 || (val.len == 1 && val.data[0] == '0')) {
+            return NGX_DECLINED;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
 char *
 ngx_http_set_predicate_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
diff --git a/src/http/ngx_http_script.h b/src/http/ngx_http_script.h
index a5116d7..25bb6d7 100644
--- a/src/http/ngx_http_script.h
+++ b/src/http/ngx_http_script.h
@@ -214,6 +214,8 @@ char *ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 
 ngx_int_t ngx_http_test_predicates(ngx_http_request_t *r,
     ngx_array_t *predicates);
+ngx_int_t ngx_http_test_required_predicates(ngx_http_request_t *r,
+    ngx_array_t *predicates);
 char *ngx_http_set_predicate_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 2c1ff17..4ffb2cc 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -60,7 +60,7 @@ static u_char ngx_http_msie_refresh_tail[] =
 static char ngx_http_error_301_page[] =
 "<html>" CRLF
 "<head><title>301 Moved Permanently</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>301 Moved Permanently</h1></center>" CRLF
 ;
 
@@ -68,7 +68,7 @@ static char ngx_http_error_301_page[] =
 static char ngx_http_error_302_page[] =
 "<html>" CRLF
 "<head><title>302 Found</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>302 Found</h1></center>" CRLF
 ;
 
@@ -76,7 +76,7 @@ static char ngx_http_error_302_page[] =
 static char ngx_http_error_303_page[] =
 "<html>" CRLF
 "<head><title>303 See Other</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>303 See Other</h1></center>" CRLF
 ;
 
@@ -84,7 +84,7 @@ static char ngx_http_error_303_page[] =
 static char ngx_http_error_307_page[] =
 "<html>" CRLF
 "<head><title>307 Temporary Redirect</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>307 Temporary Redirect</h1></center>" CRLF
 ;
 
@@ -92,7 +92,7 @@ static char ngx_http_error_307_page[] =
 static char ngx_http_error_308_page[] =
 "<html>" CRLF
 "<head><title>308 Permanent Redirect</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>308 Permanent Redirect</h1></center>" CRLF
 ;
 
@@ -100,7 +100,7 @@ static char ngx_http_error_308_page[] =
 static char ngx_http_error_400_page[] =
 "<html>" CRLF
 "<head><title>400 Bad Request</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>400 Bad Request</h1></center>" CRLF
 ;
 
@@ -108,7 +108,7 @@ static char ngx_http_error_400_page[] =
 static char ngx_http_error_401_page[] =
 "<html>" CRLF
 "<head><title>401 Authorization Required</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>401 Authorization Required</h1></center>" CRLF
 ;
 
@@ -116,7 +116,7 @@ static char ngx_http_error_401_page[] =
 static char ngx_http_error_402_page[] =
 "<html>" CRLF
 "<head><title>402 Payment Required</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>402 Payment Required</h1></center>" CRLF
 ;
 
@@ -124,7 +124,7 @@ static char ngx_http_error_402_page[] =
 static char ngx_http_error_403_page[] =
 "<html>" CRLF
 "<head><title>403 Forbidden</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>403 Forbidden</h1></center>" CRLF
 ;
 
@@ -132,7 +132,7 @@ static char ngx_http_error_403_page[] =
 static char ngx_http_error_404_page[] =
 "<html>" CRLF
 "<head><title>404 Not Found</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>404 Not Found</h1></center>" CRLF
 ;
 
@@ -140,7 +140,7 @@ static char ngx_http_error_404_page[] =
 static char ngx_http_error_405_page[] =
 "<html>" CRLF
 "<head><title>405 Not Allowed</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>405 Not Allowed</h1></center>" CRLF
 ;
 
@@ -148,7 +148,7 @@ static char ngx_http_error_405_page[] =
 static char ngx_http_error_406_page[] =
 "<html>" CRLF
 "<head><title>406 Not Acceptable</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>406 Not Acceptable</h1></center>" CRLF
 ;
 
@@ -156,7 +156,7 @@ static char ngx_http_error_406_page[] =
 static char ngx_http_error_408_page[] =
 "<html>" CRLF
 "<head><title>408 Request Time-out</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>408 Request Time-out</h1></center>" CRLF
 ;
 
@@ -164,7 +164,7 @@ static char ngx_http_error_408_page[] =
 static char ngx_http_error_409_page[] =
 "<html>" CRLF
 "<head><title>409 Conflict</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>409 Conflict</h1></center>" CRLF
 ;
 
@@ -172,7 +172,7 @@ static char ngx_http_error_409_page[] =
 static char ngx_http_error_410_page[] =
 "<html>" CRLF
 "<head><title>410 Gone</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>410 Gone</h1></center>" CRLF
 ;
 
@@ -180,7 +180,7 @@ static char ngx_http_error_410_page[] =
 static char ngx_http_error_411_page[] =
 "<html>" CRLF
 "<head><title>411 Length Required</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>411 Length Required</h1></center>" CRLF
 ;
 
@@ -188,7 +188,7 @@ static char ngx_http_error_411_page[] =
 static char ngx_http_error_412_page[] =
 "<html>" CRLF
 "<head><title>412 Precondition Failed</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>412 Precondition Failed</h1></center>" CRLF
 ;
 
@@ -196,7 +196,7 @@ static char ngx_http_error_412_page[] =
 static char ngx_http_error_413_page[] =
 "<html>" CRLF
 "<head><title>413 Request Entity Too Large</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>413 Request Entity Too Large</h1></center>" CRLF
 ;
 
@@ -204,7 +204,7 @@ static char ngx_http_error_413_page[] =
 static char ngx_http_error_414_page[] =
 "<html>" CRLF
 "<head><title>414 Request-URI Too Large</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>414 Request-URI Too Large</h1></center>" CRLF
 ;
 
@@ -212,7 +212,7 @@ static char ngx_http_error_414_page[] =
 static char ngx_http_error_415_page[] =
 "<html>" CRLF
 "<head><title>415 Unsupported Media Type</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>415 Unsupported Media Type</h1></center>" CRLF
 ;
 
@@ -220,7 +220,7 @@ static char ngx_http_error_415_page[] =
 static char ngx_http_error_416_page[] =
 "<html>" CRLF
 "<head><title>416 Requested Range Not Satisfiable</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>416 Requested Range Not Satisfiable</h1></center>" CRLF
 ;
 
@@ -228,7 +228,7 @@ static char ngx_http_error_416_page[] =
 static char ngx_http_error_421_page[] =
 "<html>" CRLF
 "<head><title>421 Misdirected Request</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>421 Misdirected Request</h1></center>" CRLF
 ;
 
@@ -236,7 +236,7 @@ static char ngx_http_error_421_page[] =
 static char ngx_http_error_429_page[] =
 "<html>" CRLF
 "<head><title>429 Too Many Requests</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>429 Too Many Requests</h1></center>" CRLF
 ;
 
@@ -245,7 +245,7 @@ static char ngx_http_error_494_page[] =
 "<html>" CRLF
 "<head><title>400 Request Header Or Cookie Too Large</title></head>"
 CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>400 Bad Request</h1></center>" CRLF
 "<center>Request Header Or Cookie Too Large</center>" CRLF
 ;
@@ -255,7 +255,7 @@ static char ngx_http_error_495_page[] =
 "<html>" CRLF
 "<head><title>400 The SSL certificate error</title></head>"
 CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>400 Bad Request</h1></center>" CRLF
 "<center>The SSL certificate error</center>" CRLF
 ;
@@ -265,7 +265,7 @@ static char ngx_http_error_496_page[] =
 "<html>" CRLF
 "<head><title>400 No required SSL certificate was sent</title></head>"
 CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>400 Bad Request</h1></center>" CRLF
 "<center>No required SSL certificate was sent</center>" CRLF
 ;
@@ -275,7 +275,7 @@ static char ngx_http_error_497_page[] =
 "<html>" CRLF
 "<head><title>400 The plain HTTP request was sent to HTTPS port</title></head>"
 CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>400 Bad Request</h1></center>" CRLF
 "<center>The plain HTTP request was sent to HTTPS port</center>" CRLF
 ;
@@ -284,7 +284,7 @@ CRLF
 static char ngx_http_error_500_page[] =
 "<html>" CRLF
 "<head><title>500 Internal Server Error</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>500 Internal Server Error</h1></center>" CRLF
 ;
 
@@ -292,7 +292,7 @@ static char ngx_http_error_500_page[] =
 static char ngx_http_error_501_page[] =
 "<html>" CRLF
 "<head><title>501 Not Implemented</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>501 Not Implemented</h1></center>" CRLF
 ;
 
@@ -300,7 +300,7 @@ static char ngx_http_error_501_page[] =
 static char ngx_http_error_502_page[] =
 "<html>" CRLF
 "<head><title>502 Bad Gateway</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>502 Bad Gateway</h1></center>" CRLF
 ;
 
@@ -308,7 +308,7 @@ static char ngx_http_error_502_page[] =
 static char ngx_http_error_503_page[] =
 "<html>" CRLF
 "<head><title>503 Service Temporarily Unavailable</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>503 Service Temporarily Unavailable</h1></center>" CRLF
 ;
 
@@ -316,7 +316,7 @@ static char ngx_http_error_503_page[] =
 static char ngx_http_error_504_page[] =
 "<html>" CRLF
 "<head><title>504 Gateway Time-out</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>504 Gateway Time-out</h1></center>" CRLF
 ;
 
@@ -324,7 +324,7 @@ static char ngx_http_error_504_page[] =
 static char ngx_http_error_505_page[] =
 "<html>" CRLF
 "<head><title>505 HTTP Version Not Supported</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>505 HTTP Version Not Supported</h1></center>" CRLF
 ;
 
@@ -332,7 +332,7 @@ static char ngx_http_error_505_page[] =
 static char ngx_http_error_507_page[] =
 "<html>" CRLF
 "<head><title>507 Insufficient Storage</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
+"<body>" CRLF
 "<center><h1>507 Insufficient Storage</h1></center>" CRLF
 ;
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 0760dc2..a7391d0 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -187,6 +187,7 @@ static void ngx_http_upstream_ssl_init_connection(ngx_http_request_t *,
 static void ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c);
 static void ngx_http_upstream_ssl_handshake(ngx_http_request_t *,
     ngx_http_upstream_t *u, ngx_connection_t *c);
+static void ngx_http_upstream_ssl_save_session(ngx_connection_t *c);
 static ngx_int_t ngx_http_upstream_ssl_name(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_connection_t *c);
 #endif
@@ -408,6 +409,10 @@ static ngx_http_variable_t  ngx_http_upstream_vars[] = {
       ngx_http_upstream_response_length_variable, 1,
       NGX_HTTP_VAR_NOCACHEABLE, 0 },
 
+    { ngx_string("upstream_bytes_sent"), NULL,
+      ngx_http_upstream_response_length_variable, 2,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
 #if (NGX_HTTP_CACHE)
 
     { ngx_string("upstream_cache_status"), NULL,
@@ -627,6 +632,10 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
         return;
     }
 
+    if (u->conf->socket_keepalive) {
+        u->peer.so_keepalive = 1;
+    }
+
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     u->output.alignment = clcf->directio_alignment;
@@ -841,7 +850,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
         ngx_http_file_cache_create_key(r);
 
-        if (r->cache->header_start + 256 >= u->conf->buffer_size) {
+        if (r->cache->header_start + 256 > u->conf->buffer_size) {
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                           "%V_buffer_size %uz is not enough for cache key, "
                           "it should be increased to at least %uz",
@@ -1500,8 +1509,8 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     r->connection->log->action = "connecting to upstream";
 
-    if (u->state && u->state->response_time) {
-        u->state->response_time = ngx_current_msec - u->state->response_time;
+    if (u->state && u->state->response_time == (ngx_msec_t) -1) {
+        u->state->response_time = ngx_current_msec - u->start_time;
     }
 
     u->state = ngx_array_push(r->upstream_states);
@@ -1513,7 +1522,9 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t));
 
-    u->state->response_time = ngx_current_msec;
+    u->start_time = ngx_current_msec;
+
+    u->state->response_time = (ngx_msec_t) -1;
     u->state->connect_time = (ngx_msec_t) -1;
     u->state->header_time = (ngx_msec_t) -1;
 
@@ -1545,6 +1556,8 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     c = u->peer.connection;
 
+    c->requests++;
+
     c->data = r;
 
     c->write->handler = ngx_http_upstream_handler;
@@ -1556,6 +1569,10 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
     c->sendfile &= r->connection->sendfile;
     u->output.sendfile = c->sendfile;
 
+    if (r->connection->tcp_nopush == NGX_TCP_NOPUSH_DISABLED) {
+        c->tcp_nopush = NGX_TCP_NOPUSH_DISABLED;
+    }
+
     if (c->pool == NULL) {
 
         /* we need separate pool here to be able to cache SSL connections */
@@ -1671,6 +1688,8 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
     }
 
     if (u->conf->ssl_session_reuse) {
+        c->ssl->save_session = ngx_http_upstream_ssl_save_session;
+
         if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) {
             ngx_http_upstream_finalize_request(r, u,
                                                NGX_HTTP_INTERNAL_SERVER_ERROR);
@@ -1755,10 +1774,6 @@ ngx_http_upstream_ssl_handshake(ngx_http_request_t *r, ngx_http_upstream_t *u,
             }
         }
 
-        if (u->conf->ssl_session_reuse) {
-            u->peer.save_session(&u->peer, u->peer.data);
-        }
-
         c->write->handler = ngx_http_upstream_handler;
         c->read->handler = ngx_http_upstream_handler;
 
@@ -1778,6 +1793,27 @@ failed:
 }
 
 
+static void
+ngx_http_upstream_ssl_save_session(ngx_connection_t *c)
+{
+    ngx_http_request_t   *r;
+    ngx_http_upstream_t  *u;
+
+    if (c->idle) {
+        return;
+    }
+
+    r = c->data;
+
+    u = r->upstream;
+    c = r->connection;
+
+    ngx_http_set_log_request(c->log, r);
+
+    u->peer.save_session(&u->peer, u->peer.data);
+}
+
+
 static ngx_int_t
 ngx_http_upstream_ssl_name(ngx_http_request_t *r, ngx_http_upstream_t *u,
     ngx_connection_t *c)
@@ -1972,7 +2008,7 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
                    "http upstream send request");
 
     if (u->state->connect_time == (ngx_msec_t) -1) {
-        u->state->connect_time = ngx_current_msec - u->state->response_time;
+        u->state->connect_time = ngx_current_msec - u->start_time;
     }
 
     if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) {
@@ -2109,7 +2145,7 @@ ngx_http_upstream_send_request_body(ngx_http_request_t *r,
         out = u->request_bufs;
 
         if (r->request_body->bufs) {
-            for (cl = out; cl->next; cl = out->next) { /* void */ }
+            for (cl = out; cl->next; cl = cl->next) { /* void */ }
             cl->next = r->request_body->bufs;
             r->request_body->bufs = NULL;
         }
@@ -2383,7 +2419,7 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     /* rc == NGX_OK */
 
-    u->state->header_time = ngx_current_msec - u->state->response_time;
+    u->state->header_time = ngx_current_msec - u->start_time;
 
     if (u->headers_in.status_n >= NGX_HTTP_SPECIAL_RESPONSE) {
 
@@ -4104,6 +4140,10 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
 
     if (u->peer.sockaddr) {
 
+        if (u->peer.connection) {
+            u->state->bytes_sent = u->peer.connection->sent;
+        }
+
         if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_403
             || ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404)
         {
@@ -4279,14 +4319,18 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
         u->resolved->ctx = NULL;
     }
 
-    if (u->state && u->state->response_time) {
-        u->state->response_time = ngx_current_msec - u->state->response_time;
+    if (u->state && u->state->response_time == (ngx_msec_t) -1) {
+        u->state->response_time = ngx_current_msec - u->start_time;
 
         if (u->pipe && u->pipe->read_length) {
             u->state->bytes_received += u->pipe->read_length
                                         - u->pipe->preread_size;
             u->state->response_length = u->pipe->read_length;
         }
+
+        if (u->peer.connection) {
+            u->state->bytes_sent = u->peer.connection->sent;
+        }
     }
 
     u->finalize_request(r, rc);
@@ -5389,18 +5433,18 @@ ngx_http_upstream_response_time_variable(ngx_http_request_t *r,
     state = r->upstream_states->elts;
 
     for ( ;; ) {
-        if (state[i].status) {
 
-            if (data == 1 && state[i].header_time != (ngx_msec_t) -1) {
-                ms = state[i].header_time;
+        if (data == 1) {
+            ms = state[i].header_time;
 
-            } else if (data == 2 && state[i].connect_time != (ngx_msec_t) -1) {
-                ms = state[i].connect_time;
+        } else if (data == 2) {
+            ms = state[i].connect_time;
 
-            } else {
-                ms = state[i].response_time;
-            }
+        } else {
+            ms = state[i].response_time;
+        }
 
+        if (ms != -1) {
             ms = ngx_max(ms, 0);
             p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000);
 
@@ -5470,6 +5514,9 @@ ngx_http_upstream_response_length_variable(ngx_http_request_t *r,
         if (data == 1) {
             p = ngx_sprintf(p, "%O", state[i].bytes_received);
 
+        } else if (data == 2) {
+            p = ngx_sprintf(p, "%O", state[i].bytes_sent);
+
         } else {
             p = ngx_sprintf(p, "%O", state[i].response_length);
         }
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index c2f4dc0..6079d72 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -64,6 +64,7 @@ typedef struct {
     ngx_msec_t                       queue_time;
     off_t                            response_length;
     off_t                            bytes_received;
+    off_t                            bytes_sent;
 
     ngx_str_t                       *peer;
 } ngx_http_upstream_state_t;
@@ -188,6 +189,7 @@ typedef struct {
     ngx_array_t                     *pass_headers;
 
     ngx_http_upstream_local_t       *local;
+    ngx_flag_t                       socket_keepalive;
 
 #if (NGX_HTTP_CACHE)
     ngx_shm_zone_t                  *cache_zone;
@@ -364,7 +366,7 @@ struct ngx_http_upstream_s {
     ngx_int_t                      (*rewrite_cookie)(ngx_http_request_t *r,
                                          ngx_table_elt_t *h);
 
-    ngx_msec_t                       timeout;
+    ngx_msec_t                       start_time;
 
     ngx_http_upstream_state_t       *state;
 
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index f6051ae..f72de3e 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -744,7 +744,7 @@ ngx_http_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc,
 
     if (peers->shpool) {
 
-        ssl_session = SSL_get0_session(pc->connection->ssl->connection);
+        ssl_session = ngx_ssl_get0_session(pc->connection);
 
         if (ssl_session == NULL) {
             return;
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 2deb968..31321b2 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -2504,7 +2504,9 @@ ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re, ngx_str_t *s)
     if (re->ncaptures) {
         len = cmcf->ncaptures;
 
-        if (r->captures == NULL) {
+        if (r->captures == NULL || r->realloc_captures) {
+            r->realloc_captures = 0;
+
             r->captures = ngx_palloc(r->pool, len * sizeof(int));
             if (r->captures == NULL) {
                 return NGX_ERROR;
diff --git a/src/http/ngx_http_write_filter_module.c b/src/http/ngx_http_write_filter_module.c
index 0036231..3f18d76 100644
--- a/src/http/ngx_http_write_filter_module.c
+++ b/src/http/ngx_http_write_filter_module.c
@@ -80,7 +80,6 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
                        cl->buf->file_pos,
                        cl->buf->file_last - cl->buf->file_pos);
 
-#if 1
         if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) {
             ngx_log_error(NGX_LOG_ALERT, c->log, 0,
                           "zero size buf in writer "
@@ -98,7 +97,24 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
             ngx_debug_point();
             return NGX_ERROR;
         }
-#endif
+
+        if (ngx_buf_size(cl->buf) < 0) {
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "negative size buf in writer "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          cl->buf->temporary,
+                          cl->buf->recycled,
+                          cl->buf->in_file,
+                          cl->buf->start,
+                          cl->buf->pos,
+                          cl->buf->last,
+                          cl->buf->file,
+                          cl->buf->file_pos,
+                          cl->buf->file_last);
+
+            ngx_debug_point();
+            return NGX_ERROR;
+        }
 
         size += ngx_buf_size(cl->buf);
 
@@ -136,7 +152,6 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
                        cl->buf->file_pos,
                        cl->buf->file_last - cl->buf->file_pos);
 
-#if 1
         if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) {
             ngx_log_error(NGX_LOG_ALERT, c->log, 0,
                           "zero size buf in writer "
@@ -154,7 +169,24 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
             ngx_debug_point();
             return NGX_ERROR;
         }
-#endif
+
+        if (ngx_buf_size(cl->buf) < 0) {
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "negative size buf in writer "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          cl->buf->temporary,
+                          cl->buf->recycled,
+                          cl->buf->in_file,
+                          cl->buf->start,
+                          cl->buf->pos,
+                          cl->buf->last,
+                          cl->buf->file,
+                          cl->buf->file_pos,
+                          cl->buf->file_last);
+
+            ngx_debug_point();
+            return NGX_ERROR;
+        }
 
         size += ngx_buf_size(cl->buf);
 
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 12214e1..e55f9ba 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -270,11 +270,10 @@ ngx_http_v2_init(ngx_event_t *rev)
 
     h2c->frame_size = NGX_HTTP_V2_DEFAULT_FRAME_SIZE;
 
-    h2c->table_update = 1;
-
     h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
 
     h2c->concurrent_pushes = h2scf->concurrent_pushes;
+    h2c->priority_limit = h2scf->concurrent_streams;
 
     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
     if (h2c->pool == NULL) {
@@ -1548,6 +1547,14 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
         header->name.len = h2c->state.field_end - h2c->state.field_start;
         header->name.data = h2c->state.field_start;
 
+        if (header->name.len == 0) {
+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                          "client sent zero header name length");
+
+            return ngx_http_v2_connection_error(h2c,
+                                                NGX_HTTP_V2_PROTOCOL_ERROR);
+        }
+
         return ngx_http_v2_state_field_len(h2c, pos, end);
     }
 
@@ -1798,6 +1805,13 @@ ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
     }
 
+    if (--h2c->priority_limit == 0) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent too many PRIORITY frames");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
+    }
+
     if (end - pos < NGX_HTTP_V2_PRIORITY_SIZE) {
         return ngx_http_v2_state_save(h2c, pos, end,
                                       ngx_http_v2_state_priority);
@@ -2076,6 +2090,11 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
             h2c->concurrent_pushes = ngx_min(value, h2scf->concurrent_pushes);
             break;
 
+        case NGX_HTTP_V2_HEADER_TABLE_SIZE_SETTING:
+
+            h2c->table_update = 1;
+            break;
+
         default:
             break;
         }
@@ -2617,18 +2636,13 @@ ngx_http_v2_push_stream(ngx_http_v2_stream_t *parent, ngx_str_t *path)
     r->method_name = ngx_http_core_get_method;
     r->method = NGX_HTTP_GET;
 
-    r->schema_start = (u_char *) "https";
-
-#if (NGX_HTTP_SSL)
-    if (fc->ssl) {
-        r->schema_end = r->schema_start + 5;
-
-    } else
-#endif
-    {
-        r->schema_end = r->schema_start + 4;
+    r->schema.data = ngx_pstrdup(pool, &parent->request->schema);
+    if (r->schema.data == NULL) {
+        goto close;
     }
 
+    r->schema.len = parent->request->schema.len;
+
     value.data = ngx_pstrdup(pool, path);
     if (value.data == NULL) {
         goto close;
@@ -2676,11 +2690,13 @@ error:
 
     if (rc == NGX_ABORT) {
         /* header handler has already finalized request */
+        ngx_http_run_posted_requests(fc);
         return NULL;
     }
 
     if (rc == NGX_DECLINED) {
         ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+        ngx_http_run_posted_requests(fc);
         return NULL;
     }
 
@@ -3112,6 +3128,8 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
         h2c->processing++;
     }
 
+    h2c->priority_limit += h2scf->concurrent_streams;
+
     return stream;
 }
 
@@ -3249,10 +3267,6 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
     ngx_uint_t                 i;
     ngx_http_core_srv_conf_t  *cscf;
 
-    if (header->name.len == 0) {
-        return NGX_ERROR;
-    }
-
     r->invalid_header = 0;
 
     cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
@@ -3484,7 +3498,10 @@ ngx_http_v2_parse_method(ngx_http_request_t *r, ngx_str_t *value)
 static ngx_int_t
 ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_str_t *value)
 {
-    if (r->schema_start) {
+    u_char      c, ch;
+    ngx_uint_t  i;
+
+    if (r->schema.len) {
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                       "client sent duplicate :scheme header");
 
@@ -3498,8 +3515,27 @@ ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_str_t *value)
         return NGX_DECLINED;
     }
 
-    r->schema_start = value->data;
-    r->schema_end = value->data + value->len;
+    for (i = 0; i < value->len; i++) {
+        ch = value->data[i];
+
+        c = (u_char) (ch | 0x20);
+        if (c >= 'a' && c <= 'z') {
+            continue;
+        }
+
+        if (((ch >= '0' && ch <= '9') || ch == '+' || ch == '-' || ch == '.')
+            && i > 0)
+        {
+            continue;
+        }
+
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent invalid :scheme header: \"%V\"", value);
+
+        return NGX_DECLINED;
+    }
+
+    r->schema = *value;
 
     return NGX_OK;
 }
@@ -3562,14 +3598,14 @@ ngx_http_v2_construct_request_line(ngx_http_request_t *r)
     static const u_char ending[] = " HTTP/2.0";
 
     if (r->method_name.len == 0
-        || r->schema_start == NULL
+        || r->schema.len == 0
         || r->unparsed_uri.len == 0)
     {
         if (r->method_name.len == 0) {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                           "client sent no :method header");
 
-        } else if (r->schema_start == NULL) {
+        } else if (r->schema.len == 0) {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                           "client sent no :scheme header");
 
@@ -3732,18 +3768,22 @@ ngx_http_v2_construct_cookie_header(ngx_http_request_t *r)
 static void
 ngx_http_v2_run_request(ngx_http_request_t *r)
 {
+    ngx_connection_t  *fc;
+
+    fc = r->connection;
+
     if (ngx_http_v2_construct_request_line(r) != NGX_OK) {
-        return;
+        goto failed;
     }
 
     if (ngx_http_v2_construct_cookie_header(r) != NGX_OK) {
-        return;
+        goto failed;
     }
 
     r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
 
     if (ngx_http_process_request_header(r) != NGX_OK) {
-        return;
+        goto failed;
     }
 
     if (r->headers_in.content_length_n > 0 && r->stream->in_closed) {
@@ -3753,7 +3793,7 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
         r->stream->skip_data = 1;
 
         ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-        return;
+        goto failed;
     }
 
     if (r->headers_in.content_length_n == -1 && !r->stream->in_closed) {
@@ -3761,6 +3801,10 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
     }
 
     ngx_http_process_request(r);
+
+failed:
+
+    ngx_http_run_posted_requests(fc);
 }
 
 
@@ -4335,6 +4379,8 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
      */
     pool = stream->pool;
 
+    h2c->frames -= stream->frames;
+
     ngx_http_free_request(stream->request, rc);
 
     if (pool != h2c->state.pool) {
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index bec2216..69d55d1 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -122,6 +122,7 @@ struct ngx_http_v2_connection_s {
     ngx_uint_t                       processing;
     ngx_uint_t                       frames;
     ngx_uint_t                       idle;
+    ngx_uint_t                       priority_limit;
 
     ngx_uint_t                       pushing;
     ngx_uint_t                       concurrent_pushes;
@@ -192,6 +193,8 @@ struct ngx_http_v2_stream_s {
 
     ngx_buf_t                       *preread;
 
+    ngx_uint_t                       frames;
+
     ngx_http_v2_out_frame_t         *free_frames;
     ngx_chain_t                     *free_frame_headers;
     ngx_chain_t                     *free_bufs;
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 029e8ec..7735b5b 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -944,15 +944,15 @@ ngx_http_v2_push_resource(ngx_http_request_t *r, ngx_str_t *path,
 
     ph = ngx_http_v2_push_headers;
 
+    len = ngx_max(r->schema.len, path->len);
+
     if (binary[0].len) {
-        tmp = ngx_palloc(r->pool, path->len);
+        tmp = ngx_palloc(r->pool, len);
         if (tmp == NULL) {
             return NGX_ERROR;
         }
 
     } else {
-        len = path->len;
-
         for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
             h = (ngx_table_elt_t **) ((char *) &r->headers_in + ph[i].offset);
 
@@ -994,7 +994,7 @@ ngx_http_v2_push_resource(ngx_http_request_t *r, ngx_str_t *path,
     len = (h2c->table_update ? 1 : 0)
           + 1
           + 1 + NGX_HTTP_V2_INT_OCTETS + path->len
-          + 1;
+          + 1 + NGX_HTTP_V2_INT_OCTETS + r->schema.len;
 
     for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
         len += binary[i].len;
@@ -1025,18 +1025,20 @@ ngx_http_v2_push_resource(ngx_http_request_t *r, ngx_str_t *path,
     *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_PATH_INDEX);
     pos = ngx_http_v2_write_value(pos, path->data, path->len, tmp);
 
-#if (NGX_HTTP_SSL)
-    if (fc->ssl) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-                       "http2 push header: \":scheme: https\"");
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 push header: \":scheme: %V\"", &r->schema);
+
+    if (r->schema.len == 5 && ngx_strncmp(r->schema.data, "https", 5) == 0) {
         *pos++ = ngx_http_v2_indexed(NGX_HTTP_V2_SCHEME_HTTPS_INDEX);
 
-    } else
-#endif
+    } else if (r->schema.len == 4
+               && ngx_strncmp(r->schema.data, "http", 4) == 0)
     {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-                       "http2 push header: \":scheme: http\"");
         *pos++ = ngx_http_v2_indexed(NGX_HTTP_V2_SCHEME_HTTP_INDEX);
+
+    } else {
+        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SCHEME_HTTP_INDEX);
+        pos = ngx_http_v2_write_value(pos, r->schema.data, r->schema.len, tmp);
     }
 
     for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
@@ -1661,22 +1663,34 @@ static ngx_http_v2_out_frame_t *
 ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
     size_t len, ngx_chain_t *first, ngx_chain_t *last)
 {
-    u_char                    flags;
-    ngx_buf_t                *buf;
-    ngx_chain_t              *cl;
-    ngx_http_v2_out_frame_t  *frame;
+    u_char                     flags;
+    ngx_buf_t                 *buf;
+    ngx_chain_t               *cl;
+    ngx_http_v2_out_frame_t   *frame;
+    ngx_http_v2_connection_t  *h2c;
 
     frame = stream->free_frames;
+    h2c = stream->connection;
 
     if (frame) {
         stream->free_frames = frame->next;
 
-    } else {
+    } else if (h2c->frames < 10000) {
         frame = ngx_palloc(stream->request->pool,
                            sizeof(ngx_http_v2_out_frame_t));
         if (frame == NULL) {
             return NULL;
         }
+
+        stream->frames++;
+        h2c->frames++;
+
+    } else {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "http2 flood detected");
+
+        h2c->connection->error = 1;
+        return NULL;
     }
 
     flags = last->buf->last_buf ? NGX_HTTP_V2_END_STREAM_FLAG : 0;
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c
index 5fd5fa0..f17c2cc 100644
--- a/src/mail/ngx_mail.c
+++ b/src/mail/ngx_mail.c
@@ -231,7 +231,7 @@ ngx_mail_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     ngx_mail_conf_port_t  *port;
     ngx_mail_conf_addr_t  *addr;
 
-    sa = &listen->sockaddr.sockaddr;
+    sa = listen->sockaddr;
     p = ngx_inet_get_port(sa);
 
     port = ports->elts;
@@ -316,7 +316,7 @@ ngx_mail_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
                 continue;
             }
 
-            ls = ngx_create_listening(cf, &addr[i].opt.sockaddr.sockaddr,
+            ls = ngx_create_listening(cf, addr[i].opt.sockaddr,
                                       addr[i].opt.socklen);
             if (ls == NULL) {
                 return NGX_CONF_ERROR;
@@ -384,12 +384,9 @@ static ngx_int_t
 ngx_mail_add_addrs(ngx_conf_t *cf, ngx_mail_port_t *mport,
     ngx_mail_conf_addr_t *addr)
 {
-    u_char              *p;
-    size_t               len;
     ngx_uint_t           i;
     ngx_mail_in_addr_t  *addrs;
     struct sockaddr_in  *sin;
-    u_char               buf[NGX_SOCKADDR_STRLEN];
 
     mport->addrs = ngx_pcalloc(cf->pool,
                                mport->naddrs * sizeof(ngx_mail_in_addr_t));
@@ -401,26 +398,14 @@ ngx_mail_add_addrs(ngx_conf_t *cf, ngx_mail_port_t *mport,
 
     for (i = 0; i < mport->naddrs; i++) {
 
-        sin = &addr[i].opt.sockaddr.sockaddr_in;
+        sin = (struct sockaddr_in *) addr[i].opt.sockaddr;
         addrs[i].addr = sin->sin_addr.s_addr;
 
         addrs[i].conf.ctx = addr[i].opt.ctx;
 #if (NGX_MAIL_SSL)
         addrs[i].conf.ssl = addr[i].opt.ssl;
 #endif
-
-        len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
-                            buf, NGX_SOCKADDR_STRLEN, 1);
-
-        p = ngx_pnalloc(cf->pool, len);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(p, buf, len);
-
-        addrs[i].conf.addr_text.len = len;
-        addrs[i].conf.addr_text.data = p;
+        addrs[i].conf.addr_text = addr[i].opt.addr_text;
     }
 
     return NGX_OK;
@@ -433,12 +418,9 @@ static ngx_int_t
 ngx_mail_add_addrs6(ngx_conf_t *cf, ngx_mail_port_t *mport,
     ngx_mail_conf_addr_t *addr)
 {
-    u_char               *p;
-    size_t                len;
     ngx_uint_t            i;
     ngx_mail_in6_addr_t  *addrs6;
     struct sockaddr_in6  *sin6;
-    u_char                buf[NGX_SOCKADDR_STRLEN];
 
     mport->addrs = ngx_pcalloc(cf->pool,
                                mport->naddrs * sizeof(ngx_mail_in6_addr_t));
@@ -450,26 +432,14 @@ ngx_mail_add_addrs6(ngx_conf_t *cf, ngx_mail_port_t *mport,
 
     for (i = 0; i < mport->naddrs; i++) {
 
-        sin6 = &addr[i].opt.sockaddr.sockaddr_in6;
+        sin6 = (struct sockaddr_in6 *) addr[i].opt.sockaddr;
         addrs6[i].addr6 = sin6->sin6_addr;
 
         addrs6[i].conf.ctx = addr[i].opt.ctx;
 #if (NGX_MAIL_SSL)
         addrs6[i].conf.ssl = addr[i].opt.ssl;
 #endif
-
-        len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
-                            buf, NGX_SOCKADDR_STRLEN, 1);
-
-        p = ngx_pnalloc(cf->pool, len);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(p, buf, len);
-
-        addrs6[i].conf.addr_text.len = len;
-        addrs6[i].conf.addr_text.data = p;
+        addrs6[i].conf.addr_text = addr[i].opt.addr_text;
     }
 
     return NGX_OK;
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index 6ecfefc..d904f25 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -27,8 +27,9 @@ typedef struct {
 
 
 typedef struct {
-    ngx_sockaddr_t          sockaddr;
+    struct sockaddr        *sockaddr;
     socklen_t               socklen;
+    ngx_str_t               addr_text;
 
     /* server ctx */
     ngx_mail_conf_ctx_t    *ctx;
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 276b8ee..e16d702 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -297,8 +297,8 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_str_t                  *value, size;
     ngx_url_t                   u;
-    ngx_uint_t                  i, m;
-    ngx_mail_listen_t          *ls;
+    ngx_uint_t                  i, n, m;
+    ngx_mail_listen_t          *ls, *als;
     ngx_mail_module_t          *module;
     ngx_mail_core_main_conf_t  *cmcf;
 
@@ -323,36 +323,16 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     cmcf = ngx_mail_conf_get_module_main_conf(cf, ngx_mail_core_module);
 
-    ls = cmcf->listen.elts;
-
-    for (i = 0; i < cmcf->listen.nelts; i++) {
-
-        if (ngx_cmp_sockaddr(&ls[i].sockaddr.sockaddr, ls[i].socklen,
-                             (struct sockaddr *) &u.sockaddr, u.socklen, 1)
-            != NGX_OK)
-        {
-            continue;
-        }
-
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "duplicate \"%V\" address and port pair", &u.url);
-        return NGX_CONF_ERROR;
-    }
-
-    ls = ngx_array_push(&cmcf->listen);
+    ls = ngx_array_push_n(&cmcf->listen, u.naddrs);
     if (ls == NULL) {
         return NGX_CONF_ERROR;
     }
 
     ngx_memzero(ls, sizeof(ngx_mail_listen_t));
 
-    ngx_memcpy(&ls->sockaddr.sockaddr, &u.sockaddr, u.socklen);
-
-    ls->socklen = u.socklen;
     ls->backlog = NGX_LISTEN_BACKLOG;
     ls->rcvbuf = -1;
     ls->sndbuf = -1;
-    ls->wildcard = u.wildcard;
     ls->ctx = cf->ctx;
 
 #if (NGX_HAVE_INET6)
@@ -434,35 +414,20 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-            size_t  len;
-            u_char  buf[NGX_SOCKADDR_STRLEN];
+            if (ngx_strcmp(&value[i].data[10], "n") == 0) {
+                ls->ipv6only = 1;
 
-            if (ls->sockaddr.sockaddr.sa_family == AF_INET6) {
-
-                if (ngx_strcmp(&value[i].data[10], "n") == 0) {
-                    ls->ipv6only = 1;
-
-                } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
-                    ls->ipv6only = 0;
-
-                } else {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "invalid ipv6only flags \"%s\"",
-                                       &value[i].data[9]);
-                    return NGX_CONF_ERROR;
-                }
-
-                ls->bind = 1;
+            } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
+                ls->ipv6only = 0;
 
             } else {
-                len = ngx_sock_ntop(&ls->sockaddr.sockaddr, ls->socklen, buf,
-                                    NGX_SOCKADDR_STRLEN, 1);
-
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "ipv6only is not supported "
-                                   "on addr \"%*s\", ignored", len, buf);
+                                   "invalid ipv6only flags \"%s\"",
+                                   &value[i].data[9]);
+                return NGX_CONF_ERROR;
             }
 
+            ls->bind = 1;
             continue;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -474,7 +439,16 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strcmp(value[i].data, "ssl") == 0) {
 #if (NGX_MAIL_SSL)
+            ngx_mail_ssl_conf_t  *sslcf;
+
+            sslcf = ngx_mail_conf_get_module_srv_conf(cf, ngx_mail_ssl_module);
+
+            sslcf->listen = 1;
+            sslcf->file = cf->conf_file->file.name.data;
+            sslcf->line = cf->conf_file->line;
+
             ls->ssl = 1;
+
             continue;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -579,6 +553,32 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
+    als = cmcf->listen.elts;
+
+    for (n = 0; n < u.naddrs; n++) {
+        ls[n] = ls[0];
+
+        ls[n].sockaddr = u.addrs[n].sockaddr;
+        ls[n].socklen = u.addrs[n].socklen;
+        ls[n].addr_text = u.addrs[n].name;
+        ls[n].wildcard = ngx_inet_wildcard(ls[n].sockaddr);
+
+        for (i = 0; i < cmcf->listen.nelts - u.naddrs + n; i++) {
+
+            if (ngx_cmp_sockaddr(als[i].sockaddr, als[i].socklen,
+                                 ls[n].sockaddr, ls[n].socklen, 1)
+                != NGX_OK)
+            {
+                continue;
+            }
+
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "duplicate \"%V\" address and port pair",
+                               &ls[n].addr_text);
+            return NGX_CONF_ERROR;
+        }
+    }
+
     return NGX_CONF_OK;
 }
 
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index bc3e6b9..803a247 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -165,29 +165,13 @@ ngx_mail_init_connection(ngx_connection_t *c)
 
     sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
 
-    if (sslcf->enable) {
+    if (sslcf->enable || addr_conf->ssl) {
         c->log->action = "SSL handshaking";
 
         ngx_mail_ssl_init_connection(&sslcf->ssl, c);
         return;
     }
 
-    if (addr_conf->ssl) {
-
-        c->log->action = "SSL handshaking";
-
-        if (sslcf->ssl.ctx == NULL) {
-            ngx_log_error(NGX_LOG_ERR, c->log, 0,
-                          "no \"ssl_certificate\" is defined "
-                          "in server listening on SSL port");
-            ngx_mail_close_connection(c);
-            return;
-        }
-
-        ngx_mail_ssl_init_connection(&sslcf->ssl, c);
-        return;
-    }
-
     }
 #endif
 
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index aebd179..5544f75 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -56,6 +56,11 @@ static ngx_conf_enum_t  ngx_mail_ssl_verify[] = {
 };
 
 
+static ngx_conf_deprecated_t  ngx_mail_ssl_deprecated = {
+    ngx_conf_deprecated, "ssl", "listen ... ssl"
+};
+
+
 static ngx_command_t  ngx_mail_ssl_commands[] = {
 
     { ngx_string("ssl"),
@@ -63,7 +68,7 @@ static ngx_command_t  ngx_mail_ssl_commands[] = {
       ngx_mail_ssl_enable,
       NGX_MAIL_SRV_CONF_OFFSET,
       offsetof(ngx_mail_ssl_conf_t, enable),
-      NULL },
+      &ngx_mail_ssl_deprecated },
 
     { ngx_string("starttls"),
       NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
@@ -238,6 +243,7 @@ ngx_mail_ssl_create_conf(ngx_conf_t *cf)
     /*
      * set by ngx_pcalloc():
      *
+     *     scf->listen = 0;
      *     scf->protocols = 0;
      *     scf->dhparam = { 0, NULL };
      *     scf->ecdh_curve = { 0, NULL };
@@ -313,14 +319,17 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     conf->ssl.log = cf->log;
 
-    if (conf->enable) {
+    if (conf->listen) {
+        mode = "listen ... ssl";
+
+    } else if (conf->enable) {
         mode = "ssl";
 
     } else if (conf->starttls != NGX_MAIL_STARTTLS_OFF) {
         mode = "starttls";
 
     } else {
-        mode = "";
+        return NGX_CONF_OK;
     }
 
     if (conf->file == NULL) {
@@ -328,51 +337,31 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->line = prev->line;
     }
 
-    if (*mode) {
+    if (conf->certificates == NULL) {
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "no \"ssl_certificate\" is defined for "
+                      "the \"%s\" directive in %s:%ui",
+                      mode, conf->file, conf->line);
+        return NGX_CONF_ERROR;
+    }
 
-        if (conf->certificates == NULL) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"ssl_certificate\" is defined for "
-                          "the \"%s\" directive in %s:%ui",
-                          mode, conf->file, conf->line);
-            return NGX_CONF_ERROR;
-        }
+    if (conf->certificate_keys == NULL) {
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "no \"ssl_certificate_key\" is defined for "
+                      "the \"%s\" directive in %s:%ui",
+                      mode, conf->file, conf->line);
+        return NGX_CONF_ERROR;
+    }
 
-        if (conf->certificate_keys == NULL) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"ssl_certificate_key\" is defined for "
-                          "the \"%s\" directive in %s:%ui",
-                          mode, conf->file, conf->line);
-            return NGX_CONF_ERROR;
-        }
-
-        if (conf->certificate_keys->nelts < conf->certificates->nelts) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"ssl_certificate_key\" is defined "
-                          "for certificate \"%V\" and "
-                          "the \"ssl\" directive in %s:%ui",
-                          ((ngx_str_t *) conf->certificates->elts)
-                          + conf->certificates->nelts - 1,
-                          conf->file, conf->line);
-            return NGX_CONF_ERROR;
-        }
-
-    } else {
-
-        if (conf->certificates == NULL) {
-            return NGX_CONF_OK;
-        }
-
-        if (conf->certificate_keys == NULL
-            || conf->certificate_keys->nelts < conf->certificates->nelts)
-        {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"ssl_certificate_key\" is defined "
-                          "for certificate \"%V\"",
-                          ((ngx_str_t *) conf->certificates->elts)
-                          + conf->certificates->nelts - 1);
-            return NGX_CONF_ERROR;
-        }
+    if (conf->certificate_keys->nelts < conf->certificates->nelts) {
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "no \"ssl_certificate_key\" is defined "
+                      "for certificate \"%V\" and "
+                      "the \"%s\" directive in %s:%ui",
+                      ((ngx_str_t *) conf->certificates->elts)
+                      + conf->certificates->nelts - 1,
+                      mode, conf->file, conf->line);
+        return NGX_CONF_ERROR;
     }
 
     if (ngx_ssl_create(&conf->ssl, conf->protocols, NULL) != NGX_OK) {
@@ -381,6 +370,7 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     cln = ngx_pool_cleanup_add(cf->pool, 0);
     if (cln == NULL) {
+        ngx_ssl_cleanup_ctx(&conf->ssl);
         return NGX_CONF_ERROR;
     }
 
@@ -446,7 +436,7 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     }
 
     if (ngx_ssl_session_cache(&conf->ssl, &ngx_mail_ssl_sess_id_ctx,
-                              conf->builtin_session_cache,
+                              conf->certificates, conf->builtin_session_cache,
                               conf->shm_zone, conf->session_timeout)
         != NGX_OK)
     {
@@ -494,8 +484,10 @@ ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    scf->file = cf->conf_file->file.name.data;
-    scf->line = cf->conf_file->line;
+    if (!scf->listen) {
+        scf->file = cf->conf_file->file.name.data;
+        scf->line = cf->conf_file->line;
+    }
 
     return NGX_CONF_OK;
 }
@@ -520,8 +512,10 @@ ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    scf->file = cf->conf_file->file.name.data;
-    scf->line = cf->conf_file->line;
+    if (!scf->listen) {
+        scf->file = cf->conf_file->file.name.data;
+        scf->line = cf->conf_file->line;
+    }
 
     return NGX_CONF_OK;
 }
diff --git a/src/mail/ngx_mail_ssl_module.h b/src/mail/ngx_mail_ssl_module.h
index 26628d5..d6b0b8e 100644
--- a/src/mail/ngx_mail_ssl_module.h
+++ b/src/mail/ngx_mail_ssl_module.h
@@ -26,6 +26,7 @@ typedef struct {
     ngx_ssl_t        ssl;
 
     ngx_uint_t       starttls;
+    ngx_uint_t       listen;
     ngx_uint_t       protocols;
 
     ngx_uint_t       verify;
diff --git a/src/os/unix/ngx_file_aio_read.c b/src/os/unix/ngx_file_aio_read.c
index aedc3c9..bb60ee8 100644
--- a/src/os/unix/ngx_file_aio_read.c
+++ b/src/os/unix/ngx_file_aio_read.c
@@ -110,7 +110,7 @@ ngx_file_aio_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
 #if (NGX_HAVE_KQUEUE)
     aio->aiocb.aio_sigevent.sigev_notify_kqueue = ngx_kqueue;
     aio->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT;
-    aio->aiocb.aio_sigevent.sigev_value.sigval_ptr = ev;
+    aio->aiocb.aio_sigevent.sigev_value.sival_ptr = ev;
 #endif
     ev->handler = ngx_file_aio_event_handler;
 
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 07872b1..383e38e 100644
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -213,9 +213,6 @@ void ngx_close_file_mapping(ngx_file_mapping_t *fm);
 #endif
 
 
-#define NGX_DIR_MASK_LEN         0
-
-
 ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
 #define ngx_open_dir_n           "opendir()"
 
diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h
index b7da48c..c641108 100644
--- a/src/os/unix/ngx_freebsd_config.h
+++ b/src/os/unix/ngx_freebsd_config.h
@@ -89,8 +89,14 @@
 
 
 #if (NGX_HAVE_FILE_AIO)
+
 #include <aio.h>
 typedef struct aiocb  ngx_aiocb_t;
+
+#if (__FreeBSD_version < 700005 && !defined __DragonFly__)
+#define sival_ptr     sigval_ptr
+#endif
+
 #endif
 
 
diff --git a/src/os/unix/ngx_thread.h b/src/os/unix/ngx_thread.h
index 1b52dd7..e3b5e81 100644
--- a/src/os/unix/ngx_thread.h
+++ b/src/os/unix/ngx_thread.h
@@ -47,12 +47,12 @@ typedef uint32_t   ngx_tid_t;
 #elif (NGX_DARWIN)
 
 typedef uint64_t   ngx_tid_t;
-#define NGX_TID_T_FMT         "%uA"
+#define NGX_TID_T_FMT         "%uL"
 
 #else
 
 typedef uint64_t   ngx_tid_t;
-#define NGX_TID_T_FMT         "%uA"
+#define NGX_TID_T_FMT         "%uL"
 
 #endif
 
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index 0efbda8..7835675 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -387,7 +387,7 @@ ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     ngx_stream_conf_port_t  *port;
     ngx_stream_conf_addr_t  *addr;
 
-    sa = &listen->sockaddr.sockaddr;
+    sa = listen->sockaddr;
     p = ngx_inet_get_port(sa);
 
     port = ports->elts;
@@ -476,7 +476,7 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
                 continue;
             }
 
-            ls = ngx_create_listening(cf, &addr[i].opt.sockaddr.sockaddr,
+            ls = ngx_create_listening(cf, addr[i].opt.sockaddr,
                                       addr[i].opt.socklen);
             if (ls == NULL) {
                 return NGX_CONF_ERROR;
@@ -538,10 +538,6 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
                 break;
             }
 
-            if (ngx_clone_listening(cf, ls) != NGX_OK) {
-                return NGX_CONF_ERROR;
-            }
-
             addr++;
             last--;
         }
@@ -555,12 +551,9 @@ static ngx_int_t
 ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
     ngx_stream_conf_addr_t *addr)
 {
-    u_char                *p;
-    size_t                 len;
     ngx_uint_t             i;
     struct sockaddr_in    *sin;
     ngx_stream_in_addr_t  *addrs;
-    u_char                 buf[NGX_SOCKADDR_STRLEN];
 
     stport->addrs = ngx_pcalloc(cf->pool,
                                 stport->naddrs * sizeof(ngx_stream_in_addr_t));
@@ -572,7 +565,7 @@ ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
 
     for (i = 0; i < stport->naddrs; i++) {
 
-        sin = &addr[i].opt.sockaddr.sockaddr_in;
+        sin = (struct sockaddr_in *) addr[i].opt.sockaddr;
         addrs[i].addr = sin->sin_addr.s_addr;
 
         addrs[i].conf.ctx = addr[i].opt.ctx;
@@ -580,19 +573,7 @@ ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
         addrs[i].conf.ssl = addr[i].opt.ssl;
 #endif
         addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
-
-        len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
-                            buf, NGX_SOCKADDR_STRLEN, 1);
-
-        p = ngx_pnalloc(cf->pool, len);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(p, buf, len);
-
-        addrs[i].conf.addr_text.len = len;
-        addrs[i].conf.addr_text.data = p;
+        addrs[i].conf.addr_text = addr[i].opt.addr_text;
     }
 
     return NGX_OK;
@@ -605,12 +586,9 @@ static ngx_int_t
 ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
     ngx_stream_conf_addr_t *addr)
 {
-    u_char                 *p;
-    size_t                  len;
     ngx_uint_t              i;
     struct sockaddr_in6    *sin6;
     ngx_stream_in6_addr_t  *addrs6;
-    u_char                  buf[NGX_SOCKADDR_STRLEN];
 
     stport->addrs = ngx_pcalloc(cf->pool,
                                 stport->naddrs * sizeof(ngx_stream_in6_addr_t));
@@ -622,7 +600,7 @@ ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
 
     for (i = 0; i < stport->naddrs; i++) {
 
-        sin6 = &addr[i].opt.sockaddr.sockaddr_in6;
+        sin6 = (struct sockaddr_in6 *) addr[i].opt.sockaddr;
         addrs6[i].addr6 = sin6->sin6_addr;
 
         addrs6[i].conf.ctx = addr[i].opt.ctx;
@@ -630,19 +608,7 @@ ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
         addrs6[i].conf.ssl = addr[i].opt.ssl;
 #endif
         addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
-
-        len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
-                            buf, NGX_SOCKADDR_STRLEN, 1);
-
-        p = ngx_pnalloc(cf->pool, len);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(p, buf, len);
-
-        addrs6[i].conf.addr_text.len = len;
-        addrs6[i].conf.addr_text.data = p;
+        addrs6[i].conf.addr_text = addr[i].opt.addr_text;
     }
 
     return NGX_OK;
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 09d2459..57e73e0 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -41,8 +41,9 @@ typedef struct {
 
 
 typedef struct {
-    ngx_sockaddr_t                 sockaddr;
+    struct sockaddr               *sockaddr;
     socklen_t                      socklen;
+    ngx_str_t                      addr_text;
 
     /* server ctx */
     ngx_stream_conf_ctx_t         *ctx;
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index 272708d..9b6afe9 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -249,34 +249,40 @@ ngx_stream_core_preread_phase(ngx_stream_session_t *s,
         }
 
         if (!c->read->ready) {
-            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-                rc = NGX_ERROR;
-                break;
-            }
-
-            if (!c->read->timer_set) {
-                ngx_add_timer(c->read, cscf->preread_timeout);
-            }
-
-            c->read->handler = ngx_stream_session_handler;
-
-            return NGX_OK;
+            break;
         }
 
         n = c->recv(c, c->buffer->last, size);
 
-        if (n == NGX_ERROR) {
+        if (n == NGX_ERROR || n == 0) {
             rc = NGX_STREAM_OK;
             break;
         }
 
-        if (n > 0) {
-            c->buffer->last += n;
+        if (n == NGX_AGAIN) {
+            break;
         }
 
+        c->buffer->last += n;
+
         rc = ph->handler(s);
     }
 
+    if (rc == NGX_AGAIN) {
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return NGX_OK;
+        }
+
+        if (!c->read->timer_set) {
+            ngx_add_timer(c->read, cscf->preread_timeout);
+        }
+
+        c->read->handler = ngx_stream_session_handler;
+
+        return NGX_OK;
+    }
+
     if (c->read->timer_set) {
         ngx_del_timer(c->read);
     }
@@ -571,7 +577,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_str_t                    *value, size;
     ngx_url_t                     u;
-    ngx_uint_t                    i, backlog;
+    ngx_uint_t                    i, n, backlog;
     ngx_stream_listen_t          *ls, *als;
     ngx_stream_core_main_conf_t  *cmcf;
 
@@ -596,21 +602,17 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
-    ls = ngx_array_push(&cmcf->listen);
+    ls = ngx_array_push_n(&cmcf->listen, u.naddrs);
     if (ls == NULL) {
         return NGX_CONF_ERROR;
     }
 
     ngx_memzero(ls, sizeof(ngx_stream_listen_t));
 
-    ngx_memcpy(&ls->sockaddr.sockaddr, &u.sockaddr, u.socklen);
-
-    ls->socklen = u.socklen;
     ls->backlog = NGX_LISTEN_BACKLOG;
     ls->rcvbuf = -1;
     ls->sndbuf = -1;
     ls->type = SOCK_STREAM;
-    ls->wildcard = u.wildcard;
     ls->ctx = cf->ctx;
 
 #if (NGX_HAVE_INET6)
@@ -682,35 +684,20 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-            size_t  len;
-            u_char  buf[NGX_SOCKADDR_STRLEN];
+            if (ngx_strcmp(&value[i].data[10], "n") == 0) {
+                ls->ipv6only = 1;
 
-            if (ls->sockaddr.sockaddr.sa_family == AF_INET6) {
-
-                if (ngx_strcmp(&value[i].data[10], "n") == 0) {
-                    ls->ipv6only = 1;
-
-                } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
-                    ls->ipv6only = 0;
-
-                } else {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "invalid ipv6only flags \"%s\"",
-                                       &value[i].data[9]);
-                    return NGX_CONF_ERROR;
-                }
-
-                ls->bind = 1;
+            } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
+                ls->ipv6only = 0;
 
             } else {
-                len = ngx_sock_ntop(&ls->sockaddr.sockaddr, ls->socklen, buf,
-                                    NGX_SOCKADDR_STRLEN, 1);
-
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "ipv6only is not supported "
-                                   "on addr \"%*s\", ignored", len, buf);
+                                   "invalid ipv6only flags \"%s\"",
+                                   &value[i].data[9]);
+                return NGX_CONF_ERROR;
             }
 
+            ls->bind = 1;
             continue;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -734,7 +721,17 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strcmp(value[i].data, "ssl") == 0) {
 #if (NGX_STREAM_SSL)
+            ngx_stream_ssl_conf_t  *sslcf;
+
+            sslcf = ngx_stream_conf_get_module_srv_conf(cf,
+                                                        ngx_stream_ssl_module);
+
+            sslcf->listen = 1;
+            sslcf->file = cf->conf_file->file.name.data;
+            sslcf->line = cf->conf_file->line;
+
             ls->ssl = 1;
+
             continue;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -866,21 +863,31 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     als = cmcf->listen.elts;
 
-    for (i = 0; i < cmcf->listen.nelts - 1; i++) {
-        if (ls->type != als[i].type) {
-            continue;
-        }
+    for (n = 0; n < u.naddrs; n++) {
+        ls[n] = ls[0];
 
-        if (ngx_cmp_sockaddr(&als[i].sockaddr.sockaddr, als[i].socklen,
-                             &ls->sockaddr.sockaddr, ls->socklen, 1)
-            != NGX_OK)
-        {
-            continue;
-        }
+        ls[n].sockaddr = u.addrs[n].sockaddr;
+        ls[n].socklen = u.addrs[n].socklen;
+        ls[n].addr_text = u.addrs[n].name;
+        ls[n].wildcard = ngx_inet_wildcard(ls[n].sockaddr);
 
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "duplicate \"%V\" address and port pair", &u.url);
-        return NGX_CONF_ERROR;
+        for (i = 0; i < cmcf->listen.nelts - u.naddrs + n; i++) {
+            if (ls[n].type != als[i].type) {
+                continue;
+            }
+
+            if (ngx_cmp_sockaddr(als[i].sockaddr, als[i].socklen,
+                                 ls[n].sockaddr, ls[n].socklen, 1)
+                != NGX_OK)
+            {
+                continue;
+            }
+
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "duplicate \"%V\" address and port pair",
+                               &ls[n].addr_text);
+            return NGX_CONF_ERROR;
+        }
     }
 
     return NGX_CONF_OK;
diff --git a/src/stream/ngx_stream_geo_module.c b/src/stream/ngx_stream_geo_module.c
index 83f7fb4..4b4cad8 100644
--- a/src/stream/ngx_stream_geo_module.c
+++ b/src/stream/ngx_stream_geo_module.c
@@ -206,6 +206,13 @@ ngx_stream_geo_cidr_variable(ngx_stream_session_t *s,
         break;
 #endif
 
+#if (NGX_HAVE_UNIX_DOMAIN)
+    case AF_UNIX:
+        vv = (ngx_stream_variable_value_t *)
+                  ngx_radix32tree_find(ctx->u.trees.tree, INADDR_NONE);
+        break;
+#endif
+
     default: /* AF_INET */
         sin = (struct sockaddr_in *) addr.sockaddr;
         inaddr = ntohl(sin->sin_addr.s_addr);
@@ -268,6 +275,12 @@ ngx_stream_geo_range_variable(ngx_stream_session_t *s,
             break;
 #endif
 
+#if (NGX_HAVE_UNIX_DOMAIN)
+        case AF_UNIX:
+            inaddr = INADDR_NONE;
+            break;
+#endif
+
         default: /* AF_INET */
             sin = (struct sockaddr_in *) addr.sockaddr;
             inaddr = ntohl(sin->sin_addr.s_addr);
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 30572cd..127c8a4 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -26,11 +26,13 @@ typedef struct {
     size_t                           buffer_size;
     size_t                           upload_rate;
     size_t                           download_rate;
+    ngx_uint_t                       requests;
     ngx_uint_t                       responses;
     ngx_uint_t                       next_upstream_tries;
     ngx_flag_t                       next_upstream;
     ngx_flag_t                       proxy_protocol;
     ngx_stream_upstream_local_t     *local;
+    ngx_flag_t                       socket_keepalive;
 
 #if (NGX_STREAM_SSL)
     ngx_flag_t                       ssl_enable;
@@ -72,6 +74,8 @@ static void ngx_stream_proxy_connect_handler(ngx_event_t *ev);
 static ngx_int_t ngx_stream_proxy_test_connect(ngx_connection_t *c);
 static void ngx_stream_proxy_process(ngx_stream_session_t *s,
     ngx_uint_t from_upstream, ngx_uint_t do_write);
+static ngx_int_t ngx_stream_proxy_test_finalize(ngx_stream_session_t *s,
+    ngx_uint_t from_upstream);
 static void ngx_stream_proxy_next_upstream(ngx_stream_session_t *s);
 static void ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc);
 static u_char *ngx_stream_proxy_log_error(ngx_log_t *log, u_char *buf,
@@ -92,6 +96,7 @@ static char *ngx_stream_proxy_ssl_password_file(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
 static void ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s);
 static void ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc);
+static void ngx_stream_proxy_ssl_save_session(ngx_connection_t *c);
 static ngx_int_t ngx_stream_proxy_ssl_name(ngx_stream_session_t *s);
 static ngx_int_t ngx_stream_proxy_set_ssl(ngx_conf_t *cf,
     ngx_stream_proxy_srv_conf_t *pscf);
@@ -135,6 +140,13 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
       0,
       NULL },
 
+    { ngx_string("proxy_socket_keepalive"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_proxy_srv_conf_t, socket_keepalive),
+      NULL },
+
     { ngx_string("proxy_connect_timeout"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_msec_slot,
@@ -184,6 +196,13 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
       offsetof(ngx_stream_proxy_srv_conf_t, download_rate),
       NULL },
 
+    { ngx_string("proxy_requests"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_proxy_srv_conf_t, requests),
+      NULL },
+
     { ngx_string("proxy_responses"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -377,6 +396,8 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
 
     s->log_handler = ngx_stream_proxy_log_error;
 
+    u->requests = 1;
+
     u->peer.log = c->log;
     u->peer.log_error = NGX_ERROR_ERR;
 
@@ -385,6 +406,10 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
         return;
     }
 
+    if (pscf->socket_keepalive) {
+        u->peer.so_keepalive = 1;
+    }
+
     u->peer.type = c->type;
     u->start_sec = ngx_time();
 
@@ -398,21 +423,19 @@ ngx_stream_proxy_handler(ngx_stream_session_t *s)
         return;
     }
 
-    if (c->type == SOCK_STREAM) {
-        p = ngx_pnalloc(c->pool, pscf->buffer_size);
-        if (p == NULL) {
-            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
-            return;
-        }
+    p = ngx_pnalloc(c->pool, pscf->buffer_size);
+    if (p == NULL) {
+        ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+        return;
+    }
 
-        u->downstream_buf.start = p;
-        u->downstream_buf.end = p + pscf->buffer_size;
-        u->downstream_buf.pos = p;
-        u->downstream_buf.last = p;
+    u->downstream_buf.start = p;
+    u->downstream_buf.end = p + pscf->buffer_size;
+    u->downstream_buf.pos = p;
+    u->downstream_buf.last = p;
 
-        if (c->read->ready) {
-            ngx_post_event(c->read, &ngx_posted_events);
-        }
+    if (c->read->ready) {
+        ngx_post_event(c->read, &ngx_posted_events);
     }
 
     if (pscf->upstream_value) {
@@ -667,7 +690,7 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
     u->proxy_protocol = pscf->proxy_protocol;
 
     if (u->state) {
-        u->state->response_time = ngx_current_msec - u->state->response_time;
+        u->state->response_time = ngx_current_msec - u->start_time;
     }
 
     u->state = ngx_array_push(s->upstream_states);
@@ -678,9 +701,11 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
 
     ngx_memzero(u->state, sizeof(ngx_stream_upstream_state_t));
 
+    u->start_time = ngx_current_msec;
+
     u->state->connect_time = (ngx_msec_t) -1;
     u->state->first_byte_time = (ngx_msec_t) -1;
-    u->state->response_time = ngx_current_msec;
+    u->state->response_time = (ngx_msec_t) -1;
 
     rc = ngx_event_connect_peer(&u->peer);
 
@@ -794,7 +819,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
         }
     }
 
-    u->state->connect_time = ngx_current_msec - u->state->response_time;
+    u->state->connect_time = ngx_current_msec - u->start_time;
 
     if (u->peer.notify) {
         u->peer.notify(&u->peer, u->peer.data,
@@ -829,7 +854,6 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 
         cl->buf->tag = (ngx_buf_tag_t) &ngx_stream_proxy_module;
         cl->buf->flush = 1;
-        cl->buf->last_buf = (c->type == SOCK_DGRAM);
 
         cl->next = u->upstream_out;
         u->upstream_out = cl;
@@ -871,17 +895,12 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
         u->proxy_protocol = 0;
     }
 
-    if (c->type == SOCK_DGRAM && pscf->responses == 0) {
-        pc->read->ready = 0;
-        pc->read->eof = 1;
-    }
-
     u->connected = 1;
 
     pc->read->handler = ngx_stream_proxy_upstream_handler;
     pc->write->handler = ngx_stream_proxy_upstream_handler;
 
-    if (pc->read->ready || pc->read->eof) {
+    if (pc->read->ready) {
         ngx_post_event(pc->read, &ngx_posted_events);
     }
 
@@ -1014,6 +1033,8 @@ ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s)
     }
 
     if (pscf->ssl_session_reuse) {
+        pc->ssl->save_session = ngx_stream_proxy_ssl_save_session;
+
         if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) {
             ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
@@ -1072,11 +1093,6 @@ ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc)
             }
         }
 
-        if (pscf->ssl_session_reuse) {
-            u = s->upstream;
-            u->peer.save_session(&u->peer, u->peer.data);
-        }
-
         if (pc->write->timer_set) {
             ngx_del_timer(pc->write);
         }
@@ -1092,6 +1108,19 @@ failed:
 }
 
 
+static void
+ngx_stream_proxy_ssl_save_session(ngx_connection_t *c)
+{
+    ngx_stream_session_t   *s;
+    ngx_stream_upstream_t  *u;
+
+    s = c->data;
+    u = s->upstream;
+
+    u->peer.save_session(&u->peer, u->peer.data);
+}
+
+
 static ngx_int_t
 ngx_stream_proxy_ssl_name(ngx_stream_session_t *s)
 {
@@ -1280,6 +1309,7 @@ static void
 ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
 {
     ngx_connection_t             *c, *pc;
+    ngx_log_handler_pt            handler;
     ngx_stream_session_t         *s;
     ngx_stream_upstream_t        *u;
     ngx_stream_proxy_srv_conf_t  *pscf;
@@ -1321,32 +1351,47 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
 
         } else {
             if (s->connection->type == SOCK_DGRAM) {
-                if (pscf->responses == NGX_MAX_INT32_VALUE) {
+
+                if (pscf->responses == NGX_MAX_INT32_VALUE
+                    || (u->responses >= pscf->responses * u->requests))
+                {
 
                     /*
                      * successfully terminate timed out UDP session
-                     * with unspecified number of responses
+                     * if expected number of responses was received
                      */
 
-                    pc->read->ready = 0;
-                    pc->read->eof = 1;
+                    handler = c->log->handler;
+                    c->log->handler = NULL;
 
-                    ngx_stream_proxy_process(s, 1, 0);
+                    ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                                  "udp timed out"
+                                  ", packets from/to client:%ui/%ui"
+                                  ", bytes from/to client:%O/%O"
+                                  ", bytes from/to upstream:%O/%O",
+                                  u->requests, u->responses,
+                                  s->received, c->sent, u->received,
+                                  pc ? pc->sent : 0);
+
+                    c->log->handler = handler;
+
+                    ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
                     return;
                 }
 
                 ngx_connection_error(pc, NGX_ETIMEDOUT, "upstream timed out");
 
-                if (u->received == 0) {
-                    ngx_stream_proxy_next_upstream(s);
-                    return;
-                }
+                pc->read->error = 1;
 
-            } else {
-                ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out");
+                ngx_stream_proxy_finalize(s, NGX_STREAM_BAD_GATEWAY);
+
+                return;
             }
 
+            ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out");
+
             ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
+
             return;
         }
 
@@ -1453,7 +1498,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
     ssize_t                       n;
     ngx_buf_t                    *b;
     ngx_int_t                     rc;
-    ngx_uint_t                    flags;
+    ngx_uint_t                    flags, *packets;
     ngx_msec_t                    delay;
     ngx_chain_t                  *cl, **ll, **out, **busy;
     ngx_connection_t             *c, *pc, *src, *dst;
@@ -1489,6 +1534,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         b = &u->upstream_buf;
         limit_rate = pscf->download_rate;
         received = &u->received;
+        packets = &u->responses;
         out = &u->downstream_out;
         busy = &u->downstream_busy;
         recv_action = "proxying and reading from upstream";
@@ -1500,6 +1546,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         b = &u->downstream_buf;
         limit_rate = pscf->upload_rate;
         received = &s->received;
+        packets = &u->requests;
         out = &u->upstream_out;
         busy = &u->upstream_busy;
         recv_action = "proxying and reading from client";
@@ -1516,11 +1563,6 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                 rc = ngx_stream_top_filter(s, *out, from_upstream);
 
                 if (rc == NGX_ERROR) {
-                    if (c->type == SOCK_DGRAM && !from_upstream) {
-                        ngx_stream_proxy_next_upstream(s);
-                        return;
-                    }
-
                     ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
                     return;
                 }
@@ -1551,7 +1593,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                     break;
                 }
 
-                if ((off_t) size > limit) {
+                if (c->type == SOCK_STREAM && (off_t) size > limit) {
                     size = (size_t) limit;
                 }
             }
@@ -1565,11 +1607,6 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
             }
 
             if (n == NGX_ERROR) {
-                if (c->type == SOCK_DGRAM && u->received == 0) {
-                    ngx_stream_proxy_next_upstream(s);
-                    return;
-                }
-
                 src->read->eof = 1;
                 n = 0;
             }
@@ -1587,16 +1624,10 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                 if (from_upstream) {
                     if (u->state->first_byte_time == (ngx_msec_t) -1) {
                         u->state->first_byte_time = ngx_current_msec
-                                                    - u->state->response_time;
+                                                    - u->start_time;
                     }
                 }
 
-                if (c->type == SOCK_DGRAM && ++u->responses == pscf->responses)
-                {
-                    src->read->ready = 0;
-                    src->read->eof = 1;
-                }
-
                 for (ll = out; *ll; ll = &(*ll)->next) { /* void */ }
 
                 cl = ngx_chain_get_free_buf(c->pool, &u->free);
@@ -1616,6 +1647,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
                 cl->buf->last_buf = src->read->eof;
                 cl->buf->flush = 1;
 
+                (*packets)++;
                 *received += n;
                 b->last += n;
                 do_write = 1;
@@ -1629,33 +1661,19 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 
     c->log->action = "proxying connection";
 
-    if (src->read->eof && dst && (dst->read->eof || !dst->buffered)) {
-        handler = c->log->handler;
-        c->log->handler = NULL;
-
-        ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "%s%s disconnected"
-                      ", bytes from/to client:%O/%O"
-                      ", bytes from/to upstream:%O/%O",
-                      src->type == SOCK_DGRAM ? "udp " : "",
-                      from_upstream ? "upstream" : "client",
-                      s->received, c->sent, u->received, pc ? pc->sent : 0);
-
-        c->log->handler = handler;
-
-        ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
+    if (ngx_stream_proxy_test_finalize(s, from_upstream) == NGX_OK) {
         return;
     }
 
     flags = src->read->eof ? NGX_CLOSE_EVENT : 0;
 
-    if (!src->shared && ngx_handle_read_event(src->read, flags) != NGX_OK) {
+    if (ngx_handle_read_event(src->read, flags) != NGX_OK) {
         ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return;
     }
 
     if (dst) {
-        if (!dst->shared && ngx_handle_write_event(dst->write, 0) != NGX_OK) {
+        if (ngx_handle_write_event(dst->write, 0) != NGX_OK) {
             ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
         }
@@ -1670,6 +1688,87 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 }
 
 
+static ngx_int_t
+ngx_stream_proxy_test_finalize(ngx_stream_session_t *s,
+    ngx_uint_t from_upstream)
+{
+    ngx_connection_t             *c, *pc;
+    ngx_log_handler_pt            handler;
+    ngx_stream_upstream_t        *u;
+    ngx_stream_proxy_srv_conf_t  *pscf;
+
+    pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
+
+    c = s->connection;
+    u = s->upstream;
+    pc = u->connected ? u->peer.connection : NULL;
+
+    if (c->type == SOCK_DGRAM) {
+
+        if (pscf->requests && u->requests < pscf->requests) {
+            return NGX_DECLINED;
+        }
+
+        if (pscf->requests) {
+            ngx_delete_udp_connection(c);
+        }
+
+        if (pscf->responses == NGX_MAX_INT32_VALUE
+            || u->responses < pscf->responses * u->requests)
+        {
+            return NGX_DECLINED;
+        }
+
+        if (pc == NULL || c->buffered || pc->buffered) {
+            return NGX_DECLINED;
+        }
+
+        handler = c->log->handler;
+        c->log->handler = NULL;
+
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "udp done"
+                      ", packets from/to client:%ui/%ui"
+                      ", bytes from/to client:%O/%O"
+                      ", bytes from/to upstream:%O/%O",
+                      u->requests, u->responses,
+                      s->received, c->sent, u->received, pc ? pc->sent : 0);
+
+        c->log->handler = handler;
+
+        ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
+
+        return NGX_OK;
+    }
+
+    /* c->type == SOCK_STREAM */
+
+    if (pc == NULL
+        || (!c->read->eof && !pc->read->eof)
+        || (!c->read->eof && c->buffered)
+        || (!pc->read->eof && pc->buffered))
+    {
+        return NGX_DECLINED;
+    }
+
+    handler = c->log->handler;
+    c->log->handler = NULL;
+
+    ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                  "%s disconnected"
+                  ", bytes from/to client:%O/%O"
+                  ", bytes from/to upstream:%O/%O",
+                  from_upstream ? "upstream" : "client",
+                  s->received, c->sent, u->received, pc ? pc->sent : 0);
+
+    c->log->handler = handler;
+
+    ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
+
+    return NGX_OK;
+}
+
+
 static void
 ngx_stream_proxy_next_upstream(ngx_stream_session_t *s)
 {
@@ -1739,6 +1838,7 @@ ngx_stream_proxy_next_upstream(ngx_stream_session_t *s)
 static void
 ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc)
 {
+    ngx_uint_t              state;
     ngx_connection_t       *pc;
     ngx_stream_upstream_t  *u;
 
@@ -1759,7 +1859,9 @@ ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc)
     pc = u->peer.connection;
 
     if (u->state) {
-        u->state->response_time = ngx_current_msec - u->state->response_time;
+        if (u->state->response_time == (ngx_msec_t) -1) {
+            u->state->response_time = ngx_current_msec - u->start_time;
+        }
 
         if (pc) {
             u->state->bytes_received = u->received;
@@ -1768,7 +1870,15 @@ ngx_stream_proxy_finalize(ngx_stream_session_t *s, ngx_uint_t rc)
     }
 
     if (u->peer.free && u->peer.sockaddr) {
-        u->peer.free(&u->peer, u->peer.data, 0);
+        state = 0;
+
+        if (pc && pc->type == SOCK_DGRAM
+            && (pc->read->error || pc->write->error))
+        {
+            state = NGX_PEER_FAILED;
+        }
+
+        u->peer.free(&u->peer, u->peer.data, state);
         u->peer.sockaddr = NULL;
     }
 
@@ -1856,11 +1966,13 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
     conf->buffer_size = NGX_CONF_UNSET_SIZE;
     conf->upload_rate = NGX_CONF_UNSET_SIZE;
     conf->download_rate = NGX_CONF_UNSET_SIZE;
+    conf->requests = NGX_CONF_UNSET_UINT;
     conf->responses = NGX_CONF_UNSET_UINT;
     conf->next_upstream_tries = NGX_CONF_UNSET_UINT;
     conf->next_upstream = NGX_CONF_UNSET;
     conf->proxy_protocol = NGX_CONF_UNSET;
     conf->local = NGX_CONF_UNSET_PTR;
+    conf->socket_keepalive = NGX_CONF_UNSET;
 
 #if (NGX_STREAM_SSL)
     conf->ssl_enable = NGX_CONF_UNSET;
@@ -1899,6 +2011,9 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_size_value(conf->download_rate,
                               prev->download_rate, 0);
 
+    ngx_conf_merge_uint_value(conf->requests,
+                              prev->requests, 0);
+
     ngx_conf_merge_uint_value(conf->responses,
                               prev->responses, NGX_MAX_INT32_VALUE);
 
@@ -1911,6 +2026,9 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_ptr_value(conf->local, prev->local, NULL);
 
+    ngx_conf_merge_value(conf->socket_keepalive,
+                              prev->socket_keepalive, 0);
+
 #if (NGX_STREAM_SSL)
 
     ngx_conf_merge_value(conf->ssl_enable, prev->ssl_enable, 0);
@@ -1978,6 +2096,7 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
 
     cln = ngx_pool_cleanup_add(cf->pool, 0);
     if (cln == NULL) {
+        ngx_ssl_cleanup_ctx(pscf->ssl);
         return NGX_ERROR;
     }
 
@@ -2025,6 +2144,12 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
         }
     }
 
+    if (ngx_ssl_client_session_cache(cf, pscf->ssl, pscf->ssl_session_reuse)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     return NGX_OK;
 }
 
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 3e5a1f2..ec9524e 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -22,6 +22,12 @@ static ngx_int_t ngx_stream_ssl_handler(ngx_stream_session_t *s);
 static ngx_int_t ngx_stream_ssl_init_connection(ngx_ssl_t *ssl,
     ngx_connection_t *c);
 static void ngx_stream_ssl_handshake_handler(ngx_connection_t *c);
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+int ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg);
+#endif
+#ifdef SSL_R_CERT_CB_ERROR
+static int ngx_stream_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg);
+#endif
 static ngx_int_t ngx_stream_ssl_static_variable(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_ssl_variable(ngx_stream_session_t *s,
@@ -32,6 +38,9 @@ static void *ngx_stream_ssl_create_conf(ngx_conf_t *cf);
 static char *ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent,
     void *child);
 
+static ngx_int_t ngx_stream_ssl_compile_certificates(ngx_conf_t *cf,
+    ngx_stream_ssl_conf_t *conf);
+
 static char *ngx_stream_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -304,13 +313,6 @@ ngx_stream_ssl_handler(ngx_stream_session_t *s)
     if (c->ssl == NULL) {
         c->log->action = "SSL handshaking";
 
-        if (sslcf->ssl.ctx == NULL) {
-            ngx_log_error(NGX_LOG_ERR, c->log, 0,
-                          "no \"ssl_certificate\" is defined "
-                          "in server listening on SSL port");
-            return NGX_ERROR;
-        }
-
         rv = ngx_stream_ssl_init_connection(&sslcf->ssl, c);
 
         if (rv != NGX_OK) {
@@ -415,6 +417,73 @@ ngx_stream_ssl_handshake_handler(ngx_connection_t *c)
 }
 
 
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+
+int
+ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
+{
+    return SSL_TLSEXT_ERR_OK;
+}
+
+#endif
+
+
+#ifdef SSL_R_CERT_CB_ERROR
+
+int
+ngx_stream_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg)
+{
+    ngx_str_t                    cert, key;
+    ngx_uint_t                   i, nelts;
+    ngx_connection_t            *c;
+    ngx_stream_session_t        *s;
+    ngx_stream_ssl_conf_t       *sslcf;
+    ngx_stream_complex_value_t  *certs, *keys;
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    if (c->ssl->handshaked) {
+        return 0;
+    }
+
+    s = c->data;
+
+    sslcf = arg;
+
+    nelts = sslcf->certificate_values->nelts;
+    certs = sslcf->certificate_values->elts;
+    keys = sslcf->certificate_key_values->elts;
+
+    for (i = 0; i < nelts; i++) {
+
+        if (ngx_stream_complex_value(s, &certs[i], &cert) != NGX_OK) {
+            return 0;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                       "ssl cert: \"%s\"", cert.data);
+
+        if (ngx_stream_complex_value(s, &keys[i], &key) != NGX_OK) {
+            return 0;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                       "ssl key: \"%s\"", key.data);
+
+        if (ngx_ssl_connection_certificate(c, c->pool, &cert, &key,
+                                           sslcf->passwords)
+            != NGX_OK)
+        {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+#endif
+
+
 static ngx_int_t
 ngx_stream_ssl_static_variable(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data)
@@ -510,7 +579,9 @@ ngx_stream_ssl_create_conf(ngx_conf_t *cf)
     /*
      * set by ngx_pcalloc():
      *
+     *     scf->listen = 0;
      *     scf->protocols = 0;
+     *     scf->certificate_values = NULL;
      *     scf->dhparam = { 0, NULL };
      *     scf->ecdh_curve = { 0, NULL };
      *     scf->client_certificate = { 0, NULL };
@@ -582,18 +653,34 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     conf->ssl.log = cf->log;
 
-    if (conf->certificates == NULL) {
+    if (!conf->listen) {
         return NGX_CONF_OK;
     }
 
-    if (conf->certificate_keys == NULL
-        || conf->certificate_keys->nelts < conf->certificates->nelts)
-    {
+    if (conf->certificates == NULL) {
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "no \"ssl_certificate\" is defined for "
+                      "the \"listen ... ssl\" directive in %s:%ui",
+                      conf->file, conf->line);
+        return NGX_CONF_ERROR;
+    }
+
+    if (conf->certificate_keys == NULL) {
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "no \"ssl_certificate_key\" is defined for "
+                      "the \"listen ... ssl\" directive in %s:%ui",
+                      conf->file, conf->line);
+        return NGX_CONF_ERROR;
+    }
+
+    if (conf->certificate_keys->nelts < conf->certificates->nelts) {
         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                       "no \"ssl_certificate_key\" is defined "
-                      "for certificate \"%V\"",
+                      "for certificate \"%V\" and "
+                      "the \"listen ... ssl\" directive in %s:%ui",
                       ((ngx_str_t *) conf->certificates->elts)
-                      + conf->certificates->nelts - 1);
+                      + conf->certificates->nelts - 1,
+                      conf->file, conf->line);
         return NGX_CONF_ERROR;
     }
 
@@ -603,19 +690,50 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     cln = ngx_pool_cleanup_add(cf->pool, 0);
     if (cln == NULL) {
+        ngx_ssl_cleanup_ctx(&conf->ssl);
         return NGX_CONF_ERROR;
     }
 
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = &conf->ssl;
 
-    if (ngx_ssl_certificates(cf, &conf->ssl, conf->certificates,
-                             conf->certificate_keys, conf->passwords)
-        != NGX_OK)
-    {
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+    SSL_CTX_set_tlsext_servername_callback(conf->ssl.ctx,
+                                           ngx_stream_ssl_servername);
+#endif
+
+    if (ngx_stream_ssl_compile_certificates(cf, conf) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
+    if (conf->certificate_values) {
+
+#ifdef SSL_R_CERT_CB_ERROR
+
+        /* install callback to lookup certificates */
+
+        SSL_CTX_set_cert_cb(conf->ssl.ctx, ngx_stream_ssl_certificate, conf);
+
+#else
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "variables in "
+                      "\"ssl_certificate\" and \"ssl_certificate_key\" "
+                      "directives are not supported on this platform");
+        return NGX_CONF_ERROR;
+#endif
+
+    } else {
+
+        /* configure certificates */
+
+        if (ngx_ssl_certificates(cf, &conf->ssl, conf->certificates,
+                                 conf->certificate_keys, conf->passwords)
+            != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
+    }
+
     if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
                         conf->prefer_server_ciphers)
         != NGX_OK)
@@ -668,7 +786,7 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     }
 
     if (ngx_ssl_session_cache(&conf->ssl, &ngx_stream_ssl_sess_id_ctx,
-                              conf->builtin_session_cache,
+                              conf->certificates, conf->builtin_session_cache,
                               conf->shm_zone, conf->session_timeout)
         != NGX_OK)
     {
@@ -697,6 +815,90 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 }
 
 
+static ngx_int_t
+ngx_stream_ssl_compile_certificates(ngx_conf_t *cf,
+    ngx_stream_ssl_conf_t *conf)
+{
+    ngx_str_t                           *cert, *key;
+    ngx_uint_t                           i, nelts;
+    ngx_stream_complex_value_t          *cv;
+    ngx_stream_compile_complex_value_t   ccv;
+
+    cert = conf->certificates->elts;
+    key = conf->certificate_keys->elts;
+    nelts = conf->certificates->nelts;
+
+    for (i = 0; i < nelts; i++) {
+
+        if (ngx_stream_script_variables_count(&cert[i])) {
+            goto found;
+        }
+
+        if (ngx_stream_script_variables_count(&key[i])) {
+            goto found;
+        }
+    }
+
+    return NGX_OK;
+
+found:
+
+    conf->certificate_values = ngx_array_create(cf->pool, nelts,
+                                           sizeof(ngx_stream_complex_value_t));
+    if (conf->certificate_values == NULL) {
+        return NGX_ERROR;
+    }
+
+    conf->certificate_key_values = ngx_array_create(cf->pool, nelts,
+                                           sizeof(ngx_stream_complex_value_t));
+    if (conf->certificate_key_values == NULL) {
+        return NGX_ERROR;
+    }
+
+    for (i = 0; i < nelts; i++) {
+
+        cv = ngx_array_push(conf->certificate_values);
+        if (cv == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+        ccv.cf = cf;
+        ccv.value = &cert[i];
+        ccv.complex_value = cv;
+        ccv.zero = 1;
+
+        if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        cv = ngx_array_push(conf->certificate_key_values);
+        if (cv == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+        ccv.cf = cf;
+        ccv.value = &key[i];
+        ccv.complex_value = cv;
+        ccv.zero = 1;
+
+        if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    conf->passwords = ngx_ssl_preserve_passwords(cf, conf->passwords);
+    if (conf->passwords == NULL) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
 static char *
 ngx_stream_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
diff --git a/src/stream/ngx_stream_ssl_module.h b/src/stream/ngx_stream_ssl_module.h
index 65f5d45..6cb4140 100644
--- a/src/stream/ngx_stream_ssl_module.h
+++ b/src/stream/ngx_stream_ssl_module.h
@@ -21,6 +21,7 @@ typedef struct {
 
     ngx_ssl_t        ssl;
 
+    ngx_uint_t       listen;
     ngx_uint_t       protocols;
 
     ngx_uint_t       verify;
@@ -33,6 +34,9 @@ typedef struct {
     ngx_array_t     *certificates;
     ngx_array_t     *certificate_keys;
 
+    ngx_array_t     *certificate_values;
+    ngx_array_t     *certificate_key_values;
+
     ngx_str_t        dhparam;
     ngx_str_t        ecdh_curve;
     ngx_str_t        client_certificate;
@@ -47,6 +51,9 @@ typedef struct {
 
     ngx_flag_t       session_tickets;
     ngx_array_t     *session_ticket_keys;
+
+    u_char          *file;
+    ngx_uint_t       line;
 } ngx_stream_ssl_conf_t;
 
 
diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c
index 62d6524..a236fc5 100644
--- a/src/stream/ngx_stream_ssl_preread_module.c
+++ b/src/stream/ngx_stream_ssl_preread_module.c
@@ -21,6 +21,7 @@ typedef struct {
     u_char         *pos;
     u_char         *dst;
     u_char          buf[4];
+    u_char          version[2];
     ngx_str_t       host;
     ngx_str_t       alpn;
     ngx_log_t      *log;
@@ -32,6 +33,8 @@ typedef struct {
 static ngx_int_t ngx_stream_ssl_preread_handler(ngx_stream_session_t *s);
 static ngx_int_t ngx_stream_ssl_preread_parse_record(
     ngx_stream_ssl_preread_ctx_t *ctx, u_char *pos, u_char *last);
+static ngx_int_t ngx_stream_ssl_preread_protocol_variable(
+    ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_ssl_preread_server_name_variable(
     ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_ssl_preread_alpn_protocols_variable(
@@ -86,6 +89,9 @@ ngx_module_t  ngx_stream_ssl_preread_module = {
 
 static ngx_stream_variable_t  ngx_stream_ssl_preread_vars[] = {
 
+    { ngx_string("ssl_preread_protocol"), NULL,
+      ngx_stream_ssl_preread_protocol_variable, 0, 0, 0 },
+
     { ngx_string("ssl_preread_server_name"), NULL,
       ngx_stream_ssl_preread_server_name_variable, 0, 0, 0 },
 
@@ -143,6 +149,14 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
 
     while (last - p >= 5) {
 
+        if ((p[0] & 0x80) && p[2] == 1 && (p[3] == 0 || p[3] == 3)) {
+            ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                           "ssl preread: version 2 ClientHello");
+            ctx->version[0] = p[3];
+            ctx->version[1] = p[4];
+            return NGX_OK;
+        }
+
         if (p[0] != 0x16) {
             ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
                            "ssl preread: not a handshake");
@@ -196,7 +210,8 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
     enum {
         sw_start = 0,
         sw_header,          /* handshake msg_type, length */
-        sw_head_tail,       /* version, random */
+        sw_version,         /* client_version */
+        sw_random,          /* random */
         sw_sid_len,         /* session_id length */
         sw_sid,             /* session_id */
         sw_cs_len,          /* cipher_suites length */
@@ -210,7 +225,8 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
         sw_sni_host,        /* SNI host_name */
         sw_alpn_len,        /* ALPN length */
         sw_alpn_proto_len,  /* ALPN protocol_name length */
-        sw_alpn_proto_data  /* ALPN protocol_name */
+        sw_alpn_proto_data, /* ALPN protocol_name */
+        sw_supver_len       /* supported_versions length */
     } state;
 
     ngx_log_debug2(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
@@ -254,13 +270,19 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
                 return NGX_DECLINED;
             }
 
-            state = sw_head_tail;
-            dst = NULL;
-            size = 34;
+            state = sw_version;
+            dst = ctx->version;
+            size = 2;
             left = (p[1] << 16) + (p[2] << 8) + p[3];
             break;
 
-        case sw_head_tail:
+        case sw_version:
+            state = sw_random;
+            dst = NULL;
+            size = 32;
+            break;
+
+        case sw_random:
             state = sw_sid_len;
             dst = p;
             size = 1;
@@ -334,6 +356,14 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
                 break;
             }
 
+            if (p[0] == 0 && p[1] == 43) {
+                /* supported_versions extension */
+                state = sw_supver_len;
+                dst = p;
+                size = 1;
+                break;
+            }
+
             state = sw_ext;
             dst = NULL;
             size = (p[2] << 8) + p[3];
@@ -434,6 +464,19 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
             dst = NULL;
             size = 0;
             break;
+
+        case sw_supver_len:
+            ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                           "ssl preread: supported_versions");
+
+            /* set TLSv1.3 */
+            ctx->version[0] = 3;
+            ctx->version[1] = 4;
+
+            state = sw_ext;
+            dst = NULL;
+            size = p[0];
+            break;
         }
 
         if (left < size) {
@@ -453,6 +496,62 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
 }
 
 
+static ngx_int_t
+ngx_stream_ssl_preread_protocol_variable(ngx_stream_session_t *s,
+    ngx_variable_value_t *v, uintptr_t data)
+{
+    ngx_str_t                      version;
+    ngx_stream_ssl_preread_ctx_t  *ctx;
+
+    ctx = ngx_stream_get_module_ctx(s, ngx_stream_ssl_preread_module);
+
+    if (ctx == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    /* SSL_get_version() format */
+
+    ngx_str_null(&version);
+
+    switch (ctx->version[0]) {
+    case 0:
+        switch (ctx->version[1]) {
+        case 2:
+            ngx_str_set(&version, "SSLv2");
+            break;
+        }
+        break;
+    case 3:
+        switch (ctx->version[1]) {
+        case 0:
+            ngx_str_set(&version, "SSLv3");
+            break;
+        case 1:
+            ngx_str_set(&version, "TLSv1");
+            break;
+        case 2:
+            ngx_str_set(&version, "TLSv1.1");
+            break;
+        case 3:
+            ngx_str_set(&version, "TLSv1.2");
+            break;
+        case 4:
+            ngx_str_set(&version, "TLSv1.3");
+            break;
+        }
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->len = version.len;
+    v->data = version.data;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_ssl_preread_server_name_variable(ngx_stream_session_t *s,
     ngx_variable_value_t *v, uintptr_t data)
diff --git a/src/stream/ngx_stream_upstream.c b/src/stream/ngx_stream_upstream.c
index 7feac43..eadcf9f 100644
--- a/src/stream/ngx_stream_upstream.c
+++ b/src/stream/ngx_stream_upstream.c
@@ -267,24 +267,22 @@ ngx_stream_upstream_response_time_variable(ngx_stream_session_t *s,
     for ( ;; ) {
 
         if (data == 1) {
-            if (state[i].first_byte_time == (ngx_msec_t) -1) {
-                *p++ = '-';
-                goto next;
-            }
-
             ms = state[i].first_byte_time;
 
-        } else if (data == 2 && state[i].connect_time != (ngx_msec_t) -1) {
+        } else if (data == 2) {
             ms = state[i].connect_time;
 
         } else {
             ms = state[i].response_time;
         }
 
-        ms = ngx_max(ms, 0);
-        p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000);
+        if (ms != -1) {
+            ms = ngx_max(ms, 0);
+            p = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000);
 
-    next:
+        } else {
+            *p++ = '-';
+        }
 
         if (++i == s->upstream_states->nelts) {
             break;
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index 73947f4..0fe416b 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -128,7 +128,9 @@ typedef struct {
 
     off_t                              received;
     time_t                             start_sec;
+    ngx_uint_t                         requests;
     ngx_uint_t                         responses;
+    ngx_msec_t                         start_time;
 
     ngx_str_t                          ssl_name;
 
diff --git a/src/stream/ngx_stream_upstream_hash_module.c b/src/stream/ngx_stream_upstream_hash_module.c
index 79ad742..4fa9a2d 100644
--- a/src/stream/ngx_stream_upstream_hash_module.c
+++ b/src/stream/ngx_stream_upstream_hash_module.c
@@ -176,7 +176,7 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
     ngx_log_debug1(NGX_LOG_DEBUG_STREAM, pc->log, 0,
                    "get hash peer, try: %ui", pc->tries);
 
-    ngx_stream_upstream_rr_peers_wlock(hp->rrp.peers);
+    ngx_stream_upstream_rr_peers_rlock(hp->rrp.peers);
 
     if (hp->tries > 20 || hp->rrp.peers->single) {
         ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
@@ -227,10 +227,13 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
             goto next;
         }
 
+        ngx_stream_upstream_rr_peer_lock(hp->rrp.peers, peer);
+
         ngx_log_debug2(NGX_LOG_DEBUG_STREAM, pc->log, 0,
                        "get hash peer, value:%uD, peer:%ui", hp->hash, p);
 
         if (peer->down) {
+            ngx_stream_upstream_rr_peer_unlock(hp->rrp.peers, peer);
             goto next;
         }
 
@@ -238,10 +241,12 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
             && peer->fails >= peer->max_fails
             && now - peer->checked <= peer->fail_timeout)
         {
+            ngx_stream_upstream_rr_peer_unlock(hp->rrp.peers, peer);
             goto next;
         }
 
         if (peer->max_conns && peer->conns >= peer->max_conns) {
+            ngx_stream_upstream_rr_peer_unlock(hp->rrp.peers, peer);
             goto next;
         }
 
@@ -267,6 +272,7 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
         peer->checked = now;
     }
 
+    ngx_stream_upstream_rr_peer_unlock(hp->rrp.peers, peer);
     ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
 
     hp->rrp.tried[n] |= m;
diff --git a/src/stream/ngx_stream_upstream_random_module.c b/src/stream/ngx_stream_upstream_random_module.c
new file mode 100644
index 0000000..402c1b2
--- /dev/null
+++ b/src/stream/ngx_stream_upstream_random_module.c
@@ -0,0 +1,502 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    ngx_stream_upstream_rr_peer_t          *peer;
+    ngx_uint_t                              range;
+} ngx_stream_upstream_random_range_t;
+
+
+typedef struct {
+    ngx_uint_t                              two;
+    ngx_stream_upstream_random_range_t     *ranges;
+} ngx_stream_upstream_random_srv_conf_t;
+
+
+typedef struct {
+    /* the round robin data must be first */
+    ngx_stream_upstream_rr_peer_data_t      rrp;
+
+    ngx_stream_upstream_random_srv_conf_t  *conf;
+    u_char                                  tries;
+} ngx_stream_upstream_random_peer_data_t;
+
+
+static ngx_int_t ngx_stream_upstream_init_random(ngx_conf_t *cf,
+    ngx_stream_upstream_srv_conf_t *us);
+static ngx_int_t ngx_stream_upstream_update_random(ngx_pool_t *pool,
+    ngx_stream_upstream_srv_conf_t *us);
+
+static ngx_int_t ngx_stream_upstream_init_random_peer(ngx_stream_session_t *s,
+    ngx_stream_upstream_srv_conf_t *us);
+static ngx_int_t ngx_stream_upstream_get_random_peer(ngx_peer_connection_t *pc,
+    void *data);
+static ngx_int_t ngx_stream_upstream_get_random2_peer(ngx_peer_connection_t *pc,
+    void *data);
+static ngx_uint_t ngx_stream_upstream_peek_random_peer(
+    ngx_stream_upstream_rr_peers_t *peers,
+    ngx_stream_upstream_random_peer_data_t *rp);
+static void *ngx_stream_upstream_random_create_conf(ngx_conf_t *cf);
+static char *ngx_stream_upstream_random(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+
+static ngx_command_t  ngx_stream_upstream_random_commands[] = {
+
+    { ngx_string("random"),
+      NGX_STREAM_UPS_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE12,
+      ngx_stream_upstream_random,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_upstream_random_module_ctx = {
+    NULL,                                    /* preconfiguration */
+    NULL,                                    /* postconfiguration */
+
+    NULL,                                    /* create main configuration */
+    NULL,                                    /* init main configuration */
+
+    ngx_stream_upstream_random_create_conf,  /* create server configuration */
+    NULL                                     /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_upstream_random_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_upstream_random_module_ctx,  /* module context */
+    ngx_stream_upstream_random_commands,     /* module directives */
+    NGX_STREAM_MODULE,                       /* module type */
+    NULL,                                    /* init master */
+    NULL,                                    /* init module */
+    NULL,                                    /* init process */
+    NULL,                                    /* init thread */
+    NULL,                                    /* exit thread */
+    NULL,                                    /* exit process */
+    NULL,                                    /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_stream_upstream_init_random(ngx_conf_t *cf,
+    ngx_stream_upstream_srv_conf_t *us)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, cf->log, 0, "init random");
+
+    if (ngx_stream_upstream_init_round_robin(cf, us) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    us->peer.init = ngx_stream_upstream_init_random_peer;
+
+#if (NGX_STREAM_UPSTREAM_ZONE)
+    if (us->shm_zone) {
+        return NGX_OK;
+    }
+#endif
+
+    return ngx_stream_upstream_update_random(cf->pool, us);
+}
+
+
+static ngx_int_t
+ngx_stream_upstream_update_random(ngx_pool_t *pool,
+    ngx_stream_upstream_srv_conf_t *us)
+{
+    size_t                                  size;
+    ngx_uint_t                              i, total_weight;
+    ngx_stream_upstream_rr_peer_t          *peer;
+    ngx_stream_upstream_rr_peers_t         *peers;
+    ngx_stream_upstream_random_range_t     *ranges;
+    ngx_stream_upstream_random_srv_conf_t  *rcf;
+
+    rcf = ngx_stream_conf_upstream_srv_conf(us,
+                                            ngx_stream_upstream_random_module);
+    peers = us->peer.data;
+
+    size = peers->number * sizeof(ngx_stream_upstream_random_range_t);
+
+    ranges = pool ? ngx_palloc(pool, size) : ngx_alloc(size, ngx_cycle->log);
+    if (ranges == NULL) {
+        return NGX_ERROR;
+    }
+
+    total_weight = 0;
+
+    for (peer = peers->peer, i = 0; peer; peer = peer->next, i++) {
+        ranges[i].peer = peer;
+        ranges[i].range = total_weight;
+        total_weight += peer->weight;
+    }
+
+    rcf->ranges = ranges;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_upstream_init_random_peer(ngx_stream_session_t *s,
+    ngx_stream_upstream_srv_conf_t *us)
+{
+    ngx_stream_upstream_random_srv_conf_t   *rcf;
+    ngx_stream_upstream_random_peer_data_t  *rp;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "init random peer");
+
+    rcf = ngx_stream_conf_upstream_srv_conf(us,
+                                            ngx_stream_upstream_random_module);
+
+    rp = ngx_palloc(s->connection->pool,
+                    sizeof(ngx_stream_upstream_random_peer_data_t));
+    if (rp == NULL) {
+        return NGX_ERROR;
+    }
+
+    s->upstream->peer.data = &rp->rrp;
+
+    if (ngx_stream_upstream_init_round_robin_peer(s, us) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (rcf->two) {
+        s->upstream->peer.get = ngx_stream_upstream_get_random2_peer;
+
+    } else {
+        s->upstream->peer.get = ngx_stream_upstream_get_random_peer;
+    }
+
+    rp->conf = rcf;
+    rp->tries = 0;
+
+    ngx_stream_upstream_rr_peers_rlock(rp->rrp.peers);
+
+#if (NGX_STREAM_UPSTREAM_ZONE)
+    if (rp->rrp.peers->shpool && rcf->ranges == NULL) {
+        if (ngx_stream_upstream_update_random(NULL, us) != NGX_OK) {
+            ngx_stream_upstream_rr_peers_unlock(rp->rrp.peers);
+            return NGX_ERROR;
+        }
+    }
+#endif
+
+    ngx_stream_upstream_rr_peers_unlock(rp->rrp.peers);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_upstream_get_random_peer(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_stream_upstream_random_peer_data_t  *rp = data;
+
+    time_t                               now;
+    uintptr_t                            m;
+    ngx_uint_t                           i, n;
+    ngx_stream_upstream_rr_peer_t       *peer;
+    ngx_stream_upstream_rr_peers_t      *peers;
+    ngx_stream_upstream_rr_peer_data_t  *rrp;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, pc->log, 0,
+                   "get random peer, try: %ui", pc->tries);
+
+    rrp = &rp->rrp;
+    peers = rrp->peers;
+
+    ngx_stream_upstream_rr_peers_rlock(peers);
+
+    if (rp->tries > 20 || peers->single) {
+        ngx_stream_upstream_rr_peers_unlock(peers);
+        return ngx_stream_upstream_get_round_robin_peer(pc, rrp);
+    }
+
+    pc->cached = 0;
+    pc->connection = NULL;
+
+    now = ngx_time();
+
+    for ( ;; ) {
+
+        i = ngx_stream_upstream_peek_random_peer(peers, rp);
+
+        peer = rp->conf->ranges[i].peer;
+
+        n = i / (8 * sizeof(uintptr_t));
+        m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
+
+        if (rrp->tried[n] & m) {
+            goto next;
+        }
+
+        ngx_stream_upstream_rr_peer_lock(peers, peer);
+
+        if (peer->down) {
+            ngx_stream_upstream_rr_peer_unlock(peers, peer);
+            goto next;
+        }
+
+        if (peer->max_fails
+            && peer->fails >= peer->max_fails
+            && now - peer->checked <= peer->fail_timeout)
+        {
+            ngx_stream_upstream_rr_peer_unlock(peers, peer);
+            goto next;
+        }
+
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            ngx_stream_upstream_rr_peer_unlock(peers, peer);
+            goto next;
+        }
+
+        break;
+
+    next:
+
+        if (++rp->tries > 20) {
+            ngx_stream_upstream_rr_peers_unlock(peers);
+            return ngx_stream_upstream_get_round_robin_peer(pc, rrp);
+        }
+    }
+
+    rrp->current = peer;
+
+    if (now - peer->checked > peer->fail_timeout) {
+        peer->checked = now;
+    }
+
+    pc->sockaddr = peer->sockaddr;
+    pc->socklen = peer->socklen;
+    pc->name = &peer->name;
+
+    peer->conns++;
+
+    ngx_stream_upstream_rr_peer_unlock(peers, peer);
+    ngx_stream_upstream_rr_peers_unlock(peers);
+
+    rrp->tried[n] |= m;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_upstream_get_random2_peer(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_stream_upstream_random_peer_data_t  *rp = data;
+
+    time_t                               now;
+    uintptr_t                            m;
+    ngx_uint_t                           i, n, p;
+    ngx_stream_upstream_rr_peer_t       *peer, *prev;
+    ngx_stream_upstream_rr_peers_t      *peers;
+    ngx_stream_upstream_rr_peer_data_t  *rrp;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, pc->log, 0,
+                   "get random2 peer, try: %ui", pc->tries);
+
+    rrp = &rp->rrp;
+    peers = rrp->peers;
+
+    ngx_stream_upstream_rr_peers_wlock(peers);
+
+    if (rp->tries > 20 || peers->single) {
+        ngx_stream_upstream_rr_peers_unlock(peers);
+        return ngx_stream_upstream_get_round_robin_peer(pc, rrp);
+    }
+
+    pc->cached = 0;
+    pc->connection = NULL;
+
+    now = ngx_time();
+
+    prev = NULL;
+
+#if (NGX_SUPPRESS_WARN)
+    p = 0;
+#endif
+
+    for ( ;; ) {
+
+        i = ngx_stream_upstream_peek_random_peer(peers, rp);
+
+        peer = rp->conf->ranges[i].peer;
+
+        if (peer == prev) {
+            goto next;
+        }
+
+        n = i / (8 * sizeof(uintptr_t));
+        m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t));
+
+        if (rrp->tried[n] & m) {
+            goto next;
+        }
+
+        if (peer->down) {
+            goto next;
+        }
+
+        if (peer->max_fails
+            && peer->fails >= peer->max_fails
+            && now - peer->checked <= peer->fail_timeout)
+        {
+            goto next;
+        }
+
+        if (peer->max_conns && peer->conns >= peer->max_conns) {
+            goto next;
+        }
+
+        if (prev) {
+            if (peer->conns * prev->weight > prev->conns * peer->weight) {
+                peer = prev;
+                n = p / (8 * sizeof(uintptr_t));
+                m = (uintptr_t) 1 << p % (8 * sizeof(uintptr_t));
+            }
+
+            break;
+        }
+
+        prev = peer;
+        p = i;
+
+    next:
+
+        if (++rp->tries > 20) {
+            ngx_stream_upstream_rr_peers_unlock(peers);
+            return ngx_stream_upstream_get_round_robin_peer(pc, rrp);
+        }
+    }
+
+    rrp->current = peer;
+
+    if (now - peer->checked > peer->fail_timeout) {
+        peer->checked = now;
+    }
+
+    pc->sockaddr = peer->sockaddr;
+    pc->socklen = peer->socklen;
+    pc->name = &peer->name;
+
+    peer->conns++;
+
+    ngx_stream_upstream_rr_peers_unlock(peers);
+
+    rrp->tried[n] |= m;
+
+    return NGX_OK;
+}
+
+
+static ngx_uint_t
+ngx_stream_upstream_peek_random_peer(ngx_stream_upstream_rr_peers_t *peers,
+    ngx_stream_upstream_random_peer_data_t *rp)
+{
+    ngx_uint_t  i, j, k, x;
+
+    x = ngx_random() % peers->total_weight;
+
+    i = 0;
+    j = peers->number;
+
+    while (j - i > 1) {
+        k = (i + j) / 2;
+
+        if (x < rp->conf->ranges[k].range) {
+            j = k;
+
+        } else {
+            i = k;
+        }
+    }
+
+    return i;
+}
+
+
+static void *
+ngx_stream_upstream_random_create_conf(ngx_conf_t *cf)
+{
+    ngx_stream_upstream_random_srv_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_upstream_random_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->two = 0;
+     */
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_upstream_random(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_upstream_random_srv_conf_t  *rcf = conf;
+
+    ngx_str_t                       *value;
+    ngx_stream_upstream_srv_conf_t  *uscf;
+
+    uscf = ngx_stream_conf_get_module_srv_conf(cf, ngx_stream_upstream_module);
+
+    if (uscf->peer.init_upstream) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "load balancing method redefined");
+    }
+
+    uscf->peer.init_upstream = ngx_stream_upstream_init_random;
+
+    uscf->flags = NGX_STREAM_UPSTREAM_CREATE
+                  |NGX_STREAM_UPSTREAM_WEIGHT
+                  |NGX_STREAM_UPSTREAM_MAX_CONNS
+                  |NGX_STREAM_UPSTREAM_MAX_FAILS
+                  |NGX_STREAM_UPSTREAM_FAIL_TIMEOUT
+                  |NGX_STREAM_UPSTREAM_DOWN;
+
+    if (cf->args->nelts == 1) {
+        return NGX_CONF_OK;
+    }
+
+    value = cf->args->elts;
+
+    if (ngx_strcmp(value[1].data, "two") == 0) {
+        rcf->two = 1;
+
+    } else {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\"", &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->args->nelts == 2) {
+        return NGX_CONF_OK;
+    }
+
+    if (ngx_strcmp(value[2].data, "least_conn") != 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\"", &value[2]);
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
index 526de3a..36e2ec5 100644
--- a/src/stream/ngx_stream_upstream_round_robin.c
+++ b/src/stream/ngx_stream_upstream_round_robin.c
@@ -776,7 +776,7 @@ ngx_stream_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc,
 
     if (peers->shpool) {
 
-        ssl_session = SSL_get0_session(pc->connection->ssl->connection);
+        ssl_session = ngx_ssl_get0_session(pc->connection);
 
         if (ssl_session == NULL) {
             return;
diff --git a/src/stream/ngx_stream_write_filter_module.c b/src/stream/ngx_stream_write_filter_module.c
index 8fdcd37..24326c6 100644
--- a/src/stream/ngx_stream_write_filter_module.c
+++ b/src/stream/ngx_stream_write_filter_module.c
@@ -104,7 +104,6 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in,
                        cl->buf->file_pos,
                        cl->buf->file_last - cl->buf->file_pos);
 
-#if 1
         if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) {
             ngx_log_error(NGX_LOG_ALERT, c->log, 0,
                           "zero size buf in writer "
@@ -122,7 +121,24 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in,
             ngx_debug_point();
             return NGX_ERROR;
         }
-#endif
+
+        if (ngx_buf_size(cl->buf) < 0) {
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "negative size buf in writer "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          cl->buf->temporary,
+                          cl->buf->recycled,
+                          cl->buf->in_file,
+                          cl->buf->start,
+                          cl->buf->pos,
+                          cl->buf->last,
+                          cl->buf->file,
+                          cl->buf->file_pos,
+                          cl->buf->file_last);
+
+            ngx_debug_point();
+            return NGX_ERROR;
+        }
 
         size += ngx_buf_size(cl->buf);
 
@@ -160,7 +176,6 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in,
                        cl->buf->file_pos,
                        cl->buf->file_last - cl->buf->file_pos);
 
-#if 1
         if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) {
             ngx_log_error(NGX_LOG_ALERT, c->log, 0,
                           "zero size buf in writer "
@@ -178,7 +193,24 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in,
             ngx_debug_point();
             return NGX_ERROR;
         }
-#endif
+
+        if (ngx_buf_size(cl->buf) < 0) {
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "negative size buf in writer "
+                          "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                          cl->buf->temporary,
+                          cl->buf->recycled,
+                          cl->buf->in_file,
+                          cl->buf->start,
+                          cl->buf->pos,
+                          cl->buf->last,
+                          cl->buf->file,
+                          cl->buf->file_pos,
+                          cl->buf->file_last);
+
+            ngx_debug_point();
+            return NGX_ERROR;
+        }
 
         size += ngx_buf_size(cl->buf);
 

From b2a3e22c477fc51206c2f0823b00684b6f1c2b92 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Sun, 8 Sep 2019 10:44:49 +0300
Subject: [PATCH 282/600] Drop debian CVE patches already included in 1.16.1

---
 debian/patches/CVE-2019-9511.patch | 87 ------------------------------
 debian/patches/CVE-2019-9513.patch | 62 ---------------------
 debian/patches/CVE-2019-9516.patch | 45 ----------------
 debian/patches/series              |  3 --
 4 files changed, 197 deletions(-)
 delete mode 100644 debian/patches/CVE-2019-9511.patch
 delete mode 100644 debian/patches/CVE-2019-9513.patch
 delete mode 100644 debian/patches/CVE-2019-9516.patch

diff --git a/debian/patches/CVE-2019-9511.patch b/debian/patches/CVE-2019-9511.patch
deleted file mode 100644
index 3b48e0c..0000000
--- a/debian/patches/CVE-2019-9511.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 3f64486e0c15414dc6368139453dcaca338ddf3e Mon Sep 17 00:00:00 2001
-From: Ruslan Ermilov <ru@nginx.com>
-Date: Tue, 13 Aug 2019 15:43:36 +0300
-Subject: [PATCH 2/3] HTTP/2: limited number of DATA frames.
-
-Fixed excessive memory growth and CPU usage if stream windows are
-manipulated in a way that results in generating many small DATA frames.
-Fix is to limit the number of simultaneously allocated DATA frames.
----
- src/http/v2/ngx_http_v2.c               |  2 ++
- src/http/v2/ngx_http_v2.h               |  2 ++
- src/http/v2/ngx_http_v2_filter_module.c | 22 +++++++++++++++++-----
- 3 files changed, 21 insertions(+), 5 deletions(-)
-
-diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
-index be2ef82b..1b01f271 100644
---- a/src/http/v2/ngx_http_v2.c
-+++ b/src/http/v2/ngx_http_v2.c
-@@ -4339,6 +4339,8 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
-      */
-     pool = stream->pool;
- 
-+    h2c->frames -= stream->frames;
-+
-     ngx_http_free_request(stream->request, rc);
- 
-     if (pool != h2c->state.pool) {
-diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
-index bec22160..715b7d30 100644
---- a/src/http/v2/ngx_http_v2.h
-+++ b/src/http/v2/ngx_http_v2.h
-@@ -192,6 +192,8 @@ struct ngx_http_v2_stream_s {
- 
-     ngx_buf_t                       *preread;
- 
-+    ngx_uint_t                       frames;
-+
-     ngx_http_v2_out_frame_t         *free_frames;
-     ngx_chain_t                     *free_frame_headers;
-     ngx_chain_t                     *free_bufs;
-diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
-index 029e8ece..c7ee5536 100644
---- a/src/http/v2/ngx_http_v2_filter_module.c
-+++ b/src/http/v2/ngx_http_v2_filter_module.c
-@@ -1661,22 +1661,34 @@ static ngx_http_v2_out_frame_t *
- ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
-     size_t len, ngx_chain_t *first, ngx_chain_t *last)
- {
--    u_char                    flags;
--    ngx_buf_t                *buf;
--    ngx_chain_t              *cl;
--    ngx_http_v2_out_frame_t  *frame;
-+    u_char                     flags;
-+    ngx_buf_t                 *buf;
-+    ngx_chain_t               *cl;
-+    ngx_http_v2_out_frame_t   *frame;
-+    ngx_http_v2_connection_t  *h2c;
- 
-     frame = stream->free_frames;
-+    h2c = stream->connection;
- 
-     if (frame) {
-         stream->free_frames = frame->next;
- 
--    } else {
-+    } else if (h2c->frames < 10000) {
-         frame = ngx_palloc(stream->request->pool,
-                            sizeof(ngx_http_v2_out_frame_t));
-         if (frame == NULL) {
-             return NULL;
-         }
-+
-+        stream->frames++;
-+        h2c->frames++;
-+
-+    } else {
-+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-+                      "http2 flood detected");
-+
-+        h2c->connection->error = 1;
-+        return NULL;
-     }
- 
-     flags = last->buf->last_buf ? NGX_HTTP_V2_END_STREAM_FLAG : 0;
--- 
-2.20.1
-
diff --git a/debian/patches/CVE-2019-9513.patch b/debian/patches/CVE-2019-9513.patch
deleted file mode 100644
index edc1c2b..0000000
--- a/debian/patches/CVE-2019-9513.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bbdc81631b6d322785d8e92788fd400e25a931e6 Mon Sep 17 00:00:00 2001
-From: Ruslan Ermilov <ru@nginx.com>
-Date: Tue, 13 Aug 2019 15:43:40 +0300
-Subject: [PATCH 3/3] HTTP/2: limited number of PRIORITY frames.
-
-Fixed excessive CPU usage caused by a peer that continuously shuffles
-priority of streams.  Fix is to limit the number of PRIORITY frames.
----
- src/http/v2/ngx_http_v2.c | 10 ++++++++++
- src/http/v2/ngx_http_v2.h |  1 +
- 2 files changed, 11 insertions(+)
-
-diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
-index 1b01f271..fd6ecb05 100644
---- a/src/http/v2/ngx_http_v2.c
-+++ b/src/http/v2/ngx_http_v2.c
-@@ -275,6 +275,7 @@ ngx_http_v2_init(ngx_event_t *rev)
-     h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
- 
-     h2c->concurrent_pushes = h2scf->concurrent_pushes;
-+    h2c->priority_limit = h2scf->concurrent_streams;
- 
-     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
-     if (h2c->pool == NULL) {
-@@ -1806,6 +1807,13 @@ ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c, u_char *pos,
-         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
-     }
- 
-+    if (--h2c->priority_limit == 0) {
-+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-+                      "client sent too many PRIORITY frames");
-+
-+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
-+    }
-+
-     if (end - pos < NGX_HTTP_V2_PRIORITY_SIZE) {
-         return ngx_http_v2_state_save(h2c, pos, end,
-                                       ngx_http_v2_state_priority);
-@@ -3120,6 +3128,8 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
-         h2c->processing++;
-     }
- 
-+    h2c->priority_limit += h2scf->concurrent_streams;
-+
-     return stream;
- }
- 
-diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
-index 715b7d30..69d55d1c 100644
---- a/src/http/v2/ngx_http_v2.h
-+++ b/src/http/v2/ngx_http_v2.h
-@@ -122,6 +122,7 @@ struct ngx_http_v2_connection_s {
-     ngx_uint_t                       processing;
-     ngx_uint_t                       frames;
-     ngx_uint_t                       idle;
-+    ngx_uint_t                       priority_limit;
- 
-     ngx_uint_t                       pushing;
-     ngx_uint_t                       concurrent_pushes;
--- 
-2.20.1
-
diff --git a/debian/patches/CVE-2019-9516.patch b/debian/patches/CVE-2019-9516.patch
deleted file mode 100644
index 0d5ec77..0000000
--- a/debian/patches/CVE-2019-9516.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 840d8a3e2f126384eb4ee3e5dd7ffe875a5634c5 Mon Sep 17 00:00:00 2001
-From: Sergey Kandaurov <pluknet@nginx.com>
-Date: Tue, 13 Aug 2019 15:43:32 +0300
-Subject: [PATCH 1/3] HTTP/2: reject zero length headers with PROTOCOL_ERROR.
-
-Fixed uncontrolled memory growth if peer sends a stream of
-headers with a 0-length header name and 0-length header value.
-Fix is to reject headers with zero name length.
----
- src/http/v2/ngx_http_v2.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
-index 12214e15..be2ef82b 100644
---- a/src/http/v2/ngx_http_v2.c
-+++ b/src/http/v2/ngx_http_v2.c
-@@ -1548,6 +1548,14 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
-         header->name.len = h2c->state.field_end - h2c->state.field_start;
-         header->name.data = h2c->state.field_start;
- 
-+        if (header->name.len == 0) {
-+            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-+                          "client sent zero header name length");
-+
-+            return ngx_http_v2_connection_error(h2c,
-+                                                NGX_HTTP_V2_PROTOCOL_ERROR);
-+        }
-+
-         return ngx_http_v2_state_field_len(h2c, pos, end);
-     }
- 
-@@ -3249,10 +3257,6 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
-     ngx_uint_t                 i;
-     ngx_http_core_srv_conf_t  *cscf;
- 
--    if (header->name.len == 0) {
--        return NGX_ERROR;
--    }
--
-     r->invalid_header = 0;
- 
-     cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
--- 
-2.20.1
-
diff --git a/debian/patches/series b/debian/patches/series
index dfc20c1..5b6b799 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
-CVE-2019-9516.patch
-CVE-2019-9511.patch
-CVE-2019-9513.patch

From 85ba84543384c260ee728b14c2b68eec6cd7a118 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 9 Sep 2019 17:31:40 +0300
Subject: [PATCH 283/600] http-ndk: Upgrade to 0.3.1

---
 debian/modules/control                        |  2 +-
 debian/modules/http-ndk/.gitignore            |  4 ++
 debian/modules/http-ndk/LICENSE               |  2 +-
 debian/modules/http-ndk/README.md             | 30 ++++++++++---
 .../{README_AUTO_LIB => README_AUTO_LIB.md}   | 43 +++++++++----------
 debian/modules/http-ndk/TODO                  |  1 -
 debian/modules/http-ndk/src/ndk_regex.c       |  4 +-
 7 files changed, 52 insertions(+), 34 deletions(-)
 create mode 100644 debian/modules/http-ndk/.gitignore
 rename debian/modules/http-ndk/{README_AUTO_LIB => README_AUTO_LIB.md} (96%)
 delete mode 100644 debian/modules/http-ndk/TODO

diff --git a/debian/modules/control b/debian/modules/control
index a5d65a8..f27ca7c 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -5,7 +5,7 @@ Files-Excluded: .gitignore .gitattributes .travis.yml
 
 Module: http-ndk
 Homepage: https://github.com/simpl/ngx_devel_kit/
-Version: 0.3.0
+Version: 0.3.1
 
 Module: http-auth-pam
 Homepage: https://github.com/stogh/ngx_http_auth_pam_module
diff --git a/debian/modules/http-ndk/.gitignore b/debian/modules/http-ndk/.gitignore
new file mode 100644
index 0000000..0fd79d0
--- /dev/null
+++ b/debian/modules/http-ndk/.gitignore
@@ -0,0 +1,4 @@
+tags
+cscope.*
+*~
+*.swp
diff --git a/debian/modules/http-ndk/LICENSE b/debian/modules/http-ndk/LICENSE
index ee54448..e1a5221 100644
--- a/debian/modules/http-ndk/LICENSE
+++ b/debian/modules/http-ndk/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015, Marcus Clyne
+Copyright (c) 2010-2018, Marcus Clyne
 
 All rights reserved.
 
diff --git a/debian/modules/http-ndk/README.md b/debian/modules/http-ndk/README.md
index e0ed4eb..d9d3972 100644
--- a/debian/modules/http-ndk/README.md
+++ b/debian/modules/http-ndk/README.md
@@ -1,7 +1,7 @@
 Name
 ====
 
-NDK - Nginx Development Kit
+Nginx Development Kit (NDK)
 
 Table of Contents
 =================
@@ -21,7 +21,8 @@ Table of Contents
 * [TODO](#todo)
 * [License](#license)
 * [Contributing / Feedback](#contributing--feedback)
-* [Author](#author)
+* [Authors](#authors)
+* [Special Thanks](#special-thanks)
 
 Synopsis
 ========
@@ -42,11 +43,15 @@ their own modules which features of the NDK they wish to use (explained below).
 If you are not an Nginx module developer, then the only useful part of this project
 will be the 'usage for users' section below.
 
+[Back to TOC](#table-of-contents)
+
 Status
 ======
 
 The NDK is now considered to be stable. It is already being used in quite a few third
-party modules.
+party modules (see list below).
+
+[Back to TOC](#table-of-contents)
 
 Features
 ========
@@ -151,7 +156,7 @@ displayed when compiling Nginx.
 
 [Back to TOC](#table-of-contents)
 
-Warning: using NDK_ALL
+Warning: Using NDK_ALL
 ----------------------
 
 You can also set `NDK_ALL` to include all the NDK modules.  This is primarily as
@@ -177,6 +182,8 @@ The following 3rd-party modules make use of NDK.
 * [ngx_http_iconv_module](https://github.com/calio/iconv-nginx-module#readme)
 * [ngx_http_array_var_module](https://github.com/openresty/array-var-nginx-module#readme)
 
+If you would like to add your module to this list, please let us know.
+
 [Back to TOC](#table-of-contents)
 
 TODO
@@ -186,13 +193,14 @@ TODO
 * additional phase-handler functions
 * generically testing for needing to add a handler
 * remove dependency of set_var on OpenSSL being compiled in
+* for backward compatability, add the ndk_macros
 
 [Back to TOC](#table-of-contents)
 
 License
 =======
 
-Copyright (c) 2010-2016, Marcus Clyne
+Copyright (c) 2010-2018, Marcus Clyne
 
 All rights reserved.
 
@@ -225,14 +233,22 @@ Contributing / Feedback
 
 If you are an Nginx module developer, and have developed some functions that are
 generic in nature (or would be easily adapted to be so), then please send them to
-me at the address below, and I'll add them to the kit.
+me at the address below, and I'll addmclyne to the kit.
 
 [Back to TOC](#table-of-contents)
 
 Author
 ======
 
-Marcus Clyne (contact at simpl dot it)
+[Marcus Clyne](https://github.com/mclyne)
 
 [Back to TOC](#table-of-contents)
 
+
+Special Thanks
+==============
+
+A special thanks goes to [Yichun Zhang](https://github.com/agentzh) for helping to maintain
+this module.
+
+[Back to TOC](#table-of-contents)
diff --git a/debian/modules/http-ndk/README_AUTO_LIB b/debian/modules/http-ndk/README_AUTO_LIB.md
similarity index 96%
rename from debian/modules/http-ndk/README_AUTO_LIB
rename to debian/modules/http-ndk/README_AUTO_LIB.md
index fd2776f..f2c3371 100644
--- a/debian/modules/http-ndk/README_AUTO_LIB
+++ b/debian/modules/http-ndk/README_AUTO_LIB.md
@@ -10,7 +10,7 @@ cross-platform way to include external libraries.
 Any developers of Nginx modules are encouraged to use Auto Lib Core to handle library
 dependencies for their modules rather than writing their own custom handler from scratch.
 
-Note : the latest version can be found at github.com/simpl/ngx_auto_lib
+Note : The latest version can be found [here](https://github.com/simplresty/ngx_auto_lib).
 
 
 Information for end users
@@ -68,7 +68,7 @@ Specifying a path to find a library
 If the version of a library you wish to include is in any of the standard paths (e.g.
 /usr/local, /usr ...), you will not need to specify a path to include the library.
 
-If you do wish to specify a specific path, in most cases just specifying 
+If you do wish to specify a specific path, in most cases just specifying
 [PFX]=/path/to/library will be sufficient. e.g.
 
 $ export MOZJS=/path/to/mozjs
@@ -106,8 +106,8 @@ searched.
 When searching under [PFX]_BASE no prefix is added to the search, but when searching under
 the directory that the Nginx source is located in, the prefix [pfx]- is automatically added.
 
-Note : there is currently a minor bug (due to the implementation of the 'sort' command) 
-means versions that include hyphens (e.g. 1.0.0-beta5) are checked before versions like 
+Note : there is currently a minor bug (due to the implementation of the 'sort' command)
+means versions that include hyphens (e.g. 1.0.0-beta5) are checked before versions like
 1.0.0a. This will be fixed soon, and searching of -build folders before normal source ones
 will be added too.
 
@@ -119,7 +119,7 @@ Shared or static?
 The default for most libraries is to look for shared libraries, though this can be overridden
 by the user by setting [PFX]_SHARED=NO.
 
-In the near future the default action will be to look for shared libraries then to look 
+In the near future the default action will be to look for shared libraries then to look
 for static libraries in each directory searched unless one of [PFX]_SHARED and/or
 [PFX]_STATIC = NO. If both are set to NO, then Auto Lib will not be used at all.
 
@@ -154,7 +154,7 @@ How Auto Lib Core works
 -----------------------
 
 Auto Lib Core works as an interface layer between the module and the auto/feature part of
-the Nginx source. This is the file that results in the 'checking for ...' lines that you 
+the Nginx source. This is the file that results in the 'checking for ...' lines that you
 see when you call ./configure.
 
 auto/feature works by using a few key variables (see below) to generate some C code, trying
@@ -162,8 +162,8 @@ to compile it to see if it works and optionally running the code. This output fi
 autotest.c (located under the objs/ directory whilst configure is running, but is deleted
 after each call to auto/feature).
 
-Normally, whenever an external library is required, a module developer will write a number 
-of calls to auto/feature manually in their config files - e.g. to check under a range of 
+Normally, whenever an external library is required, a module developer will write a number
+of calls to auto/feature manually in their config files - e.g. to check under a range of
 different possible locations to find a library. Apart from being tedious, this is obviously
 potentially error-prone.
 
@@ -180,7 +180,7 @@ Option 1 :
   located
 - add the following line to your config file
 
-  . $ngx_addon_dir/ngx_auto_lib_core 
+  . $ngx_addon_dir/ngx_auto_lib_core
 
 NOTE : if you want to include the file in a different directory to your config
 file, you will need to change both the include line in your config file AND
@@ -189,7 +189,7 @@ has $ngx_addon_dir/ngx_auto_lib_core in it)
 
 Option 2 :
 
-- make the Nginx Development Kit (github.com/simpl-it/ngx_devel_kit) a dependency 
+- make the Nginx Development Kit (github.com/simpl-it/ngx_devel_kit) a dependency
   for your module (Auto Lib Core is included automatically with it)
 
 
@@ -229,10 +229,10 @@ Calling ngx_auto_lib_init() and ngx_auto_lib_run()
 
 You can pass either one or two variables to ngx_auto_lib_init(). The first is the name of
 the library as it will appear when running ./configure, the second is the prefix that is
-used for internal variables and looking for directory prefixes. If the second is not 
+used for internal variables and looking for directory prefixes. If the second is not
 specified, it defaults to the first.
 
-The init function resets all key variables and functions, so it must be called before 
+The init function resets all key variables and functions, so it must be called before
 setting any other variables or functions that are to be used as hooks (see the notes below).
 
 ngx_auto_lib_run() should be called in the config files after all the variables and hooks
@@ -315,9 +315,9 @@ Hooks
 
 To facilitate using Auto Lib Core in a flexible way, a number of 'hooks' have been
 placed in the testing cycle. These hooks are implemented as functions that you define
-in your config file which are called if required by the core library. In the core 
+in your config file which are called if required by the core library. In the core
 library they are left as empty functions that return either 0 or 1. Any functions
-you write will 
+you write will
 
 Note : ngx_auto_lib_init() resets the variables and functions each time it is called, so
 you must DEFINE HOOKS AFTER YOU CALL ngx_auto_lib_init.
@@ -337,7 +337,7 @@ Although in most cases Auto Lib Core will be used where external libraries are
 definitely required (for a module to work), this may not always be the case. In the
 standard Nginx Auto Lib module (github.com/simpl-it/ngx_auto_lib) - which is designed
 to improve the inclusion of OpenSSL, PCRE and Zlib libraries and increase compilation
-speed where possible - the libraries are not always required, so checks are made to 
+speed where possible - the libraries are not always required, so checks are made to
 see if it is necessary.
 
 
@@ -348,11 +348,11 @@ How Auto Lib Core checks if a library is required - ngx_auto_lib_check_require()
 - search for USE_[PFX]=YES (it is set to YES by default for most modules)
 - search for any external libraries that have been included in the CORE_LIBS or ADDON_LIBS
   variables that use the same lib name as any set in ngx_feature_lib_names
-- search for any macros that have been defined either in the CFLAGS variable or using 
-  auto/have or auto/define as set in the ngx_feature_check_macros_defined and 
+- search for any macros that have been defined either in the CFLAGS variable or using
+  auto/have or auto/define as set in the ngx_feature_check_macros_defined and
   ngx_feature_ngx_macros_non_zero variables
 - any custom checks implemented by creating an ngx_auto_lib_check hook function (which
-  should return 0 if the library is required and return 1 at the end if the module is 
+  should return 0 if the library is required and return 1 at the end if the module is
   not required)
 
 
@@ -378,8 +378,8 @@ that the linker links to is the same as the one specified. This is done because
 To do
 -----
 
-- change how library paths are searched to include both shared and static libraries
-- touch up documentation
+- Change how library paths are searched to include both shared and static libraries
+- Touch up documentation
 
 
 License
@@ -391,5 +391,4 @@ License
 Copyright
 ---------
 
-    Marcus Clyne (c) 2010  (http://simpl.it)
-
+    [Marcus Clyne](https://github.com/mclyne) (c) 2010
diff --git a/debian/modules/http-ndk/TODO b/debian/modules/http-ndk/TODO
deleted file mode 100644
index 0acf8bf..0000000
--- a/debian/modules/http-ndk/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- for backward compatability, add the ndk_macros 
diff --git a/debian/modules/http-ndk/src/ndk_regex.c b/debian/modules/http-ndk/src/ndk_regex.c
index d5893df..c1efd86 100644
--- a/debian/modules/http-ndk/src/ndk_regex.c
+++ b/debian/modules/http-ndk/src/ndk_regex.c
@@ -100,7 +100,7 @@ ndk_conf_set_regex_array_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_array_t            **a;
     ngx_regex_elt_t         *re;   
     ngx_regex_compile_t      rc;
-    ngx_uint_t               i, n;
+    ngx_uint_t               i, n = 0;
     u_char                   errstr[NGX_MAX_CONF_ERRSTR];
 
     a = (ngx_array_t **) (p + cmd->offset);
@@ -162,7 +162,7 @@ ndk_conf_set_regex_array_caseless_slot (ngx_conf_t *cf, ngx_command_t *cmd, void
     ngx_array_t            **a;
     ngx_regex_elt_t         *re;   
     ngx_regex_compile_t      rc;
-    ngx_uint_t               i, n;
+    ngx_uint_t               i, n = 0;
     u_char                   errstr[NGX_MAX_CONF_ERRSTR];
 
     a = (ngx_array_t **) (p + cmd->offset);

From 132704ab76aa72ce29d00e4acd50d3218693558b Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 9 Sep 2019 17:32:06 +0300
Subject: [PATCH 284/600] http-lua: Upgrade to 0.10.15

---
 debian/modules/control                        |    2 +-
 debian/modules/http-lua/README.markdown       |  235 +-
 debian/modules/http-lua/config                |   45 +
 .../modules/http-lua/doc/HttpLuaModule.wiki   |  213 +-
 .../http-lua/src/api/ngx_http_lua_api.h       |    2 +-
 .../http-lua/src/ngx_http_lua_accessby.c      |    4 +-
 .../modules/http-lua/src/ngx_http_lua_api.c   |    2 +-
 .../http-lua/src/ngx_http_lua_balancer.c      |    3 +
 .../http-lua/src/ngx_http_lua_bodyfilterby.c  |   50 +-
 .../http-lua/src/ngx_http_lua_bodyfilterby.h  |    2 +-
 .../modules/http-lua/src/ngx_http_lua_cache.c |   23 +-
 .../http-lua/src/ngx_http_lua_clfactory.c     |   45 +-
 .../http-lua/src/ngx_http_lua_common.h        |   49 +-
 .../http-lua/src/ngx_http_lua_contentby.c     |    2 +
 .../http-lua/src/ngx_http_lua_control.c       |    3 +-
 .../http-lua/src/ngx_http_lua_coroutine.c     |   18 +-
 .../http-lua/src/ngx_http_lua_directive.c     |   11 +-
 .../src/ngx_http_lua_headerfilterby.c         |    3 +-
 .../http-lua/src/ngx_http_lua_headers.c       |   83 +-
 .../http-lua/src/ngx_http_lua_headers_in.c    |   10 +-
 .../http-lua/src/ngx_http_lua_headers_out.c   |   20 +-
 .../http-lua/src/ngx_http_lua_headers_out.h   |    6 +-
 .../http-lua/src/ngx_http_lua_initworkerby.c  |   19 +
 .../http-lua/src/ngx_http_lua_input_filters.c |  137 +
 .../http-lua/src/ngx_http_lua_input_filters.h |   29 +
 .../modules/http-lua/src/ngx_http_lua_logby.c |    3 +-
 .../modules/http-lua/src/ngx_http_lua_misc.c  |   27 +
 .../http-lua/src/ngx_http_lua_module.c        |   56 +
 .../modules/http-lua/src/ngx_http_lua_ndk.c   |   41 +
 .../modules/http-lua/src/ngx_http_lua_pipe.c  | 2475 +++++++++++++++++
 .../modules/http-lua/src/ngx_http_lua_pipe.h  |   95 +
 .../modules/http-lua/src/ngx_http_lua_regex.c |   10 +-
 .../http-lua/src/ngx_http_lua_rewriteby.c     |    4 +-
 .../http-lua/src/ngx_http_lua_script.c        |    4 +-
 .../modules/http-lua/src/ngx_http_lua_setby.c |   34 +-
 .../modules/http-lua/src/ngx_http_lua_setby.h |    2 +-
 .../http-lua/src/ngx_http_lua_shdict.c        |   44 +-
 .../http-lua/src/ngx_http_lua_socket_tcp.c    | 1608 +++++++----
 .../http-lua/src/ngx_http_lua_socket_tcp.h    |   29 +-
 .../http-lua/src/ngx_http_lua_socket_udp.c    |   12 +-
 .../http-lua/src/ngx_http_lua_ssl_certby.c    |    2 +
 .../src/ngx_http_lua_ssl_session_fetchby.c    |    2 +
 .../src/ngx_http_lua_ssl_session_storeby.c    |    3 +
 .../http-lua/src/ngx_http_lua_string.c        |   14 +
 .../http-lua/src/ngx_http_lua_subrequest.c    |    8 +
 .../modules/http-lua/src/ngx_http_lua_timer.c |   44 +-
 .../http-lua/src/ngx_http_lua_uthread.c       |    3 +-
 .../modules/http-lua/src/ngx_http_lua_util.c  |  168 +-
 .../modules/http-lua/src/ngx_http_lua_util.h  |   28 +-
 .../http-lua/src/ngx_http_lua_worker.c        |   11 +
 debian/modules/http-lua/t/000--init.t         |    5 -
 debian/modules/http-lua/t/001-set.t           |   23 +-
 debian/modules/http-lua/t/002-content.t       |   38 +-
 debian/modules/http-lua/t/004-require.t       |   12 +-
 debian/modules/http-lua/t/005-exit.t          |    2 +-
 debian/modules/http-lua/t/009-log.t           |   12 +-
 debian/modules/http-lua/t/011-md5_bin.t       |    2 +-
 debian/modules/http-lua/t/013-base64.t        |    2 +-
 debian/modules/http-lua/t/014-bugs.t          |   49 +-
 debian/modules/http-lua/t/016-resp-header.t   |  504 +++-
 debian/modules/http-lua/t/017-exec.t          |    4 +-
 debian/modules/http-lua/t/020-subrequest.t    |  134 +-
 .../http-lua/t/023-rewrite/client-abort.t     |    6 +-
 debian/modules/http-lua/t/023-rewrite/exec.t  |    4 +-
 debian/modules/http-lua/t/023-rewrite/mixed.t |    4 +-
 .../http-lua/t/023-rewrite/multi-capture.t    |    2 +-
 .../http-lua/t/023-rewrite/req-socket.t       |    6 +-
 .../modules/http-lua/t/023-rewrite/sanity.t   |   28 +-
 .../http-lua/t/023-rewrite/socket-keepalive.t |   12 +-
 .../http-lua/t/023-rewrite/subrequest.t       |   42 +-
 .../t/023-rewrite/tcp-socket-timeout.t        |   12 +-
 .../http-lua/t/023-rewrite/tcp-socket.t       |   32 +-
 .../http-lua/t/023-rewrite/uthread-exec.t     |   12 +-
 .../http-lua/t/023-rewrite/uthread-exit.t     |   40 +-
 .../http-lua/t/023-rewrite/uthread-redirect.t |    4 +-
 .../http-lua/t/023-rewrite/uthread-spawn.t    |   62 +-
 .../http-lua/t/024-access/client-abort.t      |    6 +-
 debian/modules/http-lua/t/024-access/exec.t   |    2 +-
 debian/modules/http-lua/t/024-access/mixed.t  |   10 +-
 .../http-lua/t/024-access/multi-capture.t     |    2 +-
 debian/modules/http-lua/t/024-access/sanity.t |   30 +-
 .../http-lua/t/024-access/subrequest.t        |   42 +-
 .../http-lua/t/024-access/uthread-exec.t      |   12 +-
 .../http-lua/t/024-access/uthread-exit.t      |   38 +-
 .../http-lua/t/024-access/uthread-redirect.t  |    4 +-
 .../http-lua/t/024-access/uthread-spawn.t     |   62 +-
 debian/modules/http-lua/t/025-codecache.t     |  174 +-
 debian/modules/http-lua/t/027-multi-capture.t |    4 +-
 debian/modules/http-lua/t/028-req-header.t    |   24 +-
 debian/modules/http-lua/t/030-uri-args.t      |   23 +-
 debian/modules/http-lua/t/034-match.t         |   65 +-
 debian/modules/http-lua/t/035-gmatch.t        |   22 +-
 debian/modules/http-lua/t/036-sub.t           |    4 +-
 debian/modules/http-lua/t/037-gsub.t          |    2 +-
 debian/modules/http-lua/t/038-match-o.t       |   44 +-
 debian/modules/http-lua/t/041-header-filter.t |   15 +-
 debian/modules/http-lua/t/043-shdict.t        |    4 +-
 debian/modules/http-lua/t/047-match-jit.t     |   12 +-
 debian/modules/http-lua/t/048-match-dfa.t     |   12 +-
 debian/modules/http-lua/t/055-subreq-vars.t   |   18 +-
 debian/modules/http-lua/t/056-flush.t         |    2 +-
 debian/modules/http-lua/t/057-flush-timeout.t |    2 +-
 debian/modules/http-lua/t/058-tcp-socket.t    |  364 ++-
 debian/modules/http-lua/t/062-count.t         |   31 +-
 debian/modules/http-lua/t/063-abort.t         |   62 +-
 debian/modules/http-lua/t/064-pcall.t         |   14 +-
 .../http-lua/t/065-tcp-socket-timeout.t       |   24 +-
 .../http-lua/t/066-socket-receiveuntil.t      |   30 +-
 debian/modules/http-lua/t/067-req-socket.t    |    6 +-
 .../modules/http-lua/t/068-socket-keepalive.t | 1467 +++++++++-
 debian/modules/http-lua/t/073-backtrace.t     |   14 +-
 debian/modules/http-lua/t/075-logby.t         |   11 +-
 debian/modules/http-lua/t/081-bytecode.t      |   45 +-
 debian/modules/http-lua/t/082-body-filter.t   |    3 +-
 .../http-lua/t/084-inclusive-receiveuntil.t   |   20 +-
 debian/modules/http-lua/t/087-udp-socket.t    |   12 +-
 .../http-lua/t/090-log-socket-errors.t        |   10 +-
 debian/modules/http-lua/t/091-coroutine.t     |   81 +-
 debian/modules/http-lua/t/093-uthread-spawn.t |   66 +-
 debian/modules/http-lua/t/094-uthread-exit.t  |   46 +-
 debian/modules/http-lua/t/095-uthread-exec.t  |   14 +-
 .../modules/http-lua/t/096-uthread-redirect.t |    6 +-
 .../modules/http-lua/t/097-uthread-rewrite.t  |   12 +-
 debian/modules/http-lua/t/098-uthread-wait.t  |   74 +-
 debian/modules/http-lua/t/099-c-api.t         |   10 +-
 debian/modules/http-lua/t/100-client-abort.t  |    6 +-
 debian/modules/http-lua/t/106-timer.t         |   18 +-
 debian/modules/http-lua/t/108-timer-safe.t    |   16 +-
 debian/modules/http-lua/t/109-timer-hup.t     |   18 +-
 debian/modules/http-lua/t/120-re-find.t       |    4 +-
 debian/modules/http-lua/t/123-lua-path.t      |   10 +-
 debian/modules/http-lua/t/124-init-worker.t   |   10 +-
 debian/modules/http-lua/t/126-shdict-frag.t   |    4 +-
 debian/modules/http-lua/t/127-uthread-kill.t  |   26 +-
 .../http-lua/t/128-duplex-tcp-socket.t        |    6 +-
 debian/modules/http-lua/t/129-ssl-socket.t    |   16 +-
 debian/modules/http-lua/t/130-internal-api.t  |   17 +-
 .../modules/http-lua/t/134-worker-count-5.t   |    4 +-
 debian/modules/http-lua/t/138-balancer.t      |    2 -
 debian/modules/http-lua/t/139-ssl-cert-by.t   |    2 +-
 debian/modules/http-lua/t/140-ssl-c-api.t     |   23 +-
 .../http-lua/t/143-ssl-session-fetch.t        |  105 +
 .../http-lua/t/147-tcp-socket-timeouts.t      |    8 +-
 debian/modules/http-lua/t/152-timer-every.t   |    4 +-
 debian/modules/http-lua/t/153-semaphore-hup.t |    2 +-
 debian/modules/http-lua/t/156-slow-network.t  |  138 +
 .../http-lua/t/157-socket-keepalive-hup.t     |   91 +
 debian/modules/http-lua/t/158-global-var.t    |  508 ++++
 debian/modules/http-lua/t/159-sa-restart.t    |  180 ++
 .../http-lua/t/160-disable-init-by-lua.t      |  194 ++
 .../modules/http-lua/t/161-load-resty-core.t  |   68 +
 .../ngx_http_lua_fake_shm_module.c            |   22 +-
 debian/modules/http-lua/util/build.sh         |    4 +-
 153 files changed, 9493 insertions(+), 1866 deletions(-)
 create mode 100644 debian/modules/http-lua/src/ngx_http_lua_input_filters.c
 create mode 100644 debian/modules/http-lua/src/ngx_http_lua_input_filters.h
 create mode 100644 debian/modules/http-lua/src/ngx_http_lua_pipe.c
 create mode 100644 debian/modules/http-lua/src/ngx_http_lua_pipe.h
 create mode 100644 debian/modules/http-lua/t/156-slow-network.t
 create mode 100644 debian/modules/http-lua/t/157-socket-keepalive-hup.t
 create mode 100644 debian/modules/http-lua/t/158-global-var.t
 create mode 100644 debian/modules/http-lua/t/159-sa-restart.t
 create mode 100644 debian/modules/http-lua/t/160-disable-init-by-lua.t
 create mode 100644 debian/modules/http-lua/t/161-load-resty-core.t

diff --git a/debian/modules/control b/debian/modules/control
index f27ca7c..8331ff5 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -18,7 +18,7 @@ Files-Excluded: .gitignore .gitattributes .travis.yml
 
 Module: http-lua
 Homepage: https://github.com/openresty/lua-nginx-module
-Version: 0.10.13
+Version: 0.10.15
 Patch:
   openssl-1.1.0.patch
   discover-luajit-2.1.patch
diff --git a/debian/modules/http-lua/README.markdown b/debian/modules/http-lua/README.markdown
index 15ad00e..ed0c72d 100644
--- a/debian/modules/http-lua/README.markdown
+++ b/debian/modules/http-lua/README.markdown
@@ -8,6 +8,8 @@ Name
 
 ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
+This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
+
 *This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
 
 Table of Contents
@@ -23,7 +25,6 @@ Table of Contents
 * [Installation](#installation)
     * [Building as a dynamic module](#building-as-a-dynamic-module)
     * [C Macro Configurations](#c-macro-configurations)
-    * [Installation on Ubuntu 11.10](#installation-on-ubuntu-1110)
 * [Community](#community)
     * [English Mailing List](#english-mailing-list)
     * [Chinese Mailing List](#chinese-mailing-list)
@@ -62,7 +63,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.13](https://github.com/openresty/lua-nginx-module/tags) released on 22 April 2018.
+This document describes ngx_lua [v0.10.15](https://github.com/openresty/lua-nginx-module/tags) released on March 14th, 2019.
 
 Synopsis
 ========
@@ -187,7 +188,9 @@ Synopsis
 Description
 ===========
 
-This module embeds Lua, via the standard Lua 5.1 interpreter or [LuaJIT 2.0/2.1](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.
+This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
+
+This module embeds Lua, via [LuaJIT 2.0/2.1](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](https://httpd.apache.org/docs/trunk/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](#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.
@@ -265,11 +268,11 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 Installation
 ============
 
-It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
+It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, OpenResty's LuaJIT 2.1 branch version, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-1. Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is *not* supported yet). LuaJIT can be downloaded from 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. LuaJIT can be downloaded from the [latest release of OpenResty's LuaJIT branch version](https://github.com/openresty/luajit2/releases). The official LuaJIT 2.0 and 2.1 releases are also supported, although the performance will be significantly lower in many cases.
 1. Download the latest version of the ngx_devel_kit (NDK) module [HERE](https://github.com/simplresty/ngx_devel_kit/tags).
 1. Download the latest version of ngx_lua [HERE](https://github.com/openresty/lua-nginx-module/tags).
 1. Download the latest version of Nginx [HERE](http://nginx.org/) (See [Nginx Compatibility](#nginx-compatibility))
@@ -345,29 +348,6 @@ To enable one or more of these macros, just pass extra C compiler options to the
     ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
 
 
-[Back to TOC](#table-of-contents)
-
-Installation on Ubuntu 11.10
-----------------------------
-
-Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever possible.
-
-If the standard Lua 5.1 interpreter is required however, run the following command to install it from the Ubuntu repository:
-
-```bash
-
- 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.
-
-```bash
-
- ln -s /usr/lib/x86_64-linux-gnu/liblua5.1.so /usr/lib/liblua.so
-```
-
 [Back to TOC](#table-of-contents)
 
 Community
@@ -411,7 +391,7 @@ Lua/LuaJIT bytecode support
 
 As from the `v0.5.0rc32` release, all `*_by_lua_file` configure directives (such as [content_by_lua_file](#content_by_lua_file)) support loading Lua 5.1 and LuaJIT 2.0/2.1 raw bytecode files directly.
 
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if you are using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
 
 ```bash
 
@@ -431,20 +411,6 @@ Please refer to the official LuaJIT documentation on the `-b` option for more de
 
 Also, the bytecode files generated by LuaJIT 2.1 is *not* compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
 
-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:
-
-```bash
-
- 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:
-
-```bash
-
- 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/2.1 or vice versa, will result in an error message, such as that below, being logged into the Nginx `error.log` file:
 
 
@@ -642,8 +608,7 @@ This issue is due to limitations in the Nginx event model and only appears to af
 
 Lua Coroutine Yielding/Resuming
 -------------------------------
-* Because Lua's `dofile` and `require` builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by `dofile` or `require` invokes [ngx.location.capture*](#ngxlocationcapture), [ngx.exec](#ngxexec), [ngx.exit](#ngxexit), or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
-* As the standard Lua 5.1 interpreter's VM is not fully resumable, the methods [ngx.location.capture](#ngxlocationcapture), [ngx.location.capture_multi](#ngxlocationcapture_multi), [ngx.redirect](#ngxredirect), [ngx.exec](#ngxexec), and [ngx.exit](#ngxexit) 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) or even the first line of the `for ... in ...` statement 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.x, which supports a fully resumable VM, to avoid this.
+* Because Lua's `dofile` and `require` builtins are currently implemented as C functions in LuaJIT 2.0/2.1, if the Lua file being loaded by `dofile` or `require` invokes [ngx.location.capture*](#ngxlocationcapture), [ngx.exec](#ngxexec), [ngx.exit](#ngxexit), or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
 
 [Back to TOC](#table-of-contents)
 
@@ -995,7 +960,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2019, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -1039,6 +1004,7 @@ See Also
 Directives
 ==========
 
+* [lua_load_resty_core](#lua_load_resty_core)
 * [lua_capture_error_log](#lua_capture_error_log)
 * [lua_use_default_type](#lua_use_default_type)
 * [lua_malloc_trim](#lua_malloc_trim)
@@ -1104,6 +1070,7 @@ Directives
 * [lua_check_client_abort](#lua_check_client_abort)
 * [lua_max_pending_timers](#lua_max_pending_timers)
 * [lua_max_running_timers](#lua_max_running_timers)
+* [lua_sa_restart](#lua_sa_restart)
 
 
 The basic building blocks of scripting Nginx with Lua are directives. Directives are used to specify when the user Lua code is run and
@@ -1113,6 +1080,38 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 [Back to TOC](#table-of-contents)
 
+lua_load_resty_core
+-------------------
+
+**syntax:** *lua_load_resty_core on|off*
+
+**default:** *lua_load_resty_core on*
+
+**context:** *http*
+
+Controls whether the `resty.core` module (from
+[lua-resty-core](https://github.com/openresty/lua-resty-core)) should be loaded
+or not. When enabled, this directive is equivalent to executing the following
+when the Lua VM is created:
+
+```lua
+
+ require "resty.core"
+```
+
+Note that usage of the `resty.core` module is recommended, as its
+FFI implementation is both faster, safer, and more complete than the Lua C API
+of the ngx_lua module.
+
+It must also be noted that the Lua C API of the ngx_lua module will eventually
+be removed, and usage of the FFI-based API (i.e. the `resty.core`
+module) will become mandatory. This directive only aims at providing a
+temporary backwards-compatibility mode in case of edge-cases.
+
+This directive was first introduced in the `v0.10.15` release.
+
+[Back to TOC](#directives)
+
 lua_capture_error_log
 ---------------------
 **syntax:** *lua_capture_error_log size*
@@ -2602,14 +2601,14 @@ SSL session resumption can then get immediately initiated and bypass the full SS
 Please note that TLS session tickets are very different and it is the clients' responsibility
 to cache the SSL session state when session tickets are used. SSL session resumptions based on
 TLS session tickets would happen automatically without going through this hook (nor the
-[ssl_session_store_by_lua_block](#ssl_session_store_by_lua) hook). This hook is mainly
+[ssl_session_store_by_lua*](#ssl_session_store_by_lua_block) hook). This hook is mainly
 for older or less capable SSL clients that can only do SSL sessions by session IDs.
 
 When [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block) is specified at the same time,
 this hook usually runs before [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
 When the SSL session is found and successfully loaded for the current SSL connection,
 SSL session resumption will happen and thus bypass the [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block)
-hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua_block](#ssl_session_store_by_lua)
+hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block)
 hook, for obvious reasons.
 
 To easily test this hook locally with a modern web browser, you can temporarily put the following line
@@ -3108,6 +3107,23 @@ This directive was first introduced in the `v0.8.0` release.
 
 [Back to TOC](#directives)
 
+lua_sa_restart
+--------------
+
+**syntax:** *lua_sa_restart on|off*
+
+**default:** *lua_sa_restart on*
+
+**context:** *http*
+
+When enabled, this module will set the `SA_RESTART` flag on nginx workers signal dispositions.
+
+This allows Lua I/O primitives to not be interrupted by nginx's handling of various signals.
+
+This directive was first introduced in the `v0.10.14` release.
+
+[Back to TOC](#directives)
+
 Nginx API for Lua
 =================
 
@@ -3221,6 +3237,7 @@ Nginx API for Lua
 * [tcpsock:sslhandshake](#tcpsocksslhandshake)
 * [tcpsock:send](#tcpsocksend)
 * [tcpsock:receive](#tcpsockreceive)
+* [tcpsock:receiveany](#tcpsockreceiveany)
 * [tcpsock:receiveuntil](#tcpsockreceiveuntil)
 * [tcpsock:close](#tcpsockclose)
 * [tcpsock:settimeout](#tcpsocksettimeout)
@@ -4302,7 +4319,7 @@ ngx.req.get_method
 ------------------
 **syntax:** *method_name = ngx.req.get_method()*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, balancer_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, balancer_by_lua&#42;, log_by_lua&#42;*
 
 Retrieves the current request's request method name. Strings like `"GET"` and `"POST"` are returned instead of numerical [method constants](#http-method-constants).
 
@@ -4887,7 +4904,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](#ngxreqread_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 not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn 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](#ngxreqget_body_file) function instead.
 
@@ -4911,7 +4928,7 @@ Retrieves the file name for the in-file request body data. Returns `nil` if the
 
 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](#ngxreqread_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 not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn 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](#ngxreqget_body_data) function instead.
 
@@ -4931,7 +4948,9 @@ ngx.req.set_body_data
 
 Set the current request's request body using the in-memory data specified by the `data` argument.
 
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
+If the request body has not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn on [lua_need_request_body](#lua_need_request_body) to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [ngx.req.discard_body](#ngxreqdiscard_body).
+
+Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the `v0.3.1rc18` release.
 
@@ -4947,11 +4966,13 @@ 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 request body has not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn on [lua_need_request_body](#lua_need_request_body) to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [ngx.req.discard_body](#ngxreqdiscard_body).
+
 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](#ngxreqset_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.
 
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
+Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the `v0.3.1rc18` release.
 
@@ -6717,7 +6738,7 @@ ngx.shared.DICT.flush_expired
 
 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.
 
-Unlike the [flush_all](#ngxshareddictflush_all) method, this method actually free up the memory used by the expired items.
+Unlike the [flush_all](#ngxshareddictflush_all) method, this method actually frees up the memory used by the expired items.
 
 This feature was first introduced in the `v0.6.3` release.
 
@@ -7002,6 +7023,7 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [settimeout](#tcpsocksettimeout)
 * [settimeouts](#tcpsocksettimeouts)
 * [setoption](#tcpsocksetoption)
+* [receiveany](#tcpsockreceiveany)
 * [receiveuntil](#tcpsockreceiveuntil)
 * [setkeepalive](#tcpsocksetkeepalive)
 * [getreusedtimes](#tcpsockgetreusedtimes)
@@ -7106,6 +7128,43 @@ An optional Lua table can be specified as the last argument to this method to sp
 * `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>"`.
 
+* `pool_size`
+	specify the size of the connection pool. If omitted and no
+	`backlog` option was provided, no pool will be created. If omitted
+	but `backlog` was provided, the pool will be created with a default
+	size equal to the value of the [lua_socket_pool_size](#lua_socket_pool_size)
+	directive.
+	The connection pool holds up to `pool_size` alive connections
+	ready to be reused by subsequent calls to [connect](#tcpsockconnect), but
+	note that there is no upper limit to the total number of opened connections
+	outside of the pool. If you need to restrict the total number of opened
+	connections, specify the `backlog` option.
+	When the connection pool would exceed its size limit, the least recently used
+	(kept-alive) 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. Also note that the size of the connection
+	pool cannot be changed once it has been created.
+	This option was first introduced in the `v0.10.14` release.
+
+* `backlog`
+	if specified, this module will limit the total number of opened connections
+	for this pool. No more connections than `pool_size` can be opened
+	for this pool at any time. If the connection pool is full, subsequent
+	connect operations will be queued into a queue equal to this option's
+	value (the "backlog" queue).
+	If the number of queued connect operations is equal to `backlog`,
+	subsequent connect operations will fail and return `nil` plus the
+	error string `"too many waiting connect operations"`.
+	The queued connect operations will be resumed once the number of connections
+	in the pool is less than `pool_size`.
+	The queued connect operation will abort once they have been queued for more
+	than `connect_timeout`, controlled by
+	[settimeouts](#tcpsocksettimeouts), and will return `nil` plus
+	the error string `"timeout"`.
+	This option was first introduced in the `v0.10.14` release.
+
 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.
@@ -7231,6 +7290,40 @@ This feature was first introduced in the `v0.5.0rc1` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+tcpsock:receiveany
+------------------
+**syntax:** *data, err = tcpsock:receiveany(max)*
+
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
+
+Returns any data received by the connected socket, at most `max` bytes.
+
+This method is a synchronous operation just like the [send](#tcpsocksend) method 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 received data is more than this size, this method will return with exactly this size of data.
+The remaining data in the underlying receive buffer could be returned in the next reading operation.
+
+Timeout for the reading operation is controlled by the [lua_socket_read_timeout](#lua_socket_read_timeout) config directive and the [settimeouts](#tcpsocksettimeouts) method. And the latter takes priority. For example:
+
+```lua
+
+ sock:settimeouts(1000, 1000, 1000)  -- one second timeout for connect/read/write
+ local data, err = sock:receiveany(10 * 1024 * 1024) -- read any data, at most 10K
+ if not data then
+     ngx.say("failed to read any data: ", err)
+     return
+ end
+ ngx.say("successfully read: ", data)
+```
+
+This method doesn't automatically close the current connection when the read timeout error occurs. For other connection errors, this method always automatically closes the connection.
+
+This feature was first introduced in the `v0.10.14` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
 tcpsock:receiveuntil
 --------------------
 **syntax:** *iterator = tcpsock:receiveuntil(pattern, options?)*
@@ -7403,13 +7496,31 @@ Puts the current socket's connection immediately into the cosocket built-in conn
 
 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](#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](#lua_socket_pool_size) config directive will be used.
-
-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.
-
-Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
+The second optional argument `size` is considered deprecated since
+the `v0.10.14` release of this module, in favor of the
+`pool_size` option of the [connect](#tcpsockconnect) method.
+Since the `v0.10.14` release, this option will only take effect if
+the call to [connect](#tcpsockconnect) did not already create a connection
+pool.
+When this option takes effect (no connection pool was previously created by
+[connect](#tcpsockconnect)), it will specify the size of the connection pool,
+and create it.
+If omitted (and no pool was previously created), the default size is the value
+of the [lua_socket_pool_size](#lua_socket_pool_size) directive.
+The connection pool holds up to `size` alive connections ready to be
+reused by subsequent calls to [connect](#tcpsockconnect), but note that there
+is no upper limit to the total number of opened connections outside of the
+pool.
+When the connection pool would exceed its size limit, the least recently used
+(kept-alive) 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. Also note that the size of the connection
+pool cannot be changed once it has been created.
+If you need to restrict the total number of opened connections, specify both
+the `pool_size` and `backlog` option in the call to
+[connect](#tcpsockconnect).
 
 In case of success, this method returns `1`; otherwise, it returns `nil` and a string describing the error.
 
@@ -8181,7 +8292,7 @@ This Lua module does not ship with this ngx_lua module itself rather it is shipp
 the
 [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
 
-Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md)
+Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md)
 for this `ngx.ocsp` Lua module for more details.
 
 This feature requires at least ngx_lua `v0.10.0`.
diff --git a/debian/modules/http-lua/config b/debian/modules/http-lua/config
index 044deb9..e1d5e35 100644
--- a/debian/modules/http-lua/config
+++ b/debian/modules/http-lua/config
@@ -361,6 +361,8 @@ HTTP_LUA_SRCS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.c \
             $ngx_addon_dir/src/ngx_http_lua_ssl.c \
             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.c \
+            $ngx_addon_dir/src/ngx_http_lua_input_filters.c \
+            $ngx_addon_dir/src/ngx_http_lua_pipe.c \
             "
 
 HTTP_LUA_DEPS=" \
@@ -422,6 +424,8 @@ HTTP_LUA_DEPS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.h \
             $ngx_addon_dir/src/ngx_http_lua_ssl.h \
             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.h \
+            $ngx_addon_dir/src/ngx_http_lua_input_filters.h \
+            $ngx_addon_dir/src/ngx_http_lua_pipe.h \
             "
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
@@ -474,6 +478,17 @@ ngx_feature_test='setsockopt(1, SOL_SOCKET, SO_PASSCRED, NULL, 0);'
 
 . auto/feature
 
+ngx_feature="SA_RESTART"
+ngx_feature_libs=
+ngx_feature_name="NGX_HTTP_LUA_HAVE_SA_RESTART"
+ngx_feature_run=no
+ngx_feature_incs="#include <signal.h>"
+ngx_feature_path=
+ngx_feature_test='struct sigaction act;
+                  act.sa_flags |= SA_RESTART;'
+
+. auto/feature
+
 ngx_feature="__attribute__(constructor)"
 ngx_feature_libs=
 ngx_feature_name="NGX_HTTP_LUA_HAVE_CONSTRUCTOR"
@@ -512,6 +527,36 @@ CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
 
 # ----------------------------------------
 
+ngx_feature="pipe2"
+ngx_feature_libs=
+ngx_feature_name="NGX_HTTP_LUA_HAVE_PIPE2"
+ngx_feature_run=no
+ngx_feature_incs="#include <fcntl.h>"
+ngx_feature_test="int fd[2]; pipe2(fd, O_CLOEXEC|O_NONBLOCK);"
+SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
+
+. auto/feature
+
+CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+
+# ----------------------------------------
+
+ngx_feature="signalfd"
+ngx_feature_libs=
+ngx_feature_name="NGX_HTTP_LUA_HAVE_SIGNALFD"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/signalfd.h>"
+ngx_feature_test="sigset_t set; signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);"
+SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
+
+. auto/feature
+
+CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+
+# ----------------------------------------
+
 if test -n "$ngx_module_link"; then
     ngx_module_type=HTTP_AUX_FILTER
     ngx_module_name=$ngx_addon_name
diff --git a/debian/modules/http-lua/doc/HttpLuaModule.wiki b/debian/modules/http-lua/doc/HttpLuaModule.wiki
index e3c61e2..ff9b269 100644
--- a/debian/modules/http-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/http-lua/doc/HttpLuaModule.wiki
@@ -2,6 +2,8 @@
 
 ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
+This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
+
 ''This module is not distributed with the Nginx source.'' See [[#Installation|the installation instructions]].
 
 = Status =
@@ -10,7 +12,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.13] released on 22 April 2018.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.15] released on March 14th, 2019.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -130,7 +132,9 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
 
 = Description =
 
-This module embeds Lua, via the standard Lua 5.1 interpreter or [http://luajit.org/luajit.html LuaJIT 2.0/2.1], 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 is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
+
+This module embeds Lua, via [http://luajit.org/luajit.html LuaJIT 2.0/2.1], into Nginx and by leveraging Nginx's subrequests, allows the integration of the powerful Lua threads (Lua coroutines) into the Nginx event model.
 
 Unlike [https://httpd.apache.org/docs/trunk/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.
@@ -199,11 +203,11 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 
 = Installation =
 
-It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
+It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, OpenResty's LuaJIT 2.1 branch version, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-# Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is ''not'' supported yet). LuaJIT can be downloaded from the [http://luajit.org/download.html 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.
+# LuaJIT can be downloaded from the [https://github.com/openresty/luajit2/releases latest release of OpenResty's LuaJIT branch version]. The official LuaJIT 2.0 and 2.1 releases are also supported, although the performance will be significantly lower in many cases.
 # Download the latest version of the ngx_devel_kit (NDK) module [https://github.com/simplresty/ngx_devel_kit/tags HERE].
 # Download the latest version of ngx_lua [https://github.com/openresty/lua-nginx-module/tags HERE].
 # Download the latest version of Nginx [http://nginx.org/ HERE] (See [[#Nginx Compatibility|Nginx Compatibility]])
@@ -271,24 +275,6 @@ To enable one or more of these macros, just pass extra C compiler options to the
     ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
 </geshi>
 
-== Installation on Ubuntu 11.10 ==
-
-Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever 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 ==
@@ -314,7 +300,7 @@ Please submit bug reports, wishlists, or patches by
 
 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/2.1 raw bytecode files directly.
 
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if you are using LuaJIT 2.0/2.1 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.ljbc
@@ -332,18 +318,6 @@ http://luajit.org/running.html#opt_b
 
 Also, the bytecode files generated by LuaJIT 2.1 is ''not'' compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
 
-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/2.1 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">
@@ -510,8 +484,7 @@ However, later attempts to manipulate the cosocket object will fail and return t
 This issue is due to limitations in the Nginx event model and only appears to affect Mac OS X.
 
 == Lua Coroutine Yielding/Resuming ==
-* Because Lua's <code>dofile</code> and <code>require</code> builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by <code>dofile</code> or <code>require</code> invokes [[#ngx.location.capture|ngx.location.capture*]], [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]], or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
-* 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()] or even the first line of the <code>for ... in ...</code> statement 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.x, which supports a fully resumable VM, to avoid this.
+* Because Lua's <code>dofile</code> and <code>require</code> builtins are currently implemented as C functions in LuaJIT 2.0/2.1, if the Lua file being loaded by <code>dofile</code> or <code>require</code> invokes [[#ngx.location.capture|ngx.location.capture*]], [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]], or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
 
 == Lua Variable Scope ==
 Care must be taken when importing modules and this form should be used:
@@ -817,7 +790,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2019, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -862,6 +835,34 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 ![Lua Nginx Modules Directives](https://cloud.githubusercontent.com/assets/2137369/15272097/77d1c09e-1a37-11e6-97ef-d9767035fc3e.png)
 
+== lua_load_resty_core ==
+
+'''syntax:''' ''lua_load_resty_core on|off''
+
+'''default:''' ''lua_load_resty_core on''
+
+'''context:''' ''http''
+
+Controls whether the <code>resty.core</code> module (from
+[https://github.com/openresty/lua-resty-core lua-resty-core]) should be loaded
+or not. When enabled, this directive is equivalent to executing the following
+when the Lua VM is created:
+
+<geshi lang="lua">
+    require "resty.core"
+</geshi>
+
+Note that usage of the <code>resty.core</code> module is recommended, as its
+FFI implementation is both faster, safer, and more complete than the Lua C API
+of the ngx_lua module.
+
+It must also be noted that the Lua C API of the ngx_lua module will eventually
+be removed, and usage of the FFI-based API (i.e. the <code>resty.core</code>
+module) will become mandatory. This directive only aims at providing a
+temporary backwards-compatibility mode in case of edge-cases.
+
+This directive was first introduced in the <code>v0.10.15</code> release.
+
 == lua_capture_error_log ==
 '''syntax:''' ''lua_capture_error_log size''
 
@@ -2196,14 +2197,14 @@ SSL session resumption can then get immediately initiated and bypass the full SS
 Please note that TLS session tickets are very different and it is the clients' responsibility
 to cache the SSL session state when session tickets are used. SSL session resumptions based on
 TLS session tickets would happen automatically without going through this hook (nor the
-[[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]] hook). This hook is mainly
+[[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]] hook). This hook is mainly
 for older or less capable SSL clients that can only do SSL sessions by session IDs.
 
 When [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]] is specified at the same time,
 this hook usually runs before [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]].
 When the SSL session is found and successfully loaded for the current SSL connection,
 SSL session resumption will happen and thus bypass the [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]]
-hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]]
+hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]]
 hook, for obvious reasons.
 
 To easily test this hook locally with a modern web browser, you can temporarily put the following line
@@ -2626,6 +2627,20 @@ When exceeding this limit, Nginx will stop running the callbacks of newly expire
 
 This directive was first introduced in the <code>v0.8.0</code> release.
 
+== lua_sa_restart ==
+
+'''syntax:''' ''lua_sa_restart on|off''
+
+'''default:''' ''lua_sa_restart on''
+
+'''context:''' ''http''
+
+When enabled, this module will set the `SA_RESTART` flag on nginx workers signal dispositions.
+
+This allows Lua I/O primitives to not be interrupted by nginx's handling of various signals.
+
+This directive was first introduced in the <code>v0.10.14</code> release.
+
 = Nginx API for Lua =
 
 <!-- inline-toc -->
@@ -3563,7 +3578,7 @@ This method does not work in HTTP/2 requests yet.
 == 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*, balancer_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, balancer_by_lua*, log_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]].
 
@@ -4071,7 +4086,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. This is not recommended however).
+If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn 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.
 
@@ -4092,7 +4107,7 @@ Retrieves the file name for the in-file request body data. Returns <code>nil</co
 
 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. This is not recommended however).
+If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn 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.
 
@@ -4109,7 +4124,9 @@ See also [[#ngx.req.get_body_data|ngx.req.get_body_data]].
 
 Set the current request's request body using the in-memory data specified by the <code>data</code> argument.
 
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
+If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [[#ngx.req.discard_body|ngx.req.discard_body]].
+
+Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the <code>v0.3.1rc18</code> release.
 
@@ -4122,11 +4139,13 @@ 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 request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [[#ngx.req.discard_body|ngx.req.discard_body]].
+
 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.
 
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
+Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the <code>v0.3.1rc18</code> release.
 
@@ -5648,7 +5667,7 @@ See also [[#ngx.shared.DICT.flush_expired|ngx.shared.DICT.flush_expired]] and [[
 
 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.
 
-Unlike the [[#ngx.shared.DICT.flush_all|flush_all]] method, this method actually free up the memory used by the expired items.
+Unlike the [[#ngx.shared.DICT.flush_all|flush_all]] method, this method actually frees up the memory used by the expired items.
 
 This feature was first introduced in the <code>v0.6.3</code> release.
 
@@ -5894,6 +5913,7 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [[#tcpsock:settimeout|settimeout]]
 * [[#tcpsock:settimeouts|settimeouts]]
 * [[#tcpsock:setoption|setoption]]
+* [[#tcpsock:receiveany|receiveany]]
 * [[#tcpsock:receiveuntil|receiveuntil]]
 * [[#tcpsock:setkeepalive|setkeepalive]]
 * [[#tcpsock:getreusedtimes|getreusedtimes]]
@@ -5991,6 +6011,43 @@ An optional Lua table can be specified as the last argument to this method to sp
 * <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>.
 
+* <code>pool_size</code>
+: specify the size of the connection pool. If omitted and no
+: <code>backlog</code> option was provided, no pool will be created. If omitted
+: but <code>backlog</code> was provided, the pool will be created with a default
+: size equal to the value of the [[#lua_socket_pool_size|lua_socket_pool_size]]
+: directive.
+: The connection pool holds up to <code>pool_size</code> alive connections
+: ready to be reused by subsequent calls to [[#tcpsock:connect|connect]], but
+: note that there is no upper limit to the total number of opened connections
+: outside of the pool. If you need to restrict the total number of opened
+: connections, specify the <code>backlog</code> option.
+: When the connection pool would exceed its size limit, the least recently used
+: (kept-alive) 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. Also note that the size of the connection
+: pool cannot be changed once it has been created.
+: This option was first introduced in the <code>v0.10.14</code> release.
+
+* <code>backlog</code>
+: if specified, this module will limit the total number of opened connections
+: for this pool. No more connections than <code>pool_size</code> can be opened
+: for this pool at any time. If the connection pool is full, subsequent
+: connect operations will be queued into a queue equal to this option's
+: value (the "backlog" queue).
+: If the number of queued connect operations is equal to <code>backlog</code>,
+: subsequent connect operations will fail and return <code>nil</code> plus the
+: error string <code>"too many waiting connect operations"</code>.
+: The queued connect operations will be resumed once the number of connections
+: in the pool is less than <code>pool_size</code>.
+: The queued connect operation will abort once they have been queued for more
+: than <code>connect_timeout</code>, controlled by
+: [[#tcpsock:settimeouts|settimeouts]], and will return <code>nil</code> plus
+: the error string <code>"timeout"</code>.
+: This option was first introduced in the <code>v0.10.14</code> release.
+
 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.
@@ -6103,6 +6160,36 @@ Since the <code>v0.8.8</code> release, this method no longer automatically close
 
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
+== tcpsock:receiveany ==
+'''syntax:''' ''data, err = tcpsock:receiveany(max)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
+
+Returns any data received by the connected socket, at most <code>max</code> bytes.
+
+This method is a synchronous operation just like the [[#tcpsock:send|send]] method 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 received data is more than this size, this method will return with exactly this size of data.
+The remaining data in the underlying receive buffer could be returned in the next reading operation.
+
+Timeout for the reading operation is controlled by the [[#lua_socket_read_timeout|lua_socket_read_timeout]] config directive and the [[#tcpsock:settimeouts|settimeouts]] method. And the latter takes priority. For example:
+
+<geshi lang="lua">
+    sock:settimeouts(1000, 1000, 1000)  -- one second timeout for connect/read/write
+    local data, err = sock:receiveany(10 * 1024 * 1024) -- read any data, at most 10K
+    if not data then
+        ngx.say("failed to read any data: ", err)
+        return
+    end
+    ngx.say("successfully read: ", data)
+</geshi>
+
+This method doesn't automatically close the current connection when the read timeout error occurs. For other connection errors, this method always automatically closes the connection.
+
+This feature was first introduced in the <code>v0.10.14</code> release.
+
 == tcpsock:receiveuntil ==
 '''syntax:''' ''iterator = tcpsock:receiveuntil(pattern, options?)''
 
@@ -6255,13 +6342,31 @@ Puts the current socket's connection immediately into the cosocket built-in conn
 
 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 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.
-
-Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
+The second optional argument <code>size</code> is considered deprecated since
+the <code>v0.10.14</code> release of this module, in favor of the
+<code>pool_size</code> option of the [[#tcpsock:connect|connect]] method.
+Since the <code>v0.10.14</code> release, this option will only take effect if
+the call to [[#tcpsock:connect|connect]] did not already create a connection
+pool.
+When this option takes effect (no connection pool was previously created by
+[[#tcpsock:connect|connect]]), it will specify the size of the connection pool,
+and create it.
+If omitted (and no pool was previously created), the default size is the value
+of the [[#lua_socket_pool_size|lua_socket_pool_size]] directive.
+The connection pool holds up to <code>size</code> alive connections ready to be
+reused by subsequent calls to [[#tcpsock:connect|connect]], but note that there
+is no upper limit to the total number of opened connections outside of the
+pool.
+When the connection pool would exceed its size limit, the least recently used
+(kept-alive) 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. Also note that the size of the connection
+pool cannot be changed once it has been created.
+If you need to restrict the total number of opened connections, specify both
+the <code>pool_size</code> and <code>backlog</code> option in the call to
+[[#tcpsock:connect|connect]].
 
 In case of success, this method returns <code>1</code>; otherwise, it returns <code>nil</code> and a string describing the error.
 
@@ -6950,7 +7055,7 @@ This Lua module does not ship with this ngx_lua module itself rather it is shipp
 the
 [https://github.com/openresty/lua-resty-core lua-resty-core] library.
 
-Please refer to the [https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md documentation]
+Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md documentation]
 for this <code>ngx.ocsp</code> Lua module for more details.
 
 This feature requires at least ngx_lua <code>v0.10.0</code>.
diff --git a/debian/modules/http-lua/src/api/ngx_http_lua_api.h b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
index c7c0e6b..129eb99 100644
--- a/debian/modules/http-lua/src/api/ngx_http_lua_api.h
+++ b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10013
+#define ngx_http_lua_version  10015
 
 
 typedef struct {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_accessby.c b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
index 56bf0fa..d3fe294 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_accessby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
@@ -60,7 +60,7 @@ ngx_http_lua_access_handler(ngx_http_request_t *r)
 #endif
 
         if (cur_ph < last_ph) {
-            dd("swaping the contents of cur_ph and last_ph...");
+            dd("swapping the contents of cur_ph and last_ph...");
 
             tmp = *cur_ph;
 
@@ -261,9 +261,11 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_api.c b/debian/modules/http-lua/src/ngx_http_lua_api.c
index 7b590e7..ac014f2 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_api.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_api.c
@@ -195,7 +195,7 @@ ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
     lmcf->shm_zones_inited++;
 
     if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
-        && lmcf->init_handler)
+        && lmcf->init_handler && !ngx_test_config)
     {
         saved_cycle = ngx_cycle;
         ngx_cycle = ctx->cycle;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_balancer.c b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
index fdf2af3..3ecd592 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
@@ -362,6 +362,8 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     /* init nginx context in Lua VM */
     ngx_http_lua_set_req(L, r);
+
+#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ make new env inheriting main thread's globals table */
@@ -372,6 +374,7 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif /* OPENRESTY_LUAJIT */
 
     lua_pushcfunction(L, ngx_http_lua_traceback);
     lua_insert(L, 1);  /* put it under chunk and args */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
index 2b3c38f..f3af14c 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
@@ -32,10 +32,6 @@ static void ngx_http_lua_body_filter_by_lua_env(lua_State *L,
 static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
 
 
-/* key for the ngx_chain_t *in pointer in the Lua thread */
-#define ngx_http_lua_chain_key  "__ngx_cl"
-
-
 /**
  * Set environment table for the given code closure.
  *
@@ -51,12 +47,14 @@ 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 */
+    ngx_http_lua_main_conf_t    *lmcf;
+
     ngx_http_lua_set_req(L, r);
 
-    lua_pushlightuserdata(L, in);
-    lua_setglobal(L, ngx_http_lua_chain_key);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    lmcf->body_filter_chain = in;
 
+#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -79,6 +77,7 @@ ngx_http_lua_body_filter_by_lua_env(lua_State *L, ngx_http_request_t *r,
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif /* OPENRESTY_LUAJIT */
 }
 
 
@@ -236,8 +235,8 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_int_t                    rc;
     uint16_t                     old_context;
     ngx_http_cleanup_t          *cln;
-    lua_State                   *L;
     ngx_chain_t                 *out;
+    ngx_http_lua_main_conf_t    *lmcf;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua body filter for user lua code, uri \"%V\"", &r->uri);
@@ -299,11 +298,8 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return NGX_ERROR;
     }
 
-    L = ngx_http_lua_get_lua_vm(r, ctx);
-
-    lua_getglobal(L, ngx_http_lua_chain_key);
-    out = lua_touserdata(L, -1);
-    lua_pop(L, 1);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    out = lmcf->body_filter_chain;
 
     if (in == out) {
         return ngx_http_next_body_filter(r, in);
@@ -345,7 +341,7 @@ ngx_http_lua_body_filter_init(void)
 
 
 int
-ngx_http_lua_body_filter_param_get(lua_State *L)
+ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
 {
     u_char              *data, *p;
     size_t               size;
@@ -354,6 +350,8 @@ ngx_http_lua_body_filter_param_get(lua_State *L)
     int                  idx;
     ngx_chain_t         *in;
 
+    ngx_http_lua_main_conf_t    *lmcf;
+
     idx = luaL_checkint(L, 2);
 
     dd("index: %d", idx);
@@ -363,8 +361,8 @@ ngx_http_lua_body_filter_param_get(lua_State *L)
         return 1;
     }
 
-    lua_getglobal(L, ngx_http_lua_chain_key);
-    in = lua_touserdata(L, -1);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    in = lmcf->body_filter_chain;
 
     if (idx == 2) {
         /* asking for the eof argument */
@@ -442,6 +440,8 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     ngx_chain_t             *cl;
     ngx_chain_t             *in;
 
+    ngx_http_lua_main_conf_t    *lmcf;
+
     idx = luaL_checkint(L, 2);
 
     dd("index: %d", idx);
@@ -450,13 +450,13 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
         return luaL_error(L, "bad index: %d", idx);
     }
 
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
     if (idx == 2) {
         /* overwriting the eof flag */
         last = lua_toboolean(L, 3);
 
-        lua_getglobal(L, ngx_http_lua_chain_key);
-        in = lua_touserdata(L, -1);
-        lua_pop(L, 1);
+        in = lmcf->body_filter_chain;
 
         if (last) {
             ctx->seen_last_in_filter = 1;
@@ -521,9 +521,7 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     case LUA_TNIL:
         /* discard the buffers */
 
-        lua_getglobal(L, ngx_http_lua_chain_key); /* key val */
-        in = lua_touserdata(L, -1);
-        lua_pop(L, 1);
+        in = lmcf->body_filter_chain;
 
         last = 0;
 
@@ -557,9 +555,7 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
                           lua_typename(L, type));
     }
 
-    lua_getglobal(L, ngx_http_lua_chain_key);
-    in = lua_touserdata(L, -1);
-    lua_pop(L, 1);
+    in = lmcf->body_filter_chain;
 
     last = 0;
 
@@ -625,8 +621,8 @@ done:
         }
     }
 
-    lua_pushlightuserdata(L, cl);
-    lua_setglobal(L, ngx_http_lua_chain_key);
+    lmcf->body_filter_chain = cl;
+
     return 0;
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
index 6a4b306..b108202 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
@@ -21,7 +21,7 @@ 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_get(lua_State *L, ngx_http_request_t *r);
 int ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     ngx_http_lua_ctx_t *ctx);
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_cache.c b/debian/modules/http-lua/src/ngx_http_lua_cache.c
index 5ea3069..5b29527 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_cache.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_cache.c
@@ -35,11 +35,14 @@ static ngx_int_t
 ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
     const char *key)
 {
+#ifndef OPENRESTY_LUAJIT
     int          rc;
     u_char      *err;
+#endif
 
     /*  get code cache table */
-    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          code_cache_key));
     lua_rawget(L, LUA_REGISTRYINDEX);    /*  sp++ */
 
     dd("Code cache table to load: %p", lua_topointer(L, -1));
@@ -52,6 +55,10 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
     lua_getfield(L, -1, key);    /*  sp++ */
 
     if (lua_isfunction(L, -1)) {
+#ifdef OPENRESTY_LUAJIT
+        lua_remove(L, -2);   /*  sp-- */
+        return NGX_OK;
+#else
         /*  call closure factory to gen new closure */
         rc = lua_pcall(L, 0, 1, 0);
         if (rc == 0) {
@@ -73,6 +80,7 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
                       key, err);
         lua_pop(L, 2);
         return NGX_ERROR;
+#endif /* OPENRESTY_LUAJIT */
     }
 
     dd("Value associated with given key in code cache table is not code "
@@ -102,10 +110,13 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
 static ngx_int_t
 ngx_http_lua_cache_store_code(lua_State *L, const char *key)
 {
+#ifndef OPENRESTY_LUAJIT
     int rc;
+#endif
 
     /*  get code cache table */
-    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          code_cache_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     dd("Code cache table to store: %p", lua_topointer(L, -1));
@@ -121,12 +132,14 @@ ngx_http_lua_cache_store_code(lua_State *L, const char *key)
     /*  remove cache table, leave closure factory at top of stack */
     lua_pop(L, 1); /* closure */
 
+#ifndef OPENRESTY_LUAJIT
     /*  call closure factory to generate new closure */
     rc = lua_pcall(L, 0, 1, 0);
     if (rc != 0) {
         dd("Error: failed to call closure factory!!");
         return NGX_ERROR;
     }
+#endif
 
     return NGX_OK;
 }
@@ -143,7 +156,8 @@ ngx_http_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
 
     n = lua_gettop(L);
 
-    dd("XXX cache key: [%s]", cache_key);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
+                   "looking up Lua code cache with key '%s'", cache_key);
 
     rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
@@ -227,7 +241,8 @@ ngx_http_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
         dd("CACHE file key already pre-calculated");
     }
 
-    dd("XXX cache key for file: [%s]", cache_key);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
+                   "looking up Lua code cache with key '%s'", cache_key);
 
     rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
index 041f046..754ed8d 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
@@ -15,11 +15,13 @@
 #include "ngx_http_lua_clfactory.h"
 
 
+#ifndef OPENRESTY_LUAJIT
 #define CLFACTORY_BEGIN_CODE "return function() "
 #define CLFACTORY_BEGIN_SIZE (sizeof(CLFACTORY_BEGIN_CODE) - 1)
 
 #define CLFACTORY_END_CODE "\nend"
 #define CLFACTORY_END_SIZE (sizeof(CLFACTORY_END_CODE) - 1)
+#endif
 
 
 /*
@@ -59,6 +61,7 @@
  * length(Instruction) = 4 or 8
  * little endian or big endian
 */
+#ifndef OPENRESTY_LUAJIT
 #define    LUA_LITTLE_ENDIAN_4BYTES_CODE                                     \
     "\x24\x00\x00\x00\x1e\x00\x00\x01\x1e\x00\x80\x00"
 #define    LUA_LITTLE_ENDIAN_8BYTES_CODE                                     \
@@ -75,6 +78,7 @@
 #define    LUA_BIG_ENDIAN_8BYTES_CODE_LEN           (8 + 8 + 8)
 #define    LUAC_HEADERSIZE         12
 #define    LUAC_VERSION            0x51
+#endif /* OPENRESTY_LUAJIT */
 
 
 /*
@@ -147,6 +151,7 @@
  * ---------------------
 */
 
+#ifndef OPENRESTY_LUAJIT
 #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))
@@ -160,6 +165,7 @@
     (POS_BYTECODE + LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN                        \
     + sizeof(int) + sizeof(int))
 #define    MAX_END_CODE_SIZE       (sizeof(int) + sizeof(int) + sizeof(int))
+#endif /* OPENRESTY_LUAJIT */
 
 /*
  * taken from chaoslawful:
@@ -225,6 +231,7 @@
 
 /* bytecode for luajit 2.0 */
 
+#ifndef OPENRESTY_LUAJIT
 #define    LJ20_LITTLE_ENDIAN_CODE_STRIPPED                                  \
     "\x14\x03\x00\x01\x00\x01\x00\x03"                                       \
     "\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00"                       \
@@ -275,6 +282,7 @@
 #define    LJ21_BCDUMP_VERSION        2
 #define    LJ20_BCDUMP_VERSION        1
 #define    LJ_SIGNATURE             "\x1b\x4c\x4a"
+#endif /* OPENRESTY_LUAJIT */
 
 
 typedef enum {
@@ -292,10 +300,11 @@ enum {
 typedef struct {
     ngx_http_lua_clfactory_file_type_e file_type;
 
-    int         sent_begin;
-    int         sent_end;
     int         extraline;
     FILE       *f;
+#ifndef OPENRESTY_LUAJIT
+    int         sent_begin;
+    int         sent_end;
     size_t      begin_code_len;
     size_t      end_code_len;
     size_t      rest_len;
@@ -307,13 +316,16 @@ typedef struct {
         char   *ptr;
         char    str[MAX_END_CODE_SIZE];
     }           end_code;
+#endif /* OPENRESTY_LUAJIT */
     char        buff[NGX_LUA_READER_BUFSIZE];
 } ngx_http_lua_clfactory_file_ctx_t;
 
 
 typedef struct {
+#ifndef OPENRESTY_LUAJIT
     int         sent_begin;
     int         sent_end;
+#endif
     const char *s;
     size_t      size;
 } ngx_http_lua_clfactory_buffer_ctx_t;
@@ -325,9 +337,12 @@ static int ngx_http_lua_clfactory_errfile(lua_State *L, const char *what,
     int fname_index);
 static const char *ngx_http_lua_clfactory_getS(lua_State *L, void *ud,
     size_t *size);
+#ifndef OPENRESTY_LUAJIT
 static long ngx_http_lua_clfactory_file_size(FILE *f);
+#endif
 
 
+#ifndef OPENRESTY_LUAJIT
 int
 ngx_http_lua_clfactory_bytecode_prepare(lua_State *L,
     ngx_http_lua_clfactory_file_ctx_t *lf, int fname_index)
@@ -593,6 +608,7 @@ error:
 
     return LUA_ERRFILE;
 }
+#endif /* OPENRESTY_LUAJIT */
 
 
 ngx_int_t
@@ -612,10 +628,12 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
     lf.extraline = 0;
     lf.file_type = NGX_LUA_TEXT_FILE;
 
+#ifndef OPENRESTY_LUAJIT
     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;
+#endif
 
     lua_pushfstring(L, "@%s", filename);
 
@@ -683,20 +701,27 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
             /* skip eventual `#!...' */
         }
 
+#ifndef OPENRESTY_LUAJIT
         status = ngx_http_lua_clfactory_bytecode_prepare(L, &lf, fname_index);
 
         if (status != 0) {
             return status;
         }
+#endif
 
         lf.extraline = 0;
     }
 
+#ifndef OPENRESTY_LUAJIT
     if (lf.file_type == NGX_LUA_TEXT_FILE) {
         ungetc(c, lf.f);
     }
 
     lf.sent_begin = lf.sent_end = 0;
+
+#else
+    ungetc(c, lf.f);
+#endif
     status = lua_load(L, ngx_http_lua_clfactory_getF, &lf,
                       lua_tostring(L, -1));
 
@@ -725,8 +750,10 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 
     ls.s = buff;
     ls.size = size;
+#ifndef OPENRESTY_LUAJIT
     ls.sent_begin = 0;
     ls.sent_end = 0;
+#endif
 
     return lua_load(L, ngx_http_lua_clfactory_getS, &ls, name);
 }
@@ -735,7 +762,9 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 static const char *
 ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 {
+#ifndef OPENRESTY_LUAJIT
     char                        *buf;
+#endif
     size_t                       num;
 
     ngx_http_lua_clfactory_file_ctx_t        *lf;
@@ -748,6 +777,7 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
         return "\n";
     }
 
+#ifndef OPENRESTY_LUAJIT
     if (lf->sent_begin == 0) {
         lf->sent_begin = 1;
         *size = lf->begin_code_len;
@@ -761,12 +791,14 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 
         return buf;
     }
+#endif /* OPENRESTY_LUAJIT */
 
     num = fread(lf->buff, 1, sizeof(lf->buff), lf->f);
 
     dd("fread returned %d", (int) num);
 
     if (num == 0) {
+#ifndef OPENRESTY_LUAJIT
         if (lf->sent_end == 0) {
             lf->sent_end = 1;
             *size = lf->end_code_len;
@@ -780,11 +812,13 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 
             return buf;
         }
+#endif /* OPENRESTY_LUAJIT */
 
         *size = 0;
         return NULL;
     }
 
+#ifndef OPENRESTY_LUAJIT
     if (lf->file_type == NGX_LUA_BT_LJ) {
         /* skip the footer(\x00) in luajit */
 
@@ -800,6 +834,7 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
             }
         }
     }
+#endif /* OPENRESTY_LUAJIT */
 
     *size = num;
     return lf->buff;
@@ -833,19 +868,23 @@ ngx_http_lua_clfactory_getS(lua_State *L, void *ud, size_t *size)
 {
     ngx_http_lua_clfactory_buffer_ctx_t      *ls = ud;
 
+#ifndef OPENRESTY_LUAJIT
     if (ls->sent_begin == 0) {
         ls->sent_begin = 1;
         *size = CLFACTORY_BEGIN_SIZE;
 
         return CLFACTORY_BEGIN_CODE;
     }
+#endif
 
     if (ls->size == 0) {
+#ifndef OPENRESTY_LUAJIT
         if (ls->sent_end == 0) {
             ls->sent_end = 1;
             *size = CLFACTORY_END_SIZE;
             return CLFACTORY_END_CODE;
         }
+#endif
 
         return NULL;
     }
@@ -857,6 +896,7 @@ ngx_http_lua_clfactory_getS(lua_State *L, void *ud, size_t *size)
 }
 
 
+#ifndef OPENRESTY_LUAJIT
 static long
 ngx_http_lua_clfactory_file_size(FILE *f)
 {
@@ -882,6 +922,7 @@ ngx_http_lua_clfactory_file_size(FILE *f)
 
     return len;
 }
+#endif /* OPENRESTY_LUAJIT */
 
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_common.h b/debian/modules/http-lua/src/ngx_http_lua_common.h
index 01ef2be..dae5245 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_common.h
@@ -17,7 +17,7 @@
 #include <setjmp.h>
 #include <stdint.h>
 
-#include <lua.h>
+#include <luajit.h>
 #include <lualib.h>
 #include <lauxlib.h>
 
@@ -140,6 +140,15 @@ typedef struct {
 #endif
 
 
+#if (NGX_PTR_SIZE >= 8 && !defined(_WIN64))
+#define ngx_http_lua_lightudata_mask(ludata)                                 \
+    ((void *) ((uintptr_t) (&ngx_http_lua_##ludata) & ((1UL << 47) - 1)))
+
+#else
+#define ngx_http_lua_lightudata_mask(ludata)    (&ngx_http_lua_##ludata)
+#endif
+
+
 typedef struct ngx_http_lua_main_conf_s  ngx_http_lua_main_conf_t;
 typedef union ngx_http_lua_srv_conf_u  ngx_http_lua_srv_conf_t;
 
@@ -173,6 +182,8 @@ struct ngx_http_lua_main_conf_s {
     ngx_cycle_t         *cycle;
     ngx_pool_t          *pool;
 
+    ngx_flag_t           load_resty_core;
+
     ngx_int_t            max_pending_timers;
     ngx_int_t            pending_timers;
 
@@ -208,9 +219,31 @@ struct ngx_http_lua_main_conf_s {
     ngx_str_t                            init_worker_src;
 
     ngx_http_lua_balancer_peer_data_t      *balancer_peer_data;
-                    /* balancer_by_lua does not support yielding and
-                     * there cannot be any conflicts among concurrent requests,
-                     * thus it is safe to store the peer data in the main conf.
+                    /* neither yielding nor recursion is possible in
+                     * balancer_by_lua*, so there cannot be any races among
+                     * concurrent requests and it is safe to store the peer
+                     * data pointer in the main conf.
+                     */
+
+    ngx_chain_t                            *body_filter_chain;
+                    /* neither yielding nor recursion is possible in
+                     * body_filter_by_lua*, so there cannot be any races among
+                     * concurrent requests when storing the chain
+                     * data pointer in the main conf.
+                     */
+
+    ngx_http_variable_value_t              *setby_args;
+                    /* neither yielding nor recursion is possible in
+                     * set_by_lua*, so there cannot be any races among
+                     * concurrent requests when storing the args pointer
+                     * in the main conf.
+                     */
+
+    size_t                                  setby_nargs;
+                    /* neither yielding nor recursion is possible in
+                     * set_by_lua*, so there cannot be any races among
+                     * concurrent requests when storing the nargs in the
+                     * main conf.
                      */
 
     ngx_uint_t                      shm_zones_inited;
@@ -227,6 +260,10 @@ struct ngx_http_lua_main_conf_s {
     ngx_int_t            busy_buf_ptr_count;
 #endif
 
+    ngx_int_t            host_var_index;
+
+    ngx_flag_t           set_sa_restart;
+
     unsigned             requires_header_filter:1;
     unsigned             requires_body_filter:1;
     unsigned             requires_capture_filter:1;
@@ -444,7 +481,7 @@ typedef struct {
 
 
 typedef struct ngx_http_lua_ctx_s {
-    /* for lua_coce_cache off: */
+    /* for lua_code_cache off: */
     ngx_http_lua_vm_state_t  *vm_state;
 
     ngx_http_request_t      *request;
@@ -531,6 +568,8 @@ typedef struct ngx_http_lua_ctx_s {
 
     unsigned         headers_set:1; /* whether the user has set custom
                                        response headers */
+    unsigned         mime_set:1;    /* whether the user has set Content-Type
+                                       response header */
 
     unsigned         entered_rewrite_phase:1;
     unsigned         entered_access_phase:1;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_contentby.c b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
index ecd6c0e..274c9ad 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_contentby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
@@ -63,9 +63,11 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_control.c b/debian/modules/http-lua/src/ngx_http_lua_control.c
index 6ac2cbf..5cd1d64 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_control.c
@@ -432,7 +432,8 @@ ngx_http_lua_on_abort(lua_State *L)
 
     ngx_http_lua_coroutine_create_helper(L, r, ctx, &coctx);
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushvalue(L, -2);
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
index b790814..99a2423 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
@@ -104,11 +104,15 @@ ngx_http_lua_coroutine_create_helper(lua_State *L, ngx_http_request_t *r,
     coctx->co = co;
     coctx->co_status = NGX_HTTP_LUA_CO_SUSPENDED;
 
+#ifdef OPENRESTY_LUAJIT
+    ngx_http_lua_set_req(co, r);
+#else
     /* make new coroutine share globals of the parent coroutine.
      * NOTE: globals don't have to be separated! */
     ngx_http_lua_get_globals_table(L);
     lua_xmove(L, co, 1);
     ngx_http_lua_set_globals_table(co);
+#endif
 
     lua_xmove(vm, L, 1);    /* move coroutine from main thread to L */
 
@@ -288,15 +292,27 @@ ngx_http_lua_inject_coroutine_api(ngx_log_t *log, lua_State *L)
     {
         const char buf[] =
             "local keys = {'create', 'yield', 'resume', 'status'}\n"
+#ifdef OPENRESTY_LUAJIT
+            "local get_req = require 'thread.exdata'\n"
+#else
             "local getfenv = getfenv\n"
+#endif
             "for _, key in ipairs(keys) do\n"
                "local std = coroutine['_' .. key]\n"
                "local ours = coroutine['__' .. key]\n"
                "local raw_ctx = ngx._phase_ctx\n"
                "coroutine[key] = function (...)\n"
+#ifdef OPENRESTY_LUAJIT
+                    "local r = get_req()\n"
+#else
                     "local r = getfenv(0).__ngx_req\n"
-                    "if r then\n"
+#endif
+                    "if r ~= nil then\n"
+#ifdef OPENRESTY_LUAJIT
+                        "local ctx = raw_ctx()\n"
+#else
                         "local ctx = raw_ctx(r)\n"
+#endif
                         /* ignore header and body filters */
                         "if ctx ~= 0x020 and ctx ~= 0x040 then\n"
                             "return ours(...)\n"
diff --git a/debian/modules/http-lua/src/ngx_http_lua_directive.c b/debian/modules/http-lua/src/ngx_http_lua_directive.c
index fb8c6dc..a989c26 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_directive.c
@@ -1304,11 +1304,12 @@ ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
 
 found:
 
-    ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
-                 tag_len, tag, cf->conf_file->file.name.data
-                               + cf->conf_file->file.name.len - p,
-                 p, cf->conf_file->line);
-    *chunkname_len = len;
+    p = ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
+                     tag_len, tag, cf->conf_file->file.name.data
+                     + cf->conf_file->file.name.len - p,
+                     p, cf->conf_file->line);
+
+    *chunkname_len = p - out - 1;  /* exclude the trailing '\0' byte */
 
     return out;
 }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
index b504530..a0acd4a 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
@@ -42,9 +42,9 @@ 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)
 {
-    /*  set nginx request pointer to current lua thread's globals table */
     ngx_http_lua_set_req(L, r);
 
+#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -68,6 +68,7 @@ ngx_http_lua_header_filter_by_lua_env(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif /* OPENRESTY_LUAJIT */
 }
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers.c b/debian/modules/http-lua/src/ngx_http_lua_headers.c
index b833577..e3f48bc 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers.c
@@ -442,7 +442,8 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L)
     lua_createtable(L, 0, count);
 
     if (!raw) {
-        lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              headers_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -504,7 +505,6 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     ngx_table_elt_t    *header;
     ngx_http_request_t *r;
     ngx_http_lua_ctx_t *ctx;
-    ngx_int_t           rc;
     u_char             *lowcase_key = NULL;
     size_t              lowcase_key_sz = 0;
     ngx_uint_t          i;
@@ -543,17 +543,6 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
         return luaL_error(L, "no ctx found");
     }
 
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            return luaL_error(L,
-                              "failed to set default content type: %d",
-                              (int) rc);
-        }
-
-        ctx->headers_set = 1;
-    }
-
     ngx_http_lua_check_fake_request(L, r);
 
     part = &r->headers_out.headers.part;
@@ -566,7 +555,8 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     lua_createtable(L, 0, count + 2);
 
     if (!raw) {
-        lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              headers_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -694,7 +684,6 @@ ngx_http_lua_ngx_header_get(lua_State *L)
     size_t                       len;
     ngx_http_lua_loc_conf_t     *llcf;
     ngx_http_lua_ctx_t          *ctx;
-    ngx_int_t                    rc;
 
     r = ngx_http_lua_get_req(L);
     if (r == NULL) {
@@ -737,18 +726,7 @@ ngx_http_lua_ngx_header_get(lua_State *L)
 
     key.len = len;
 
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            return luaL_error(L,
-                              "failed to set default content type: %d",
-                              (int) rc);
-        }
-
-        ctx->headers_set = 1;
-    }
-
-    return ngx_http_lua_get_output_header(L, r, &key);
+    return ngx_http_lua_get_output_header(L, r, ctx, &key);
 }
 
 
@@ -811,16 +789,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
         }
     }
 
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            return luaL_error(L,
-                              "failed to set default content type: %d",
-                              (int) rc);
-        }
-
-        ctx->headers_set = 1;
-    }
+    ctx->headers_set = 1;
 
     if (lua_type(L, 3) == LUA_TNIL) {
         ngx_str_null(&value);
@@ -845,7 +814,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, key, value,
+                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
                                                     i == 1 /* override */);
 
                 if (rc == NGX_ERROR) {
@@ -872,7 +841,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, key, value, 1 /* override */);
+    rc = ngx_http_lua_set_output_header(r, ctx, key, value, 1 /* override */);
 
     if (rc == NGX_ERROR) {
         return luaL_error(L, "failed to set header %s (error: %d)",
@@ -1081,7 +1050,8 @@ ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L)
         "local new_key = string.gsub(string.lower(key), '_', '-')\n"
         "if new_key ~= key then return tb[new_key] else return nil end";
 
-    lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          headers_metatable_key));
 
     /* metatable for ngx.req.get_headers(_, true) and
      * ngx.resp.get_headers(_, true) */
@@ -1241,15 +1211,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
         }
     }
 
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            *errmsg = "failed to set default content type";
-            return NGX_ERROR;
-        }
-
-        ctx->headers_set = 1;
-    }
+    ctx->headers_set = 1;
 
     if (is_nil) {
         value.data = NULL;
@@ -1276,7 +1238,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, key, value,
+                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
                                                     override && i == 0);
 
                 if (rc == NGX_ERROR) {
@@ -1302,7 +1264,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, key, value, override);
+    rc = ngx_http_lua_set_output_header(r, ctx, key, value, override);
 
     if (rc == NGX_ERROR) {
         *errmsg = "failed to set header";
@@ -1370,7 +1332,8 @@ ngx_http_lua_ffi_req_header_set_single_value(ngx_http_request_t *r,
 int
 ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
     const u_char *key, size_t key_len,
-    u_char *key_buf, ngx_http_lua_ffi_str_t *values, int max_nvalues)
+    u_char *key_buf, ngx_http_lua_ffi_str_t *values, int max_nvalues,
+    char **errmsg)
 {
     int                  found;
     u_char               c, *p;
@@ -1387,19 +1350,10 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
-        /* *errmsg = "no ctx found"; */
+        *errmsg = "no ctx found";
         return NGX_ERROR;
     }
 
-    if (!ctx->headers_set) {
-        if (ngx_http_lua_set_content_type(r) != NGX_OK) {
-            /* *errmsg = "failed to set default content type"; */
-            return NGX_ERROR;
-        }
-
-        ctx->headers_set = 1;
-    }
-
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->transform_underscores_in_resp_headers
         && memchr(key, '_', key_len) != NULL)
@@ -1425,6 +1379,7 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
         {
             p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
             if (p == NULL) {
+                *errmsg = "no memory";
                 return NGX_ERROR;
             }
 
@@ -1438,8 +1393,8 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
         break;
 
     case 12:
-        if (r->headers_out.content_type.len
-            && ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0)
+        if (ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0
+            && r->headers_out.content_type.len)
         {
             values[0].data = r->headers_out.content_type.data;
             values[0].len = r->headers_out.content_type.len;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
index 4852b2f..c52cd13 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
@@ -432,10 +432,14 @@ 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)
 {
-    ngx_str_t host;
+    ngx_str_t                    host;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_variable_value_t   *var;
 
     dd("server new value len: %d", (int) value->len);
 
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
     if (value->len) {
         host= *value;
 
@@ -449,6 +453,10 @@ ngx_http_set_host_header(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
         r->headers_in.server = *value;
     }
 
+    var = &r->variables[lmcf->host_var_index];
+    var->valid = 0;
+    var->not_found = 0;
+
     return ngx_http_set_builtin_header(r, hv, value);
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
index b908eae..cf94bd0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
@@ -106,6 +106,12 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
                  offsetof(ngx_http_headers_out_t, cache_control),
                  ngx_http_set_builtin_multi_header },
 
+#if defined(nginx_version) && nginx_version >= 1013009
+    { ngx_string("Link"),
+                 offsetof(ngx_http_headers_out_t, link),
+                 ngx_http_set_builtin_multi_header },
+#endif
+
     { ngx_null_string, 0, ngx_http_set_header }
 };
 
@@ -476,8 +482,8 @@ ngx_http_clear_builtin_header(ngx_http_request_t *r,
 
 
 ngx_int_t
-ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override)
+ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
+    ngx_str_t key, ngx_str_t value, unsigned override)
 {
     ngx_http_lua_header_val_t         hv;
     ngx_http_lua_set_header_t        *handlers = ngx_http_lua_set_handlers;
@@ -508,6 +514,10 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
         hv.offset = handlers[i].offset;
         hv.handler = handlers[i].handler;
 
+        if (hv.handler == ngx_http_set_content_type_header) {
+            ctx->mime_set = 1;
+        }
+
         break;
     }
 
@@ -528,7 +538,7 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
 
 int
 ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_str_t *key)
+    ngx_http_lua_ctx_t *ctx, ngx_str_t *key)
 {
     ngx_table_elt_t            *h;
     ngx_list_part_t            *part;
@@ -550,8 +560,8 @@ ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
         break;
 
     case 12:
-        if (r->headers_out.content_type.len
-            && ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0)
+        if (ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0
+            && r->headers_out.content_type.len)
         {
             lua_pushlstring(L, (char *) r->headers_out.content_type.data,
                             r->headers_out.content_type.len);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
index ef5e6d4..6ec1fe3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
@@ -12,10 +12,10 @@
 #include "ngx_http_lua_common.h"
 
 
-ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override);
+ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, ngx_str_t key, ngx_str_t value, unsigned override);
 int ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_str_t *key);
+    ngx_http_lua_ctx_t *ctx, ngx_str_t *key);
 
 
 #endif /* _NGX_HTTP_LUA_HEADERS_OUT_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
index 4a722a0..76acdc3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
@@ -12,6 +12,7 @@
 
 #include "ngx_http_lua_initworkerby.h"
 #include "ngx_http_lua_util.h"
+#include "ngx_http_lua_pipe.h"
 
 
 static u_char *ngx_http_lua_log_init_worker_error(ngx_log_t *log,
@@ -25,6 +26,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     void                        *cur, *prev;
     ngx_uint_t                   i;
     ngx_conf_t                   conf;
+    ngx_conf_file_t              cf_file;
     ngx_cycle_t                 *fake_cycle;
     ngx_module_t               **modules;
     ngx_open_file_t             *file, *ofile;
@@ -64,8 +66,21 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
 
         return NGX_OK;
     }
+
+#ifdef HAVE_NGX_LUA_PIPE
+    if (ngx_http_lua_pipe_add_signal_handler(cycle) != NGX_OK) {
+        return NGX_ERROR;
+    }
+#endif
+
 #endif  /* NGX_WIN32 */
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+    if (lmcf->set_sa_restart) {
+        ngx_http_lua_set_sa_restart(ngx_cycle->log);
+    }
+#endif
+
     if (lmcf->init_worker_handler == NULL) {
         return NGX_OK;
     }
@@ -166,6 +181,10 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     conf.pool = fake_cycle->pool;
     conf.log = cycle->log;
 
+    ngx_memzero(&cf_file, sizeof(cf_file));
+    cf_file.file.name = cycle->conf_file;
+    conf.conf_file = &cf_file;
+
     http_ctx.loc_conf = ngx_pcalloc(conf.pool,
                                     sizeof(void *) * ngx_http_max_module);
     if (http_ctx.loc_conf == NULL) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_input_filters.c b/debian/modules/http-lua/src/ngx_http_lua_input_filters.c
new file mode 100644
index 0000000..87a9d8c
--- /dev/null
+++ b/debian/modules/http-lua/src/ngx_http_lua_input_filters.c
@@ -0,0 +1,137 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_common.h"
+
+
+ngx_int_t
+ngx_http_lua_read_bytes(ngx_buf_t *src, ngx_chain_t *buf_in, size_t *rest,
+    ssize_t bytes, ngx_log_t *log)
+{
+    if (bytes == 0) {
+        return NGX_ERROR;
+    }
+
+    if ((size_t) bytes >= *rest) {
+
+        buf_in->buf->last += *rest;
+        src->pos += *rest;
+        *rest = 0;
+
+        return NGX_OK;
+    }
+
+    /* bytes < *rest */
+
+    buf_in->buf->last += bytes;
+    src->pos += bytes;
+    *rest -= bytes;
+
+    return NGX_AGAIN;
+}
+
+
+ngx_int_t
+ngx_http_lua_read_all(ngx_buf_t *src, ngx_chain_t *buf_in, ssize_t bytes,
+    ngx_log_t *log)
+{
+    if (bytes == 0) {
+        return NGX_OK;
+    }
+
+    buf_in->buf->last += bytes;
+    src->pos += bytes;
+
+    return NGX_AGAIN;
+}
+
+
+ngx_int_t
+ngx_http_lua_read_any(ngx_buf_t *src, ngx_chain_t *buf_in, size_t *max,
+    ssize_t bytes, ngx_log_t *log)
+{
+    if (bytes == 0) {
+        return NGX_ERROR;
+    }
+
+    if (bytes >= (ssize_t) *max) {
+        bytes = (ssize_t) *max;
+    }
+
+    buf_in->buf->last += bytes;
+    src->pos += bytes;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_lua_read_line(ngx_buf_t *src, ngx_chain_t *buf_in, ssize_t bytes,
+    ngx_log_t *log)
+{
+    u_char                      *dst;
+    u_char                       c;
+#if (NGX_DEBUG)
+    u_char                      *begin;
+#endif
+
+#if (NGX_DEBUG)
+    begin = src->pos;
+#endif
+
+    if (bytes == 0) {
+        return NGX_ERROR;
+    }
+
+    dd("already read: %p: %.*s", buf_in,
+       (int) (buf_in->buf->last - buf_in->buf->pos), buf_in->buf->pos);
+
+    dd("data read: %.*s", (int) bytes, src->pos);
+
+    dst = buf_in->buf->last;
+
+    while (bytes--) {
+
+        c = *src->pos++;
+
+        switch (c) {
+        case '\n':
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
+                           "lua read the final line part: \"%*s\"",
+                           src->pos - 1 - begin, begin);
+
+            buf_in->buf->last = dst;
+
+            dd("read a line: %p: %.*s", buf_in,
+               (int) (buf_in->buf->last - buf_in->buf->pos), buf_in->buf->pos);
+
+            return NGX_OK;
+
+        case '\r':
+            /* ignore it */
+            break;
+
+        default:
+            *dst++ = c;
+            break;
+        }
+    }
+
+#if (NGX_DEBUG)
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
+                   "lua read partial line data: %*s", dst - begin, begin);
+#endif
+
+    buf_in->buf->last = dst;
+
+    return NGX_AGAIN;
+}
diff --git a/debian/modules/http-lua/src/ngx_http_lua_input_filters.h b/debian/modules/http-lua/src/ngx_http_lua_input_filters.h
new file mode 100644
index 0000000..046d40f
--- /dev/null
+++ b/debian/modules/http-lua/src/ngx_http_lua_input_filters.h
@@ -0,0 +1,29 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_
+#define _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+ngx_int_t ngx_http_lua_read_bytes(ngx_buf_t *src, ngx_chain_t *buf_in,
+    size_t *rest, ssize_t bytes, ngx_log_t *log);
+
+ngx_int_t ngx_http_lua_read_all(ngx_buf_t *src, ngx_chain_t *buf_in,
+    ssize_t bytes, ngx_log_t *log);
+
+ngx_int_t ngx_http_lua_read_any(ngx_buf_t *src, ngx_chain_t *buf_in,
+    size_t *max, ssize_t bytes, ngx_log_t *log);
+
+ngx_int_t ngx_http_lua_read_line(ngx_buf_t *src, ngx_chain_t *buf_in,
+    ssize_t bytes, ngx_log_t *log);
+
+
+#endif /* _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_logby.c b/debian/modules/http-lua/src/ngx_http_lua_logby.c
index 0f1d2f3..32d1cba 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_logby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_logby.c
@@ -38,9 +38,9 @@ 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 */
     ngx_http_lua_set_req(L, r);
 
+#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -64,6 +64,7 @@ ngx_http_lua_log_by_lua_env(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif /* OPENRESTY_LUAJIT */
 }
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_misc.c b/debian/modules/http-lua/src/ngx_http_lua_misc.c
index f96e2f2..145ca9b 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_misc.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_misc.c
@@ -286,6 +286,33 @@ ngx_http_lua_ffi_headers_sent(ngx_http_request_t *r)
 
     return r->header_sent ? 1 : 0;
 }
+
+
+int
+ngx_http_lua_ffi_get_conf_env(u_char *name, u_char **env_buf, size_t *name_len)
+{
+    ngx_uint_t            i;
+    ngx_str_t            *var;
+    ngx_core_conf_t      *ccf;
+
+    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                           ngx_core_module);
+
+    var = ccf->env.elts;
+
+    for (i = 0; i < ccf->env.nelts; i++) {
+        if (var[i].data[var[i].len] == '='
+            && ngx_strncmp(name, var[i].data, var[i].len) == 0)
+        {
+            *env_buf = var[i].data;
+            *name_len = var[i].len;
+
+            return NGX_OK;
+        }
+    }
+
+    return NGX_DECLINED;
+}
 #endif /* NGX_LUA_NO_FFI_API */
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_module.c b/debian/modules/http-lua/src/ngx_http_lua_module.c
index ae8bc0e..2a3f5d5 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_module.c
@@ -29,6 +29,7 @@
 #include "ngx_http_lua_ssl_session_storeby.h"
 #include "ngx_http_lua_ssl_session_fetchby.h"
 #include "ngx_http_lua_headers.h"
+#include "ngx_http_lua_pipe.h"
 
 
 static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
@@ -76,6 +77,13 @@ static ngx_conf_bitmask_t  ngx_http_lua_ssl_protocols[] = {
 
 static ngx_command_t ngx_http_lua_cmds[] = {
 
+    { ngx_string("lua_load_resty_core"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(ngx_http_lua_main_conf_t, load_resty_core),
+      NULL },
+
     { ngx_string("lua_max_running_timers"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -104,6 +112,13 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       NULL },
 
+    { ngx_string("lua_sa_restart"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(ngx_http_lua_main_conf_t, set_sa_restart),
+      NULL },
+
 #if (NGX_PCRE)
     { ngx_string("lua_regex_cache_max_entries"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -638,9 +653,19 @@ ngx_http_lua_init(ngx_conf_t *cf)
 #if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
     ngx_pool_cleanup_t         *cln;
 #endif
+    ngx_str_t                   name = ngx_string("host");
+
+    if (ngx_process == NGX_PROCESS_SIGNALLER || ngx_test_config) {
+        return NGX_OK;
+    }
 
     lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
 
+    lmcf->host_var_index = ngx_http_get_variable_index(cf, &name);
+    if (lmcf->host_var_index == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
     if (ngx_http_lua_prev_cycle != ngx_cycle) {
         ngx_http_lua_prev_cycle = ngx_cycle;
         multi_http_blocks = 0;
@@ -725,6 +750,11 @@ ngx_http_lua_init(ngx_conf_t *cf)
 
     cln->data = lmcf;
     cln->handler = ngx_http_lua_sema_mm_cleanup;
+
+#ifdef HAVE_NGX_LUA_PIPE
+    ngx_http_lua_pipe_init();
+#endif
+
 #endif
 
 #if nginx_version >= 1011011
@@ -740,6 +770,19 @@ ngx_http_lua_init(ngx_conf_t *cf)
     if (lmcf->lua == NULL) {
         dd("initializing lua vm");
 
+#ifndef OPENRESTY_LUAJIT
+        if (ngx_process != NGX_PROCESS_SIGNALLER && !ngx_test_config) {
+            ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
+                          "detected a LuaJIT version which is not OpenResty's"
+                          "; many optimizations will be disabled and "
+                          "performance will be compromised (see "
+                          "https://github.com/openresty/luajit2 for "
+                          "OpenResty's LuaJIT or, even better, consider using "
+                          "the OpenResty releases from https://openresty.org/"
+                          "en/download.html)");
+        }
+#endif
+
         ngx_http_lua_content_length_hash =
                                   ngx_http_lua_hash_literal("content-length");
         ngx_http_lua_location_hash = ngx_http_lua_hash_literal("location");
@@ -841,6 +884,7 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
      */
 
     lmcf->pool = cf->pool;
+    lmcf->load_resty_core = NGX_CONF_UNSET;
     lmcf->max_pending_timers = NGX_CONF_UNSET;
     lmcf->max_running_timers = NGX_CONF_UNSET;
 #if (NGX_PCRE)
@@ -850,6 +894,8 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
     lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
     lmcf->postponed_to_access_phase_end = NGX_CONF_UNSET;
 
+    lmcf->set_sa_restart = NGX_CONF_UNSET;
+
 #if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
     lmcf->malloc_trim_cycle = NGX_CONF_UNSET_UINT;
 #endif
@@ -872,6 +918,10 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
 {
     ngx_http_lua_main_conf_t *lmcf = conf;
 
+    if (lmcf->load_resty_core == NGX_CONF_UNSET) {
+        lmcf->load_resty_core = 1;
+    }
+
 #if (NGX_PCRE)
     if (lmcf->regex_cache_max_entries == NGX_CONF_UNSET) {
         lmcf->regex_cache_max_entries = 1024;
@@ -890,6 +940,12 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
         lmcf->max_running_timers = 256;
     }
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+    if (lmcf->set_sa_restart == NGX_CONF_UNSET) {
+        lmcf->set_sa_restart = 1;
+    }
+#endif
+
 #if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
     if (lmcf->malloc_trim_cycle == NGX_CONF_UNSET_UINT) {
         lmcf->malloc_trim_cycle = 1000;  /* number of reqs */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ndk.c b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
index 24b80b4..6344183 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ndk.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
@@ -186,6 +186,47 @@ ngx_http_lua_inject_ndk_api(lua_State *L)
 }
 
 
+int
+ngx_http_lua_ffi_ndk_lookup_directive(const u_char *var_data,
+    size_t var_len, ndk_set_var_value_pt *func)
+{
+    *func = ngx_http_lookup_ndk_set_var_directive((u_char *) var_data, var_len);
+
+    if (*func == NULL) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_ndk_set_var_get(ngx_http_request_t *r,
+    ndk_set_var_value_pt func, const u_char *arg_data, size_t arg_len,
+    ngx_http_lua_ffi_str_t *value)
+{
+    ngx_int_t                            rc;
+    ngx_str_t                            res;
+    ngx_http_variable_value_t            arg;
+
+    ngx_memzero(&arg, sizeof(ngx_http_variable_value_t));
+    arg.valid = 1;
+
+    arg.data = (u_char *) arg_data;
+    arg.len = arg_len;
+
+    rc = func(r, &res, &arg);
+
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    value->data = res.data;
+    value->len = res.len;
+    return NGX_OK;
+}
+
+
 #endif /* defined(NDK) && NDK */
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pipe.c b/debian/modules/http-lua/src/ngx_http_lua_pipe.c
new file mode 100644
index 0000000..8c8221f
--- /dev/null
+++ b/debian/modules/http-lua/src/ngx_http_lua_pipe.c
@@ -0,0 +1,2475 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_common.h"
+#include "ngx_http_lua_input_filters.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_pipe.h"
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+#include <sys/signalfd.h>
+#endif
+
+
+#ifdef HAVE_NGX_LUA_PIPE
+static ngx_rbtree_node_t *ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key);
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+static void ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
+    void *ucontext);
+#endif
+static void ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev);
+static ssize_t ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf,
+    size_t size);
+static ssize_t ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf,
+    size_t size);
+static ngx_int_t ngx_http_lua_pipe_close_helper(
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, ngx_event_t *ev, int forced);
+static ngx_int_t ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe,
+    int forced);
+static ngx_int_t ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe,
+    int forced);
+static ngx_int_t ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe,
+    int forced);
+static void ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc,
+    int forced);
+static ngx_int_t ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size);
+static void ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx,
+    u_char *errbuf, size_t *errbuf_size);
+static void ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size);
+static ngx_int_t ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx);
+static ngx_int_t ngx_http_lua_pipe_read_all(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read_line(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read_any(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx);
+static ngx_int_t ngx_http_lua_pipe_init_ctx(
+    ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd, ngx_pool_t *pool,
+    u_char *errbuf, size_t *errbuf_size);
+static ngx_int_t ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx);
+static int ngx_http_lua_pipe_read_stdout_retval(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
+static int ngx_http_lua_pipe_read_stderr_retval(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
+static int ngx_http_lua_pipe_read_retval_helper(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L, int from_stderr);
+static int ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L);
+static int ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L);
+static void ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
+    ngx_http_lua_co_ctx_t *wait_co_ctx);
+static void ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev);
+static ngx_int_t ngx_http_lua_pipe_resume(ngx_http_request_t *r);
+static void ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_clear_event(ngx_event_t *ev);
+static void ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data);
+static void ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data);
+static void ngx_http_lua_pipe_proc_write_cleanup(void *data);
+static void ngx_http_lua_pipe_proc_wait_cleanup(void *data);
+
+
+static ngx_rbtree_t       ngx_http_lua_pipe_rbtree;
+static ngx_rbtree_node_t  ngx_http_lua_pipe_proc_sentinel;
+
+
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+static int                                ngx_http_lua_signalfd;
+static struct signalfd_siginfo            ngx_http_lua_pipe_notification;
+
+#define ngx_http_lua_read_sigfd           ngx_http_lua_signalfd
+
+#else
+static int                                ngx_http_lua_sigchldfd[2];
+static u_char                             ngx_http_lua_pipe_notification[1];
+
+#define ngx_http_lua_read_sigfd           ngx_http_lua_sigchldfd[0]
+#define ngx_http_lua_write_sigfd          ngx_http_lua_sigchldfd[1]
+#endif
+
+
+static ngx_connection_t                  *ngx_http_lua_sigfd_conn = NULL;
+
+
+/* The below signals are ignored by Nginx.
+ * We need to reset them for the spawned child processes. */
+ngx_http_lua_pipe_signal_t ngx_signals[] = {
+    { SIGSYS, "SIGSYS" },
+    { SIGPIPE, "SIGPIPE" },
+    { 0, NULL }
+};
+
+
+enum {
+    PIPE_ERR_CLOSED = 1,
+    PIPE_ERR_SYSCALL,
+    PIPE_ERR_NOMEM,
+    PIPE_ERR_TIMEOUT,
+    PIPE_ERR_ADD_READ_EV,
+    PIPE_ERR_ADD_WRITE_EV
+};
+
+
+enum {
+    PIPE_READ_ALL = 0,
+    PIPE_READ_BYTES,
+    PIPE_READ_LINE,
+    PIPE_READ_ANY
+};
+
+
+#define REASON_EXIT         "exit"
+#define REASON_SIGNAL       "signal"
+#define REASON_UNKNOWN      "unknown"
+
+#define REASON_RUNNING_CODE  0
+#define REASON_EXIT_CODE     1
+#define REASON_SIGNAL_CODE   2
+#define REASON_UNKNOWN_CODE  3
+
+
+void
+ngx_http_lua_pipe_init(void)
+{
+    ngx_rbtree_init(&ngx_http_lua_pipe_rbtree,
+                    &ngx_http_lua_pipe_proc_sentinel, ngx_rbtree_insert_value);
+}
+
+
+ngx_int_t
+ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle)
+{
+    ngx_event_t         *rev;
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+    sigset_t             set;
+
+#else
+    int                  rc;
+    struct sigaction     sa;
+#endif
+
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+    if (sigemptyset(&set) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe init signal set failed");
+        return NGX_ERROR;
+    }
+
+    if (sigaddset(&set, SIGCHLD) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe add SIGCHLD to signal set failed");
+        return NGX_ERROR;
+    }
+
+    if (sigprocmask(SIG_BLOCK, &set, NULL) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe block SIGCHLD failed");
+        return NGX_ERROR;
+    }
+
+    ngx_http_lua_signalfd = signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);
+    if (ngx_http_lua_signalfd < 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe create signalfd instance failed");
+        return NGX_ERROR;
+    }
+
+#else /* !(NGX_HTTP_LUA_HAVE_SIGNALFD) */
+#   if (NGX_HTTP_LUA_HAVE_PIPE2)
+    rc = pipe2(ngx_http_lua_sigchldfd, O_NONBLOCK|O_CLOEXEC);
+#   else
+    rc = pipe(ngx_http_lua_sigchldfd);
+#   endif
+
+    if (rc == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe init SIGCHLD fd failed");
+        return NGX_ERROR;
+    }
+
+#   if !(NGX_HTTP_LUA_HAVE_PIPE2)
+    if (ngx_nonblocking(ngx_http_lua_read_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
+                      ngx_nonblocking_n " SIGCHLD read fd failed");
+        goto failed;
+    }
+
+    if (ngx_nonblocking(ngx_http_lua_write_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
+                      ngx_nonblocking_n " SIGCHLD write fd failed");
+        goto failed;
+    }
+
+    /* it's ok not to set the pipe fd with O_CLOEXEC. This requires
+     * extra syscall */
+#   endif /* !(NGX_HTTP_LUA_HAVE_PIPE2) */
+#endif /* NGX_HTTP_LUA_HAVE_SIGNALFD */
+
+    ngx_http_lua_sigfd_conn = ngx_get_connection(ngx_http_lua_read_sigfd,
+                                                 cycle->log);
+    if (ngx_http_lua_sigfd_conn == NULL) {
+        goto failed;
+    }
+
+    ngx_http_lua_sigfd_conn->log = cycle->log;
+    ngx_http_lua_sigfd_conn->recv = ngx_http_lua_pipe_fd_read;
+    rev = ngx_http_lua_sigfd_conn->read;
+    rev->log = ngx_http_lua_sigfd_conn->log;
+    rev->handler = ngx_http_lua_pipe_sigchld_event_handler;
+
+#ifdef HAVE_SOCKET_CLOEXEC_PATCH
+    rev->skip_socket_leak_check = 1;
+#endif
+
+    if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
+        goto failed;
+    }
+
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+    ngx_memzero(&sa, sizeof(struct sigaction));
+    sa.sa_sigaction = ngx_http_lua_pipe_sigchld_handler;
+    sa.sa_flags = SA_SIGINFO;
+
+    if (sigemptyset(&sa.sa_mask) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe init signal mask failed");
+        goto failed;
+    }
+
+    if (sigaction(SIGCHLD, &sa, NULL) == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe sigaction(SIGCHLD) failed");
+        goto failed;
+    }
+#endif
+
+    return NGX_OK;
+
+failed:
+
+    if (ngx_http_lua_sigfd_conn != NULL) {
+        ngx_close_connection(ngx_http_lua_sigfd_conn);
+        ngx_http_lua_sigfd_conn = NULL;
+    }
+
+    if (close(ngx_http_lua_read_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                      "lua pipe close the read sigfd failed");
+    }
+
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+    if (close(ngx_http_lua_write_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                      "lua pipe close the write sigfd failed");
+    }
+#endif
+
+    return NGX_ERROR;
+}
+
+
+static ngx_rbtree_node_t *
+ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key)
+{
+    ngx_rbtree_node_t    *node, *sentinel;
+
+    node = ngx_http_lua_pipe_rbtree.root;
+    sentinel = ngx_http_lua_pipe_rbtree.sentinel;
+
+    while (node != sentinel) {
+        if (key < node->key) {
+            node = node->left;
+            continue;
+        }
+
+        if (key > node->key) {
+            node = node->right;
+            continue;
+        }
+
+        return node;
+    }
+
+    return NULL;
+}
+
+
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+static void
+ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
+    void *ucontext)
+{
+    ngx_err_t                        err, saved_err;
+    ngx_int_t                        n;
+
+    saved_err = ngx_errno;
+
+    for ( ;; ) {
+        n = write(ngx_http_lua_write_sigfd, ngx_http_lua_pipe_notification,
+                  sizeof(ngx_http_lua_pipe_notification));
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
+                       "lua pipe SIGCHLD fd write siginfo:%p", siginfo);
+
+        if (n >= 0) {
+            break;
+        }
+
+        err = ngx_errno;
+
+        if (err != NGX_EINTR) {
+            if (err != NGX_EAGAIN) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, err,
+                              "lua pipe SIGCHLD fd write failed");
+            }
+
+            break;
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, err,
+                       "lua pipe SIGCHLD fd write was interrupted");
+    }
+
+    ngx_set_errno(saved_err);
+}
+#endif
+
+
+static void
+ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev)
+{
+    int                              n;
+    int                              status;
+    ngx_pid_t                        pid;
+    ngx_connection_t                *c = ev->data;
+    ngx_rbtree_node_t               *node;
+    ngx_http_lua_pipe_node_t        *pipe_node;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
+                   "lua pipe reaping children");
+
+    for ( ;; ) {
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+        n = c->recv(c, (u_char *) &ngx_http_lua_pipe_notification,
+#else
+        n = c->recv(c, ngx_http_lua_pipe_notification,
+#endif
+                    sizeof(ngx_http_lua_pipe_notification));
+
+        if (n <= 0) {
+            if (n == NGX_ERROR) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe SIGCHLD fd read failed");
+            }
+
+            break;
+        }
+
+        for ( ;; ) {
+            pid = waitpid(-1, &status, WNOHANG);
+
+            if (pid == 0) {
+                break;
+            }
+
+            if (pid < 0) {
+                if (ngx_errno != NGX_ECHILD) {
+                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                                  "lua pipe waitpid failed");
+                }
+
+                break;
+            }
+
+            /* This log is ported from Nginx's signal handler since we override
+             * or block it in this implementation. */
+            ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
+                          "signal %d (SIGCHLD) received from %P",
+                          SIGCHLD, pid);
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua pipe SIGCHLD fd read pid:%P status:%d", pid,
+                           status);
+
+            node = ngx_http_lua_pipe_lookup_pid(pid);
+            if (node != NULL) {
+                pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+                if (pipe_node->wait_co_ctx != NULL) {
+                    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                                   "lua pipe resume process:%p waiting for %P",
+                                   pipe_node->proc, pid);
+
+                    /*
+                     * We need the extra parentheses around the first argument
+                     * of ngx_post_event() just to work around macro issues in
+                     * nginx cores older than 1.7.12 (exclusive).
+                     */
+                    ngx_post_event((&pipe_node->wait_co_ctx->sleep),
+                                   &ngx_posted_events);
+                }
+
+                pipe_node->proc->pipe->dead = 1;
+
+                if (WIFSIGNALED(status)) {
+                    pipe_node->status = WTERMSIG(status);
+                    pipe_node->reason_code = REASON_SIGNAL_CODE;
+
+                } else if (WIFEXITED(status)) {
+                    pipe_node->status = WEXITSTATUS(status);
+                    pipe_node->reason_code = REASON_EXIT_CODE;
+
+                } else {
+                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                                  "lua pipe unknown exit status %d from "
+                                  "process %P", status, pid);
+                    pipe_node->status = status;
+                    pipe_node->reason_code = REASON_UNKNOWN_CODE;
+                }
+            }
+        }
+    }
+}
+
+
+static ssize_t
+ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ssize_t       n;
+    ngx_err_t     err;
+    ngx_event_t  *rev;
+
+    rev = c->read;
+
+    do {
+        n = read(c->fd, buf, size);
+
+        err = ngx_errno;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "read: fd:%d %z of %uz", c->fd, n, size);
+
+        if (n == 0) {
+            rev->ready = 0;
+            rev->eof = 1;
+            return 0;
+        }
+
+        if (n > 0) {
+            if ((size_t) n < size
+                && !(ngx_event_flags & NGX_USE_GREEDY_EVENT))
+            {
+                rev->ready = 0;
+            }
+
+            return n;
+        }
+
+        if (err == NGX_EAGAIN || err == NGX_EINTR) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "read() not ready");
+            n = NGX_AGAIN;
+
+        } else {
+            n = ngx_connection_error(c, err, "read() failed");
+            break;
+        }
+
+    } while (err == NGX_EINTR);
+
+    rev->ready = 0;
+
+    if (n == NGX_ERROR) {
+        rev->error = 1;
+    }
+
+    return n;
+}
+
+
+static ssize_t
+ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ssize_t       n;
+    ngx_err_t     err;
+    ngx_event_t  *wev;
+
+    wev = c->write;
+
+    do {
+        n = write(c->fd, buf, size);
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "write: fd:%d %z of %uz", c->fd, n, size);
+
+        if (n >= 0) {
+            if ((size_t) n != size) {
+                wev->ready = 0;
+            }
+
+            return n;
+        }
+
+        err = ngx_errno;
+
+        if (err == NGX_EAGAIN || err == NGX_EINTR) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "write() not ready");
+            n = NGX_AGAIN;
+
+        } else if (err != NGX_EPIPE) {
+            n = ngx_connection_error(c, err, "write() failed");
+            break;
+        }
+
+    } while (err == NGX_EINTR);
+
+    wev->ready = 0;
+
+    if (n == NGX_ERROR) {
+        wev->error = 1;
+    }
+
+    return n;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_spawn(ngx_http_lua_ffi_pipe_proc_t *proc,
+    const char *file, const char **argv, int merge_stderr, size_t buffer_size,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    int                             rc;
+    int                             in[2];
+    int                             out[2];
+    int                             err[2];
+    int                             stdin_fd, stdout_fd, stderr_fd;
+    int                             errlog_fd, temp_errlog_fd;
+    ngx_pid_t                       pid;
+    ssize_t                         pool_size;
+    ngx_pool_t                     *pool;
+    ngx_uint_t                      i;
+    ngx_listening_t                *ls;
+    ngx_http_lua_pipe_t            *pp;
+    ngx_rbtree_node_t              *node;
+    ngx_http_lua_pipe_node_t       *pipe_node;
+    struct sigaction                sa;
+    ngx_http_lua_pipe_signal_t     *sig;
+    sigset_t                        set;
+
+    pool_size = ngx_align(NGX_MIN_POOL_SIZE + buffer_size * 2,
+                          NGX_POOL_ALIGNMENT);
+
+    pool = ngx_create_pool(pool_size, ngx_cycle->log);
+    if (pool == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    pp = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_t)
+                     + offsetof(ngx_rbtree_node_t, color)
+                     + sizeof(ngx_http_lua_pipe_node_t));
+    if (pp == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        goto free_pool;
+    }
+
+    rc = pipe(in);
+    if (rc == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto free_pool;
+    }
+
+    rc = pipe(out);
+    if (rc == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_fd;
+    }
+
+    if (!merge_stderr) {
+        rc = pipe(err);
+        if (rc == -1) {
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                        "pipe failed: %s", strerror(errno))
+                           - errbuf;
+            goto close_in_out_fd;
+        }
+    }
+
+    pid = fork();
+    if (pid == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "fork failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_out_err_fd;
+    }
+
+    if (pid == 0) {
+
+#if (NGX_HAVE_CPU_AFFINITY)
+        /* reset the CPU affinity mask */
+        ngx_uint_t     log_level;
+        ngx_cpuset_t   child_cpu_affinity;
+
+        if (ngx_process == NGX_PROCESS_WORKER
+            && ngx_get_cpu_affinity(ngx_worker) != NULL)
+        {
+            CPU_ZERO(&child_cpu_affinity);
+
+            for (i = 0; i < (ngx_uint_t) ngx_min(ngx_ncpu, CPU_SETSIZE); i++) {
+                CPU_SET(i, &child_cpu_affinity);
+            }
+
+            log_level = ngx_cycle->log->log_level;
+            ngx_cycle->log->log_level = NGX_LOG_WARN;
+            ngx_setaffinity(&child_cpu_affinity, ngx_cycle->log);
+            ngx_cycle->log->log_level = log_level;
+        }
+#endif
+
+        /* reset the handler of ignored signals to the default */
+        for (sig = ngx_signals; sig->signo != 0; sig++) {
+            ngx_memzero(&sa, sizeof(struct sigaction));
+            sa.sa_handler = SIG_DFL;
+
+            if (sigemptyset(&sa.sa_mask) != 0) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child init signal mask failed");
+                exit(EXIT_FAILURE);
+            }
+
+            if (sigaction(sig->signo, &sa, NULL) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child reset signal handler for %s "
+                              "failed", sig->signame);
+                exit(EXIT_FAILURE);
+            }
+        }
+
+        /* reset signal mask */
+        if (sigemptyset(&set) != 0) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child init signal set failed");
+            exit(EXIT_FAILURE);
+        }
+
+        if (sigprocmask(SIG_SETMASK, &set, NULL) != 0) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child reset signal mask failed");
+            exit(EXIT_FAILURE);
+        }
+
+        /* close listening socket fd */
+        ls = ngx_cycle->listening.elts;
+        for (i = 0; i < ngx_cycle->listening.nelts; i++) {
+            if (ngx_close_socket(ls[i].fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_socket_errno,
+                              "lua pipe child " ngx_close_socket_n
+                              " %V failed", &ls[i].addr_text);
+            }
+        }
+
+        /* close and dup pipefd */
+        if (close(in[1]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "lua pipe child failed to close the in[1] "
+                          "pipe fd");
+        }
+
+        if (close(out[0]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "lua pipe child failed to close the out[0] "
+                          "pipe fd");
+        }
+
+        if (ngx_cycle->log->file && ngx_cycle->log->file->fd == STDERR_FILENO) {
+            errlog_fd = ngx_cycle->log->file->fd;
+            temp_errlog_fd = dup(errlog_fd);
+
+            if (temp_errlog_fd == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child dup errlog fd failed");
+                exit(EXIT_FAILURE);
+            }
+
+            if (ngx_cloexec(temp_errlog_fd) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child new errlog fd " ngx_cloexec_n
+                              " failed");
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua pipe child dup old errlog fd %d to new fd %d",
+                           ngx_cycle->log->file->fd, temp_errlog_fd);
+
+            ngx_cycle->log->file->fd = temp_errlog_fd;
+        }
+
+        if (dup2(in[0], STDIN_FILENO) == -1) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child dup2 stdin failed");
+            exit(EXIT_FAILURE);
+        }
+
+        if (dup2(out[1], STDOUT_FILENO) == -1) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child dup2 stdout failed");
+            exit(EXIT_FAILURE);
+        }
+
+        if (merge_stderr) {
+            if (dup2(STDOUT_FILENO, STDERR_FILENO) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child dup2 stderr failed");
+                exit(EXIT_FAILURE);
+            }
+
+        } else {
+            if (close(err[0]) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "lua pipe child failed to close the err[0] "
+                              "pipe fd");
+            }
+
+            if (dup2(err[1], STDERR_FILENO) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child dup2 stderr failed");
+                exit(EXIT_FAILURE);
+            }
+        }
+
+        if (execvp(file, (char * const *) argv) == -1) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child execvp() failed while executing %s",
+                          file);
+        }
+
+        exit(EXIT_FAILURE);
+    }
+
+    /* parent process */
+    if (close(in[0]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "lua pipe: failed to close the in[0] pipe fd");
+    }
+
+    stdin_fd = in[1];
+
+    if (ngx_nonblocking(stdin_fd) == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    ngx_nonblocking_n " failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_out_err_fd;
+    }
+
+    pp->stdin_fd = stdin_fd;
+
+    if (close(out[1]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "lua pipe: failed to close the out[1] pipe fd");
+    }
+
+    stdout_fd = out[0];
+
+    if (ngx_nonblocking(stdout_fd) == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    ngx_nonblocking_n " failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_out_err_fd;
+    }
+
+    pp->stdout_fd = stdout_fd;
+
+    if (!merge_stderr) {
+        if (close(err[1]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "lua pipe: failed to close the err[1] pipe fd");
+        }
+
+        stderr_fd = err[0];
+
+        if (ngx_nonblocking(stderr_fd) == -1) {
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                        ngx_nonblocking_n " failed: %s",
+                                        strerror(errno))
+                           - errbuf;
+            goto close_in_out_err_fd;
+        }
+
+        pp->stderr_fd = stderr_fd;
+    }
+
+    node = (ngx_rbtree_node_t *) (pp + 1);
+    node->key = pid;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    pipe_node->proc = proc;
+    ngx_rbtree_insert(&ngx_http_lua_pipe_rbtree, node);
+
+    pp->node = node;
+    pp->pool = pool;
+    pp->merge_stderr = merge_stderr;
+    pp->buffer_size = buffer_size;
+
+    proc->_pid = pid;
+    proc->write_timeout = 10000;
+    proc->stdout_read_timeout = 10000;
+    proc->stderr_read_timeout = 10000;
+    proc->wait_timeout = 10000;
+    proc->pipe = pp;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe spawn process:%p pid:%P merge_stderr:%d "
+                   "buffer_size:%uz", proc, pid, merge_stderr, buffer_size);
+    return NGX_OK;
+
+close_in_out_err_fd:
+
+    if (!merge_stderr) {
+        if (close(err[0]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "failed to close the err[0] pipe fd");
+        }
+
+        if (close(err[1]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "failed to close the err[1] pipe fd");
+        }
+    }
+
+close_in_out_fd:
+
+    if (close(out[0]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the out[0] pipe fd");
+    }
+
+    if (close(out[1]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the out[1] pipe fd");
+    }
+
+close_in_fd:
+
+    if (close(in[0]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the in[0] pipe fd");
+    }
+
+    if (close(in[1]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the in[1] pipe fd");
+    }
+
+free_pool:
+
+    ngx_destroy_pool(pool);
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_close_helper(ngx_http_lua_pipe_ctx_t *pipe_ctx,
+    ngx_event_t *ev, int forced)
+{
+    if (ev->handler != ngx_http_lua_pipe_dummy_event_handler && !forced) {
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe cannot close fd:%d without "
+                       "forced pipe:%p ev:%p", pipe_ctx->c->fd, pipe_ctx, ev);
+        return NGX_ERROR;
+    }
+
+    ngx_close_connection(pipe_ctx->c);
+    pipe_ctx->c = NULL;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe, int forced)
+{
+    ngx_event_t                     *wev;
+
+    if (pipe->stdin_ctx == NULL) {
+        if (pipe->stdin_fd != -1) {
+            if (close(pipe->stdin_fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "failed to close the stdin pipe fd");
+            }
+
+            pipe->stdin_fd = -1;
+        }
+
+    } else if (pipe->stdin_ctx->c != NULL) {
+        wev = pipe->stdin_ctx->c->write;
+        return ngx_http_lua_pipe_close_helper(pipe->stdin_ctx, wev, forced);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe, int forced)
+{
+    ngx_event_t                     *rev;
+
+    if (pipe->stdout_ctx == NULL) {
+        if (pipe->stdout_fd != -1) {
+            if (close(pipe->stdout_fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "failed to close the stdout pipe fd");
+            }
+
+            pipe->stdout_fd = -1;
+        }
+
+    } else if (pipe->stdout_ctx->c != NULL) {
+        rev = pipe->stdout_ctx->c->read;
+        return ngx_http_lua_pipe_close_helper(pipe->stdout_ctx, rev, forced);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe, int forced)
+{
+    ngx_event_t                     *rev;
+
+    if (pipe->stderr_ctx == NULL) {
+        if (pipe->stderr_fd != -1) {
+            if (close(pipe->stderr_fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "failed to close the stderr pipe fd");
+            }
+
+            pipe->stderr_fd = -1;
+        }
+
+    } else if (pipe->stderr_ctx->c != NULL) {
+        rev = pipe->stderr_ctx->c->read;
+        return ngx_http_lua_pipe_close_helper(pipe->stderr_ctx, rev, forced);
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_shutdown_stdin(ngx_http_lua_ffi_pipe_proc_t *proc,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_int_t                        rc;
+    ngx_http_lua_pipe_t             *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_lua_pipe_close_stdin(pipe, 0);
+    if (rc != NGX_OK) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy writing")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_shutdown_stdout(ngx_http_lua_ffi_pipe_proc_t *proc,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_int_t                        rc;
+    ngx_http_lua_pipe_t             *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_lua_pipe_close_stdout(pipe, 0);
+    if (rc != NGX_OK) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_shutdown_stderr(ngx_http_lua_ffi_pipe_proc_t *proc,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t             *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe->merge_stderr) {
+        /* stdout is used internally as stderr when merge_stderr is true */
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (ngx_http_lua_pipe_close_stderr(pipe, 0) != NGX_OK) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc, int forced)
+{
+    ngx_http_lua_pipe_t          *pipe;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe finalize process:%p pid:%P forced:%d", proc,
+                   proc->_pid, forced);
+    pipe = proc->pipe;
+
+    if (pipe->node) {
+        ngx_rbtree_delete(&ngx_http_lua_pipe_rbtree, pipe->node);
+        pipe->node = NULL;
+    }
+
+    pipe->dead = 1;
+
+    ngx_http_lua_pipe_close_stdin(pipe, forced);
+    ngx_http_lua_pipe_close_stdout(pipe, forced);
+
+    if (!pipe->merge_stderr) {
+        ngx_http_lua_pipe_close_stderr(pipe, forced);
+    }
+
+    pipe->closed = 1;
+}
+
+
+void
+ngx_http_lua_ffi_pipe_proc_destroy(ngx_http_lua_ffi_pipe_proc_t *proc)
+{
+    ngx_http_lua_pipe_t          *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL) {
+        return;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe destroy process:%p pid:%P", proc, proc->_pid);
+
+    if (!pipe->dead) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe kill process:%p pid:%P", proc, proc->_pid);
+
+        if (kill(proc->_pid, SIGKILL) == -1) {
+            if (ngx_errno != ESRCH) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe failed to kill process:%p pid:%P");
+            }
+        }
+    }
+
+    ngx_http_lua_pipe_proc_finalize(proc, 1);
+    ngx_destroy_pool(pipe->pool);
+    proc->pipe = NULL;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size)
+{
+    int                                 rc;
+
+    *ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
+    }
+
+    rc = ngx_http_lua_ffi_check_context(*ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                                        | NGX_HTTP_LUA_CONTEXT_ACCESS
+                                        | NGX_HTTP_LUA_CONTEXT_CONTENT
+                                        | NGX_HTTP_LUA_CONTEXT_TIMER
+                                        | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH,
+                                        errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char *errbuf,
+    size_t *errbuf_size)
+{
+    switch (pipe_ctx->err_type) {
+
+    case PIPE_ERR_CLOSED:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        break;
+
+    case PIPE_ERR_SYSCALL:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
+                                    strerror(pipe_ctx->pipe_errno))
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_NOMEM:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_TIMEOUT:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "timeout")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_ADD_READ_EV:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "failed to add read event")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_ADD_WRITE_EV:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "failed to add write event")
+                       - errbuf;
+        break;
+
+    default:
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                      "unexpected err type: %d", pipe_ctx->err_type);
+        ngx_http_lua_assert(NULL);
+    }
+}
+
+
+static void
+ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size)
+{
+    size_t                   size = 0;
+    size_t                   chunk_size;
+    size_t                   nbufs;
+    u_char                  *p;
+    ngx_buf_t               *b;
+    ngx_chain_t             *cl;
+    ngx_chain_t            **ll;
+
+    nbufs = 0;
+    ll = NULL;
+
+    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
+        b = cl->buf;
+        chunk_size = b->last - b->pos;
+
+        if (cl->next) {
+            ll = &cl->next;
+        }
+
+        size += chunk_size;
+
+        nbufs++;
+    }
+
+    if (*buf_size < size) {
+        *buf = NULL;
+        *buf_size = size;
+
+        return;
+    }
+
+    *buf_size = size;
+
+    p = *buf;
+    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
+        b = cl->buf;
+        chunk_size = b->last - b->pos;
+        p = ngx_cpymem(p, b->pos, chunk_size);
+    }
+
+    if (nbufs > 1 && ll) {
+        *ll = pipe->free_bufs;
+        pipe->free_bufs = pipe_ctx->bufs_in;
+        pipe_ctx->bufs_in = pipe_ctx->buf_in;
+    }
+
+    if (pipe_ctx->buffer.pos == pipe_ctx->buffer.last) {
+        pipe_ctx->buffer.pos = pipe_ctx->buffer.start;
+        pipe_ctx->buffer.last = pipe_ctx->buffer.start;
+    }
+
+    if (pipe_ctx->bufs_in) {
+        pipe_ctx->buf_in->buf->last = pipe_ctx->buffer.pos;
+        pipe_ctx->buf_in->buf->pos = pipe_ctx->buffer.pos;
+    }
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx)
+{
+    ngx_chain_t             *cl;
+
+    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
+                                         &pipe->free_bufs,
+                                         pipe->buffer_size);
+
+    if (cl == NULL) {
+        pipe_ctx->err_type = PIPE_ERR_NOMEM;
+        return NGX_ERROR;
+    }
+
+    pipe_ctx->buf_in->next = cl;
+    pipe_ctx->buf_in = cl;
+    pipe_ctx->buffer = *cl->buf;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_all(void *data, ssize_t bytes)
+{
+    ngx_http_lua_pipe_ctx_t      *pipe_ctx = data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read all");
+    return ngx_http_lua_read_all(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
+                                 ngx_cycle->log);
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes)
+{
+    ngx_int_t                          rc;
+    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe read bytes %z", bytes);
+
+    rc = ngx_http_lua_read_bytes(&pipe_ctx->buffer, pipe_ctx->buf_in,
+                                 &pipe_ctx->rest, bytes, ngx_cycle->log);
+    if (rc == NGX_ERROR) {
+        pipe_ctx->err_type = PIPE_ERR_CLOSED;
+        return NGX_ERROR;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_line(void *data, ssize_t bytes)
+{
+    ngx_int_t                          rc;
+    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe read line");
+    rc = ngx_http_lua_read_line(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
+                                ngx_cycle->log);
+    if (rc == NGX_ERROR) {
+        pipe_ctx->err_type = PIPE_ERR_CLOSED;
+        return NGX_ERROR;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_any(void *data, ssize_t bytes)
+{
+    ngx_int_t                          rc;
+    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read any");
+    rc = ngx_http_lua_read_any(&pipe_ctx->buffer, pipe_ctx->buf_in,
+                               &pipe_ctx->rest, bytes, ngx_cycle->log);
+    if (rc == NGX_ERROR) {
+        pipe_ctx->err_type = PIPE_ERR_CLOSED;
+        return NGX_ERROR;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx)
+{
+    int                                 rc;
+    int                                 read;
+    size_t                              size;
+    ssize_t                             n;
+    ngx_buf_t                          *b;
+    ngx_event_t                        *rev;
+    ngx_connection_t                   *c;
+
+    c = pipe_ctx->c;
+    rev = c->read;
+    b = &pipe_ctx->buffer;
+    read = 0;
+
+    for ( ;; ) {
+        size = b->last - b->pos;
+
+        if (size || pipe_ctx->eof) {
+            rc = pipe_ctx->input_filter(pipe_ctx->input_filter_ctx, size);
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (rc == NGX_OK) {
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                               "lua pipe read done pipe:%p", pipe_ctx);
+                return NGX_OK;
+            }
+
+            /* rc == NGX_AGAIN */
+            continue;
+        }
+
+        if (read && !rev->ready) {
+            break;
+        }
+
+        size = b->end - b->last;
+
+        if (size == 0) {
+            rc = ngx_http_lua_pipe_add_input_buffer(pipe, pipe_ctx);
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            b = &pipe_ctx->buffer;
+            size = (size_t) (b->end - b->last);
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe try to read data %uz pipe:%p",
+                       size, pipe_ctx);
+
+        n = c->recv(c, b->last, size);
+        read = 1;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe read data returned %z pipe:%p", n, pipe_ctx);
+
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
+        if (n == 0) {
+            pipe_ctx->eof = 1;
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua pipe closed pipe:%p", pipe_ctx);
+            continue;
+        }
+
+        if (n == NGX_ERROR) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
+                           "lua pipe read data error pipe:%p", pipe_ctx);
+
+            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
+            pipe_ctx->pipe_errno = ngx_errno;
+            return NGX_ERROR;
+        }
+
+        b->last += n;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_init_ctx(ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd,
+    ngx_pool_t *pool, u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_connection_t                   *c;
+
+    if (fd == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    *pipe_ctx_pt = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_ctx_t));
+    if (*pipe_ctx_pt == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    c = ngx_get_connection(fd, ngx_cycle->log);
+    if (c == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no connection")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    c->log = ngx_cycle->log;
+    c->recv = ngx_http_lua_pipe_fd_read;
+    c->read->handler = ngx_http_lua_pipe_dummy_event_handler;
+    c->read->log = c->log;
+
+#ifdef HAVE_SOCKET_CLOEXEC_PATCH
+    c->read->skip_socket_leak_check = 1;
+#endif
+
+    c->send = ngx_http_lua_pipe_fd_write;
+    c->write->handler = ngx_http_lua_pipe_dummy_event_handler;
+    c->write->log = c->log;
+    (*pipe_ctx_pt)->c = c;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe init pipe ctx:%p fd:*%d", *pipe_ctx_pt, fd);
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_read(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, int reader_type,
+    size_t length, u_char **buf, size_t *buf_size, u_char *errbuf,
+    size_t *errbuf_size)
+{
+    int                                 rc;
+    ngx_msec_t                          timeout;
+    ngx_event_t                        *rev;
+    ngx_connection_t                   *c;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_co_ctx_t              *wait_co_ctx;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe read process:%p pid:%P", proc, proc->_pid);
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe->merge_stderr && from_stderr) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (from_stderr) {
+        if (pipe->stderr_ctx == NULL) {
+            if (ngx_http_lua_pipe_init_ctx(&pipe->stderr_ctx, pipe->stderr_fd,
+                                           pipe->pool, errbuf,
+                                           errbuf_size)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+        } else {
+            pipe->stderr_ctx->err_type = 0;
+        }
+
+        pipe_ctx = pipe->stderr_ctx;
+
+    } else {
+        if (pipe->stdout_ctx == NULL) {
+            if (ngx_http_lua_pipe_init_ctx(&pipe->stdout_ctx, pipe->stdout_fd,
+                                           pipe->pool, errbuf,
+                                           errbuf_size)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+        } else {
+            pipe->stdout_ctx->err_type = 0;
+        }
+
+        pipe_ctx = pipe->stdout_ctx;
+    }
+
+    c = pipe_ctx->c;
+    if (c == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    rev = c->read;
+    if (rev->handler != ngx_http_lua_pipe_dummy_event_handler) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    pipe_ctx->input_filter_ctx = pipe_ctx;
+
+    switch (reader_type) {
+
+    case PIPE_READ_ALL:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_all;
+        break;
+
+    case PIPE_READ_BYTES:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_bytes;
+        break;
+
+    case PIPE_READ_LINE:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_line;
+        break;
+
+    case PIPE_READ_ANY:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_any;
+        break;
+
+    default:
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                      "unexpected reader_type: %d", reader_type);
+        ngx_http_lua_assert(NULL);
+    }
+
+    pipe_ctx->rest = length;
+
+    if (pipe_ctx->bufs_in == NULL) {
+        pipe_ctx->bufs_in =
+            ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
+                                            &pipe->free_bufs,
+                                            pipe->buffer_size);
+
+        if (pipe_ctx->bufs_in == NULL) {
+            pipe_ctx->err_type = PIPE_ERR_NOMEM;
+            goto error;
+        }
+
+        pipe_ctx->buf_in = pipe_ctx->bufs_in;
+        pipe_ctx->buffer = *pipe_ctx->buf_in->buf;
+    }
+
+    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
+    if (rc == NGX_ERROR) {
+        goto error;
+    }
+
+    if (rc == NGX_OK) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        return NGX_OK;
+    }
+
+    /* rc == NGX_AGAIN */
+    wait_co_ctx = ctx->cur_co_ctx;
+
+    c->data = wait_co_ctx;
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        pipe_ctx->err_type = PIPE_ERR_ADD_READ_EV;
+        goto error;
+    }
+
+    wait_co_ctx->data = proc;
+
+    if (from_stderr) {
+        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
+        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stderr_cleanup;
+        timeout = proc->stderr_read_timeout;
+
+    } else {
+        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
+        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stdout_cleanup;
+        timeout = proc->stdout_read_timeout;
+    }
+
+    if (timeout > 0) {
+        ngx_add_timer(rev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua pipe add timer for reading: %d(ms) process:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       rev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+
+error:
+
+    if (pipe_ctx->bufs_in) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+        return NGX_DECLINED;
+    }
+
+    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+
+    return NGX_ERROR;
+}
+
+
+/*
+ * ngx_http_lua_ffi_pipe_get_read_result should only be called just after
+ * ngx_http_lua_ffi_pipe_proc_read, so we omit most of the sanity check already
+ * done in ngx_http_lua_ffi_pipe_proc_read.
+ */
+int
+ngx_http_lua_ffi_pipe_get_read_result(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, u_char **buf,
+    size_t *buf_size, u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe get read result process:%p pid:%P", proc,
+                   proc->_pid);
+
+    pipe = proc->pipe;
+    pipe_ctx = from_stderr ? pipe->stderr_ctx : pipe->stdout_ctx;
+
+    if (!pipe_ctx->err_type) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        return NGX_OK;
+    }
+
+    if (pipe_ctx->bufs_in) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+        return NGX_DECLINED;
+    }
+
+    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx)
+{
+    size_t                       size;
+    ngx_int_t                    n;
+    ngx_buf_t                   *b;
+    ngx_connection_t            *c;
+
+    c = pipe_ctx->c;
+    b = pipe_ctx->buf_in->buf;
+
+    for ( ;; ) {
+        size = b->last - b->pos;
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe try to write data %uz pipe:%p", size,
+                       pipe_ctx);
+
+        n = c->send(c, b->pos, size);
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe write returned %i pipe:%p", n, pipe_ctx);
+
+        if (n >= 0) {
+            b->pos += n;
+
+            if (b->pos == b->last) {
+                b->pos = b->start;
+                b->last = b->start;
+
+                if (!pipe->free_bufs) {
+                    pipe->free_bufs = pipe_ctx->buf_in;
+
+                } else {
+                    pipe->free_bufs->next = pipe_ctx->buf_in;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                               "lua pipe write done pipe:%p", pipe_ctx);
+                return NGX_OK;
+            }
+
+            continue;
+        }
+
+        /* NGX_ERROR || NGX_AGAIN */
+        break;
+    }
+
+    if (n == NGX_ERROR) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
+                       "lua pipe write data error pipe:%p", pipe_ctx);
+
+        if (ngx_errno == NGX_EPIPE) {
+            pipe_ctx->err_type = PIPE_ERR_CLOSED;
+
+        } else {
+            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
+            pipe_ctx->pipe_errno = ngx_errno;
+        }
+
+        return NGX_ERROR;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+ssize_t
+ngx_http_lua_ffi_pipe_proc_write(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, const u_char *data, size_t len,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    int                                 rc;
+    ngx_buf_t                          *b;
+    ngx_msec_t                          timeout;
+    ngx_chain_t                        *cl;
+    ngx_event_t                        *wev;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_co_ctx_t              *wait_co_ctx;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe write process:%p pid:%P", proc, proc->_pid);
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe->stdin_ctx == NULL) {
+        if (ngx_http_lua_pipe_init_ctx(&pipe->stdin_ctx, pipe->stdin_fd,
+                                       pipe->pool, errbuf,
+                                       errbuf_size)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+    } else {
+        pipe->stdin_ctx->err_type = 0;
+    }
+
+    pipe_ctx = pipe->stdin_ctx;
+    if (pipe_ctx->c == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    wev = pipe_ctx->c->write;
+    if (wev->handler != ngx_http_lua_pipe_dummy_event_handler) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy writing")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    pipe_ctx->rest = len;
+
+    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
+                                         &pipe->free_bufs, len);
+    if (cl == NULL) {
+        pipe_ctx->err_type = PIPE_ERR_NOMEM;
+        goto error;
+    }
+
+    pipe_ctx->buf_in = cl;
+    b = pipe_ctx->buf_in->buf;
+    b->last = ngx_copy(b->last, data, len);
+
+    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
+    if (rc == NGX_ERROR) {
+        goto error;
+    }
+
+    if (rc == NGX_OK) {
+        return len;
+    }
+
+    /* rc == NGX_AGAIN */
+    wait_co_ctx = ctx->cur_co_ctx;
+    pipe_ctx->c->data = wait_co_ctx;
+
+    wev->handler = ngx_http_lua_pipe_resume_write_handler;
+    if (ngx_handle_write_event(wev, 0) != NGX_OK) {
+        pipe_ctx->err_type = PIPE_ERR_ADD_WRITE_EV;
+        goto error;
+    }
+
+    wait_co_ctx->data = proc;
+    wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_write_cleanup;
+    timeout = proc->write_timeout;
+
+    if (timeout > 0) {
+        ngx_add_timer(wev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua pipe add timer for writing: %d(ms) process:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       wev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+
+error:
+
+    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+    return NGX_ERROR;
+}
+
+
+/*
+ * ngx_http_lua_ffi_pipe_get_write_result should only be called just after
+ * ngx_http_lua_ffi_pipe_proc_write, so we omit most of the sanity check
+ * already done in ngx_http_lua_ffi_pipe_proc_write.
+ */
+ssize_t
+ngx_http_lua_ffi_pipe_get_write_result(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe get write result process:%p pid:%P", proc,
+                   proc->_pid);
+
+    pipe = proc->pipe;
+    pipe_ctx = pipe->stdin_ctx;
+
+    if (pipe_ctx->err_type) {
+        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+        return NGX_ERROR;
+    }
+
+    return pipe_ctx->rest;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_wait(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, char **reason, int *status,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    int                                 rc;
+    ngx_rbtree_node_t                  *node;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_co_ctx_t              *wait_co_ctx;
+    ngx_http_lua_pipe_node_t           *pipe_node;
+
+    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe wait process:%p pid:%P", proc, proc->_pid);
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
+        return NGX_ERROR;
+    }
+
+    node = pipe->node;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    if (pipe_node->wait_co_ctx) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy waiting")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe_node->reason_code == REASON_RUNNING_CODE) {
+        wait_co_ctx = ctx->cur_co_ctx;
+        wait_co_ctx->data = proc;
+        ngx_memzero(&wait_co_ctx->sleep, sizeof(ngx_event_t));
+        wait_co_ctx->sleep.handler = ngx_http_lua_pipe_resume_wait_handler;
+        wait_co_ctx->sleep.data = wait_co_ctx;
+        wait_co_ctx->sleep.log = r->connection->log;
+        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_wait_cleanup;
+
+        pipe_node->wait_co_ctx = wait_co_ctx;
+
+        if (proc->wait_timeout > 0) {
+            ngx_add_timer(&wait_co_ctx->sleep, proc->wait_timeout);
+            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua pipe add timer for waiting: %d(ms) process:%p "
+                           "pid:%P ev:%p", proc->wait_timeout, proc,
+                           proc->_pid, &wait_co_ctx->sleep);
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua pipe wait yielding process:%p pid:%P", proc,
+                       proc->_pid);
+
+        return NGX_AGAIN;
+    }
+
+    *status = pipe_node->status;
+
+    switch (pipe_node->reason_code) {
+
+    case REASON_EXIT_CODE:
+        *reason = REASON_EXIT;
+        break;
+
+    case REASON_SIGNAL_CODE:
+        *reason = REASON_SIGNAL;
+        break;
+
+    default:
+        *reason = REASON_UNKNOWN;
+    }
+
+    ngx_http_lua_pipe_proc_finalize(proc, 0);
+
+    if (*status == 0) {
+        return NGX_OK;
+    }
+
+    return NGX_DECLINED;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_kill(ngx_http_lua_ffi_pipe_proc_t *proc, int signal,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_pid_t                           pid;
+    ngx_http_lua_pipe_t                *pipe;
+
+    pipe = proc->pipe;
+
+    if (pipe == NULL || pipe->dead) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
+        return NGX_ERROR;
+    }
+
+    pid = proc->_pid;
+
+    if (kill(pid, signal) == -1) {
+        switch (ngx_errno) {
+        case EINVAL:
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "invalid signal")
+                           - errbuf;
+            break;
+
+        case ESRCH:
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited")
+                           - errbuf;
+            break;
+
+        default:
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
+                                        strerror(ngx_errno))
+                           - errbuf;
+        }
+
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static int
+ngx_http_lua_pipe_read_stdout_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L)
+{
+    return ngx_http_lua_pipe_read_retval_helper(proc, L, 0);
+}
+
+
+static int
+ngx_http_lua_pipe_read_stderr_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L)
+{
+    return ngx_http_lua_pipe_read_retval_helper(proc, L, 1);
+}
+
+
+static int
+ngx_http_lua_pipe_read_retval_helper(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L, int from_stderr)
+{
+    int                              rc;
+    ngx_msec_t                       timeout;
+    ngx_event_t                     *rev;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
+
+    pipe = proc->pipe;
+    if (from_stderr) {
+        pipe_ctx = pipe->stderr_ctx;
+
+    } else {
+        pipe_ctx = pipe->stdout_ctx;
+    }
+
+    if (pipe->timeout) {
+        pipe->timeout = 0;
+        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
+        return 0;
+    }
+
+    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
+    if (rc != NGX_AGAIN) {
+        return 0;
+    }
+
+    rev = pipe_ctx->c->read;
+
+    if (from_stderr) {
+        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
+        timeout = proc->stderr_read_timeout;
+
+    } else {
+        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
+        timeout = proc->stdout_read_timeout;
+    }
+
+    if (timeout > 0) {
+        ngx_add_timer(rev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe add timer for reading: %d(ms) proc:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       rev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+}
+
+
+static int
+ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L)
+{
+    int                              rc;
+    ngx_msec_t                       timeout;
+    ngx_event_t                     *wev;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
+
+    pipe = proc->pipe;
+    pipe_ctx = pipe->stdin_ctx;
+
+    if (pipe->timeout) {
+        pipe->timeout = 0;
+        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
+        return 0;
+    }
+
+    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
+    if (rc != NGX_AGAIN) {
+        return 0;
+    }
+
+    wev = pipe_ctx->c->write;
+    wev->handler = ngx_http_lua_pipe_resume_write_handler;
+    timeout = proc->write_timeout;
+
+    if (timeout > 0) {
+        ngx_add_timer(wev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe add timer for writing: %d(ms) proc:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       wev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+}
+
+
+static int
+ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L)
+{
+    int                              nret;
+    ngx_rbtree_node_t               *node;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_pipe_node_t        *pipe_node;
+
+    pipe = proc->pipe;
+    node = pipe->node;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    pipe_node->wait_co_ctx = NULL;
+
+    if (pipe->timeout) {
+        pipe->timeout = 0;
+        lua_pushnil(L);
+        lua_pushliteral(L, "timeout");
+        return 2;
+    }
+
+    ngx_http_lua_pipe_proc_finalize(pipe_node->proc, 0);
+
+    if (pipe_node->status == 0) {
+        lua_pushboolean(L, 1);
+        lua_pushliteral(L, REASON_EXIT);
+        lua_pushinteger(L, pipe_node->status);
+        nret = 3;
+
+    } else {
+        lua_pushboolean(L, 0);
+
+        switch (pipe_node->reason_code) {
+
+        case REASON_EXIT_CODE:
+            lua_pushliteral(L, REASON_EXIT);
+            break;
+
+        case REASON_SIGNAL_CODE:
+            lua_pushliteral(L, REASON_SIGNAL);
+            break;
+
+        default:
+            lua_pushliteral(L, REASON_UNKNOWN);
+        }
+
+        lua_pushinteger(L, pipe_node->status);
+        nret = 3;
+    }
+
+    return nret;
+}
+
+
+static void
+ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
+    ngx_http_lua_co_ctx_t *wait_co_ctx)
+{
+    ngx_connection_t                *c;
+    ngx_http_request_t              *r;
+    ngx_http_lua_ctx_t              *ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    if (ev->timedout) {
+        proc = wait_co_ctx->data;
+        pipe = proc->pipe;
+        pipe->timeout = 1;
+        ev->timedout = 0;
+    }
+
+    ngx_http_lua_pipe_clear_event(ev);
+
+    r = ngx_http_lua_get_req(wait_co_ctx->co);
+    c = r->connection;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    ngx_http_lua_assert(ctx != NULL);
+
+    ctx->cur_co_ctx = wait_co_ctx;
+
+    if (ctx->entered_content_phase) {
+        (void) ngx_http_lua_pipe_resume(r);
+
+    } else {
+        ctx->resume_handler = ngx_http_lua_pipe_resume;
+        ngx_http_core_run_phases(r);
+    }
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c = ev->data;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    wait_co_ctx = c->data;
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_read_stdout_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c = ev->data;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    wait_co_ctx = c->data;
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_read_stderr_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c = ev->data;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    wait_co_ctx = c->data;
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_write_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev)
+{
+    ngx_http_lua_co_ctx_t           *wait_co_ctx = ev->data;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_wait_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_resume(ngx_http_request_t *r)
+{
+    int                              nret;
+    lua_State                       *vm;
+    ngx_int_t                        rc;
+    ngx_uint_t                       nreqs;
+    ngx_connection_t                *c;
+    ngx_http_lua_ctx_t              *ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    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;
+    ctx->cur_co_ctx->cleanup = NULL;
+
+    proc = ctx->cur_co_ctx->data;
+    pipe = proc->pipe;
+    nret = pipe->retval_handler(proc, ctx->cur_co_ctx->co);
+    if (nret == NGX_AGAIN) {
+        return NGX_DONE;
+    }
+
+    c = r->connection;
+    vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
+
+    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_lua_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
+    }
+
+    /* rc == NGX_ERROR || rc >= NGX_OK */
+
+    if (ctx->entered_content_phase) {
+        ngx_http_lua_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+static void
+ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev)
+{
+    /* do nothing */
+}
+
+
+static void
+ngx_http_lua_pipe_clear_event(ngx_event_t *ev)
+{
+    ev->handler = ngx_http_lua_pipe_dummy_event_handler;
+
+    if (ev->timer_set) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
+                       "lua pipe del timer for ev:%p", ev);
+        ngx_del_timer(ev);
+    }
+
+    if (ev->posted) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
+                       "lua pipe del posted event for ev:%p", ev);
+        ngx_delete_posted_event(ev);
+    }
+}
+
+
+static void
+ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data)
+{
+    ngx_event_t                    *rev;
+    ngx_connection_t               *c;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc read stdout cleanup");
+
+    proc = wait_co_ctx->data;
+    c = proc->pipe->stdout_ctx->c;
+    if (c) {
+        rev = c->read;
+        ngx_http_lua_pipe_clear_event(rev);
+    }
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data)
+{
+    ngx_event_t                    *rev;
+    ngx_connection_t               *c;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc read stderr cleanup");
+
+    proc = wait_co_ctx->data;
+    c = proc->pipe->stderr_ctx->c;
+    if (c) {
+        rev = c->read;
+        ngx_http_lua_pipe_clear_event(rev);
+    }
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_write_cleanup(void *data)
+{
+    ngx_event_t                    *wev;
+    ngx_connection_t               *c;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc write cleanup");
+
+    proc = wait_co_ctx->data;
+    c = proc->pipe->stdin_ctx->c;
+    if (c) {
+        wev = c->write;
+        ngx_http_lua_pipe_clear_event(wev);
+    }
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_wait_cleanup(void *data)
+{
+    ngx_rbtree_node_t              *node;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_pipe_node_t       *pipe_node;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc wait cleanup");
+
+    proc = wait_co_ctx->data;
+    node = proc->pipe->node;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    pipe_node->wait_co_ctx = NULL;
+
+    ngx_http_lua_pipe_clear_event(&wait_co_ctx->sleep);
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+#endif /* HAVE_NGX_LUA_PIPE */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pipe.h b/debian/modules/http-lua/src/ngx_http_lua_pipe.h
new file mode 100644
index 0000000..b5cea89
--- /dev/null
+++ b/debian/modules/http-lua/src/ngx_http_lua_pipe.h
@@ -0,0 +1,95 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef _NGX_HTTP_LUA_PIPE_H_INCLUDED_
+#define _NGX_HTTP_LUA_PIPE_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+typedef ngx_int_t (*ngx_http_lua_pipe_input_filter)(void *data, ssize_t bytes);
+
+
+typedef struct {
+    ngx_connection_t                   *c;
+    ngx_http_lua_pipe_input_filter      input_filter;
+    void                               *input_filter_ctx;
+    size_t                              rest;
+    ngx_chain_t                        *buf_in;
+    ngx_chain_t                        *bufs_in;
+    ngx_buf_t                           buffer;
+    ngx_err_t                           pipe_errno;
+    unsigned                            err_type:16;
+    unsigned                            eof:1;
+} ngx_http_lua_pipe_ctx_t;
+
+
+typedef struct ngx_http_lua_pipe_s  ngx_http_lua_pipe_t;
+
+
+typedef struct {
+    ngx_pid_t               _pid;
+    ngx_msec_t              write_timeout;
+    ngx_msec_t              stdout_read_timeout;
+    ngx_msec_t              stderr_read_timeout;
+    ngx_msec_t              wait_timeout;
+    /* pipe hides the implementation from the Lua binding */
+    ngx_http_lua_pipe_t    *pipe;
+} ngx_http_lua_ffi_pipe_proc_t;
+
+
+typedef int (*ngx_http_lua_pipe_retval_handler)(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
+
+
+struct ngx_http_lua_pipe_s {
+    ngx_pool_t                         *pool;
+    ngx_chain_t                        *free_bufs;
+    ngx_rbtree_node_t                  *node;
+    int                                 stdin_fd;
+    int                                 stdout_fd;
+    int                                 stderr_fd;
+    ngx_http_lua_pipe_ctx_t            *stdin_ctx;
+    ngx_http_lua_pipe_ctx_t            *stdout_ctx;
+    ngx_http_lua_pipe_ctx_t            *stderr_ctx;
+    ngx_http_lua_pipe_retval_handler    retval_handler;
+    size_t                              buffer_size;
+    unsigned                            closed:1;
+    unsigned                            dead:1;
+    unsigned                            timeout:1;
+    unsigned                            merge_stderr:1;
+};
+
+
+typedef struct {
+    u_char                           color;
+    u_char                           reason_code;
+    int                              status;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+} ngx_http_lua_pipe_node_t;
+
+
+typedef struct {
+    int     signo;
+    char   *signame;
+} ngx_http_lua_pipe_signal_t;
+
+
+#if !(NGX_WIN32) && !defined(NGX_LUA_NO_FFI_API)                             \
+    && defined(HAVE_SOCKET_CLOEXEC_PATCH)
+#define HAVE_NGX_LUA_PIPE   1
+
+
+void ngx_http_lua_pipe_init(void);
+ngx_int_t ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle);
+#endif
+
+
+#endif /* _NGX_HTTP_LUA_PIPE_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_regex.c b/debian/modules/http-lua/src/ngx_http_lua_regex.c
index 843d1e4..8f3373b 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_regex.c
@@ -15,7 +15,6 @@
 #include "ngx_http_lua_regex.h"
 #include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_script.h"
-#include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_util.h"
 
 
@@ -249,7 +248,8 @@ ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              regex_cache_key));
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
@@ -720,7 +720,8 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              regex_cache_key));
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
@@ -1388,7 +1389,8 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              regex_cache_key));
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "s");
diff --git a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
index 1bbe87c..1de9968 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
@@ -62,7 +62,7 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
 #endif
 
         if (cur_ph < last_ph) {
-            dd("swaping the contents of cur_ph and last_ph...");
+            dd("swapping the contents of cur_ph and last_ph...");
 
             tmp      = *cur_ph;
 
@@ -261,9 +261,11 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_script.c b/debian/modules/http-lua/src/ngx_http_lua_script.c
index 95ebadf..c675a16 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_script.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_script.c
@@ -329,7 +329,7 @@ ngx_http_lua_script_add_copy_code(ngx_http_lua_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_lua_script_code_pt)
+    code->code = (ngx_http_lua_script_code_pt) (void *)
                  ngx_http_lua_script_copy_len_code;
     code->len = len;
 
@@ -399,7 +399,7 @@ ngx_http_lua_script_add_capture_code(ngx_http_lua_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_lua_script_code_pt)
+    code->code = (ngx_http_lua_script_code_pt) (void *)
                  ngx_http_lua_script_copy_capture_len_code;
     code->n = 2 * n;
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.c b/debian/modules/http-lua/src/ngx_http_lua_setby.c
index 2e8762a..d4288b5 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_setby.c
@@ -30,13 +30,6 @@ 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);
 
 
-/* keys in Lua thread for fetching args and nargs in set_by_lua* */
-
-#define ngx_http_lua_nargs_key  "__ngx_nargs"
-
-#define ngx_http_lua_args_key  "__ngx_args"
-
-
 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)
@@ -134,23 +127,24 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
 
 
 int
-ngx_http_lua_setby_param_get(lua_State *L)
+ngx_http_lua_setby_param_get(lua_State *L, ngx_http_request_t *r)
 {
     int         idx;
     int         n;
 
     ngx_http_variable_value_t       *v;
+    ngx_http_lua_main_conf_t        *lmcf;
 
     idx = luaL_checkint(L, 2);
     idx--;
 
-    /*  get number of args from globals */
-    lua_getglobal(L, ngx_http_lua_nargs_key);
-    n = (int) lua_tointeger(L, -1);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
-    /*  get args from globals */
-    lua_getglobal(L, ngx_http_lua_args_key);
-    v = lua_touserdata(L, -1);
+    /*  get number of args from lmcf */
+    n = lmcf->setby_nargs;
+
+    /*  get args from lmcf */
+    v = lmcf->setby_args;
 
     if (idx < 0 || idx > n - 1) {
         lua_pushnil(L);
@@ -178,15 +172,16 @@ 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)
 {
-    /*  set nginx request pointer to current lua thread's globals table */
+    ngx_http_lua_main_conf_t        *lmcf;
+
     ngx_http_lua_set_req(L, r);
 
-    lua_pushinteger(L, nargs);
-    lua_setglobal(L, ngx_http_lua_nargs_key);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
-    lua_pushlightuserdata(L, args);
-    lua_setglobal(L, ngx_http_lua_args_key);
+    lmcf->setby_nargs = nargs;
+    lmcf->setby_args = args;
 
+#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -211,6 +206,7 @@ ngx_http_lua_set_by_lua_env(lua_State *L, ngx_http_request_t *r, size_t nargs,
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif
 }
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.h b/debian/modules/http-lua/src/ngx_http_lua_setby.h
index da71753..f43eef7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_setby.h
@@ -7,7 +7,7 @@
 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);
+int ngx_http_lua_setby_param_get(lua_State *L, ngx_http_request_t *r);
 
 
 #endif /* _NGX_HTTP_LUA_SET_BY_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_shdict.c b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
index 5fb7930..b017bea 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
@@ -325,6 +325,7 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_uint_t                   i;
     ngx_shm_zone_t             **zone;
+    ngx_shm_zone_t             **zone_udata;
 
     if (lmcf->shdict_zones != NULL) {
         lua_createtable(L, 0, lmcf->shdict_zones->nelts /* nrec */);
@@ -396,7 +397,9 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
 
             lua_createtable(L, 1 /* narr */, 0 /* nrec */);
                 /* table of zone[i] */
-            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
+            zone_udata = lua_newuserdata(L, sizeof(ngx_shm_zone_t *));
+                /* shared mt key ud */
+            *zone_udata = zone[i];
             lua_rawseti(L, -2, SHDICT_USERDATA_INDEX); /* {zone[i]} */
             lua_pushvalue(L, -3); /* shared mt key ud mt */
             lua_setmetatable(L, -2); /* shared mt key ud */
@@ -431,11 +434,17 @@ static ngx_inline ngx_shm_zone_t *
 ngx_http_lua_shdict_get_zone(lua_State *L, int index)
 {
     ngx_shm_zone_t      *zone;
+    ngx_shm_zone_t     **zone_udata;
 
     lua_rawgeti(L, index, SHDICT_USERDATA_INDEX);
-    zone = lua_touserdata(L, -1);
+    zone_udata = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
+    if (zone_udata == NULL) {
+        return NULL;
+    }
+
+    zone = *zone_udata;
     return zone;
 }
 
@@ -2209,6 +2218,17 @@ ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
 
 
 #ifndef NGX_LUA_NO_FFI_API
+ngx_shm_zone_t *
+ngx_http_lua_ffi_shdict_udata_to_zone(void *zone_udata)
+{
+    if (zone_udata == NULL) {
+        return NULL;
+    }
+
+    return *(ngx_shm_zone_t **) zone_udata;
+}
+
+
 int
 ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     size_t key_len, int value_type, u_char *str_value_buf,
@@ -2225,10 +2245,6 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     dd("exptime: %ld", exptime);
 
     ctx = zone->data;
@@ -2490,10 +2506,6 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_node_t  *sd;
     ngx_str_t                    value;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     *err = NULL;
 
     ctx = zone->data;
@@ -2636,10 +2648,6 @@ ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
     u_char                      *p;
     ngx_queue_t                 *queue, *q;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     if (init_ttl > 0) {
         tp = ngx_timeofday();
     }
@@ -2915,10 +2923,6 @@ ngx_http_lua_ffi_shdict_get_ttl(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     ctx = zone->data;
     hash = ngx_crc32_short(key, key_len);
 
@@ -2959,10 +2963,6 @@ ngx_http_lua_ffi_shdict_set_expire(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     if (exptime > 0) {
         tp = ngx_timeofday();
     }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
index efdf427..87461e6 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
@@ -11,6 +11,7 @@
 
 
 #include "ngx_http_lua_socket_tcp.h"
+#include "ngx_http_lua_input_filters.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_uthread.h"
 #include "ngx_http_lua_output.h"
@@ -24,6 +25,7 @@ static int ngx_http_lua_socket_tcp_connect(lua_State *L);
 static int ngx_http_lua_socket_tcp_sslhandshake(lua_State *L);
 #endif
 static int ngx_http_lua_socket_tcp_receive(lua_State *L);
+static int ngx_http_lua_socket_tcp_receiveany(lua_State *L);
 static int ngx_http_lua_socket_tcp_send(lua_State *L);
 static int ngx_http_lua_socket_tcp_close(lua_State *L);
 static int ngx_http_lua_socket_tcp_setoption(lua_State *L);
@@ -69,6 +71,8 @@ static int ngx_http_lua_socket_tcp_conn_retval_handler(ngx_http_request_t *r,
     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_tcp_upstream_t *u);
+static int ngx_http_lua_socket_tcp_receive_helper(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 static ngx_int_t ngx_http_lua_socket_tcp_read(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u);
 static int ngx_http_lua_socket_tcp_receive_retval_handler(ngx_http_request_t *r,
@@ -86,6 +90,7 @@ static int ngx_http_lua_socket_write_error_retval_handler(ngx_http_request_t *r,
 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);
+static ngx_int_t ngx_http_lua_socket_read_any(void *data, ssize_t bytes);
 static int ngx_http_lua_socket_tcp_receiveuntil(lua_State *L);
 static int ngx_http_lua_socket_receiveuntil_iterator(lua_State *L);
 static ngx_int_t ngx_http_lua_socket_compile_pattern(u_char *data, size_t len,
@@ -95,12 +100,28 @@ static int ngx_http_lua_req_socket(lua_State *L);
 static void ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r);
 static int ngx_http_lua_socket_tcp_getreusedtimes(lua_State *L);
 static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L);
+static void ngx_http_lua_socket_tcp_create_socket_pool(lua_State *L,
+    ngx_http_request_t *r, ngx_str_t key, ngx_int_t pool_size,
+    ngx_int_t backlog, ngx_http_lua_socket_pool_t **spool);
 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_tcp_upstream_t *u);
 static void ngx_http_lua_socket_keepalive_dummy_handler(ngx_event_t *ev);
+static int ngx_http_lua_socket_tcp_connect_helper(lua_State *L,
+    ngx_http_lua_socket_tcp_upstream_t *u, ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, u_char *host_ref, size_t host_len, in_port_t port,
+    unsigned resuming);
+static void ngx_http_lua_socket_tcp_conn_op_timeout_handler(
+    ngx_event_t *ev);
+static int ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler(
+    ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
+static void ngx_http_lua_socket_tcp_resume_conn_op(
+    ngx_http_lua_socket_pool_t *spool);
+static void ngx_http_lua_socket_tcp_conn_op_ctx_cleanup(void *data);
+static void ngx_http_lua_socket_tcp_conn_op_resume_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 int ngx_http_lua_socket_tcp_conn_op_resume_retval_handler(
+    ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u, 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,
@@ -113,11 +134,13 @@ static ngx_int_t ngx_http_lua_socket_add_input_buffer(ngx_http_request_t *r,
     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_tcp_upstream_t *u, u_char *pat, size_t prefix);
+static ngx_int_t ngx_http_lua_socket_tcp_conn_op_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_conn_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_read_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r,
     int socket_op);
+static void ngx_http_lua_tcp_queue_conn_op_cleanup(void *data);
 static void ngx_http_lua_tcp_resolve_cleanup(void *data);
 static void ngx_http_lua_coctx_cleanup(void *data);
 static void ngx_http_lua_socket_free_pool(ngx_log_t *log,
@@ -150,7 +173,8 @@ enum {
 enum {
     SOCKET_OP_CONNECT,
     SOCKET_OP_READ,
-    SOCKET_OP_WRITE
+    SOCKET_OP_WRITE,
+    SOCKET_OP_RESUME_CONN
 };
 
 
@@ -229,7 +253,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_setfield(L, -2, "socket");
 
     /* {{{req socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          req_socket_metatable_key));
     lua_createtable(L, 0 /* narr */, 5 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
@@ -251,7 +276,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{raw req socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          raw_req_socket_metatable_key));
     lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
@@ -276,7 +302,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{tcp object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          tcp_socket_metatable_key));
     lua_createtable(L, 0 /* narr */, 12 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_connect);
@@ -292,6 +319,9 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
     lua_setfield(L, -2, "receive");
 
+    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveany);
+    lua_setfield(L, -2, "receiveany");
+
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveuntil);
     lua_setfield(L, -2, "receiveuntil");
 
@@ -322,7 +352,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{upstream userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          upstream_udata_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_upstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -330,7 +361,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{downstream userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          downstream_udata_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_downstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -338,7 +370,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{socket pool userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          pool_udata_metatable_key));
     lua_createtable(L, 0, 1); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_shutdown_pool);
     lua_setfield(L, -2, "__gc");
@@ -346,7 +379,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{socket compiled pattern userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          pattern_udata_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_cleanup_compiled_pattern);
     lua_setfield(L, -2, "__gc");
@@ -356,7 +390,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 #if (NGX_HTTP_SSL)
 
     /* {{{ssl session userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          ssl_session_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_ssl_free_session);
     lua_setfield(L, -2, "__gc");
@@ -404,7 +439,8 @@ ngx_http_lua_socket_tcp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     lua_createtable(L, 5 /* narr */, 1 /* nrec */);
-    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          tcp_socket_metatable_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -414,31 +450,421 @@ ngx_http_lua_socket_tcp(lua_State *L)
 }
 
 
+static void
+ngx_http_lua_socket_tcp_create_socket_pool(lua_State *L, ngx_http_request_t *r,
+    ngx_str_t key, ngx_int_t pool_size, ngx_int_t backlog,
+    ngx_http_lua_socket_pool_t **spool)
+{
+    u_char                              *p;
+    size_t                               size, key_len;
+    ngx_int_t                            i;
+    ngx_http_lua_socket_pool_t          *sp;
+    ngx_http_lua_socket_pool_item_t     *items;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket connection pool size: %i, backlog: %i",
+                   pool_size, backlog);
+
+    key_len = ngx_align(key.len + 1, sizeof(void *));
+
+    size = sizeof(ngx_http_lua_socket_pool_t) - 1 + key_len
+           + sizeof(ngx_http_lua_socket_pool_item_t) * pool_size;
+
+    /* before calling this function, the Lua stack is:
+     * -1 key
+     * -2 pools
+     */
+    sp = lua_newuserdata(L, size);
+    if (sp == NULL) {
+        luaL_error(L, "no memory");
+        return;
+    }
+
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          pool_udata_metatable_key));
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_setmetatable(L, -2);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket keepalive create connection pool for key"
+                   " \"%V\"", &key);
+
+    /* a new socket pool with metatable is push to the stack, so now we have:
+     * -1 sp
+     * -2 key
+     * -3 pools
+     *
+     * it is time to set pools[key] to sp.
+     */
+    lua_rawset(L, -3);
+
+    /* clean up the stack for consistency's sake */
+    lua_pop(L, 1);
+
+    sp->backlog = backlog;
+    sp->size = pool_size;
+    sp->connections = 0;
+    sp->lua_vm = ngx_http_lua_get_lua_vm(r, NULL);
+
+    ngx_queue_init(&sp->cache_connect_op);
+    ngx_queue_init(&sp->wait_connect_op);
+    ngx_queue_init(&sp->cache);
+    ngx_queue_init(&sp->free);
+
+    p = ngx_copy(sp->key, key.data, key.len);
+    *p++ = '\0';
+
+    items = (ngx_http_lua_socket_pool_item_t *) (sp->key + key_len);
+
+    dd("items: %p", items);
+
+    ngx_http_lua_assert((void *) items == ngx_align_ptr(items, sizeof(void *)));
+
+    for (i = 0; i < pool_size; i++) {
+        ngx_queue_insert_head(&sp->free, &items[i].queue);
+        items[i].socket_pool = sp;
+    }
+
+    *spool = sp;
+}
+
+
+static int
+ngx_http_lua_socket_tcp_connect_helper(lua_State *L,
+    ngx_http_lua_socket_tcp_upstream_t *u, ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, u_char *host_ref, size_t host_len, in_port_t port,
+    unsigned resuming)
+{
+    int                                    n;
+    int                                    host_size;
+    int                                    saved_top;
+    ngx_int_t                              rc;
+    ngx_str_t                              host;
+    ngx_str_t                             *conn_op_host;
+    ngx_url_t                              url;
+    ngx_queue_t                           *q;
+    ngx_resolver_ctx_t                    *rctx, temp;
+    ngx_http_lua_co_ctx_t                 *coctx;
+    ngx_http_core_loc_conf_t              *clcf;
+    ngx_http_lua_socket_pool_t            *spool;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t *conn_op_ctx;
+
+    spool = u->socket_pool;
+    if (spool != NULL) {
+        rc = ngx_http_lua_get_keepalive_peer(r, u);
+
+        if (rc == NGX_OK) {
+            lua_pushinteger(L, 1);
+            return 1;
+        }
+
+        /* rc == NGX_DECLINED */
+
+        spool->connections++;
+
+        /* check if backlog is enabled and
+         * don't queue resuming connection operation */
+        if (spool->backlog >= 0 && !resuming) {
+
+            dd("lua tcp socket %s connections %ld",
+               spool->key, spool->connections);
+
+            if (spool->connections > spool->size + spool->backlog) {
+                spool->connections--;
+                lua_pushnil(L);
+                lua_pushliteral(L, "too many waiting connect operations");
+                return 2;
+            }
+
+            if (spool->connections > spool->size) {
+                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->peer.log, 0,
+                               "lua tcp socket queue connect operation for "
+                               "connection pool \"%s\", connections: %i",
+                               spool->key, spool->connections);
+
+                host_size = sizeof(u_char) *
+                    (ngx_max(host_len, NGX_INET_ADDRSTRLEN) + 1);
+
+                if (!ngx_queue_empty(&spool->cache_connect_op)) {
+                    q = ngx_queue_last(&spool->cache_connect_op);
+                    ngx_queue_remove(q);
+                    conn_op_ctx = ngx_queue_data(
+                        q, ngx_http_lua_socket_tcp_conn_op_ctx_t, queue);
+
+                    conn_op_host = &conn_op_ctx->host;
+                    if (host_len > conn_op_host->len
+                        && host_len > NGX_INET_ADDRSTRLEN)
+                    {
+                        ngx_free(conn_op_host->data);
+                        conn_op_host->data = ngx_alloc(host_size,
+                                                       ngx_cycle->log);
+                        if (conn_op_host->data == NULL) {
+                            ngx_free(conn_op_ctx);
+                            goto no_memory_and_not_resuming;
+                        }
+                    }
+
+                } else {
+                    conn_op_ctx = ngx_alloc(
+                        sizeof(ngx_http_lua_socket_tcp_conn_op_ctx_t),
+                        ngx_cycle->log);
+                    if (conn_op_ctx == NULL) {
+                        goto no_memory_and_not_resuming;
+                    }
+
+                    conn_op_host = &conn_op_ctx->host;
+                    conn_op_host->data = ngx_alloc(host_size, ngx_cycle->log);
+                    if (conn_op_host->data == NULL) {
+                        ngx_free(conn_op_ctx);
+                        goto no_memory_and_not_resuming;
+                    }
+                }
+
+                conn_op_ctx->cleanup = NULL;
+
+                ngx_memcpy(conn_op_host->data, host_ref, host_len);
+                conn_op_host->data[host_len] = '\0';
+                conn_op_host->len = host_len;
+
+                conn_op_ctx->port = port;
+
+                u->write_co_ctx = ctx->cur_co_ctx;
+
+                conn_op_ctx->u = u;
+                ctx->cur_co_ctx->cleanup =
+                    ngx_http_lua_tcp_queue_conn_op_cleanup;
+                ctx->cur_co_ctx->data = conn_op_ctx;
+
+                ngx_memzero(&conn_op_ctx->event, sizeof(ngx_event_t));
+                conn_op_ctx->event.handler =
+                    ngx_http_lua_socket_tcp_conn_op_timeout_handler;
+                conn_op_ctx->event.data = conn_op_ctx;
+                conn_op_ctx->event.log = ngx_cycle->log;
+
+                ngx_add_timer(&conn_op_ctx->event, u->connect_timeout);
+
+                ngx_queue_insert_tail(&spool->wait_connect_op,
+                                      &conn_op_ctx->queue);
+
+                ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                               "lua tcp socket queued connect operation for "
+                               "%d(ms), u: %p, ctx: %p",
+                               u->connect_timeout, conn_op_ctx->u, conn_op_ctx);
+
+                return lua_yield(L, 0);
+            }
+        }
+
+    } /* end spool != NULL */
+
+    host.data = ngx_palloc(r->pool, host_len + 1);
+    if (host.data == NULL) {
+        return luaL_error(L, "no memory");
+    }
+
+    host.len = host_len;
+
+    ngx_memcpy(host.data, host_ref, host_len);
+    host.data[host_len] = '\0';
+
+    ngx_memzero(&url, sizeof(ngx_url_t));
+    url.url = host;
+    url.default_port = port;
+    url.no_resolve = 1;
+
+    coctx = ctx->cur_co_ctx;
+
+    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",
+                            url.url.data, url.err);
+
+        } else {
+            lua_pushfstring(L, "failed to parse host name \"%s\"",
+                            url.url.data);
+        }
+
+        goto failed;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "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) {
+        if (resuming) {
+            lua_pushnil(L);
+            lua_pushliteral(L, "no memory");
+            goto failed;
+        }
+
+        goto no_memory_and_not_resuming;
+    }
+
+    if (url.addrs && url.addrs[0].sockaddr) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp 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 = url.default_port;
+    }
+
+    if (u->resolved->sockaddr) {
+        rc = ngx_http_lua_socket_resolve_retval_handler(r, u, L);
+        if (rc == NGX_AGAIN && !resuming) {
+            return lua_yield(L, 0);
+        }
+
+        if (rc > 1) {
+            goto failed;
+        }
+
+        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");
+        goto failed;
+    }
+
+    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);
+        goto failed;
+    }
+
+    rctx->name = host;
+#if !defined(nginx_version) || nginx_version < 1005008
+    rctx->type = NGX_RESOLVE_A;
+#endif
+    rctx->handler = ngx_http_lua_socket_resolve_handler;
+    rctx->data = u;
+    rctx->timeout = clcf->resolver_timeout;
+
+    u->resolved->ctx = rctx;
+    u->write_co_ctx = ctx->cur_co_ctx;
+
+    ngx_http_lua_cleanup_pending_operation(coctx);
+    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
+    coctx->data = u;
+
+    saved_top = lua_gettop(L);
+
+    if (ngx_resolve_name(rctx) != NGX_OK) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket fail to run resolver immediately");
+
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
+
+        coctx->cleanup = NULL;
+        coctx->data = NULL;
+
+        u->resolved->ctx = NULL;
+        lua_pushnil(L);
+        lua_pushfstring(L, "%s could not be resolved", host.data);
+        goto failed;
+    }
+
+    if (u->conn_waiting) {
+        dd("resolved and already connecting");
+
+        if (resuming) {
+            return NGX_AGAIN;
+        }
+
+        return lua_yield(L, 0);
+    }
+
+    n = lua_gettop(L) - saved_top;
+    if (n) {
+        dd("errors occurred during resolving or connecting"
+           "or already connected");
+
+        if (n > 1) {
+            goto failed;
+        }
+
+        return n;
+    }
+
+    /* still resolving */
+
+    u->conn_waiting = 1;
+    u->write_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;
+
+    } else {
+        r->write_event_handler = ngx_http_core_run_phases;
+    }
+
+    if (resuming) {
+        return NGX_AGAIN;
+    }
+
+    return lua_yield(L, 0);
+
+failed:
+
+    if (spool != NULL) {
+        spool->connections--;
+        ngx_http_lua_socket_tcp_resume_conn_op(spool);
+    }
+
+    return 2;
+
+no_memory_and_not_resuming:
+
+    if (spool != NULL) {
+        spool->connections--;
+        ngx_http_lua_socket_tcp_resume_conn_op(spool);
+    }
+
+    return luaL_error(L, "no memory");
+}
+
+
 static int
 ngx_http_lua_socket_tcp_connect(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_peer_connection_t       *pc;
     int                          connect_timeout, send_timeout, read_timeout;
     unsigned                     custom_pool;
     int                          key_index;
+    ngx_int_t                    backlog;
+    ngx_int_t                    pool_size;
+    ngx_str_t                    key;
     const char                  *msg;
-    ngx_http_lua_co_ctx_t       *coctx;
 
     ngx_http_lua_socket_tcp_upstream_t      *u;
 
+    ngx_http_lua_socket_pool_t              *spool;
+
     n = lua_gettop(L);
     if (n != 2 && n != 3 && n != 4) {
         return luaL_error(L, "ngx.socket connect: expecting 2, 3, or 4 "
@@ -466,13 +892,54 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     p = (u_char *) luaL_checklstring(L, 2, &len);
 
+    backlog = -1;
     key_index = 2;
+    pool_size = 0;
     custom_pool = 0;
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
     if (lua_type(L, n) == LUA_TTABLE) {
 
         /* found the last optional option table */
 
+        lua_getfield(L, n, "pool_size");
+
+        if (lua_isnumber(L, -1)) {
+            pool_size = (ngx_int_t) lua_tointeger(L, -1);
+
+            if (pool_size <= 0) {
+                msg = lua_pushfstring(L, "bad \"pool_size\" option value: %i",
+                                      pool_size);
+                return luaL_argerror(L, n, msg);
+            }
+
+        } else if (!lua_isnil(L, -1)) {
+            msg = lua_pushfstring(L, "bad \"pool_size\" option type: %s",
+                                  lua_typename(L, lua_type(L, -1)));
+            return luaL_argerror(L, n, msg);
+        }
+
+        lua_pop(L, 1);
+
+        lua_getfield(L, n, "backlog");
+
+        if (lua_isnumber(L, -1)) {
+            backlog = (ngx_int_t) lua_tointeger(L, -1);
+
+            if (backlog < 0) {
+                msg = lua_pushfstring(L, "bad \"backlog\" option value: %i",
+                                      backlog);
+                return luaL_argerror(L, n, msg);
+            }
+
+            /* use default value for pool size if only backlog specified */
+            if (pool_size == 0) {
+                pool_size = llcf->pool_size;
+            }
+        }
+
+        lua_pop(L, 1);
+
         lua_getfield(L, n, "pool");
 
         switch (lua_type(L, -1)) {
@@ -572,7 +1039,8 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         }
 
 #if 1
-        lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              upstream_udata_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
 #endif
@@ -582,12 +1050,8 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     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;
 
     pc = &u->peer;
@@ -628,163 +1092,28 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         u->read_timeout = u->conf->read_timeout;
     }
 
-    rc = ngx_http_lua_get_keepalive_peer(r, L, key_index, u);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
+    lua_rawget(L, LUA_REGISTRYINDEX); /* table */
+    lua_pushvalue(L, key_index); /* key */
 
-    if (rc == NGX_OK) {
-        lua_pushinteger(L, 1);
-        return 1;
+    lua_rawget(L, -2);
+    spool = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (spool != NULL) {
+        u->socket_pool = spool;
+
+    } else if (pool_size > 0) {
+        lua_pushvalue(L, key_index);
+        key.data = (u_char *) lua_tolstring(L, -1, &key.len);
+
+        ngx_http_lua_socket_tcp_create_socket_pool(L, r, key, pool_size,
+                                                   backlog, &spool);
+        u->socket_pool = spool;
     }
 
-    if (rc == NGX_ERROR) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "error in get keepalive peer");
-        return 2;
-    }
-
-    /* rc == NGX_DECLINED */
-
-    /* TODO: we should avoid this in-pool allocation */
-
-    host.data = ngx_palloc(r->pool, len + 1);
-    if (host.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    host.len = len;
-
-    ngx_memcpy(host.data, p, len);
-    host.data[len] = '\0';
-
-    ngx_memzero(&url, sizeof(ngx_url_t));
-
-    url.url.len = host.len;
-    url.url.data = host.data;
-    url.default_port = (in_port_t) 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;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "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) {
-        return luaL_error(L, "no memory");
-    }
-
-    if (url.addrs && url.addrs[0].sockaddr) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp 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;
-#if !defined(nginx_version) || nginx_version < 1005008
-    rctx->type = NGX_RESOLVE_A;
-#endif
-    rctx->handler = ngx_http_lua_socket_resolve_handler;
-    rctx->data = u;
-    rctx->timeout = clcf->resolver_timeout;
-
-    u->resolved->ctx = rctx;
-    u->write_co_ctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
-    coctx->data = u;
-
-    saved_top = lua_gettop(L);
-
-    if (ngx_resolve_name(rctx) != NGX_OK) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket fail to run resolver immediately");
-
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
-
-        coctx->cleanup = NULL;
-        coctx->data = NULL;
-
-        u->resolved->ctx = NULL;
-        lua_pushnil(L);
-        lua_pushfstring(L, "%s could not be resolved", host.data);
-
-        return 2;
-    }
-
-    if (u->conn_waiting) {
-        dd("resolved and already connecting");
-        return lua_yield(L, 0);
-    }
-
-    n = lua_gettop(L) - saved_top;
-    if (n) {
-        dd("errors occurred during resolving or connecting"
-           "or already connected");
-        return n;
-    }
-
-    /* still resolving */
-
-    u->conn_waiting = 1;
-    u->write_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;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    return lua_yield(L, 0);
+    return ngx_http_lua_socket_tcp_connect_helper(L, u, r, ctx, p,
+                                                  len, port, 0);
 }
 
 
@@ -1638,7 +1967,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
                       "lua ssl save session: %p", ssl_session);
 
         /* set up the __gc metamethod */
-        lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              ssl_session_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -1755,20 +2085,173 @@ ngx_http_lua_socket_tcp_conn_retval_handler(ngx_http_request_t *r,
 }
 
 
+static int
+ngx_http_lua_socket_tcp_receive_helper(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
+{
+    ngx_int_t                            rc;
+    ngx_http_lua_ctx_t                  *ctx;
+    ngx_http_lua_co_ctx_t               *coctx;
+
+    u->input_filter_ctx = u;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (u->bufs_in == NULL) {
+        u->bufs_in =
+            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
+                                            &ctx->free_recv_bufs,
+                                            u->conf->buffer_size);
+
+        if (u->bufs_in == NULL) {
+            return luaL_error(L, "no memory");
+        }
+
+        u->buf_in = u->bufs_in;
+        u->buffer = *u->buf_in->buf;
+    }
+
+    dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket read timeout: %M", u->read_timeout);
+
+    if (u->raw_downstream || u->body_downstream) {
+        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
+    }
+
+    u->read_waiting = 0;
+    u->read_co_ctx = NULL;
+
+    rc = ngx_http_lua_socket_tcp_read(r, u);
+
+    if (rc == NGX_ERROR) {
+        dd("read failed: %d", (int) u->ft_type);
+        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
+        dd("tcp receive retval returned: %d", (int) rc);
+        return rc;
+    }
+
+    if (rc == NGX_OK) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket receive done in a single run");
+
+        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
+    }
+
+    /* rc == NGX_AGAIN */
+
+    u->read_event_handler = ngx_http_lua_socket_read_handler;
+
+    coctx = ctx->cur_co_ctx;
+
+    ngx_http_lua_cleanup_pending_operation(coctx);
+    coctx->cleanup = ngx_http_lua_coctx_cleanup;
+    coctx->data = u;
+
+    if (ctx->entered_content_phase) {
+        r->write_event_handler = ngx_http_lua_content_wev_handler;
+
+    } else {
+        r->write_event_handler = ngx_http_core_run_phases;
+    }
+
+    u->read_co_ctx = coctx;
+    u->read_waiting = 1;
+    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
+
+    dd("setting data to %p, coctx:%p", u, coctx);
+
+    if (u->raw_downstream || u->body_downstream) {
+        ctx->downstream = u;
+    }
+
+    return lua_yield(L, 0);
+}
+
+
+static int
+ngx_http_lua_socket_tcp_receiveany(lua_State *L)
+{
+    int                                  n;
+    lua_Integer                          bytes;
+    ngx_http_request_t                  *r;
+    ngx_http_lua_loc_conf_t             *llcf;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
+
+    n = lua_gettop(L);
+    if (n != 2) {
+        return luaL_error(L, "expecting 2 arguments "
+                          "(including the object), but got %d", n);
+    }
+
+    r = ngx_http_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    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->read_closed) {
+
+        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:%d eof:%d",
+                          u, u ? u->peer.connection : NULL,
+                          u ? (int) u->ft_type : 0, u ? (int) u->eof : 0);
+        }
+
+        lua_pushnil(L);
+        lua_pushliteral(L, "closed");
+        return 2;
+    }
+
+    if (u->request != r) {
+        return luaL_error(L, "bad request");
+    }
+
+    ngx_http_lua_socket_check_busy_connecting(r, u, L);
+    ngx_http_lua_socket_check_busy_reading(r, u, L);
+
+    if (!lua_isnumber(L, 2)) {
+        return luaL_argerror(L, 2, "bad max argument");
+    }
+
+    bytes = lua_tointeger(L, 2);
+    if (bytes <= 0) {
+        return luaL_argerror(L, 2, "bad max argument");
+    }
+
+    u->input_filter = ngx_http_lua_socket_read_any;
+    u->rest = (size_t) bytes;
+    u->length = u->rest;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket calling receiveany() method to read at "
+                   "most %uz bytes", u->rest);
+
+    return ngx_http_lua_socket_tcp_receive_helper(r, u, L);
+}
+
+
 static int
 ngx_http_lua_socket_tcp_receive(lua_State *L)
 {
     ngx_http_request_t                  *r;
     ngx_http_lua_socket_tcp_upstream_t  *u;
-    ngx_int_t                            rc;
-    ngx_http_lua_ctx_t                  *ctx;
     int                                  n;
     ngx_str_t                            pat;
     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) {
@@ -1883,119 +2366,27 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
         u->rest = 0;
     }
 
-    u->input_filter_ctx = u;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (u->bufs_in == NULL) {
-        u->bufs_in =
-            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                            &ctx->free_recv_bufs,
-                                            u->conf->buffer_size);
-
-        if (u->bufs_in == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        u->buf_in = u->bufs_in;
-        u->buffer = *u->buf_in->buf;
-    }
-
-    dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
-
-    if (u->raw_downstream || u->body_downstream) {
-        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
-    }
-
-    u->read_waiting = 0;
-    u->read_co_ctx = NULL;
-
-    rc = ngx_http_lua_socket_tcp_read(r, u);
-
-    if (rc == NGX_ERROR) {
-        dd("read failed: %d", (int) u->ft_type);
-        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-        dd("tcp receive retval returned: %d", (int) rc);
-        return rc;
-    }
-
-    if (rc == NGX_OK) {
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket receive done in a single run");
-
-        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-    }
-
-    /* rc == NGX_AGAIN */
-
-    u->read_event_handler = ngx_http_lua_socket_read_handler;
-
-    coctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_coctx_cleanup;
-    coctx->data = u;
-
-    if (ctx->entered_content_phase) {
-        r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    u->read_co_ctx = coctx;
-    u->read_waiting = 1;
-    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
-
-    dd("setting data to %p, coctx:%p", u, coctx);
-
-    if (u->raw_downstream || u->body_downstream) {
-        ctx->downstream = u;
-    }
-
-    return lua_yield(L, 0);
+    return ngx_http_lua_socket_tcp_receive_helper(r, u, L);
 }
 
 
 static ngx_int_t
 ngx_http_lua_socket_read_chunk(void *data, ssize_t bytes)
 {
+    ngx_int_t                                rc;
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_buf_t                   *b;
-#if (NGX_DEBUG)
-    ngx_http_request_t          *r;
-
-    r = u->request;
-#endif
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
                    "lua tcp socket read chunk %z", bytes);
 
-    if (bytes == 0) {
+    rc = ngx_http_lua_read_bytes(&u->buffer, u->buf_in, &u->rest,
+                                 bytes, u->request->connection->log);
+    if (rc == NGX_ERROR) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
         return NGX_ERROR;
     }
 
-    b = &u->buffer;
-
-    if (bytes >= (ssize_t) u->rest) {
-
-        u->buf_in->buf->last += u->rest;
-        b->pos += u->rest;
-        u->rest = 0;
-
-        return NGX_OK;
-    }
-
-    /* bytes < u->rest */
-
-    u->buf_in->buf->last += bytes;
-    b->pos += bytes;
-    u->rest -= bytes;
-
-    return NGX_AGAIN;
+    return rc;
 }
 
 
@@ -2004,26 +2395,10 @@ ngx_http_lua_socket_read_all(void *data, ssize_t bytes)
 {
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_buf_t                   *b;
-#if (NGX_DEBUG)
-    ngx_http_request_t          *r;
-
-    r = u->request;
-#endif
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
                    "lua tcp socket read all");
-
-    if (bytes == 0) {
-        return NGX_OK;
-    }
-
-    b = &u->buffer;
-
-    u->buf_in->buf->last += bytes;
-    b->pos += bytes;
-
-    return NGX_AGAIN;
+    return ngx_http_lua_read_all(&u->buffer, u->buf_in, bytes,
+                                 u->request->connection->log);
 }
 
 
@@ -2032,72 +2407,40 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
 {
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_buf_t                   *b;
-    u_char                      *dst;
-    u_char                       c;
-#if (NGX_DEBUG)
-    u_char                      *begin;
-#endif
+    ngx_int_t                    rc;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
                    "lua tcp socket read line");
 
-    if (bytes == 0) {
+    rc = ngx_http_lua_read_line(&u->buffer, u->buf_in, bytes,
+                                u->request->connection->log);
+    if (rc == NGX_ERROR) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
         return NGX_ERROR;
     }
 
-    b = &u->buffer;
+    return rc;
+}
 
-#if (NGX_DEBUG)
-    begin = b->pos;
-#endif
 
-    dd("already read: %p: %.*s", u->buf_in,
-       (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
-       u->buf_in->buf->pos);
+static ngx_int_t
+ngx_http_lua_socket_read_any(void *data, ssize_t bytes)
+{
+    ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    dd("data read: %.*s", (int) bytes, b->pos);
+    ngx_int_t                    rc;
 
-    dst = u->buf_in->buf->last;
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+                   "lua tcp socket read any");
 
-    while (bytes--) {
-
-        c = *b->pos++;
-
-        switch (c) {
-        case '\n':
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                           "lua tcp socket read the final line part: \"%*s\"",
-                           b->pos - 1 - begin, begin);
-
-            u->buf_in->buf->last = dst;
-
-            dd("read a line: %p: %.*s", u->buf_in,
-               (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
-               u->buf_in->buf->pos);
-
-            return NGX_OK;
-
-        case '\r':
-            /* ignore it */
-            break;
-
-        default:
-            *dst++ = c;
-            break;
-        }
+    rc = ngx_http_lua_read_any(&u->buffer, u->buf_in, &u->rest, bytes,
+                               u->request->connection->log);
+    if (rc == NGX_ERROR) {
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
+        return NGX_ERROR;
     }
 
-#if (NGX_DEBUG)
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "lua tcp socket read partial line data: %*s",
-                   dst - begin, begin);
-#endif
-
-    u->buf_in->buf->last = dst;
-
-    return NGX_AGAIN;
+    return rc;
 }
 
 
@@ -3539,6 +3882,267 @@ ngx_http_lua_socket_tcp_finalize_write_part(ngx_http_request_t *r,
 }
 
 
+static void
+ngx_http_lua_socket_tcp_conn_op_timeout_handler(ngx_event_t *ev)
+{
+    ngx_http_lua_socket_tcp_upstream_t      *u;
+    ngx_http_lua_ctx_t                      *ctx;
+    ngx_connection_t                        *c;
+    ngx_http_request_t                      *r;
+    ngx_http_lua_co_ctx_t                   *coctx;
+    ngx_http_lua_loc_conf_t                 *llcf;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+
+    conn_op_ctx = ev->data;
+    ngx_queue_remove(&conn_op_ctx->queue);
+
+    u = conn_op_ctx->u;
+    r = u->request;
+
+    coctx = u->write_co_ctx;
+    coctx->cleanup = NULL;
+    /* note that we store conn_op_ctx in coctx->data instead of u */
+    coctx->data = conn_op_ctx;
+    u->write_co_ctx = 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,
+                      "lua tcp socket queued connect timed out,"
+                      " when trying to connect to %V:%ud",
+                      &conn_op_ctx->host, conn_op_ctx->port);
+    }
+
+    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
+                          &conn_op_ctx->queue);
+    u->socket_pool->connections--;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    ctx->cur_co_ctx = coctx;
+
+    ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
+                        || coctx->co_ref >= 0));
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket waking up the current request");
+
+    u->write_prepare_retvals =
+        ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler;
+
+    c = r->connection;
+
+    if (ctx->entered_content_phase) {
+        (void) ngx_http_lua_socket_tcp_conn_op_resume(r);
+
+    } else {
+        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_op_resume;
+        ngx_http_core_run_phases(r);
+    }
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+static int
+ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
+{
+    lua_pushnil(L);
+    lua_pushliteral(L, "timeout");
+    return 2;
+}
+
+
+static void
+ngx_http_lua_socket_tcp_resume_conn_op(ngx_http_lua_socket_pool_t *spool)
+{
+    ngx_queue_t                             *q;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+
+#if (NGX_DEBUG)
+    ngx_http_lua_assert(spool->connections >= 0);
+
+#else
+    if (spool->connections < 0) {
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                      "lua tcp socket connections count mismatched for "
+                      "connection pool \"%s\", connections: %i, size: %i",
+                      spool->key, spool->connections, spool->size);
+        spool->connections = 0;
+    }
+#endif
+
+    /* we manually destroy wait_connect_op before triggering connect
+     * operation resumption, so that there is no resumption happens when Nginx
+     * is exiting.
+     */
+    if (ngx_queue_empty(&spool->wait_connect_op)) {
+        return;
+    }
+
+    q = ngx_queue_head(&spool->wait_connect_op);
+    conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
+                                 queue);
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua tcp socket post connect operation resumption "
+                   "u: %p, ctx: %p for connection pool \"%s\", "
+                   "connections: %i",
+                   conn_op_ctx->u, conn_op_ctx, spool->key, spool->connections);
+
+    if (conn_op_ctx->event.timer_set) {
+        ngx_del_timer(&conn_op_ctx->event);
+    }
+
+    conn_op_ctx->event.handler =
+        ngx_http_lua_socket_tcp_conn_op_resume_handler;
+
+    ngx_post_event((&conn_op_ctx->event), &ngx_posted_events);
+}
+
+
+static void
+ngx_http_lua_socket_tcp_conn_op_ctx_cleanup(void *data)
+{
+    ngx_http_lua_socket_tcp_upstream_t     *u;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t  *conn_op_ctx = data;
+
+    u = conn_op_ctx->u;
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+                   "cleanup lua tcp socket conn_op_ctx: \"%V\"",
+                   &u->request->uri);
+
+    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
+                          &conn_op_ctx->queue);
+}
+
+
+static void
+ngx_http_lua_socket_tcp_conn_op_resume_handler(ngx_event_t *ev)
+{
+    ngx_queue_t                             *q;
+    ngx_connection_t                        *c;
+    ngx_http_lua_ctx_t                      *ctx;
+    ngx_http_request_t                      *r;
+    ngx_http_cleanup_t                      *cln;
+    ngx_http_lua_co_ctx_t                   *coctx;
+    ngx_http_lua_socket_pool_t              *spool;
+    ngx_http_lua_socket_tcp_upstream_t      *u;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+
+    conn_op_ctx = ev->data;
+    u = conn_op_ctx->u;
+    r = u->request;
+    spool = u->socket_pool;
+
+    if (ngx_queue_empty(&spool->wait_connect_op)) {
+#if (NGX_DEBUG)
+        ngx_http_lua_assert(!(spool->backlog >= 0
+                              && spool->connections > spool->size));
+
+#else
+        if (spool->backlog >= 0 && spool->connections > spool->size) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                          "lua tcp socket connections count mismatched for "
+                          "connection pool \"%s\", connections: %i, size: %i",
+                          spool->key, spool->connections, spool->size);
+            spool->connections = spool->size;
+        }
+#endif
+
+        return;
+    }
+
+    q = ngx_queue_head(&spool->wait_connect_op);
+    ngx_queue_remove(q);
+
+    coctx = u->write_co_ctx;
+    coctx->cleanup = NULL;
+    /* note that we store conn_op_ctx in coctx->data instead of u */
+    coctx->data = conn_op_ctx;
+    /* clear ngx_http_lua_tcp_queue_conn_op_cleanup */
+    u->write_co_ctx = NULL;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        ngx_queue_insert_head(&spool->cache_connect_op,
+                              &conn_op_ctx->queue);
+        return;
+    }
+
+    ctx->cur_co_ctx = coctx;
+
+    ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
+                        || coctx->co_ref >= 0));
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket waking up the current request");
+
+    u->write_prepare_retvals =
+        ngx_http_lua_socket_tcp_conn_op_resume_retval_handler;
+
+    c = r->connection;
+
+    if (ctx->entered_content_phase) {
+        (void) ngx_http_lua_socket_tcp_conn_op_resume(r);
+
+    } else {
+        cln = ngx_http_lua_cleanup_add(r, 0);
+        if (cln != NULL) {
+            cln->handler = ngx_http_lua_socket_tcp_conn_op_ctx_cleanup;
+            cln->data = conn_op_ctx;
+            conn_op_ctx->cleanup = &cln->handler;
+        }
+
+        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_op_resume;
+        ngx_http_core_run_phases(r);
+    }
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+static int
+ngx_http_lua_socket_tcp_conn_op_resume_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
+{
+    int                                      nret;
+    ngx_http_lua_ctx_t                      *ctx;
+    ngx_http_lua_co_ctx_t                   *coctx;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    coctx = ctx->cur_co_ctx;
+    dd("coctx: %p", coctx);
+    conn_op_ctx = coctx->data;
+    if (conn_op_ctx->cleanup != NULL) {
+        *conn_op_ctx->cleanup = NULL;
+        ngx_http_lua_cleanup_free(r, conn_op_ctx->cleanup);
+        conn_op_ctx->cleanup = NULL;
+    }
+
+    /* decrease pending connect operation counter */
+    u->socket_pool->connections--;
+
+    nret = ngx_http_lua_socket_tcp_connect_helper(L, u, r, ctx,
+                                                  conn_op_ctx->host.data,
+                                                  conn_op_ctx->host.len,
+                                                  conn_op_ctx->port, 1);
+    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
+                          &conn_op_ctx->queue);
+
+    return nret;
+}
+
+
 static void
 ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u)
@@ -3589,21 +4193,21 @@ ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
 
         ngx_http_lua_socket_tcp_close_connection(c);
         u->peer.connection = NULL;
-
-        if (!u->reused) {
-            return;
-        }
+        u->conn_closed = 1;
 
         spool = u->socket_pool;
         if (spool == NULL) {
             return;
         }
 
-        spool->active_connections--;
+        spool->connections--;
 
-        if (spool->active_connections == 0) {
+        if (spool->connections == 0) {
             ngx_http_lua_socket_free_pool(r->connection->log, spool);
+            return;
         }
+
+        ngx_http_lua_socket_tcp_resume_conn_op(spool);
     }
 }
 
@@ -3775,7 +4379,8 @@ ngx_http_lua_socket_tcp_receiveuntil(lua_State *L)
         return luaL_error(L, "no memory");
     }
 
-    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          pattern_udata_metatable_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -4430,10 +5035,12 @@ ngx_http_lua_req_socket(lua_State *L)
     lua_createtable(L, 2 /* narr */, 3 /* nrec */); /* the object */
 
     if (raw) {
-        lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              raw_req_socket_metatable_key));
 
     } else {
-        lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              req_socket_metatable_key));
     }
 
     lua_rawget(L, LUA_REGISTRYINDEX);
@@ -4445,7 +5052,8 @@ ngx_http_lua_req_socket(lua_State *L)
     }
 
 #if 1
-    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          downstream_udata_metatable_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 #endif
@@ -4572,20 +5180,18 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     ngx_http_lua_socket_tcp_upstream_t  *u;
     ngx_connection_t                    *c;
     ngx_http_lua_socket_pool_t          *spool;
-    size_t                               size, key_len;
     ngx_str_t                            key;
-    ngx_uint_t                           i;
     ngx_queue_t                         *q;
     ngx_peer_connection_t               *pc;
-    u_char                              *p;
     ngx_http_request_t                  *r;
     ngx_msec_t                           timeout;
-    ngx_uint_t                           pool_size;
+    ngx_int_t                            pool_size;
     int                                  n;
     ngx_int_t                            rc;
     ngx_buf_t                           *b;
+    const char                          *msg;
 
-    ngx_http_lua_socket_pool_item_t     *items, *item;
+    ngx_http_lua_socket_pool_item_t     *item;
 
     n = lua_gettop(L);
 
@@ -4596,17 +5202,6 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
 
     luaL_checktype(L, 1, LUA_TTABLE);
 
-    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);
-    if (key.data == NULL) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key not found");
-        return 2;
-    }
-
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
     lua_pop(L, 1);
@@ -4617,7 +5212,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         return 2;
     }
 
-    /* stack: obj cache key */
+    /* stack: obj timeout? size? */
 
     pc = &u->peer;
     c = pc->connection;
@@ -4669,9 +5264,32 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         return 2;
     }
 
+    if (ngx_terminate || ngx_exiting) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                       "lua tcp socket set keepalive while process exiting, "
+                       "closing connection %p", c);
+
+        ngx_http_lua_socket_tcp_finalize(r, u);
+        lua_pushinteger(L, 1);
+        return 1;
+    }
+
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket set keepalive: saving connection %p", c);
 
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
+    lua_rawget(L, LUA_REGISTRYINDEX);
+
+    /* stack: obj timeout? size? pools */
+
+    lua_rawgeti(L, 1, SOCKET_KEY_INDEX);
+    key.data = (u_char *) lua_tolstring(L, -1, &key.len);
+    if (key.data == NULL) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "key not found");
+        return 2;
+    }
+
     dd("saving connection to key %s", lua_tostring(L, -1));
 
     lua_pushvalue(L, -1);
@@ -4679,7 +5297,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     spool = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    /* stack: obj timeout? size? cache key */
+    /* stack: obj timeout? size? pools cache_key */
 
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
@@ -4693,82 +5311,49 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
             pool_size = llcf->pool_size;
         }
 
-        if (pool_size == 0) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "zero pool size");
-            return 2;
+        if (pool_size <= 0) {
+            msg = lua_pushfstring(L, "bad \"pool_size\" option value: %i",
+                                  pool_size);
+            return luaL_argerror(L, n, msg);
         }
 
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket connection pool size: %ui", pool_size);
-
-        key_len = ngx_align(key.len + 1, sizeof(void *));
-
-        size = sizeof(ngx_http_lua_socket_pool_t) + key_len - 1
-               + sizeof(ngx_http_lua_socket_pool_item_t)
-               * pool_size;
-
-        spool = lua_newuserdata(L, size);
-        if (spool == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
-        lua_rawget(L, LUA_REGISTRYINDEX);
-        lua_setmetatable(L, -2);
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "lua tcp socket keepalive create connection pool for key"
-                       " \"%s\"", lua_tostring(L, -2));
-
-        lua_rawset(L, -3);
-
-        spool->active_connections = 0;
-        spool->lua_vm = ngx_http_lua_get_lua_vm(r, NULL);
-
-        ngx_queue_init(&spool->cache);
-        ngx_queue_init(&spool->free);
-
-        p = ngx_copy(spool->key, key.data, key.len);
-        *p++ = '\0';
-
-        items = (ngx_http_lua_socket_pool_item_t *) (spool->key + key_len);
-
-        dd("items: %p", items);
-
-        ngx_http_lua_assert((void *) items == ngx_align_ptr(items,
-                                                            sizeof(void *)));
-
-        for (i = 0; i < pool_size; i++) {
-            ngx_queue_insert_head(&spool->free, &items[i].queue);
-            items[i].socket_pool = spool;
-        }
+        ngx_http_lua_socket_tcp_create_socket_pool(L, r, key, pool_size, -1,
+                                                   &spool);
     }
 
     if (ngx_queue_empty(&spool->free)) {
 
         q = ngx_queue_last(&spool->cache);
         ngx_queue_remove(q);
-        spool->active_connections--;
 
         item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
 
         ngx_http_lua_socket_tcp_close_connection(item->connection);
 
+        /* only decrease the counter for connections which were counted */
+        if (u->socket_pool != NULL) {
+            u->socket_pool->connections--;
+        }
+
     } else {
         q = ngx_queue_head(&spool->free);
         ngx_queue_remove(q);
 
         item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
+
+        /* we should always increase connections after getting connected,
+         * and decrease connections after getting closed.
+         * however, we don't create connection pool in previous connect method.
+         * so we increase connections here for backward compatibility.
+         */
+        if (u->socket_pool == NULL) {
+            spool->connections++;
+        }
     }
 
     item->connection = c;
     ngx_queue_insert_head(&spool->cache, q);
 
-    if (!u->reused) {
-        spool->active_connections++;
-    }
-
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket clear current socket connection");
 
@@ -4837,48 +5422,33 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     ngx_http_lua_socket_tcp_finalize(r, u);
 #endif
 
+    /* since we set u->peer->connection to NULL previously, the connect
+     * operation won't be resumed in the ngx_http_lua_socket_tcp_finalize.
+     * Therefore we need to resume it here.
+     */
+    ngx_http_lua_socket_tcp_resume_conn_op(spool);
+
     lua_pushinteger(L, 1);
     return 1;
 }
 
 
 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_tcp_upstream_t *u)
+ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_http_lua_socket_pool_item_t     *item;
     ngx_http_lua_socket_pool_t          *spool;
     ngx_http_cleanup_t                  *cln;
     ngx_queue_t                         *q;
-    int                                  top;
     ngx_peer_connection_t               *pc;
     ngx_connection_t                    *c;
 
-    top = lua_gettop(L);
-
-    if (key_index < 0) {
-        key_index = top + key_index + 1;
-    }
-
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua tcp socket pool get keepalive peer");
 
     pc = &u->peer;
-
-    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 tcp socket keepalive connection pool not found");
-        lua_settop(L, top);
-        return NGX_DECLINED;
-    }
-
-    u->socket_pool = spool;
+    spool = u->socket_pool;
 
     if (!ngx_queue_empty(&spool->cache)) {
         q = ngx_queue_head(&spool->cache);
@@ -4923,7 +5493,6 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
             cln = ngx_http_lua_cleanup_add(r, 0);
             if (cln == NULL) {
                 u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-                lua_settop(L, top);
                 return NGX_ERROR;
             }
 
@@ -4932,16 +5501,12 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
             u->cleanup = &cln->handler;
         }
 
-        lua_settop(L, top);
-
         return NGX_OK;
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket keepalive: connection pool empty");
 
-    lua_settop(L, top);
-
     return NGX_DECLINED;
 }
 
@@ -5013,13 +5578,15 @@ close:
 
     ngx_queue_remove(&item->queue);
     ngx_queue_insert_head(&spool->free, &item->queue);
-    spool->active_connections--;
+    spool->connections--;
 
-    dd("keepalive: active connections: %u",
-       (unsigned) spool->active_connections);
+    dd("keepalive: connections: %u", (unsigned) spool->connections);
 
-    if (spool->active_connections == 0) {
+    if (spool->connections == 0) {
         ngx_http_lua_socket_free_pool(ev->log, spool);
+
+    } else {
+        ngx_http_lua_socket_tcp_resume_conn_op(spool);
     }
 
     return NGX_DECLINED;
@@ -5037,7 +5604,7 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 
     L = spool->lua_vm;
 
-    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushstring(L, (char *) spool->key);
     lua_pushnil(L);
@@ -5049,9 +5616,10 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 static void
 ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
 {
-    ngx_queue_t                         *q;
-    ngx_connection_t                    *c;
-    ngx_http_lua_socket_pool_item_t     *item;
+    ngx_queue_t                             *q;
+    ngx_connection_t                        *c;
+    ngx_http_lua_socket_pool_item_t         *item;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
 
     while (!ngx_queue_empty(&spool->cache)) {
         q = ngx_queue_head(&spool->cache);
@@ -5065,7 +5633,29 @@ ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
         ngx_queue_insert_head(&spool->free, q);
     }
 
-    spool->active_connections = 0;
+    while (!ngx_queue_empty(&spool->cache_connect_op)) {
+        q = ngx_queue_head(&spool->cache_connect_op);
+        ngx_queue_remove(q);
+        conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
+                                     queue);
+        ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx);
+    }
+
+    while (!ngx_queue_empty(&spool->wait_connect_op)) {
+        q = ngx_queue_head(&spool->wait_connect_op);
+        ngx_queue_remove(q);
+        conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
+                                     queue);
+
+        if (conn_op_ctx->event.timer_set) {
+            ngx_del_timer(&conn_op_ctx->event);
+        }
+
+        ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx);
+    }
+
+    /* spool->connections will be decreased down to zero in
+     * ngx_http_lua_socket_tcp_finalize */
 }
 
 
@@ -5319,6 +5909,13 @@ static ngx_int_t ngx_http_lua_socket_insert_buffer(ngx_http_request_t *r,
 }
 
 
+static ngx_int_t
+ngx_http_lua_socket_tcp_conn_op_resume(ngx_http_request_t *r)
+{
+    return ngx_http_lua_socket_tcp_resume_helper(r, SOCKET_OP_RESUME_CONN);
+}
+
+
 static ngx_int_t
 ngx_http_lua_socket_tcp_conn_resume(ngx_http_request_t *r)
 {
@@ -5343,13 +5940,14 @@ ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 {
-    int                          nret;
-    lua_State                   *vm;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_connection_t            *c;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
+    int                                    nret;
+    lua_State                             *vm;
+    ngx_int_t                              rc;
+    ngx_uint_t                             nreqs;
+    ngx_connection_t                      *c;
+    ngx_http_lua_ctx_t                    *ctx;
+    ngx_http_lua_co_ctx_t                 *coctx;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t *conn_op_ctx;
 
     ngx_http_lua_socket_tcp_retval_handler  prepare_retvals;
 
@@ -5369,15 +5967,22 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 
     dd("coctx: %p", coctx);
 
-    u = coctx->data;
-
     switch (socket_op) {
+
+    case SOCKET_OP_RESUME_CONN:
+        conn_op_ctx = coctx->data;
+        u = conn_op_ctx->u;
+        prepare_retvals = u->write_prepare_retvals;
+        break;
+
     case SOCKET_OP_CONNECT:
     case SOCKET_OP_WRITE:
+        u = coctx->data;
         prepare_retvals = u->write_prepare_retvals;
         break;
 
     case SOCKET_OP_READ:
+        u = coctx->data;
         prepare_retvals = u->read_prepare_retvals;
         break;
 
@@ -5391,6 +5996,15 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
                    "u:%p", prepare_retvals, u);
 
     nret = prepare_retvals(r, u, ctx->cur_co_ctx->co);
+    if (socket_op == SOCKET_OP_CONNECT
+        && nret > 1
+        && !u->conn_closed
+        && u->socket_pool != NULL)
+    {
+        u->socket_pool->connections--;
+        ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
+    }
+
     if (nret == NGX_AGAIN) {
         return NGX_DONE;
     }
@@ -5422,6 +6036,36 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 }
 
 
+static void
+ngx_http_lua_tcp_queue_conn_op_cleanup(void *data)
+{
+    ngx_http_lua_co_ctx_t                  *coctx = data;
+    ngx_http_lua_socket_tcp_upstream_t     *u;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t  *conn_op_ctx;
+
+    conn_op_ctx = coctx->data;
+    u = conn_op_ctx->u;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua tcp socket abort queueing, conn_op_ctx: %p, u: %p",
+                   conn_op_ctx, u);
+
+    if (conn_op_ctx->event.posted) {
+        ngx_delete_posted_event(&conn_op_ctx->event);
+
+    } else if (conn_op_ctx->event.timer_set) {
+        ngx_del_timer(&conn_op_ctx->event);
+    }
+
+    ngx_queue_remove(&conn_op_ctx->queue);
+    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
+                          &conn_op_ctx->queue);
+
+    u->socket_pool->connections--;
+    ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
+}
+
+
 static void
 ngx_http_lua_tcp_resolve_cleanup(void *data)
 {
@@ -5437,6 +6081,11 @@ ngx_http_lua_tcp_resolve_cleanup(void *data)
         return;
     }
 
+    if (u->socket_pool != NULL) {
+        u->socket_pool->connections--;
+        ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
+    }
+
     rctx = u->resolved->ctx;
     if (rctx == NULL) {
         return;
@@ -5496,7 +6145,8 @@ ngx_http_lua_cleanup_conn_pools(lua_State *L)
 {
     ngx_http_lua_socket_pool_t          *spool;
 
-    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          socket_pool_key));
     lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
     lua_pushnil(L);  /* first key */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
index dbdee41..091e437 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
@@ -35,17 +35,39 @@ 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 {
+    ngx_event_t                         event;
+    ngx_queue_t                         queue;
+    ngx_str_t                           host;
+    ngx_http_cleanup_pt                *cleanup;
+    ngx_http_lua_socket_tcp_upstream_t *u;
+    in_port_t                           port;
+} ngx_http_lua_socket_tcp_conn_op_ctx_t;
+
+
+#define ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx)                \
+    ngx_free(conn_op_ctx->host.data);                                        \
+    ngx_free(conn_op_ctx)
+
+
 typedef struct {
     lua_State                         *lua_vm;
 
-    /* active connections == out-of-pool reused connections
-     *                       + in-pool connections */
-    ngx_uint_t                         active_connections;
+    ngx_int_t                          size;
+    ngx_queue_t                        cache_connect_op;
+    ngx_queue_t                        wait_connect_op;
+
+    /* connections == active connections + pending connect operations,
+     * while active connections == out-of-pool reused connections
+     *                             + in-pool connections */
+    ngx_int_t                          connections;
 
     /* queues of ngx_http_lua_socket_pool_item_t: */
     ngx_queue_t                        cache;
     ngx_queue_t                        free;
 
+    ngx_int_t                          backlog;
+
     u_char                             key[1];
 
 } ngx_http_lua_socket_pool_t;
@@ -104,6 +126,7 @@ struct ngx_http_lua_socket_tcp_upstream_s {
     unsigned                         raw_downstream:1;
     unsigned                         read_closed:1;
     unsigned                         write_closed:1;
+    unsigned                         conn_closed:1;
 #if (NGX_HTTP_SSL)
     unsigned                         ssl_verify:1;
     unsigned                         ssl_session_reuse:1;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
index 8927f41..cbc32d6 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
@@ -81,7 +81,8 @@ ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
     lua_setfield(L, -2, "udp"); /* ngx socket */
 
     /* udp socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          socket_udp_metatable_key));
     lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_udp_setpeername);
@@ -105,7 +106,8 @@ ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* udp socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          udp_udata_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_udp_upstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -144,7 +146,8 @@ ngx_http_lua_socket_udp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     lua_createtable(L, 3 /* narr */, 1 /* nrec */);
-    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          socket_udp_metatable_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -263,7 +266,8 @@ ngx_http_lua_socket_udp_setpeername(lua_State *L)
         }
 
 #if 1
-        lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              udp_udata_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
 #endif
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
index 453a5c7..622d0a5 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
@@ -498,9 +498,11 @@ ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /* save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
index 0b88a87..303efb4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
@@ -505,9 +505,11 @@ ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /* save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
index 7609c39..a02f729 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
@@ -380,6 +380,8 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     /* init nginx context in Lua VM */
     ngx_http_lua_set_req(L, r);
+
+#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ make new env inheriting main thread's globals table */
@@ -390,6 +392,7 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif
 
     lua_pushcfunction(L, ngx_http_lua_traceback);
     lua_insert(L, 1);  /* put it under chunk and args */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_string.c b/debian/modules/http-lua/src/ngx_http_lua_string.c
index 239b232..bdadeb4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_string.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_string.c
@@ -762,6 +762,20 @@ ngx_http_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst)
     ngx_http_lua_escape_uri(dst, (u_char *) src, len, NGX_ESCAPE_URI_COMPONENT);
 }
 
+
+void
+ngx_http_lua_ffi_str_replace_char(u_char *buf, size_t len, const u_char find,
+    const u_char replace)
+{
+    while (len) {
+        if (*buf == find) {
+            *buf = replace;
+        }
+
+        buf++;
+        len--;
+    }
+}
 #endif
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
index 826a43c..f312b65 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
@@ -1031,6 +1031,14 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
     dd("pr_coctx status: %d", (int) pr_coctx->sr_statuses[ctx->index]);
 
     /* copy subrequest response headers */
+    if (ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r, ctx);
+        if (rc != NGX_OK) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "failed to set default content type: %i", rc);
+            return NGX_ERROR;
+        }
+    }
 
     pr_coctx->sr_headers[ctx->index] = &r->headers_out;
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_timer.c b/debian/modules/http-lua/src/ngx_http_lua_timer.c
index 596b2f7..e92c211 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_timer.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_timer.c
@@ -220,6 +220,7 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
 
     ngx_http_lua_probe_user_coroutine_create(r, L, co);
 
+#ifndef OPENRESTY_LUAJIT
     lua_createtable(co, 0, 0);  /* the new globals table */
 
     /* co stack: global_tb */
@@ -232,6 +233,7 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
     /* co stack: global_tb */
 
     ngx_http_lua_set_globals_table(co);
+#endif
 
     /* co stack: <empty> */
 
@@ -251,12 +253,15 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
     /* L stack: time func [args] thread */
     /* co stack: func */
 
+#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /* co stack: func */
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     /* L stack: time func [args] thread coroutines */
@@ -345,6 +350,9 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
 
     ngx_add_timer(ev, delay);
 
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "created timer (co: %p delay: %M ms)", tctx->co, delay);
+
     lua_pushinteger(L, 1);
     return 1;
 
@@ -358,7 +366,8 @@ nomem:
         ngx_free(ev);
     }
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     luaL_unref(L, -1, co_ref);
 
@@ -387,6 +396,7 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
 
     co = lua_newthread(vm);
 
+#ifndef OPENRESTY_LUAJIT
     lua_createtable(co, 0, 0);  /* the new globals table */
 
     /* co stack: global_tb */
@@ -399,6 +409,7 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
     /* co stack: global_tb */
 
     ngx_http_lua_set_globals_table(co);
+#endif
 
     /* co stack: <empty> */
 
@@ -418,12 +429,15 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
     /* L stack: func [args] thread */
     /* co stack: func */
 
+#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /* co stack: func */
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     /* L stack: func [args] thread coroutines */
@@ -498,6 +512,10 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
 
     ngx_add_timer(ev, tctx->delay);
 
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "created next timer (co: %p delay: %M ms)", tctx->co,
+                   tctx->delay);
+
     return NGX_OK;
 
 nomem:
@@ -512,7 +530,8 @@ nomem:
 
     /* L stack: func [args] */
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     luaL_unref(L, -1, co_ref);
 
@@ -568,6 +587,9 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     c = ngx_http_lua_create_fake_connection(tctx.pool);
     if (c == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "failed to create fake connection to run timer (co: %p)",
+                      tctx.co);
         goto failed;
     }
 
@@ -579,6 +601,9 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     r = ngx_http_lua_create_fake_request(c);
     if (r == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "failed to create fake request to run timer (co: %p)",
+                      tctx.co);
         goto failed;
     }
 
@@ -614,6 +639,8 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     ctx = ngx_http_lua_create_ctx(r);
     if (ctx == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "failed to create ctx to run timer (co: %p)", tctx.co);
         goto failed;
     }
 
@@ -622,6 +649,9 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
         pcln = ngx_pool_cleanup_add(r->pool, 0);
         if (pcln == NULL) {
+            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                          "failed to add vm cleanup to run timer (co: %p)",
+                          tctx.co);
             goto failed;
         }
 
@@ -635,6 +665,9 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     cln = ngx_http_cleanup_add(r, 0);
     if (cln == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "failed to add request cleanup to run timer (co: %p)",
+                      tctx.co);
         goto failed;
     }
 
@@ -692,7 +725,8 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 failed:
 
     if (tctx.co_ref && tctx.co) {
-        lua_pushlightuserdata(tctx.co, &ngx_http_lua_coroutines_key);
+        lua_pushlightuserdata(tctx.co, ngx_http_lua_lightudata_mask(
+                              coroutines_key));
         lua_rawget(tctx.co, LUA_REGISTRYINDEX);
         luaL_unref(tctx.co, -1, tctx.co_ref);
         lua_settop(tctx.co, 0);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_uthread.c b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
index 8195ec0..43517a0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_uthread.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
@@ -70,7 +70,8 @@ ngx_http_lua_uthread_spawn(lua_State *L)
 
     /* anchor the newly created coroutine into the Lua registry */
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushvalue(L, -2);
     coctx->co_ref = luaL_ref(L, -2);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.c b/debian/modules/http-lua/src/ngx_http_lua_util.c
index f7a537e..c12262e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.c
@@ -70,6 +70,25 @@
 #endif
 
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+#define NGX_HTTP_LUA_SA_RESTART_SIGS {                                       \
+    ngx_signal_value(NGX_RECONFIGURE_SIGNAL),                                \
+    ngx_signal_value(NGX_REOPEN_SIGNAL),                                     \
+    ngx_signal_value(NGX_NOACCEPT_SIGNAL),                                   \
+    ngx_signal_value(NGX_TERMINATE_SIGNAL),                                  \
+    ngx_signal_value(NGX_SHUTDOWN_SIGNAL),                                   \
+    ngx_signal_value(NGX_CHANGEBIN_SIGNAL),                                  \
+    SIGALRM,                                                                 \
+    SIGINT,                                                                  \
+    SIGIO,                                                                   \
+    SIGCHLD,                                                                 \
+    SIGSYS,                                                                  \
+    SIGPIPE,                                                                 \
+    0                                                                        \
+};
+#endif
+
+
 char ngx_http_lua_code_cache_key;
 char ngx_http_lua_regex_cache_key;
 char ngx_http_lua_socket_pool_key;
@@ -128,6 +147,13 @@ static int ngx_http_lua_get_raw_phase_context(lua_State *L);
 #define LUA_PATH_SEP ";"
 #endif
 
+
+#if !defined(LUA_DEFAULT_PATH) && (NGX_DEBUG)
+#define LUA_DEFAULT_PATH "../lua-resty-core/lib/?.lua;"                      \
+                         "../lua-resty-lrucache/lib/?.lua"
+#endif
+
+
 #define AUX_MARK "\1"
 
 
@@ -171,6 +197,7 @@ ngx_http_lua_set_path(ngx_cycle_t *cycle, lua_State *L, int tab_idx,
 }
 
 
+#ifndef OPENRESTY_LUAJIT
 /**
  * Create new table and set _G field to itself.
  *
@@ -185,6 +212,7 @@ ngx_http_lua_create_new_globals_table(lua_State *L, int narr, int nrec)
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "_G");
 }
+#endif /* OPENRESTY_LUAJIT */
 
 
 static lua_State *
@@ -313,11 +341,13 @@ ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
 
     base = lua_gettop(L);
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     co = lua_newthread(L);
 
+#ifndef OPENRESTY_LUAJIT
     /*  {{{ inherit coroutine's globals to main thread's globals table
      *  for print() function will try to find tostring() in current
      *  globals table.
@@ -332,6 +362,7 @@ ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
 
     ngx_http_lua_set_globals_table(co);
     /*  }}} */
+#endif /* OPENRESTY_LUAJIT */
 
     *ref = luaL_ref(L, -2);
 
@@ -356,7 +387,8 @@ ngx_http_lua_del_thread(ngx_http_request_t *r, lua_State *L,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua deleting light thread");
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
@@ -408,7 +440,9 @@ ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
             r->headers_out.status = NGX_HTTP_OK;
         }
 
-        if (!ctx->headers_set && ngx_http_lua_set_content_type(r) != NGX_OK) {
+        if (!ctx->mime_set
+            && ngx_http_lua_set_content_type(r, ctx) != NGX_OK)
+        {
             return NGX_ERROR;
         }
 
@@ -657,7 +691,8 @@ ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log)
 
     /* {{{ register a table to anchor lua coroutines reliably:
      * {([int]ref) = [cort]} */
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_createtable(L, 0, 32 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
@@ -668,20 +703,23 @@ ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log)
     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_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          socket_pool_key));
     lua_createtable(L, 0, 8 /* nrec */);
     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_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          regex_cache_key));
     lua_createtable(L, 0, 16 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
 #endif
 
     /* {{{ register table to cache user code:
      * { [(string)cache_key] = <code closure> } */
-    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          code_cache_key));
     lua_createtable(L, 0, 8 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
@@ -695,9 +733,6 @@ ngx_http_lua_init_globals(lua_State *L, ngx_cycle_t *cycle,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
                    "lua initializing lua globals");
 
-    lua_pushlightuserdata(L, cycle);
-    lua_setglobal(L, "__ngx_cycle");
-
 #if defined(NDK) && NDK
     ngx_http_lua_inject_ndk_api(L);
 #endif /* defined(NDK) && NDK */
@@ -756,6 +791,52 @@ ngx_http_lua_inject_ngx_api(lua_State *L, ngx_http_lua_main_conf_t *lmcf,
     lua_setglobal(L, "ngx");
 
     ngx_http_lua_inject_coroutine_api(log, L);
+
+#ifdef OPENRESTY_LUAJIT
+    {
+        int         rc;
+
+        const char buf[] =
+            "local ngx_log = ngx.log\n"
+            "local ngx_WARN = ngx.WARN\n"
+            "local tostring = tostring\n"
+            "local ngx_get_phase = ngx.get_phase\n"
+            "local traceback = require 'debug'.traceback\n"
+            "local function newindex(table, key, value)\n"
+                "rawset(table, key, value)\n"
+                "local phase = ngx_get_phase()\n"
+                "if phase == 'init_worker' or phase == 'init' then\n"
+                    "return\n"
+                "end\n"
+                "ngx_log(ngx_WARN, 'writing a global lua variable "
+                         "(\\'', tostring(key), '\\') which may lead to "
+                         "race conditions between concurrent requests, so "
+                         "prefer the use of \\'local\\' variables', "
+                         "traceback('', 2))\n"
+            "end\n"
+            "setmetatable(_G, { __newindex = newindex })\n"
+            ;
+
+        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "=_G write guard");
+
+        if (rc != 0) {
+            ngx_log_error(NGX_LOG_ERR, log, 0,
+                          "failed to load Lua code (%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 Lua code (%i): %s",
+                          rc, lua_tostring(L, -1));
+            lua_pop(L, 1);
+        }
+    }
+#endif
 }
 
 
@@ -2954,12 +3035,12 @@ ngx_http_lua_param_get(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_BODY_FILTER);
 
     if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SET)) {
-        return ngx_http_lua_setby_param_get(L);
+        return ngx_http_lua_setby_param_get(L, r);
     }
 
     /* ctx->context & (NGX_HTTP_LUA_CONTEXT_BODY_FILTER) */
 
-    return ngx_http_lua_body_filter_param_get(L);
+    return ngx_http_lua_body_filter_param_get(L, r);
 }
 
 
@@ -3156,7 +3237,8 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
 
         ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
-        lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              coroutines_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         inited = 1;
 
@@ -3194,7 +3276,8 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
                 ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
                 if (!inited) {
-                    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+                    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                                          coroutines_key));
                     lua_rawget(L, LUA_REGISTRYINDEX);
                     inited = 1;
                 }
@@ -3223,7 +3306,8 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
         ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
         if (!inited) {
-            lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+            lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                                  coroutines_key));
             lua_rawget(L, LUA_REGISTRYINDEX);
             inited = 1;
         }
@@ -3736,6 +3820,7 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
     ngx_pool_t *pool, ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log,
     ngx_pool_cleanup_t **pcln)
 {
+    int                              rc;
     lua_State                       *L;
     ngx_uint_t                       i;
     ngx_pool_cleanup_t              *cln;
@@ -3778,6 +3863,11 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
         *pcln = cln;
     }
 
+#ifdef OPENRESTY_LUAJIT
+    /* load FFI library first since cdata needs it */
+    luaopen_ffi(L);
+#endif
+
     if (lmcf->preload_hooks) {
 
         /* register the 3rd-party module's preload hooks */
@@ -3798,6 +3888,21 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
         lua_pop(L, 2);
     }
 
+    if (lmcf->load_resty_core) {
+        lua_getglobal(L, "require");
+        lua_pushstring(L, "resty.core");
+
+        rc = lua_pcall(L, 1, 1, 0);
+        if (rc != 0) {
+            ngx_log_error(NGX_LOG_ERR, log, 0,
+                          "lua_load_resty_core failed to load the resty.core "
+                          "module from https://github.com/openresty/lua-resty"
+                          "-core; ensure you are using an OpenResty release "
+                          "from https://openresty.org/en/download.html "
+                          "(rc: %i, reason: %s)", rc, lua_tostring(L, -1));
+        }
+    }
+
     return L;
 }
 
@@ -4041,7 +4146,12 @@ ngx_http_lua_get_raw_phase_context(lua_State *L)
     ngx_http_request_t      *r;
     ngx_http_lua_ctx_t      *ctx;
 
+#ifdef OPENRESTY_LUAJIT
+    r = lua_getexdata(L);
+#else
     r = lua_touserdata(L, 1);
+#endif
+
     if (r == NULL) {
         return 0;
     }
@@ -4129,4 +4239,32 @@ ngx_http_lua_cleanup_free(ngx_http_request_t *r, ngx_http_cleanup_pt *cleanup)
 }
 
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+void
+ngx_http_lua_set_sa_restart(ngx_log_t *log)
+{
+    int                    *signo;
+    int                     sigs[] = NGX_HTTP_LUA_SA_RESTART_SIGS;
+    struct sigaction        act;
+
+    for (signo = sigs; *signo != 0; signo++) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
+                       "setting SA_RESTART for signal %d", *signo);
+
+        if (sigaction(*signo, NULL, &act) != 0) {
+            ngx_log_error(NGX_LOG_WARN, log, ngx_errno, "failed to get "
+                          "sigaction for signal %d", *signo);
+        }
+
+        act.sa_flags |= SA_RESTART;
+
+        if (sigaction(*signo, &act, NULL) != 0) {
+            ngx_log_error(NGX_LOG_WARN, log, ngx_errno, "failed to set "
+                          "sigaction for signal %d", *signo);
+        }
+    }
+}
+#endif
+
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.h b/debian/modules/http-lua/src/ngx_http_lua_util.h
index 7dcc6f7..f08f481 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.h
@@ -9,6 +9,11 @@
 #define _NGX_HTTP_LUA_UTIL_H_INCLUDED_
 
 
+#ifdef DDEBUG
+#include "ddebug.h"
+#endif
+
+
 #include "ngx_http_lua_common.h"
 #include "ngx_http_lua_api.h"
 
@@ -188,7 +193,9 @@ ngx_int_t ngx_http_lua_open_and_stat_file(u_char *name,
 ngx_chain_t *ngx_http_lua_chain_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
     ngx_chain_t **free, size_t len);
 
+#ifndef OPENRESTY_LUAJIT
 void ngx_http_lua_create_new_globals_table(lua_State *L, int narr, int nrec);
+#endif
 
 int ngx_http_lua_traceback(lua_State *L);
 
@@ -243,6 +250,9 @@ ngx_http_cleanup_t *ngx_http_lua_cleanup_add(ngx_http_request_t *r,
 void ngx_http_lua_cleanup_free(ngx_http_request_t *r,
     ngx_http_cleanup_pt *cleanup);
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+void ngx_http_lua_set_sa_restart(ngx_log_t *log);
+#endif
 
 #define ngx_http_lua_check_if_abortable(L, ctx)                              \
     if ((ctx)->no_abort) {                                                   \
@@ -282,7 +292,9 @@ ngx_http_lua_create_ctx(ngx_http_request_t *r)
     if (!llcf->enable_code_cache && r->connection->fd != (ngx_socket_t) -1) {
         lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
+#ifdef DDEBUG
         dd("lmcf: %p", lmcf);
+#endif
 
         L = ngx_http_lua_init_vm(lmcf->lua, lmcf->cycle, r->pool, lmcf,
                                  r->connection->log, &cln);
@@ -323,7 +335,11 @@ ngx_http_lua_get_lua_vm(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
     }
 
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+#ifdef DDEBUG
     dd("lmcf->lua: %p", lmcf->lua);
+#endif
+
     return lmcf->lua;
 }
 
@@ -334,6 +350,9 @@ ngx_http_lua_get_lua_vm(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 static ngx_inline ngx_http_request_t *
 ngx_http_lua_get_req(lua_State *L)
 {
+#ifdef OPENRESTY_LUAJIT
+    return lua_getexdata(L);
+#else
     ngx_http_request_t    *r;
 
     lua_getglobal(L, ngx_http_lua_req_key);
@@ -341,14 +360,19 @@ ngx_http_lua_get_req(lua_State *L)
     lua_pop(L, 1);
 
     return r;
+#endif
 }
 
 
 static ngx_inline void
 ngx_http_lua_set_req(lua_State *L, ngx_http_request_t *r)
 {
+#ifdef OPENRESTY_LUAJIT
+    lua_setexdata(L, (void *) r);
+#else
     lua_pushlightuserdata(L, r);
     lua_setglobal(L, ngx_http_lua_req_key);
+#endif
 }
 
 
@@ -387,10 +411,12 @@ ngx_http_lua_hash_str(u_char *src, size_t n)
 
 
 static ngx_inline ngx_int_t
-ngx_http_lua_set_content_type(ngx_http_request_t *r)
+ngx_http_lua_set_content_type(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 {
     ngx_http_lua_loc_conf_t     *llcf;
 
+    ctx->mime_set = 1;
+
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->use_default_type
         && r->headers_out.status != NGX_HTTP_NOT_MODIFIED)
diff --git a/debian/modules/http-lua/src/ngx_http_lua_worker.c b/debian/modules/http-lua/src/ngx_http_lua_worker.c
index 461509b..33cfa11 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_worker.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_worker.c
@@ -153,6 +153,8 @@ ngx_http_lua_ffi_master_pid(void)
 int
 ngx_http_lua_ffi_get_process_type(void)
 {
+    ngx_core_conf_t  *ccf;
+
 #if defined(HAVE_PRIVILEGED_PROCESS_PATCH) && !NGX_WIN32
     if (ngx_process == NGX_PROCESS_HELPER) {
         if (ngx_is_privileged_agent) {
@@ -161,6 +163,15 @@ ngx_http_lua_ffi_get_process_type(void)
     }
 #endif
 
+    if (ngx_process == NGX_PROCESS_SINGLE) {
+        ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                               ngx_core_module);
+
+        if (ccf->master) {
+            return NGX_PROCESS_MASTER;
+        }
+    }
+
     return ngx_process;
 }
 
diff --git a/debian/modules/http-lua/t/000--init.t b/debian/modules/http-lua/t/000--init.t
index dbe2c33..5865755 100644
--- a/debian/modules/http-lua/t/000--init.t
+++ b/debian/modules/http-lua/t/000--init.t
@@ -10,11 +10,6 @@ $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
 
 our $http_config = <<'_EOC_';
-    upstream database {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
-                       dbname=ngx_test user=ngx_test password=ngx_test;
-    }
-
     lua_package_path "../lua-resty-mysql/lib/?.lua;;";
 _EOC_
 
diff --git a/debian/modules/http-lua/t/001-set.t b/debian/modules/http-lua/t/001-set.t
index ba8f22c..9e8ee7b 100644
--- a/debian/modules/http-lua/t/001-set.t
+++ b/debian/modules/http-lua/t/001-set.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 4);
+plan tests => repeat_each() * (blocks() * 3 + 5);
 
 #log_level("warn");
 no_long_string();
@@ -46,7 +46,7 @@ helloworld
 === TEST 3: internal only
 --- config
     location /lua {
-        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(10)";
+        set_by_lua $res "local function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(10)";
         echo $res;
     }
 --- request
@@ -76,7 +76,7 @@ GET /lua?a=1&b=2
 === TEST 5: fib by arg
 --- config
     location /fib {
-        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(tonumber(ngx.arg[1]))" $arg_n;
+        set_by_lua $res "local function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(tonumber(ngx.arg[1]))" $arg_n;
         echo $res;
     }
 --- request
@@ -592,25 +592,30 @@ failed to run set_by_lua*: unknown reason
 
 
 
-=== TEST 37: globals get cleared for every single request
+=== TEST 37: globals are shared in all requests.
 --- config
     location /lua {
-        set_by_lua $res '
+        set_by_lua_block $res {
             if not foo then
                 foo = 1
             else
+                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             return foo
-        ';
+        }
         echo $res;
     }
 --- request
 GET /lua
---- response_body
-1
+--- response_body_like chomp
+\A[12]
+\z
 --- no_error_log
 [error]
+--- grep_error_log eval: qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
+--- grep_error_log_out eval
+["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
 
 
 
@@ -755,6 +760,8 @@ GET /lua?name=jim
 --- config
     location /t {
         set_by_lua $a '
+            local bar
+            local foo
             function foo()
                 bar()
             end
diff --git a/debian/modules/http-lua/t/002-content.t b/debian/modules/http-lua/t/002-content.t
index cc92d6f..bb569f5 100644
--- a/debian/modules/http-lua/t/002-content.t
+++ b/debian/modules/http-lua/t/002-content.t
@@ -86,7 +86,7 @@ qr/content_by_lua\(nginx\.conf:\d+\):1: attempt to call field 'echo' \(a nil val
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        content_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        content_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
     }
 --- request
 GET /lua?a=1&b=2
@@ -102,7 +102,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-v = ngx.var["request_uri"]
+local v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -154,7 +154,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        content_by_lua 'who = ngx.var.arg_who
+        content_by_lua 'local who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
     }
 --- request
@@ -171,7 +171,7 @@ Hello, agentzh!
     }
 
     location /lua {
-        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status, " "); ngx.print("body=", res.body)';
+        content_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status, " "); ngx.print("body=", res.body)';
     }
 --- request
 GET /lua
@@ -183,7 +183,7 @@ status=200 body=hello, world
 ei= TEST 9: capture non-existed location
 --- config
     location /lua {
-        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        content_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
     }
 --- request
 GET /lua
@@ -194,7 +194,7 @@ GET /lua
 === TEST 9: invalid capture location (not as expected...)
 --- config
     location /lua {
-        content_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        content_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
     }
 --- request
 GET /lua
@@ -247,7 +247,7 @@ GET /lua
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body, "\\n");
            else
@@ -271,7 +271,7 @@ end
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -353,7 +353,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    content_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    content_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
 }
 --- request
 GET /parent
@@ -369,7 +369,7 @@ location /sub {
 location /parent {
     set $a 12;
     content_by_lua '
-        res = ngx.location.capture(
+        local res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -390,7 +390,7 @@ location /sub {
 }
 location /parent {
     content_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = true });
+        local res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 }
@@ -408,7 +408,7 @@ location /sub {
 }
 location /parent {
     content_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = false });
+        local res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
 }
@@ -427,7 +427,7 @@ GET /parent
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
     }
@@ -454,7 +454,7 @@ type: foo/bar
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", type(res.header["Set-Cookie"]));
             ngx.say("len: ", #res.header["Set-Cookie"]);
             ngx.say("value: ", table.concat(res.header["Set-Cookie"], "|"))
@@ -482,7 +482,7 @@ value: a|hello, world|foo
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -507,7 +507,7 @@ Bar: Bah
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
@@ -524,7 +524,7 @@ Bar: nil
 --- config
     location /lua {
         content_by_lua '
-            data = "hello, world"
+            local data = "hello, world"
             -- ngx.header["Content-Length"] = #data
             -- ngx.header.content_length = #data
             ngx.print(data)
@@ -742,7 +742,7 @@ true
 --- config
     location /lua {
         content_by_lua '
-            data = "hello,\\nworld\\n"
+            local data = "hello,\\nworld\\n"
             ngx.header["Content-Length"] = #data
             ngx.say("hello,")
             ngx.flush()
@@ -801,7 +801,7 @@ world
     }
 --- user_files
 >>> test.lua
-v = ngx.var["request_uri"]
+local v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
diff --git a/debian/modules/http-lua/t/004-require.t b/debian/modules/http-lua/t/004-require.t
index 35e04db..17e1d57 100644
--- a/debian/modules/http-lua/t/004-require.t
+++ b/debian/modules/http-lua/t/004-require.t
@@ -24,7 +24,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /main {
         echo_location /load;
@@ -85,7 +85,7 @@ hello, foo
 --- request
 GET /main
 --- user_files
---- response_body_like: ^[^;]+/servroot/html/\?.so$
+--- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.so$
 
 
 
@@ -100,7 +100,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^[^;]+/servroot/html/\?.lua;.+\.lua;$
+--- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.lua;(.+\.lua)?;*$
 
 
 
@@ -115,7 +115,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^[^;]+/servroot/html/\?.so;.+\.so;$
+--- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.so;(.+\.so)?;*$
 
 
 
@@ -130,7 +130,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^.+\.lua;[^;]+/servroot/html/\?.lua$
+--- response_body_like: ^(.+\.lua)?;*?[^;]+/servroot(_\d+)?/html/\?\.lua$
 
 
 
@@ -145,7 +145,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^.+\.so;[^;]+/servroot/html/\?.so$
+--- response_body_like: ^(.+\.so)?;*?[^;]+/servroot(_\d+)?/html/\?\.so$
 
 
 
diff --git a/debian/modules/http-lua/t/005-exit.t b/debian/modules/http-lua/t/005-exit.t
index a5a28b3..a416a75 100644
--- a/debian/modules/http-lua/t/005-exit.t
+++ b/debian/modules/http-lua/t/005-exit.t
@@ -452,7 +452,7 @@ Hi
 --- config
     location /lua {
         content_by_lua '
-            function f ()
+            local function f ()
                 ngx.say("hello")
                 ngx.exit(200)
             end
diff --git a/debian/modules/http-lua/t/009-log.t b/debian/modules/http-lua/t/009-log.t
index 68c057f..cb3895b 100644
--- a/debian/modules/http-lua/t/009-log.t
+++ b/debian/modules/http-lua/t/009-log.t
@@ -414,6 +414,8 @@ GET /log
 --- config
     location /log {
         content_by_lua '
+            local foo
+            local bar
             function foo()
                 bar()
             end
@@ -431,7 +433,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):7: bar\(\): hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):9: bar\(\): hello, log12343.14159/
 
 
 
@@ -439,6 +441,8 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):7: bar\(\): hell
 --- config
     location /log {
         content_by_lua '
+            local foo
+            local bar
             function foo()
                 return bar(5)
             end
@@ -461,7 +465,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8:(?: foo\(\):)? hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):10:(?: foo\(\):)? hello, log12343.14159/
 
 
 
@@ -472,6 +476,8 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8:(?: foo\(\):)?
     }
 --- user_files
 >>> test.lua
+local foo
+local bar
 function foo()
     bar()
 end
@@ -488,7 +494,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] test.lua:6: bar\(\): hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] test.lua:8: bar\(\): hello, log12343.14159/
 
 
 
diff --git a/debian/modules/http-lua/t/011-md5_bin.t b/debian/modules/http-lua/t/011-md5_bin.t
index ae7c974..dc0fd9c 100644
--- a/debian/modules/http-lua/t/011-md5_bin.t
+++ b/debian/modules/http-lua/t/011-md5_bin.t
@@ -156,7 +156,7 @@ d41d8cd98f00b204e9800998ecf8427e
 --- config
     location = /t {
         content_by_lua '
-            s = ngx.md5_bin(45)
+            local s = ngx.md5_bin(45)
             s = string.gsub(s, ".", function (c)
                     return string.format("%02x", string.byte(c))
                 end)
diff --git a/debian/modules/http-lua/t/013-base64.t b/debian/modules/http-lua/t/013-base64.t
index 1cc27de..d1a8d8b 100644
--- a/debian/modules/http-lua/t/013-base64.t
+++ b/debian/modules/http-lua/t/013-base64.t
@@ -242,4 +242,4 @@ GET /t
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
 --- error_log eval
-qr/bad argument \#2 to 'encode_base64' \(boolean expected, got number\)|\[error\] .*? boolean argument only/
+qr/bad argument \#2 to 'encode_base64' \(boolean expected, got number\)|\[error\] .*? bad no_padding: boolean expected, got number/
diff --git a/debian/modules/http-lua/t/014-bugs.t b/debian/modules/http-lua/t/014-bugs.t
index 9aadff0..dad084e 100644
--- a/debian/modules/http-lua/t/014-bugs.t
+++ b/debian/modules/http-lua/t/014-bugs.t
@@ -43,7 +43,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /load {
         content_by_lua '
@@ -69,7 +69,7 @@ end
 
 === TEST 2: sanity
 --- http_config
-lua_package_path '/home/agentz/rpm/BUILD/lua-yajl-1.1/build/?.so;/home/lz/luax/?.so;./?.so';
+lua_package_cpath '/home/agentz/rpm/BUILD/lua-yajl-1.1/build/?.so;/home/lz/luax/?.so;./?.so';
 --- config
     location = '/report/listBidwordPrices4lzExtra.htm' {
         content_by_lua '
@@ -112,7 +112,7 @@ GET /report/listBidwordPrices4lzExtra.htm?words=123,156,2532
     }
     location = /main {
         content_by_lua '
-            res = ngx.location.capture("/memc?c=get&k=foo&v=")
+            local res = ngx.location.capture("/memc?c=get&k=foo&v=")
             ngx.say("1: ", res.body)
 
             res = ngx.location.capture("/memc?c=set&k=foo&v=bar");
@@ -204,7 +204,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/37
         content_by_lua '
             -- local yajl = require "yajl"
             ngx.header["Set-Cookie"] = {}
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
 
             for i,j in pairs(res.header) do
                 ngx.header[i] = j
@@ -231,7 +231,7 @@ Set-Cookie: TestCookie2=bar.*"
     }
 --- user_files
 >>> foo.lua
-res = {}
+local res = {}
 res = {'good 1', 'good 2', 'good 3'}
 return ngx.redirect("/somedir/" .. ngx.escape_uri(res[math.random(1,#res)]))
 --- request
@@ -579,7 +579,7 @@ $s
 
 
 
-=== TEST 26: unexpected globals sharing by using _G
+=== TEST 26: globals sharing by using _G
 --- config
     location /test {
         content_by_lua '
@@ -593,12 +593,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body eval
-["0", "0", "0"]
+--- response_body_like eval
+[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
 
 
 
-=== TEST 27: unexpected globals sharing by using _G (set_by_lua*)
+=== TEST 27: globals sharing by using _G (set_by_lua*)
 --- config
     location /test {
         set_by_lua $a '
@@ -613,12 +613,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body eval
-["0", "0", "0"]
+--- response_body_like eval
+[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
 
 
 
-=== TEST 28: unexpected globals sharing by using _G (log_by_lua*)
+=== TEST 28: globals sharing by using _G (log_by_lua*)
 --- http_config
     lua_shared_dict log_dict 100k;
 --- config
@@ -633,19 +633,19 @@ $s
             if _G.t then
                 _G.t = _G.t + 1
             else
-                _G.t = 0
+                _G.t = 1
             end
             log_dict:set("cnt", t)
         ';
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body eval
-["0", "0", "0"]
+--- response_body_like eval
+[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
 
 
 
-=== TEST 29: unexpected globals sharing by using _G (header_filter_by_lua*)
+=== TEST 29: globals sharing by using _G (header_filter_by_lua*)
 --- config
     location /test {
         header_filter_by_lua '
@@ -663,12 +663,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body eval
-["0", "0", "0"]
+--- response_body_like eval
+[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
 
 
 
-=== TEST 30: unexpected globals sharing by using _G (body_filter_by_lua*)
+=== TEST 30: globals sharing by using _G (body_filter_by_lua*)
 --- config
     location /test {
         body_filter_by_lua '
@@ -686,8 +686,9 @@ $s
     }
 --- request
 GET /test
---- response_body
-a0
+--- response_body_like eval
+qr/\Aa[036]
+\z/
 --- no_error_log
 [error]
 
@@ -846,7 +847,7 @@ ok
 
 === TEST 37: resolving names with a trailing dot
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -864,7 +865,7 @@ GET /t
 
 === TEST 38: resolving names with a trailing dot
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen 12354;
 
@@ -891,7 +892,7 @@ args: foo=1&bar=2
 
 === TEST 39: lua_code_cache off + setkeepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location = /t {
diff --git a/debian/modules/http-lua/t/016-resp-header.t b/debian/modules/http-lua/t/016-resp-header.t
index 72c1e05..e38202b 100644
--- a/debian/modules/http-lua/t/016-resp-header.t
+++ b/debian/modules/http-lua/t/016-resp-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 46);
+plan tests => repeat_each() * (blocks() * 3 + 59);
 
 #no_diff();
 no_long_string();
@@ -630,7 +630,46 @@ Cache-Control: private, no-store
 
 
 
-=== TEST 32: set multi values to cache-control and override it with a single value
+=== TEST 32: set single value to Link header
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.header.link = "</foo.jpg>; rel=preload"
+            ngx.say("Link: ", ngx.var.sent_http_link)
+        }
+    }
+--- request
+GET /t
+--- response_headers
+Link: </foo.jpg>; rel=preload
+--- response_body
+Link: </foo.jpg>; rel=preload
+
+
+
+=== TEST 33: set multi values to Link header
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.header.link = {
+                "</foo.jpg>; rel=preload",
+                "</bar.css>; rel=preload; as=style"
+            }
+
+            ngx.say("Link: ", ngx.var.sent_http_link)
+        }
+    }
+--- request
+GET /t
+--- response_headers
+Link: </foo.jpg>; rel=preload, </bar.css>; rel=preload; as=style
+--- response_body_like chop
+^Link: </foo.jpg>; rel=preload[;,] </bar.css>; rel=preload; as=style$
+--- skip_nginx: 3: < 1.13.9
+
+
+
+=== TEST 34: set multi values to cache-control and override it with a single value
 --- config
     location /lua {
         content_by_lua '
@@ -650,7 +689,30 @@ Cache-Control: no-cache
 
 
 
-=== TEST 33: set multi values to cache-control and override it with multiple values
+=== TEST 35: set multi values to Link header and override it with a single value
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.header.link = {
+                "</foo.jpg>; rel=preload",
+                "</bar.css>; rel=preload; as=style"
+            }
+            ngx.header.link = "</hello.jpg>; rel=preload"
+            ngx.say("Link: ", ngx.var.sent_http_link)
+            ngx.say("Link: ", ngx.header.link)
+        }
+    }
+--- request
+    GET /lua
+--- response_headers
+Link: </hello.jpg>; rel=preload
+--- response_body
+Link: </hello.jpg>; rel=preload
+Link: </hello.jpg>; rel=preload
+
+
+
+=== TEST 36: set multi values to cache-control and override it with multiple values
 --- config
     location /lua {
         content_by_lua '
@@ -672,7 +734,37 @@ Cache-Control: no-cache[;,] blah[;,] foo$
 
 
 
-=== TEST 34: set the www-authenticate response header
+=== TEST 37: set multi values to Link header and override it with multiple values
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.header.link = {
+                "</foo.jpg>; rel=preload",
+                "</bar.css>; rel=preload; as=style"
+            }
+            ngx.header.link = {
+                "</foo.jpg>; rel=preload",
+                "</hello.css>; rel=preload",
+                "</bar.css>; rel=preload; as=style"
+            }
+            ngx.say("Link: ", ngx.var.sent_http_link)
+            ngx.say("Link: ", table.concat(ngx.header.link, ", "))
+        }
+    }
+--- request
+    GET /lua
+--- response_headers
+Link: </foo.jpg>; rel=preload, </hello.css>; rel=preload, </bar.css>; rel=preload; as=style
+--- response_body_like chop
+^Link: </foo.jpg>; rel=preload[;,] </hello.css>; rel=preload[;,] </bar.css>; rel=preload; as=style
+Link: </foo.jpg>; rel=preload[;,] </hello.css>; rel=preload[;,] </bar.css>; rel=preload; as=style$
+--- no_error_log
+[error]
+--- skip_nginx: 4: < 1.13.9
+
+
+
+=== TEST 38: set the www-authenticate response header
 --- config
     location /lua {
         content_by_lua '
@@ -689,7 +781,7 @@ WWW-Authenticate: blah
 
 
 
-=== TEST 35: set and clear the www-authenticate response header
+=== TEST 39: set and clear the www-authenticate response header
 --- config
     location /lua {
         content_by_lua '
@@ -707,7 +799,7 @@ Foo: nil
 
 
 
-=== TEST 36: set multi values to cache-control and override it with multiple values (to reproduce a bug)
+=== TEST 40: set multi values to cache-control and override it with multiple values (to reproduce a bug)
 --- config
     location /lua {
         content_by_lua '
@@ -727,7 +819,7 @@ Cache-Control: blah
 
 
 
-=== TEST 37: set last-modified and return 304
+=== TEST 41: set last-modified and return 304
 --- config
   location /lua {
         content_by_lua '
@@ -745,7 +837,7 @@ Last-Modified: Thu, 18 Nov 2010 11:27:35 GMT
 
 
 
-=== TEST 38: set last-modified and return 200
+=== TEST 42: set last-modified and return 200
 --- config
   location /lua {
         content_by_lua '
@@ -764,7 +856,7 @@ Thu, 18 Nov 2010 11:27:35 GMT
 
 
 
-=== TEST 39: set response content-encoding header should bypass ngx_http_gzip_filter_module
+=== TEST 43: set response content-encoding header should bypass ngx_http_gzip_filter_module
 --- config
     default_type text/plain;
     gzip             on;
@@ -781,13 +873,16 @@ GET /read
 --- more_headers
 Accept-Encoding: gzip
 --- response_headers
-Content-Type: text/plain
+Content-Encoding: gzip
+--- no_error_log
+[error]
+http gzip filter
 --- response_body
 Hello, world, my dear friend!
 
 
 
-=== TEST 40: no transform underscores (write)
+=== TEST 44: no transform underscores (write)
 --- config
     lua_transform_underscores_in_response_headers off;
     location = /t {
@@ -807,7 +902,7 @@ nil
 
 
 
-=== TEST 41: with transform underscores (write)
+=== TEST 45: with transform underscores (write)
 --- config
     lua_transform_underscores_in_response_headers on;
     location = /t {
@@ -827,7 +922,7 @@ Hello
 
 
 
-=== TEST 42: github issue #199: underscores in lua variables
+=== TEST 46: github issue #199: underscores in lua variables
 --- config
     location /read {
         content_by_lua '
@@ -860,7 +955,7 @@ something: hello
 
 
 
-=== TEST 43: set multiple response header
+=== TEST 47: set multiple response header
 --- config
     location /read {
         content_by_lua '
@@ -880,7 +975,7 @@ text/my-plain-50
 
 
 
-=== TEST 44: set multiple response header and then reset and then clear
+=== TEST 48: set multiple response header and then reset and then clear
 --- config
     location /read {
         content_by_lua '
@@ -909,7 +1004,7 @@ ok
 
 
 
-=== TEST 45: set response content-type header for multiple times
+=== TEST 49: set response content-type header for multiple times
 --- config
     location /read {
         content_by_lua '
@@ -927,7 +1022,7 @@ Hi
 
 
 
-=== TEST 46: set Last-Modified response header for multiple times
+=== TEST 50: set Last-Modified response header for multiple times
 --- config
     location /read {
         content_by_lua '
@@ -945,7 +1040,7 @@ ok
 
 
 
-=== TEST 47: set Last-Modified response header and then clear
+=== TEST 51: set Last-Modified response header and then clear
 --- config
     location /read {
         content_by_lua '
@@ -963,7 +1058,7 @@ ok
 
 
 
-=== TEST 48: github #20: segfault caused by the nasty optimization in the nginx core (write)
+=== TEST 52: github #20: segfault caused by the nasty optimization in the nginx core (write)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -985,7 +1080,7 @@ Location: http://localhost:$ServerPort/t/
 
 
 
-=== TEST 49: github #20: segfault caused by the nasty optimization in the nginx core (read)
+=== TEST 53: github #20: segfault caused by the nasty optimization in the nginx core (read)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1007,7 +1102,7 @@ Location: http://localhost:$ServerPort/t/
 
 
 
-=== TEST 50: github #20: segfault caused by the nasty optimization in the nginx core (read Location)
+=== TEST 54: github #20: segfault caused by the nasty optimization in the nginx core (read Location)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1030,7 +1125,7 @@ Foo: /t/
 
 
 
-=== TEST 51: github #20: segfault caused by the nasty optimization in the nginx core (set Foo and read Location)
+=== TEST 55: github #20: segfault caused by the nasty optimization in the nginx core (set Foo and read Location)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1054,7 +1149,7 @@ Foo: /t/
 
 
 
-=== TEST 52: case sensitive cache-control header
+=== TEST 56: case sensitive cache-control header
 --- config
     location /lua {
         content_by_lua '
@@ -1071,7 +1166,24 @@ Cache-Control: private
 
 
 
-=== TEST 53: clear Cache-Control when there was no Cache-Control
+=== TEST 57: case sensitive Link header
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.header["link"] = "</foo.jpg>; rel=preload"
+            ngx.say("Link: ", ngx.var.sent_http_link)
+        }
+    }
+--- request
+    GET /lua
+--- raw_response_headers_like chop
+link: </foo.jpg>; rel=preload
+--- response_body
+Link: </foo.jpg>; rel=preload
+
+
+
+=== TEST 58: clear Cache-Control when there was no Cache-Control
 --- config
     location /lua {
         content_by_lua '
@@ -1088,7 +1200,24 @@ Cache-Control: nil
 
 
 
-=== TEST 54: set response content-type header
+=== TEST 59: clear Link header when there was no Link
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.header["Link"] = nil
+            ngx.say("Link: ", ngx.var.sent_http_link)
+        }
+    }
+--- request
+    GET /lua
+--- raw_response_headers_unlike eval
+qr/Link/i
+--- response_body
+Link: nil
+
+
+
+=== TEST 60: set response content-type header
 --- config
     location /read {
         content_by_lua '
@@ -1107,7 +1236,7 @@ s = content_type
 
 
 
-=== TEST 55: set a number header name
+=== TEST 61: set a number header name
 --- config
     location /lua {
         content_by_lua '
@@ -1126,7 +1255,7 @@ s = content_type
 
 
 
-=== TEST 56: set a number header name (in a table value)
+=== TEST 62: set a number header name (in a table value)
 --- config
     location /lua {
         content_by_lua '
@@ -1145,7 +1274,7 @@ foo: 32
 
 
 
-=== TEST 57: random access resp headers
+=== TEST 63: random access resp headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1185,7 +1314,7 @@ bar: baz
 
 
 
-=== TEST 58: iterating through raw resp headers
+=== TEST 64: iterating through raw resp headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1221,7 +1350,7 @@ bar: nil
 
 
 
-=== TEST 59: removed response headers
+=== TEST 65: removed response headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1254,7 +1383,7 @@ bar: baz
 
 
 
-=== TEST 60: built-in Content-Type header
+=== TEST 66: built-in Content-Type header
 --- config
     location = /t {
         content_by_lua '
@@ -1287,7 +1416,7 @@ my content_type: text/plain
 
 
 
-=== TEST 61: built-in Content-Length header
+=== TEST 67: built-in Content-Length header
 --- config
     location = /t {
         content_by_lua '
@@ -1320,7 +1449,7 @@ my content_length: 3
 
 
 
-=== TEST 62: built-in Connection header
+=== TEST 68: built-in Connection header
 --- config
     location = /t {
         content_by_lua '
@@ -1351,7 +1480,7 @@ my connection: close
 
 
 
-=== TEST 63: built-in Transfer-Encoding header (chunked)
+=== TEST 69: built-in Transfer-Encoding header (chunked)
 --- config
     location = /t {
         content_by_lua '
@@ -1383,7 +1512,7 @@ my transfer-encoding: chunked
 
 
 
-=== TEST 64: built-in Transfer-Encoding header (none)
+=== TEST 70: built-in Transfer-Encoding header (none)
 --- config
     location = /t {
         content_by_lua '
@@ -1416,7 +1545,7 @@ my transfer_encoding: nil
 
 
 
-=== TEST 65: set Location (no host)
+=== TEST 71: set Location (no host)
 --- config
     location = /t {
         content_by_lua '
@@ -1435,7 +1564,7 @@ Location: /foo/bar
 
 
 
-=== TEST 66: set Location (with host)
+=== TEST 72: set Location (with host)
 --- config
     location = /t {
         content_by_lua '
@@ -1454,7 +1583,7 @@ Location: http://test.com/foo/bar
 
 
 
-=== TEST 67: ngx.header["Content-Type"] with ngx_gzip
+=== TEST 73: ngx.header["Content-Type"] with ngx_gzip
 --- config
     gzip             on;
     gzip_min_length  1;
@@ -1478,7 +1607,7 @@ Content-Type: text/html; charset=utf-8
 
 
 
-=== TEST 68: ngx.header["Content-Type"] with "; blah"
+=== TEST 74: ngx.header["Content-Type"] with "; blah"
 --- config
     location = /test2 {
         content_by_lua '
@@ -1498,84 +1627,11 @@ test
 
 
 
-=== TEST 69: return the matched content-type instead of default_type
---- http_config
-types {
-    image/png png;
-}
---- config
-location /set/ {
-     default_type text/html;
-     content_by_lua_block {
-       ngx.say(ngx.header["content-type"])
-   }
-}
---- request
-GET /set/hello.png
---- response_headers
-Content-Type: image/png
---- response_body
-image/png
---- no_error_log
-[error]
-
-
-
-=== TEST 70: always return the matched content-type
---- config
-    location /set/ {
-        default_type "image/png";
-        content_by_lua_block {
-            ngx.say(ngx.header["content-type"])
-            ngx.say(ngx.header["content-type"])
-        }
-    }
---- request
-GET /set/hello.png
---- response_headers
-Content-Type: image/png
---- response_body
-image/png
-image/png
---- no_error_log
-[error]
-
-
-
-=== TEST 71: return the matched content-type after ngx.resp.get_headers()
---- http_config
-types {
-    image/png png;
-}
---- config
-    location /set/ {
-        default_type text/html;
-        content_by_lua_block {
-            local h, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say(h["content-type"])
-        }
-    }
---- request
-GET /set/hello.png
---- response_headers
-Content-Type: image/png
---- response_body
-image/png
---- no_error_log
-[error]
-
-
-
-=== TEST 72: exceeding max header limit (default 100)
+=== TEST 75: exceeding max header limit (default 100)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 99 do
+            for i = 1, 100 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1605,11 +1661,11 @@ lua exceeding response header limit 101 > 100
 
 
 
-=== TEST 73: NOT exceeding max header limit (default 100)
+=== TEST 76: NOT exceeding max header limit (default 100)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 98 do
+            for i = 1, 99 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1637,11 +1693,11 @@ lua exceeding response header limit
 
 
 
-=== TEST 74: exceeding max header limit (custom limit, 3)
+=== TEST 77: exceeding max header limit (custom limit, 3)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 2 do
+            for i = 1, 3 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1671,11 +1727,11 @@ lua exceeding response header limit 4 > 3
 
 
 
-=== TEST 75: NOT exceeding max header limit (custom limit, 3)
+=== TEST 78: NOT exceeding max header limit (custom limit, 3)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 1 do
+            for i = 1, 2 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1699,3 +1755,211 @@ found 3 resp headers
 --- no_error_log
 [error]
 lua exceeding response header limit
+
+
+
+=== TEST 79: return nil if Content-Type is not set yet
+--- config
+    location /t {
+        default_type text/html;
+        content_by_lua_block {
+            ngx.log(ngx.WARN, "Content-Type: ", ngx.header["content-type"])
+            ngx.say("Content-Type: ", ngx.header["content-type"])
+        }
+    }
+--- request
+GET /t
+--- response_headers
+Content-Type: text/html
+--- response_body
+Content-Type: nil
+--- no_error_log
+[error]
+--- error_log
+Content-Type: nil
+
+
+
+=== TEST 80: don't generate Content-Type when setting other response header
+--- config
+    location = /backend {
+        content_by_lua_block {
+            ngx.say("foo")
+        }
+        header_filter_by_lua_block {
+            ngx.header.content_type = nil
+        }
+    }
+
+    location = /t {
+        default_type text/html;
+        rewrite_by_lua_block {
+            ngx.header.blah = "foo"
+        }
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+blah: foo
+!Content-Type
+--- no_error_log
+[error]
+
+
+
+=== TEST 81: don't generate Content-Type when getting other response header
+--- config
+    location = /backend {
+        content_by_lua_block {
+            ngx.say("foo")
+        }
+        header_filter_by_lua_block {
+            ngx.header.content_type = nil
+        }
+    }
+
+    location = /t {
+        default_type text/html;
+        rewrite_by_lua_block {
+            local h = ngx.header.content_length
+        }
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+!Content-Type
+--- no_error_log
+[error]
+
+
+
+=== TEST 82: don't generate Content-Type when getting it
+--- config
+    location = /backend {
+        content_by_lua_block {
+            ngx.say("foo")
+        }
+        header_filter_by_lua_block {
+            ngx.header.content_type = nil
+        }
+    }
+
+    location /t {
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
+        header_filter_by_lua_block {
+            ngx.log(ngx.WARN, "Content-Type: ", ngx.header["content-type"])
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+!Content-Type
+--- no_error_log
+[error]
+--- error_log
+Content-Type: nil
+
+
+
+=== TEST 83: generate default Content-Type when setting other response header
+--- config
+    location = /t {
+        default_type text/html;
+        content_by_lua_block {
+            ngx.header.blah = "foo"
+            ngx.say("foo")
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+blah: foo
+Content-Type: text/html
+--- no_error_log
+[error]
+
+
+
+=== TEST 84: don't generate Content-Type when calling ngx.resp.get_headers()
+--- config
+    location = /backend {
+        content_by_lua_block {
+            ngx.say("foo")
+        }
+        header_filter_by_lua_block {
+            ngx.header.content_type = nil
+        }
+    }
+
+    location /t {
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
+        header_filter_by_lua_block {
+            local h, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return
+            end
+
+            ngx.log(ngx.WARN, "Content-Type: ", h["content-type"])
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+!Content-Type
+--- no_error_log
+[error]
+--- error_log
+Content-Type: nil
+
+
+
+=== TEST 85: don't generate default Content-Type when Content-Type is cleared
+--- config
+    location = /t {
+        default_type text/html;
+        content_by_lua_block {
+            ngx.header["Content-Type"] = nil
+            ngx.say("foo")
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+!Content-Type
+--- no_error_log
+[error]
+
+
+
+=== TEST 86: don't generate default Content-Type when Content-Type is set
+--- config
+    location = /t {
+        default_type text/html;
+        content_by_lua_block {
+            ngx.header["Content-Type"] = "application/json"
+            ngx.say("foo")
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+Content-Type: application/json
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/017-exec.t b/debian/modules/http-lua/t/017-exec.t
index 544b8bb..a73e93e 100644
--- a/debian/modules/http-lua/t/017-exec.t
+++ b/debian/modules/http-lua/t/017-exec.t
@@ -382,7 +382,7 @@ hello
 --- config
     location /lua {
         content_by_lua '
-            function f ()
+            local function f ()
                 ngx.exec("/hi")
             end
 
@@ -524,7 +524,7 @@ hello
 --- config
     location /main {
         rewrite_by_lua '
-            res = ngx.location.capture("/test_loc");
+            local res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/020-subrequest.t b/debian/modules/http-lua/t/020-subrequest.t
index 658a1d2..5a386db 100644
--- a/debian/modules/http-lua/t/020-subrequest.t
+++ b/debian/modules/http-lua/t/020-subrequest.t
@@ -32,7 +32,7 @@ __DATA__
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -62,7 +62,7 @@ lua http subrequest "/other?"
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -90,7 +90,7 @@ DELETE
 
     location /t {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -114,7 +114,7 @@ POST
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -141,7 +141,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -169,7 +169,7 @@ GET
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo")
+            local res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -196,7 +196,7 @@ GET
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo", {})
+            local res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -226,7 +226,7 @@ GET
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -255,7 +255,7 @@ hello
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -291,7 +291,7 @@ hello
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -329,7 +329,7 @@ GET
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -362,7 +362,7 @@ hello
         content_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -404,7 +404,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            res = ngx.location.capture("/memc",
+            local res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -435,7 +435,7 @@ cached: hello
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -456,7 +456,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -478,7 +478,7 @@ fo%3D=%3D%3E
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -503,7 +503,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -526,7 +526,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -548,7 +548,7 @@ attempt to use a non-string key in the "args" option table
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -570,7 +570,7 @@ attempt to use a non-string key in the "args" option table
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -592,7 +592,7 @@ a=3&b=4
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
@@ -685,7 +685,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/38
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_GET });
             ngx.say("header foo: [", res.body, "]")
         ';
@@ -711,7 +711,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/38
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { body = "abc" });
             ngx.say("header foo: [", res.body, "]")
         ';
@@ -746,8 +746,8 @@ header foo: [bar]
     }
     location /main {
         content_by_lua '
-            res1, res2 = ngx.location.capture_multi({{"/a"}, {"/b"}})
-            res3 = ngx.location.capture("/c")
+            local res1, res2 = ngx.location.capture_multi({{"/a"}, {"/b"}})
+            local res3 = ngx.location.capture("/c")
             ngx.print(res1.body, res2.body, res3.body)
         ';
     }
@@ -780,7 +780,7 @@ lua reuse free buf memory
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -801,7 +801,7 @@ hello
 --- config
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo.html")
+            local res = ngx.location.capture("/foo.html")
 
             ngx.say(res.status)
             ngx.say(res.header["Last-Modified"])
@@ -832,7 +832,7 @@ hello, static file$
     location /lua {
         content_by_lua '
             local ctx = {}
-            res = ngx.location.capture("/sub", { ctx = ctx })
+            local res = ngx.location.capture("/sub", { ctx = ctx })
 
             ngx.say(ctx.foo);
             ngx.say(ngx.ctx.foo);
@@ -857,7 +857,7 @@ nil
     }
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/sub", { ctx = ngx.ctx })
+            local res = ngx.location.capture("/sub", { ctx = ngx.ctx })
             ngx.say(ngx.ctx.foo);
         ';
     }
@@ -885,7 +885,7 @@ bar
 
     location /t {
         content_by_lua '
-            res = ngx.location.capture("/memc",
+            local res = ngx.location.capture("/memc",
                 { method = ngx.HTTP_PUT, body = "hello 1234" });
             -- ngx.say("PUT: " .. res.status);
 
@@ -922,7 +922,7 @@ lua reuse free buf chain, but reallocate memory because
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -959,7 +959,7 @@ nil
         content_by_lua '
             ngx.req.read_body()
 
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -996,7 +996,7 @@ nil
         content_by_lua '
             ngx.req.read_body()
 
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -1033,7 +1033,7 @@ hello, world
         content_by_lua '
             ngx.req.read_body()
 
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT });
 
             ngx.print(res.body)
@@ -1074,7 +1074,7 @@ lua subrequests cycle while processing "/t"
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_OPTIONS });
 
             ngx.print(res.body)
@@ -1099,7 +1099,7 @@ OPTIONS
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_OPTIONS, body = "hello world" });
 
             ngx.print(res.body)
@@ -1151,7 +1151,7 @@ r%5B%5D=http%3A%2F%2Fajax.googleapis.com%3A80%2Fajax%2Flibs%2Fjquery%2F1.7.2%2Fj
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1172,7 +1172,7 @@ body:
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1196,7 +1196,7 @@ body:
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1242,7 +1242,7 @@ F(ngx_http_finalize_request) {
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/memc")
+            local res = ngx.location.capture("/memc")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1312,7 +1312,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/memc")
+            local res = ngx.location.capture("/memc")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1385,7 +1385,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1445,7 +1445,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1507,7 +1507,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1567,7 +1567,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1630,7 +1630,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1690,7 +1690,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1756,7 +1756,7 @@ upstream timed out
             ngx.req.read_body()
 
             for i = 1, 2 do
-                res = ngx.location.capture("/other",
+                local res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1796,7 +1796,7 @@ hello world
             ngx.req.read_body()
 
             for i = 1, 2 do
-                res = ngx.location.capture("/other",
+                local res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1836,7 +1836,7 @@ hello world
             ngx.req.read_body()
 
             for i = 1, 2 do
-                res = ngx.location.capture("/other",
+                local res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1916,7 +1916,7 @@ a client request body is buffered to a temporary file
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1979,7 +1979,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2040,7 +2040,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2102,7 +2102,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2160,7 +2160,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2219,7 +2219,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2288,7 +2288,7 @@ upstream prematurely closed connection
             }
 
             for i, method in ipairs(methods) do
-                res = ngx.location.capture("/other",
+                local res = ngx.location.capture("/other",
                     { method = method })
                 ngx.print(res.body)
             end
@@ -2324,7 +2324,7 @@ method: TRACE
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -2353,7 +2353,7 @@ nil
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE, always_forward_body = true });
 
             ngx.print(res.body)
@@ -2382,7 +2382,7 @@ hello world
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE, always_forward_body = true });
 
             ngx.print(res.body)
@@ -2410,7 +2410,7 @@ hello world
 --- config
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
         ';
     }
@@ -2603,7 +2603,7 @@ qr/Assertion .*? failed/
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2636,7 +2636,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2669,7 +2669,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2699,7 +2699,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: Cookie: ", ngx.var.http_cookie)
         ';
@@ -2727,7 +2727,7 @@ pr: Cookie: foo; bar
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: Cookie: ", ngx.var.http_cookie)
         ';
@@ -2750,7 +2750,7 @@ pr: Cookie: foo; bar
 --- config
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/index.html",
+            local res = ngx.location.capture("/index.html",
                 { method = ngx.HTTP_HEAD });
             ngx.say("content-length: ", res.header["Content-Length"])
             ngx.say("body: [", res.body, "]")
diff --git a/debian/modules/http-lua/t/023-rewrite/client-abort.t b/debian/modules/http-lua/t/023-rewrite/client-abort.t
index 117d17e..0d6f2b3 100644
--- a/debian/modules/http-lua/t/023-rewrite/client-abort.t
+++ b/debian/modules/http-lua/t/023-rewrite/client-abort.t
@@ -199,7 +199,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 
     location = /sleep {
@@ -240,7 +240,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 --- request
 GET /t
@@ -545,7 +545,7 @@ client prematurely closed connection
                 return
             end
 
-            ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            local 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
diff --git a/debian/modules/http-lua/t/023-rewrite/exec.t b/debian/modules/http-lua/t/023-rewrite/exec.t
index edd4607..59691cb 100644
--- a/debian/modules/http-lua/t/023-rewrite/exec.t
+++ b/debian/modules/http-lua/t/023-rewrite/exec.t
@@ -326,7 +326,7 @@ hello
 --- config
     location /main {
         rewrite_by_lua '
-            res = ngx.location.capture("/test_loc");
+            local res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
@@ -354,7 +354,7 @@ hello, bah
 --- config
     location /main {
         rewrite_by_lua '
-            res = ngx.location.capture("/test_loc");
+            local res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/023-rewrite/mixed.t b/debian/modules/http-lua/t/023-rewrite/mixed.t
index 0f742b2..5b38d3f 100644
--- a/debian/modules/http-lua/t/023-rewrite/mixed.t
+++ b/debian/modules/http-lua/t/023-rewrite/mixed.t
@@ -35,7 +35,7 @@ __DATA__
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             print("rewrite GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -49,7 +49,7 @@ __DATA__
         content_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
diff --git a/debian/modules/http-lua/t/023-rewrite/multi-capture.t b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
index 083ec78..a0a02b7 100644
--- a/debian/modules/http-lua/t/023-rewrite/multi-capture.t
+++ b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
@@ -154,7 +154,7 @@ res2.body = b
 
     location /main {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo?n=1")
+            local res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/req-socket.t b/debian/modules/http-lua/t/023-rewrite/req-socket.t
index 87cbbbe..9292385 100644
--- a/debian/modules/http-lua/t/023-rewrite/req-socket.t
+++ b/debian/modules/http-lua/t/023-rewrite/req-socket.t
@@ -325,7 +325,7 @@ found the end of the stream
 
 === TEST 4: attempt to use the req socket across request boundary
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         rewrite_by_lua '
@@ -376,7 +376,7 @@ hello world
 === 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         rewrite_by_lua '
@@ -440,7 +440,7 @@ done
 
 === TEST 6: pipelined POST requests
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         rewrite_by_lua '
diff --git a/debian/modules/http-lua/t/023-rewrite/sanity.t b/debian/modules/http-lua/t/023-rewrite/sanity.t
index b90aa0e..73a85dc 100644
--- a/debian/modules/http-lua/t/023-rewrite/sanity.t
+++ b/debian/modules/http-lua/t/023-rewrite/sanity.t
@@ -69,7 +69,7 @@ GET /lua
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        rewrite_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        rewrite_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -87,7 +87,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-v = ngx.var["request_uri"]
+local v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -140,7 +140,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        rewrite_by_lua 'who = ngx.var.arg_who
+        rewrite_by_lua 'local who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
@@ -159,7 +159,7 @@ Hello, agentzh!
 
     location /lua {
         rewrite_by_lua '
-res = ngx.location.capture("/other")
+local res = ngx.location.capture("/other")
 ngx.print("status=", res.status, " ")
 ngx.print("body=", res.body)
 ';
@@ -175,7 +175,7 @@ status=200 body=hello, world
 === TEST 9: capture non-existed location
 --- config
     location /lua {
-        rewrite_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        rewrite_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -187,7 +187,7 @@ GET /lua
 === TEST 10: invalid capture location (not as expected...)
 --- config
     location /lua {
-        rewrite_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        rewrite_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -270,7 +270,7 @@ end
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -359,7 +359,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    rewrite_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    rewrite_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
     content_by_lua 'ngx.exit(ngx.OK)';
 }
 --- request
@@ -377,7 +377,7 @@ location /parent {
     set $a '';
     rewrite_by_lua '
         ngx.var.a = 12;
-        res = ngx.location.capture(
+        local res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -399,7 +399,7 @@ location /sub {
 }
 location /parent {
     rewrite_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = true });
+        local res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 
@@ -421,7 +421,7 @@ location /sub {
 
 location /parent {
     rewrite_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = false });
+        local res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
     content_by_lua return;
@@ -441,7 +441,7 @@ GET /parent
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
 
@@ -466,7 +466,7 @@ type: foo/bar
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -494,7 +494,7 @@ Bar: Bah
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
index 489a70f..8b532ea 100644
--- a/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
+++ b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
@@ -27,7 +27,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -104,7 +104,7 @@ lua tcp socket get keepalive peer: using connection
 
 === TEST 2: free up the whole connection pool if no active connections
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -177,7 +177,7 @@ received: OK
 
 === TEST 3: upstream sockets close prematurely
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
    server_tokens off;
    keepalive_timeout 100ms;
@@ -254,7 +254,7 @@ done
 
 === TEST 4: http keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
    server_tokens off;
    location /t {
@@ -815,7 +815,7 @@ lua tcp socket keepalive timeout: unlimited
 === TEST 11: sanity (uds)
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -953,7 +953,7 @@ lua tcp socket get keepalive peer: using connection
 
 === 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     error_page 404 /404.html;
     location /t {
diff --git a/debian/modules/http-lua/t/023-rewrite/subrequest.t b/debian/modules/http-lua/t/023-rewrite/subrequest.t
index 5d1e8f0..cb8523c 100644
--- a/debian/modules/http-lua/t/023-rewrite/subrequest.t
+++ b/debian/modules/http-lua/t/023-rewrite/subrequest.t
@@ -27,7 +27,7 @@ __DATA__
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -54,7 +54,7 @@ DELETE
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ DELETE
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -105,7 +105,7 @@ POST
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -131,7 +131,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -158,7 +158,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo")
+            local res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -184,7 +184,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo", {})
+            local res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -213,7 +213,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -241,7 +241,7 @@ hello
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -276,7 +276,7 @@ hello
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -313,7 +313,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -345,7 +345,7 @@ hello
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -386,7 +386,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            res = ngx.location.capture("/memc",
+            local res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -417,7 +417,7 @@ cached: hello
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -437,7 +437,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -458,7 +458,7 @@ fo%3D=%3D%3E
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -480,7 +480,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -502,7 +502,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -523,7 +523,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -544,7 +544,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -565,7 +565,7 @@ a=3&b=4
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
index 329c045..e713bb5 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
@@ -46,7 +46,7 @@ __DATA__
     location /t1 {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -63,7 +63,7 @@ GET /t1
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -79,7 +79,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(150)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -114,7 +114,7 @@ lua tcp socket connect timeout: 150
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(nil)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -149,7 +149,7 @@ lua tcp socket connect timeout: 102
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(0)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -185,7 +185,7 @@ lua tcp socket connect timeout: 102
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(-1)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
index 41aeab7..5258487 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
@@ -250,11 +250,11 @@ attempt to send data on a closed socket:
     }
 --- request
 GET /t
---- response_body
+--- response_body_like
 connected: 1
 request sent: 56
-first line received: HTTP/1.1 200 OK
-second line received: Server: openresty
+first line received: HTTP\/1\.1 200 OK
+second line received: (?:Date|Server): .*?
 --- no_error_log
 [error]
 
@@ -304,7 +304,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
     location /test {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -329,7 +329,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -940,7 +940,7 @@ close: 1 nil
                 end
             end
 
-            ok, err = sock:close()
+            local ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
 
@@ -1082,7 +1082,7 @@ close: 1 nil
 
 === TEST 19: cannot survive across request boundary (send)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1143,7 +1143,7 @@ received: OK|failed to send request: closed)\$"
 
 === TEST 20: cannot survive across request boundary (receive)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1214,7 +1214,7 @@ 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1285,7 +1285,7 @@ received: OK|failed to close: closed)$/
 
 === TEST 22: cannot survive across request boundary (connect)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -2041,7 +2041,7 @@ close: 1 nil
 
 === TEST 33: bad request tries to connect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2097,7 +2097,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):7: bad request/
 
 === TEST 34: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2156,7 +2156,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 35: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2215,7 +2215,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 36: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2274,7 +2274,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 37: bad request tries to set keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2333,7 +2333,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 38: bad request tries to receiveuntil
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
index 2bea7e7..9428bd6 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.exec("/foo")
             end
 
@@ -59,7 +59,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -95,7 +95,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -178,12 +178,12 @@ hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
             end
 
@@ -270,7 +270,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
index 6ebbb67..e25f7f8 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -172,13 +172,13 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -262,7 +262,7 @@ f
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -298,10 +298,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -311,7 +311,7 @@ exiting the user thread
             ngx.thread.spawn(f)
             ngx.say("after")
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -403,11 +403,11 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         #resolver 127.0.0.1;
         resolver_timeout 12s;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -510,7 +510,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -521,7 +521,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("172.105.207.225", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -600,7 +600,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -700,7 +700,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -806,7 +806,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -901,7 +901,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -995,7 +995,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1080,7 +1080,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1164,7 +1164,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1247,7 +1247,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
index 83de1a3..0e636f7 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -113,7 +113,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
index 5552107..dccef87 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
             end
 
@@ -68,11 +68,11 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("in thread 1")
             end
 
-            function g()
+            local function g()
                 ngx.say("in thread 2")
             end
 
@@ -117,7 +117,7 @@ after 2
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -154,13 +154,13 @@ after sleep
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            function g()
+            local function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -210,7 +210,7 @@ delete thread 2
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.blah()
             end
 
@@ -241,9 +241,9 @@ qr/lua user thread aborted: runtime error: rewrite_by_lua\(nginx\.conf:\d+\):3:
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
-                res = ngx.location.capture("/proxy")
+                local res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -287,7 +287,7 @@ after capture: hello world
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -340,7 +340,7 @@ after capture: hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -394,13 +394,13 @@ capture: hello bar
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            function g()
+            local function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -472,7 +472,8 @@ g: after capture: hello bah
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -518,7 +519,8 @@ after g
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -566,7 +568,7 @@ hello in g()
     location /lua {
         rewrite_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -599,7 +601,7 @@ status: running
     location /lua {
         rewrite_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
             end
 
@@ -631,7 +633,8 @@ status: zombie
     location /lua {
         rewrite_by_lua '
             local co
-            function f()
+            local g
+            local function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -670,7 +673,8 @@ status: normal
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -717,7 +721,7 @@ after f
         rewrite_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -770,7 +774,7 @@ f 3
         rewrite_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -779,7 +783,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            function g()
+            local function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -826,7 +830,7 @@ g 3
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -863,12 +867,12 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            function g()
+            local function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -914,7 +918,7 @@ hello from g
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -966,7 +970,7 @@ received: OK
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1027,7 +1031,7 @@ after)$
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1073,7 +1077,7 @@ body: hello world)$
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
diff --git a/debian/modules/http-lua/t/024-access/client-abort.t b/debian/modules/http-lua/t/024-access/client-abort.t
index c16f4ea..83bf0a4 100644
--- a/debian/modules/http-lua/t/024-access/client-abort.t
+++ b/debian/modules/http-lua/t/024-access/client-abort.t
@@ -200,7 +200,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 
     location = /sleep {
@@ -241,7 +241,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 --- request
 GET /t
@@ -546,7 +546,7 @@ client prematurely closed connection
                 return
             end
 
-            ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            local 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
diff --git a/debian/modules/http-lua/t/024-access/exec.t b/debian/modules/http-lua/t/024-access/exec.t
index 43c1a77..d168a47 100644
--- a/debian/modules/http-lua/t/024-access/exec.t
+++ b/debian/modules/http-lua/t/024-access/exec.t
@@ -326,7 +326,7 @@ hello
 --- config
     location /main {
         access_by_lua '
-            res = ngx.location.capture("/test_loc");
+            local res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/024-access/mixed.t b/debian/modules/http-lua/t/024-access/mixed.t
index a9f8039..22f0037 100644
--- a/debian/modules/http-lua/t/024-access/mixed.t
+++ b/debian/modules/http-lua/t/024-access/mixed.t
@@ -35,7 +35,7 @@ __DATA__
         access_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             print("access GET: ", res.status);
 
             res = ngx.location.capture("/memc",
@@ -49,7 +49,7 @@ __DATA__
         content_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -187,7 +187,7 @@ world\x03\x04\xff
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             print("rewrite GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -201,7 +201,7 @@ world\x03\x04\xff
         access_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             print("access GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -215,7 +215,7 @@ world\x03\x04\xff
         content_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
diff --git a/debian/modules/http-lua/t/024-access/multi-capture.t b/debian/modules/http-lua/t/024-access/multi-capture.t
index 930b74d..b1757dd 100644
--- a/debian/modules/http-lua/t/024-access/multi-capture.t
+++ b/debian/modules/http-lua/t/024-access/multi-capture.t
@@ -154,7 +154,7 @@ res2.body = b
 
     location /main {
         access_by_lua '
-            res = ngx.location.capture("/foo?n=1")
+            local res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
diff --git a/debian/modules/http-lua/t/024-access/sanity.t b/debian/modules/http-lua/t/024-access/sanity.t
index 7ff177f..e5612a8 100644
--- a/debian/modules/http-lua/t/024-access/sanity.t
+++ b/debian/modules/http-lua/t/024-access/sanity.t
@@ -69,7 +69,7 @@ GET /lua
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        access_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        access_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -87,7 +87,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-v = ngx.var["request_uri"]
+local v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -140,7 +140,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        access_by_lua 'who = ngx.var.arg_who
+        access_by_lua 'local who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
@@ -159,7 +159,7 @@ Hello, agentzh!
 
     location /lua {
         access_by_lua '
-res = ngx.location.capture("/other")
+local res = ngx.location.capture("/other")
 ngx.print("status=", res.status, " ")
 ngx.print("body=", res.body)
 ';
@@ -175,7 +175,7 @@ status=200 body=hello, world
 === TEST 9: capture non-existed location
 --- config
     location /lua {
-        access_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        access_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -187,7 +187,7 @@ GET /lua
 === TEST 10: invalid capture location (not as expected...)
 --- config
     location /lua {
-        access_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        access_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -244,7 +244,7 @@ GET /lua
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body, "\\n");
            else
@@ -271,7 +271,7 @@ access phase not running in subrequests
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -357,7 +357,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    access_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    access_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
     content_by_lua 'ngx.exit(ngx.OK)';
 }
 --- request
@@ -375,7 +375,7 @@ location /parent {
     set $a '';
     access_by_lua '
         ngx.var.a = 12;
-        res = ngx.location.capture(
+        local res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -397,7 +397,7 @@ location /sub {
 }
 location /parent {
     access_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = true });
+        local res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 
@@ -419,7 +419,7 @@ location /sub {
 
 location /parent {
     access_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = false });
+        local res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
     content_by_lua return;
@@ -439,7 +439,7 @@ GET /parent
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
 
@@ -464,7 +464,7 @@ type: foo/bar
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -492,7 +492,7 @@ Bar: Bah
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
diff --git a/debian/modules/http-lua/t/024-access/subrequest.t b/debian/modules/http-lua/t/024-access/subrequest.t
index b6ccf11..665780a 100644
--- a/debian/modules/http-lua/t/024-access/subrequest.t
+++ b/debian/modules/http-lua/t/024-access/subrequest.t
@@ -27,7 +27,7 @@ __DATA__
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -54,7 +54,7 @@ DELETE
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ DELETE
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -105,7 +105,7 @@ POST
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -131,7 +131,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -158,7 +158,7 @@ GET
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo")
+            local res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -184,7 +184,7 @@ GET
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo", {})
+            local res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -213,7 +213,7 @@ GET
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -241,7 +241,7 @@ hello
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -276,7 +276,7 @@ hello
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -313,7 +313,7 @@ GET
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -345,7 +345,7 @@ hello
         access_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -386,7 +386,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            res = ngx.location.capture("/memc",
+            local res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -417,7 +417,7 @@ cached: hello
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -437,7 +437,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -458,7 +458,7 @@ fo%3D=%3D%3E
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -480,7 +480,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -502,7 +502,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -523,7 +523,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -544,7 +544,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -565,7 +565,7 @@ a=3&b=4
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
diff --git a/debian/modules/http-lua/t/024-access/uthread-exec.t b/debian/modules/http-lua/t/024-access/uthread-exec.t
index 7add3d4..9c88eb3 100644
--- a/debian/modules/http-lua/t/024-access/uthread-exec.t
+++ b/debian/modules/http-lua/t/024-access/uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.exec("/foo")
             end
 
@@ -59,7 +59,7 @@ i am foo
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -95,7 +95,7 @@ i am foo
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -179,12 +179,12 @@ hello foo
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
             end
 
@@ -271,7 +271,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-exit.t b/debian/modules/http-lua/t/024-access/uthread-exit.t
index 02c2a1f..2757237 100644
--- a/debian/modules/http-lua/t/024-access/uthread-exit.t
+++ b/debian/modules/http-lua/t/024-access/uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -172,13 +172,13 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -262,7 +262,7 @@ f
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -298,10 +298,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -394,10 +394,10 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -491,7 +491,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -502,7 +502,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("172.105.207.225", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -582,7 +582,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -682,7 +682,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -788,7 +788,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -883,7 +883,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -977,7 +977,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1062,7 +1062,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1146,7 +1146,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1229,7 +1229,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-redirect.t b/debian/modules/http-lua/t/024-access/uthread-redirect.t
index 4eb4759..cb99a35 100644
--- a/debian/modules/http-lua/t/024-access/uthread-redirect.t
+++ b/debian/modules/http-lua/t/024-access/uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -113,7 +113,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-spawn.t b/debian/modules/http-lua/t/024-access/uthread-spawn.t
index 7c7ba3b..bc92ccd 100644
--- a/debian/modules/http-lua/t/024-access/uthread-spawn.t
+++ b/debian/modules/http-lua/t/024-access/uthread-spawn.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
             end
 
@@ -68,11 +68,11 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("in thread 1")
             end
 
-            function g()
+            local function g()
                 ngx.say("in thread 2")
             end
 
@@ -117,7 +117,7 @@ after 2
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -154,13 +154,13 @@ after sleep
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            function g()
+            local function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -210,7 +210,7 @@ delete thread 2
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.blah()
             end
 
@@ -241,9 +241,9 @@ qr/lua user thread aborted: runtime error: access_by_lua\(nginx\.conf:\d+\):3: a
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
-                res = ngx.location.capture("/proxy")
+                local res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -287,7 +287,7 @@ after capture: hello world
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -340,7 +340,7 @@ after capture: hello foo
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -395,13 +395,13 @@ capture: hello bar
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            function g()
+            local function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -473,7 +473,8 @@ g: after capture: hello bah
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -519,7 +520,8 @@ after g
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -567,7 +569,7 @@ hello in g()
     location /lua {
         access_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -600,7 +602,7 @@ status: running
     location /lua {
         access_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
             end
 
@@ -632,7 +634,8 @@ status: zombie
     location /lua {
         access_by_lua '
             local co
-            function f()
+            local g
+            local function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -671,7 +674,8 @@ status: normal
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -718,7 +722,7 @@ after f
         access_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -771,7 +775,7 @@ f 3
         access_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -780,7 +784,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            function g()
+            local function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -827,7 +831,7 @@ g 3
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -864,12 +868,12 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            function g()
+            local function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -915,7 +919,7 @@ hello from g
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -967,7 +971,7 @@ received: OK
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1028,7 +1032,7 @@ after)$
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1073,7 +1077,7 @@ body: hello world)$
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
diff --git a/debian/modules/http-lua/t/025-codecache.t b/debian/modules/http-lua/t/025-codecache.t
index 20791d7..22b78b2 100644
--- a/debian/modules/http-lua/t/025-codecache.t
+++ b/debian/modules/http-lua/t/025-codecache.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 155;
+plan tests => repeat_each() * 163;
 
 #$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
 
@@ -27,7 +27,7 @@ __DATA__
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -61,7 +61,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -95,7 +95,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -130,7 +130,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -166,7 +166,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -193,7 +193,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 6: code cache explicitly off (affects require) + content_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -204,7 +204,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
             f:write("module(..., package.seeall); ngx.say(102);")
             f:close()
             ngx.say("updated")
@@ -231,7 +231,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 7: code cache explicitly off (affects require) + content_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -240,7 +240,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
             f:write("module(..., package.seeall); ngx.say(102);")
             f:close()
             ngx.say("updated")
@@ -269,7 +269,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 8: code cache explicitly off (affects require) + set_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -279,7 +279,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
             f:write("module(..., package.seeall); return 102;")
             f:close()
             ngx.say("updated")
@@ -308,7 +308,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 9: code cache explicitly on (affects require) + set_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /lua {
         lua_code_cache on;
@@ -318,7 +318,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
             f:write("module(..., package.seeall); return 102;")
             f:close()
             ngx.say("updated")
@@ -355,7 +355,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("return 101")
             f:close()
             ngx.say("updated")
@@ -390,7 +390,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("return 101")
             f:close()
             ngx.say("updated")
@@ -468,7 +468,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 14: no clear builtin lib "string"
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location /lua {
@@ -504,7 +504,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 15: do not skip luarocks
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
      lua_code_cache off;"
 --- config
     location /main {
@@ -554,7 +554,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 16: do not skip luarocks*
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
      lua_code_cache off;"
 --- config
     location /main {
@@ -604,7 +604,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 17: clear _G table
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location /t {
@@ -1050,7 +1050,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
 
 === TEST 29: cosocket connection pool timeout (after Lua VM destroys)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location = /t {
@@ -1118,7 +1118,7 @@ qr/\blua tcp socket keepalive: free connection pool [0-9A-F]+ for "127.0.0.1:/,
 
 === TEST 30: cosocket connection pool timeout (before Lua VM destroys)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location = /t {
@@ -1244,3 +1244,133 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
 "decrementing the reference count for Lua VM: 1",
 "lua close the global Lua VM",
 ]
+
+
+
+=== TEST 32: make sure inline code keys are correct
+GitHub issue #1428
+--- config
+include ../html/a/proxy.conf;
+include ../html/b/proxy.conf;
+include ../html/c/proxy.conf;
+
+location /t {
+    echo_location /a/;
+    echo_location /b/;
+    echo_location /a/;
+    echo_location /c/;
+}
+
+--- user_files
+>>> a/proxy.conf
+location /a/ {
+    content_by_lua_block { ngx.say("/a/ is called") }
+}
+
+>>> b/proxy.conf
+location /b/ {
+    content_by_lua_block { ngx.say("/b/ is called") }
+}
+
+>>> c/proxy.conf
+location /c/ {
+    content_by_lua_block { ngx.say("/b/ is called") }
+}
+
+--- request
+GET /t
+--- response_body
+/a/ is called
+/b/ is called
+/a/ is called
+/b/ is called
+--- grep_error_log eval: qr/looking up Lua code cache with key '.*?'/
+--- grep_error_log_out eval
+[
+"looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+",
+"looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+"]
+--- log_level: debug
+--- no_error_log
+[error]
+
+
+
+=== TEST 33: make sure Lua code file keys are correct
+GitHub issue #1428
+--- config
+include ../html/a/proxy.conf;
+include ../html/b/proxy.conf;
+include ../html/c/proxy.conf;
+
+location /t {
+    echo_location /a/;
+    echo_location /b/;
+    echo_location /a/;
+    echo_location /c/;
+}
+
+--- user_files
+>>> a.lua
+ngx.say("/a/ is called")
+
+>>> b.lua
+ngx.say("/b/ is called")
+
+>>> c.lua
+ngx.say("/b/ is called")
+
+>>> a/proxy.conf
+location /a/ {
+    content_by_lua_file html/a.lua;
+}
+
+>>> b/proxy.conf
+location /b/ {
+    content_by_lua_file html/b.lua;
+}
+
+>>> c/proxy.conf
+location /c/ {
+    content_by_lua_file html/c.lua;
+}
+
+--- request
+GET /t
+--- response_body
+/a/ is called
+/b/ is called
+/a/ is called
+/b/ is called
+--- grep_error_log eval: qr/looking up Lua code cache with key '.*?'/
+--- grep_error_log_out eval
+[
+"looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
+looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
+",
+"looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
+looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
+looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
+looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
+"
+]
+--- log_level: debug
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/027-multi-capture.t b/debian/modules/http-lua/t/027-multi-capture.t
index 9227fe5..9299561 100644
--- a/debian/modules/http-lua/t/027-multi-capture.t
+++ b/debian/modules/http-lua/t/027-multi-capture.t
@@ -151,7 +151,7 @@ res2.body = b
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/foo?n=1")
+            local res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
@@ -743,7 +743,7 @@ proxy_cache_path conf/cache levels=1:2 keys_zone=STATIC:10m inactive=10m max_siz
 
     location = /proxy {
             proxy_cache STATIC;
-            proxy_pass http://agentzh.org:12345;
+            proxy_pass http://127.0.0.2:12345;
             proxy_cache_key $proxy_host$uri$args;
             proxy_cache_valid any 1s;
             #proxy_http_version 1.1;
diff --git a/debian/modules/http-lua/t/028-req-header.t b/debian/modules/http-lua/t/028-req-header.t
index ca92daa..8ddbb29 100644
--- a/debian/modules/http-lua/t/028-req-header.t
+++ b/debian/modules/http-lua/t/028-req-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 43);
+plan tests => repeat_each() * (2 * blocks() + 44);
 
 #no_diff();
 no_long_string();
@@ -2008,3 +2008,25 @@ found 3 headers.
 --- no_error_log
 lua exceeding request header limit
 [error]
+
+
+
+=== TEST 61: setting Host header clears cached $host variable
+--- config
+    location /req-header {
+        # this makes $host indexed and cacheable
+        set $foo $host;
+
+        content_by_lua_block {
+            ngx.say(ngx.var.host)
+            ngx.req.set_header("Host", "new");
+            ngx.say(ngx.var.host)
+        }
+    }
+--- request
+GET /req-header
+--- response_body
+localhost
+new
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/030-uri-args.t b/debian/modules/http-lua/t/030-uri-args.t
index a9d46ff..7af63c4 100644
--- a/debian/modules/http-lua/t/030-uri-args.t
+++ b/debian/modules/http-lua/t/030-uri-args.t
@@ -421,7 +421,7 @@ done
             ngx.req.set_uri_args("hello")
             ngx.req.set_uri("/bar", true);
         ';
-        proxy_pass http://agentzh.org:12345;
+        proxy_pass http://127.0.0.2:12345;
     }
 --- request
     GET /foo?world
@@ -568,7 +568,7 @@ HTTP/1.0 ca%20t=%25
             ngx.req.set_uri("/bar", true);
             ngx.exit(503)
         ';
-        proxy_pass http://agentzh.org:12345;
+        proxy_pass http://127.0.0.2:12345;
     }
 --- request
     GET /foo?world
@@ -586,7 +586,7 @@ hello
         #set $args 'hello';
         set $err '';
         access_by_lua '
-            res, err = pcall(ngx.req.set_uri, "/bar", true);
+            local res, err = pcall(ngx.req.set_uri, "/bar", true);
             ngx.var.err = err
         ';
         echo "err: $err";
@@ -626,7 +626,7 @@ uri: /bar
     location /foo {
         #set $args 'hello';
         content_by_lua '
-            res, err = pcall(ngx.req.set_uri, "/bar", true);
+            local res, err = pcall(ngx.req.set_uri, "/bar", true);
             ngx.say("err: ", err)
         ';
     }
@@ -665,7 +665,7 @@ uri: /bar
     location /foo {
         #set $args 'hello';
         set_by_lua $err '
-            res, err = pcall(ngx.req.set_uri, "/bar", true);
+            local res, err = pcall(ngx.req.set_uri, "/bar", true);
             return err
         ';
         echo "err: $err";
@@ -788,7 +788,7 @@ GET /lua
     location /lua {
         content_by_lua '
             local t = {bar = ngx.shared.dogs, foo = 3}
-            rc, err = pcall(ngx.encode_args, t)
+            local rc, err = pcall(ngx.encode_args, t)
             ngx.say("rc: ", rc, ", err: ", err)
         ';
     }
@@ -1112,6 +1112,7 @@ HTTP/1.0 a=3&b=5&b=6
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args)
 
@@ -1135,6 +1136,7 @@ b = foo
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=bar&b=foo&a=baz"
             args, err = ngx.decode_args(args)
 
@@ -1158,6 +1160,7 @@ b = foo
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = ""
             args, err = ngx.decode_args(args)
             if err then
@@ -1178,6 +1181,7 @@ n = 0
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a&b"
             args, err = ngx.decode_args(args)
             if err then
@@ -1200,6 +1204,7 @@ b = true
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=&b="
             args, err = ngx.decode_args(args)
 
@@ -1223,6 +1228,7 @@ b =
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args, 1)
             if err then
@@ -1246,6 +1252,7 @@ b = nil
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args, -1)
 
@@ -1270,7 +1277,7 @@ b = foo
     location /lua {
         content_by_lua '
             local s = "f+f=bar&B=foo"
-            args, err = ngx.decode_args(s)
+            local args, err = ngx.decode_args(s)
             if err then
                 ngx.say("err: ", err)
             end
@@ -1302,7 +1309,7 @@ s = f+f=bar&B=foo
     lua_need_request_body on;
     location /t {
         content_by_lua '
-            function split(s, delimiter)
+            local function split(s, delimiter)
                 local result = {}
                 local from = 1
                 local delim_from, delim_to = string.find(s, delimiter, from)
diff --git a/debian/modules/http-lua/t/034-match.t b/debian/modules/http-lua/t/034-match.t
index ebe5762..473a11f 100644
--- a/debian/modules/http-lua/t/034-match.t
+++ b/debian/modules/http-lua/t/034-match.t
@@ -21,7 +21,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)")
             if m then
                 ngx.say(m[0])
             else
@@ -40,7 +40,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\\\d+)")
+            local m = ngx.re.match("hello, 1234", "(\\\\d+)")
             if m then
                 ngx.say(m[0])
             else
@@ -59,7 +59,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\d+)")
+            local m = ngx.re.match("hello, 1234", "(\\d+)")
             if m then
                 ngx.say(m[0])
             else
@@ -80,7 +80,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "[[\\d+]]")
+            local m = ngx.re.match("hello, 1234", "[[\\d+]]")
             if m then
                 ngx.say(m[0])
             else
@@ -101,7 +101,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+")
+            local m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -122,7 +122,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "")
+            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -145,7 +145,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
+            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -168,7 +168,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "foo")
+            local m = ngx.re.match("hello, 1234", "foo")
             if m then
                 ngx.say(m[0])
             else
@@ -187,7 +187,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO")
+            local m = ngx.re.match("hello, 1234", "HELLO")
             if m then
                 ngx.say(m[0])
             else
@@ -206,7 +206,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO", "i")
+            local m = ngx.re.match("hello, 1234", "HELLO", "i")
             if m then
                 ngx.say(m[0])
             else
@@ -225,7 +225,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            rc, err = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iu")
+            local rc, err = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iu")
             if not rc then
                 ngx.say("FAIL: ", err)
                 return
@@ -249,7 +249,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "m")
+            local m = ngx.re.match("hello\\nworld", "^world", "m")
             if m then
                 ngx.say(m[0])
             else
@@ -268,7 +268,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "m")
+            local m = ngx.re.match("hello\\nworld", ".*", "m")
             if m then
                 ngx.say(m[0])
             else
@@ -287,7 +287,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "s")
+            local m = ngx.re.match("hello\\nworld", "^world", "s")
             if m then
                 ngx.say(m[0])
             else
@@ -306,7 +306,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "s")
+            local m = ngx.re.match("hello\\nworld", ".*", "s")
             if m then
                 ngx.say(m[0])
             else
@@ -326,7 +326,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "x")
+            local m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "x")
             if m then
                 ngx.say(m[0])
             else
@@ -372,7 +372,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Hm")
+            local rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Hm")
             if rc then
                 if m then
                     ngx.say(m[0])
@@ -395,7 +395,7 @@ error: .*?unknown flag "H" \(flags "Hm"\)
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, world", "(world)|(hello)", "x")
+            local m = ngx.re.match("hello, world", "(world)|(hello)", "x")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -418,7 +418,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)(h?)")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -442,7 +442,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "a")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "a")
             if m then
                 ngx.say(m[0])
             else
@@ -461,7 +461,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("1234, hello", "([0-9]+)", "a")
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "a")
             if m then
                 ngx.say(m[0])
             else
@@ -481,7 +481,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = {}
-            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -504,7 +504,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = { pos = 3 }
-            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -526,7 +526,7 @@ not matched!
 --- config
     location /re {
         set_by_lua $res '
-            m = ngx.re.match("hello, 1234", "([0-9]+)")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)")
             if m then
                 return m[0]
             else
@@ -569,7 +569,7 @@ baz
     }
 --- user_files
 >>> a.lua
-m = ngx.re.match("hello, 1234", "(\\\s+)")
+local m = ngx.re.match("hello, 1234", "(\\\s+)")
 if m then
     ngx.say("[", m[0], "]")
 else
@@ -595,7 +595,7 @@ end
 local uri = "<impact>2</impact>"
 local regex = '(?:>[\\w\\s]*</?\\w{2,}>)';
 ngx.say("regex: ", regex)
-m = ngx.re.match(uri, regex, "oi")
+local m = ngx.re.match(uri, regex, "oi")
 if m then
     ngx.say("[", m[0], "]")
 else
@@ -613,7 +613,7 @@ regex: (?:>[\w\s]*</?\w{2,}>)
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", [[\\d+]])
+            local m = ngx.re.match("hello, 1234", [[\\d+]])
             if m then
                 ngx.say(m[0])
             else
@@ -660,7 +660,7 @@ error: pcre_compile() failed: missing ) in "([0-9]+"
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", [[([0-9]+)]])
+            local m = ngx.re.match("hello, 1234", [[([0-9]+)]])
             if m then
                 ngx.say(m[0])
             else
@@ -1027,7 +1027,7 @@ exec opts: 0
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -1067,7 +1067,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -1101,7 +1101,7 @@ failed to match
         content_by_lua '
             local res = {}
             local s = "hello, 1234"
-            m = ngx.re.match(s, [[(\\d)(\\d)]], "o", nil, res)
+            local m = ngx.re.match(s, [[(\\d)(\\d)]], "o", nil, res)
             if m then
                 ngx.say("1: m size: ", #m)
                 ngx.say("1: res size: ", #res)
@@ -1132,11 +1132,12 @@ failed to match
 === TEST 48: init_by_lua
 --- http_config
     init_by_lua '
-        m = ngx.re.match("hello, 1234", "(\\\\d+)")
+        package.loaded.m = ngx.re.match("hello, 1234", "(\\\\d+)")
     ';
 --- config
     location /re {
         content_by_lua '
+            local m = package.loaded.m
             if m then
                 ngx.say(m[0])
             else
diff --git a/debian/modules/http-lua/t/035-gmatch.t b/debian/modules/http-lua/t/035-gmatch.t
index 0426997..0dfeaea 100644
--- a/debian/modules/http-lua/t/035-gmatch.t
+++ b/debian/modules/http-lua/t/035-gmatch.t
@@ -123,7 +123,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "a")
+            local it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "a")
             ngx.say(it())
         ';
     }
@@ -418,7 +418,7 @@ hello
         content_by_lua '
             local a = {}
             for i = 1, 3 do
-                it = ngx.re.gmatch("hello, world", "[a-z]+")
+                local it = ngx.re.gmatch("hello, world", "[a-z]+")
                 it()
                 collectgarbage()
                 table.insert(a, {"hello", "world"})
@@ -482,9 +482,9 @@ end
     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
+matched
+--- no_error_log
+[error]
 
 
 
@@ -518,7 +518,7 @@ matched: []
     location /re {
         content_by_lua '
             local it = ngx.re.gmatch("1234, 1234", "(?<first>[0-9]+)")
-            m = it()
+            local m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -555,7 +555,7 @@ matched: []
         content_by_lua '
             local it = ngx.re.gmatch("1234, abcd, 1234", "(?<first>[0-9]+)|(?<second>[a-z]+)")
 
-            m = it()
+            local m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -599,7 +599,7 @@ abcd
     location /re {
         content_by_lua '
             local it = ngx.re.gmatch("hello, 1234", "(?<first>[a-z]+), (?<first>[0-9]+)", "D")
-            m = it()
+            local m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -825,7 +825,7 @@ exec opts: 0
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -871,7 +871,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -881,7 +881,7 @@ if not it then
     return
 end
 
-res, err = it()
+local res, err = it()
 
 --[[
 ngx.update_time()
diff --git a/debian/modules/http-lua/t/036-sub.t b/debian/modules/http-lua/t/036-sub.t
index 2b4b075..3e88eba 100644
--- a/debian/modules/http-lua/t/036-sub.t
+++ b/debian/modules/http-lua/t/036-sub.t
@@ -590,7 +590,7 @@ s: a好
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -693,7 +693,7 @@ ab.cd
 
 location = /t {
     content_by_lua '
-        function test()
+        local function test()
             local data = [[
                 OUTER {FIRST}
 ]]
diff --git a/debian/modules/http-lua/t/037-gsub.t b/debian/modules/http-lua/t/037-gsub.t
index 4c5810d..41f86ac 100644
--- a/debian/modules/http-lua/t/037-gsub.t
+++ b/debian/modules/http-lua/t/037-gsub.t
@@ -511,7 +511,7 @@ s: aa
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/038-match-o.t b/debian/modules/http-lua/t/038-match-o.t
index d61ff1f..f6ae010 100644
--- a/debian/modules/http-lua/t/038-match-o.t
+++ b/debian/modules/http-lua/t/038-match-o.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -39,7 +39,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\\\d+)", "o")
+            local m = ngx.re.match("hello, 1234", "(\\\\d+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -58,7 +58,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\d+)", "o")
+            local m = ngx.re.match("hello, 1234", "(\\d+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -79,7 +79,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "[[\\d+]]", "o")
+            local m = ngx.re.match("hello, 1234", "[[\\d+]]", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -100,7 +100,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+", "o")
+            local m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -121,7 +121,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
+            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -144,7 +144,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "foo", "o")
+            local m = ngx.re.match("hello, 1234", "foo", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -163,7 +163,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO", "o")
+            local m = ngx.re.match("hello, 1234", "HELLO", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -182,7 +182,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO", "oi")
+            local m = ngx.re.match("hello, 1234", "HELLO", "oi")
             if m then
                 ngx.say(m[0])
             else
@@ -224,7 +224,7 @@ this version of PCRE is not compiled with PCRE_UTF8 support|^hello章亦$
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "mo")
+            local m = ngx.re.match("hello\\nworld", "^world", "mo")
             if m then
                 ngx.say(m[0])
             else
@@ -243,7 +243,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "om")
+            local m = ngx.re.match("hello\\nworld", ".*", "om")
             if m then
                 ngx.say(m[0])
             else
@@ -262,7 +262,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "so")
+            local m = ngx.re.match("hello\\nworld", "^world", "so")
             if m then
                 ngx.say(m[0])
             else
@@ -281,7 +281,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "os")
+            local m = ngx.re.match("hello\\nworld", ".*", "os")
             if m then
                 ngx.say(m[0])
             else
@@ -301,7 +301,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "xo")
+            local m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "xo")
             if m then
                 ngx.say(m[0])
             else
@@ -347,7 +347,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Ho")
+            local rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Ho")
             if rc then
                 if m then
                     ngx.say(m[0])
@@ -370,7 +370,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, world", "(world)|(hello)", "xo")
+            local m = ngx.re.match("hello, world", "(world)|(hello)", "xo")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -393,7 +393,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)", "o")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)(h?)", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -417,7 +417,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "oa")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "oa")
             if m then
                 ngx.say(m[0])
             else
@@ -436,7 +436,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("1234, hello", "([0-9]+)", "ao")
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "ao")
             if m then
                 ngx.say(m[0])
             else
@@ -456,7 +456,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = {}
-            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -479,7 +479,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = { pos = 3 }
-            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -501,7 +501,7 @@ not matched!
 --- config
     location /re {
         set_by_lua $res '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
             if m then
                 return m[0]
             else
diff --git a/debian/modules/http-lua/t/041-header-filter.t b/debian/modules/http-lua/t/041-header-filter.t
index 7d8ee74..0adc699 100644
--- a/debian/modules/http-lua/t/041-header-filter.t
+++ b/debian/modules/http-lua/t/041-header-filter.t
@@ -10,7 +10,7 @@ log_level('debug');
 
 repeat_each(2);
 
-plan tests => repeat_each() * 94;
+plan tests => repeat_each() * (blocks() * 2 + 13);
 
 #no_diff();
 #no_long_string();
@@ -416,7 +416,7 @@ lua release ngx.ctx
 
 
 
-=== TEST 20: global got cleared for each single request
+=== TEST 20: globals are shared by all requests
 --- config
     location /lua {
         set $foo '';
@@ -428,6 +428,7 @@ lua release ngx.ctx
             if not foo then
                 foo = 1
             else
+                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             ngx.var.foo = foo
@@ -435,10 +436,13 @@ lua release ngx.ctx
     }
 --- request
 GET /lua
---- response_body
-1
+--- response_body_like
+^[12]$
 --- no_error_log
 [error]
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["", "old foo: 1\n"]
 
 
 
@@ -730,7 +734,8 @@ hello world
 --- config
     location /t {
         header_filter_by_lua '
-            function foo()
+            local bar
+            local function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/043-shdict.t b/debian/modules/http-lua/t/043-shdict.t
index 9183bf5..b0528e5 100644
--- a/debian/modules/http-lua/t/043-shdict.t
+++ b/debian/modules/http-lua/t/043-shdict.t
@@ -420,7 +420,7 @@ ngx_slab_alloc() failed: no memory in lua_shared_dict zone
             ngx.say(dogs:get(key))
 
             key = string.rep("a", 65536)
-            ok, err = dogs:set(key, "world")
+            local ok, err = dogs:set(key, "world")
             if not ok then
                 ngx.say("not ok: ", err)
                 return
@@ -2048,7 +2048,7 @@ get_stale ok: false, stale: false
                 ngx.say("get not ok: ", err)
                 return
             end
-            flags = err
+            local flags = err
             ngx.say("get_stale ok: ", data, ", flags: ", flags,
                     ", stale: ", stale)
 
diff --git a/debian/modules/http-lua/t/047-match-jit.t b/debian/modules/http-lua/t/047-match-jit.t
index 2417a63..f53a408 100644
--- a/debian/modules/http-lua/t/047-match-jit.t
+++ b/debian/modules/http-lua/t/047-match-jit.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "j")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "j")
             if m then
                 ngx.say(m[0])
             else
@@ -41,7 +41,7 @@ pcre JIT compiling result: 1
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, world", "([0-9]+)", "j")
+            local m = ngx.re.match("hello, world", "([0-9]+)", "j")
             if m then
                 ngx.say(m[0])
             else
@@ -62,7 +62,7 @@ pcre JIT compiling result: 1
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "jo")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "jo")
             if m then
                 ngx.say(m[0])
             else
@@ -87,7 +87,7 @@ qr/pcre JIT compiling result: \d+/
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, world", "([0-9]+)", "jo")
+            local m = ngx.re.match("hello, world", "([0-9]+)", "jo")
             if m then
                 ngx.say(m[0])
             else
@@ -147,7 +147,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 21)
+local s = string.rep([[ABCDEFG]], 21)
 
 local start = ngx.now()
 
@@ -187,7 +187,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 21)
+local s = string.rep([[ABCDEFG]], 21)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/048-match-dfa.t b/debian/modules/http-lua/t/048-match-dfa.t
index 28b5a60..edf3662 100644
--- a/debian/modules/http-lua/t/048-match-dfa.t
+++ b/debian/modules/http-lua/t/048-match-dfa.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello", "(he|hell)", "d")
+            local m = ngx.re.match("hello", "(he|hell)", "d")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -43,7 +43,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello", "(he|hell)", "do")
+            local m = ngx.re.match("hello", "(he|hell)", "do")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -66,7 +66,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello", "(he|hell)", "jd")
+            local m = ngx.re.match("hello", "(he|hell)", "jd")
             if m then
                 ngx.say(m[0])
             else
@@ -85,7 +85,7 @@ hell
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("world", "(he|hell)", "d")
+            local m = ngx.re.match("world", "(he|hell)", "d")
             if m then
                 ngx.say(m[0])
             else
@@ -104,7 +104,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello", "he|hell", "do")
+            local m = ngx.re.match("hello", "he|hell", "do")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -127,7 +127,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("world", "([0-9]+)", "do")
+            local m = ngx.re.match("world", "([0-9]+)", "do")
             if m then
                 ngx.say(m[0])
             else
diff --git a/debian/modules/http-lua/t/055-subreq-vars.t b/debian/modules/http-lua/t/055-subreq-vars.t
index eb5e24d..1369992 100644
--- a/debian/modules/http-lua/t/055-subreq-vars.t
+++ b/debian/modules/http-lua/t/055-subreq-vars.t
@@ -28,7 +28,7 @@ __DATA__
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ qr/variable "(dog|cat)" cannot be assigned a value \(maybe you forgot to define
     location /lua {
         set $dog '';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -110,7 +110,7 @@ variable "cat" cannot be assigned a value (maybe you forgot to define it first?)
         set $dog '';
         set $cat '';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -137,7 +137,7 @@ cat = 32
         set $dog '';
         set $cat '';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = "hello" });
 
             ngx.print(res.body)
@@ -165,7 +165,7 @@ Bad vars option value
         set $dog '';
         set $cat '';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { cat = true } });
 
             ngx.print(res.body)
@@ -188,7 +188,7 @@ attempt to use bad variable value type boolean
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { args = "a=hello&b=32" }});
 
             ngx.print(res.body)
@@ -234,7 +234,7 @@ variable "query_string" not changeable
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { copy_all_vars = true });
 
             ngx.print(res.body)
@@ -259,7 +259,7 @@ GET /lua
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { share_all_vars = true });
 
             ngx.print(res.body)
@@ -284,7 +284,7 @@ GET /lua
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { dog = "hiya" }, copy_all_vars = true });
 
             ngx.print(res.body)
diff --git a/debian/modules/http-lua/t/056-flush.t b/debian/modules/http-lua/t/056-flush.t
index 6b697a4..bdd33d4 100644
--- a/debian/modules/http-lua/t/056-flush.t
+++ b/debian/modules/http-lua/t/056-flush.t
@@ -317,7 +317,7 @@ lua http 1.0 buffering makes ngx.flush() a no-op
 --- config
     location /test {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello, world")
                 ngx.flush(true)
                 coroutine.yield()
diff --git a/debian/modules/http-lua/t/057-flush-timeout.t b/debian/modules/http-lua/t/057-flush-timeout.t
index a046539..1f8cfaa 100644
--- a/debian/modules/http-lua/t/057-flush-timeout.t
+++ b/debian/modules/http-lua/t/057-flush-timeout.t
@@ -127,7 +127,7 @@ del timer 1234
     send_timeout 200ms;
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
diff --git a/debian/modules/http-lua/t/058-tcp-socket.t b/debian/modules/http-lua/t/058-tcp-socket.t
index 354a876..837006c 100644
--- a/debian/modules/http-lua/t/058-tcp-socket.t
+++ b/debian/modules/http-lua/t/058-tcp-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 199;
+plan tests => repeat_each() * 219;
 
 our $HtmlDir = html_dir;
 
@@ -245,11 +245,11 @@ attempt to send data on a closed socket:
 
 --- request
 GET /t
---- response_body
+--- response_body_like
 connected: 1
 request sent: 56
-first line received: HTTP/1.1 200 OK
-second line received: Server: openresty
+first line received: HTTP\/1\.1 200 OK
+second line received: (?:Date|Server): .*?
 --- no_error_log
 [error]
 --- timeout: 10
@@ -298,7 +298,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
     location /test {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -321,7 +321,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -914,7 +914,7 @@ close: 1 nil
                 end
             end
 
-            ok, err = sock:close()
+            local ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
     }
@@ -961,7 +961,7 @@ close: 1 nil
             line, err = sock:receive()
             ngx.say("receive: ", line, " ", err)
 
-            ok, err = sock:close()
+            local ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
     }
@@ -1057,7 +1057,7 @@ close: 1 nil
 
 === TEST 19: cannot survive across request boundary (send)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1116,7 +1116,7 @@ received: OK|failed to send request: closed)\$"
 
 === TEST 20: cannot survive across request boundary (receive)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1191,7 +1191,7 @@ 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1260,7 +1260,7 @@ received: OK|failed to close: closed)$/
 
 === TEST 22: cannot survive across request boundary (connect)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -2611,7 +2611,7 @@ close: 1 nil
             local ready = false
             local fatal = false
 
-            function f()
+            local function f()
                 local line, err, part = sock:receive()
                 if not line then
                     ngx.say("failed to receive the 1st line: ", err, " [", part, "]")
@@ -2672,7 +2672,7 @@ lua clean up the timer for pending ngx.sleep
 
 === TEST 44: bad request tries to connect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2726,7 +2726,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):7: bad request/
 
 === TEST 45: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2783,7 +2783,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 46: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2840,7 +2840,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 47: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2897,7 +2897,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 48: bad request tries to set keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2954,7 +2954,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 49: bad request tries to receiveuntil
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -3315,7 +3315,7 @@ close: 1 nil
 
             local thr = ngx.thread.spawn(function ()
                 sock = ngx.socket.tcp()
-                local ok, err = sock:connect("agentzh.org", 12345)
+                local ok, err = sock:connect("127.0.0.2", 12345)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -3464,7 +3464,7 @@ lua http cleanup reuse
                 ngx.say("failed to create timer: ", err)
             end
 
-            i = 1
+            local i = 1
             while not done do
                 local time = 0.005 * i
                 if time > 0.1 then
@@ -3545,7 +3545,7 @@ lua http cleanup reuse
                 ngx.say("failed to create timer: ", err)
             end
 
-            i = 1
+            local i = 1
             while not done do
                 local time = 0.005 * i
                 if time > 0.1 then
@@ -3720,10 +3720,10 @@ sudo iptables -I OUTPUT 1 -p udp --dport 10086 -j REJECT
     }
 --- request
 GET /t
---- response_body
-failed to connect: www.google.com could not be resolved
-failed to connect: www.google.com could not be resolved
-failed to connect: www.google.com could not be resolved
+--- response_body_like
+failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
+failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
+failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
 hello!
 --- error_log eval
 qr{\[alert\] .*? send\(\) failed \(\d+: Operation not permitted\) while resolving}
@@ -3808,3 +3808,315 @@ received:
 received: truefalsenil
 --- no_error_log
 [error]
+
+
+
+=== TEST 64: receiveany method in cosocket
+--- config
+    server_tokens off;
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+            local req = {
+                'GET /foo HTTP/1.0\r\n',
+                'Host: localhost\r\n',
+                'Connection: close\r\n\r\n',
+            }
+            local ok, err = sock:send(req)
+            if not ok then
+                ngx.say("send request failed: ", err)
+                return
+            end
+
+            -- skip http header
+            while true do
+                local data, err, _ = sock:receive('*l')
+                if err then
+                    ngx.say('unexpected error occurs when receiving http head: ', err)
+                    return
+                end
+
+                if #data == 0 then -- read last line of head
+                    break
+                end
+            end
+
+            -- receive http body
+            while true do
+                local data, err = sock:receiveany(1024)
+                if err then
+                    if err ~= 'closed' then
+                        ngx.say('unexpected err: ', err)
+                    end
+                    break
+                end
+                ngx.say(data)
+            end
+
+            sock:close()
+        }
+    }
+
+    location = /foo {
+        content_by_lua_block {
+            local resp = {
+                '1',
+                '22',
+                'hello world',
+            }
+
+            local length = 0
+            for _, v in ipairs(resp) do
+                length = length + #v
+            end
+
+            -- flush http header
+            ngx.header['Content-Length'] = length
+            ngx.flush(true)
+            ngx.sleep(0.01)
+
+            -- send http body
+            for _, v in ipairs(resp) do
+                ngx.print(v)
+                ngx.flush(true)
+                ngx.sleep(0.01)
+            end
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+1
+22
+hello world
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket read any
+
+
+
+=== TEST 65: receiveany send data after read side closed
+--- config
+    server_tokens off;
+    location = /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", 7658))
+
+            while true do
+                local data, err = sock:receiveany(1024)
+                if err then
+                    if err ~= 'closed' then
+                        ngx.say('unexpected err: ', err)
+                        break
+                    end
+
+                    local data = "send data after read side closed"
+                    local bytes, err = sock:send(data)
+                    if not bytes then
+                        ngx.say(err)
+                    end
+
+                    break
+                end
+                ngx.say(data)
+            end
+
+            sock:close()
+        }
+    }
+
+--- request
+GET /t
+--- tcp_listen: 7658
+--- tcp_shutdown: 1
+--- tcp_query eval: "send data after read side closed"
+--- tcp_query_len: 32
+--- response_body
+--- no_error_log
+[error]
+
+
+
+=== TEST 66: receiveany with limited, max <= 0
+--- config
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+
+            local function receiveany_say_err(...)
+                local ok, err = pcall(sock.receiveany, sock, ...)
+                if not ok then
+                    ngx.say(err)
+                end
+            end
+
+
+            receiveany_say_err(0)
+            receiveany_say_err(-1)
+            receiveany_say_err()
+            receiveany_say_err(nil)
+        }
+    }
+
+--- response_body
+bad argument #2 to '?' (bad max argument)
+bad argument #2 to '?' (bad max argument)
+expecting 2 arguments (including the object), but got 1
+bad argument #2 to '?' (bad max argument)
+--- request
+GET /t
+--- no_error_log
+[error]
+
+
+
+=== TEST 67: receiveany with limited, max is larger than data
+--- config
+    server_tokens off;
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+            local req = {
+                'GET /foo HTTP/1.0\r\n',
+                'Host: localhost\r\n',
+                'Connection: close\r\n\r\n',
+            }
+            local ok, err = sock:send(req)
+            if not ok then
+                ngx.say("send request failed: ", err)
+                return
+            end
+
+            while true do
+                local data, err, _ = sock:receive('*l')
+                if err then
+                    ngx.say('unexpected error occurs when receiving http head: ', err)
+                    return
+                end
+
+                if #data == 0 then -- read last line of head
+                    break
+                end
+            end
+
+            local data, err = sock:receiveany(128)
+            if err then
+                if err ~= 'closed' then
+                    ngx.say('unexpected err: ', err)
+                end
+            else
+                ngx.say(data)
+            end
+
+            sock:close()
+        }
+    }
+
+    location = /foo {
+        content_by_lua_block {
+            local resp = 'hello world'
+            local length = #resp
+
+            ngx.header['Content-Length'] = length
+            ngx.flush(true)
+            ngx.sleep(0.01)
+
+            ngx.print(resp)
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+hello world
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket calling receiveany() method to read at most 128 bytes
+
+
+
+=== TEST 68: receiveany with limited, max is smaller than data
+--- config
+    server_tokens off;
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+            local req = {
+                'GET /foo HTTP/1.0\r\n',
+                'Host: localhost\r\n',
+                'Connection: close\r\n\r\n',
+            }
+            local ok, err = sock:send(req)
+            if not ok then
+                ngx.say("send request failed: ", err)
+                return
+            end
+
+            while true do
+                local data, err, _ = sock:receive('*l')
+                if err then
+                    ngx.say('unexpected error occurs when receiving http head: ', err)
+                    return
+                end
+
+                if #data == 0 then -- read last line of head
+                    break
+                end
+            end
+
+            while true do
+                local data, err = sock:receiveany(7)
+                if err then
+                    if err ~= 'closed' then
+                        ngx.say('unexpected err: ', err)
+                    end
+                    break
+
+                else
+                    ngx.say(data)
+                end
+            end
+
+            sock:close()
+        }
+    }
+
+    location = /foo {
+        content_by_lua_block {
+            local resp = 'hello world'
+            local length = #resp
+
+            ngx.header['Content-Length'] = length
+            ngx.flush(true)
+            ngx.sleep(0.01)
+
+            ngx.print(resp)
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+hello w
+orld
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket calling receiveany() method to read at most 7 bytes
diff --git a/debian/modules/http-lua/t/062-count.t b/debian/modules/http-lua/t/062-count.t
index 2ad2f9f..9b0afe8 100644
--- a/debian/modules/http-lua/t/062-count.t
+++ b/debian/modules/http-lua/t/062-count.t
@@ -283,7 +283,7 @@ n = 5
 --- request
 GET /test
 --- response_body
-n = 18
+n = 22
 --- no_error_log
 [error]
 
@@ -444,7 +444,28 @@ worker: 4
 
 
 
-=== TEST 20: entries under the metatable of udp sockets
+=== TEST 20: entries under the metatable of tcp sockets
+--- config
+        location = /test {
+            content_by_lua_block {
+                local n = 0
+                local sock = ngx.socket.tcp()
+                for k, v in pairs(getmetatable(sock)) do
+                    n = n + 1
+                end
+                ngx.say("n = ", n)
+            }
+        }
+--- request
+GET /test
+--- response_body
+n = 13
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: entries under the metatable of udp sockets
 --- config
         location = /test {
             content_by_lua '
@@ -465,7 +486,7 @@ n = 6
 
 
 
-=== TEST 21: entries under the metatable of req raw sockets
+=== TEST 22: entries under the metatable of req raw sockets
 --- config
         location = /test {
             content_by_lua '
@@ -497,7 +518,7 @@ n = 6
 
 
 
-=== TEST 22: entries under the req raw sockets
+=== TEST 23: entries under the req raw sockets
 --- config
         location = /test {
             content_by_lua_block {
@@ -536,7 +557,7 @@ nrec = 3
 
 
 
-=== TEST 23: entries under the req sockets
+=== TEST 24: entries under the req sockets
 --- config
         location = /test {
             content_by_lua_block {
diff --git a/debian/modules/http-lua/t/063-abort.t b/debian/modules/http-lua/t/063-abort.t
index 411a07e..7c90eaa 100644
--- a/debian/modules/http-lua/t/063-abort.t
+++ b/debian/modules/http-lua/t/063-abort.t
@@ -22,7 +22,7 @@ __DATA__
 
 === TEST 1: ngx.exit(400) should abort print
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /memc_query {
             internal;
@@ -68,7 +68,7 @@ GET /test?a
 
 === TEST 2: ngx.exit(400) should abort ngx.log
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /memc_query {
             internal;
@@ -116,7 +116,7 @@ GET /test?a
 
 === TEST 3: ngx.exit(400) should abort ngx.location.capture
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /memc_query {
             internal;
@@ -161,7 +161,7 @@ the "$memc_key" variable is not set
 
 === TEST 4: ngx.exit(400) should abort ngx.location.capture_multi
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /memc_query {
             internal;
@@ -206,7 +206,7 @@ the "$memc_key" variable is not set
 
 === TEST 5: ngx.exit(400) should abort ngx.redirect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -233,7 +233,7 @@ lua redirect to "/blah" with code 302
 
 === TEST 6: ngx.exit(400) should abort ngx.exit
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -260,7 +260,7 @@ lua exit with code 503
 
 === TEST 7: ngx.exit(400) should abort ngx.exec
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -287,7 +287,7 @@ lua exec "/blah?"
 
 === TEST 8: ngx.exit(400) should abort ngx.send_headers
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -314,7 +314,7 @@ lua send headers
 
 === TEST 9: ngx.exit(400) should abort ngx.print
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -341,7 +341,7 @@ lua print response
 
 === TEST 10: ngx.exit(400) should abort ngx.say
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -368,7 +368,7 @@ lua say response
 
 === TEST 11: ngx.exit(400) should abort ngx.flush
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -395,7 +395,7 @@ lua flush asynchronously
 
 === TEST 12: ngx.exit(400) should abort ngx.eof
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -422,7 +422,7 @@ lua send eof
 
 === TEST 13: ngx.exit(400) should abort ngx.re.match
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -449,7 +449,7 @@ lua compiling match regex "a" with options "jo"
 
 === TEST 14: ngx.exit(400) should abort ngx.re.gmatch
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -476,7 +476,7 @@ lua compiling gmatch regex "a" with options "jo"
 
 === TEST 15: ngx.exit(400) should abort ngx.re.sub
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -503,7 +503,7 @@ lua compiling sub regex "a" with options "jo"
 
 === TEST 16: ngx.exit(400) should abort ngx.re.gsub
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -530,7 +530,7 @@ lua compiling gsub regex "a" with options "jo"
 
 === TEST 17: ngx.exit(400) should abort ngx.shared.DICT (set)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -560,7 +560,7 @@ foo = 56
 
 === TEST 18: ngx.exit(400) should abort ngx.shared.DICT (replace)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -590,7 +590,7 @@ foo = 56
 
 === TEST 19: ngx.exit(400) should abort ngx.shared.DICT (incr)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -620,7 +620,7 @@ foo = 88
 
 === TEST 20: ngx.exit(400) should abort ngx.shared.DICT (get)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -649,7 +649,7 @@ fetching key "foo" in shared dict "dogs"
 
 === TEST 21: ngx.exit(400) should skip os.execute
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -679,7 +679,7 @@ GET /test
 
 === TEST 22: ngx.exit(400) should break pcall and skip os.execute
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -709,7 +709,7 @@ fetching key "foo" in shared dict "dogs"
 
 === TEST 23: ngx.exit(400) should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -739,7 +739,7 @@ GET /test
 
 === TEST 24: ngx.redirect() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -769,7 +769,7 @@ GET /test
 
 === TEST 25: ngx.redirect() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -799,7 +799,7 @@ GET /test
 
 === TEST 26: ngx.exec() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -832,7 +832,7 @@ foo
 
 === TEST 27: ngx.exec() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -865,7 +865,7 @@ foo
 
 === TEST 28: ngx.set_uri(uri, true) should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             rewrite_by_lua '
@@ -921,7 +921,7 @@ hello world
 
 === TEST 30: ngx.exit(400) should break xpcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -955,7 +955,7 @@ GET /test
 
 === TEST 31: ngx.exec() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -988,7 +988,7 @@ foo
 
 === TEST 32: ngx.exec() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
diff --git a/debian/modules/http-lua/t/064-pcall.t b/debian/modules/http-lua/t/064-pcall.t
index 3011f3e..9af2de7 100644
--- a/debian/modules/http-lua/t/064-pcall.t
+++ b/debian/modules/http-lua/t/064-pcall.t
@@ -22,11 +22,11 @@ __DATA__
 
 === TEST 1: pcall works
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
-                function f(a, b)
+                local function f(a, b)
                     if a == 0 and b == 0 then
                         error("zero error")
                     end
@@ -58,11 +58,11 @@ $/s
 
 === TEST 2: xpcall works
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
-                function f(a, b)
+                local function f(a, b)
                     if a == 0 and b == 0 then
                         error("zero error")
                     end
@@ -70,15 +70,15 @@ $/s
                     return 23, "hello", true
                 end
 
-                function g()
+                local function g()
                     return f(0, 0)
                 end
 
-                function h()
+                local function h()
                     return f(0)
                 end
 
-                function err(...)
+                local function err(...)
                     ngx.say("error handler called: ", ...)
                     return "this is the new err"
                 end
diff --git a/debian/modules/http-lua/t/065-tcp-socket-timeout.t b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
index 78b8cff..092094a 100644
--- a/debian/modules/http-lua/t/065-tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
@@ -51,7 +51,7 @@ __DATA__
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -66,7 +66,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -81,7 +81,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(150)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -96,7 +96,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 150
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -110,7 +110,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(nil)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -125,7 +125,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 
 
 
@@ -139,7 +139,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(0)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -154,7 +154,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -168,7 +168,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(-1)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -584,7 +584,7 @@ bad timeout value
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -683,7 +683,7 @@ after
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("1: failed to connect: ", err)
 
@@ -707,7 +707,7 @@ GET /t
 2: connected: 1
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
diff --git a/debian/modules/http-lua/t/066-socket-receiveuntil.t b/debian/modules/http-lua/t/066-socket-receiveuntil.t
index ffe74aa..89d2abf 100644
--- a/debian/modules/http-lua/t/066-socket-receiveuntil.t
+++ b/debian/modules/http-lua/t/066-socket-receiveuntil.t
@@ -245,7 +245,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -316,7 +316,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -387,7 +387,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaa")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -458,7 +458,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -530,7 +530,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -602,7 +602,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -673,7 +673,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -744,7 +744,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -815,7 +815,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -886,7 +886,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -957,7 +957,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -1028,7 +1028,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1105,7 +1105,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1182,7 +1182,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1270,7 +1270,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
diff --git a/debian/modules/http-lua/t/067-req-socket.t b/debian/modules/http-lua/t/067-req-socket.t
index 229d5cc..6593360 100644
--- a/debian/modules/http-lua/t/067-req-socket.t
+++ b/debian/modules/http-lua/t/067-req-socket.t
@@ -320,7 +320,7 @@ found the end of the stream
 
 === TEST 4: attempt to use the req socket across request boundary
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         content_by_lua '
@@ -369,7 +369,7 @@ hello world
 === 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         content_by_lua '
@@ -431,7 +431,7 @@ done
 
 === TEST 6: pipelined POST requests
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         content_by_lua '
diff --git a/debian/modules/http-lua/t/068-socket-keepalive.t b/debian/modules/http-lua/t/068-socket-keepalive.t
index f052e9a..e4c6988 100644
--- a/debian/modules/http-lua/t/068-socket-keepalive.t
+++ b/debian/modules/http-lua/t/068-socket-keepalive.t
@@ -4,13 +4,14 @@ use Test::Nginx::Socket::Lua;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 5 + 9);
+plan tests => repeat_each() * (blocks() * 4 + 31);
 
 our $HtmlDir = html_dir;
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
 $ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
 
 $ENV{LUA_PATH} ||=
     '/usr/local/openresty-debug/lualib/?.lua;/usr/local/openresty/lualib/?.lua;;';
@@ -29,7 +30,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -97,7 +98,7 @@ lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGI
 
 === TEST 2: free up the whole connection pool if no active connections
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -168,7 +169,7 @@ received: OK
 
 === TEST 3: upstream sockets close prematurely
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
    server_tokens off;
    keepalive_timeout 100ms;
@@ -243,7 +244,7 @@ done
 
 === TEST 4: http keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
    server_tokens off;
    location /t {
@@ -701,7 +702,35 @@ qr/lua tcp socket connection pool size: 25\b/]
 
 
 
-=== TEST 10: sock:keepalive_timeout(0) means unlimited
+=== TEST 10: setkeepalive() 'pool_size' should be greater than zero
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua_block {
+            local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
+            if not sock then
+                ngx.say(err)
+                return
+            end
+
+            local ok, err = pcall(sock.setkeepalive, sock, 0, 0)
+            if not ok then
+                ngx.say(err)
+                return
+            end
+            ngx.say(ok)
+        }
+    }
+--- request
+GET /t
+--- response_body
+bad argument #3 to '?' (bad "pool_size" option value: 0)
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: sock:keepalive_timeout(0) means unlimited
 --- config
    server_tokens off;
    location /t {
@@ -776,10 +805,10 @@ qr/lua tcp socket connection pool size: 30\b/]
 
 
 
-=== TEST 11: sanity (uds)
+=== TEST 12: sanity (uds)
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -858,7 +887,7 @@ received response of 119 bytes
 
 
 
-=== TEST 12: github issue #108: ngx.locaiton.capture + redis.set_keepalive
+=== TEST 13: github issue #108: ngx.locaiton.capture + redis.set_keepalive
 --- http_config eval
     qq{
         lua_package_path "$::HtmlDir/?.lua;;";
@@ -905,9 +934,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 13: github issue #110: ngx.exit with HTTP_NOT_FOUND causes worker process to exit
+=== TEST 14: github issue #110: ngx.exit with HTTP_NOT_FOUND causes worker process to exit
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     error_page 404 /404.html;
     location /t {
@@ -964,9 +993,9 @@ Not found, dear...
 
 
 
-=== TEST 14: custom pools (different pool for the same host:port) - tcp
+=== TEST 15: custom pools (different pool for the same host:port) - tcp
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1012,9 +1041,9 @@ lua tcp socket keepalive create connection pool for key "B"
 
 
 
-=== TEST 15: custom pools (same pool for different host:port) - tcp
+=== TEST 16: custom pools (same pool for different host:port) - tcp
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1059,10 +1088,10 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 16: custom pools (different pool for the same host:port) - unix
+=== TEST 17: custom pools (different pool for the same host:port) - unix
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -1119,10 +1148,10 @@ lua tcp socket keepalive create connection pool for key "B"
 
 
 
-=== TEST 17: custom pools (same pool for the same path) - unix
+=== TEST 18: custom pools (same pool for the same path) - unix
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -1174,9 +1203,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 18: numeric pool option value
+=== TEST 19: numeric pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1221,9 +1250,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 19: nil pool option value
+=== TEST 20: nil pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1264,9 +1293,9 @@ connected: 1, reused: 0
 
 
 
-=== TEST 20: (bad) table pool option value
+=== TEST 21: (bad) table pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1305,9 +1334,9 @@ bad argument #3 to 'connect' (bad "pool" option type: table)
 
 
 
-=== TEST 21: (bad) boolean pool option value
+=== TEST 22: (bad) boolean pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1346,7 +1375,7 @@ bad argument #3 to 'connect' (bad "pool" option type: boolean)
 
 
 
-=== TEST 22: clear the redis store
+=== TEST 23: clear the redis store
 --- config
     location /t {
         redis2_query flushall;
@@ -1363,9 +1392,9 @@ bad argument #3 to 'connect' (bad "pool" option type: boolean)
 
 
 
-=== TEST 23: bug in send(): clear the chain writer ctx
+=== TEST 24: bug in send(): clear the chain writer ctx
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_REDIS_PORT;
@@ -1478,7 +1507,7 @@ done
 
 
 
-=== TEST 24: setkeepalive() with explicit nil args
+=== TEST 25: setkeepalive() with explicit nil args
 --- config
    server_tokens off;
    location /t {
@@ -1551,3 +1580,1379 @@ done
 "lua tcp socket keepalive timeout: 100 ms",
 qr/lua tcp socket connection pool size: 30\b/]
 --- timeout: 4
+
+
+
+=== TEST 26: conn queuing: connect() verifies the options for connection pool
+--- config
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local function check_opts_for_connect(opts)
+                local ok, err = pcall(function()
+                    sock:connect("127.0.0.1", ngx.var.port, opts)
+                end)
+                if not ok then
+                    ngx.say(err)
+                else
+                    ngx.say("ok")
+                end
+            end
+
+            check_opts_for_connect({pool_size = 'a'})
+            check_opts_for_connect({pool_size = 0})
+            check_opts_for_connect({backlog = -1})
+            check_opts_for_connect({backlog = 0})
+        }
+    }
+--- request
+GET /t
+--- response_body_like
+.+ 'connect' \(bad "pool_size" option type: string\)
+.+ 'connect' \(bad "pool_size" option value: 0\)
+.+ 'connect' \(bad "backlog" option value: -1\)
+ok
+--- no_error_log
+[error]
+
+
+
+=== TEST 27: conn queuing: connect() can specify 'pool_size' which overrides setkeepalive()
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local function go()
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", port, {pool_size = 1})
+                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(0, 20)
+                if not ok then
+                    ngx.say("failed to set reusable: ", err)
+                end
+            end
+
+            -- reuse ok
+            go()
+            go()
+
+            local sock1 = ngx.socket.connect("127.0.0.1", port)
+            local sock2 = ngx.socket.connect("127.0.0.1", port)
+            local ok, err = sock1:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+            local ok, err = sock2:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+
+            -- the pool_size is 1 instead of 20
+            sock1 = ngx.socket.connect("127.0.0.1", port)
+            sock2 = ngx.socket.connect("127.0.0.1", port)
+            ngx.say("reused: ", sock1:getreusedtimes())
+            ngx.say("reused: ", sock2:getreusedtimes())
+            sock1:setkeepalive(0, 20)
+            sock2:setkeepalive(0, 20)
+        }
+    }
+--- request
+GET /t
+--- response_body
+connected: 1, reused: 0
+request sent: 11
+received: OK
+connected: 1, reused: 1
+request sent: 11
+received: OK
+reused: 1
+reused: 0
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket connection pool size: 20"]
+--- error_log eval
+[qq{lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"},
+"lua tcp socket connection pool size: 1",
+]
+
+
+
+=== TEST 28: conn queuing: connect() can specify 'pool_size' for unix domain socket
+--- http_config eval
+"
+    server {
+        listen unix:$::HtmlDir/nginx.sock;
+    }
+"
+--- config
+    location /t {
+        content_by_lua_block {
+            local path = "unix:" .. "$TEST_NGINX_HTML_DIR/nginx.sock";
+            local function go()
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect(path, {pool_size = 1})
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+                local ok, err = sock:setkeepalive(0, 20)
+                if not ok then
+                    ngx.say("failed to set reusable: ", err)
+                end
+            end
+
+            go()
+            go()
+
+            local sock1 = ngx.socket.connect(path)
+            local sock2 = ngx.socket.connect(path)
+            local ok, err = sock1:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+            local ok, err = sock2:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+
+            -- the pool_size is 1 instead of 20
+            sock1 = ngx.socket.connect(path)
+            sock2 = ngx.socket.connect(path)
+            ngx.say("reused: ", sock1:getreusedtimes())
+            ngx.say("reused: ", sock2:getreusedtimes())
+            sock1:setkeepalive(0, 20)
+            sock2:setkeepalive(0, 20)
+        }
+    }
+--- request
+GET /t
+--- response_body
+connected: 1, reused: 0
+connected: 1, reused: 1
+reused: 1
+reused: 0
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket connection pool size: 20"]
+--- error_log eval
+["lua tcp socket get keepalive peer: using connection",
+'lua tcp socket keepalive create connection pool for key "unix:',
+"lua tcp socket connection pool size: 1",
+]
+
+
+
+=== TEST 29: conn queuing: connect() can specify 'pool_size' for custom pool
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local function go(pool)
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", port, {pool = pool, pool_size = 1})
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", pool, ", reused: ", sock:getreusedtimes())
+
+                local ok, err = sock:setkeepalive(0, 20)
+                if not ok then
+                    ngx.say("failed to set reusable: ", err)
+                end
+            end
+
+            go('A')
+            go('B')
+            go('A')
+            go('B')
+
+            local sock1 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
+            local sock2 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
+            local ok, err = sock1:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+            local ok, err = sock2:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+
+            -- the pool_size is 1 instead of 20
+            sock1 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
+            sock2 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
+            ngx.say("reused: ", sock1:getreusedtimes())
+            ngx.say("reused: ", sock2:getreusedtimes())
+            sock1:setkeepalive(0, 20)
+            sock2:setkeepalive(0, 20)
+        }
+    }
+--- request
+GET /t
+--- response_body
+connected: A, reused: 0
+connected: B, reused: 0
+connected: A, reused: 1
+connected: B, reused: 1
+reused: 1
+reused: 0
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket connection pool size: 20"]
+--- error_log eval
+[qq{lua tcp socket keepalive create connection pool for key "A"},
+qq{lua tcp socket keepalive create connection pool for key "B"},
+"lua tcp socket connection pool size: 1",
+]
+
+
+
+=== TEST 30: conn queuing: connect() uses lua_socket_pool_size as default if 'backlog' is given
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        lua_socket_pool_size 1234;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {backlog = 0}
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.say(err)
+            else
+                ngx.say("ok")
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- error_log
+lua tcp socket connection pool size: 1234
+--- no_error_log
+[error]
+
+
+
+=== TEST 31: conn queuing: more connect operations than 'backlog' size
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 2, backlog = 0}
+            local sock = ngx.socket.connect("127.0.0.1", port, opts)
+            local not_reused_socket, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not not_reused_socket then
+                ngx.say(err)
+                return
+            end
+            -- burst
+            local ok, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say(err)
+                return
+            end
+
+            ok, err = sock:connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+            ngx.say("reused: ", sock:getreusedtimes())
+            -- both queue and pool is full
+            ok, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+reused: 1
+too many waiting connect operations
+--- no_error_log
+[error]
+
+
+
+=== TEST 32: conn queuing: once 'pool_size' is reached and pool has 'backlog'
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 2, backlog = 2}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            ngx.timer.at(0, function(premature)
+                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock2 then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                ngx.log(ngx.WARN, "start to handle timer")
+                ngx.sleep(0.1)
+                sock2:close()
+                -- resume connect operation
+                ngx.log(ngx.WARN, "continue to handle timer")
+            end)
+
+            ngx.sleep(0.05)
+            ngx.log(ngx.WARN, "start to handle cosocket")
+            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock3 then
+                ngx.say(err)
+                return
+            end
+            ngx.log(ngx.WARN, "continue to handle cosocket")
+
+            local req = "flush_all\r\n"
+            local bytes, err = sock3:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local line, err, part = sock3:receive()
+            if line then
+                ngx.say("received: ", line)
+            else
+                ngx.say("failed to receive a line: ", err, " [", part, "]")
+            end
+
+            local ok, err = sock3:setkeepalive()
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+            ngx.say("setkeepalive: OK")
+        }
+    }
+--- request
+GET /t
+--- response_body
+request sent: 11
+received: OK
+setkeepalive: OK
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket queue connect operation for connection pool "127.0.0.1
+--- grep_error_log eval: qr/(start|continue) to handle \w+/
+--- grep_error_log_out
+start to handle timer
+start to handle cosocket
+continue to handle timer
+continue to handle cosocket
+
+
+
+=== TEST 33: conn queuing: do not count failed connect operations
+--- config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    resolver_timeout 3s;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 0}
+
+            local sock = ngx.socket.tcp()
+            sock:settimeouts(100, 3000, 3000)
+            local ok, err = sock:connect("127.0.0.2", 12345, opts)
+            if not ok then
+                ngx.say(err)
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.say(err)
+            end
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- error_log
+lua tcp socket connect timed out, when connecting to
+--- response_body
+timeout
+ok
+
+
+
+=== TEST 34: conn queuing: connect until backlog is reached
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 1}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            ngx.timer.at(0.01, function(premature)
+                ngx.log(ngx.WARN, "start to handle timer")
+                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock2 then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                ngx.sleep(0.02)
+                local ok, err = sock2:close()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+                ngx.log(ngx.WARN, "continue to handle timer")
+            end)
+
+            ngx.sleep(0.02)
+            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock3 then
+                ngx.say(err)
+            end
+            local ok, err = sock1:setkeepalive()
+            if not ok then
+                ngx.say(err)
+                return
+            end
+            ngx.sleep(0.01) -- run sock2
+
+            ngx.log(ngx.WARN, "start to handle cosocket")
+            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock3 then
+                ngx.say(err)
+                return
+            end
+            ngx.log(ngx.WARN, "continue to handle cosocket")
+
+            local ok, err = sock3:setkeepalive()
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket queue connect operation for connection pool "127.0.0.1
+--- grep_error_log eval: qr/queue connect operation for connection pool|(start|continue) to handle \w+/
+--- grep_error_log_out
+start to handle timer
+queue connect operation for connection pool
+start to handle cosocket
+queue connect operation for connection pool
+continue to handle timer
+continue to handle cosocket
+
+
+
+=== TEST 35: conn queuing: memory reuse for host in queueing connect operation ctx
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 3}
+            local sock = ngx.socket.connect("127.0.0.1", port, opts)
+
+            ngx.timer.at(0.01, function(premature)
+                local sock, err = ngx.socket.connect("0.0.0.0", port, opts)
+                if not sock then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                local ok, err = sock:close()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+            end)
+
+            ngx.timer.at(0.015, function(premature)
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                local ok, err = sock:close()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+            end)
+
+            ngx.timer.at(0.02, function(premature)
+                local sock, err = ngx.socket.connect("0.0.0.0", port, opts)
+                if not sock then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                local ok, err = sock:close()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+            end)
+
+            ngx.sleep(0.03)
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say(err)
+                return
+            end
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 36: conn queuing: connect() returns error after connect operation resumed
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+            local sock = ngx.socket.connect("127.0.0.1", port, opts)
+
+            ngx.timer.at(0, function(premature)
+                local sock, err = ngx.socket.connect("", port, opts)
+                if not sock then
+                    ngx.log(ngx.WARN, err)
+                end
+            end)
+
+            ngx.sleep(0.01)
+            -- use 'close' to force parsing host instead of reusing conn
+            local ok, err = sock:close()
+            if not ok then
+                ngx.say(err)
+                return
+            end
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+--- error_log
+failed to parse host name
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+
+
+
+=== TEST 37: conn queuing: in uthread
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 2}
+
+            local conn_sock = function()
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("start to handle uthread")
+
+                ngx.sleep(0.01)
+                sock:close()
+                ngx.say("continue to handle other uthread")
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock)
+            local co2 = ngx.thread.spawn(conn_sock)
+            local co3 = ngx.thread.spawn(conn_sock)
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.log(ngx.ERR, err)
+            end
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.thread.wait(co3)
+            ngx.say("all uthreads ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+start to handle uthread
+continue to handle other uthread
+start to handle uthread
+continue to handle other uthread
+all uthreads ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 38: conn queuing: in access_by_lua
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        access_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 2}
+
+            local conn_sock = function()
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("start to handle uthread")
+
+                ngx.sleep(0.01)
+                sock:close()
+                ngx.say("continue to handle other uthread")
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock)
+            local co2 = ngx.thread.spawn(conn_sock)
+            local co3 = ngx.thread.spawn(conn_sock)
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.log(ngx.ERR, err)
+            end
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.thread.wait(co3)
+            ngx.say("all uthreads ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+start to handle uthread
+continue to handle other uthread
+start to handle uthread
+continue to handle other uthread
+all uthreads ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 39: conn queuing: in rewrite_by_lua
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        rewrite_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 2}
+
+            local conn_sock = function()
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("start to handle uthread")
+
+                ngx.sleep(0.01)
+                sock:close()
+                ngx.say("continue to handle other uthread")
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock)
+            local co2 = ngx.thread.spawn(conn_sock)
+            local co3 = ngx.thread.spawn(conn_sock)
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.log(ngx.ERR, err)
+            end
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.thread.wait(co3)
+            ngx.say("all uthreads ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+start to handle uthread
+continue to handle other uthread
+start to handle uthread
+continue to handle other uthread
+all uthreads ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 40: conn queuing: in subrequest
+--- config
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /t {
+        content_by_lua_block {
+            local port = ngx.var.port
+            ngx.timer.at(0, function()
+                local opts = {pool_size = 1, backlog = 2}
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                ngx.sleep(0.1)
+                local ok, err = sock:setkeepalive()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+            end)
+
+            ngx.sleep(0.01)
+            local res1, res2, res3 = ngx.location.capture_multi{
+                {"/conn"}, {"/conn"}, {"/conn"}
+            }
+            ngx.say(res1.body)
+            ngx.say(res2.body)
+            ngx.say(res3.body)
+        }
+    }
+
+    location /conn {
+        content_by_lua_block {
+            local port = ngx.var.port
+            local sock, err = ngx.socket.connect("127.0.0.1", port)
+            if not sock then
+                ngx.print(err)
+                return
+            end
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.print(err)
+            else
+                ngx.print("ok")
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+ok
+too many waiting connect operations
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 41: conn queuing: timeouts when 'connect_timeout' is reached
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 1}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            local sock2 = ngx.socket.tcp()
+            sock2:settimeouts(10, 3000, 3000)
+            local ok, err = sock2:connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+timeout
+--- error_log eval
+"lua tcp socket queued connect timed out, when trying to connect to 127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
+
+
+
+=== TEST 42: conn queuing: set timeout via lua_socket_connect_timeout
+--- config
+    lua_socket_connect_timeout 10ms;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 1}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            local sock2 = ngx.socket.tcp()
+            local ok, err = sock2:connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+timeout
+--- error_log eval
+"lua tcp socket queued connect timed out, when trying to connect to 127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
+
+
+
+=== TEST 43: conn queuing: client aborting while connect operation is queued
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 1}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            local sock2 = ngx.socket.tcp()
+            sock2:settimeouts(3000, 3000, 3000)
+            local ok, err = sock2:connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- ignore_response
+--- timeout: 0.1
+--- abort
+--- no_error_log
+[error]
+
+
+
+=== TEST 44: conn queuing: resume next connect operation if resumed connect failed immediately
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 2}
+
+            local conn_sock = function(should_timeout)
+                local sock = ngx.socket.tcp()
+                local ok, err
+                if should_timeout then
+                    ok, err = sock:connect("", port, opts)
+                else
+                    ok, err = sock:connect("127.0.0.1", port, opts)
+                end
+                if not ok then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("connected in uthread")
+                sock:close()
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock, true)
+            local co2 = ngx.thread.spawn(conn_sock)
+
+            local ok, err = sock:close()
+            if not ok then
+                ngx.log(ngx.ERR, err)
+            end
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+failed to parse host name "": no host
+connected in uthread
+ok
+--- no_error_log
+[error]
+
+
+
+=== TEST 45: conn queuing: resume connect operation if resumed connect failed (timeout)
+--- config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    resolver_timeout 3s;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+
+            local conn_sock = function(should_timeout)
+                local sock = ngx.socket.tcp()
+                local ok, err
+                if should_timeout then
+                    sock:settimeouts(100, 3000, 3000)
+                    ok, err = sock:connect("127.0.0.2", 12345, opts)
+                else
+                    ok, err = sock:connect("127.0.0.1", port, opts)
+                end
+                if not ok then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("connected in uthread")
+                sock:close()
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock, true)
+            local co2 = ngx.thread.spawn(conn_sock)
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+timeout
+connected in uthread
+ok
+--- error_log
+queue connect operation for connection pool "test"
+lua tcp socket connect timed out, when connecting to
+
+
+
+=== TEST 46: conn queuing: resume connect operation if resumed connect failed (could not be resolved)
+--- config
+    resolver 127.0.0.2:12345 ipv6=off;
+    resolver_timeout 1s;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+
+            local conn_sock = function(should_timeout)
+                local sock = ngx.socket.tcp()
+                local ok, err
+                if should_timeout then
+                    sock:settimeouts(1, 3000, 3000)
+                    ok, err = sock:connect("agentzh.org", 80, opts)
+                else
+                    ok, err = sock:connect("127.0.0.1", port, opts)
+                end
+                if not ok then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("connected in uthread")
+                sock:close()
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock, true)
+            local co2 = ngx.thread.spawn(conn_sock)
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+agentzh.org could not be resolved (110: Operation timed out)
+connected in uthread
+ok
+--- error_log
+queue connect operation for connection pool "test"
+
+
+
+=== TEST 47: conn queuing: resume connect operation if resumed connect failed (connection refused)
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+
+            local conn_sock = function(should_timeout)
+                local sock = ngx.socket.tcp()
+                local ok, err
+                if should_timeout then
+                    sock:settimeouts(100, 3000, 3000)
+                    ok, err = sock:connect("127.0.0.1", 62345, opts)
+                else
+                    ok, err = sock:connect("127.0.0.1", port, opts)
+                end
+                if not ok then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("connected in uthread")
+                sock:close()
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock, true)
+            local co2 = ngx.thread.spawn(conn_sock)
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+connection refused
+connected in uthread
+ok
+--- error_log
+queue connect operation for connection pool "test"
+
+
+
+=== TEST 48: conn queuing: resume connect operation if resumed connect failed (uthread aborted while resolving)
+--- http_config
+    lua_package_path '../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;';
+--- config
+    resolver 127.0.0.1 ipv6=off;
+    resolver_timeout 100s;
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /sub {
+        content_by_lua_block {
+            local semaphore = require "ngx.semaphore"
+            local sem = semaphore.new()
+
+            local function f()
+                sem:wait(0.1)
+                ngx.exit(0)
+            end
+
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+            local port = ngx.var.port
+            ngx.timer.at(0, function()
+                sem:post()
+                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
+                package.loaded.for_timer_to_resume:post()
+                if not sock2 then
+                    ngx.log(ngx.ALERT, "resume connect failed: ", err)
+                    return
+                end
+
+                ngx.log(ngx.INFO, "resume success")
+            end)
+
+            ngx.thread.spawn(f)
+            local sock1, err = ngx.socket.connect("openresty.org", 80, opts)
+            if not sock1 then
+                ngx.say(err)
+                return
+            end
+        }
+    }
+
+    location /t {
+        content_by_lua_block {
+            local semaphore = require "ngx.semaphore"
+            local for_timer_to_resume = semaphore.new()
+            package.loaded.for_timer_to_resume = for_timer_to_resume
+
+            ngx.location.capture("/sub")
+            for_timer_to_resume:wait(0.1)
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[alert]
+--- error_log
+resume success
+
+
+
+=== TEST 49: conn queuing: resume connect operation if resumed connect failed (uthread killed while resolving)
+--- config
+    resolver 127.0.0.1 ipv6=off;
+    resolver_timeout 100s;
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /t {
+        content_by_lua_block {
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+            local port = ngx.var.port
+
+            local function resolve()
+                local sock1, err = ngx.socket.connect("openresty.org", 80, opts)
+                if not sock1 then
+                    ngx.say(err)
+                    return
+                end
+            end
+
+            local th = ngx.thread.spawn(resolve)
+            local ok, err = ngx.thread.kill(th)
+            if not ok then
+                ngx.log(ngx.ALERT, "kill thread failed: ", err)
+                return
+            end
+
+            local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock2 then
+                ngx.log(ngx.ALERT, "resume connect failed: ", err)
+                return
+            end
+
+            ngx.log(ngx.INFO, "resume success")
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[alert]
+--- error_log
+resume success
+
+
+
+=== TEST 50: conn queuing: increase the counter for connections created before creating the pool with setkeepalive()
+--- config
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /t {
+        content_by_lua_block {
+            local function connect()
+                local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
+                if not sock then
+                    error("connect failed: " .. err)
+                end
+
+                return sock
+            end
+
+            local sock1 = connect()
+            local sock2 = connect()
+            assert(sock1:setkeepalive())
+            assert(sock2:setkeepalive())
+
+            local sock1 = connect()
+            local sock2 = connect()
+            assert(sock1:close())
+            assert(sock2:close())
+
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+ok
+
+
+
+=== TEST 51: conn queuing: only decrease the counter for connections which were counted by the pool
+--- config
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /t {
+        content_by_lua_block {
+            local function connect()
+                local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
+                if not sock then
+                    error("connect failed: " .. err)
+                end
+
+                return sock
+            end
+
+            local sock1 = connect()
+            local sock2 = connect()
+            assert(sock1:setkeepalive(1000, 1))
+            assert(sock2:setkeepalive(1000, 1))
+
+            local sock1 = connect()
+            local sock2 = connect()
+            assert(sock1:close())
+            assert(sock2:close())
+
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+ok
+
+
+
+=== TEST 52: conn queuing: clean up pending connect operations which are in queue
+--- config
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /sub {
+        content_by_lua_block {
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+            local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port, opts)
+            if not sock then
+                ngx.say("connect failed: " .. err)
+                return
+            end
+
+            local function f()
+                assert(ngx.socket.connect("127.0.0.1", ngx.var.port, opts))
+            end
+
+            local th = ngx.thread.spawn(f)
+            local ok, err = ngx.thread.kill(th)
+            if not ok then
+                ngx.log(ngx.ERR, "kill thread failed: ", err)
+                return
+            end
+
+            sock:close()
+        }
+    }
+
+    location /t {
+        content_by_lua_block {
+            ngx.location.capture("/sub")
+            -- let pending connect operation resumes first
+            ngx.sleep(0)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket abort queueing
+--- response_body
+ok
diff --git a/debian/modules/http-lua/t/073-backtrace.t b/debian/modules/http-lua/t/073-backtrace.t
index 6c54692..663c3af 100644
--- a/debian/modules/http-lua/t/073-backtrace.t
+++ b/debian/modules/http-lua/t/073-backtrace.t
@@ -21,10 +21,10 @@ __DATA__
 --- config
     location /lua {
         content_by_lua
-        '   function bar()
+        '   local function bar()
                 return lua_concat(3)
             end
-            function foo()
+            local function foo()
                 bar()
             end
             foo()
@@ -37,7 +37,7 @@ GET /lua
 attempt to call global 'lua_concat'
 : in function 'bar'
 :5: in function 'foo'
-:7: in function
+:7: in main chunk
 
 
 
@@ -45,10 +45,10 @@ attempt to call global 'lua_concat'
 --- config
     location /lua {
         content_by_lua
-        '   function bar()
+        '   local function bar()
                 error(nil)
             end
-            function foo()
+            local function foo()
                 bar()
             end
             foo()
@@ -64,7 +64,7 @@ GET /lua
 " in function 'error'",
 ": in function 'bar'",
 ":5: in function 'foo'",
-qr/:7: in function <content_by_lua\(nginx\.conf:\d+\):1>/,
+qr/:7: in main chunk/,
 ]
 
 
@@ -125,7 +125,7 @@ probe process("$LIBLUA_PATH").function("lua_concat") {
 :63: in function 'func16'
 :67: in function 'func17'
 :71: in function 'func18'
-:74: in function
+:74: in main chunk
 
 
 
diff --git a/debian/modules/http-lua/t/075-logby.t b/debian/modules/http-lua/t/075-logby.t
index 520c62e..8eece69 100644
--- a/debian/modules/http-lua/t/075-logby.t
+++ b/debian/modules/http-lua/t/075-logby.t
@@ -220,7 +220,7 @@ failed to run log_by_lua*: unknown reason
 
 
 
-=== TEST 11: globals get cleared for every single request
+=== TEST 11: globals sharing
 --- config
     location /lua {
         echo ok;
@@ -228,6 +228,7 @@ failed to run log_by_lua*: unknown reason
             if not foo then
                 foo = 1
             else
+                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             ngx.log(ngx.WARN, "foo = ", foo)
@@ -237,8 +238,9 @@ failed to run log_by_lua*: unknown reason
 GET /lua
 --- response_body
 ok
---- error_log
-foo = 1
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["", "old foo: 1\n"]
 
 
 
@@ -495,7 +497,8 @@ API disabled in the context of log_by_lua*
     location /t {
         echo ok;
         log_by_lua '
-            function foo()
+            local bar
+            local function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/081-bytecode.t b/debian/modules/http-lua/t/081-bytecode.t
index cb50e94..92383bc 100644
--- a/debian/modules/http-lua/t/081-bytecode.t
+++ b/debian/modules/http-lua/t/081-bytecode.t
@@ -24,7 +24,7 @@ __DATA__
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             if jit then
                 if not string.find(jit.version, "LuaJIT 2.0") then
@@ -35,7 +35,8 @@ __DATA__
             else
                 f:write(string.sub(b, 1, 147));
             end
-            f:close(); res = ngx.location.capture("/call");
+            f:close();
+            local res = ngx.location.capture("/call");
             ngx.print(res.body)
         ';
     }
@@ -60,14 +61,15 @@ __DATA__
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local 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");
+            f:close();
+            local res = ngx.location.capture("/call");
             if res.status == 200 then
                 ngx.print(res.body)
             else
@@ -85,7 +87,7 @@ __DATA__
 --- response_body
 error
 --- error_log eval
-qr/failed to load external Lua file ".*?test\.lua": bad byte-code header/
+qr/failed to load external Lua file ".*?test\.lua": .* cannot load incompatible bytecode/
 
 
 
@@ -96,14 +98,15 @@ qr/failed to load external Lua file ".*?test\.lua": bad byte-code header/
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local 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");
+            f:close();
+            local res = ngx.location.capture("/call");
             if res.status == 200 then
                 ngx.print(res.body)
             else
@@ -121,7 +124,7 @@ qr/failed to load external Lua file ".*?test\.lua": bad byte-code header/
 --- response_body
 error
 --- error_log
-bytecode format version unsupported
+cannot load incompatible bytecode
 
 
 
@@ -132,7 +135,7 @@ bytecode format version unsupported
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             local do_jit
             if jit then
@@ -176,7 +179,7 @@ bytecode format version unsupported
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local 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
@@ -220,7 +223,7 @@ error
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             if jit then
                 if not string.find(jit.version, "LuaJIT 2.0") then
@@ -256,9 +259,9 @@ error
         content_by_lua '
             local bcsave = require "jit.bcsave"
             if jit then
-                local prefix = ngx.config.prefix()
-                local infile = prefix .. "html/a.lua"
-                local outfile = prefix .. "html/a.luac"
+                local prefix = "$TEST_NGINX_SERVER_ROOT"
+                local infile = prefix .. "/html/a.lua"
+                local outfile = prefix .. "/html/a.luac"
                 bcsave.start("-s", infile, outfile)
                 return ngx.exec("/call")
             end
@@ -289,9 +292,9 @@ ngx.status = 201 ngx.say("hello from Lua!")
         content_by_lua '
             local bcsave = require "jit.bcsave"
             if jit then
-                local prefix = ngx.config.prefix()
-                local infile = prefix .. "html/a.lua"
-                local outfile = prefix .. "html/a.luac"
+                local prefix = "$TEST_NGINX_SERVER_ROOT"
+                local infile = prefix .. "/html/a.lua"
+                local outfile = prefix .. "/html/a.luac"
                 bcsave.start("-g", infile, outfile)
                 return ngx.exec("/call")
             end
@@ -320,9 +323,9 @@ ngx.status = 201 ngx.say("hello from Lua!")
 --- config
     location = /t {
         content_by_lua_block {
-            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
+            local f = assert(loadstring("local a = 1 ngx.say('a = ', a)", "=code"))
             local bc = string.dump(f)
-            local f = assert(io.open("t/servroot/html/a.luac", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
             f:write(bc)
             f:close()
         }
@@ -349,9 +352,9 @@ a = 1
 --- config
     location = /t {
         content_by_lua_block {
-            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
+            local f = assert(loadstring("local a = 1 ngx.say('a = ', a)", "=code"))
             local bc = string.dump(f, true)
-            local f = assert(io.open("t/servroot/html/a.luac", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
             f:write(bc)
             f:close()
         }
diff --git a/debian/modules/http-lua/t/082-body-filter.t b/debian/modules/http-lua/t/082-body-filter.t
index 98efa84..5f765fa 100644
--- a/debian/modules/http-lua/t/082-body-filter.t
+++ b/debian/modules/http-lua/t/082-body-filter.t
@@ -460,7 +460,8 @@ GET /t
 --- config
     location /t {
         body_filter_by_lua '
-            function foo()
+            local bar
+            local function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/084-inclusive-receiveuntil.t b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
index f7d5d3d..66be893 100644
--- a/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
+++ b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
@@ -56,7 +56,7 @@ __DATA__
             local reader = sock:receiveuntil("abcabd", { inclusive = true })
 
             for i = 1, 3 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -128,7 +128,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe", { inclusive = true })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -200,7 +200,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd", { inclusive = true })
 
             for i = 1, 3 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -272,7 +272,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = nil })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -343,7 +343,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = false })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -414,7 +414,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = true })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -485,7 +485,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = "true" })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -552,7 +552,7 @@ bad "inclusive" option value type: string
             local reader = sock:receiveuntil("aa", { inclusive = "true" })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -620,7 +620,7 @@ bad "inclusive" option value type: string
             local reader = sock:receiveuntil("--abc", { inclusive = true })
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -697,7 +697,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc", { inclusive = true })
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
diff --git a/debian/modules/http-lua/t/087-udp-socket.t b/debian/modules/http-lua/t/087-udp-socket.t
index 8bedc32..dc6cad5 100644
--- a/debian/modules/http-lua/t/087-udp-socket.t
+++ b/debian/modules/http-lua/t/087-udp-socket.t
@@ -555,7 +555,7 @@ lua udp socket read timed out
 
             local udp = socket.udp()
 
-            udp:settimeout(2000) -- 2 sec
+            udp:settimeout(5000) -- 5 sec
 
             local ok, err = udp:setpeername("$TEST_NGINX_RESOLVER", 53)
             if not ok then
@@ -824,7 +824,7 @@ probe syscall.socket.return, syscall.connect.return {
 
 === TEST 15: bad request tries to setpeer
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -881,7 +881,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 16: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -938,7 +938,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 17: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -995,7 +995,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 18: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -1052,7 +1052,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 19: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
diff --git a/debian/modules/http-lua/t/090-log-socket-errors.t b/debian/modules/http-lua/t/090-log-socket-errors.t
index 16576b6..f5a9f80 100644
--- a/debian/modules/http-lua/t/090-log-socket-errors.t
+++ b/debian/modules/http-lua/t/090-log-socket-errors.t
@@ -28,7 +28,7 @@ __DATA__
         lua_socket_log_errors off;
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say(err)
         ';
     }
@@ -50,7 +50,7 @@ timeout
         lua_socket_log_errors on;
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say(err)
         ';
     }
@@ -59,7 +59,7 @@ GET /t
 --- response_body
 timeout
 --- error_log
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 
 
 
@@ -72,7 +72,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         lua_socket_read_timeout 1ms;
         content_by_lua '
             local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("agentzh.org", 12345)
+            local ok, err = sock:setpeername("127.0.0.2", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
@@ -95,7 +95,7 @@ lua udp socket read timed out
         lua_socket_read_timeout 1ms;
         content_by_lua '
             local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("agentzh.org", 12345)
+            local ok, err = sock:setpeername("127.0.0.2", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
diff --git a/debian/modules/http-lua/t/091-coroutine.t b/debian/modules/http-lua/t/091-coroutine.t
index bceb512..7cf60f9 100644
--- a/debian/modules/http-lua/t/091-coroutine.t
+++ b/debian/modules/http-lua/t/091-coroutine.t
@@ -85,7 +85,7 @@ __DATA__
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("Hello, ", cnt)
@@ -120,7 +120,7 @@ Hello, 2
 --- config
     location /lua {
         content_by_lua '
-            function f(fid)
+            local function f(fid)
                 local cnt = 0
                 while true do
                     ngx.say("cc", fid, ": ", cnt)
@@ -163,7 +163,7 @@ cc3: 2
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            function worker(url)
+            local function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -178,7 +178,7 @@ cc3: 2
 
             local urls = {
                 "agentzh.org",
-                "iscribblet.org",
+                "openresty.com",
                 "openresty.org"
             }
 
@@ -204,7 +204,7 @@ cc3: 2
 GET /lua
 --- response_body
 successfully connected to: agentzh.org
-successfully connected to: iscribblet.org
+successfully connected to: openresty.com
 successfully connected to: openresty.org
 *** All Done ***
 --- no_error_log
@@ -218,14 +218,14 @@ successfully connected to: openresty.org
     location /lua {
         content_by_lua '
             -- generate all the numbers from 2 to n
-            function gen (n)
+            local 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)
+            local function filter (p, g)
               return coroutine.wrap(function ()
                 while 1 do
                   local n = g()
@@ -235,8 +235,8 @@ successfully connected to: openresty.org
               end)
             end
 
-            N = 10
-            x = gen(N)		-- generate primes up to N
+            local N = 10
+            local 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
@@ -264,14 +264,14 @@ GET /lua
             coroutine.create = nil
             coroutine.resume = nil
             -- generate all the numbers from 2 to n
-            function gen (n)
+            local 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)
+            local function filter (p, g)
               return coroutine.wrap(function ()
                 while 1 do
                   local n = g()
@@ -281,8 +281,8 @@ GET /lua
               end)
             end
 
-            N = 10 
-            x = gen(N)		-- generate primes up to N
+            local N = 10 
+            local 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
@@ -307,7 +307,7 @@ GET /lua
 --- config
     location /lua {
         content_by_lua '
-            function generatefib (n)
+            local function generatefib (n)
               return coroutine.wrap(function ()
                 local a,b = 1, 1
                 while a <= n do
@@ -362,7 +362,7 @@ GET /lua
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            function worker(url)
+            local function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -377,7 +377,7 @@ GET /lua
 
             local urls = {
                 "agentzh.org",
-                "iscribblet.org",
+                "openresty.com",
                 "openresty.org"
             }
 
@@ -398,7 +398,7 @@ GET /lua
 GET /lua
 --- response_body
 successfully connected to: agentzh.org
-successfully connected to: iscribblet.org
+successfully connected to: openresty.com
 successfully connected to: openresty.org
 *** All Done ***
 --- no_error_log
@@ -414,7 +414,7 @@ successfully connected to: openresty.org
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
             local st, rn = coroutine.status, coroutine.running
 
-            function f(self)
+            local function f(self)
                 local cnt = 0
                 if rn() ~= self then ngx.say("error"); return end
                 ngx.say("running: ", st(self)) --running
@@ -509,7 +509,7 @@ GET /lua
 --- config
     location /lua {
         content_by_lua '
-            function print(...)
+            local function print(...)
                 local args = {...}
                 local is_first = true
                 for i,v in ipairs(args) do
@@ -523,12 +523,12 @@ GET /lua
                 ngx.print("\\\n")
             end
 
-            function foo (a)
+            local function foo (a)
                 print("foo", a)
                 return coroutine.yield(2*a)
             end
 
-            co = coroutine.create(function (a,b)
+            local co = coroutine.create(function (a,b)
                     print("co-body", a, b)
                     local r = foo(a+1)
                     print("co-body", r)
@@ -566,7 +566,8 @@ main false cannot resume dead coroutine
             local create = coroutine.create
             local resume = coroutine.resume
             local yield = coroutine.yield
-            function f()
+            local g
+            local function f()
                 ngx.say("f begin")
                 yield()
                 local c2 = create(g)
@@ -627,8 +628,9 @@ main done
             local yield = coroutine.yield
 
             local code = 400
+            local g
 
-            function f()
+            local function f()
                 local c2 = create(g)
                 yield()
                 code = code + 1
@@ -683,8 +685,9 @@ exit
             local yield = coroutine.yield
 
             local code = 0
+            local g
 
-            function f()
+            local function f()
                 local c2 = create(g)
                 yield()
                 code = code + 1
@@ -740,7 +743,7 @@ num: 3
     location /lua {
         echo hello;
         header_filter_by_lua '
-            function f()
+            local function f()
                 yield()
             end
 
@@ -764,13 +767,13 @@ API disabled in the context of header_filter_by_lua*
 
             local c1, c2
 
-            function f()
+            local function f()
                 print("f 1")
                 print(coroutine.resume(c2))
                 print("f 2")
             end
 
-            function g()
+            local function g()
                 print("g 1")
                 -- print(coroutine.resume(c1))
                 print("g 2")
@@ -803,13 +806,13 @@ f 2
 
             local c1, c2
 
-            function f()
+            local function f()
                 print("f 1")
                 print(coroutine.resume(c2))
                 print("f 2")
             end
 
-            function g()
+            local function g()
                 print("g 1")
                 print(coroutine.resume(c1))
                 print("g 2")
@@ -859,7 +862,7 @@ falsecannot resume running coroutine
     location /t {
         content_by_lua '
             local co
-            function f()
+            local function f()
                 ngx.say("f: ", coroutine.status(co))
                 ngx.say("f: ", coroutine.resume(co))
             end
@@ -885,7 +888,7 @@ chunk: true
     location /t {
         content_by_lua '
             local co
-            function f()
+            local function f()
                 error("bad")
             end
             co = coroutine.create(f)
@@ -990,7 +993,7 @@ test10
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            function worker(url)
+            local function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -1044,7 +1047,7 @@ successfully connected to: agentzh.org
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            function worker(url)
+            local function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -1104,7 +1107,7 @@ successfully connected to: agentzh.org
 --- config
     location /cotest {
         content_by_lua '
-            function generator()
+            local function generator()
                 return co_wrap(function()
                     co_yield("data")
                 end)
@@ -1133,7 +1136,7 @@ data
 --- config
     location /cotest {
         content_by_lua '
-            function generator()
+            local function generator()
                 return co_wrap(function()
                     co_yield("data")
                 end)
@@ -1166,7 +1169,7 @@ data
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 return 3
             end
 
@@ -1199,7 +1202,7 @@ ok
             local coroutine = require "coroutine"
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("Hello, ", cnt)
@@ -1238,7 +1241,7 @@ Hello, 2
         header_filter_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     print("co yield: ", cnt)
@@ -1278,7 +1281,7 @@ co yield: 2
         body_filter_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     print("co yield: ", cnt)
diff --git a/debian/modules/http-lua/t/093-uthread-spawn.t b/debian/modules/http-lua/t/093-uthread-spawn.t
index b622d30..ab6db2f 100644
--- a/debian/modules/http-lua/t/093-uthread-spawn.t
+++ b/debian/modules/http-lua/t/093-uthread-spawn.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
             end
 
@@ -58,11 +58,11 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("in thread 1")
             end
 
-            function g()
+            local function g()
                 ngx.say("in thread 2")
             end
 
@@ -107,7 +107,7 @@ after 2
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -144,13 +144,13 @@ after sleep
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            function g()
+            local function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -200,7 +200,7 @@ delete thread 2
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.blah()
             end
 
@@ -231,9 +231,9 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):3:
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
-                res = ngx.location.capture("/proxy")
+                local res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -277,7 +277,7 @@ after capture: hello world
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -330,7 +330,7 @@ after capture: hello foo
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -384,13 +384,13 @@ capture: hello bar
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            function g()
+            local function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -462,7 +462,8 @@ g: after capture: hello bah
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -508,7 +509,8 @@ after g
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -556,7 +558,7 @@ hello in g()
     location /lua {
         content_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -589,7 +591,7 @@ status: running
     location /lua {
         content_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
             end
 
@@ -621,7 +623,8 @@ status: zombie
     location /lua {
         content_by_lua '
             local co
-            function f()
+            local g
+            local function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -660,7 +663,8 @@ status: normal
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -707,7 +711,7 @@ after f
         content_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -760,7 +764,7 @@ f 3
         content_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -769,7 +773,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            function g()
+            local function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -816,7 +820,7 @@ g 3
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -853,12 +857,12 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            function g()
+            local function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -904,7 +908,7 @@ hello from g
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -956,7 +960,7 @@ received: OK
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1018,7 +1022,7 @@ after)$
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1063,7 +1067,7 @@ body: hello world)$
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
@@ -1113,7 +1117,7 @@ body: hello world)$
 --- config
     location /lua {
         content_by_lua '
-            function f(a, b)
+            local function f(a, b)
                 ngx.say("hello ", a, " and ", b)
             end
 
@@ -1647,7 +1651,7 @@ ok
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
             end
diff --git a/debian/modules/http-lua/t/094-uthread-exit.t b/debian/modules/http-lua/t/094-uthread-exit.t
index 2f7d9ba..58d8d0b 100644
--- a/debian/modules/http-lua/t/094-uthread-exit.t
+++ b/debian/modules/http-lua/t/094-uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -171,13 +171,13 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -261,7 +261,7 @@ f
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -297,10 +297,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -393,10 +393,10 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -490,7 +490,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -501,7 +501,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("172.105.207.225", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -580,7 +580,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -680,7 +680,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -786,7 +786,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -881,7 +881,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -974,7 +974,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1059,7 +1059,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1142,7 +1142,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1225,7 +1225,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1315,7 +1315,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture_multi{
                     {"/echo"},
                     {"/sleep"}
@@ -1407,7 +1407,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(444)
@@ -1490,7 +1490,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(408)
@@ -1573,7 +1573,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(499)
diff --git a/debian/modules/http-lua/t/095-uthread-exec.t b/debian/modules/http-lua/t/095-uthread-exec.t
index 56156c4..7bf37c0 100644
--- a/debian/modules/http-lua/t/095-uthread-exec.t
+++ b/debian/modules/http-lua/t/095-uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.exec("/foo")
             end
 
@@ -58,7 +58,7 @@ i am foo
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -93,7 +93,7 @@ i am foo
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -175,12 +175,12 @@ hello foo
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
             end
 
@@ -267,7 +267,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -348,7 +348,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture("/sleep")
                 ngx.say("end")
             end
diff --git a/debian/modules/http-lua/t/096-uthread-redirect.t b/debian/modules/http-lua/t/096-uthread-redirect.t
index 003c642..95bff01 100644
--- a/debian/modules/http-lua/t/096-uthread-redirect.t
+++ b/debian/modules/http-lua/t/096-uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -114,7 +114,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -194,7 +194,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture_multi{
                     {"/echo"},
                     {"/sleep"}
diff --git a/debian/modules/http-lua/t/097-uthread-rewrite.t b/debian/modules/http-lua/t/097-uthread-rewrite.t
index 2f0c06f..998e256 100644
--- a/debian/modules/http-lua/t/097-uthread-rewrite.t
+++ b/debian/modules/http-lua/t/097-uthread-rewrite.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.req.set_uri("/foo", true)
             end
 
@@ -58,7 +58,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
@@ -93,7 +93,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
@@ -175,12 +175,12 @@ hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
             end
 
@@ -267,7 +267,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
diff --git a/debian/modules/http-lua/t/098-uthread-wait.t b/debian/modules/http-lua/t/098-uthread-wait.t
index 4948596..c2819ae 100644
--- a/debian/modules/http-lua/t/098-uthread-wait.t
+++ b/debian/modules/http-lua/t/098-uthread-wait.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 return "done"
             end
@@ -72,7 +72,7 @@ done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done"
@@ -120,13 +120,13 @@ done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -200,13 +200,13 @@ f: done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -228,7 +228,7 @@ f: done
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            ok, res = ngx.thread.wait(tf)
+            local ok, res = ngx.thread.wait(tf)
             if not ok then
                 ngx.say("failed to wait f: ", res)
                 return
@@ -281,7 +281,7 @@ g: done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 return "done", 3.14
             end
@@ -330,7 +330,7 @@ res: done 3.14
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done", 3.14
@@ -378,7 +378,7 @@ res: done 3.14
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 error("bad bad!")
             end
@@ -427,7 +427,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):4:
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 error("bad bad!")
@@ -477,12 +477,12 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):5:
 --- config
     location /lua {
         content_by_lua '
-            function g()
+            local function g()
                 ngx.say("hello in thread")
                 return "done"
             end
 
-            function f()
+            local function f()
                 local t, err = ngx.thread.spawn(g)
                 if not t then
                     ngx.say("failed to spawn thread: ", err)
@@ -533,13 +533,13 @@ done
 --- config
     location /lua {
         content_by_lua '
-            function g()
+            local function g()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done"
             end
 
-            function f()
+            local function f()
                 local t, err = ngx.thread.spawn(g)
                 if not t then
                     ngx.say("failed to spawn thread: ", err)
@@ -593,12 +593,12 @@ done
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 out("f: hello")
                 return "f done"
             end
 
-            function g()
+            local function g()
                 out("g: hello")
                 return "g done"
             end
@@ -668,13 +668,13 @@ g status: zombie
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 out("f: hello")
                 return "f done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 out("g: hello")
                 return "g done"
@@ -745,13 +745,13 @@ g: hello
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 ngx.sleep(0.2)
                 out("f: hello")
                 return "f done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.1)
                 out("g: hello")
                 return "g done"
@@ -822,12 +822,12 @@ f: hello
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 out("f: hello")
                 error("f done")
             end
 
-            function g()
+            local function g()
                 out("g: hello")
                 error("g done")
             end
@@ -896,13 +896,13 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):7:
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 out("f: hello")
                 error("f done")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 out("g: hello")
                 error("g done")
@@ -969,13 +969,13 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):8:
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -997,7 +997,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):8:
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            ok, res = ngx.thread.wait(tf, tg)
+            local ok, res = ngx.thread.wait(tf, tg)
             if not ok then
                 ngx.say("failed to wait: ", res)
                 return
@@ -1038,13 +1038,13 @@ res: done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.2)
                 ngx.say("f: hello")
                 return "f done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.1)
                 ngx.say("g: hello")
                 return "g done"
@@ -1066,7 +1066,7 @@ res: done
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            ok, res = ngx.thread.wait(tf, tg)
+            local ok, res = ngx.thread.wait(tf, tg)
             if not ok then
                 ngx.say("failed to wait: ", res)
                 return
@@ -1109,12 +1109,12 @@ res: g done
         content_by_lua '
             local t
 
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 return "done"
             end
 
-            function g()
+            local function g()
                 t = ngx.thread.spawn(f)
             end
 
@@ -1154,7 +1154,7 @@ only the parent coroutine can wait on the thread
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 coroutine.yield()
                 return "done"
@@ -1192,7 +1192,7 @@ qr/lua entry thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):11
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 collectgarbage()
                 error("f done")
@@ -1228,7 +1228,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):5:
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 return "done"
             end
@@ -1283,7 +1283,7 @@ failed to run thread: already waited or killed
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 -- ngx.say("hello in thread")
                 return "done"
             end
diff --git a/debian/modules/http-lua/t/099-c-api.t b/debian/modules/http-lua/t/099-c-api.t
index a0b375c..5033462 100644
--- a/debian/modules/http-lua/t/099-c-api.t
+++ b/debian/modules/http-lua/t/099-c-api.t
@@ -86,7 +86,7 @@ dogs zone: defined
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -149,7 +149,7 @@ bar: rc=0, type=3, val=3.14159
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -212,7 +212,7 @@ bar: rc=0, type=1, val=0
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -272,7 +272,7 @@ bar: rc=-5
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local s = ffi.new("char[?]", 20)
 
@@ -344,7 +344,7 @@ bar: rc=0, type=4, val=, len=0
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
diff --git a/debian/modules/http-lua/t/100-client-abort.t b/debian/modules/http-lua/t/100-client-abort.t
index 89c1f6a..f571387 100644
--- a/debian/modules/http-lua/t/100-client-abort.t
+++ b/debian/modules/http-lua/t/100-client-abort.t
@@ -195,7 +195,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 
     location = /sleep {
@@ -236,7 +236,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 --- request
 GET /t
@@ -540,7 +540,7 @@ client prematurely closed connection
                 return
             end
 
-            ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            local 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
diff --git a/debian/modules/http-lua/t/106-timer.t b/debian/modules/http-lua/t/106-timer.t
index 3e4741e..7b7c85e 100644
--- a/debian/modules/http-lua/t/106-timer.t
+++ b/debian/modules/http-lua/t/106-timer.t
@@ -76,7 +76,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])
 
 
 
-=== TEST 2: separated global env
+=== TEST 2: globals are shared
 --- config
     location /t {
         content_by_lua '
@@ -104,7 +104,7 @@ F(ngx_http_lua_timer_handler) {
 
 --- response_body
 registered timer
-foo = nil
+foo = 3
 
 --- wait: 0.1
 --- no_error_log
@@ -320,7 +320,7 @@ qr/received: Server: \S+/,
 
 === TEST 6: tcp cosocket in timer handler (keep-alive connections)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -596,7 +596,7 @@ qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
 
 === TEST 10: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -693,7 +693,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 11: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -799,7 +799,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 12: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -912,7 +912,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 13: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -1023,7 +1023,7 @@ qr/go\(\): connected: 1, reused: \d+/,
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
             local function f()
-                function f()
+                local function f()
                     local cnt = 0
                     for i = 1, 20 do
                         print("cnt = ", cnt)
@@ -1090,7 +1090,7 @@ registered timer
                 ngx.log(ngx.ERR, ...)
             end
             local function handle()
-                function f()
+                local function f()
                     print("hello in thread")
                     return "done"
                 end
diff --git a/debian/modules/http-lua/t/108-timer-safe.t b/debian/modules/http-lua/t/108-timer-safe.t
index 2795998..758d01a 100644
--- a/debian/modules/http-lua/t/108-timer-safe.t
+++ b/debian/modules/http-lua/t/108-timer-safe.t
@@ -229,7 +229,7 @@ qr/received: Server: \S+/,
 
 === TEST 4: tcp cosocket in timer handler (keep-alive connections)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -489,7 +489,7 @@ delete thread 2
 --- response_body
 hello world
 
---- wait: 0.1
+--- wait: 0.15
 --- no_error_log
 [error]
 [alert]
@@ -499,7 +499,7 @@ hello world
 [
 "registered timer",
 qr/\[lua\] .*? my lua timer handler/,
-qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
+qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-9]|8[0-6])/,
 "lua ngx.timer expired",
 "http lua close fake http connection"
 ]
@@ -508,7 +508,7 @@ qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
 
 === TEST 8: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -606,7 +606,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 9: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -713,7 +713,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 10: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -827,7 +827,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 11: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -1007,7 +1007,7 @@ registered timer
                 ngx.log(ngx.ERR, ...)
             end
             local function handle()
-                function f()
+                local function f()
                     print("hello in thread")
                     return "done"
                 end
diff --git a/debian/modules/http-lua/t/109-timer-hup.t b/debian/modules/http-lua/t/109-timer-hup.t
index 0864046..2c197c2 100644
--- a/debian/modules/http-lua/t/109-timer-hup.t
+++ b/debian/modules/http-lua/t/109-timer-hup.t
@@ -46,7 +46,7 @@ __DATA__
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -99,7 +99,7 @@ timer prematurely expired: true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -163,7 +163,7 @@ timer prematurely expired: true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -219,7 +219,7 @@ failed to register a new timer after reload: process exiting, context: ngx.timer
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -284,7 +284,7 @@ g: exiting=true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -363,7 +363,7 @@ lua found 100 pending timers
                 local line, err = sock:receive("*l")
             until not line or string.find(line, "^%s*$")
 
-            function foo()
+            local function foo()
                 repeat
                     -- Get and read chunk
                     local line, err = sock:receive("*l")
@@ -379,7 +379,7 @@ lua found 100 pending timers
                 until len == 0
             end
 
-            co = coroutine.create(foo)
+            local co = coroutine.create(foo)
             repeat
                 local chunk = select(2,coroutine.resume(co))
             until chunk == nil
@@ -399,7 +399,7 @@ lua found 100 pending timers
                 end
                 local ok, err = ngx.timer.at(1, background_thread)
 
-                local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+                local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
                 if not f then
                     ngx.say("failed to open nginx.pid: ", err)
                     return
@@ -453,7 +453,7 @@ lua found 1 pending timers
                 end
 
                 if kill then
-                    local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+                    local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
                     if not f then
                         ngx.log(ngx.ERR, "failed to open nginx.pid: ", err)
                         return
diff --git a/debian/modules/http-lua/t/120-re-find.t b/debian/modules/http-lua/t/120-re-find.t
index 73e6134..f80ca4f 100644
--- a/debian/modules/http-lua/t/120-re-find.t
+++ b/debian/modules/http-lua/t/120-re-find.t
@@ -622,7 +622,7 @@ matched: 你
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -664,7 +664,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/123-lua-path.t b/debian/modules/http-lua/t/123-lua-path.t
index 23681a9..e30132f 100644
--- a/debian/modules/http-lua/t/123-lua-path.t
+++ b/debian/modules/http-lua/t/123-lua-path.t
@@ -11,7 +11,7 @@ repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 3 + 1);
 
-$ENV{LUA_PATH} = "/foo/bar/baz";
+$ENV{LUA_PATH} = "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;/foo/bar/baz";
 $ENV{LUA_CPATH} = "/baz/bar/foo";
 #no_diff();
 #no_long_string();
@@ -36,8 +36,8 @@ env LUA_CPATH;
     }
 --- request
 GET /lua
---- response_body
-/foo/bar/baz
+--- response_body_like
+(?:\.\.\/lua-resty-core\/lib\/\?\.lua;\.\.\/lua-resty-lrucache\/lib\/\?\.lua;){1,2}\/foo\/bar\/baz
 /baz/bar/foo
 
 --- no_error_log
@@ -60,8 +60,8 @@ env LUA_CPATH;
     }
 --- request
 GET /lua
---- response_body
-/foo/bar/baz
+--- response_body_like
+(?:\.\.\/lua-resty-core\/lib\/\?\.lua;\.\.\/lua-resty-lrucache\/lib\/\?\.lua;){1,2}\/foo\/bar\/baz
 /baz/bar/foo
 
 --- no_error_log
diff --git a/debian/modules/http-lua/t/124-init-worker.t b/debian/modules/http-lua/t/124-init-worker.t
index 9b2a91f..b648d55 100644
--- a/debian/modules/http-lua/t/124-init-worker.t
+++ b/debian/modules/http-lua/t/124-init-worker.t
@@ -521,12 +521,11 @@ warn(): Thu, 01 Jan 1970 01:34:38 GMT
     }
 --- request
 GET /t
---- response_body
-timer created
+--- response_body_like
 connected: 1
 request sent: 56
-first line received: HTTP/1.1 200 OK
-second line received: Server: openresty
+first line received: HTTP\/1\.1 200 OK
+second line received: (?:Date|Server): .*?
 --- no_error_log
 [error]
 --- timeout: 10
@@ -550,6 +549,7 @@ second line received: Server: openresty
             else
                 say("connect: ", ok, " ", err)
             end
+            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
@@ -600,6 +600,7 @@ qr/connect\(\) failed \(\d+: Connection refused\), context: ngx\.timer$/
             else
                 say("connect: ", ok, " ", err)
             end
+            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
@@ -650,6 +651,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
             else
                 say("connect: ", ok, " ", err)
             end
+            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
diff --git a/debian/modules/http-lua/t/126-shdict-frag.t b/debian/modules/http-lua/t/126-shdict-frag.t
index 5a2aff8..33646d1 100644
--- a/debian/modules/http-lua/t/126-shdict-frag.t
+++ b/debian/modules/http-lua/t/126-shdict-frag.t
@@ -1240,8 +1240,8 @@ failed to safe set baz: no memory
                 local key = "mylittlekey" .. rand(maxkeyidx)
                 local ok, err = dogs:get(key)
                 if not ok or rand() > 0.6 then
-                    sz = rand(maxsz)
-                    val = rep("a", sz)
+                    local sz = rand(maxsz)
+                    local val = rep("a", sz)
                     local ok, err, forcible = dogs:set(key, val)
                     if err then
                         ngx.log(ngx.ERR, "failed to set key: ", err)
diff --git a/debian/modules/http-lua/t/127-uthread-kill.t b/debian/modules/http-lua/t/127-uthread-kill.t
index cc43c62..5542153 100644
--- a/debian/modules/http-lua/t/127-uthread-kill.t
+++ b/debian/modules/http-lua/t/127-uthread-kill.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f()")
                 ngx.sleep(1)
             end
@@ -81,7 +81,7 @@ lua clean up the timer for pending ngx.sleep
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f()")
                 ngx.sleep(0.001)
                 return 32
@@ -138,12 +138,12 @@ lua clean up the timer for pending ngx.sleep
 
 === TEST 3: kill pending resolver
 --- config
-    resolver agentzh.org:12345;
+    resolver 127.0.0.2:12345;
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
-                sock:connect("some.agentzh.org", 12345)
+                sock:connect("some.127.0.0.2", 12345)
             end
 
             local t, err = ngx.thread.spawn(f)
@@ -194,13 +194,13 @@ resolve name done: -2
     location /lua {
         content_by_lua '
             local ready = false
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
                 sock:connect("agentzh.org", 80)
                 sock:close()
                 ready = true
                 sock:settimeout(10000)
-                sock:connect("agentzh.org", 12345)
+                sock:connect("127.0.0.2", 12345)
             end
 
             local t, err = ngx.thread.spawn(f)
@@ -262,7 +262,7 @@ lua finalize socket
 
     location = /t {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture("/sub")
             end
 
@@ -309,11 +309,11 @@ lua tcp socket abort resolver
 
     location = /t {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture("/sub")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.3)
             end
 
@@ -376,7 +376,7 @@ lua tcp socket abort resolver
     location = /t {
         content_by_lua '
             local ready = false
-            function f()
+            local function f()
                 ngx.location.capture("/sub")
                 ready = true
                 ngx.sleep(0.5)
@@ -424,7 +424,7 @@ lua tcp socket abort resolver
 --- config
     location = /t {
         content_by_lua '
-            function f()
+            local function f()
                 return
             end
 
@@ -473,7 +473,7 @@ lua tcp socket abort resolver
                 ngx.say("killed main thread.")
             end
 
-            function f()
+            local function f()
                 local ok, err = ngx.thread.kill(coroutine.running())
                 if not ok then
                     ngx.say("failed to kill user thread: ", err)
diff --git a/debian/modules/http-lua/t/128-duplex-tcp-socket.t b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
index aed560c..22b9f03 100644
--- a/debian/modules/http-lua/t/128-duplex-tcp-socket.t
+++ b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
@@ -396,7 +396,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("172.105.207.225", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
@@ -425,7 +425,7 @@ close: nil closed
 --- config
     server_tokens off;
     lua_socket_log_errors off;
-    resolver agentzh.org:12345;
+    resolver 127.0.0.2:12345;
     resolver_timeout 300ms;
     location /t {
         content_by_lua '
@@ -459,7 +459,7 @@ close: nil closed
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("some2.agentzh.org", 12345)
+            local ok, err = sock:connect("some2.agentzh.org", 80)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
diff --git a/debian/modules/http-lua/t/129-ssl-socket.t b/debian/modules/http-lua/t/129-ssl-socket.t
index 3f05640..f2fa26b 100644
--- a/debian/modules/http-lua/t/129-ssl-socket.t
+++ b/debian/modules/http-lua/t/129-ssl-socket.t
@@ -301,7 +301,7 @@ SSL reused session
 
         content_by_lua '
             local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
+            sock:settimeout(7000)
 
             do
 
@@ -380,7 +380,7 @@ lua ssl free session
 --- no_error_log
 [error]
 [alert]
---- timeout: 5
+--- timeout: 10
 
 
 
@@ -573,7 +573,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET /en/linux-packages.html HTTP/1.1\\r\\nHost: openresty.com\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -602,7 +602,7 @@ GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 56 bytes.
+sent http request: 80 bytes.
 received: HTTP/1.1 404 Not Found
 close: 1 nil
 
@@ -1333,13 +1333,13 @@ failed to send http request: closed
 --- grep_error_log_out
 --- error_log eval
 [
-qr/\[crit\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
+qr/\[(crit|error)\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
 'lua ssl server name: "openresty.org"',
 ]
 --- no_error_log
 SSL reused session
-[error]
 [alert]
+[emerg]
 --- timeout: 5
 
 
@@ -2508,7 +2508,7 @@ SSL reused session
 
         content_by_lua_block {
             local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
+            sock:settimeout(7000)
 
             local ok, err = sock:connect("openresty.org", 443)
             if not ok then
@@ -2529,4 +2529,4 @@ GET /t
 qr/\[error\] .* ngx.socket sslhandshake: expecting 1 ~ 5 arguments \(including the object\), but seen 0/
 --- no_error_log
 [alert]
---- timeout: 5
+--- timeout: 10
diff --git a/debian/modules/http-lua/t/130-internal-api.t b/debian/modules/http-lua/t/130-internal-api.t
index eba0980..2158e87 100644
--- a/debian/modules/http-lua/t/130-internal-api.t
+++ b/debian/modules/http-lua/t/130-internal-api.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 3;
+plan tests => repeat_each() * blocks() * 3;
 
 #no_diff();
 no_long_string();
@@ -19,12 +19,7 @@ run_tests();
 
 __DATA__
 
-=== TEST 1: __ngx_req and __ngx_cycle
---- http_config
-    init_by_lua '
-        my_cycle = __ngx_cycle
-    ';
-
+=== TEST 1: req
 --- config
     location = /t {
         content_by_lua '
@@ -32,18 +27,14 @@ __DATA__
             local function tonum(ud)
                 return tonumber(ffi.cast("uintptr_t", ud))
             end
-            ngx.say(string.format("init: cycle=%#x", tonum(my_cycle)))
-            ngx.say(string.format("content cycle=%#x", tonum(__ngx_cycle)))
-            ngx.say(string.format("content req=%#x", tonum(__ngx_req)))
+            ngx.say(string.format("content req=%#x", tonum(exdata())))
         ';
     }
 --- request
 GET /t
 
 --- response_body_like chop
-^init: cycle=(0x[a-f0-9]{4,})
-content cycle=\1
-content req=0x[a-f0-9]{4,}
+^content req=0x[a-f0-9]{4,}
 $
 --- no_error_log
 [error]
diff --git a/debian/modules/http-lua/t/134-worker-count-5.t b/debian/modules/http-lua/t/134-worker-count-5.t
index b257c12..ec6d0e7 100644
--- a/debian/modules/http-lua/t/134-worker-count-5.t
+++ b/debian/modules/http-lua/t/134-worker-count-5.t
@@ -3,7 +3,7 @@
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
-#master_on();
+master_on();
 workers(5);
 #log_level('warn');
 
@@ -55,7 +55,7 @@ workers: 5
 
 === TEST 3: init_by_lua + module (github #681)
 --- http_config
-    lua_package_path "t/servroot/html/?.lua;;";
+    lua_package_path "$TEST_NGINX_SERVER_ROOT/html/?.lua;;";
 
     init_by_lua_block {
         local blah = require "file"
diff --git a/debian/modules/http-lua/t/138-balancer.t b/debian/modules/http-lua/t/138-balancer.t
index 0aba66d..151db7b 100644
--- a/debian/modules/http-lua/t/138-balancer.t
+++ b/debian/modules/http-lua/t/138-balancer.t
@@ -362,8 +362,6 @@ me: 101
 
 === TEST 13: lua subrequests
 --- http_config
-    lua_package_path "t/servroot/html/?.lua;;";
-
     lua_code_cache off;
 
     upstream backend {
diff --git a/debian/modules/http-lua/t/139-ssl-cert-by.t b/debian/modules/http-lua/t/139-ssl-cert-by.t
index a65d703..bebbdb2 100644
--- a/debian/modules/http-lua/t/139-ssl-cert-by.t
+++ b/debian/modules/http-lua/t/139-ssl-cert-by.t
@@ -1278,7 +1278,7 @@ lua ssl server name: "test.com"
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
         ssl_certificate_by_lua_block {
-            function f()
+            local function f()
                 ngx.sleep(0.01)
                 print("uthread: hello in thread")
                 return "done"
diff --git a/debian/modules/http-lua/t/140-ssl-c-api.t b/debian/modules/http-lua/t/140-ssl-c-api.t
index 8734d14..a77f5d4 100644
--- a/debian/modules/http-lua/t/140-ssl-c-api.t
+++ b/debian/modules/http-lua/t/140-ssl-c-api.t
@@ -10,6 +10,7 @@ my $openssl_version = eval { `$NginxBinary -V 2>&1` };
 
 if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
     plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
+
 } else {
     plan tests => repeat_each() * (blocks() * 5 + 1);
 }
@@ -68,7 +69,7 @@ _EOC_
 
     my $http_config = $block->http_config || '';
     $http_config .= <<'_EOC_';
-lua_package_path "$prefix/html/?.lua;;";
+lua_package_path "$prefix/html/?.lua;../lua-resty-core/lib/?.lua;;";
 _EOC_
     $block->set_value("http_config", $http_config);
 });
@@ -91,8 +92,8 @@ __DATA__
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -245,8 +246,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -399,8 +400,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -528,8 +529,8 @@ failed to parse PEM priv key: PEM_read_bio_PrivateKey() failed
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -678,8 +679,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
diff --git a/debian/modules/http-lua/t/143-ssl-session-fetch.t b/debian/modules/http-lua/t/143-ssl-session-fetch.t
index 4dc992d..78a66cf 100644
--- a/debian/modules/http-lua/t/143-ssl-session-fetch.t
+++ b/debian/modules/http-lua/t/143-ssl-session-fetch.t
@@ -1114,3 +1114,108 @@ qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
 [error]
 [alert]
 [emerg]
+
+
+
+=== TEST 14: keep global variable in ssl_session_(store|fetch)_by_lua when OpenResty LuaJIT is used
+--- http_config
+    ssl_session_store_by_lua_block {
+        ngx.log(ngx.WARN, "new foo: ", foo)
+        if not foo then
+            foo = 1
+        else
+            ngx.log(ngx.WARN, "old foo: ", foo)
+            foo = foo + 1
+        end
+    }
+    ssl_session_fetch_by_lua_block {
+        ngx.log(ngx.WARN, "new bar: ", foo)
+        if not bar then
+            bar = 1
+        else
+            ngx.log(ngx.WARN, "old bar: ", bar)
+            bar = bar + 1
+        end
+    }
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+        ssl_session_tickets off;
+
+        server_tokens off;
+        location /foo {
+            content_by_lua_block {
+                ngx.say("foo: ", foo)
+                ngx.say("bar: ", bar)
+            }
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                local sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                package.loaded.session = sess
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    local m, err = ngx.re.match(line, "^foo: (.*)$", "jo")
+                    if err then
+                        ngx.say("failed to match line: ", err)
+                    end
+
+                    if m and m[1] then
+                        ngx.print(m[1])
+                    end
+                end
+
+                local ok, err = sock:close()
+                ngx.say("done")
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body_like chomp
+\A[123]done\n\z
+--- grep_error_log eval: qr/old (foo|bar): \d+/
+--- grep_error_log_out eval
+["", "old foo: 1\n", "old bar: 1\nold foo: 2\n"]
+--- no_error_log
+[error]
+[alert]
+[emerg]
diff --git a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
index 4ebc8f3..8566c0b 100644
--- a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
+++ b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
@@ -323,7 +323,7 @@ lua tcp socket write timed out
 
             sock:settimeouts(100, 100, 100)
 
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -346,7 +346,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -411,7 +411,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 
             local chunk = 4
 
-            function read()
+            local function read()
                 sock:settimeout(200) -- read: 200 ms
 
                 local data, err = sock:receive(content_length)
@@ -506,7 +506,7 @@ failed to receive data: timeout
 
             local chunk = 4
 
-            function read()
+            local function read()
                 local data, err = sock:receive(content_length)
                 if not data then
                     ngx.log(ngx.ERR, "failed to receive data: ", err)
diff --git a/debian/modules/http-lua/t/152-timer-every.t b/debian/modules/http-lua/t/152-timer-every.t
index c8d62e7..7b42d2d 100644
--- a/debian/modules/http-lua/t/152-timer-every.t
+++ b/debian/modules/http-lua/t/152-timer-every.t
@@ -63,7 +63,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, cont
 
 
 
-=== TEST 2: separated global env
+=== TEST 2: shared global env
 --- config
     location /t {
         content_by_lua_block {
@@ -84,7 +84,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, cont
 --- request
 GET /t
 --- response_body
-foo = nil
+foo = 3
 --- wait: 0.12
 --- no_error_log
 [error]
diff --git a/debian/modules/http-lua/t/153-semaphore-hup.t b/debian/modules/http-lua/t/153-semaphore-hup.t
index c85a21d..5c271a4 100644
--- a/debian/modules/http-lua/t/153-semaphore-hup.t
+++ b/debian/modules/http-lua/t/153-semaphore-hup.t
@@ -67,7 +67,7 @@ add_block_preprocessor(sub {
                 return
             end
 
-            shdict = ngx.shared.shdict
+            local shdict = ngx.shared.shdict
             local success = shdict:add("reloaded", 1)
             if not success then
                 return
diff --git a/debian/modules/http-lua/t/156-slow-network.t b/debian/modules/http-lua/t/156-slow-network.t
new file mode 100644
index 0000000..2d80506
--- /dev/null
+++ b/debian/modules/http-lua/t/156-slow-network.t
@@ -0,0 +1,138 @@
+BEGIN {
+    if (!defined $ENV{LD_PRELOAD}) {
+        $ENV{LD_PRELOAD} = '';
+    }
+
+    if ($ENV{LD_PRELOAD} !~ /\bmockeagain\.so\b/) {
+        $ENV{LD_PRELOAD} = "mockeagain.so $ENV{LD_PRELOAD}";
+    }
+
+    if ($ENV{MOCKEAGAIN} eq 'r') {
+        $ENV{MOCKEAGAIN} = 'rw';
+
+    } else {
+        $ENV{MOCKEAGAIN} = 'w';
+    }
+
+    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
+}
+
+use Test::Nginx::Socket::Lua;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->error_log) {
+        $block->set_value("no_error_log", "[error]");
+    }
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+
+});
+
+
+log_level("debug");
+no_long_string();
+#no_diff();
+run_tests();
+
+__DATA__
+
+=== TEST 1: receiveany returns anything once socket receives
+--- config
+    server_tokens off;
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+            local req = {
+                'GET /foo HTTP/1.0\r\n',
+                'Host: localhost\r\n',
+                'Connection: close\r\n\r\n',
+            }
+            local ok, err = sock:send(req)
+            if not ok then
+                ngx.say("send request failed: ", err)
+                return
+            end
+
+
+            -- skip http header
+            while true do
+                local data, err, _ = sock:receive('*l')
+                if err then
+                    ngx.say('unexpected error occurs when receiving http head: ' .. err)
+                    return
+                end
+                if #data == 0 then -- read last line of head
+                    break
+                end
+            end
+
+            -- receive http body
+            while true do
+                local data, err = sock:receiveany(1024)
+                if err then
+                    if err ~= 'closed' then
+                        ngx.say('unexpected err: ', err)
+                    end
+                    break
+                end
+                ngx.say(data)
+            end
+
+            sock:close()
+        }
+    }
+
+    location = /foo {
+        content_by_lua_block {
+            local resp = {
+                '1',
+                'hello',
+            }
+
+            local length = 0
+            for _, v in ipairs(resp) do
+                length = length + #v
+            end
+
+            -- flush http header
+            ngx.header['Content-Length'] = length
+            ngx.flush(true)
+            ngx.sleep(0.01)
+
+            -- send http body bytes by bytes
+            for _, v in ipairs(resp) do
+                ngx.print(v)
+                ngx.flush(true)
+                ngx.sleep(0.01)
+            end
+        }
+    }
+
+--- response_body
+1
+h
+e
+l
+l
+o
+--- grep_error_log eval
+qr/lua tcp socket read any/
+--- grep_error_log_out
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
diff --git a/debian/modules/http-lua/t/157-socket-keepalive-hup.t b/debian/modules/http-lua/t/157-socket-keepalive-hup.t
new file mode 100644
index 0000000..357bb59
--- /dev/null
+++ b/debian/modules/http-lua/t/157-socket-keepalive-hup.t
@@ -0,0 +1,91 @@
+# 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;
+        undef $ENV{TEST_NGINX_USE_STAP};
+    }
+}
+
+use Test::Nginx::Socket::Lua $SkipReason ? (skip_all => $SkipReason) : ();
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 8);
+
+#no_diff();
+no_long_string();
+
+worker_connections(1024);
+run_tests();
+
+__DATA__
+
+=== TEST 1: exiting
+--- config
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua_block {
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            if not f then
+                ngx.say("failed to open nginx.pid: ", err)
+                return
+            end
+
+            local pid = f:read()
+            -- ngx.say("master pid: [", pid, "]")
+
+            f:close()
+
+            local i = 0
+            local port = ngx.var.port
+
+            local function f(premature)
+                print("timer prematurely expired: ", premature)
+
+                local sock = ngx.socket.tcp()
+
+                local ok, err = sock:connect("127.0.0.1", port)
+                if not ok then
+                    print("failed to connect: ", err)
+                    return
+                end
+
+                local ok, err = sock:setkeepalive()
+                if not ok then
+                    print("failed to setkeepalive: ", err)
+                    return
+                end
+
+                print("setkeepalive successfully")
+            end
+            local ok, err = ngx.timer.at(3, f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+            ngx.say("registered timer")
+            os.execute("kill -HUP " .. pid)
+        }
+    }
+--- request
+GET /t
+
+--- response_body
+registered timer
+
+--- wait: 0.3
+--- no_error_log
+[error]
+[alert]
+[crit]
+--- error_log
+timer prematurely expired: true
+setkeepalive successfully
+lua tcp socket set keepalive while process exiting, closing connection
diff --git a/debian/modules/http-lua/t/158-global-var.t b/debian/modules/http-lua/t/158-global-var.t
new file mode 100644
index 0000000..414a43a
--- /dev/null
+++ b/debian/modules/http-lua/t/158-global-var.t
@@ -0,0 +1,508 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+log_level('debug');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 + 14);
+
+our $HtmlDir = html_dir;
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+
+no_long_string();
+
+sub read_file {
+    my $infile = shift;
+    open my $in, $infile
+        or die "cannot open $infile for reading: $!";
+    my $cert = do { local $/; <$in> };
+    close $in;
+    $cert;
+}
+
+our $TestCertificate = read_file("t/cert/test.crt");
+our $TestCertificateKey = read_file("t/cert/test.key");
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->error_log) {
+        $block->set_value("no_error_log", "[error]");
+    }
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+
+});
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set_by_lua
+--- config
+    location /t {
+        set_by_lua_block $res {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            return foo
+        }
+        echo $res;
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|set_by_lua:\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+set_by_lua:3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 2: rewrite_by_lua
+--- config
+    location /t {
+        rewrite_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+rewrite_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 3: access_by_lua
+--- config
+    location /t {
+        access_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+access_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 4: content_by_lua
+--- config
+    location /t {
+        content_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+content_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 5: header_filter_by_lua
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say(foo)
+        }
+        header_filter_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+    }
+--- response_body_like chomp
+\A(?:nil|1)\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+header_filter_by_lua:3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 6: body_filter_by_lua
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say(foo)
+        }
+        body_filter_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+    }
+--- response_body_like chomp
+\A(?:nil|2)\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\[warn\] .*?writing a global lua variable \('foo'\)
+body_filter_by_lua:3: in main chunk, 
+old foo: 1\n\z/, "old foo: 2\nold foo: 3\n"]
+
+
+
+=== TEST 7: log_by_lua
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say(foo)
+        }
+        log_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+    }
+--- response_body_like chomp
+\A(?:nil|1)\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk)/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+log_by_lua\(nginx\.conf:50\):3: in main chunk\n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 8: ssl_certificate_by_lua
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            content_by_lua_block {
+                ngx.say("foo: ", foo)
+            }
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                -- ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                -- ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    local m, err = ngx.re.match(line, "^foo: (.*)$", "jo")
+                    if err then
+                        ngx.say("failed to match line: ", err)
+                    end
+
+                    if m and m[1] then
+                        ngx.print(m[1])
+                    end
+                end
+
+                local ok, err = sock:close()
+                ngx.say("done")
+            end  -- do
+        }
+    }
+
+--- response_body_like chomp
+\A[12]done\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk)/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+ssl_certificate_by_lua:3: in main chunk\n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 9: timer
+--- config
+    location /t {
+        content_by_lua_block {
+            local function f()
+                if not foo then
+                    foo = 1
+                else
+                    ngx.log(ngx.WARN, "old foo: ", foo)
+                    foo = foo + 1
+                end
+            end
+            local ok, err = ngx.timer.at(0, f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+            ngx.sleep(0.01)
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in\b)/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+content_by_lua\(nginx\.conf:56\):4: in\n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 10: init_by_lua
+--- http_config
+    init_by_lua_block {
+        foo = 1
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[23]\n\z
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["old foo: 1\n", "old foo: 2\n"]
+
+
+
+=== TEST 11: init_worker_by_lua
+--- http_config
+    init_worker_by_lua_block {
+        if not foo then
+            foo = 1
+        else
+            ngx.log(ngx.WARN, "old foo: ", foo)
+            foo = foo + 1
+        end
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[23]\n\z
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["old foo: 1\n", "old foo: 2\n"]
+
+
+
+=== TEST 12: init_by_lua + init_worker_by_lua
+--- http_config
+    init_by_lua_block {
+        if not foo then
+            foo = 1
+        else
+            ngx.log(ngx.WARN, "old foo: ", foo)
+            foo = foo + 1
+        end
+    }
+    init_worker_by_lua_block {
+        if not foo then
+            foo = 1
+        else
+            ngx.log(ngx.WARN, "old foo: ", foo)
+            foo = foo + 1
+        end
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[34]\n\z
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["old foo: 1\nold foo: 2\n", "old foo: 3\n"]
+
+
+
+=== TEST 13: don't show warn messages in init/init_worker
+--- http_config
+    init_by_lua_block {
+        foo = 1
+    }
+
+    init_worker_by_lua_block {
+        bar = 2
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say(foo)
+            ngx.say(bar)
+        }
+    }
+--- response_body
+1
+2
+--- no_error_log
+setting global variable
+
+
+
+=== TEST 14: uthread
+--- config
+    location /t {
+        content_by_lua_block {
+            local function f()
+                if not foo then
+                    foo = 1
+                else
+                    ngx.log(ngx.WARN, "old foo: ", foo)
+                    foo = foo + 1
+                end
+            end
+            local ok, err = ngx.thread.spawn(f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+            ngx.sleep(0.01)
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
+--- grep_error_log_out eval
+["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
+
+
+
+=== TEST 15: balancer_by_lua
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+qr/\[crit\].*?\Qconnect() to 0.0.0.1:80 failed\E/
+--- grep_error_log eval: qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
+--- grep_error_log_out eval
+["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
diff --git a/debian/modules/http-lua/t/159-sa-restart.t b/debian/modules/http-lua/t/159-sa-restart.t
new file mode 100644
index 0000000..a0f0c0e
--- /dev/null
+++ b/debian/modules/http-lua/t/159-sa-restart.t
@@ -0,0 +1,180 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    my $http_config = $block->http_config || '';
+
+    $http_config .= <<_EOC_;
+    init_by_lua_block {
+        function test_sa_restart()
+            local signals = {
+                --"HUP",
+                --"INFO",
+                --"XCPU",
+                --"USR1",
+                --"USR2",
+                "ALRM",
+                --"INT",
+                "IO",
+                "CHLD",
+                --"WINCH",
+            }
+
+            for _, signame in ipairs(signals) do
+                local cmd = string.format("kill -s %s %d && sleep 0.01",
+                                          signame, ngx.worker.pid())
+                local err = select(2, io.popen(cmd):read("*a"))
+                if err then
+                    error("SIG" .. signame .. " caused: " .. err)
+                end
+            end
+        end
+    }
+_EOC_
+
+    $block->set_value("http_config", $http_config);
+
+    if (!defined $block->config) {
+        my $config = <<_EOC_;
+        location /t {
+            echo ok;
+        }
+_EOC_
+
+        $block->set_value("config", $config);
+    }
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+
+    if (!defined $block->response_body) {
+        $block->set_value("ignore_response_body");
+    }
+
+    if (!defined $block->no_error_log) {
+        $block->set_value("no_error_log", "[error]");
+    }
+});
+
+plan tests => repeat_each() * (blocks() * 2 + 1);
+
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: lua_sa_restart default - sets SA_RESTART in init_worker_by_lua*
+--- http_config
+    init_worker_by_lua_block {
+        test_sa_restart()
+    }
+
+
+
+=== TEST 2: lua_sa_restart off - does not set SA_RESTART
+--- http_config
+    lua_sa_restart off;
+
+    init_worker_by_lua_block {
+        test_sa_restart()
+    }
+--- no_error_log
+[crit]
+--- error_log
+Interrupted system call
+
+
+
+=== TEST 3: lua_sa_restart on (default) - sets SA_RESTART if no init_worker_by_lua* phase is defined
+--- config
+    location /t {
+        content_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 4: lua_sa_restart on (default) - SA_RESTART is effective in rewrite_by_lua*
+--- config
+    location /t {
+        rewrite_by_lua_block {
+            test_sa_restart()
+        }
+
+        echo ok;
+    }
+
+
+
+=== TEST 5: lua_sa_restart on (default) - SA_RESTART is effective in access_by_lua*
+--- config
+    location /t {
+        access_by_lua_block {
+            test_sa_restart()
+        }
+
+        echo ok;
+    }
+
+
+
+=== TEST 6: lua_sa_restart on (default) - SA_RESTART is effective in content_by_lua*
+--- config
+    location /t {
+        content_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 7: lua_sa_restart on (default) - SA_RESTART is effective in header_filter_by_lua*
+--- config
+    location /t {
+        echo ok;
+
+        header_filter_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 8: lua_sa_restart on (default) - SA_RESTART is effective in body_filter_by_lua*
+--- config
+    location /t {
+        echo ok;
+
+        body_filter_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 9: lua_sa_restart on (default) - SA_RESTART is effective in log_by_lua*
+--- config
+    location /t {
+        echo ok;
+
+        log_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 10: lua_sa_restart on (default) - SA_RESTART is effective in timer phase
+--- config
+    location /t {
+        echo ok;
+
+        log_by_lua_block {
+            ngx.timer.at(0, test_sa_restart)
+        }
+    }
diff --git a/debian/modules/http-lua/t/160-disable-init-by-lua.t b/debian/modules/http-lua/t/160-disable-init-by-lua.t
new file mode 100644
index 0000000..541771e
--- /dev/null
+++ b/debian/modules/http-lua/t/160-disable-init-by-lua.t
@@ -0,0 +1,194 @@
+use Test::Nginx::Socket::Lua;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+
+my $html_dir = $ENV{TEST_NGINX_HTML_DIR};
+my $http_config = <<_EOC_;
+    init_by_lua_block {
+        function set_up_ngx_tmp_conf(conf)
+            if conf == nil then
+                conf = [[
+                    events {
+                        worker_connections 64;
+                    }
+                    http {
+                        init_by_lua_block {
+                            ngx.log(ngx.ERR, "run init_by_lua")
+                        }
+                    }
+                ]]
+            end
+
+            assert(os.execute("mkdir -p $html_dir/logs"))
+
+            local conf_file = "$html_dir/nginx.conf"
+            local f, err = io.open(conf_file, "w")
+            if not f then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            assert(f:write(conf))
+
+            return conf_file
+        end
+
+        function get_ngx_bin_path()
+            local ffi = require "ffi"
+            ffi.cdef[[char **ngx_argv;]]
+            return ffi.string(ffi.C.ngx_argv[0])
+        end
+    }
+_EOC_
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->http_config) {
+        $block->set_value("http_config", $http_config);
+    }
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+});
+
+env_to_nginx("PATH");
+log_level("warn");
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: ensure init_by_lua* is not run in signaller process
+--- config
+    location = /t {
+        content_by_lua_block {
+            local conf_file = set_up_ngx_tmp_conf()
+            local nginx = get_ngx_bin_path()
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -s reopen"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+        }
+    }
+--- error_log
+failed (2: No such file or directory)
+--- no_error_log eval
+qr/\[error\] .*? init_by_lua:\d+: run init_by_lua/
+
+
+
+=== TEST 2: init_by_lua* does not run when testing Nginx configuration
+--- config
+    location = /t {
+        content_by_lua_block {
+            local conf_file = set_up_ngx_tmp_conf()
+            local nginx = get_ngx_bin_path()
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -t"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -T"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+        }
+    }
+--- error_log
+test is successful
+--- no_error_log eval
+qr/\[error\] .*? init_by_lua:\d+: run init_by_lua/
+
+
+
+=== TEST 3: init_by_lua* does not run when testing Nginx configuration which contains 'lua_shared_dict' (GitHub #1462)
+--- config
+    location = /t {
+        content_by_lua_block {
+            local conf = [[
+                events {
+                    worker_connections 64;
+                }
+                http {
+                    lua_shared_dict test 64k;
+                    init_by_lua_block {
+                        ngx.log(ngx.ERR, "run init_by_lua with lua_shared_dict")
+                    }
+                }
+            ]]
+            local conf_file = set_up_ngx_tmp_conf(conf)
+            local nginx = get_ngx_bin_path()
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -t"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -T"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+        }
+    }
+--- error_log
+test is successful
+--- no_error_log eval
+qr/\[error\] .*? init_by_lua:\d+: run init_by_lua with lua_shared_dict/
diff --git a/debian/modules/http-lua/t/161-load-resty-core.t b/debian/modules/http-lua/t/161-load-resty-core.t
new file mode 100644
index 0000000..41b18f0
--- /dev/null
+++ b/debian/modules/http-lua/t/161-load-resty-core.t
@@ -0,0 +1,68 @@
+use Test::Nginx::Socket::Lua;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+
+    if (!defined $block->no_error_log) {
+        $block->set_value("no_error_log", "[error]");
+    }
+});
+
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: lua_load_resty_core is enabled by default
+--- config
+    location = /t {
+        content_by_lua_block {
+            local loaded_resty_core = package.loaded["resty.core"]
+            local resty_core = require "resty.core"
+
+            ngx.say("resty.core loaded: ", loaded_resty_core == resty_core)
+        }
+    }
+--- response_body
+resty.core loaded: true
+
+
+
+=== TEST 2: lua_load_resty_core can be disabled
+--- http_config
+    lua_load_resty_core off;
+--- config
+    location = /t {
+        content_by_lua_block {
+            local loaded_resty_core = package.loaded["resty.core"]
+
+            ngx.say("resty.core loaded: ", loaded_resty_core ~= nil)
+        }
+    }
+--- response_body
+resty.core loaded: false
+
+
+
+=== TEST 3: lua_load_resty_core is effective when using lua_shared_dict
+--- http_config
+    lua_shared_dict dogs 128k;
+--- config
+    location = /t {
+        content_by_lua_block {
+            local loaded_resty_core = package.loaded["resty.core"]
+            local resty_core = require "resty.core"
+
+            ngx.say("resty.core loaded: ", loaded_resty_core == resty_core)
+        }
+    }
+--- response_body
+resty.core loaded: true
diff --git a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
index 0286853..ffc32f5 100644
--- a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
+++ b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
@@ -213,10 +213,9 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 
     ngx_uint_t                   i;
     ngx_shm_zone_t             **zone;
+    ngx_shm_zone_t             **zone_udata;
 
-    lua_getglobal(L, "__ngx_cycle");
-    cycle = lua_touserdata(L, -1);
-    lua_pop(L, 1);
+    cycle = (ngx_cycle_t *) ngx_cycle;
 
     hmcf_ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index];
     lfsmcf = hmcf_ctx->main_conf[ngx_http_lua_fake_shm_module.ctx_index];
@@ -242,7 +241,9 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 
             lua_createtable(L, 1 /* narr */, 0 /* nrec */);
                 /* table of zone[i] */
-            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
+            zone_udata = lua_newuserdata(L, sizeof(ngx_shm_zone_t *));
+                /* shared mt key ud */
+            *zone_udata = zone[i];
             lua_rawseti(L, -2, 1); /* {zone[i]} */
             lua_pushvalue(L, -3); /* shared mt key ud mt */
             lua_setmetatable(L, -2); /* shared mt key ud */
@@ -262,9 +263,10 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 static int
 ngx_http_lua_fake_shm_get_info(lua_State *L)
 {
-    ngx_int_t                    n;
-    ngx_shm_zone_t              *zone;
-    ngx_http_lua_fake_shm_ctx_t *ctx;
+    ngx_int_t                         n;
+    ngx_shm_zone_t                   *zone;
+    ngx_shm_zone_t                  **zone_udata;
+    ngx_http_lua_fake_shm_ctx_t      *ctx;
 
     n = lua_gettop(L);
 
@@ -276,13 +278,15 @@ ngx_http_lua_fake_shm_get_info(lua_State *L)
     luaL_checktype(L, 1, LUA_TTABLE);
 
     lua_rawgeti(L, 1, 1);
-    zone = lua_touserdata(L, -1);
+    zone_udata = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    if (zone == NULL) {
+    if (zone_udata == NULL) {
         return luaL_error(L, "bad \"zone\" argument");
     }
 
+    zone = *zone_udata;
+
     ctx = (ngx_http_lua_fake_shm_ctx_t *) zone->data;
 
     lua_pushlstring(L, (char *) zone->shm.name.data, zone->shm.name.len);
diff --git a/debian/modules/http-lua/util/build.sh b/debian/modules/http-lua/util/build.sh
index 164bf9f..14e9fd4 100755
--- a/debian/modules/http-lua/util/build.sh
+++ b/debian/modules/http-lua/util/build.sh
@@ -22,6 +22,8 @@ force=$2
             #--without-http_referer_module \
             #--with-http_spdy_module \
 
+add_fake_shm_module="--add-module=$root/t/data/fake-shm-module"
+
 time ngx-build $force $version \
             --with-pcre-jit \
             --with-ipv6 \
@@ -55,7 +57,7 @@ time ngx-build $force $version \
                 --add-module=$root/../redis2-nginx-module \
                 --add-module=$root/../stream-lua-nginx-module \
                 --add-module=$root/t/data/fake-module \
-                --add-module=$root/t/data/fake-shm-module \
+                $add_fake_shm_module \
                 --add-module=$root/t/data/fake-delayed-load-module \
                 --with-http_gunzip_module \
                 --with-http_dav_module \

From 07d0cb5b7152a38029139c8a6a22e12cd02eb614 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Mon, 9 Sep 2019 18:25:14 +0300
Subject: [PATCH 285/600] Release 1.16.1-1

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 509cc2b..0b0b75b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nginx (1.16.1-1) unstable; urgency=medium
+
+  * New upstream version (Closes: #929200)
+  * Follow stable 1.16 releases (Closes: #929199)
+  * Drop already included debian patches
+  * http-ndk: Upgrade to 0.3.1
+  * http-lua: Upgrade to 0.10.15
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Mon, 09 Sep 2019 18:24:43 +0300
+
 nginx (1.14.2-3) unstable; urgency=high
 
   * Backport upstream fixes for 3 CVEs (Closes: #935037)

From bfd112b793a68d11e9b1a9bd7209f7acfac22995 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Sat, 12 Oct 2019 17:24:11 +0300
Subject: [PATCH 286/600] http-lua: Downgrade to 0.10.13

This a temporary fix for the FTBFS on arches where liblua5.1-0-dev is
used instead of libluajit-5.1-dev.

The regression was introduce in 0.10.14, see:

https://github.com/openresty/lua-nginx-module/commit/7286812116940216344ade33722c49ae47037605

This reverts commit 132704ab76aa72ce29d00e4acd50d3218693558b.

Closes: 941917
---
 debian/modules/control                        |    2 +-
 debian/modules/http-lua/README.markdown       |  235 +-
 debian/modules/http-lua/config                |   45 -
 .../modules/http-lua/doc/HttpLuaModule.wiki   |  213 +-
 .../http-lua/src/api/ngx_http_lua_api.h       |    2 +-
 .../http-lua/src/ngx_http_lua_accessby.c      |    4 +-
 .../modules/http-lua/src/ngx_http_lua_api.c   |    2 +-
 .../http-lua/src/ngx_http_lua_balancer.c      |    3 -
 .../http-lua/src/ngx_http_lua_bodyfilterby.c  |   50 +-
 .../http-lua/src/ngx_http_lua_bodyfilterby.h  |    2 +-
 .../modules/http-lua/src/ngx_http_lua_cache.c |   23 +-
 .../http-lua/src/ngx_http_lua_clfactory.c     |   45 +-
 .../http-lua/src/ngx_http_lua_common.h        |   49 +-
 .../http-lua/src/ngx_http_lua_contentby.c     |    2 -
 .../http-lua/src/ngx_http_lua_control.c       |    3 +-
 .../http-lua/src/ngx_http_lua_coroutine.c     |   18 +-
 .../http-lua/src/ngx_http_lua_directive.c     |   11 +-
 .../src/ngx_http_lua_headerfilterby.c         |    3 +-
 .../http-lua/src/ngx_http_lua_headers.c       |   83 +-
 .../http-lua/src/ngx_http_lua_headers_in.c    |   10 +-
 .../http-lua/src/ngx_http_lua_headers_out.c   |   20 +-
 .../http-lua/src/ngx_http_lua_headers_out.h   |    6 +-
 .../http-lua/src/ngx_http_lua_initworkerby.c  |   19 -
 .../http-lua/src/ngx_http_lua_input_filters.c |  137 -
 .../http-lua/src/ngx_http_lua_input_filters.h |   29 -
 .../modules/http-lua/src/ngx_http_lua_logby.c |    3 +-
 .../modules/http-lua/src/ngx_http_lua_misc.c  |   27 -
 .../http-lua/src/ngx_http_lua_module.c        |   56 -
 .../modules/http-lua/src/ngx_http_lua_ndk.c   |   41 -
 .../modules/http-lua/src/ngx_http_lua_pipe.c  | 2475 -----------------
 .../modules/http-lua/src/ngx_http_lua_pipe.h  |   95 -
 .../modules/http-lua/src/ngx_http_lua_regex.c |   10 +-
 .../http-lua/src/ngx_http_lua_rewriteby.c     |    4 +-
 .../http-lua/src/ngx_http_lua_script.c        |    4 +-
 .../modules/http-lua/src/ngx_http_lua_setby.c |   34 +-
 .../modules/http-lua/src/ngx_http_lua_setby.h |    2 +-
 .../http-lua/src/ngx_http_lua_shdict.c        |   44 +-
 .../http-lua/src/ngx_http_lua_socket_tcp.c    | 1608 ++++-------
 .../http-lua/src/ngx_http_lua_socket_tcp.h    |   29 +-
 .../http-lua/src/ngx_http_lua_socket_udp.c    |   12 +-
 .../http-lua/src/ngx_http_lua_ssl_certby.c    |    2 -
 .../src/ngx_http_lua_ssl_session_fetchby.c    |    2 -
 .../src/ngx_http_lua_ssl_session_storeby.c    |    3 -
 .../http-lua/src/ngx_http_lua_string.c        |   14 -
 .../http-lua/src/ngx_http_lua_subrequest.c    |    8 -
 .../modules/http-lua/src/ngx_http_lua_timer.c |   44 +-
 .../http-lua/src/ngx_http_lua_uthread.c       |    3 +-
 .../modules/http-lua/src/ngx_http_lua_util.c  |  168 +-
 .../modules/http-lua/src/ngx_http_lua_util.h  |   28 +-
 .../http-lua/src/ngx_http_lua_worker.c        |   11 -
 debian/modules/http-lua/t/000--init.t         |    5 +
 debian/modules/http-lua/t/001-set.t           |   23 +-
 debian/modules/http-lua/t/002-content.t       |   38 +-
 debian/modules/http-lua/t/004-require.t       |   12 +-
 debian/modules/http-lua/t/005-exit.t          |    2 +-
 debian/modules/http-lua/t/009-log.t           |   12 +-
 debian/modules/http-lua/t/011-md5_bin.t       |    2 +-
 debian/modules/http-lua/t/013-base64.t        |    2 +-
 debian/modules/http-lua/t/014-bugs.t          |   49 +-
 debian/modules/http-lua/t/016-resp-header.t   |  504 +---
 debian/modules/http-lua/t/017-exec.t          |    4 +-
 debian/modules/http-lua/t/020-subrequest.t    |  134 +-
 .../http-lua/t/023-rewrite/client-abort.t     |    6 +-
 debian/modules/http-lua/t/023-rewrite/exec.t  |    4 +-
 debian/modules/http-lua/t/023-rewrite/mixed.t |    4 +-
 .../http-lua/t/023-rewrite/multi-capture.t    |    2 +-
 .../http-lua/t/023-rewrite/req-socket.t       |    6 +-
 .../modules/http-lua/t/023-rewrite/sanity.t   |   28 +-
 .../http-lua/t/023-rewrite/socket-keepalive.t |   12 +-
 .../http-lua/t/023-rewrite/subrequest.t       |   42 +-
 .../t/023-rewrite/tcp-socket-timeout.t        |   12 +-
 .../http-lua/t/023-rewrite/tcp-socket.t       |   32 +-
 .../http-lua/t/023-rewrite/uthread-exec.t     |   12 +-
 .../http-lua/t/023-rewrite/uthread-exit.t     |   40 +-
 .../http-lua/t/023-rewrite/uthread-redirect.t |    4 +-
 .../http-lua/t/023-rewrite/uthread-spawn.t    |   62 +-
 .../http-lua/t/024-access/client-abort.t      |    6 +-
 debian/modules/http-lua/t/024-access/exec.t   |    2 +-
 debian/modules/http-lua/t/024-access/mixed.t  |   10 +-
 .../http-lua/t/024-access/multi-capture.t     |    2 +-
 debian/modules/http-lua/t/024-access/sanity.t |   30 +-
 .../http-lua/t/024-access/subrequest.t        |   42 +-
 .../http-lua/t/024-access/uthread-exec.t      |   12 +-
 .../http-lua/t/024-access/uthread-exit.t      |   38 +-
 .../http-lua/t/024-access/uthread-redirect.t  |    4 +-
 .../http-lua/t/024-access/uthread-spawn.t     |   62 +-
 debian/modules/http-lua/t/025-codecache.t     |  174 +-
 debian/modules/http-lua/t/027-multi-capture.t |    4 +-
 debian/modules/http-lua/t/028-req-header.t    |   24 +-
 debian/modules/http-lua/t/030-uri-args.t      |   23 +-
 debian/modules/http-lua/t/034-match.t         |   65 +-
 debian/modules/http-lua/t/035-gmatch.t        |   22 +-
 debian/modules/http-lua/t/036-sub.t           |    4 +-
 debian/modules/http-lua/t/037-gsub.t          |    2 +-
 debian/modules/http-lua/t/038-match-o.t       |   44 +-
 debian/modules/http-lua/t/041-header-filter.t |   15 +-
 debian/modules/http-lua/t/043-shdict.t        |    4 +-
 debian/modules/http-lua/t/047-match-jit.t     |   12 +-
 debian/modules/http-lua/t/048-match-dfa.t     |   12 +-
 debian/modules/http-lua/t/055-subreq-vars.t   |   18 +-
 debian/modules/http-lua/t/056-flush.t         |    2 +-
 debian/modules/http-lua/t/057-flush-timeout.t |    2 +-
 debian/modules/http-lua/t/058-tcp-socket.t    |  364 +--
 debian/modules/http-lua/t/062-count.t         |   31 +-
 debian/modules/http-lua/t/063-abort.t         |   62 +-
 debian/modules/http-lua/t/064-pcall.t         |   14 +-
 .../http-lua/t/065-tcp-socket-timeout.t       |   24 +-
 .../http-lua/t/066-socket-receiveuntil.t      |   30 +-
 debian/modules/http-lua/t/067-req-socket.t    |    6 +-
 .../modules/http-lua/t/068-socket-keepalive.t | 1467 +---------
 debian/modules/http-lua/t/073-backtrace.t     |   14 +-
 debian/modules/http-lua/t/075-logby.t         |   11 +-
 debian/modules/http-lua/t/081-bytecode.t      |   45 +-
 debian/modules/http-lua/t/082-body-filter.t   |    3 +-
 .../http-lua/t/084-inclusive-receiveuntil.t   |   20 +-
 debian/modules/http-lua/t/087-udp-socket.t    |   12 +-
 .../http-lua/t/090-log-socket-errors.t        |   10 +-
 debian/modules/http-lua/t/091-coroutine.t     |   81 +-
 debian/modules/http-lua/t/093-uthread-spawn.t |   66 +-
 debian/modules/http-lua/t/094-uthread-exit.t  |   46 +-
 debian/modules/http-lua/t/095-uthread-exec.t  |   14 +-
 .../modules/http-lua/t/096-uthread-redirect.t |    6 +-
 .../modules/http-lua/t/097-uthread-rewrite.t  |   12 +-
 debian/modules/http-lua/t/098-uthread-wait.t  |   74 +-
 debian/modules/http-lua/t/099-c-api.t         |   10 +-
 debian/modules/http-lua/t/100-client-abort.t  |    6 +-
 debian/modules/http-lua/t/106-timer.t         |   18 +-
 debian/modules/http-lua/t/108-timer-safe.t    |   16 +-
 debian/modules/http-lua/t/109-timer-hup.t     |   18 +-
 debian/modules/http-lua/t/120-re-find.t       |    4 +-
 debian/modules/http-lua/t/123-lua-path.t      |   10 +-
 debian/modules/http-lua/t/124-init-worker.t   |   10 +-
 debian/modules/http-lua/t/126-shdict-frag.t   |    4 +-
 debian/modules/http-lua/t/127-uthread-kill.t  |   26 +-
 .../http-lua/t/128-duplex-tcp-socket.t        |    6 +-
 debian/modules/http-lua/t/129-ssl-socket.t    |   16 +-
 debian/modules/http-lua/t/130-internal-api.t  |   17 +-
 .../modules/http-lua/t/134-worker-count-5.t   |    4 +-
 debian/modules/http-lua/t/138-balancer.t      |    2 +
 debian/modules/http-lua/t/139-ssl-cert-by.t   |    2 +-
 debian/modules/http-lua/t/140-ssl-c-api.t     |   23 +-
 .../http-lua/t/143-ssl-session-fetch.t        |  105 -
 .../http-lua/t/147-tcp-socket-timeouts.t      |    8 +-
 debian/modules/http-lua/t/152-timer-every.t   |    4 +-
 debian/modules/http-lua/t/153-semaphore-hup.t |    2 +-
 debian/modules/http-lua/t/156-slow-network.t  |  138 -
 .../http-lua/t/157-socket-keepalive-hup.t     |   91 -
 debian/modules/http-lua/t/158-global-var.t    |  508 ----
 debian/modules/http-lua/t/159-sa-restart.t    |  180 --
 .../http-lua/t/160-disable-init-by-lua.t      |  194 --
 .../modules/http-lua/t/161-load-resty-core.t  |   68 -
 .../ngx_http_lua_fake_shm_module.c            |   22 +-
 debian/modules/http-lua/util/build.sh         |    4 +-
 153 files changed, 1866 insertions(+), 9493 deletions(-)
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_input_filters.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_input_filters.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_pipe.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_pipe.h
 delete mode 100644 debian/modules/http-lua/t/156-slow-network.t
 delete mode 100644 debian/modules/http-lua/t/157-socket-keepalive-hup.t
 delete mode 100644 debian/modules/http-lua/t/158-global-var.t
 delete mode 100644 debian/modules/http-lua/t/159-sa-restart.t
 delete mode 100644 debian/modules/http-lua/t/160-disable-init-by-lua.t
 delete mode 100644 debian/modules/http-lua/t/161-load-resty-core.t

diff --git a/debian/modules/control b/debian/modules/control
index 8331ff5..f27ca7c 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -18,7 +18,7 @@ Files-Excluded: .gitignore .gitattributes .travis.yml
 
 Module: http-lua
 Homepage: https://github.com/openresty/lua-nginx-module
-Version: 0.10.15
+Version: 0.10.13
 Patch:
   openssl-1.1.0.patch
   discover-luajit-2.1.patch
diff --git a/debian/modules/http-lua/README.markdown b/debian/modules/http-lua/README.markdown
index ed0c72d..15ad00e 100644
--- a/debian/modules/http-lua/README.markdown
+++ b/debian/modules/http-lua/README.markdown
@@ -8,8 +8,6 @@ Name
 
 ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
-This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
-
 *This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
 
 Table of Contents
@@ -25,6 +23,7 @@ Table of Contents
 * [Installation](#installation)
     * [Building as a dynamic module](#building-as-a-dynamic-module)
     * [C Macro Configurations](#c-macro-configurations)
+    * [Installation on Ubuntu 11.10](#installation-on-ubuntu-1110)
 * [Community](#community)
     * [English Mailing List](#english-mailing-list)
     * [Chinese Mailing List](#chinese-mailing-list)
@@ -63,7 +62,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.15](https://github.com/openresty/lua-nginx-module/tags) released on March 14th, 2019.
+This document describes ngx_lua [v0.10.13](https://github.com/openresty/lua-nginx-module/tags) released on 22 April 2018.
 
 Synopsis
 ========
@@ -188,9 +187,7 @@ Synopsis
 Description
 ===========
 
-This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
-
-This module embeds Lua, via [LuaJIT 2.0/2.1](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.
+This module embeds Lua, via the standard Lua 5.1 interpreter or [LuaJIT 2.0/2.1](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](https://httpd.apache.org/docs/trunk/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](#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.
@@ -268,11 +265,11 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 Installation
 ============
 
-It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, OpenResty's LuaJIT 2.1 branch version, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
+It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-1. LuaJIT can be downloaded from the [latest release of OpenResty's LuaJIT branch version](https://github.com/openresty/luajit2/releases). The official LuaJIT 2.0 and 2.1 releases are also supported, although the performance will be significantly lower in many cases.
+1. Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is *not* supported yet). LuaJIT can be downloaded from 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](https://github.com/simplresty/ngx_devel_kit/tags).
 1. Download the latest version of ngx_lua [HERE](https://github.com/openresty/lua-nginx-module/tags).
 1. Download the latest version of Nginx [HERE](http://nginx.org/) (See [Nginx Compatibility](#nginx-compatibility))
@@ -348,6 +345,29 @@ To enable one or more of these macros, just pass extra C compiler options to the
     ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
 
 
+[Back to TOC](#table-of-contents)
+
+Installation on Ubuntu 11.10
+----------------------------
+
+Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever possible.
+
+If the standard Lua 5.1 interpreter is required however, run the following command to install it from the Ubuntu repository:
+
+```bash
+
+ 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.
+
+```bash
+
+ ln -s /usr/lib/x86_64-linux-gnu/liblua5.1.so /usr/lib/liblua.so
+```
+
 [Back to TOC](#table-of-contents)
 
 Community
@@ -391,7 +411,7 @@ Lua/LuaJIT bytecode support
 
 As from the `v0.5.0rc32` release, all `*_by_lua_file` configure directives (such as [content_by_lua_file](#content_by_lua_file)) support loading Lua 5.1 and LuaJIT 2.0/2.1 raw bytecode files directly.
 
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if you are using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
 
 ```bash
 
@@ -411,6 +431,20 @@ Please refer to the official LuaJIT documentation on the `-b` option for more de
 
 Also, the bytecode files generated by LuaJIT 2.1 is *not* compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
 
+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:
+
+```bash
+
+ 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:
+
+```bash
+
+ 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/2.1 or vice versa, will result in an error message, such as that below, being logged into the Nginx `error.log` file:
 
 
@@ -608,7 +642,8 @@ This issue is due to limitations in the Nginx event model and only appears to af
 
 Lua Coroutine Yielding/Resuming
 -------------------------------
-* Because Lua's `dofile` and `require` builtins are currently implemented as C functions in LuaJIT 2.0/2.1, if the Lua file being loaded by `dofile` or `require` invokes [ngx.location.capture*](#ngxlocationcapture), [ngx.exec](#ngxexec), [ngx.exit](#ngxexit), or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
+* Because Lua's `dofile` and `require` builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by `dofile` or `require` invokes [ngx.location.capture*](#ngxlocationcapture), [ngx.exec](#ngxexec), [ngx.exit](#ngxexit), or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
+* As the standard Lua 5.1 interpreter's VM is not fully resumable, the methods [ngx.location.capture](#ngxlocationcapture), [ngx.location.capture_multi](#ngxlocationcapture_multi), [ngx.redirect](#ngxredirect), [ngx.exec](#ngxexec), and [ngx.exit](#ngxexit) 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) or even the first line of the `for ... in ...` statement 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.x, which supports a fully resumable VM, to avoid this.
 
 [Back to TOC](#table-of-contents)
 
@@ -960,7 +995,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2019, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -1004,7 +1039,6 @@ See Also
 Directives
 ==========
 
-* [lua_load_resty_core](#lua_load_resty_core)
 * [lua_capture_error_log](#lua_capture_error_log)
 * [lua_use_default_type](#lua_use_default_type)
 * [lua_malloc_trim](#lua_malloc_trim)
@@ -1070,7 +1104,6 @@ Directives
 * [lua_check_client_abort](#lua_check_client_abort)
 * [lua_max_pending_timers](#lua_max_pending_timers)
 * [lua_max_running_timers](#lua_max_running_timers)
-* [lua_sa_restart](#lua_sa_restart)
 
 
 The basic building blocks of scripting Nginx with Lua are directives. Directives are used to specify when the user Lua code is run and
@@ -1080,38 +1113,6 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 [Back to TOC](#table-of-contents)
 
-lua_load_resty_core
--------------------
-
-**syntax:** *lua_load_resty_core on|off*
-
-**default:** *lua_load_resty_core on*
-
-**context:** *http*
-
-Controls whether the `resty.core` module (from
-[lua-resty-core](https://github.com/openresty/lua-resty-core)) should be loaded
-or not. When enabled, this directive is equivalent to executing the following
-when the Lua VM is created:
-
-```lua
-
- require "resty.core"
-```
-
-Note that usage of the `resty.core` module is recommended, as its
-FFI implementation is both faster, safer, and more complete than the Lua C API
-of the ngx_lua module.
-
-It must also be noted that the Lua C API of the ngx_lua module will eventually
-be removed, and usage of the FFI-based API (i.e. the `resty.core`
-module) will become mandatory. This directive only aims at providing a
-temporary backwards-compatibility mode in case of edge-cases.
-
-This directive was first introduced in the `v0.10.15` release.
-
-[Back to TOC](#directives)
-
 lua_capture_error_log
 ---------------------
 **syntax:** *lua_capture_error_log size*
@@ -2601,14 +2602,14 @@ SSL session resumption can then get immediately initiated and bypass the full SS
 Please note that TLS session tickets are very different and it is the clients' responsibility
 to cache the SSL session state when session tickets are used. SSL session resumptions based on
 TLS session tickets would happen automatically without going through this hook (nor the
-[ssl_session_store_by_lua*](#ssl_session_store_by_lua_block) hook). This hook is mainly
+[ssl_session_store_by_lua_block](#ssl_session_store_by_lua) hook). This hook is mainly
 for older or less capable SSL clients that can only do SSL sessions by session IDs.
 
 When [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block) is specified at the same time,
 this hook usually runs before [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
 When the SSL session is found and successfully loaded for the current SSL connection,
 SSL session resumption will happen and thus bypass the [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block)
-hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block)
+hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua_block](#ssl_session_store_by_lua)
 hook, for obvious reasons.
 
 To easily test this hook locally with a modern web browser, you can temporarily put the following line
@@ -3107,23 +3108,6 @@ This directive was first introduced in the `v0.8.0` release.
 
 [Back to TOC](#directives)
 
-lua_sa_restart
---------------
-
-**syntax:** *lua_sa_restart on|off*
-
-**default:** *lua_sa_restart on*
-
-**context:** *http*
-
-When enabled, this module will set the `SA_RESTART` flag on nginx workers signal dispositions.
-
-This allows Lua I/O primitives to not be interrupted by nginx's handling of various signals.
-
-This directive was first introduced in the `v0.10.14` release.
-
-[Back to TOC](#directives)
-
 Nginx API for Lua
 =================
 
@@ -3237,7 +3221,6 @@ Nginx API for Lua
 * [tcpsock:sslhandshake](#tcpsocksslhandshake)
 * [tcpsock:send](#tcpsocksend)
 * [tcpsock:receive](#tcpsockreceive)
-* [tcpsock:receiveany](#tcpsockreceiveany)
 * [tcpsock:receiveuntil](#tcpsockreceiveuntil)
 * [tcpsock:close](#tcpsockclose)
 * [tcpsock:settimeout](#tcpsocksettimeout)
@@ -4319,7 +4302,7 @@ ngx.req.get_method
 ------------------
 **syntax:** *method_name = ngx.req.get_method()*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, balancer_by_lua&#42;, log_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, balancer_by_lua&#42;*
 
 Retrieves the current request's request method name. Strings like `"GET"` and `"POST"` are returned instead of numerical [method constants](#http-method-constants).
 
@@ -4904,7 +4887,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](#ngxreqread_body) first (or turn 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 not been read yet, call [ngx.req.read_body](#ngxreqread_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](#ngxreqget_body_file) function instead.
 
@@ -4928,7 +4911,7 @@ Retrieves the file name for the in-file request body data. Returns `nil` if the
 
 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](#ngxreqread_body) first (or turn 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 not been read yet, call [ngx.req.read_body](#ngxreqread_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](#ngxreqget_body_data) function instead.
 
@@ -4948,9 +4931,7 @@ ngx.req.set_body_data
 
 Set the current request's request body using the in-memory data specified by the `data` argument.
 
-If the request body has not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn on [lua_need_request_body](#lua_need_request_body) to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [ngx.req.discard_body](#ngxreqdiscard_body).
-
-Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
+If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the `v0.3.1rc18` release.
 
@@ -4966,13 +4947,11 @@ 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 request body has not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn on [lua_need_request_body](#lua_need_request_body) to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [ngx.req.discard_body](#ngxreqdiscard_body).
-
 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](#ngxreqset_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.
 
-Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
+If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the `v0.3.1rc18` release.
 
@@ -6738,7 +6717,7 @@ ngx.shared.DICT.flush_expired
 
 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.
 
-Unlike the [flush_all](#ngxshareddictflush_all) method, this method actually frees up the memory used by the expired items.
+Unlike the [flush_all](#ngxshareddictflush_all) method, this method actually free up the memory used by the expired items.
 
 This feature was first introduced in the `v0.6.3` release.
 
@@ -7023,7 +7002,6 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [settimeout](#tcpsocksettimeout)
 * [settimeouts](#tcpsocksettimeouts)
 * [setoption](#tcpsocksetoption)
-* [receiveany](#tcpsockreceiveany)
 * [receiveuntil](#tcpsockreceiveuntil)
 * [setkeepalive](#tcpsocksetkeepalive)
 * [getreusedtimes](#tcpsockgetreusedtimes)
@@ -7128,43 +7106,6 @@ An optional Lua table can be specified as the last argument to this method to sp
 * `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>"`.
 
-* `pool_size`
-	specify the size of the connection pool. If omitted and no
-	`backlog` option was provided, no pool will be created. If omitted
-	but `backlog` was provided, the pool will be created with a default
-	size equal to the value of the [lua_socket_pool_size](#lua_socket_pool_size)
-	directive.
-	The connection pool holds up to `pool_size` alive connections
-	ready to be reused by subsequent calls to [connect](#tcpsockconnect), but
-	note that there is no upper limit to the total number of opened connections
-	outside of the pool. If you need to restrict the total number of opened
-	connections, specify the `backlog` option.
-	When the connection pool would exceed its size limit, the least recently used
-	(kept-alive) 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. Also note that the size of the connection
-	pool cannot be changed once it has been created.
-	This option was first introduced in the `v0.10.14` release.
-
-* `backlog`
-	if specified, this module will limit the total number of opened connections
-	for this pool. No more connections than `pool_size` can be opened
-	for this pool at any time. If the connection pool is full, subsequent
-	connect operations will be queued into a queue equal to this option's
-	value (the "backlog" queue).
-	If the number of queued connect operations is equal to `backlog`,
-	subsequent connect operations will fail and return `nil` plus the
-	error string `"too many waiting connect operations"`.
-	The queued connect operations will be resumed once the number of connections
-	in the pool is less than `pool_size`.
-	The queued connect operation will abort once they have been queued for more
-	than `connect_timeout`, controlled by
-	[settimeouts](#tcpsocksettimeouts), and will return `nil` plus
-	the error string `"timeout"`.
-	This option was first introduced in the `v0.10.14` release.
-
 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.
@@ -7290,40 +7231,6 @@ This feature was first introduced in the `v0.5.0rc1` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
-tcpsock:receiveany
-------------------
-**syntax:** *data, err = tcpsock:receiveany(max)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-Returns any data received by the connected socket, at most `max` bytes.
-
-This method is a synchronous operation just like the [send](#tcpsocksend) method 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 received data is more than this size, this method will return with exactly this size of data.
-The remaining data in the underlying receive buffer could be returned in the next reading operation.
-
-Timeout for the reading operation is controlled by the [lua_socket_read_timeout](#lua_socket_read_timeout) config directive and the [settimeouts](#tcpsocksettimeouts) method. And the latter takes priority. For example:
-
-```lua
-
- sock:settimeouts(1000, 1000, 1000)  -- one second timeout for connect/read/write
- local data, err = sock:receiveany(10 * 1024 * 1024) -- read any data, at most 10K
- if not data then
-     ngx.say("failed to read any data: ", err)
-     return
- end
- ngx.say("successfully read: ", data)
-```
-
-This method doesn't automatically close the current connection when the read timeout error occurs. For other connection errors, this method always automatically closes the connection.
-
-This feature was first introduced in the `v0.10.14` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
 tcpsock:receiveuntil
 --------------------
 **syntax:** *iterator = tcpsock:receiveuntil(pattern, options?)*
@@ -7496,31 +7403,13 @@ Puts the current socket's connection immediately into the cosocket built-in conn
 
 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](#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` is considered deprecated since
-the `v0.10.14` release of this module, in favor of the
-`pool_size` option of the [connect](#tcpsockconnect) method.
-Since the `v0.10.14` release, this option will only take effect if
-the call to [connect](#tcpsockconnect) did not already create a connection
-pool.
-When this option takes effect (no connection pool was previously created by
-[connect](#tcpsockconnect)), it will specify the size of the connection pool,
-and create it.
-If omitted (and no pool was previously created), the default size is the value
-of the [lua_socket_pool_size](#lua_socket_pool_size) directive.
-The connection pool holds up to `size` alive connections ready to be
-reused by subsequent calls to [connect](#tcpsockconnect), but note that there
-is no upper limit to the total number of opened connections outside of the
-pool.
-When the connection pool would exceed its size limit, the least recently used
-(kept-alive) 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. Also note that the size of the connection
-pool cannot be changed once it has been created.
-If you need to restrict the total number of opened connections, specify both
-the `pool_size` and `backlog` option in the call to
-[connect](#tcpsockconnect).
+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](#lua_socket_pool_size) config directive will be used.
+
+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.
+
+Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
 
 In case of success, this method returns `1`; otherwise, it returns `nil` and a string describing the error.
 
@@ -8292,7 +8181,7 @@ This Lua module does not ship with this ngx_lua module itself rather it is shipp
 the
 [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
 
-Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md)
+Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md)
 for this `ngx.ocsp` Lua module for more details.
 
 This feature requires at least ngx_lua `v0.10.0`.
diff --git a/debian/modules/http-lua/config b/debian/modules/http-lua/config
index e1d5e35..044deb9 100644
--- a/debian/modules/http-lua/config
+++ b/debian/modules/http-lua/config
@@ -361,8 +361,6 @@ HTTP_LUA_SRCS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.c \
             $ngx_addon_dir/src/ngx_http_lua_ssl.c \
             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.c \
-            $ngx_addon_dir/src/ngx_http_lua_input_filters.c \
-            $ngx_addon_dir/src/ngx_http_lua_pipe.c \
             "
 
 HTTP_LUA_DEPS=" \
@@ -424,8 +422,6 @@ HTTP_LUA_DEPS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.h \
             $ngx_addon_dir/src/ngx_http_lua_ssl.h \
             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.h \
-            $ngx_addon_dir/src/ngx_http_lua_input_filters.h \
-            $ngx_addon_dir/src/ngx_http_lua_pipe.h \
             "
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
@@ -478,17 +474,6 @@ ngx_feature_test='setsockopt(1, SOL_SOCKET, SO_PASSCRED, NULL, 0);'
 
 . auto/feature
 
-ngx_feature="SA_RESTART"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_SA_RESTART"
-ngx_feature_run=no
-ngx_feature_incs="#include <signal.h>"
-ngx_feature_path=
-ngx_feature_test='struct sigaction act;
-                  act.sa_flags |= SA_RESTART;'
-
-. auto/feature
-
 ngx_feature="__attribute__(constructor)"
 ngx_feature_libs=
 ngx_feature_name="NGX_HTTP_LUA_HAVE_CONSTRUCTOR"
@@ -527,36 +512,6 @@ CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
 
 # ----------------------------------------
 
-ngx_feature="pipe2"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_PIPE2"
-ngx_feature_run=no
-ngx_feature_incs="#include <fcntl.h>"
-ngx_feature_test="int fd[2]; pipe2(fd, O_CLOEXEC|O_NONBLOCK);"
-SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
-
-. auto/feature
-
-CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-
-# ----------------------------------------
-
-ngx_feature="signalfd"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_SIGNALFD"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/signalfd.h>"
-ngx_feature_test="sigset_t set; signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);"
-SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
-
-. auto/feature
-
-CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-
-# ----------------------------------------
-
 if test -n "$ngx_module_link"; then
     ngx_module_type=HTTP_AUX_FILTER
     ngx_module_name=$ngx_addon_name
diff --git a/debian/modules/http-lua/doc/HttpLuaModule.wiki b/debian/modules/http-lua/doc/HttpLuaModule.wiki
index ff9b269..e3c61e2 100644
--- a/debian/modules/http-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/http-lua/doc/HttpLuaModule.wiki
@@ -2,8 +2,6 @@
 
 ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
-This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
-
 ''This module is not distributed with the Nginx source.'' See [[#Installation|the installation instructions]].
 
 = Status =
@@ -12,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.15] released on March 14th, 2019.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.13] released on 22 April 2018.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -132,9 +130,7 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
 
 = Description =
 
-This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
-
-This module embeds Lua, via [http://luajit.org/luajit.html LuaJIT 2.0/2.1], 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 5.1 interpreter or [http://luajit.org/luajit.html LuaJIT 2.0/2.1], into Nginx and by leveraging Nginx's subrequests, allows the integration of the powerful Lua threads (Lua coroutines) into the Nginx event model.
 
 Unlike [https://httpd.apache.org/docs/trunk/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.
@@ -203,11 +199,11 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 
 = Installation =
 
-It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, OpenResty's LuaJIT 2.1 branch version, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
+It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-# LuaJIT can be downloaded from the [https://github.com/openresty/luajit2/releases latest release of OpenResty's LuaJIT branch version]. The official LuaJIT 2.0 and 2.1 releases are also supported, although the performance will be significantly lower in many cases.
+# Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is ''not'' supported yet). LuaJIT can be downloaded from the [http://luajit.org/download.html 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 [https://github.com/simplresty/ngx_devel_kit/tags HERE].
 # Download the latest version of ngx_lua [https://github.com/openresty/lua-nginx-module/tags HERE].
 # Download the latest version of Nginx [http://nginx.org/ HERE] (See [[#Nginx Compatibility|Nginx Compatibility]])
@@ -275,6 +271,24 @@ To enable one or more of these macros, just pass extra C compiler options to the
     ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
 </geshi>
 
+== Installation on Ubuntu 11.10 ==
+
+Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever 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 ==
@@ -300,7 +314,7 @@ Please submit bug reports, wishlists, or patches by
 
 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/2.1 raw bytecode files directly.
 
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if you are using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 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.ljbc
@@ -318,6 +332,18 @@ http://luajit.org/running.html#opt_b
 
 Also, the bytecode files generated by LuaJIT 2.1 is ''not'' compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
 
+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/2.1 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">
@@ -484,7 +510,8 @@ However, later attempts to manipulate the cosocket object will fail and return t
 This issue is due to limitations in the Nginx event model and only appears to affect Mac OS X.
 
 == Lua Coroutine Yielding/Resuming ==
-* Because Lua's <code>dofile</code> and <code>require</code> builtins are currently implemented as C functions in LuaJIT 2.0/2.1, if the Lua file being loaded by <code>dofile</code> or <code>require</code> invokes [[#ngx.location.capture|ngx.location.capture*]], [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]], or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
+* Because Lua's <code>dofile</code> and <code>require</code> builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by <code>dofile</code> or <code>require</code> invokes [[#ngx.location.capture|ngx.location.capture*]], [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]], or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
+* 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()] or even the first line of the <code>for ... in ...</code> statement 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.x, which supports a fully resumable VM, to avoid this.
 
 == Lua Variable Scope ==
 Care must be taken when importing modules and this form should be used:
@@ -790,7 +817,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2019, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -835,34 +862,6 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 ![Lua Nginx Modules Directives](https://cloud.githubusercontent.com/assets/2137369/15272097/77d1c09e-1a37-11e6-97ef-d9767035fc3e.png)
 
-== lua_load_resty_core ==
-
-'''syntax:''' ''lua_load_resty_core on|off''
-
-'''default:''' ''lua_load_resty_core on''
-
-'''context:''' ''http''
-
-Controls whether the <code>resty.core</code> module (from
-[https://github.com/openresty/lua-resty-core lua-resty-core]) should be loaded
-or not. When enabled, this directive is equivalent to executing the following
-when the Lua VM is created:
-
-<geshi lang="lua">
-    require "resty.core"
-</geshi>
-
-Note that usage of the <code>resty.core</code> module is recommended, as its
-FFI implementation is both faster, safer, and more complete than the Lua C API
-of the ngx_lua module.
-
-It must also be noted that the Lua C API of the ngx_lua module will eventually
-be removed, and usage of the FFI-based API (i.e. the <code>resty.core</code>
-module) will become mandatory. This directive only aims at providing a
-temporary backwards-compatibility mode in case of edge-cases.
-
-This directive was first introduced in the <code>v0.10.15</code> release.
-
 == lua_capture_error_log ==
 '''syntax:''' ''lua_capture_error_log size''
 
@@ -2197,14 +2196,14 @@ SSL session resumption can then get immediately initiated and bypass the full SS
 Please note that TLS session tickets are very different and it is the clients' responsibility
 to cache the SSL session state when session tickets are used. SSL session resumptions based on
 TLS session tickets would happen automatically without going through this hook (nor the
-[[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]] hook). This hook is mainly
+[[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]] hook). This hook is mainly
 for older or less capable SSL clients that can only do SSL sessions by session IDs.
 
 When [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]] is specified at the same time,
 this hook usually runs before [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]].
 When the SSL session is found and successfully loaded for the current SSL connection,
 SSL session resumption will happen and thus bypass the [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]]
-hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]]
+hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]]
 hook, for obvious reasons.
 
 To easily test this hook locally with a modern web browser, you can temporarily put the following line
@@ -2627,20 +2626,6 @@ When exceeding this limit, Nginx will stop running the callbacks of newly expire
 
 This directive was first introduced in the <code>v0.8.0</code> release.
 
-== lua_sa_restart ==
-
-'''syntax:''' ''lua_sa_restart on|off''
-
-'''default:''' ''lua_sa_restart on''
-
-'''context:''' ''http''
-
-When enabled, this module will set the `SA_RESTART` flag on nginx workers signal dispositions.
-
-This allows Lua I/O primitives to not be interrupted by nginx's handling of various signals.
-
-This directive was first introduced in the <code>v0.10.14</code> release.
-
 = Nginx API for Lua =
 
 <!-- inline-toc -->
@@ -3578,7 +3563,7 @@ This method does not work in HTTP/2 requests yet.
 == 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*, body_filter_by_lua*, balancer_by_lua*, log_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, balancer_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]].
 
@@ -4086,7 +4071,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 turn 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 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.
 
@@ -4107,7 +4092,7 @@ Retrieves the file name for the in-file request body data. Returns <code>nil</co
 
 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 turn 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 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.
 
@@ -4124,9 +4109,7 @@ See also [[#ngx.req.get_body_data|ngx.req.get_body_data]].
 
 Set the current request's request body using the in-memory data specified by the <code>data</code> argument.
 
-If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [[#ngx.req.discard_body|ngx.req.discard_body]].
-
-Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
+If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the <code>v0.3.1rc18</code> release.
 
@@ -4139,13 +4122,11 @@ 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 request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [[#ngx.req.discard_body|ngx.req.discard_body]].
-
 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.
 
-Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
+If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the <code>v0.3.1rc18</code> release.
 
@@ -5667,7 +5648,7 @@ See also [[#ngx.shared.DICT.flush_expired|ngx.shared.DICT.flush_expired]] and [[
 
 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.
 
-Unlike the [[#ngx.shared.DICT.flush_all|flush_all]] method, this method actually frees up the memory used by the expired items.
+Unlike the [[#ngx.shared.DICT.flush_all|flush_all]] method, this method actually free up the memory used by the expired items.
 
 This feature was first introduced in the <code>v0.6.3</code> release.
 
@@ -5913,7 +5894,6 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [[#tcpsock:settimeout|settimeout]]
 * [[#tcpsock:settimeouts|settimeouts]]
 * [[#tcpsock:setoption|setoption]]
-* [[#tcpsock:receiveany|receiveany]]
 * [[#tcpsock:receiveuntil|receiveuntil]]
 * [[#tcpsock:setkeepalive|setkeepalive]]
 * [[#tcpsock:getreusedtimes|getreusedtimes]]
@@ -6011,43 +5991,6 @@ An optional Lua table can be specified as the last argument to this method to sp
 * <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>.
 
-* <code>pool_size</code>
-: specify the size of the connection pool. If omitted and no
-: <code>backlog</code> option was provided, no pool will be created. If omitted
-: but <code>backlog</code> was provided, the pool will be created with a default
-: size equal to the value of the [[#lua_socket_pool_size|lua_socket_pool_size]]
-: directive.
-: The connection pool holds up to <code>pool_size</code> alive connections
-: ready to be reused by subsequent calls to [[#tcpsock:connect|connect]], but
-: note that there is no upper limit to the total number of opened connections
-: outside of the pool. If you need to restrict the total number of opened
-: connections, specify the <code>backlog</code> option.
-: When the connection pool would exceed its size limit, the least recently used
-: (kept-alive) 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. Also note that the size of the connection
-: pool cannot be changed once it has been created.
-: This option was first introduced in the <code>v0.10.14</code> release.
-
-* <code>backlog</code>
-: if specified, this module will limit the total number of opened connections
-: for this pool. No more connections than <code>pool_size</code> can be opened
-: for this pool at any time. If the connection pool is full, subsequent
-: connect operations will be queued into a queue equal to this option's
-: value (the "backlog" queue).
-: If the number of queued connect operations is equal to <code>backlog</code>,
-: subsequent connect operations will fail and return <code>nil</code> plus the
-: error string <code>"too many waiting connect operations"</code>.
-: The queued connect operations will be resumed once the number of connections
-: in the pool is less than <code>pool_size</code>.
-: The queued connect operation will abort once they have been queued for more
-: than <code>connect_timeout</code>, controlled by
-: [[#tcpsock:settimeouts|settimeouts]], and will return <code>nil</code> plus
-: the error string <code>"timeout"</code>.
-: This option was first introduced in the <code>v0.10.14</code> release.
-
 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.
@@ -6160,36 +6103,6 @@ Since the <code>v0.8.8</code> release, this method no longer automatically close
 
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
-== tcpsock:receiveany ==
-'''syntax:''' ''data, err = tcpsock:receiveany(max)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-Returns any data received by the connected socket, at most <code>max</code> bytes.
-
-This method is a synchronous operation just like the [[#tcpsock:send|send]] method 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 received data is more than this size, this method will return with exactly this size of data.
-The remaining data in the underlying receive buffer could be returned in the next reading operation.
-
-Timeout for the reading operation is controlled by the [[#lua_socket_read_timeout|lua_socket_read_timeout]] config directive and the [[#tcpsock:settimeouts|settimeouts]] method. And the latter takes priority. For example:
-
-<geshi lang="lua">
-    sock:settimeouts(1000, 1000, 1000)  -- one second timeout for connect/read/write
-    local data, err = sock:receiveany(10 * 1024 * 1024) -- read any data, at most 10K
-    if not data then
-        ngx.say("failed to read any data: ", err)
-        return
-    end
-    ngx.say("successfully read: ", data)
-</geshi>
-
-This method doesn't automatically close the current connection when the read timeout error occurs. For other connection errors, this method always automatically closes the connection.
-
-This feature was first introduced in the <code>v0.10.14</code> release.
-
 == tcpsock:receiveuntil ==
 '''syntax:''' ''iterator = tcpsock:receiveuntil(pattern, options?)''
 
@@ -6342,31 +6255,13 @@ Puts the current socket's connection immediately into the cosocket built-in conn
 
 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> is considered deprecated since
-the <code>v0.10.14</code> release of this module, in favor of the
-<code>pool_size</code> option of the [[#tcpsock:connect|connect]] method.
-Since the <code>v0.10.14</code> release, this option will only take effect if
-the call to [[#tcpsock:connect|connect]] did not already create a connection
-pool.
-When this option takes effect (no connection pool was previously created by
-[[#tcpsock:connect|connect]]), it will specify the size of the connection pool,
-and create it.
-If omitted (and no pool was previously created), the default size is the value
-of the [[#lua_socket_pool_size|lua_socket_pool_size]] directive.
-The connection pool holds up to <code>size</code> alive connections ready to be
-reused by subsequent calls to [[#tcpsock:connect|connect]], but note that there
-is no upper limit to the total number of opened connections outside of the
-pool.
-When the connection pool would exceed its size limit, the least recently used
-(kept-alive) 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. Also note that the size of the connection
-pool cannot be changed once it has been created.
-If you need to restrict the total number of opened connections, specify both
-the <code>pool_size</code> and <code>backlog</code> option in the call to
-[[#tcpsock:connect|connect]].
+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 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.
+
+Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
 
 In case of success, this method returns <code>1</code>; otherwise, it returns <code>nil</code> and a string describing the error.
 
@@ -7055,7 +6950,7 @@ This Lua module does not ship with this ngx_lua module itself rather it is shipp
 the
 [https://github.com/openresty/lua-resty-core lua-resty-core] library.
 
-Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md documentation]
+Please refer to the [https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md documentation]
 for this <code>ngx.ocsp</code> Lua module for more details.
 
 This feature requires at least ngx_lua <code>v0.10.0</code>.
diff --git a/debian/modules/http-lua/src/api/ngx_http_lua_api.h b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
index 129eb99..c7c0e6b 100644
--- a/debian/modules/http-lua/src/api/ngx_http_lua_api.h
+++ b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10015
+#define ngx_http_lua_version  10013
 
 
 typedef struct {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_accessby.c b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
index d3fe294..56bf0fa 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_accessby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
@@ -60,7 +60,7 @@ ngx_http_lua_access_handler(ngx_http_request_t *r)
 #endif
 
         if (cur_ph < last_ph) {
-            dd("swapping the contents of cur_ph and last_ph...");
+            dd("swaping the contents of cur_ph and last_ph...");
 
             tmp = *cur_ph;
 
@@ -261,11 +261,9 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_api.c b/debian/modules/http-lua/src/ngx_http_lua_api.c
index ac014f2..7b590e7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_api.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_api.c
@@ -195,7 +195,7 @@ ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
     lmcf->shm_zones_inited++;
 
     if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
-        && lmcf->init_handler && !ngx_test_config)
+        && lmcf->init_handler)
     {
         saved_cycle = ngx_cycle;
         ngx_cycle = ctx->cycle;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_balancer.c b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
index 3ecd592..fdf2af3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
@@ -362,8 +362,6 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     /* init nginx context in Lua VM */
     ngx_http_lua_set_req(L, r);
-
-#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ make new env inheriting main thread's globals table */
@@ -374,7 +372,6 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif /* OPENRESTY_LUAJIT */
 
     lua_pushcfunction(L, ngx_http_lua_traceback);
     lua_insert(L, 1);  /* put it under chunk and args */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
index f3af14c..2b3c38f 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
@@ -32,6 +32,10 @@ static void ngx_http_lua_body_filter_by_lua_env(lua_State *L,
 static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
 
 
+/* key for the ngx_chain_t *in pointer in the Lua thread */
+#define ngx_http_lua_chain_key  "__ngx_cl"
+
+
 /**
  * Set environment table for the given code closure.
  *
@@ -47,14 +51,12 @@ static void
 ngx_http_lua_body_filter_by_lua_env(lua_State *L, ngx_http_request_t *r,
     ngx_chain_t *in)
 {
-    ngx_http_lua_main_conf_t    *lmcf;
-
+    /*  set nginx request pointer to current lua thread's globals table */
     ngx_http_lua_set_req(L, r);
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-    lmcf->body_filter_chain = in;
+    lua_pushlightuserdata(L, in);
+    lua_setglobal(L, ngx_http_lua_chain_key);
 
-#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -77,7 +79,6 @@ ngx_http_lua_body_filter_by_lua_env(lua_State *L, ngx_http_request_t *r,
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif /* OPENRESTY_LUAJIT */
 }
 
 
@@ -235,8 +236,8 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_int_t                    rc;
     uint16_t                     old_context;
     ngx_http_cleanup_t          *cln;
+    lua_State                   *L;
     ngx_chain_t                 *out;
-    ngx_http_lua_main_conf_t    *lmcf;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua body filter for user lua code, uri \"%V\"", &r->uri);
@@ -298,8 +299,11 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return NGX_ERROR;
     }
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-    out = lmcf->body_filter_chain;
+    L = ngx_http_lua_get_lua_vm(r, ctx);
+
+    lua_getglobal(L, ngx_http_lua_chain_key);
+    out = lua_touserdata(L, -1);
+    lua_pop(L, 1);
 
     if (in == out) {
         return ngx_http_next_body_filter(r, in);
@@ -341,7 +345,7 @@ ngx_http_lua_body_filter_init(void)
 
 
 int
-ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
+ngx_http_lua_body_filter_param_get(lua_State *L)
 {
     u_char              *data, *p;
     size_t               size;
@@ -350,8 +354,6 @@ ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
     int                  idx;
     ngx_chain_t         *in;
 
-    ngx_http_lua_main_conf_t    *lmcf;
-
     idx = luaL_checkint(L, 2);
 
     dd("index: %d", idx);
@@ -361,8 +363,8 @@ ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
         return 1;
     }
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-    in = lmcf->body_filter_chain;
+    lua_getglobal(L, ngx_http_lua_chain_key);
+    in = lua_touserdata(L, -1);
 
     if (idx == 2) {
         /* asking for the eof argument */
@@ -440,8 +442,6 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     ngx_chain_t             *cl;
     ngx_chain_t             *in;
 
-    ngx_http_lua_main_conf_t    *lmcf;
-
     idx = luaL_checkint(L, 2);
 
     dd("index: %d", idx);
@@ -450,13 +450,13 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
         return luaL_error(L, "bad index: %d", idx);
     }
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
     if (idx == 2) {
         /* overwriting the eof flag */
         last = lua_toboolean(L, 3);
 
-        in = lmcf->body_filter_chain;
+        lua_getglobal(L, ngx_http_lua_chain_key);
+        in = lua_touserdata(L, -1);
+        lua_pop(L, 1);
 
         if (last) {
             ctx->seen_last_in_filter = 1;
@@ -521,7 +521,9 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     case LUA_TNIL:
         /* discard the buffers */
 
-        in = lmcf->body_filter_chain;
+        lua_getglobal(L, ngx_http_lua_chain_key); /* key val */
+        in = lua_touserdata(L, -1);
+        lua_pop(L, 1);
 
         last = 0;
 
@@ -555,7 +557,9 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
                           lua_typename(L, type));
     }
 
-    in = lmcf->body_filter_chain;
+    lua_getglobal(L, ngx_http_lua_chain_key);
+    in = lua_touserdata(L, -1);
+    lua_pop(L, 1);
 
     last = 0;
 
@@ -621,8 +625,8 @@ done:
         }
     }
 
-    lmcf->body_filter_chain = cl;
-
+    lua_pushlightuserdata(L, cl);
+    lua_setglobal(L, ngx_http_lua_chain_key);
     return 0;
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
index b108202..6a4b306 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
@@ -21,7 +21,7 @@ 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, ngx_http_request_t *r);
+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);
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_cache.c b/debian/modules/http-lua/src/ngx_http_lua_cache.c
index 5b29527..5ea3069 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_cache.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_cache.c
@@ -35,14 +35,11 @@ static ngx_int_t
 ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
     const char *key)
 {
-#ifndef OPENRESTY_LUAJIT
     int          rc;
     u_char      *err;
-#endif
 
     /*  get code cache table */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          code_cache_key));
+    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));
@@ -55,10 +52,6 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
     lua_getfield(L, -1, key);    /*  sp++ */
 
     if (lua_isfunction(L, -1)) {
-#ifdef OPENRESTY_LUAJIT
-        lua_remove(L, -2);   /*  sp-- */
-        return NGX_OK;
-#else
         /*  call closure factory to gen new closure */
         rc = lua_pcall(L, 0, 1, 0);
         if (rc == 0) {
@@ -80,7 +73,6 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
                       key, err);
         lua_pop(L, 2);
         return NGX_ERROR;
-#endif /* OPENRESTY_LUAJIT */
     }
 
     dd("Value associated with given key in code cache table is not code "
@@ -110,13 +102,10 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
 static ngx_int_t
 ngx_http_lua_cache_store_code(lua_State *L, const char *key)
 {
-#ifndef OPENRESTY_LUAJIT
     int rc;
-#endif
 
     /*  get code cache table */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          code_cache_key));
+    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));
@@ -132,14 +121,12 @@ ngx_http_lua_cache_store_code(lua_State *L, const char *key)
     /*  remove cache table, leave closure factory at top of stack */
     lua_pop(L, 1); /* closure */
 
-#ifndef OPENRESTY_LUAJIT
     /*  call closure factory to generate new closure */
     rc = lua_pcall(L, 0, 1, 0);
     if (rc != 0) {
         dd("Error: failed to call closure factory!!");
         return NGX_ERROR;
     }
-#endif
 
     return NGX_OK;
 }
@@ -156,8 +143,7 @@ ngx_http_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
 
     n = lua_gettop(L);
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "looking up Lua code cache with key '%s'", cache_key);
+    dd("XXX cache key: [%s]", cache_key);
 
     rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
@@ -241,8 +227,7 @@ ngx_http_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
         dd("CACHE file key already pre-calculated");
     }
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "looking up Lua code cache with key '%s'", cache_key);
+    dd("XXX cache key for file: [%s]", cache_key);
 
     rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
index 754ed8d..041f046 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
@@ -15,13 +15,11 @@
 #include "ngx_http_lua_clfactory.h"
 
 
-#ifndef OPENRESTY_LUAJIT
 #define CLFACTORY_BEGIN_CODE "return function() "
 #define CLFACTORY_BEGIN_SIZE (sizeof(CLFACTORY_BEGIN_CODE) - 1)
 
 #define CLFACTORY_END_CODE "\nend"
 #define CLFACTORY_END_SIZE (sizeof(CLFACTORY_END_CODE) - 1)
-#endif
 
 
 /*
@@ -61,7 +59,6 @@
  * length(Instruction) = 4 or 8
  * little endian or big endian
 */
-#ifndef OPENRESTY_LUAJIT
 #define    LUA_LITTLE_ENDIAN_4BYTES_CODE                                     \
     "\x24\x00\x00\x00\x1e\x00\x00\x01\x1e\x00\x80\x00"
 #define    LUA_LITTLE_ENDIAN_8BYTES_CODE                                     \
@@ -78,7 +75,6 @@
 #define    LUA_BIG_ENDIAN_8BYTES_CODE_LEN           (8 + 8 + 8)
 #define    LUAC_HEADERSIZE         12
 #define    LUAC_VERSION            0x51
-#endif /* OPENRESTY_LUAJIT */
 
 
 /*
@@ -151,7 +147,6 @@
  * ---------------------
 */
 
-#ifndef OPENRESTY_LUAJIT
 #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))
@@ -165,7 +160,6 @@
     (POS_BYTECODE + LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN                        \
     + sizeof(int) + sizeof(int))
 #define    MAX_END_CODE_SIZE       (sizeof(int) + sizeof(int) + sizeof(int))
-#endif /* OPENRESTY_LUAJIT */
 
 /*
  * taken from chaoslawful:
@@ -231,7 +225,6 @@
 
 /* bytecode for luajit 2.0 */
 
-#ifndef OPENRESTY_LUAJIT
 #define    LJ20_LITTLE_ENDIAN_CODE_STRIPPED                                  \
     "\x14\x03\x00\x01\x00\x01\x00\x03"                                       \
     "\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00"                       \
@@ -282,7 +275,6 @@
 #define    LJ21_BCDUMP_VERSION        2
 #define    LJ20_BCDUMP_VERSION        1
 #define    LJ_SIGNATURE             "\x1b\x4c\x4a"
-#endif /* OPENRESTY_LUAJIT */
 
 
 typedef enum {
@@ -300,11 +292,10 @@ enum {
 typedef struct {
     ngx_http_lua_clfactory_file_type_e file_type;
 
-    int         extraline;
-    FILE       *f;
-#ifndef OPENRESTY_LUAJIT
     int         sent_begin;
     int         sent_end;
+    int         extraline;
+    FILE       *f;
     size_t      begin_code_len;
     size_t      end_code_len;
     size_t      rest_len;
@@ -316,16 +307,13 @@ typedef struct {
         char   *ptr;
         char    str[MAX_END_CODE_SIZE];
     }           end_code;
-#endif /* OPENRESTY_LUAJIT */
     char        buff[NGX_LUA_READER_BUFSIZE];
 } ngx_http_lua_clfactory_file_ctx_t;
 
 
 typedef struct {
-#ifndef OPENRESTY_LUAJIT
     int         sent_begin;
     int         sent_end;
-#endif
     const char *s;
     size_t      size;
 } ngx_http_lua_clfactory_buffer_ctx_t;
@@ -337,12 +325,9 @@ static int ngx_http_lua_clfactory_errfile(lua_State *L, const char *what,
     int fname_index);
 static const char *ngx_http_lua_clfactory_getS(lua_State *L, void *ud,
     size_t *size);
-#ifndef OPENRESTY_LUAJIT
 static long ngx_http_lua_clfactory_file_size(FILE *f);
-#endif
 
 
-#ifndef OPENRESTY_LUAJIT
 int
 ngx_http_lua_clfactory_bytecode_prepare(lua_State *L,
     ngx_http_lua_clfactory_file_ctx_t *lf, int fname_index)
@@ -608,7 +593,6 @@ error:
 
     return LUA_ERRFILE;
 }
-#endif /* OPENRESTY_LUAJIT */
 
 
 ngx_int_t
@@ -628,12 +612,10 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
     lf.extraline = 0;
     lf.file_type = NGX_LUA_TEXT_FILE;
 
-#ifndef OPENRESTY_LUAJIT
     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;
-#endif
 
     lua_pushfstring(L, "@%s", filename);
 
@@ -701,27 +683,20 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
             /* skip eventual `#!...' */
         }
 
-#ifndef OPENRESTY_LUAJIT
         status = ngx_http_lua_clfactory_bytecode_prepare(L, &lf, fname_index);
 
         if (status != 0) {
             return status;
         }
-#endif
 
         lf.extraline = 0;
     }
 
-#ifndef OPENRESTY_LUAJIT
     if (lf.file_type == NGX_LUA_TEXT_FILE) {
         ungetc(c, lf.f);
     }
 
     lf.sent_begin = lf.sent_end = 0;
-
-#else
-    ungetc(c, lf.f);
-#endif
     status = lua_load(L, ngx_http_lua_clfactory_getF, &lf,
                       lua_tostring(L, -1));
 
@@ -750,10 +725,8 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 
     ls.s = buff;
     ls.size = size;
-#ifndef OPENRESTY_LUAJIT
     ls.sent_begin = 0;
     ls.sent_end = 0;
-#endif
 
     return lua_load(L, ngx_http_lua_clfactory_getS, &ls, name);
 }
@@ -762,9 +735,7 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 static const char *
 ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 {
-#ifndef OPENRESTY_LUAJIT
     char                        *buf;
-#endif
     size_t                       num;
 
     ngx_http_lua_clfactory_file_ctx_t        *lf;
@@ -777,7 +748,6 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
         return "\n";
     }
 
-#ifndef OPENRESTY_LUAJIT
     if (lf->sent_begin == 0) {
         lf->sent_begin = 1;
         *size = lf->begin_code_len;
@@ -791,14 +761,12 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 
         return buf;
     }
-#endif /* OPENRESTY_LUAJIT */
 
     num = fread(lf->buff, 1, sizeof(lf->buff), lf->f);
 
     dd("fread returned %d", (int) num);
 
     if (num == 0) {
-#ifndef OPENRESTY_LUAJIT
         if (lf->sent_end == 0) {
             lf->sent_end = 1;
             *size = lf->end_code_len;
@@ -812,13 +780,11 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 
             return buf;
         }
-#endif /* OPENRESTY_LUAJIT */
 
         *size = 0;
         return NULL;
     }
 
-#ifndef OPENRESTY_LUAJIT
     if (lf->file_type == NGX_LUA_BT_LJ) {
         /* skip the footer(\x00) in luajit */
 
@@ -834,7 +800,6 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
             }
         }
     }
-#endif /* OPENRESTY_LUAJIT */
 
     *size = num;
     return lf->buff;
@@ -868,23 +833,19 @@ ngx_http_lua_clfactory_getS(lua_State *L, void *ud, size_t *size)
 {
     ngx_http_lua_clfactory_buffer_ctx_t      *ls = ud;
 
-#ifndef OPENRESTY_LUAJIT
     if (ls->sent_begin == 0) {
         ls->sent_begin = 1;
         *size = CLFACTORY_BEGIN_SIZE;
 
         return CLFACTORY_BEGIN_CODE;
     }
-#endif
 
     if (ls->size == 0) {
-#ifndef OPENRESTY_LUAJIT
         if (ls->sent_end == 0) {
             ls->sent_end = 1;
             *size = CLFACTORY_END_SIZE;
             return CLFACTORY_END_CODE;
         }
-#endif
 
         return NULL;
     }
@@ -896,7 +857,6 @@ ngx_http_lua_clfactory_getS(lua_State *L, void *ud, size_t *size)
 }
 
 
-#ifndef OPENRESTY_LUAJIT
 static long
 ngx_http_lua_clfactory_file_size(FILE *f)
 {
@@ -922,7 +882,6 @@ ngx_http_lua_clfactory_file_size(FILE *f)
 
     return len;
 }
-#endif /* OPENRESTY_LUAJIT */
 
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_common.h b/debian/modules/http-lua/src/ngx_http_lua_common.h
index dae5245..01ef2be 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_common.h
@@ -17,7 +17,7 @@
 #include <setjmp.h>
 #include <stdint.h>
 
-#include <luajit.h>
+#include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 
@@ -140,15 +140,6 @@ typedef struct {
 #endif
 
 
-#if (NGX_PTR_SIZE >= 8 && !defined(_WIN64))
-#define ngx_http_lua_lightudata_mask(ludata)                                 \
-    ((void *) ((uintptr_t) (&ngx_http_lua_##ludata) & ((1UL << 47) - 1)))
-
-#else
-#define ngx_http_lua_lightudata_mask(ludata)    (&ngx_http_lua_##ludata)
-#endif
-
-
 typedef struct ngx_http_lua_main_conf_s  ngx_http_lua_main_conf_t;
 typedef union ngx_http_lua_srv_conf_u  ngx_http_lua_srv_conf_t;
 
@@ -182,8 +173,6 @@ struct ngx_http_lua_main_conf_s {
     ngx_cycle_t         *cycle;
     ngx_pool_t          *pool;
 
-    ngx_flag_t           load_resty_core;
-
     ngx_int_t            max_pending_timers;
     ngx_int_t            pending_timers;
 
@@ -219,31 +208,9 @@ struct ngx_http_lua_main_conf_s {
     ngx_str_t                            init_worker_src;
 
     ngx_http_lua_balancer_peer_data_t      *balancer_peer_data;
-                    /* neither yielding nor recursion is possible in
-                     * balancer_by_lua*, so there cannot be any races among
-                     * concurrent requests and it is safe to store the peer
-                     * data pointer in the main conf.
-                     */
-
-    ngx_chain_t                            *body_filter_chain;
-                    /* neither yielding nor recursion is possible in
-                     * body_filter_by_lua*, so there cannot be any races among
-                     * concurrent requests when storing the chain
-                     * data pointer in the main conf.
-                     */
-
-    ngx_http_variable_value_t              *setby_args;
-                    /* neither yielding nor recursion is possible in
-                     * set_by_lua*, so there cannot be any races among
-                     * concurrent requests when storing the args pointer
-                     * in the main conf.
-                     */
-
-    size_t                                  setby_nargs;
-                    /* neither yielding nor recursion is possible in
-                     * set_by_lua*, so there cannot be any races among
-                     * concurrent requests when storing the nargs in the
-                     * main conf.
+                    /* balancer_by_lua does not support yielding and
+                     * there cannot be any conflicts among concurrent requests,
+                     * thus it is safe to store the peer data in the main conf.
                      */
 
     ngx_uint_t                      shm_zones_inited;
@@ -260,10 +227,6 @@ struct ngx_http_lua_main_conf_s {
     ngx_int_t            busy_buf_ptr_count;
 #endif
 
-    ngx_int_t            host_var_index;
-
-    ngx_flag_t           set_sa_restart;
-
     unsigned             requires_header_filter:1;
     unsigned             requires_body_filter:1;
     unsigned             requires_capture_filter:1;
@@ -481,7 +444,7 @@ typedef struct {
 
 
 typedef struct ngx_http_lua_ctx_s {
-    /* for lua_code_cache off: */
+    /* for lua_coce_cache off: */
     ngx_http_lua_vm_state_t  *vm_state;
 
     ngx_http_request_t      *request;
@@ -568,8 +531,6 @@ typedef struct ngx_http_lua_ctx_s {
 
     unsigned         headers_set:1; /* whether the user has set custom
                                        response headers */
-    unsigned         mime_set:1;    /* whether the user has set Content-Type
-                                       response header */
 
     unsigned         entered_rewrite_phase:1;
     unsigned         entered_access_phase:1;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_contentby.c b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
index 274c9ad..ecd6c0e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_contentby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
@@ -63,11 +63,9 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_control.c b/debian/modules/http-lua/src/ngx_http_lua_control.c
index 5cd1d64..6ac2cbf 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_control.c
@@ -432,8 +432,7 @@ ngx_http_lua_on_abort(lua_State *L)
 
     ngx_http_lua_coroutine_create_helper(L, r, ctx, &coctx);
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushvalue(L, -2);
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
index 99a2423..b790814 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
@@ -104,15 +104,11 @@ ngx_http_lua_coroutine_create_helper(lua_State *L, ngx_http_request_t *r,
     coctx->co = co;
     coctx->co_status = NGX_HTTP_LUA_CO_SUSPENDED;
 
-#ifdef OPENRESTY_LUAJIT
-    ngx_http_lua_set_req(co, r);
-#else
     /* make new coroutine share globals of the parent coroutine.
      * NOTE: globals don't have to be separated! */
     ngx_http_lua_get_globals_table(L);
     lua_xmove(L, co, 1);
     ngx_http_lua_set_globals_table(co);
-#endif
 
     lua_xmove(vm, L, 1);    /* move coroutine from main thread to L */
 
@@ -292,27 +288,15 @@ ngx_http_lua_inject_coroutine_api(ngx_log_t *log, lua_State *L)
     {
         const char buf[] =
             "local keys = {'create', 'yield', 'resume', 'status'}\n"
-#ifdef OPENRESTY_LUAJIT
-            "local get_req = require 'thread.exdata'\n"
-#else
             "local getfenv = getfenv\n"
-#endif
             "for _, key in ipairs(keys) do\n"
                "local std = coroutine['_' .. key]\n"
                "local ours = coroutine['__' .. key]\n"
                "local raw_ctx = ngx._phase_ctx\n"
                "coroutine[key] = function (...)\n"
-#ifdef OPENRESTY_LUAJIT
-                    "local r = get_req()\n"
-#else
                     "local r = getfenv(0).__ngx_req\n"
-#endif
-                    "if r ~= nil then\n"
-#ifdef OPENRESTY_LUAJIT
-                        "local ctx = raw_ctx()\n"
-#else
+                    "if r then\n"
                         "local ctx = raw_ctx(r)\n"
-#endif
                         /* ignore header and body filters */
                         "if ctx ~= 0x020 and ctx ~= 0x040 then\n"
                             "return ours(...)\n"
diff --git a/debian/modules/http-lua/src/ngx_http_lua_directive.c b/debian/modules/http-lua/src/ngx_http_lua_directive.c
index a989c26..fb8c6dc 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_directive.c
@@ -1304,12 +1304,11 @@ ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
 
 found:
 
-    p = ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
-                     tag_len, tag, cf->conf_file->file.name.data
-                     + cf->conf_file->file.name.len - p,
-                     p, cf->conf_file->line);
-
-    *chunkname_len = p - out - 1;  /* exclude the trailing '\0' byte */
+    ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
+                 tag_len, tag, cf->conf_file->file.name.data
+                               + cf->conf_file->file.name.len - p,
+                 p, cf->conf_file->line);
+    *chunkname_len = len;
 
     return out;
 }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
index a0acd4a..b504530 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
@@ -42,9 +42,9 @@ 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)
 {
+    /*  set nginx request pointer to current lua thread's globals table */
     ngx_http_lua_set_req(L, r);
 
-#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -68,7 +68,6 @@ ngx_http_lua_header_filter_by_lua_env(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif /* OPENRESTY_LUAJIT */
 }
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers.c b/debian/modules/http-lua/src/ngx_http_lua_headers.c
index e3f48bc..b833577 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers.c
@@ -442,8 +442,7 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L)
     lua_createtable(L, 0, count);
 
     if (!raw) {
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              headers_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -505,6 +504,7 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     ngx_table_elt_t    *header;
     ngx_http_request_t *r;
     ngx_http_lua_ctx_t *ctx;
+    ngx_int_t           rc;
     u_char             *lowcase_key = NULL;
     size_t              lowcase_key_sz = 0;
     ngx_uint_t          i;
@@ -543,6 +543,17 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
         return luaL_error(L, "no ctx found");
     }
 
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            return luaL_error(L,
+                              "failed to set default content type: %d",
+                              (int) rc);
+        }
+
+        ctx->headers_set = 1;
+    }
+
     ngx_http_lua_check_fake_request(L, r);
 
     part = &r->headers_out.headers.part;
@@ -555,8 +566,7 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     lua_createtable(L, 0, count + 2);
 
     if (!raw) {
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              headers_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -684,6 +694,7 @@ ngx_http_lua_ngx_header_get(lua_State *L)
     size_t                       len;
     ngx_http_lua_loc_conf_t     *llcf;
     ngx_http_lua_ctx_t          *ctx;
+    ngx_int_t                    rc;
 
     r = ngx_http_lua_get_req(L);
     if (r == NULL) {
@@ -726,7 +737,18 @@ ngx_http_lua_ngx_header_get(lua_State *L)
 
     key.len = len;
 
-    return ngx_http_lua_get_output_header(L, r, ctx, &key);
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            return luaL_error(L,
+                              "failed to set default content type: %d",
+                              (int) rc);
+        }
+
+        ctx->headers_set = 1;
+    }
+
+    return ngx_http_lua_get_output_header(L, r, &key);
 }
 
 
@@ -789,7 +811,16 @@ ngx_http_lua_ngx_header_set(lua_State *L)
         }
     }
 
-    ctx->headers_set = 1;
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            return luaL_error(L,
+                              "failed to set default content type: %d",
+                              (int) rc);
+        }
+
+        ctx->headers_set = 1;
+    }
 
     if (lua_type(L, 3) == LUA_TNIL) {
         ngx_str_null(&value);
@@ -814,7 +845,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
+                rc = ngx_http_lua_set_output_header(r, key, value,
                                                     i == 1 /* override */);
 
                 if (rc == NGX_ERROR) {
@@ -841,7 +872,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, ctx, key, value, 1 /* override */);
+    rc = ngx_http_lua_set_output_header(r, key, value, 1 /* override */);
 
     if (rc == NGX_ERROR) {
         return luaL_error(L, "failed to set header %s (error: %d)",
@@ -1050,8 +1081,7 @@ ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L)
         "local new_key = string.gsub(string.lower(key), '_', '-')\n"
         "if new_key ~= key then return tb[new_key] else return nil end";
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          headers_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
 
     /* metatable for ngx.req.get_headers(_, true) and
      * ngx.resp.get_headers(_, true) */
@@ -1211,7 +1241,15 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
         }
     }
 
-    ctx->headers_set = 1;
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            *errmsg = "failed to set default content type";
+            return NGX_ERROR;
+        }
+
+        ctx->headers_set = 1;
+    }
 
     if (is_nil) {
         value.data = NULL;
@@ -1238,7 +1276,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
+                rc = ngx_http_lua_set_output_header(r, key, value,
                                                     override && i == 0);
 
                 if (rc == NGX_ERROR) {
@@ -1264,7 +1302,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, ctx, key, value, override);
+    rc = ngx_http_lua_set_output_header(r, key, value, override);
 
     if (rc == NGX_ERROR) {
         *errmsg = "failed to set header";
@@ -1332,8 +1370,7 @@ ngx_http_lua_ffi_req_header_set_single_value(ngx_http_request_t *r,
 int
 ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
     const u_char *key, size_t key_len,
-    u_char *key_buf, ngx_http_lua_ffi_str_t *values, int max_nvalues,
-    char **errmsg)
+    u_char *key_buf, ngx_http_lua_ffi_str_t *values, int max_nvalues)
 {
     int                  found;
     u_char               c, *p;
@@ -1350,10 +1387,19 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
-        *errmsg = "no ctx found";
+        /* *errmsg = "no ctx found"; */
         return NGX_ERROR;
     }
 
+    if (!ctx->headers_set) {
+        if (ngx_http_lua_set_content_type(r) != NGX_OK) {
+            /* *errmsg = "failed to set default content type"; */
+            return NGX_ERROR;
+        }
+
+        ctx->headers_set = 1;
+    }
+
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->transform_underscores_in_resp_headers
         && memchr(key, '_', key_len) != NULL)
@@ -1379,7 +1425,6 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
         {
             p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
             if (p == NULL) {
-                *errmsg = "no memory";
                 return NGX_ERROR;
             }
 
@@ -1393,8 +1438,8 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
         break;
 
     case 12:
-        if (ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0
-            && r->headers_out.content_type.len)
+        if (r->headers_out.content_type.len
+            && ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0)
         {
             values[0].data = r->headers_out.content_type.data;
             values[0].len = r->headers_out.content_type.len;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
index c52cd13..4852b2f 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
@@ -432,14 +432,10 @@ 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)
 {
-    ngx_str_t                    host;
-    ngx_http_lua_main_conf_t    *lmcf;
-    ngx_http_variable_value_t   *var;
+    ngx_str_t host;
 
     dd("server new value len: %d", (int) value->len);
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
     if (value->len) {
         host= *value;
 
@@ -453,10 +449,6 @@ ngx_http_set_host_header(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
         r->headers_in.server = *value;
     }
 
-    var = &r->variables[lmcf->host_var_index];
-    var->valid = 0;
-    var->not_found = 0;
-
     return ngx_http_set_builtin_header(r, hv, value);
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
index cf94bd0..b908eae 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
@@ -106,12 +106,6 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
                  offsetof(ngx_http_headers_out_t, cache_control),
                  ngx_http_set_builtin_multi_header },
 
-#if defined(nginx_version) && nginx_version >= 1013009
-    { ngx_string("Link"),
-                 offsetof(ngx_http_headers_out_t, link),
-                 ngx_http_set_builtin_multi_header },
-#endif
-
     { ngx_null_string, 0, ngx_http_set_header }
 };
 
@@ -482,8 +476,8 @@ ngx_http_clear_builtin_header(ngx_http_request_t *r,
 
 
 ngx_int_t
-ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
-    ngx_str_t key, ngx_str_t value, unsigned override)
+ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
+    ngx_str_t value, unsigned override)
 {
     ngx_http_lua_header_val_t         hv;
     ngx_http_lua_set_header_t        *handlers = ngx_http_lua_set_handlers;
@@ -514,10 +508,6 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
         hv.offset = handlers[i].offset;
         hv.handler = handlers[i].handler;
 
-        if (hv.handler == ngx_http_set_content_type_header) {
-            ctx->mime_set = 1;
-        }
-
         break;
     }
 
@@ -538,7 +528,7 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
 
 int
 ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, ngx_str_t *key)
+    ngx_str_t *key)
 {
     ngx_table_elt_t            *h;
     ngx_list_part_t            *part;
@@ -560,8 +550,8 @@ ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
         break;
 
     case 12:
-        if (ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0
-            && r->headers_out.content_type.len)
+        if (r->headers_out.content_type.len
+            && ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0)
         {
             lua_pushlstring(L, (char *) r->headers_out.content_type.data,
                             r->headers_out.content_type.len);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
index 6ec1fe3..ef5e6d4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
@@ -12,10 +12,10 @@
 #include "ngx_http_lua_common.h"
 
 
-ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, ngx_str_t key, ngx_str_t value, unsigned override);
+ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
+    ngx_str_t value, unsigned override);
 int ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, ngx_str_t *key);
+    ngx_str_t *key);
 
 
 #endif /* _NGX_HTTP_LUA_HEADERS_OUT_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
index 76acdc3..4a722a0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
@@ -12,7 +12,6 @@
 
 #include "ngx_http_lua_initworkerby.h"
 #include "ngx_http_lua_util.h"
-#include "ngx_http_lua_pipe.h"
 
 
 static u_char *ngx_http_lua_log_init_worker_error(ngx_log_t *log,
@@ -26,7 +25,6 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     void                        *cur, *prev;
     ngx_uint_t                   i;
     ngx_conf_t                   conf;
-    ngx_conf_file_t              cf_file;
     ngx_cycle_t                 *fake_cycle;
     ngx_module_t               **modules;
     ngx_open_file_t             *file, *ofile;
@@ -66,21 +64,8 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
 
         return NGX_OK;
     }
-
-#ifdef HAVE_NGX_LUA_PIPE
-    if (ngx_http_lua_pipe_add_signal_handler(cycle) != NGX_OK) {
-        return NGX_ERROR;
-    }
-#endif
-
 #endif  /* NGX_WIN32 */
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-    if (lmcf->set_sa_restart) {
-        ngx_http_lua_set_sa_restart(ngx_cycle->log);
-    }
-#endif
-
     if (lmcf->init_worker_handler == NULL) {
         return NGX_OK;
     }
@@ -181,10 +166,6 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     conf.pool = fake_cycle->pool;
     conf.log = cycle->log;
 
-    ngx_memzero(&cf_file, sizeof(cf_file));
-    cf_file.file.name = cycle->conf_file;
-    conf.conf_file = &cf_file;
-
     http_ctx.loc_conf = ngx_pcalloc(conf.pool,
                                     sizeof(void *) * ngx_http_max_module);
     if (http_ctx.loc_conf == NULL) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_input_filters.c b/debian/modules/http-lua/src/ngx_http_lua_input_filters.c
deleted file mode 100644
index 87a9d8c..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_input_filters.c
+++ /dev/null
@@ -1,137 +0,0 @@
-
-/*
- * Copyright (C) by OpenResty Inc.
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t
-ngx_http_lua_read_bytes(ngx_buf_t *src, ngx_chain_t *buf_in, size_t *rest,
-    ssize_t bytes, ngx_log_t *log)
-{
-    if (bytes == 0) {
-        return NGX_ERROR;
-    }
-
-    if ((size_t) bytes >= *rest) {
-
-        buf_in->buf->last += *rest;
-        src->pos += *rest;
-        *rest = 0;
-
-        return NGX_OK;
-    }
-
-    /* bytes < *rest */
-
-    buf_in->buf->last += bytes;
-    src->pos += bytes;
-    *rest -= bytes;
-
-    return NGX_AGAIN;
-}
-
-
-ngx_int_t
-ngx_http_lua_read_all(ngx_buf_t *src, ngx_chain_t *buf_in, ssize_t bytes,
-    ngx_log_t *log)
-{
-    if (bytes == 0) {
-        return NGX_OK;
-    }
-
-    buf_in->buf->last += bytes;
-    src->pos += bytes;
-
-    return NGX_AGAIN;
-}
-
-
-ngx_int_t
-ngx_http_lua_read_any(ngx_buf_t *src, ngx_chain_t *buf_in, size_t *max,
-    ssize_t bytes, ngx_log_t *log)
-{
-    if (bytes == 0) {
-        return NGX_ERROR;
-    }
-
-    if (bytes >= (ssize_t) *max) {
-        bytes = (ssize_t) *max;
-    }
-
-    buf_in->buf->last += bytes;
-    src->pos += bytes;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_lua_read_line(ngx_buf_t *src, ngx_chain_t *buf_in, ssize_t bytes,
-    ngx_log_t *log)
-{
-    u_char                      *dst;
-    u_char                       c;
-#if (NGX_DEBUG)
-    u_char                      *begin;
-#endif
-
-#if (NGX_DEBUG)
-    begin = src->pos;
-#endif
-
-    if (bytes == 0) {
-        return NGX_ERROR;
-    }
-
-    dd("already read: %p: %.*s", buf_in,
-       (int) (buf_in->buf->last - buf_in->buf->pos), buf_in->buf->pos);
-
-    dd("data read: %.*s", (int) bytes, src->pos);
-
-    dst = buf_in->buf->last;
-
-    while (bytes--) {
-
-        c = *src->pos++;
-
-        switch (c) {
-        case '\n':
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
-                           "lua read the final line part: \"%*s\"",
-                           src->pos - 1 - begin, begin);
-
-            buf_in->buf->last = dst;
-
-            dd("read a line: %p: %.*s", buf_in,
-               (int) (buf_in->buf->last - buf_in->buf->pos), buf_in->buf->pos);
-
-            return NGX_OK;
-
-        case '\r':
-            /* ignore it */
-            break;
-
-        default:
-            *dst++ = c;
-            break;
-        }
-    }
-
-#if (NGX_DEBUG)
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "lua read partial line data: %*s", dst - begin, begin);
-#endif
-
-    buf_in->buf->last = dst;
-
-    return NGX_AGAIN;
-}
diff --git a/debian/modules/http-lua/src/ngx_http_lua_input_filters.h b/debian/modules/http-lua/src/ngx_http_lua_input_filters.h
deleted file mode 100644
index 046d40f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_input_filters.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-/*
- * Copyright (C) by OpenResty Inc.
- */
-
-
-#ifndef _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_
-#define _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_read_bytes(ngx_buf_t *src, ngx_chain_t *buf_in,
-    size_t *rest, ssize_t bytes, ngx_log_t *log);
-
-ngx_int_t ngx_http_lua_read_all(ngx_buf_t *src, ngx_chain_t *buf_in,
-    ssize_t bytes, ngx_log_t *log);
-
-ngx_int_t ngx_http_lua_read_any(ngx_buf_t *src, ngx_chain_t *buf_in,
-    size_t *max, ssize_t bytes, ngx_log_t *log);
-
-ngx_int_t ngx_http_lua_read_line(ngx_buf_t *src, ngx_chain_t *buf_in,
-    ssize_t bytes, ngx_log_t *log);
-
-
-#endif /* _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_logby.c b/debian/modules/http-lua/src/ngx_http_lua_logby.c
index 32d1cba..0f1d2f3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_logby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_logby.c
@@ -38,9 +38,9 @@ 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 */
     ngx_http_lua_set_req(L, r);
 
-#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -64,7 +64,6 @@ ngx_http_lua_log_by_lua_env(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif /* OPENRESTY_LUAJIT */
 }
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_misc.c b/debian/modules/http-lua/src/ngx_http_lua_misc.c
index 145ca9b..f96e2f2 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_misc.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_misc.c
@@ -286,33 +286,6 @@ ngx_http_lua_ffi_headers_sent(ngx_http_request_t *r)
 
     return r->header_sent ? 1 : 0;
 }
-
-
-int
-ngx_http_lua_ffi_get_conf_env(u_char *name, u_char **env_buf, size_t *name_len)
-{
-    ngx_uint_t            i;
-    ngx_str_t            *var;
-    ngx_core_conf_t      *ccf;
-
-    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                           ngx_core_module);
-
-    var = ccf->env.elts;
-
-    for (i = 0; i < ccf->env.nelts; i++) {
-        if (var[i].data[var[i].len] == '='
-            && ngx_strncmp(name, var[i].data, var[i].len) == 0)
-        {
-            *env_buf = var[i].data;
-            *name_len = var[i].len;
-
-            return NGX_OK;
-        }
-    }
-
-    return NGX_DECLINED;
-}
 #endif /* NGX_LUA_NO_FFI_API */
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_module.c b/debian/modules/http-lua/src/ngx_http_lua_module.c
index 2a3f5d5..ae8bc0e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_module.c
@@ -29,7 +29,6 @@
 #include "ngx_http_lua_ssl_session_storeby.h"
 #include "ngx_http_lua_ssl_session_fetchby.h"
 #include "ngx_http_lua_headers.h"
-#include "ngx_http_lua_pipe.h"
 
 
 static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
@@ -77,13 +76,6 @@ static ngx_conf_bitmask_t  ngx_http_lua_ssl_protocols[] = {
 
 static ngx_command_t ngx_http_lua_cmds[] = {
 
-    { ngx_string("lua_load_resty_core"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, load_resty_core),
-      NULL },
-
     { ngx_string("lua_max_running_timers"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -112,13 +104,6 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       NULL },
 
-    { ngx_string("lua_sa_restart"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, set_sa_restart),
-      NULL },
-
 #if (NGX_PCRE)
     { ngx_string("lua_regex_cache_max_entries"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -653,19 +638,9 @@ ngx_http_lua_init(ngx_conf_t *cf)
 #if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
     ngx_pool_cleanup_t         *cln;
 #endif
-    ngx_str_t                   name = ngx_string("host");
-
-    if (ngx_process == NGX_PROCESS_SIGNALLER || ngx_test_config) {
-        return NGX_OK;
-    }
 
     lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
 
-    lmcf->host_var_index = ngx_http_get_variable_index(cf, &name);
-    if (lmcf->host_var_index == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
     if (ngx_http_lua_prev_cycle != ngx_cycle) {
         ngx_http_lua_prev_cycle = ngx_cycle;
         multi_http_blocks = 0;
@@ -750,11 +725,6 @@ ngx_http_lua_init(ngx_conf_t *cf)
 
     cln->data = lmcf;
     cln->handler = ngx_http_lua_sema_mm_cleanup;
-
-#ifdef HAVE_NGX_LUA_PIPE
-    ngx_http_lua_pipe_init();
-#endif
-
 #endif
 
 #if nginx_version >= 1011011
@@ -770,19 +740,6 @@ ngx_http_lua_init(ngx_conf_t *cf)
     if (lmcf->lua == NULL) {
         dd("initializing lua vm");
 
-#ifndef OPENRESTY_LUAJIT
-        if (ngx_process != NGX_PROCESS_SIGNALLER && !ngx_test_config) {
-            ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
-                          "detected a LuaJIT version which is not OpenResty's"
-                          "; many optimizations will be disabled and "
-                          "performance will be compromised (see "
-                          "https://github.com/openresty/luajit2 for "
-                          "OpenResty's LuaJIT or, even better, consider using "
-                          "the OpenResty releases from https://openresty.org/"
-                          "en/download.html)");
-        }
-#endif
-
         ngx_http_lua_content_length_hash =
                                   ngx_http_lua_hash_literal("content-length");
         ngx_http_lua_location_hash = ngx_http_lua_hash_literal("location");
@@ -884,7 +841,6 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
      */
 
     lmcf->pool = cf->pool;
-    lmcf->load_resty_core = NGX_CONF_UNSET;
     lmcf->max_pending_timers = NGX_CONF_UNSET;
     lmcf->max_running_timers = NGX_CONF_UNSET;
 #if (NGX_PCRE)
@@ -894,8 +850,6 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
     lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
     lmcf->postponed_to_access_phase_end = NGX_CONF_UNSET;
 
-    lmcf->set_sa_restart = NGX_CONF_UNSET;
-
 #if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
     lmcf->malloc_trim_cycle = NGX_CONF_UNSET_UINT;
 #endif
@@ -918,10 +872,6 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
 {
     ngx_http_lua_main_conf_t *lmcf = conf;
 
-    if (lmcf->load_resty_core == NGX_CONF_UNSET) {
-        lmcf->load_resty_core = 1;
-    }
-
 #if (NGX_PCRE)
     if (lmcf->regex_cache_max_entries == NGX_CONF_UNSET) {
         lmcf->regex_cache_max_entries = 1024;
@@ -940,12 +890,6 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
         lmcf->max_running_timers = 256;
     }
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-    if (lmcf->set_sa_restart == NGX_CONF_UNSET) {
-        lmcf->set_sa_restart = 1;
-    }
-#endif
-
 #if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
     if (lmcf->malloc_trim_cycle == NGX_CONF_UNSET_UINT) {
         lmcf->malloc_trim_cycle = 1000;  /* number of reqs */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ndk.c b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
index 6344183..24b80b4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ndk.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
@@ -186,47 +186,6 @@ ngx_http_lua_inject_ndk_api(lua_State *L)
 }
 
 
-int
-ngx_http_lua_ffi_ndk_lookup_directive(const u_char *var_data,
-    size_t var_len, ndk_set_var_value_pt *func)
-{
-    *func = ngx_http_lookup_ndk_set_var_directive((u_char *) var_data, var_len);
-
-    if (*func == NULL) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_ndk_set_var_get(ngx_http_request_t *r,
-    ndk_set_var_value_pt func, const u_char *arg_data, size_t arg_len,
-    ngx_http_lua_ffi_str_t *value)
-{
-    ngx_int_t                            rc;
-    ngx_str_t                            res;
-    ngx_http_variable_value_t            arg;
-
-    ngx_memzero(&arg, sizeof(ngx_http_variable_value_t));
-    arg.valid = 1;
-
-    arg.data = (u_char *) arg_data;
-    arg.len = arg_len;
-
-    rc = func(r, &res, &arg);
-
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    value->data = res.data;
-    value->len = res.len;
-    return NGX_OK;
-}
-
-
 #endif /* defined(NDK) && NDK */
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pipe.c b/debian/modules/http-lua/src/ngx_http_lua_pipe.c
deleted file mode 100644
index 8c8221f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_pipe.c
+++ /dev/null
@@ -1,2475 +0,0 @@
-
-/*
- * Copyright (C) by OpenResty Inc.
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_common.h"
-#include "ngx_http_lua_input_filters.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_pipe.h"
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-#include <sys/signalfd.h>
-#endif
-
-
-#ifdef HAVE_NGX_LUA_PIPE
-static ngx_rbtree_node_t *ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key);
-#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
-static void ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
-    void *ucontext);
-#endif
-static void ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev);
-static ssize_t ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf,
-    size_t size);
-static ssize_t ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf,
-    size_t size);
-static ngx_int_t ngx_http_lua_pipe_close_helper(
-    ngx_http_lua_pipe_ctx_t *pipe_ctx, ngx_event_t *ev, int forced);
-static ngx_int_t ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe,
-    int forced);
-static ngx_int_t ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe,
-    int forced);
-static ngx_int_t ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe,
-    int forced);
-static void ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc,
-    int forced);
-static ngx_int_t ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size);
-static void ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx,
-    u_char *errbuf, size_t *errbuf_size);
-static void ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size);
-static ngx_int_t ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx);
-static ngx_int_t ngx_http_lua_pipe_read_all(void *data, ssize_t bytes);
-static ngx_int_t ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes);
-static ngx_int_t ngx_http_lua_pipe_read_line(void *data, ssize_t bytes);
-static ngx_int_t ngx_http_lua_pipe_read_any(void *data, ssize_t bytes);
-static ngx_int_t ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx);
-static ngx_int_t ngx_http_lua_pipe_init_ctx(
-    ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd, ngx_pool_t *pool,
-    u_char *errbuf, size_t *errbuf_size);
-static ngx_int_t ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx);
-static int ngx_http_lua_pipe_read_stdout_retval(
-    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
-static int ngx_http_lua_pipe_read_stderr_retval(
-    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
-static int ngx_http_lua_pipe_read_retval_helper(
-    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L, int from_stderr);
-static int ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L);
-static int ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L);
-static void ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
-    ngx_http_lua_co_ctx_t *wait_co_ctx);
-static void ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev);
-static void ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev);
-static void ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev);
-static void ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev);
-static ngx_int_t ngx_http_lua_pipe_resume(ngx_http_request_t *r);
-static void ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev);
-static void ngx_http_lua_pipe_clear_event(ngx_event_t *ev);
-static void ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data);
-static void ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data);
-static void ngx_http_lua_pipe_proc_write_cleanup(void *data);
-static void ngx_http_lua_pipe_proc_wait_cleanup(void *data);
-
-
-static ngx_rbtree_t       ngx_http_lua_pipe_rbtree;
-static ngx_rbtree_node_t  ngx_http_lua_pipe_proc_sentinel;
-
-
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-static int                                ngx_http_lua_signalfd;
-static struct signalfd_siginfo            ngx_http_lua_pipe_notification;
-
-#define ngx_http_lua_read_sigfd           ngx_http_lua_signalfd
-
-#else
-static int                                ngx_http_lua_sigchldfd[2];
-static u_char                             ngx_http_lua_pipe_notification[1];
-
-#define ngx_http_lua_read_sigfd           ngx_http_lua_sigchldfd[0]
-#define ngx_http_lua_write_sigfd          ngx_http_lua_sigchldfd[1]
-#endif
-
-
-static ngx_connection_t                  *ngx_http_lua_sigfd_conn = NULL;
-
-
-/* The below signals are ignored by Nginx.
- * We need to reset them for the spawned child processes. */
-ngx_http_lua_pipe_signal_t ngx_signals[] = {
-    { SIGSYS, "SIGSYS" },
-    { SIGPIPE, "SIGPIPE" },
-    { 0, NULL }
-};
-
-
-enum {
-    PIPE_ERR_CLOSED = 1,
-    PIPE_ERR_SYSCALL,
-    PIPE_ERR_NOMEM,
-    PIPE_ERR_TIMEOUT,
-    PIPE_ERR_ADD_READ_EV,
-    PIPE_ERR_ADD_WRITE_EV
-};
-
-
-enum {
-    PIPE_READ_ALL = 0,
-    PIPE_READ_BYTES,
-    PIPE_READ_LINE,
-    PIPE_READ_ANY
-};
-
-
-#define REASON_EXIT         "exit"
-#define REASON_SIGNAL       "signal"
-#define REASON_UNKNOWN      "unknown"
-
-#define REASON_RUNNING_CODE  0
-#define REASON_EXIT_CODE     1
-#define REASON_SIGNAL_CODE   2
-#define REASON_UNKNOWN_CODE  3
-
-
-void
-ngx_http_lua_pipe_init(void)
-{
-    ngx_rbtree_init(&ngx_http_lua_pipe_rbtree,
-                    &ngx_http_lua_pipe_proc_sentinel, ngx_rbtree_insert_value);
-}
-
-
-ngx_int_t
-ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle)
-{
-    ngx_event_t         *rev;
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-    sigset_t             set;
-
-#else
-    int                  rc;
-    struct sigaction     sa;
-#endif
-
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-    if (sigemptyset(&set) != 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe init signal set failed");
-        return NGX_ERROR;
-    }
-
-    if (sigaddset(&set, SIGCHLD) != 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe add SIGCHLD to signal set failed");
-        return NGX_ERROR;
-    }
-
-    if (sigprocmask(SIG_BLOCK, &set, NULL) != 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe block SIGCHLD failed");
-        return NGX_ERROR;
-    }
-
-    ngx_http_lua_signalfd = signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);
-    if (ngx_http_lua_signalfd < 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe create signalfd instance failed");
-        return NGX_ERROR;
-    }
-
-#else /* !(NGX_HTTP_LUA_HAVE_SIGNALFD) */
-#   if (NGX_HTTP_LUA_HAVE_PIPE2)
-    rc = pipe2(ngx_http_lua_sigchldfd, O_NONBLOCK|O_CLOEXEC);
-#   else
-    rc = pipe(ngx_http_lua_sigchldfd);
-#   endif
-
-    if (rc == -1) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe init SIGCHLD fd failed");
-        return NGX_ERROR;
-    }
-
-#   if !(NGX_HTTP_LUA_HAVE_PIPE2)
-    if (ngx_nonblocking(ngx_http_lua_read_sigfd) == -1) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
-                      ngx_nonblocking_n " SIGCHLD read fd failed");
-        goto failed;
-    }
-
-    if (ngx_nonblocking(ngx_http_lua_write_sigfd) == -1) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
-                      ngx_nonblocking_n " SIGCHLD write fd failed");
-        goto failed;
-    }
-
-    /* it's ok not to set the pipe fd with O_CLOEXEC. This requires
-     * extra syscall */
-#   endif /* !(NGX_HTTP_LUA_HAVE_PIPE2) */
-#endif /* NGX_HTTP_LUA_HAVE_SIGNALFD */
-
-    ngx_http_lua_sigfd_conn = ngx_get_connection(ngx_http_lua_read_sigfd,
-                                                 cycle->log);
-    if (ngx_http_lua_sigfd_conn == NULL) {
-        goto failed;
-    }
-
-    ngx_http_lua_sigfd_conn->log = cycle->log;
-    ngx_http_lua_sigfd_conn->recv = ngx_http_lua_pipe_fd_read;
-    rev = ngx_http_lua_sigfd_conn->read;
-    rev->log = ngx_http_lua_sigfd_conn->log;
-    rev->handler = ngx_http_lua_pipe_sigchld_event_handler;
-
-#ifdef HAVE_SOCKET_CLOEXEC_PATCH
-    rev->skip_socket_leak_check = 1;
-#endif
-
-    if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
-        goto failed;
-    }
-
-#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
-    ngx_memzero(&sa, sizeof(struct sigaction));
-    sa.sa_sigaction = ngx_http_lua_pipe_sigchld_handler;
-    sa.sa_flags = SA_SIGINFO;
-
-    if (sigemptyset(&sa.sa_mask) != 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe init signal mask failed");
-        goto failed;
-    }
-
-    if (sigaction(SIGCHLD, &sa, NULL) == -1) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe sigaction(SIGCHLD) failed");
-        goto failed;
-    }
-#endif
-
-    return NGX_OK;
-
-failed:
-
-    if (ngx_http_lua_sigfd_conn != NULL) {
-        ngx_close_connection(ngx_http_lua_sigfd_conn);
-        ngx_http_lua_sigfd_conn = NULL;
-    }
-
-    if (close(ngx_http_lua_read_sigfd) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
-                      "lua pipe close the read sigfd failed");
-    }
-
-#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
-    if (close(ngx_http_lua_write_sigfd) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
-                      "lua pipe close the write sigfd failed");
-    }
-#endif
-
-    return NGX_ERROR;
-}
-
-
-static ngx_rbtree_node_t *
-ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key)
-{
-    ngx_rbtree_node_t    *node, *sentinel;
-
-    node = ngx_http_lua_pipe_rbtree.root;
-    sentinel = ngx_http_lua_pipe_rbtree.sentinel;
-
-    while (node != sentinel) {
-        if (key < node->key) {
-            node = node->left;
-            continue;
-        }
-
-        if (key > node->key) {
-            node = node->right;
-            continue;
-        }
-
-        return node;
-    }
-
-    return NULL;
-}
-
-
-#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
-static void
-ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
-    void *ucontext)
-{
-    ngx_err_t                        err, saved_err;
-    ngx_int_t                        n;
-
-    saved_err = ngx_errno;
-
-    for ( ;; ) {
-        n = write(ngx_http_lua_write_sigfd, ngx_http_lua_pipe_notification,
-                  sizeof(ngx_http_lua_pipe_notification));
-
-        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
-                       "lua pipe SIGCHLD fd write siginfo:%p", siginfo);
-
-        if (n >= 0) {
-            break;
-        }
-
-        err = ngx_errno;
-
-        if (err != NGX_EINTR) {
-            if (err != NGX_EAGAIN) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, err,
-                              "lua pipe SIGCHLD fd write failed");
-            }
-
-            break;
-        }
-
-        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, err,
-                       "lua pipe SIGCHLD fd write was interrupted");
-    }
-
-    ngx_set_errno(saved_err);
-}
-#endif
-
-
-static void
-ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev)
-{
-    int                              n;
-    int                              status;
-    ngx_pid_t                        pid;
-    ngx_connection_t                *c = ev->data;
-    ngx_rbtree_node_t               *node;
-    ngx_http_lua_pipe_node_t        *pipe_node;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
-                   "lua pipe reaping children");
-
-    for ( ;; ) {
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-        n = c->recv(c, (u_char *) &ngx_http_lua_pipe_notification,
-#else
-        n = c->recv(c, ngx_http_lua_pipe_notification,
-#endif
-                    sizeof(ngx_http_lua_pipe_notification));
-
-        if (n <= 0) {
-            if (n == NGX_ERROR) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe SIGCHLD fd read failed");
-            }
-
-            break;
-        }
-
-        for ( ;; ) {
-            pid = waitpid(-1, &status, WNOHANG);
-
-            if (pid == 0) {
-                break;
-            }
-
-            if (pid < 0) {
-                if (ngx_errno != NGX_ECHILD) {
-                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                                  "lua pipe waitpid failed");
-                }
-
-                break;
-            }
-
-            /* This log is ported from Nginx's signal handler since we override
-             * or block it in this implementation. */
-            ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
-                          "signal %d (SIGCHLD) received from %P",
-                          SIGCHLD, pid);
-
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "lua pipe SIGCHLD fd read pid:%P status:%d", pid,
-                           status);
-
-            node = ngx_http_lua_pipe_lookup_pid(pid);
-            if (node != NULL) {
-                pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-                if (pipe_node->wait_co_ctx != NULL) {
-                    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                                   "lua pipe resume process:%p waiting for %P",
-                                   pipe_node->proc, pid);
-
-                    /*
-                     * We need the extra parentheses around the first argument
-                     * of ngx_post_event() just to work around macro issues in
-                     * nginx cores older than 1.7.12 (exclusive).
-                     */
-                    ngx_post_event((&pipe_node->wait_co_ctx->sleep),
-                                   &ngx_posted_events);
-                }
-
-                pipe_node->proc->pipe->dead = 1;
-
-                if (WIFSIGNALED(status)) {
-                    pipe_node->status = WTERMSIG(status);
-                    pipe_node->reason_code = REASON_SIGNAL_CODE;
-
-                } else if (WIFEXITED(status)) {
-                    pipe_node->status = WEXITSTATUS(status);
-                    pipe_node->reason_code = REASON_EXIT_CODE;
-
-                } else {
-                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                                  "lua pipe unknown exit status %d from "
-                                  "process %P", status, pid);
-                    pipe_node->status = status;
-                    pipe_node->reason_code = REASON_UNKNOWN_CODE;
-                }
-            }
-        }
-    }
-}
-
-
-static ssize_t
-ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf, size_t size)
-{
-    ssize_t       n;
-    ngx_err_t     err;
-    ngx_event_t  *rev;
-
-    rev = c->read;
-
-    do {
-        n = read(c->fd, buf, size);
-
-        err = ngx_errno;
-
-        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "read: fd:%d %z of %uz", c->fd, n, size);
-
-        if (n == 0) {
-            rev->ready = 0;
-            rev->eof = 1;
-            return 0;
-        }
-
-        if (n > 0) {
-            if ((size_t) n < size
-                && !(ngx_event_flags & NGX_USE_GREEDY_EVENT))
-            {
-                rev->ready = 0;
-            }
-
-            return n;
-        }
-
-        if (err == NGX_EAGAIN || err == NGX_EINTR) {
-            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
-                           "read() not ready");
-            n = NGX_AGAIN;
-
-        } else {
-            n = ngx_connection_error(c, err, "read() failed");
-            break;
-        }
-
-    } while (err == NGX_EINTR);
-
-    rev->ready = 0;
-
-    if (n == NGX_ERROR) {
-        rev->error = 1;
-    }
-
-    return n;
-}
-
-
-static ssize_t
-ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf, size_t size)
-{
-    ssize_t       n;
-    ngx_err_t     err;
-    ngx_event_t  *wev;
-
-    wev = c->write;
-
-    do {
-        n = write(c->fd, buf, size);
-
-        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "write: fd:%d %z of %uz", c->fd, n, size);
-
-        if (n >= 0) {
-            if ((size_t) n != size) {
-                wev->ready = 0;
-            }
-
-            return n;
-        }
-
-        err = ngx_errno;
-
-        if (err == NGX_EAGAIN || err == NGX_EINTR) {
-            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
-                           "write() not ready");
-            n = NGX_AGAIN;
-
-        } else if (err != NGX_EPIPE) {
-            n = ngx_connection_error(c, err, "write() failed");
-            break;
-        }
-
-    } while (err == NGX_EINTR);
-
-    wev->ready = 0;
-
-    if (n == NGX_ERROR) {
-        wev->error = 1;
-    }
-
-    return n;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_spawn(ngx_http_lua_ffi_pipe_proc_t *proc,
-    const char *file, const char **argv, int merge_stderr, size_t buffer_size,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    int                             rc;
-    int                             in[2];
-    int                             out[2];
-    int                             err[2];
-    int                             stdin_fd, stdout_fd, stderr_fd;
-    int                             errlog_fd, temp_errlog_fd;
-    ngx_pid_t                       pid;
-    ssize_t                         pool_size;
-    ngx_pool_t                     *pool;
-    ngx_uint_t                      i;
-    ngx_listening_t                *ls;
-    ngx_http_lua_pipe_t            *pp;
-    ngx_rbtree_node_t              *node;
-    ngx_http_lua_pipe_node_t       *pipe_node;
-    struct sigaction                sa;
-    ngx_http_lua_pipe_signal_t     *sig;
-    sigset_t                        set;
-
-    pool_size = ngx_align(NGX_MIN_POOL_SIZE + buffer_size * 2,
-                          NGX_POOL_ALIGNMENT);
-
-    pool = ngx_create_pool(pool_size, ngx_cycle->log);
-    if (pool == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    pp = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_t)
-                     + offsetof(ngx_rbtree_node_t, color)
-                     + sizeof(ngx_http_lua_pipe_node_t));
-    if (pp == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
-                       - errbuf;
-        goto free_pool;
-    }
-
-    rc = pipe(in);
-    if (rc == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto free_pool;
-    }
-
-    rc = pipe(out);
-    if (rc == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto close_in_fd;
-    }
-
-    if (!merge_stderr) {
-        rc = pipe(err);
-        if (rc == -1) {
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                        "pipe failed: %s", strerror(errno))
-                           - errbuf;
-            goto close_in_out_fd;
-        }
-    }
-
-    pid = fork();
-    if (pid == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "fork failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto close_in_out_err_fd;
-    }
-
-    if (pid == 0) {
-
-#if (NGX_HAVE_CPU_AFFINITY)
-        /* reset the CPU affinity mask */
-        ngx_uint_t     log_level;
-        ngx_cpuset_t   child_cpu_affinity;
-
-        if (ngx_process == NGX_PROCESS_WORKER
-            && ngx_get_cpu_affinity(ngx_worker) != NULL)
-        {
-            CPU_ZERO(&child_cpu_affinity);
-
-            for (i = 0; i < (ngx_uint_t) ngx_min(ngx_ncpu, CPU_SETSIZE); i++) {
-                CPU_SET(i, &child_cpu_affinity);
-            }
-
-            log_level = ngx_cycle->log->log_level;
-            ngx_cycle->log->log_level = NGX_LOG_WARN;
-            ngx_setaffinity(&child_cpu_affinity, ngx_cycle->log);
-            ngx_cycle->log->log_level = log_level;
-        }
-#endif
-
-        /* reset the handler of ignored signals to the default */
-        for (sig = ngx_signals; sig->signo != 0; sig++) {
-            ngx_memzero(&sa, sizeof(struct sigaction));
-            sa.sa_handler = SIG_DFL;
-
-            if (sigemptyset(&sa.sa_mask) != 0) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child init signal mask failed");
-                exit(EXIT_FAILURE);
-            }
-
-            if (sigaction(sig->signo, &sa, NULL) == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child reset signal handler for %s "
-                              "failed", sig->signame);
-                exit(EXIT_FAILURE);
-            }
-        }
-
-        /* reset signal mask */
-        if (sigemptyset(&set) != 0) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child init signal set failed");
-            exit(EXIT_FAILURE);
-        }
-
-        if (sigprocmask(SIG_SETMASK, &set, NULL) != 0) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child reset signal mask failed");
-            exit(EXIT_FAILURE);
-        }
-
-        /* close listening socket fd */
-        ls = ngx_cycle->listening.elts;
-        for (i = 0; i < ngx_cycle->listening.nelts; i++) {
-            if (ngx_close_socket(ls[i].fd) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_socket_errno,
-                              "lua pipe child " ngx_close_socket_n
-                              " %V failed", &ls[i].addr_text);
-            }
-        }
-
-        /* close and dup pipefd */
-        if (close(in[1]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "lua pipe child failed to close the in[1] "
-                          "pipe fd");
-        }
-
-        if (close(out[0]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "lua pipe child failed to close the out[0] "
-                          "pipe fd");
-        }
-
-        if (ngx_cycle->log->file && ngx_cycle->log->file->fd == STDERR_FILENO) {
-            errlog_fd = ngx_cycle->log->file->fd;
-            temp_errlog_fd = dup(errlog_fd);
-
-            if (temp_errlog_fd == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child dup errlog fd failed");
-                exit(EXIT_FAILURE);
-            }
-
-            if (ngx_cloexec(temp_errlog_fd) == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child new errlog fd " ngx_cloexec_n
-                              " failed");
-            }
-
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "lua pipe child dup old errlog fd %d to new fd %d",
-                           ngx_cycle->log->file->fd, temp_errlog_fd);
-
-            ngx_cycle->log->file->fd = temp_errlog_fd;
-        }
-
-        if (dup2(in[0], STDIN_FILENO) == -1) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child dup2 stdin failed");
-            exit(EXIT_FAILURE);
-        }
-
-        if (dup2(out[1], STDOUT_FILENO) == -1) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child dup2 stdout failed");
-            exit(EXIT_FAILURE);
-        }
-
-        if (merge_stderr) {
-            if (dup2(STDOUT_FILENO, STDERR_FILENO) == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child dup2 stderr failed");
-                exit(EXIT_FAILURE);
-            }
-
-        } else {
-            if (close(err[0]) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                              "lua pipe child failed to close the err[0] "
-                              "pipe fd");
-            }
-
-            if (dup2(err[1], STDERR_FILENO) == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child dup2 stderr failed");
-                exit(EXIT_FAILURE);
-            }
-        }
-
-        if (execvp(file, (char * const *) argv) == -1) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child execvp() failed while executing %s",
-                          file);
-        }
-
-        exit(EXIT_FAILURE);
-    }
-
-    /* parent process */
-    if (close(in[0]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "lua pipe: failed to close the in[0] pipe fd");
-    }
-
-    stdin_fd = in[1];
-
-    if (ngx_nonblocking(stdin_fd) == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    ngx_nonblocking_n " failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto close_in_out_err_fd;
-    }
-
-    pp->stdin_fd = stdin_fd;
-
-    if (close(out[1]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "lua pipe: failed to close the out[1] pipe fd");
-    }
-
-    stdout_fd = out[0];
-
-    if (ngx_nonblocking(stdout_fd) == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    ngx_nonblocking_n " failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto close_in_out_err_fd;
-    }
-
-    pp->stdout_fd = stdout_fd;
-
-    if (!merge_stderr) {
-        if (close(err[1]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "lua pipe: failed to close the err[1] pipe fd");
-        }
-
-        stderr_fd = err[0];
-
-        if (ngx_nonblocking(stderr_fd) == -1) {
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                        ngx_nonblocking_n " failed: %s",
-                                        strerror(errno))
-                           - errbuf;
-            goto close_in_out_err_fd;
-        }
-
-        pp->stderr_fd = stderr_fd;
-    }
-
-    node = (ngx_rbtree_node_t *) (pp + 1);
-    node->key = pid;
-    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-    pipe_node->proc = proc;
-    ngx_rbtree_insert(&ngx_http_lua_pipe_rbtree, node);
-
-    pp->node = node;
-    pp->pool = pool;
-    pp->merge_stderr = merge_stderr;
-    pp->buffer_size = buffer_size;
-
-    proc->_pid = pid;
-    proc->write_timeout = 10000;
-    proc->stdout_read_timeout = 10000;
-    proc->stderr_read_timeout = 10000;
-    proc->wait_timeout = 10000;
-    proc->pipe = pp;
-
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe spawn process:%p pid:%P merge_stderr:%d "
-                   "buffer_size:%uz", proc, pid, merge_stderr, buffer_size);
-    return NGX_OK;
-
-close_in_out_err_fd:
-
-    if (!merge_stderr) {
-        if (close(err[0]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "failed to close the err[0] pipe fd");
-        }
-
-        if (close(err[1]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "failed to close the err[1] pipe fd");
-        }
-    }
-
-close_in_out_fd:
-
-    if (close(out[0]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "failed to close the out[0] pipe fd");
-    }
-
-    if (close(out[1]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "failed to close the out[1] pipe fd");
-    }
-
-close_in_fd:
-
-    if (close(in[0]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "failed to close the in[0] pipe fd");
-    }
-
-    if (close(in[1]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "failed to close the in[1] pipe fd");
-    }
-
-free_pool:
-
-    ngx_destroy_pool(pool);
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_close_helper(ngx_http_lua_pipe_ctx_t *pipe_ctx,
-    ngx_event_t *ev, int forced)
-{
-    if (ev->handler != ngx_http_lua_pipe_dummy_event_handler && !forced) {
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe cannot close fd:%d without "
-                       "forced pipe:%p ev:%p", pipe_ctx->c->fd, pipe_ctx, ev);
-        return NGX_ERROR;
-    }
-
-    ngx_close_connection(pipe_ctx->c);
-    pipe_ctx->c = NULL;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe, int forced)
-{
-    ngx_event_t                     *wev;
-
-    if (pipe->stdin_ctx == NULL) {
-        if (pipe->stdin_fd != -1) {
-            if (close(pipe->stdin_fd) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                              "failed to close the stdin pipe fd");
-            }
-
-            pipe->stdin_fd = -1;
-        }
-
-    } else if (pipe->stdin_ctx->c != NULL) {
-        wev = pipe->stdin_ctx->c->write;
-        return ngx_http_lua_pipe_close_helper(pipe->stdin_ctx, wev, forced);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe, int forced)
-{
-    ngx_event_t                     *rev;
-
-    if (pipe->stdout_ctx == NULL) {
-        if (pipe->stdout_fd != -1) {
-            if (close(pipe->stdout_fd) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                              "failed to close the stdout pipe fd");
-            }
-
-            pipe->stdout_fd = -1;
-        }
-
-    } else if (pipe->stdout_ctx->c != NULL) {
-        rev = pipe->stdout_ctx->c->read;
-        return ngx_http_lua_pipe_close_helper(pipe->stdout_ctx, rev, forced);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe, int forced)
-{
-    ngx_event_t                     *rev;
-
-    if (pipe->stderr_ctx == NULL) {
-        if (pipe->stderr_fd != -1) {
-            if (close(pipe->stderr_fd) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                              "failed to close the stderr pipe fd");
-            }
-
-            pipe->stderr_fd = -1;
-        }
-
-    } else if (pipe->stderr_ctx->c != NULL) {
-        rev = pipe->stderr_ctx->c->read;
-        return ngx_http_lua_pipe_close_helper(pipe->stderr_ctx, rev, forced);
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_shutdown_stdin(ngx_http_lua_ffi_pipe_proc_t *proc,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_int_t                        rc;
-    ngx_http_lua_pipe_t             *pipe;
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_lua_pipe_close_stdin(pipe, 0);
-    if (rc != NGX_OK) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy writing")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_shutdown_stdout(ngx_http_lua_ffi_pipe_proc_t *proc,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_int_t                        rc;
-    ngx_http_lua_pipe_t             *pipe;
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_lua_pipe_close_stdout(pipe, 0);
-    if (rc != NGX_OK) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_shutdown_stderr(ngx_http_lua_ffi_pipe_proc_t *proc,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_http_lua_pipe_t             *pipe;
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (pipe->merge_stderr) {
-        /* stdout is used internally as stderr when merge_stderr is true */
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (ngx_http_lua_pipe_close_stderr(pipe, 0) != NGX_OK) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc, int forced)
-{
-    ngx_http_lua_pipe_t          *pipe;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe finalize process:%p pid:%P forced:%d", proc,
-                   proc->_pid, forced);
-    pipe = proc->pipe;
-
-    if (pipe->node) {
-        ngx_rbtree_delete(&ngx_http_lua_pipe_rbtree, pipe->node);
-        pipe->node = NULL;
-    }
-
-    pipe->dead = 1;
-
-    ngx_http_lua_pipe_close_stdin(pipe, forced);
-    ngx_http_lua_pipe_close_stdout(pipe, forced);
-
-    if (!pipe->merge_stderr) {
-        ngx_http_lua_pipe_close_stderr(pipe, forced);
-    }
-
-    pipe->closed = 1;
-}
-
-
-void
-ngx_http_lua_ffi_pipe_proc_destroy(ngx_http_lua_ffi_pipe_proc_t *proc)
-{
-    ngx_http_lua_pipe_t          *pipe;
-
-    pipe = proc->pipe;
-    if (pipe == NULL) {
-        return;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe destroy process:%p pid:%P", proc, proc->_pid);
-
-    if (!pipe->dead) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe kill process:%p pid:%P", proc, proc->_pid);
-
-        if (kill(proc->_pid, SIGKILL) == -1) {
-            if (ngx_errno != ESRCH) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe failed to kill process:%p pid:%P");
-            }
-        }
-    }
-
-    ngx_http_lua_pipe_proc_finalize(proc, 1);
-    ngx_destroy_pool(pipe->pool);
-    proc->pipe = NULL;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size)
-{
-    int                                 rc;
-
-    *ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
-    }
-
-    rc = ngx_http_lua_ffi_check_context(*ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
-                                        | NGX_HTTP_LUA_CONTEXT_ACCESS
-                                        | NGX_HTTP_LUA_CONTEXT_CONTENT
-                                        | NGX_HTTP_LUA_CONTEXT_TIMER
-                                        | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH,
-                                        errbuf, errbuf_size);
-    if (rc != NGX_OK) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char *errbuf,
-    size_t *errbuf_size)
-{
-    switch (pipe_ctx->err_type) {
-
-    case PIPE_ERR_CLOSED:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        break;
-
-    case PIPE_ERR_SYSCALL:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
-                                    strerror(pipe_ctx->pipe_errno))
-                       - errbuf;
-        break;
-
-    case PIPE_ERR_NOMEM:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
-                       - errbuf;
-        break;
-
-    case PIPE_ERR_TIMEOUT:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "timeout")
-                       - errbuf;
-        break;
-
-    case PIPE_ERR_ADD_READ_EV:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "failed to add read event")
-                       - errbuf;
-        break;
-
-    case PIPE_ERR_ADD_WRITE_EV:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "failed to add write event")
-                       - errbuf;
-        break;
-
-    default:
-        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                      "unexpected err type: %d", pipe_ctx->err_type);
-        ngx_http_lua_assert(NULL);
-    }
-}
-
-
-static void
-ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size)
-{
-    size_t                   size = 0;
-    size_t                   chunk_size;
-    size_t                   nbufs;
-    u_char                  *p;
-    ngx_buf_t               *b;
-    ngx_chain_t             *cl;
-    ngx_chain_t            **ll;
-
-    nbufs = 0;
-    ll = NULL;
-
-    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
-        b = cl->buf;
-        chunk_size = b->last - b->pos;
-
-        if (cl->next) {
-            ll = &cl->next;
-        }
-
-        size += chunk_size;
-
-        nbufs++;
-    }
-
-    if (*buf_size < size) {
-        *buf = NULL;
-        *buf_size = size;
-
-        return;
-    }
-
-    *buf_size = size;
-
-    p = *buf;
-    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
-        b = cl->buf;
-        chunk_size = b->last - b->pos;
-        p = ngx_cpymem(p, b->pos, chunk_size);
-    }
-
-    if (nbufs > 1 && ll) {
-        *ll = pipe->free_bufs;
-        pipe->free_bufs = pipe_ctx->bufs_in;
-        pipe_ctx->bufs_in = pipe_ctx->buf_in;
-    }
-
-    if (pipe_ctx->buffer.pos == pipe_ctx->buffer.last) {
-        pipe_ctx->buffer.pos = pipe_ctx->buffer.start;
-        pipe_ctx->buffer.last = pipe_ctx->buffer.start;
-    }
-
-    if (pipe_ctx->bufs_in) {
-        pipe_ctx->buf_in->buf->last = pipe_ctx->buffer.pos;
-        pipe_ctx->buf_in->buf->pos = pipe_ctx->buffer.pos;
-    }
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx)
-{
-    ngx_chain_t             *cl;
-
-    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
-                                         &pipe->free_bufs,
-                                         pipe->buffer_size);
-
-    if (cl == NULL) {
-        pipe_ctx->err_type = PIPE_ERR_NOMEM;
-        return NGX_ERROR;
-    }
-
-    pipe_ctx->buf_in->next = cl;
-    pipe_ctx->buf_in = cl;
-    pipe_ctx->buffer = *cl->buf;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read_all(void *data, ssize_t bytes)
-{
-    ngx_http_lua_pipe_ctx_t      *pipe_ctx = data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read all");
-    return ngx_http_lua_read_all(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
-                                 ngx_cycle->log);
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes)
-{
-    ngx_int_t                          rc;
-    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe read bytes %z", bytes);
-
-    rc = ngx_http_lua_read_bytes(&pipe_ctx->buffer, pipe_ctx->buf_in,
-                                 &pipe_ctx->rest, bytes, ngx_cycle->log);
-    if (rc == NGX_ERROR) {
-        pipe_ctx->err_type = PIPE_ERR_CLOSED;
-        return NGX_ERROR;
-    }
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read_line(void *data, ssize_t bytes)
-{
-    ngx_int_t                          rc;
-    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe read line");
-    rc = ngx_http_lua_read_line(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
-                                ngx_cycle->log);
-    if (rc == NGX_ERROR) {
-        pipe_ctx->err_type = PIPE_ERR_CLOSED;
-        return NGX_ERROR;
-    }
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read_any(void *data, ssize_t bytes)
-{
-    ngx_int_t                          rc;
-    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read any");
-    rc = ngx_http_lua_read_any(&pipe_ctx->buffer, pipe_ctx->buf_in,
-                               &pipe_ctx->rest, bytes, ngx_cycle->log);
-    if (rc == NGX_ERROR) {
-        pipe_ctx->err_type = PIPE_ERR_CLOSED;
-        return NGX_ERROR;
-    }
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx)
-{
-    int                                 rc;
-    int                                 read;
-    size_t                              size;
-    ssize_t                             n;
-    ngx_buf_t                          *b;
-    ngx_event_t                        *rev;
-    ngx_connection_t                   *c;
-
-    c = pipe_ctx->c;
-    rev = c->read;
-    b = &pipe_ctx->buffer;
-    read = 0;
-
-    for ( ;; ) {
-        size = b->last - b->pos;
-
-        if (size || pipe_ctx->eof) {
-            rc = pipe_ctx->input_filter(pipe_ctx->input_filter_ctx, size);
-            if (rc == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            if (rc == NGX_OK) {
-                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                               "lua pipe read done pipe:%p", pipe_ctx);
-                return NGX_OK;
-            }
-
-            /* rc == NGX_AGAIN */
-            continue;
-        }
-
-        if (read && !rev->ready) {
-            break;
-        }
-
-        size = b->end - b->last;
-
-        if (size == 0) {
-            rc = ngx_http_lua_pipe_add_input_buffer(pipe, pipe_ctx);
-            if (rc == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            b = &pipe_ctx->buffer;
-            size = (size_t) (b->end - b->last);
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe try to read data %uz pipe:%p",
-                       size, pipe_ctx);
-
-        n = c->recv(c, b->last, size);
-        read = 1;
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe read data returned %z pipe:%p", n, pipe_ctx);
-
-        if (n == NGX_AGAIN) {
-            break;
-        }
-
-        if (n == 0) {
-            pipe_ctx->eof = 1;
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "lua pipe closed pipe:%p", pipe_ctx);
-            continue;
-        }
-
-        if (n == NGX_ERROR) {
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
-                           "lua pipe read data error pipe:%p", pipe_ctx);
-
-            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
-            pipe_ctx->pipe_errno = ngx_errno;
-            return NGX_ERROR;
-        }
-
-        b->last += n;
-    }
-
-    return NGX_AGAIN;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_init_ctx(ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd,
-    ngx_pool_t *pool, u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_connection_t                   *c;
-
-    if (fd == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    *pipe_ctx_pt = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_ctx_t));
-    if (*pipe_ctx_pt == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    c = ngx_get_connection(fd, ngx_cycle->log);
-    if (c == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no connection")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    c->log = ngx_cycle->log;
-    c->recv = ngx_http_lua_pipe_fd_read;
-    c->read->handler = ngx_http_lua_pipe_dummy_event_handler;
-    c->read->log = c->log;
-
-#ifdef HAVE_SOCKET_CLOEXEC_PATCH
-    c->read->skip_socket_leak_check = 1;
-#endif
-
-    c->send = ngx_http_lua_pipe_fd_write;
-    c->write->handler = ngx_http_lua_pipe_dummy_event_handler;
-    c->write->log = c->log;
-    (*pipe_ctx_pt)->c = c;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe init pipe ctx:%p fd:*%d", *pipe_ctx_pt, fd);
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_read(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, int reader_type,
-    size_t length, u_char **buf, size_t *buf_size, u_char *errbuf,
-    size_t *errbuf_size)
-{
-    int                                 rc;
-    ngx_msec_t                          timeout;
-    ngx_event_t                        *rev;
-    ngx_connection_t                   *c;
-    ngx_http_lua_ctx_t                 *ctx;
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_co_ctx_t              *wait_co_ctx;
-    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
-
-    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe read process:%p pid:%P", proc, proc->_pid);
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (pipe->merge_stderr && from_stderr) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (from_stderr) {
-        if (pipe->stderr_ctx == NULL) {
-            if (ngx_http_lua_pipe_init_ctx(&pipe->stderr_ctx, pipe->stderr_fd,
-                                           pipe->pool, errbuf,
-                                           errbuf_size)
-                != NGX_OK)
-            {
-                return NGX_ERROR;
-            }
-
-        } else {
-            pipe->stderr_ctx->err_type = 0;
-        }
-
-        pipe_ctx = pipe->stderr_ctx;
-
-    } else {
-        if (pipe->stdout_ctx == NULL) {
-            if (ngx_http_lua_pipe_init_ctx(&pipe->stdout_ctx, pipe->stdout_fd,
-                                           pipe->pool, errbuf,
-                                           errbuf_size)
-                != NGX_OK)
-            {
-                return NGX_ERROR;
-            }
-
-        } else {
-            pipe->stdout_ctx->err_type = 0;
-        }
-
-        pipe_ctx = pipe->stdout_ctx;
-    }
-
-    c = pipe_ctx->c;
-    if (c == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    rev = c->read;
-    if (rev->handler != ngx_http_lua_pipe_dummy_event_handler) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    pipe_ctx->input_filter_ctx = pipe_ctx;
-
-    switch (reader_type) {
-
-    case PIPE_READ_ALL:
-        pipe_ctx->input_filter = ngx_http_lua_pipe_read_all;
-        break;
-
-    case PIPE_READ_BYTES:
-        pipe_ctx->input_filter = ngx_http_lua_pipe_read_bytes;
-        break;
-
-    case PIPE_READ_LINE:
-        pipe_ctx->input_filter = ngx_http_lua_pipe_read_line;
-        break;
-
-    case PIPE_READ_ANY:
-        pipe_ctx->input_filter = ngx_http_lua_pipe_read_any;
-        break;
-
-    default:
-        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                      "unexpected reader_type: %d", reader_type);
-        ngx_http_lua_assert(NULL);
-    }
-
-    pipe_ctx->rest = length;
-
-    if (pipe_ctx->bufs_in == NULL) {
-        pipe_ctx->bufs_in =
-            ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
-                                            &pipe->free_bufs,
-                                            pipe->buffer_size);
-
-        if (pipe_ctx->bufs_in == NULL) {
-            pipe_ctx->err_type = PIPE_ERR_NOMEM;
-            goto error;
-        }
-
-        pipe_ctx->buf_in = pipe_ctx->bufs_in;
-        pipe_ctx->buffer = *pipe_ctx->buf_in->buf;
-    }
-
-    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
-    if (rc == NGX_ERROR) {
-        goto error;
-    }
-
-    if (rc == NGX_OK) {
-        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
-        return NGX_OK;
-    }
-
-    /* rc == NGX_AGAIN */
-    wait_co_ctx = ctx->cur_co_ctx;
-
-    c->data = wait_co_ctx;
-    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
-        pipe_ctx->err_type = PIPE_ERR_ADD_READ_EV;
-        goto error;
-    }
-
-    wait_co_ctx->data = proc;
-
-    if (from_stderr) {
-        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
-        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stderr_cleanup;
-        timeout = proc->stderr_read_timeout;
-
-    } else {
-        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
-        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stdout_cleanup;
-        timeout = proc->stdout_read_timeout;
-    }
-
-    if (timeout > 0) {
-        ngx_add_timer(rev, timeout);
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua pipe add timer for reading: %d(ms) process:%p "
-                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
-                       rev);
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
-                   proc->_pid, pipe);
-
-    return NGX_AGAIN;
-
-error:
-
-    if (pipe_ctx->bufs_in) {
-        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
-        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-        return NGX_DECLINED;
-    }
-
-    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-
-    return NGX_ERROR;
-}
-
-
-/*
- * ngx_http_lua_ffi_pipe_get_read_result should only be called just after
- * ngx_http_lua_ffi_pipe_proc_read, so we omit most of the sanity check already
- * done in ngx_http_lua_ffi_pipe_proc_read.
- */
-int
-ngx_http_lua_ffi_pipe_get_read_result(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, u_char **buf,
-    size_t *buf_size, u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe get read result process:%p pid:%P", proc,
-                   proc->_pid);
-
-    pipe = proc->pipe;
-    pipe_ctx = from_stderr ? pipe->stderr_ctx : pipe->stdout_ctx;
-
-    if (!pipe_ctx->err_type) {
-        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
-        return NGX_OK;
-    }
-
-    if (pipe_ctx->bufs_in) {
-        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
-        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-        return NGX_DECLINED;
-    }
-
-    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx)
-{
-    size_t                       size;
-    ngx_int_t                    n;
-    ngx_buf_t                   *b;
-    ngx_connection_t            *c;
-
-    c = pipe_ctx->c;
-    b = pipe_ctx->buf_in->buf;
-
-    for ( ;; ) {
-        size = b->last - b->pos;
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe try to write data %uz pipe:%p", size,
-                       pipe_ctx);
-
-        n = c->send(c, b->pos, size);
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe write returned %i pipe:%p", n, pipe_ctx);
-
-        if (n >= 0) {
-            b->pos += n;
-
-            if (b->pos == b->last) {
-                b->pos = b->start;
-                b->last = b->start;
-
-                if (!pipe->free_bufs) {
-                    pipe->free_bufs = pipe_ctx->buf_in;
-
-                } else {
-                    pipe->free_bufs->next = pipe_ctx->buf_in;
-                }
-
-                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                               "lua pipe write done pipe:%p", pipe_ctx);
-                return NGX_OK;
-            }
-
-            continue;
-        }
-
-        /* NGX_ERROR || NGX_AGAIN */
-        break;
-    }
-
-    if (n == NGX_ERROR) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
-                       "lua pipe write data error pipe:%p", pipe_ctx);
-
-        if (ngx_errno == NGX_EPIPE) {
-            pipe_ctx->err_type = PIPE_ERR_CLOSED;
-
-        } else {
-            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
-            pipe_ctx->pipe_errno = ngx_errno;
-        }
-
-        return NGX_ERROR;
-    }
-
-    return NGX_AGAIN;
-}
-
-
-ssize_t
-ngx_http_lua_ffi_pipe_proc_write(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, const u_char *data, size_t len,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    int                                 rc;
-    ngx_buf_t                          *b;
-    ngx_msec_t                          timeout;
-    ngx_chain_t                        *cl;
-    ngx_event_t                        *wev;
-    ngx_http_lua_ctx_t                 *ctx;
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_co_ctx_t              *wait_co_ctx;
-    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
-
-    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe write process:%p pid:%P", proc, proc->_pid);
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (pipe->stdin_ctx == NULL) {
-        if (ngx_http_lua_pipe_init_ctx(&pipe->stdin_ctx, pipe->stdin_fd,
-                                       pipe->pool, errbuf,
-                                       errbuf_size)
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-    } else {
-        pipe->stdin_ctx->err_type = 0;
-    }
-
-    pipe_ctx = pipe->stdin_ctx;
-    if (pipe_ctx->c == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    wev = pipe_ctx->c->write;
-    if (wev->handler != ngx_http_lua_pipe_dummy_event_handler) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy writing")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    pipe_ctx->rest = len;
-
-    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
-                                         &pipe->free_bufs, len);
-    if (cl == NULL) {
-        pipe_ctx->err_type = PIPE_ERR_NOMEM;
-        goto error;
-    }
-
-    pipe_ctx->buf_in = cl;
-    b = pipe_ctx->buf_in->buf;
-    b->last = ngx_copy(b->last, data, len);
-
-    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
-    if (rc == NGX_ERROR) {
-        goto error;
-    }
-
-    if (rc == NGX_OK) {
-        return len;
-    }
-
-    /* rc == NGX_AGAIN */
-    wait_co_ctx = ctx->cur_co_ctx;
-    pipe_ctx->c->data = wait_co_ctx;
-
-    wev->handler = ngx_http_lua_pipe_resume_write_handler;
-    if (ngx_handle_write_event(wev, 0) != NGX_OK) {
-        pipe_ctx->err_type = PIPE_ERR_ADD_WRITE_EV;
-        goto error;
-    }
-
-    wait_co_ctx->data = proc;
-    wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_write_cleanup;
-    timeout = proc->write_timeout;
-
-    if (timeout > 0) {
-        ngx_add_timer(wev, timeout);
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua pipe add timer for writing: %d(ms) process:%p "
-                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
-                       wev);
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
-                   proc->_pid, pipe);
-
-    return NGX_AGAIN;
-
-error:
-
-    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-    return NGX_ERROR;
-}
-
-
-/*
- * ngx_http_lua_ffi_pipe_get_write_result should only be called just after
- * ngx_http_lua_ffi_pipe_proc_write, so we omit most of the sanity check
- * already done in ngx_http_lua_ffi_pipe_proc_write.
- */
-ssize_t
-ngx_http_lua_ffi_pipe_get_write_result(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe get write result process:%p pid:%P", proc,
-                   proc->_pid);
-
-    pipe = proc->pipe;
-    pipe_ctx = pipe->stdin_ctx;
-
-    if (pipe_ctx->err_type) {
-        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-        return NGX_ERROR;
-    }
-
-    return pipe_ctx->rest;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_wait(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, char **reason, int *status,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    int                                 rc;
-    ngx_rbtree_node_t                  *node;
-    ngx_http_lua_ctx_t                 *ctx;
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_co_ctx_t              *wait_co_ctx;
-    ngx_http_lua_pipe_node_t           *pipe_node;
-
-    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe wait process:%p pid:%P", proc, proc->_pid);
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
-        return NGX_ERROR;
-    }
-
-    node = pipe->node;
-    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-    if (pipe_node->wait_co_ctx) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy waiting")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (pipe_node->reason_code == REASON_RUNNING_CODE) {
-        wait_co_ctx = ctx->cur_co_ctx;
-        wait_co_ctx->data = proc;
-        ngx_memzero(&wait_co_ctx->sleep, sizeof(ngx_event_t));
-        wait_co_ctx->sleep.handler = ngx_http_lua_pipe_resume_wait_handler;
-        wait_co_ctx->sleep.data = wait_co_ctx;
-        wait_co_ctx->sleep.log = r->connection->log;
-        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_wait_cleanup;
-
-        pipe_node->wait_co_ctx = wait_co_ctx;
-
-        if (proc->wait_timeout > 0) {
-            ngx_add_timer(&wait_co_ctx->sleep, proc->wait_timeout);
-            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua pipe add timer for waiting: %d(ms) process:%p "
-                           "pid:%P ev:%p", proc->wait_timeout, proc,
-                           proc->_pid, &wait_co_ctx->sleep);
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua pipe wait yielding process:%p pid:%P", proc,
-                       proc->_pid);
-
-        return NGX_AGAIN;
-    }
-
-    *status = pipe_node->status;
-
-    switch (pipe_node->reason_code) {
-
-    case REASON_EXIT_CODE:
-        *reason = REASON_EXIT;
-        break;
-
-    case REASON_SIGNAL_CODE:
-        *reason = REASON_SIGNAL;
-        break;
-
-    default:
-        *reason = REASON_UNKNOWN;
-    }
-
-    ngx_http_lua_pipe_proc_finalize(proc, 0);
-
-    if (*status == 0) {
-        return NGX_OK;
-    }
-
-    return NGX_DECLINED;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_kill(ngx_http_lua_ffi_pipe_proc_t *proc, int signal,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_pid_t                           pid;
-    ngx_http_lua_pipe_t                *pipe;
-
-    pipe = proc->pipe;
-
-    if (pipe == NULL || pipe->dead) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
-        return NGX_ERROR;
-    }
-
-    pid = proc->_pid;
-
-    if (kill(pid, signal) == -1) {
-        switch (ngx_errno) {
-        case EINVAL:
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "invalid signal")
-                           - errbuf;
-            break;
-
-        case ESRCH:
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited")
-                           - errbuf;
-            break;
-
-        default:
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
-                                        strerror(ngx_errno))
-                           - errbuf;
-        }
-
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static int
-ngx_http_lua_pipe_read_stdout_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L)
-{
-    return ngx_http_lua_pipe_read_retval_helper(proc, L, 0);
-}
-
-
-static int
-ngx_http_lua_pipe_read_stderr_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L)
-{
-    return ngx_http_lua_pipe_read_retval_helper(proc, L, 1);
-}
-
-
-static int
-ngx_http_lua_pipe_read_retval_helper(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L, int from_stderr)
-{
-    int                              rc;
-    ngx_msec_t                       timeout;
-    ngx_event_t                     *rev;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
-
-    pipe = proc->pipe;
-    if (from_stderr) {
-        pipe_ctx = pipe->stderr_ctx;
-
-    } else {
-        pipe_ctx = pipe->stdout_ctx;
-    }
-
-    if (pipe->timeout) {
-        pipe->timeout = 0;
-        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
-        return 0;
-    }
-
-    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
-    if (rc != NGX_AGAIN) {
-        return 0;
-    }
-
-    rev = pipe_ctx->c->read;
-
-    if (from_stderr) {
-        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
-        timeout = proc->stderr_read_timeout;
-
-    } else {
-        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
-        timeout = proc->stdout_read_timeout;
-    }
-
-    if (timeout > 0) {
-        ngx_add_timer(rev, timeout);
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe add timer for reading: %d(ms) proc:%p "
-                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
-                       rev);
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
-                   proc->_pid, pipe);
-
-    return NGX_AGAIN;
-}
-
-
-static int
-ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L)
-{
-    int                              rc;
-    ngx_msec_t                       timeout;
-    ngx_event_t                     *wev;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
-
-    pipe = proc->pipe;
-    pipe_ctx = pipe->stdin_ctx;
-
-    if (pipe->timeout) {
-        pipe->timeout = 0;
-        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
-        return 0;
-    }
-
-    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
-    if (rc != NGX_AGAIN) {
-        return 0;
-    }
-
-    wev = pipe_ctx->c->write;
-    wev->handler = ngx_http_lua_pipe_resume_write_handler;
-    timeout = proc->write_timeout;
-
-    if (timeout > 0) {
-        ngx_add_timer(wev, timeout);
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe add timer for writing: %d(ms) proc:%p "
-                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
-                       wev);
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
-                   proc->_pid, pipe);
-
-    return NGX_AGAIN;
-}
-
-
-static int
-ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L)
-{
-    int                              nret;
-    ngx_rbtree_node_t               *node;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_pipe_node_t        *pipe_node;
-
-    pipe = proc->pipe;
-    node = pipe->node;
-    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-    pipe_node->wait_co_ctx = NULL;
-
-    if (pipe->timeout) {
-        pipe->timeout = 0;
-        lua_pushnil(L);
-        lua_pushliteral(L, "timeout");
-        return 2;
-    }
-
-    ngx_http_lua_pipe_proc_finalize(pipe_node->proc, 0);
-
-    if (pipe_node->status == 0) {
-        lua_pushboolean(L, 1);
-        lua_pushliteral(L, REASON_EXIT);
-        lua_pushinteger(L, pipe_node->status);
-        nret = 3;
-
-    } else {
-        lua_pushboolean(L, 0);
-
-        switch (pipe_node->reason_code) {
-
-        case REASON_EXIT_CODE:
-            lua_pushliteral(L, REASON_EXIT);
-            break;
-
-        case REASON_SIGNAL_CODE:
-            lua_pushliteral(L, REASON_SIGNAL);
-            break;
-
-        default:
-            lua_pushliteral(L, REASON_UNKNOWN);
-        }
-
-        lua_pushinteger(L, pipe_node->status);
-        nret = 3;
-    }
-
-    return nret;
-}
-
-
-static void
-ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
-    ngx_http_lua_co_ctx_t *wait_co_ctx)
-{
-    ngx_connection_t                *c;
-    ngx_http_request_t              *r;
-    ngx_http_lua_ctx_t              *ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    if (ev->timedout) {
-        proc = wait_co_ctx->data;
-        pipe = proc->pipe;
-        pipe->timeout = 1;
-        ev->timedout = 0;
-    }
-
-    ngx_http_lua_pipe_clear_event(ev);
-
-    r = ngx_http_lua_get_req(wait_co_ctx->co);
-    c = r->connection;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    ngx_http_lua_assert(ctx != NULL);
-
-    ctx->cur_co_ctx = wait_co_ctx;
-
-    if (ctx->entered_content_phase) {
-        (void) ngx_http_lua_pipe_resume(r);
-
-    } else {
-        ctx->resume_handler = ngx_http_lua_pipe_resume;
-        ngx_http_core_run_phases(r);
-    }
-
-    ngx_http_run_posted_requests(c);
-}
-
-
-static void
-ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev)
-{
-    ngx_connection_t                *c = ev->data;
-    ngx_http_lua_co_ctx_t           *wait_co_ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    wait_co_ctx = c->data;
-    proc = wait_co_ctx->data;
-    pipe = proc->pipe;
-    pipe->retval_handler = ngx_http_lua_pipe_read_stdout_retval;
-    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
-}
-
-
-static void
-ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev)
-{
-    ngx_connection_t                *c = ev->data;
-    ngx_http_lua_co_ctx_t           *wait_co_ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    wait_co_ctx = c->data;
-    proc = wait_co_ctx->data;
-    pipe = proc->pipe;
-    pipe->retval_handler = ngx_http_lua_pipe_read_stderr_retval;
-    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
-}
-
-
-static void
-ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev)
-{
-    ngx_connection_t                *c = ev->data;
-    ngx_http_lua_co_ctx_t           *wait_co_ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    wait_co_ctx = c->data;
-    proc = wait_co_ctx->data;
-    pipe = proc->pipe;
-    pipe->retval_handler = ngx_http_lua_pipe_write_retval;
-    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
-}
-
-
-static void
-ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev)
-{
-    ngx_http_lua_co_ctx_t           *wait_co_ctx = ev->data;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    proc = wait_co_ctx->data;
-    pipe = proc->pipe;
-    pipe->retval_handler = ngx_http_lua_pipe_wait_retval;
-    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_resume(ngx_http_request_t *r)
-{
-    int                              nret;
-    lua_State                       *vm;
-    ngx_int_t                        rc;
-    ngx_uint_t                       nreqs;
-    ngx_connection_t                *c;
-    ngx_http_lua_ctx_t              *ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    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;
-    ctx->cur_co_ctx->cleanup = NULL;
-
-    proc = ctx->cur_co_ctx->data;
-    pipe = proc->pipe;
-    nret = pipe->retval_handler(proc, ctx->cur_co_ctx->co);
-    if (nret == NGX_AGAIN) {
-        return NGX_DONE;
-    }
-
-    c = r->connection;
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    /* rc == NGX_ERROR || rc >= NGX_OK */
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_finalize_request(r, rc);
-        return NGX_DONE;
-    }
-
-    return rc;
-}
-
-
-static void
-ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev)
-{
-    /* do nothing */
-}
-
-
-static void
-ngx_http_lua_pipe_clear_event(ngx_event_t *ev)
-{
-    ev->handler = ngx_http_lua_pipe_dummy_event_handler;
-
-    if (ev->timer_set) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                       "lua pipe del timer for ev:%p", ev);
-        ngx_del_timer(ev);
-    }
-
-    if (ev->posted) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                       "lua pipe del posted event for ev:%p", ev);
-        ngx_delete_posted_event(ev);
-    }
-}
-
-
-static void
-ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data)
-{
-    ngx_event_t                    *rev;
-    ngx_connection_t               *c;
-    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
-    ngx_http_lua_ffi_pipe_proc_t   *proc;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe proc read stdout cleanup");
-
-    proc = wait_co_ctx->data;
-    c = proc->pipe->stdout_ctx->c;
-    if (c) {
-        rev = c->read;
-        ngx_http_lua_pipe_clear_event(rev);
-    }
-
-    wait_co_ctx->cleanup = NULL;
-}
-
-
-static void
-ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data)
-{
-    ngx_event_t                    *rev;
-    ngx_connection_t               *c;
-    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
-    ngx_http_lua_ffi_pipe_proc_t   *proc;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe proc read stderr cleanup");
-
-    proc = wait_co_ctx->data;
-    c = proc->pipe->stderr_ctx->c;
-    if (c) {
-        rev = c->read;
-        ngx_http_lua_pipe_clear_event(rev);
-    }
-
-    wait_co_ctx->cleanup = NULL;
-}
-
-
-static void
-ngx_http_lua_pipe_proc_write_cleanup(void *data)
-{
-    ngx_event_t                    *wev;
-    ngx_connection_t               *c;
-    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
-    ngx_http_lua_ffi_pipe_proc_t   *proc;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe proc write cleanup");
-
-    proc = wait_co_ctx->data;
-    c = proc->pipe->stdin_ctx->c;
-    if (c) {
-        wev = c->write;
-        ngx_http_lua_pipe_clear_event(wev);
-    }
-
-    wait_co_ctx->cleanup = NULL;
-}
-
-
-static void
-ngx_http_lua_pipe_proc_wait_cleanup(void *data)
-{
-    ngx_rbtree_node_t              *node;
-    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
-    ngx_http_lua_pipe_node_t       *pipe_node;
-    ngx_http_lua_ffi_pipe_proc_t   *proc;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe proc wait cleanup");
-
-    proc = wait_co_ctx->data;
-    node = proc->pipe->node;
-    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-    pipe_node->wait_co_ctx = NULL;
-
-    ngx_http_lua_pipe_clear_event(&wait_co_ctx->sleep);
-
-    wait_co_ctx->cleanup = NULL;
-}
-
-
-#endif /* HAVE_NGX_LUA_PIPE */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pipe.h b/debian/modules/http-lua/src/ngx_http_lua_pipe.h
deleted file mode 100644
index b5cea89..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_pipe.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-/*
- * Copyright (C) by OpenResty Inc.
- */
-
-
-#ifndef _NGX_HTTP_LUA_PIPE_H_INCLUDED_
-#define _NGX_HTTP_LUA_PIPE_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-typedef ngx_int_t (*ngx_http_lua_pipe_input_filter)(void *data, ssize_t bytes);
-
-
-typedef struct {
-    ngx_connection_t                   *c;
-    ngx_http_lua_pipe_input_filter      input_filter;
-    void                               *input_filter_ctx;
-    size_t                              rest;
-    ngx_chain_t                        *buf_in;
-    ngx_chain_t                        *bufs_in;
-    ngx_buf_t                           buffer;
-    ngx_err_t                           pipe_errno;
-    unsigned                            err_type:16;
-    unsigned                            eof:1;
-} ngx_http_lua_pipe_ctx_t;
-
-
-typedef struct ngx_http_lua_pipe_s  ngx_http_lua_pipe_t;
-
-
-typedef struct {
-    ngx_pid_t               _pid;
-    ngx_msec_t              write_timeout;
-    ngx_msec_t              stdout_read_timeout;
-    ngx_msec_t              stderr_read_timeout;
-    ngx_msec_t              wait_timeout;
-    /* pipe hides the implementation from the Lua binding */
-    ngx_http_lua_pipe_t    *pipe;
-} ngx_http_lua_ffi_pipe_proc_t;
-
-
-typedef int (*ngx_http_lua_pipe_retval_handler)(
-    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
-
-
-struct ngx_http_lua_pipe_s {
-    ngx_pool_t                         *pool;
-    ngx_chain_t                        *free_bufs;
-    ngx_rbtree_node_t                  *node;
-    int                                 stdin_fd;
-    int                                 stdout_fd;
-    int                                 stderr_fd;
-    ngx_http_lua_pipe_ctx_t            *stdin_ctx;
-    ngx_http_lua_pipe_ctx_t            *stdout_ctx;
-    ngx_http_lua_pipe_ctx_t            *stderr_ctx;
-    ngx_http_lua_pipe_retval_handler    retval_handler;
-    size_t                              buffer_size;
-    unsigned                            closed:1;
-    unsigned                            dead:1;
-    unsigned                            timeout:1;
-    unsigned                            merge_stderr:1;
-};
-
-
-typedef struct {
-    u_char                           color;
-    u_char                           reason_code;
-    int                              status;
-    ngx_http_lua_co_ctx_t           *wait_co_ctx;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-} ngx_http_lua_pipe_node_t;
-
-
-typedef struct {
-    int     signo;
-    char   *signame;
-} ngx_http_lua_pipe_signal_t;
-
-
-#if !(NGX_WIN32) && !defined(NGX_LUA_NO_FFI_API)                             \
-    && defined(HAVE_SOCKET_CLOEXEC_PATCH)
-#define HAVE_NGX_LUA_PIPE   1
-
-
-void ngx_http_lua_pipe_init(void);
-ngx_int_t ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_PIPE_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_regex.c b/debian/modules/http-lua/src/ngx_http_lua_regex.c
index 8f3373b..843d1e4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_regex.c
@@ -15,6 +15,7 @@
 #include "ngx_http_lua_regex.h"
 #include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_script.h"
+#include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_util.h"
 
 
@@ -248,8 +249,7 @@ ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              regex_cache_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
@@ -720,8 +720,7 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              regex_cache_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
@@ -1389,8 +1388,7 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              regex_cache_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "s");
diff --git a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
index 1de9968..1bbe87c 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
@@ -62,7 +62,7 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
 #endif
 
         if (cur_ph < last_ph) {
-            dd("swapping the contents of cur_ph and last_ph...");
+            dd("swaping the contents of cur_ph and last_ph...");
 
             tmp      = *cur_ph;
 
@@ -261,11 +261,9 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_script.c b/debian/modules/http-lua/src/ngx_http_lua_script.c
index c675a16..95ebadf 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_script.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_script.c
@@ -329,7 +329,7 @@ ngx_http_lua_script_add_copy_code(ngx_http_lua_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_lua_script_code_pt) (void *)
+    code->code = (ngx_http_lua_script_code_pt)
                  ngx_http_lua_script_copy_len_code;
     code->len = len;
 
@@ -399,7 +399,7 @@ ngx_http_lua_script_add_capture_code(ngx_http_lua_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_lua_script_code_pt) (void *)
+    code->code = (ngx_http_lua_script_code_pt)
                  ngx_http_lua_script_copy_capture_len_code;
     code->n = 2 * n;
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.c b/debian/modules/http-lua/src/ngx_http_lua_setby.c
index d4288b5..2e8762a 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_setby.c
@@ -30,6 +30,13 @@ 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);
 
 
+/* keys in Lua thread for fetching args and nargs in set_by_lua* */
+
+#define ngx_http_lua_nargs_key  "__ngx_nargs"
+
+#define ngx_http_lua_args_key  "__ngx_args"
+
+
 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)
@@ -127,24 +134,23 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
 
 
 int
-ngx_http_lua_setby_param_get(lua_State *L, ngx_http_request_t *r)
+ngx_http_lua_setby_param_get(lua_State *L)
 {
     int         idx;
     int         n;
 
     ngx_http_variable_value_t       *v;
-    ngx_http_lua_main_conf_t        *lmcf;
 
     idx = luaL_checkint(L, 2);
     idx--;
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    /*  get number of args from globals */
+    lua_getglobal(L, ngx_http_lua_nargs_key);
+    n = (int) lua_tointeger(L, -1);
 
-    /*  get number of args from lmcf */
-    n = lmcf->setby_nargs;
-
-    /*  get args from lmcf */
-    v = lmcf->setby_args;
+    /*  get args from globals */
+    lua_getglobal(L, ngx_http_lua_args_key);
+    v = lua_touserdata(L, -1);
 
     if (idx < 0 || idx > n - 1) {
         lua_pushnil(L);
@@ -172,16 +178,15 @@ 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;
-
+    /*  set nginx request pointer to current lua thread's globals table */
     ngx_http_lua_set_req(L, r);
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    lua_pushinteger(L, nargs);
+    lua_setglobal(L, ngx_http_lua_nargs_key);
 
-    lmcf->setby_nargs = nargs;
-    lmcf->setby_args = args;
+    lua_pushlightuserdata(L, args);
+    lua_setglobal(L, ngx_http_lua_args_key);
 
-#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -206,7 +211,6 @@ ngx_http_lua_set_by_lua_env(lua_State *L, ngx_http_request_t *r, size_t nargs,
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif
 }
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.h b/debian/modules/http-lua/src/ngx_http_lua_setby.h
index f43eef7..da71753 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_setby.h
@@ -7,7 +7,7 @@
 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, ngx_http_request_t *r);
+int ngx_http_lua_setby_param_get(lua_State *L);
 
 
 #endif /* _NGX_HTTP_LUA_SET_BY_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_shdict.c b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
index b017bea..5fb7930 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
@@ -325,7 +325,6 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_uint_t                   i;
     ngx_shm_zone_t             **zone;
-    ngx_shm_zone_t             **zone_udata;
 
     if (lmcf->shdict_zones != NULL) {
         lua_createtable(L, 0, lmcf->shdict_zones->nelts /* nrec */);
@@ -397,9 +396,7 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
 
             lua_createtable(L, 1 /* narr */, 0 /* nrec */);
                 /* table of zone[i] */
-            zone_udata = lua_newuserdata(L, sizeof(ngx_shm_zone_t *));
-                /* shared mt key ud */
-            *zone_udata = zone[i];
+            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
             lua_rawseti(L, -2, SHDICT_USERDATA_INDEX); /* {zone[i]} */
             lua_pushvalue(L, -3); /* shared mt key ud mt */
             lua_setmetatable(L, -2); /* shared mt key ud */
@@ -434,17 +431,11 @@ static ngx_inline ngx_shm_zone_t *
 ngx_http_lua_shdict_get_zone(lua_State *L, int index)
 {
     ngx_shm_zone_t      *zone;
-    ngx_shm_zone_t     **zone_udata;
 
     lua_rawgeti(L, index, SHDICT_USERDATA_INDEX);
-    zone_udata = lua_touserdata(L, -1);
+    zone = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    if (zone_udata == NULL) {
-        return NULL;
-    }
-
-    zone = *zone_udata;
     return zone;
 }
 
@@ -2218,17 +2209,6 @@ ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
 
 
 #ifndef NGX_LUA_NO_FFI_API
-ngx_shm_zone_t *
-ngx_http_lua_ffi_shdict_udata_to_zone(void *zone_udata)
-{
-    if (zone_udata == NULL) {
-        return NULL;
-    }
-
-    return *(ngx_shm_zone_t **) zone_udata;
-}
-
-
 int
 ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     size_t key_len, int value_type, u_char *str_value_buf,
@@ -2245,6 +2225,10 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     dd("exptime: %ld", exptime);
 
     ctx = zone->data;
@@ -2506,6 +2490,10 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_node_t  *sd;
     ngx_str_t                    value;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     *err = NULL;
 
     ctx = zone->data;
@@ -2648,6 +2636,10 @@ ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
     u_char                      *p;
     ngx_queue_t                 *queue, *q;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     if (init_ttl > 0) {
         tp = ngx_timeofday();
     }
@@ -2923,6 +2915,10 @@ ngx_http_lua_ffi_shdict_get_ttl(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     ctx = zone->data;
     hash = ngx_crc32_short(key, key_len);
 
@@ -2963,6 +2959,10 @@ ngx_http_lua_ffi_shdict_set_expire(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     if (exptime > 0) {
         tp = ngx_timeofday();
     }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
index 87461e6..efdf427 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
@@ -11,7 +11,6 @@
 
 
 #include "ngx_http_lua_socket_tcp.h"
-#include "ngx_http_lua_input_filters.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_uthread.h"
 #include "ngx_http_lua_output.h"
@@ -25,7 +24,6 @@ static int ngx_http_lua_socket_tcp_connect(lua_State *L);
 static int ngx_http_lua_socket_tcp_sslhandshake(lua_State *L);
 #endif
 static int ngx_http_lua_socket_tcp_receive(lua_State *L);
-static int ngx_http_lua_socket_tcp_receiveany(lua_State *L);
 static int ngx_http_lua_socket_tcp_send(lua_State *L);
 static int ngx_http_lua_socket_tcp_close(lua_State *L);
 static int ngx_http_lua_socket_tcp_setoption(lua_State *L);
@@ -71,8 +69,6 @@ static int ngx_http_lua_socket_tcp_conn_retval_handler(ngx_http_request_t *r,
     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_tcp_upstream_t *u);
-static int ngx_http_lua_socket_tcp_receive_helper(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 static ngx_int_t ngx_http_lua_socket_tcp_read(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u);
 static int ngx_http_lua_socket_tcp_receive_retval_handler(ngx_http_request_t *r,
@@ -90,7 +86,6 @@ static int ngx_http_lua_socket_write_error_retval_handler(ngx_http_request_t *r,
 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);
-static ngx_int_t ngx_http_lua_socket_read_any(void *data, ssize_t bytes);
 static int ngx_http_lua_socket_tcp_receiveuntil(lua_State *L);
 static int ngx_http_lua_socket_receiveuntil_iterator(lua_State *L);
 static ngx_int_t ngx_http_lua_socket_compile_pattern(u_char *data, size_t len,
@@ -100,28 +95,12 @@ static int ngx_http_lua_req_socket(lua_State *L);
 static void ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r);
 static int ngx_http_lua_socket_tcp_getreusedtimes(lua_State *L);
 static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L);
-static void ngx_http_lua_socket_tcp_create_socket_pool(lua_State *L,
-    ngx_http_request_t *r, ngx_str_t key, ngx_int_t pool_size,
-    ngx_int_t backlog, ngx_http_lua_socket_pool_t **spool);
 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_tcp_upstream_t *u);
 static void ngx_http_lua_socket_keepalive_dummy_handler(ngx_event_t *ev);
-static int ngx_http_lua_socket_tcp_connect_helper(lua_State *L,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, u_char *host_ref, size_t host_len, in_port_t port,
-    unsigned resuming);
-static void ngx_http_lua_socket_tcp_conn_op_timeout_handler(
-    ngx_event_t *ev);
-static int ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler(
-    ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
-static void ngx_http_lua_socket_tcp_resume_conn_op(
-    ngx_http_lua_socket_pool_t *spool);
-static void ngx_http_lua_socket_tcp_conn_op_ctx_cleanup(void *data);
-static void ngx_http_lua_socket_tcp_conn_op_resume_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 int ngx_http_lua_socket_tcp_conn_op_resume_retval_handler(
-    ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u, 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,
@@ -134,13 +113,11 @@ static ngx_int_t ngx_http_lua_socket_add_input_buffer(ngx_http_request_t *r,
     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_tcp_upstream_t *u, u_char *pat, size_t prefix);
-static ngx_int_t ngx_http_lua_socket_tcp_conn_op_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_conn_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_read_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r,
     int socket_op);
-static void ngx_http_lua_tcp_queue_conn_op_cleanup(void *data);
 static void ngx_http_lua_tcp_resolve_cleanup(void *data);
 static void ngx_http_lua_coctx_cleanup(void *data);
 static void ngx_http_lua_socket_free_pool(ngx_log_t *log,
@@ -173,8 +150,7 @@ enum {
 enum {
     SOCKET_OP_CONNECT,
     SOCKET_OP_READ,
-    SOCKET_OP_WRITE,
-    SOCKET_OP_RESUME_CONN
+    SOCKET_OP_WRITE
 };
 
 
@@ -253,8 +229,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_setfield(L, -2, "socket");
 
     /* {{{req socket object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          req_socket_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
     lua_createtable(L, 0 /* narr */, 5 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
@@ -276,8 +251,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{raw req socket object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          raw_req_socket_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
     lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
@@ -302,8 +276,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{tcp object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          tcp_socket_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
     lua_createtable(L, 0 /* narr */, 12 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_connect);
@@ -319,9 +292,6 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
     lua_setfield(L, -2, "receive");
 
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveany);
-    lua_setfield(L, -2, "receiveany");
-
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveuntil);
     lua_setfield(L, -2, "receiveuntil");
 
@@ -352,8 +322,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{upstream userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          upstream_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_upstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -361,8 +330,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{downstream userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          downstream_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_downstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -370,8 +338,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{socket pool userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          pool_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
     lua_createtable(L, 0, 1); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_shutdown_pool);
     lua_setfield(L, -2, "__gc");
@@ -379,8 +346,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{socket compiled pattern userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          pattern_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_cleanup_compiled_pattern);
     lua_setfield(L, -2, "__gc");
@@ -390,8 +356,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 #if (NGX_HTTP_SSL)
 
     /* {{{ssl session userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          ssl_session_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_ssl_free_session);
     lua_setfield(L, -2, "__gc");
@@ -439,8 +404,7 @@ ngx_http_lua_socket_tcp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     lua_createtable(L, 5 /* narr */, 1 /* nrec */);
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          tcp_socket_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -450,421 +414,31 @@ ngx_http_lua_socket_tcp(lua_State *L)
 }
 
 
-static void
-ngx_http_lua_socket_tcp_create_socket_pool(lua_State *L, ngx_http_request_t *r,
-    ngx_str_t key, ngx_int_t pool_size, ngx_int_t backlog,
-    ngx_http_lua_socket_pool_t **spool)
-{
-    u_char                              *p;
-    size_t                               size, key_len;
-    ngx_int_t                            i;
-    ngx_http_lua_socket_pool_t          *sp;
-    ngx_http_lua_socket_pool_item_t     *items;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket connection pool size: %i, backlog: %i",
-                   pool_size, backlog);
-
-    key_len = ngx_align(key.len + 1, sizeof(void *));
-
-    size = sizeof(ngx_http_lua_socket_pool_t) - 1 + key_len
-           + sizeof(ngx_http_lua_socket_pool_item_t) * pool_size;
-
-    /* before calling this function, the Lua stack is:
-     * -1 key
-     * -2 pools
-     */
-    sp = lua_newuserdata(L, size);
-    if (sp == NULL) {
-        luaL_error(L, "no memory");
-        return;
-    }
-
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          pool_udata_metatable_key));
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    lua_setmetatable(L, -2);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket keepalive create connection pool for key"
-                   " \"%V\"", &key);
-
-    /* a new socket pool with metatable is push to the stack, so now we have:
-     * -1 sp
-     * -2 key
-     * -3 pools
-     *
-     * it is time to set pools[key] to sp.
-     */
-    lua_rawset(L, -3);
-
-    /* clean up the stack for consistency's sake */
-    lua_pop(L, 1);
-
-    sp->backlog = backlog;
-    sp->size = pool_size;
-    sp->connections = 0;
-    sp->lua_vm = ngx_http_lua_get_lua_vm(r, NULL);
-
-    ngx_queue_init(&sp->cache_connect_op);
-    ngx_queue_init(&sp->wait_connect_op);
-    ngx_queue_init(&sp->cache);
-    ngx_queue_init(&sp->free);
-
-    p = ngx_copy(sp->key, key.data, key.len);
-    *p++ = '\0';
-
-    items = (ngx_http_lua_socket_pool_item_t *) (sp->key + key_len);
-
-    dd("items: %p", items);
-
-    ngx_http_lua_assert((void *) items == ngx_align_ptr(items, sizeof(void *)));
-
-    for (i = 0; i < pool_size; i++) {
-        ngx_queue_insert_head(&sp->free, &items[i].queue);
-        items[i].socket_pool = sp;
-    }
-
-    *spool = sp;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_connect_helper(lua_State *L,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, u_char *host_ref, size_t host_len, in_port_t port,
-    unsigned resuming)
-{
-    int                                    n;
-    int                                    host_size;
-    int                                    saved_top;
-    ngx_int_t                              rc;
-    ngx_str_t                              host;
-    ngx_str_t                             *conn_op_host;
-    ngx_url_t                              url;
-    ngx_queue_t                           *q;
-    ngx_resolver_ctx_t                    *rctx, temp;
-    ngx_http_lua_co_ctx_t                 *coctx;
-    ngx_http_core_loc_conf_t              *clcf;
-    ngx_http_lua_socket_pool_t            *spool;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t *conn_op_ctx;
-
-    spool = u->socket_pool;
-    if (spool != NULL) {
-        rc = ngx_http_lua_get_keepalive_peer(r, u);
-
-        if (rc == NGX_OK) {
-            lua_pushinteger(L, 1);
-            return 1;
-        }
-
-        /* rc == NGX_DECLINED */
-
-        spool->connections++;
-
-        /* check if backlog is enabled and
-         * don't queue resuming connection operation */
-        if (spool->backlog >= 0 && !resuming) {
-
-            dd("lua tcp socket %s connections %ld",
-               spool->key, spool->connections);
-
-            if (spool->connections > spool->size + spool->backlog) {
-                spool->connections--;
-                lua_pushnil(L);
-                lua_pushliteral(L, "too many waiting connect operations");
-                return 2;
-            }
-
-            if (spool->connections > spool->size) {
-                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->peer.log, 0,
-                               "lua tcp socket queue connect operation for "
-                               "connection pool \"%s\", connections: %i",
-                               spool->key, spool->connections);
-
-                host_size = sizeof(u_char) *
-                    (ngx_max(host_len, NGX_INET_ADDRSTRLEN) + 1);
-
-                if (!ngx_queue_empty(&spool->cache_connect_op)) {
-                    q = ngx_queue_last(&spool->cache_connect_op);
-                    ngx_queue_remove(q);
-                    conn_op_ctx = ngx_queue_data(
-                        q, ngx_http_lua_socket_tcp_conn_op_ctx_t, queue);
-
-                    conn_op_host = &conn_op_ctx->host;
-                    if (host_len > conn_op_host->len
-                        && host_len > NGX_INET_ADDRSTRLEN)
-                    {
-                        ngx_free(conn_op_host->data);
-                        conn_op_host->data = ngx_alloc(host_size,
-                                                       ngx_cycle->log);
-                        if (conn_op_host->data == NULL) {
-                            ngx_free(conn_op_ctx);
-                            goto no_memory_and_not_resuming;
-                        }
-                    }
-
-                } else {
-                    conn_op_ctx = ngx_alloc(
-                        sizeof(ngx_http_lua_socket_tcp_conn_op_ctx_t),
-                        ngx_cycle->log);
-                    if (conn_op_ctx == NULL) {
-                        goto no_memory_and_not_resuming;
-                    }
-
-                    conn_op_host = &conn_op_ctx->host;
-                    conn_op_host->data = ngx_alloc(host_size, ngx_cycle->log);
-                    if (conn_op_host->data == NULL) {
-                        ngx_free(conn_op_ctx);
-                        goto no_memory_and_not_resuming;
-                    }
-                }
-
-                conn_op_ctx->cleanup = NULL;
-
-                ngx_memcpy(conn_op_host->data, host_ref, host_len);
-                conn_op_host->data[host_len] = '\0';
-                conn_op_host->len = host_len;
-
-                conn_op_ctx->port = port;
-
-                u->write_co_ctx = ctx->cur_co_ctx;
-
-                conn_op_ctx->u = u;
-                ctx->cur_co_ctx->cleanup =
-                    ngx_http_lua_tcp_queue_conn_op_cleanup;
-                ctx->cur_co_ctx->data = conn_op_ctx;
-
-                ngx_memzero(&conn_op_ctx->event, sizeof(ngx_event_t));
-                conn_op_ctx->event.handler =
-                    ngx_http_lua_socket_tcp_conn_op_timeout_handler;
-                conn_op_ctx->event.data = conn_op_ctx;
-                conn_op_ctx->event.log = ngx_cycle->log;
-
-                ngx_add_timer(&conn_op_ctx->event, u->connect_timeout);
-
-                ngx_queue_insert_tail(&spool->wait_connect_op,
-                                      &conn_op_ctx->queue);
-
-                ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                               "lua tcp socket queued connect operation for "
-                               "%d(ms), u: %p, ctx: %p",
-                               u->connect_timeout, conn_op_ctx->u, conn_op_ctx);
-
-                return lua_yield(L, 0);
-            }
-        }
-
-    } /* end spool != NULL */
-
-    host.data = ngx_palloc(r->pool, host_len + 1);
-    if (host.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    host.len = host_len;
-
-    ngx_memcpy(host.data, host_ref, host_len);
-    host.data[host_len] = '\0';
-
-    ngx_memzero(&url, sizeof(ngx_url_t));
-    url.url = host;
-    url.default_port = port;
-    url.no_resolve = 1;
-
-    coctx = ctx->cur_co_ctx;
-
-    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",
-                            url.url.data, url.err);
-
-        } else {
-            lua_pushfstring(L, "failed to parse host name \"%s\"",
-                            url.url.data);
-        }
-
-        goto failed;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "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) {
-        if (resuming) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "no memory");
-            goto failed;
-        }
-
-        goto no_memory_and_not_resuming;
-    }
-
-    if (url.addrs && url.addrs[0].sockaddr) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp 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 = url.default_port;
-    }
-
-    if (u->resolved->sockaddr) {
-        rc = ngx_http_lua_socket_resolve_retval_handler(r, u, L);
-        if (rc == NGX_AGAIN && !resuming) {
-            return lua_yield(L, 0);
-        }
-
-        if (rc > 1) {
-            goto failed;
-        }
-
-        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");
-        goto failed;
-    }
-
-    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);
-        goto failed;
-    }
-
-    rctx->name = host;
-#if !defined(nginx_version) || nginx_version < 1005008
-    rctx->type = NGX_RESOLVE_A;
-#endif
-    rctx->handler = ngx_http_lua_socket_resolve_handler;
-    rctx->data = u;
-    rctx->timeout = clcf->resolver_timeout;
-
-    u->resolved->ctx = rctx;
-    u->write_co_ctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
-    coctx->data = u;
-
-    saved_top = lua_gettop(L);
-
-    if (ngx_resolve_name(rctx) != NGX_OK) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket fail to run resolver immediately");
-
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
-
-        coctx->cleanup = NULL;
-        coctx->data = NULL;
-
-        u->resolved->ctx = NULL;
-        lua_pushnil(L);
-        lua_pushfstring(L, "%s could not be resolved", host.data);
-        goto failed;
-    }
-
-    if (u->conn_waiting) {
-        dd("resolved and already connecting");
-
-        if (resuming) {
-            return NGX_AGAIN;
-        }
-
-        return lua_yield(L, 0);
-    }
-
-    n = lua_gettop(L) - saved_top;
-    if (n) {
-        dd("errors occurred during resolving or connecting"
-           "or already connected");
-
-        if (n > 1) {
-            goto failed;
-        }
-
-        return n;
-    }
-
-    /* still resolving */
-
-    u->conn_waiting = 1;
-    u->write_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;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    if (resuming) {
-        return NGX_AGAIN;
-    }
-
-    return lua_yield(L, 0);
-
-failed:
-
-    if (spool != NULL) {
-        spool->connections--;
-        ngx_http_lua_socket_tcp_resume_conn_op(spool);
-    }
-
-    return 2;
-
-no_memory_and_not_resuming:
-
-    if (spool != NULL) {
-        spool->connections--;
-        ngx_http_lua_socket_tcp_resume_conn_op(spool);
-    }
-
-    return luaL_error(L, "no memory");
-}
-
-
 static int
 ngx_http_lua_socket_tcp_connect(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_peer_connection_t       *pc;
     int                          connect_timeout, send_timeout, read_timeout;
     unsigned                     custom_pool;
     int                          key_index;
-    ngx_int_t                    backlog;
-    ngx_int_t                    pool_size;
-    ngx_str_t                    key;
     const char                  *msg;
+    ngx_http_lua_co_ctx_t       *coctx;
 
     ngx_http_lua_socket_tcp_upstream_t      *u;
 
-    ngx_http_lua_socket_pool_t              *spool;
-
     n = lua_gettop(L);
     if (n != 2 && n != 3 && n != 4) {
         return luaL_error(L, "ngx.socket connect: expecting 2, 3, or 4 "
@@ -892,54 +466,13 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     p = (u_char *) luaL_checklstring(L, 2, &len);
 
-    backlog = -1;
     key_index = 2;
-    pool_size = 0;
     custom_pool = 0;
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
     if (lua_type(L, n) == LUA_TTABLE) {
 
         /* found the last optional option table */
 
-        lua_getfield(L, n, "pool_size");
-
-        if (lua_isnumber(L, -1)) {
-            pool_size = (ngx_int_t) lua_tointeger(L, -1);
-
-            if (pool_size <= 0) {
-                msg = lua_pushfstring(L, "bad \"pool_size\" option value: %i",
-                                      pool_size);
-                return luaL_argerror(L, n, msg);
-            }
-
-        } else if (!lua_isnil(L, -1)) {
-            msg = lua_pushfstring(L, "bad \"pool_size\" option type: %s",
-                                  lua_typename(L, lua_type(L, -1)));
-            return luaL_argerror(L, n, msg);
-        }
-
-        lua_pop(L, 1);
-
-        lua_getfield(L, n, "backlog");
-
-        if (lua_isnumber(L, -1)) {
-            backlog = (ngx_int_t) lua_tointeger(L, -1);
-
-            if (backlog < 0) {
-                msg = lua_pushfstring(L, "bad \"backlog\" option value: %i",
-                                      backlog);
-                return luaL_argerror(L, n, msg);
-            }
-
-            /* use default value for pool size if only backlog specified */
-            if (pool_size == 0) {
-                pool_size = llcf->pool_size;
-            }
-        }
-
-        lua_pop(L, 1);
-
         lua_getfield(L, n, "pool");
 
         switch (lua_type(L, -1)) {
@@ -1039,8 +572,7 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         }
 
 #if 1
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              upstream_udata_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
 #endif
@@ -1050,8 +582,12 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     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;
 
     pc = &u->peer;
@@ -1092,28 +628,163 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         u->read_timeout = u->conf->read_timeout;
     }
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
-    lua_rawget(L, LUA_REGISTRYINDEX); /* table */
-    lua_pushvalue(L, key_index); /* key */
+    rc = ngx_http_lua_get_keepalive_peer(r, L, key_index, u);
 
-    lua_rawget(L, -2);
-    spool = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    if (spool != NULL) {
-        u->socket_pool = spool;
-
-    } else if (pool_size > 0) {
-        lua_pushvalue(L, key_index);
-        key.data = (u_char *) lua_tolstring(L, -1, &key.len);
-
-        ngx_http_lua_socket_tcp_create_socket_pool(L, r, key, pool_size,
-                                                   backlog, &spool);
-        u->socket_pool = spool;
+    if (rc == NGX_OK) {
+        lua_pushinteger(L, 1);
+        return 1;
     }
 
-    return ngx_http_lua_socket_tcp_connect_helper(L, u, r, ctx, p,
-                                                  len, port, 0);
+    if (rc == NGX_ERROR) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "error in get keepalive peer");
+        return 2;
+    }
+
+    /* rc == NGX_DECLINED */
+
+    /* TODO: we should avoid this in-pool allocation */
+
+    host.data = ngx_palloc(r->pool, len + 1);
+    if (host.data == NULL) {
+        return luaL_error(L, "no memory");
+    }
+
+    host.len = len;
+
+    ngx_memcpy(host.data, p, len);
+    host.data[len] = '\0';
+
+    ngx_memzero(&url, sizeof(ngx_url_t));
+
+    url.url.len = host.len;
+    url.url.data = host.data;
+    url.default_port = (in_port_t) 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;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "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) {
+        return luaL_error(L, "no memory");
+    }
+
+    if (url.addrs && url.addrs[0].sockaddr) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp 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;
+#if !defined(nginx_version) || nginx_version < 1005008
+    rctx->type = NGX_RESOLVE_A;
+#endif
+    rctx->handler = ngx_http_lua_socket_resolve_handler;
+    rctx->data = u;
+    rctx->timeout = clcf->resolver_timeout;
+
+    u->resolved->ctx = rctx;
+    u->write_co_ctx = ctx->cur_co_ctx;
+
+    ngx_http_lua_cleanup_pending_operation(coctx);
+    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
+    coctx->data = u;
+
+    saved_top = lua_gettop(L);
+
+    if (ngx_resolve_name(rctx) != NGX_OK) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket fail to run resolver immediately");
+
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
+
+        coctx->cleanup = NULL;
+        coctx->data = NULL;
+
+        u->resolved->ctx = NULL;
+        lua_pushnil(L);
+        lua_pushfstring(L, "%s could not be resolved", host.data);
+
+        return 2;
+    }
+
+    if (u->conn_waiting) {
+        dd("resolved and already connecting");
+        return lua_yield(L, 0);
+    }
+
+    n = lua_gettop(L) - saved_top;
+    if (n) {
+        dd("errors occurred during resolving or connecting"
+           "or already connected");
+        return n;
+    }
+
+    /* still resolving */
+
+    u->conn_waiting = 1;
+    u->write_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;
+
+    } else {
+        r->write_event_handler = ngx_http_core_run_phases;
+    }
+
+    return lua_yield(L, 0);
 }
 
 
@@ -1967,8 +1638,7 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
                       "lua ssl save session: %p", ssl_session);
 
         /* set up the __gc metamethod */
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              ssl_session_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -2085,173 +1755,20 @@ ngx_http_lua_socket_tcp_conn_retval_handler(ngx_http_request_t *r,
 }
 
 
-static int
-ngx_http_lua_socket_tcp_receive_helper(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    ngx_int_t                            rc;
-    ngx_http_lua_ctx_t                  *ctx;
-    ngx_http_lua_co_ctx_t               *coctx;
-
-    u->input_filter_ctx = u;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (u->bufs_in == NULL) {
-        u->bufs_in =
-            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                            &ctx->free_recv_bufs,
-                                            u->conf->buffer_size);
-
-        if (u->bufs_in == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        u->buf_in = u->bufs_in;
-        u->buffer = *u->buf_in->buf;
-    }
-
-    dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket read timeout: %M", u->read_timeout);
-
-    if (u->raw_downstream || u->body_downstream) {
-        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
-    }
-
-    u->read_waiting = 0;
-    u->read_co_ctx = NULL;
-
-    rc = ngx_http_lua_socket_tcp_read(r, u);
-
-    if (rc == NGX_ERROR) {
-        dd("read failed: %d", (int) u->ft_type);
-        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-        dd("tcp receive retval returned: %d", (int) rc);
-        return rc;
-    }
-
-    if (rc == NGX_OK) {
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket receive done in a single run");
-
-        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-    }
-
-    /* rc == NGX_AGAIN */
-
-    u->read_event_handler = ngx_http_lua_socket_read_handler;
-
-    coctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_coctx_cleanup;
-    coctx->data = u;
-
-    if (ctx->entered_content_phase) {
-        r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    u->read_co_ctx = coctx;
-    u->read_waiting = 1;
-    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
-
-    dd("setting data to %p, coctx:%p", u, coctx);
-
-    if (u->raw_downstream || u->body_downstream) {
-        ctx->downstream = u;
-    }
-
-    return lua_yield(L, 0);
-}
-
-
-static int
-ngx_http_lua_socket_tcp_receiveany(lua_State *L)
-{
-    int                                  n;
-    lua_Integer                          bytes;
-    ngx_http_request_t                  *r;
-    ngx_http_lua_loc_conf_t             *llcf;
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-
-    n = lua_gettop(L);
-    if (n != 2) {
-        return luaL_error(L, "expecting 2 arguments "
-                          "(including the object), but got %d", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    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->read_closed) {
-
-        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:%d eof:%d",
-                          u, u ? u->peer.connection : NULL,
-                          u ? (int) u->ft_type : 0, u ? (int) u->eof : 0);
-        }
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    if (u->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    ngx_http_lua_socket_check_busy_connecting(r, u, L);
-    ngx_http_lua_socket_check_busy_reading(r, u, L);
-
-    if (!lua_isnumber(L, 2)) {
-        return luaL_argerror(L, 2, "bad max argument");
-    }
-
-    bytes = lua_tointeger(L, 2);
-    if (bytes <= 0) {
-        return luaL_argerror(L, 2, "bad max argument");
-    }
-
-    u->input_filter = ngx_http_lua_socket_read_any;
-    u->rest = (size_t) bytes;
-    u->length = u->rest;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket calling receiveany() method to read at "
-                   "most %uz bytes", u->rest);
-
-    return ngx_http_lua_socket_tcp_receive_helper(r, u, L);
-}
-
-
 static int
 ngx_http_lua_socket_tcp_receive(lua_State *L)
 {
     ngx_http_request_t                  *r;
     ngx_http_lua_socket_tcp_upstream_t  *u;
+    ngx_int_t                            rc;
+    ngx_http_lua_ctx_t                  *ctx;
     int                                  n;
     ngx_str_t                            pat;
     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) {
@@ -2366,27 +1883,119 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
         u->rest = 0;
     }
 
-    return ngx_http_lua_socket_tcp_receive_helper(r, u, L);
+    u->input_filter_ctx = u;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (u->bufs_in == NULL) {
+        u->bufs_in =
+            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
+                                            &ctx->free_recv_bufs,
+                                            u->conf->buffer_size);
+
+        if (u->bufs_in == NULL) {
+            return luaL_error(L, "no memory");
+        }
+
+        u->buf_in = u->bufs_in;
+        u->buffer = *u->buf_in->buf;
+    }
+
+    dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
+
+    if (u->raw_downstream || u->body_downstream) {
+        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
+    }
+
+    u->read_waiting = 0;
+    u->read_co_ctx = NULL;
+
+    rc = ngx_http_lua_socket_tcp_read(r, u);
+
+    if (rc == NGX_ERROR) {
+        dd("read failed: %d", (int) u->ft_type);
+        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
+        dd("tcp receive retval returned: %d", (int) rc);
+        return rc;
+    }
+
+    if (rc == NGX_OK) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket receive done in a single run");
+
+        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
+    }
+
+    /* rc == NGX_AGAIN */
+
+    u->read_event_handler = ngx_http_lua_socket_read_handler;
+
+    coctx = ctx->cur_co_ctx;
+
+    ngx_http_lua_cleanup_pending_operation(coctx);
+    coctx->cleanup = ngx_http_lua_coctx_cleanup;
+    coctx->data = u;
+
+    if (ctx->entered_content_phase) {
+        r->write_event_handler = ngx_http_lua_content_wev_handler;
+
+    } else {
+        r->write_event_handler = ngx_http_core_run_phases;
+    }
+
+    u->read_co_ctx = coctx;
+    u->read_waiting = 1;
+    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
+
+    dd("setting data to %p, coctx:%p", u, coctx);
+
+    if (u->raw_downstream || u->body_downstream) {
+        ctx->downstream = u;
+    }
+
+    return lua_yield(L, 0);
 }
 
 
 static ngx_int_t
 ngx_http_lua_socket_read_chunk(void *data, ssize_t bytes)
 {
-    ngx_int_t                                rc;
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+    ngx_buf_t                   *b;
+#if (NGX_DEBUG)
+    ngx_http_request_t          *r;
+
+    r = u->request;
+#endif
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua tcp socket read chunk %z", bytes);
 
-    rc = ngx_http_lua_read_bytes(&u->buffer, u->buf_in, &u->rest,
-                                 bytes, u->request->connection->log);
-    if (rc == NGX_ERROR) {
+    if (bytes == 0) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
         return NGX_ERROR;
     }
 
-    return rc;
+    b = &u->buffer;
+
+    if (bytes >= (ssize_t) u->rest) {
+
+        u->buf_in->buf->last += u->rest;
+        b->pos += u->rest;
+        u->rest = 0;
+
+        return NGX_OK;
+    }
+
+    /* bytes < u->rest */
+
+    u->buf_in->buf->last += bytes;
+    b->pos += bytes;
+    u->rest -= bytes;
+
+    return NGX_AGAIN;
 }
 
 
@@ -2395,10 +2004,26 @@ ngx_http_lua_socket_read_all(void *data, ssize_t bytes)
 {
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+    ngx_buf_t                   *b;
+#if (NGX_DEBUG)
+    ngx_http_request_t          *r;
+
+    r = u->request;
+#endif
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua tcp socket read all");
-    return ngx_http_lua_read_all(&u->buffer, u->buf_in, bytes,
-                                 u->request->connection->log);
+
+    if (bytes == 0) {
+        return NGX_OK;
+    }
+
+    b = &u->buffer;
+
+    u->buf_in->buf->last += bytes;
+    b->pos += bytes;
+
+    return NGX_AGAIN;
 }
 
 
@@ -2407,40 +2032,72 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
 {
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_int_t                    rc;
+    ngx_buf_t                   *b;
+    u_char                      *dst;
+    u_char                       c;
+#if (NGX_DEBUG)
+    u_char                      *begin;
+#endif
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
                    "lua tcp socket read line");
 
-    rc = ngx_http_lua_read_line(&u->buffer, u->buf_in, bytes,
-                                u->request->connection->log);
-    if (rc == NGX_ERROR) {
+    if (bytes == 0) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
         return NGX_ERROR;
     }
 
-    return rc;
-}
+    b = &u->buffer;
 
+#if (NGX_DEBUG)
+    begin = b->pos;
+#endif
 
-static ngx_int_t
-ngx_http_lua_socket_read_any(void *data, ssize_t bytes)
-{
-    ngx_http_lua_socket_tcp_upstream_t      *u = data;
+    dd("already read: %p: %.*s", u->buf_in,
+       (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
+       u->buf_in->buf->pos);
 
-    ngx_int_t                    rc;
+    dd("data read: %.*s", (int) bytes, b->pos);
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "lua tcp socket read any");
+    dst = u->buf_in->buf->last;
 
-    rc = ngx_http_lua_read_any(&u->buffer, u->buf_in, &u->rest, bytes,
-                               u->request->connection->log);
-    if (rc == NGX_ERROR) {
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
-        return NGX_ERROR;
+    while (bytes--) {
+
+        c = *b->pos++;
+
+        switch (c) {
+        case '\n':
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+                           "lua tcp socket read the final line part: \"%*s\"",
+                           b->pos - 1 - begin, begin);
+
+            u->buf_in->buf->last = dst;
+
+            dd("read a line: %p: %.*s", u->buf_in,
+               (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
+               u->buf_in->buf->pos);
+
+            return NGX_OK;
+
+        case '\r':
+            /* ignore it */
+            break;
+
+        default:
+            *dst++ = c;
+            break;
+        }
     }
 
-    return rc;
+#if (NGX_DEBUG)
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+                   "lua tcp socket read partial line data: %*s",
+                   dst - begin, begin);
+#endif
+
+    u->buf_in->buf->last = dst;
+
+    return NGX_AGAIN;
 }
 
 
@@ -3882,267 +3539,6 @@ ngx_http_lua_socket_tcp_finalize_write_part(ngx_http_request_t *r,
 }
 
 
-static void
-ngx_http_lua_socket_tcp_conn_op_timeout_handler(ngx_event_t *ev)
-{
-    ngx_http_lua_socket_tcp_upstream_t      *u;
-    ngx_http_lua_ctx_t                      *ctx;
-    ngx_connection_t                        *c;
-    ngx_http_request_t                      *r;
-    ngx_http_lua_co_ctx_t                   *coctx;
-    ngx_http_lua_loc_conf_t                 *llcf;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
-
-    conn_op_ctx = ev->data;
-    ngx_queue_remove(&conn_op_ctx->queue);
-
-    u = conn_op_ctx->u;
-    r = u->request;
-
-    coctx = u->write_co_ctx;
-    coctx->cleanup = NULL;
-    /* note that we store conn_op_ctx in coctx->data instead of u */
-    coctx->data = conn_op_ctx;
-    u->write_co_ctx = 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,
-                      "lua tcp socket queued connect timed out,"
-                      " when trying to connect to %V:%ud",
-                      &conn_op_ctx->host, conn_op_ctx->port);
-    }
-
-    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
-                          &conn_op_ctx->queue);
-    u->socket_pool->connections--;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    ctx->cur_co_ctx = coctx;
-
-    ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                        || coctx->co_ref >= 0));
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket waking up the current request");
-
-    u->write_prepare_retvals =
-        ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler;
-
-    c = r->connection;
-
-    if (ctx->entered_content_phase) {
-        (void) ngx_http_lua_socket_tcp_conn_op_resume(r);
-
-    } else {
-        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_op_resume;
-        ngx_http_core_run_phases(r);
-    }
-
-    ngx_http_run_posted_requests(c);
-}
-
-
-static int
-ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    lua_pushnil(L);
-    lua_pushliteral(L, "timeout");
-    return 2;
-}
-
-
-static void
-ngx_http_lua_socket_tcp_resume_conn_op(ngx_http_lua_socket_pool_t *spool)
-{
-    ngx_queue_t                             *q;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
-
-#if (NGX_DEBUG)
-    ngx_http_lua_assert(spool->connections >= 0);
-
-#else
-    if (spool->connections < 0) {
-        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                      "lua tcp socket connections count mismatched for "
-                      "connection pool \"%s\", connections: %i, size: %i",
-                      spool->key, spool->connections, spool->size);
-        spool->connections = 0;
-    }
-#endif
-
-    /* we manually destroy wait_connect_op before triggering connect
-     * operation resumption, so that there is no resumption happens when Nginx
-     * is exiting.
-     */
-    if (ngx_queue_empty(&spool->wait_connect_op)) {
-        return;
-    }
-
-    q = ngx_queue_head(&spool->wait_connect_op);
-    conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
-                                 queue);
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua tcp socket post connect operation resumption "
-                   "u: %p, ctx: %p for connection pool \"%s\", "
-                   "connections: %i",
-                   conn_op_ctx->u, conn_op_ctx, spool->key, spool->connections);
-
-    if (conn_op_ctx->event.timer_set) {
-        ngx_del_timer(&conn_op_ctx->event);
-    }
-
-    conn_op_ctx->event.handler =
-        ngx_http_lua_socket_tcp_conn_op_resume_handler;
-
-    ngx_post_event((&conn_op_ctx->event), &ngx_posted_events);
-}
-
-
-static void
-ngx_http_lua_socket_tcp_conn_op_ctx_cleanup(void *data)
-{
-    ngx_http_lua_socket_tcp_upstream_t     *u;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t  *conn_op_ctx = data;
-
-    u = conn_op_ctx->u;
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "cleanup lua tcp socket conn_op_ctx: \"%V\"",
-                   &u->request->uri);
-
-    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
-                          &conn_op_ctx->queue);
-}
-
-
-static void
-ngx_http_lua_socket_tcp_conn_op_resume_handler(ngx_event_t *ev)
-{
-    ngx_queue_t                             *q;
-    ngx_connection_t                        *c;
-    ngx_http_lua_ctx_t                      *ctx;
-    ngx_http_request_t                      *r;
-    ngx_http_cleanup_t                      *cln;
-    ngx_http_lua_co_ctx_t                   *coctx;
-    ngx_http_lua_socket_pool_t              *spool;
-    ngx_http_lua_socket_tcp_upstream_t      *u;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
-
-    conn_op_ctx = ev->data;
-    u = conn_op_ctx->u;
-    r = u->request;
-    spool = u->socket_pool;
-
-    if (ngx_queue_empty(&spool->wait_connect_op)) {
-#if (NGX_DEBUG)
-        ngx_http_lua_assert(!(spool->backlog >= 0
-                              && spool->connections > spool->size));
-
-#else
-        if (spool->backlog >= 0 && spool->connections > spool->size) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                          "lua tcp socket connections count mismatched for "
-                          "connection pool \"%s\", connections: %i, size: %i",
-                          spool->key, spool->connections, spool->size);
-            spool->connections = spool->size;
-        }
-#endif
-
-        return;
-    }
-
-    q = ngx_queue_head(&spool->wait_connect_op);
-    ngx_queue_remove(q);
-
-    coctx = u->write_co_ctx;
-    coctx->cleanup = NULL;
-    /* note that we store conn_op_ctx in coctx->data instead of u */
-    coctx->data = conn_op_ctx;
-    /* clear ngx_http_lua_tcp_queue_conn_op_cleanup */
-    u->write_co_ctx = NULL;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        ngx_queue_insert_head(&spool->cache_connect_op,
-                              &conn_op_ctx->queue);
-        return;
-    }
-
-    ctx->cur_co_ctx = coctx;
-
-    ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                        || coctx->co_ref >= 0));
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket waking up the current request");
-
-    u->write_prepare_retvals =
-        ngx_http_lua_socket_tcp_conn_op_resume_retval_handler;
-
-    c = r->connection;
-
-    if (ctx->entered_content_phase) {
-        (void) ngx_http_lua_socket_tcp_conn_op_resume(r);
-
-    } else {
-        cln = ngx_http_lua_cleanup_add(r, 0);
-        if (cln != NULL) {
-            cln->handler = ngx_http_lua_socket_tcp_conn_op_ctx_cleanup;
-            cln->data = conn_op_ctx;
-            conn_op_ctx->cleanup = &cln->handler;
-        }
-
-        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_op_resume;
-        ngx_http_core_run_phases(r);
-    }
-
-    ngx_http_run_posted_requests(c);
-}
-
-
-static int
-ngx_http_lua_socket_tcp_conn_op_resume_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    int                                      nret;
-    ngx_http_lua_ctx_t                      *ctx;
-    ngx_http_lua_co_ctx_t                   *coctx;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    coctx = ctx->cur_co_ctx;
-    dd("coctx: %p", coctx);
-    conn_op_ctx = coctx->data;
-    if (conn_op_ctx->cleanup != NULL) {
-        *conn_op_ctx->cleanup = NULL;
-        ngx_http_lua_cleanup_free(r, conn_op_ctx->cleanup);
-        conn_op_ctx->cleanup = NULL;
-    }
-
-    /* decrease pending connect operation counter */
-    u->socket_pool->connections--;
-
-    nret = ngx_http_lua_socket_tcp_connect_helper(L, u, r, ctx,
-                                                  conn_op_ctx->host.data,
-                                                  conn_op_ctx->host.len,
-                                                  conn_op_ctx->port, 1);
-    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
-                          &conn_op_ctx->queue);
-
-    return nret;
-}
-
-
 static void
 ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u)
@@ -4193,21 +3589,21 @@ ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
 
         ngx_http_lua_socket_tcp_close_connection(c);
         u->peer.connection = NULL;
-        u->conn_closed = 1;
+
+        if (!u->reused) {
+            return;
+        }
 
         spool = u->socket_pool;
         if (spool == NULL) {
             return;
         }
 
-        spool->connections--;
+        spool->active_connections--;
 
-        if (spool->connections == 0) {
+        if (spool->active_connections == 0) {
             ngx_http_lua_socket_free_pool(r->connection->log, spool);
-            return;
         }
-
-        ngx_http_lua_socket_tcp_resume_conn_op(spool);
     }
 }
 
@@ -4379,8 +3775,7 @@ ngx_http_lua_socket_tcp_receiveuntil(lua_State *L)
         return luaL_error(L, "no memory");
     }
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          pattern_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -5035,12 +4430,10 @@ ngx_http_lua_req_socket(lua_State *L)
     lua_createtable(L, 2 /* narr */, 3 /* nrec */); /* the object */
 
     if (raw) {
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              raw_req_socket_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
 
     } else {
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              req_socket_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
     }
 
     lua_rawget(L, LUA_REGISTRYINDEX);
@@ -5052,8 +4445,7 @@ ngx_http_lua_req_socket(lua_State *L)
     }
 
 #if 1
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          downstream_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 #endif
@@ -5180,18 +4572,20 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     ngx_http_lua_socket_tcp_upstream_t  *u;
     ngx_connection_t                    *c;
     ngx_http_lua_socket_pool_t          *spool;
+    size_t                               size, key_len;
     ngx_str_t                            key;
+    ngx_uint_t                           i;
     ngx_queue_t                         *q;
     ngx_peer_connection_t               *pc;
+    u_char                              *p;
     ngx_http_request_t                  *r;
     ngx_msec_t                           timeout;
-    ngx_int_t                            pool_size;
+    ngx_uint_t                           pool_size;
     int                                  n;
     ngx_int_t                            rc;
     ngx_buf_t                           *b;
-    const char                          *msg;
 
-    ngx_http_lua_socket_pool_item_t     *item;
+    ngx_http_lua_socket_pool_item_t     *items, *item;
 
     n = lua_gettop(L);
 
@@ -5202,6 +4596,17 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
 
     luaL_checktype(L, 1, LUA_TTABLE);
 
+    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);
+    if (key.data == NULL) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "key not found");
+        return 2;
+    }
+
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
     lua_pop(L, 1);
@@ -5212,7 +4617,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         return 2;
     }
 
-    /* stack: obj timeout? size? */
+    /* stack: obj cache key */
 
     pc = &u->peer;
     c = pc->connection;
@@ -5264,32 +4669,9 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         return 2;
     }
 
-    if (ngx_terminate || ngx_exiting) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "lua tcp socket set keepalive while process exiting, "
-                       "closing connection %p", c);
-
-        ngx_http_lua_socket_tcp_finalize(r, u);
-        lua_pushinteger(L, 1);
-        return 1;
-    }
-
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket set keepalive: saving connection %p", c);
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
-    lua_rawget(L, LUA_REGISTRYINDEX);
-
-    /* stack: obj timeout? size? pools */
-
-    lua_rawgeti(L, 1, SOCKET_KEY_INDEX);
-    key.data = (u_char *) lua_tolstring(L, -1, &key.len);
-    if (key.data == NULL) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key not found");
-        return 2;
-    }
-
     dd("saving connection to key %s", lua_tostring(L, -1));
 
     lua_pushvalue(L, -1);
@@ -5297,7 +4679,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     spool = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    /* stack: obj timeout? size? pools cache_key */
+    /* stack: obj timeout? size? cache key */
 
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
@@ -5311,49 +4693,82 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
             pool_size = llcf->pool_size;
         }
 
-        if (pool_size <= 0) {
-            msg = lua_pushfstring(L, "bad \"pool_size\" option value: %i",
-                                  pool_size);
-            return luaL_argerror(L, n, msg);
+        if (pool_size == 0) {
+            lua_pushnil(L);
+            lua_pushliteral(L, "zero pool size");
+            return 2;
         }
 
-        ngx_http_lua_socket_tcp_create_socket_pool(L, r, key, pool_size, -1,
-                                                   &spool);
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket connection pool size: %ui", pool_size);
+
+        key_len = ngx_align(key.len + 1, sizeof(void *));
+
+        size = sizeof(ngx_http_lua_socket_pool_t) + key_len - 1
+               + sizeof(ngx_http_lua_socket_pool_item_t)
+               * pool_size;
+
+        spool = lua_newuserdata(L, size);
+        if (spool == NULL) {
+            return luaL_error(L, "no memory");
+        }
+
+        lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
+        lua_rawget(L, LUA_REGISTRYINDEX);
+        lua_setmetatable(L, -2);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                       "lua tcp socket keepalive create connection pool for key"
+                       " \"%s\"", lua_tostring(L, -2));
+
+        lua_rawset(L, -3);
+
+        spool->active_connections = 0;
+        spool->lua_vm = ngx_http_lua_get_lua_vm(r, NULL);
+
+        ngx_queue_init(&spool->cache);
+        ngx_queue_init(&spool->free);
+
+        p = ngx_copy(spool->key, key.data, key.len);
+        *p++ = '\0';
+
+        items = (ngx_http_lua_socket_pool_item_t *) (spool->key + key_len);
+
+        dd("items: %p", items);
+
+        ngx_http_lua_assert((void *) items == ngx_align_ptr(items,
+                                                            sizeof(void *)));
+
+        for (i = 0; i < pool_size; i++) {
+            ngx_queue_insert_head(&spool->free, &items[i].queue);
+            items[i].socket_pool = spool;
+        }
     }
 
     if (ngx_queue_empty(&spool->free)) {
 
         q = ngx_queue_last(&spool->cache);
         ngx_queue_remove(q);
+        spool->active_connections--;
 
         item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
 
         ngx_http_lua_socket_tcp_close_connection(item->connection);
 
-        /* only decrease the counter for connections which were counted */
-        if (u->socket_pool != NULL) {
-            u->socket_pool->connections--;
-        }
-
     } else {
         q = ngx_queue_head(&spool->free);
         ngx_queue_remove(q);
 
         item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
-
-        /* we should always increase connections after getting connected,
-         * and decrease connections after getting closed.
-         * however, we don't create connection pool in previous connect method.
-         * so we increase connections here for backward compatibility.
-         */
-        if (u->socket_pool == NULL) {
-            spool->connections++;
-        }
     }
 
     item->connection = c;
     ngx_queue_insert_head(&spool->cache, q);
 
+    if (!u->reused) {
+        spool->active_connections++;
+    }
+
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket clear current socket connection");
 
@@ -5422,33 +4837,48 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     ngx_http_lua_socket_tcp_finalize(r, u);
 #endif
 
-    /* since we set u->peer->connection to NULL previously, the connect
-     * operation won't be resumed in the ngx_http_lua_socket_tcp_finalize.
-     * Therefore we need to resume it here.
-     */
-    ngx_http_lua_socket_tcp_resume_conn_op(spool);
-
     lua_pushinteger(L, 1);
     return 1;
 }
 
 
 static ngx_int_t
-ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
+ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
+    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;
     ngx_http_cleanup_t                  *cln;
     ngx_queue_t                         *q;
+    int                                  top;
     ngx_peer_connection_t               *pc;
     ngx_connection_t                    *c;
 
+    top = lua_gettop(L);
+
+    if (key_index < 0) {
+        key_index = top + key_index + 1;
+    }
+
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua tcp socket pool get keepalive peer");
 
     pc = &u->peer;
-    spool = u->socket_pool;
+
+    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 tcp socket keepalive connection pool not found");
+        lua_settop(L, top);
+        return NGX_DECLINED;
+    }
+
+    u->socket_pool = spool;
 
     if (!ngx_queue_empty(&spool->cache)) {
         q = ngx_queue_head(&spool->cache);
@@ -5493,6 +4923,7 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
             cln = ngx_http_lua_cleanup_add(r, 0);
             if (cln == NULL) {
                 u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
+                lua_settop(L, top);
                 return NGX_ERROR;
             }
 
@@ -5501,12 +4932,16 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
             u->cleanup = &cln->handler;
         }
 
+        lua_settop(L, top);
+
         return NGX_OK;
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket keepalive: connection pool empty");
 
+    lua_settop(L, top);
+
     return NGX_DECLINED;
 }
 
@@ -5578,15 +5013,13 @@ close:
 
     ngx_queue_remove(&item->queue);
     ngx_queue_insert_head(&spool->free, &item->queue);
-    spool->connections--;
+    spool->active_connections--;
 
-    dd("keepalive: connections: %u", (unsigned) spool->connections);
+    dd("keepalive: active connections: %u",
+       (unsigned) spool->active_connections);
 
-    if (spool->connections == 0) {
+    if (spool->active_connections == 0) {
         ngx_http_lua_socket_free_pool(ev->log, spool);
-
-    } else {
-        ngx_http_lua_socket_tcp_resume_conn_op(spool);
     }
 
     return NGX_DECLINED;
@@ -5604,7 +5037,7 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 
     L = spool->lua_vm;
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushstring(L, (char *) spool->key);
     lua_pushnil(L);
@@ -5616,10 +5049,9 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 static void
 ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
 {
-    ngx_queue_t                             *q;
-    ngx_connection_t                        *c;
-    ngx_http_lua_socket_pool_item_t         *item;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+    ngx_queue_t                         *q;
+    ngx_connection_t                    *c;
+    ngx_http_lua_socket_pool_item_t     *item;
 
     while (!ngx_queue_empty(&spool->cache)) {
         q = ngx_queue_head(&spool->cache);
@@ -5633,29 +5065,7 @@ ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
         ngx_queue_insert_head(&spool->free, q);
     }
 
-    while (!ngx_queue_empty(&spool->cache_connect_op)) {
-        q = ngx_queue_head(&spool->cache_connect_op);
-        ngx_queue_remove(q);
-        conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
-                                     queue);
-        ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx);
-    }
-
-    while (!ngx_queue_empty(&spool->wait_connect_op)) {
-        q = ngx_queue_head(&spool->wait_connect_op);
-        ngx_queue_remove(q);
-        conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
-                                     queue);
-
-        if (conn_op_ctx->event.timer_set) {
-            ngx_del_timer(&conn_op_ctx->event);
-        }
-
-        ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx);
-    }
-
-    /* spool->connections will be decreased down to zero in
-     * ngx_http_lua_socket_tcp_finalize */
+    spool->active_connections = 0;
 }
 
 
@@ -5909,13 +5319,6 @@ static ngx_int_t ngx_http_lua_socket_insert_buffer(ngx_http_request_t *r,
 }
 
 
-static ngx_int_t
-ngx_http_lua_socket_tcp_conn_op_resume(ngx_http_request_t *r)
-{
-    return ngx_http_lua_socket_tcp_resume_helper(r, SOCKET_OP_RESUME_CONN);
-}
-
-
 static ngx_int_t
 ngx_http_lua_socket_tcp_conn_resume(ngx_http_request_t *r)
 {
@@ -5940,14 +5343,13 @@ ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 {
-    int                                    nret;
-    lua_State                             *vm;
-    ngx_int_t                              rc;
-    ngx_uint_t                             nreqs;
-    ngx_connection_t                      *c;
-    ngx_http_lua_ctx_t                    *ctx;
-    ngx_http_lua_co_ctx_t                 *coctx;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t *conn_op_ctx;
+    int                          nret;
+    lua_State                   *vm;
+    ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
+    ngx_connection_t            *c;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx;
 
     ngx_http_lua_socket_tcp_retval_handler  prepare_retvals;
 
@@ -5967,22 +5369,15 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 
     dd("coctx: %p", coctx);
 
+    u = coctx->data;
+
     switch (socket_op) {
-
-    case SOCKET_OP_RESUME_CONN:
-        conn_op_ctx = coctx->data;
-        u = conn_op_ctx->u;
-        prepare_retvals = u->write_prepare_retvals;
-        break;
-
     case SOCKET_OP_CONNECT:
     case SOCKET_OP_WRITE:
-        u = coctx->data;
         prepare_retvals = u->write_prepare_retvals;
         break;
 
     case SOCKET_OP_READ:
-        u = coctx->data;
         prepare_retvals = u->read_prepare_retvals;
         break;
 
@@ -5996,15 +5391,6 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
                    "u:%p", prepare_retvals, u);
 
     nret = prepare_retvals(r, u, ctx->cur_co_ctx->co);
-    if (socket_op == SOCKET_OP_CONNECT
-        && nret > 1
-        && !u->conn_closed
-        && u->socket_pool != NULL)
-    {
-        u->socket_pool->connections--;
-        ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
-    }
-
     if (nret == NGX_AGAIN) {
         return NGX_DONE;
     }
@@ -6036,36 +5422,6 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 }
 
 
-static void
-ngx_http_lua_tcp_queue_conn_op_cleanup(void *data)
-{
-    ngx_http_lua_co_ctx_t                  *coctx = data;
-    ngx_http_lua_socket_tcp_upstream_t     *u;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t  *conn_op_ctx;
-
-    conn_op_ctx = coctx->data;
-    u = conn_op_ctx->u;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua tcp socket abort queueing, conn_op_ctx: %p, u: %p",
-                   conn_op_ctx, u);
-
-    if (conn_op_ctx->event.posted) {
-        ngx_delete_posted_event(&conn_op_ctx->event);
-
-    } else if (conn_op_ctx->event.timer_set) {
-        ngx_del_timer(&conn_op_ctx->event);
-    }
-
-    ngx_queue_remove(&conn_op_ctx->queue);
-    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
-                          &conn_op_ctx->queue);
-
-    u->socket_pool->connections--;
-    ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
-}
-
-
 static void
 ngx_http_lua_tcp_resolve_cleanup(void *data)
 {
@@ -6081,11 +5437,6 @@ ngx_http_lua_tcp_resolve_cleanup(void *data)
         return;
     }
 
-    if (u->socket_pool != NULL) {
-        u->socket_pool->connections--;
-        ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
-    }
-
     rctx = u->resolved->ctx;
     if (rctx == NULL) {
         return;
@@ -6145,8 +5496,7 @@ ngx_http_lua_cleanup_conn_pools(lua_State *L)
 {
     ngx_http_lua_socket_pool_t          *spool;
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          socket_pool_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
     lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
     lua_pushnil(L);  /* first key */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
index 091e437..dbdee41 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
@@ -35,39 +35,17 @@ 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 {
-    ngx_event_t                         event;
-    ngx_queue_t                         queue;
-    ngx_str_t                           host;
-    ngx_http_cleanup_pt                *cleanup;
-    ngx_http_lua_socket_tcp_upstream_t *u;
-    in_port_t                           port;
-} ngx_http_lua_socket_tcp_conn_op_ctx_t;
-
-
-#define ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx)                \
-    ngx_free(conn_op_ctx->host.data);                                        \
-    ngx_free(conn_op_ctx)
-
-
 typedef struct {
     lua_State                         *lua_vm;
 
-    ngx_int_t                          size;
-    ngx_queue_t                        cache_connect_op;
-    ngx_queue_t                        wait_connect_op;
-
-    /* connections == active connections + pending connect operations,
-     * while active connections == out-of-pool reused connections
-     *                             + in-pool connections */
-    ngx_int_t                          connections;
+    /* active connections == out-of-pool reused connections
+     *                       + in-pool connections */
+    ngx_uint_t                         active_connections;
 
     /* queues of ngx_http_lua_socket_pool_item_t: */
     ngx_queue_t                        cache;
     ngx_queue_t                        free;
 
-    ngx_int_t                          backlog;
-
     u_char                             key[1];
 
 } ngx_http_lua_socket_pool_t;
@@ -126,7 +104,6 @@ struct ngx_http_lua_socket_tcp_upstream_s {
     unsigned                         raw_downstream:1;
     unsigned                         read_closed:1;
     unsigned                         write_closed:1;
-    unsigned                         conn_closed:1;
 #if (NGX_HTTP_SSL)
     unsigned                         ssl_verify:1;
     unsigned                         ssl_session_reuse:1;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
index cbc32d6..8927f41 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
@@ -81,8 +81,7 @@ ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
     lua_setfield(L, -2, "udp"); /* ngx socket */
 
     /* udp socket object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          socket_udp_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
     lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_udp_setpeername);
@@ -106,8 +105,7 @@ ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* udp socket object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          udp_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_udp_upstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -146,8 +144,7 @@ ngx_http_lua_socket_udp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     lua_createtable(L, 3 /* narr */, 1 /* nrec */);
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          socket_udp_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -266,8 +263,7 @@ ngx_http_lua_socket_udp_setpeername(lua_State *L)
         }
 
 #if 1
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              udp_udata_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
 #endif
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
index 622d0a5..453a5c7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
@@ -498,11 +498,9 @@ ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /* save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
index 303efb4..0b88a87 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
@@ -505,11 +505,9 @@ ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /* save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
index a02f729..7609c39 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
@@ -380,8 +380,6 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     /* init nginx context in Lua VM */
     ngx_http_lua_set_req(L, r);
-
-#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ make new env inheriting main thread's globals table */
@@ -392,7 +390,6 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif
 
     lua_pushcfunction(L, ngx_http_lua_traceback);
     lua_insert(L, 1);  /* put it under chunk and args */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_string.c b/debian/modules/http-lua/src/ngx_http_lua_string.c
index bdadeb4..239b232 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_string.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_string.c
@@ -762,20 +762,6 @@ ngx_http_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst)
     ngx_http_lua_escape_uri(dst, (u_char *) src, len, NGX_ESCAPE_URI_COMPONENT);
 }
 
-
-void
-ngx_http_lua_ffi_str_replace_char(u_char *buf, size_t len, const u_char find,
-    const u_char replace)
-{
-    while (len) {
-        if (*buf == find) {
-            *buf = replace;
-        }
-
-        buf++;
-        len--;
-    }
-}
 #endif
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
index f312b65..826a43c 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
@@ -1031,14 +1031,6 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
     dd("pr_coctx status: %d", (int) pr_coctx->sr_statuses[ctx->index]);
 
     /* copy subrequest response headers */
-    if (ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r, ctx);
-        if (rc != NGX_OK) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "failed to set default content type: %i", rc);
-            return NGX_ERROR;
-        }
-    }
 
     pr_coctx->sr_headers[ctx->index] = &r->headers_out;
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_timer.c b/debian/modules/http-lua/src/ngx_http_lua_timer.c
index e92c211..596b2f7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_timer.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_timer.c
@@ -220,7 +220,6 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
 
     ngx_http_lua_probe_user_coroutine_create(r, L, co);
 
-#ifndef OPENRESTY_LUAJIT
     lua_createtable(co, 0, 0);  /* the new globals table */
 
     /* co stack: global_tb */
@@ -233,7 +232,6 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
     /* co stack: global_tb */
 
     ngx_http_lua_set_globals_table(co);
-#endif
 
     /* co stack: <empty> */
 
@@ -253,15 +251,12 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
     /* L stack: time func [args] thread */
     /* co stack: func */
 
-#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /* co stack: func */
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     /* L stack: time func [args] thread coroutines */
@@ -350,9 +345,6 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
 
     ngx_add_timer(ev, delay);
 
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "created timer (co: %p delay: %M ms)", tctx->co, delay);
-
     lua_pushinteger(L, 1);
     return 1;
 
@@ -366,8 +358,7 @@ nomem:
         ngx_free(ev);
     }
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     luaL_unref(L, -1, co_ref);
 
@@ -396,7 +387,6 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
 
     co = lua_newthread(vm);
 
-#ifndef OPENRESTY_LUAJIT
     lua_createtable(co, 0, 0);  /* the new globals table */
 
     /* co stack: global_tb */
@@ -409,7 +399,6 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
     /* co stack: global_tb */
 
     ngx_http_lua_set_globals_table(co);
-#endif
 
     /* co stack: <empty> */
 
@@ -429,15 +418,12 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
     /* L stack: func [args] thread */
     /* co stack: func */
 
-#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /* co stack: func */
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     /* L stack: func [args] thread coroutines */
@@ -512,10 +498,6 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
 
     ngx_add_timer(ev, tctx->delay);
 
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "created next timer (co: %p delay: %M ms)", tctx->co,
-                   tctx->delay);
-
     return NGX_OK;
 
 nomem:
@@ -530,8 +512,7 @@ nomem:
 
     /* L stack: func [args] */
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     luaL_unref(L, -1, co_ref);
 
@@ -587,9 +568,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     c = ngx_http_lua_create_fake_connection(tctx.pool);
     if (c == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "failed to create fake connection to run timer (co: %p)",
-                      tctx.co);
         goto failed;
     }
 
@@ -601,9 +579,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     r = ngx_http_lua_create_fake_request(c);
     if (r == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "failed to create fake request to run timer (co: %p)",
-                      tctx.co);
         goto failed;
     }
 
@@ -639,8 +614,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     ctx = ngx_http_lua_create_ctx(r);
     if (ctx == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "failed to create ctx to run timer (co: %p)", tctx.co);
         goto failed;
     }
 
@@ -649,9 +622,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
         pcln = ngx_pool_cleanup_add(r->pool, 0);
         if (pcln == NULL) {
-            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                          "failed to add vm cleanup to run timer (co: %p)",
-                          tctx.co);
             goto failed;
         }
 
@@ -665,9 +635,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     cln = ngx_http_cleanup_add(r, 0);
     if (cln == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "failed to add request cleanup to run timer (co: %p)",
-                      tctx.co);
         goto failed;
     }
 
@@ -725,8 +692,7 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 failed:
 
     if (tctx.co_ref && tctx.co) {
-        lua_pushlightuserdata(tctx.co, ngx_http_lua_lightudata_mask(
-                              coroutines_key));
+        lua_pushlightuserdata(tctx.co, &ngx_http_lua_coroutines_key);
         lua_rawget(tctx.co, LUA_REGISTRYINDEX);
         luaL_unref(tctx.co, -1, tctx.co_ref);
         lua_settop(tctx.co, 0);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_uthread.c b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
index 43517a0..8195ec0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_uthread.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
@@ -70,8 +70,7 @@ ngx_http_lua_uthread_spawn(lua_State *L)
 
     /* anchor the newly created coroutine into the Lua registry */
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushvalue(L, -2);
     coctx->co_ref = luaL_ref(L, -2);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.c b/debian/modules/http-lua/src/ngx_http_lua_util.c
index c12262e..f7a537e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.c
@@ -70,25 +70,6 @@
 #endif
 
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-#define NGX_HTTP_LUA_SA_RESTART_SIGS {                                       \
-    ngx_signal_value(NGX_RECONFIGURE_SIGNAL),                                \
-    ngx_signal_value(NGX_REOPEN_SIGNAL),                                     \
-    ngx_signal_value(NGX_NOACCEPT_SIGNAL),                                   \
-    ngx_signal_value(NGX_TERMINATE_SIGNAL),                                  \
-    ngx_signal_value(NGX_SHUTDOWN_SIGNAL),                                   \
-    ngx_signal_value(NGX_CHANGEBIN_SIGNAL),                                  \
-    SIGALRM,                                                                 \
-    SIGINT,                                                                  \
-    SIGIO,                                                                   \
-    SIGCHLD,                                                                 \
-    SIGSYS,                                                                  \
-    SIGPIPE,                                                                 \
-    0                                                                        \
-};
-#endif
-
-
 char ngx_http_lua_code_cache_key;
 char ngx_http_lua_regex_cache_key;
 char ngx_http_lua_socket_pool_key;
@@ -147,13 +128,6 @@ static int ngx_http_lua_get_raw_phase_context(lua_State *L);
 #define LUA_PATH_SEP ";"
 #endif
 
-
-#if !defined(LUA_DEFAULT_PATH) && (NGX_DEBUG)
-#define LUA_DEFAULT_PATH "../lua-resty-core/lib/?.lua;"                      \
-                         "../lua-resty-lrucache/lib/?.lua"
-#endif
-
-
 #define AUX_MARK "\1"
 
 
@@ -197,7 +171,6 @@ ngx_http_lua_set_path(ngx_cycle_t *cycle, lua_State *L, int tab_idx,
 }
 
 
-#ifndef OPENRESTY_LUAJIT
 /**
  * Create new table and set _G field to itself.
  *
@@ -212,7 +185,6 @@ ngx_http_lua_create_new_globals_table(lua_State *L, int narr, int nrec)
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "_G");
 }
-#endif /* OPENRESTY_LUAJIT */
 
 
 static lua_State *
@@ -341,13 +313,11 @@ ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
 
     base = lua_gettop(L);
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     co = lua_newthread(L);
 
-#ifndef OPENRESTY_LUAJIT
     /*  {{{ inherit coroutine's globals to main thread's globals table
      *  for print() function will try to find tostring() in current
      *  globals table.
@@ -362,7 +332,6 @@ ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
 
     ngx_http_lua_set_globals_table(co);
     /*  }}} */
-#endif /* OPENRESTY_LUAJIT */
 
     *ref = luaL_ref(L, -2);
 
@@ -387,8 +356,7 @@ ngx_http_lua_del_thread(ngx_http_request_t *r, lua_State *L,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua deleting light thread");
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
@@ -440,9 +408,7 @@ ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
             r->headers_out.status = NGX_HTTP_OK;
         }
 
-        if (!ctx->mime_set
-            && ngx_http_lua_set_content_type(r, ctx) != NGX_OK)
-        {
+        if (!ctx->headers_set && ngx_http_lua_set_content_type(r) != NGX_OK) {
             return NGX_ERROR;
         }
 
@@ -691,8 +657,7 @@ ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log)
 
     /* {{{ register a table to anchor lua coroutines reliably:
      * {([int]ref) = [cort]} */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_createtable(L, 0, 32 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
@@ -703,23 +668,20 @@ ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log)
     lua_rawset(L, LUA_REGISTRYINDEX);
 
     /* create the registry entry for the Lua socket connection pool table */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          socket_pool_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
     lua_createtable(L, 0, 8 /* nrec */);
     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_lightudata_mask(
-                          regex_cache_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
     lua_createtable(L, 0, 16 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
 #endif
 
     /* {{{ register table to cache user code:
      * { [(string)cache_key] = <code closure> } */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          code_cache_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
     lua_createtable(L, 0, 8 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
@@ -733,6 +695,9 @@ ngx_http_lua_init_globals(lua_State *L, ngx_cycle_t *cycle,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
                    "lua initializing lua globals");
 
+    lua_pushlightuserdata(L, cycle);
+    lua_setglobal(L, "__ngx_cycle");
+
 #if defined(NDK) && NDK
     ngx_http_lua_inject_ndk_api(L);
 #endif /* defined(NDK) && NDK */
@@ -791,52 +756,6 @@ ngx_http_lua_inject_ngx_api(lua_State *L, ngx_http_lua_main_conf_t *lmcf,
     lua_setglobal(L, "ngx");
 
     ngx_http_lua_inject_coroutine_api(log, L);
-
-#ifdef OPENRESTY_LUAJIT
-    {
-        int         rc;
-
-        const char buf[] =
-            "local ngx_log = ngx.log\n"
-            "local ngx_WARN = ngx.WARN\n"
-            "local tostring = tostring\n"
-            "local ngx_get_phase = ngx.get_phase\n"
-            "local traceback = require 'debug'.traceback\n"
-            "local function newindex(table, key, value)\n"
-                "rawset(table, key, value)\n"
-                "local phase = ngx_get_phase()\n"
-                "if phase == 'init_worker' or phase == 'init' then\n"
-                    "return\n"
-                "end\n"
-                "ngx_log(ngx_WARN, 'writing a global lua variable "
-                         "(\\'', tostring(key), '\\') which may lead to "
-                         "race conditions between concurrent requests, so "
-                         "prefer the use of \\'local\\' variables', "
-                         "traceback('', 2))\n"
-            "end\n"
-            "setmetatable(_G, { __newindex = newindex })\n"
-            ;
-
-        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "=_G write guard");
-
-        if (rc != 0) {
-            ngx_log_error(NGX_LOG_ERR, log, 0,
-                          "failed to load Lua code (%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 Lua code (%i): %s",
-                          rc, lua_tostring(L, -1));
-            lua_pop(L, 1);
-        }
-    }
-#endif
 }
 
 
@@ -3035,12 +2954,12 @@ ngx_http_lua_param_get(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_BODY_FILTER);
 
     if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SET)) {
-        return ngx_http_lua_setby_param_get(L, r);
+        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, r);
+    return ngx_http_lua_body_filter_param_get(L);
 }
 
 
@@ -3237,8 +3156,7 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
 
         ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              coroutines_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         inited = 1;
 
@@ -3276,8 +3194,7 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
                 ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
                 if (!inited) {
-                    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                                          coroutines_key));
+                    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
                     lua_rawget(L, LUA_REGISTRYINDEX);
                     inited = 1;
                 }
@@ -3306,8 +3223,7 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
         ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
         if (!inited) {
-            lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                                  coroutines_key));
+            lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
             lua_rawget(L, LUA_REGISTRYINDEX);
             inited = 1;
         }
@@ -3820,7 +3736,6 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
     ngx_pool_t *pool, ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log,
     ngx_pool_cleanup_t **pcln)
 {
-    int                              rc;
     lua_State                       *L;
     ngx_uint_t                       i;
     ngx_pool_cleanup_t              *cln;
@@ -3863,11 +3778,6 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
         *pcln = cln;
     }
 
-#ifdef OPENRESTY_LUAJIT
-    /* load FFI library first since cdata needs it */
-    luaopen_ffi(L);
-#endif
-
     if (lmcf->preload_hooks) {
 
         /* register the 3rd-party module's preload hooks */
@@ -3888,21 +3798,6 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
         lua_pop(L, 2);
     }
 
-    if (lmcf->load_resty_core) {
-        lua_getglobal(L, "require");
-        lua_pushstring(L, "resty.core");
-
-        rc = lua_pcall(L, 1, 1, 0);
-        if (rc != 0) {
-            ngx_log_error(NGX_LOG_ERR, log, 0,
-                          "lua_load_resty_core failed to load the resty.core "
-                          "module from https://github.com/openresty/lua-resty"
-                          "-core; ensure you are using an OpenResty release "
-                          "from https://openresty.org/en/download.html "
-                          "(rc: %i, reason: %s)", rc, lua_tostring(L, -1));
-        }
-    }
-
     return L;
 }
 
@@ -4146,12 +4041,7 @@ ngx_http_lua_get_raw_phase_context(lua_State *L)
     ngx_http_request_t      *r;
     ngx_http_lua_ctx_t      *ctx;
 
-#ifdef OPENRESTY_LUAJIT
-    r = lua_getexdata(L);
-#else
     r = lua_touserdata(L, 1);
-#endif
-
     if (r == NULL) {
         return 0;
     }
@@ -4239,32 +4129,4 @@ ngx_http_lua_cleanup_free(ngx_http_request_t *r, ngx_http_cleanup_pt *cleanup)
 }
 
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-void
-ngx_http_lua_set_sa_restart(ngx_log_t *log)
-{
-    int                    *signo;
-    int                     sigs[] = NGX_HTTP_LUA_SA_RESTART_SIGS;
-    struct sigaction        act;
-
-    for (signo = sigs; *signo != 0; signo++) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                       "setting SA_RESTART for signal %d", *signo);
-
-        if (sigaction(*signo, NULL, &act) != 0) {
-            ngx_log_error(NGX_LOG_WARN, log, ngx_errno, "failed to get "
-                          "sigaction for signal %d", *signo);
-        }
-
-        act.sa_flags |= SA_RESTART;
-
-        if (sigaction(*signo, &act, NULL) != 0) {
-            ngx_log_error(NGX_LOG_WARN, log, ngx_errno, "failed to set "
-                          "sigaction for signal %d", *signo);
-        }
-    }
-}
-#endif
-
-
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.h b/debian/modules/http-lua/src/ngx_http_lua_util.h
index f08f481..7dcc6f7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.h
@@ -9,11 +9,6 @@
 #define _NGX_HTTP_LUA_UTIL_H_INCLUDED_
 
 
-#ifdef DDEBUG
-#include "ddebug.h"
-#endif
-
-
 #include "ngx_http_lua_common.h"
 #include "ngx_http_lua_api.h"
 
@@ -193,9 +188,7 @@ ngx_int_t ngx_http_lua_open_and_stat_file(u_char *name,
 ngx_chain_t *ngx_http_lua_chain_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
     ngx_chain_t **free, size_t len);
 
-#ifndef OPENRESTY_LUAJIT
 void ngx_http_lua_create_new_globals_table(lua_State *L, int narr, int nrec);
-#endif
 
 int ngx_http_lua_traceback(lua_State *L);
 
@@ -250,9 +243,6 @@ ngx_http_cleanup_t *ngx_http_lua_cleanup_add(ngx_http_request_t *r,
 void ngx_http_lua_cleanup_free(ngx_http_request_t *r,
     ngx_http_cleanup_pt *cleanup);
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-void ngx_http_lua_set_sa_restart(ngx_log_t *log);
-#endif
 
 #define ngx_http_lua_check_if_abortable(L, ctx)                              \
     if ((ctx)->no_abort) {                                                   \
@@ -292,9 +282,7 @@ ngx_http_lua_create_ctx(ngx_http_request_t *r)
     if (!llcf->enable_code_cache && r->connection->fd != (ngx_socket_t) -1) {
         lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
-#ifdef DDEBUG
         dd("lmcf: %p", lmcf);
-#endif
 
         L = ngx_http_lua_init_vm(lmcf->lua, lmcf->cycle, r->pool, lmcf,
                                  r->connection->log, &cln);
@@ -335,11 +323,7 @@ ngx_http_lua_get_lua_vm(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
     }
 
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-#ifdef DDEBUG
     dd("lmcf->lua: %p", lmcf->lua);
-#endif
-
     return lmcf->lua;
 }
 
@@ -350,9 +334,6 @@ ngx_http_lua_get_lua_vm(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 static ngx_inline ngx_http_request_t *
 ngx_http_lua_get_req(lua_State *L)
 {
-#ifdef OPENRESTY_LUAJIT
-    return lua_getexdata(L);
-#else
     ngx_http_request_t    *r;
 
     lua_getglobal(L, ngx_http_lua_req_key);
@@ -360,19 +341,14 @@ ngx_http_lua_get_req(lua_State *L)
     lua_pop(L, 1);
 
     return r;
-#endif
 }
 
 
 static ngx_inline void
 ngx_http_lua_set_req(lua_State *L, ngx_http_request_t *r)
 {
-#ifdef OPENRESTY_LUAJIT
-    lua_setexdata(L, (void *) r);
-#else
     lua_pushlightuserdata(L, r);
     lua_setglobal(L, ngx_http_lua_req_key);
-#endif
 }
 
 
@@ -411,12 +387,10 @@ ngx_http_lua_hash_str(u_char *src, size_t n)
 
 
 static ngx_inline ngx_int_t
-ngx_http_lua_set_content_type(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
+ngx_http_lua_set_content_type(ngx_http_request_t *r)
 {
     ngx_http_lua_loc_conf_t     *llcf;
 
-    ctx->mime_set = 1;
-
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->use_default_type
         && r->headers_out.status != NGX_HTTP_NOT_MODIFIED)
diff --git a/debian/modules/http-lua/src/ngx_http_lua_worker.c b/debian/modules/http-lua/src/ngx_http_lua_worker.c
index 33cfa11..461509b 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_worker.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_worker.c
@@ -153,8 +153,6 @@ ngx_http_lua_ffi_master_pid(void)
 int
 ngx_http_lua_ffi_get_process_type(void)
 {
-    ngx_core_conf_t  *ccf;
-
 #if defined(HAVE_PRIVILEGED_PROCESS_PATCH) && !NGX_WIN32
     if (ngx_process == NGX_PROCESS_HELPER) {
         if (ngx_is_privileged_agent) {
@@ -163,15 +161,6 @@ ngx_http_lua_ffi_get_process_type(void)
     }
 #endif
 
-    if (ngx_process == NGX_PROCESS_SINGLE) {
-        ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                               ngx_core_module);
-
-        if (ccf->master) {
-            return NGX_PROCESS_MASTER;
-        }
-    }
-
     return ngx_process;
 }
 
diff --git a/debian/modules/http-lua/t/000--init.t b/debian/modules/http-lua/t/000--init.t
index 5865755..dbe2c33 100644
--- a/debian/modules/http-lua/t/000--init.t
+++ b/debian/modules/http-lua/t/000--init.t
@@ -10,6 +10,11 @@ $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
 
 our $http_config = <<'_EOC_';
+    upstream database {
+        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+
     lua_package_path "../lua-resty-mysql/lib/?.lua;;";
 _EOC_
 
diff --git a/debian/modules/http-lua/t/001-set.t b/debian/modules/http-lua/t/001-set.t
index 9e8ee7b..ba8f22c 100644
--- a/debian/modules/http-lua/t/001-set.t
+++ b/debian/modules/http-lua/t/001-set.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 5);
+plan tests => repeat_each() * (blocks() * 3 + 4);
 
 #log_level("warn");
 no_long_string();
@@ -46,7 +46,7 @@ helloworld
 === TEST 3: internal only
 --- config
     location /lua {
-        set_by_lua $res "local function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(10)";
+        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(10)";
         echo $res;
     }
 --- request
@@ -76,7 +76,7 @@ GET /lua?a=1&b=2
 === TEST 5: fib by arg
 --- config
     location /fib {
-        set_by_lua $res "local function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(tonumber(ngx.arg[1]))" $arg_n;
+        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(tonumber(ngx.arg[1]))" $arg_n;
         echo $res;
     }
 --- request
@@ -592,30 +592,25 @@ failed to run set_by_lua*: unknown reason
 
 
 
-=== TEST 37: globals are shared in all requests.
+=== TEST 37: globals get cleared for every single request
 --- config
     location /lua {
-        set_by_lua_block $res {
+        set_by_lua $res '
             if not foo then
                 foo = 1
             else
-                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             return foo
-        }
+        ';
         echo $res;
     }
 --- request
 GET /lua
---- response_body_like chomp
-\A[12]
-\z
+--- response_body
+1
 --- no_error_log
 [error]
---- grep_error_log eval: qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
---- grep_error_log_out eval
-["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
 
 
 
@@ -760,8 +755,6 @@ GET /lua?name=jim
 --- config
     location /t {
         set_by_lua $a '
-            local bar
-            local foo
             function foo()
                 bar()
             end
diff --git a/debian/modules/http-lua/t/002-content.t b/debian/modules/http-lua/t/002-content.t
index bb569f5..cc92d6f 100644
--- a/debian/modules/http-lua/t/002-content.t
+++ b/debian/modules/http-lua/t/002-content.t
@@ -86,7 +86,7 @@ qr/content_by_lua\(nginx\.conf:\d+\):1: attempt to call field 'echo' \(a nil val
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        content_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        content_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
     }
 --- request
 GET /lua?a=1&b=2
@@ -102,7 +102,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-local v = ngx.var["request_uri"]
+v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -154,7 +154,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        content_by_lua 'local who = ngx.var.arg_who
+        content_by_lua 'who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
     }
 --- request
@@ -171,7 +171,7 @@ Hello, agentzh!
     }
 
     location /lua {
-        content_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status, " "); ngx.print("body=", res.body)';
+        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status, " "); ngx.print("body=", res.body)';
     }
 --- request
 GET /lua
@@ -183,7 +183,7 @@ status=200 body=hello, world
 ei= TEST 9: capture non-existed location
 --- config
     location /lua {
-        content_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
     }
 --- request
 GET /lua
@@ -194,7 +194,7 @@ GET /lua
 === TEST 9: invalid capture location (not as expected...)
 --- config
     location /lua {
-        content_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        content_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
     }
 --- request
 GET /lua
@@ -247,7 +247,7 @@ GET /lua
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body, "\\n");
            else
@@ -271,7 +271,7 @@ end
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -353,7 +353,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    content_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    content_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
 }
 --- request
 GET /parent
@@ -369,7 +369,7 @@ location /sub {
 location /parent {
     set $a 12;
     content_by_lua '
-        local res = ngx.location.capture(
+        res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -390,7 +390,7 @@ location /sub {
 }
 location /parent {
     content_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = true });
+        res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 }
@@ -408,7 +408,7 @@ location /sub {
 }
 location /parent {
     content_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = false });
+        res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
 }
@@ -427,7 +427,7 @@ GET /parent
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
     }
@@ -454,7 +454,7 @@ type: foo/bar
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", type(res.header["Set-Cookie"]));
             ngx.say("len: ", #res.header["Set-Cookie"]);
             ngx.say("value: ", table.concat(res.header["Set-Cookie"], "|"))
@@ -482,7 +482,7 @@ value: a|hello, world|foo
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -507,7 +507,7 @@ Bar: Bah
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
@@ -524,7 +524,7 @@ Bar: nil
 --- config
     location /lua {
         content_by_lua '
-            local data = "hello, world"
+            data = "hello, world"
             -- ngx.header["Content-Length"] = #data
             -- ngx.header.content_length = #data
             ngx.print(data)
@@ -742,7 +742,7 @@ true
 --- config
     location /lua {
         content_by_lua '
-            local data = "hello,\\nworld\\n"
+            data = "hello,\\nworld\\n"
             ngx.header["Content-Length"] = #data
             ngx.say("hello,")
             ngx.flush()
@@ -801,7 +801,7 @@ world
     }
 --- user_files
 >>> test.lua
-local v = ngx.var["request_uri"]
+v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
diff --git a/debian/modules/http-lua/t/004-require.t b/debian/modules/http-lua/t/004-require.t
index 17e1d57..35e04db 100644
--- a/debian/modules/http-lua/t/004-require.t
+++ b/debian/modules/http-lua/t/004-require.t
@@ -24,7 +24,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /main {
         echo_location /load;
@@ -85,7 +85,7 @@ hello, foo
 --- request
 GET /main
 --- user_files
---- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.so$
+--- response_body_like: ^[^;]+/servroot/html/\?.so$
 
 
 
@@ -100,7 +100,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.lua;(.+\.lua)?;*$
+--- response_body_like: ^[^;]+/servroot/html/\?.lua;.+\.lua;$
 
 
 
@@ -115,7 +115,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.so;(.+\.so)?;*$
+--- response_body_like: ^[^;]+/servroot/html/\?.so;.+\.so;$
 
 
 
@@ -130,7 +130,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^(.+\.lua)?;*?[^;]+/servroot(_\d+)?/html/\?\.lua$
+--- response_body_like: ^.+\.lua;[^;]+/servroot/html/\?.lua$
 
 
 
@@ -145,7 +145,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^(.+\.so)?;*?[^;]+/servroot(_\d+)?/html/\?\.so$
+--- response_body_like: ^.+\.so;[^;]+/servroot/html/\?.so$
 
 
 
diff --git a/debian/modules/http-lua/t/005-exit.t b/debian/modules/http-lua/t/005-exit.t
index a416a75..a5a28b3 100644
--- a/debian/modules/http-lua/t/005-exit.t
+++ b/debian/modules/http-lua/t/005-exit.t
@@ -452,7 +452,7 @@ Hi
 --- config
     location /lua {
         content_by_lua '
-            local function f ()
+            function f ()
                 ngx.say("hello")
                 ngx.exit(200)
             end
diff --git a/debian/modules/http-lua/t/009-log.t b/debian/modules/http-lua/t/009-log.t
index cb3895b..68c057f 100644
--- a/debian/modules/http-lua/t/009-log.t
+++ b/debian/modules/http-lua/t/009-log.t
@@ -414,8 +414,6 @@ GET /log
 --- config
     location /log {
         content_by_lua '
-            local foo
-            local bar
             function foo()
                 bar()
             end
@@ -433,7 +431,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):9: bar\(\): hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):7: bar\(\): hello, log12343.14159/
 
 
 
@@ -441,8 +439,6 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):9: bar\(\): hell
 --- config
     location /log {
         content_by_lua '
-            local foo
-            local bar
             function foo()
                 return bar(5)
             end
@@ -465,7 +461,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):10:(?: foo\(\):)? hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8:(?: foo\(\):)? hello, log12343.14159/
 
 
 
@@ -476,8 +472,6 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):10:(?: foo\(\):)
     }
 --- user_files
 >>> test.lua
-local foo
-local bar
 function foo()
     bar()
 end
@@ -494,7 +488,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] test.lua:8: bar\(\): hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] test.lua:6: bar\(\): hello, log12343.14159/
 
 
 
diff --git a/debian/modules/http-lua/t/011-md5_bin.t b/debian/modules/http-lua/t/011-md5_bin.t
index dc0fd9c..ae7c974 100644
--- a/debian/modules/http-lua/t/011-md5_bin.t
+++ b/debian/modules/http-lua/t/011-md5_bin.t
@@ -156,7 +156,7 @@ d41d8cd98f00b204e9800998ecf8427e
 --- config
     location = /t {
         content_by_lua '
-            local s = ngx.md5_bin(45)
+            s = ngx.md5_bin(45)
             s = string.gsub(s, ".", function (c)
                     return string.format("%02x", string.byte(c))
                 end)
diff --git a/debian/modules/http-lua/t/013-base64.t b/debian/modules/http-lua/t/013-base64.t
index d1a8d8b..1cc27de 100644
--- a/debian/modules/http-lua/t/013-base64.t
+++ b/debian/modules/http-lua/t/013-base64.t
@@ -242,4 +242,4 @@ GET /t
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
 --- error_log eval
-qr/bad argument \#2 to 'encode_base64' \(boolean expected, got number\)|\[error\] .*? bad no_padding: boolean expected, got number/
+qr/bad argument \#2 to 'encode_base64' \(boolean expected, got number\)|\[error\] .*? boolean argument only/
diff --git a/debian/modules/http-lua/t/014-bugs.t b/debian/modules/http-lua/t/014-bugs.t
index dad084e..9aadff0 100644
--- a/debian/modules/http-lua/t/014-bugs.t
+++ b/debian/modules/http-lua/t/014-bugs.t
@@ -43,7 +43,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /load {
         content_by_lua '
@@ -69,7 +69,7 @@ end
 
 === TEST 2: sanity
 --- http_config
-lua_package_cpath '/home/agentz/rpm/BUILD/lua-yajl-1.1/build/?.so;/home/lz/luax/?.so;./?.so';
+lua_package_path '/home/agentz/rpm/BUILD/lua-yajl-1.1/build/?.so;/home/lz/luax/?.so;./?.so';
 --- config
     location = '/report/listBidwordPrices4lzExtra.htm' {
         content_by_lua '
@@ -112,7 +112,7 @@ GET /report/listBidwordPrices4lzExtra.htm?words=123,156,2532
     }
     location = /main {
         content_by_lua '
-            local res = ngx.location.capture("/memc?c=get&k=foo&v=")
+            res = ngx.location.capture("/memc?c=get&k=foo&v=")
             ngx.say("1: ", res.body)
 
             res = ngx.location.capture("/memc?c=set&k=foo&v=bar");
@@ -204,7 +204,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/37
         content_by_lua '
             -- local yajl = require "yajl"
             ngx.header["Set-Cookie"] = {}
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
 
             for i,j in pairs(res.header) do
                 ngx.header[i] = j
@@ -231,7 +231,7 @@ Set-Cookie: TestCookie2=bar.*"
     }
 --- user_files
 >>> foo.lua
-local res = {}
+res = {}
 res = {'good 1', 'good 2', 'good 3'}
 return ngx.redirect("/somedir/" .. ngx.escape_uri(res[math.random(1,#res)]))
 --- request
@@ -579,7 +579,7 @@ $s
 
 
 
-=== TEST 26: globals sharing by using _G
+=== TEST 26: unexpected globals sharing by using _G
 --- config
     location /test {
         content_by_lua '
@@ -593,12 +593,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body_like eval
-[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
+--- response_body eval
+["0", "0", "0"]
 
 
 
-=== TEST 27: globals sharing by using _G (set_by_lua*)
+=== TEST 27: unexpected globals sharing by using _G (set_by_lua*)
 --- config
     location /test {
         set_by_lua $a '
@@ -613,12 +613,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body_like eval
-[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
+--- response_body eval
+["0", "0", "0"]
 
 
 
-=== TEST 28: globals sharing by using _G (log_by_lua*)
+=== TEST 28: unexpected globals sharing by using _G (log_by_lua*)
 --- http_config
     lua_shared_dict log_dict 100k;
 --- config
@@ -633,19 +633,19 @@ $s
             if _G.t then
                 _G.t = _G.t + 1
             else
-                _G.t = 1
+                _G.t = 0
             end
             log_dict:set("cnt", t)
         ';
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body_like eval
-[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
+--- response_body eval
+["0", "0", "0"]
 
 
 
-=== TEST 29: globals sharing by using _G (header_filter_by_lua*)
+=== TEST 29: unexpected globals sharing by using _G (header_filter_by_lua*)
 --- config
     location /test {
         header_filter_by_lua '
@@ -663,12 +663,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body_like eval
-[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
+--- response_body eval
+["0", "0", "0"]
 
 
 
-=== TEST 30: globals sharing by using _G (body_filter_by_lua*)
+=== TEST 30: unexpected globals sharing by using _G (body_filter_by_lua*)
 --- config
     location /test {
         body_filter_by_lua '
@@ -686,9 +686,8 @@ $s
     }
 --- request
 GET /test
---- response_body_like eval
-qr/\Aa[036]
-\z/
+--- response_body
+a0
 --- no_error_log
 [error]
 
@@ -847,7 +846,7 @@ ok
 
 === TEST 37: resolving names with a trailing dot
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -865,7 +864,7 @@ GET /t
 
 === TEST 38: resolving names with a trailing dot
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen 12354;
 
@@ -892,7 +891,7 @@ args: foo=1&bar=2
 
 === TEST 39: lua_code_cache off + setkeepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location = /t {
diff --git a/debian/modules/http-lua/t/016-resp-header.t b/debian/modules/http-lua/t/016-resp-header.t
index e38202b..72c1e05 100644
--- a/debian/modules/http-lua/t/016-resp-header.t
+++ b/debian/modules/http-lua/t/016-resp-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 59);
+plan tests => repeat_each() * (blocks() * 3 + 46);
 
 #no_diff();
 no_long_string();
@@ -630,46 +630,7 @@ Cache-Control: private, no-store
 
 
 
-=== TEST 32: set single value to Link header
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.header.link = "</foo.jpg>; rel=preload"
-            ngx.say("Link: ", ngx.var.sent_http_link)
-        }
-    }
---- request
-GET /t
---- response_headers
-Link: </foo.jpg>; rel=preload
---- response_body
-Link: </foo.jpg>; rel=preload
-
-
-
-=== TEST 33: set multi values to Link header
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.header.link = {
-                "</foo.jpg>; rel=preload",
-                "</bar.css>; rel=preload; as=style"
-            }
-
-            ngx.say("Link: ", ngx.var.sent_http_link)
-        }
-    }
---- request
-GET /t
---- response_headers
-Link: </foo.jpg>; rel=preload, </bar.css>; rel=preload; as=style
---- response_body_like chop
-^Link: </foo.jpg>; rel=preload[;,] </bar.css>; rel=preload; as=style$
---- skip_nginx: 3: < 1.13.9
-
-
-
-=== TEST 34: set multi values to cache-control and override it with a single value
+=== TEST 32: set multi values to cache-control and override it with a single value
 --- config
     location /lua {
         content_by_lua '
@@ -689,30 +650,7 @@ Cache-Control: no-cache
 
 
 
-=== TEST 35: set multi values to Link header and override it with a single value
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.header.link = {
-                "</foo.jpg>; rel=preload",
-                "</bar.css>; rel=preload; as=style"
-            }
-            ngx.header.link = "</hello.jpg>; rel=preload"
-            ngx.say("Link: ", ngx.var.sent_http_link)
-            ngx.say("Link: ", ngx.header.link)
-        }
-    }
---- request
-    GET /lua
---- response_headers
-Link: </hello.jpg>; rel=preload
---- response_body
-Link: </hello.jpg>; rel=preload
-Link: </hello.jpg>; rel=preload
-
-
-
-=== TEST 36: set multi values to cache-control and override it with multiple values
+=== TEST 33: set multi values to cache-control and override it with multiple values
 --- config
     location /lua {
         content_by_lua '
@@ -734,37 +672,7 @@ Cache-Control: no-cache[;,] blah[;,] foo$
 
 
 
-=== TEST 37: set multi values to Link header and override it with multiple values
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.header.link = {
-                "</foo.jpg>; rel=preload",
-                "</bar.css>; rel=preload; as=style"
-            }
-            ngx.header.link = {
-                "</foo.jpg>; rel=preload",
-                "</hello.css>; rel=preload",
-                "</bar.css>; rel=preload; as=style"
-            }
-            ngx.say("Link: ", ngx.var.sent_http_link)
-            ngx.say("Link: ", table.concat(ngx.header.link, ", "))
-        }
-    }
---- request
-    GET /lua
---- response_headers
-Link: </foo.jpg>; rel=preload, </hello.css>; rel=preload, </bar.css>; rel=preload; as=style
---- response_body_like chop
-^Link: </foo.jpg>; rel=preload[;,] </hello.css>; rel=preload[;,] </bar.css>; rel=preload; as=style
-Link: </foo.jpg>; rel=preload[;,] </hello.css>; rel=preload[;,] </bar.css>; rel=preload; as=style$
---- no_error_log
-[error]
---- skip_nginx: 4: < 1.13.9
-
-
-
-=== TEST 38: set the www-authenticate response header
+=== TEST 34: set the www-authenticate response header
 --- config
     location /lua {
         content_by_lua '
@@ -781,7 +689,7 @@ WWW-Authenticate: blah
 
 
 
-=== TEST 39: set and clear the www-authenticate response header
+=== TEST 35: set and clear the www-authenticate response header
 --- config
     location /lua {
         content_by_lua '
@@ -799,7 +707,7 @@ Foo: nil
 
 
 
-=== TEST 40: set multi values to cache-control and override it with multiple values (to reproduce a bug)
+=== TEST 36: set multi values to cache-control and override it with multiple values (to reproduce a bug)
 --- config
     location /lua {
         content_by_lua '
@@ -819,7 +727,7 @@ Cache-Control: blah
 
 
 
-=== TEST 41: set last-modified and return 304
+=== TEST 37: set last-modified and return 304
 --- config
   location /lua {
         content_by_lua '
@@ -837,7 +745,7 @@ Last-Modified: Thu, 18 Nov 2010 11:27:35 GMT
 
 
 
-=== TEST 42: set last-modified and return 200
+=== TEST 38: set last-modified and return 200
 --- config
   location /lua {
         content_by_lua '
@@ -856,7 +764,7 @@ Thu, 18 Nov 2010 11:27:35 GMT
 
 
 
-=== TEST 43: set response content-encoding header should bypass ngx_http_gzip_filter_module
+=== TEST 39: set response content-encoding header should bypass ngx_http_gzip_filter_module
 --- config
     default_type text/plain;
     gzip             on;
@@ -873,16 +781,13 @@ GET /read
 --- more_headers
 Accept-Encoding: gzip
 --- response_headers
-Content-Encoding: gzip
---- no_error_log
-[error]
-http gzip filter
+Content-Type: text/plain
 --- response_body
 Hello, world, my dear friend!
 
 
 
-=== TEST 44: no transform underscores (write)
+=== TEST 40: no transform underscores (write)
 --- config
     lua_transform_underscores_in_response_headers off;
     location = /t {
@@ -902,7 +807,7 @@ nil
 
 
 
-=== TEST 45: with transform underscores (write)
+=== TEST 41: with transform underscores (write)
 --- config
     lua_transform_underscores_in_response_headers on;
     location = /t {
@@ -922,7 +827,7 @@ Hello
 
 
 
-=== TEST 46: github issue #199: underscores in lua variables
+=== TEST 42: github issue #199: underscores in lua variables
 --- config
     location /read {
         content_by_lua '
@@ -955,7 +860,7 @@ something: hello
 
 
 
-=== TEST 47: set multiple response header
+=== TEST 43: set multiple response header
 --- config
     location /read {
         content_by_lua '
@@ -975,7 +880,7 @@ text/my-plain-50
 
 
 
-=== TEST 48: set multiple response header and then reset and then clear
+=== TEST 44: set multiple response header and then reset and then clear
 --- config
     location /read {
         content_by_lua '
@@ -1004,7 +909,7 @@ ok
 
 
 
-=== TEST 49: set response content-type header for multiple times
+=== TEST 45: set response content-type header for multiple times
 --- config
     location /read {
         content_by_lua '
@@ -1022,7 +927,7 @@ Hi
 
 
 
-=== TEST 50: set Last-Modified response header for multiple times
+=== TEST 46: set Last-Modified response header for multiple times
 --- config
     location /read {
         content_by_lua '
@@ -1040,7 +945,7 @@ ok
 
 
 
-=== TEST 51: set Last-Modified response header and then clear
+=== TEST 47: set Last-Modified response header and then clear
 --- config
     location /read {
         content_by_lua '
@@ -1058,7 +963,7 @@ ok
 
 
 
-=== TEST 52: github #20: segfault caused by the nasty optimization in the nginx core (write)
+=== TEST 48: github #20: segfault caused by the nasty optimization in the nginx core (write)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1080,7 +985,7 @@ Location: http://localhost:$ServerPort/t/
 
 
 
-=== TEST 53: github #20: segfault caused by the nasty optimization in the nginx core (read)
+=== TEST 49: github #20: segfault caused by the nasty optimization in the nginx core (read)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1102,7 +1007,7 @@ Location: http://localhost:$ServerPort/t/
 
 
 
-=== TEST 54: github #20: segfault caused by the nasty optimization in the nginx core (read Location)
+=== TEST 50: github #20: segfault caused by the nasty optimization in the nginx core (read Location)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1125,7 +1030,7 @@ Foo: /t/
 
 
 
-=== TEST 55: github #20: segfault caused by the nasty optimization in the nginx core (set Foo and read Location)
+=== TEST 51: github #20: segfault caused by the nasty optimization in the nginx core (set Foo and read Location)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1149,7 +1054,7 @@ Foo: /t/
 
 
 
-=== TEST 56: case sensitive cache-control header
+=== TEST 52: case sensitive cache-control header
 --- config
     location /lua {
         content_by_lua '
@@ -1166,24 +1071,7 @@ Cache-Control: private
 
 
 
-=== TEST 57: case sensitive Link header
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.header["link"] = "</foo.jpg>; rel=preload"
-            ngx.say("Link: ", ngx.var.sent_http_link)
-        }
-    }
---- request
-    GET /lua
---- raw_response_headers_like chop
-link: </foo.jpg>; rel=preload
---- response_body
-Link: </foo.jpg>; rel=preload
-
-
-
-=== TEST 58: clear Cache-Control when there was no Cache-Control
+=== TEST 53: clear Cache-Control when there was no Cache-Control
 --- config
     location /lua {
         content_by_lua '
@@ -1200,24 +1088,7 @@ Cache-Control: nil
 
 
 
-=== TEST 59: clear Link header when there was no Link
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.header["Link"] = nil
-            ngx.say("Link: ", ngx.var.sent_http_link)
-        }
-    }
---- request
-    GET /lua
---- raw_response_headers_unlike eval
-qr/Link/i
---- response_body
-Link: nil
-
-
-
-=== TEST 60: set response content-type header
+=== TEST 54: set response content-type header
 --- config
     location /read {
         content_by_lua '
@@ -1236,7 +1107,7 @@ s = content_type
 
 
 
-=== TEST 61: set a number header name
+=== TEST 55: set a number header name
 --- config
     location /lua {
         content_by_lua '
@@ -1255,7 +1126,7 @@ s = content_type
 
 
 
-=== TEST 62: set a number header name (in a table value)
+=== TEST 56: set a number header name (in a table value)
 --- config
     location /lua {
         content_by_lua '
@@ -1274,7 +1145,7 @@ foo: 32
 
 
 
-=== TEST 63: random access resp headers
+=== TEST 57: random access resp headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1314,7 +1185,7 @@ bar: baz
 
 
 
-=== TEST 64: iterating through raw resp headers
+=== TEST 58: iterating through raw resp headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1350,7 +1221,7 @@ bar: nil
 
 
 
-=== TEST 65: removed response headers
+=== TEST 59: removed response headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1383,7 +1254,7 @@ bar: baz
 
 
 
-=== TEST 66: built-in Content-Type header
+=== TEST 60: built-in Content-Type header
 --- config
     location = /t {
         content_by_lua '
@@ -1416,7 +1287,7 @@ my content_type: text/plain
 
 
 
-=== TEST 67: built-in Content-Length header
+=== TEST 61: built-in Content-Length header
 --- config
     location = /t {
         content_by_lua '
@@ -1449,7 +1320,7 @@ my content_length: 3
 
 
 
-=== TEST 68: built-in Connection header
+=== TEST 62: built-in Connection header
 --- config
     location = /t {
         content_by_lua '
@@ -1480,7 +1351,7 @@ my connection: close
 
 
 
-=== TEST 69: built-in Transfer-Encoding header (chunked)
+=== TEST 63: built-in Transfer-Encoding header (chunked)
 --- config
     location = /t {
         content_by_lua '
@@ -1512,7 +1383,7 @@ my transfer-encoding: chunked
 
 
 
-=== TEST 70: built-in Transfer-Encoding header (none)
+=== TEST 64: built-in Transfer-Encoding header (none)
 --- config
     location = /t {
         content_by_lua '
@@ -1545,7 +1416,7 @@ my transfer_encoding: nil
 
 
 
-=== TEST 71: set Location (no host)
+=== TEST 65: set Location (no host)
 --- config
     location = /t {
         content_by_lua '
@@ -1564,7 +1435,7 @@ Location: /foo/bar
 
 
 
-=== TEST 72: set Location (with host)
+=== TEST 66: set Location (with host)
 --- config
     location = /t {
         content_by_lua '
@@ -1583,7 +1454,7 @@ Location: http://test.com/foo/bar
 
 
 
-=== TEST 73: ngx.header["Content-Type"] with ngx_gzip
+=== TEST 67: ngx.header["Content-Type"] with ngx_gzip
 --- config
     gzip             on;
     gzip_min_length  1;
@@ -1607,7 +1478,7 @@ Content-Type: text/html; charset=utf-8
 
 
 
-=== TEST 74: ngx.header["Content-Type"] with "; blah"
+=== TEST 68: ngx.header["Content-Type"] with "; blah"
 --- config
     location = /test2 {
         content_by_lua '
@@ -1627,11 +1498,84 @@ test
 
 
 
-=== TEST 75: exceeding max header limit (default 100)
+=== TEST 69: return the matched content-type instead of default_type
+--- http_config
+types {
+    image/png png;
+}
+--- config
+location /set/ {
+     default_type text/html;
+     content_by_lua_block {
+       ngx.say(ngx.header["content-type"])
+   }
+}
+--- request
+GET /set/hello.png
+--- response_headers
+Content-Type: image/png
+--- response_body
+image/png
+--- no_error_log
+[error]
+
+
+
+=== TEST 70: always return the matched content-type
+--- config
+    location /set/ {
+        default_type "image/png";
+        content_by_lua_block {
+            ngx.say(ngx.header["content-type"])
+            ngx.say(ngx.header["content-type"])
+        }
+    }
+--- request
+GET /set/hello.png
+--- response_headers
+Content-Type: image/png
+--- response_body
+image/png
+image/png
+--- no_error_log
+[error]
+
+
+
+=== TEST 71: return the matched content-type after ngx.resp.get_headers()
+--- http_config
+types {
+    image/png png;
+}
+--- config
+    location /set/ {
+        default_type text/html;
+        content_by_lua_block {
+            local h, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say(h["content-type"])
+        }
+    }
+--- request
+GET /set/hello.png
+--- response_headers
+Content-Type: image/png
+--- response_body
+image/png
+--- no_error_log
+[error]
+
+
+
+=== TEST 72: exceeding max header limit (default 100)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 100 do
+            for i = 1, 99 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1661,11 +1605,11 @@ lua exceeding response header limit 101 > 100
 
 
 
-=== TEST 76: NOT exceeding max header limit (default 100)
+=== TEST 73: NOT exceeding max header limit (default 100)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 99 do
+            for i = 1, 98 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1693,11 +1637,11 @@ lua exceeding response header limit
 
 
 
-=== TEST 77: exceeding max header limit (custom limit, 3)
+=== TEST 74: exceeding max header limit (custom limit, 3)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 3 do
+            for i = 1, 2 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1727,11 +1671,11 @@ lua exceeding response header limit 4 > 3
 
 
 
-=== TEST 78: NOT exceeding max header limit (custom limit, 3)
+=== TEST 75: NOT exceeding max header limit (custom limit, 3)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 2 do
+            for i = 1, 1 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1755,211 +1699,3 @@ found 3 resp headers
 --- no_error_log
 [error]
 lua exceeding response header limit
-
-
-
-=== TEST 79: return nil if Content-Type is not set yet
---- config
-    location /t {
-        default_type text/html;
-        content_by_lua_block {
-            ngx.log(ngx.WARN, "Content-Type: ", ngx.header["content-type"])
-            ngx.say("Content-Type: ", ngx.header["content-type"])
-        }
-    }
---- request
-GET /t
---- response_headers
-Content-Type: text/html
---- response_body
-Content-Type: nil
---- no_error_log
-[error]
---- error_log
-Content-Type: nil
-
-
-
-=== TEST 80: don't generate Content-Type when setting other response header
---- config
-    location = /backend {
-        content_by_lua_block {
-            ngx.say("foo")
-        }
-        header_filter_by_lua_block {
-            ngx.header.content_type = nil
-        }
-    }
-
-    location = /t {
-        default_type text/html;
-        rewrite_by_lua_block {
-            ngx.header.blah = "foo"
-        }
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-blah: foo
-!Content-Type
---- no_error_log
-[error]
-
-
-
-=== TEST 81: don't generate Content-Type when getting other response header
---- config
-    location = /backend {
-        content_by_lua_block {
-            ngx.say("foo")
-        }
-        header_filter_by_lua_block {
-            ngx.header.content_type = nil
-        }
-    }
-
-    location = /t {
-        default_type text/html;
-        rewrite_by_lua_block {
-            local h = ngx.header.content_length
-        }
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-!Content-Type
---- no_error_log
-[error]
-
-
-
-=== TEST 82: don't generate Content-Type when getting it
---- config
-    location = /backend {
-        content_by_lua_block {
-            ngx.say("foo")
-        }
-        header_filter_by_lua_block {
-            ngx.header.content_type = nil
-        }
-    }
-
-    location /t {
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
-        header_filter_by_lua_block {
-            ngx.log(ngx.WARN, "Content-Type: ", ngx.header["content-type"])
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-!Content-Type
---- no_error_log
-[error]
---- error_log
-Content-Type: nil
-
-
-
-=== TEST 83: generate default Content-Type when setting other response header
---- config
-    location = /t {
-        default_type text/html;
-        content_by_lua_block {
-            ngx.header.blah = "foo"
-            ngx.say("foo")
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-blah: foo
-Content-Type: text/html
---- no_error_log
-[error]
-
-
-
-=== TEST 84: don't generate Content-Type when calling ngx.resp.get_headers()
---- config
-    location = /backend {
-        content_by_lua_block {
-            ngx.say("foo")
-        }
-        header_filter_by_lua_block {
-            ngx.header.content_type = nil
-        }
-    }
-
-    location /t {
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
-        header_filter_by_lua_block {
-            local h, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return
-            end
-
-            ngx.log(ngx.WARN, "Content-Type: ", h["content-type"])
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-!Content-Type
---- no_error_log
-[error]
---- error_log
-Content-Type: nil
-
-
-
-=== TEST 85: don't generate default Content-Type when Content-Type is cleared
---- config
-    location = /t {
-        default_type text/html;
-        content_by_lua_block {
-            ngx.header["Content-Type"] = nil
-            ngx.say("foo")
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-!Content-Type
---- no_error_log
-[error]
-
-
-
-=== TEST 86: don't generate default Content-Type when Content-Type is set
---- config
-    location = /t {
-        default_type text/html;
-        content_by_lua_block {
-            ngx.header["Content-Type"] = "application/json"
-            ngx.say("foo")
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-Content-Type: application/json
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/017-exec.t b/debian/modules/http-lua/t/017-exec.t
index a73e93e..544b8bb 100644
--- a/debian/modules/http-lua/t/017-exec.t
+++ b/debian/modules/http-lua/t/017-exec.t
@@ -382,7 +382,7 @@ hello
 --- config
     location /lua {
         content_by_lua '
-            local function f ()
+            function f ()
                 ngx.exec("/hi")
             end
 
@@ -524,7 +524,7 @@ hello
 --- config
     location /main {
         rewrite_by_lua '
-            local res = ngx.location.capture("/test_loc");
+            res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/020-subrequest.t b/debian/modules/http-lua/t/020-subrequest.t
index 5a386db..658a1d2 100644
--- a/debian/modules/http-lua/t/020-subrequest.t
+++ b/debian/modules/http-lua/t/020-subrequest.t
@@ -32,7 +32,7 @@ __DATA__
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -62,7 +62,7 @@ lua http subrequest "/other?"
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -90,7 +90,7 @@ DELETE
 
     location /t {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -114,7 +114,7 @@ POST
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -141,7 +141,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -169,7 +169,7 @@ GET
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo")
+            res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -196,7 +196,7 @@ GET
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo", {})
+            res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -226,7 +226,7 @@ GET
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -255,7 +255,7 @@ hello
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -291,7 +291,7 @@ hello
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -329,7 +329,7 @@ GET
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -362,7 +362,7 @@ hello
         content_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -404,7 +404,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            local res = ngx.location.capture("/memc",
+            res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -435,7 +435,7 @@ cached: hello
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -456,7 +456,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -478,7 +478,7 @@ fo%3D=%3D%3E
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -503,7 +503,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -526,7 +526,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -548,7 +548,7 @@ attempt to use a non-string key in the "args" option table
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -570,7 +570,7 @@ attempt to use a non-string key in the "args" option table
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -592,7 +592,7 @@ a=3&b=4
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
@@ -685,7 +685,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/38
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_GET });
             ngx.say("header foo: [", res.body, "]")
         ';
@@ -711,7 +711,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/38
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { body = "abc" });
             ngx.say("header foo: [", res.body, "]")
         ';
@@ -746,8 +746,8 @@ header foo: [bar]
     }
     location /main {
         content_by_lua '
-            local res1, res2 = ngx.location.capture_multi({{"/a"}, {"/b"}})
-            local res3 = ngx.location.capture("/c")
+            res1, res2 = ngx.location.capture_multi({{"/a"}, {"/b"}})
+            res3 = ngx.location.capture("/c")
             ngx.print(res1.body, res2.body, res3.body)
         ';
     }
@@ -780,7 +780,7 @@ lua reuse free buf memory
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -801,7 +801,7 @@ hello
 --- config
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo.html")
+            res = ngx.location.capture("/foo.html")
 
             ngx.say(res.status)
             ngx.say(res.header["Last-Modified"])
@@ -832,7 +832,7 @@ hello, static file$
     location /lua {
         content_by_lua '
             local ctx = {}
-            local res = ngx.location.capture("/sub", { ctx = ctx })
+            res = ngx.location.capture("/sub", { ctx = ctx })
 
             ngx.say(ctx.foo);
             ngx.say(ngx.ctx.foo);
@@ -857,7 +857,7 @@ nil
     }
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/sub", { ctx = ngx.ctx })
+            res = ngx.location.capture("/sub", { ctx = ngx.ctx })
             ngx.say(ngx.ctx.foo);
         ';
     }
@@ -885,7 +885,7 @@ bar
 
     location /t {
         content_by_lua '
-            local res = ngx.location.capture("/memc",
+            res = ngx.location.capture("/memc",
                 { method = ngx.HTTP_PUT, body = "hello 1234" });
             -- ngx.say("PUT: " .. res.status);
 
@@ -922,7 +922,7 @@ lua reuse free buf chain, but reallocate memory because
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -959,7 +959,7 @@ nil
         content_by_lua '
             ngx.req.read_body()
 
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -996,7 +996,7 @@ nil
         content_by_lua '
             ngx.req.read_body()
 
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -1033,7 +1033,7 @@ hello, world
         content_by_lua '
             ngx.req.read_body()
 
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT });
 
             ngx.print(res.body)
@@ -1074,7 +1074,7 @@ lua subrequests cycle while processing "/t"
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_OPTIONS });
 
             ngx.print(res.body)
@@ -1099,7 +1099,7 @@ OPTIONS
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_OPTIONS, body = "hello world" });
 
             ngx.print(res.body)
@@ -1151,7 +1151,7 @@ r%5B%5D=http%3A%2F%2Fajax.googleapis.com%3A80%2Fajax%2Flibs%2Fjquery%2F1.7.2%2Fj
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1172,7 +1172,7 @@ body:
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1196,7 +1196,7 @@ body:
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1242,7 +1242,7 @@ F(ngx_http_finalize_request) {
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/memc")
+            res = ngx.location.capture("/memc")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1312,7 +1312,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/memc")
+            res = ngx.location.capture("/memc")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1385,7 +1385,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1445,7 +1445,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1507,7 +1507,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1567,7 +1567,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1630,7 +1630,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1690,7 +1690,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1756,7 +1756,7 @@ upstream timed out
             ngx.req.read_body()
 
             for i = 1, 2 do
-                local res = ngx.location.capture("/other",
+                res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1796,7 +1796,7 @@ hello world
             ngx.req.read_body()
 
             for i = 1, 2 do
-                local res = ngx.location.capture("/other",
+                res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1836,7 +1836,7 @@ hello world
             ngx.req.read_body()
 
             for i = 1, 2 do
-                local res = ngx.location.capture("/other",
+                res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1916,7 +1916,7 @@ a client request body is buffered to a temporary file
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1979,7 +1979,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2040,7 +2040,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2102,7 +2102,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2160,7 +2160,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2219,7 +2219,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2288,7 +2288,7 @@ upstream prematurely closed connection
             }
 
             for i, method in ipairs(methods) do
-                local res = ngx.location.capture("/other",
+                res = ngx.location.capture("/other",
                     { method = method })
                 ngx.print(res.body)
             end
@@ -2324,7 +2324,7 @@ method: TRACE
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -2353,7 +2353,7 @@ nil
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE, always_forward_body = true });
 
             ngx.print(res.body)
@@ -2382,7 +2382,7 @@ hello world
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE, always_forward_body = true });
 
             ngx.print(res.body)
@@ -2410,7 +2410,7 @@ hello world
 --- config
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
         ';
     }
@@ -2603,7 +2603,7 @@ qr/Assertion .*? failed/
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2636,7 +2636,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2669,7 +2669,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2699,7 +2699,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: Cookie: ", ngx.var.http_cookie)
         ';
@@ -2727,7 +2727,7 @@ pr: Cookie: foo; bar
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: Cookie: ", ngx.var.http_cookie)
         ';
@@ -2750,7 +2750,7 @@ pr: Cookie: foo; bar
 --- config
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/index.html",
+            res = ngx.location.capture("/index.html",
                 { method = ngx.HTTP_HEAD });
             ngx.say("content-length: ", res.header["Content-Length"])
             ngx.say("body: [", res.body, "]")
diff --git a/debian/modules/http-lua/t/023-rewrite/client-abort.t b/debian/modules/http-lua/t/023-rewrite/client-abort.t
index 0d6f2b3..117d17e 100644
--- a/debian/modules/http-lua/t/023-rewrite/client-abort.t
+++ b/debian/modules/http-lua/t/023-rewrite/client-abort.t
@@ -199,7 +199,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 
     location = /sleep {
@@ -240,7 +240,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 --- request
 GET /t
@@ -545,7 +545,7 @@ client prematurely closed connection
                 return
             end
 
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            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
diff --git a/debian/modules/http-lua/t/023-rewrite/exec.t b/debian/modules/http-lua/t/023-rewrite/exec.t
index 59691cb..edd4607 100644
--- a/debian/modules/http-lua/t/023-rewrite/exec.t
+++ b/debian/modules/http-lua/t/023-rewrite/exec.t
@@ -326,7 +326,7 @@ hello
 --- config
     location /main {
         rewrite_by_lua '
-            local res = ngx.location.capture("/test_loc");
+            res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
@@ -354,7 +354,7 @@ hello, bah
 --- config
     location /main {
         rewrite_by_lua '
-            local res = ngx.location.capture("/test_loc");
+            res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/023-rewrite/mixed.t b/debian/modules/http-lua/t/023-rewrite/mixed.t
index 5b38d3f..0f742b2 100644
--- a/debian/modules/http-lua/t/023-rewrite/mixed.t
+++ b/debian/modules/http-lua/t/023-rewrite/mixed.t
@@ -35,7 +35,7 @@ __DATA__
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             print("rewrite GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -49,7 +49,7 @@ __DATA__
         content_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
diff --git a/debian/modules/http-lua/t/023-rewrite/multi-capture.t b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
index a0a02b7..083ec78 100644
--- a/debian/modules/http-lua/t/023-rewrite/multi-capture.t
+++ b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
@@ -154,7 +154,7 @@ res2.body = b
 
     location /main {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo?n=1")
+            res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/req-socket.t b/debian/modules/http-lua/t/023-rewrite/req-socket.t
index 9292385..87cbbbe 100644
--- a/debian/modules/http-lua/t/023-rewrite/req-socket.t
+++ b/debian/modules/http-lua/t/023-rewrite/req-socket.t
@@ -325,7 +325,7 @@ found the end of the stream
 
 === TEST 4: attempt to use the req socket across request boundary
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         rewrite_by_lua '
@@ -376,7 +376,7 @@ hello world
 === 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         rewrite_by_lua '
@@ -440,7 +440,7 @@ done
 
 === TEST 6: pipelined POST requests
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         rewrite_by_lua '
diff --git a/debian/modules/http-lua/t/023-rewrite/sanity.t b/debian/modules/http-lua/t/023-rewrite/sanity.t
index 73a85dc..b90aa0e 100644
--- a/debian/modules/http-lua/t/023-rewrite/sanity.t
+++ b/debian/modules/http-lua/t/023-rewrite/sanity.t
@@ -69,7 +69,7 @@ GET /lua
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        rewrite_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        rewrite_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -87,7 +87,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-local v = ngx.var["request_uri"]
+v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -140,7 +140,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        rewrite_by_lua 'local who = ngx.var.arg_who
+        rewrite_by_lua 'who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
@@ -159,7 +159,7 @@ Hello, agentzh!
 
     location /lua {
         rewrite_by_lua '
-local res = ngx.location.capture("/other")
+res = ngx.location.capture("/other")
 ngx.print("status=", res.status, " ")
 ngx.print("body=", res.body)
 ';
@@ -175,7 +175,7 @@ status=200 body=hello, world
 === TEST 9: capture non-existed location
 --- config
     location /lua {
-        rewrite_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        rewrite_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -187,7 +187,7 @@ GET /lua
 === TEST 10: invalid capture location (not as expected...)
 --- config
     location /lua {
-        rewrite_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        rewrite_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -270,7 +270,7 @@ end
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -359,7 +359,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    rewrite_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    rewrite_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
     content_by_lua 'ngx.exit(ngx.OK)';
 }
 --- request
@@ -377,7 +377,7 @@ location /parent {
     set $a '';
     rewrite_by_lua '
         ngx.var.a = 12;
-        local res = ngx.location.capture(
+        res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -399,7 +399,7 @@ location /sub {
 }
 location /parent {
     rewrite_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = true });
+        res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 
@@ -421,7 +421,7 @@ location /sub {
 
 location /parent {
     rewrite_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = false });
+        res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
     content_by_lua return;
@@ -441,7 +441,7 @@ GET /parent
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
 
@@ -466,7 +466,7 @@ type: foo/bar
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -494,7 +494,7 @@ Bar: Bah
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
index 8b532ea..489a70f 100644
--- a/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
+++ b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
@@ -27,7 +27,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -104,7 +104,7 @@ lua tcp socket get keepalive peer: using connection
 
 === TEST 2: free up the whole connection pool if no active connections
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -177,7 +177,7 @@ received: OK
 
 === TEST 3: upstream sockets close prematurely
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
    server_tokens off;
    keepalive_timeout 100ms;
@@ -254,7 +254,7 @@ done
 
 === TEST 4: http keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
    server_tokens off;
    location /t {
@@ -815,7 +815,7 @@ lua tcp socket keepalive timeout: unlimited
 === TEST 11: sanity (uds)
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -953,7 +953,7 @@ lua tcp socket get keepalive peer: using connection
 
 === 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     error_page 404 /404.html;
     location /t {
diff --git a/debian/modules/http-lua/t/023-rewrite/subrequest.t b/debian/modules/http-lua/t/023-rewrite/subrequest.t
index cb8523c..5d1e8f0 100644
--- a/debian/modules/http-lua/t/023-rewrite/subrequest.t
+++ b/debian/modules/http-lua/t/023-rewrite/subrequest.t
@@ -27,7 +27,7 @@ __DATA__
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -54,7 +54,7 @@ DELETE
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ DELETE
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -105,7 +105,7 @@ POST
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -131,7 +131,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -158,7 +158,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo")
+            res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -184,7 +184,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo", {})
+            res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -213,7 +213,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -241,7 +241,7 @@ hello
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -276,7 +276,7 @@ hello
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -313,7 +313,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -345,7 +345,7 @@ hello
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -386,7 +386,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            local res = ngx.location.capture("/memc",
+            res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -417,7 +417,7 @@ cached: hello
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -437,7 +437,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -458,7 +458,7 @@ fo%3D=%3D%3E
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -480,7 +480,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -502,7 +502,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -523,7 +523,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -544,7 +544,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -565,7 +565,7 @@ a=3&b=4
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
index e713bb5..329c045 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
@@ -46,7 +46,7 @@ __DATA__
     location /t1 {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -63,7 +63,7 @@ GET /t1
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -79,7 +79,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(150)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -114,7 +114,7 @@ lua tcp socket connect timeout: 150
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(nil)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -149,7 +149,7 @@ lua tcp socket connect timeout: 102
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(0)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -185,7 +185,7 @@ lua tcp socket connect timeout: 102
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(-1)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
index 5258487..41aeab7 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
@@ -250,11 +250,11 @@ attempt to send data on a closed socket:
     }
 --- request
 GET /t
---- response_body_like
+--- response_body
 connected: 1
 request sent: 56
-first line received: HTTP\/1\.1 200 OK
-second line received: (?:Date|Server): .*?
+first line received: HTTP/1.1 200 OK
+second line received: Server: openresty
 --- no_error_log
 [error]
 
@@ -304,7 +304,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
     location /test {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -329,7 +329,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -940,7 +940,7 @@ close: 1 nil
                 end
             end
 
-            local ok, err = sock:close()
+            ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
 
@@ -1082,7 +1082,7 @@ close: 1 nil
 
 === TEST 19: cannot survive across request boundary (send)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1143,7 +1143,7 @@ received: OK|failed to send request: closed)\$"
 
 === TEST 20: cannot survive across request boundary (receive)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1214,7 +1214,7 @@ 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1285,7 +1285,7 @@ received: OK|failed to close: closed)$/
 
 === TEST 22: cannot survive across request boundary (connect)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -2041,7 +2041,7 @@ close: 1 nil
 
 === TEST 33: bad request tries to connect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2097,7 +2097,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):7: bad request/
 
 === TEST 34: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2156,7 +2156,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 35: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2215,7 +2215,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 36: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2274,7 +2274,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 37: bad request tries to set keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2333,7 +2333,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 38: bad request tries to receiveuntil
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
index 9428bd6..2bea7e7 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.exec("/foo")
             end
 
@@ -59,7 +59,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -95,7 +95,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -178,12 +178,12 @@ hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
             end
 
@@ -270,7 +270,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
index e25f7f8..6ebbb67 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -172,13 +172,13 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -262,7 +262,7 @@ f
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -298,10 +298,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -311,7 +311,7 @@ exiting the user thread
             ngx.thread.spawn(f)
             ngx.say("after")
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -403,11 +403,11 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         #resolver 127.0.0.1;
         resolver_timeout 12s;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -510,7 +510,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -521,7 +521,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -600,7 +600,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -700,7 +700,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -806,7 +806,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -901,7 +901,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -995,7 +995,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1080,7 +1080,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1164,7 +1164,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1247,7 +1247,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
index 0e636f7..83de1a3 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -113,7 +113,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
index dccef87..5552107 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
             end
 
@@ -68,11 +68,11 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("in thread 1")
             end
 
-            local function g()
+            function g()
                 ngx.say("in thread 2")
             end
 
@@ -117,7 +117,7 @@ after 2
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -154,13 +154,13 @@ after sleep
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            local function g()
+            function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -210,7 +210,7 @@ delete thread 2
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.blah()
             end
 
@@ -241,9 +241,9 @@ qr/lua user thread aborted: runtime error: rewrite_by_lua\(nginx\.conf:\d+\):3:
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
-                local res = ngx.location.capture("/proxy")
+                res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -287,7 +287,7 @@ after capture: hello world
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -340,7 +340,7 @@ after capture: hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -394,13 +394,13 @@ capture: hello bar
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            local function g()
+            function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -472,8 +472,7 @@ g: after capture: hello bah
 --- config
     location /lua {
         rewrite_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -519,8 +518,7 @@ after g
 --- config
     location /lua {
         rewrite_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -568,7 +566,7 @@ hello in g()
     location /lua {
         rewrite_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -601,7 +599,7 @@ status: running
     location /lua {
         rewrite_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
             end
 
@@ -633,8 +631,7 @@ status: zombie
     location /lua {
         rewrite_by_lua '
             local co
-            local g
-            local function f()
+            function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -673,8 +670,7 @@ status: normal
 --- config
     location /lua {
         rewrite_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -721,7 +717,7 @@ after f
         rewrite_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -774,7 +770,7 @@ f 3
         rewrite_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -783,7 +779,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            local function g()
+            function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -830,7 +826,7 @@ g 3
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -867,12 +863,12 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            local function g()
+            function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -918,7 +914,7 @@ hello from g
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -970,7 +966,7 @@ received: OK
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1031,7 +1027,7 @@ after)$
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1077,7 +1073,7 @@ body: hello world)$
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
diff --git a/debian/modules/http-lua/t/024-access/client-abort.t b/debian/modules/http-lua/t/024-access/client-abort.t
index 83bf0a4..c16f4ea 100644
--- a/debian/modules/http-lua/t/024-access/client-abort.t
+++ b/debian/modules/http-lua/t/024-access/client-abort.t
@@ -200,7 +200,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 
     location = /sleep {
@@ -241,7 +241,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 --- request
 GET /t
@@ -546,7 +546,7 @@ client prematurely closed connection
                 return
             end
 
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            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
diff --git a/debian/modules/http-lua/t/024-access/exec.t b/debian/modules/http-lua/t/024-access/exec.t
index d168a47..43c1a77 100644
--- a/debian/modules/http-lua/t/024-access/exec.t
+++ b/debian/modules/http-lua/t/024-access/exec.t
@@ -326,7 +326,7 @@ hello
 --- config
     location /main {
         access_by_lua '
-            local res = ngx.location.capture("/test_loc");
+            res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/024-access/mixed.t b/debian/modules/http-lua/t/024-access/mixed.t
index 22f0037..a9f8039 100644
--- a/debian/modules/http-lua/t/024-access/mixed.t
+++ b/debian/modules/http-lua/t/024-access/mixed.t
@@ -35,7 +35,7 @@ __DATA__
         access_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             print("access GET: ", res.status);
 
             res = ngx.location.capture("/memc",
@@ -49,7 +49,7 @@ __DATA__
         content_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -187,7 +187,7 @@ world\x03\x04\xff
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             print("rewrite GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -201,7 +201,7 @@ world\x03\x04\xff
         access_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             print("access GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -215,7 +215,7 @@ world\x03\x04\xff
         content_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
diff --git a/debian/modules/http-lua/t/024-access/multi-capture.t b/debian/modules/http-lua/t/024-access/multi-capture.t
index b1757dd..930b74d 100644
--- a/debian/modules/http-lua/t/024-access/multi-capture.t
+++ b/debian/modules/http-lua/t/024-access/multi-capture.t
@@ -154,7 +154,7 @@ res2.body = b
 
     location /main {
         access_by_lua '
-            local res = ngx.location.capture("/foo?n=1")
+            res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
diff --git a/debian/modules/http-lua/t/024-access/sanity.t b/debian/modules/http-lua/t/024-access/sanity.t
index e5612a8..7ff177f 100644
--- a/debian/modules/http-lua/t/024-access/sanity.t
+++ b/debian/modules/http-lua/t/024-access/sanity.t
@@ -69,7 +69,7 @@ GET /lua
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        access_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        access_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -87,7 +87,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-local v = ngx.var["request_uri"]
+v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -140,7 +140,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        access_by_lua 'local who = ngx.var.arg_who
+        access_by_lua 'who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
@@ -159,7 +159,7 @@ Hello, agentzh!
 
     location /lua {
         access_by_lua '
-local res = ngx.location.capture("/other")
+res = ngx.location.capture("/other")
 ngx.print("status=", res.status, " ")
 ngx.print("body=", res.body)
 ';
@@ -175,7 +175,7 @@ status=200 body=hello, world
 === TEST 9: capture non-existed location
 --- config
     location /lua {
-        access_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        access_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -187,7 +187,7 @@ GET /lua
 === TEST 10: invalid capture location (not as expected...)
 --- config
     location /lua {
-        access_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        access_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -244,7 +244,7 @@ GET /lua
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body, "\\n");
            else
@@ -271,7 +271,7 @@ access phase not running in subrequests
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -357,7 +357,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    access_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    access_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
     content_by_lua 'ngx.exit(ngx.OK)';
 }
 --- request
@@ -375,7 +375,7 @@ location /parent {
     set $a '';
     access_by_lua '
         ngx.var.a = 12;
-        local res = ngx.location.capture(
+        res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -397,7 +397,7 @@ location /sub {
 }
 location /parent {
     access_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = true });
+        res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 
@@ -419,7 +419,7 @@ location /sub {
 
 location /parent {
     access_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = false });
+        res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
     content_by_lua return;
@@ -439,7 +439,7 @@ GET /parent
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
 
@@ -464,7 +464,7 @@ type: foo/bar
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -492,7 +492,7 @@ Bar: Bah
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
diff --git a/debian/modules/http-lua/t/024-access/subrequest.t b/debian/modules/http-lua/t/024-access/subrequest.t
index 665780a..b6ccf11 100644
--- a/debian/modules/http-lua/t/024-access/subrequest.t
+++ b/debian/modules/http-lua/t/024-access/subrequest.t
@@ -27,7 +27,7 @@ __DATA__
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -54,7 +54,7 @@ DELETE
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ DELETE
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -105,7 +105,7 @@ POST
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -131,7 +131,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -158,7 +158,7 @@ GET
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo")
+            res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -184,7 +184,7 @@ GET
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo", {})
+            res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -213,7 +213,7 @@ GET
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -241,7 +241,7 @@ hello
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -276,7 +276,7 @@ hello
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -313,7 +313,7 @@ GET
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -345,7 +345,7 @@ hello
         access_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -386,7 +386,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            local res = ngx.location.capture("/memc",
+            res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -417,7 +417,7 @@ cached: hello
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -437,7 +437,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -458,7 +458,7 @@ fo%3D=%3D%3E
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -480,7 +480,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -502,7 +502,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -523,7 +523,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -544,7 +544,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -565,7 +565,7 @@ a=3&b=4
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
diff --git a/debian/modules/http-lua/t/024-access/uthread-exec.t b/debian/modules/http-lua/t/024-access/uthread-exec.t
index 9c88eb3..7add3d4 100644
--- a/debian/modules/http-lua/t/024-access/uthread-exec.t
+++ b/debian/modules/http-lua/t/024-access/uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.exec("/foo")
             end
 
@@ -59,7 +59,7 @@ i am foo
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -95,7 +95,7 @@ i am foo
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -179,12 +179,12 @@ hello foo
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
             end
 
@@ -271,7 +271,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-exit.t b/debian/modules/http-lua/t/024-access/uthread-exit.t
index 2757237..02c2a1f 100644
--- a/debian/modules/http-lua/t/024-access/uthread-exit.t
+++ b/debian/modules/http-lua/t/024-access/uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -172,13 +172,13 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -262,7 +262,7 @@ f
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -298,10 +298,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -394,10 +394,10 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -491,7 +491,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -502,7 +502,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -582,7 +582,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -682,7 +682,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -788,7 +788,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -883,7 +883,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -977,7 +977,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1062,7 +1062,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1146,7 +1146,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1229,7 +1229,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-redirect.t b/debian/modules/http-lua/t/024-access/uthread-redirect.t
index cb99a35..4eb4759 100644
--- a/debian/modules/http-lua/t/024-access/uthread-redirect.t
+++ b/debian/modules/http-lua/t/024-access/uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -113,7 +113,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-spawn.t b/debian/modules/http-lua/t/024-access/uthread-spawn.t
index bc92ccd..7c7ba3b 100644
--- a/debian/modules/http-lua/t/024-access/uthread-spawn.t
+++ b/debian/modules/http-lua/t/024-access/uthread-spawn.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
             end
 
@@ -68,11 +68,11 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("in thread 1")
             end
 
-            local function g()
+            function g()
                 ngx.say("in thread 2")
             end
 
@@ -117,7 +117,7 @@ after 2
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -154,13 +154,13 @@ after sleep
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            local function g()
+            function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -210,7 +210,7 @@ delete thread 2
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.blah()
             end
 
@@ -241,9 +241,9 @@ qr/lua user thread aborted: runtime error: access_by_lua\(nginx\.conf:\d+\):3: a
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
-                local res = ngx.location.capture("/proxy")
+                res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -287,7 +287,7 @@ after capture: hello world
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -340,7 +340,7 @@ after capture: hello foo
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -395,13 +395,13 @@ capture: hello bar
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            local function g()
+            function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -473,8 +473,7 @@ g: after capture: hello bah
 --- config
     location /lua {
         access_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -520,8 +519,7 @@ after g
 --- config
     location /lua {
         access_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -569,7 +567,7 @@ hello in g()
     location /lua {
         access_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -602,7 +600,7 @@ status: running
     location /lua {
         access_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
             end
 
@@ -634,8 +632,7 @@ status: zombie
     location /lua {
         access_by_lua '
             local co
-            local g
-            local function f()
+            function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -674,8 +671,7 @@ status: normal
 --- config
     location /lua {
         access_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -722,7 +718,7 @@ after f
         access_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -775,7 +771,7 @@ f 3
         access_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -784,7 +780,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            local function g()
+            function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -831,7 +827,7 @@ g 3
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -868,12 +864,12 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            local function g()
+            function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -919,7 +915,7 @@ hello from g
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -971,7 +967,7 @@ received: OK
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1032,7 +1028,7 @@ after)$
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1077,7 +1073,7 @@ body: hello world)$
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
diff --git a/debian/modules/http-lua/t/025-codecache.t b/debian/modules/http-lua/t/025-codecache.t
index 22b78b2..20791d7 100644
--- a/debian/modules/http-lua/t/025-codecache.t
+++ b/debian/modules/http-lua/t/025-codecache.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 163;
+plan tests => repeat_each() * 155;
 
 #$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
 
@@ -27,7 +27,7 @@ __DATA__
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -61,7 +61,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -95,7 +95,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -130,7 +130,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -166,7 +166,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -193,7 +193,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 6: code cache explicitly off (affects require) + content_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -204,7 +204,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
+            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
             f:write("module(..., package.seeall); ngx.say(102);")
             f:close()
             ngx.say("updated")
@@ -231,7 +231,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 7: code cache explicitly off (affects require) + content_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -240,7 +240,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
+            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
             f:write("module(..., package.seeall); ngx.say(102);")
             f:close()
             ngx.say("updated")
@@ -269,7 +269,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 8: code cache explicitly off (affects require) + set_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -279,7 +279,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
+            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
             f:write("module(..., package.seeall); return 102;")
             f:close()
             ngx.say("updated")
@@ -308,7 +308,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 9: code cache explicitly on (affects require) + set_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /lua {
         lua_code_cache on;
@@ -318,7 +318,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
+            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
             f:write("module(..., package.seeall); return 102;")
             f:close()
             ngx.say("updated")
@@ -355,7 +355,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("return 101")
             f:close()
             ngx.say("updated")
@@ -390,7 +390,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("return 101")
             f:close()
             ngx.say("updated")
@@ -468,7 +468,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 14: no clear builtin lib "string"
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location /lua {
@@ -504,7 +504,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 15: do not skip luarocks
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
      lua_code_cache off;"
 --- config
     location /main {
@@ -554,7 +554,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 16: do not skip luarocks*
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
      lua_code_cache off;"
 --- config
     location /main {
@@ -604,7 +604,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 17: clear _G table
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location /t {
@@ -1050,7 +1050,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
 
 === TEST 29: cosocket connection pool timeout (after Lua VM destroys)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location = /t {
@@ -1118,7 +1118,7 @@ qr/\blua tcp socket keepalive: free connection pool [0-9A-F]+ for "127.0.0.1:/,
 
 === TEST 30: cosocket connection pool timeout (before Lua VM destroys)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location = /t {
@@ -1244,133 +1244,3 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
 "decrementing the reference count for Lua VM: 1",
 "lua close the global Lua VM",
 ]
-
-
-
-=== TEST 32: make sure inline code keys are correct
-GitHub issue #1428
---- config
-include ../html/a/proxy.conf;
-include ../html/b/proxy.conf;
-include ../html/c/proxy.conf;
-
-location /t {
-    echo_location /a/;
-    echo_location /b/;
-    echo_location /a/;
-    echo_location /c/;
-}
-
---- user_files
->>> a/proxy.conf
-location /a/ {
-    content_by_lua_block { ngx.say("/a/ is called") }
-}
-
->>> b/proxy.conf
-location /b/ {
-    content_by_lua_block { ngx.say("/b/ is called") }
-}
-
->>> c/proxy.conf
-location /c/ {
-    content_by_lua_block { ngx.say("/b/ is called") }
-}
-
---- request
-GET /t
---- response_body
-/a/ is called
-/b/ is called
-/a/ is called
-/b/ is called
---- grep_error_log eval: qr/looking up Lua code cache with key '.*?'/
---- grep_error_log_out eval
-[
-"looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-",
-"looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-"]
---- log_level: debug
---- no_error_log
-[error]
-
-
-
-=== TEST 33: make sure Lua code file keys are correct
-GitHub issue #1428
---- config
-include ../html/a/proxy.conf;
-include ../html/b/proxy.conf;
-include ../html/c/proxy.conf;
-
-location /t {
-    echo_location /a/;
-    echo_location /b/;
-    echo_location /a/;
-    echo_location /c/;
-}
-
---- user_files
->>> a.lua
-ngx.say("/a/ is called")
-
->>> b.lua
-ngx.say("/b/ is called")
-
->>> c.lua
-ngx.say("/b/ is called")
-
->>> a/proxy.conf
-location /a/ {
-    content_by_lua_file html/a.lua;
-}
-
->>> b/proxy.conf
-location /b/ {
-    content_by_lua_file html/b.lua;
-}
-
->>> c/proxy.conf
-location /c/ {
-    content_by_lua_file html/c.lua;
-}
-
---- request
-GET /t
---- response_body
-/a/ is called
-/b/ is called
-/a/ is called
-/b/ is called
---- grep_error_log eval: qr/looking up Lua code cache with key '.*?'/
---- grep_error_log_out eval
-[
-"looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
-looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
-",
-"looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
-looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
-looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
-looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
-"
-]
---- log_level: debug
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/027-multi-capture.t b/debian/modules/http-lua/t/027-multi-capture.t
index 9299561..9227fe5 100644
--- a/debian/modules/http-lua/t/027-multi-capture.t
+++ b/debian/modules/http-lua/t/027-multi-capture.t
@@ -151,7 +151,7 @@ res2.body = b
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/foo?n=1")
+            res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
@@ -743,7 +743,7 @@ proxy_cache_path conf/cache levels=1:2 keys_zone=STATIC:10m inactive=10m max_siz
 
     location = /proxy {
             proxy_cache STATIC;
-            proxy_pass http://127.0.0.2:12345;
+            proxy_pass http://agentzh.org:12345;
             proxy_cache_key $proxy_host$uri$args;
             proxy_cache_valid any 1s;
             #proxy_http_version 1.1;
diff --git a/debian/modules/http-lua/t/028-req-header.t b/debian/modules/http-lua/t/028-req-header.t
index 8ddbb29..ca92daa 100644
--- a/debian/modules/http-lua/t/028-req-header.t
+++ b/debian/modules/http-lua/t/028-req-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 44);
+plan tests => repeat_each() * (2 * blocks() + 43);
 
 #no_diff();
 no_long_string();
@@ -2008,25 +2008,3 @@ found 3 headers.
 --- no_error_log
 lua exceeding request header limit
 [error]
-
-
-
-=== TEST 61: setting Host header clears cached $host variable
---- config
-    location /req-header {
-        # this makes $host indexed and cacheable
-        set $foo $host;
-
-        content_by_lua_block {
-            ngx.say(ngx.var.host)
-            ngx.req.set_header("Host", "new");
-            ngx.say(ngx.var.host)
-        }
-    }
---- request
-GET /req-header
---- response_body
-localhost
-new
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/030-uri-args.t b/debian/modules/http-lua/t/030-uri-args.t
index 7af63c4..a9d46ff 100644
--- a/debian/modules/http-lua/t/030-uri-args.t
+++ b/debian/modules/http-lua/t/030-uri-args.t
@@ -421,7 +421,7 @@ done
             ngx.req.set_uri_args("hello")
             ngx.req.set_uri("/bar", true);
         ';
-        proxy_pass http://127.0.0.2:12345;
+        proxy_pass http://agentzh.org:12345;
     }
 --- request
     GET /foo?world
@@ -568,7 +568,7 @@ HTTP/1.0 ca%20t=%25
             ngx.req.set_uri("/bar", true);
             ngx.exit(503)
         ';
-        proxy_pass http://127.0.0.2:12345;
+        proxy_pass http://agentzh.org:12345;
     }
 --- request
     GET /foo?world
@@ -586,7 +586,7 @@ hello
         #set $args 'hello';
         set $err '';
         access_by_lua '
-            local res, err = pcall(ngx.req.set_uri, "/bar", true);
+            res, err = pcall(ngx.req.set_uri, "/bar", true);
             ngx.var.err = err
         ';
         echo "err: $err";
@@ -626,7 +626,7 @@ uri: /bar
     location /foo {
         #set $args 'hello';
         content_by_lua '
-            local res, err = pcall(ngx.req.set_uri, "/bar", true);
+            res, err = pcall(ngx.req.set_uri, "/bar", true);
             ngx.say("err: ", err)
         ';
     }
@@ -665,7 +665,7 @@ uri: /bar
     location /foo {
         #set $args 'hello';
         set_by_lua $err '
-            local res, err = pcall(ngx.req.set_uri, "/bar", true);
+            res, err = pcall(ngx.req.set_uri, "/bar", true);
             return err
         ';
         echo "err: $err";
@@ -788,7 +788,7 @@ GET /lua
     location /lua {
         content_by_lua '
             local t = {bar = ngx.shared.dogs, foo = 3}
-            local rc, err = pcall(ngx.encode_args, t)
+            rc, err = pcall(ngx.encode_args, t)
             ngx.say("rc: ", rc, ", err: ", err)
         ';
     }
@@ -1112,7 +1112,6 @@ HTTP/1.0 a=3&b=5&b=6
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args)
 
@@ -1136,7 +1135,6 @@ b = foo
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=bar&b=foo&a=baz"
             args, err = ngx.decode_args(args)
 
@@ -1160,7 +1158,6 @@ b = foo
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = ""
             args, err = ngx.decode_args(args)
             if err then
@@ -1181,7 +1178,6 @@ n = 0
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a&b"
             args, err = ngx.decode_args(args)
             if err then
@@ -1204,7 +1200,6 @@ b = true
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=&b="
             args, err = ngx.decode_args(args)
 
@@ -1228,7 +1223,6 @@ b =
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args, 1)
             if err then
@@ -1252,7 +1246,6 @@ b = nil
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args, -1)
 
@@ -1277,7 +1270,7 @@ b = foo
     location /lua {
         content_by_lua '
             local s = "f+f=bar&B=foo"
-            local args, err = ngx.decode_args(s)
+            args, err = ngx.decode_args(s)
             if err then
                 ngx.say("err: ", err)
             end
@@ -1309,7 +1302,7 @@ s = f+f=bar&B=foo
     lua_need_request_body on;
     location /t {
         content_by_lua '
-            local function split(s, delimiter)
+            function split(s, delimiter)
                 local result = {}
                 local from = 1
                 local delim_from, delim_to = string.find(s, delimiter, from)
diff --git a/debian/modules/http-lua/t/034-match.t b/debian/modules/http-lua/t/034-match.t
index 473a11f..ebe5762 100644
--- a/debian/modules/http-lua/t/034-match.t
+++ b/debian/modules/http-lua/t/034-match.t
@@ -21,7 +21,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)")
+            m = ngx.re.match("hello, 1234", "([0-9]+)")
             if m then
                 ngx.say(m[0])
             else
@@ -40,7 +40,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(\\\\d+)")
+            m = ngx.re.match("hello, 1234", "(\\\\d+)")
             if m then
                 ngx.say(m[0])
             else
@@ -59,7 +59,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(\\d+)")
+            m = ngx.re.match("hello, 1234", "(\\d+)")
             if m then
                 ngx.say(m[0])
             else
@@ -80,7 +80,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "[[\\d+]]")
+            m = ngx.re.match("hello, 1234", "[[\\d+]]")
             if m then
                 ngx.say(m[0])
             else
@@ -101,7 +101,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+")
+            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -122,7 +122,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "")
+            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -145,7 +145,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
+            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -168,7 +168,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "foo")
+            m = ngx.re.match("hello, 1234", "foo")
             if m then
                 ngx.say(m[0])
             else
@@ -187,7 +187,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "HELLO")
+            m = ngx.re.match("hello, 1234", "HELLO")
             if m then
                 ngx.say(m[0])
             else
@@ -206,7 +206,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "HELLO", "i")
+            m = ngx.re.match("hello, 1234", "HELLO", "i")
             if m then
                 ngx.say(m[0])
             else
@@ -225,7 +225,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local rc, err = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iu")
+            rc, err = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iu")
             if not rc then
                 ngx.say("FAIL: ", err)
                 return
@@ -249,7 +249,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "^world", "m")
+            m = ngx.re.match("hello\\nworld", "^world", "m")
             if m then
                 ngx.say(m[0])
             else
@@ -268,7 +268,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", ".*", "m")
+            m = ngx.re.match("hello\\nworld", ".*", "m")
             if m then
                 ngx.say(m[0])
             else
@@ -287,7 +287,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "^world", "s")
+            m = ngx.re.match("hello\\nworld", "^world", "s")
             if m then
                 ngx.say(m[0])
             else
@@ -306,7 +306,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", ".*", "s")
+            m = ngx.re.match("hello\\nworld", ".*", "s")
             if m then
                 ngx.say(m[0])
             else
@@ -326,7 +326,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "x")
+            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "x")
             if m then
                 ngx.say(m[0])
             else
@@ -372,7 +372,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            local rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Hm")
+            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Hm")
             if rc then
                 if m then
                     ngx.say(m[0])
@@ -395,7 +395,7 @@ error: .*?unknown flag "H" \(flags "Hm"\)
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, world", "(world)|(hello)", "x")
+            m = ngx.re.match("hello, world", "(world)|(hello)", "x")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -418,7 +418,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)(h?)")
+            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -442,7 +442,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "a")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "a")
             if m then
                 ngx.say(m[0])
             else
@@ -461,7 +461,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "a")
+            m = ngx.re.match("1234, hello", "([0-9]+)", "a")
             if m then
                 ngx.say(m[0])
             else
@@ -481,7 +481,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = {}
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
+            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -504,7 +504,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = { pos = 3 }
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
+            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -526,7 +526,7 @@ not matched!
 --- config
     location /re {
         set_by_lua $res '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)")
+            m = ngx.re.match("hello, 1234", "([0-9]+)")
             if m then
                 return m[0]
             else
@@ -569,7 +569,7 @@ baz
     }
 --- user_files
 >>> a.lua
-local m = ngx.re.match("hello, 1234", "(\\\s+)")
+m = ngx.re.match("hello, 1234", "(\\\s+)")
 if m then
     ngx.say("[", m[0], "]")
 else
@@ -595,7 +595,7 @@ end
 local uri = "<impact>2</impact>"
 local regex = '(?:>[\\w\\s]*</?\\w{2,}>)';
 ngx.say("regex: ", regex)
-local m = ngx.re.match(uri, regex, "oi")
+m = ngx.re.match(uri, regex, "oi")
 if m then
     ngx.say("[", m[0], "]")
 else
@@ -613,7 +613,7 @@ regex: (?:>[\w\s]*</?\w{2,}>)
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", [[\\d+]])
+            m = ngx.re.match("hello, 1234", [[\\d+]])
             if m then
                 ngx.say(m[0])
             else
@@ -660,7 +660,7 @@ error: pcre_compile() failed: missing ) in "([0-9]+"
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", [[([0-9]+)]])
+            m = ngx.re.match("hello, 1234", [[([0-9]+)]])
             if m then
                 ngx.say(m[0])
             else
@@ -1027,7 +1027,7 @@ exec opts: 0
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -1067,7 +1067,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -1101,7 +1101,7 @@ failed to match
         content_by_lua '
             local res = {}
             local s = "hello, 1234"
-            local m = ngx.re.match(s, [[(\\d)(\\d)]], "o", nil, res)
+            m = ngx.re.match(s, [[(\\d)(\\d)]], "o", nil, res)
             if m then
                 ngx.say("1: m size: ", #m)
                 ngx.say("1: res size: ", #res)
@@ -1132,12 +1132,11 @@ failed to match
 === TEST 48: init_by_lua
 --- http_config
     init_by_lua '
-        package.loaded.m = ngx.re.match("hello, 1234", "(\\\\d+)")
+        m = ngx.re.match("hello, 1234", "(\\\\d+)")
     ';
 --- config
     location /re {
         content_by_lua '
-            local m = package.loaded.m
             if m then
                 ngx.say(m[0])
             else
diff --git a/debian/modules/http-lua/t/035-gmatch.t b/debian/modules/http-lua/t/035-gmatch.t
index 0dfeaea..0426997 100644
--- a/debian/modules/http-lua/t/035-gmatch.t
+++ b/debian/modules/http-lua/t/035-gmatch.t
@@ -123,7 +123,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            local it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "a")
+            it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "a")
             ngx.say(it())
         ';
     }
@@ -418,7 +418,7 @@ hello
         content_by_lua '
             local a = {}
             for i = 1, 3 do
-                local it = ngx.re.gmatch("hello, world", "[a-z]+")
+                it = ngx.re.gmatch("hello, world", "[a-z]+")
                 it()
                 collectgarbage()
                 table.insert(a, {"hello", "world"})
@@ -482,9 +482,9 @@ end
     GET /main
 --- response_body
 matched
-matched
---- no_error_log
-[error]
+sr failed: 500
+--- error_log
+attempt to use ngx.re.gmatch iterator in a request that did not create it
 
 
 
@@ -518,7 +518,7 @@ matched: []
     location /re {
         content_by_lua '
             local it = ngx.re.gmatch("1234, 1234", "(?<first>[0-9]+)")
-            local m = it()
+            m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -555,7 +555,7 @@ matched: []
         content_by_lua '
             local it = ngx.re.gmatch("1234, abcd, 1234", "(?<first>[0-9]+)|(?<second>[a-z]+)")
 
-            local m = it()
+            m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -599,7 +599,7 @@ abcd
     location /re {
         content_by_lua '
             local it = ngx.re.gmatch("hello, 1234", "(?<first>[a-z]+), (?<first>[0-9]+)", "D")
-            local m = it()
+            m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -825,7 +825,7 @@ exec opts: 0
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -871,7 +871,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -881,7 +881,7 @@ if not it then
     return
 end
 
-local res, err = it()
+res, err = it()
 
 --[[
 ngx.update_time()
diff --git a/debian/modules/http-lua/t/036-sub.t b/debian/modules/http-lua/t/036-sub.t
index 3e88eba..2b4b075 100644
--- a/debian/modules/http-lua/t/036-sub.t
+++ b/debian/modules/http-lua/t/036-sub.t
@@ -590,7 +590,7 @@ s: a好
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -693,7 +693,7 @@ ab.cd
 
 location = /t {
     content_by_lua '
-        local function test()
+        function test()
             local data = [[
                 OUTER {FIRST}
 ]]
diff --git a/debian/modules/http-lua/t/037-gsub.t b/debian/modules/http-lua/t/037-gsub.t
index 41f86ac..4c5810d 100644
--- a/debian/modules/http-lua/t/037-gsub.t
+++ b/debian/modules/http-lua/t/037-gsub.t
@@ -511,7 +511,7 @@ s: aa
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/038-match-o.t b/debian/modules/http-lua/t/038-match-o.t
index f6ae010..d61ff1f 100644
--- a/debian/modules/http-lua/t/038-match-o.t
+++ b/debian/modules/http-lua/t/038-match-o.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -39,7 +39,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(\\\\d+)", "o")
+            m = ngx.re.match("hello, 1234", "(\\\\d+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -58,7 +58,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(\\d+)", "o")
+            m = ngx.re.match("hello, 1234", "(\\d+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -79,7 +79,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "[[\\d+]]", "o")
+            m = ngx.re.match("hello, 1234", "[[\\d+]]", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -100,7 +100,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+", "o")
+            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -121,7 +121,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
+            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -144,7 +144,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "foo", "o")
+            m = ngx.re.match("hello, 1234", "foo", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -163,7 +163,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "HELLO", "o")
+            m = ngx.re.match("hello, 1234", "HELLO", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -182,7 +182,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "HELLO", "oi")
+            m = ngx.re.match("hello, 1234", "HELLO", "oi")
             if m then
                 ngx.say(m[0])
             else
@@ -224,7 +224,7 @@ this version of PCRE is not compiled with PCRE_UTF8 support|^hello章亦$
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "^world", "mo")
+            m = ngx.re.match("hello\\nworld", "^world", "mo")
             if m then
                 ngx.say(m[0])
             else
@@ -243,7 +243,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", ".*", "om")
+            m = ngx.re.match("hello\\nworld", ".*", "om")
             if m then
                 ngx.say(m[0])
             else
@@ -262,7 +262,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "^world", "so")
+            m = ngx.re.match("hello\\nworld", "^world", "so")
             if m then
                 ngx.say(m[0])
             else
@@ -281,7 +281,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", ".*", "os")
+            m = ngx.re.match("hello\\nworld", ".*", "os")
             if m then
                 ngx.say(m[0])
             else
@@ -301,7 +301,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "xo")
+            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "xo")
             if m then
                 ngx.say(m[0])
             else
@@ -347,7 +347,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            local rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Ho")
+            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Ho")
             if rc then
                 if m then
                     ngx.say(m[0])
@@ -370,7 +370,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, world", "(world)|(hello)", "xo")
+            m = ngx.re.match("hello, world", "(world)|(hello)", "xo")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -393,7 +393,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)(h?)", "o")
+            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -417,7 +417,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "oa")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "oa")
             if m then
                 ngx.say(m[0])
             else
@@ -436,7 +436,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "ao")
+            m = ngx.re.match("1234, hello", "([0-9]+)", "ao")
             if m then
                 ngx.say(m[0])
             else
@@ -456,7 +456,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = {}
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
+            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -479,7 +479,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = { pos = 3 }
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
+            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -501,7 +501,7 @@ not matched!
 --- config
     location /re {
         set_by_lua $res '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
             if m then
                 return m[0]
             else
diff --git a/debian/modules/http-lua/t/041-header-filter.t b/debian/modules/http-lua/t/041-header-filter.t
index 0adc699..7d8ee74 100644
--- a/debian/modules/http-lua/t/041-header-filter.t
+++ b/debian/modules/http-lua/t/041-header-filter.t
@@ -10,7 +10,7 @@ log_level('debug');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 13);
+plan tests => repeat_each() * 94;
 
 #no_diff();
 #no_long_string();
@@ -416,7 +416,7 @@ lua release ngx.ctx
 
 
 
-=== TEST 20: globals are shared by all requests
+=== TEST 20: global got cleared for each single request
 --- config
     location /lua {
         set $foo '';
@@ -428,7 +428,6 @@ lua release ngx.ctx
             if not foo then
                 foo = 1
             else
-                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             ngx.var.foo = foo
@@ -436,13 +435,10 @@ lua release ngx.ctx
     }
 --- request
 GET /lua
---- response_body_like
-^[12]$
+--- response_body
+1
 --- no_error_log
 [error]
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["", "old foo: 1\n"]
 
 
 
@@ -734,8 +730,7 @@ hello world
 --- config
     location /t {
         header_filter_by_lua '
-            local bar
-            local function foo()
+            function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/043-shdict.t b/debian/modules/http-lua/t/043-shdict.t
index b0528e5..9183bf5 100644
--- a/debian/modules/http-lua/t/043-shdict.t
+++ b/debian/modules/http-lua/t/043-shdict.t
@@ -420,7 +420,7 @@ ngx_slab_alloc() failed: no memory in lua_shared_dict zone
             ngx.say(dogs:get(key))
 
             key = string.rep("a", 65536)
-            local ok, err = dogs:set(key, "world")
+            ok, err = dogs:set(key, "world")
             if not ok then
                 ngx.say("not ok: ", err)
                 return
@@ -2048,7 +2048,7 @@ get_stale ok: false, stale: false
                 ngx.say("get not ok: ", err)
                 return
             end
-            local flags = err
+            flags = err
             ngx.say("get_stale ok: ", data, ", flags: ", flags,
                     ", stale: ", stale)
 
diff --git a/debian/modules/http-lua/t/047-match-jit.t b/debian/modules/http-lua/t/047-match-jit.t
index f53a408..2417a63 100644
--- a/debian/modules/http-lua/t/047-match-jit.t
+++ b/debian/modules/http-lua/t/047-match-jit.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "j")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "j")
             if m then
                 ngx.say(m[0])
             else
@@ -41,7 +41,7 @@ pcre JIT compiling result: 1
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, world", "([0-9]+)", "j")
+            m = ngx.re.match("hello, world", "([0-9]+)", "j")
             if m then
                 ngx.say(m[0])
             else
@@ -62,7 +62,7 @@ pcre JIT compiling result: 1
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "jo")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "jo")
             if m then
                 ngx.say(m[0])
             else
@@ -87,7 +87,7 @@ qr/pcre JIT compiling result: \d+/
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, world", "([0-9]+)", "jo")
+            m = ngx.re.match("hello, world", "([0-9]+)", "jo")
             if m then
                 ngx.say(m[0])
             else
@@ -147,7 +147,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 21)
+s = string.rep([[ABCDEFG]], 21)
 
 local start = ngx.now()
 
@@ -187,7 +187,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 21)
+s = string.rep([[ABCDEFG]], 21)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/048-match-dfa.t b/debian/modules/http-lua/t/048-match-dfa.t
index edf3662..28b5a60 100644
--- a/debian/modules/http-lua/t/048-match-dfa.t
+++ b/debian/modules/http-lua/t/048-match-dfa.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello", "(he|hell)", "d")
+            m = ngx.re.match("hello", "(he|hell)", "d")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -43,7 +43,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello", "(he|hell)", "do")
+            m = ngx.re.match("hello", "(he|hell)", "do")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -66,7 +66,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello", "(he|hell)", "jd")
+            m = ngx.re.match("hello", "(he|hell)", "jd")
             if m then
                 ngx.say(m[0])
             else
@@ -85,7 +85,7 @@ hell
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("world", "(he|hell)", "d")
+            m = ngx.re.match("world", "(he|hell)", "d")
             if m then
                 ngx.say(m[0])
             else
@@ -104,7 +104,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello", "he|hell", "do")
+            m = ngx.re.match("hello", "he|hell", "do")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -127,7 +127,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("world", "([0-9]+)", "do")
+            m = ngx.re.match("world", "([0-9]+)", "do")
             if m then
                 ngx.say(m[0])
             else
diff --git a/debian/modules/http-lua/t/055-subreq-vars.t b/debian/modules/http-lua/t/055-subreq-vars.t
index 1369992..eb5e24d 100644
--- a/debian/modules/http-lua/t/055-subreq-vars.t
+++ b/debian/modules/http-lua/t/055-subreq-vars.t
@@ -28,7 +28,7 @@ __DATA__
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ qr/variable "(dog|cat)" cannot be assigned a value \(maybe you forgot to define
     location /lua {
         set $dog '';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -110,7 +110,7 @@ variable "cat" cannot be assigned a value (maybe you forgot to define it first?)
         set $dog '';
         set $cat '';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -137,7 +137,7 @@ cat = 32
         set $dog '';
         set $cat '';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = "hello" });
 
             ngx.print(res.body)
@@ -165,7 +165,7 @@ Bad vars option value
         set $dog '';
         set $cat '';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { cat = true } });
 
             ngx.print(res.body)
@@ -188,7 +188,7 @@ attempt to use bad variable value type boolean
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { args = "a=hello&b=32" }});
 
             ngx.print(res.body)
@@ -234,7 +234,7 @@ variable "query_string" not changeable
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { copy_all_vars = true });
 
             ngx.print(res.body)
@@ -259,7 +259,7 @@ GET /lua
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { share_all_vars = true });
 
             ngx.print(res.body)
@@ -284,7 +284,7 @@ GET /lua
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { dog = "hiya" }, copy_all_vars = true });
 
             ngx.print(res.body)
diff --git a/debian/modules/http-lua/t/056-flush.t b/debian/modules/http-lua/t/056-flush.t
index bdd33d4..6b697a4 100644
--- a/debian/modules/http-lua/t/056-flush.t
+++ b/debian/modules/http-lua/t/056-flush.t
@@ -317,7 +317,7 @@ lua http 1.0 buffering makes ngx.flush() a no-op
 --- config
     location /test {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello, world")
                 ngx.flush(true)
                 coroutine.yield()
diff --git a/debian/modules/http-lua/t/057-flush-timeout.t b/debian/modules/http-lua/t/057-flush-timeout.t
index 1f8cfaa..a046539 100644
--- a/debian/modules/http-lua/t/057-flush-timeout.t
+++ b/debian/modules/http-lua/t/057-flush-timeout.t
@@ -127,7 +127,7 @@ del timer 1234
     send_timeout 200ms;
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
diff --git a/debian/modules/http-lua/t/058-tcp-socket.t b/debian/modules/http-lua/t/058-tcp-socket.t
index 837006c..354a876 100644
--- a/debian/modules/http-lua/t/058-tcp-socket.t
+++ b/debian/modules/http-lua/t/058-tcp-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 219;
+plan tests => repeat_each() * 199;
 
 our $HtmlDir = html_dir;
 
@@ -245,11 +245,11 @@ attempt to send data on a closed socket:
 
 --- request
 GET /t
---- response_body_like
+--- response_body
 connected: 1
 request sent: 56
-first line received: HTTP\/1\.1 200 OK
-second line received: (?:Date|Server): .*?
+first line received: HTTP/1.1 200 OK
+second line received: Server: openresty
 --- no_error_log
 [error]
 --- timeout: 10
@@ -298,7 +298,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
     location /test {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -321,7 +321,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -914,7 +914,7 @@ close: 1 nil
                 end
             end
 
-            local ok, err = sock:close()
+            ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
     }
@@ -961,7 +961,7 @@ close: 1 nil
             line, err = sock:receive()
             ngx.say("receive: ", line, " ", err)
 
-            local ok, err = sock:close()
+            ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
     }
@@ -1057,7 +1057,7 @@ close: 1 nil
 
 === TEST 19: cannot survive across request boundary (send)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1116,7 +1116,7 @@ received: OK|failed to send request: closed)\$"
 
 === TEST 20: cannot survive across request boundary (receive)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1191,7 +1191,7 @@ 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1260,7 +1260,7 @@ received: OK|failed to close: closed)$/
 
 === TEST 22: cannot survive across request boundary (connect)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -2611,7 +2611,7 @@ close: 1 nil
             local ready = false
             local fatal = false
 
-            local function f()
+            function f()
                 local line, err, part = sock:receive()
                 if not line then
                     ngx.say("failed to receive the 1st line: ", err, " [", part, "]")
@@ -2672,7 +2672,7 @@ lua clean up the timer for pending ngx.sleep
 
 === TEST 44: bad request tries to connect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2726,7 +2726,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):7: bad request/
 
 === TEST 45: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2783,7 +2783,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 46: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2840,7 +2840,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 47: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2897,7 +2897,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 48: bad request tries to set keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2954,7 +2954,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 49: bad request tries to receiveuntil
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -3315,7 +3315,7 @@ close: 1 nil
 
             local thr = ngx.thread.spawn(function ()
                 sock = ngx.socket.tcp()
-                local ok, err = sock:connect("127.0.0.2", 12345)
+                local ok, err = sock:connect("agentzh.org", 12345)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -3464,7 +3464,7 @@ lua http cleanup reuse
                 ngx.say("failed to create timer: ", err)
             end
 
-            local i = 1
+            i = 1
             while not done do
                 local time = 0.005 * i
                 if time > 0.1 then
@@ -3545,7 +3545,7 @@ lua http cleanup reuse
                 ngx.say("failed to create timer: ", err)
             end
 
-            local i = 1
+            i = 1
             while not done do
                 local time = 0.005 * i
                 if time > 0.1 then
@@ -3720,10 +3720,10 @@ sudo iptables -I OUTPUT 1 -p udp --dport 10086 -j REJECT
     }
 --- request
 GET /t
---- response_body_like
-failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
-failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
-failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
+--- response_body
+failed to connect: www.google.com could not be resolved
+failed to connect: www.google.com could not be resolved
+failed to connect: www.google.com could not be resolved
 hello!
 --- error_log eval
 qr{\[alert\] .*? send\(\) failed \(\d+: Operation not permitted\) while resolving}
@@ -3808,315 +3808,3 @@ received:
 received: truefalsenil
 --- no_error_log
 [error]
-
-
-
-=== TEST 64: receiveany method in cosocket
---- config
-    server_tokens off;
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-            local req = {
-                'GET /foo HTTP/1.0\r\n',
-                'Host: localhost\r\n',
-                'Connection: close\r\n\r\n',
-            }
-            local ok, err = sock:send(req)
-            if not ok then
-                ngx.say("send request failed: ", err)
-                return
-            end
-
-            -- skip http header
-            while true do
-                local data, err, _ = sock:receive('*l')
-                if err then
-                    ngx.say('unexpected error occurs when receiving http head: ', err)
-                    return
-                end
-
-                if #data == 0 then -- read last line of head
-                    break
-                end
-            end
-
-            -- receive http body
-            while true do
-                local data, err = sock:receiveany(1024)
-                if err then
-                    if err ~= 'closed' then
-                        ngx.say('unexpected err: ', err)
-                    end
-                    break
-                end
-                ngx.say(data)
-            end
-
-            sock:close()
-        }
-    }
-
-    location = /foo {
-        content_by_lua_block {
-            local resp = {
-                '1',
-                '22',
-                'hello world',
-            }
-
-            local length = 0
-            for _, v in ipairs(resp) do
-                length = length + #v
-            end
-
-            -- flush http header
-            ngx.header['Content-Length'] = length
-            ngx.flush(true)
-            ngx.sleep(0.01)
-
-            -- send http body
-            for _, v in ipairs(resp) do
-                ngx.print(v)
-                ngx.flush(true)
-                ngx.sleep(0.01)
-            end
-        }
-    }
-
---- request
-GET /t
---- response_body
-1
-22
-hello world
---- no_error_log
-[error]
---- error_log
-lua tcp socket read any
-
-
-
-=== TEST 65: receiveany send data after read side closed
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", 7658))
-
-            while true do
-                local data, err = sock:receiveany(1024)
-                if err then
-                    if err ~= 'closed' then
-                        ngx.say('unexpected err: ', err)
-                        break
-                    end
-
-                    local data = "send data after read side closed"
-                    local bytes, err = sock:send(data)
-                    if not bytes then
-                        ngx.say(err)
-                    end
-
-                    break
-                end
-                ngx.say(data)
-            end
-
-            sock:close()
-        }
-    }
-
---- request
-GET /t
---- tcp_listen: 7658
---- tcp_shutdown: 1
---- tcp_query eval: "send data after read side closed"
---- tcp_query_len: 32
---- response_body
---- no_error_log
-[error]
-
-
-
-=== TEST 66: receiveany with limited, max <= 0
---- config
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-
-            local function receiveany_say_err(...)
-                local ok, err = pcall(sock.receiveany, sock, ...)
-                if not ok then
-                    ngx.say(err)
-                end
-            end
-
-
-            receiveany_say_err(0)
-            receiveany_say_err(-1)
-            receiveany_say_err()
-            receiveany_say_err(nil)
-        }
-    }
-
---- response_body
-bad argument #2 to '?' (bad max argument)
-bad argument #2 to '?' (bad max argument)
-expecting 2 arguments (including the object), but got 1
-bad argument #2 to '?' (bad max argument)
---- request
-GET /t
---- no_error_log
-[error]
-
-
-
-=== TEST 67: receiveany with limited, max is larger than data
---- config
-    server_tokens off;
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-            local req = {
-                'GET /foo HTTP/1.0\r\n',
-                'Host: localhost\r\n',
-                'Connection: close\r\n\r\n',
-            }
-            local ok, err = sock:send(req)
-            if not ok then
-                ngx.say("send request failed: ", err)
-                return
-            end
-
-            while true do
-                local data, err, _ = sock:receive('*l')
-                if err then
-                    ngx.say('unexpected error occurs when receiving http head: ', err)
-                    return
-                end
-
-                if #data == 0 then -- read last line of head
-                    break
-                end
-            end
-
-            local data, err = sock:receiveany(128)
-            if err then
-                if err ~= 'closed' then
-                    ngx.say('unexpected err: ', err)
-                end
-            else
-                ngx.say(data)
-            end
-
-            sock:close()
-        }
-    }
-
-    location = /foo {
-        content_by_lua_block {
-            local resp = 'hello world'
-            local length = #resp
-
-            ngx.header['Content-Length'] = length
-            ngx.flush(true)
-            ngx.sleep(0.01)
-
-            ngx.print(resp)
-        }
-    }
-
---- request
-GET /t
---- response_body
-hello world
---- no_error_log
-[error]
---- error_log
-lua tcp socket calling receiveany() method to read at most 128 bytes
-
-
-
-=== TEST 68: receiveany with limited, max is smaller than data
---- config
-    server_tokens off;
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-            local req = {
-                'GET /foo HTTP/1.0\r\n',
-                'Host: localhost\r\n',
-                'Connection: close\r\n\r\n',
-            }
-            local ok, err = sock:send(req)
-            if not ok then
-                ngx.say("send request failed: ", err)
-                return
-            end
-
-            while true do
-                local data, err, _ = sock:receive('*l')
-                if err then
-                    ngx.say('unexpected error occurs when receiving http head: ', err)
-                    return
-                end
-
-                if #data == 0 then -- read last line of head
-                    break
-                end
-            end
-
-            while true do
-                local data, err = sock:receiveany(7)
-                if err then
-                    if err ~= 'closed' then
-                        ngx.say('unexpected err: ', err)
-                    end
-                    break
-
-                else
-                    ngx.say(data)
-                end
-            end
-
-            sock:close()
-        }
-    }
-
-    location = /foo {
-        content_by_lua_block {
-            local resp = 'hello world'
-            local length = #resp
-
-            ngx.header['Content-Length'] = length
-            ngx.flush(true)
-            ngx.sleep(0.01)
-
-            ngx.print(resp)
-        }
-    }
-
---- request
-GET /t
---- response_body
-hello w
-orld
---- no_error_log
-[error]
---- error_log
-lua tcp socket calling receiveany() method to read at most 7 bytes
diff --git a/debian/modules/http-lua/t/062-count.t b/debian/modules/http-lua/t/062-count.t
index 9b0afe8..2ad2f9f 100644
--- a/debian/modules/http-lua/t/062-count.t
+++ b/debian/modules/http-lua/t/062-count.t
@@ -283,7 +283,7 @@ n = 5
 --- request
 GET /test
 --- response_body
-n = 22
+n = 18
 --- no_error_log
 [error]
 
@@ -444,28 +444,7 @@ worker: 4
 
 
 
-=== TEST 20: entries under the metatable of tcp sockets
---- config
-        location = /test {
-            content_by_lua_block {
-                local n = 0
-                local sock = ngx.socket.tcp()
-                for k, v in pairs(getmetatable(sock)) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            }
-        }
---- request
-GET /test
---- response_body
-n = 13
---- no_error_log
-[error]
-
-
-
-=== TEST 21: entries under the metatable of udp sockets
+=== TEST 20: entries under the metatable of udp sockets
 --- config
         location = /test {
             content_by_lua '
@@ -486,7 +465,7 @@ n = 6
 
 
 
-=== TEST 22: entries under the metatable of req raw sockets
+=== TEST 21: entries under the metatable of req raw sockets
 --- config
         location = /test {
             content_by_lua '
@@ -518,7 +497,7 @@ n = 6
 
 
 
-=== TEST 23: entries under the req raw sockets
+=== TEST 22: entries under the req raw sockets
 --- config
         location = /test {
             content_by_lua_block {
@@ -557,7 +536,7 @@ nrec = 3
 
 
 
-=== TEST 24: entries under the req sockets
+=== TEST 23: entries under the req sockets
 --- config
         location = /test {
             content_by_lua_block {
diff --git a/debian/modules/http-lua/t/063-abort.t b/debian/modules/http-lua/t/063-abort.t
index 7c90eaa..411a07e 100644
--- a/debian/modules/http-lua/t/063-abort.t
+++ b/debian/modules/http-lua/t/063-abort.t
@@ -22,7 +22,7 @@ __DATA__
 
 === TEST 1: ngx.exit(400) should abort print
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /memc_query {
             internal;
@@ -68,7 +68,7 @@ GET /test?a
 
 === TEST 2: ngx.exit(400) should abort ngx.log
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /memc_query {
             internal;
@@ -116,7 +116,7 @@ GET /test?a
 
 === TEST 3: ngx.exit(400) should abort ngx.location.capture
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /memc_query {
             internal;
@@ -161,7 +161,7 @@ the "$memc_key" variable is not set
 
 === TEST 4: ngx.exit(400) should abort ngx.location.capture_multi
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /memc_query {
             internal;
@@ -206,7 +206,7 @@ the "$memc_key" variable is not set
 
 === TEST 5: ngx.exit(400) should abort ngx.redirect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -233,7 +233,7 @@ lua redirect to "/blah" with code 302
 
 === TEST 6: ngx.exit(400) should abort ngx.exit
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -260,7 +260,7 @@ lua exit with code 503
 
 === TEST 7: ngx.exit(400) should abort ngx.exec
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -287,7 +287,7 @@ lua exec "/blah?"
 
 === TEST 8: ngx.exit(400) should abort ngx.send_headers
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -314,7 +314,7 @@ lua send headers
 
 === TEST 9: ngx.exit(400) should abort ngx.print
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -341,7 +341,7 @@ lua print response
 
 === TEST 10: ngx.exit(400) should abort ngx.say
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -368,7 +368,7 @@ lua say response
 
 === TEST 11: ngx.exit(400) should abort ngx.flush
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -395,7 +395,7 @@ lua flush asynchronously
 
 === TEST 12: ngx.exit(400) should abort ngx.eof
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -422,7 +422,7 @@ lua send eof
 
 === TEST 13: ngx.exit(400) should abort ngx.re.match
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -449,7 +449,7 @@ lua compiling match regex "a" with options "jo"
 
 === TEST 14: ngx.exit(400) should abort ngx.re.gmatch
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -476,7 +476,7 @@ lua compiling gmatch regex "a" with options "jo"
 
 === TEST 15: ngx.exit(400) should abort ngx.re.sub
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -503,7 +503,7 @@ lua compiling sub regex "a" with options "jo"
 
 === TEST 16: ngx.exit(400) should abort ngx.re.gsub
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -530,7 +530,7 @@ lua compiling gsub regex "a" with options "jo"
 
 === TEST 17: ngx.exit(400) should abort ngx.shared.DICT (set)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -560,7 +560,7 @@ foo = 56
 
 === TEST 18: ngx.exit(400) should abort ngx.shared.DICT (replace)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -590,7 +590,7 @@ foo = 56
 
 === TEST 19: ngx.exit(400) should abort ngx.shared.DICT (incr)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -620,7 +620,7 @@ foo = 88
 
 === TEST 20: ngx.exit(400) should abort ngx.shared.DICT (get)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -649,7 +649,7 @@ fetching key "foo" in shared dict "dogs"
 
 === TEST 21: ngx.exit(400) should skip os.execute
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -679,7 +679,7 @@ GET /test
 
 === TEST 22: ngx.exit(400) should break pcall and skip os.execute
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -709,7 +709,7 @@ fetching key "foo" in shared dict "dogs"
 
 === TEST 23: ngx.exit(400) should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -739,7 +739,7 @@ GET /test
 
 === TEST 24: ngx.redirect() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -769,7 +769,7 @@ GET /test
 
 === TEST 25: ngx.redirect() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -799,7 +799,7 @@ GET /test
 
 === TEST 26: ngx.exec() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -832,7 +832,7 @@ foo
 
 === TEST 27: ngx.exec() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -865,7 +865,7 @@ foo
 
 === TEST 28: ngx.set_uri(uri, true) should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             rewrite_by_lua '
@@ -921,7 +921,7 @@ hello world
 
 === TEST 30: ngx.exit(400) should break xpcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -955,7 +955,7 @@ GET /test
 
 === TEST 31: ngx.exec() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -988,7 +988,7 @@ foo
 
 === TEST 32: ngx.exec() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
diff --git a/debian/modules/http-lua/t/064-pcall.t b/debian/modules/http-lua/t/064-pcall.t
index 9af2de7..3011f3e 100644
--- a/debian/modules/http-lua/t/064-pcall.t
+++ b/debian/modules/http-lua/t/064-pcall.t
@@ -22,11 +22,11 @@ __DATA__
 
 === TEST 1: pcall works
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
-                local function f(a, b)
+                function f(a, b)
                     if a == 0 and b == 0 then
                         error("zero error")
                     end
@@ -58,11 +58,11 @@ $/s
 
 === TEST 2: xpcall works
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
-                local function f(a, b)
+                function f(a, b)
                     if a == 0 and b == 0 then
                         error("zero error")
                     end
@@ -70,15 +70,15 @@ $/s
                     return 23, "hello", true
                 end
 
-                local function g()
+                function g()
                     return f(0, 0)
                 end
 
-                local function h()
+                function h()
                     return f(0)
                 end
 
-                local function err(...)
+                function err(...)
                     ngx.say("error handler called: ", ...)
                     return "this is the new err"
                 end
diff --git a/debian/modules/http-lua/t/065-tcp-socket-timeout.t b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
index 092094a..78b8cff 100644
--- a/debian/modules/http-lua/t/065-tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
@@ -51,7 +51,7 @@ __DATA__
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -66,7 +66,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -81,7 +81,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(150)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -96,7 +96,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 150
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -110,7 +110,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(nil)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -125,7 +125,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 
 
 
@@ -139,7 +139,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(0)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -154,7 +154,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -168,7 +168,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(-1)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -584,7 +584,7 @@ bad timeout value
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -683,7 +683,7 @@ after
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("1: failed to connect: ", err)
 
@@ -707,7 +707,7 @@ GET /t
 2: connected: 1
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
diff --git a/debian/modules/http-lua/t/066-socket-receiveuntil.t b/debian/modules/http-lua/t/066-socket-receiveuntil.t
index 89d2abf..ffe74aa 100644
--- a/debian/modules/http-lua/t/066-socket-receiveuntil.t
+++ b/debian/modules/http-lua/t/066-socket-receiveuntil.t
@@ -245,7 +245,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -316,7 +316,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -387,7 +387,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaa")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -458,7 +458,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -530,7 +530,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -602,7 +602,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -673,7 +673,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -744,7 +744,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -815,7 +815,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -886,7 +886,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -957,7 +957,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -1028,7 +1028,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1105,7 +1105,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1182,7 +1182,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1270,7 +1270,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
diff --git a/debian/modules/http-lua/t/067-req-socket.t b/debian/modules/http-lua/t/067-req-socket.t
index 6593360..229d5cc 100644
--- a/debian/modules/http-lua/t/067-req-socket.t
+++ b/debian/modules/http-lua/t/067-req-socket.t
@@ -320,7 +320,7 @@ found the end of the stream
 
 === TEST 4: attempt to use the req socket across request boundary
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         content_by_lua '
@@ -369,7 +369,7 @@ hello world
 === 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         content_by_lua '
@@ -431,7 +431,7 @@ done
 
 === TEST 6: pipelined POST requests
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         content_by_lua '
diff --git a/debian/modules/http-lua/t/068-socket-keepalive.t b/debian/modules/http-lua/t/068-socket-keepalive.t
index e4c6988..f052e9a 100644
--- a/debian/modules/http-lua/t/068-socket-keepalive.t
+++ b/debian/modules/http-lua/t/068-socket-keepalive.t
@@ -4,14 +4,13 @@ use Test::Nginx::Socket::Lua;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 31);
+plan tests => repeat_each() * (blocks() * 5 + 9);
 
 our $HtmlDir = html_dir;
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
 $ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
 
 $ENV{LUA_PATH} ||=
     '/usr/local/openresty-debug/lualib/?.lua;/usr/local/openresty/lualib/?.lua;;';
@@ -30,7 +29,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -98,7 +97,7 @@ lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGI
 
 === TEST 2: free up the whole connection pool if no active connections
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -169,7 +168,7 @@ received: OK
 
 === TEST 3: upstream sockets close prematurely
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
    server_tokens off;
    keepalive_timeout 100ms;
@@ -244,7 +243,7 @@ done
 
 === TEST 4: http keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
    server_tokens off;
    location /t {
@@ -702,35 +701,7 @@ qr/lua tcp socket connection pool size: 25\b/]
 
 
 
-=== TEST 10: setkeepalive() 'pool_size' should be greater than zero
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-        content_by_lua_block {
-            local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
-            if not sock then
-                ngx.say(err)
-                return
-            end
-
-            local ok, err = pcall(sock.setkeepalive, sock, 0, 0)
-            if not ok then
-                ngx.say(err)
-                return
-            end
-            ngx.say(ok)
-        }
-    }
---- request
-GET /t
---- response_body
-bad argument #3 to '?' (bad "pool_size" option value: 0)
---- no_error_log
-[error]
-
-
-
-=== TEST 11: sock:keepalive_timeout(0) means unlimited
+=== TEST 10: sock:keepalive_timeout(0) means unlimited
 --- config
    server_tokens off;
    location /t {
@@ -805,10 +776,10 @@ qr/lua tcp socket connection pool size: 30\b/]
 
 
 
-=== TEST 12: sanity (uds)
+=== TEST 11: sanity (uds)
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -887,7 +858,7 @@ received response of 119 bytes
 
 
 
-=== TEST 13: github issue #108: ngx.locaiton.capture + redis.set_keepalive
+=== TEST 12: github issue #108: ngx.locaiton.capture + redis.set_keepalive
 --- http_config eval
     qq{
         lua_package_path "$::HtmlDir/?.lua;;";
@@ -934,9 +905,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 14: github issue #110: ngx.exit with HTTP_NOT_FOUND causes worker process to exit
+=== 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     error_page 404 /404.html;
     location /t {
@@ -993,9 +964,9 @@ Not found, dear...
 
 
 
-=== TEST 15: custom pools (different pool for the same host:port) - tcp
+=== TEST 14: custom pools (different pool for the same host:port) - tcp
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1041,9 +1012,9 @@ lua tcp socket keepalive create connection pool for key "B"
 
 
 
-=== TEST 16: custom pools (same pool for different host:port) - tcp
+=== TEST 15: custom pools (same pool for different host:port) - tcp
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1088,10 +1059,10 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 17: custom pools (different pool for the same host:port) - unix
+=== TEST 16: custom pools (different pool for the same host:port) - unix
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -1148,10 +1119,10 @@ lua tcp socket keepalive create connection pool for key "B"
 
 
 
-=== TEST 18: custom pools (same pool for the same path) - unix
+=== TEST 17: custom pools (same pool for the same path) - unix
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -1203,9 +1174,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 19: numeric pool option value
+=== TEST 18: numeric pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1250,9 +1221,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 20: nil pool option value
+=== TEST 19: nil pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1293,9 +1264,9 @@ connected: 1, reused: 0
 
 
 
-=== TEST 21: (bad) table pool option value
+=== TEST 20: (bad) table pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1334,9 +1305,9 @@ bad argument #3 to 'connect' (bad "pool" option type: table)
 
 
 
-=== TEST 22: (bad) boolean pool option value
+=== TEST 21: (bad) boolean pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1375,7 +1346,7 @@ bad argument #3 to 'connect' (bad "pool" option type: boolean)
 
 
 
-=== TEST 23: clear the redis store
+=== TEST 22: clear the redis store
 --- config
     location /t {
         redis2_query flushall;
@@ -1392,9 +1363,9 @@ bad argument #3 to 'connect' (bad "pool" option type: boolean)
 
 
 
-=== TEST 24: bug in send(): clear the chain writer ctx
+=== TEST 23: bug in send(): clear the chain writer ctx
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_REDIS_PORT;
@@ -1507,7 +1478,7 @@ done
 
 
 
-=== TEST 25: setkeepalive() with explicit nil args
+=== TEST 24: setkeepalive() with explicit nil args
 --- config
    server_tokens off;
    location /t {
@@ -1580,1379 +1551,3 @@ done
 "lua tcp socket keepalive timeout: 100 ms",
 qr/lua tcp socket connection pool size: 30\b/]
 --- timeout: 4
-
-
-
-=== TEST 26: conn queuing: connect() verifies the options for connection pool
---- config
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local function check_opts_for_connect(opts)
-                local ok, err = pcall(function()
-                    sock:connect("127.0.0.1", ngx.var.port, opts)
-                end)
-                if not ok then
-                    ngx.say(err)
-                else
-                    ngx.say("ok")
-                end
-            end
-
-            check_opts_for_connect({pool_size = 'a'})
-            check_opts_for_connect({pool_size = 0})
-            check_opts_for_connect({backlog = -1})
-            check_opts_for_connect({backlog = 0})
-        }
-    }
---- request
-GET /t
---- response_body_like
-.+ 'connect' \(bad "pool_size" option type: string\)
-.+ 'connect' \(bad "pool_size" option value: 0\)
-.+ 'connect' \(bad "backlog" option value: -1\)
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 27: conn queuing: connect() can specify 'pool_size' which overrides setkeepalive()
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local function go()
-                local sock = ngx.socket.tcp()
-                local ok, err = sock:connect("127.0.0.1", port, {pool_size = 1})
-                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(0, 20)
-                if not ok then
-                    ngx.say("failed to set reusable: ", err)
-                end
-            end
-
-            -- reuse ok
-            go()
-            go()
-
-            local sock1 = ngx.socket.connect("127.0.0.1", port)
-            local sock2 = ngx.socket.connect("127.0.0.1", port)
-            local ok, err = sock1:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-            local ok, err = sock2:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-
-            -- the pool_size is 1 instead of 20
-            sock1 = ngx.socket.connect("127.0.0.1", port)
-            sock2 = ngx.socket.connect("127.0.0.1", port)
-            ngx.say("reused: ", sock1:getreusedtimes())
-            ngx.say("reused: ", sock2:getreusedtimes())
-            sock1:setkeepalive(0, 20)
-            sock2:setkeepalive(0, 20)
-        }
-    }
---- request
-GET /t
---- response_body
-connected: 1, reused: 0
-request sent: 11
-received: OK
-connected: 1, reused: 1
-request sent: 11
-received: OK
-reused: 1
-reused: 0
---- no_error_log eval
-["[error]",
-"lua tcp socket keepalive: free connection pool for ",
-"lua tcp socket connection pool size: 20"]
---- error_log eval
-[qq{lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"},
-"lua tcp socket connection pool size: 1",
-]
-
-
-
-=== TEST 28: conn queuing: connect() can specify 'pool_size' for unix domain socket
---- http_config eval
-"
-    server {
-        listen unix:$::HtmlDir/nginx.sock;
-    }
-"
---- config
-    location /t {
-        content_by_lua_block {
-            local path = "unix:" .. "$TEST_NGINX_HTML_DIR/nginx.sock";
-            local function go()
-                local sock = ngx.socket.tcp()
-                local ok, err = sock:connect(path, {pool_size = 1})
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-                local ok, err = sock:setkeepalive(0, 20)
-                if not ok then
-                    ngx.say("failed to set reusable: ", err)
-                end
-            end
-
-            go()
-            go()
-
-            local sock1 = ngx.socket.connect(path)
-            local sock2 = ngx.socket.connect(path)
-            local ok, err = sock1:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-            local ok, err = sock2:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-
-            -- the pool_size is 1 instead of 20
-            sock1 = ngx.socket.connect(path)
-            sock2 = ngx.socket.connect(path)
-            ngx.say("reused: ", sock1:getreusedtimes())
-            ngx.say("reused: ", sock2:getreusedtimes())
-            sock1:setkeepalive(0, 20)
-            sock2:setkeepalive(0, 20)
-        }
-    }
---- request
-GET /t
---- response_body
-connected: 1, reused: 0
-connected: 1, reused: 1
-reused: 1
-reused: 0
---- no_error_log eval
-["[error]",
-"lua tcp socket keepalive: free connection pool for ",
-"lua tcp socket connection pool size: 20"]
---- error_log eval
-["lua tcp socket get keepalive peer: using connection",
-'lua tcp socket keepalive create connection pool for key "unix:',
-"lua tcp socket connection pool size: 1",
-]
-
-
-
-=== TEST 29: conn queuing: connect() can specify 'pool_size' for custom pool
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local function go(pool)
-                local sock = ngx.socket.tcp()
-                local ok, err = sock:connect("127.0.0.1", port, {pool = pool, pool_size = 1})
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", pool, ", reused: ", sock:getreusedtimes())
-
-                local ok, err = sock:setkeepalive(0, 20)
-                if not ok then
-                    ngx.say("failed to set reusable: ", err)
-                end
-            end
-
-            go('A')
-            go('B')
-            go('A')
-            go('B')
-
-            local sock1 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
-            local sock2 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
-            local ok, err = sock1:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-            local ok, err = sock2:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-
-            -- the pool_size is 1 instead of 20
-            sock1 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
-            sock2 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
-            ngx.say("reused: ", sock1:getreusedtimes())
-            ngx.say("reused: ", sock2:getreusedtimes())
-            sock1:setkeepalive(0, 20)
-            sock2:setkeepalive(0, 20)
-        }
-    }
---- request
-GET /t
---- response_body
-connected: A, reused: 0
-connected: B, reused: 0
-connected: A, reused: 1
-connected: B, reused: 1
-reused: 1
-reused: 0
---- no_error_log eval
-["[error]",
-"lua tcp socket keepalive: free connection pool for ",
-"lua tcp socket connection pool size: 20"]
---- error_log eval
-[qq{lua tcp socket keepalive create connection pool for key "A"},
-qq{lua tcp socket keepalive create connection pool for key "B"},
-"lua tcp socket connection pool size: 1",
-]
-
-
-
-=== TEST 30: conn queuing: connect() uses lua_socket_pool_size as default if 'backlog' is given
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-        lua_socket_pool_size 1234;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {backlog = 0}
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.say(err)
-            else
-                ngx.say("ok")
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- error_log
-lua tcp socket connection pool size: 1234
---- no_error_log
-[error]
-
-
-
-=== TEST 31: conn queuing: more connect operations than 'backlog' size
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 2, backlog = 0}
-            local sock = ngx.socket.connect("127.0.0.1", port, opts)
-            local not_reused_socket, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not not_reused_socket then
-                ngx.say(err)
-                return
-            end
-            -- burst
-            local ok, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.say(err)
-                return
-            end
-
-            ok, err = sock:connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-            ngx.say("reused: ", sock:getreusedtimes())
-            -- both queue and pool is full
-            ok, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
-reused: 1
-too many waiting connect operations
---- no_error_log
-[error]
-
-
-
-=== TEST 32: conn queuing: once 'pool_size' is reached and pool has 'backlog'
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 2, backlog = 2}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            ngx.timer.at(0, function(premature)
-                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock2 then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                ngx.log(ngx.WARN, "start to handle timer")
-                ngx.sleep(0.1)
-                sock2:close()
-                -- resume connect operation
-                ngx.log(ngx.WARN, "continue to handle timer")
-            end)
-
-            ngx.sleep(0.05)
-            ngx.log(ngx.WARN, "start to handle cosocket")
-            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock3 then
-                ngx.say(err)
-                return
-            end
-            ngx.log(ngx.WARN, "continue to handle cosocket")
-
-            local req = "flush_all\r\n"
-            local bytes, err = sock3:send(req)
-            if not bytes then
-                ngx.say("failed to send request: ", err)
-                return
-            end
-            ngx.say("request sent: ", bytes)
-
-            local line, err, part = sock3:receive()
-            if line then
-                ngx.say("received: ", line)
-            else
-                ngx.say("failed to receive a line: ", err, " [", part, "]")
-            end
-
-            local ok, err = sock3:setkeepalive()
-            if not ok then
-                ngx.say("failed to set reusable: ", err)
-            end
-            ngx.say("setkeepalive: OK")
-        }
-    }
---- request
-GET /t
---- response_body
-request sent: 11
-received: OK
-setkeepalive: OK
---- no_error_log
-[error]
---- error_log
-lua tcp socket queue connect operation for connection pool "127.0.0.1
---- grep_error_log eval: qr/(start|continue) to handle \w+/
---- grep_error_log_out
-start to handle timer
-start to handle cosocket
-continue to handle timer
-continue to handle cosocket
-
-
-
-=== TEST 33: conn queuing: do not count failed connect operations
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 0}
-
-            local sock = ngx.socket.tcp()
-            sock:settimeouts(100, 3000, 3000)
-            local ok, err = sock:connect("127.0.0.2", 12345, opts)
-            if not ok then
-                ngx.say(err)
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.say(err)
-            end
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- error_log
-lua tcp socket connect timed out, when connecting to
---- response_body
-timeout
-ok
-
-
-
-=== TEST 34: conn queuing: connect until backlog is reached
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 1}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            ngx.timer.at(0.01, function(premature)
-                ngx.log(ngx.WARN, "start to handle timer")
-                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock2 then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                ngx.sleep(0.02)
-                local ok, err = sock2:close()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-                ngx.log(ngx.WARN, "continue to handle timer")
-            end)
-
-            ngx.sleep(0.02)
-            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock3 then
-                ngx.say(err)
-            end
-            local ok, err = sock1:setkeepalive()
-            if not ok then
-                ngx.say(err)
-                return
-            end
-            ngx.sleep(0.01) -- run sock2
-
-            ngx.log(ngx.WARN, "start to handle cosocket")
-            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock3 then
-                ngx.say(err)
-                return
-            end
-            ngx.log(ngx.WARN, "continue to handle cosocket")
-
-            local ok, err = sock3:setkeepalive()
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
---- no_error_log
-[error]
---- error_log
-lua tcp socket queue connect operation for connection pool "127.0.0.1
---- grep_error_log eval: qr/queue connect operation for connection pool|(start|continue) to handle \w+/
---- grep_error_log_out
-start to handle timer
-queue connect operation for connection pool
-start to handle cosocket
-queue connect operation for connection pool
-continue to handle timer
-continue to handle cosocket
-
-
-
-=== TEST 35: conn queuing: memory reuse for host in queueing connect operation ctx
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 3}
-            local sock = ngx.socket.connect("127.0.0.1", port, opts)
-
-            ngx.timer.at(0.01, function(premature)
-                local sock, err = ngx.socket.connect("0.0.0.0", port, opts)
-                if not sock then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                local ok, err = sock:close()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-            end)
-
-            ngx.timer.at(0.015, function(premature)
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                local ok, err = sock:close()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-            end)
-
-            ngx.timer.at(0.02, function(premature)
-                local sock, err = ngx.socket.connect("0.0.0.0", port, opts)
-                if not sock then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                local ok, err = sock:close()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-            end)
-
-            ngx.sleep(0.03)
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.say(err)
-                return
-            end
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 36: conn queuing: connect() returns error after connect operation resumed
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-            local sock = ngx.socket.connect("127.0.0.1", port, opts)
-
-            ngx.timer.at(0, function(premature)
-                local sock, err = ngx.socket.connect("", port, opts)
-                if not sock then
-                    ngx.log(ngx.WARN, err)
-                end
-            end)
-
-            ngx.sleep(0.01)
-            -- use 'close' to force parsing host instead of reusing conn
-            local ok, err = sock:close()
-            if not ok then
-                ngx.say(err)
-                return
-            end
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- error_log
-failed to parse host name
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-
-
-
-=== TEST 37: conn queuing: in uthread
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 2}
-
-            local conn_sock = function()
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("start to handle uthread")
-
-                ngx.sleep(0.01)
-                sock:close()
-                ngx.say("continue to handle other uthread")
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock)
-            local co2 = ngx.thread.spawn(conn_sock)
-            local co3 = ngx.thread.spawn(conn_sock)
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.log(ngx.ERR, err)
-            end
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.thread.wait(co3)
-            ngx.say("all uthreads ok")
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
-start to handle uthread
-continue to handle other uthread
-start to handle uthread
-continue to handle other uthread
-all uthreads ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 38: conn queuing: in access_by_lua
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        access_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 2}
-
-            local conn_sock = function()
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("start to handle uthread")
-
-                ngx.sleep(0.01)
-                sock:close()
-                ngx.say("continue to handle other uthread")
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock)
-            local co2 = ngx.thread.spawn(conn_sock)
-            local co3 = ngx.thread.spawn(conn_sock)
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.log(ngx.ERR, err)
-            end
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.thread.wait(co3)
-            ngx.say("all uthreads ok")
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
-start to handle uthread
-continue to handle other uthread
-start to handle uthread
-continue to handle other uthread
-all uthreads ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 39: conn queuing: in rewrite_by_lua
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        rewrite_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 2}
-
-            local conn_sock = function()
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("start to handle uthread")
-
-                ngx.sleep(0.01)
-                sock:close()
-                ngx.say("continue to handle other uthread")
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock)
-            local co2 = ngx.thread.spawn(conn_sock)
-            local co3 = ngx.thread.spawn(conn_sock)
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.log(ngx.ERR, err)
-            end
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.thread.wait(co3)
-            ngx.say("all uthreads ok")
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
-start to handle uthread
-continue to handle other uthread
-start to handle uthread
-continue to handle other uthread
-all uthreads ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 40: conn queuing: in subrequest
---- config
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /t {
-        content_by_lua_block {
-            local port = ngx.var.port
-            ngx.timer.at(0, function()
-                local opts = {pool_size = 1, backlog = 2}
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                ngx.sleep(0.1)
-                local ok, err = sock:setkeepalive()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-            end)
-
-            ngx.sleep(0.01)
-            local res1, res2, res3 = ngx.location.capture_multi{
-                {"/conn"}, {"/conn"}, {"/conn"}
-            }
-            ngx.say(res1.body)
-            ngx.say(res2.body)
-            ngx.say(res3.body)
-        }
-    }
-
-    location /conn {
-        content_by_lua_block {
-            local port = ngx.var.port
-            local sock, err = ngx.socket.connect("127.0.0.1", port)
-            if not sock then
-                ngx.print(err)
-                return
-            end
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.print(err)
-            else
-                ngx.print("ok")
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-ok
-ok
-too many waiting connect operations
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 41: conn queuing: timeouts when 'connect_timeout' is reached
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 1}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            local sock2 = ngx.socket.tcp()
-            sock2:settimeouts(10, 3000, 3000)
-            local ok, err = sock2:connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-timeout
---- error_log eval
-"lua tcp socket queued connect timed out, when trying to connect to 127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
-
-
-
-=== TEST 42: conn queuing: set timeout via lua_socket_connect_timeout
---- config
-    lua_socket_connect_timeout 10ms;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 1}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            local sock2 = ngx.socket.tcp()
-            local ok, err = sock2:connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-timeout
---- error_log eval
-"lua tcp socket queued connect timed out, when trying to connect to 127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
-
-
-
-=== TEST 43: conn queuing: client aborting while connect operation is queued
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 1}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            local sock2 = ngx.socket.tcp()
-            sock2:settimeouts(3000, 3000, 3000)
-            local ok, err = sock2:connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- ignore_response
---- timeout: 0.1
---- abort
---- no_error_log
-[error]
-
-
-
-=== TEST 44: conn queuing: resume next connect operation if resumed connect failed immediately
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 2}
-
-            local conn_sock = function(should_timeout)
-                local sock = ngx.socket.tcp()
-                local ok, err
-                if should_timeout then
-                    ok, err = sock:connect("", port, opts)
-                else
-                    ok, err = sock:connect("127.0.0.1", port, opts)
-                end
-                if not ok then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("connected in uthread")
-                sock:close()
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock, true)
-            local co2 = ngx.thread.spawn(conn_sock)
-
-            local ok, err = sock:close()
-            if not ok then
-                ngx.log(ngx.ERR, err)
-            end
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-failed to parse host name "": no host
-connected in uthread
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 45: conn queuing: resume connect operation if resumed connect failed (timeout)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-
-            local conn_sock = function(should_timeout)
-                local sock = ngx.socket.tcp()
-                local ok, err
-                if should_timeout then
-                    sock:settimeouts(100, 3000, 3000)
-                    ok, err = sock:connect("127.0.0.2", 12345, opts)
-                else
-                    ok, err = sock:connect("127.0.0.1", port, opts)
-                end
-                if not ok then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("connected in uthread")
-                sock:close()
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock, true)
-            local co2 = ngx.thread.spawn(conn_sock)
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-timeout
-connected in uthread
-ok
---- error_log
-queue connect operation for connection pool "test"
-lua tcp socket connect timed out, when connecting to
-
-
-
-=== TEST 46: conn queuing: resume connect operation if resumed connect failed (could not be resolved)
---- config
-    resolver 127.0.0.2:12345 ipv6=off;
-    resolver_timeout 1s;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-
-            local conn_sock = function(should_timeout)
-                local sock = ngx.socket.tcp()
-                local ok, err
-                if should_timeout then
-                    sock:settimeouts(1, 3000, 3000)
-                    ok, err = sock:connect("agentzh.org", 80, opts)
-                else
-                    ok, err = sock:connect("127.0.0.1", port, opts)
-                end
-                if not ok then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("connected in uthread")
-                sock:close()
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock, true)
-            local co2 = ngx.thread.spawn(conn_sock)
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-agentzh.org could not be resolved (110: Operation timed out)
-connected in uthread
-ok
---- error_log
-queue connect operation for connection pool "test"
-
-
-
-=== TEST 47: conn queuing: resume connect operation if resumed connect failed (connection refused)
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-
-            local conn_sock = function(should_timeout)
-                local sock = ngx.socket.tcp()
-                local ok, err
-                if should_timeout then
-                    sock:settimeouts(100, 3000, 3000)
-                    ok, err = sock:connect("127.0.0.1", 62345, opts)
-                else
-                    ok, err = sock:connect("127.0.0.1", port, opts)
-                end
-                if not ok then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("connected in uthread")
-                sock:close()
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock, true)
-            local co2 = ngx.thread.spawn(conn_sock)
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-connection refused
-connected in uthread
-ok
---- error_log
-queue connect operation for connection pool "test"
-
-
-
-=== TEST 48: conn queuing: resume connect operation if resumed connect failed (uthread aborted while resolving)
---- http_config
-    lua_package_path '../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;';
---- config
-    resolver 127.0.0.1 ipv6=off;
-    resolver_timeout 100s;
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /sub {
-        content_by_lua_block {
-            local semaphore = require "ngx.semaphore"
-            local sem = semaphore.new()
-
-            local function f()
-                sem:wait(0.1)
-                ngx.exit(0)
-            end
-
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-            local port = ngx.var.port
-            ngx.timer.at(0, function()
-                sem:post()
-                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
-                package.loaded.for_timer_to_resume:post()
-                if not sock2 then
-                    ngx.log(ngx.ALERT, "resume connect failed: ", err)
-                    return
-                end
-
-                ngx.log(ngx.INFO, "resume success")
-            end)
-
-            ngx.thread.spawn(f)
-            local sock1, err = ngx.socket.connect("openresty.org", 80, opts)
-            if not sock1 then
-                ngx.say(err)
-                return
-            end
-        }
-    }
-
-    location /t {
-        content_by_lua_block {
-            local semaphore = require "ngx.semaphore"
-            local for_timer_to_resume = semaphore.new()
-            package.loaded.for_timer_to_resume = for_timer_to_resume
-
-            ngx.location.capture("/sub")
-            for_timer_to_resume:wait(0.1)
-        }
-    }
---- request
-GET /t
---- no_error_log
-[alert]
---- error_log
-resume success
-
-
-
-=== TEST 49: conn queuing: resume connect operation if resumed connect failed (uthread killed while resolving)
---- config
-    resolver 127.0.0.1 ipv6=off;
-    resolver_timeout 100s;
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /t {
-        content_by_lua_block {
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-            local port = ngx.var.port
-
-            local function resolve()
-                local sock1, err = ngx.socket.connect("openresty.org", 80, opts)
-                if not sock1 then
-                    ngx.say(err)
-                    return
-                end
-            end
-
-            local th = ngx.thread.spawn(resolve)
-            local ok, err = ngx.thread.kill(th)
-            if not ok then
-                ngx.log(ngx.ALERT, "kill thread failed: ", err)
-                return
-            end
-
-            local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock2 then
-                ngx.log(ngx.ALERT, "resume connect failed: ", err)
-                return
-            end
-
-            ngx.log(ngx.INFO, "resume success")
-        }
-    }
---- request
-GET /t
---- no_error_log
-[alert]
---- error_log
-resume success
-
-
-
-=== TEST 50: conn queuing: increase the counter for connections created before creating the pool with setkeepalive()
---- config
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /t {
-        content_by_lua_block {
-            local function connect()
-                local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
-                if not sock then
-                    error("connect failed: " .. err)
-                end
-
-                return sock
-            end
-
-            local sock1 = connect()
-            local sock2 = connect()
-            assert(sock1:setkeepalive())
-            assert(sock2:setkeepalive())
-
-            local sock1 = connect()
-            local sock2 = connect()
-            assert(sock1:close())
-            assert(sock2:close())
-
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- no_error_log
-[error]
---- response_body
-ok
-
-
-
-=== TEST 51: conn queuing: only decrease the counter for connections which were counted by the pool
---- config
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /t {
-        content_by_lua_block {
-            local function connect()
-                local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
-                if not sock then
-                    error("connect failed: " .. err)
-                end
-
-                return sock
-            end
-
-            local sock1 = connect()
-            local sock2 = connect()
-            assert(sock1:setkeepalive(1000, 1))
-            assert(sock2:setkeepalive(1000, 1))
-
-            local sock1 = connect()
-            local sock2 = connect()
-            assert(sock1:close())
-            assert(sock2:close())
-
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- no_error_log
-[error]
---- response_body
-ok
-
-
-
-=== TEST 52: conn queuing: clean up pending connect operations which are in queue
---- config
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /sub {
-        content_by_lua_block {
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-            local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port, opts)
-            if not sock then
-                ngx.say("connect failed: " .. err)
-                return
-            end
-
-            local function f()
-                assert(ngx.socket.connect("127.0.0.1", ngx.var.port, opts))
-            end
-
-            local th = ngx.thread.spawn(f)
-            local ok, err = ngx.thread.kill(th)
-            if not ok then
-                ngx.log(ngx.ERR, "kill thread failed: ", err)
-                return
-            end
-
-            sock:close()
-        }
-    }
-
-    location /t {
-        content_by_lua_block {
-            ngx.location.capture("/sub")
-            -- let pending connect operation resumes first
-            ngx.sleep(0)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- no_error_log
-[error]
---- error_log
-lua tcp socket abort queueing
---- response_body
-ok
diff --git a/debian/modules/http-lua/t/073-backtrace.t b/debian/modules/http-lua/t/073-backtrace.t
index 663c3af..6c54692 100644
--- a/debian/modules/http-lua/t/073-backtrace.t
+++ b/debian/modules/http-lua/t/073-backtrace.t
@@ -21,10 +21,10 @@ __DATA__
 --- config
     location /lua {
         content_by_lua
-        '   local function bar()
+        '   function bar()
                 return lua_concat(3)
             end
-            local function foo()
+            function foo()
                 bar()
             end
             foo()
@@ -37,7 +37,7 @@ GET /lua
 attempt to call global 'lua_concat'
 : in function 'bar'
 :5: in function 'foo'
-:7: in main chunk
+:7: in function
 
 
 
@@ -45,10 +45,10 @@ attempt to call global 'lua_concat'
 --- config
     location /lua {
         content_by_lua
-        '   local function bar()
+        '   function bar()
                 error(nil)
             end
-            local function foo()
+            function foo()
                 bar()
             end
             foo()
@@ -64,7 +64,7 @@ GET /lua
 " in function 'error'",
 ": in function 'bar'",
 ":5: in function 'foo'",
-qr/:7: in main chunk/,
+qr/:7: in function <content_by_lua\(nginx\.conf:\d+\):1>/,
 ]
 
 
@@ -125,7 +125,7 @@ probe process("$LIBLUA_PATH").function("lua_concat") {
 :63: in function 'func16'
 :67: in function 'func17'
 :71: in function 'func18'
-:74: in main chunk
+:74: in function
 
 
 
diff --git a/debian/modules/http-lua/t/075-logby.t b/debian/modules/http-lua/t/075-logby.t
index 8eece69..520c62e 100644
--- a/debian/modules/http-lua/t/075-logby.t
+++ b/debian/modules/http-lua/t/075-logby.t
@@ -220,7 +220,7 @@ failed to run log_by_lua*: unknown reason
 
 
 
-=== TEST 11: globals sharing
+=== TEST 11: globals get cleared for every single request
 --- config
     location /lua {
         echo ok;
@@ -228,7 +228,6 @@ failed to run log_by_lua*: unknown reason
             if not foo then
                 foo = 1
             else
-                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             ngx.log(ngx.WARN, "foo = ", foo)
@@ -238,9 +237,8 @@ failed to run log_by_lua*: unknown reason
 GET /lua
 --- response_body
 ok
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["", "old foo: 1\n"]
+--- error_log
+foo = 1
 
 
 
@@ -497,8 +495,7 @@ API disabled in the context of log_by_lua*
     location /t {
         echo ok;
         log_by_lua '
-            local bar
-            local function foo()
+            function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/081-bytecode.t b/debian/modules/http-lua/t/081-bytecode.t
index 92383bc..cb50e94 100644
--- a/debian/modules/http-lua/t/081-bytecode.t
+++ b/debian/modules/http-lua/t/081-bytecode.t
@@ -24,7 +24,7 @@ __DATA__
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             if jit then
                 if not string.find(jit.version, "LuaJIT 2.0") then
@@ -35,8 +35,7 @@ __DATA__
             else
                 f:write(string.sub(b, 1, 147));
             end
-            f:close();
-            local res = ngx.location.capture("/call");
+            f:close(); res = ngx.location.capture("/call");
             ngx.print(res.body)
         ';
     }
@@ -61,15 +60,14 @@ __DATA__
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            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();
-            local res = ngx.location.capture("/call");
+            f:close(); res = ngx.location.capture("/call");
             if res.status == 200 then
                 ngx.print(res.body)
             else
@@ -87,7 +85,7 @@ __DATA__
 --- response_body
 error
 --- error_log eval
-qr/failed to load external Lua file ".*?test\.lua": .* cannot load incompatible bytecode/
+qr/failed to load external Lua file ".*?test\.lua": bad byte-code header/
 
 
 
@@ -98,15 +96,14 @@ qr/failed to load external Lua file ".*?test\.lua": .* cannot load incompatible
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            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();
-            local res = ngx.location.capture("/call");
+            f:close(); res = ngx.location.capture("/call");
             if res.status == 200 then
                 ngx.print(res.body)
             else
@@ -124,7 +121,7 @@ qr/failed to load external Lua file ".*?test\.lua": .* cannot load incompatible
 --- response_body
 error
 --- error_log
-cannot load incompatible bytecode
+bytecode format version unsupported
 
 
 
@@ -135,7 +132,7 @@ cannot load incompatible bytecode
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             local do_jit
             if jit then
@@ -179,7 +176,7 @@ cannot load incompatible bytecode
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            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
@@ -223,7 +220,7 @@ error
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             if jit then
                 if not string.find(jit.version, "LuaJIT 2.0") then
@@ -259,9 +256,9 @@ error
         content_by_lua '
             local bcsave = require "jit.bcsave"
             if jit then
-                local prefix = "$TEST_NGINX_SERVER_ROOT"
-                local infile = prefix .. "/html/a.lua"
-                local outfile = prefix .. "/html/a.luac"
+                local prefix = ngx.config.prefix()
+                local infile = prefix .. "html/a.lua"
+                local outfile = prefix .. "html/a.luac"
                 bcsave.start("-s", infile, outfile)
                 return ngx.exec("/call")
             end
@@ -292,9 +289,9 @@ ngx.status = 201 ngx.say("hello from Lua!")
         content_by_lua '
             local bcsave = require "jit.bcsave"
             if jit then
-                local prefix = "$TEST_NGINX_SERVER_ROOT"
-                local infile = prefix .. "/html/a.lua"
-                local outfile = prefix .. "/html/a.luac"
+                local prefix = ngx.config.prefix()
+                local infile = prefix .. "html/a.lua"
+                local outfile = prefix .. "html/a.luac"
                 bcsave.start("-g", infile, outfile)
                 return ngx.exec("/call")
             end
@@ -323,9 +320,9 @@ ngx.status = 201 ngx.say("hello from Lua!")
 --- config
     location = /t {
         content_by_lua_block {
-            local f = assert(loadstring("local a = 1 ngx.say('a = ', a)", "=code"))
+            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
             local bc = string.dump(f)
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
+            local f = assert(io.open("t/servroot/html/a.luac", "w"))
             f:write(bc)
             f:close()
         }
@@ -352,9 +349,9 @@ a = 1
 --- config
     location = /t {
         content_by_lua_block {
-            local f = assert(loadstring("local a = 1 ngx.say('a = ', a)", "=code"))
+            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
             local bc = string.dump(f, true)
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
+            local f = assert(io.open("t/servroot/html/a.luac", "w"))
             f:write(bc)
             f:close()
         }
diff --git a/debian/modules/http-lua/t/082-body-filter.t b/debian/modules/http-lua/t/082-body-filter.t
index 5f765fa..98efa84 100644
--- a/debian/modules/http-lua/t/082-body-filter.t
+++ b/debian/modules/http-lua/t/082-body-filter.t
@@ -460,8 +460,7 @@ GET /t
 --- config
     location /t {
         body_filter_by_lua '
-            local bar
-            local function foo()
+            function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/084-inclusive-receiveuntil.t b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
index 66be893..f7d5d3d 100644
--- a/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
+++ b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
@@ -56,7 +56,7 @@ __DATA__
             local reader = sock:receiveuntil("abcabd", { inclusive = true })
 
             for i = 1, 3 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -128,7 +128,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe", { inclusive = true })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -200,7 +200,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd", { inclusive = true })
 
             for i = 1, 3 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -272,7 +272,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = nil })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -343,7 +343,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = false })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -414,7 +414,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = true })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -485,7 +485,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = "true" })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -552,7 +552,7 @@ bad "inclusive" option value type: string
             local reader = sock:receiveuntil("aa", { inclusive = "true" })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -620,7 +620,7 @@ bad "inclusive" option value type: string
             local reader = sock:receiveuntil("--abc", { inclusive = true })
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -697,7 +697,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc", { inclusive = true })
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
diff --git a/debian/modules/http-lua/t/087-udp-socket.t b/debian/modules/http-lua/t/087-udp-socket.t
index dc6cad5..8bedc32 100644
--- a/debian/modules/http-lua/t/087-udp-socket.t
+++ b/debian/modules/http-lua/t/087-udp-socket.t
@@ -555,7 +555,7 @@ lua udp socket read timed out
 
             local udp = socket.udp()
 
-            udp:settimeout(5000) -- 5 sec
+            udp:settimeout(2000) -- 2 sec
 
             local ok, err = udp:setpeername("$TEST_NGINX_RESOLVER", 53)
             if not ok then
@@ -824,7 +824,7 @@ probe syscall.socket.return, syscall.connect.return {
 
 === TEST 15: bad request tries to setpeer
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -881,7 +881,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 16: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -938,7 +938,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 17: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -995,7 +995,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 18: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -1052,7 +1052,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 19: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
diff --git a/debian/modules/http-lua/t/090-log-socket-errors.t b/debian/modules/http-lua/t/090-log-socket-errors.t
index f5a9f80..16576b6 100644
--- a/debian/modules/http-lua/t/090-log-socket-errors.t
+++ b/debian/modules/http-lua/t/090-log-socket-errors.t
@@ -28,7 +28,7 @@ __DATA__
         lua_socket_log_errors off;
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say(err)
         ';
     }
@@ -50,7 +50,7 @@ timeout
         lua_socket_log_errors on;
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say(err)
         ';
     }
@@ -59,7 +59,7 @@ GET /t
 --- response_body
 timeout
 --- error_log
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 
 
 
@@ -72,7 +72,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         lua_socket_read_timeout 1ms;
         content_by_lua '
             local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("127.0.0.2", 12345)
+            local ok, err = sock:setpeername("agentzh.org", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
@@ -95,7 +95,7 @@ lua udp socket read timed out
         lua_socket_read_timeout 1ms;
         content_by_lua '
             local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("127.0.0.2", 12345)
+            local ok, err = sock:setpeername("agentzh.org", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
diff --git a/debian/modules/http-lua/t/091-coroutine.t b/debian/modules/http-lua/t/091-coroutine.t
index 7cf60f9..bceb512 100644
--- a/debian/modules/http-lua/t/091-coroutine.t
+++ b/debian/modules/http-lua/t/091-coroutine.t
@@ -85,7 +85,7 @@ __DATA__
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("Hello, ", cnt)
@@ -120,7 +120,7 @@ Hello, 2
 --- config
     location /lua {
         content_by_lua '
-            local function f(fid)
+            function f(fid)
                 local cnt = 0
                 while true do
                     ngx.say("cc", fid, ": ", cnt)
@@ -163,7 +163,7 @@ cc3: 2
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            local function worker(url)
+            function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -178,7 +178,7 @@ cc3: 2
 
             local urls = {
                 "agentzh.org",
-                "openresty.com",
+                "iscribblet.org",
                 "openresty.org"
             }
 
@@ -204,7 +204,7 @@ cc3: 2
 GET /lua
 --- response_body
 successfully connected to: agentzh.org
-successfully connected to: openresty.com
+successfully connected to: iscribblet.org
 successfully connected to: openresty.org
 *** All Done ***
 --- no_error_log
@@ -218,14 +218,14 @@ successfully connected to: openresty.org
     location /lua {
         content_by_lua '
             -- generate all the numbers from 2 to n
-            local function gen (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
-            local function filter (p, g)
+            function filter (p, g)
               return coroutine.wrap(function ()
                 while 1 do
                   local n = g()
@@ -235,8 +235,8 @@ successfully connected to: openresty.org
               end)
             end
 
-            local N = 10
-            local x = gen(N)		-- generate primes up to N
+            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
@@ -264,14 +264,14 @@ GET /lua
             coroutine.create = nil
             coroutine.resume = nil
             -- generate all the numbers from 2 to n
-            local function gen (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
-            local function filter (p, g)
+            function filter (p, g)
               return coroutine.wrap(function ()
                 while 1 do
                   local n = g()
@@ -281,8 +281,8 @@ GET /lua
               end)
             end
 
-            local N = 10 
-            local x = gen(N)		-- generate primes up to N
+            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
@@ -307,7 +307,7 @@ GET /lua
 --- config
     location /lua {
         content_by_lua '
-            local function generatefib (n)
+            function generatefib (n)
               return coroutine.wrap(function ()
                 local a,b = 1, 1
                 while a <= n do
@@ -362,7 +362,7 @@ GET /lua
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            local function worker(url)
+            function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -377,7 +377,7 @@ GET /lua
 
             local urls = {
                 "agentzh.org",
-                "openresty.com",
+                "iscribblet.org",
                 "openresty.org"
             }
 
@@ -398,7 +398,7 @@ GET /lua
 GET /lua
 --- response_body
 successfully connected to: agentzh.org
-successfully connected to: openresty.com
+successfully connected to: iscribblet.org
 successfully connected to: openresty.org
 *** All Done ***
 --- no_error_log
@@ -414,7 +414,7 @@ successfully connected to: openresty.org
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
             local st, rn = coroutine.status, coroutine.running
 
-            local function f(self)
+            function f(self)
                 local cnt = 0
                 if rn() ~= self then ngx.say("error"); return end
                 ngx.say("running: ", st(self)) --running
@@ -509,7 +509,7 @@ GET /lua
 --- config
     location /lua {
         content_by_lua '
-            local function print(...)
+            function print(...)
                 local args = {...}
                 local is_first = true
                 for i,v in ipairs(args) do
@@ -523,12 +523,12 @@ GET /lua
                 ngx.print("\\\n")
             end
 
-            local function foo (a)
+            function foo (a)
                 print("foo", a)
                 return coroutine.yield(2*a)
             end
 
-            local co = coroutine.create(function (a,b)
+            co = coroutine.create(function (a,b)
                     print("co-body", a, b)
                     local r = foo(a+1)
                     print("co-body", r)
@@ -566,8 +566,7 @@ main false cannot resume dead coroutine
             local create = coroutine.create
             local resume = coroutine.resume
             local yield = coroutine.yield
-            local g
-            local function f()
+            function f()
                 ngx.say("f begin")
                 yield()
                 local c2 = create(g)
@@ -628,9 +627,8 @@ main done
             local yield = coroutine.yield
 
             local code = 400
-            local g
 
-            local function f()
+            function f()
                 local c2 = create(g)
                 yield()
                 code = code + 1
@@ -685,9 +683,8 @@ exit
             local yield = coroutine.yield
 
             local code = 0
-            local g
 
-            local function f()
+            function f()
                 local c2 = create(g)
                 yield()
                 code = code + 1
@@ -743,7 +740,7 @@ num: 3
     location /lua {
         echo hello;
         header_filter_by_lua '
-            local function f()
+            function f()
                 yield()
             end
 
@@ -767,13 +764,13 @@ API disabled in the context of header_filter_by_lua*
 
             local c1, c2
 
-            local function f()
+            function f()
                 print("f 1")
                 print(coroutine.resume(c2))
                 print("f 2")
             end
 
-            local function g()
+            function g()
                 print("g 1")
                 -- print(coroutine.resume(c1))
                 print("g 2")
@@ -806,13 +803,13 @@ f 2
 
             local c1, c2
 
-            local function f()
+            function f()
                 print("f 1")
                 print(coroutine.resume(c2))
                 print("f 2")
             end
 
-            local function g()
+            function g()
                 print("g 1")
                 print(coroutine.resume(c1))
                 print("g 2")
@@ -862,7 +859,7 @@ falsecannot resume running coroutine
     location /t {
         content_by_lua '
             local co
-            local function f()
+            function f()
                 ngx.say("f: ", coroutine.status(co))
                 ngx.say("f: ", coroutine.resume(co))
             end
@@ -888,7 +885,7 @@ chunk: true
     location /t {
         content_by_lua '
             local co
-            local function f()
+            function f()
                 error("bad")
             end
             co = coroutine.create(f)
@@ -993,7 +990,7 @@ test10
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            local function worker(url)
+            function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -1047,7 +1044,7 @@ successfully connected to: agentzh.org
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            local function worker(url)
+            function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -1107,7 +1104,7 @@ successfully connected to: agentzh.org
 --- config
     location /cotest {
         content_by_lua '
-            local function generator()
+            function generator()
                 return co_wrap(function()
                     co_yield("data")
                 end)
@@ -1136,7 +1133,7 @@ data
 --- config
     location /cotest {
         content_by_lua '
-            local function generator()
+            function generator()
                 return co_wrap(function()
                     co_yield("data")
                 end)
@@ -1169,7 +1166,7 @@ data
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 return 3
             end
 
@@ -1202,7 +1199,7 @@ ok
             local coroutine = require "coroutine"
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("Hello, ", cnt)
@@ -1241,7 +1238,7 @@ Hello, 2
         header_filter_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 local cnt = 0
                 for i = 1, 20 do
                     print("co yield: ", cnt)
@@ -1281,7 +1278,7 @@ co yield: 2
         body_filter_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 local cnt = 0
                 for i = 1, 20 do
                     print("co yield: ", cnt)
diff --git a/debian/modules/http-lua/t/093-uthread-spawn.t b/debian/modules/http-lua/t/093-uthread-spawn.t
index ab6db2f..b622d30 100644
--- a/debian/modules/http-lua/t/093-uthread-spawn.t
+++ b/debian/modules/http-lua/t/093-uthread-spawn.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
             end
 
@@ -58,11 +58,11 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("in thread 1")
             end
 
-            local function g()
+            function g()
                 ngx.say("in thread 2")
             end
 
@@ -107,7 +107,7 @@ after 2
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -144,13 +144,13 @@ after sleep
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            local function g()
+            function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -200,7 +200,7 @@ delete thread 2
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.blah()
             end
 
@@ -231,9 +231,9 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):3:
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
-                local res = ngx.location.capture("/proxy")
+                res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -277,7 +277,7 @@ after capture: hello world
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -330,7 +330,7 @@ after capture: hello foo
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -384,13 +384,13 @@ capture: hello bar
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            local function g()
+            function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -462,8 +462,7 @@ g: after capture: hello bah
 --- config
     location /lua {
         content_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -509,8 +508,7 @@ after g
 --- config
     location /lua {
         content_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -558,7 +556,7 @@ hello in g()
     location /lua {
         content_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -591,7 +589,7 @@ status: running
     location /lua {
         content_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
             end
 
@@ -623,8 +621,7 @@ status: zombie
     location /lua {
         content_by_lua '
             local co
-            local g
-            local function f()
+            function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -663,8 +660,7 @@ status: normal
 --- config
     location /lua {
         content_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -711,7 +707,7 @@ after f
         content_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -764,7 +760,7 @@ f 3
         content_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -773,7 +769,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            local function g()
+            function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -820,7 +816,7 @@ g 3
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -857,12 +853,12 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            local function g()
+            function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -908,7 +904,7 @@ hello from g
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -960,7 +956,7 @@ received: OK
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1022,7 +1018,7 @@ after)$
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1067,7 +1063,7 @@ body: hello world)$
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
@@ -1117,7 +1113,7 @@ body: hello world)$
 --- config
     location /lua {
         content_by_lua '
-            local function f(a, b)
+            function f(a, b)
                 ngx.say("hello ", a, " and ", b)
             end
 
@@ -1651,7 +1647,7 @@ ok
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
             end
diff --git a/debian/modules/http-lua/t/094-uthread-exit.t b/debian/modules/http-lua/t/094-uthread-exit.t
index 58d8d0b..2f7d9ba 100644
--- a/debian/modules/http-lua/t/094-uthread-exit.t
+++ b/debian/modules/http-lua/t/094-uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -171,13 +171,13 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -261,7 +261,7 @@ f
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -297,10 +297,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -393,10 +393,10 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -490,7 +490,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -501,7 +501,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -580,7 +580,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -680,7 +680,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -786,7 +786,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -881,7 +881,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -974,7 +974,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1059,7 +1059,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1142,7 +1142,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1225,7 +1225,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1315,7 +1315,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture_multi{
                     {"/echo"},
                     {"/sleep"}
@@ -1407,7 +1407,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(444)
@@ -1490,7 +1490,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(408)
@@ -1573,7 +1573,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(499)
diff --git a/debian/modules/http-lua/t/095-uthread-exec.t b/debian/modules/http-lua/t/095-uthread-exec.t
index 7bf37c0..56156c4 100644
--- a/debian/modules/http-lua/t/095-uthread-exec.t
+++ b/debian/modules/http-lua/t/095-uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.exec("/foo")
             end
 
@@ -58,7 +58,7 @@ i am foo
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -93,7 +93,7 @@ i am foo
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -175,12 +175,12 @@ hello foo
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
             end
 
@@ -267,7 +267,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -348,7 +348,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture("/sleep")
                 ngx.say("end")
             end
diff --git a/debian/modules/http-lua/t/096-uthread-redirect.t b/debian/modules/http-lua/t/096-uthread-redirect.t
index 95bff01..003c642 100644
--- a/debian/modules/http-lua/t/096-uthread-redirect.t
+++ b/debian/modules/http-lua/t/096-uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -114,7 +114,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -194,7 +194,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture_multi{
                     {"/echo"},
                     {"/sleep"}
diff --git a/debian/modules/http-lua/t/097-uthread-rewrite.t b/debian/modules/http-lua/t/097-uthread-rewrite.t
index 998e256..2f0c06f 100644
--- a/debian/modules/http-lua/t/097-uthread-rewrite.t
+++ b/debian/modules/http-lua/t/097-uthread-rewrite.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.req.set_uri("/foo", true)
             end
 
@@ -58,7 +58,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
@@ -93,7 +93,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
@@ -175,12 +175,12 @@ hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
             end
 
@@ -267,7 +267,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
diff --git a/debian/modules/http-lua/t/098-uthread-wait.t b/debian/modules/http-lua/t/098-uthread-wait.t
index c2819ae..4948596 100644
--- a/debian/modules/http-lua/t/098-uthread-wait.t
+++ b/debian/modules/http-lua/t/098-uthread-wait.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 return "done"
             end
@@ -72,7 +72,7 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done"
@@ -120,13 +120,13 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -200,13 +200,13 @@ f: done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -228,7 +228,7 @@ f: done
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            local ok, res = ngx.thread.wait(tf)
+            ok, res = ngx.thread.wait(tf)
             if not ok then
                 ngx.say("failed to wait f: ", res)
                 return
@@ -281,7 +281,7 @@ g: done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 return "done", 3.14
             end
@@ -330,7 +330,7 @@ res: done 3.14
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done", 3.14
@@ -378,7 +378,7 @@ res: done 3.14
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 error("bad bad!")
             end
@@ -427,7 +427,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):4:
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 error("bad bad!")
@@ -477,12 +477,12 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):5:
 --- config
     location /lua {
         content_by_lua '
-            local function g()
+            function g()
                 ngx.say("hello in thread")
                 return "done"
             end
 
-            local function f()
+            function f()
                 local t, err = ngx.thread.spawn(g)
                 if not t then
                     ngx.say("failed to spawn thread: ", err)
@@ -533,13 +533,13 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local function g()
+            function g()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done"
             end
 
-            local function f()
+            function f()
                 local t, err = ngx.thread.spawn(g)
                 if not t then
                     ngx.say("failed to spawn thread: ", err)
@@ -593,12 +593,12 @@ done
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 out("f: hello")
                 return "f done"
             end
 
-            local function g()
+            function g()
                 out("g: hello")
                 return "g done"
             end
@@ -668,13 +668,13 @@ g status: zombie
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 out("f: hello")
                 return "f done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 out("g: hello")
                 return "g done"
@@ -745,13 +745,13 @@ g: hello
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 ngx.sleep(0.2)
                 out("f: hello")
                 return "f done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.1)
                 out("g: hello")
                 return "g done"
@@ -822,12 +822,12 @@ f: hello
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 out("f: hello")
                 error("f done")
             end
 
-            local function g()
+            function g()
                 out("g: hello")
                 error("g done")
             end
@@ -896,13 +896,13 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):7:
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 out("f: hello")
                 error("f done")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 out("g: hello")
                 error("g done")
@@ -969,13 +969,13 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):8:
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -997,7 +997,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):8:
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            local ok, res = ngx.thread.wait(tf, tg)
+            ok, res = ngx.thread.wait(tf, tg)
             if not ok then
                 ngx.say("failed to wait: ", res)
                 return
@@ -1038,13 +1038,13 @@ res: done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.2)
                 ngx.say("f: hello")
                 return "f done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.1)
                 ngx.say("g: hello")
                 return "g done"
@@ -1066,7 +1066,7 @@ res: done
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            local ok, res = ngx.thread.wait(tf, tg)
+            ok, res = ngx.thread.wait(tf, tg)
             if not ok then
                 ngx.say("failed to wait: ", res)
                 return
@@ -1109,12 +1109,12 @@ res: g done
         content_by_lua '
             local t
 
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 return "done"
             end
 
-            local function g()
+            function g()
                 t = ngx.thread.spawn(f)
             end
 
@@ -1154,7 +1154,7 @@ only the parent coroutine can wait on the thread
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 coroutine.yield()
                 return "done"
@@ -1192,7 +1192,7 @@ qr/lua entry thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):11
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 collectgarbage()
                 error("f done")
@@ -1228,7 +1228,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):5:
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 return "done"
             end
@@ -1283,7 +1283,7 @@ failed to run thread: already waited or killed
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 -- ngx.say("hello in thread")
                 return "done"
             end
diff --git a/debian/modules/http-lua/t/099-c-api.t b/debian/modules/http-lua/t/099-c-api.t
index 5033462..a0b375c 100644
--- a/debian/modules/http-lua/t/099-c-api.t
+++ b/debian/modules/http-lua/t/099-c-api.t
@@ -86,7 +86,7 @@ dogs zone: defined
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -149,7 +149,7 @@ bar: rc=0, type=3, val=3.14159
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -212,7 +212,7 @@ bar: rc=0, type=1, val=0
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -272,7 +272,7 @@ bar: rc=-5
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local s = ffi.new("char[?]", 20)
 
@@ -344,7 +344,7 @@ bar: rc=0, type=4, val=, len=0
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
diff --git a/debian/modules/http-lua/t/100-client-abort.t b/debian/modules/http-lua/t/100-client-abort.t
index f571387..89c1f6a 100644
--- a/debian/modules/http-lua/t/100-client-abort.t
+++ b/debian/modules/http-lua/t/100-client-abort.t
@@ -195,7 +195,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 
     location = /sleep {
@@ -236,7 +236,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 --- request
 GET /t
@@ -540,7 +540,7 @@ client prematurely closed connection
                 return
             end
 
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            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
diff --git a/debian/modules/http-lua/t/106-timer.t b/debian/modules/http-lua/t/106-timer.t
index 7b7c85e..3e4741e 100644
--- a/debian/modules/http-lua/t/106-timer.t
+++ b/debian/modules/http-lua/t/106-timer.t
@@ -76,7 +76,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])
 
 
 
-=== TEST 2: globals are shared
+=== TEST 2: separated global env
 --- config
     location /t {
         content_by_lua '
@@ -104,7 +104,7 @@ F(ngx_http_lua_timer_handler) {
 
 --- response_body
 registered timer
-foo = 3
+foo = nil
 
 --- wait: 0.1
 --- no_error_log
@@ -320,7 +320,7 @@ qr/received: Server: \S+/,
 
 === TEST 6: tcp cosocket in timer handler (keep-alive connections)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -596,7 +596,7 @@ qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
 
 === TEST 10: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -693,7 +693,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 11: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -799,7 +799,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 12: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -912,7 +912,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 13: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -1023,7 +1023,7 @@ qr/go\(\): connected: 1, reused: \d+/,
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
             local function f()
-                local function f()
+                function f()
                     local cnt = 0
                     for i = 1, 20 do
                         print("cnt = ", cnt)
@@ -1090,7 +1090,7 @@ registered timer
                 ngx.log(ngx.ERR, ...)
             end
             local function handle()
-                local function f()
+                function f()
                     print("hello in thread")
                     return "done"
                 end
diff --git a/debian/modules/http-lua/t/108-timer-safe.t b/debian/modules/http-lua/t/108-timer-safe.t
index 758d01a..2795998 100644
--- a/debian/modules/http-lua/t/108-timer-safe.t
+++ b/debian/modules/http-lua/t/108-timer-safe.t
@@ -229,7 +229,7 @@ qr/received: Server: \S+/,
 
 === TEST 4: tcp cosocket in timer handler (keep-alive connections)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -489,7 +489,7 @@ delete thread 2
 --- response_body
 hello world
 
---- wait: 0.15
+--- wait: 0.1
 --- no_error_log
 [error]
 [alert]
@@ -499,7 +499,7 @@ hello world
 [
 "registered timer",
 qr/\[lua\] .*? my lua timer handler/,
-qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-9]|8[0-6])/,
+qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
 "lua ngx.timer expired",
 "http lua close fake http connection"
 ]
@@ -508,7 +508,7 @@ qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-9]|8[0-
 
 === TEST 8: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -606,7 +606,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 9: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -713,7 +713,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 10: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -827,7 +827,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 11: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -1007,7 +1007,7 @@ registered timer
                 ngx.log(ngx.ERR, ...)
             end
             local function handle()
-                local function f()
+                function f()
                     print("hello in thread")
                     return "done"
                 end
diff --git a/debian/modules/http-lua/t/109-timer-hup.t b/debian/modules/http-lua/t/109-timer-hup.t
index 2c197c2..0864046 100644
--- a/debian/modules/http-lua/t/109-timer-hup.t
+++ b/debian/modules/http-lua/t/109-timer-hup.t
@@ -46,7 +46,7 @@ __DATA__
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -99,7 +99,7 @@ timer prematurely expired: true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -163,7 +163,7 @@ timer prematurely expired: true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -219,7 +219,7 @@ failed to register a new timer after reload: process exiting, context: ngx.timer
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -284,7 +284,7 @@ g: exiting=true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -363,7 +363,7 @@ lua found 100 pending timers
                 local line, err = sock:receive("*l")
             until not line or string.find(line, "^%s*$")
 
-            local function foo()
+            function foo()
                 repeat
                     -- Get and read chunk
                     local line, err = sock:receive("*l")
@@ -379,7 +379,7 @@ lua found 100 pending timers
                 until len == 0
             end
 
-            local co = coroutine.create(foo)
+            co = coroutine.create(foo)
             repeat
                 local chunk = select(2,coroutine.resume(co))
             until chunk == nil
@@ -399,7 +399,7 @@ lua found 100 pending timers
                 end
                 local ok, err = ngx.timer.at(1, background_thread)
 
-                local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+                local f, err = io.open("t/servroot/logs/nginx.pid", "r")
                 if not f then
                     ngx.say("failed to open nginx.pid: ", err)
                     return
@@ -453,7 +453,7 @@ lua found 1 pending timers
                 end
 
                 if kill then
-                    local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+                    local f, err = io.open("t/servroot/logs/nginx.pid", "r")
                     if not f then
                         ngx.log(ngx.ERR, "failed to open nginx.pid: ", err)
                         return
diff --git a/debian/modules/http-lua/t/120-re-find.t b/debian/modules/http-lua/t/120-re-find.t
index f80ca4f..73e6134 100644
--- a/debian/modules/http-lua/t/120-re-find.t
+++ b/debian/modules/http-lua/t/120-re-find.t
@@ -622,7 +622,7 @@ matched: 你
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -664,7 +664,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/123-lua-path.t b/debian/modules/http-lua/t/123-lua-path.t
index e30132f..23681a9 100644
--- a/debian/modules/http-lua/t/123-lua-path.t
+++ b/debian/modules/http-lua/t/123-lua-path.t
@@ -11,7 +11,7 @@ repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 3 + 1);
 
-$ENV{LUA_PATH} = "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;/foo/bar/baz";
+$ENV{LUA_PATH} = "/foo/bar/baz";
 $ENV{LUA_CPATH} = "/baz/bar/foo";
 #no_diff();
 #no_long_string();
@@ -36,8 +36,8 @@ env LUA_CPATH;
     }
 --- request
 GET /lua
---- response_body_like
-(?:\.\.\/lua-resty-core\/lib\/\?\.lua;\.\.\/lua-resty-lrucache\/lib\/\?\.lua;){1,2}\/foo\/bar\/baz
+--- response_body
+/foo/bar/baz
 /baz/bar/foo
 
 --- no_error_log
@@ -60,8 +60,8 @@ env LUA_CPATH;
     }
 --- request
 GET /lua
---- response_body_like
-(?:\.\.\/lua-resty-core\/lib\/\?\.lua;\.\.\/lua-resty-lrucache\/lib\/\?\.lua;){1,2}\/foo\/bar\/baz
+--- response_body
+/foo/bar/baz
 /baz/bar/foo
 
 --- no_error_log
diff --git a/debian/modules/http-lua/t/124-init-worker.t b/debian/modules/http-lua/t/124-init-worker.t
index b648d55..9b2a91f 100644
--- a/debian/modules/http-lua/t/124-init-worker.t
+++ b/debian/modules/http-lua/t/124-init-worker.t
@@ -521,11 +521,12 @@ warn(): Thu, 01 Jan 1970 01:34:38 GMT
     }
 --- request
 GET /t
---- response_body_like
+--- response_body
+timer created
 connected: 1
 request sent: 56
-first line received: HTTP\/1\.1 200 OK
-second line received: (?:Date|Server): .*?
+first line received: HTTP/1.1 200 OK
+second line received: Server: openresty
 --- no_error_log
 [error]
 --- timeout: 10
@@ -549,7 +550,6 @@ second line received: (?:Date|Server): .*?
             else
                 say("connect: ", ok, " ", err)
             end
-            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
@@ -600,7 +600,6 @@ qr/connect\(\) failed \(\d+: Connection refused\), context: ngx\.timer$/
             else
                 say("connect: ", ok, " ", err)
             end
-            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
@@ -651,7 +650,6 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
             else
                 say("connect: ", ok, " ", err)
             end
-            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
diff --git a/debian/modules/http-lua/t/126-shdict-frag.t b/debian/modules/http-lua/t/126-shdict-frag.t
index 33646d1..5a2aff8 100644
--- a/debian/modules/http-lua/t/126-shdict-frag.t
+++ b/debian/modules/http-lua/t/126-shdict-frag.t
@@ -1240,8 +1240,8 @@ failed to safe set baz: no memory
                 local key = "mylittlekey" .. rand(maxkeyidx)
                 local ok, err = dogs:get(key)
                 if not ok or rand() > 0.6 then
-                    local sz = rand(maxsz)
-                    local val = rep("a", sz)
+                    sz = rand(maxsz)
+                    val = rep("a", sz)
                     local ok, err, forcible = dogs:set(key, val)
                     if err then
                         ngx.log(ngx.ERR, "failed to set key: ", err)
diff --git a/debian/modules/http-lua/t/127-uthread-kill.t b/debian/modules/http-lua/t/127-uthread-kill.t
index 5542153..cc43c62 100644
--- a/debian/modules/http-lua/t/127-uthread-kill.t
+++ b/debian/modules/http-lua/t/127-uthread-kill.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f()")
                 ngx.sleep(1)
             end
@@ -81,7 +81,7 @@ lua clean up the timer for pending ngx.sleep
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f()")
                 ngx.sleep(0.001)
                 return 32
@@ -138,12 +138,12 @@ lua clean up the timer for pending ngx.sleep
 
 === TEST 3: kill pending resolver
 --- config
-    resolver 127.0.0.2:12345;
+    resolver agentzh.org:12345;
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
-                sock:connect("some.127.0.0.2", 12345)
+                sock:connect("some.agentzh.org", 12345)
             end
 
             local t, err = ngx.thread.spawn(f)
@@ -194,13 +194,13 @@ resolve name done: -2
     location /lua {
         content_by_lua '
             local ready = false
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
                 sock:connect("agentzh.org", 80)
                 sock:close()
                 ready = true
                 sock:settimeout(10000)
-                sock:connect("127.0.0.2", 12345)
+                sock:connect("agentzh.org", 12345)
             end
 
             local t, err = ngx.thread.spawn(f)
@@ -262,7 +262,7 @@ lua finalize socket
 
     location = /t {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture("/sub")
             end
 
@@ -309,11 +309,11 @@ lua tcp socket abort resolver
 
     location = /t {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture("/sub")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.3)
             end
 
@@ -376,7 +376,7 @@ lua tcp socket abort resolver
     location = /t {
         content_by_lua '
             local ready = false
-            local function f()
+            function f()
                 ngx.location.capture("/sub")
                 ready = true
                 ngx.sleep(0.5)
@@ -424,7 +424,7 @@ lua tcp socket abort resolver
 --- config
     location = /t {
         content_by_lua '
-            local function f()
+            function f()
                 return
             end
 
@@ -473,7 +473,7 @@ lua tcp socket abort resolver
                 ngx.say("killed main thread.")
             end
 
-            local function f()
+            function f()
                 local ok, err = ngx.thread.kill(coroutine.running())
                 if not ok then
                     ngx.say("failed to kill user thread: ", err)
diff --git a/debian/modules/http-lua/t/128-duplex-tcp-socket.t b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
index 22b9f03..aed560c 100644
--- a/debian/modules/http-lua/t/128-duplex-tcp-socket.t
+++ b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
@@ -396,7 +396,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
@@ -425,7 +425,7 @@ close: nil closed
 --- config
     server_tokens off;
     lua_socket_log_errors off;
-    resolver 127.0.0.2:12345;
+    resolver agentzh.org:12345;
     resolver_timeout 300ms;
     location /t {
         content_by_lua '
@@ -459,7 +459,7 @@ close: nil closed
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("some2.agentzh.org", 80)
+            local ok, err = sock:connect("some2.agentzh.org", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
diff --git a/debian/modules/http-lua/t/129-ssl-socket.t b/debian/modules/http-lua/t/129-ssl-socket.t
index f2fa26b..3f05640 100644
--- a/debian/modules/http-lua/t/129-ssl-socket.t
+++ b/debian/modules/http-lua/t/129-ssl-socket.t
@@ -301,7 +301,7 @@ SSL reused session
 
         content_by_lua '
             local sock = ngx.socket.tcp()
-            sock:settimeout(7000)
+            sock:settimeout(2000)
 
             do
 
@@ -380,7 +380,7 @@ lua ssl free session
 --- no_error_log
 [error]
 [alert]
---- timeout: 10
+--- timeout: 5
 
 
 
@@ -573,7 +573,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET /en/linux-packages.html HTTP/1.1\\r\\nHost: openresty.com\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -602,7 +602,7 @@ GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 80 bytes.
+sent http request: 56 bytes.
 received: HTTP/1.1 404 Not Found
 close: 1 nil
 
@@ -1333,13 +1333,13 @@ failed to send http request: closed
 --- grep_error_log_out
 --- error_log eval
 [
-qr/\[(crit|error)\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
+qr/\[crit\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
 'lua ssl server name: "openresty.org"',
 ]
 --- no_error_log
 SSL reused session
+[error]
 [alert]
-[emerg]
 --- timeout: 5
 
 
@@ -2508,7 +2508,7 @@ SSL reused session
 
         content_by_lua_block {
             local sock = ngx.socket.tcp()
-            sock:settimeout(7000)
+            sock:settimeout(2000)
 
             local ok, err = sock:connect("openresty.org", 443)
             if not ok then
@@ -2529,4 +2529,4 @@ GET /t
 qr/\[error\] .* ngx.socket sslhandshake: expecting 1 ~ 5 arguments \(including the object\), but seen 0/
 --- no_error_log
 [alert]
---- timeout: 10
+--- timeout: 5
diff --git a/debian/modules/http-lua/t/130-internal-api.t b/debian/modules/http-lua/t/130-internal-api.t
index 2158e87..eba0980 100644
--- a/debian/modules/http-lua/t/130-internal-api.t
+++ b/debian/modules/http-lua/t/130-internal-api.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * blocks() * 3;
+plan tests => repeat_each() * 3;
 
 #no_diff();
 no_long_string();
@@ -19,7 +19,12 @@ run_tests();
 
 __DATA__
 
-=== TEST 1: req
+=== TEST 1: __ngx_req and __ngx_cycle
+--- http_config
+    init_by_lua '
+        my_cycle = __ngx_cycle
+    ';
+
 --- config
     location = /t {
         content_by_lua '
@@ -27,14 +32,18 @@ __DATA__
             local function tonum(ud)
                 return tonumber(ffi.cast("uintptr_t", ud))
             end
-            ngx.say(string.format("content req=%#x", tonum(exdata())))
+            ngx.say(string.format("init: cycle=%#x", tonum(my_cycle)))
+            ngx.say(string.format("content cycle=%#x", tonum(__ngx_cycle)))
+            ngx.say(string.format("content req=%#x", tonum(__ngx_req)))
         ';
     }
 --- request
 GET /t
 
 --- response_body_like chop
-^content req=0x[a-f0-9]{4,}
+^init: cycle=(0x[a-f0-9]{4,})
+content cycle=\1
+content req=0x[a-f0-9]{4,}
 $
 --- no_error_log
 [error]
diff --git a/debian/modules/http-lua/t/134-worker-count-5.t b/debian/modules/http-lua/t/134-worker-count-5.t
index ec6d0e7..b257c12 100644
--- a/debian/modules/http-lua/t/134-worker-count-5.t
+++ b/debian/modules/http-lua/t/134-worker-count-5.t
@@ -3,7 +3,7 @@
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
-master_on();
+#master_on();
 workers(5);
 #log_level('warn');
 
@@ -55,7 +55,7 @@ workers: 5
 
 === TEST 3: init_by_lua + module (github #681)
 --- http_config
-    lua_package_path "$TEST_NGINX_SERVER_ROOT/html/?.lua;;";
+    lua_package_path "t/servroot/html/?.lua;;";
 
     init_by_lua_block {
         local blah = require "file"
diff --git a/debian/modules/http-lua/t/138-balancer.t b/debian/modules/http-lua/t/138-balancer.t
index 151db7b..0aba66d 100644
--- a/debian/modules/http-lua/t/138-balancer.t
+++ b/debian/modules/http-lua/t/138-balancer.t
@@ -362,6 +362,8 @@ me: 101
 
 === TEST 13: lua subrequests
 --- http_config
+    lua_package_path "t/servroot/html/?.lua;;";
+
     lua_code_cache off;
 
     upstream backend {
diff --git a/debian/modules/http-lua/t/139-ssl-cert-by.t b/debian/modules/http-lua/t/139-ssl-cert-by.t
index bebbdb2..a65d703 100644
--- a/debian/modules/http-lua/t/139-ssl-cert-by.t
+++ b/debian/modules/http-lua/t/139-ssl-cert-by.t
@@ -1278,7 +1278,7 @@ lua ssl server name: "test.com"
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
         ssl_certificate_by_lua_block {
-            local function f()
+            function f()
                 ngx.sleep(0.01)
                 print("uthread: hello in thread")
                 return "done"
diff --git a/debian/modules/http-lua/t/140-ssl-c-api.t b/debian/modules/http-lua/t/140-ssl-c-api.t
index a77f5d4..8734d14 100644
--- a/debian/modules/http-lua/t/140-ssl-c-api.t
+++ b/debian/modules/http-lua/t/140-ssl-c-api.t
@@ -10,7 +10,6 @@ my $openssl_version = eval { `$NginxBinary -V 2>&1` };
 
 if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
     plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
-
 } else {
     plan tests => repeat_each() * (blocks() * 5 + 1);
 }
@@ -69,7 +68,7 @@ _EOC_
 
     my $http_config = $block->http_config || '';
     $http_config .= <<'_EOC_';
-lua_package_path "$prefix/html/?.lua;../lua-resty-core/lib/?.lua;;";
+lua_package_path "$prefix/html/?.lua;;";
 _EOC_
     $block->set_value("http_config", $http_config);
 });
@@ -92,8 +91,8 @@ __DATA__
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -246,8 +245,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -400,8 +399,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -529,8 +528,8 @@ failed to parse PEM priv key: PEM_read_bio_PrivateKey() failed
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -679,8 +678,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
diff --git a/debian/modules/http-lua/t/143-ssl-session-fetch.t b/debian/modules/http-lua/t/143-ssl-session-fetch.t
index 78a66cf..4dc992d 100644
--- a/debian/modules/http-lua/t/143-ssl-session-fetch.t
+++ b/debian/modules/http-lua/t/143-ssl-session-fetch.t
@@ -1114,108 +1114,3 @@ qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
 [error]
 [alert]
 [emerg]
-
-
-
-=== TEST 14: keep global variable in ssl_session_(store|fetch)_by_lua when OpenResty LuaJIT is used
---- http_config
-    ssl_session_store_by_lua_block {
-        ngx.log(ngx.WARN, "new foo: ", foo)
-        if not foo then
-            foo = 1
-        else
-            ngx.log(ngx.WARN, "old foo: ", foo)
-            foo = foo + 1
-        end
-    }
-    ssl_session_fetch_by_lua_block {
-        ngx.log(ngx.WARN, "new bar: ", foo)
-        if not bar then
-            bar = 1
-        else
-            ngx.log(ngx.WARN, "old bar: ", bar)
-            bar = bar + 1
-        end
-    }
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-        location /foo {
-            content_by_lua_block {
-                ngx.say("foo: ", foo)
-                ngx.say("bar: ", bar)
-            }
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                local sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                package.loaded.session = sess
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    local m, err = ngx.re.match(line, "^foo: (.*)$", "jo")
-                    if err then
-                        ngx.say("failed to match line: ", err)
-                    end
-
-                    if m and m[1] then
-                        ngx.print(m[1])
-                    end
-                end
-
-                local ok, err = sock:close()
-                ngx.say("done")
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body_like chomp
-\A[123]done\n\z
---- grep_error_log eval: qr/old (foo|bar): \d+/
---- grep_error_log_out eval
-["", "old foo: 1\n", "old bar: 1\nold foo: 2\n"]
---- no_error_log
-[error]
-[alert]
-[emerg]
diff --git a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
index 8566c0b..4ebc8f3 100644
--- a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
+++ b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
@@ -323,7 +323,7 @@ lua tcp socket write timed out
 
             sock:settimeouts(100, 100, 100)
 
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -346,7 +346,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -411,7 +411,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 
             local chunk = 4
 
-            local function read()
+            function read()
                 sock:settimeout(200) -- read: 200 ms
 
                 local data, err = sock:receive(content_length)
@@ -506,7 +506,7 @@ failed to receive data: timeout
 
             local chunk = 4
 
-            local function read()
+            function read()
                 local data, err = sock:receive(content_length)
                 if not data then
                     ngx.log(ngx.ERR, "failed to receive data: ", err)
diff --git a/debian/modules/http-lua/t/152-timer-every.t b/debian/modules/http-lua/t/152-timer-every.t
index 7b42d2d..c8d62e7 100644
--- a/debian/modules/http-lua/t/152-timer-every.t
+++ b/debian/modules/http-lua/t/152-timer-every.t
@@ -63,7 +63,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, cont
 
 
 
-=== TEST 2: shared global env
+=== TEST 2: separated global env
 --- config
     location /t {
         content_by_lua_block {
@@ -84,7 +84,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, cont
 --- request
 GET /t
 --- response_body
-foo = 3
+foo = nil
 --- wait: 0.12
 --- no_error_log
 [error]
diff --git a/debian/modules/http-lua/t/153-semaphore-hup.t b/debian/modules/http-lua/t/153-semaphore-hup.t
index 5c271a4..c85a21d 100644
--- a/debian/modules/http-lua/t/153-semaphore-hup.t
+++ b/debian/modules/http-lua/t/153-semaphore-hup.t
@@ -67,7 +67,7 @@ add_block_preprocessor(sub {
                 return
             end
 
-            local shdict = ngx.shared.shdict
+            shdict = ngx.shared.shdict
             local success = shdict:add("reloaded", 1)
             if not success then
                 return
diff --git a/debian/modules/http-lua/t/156-slow-network.t b/debian/modules/http-lua/t/156-slow-network.t
deleted file mode 100644
index 2d80506..0000000
--- a/debian/modules/http-lua/t/156-slow-network.t
+++ /dev/null
@@ -1,138 +0,0 @@
-BEGIN {
-    if (!defined $ENV{LD_PRELOAD}) {
-        $ENV{LD_PRELOAD} = '';
-    }
-
-    if ($ENV{LD_PRELOAD} !~ /\bmockeagain\.so\b/) {
-        $ENV{LD_PRELOAD} = "mockeagain.so $ENV{LD_PRELOAD}";
-    }
-
-    if ($ENV{MOCKEAGAIN} eq 'r') {
-        $ENV{MOCKEAGAIN} = 'rw';
-
-    } else {
-        $ENV{MOCKEAGAIN} = 'w';
-    }
-
-    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
-}
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4);
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    if (!defined $block->error_log) {
-        $block->set_value("no_error_log", "[error]");
-    }
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-
-});
-
-
-log_level("debug");
-no_long_string();
-#no_diff();
-run_tests();
-
-__DATA__
-
-=== TEST 1: receiveany returns anything once socket receives
---- config
-    server_tokens off;
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-            local req = {
-                'GET /foo HTTP/1.0\r\n',
-                'Host: localhost\r\n',
-                'Connection: close\r\n\r\n',
-            }
-            local ok, err = sock:send(req)
-            if not ok then
-                ngx.say("send request failed: ", err)
-                return
-            end
-
-
-            -- skip http header
-            while true do
-                local data, err, _ = sock:receive('*l')
-                if err then
-                    ngx.say('unexpected error occurs when receiving http head: ' .. err)
-                    return
-                end
-                if #data == 0 then -- read last line of head
-                    break
-                end
-            end
-
-            -- receive http body
-            while true do
-                local data, err = sock:receiveany(1024)
-                if err then
-                    if err ~= 'closed' then
-                        ngx.say('unexpected err: ', err)
-                    end
-                    break
-                end
-                ngx.say(data)
-            end
-
-            sock:close()
-        }
-    }
-
-    location = /foo {
-        content_by_lua_block {
-            local resp = {
-                '1',
-                'hello',
-            }
-
-            local length = 0
-            for _, v in ipairs(resp) do
-                length = length + #v
-            end
-
-            -- flush http header
-            ngx.header['Content-Length'] = length
-            ngx.flush(true)
-            ngx.sleep(0.01)
-
-            -- send http body bytes by bytes
-            for _, v in ipairs(resp) do
-                ngx.print(v)
-                ngx.flush(true)
-                ngx.sleep(0.01)
-            end
-        }
-    }
-
---- response_body
-1
-h
-e
-l
-l
-o
---- grep_error_log eval
-qr/lua tcp socket read any/
---- grep_error_log_out
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
diff --git a/debian/modules/http-lua/t/157-socket-keepalive-hup.t b/debian/modules/http-lua/t/157-socket-keepalive-hup.t
deleted file mode 100644
index 357bb59..0000000
--- a/debian/modules/http-lua/t/157-socket-keepalive-hup.t
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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;
-        undef $ENV{TEST_NGINX_USE_STAP};
-    }
-}
-
-use Test::Nginx::Socket::Lua $SkipReason ? (skip_all => $SkipReason) : ();
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 8);
-
-#no_diff();
-no_long_string();
-
-worker_connections(1024);
-run_tests();
-
-__DATA__
-
-=== TEST 1: exiting
---- config
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua_block {
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
-            if not f then
-                ngx.say("failed to open nginx.pid: ", err)
-                return
-            end
-
-            local pid = f:read()
-            -- ngx.say("master pid: [", pid, "]")
-
-            f:close()
-
-            local i = 0
-            local port = ngx.var.port
-
-            local function f(premature)
-                print("timer prematurely expired: ", premature)
-
-                local sock = ngx.socket.tcp()
-
-                local ok, err = sock:connect("127.0.0.1", port)
-                if not ok then
-                    print("failed to connect: ", err)
-                    return
-                end
-
-                local ok, err = sock:setkeepalive()
-                if not ok then
-                    print("failed to setkeepalive: ", err)
-                    return
-                end
-
-                print("setkeepalive successfully")
-            end
-            local ok, err = ngx.timer.at(3, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            os.execute("kill -HUP " .. pid)
-        }
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.3
---- no_error_log
-[error]
-[alert]
-[crit]
---- error_log
-timer prematurely expired: true
-setkeepalive successfully
-lua tcp socket set keepalive while process exiting, closing connection
diff --git a/debian/modules/http-lua/t/158-global-var.t b/debian/modules/http-lua/t/158-global-var.t
deleted file mode 100644
index 414a43a..0000000
--- a/debian/modules/http-lua/t/158-global-var.t
+++ /dev/null
@@ -1,508 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-log_level('debug');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 14);
-
-our $HtmlDir = html_dir;
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-
-no_long_string();
-
-sub read_file {
-    my $infile = shift;
-    open my $in, $infile
-        or die "cannot open $infile for reading: $!";
-    my $cert = do { local $/; <$in> };
-    close $in;
-    $cert;
-}
-
-our $TestCertificate = read_file("t/cert/test.crt");
-our $TestCertificateKey = read_file("t/cert/test.key");
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    if (!defined $block->error_log) {
-        $block->set_value("no_error_log", "[error]");
-    }
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-
-});
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set_by_lua
---- config
-    location /t {
-        set_by_lua_block $res {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            return foo
-        }
-        echo $res;
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|set_by_lua:\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-set_by_lua:3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 2: rewrite_by_lua
---- config
-    location /t {
-        rewrite_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-rewrite_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 3: access_by_lua
---- config
-    location /t {
-        access_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-access_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 4: content_by_lua
---- config
-    location /t {
-        content_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-content_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 5: header_filter_by_lua
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.say(foo)
-        }
-        header_filter_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-    }
---- response_body_like chomp
-\A(?:nil|1)\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-header_filter_by_lua:3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 6: body_filter_by_lua
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.say(foo)
-        }
-        body_filter_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-    }
---- response_body_like chomp
-\A(?:nil|2)\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\[warn\] .*?writing a global lua variable \('foo'\)
-body_filter_by_lua:3: in main chunk, 
-old foo: 1\n\z/, "old foo: 2\nold foo: 3\n"]
-
-
-
-=== TEST 7: log_by_lua
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.say(foo)
-        }
-        log_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-    }
---- response_body_like chomp
-\A(?:nil|1)\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk)/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-log_by_lua\(nginx\.conf:50\):3: in main chunk\n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 8: ssl_certificate_by_lua
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            content_by_lua_block {
-                ngx.say("foo: ", foo)
-            }
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                -- ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                -- ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    local m, err = ngx.re.match(line, "^foo: (.*)$", "jo")
-                    if err then
-                        ngx.say("failed to match line: ", err)
-                    end
-
-                    if m and m[1] then
-                        ngx.print(m[1])
-                    end
-                end
-
-                local ok, err = sock:close()
-                ngx.say("done")
-            end  -- do
-        }
-    }
-
---- response_body_like chomp
-\A[12]done\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk)/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-ssl_certificate_by_lua:3: in main chunk\n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 9: timer
---- config
-    location /t {
-        content_by_lua_block {
-            local function f()
-                if not foo then
-                    foo = 1
-                else
-                    ngx.log(ngx.WARN, "old foo: ", foo)
-                    foo = foo + 1
-                end
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.sleep(0.01)
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in\b)/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-content_by_lua\(nginx\.conf:56\):4: in\n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 10: init_by_lua
---- http_config
-    init_by_lua_block {
-        foo = 1
-    }
---- config
-    location /t {
-        content_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[23]\n\z
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["old foo: 1\n", "old foo: 2\n"]
-
-
-
-=== TEST 11: init_worker_by_lua
---- http_config
-    init_worker_by_lua_block {
-        if not foo then
-            foo = 1
-        else
-            ngx.log(ngx.WARN, "old foo: ", foo)
-            foo = foo + 1
-        end
-    }
---- config
-    location /t {
-        content_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[23]\n\z
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["old foo: 1\n", "old foo: 2\n"]
-
-
-
-=== TEST 12: init_by_lua + init_worker_by_lua
---- http_config
-    init_by_lua_block {
-        if not foo then
-            foo = 1
-        else
-            ngx.log(ngx.WARN, "old foo: ", foo)
-            foo = foo + 1
-        end
-    }
-    init_worker_by_lua_block {
-        if not foo then
-            foo = 1
-        else
-            ngx.log(ngx.WARN, "old foo: ", foo)
-            foo = foo + 1
-        end
-    }
---- config
-    location /t {
-        content_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[34]\n\z
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["old foo: 1\nold foo: 2\n", "old foo: 3\n"]
-
-
-
-=== TEST 13: don't show warn messages in init/init_worker
---- http_config
-    init_by_lua_block {
-        foo = 1
-    }
-
-    init_worker_by_lua_block {
-        bar = 2
-    }
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.say(foo)
-            ngx.say(bar)
-        }
-    }
---- response_body
-1
-2
---- no_error_log
-setting global variable
-
-
-
-=== TEST 14: uthread
---- config
-    location /t {
-        content_by_lua_block {
-            local function f()
-                if not foo then
-                    foo = 1
-                else
-                    ngx.log(ngx.WARN, "old foo: ", foo)
-                    foo = foo + 1
-                end
-            end
-            local ok, err = ngx.thread.spawn(f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.sleep(0.01)
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
---- grep_error_log_out eval
-["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
-
-
-
-=== TEST 15: balancer_by_lua
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-qr/\[crit\].*?\Qconnect() to 0.0.0.1:80 failed\E/
---- grep_error_log eval: qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
---- grep_error_log_out eval
-["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
diff --git a/debian/modules/http-lua/t/159-sa-restart.t b/debian/modules/http-lua/t/159-sa-restart.t
deleted file mode 100644
index a0f0c0e..0000000
--- a/debian/modules/http-lua/t/159-sa-restart.t
+++ /dev/null
@@ -1,180 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    my $http_config = $block->http_config || '';
-
-    $http_config .= <<_EOC_;
-    init_by_lua_block {
-        function test_sa_restart()
-            local signals = {
-                --"HUP",
-                --"INFO",
-                --"XCPU",
-                --"USR1",
-                --"USR2",
-                "ALRM",
-                --"INT",
-                "IO",
-                "CHLD",
-                --"WINCH",
-            }
-
-            for _, signame in ipairs(signals) do
-                local cmd = string.format("kill -s %s %d && sleep 0.01",
-                                          signame, ngx.worker.pid())
-                local err = select(2, io.popen(cmd):read("*a"))
-                if err then
-                    error("SIG" .. signame .. " caused: " .. err)
-                end
-            end
-        end
-    }
-_EOC_
-
-    $block->set_value("http_config", $http_config);
-
-    if (!defined $block->config) {
-        my $config = <<_EOC_;
-        location /t {
-            echo ok;
-        }
-_EOC_
-
-        $block->set_value("config", $config);
-    }
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-
-    if (!defined $block->response_body) {
-        $block->set_value("ignore_response_body");
-    }
-
-    if (!defined $block->no_error_log) {
-        $block->set_value("no_error_log", "[error]");
-    }
-});
-
-plan tests => repeat_each() * (blocks() * 2 + 1);
-
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: lua_sa_restart default - sets SA_RESTART in init_worker_by_lua*
---- http_config
-    init_worker_by_lua_block {
-        test_sa_restart()
-    }
-
-
-
-=== TEST 2: lua_sa_restart off - does not set SA_RESTART
---- http_config
-    lua_sa_restart off;
-
-    init_worker_by_lua_block {
-        test_sa_restart()
-    }
---- no_error_log
-[crit]
---- error_log
-Interrupted system call
-
-
-
-=== TEST 3: lua_sa_restart on (default) - sets SA_RESTART if no init_worker_by_lua* phase is defined
---- config
-    location /t {
-        content_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 4: lua_sa_restart on (default) - SA_RESTART is effective in rewrite_by_lua*
---- config
-    location /t {
-        rewrite_by_lua_block {
-            test_sa_restart()
-        }
-
-        echo ok;
-    }
-
-
-
-=== TEST 5: lua_sa_restart on (default) - SA_RESTART is effective in access_by_lua*
---- config
-    location /t {
-        access_by_lua_block {
-            test_sa_restart()
-        }
-
-        echo ok;
-    }
-
-
-
-=== TEST 6: lua_sa_restart on (default) - SA_RESTART is effective in content_by_lua*
---- config
-    location /t {
-        content_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 7: lua_sa_restart on (default) - SA_RESTART is effective in header_filter_by_lua*
---- config
-    location /t {
-        echo ok;
-
-        header_filter_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 8: lua_sa_restart on (default) - SA_RESTART is effective in body_filter_by_lua*
---- config
-    location /t {
-        echo ok;
-
-        body_filter_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 9: lua_sa_restart on (default) - SA_RESTART is effective in log_by_lua*
---- config
-    location /t {
-        echo ok;
-
-        log_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 10: lua_sa_restart on (default) - SA_RESTART is effective in timer phase
---- config
-    location /t {
-        echo ok;
-
-        log_by_lua_block {
-            ngx.timer.at(0, test_sa_restart)
-        }
-    }
diff --git a/debian/modules/http-lua/t/160-disable-init-by-lua.t b/debian/modules/http-lua/t/160-disable-init-by-lua.t
deleted file mode 100644
index 541771e..0000000
--- a/debian/modules/http-lua/t/160-disable-init-by-lua.t
+++ /dev/null
@@ -1,194 +0,0 @@
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-
-my $html_dir = $ENV{TEST_NGINX_HTML_DIR};
-my $http_config = <<_EOC_;
-    init_by_lua_block {
-        function set_up_ngx_tmp_conf(conf)
-            if conf == nil then
-                conf = [[
-                    events {
-                        worker_connections 64;
-                    }
-                    http {
-                        init_by_lua_block {
-                            ngx.log(ngx.ERR, "run init_by_lua")
-                        }
-                    }
-                ]]
-            end
-
-            assert(os.execute("mkdir -p $html_dir/logs"))
-
-            local conf_file = "$html_dir/nginx.conf"
-            local f, err = io.open(conf_file, "w")
-            if not f then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            assert(f:write(conf))
-
-            return conf_file
-        end
-
-        function get_ngx_bin_path()
-            local ffi = require "ffi"
-            ffi.cdef[[char **ngx_argv;]]
-            return ffi.string(ffi.C.ngx_argv[0])
-        end
-    }
-_EOC_
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    if (!defined $block->http_config) {
-        $block->set_value("http_config", $http_config);
-    }
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-});
-
-env_to_nginx("PATH");
-log_level("warn");
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: ensure init_by_lua* is not run in signaller process
---- config
-    location = /t {
-        content_by_lua_block {
-            local conf_file = set_up_ngx_tmp_conf()
-            local nginx = get_ngx_bin_path()
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -s reopen"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-        }
-    }
---- error_log
-failed (2: No such file or directory)
---- no_error_log eval
-qr/\[error\] .*? init_by_lua:\d+: run init_by_lua/
-
-
-
-=== TEST 2: init_by_lua* does not run when testing Nginx configuration
---- config
-    location = /t {
-        content_by_lua_block {
-            local conf_file = set_up_ngx_tmp_conf()
-            local nginx = get_ngx_bin_path()
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -t"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -T"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-        }
-    }
---- error_log
-test is successful
---- no_error_log eval
-qr/\[error\] .*? init_by_lua:\d+: run init_by_lua/
-
-
-
-=== TEST 3: init_by_lua* does not run when testing Nginx configuration which contains 'lua_shared_dict' (GitHub #1462)
---- config
-    location = /t {
-        content_by_lua_block {
-            local conf = [[
-                events {
-                    worker_connections 64;
-                }
-                http {
-                    lua_shared_dict test 64k;
-                    init_by_lua_block {
-                        ngx.log(ngx.ERR, "run init_by_lua with lua_shared_dict")
-                    }
-                }
-            ]]
-            local conf_file = set_up_ngx_tmp_conf(conf)
-            local nginx = get_ngx_bin_path()
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -t"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -T"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-        }
-    }
---- error_log
-test is successful
---- no_error_log eval
-qr/\[error\] .*? init_by_lua:\d+: run init_by_lua with lua_shared_dict/
diff --git a/debian/modules/http-lua/t/161-load-resty-core.t b/debian/modules/http-lua/t/161-load-resty-core.t
deleted file mode 100644
index 41b18f0..0000000
--- a/debian/modules/http-lua/t/161-load-resty-core.t
+++ /dev/null
@@ -1,68 +0,0 @@
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-
-    if (!defined $block->no_error_log) {
-        $block->set_value("no_error_log", "[error]");
-    }
-});
-
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: lua_load_resty_core is enabled by default
---- config
-    location = /t {
-        content_by_lua_block {
-            local loaded_resty_core = package.loaded["resty.core"]
-            local resty_core = require "resty.core"
-
-            ngx.say("resty.core loaded: ", loaded_resty_core == resty_core)
-        }
-    }
---- response_body
-resty.core loaded: true
-
-
-
-=== TEST 2: lua_load_resty_core can be disabled
---- http_config
-    lua_load_resty_core off;
---- config
-    location = /t {
-        content_by_lua_block {
-            local loaded_resty_core = package.loaded["resty.core"]
-
-            ngx.say("resty.core loaded: ", loaded_resty_core ~= nil)
-        }
-    }
---- response_body
-resty.core loaded: false
-
-
-
-=== TEST 3: lua_load_resty_core is effective when using lua_shared_dict
---- http_config
-    lua_shared_dict dogs 128k;
---- config
-    location = /t {
-        content_by_lua_block {
-            local loaded_resty_core = package.loaded["resty.core"]
-            local resty_core = require "resty.core"
-
-            ngx.say("resty.core loaded: ", loaded_resty_core == resty_core)
-        }
-    }
---- response_body
-resty.core loaded: true
diff --git a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
index ffc32f5..0286853 100644
--- a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
+++ b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
@@ -213,9 +213,10 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 
     ngx_uint_t                   i;
     ngx_shm_zone_t             **zone;
-    ngx_shm_zone_t             **zone_udata;
 
-    cycle = (ngx_cycle_t *) ngx_cycle;
+    lua_getglobal(L, "__ngx_cycle");
+    cycle = lua_touserdata(L, -1);
+    lua_pop(L, 1);
 
     hmcf_ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index];
     lfsmcf = hmcf_ctx->main_conf[ngx_http_lua_fake_shm_module.ctx_index];
@@ -241,9 +242,7 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 
             lua_createtable(L, 1 /* narr */, 0 /* nrec */);
                 /* table of zone[i] */
-            zone_udata = lua_newuserdata(L, sizeof(ngx_shm_zone_t *));
-                /* shared mt key ud */
-            *zone_udata = zone[i];
+            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
             lua_rawseti(L, -2, 1); /* {zone[i]} */
             lua_pushvalue(L, -3); /* shared mt key ud mt */
             lua_setmetatable(L, -2); /* shared mt key ud */
@@ -263,10 +262,9 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 static int
 ngx_http_lua_fake_shm_get_info(lua_State *L)
 {
-    ngx_int_t                         n;
-    ngx_shm_zone_t                   *zone;
-    ngx_shm_zone_t                  **zone_udata;
-    ngx_http_lua_fake_shm_ctx_t      *ctx;
+    ngx_int_t                    n;
+    ngx_shm_zone_t              *zone;
+    ngx_http_lua_fake_shm_ctx_t *ctx;
 
     n = lua_gettop(L);
 
@@ -278,15 +276,13 @@ ngx_http_lua_fake_shm_get_info(lua_State *L)
     luaL_checktype(L, 1, LUA_TTABLE);
 
     lua_rawgeti(L, 1, 1);
-    zone_udata = lua_touserdata(L, -1);
+    zone = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    if (zone_udata == NULL) {
+    if (zone == NULL) {
         return luaL_error(L, "bad \"zone\" argument");
     }
 
-    zone = *zone_udata;
-
     ctx = (ngx_http_lua_fake_shm_ctx_t *) zone->data;
 
     lua_pushlstring(L, (char *) zone->shm.name.data, zone->shm.name.len);
diff --git a/debian/modules/http-lua/util/build.sh b/debian/modules/http-lua/util/build.sh
index 14e9fd4..164bf9f 100755
--- a/debian/modules/http-lua/util/build.sh
+++ b/debian/modules/http-lua/util/build.sh
@@ -22,8 +22,6 @@ force=$2
             #--without-http_referer_module \
             #--with-http_spdy_module \
 
-add_fake_shm_module="--add-module=$root/t/data/fake-shm-module"
-
 time ngx-build $force $version \
             --with-pcre-jit \
             --with-ipv6 \
@@ -57,7 +55,7 @@ time ngx-build $force $version \
                 --add-module=$root/../redis2-nginx-module \
                 --add-module=$root/../stream-lua-nginx-module \
                 --add-module=$root/t/data/fake-module \
-                $add_fake_shm_module \
+                --add-module=$root/t/data/fake-shm-module \
                 --add-module=$root/t/data/fake-delayed-load-module \
                 --with-http_gunzip_module \
                 --with-http_dav_module \

From c9fc21913a0c616e50d065a0808c8bfcbeee1835 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Sat, 12 Oct 2019 18:00:53 +0300
Subject: [PATCH 287/600] Release 1.16.1-2

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0b0b75b..a692f86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.16.1-2) unstable; urgency=medium
+
+  * http-lua: Downgrade to 0.10.13 (Closes: #941917)
+    Temporary fix FTBFS on architectures where Luajit is not available.
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Sat, 12 Oct 2019 17:59:23 +0300
+
 nginx (1.16.1-1) unstable; urgency=medium
 
   * New upstream version (Closes: #929200)

From 06b6f5670e9ca2b6d71f05b6b531ac661b10c4b6 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Sat, 11 Jan 2020 09:21:48 +0200
Subject: [PATCH 288/600] Handle CVE-2019-20372, error page request smuggling

Nginx before 1.17.7, with certain error_page configurations, allows HTTP
request smuggling, as demonstrated by the ability of an attacker to read
unauthorized web pages in environments where NGINX is being fronted by a
load balancer.
---
 debian/patches/CVE-2019-20372.patch | 31 +++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 debian/patches/CVE-2019-20372.patch

diff --git a/debian/patches/CVE-2019-20372.patch b/debian/patches/CVE-2019-20372.patch
new file mode 100644
index 0000000..7793fa4
--- /dev/null
+++ b/debian/patches/CVE-2019-20372.patch
@@ -0,0 +1,31 @@
+From 8bffc01d084b4881e3eed2052c115b8f04268cb9 Mon Sep 17 00:00:00 2001
+From: Ruslan Ermilov <ru@nginx.com>
+Date: Mon, 23 Dec 2019 15:45:46 +0300
+Subject: [PATCH] Discard request body when redirecting to a URL via
+ error_page.
+
+Reported by Bert JW Regeer and Francisco Oca Gonzalez.
+---
+ src/http/ngx_http_special_response.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
+index 2c1ff174..e2a5e9dc 100644
+--- a/src/http/ngx_http_special_response.c
++++ b/src/http/ngx_http_special_response.c
+@@ -623,6 +623,12 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
+         return ngx_http_named_location(r, &uri);
+     }
+ 
++    r->expect_tested = 1;
++
++    if (ngx_http_discard_request_body(r) != NGX_OK) {
++        r->keepalive = 0;
++    }
++
+     location = ngx_list_push(&r->headers_out.headers);
+ 
+     if (location == NULL) {
+-- 
+2.23.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 5b6b799..b221db7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
+CVE-2019-20372.patch

From f6841c97e24e562a828e90ab7f00598c2fd987f0 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <ctrochalakis@debian.org>
Date: Sat, 11 Jan 2020 09:37:17 +0200
Subject: [PATCH 289/600] Release 1.16.1-3

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a692f86..4f12422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.16.1-3) unstable; urgency=high
+
+  * Handle CVE-2019-20372, error page request smuggling
+    (Closes: #948579)
+
+ -- Christos Trochalakis <ctrochalakis@debian.org>  Sat, 11 Jan 2020 09:36:00 +0200
+
 nginx (1.16.1-2) unstable; urgency=medium
 
   * http-lua: Downgrade to 0.10.13 (Closes: #941917)

From 55ef39e8e194200d8c2da5da12c96594971b41bb Mon Sep 17 00:00:00 2001
From: Mohamed Akram <mohd.akram@outlook.com>
Date: Mon, 11 May 2020 22:44:59 +0400
Subject: [PATCH 290/600] Enable --with-compat configure option

Closes: #897926
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 981a57e..4f28b78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,7 @@ common_configure_flags := \
 			--http-proxy-temp-path=/var/lib/nginx/proxy \
 			--http-scgi-temp-path=/var/lib/nginx/scgi \
 			--http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
+			--with-compat \
 			--with-debug \
 			--with-pcre-jit \
 			--with-http_ssl_module \

From e5f8119f92409de49e5ab9dfd8f0eba44b61fa5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 19:56:08 +0200
Subject: [PATCH 291/600] Add REMOTE_USER fastcgi param

---
 debian/conf/fastcgi.conf   | 1 +
 debian/conf/fastcgi_params | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/conf/fastcgi.conf b/debian/conf/fastcgi.conf
index 091738c..d53a628 100644
--- a/debian/conf/fastcgi.conf
+++ b/debian/conf/fastcgi.conf
@@ -18,6 +18,7 @@ fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
 
 fastcgi_param  REMOTE_ADDR        $remote_addr;
 fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  REMOTE_USER        $remote_user;
 fastcgi_param  SERVER_ADDR        $server_addr;
 fastcgi_param  SERVER_PORT        $server_port;
 fastcgi_param  SERVER_NAME        $server_name;
diff --git a/debian/conf/fastcgi_params b/debian/conf/fastcgi_params
index 28decb9..69c4387 100644
--- a/debian/conf/fastcgi_params
+++ b/debian/conf/fastcgi_params
@@ -17,6 +17,7 @@ fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
 
 fastcgi_param  REMOTE_ADDR        $remote_addr;
 fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  REMOTE_USER        $remote_user;
 fastcgi_param  SERVER_ADDR        $server_addr;
 fastcgi_param  SERVER_PORT        $server_port;
 fastcgi_param  SERVER_NAME        $server_name;

From 3ef09c0f692984ea8b3ea2f40f0fa15e8502433e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 20:30:37 +0200
Subject: [PATCH 292/600] Use debhelper-compat instead of debian/compat

---
 debian/compat  | 1 -
 debian/control | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 debian/compat

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 409dc22..6860800 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: httpd
 Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper-compat (= 10),
                dpkg-dev (>= 1.15.5),
                libexpat-dev,
                libgd-dev,

From 2b4e972bd350a3431f4313d154c4cc2854ee6024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 20:36:23 +0200
Subject: [PATCH 293/600] Replace dh_systemd_enable with dh_installsystemd

---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4f28b78..8b3f962 100755
--- a/debian/rules
+++ b/debian/rules
@@ -154,8 +154,8 @@ override_dh_install:
 override_dh_installinit:
 	dh_installinit --no-restart-on-upgrade --no-start --name=nginx
 
-override_dh_systemd_enable:
-	dh_systemd_enable --name=nginx
+override_dh_installsystemd:
+	dh_installsystemd --name=nginx
 
 override_dh_installlogrotate:
 	dh_installlogrotate --package nginx-common --name=nginx

From 12e9c91f45b611aeb9c66e3f7ea531b637e9ba6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 20:41:04 +0200
Subject: [PATCH 294/600] Set Rules-Requires-Root: no

---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 6860800..34b14d7 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Standards-Version: 4.3.0
 Homepage: https://nginx.net
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx
+Rules-Requires-Root: no
 
 Package: nginx
 Architecture: all

From 7f0bb450a9742c809e22e8b31f32d359945ab1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 20:49:21 +0200
Subject: [PATCH 295/600] d/rules/dh_installinit: Replace
 --no-restart-on-upgrade with --no-stop-on-upgrade

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 8b3f962..bf4b9f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,7 +152,7 @@ override_dh_install:
 	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/autoscripts debian/dh_nginx
 
 override_dh_installinit:
-	dh_installinit --no-restart-on-upgrade --no-start --name=nginx
+	dh_installinit --no-stop-on-upgrade --no-start --name=nginx
 
 override_dh_installsystemd:
 	dh_installsystemd --name=nginx

From 52a04bd90d7a5098654e8eceb286adca5b4b6e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 20:54:39 +0200
Subject: [PATCH 296/600] Bump debhelper compat level to 13

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 34b14d7..e2f3990 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: httpd
 Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>
-Build-Depends: debhelper-compat (= 10),
+Build-Depends: debhelper-compat (= 13),
                dpkg-dev (>= 1.15.5),
                libexpat-dev,
                libgd-dev,

From d089e100447b31ef880030665879ce26b832af3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 21:04:44 +0200
Subject: [PATCH 297/600] Use package.maintscript instead of
 dpkg-maintscript-helper

---
 debian/nginx-common.maintscript |  8 ++++++++
 debian/nginx-common.postinst    | 14 --------------
 debian/nginx-common.postrm      | 14 --------------
 debian/nginx-common.preinst     | 14 --------------
 4 files changed, 8 insertions(+), 42 deletions(-)
 create mode 100644 debian/nginx-common.maintscript

diff --git a/debian/nginx-common.maintscript b/debian/nginx-common.maintscript
new file mode 100644
index 0000000..e1e7f53
--- /dev/null
+++ b/debian/nginx-common.maintscript
@@ -0,0 +1,8 @@
+# Handle naxsi removal
+rm_conffile /etc/nginx/naxsi.rules         1.6.2-2~
+rm_conffile /etc/nginx/naxsi_core.rules    1.6.2-2~
+rm_conffile /etc/nginx/naxsi-ui.conf.1.4.1 1.6.2-2~
+rm_conffile /etc/nginx/naxsi-ui.conf       1.6.2-2~
+
+# Handle upstart removal
+rm_conffile /etc/init/nginx.conf           1.13.5-1~
diff --git a/debian/nginx-common.postinst b/debian/nginx-common.postinst
index f83032d..9e0610e 100644
--- a/debian/nginx-common.postinst
+++ b/debian/nginx-common.postinst
@@ -3,20 +3,6 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-# Handle naxsi removal
-dpkg-maintscript-helper rm_conffile \
-	          /etc/nginx/naxsi.rules         1.6.2-2~ -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	          /etc/nginx/naxsi_core.rules    1.6.2-2~ -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	          /etc/nginx/naxsi-ui.conf.1.4.1 1.6.2-2~ -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	          /etc/nginx/naxsi-ui.conf       1.6.2-2~ -- "$@"
-
-# Handle upstart removal
-dpkg-maintscript-helper rm_conffile \
-	          /etc/init/nginx.conf           1.13.5-1~ -- "$@"
-
 case "$1" in
   configure)
     logdir="/var/log/nginx"
diff --git a/debian/nginx-common.postrm b/debian/nginx-common.postrm
index d6f313a..f5124c8 100644
--- a/debian/nginx-common.postrm
+++ b/debian/nginx-common.postrm
@@ -1,20 +1,6 @@
 #!/bin/sh
 set -e
 
-# Handle naxsi removal
-dpkg-maintscript-helper rm_conffile \
-	          /etc/nginx/naxsi.rules         1.6.2-2~ -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	          /etc/nginx/naxsi_core.rules    1.6.2-2~ -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	          /etc/nginx/naxsi-ui.conf.1.4.1 1.6.2-2~ -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	          /etc/nginx/naxsi-ui.conf       1.6.2-2~ -- "$@"
-
-# Handle upstart removal
-dpkg-maintscript-helper rm_conffile \
-	          /etc/init/nginx.conf           1.13.5-1~ -- "$@"
-
 case "$1" in
   purge)
     rm -rf /var/lib/nginx /var/log/nginx /etc/nginx
diff --git a/debian/nginx-common.preinst b/debian/nginx-common.preinst
index 27f21da..ead53f7 100644
--- a/debian/nginx-common.preinst
+++ b/debian/nginx-common.preinst
@@ -1,20 +1,6 @@
 #!/bin/sh
 set -e
 
-# Handle naxsi removal
-dpkg-maintscript-helper rm_conffile \
-	  /etc/nginx/naxsi.rules         1.6.2-2~ -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	  /etc/nginx/naxsi_core.rules    1.6.2-2~ -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	  /etc/nginx/naxsi-ui.conf.1.4.1 1.6.2-2~ -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	  /etc/nginx/naxsi-ui.conf       1.6.2-2~ -- "$@"
-
-# Handle upstart removal
-dpkg-maintscript-helper rm_conffile \
-	  /etc/init/nginx.conf           1.13.5-1~ -- "$@"
-
 case "$1" in
   install)
     # If we are doing a fresh install, then these files are no longer needed.

From 403f780a4693f70066f9659cae8fc0e6adea161c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 21:15:12 +0200
Subject: [PATCH 298/600] Bump standards version to 4.5.0

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e2f3990..835af43 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper-compat (= 13),
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
 Homepage: https://nginx.net
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx

From b575cfe355931e42fb61febe58d06076a8b10725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 21:22:34 +0200
Subject: [PATCH 299/600] nchan: Upgrade to 1.2.7

---
 debian/modules/nchan/README.md                | 1033 +++++++-
 debian/modules/nchan/changelog.txt            |  205 ++
 debian/modules/nchan/cloc-exclude.txt         |   21 +-
 debian/modules/nchan/config                   |   87 +-
 debian/modules/nchan/src/nchan_commands.rb    |  383 ++-
 .../modules/nchan/src/nchan_config_commands.c |  284 ++-
 debian/modules/nchan/src/nchan_defs.c         |    9 +-
 debian/modules/nchan/src/nchan_defs.h         |   11 +-
 debian/modules/nchan/src/nchan_module.c       |  428 ++--
 debian/modules/nchan/src/nchan_module.h       |   34 +-
 debian/modules/nchan/src/nchan_setup.c        |  703 +++++-
 debian/modules/nchan/src/nchan_types.h        |  197 +-
 debian/modules/nchan/src/nchan_variables.c    |    6 +
 debian/modules/nchan/src/nchan_version.h      |    1 +
 .../modules/nchan/src/store/memory/groups.c   |  570 +++++
 .../modules/nchan/src/store/memory/groups.h   |   55 +
 .../nchan/src/store/memory/ipc-handlers.c     |  701 ++++--
 .../nchan/src/store/memory/ipc-handlers.h     |   16 +-
 debian/modules/nchan/src/store/memory/ipc.c   |   30 +-
 debian/modules/nchan/src/store/memory/ipc.h   |   11 +-
 .../modules/nchan/src/store/memory/memstore.c | 1457 +++++++----
 .../nchan/src/store/memory/store-private.h    |   41 +-
 debian/modules/nchan/src/store/memory/store.h |    6 +-
 .../modules/nchan/src/store/redis/cluster.c   | 1257 ----------
 .../modules/nchan/src/store/redis/cluster.h   |   30 -
 debian/modules/nchan/src/store/redis/cmp.c    | 1319 +++++++---
 debian/modules/nchan/src/store/redis/cmp.h    |   66 +-
 .../nchan/src/store/redis/hiredis/.gitignore  |    7 +
 .../nchan/src/store/redis/hiredis/.travis.yml |   24 +
 .../src/store/redis/hiredis/CHANGELOG.md      |  110 +
 .../nchan/src/store/redis/hiredis/COPYING     |   29 +
 .../nchan/src/store/redis/hiredis/Makefile    |  217 ++
 .../nchan/src/store/redis/hiredis/README.md   |  392 +++
 .../src/store/redis/hiredis/adapters/ae.h     |  127 +
 .../src/store/redis/hiredis/adapters/libev.h  |  147 ++
 .../store/redis/hiredis/adapters/libevent.h   |  108 +
 .../src/store/redis/hiredis/adapters/libuv.h  |  121 +
 .../nchan/src/store/redis/hiredis/async.c     |  687 ++++++
 .../nchan/src/store/redis/hiredis/async.h     |  129 +
 .../nchan/src/store/redis/hiredis/dict.c      |  338 +++
 .../nchan/src/store/redis/hiredis/dict.h      |  126 +
 .../store/redis/hiredis/examples/example-ae.c |   62 +
 .../redis/hiredis/examples/example-libev.c    |   52 +
 .../redis/hiredis/examples/example-libevent.c |   53 +
 .../redis/hiredis/examples/example-libuv.c    |   53 +
 .../store/redis/hiredis/examples/example.c    |   78 +
 .../nchan/src/store/redis/hiredis/fmacros.h   |   21 +
 .../nchan/src/store/redis/hiredis/hiredis.c   | 1021 ++++++++
 .../nchan/src/store/redis/hiredis/hiredis.h   |  226 ++
 .../nchan/src/store/redis/hiredis/net.c       |  461 ++++
 .../nchan/src/store/redis/hiredis/net.h       |   53 +
 .../nchan/src/store/redis/hiredis/read.c      |  525 ++++
 .../nchan/src/store/redis/hiredis/read.h      |  116 +
 .../nchan/src/store/redis/hiredis/sds.c       | 1095 +++++++++
 .../nchan/src/store/redis/hiredis/sds.h       |  105 +
 .../nchan/src/store/redis/hiredis/test.c      |  807 ++++++
 .../nchan/src/store/redis/hiredis/win32.h     |   42 +
 .../modules/nchan/src/store/redis/rdsstore.c  | 2139 +++++++---------
 .../{scripts => redis-lua-scripts}/.gitignore |    0
 .../{scripts => redis-lua-scripts}/Gemfile    |    0
 .../add_fakesub.lua                           |   13 +-
 .../channel_keepalive.lua                     |    9 +-
 .../{scripts => redis-lua-scripts}/delete.lua |   58 +-
 .../redis/redis-lua-scripts/find_channel.lua  |   70 +
 .../get_message.lua                           |   33 +-
 .../get_message_from_key.lua                  |    8 +
 .../publish.lua                               |  119 +-
 .../publish_status.lua                        |    8 +-
 .../{scripts => redis-lua-scripts}/rsck.lua   |   37 +-
 .../subscriber_register.lua                   |   24 +-
 .../subscriber_unregister.lua                 |    6 +-
 .../testscripts.rb                            |    7 +-
 .../src/store/redis/redis_lua_commands.c      | 1036 ++++++++
 .../src/store/redis/redis_lua_commands.h      | 1001 +-------
 .../src/store/redis/redis_nginx_adapter.c     |   64 +-
 .../src/store/redis/redis_nginx_adapter.h     |    7 +-
 .../nchan/src/store/redis/redis_nodeset.c     | 2179 +++++++++++++++++
 .../nchan/src/store/redis/redis_nodeset.h     |  276 +++
 .../src/store/redis/redis_nodeset_parser.c    |  241 ++
 .../src/store/redis/redis_nodeset_parser.h    |   40 +
 .../src/store/redis/scripts/find_channel.lua  |   56 -
 .../redis/scripts/get_message_from_key.lua    |    9 -
 .../nchan/src/store/redis/store-private.h     |  196 +-
 debian/modules/nchan/src/store/redis/store.h  |   11 +-
 debian/modules/nchan/src/store/spool.c        |  290 ++-
 debian/modules/nchan/src/store/spool.h        |   14 +-
 .../modules/nchan/src/subscribers/benchmark.c |   72 +
 .../modules/nchan/src/subscribers/benchmark.h |    3 +
 debian/modules/nchan/src/subscribers/common.c |  565 ++---
 debian/modules/nchan/src/subscribers/common.h |   17 +-
 .../nchan/src/subscribers/eventsource.c       |   94 +-
 .../nchan/src/subscribers/getmsg_proxy.c      |  106 +
 .../nchan/src/subscribers/getmsg_proxy.h      |    1 +
 .../nchan/src/subscribers/http-chunked.c      |   10 +-
 .../src/subscribers/http-multipart-mixed.c    |   27 +-
 .../nchan/src/subscribers/http-raw-stream.c   |   16 +-
 .../modules/nchan/src/subscribers/internal.c  |   19 +-
 .../nchan/src/subscribers/longpoll-private.h  |    4 +-
 .../modules/nchan/src/subscribers/longpoll.c  |  240 +-
 .../nchan/src/subscribers/memstore_ipc.c      |   63 +-
 .../nchan/src/subscribers/memstore_ipc.h      |    3 +
 .../nchan/src/subscribers/memstore_multi.c    |   53 +-
 .../nchan/src/subscribers/memstore_redis.c    |  130 +-
 .../nchan/src/subscribers/memstore_redis.h    |    1 -
 .../modules/nchan/src/subscribers/websocket.c | 1420 +++++++----
 .../modules/nchan/src/subscribers/websocket.h |    3 +-
 debian/modules/nchan/src/uthash.h             | 1234 ++++++----
 debian/modules/nchan/src/util/hdr_histogram.c | 1015 ++++++++
 debian/modules/nchan/src/util/hdr_histogram.h |  427 ++++
 .../modules/nchan/src/util/nchan_benchmark.c  |  804 ++++++
 .../modules/nchan/src/util/nchan_benchmark.h  |   91 +
 .../nchan/src/util/nchan_bufchainpool.c       |   96 +
 .../nchan/src/util/nchan_bufchainpool.h       |   17 +
 .../modules/nchan/src/util/nchan_channel_id.c |   82 +-
 .../modules/nchan/src/util/nchan_channel_id.h |    5 +-
 .../nchan/src/util/nchan_channel_info.c       |  128 -
 .../nchan/src/util/nchan_channel_info.h       |    7 -
 debian/modules/nchan/src/util/nchan_debug.c   |   81 +
 debian/modules/nchan/src/util/nchan_debug.h   |   13 +
 .../nchan/src/util/nchan_fake_request.c       |  291 ++-
 .../nchan/src/util/nchan_fake_request.h       |   58 +-
 debian/modules/nchan/src/util/nchan_list.c    |   26 +
 debian/modules/nchan/src/util/nchan_list.h    |    5 +
 .../src/util/{nchan_msgid.c => nchan_msg.c}   |  324 ++-
 .../src/util/{nchan_msgid.h => nchan_msg.h}   |   19 +
 debian/modules/nchan/src/util/nchan_output.c  |   95 +-
 debian/modules/nchan/src/util/nchan_output.h  |    6 +-
 .../nchan/src/util/nchan_output_info.c        |  271 ++
 .../nchan/src/util/nchan_output_info.h        |    6 +
 debian/modules/nchan/src/util/nchan_rbtree.h  |    6 +-
 debian/modules/nchan/src/util/nchan_slist.c   |  164 ++
 debian/modules/nchan/src/util/nchan_slist.h   |   41 +
 .../modules/nchan/src/util/nchan_subrequest.c |   75 +-
 .../modules/nchan/src/util/nchan_subrequest.h |    5 +-
 debian/modules/nchan/src/util/nchan_util.c    |  911 ++++++-
 debian/modules/nchan/src/util/nchan_util.h    |   50 +-
 .../nchan/src/util/ngx_nchan_hacked_slab.c    |    4 +
 debian/modules/nchan/src/util/shmem.c         |   49 +-
 debian/modules/nchan/src/util/shmem.h         |    5 +
 139 files changed, 26023 insertions(+), 7479 deletions(-)
 mode change 100755 => 100644 debian/modules/nchan/src/nchan_module.c
 create mode 100644 debian/modules/nchan/src/nchan_version.h
 create mode 100644 debian/modules/nchan/src/store/memory/groups.c
 create mode 100644 debian/modules/nchan/src/store/memory/groups.h
 delete mode 100644 debian/modules/nchan/src/store/redis/cluster.c
 delete mode 100644 debian/modules/nchan/src/store/redis/cluster.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/.gitignore
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/.travis.yml
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/COPYING
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/Makefile
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/README.md
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/adapters/ae.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/adapters/libev.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/adapters/libevent.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/adapters/libuv.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/async.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/async.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/dict.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/dict.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example-ae.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example-libev.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example-libevent.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example-libuv.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/fmacros.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/hiredis.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/hiredis.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/net.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/net.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/read.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/read.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/sds.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/sds.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/test.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/win32.h
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/.gitignore (100%)
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/Gemfile (100%)
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/add_fakesub.lua (65%)
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/channel_keepalive.lua (85%)
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/delete.lua (54%)
 create mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/find_channel.lua
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/get_message.lua (80%)
 create mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message_from_key.lua
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/publish.lua (71%)
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/publish_status.lua (81%)
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/rsck.lua (86%)
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/subscriber_register.lua (62%)
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/subscriber_unregister.lua (85%)
 rename debian/modules/nchan/src/store/redis/{scripts => redis-lua-scripts}/testscripts.rb (94%)
 create mode 100644 debian/modules/nchan/src/store/redis/redis_lua_commands.c
 create mode 100644 debian/modules/nchan/src/store/redis/redis_nodeset.c
 create mode 100644 debian/modules/nchan/src/store/redis/redis_nodeset.h
 create mode 100644 debian/modules/nchan/src/store/redis/redis_nodeset_parser.c
 create mode 100644 debian/modules/nchan/src/store/redis/redis_nodeset_parser.h
 delete mode 100644 debian/modules/nchan/src/store/redis/scripts/find_channel.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/scripts/get_message_from_key.lua
 create mode 100644 debian/modules/nchan/src/subscribers/benchmark.c
 create mode 100644 debian/modules/nchan/src/subscribers/benchmark.h
 create mode 100644 debian/modules/nchan/src/subscribers/getmsg_proxy.c
 create mode 100644 debian/modules/nchan/src/subscribers/getmsg_proxy.h
 create mode 100644 debian/modules/nchan/src/util/hdr_histogram.c
 create mode 100644 debian/modules/nchan/src/util/hdr_histogram.h
 create mode 100644 debian/modules/nchan/src/util/nchan_benchmark.c
 create mode 100644 debian/modules/nchan/src/util/nchan_benchmark.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_channel_info.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_channel_info.h
 create mode 100644 debian/modules/nchan/src/util/nchan_debug.c
 create mode 100644 debian/modules/nchan/src/util/nchan_debug.h
 rename debian/modules/nchan/src/util/{nchan_msgid.c => nchan_msg.c} (65%)
 rename debian/modules/nchan/src/util/{nchan_msgid.h => nchan_msg.h} (63%)
 create mode 100644 debian/modules/nchan/src/util/nchan_output_info.c
 create mode 100644 debian/modules/nchan/src/util/nchan_output_info.h
 create mode 100644 debian/modules/nchan/src/util/nchan_slist.c
 create mode 100644 debian/modules/nchan/src/util/nchan_slist.h

diff --git a/debian/modules/nchan/README.md b/debian/modules/nchan/README.md
index ee43ac9..152396d 100644
--- a/debian/modules/nchan/README.md
+++ b/debian/modules/nchan/README.md
@@ -1,57 +1,56 @@
-<img class="logo" alt="NCHAN" src="https://nchan.slact.net/github-logo.png" />
+<img class="logo" alt="NCHAN" src="https://nchan.io/github-logo.png" />
 
-https://nchan.slact.net
+https://nchan.io
 
 Nchan is a scalable, flexible pub/sub server for the modern web, built as a module for the [Nginx](http://nginx.org) web server. It can be configured as a standalone server, or as a shim between your application and hundreds, thousands, or millions of live subscribers. It can buffer messages in memory, on-disk, or via [Redis](http://redis.io). All connections are handled asynchronously and distributed among any number of worker processes. It can also scale to many Nginx servers with [Redis](http://redis.io).
 
 Messages are [published](#publisher-endpoints) to channels with HTTP `POST` requests or Websocket, and [subscribed](#subscriber-endpoint) also through [Websocket](#websocket), [long-polling](#long-polling), [EventSource](#eventsource) (SSE), old-fashioned [interval polling](#interval-polling), [and](#http-chunked-transfer) [more](#http-multipart-mixed).
 
-In a web browser, you can use Websocket or EventSource directly, or the [NchanSubscriber.js](https://github.com/slact/nchan/blob/master/NchanSubscriber.js) wrapper library. It supports Long-Polling, EventSource, and resumable Websockets, and has a few other added convenience options.
+In a web browser, you can use Websocket or EventSource natively, or the [NchanSubscriber.js](https://github.com/slact/nchan.js) wrapper library. It supports Long-Polling, EventSource, and resumable Websockets, and has a few other added convenience options. It's also available on [NPM](https://www.npmjs.com/package/nchan).
 
 ## Features
- - RESTful, HTTP-native API.
- - Supports [Websocket](https://nchan.slact.net/#websocket), [EventSource (Server-Sent Events)](https://nchan.slact.net/#eventsource), [Long-Polling](https://nchan.slact.net/#long-polling) and other HTTP-based subscribers.
- - No-repeat, no-loss message delivery guarantees with per-channel configurable message buffers.
+ - RESTful, HTTP-native [API](#publishing-messages).
+ - Supports [Websocket](#websocket), [EventSource (Server-Sent Events)](#eventsource), [Long-Polling](#long-polling) and other HTTP-based subscribers.
+ - Per-channel configurable message buffers with no-repeat, no-loss message delivery guarantees.
  - Subscribe to [hundreds of channels](#channel-multiplexing) over a single subscriber connection.
- - HTTP request [callbacks and hooks](https://nchan.slact.net/details#application-callbacks) for easy integration.
- - Introspection with [channel events](https://nchan.slact.net/details#channel-events) and [url for monitoring performance statistics](https://nchan.slact.net/details#nchan_stub_status).
- - Fast ephemeral local message storage and optional, slower, persistent storage with [Redis](https://nchan.slact.net/details#connecting-to-a-redis-server).
- - Horizontally scalable (using [Redis](https://nchan.slact.net/details#connecting-to-a-redis-server)).
- - Highly Available with no single point of failure (using [Redis Cluster](https://nchan.slact.net/details#redis-cluster)).
- 
-<!-- toc -->
+ - HTTP request [callbacks and hooks](#hooks-and-callbacks) for easy integration.
+ - Introspection with [channel events](#channel-events) and [url for monitoring performance statistics](#nchan_stub_status-stats).
+ - Channel [group](#channel-groups) usage [accounting and limits](#limits-and-accounting).
+ - Fast, nonblocking [shared-memory local message storage](#memory-storage) and optional, slower, persistent storage with [Redis](#redis).
+ - Horizontally scalable (using [Redis](#redis)).
+ - Auto-failover and [high availability](#high-availability) with no single point of failure using [Redis Cluster](#redis-cluster).
 
 ## Status and History
 
-The latest Nchan release is v1.0.8 (November 28, 2016) ([changelog](https://nchan.slact.net/changelog)).
+The latest Nchan release is 1.2.7 (March 17, 2020) ([changelog](https://nchan.io/changelog)).
 
-The first iteration of Nchan was written in 2009-2010 as the [Nginx HTTP Push Module](https://pushmodule.slact.net), and was vastly refactored into its present state in 2014-2016. The present release is in the **testing** phase. The core features and old functionality are thoroughly tested and stable. Some of the new functionality, especially Redis Cluster may be a bit buggy.
+The first iteration of Nchan was written in 2009-2010 as the [Nginx HTTP Push Module](https://pushmodule.slact.net), and was vastly refactored into its present state in 2014-2016.
 
 #### Upgrade from Nginx HTTP Push Module
 
-Although Nchan is backwards-compatible with all Push Module configuration directives, some of the more unusual and rarely used settings have been disabled and will be ignored (with a warning). See the [upgrade page](https://nchan.slact.net/upgrade) for a detailed list of changes and improvements, as well as a full list of incompatibilities.
+Although Nchan is backwards-compatible with all Push Module configuration directives, some of the more unusual and rarely used settings have been disabled and will be ignored (with a warning). See the [upgrade page](https://nchan.io/upgrade) for a detailed list of changes and improvements, as well as a full list of incompatibilities.
 
 
 ## Does it scale?
 
-<img class="benchmark_graph" alt="benchmarking internal subscriber response times" src="https://nchan.slact.net/img/benchmark_internal_total.png" />
+<img class="benchmark_graph" alt="benchmarking internal subscriber response times" src="https://nchan.io/img/benchmark_internal_total.png" />
 
 Yes it does. Like Nginx, Nchan can easily handle as much traffic as you can throw at it. I've tried to benchmark it, but my benchmarking tools are much slower than Nchan. The data I've gathered is on how long Nchan itself takes to respond to every subscriber after publishing a message -- this excludes TCP handshake times and internal HTTP request parsing. Basically, it measures how Nchan scales assuming all other components are already tuned for scalability. The graphed data are averages of 5 runs with 50-byte messages.
 
-With a well-tuned OS and network stack on commodity server hardware, expect to handle upwards of 300K concurrent subscribers per second at minimal CPU load. Nchan can also be scaled out to multiple Nginx instances using the [Redis storage engine](#nchan_use_redis), and that too can be scaled up beyond a single-point-of-failure by using [Redis Cluster](https://nchan.slact.net/details#using-redis).
+With a well-tuned OS and network stack on commodity server hardware, expect to handle upwards of 300K concurrent subscribers per second at minimal CPU load. Nchan can also be scaled out to multiple Nginx instances using the [Redis storage engine](#nchan_use_redis), and that too can be scaled up beyond a single-point-of-failure by using [Redis Cluster](#redis-cluster).
 
-Currently, Nchan's main bottleneck is not CPU load but memory bandwidth. This can be improved significantly in future versions with fewer allocations and better use of contiguous memory pools. Please consider supporting Nchan to speed up the work of memory cache optimization.
 
 ## Install
 
 #### Download Packages
- - [Arch Linux](https://archlinux.org): [nginx-nchan](https://aur.archlinux.org/packages/nginx-nchan/) and [nginx-nchan-git](https://aur.archlinux.org/packages/nginx-nchan-git/) are available in the Arch User Repository.  
- - Mac OS X: a [homebrew](http://brew.sh) package is available. `brew tap homebrew/nginx; brew install nginx-full --with-nchan-module`
- - [Debian](https://www.debian.org/): A dynamic module build for is available in the Debian package repository: [libnginx-mod-nchan](https://packages.debian.org/sid/libnginx-mod-nchan).  
- Additionally, you can use the pre-built static module packages [nginx-common.deb](https://nchan.slact.net/download/nginx-common.deb) and [nginx-extras.deb](https://nchan.slact.net/download/nginx-extras.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`.
- - [Ubuntu](http://www.ubuntu.com/):  [nginx-common.ubuntu.deb](https://nchan.slact.net/download/nginx-common.ubuntu.deb) and [nginx-extras.ubuntu.deb](https://nchan.slact.net/download/nginx-extras.ubuntu.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`. Who knows when Ubuntu will add them to their repository?...
- - [Fedora](https://fedoraproject.org): Dynamic module builds for Nginx > 1.10.0 are available: [nginx-mod-nchan.x86_64.rpm](https://nchan.slact.net/download/nginx-mod-nchan.x86-64.rpm), [nginx-mod-nchan.src.rpm](https://nchan.slact.net/download/nginx-mod-nchan.src.rpm). 
- - A statically compiled binary and associated linux nginx installation files are also [available as a tarball](https://nchan.slact.net/download/nginx-nchan-latest.tar.gz).
+ - [Arch Linux](https://archlinux.org): [nginx-mod-nchan](https://aur.archlinux.org/packages/nginx-mod-nchan/) and [nginx-mainline-mod-nchan](https://aur.archlinux.org/packages/nginx-mainline-mod-nchan/) are available in the Arch User Repository.
+ - Mac OS X: a [homebrew](http://brew.sh) package is available. `brew tap denji/nginx; brew install nginx-full --with-nchan-module`
+ - [Debian](https://www.debian.org/): A dynamic module build is available in the Debian package repository: [libnginx-mod-nchan](https://packages.debian.org/sid/libnginx-mod-nchan).  
+ Additionally, you can use the pre-built static module packages [nginx-common.deb](https://nchan.io/download/nginx-common.deb) and [nginx-extras.deb](https://nchan.io/download/nginx-extras.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`.
+ - [Ubuntu](http://www.ubuntu.com/):  [nginx-common.ubuntu.deb](https://nchan.io/download/nginx-common.ubuntu.deb) and [nginx-extras.ubuntu.deb](https://nchan.io/download/nginx-extras.ubuntu.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`. Who knows when Ubuntu will add Nchan to their repository?...
+ - [Fedora](https://fedoraproject.org): Dynamic module builds for Nginx > 1.10.0 are available: [nginx-mod-nchan.x86_64.rpm](https://nchan.io/download/nginx-mod-nchan.x86-64.rpm), [nginx-mod-nchan.src.rpm](https://nchan.io/download/nginx-mod-nchan.src.rpm). 
+ - [Heroku](https://heroku.com): A buildpack for compiling Nchan into Nginx is available: [nchan-buildpack](https://github.com/andjosh/nchan-buildpack). A one-click, readily-deployable app is also available: [nchan-heroku](https://github.com/andjosh/nchan-heroku).
+ - A statically compiled binary and associated linux nginx installation files are also [available as a tarball](https://nchan.io/download/nginx-nchan-latest.tar.gz).
 
 
 #### Build From Source
@@ -62,7 +61,7 @@ Grab the latest copy of Nginx from [nginx.org](http://nginx.org). Grab the lates
 
 If you're using Nginx  > 1.9.11, you can build Nchan as a [dynamic module](https://www.nginx.com/blog/dynamic-modules-nginx-1-9-11/) with `--add-dynamic-module=path/to/nchan`
 
-Run `make`, `make install`, and enjoy. (Caution, contents may be hot.)
+Run `make`, then `make install`.
 
 ## Getting Started
 
@@ -87,11 +86,11 @@ http {
 }
 ```
 
-You can now publish messages to channels by `POST`ing data to `/sub?id=channel_id` , and subscribe by pointing Websocket, EventSource, or [NchanSubscriber.js](https://github.com/slact/nchan/blob/master/NchanSubscriber.js) to `sub/?id=channel_id`. It's that simple.
+You can now publish messages to channels by `POST`ing data to `/pub?id=channel_id` , and subscribe by pointing Websocket, EventSource, or [NchanSubscriber.js](https://github.com/slact/nchan.js) to `sub/?id=channel_id`. It's that simple.
 
 But Nchan is very flexible and highly configurable. So, of course, it can get a lot more complicated...
 
-## Conceptual Overview
+### Conceptual Overview
 
 The basic unit of most pub/sub solutions is the messaging *channel*. Nchan is no different. Publishers send messages to channels with a certain *channel id*, and subscribers subscribed to those channels receive them. Some number of messages may be buffered for a time in a channel's message buffer before they are deleted. Pretty simple, right? 
 
@@ -121,15 +120,26 @@ http {
 The above maps requests to the URI `/sub` onto the channel `foobar`'s *subscriber endpoint* , and similarly `/pub` onto channel `foobar`'s *publisher endpoint*.
 
 
-#### Publisher Endpoints
+## Publisher Endpoints
 
 Publisher endpoints are Nginx config *locations* with the [*`nchan_publisher`*](#nchan_publisher) directive.
 
 Messages can be published to a channel by sending HTTP **POST** requests with the message contents to the *publisher endpoint* locations. You can also publish messages through a **Websocket** connection to the same location.
 
+```nginx
+  location /pub {
+    #example publisher location
+    nchan_publisher;
+    nchan_channel_id foo;
+    nchan_channel_group test;
+    nchan_message_buffer_length 50;
+    nchan_message_timeout 5m;
+  }
+```
+
 <!-- tag:publisher -->
 
-##### Publishing Messages
+### Publishing Messages
 
 Requests and websocket messages are responded to with information about the channel at time of message publication. Here's an example from publishing with `curl`:
 
@@ -147,7 +157,7 @@ The response can be in plaintext (as above), JSON, or XML, based on the request'
 ```console
 > curl --request POST --data "test message" -H "Accept: text/json" http://127.0.0.2:80/pub
 
- {"messages": 6, "requested": 55, "subscribers": 0, "last_message_id": "1450755317:0" }
+ {"messages": 5, "requested": 18, "subscribers": 0, "last_message_id": "1450755280:0" }
 ```
 
 Websocket publishers also receive the same responses when publishing, with the encoding determined by the *`Accept`* header present during the handshake.
@@ -156,7 +166,7 @@ The response code for an HTTP request is *`202` Accepted* if no subscribers are
 
 Metadata can be added to a message when using an HTTP POST request for publishing. A `Content-Type` header will be associated as the message's content type (and output to Long-Poll, Interval-Poll, and multipart/mixed subscribers). A `X-EventSource-Event` header can also be used to associate an EventSource `event:` line value with a message.
 
-##### Other Publisher Endpoint Actions
+### Other Publisher Endpoint Actions
 
 **HTTP `GET`** requests return channel information without publishing a message. The response code is `200` if the channel exists, and `404` otherwise:  
 ```console
@@ -171,15 +181,32 @@ Metadata can be added to a message when using an HTTP POST request for publishin
 
 **HTTP `DELETE`** requests delete a channel and end all subscriber connections. Like the `GET` requests, this returns a `200` status response with channel info if the channel existed, and a `404` otherwise.
 
-For an in-depth explanation of how settings are applied to channels from publisher locations, see the [details page](https://nchan.slact.net/details#publisher-endpoint-configs).
+### How Channel Settings Work
 
-#### Subscriber Endpoints
+*A channel's configuration is set to the that of its last-used publishing location.*
+So, if you want a channel to behave consistently, and want to publish to it from multiple locations, *make sure those locations have the same configuration*.
+
+You can also can use differently-configured publisher locations to dynamically update a channel's message buffer settings. This can be used to erase messages or to scale an existing channel's message buffer as desired.
+
+## Subscriber Endpoints
 
 Subscriber endpoints are Nginx config *locations* with the [*`nchan_subscriber`*](#nchan_subscriber) directive.
 
 Nchan supports several different kinds of subscribers for receiving messages: [*Websocket*](#websocket), [*EventSource*](#eventsource) (Server Sent Events),  [*Long-Poll*](#long-polling), [*Interval-Poll*](#interval-polling). [*HTTP chunked transfer*](#http-chunked-transfer), and [*HTTP multipart/mixed*](#http-multipart-mixed).
 
-- ##### Long-Polling
+```nginx
+  location /sub {
+    #example subscriber location
+    nchan_subscriber;
+    nchan_channel_id foo;
+    nchan_channel_group test;
+    nchan_subscriber_first_message oldest;
+  }
+```
+
+<!-- tag:subscriber -->
+
+- ### Long-Polling
   The tried-and-true server-push method supported by every browser out there.  
   Initiated by sending an HTTP `GET` request to a channel subscriber endpoint.  
   The long-polling subscriber walks through a channel's message queue via the built-in cache mechanism of HTTP clients, namely with the "`Last-Modified`" and "`Etag`" headers. Explicitly, to receive the next message for given a long-poll subscriber response, send a request with the "`If-Modified-Since`" header set to the previous response's "`Last-Modified`" header, and "`If-None-Match`" likewise set to the previous response's "`Etag`" header.  
@@ -187,15 +214,16 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
   <!-- tag:subscriber-longpoll -->
   
-- ##### Interval-Polling
+- ### Interval-Polling
   Works just like long-polling, except if the requested message is not yet available, immediately responds with a `304 Not Modified`.
-  There is no way to differentiate between long-poll and interval-poll subscriber requests, so long-polling must be disabled for a subscriber location if you wish to use interval-polling.
+  Nchan cannot automatically distinguish between long-poll and interval-poll subscriber requests, so long-polling must be disabled for a subscriber location if you wish to use interval-polling.
 
-- ##### Websocket
+- ### Websocket
   Bidirectional communication for web browsers. Part of the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html). Nchan supports the latest protocol version 13 ([RFC 6455](https://tools.ietf.org/html/rfc6455)).  
   Initiated by sending a websocket handshake to the desired subscriber endpoint location.  
-  If the websocket connection is closed by the server, the `close` frame will contain the HTTP response code and status line describing the reason for closing the connection. Server-initiated keep-alive pings can be configured with the [`nchan_websocket_ping_interval`](#nchan_websocket_ping_interval) config directive. Websocket extensions are not yet supported.  
-  Messages published through a websocket connection can be forwarded to an upstream application with the [`nchan_publisher_upstream_request`](#nchan_publisher_upstream_request) config directive.   
+  If the websocket connection is closed by the server, the `close` frame will contain the HTTP response code and status line describing the reason for closing the connection. Server-initiated keep-alive pings can be configured with the [`nchan_websocket_ping_interval`](#nchan_websocket_ping_interval) config directive.
+  Messages are delivered to subscribers in `text` websocket frames, except if a message's `content-type` is "`application/octet-stream`" -- then it is delivered in a `binary` frame.
+  <br />
   Websocket subscribers can use the custom `ws+meta.nchan` subprotocol to receive message metadata with messages, making websocket connections resumable. Messages received with this subprotocol are of the form
   <pre>
   id: message_id
@@ -204,9 +232,24 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   message_data
   </pre>   
   The `content-type:` line may be omitted.
+  <br />
+  #### Websocket Publisher
+  Messages published through a websocket connection can be forwarded to an upstream application with the [`nchan_publisher_upstream_request`](#nchan_publisher_upstream_request) config directive.   
+  Messages published in a binary frame are automatically given the `content-type` "`application/octet-stream`".
+  #### Permessage-deflate
+  Nchan version 1.1.8 and above supports the [permessage-deflate protocol extension](https://tools.ietf.org/html/rfc7692). Messages are deflated once when they are published, and then can be broadcast to any number of compatible websocket subscribers. Message deflation is enabled by setting the [`nchan_deflate_message_for_websocket on;`](#nchan_deflate_message_for_websocket) directive in a publisher location.
+  <br />
+  The deflated data is stored alongside the original message in memory, or, if large enough, on disk. This means more [shared memory](#nchan_shared_memory_size) is necessary when using `nchan_deflate_message_for_websocket`.
+  <br />
+  Deflation parameters (speed, memory use, strategy, etc.), can be tweaked using the [`nchan_permessage_deflate_compression_window`](#nchan_permessage_deflate_compression_window), [`nchan_permessage_deflate_compression_level`](#nchan_permessage_deflate_compression_level),
+  [`nchan_permessage_deflate_compression_strategy`](#nchan_permessage_deflate_compression_strategy), and 
+  [`nchan_permessage_deflate_compression_window`](#nchan_permessage_deflate_compression_window) settings.
+  <br />
+  Nchan also supports the (deprecated) [perframe-deflate extension](https://tools.ietf.org/html/draft-tyoshino-hybi-websocket-perframe-deflate-06) still in use by Safari as `x-webkit-perframe-deflate`.
+  <br />
   <!-- tag:subscriber-websocket -->
   
-- ##### EventSource
+- ### EventSource
   Also known as [Server-Sent Events](https://en.wikipedia.org/wiki/Server-sent_events) or SSE, it predates Websockets in the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html), and is a [very simple protocol](http://www.w3.org/TR/eventsource/#event-stream-interpretation).  
   Initiated by sending an HTTP `GET` request to a channel subscriber endpoint with the "`Accept: text/event-stream`" header.    
   Each message `data: ` segment will be prefaced by the message `id: `.  
@@ -217,7 +260,7 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   A message's associated `event` type, if present, will be sent to this subscriber with the `event:` line.  
   <!-- tag:subscriber-eventsource -->
   
-- ##### HTTP [multipart/mixed](http://www.w3.org/Protocols/rfc1341/7_2_Multipart.html#z0)
+- ### HTTP [multipart/mixed](http://www.w3.org/Protocols/rfc1341/7_2_Multipart.html#z0)
   The `multipart/mixed` MIMEtype was conceived for emails, but hey, why not use it for HTTP? It's easy to parse and includes metadata with each message.  
   Initiated by including an `Accept: multipart/mixed` header.  
   The response headers and the unused "preamble" portion of the response body are sent right away, with the boundary string generated randomly for each subscriber.  Each subsequent message will be sent as one part of the multipart message, and will include the message time and tag (`Last-Modified` and `Etag`) as well as the optional `Content-Type` headers.  
@@ -225,11 +268,11 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
   <!-- tag:subscriber-multipart -->
   
-- ##### HTTP Raw Stream
+- ### HTTP Raw Stream
   A simple subscription method similar to the [streaming subscriber](https://github.com/wandenberg/nginx-push-stream-module/blob/master/docs/directives/subscribers.textile#push_stream_subscriber) of the [Nginx HTTP Push Stream Module](https://github.com/wandenberg/nginx-push-stream-module). Messages are appended to the response body, separated by a newline or configurable by `nchan_subscriber_http_raw_stream_separator`.
   <!-- tag:subscriber-rawstream -->
 
-- ##### HTTP [Chunked Transfer](http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1)
+- ### HTTP [Chunked Transfer](http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1)
   This subscription method uses the `chunked` `Transfer-Encoding` to receive messages.   
   Initiated by explicitly including `chunked` in the [`TE` header](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.39):  
   `TE: chunked` (or `TE: chunked;q=??` where the qval > 0)  
@@ -237,9 +280,7 @@ Nchan supports several different kinds of subscribers for receiving messages: [*
   Unlike the other subscriber types, the `chunked` subscriber cannot be used with http/2 because it dissallows chunked encoding.
   <!-- tag:subscriber-chunked -->
 
-<!-- tag:subscriber -->
-
-#### PubSub Endpoint  
+## PubSub Endpoint  
 
 PubSub endpoints are Nginx config *locations* with the [*`nchan_pubsub`*](#nchan_pubsub) directive.
 
@@ -249,17 +290,19 @@ requests as subscribers, and all HTTP `POST` as publishers. One simple use case
 ```nginx
   location = /pubsub {
     nchan_pubsub;
-    nchan_channel_id foobar;
+    nchan_channel_id foo;
+    nchan_channel_group test;
   }
 ```
 
-A more applicable setup may set different publisher and subscriber channel ids:
+A more interesting setup may set different publisher and subscriber channel ids:
 
 ```nginx
   location = /pubsub {
     nchan_pubsub;
     nchan_publisher_channel_id foo;
     nchan_subscriber_channel_id bar;
+    nchan_channel_group test;
   }
 ```
 
@@ -267,9 +310,9 @@ Here, subscribers will listen for messages on channel `foo`, and publishers will
 
 <!-- tag:pubsub -->
 
-### The Channel ID
+## The Channel ID
 
-So far the examples have used static channel ids, which is not very useful in practice. It can be set to any nginx *variable*, such as a querystring argument, a header value, or a part of the location url:
+So far the examples have used static channel ids, which is not very useful. In practice, the channel id can be set to any nginx *variable*, such as a querystring argument, a header value, or a part of the location url:
 
 ```nginx
   location = /sub_by_ip {
@@ -294,9 +337,11 @@ So far the examples have used static channel ids, which is not very useful in pr
   }
 ```
 
+I recommend using the last option, a channel id derived from the request URL via a regular expression. It makes things nice and RESTful.
+
 <!-- tag:channel-id -->
 
-#### Channel Multiplexing
+### Channel Multiplexing
 
 With channel multiplexing, subscribers can subscribe to up to 255 channels per connection. Messages published to all the specified channels will be delivered in-order to the subscriber. There are two ways to enable multiplexing:
 
@@ -325,68 +370,626 @@ For more than 7 channels, `nchan_channel_id_split_delimiter` can be used to spli
   }
 ```
 
-Publishing to multiple channels with a single request is also possible, with similar configuration:
+It is also possible to publish to multiple channels with a single request as well as delete multiple channels with a single request, with similar configuration:
 
 ```nginx
   location ~ /multipub/(\w+)/(\w+)$ {
     nchan_publisher;
     nchan_channel_id "$1" "$2" "another_channel";
+    #POST /multipub/foo/bar will publish to:
+    # channels 'foo', 'bar', 'another_channel'
+    #DELETE /multipub/foo/bar will delete:
+    # channels 'foo', 'bar', 'another_channel'
   }
 ```
 
-`DELETE` requests to a multiplexed channel broadcast the deletion to each of the channels it multiplexes, deletes all their messages and kicks out all clients subscribed to any of the channel ids.
+When a channel is deleted, all of its messages are deleted, and all of its subscribers' connection are closed -- including ones subscribing through a multiplexed location. For example, suppose a subscriber is subscribed to channels "foo" and "bar" via a single multiplexed connection. If "foo" is deleted, the connection is closed, and the subscriber therefore loses the "bar" subscription as well.
 
-See the [details page](https://nchan.slact.net/details#securing-channels) for more information about using good IDs and keeping channels secure.
+See the [Channel Security](#securing-channels) section about using good IDs and keeping private channels secure.
 
 <!-- tag:channel-multiplexing -->
 
+### Channel Groups
+
+Channels can be associated with groups to avoid channel ID conflicts:
+
+```nginx
+  location /test_pubsub {
+    nchan_pubsub;
+    nchan_channel_group "test";
+    nchan_channel_id "foo";
+  }
+  
+  location /pubsub {
+    nchan_pubsub;
+    nchan_channel_group "production";
+    nchan_channel_id "foo";
+    #same channel id, different channel group. Thus, different channel.
+  }
+  
+  location /flexgroup_pubsub {
+    nchan_pubsub;
+    nchan_channel_group $arg_group;
+    nchan_channel_id "foo";
+    #group can be set with request variables too
+  }
+```
+
+#### Limits and Accounting
+
+Groups can be used to track aggregate channel usage, as well as set limits on the number of channels, subscribers, stored messages, memory use, etc:
+
+```nginx
+  #enable group accounting
+  nchan_channel_group_accounting on;
+  
+  location ~ /pubsub/(\w+)$ {
+    nchan_pubsub;
+    nchan_channel_group "limited";
+    nchan_channel_id $1;
+  }
+  
+  location ~ /prelimited_pubsub/(\w+)$ {
+    nchan_pubsub;
+    nchan_channel_group "limited";
+    nchan_channel_id $1;
+    nchan_group_max_subscribers 100;
+    nchan_group_max_messages_memory 50M;
+  }
+  
+  location /group {
+    nchan_channel_group limited;
+    nchan_group_location;
+    nchan_group_max_channels $arg_max_channels;
+    nchan_group_max_messages $arg_max_messages;
+    nchan_group_max_messages_memory $arg_max_messages_mem;
+    nchan_group_max_messages_disk $arg_max_messages_disk;
+    nchan_group_max_subscribers $arg_max_subs;
+  }
+```
+
+Here, `/group` is an `nchan_group_location`, which is used for accessing and modifying group data. To get group data, send a `GET` request to a `nchan_group_location`:
+
+```sh
+>  curl http://localhost/group
+
+channels: 10
+subscribers: 0
+messages: 219
+shared memory used by messages: 42362 bytes
+disk space used by messages: 0 bytes
+limits:
+  max channels: 0
+  max subscribers: 0
+  max messages: 0
+  max messages shared memory: 0
+  max messages disk space: 0  
+```
+
+By default, the data is returned in human-readable plaintext, but can also be formatted as JSON, XML, or YAML:
+
+```sh
+>  curl -H "Accept: text/json" http://localhost/group
+
+{
+  "channels": 21,
+  "subscribers": 40,
+  "messages": 53,
+  "messages_memory": 19941,
+  "messages_disk": 0,
+  "limits": {
+    "channels": 0,
+    "subscribers": 0,
+    "messages": 0,
+    "messages_memory": 0,
+    "messages_disk": 0
+  }
+}
+```
+
+The data in the response are for the single Nchan instance only, regardless of whether Redis is used. A limit of 0 means 'unlimited'.
+
+Limits can be set per-location, as with the above `/prelimited_pubsub/...` location, or with a POST request to the `nchan_group_location`:
+```sh
+>  curl -X POST "http://localhost/group?max_channels=15&max_subs=1000&max_messages_disk=0.5G"
+
+channels: 0
+subscribers: 0
+messages: 0
+shared memory used by messages: 0 bytes
+disk space used by messages: 0 bytes
+limits:
+  max channels: 15
+  max subscribers: 1000
+  max messages: 0
+  max messages shared memory: 0
+  max messages disk space: 536870912
+
+```
+
+Limits are only applied locally, regardless of whether Redis is enabled. 
+If a publisher or subscriber request exceeds a group limit, Nchan will respond to it with a `403 Forbidden` response.
+
+<!-- tag:group -->
+
+## Hooks and Callbacks
+
+<!-- tag:hook -->
+  
+### Request Authorization
+
+This feature, configured with [`nchan_authorize_request`](#nchan_authorize_request), behaves just like the Nginx [http_auth_request module](http://nginx.org/en/docs/http/ngx_http_auth_request_module.html#auth_request_set).
+
+Consider the configuration:
+```nginx
+  upstream my_app {
+    server 127.0.0.1:8080;
+  }
+  location = /auth {
+    proxy_pass http://my_app/pubsub_authorize;
+    proxy_pass_request_body off;
+    proxy_set_header Content-Length "";
+    proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
+    proxy_set_header X-Publisher-Type $nchan_publisher_type;
+    proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
+    proxy_set_header X-Channel-Id $nchan_channel_id;
+    proxy_set_header X-Original-URI $request_uri;
+    proxy_set_header X-Forwarded-For $remote_addr;
+  }
+  
+  location ~ /pubsub/auth/(\w+)$ {
+    nchan_channel_id $1;
+    nchan_authorize_request /auth;
+    nchan_pubsub;
+    nchan_channel_group test;
+  }
+```
+
+Here, any request to the location `/pubsub/auth/<...>` will need to be authorized by your application (`my_app`). Nginx will generate a `GET /pubsub_authorize` request to the application, with additional headers set by the `proxy_set_header` directives. Note that Nchan-specific variables are available for this authorization request. Once your application receives this request, it should decide whether or not to authorize the subscriber. This can be done based on a forwarded session cookie, IP address, or any set of parameters of your choosing. If authorized, it should respond with an empty `200 OK` response.  
+All non-`2xx` response codes (such as `403 Forbidden`) are intepreted as authorization failures. In this case, the failing response is proxied to the client. 
+
+Note that Websocket and EventSource clients will only try to authorize during the initial handshake request, whereas Long-Poll and Interval-Poll subscribers will need to be authorized each time they request the next message, which may flood your application with too many authorization requests.
+
+<!-- commands: nchan_authorize_request -->
+
+### Subscriber Presence
+
+Subscribers can notify an application when they have subscribed and unsubscribed to a channel using the [`nchan_subscribe_request`](#nchan_subscribe_request)
+and [`nchan_unsubscribe_request`](#nchan_unsubscribe_request) settings. 
+These should point to Nginx locations configured to forward requests to an upstream proxy (your application):
+
+```nginx
+  location ~ /sub/(\w+)$ {
+    nchan_channel_id $1;
+    nchan_subscribe_request /upstream/sub;
+    nchan_unsubscribe_request /upstream/unsub;
+    nchan_subscriber;
+    nchan_channel_group test;
+  }
+
+  location = /upstream/unsub {
+    proxy_pass http://127.0.0.1:9292/unsub;
+    proxy_ignore_client_abort on;  #!!!important!!!!
+    proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
+    proxy_set_header X-Channel-Id $nchan_channel_id;
+    proxy_set_header X-Original-URI $request_uri;
+  } 
+  location = /upstream/sub {
+    proxy_pass http://127.0.0.1:9292/sub;
+    proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
+    proxy_set_header X-Message-Id $nchan_message_id;
+    proxy_set_header X-Channel-Id $nchan_channel_id;
+    proxy_set_header X-Original-URI $request_uri;
+  } 
+```
+
+In order for `nchan_unsubscribe_request` to work correctly, the location it points to must have `proxy_ignore_client_abort on;`. Otherwise, suddenly aborted subscribers may not trigger an unsubscribe request.
+
+Note that the subscribe/unsubscribe hooks are **disabled for long-poll and interval-poll clients**, because they would trigger these hooks each time they receive a message.
+
+<!-- commands: nchan_subscribe_request nchan_unsubscribe_request -->
+
+### Message Forwarding
+
+Messages can be forwarded to an upstream application before being published using the `nchan_publisher_upstream_request` setting:
+
+```nginx
+  location ~ /pub/(\w+)$ {
+    #publisher endpoint
+    nchan_channel_id $1;
+    nchan_pubsub;
+    nchan_publisher_upstream_request /upstream_pub;
+  }
+  
+  location = /upstream_pub {
+    proxy_pass http://127.0.0.1:9292/pub;
+    proxy_set_header X-Publisher-Type $nchan_publisher_type;
+    proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
+    proxy_set_header X-Channel-Id $nchan_channel_id;
+    proxy_set_header X-Original-URI $request_uri;
+  } 
+```
+With this configuration, incoming messages are first `POST`ed to `http://127.0.0.1:9292/pub`.
+The upstream response code determines how publishing will proceed:
+  - `304 Not Modified` publishes the message as received, without modifification.
+  - `204 No Content` discards the message
+  - `200 OK` is used for modifying the message. Instead of the original incoming message, the message contained in this HTTP response is published.
+
+There are two main use cases for `nchan_publisher_upstream_request`: forwarding incoming data from Websocket publishers to an application, and mutating incoming messages.
+
+<!-- commands: nchan_publisher_upstream_request -->
+
 ## Storage
 
 Nchan can stores messages in memory, on disk, or via Redis. Memory storage is much faster, whereas Redis has additional overhead as is considerably slower for publishing messages, but offers near unlimited scalability for broadcast use cases with far more subscribers than publishers.
 
-<!-- tag:storage -->
-
 ### Memory Storage
 
-This storage method uses a segment of shared memory to store messages and channel data. Large messages as determined by Nginx's caching layer are stored on-disk. The size of the memory segment is configured with `nchan_max_reserved_memory`. Data stored here is not persistent, and is lost if Nginx is restarted or reloaded.
+This default storage method uses a segment of shared memory to store messages and channel data. Large messages as determined by Nginx's caching layer are stored on-disk. The size of the memory segment is configured with `nchan_shared_memory_size`. Data stored here is not persistent, and is lost if Nginx is restarted or reloaded.
 
 <!-- tag:memstore -->
 
 ### Redis
 
-Nchan can also store messages and channels on a Redis server, or in a Redis cluster. To use a Redis server, set `nchan_use_redis on;` and set the server url with `nchan_redis_url`. These two settings are inheritable by nested locations, so it is enough to set them within an `http { }` block to enable Redis for all Nchan locations in that block. Different locations can also use different Redis servers.
+[Redis](http://redis.io) can be used to add **data persistence** and **horizontal scalability**, **failover** and **high availability** to your Nchan setup. 
 
-To use a Redis Cluster, the Redis servers acting as cluster nodes need to be configured in an `upstream { }` block:
+<!-- tag:redis -->
+
+#### Connecting to a Redis Server
+To connect to a single Redis master server, use an `upstream` with `nchan_redis_server` and `nchan_redis_pass` settings:
 
 ```nginx
+http {
+  upstream my_redis_server {
+    nchan_redis_server 127.0.0.1;
+  }
+  server {
+    listen 80;
+    
+    location ~ /redis_sub/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_id $1;
+      nchan_redis_pass my_redis_server;
+    }
+    location ~ /redis_pub/(\w+)$ {
+      nchan_redis_pass my_redis_server;
+      nchan_publisher;
+      nchan_channel_id $1;
+    }
+  }
+} 
+```
+
+All servers with the above configuration connecting to the same redis server share channel and message data.
+
+Channels that don't use Redis can be configured side-by-side with Redis-backed channels, provided the endpoints never overlap. (This can be ensured, as above, by setting separate `nchan_channel_group`s.). Different locations can also connect to different Redis servers.
+
+Nchan can work with a single Redis master. It can also auto-discover and use Redis slaves to balance PUBSUB traffic.
+
+<!-- commands: nchan_redis_server nchan_redis_pass -->
+
+#### Redis Cluster
+Nchan also supports using Redis Cluster, which adds scalability via sharding channels among cluster nodes. Redis cluster also provides **automatic failover**, **high availability**, and eliminates the single point of failure of one shared Redis server. It is configred and used like so:
+
+```nginx
+http {
   upstream redis_cluster {
     nchan_redis_server redis://127.0.0.1:7000;
     nchan_redis_server redis://127.0.0.1:7001;
     nchan_redis_server redis://127.0.0.1:7002;
+    # you don't need to specify all the nodes, they will be autodiscovered
+    # however, it's recommended that you do specify at least a few master nodes.
   }
+  server {
+    listen 80;
+    
+    location ~ /sub/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_id $1;
+      nchan_redis_pass redis_cluster;
+    }
+    location ~ /pub/(\w+)$ {
+      nchan_publisher;
+      nchan_channel_id $1;
+      nchan_redis_pass redis_cluster;
+    }
+  }
+} 
 ```
 
-It is best to specify all master cluster nodes, but this is not required -- as long as Nchan can connect to at least 1 node, it will discover and connect to the whole cluster.
+<!-- commands: nchan_redis_server nchan_redis_pass -->
 
-To use Redis Cluster in an Nchan location, use the `nchan_redis_pass` setting:
+##### High Availability
+Redis Cluster connections are designed to be resilient and try to recover from errors. Interrupted connections will have their commands queued until reconnection, and Nchan will publish any messages it successfully received while disconnected. Nchan is also adaptive to cluster modifications. It will add new nodes and remove them as needed.
+
+All Nchan servers sharing a Redis server or cluster should have their times synchronized (via ntpd or your favorite ntp daemon). Failure to do so may result in missed or duplicate messages.
+
+#### Tweaks and Optimizations
+
+As of version 1.2.0, Nchan uses Redis slaves to load-balance PUBSUB traffic. By default, there is an equal chance that a channel's PUBSUB subscription will go to any master or slave. The [`nchan_redis_subscribe_weights`](#nchan_redis_subscribe_weights) setting is available to fine-tune this load-balancing.
+
+Also from 1.2.0 onward, [`nchan_redis_optimize_target`](#nchan_redis_optimize_target) can be used to prefer optimizing Redis slaves for CPU or bandwidth. For heavy publishing loads, the tradeoff is very roughly 35% replication bandwidth per slave to 30% CPU load on slaves.
+
+## Introspection
+
+There are several ways to see what's happening inside Nchan. These are useful for debugging application integration and for measuring performance.
+
+### Channel Events
+
+Channel events are messages automatically published by Nchan when certain events occur in a channel. These are very useful for debugging the use of channels. However, they carry a significant performance overhead and should be used during development, and not in production.
+
+Channel events are published to special 'meta' channels associated with normal channels. Here's how to configure them:
 
 ```nginx
-  location ~ /pubsub/(\w+)$ {
-    nchan_channel_id $1;
-    nchan_pubsub;
-    nchan_redis_pass redis_cluster;
+location ~ /pubsub/(.+)$ {
+  nchan_pubsub;
+  nchan_channel_id $1;
+  nchan_channel_events_channel_id $1; #enables channel events for this location
+}
+
+location ~ /channel_events/(.+) {
+  #channel events subscriber location
+  nchan_subscriber;
+  nchan_channel_group meta; #"meta" is a SPECIAL channel group
+  nchan_channel_id $1;
+}
+```
+
+Note the `/channel_events/...` location has a *special* `nchan_channel_group`, `meta`. This group is reserved for accessing "channel events channels", or"metachannels".
+
+Now, say I subscribe to `/channel_events/foo` I will refer to this as the channel events subscriber.
+
+Let's see what this channel events subscriber receives when I publish messages to 
+
+Subscribing to `/pubsub/foo` produces the channel event
+```
+subscriber_enqueue foo
+```
+
+Publishing a message to `/pubsub/foo`:
+```
+channel_publish foo
+```
+
+Unsubscribing from `/pubsub/foo`:
+```
+subscriber_dequeue foo
+```
+
+Deleting `/pubsub/foo` (with HTTP `DELETE /pubsub/foo`):
+```
+channel_delete foo
+```
+
+The event string itself is configirable with [nchan_channel_event_string](#nchan_channel_event_string). By default, it is set to `$nchan_channel_event $nchan_channel_id`. 
+This string can use any Nginx and [Nchan variables](/#variables).
+
+
+### nchan_stub_status Stats
+
+Like Nginx's [stub_status](https://nginx.org/en/docs/http/ngx_http_stub_status_module.html),
+`nchan_stub_status` is used to get performance metrics.
+
+```nginx
+  location /nchan_stub_status {
+    nchan_stub_status;
   }
+```
+
+Sending a GET request to this location produces the response:
+
+```text
+total published messages: 1906
+stored messages: 1249
+shared memory used: 1824K
+channels: 80
+subscribers: 90
+redis pending commands: 0
+redis connected servers: 0
+total interprocess alerts received: 1059634
+interprocess alerts in transit: 0
+interprocess queued alerts: 0
+total interprocess send delay: 0
+total interprocess receive delay: 0
+nchan version: 1.1.5
+```
+
+Here's what each line means, and how to interpret it:
+  - `total published messages`: Number of messages published to all channels through this Nchan server.
+  - `stored messages`: Number of messages currently buffered in memory
+  - `shared memory used`: Total shared memory used for buffering messages, storing channel information, and other purposes. This value should be comfortably below `nchan_shared_memory_size`.
+  - `channels`: Number of channels present on this Nchan server.
+  - `subscribers`: Number of subscribers to all channels on this Nchan server.
+  - `redis pending commands`: Number of commands sent to Redis that are awaiting a reply. May spike during high load, especially if the Redis server is overloaded. Should tend towards 0.
+  - `redis connected servers`: Number of redis servers to which Nchan is currently connected.
+  - `total interprocess alerts received`: Number of interprocess communication packets transmitted between Nginx workers processes for Nchan. Can grow at 100-10000 per second at high load.
+  - `interprocess alerts in transit`: Number of interprocess communication packets in transit between Nginx workers. May be nonzero during high load, but should always tend toward 0 over time.
+  - `interprocess queued alerts`: Number of interprocess communication packets waiting to be sent. May be nonzero during high load, but should always tend toward 0 over time.
+  - `total interprocess send delay`: Total amount of time interprocess communication packets spend being queued if delayed. May increase during high load.
+  - `total interprocess receive delay`: Total amount of time interprocess communication packets spend in transit if delayed. May increase during high load.
+  - `nchan_version`: current version of Nchan. Available for version 1.1.5 and above.
+
+Additionally, when there is at least one `nchan_stub_status` location, the following Nginx variables are available:
+  - `$nchan_stub_status_total_published_messages`  
+  - `$nchan_stub_status_stored_messages`  
+  - `$nchan_stub_status_shared_memory_used`  
+  - `$nchan_stub_status_channels`  
+  - `$nchan_stub_status_subscribers`  
+  - `$nchan_stub_status_redis_pending_commands`  
+  - `$nchan_stub_status_redis_connected_servers`  
+  - `$nchan_stub_status_total_ipc_alerts_received`  
+  - `$nchan_stub_status_ipc_queued_alerts`  
+  - `$nchan_stub_status_total_ipc_send_delay`  
+  - `$nchan_stub_status_total_ipc_receive_delay`  
+
+  
+## Securing Channels
+
+### Securing Publisher Endpoints
+Consider the use case of an application where authenticated users each use a private, dedicated channel for live updates. The configuration might look like this:
+
+```nginx
+http {
+  server {
+    #available only on localhost
+    listen  127.0.0.1:8080;
+    location ~ /pub/(\w+)$ {
+      nchan_publisher;
+      nchan_channel_group my_app_group;
+      nchan_channel_id $1;
+    }
+  }
+  
+  server {
+    #available to the world
+    listen 80;
+    
+    location ~ /sub/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_group my_app_group;
+      nchan_channel_id $1;
+    }
+  }
+}
 
 ```
 
-Note that `nchan_redis_pass` implies `nchan_use_redis on;`, and that this setting is *not* inherited by nested locations.
+Here, the subscriber endpoint is available on a public-facing port 80, and the publisher endpoint is only available on localhost, so can be accessed only by applications residing on that machine. Another way to limit access to the publisher endpoint is by using the allow/deny settings:
 
-When connecting several Nchan servers to the same Redis server (or cluster), the servers **must have their times synced up**. Failure to do so may result in missing and duplicated messages.
+```nginx
 
-See the [details page](https://nchan.slact.net/details#using-redis) for more information on using Redis.
+  server {
+    #available to the world
+    listen 80; 
+    location ~ /pub/(\w+)$ {
+      allow 127.0.0.1;
+      deny all;
+      nchan_publisher;
+      nchan_channel_group my_app_group;
+      nchan_channel_id $1;
+    }
+```
 
-<!-- tag:redis -->
+Here, only the local IP 127.0.0.1 is allowed to use the publisher location, even though it is defined in a non-localhost server block.
 
+### Keeping a Channel Private
+
+A Channel ID that is meant to be private should be treated with the same care as a session ID token. Considering the above use case of one-channel-per-user, how can we ensure that only the authenticated user, and no one else, is able to access his channel? 
+
+First, if you intend on securing the channel contents, you must use TLS/SSL:
+
+```nginx 
+http {
+  server {
+    #available only on localhost
+    listen  127.0.0.1:8080;
+    #...publisher endpoint config
+  }
+  server {
+    #available to the world
+    listen 443 ssl;
+    #SSL config goes here
+    location ~ /sub/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_group my_app_group;
+      nchan_channel_id $1;
+    }
+  }
+}
+```
+
+Now that you have a secure connection between the subscriber client and the server, you don't need to worry about the channel ID or messages being passively intercepted. This is a minimum requirement for secure message delivery, but it is not sufficient. 
+
+You must also take care to do at least one of the following:
+  - [Generate good, high-entropy Channel IDs](#good-ids).
+  - [Authorize all subscribers with the `nchan_authorize_request` config directive](#request-authorization).
+  - [Authorize subscribers and hide channel IDs with the "`X-Accel-Redirect`" mechanism](#x-accel-redirect).
+  
+#### Good IDs
+
+An ID that can be guessed is an ID that can be hijacked. If you are not authenticating subscribers (as described below), a channel ID should be impossible to guess. Use at least 128 bits of entropy to generate a random token, associate it with the authenticated user, and share it only with the user's client. Do not reuse tokens, just as you would not reuse session IDs.
+
+#### X-Accel-Redirect
+
+This feature uses the [X-Accel feature](https://www.nginx.com/resources/wiki/start/topics/examples/x-accel) of Nginx upstream proxies to perform an internal request to a subscriber endpoint.
+It allows a subscriber client to be authenticated by your application, and then redirected by nginx internally to a location chosen by your appplication (such as a publisher or subscriber endpoint). This makes it possible to have securely authenticated clients that are unaware of the channel id they are subscribed to.
+
+Consider the following configuration:
+```nginx 
+upstream upstream_app {
+  server 127.0.0.1:8080;
+}
+
+server {
+  listen 80; 
+  
+  location = /sub_upstream {
+    proxy_pass http://upstream_app/subscriber_x_accel_redirect;
+    proxy_set_header X-Forwarded-For $remote_addr;
+  }
+  
+  location ~ /sub/internal/(\w+)$ {
+    internal; #this location only accessible for internal nginx redirects
+    nchan_subscriber;
+    nchan_channel_id $1;
+    nchan_channel_group test;
+  }
+}
+```
+
+As commented, `/sub/internal/` is inaccessible from the outside:
+```console
+> curl  -v  http://127.0.0.1/sub/internal/foo
+  
+  < HTTP/1.1 404 Not Found
+  < Server: nginx/1.9.5
+  <
+  <html>
+  <head><title>404 Not Found</title></head>
+  <body bgcolor="white">
+  <center><h1>404 Not Found</h1></center>
+  <hr><center>nginx/1.9.5</center>
+  </body>
+  </html>
+```
+
+But if a request is made to `/sub_upstream`, it gets forwarded to your application (`my_app`) on port 8080 with the url `/subscriber_x_accel_redirect`.
+Note that you can set any forwarded headers here like any [`proxy_pass`](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass) Nginx location, 
+but unlike the case with `nchan_authorize_request`, Nchan-specific variables are not available.
+
+Now, your application must be set up to handle the request to `/subscriber_x_accel_redirect`. You should make sure the client is properly authenticated (maybe using a session cookie), and generate an associated channel id. If authentication fails, respond with a normal `403 Forbidden` response. You can also pass extra information about the failure in the response body and headers.
+
+If your application successfully authenticates the subscriber request, you now need to instruct Nginx to issue an internal redirect to `/sub/internal/my_channel_id`.
+This is accomplished by responding with an empty `200 OK` response that includes two headers:
+- `X-Accel-Redirect: /sub/internal/my_channel_id`
+- `X-Accel-Buffering: no`
+
+In the presence of these headers, Nginx will not forward your app's response to the client, and instead will *internally* redirect to `/sub/internal/my_channel_id`. 
+This will behave as if the client had requested the subscriber endpoint location directly.
+
+Thus using X-Accel-Redirect it is possible to both authenticate all subscribers *and* keep channel IDs completely hidden from subscribers.
+
+This method is especially useful for EventSource and Websocket subscribers. Long-Polling subscribers will need to be re-authenticated for every new message, which may flood your application with too many authentication requests.
+
+### Revoking Channel Authorization
+
+In some cases, you may want to revoke a particular subscriber's authorization for a given channel (e.g., if the user's permissions are changed). If the channel is unique to the subscriber, this is simply accomplished by deleting the channel. The same can be achieved for shared channels by subscribing each subscriber to both the shared channel and a subscriber-specific channel via a multiplexed connection. Deleting the subscriber-specific channel will terminate the subscriber''s connection, thereby also terminating their subscription to the shared channel. Consider the following configuration:
+
+```nginx
+location ~ /sub/(\w+) {
+  nchan_subscriber;
+  nchan_channel_id shared_$1 user_$arg_userid;
+  nchan_authorize_request /authorize;
+}
+
+location /pub/user {
+  nchan_publisher;
+  nchan_channel_id user_$arg_userid;
+}
+```
+
+A request to `/sub/foo?userid=1234` will subscribe to channels "shared_foo" and "user_1234" via a multiplexed connection. If you later send a `DELETE` request to `/pub/user?userid=1234`, this subscriber will be disconnected and therefore unsubscribed from both "user_1234" and "shared_foo".
+  
 ## Variables
 
 Nchan makes several variables usabled in the config file:
@@ -401,13 +1004,16 @@ Nchan makes several variables usabled in the config file:
   For subscriber locations, this variable is set to the subscriber type (websocket, longpoll, etc.).
 
 - `$nchan_publisher_type`  
-  For subscriber locations, this variable is set to the subscriber type (http or websocket).
+  For publisher locations, this variable is set to the subscriber type (http or websocket).
   
 - `$nchan_prev_message_id`, `$nchan_message_id`
   The current and previous (if applicable) message id for publisher request or subscriber response.
 
 - `$nchan_channel_event`
   For channel events, this is the event name. Useful when configuring `nchan_channel_event_string`.
+
+- `$nchan_version`
+  Current Nchan version. Available since 1.1.5.
   
 Additionally, `nchan_stub_status` data is also exposed as variables. These are available only when `nchan_stub_status` is enabled on at least one location:
 
@@ -440,18 +1046,72 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   > Split the channel id into several ids for multiplexing using the delimiter string provided.    
   [more details](#channel-multiplexing)  
 
+- **nchan_deflate_message_for_websocket** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: server, location  
+  > Store a compressed (deflated) copy of the message along with the original to be sent to websocket clients supporting the permessage-deflate protocol extension    
+
 - **nchan_eventsource_event**  
   arguments: 1  
   default: `(none)`  
   context: server, location, if  
   > Set the EventSource `event:` line to this value. When used in a publisher location, overrides the published message's `X-EventSource-Event` header and associates the message with the given value. When used in a subscriber location, overrides all messages' associated `event:` string with the given value.    
 
+- **nchan_eventsource_ping_comment**  
+  arguments: 1  
+  default: `(empty)`  
+  context: server, location, if  
+  > Set the EventSource comment `: ...` line for periodic pings from server to client. Newlines are not allowed. If empty, no comment is sent with the ping.    
+
+- **nchan_eventsource_ping_data**  
+  arguments: 1  
+  default: `(empty)`  
+  context: server, location, if  
+  > Set the EventSource `data:` line for periodic pings from server to client. Newlines are not allowed. If empty, no data is sent with the ping.    
+
+- **nchan_eventsource_ping_event**  
+  arguments: 1  
+  default: `ping`  
+  context: server, location, if  
+  > Set the EventSource `event:` line for periodic pings from server to client. Newlines are not allowed. If empty, no event type is sent with the ping.    
+
+- **nchan_eventsource_ping_interval** `<number> (seconds)`  
+  arguments: 1  
+  default: `0 (none)`  
+  context: server, location, if  
+  > Interval for sending ping messages to EventSource subscribers. Disabled by default.    
+
 - **nchan_longpoll_multipart_response** `[ off | on | raw ]`  
   arguments: 1  
   default: `off`  
   context: server, location, if  
   > when set to 'on', enable sending multiple messages in a single longpoll response, separated using the multipart/mixed content-type scheme. If there is only one available message in response to a long-poll request, it is sent unmodified. This is useful for high-latency long-polling connections as a way to minimize round-trips to the server. When set to 'raw', sends multiple messages using the http-raw-stream message separator.    
 
+- **nchan_permessage_deflate_compression_level** `[ 0-9 ]`  
+  arguments: 1  
+  default: `6`  
+  context: http  
+  > Compression level for the `deflate` algorithm used in websocket's permessage-deflate extension. 0: no compression, 1: fastest, worst, 9: slowest, best    
+
+- **nchan_permessage_deflate_compression_memlevel** `[ 1-9 ]`  
+  arguments: 1  
+  default: `8`  
+  context: http  
+  > Memory level for the `deflate` algorithm used in websocket's permessage-deflate extension. How much memory should be allocated for the internal compression state. 1 - minimum memory, slow and reduces compression ratio; 9 - maximum memory for optimal speed    
+
+- **nchan_permessage_deflate_compression_strategy** `[ default | filtered | huffman-only | rle | fixed ]`  
+  arguments: 1  
+  default: `default`  
+  context: http  
+  > Compression strategy for the `deflate` algorithm used in websocket's permessage-deflate extension. Use 'default' for normal data, For details see [zlib's section on copression strategies](http://zlib.net/manual.html#Advanced)    
+
+- **nchan_permessage_deflate_compression_window** `[ 9-15 ]`  
+  arguments: 1  
+  default: `10`  
+  context: http  
+  > Compression window for the `deflate` algorithm used in websocket's permessage-deflate extension. The base two logarithm of the window size (the size of the history buffer). The bigger the window, the better the compression, but the more memory used by the compressor.    
+
 - **nchan_publisher** `[ http | websocket ]`  
   arguments: 0 - 2  
   default: `http websocket`  
@@ -471,7 +1131,7 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   context: server, location, if  
   > Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.    
   > The upstream response code determines how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.    
-  [more details](https://nchan.slact.net/details#message-publishing-callbacks)  
+  [more details](#message-forwarding)  
 
 - **nchan_pubsub** `[ http | websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
   arguments: 0 - 6  
@@ -480,6 +1140,12 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   > Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server.    
   [more details](#pubsub-endpoint)  
 
+- **nchan_subscribe_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send GET request to internal location (which may proxy to an upstream server) after subscribing. Disabled for longpoll and interval-polling subscribers.    
+  [more details](#subscriber-presence)  
+
 - **nchan_subscriber** `[ websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
   arguments: 0 - 5  
   default: `websocket eventsource longpoll chunked multipart-mixed`  
@@ -535,37 +1201,111 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   legacy name: push_subscriber_timeout  
   > Maximum time a subscriber may wait for a message before being disconnected. If you don't want a subscriber's connection to timeout, set this to 0. When possible, the subscriber will get a response with a `408 Request Timeout` status; otherwise the subscriber will simply be disconnected.    
 
+- **nchan_unsubscribe_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send GET request to internal location (which may proxy to an upstream server) after unsubscribing. Disabled for longpoll and interval-polling subscribers.    
+  [more details](#subscriber-presence)  
+
+- **nchan_websocket_client_heartbeat** `<heartbeat_in> <heartbeat_out>`  
+  arguments: 2  
+  default: `none (disabled)`  
+  context: server, location, if  
+  > Most browser Websocket clients do not allow manually sending PINGs to the server. To overcome this limitation, this setting can be used to set up a PING/PONG message/response connection heartbeat. When the client sends the server message *heartbeat_in* (PING), the server automatically responds with *heartbeat_out* (PONG).    
+
 - **nchan_websocket_ping_interval** `<number> (seconds)`  
   arguments: 1  
   default: `0 (none)`  
   context: server, location, if  
   > Interval for sending websocket ping frames. Disabled by default.    
 
+- **nchan_access_control_allow_credentials**  
+  arguments: 1  
+  default: `on`  
+  context: http, server, location, if  
+  > When enabled, sets the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Credentials` header to `true`.    
+
+- **nchan_access_control_allow_origin** `<string>`  
+  arguments: 1  
+  default: `$http_origin`  
+  context: http, server, location, if  
+  > Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the incoming request's `Origin` header does not match this value, respond with a `403 Forbidden`. Multiple origins can be provided in a single argument separated with a space.    
+
 - **nchan_authorize_request** `<url>`  
   arguments: 1  
   context: server, location, if  
   > Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it.    
-  [more details](https://nchan.slact.net/details#request-authorization)  
+  [more details](#request-authorization)  
 
-- **nchan_subscribe_request** `<url>`  
+- **nchan_channel_group** `<string>`  
   arguments: 1  
+  default: `(none)`  
   context: server, location, if  
-  > Send GET request to internal location (which may proxy to an upstream server) after subscribing. Disabled for longpoll and interval-polling subscribers.    
-  [more details](https://nchan.slact.net/details#subsribe-and-unsubscribe-callbacks)  
+  legacy name: push_channel_group  
+  > The accounting and security group a channel belongs to. Works like a prefix string to the channel id. Can be set with nginx variables.    
 
-- **nchan_unsubscribe_request** `<url>`  
+- **nchan_channel_group_accounting**  
   arguments: 1  
-  context: server, location, if  
-  > Send GET request to internal location (which may proxy to an upstream server) after unsubscribing. Disabled for longpoll and interval-polling subscribers.    
-  [more details](https://nchan.slact.net/details#subsribe-and-unsubscribe-callbacks)  
+  default: `off`  
+  context: server, location  
+  > Enable tracking channel, subscriber, and message information on a per-channel-group basis. Can be used to place upper limits on channel groups.    
 
-- **nchan_max_reserved_memory** `<size>`  
+- **nchan_group_location** `[ get | set | delete | off ]`  
+  arguments: 0 - 3  
+  default: `get set delete`  
+  context: location  
+  > Group information and configuration location. GET request for group info, POST to set limits, DELETE to delete all channels in group.    
+
+- **nchan_group_max_channels** `<number>`  
   arguments: 1  
-  default: `32M`  
-  context: http  
-  legacy name: push_max_reserved_memory  
-  > The size of the shared memory chunk this module will use for message queuing and buffering.    
-  [more details](#memory-storage)  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum number of channels allowed in the group.    
+
+- **nchan_group_max_messages** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum number of messages allowed for all the channels in the group.    
+
+- **nchan_group_max_messages_disk** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum amount of disk space allowed for the messages of all the channels in the group.    
+
+- **nchan_group_max_messages_memory** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum amount of shared memory allowed for the messages of all the channels in the group.    
+
+- **nchan_group_max_subscribers** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum number of subscribers allowed for the messages of all the channels in the group.    
+
+- **nchan_max_channel_id_length** `<number>`  
+  arguments: 1  
+  default: `1024`  
+  context: http, server, location  
+  legacy name: push_max_channel_id_length  
+  > Maximum permissible channel id length (number of characters). This settings applies to ids before they may be split by the `nchan_channel_id_split_delimiter` Requests with a channel id that is too long will receive a `403 Forbidden` response.    
+
+- **nchan_max_channel_subscribers** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: http, server, location  
+  legacy name: push_max_channel_subscribers  
+  > Maximum concurrent subscribers to the channel on this Nchan server. Does not include subscribers on other Nchan instances when using a shared Redis server.    
+
+- **nchan_subscribe_existing_channels_only** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: http, server, location  
+  legacy name: push_authorized_channels_only  
+  > Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response.    
 
 - **nchan_message_buffer_length** `[ <number> | <variable> ]`  
   arguments: 1  
@@ -574,6 +1314,12 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   legacy names: push_max_message_buffer_length, push_message_buffer_length  
   > Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages. An Nginx variable can also be used to set the buffer length dynamically.    
 
+- **nchan_message_temp_path** `<path>`  
+  arguments: 1  
+  default: `<client_body_temp_path>`  
+  context: http  
+  > Large messages are stored in temporary files in the `client_body_temp_path` or the `nchan_message_temp_path` if the former is unavailable. Default is the built-in default `client_body_temp_path`    
+
 - **nchan_message_timeout** `[ <time> | <variable> ]`  
   arguments: 1  
   default: `1h`  
@@ -581,36 +1327,83 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   legacy name: push_message_timeout  
   > Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Note that messages always expire from oldest to newest, so an older message may prevent a newer one with a shorter timeout from expiring. An Nginx variable can also be used to set the timeout dynamically.    
 
+- **nchan_redis_connect_timeout**  
+  arguments: 1  
+  default: `600ms`  
+  context: upstream  
+  > Redis server connection timeout.    
+
 - **nchan_redis_idle_channel_cache_timeout** `<time>`  
   arguments: 1  
   default: `30s`  
   context: http, server, location  
   > A Redis-stored channel and its messages are removed from memory (local cache) after this timeout, provided there are no local subscribers.    
 
-- **nchan_redis_pass**  
+- **nchan_redis_namespace** `<string>`  
+  arguments: 1  
+  context: http, server, upstream, location  
+  > Prefix all Redis keys with this string. All Nchan-related keys in redis will be of the form "nchan_redis_namespace:*" . Default is empty.    
+
+- **nchan_redis_nostore_fastpublish** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: http, server, upstream  
+  > Increases publishing capacity by 2-3x for Redis nostore mode at the expense of inaccurate subscriber counts in the publisher response.    
+
+- **nchan_redis_optimize_target** `[ cpu | bandwidth ]`  
+  arguments: 1  
+  default: `cpu`  
+  context: upstream  
+  > This tweaks whether [effect replication](https://redis.io/commands/eval#replicating-commands-instead-of-scripts) is enabled. Optimizing for CPU usage enables effect replication, costing additional bandwidth (between 1.2 and 2 times more) between all master->slave links. Optimizing for bandwidth increases CPU load on slaves, but keeps outgoing bandwidth used for replication the same as the incoming bandwidth on Master.    
+
+- **nchan_redis_pass** `<upstream-name>`  
   arguments: 1  
   context: http, server, location  
   > Use an upstream config block for Redis servers.    
-  [more details](https://nchan.slact.net/details#using-redis)  
+  [more details](#connecting-to-a-redis-server)  
 
 - **nchan_redis_ping_interval**  
   arguments: 1  
   default: `4m`  
-  context: http, server, location  
+  context: http, server, upstream, location  
   > Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable.    
 
-- **nchan_redis_server**  
+- **nchan_redis_server** `<redis-url>`  
   arguments: 1  
   context: upstream  
-  > Used in upstream { } blocks to set redis servers.    
-  [more details](https://nchan.slact.net/details#using-redis)  
+  > Used in upstream { } blocks to set redis servers. Redis url is in the form 'redis://:password@hostname:6379/0'. Shorthands 'host:port' or 'host' are permitted.    
+  [more details](#connecting-to-a-redis-server)  
 
-- **nchan_redis_url**  
+- **nchan_redis_storage_mode** `[ distributed | backup | nostore ]`  
+  arguments: 1  
+  default: `distributed`  
+  context: http, server, upstream  
+  > The mode of operation of the Redis server. In `distributed` mode, messages are published directly to Redis, and retrieved in real-time. Any number of Nchan servers in distributed mode can share the Redis server (or cluster). Useful for horizontal scalability, but suffers the latency penalty of all message publishing going through Redis first.  
+  >   
+  > In `backup` mode, messages are published locally first, then later forwarded to Redis, and are retrieved only upon chanel initialization. Only one Nchan server should use a Redis server (or cluster) in this mode. Useful for data persistence without sacrificing response times to the latency of a round-trip to Redis.  
+  >   
+  > In `nostore` mode, messages are published as in `distributed` mode, but are not stored. Thus Redis is used to broadcast messages to many Nchan instances with no delivery guarantees during connection failure, and only local in-memory storage. This means that there are also no message delivery guarantees for subscribers switching from one Nchan instance to another connected to the same Redis server or cluster. Nostore mode increases Redis publishing capacity by an order of magnitude.    
+
+- **nchan_redis_subscribe_weights** `master=<integer> slave=<integer>`  
+  arguments: 1 - 2  
+  default: `master=1 slave=1`  
+  context: upstream  
+  > Determines how subscriptions to Redis PUBSUB channels are distributed between master and slave nodes. The higher the number, the more likely that each node of that type will be chosen for each new channel. The weights for slave nodes are cumulative, so an equal 1:1 master:slave weight ratio with two slaves would have a 1/3 chance of picking a master, and 2/3 chance of picking one of the slaves. The weight must be a non-negative integer.    
+
+- **nchan_redis_url** `<redis-url>`  
   arguments: 1  
   default: `127.0.0.1:6379`  
   context: http, server, location  
-  > The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.    
-  [more details](https://nchan.slact.net/details#using-redis)  
+  > Use of this command is discouraged in favor of upstreams blocks with (`nchan_redis_server`)[#nchan_redis_server]. The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.    
+  [more details](#connecting-to-a-redis-server)  
+
+- **nchan_shared_memory_size** `<size>`  
+  arguments: 1  
+  default: `128M`  
+  context: http  
+  legacy names: push_max_reserved_memory, nchan_max_reserved_memory  
+  > Shared memory slab pre-allocated for Nchan. Used for channel statistics, message storage, and interprocess communication.    
+  [more details](#memory-storage)  
 
 - **nchan_store_messages** `[ on | off ]`  
   arguments: 1  
@@ -623,28 +1416,8 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   arguments: 1  
   default: `off`  
   context: http, server, location  
-  > Use redis for message storage at this location.    
-  [more details](https://nchan.slact.net/details#using-redis)  
-
-- **nchan_access_control_allow_origin** `<string>`  
-  arguments: 1  
-  default: `*`  
-  context: http, server, location  
-  > Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the publisher or subscriber request's `Origin` header does not match this value, respond with a `403 Forbidden`.    
-
-- **nchan_channel_group** `<string>`  
-  arguments: 1  
-  default: `(none)`  
-  context: server, location, if  
-  legacy name: push_channel_group  
-  > Because settings are bound to locations and not individual channels, it is useful to be able to have channels that can be reached only from some locations and never others. That's where this setting comes in. Think of it as a prefix string for the channel id.    
-
-- **nchan_subscribe_existing_channels_only** `[ on | off ]`  
-  arguments: 1  
-  default: `off`  
-  context: http, server, location  
-  legacy name: push_authorized_channels_only  
-  > Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response.    
+  > Use of this command is discouraged in favor of (`nchan_redis_pass`)[#nchan_redis_pass]. Use Redis for message storage at this location.    
+  [more details](#connecting-to-a-redis-server)  
 
 - **nchan_channel_event_string** `<string>`  
   arguments: 1  
@@ -656,27 +1429,13 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   arguments: 1  
   context: server, location, if  
   > Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'.    
-  [more details](https://nchan.slact.net/details#channel-events)  
+  [more details](#channel-events)  
 
 - **nchan_stub_status**  
   arguments: 0  
   context: location  
   > Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc.    
-  [more details](https://nchan.slact.net/details#nchan_stub_status)  
-
-- **nchan_max_channel_id_length** `<number>`  
-  arguments: 1  
-  default: `512`  
-  context: http, server, location  
-  legacy name: push_max_channel_id_length  
-  > Maximum permissible channel id length (number of characters). Longer ids will be truncated.    
-
-- **nchan_max_channel_subscribers** `<number>`  
-  arguments: 1  
-  default: `0 (unlimited)`  
-  context: http, server, location  
-  legacy name: push_max_channel_subscribers  
-  > Maximum concurrent subscribers to the channel on this Nchan server. Does not include subscribers on other Nchan instances when using a shared Redis server.    
+  [more details](#nchan_stub_status)  
 
 - **nchan_channel_timeout**  
   arguments: 1  
@@ -690,5 +1449,9 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   context: http, server, location  
   > Development directive to completely replace default storage engine. Don't use unless you are an Nchan developer.    
 
+- **nchan_redis_wait_after_connecting**  
+  arguments: 1  
+  context: http, server, location  
+
 ## Contribute
-Please support this project with a donation to keep me warm through the winter. I accept bitcoin at 15dLBzRS4HLRwCCVjx4emYkxXcyAPmGxM3 . Other donation methods can be found at https://nchan.slact.net
+Please support this project with a donation to keep me warm through the winter. I accept bitcoin at 15dLBzRS4HLRwCCVjx4emYkxXcyAPmGxM3 . Other donation methods can be found at https://nchan.io
diff --git a/debian/modules/nchan/changelog.txt b/debian/modules/nchan/changelog.txt
index 8eba621..88f481e 100644
--- a/debian/modules/nchan/changelog.txt
+++ b/debian/modules/nchan/changelog.txt
@@ -1,3 +1,208 @@
+1.2.7 (Mar. 17 2020)
+ fix: unidirectional subscribers have their connection terminated if they send any data to the server
+      after the initial request handshake. This applies to all subscribers except Websocket
+ feature: periodic pings for EventSource subscribers
+ fix: Redis pending commands count may be incorrect in nchan's stub status page
+ fix: channel deletion fails to propagate to Redis slaves
+ fix: possible stack overflow when using websocket subscribers
+1.2.6 (Jun. 18 2019)
+ fix: when using Redis, a channel can stop receiving new messages if 
+      they are published faster than they can be sent to subscribers and the 
+      message buffer is sufficiently small
+ fix: websocket PONG response did not contain PING frame data
+ fix: multiplexed channels may stop receiving messages
+ fix (security): specially crafted websocket publisher requests when using Redis
+      may result in use-after-free memory access
+ fix: Nginx config reload may result in crash when using Redis cluster
+1.2.5 (Mar. 20 2019)
+ fix: using multiplexed channels with Redis in backup mode may result in worker crash
+ fix: nchan_publisher_channel_id could not be set exclusively in a publisher location
+ fix: Google pagespeed module compatibility
+ fix: nchan prevents nginx from starting if no http {} block is configured
+1.2.4 (Feb. 25 2019)
+ fix: Redis cluster info with zero-length hostname may result in worker crash
+ fix: build problems with included hiredis lib in FreeBSD
+ feature: nchan_redis_namespace and nchan_redis_ping_interval now work in upstream blocks
+ fix: websocket publisher did not publishing channel events
+ fix: Redis namespace was limited to 8 bytes
+1.2.3 (Oct. 15 2018)
+ fix: possible invalid memory access when the initial connection to a Redis cluster node times out
+1.2.2 (Oct. 9 2018)
+ fix (security): using an unresponsive, overloaded Redis server may result in invalid memory access
+ fix: incorrect logging of discovered Redis cluster nodes
+ fix: better handling of connection loss when Redis server is unresponsive
+ fix: presence of Redis cluster nodes with no known address ("noaddr") nodes could result in worker crash
+ fix (security): subscriber may erroneously receive a 400 Bad Request or crash a worker 
+      based on data from a previous subscriber
+ feature: built-in backend benchmark
+ feature: add optimized fastpublish option to Redis nostore mode for maximum
+      message publishing thoroughput via Redis
+ feature: add no-store Redis mode that uses Redis for broadcasting messages, not storage
+ fix: connecting to load-balancing Redis proxy resulted in crash
+ fix: using longpoll-multipart in "raw" mode cound result in worker crash
+ fix: channel events used with Redis resulted in segfault
+1.2.1 (Aug. 2 2018)
+ fix: channel last_requested was set to 0 instead of -1 on channel creation
+ fix: authentication failure body not forwarded for Nginx > 1.13.10
+ fix: possible invalid memory access for websocket unsubscribe requests
+ fix: building Nchan could interfere with building other modules
+1.2.0 (Jul. 23 2018)
+ feature: configurable support for CORS Access-Control-Allow-Credentials header
+ fix: better compliance with RFC7692  Websocket permessage-deflate parameter negotiation
+ fix (security): possible busy-loop denial-of-service for specially crafted 
+      handshakes from Websocket subscribers using permessage-deflate
+      (Thanks, Benjamin Michéle)
+ fix: nchan_permessage_deflate_compression_memlevel was not applied when set
+ refactor: all publisher and subscriber upstream requests are now more memory-efficient
+ fix: Using websocket publisher upstream requests may result in invalid memory access
+ fix: publishing Redis-backed messages with 1-second expiration may fail after
+      cluster restart
+ change: nchan_redis_wait_after_connecting directive is now obsolete, and is ignored
+ feature: nchan_redis_optimize_target for "cpu" or "bandwidth". Trades off CPU
+      load on Redis slaves for syncronization bandwidth.
+ feature: configurable Redis master/slave channel subscribe weights with
+      nchan_redis_subscribe_weights
+ fix: Compilation issues on OS X and systems lacking non-POSIX memrchr()
+ fix: nchan_pubsub CORS Allowed headers did not include headers used by subscribers
+ fix: Redis-backed channel buffer length could exceed nchan_message_buffer_length
+ fix: Publisher upstream compatibility for Nginx > 1.13.10
+ feature: nchan_redis_connect_timeout to configure maximum connection time 
+      to Redis servers
+ feature: Offload Redis SUBSCRIBE traffic to slaves 
+      (one SUBSCRIBE per channel per worker)
+ fix: Redis cluster and master/slave failover and reconnection issues
+ refactor: Redis connection handling rewritten from scratch
+ fix: subscribers may not receive new messages after reconnecting to Redis
+ fix: publishing to an unavailable Redis-backed channel may result in a 
+      following 400 Bad Request
+ change: Old Redis-backed channel messages are now delivered after the message
+      buffer is fully loaded into memory. Previously they were delivered
+      incrementally while the buffer loaded.
+ fix: multiplexed Redis-backed channels may not deliver messages if one or
+      more channels' messages all expire
+ fix: possible crash when catching up to reconnected Redis channel with
+      subscribers waiting for consecutive messages
+ fix: possible crash from rapidly creating and deleting channels
+1.1.15 (Apr. 27 2018)
+ fix: A disconnect from a Redis cluster node can result in a segfault
+ fix: Using Redis-backed multiplexed channels can result in a segfault
+1.1.14 (Jan. 10 2018)
+ feature: added nchan_redis_wait_after_connecting setting
+ fix: compatibility with Redis >= 4.0 cluster
+1.1.13 (Dec. 4 2017)
+ fix: added Redis backwards compatibility with Nchan 1.1.7 and below
+      for online upgrades with mixed-version Nchan cluster
+1.1.12 (Dec. 1 2017)
+ fix: possible "Unexpected spool == nuspool" worker crash
+ fix: subscriber messages delivered during active nchan_subscribe subrequest
+      may be garbled
+1.1.11 (Nov. 29 2017)
+ fix: Redis backup-mode not working (since 1.1.9)
+ fix: incorrect handling of Redis permessage-deflated messages results in
+      missing first char of eventsource event type
+ fix: worker crash when unable to create temp file for large websocket
+      permessage-deflate message
+ fix: CPU-bound overloaded Nginx may result in worker crashes
+      (may occur with large Openresty Lua load)
+ change: default nchan_shared_memory_size is now 128M
+ fix: some channel info from publisher GET requests may be incorrect with Redis
+ fix: file descriptor leak when reconnecting to Redis
+1.1.10 (Nov. 13 2017)
+ feature: nchan_authorize_request failure response forwarded back to subscriber
+      Sponsored by Symless (https://symless.com/)
+ fix: allow nchan_access_control_allow_origin in if blocks
+ fix: longpoll-multipart may read uninitialized memory when receiving 
+      zero-length message
+ fix (security): invalid memory access for aborted websocket subscriber 
+      after channel existence check via Redis
+ fix: websocket handhshake failure handled incorrectly when messages 
+      are available
+ fix (security): websocket subscriber disconnecting before handshake may
+      result in invalid memory access
+ fix (security): possible invalid memory access for disappearing longpoll sub
+ feature: add "shared memory limit" to nchan_stub_status output
+1.1.9 (Oct. 30 2017)
+ fix: more proper websocket extension negotiation with more 
+      informative failure messages
+ fix: websocket handshake failure response included superfluous CLOSE frame
+ feature: websocket deflate-frame and x-webkit-deflate-frame support
+1.1.8 (Oct. 26 2017)
+ feature: websocket permessage-deflate support
+      Sponsored by HYFN (https://hyfn.com/)
+ fix (security): websocket publisher may crash worker when publishing with
+      channel group accounting on to a new group
+ fix: messages published to Nchan via websocket binary frames 
+      should have content-type set to "application/octet-stream"
+ fix: accept websocket publisher binary frames (thanks @rponczkowski)
+ fix: multiplexing over exactly 255 channels results in worker crash
+ fix (security): Specially crafted invalid subscriber msgid may crash worker
+ fix: nchan_subscriber_first_message <= 0 (newest) with existing Redis data
+      incorrectly treated as "oldest" for initial subscribers
+ fix: 0-length channel name may crash worker
+ fix: subscribe/unsubscribe callback requests do not work when used with
+      authorization callback request
+ fix (security): Messages published with Redis through websocket publisher 
+      may result in worker crash (bug introduced in 1.1.5)
+ fix: nchan_pubsub setting may not be parsed correctly
+1.1.7 (Jul. 3 2017)
+ fix: possible read-after-free after redis disconnect
+ fix: publishing to redis cluster before it is connected results in worker crash
+ fix: possible use-after-free for suddenly disconnected longpoll-multipart subscriber
+ fix: possible use-after-free when using nchan_authorize_request for slow subscribers and slow upstream
+ fix: nchan_stub_status "stored messages" value could be incorrect when using Redis
+1.1.6 (May 9 2017)
+ fix: messages published through Redis may crash worker (introduced in 1.1.5)
+ fix (security): urlencoded message id in url parsed incorrectly can result in worker crash
+1.1.5 (May 3 2017)
+ feature: get current Nchan version through $nchan_version variable 
+      and nchan_stub_status
+ fix (security): invalid memory access for multiplexed channel subscribers 
+      with buffered output (Thanks Casey Forbes (@caseyf) for debugging.)
+ fix: "redis pending commands" nchan_stub_status stat could be wrong after 
+      deleting channels
+ fix: invalid memory access when using Redis under high load
+ fix: possible "message from the past" errors under high publishing load
+ fix: graceful publisher/subscriber notifications when out of shared memory
+      (via HTTP 507 Insufficient Storage status code)
+ fix: compatibility with limit_except directive
+1.1.4 (Apr. 25 2017)
+ fix (security): possible memory corruption using multiplexed channels 
+      at high load (Thanks Giovanni Caporaletti (@TrustNoOne) for debugging.)
+ fix: possible crash when reconnecting to Redis cluster (introduced in 1.1.3)
+1.1.3 (Mar. 25 2017)
+ fix (security): incorrect handling of WS optimization could trigger SIGABRT
+ fix: Redis cluster reconnect readiness verification
+1.1.2 (Mar. 1 2017)
+ change: "interprocess alert X delayed by Y sec" log messages downgraded 
+      from ERROR to NOTICE
+ fix: "group info string too short" error
+ fix: Incorrect handling of connections to Redis cluster nodes with round-robin
+      DNS hostnames (Thanks to ring.com for sponsoring this fix!)
+1.1.1 (Feb. 8 2017)
+ fix: incorrect stats for nchan_stub_status after reload.
+      (Stats are no longer reset after reload)
+ fix: websocket subscriber may receive two CLOSE frames
+ fix: websocket with ws+meta.nchan subprotocol did not receive empty messages
+ feature: websocket client heartbeats with nchan_websocket_client_heartbeat
+ fix: websocket now echoes code and reason when connection close initiated from client
+1.1.0 (Jan. 4 2017)
+ feature: websocket subscribers now receive "application/octet-stream" messages
+      in binary frame rather than text
+ fix: publisher request variables not always passed to nchan_publisher_upstream_request
+ feature: Redis storage 'backup' mode strictly for data persistence
+ fix: possible lingering subscriber if connection is closed just before subscribing
+ fix: possible memory leak when using multiplexed channels
+ security fix: subscribing with If-Modified-Since and without If-None-Match headers
+      crashed the Nginx worker (thanks @supertong)
+ security fix: sending an empty message to multipart/mixed subscriber crashed Nginx worker
+ fix: publisher & subscriber response codes were logged incorrectly
+ fix: websocket subscriber memory leak on upstream authentication failure
+ fix: possible crash after reloading when using several instances of Nchan with Redis
+ feature: nchan_access_control_allow_origin can accept nginx variables
+ feature: Redis key namespaces
+ feature: all size configurations can now parse decimal values
+ fix: off-by-one subscriber count when using multiplexed channels
+ feature: accounting and dynamic limits for channel groups
 1.0.8 (Nov. 28 2016)
  fix: possible crash under severely heavy load, introduced in 1.0.7 with stack-overflow fix
 1.0.7 (Nov. 27 2016)
diff --git a/debian/modules/nchan/cloc-exclude.txt b/debian/modules/nchan/cloc-exclude.txt
index c72f372..fdf0e34 100644
--- a/debian/modules/nchan/cloc-exclude.txt
+++ b/debian/modules/nchan/cloc-exclude.txt
@@ -1,17 +1,16 @@
 src/uthash.h
 src/hiredis
-src/store/redis/cmp.*
+src/util/ngx_nchan_hacked_slab.c
+src/util/hdr_histogram.c
+src/util/hdr_histogram.h
+src/store/redis/cmp.c
+src/store/redis/cmp.h
+src/store/redis/redis_lua_commands.h
 src/nginx-source
-dev/package
-dev/nginx-nchan/*.patch
-dev/nginx-nchan/pkg
-dev/nginx-nchan/src
-dev/nginx-nchan/*.txt
-dev/nginx-nchan/nginx.conf
-dev/nginx-nchan/nginx.logrotate
-dev/nginx-nchan/*.tar
-dev/nginx-nchan/*.gz
+src/nchan_config_commands.c
+dev/bench
+dev/nginx-pkg
 dev/clang-analyzer
 dev/package
 dev/src
-
+dev/redis-trib.rb
diff --git a/debian/modules/nchan/config b/debian/modules/nchan/config
index 5776d29..324deef 100644
--- a/debian/modules/nchan/config
+++ b/debian/modules/nchan/config
@@ -1,25 +1,68 @@
 ngx_addon_name=ngx_nchan_module
 
+nchan_libs=""
 #do we have hiredis on the platform?
-ngx_feature="hiredis"
+# it's currently no longer possible to link the platform's hiredis lib, 
+# because we now use a hacked connect function
+# maybe it can be brought back at some later time...
+ngx_feature="hiredis with stored sockaddr"
+ngx_feature_name="NCHAN_HAVE_HIREDIS_WITH_SOCKADDR"
 ngx_feature_run=yes
-ngx_feature_incs="#include <hiredis/hiredis.h>"
-ngx_feature_test="if(HIREDIS_SONAME < 0.13) { return 1; }"
+ngx_feature_path=
+ngx_feature_incs=" \
+  #include <hiredis/hiredis.h>
+  #include <sys/socket.h>
+"
 ngx_feature_libs="-lhiredis"
+ngx_feature_test=" \
+  redisContext c; \
+  if(HIREDIS_SONAME < 0.13) { return 1; } \
+  if(sizeof(c.sockaddr) != sizeof(struct sockaddr)) { return 1;} \
+"
 . auto/feature
 if [ $ngx_found = no ]; then
   _NCHAN_HIREDIS_SRCS="\
-    ${ngx_addon_dir}/src/hiredis/hiredis.c \
-    ${ngx_addon_dir}/src/hiredis/read.c \
-    ${ngx_addon_dir}/src/hiredis/async.c \
-    ${ngx_addon_dir}/src/hiredis/sds.c \
-    ${ngx_addon_dir}/src/hiredis/net.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/hiredis.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/read.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/async.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/sds.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/net.c \
   "
   ngx_feature_libs=""
 else
+  nchan_libs="$nchan_libs $ngx_feature_libs"
   _NCHAN_HIREDIS_SRCS=""
 fi
 
+ngx_feature="math lib"
+ngx_feature_name="NCHAN_HAVE_MATH"
+ngx_feature_run=yes
+ngx_feature_path=
+ngx_feature_incs="#include <math.h>"
+ngx_feature_libs="-lm"
+ngx_feature_test="sqrt(20);"
+. auto/feature
+if [ $ngx_found = yes ]; then
+  nchan_libs="$nchan_libs $ngx_feature_libs"
+fi
+
+#do we have memrchr() on the platform?
+ngx_feature="memrchr()"
+ngx_feature_name="NCHAN_HAVE_MEMRCHR"
+ngx_feature_run=yes
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_incs=" \
+  #include <string.h> 
+  #include <stddef.h> 
+"
+ngx_feature_test=" \
+  const char *str = \"aboobar\"; \
+  const void *place = &str[4]; \
+  const void *found = memrchr(str, 'b', strlen(str)); \
+  if(place != found) { return 1; } \
+"
+. auto/feature
 
 _NCHAN_SUBSCRIBERS_SRCS="\
   ${ngx_addon_dir}/src/subscribers/common.c \
@@ -35,24 +78,31 @@ _NCHAN_SUBSCRIBERS_SRCS="\
   ${ngx_addon_dir}/src/subscribers/memstore_ipc.c \
   ${ngx_addon_dir}/src/subscribers/memstore_multi.c \
   ${ngx_addon_dir}/src/subscribers/memstore_redis.c \
+  ${ngx_addon_dir}/src/subscribers/getmsg_proxy.c \
+  ${ngx_addon_dir}/src/subscribers/benchmark.c \
 "
 
 _NCHAN_REDIS_STORE_SRCS="\
   ${_NCHAN_HIREDIS_SRCS} \
   ${ngx_addon_dir}/src/store/redis/cmp.c \
-  ${ngx_addon_dir}/src/store/redis/cluster.c \
+  ${ngx_addon_dir}/src/store/redis/redis_lua_commands.c \
+  ${ngx_addon_dir}/src/store/redis/redis_nodeset_parser.c \
+  ${ngx_addon_dir}/src/store/redis/redis_nodeset.c \
   ${ngx_addon_dir}/src/store/redis/rdsstore.c \
   ${ngx_addon_dir}/src/store/redis/redis_nginx_adapter.c \
 "
 _NCHAN_MEMORY_STORE_SRCS="\
   ${ngx_addon_dir}/src/store/memory/ipc.c \
   ${ngx_addon_dir}/src/store/memory/ipc-handlers.c \
+  ${ngx_addon_dir}/src/store/memory/groups.c \
   ${ngx_addon_dir}/src/store/memory/memstore.c \
 "
 
 _nchan_util_dir="${ngx_addon_dir}/src/util"
 _NCHAN_UTIL_SRCS=" \
+  $_nchan_util_dir/nchan_debug.c \
   $_nchan_util_dir/nchan_list.c \
+  $_nchan_util_dir/nchan_slist.c \
   $_nchan_util_dir/ngx_nchan_hacked_slab.c \
   $_nchan_util_dir/shmem.c \
   $_nchan_util_dir/nchan_rbtree.c \
@@ -62,31 +112,32 @@ _NCHAN_UTIL_SRCS=" \
   $_nchan_util_dir/nchan_fake_request.c \
   $_nchan_util_dir/nchan_bufchainpool.c \
   $_nchan_util_dir/nchan_channel_id.c \
-  $_nchan_util_dir/nchan_channel_info.c \
-  $_nchan_util_dir/nchan_msgid.c \
+  $_nchan_util_dir/nchan_output_info.c \
+  $_nchan_util_dir/nchan_msg.c \
   $_nchan_util_dir/nchan_thingcache.c \
   $_nchan_util_dir/nchan_reaper.c \
   $_nchan_util_dir/nchan_subrequest.c \
+  $_nchan_util_dir/nchan_benchmark.c \
+  $_nchan_util_dir/hdr_histogram.c \
 "
 
 _NCHAN_STORE_SRCS="\
   ${ngx_addon_dir}/src/store/spool.c \
   ${ngx_addon_dir}/src/store/ngx_rwlock.c \
   ${ngx_addon_dir}/src/store/store_common.c \
-  $_NCHAN_REDIS_STORE_SRCS \
   $_NCHAN_MEMORY_STORE_SRCS \
+  $_NCHAN_REDIS_STORE_SRCS \
 "
 
 _NCHAN_SRCS="\
-  $_NCHAN_UTIL_SRCS \
-  $_NCHAN_SUBSCRIBERS_SRCS \
-  $_NCHAN_STORE_SRCS \
   ${ngx_addon_dir}/src/nchan_defs.c \
   ${ngx_addon_dir}/src/nchan_variables.c \
   ${ngx_addon_dir}/src/nchan_module.c \
+  $_NCHAN_UTIL_SRCS \
+  $_NCHAN_SUBSCRIBERS_SRCS \
+  $_NCHAN_STORE_SRCS \
 "
 
-
 ngx_module_incs=$ngx_addon_dir/src
 
 have=NGX_HTTP_HEADERS . auto/have
@@ -95,11 +146,11 @@ if test -n "$ngx_module_link"; then
   ngx_module_type=HTTP
   ngx_module_name=$ngx_addon_name
   ngx_module_srcs="$_NCHAN_SRCS"
-  ngx_module_libs=$ngx_feature_libs
+  ngx_module_libs=$nchan_libs
   . auto/module
 else
   NGX_ADDON_SRCS="$NGX_ADDON_SRCS $_NCHAN_SRCS"
-  CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+  CORE_LIBS="$CORE_LIBS $nchan_libs"
   CORE_INCS="$CORE_INCS $ngx_module_incs"
   HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
 fi
diff --git a/debian/modules/nchan/src/nchan_commands.rb b/debian/modules/nchan/src/nchan_commands.rb
index 12a88f1..eae0ea9 100644
--- a/debian/modules/nchan/src/nchan_commands.rb
+++ b/debian/modules/nchan/src/nchan_commands.rb
@@ -30,13 +30,24 @@ CfCmd.new do
       group: "pubsub",
       tags: [ 'publisher', 'hook' ],
       value: "<url>",
-      uri: "/details#message-publishing-callbacks",
+      uri: "#message-forwarding",
       info: <<-EOS.gsub(/^ {8}/, '')
         Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.  
         The upstream response code determines how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.
       EOS
-      
   
+      
+  nchan_deflate_message_for_websocket [:srv, :loc],
+      :nchan_set_message_compression_slot,
+      :loc_conf,
+      args: 1,
+      
+      group: "pubsub",
+      tags: ["publisher", 'subscriber-websocket'],
+      value: ['on', 'off'],
+      default: "off",
+      info: "Store a compressed (deflated) copy of the message along with the original to be sent to websocket clients supporting the permessage-deflate protocol extension"
+      
   nchan_channel_id_split_delimiter [:srv, :loc, :if],
       :ngx_conf_set_str_slot,
       [:loc_conf, :channel_id_split_delimiter],
@@ -62,6 +73,7 @@ CfCmd.new do
       :nchan_pubsub_directive,
       :loc_conf,
       args: 0..6,
+      alt: ["nchan_pubsub_location"],
       
       group: "pubsub",
       tags: [ 'publisher', 'subscriber', 'pubsub' ],
@@ -91,13 +103,53 @@ CfCmd.new do
       tags: ['subscriber-eventsource'],
       default: "(none)",
       info: "Set the EventSource `event:` line to this value. When used in a publisher location, overrides the published message's `X-EventSource-Event` header and associates the message with the given value. When used in a subscriber location, overrides all messages' associated `event:` string with the given value."
+  
+  nchan_eventsource_ping_comment [:srv, :loc, :if],
+      :ngx_conf_set_str_slot_no_newlines,
+      [:loc_conf, :"eventsource_ping.comment"],
+      args: 1,
       
+      group: "pubsub",
+      tags: ['subscriber-eventsource'],
+      default: "(empty)",
+      info: "Set the EventSource comment `: ...` line for periodic pings from server to client. Newlines are not allowed. If empty, no comment is sent with the ping."
+  
+  nchan_eventsource_ping_event [:srv, :loc, :if],
+      :ngx_conf_set_str_slot_no_newlines,
+      [:loc_conf, :"eventsource_ping.event"],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber-eventsource'],
+      default: "ping",
+      info: "Set the EventSource `event:` line for periodic pings from server to client. Newlines are not allowed. If empty, no event type is sent with the ping."
+  
+  nchan_eventsource_ping_data [:srv, :loc, :if],
+      :ngx_conf_set_str_slot_no_newlines,
+      [:loc_conf, :"eventsource_ping.data"],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber-eventsource'],
+      default: "(empty)",
+      info: "Set the EventSource `data:` line for periodic pings from server to client. Newlines are not allowed. If empty, no data is sent with the ping."
+  
+    nchan_eventsource_ping_interval [:srv, :loc, :if],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :"eventsource_ping.interval"],
+      
+      group: "pubsub",
+      tags: ['subscriber-eventsource'],
+      value: "<number> (seconds)",
+      default: "0 (none)",
+      info: "Interval for sending ping messages to EventSource subscribers. Disabled by default."
   
   nchan_subscriber [:srv, :loc, :if],
       :nchan_subscriber_directive,
       :loc_conf,
       args: 0..5,
       legacy: "push_subscriber",
+      alt: ["nchan_subscriber_location"],
       
       group: "pubsub",
       tags: ['subscriber'],
@@ -188,11 +240,23 @@ CfCmd.new do
       default: "0 (none)",
       info: "Interval for sending websocket ping frames. Disabled by default."
   
+  nchan_websocket_client_heartbeat [:srv, :loc, :if],
+      :nchan_websocket_heartbeat_directive,
+      [:loc_conf, :websocket_heartbeat],
+      args: 2,
+      
+      group: "pubsub",
+      tags:['subscriber-websocket'],
+      value: "<heartbeat_in> <heartbeat_out>",
+      default: "none (disabled)",
+      info: "Most browser Websocket clients do not allow manually sending PINGs to the server. To overcome this limitation, this setting can be used to set up a PING/PONG message/response connection heartbeat. When the client sends the server message *heartbeat_in* (PING), the server automatically responds with *heartbeat_out* (PONG)."
+  
   nchan_publisher [:srv, :loc, :if],
       :nchan_publisher_directive,
       :loc_conf,
       args: 0..2,
       legacy: "push_publisher",
+      alt: ["nchan_publisher_location"],
       
       group: "pubsub",
       tags: ['publisher'],
@@ -221,7 +285,7 @@ CfCmd.new do
       tags: ['publisher', 'subscriber', 'hook'],
       value: "<url>",
       info: "Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it.",
-      uri: "/details#request-authorization"
+      uri: "#request-authorization"
   
   nchan_subscribe_request [:srv, :loc, :if], 
       :ngx_http_set_complex_value_slot,
@@ -231,7 +295,7 @@ CfCmd.new do
       tags: ['subscriber', 'hook'],
       value: "<url>",
       info: "Send GET request to internal location (which may proxy to an upstream server) after subscribing. Disabled for longpoll and interval-polling subscribers.",
-      uri: "/details#subsribe-and-unsubscribe-callbacks"
+      uri: "#subscriber-presence"
   
   nchan_unsubscribe_request [:srv, :loc, :if], 
       :ngx_http_set_unsubscribe_request_url,
@@ -241,7 +305,18 @@ CfCmd.new do
       tags: ['subscriber', 'hook'],
       value: "<url>",
       info: "Send GET request to internal location (which may proxy to an upstream server) after unsubscribing. Disabled for longpoll and interval-polling subscribers.",
-      uri: "/details#subsribe-and-unsubscribe-callbacks"
+      uri: "#subscriber-presence"
+  
+  nchan_message_temp_path [:main],
+      :ngx_conf_set_path_slot,
+      [:main_conf, :message_temp_path],
+      
+      group: "storage",
+      tags: ["memstore"],
+      value: "<path>",
+      default: "<client_body_temp_path>",
+      info: "Large messages are stored in temporary files in the `client_body_temp_path` or the `nchan_message_temp_path` if the former is unavailable. Default is the built-in default `client_body_temp_path`"
+      
   
   nchan_store_messages [:main, :srv, :loc, :if],
       :nchan_store_messages_directive,
@@ -254,27 +329,68 @@ CfCmd.new do
       default: :on,
       info: "Publisher configuration. \"`off`\" is equivalent to setting `nchan_message_buffer_length 0`, which disables the buffering of old messages. Using this setting is not recommended when publishing very quickly, as it may result in missed messages."
     
-  nchan_max_reserved_memory [:main],
-      :ngx_conf_set_size_slot,
+  nchan_shared_memory_size [:main],
+      :nchan_conf_set_size_slot,
       [:main_conf, :shm_size],
-      legacy: "push_max_reserved_memory",
+      legacy: ["push_max_reserved_memory", "nchan_max_reserved_memory"],
       
       group: "storage",
       tags: ['memstore'],
       value: "<size>",
-      default: "32M",
-      info: "The size of the shared memory chunk this module will use for message queuing and buffering.",
+      default: "128M",
+      info: "Shared memory slab pre-allocated for Nchan. Used for channel statistics, message storage, and interprocess communication.",
       uri: "#memory-storage"
-    
+  
+  nchan_permessage_deflate_compression_level [:main],
+      :nchan_conf_deflate_compression_level_directive,
+      :main_conf,
+      
+      group: "pubsub",
+      tags: ['subscriber-websocket'],
+      value: ["0-9"],
+      default: "6",
+      info: "Compression level for the `deflate` algorithm used in websocket's permessage-deflate extension. 0: no compression, 1: fastest, worst, 9: slowest, best"
+  
+  nchan_permessage_deflate_compression_strategy [:main],
+      :nchan_conf_deflate_compression_strategy_directive,
+      :main_conf,
+      
+      group: "pubsub",
+      tags: ['subscriber-websocket'],
+      value: ["default", "filtered", "huffman-only", "rle", "fixed"],
+      default: "default",
+      info: "Compression strategy for the `deflate` algorithm used in websocket's permessage-deflate extension. Use 'default' for normal data, For details see [zlib's section on copression strategies](http://zlib.net/manual.html#Advanced)"
+  
+  nchan_permessage_deflate_compression_window [:main],
+      :nchan_conf_deflate_compression_window_directive,
+      :main_conf,
+      
+      group: "pubsub",
+      tags: ['subscriber-websocket'],
+      value: ["9-15"],
+      default: "10",
+      info: "Compression window for the `deflate` algorithm used in websocket's permessage-deflate extension. The base two logarithm of the window size (the size of the history buffer). The bigger the window, the better the compression, but the more memory used by the compressor."
+  
+  nchan_permessage_deflate_compression_memlevel [:main],
+      :nchan_conf_deflate_compression_memlevel_directive,
+      :main_conf,
+      
+      group: "pubsub",
+      tags: ['subscriber-websocket'],
+      value: ["1-9"],
+      default: "8",
+      info: "Memory level for the `deflate` algorithm used in websocket's permessage-deflate extension. How much memory should be allocated for the internal compression state. 1 - minimum memory, slow and reduces compression ratio; 9 - maximum memory for optimal speed"
+  
   nchan_redis_url [:main, :srv, :loc],
       :ngx_conf_set_redis_url,
       [:loc_conf, :"redis.url"],
       
       group: "storage",
       tags: ['redis'],
+      value: "<redis-url>",
       default: "127.0.0.1:6379",
-      info: "The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.",
-      uri: "/details#using-redis"
+      info: "Use of this command is discouraged in favor of upstreams blocks with (`nchan_redis_server`)[#nchan_redis_server]. The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.",
+      uri: "#connecting-to-a-redis-server"
   
   nchan_redis_pass [:main, :srv, :loc],
       :ngx_conf_set_redis_upstream_pass,
@@ -282,8 +398,9 @@ CfCmd.new do
       
       group: "storage",
       tags: ['publisher', 'subscriber', 'redis'],
+      value: "<upstream-name>",
       info: "Use an upstream config block for Redis servers.",
-      uri: "/details#using-redis"
+      uri: "#connecting-to-a-redis-server"
   
   nchan_redis_pass_inheritable [:main, :srv, :loc],
       :ngx_conf_set_flag_slot,
@@ -303,8 +420,36 @@ CfCmd.new do
       :loc_conf,
       group: "storage",
       tags: ['redis'],
-      info: "Used in upstream { } blocks to set redis servers.",
-      uri: "/details#using-redis"
+      value: "<redis-url>",
+      info: "Used in upstream { } blocks to set redis servers. Redis url is in the form 'redis://:password@hostname:6379/0'. Shorthands 'host:port' or 'host' are permitted.",
+      uri: "#connecting-to-a-redis-server"
+  
+  nchan_redis_storage_mode [:main, :srv, :upstream], 
+      :ngx_conf_set_redis_storage_mode_slot,
+      [:loc_conf, :"redis.storage_mode"],
+      
+      group: "storage",
+      tags: ['redis'],
+      value: ["distributed", "backup", "nostore"],
+      default: "distributed",
+      info: <<-EOS.gsub(/^ {8}/, '')
+        The mode of operation of the Redis server. In `distributed` mode, messages are published directly to Redis, and retrieved in real-time. Any number of Nchan servers in distributed mode can share the Redis server (or cluster). Useful for horizontal scalability, but suffers the latency penalty of all message publishing going through Redis first.
+        
+        In `backup` mode, messages are published locally first, then later forwarded to Redis, and are retrieved only upon chanel initialization. Only one Nchan server should use a Redis server (or cluster) in this mode. Useful for data persistence without sacrificing response times to the latency of a round-trip to Redis.
+        
+        In `nostore` mode, messages are published as in `distributed` mode, but are not stored. Thus Redis is used to broadcast messages to many Nchan instances with no delivery guarantees during connection failure, and only local in-memory storage. This means that there are also no message delivery guarantees for subscribers switching from one Nchan instance to another connected to the same Redis server or cluster. Nostore mode increases Redis publishing capacity by an order of magnitude.
+      EOS
+  
+  nchan_redis_nostore_fastpublish [:main, :srv, :upstream],
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, :"redis.nostore_fastpublish"],
+      
+      group: "storage",
+      tags: ['redis', 'publisher'],
+      value: [:on, :off],
+      default: :off,
+      info: "Increases publishing capacity by 2-3x for Redis nostore mode at the expense of inaccurate subscriber counts in the publisher response."
+  
   
   nchan_use_redis [:main, :srv, :loc],
       :ngx_conf_enable_redis,
@@ -314,10 +459,10 @@ CfCmd.new do
       tags: ['redis', 'publisher', 'subscriber'],
       value: [ :on, :off ],
       default: :off,
-      info: "Use redis for message storage at this location.", 
-      uri: "/details#using-redis"
+      info: "Use of this command is discouraged in favor of (`nchan_redis_pass`)[#nchan_redis_pass]. Use Redis for message storage at this location.",
+      uri: "#connecting-to-a-redis-server"
   
-  nchan_redis_ping_interval [:main, :srv, :loc],
+  nchan_redis_ping_interval [:main, :srv, :upstream, :loc],
       :ngx_conf_set_sec_slot,
       [:loc_conf, :"redis.ping_interval"],
       
@@ -326,6 +471,55 @@ CfCmd.new do
       default: "4m",
       info: "Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable."
   
+  nchan_redis_wait_after_connecting [:main, :srv, :loc],
+      :nchan_ignore_obsolete_setting,
+      :loc_conf,
+      
+      group: "obsolete",
+      tags: ['redis'],
+      uncocumented: true
+  
+  nchan_redis_connect_timeout [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.connect_timeout"],
+      
+      group: "storage",
+      tags: ['redis'],
+      default: "600ms",
+      info: "Redis server connection timeout."
+  
+  nchan_redis_subscribe_weights [:upstream],
+      :ngx_conf_set_redis_subscribe_weights,
+      :srv_conf,
+      args: 1..2,
+      
+      group: "storage",
+      tags: ['redis'],
+      value: "master=<integer> slave=<integer>",
+      default: "master=1 slave=1",
+      info: "Determines how subscriptions to Redis PUBSUB channels are distributed between master and slave nodes. The higher the number, the more likely that each node of that type will be chosen for each new channel. The weights for slave nodes are cumulative, so an equal 1:1 master:slave weight ratio with two slaves would have a 1/3 chance of picking a master, and 2/3 chance of picking one of the slaves. The weight must be a non-negative integer."
+  
+  nchan_redis_optimize_target [:upstream],
+      :ngx_conf_set_redis_optimize_target,
+      :srv_conf,
+      
+      group: "storage",
+      tags: ['redis'],
+      value: [:cpu, :bandwidth],
+      default: "cpu",
+      info: "This tweaks whether [effect replication](https://redis.io/commands/eval#replicating-commands-instead-of-scripts) is enabled. Optimizing for CPU usage enables effect replication, costing additional bandwidth (between 1.2 and 2 times more) between all master->slave links. Optimizing for bandwidth increases CPU load on slaves, but keeps outgoing bandwidth used for replication the same as the incoming bandwidth on Master."
+  
+  nchan_redis_namespace [:main, :srv, :upstream, :loc], 
+      :ngx_conf_set_str_slot,
+      [:loc_conf, :"redis.namespace"],
+      args: 1,
+      post_handler: "ngx_conf_process_redis_namespace_slot",
+      
+      group: "storage",
+      value: "<string>",
+      tags: ['redis'],
+      info: "Prefix all Redis keys with this string. All Nchan-related keys in redis will be of the form \"nchan_redis_namespace:*\" . Default is empty."
+  
   nchan_redis_fakesub_timer_interval [:main],
       :ngx_conf_set_msec_slot,
       [:main_conf, :redis_fakesub_timer_interval],
@@ -378,27 +572,108 @@ CfCmd.new do
       default: :off,
       info: "Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response."
   
-  nchan_access_control_allow_origin [:main, :srv, :loc], 
-      :ngx_conf_set_str_slot,
+  nchan_access_control_allow_origin [:main, :srv, :loc, :if], 
+      :ngx_http_set_complex_value_slot,
       [:loc_conf, :allow_origin],
       args: 1,
       
       group: "security",
       value: "<string>",
       tags: ['publisher', 'subscriber'],
-      default: "*",
-      info: "Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the publisher or subscriber request's `Origin` header does not match this value, respond with a `403 Forbidden`."
+      default: "$http_origin",
+      info: "Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the incoming request's `Origin` header does not match this value, respond with a `403 Forbidden`. Multiple origins can be provided in a single argument separated with a space."
+
+  nchan_access_control_allow_credentials [:main, :srv, :loc, :if], 
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, :allow_credentials],
+      args: 1,
+      
+      group: "security",
+      tags: ['publisher', 'subscriber'],
+      default: "on",
+      info: "When enabled, sets the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Credentials` header to `true`."
+  
   
   nchan_channel_group [:srv, :loc, :if], 
-      :ngx_conf_set_str_slot, 
+      :ngx_http_set_complex_value_slot, 
       [:loc_conf, :channel_group],
       legacy: "push_channel_group",
       
       group: "security",
-      tags: ['publisher', 'subscriber', 'channel-events'],
+      tags: ['publisher', 'subscriber', 'channel-events', 'group'],
       value: "<string>",
       default: "(none)",
-      info: "Because settings are bound to locations and not individual channels, it is useful to be able to have channels that can be reached only from some locations and never others. That's where this setting comes in. Think of it as a prefix string for the channel id."
+      info: "The accounting and security group a channel belongs to. Works like a prefix string to the channel id. Can be set with nginx variables."
+  
+  nchan_channel_group_accounting [:srv, :loc], 
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, "group.enable_accounting"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      default: "off",
+      info: "Enable tracking channel, subscriber, and message information on a per-channel-group basis. Can be used to place upper limits on channel groups."
+  
+  nchan_group_location [:loc], 
+      :nchan_group_directive, 
+      [:loc_conf],
+      args: 0..3,
+      
+      group: "security",
+      tags: ['group'],
+      value: ["get", "set", "delete", "off"],
+      default: ["get", "set", "delete"],
+      info: "Group information and configuration location. GET request for group info, POST to set limits, DELETE to delete all channels in group."
+  
+  nchan_group_max_channels [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_channels"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum number of channels allowed in the group."
+  
+  nchan_group_max_messages [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_messages"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum number of messages allowed for all the channels in the group."
+  
+  nchan_group_max_messages_memory [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_messages_shm_bytes"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum amount of shared memory allowed for the messages of all the channels in the group."
+  
+  nchan_group_max_messages_disk [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_messages_file_bytes"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum amount of disk space allowed for the messages of all the channels in the group."
+  
+  nchan_group_max_subscribers [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_subscribers"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum number of subscribers allowed for the messages of all the channels in the group."
   
   nchan_channel_events_channel_id [:srv, :loc, :if],
       :nchan_set_channel_events_channel_id,
@@ -406,8 +681,8 @@ CfCmd.new do
       args: 1,
       
       group: "meta",
-      tags: ['publisher', 'subscriber', 'channel-events'],
-      uri: "/details#channel-events",
+      tags: ['publisher', 'subscriber', 'channel-events', 'introspection'],
+      uri: "#channel-events",
       info: "Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'."
   
   nchan_stub_status [:loc],
@@ -416,15 +691,16 @@ CfCmd.new do
       args: 0,
       
       group: "meta",
+      tags: ['introspection'],
       info: "Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc.",
-      uri: "/details#nchan_stub_status"
+      uri: "#nchan_stub_status"
   
   nchan_channel_event_string [:srv, :loc, :if], 
       :ngx_http_set_complex_value_slot,
       [:loc_conf, :channel_event_string],
       
       group: "meta",
-      tags: ['publisher', 'subscriber', 'channel-events'],
+      tags: ['publisher', 'subscriber', 'channel-events', 'introspection'],
       value: "<string>",
       default: "\"$nchan_channel_event $nchan_channel_id\"",
       info: "Contents of channel event message"
@@ -437,8 +713,8 @@ CfCmd.new do
       group: "security",
       tags: ['publisher', 'subscriber', 'channel-id' ],
       value: "<number>",
-      default: 512,
-      info: "Maximum permissible channel id length (number of characters). Longer ids will be truncated."
+      default: 1024,
+      info: "Maximum permissible channel id length (number of characters). This settings applies to ids before they may be split by the `nchan_channel_id_split_delimiter` Requests with a channel id that is too long will receive a `403 Forbidden` response."
   
   nchan_max_channel_subscribers [:main, :srv, :loc],
       :ngx_conf_set_num_slot,
@@ -468,6 +744,49 @@ CfCmd.new do
       default: "memory",
       info: "Development directive to completely replace default storage engine. Don't use unless you are an Nchan developer."
   
+  nchan_benchmark [:loc],
+      :nchan_benchmark_directive,
+      [:loc_conf],
+      group: "development",
+      undocumented: true,
+      args: 0
+  nchan_benchmark_time [:loc],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, "benchmark.time"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_messages_per_channel_per_minute [:loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, "benchmark.msgs_per_minute"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_message_padding_bytes [:loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, "benchmark.msg_padding"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_channels [:loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, "benchmark.channels"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_subscribers_per_channel [:loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, "benchmark.subscribers_per_channel"],
+      group: "development",
+      undocumented: true
+    nchan_benchmark_subscriber_distribution [:loc],
+      :nchan_benchmark_subscriber_distribution_directive,
+      [:loc_conf, "benchmark.subscriber_distribution"],
+      group: "development",
+      undocumented: true
+    nchan_benchmark_publisher_distribution [:loc],
+      :nchan_benchmark_publisher_distribution_directive,
+      [:loc_conf, "benchmark.publisher_distribution"],
+      group: "development",
+      undocumented: true
+
+  
   push_min_message_buffer_length [:srv, :loc, :if],
       :nchan_ignore_obsolete_setting,
       :loc_conf,
diff --git a/debian/modules/nchan/src/nchan_config_commands.c b/debian/modules/nchan/src/nchan_config_commands.c
index 3051f09..4cbde2a 100644
--- a/debian/modules/nchan/src/nchan_config_commands.c
+++ b/debian/modules/nchan/src/nchan_config_commands.c
@@ -1,4 +1,8 @@
 //AUTOGENERATED, do not edit! see nchan_commands.rb
+static ngx_conf_post_t nchan_redis_namespace__post_handler = {
+  ngx_conf_process_redis_namespace_slot
+};
+
 static ngx_command_t  nchan_commands[] = {
     { ngx_string("nchan_channel_id"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
@@ -33,6 +37,13 @@ static ngx_command_t  nchan_commands[] = {
     offsetof(nchan_loc_conf_t, publisher_upstream_request_url),
     NULL } ,
 
+  { ngx_string("nchan_deflate_message_for_websocket"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_compression_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
   { ngx_string("nchan_channel_id_split_delimiter"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
     ngx_conf_set_str_slot,
@@ -59,6 +70,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_pubsub_location"), //alt for nchan_pubsub
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6,
+    nchan_pubsub_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_longpoll_multipart_response"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -74,6 +91,34 @@ static ngx_command_t  nchan_commands[] = {
     offsetof(nchan_loc_conf_t, eventsource_event),
     NULL } ,
 
+  { ngx_string("nchan_eventsource_ping_comment"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot_no_newlines,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.comment),
+    NULL } ,
+
+  { ngx_string("nchan_eventsource_ping_event"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot_no_newlines,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.event),
+    NULL } ,
+
+  { ngx_string("nchan_eventsource_ping_data"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot_no_newlines,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.data),
+    NULL } ,
+
+  { ngx_string("nchan_eventsource_ping_interval"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.interval),
+    NULL } ,
+
   { ngx_string("nchan_subscriber"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
     nchan_subscriber_directive,
@@ -86,6 +131,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_subscriber_location"), //alt for nchan_subscriber
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
+    nchan_subscriber_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_subscriber_compound_etag_message_id"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -129,6 +180,13 @@ static ngx_command_t  nchan_commands[] = {
     offsetof(nchan_loc_conf_t, websocket_ping_interval),
     NULL } ,
 
+  { ngx_string("nchan_websocket_client_heartbeat"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE2,
+    nchan_websocket_heartbeat_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, websocket_heartbeat),
+    NULL } ,
+
   { ngx_string("nchan_publisher"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
     nchan_publisher_directive,
@@ -141,6 +199,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_publisher_location"), //alt for nchan_publisher
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    nchan_publisher_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_subscriber_timeout"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -176,6 +240,13 @@ static ngx_command_t  nchan_commands[] = {
     offsetof(nchan_loc_conf_t, unsubscribe_request_url),
     NULL } ,
 
+  { ngx_string("nchan_message_temp_path"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_path_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, message_temp_path),
+    NULL } ,
+
   { ngx_string("nchan_store_messages"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
     nchan_store_messages_directive,
@@ -189,18 +260,52 @@ static ngx_command_t  nchan_commands[] = {
     0,
     NULL } ,
 
-  { ngx_string("nchan_max_reserved_memory"),
+  { ngx_string("nchan_shared_memory_size"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_size_slot,
+    nchan_conf_set_size_slot,
     NGX_HTTP_MAIN_CONF_OFFSET,
     offsetof(nchan_main_conf_t, shm_size),
     NULL } ,
-  { ngx_string("push_max_reserved_memory"), //legacy for nchan_max_reserved_memory
+  { ngx_string("push_max_reserved_memory"), //legacy for nchan_shared_memory_size
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_size_slot,
+    nchan_conf_set_size_slot,
     NGX_HTTP_MAIN_CONF_OFFSET,
     offsetof(nchan_main_conf_t, shm_size),
     NULL } ,
+  { ngx_string("nchan_max_reserved_memory"), //legacy for nchan_shared_memory_size
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, shm_size),
+    NULL } ,
+
+  { ngx_string("nchan_permessage_deflate_compression_level"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_level_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_permessage_deflate_compression_strategy"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_strategy_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_permessage_deflate_compression_window"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_window_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_permessage_deflate_compression_memlevel"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_memlevel_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_redis_url"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -237,6 +342,20 @@ static ngx_command_t  nchan_commands[] = {
     0,
     NULL } ,
 
+  { ngx_string("nchan_redis_storage_mode"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_storage_mode_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.storage_mode),
+    NULL } ,
+
+  { ngx_string("nchan_redis_nostore_fastpublish"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.nostore_fastpublish),
+    NULL } ,
+
   { ngx_string("nchan_use_redis"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
     ngx_conf_enable_redis,
@@ -245,12 +364,47 @@ static ngx_command_t  nchan_commands[] = {
     NULL } ,
 
   { ngx_string("nchan_redis_ping_interval"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
     ngx_conf_set_sec_slot,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis.ping_interval),
     NULL } ,
 
+  { ngx_string("nchan_redis_wait_after_connecting"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_obsolete_setting,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_redis_connect_timeout"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.connect_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_redis_subscribe_weights"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    ngx_conf_set_redis_subscribe_weights,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_redis_optimize_target"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_optimize_target,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_redis_namespace"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.namespace),
+    &nchan_redis_namespace__post_handler } ,
+
   { ngx_string("nchan_redis_fakesub_timer_interval"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
     ngx_conf_set_msec_slot,
@@ -317,25 +471,81 @@ static ngx_command_t  nchan_commands[] = {
     NULL } ,
 
   { ngx_string("nchan_access_control_allow_origin"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, allow_origin),
     NULL } ,
 
+  { ngx_string("nchan_access_control_allow_credentials"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, allow_credentials),
+    NULL } ,
+
   { ngx_string("nchan_channel_group"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    ngx_http_set_complex_value_slot,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, channel_group),
     NULL } ,
   { ngx_string("push_channel_group"), //legacy for nchan_channel_group
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
+    ngx_http_set_complex_value_slot,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, channel_group),
     NULL } ,
 
+  { ngx_string("nchan_channel_group_accounting"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.enable_accounting),
+    NULL } ,
+
+  { ngx_string("nchan_group_location"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3,
+    nchan_group_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_group_max_channels"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_channels),
+    NULL } ,
+
+  { ngx_string("nchan_group_max_messages"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_messages),
+    NULL } ,
+
+  { ngx_string("nchan_group_max_messages_memory"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_messages_shm_bytes),
+    NULL } ,
+
+  { ngx_string("nchan_group_max_messages_disk"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_messages_file_bytes),
+    NULL } ,
+
+  { ngx_string("nchan_group_max_subscribers"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_subscribers),
+    NULL } ,
+
   { ngx_string("nchan_channel_events_channel_id"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
     nchan_set_channel_events_channel_id,
@@ -403,6 +613,62 @@ static ngx_command_t  nchan_commands[] = {
     offsetof(nchan_loc_conf_t, storage_engine),
     NULL } ,
 
+  { ngx_string("nchan_benchmark"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
+    nchan_benchmark_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_time"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.time),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_messages_per_channel_per_minute"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.msgs_per_minute),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_message_padding_bytes"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.msg_padding),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_channels"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.channels),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_subscribers_per_channel"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.subscribers_per_channel),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_subscriber_distribution"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_benchmark_subscriber_distribution_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.subscriber_distribution),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_publisher_distribution"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_benchmark_publisher_distribution_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.publisher_distribution),
+    NULL } ,
+
   { ngx_string("push_min_message_buffer_length"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
     nchan_ignore_obsolete_setting,
diff --git a/debian/modules/nchan/src/nchan_defs.c b/debian/modules/nchan/src/nchan_defs.c
index c9e07e1..8dbd49c 100644
--- a/debian/modules/nchan/src/nchan_defs.c
+++ b/debian/modules/nchan/src/nchan_defs.c
@@ -15,6 +15,7 @@ const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS = ngx_string("Access-
 const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS = ngx_string("Access-Control-Allow-Methods");
 const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN = ngx_string("Access-Control-Allow-Origin");
 const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS = ngx_string("Access-Control-Expose-Headers");
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS = ngx_string("Access-Control-Allow-Credentials");
 
 const  ngx_str_t NCHAN_HEADER_EVENTSOURCE_EVENT = ngx_string("X-EventSource-Event");
 
@@ -26,6 +27,7 @@ const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_KEY = ngx_string("Sec-WebSocket-Key")
 const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT = ngx_string("Sec-WebSocket-Accept");
 const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_VERSION = ngx_string("Sec-WebSocket-Version");
 const ngx_str_t NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL = ngx_string("Sec-WebSocket-Protocol");
+const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS = ngx_string("Sec-WebSocket-Extensions");
 
 //and some wobsockety values
 const ngx_str_t NCHAN_UPGRADE = ngx_string("Upgrade");
@@ -39,6 +41,7 @@ const  ngx_str_t NCHAN_CACHE_CONTROL_VALUE = ngx_string("no-cache");
 const  ngx_str_t NCHAN_HTTP_STATUS_101 = ngx_string("101 Switching Protocols");
 const  ngx_str_t NCHAN_HTTP_STATUS_204 = ngx_string("204 No Content");
 const  ngx_str_t NCHAN_HTTP_STATUS_304 = ngx_string("304 Not Modified");
+const  ngx_str_t NCHAN_HTTP_STATUS_400 = ngx_string("400 Bad Request");
 const  ngx_str_t NCHAN_HTTP_STATUS_408 = ngx_string("408 Request Timeout");
 const  ngx_str_t NCHAN_HTTP_STATUS_409 = ngx_string("409 Conflict");
 const  ngx_str_t NCHAN_HTTP_STATUS_410 = ngx_string("410 Gone");
@@ -46,10 +49,14 @@ const  ngx_str_t NCHAN_HTTP_STATUS_410 = ngx_string("410 Gone");
 //other stuff
 const  ngx_str_t NCHAN_SUBSCRIBER_TIMEOUT= ngx_string("Subscriber Timeout");
 const  ngx_str_t NCHAN_ANYSTRING= ngx_string("*");
+const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_GROUP_HEADERS = ngx_string("Accept, Content-Type");
 const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS = ngx_string("Content-Type");
 const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS = ngx_string("If-None-Match, If-Modified-Since, Content-Type, Cache-Control, X-EventSource-Event");
+const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBSUB_HEADERS = ngx_string("If-None-Match, If-Modified-Since, Content-Type, Cache-Control, X-EventSource-Event");
 const  ngx_str_t NCHAN_ALLOW_GET_POST_PUT_DELETE= ngx_string("GET, POST, PUT, DELETE");
 const  ngx_str_t NCHAN_ALLOW_GET= ngx_string("GET");
+const  ngx_str_t NCHAN_ALLOW_GET_POST_DELETE= ngx_string("GET, POST, DELETE");
+
 
 const  ngx_str_t NCHAN_VARY_HEADER_VALUE = ngx_string("If-None-Match, If-Modified-Since");
 const  ngx_str_t NCHAN_MSG_RESPONSE_ALLOWED_HEADERS = ngx_string("Last-Modified, Etag, Content-Type");
@@ -86,6 +93,6 @@ const ngx_str_t NCHAN_CHANNEL_INFO_YAML = ngx_string(
   "messages: %ui" CRLF
   "requested: %d" CRLF
   "subscribers: %ui" CRLF
-  "last_message_id: %V" CRLF
+  "last_message_id: \"%V\"" CRLF
   CRLF
   "\0");
diff --git a/debian/modules/nchan/src/nchan_defs.h b/debian/modules/nchan/src/nchan_defs.h
index 8e1af05..0809080 100644
--- a/debian/modules/nchan/src/nchan_defs.h
+++ b/debian/modules/nchan/src/nchan_defs.h
@@ -1,12 +1,13 @@
 #ifndef NCHAN_DEFS_H
 #define NCHAN_DEFS_H
 
-#define NCHAN_DEFAULT_SHM_SIZE 33554432 //32 megs
+#define NCHAN_DEFAULT_SHM_SIZE 134217728 //128 megs
 #define NCHAN_DEFAULT_MESSAGE_TIMEOUT 3600
 #define NCHAN_DEFAULT_REDIS_IDLE_CHANNEL_CACHE_TIMEOUT 30
 #define NCHAN_DEFAULT_SUBSCRIBER_TIMEOUT 0  //default: never timeout
+#define NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC 600
 //(liucougar: this is a bit confusing, but it is what's the default behavior before this option is introducecd)
-#define NCHAN_DEFAULT_WEBSOCKET_PING_INTERVAL 0
+#define NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL 0
 
 #define NCHAN_DEFAULT_CHANNEL_TIMEOUT 5 //default: timeout in 5 seconds
 
@@ -62,6 +63,7 @@ extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS;
 extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS;
 extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN;
 extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS;
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS;
 
 extern const ngx_str_t NCHAN_HEADER_EVENTSOURCE_EVENT;
 
@@ -71,6 +73,7 @@ extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_KEY;
 extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT;
 extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_VERSION;
 extern const ngx_str_t NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL;
+extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS;
 
 //header values
 extern const  ngx_str_t NCHAN_CACHE_CONTROL_VALUE;
@@ -79,6 +82,7 @@ extern const  ngx_str_t NCHAN_CACHE_CONTROL_VALUE;
 extern const  ngx_str_t NCHAN_HTTP_STATUS_101;
 extern const  ngx_str_t NCHAN_HTTP_STATUS_204;
 extern const  ngx_str_t NCHAN_HTTP_STATUS_304;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_400;
 extern const  ngx_str_t NCHAN_HTTP_STATUS_408;
 extern const  ngx_str_t NCHAN_HTTP_STATUS_409;
 extern const  ngx_str_t NCHAN_HTTP_STATUS_410;
@@ -91,7 +95,10 @@ extern const ngx_str_t NCHAN_WEBSOCKET;
 extern const ngx_str_t NCHAN_ANYSTRING;
 extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS;
 extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS;
+extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBSUB_HEADERS;
+extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_GROUP_HEADERS;
 extern const ngx_str_t NCHAN_ALLOW_GET_POST_PUT_DELETE;
+extern const ngx_str_t NCHAN_ALLOW_GET_POST_DELETE;
 extern const ngx_str_t NCHAN_ALLOW_GET;
 extern const ngx_str_t NCHAN_VARY_HEADER_VALUE;
 extern const ngx_str_t NCHAN_MSG_RESPONSE_ALLOWED_HEADERS;
diff --git a/debian/modules/nchan/src/nchan_module.c b/debian/modules/nchan/src/nchan_module.c
old mode 100755
new mode 100644
index ff97852..4555c5d
--- a/debian/modules/nchan/src/nchan_module.c
+++ b/debian/modules/nchan/src/nchan_module.c
@@ -13,11 +13,17 @@
 #include <subscribers/http-multipart-mixed.h>
 #include <subscribers/http-raw-stream.h>
 #include <subscribers/websocket.h>
+#include <subscribers/benchmark.h>
 #include <store/memory/store.h>
 #include <store/redis/store.h>
 
 #include <nchan_setup.c>
 
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
+
+
 #if FAKESHARD
 #include <store/memory/ipc.h>
 #include <store/memory/shmem.h>
@@ -30,6 +36,9 @@ ngx_int_t           nchan_worker_processes;
 int                 nchan_stub_status_enabled = 0;
 
 
+static void nchan_publisher_body_handler(ngx_http_request_t *r);
+static void nchan_publisher_unavailable_body_handler(ngx_http_request_t *r);
+
 //#define DEBUG_LEVEL NGX_LOG_WARN
 //#define DEBUG_LEVEL NGX_LOG_DEBUG
 
@@ -55,8 +64,6 @@ ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *r, channel_
   static ngx_str_t evt_chan_publish= ngx_string("channel_publish");
   static ngx_str_t evt_chan_delete = ngx_string("channel_delete");
 
-  struct timeval             tv;
-  
   nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
   ngx_http_complex_value_t  *cv = cf->channel_events_channel_id;
   if(cv==NULL) {
@@ -70,7 +77,6 @@ ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *r, channel_
   ngx_str_t                 *id;
   u_char                    *cur;
   ngx_str_t                  evstr;
-  ngx_buf_t                  buf;
   nchan_msg_t                msg;
   
   switch(event_type) {
@@ -113,21 +119,22 @@ ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *r, channel_
   
   //the event message
   ngx_http_complex_value(r, cf->channel_event_string, &evstr);
-  ngx_memzero(&buf, sizeof(buf)); //do we really need this?...
-  buf.temporary = 1;
-  buf.memory = 1;
-  buf.last_buf = 1;
-  buf.pos = evstr.data;
-  buf.last = evstr.data + evstr.len;
-  buf.start = buf.pos;
-  buf.end = buf.last;
   
   ngx_memzero(&msg, sizeof(msg));
-  ngx_gettimeofday(&tv);
-  msg.id.time = tv.tv_sec;
-  msg.id.tagcount = 1;
-  msg.buf = &buf;
   
+  msg.buf.temporary = 1;
+  msg.buf.memory = 1;
+  msg.buf.last_buf = 1;
+  msg.buf.pos = evstr.data;
+  msg.buf.last = evstr.data + evstr.len;
+  msg.buf.start = msg.buf.pos;
+  msg.buf.end = msg.buf.last;
+  
+  msg.id.time = 0;
+  msg.id.tag.fixed[0] = 0;
+  msg.id.tagactive = 0;
+  msg.id.tagcount = 1;
+  msg.storage = NCHAN_MSG_STACK;
   
   if(evcf == NULL) {
     evcf = &evcf_data;
@@ -201,9 +208,7 @@ ngx_int_t nchan_loc_conf_max_messages(nchan_loc_conf_t *cf) {
   return num;
 }
 
-static void nchan_publisher_body_handler(ngx_http_request_t *r);
-
-static ngx_int_t nchan_http_publisher_handler(ngx_http_request_t * r) {
+static ngx_int_t nchan_http_publisher_handler(ngx_http_request_t * r, void (*body_handler)(ngx_http_request_t *r)) {
   ngx_int_t                       rc;
   nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
   
@@ -211,7 +216,7 @@ static ngx_int_t nchan_http_publisher_handler(ngx_http_request_t * r) {
   
   if(ctx) ctx->publisher_type = &publisher_name;
   
-  /* Instruct ngx_http_read_subscriber_request_body to store the request
+  /* Instruct ngx_http_read_client_request_body to store the request
      body entirely in a memory buffer or in a file */
   r->request_body_in_single_buf = 1;
   r->request_body_in_persistent_file = 1;
@@ -221,7 +226,7 @@ static ngx_int_t nchan_http_publisher_handler(ngx_http_request_t * r) {
   //don't buffer the request body --send it right on through
   //r->request_body_no_buffering = 1;
 
-  rc = ngx_http_read_client_request_body(r, nchan_publisher_body_handler);
+  rc = ngx_http_read_client_request_body(r, body_handler);
   if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
     return rc;
   }
@@ -233,11 +238,14 @@ ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r) {
   ngx_chain_t          out;
   nchan_stub_status_t *stats;
   
-  float                shmem_used;
+  nchan_main_conf_t   *mcf = ngx_http_get_module_main_conf(r, ngx_nchan_module);
+  
+  float                shmem_used, shmem_max;
   
   char     *buf_fmt = "total published messages: %ui\n"
                       "stored messages: %ui\n"
                       "shared memory used: %fK\n"
+                      "shared memory limit: %fK\n"
                       "channels: %ui\n"
                       "subscribers: %ui\n"
                       "redis pending commands: %ui\n"
@@ -246,7 +254,8 @@ ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r) {
                       "interprocess alerts in transit: %ui\n"
                       "interprocess queued alerts: %ui\n"
                       "total interprocess send delay: %ui\n"
-                      "total interprocess receive delay: %ui\n";
+                      "total interprocess receive delay: %ui\n"
+                      "nchan version: %s\n";
   
   if ((b = ngx_pcalloc(r->pool, sizeof(*b) + 800)) == NULL) {
     nchan_log_request_error(r, "Failed to allocate response buffer for nchan_stub_status.");
@@ -254,13 +263,14 @@ ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r) {
   }
   
   shmem_used = (float )((float )nchan_get_used_shmem() / 1024.0);
+  shmem_max = (float )((float )mcf->shm_size / 1024.0);
   
   stats = nchan_get_stub_status_stats();
   
   b->start = (u_char *)&b[1];
   b->pos = b->start;
   
-  b->end = ngx_snprintf(b->start, 800, buf_fmt, stats->total_published_messages, stats->messages, shmem_used, stats->channels, stats->subscribers, stats->redis_pending_commands, stats->redis_connected_servers, stats->ipc_total_alerts_received, stats->ipc_total_alerts_sent - stats->ipc_total_alerts_received, stats->ipc_queue_size, stats->ipc_total_send_delay, stats->ipc_total_receive_delay);
+  b->end = ngx_snprintf(b->start, 800, buf_fmt, stats->total_published_messages, stats->messages, shmem_used, shmem_max, stats->channels, stats->subscribers, stats->redis_pending_commands, stats->redis_connected_servers, stats->ipc_total_alerts_received, stats->ipc_total_alerts_sent - stats->ipc_total_alerts_received, stats->ipc_queue_size, stats->ipc_total_send_delay, stats->ipc_total_receive_delay, NCHAN_VERSION);
   b->last = b->end;
 
   b->memory = 1;
@@ -336,6 +346,133 @@ int nchan_parse_message_buffer_config(ngx_http_request_t *r, nchan_loc_conf_t *c
   return 1;
 }
 
+static ngx_int_t group_handler_callback(ngx_int_t status, nchan_group_t *group, ngx_http_request_t *r) {
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  if(!group) {
+    group = ngx_pcalloc(r->pool, sizeof(*group));
+  }
+  
+  if(!ctx->request_ran_content_handler) {
+    r->main->count--;
+    nchan_group_info(r, group);
+  }
+  else {
+    nchan_http_finalize_request(r, nchan_group_info(r, group));
+  }
+  
+  
+  
+  return NGX_OK;
+}
+
+
+static ngx_int_t parse_size_limit(u_char *data, size_t len) {
+  ngx_str_t  str;
+  str.data = data;
+  str.len = len;
+  return nchan_parse_size(&str);
+}
+
+static ngx_int_t set_group_num_limit(ngx_http_request_t *r, ngx_http_complex_value_t *cv, ngx_atomic_int_t *dst, ngx_int_t (*parsefunc)(u_char *, size_t), char *errstr) {
+  ngx_str_t               tmp;
+  ngx_int_t               num;
+  if(cv) {
+    ngx_http_complex_value(r, cv, &tmp);
+    if(tmp.len == 0) {
+      *dst = -1;
+      return 1;
+    }
+    else if((num = parsefunc(tmp.data, tmp.len)) == NGX_ERROR || num < 0) {
+      nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, errstr, 0);
+      return 0;
+    }
+    *dst = num;
+  }
+  else {
+    *dst = -1;
+  }
+  return 1;
+}
+
+static ngx_int_t parse_group_limits(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_group_limits_t *limits) {
+  set_group_num_limit(r, cf->group.max_channels, &limits->channels, ngx_atoi, "invalid nchan_group_max_channels value");
+  set_group_num_limit(r, cf->group.max_subscribers, &limits->subscribers, ngx_atoi, "invalid nchan_group_max_subscribers value");
+  set_group_num_limit(r, cf->group.max_messages, &limits->messages, ngx_atoi, "invalid nchan_group_max_messages value");
+  set_group_num_limit(r, cf->group.max_messages_shm_bytes, &limits->messages_shmem_bytes, parse_size_limit, "invalid nchan_group_max_messages_memory value");
+  set_group_num_limit(r, cf->group.max_messages_file_bytes, &limits->messages_file_bytes, parse_size_limit, "invalid nchan_group_max_messages_disk value");
+  
+  return r->headers_out.status != NGX_HTTP_FORBIDDEN ? NGX_OK : NGX_ERROR;
+}
+
+ngx_int_t nchan_group_handler(ngx_http_request_t *r) {
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  nchan_request_ctx_t    *ctx;
+  ngx_int_t               rc = NGX_DONE;
+  ngx_str_t              *group;
+  
+  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
+  
+  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
+    ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+    return NGX_ERROR;
+  }
+  
+  if(!cf->group.enable_accounting) {
+    nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Channel group accounting is disabled.", 0);
+    return NGX_OK;
+  }
+  
+  group = nchan_get_group_name(r, cf, ctx);
+  if(group == NULL) {
+    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "No group specified", 0);
+    return NGX_OK;
+  }
+  
+  switch(r->method) {
+    case NGX_HTTP_GET:
+      if(!cf->group.get) {
+        rc = nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+      }
+      r->main->count++;
+      cf->storage_engine->get_group(group, cf, (callback_pt )group_handler_callback, r);
+      
+      break;
+      
+    case NGX_HTTP_POST:
+      if(!cf->group.set) {
+        rc = nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+      }
+      
+      nchan_group_limits_t     limits;
+      
+      if(parse_group_limits(r, cf, &limits) != NGX_OK) {
+        return NGX_OK;
+      }
+      
+      r->main->count++;
+      cf->storage_engine->set_group_limits(group, cf, &limits, (callback_pt )group_handler_callback, r);
+      break;
+      
+    case NGX_HTTP_DELETE:
+      if(!cf->group.delete) {
+        rc = nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+      }
+      r->main->count++;
+      cf->storage_engine->delete_group(group, cf, (callback_pt )group_handler_callback, r);
+      break;
+      
+    case NGX_HTTP_OPTIONS:
+        rc= nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_GROUP_HEADERS, &NCHAN_ALLOW_GET_POST_DELETE);
+      break;
+  }
+  ctx->request_ran_content_handler = 1;
+  return rc;
+}
+
 ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
   nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
   ngx_str_t              *channel_id;
@@ -343,47 +480,55 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
   nchan_msg_id_t         *msg_id;
   ngx_int_t               rc = NGX_DONE;
   nchan_request_ctx_t    *ctx;
-  ngx_str_t              *origin_header;
+  nchan_group_limits_t    group_limits;
   
-#if NCHAN_BENCHMARK
-  struct timeval          tv;
-  ngx_gettimeofday(&tv);
-#endif
+  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
+    ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+    return NGX_ERROR;
+  }  
   
   if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
     return NGX_HTTP_INTERNAL_SERVER_ERROR;
   }
   ngx_http_set_ctx(r, ctx, ngx_nchan_module);
 
-#if NCHAN_BENCHMARK
-  ctx->start_tv = tv;
-#endif
-  
   //X-Accel-Redirected requests get their method mangled to GET. De-mangle it if necessary
   if(r->upstream && r->upstream->headers_in.x_accel_redirect) {
     //yep, we got x-accel-redirected. what was the original method?...
     nchan_recover_x_accel_redirected_request_method(r);
   }
   
-  if((origin_header = nchan_get_header_value(r, NCHAN_HEADER_ORIGIN)) != NULL) {
-    ctx->request_origin_header = *origin_header;
-    if(!(cf->allow_origin.len == 1 && cf->allow_origin.data[0] == '*')) {
-      if(!(origin_header->len == cf->allow_origin.len && ngx_strnstr(origin_header->data, (char *)cf->allow_origin.data, origin_header->len) != NULL)) {
-        //CORS origin match failed! return a 403 forbidden
-        goto forbidden;
-      }
-    }
-  }
-  else {
-    ctx->request_origin_header.len=0;
-    ctx->request_origin_header.data=NULL;
+  if(!nchan_match_origin_header(r, cf, ctx)) {
+    goto forbidden;
   }
   
-  if((channel_id = nchan_get_channel_id(r, SUB, 1)) == NULL) {
-    //just get the subscriber_channel_id for now. the publisher one is handled elsewhere
-    return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
+  if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
+    goto bad_msgid;
   }
-
+  
+  if(parse_group_limits(r, cf, &group_limits) == NGX_OK) {
+    // unless the group already exists, these limits may only be set after this incoming request.
+    // TODO: fix this, although that will lead to even gnarlier control flow.
+    cf->storage_engine->set_group_limits(nchan_get_group_name(r, cf, ctx), cf, &group_limits, NULL, NULL);
+  }
+  else {
+    // there waas an error parsing group limit strings, and it has already been sent in the response. 
+    // just quit.
+    return NGX_OK;
+  }
+  
+  if(cf->redis.enabled && !nchan_store_redis_ready(cf)) {
+    //using redis, and it's not ready yet
+    if(r->method == NGX_HTTP_POST || r->method == NGX_HTTP_PUT) {
+      //discard request body before responding
+      nchan_http_publisher_handler(r, nchan_publisher_unavailable_body_handler);
+    }
+    else {
+      nchan_respond_status(r, NGX_HTTP_SERVICE_UNAVAILABLE, NULL, NULL, 0);
+    }
+    return NGX_OK;
+  }
+  
   if(cf->pub.websocket || cf->pub.http) {
     char *err;
     if(!nchan_parse_message_buffer_config(r, cf, &err)) {
@@ -392,7 +537,7 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
         return NGX_OK;
       }
       else {
-        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 0);
+        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
         return NGX_OK;
       }
     }
@@ -402,6 +547,10 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
     //want websocket?
     if(cf->sub.websocket) {
       //we prefer to subscribe
+      if((channel_id = nchan_get_channel_id(r, SUB, 1)) == NULL) {
+        return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
+      }
+      
 #if FAKESHARD
       memstore_sub_debug_start();
 #endif
@@ -412,7 +561,9 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
         nchan_log_request_error(r, "unable to create websocket subscriber");
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
       }
-      sub->fn->subscribe(sub, channel_id);
+      if(sub->fn->subscribe(sub, channel_id) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+      }
 #if FAKESHARD      
       memstore_sub_debug_end();
 #endif
@@ -448,25 +599,31 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
           sub_create = longpoll_subscriber_create;
         }
         else if(cf->pub.http) {
-          nchan_http_publisher_handler(r);
+          nchan_http_publisher_handler(r, nchan_publisher_body_handler);
         }
         else {
           goto forbidden;
         }
         
         if(sub_create) {
+          if((channel_id = nchan_get_channel_id(r, SUB, 1)) == NULL) {
+            return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
+          }
 #if FAKESHARD
           memstore_sub_debug_start();
 #endif
           if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
             goto bad_msgid;
           }
+          
           if((sub = sub_create(r, msg_id)) == NULL) {
             nchan_log_request_error(r, "unable to create subscriber");
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
           }
           
-          sub->fn->subscribe(sub, channel_id);
+          if(sub->fn->subscribe(sub, channel_id) != NGX_OK) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+          }
 #if FAKESHARD
           memstore_sub_debug_end();
 #endif
@@ -477,24 +634,27 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
       case NGX_HTTP_POST:
       case NGX_HTTP_PUT:
         if(cf->pub.http) {
-          nchan_http_publisher_handler(r);
+          nchan_http_publisher_handler(r, nchan_publisher_body_handler);
         }
         else goto forbidden;
         break;
       
       case NGX_HTTP_DELETE:
         if(cf->pub.http) {
-          nchan_http_publisher_handler(r);
+          nchan_http_publisher_handler(r, nchan_publisher_body_handler);
         }
         else goto forbidden;
         break;
       
       case NGX_HTTP_OPTIONS:
-        if(cf->pub.http) {
-          nchan_OPTIONS_respond(r, &cf->allow_origin, &NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS, &NCHAN_ALLOW_GET_POST_PUT_DELETE);
+        if(cf->pub.http && (cf->sub.poll || cf->sub.longpoll || cf->sub.eventsource || cf->sub.websocket)) {
+          nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_PUBSUB_HEADERS, &NCHAN_ALLOW_GET_POST_PUT_DELETE);
+        }
+        else if(cf->pub.http) {
+          nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS, &NCHAN_ALLOW_GET_POST_PUT_DELETE);
         }
         else if(cf->sub.poll || cf->sub.longpoll || cf->sub.eventsource || cf->sub.websocket) {
-          nchan_OPTIONS_respond(r, &cf->allow_origin, &NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS, &NCHAN_ALLOW_GET);
+          nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS, &NCHAN_ALLOW_GET);
         }
         else goto forbidden;
         break;
@@ -504,7 +664,7 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
   return rc;
   
 forbidden:
-  nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, 0);
+  nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
   ctx->request_ran_content_handler = 1;
   return NGX_OK;
 
@@ -520,7 +680,12 @@ static ngx_int_t channel_info_callback(ngx_int_t status, void *rptr, void *pd) {
   if(r == NULL) {
     return NGX_ERROR;
   }
-  nchan_http_finalize_request(r, nchan_response_channel_ptr_info( (nchan_channel_t *)rptr, r, 0));
+  if(status>=500 && status <= 599) {
+    nchan_http_finalize_request(r, status);
+  }
+  else {
+    nchan_http_finalize_request(r, nchan_response_channel_ptr_info( (nchan_channel_t *)rptr, r, 0));
+  }
   return NGX_OK;
 }
 
@@ -567,9 +732,10 @@ static ngx_http_request_t *nchan_get_safe_request_ptr(safe_request_ptr_t *d) {
 }
 
 
-static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, safe_request_ptr_t *pd) {
+static ngx_int_t publish_callback(ngx_int_t status, void *data, safe_request_ptr_t *pd) {
   nchan_request_ctx_t   *ctx;
   static nchan_msg_id_t  empty_msgid = NCHAN_ZERO_MSGID;
+  nchan_channel_t       *ch = data;
   
   ngx_http_request_t    *r = nchan_get_safe_request_ptr(pd);
   
@@ -599,19 +765,34 @@ static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, safe_re
       return NGX_OK;
       
     case NGX_ERROR:
+      status = NGX_HTTP_INTERNAL_SERVER_ERROR;
+      /*fallthrough*/
+    case NGX_HTTP_INSUFFICIENT_STORAGE:
     case NGX_HTTP_INTERNAL_SERVER_ERROR:
+    case NGX_HTTP_SERVICE_UNAVAILABLE:
       //WTF?
-      nchan_log_request_error(r, "error publishing message");
-      ctx->prev_msg_id = empty_msgid;;
+      nchan_log_request_error(r, "error publishing message (HTTP status code %i)", status);
+      ctx->prev_msg_id = empty_msgid;
       ctx->msg_id = empty_msgid;
-      nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+      nchan_http_finalize_request(r, status);
       return NGX_ERROR;
       
+    case NGX_HTTP_FORBIDDEN:
+      ctx->prev_msg_id = empty_msgid;
+      ctx->msg_id = empty_msgid;
+      if(data) {
+        nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, (char *)data, 1);
+      }
+      else {
+        nchan_http_finalize_request(r, NGX_HTTP_FORBIDDEN);
+      }
+      return NGX_OK;
+      
     default:
       //for debugging, mostly. I don't expect this branch to behit during regular operation
       ctx->prev_msg_id = empty_msgid;;
       ctx->msg_id = empty_msgid;
-      nchan_log_request_error(r, "TOTALLY UNEXPECTED error publishing message, status code %i", status);
+      nchan_log_request_error(r, "TOTALLY UNEXPECTED error publishing message (HTTP status code %i)", status);
       nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
       return NGX_ERROR;
   }
@@ -619,7 +800,6 @@ static ngx_int_t publish_callback(ngx_int_t status, nchan_channel_t *ch, safe_re
 
 static void nchan_publisher_post_request(ngx_http_request_t *r, ngx_str_t *content_type, size_t content_length, ngx_chain_t *request_body_chain, ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
   ngx_buf_t                      *buf;
-  struct timeval                  tv;
   nchan_msg_t                    *msg;
   ngx_str_t                      *eventsource_event;
   
@@ -633,19 +813,19 @@ static void nchan_publisher_post_request(ngx_http_request_t *r, ngx_str_t *conte
     nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
     return; 
   }
-  msg->shared = 0;
+  msg->storage = NCHAN_MSG_POOL;
   
   
   if(cf->eventsource_event.len > 0) {
-    msg->eventsource_event = cf->eventsource_event;
+    msg->eventsource_event = &cf->eventsource_event;
   }
   else if((eventsource_event = nchan_get_header_value(r, NCHAN_HEADER_EVENTSOURCE_EVENT)) != NULL) {
-    msg->eventsource_event = *eventsource_event;
+    msg->eventsource_event = eventsource_event;
   }
   
   //content type
   if(content_type) {
-    msg->content_type = *content_type;
+    msg->content_type = content_type;
   }
   
   if(content_length == 0) {
@@ -660,22 +840,16 @@ static void nchan_publisher_post_request(ngx_http_request_t *r, ngx_str_t *conte
     return;
   }
   
-  ngx_gettimeofday(&tv);
-  msg->id.time = tv.tv_sec;
+  msg->id.time = 0;
   msg->id.tag.fixed[0] = 0;
   msg->id.tagactive = 0;
   msg->id.tagcount = 1;
   
-  msg->buf = buf;
+  msg->buf = *buf;
 #if NCHAN_MSG_LEAK_DEBUG
   msg->lbl = r->uri;
 #endif
-#if NCHAN_BENCHMARK
-  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  msg->start_tv = ctx->start_tv;
-#endif
-  
-  
+  nchan_deflate_message_if_needed(msg, cf, r, r->pool);
   if((pd = nchan_set_safe_request_ptr(r)) == NULL) {
     return;
   }
@@ -715,7 +889,11 @@ static ngx_int_t nchan_publisher_upstream_handler(ngx_http_request_t *sr, void *
         if(sr->upstream) {
           content_type = (sr->upstream->headers_in.content_type ? &sr->upstream->headers_in.content_type->value : NULL);
           content_length = nchan_subrequest_content_length(sr);
+#if nginx_version >= 1013010
+          request_chain = sr->out;
+#else
           request_chain = sr->upstream->out_bufs;
+#endif
         }
         else {
           content_type = NULL;
@@ -793,7 +971,8 @@ static void nchan_publisher_body_handler_continued(ngx_http_request_t *r, ngx_st
         psrd->ch_id = channel_id;
         
         ngx_http_subrequest(r, &publisher_upstream_request_url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
-        nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, r->request_body, r->headers_in.content_length_n, NULL);
+        nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, r->request_body, r->headers_in.content_length_n);
+        sr->args = r->args;
       }
       break;
       
@@ -806,7 +985,7 @@ static void nchan_publisher_body_handler_continued(ngx_http_request_t *r, ngx_st
       break;
       
     default: 
-      nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, 0);
+      nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
   }
   
 }
@@ -841,6 +1020,11 @@ static ngx_int_t nchan_publisher_body_authorize_handler(ngx_http_request_t *r, v
   return NGX_OK;
 }
 
+static void nchan_publisher_unavailable_body_handler(ngx_http_request_t *r) {
+  nchan_http_finalize_request(r, NGX_HTTP_SERVICE_UNAVAILABLE);
+  return;
+}
+
 static void nchan_publisher_body_handler(ngx_http_request_t *r) {
   ngx_str_t                      *channel_id;
   nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
@@ -902,72 +1086,22 @@ static void nchan_publisher_body_handler(ngx_http_request_t *r) {
   }
 }
 
-#if NCHAN_BENCHMARK
-int nchan_timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y) {
-  /* Perform the carry for the later subtraction by updating y. */
-  if (x->tv_usec < y->tv_usec) {
-    int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
-    y->tv_usec -= 1000000 * nsec;
-    y->tv_sec += nsec;
-  }
-  if (x->tv_usec - y->tv_usec > 1000000) {
-    int nsec = (x->tv_usec - y->tv_usec) / 1000000;
-    y->tv_usec += 1000000 * nsec;
-    y->tv_sec -= nsec;
-  }
-
-  /* Compute the time remaining to wait.
-     tv_usec is certainly positive. */
-  result->tv_sec = x->tv_sec - y->tv_sec;
-  result->tv_usec = x->tv_usec - y->tv_usec;
-
-  /* Return 1 if result is negative. */
-  return x->tv_sec < y->tv_sec;
-}
-#endif
-
-
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-
-subscriber_t *subdebug_head = NULL;
-
-void subscriber_debug_add(subscriber_t *sub) {
-  if(subdebug_head == NULL) {
-    sub->dbg_next = NULL;
-    sub->dbg_prev = NULL;
-  }
-  else {
-    sub->dbg_next = subdebug_head;
-    sub->dbg_prev = NULL;
-    assert(subdebug_head->dbg_prev == NULL);
-    subdebug_head->dbg_prev = sub;
-  }
-  subdebug_head = sub;
-}
-void subscriber_debug_remove(subscriber_t *sub) {
-  subscriber_t *prev, *next;
-  prev = sub->dbg_prev;
-  next = sub->dbg_next;
-  if(subdebug_head == sub) {
-    assert(sub->dbg_prev == NULL);
-    if(next) {
-      next->dbg_prev = NULL;
-    }
-    subdebug_head = next;
-  }
-  else {
-    if(prev) {
-      prev->dbg_next = next;
-    }
-    if(next) {
-      next->dbg_prev = prev;
-    }
-  }
+ngx_int_t nchan_benchmark_handler(ngx_http_request_t *r) {
+  nchan_request_ctx_t    *ctx;
   
-  sub->dbg_next = NULL;
-  sub->dbg_prev = NULL;
+  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
+  
+  return nchan_benchmark_ws_initialize(r);
+  
+  /*
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  return nchan_benchmark_initialize(r);
+  */
 }
-void subscriber_debug_assert_isempty(void) {
-  assert(subdebug_head == NULL);
-}
-#endif
diff --git a/debian/modules/nchan/src/nchan_module.h b/debian/modules/nchan/src/nchan_module.h
index 8c1aafb..b337e54 100644
--- a/debian/modules/nchan/src/nchan_module.h
+++ b/debian/modules/nchan/src/nchan_module.h
@@ -3,17 +3,17 @@
 //#define NCHAN_SUBSCRIBER_LEAK_DEBUG 1
 //#define NCHAN_MSG_RESERVE_DEBUG 1
 //#define NCHAN_MSG_LEAK_DEBUG 1
-//#define NCHAN_BENCHMARK 1
 
 //debugging config
 //#define FAKESHARD 1
+//#define FAKE_SHMEM 1
 #if FAKESHARD
 //#define PUB_FAKE_WORKER 0
 //#define SUB_FAKE_WORKER 1
 //#define ONE_FAKE_CHANNEL_OWNER 2
 #define MAX_FAKE_WORKERS 5
 #endif
-
+#include <nchan_version.h>
 #include <ngx_http.h>
 
 //building for old versions
@@ -30,9 +30,10 @@
 #include <nchan_defs.h>
 #include <util/nchan_util.h>
 #include <util/nchan_channel_id.h>
-#include <util/nchan_channel_info.h>
-#include <util/nchan_msgid.h>
+#include <util/nchan_output_info.h>
+#include <util/nchan_msg.h>
 #include <util/nchan_output.h>
+#include <util/nchan_debug.h>
 
 extern ngx_pool_t *nchan_pool;
 extern ngx_int_t nchan_worker_processes;
@@ -43,7 +44,8 @@ extern int nchan_stub_status_enabled;
 
 ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r);
 ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r);
-ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type);
+ngx_int_t nchan_group_handler(ngx_http_request_t *r);
+ngx_int_t nchan_benchmark_handler(ngx_http_request_t *r);
 
 time_t nchan_loc_conf_message_timeout(nchan_loc_conf_t *cf);
 ngx_int_t nchan_loc_conf_max_messages(nchan_loc_conf_t *cf);
@@ -55,23 +57,13 @@ void __memstore_update_stub_status(off_t offset, int count);
 nchan_stub_status_t *nchan_get_stub_status_stats(void);
 size_t nchan_get_used_shmem(void);
 
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-void subscriber_debug_add(subscriber_t *);
-void subscriber_debug_remove(subscriber_t *);
-void subscriber_debug_assert_isempty(void);
-#endif
-
-#if NCHAN_BENCHMARK
-int nchan_timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
-#endif
-
-#define nchan_log_notice(fmt, args...)  ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0, "nchan: " fmt, ##args)
-#define nchan_log_warning(fmt, args...) ngx_log_error(NGX_LOG_WARN,   ngx_cycle->log, 0, "nchan: " fmt, ##args)
-#define nchan_log_error(fmt, args...)   ngx_log_error(NGX_LOG_ERR,    ngx_cycle->log, 0, "nchan: " fmt, ##args)
-#define nchan_log_request_warning(request, fmt, args...) ngx_log_error(NGX_LOG_WARN, (request)->connection->log, 0, "nchan: " fmt, ##args)
-#define nchan_log_request_error(request, fmt, args...)    ngx_log_error(NGX_LOG_ERR, (request)->connection->log, 0, "nchan: " fmt, ##args)
-
 #define nchan_log(level, log, errno, fmt, args...) ngx_log_error(level, log, errno, "nchan: " fmt, ##args)
+#define nchan_log_notice(fmt, args...) nchan_log(NGX_LOG_NOTICE, ngx_cycle->log, 0, fmt, ##args)
+#define nchan_log_warning(fmt, args...) nchan_log(NGX_LOG_WARN, ngx_cycle->log, 0, fmt, ##args)
+#define nchan_log_error(fmt, args...) nchan_log(NGX_LOG_ERR, ngx_cycle->log, 0, fmt, ##args)
+#define nchan_log_ooshm_error(fmt, args...) nchan_log(NGX_LOG_ERR, ngx_cycle->log, 0, "Out of shared memory while " fmt ". Increase nchan_max_reserved_memory.", ##args)
 
+#define nchan_log_request_warning(request, fmt, args...) ngx_log_error(NGX_LOG_WARN, (request)->connection->log, 0, "nchan: " fmt, ##args)
+#define nchan_log_request_error(request, fmt, args...)    ngx_log_error(NGX_LOG_ERR, ((request) ? (request)->connection->log : ngx_cycle->log), 0, "nchan: " fmt, ##args)
 
 #endif /*NCHAN_MODULE_H*/
diff --git a/debian/modules/nchan/src/nchan_setup.c b/debian/modules/nchan/src/nchan_setup.c
index e083e31..8d416a0 100644
--- a/debian/modules/nchan/src/nchan_setup.c
+++ b/debian/modules/nchan/src/nchan_setup.c
@@ -4,20 +4,46 @@
 #include <nchan_variables.h>
 #include <store/memory/store.h>
 #include <store/redis/store.h>
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
 
 static ngx_str_t      DEFAULT_CHANNEL_EVENT_STRING = ngx_string("$nchan_channel_event $nchan_channel_id");
 
 nchan_store_t   *default_storage_engine = &nchan_store_memory;
+ngx_flag_t       global_nchan_enabled = 0;
 ngx_flag_t       global_redis_enabled = 0;
+ngx_flag_t       global_zstream_needed = 0;
+ngx_flag_t       global_benchmark_enabled = 0;
+void            *global_owner_cycle = NULL;
+
+#define MERGE_UNSET_CONF(conf, prev, unset, default)         \
+if (conf == unset) {                                         \
+  conf = (prev == unset) ? default : prev;                   \
+}
 
 #define MERGE_CONF(cf, prev_cf, name) if((cf)->name == NULL) { (cf)->name = (prev_cf)->name; }
 
 static ngx_int_t nchan_init_module(ngx_cycle_t *cycle) {
-  ngx_core_conf_t                *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  if(global_owner_cycle && global_owner_cycle != ngx_cycle) {
+    global_nchan_enabled = 0;
+    global_redis_enabled = 0;
+    global_zstream_needed = 0;
+    global_benchmark_enabled = 0;
+  }
+  global_owner_cycle = (void *)ngx_cycle;
+  
+  if(!global_nchan_enabled) {
+    return NGX_OK;
+  }
+  ngx_core_conf_t         *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
   nchan_worker_processes = ccf->worker_processes;
   
   //initialize storage engines
   nchan_store_memory.init_module(cycle);
+  if(global_benchmark_enabled) {
+    nchan_benchmark_init_module(cycle);
+  }
   if(global_redis_enabled) {
     nchan_store_redis.init_module(cycle);
   }
@@ -25,6 +51,9 @@ static ngx_int_t nchan_init_module(ngx_cycle_t *cycle) {
 }
 
 static ngx_int_t nchan_init_worker(ngx_cycle_t *cycle) {
+  if(!global_nchan_enabled) {
+    return NGX_OK;
+  }
   if (ngx_process != NGX_PROCESS_WORKER && ngx_process != NGX_PROCESS_SINGLE) {
     //not a worker, stop initializing stuff.
     return NGX_OK;
@@ -33,6 +62,9 @@ static ngx_int_t nchan_init_worker(ngx_cycle_t *cycle) {
   if(nchan_store_memory.init_worker(cycle)!=NGX_OK) {
     return NGX_ERROR;
   }
+  if(global_benchmark_enabled) {
+    nchan_benchmark_init_worker(cycle);
+  }
   
   if(global_redis_enabled && nchan_store_redis.init_worker(cycle)!=NGX_OK) {
     return NGX_ERROR;
@@ -44,13 +76,30 @@ static ngx_int_t nchan_init_worker(ngx_cycle_t *cycle) {
   return NGX_OK;
 }
 
+static ngx_int_t nchan_preconfig(ngx_conf_t *cf) {
+  global_owner_cycle = (void *)ngx_cycle;
+  global_nchan_enabled = 0;
+  return nchan_add_variables(cf);
+}
+
 static ngx_int_t nchan_postconfig(ngx_conf_t *cf) {
+  global_owner_cycle = (void *)ngx_cycle;
   if(nchan_store_memory.init_postconfig(cf)!=NGX_OK) {
     return NGX_ERROR;
   }
   if(global_redis_enabled && nchan_store_redis.init_postconfig(cf)!=NGX_OK) {
     return NGX_ERROR;
   }
+  
+#if (NGX_ZLIB)
+  if(global_zstream_needed) {
+    nchan_main_conf_t  *mcf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
+    nchan_common_deflate_init(mcf);
+  }
+#endif
+  
+  global_nchan_enabled = 1;
+  
   return NGX_OK;
 }
 
@@ -60,12 +109,45 @@ static void * nchan_create_main_conf(ngx_conf_t *cf) {
   if(mcf == NULL) {
     return NGX_CONF_ERROR;
   }
+  
+  static ngx_path_init_t nchan_temp_path = { ngx_string(NGX_HTTP_CLIENT_TEMP_PATH), { 0, 0, 0 } };
+  ngx_conf_merge_path_value(cf, &mcf->message_temp_path, NULL, &nchan_temp_path);
+  
   nchan_store_memory.create_main_conf(cf, mcf);
   nchan_store_redis.create_main_conf(cf, mcf);
   
+#if (NGX_ZLIB)
+  mcf->zlib_params.level = Z_DEFAULT_COMPRESSION;
+  mcf->zlib_params.windowBits = 10;
+  mcf->zlib_params.memLevel = 8;
+  mcf->zlib_params.strategy = Z_DEFAULT_STRATEGY;
+#endif
+  
   return mcf;
 }
 
+static void *nchan_create_srv_conf(ngx_conf_t *cf) {
+  nchan_srv_conf_t       *scf = ngx_pcalloc(cf->pool, sizeof(*scf));
+  if(scf == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  scf->redis.connect_timeout = NGX_CONF_UNSET_MSEC;
+  scf->redis.optimize_target = NCHAN_REDIS_OPTIMIZE_UNSET;
+  scf->redis.master_weight = NGX_CONF_UNSET;
+  scf->redis.slave_weight = NGX_CONF_UNSET;
+  scf->upstream_nchan_loc_conf = NULL;
+  return scf;
+}
+
+static char *nchan_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) {
+  nchan_srv_conf_t       *prev = parent, *conf = child;
+  ngx_conf_merge_msec_value(conf->redis.connect_timeout, prev->redis.connect_timeout, NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC);
+  MERGE_UNSET_CONF(conf->redis.optimize_target, prev->redis.optimize_target, NCHAN_REDIS_OPTIMIZE_UNSET, NCHAN_REDIS_OPTIMIZE_CPU);
+  ngx_conf_merge_value(conf->redis.master_weight, prev->redis.master_weight, 1);
+  ngx_conf_merge_value(conf->redis.slave_weight, prev->redis.slave_weight, 1);
+  return NGX_CONF_OK;
+}
+
 //location config stuff
 static void *nchan_create_loc_conf(ngx_conf_t *cf) {
   nchan_loc_conf_t       *lcf = ngx_pcalloc(cf->pool, sizeof(*lcf));
@@ -82,12 +164,16 @@ static void *nchan_create_loc_conf(ngx_conf_t *cf) {
   lcf->sub.websocket=0;
   lcf->sub.http_chunked=0;
   
+  // lcf->group is already zeroed
+  lcf->group.enable_accounting = NGX_CONF_UNSET;
+  
   lcf->shared_data_index=NGX_CONF_UNSET;
   
   lcf->authorize_request_url = NULL;
   lcf->publisher_upstream_request_url = NULL;
   lcf->unsubscribe_request_url = NULL;
   lcf->subscribe_request_url = NULL;
+  lcf->channel_group = NULL;
   
   lcf->message_timeout=NGX_CONF_UNSET;
   lcf->max_messages=NGX_CONF_UNSET;
@@ -107,11 +193,19 @@ static void *nchan_create_loc_conf(ngx_conf_t *cf) {
   
   lcf->websocket_ping_interval=NGX_CONF_UNSET;
   
+  lcf->eventsource_ping.interval=NGX_CONF_UNSET;
+  
   lcf->msg_in_etag_only = NGX_CONF_UNSET;
   
+  lcf->allow_origin = NULL;
+  lcf->allow_credentials = NGX_CONF_UNSET;
+  
   lcf->channel_events_channel_id = NULL;
   lcf->channel_event_string = NULL;
   
+  lcf->websocket_heartbeat.enabled=NGX_CONF_UNSET;
+  
+  lcf->message_compression = NCHAN_MSG_COMPRESSION_INVALID;
   
   lcf->longpoll_multimsg=NGX_CONF_UNSET;
   lcf->longpoll_multimsg_use_raw_stream_separator=NGX_CONF_UNSET;
@@ -125,7 +219,20 @@ static void *nchan_create_loc_conf(ngx_conf_t *cf) {
   lcf->redis.url_enabled=NGX_CONF_UNSET;
   lcf->redis.ping_interval = NGX_CONF_UNSET;
   lcf->redis.upstream_inheritable=NGX_CONF_UNSET;
+  lcf->redis.storage_mode = REDIS_MODE_CONF_UNSET;
+  lcf->redis.nostore_fastpublish = NGX_CONF_UNSET;
+  lcf->redis.privdata = NULL;
+  lcf->redis.nodeset = NULL;
   
+  lcf->request_handler = NULL;
+  
+  lcf->benchmark.time = NGX_CONF_UNSET;
+  lcf->benchmark.msgs_per_minute = NGX_CONF_UNSET;
+  lcf->benchmark.msg_padding = NGX_CONF_UNSET;
+  lcf->benchmark.channels = NGX_CONF_UNSET;
+  lcf->benchmark.subscribers_per_channel = NGX_CONF_UNSET;
+  lcf->benchmark.subscriber_distribution = NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_UNSET;
+  lcf->benchmark.publisher_distribution = NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_UNSET;
   return lcf;
 }
 
@@ -153,6 +260,36 @@ static char * create_complex_value_from_ngx_str(ngx_conf_t *cf, ngx_http_complex
   return NGX_CONF_OK;
 }
 
+static int is_pub_location(nchan_loc_conf_t *lcf) {
+  return lcf->pub.http || lcf->pub.websocket;
+}
+static int is_sub_location(nchan_loc_conf_t *lcf) {
+  nchan_conf_subscriber_types_t s = lcf->sub;
+  return s.poll || s.http_raw_stream || s.longpoll || s.http_chunked || s.http_multipart || s.eventsource || s.websocket;
+}
+static int is_group_location(nchan_loc_conf_t *lcf) {
+  return lcf->group.get || lcf->group.set || lcf->group.delete;
+}
+
+static int is_valid_location(ngx_conf_t *cf, nchan_loc_conf_t *lcf) {
+  
+  if(is_group_location(lcf)) {
+    if(is_pub_location(lcf) && is_sub_location(lcf)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a publisher and subscriber location and also be a group access location (nchan_group + nchan_publisher, nchan_subscriber or nchan_pubsub)");
+      return 0;
+    }
+    else if(is_pub_location(lcf)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a publisher location and also be a group access location (nchan_group + nchan_publisher)");
+      return 0;
+    }
+    else if(is_sub_location(lcf)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a subscriber location and also be a group access location (nchan_group + nchan_subscriber)");
+      return 0;
+    }
+  }
+  return 1;
+}
+
 static char *ngx_conf_set_redis_upstream(ngx_conf_t *cf, ngx_str_t *url, void *conf) {  
   ngx_url_t             upstream_url;
   nchan_loc_conf_t     *lcf = conf;
@@ -170,14 +307,43 @@ static char *ngx_conf_set_redis_upstream(ngx_conf_t *cf, ngx_str_t *url, void *c
   
   lcf->redis.enabled = 1;
   global_redis_enabled = 1;
-  nchan_store_redis_add_server_conf(cf, &lcf->redis, lcf);
+  nchan_store_redis_add_active_loc_conf(cf, lcf);
   
   return NGX_CONF_OK;
 }
 
+static char *nchan_setup_handler(ngx_conf_t *cf, ngx_int_t (*handler)(ngx_http_request_t *)) {
+  ngx_http_core_loc_conf_t       *clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+  //nchan_loc_conf_t               *plcf = conf;
+  clcf->handler = handler;
+  clcf->if_modified_since = NGX_HTTP_IMS_OFF;
+  
+  return NGX_CONF_OK;
+}
+
+static nchan_loc_conf_t *nchan_loc_conf_get_upstream_lcf(nchan_loc_conf_t *conf, nchan_loc_conf_t *prev) {
+  nchan_redis_conf_t *rcf = &conf->redis, *prev_rcf = &prev->redis;
+  if(rcf->upstream == prev_rcf->upstream || rcf->upstream == NULL) {
+    //same or no upstream, so don't bother
+    return NULL;
+  }
+  else {
+    assert(rcf->upstream);
+    nchan_srv_conf_t      *upstream_scf = ngx_http_conf_upstream_srv_conf(rcf->upstream, ngx_nchan_module);
+    if(upstream_scf && upstream_scf->upstream_nchan_loc_conf) {
+      return upstream_scf->upstream_nchan_loc_conf;
+    }
+    else {
+      //ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "nchan upstream srv_conf loc_conf ptr is null");
+      return NULL;
+    }
+  }
+}
+
+
 static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
   nchan_loc_conf_t       *prev = parent, *conf = child;
-  
+  nchan_loc_conf_t       *up = nchan_loc_conf_get_upstream_lcf(conf, prev);
   //publisher types
   ngx_conf_merge_bitmask_value(conf->pub.http, prev->pub.http, 0);
   ngx_conf_merge_bitmask_value(conf->pub.websocket, prev->pub.websocket, 0);
@@ -189,6 +355,20 @@ static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
   ngx_conf_merge_bitmask_value(conf->sub.http_chunked, prev->sub.http_chunked, 0);
   ngx_conf_merge_bitmask_value(conf->sub.websocket, prev->sub.websocket, 0);
   
+  //group request types
+  ngx_conf_merge_bitmask_value(conf->group.get, prev->group.get, 0);
+  ngx_conf_merge_bitmask_value(conf->group.set, prev->group.set, 0);
+  ngx_conf_merge_bitmask_value(conf->group.delete, prev->group.delete, 0);
+  
+  ngx_conf_merge_value(conf->group.enable_accounting, prev->group.enable_accounting, 0);
+  
+  //validate location
+  if(!is_valid_location(cf, conf)) {
+    return NGX_CONF_ERROR;
+  }
+  
+  MERGE_UNSET_CONF(conf->message_compression, prev->message_compression, NCHAN_MSG_COMPRESSION_INVALID, NCHAN_MSG_NO_COMPRESSION);
+  
   ngx_conf_merge_sec_value(conf->message_timeout, prev->message_timeout, NCHAN_DEFAULT_MESSAGE_TIMEOUT);
   ngx_conf_merge_value(conf->max_messages, prev->max_messages, NCHAN_DEFAULT_MAX_MESSAGES);
   
@@ -199,7 +379,12 @@ static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
     conf->subscriber_first_message = (prev->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) ? NCHAN_SUBSCRIBER_DEFAULT_FIRST_MESSAGE : prev->subscriber_first_message;
   }
   
-  ngx_conf_merge_sec_value(conf->websocket_ping_interval, prev->websocket_ping_interval, NCHAN_DEFAULT_WEBSOCKET_PING_INTERVAL);
+  ngx_conf_merge_sec_value(conf->websocket_ping_interval, prev->websocket_ping_interval, NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL);
+  
+  ngx_conf_merge_sec_value(conf->eventsource_ping.interval, prev->eventsource_ping.interval, NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL);
+  ngx_conf_merge_str_value(conf->eventsource_ping.data, prev->eventsource_ping.comment, "");
+  ngx_conf_merge_str_value(conf->eventsource_ping.event, prev->eventsource_ping.event, "ping");
+  ngx_conf_merge_str_value(conf->eventsource_ping.data, prev->eventsource_ping.data, "");
   
   ngx_conf_merge_sec_value(conf->subscriber_timeout, prev->subscriber_timeout, NCHAN_DEFAULT_SUBSCRIBER_TIMEOUT);
   ngx_conf_merge_sec_value(conf->redis_idle_channel_cache_timeout, prev->redis_idle_channel_cache_timeout, NCHAN_DEFAULT_REDIS_IDLE_CHANNEL_CACHE_TIMEOUT);
@@ -212,13 +397,18 @@ static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
   ngx_conf_merge_str_value(conf->subscriber_http_raw_stream_separator, prev->subscriber_http_raw_stream_separator, "\n");
   
   ngx_conf_merge_str_value(conf->channel_id_split_delimiter, prev->channel_id_split_delimiter, "");
-  ngx_conf_merge_str_value(conf->channel_group, prev->channel_group, "");
-  ngx_conf_merge_str_value(conf->allow_origin, prev->allow_origin, "*");
+  MERGE_CONF(conf, prev, allow_origin);
+  ngx_conf_merge_value(conf->allow_credentials, prev->allow_credentials, 1);
   ngx_conf_merge_str_value(conf->eventsource_event, prev->eventsource_event, "");
   ngx_conf_merge_str_value(conf->custom_msgtag_header, prev->custom_msgtag_header, "");
   ngx_conf_merge_value(conf->msg_in_etag_only, prev->msg_in_etag_only, 0);
   ngx_conf_merge_value(conf->longpoll_multimsg, prev->longpoll_multimsg, 0);
   ngx_conf_merge_value(conf->longpoll_multimsg_use_raw_stream_separator, prev->longpoll_multimsg_use_raw_stream_separator, 0);
+  
+  ngx_conf_merge_value(conf->websocket_heartbeat.enabled, prev->websocket_heartbeat.enabled, 0);
+  MERGE_CONF(conf, prev, websocket_heartbeat.in);
+  MERGE_CONF(conf, prev, websocket_heartbeat.out);
+  
   MERGE_CONF(conf, prev, channel_events_channel_id);
   MERGE_CONF(conf, prev, channel_event_string);
   
@@ -236,6 +426,13 @@ static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
   MERGE_CONF(conf, prev, publisher_upstream_request_url);
   MERGE_CONF(conf, prev, unsubscribe_request_url);
   MERGE_CONF(conf, prev, subscribe_request_url);
+  MERGE_CONF(conf, prev, channel_group);
+  
+  MERGE_CONF(conf, prev, group.max_channels);
+  MERGE_CONF(conf, prev, group.max_subscribers);
+  MERGE_CONF(conf, prev, group.max_messages);
+  MERGE_CONF(conf, prev, group.max_messages_shm_bytes);
+  MERGE_CONF(conf, prev, group.max_messages_file_bytes);
   
   if(conf->pub_chid.n == 0) {
     conf->pub_chid = prev->pub_chid;
@@ -261,30 +458,54 @@ static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
     }
     conf->last_message_id.n = 2;
   }
-  
+    
   ngx_conf_merge_value(conf->redis.url_enabled, prev->redis.url_enabled, 0);
+  
   ngx_conf_merge_value(conf->redis.upstream_inheritable, prev->redis.upstream_inheritable, 0);
   ngx_conf_merge_str_value(conf->redis.url, prev->redis.url, NCHAN_REDIS_DEFAULT_URL);
+  
+  if(up && up->redis.namespace.len > 0) { //upstream has a namespace set
+    ngx_conf_merge_str_value(conf->redis.namespace, up->redis.namespace, ""); 
+  }
+  else {
+    ngx_conf_merge_str_value(conf->redis.namespace, prev->redis.namespace, "");
+  }
+  
+  if(up)
+    ngx_conf_merge_value(conf->redis.ping_interval, up->redis.ping_interval, NGX_CONF_UNSET);
   ngx_conf_merge_value(conf->redis.ping_interval, prev->redis.ping_interval, NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME);
+  
+  if(up)
+    ngx_conf_merge_value(conf->redis.nostore_fastpublish, up->redis.nostore_fastpublish, NGX_CONF_UNSET);
+  ngx_conf_merge_value(conf->redis.nostore_fastpublish, prev->redis.nostore_fastpublish, 0);
+  
   if(conf->redis.url_enabled) {
     conf->redis.enabled = 1;
-    nchan_store_redis_add_server_conf(cf, &conf->redis, conf);
+    nchan_store_redis_add_active_loc_conf(cf, conf);
   }
   if(conf->redis.upstream_inheritable && !conf->redis.upstream && prev->redis.upstream && prev->redis.upstream_url.len > 0) {
     conf->redis.upstream_url = prev->redis.upstream_url;
     ngx_conf_set_redis_upstream(cf, &conf->redis.upstream_url, conf);
   }
   
-  return NGX_CONF_OK;
-}
-
- //channel id variable
-//publisher and subscriber handlers now.
-static char *nchan_setup_handler(ngx_conf_t *cf, void * conf, ngx_int_t (*handler)(ngx_http_request_t *)) {
-  ngx_http_core_loc_conf_t       *clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-  //nchan_loc_conf_t               *plcf = conf;
-  clcf->handler = handler;
-  clcf->if_modified_since = NGX_HTTP_IMS_OFF;
+  if(up)
+    MERGE_UNSET_CONF(conf->redis.storage_mode, up->redis.storage_mode, REDIS_MODE_CONF_UNSET, REDIS_MODE_CONF_UNSET);
+  MERGE_UNSET_CONF(conf->redis.storage_mode, prev->redis.storage_mode, REDIS_MODE_CONF_UNSET, REDIS_MODE_DISTRIBUTED);
+  
+  if(prev->request_handler != NULL && conf->request_handler == NULL) {
+    conf->request_handler = prev->request_handler;
+  }
+  if(conf->request_handler != NULL) {
+    nchan_setup_handler(cf, conf->request_handler);
+  }
+  
+  ngx_conf_merge_value(conf->benchmark.time, prev->benchmark.time, 10);
+  ngx_conf_merge_value(conf->benchmark.msgs_per_minute, prev->benchmark.msgs_per_minute, 120);
+  ngx_conf_merge_value(conf->benchmark.msg_padding, prev->benchmark.msg_padding, 0);
+  ngx_conf_merge_value(conf->benchmark.channels, prev->benchmark.channels, 1000);
+  ngx_conf_merge_value(conf->benchmark.subscribers_per_channel, prev->benchmark.subscribers_per_channel, 100);
+  MERGE_UNSET_CONF(conf->benchmark.subscriber_distribution, prev->benchmark.subscriber_distribution, NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_UNSET, NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM);
+  MERGE_UNSET_CONF(conf->benchmark.publisher_distribution, prev->benchmark.publisher_distribution, NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_UNSET, NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM);
   
   return NGX_CONF_OK;
 }
@@ -332,12 +553,12 @@ static char *nchan_set_storage_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *
 #define DISABLED_STRINGS "none", "off", "disabled"
 #define DISABLED_STRINGS_N 3
 
-
 static char *nchan_publisher_directive_parse(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, ngx_int_t fail) {
   nchan_loc_conf_t     *lcf = conf;
   ngx_str_t            *val;
   ngx_uint_t            i;
   
+  
   nchan_conf_publisher_types_t *pubt = &lcf->pub;
   
   if(cf->args->nelts == 1){ //no arguments
@@ -362,7 +583,11 @@ static char *nchan_publisher_directive_parse(ngx_conf_t *cf, ngx_command_t *cmd,
     }
   }
   
-  return nchan_setup_handler(cf, conf, &nchan_pubsub_handler);
+  if(!is_valid_location(cf, lcf)) {
+    return NGX_CONF_ERROR;
+  }
+  lcf->request_handler = &nchan_pubsub_handler;
+  return NGX_CONF_OK;
 }
 
 static char *nchan_publisher_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
@@ -425,7 +650,12 @@ static char *nchan_subscriber_directive_parse(ngx_conf_t *cf, ngx_command_t *cmd
       }
     }
   }
-  return nchan_setup_handler(cf, conf, &nchan_pubsub_handler);
+  
+  if(!is_valid_location(cf, lcf)) {
+    return NGX_CONF_ERROR;
+  }
+  lcf->request_handler = &nchan_pubsub_handler;
+  return NGX_CONF_OK;
 }
 
 static char *nchan_subscriber_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
@@ -435,18 +665,147 @@ static char *nchan_subscriber_directive(ngx_conf_t *cf, ngx_command_t *cmd, void
 static char *nchan_pubsub_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
   ngx_str_t            *val;
   ngx_uint_t            i;
+  nchan_loc_conf_t     *lcf = conf;
   nchan_publisher_directive_parse(cf, cmd, conf, 0);
   nchan_subscriber_directive_parse(cf, cmd, conf, 0);
   for(i=1; i < cf->args->nelts; i++) {
     val = &((ngx_str_t *) cf->args->elts)[i];
     if(! nchan_strmatch(val, 
-      WEBSOCKET_STRINGS_N + EVENTSOURCE_STRINGS_N + HTTP_CHUNKED_STRINGS_N + HTTP_MULTIPART_STRINGS_N + LONGPOLL_STRINGS_N + INTERVALPOLL_STRINGS_N + DISABLED_STRINGS_N,
-      WEBSOCKET_STRINGS, EVENTSOURCE_STRINGS, HTTP_CHUNKED_STRINGS, HTTP_MULTIPART_STRINGS, LONGPOLL_STRINGS_N, INTERVALPOLL_STRINGS_N, DISABLED_STRINGS_N)) {
+      WEBSOCKET_STRINGS_N + EVENTSOURCE_STRINGS_N + HTTP_CHUNKED_STRINGS_N + HTTP_MULTIPART_STRINGS_N + LONGPOLL_STRINGS_N + INTERVALPOLL_STRINGS_N + HTTP_RAW_STREAM_STRINGS_N + DISABLED_STRINGS_N,
+      WEBSOCKET_STRINGS, EVENTSOURCE_STRINGS, HTTP_CHUNKED_STRINGS, HTTP_MULTIPART_STRINGS, LONGPOLL_STRINGS, INTERVALPOLL_STRINGS, HTTP_RAW_STREAM_STRINGS, DISABLED_STRINGS)) {
       ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
       return NGX_CONF_ERROR;
     }
   }
-  return nchan_setup_handler(cf, conf, &nchan_pubsub_handler);
+  
+  if(!is_valid_location(cf, lcf)) {
+    return NGX_CONF_ERROR;
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_group_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t     *lcf = conf;
+  ngx_str_t            *val;
+  ngx_uint_t            i;
+  nchan_conf_group_t   *group = &lcf->group;
+  
+  if(cf->args->nelts == 1){ //no arguments
+    group->get=1;
+    group->set=1;
+    group->delete=1;
+  }
+  else {
+    for(i=1; i < cf->args->nelts; i++) {
+      val = &((ngx_str_t *) cf->args->elts)[i];
+      if(nchan_strmatch(val, 1, "get")) {
+        group->get=1;
+      }
+      else if(nchan_strmatch(val, 1, "set")) {
+        group->set=1;
+      }
+      else if(nchan_strmatch(val, 1, "delete")) {
+        group->delete=1;
+      }
+      else if(nchan_strmatch(val, 1, "off")) {
+        group->get=0;
+        group->set=0;
+        group->delete=0;
+      }
+      else {
+        ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
+        return NGX_CONF_ERROR;
+      }
+    }
+  }
+  
+  if(!is_valid_location(cf, lcf)) {
+    return NGX_CONF_ERROR;
+  }
+  lcf->request_handler = &nchan_group_handler;
+  return NGX_CONF_OK;
+}
+
+static ngx_int_t set_complex_value(ngx_conf_t *cf, ngx_http_complex_value_t **cv, char *val) {
+  ngx_http_compile_complex_value_t    ccv;
+  ngx_str_t                          *value = ngx_palloc(cf->pool, sizeof(ngx_str_t));;
+  if(value == NULL) {
+    return NGX_ERROR;
+  }
+  value->data = (u_char *)val;
+  value->len = strlen(val);
+  *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+  if (*cv == NULL) {
+    return NGX_ERROR;
+  } 
+  ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+  ccv.cf = cf;
+  ccv.value = value;
+  ccv.complex_value = *cv;
+  if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t set_complex_value_array_size1(ngx_conf_t *cf, nchan_complex_value_arr_t *chid, char *val) {
+  chid->n = 1;
+  return set_complex_value(cf, &chid->cv[0], val);
+}
+
+static char *nchan_benchmark_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t     *lcf = conf;
+  global_benchmark_enabled = 1;
+  lcf->request_handler = &nchan_benchmark_handler;
+  
+  
+  //set group
+  if(set_complex_value(cf, &lcf->channel_group, "benchmark") != NGX_OK) {
+    return "error setting benchmark channel group";
+  }
+  //set pub and sub channel ids
+  if(set_complex_value_array_size1(cf, &lcf->pub_chid, "control") != NGX_OK) {
+    return "error setting benchmark control channel";
+  }
+  if(set_complex_value_array_size1(cf, &lcf->sub_chid, "data") != NGX_OK) {
+    return "error setting benchmark data channel";
+  }
+  
+  lcf->sub.websocket = 1;
+  lcf->pub.websocket = 1;
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_benchmark_subscriber_distribution_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+  if(nchan_strmatch(val, 1, "random")) {
+    lcf->benchmark.subscriber_distribution = NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM;
+  }
+  else if(nchan_strmatch(val, 2, "optimal", "best")) {
+    lcf->benchmark.subscriber_distribution = NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_OPTIMAL;
+  }
+  else {
+    return "invalid value, must be \"random\" or \"optimal\"";
+  }
+  return NGX_CONF_OK;
+}
+static char *nchan_benchmark_publisher_distribution_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+  if(nchan_strmatch(val, 1, "random")) {
+    lcf->benchmark.publisher_distribution = NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM;
+  }
+  else if(nchan_strmatch(val, 2, "optimal", "best")) {
+    lcf->benchmark.publisher_distribution = NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_OPTIMAL;
+  }
+  else {
+    return "invalid value, must be \"random\" or \"optimal\"";
+  }
+  return NGX_CONF_OK;
 }
 
 static char *nchan_subscriber_first_message_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
@@ -482,7 +841,113 @@ static char *nchan_subscriber_first_message_directive(ngx_conf_t *cf, ngx_comman
   return NGX_CONF_OK;
 }
 
+static char *nchan_websocket_heartbeat_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t   *lcf = (nchan_loc_conf_t *)conf;
+  ngx_str_t          *heartbeat_in = &((ngx_str_t *) cf->args->elts)[1];
+  ngx_str_t          *heartbeat_out = &((ngx_str_t *) cf->args->elts)[2];
+  ngx_str_t          *in, *out;
+  lcf->websocket_heartbeat.enabled = 1;
+  
+  in = ngx_pcalloc(cf->pool, sizeof(ngx_str_t) + heartbeat_in->len);
+  in->data = (u_char *)&in[1];
+  in->len = heartbeat_in->len;
+  ngx_memcpy(in->data, heartbeat_in->data, heartbeat_in->len);
+  lcf->websocket_heartbeat.in = in;
+  
+  out = ngx_pcalloc(cf->pool, sizeof(ngx_str_t) + heartbeat_out->len);
+  out->data = (u_char *)&out[1];
+  out->len = heartbeat_out->len;
+  ngx_memcpy(out->data, heartbeat_out->data, heartbeat_out->len);
+  lcf->websocket_heartbeat.out = out;
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_conf_deflate_compression_level_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if (NGX_ZLIB)
+  nchan_main_conf_t  *mcf = (nchan_main_conf_t *)conf;
+  ngx_int_t           np;
+  ngx_str_t           *value = cf->args->elts;
+  np = ngx_atoi(value[1].data, value[1].len);
+  if (np == NGX_ERROR) {
+    return "invalid number";
+  }
+  if(np < 0 || np > 9) {
+    return "must be between 0 and 9";
+  }
+  
+  mcf->zlib_params.level = np;
+#endif
+  return NGX_CONF_OK;
+}
+
+static char *nchan_conf_deflate_compression_strategy_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if (NGX_ZLIB)
+  nchan_main_conf_t   *mcf = (nchan_main_conf_t *)conf;
+  ngx_str_t           *val = cf->args->elts;
+  if(nchan_strmatch(val, 1, "default")) {
+    mcf->zlib_params.strategy = Z_DEFAULT_STRATEGY;
+  }
+  else if(nchan_strmatch(val, 1, "filtered")) {
+    mcf->zlib_params.strategy = Z_FILTERED;
+  }
+  else if(nchan_strmatch(val, 1, "huffman-only")) {
+    mcf->zlib_params.strategy = Z_HUFFMAN_ONLY;
+  }
+  else if(nchan_strmatch(val, 1, "rle")) {
+    mcf->zlib_params.strategy = Z_RLE;
+  }
+  else if(nchan_strmatch(val, 1, "fixed")) {
+    mcf->zlib_params.strategy = Z_FIXED;
+  }
+  else {
+    return "invalid compression strategy";
+  }
+#endif
+  return NGX_CONF_OK;
+}
+
+static char *nchan_conf_deflate_compression_window_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if (NGX_ZLIB)
+  nchan_main_conf_t  *mcf = (nchan_main_conf_t *)conf;
+  ngx_int_t           np;
+  ngx_str_t           *value = cf->args->elts;
+  np = ngx_atoi(value[1].data, value[1].len);
+  if (np == NGX_ERROR) {
+    return "invalid number";
+  }
+  if(np < 9 || np > 15) {
+    return "must be between 9 and 15";
+  }
+  
+  mcf->zlib_params.windowBits = np;
+#endif
+  return NGX_CONF_OK;
+}
+
+static char *nchan_conf_deflate_compression_memlevel_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if (NGX_ZLIB)
+  nchan_main_conf_t  *mcf = (nchan_main_conf_t *)conf;
+  ngx_int_t           np;
+  ngx_str_t           *value = cf->args->elts;
+  np = ngx_atoi(value[1].data, value[1].len);
+  if (np == NGX_ERROR) {
+    return "invalid number";
+  }
+  if(np < 1 || np > 9) {
+    return "must be between 1 and 9";
+  }
+  
+  mcf->zlib_params.memLevel = np;
+#endif
+  return NGX_CONF_OK;
+}
+
+
 static void nchan_exit_worker(ngx_cycle_t *cycle) {
+  if(!global_nchan_enabled) {
+    return;
+  }
   if(global_redis_enabled) {
     redis_store_prepare_to_exit_worker();
   }
@@ -491,16 +956,32 @@ static void nchan_exit_worker(ngx_cycle_t *cycle) {
     nchan_store_redis.exit_worker(cycle);
   }
   nchan_output_shutdown();
+#if (NGX_ZLIB)
+  if(global_zstream_needed) {
+    nchan_common_deflate_shutdown();
+  }
+#endif
 #if NCHAN_SUBSCRIBER_LEAK_DEBUG
   subscriber_debug_assert_isempty();
 #endif
 }
 
 static void nchan_exit_master(ngx_cycle_t *cycle) {
+  if(!global_nchan_enabled) {
+    return;
+  }
+  if(global_benchmark_enabled) {
+    nchan_benchmark_exit_master(cycle);
+  }
   nchan_store_memory.exit_master(cycle);
   if(global_redis_enabled) {
     nchan_store_redis.exit_master(cycle);
   }
+#if (NGX_ZLIB)
+  if(global_zstream_needed) {
+    nchan_common_deflate_shutdown();
+  }
+#endif
 }
 
 static char *nchan_set_complex_value_array(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, nchan_complex_value_arr_t *chid) {
@@ -668,6 +1149,26 @@ static char *nchan_set_raw_subscriber_separator(ngx_conf_t *cf, ngx_command_t *c
   return NGX_CONF_OK;
 }
 
+static char *nchan_set_message_compression_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+#if (NGX_ZLIB)
+  if(nchan_strmatch(val, 1, "on")) {
+    lcf->message_compression = 1;
+    global_zstream_needed = 1;
+  }
+  else if(nchan_strmatch(val, 1, "off")) {
+    lcf->message_compression = 0;
+  }
+  else {
+    return "invalid value: must be 'on' or 'off'";
+  }
+  return NGX_CONF_OK;
+#else
+  return "cannot use compression, Nginx was built without zlib";
+#endif
+}
+
 static char *nchan_set_longpoll_multipart(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
   ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
   nchan_loc_conf_t   *lcf = conf;
@@ -688,11 +1189,59 @@ static char *nchan_set_longpoll_multipart(ngx_conf_t *cf, ngx_command_t *cmd, vo
   return NGX_CONF_OK;
 }
 
+static char *ngx_conf_set_redis_subscribe_weights(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_int_t  master = NGX_CONF_UNSET;
+  ngx_int_t  slave = NGX_CONF_UNSET;
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *cur;
+  unsigned   i;
+  nchan_srv_conf_t *scf = conf;
+  for(i=1; i < cf->args->nelts; i++) {
+    cur = &val[i];
+    if(nchan_str_after(&cur, "master=")) {
+      if((master = ngx_atoi(cur->data, cur->len)) == NGX_ERROR) {
+        return "has invalid weight for master";
+      }
+    }
+    else if(nchan_str_after(&cur, "slave=")) {
+      if((slave = ngx_atoi(cur->data, cur->len)) == NGX_ERROR) {
+        return "has invalid weight for slave";
+      }
+    }
+  }
+  
+  if(master != NGX_CONF_UNSET) {
+    scf->redis.master_weight = master;
+  }
+  if(slave != NGX_CONF_UNSET) {
+    scf->redis.slave_weight = slave;
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_set_redis_optimize_target(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_srv_conf_t   *scf = conf;
+  if(nchan_strmatch(val, 2, "bandwidth", "bw")) {
+    scf->redis.optimize_target = NCHAN_REDIS_OPTIMIZE_BANDWIDTH;
+  }
+  else if(nchan_strmatch(val, 2, "cpu", "CPU")) {
+    scf->redis.optimize_target = NCHAN_REDIS_OPTIMIZE_CPU;
+  }
+  else {
+    return "invalid value, must be \"bandwidth\" or \"cpu\"";
+  }
+  return NGX_CONF_OK;
+}
+
 static char *ngx_conf_enable_redis(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
   char                *rc;
   ngx_flag_t          *fp;
   char                *p = conf;
-  nchan_loc_conf_t    *lcf = (nchan_loc_conf_t *)conf;
+  nchan_loc_conf_t    *lcf = conf;
+  
+  ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Use of %V is discouraged in favor of nchan_redis_pass.", &cmd->name);
   
   rc = ngx_conf_set_flag_slot(cf, cmd, conf);
   if(rc == NGX_CONF_ERROR) {
@@ -703,20 +1252,22 @@ static char *ngx_conf_enable_redis(ngx_conf_t *cf, ngx_command_t *cmd, void *con
   if(*fp) {
     if(!lcf->redis.enabled) {
       lcf->redis.enabled = 1;
-      nchan_store_redis_add_server_conf(cf, &lcf->redis, lcf);
+      nchan_store_redis_add_active_loc_conf(cf, lcf);
     }
     global_redis_enabled = 1;
   }
   else {
-    nchan_store_redis_remove_server_conf(cf, &lcf->redis);
+    nchan_store_redis_remove_active_loc_conf(cf, lcf);
   }
   
   return rc;
 }
 
 static char *nchan_stub_status_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t    *lcf = conf;
   nchan_stub_status_enabled = 1;
-  return nchan_setup_handler(cf, conf, &nchan_stub_status_handler);
+  lcf->request_handler = &nchan_stub_status_handler;
+  return NGX_CONF_OK;
 }
 
 
@@ -728,8 +1279,18 @@ static char *ngx_conf_upstream_redis_server(ngx_conf_t *cf, ngx_command_t *cmd,
   ngx_http_upstream_srv_conf_t        *uscf;
   ngx_str_t                           *value;
   ngx_http_upstream_server_t          *usrv;
-  
+  nchan_loc_conf_t                    *lcf = conf;
   uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);  
+  nchan_srv_conf_t                    *scf = NULL;
+  scf = ngx_http_conf_upstream_srv_conf(uscf, ngx_nchan_module);
+  if(scf->upstream_nchan_loc_conf) {
+    assert(scf->upstream_nchan_loc_conf == lcf);
+  }
+  else {
+    //is this even a safe technique? it might break in the future...
+    scf->upstream_nchan_loc_conf = lcf;
+  }
+  
   
   if(uscf->servers == NULL) {
         uscf->servers = ngx_array_create(cf->pool, 4, sizeof(ngx_http_upstream_server_t));
@@ -738,6 +1299,11 @@ static char *ngx_conf_upstream_redis_server(ngx_conf_t *cf, ngx_command_t *cmd,
     return NGX_CONF_ERROR;
   }
   value = cf->args->elts;
+  
+  if(!nchan_store_redis_validate_url(&value[1])) {
+    return "url is invalid";
+  }
+  
   ngx_memzero(usrv, sizeof(*usrv));
 #if nginx_version >= 1007002
   usrv->name = value[1];
@@ -749,16 +1315,89 @@ static char *ngx_conf_upstream_redis_server(ngx_conf_t *cf, ngx_command_t *cmd,
   return NGX_CONF_OK;
 }
 
+static char *ngx_conf_set_str_slot_no_newlines(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *arg = &val[1];
+  
+  if(nchan_ngx_str_substr(arg, "\n")) {
+    return "can't contain any newline characters";
+  }
+  
+  return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
 static char *ngx_conf_set_redis_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
   nchan_loc_conf_t  *lcf = conf;
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *arg = &val[1];
+  
+  ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Use of %V is discouraged in favor of an upstream { } block with nchan_redis_server %V;", &cmd->name, arg);
   
   if(lcf->redis.upstream) {
     return "can't be set here: already using nchan_redis_pass";
   }
+  if(!nchan_store_redis_validate_url(arg)) {
+    return "url is invalid";
+  }
   
   return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
+static char *ngx_conf_process_redis_namespace_slot(ngx_conf_t *cf, void *post, void *fld) {
+  ngx_str_t *arg = fld;
+
+  if(memchr(arg->data, '{', arg->len)) {
+    return "can't contain character '{'";
+  }
+  
+  if(memchr(arg->data, '}', arg->len)) {
+    return "can't contain character '}'";
+  }
+  
+  if(arg->len > 0 && arg->data[arg->len-1] != ':') {
+    u_char  *nns;
+    if((nns = ngx_palloc(cf->pool, arg->len + 2)) == NULL) {
+      return "couldn't allocate redis namespace data";
+    }
+    ngx_memcpy(nns, arg->data, arg->len);
+    nns[arg->len]=':';
+    nns[arg->len+1]='\0';
+    arg->len++;
+    arg->data=nns;
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_set_redis_storage_mode_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  char                         *p = conf;
+  ngx_str_t                    *val = cf->args->elts;
+  ngx_str_t                    *arg = &val[1];
+  
+  nchan_redis_storage_mode_t   *field;
+
+  field = (nchan_redis_storage_mode_t *) (p + cmd->offset);
+  
+  if(*field != REDIS_MODE_CONF_UNSET) {
+    return "is duplicate";
+  }
+  
+  if(nchan_strmatch(arg, 1, "backup")) {
+    *field = REDIS_MODE_BACKUP;
+  }
+  else if(nchan_strmatch(arg, 1, "distributed")) {
+    *field = REDIS_MODE_DISTRIBUTED;
+  }
+  else if(nchan_strmatch(arg, 1, "nostore") ||  nchan_strmatch(arg, 1, "distributed-nostore")) {
+    *field = REDIS_MODE_DISTRIBUTED_NOSTORE;
+  }
+  else {
+    return "is invalid, must be one of 'distributed',  'backup' or 'nostore'";
+  }
+  
+  return NGX_CONF_OK;
+}
+
 static char *ngx_conf_set_redis_upstream_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
   nchan_loc_conf_t  *lcf = conf;
   ngx_str_t         *value = cf->args->elts;
@@ -771,12 +1410,12 @@ static char *ngx_conf_set_redis_upstream_pass(ngx_conf_t *cf, ngx_command_t *cmd
 #include "nchan_config_commands.c" //hideous but hey, it works
 
 static ngx_http_module_t  nchan_module_ctx = {
-    nchan_add_variables,           /* preconfiguration */
+    nchan_preconfig,               /* preconfiguration */
     nchan_postconfig,              /* postconfiguration */
     nchan_create_main_conf,        /* create main configuration */
     NULL,                          /* init main configuration */
-    NULL,                          /* create server configuration */
-    NULL,                          /* merge server configuration */
+    nchan_create_srv_conf,         /* create server configuration */
+    nchan_merge_srv_conf,          /* merge server configuration */
     nchan_create_loc_conf,         /* create location configuration */
     nchan_merge_loc_conf,          /* merge location configuration */
 };
diff --git a/debian/modules/nchan/src/nchan_types.h b/debian/modules/nchan/src/nchan_types.h
index 58b8ee1..d8733c0 100644
--- a/debian/modules/nchan/src/nchan_types.h
+++ b/debian/modules/nchan/src/nchan_types.h
@@ -5,8 +5,14 @@
 
 typedef ngx_int_t (*callback_pt)(ngx_int_t, void *, void *);
 
-typedef enum {MSG_CHANNEL_NOTREADY, MSG_NORESPONSE, MSG_INVALID, MSG_PENDING, MSG_NOTFOUND, MSG_FOUND, MSG_EXPECTED, MSG_EXPIRED} nchan_msg_status_t;
-typedef enum {INACTIVE, NOTREADY, WAITING, STUBBED, READY} chanhead_pubsub_status_t;
+#include <util/nchan_fake_request.h>
+
+typedef enum {MSG_ERROR, MSG_CHANNEL_NOTREADY, MSG_INVALID, MSG_PENDING, MSG_NOTFOUND, MSG_FOUND, MSG_EXPECTED, MSG_EXPIRED} nchan_msg_status_t;
+typedef enum {INACTIVE, NOTREADY, WAITING, STUBBED, READY, DELETED} chanhead_pubsub_status_t;
+
+typedef enum {NCHAN_CONTENT_TYPE_PLAIN, NCHAN_CONTENT_TYPE_JSON, NCHAN_CONTENT_TYPE_XML, NCHAN_CONTENT_TYPE_YAML, NCHAN_CONTENT_TYPE_HTML} nchan_content_type_t;
+
+typedef enum {REDIS_MODE_CONF_UNSET = NGX_CONF_UNSET, REDIS_MODE_BACKUP = 1, REDIS_MODE_DISTRIBUTED = 2, REDIS_MODE_DISTRIBUTED_NOSTORE = 3} nchan_redis_storage_mode_t;
 
 typedef enum {
   SUB_ENQUEUE, SUB_DEQUEUE, SUB_RECEIVE_MESSAGE, SUB_RECEIVE_STATUS, 
@@ -17,6 +23,15 @@ typedef struct {
   size_t                          shm_size;
   ngx_msec_t                      redis_fakesub_timer_interval;
   size_t                          redis_publish_message_msgkey_size;
+#if (NGX_ZLIB)
+  struct {
+                                    int level;
+                                    int windowBits;
+                                    int memLevel;
+                                    int strategy;
+  }                               zlib_params;
+#endif
+  ngx_path_t                     *message_temp_path;
 } nchan_main_conf_t;
 
 
@@ -24,10 +39,14 @@ typedef struct {
   ngx_str_t                     url;
   ngx_flag_t                    url_enabled;
   time_t                        ping_interval;
+  ngx_str_t                     namespace;
+  nchan_redis_storage_mode_t    storage_mode;
+  ngx_int_t                     nostore_fastpublish;
   ngx_str_t                     upstream_url;
   ngx_http_upstream_srv_conf_t *upstream;
   ngx_flag_t                    upstream_inheritable;
   unsigned                      enabled:1;
+  void                         *nodeset;
   void                         *privdata;
 } nchan_redis_conf_t;
 
@@ -57,8 +76,8 @@ union nchan_msg_multitag {
 typedef struct {
   time_t                          time; //tag message by time
   union nchan_msg_multitag        tag;
-  unsigned                        tagactive:16;
-  unsigned                        tagcount:16;
+  int16_t                         tagactive;
+  int16_t                         tagcount;
 } nchan_msg_id_t;
 
 typedef struct {
@@ -80,20 +99,35 @@ struct msg_rsv_dbg_s {
 typedef struct nchan_loc_conf_s nchan_loc_conf_t;
 typedef struct nchan_msg_s nchan_msg_t;
 
+typedef enum {NCHAN_MSG_SHARED, NCHAN_MSG_HEAP, NCHAN_MSG_POOL, NCHAN_MSG_STACK} nchan_msg_storage_t;
+
+typedef enum {
+  NCHAN_MSG_COMPRESSION_INVALID = -1,
+  NCHAN_MSG_NO_COMPRESSION = 0, 
+  NCHAN_MSG_COMPRESSION_WEBSOCKET_PERMESSAGE_DEFLATE
+} nchan_msg_compression_type_t;
+  
+typedef struct {
+  ngx_buf_t                       buf;
+  nchan_msg_compression_type_t    compression;
+} nchan_compressed_msg_t;
+
 struct nchan_msg_s {
   nchan_msg_id_t                  id;
   nchan_msg_id_t                  prev_id;
-  ngx_str_t                       content_type;
-  ngx_str_t                       eventsource_event;
+  ngx_str_t                      *content_type;
+  ngx_str_t                      *eventsource_event;
   //  ngx_str_t                   charset;
-  ngx_buf_t                      *buf;
+  ngx_buf_t                       buf;
   time_t                          expires;
+  
   ngx_atomic_int_t                refcount;
+  nchan_msg_t                    *parent;
+  nchan_compressed_msg_t         *compressed;
+  //struct nchan_msg_s             *reload_next;
   
-  struct nchan_msg_s             *reload_next;
+  nchan_msg_storage_t             storage;
   
-  unsigned                        shared:1; //for debugging
-  unsigned                        temp_allocd:1;
 #if NCHAN_MSG_RESERVE_DEBUG
   struct msg_rsv_dbg_s           *rsv;
 #endif
@@ -102,16 +136,8 @@ struct nchan_msg_s {
   struct nchan_msg_s             *dbg_prev;
   struct nchan_msg_s             *dbg_next;
 #endif
-#if NCHAN_BENCHMARK
-  struct timeval                  start_tv;
-#endif
 }; // nchan_msg_t
 
-typedef struct {
-  nchan_msg_t       copy;
-  nchan_msg_t      *original;
-} nchan_msg_copy_t;
-
 typedef struct {
   ngx_str_t                       id;
   ngx_int_t                       messages;
@@ -150,6 +176,26 @@ typedef struct {
 
 typedef struct subscriber_s subscriber_t;
 
+typedef struct {
+  //must be made entirely of ngx_atomic_int_t
+  ngx_atomic_int_t                channels;
+  ngx_atomic_int_t                subscribers;
+  ngx_atomic_int_t                messages;
+  ngx_atomic_int_t                messages_shmem_bytes;
+  ngx_atomic_int_t                messages_file_bytes;
+} nchan_group_limits_t;
+
+typedef struct {
+  ngx_atomic_int_t               channels;
+  ngx_atomic_int_t               multiplexed_channels;
+  ngx_atomic_int_t               subscribers;
+  ngx_atomic_int_t               messages;
+  ngx_atomic_int_t               messages_shmem_bytes;
+  ngx_atomic_int_t               messages_file_bytes;
+  nchan_group_limits_t           limit;
+  ngx_str_t                      name;
+} nchan_group_t;
+
 typedef struct{
   //init
   ngx_int_t (*init_module)(ngx_cycle_t *cycle);
@@ -166,16 +212,14 @@ typedef struct{
   ngx_int_t (*subscribe)   (ngx_str_t *, subscriber_t *);
   ngx_int_t (*publish)     (ngx_str_t *, nchan_msg_t *, nchan_loc_conf_t *, callback_pt, void *);
   
+    //channel actions
   ngx_int_t (*delete_channel)(ngx_str_t *, nchan_loc_conf_t *, callback_pt, void *);
-  
-  //channel actions
   ngx_int_t (*find_channel)(ngx_str_t *, nchan_loc_conf_t *, callback_pt, void*);
   
-  
-  
-  //message actions and properties
-  ngx_str_t * (*message_etag)(nchan_msg_t *msg, ngx_pool_t *pool);
-  ngx_str_t * (*message_content_type)(nchan_msg_t *msg, ngx_pool_t *pool);
+  //group actions
+  ngx_int_t (*get_group)(ngx_str_t *name, nchan_loc_conf_t *, callback_pt, void *);
+  ngx_int_t (*set_group_limits)(ngx_str_t *name, nchan_loc_conf_t *, nchan_group_limits_t *limits, callback_pt, void *);
+  ngx_int_t (*delete_group)(ngx_str_t *name, nchan_loc_conf_t *, callback_pt, void *);
 
 } nchan_store_t;
 
@@ -196,6 +240,20 @@ typedef struct {
   unsigned                        websocket:1;
 } nchan_conf_subscriber_types_t;
 
+typedef struct {
+  unsigned                        get:1;
+  unsigned                        set:1;
+  unsigned                        delete:1;
+  
+  ngx_int_t                       enable_accounting;
+  
+  ngx_http_complex_value_t       *max_channels;
+  ngx_http_complex_value_t       *max_subscribers;
+  ngx_http_complex_value_t       *max_messages;
+  ngx_http_complex_value_t       *max_messages_shm_bytes;
+  ngx_http_complex_value_t       *max_messages_file_bytes;
+} nchan_conf_group_t;
+
 #define NCHAN_COMPLEX_VALUE_ARRAY_MAX 8
 typedef struct {
   ngx_http_complex_value_t       *cv[NCHAN_COMPLEX_VALUE_ARRAY_MAX];
@@ -207,6 +265,40 @@ typedef struct {
  ngx_atomic_uint_t               max_messages;
 } nchan_loc_conf_shared_data_t;
 
+typedef enum {
+  NCHAN_REDIS_OPTIMIZE_UNSET = -1,
+  NCHAN_REDIS_OPTIMIZE_CPU = 1,
+  NCHAN_REDIS_OPTIMIZE_BANDWIDTH = 2
+} nchan_redis_optimize_t;
+
+typedef struct {
+  struct {
+      ngx_msec_t                    connect_timeout;
+      nchan_redis_optimize_t        optimize_target;
+      ngx_int_t                     master_weight;
+      ngx_int_t                     slave_weight;
+  }                               redis;
+  nchan_loc_conf_t                *upstream_nchan_loc_conf;
+} nchan_srv_conf_t;
+
+typedef struct {
+  time_t                          time;
+  ngx_int_t                       msgs_per_minute;
+  ngx_int_t                       msg_padding;
+  ngx_int_t                       channels;
+  ngx_int_t                       subscribers_per_channel;
+  enum {
+    NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_UNSET = -1,
+    NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM = 1,
+    NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_OPTIMAL = 2
+  }                               subscriber_distribution;
+  enum {
+    NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_UNSET = -1,
+    NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM = 1,
+    NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_OPTIMAL = 2
+  }                               publisher_distribution;
+} nchan_benchmark_conf_t;
+
 struct nchan_loc_conf_s { //nchan_loc_conf_t
   
   ngx_int_t                       shared_data_index;
@@ -226,12 +318,14 @@ struct nchan_loc_conf_s { //nchan_loc_conf_t
   nchan_complex_value_arr_t       pub_chid;
   nchan_complex_value_arr_t       sub_chid;
   nchan_complex_value_arr_t       pubsub_chid;
-  ngx_str_t                       channel_group;
+  ngx_http_complex_value_t       *channel_group;
+  
   ngx_str_t                       channel_id_split_delimiter;
   
   ngx_str_t                       subscriber_http_raw_stream_separator;
 
-  ngx_str_t                       allow_origin;
+  ngx_http_complex_value_t       *allow_origin;
+  ngx_int_t                       allow_credentials;
   
   nchan_complex_value_arr_t       last_message_id;
   ngx_str_t                       custom_msgtag_header;
@@ -239,7 +333,7 @@ struct nchan_loc_conf_s { //nchan_loc_conf_t
   
   nchan_conf_publisher_types_t    pub;
   nchan_conf_subscriber_types_t   sub; 
-  
+  nchan_conf_group_t              group;
   time_t                          subscriber_timeout;
   
   ngx_int_t                       longpoll_multimsg;
@@ -248,6 +342,20 @@ struct nchan_loc_conf_s { //nchan_loc_conf_t
   ngx_str_t                       eventsource_event;
   
   time_t                          websocket_ping_interval;
+  struct {
+    time_t                          interval;
+    ngx_str_t                       event;
+    ngx_str_t                       data;
+    ngx_str_t                       comment;
+  }                               eventsource_ping;
+  
+  struct {
+    ngx_int_t   enabled;
+    ngx_str_t  *in;
+    ngx_str_t  *out;
+  }                               websocket_heartbeat;
+  
+  nchan_msg_compression_type_t    message_compression;
   
   ngx_int_t                       subscriber_first_message;
   
@@ -263,14 +371,12 @@ struct nchan_loc_conf_s { //nchan_loc_conf_t
   ngx_int_t                       max_channel_subscribers;
   time_t                          channel_timeout;
   nchan_store_t                  *storage_engine;
+  
+  nchan_benchmark_conf_t          benchmark;
+  
+  ngx_int_t                     (*request_handler)(ngx_http_request_t *r);
 };// nchan_loc_conf_t;
 
-typedef struct {
-  char              *subtype;
-  size_t             len;
-  const ngx_str_t   *format;
-} nchan_content_subtype_t;
-
 typedef struct nchan_llist_timed_s {
   struct nchan_llist_timed_s     *prev;
   void                           *data;
@@ -286,7 +392,7 @@ typedef struct {
   ngx_int_t              (*enqueue)(struct subscriber_s *);
   ngx_int_t              (*dequeue)(struct subscriber_s *);
   ngx_int_t              (*respond_message)(struct subscriber_s *, nchan_msg_t *);
-  ngx_int_t              (*respond_status)(struct subscriber_s *, ngx_int_t, const ngx_str_t *);
+  ngx_int_t              (*respond_status)(struct subscriber_s *, ngx_int_t, const ngx_str_t *, ngx_chain_t *);
   ngx_int_t              (*set_dequeue_callback)(subscriber_t *self, subscriber_callback_pt cb, void *privdata);
   ngx_int_t              (*reserve)(struct subscriber_s *);
   ngx_int_t              (*release)(struct subscriber_s *, uint8_t nodestroy);
@@ -305,10 +411,14 @@ struct subscriber_s {
   nchan_msg_id_t             last_msgid;
   nchan_loc_conf_t          *cf;
   ngx_http_request_t        *request;
+  void                      *upstream_requestmachine;
   ngx_uint_t                 reserved;
+  
+  unsigned                   enable_sub_unsub_callbacks;
   unsigned                   dequeue_after_response:1;
   unsigned                   destroy_after_dequeue:1;
   unsigned                   enqueued:1;
+  
 #if FAKESHARD
   ngx_int_t                  owner;
 #endif
@@ -334,16 +444,23 @@ typedef struct {
   ngx_str_t                     *channel_event_name;
   ngx_str_t                      channel_id[NCHAN_MULTITAG_REQUEST_CTX_MAX];
   int                            channel_id_count;
-  ngx_str_t                      request_origin_header;
+  ngx_str_t                     *channel_group_name;
+  
+  ngx_str_t                     *request_origin_header;
+  ngx_str_t                     *allow_origin;
   
-  ngx_int_t                      unsubscribe_request_callback_finalize_code;
   unsigned                       sent_unsubscribe_request:1;
   unsigned                       request_ran_content_handler:1;
-#if NCHAN_BENCHMARK
-  struct timeval                 start_tv;
-#endif
   
 } nchan_request_ctx_t;
 
 
+typedef struct {
+  ngx_str_t     hostname;
+  ngx_str_t     peername; // resolved hostname (ip address)
+  ngx_int_t     port;
+  ngx_str_t     password;
+  ngx_int_t     db;
+} redis_connect_params_t;
+
 #endif  /* NCHAN_TYPES_H */
diff --git a/debian/modules/nchan/src/nchan_variables.c b/debian/modules/nchan/src/nchan_variables.c
index f1b0da7..fbf2944 100644
--- a/debian/modules/nchan/src/nchan_variables.c
+++ b/debian/modules/nchan/src/nchan_variables.c
@@ -171,6 +171,11 @@ static ngx_int_t nchan_stub_status_shared_memory_used(ngx_http_request_t *r, ngx
   return NGX_OK;
 }
 
+static ngx_int_t nchan_version_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t d) {
+  set_varval(v, (u_char *)NCHAN_VERSION, strlen(NCHAN_VERSION));
+  return NGX_OK;
+}
+
 
 
 #define STUB_STATUS_VARIABLE(counter) \
@@ -205,6 +210,7 @@ nchan_variable_t nchan_vars[] = {
   STUB_STATUS_NAMED_VARIABLE("ipc_queued_alerts", ipc_queue_size),
   STUB_STATUS_NAMED_VARIABLE("total_ipc_send_delay", ipc_total_send_delay),
   STUB_STATUS_NAMED_VARIABLE("total_ipc_receive_delay", ipc_total_receive_delay),
+  { ngx_string("nchan_version"), nchan_version_variable, 0},
   
 //  { ngx_string("nchan_message_alert_type"), nchan_message_alert_type_variable, 0},
   
diff --git a/debian/modules/nchan/src/nchan_version.h b/debian/modules/nchan/src/nchan_version.h
new file mode 100644
index 0000000..a8c02ae
--- /dev/null
+++ b/debian/modules/nchan/src/nchan_version.h
@@ -0,0 +1 @@
+#define NCHAN_VERSION "1.2.7"
diff --git a/debian/modules/nchan/src/store/memory/groups.c b/debian/modules/nchan/src/store/memory/groups.c
new file mode 100644
index 0000000..9691b0a
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/groups.c
@@ -0,0 +1,570 @@
+#include "groups.h"
+#include "store.h"
+#include "ipc-handlers.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:GROUPS: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:GROUPS: " fmt, ##args)
+
+//#define NCHAN_DEBUG_GROUP_NOCACAHE 1
+#define MAX_GETGROUP_WAIT_TIME_BEFORE_RETRY 5
+
+static void *group_id(void *d) {
+  return &((group_tree_node_t *)d)->name;
+}
+
+#if NCHAN_DEBUG_GROUP_NOCACAHE
+ngx_int_t clear_group_if_not_owner(rbtree_seed_t *seed, void *node_data, void *pd) {
+  group_tree_node_t *gtn = node_data;
+  ngx_int_t          myslot = memstore_slot();
+  
+  if(memstore_str_owner(&gtn->name) != myslot) {
+    gtn->group = NULL; //asshole.
+    //DBG("cleared group %V shared data", &gtn->name);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t jerk_group_clearer(void *pd) {
+  memstore_groups_t *gp = pd;
+  
+  rbtree_walk(&gp->tree, clear_group_if_not_owner, NULL);
+  
+  return NGX_OK;
+}
+#endif
+
+ngx_int_t memstore_groups_init(memstore_groups_t *gp) {
+  return rbtree_init(&gp->tree, "memstore groups", group_id, NULL, NULL);
+}
+
+ngx_int_t shutdown_walker(rbtree_seed_t *seed, void *node_data, void *privdata) {
+  group_tree_node_t *gtn = (group_tree_node_t *)node_data;
+  shmem_t *          shm = nchan_store_memory_shmem;
+  ngx_int_t          myslot = memstore_slot();
+  DBG("shutdown_walker %V group %p", &gtn->name, gtn->group);
+  if(memstore_str_owner(&gtn->name) == myslot) {
+    shm_free(shm, gtn->group);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_groups_shutdown(memstore_groups_t *gp) {
+  rbtree_empty(&gp->tree, shutdown_walker, NULL);
+  DBG("empties rbtree");
+  return NGX_OK;
+}
+
+static group_tree_node_t *group_create_node(memstore_groups_t *gp, ngx_str_t *name, nchan_group_t *shm_group) {
+  //assumes node does not yet exist
+  ngx_rbtree_node_t      *node;
+  group_tree_node_t      *gtn;
+  
+  if((node = rbtree_create_node(&gp->tree, sizeof(group_tree_node_t) + name->len)) == NULL) {
+    ERR("couldn't alloc rbtree node for group %V", name);
+    return NULL;
+  }
+  gtn = rbtree_data_from_node(node);
+  gtn->name.len = name->len;
+  gtn->name.data = (u_char *)(&gtn[1]);
+  ngx_memcpy(gtn->name.data, name->data, name->len);
+  
+  gtn->group = shm_group;
+  
+  gtn->when_ready_head = NULL;
+  gtn->when_ready_tail = NULL;
+  
+  gtn->owned_chanhead_head = NULL;
+  
+  gtn->getting_group = 0;
+  
+  rbtree_insert_node(&gp->tree, node);
+  
+  return gtn;
+}
+
+static group_tree_node_t *group_owner_create_node(memstore_groups_t *gp, ngx_str_t *name) {
+  //ASSUMES group name is owned by current worker, AND node does not yet exist
+  group_tree_node_t      *gtn;
+  nchan_group_t          *group;
+  group = shm_calloc(nchan_store_memory_shmem, sizeof(*group) + name->len, "group");
+  if(group == NULL) {
+    nchan_log_ooshm_error("creating group %V", name);
+    return NULL;
+  }
+  
+  group->name.len = name->len;
+  group->name.data = (u_char *)(&group[1]);
+  ngx_memcpy(group->name.data, name->data, name->len);
+  
+  DBG("created group %p %V", group, &group->name);
+  
+  if((gtn = group_create_node(gp, name, group)) == NULL) {
+    shm_free(nchan_store_memory_shmem, group);
+    return NULL;
+  }
+  
+  memstore_ipc_broadcast_group(group);
+  
+  return gtn;
+}
+
+nchan_group_t *memstore_group_owner_find(memstore_groups_t *gp, ngx_str_t *name, int *group_just_created) {
+  ngx_rbtree_node_t      *node;
+  group_tree_node_t      *gtn;
+  assert(memstore_str_owner(name) == memstore_slot());
+  if((node = rbtree_find_node(&gp->tree, name)) != NULL) {
+    gtn = rbtree_data_from_node(node);
+    if(group_just_created) *group_just_created = 0;
+  }
+  else {
+    gtn = group_owner_create_node(gp, name);
+    if(group_just_created) *group_just_created = 1;
+  }
+  
+  return gtn ? gtn->group : NULL;
+}
+
+
+static ngx_int_t add_whenready_callback(group_tree_node_t *gtn, char *lbl, callback_pt cb, void *pd) {
+  //not ready yet, queue up the callback
+  group_callback_t  *gcb;
+  DBG("add to %p whenready %s for group %V", gtn, lbl, &gtn->name);
+  if((gcb = ngx_alloc(sizeof(*gcb), ngx_cycle->log)) == NULL) {
+    ERR("couldn't allocate callback link for group %V", &gtn->name);
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+  
+  gcb->cb = cb;
+  gcb->pd = pd;
+  gcb->label = lbl;
+  gcb->next = NULL;
+  
+  if(gtn->when_ready_tail) {
+    gtn->when_ready_tail->next = gcb;
+  }
+  
+  if(!gtn->when_ready_head) {
+    gtn->when_ready_head = gcb;
+  }
+  
+  
+  gtn->when_ready_tail = gcb;
+  
+  for(gcb = gtn->when_ready_head; gcb != NULL; gcb = gcb->next){
+    DBG("  whenready %s", gcb->label);
+  }
+  
+  if(ngx_time() - gtn->getting_group > MAX_GETGROUP_WAIT_TIME_BEFORE_RETRY) {
+    gtn->getting_group = ngx_time();
+    memstore_ipc_send_get_group(memstore_str_owner(&gtn->name), &gtn->name);    
+  }
+  
+  return NGX_OK;
+}
+
+static void call_whenready_callbacks(group_tree_node_t *gtn, nchan_group_t *shm_group) {
+  group_callback_t       *gcb, *next_gcb;
+  
+  for(gcb = gtn->when_ready_head; gcb != NULL; gcb = next_gcb) {
+    DBG("whenready for %p callback %s for group %V", gtn, gcb->label, &gtn->name);
+    next_gcb = gcb->next;
+    gcb->cb(shm_group ? NGX_OK : NGX_ERROR, shm_group , gcb->pd);
+    ngx_free(gcb);
+  }
+  gtn->when_ready_head = NULL;
+  gtn->when_ready_tail = NULL;
+}
+
+ngx_int_t memstore_group_find_from_groupnode(memstore_groups_t *gp, group_tree_node_t *gtn, callback_pt cb, void *pd) {
+  if(!gtn) {
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+  if(gtn->group) {
+    cb(NGX_OK, gtn->group, pd);
+  }
+  else {
+    add_whenready_callback(gtn, "group find", cb, pd);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_find(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd) {
+#if NCHAN_DEBUG_GROUP_NOCACAHE
+  static int hmm = 0;
+  if(!hmm) {
+    nchan_add_interval_timer(jerk_group_clearer, gp, 100);
+    hmm = 1; 
+  }
+#endif
+  group_tree_node_t  *gtn = memstore_groupnode_get(gp, name);
+  return memstore_group_find_from_groupnode(gp, gtn, cb, pd);
+}
+
+group_tree_node_t *memstore_groupnode_get(memstore_groups_t *gp, ngx_str_t *name) {
+  ngx_rbtree_node_t      *node;
+  group_tree_node_t      *gtn = NULL;
+  ngx_int_t               owner;
+  if((node = rbtree_find_node(&gp->tree, name)) != NULL) {
+    gtn = rbtree_data_from_node(node);
+  }
+  else {
+    owner = memstore_str_owner(name);
+    if(owner == memstore_slot()) {
+      gtn = group_owner_create_node(gp, name);
+    }
+    else {
+      if((gtn = group_create_node(gp, name, NULL))!=NULL) {
+        gtn->getting_group=1;
+        memstore_ipc_send_get_group(memstore_str_owner(name), name);
+      }
+    }
+    if(!gtn) {
+      ERR("couldn't create groupnode for group %V", name);
+    }
+  }
+  return gtn;
+}
+
+ngx_int_t memstore_group_receive(memstore_groups_t *gp, nchan_group_t *shm_group) {
+  ngx_rbtree_node_t      *node;
+  group_tree_node_t      *gtn = NULL;
+  
+  assert(memstore_str_owner(&shm_group->name) != memstore_slot());
+  
+  DBG("memstore group receive %V", &shm_group->name);
+  
+  if((node = rbtree_find_node(&gp->tree, &shm_group->name)) != NULL) {
+    gtn = rbtree_data_from_node(node);  
+    gtn->group = shm_group;
+    gtn->getting_group = 0;
+    call_whenready_callbacks(gtn, shm_group);
+    
+#if NCHAN_DEBUG_GROUP_NOCACAHE
+    gtn->group = NULL;
+#endif
+    
+  }
+  else {
+    gtn = group_create_node(gp, &shm_group->name, shm_group);
+    DBG("created node %p", gtn);
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_receive_delete(memstore_groups_t *gp, nchan_group_t *shm_group) {
+  memstore_channel_head_t    *cur;
+  group_tree_node_t          *gtn = NULL;
+  ngx_rbtree_node_t          *node;
+  DBG("receive GROUP DELETE for %V", &shm_group->name);
+  if((node = rbtree_find_node(&gp->tree, &shm_group->name)) != NULL) {
+    gtn = rbtree_data_from_node(node);
+  }
+  DBG("gtn is %V", gtn);
+  if(gtn) {
+    
+    call_whenready_callbacks(gtn, NULL);
+    
+    while((cur = gtn->owned_chanhead_head) != NULL) {
+      memstore_group_dissociate_own_channel(cur);
+      nchan_store_memory.delete_channel(&cur->id, cur->cf, NULL, NULL);
+    }
+  }
+  
+  return NGX_OK;
+}
+
+typedef struct {
+  callback_pt        cb;
+  void              *pd;
+  memstore_groups_t *gp;
+  unsigned           owned;
+} group_delete_callback_data_t;
+
+static ngx_int_t group_delete_callback(ngx_int_t rc, nchan_group_t *shm_group, group_delete_callback_data_t *d) {
+  static nchan_group_t  group;
+  if(shm_group) {
+    DBG("GROUP DELETE find_group callback for %V", &shm_group->name);
+    group = *shm_group;
+    if(d->owned) {
+      memstore_group_receive_delete(d->gp, shm_group);
+    }
+    memstore_ipc_broadcast_group_delete(shm_group);
+  }
+  else {
+    ERR("group for delete callback is NULL");
+    ngx_memzero(&group, sizeof(group));
+  }
+  d->cb(rc, &group, d->pd);
+  ngx_free(d);
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_delete(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd) {
+  group_tree_node_t            *gtn = NULL;
+  ngx_int_t                     owner = memstore_str_owner(name);
+  group_delete_callback_data_t *d;
+  
+  if((gtn = memstore_groupnode_get(gp, name)) == NULL) {
+    ERR("couldn't get groupnode for deletion");
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+  
+  if((d = ngx_alloc(sizeof(*d), ngx_cycle->log)) == NULL) {
+    ERR("couldn't alloc callback data for group deletion");
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+  
+  d->cb = cb;
+  d->pd = pd;
+  d->gp = gp;
+  d->owned = owner == memstore_slot();
+  DBG("start DELETE GROUP %V", &gtn->name);
+  return memstore_group_find(gp, &gtn->name, (callback_pt )group_delete_callback, d);
+}
+
+
+static void verify_gnd(memstore_channel_head_t *ch) {
+  /*
+  memstore_channel_head_t *cur;
+  int n=0, n2=0;
+  for(cur = ch; cur != NULL; cur = cur->groupnode_next) {
+    if(cur->groupnode_next) {
+      assert(cur->groupnode_next->groupnode_prev == cur);
+      n++;
+    }
+  }
+  for(cur = ch; cur != NULL; cur = cur->groupnode_prev) {
+    if(cur->groupnode_prev) {
+      assert(cur->groupnode_prev->groupnode_next == cur);
+      n++;
+    }
+  }
+
+  if(ch->groupnode) {
+    int prevnulls = 0;
+    int nextnulls = 0;
+    for(cur = ch->groupnode->owned_chanhead_head; cur != NULL; cur = cur->groupnode_next) {
+      n2++;
+      if(!cur->groupnode_prev) {
+        assert(++prevnulls <= 1);
+      }
+      else {
+        assert(cur->groupnode_prev->groupnode_next == cur);
+      }
+      
+      if(!cur->groupnode_next) {
+        assert(++nextnulls <= 1);
+      }
+      else {
+        assert(cur->groupnode_next->groupnode_prev == cur);
+      }
+    }
+    if(n>0) {
+      assert(n2 - 1 == n);
+    }
+  }
+  */
+}
+
+static void verify_gnd_ch_absent(memstore_channel_head_t *ch) {
+  /*memstore_channel_head_t *cur;
+  for(cur = ch->groupnode->owned_chanhead_head; cur != NULL; cur = cur->groupnode_next) {
+    assert(cur != ch);
+    if(cur->groupnode_prev) {      
+      assert(cur->groupnode_prev != ch);
+    }
+  }
+  */
+  /*memstore_channel_head_t *tmp;
+  HASH_ITER(hh, mpt->hash, cur, tmp) {
+    assert(cur->groupnode_prev != ch);
+    assert(cur->groupnode_next != ch);
+  }*/
+}
+
+
+void memstore_group_associate_own_channel(memstore_channel_head_t *ch) {
+  group_tree_node_t *gtn = ch->groupnode;
+  
+  verify_gnd(ch);
+  verify_gnd_ch_absent(ch);
+  
+  assert(ch->owner == memstore_slot());
+  
+  if(!ch->multi) {
+    ch->groupnode_next = gtn->owned_chanhead_head;
+    if(gtn->owned_chanhead_head) {
+      gtn->owned_chanhead_head->groupnode_prev = ch;
+    }
+    gtn->owned_chanhead_head = ch;
+    
+  }
+  
+  verify_gnd(ch);
+}
+
+void memstore_group_dissociate_own_channel(memstore_channel_head_t *ch) {
+  verify_gnd(ch);
+  assert(ch->owner == memstore_slot());
+  if(!ch->multi) {
+    if(ch->groupnode->owned_chanhead_head == ch) {
+      ch->groupnode->owned_chanhead_head = ch->groupnode_next;
+    }
+    if(ch->groupnode_prev) {
+      assert(ch->groupnode_prev->groupnode_next == ch);
+      ch->groupnode_prev->groupnode_next = ch->groupnode_next;
+    }
+    if(ch->groupnode_next) {
+      assert(ch->groupnode_next->groupnode_prev == ch);
+      ch->groupnode_next->groupnode_prev = ch->groupnode_prev;
+    }
+    
+    ch->groupnode_prev = NULL;
+    ch->groupnode_next = NULL;
+  }
+  assert(ch->groupnode->owned_chanhead_head != ch);
+  verify_gnd(ch);
+  verify_gnd_ch_absent(ch);
+}
+
+
+
+static ngx_int_t group_add_channel_internal(nchan_group_t *shm_group, int multi, int self_owned, int n) {
+  if(shm_group) {
+    if(multi) {
+      ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->multiplexed_channels, n);
+    }
+    else if (self_owned) {
+      ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->channels, n);
+    }
+  }
+  return NGX_OK;
+}
+
+typedef struct {
+  int       n;
+  unsigned  multi:1;
+  unsigned  self_owned:1;
+} add_channel_count_callback_data_t;
+
+static ngx_int_t group_add_channel_callback(ngx_int_t rc, nchan_group_t *shm_group, add_channel_count_callback_data_t *d) {
+  group_add_channel_internal(shm_group, d->multi, d->self_owned, d->n);
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static ngx_int_t memstore_group_add_channel_generic(memstore_channel_head_t *ch, int n) {
+  int self_owned = ch->owner == memstore_slot();
+  if(ch->groupnode->group) {
+    group_add_channel_internal(ch->groupnode->group, ch->multi != NULL, self_owned, n);
+  }
+  else {
+    add_channel_count_callback_data_t             *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    if(!d) {
+      ERR("Couldn't allocate group_add_channel data");
+      return NGX_ERROR;
+    }
+    else {
+      d->n = n;
+      d->multi = ch->multi != NULL;
+      d->self_owned = self_owned;
+      add_whenready_callback(ch->groupnode, "add channel", (callback_pt )group_add_channel_callback, d);
+    }
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_add_channel(memstore_channel_head_t *ch) {
+  return memstore_group_add_channel_generic(ch, 1);
+}
+
+ngx_int_t memstore_group_remove_channel(memstore_channel_head_t *ch) {
+  return memstore_group_add_channel_generic(ch, -1);
+}
+
+static ngx_int_t group_add_message_internal(nchan_group_t *shm_group, size_t mem_sz, size_t file_sz, int n) {
+  
+  if(shm_group) {
+    ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->messages, n);
+    ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->messages_shmem_bytes, n * mem_sz);
+    if(file_sz > 0) {
+      ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->messages_file_bytes, n * file_sz);
+    }
+  }
+  return NGX_OK;
+}
+
+typedef struct {
+  int n;
+  size_t mem_sz;
+  size_t file_sz;
+} add_message_callback_data_t;
+
+static ngx_int_t group_add_message_callback(ngx_int_t rc, nchan_group_t *shm_group, add_message_callback_data_t *d) {
+  group_add_message_internal(shm_group, d->mem_sz, d->file_sz, d->n);
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static ngx_int_t memstore_group_add_message_generic(group_tree_node_t *gtn, nchan_msg_t *msg, int n) {
+  size_t         mem_sz = memstore_msg_memsize(msg);
+  size_t         file_sz = ngx_buf_in_memory_only((&msg->buf)) ? 0 : ngx_buf_size((&msg->buf));
+  if(gtn->group) {
+    group_add_message_internal(gtn->group, mem_sz, file_sz, n);
+  }
+  else {
+    add_message_callback_data_t *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    if(!d) {
+      ERR("Couldn't allocate group_add_message data");
+      return NGX_ERROR;
+    }
+    else {
+      d->n = n;
+      d->mem_sz = mem_sz;
+      d->file_sz = file_sz;
+      add_whenready_callback(gtn, "add message", (callback_pt )group_add_message_callback, d);
+    }
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_add_message(group_tree_node_t *gtn, nchan_msg_t *msg) {
+  return memstore_group_add_message_generic(gtn, msg, 1);
+}
+
+ngx_int_t memstore_group_remove_message(group_tree_node_t *gtn, nchan_msg_t *msg) {
+  return memstore_group_add_message_generic(gtn, msg, -1);
+}
+
+
+
+static ngx_int_t group_add_subscribers_internal(nchan_group_t *shm_group, int n) {
+  if(shm_group) {
+    ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->subscribers, n);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t group_add_subscribers_callback(ngx_int_t rc, nchan_group_t *shm_group, void *pd) {
+  intptr_t    n = (intptr_t )pd;
+  group_add_subscribers_internal(shm_group, n);
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_add_subscribers(group_tree_node_t *gtn, int count) {
+  if(gtn->group) {
+    group_add_subscribers_internal(gtn->group, count);
+  }
+  else {
+    add_whenready_callback(gtn, "add subscribers", (callback_pt )group_add_subscribers_callback, (void *)(intptr_t )count);
+  }
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/store/memory/groups.h b/debian/modules/nchan/src/store/memory/groups.h
new file mode 100644
index 0000000..6fc80dd
--- /dev/null
+++ b/debian/modules/nchan/src/store/memory/groups.h
@@ -0,0 +1,55 @@
+ #ifndef MEMSTORE_GROUPS_HEADER
+#define MEMSTORE_GROUPS_HEADER
+#include <nchan_module.h>
+#include <util/nchan_rbtree.h>
+
+typedef struct {
+  rbtree_seed_t           tree;
+} memstore_groups_t;
+
+typedef struct group_tree_node_s group_tree_node_t ;
+
+#include "store-private.h"
+
+typedef struct group_callback_s group_callback_t ;
+struct group_callback_s {
+  callback_pt         cb;
+  void               *pd;
+  group_callback_t   *next;
+  char               *label;
+};
+
+struct group_tree_node_s {
+  ngx_str_t                 name; //local memory copy of group name
+  nchan_group_t            *group;
+  group_callback_t         *when_ready_head;
+  group_callback_t         *when_ready_tail;
+  memstore_channel_head_t  *owned_chanhead_head;
+  time_t                    getting_group;
+};
+
+ngx_int_t memstore_groups_init(memstore_groups_t *);
+ngx_int_t memstore_groups_shutdown(memstore_groups_t *);
+
+
+ngx_int_t memstore_group_find(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd);
+ngx_int_t memstore_group_find_from_groupnode(memstore_groups_t *gp, group_tree_node_t *gtn, callback_pt cb, void *pd);
+
+
+group_tree_node_t *memstore_groupnode_get(memstore_groups_t *gp, ngx_str_t *name);
+nchan_group_t *memstore_group_owner_find(memstore_groups_t *gp, ngx_str_t *name, int *group_just_created);
+ngx_int_t memstore_group_receive(memstore_groups_t *gp, nchan_group_t *shm_group);
+ngx_int_t memstore_group_delete(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd);
+ngx_int_t memstore_group_receive_delete(memstore_groups_t *gp, nchan_group_t *shm_group);
+
+ngx_int_t memstore_group_add_channel(memstore_channel_head_t *ch);
+ngx_int_t memstore_group_remove_channel(memstore_channel_head_t *ch);
+
+void memstore_group_associate_own_channel(memstore_channel_head_t *ch);
+void memstore_group_dissociate_own_channel(memstore_channel_head_t *ch);
+
+ngx_int_t memstore_group_add_message(group_tree_node_t *gtn, nchan_msg_t *msg);
+ngx_int_t memstore_group_remove_message(group_tree_node_t *gtn, nchan_msg_t *msg);
+
+ngx_int_t memstore_group_add_subscribers(group_tree_node_t *gtn, int count);
+#endif //MEMSTORE_GROUPS_HEADER
diff --git a/debian/modules/nchan/src/store/memory/ipc-handlers.c b/debian/modules/nchan/src/store/memory/ipc-handlers.c
index 6656b07..8203b0c 100644
--- a/debian/modules/nchan/src/store/memory/ipc-handlers.c
+++ b/debian/modules/nchan/src/store/memory/ipc-handlers.c
@@ -7,31 +7,66 @@
 #include <assert.h>
 #include <store/redis/store.h>
 #include <subscribers/memstore_ipc.h>
+#include <subscribers/getmsg_proxy.h>
 #include <subscribers/memstore_redis.h>
-#include <util/nchan_msgid.h>
+#include <util/nchan_msg.h>
+#include <util/nchan_benchmark.h>
 
-#define IPC_SUBSCRIBE               1
-#define IPC_SUBSCRIBE_REPLY         2
-#define IPC_UNSUBSCRIBE             3  //NOT USED
-#define IPC_UNSUBSCRIBED            4
-#define IPC_PUBLISH_MESSAGE         5
-#define IPC_PUBLISH_MESSAGE_REPLY   6
-#define IPC_PUBLISH_STATUS          7
-#define IPC_PUBLISH_STATUS_REPLY    8
-#define IPC_GET_MESSAGE             9
-#define IPC_GET_MESSAGE_REPLY       10
-#define IPC_DELETE                  11
-#define IPC_DELETE_REPLY            12
-#define IPC_GET_CHANNEL_INFO        13
-#define IPC_GET_CHANNEL_INFO_REPLY  14
-#define IPC_GET_CHANNEL_AUTHCHECK   15
-#define IPC_GET_CHANNEL_AUTHCHECK_REPLY 16
-#define IPC_SUBSCRIBER_KEEPALIVE    17
-#define IPC_SUBSCRIBER_KEEPALIVE_REPLY 18
 
-#define IPC_TEST_FLOOD                 30
+//macro black magic, AKA X-Macros
+#define LIST_IPC_COMMANDS(L) \
+  L(subscribe) \
+  L(subscribe_reply) \
+  L(subscribe_chanhead_release) \
+  L(subscribe_chanhead_nevermind_release) \
+  L(unsubscribed) \
+  L(publish_message) \
+  L(publish_message_reply) \
+  L(publish_status) \
+  L(publish_notice) \
+  L(get_message) \
+  L(get_message_reply) \
+  L(delete) \
+  L(delete_reply) \
+  L(get_channel_info) \
+  L(get_channel_info_reply) \
+  L(channel_auth_check) \
+  L(channel_auth_check_reply) \
+  L(subscriber_keepalive) \
+  L(subscriber_keepalive_reply) \
+  L(get_group) \
+  L(group) \
+  L(group_delete) \
+  L(flood_test) \
+  L(benchmark_initialize) \
+  L(benchmark_start) \
+  L(benchmark_stop) \
+  L(benchmark_abort) \
+  L(benchmark_finish) \
+  L(benchmark_finish_reply) \
 
 
+
+#define MAKE_ipc_handlers_t(val) ipc_handler_pt val;
+typedef struct {
+  LIST_IPC_COMMANDS(MAKE_ipc_handlers_t)
+} ipc_handlers_t;
+
+#define MAKE_ipc_command_codes_t(val) int val;
+typedef struct {
+  LIST_IPC_COMMANDS(MAKE_ipc_command_codes_t);
+} ipc_command_codes_t;
+
+#define MAKE_ipc_cmd(val) offsetof(ipc_handlers_t, val)/sizeof(ipc_handler_pt),
+static ipc_command_codes_t ipc_cmd = {
+  LIST_IPC_COMMANDS(MAKE_ipc_cmd)
+};
+
+#define IPC_CMDS (sizeof(ipc_handlers_t)/sizeof(ipc_handler_pt))
+
+#define ipc_cmd(cmd, dst, data) ipc_alert(nchan_memstore_get_ipc(), dst, ipc_cmd.cmd, data, sizeof(*(data)))
+#define ipc_broadcast_cmd(cmd, data) ipc_broadcast_alert(nchan_memstore_get_ipc(), ipc_cmd.cmd, data, sizeof(*(data)))
+
 //#define DEBUG_LEVEL NGX_LOG_WARN
 #define DEBUG_LEVEL NGX_LOG_DEBUG
 
@@ -53,28 +88,27 @@ static nchan_msg_id_t zero_msgid = NCHAN_ZERO_MSGID;
 
 static ngx_str_t *str_shm_copy(ngx_str_t *str){
   ngx_str_t *out;
-  out = shm_copy_immutable_string(nchan_memstore_get_shm(), str);
-  DBG("create shm_str %p (data@ %p) %V", out, out->data, out);
+  out = shm_copy_immutable_string(nchan_store_memory_shmem, str);
+  if(out) {
+    DBG("create shm_str %p (data@ %p) %V", out, out->data, out);
+  }
   return out;
 }
 
 static void str_shm_free(ngx_str_t *str) {
   DBG("free shm_str %V @ %p", str, str->data);
-  shm_free_immutable_string(nchan_memstore_get_shm(), str);
+  shm_free_immutable_string(nchan_store_memory_shmem, str);
 }
 
 ////////// SUBSCRIBE ////////////////
-union subdata_u {
-  memstore_channel_head_t     *origin_chanhead;
-  subscriber_t                *subscriber;
-};
-
 typedef struct {
   ngx_str_t                   *shm_chid;
   store_channel_head_shm_t    *shared_channel_data;
   nchan_loc_conf_t            *cf;
-  union subdata_u              d;
-  
+  memstore_channel_head_t     *origin_chanhead;
+  memstore_channel_head_t     *owner_chanhead;
+  subscriber_t                *subscriber;
+  ngx_int_t                    rc;
 } subscribe_data_t;
 
 ngx_int_t memstore_ipc_send_subscribe(ngx_int_t dst, ngx_str_t *chid, memstore_channel_head_t *origin_chanhead, nchan_loc_conf_t *cf) {
@@ -84,40 +118,53 @@ ngx_int_t memstore_ipc_send_subscribe(ngx_int_t dst, ngx_str_t *chid, memstore_c
   DEBUG_MEMZERO(&data);
   
   if((data.shm_chid = str_shm_copy(chid)) == NULL) {
-    ERR("Out of shared memory, can't send IPC subscrive alert");
+    nchan_log_ooshm_error("sending IPC subscribe alert for channel %V", chid);
     return NGX_DECLINED;
   }
   data.shared_channel_data = NULL;
-  data.d.origin_chanhead = origin_chanhead;
+  data.origin_chanhead = origin_chanhead;
+  data.owner_chanhead = NULL;
   data.cf = cf;
   
-  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_SUBSCRIBE, &data, sizeof(data));
+  assert(memstore_str_owner(data.shm_chid) == dst);
+  
+  return ipc_cmd(subscribe, dst, &data);
 }
 static void receive_subscribe(ngx_int_t sender, subscribe_data_t *d) {
   memstore_channel_head_t    *head;
   subscriber_t               *ipc_sub = NULL;
+  ngx_int_t                   rc;
   
   DBG("received subscribe request for channel %V", d->shm_chid);
   head = nchan_memstore_get_chanhead(d->shm_chid, d->cf);
   
   if(head == NULL) {
-    ERR("couldn't get chanhead while receiving subscribe ipc msg");
+    //ERR("couldn't get chanhead while receiving subscribe ipc msg");
     d->shared_channel_data = NULL;
-    d->d.subscriber = NULL;
+    d->subscriber = NULL;
   }
   else {
-    ipc_sub = memstore_ipc_subscriber_create(sender, &head->id, d->cf, d->d.origin_chanhead);
-    d->d.subscriber = ipc_sub;
+    ipc_sub = memstore_ipc_subscriber_create(sender, &head->id, d->cf, d->origin_chanhead);
+    d->subscriber = ipc_sub;
     d->shared_channel_data = head->shared;
+    d->owner_chanhead = head;
+    memstore_chanhead_reserve(head, "interprocess subscribe");
+    
+    ngx_atomic_fetch_add(&head->shared->gc.outside_refcount, 1); //it's awkward to put this refcount here, but necessary.
+    
     assert(d->shared_channel_data);
   }
   
-  ipc_alert(nchan_memstore_get_ipc(), sender, IPC_SUBSCRIBE_REPLY, d, sizeof(*d));
-  DBG("sent subscribe reply for channel %V to %i", d->shm_chid, sender);
-  
   if(ipc_sub) {
-    head->spooler.fn->add(&head->spooler, ipc_sub);
+    rc = head->spooler.fn->add(&head->spooler, ipc_sub);
+    d->rc = rc;
   }
+  else {
+    d->rc = NGX_ERROR;
+  }
+  
+  ipc_cmd(subscribe_reply, sender, d);
+  DBG("sent subscribe reply for channel %V to %i", d->shm_chid, sender);
 }
 static void receive_subscribe_reply(ngx_int_t sender, subscribe_data_t *d) {
   memstore_channel_head_t      *head;
@@ -125,46 +172,85 @@ static void receive_subscribe_reply(ngx_int_t sender, subscribe_data_t *d) {
   DBG("received subscribe reply for channel %V", d->shm_chid);
   //we have the chanhead address, but are too afraid to use it.
   
-  if(!d->shared_channel_data && !d->d.subscriber) {
-    ERR("failed to subscribe");
-    return;
-  }
-  
   if((head = nchan_memstore_get_chanhead_no_ipc_sub(d->shm_chid, d->cf)) == NULL) {
     ERR("Error regarding an aspect of life or maybe freshly fallen cookie crumbles");
+    str_shm_free(d->shm_chid);
     return;
   }
   
-  old_shared = head->shared;
-  if(old_shared) {
-    assert(old_shared == d->shared_channel_data);
+  if(head != d->origin_chanhead) {    
+    assert(d->owner_chanhead);
+    ipc_cmd(subscribe_chanhead_nevermind_release, sender, d);
+    return;
   }
-  DBG("receive subscribe proceed to do ipc_sub stuff");
-  head->shared = d->shared_channel_data;
   
-  if(old_shared == NULL) {
-    //ERR("%V local total_sub_count %i, internal_sub_count %i", &head->id,  head->sub_count, head->internal_sub_count);
-    assert(head->total_sub_count >= head->internal_sub_count);
-    ngx_atomic_fetch_add(&head->shared->sub_count, head->total_sub_count - head->internal_sub_count);
-    ngx_atomic_fetch_add(&head->shared->internal_sub_count, head->internal_sub_count);
+  if(!d->shared_channel_data && !d->subscriber) {
+    //ERR("failed to subscribe");
+    nchan_memstore_publish_generic(head, NULL, NGX_HTTP_INSUFFICIENT_STORAGE, NULL);
+    head->status = NOTREADY;
+    chanhead_gc_add(head, "failed to subscribe to channel owner worker");
   }
   else {
-    ERR("%V sub count already shared, don't update", &head->id);
+    old_shared = head->shared;
+    if(old_shared) {
+      assert(old_shared == d->shared_channel_data);
+    }
+    DBG("receive subscribe proceed to do ipc_sub stuff");
+    head->shared = d->shared_channel_data;
+    
+    if(old_shared == NULL) {
+      //ERR("%V local total_sub_count %i, internal_sub_count %i", &head->id,  head->sub_count, head->internal_sub_count);
+      assert(head->total_sub_count >= head->internal_sub_count);
+      ngx_atomic_fetch_add(&head->shared->sub_count, head->total_sub_count - head->internal_sub_count);
+      ngx_atomic_fetch_add(&head->shared->internal_sub_count, head->internal_sub_count);
+    }
+    else {
+      ERR("%V sub count already shared, don't update", &head->id);
+    }
+    
+    assert(head->shared != NULL);
+    if(head->foreign_owner_ipc_sub && head->foreign_owner_ipc_sub != d->subscriber) {
+      // we got another subscriber for this chanhead, probably due to some very heavy delays
+      // discard it, keeping the old one.
+      // (It might be nice to discard the _old_ subscriber, but the owner worker may have already deleted it
+      // or may have changed altogether due to a previous worker crash)
+      ERR("Got ipc-subscriber for an already subscribed channel %V", &head->id);
+      memstore_ready_chanhead_unless_stub(head);
+      ipc_cmd(subscribe_chanhead_nevermind_release, sender, d);
+      return;
+    }
+    else {
+      head->foreign_owner_ipc_sub = d->subscriber;
+    }
+    
+    memstore_ready_chanhead_unless_stub(head);
   }
   
-  assert(head->shared != NULL);
-  if(head->foreign_owner_ipc_sub) {
-    assert(head->foreign_owner_ipc_sub == d->d.subscriber);
-  }
-  else {
-    head->foreign_owner_ipc_sub = d->d.subscriber;
-  }
-  
-  memstore_ready_chanhead_unless_stub(head);
-  
   str_shm_free(d->shm_chid);
+  if(d->owner_chanhead) {
+    ipc_cmd(subscribe_chanhead_release, sender, d);
+  }
 }
 
+static void receive_subscribe_chanhead_release(ngx_int_t sender, subscribe_data_t *d) {
+  DBG("release the %V", &d->owner_chanhead->id);
+  memstore_chanhead_release(d->owner_chanhead, "interprocess subscribe");
+}
+static void receive_subscribe_chanhead_nevermind_release(ngx_int_t sender, subscribe_data_t *d) {
+  ERR("release & nevermind the %V", &d->owner_chanhead->id);
+  memstore_channel_head_t      *head;
+  head = nchan_memstore_find_chanhead(d->shm_chid);
+  if(head == NULL || head != d->owner_chanhead) {
+    ERR("wrong chanhead on receive_subscribe_chanhead_nevermind_release ( expected %p, got %p)", d->owner_chanhead, head);
+    return;
+  }
+  
+  memstore_ipc_subscriber_unhook(d->subscriber);
+  d->subscriber->fn->respond_status(d->subscriber, NGX_HTTP_GONE, NULL, NULL);
+  
+  memstore_chanhead_release(d->owner_chanhead, "interprocess subscribe");
+  str_shm_free(d->shm_chid);
+}
 
 
 ////////// UNSUBSCRIBED ////////////////
@@ -177,10 +263,10 @@ ngx_int_t memstore_ipc_send_unsubscribed(ngx_int_t dst, ngx_str_t *chid, void* p
   DBG("send unsubscribed to %i %V", dst, chid);
   unsubscribed_data_t        data = {str_shm_copy(chid), privdata};
   if(data.shm_chid == NULL) {
-    ERR("Out of shared memory, can't send IPC unsubscribe alert");
+    nchan_log_ooshm_error("sending IPC unsubscribe alert for channel %V", chid);
     return NGX_DECLINED;
   }
-  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_UNSUBSCRIBED, &data, sizeof(data));
+  return ipc_cmd(unsubscribed, dst, &data);
 }
 static void receive_unsubscribed(ngx_int_t sender, unsubscribed_data_t *d) {
   DBG("received unsubscribed request for channel %V privdata %p", d->shm_chid, d->privdata);
@@ -213,23 +299,23 @@ static void receive_unsubscribed(ngx_int_t sender, unsubscribed_data_t *d) {
 ////////// PUBLISH STATUS ////////////////
 typedef struct {
   ngx_str_t                 *shm_chid;
-  ngx_int_t                  status_code;
-  const ngx_str_t           *status_line;
+  ngx_int_t                  code;
+  const ngx_str_t           *data;
   callback_pt                callback;
   void                      *callback_privdata;
-} publish_status_data_t;
+} publish_code_data_t;
 
 ngx_int_t memstore_ipc_send_publish_status(ngx_int_t dst, ngx_str_t *chid, ngx_int_t status_code, const ngx_str_t *status_line, callback_pt callback, void *privdata) {
   DBG("IPC: send publish status to %i ch %V", dst, chid);
-  publish_status_data_t  data = {str_shm_copy(chid), status_code, status_line, callback, privdata};
+  publish_code_data_t  data = {str_shm_copy(chid), status_code, status_line, callback, privdata};
   if(data.shm_chid == NULL) {
+    nchan_log_ooshm_error("sending IPC status alert for channel %V", chid);
     return NGX_DECLINED;
   }
-  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_PUBLISH_STATUS, &data, sizeof(data));
+  return ipc_cmd(publish_status, dst, &data);
 }
 
-static void receive_publish_status(ngx_int_t sender, publish_status_data_t *d) {
-  static ngx_str_t               nullstring = ngx_null_string;
+static void receive_publish_status(ngx_int_t sender, publish_code_data_t *d) {
   memstore_channel_head_t       *chead;
   
   if((chead = nchan_memstore_find_chanhead(d->shm_chid)) == NULL) {
@@ -237,20 +323,52 @@ static void receive_publish_status(ngx_int_t sender, publish_status_data_t *d) {
       ERR("can't find chanhead for id %V, but it's okay.", d->shm_chid);
     }
     else {
-      ERR("can't find chanhead for id %V", d->shm_chid);
-      assert(0);
+      ERR("Can't find chanhead for id %V while publishing status %i. This is not a big deal if you just reloaded Nchan.", d->shm_chid, d->code);
     }
+    str_shm_free(d->shm_chid);
     return;
   }
   
-  DBG("IPC: received publish status for channel %V status %i %s", d->shm_chid, d->status_code, d->status_line == NULL ? &nullstring : d->status_line);
+  DBG("IPC: received publish status for channel %V status %i", d->shm_chid, d->code);
   
-  nchan_memstore_publish_generic(chead, NULL, d->status_code, d->status_line);
+  nchan_memstore_publish_generic(chead, NULL, d->code, d->data);
   
   str_shm_free(d->shm_chid);
   d->shm_chid=NULL;
 }
 
+////////// PUBLISH_NOTICE ////////////////
+ngx_int_t memstore_ipc_send_publish_notice(ngx_int_t dst, ngx_str_t *chid, ngx_int_t notice_code, void *notice_data) {
+  DBG("IPC: send publish notice to %i ch %V", dst, chid);
+  publish_code_data_t  data = {str_shm_copy(chid), notice_code, notice_data, NULL, NULL};
+  if(data.shm_chid == NULL) {
+    nchan_log_ooshm_error("sending IPC notice alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  return ipc_cmd(publish_notice, dst, &data);
+}
+
+static void receive_publish_notice(ngx_int_t sender, publish_code_data_t *d) {
+  memstore_channel_head_t       *chead;
+  
+  if((chead = nchan_memstore_find_chanhead(d->shm_chid)) == NULL) {
+    if(ngx_exiting || ngx_quit) {
+      ERR("can't find chanhead for id %V, but it's okay.", d->shm_chid);
+    }
+    else {
+      ERR("Can't find chanhead for id %V while publishing status %i. This is not a big deal if you just reloaded Nchan.", d->shm_chid, d->code);
+    }
+    str_shm_free(d->shm_chid);
+    return;
+  }
+  
+  DBG("IPC: received publish notice for channel %V notice %i", d->shm_chid, d->code);
+  
+  nchan_memstore_publish_notice(chead, d->code, d->data);
+  
+  str_shm_free(d->shm_chid);
+}
+
 ////////// PUBLISH  ////////////////
 typedef struct {
   ngx_str_t                 *shm_chid;
@@ -266,11 +384,11 @@ ngx_int_t memstore_ipc_send_publish_message(ngx_int_t dst, ngx_str_t *chid, ncha
   DEBUG_MEMZERO(&data);
   
   DBG("IPC: send publish message to %i ch %V", dst, chid);
-  assert(shm_msg->shared == 1);
-  assert(shm_msg->temp_allocd == 0);
+  assert(shm_msg->storage == NCHAN_MSG_SHARED);
   assert(chid->data != NULL);
   data.shm_chid = str_shm_copy(chid);
   if(data.shm_chid == NULL) {
+    nchan_log_ooshm_error("sending IPC publish-message alert for channel %V", chid);
     return NGX_DECLINED;
   }
   data.shm_msg = shm_msg;
@@ -281,7 +399,7 @@ ngx_int_t memstore_ipc_send_publish_message(ngx_int_t dst, ngx_str_t *chid, ncha
   assert(data.shm_chid->data != NULL);
   assert(msg_reserve(shm_msg, "publish_message") == NGX_OK);
   
-  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_PUBLISH_MESSAGE, &data, sizeof(data));
+  return ipc_cmd(publish_message, dst, &data);
 }
 
 typedef struct {
@@ -365,7 +483,7 @@ static ngx_int_t publish_message_generic_callback(ngx_int_t status, void *rptr,
     rd.msg_time = ch->last_published_msg_id.time;
     rd.msg_tag = ch->last_published_msg_id.tag.fixed[0];
   }
-  ipc_alert(nchan_memstore_get_ipc(), cd->sender, IPC_PUBLISH_MESSAGE_REPLY, &rd, sizeof(rd));
+  ipc_cmd(publish_message_reply, cd->sender, &rd);
   if(cd->allocd) {
     ngx_free(cd);
   }
@@ -407,29 +525,34 @@ typedef struct {
 ngx_int_t memstore_ipc_send_get_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_id_t *msgid, void *privdata) {
   getmessage_data_t      data;
   
-  if((data.shm_chid= str_shm_copy(chid)) == NULL) {
-    return NGX_ERROR;
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    nchan_log_ooshm_error("sending IPC get-message alert for channel %V", chid);
+    return NGX_DECLINED;
   }
   data.privdata = privdata;
   data.d.req.msgid = *msgid;
   
   DBG("IPC: send get message from %i ch %V", dst, chid);
-  assert(data.shm_chid->len>1);
-  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_GET_MESSAGE, &data, sizeof(data));
+  assert(data.shm_chid->len >= 1);
+  return ipc_cmd(get_message, dst, &data);
 }
 
 
 typedef struct {
   ngx_int_t            sender;
   getmessage_data_t    data;
-} getmessage_data_rsub_pd_t;
+} getmessage_data_proxy_pd_t;
 
-static void ipc_handler_notify_on_MSG_EXPECTED_callback(nchan_msg_status_t status, void *pd) {
-  assert(status == MSG_EXPECTED || status == MSG_NORESPONSE);
-  getmessage_data_rsub_pd_t *gd = (getmessage_data_rsub_pd_t *)pd;
-  gd->data.d.resp.getmsg_code = status;
-  gd->data.d.resp.shm_msg = NULL;
-  ipc_alert(nchan_memstore_get_ipc(), gd->sender, IPC_GET_MESSAGE_REPLY, &gd->data, sizeof(gd->data));
+//for retrieving messages from unready buffers
+static ngx_int_t ipc_getmsg_proxy_callback(ngx_int_t code, nchan_msg_t *msg, getmessage_data_proxy_pd_t *ppd) {
+  ppd->data.d.resp.getmsg_code = code;
+  ppd->data.d.resp.shm_msg = msg;
+  if(msg) {
+    assert(msg_reserve(msg, "get_message_reply") == NGX_OK);
+  }
+  ipc_cmd(get_message_reply, ppd->sender, &ppd->data);
+  ngx_free(ppd);
+  return NGX_OK;
 }
 
 static void receive_get_message(ngx_int_t sender, getmessage_data_t *d) {
@@ -437,7 +560,7 @@ static void receive_get_message(ngx_int_t sender, getmessage_data_t *d) {
   store_message_t             *msg = NULL;
   
   
-  assert(d->shm_chid->len>1);
+  assert(d->shm_chid->len >= 1);
   assert(d->shm_chid->data!=NULL);
   DBG("IPC: received get_message request for channel %V privdata %p", d->shm_chid, d->privdata);
   
@@ -447,32 +570,47 @@ static void receive_get_message(ngx_int_t sender, getmessage_data_t *d) {
     d->d.resp.getmsg_code = MSG_NOTFOUND;
     d->d.resp.shm_msg = NULL;
   }
-  else {
-    nchan_msg_status_t           status;
-    msg = chanhead_find_next_message(head, &d->d.req.msgid, &status);
-    
-    if(msg == NULL && head->cf && head->cf->redis.enabled) {
-      //messages from redis are not requested explicitly, but are delivered from oldest to newest
-      //by the memmstore-redis subscriber. 
-      getmessage_data_rsub_pd_t  rdata = {sender, *d};
-      
-      nchan_memstore_redis_subscriber_notify_on_MSG_EXPECTED(head->redis_sub, &d->d.req.msgid, ipc_handler_notify_on_MSG_EXPECTED_callback, sizeof(rdata), &rdata);
-      return;
-    }
-    
-    d->d.resp.getmsg_code = status;
+  else if(head->msg_buffer_complete) {
+    msg = chanhead_find_next_message(head, &d->d.req.msgid, &d->d.resp.getmsg_code);
     d->d.resp.shm_msg = msg == NULL ? NULL : msg->msg;
   }
+  else {
+    //buffer is not ready. reply when it's ready
+    getmessage_data_proxy_pd_t *ppd = ngx_alloc(sizeof(*ppd), ngx_cycle->log);
+    if(ppd == NULL) {
+      ERR("couldn't allocate getmessage proxy data for ipc get_message");
+      goto err;
+    }
+    ppd->data = *d;
+    ppd->sender = sender;
+    
+    subscriber_t *getmsg_sub = getmsg_proxy_subscriber_create(&d->d.req.msgid, (callback_pt )ipc_getmsg_proxy_callback, ppd);
+    if(!getmsg_sub) {
+      ERR("couldn't allocate getmessage proxy subscriber for ipc get_message");
+      goto err;
+    }
+    if(head->spooler.fn->add(&head->spooler, getmsg_sub) != NGX_OK) {
+      ERR("couldn't enqueue getmsg proxy subscriber for ipc get_message");
+      goto err;
+    }
+    return;
+  }
   if(d->d.resp.shm_msg) {
     assert(msg_reserve(d->d.resp.shm_msg, "get_message_reply") == NGX_OK);
   }
   DBG("IPC: send get_message_reply for channel %V  msg %p, privdata: %p", d->shm_chid, msg, d->privdata);
-  ipc_alert(nchan_memstore_get_ipc(), sender, IPC_GET_MESSAGE_REPLY, d, sizeof(*d));
+  ipc_cmd(get_message_reply, sender, d);
+  return;
+
+err:
+  d->d.resp.getmsg_code = MSG_ERROR;
+  d->d.resp.shm_msg = NULL;
+  ipc_cmd(get_message_reply, sender, d);
 }
 
 static void receive_get_message_reply(ngx_int_t sender, getmessage_data_t *d) {
   
-  assert(d->shm_chid->len>1);
+  assert(d->shm_chid->len >= 1);
   assert(d->shm_chid->data!=NULL);
   DBG("IPC: received get_message reply for channel %V msg %p privdata %p", d->shm_chid, d->d.resp.shm_msg, d->privdata);
   nchan_memstore_handle_get_message_reply(d->d.resp.shm_msg, d->d.resp.getmsg_code, d->privdata);
@@ -498,10 +636,11 @@ typedef struct {
 ngx_int_t memstore_ipc_send_delete(ngx_int_t dst, ngx_str_t *chid, callback_pt callback,void *privdata) {
   delete_data_t  data = {str_shm_copy(chid), 0, NULL, 0, callback, privdata};
   if(data.shm_chid == NULL) {
-    return NGX_ERROR;
+    nchan_log_ooshm_error("sending IPC send-delete alert for channel %V", chid);
+    return NGX_DECLINED;
   }
   DBG("IPC: send delete to %i ch %V", dst, chid);
-  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_DELETE, &data, sizeof(data));
+  return ipc_cmd(delete, dst, &data);
 }
 
 static ngx_int_t delete_callback_handler(ngx_int_t, nchan_channel_t *, delete_data_t *);
@@ -517,10 +656,10 @@ static ngx_int_t delete_callback_handler(ngx_int_t code, nchan_channel_t *chan,
   
   d->code = code;
   if (chan) {
-    if((chan_info = shm_alloc(nchan_memstore_get_shm(), sizeof(*chan_info), "channel info for delete IPC response")) == NULL) {
+    if((chan_info = shm_alloc(nchan_store_memory_shmem, sizeof(*chan_info), "channel info for delete IPC response")) == NULL) {
       d->shm_channel_info = NULL;
-      //yeah
-      ERR("unable to allocate chan_info");
+      d->code = NGX_HTTP_INSUFFICIENT_STORAGE;
+      nchan_log_ooshm_error("sending IPC delete-reply alert for channel %V", d->shm_chid);
     }
     else {
       d->shm_channel_info= chan_info;
@@ -541,7 +680,7 @@ static ngx_int_t delete_callback_handler(ngx_int_t code, nchan_channel_t *chan,
   else {
     d->shm_channel_info = NULL;
   }
-  ipc_alert(nchan_memstore_get_ipc(), d->sender, IPC_DELETE_REPLY, d, sizeof(*d));
+  ipc_cmd(delete_reply, d->sender, d);
   return NGX_OK;
 }
 static void receive_delete_reply(ngx_int_t sender, delete_data_t *d) {
@@ -550,7 +689,7 @@ static void receive_delete_reply(ngx_int_t sender, delete_data_t *d) {
   d->callback(d->code, d->shm_channel_info, d->privdata);
   
   if(d->shm_channel_info != NULL) {
-    shm_free(nchan_memstore_get_shm(), d->shm_channel_info);
+    shm_free(nchan_store_memory_shmem, d->shm_channel_info);
   }
   str_shm_free(d->shm_chid);
 }
@@ -561,31 +700,36 @@ static void receive_delete_reply(ngx_int_t sender, delete_data_t *d) {
 ////////// GET CHANNEL INFO ////////////////
 typedef struct {
   ngx_str_t                 *shm_chid;
+  nchan_loc_conf_t          *cf;
   store_channel_head_shm_t  *channel_info;
   nchan_msg_id_t             last_msgid;
   callback_pt                callback;
   void                      *privdata;
 } channel_info_data_t;
 
-ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, callback_pt callback, void* privdata) {
+ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata) {
   DBG("send get_channel_info to %i %V", dst, chid);
   channel_info_data_t        data;
   DEBUG_MEMZERO(&data);
   if((data.shm_chid = str_shm_copy(chid)) == NULL) {
-    return NGX_ERROR;
+    nchan_log_ooshm_error("sending IPC get-channel-info alert for channel %V", chid);
+    return NGX_DECLINED;
   }
 
   data.channel_info = NULL;
   data.last_msgid = zero_msgid;
+  data.cf = cf;
   data.callback = callback;
   data.privdata = privdata;
-  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_GET_CHANNEL_INFO, &data, sizeof(data));
+  return ipc_cmd(get_channel_info, dst, &data);
 }
-static void receive_get_channel_info(ngx_int_t sender, channel_info_data_t *d) {
-  memstore_channel_head_t    *head;
-  
-  DBG("received get_channel_info request for channel %V privdata %p", d->shm_chid, d->privdata);
-  head = nchan_memstore_find_chanhead(d->shm_chid);
+
+typedef struct {
+  channel_info_data_t   d;
+  ngx_int_t             sender;
+} channel_info_find_chanhead_backup_data_t;
+
+static void receive_get_channel_info_continued(ngx_int_t sender, channel_info_data_t *d, memstore_channel_head_t *head) {
   assert(memstore_slot() == memstore_channel_owner(d->shm_chid));
   if(head == NULL) {
     //already deleted maybe?
@@ -597,7 +741,33 @@ static void receive_get_channel_info(ngx_int_t sender, channel_info_data_t *d) {
     assert(head->latest_msgid.tagcount <= 1);
     d->last_msgid = head->latest_msgid;
   }
-  ipc_alert(nchan_memstore_get_ipc(), sender, IPC_GET_CHANNEL_INFO_REPLY, d, sizeof(*d));
+  ipc_cmd(get_channel_info_reply, sender, d);
+}
+
+static ngx_int_t find_chanhead_w_backup_callback(ngx_int_t rc, void *vd, void *pd) {
+  channel_info_find_chanhead_backup_data_t *d = pd;
+  memstore_channel_head_t                  *head = vd;
+  
+  receive_get_channel_info_continued(d->sender, &d->d, head);
+  
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static void receive_get_channel_info(ngx_int_t sender, channel_info_data_t *d) {
+  memstore_channel_head_t    *head;
+  
+  DBG("received get_channel_info request for channel %V privdata %p", d->shm_chid, d->privdata);
+  if(d->cf->redis.enabled && d->cf->redis.storage_mode == REDIS_MODE_BACKUP) {
+    channel_info_find_chanhead_backup_data_t *dd = ngx_alloc(sizeof(*dd), ngx_cycle->log);
+    dd->d = *d;
+    dd->sender = sender;
+    nchan_memstore_find_chanhead_with_backup(d->shm_chid, d->cf, find_chanhead_w_backup_callback, dd);
+  }
+  else {
+    head = nchan_memstore_find_chanhead(d->shm_chid);
+    receive_get_channel_info_continued(sender, d, head);
+  }
 }
 
 static void receive_get_channel_info_reply(ngx_int_t sender, channel_info_data_t *d) {
@@ -632,11 +802,13 @@ typedef struct {
   void                    *privdata;
 } channel_authcheck_data_t;
 
-ngx_int_t memstore_ipc_send_channel_auth_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata) {
+ngx_int_t memstore_ipc_send_channel_existence_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata) {
   DBG("send channel_auth_check to %i %V", dst, chid);
   channel_authcheck_data_t        data;
+  DEBUG_MEMZERO(&data);
   if((data.shm_chid = str_shm_copy(chid)) == NULL) {
-    return NGX_ERROR;
+    nchan_log_ooshm_error("sending IPC channel-existence-check alert for channel %V", chid);
+    return NGX_DECLINED;
   }
   data.auth_ok = 0;
   data.channel_must_exist = cf->subscribe_only_existing_channel;
@@ -645,7 +817,7 @@ ngx_int_t memstore_ipc_send_channel_auth_check(ngx_int_t dst, ngx_str_t *chid, n
   data.callback = callback;
   data.privdata = privdata;
   
-  return ipc_alert(nchan_memstore_get_ipc(), dst, IPC_GET_CHANNEL_AUTHCHECK, &data, sizeof(data));
+  return ipc_cmd(channel_auth_check, dst, &data);
 }
 
 typedef struct {
@@ -656,7 +828,6 @@ typedef struct {
 static ngx_int_t redis_receive_channel_auth_check_callback(ngx_int_t status, void *ch, void *d) {
   nchan_channel_t                     *channel = (nchan_channel_t *)ch;
   channel_authcheck_data_callback_t   *data = (channel_authcheck_data_callback_t *)d;
-  assert(status == NGX_OK);
   if(channel == NULL) {
     data->d.auth_ok = !data->d.channel_must_exist;
   }
@@ -666,7 +837,7 @@ static ngx_int_t redis_receive_channel_auth_check_callback(ngx_int_t status, voi
   else {
     data->d.auth_ok = channel->subscribers < data->d.max_subscribers;
   }
-  ipc_alert(nchan_memstore_get_ipc(), data->sender, IPC_GET_CHANNEL_AUTHCHECK_REPLY, &data->d, sizeof(data->d));
+  ipc_cmd(channel_auth_check_reply, data->sender, &data->d);
   ngx_free(d);
   return NGX_OK;
 }
@@ -689,7 +860,7 @@ static void receive_channel_auth_check(ngx_int_t sender, channel_authcheck_data_
       assert(head->shared);
       d->auth_ok = head->shared->sub_count < (ngx_uint_t )d->max_subscribers;
     }
-    ipc_alert(nchan_memstore_get_ipc(), sender, IPC_GET_CHANNEL_AUTHCHECK_REPLY, d, sizeof(*d));
+    ipc_cmd(channel_auth_check_reply, sender, d);
   }
   else {
     channel_authcheck_data_callback_t    *dd = ngx_alloc(sizeof(*dd), ngx_cycle->log);
@@ -705,56 +876,162 @@ static void receive_channel_auth_check_reply(ngx_int_t sender, channel_authcheck
 }
 
 /////////// SUBSCRIBER KEEPALIVE ///////////
+typedef enum {
+  KA_REPLY_NORENEW = 0, 
+  KA_REPLY_RENEW,
+  KA_REPLY_UNHOOK_NORENEW,
+} keepalive_reply_action_t;
+
 typedef struct {
   ngx_str_t                   *shm_chid;
   subscriber_t                *ipc_sub;
   memstore_channel_head_t     *originator;
-  ngx_uint_t                   renew;
-  callback_pt                  callback;
-  void                        *privdata;
+  keepalive_reply_action_t     reply_action;  
 } sub_keepalive_data_t;
 
-ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch, callback_pt callback, void *privdata) {
-  sub_keepalive_data_t        data = {str_shm_copy(chid), sub, ch, 0, callback, privdata};
-  if(data.shm_chid == NULL) {
-    return NGX_ERROR;
+ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch) {
+  sub_keepalive_data_t        data;
+  DEBUG_MEMZERO(&data);
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    nchan_log_ooshm_error("sending IPC keepalive alert for channel %V", chid);
+    return NGX_DECLINED;
   }
+  data.ipc_sub = sub;
+  data.originator = ch;
+  
+  data.reply_action = KA_REPLY_NORENEW;
+  
+  sub->fn->reserve(sub);
+  
   DBG("send SUBSCRIBER KEEPALIVE to %i %V", dst, chid);
-  ipc_alert(nchan_memstore_get_ipc(), dst, IPC_SUBSCRIBER_KEEPALIVE, &data, sizeof(data));
+  
+  ipc_cmd(subscriber_keepalive, dst, &data);
   return NGX_OK;
 }
 static void receive_subscriber_keepalive(ngx_int_t sender, sub_keepalive_data_t *d) {
   memstore_channel_head_t    *head;
   DBG("received SUBSCRIBER KEEPALIVE from %i for channel %V", sender, d->shm_chid);
   head = nchan_memstore_find_chanhead(d->shm_chid);
+  str_shm_free(d->shm_chid);
+  
   if(head == NULL) {
     DBG("not subscribed anymore");
-    d->renew = 0;
+    d->reply_action = KA_REPLY_NORENEW;
   }
   else {
-    assert(head == d->originator);
-    assert(head->status == READY || head->status == STUBBED);
-    assert(head->foreign_owner_ipc_sub == d->ipc_sub);
-    if(head->total_sub_count == 0) {
+    if(head != d->originator) {
+      ERR("Got keepalive for expired channel %V", &head->id);
+      d->reply_action = KA_REPLY_UNHOOK_NORENEW;
+    }
+    else if(head->status != READY && head->status != STUBBED) {
+      if(head->status == WAITING && head->foreign_owner_ipc_sub == NULL) {
+        //wrong-status head. don't renew, get rid of this chanhead
+        nchan_memstore_publish_generic(head, NULL, NGX_HTTP_SERVICE_UNAVAILABLE, NULL);
+        nchan_memstore_force_delete_channel(d->shm_chid, NULL, NULL);
+        d->reply_action = KA_REPLY_UNHOOK_NORENEW;
+      }
+      else {
+        //something's gone extra weird. 
+        //kick out these subs, delete chanhead... just in case
+        nchan_memstore_publish_generic(head, NULL, NGX_HTTP_SERVICE_UNAVAILABLE, NULL);
+        nchan_memstore_force_delete_channel(d->shm_chid, NULL, NULL);
+        d->reply_action = KA_REPLY_UNHOOK_NORENEW;
+      }
+    }
+    else if(head->foreign_owner_ipc_sub != d->ipc_sub) {
+      // we got another subscriber for this chanhead, probably due to some very heavy delays
+      // discard it, keeping the old one.
+      // (It might be nice to discard the _old_ subscriber, but the owner worker may have already deleted it
+      ERR("Got ipc-subscriber during keepalive for an already subscribed channel %V", &head->id);
+      d->reply_action = KA_REPLY_UNHOOK_NORENEW;
+    }
+    else if(head->total_sub_count == 0) {
       if(ngx_time() - head->last_subscribed_local > MEMSTORE_IPC_SUBSCRIBER_TIMEOUT) {
-        d->renew = 0;
+        d->reply_action = KA_REPLY_NORENEW;
         DBG("No subscribers lately. Time... to die.");
       }
       else {
         DBG("No subscribers, but there was one %i sec ago. don't unsubscribe.", ngx_time() - head->last_subscribed_local);
-        d->renew = 1;
+        d->reply_action = KA_REPLY_RENEW;
       }
     }
     else {
-      d->renew = 1;
+      d->reply_action = KA_REPLY_RENEW;
     }
   }
-  ipc_alert(nchan_memstore_get_ipc(), sender, IPC_SUBSCRIBER_KEEPALIVE_REPLY, d, sizeof(*d));
+  ipc_cmd(subscriber_keepalive_reply, sender, d);
 }
 
 static void receive_subscriber_keepalive_reply(ngx_int_t sender, sub_keepalive_data_t *d) {
-  d->callback(d->renew, NULL, d->privdata);
-  str_shm_free(d->shm_chid);
+  subscriber_t     *sub = d->ipc_sub;
+  switch(d->reply_action) {
+    case KA_REPLY_NORENEW:
+      sub->fn->dequeue(sub);
+      sub->fn->release(sub, 0);
+      break;
+    case KA_REPLY_RENEW:
+      memstore_ipc_subscriber_keepalive_renew(sub);
+      sub->fn->release(sub, 0);
+      break;
+    case KA_REPLY_UNHOOK_NORENEW:
+      memstore_ipc_subscriber_unhook(sub);
+      sub->fn->release(sub, 0);
+      break;
+    default:
+      raise(SIGABRT);
+  }
+}
+
+
+/////////// GROUPS ///////////
+
+ngx_int_t memstore_ipc_send_get_group(ngx_int_t dst, ngx_str_t *group_id) {
+  ngx_str_t         *shm_id = str_shm_copy(group_id);
+  if(shm_id == NULL) {
+    nchan_log_ooshm_error("sending IPC get-group alert for group %V", group_id);
+    return NGX_DECLINED;
+  }
+  DBG("send GET GROUP to %i %p %V", dst, shm_id, shm_id);
+  ipc_cmd(get_group, dst, &shm_id);
+  return NGX_OK;
+}
+
+static void receive_get_group(ngx_int_t sender, ngx_str_t **group_id) {
+  nchan_group_t  *shared_group;
+  int             new_group;
+  DBG("received GET GROUP from %i %p %V", sender, *group_id, *group_id);
+  
+  shared_group = memstore_group_owner_find(nchan_memstore_get_groups(), *group_id, &new_group);
+  if(!new_group) { //new group is automatically broadcast to everyone, this one already exists.
+    ipc_cmd(group, sender, &shared_group);
+  }
+  
+  str_shm_free(*group_id);
+}
+
+ngx_int_t memstore_ipc_broadcast_group(nchan_group_t *shared_group) {
+  DBG("broadcast GROUP %V to everyone but me", &shared_group->name);
+  ipc_broadcast_cmd(group, &shared_group);
+  
+  return NGX_OK;
+}
+
+static void receive_group(ngx_int_t sender, nchan_group_t **shared_group) {
+  DBG("receive GROUP %V", &(*shared_group)->name);
+  
+  memstore_group_receive(nchan_memstore_get_groups(), *shared_group);
+}
+
+ngx_int_t memstore_ipc_broadcast_group_delete(nchan_group_t *shared_group) {
+  DBG("send DELETE GROUP");
+  ipc_broadcast_cmd(group_delete, &shared_group);
+  return NGX_OK;
+}
+
+static void receive_group_delete(ngx_int_t sender, nchan_group_t **shared_group) {
+  DBG("receive GROUP DELETE %V", &(*shared_group)->name);
+  
+  memstore_group_receive_delete(nchan_memstore_get_groups(), *shared_group);
 }
 
 /////////// FLOOD TEST ///////////
@@ -766,7 +1043,7 @@ typedef struct {
 static int  flood_seq = 0;
 ngx_int_t memstore_ipc_send_flood_test(ngx_int_t dst) {
   flood_data_t        data = {flood_seq++};
-  ipc_alert(nchan_memstore_get_ipc(), dst, IPC_TEST_FLOOD, &data, sizeof(data));
+  ipc_cmd(flood_test, dst, &data);
   return NGX_OK;
 }
 
@@ -779,26 +1056,104 @@ static void receive_flood_test(ngx_int_t sender, flood_data_t *d) {
   nanosleep(&tv, NULL);
 }
 
-static ipc_handler_pt ipc_alert_handler[] = {
-  [IPC_SUBSCRIBE] =                   (ipc_handler_pt )receive_subscribe,
-  [IPC_SUBSCRIBE_REPLY] =             (ipc_handler_pt )receive_subscribe_reply,
-  [IPC_UNSUBSCRIBED] =                (ipc_handler_pt )receive_unsubscribed,
-  [IPC_PUBLISH_MESSAGE] =             (ipc_handler_pt )receive_publish_message,
-  [IPC_PUBLISH_MESSAGE_REPLY] =       (ipc_handler_pt )receive_publish_message_reply,
-  [IPC_PUBLISH_STATUS] =              (ipc_handler_pt )receive_publish_status,
-  [IPC_GET_MESSAGE] =                 (ipc_handler_pt )receive_get_message,
-  [IPC_GET_MESSAGE_REPLY] =           (ipc_handler_pt )receive_get_message_reply,
-  [IPC_DELETE] =                      (ipc_handler_pt )receive_delete,
-  [IPC_DELETE_REPLY] =                (ipc_handler_pt )receive_delete_reply,
-  [IPC_GET_CHANNEL_INFO] =            (ipc_handler_pt )receive_get_channel_info,
-  [IPC_GET_CHANNEL_INFO_REPLY]=       (ipc_handler_pt )receive_get_channel_info_reply,
-  [IPC_GET_CHANNEL_AUTHCHECK] =       (ipc_handler_pt )receive_channel_auth_check,
-  [IPC_GET_CHANNEL_AUTHCHECK_REPLY]=  (ipc_handler_pt )receive_channel_auth_check_reply,
-  [IPC_SUBSCRIBER_KEEPALIVE] =        (ipc_handler_pt )receive_subscriber_keepalive,
-  [IPC_SUBSCRIBER_KEEPALIVE_REPLY] =  (ipc_handler_pt )receive_subscriber_keepalive_reply,
-  [IPC_TEST_FLOOD]                 =  (ipc_handler_pt )receive_flood_test
+////////// BENCHMARK INITIALIZE //////////////
+typedef struct {
+  nchan_loc_conf_t *loc_conf;
+  time_t        time;
+  uint32_t      id;
+  nchan_benchmark_shared_t shared;
+} benchmark_initialize_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_initialize(void *bench_pd) {
+  nchan_benchmark_t            *bench = bench_pd;
+  benchmark_initialize_data_t   data;
+  DEBUG_MEMZERO(&data);
+  data.loc_conf = bench->loc_conf;
+  data.id = bench->id;
+  data.time = bench->time.init;
+  data.shared = bench->shared;
+  
+  return ipc_broadcast_cmd(benchmark_initialize, &data);
+}
+static void receive_benchmark_initialize(ngx_int_t sender, benchmark_initialize_data_t *d) {
+  nchan_benchmark_initialize_from_ipc(sender, d->loc_conf, d->time, d->id, &d->shared);
+}
+
+////////// BENCHMARK RUN ////////////////
+typedef struct {
+  nchan_loc_conf_t *loc_conf;
+} benchmark_run_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_run(void) {
+  benchmark_run_data_t        data;
+  DEBUG_MEMZERO(&data);
+  return ipc_broadcast_cmd(benchmark_start, &data);
+}
+static void receive_benchmark_start(ngx_int_t sender, benchmark_run_data_t *d) {
+  nchan_benchmark_run();
+}
+
+////////// BENCHMARK STOP ////////////////
+typedef struct {
+  nchan_loc_conf_t *loc_conf;
+} benchmark_stop_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_stop(void) {
+  benchmark_stop_data_t        data;
+  DEBUG_MEMZERO(&data);
+  return ipc_broadcast_cmd(benchmark_stop, &data);
+}
+static void receive_benchmark_stop(ngx_int_t sender, benchmark_stop_data_t *d) {
+  nchan_benchmark_stop();
+}
+
+////////// BENCHMARK FINISH ////////////////
+typedef struct {
+  nchan_benchmark_data_t data;
+} benchmark_finish_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_finish(void) {
+  benchmark_finish_data_t        data;
+  DEBUG_MEMZERO(&data);
+  return ipc_broadcast_cmd(benchmark_finish, &data);
+}
+static void receive_benchmark_finish(ngx_int_t sender, benchmark_finish_data_t *d) {
+  nchan_benchmark_t        *bench = nchan_benchmark_get_active();
+  benchmark_finish_data_t   data;
+  DEBUG_MEMZERO(&data);
+  nchan_benchmark_dequeue_subscribers();
+  data.data = bench->data;
+  ipc_cmd(benchmark_finish_reply, sender, &data);
+  nchan_benchmark_cleanup();
+}
+
+static void receive_benchmark_finish_reply(ngx_int_t sender, benchmark_finish_data_t *d) {
+  nchan_benchmark_receive_finished_data(&d->data);
+}
+
+////////// BENCHMARK ABORT ////////////////
+typedef struct {
+  nchan_benchmark_data_t data;
+} benchmark_abort_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_abort(void) {
+  benchmark_abort_data_t        data;
+  DEBUG_MEMZERO(&data);
+  return ipc_broadcast_cmd(benchmark_abort, &data);
+}
+static void receive_benchmark_abort(ngx_int_t sender, benchmark_abort_data_t *d) {
+  nchan_benchmark_abort();
+}
+
+#define MAKE_ipc_cmd_handler(val) [offsetof(ipc_handlers_t, val)/sizeof(ipc_handler_pt)] = (ipc_handler_pt )receive_ ## val,
+static ipc_handler_pt ipc_cmd_handler[] = {
+  LIST_IPC_COMMANDS(MAKE_ipc_cmd_handler)
 };
 
 void memstore_ipc_alert_handler(ngx_int_t sender, ngx_uint_t code, void *data) {
-  ipc_alert_handler[code](sender, data);
+  if(code >= IPC_CMDS) {
+    ERR("received invalid code %ui from sender %i", code, sender);
+    return;
+  }
+  ipc_cmd_handler[code](sender, data);
 }
diff --git a/debian/modules/nchan/src/store/memory/ipc-handlers.h b/debian/modules/nchan/src/store/memory/ipc-handlers.h
index a245c4f..412974f 100644
--- a/debian/modules/nchan/src/store/memory/ipc-handlers.h
+++ b/debian/modules/nchan/src/store/memory/ipc-handlers.h
@@ -3,14 +3,24 @@
 typedef void (*ipc_handler_pt)(ngx_int_t, void *);
 
 ngx_int_t memstore_ipc_send_subscribe(ngx_int_t owner, ngx_str_t *shm_chid, memstore_channel_head_t *, nchan_loc_conf_t *);
-ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch, callback_pt callback, void *privdata);
+ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch);
 ngx_int_t memstore_ipc_send_unsubscribe(ngx_int_t dst, ngx_str_t *chid, void *subscriber, void* privdata);
 ngx_int_t memstore_ipc_send_unsubscribed(ngx_int_t dst, ngx_str_t *chid, void* privdata);
 ngx_int_t memstore_ipc_send_publish_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_t *shm_msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
 ngx_int_t memstore_ipc_send_publish_status(ngx_int_t dst, ngx_str_t *chid, ngx_int_t status_code, const ngx_str_t *status_line, callback_pt callback, void *privdata);
+ngx_int_t memstore_ipc_send_publish_notice(ngx_int_t dst, ngx_str_t *chid, ngx_int_t notice_code, void *notice_data);
 ngx_int_t memstore_ipc_send_get_message(ngx_int_t owner, ngx_str_t *shm_chid, nchan_msg_id_t *msgid, void * privdata);
 ngx_int_t memstore_ipc_send_delete(ngx_int_t owner, ngx_str_t *shm_chid, callback_pt callback, void *privdata);
 void memstore_ipc_alert_handler(ngx_int_t sender, ngx_uint_t code, void *data);
-ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, callback_pt callback, void* privdata);
-ngx_int_t memstore_ipc_send_channel_auth_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata);
+ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata);
+ngx_int_t memstore_ipc_send_channel_existence_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata);
+ngx_int_t memstore_ipc_broadcast_group(nchan_group_t *shared_group);
+ngx_int_t memstore_ipc_send_get_group(ngx_int_t dst, ngx_str_t *group_id);
+ngx_int_t memstore_ipc_broadcast_group_delete(nchan_group_t *shared_group);
 ngx_int_t memstore_ipc_send_flood_test(ngx_int_t dst);
+
+ngx_int_t memstore_ipc_broadcast_benchmark_initialize(void *bench);
+ngx_int_t memstore_ipc_broadcast_benchmark_run(void);
+ngx_int_t memstore_ipc_broadcast_benchmark_stop(void);
+ngx_int_t memstore_ipc_broadcast_benchmark_finish(void);
+ngx_int_t memstore_ipc_broadcast_benchmark_abort(void);
diff --git a/debian/modules/nchan/src/store/memory/ipc.c b/debian/modules/nchan/src/store/memory/ipc.c
index dbdce5e..f7152da 100755
--- a/debian/modules/nchan/src/store/memory/ipc.c
+++ b/debian/modules/nchan/src/store/memory/ipc.c
@@ -3,6 +3,7 @@
 #include <ngx_channel.h>
 #include <assert.h>
 #include "ipc.h"
+#include "groups.h"
 
 #include "store-private.h"
 
@@ -19,7 +20,6 @@ static ngx_event_t  send_alert_delay_log_timer;
 static void receive_alert_delay_log_timer_handler(ngx_event_t *ev);
 static void send_alert_delay_log_timer_handler(ngx_event_t *ev);
 
-
 static void ipc_read_handler(ngx_event_t *ev);
 
 ngx_int_t ipc_init(ipc_t *ipc) {
@@ -42,7 +42,9 @@ ngx_int_t ipc_init(ipc_t *ipc) {
     proc->wbuf.overflow_first = NULL;
     proc->wbuf.overflow_last = NULL;
     proc->wbuf.overflow_n = 0;
+    ipc->worker_slots[i]=NGX_ERROR;
   }
+  ipc->workers = NGX_ERROR;
   return NGX_OK;
 }
 
@@ -86,6 +88,8 @@ ngx_int_t ipc_open(ipc_t *ipc, ngx_cycle_t *cycle, ngx_int_t workers, void (*slo
       slot_callback(s, i);
     }
     
+    ipc->worker_slots[i] = s;
+    
     proc = &ipc->process[s];
 
     socks = proc->pipe;
@@ -120,6 +124,7 @@ ngx_int_t ipc_open(ipc_t *ipc, ngx_cycle_t *cycle, ngx_int_t workers, void (*slo
     
     s++; //NEXT!!
   }
+  ipc->workers = workers;
   
   //ERR("ipc_alert_t size %i bytes", sizeof(ipc_alert_t));
   
@@ -133,6 +138,8 @@ ngx_int_t ipc_close(ipc_t *ipc, ngx_cycle_t *cycle) {
   ipc_process_t            *proc;
   ipc_writebuf_overflow_t  *of, *of_next;
   
+  DBG("start closing");
+  
   for (i=0; i<NGX_MAX_PROCESSES; i++) {
     proc = &ipc->process[i];
     if(!proc->active) continue;
@@ -151,6 +158,7 @@ ngx_int_t ipc_close(ipc_t *ipc, ngx_cycle_t *cycle) {
     ipc_try_close_fd(&proc->pipe[1]);
     ipc->process[i].active = 0;
   }
+  DBG("done closing");
   return NGX_OK;
 }
 
@@ -158,7 +166,7 @@ static ngx_uint_t delayed_sent_alerts_count;
 static ngx_uint_t delayed_sent_alerts_delay;
 
 static void send_alert_delay_log_timer_handler(ngx_event_t *ev) {
-  nchan_log_error("Sending %ui interprocess alert%s delayed by %ui sec.", delayed_sent_alerts_count, delayed_sent_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_sent_alerts_count > 0 ? delayed_sent_alerts_delay / delayed_sent_alerts_count : 0));
+  nchan_log_notice("Sending %ui interprocess alert%s delayed by %ui sec.", delayed_sent_alerts_count, delayed_sent_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_sent_alerts_count > 0 ? delayed_sent_alerts_delay / delayed_sent_alerts_count : 0));
   
   delayed_sent_alerts_count = 0;
   delayed_sent_alerts_delay = 0;
@@ -367,7 +375,7 @@ static ngx_uint_t delayed_received_alerts_count;
 static ngx_uint_t delayed_received_alerts_delay;
 
 static void receive_alert_delay_log_timer_handler(ngx_event_t *ev) {
-  nchan_log_error("Received %ui interprocess alert%s delayed by %ui sec.", delayed_received_alerts_count, delayed_received_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_received_alerts_count > 0 ? delayed_received_alerts_delay / delayed_received_alerts_count : 0));
+  nchan_log_notice("Received %ui interprocess alert%s delayed by %ui sec.", delayed_received_alerts_count, delayed_received_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_received_alerts_count > 0 ? delayed_received_alerts_delay / delayed_received_alerts_count : 0));
   
   delayed_received_alerts_count = 0;
   delayed_received_alerts_delay = 0;
@@ -453,6 +461,22 @@ static void ipc_read_handler(ngx_event_t *ev) {
 }
 
 
+ngx_int_t ipc_broadcast_alert(ipc_t *ipc, ngx_uint_t code, void *data, size_t data_size) {
+  ngx_int_t   i, slot, rc, ret = NGX_OK;
+  ngx_int_t   my_slot = memstore_slot();
+  DBG("broadcast alert");
+  for(i=0; i < ipc->workers; i++) {
+    slot = ipc->worker_slots[i];
+    if(my_slot != slot) {
+      if((rc = ipc_alert(ipc, slot, code, data, data_size)) != NGX_OK)  {
+        ERR("Error sending alert to slot %i", slot);
+        ret = NGX_ERROR;
+      }
+    }
+  }
+  return ret;
+}
+
 ngx_int_t ipc_alert(ipc_t *ipc, ngx_int_t slot, ngx_uint_t code, void *data, size_t data_size) {
   DBG("IPC send alert code %i to slot %i", code, slot);
   
diff --git a/debian/modules/nchan/src/store/memory/ipc.h b/debian/modules/nchan/src/store/memory/ipc.h
index 361bbd7..522dcc5 100755
--- a/debian/modules/nchan/src/store/memory/ipc.h
+++ b/debian/modules/nchan/src/store/memory/ipc.h
@@ -1,4 +1,7 @@
-#define IPC_DATA_SIZE 56
+#ifndef NCHAN_IPC_H
+#define NCHAN_IPC_H
+
+#define IPC_DATA_SIZE 64
 //#define IPC_DATA_SIZE 80
 
 typedef struct {
@@ -44,6 +47,9 @@ struct ipc_s {
   ipc_process_t         process[NGX_MAX_PROCESSES];
   
   void                  (*handler)(ngx_int_t, ngx_uint_t, void*);
+  
+  ngx_int_t             workers;
+  ngx_int_t             worker_slots[NGX_MAX_PROCESSES];
 }; //ipc_t
 
 ngx_int_t ipc_init(ipc_t *ipc);
@@ -52,4 +58,7 @@ ngx_int_t ipc_set_handler(ipc_t *ipc, void (*alert_handler)(ngx_int_t, ngx_uint_
 ngx_int_t ipc_register_worker(ipc_t *ipc, ngx_cycle_t *cycle);
 ngx_int_t ipc_close(ipc_t *ipc, ngx_cycle_t *cycle);
 
+ngx_int_t ipc_broadcast_alert(ipc_t *ipc, ngx_uint_t code, void *data, size_t data_size);
 ngx_int_t ipc_alert(ipc_t *ipc, ngx_int_t slot, ngx_uint_t code,  void *data, size_t data_size);
+
+#endif //NCHAN_IPC_H
diff --git a/debian/modules/nchan/src/store/memory/memstore.c b/debian/modules/nchan/src/store/memory/memstore.c
index a8b309b..2844220 100755
--- a/debian/modules/nchan/src/store/memory/memstore.c
+++ b/debian/modules/nchan/src/store/memory/memstore.c
@@ -8,13 +8,16 @@
 #include "ipc.h"
 #include "ipc-handlers.h"
 #include "store-private.h"
+#include "groups.h"
 #include <store/spool.h>
 
 #include <util/nchan_reaper.h>
+#include <util/nchan_debug.h>
 
 #include <store/redis/store.h>
 #include <store/store_common.h>
 #include <subscribers/memstore_redis.h>
+#include <subscribers/getmsg_proxy.h>
 #include <subscribers/memstore_multi.h>
 
 #define NCHAN_CHANHEAD_EXPIRE_SEC 5
@@ -66,17 +69,17 @@ static ngx_int_t nchan_memstore_store_msg_ready_to_reap_generic(store_message_t
       return NGX_DECLINED;
     }
     
-    if(ngx_atomic_cmp_set((ngx_atomic_uint_t *)&smsg->msg->refcount, 0, MSG_REFCOUNT_INVALID)) {
+    if(msg_refcount_invalidate_if_zero(smsg->msg)) {
       return NGX_OK;
     }
     return NGX_DECLINED;
   }
   else {
-    if(! ngx_atomic_cmp_set((ngx_atomic_uint_t *)&smsg->msg->refcount, 0, MSG_REFCOUNT_INVALID)) {
+    if(!msg_refcount_invalidate_if_zero(smsg->msg)) {
       if(smsg->msg->refcount > 0) {
         ERR("force-reaping msg with refcount %d", smsg->msg->refcount);
       }
-      smsg->msg->refcount = MSG_REFCOUNT_INVALID;
+      msg_refcount_invalidate(smsg->msg);
     }
     return NGX_OK;
   }
@@ -90,38 +93,37 @@ static ngx_int_t nchan_memstore_store_msg_ready_to_reap_wait_util_expired(store_
   return nchan_memstore_store_msg_ready_to_reap_generic(smsg, 1, force);
 }
 
-static ngx_int_t memstore_reap_message( nchan_msg_t *msg );
-static ngx_int_t memstore_reap_store_message( store_message_t *smsg );
+static void memstore_reap_message( nchan_msg_t *msg );
+static void memstore_reap_store_message( store_message_t *smsg );
 
 static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch);
 
-
-/*
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
 static void log_memstore_chanhead_reservations(memstore_channel_head_t *ch) {
-#if MESTORE_CHANHEAD_RESERVE_DEBUG
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
   nchan_list_el_t  *cur;
   char            **lbl;
-  ERR("%p %V reservations: %i", ch, &ch->id, ch->reserved.n);
+  DBG("%p %V reservations: %i", ch, &ch->id, ch->reserved.n);
   for(cur = ch->reserved.head; cur != NULL; cur = cur->next) {
     lbl = nchan_list_data_from_el(cur);
-    ERR("   %s", *lbl);
+    DBG("   %s", *lbl);
   }
 #else
-  ERR("%p %V reservations: %i", ch, &ch->id, ch->reserved);
+  DBG("%p %V reservations: %i", ch, &ch->id, ch->reserved);
 #endif
 }
-*/
+#endif
 
 static int memstore_chanhead_reservations(memstore_channel_head_t *ch) {
-#if MESTORE_CHANHEAD_RESERVE_DEBUG
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
   return ch->reserved.n;
 #else
   return ch->reserved;
 #endif
 }
 
-static void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *lbl) {
-#if MESTORE_CHANHEAD_RESERVE_DEBUG
+void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *lbl) {
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
   char   **label = nchan_list_append(&ch->reserved);
   *label = (char *)lbl;
 #else
@@ -129,8 +131,8 @@ static void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *l
 #endif
 }
 
-static void memstore_chanhead_release(memstore_channel_head_t *ch, char *label) {
-#if MESTORE_CHANHEAD_RESERVE_DEBUG
+void memstore_chanhead_release(memstore_channel_head_t *ch, char *label) {
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
   nchan_list_el_t  *cur;
   char            **lbl;
   for(cur = ch->reserved.head; cur != NULL; cur = cur->next) {
@@ -147,97 +149,82 @@ static void memstore_chanhead_release(memstore_channel_head_t *ch, char *label)
 #endif
 }
 
+static ngx_int_t memstore_chanhead_reserved_or_in_use(memstore_channel_head_t *ch) {
+  if (ch->total_sub_count > 0) { //there are subscribers
+    DBG("not ready to reap %V, %i subs left", &ch->id, ch->total_sub_count);
+    return 1;
+  }
+  
+  if(memstore_chanhead_reservations(ch) > 0) {
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+    DBG("not ready to reap %V, still reserved:", &ch->id);
+    log_memstore_chanhead_reservations(ch);
+#endif
+    return 1;
+  }
+  
+  if(ch->cf && ch->cf->redis.enabled && ch->churn_start_time + ch->redis_idle_cache_ttl < ngx_time()) {
+    DBG("idle redis cache channel %p %V (msgs: %i)", ch, &ch->id, ch->channel.messages);
+    // any stored messages are unimportant, they're backed up in redis
+  }
+  else if(ch->channel.messages > 0) {
+    assert(ch->msg_first != NULL);
+    DBG("not ready to reap %V, %i messages left", &ch->id, ch->channel.messages);
+    return 1;
+  }
+  
+  if(ch->owner == ch->slot && ch->shared && ch->shared->gc.outside_refcount > 0) {
+    DBG("channel %p %V shared data still used by %i workers.", ch, &ch->id, ch->shared->gc.outside_refcount);
+    return 1;
+  }
+  
+  return 0;
+}
 
 static ngx_int_t nchan_memstore_chanhead_ready_to_reap(memstore_channel_head_t *ch, uint8_t force) {
   
   memstore_chanhead_messages_gc(ch);
-  if(!force) {
-    if(ch->status != INACTIVE) {
-      char *sts;
-      switch(ch->status) {
-        case NOTREADY:
-          sts = "NOTREADY";
-          break;
-        case WAITING:
-          sts = "WAITING";
-          break;
-        case STUBBED:
-          sts = "STUBBED";
-          break;
-        case READY:
-          sts = "READY";
-          break;
-        case INACTIVE:
-          sts = "INACTIVE";
-          break;
-        default:
-          sts = "????";
-      }
-      DBG("not ready to reap %V : status %s", &ch->id, sts);
-      return NGX_DECLINED;
-    }
-    
-    if(ch->gc_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
-      DBG("not ready to reap %V, %i sec left", &ch->id, ch->gc_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
-      return NGX_DECLINED;
-    }
-    
-    if (ch->total_sub_count > 0) { //there are subscribers
-      DBG("not ready to reap %V, %i subs left", &ch->id, ch->total_sub_count);
-      return NGX_DECLINED;
-    }
-    
-    if(memstore_chanhead_reservations(ch) > 0) {
-      DBG("not ready to reap %V, still reserved:", &ch->id);
-      //log_memstore_chanhead_reservations(ch);
-      return NGX_DECLINED;
-    }
-    
-    if(ch->cf && ch->cf->redis.enabled && ch->churn_start_time + ch->redis_idle_cache_ttl < ngx_time()) {
-      DBG("get rid of idle redis cache channel %p %V (msgs: %i)", ch, &ch->id, ch->channel.messages);
-      return NGX_OK;
-    }
-    else if(ch->channel.messages > 0) {
-      assert(ch->msg_first != NULL);
-      DBG("not ready to reap %V, %i messages left", &ch->id, ch->channel.messages);
-      return NGX_DECLINED;
-    }
-    //DBG("ok to delete channel %V", &ch->id);
-    return NGX_OK;
-  }
-  else {
+  
+  if(force) {
     //force delete is always ok
     return NGX_OK;
   }
+  
+  if(ch->status != INACTIVE) {
+    DBG("not ready to reap %V : status %i", &ch->id, ch->status);
+    return NGX_DECLINED;
+  }
+  
+  if(ch->gc_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
+    DBG("not ready to reap %V, %i sec left", &ch->id, ch->gc_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
+    return NGX_DECLINED;
+  }
+    
+  if(memstore_chanhead_reserved_or_in_use(ch)) {
+    return NGX_DECLINED;
+  }
+    
+  DBG("ok to delete channel %V", &ch->id);
+  return NGX_OK;
 }
 
 static ngx_int_t nchan_memstore_chanhead_ready_to_reap_slowly(memstore_channel_head_t *ch, uint8_t force) {
   
   memstore_chanhead_messages_gc(ch);
-  if(!force) {
-    if(ch->churn_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
-      DBG("not ready to reap %p %V, %i sec left", ch, &ch->id, ch->churn_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
-      return NGX_DECLINED;
-    }
-    
-    if (ch->total_sub_count > 0) { //there are subscribers
-      DBG("not ready to reap %V, %i subs left", &ch->id, ch->total_sub_count);
-      //ERR("not ready to reap %p %V, %i [%i] {%i} subs (%i {%i} internal) left", ch, &ch->id, ch->total_sub_count, ch->channel.subscribers, ch->shared->sub_count, ch->internal_sub_count, ch->shared->internal_sub_count);
-      return NGX_DECLINED;
-    }
-    
-    if(ch->cf && ch->cf->redis.enabled && ch->churn_start_time + ch->redis_idle_cache_ttl < ngx_time()) {
-      DBG("get rid of idle redis cache channel %p %V (msgs: %i)", ch, &ch->id, ch->channel.messages);
-      return NGX_OK;
-    }
-    else if(ch->channel.messages > 0) {
-      assert(ch->msg_first != NULL);
-      DBG("not ready to reap %p %V, %i messages left", ch, &ch->id, ch->channel.messages);
-      return NGX_DECLINED;
-    }
+  if(force) {
+    return NGX_OK;
   }
   
-  //DBG("ok to delete channel %V", &ch->id);
+  if(ch->churn_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
+    DBG("not ready to reap %p %V, %i sec left", ch, &ch->id, ch->churn_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
+    return NGX_DECLINED;
+  }
+    
+  if(memstore_chanhead_reserved_or_in_use(ch)) {
+    return NGX_DECLINED;
+  }
+  
+  DBG("ok to slow-delete channel %V", &ch->id);
   return NGX_OK;
 }
 
@@ -291,10 +278,14 @@ static void init_mpt(memstore_data_t *m) {
 }
 
 static shmem_t         *shm = NULL;
+void                   *nchan_store_memory_shmem = NULL;
 static shm_data_t      *shdata = NULL;
 static ipc_t            ipc_data;
 static ipc_t           *ipc = NULL;
 
+static memstore_groups_t groups_data;
+static memstore_groups_t *groups = NULL;
+
 #if FAKESHARD
 
 static memstore_data_t  mdata[MAX_FAKE_WORKERS];
@@ -329,14 +320,14 @@ int memstore_ready(void) {
 }
 #endif
 
-shmem_t *nchan_memstore_get_shm(void){
-  return shm;
-}
-
 ipc_t *nchan_memstore_get_ipc(void){
   return ipc;
 }
 
+memstore_groups_t *nchan_memstore_get_groups(void) {
+  return groups;
+}
+
 static ngx_int_t                  shared_loc_conf_count = 0;
 ngx_int_t memstore_reserve_conf_shared_data(nchan_loc_conf_t *cf) {
   if(cf->shared_data_index == NGX_CONF_UNSET) {
@@ -401,18 +392,12 @@ void memstore_fakeprocess_push_random(void) {
 
 #endif
 
-static ngx_int_t is_multi_id(ngx_str_t *id);
-
-ngx_int_t memstore_channel_owner(ngx_str_t *id) {
+ngx_int_t memstore_str_owner(ngx_str_t *str) {
   uint32_t        h;
   ngx_int_t       workers;
-  //multi is always self-owned
-  if(is_multi_id(id)) {
-    return memstore_slot();
-  }
   
   workers = shdata->max_workers;
-  h = ngx_crc32_short(id->data, id->len);
+  h = ngx_crc32_short(str->data, str->len);
 #if FAKESHARD
   #ifdef ONE_FAKE_CHANNEL_OWNER
   h++; //just to avoid the unused variable warning
@@ -425,7 +410,7 @@ ngx_int_t memstore_channel_owner(ngx_str_t *id) {
   i = h % workers;
   assert(i >= 0);
   slot = shdata->procslot[i + memstore_procslot_offset];
-  //DBG("channel owner for %V workers=%i (max=%i active=%i) h=%ui m_p_off=%i i=%i slot=%i", id, workers, shdata->max_workers, shdata->total_active_workers, h, memstore_procslot_offset, i, slot);
+  //DBG("owner for %V workers=%i (max=%i active=%i) h=%ui m_p_off=%i i=%i slot=%i", str, workers, shdata->max_workers, shdata->total_active_workers, h, memstore_procslot_offset, i, slot);
   if(slot == NCHAN_INVALID_SLOT) {
     ERR("something went wrong, the channel owner is invalid. i: %i h: %ui, workers: %i", i, h, workers);
     assert(0);
@@ -435,7 +420,16 @@ ngx_int_t memstore_channel_owner(ngx_str_t *id) {
 #endif
 }
 
+ngx_int_t nchan_nginx_worker_procslot(ngx_int_t worker_number) {
+  if( worker_number < 0 || worker_number > shdata->max_workers) {
+    return NGX_ERROR;
+  }
+  return shdata->procslot[worker_number + memstore_procslot_offset];
+}
 
+ngx_int_t memstore_channel_owner(ngx_str_t *id) {
+  return nchan_channel_id_is_multi(id) ? memstore_slot() : memstore_str_owner(id);
+}
 
 #if NCHAN_MSG_LEAK_DEBUG
 
@@ -532,7 +526,6 @@ static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
     zone->data = data;
     d = zone->data;
     DBG("reattached shm data at %p", data);
-    shm_reinit(shm);
     shmtx_lock(shm);
     d->generation ++;
     d->current_active_workers = 0;
@@ -542,8 +535,13 @@ static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
       d->conf_data = NULL;
     }
     
-    ngx_memzero(&d->stats, sizeof(d->stats));
-    shm_set_allocd_pages_tracker(shm, &d->shmem_pages_used);
+    // don't reinitialize stub stats, because this may happen before the
+    // old workers shut down. Rather than add a generational conditional
+    // to __memstore_update_stub_status, we just don't reset the stats.
+    //ngx_memzero(&d->stats, sizeof(d->stats));
+#if nginx_version <= 1011006
+  shm_set_allocd_pages_tracker(shm, &d->shmem_pages_used);
+#endif
     shmtx_unlock(shm);
   }
   else {
@@ -564,15 +562,15 @@ static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
     shdata->reloading = 0;
     
     
-    
     for(i=0; i< NGX_MAX_PROCESSES; i++) {
       shdata->procslot[i]=NCHAN_INVALID_SLOT;
     }
     ngx_memzero(&d->stats, sizeof(d->stats));
     
+#if nginx_version <= 1011006
     shdata->shmem_pages_used=0;
-    shm_set_allocd_pages_tracker(shm, &shdata->shmem_pages_used);
-    
+    shm_set_allocd_pages_tracker(shm, &d->shmem_pages_used);
+#endif
     DBG("Shm created with data at %p", d);
 #if NCHAN_MSG_LEAK_DEBUG
     shdata->msgdebug_head = NULL;
@@ -600,7 +598,11 @@ nchan_stub_status_t *nchan_get_stub_status_stats(void) {
 }
 
 size_t nchan_get_used_shmem(void) {
+#if nginx_version <= 1011006
   return shdata->shmem_pages_used * ngx_pagesize;
+#else
+  return shm_used_pages(shm) * ngx_pagesize;
+#endif
 }
 
 static int send_redis_fakesub_delta(memstore_channel_head_t *head) {
@@ -621,7 +623,7 @@ static void memstore_reap_chanhead(memstore_channel_head_t *ch) {
     ch->spooler.fn->broadcast_status(&ch->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
   }
   stop_spooler(&ch->spooler, 0);
-  if(ch->cf && ch->cf->redis.enabled && !ch->multi) {
+  if(ch->cf && ch->cf->redis.enabled && ch->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED && !ch->multi) {
     send_redis_fakesub_delta(ch);
     if(ch->delta_fakesubs_timer_ev.timer_set) {
       ngx_del_timer(&ch->delta_fakesubs_timer_ev);
@@ -632,6 +634,7 @@ static void memstore_reap_chanhead(memstore_channel_head_t *ch) {
     if(ch->shared)
       shm_free(shm, ch->shared);
   }
+  
   DBG("chanhead %p (%V) is empty and expired. DELETE.", ch, &ch->id);
   CHANNEL_HASH_DEL(ch);
   if(ch->redis_sub) {
@@ -640,6 +643,17 @@ static void memstore_reap_chanhead(memstore_channel_head_t *ch) {
     }
     memstore_redis_subscriber_destroy(ch->redis_sub);
   }
+  
+  if(ch->groupnode) {
+    if(ch->owner == memstore_slot()) {
+      memstore_group_dissociate_own_channel(ch);
+    }
+    memstore_group_remove_channel(ch);
+  }
+  assert(ch->groupnode_prev == NULL);
+  assert(ch->groupnode_next == NULL);
+  
+  
   if(ch->multi) {
     for(i=0; i < ch->multi_count; i++) {
       if(ch->multi[i].sub) {
@@ -650,6 +664,9 @@ static void memstore_reap_chanhead(memstore_channel_head_t *ch) {
     nchan_free_msg_id(&ch->latest_msgid);
     nchan_free_msg_id(&ch->oldest_msgid);
   }
+  
+  ch->status = DELETED;
+  
   ngx_free(ch);
 }
 
@@ -711,12 +728,14 @@ static ngx_int_t nchan_store_init_worker(ngx_cycle_t *cycle) {
   
   DBG("shm: %p, shdata: %p", shm, shdata);
   shmtx_unlock(shm);
+  
   return NGX_OK;
 }
 
 #define CHANHEAD_SHARED_OKAY(head) head->status == READY || head->status == STUBBED || (!head->stub && head->cf->redis.enabled == 1 && head->status == WAITING && head->owner == head->slot)
 
 void memstore_fakesub_add(memstore_channel_head_t *head, ngx_int_t n) {
+  assert(head->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED);
   if(redis_fakesub_timer_interval == 0) {
     nchan_store_redis_fakesub_add(&head->id, head->cf, n, head->shutting_down);
   }
@@ -743,7 +762,6 @@ static void memstore_spooler_use_handler(channel_spooler_t *spl, void *d) {
 static void memstore_spooler_add_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
   memstore_channel_head_t   *head = (memstore_channel_head_t *)privdata;
   head->total_sub_count++;
-  head->channel.subscribers++;
   if(sub->type == INTERNAL) {
     head->internal_sub_count++;
     if(head->shared) {
@@ -756,10 +774,13 @@ static void memstore_spooler_add_handler(channel_spooler_t *spl, subscriber_t *s
       assert(CHANHEAD_SHARED_OKAY(head));
       ngx_atomic_fetch_add(&head->shared->sub_count, 1);
     }
-    if(head->cf && head->cf->redis.enabled && !head->multi) {
+    if(head->cf && head->cf->redis.enabled && head->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED && !head->multi) {
       memstore_fakesub_add(head, 1);
     }
     nchan_update_stub_status(subscribers, 1);
+    if(head->groupnode) {
+      memstore_group_add_subscribers(head->groupnode, 1);
+    }
     if(head->multi) {
       ngx_int_t      i, max = head->multi_count;
       subscriber_t  *msub;
@@ -770,9 +791,8 @@ static void memstore_spooler_add_handler(channel_spooler_t *spl, subscriber_t *s
         }
       }
     }
-    
   }
-
+  head->channel.subscribers = head->total_sub_count - head->internal_sub_count;
   assert(head->total_sub_count >= head->internal_sub_count);
 }
 
@@ -794,7 +814,7 @@ static void memstore_spooler_bulk_dequeue_handler(channel_spooler_t *spl, subscr
       assert(head->shutting_down == 1);
     }
     */
-    if(head->cf && head->cf->redis.enabled && !head->multi) {
+    if(head->cf && head->cf->redis.enabled && head->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED && !head->multi) {
       memstore_fakesub_add(head, -count);
     }
     
@@ -810,6 +830,9 @@ static void memstore_spooler_bulk_dequeue_handler(channel_spooler_t *spl, subscr
         }
       }
     }
+    if(head->groupnode) {
+      memstore_group_add_subscribers(head->groupnode, -(count));
+    }
   }
   head->total_sub_count -= count;
   head->channel.subscribers = head->total_sub_count - head->internal_sub_count;
@@ -834,9 +857,7 @@ static ngx_int_t start_chanhead_spooler(memstore_channel_head_t *head) {
     NULL
   };
   
-  
-  //(head->use_redis && head->owner == memstore_slot()) ? FETCH_IGNORE_MSG_NOTFOUND : FETCH
-  start_spooler(&head->spooler, &head->id, &head->status, &nchan_store_memory, head->cf, (head->cf && head->cf->redis.enabled) ? FETCH_IGNORE_MSG_NOTFOUND : FETCH, &handlers, head);
+  start_spooler(&head->spooler, &head->id, &head->status, &head->msg_buffer_complete, &nchan_store_memory, head->cf, NCHAN_SPOOL_FETCH, &handlers, head);
   if(head->meta) {
     head->spooler.publish_events = 0;
   }
@@ -906,7 +927,7 @@ ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8
     }
   }
   else {
-    if(head->cf && head->cf->redis.enabled && !head->multi && head->status != READY) {
+    if(head->cf && head->cf->redis.enabled && !head->multi && head->status != READY) { //both redis BACKUP and DISTRIBUTED storage modes
       if(head->redis_sub == NULL) {
         head->redis_sub = memstore_redis_subscriber_create(head);
         nchan_store_redis.subscribe(&head->id, head->redis_sub);
@@ -929,18 +950,13 @@ ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8
 }
 
 
-static ngx_int_t is_multi_id(ngx_str_t *id) {
-  u_char         *cur = id->data;
-  return (cur[0] == 'm' && cur[1] == '/' && cur[2] == NCHAN_MULTI_SEP_CHR);
-}
-
 static ngx_int_t parse_multi_id(ngx_str_t *id, ngx_str_t ids[]) {
   ngx_int_t       n = 0;
   u_char         *cur = id->data;
   u_char         *last = cur + id->len;
   u_char         *sep;
   
-  if(is_multi_id(id)) {
+  if(nchan_channel_id_is_multi(id)) {
     cur += 3;
     while((sep = ngx_strlchr(cur, last, NCHAN_MULTI_SEP_CHR)) != NULL) {
       ids[n].data=cur;
@@ -953,6 +969,25 @@ static ngx_int_t parse_multi_id(ngx_str_t *id, ngx_str_t ids[]) {
   return 0;
 }
 
+static int count_channel_id(ngx_str_t *id) {
+  int       n = 0;
+  u_char   *cur = id->data;
+  u_char   *last = cur + id->len;
+  u_char   *sep;
+  
+  if(nchan_channel_id_is_multi(id)) {
+    cur += 3;
+    while((sep = ngx_strlchr(cur, last, NCHAN_MULTI_SEP_CHR)) != NULL) {
+      cur = sep + 1;
+      n++;
+    }
+    return n;
+  }
+  else {
+    return 1;
+  }
+}
+
 static void delta_fakesubs_timer_handler(ngx_event_t *ev) {
   memstore_channel_head_t *head = (memstore_channel_head_t *)ev->data;
   if(send_redis_fakesub_delta(head) && !ngx_exiting && !ngx_quit && ev->timedout) {
@@ -966,6 +1001,8 @@ static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id,
   ngx_int_t                     owner = memstore_channel_owner(channel_id);
   ngx_str_t                     ids[NCHAN_MULTITAG_MAX];
   ngx_int_t                     i, n = 0;
+  ngx_str_t                     group_name;
+  group_tree_node_t            *groupnode;
   
   head=ngx_calloc(sizeof(*head) + sizeof(u_char)*(channel_id->len), ngx_cycle->log);
   
@@ -995,26 +1032,18 @@ static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id,
     head->cf = NULL;
   }
   
-  if(head->cf && head->cf->redis.enabled && !head->multi) {
-    head->delta_fakesubs = 0;
-    nchan_init_timer(&head->delta_fakesubs_timer_ev, delta_fakesubs_timer_handler, head);
-    head->redis_idle_cache_ttl = cf->redis_idle_channel_cache_timeout;
-  }
-  else {
-    head->redis_idle_cache_ttl = 0;
-  }
-  
   if(head->slot == owner) {
     if((head->shared = shm_alloc(shm, sizeof(*head->shared), "channel shared data")) == NULL) {
-      ERR("can't allocate shared memory for (new) chanhead");
+      ngx_free(head);
+      nchan_log_ooshm_error("allocating channel %V", channel_id);
       return NULL;
     }
     head->shared->sub_count = 0;
     head->shared->internal_sub_count = 0;
     head->shared->total_message_count = 0;
     head->shared->stored_message_count = 0;
-    head->shared->last_seen = ngx_time();
-    
+    head->shared->last_seen = 0;
+    head->shared->gc.outside_refcount=0;
     nchan_update_stub_status(channels, 1);
   }
   else {
@@ -1033,20 +1062,20 @@ static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id,
   head->foreign_owner_ipc_sub = NULL;
   head->last_subscribed_local = 0;
   
-#if MESTORE_CHANHEAD_RESERVE_DEBUG
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
   nchan_list_init(&head->reserved, sizeof(char *), "chanhead reserve (debug)");
 #else
   head->reserved = 0;
 #endif
   head->multi=NULL;
   head->multi_count = 0;
-  head->multi_waiting = 0;
+  head->multi_subscribers_pending = 0;
   
   //set channel
   ngx_memcpy(&head->channel.id, &head->id, sizeof(ngx_str_t));
   head->channel.messages = 0;
   head->channel.subscribers = 0;
-  head->channel.last_seen = ngx_time();
+  head->channel.last_seen = 0;
   head->max_messages = (ngx_int_t) -1;
   
   if(head->id.len >= 5 && ngx_strncmp(head->id.data, "meta/", 5) == 0) {
@@ -1059,13 +1088,13 @@ static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id,
   
   head->spooler.running=0;
   
-  head->multi_waiting = 0;
   if((n = parse_multi_id(&head->id, ids)) > 0) {
     memstore_multi_t          *multi;
     int16_t                   *tags_latest, *tags_oldest;
     
     if((multi = ngx_calloc(sizeof(*multi) * n, ngx_cycle->log)) == NULL) {
       ERR("can't allocate multi array for multi-channel %p", head);
+      return NULL;
     }
     
     head->latest_msgid.time = 0;
@@ -1097,11 +1126,13 @@ static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id,
     }
     
     head->multi_count = n;
+    head->multi_subscribers_pending = n;
     head->multi = multi;
     head->owner = head->slot; //multis are always self-owned
   }
   else {
     head->multi_count = 0;
+    head->multi_subscribers_pending = n;
     
     head->latest_msgid.time = 0;
     head->latest_msgid.tag.fixed[0] = 0;
@@ -1114,8 +1145,41 @@ static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id,
     head->multi = NULL;
   }
   
+  if(head->cf && head->cf->redis.enabled && !head->multi) { // both DISTRIBUTED and BACKUP redis storage modes
+    nchan_init_timer(&head->delta_fakesubs_timer_ev, delta_fakesubs_timer_handler, head);
+    head->delta_fakesubs = 0;
+    head->redis_idle_cache_ttl = cf->redis_idle_channel_cache_timeout;
+    
+    
+    if(head->slot == owner) {
+      head->msg_buffer_complete = 0;
+    }
+    else {
+      head->msg_buffer_complete = 1; //always assume buffer is complete, and let the owner figure out the details
+    }
+  }
+  else {
+    head->redis_idle_cache_ttl = 0;
+    head->msg_buffer_complete = 1;
+  }
+  
   start_chanhead_spooler(head);
 
+  //get group
+  if(cf && cf->group.enable_accounting) {
+    group_name = nchan_get_group_from_channel_id(&head->id);
+    if((groupnode = memstore_groupnode_get(groups, &group_name)) == NULL) {
+      ERR("couldn't get groupnode %V for chanhead %V", &group_name, &head->id);
+    }
+    else {
+      head->groupnode = groupnode;
+      memstore_group_add_channel(head);
+      if(head->owner == head->slot) {
+        memstore_group_associate_own_channel(head);
+      }
+    }
+  }
+  
   CHANNEL_HASH_ADD(head);
   
   return head;
@@ -1134,10 +1198,56 @@ static ngx_inline memstore_channel_head_t *ensure_chanhead_ready_or_trash_chanhe
 
 memstore_channel_head_t * nchan_memstore_find_chanhead(ngx_str_t *channel_id) {
   memstore_channel_head_t     *head = NULL;
+  //ERR("channel id %V", channel_id);
   CHANNEL_HASH_FIND(channel_id, head);
   return ensure_chanhead_ready_or_trash_chanhead(head, 1);
 }
 
+typedef struct {
+  ngx_str_t        *chid;
+  nchan_loc_conf_t *cf;
+  callback_pt       cb;
+  void             *pd;
+} find_ch_backup_data_t;
+
+
+static ngx_int_t memstore_find_chanhead_with_backup_callback(ngx_int_t rc, void *vd, void *pd) {
+  nchan_channel_t             *chinfo = vd;
+  find_ch_backup_data_t       *d = pd;
+  memstore_channel_head_t     *ch = NULL;
+  if(chinfo) {
+    ch = nchan_memstore_get_chanhead(d->chid, d->cf);
+    d->cb(ch ? NGX_OK : NGX_ERROR, ch, d->pd);
+  }
+  else {
+    d->cb(NGX_OK, NULL, d->pd);
+  }
+  
+  ngx_free(d);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_memstore_find_chanhead_with_backup(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  memstore_channel_head_t     *head = NULL;
+  if((head = nchan_memstore_find_chanhead(channel_id)) == NULL) {
+    find_ch_backup_data_t     *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    if(!d) {
+      ERR("couldn't allocate data for nchan_memstore_find_chanhead_with_backup");
+      cb(NGX_ERROR, NULL, pd);
+      return NGX_ERROR;
+    }
+    d->chid = channel_id;
+    d->cf = cf;
+    d->cb = cb;
+    d->pd = pd;
+    
+    return nchan_store_redis.find_channel(channel_id, cf, memstore_find_chanhead_with_backup_callback, d);
+  }
+  
+  cb(NGX_OK, head, pd);
+  return NGX_OK;
+}
+
 memstore_channel_head_t *nchan_memstore_get_chanhead(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
   memstore_channel_head_t          *head;
   head = nchan_memstore_find_chanhead(channel_id);
@@ -1174,7 +1284,8 @@ ngx_int_t chanhead_gc_add(memstore_channel_head_t *ch, const char *reason) {
     assert(ch->foreign_owner_ipc_sub == NULL); //we don't accept still-subscribed chanheads
   }
   
-  if(ch->slot != ch->owner) {
+  if(ch->slot != ch->owner && ch->shared) {
+    ngx_atomic_fetch_add(&ch->shared->gc.outside_refcount, -1);
     ch->shared = NULL;
   }
   if(ch->status == WAITING && !(ch->cf && ch->cf->redis.enabled) && !(ngx_exiting || ngx_quit)) {
@@ -1184,6 +1295,7 @@ ngx_int_t chanhead_gc_add(memstore_channel_head_t *ch, const char *reason) {
   }
   
   assert(ch->slot == slot);
+  
   if(! ch->in_gc_queue) {
     ch->gc_start_time = ngx_time();
     ch->status = INACTIVE;
@@ -1244,16 +1356,31 @@ static ngx_str_t *chanhead_msg_to_str(store_message_t *msg) {
 }
 */
 
+ngx_int_t nchan_memstore_publish_notice(memstore_channel_head_t *head, ngx_int_t notice_code, const void *notice_data) {
+  
+  DBG("tried publishing notice %i to chanhead %p (subs: %i)", notice_code, head, head->total_sub_count);
+  
+  switch(notice_code) {
+    case NCHAN_NOTICE_BUFFER_LOADED:
+      //DBG("buffer loaded from Redis");
+      if(head->msg_buffer_complete == 0) {
+        head->msg_buffer_complete = 1;
+        ensure_chanhead_ready_or_trash_chanhead(head, 0);
+        head->spooler.fn->handle_channel_status_change(&head->spooler);
+      }
+      break;
+    
+    default:
+      //do nothing
+      break;
+  }
+  
+  return head->spooler.fn->broadcast_notice(&head->spooler, notice_code, (void *)notice_data);
+}
+
 ngx_int_t nchan_memstore_publish_generic(memstore_channel_head_t *head, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line) {
   
   ngx_int_t          shared_sub_count = 0;
-  
-  if(head->shared) {
-    if(!(head->cf && head->cf->redis.enabled) && !head->multi) {
-      assert(head->status == READY || head->status == STUBBED);
-    }
-    shared_sub_count = head->shared->sub_count;
-  }
 
   if(head==NULL) {
     /*
@@ -1266,26 +1393,22 @@ ngx_int_t nchan_memstore_publish_generic(memstore_channel_head_t *head, nchan_ms
     */
     return NCHAN_MESSAGE_QUEUED;
   }
+  
+  if(head->shared) {
+    if(!(head->cf && head->cf->redis.enabled) && !head->multi) {
+      assert(head->status == READY || head->status == STUBBED);
+    }
+    shared_sub_count = head->shared->sub_count;
+  }
 
   if(msg) {
     //DBG("tried publishing %V to chanhead %p (subs: %i)", msgid_to_str(&msg->id), head, head->total_sub_count);
     head->spooler.fn->respond_message(&head->spooler, msg);
-
-#if NCHAN_BENCHMARK
-    struct timeval          tv, diff;
-    ngx_gettimeofday(&tv);
-    nchan_timeval_subtract(&diff, &tv, &msg->start_tv);
     
-    ngx_str_t              *msgid_str = msgid_to_str(&msg->id);
-    
-    assert(diff.tv_sec < 10);
-    
-    ERR("::BENCH:: channel %V msg %p <%V> len %i responded to %i in %l.%06l sec", &head->id, msg, msgid_str, ngx_buf_size(msg->buf), head->spooler.last_responded_subscriber_count, (long int)(diff.tv_sec), (long int)(diff.tv_usec));
-#endif
-    
-    if(msg->temp_allocd) {
-      ngx_free(msg);
-    }
+    //wait what?...
+    //if(msg->temp_allocd) {
+    //  ngx_free(msg);
+    //}
   }
   else {
     DBG("tried publishing status %i to chanhead %p (subs: %i)", status_code, head, head->total_sub_count);
@@ -1340,27 +1463,39 @@ static ngx_int_t delete_multi_callback_handler(ngx_int_t code, nchan_channel_t*
   return NGX_OK;
 }
 
-static ngx_int_t nchan_memstore_force_delete_chanhead(memstore_channel_head_t *ch, callback_pt callback, void *privdata);
-
 static ngx_int_t nchan_store_delete_single_channel_id(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
   ngx_int_t                owner;
-
-  assert(!is_multi_id(channel_id));
+  ngx_int_t                rc;
+  
+  assert(!nchan_channel_id_is_multi(channel_id));
   owner = memstore_channel_owner(channel_id);
   
   if(cf->redis.enabled) {
-    return nchan_store_redis.delete_channel(channel_id, cf, callback, privdata);
+    if(cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+      return nchan_store_redis.delete_channel(channel_id, cf, callback, privdata);
+    }
+    else {
+      nchan_store_redis.delete_channel(channel_id, cf, NULL, NULL);
+    }
   }
-  else if(owner == memstore_slot()) {
+  
+  if(owner == memstore_slot()) {
     return nchan_memstore_force_delete_channel(channel_id, callback, privdata);
   }
   else {
-    return memstore_ipc_send_delete(owner, channel_id, callback, privdata);
+    rc = memstore_ipc_send_delete(owner, channel_id, callback, privdata);
+    if(rc == NGX_DECLINED) {
+      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+      return NGX_ERROR;
+    }
+    else {
+      return NGX_OK;
+    }
   }
 }
 
 static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  if(!is_multi_id(channel_id)) {
+  if(!nchan_channel_id_is_multi(channel_id)) {
     return nchan_store_delete_single_channel_id(channel_id, cf, callback, privdata);
   }
   else {
@@ -1435,13 +1570,20 @@ static ngx_int_t nchan_store_find_channel(ngx_str_t *channel_id, nchan_loc_conf_
   ngx_int_t                    owner = memstore_channel_owner(channel_id);
   memstore_channel_head_t     *ch;
   nchan_channel_t              chaninfo;
-  if(cf->redis.enabled) {
+  
+  if(cf->redis.enabled && cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
     return nchan_store_redis.find_channel(channel_id, cf, callback, privdata);
   }
   else if(memstore_slot() == owner) {
     ch = nchan_memstore_find_chanhead(channel_id);
     if(ch == NULL) {
-      callback(NGX_OK, NULL, privdata);
+      if(cf->redis.enabled && cf->redis.storage_mode == REDIS_MODE_BACKUP) {
+        DBG("channel %V not found in backup mode. Try Redis...", channel_id);
+        return nchan_store_redis.find_channel(channel_id, cf, callback, privdata);
+      }
+      else {
+        callback(NGX_OK, NULL, privdata);
+      }
     }
     else {
       chaninfo = ch->channel;
@@ -1454,7 +1596,9 @@ static ngx_int_t nchan_store_find_channel(ngx_str_t *channel_id, nchan_loc_conf_
     
   }
   else {
-    memstore_ipc_send_get_channel_info(owner, channel_id, callback, privdata);
+    if(memstore_ipc_send_get_channel_info(owner, channel_id, cf, callback, privdata) == NGX_DECLINED) {
+      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+    }
   }
   return NGX_OK;
 }
@@ -1530,6 +1674,11 @@ static ngx_int_t nchan_store_init_module(ngx_cycle_t *cycle) {
   }
   ipc_open(ipc, cycle, shdata->max_workers, &init_shdata_procslots);
 
+  if(groups == NULL) {
+    groups = &groups_data;
+    memstore_groups_init(groups);
+  }
+  
   //initialize default shared multi-channel config
   ngx_memzero(&default_multiconf, sizeof(default_multiconf));
   default_multiconf.complex_message_timeout = NULL;
@@ -1555,6 +1704,7 @@ static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
   redis_fakesub_timer_interval = conf->redis_fakesub_timer_interval;
   
   shm = shm_create(&name, cf, conf->shm_size, initialize_shm, &ngx_nchan_module);
+  nchan_store_memory_shmem = shm;
   return NGX_OK;
 }
 
@@ -1596,6 +1746,8 @@ static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
   }
 #endif
   
+  memstore_groups_shutdown(groups);
+  
   shmtx_lock(shm);
   
   if(shdata->old_max_workers == NGX_CONF_UNSET) {
@@ -1615,7 +1767,6 @@ static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
     ERR("my procslot not found! I don't know what to do!");
     assert(0);
   }
-  
   ipc_close(ipc, cycle);
   
   if(shdata->reloading == 0) {
@@ -1678,11 +1829,11 @@ static ngx_int_t validate_chanhead_messages(memstore_channel_head_t *ch) {
   return NGX_OK;
 }
 
-static ngx_int_t memstore_reap_message( nchan_msg_t *msg ) {
-  ngx_buf_t         *buf = msg->buf;
+static void memstore_reap_message( nchan_msg_t *msg ) {
+  ngx_buf_t         *buf = &msg->buf;
   ngx_file_t        *f = buf->file;
   
-  assert(msg->refcount == MSG_REFCOUNT_INVALID);
+  assert(!msg_refcount_valid(msg));
   
   if(f != NULL) {
     if(f->fd != NGX_INVALID_FILE) {
@@ -1694,6 +1845,14 @@ static ngx_int_t memstore_reap_message( nchan_msg_t *msg ) {
     }
     ngx_delete_file(f->name.data); // assumes string is zero-terminated, which required trickery during allocation
   }
+  
+  if(msg->compressed && msg->compressed->buf.file) {
+    f = msg->compressed->buf.file;
+    if(f->fd != NGX_INVALID_FILE) {
+      ngx_close_file(f->fd);
+    }
+    ngx_delete_file(f->name.data); // assumes string is zero-terminated, which required trickery during allocation
+  }
   //DBG("free smsg %p",s msg);
 #if NCHAN_MSG_LEAK_DEBUG  
   msg_debug_remove(msg);
@@ -1705,16 +1864,14 @@ static ngx_int_t memstore_reap_message( nchan_msg_t *msg ) {
   ngx_memset(msg, 0xFA, sizeof(*msg)); //debug stuff
   shm_free(shm, msg);
   nchan_update_stub_status(messages, -1);
-  return NGX_OK;
 }
 
-static ngx_int_t memstore_reap_store_message( store_message_t *smsg ) {
+static void memstore_reap_store_message( store_message_t *smsg ) {
   
   memstore_reap_message(smsg->msg);
   
   ngx_memset(smsg, 0xBC, sizeof(*smsg)); //debug stuff
   ngx_free(smsg);
-  return NGX_OK;
 }
 
 
@@ -1745,6 +1902,10 @@ static ngx_int_t chanhead_delete_message(memstore_channel_head_t *ch, store_mess
   
   ngx_atomic_fetch_add(&ch->shared->stored_message_count, -1);
   
+  if(ch->groupnode) {
+    memstore_group_remove_message(ch->groupnode, msg->msg);
+  }
+  
   if(ch->channel.messages == 0) {
     assert(ch->msg_first == NULL);
     assert(ch->msg_last == NULL);
@@ -1803,6 +1964,8 @@ store_message_t *chanhead_find_next_message(memstore_channel_head_t *ch, nchan_m
   time_t           mid_time; //optimization yeah
   int16_t          mid_tag; //optimization yeah
   
+  assert(ch->msg_buffer_complete); //we only deal with complete buffers here
+  
   //DBG("find next message %V", msgid_to_str(msgid));
   if(ch == NULL) {
     *status = MSG_NOTFOUND;
@@ -1838,6 +2001,7 @@ store_message_t *chanhead_find_next_message(memstore_channel_head_t *ch, nchan_m
     store_message_t  *prev = NULL;
     
     assert(mid_tag != 0);
+    
     for(cur = (direction>0 ? ch->msg_first : ch->msg_last); cur != NULL && n > 1; cur = (direction>0 ? cur->next : cur->prev)) {
       prev = cur;
       n--;
@@ -1891,6 +2055,8 @@ typedef struct {
   nchan_msg_id_t               msg_id;
   callback_pt                  cb;
   void                        *cb_privdata;
+  unsigned                     channel_exists:1;
+  unsigned                     group_channel_limit_pass:1;
   unsigned                     reserved:1;
   unsigned                     subbed:1;
   unsigned                     allocd:1;
@@ -1925,7 +2091,7 @@ static void subscribe_data_free(subscribe_data_t *d) {
 #define SUB_CHANNEL_AUTHORIZED 1
 #define SUB_CHANNEL_NOTSURE 2
 
-static ngx_int_t nchan_store_subscribe_sub_auth_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d);
+static ngx_int_t nchan_store_subscribe_channel_existence_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d);
 static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d);
 
 static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub) {
@@ -1939,42 +2105,50 @@ static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub)
   d->sub = sub;
   d->subbed = 0;
   d->reserved = 0;
+  d->channel_exists = 0;
+  d->group_channel_limit_pass = 0;
   d->msg_id = sub->last_msgid;
   
   if(sub->cf->subscribe_only_existing_channel || sub->cf->max_channel_subscribers > 0) {
     sub->fn->reserve(sub);
     d->reserved = 1;
     if(memstore_slot() != owner) {
-      memstore_ipc_send_channel_auth_check(owner, channel_id, sub->cf, (callback_pt )nchan_store_subscribe_sub_auth_check_callback, d);
+      ngx_int_t rc;
+      rc = memstore_ipc_send_channel_existence_check(owner, channel_id, sub->cf, (callback_pt )nchan_store_subscribe_channel_existence_check_callback, d);
+      if(rc == NGX_DECLINED) { // out of memory
+        nchan_store_subscribe_channel_existence_check_callback(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
+        return NGX_ERROR;
+      }
     }
     else {
-      nchan_store_subscribe_continued(SUB_CHANNEL_NOTSURE, NULL, d);
+      return nchan_store_subscribe_continued(SUB_CHANNEL_NOTSURE, NULL, d);
     }
   }
   else {
-    nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
+    return nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
   }
-  
   return NGX_OK;
 }
 
-static ngx_int_t nchan_store_subscribe_sub_auth_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
+static ngx_int_t nchan_store_subscribe_channel_existence_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
   if(d->sub->fn->release(d->sub, 0) == NGX_OK) {
     d->reserved = 0;
     return nchan_store_subscribe_continued(channel_status, _, d);
   }
   else {//don't go any further, the sub has been deleted
-    assert(d->sub->reserved == 0);
     subscribe_data_free(d);
     return NGX_OK;
   }
 }
 
-static ngx_int_t redis_subscribe_channel_authcheck_callback(ngx_int_t status, void *ch, void *d) {
+static ngx_int_t redis_subscribe_channel_existence_callback(ngx_int_t status, void *ch, void *d) {
   nchan_channel_t    *channel = (nchan_channel_t *)ch;
   subscribe_data_t   *data = (subscribe_data_t *)d;
   nchan_loc_conf_t   *cf = data->sub->cf;
   ngx_int_t           channel_status;
+  
+  data->channel_exists = channel != NULL;
+  
   if(status == NGX_OK) {
     if(channel == NULL) {
       channel_status = cf->subscribe_only_existing_channel ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
@@ -1989,6 +2163,7 @@ static ngx_int_t redis_subscribe_channel_authcheck_callback(ngx_int_t status, vo
     */
     else {
       channel_status = SUB_CHANNEL_AUTHORIZED;
+
     }
     nchan_store_subscribe_continued(channel_status, NULL, data);
   }
@@ -1999,18 +2174,151 @@ static ngx_int_t redis_subscribe_channel_authcheck_callback(ngx_int_t status, vo
   return NGX_OK;
 }
 
+static ngx_int_t group_subscribe_accounting_check(ngx_int_t rc, nchan_group_t *shm_group, subscribe_data_t *d) {
+  
+  memstore_channel_head_t  *ch = ensure_chanhead_ready_or_trash_chanhead(d->chanhead, 0);
+  
+  if(ch && d->sub->status != DEAD) {
+    if(shm_group) {
+      if(!shm_group->limit.subscribers || shm_group->subscribers < shm_group->limit.subscribers) { 
+        //not an atomic comparison but we don't really care
+        d->chanhead->spooler.fn->add(&d->chanhead->spooler, d->sub);
+      }
+      else {
+        d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+      }
+    }
+    else {
+      ERR("coldn't find group for group_subscribe_accounting_check");
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+    }
+  }
+  
+  if(d->reserved) {
+    d->sub->fn->release(d->sub, 0);
+  }
+  memstore_chanhead_release(d->chanhead, "group accounting check");
+  
+  subscribe_data_free(d);
+  return NGX_OK;
+}
+
+
+static ngx_int_t group_subscribe_channel_limit_reached(ngx_int_t rc, nchan_channel_t *chaninfo, subscribe_data_t *d) {
+  //no new hannels!
+  if(d->sub->status != DEAD) {
+    if(chaninfo) {
+      //ok, channel already exists.
+      nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
+    }
+    else {
+      //nope. no channel, no subscribing.
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+      if(d->reserved)  d->sub->fn->release(d->sub, 0);
+      subscribe_data_free(d);
+    }
+  }
+  else {
+    if(d->reserved)  d->sub->fn->release(d->sub, 0);
+    subscribe_data_free(d);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t group_subscribe_channel_limit_check(ngx_int_t _, nchan_group_t *shm_group, subscribe_data_t *d) {
+  ngx_int_t    rc = NGX_OK;
+  DBG("group subscribe limit check");
+  if(d->sub->status != DEAD) {
+    if(shm_group) {
+      if(!shm_group->limit.channels || (shm_group->channels < shm_group->limit.channels)) {
+        d->group_channel_limit_pass = 1;
+        rc = nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
+      }
+      else if (shm_group->limit.channels && shm_group->channels == shm_group->limit.channels){
+        //no new channels!
+        rc = nchan_store_find_channel(d->channel_id, d->sub->cf, (callback_pt )group_subscribe_channel_limit_reached, d);
+      }
+      else {
+        rc = nchan_store_subscribe_continued(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
+      }
+      
+    }
+    else {
+      //well that's unusual...
+      ERR("coldn't find group for group_subscribe_channel_limit_check");
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+      if(d->reserved)  d->sub->fn->release(d->sub, 0);
+      subscribe_data_free(d);
+      rc = NGX_ERROR;
+    }
+  }
+  else {
+    if(d->reserved)  d->sub->fn->release(d->sub, 0);
+    subscribe_data_free(d);
+  }
+  return rc;
+}
+
 static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
   memstore_channel_head_t       *chanhead = NULL;
+  int                            retry_null_chanhead = 1;
   //store_message_t             *chmsg;
   //nchan_msg_status_t           findmsg_status;
-  ngx_int_t                      not_dead;
-  ngx_int_t                      use_redis = d->sub->cf->redis.enabled;
+  ngx_int_t                      check_redis = d->sub->cf->redis.enabled; // for BACKUP and DISTRIBUTED mode
   nchan_loc_conf_t              *cf = d->sub->cf;
   ngx_int_t                      rc = NGX_OK;
+  nchan_request_ctx_t           *ctx = NULL;
+  
+  if(d->sub->status == DEAD) {
+    if(d->reserved) {
+      d->sub->fn->release(d->sub, 0);
+      d->reserved = 0;
+    }
+    subscribe_data_free(d);
+    return rc;
+  }
+  
+  if(d->sub->request) {
+    ctx = ngx_http_get_module_ctx(d->sub->request, ngx_nchan_module);
+  }
   
   switch(channel_status) {
     case SUB_CHANNEL_AUTHORIZED:
-      chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
+      if(cf->group.enable_accounting) {
+        //now we dance the careful dance of making sure the group channel limit is not exceeded
+        //it isn't a pretty dance.
+        if(d->group_channel_limit_pass || d->channel_exists) {
+          //already checked, or no need to check
+          chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
+          retry_null_chanhead = 0;
+          if(!chanhead) rc = NGX_ERROR;
+        }
+        else if((chanhead = nchan_memstore_find_chanhead(d->channel_id)) != NULL) {
+          //well, the channel exists already, so using it won't exceed the limit
+          d->group_channel_limit_pass = 1;
+        }
+        else {
+          //can't find the channel. gotta check if it really does exist
+          DBG("can't find the channel. gotta check if it really does exist");
+          if(ctx) {
+            if(!d->reserved) {
+              d->sub->fn->reserve(d->sub);
+              d->reserved = 1;
+            }
+            return memstore_group_find(groups, nchan_get_group_name(d->sub->request, cf, ctx), (callback_pt )group_subscribe_channel_limit_check, d);
+          }
+          else {
+            retry_null_chanhead = 0;
+            rc = NGX_ERROR;
+            chanhead = NULL;
+          }
+        }
+      }
+      else {
+        chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
+        if(!chanhead) rc = NGX_ERROR;
+        retry_null_chanhead = 0;
+      }
       break;
     
     case SUB_CHANNEL_UNAUTHORIZED:
@@ -2018,7 +2326,7 @@ static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void*
       break;
     
     case SUB_CHANNEL_NOTSURE:
-      if(use_redis) {
+      if(check_redis) {
         if(cf->subscribe_only_existing_channel) {
           //we used to also check if cf->max_channel_subscribers == 0 here, but that's
           //no longer necessary, as the shared subscriber total check is now disabled
@@ -2026,8 +2334,8 @@ static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void*
             break;
           }
         }
-        nchan_store_redis.find_channel(d->channel_id, cf, redis_subscribe_channel_authcheck_callback, d);
-        return NGX_OK;
+        nchan_store_redis.find_channel(d->channel_id, cf, redis_subscribe_channel_existence_callback, d);
+        return rc;
       }
       else {
         chanhead = nchan_memstore_find_chanhead(d->channel_id);
@@ -2035,14 +2343,12 @@ static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void*
       break;
   }
   
-  not_dead = d->sub->status != DEAD;
 
   if ((channel_status == SUB_CHANNEL_UNAUTHORIZED) || 
       (!chanhead && cf->subscribe_only_existing_channel) ||
       (chanhead && cf->max_channel_subscribers > 0 && chanhead->shared && chanhead->shared->sub_count >= (ngx_uint_t )cf->max_channel_subscribers)) {
-    if(not_dead) {
-      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL);
-    }
+    
+    d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
     
     if(d->reserved) {
       d->sub->fn->release(d->sub, 0);
@@ -2054,19 +2360,14 @@ static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void*
     d->sub = NULL; //debug
     //d->cb(NGX_HTTP_NOT_FOUND, NULL, d->cb_privdata);
     subscribe_data_free(d);
-    return NGX_OK;
+    return rc;
   }
-  else if(!chanhead) {
+  else if(!chanhead && retry_null_chanhead) {
     chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
   }
   
   if(!chanhead) { //nchan_memstore_get_chanhead could fail when out of shared memory
-    if(not_dead) {
-      //this response does something funny (i.e. crashy) to the finalize_request function
-      //no response for now, but TODO: get this right
-      //d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL);
       rc = NGX_ERROR;
-    }
   }
   
   d->chanhead = chanhead;
@@ -2075,8 +2376,47 @@ static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void*
     d->sub->fn->release(d->sub, 1);
     d->reserved = 0;
   }
-  if(chanhead && not_dead) {
-    chanhead->spooler.fn->add(&chanhead->spooler, d->sub);
+  if(chanhead) {
+    
+    //check message id appropriateness
+    if(!nchan_msgid_tagcount_match(&d->sub->last_msgid, chanhead->multi ? chanhead->multi_count : 1)) {
+      d->sub->fn->reserve(d->sub);
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_BAD_REQUEST, NULL, NULL);
+      d->sub->fn->release(d->sub, 0);
+    }
+    else if(cf->group.enable_accounting || chanhead->groupnode) {
+      //per-group max subscriber check
+      DBG("per-group max subscriber check");
+      assert(d->allocd);
+      d->sub->fn->reserve(d->sub);
+      d->reserved = 1;
+      memstore_chanhead_reserve(chanhead, "group accounting check");
+      if(chanhead->groupnode) {
+        DBG("memstore_group_find_from_groupnode(groups, chanhead->groupnode, (callback_pt )group_subscribe_accounting_check, d) sub: %p", d->sub);
+        memstore_group_find_from_groupnode(groups, chanhead->groupnode, (callback_pt )group_subscribe_accounting_check, d);
+      }
+      else {
+        if(ctx) {
+          // this means group accounting was disabled when the channel was created.
+          // that's okay though, we should check it anyway.
+          DBG("memstore_group_find(groups, nchan_get_group_name(d->sub->request, cf, ctx), (callback_pt )group_subscribe_accounting_check, d); sub: %p", d->sub);
+          memstore_group_find(groups, nchan_get_group_name(d->sub->request, cf, ctx), (callback_pt )group_subscribe_accounting_check, d);
+        }
+        else {
+          d->sub->fn->respond_status(d->sub, NGX_HTTP_BAD_REQUEST, NULL, NULL);
+          subscribe_data_free(d);
+          return NGX_ERROR;
+        }
+      }
+      return rc;
+    }
+    else {
+      chanhead->spooler.fn->add(&chanhead->spooler, d->sub);
+    }
+  }
+  else {
+    //out-of-memory condition
+    d->sub->fn->respond_status(d->sub, NGX_HTTP_INSUFFICIENT_STORAGE, NULL, NULL);
   }
 
   subscribe_data_free(d);
@@ -2124,21 +2464,28 @@ static ngx_inline void set_multimsg_msg(get_multi_message_data_t *d, get_multi_m
   d->msg_status = status;
 }
 
-static ngx_int_t nchan_store_async_get_multi_message_callback(nchan_msg_status_t status, nchan_msg_t *msg, get_multi_message_data_single_t *sd);
+static ngx_int_t nchan_store_async_get_multi_message_callback(ngx_int_t code, void *d, void *pd);
 
-static void retry_get_multi_message_after_MSG_NORESPONSE(void *pd) {
-  get_multi_message_data_single_t  *sd = pd;
-  get_multi_message_data_t         *d = sd->d;
-  nchan_msg_id_t                    retry_msgid = NCHAN_ZERO_MSGID;
-  assert(nchan_extract_from_multi_msgid(&d->wanted_msgid, sd->n, &retry_msgid) == NGX_OK);
-  nchan_store_async_get_message(&d->chanhead->multi[sd->n].id, &retry_msgid, d->chanhead->cf, (callback_pt )nchan_store_async_get_multi_message_callback, sd);
+static ngx_int_t nchan_store_async_get_multi_message_callback_cleanup(get_multi_message_data_t *d) {
+  if(d->getting == 0) {
+    nchan_free_msg_id(&d->wanted_msgid);
+    if(d->timer.timer_set) {
+      ngx_del_timer(&d->timer);
+    }
+    ngx_free(d);
+  }
+  return NGX_OK;
 }
 
-static ngx_int_t nchan_store_async_get_multi_message_callback(nchan_msg_status_t status, nchan_msg_t *msg, get_multi_message_data_single_t *sd) {
+static ngx_int_t nchan_store_async_get_multi_message_callback(ngx_int_t code, void *ptr, void *pd) {
+  nchan_msg_status_t          status = code;
+  nchan_msg_t                *msg = ptr;
+  get_multi_message_data_single_t *sd = pd;
+  
   static int16_t              multi_largetag[NCHAN_MULTITAG_MAX], multi_prevlargetag[NCHAN_MULTITAG_MAX];
   //ngx_str_t                   empty_id_str = ngx_string("-");
   get_multi_message_data_t   *d = sd->d;
-  nchan_msg_copy_t            retmsg;
+  nchan_msg_t                 retmsg;
   
   /*
   switch(status) {
@@ -2152,15 +2499,7 @@ static ngx_int_t nchan_store_async_get_multi_message_callback(nchan_msg_status_t
   if(d->expired) {
     ERR("multimsg callback #%i for %p received after expiring at %ui status %i msg %p", d->n, d, d->expired, status, msg);
     d->getting--;
-    goto cleanup;
-  }
-  
-  if(status == MSG_NORESPONSE) {
-    //retry featching that message
-    //this isn't clean, nor is it efficient
-    //buf fuck it, we're doing it live.
-    nchan_add_oneshot_timer(retry_get_multi_message_after_MSG_NORESPONSE, sd, 10);
-    return NGX_OK;
+    return nchan_store_async_get_multi_message_callback_cleanup(d);
   }
   d->getting--;
   
@@ -2200,40 +2539,38 @@ static ngx_int_t nchan_store_async_get_multi_message_callback(nchan_msg_status_t
     memstore_chanhead_release(d->chanhead, "multimsg");
     if(d->msg) {
       int16_t      *muhtags;
-      
       ngx_int_t     n = d->n;
-      retmsg.copy = *d->msg;
-      retmsg.copy.shared = 0;
-      retmsg.copy.temp_allocd = 0;
-      retmsg.original = d->msg;
       
-      nchan_copy_msg_id(&retmsg.copy.prev_id, &d->wanted_msgid, multi_prevlargetag);
+      assert(d->msg->id.tagcount == 1);
+      
+      nchan_msg_derive_stack(d->msg, &retmsg, NULL);
+      
+      nchan_copy_msg_id(&retmsg.prev_id, &d->wanted_msgid, multi_prevlargetag);
       
       //TODO: some kind of missed-message check maybe?
       
       if (d->wanted_msgid.time != d->msg->id.time) {
-        nchan_copy_msg_id(&retmsg.copy.id, &d->msg->id, multi_largetag);
+        nchan_copy_msg_id(&retmsg.id, &d->msg->id, NULL);
         
         if(d->multi_count > NCHAN_FIXED_MULTITAG_MAX) {
-          retmsg.copy.id.tag.allocd = multi_largetag;
-          assert(d->msg->id.tagcount == 1);
-          retmsg.copy.id.tag.allocd[0] = d->msg->id.tag.fixed[0];
+          retmsg.id.tag.allocd = multi_largetag;
+          retmsg.id.tag.allocd[0] = d->msg->id.tag.fixed[0];
         }
-        retmsg.copy.id.tagcount = d->multi_count;
-        nchan_expand_msg_id_multi_tag(&retmsg.copy.id, 0, n, -1);
+        retmsg.id.tagcount = d->multi_count;
+        nchan_expand_msg_id_multi_tag(&retmsg.id, 0, n, -1);
       }
       else {
-        nchan_copy_msg_id(&retmsg.copy.id, &d->wanted_msgid, multi_largetag); 
+        nchan_copy_msg_id(&retmsg.id, &d->wanted_msgid, multi_largetag); 
       }
       
-      muhtags = (d->multi_count > NCHAN_FIXED_MULTITAG_MAX) ? retmsg.copy.id.tag.allocd : retmsg.copy.id.tag.fixed;
+      muhtags = (d->multi_count > NCHAN_FIXED_MULTITAG_MAX) ? retmsg.id.tag.allocd : retmsg.id.tag.fixed;
       muhtags[n] = d->msg->id.tag.fixed[0];
       
-      retmsg.copy.id.tagactive = n;
+      retmsg.id.tagactive = n;
       
       //DBG("respond msg id transformed into %p %V", &retmsg.copy, msgid_to_str(&retmsg.copy.id));
       
-      d->cb(d->msg_status, &retmsg.copy, d->privdata);
+      d->cb(d->msg_status, &retmsg, d->privdata);
       
       msg_release(d->msg, "get multi msg");
     }
@@ -2242,15 +2579,7 @@ static ngx_int_t nchan_store_async_get_multi_message_callback(nchan_msg_status_t
     }
   }
 
-cleanup:
-  if(d->getting == 0) {
-    nchan_free_msg_id(&d->wanted_msgid);
-    if(d->timer.timer_set) {
-      ngx_del_timer(&d->timer);
-    }
-    ngx_free(d);
-  }
-  return NGX_OK;
+  return nchan_store_async_get_multi_message_callback_cleanup(d);
 }
 
 static void get_multimsg_timeout(ngx_event_t *ev) {
@@ -2280,22 +2609,22 @@ static ngx_int_t nchan_store_async_get_multi_message(ngx_str_t *chid, nchan_msg_
   
   ngx_memzero(req_msgid, sizeof(req_msgid));
   
-  chead = nchan_memstore_get_chanhead(chid, &default_multiconf);
-  assert(chead);
+  if((chead = nchan_memstore_get_chanhead(chid, &default_multiconf)) == NULL) {
+    //probably out of memory
+    callback(MSG_EXPECTED, NULL, privdata); // this is a lie.
+    return NGX_ERROR;
+  }
+  
   n = chead->multi_count;
   
   multi = chead->multi;
   
-  memstore_chanhead_reserve(chead, "multimsg");
-  
   //init loop
   for(i = 0; i < n; i++) {
     want[i] = 0;
   }
   
   //DBG("get multi msg %V (count: %i)", msgid_to_str(msg_id), n);
-  
-  
   if(msg_id->time == 0) {
     for(i = 0; i < n; i++) {
       assert(nchan_extract_from_multi_msgid(msg_id, i, &req_msgid[i]) == NGX_OK);
@@ -2329,6 +2658,13 @@ static ngx_int_t nchan_store_async_get_multi_message(ngx_str_t *chid, nchan_msg_
     }
   }
   
+  if(getting == 0) { //don't need to explicitly fetch messages, we know all the responses will be MSG_EXPECTED
+    DBG("don't need to explicitly fetch messages for %V (msgid %V), we know all the responses will be MSG_EXPECTED", chid, msgid_to_str(msg_id));
+    callback(MSG_EXPECTED, NULL, privdata);
+    return NGX_OK;
+  }
+  
+  memstore_chanhead_reserve(chead, "multimsg");
   
   get_multi_message_data_t         *d;
   get_multi_message_data_single_t  *sd;
@@ -2362,7 +2698,7 @@ static ngx_int_t nchan_store_async_get_multi_message(ngx_str_t *chid, nchan_msg_
       
       getmsg_chid = (multi == NULL) ? &ids[i] : &multi[i].id;
       //DBG("get message from %V (n: %i) %V", getmsg_chid, i, msgid_to_str(&req_msgid[i]));
-      nchan_store_async_get_message(getmsg_chid, &req_msgid[i], chead->cf, (callback_pt )nchan_store_async_get_multi_message_callback, sd);
+      nchan_store_async_get_message(getmsg_chid, &req_msgid[i], chead->cf, nchan_store_async_get_multi_message_callback, sd);
       sd++;
     }
   }
@@ -2370,9 +2706,8 @@ static ngx_int_t nchan_store_async_get_multi_message(ngx_str_t *chid, nchan_msg_
   return NGX_OK;
 }
 
-void async_get_message_notify_on_MSG_EXPECTED_callback(nchan_msg_status_t status, void *pd){
-  subscribe_data_t            *d = (subscribe_data_t *) pd; 
-  nchan_memstore_handle_get_message_reply(NULL, status, d);
+static ngx_int_t getmsg_proxy_completebuffer_callback(ngx_int_t code, nchan_msg_t *msg, void *data) {
+  return nchan_memstore_handle_get_message_reply(msg, code, data);
 }
 
 static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
@@ -2382,21 +2717,17 @@ static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_
   nchan_msg_status_t           findmsg_status;
   memstore_channel_head_t     *chead;
   
-  ngx_int_t                    use_redis = 0;
-  
   if(callback==NULL) {
     ERR("no callback given for async get_message. someone's using the API wrong!");
     return NGX_ERROR;
   }
   
-  if(is_multi_id(channel_id)) {
+  if(nchan_channel_id_is_multi(channel_id)) {
     return nchan_store_async_get_multi_message(channel_id, msg_id, callback, privdata);
   }
   
   chead = nchan_memstore_find_chanhead(channel_id);
-  if(chead) {
-    use_redis = chead->cf && chead->cf->redis.enabled;
-  }
+  
   d = subscribe_data_alloc(owner);
   d->channel_owner = owner;
   d->channel_id = channel_id;
@@ -2408,19 +2739,31 @@ static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_
   
   if(memstore_slot() != owner) {
     //check if we need to ask for a message
-    memstore_ipc_send_get_message(d->channel_owner, d->channel_id, &d->msg_id, d);
+    if(memstore_ipc_send_get_message(d->channel_owner, d->channel_id, &d->msg_id, d) == NGX_DECLINED) {
+      subscribe_data_free(d);
+      callback(MSG_ERROR, NULL, privdata);
+      return NGX_ERROR;
+    }
+  }
+  else if(!chead->msg_buffer_complete) {
+    assert(d->allocd == 1); //let's assume subscribe_data_alloc always allocates
+    subscriber_t *getmsg_sub = getmsg_proxy_subscriber_create(msg_id, (callback_pt )getmsg_proxy_completebuffer_callback, d);
+    if(getmsg_sub == NULL) {
+      ERR("Unable to create getmsg proxy sub for async get_message");
+      subscribe_data_free(d);
+      callback(MSG_ERROR, NULL, privdata);
+      return NGX_ERROR;
+    }
+    if(chead->spooler.fn->add(&chead->spooler, getmsg_sub) != NGX_OK) {
+      ERR("Unable to subscribe getmsg sub for async get_message");
+      subscribe_data_free(d);
+      callback(MSG_ERROR, NULL, privdata);
+      return NGX_ERROR;
+    }
+    return NGX_OK;
   }
   else {
     chmsg = chanhead_find_next_message(d->chanhead, &d->msg_id, &findmsg_status);
-    
-    if(chmsg == NULL && use_redis) {
-      int       was_it_allocd = d->allocd;
-      d->allocd = 0;
-      nchan_memstore_redis_subscriber_notify_on_MSG_EXPECTED(chead->redis_sub, msg_id, async_get_message_notify_on_MSG_EXPECTED_callback, sizeof(*d), d);
-      d->allocd = was_it_allocd;
-      subscribe_data_free(d);
-      return NGX_OK;
-    }
     return nchan_memstore_handle_get_message_reply(chmsg == NULL ? NULL : chmsg->msg, findmsg_status, d);
   }
   
@@ -2459,7 +2802,7 @@ static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_messag
   if(ch->msg_last && ch->msg_last->msg->id.time == msg->msg->id.time) {
     msg->msg->id.tag.fixed[0] = ch->msg_last->msg->id.tag.fixed[0] + 1;
   }
-  else if(!ch->cf->redis.enabled) {
+  else if(!ch->cf->redis.enabled || ch->cf->redis.storage_mode < REDIS_MODE_DISTRIBUTED) { //TODO: check this logic
     msg->msg->id.tag.fixed[0] = 0;
   }
 
@@ -2470,6 +2813,10 @@ static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_messag
   ngx_atomic_fetch_add(&ch->shared->stored_message_count, 1);
   ngx_atomic_fetch_add(&ch->shared->total_message_count, 1);
 
+  if(ch->groupnode) {
+    memstore_group_add_message(ch->groupnode, msg->msg);
+  }
+  
   ch->msg_last = msg;
   
   //DBG("create %V %V", msgid_to_str(&msg->msg->id), chanhead_msg_to_str(msg));
@@ -2480,12 +2827,6 @@ static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_messag
   return ch->msg_last == msg ? NGX_OK : NGX_ERROR;
 }
 
-typedef struct {
-  nchan_msg_t             msg;
-  ngx_buf_t               buf;
-  ngx_file_t              file;
-} shmsg_memspace_t;
-
 static u_char* copy_preallocated_str_to_cur(ngx_str_t *dst, ngx_str_t *src, u_char *cur) {
   size_t   sz = src->len;
   dst->len = sz; 
@@ -2499,154 +2840,153 @@ static u_char* copy_preallocated_str_to_cur(ngx_str_t *dst, ngx_str_t *src, u_ch
   return cur + sz;
 }
 
-static nchan_msg_t *create_shm_msg(nchan_msg_t *m) {
-  shmsg_memspace_t        *stuff;
-  nchan_msg_t             *msg;
-  ngx_buf_t               *mbuf = NULL, *buf=NULL;
-  u_char                  *cur;
-  mbuf = m->buf;
-  
-  size_t                  total_sz, buf_body_size = 0, content_type_size = 0, buf_filename_size = 0, eventsource_event_size = 0;
-  
-  eventsource_event_size += m->eventsource_event.len;
-  content_type_size += m->content_type.len;
-  if(ngx_buf_in_memory_only(mbuf)) {
-    buf_body_size = ngx_buf_size(mbuf);
+static size_t memstore_buf_memsize(ngx_buf_t *buf) {
+  size_t buf_size = 0;
+  if(ngx_buf_in_memory_only(buf)) {
+    buf_size += ngx_buf_size(buf);
   }
-  if(mbuf->in_file && mbuf->file != NULL) {
-    buf_filename_size = mbuf->file->name.len + 1; //+1 to ensure NUL-terminated filename string
+  if(buf->in_file && buf->file != NULL) {
+    buf_size = sizeof(ngx_file_t) + buf->file->name.len + 1; //+1 to ensure NUL-terminated filename string
+  }
+  return buf_size;
+}
+
+size_t memstore_msg_memsize(nchan_msg_t *m) {
+  size_t                  total_sz, buf_contents_size = 0, content_type_size = 0, eventsource_event_size = 0, compressed_sz = 0;
+  ngx_buf_t              *mbuf = &m->buf;
+  if(m->eventsource_event)
+    eventsource_event_size += m->eventsource_event->len + sizeof(ngx_str_t);
+  if(m->content_type)
+    content_type_size += m->content_type->len + sizeof(ngx_str_t);
+  
+  buf_contents_size = memstore_buf_memsize(mbuf);
+  
+  if(m->compressed) {
+    compressed_sz += sizeof(nchan_compressed_msg_t) + memstore_buf_memsize(&m->compressed->buf);
   }
   
-  total_sz = sizeof(*stuff) + (buf_filename_size + content_type_size + eventsource_event_size +  buf_body_size);
+  total_sz = sizeof(nchan_msg_t) + (buf_contents_size + content_type_size + eventsource_event_size + compressed_sz);
 #if NCHAN_MSG_LEAK_DEBUG
   size_t    debug_sz = m->lbl.len;
   total_sz += debug_sz;
 #endif
   
-  if((stuff = shm_alloc(shm, total_sz, "message")) == NULL) {
-    ERR("can't allocate 'shared' memory for msg for channel id");
+  return total_sz;
+}
+
+static u_char *copy_buf_contents(ngx_buf_t *in, ngx_buf_t *out, u_char *rest) {
+  size_t buf_mem_body_size = 0;
+  
+  if(in->file!=NULL) {
+    out->file = (ngx_file_t *)rest;
+    *out->file = *in->file;
+    out->file->fd = NGX_INVALID_FILE;
+    out->file->log = ngx_cycle->log;
+    
+    rest = (u_char *)&out->file[1];
+    rest = copy_preallocated_str_to_cur(&out->file->name, &in->file->name, rest);
+    //ensure last char is NUL
+    *(rest++) = '\0';
+  }
+  
+  if(ngx_buf_in_memory_only(in)) {
+    buf_mem_body_size = ngx_buf_size(in);
+  }
+  
+  if(buf_mem_body_size > 0) {
+    ngx_str_t   dst_str, src_str = {buf_mem_body_size, in->pos};
+    
+    rest = copy_preallocated_str_to_cur(&dst_str, &src_str, rest);
+    
+    out->pos = dst_str.data;
+    out->last = out->pos + dst_str.len;
+    out->start = out->pos;
+    out->end = out->last;
+  }
+  
+  return rest;
+}
+
+//#define NCHAN_CREATE_SHM_MSG_DEBUG 1
+
+static nchan_msg_t *create_shm_msg(nchan_msg_t *m) {
+  nchan_msg_t             *msg;
+  ngx_buf_t               *mbuf = NULL;
+  u_char                  *cur;
+  size_t                   memsize = memstore_msg_memsize(m);
+
+#if NCHAN_CREATE_SHM_MSG_DEBUG
+  memsize += 5;
+#endif
+  mbuf = &m->buf;
+    
+  if((msg = shm_alloc(shm, memsize, "message")) == NULL) {
+    nchan_log_ooshm_error("allocating message of size %i", memsize);
     return NULL;
   }
-  cur = (u_char *)&stuff[1];
   
+#if NCHAN_CREATE_SHM_MSG_DEBUG
+  cur = (u_char *)msg;
+  cur[memsize+1]='e';
+  cur[memsize+2]='n';
+  cur[memsize+3]='d';
+  cur[memsize+4]='\0';
+#endif
+  
+  cur = (u_char *)&msg[1];
   assert(m->id.tagcount == 1);
   
-  msg = &stuff->msg;
-  buf = &stuff->buf;
+  *msg = *m;
   
-  ngx_memcpy(msg, m, sizeof(*msg));
-  ngx_memcpy(buf, mbuf, sizeof(*buf));
-  
-  msg->buf = buf;
-  
-  cur = copy_preallocated_str_to_cur(&msg->content_type, &m->content_type, cur);
-  
-  cur = copy_preallocated_str_to_cur(&msg->eventsource_event, &m->eventsource_event, cur);
-  
-  if(mbuf->file!=NULL) {
-    buf->file = &stuff->file;
-    *buf->file = *mbuf->file;
-    buf->file->fd =NGX_INVALID_FILE;
-    buf->file->log = ngx_cycle->log;
-    
-    cur = copy_preallocated_str_to_cur(&buf->file->name, &mbuf->file->name, cur);
-    //ensure last char is NUL
-    *(cur++) = '\0';
+  if(m->content_type) {
+    msg->content_type = (ngx_str_t *)cur;
+    cur = (u_char *)(&msg->content_type[1]);
+    cur = copy_preallocated_str_to_cur(msg->content_type, m->content_type, cur);
+  }
+  else {
+    msg->content_type = NULL;
   }
   
-  if(buf_body_size > 0) {
-    ngx_str_t   dst_str, src_str = {buf_body_size, mbuf->pos};
-    
-    //cur = copy_preallocated_str_to_cur(&dst_str, &src_str, cur);
-    copy_preallocated_str_to_cur(&dst_str, &src_str, cur);
-    
-    buf->pos = dst_str.data;
-    buf->last = buf->pos + dst_str.len;
-    buf->start = buf->pos;
-    buf->end = buf->last;
+  if(m->eventsource_event) {
+    msg->eventsource_event = (ngx_str_t *)cur;
+    cur = (u_char *)(&msg->eventsource_event[1]);
+    cur = copy_preallocated_str_to_cur(msg->eventsource_event, m->eventsource_event, cur);
+  }
+  else {
+    msg->eventsource_event = NULL;
   }
   
-  msg->shared = 1;
-  msg->temp_allocd = 0;
+  cur = copy_buf_contents(mbuf, &msg->buf, cur);
+  msg->buf.last_buf = 1;
+  
+  msg->storage = NCHAN_MSG_SHARED;
+  msg->parent = NULL;
+  
+  if(m->compressed) {
+    msg->compressed = (nchan_compressed_msg_t *)cur;
+    cur = (u_char *)&msg->compressed[1];
+    *msg->compressed = *m->compressed;    
+    cur = copy_buf_contents(&m->compressed->buf, &msg->compressed->buf, cur);
+    msg->compressed->buf.last_buf = 1;
+  }
   
 #if NCHAN_MSG_RESERVE_DEBUG
   msg->rsv = NULL;
 #endif
-#if NCHAN_MSG_LEAK_DEBUG  
+#if NCHAN_MSG_LEAK_DEBUG 
+  assert((u_char *)msg + memsize == cur + m->lbl.len);
   msg->lbl.len = m->lbl.len;
-  msg->lbl.data = (u_char *)stuff + (total_sz - debug_sz);
+  msg->lbl.data = cur;
   ngx_memcpy(msg->lbl.data, m->lbl.data, msg->lbl.len);
   
   msg_debug_add(msg);
 #endif
-  
+#if NCHAN_CREATE_SHM_MSG_DEBUG
+  assert(ngx_memcmp(((u_char *)msg) + memsize + 1, "end", 4) == 0);
+#endif
   return msg;
 }
 
-ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl) {
-  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, 1);
-  assert(msg->refcount >= 0);
-  if(msg->refcount < 0) {
-    msg->refcount = MSG_REFCOUNT_INVALID;
-    return NGX_ERROR;
-  }
-#if NCHAN_MSG_RESERVE_DEBUG  
-  msg_rsv_dbg_t     *rsv;
-  shmtx_lock(shm);
-  rsv=shm_locked_calloc(shm, sizeof(*rsv) + ngx_strlen(lbl) + 1, "msgdebug");
-  rsv->lbl = (char *)(&rsv[1]);
-  ngx_memcpy(rsv->lbl, lbl, ngx_strlen(lbl));
-  if(msg->rsv == NULL) {
-    msg->rsv = rsv;
-    rsv->prev = NULL;
-    rsv->next = NULL;
-  }
-  else {
-    msg->rsv->prev = rsv;
-    rsv->next = msg->rsv;
-    rsv->prev = NULL;
-    msg->rsv = rsv;
-  }
-  shmtx_unlock(shm);
-#endif
-  //DBG("msg %p reserved (%i) %s", msg, msg->refcount, lbl);
-  return NGX_OK;
-}
-
-ngx_int_t msg_release(nchan_msg_t *msg, char *lbl) {
-#if NCHAN_MSG_RESERVE_DEBUG
-  msg_rsv_dbg_t     *cur, *prev, *next;
-  size_t             sz = ngx_strlen(lbl);
-  ngx_int_t          rsv_found=0;
-  shmtx_lock(shm);
-  assert(msg->refcount > 0);
-  for(cur = msg->rsv; cur != NULL; cur = cur->next) {
-    if(ngx_memcmp(lbl, cur->lbl, sz) == 0) {
-      prev = cur->prev;
-      next = cur->next;
-      if(prev) {
-        prev->next = next;
-      }
-      if(next) {
-        next->prev = prev;
-      }
-      if(cur == msg->rsv) {
-        msg->rsv = next;
-      }
-      shm_locked_free(shm, cur);
-      rsv_found = 1;
-      break;
-    }
-  }
-  assert(rsv_found);
-  shmtx_unlock(shm);
-#endif
-  assert(msg->refcount > 0);
-  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, -1);
-  //DBG("msg %p released (%i) %s", msg, msg->refcount, lbl);
-  return NGX_OK;
-}
-
 static store_message_t *create_shared_message(nchan_msg_t *m, ngx_int_t msg_already_in_shm) {
   store_message_t          *chmsg;
   nchan_msg_t              *msg;
@@ -2705,13 +3045,128 @@ static ngx_int_t publish_multi_callback(ngx_int_t status, void *rptr, void *priv
   return NGX_OK;
 }
 
+typedef struct {
+  ngx_str_t        *chid;
+  ngx_str_t         groupname;
+  nchan_msg_t      *msg;
+  nchan_loc_conf_t *cf;
+  callback_pt       cb;
+  void             *pd;
+} group_publish_accounting_check_data_t;
+
+static ngx_int_t group_publish_accounting_channelcheck(ngx_int_t rc, nchan_channel_t *chaninfo, group_publish_accounting_check_data_t *d) {
+  if(chaninfo) {
+    //channel already exists. we may proceed.
+    nchan_store_publish_message_generic(d->chid, d->msg, 0, d->cf, d->cb, d->pd);
+  }
+  else {
+    char *err = "Group limit reached for number of channels.";
+    nchan_log_warning("%s (group %V)", err, &d->groupname);
+    d->cb(NGX_HTTP_FORBIDDEN, err, d->pd);
+  }
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static ngx_int_t group_publish_accounting_check(ngx_int_t rc, nchan_group_t *shm_group, group_publish_accounting_check_data_t *d) {
+  int     n;
+  int     ok = 0;
+  ssize_t msg_sz;
+  char   *err = "unknown error";
+  
+  
+  if(!shm_group) {
+    ERR("couldn't find group %V for publishing accounting check.", &d->groupname);
+    d->cb(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->pd);
+    ngx_free(d);
+    return NGX_ERROR;
+  }
+  
+  if((ok = !shm_group->limit.messages || shm_group->messages < shm_group->limit.messages) == 0) {
+    err = "Group limit reached for number of messages.";
+  }
+
+  if(ok && shm_group->limit.messages_shmem_bytes) {
+    n = count_channel_id(d->chid);
+    msg_sz = memstore_msg_memsize(d->msg);
+    ok = (shm_group->messages_shmem_bytes + n * msg_sz) <= shm_group->limit.messages_shmem_bytes;
+    if(!ok) err = "Group limit reached for memory used by messages.";
+  }
+  
+  if(ok && shm_group->limit.messages_file_bytes) {
+    ok = shm_group->messages_file_bytes + ngx_buf_size((&d->msg->buf)) <= shm_group->limit.messages_file_bytes;
+    // no need to multiply ngx_buf_size by n because the file is shared for all the messages.
+    if(!ok) err = "Group limit reached for disk space used by messages.";
+  }
+  
+  if(ok && shm_group->limit.channels) {
+    //channel check
+    if(shm_group->channels + 1 == shm_group->limit.channels) {
+      //need to check if publishing will create a channel
+      memstore_channel_head_t *ch;
+      
+      //first try it the easy way
+      ch = nchan_memstore_find_chanhead(d->chid);
+      if(!ch) {
+        //this is going to be kind of costly...
+        nchan_store_find_channel(d->chid, d->cf, (callback_pt )group_publish_accounting_channelcheck, d);
+        return NGX_OK;
+      }
+    }
+    else if(shm_group->channels >= shm_group->limit.channels) {
+      ok = 0;
+      err = "Group limit reached for number of channels.";
+    }
+  }
+  
+  if(ok) {
+    ngx_int_t pub_rc = nchan_store_publish_message_generic(d->chid, d->msg, 0, d->cf, d->cb, d->pd);
+    if(pub_rc == NGX_DECLINED) { //out of memory probably
+      d->cb(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, d->pd);
+    }
+  }
+  else {
+    nchan_log_warning("%s (group %V)", err, &d->groupname);
+    d->cb(NGX_HTTP_FORBIDDEN, err, d->pd);
+  }
+  
+  ngx_free(d);
+  return NGX_OK;
+}
+
 static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t *msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  return nchan_store_publish_message_generic(channel_id, msg, 0, cf, callback, privdata);
+  if(cf->group.enable_accounting) {
+    // it might be better to do this later when a chanhead is available,
+    // so we can avoid the group lookup in the group-tree and use chanhead->groupnode.
+    
+    // but the code is much cleaner doing it the less efficient way, and I don't think
+    // publishing is really going to be a bottleneck. Still, a possible TODO for later.
+    group_publish_accounting_check_data_t  *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    if(d == NULL) {
+      ERR("Couldn't allocate data for group publishing check");
+      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
+      return NGX_ERROR;
+    }
+    
+    d->chid = channel_id;
+    d->groupname = nchan_get_group_from_channel_id(channel_id);
+    d->msg = msg;
+    d->cf = cf;
+    d->cb = callback;
+    d->pd = privdata;
+    
+    return memstore_group_find(groups, &d->groupname, (callback_pt )group_publish_accounting_check, d);
+  }
+  else {
+    return nchan_store_publish_message_generic(channel_id, msg, 0, cf, callback, privdata);
+  }
 }
 
 static void fill_message_timedata(nchan_msg_t *msg, time_t timeout) {
-  //this coould be dangerous!!
   if(msg->id.time == 0) {
+    // cached time is okay to use here, because this is the channel owner.
+    // even if it's a second behind, so will the previous messages. 
+    // monotonicity is still preserved.
     msg->id.time = ngx_time();
   }
   if(msg->expires == 0) {
@@ -2720,32 +3175,38 @@ static void fill_message_timedata(nchan_msg_t *msg, time_t timeout) {
 }
 
 static ngx_int_t nchan_store_publish_message_to_single_channel_id(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  memstore_channel_head_t  *chead;
+  
+  if(callback == NULL) {
+    callback = empty_callback;
+  }
+  
   if(cf->redis.enabled) {
-    assert(!msg_in_shm);
-    nchan_update_stub_status(messages, 1);
     fill_message_timedata(msg, nchan_loc_conf_message_timeout(cf));
-    if(callback == NULL) {
-      callback = empty_callback;
+    
+    if(cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+      assert(!msg_in_shm);
+      return nchan_store_redis.publish(channel_id, msg, cf, callback, privdata);
     }
-    return nchan_store_redis.publish(channel_id, msg, cf, callback, privdata);
+    //BACKUP mode gets published later
   }
-  else {
-    memstore_channel_head_t  *chead;
-    if((chead = nchan_memstore_get_chanhead(channel_id, cf)) == NULL) {
-      ERR("can't get chanhead for id %V", channel_id);
-      //we probably just ran out of shared memory
-      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
-      return NGX_ERROR;
-    }
-    return nchan_store_chanhead_publish_message_generic(chead, msg, msg_in_shm, cf, callback, privdata);
+  
+  if((chead = nchan_memstore_get_chanhead(channel_id, cf)) == NULL) {
+    //ERR("can't get chanhead for id %V", channel_id);
+    //we probably just ran out of shared memory
+    callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+    return NGX_ERROR;
   }
+  
+  return nchan_store_chanhead_publish_message_generic(chead, msg, msg_in_shm, cf, callback, privdata);
 }
 
 ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  
-  if(is_multi_id(channel_id)) {
+  ngx_int_t   rc;
+  if(nchan_channel_id_is_multi(channel_id)) {
     ngx_int_t             i, n = 0;
     ngx_str_t             ids[NCHAN_MULTITAG_MAX];
+    ngx_int_t             trc=NGX_OK;
     publish_multi_data_t *pd;
     if((pd = ngx_alloc(sizeof(*pd), ngx_cycle->log)) == NULL) {
       ERR("can't allocate publish multi chanhead data");
@@ -2761,9 +3222,12 @@ ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t
     ngx_memzero(&pd->ch, sizeof(pd->ch));
     
     for(i=0; i<n; i++) {
-      nchan_store_publish_message_to_single_channel_id(&ids[i], msg, msg_in_shm, cf, publish_multi_callback, pd);
+      rc = nchan_store_publish_message_to_single_channel_id(&ids[i], msg, msg_in_shm, cf, publish_multi_callback, pd);
+      if(rc != NGX_OK) {
+        trc = rc;
+      }
     }
-    return NGX_OK;
+    return trc;
   }
   else {
     return nchan_store_publish_message_to_single_channel_id(channel_id, msg, msg_in_shm, cf, callback, privdata);
@@ -2786,9 +3250,7 @@ ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *
 
   assert(msg->id.tagcount == 1);
   
-  fill_message_timedata(msg, timeout);
-  
-  assert(!cf->redis.enabled);
+  assert(!cf->redis.enabled || cf->redis.storage_mode == REDIS_MODE_BACKUP);
   
   if(memstore_slot() != owner) {
     if((publish_msg = create_shm_msg(msg)) == NULL) {
@@ -2798,6 +3260,12 @@ ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *
     return memstore_ipc_send_publish_message(owner, &chead->id, publish_msg, cf, callback, privdata);
   }
   
+  if(cf->redis.enabled && cf->redis.storage_mode == REDIS_MODE_BACKUP) {
+    nchan_store_redis.publish(&chead->id, msg, cf, empty_callback, NULL);
+  }
+  
+  fill_message_timedata(msg, timeout);
+  
   chan_expire = ngx_time() + timeout;
   chead->channel.expires = chan_expire > msg->expires + 5 ? chan_expire : msg->expires + 5;
   if( chan_expire > chead->channel.expires) {
@@ -2807,6 +3275,7 @@ ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *
   
   chead->max_messages = nchan_loc_conf_max_messages(cf);
   
+  
   if(chead->latest_msgid.time > msg->id.time) {
     if(cf->redis.enabled) {
       nchan_log_error("A message from the past has just been published. At least one of your servers running Nchan using Redis does not have its time synchronized.");
@@ -2873,34 +3342,118 @@ ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *
   
   rc = nchan_memstore_publish_generic(chead, publish_msg, 0, NULL);
   
-  assert(!cf->redis.enabled);
   callback(rc, channel_copy, privdata);
 
   return rc;
 }
 
+static ngx_int_t nchan_store_get_group(ngx_str_t *name, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  if(cf->group.enable_accounting) {
+    return memstore_group_find(groups, name, cb, pd);
+  }
+  else {
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+}
+
+typedef struct {
+  callback_pt           cb;
+  void                 *pd;
+  nchan_group_limits_t  limits;
+} group_callback_data_pt;
+
+#define APPLY_GROUP_LIMIT_IF_SET(limits, group, limit_name) \
+if((limits).limit_name != -1) (group)->limit.limit_name = (limits).limit_name
+
+static ngx_int_t set_group_limits_callback(ngx_int_t rc, nchan_group_t *group, group_callback_data_pt *ppd) {
+  
+  if(group) {
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, channels);
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, subscribers);
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, messages);
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, messages_shmem_bytes);
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, messages_file_bytes);
+  }
+  
+  if(ppd->cb) {
+    ppd->cb(rc, group, ppd->pd);
+  }
+  ngx_free(ppd);
+  return NGX_OK;
+}
+
+#define INIT_GROUP_DOUBLE_CALLBACK(double_privdata, callback, privdata) \
+  if((double_privdata = ngx_alloc(sizeof(*double_privdata), ngx_cycle->log)) == NULL) { \
+    callback(NGX_ERROR, NULL, privdata);                                \
+    return NGX_ERROR;                                                   \
+  }                                                                     \
+  double_privdata->cb = callback;                                       \
+  double_privdata->pd = privdata
+
+
+static ngx_int_t nchan_store_set_group_limits(ngx_str_t *name, nchan_loc_conf_t *cf, nchan_group_limits_t *limits, callback_pt cb, void *pd) {
+  group_callback_data_pt   *ppd;
+  
+  if(!cf->group.enable_accounting) {
+    if(cb)
+      cb(NGX_ERROR, NULL, pd);
+    return NGX_OK;
+  }
+  
+  if(cb == NULL) {
+    ngx_atomic_int_t         *limit;
+    int                       limit_set = 0;
+    //do we even have any limits to set?...
+    //because if not, this whole thing can be bypassed, as there's no callback to run afterwards
+    for(limit = (ngx_atomic_int_t *)limits; limit < (ngx_atomic_int_t *)(limits + 1); limit++) {
+      if (*limit != -1) {
+        limit_set ++;
+        break;
+      }
+    }
+    if(limit_set == 0) {
+      return NGX_OK;
+    }
+  }
+  
+  INIT_GROUP_DOUBLE_CALLBACK(ppd, cb, pd);
+  ppd->limits = *limits;
+  
+  return memstore_group_find(groups, name, (callback_pt )set_group_limits_callback, ppd);
+}
+static ngx_int_t nchan_store_delete_group(ngx_str_t *name, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  
+  if(!cf->group.enable_accounting) {
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_OK;
+  }
+  
+  return memstore_group_delete(groups, name, cb, pd);
+}
+
 nchan_store_t  nchan_store_memory = {
-    //init
-    &nchan_store_init_module,
-    &nchan_store_init_worker,
-    &nchan_store_init_postconfig,
-    &nchan_store_create_main_conf,
-    
-    //shutdown
-    &nchan_store_exit_worker,
-    &nchan_store_exit_master,
-    
-    //async-friendly functions with callbacks
-    &nchan_store_async_get_message, //+callback
-    &nchan_store_subscribe, //+callback
-    &nchan_store_publish_message, //+callback
-    
-    &nchan_store_delete_channel, //+callback
-    &nchan_store_find_channel, //+callback
-    
-    //message stuff
-    NULL,
-    NULL,
+   //init
+  &nchan_store_init_module,
+  &nchan_store_init_worker,
+  &nchan_store_init_postconfig,
+  &nchan_store_create_main_conf,
+  
+  //shutdown
+  &nchan_store_exit_worker,
+  &nchan_store_exit_master,
+  
+  //async-friendly functions with callbacks
+  &nchan_store_async_get_message, //+callback
+  &nchan_store_subscribe, //+callback
+  &nchan_store_publish_message, //+callback
+  
+  &nchan_store_delete_channel, //+callback
+  &nchan_store_find_channel, //+callback
+  
+  &nchan_store_get_group, //+callback
+  &nchan_store_set_group_limits, //+callback
+  &nchan_store_delete_group, //+callback
     
 };
 
diff --git a/debian/modules/nchan/src/store/memory/store-private.h b/debian/modules/nchan/src/store/memory/store-private.h
index b8f414f..e4a426a 100644
--- a/debian/modules/nchan/src/store/memory/store-private.h
+++ b/debian/modules/nchan/src/store/memory/store-private.h
@@ -1,10 +1,20 @@
  #ifndef MEMSTORE_PRIVATE_HEADER
 #define MEMSTORE_PRIVATE_HEADER
 #include <util/shmem.h>
-//#define MESTORE_CHANHEAD_RESERVE_DEBUG 0
+#include "ipc.h"
+//#define MEMSTORE_CHANHEAD_RESERVE_DEBUG 1
+
+#define NCHAN_NOTICE_BUFFER_LOADED 0x356F
+
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+#include <util/nchan_list.h>
+#endif
 #include "uthash.h"
 typedef struct memstore_channel_head_s memstore_channel_head_t;
 typedef struct store_message_s store_message_t;
+size_t memstore_msg_memsize(nchan_msg_t *m);
+
+#include "groups.h"
 
 struct store_message_s {
   nchan_msg_t               *msg;
@@ -20,10 +30,11 @@ typedef struct {
   ngx_atomic_t                total_message_count;
   ngx_atomic_t                stored_message_count;
   ngx_atomic_t                last_seen;
+  struct {
+    ngx_atomic_t                outside_refcount;
+  }                           gc;
 } store_channel_head_shm_t;
 
-#define MSG_REFCOUNT_INVALID -9000
-
 typedef struct {
   ngx_str_t            id;
   subscriber_t        *sub;
@@ -40,13 +51,13 @@ struct memstore_channel_head_s {
   ngx_int_t                       internal_sub_count;
   time_t                          last_subscribed_local;
 
-#if MESTORE_CHANHEAD_RESERVE_DEBUG
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
   nchan_list_t                    reserved;
 #else
   uint16_t                        reserved;
 #endif
   
-  uint8_t                         multi_waiting;
+  uint8_t                         multi_subscribers_pending;
   uint8_t                         multi_count;
   memstore_multi_t               *multi;
   
@@ -64,7 +75,13 @@ struct memstore_channel_head_s {
   unsigned                        shutting_down:1;
   unsigned                        meta:1;
   
+  uint8_t                         msg_buffer_complete; //must be a byte because we need to reference it in the spooler
+  
   nchan_loc_conf_t               *cf;
+  
+  group_tree_node_t              *groupnode;
+  memstore_channel_head_t        *groupnode_prev;
+  memstore_channel_head_t        *groupnode_next;
 
   subscriber_t                   *redis_sub;
   ngx_int_t                       delta_fakesubs;
@@ -109,8 +126,9 @@ typedef struct {
   nchan_loc_conf_shared_data_t      *conf_data;
   
   nchan_stub_status_t                stats;
-  
+#if nginx_version <= 1011006
   ngx_atomic_uint_t                  shmem_pages_used;
+#endif
 
 #if NCHAN_MSG_LEAK_DEBUG
   nchan_msg_t                       *msgdebug_head;
@@ -118,22 +136,25 @@ typedef struct {
 } shm_data_t;
 
 memstore_channel_head_t *nchan_memstore_find_chanhead(ngx_str_t *channel_id);
+ngx_int_t nchan_memstore_find_chanhead_with_backup(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt cb, void *pd);
 memstore_channel_head_t *nchan_memstore_get_chanhead(ngx_str_t *channel_id, nchan_loc_conf_t *cf);
 memstore_channel_head_t *nchan_memstore_get_chanhead_no_ipc_sub(ngx_str_t *channel_id, nchan_loc_conf_t *cf);
 store_message_t *chanhead_find_next_message(memstore_channel_head_t *ch, nchan_msg_id_t *msgid, nchan_msg_status_t *status);
-shmem_t *nchan_memstore_get_shm(void);
 ipc_t *nchan_memstore_get_ipc(void);
+memstore_groups_t *nchan_memstore_get_groups(void);
 ngx_int_t nchan_memstore_handle_get_message_reply(nchan_msg_t *msg, nchan_msg_status_t findmsg_status, void *d);
 
 ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
 ngx_int_t nchan_memstore_publish_generic(memstore_channel_head_t *head, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line);
 ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *chead, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
+ngx_int_t nchan_memstore_publish_notice(memstore_channel_head_t *head, ngx_int_t notice_code, const void *notice_data);
 ngx_int_t nchan_memstore_force_delete_channel(ngx_str_t *channel_id, callback_pt callback, void *privdata);
 ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8_t ipc_subscribe_if_needed);
 ngx_int_t memstore_ready_chanhead_unless_stub(memstore_channel_head_t *head);
 void memstore_fakesub_add(memstore_channel_head_t *head, ngx_int_t n);
 ngx_int_t memstore_chanhead_messages_gc(memstore_channel_head_t *ch);
 
+
 #if FAKESHARD
 void memstore_fakeprocess_push(ngx_int_t slot);
 void memstore_fakeprocess_push_random(void);
@@ -141,10 +162,16 @@ ngx_int_t memstore_fakeprocess_pop(void);
 #endif
 
 ngx_int_t memstore_slot(void);
+ngx_int_t memstore_str_owner(ngx_str_t *str);
+
 int memstore_ready(void);
 ngx_int_t chanhead_gc_add(memstore_channel_head_t *head, const char *);
 ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *chanhead, const char *);
 
+
+void memstore_chanhead_release(memstore_channel_head_t *ch, char *label);
+void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label);
+
 uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
 
 #endif /*MEMSTORE_PRIVATE_HEADER*/
diff --git a/debian/modules/nchan/src/store/memory/store.h b/debian/modules/nchan/src/store/memory/store.h
index b4bf5d9..c1b9eef 100644
--- a/debian/modules/nchan/src/store/memory/store.h
+++ b/debian/modules/nchan/src/store/memory/store.h
@@ -3,11 +3,11 @@
 
 extern nchan_store_t  nchan_store_memory;
 
-ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl);
-ngx_int_t msg_release(nchan_msg_t *msg, char *lbl);
-
 ngx_int_t memstore_channel_owner(ngx_str_t *id);
 
+extern void  *nchan_store_memory_shmem;
+
 nchan_loc_conf_shared_data_t *memstore_get_conf_shared_data(nchan_loc_conf_t *cf);
 ngx_int_t memstore_reserve_conf_shared_data(nchan_loc_conf_t *cf);
+ngx_int_t nchan_nginx_worker_procslot(ngx_int_t worker_number);
 #endif //NCHAN_MEMSTORE_H
diff --git a/debian/modules/nchan/src/store/redis/cluster.c b/debian/modules/nchan/src/store/redis/cluster.c
deleted file mode 100644
index 9d1322d..0000000
--- a/debian/modules/nchan/src/store/redis/cluster.c
+++ /dev/null
@@ -1,1257 +0,0 @@
-#include <nchan_module.h>
-#include <assert.h>
-
-#include "redis_nginx_adapter.h"
-
-#include <util/nchan_msgid.h>
-#include <util/nchan_rbtree.h>
-#include <store/store_common.h>
-
-#include "cluster.h"
-
-//#define DBG(fmt, args...) ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "REDISTORE(CLUSTER): " fmt, ##args)
-#define DBG(args...) //
-
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDISTORE(CLUSTER): " fmt, ##args)
-
-
-#define CLUSTER_NOTREADY_RETRY_TIME 1000
-
-static rbtree_seed_t              redis_cluster_node_id_tree;
-static nchan_list_t               redis_cluster_list;
-
-typedef struct {
-  ngx_str_t      line;
-  ngx_str_t      id;         //node id
-  ngx_str_t      address;    //address as known by redis
-  ngx_str_t      flags;
-  
-  ngx_str_t      master_id;  //if slave
-  ngx_str_t      ping_sent;
-  ngx_str_t      pong_recv;
-  ngx_str_t      config_epoch;
-  ngx_str_t      link_state; //connected or disconnected
-  
-  ngx_str_t      slots;
-  
-  unsigned       connected:1;
-  unsigned       master:1;
-  unsigned       failed:1;
-  unsigned       self:1;
-} cluster_nodes_line_t;
-
-static ngx_int_t index_rdata_by_cluster_node_id(rdstore_data_t *rdata, cluster_nodes_line_t *line);
-static ngx_int_t unindex_rdata_by_cluster_node_id(rdstore_data_t *rdata);
-
-static void redis_cluster_node_drop_keyslots(rdstore_data_t *rdata);
-static void rdata_set_cluster_node_flags(rdstore_data_t *rdata, cluster_nodes_line_t *l);
-
-static ngx_int_t associate_rdata_with_cluster(rdstore_data_t *rdata, redis_cluster_t *cluster);
-static ngx_int_t dissociate_rdata_from_cluster(rdstore_data_t *rdata);
-
-static void *redis_data_rbtree_node_cluster_id(void *data) {
-  return &(*(rdstore_data_t **)data)->node.id;
-}
-void redis_cluster_init_postconfig(ngx_conf_t *cf) {
-  rbtree_init(&redis_cluster_node_id_tree, "redis cluster node (by id) data", redis_data_rbtree_node_cluster_id, NULL, NULL);
-  nchan_list_init(&redis_cluster_list, sizeof(redis_cluster_t), "clusters");
-}
-
-void redis_cluster_exit_worker(ngx_cycle_t *cycle) {
-  nchan_list_el_t  *cur;
-  redis_cluster_t  *cluster;
-  for(cur = redis_cluster_list.head; cur != NULL; cur = cur->next) {
-    cluster = nchan_list_data_from_el(cur);
-    nchan_list_empty(&cluster->nodes.master);
-    nchan_list_empty(&cluster->nodes.slave);
-    nchan_list_empty(&cluster->nodes.disconnected);
-    
-    nchan_list_empty(&cluster->retry_commands);
-    
-    rbtree_empty(&cluster->hashslots, NULL, NULL);
-    
-    cluster->status = CLUSTER_NOTREADY;
-    nchan_reaper_stop(&cluster->chanhead_reaper);
-    if(cluster->still_notready_timer.timer_set) {
-      ngx_del_timer(&cluster->still_notready_timer);
-    }
-    if(cluster->pool) {
-      ngx_destroy_pool(cluster->pool);
-    }
-  }
-  nchan_list_empty(&redis_cluster_list);
-  rbtree_empty(&redis_cluster_node_id_tree, NULL, NULL);
-}
-
-static ngx_int_t cluster_set_status(redis_cluster_t *cluster, redis_cluster_status_t status);
-
-static void redis_cluster_info_callback(redisAsyncContext *ac, void *rep, void *privdata);
-static void redis_get_cluster_nodes_callback(redisAsyncContext *ac, void *rep, void *privdata);
-static uint16_t redis_crc16(uint16_t crc, const char *buf, int len);
-
-static void redis_check_if_cluster_ready_handler(ngx_event_t *ev) {
-  rdstore_data_t   *rdata = ev->data;
-  if(rdata->status != DISCONNECTED && rdata->ctx) {
-    redis_get_cluster_info(rdata);
-  }
-  
-  ngx_free(ev);
-}
-
-static void nchan_list_rdata_init(nchan_list_t *list, char *name) {
-  nchan_list_init(list, sizeof(rdstore_data_t *), name);
-}
-
-static ngx_int_t nchan_cluster_nodes_list_rdata_remove(rdstore_data_t *rdata) {
-  if(rdata->node.in_node_list) {
-    assert(rdata->node.node_list_el_data && *rdata->node.node_list_el_data == rdata);
-    nchan_list_remove(rdata->node.in_node_list, rdata->node.node_list_el_data);
-    rdata->node.in_node_list = NULL;
-    rdata->node.node_list_el_data = NULL;
-    return NGX_OK;
-  }
-  return NGX_DECLINED;
-}
-
-#define nchan_list_rdata_from_el(cur) *(rdstore_data_t **)nchan_list_data_from_el(cur)
-
-
-void redis_get_cluster_info(rdstore_data_t *rdata) {
-  redisAsyncCommand(rdata->ctx, redis_cluster_info_callback, NULL, "CLUSTER INFO");
-}
-
-static void redis_cluster_info_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  redisReply        *reply = rep;
-  rdstore_data_t    *rdata = ac->data;
-  //uintptr_t          cluster_size = 0;
-  //u_char            *cluster_size_start, *cluster_size_end;
-  if(!redisReplyOk(ac, reply) || reply->type != REDIS_REPLY_STRING) {
-    return;
-  }
-  
-  //what's the cluster size (# of master nodes)
-  /*
-  if((cluster_size_start = ngx_strstrn((u_char *)reply->str, "cluster_size:", 12)) != 0) {
-    cluster_size_start += 13;
-    cluster_size_end = (u_char *)ngx_strchr(cluster_size_start, '\r');
-    cluster_size = ngx_atoi(cluster_size_start, cluster_size_end - cluster_size_start);
-  }
-  */
-  
-  if(ngx_strstrn((u_char *)reply->str, "cluster_state:ok", 15)) {
-    redis_get_cluster_nodes(rdata);
-  }
-  else {
-    nchan_log_warning("Redis cluster not ready, says node %V", rdata->connect_url);
-    ngx_event_t      *evt = ngx_calloc(sizeof(*evt), ngx_cycle->log);
-    nchan_init_timer(evt, redis_check_if_cluster_ready_handler, rdata);
-    //rdt_set_status(rdata, WAITING_FOR_CLUSTER_READY, ac);
-    ngx_add_timer(evt, 1000);
-  }
-}
-
-
-static void *rbtree_cluster_hashslots_id(void *data) {
-  return &((redis_cluster_keyslot_range_node_t *)data)->range;
-}
-static uint32_t rbtree_cluster_hashslots_bucketer(void *vid) {
-  return 1; //no buckets
-}
-static ngx_int_t rbtree_cluster_hashslots_compare(void *v1, void *v2) {
-  redis_cluster_slot_range_t   *r1 = v1;
-  redis_cluster_slot_range_t   *r2 = v2;
-  
-  if(r2->max < r1->min) {
-    //r2 is strictly left of r1
-    return -1;
-  }
-  else if(r2->min > r1->max) {
-    //r2 is structly right of r1
-    return 1;
-  }
-  else {
-    //there's an overlap
-    return 0;
-  }
-}
-
-
-void redis_get_cluster_nodes(rdstore_data_t *rdata) {
-  redisAsyncCommand(rdata->ctx, redis_get_cluster_nodes_callback, NULL, "CLUSTER NODES");
-}
-
-#define nchan_scan_str(str_src, cur, chr, str)\
-  (str)->data = (u_char *)memchr(cur, chr, (str_src)->len - (cur - (str_src)->data));\
-  if(!(str)->data)                            \
-    (str)->data = (str_src)->data + (str_src)->len;\
-  if((str)->data) {                           \
-    (str)->len = (str)->data - cur;           \
-    (str)->data = cur;                        \
-    cur+=(str)->len+1;                        \
-  }                                           \
-  else                                        \
-    goto fail
-
-static rdstore_data_t *find_rdata_by_node_id(ngx_str_t *id) {
-  ngx_rbtree_node_t   *rbtree_node;
-  if((rbtree_node = rbtree_find_node(&redis_cluster_node_id_tree, id)) != NULL) {
-    //do any other nodes already have the cluster set? if so, use that cluster struct.
-    return *(rdstore_data_t **)rbtree_data_from_node(rbtree_node);
-  }
-  return NULL;
-}
-
-static char *redis_scan_cluster_nodes_line(char *line, cluster_nodes_line_t *l) {
-  u_char     *cur = (u_char *)line;
-  u_char     *max = cur;
-  ngx_str_t   rest_line;
-  
-  if(cur[0]=='\0')
-    return NULL;
-  
-  nchan_scan_nearest_chr(&max, &rest_line, 2, '\n', '\0');
-  l->line = rest_line;
-  
-  nchan_scan_until_chr_on_line(&rest_line, &l->id,           ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->address,      ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->flags,        ' ');
-  
-  nchan_scan_until_chr_on_line(&rest_line, &l->master_id,    ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->ping_sent,    ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->pong_recv,    ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->config_epoch, ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->link_state,   ' ');
-  
-  if(nchan_ngx_str_substr((&l->flags), "master")) {
-    l->slots = rest_line;
-    l->master = 1;
-  }
-  else {
-    l->slots.data = NULL;
-    l->slots.len = 0;
-    l->master = 0;
-  }
-  l->failed = nchan_ngx_str_substr((&l->flags), "fail");
-  l->self = nchan_ngx_str_substr((&l->flags), "myself") ? 1 : 0;
-  
-  l->connected = l->link_state.data[0]=='c' ? 1 : 0; //[c]onnected
-  
-  cur = max;
-  if(&cur[-1] > (u_char *)line && cur[-1] == '\0')
-    cur--;
-  return (char *)cur;
-}
-
-static u_char *redis_scan_cluster_nodes_slots_string(ngx_str_t *str, u_char *cur, redis_cluster_slot_range_t *r) {
-  ngx_str_t       slot_min_str, slot_max_str, slot;
-  ngx_int_t       slot_min,     slot_max;
-  u_char         *dash;
-  
-  if(cur == NULL) {
-    cur = str->data;
-  }
-  else if(cur >= str->data + str->len) {
-    return NULL;
-  }
-  if(str->len == 0) {
-    return NULL;
-  }
-  
-  nchan_scan_str(str, cur, ' ', &slot);
-  if(slot.data[0] == '[') {
-    //transitional special slot. ignore it.
-    return redis_scan_cluster_nodes_slots_string(str, cur, r);
-  }
-  
-  dash = (u_char *)memchr(slot.data, '-', slot.len);
-  if(dash) {
-    slot_min_str.data = slot.data;
-    slot_min_str.len = dash - slot.data;
-    
-    slot_max_str.data = dash + 1;
-    slot_max_str.len = slot.len - (slot_max_str.data - slot.data);
-  }
-  else {
-    slot_min_str = slot;
-    slot_max_str = slot;
-  }
-  
-  slot_min = ngx_atoi(slot_min_str.data, slot_min_str.len);
-  slot_max = ngx_atoi(slot_max_str.data, slot_max_str.len);
-  
-  DBG("slots: %i - %i", slot_min, slot_max);
-  
-  r->min = slot_min;
-  r->max = slot_max;
-  
-  return cur;
-  
-fail:
-  return NULL;
-}
-
-static void redis_cluster_discover_and_connect_to_missing_nodes(redisReply *reply, nchan_loc_conf_t *cf, redis_cluster_t *cluster) {
-  char                  *line;
-  redis_connect_params_t rcp;
-  rdstore_data_t        *rdata;
-  cluster_nodes_line_t   l;
-  ngx_str_t             *url;
-  
-  DBG("discover new nodes");
-  line = reply->str;
-  while((line = redis_scan_cluster_nodes_line(line, &l)) != NULL) {
-    if(l.master && !l.failed) {
-      if((rdata = find_rdata_by_node_id(&l.id)) == NULL) {
-        DBG("found a new node %V %V", &l.id, &l.address);
-        url = ngx_palloc(ngx_cycle->pool, sizeof(*url) + l.address.len + 1); //TODO: pallocate from a more fitting pool
-        url->data = (u_char *)&url[1];
-        nchan_strcpy(url, &l.address, 0);
-        url->data[url->len] = '\0';
-        parse_redis_url(url, &rcp);
-        rdata = redis_create_rdata(url, &rcp, &cf->redis, cf);
-        index_rdata_by_cluster_node_id(rdata, &l);
-      }
-      assert(rdata);
-      
-      if(rdata->node.cluster && rdata->node.cluster != cluster) {
-        dissociate_rdata_from_cluster(rdata);
-      }
-      
-      if(!nchan_ngx_str_match(&rdata->node.slots, &l.slots)) {
-        if(rdata->node.cluster) {
-          redis_cluster_node_drop_keyslots(rdata);
-        }
-        
-        unindex_rdata_by_cluster_node_id(rdata);
-        index_rdata_by_cluster_node_id(rdata, &l);
-      }
-      
-      rdata_set_cluster_node_flags(rdata, &l);
-      
-      associate_rdata_with_cluster(rdata, cluster);
-      
-      if(!rdata->node.failed && rdata->status != CONNECTED) {
-        cluster->node_connections_pending++;
-        redis_ensure_connected(rdata);
-      }
-    }
-    else if(!l.master && !l.failed && (rdata = find_rdata_by_node_id(&l.id)) != NULL) {
-      if(rdata->node.master) {
-        //master got downgraded to slave
-        rdata_set_cluster_node_flags(rdata, &l);
-      }
-    }
-  }
-}
-
-static rdstore_data_t *get_any_connected_cluster_node(redis_cluster_t *cluster) {
-  rdstore_data_t     *rdata;
-  nchan_list_el_t    *cur;
-  nchan_list_el_t   *node_head[] = {cluster->nodes.master.head, cluster->nodes.slave.head};
-  int                 i;
-  
-  for(i = 0; i < 2; i++) {
-    for(cur = node_head[i]; cur != NULL; cur = cur->next) {
-      rdata = nchan_list_rdata_from_el(cur);
-      if(rdata->status == CONNECTED) {
-        return rdata;
-      }
-    }
-  }
-  
-  return NULL;
-}
-
-static void cluster_not_ready_timer_handler(ngx_event_t *ev) {
-  redis_cluster_t               *cluster = ev->data;
-  rdstore_data_t                *rdata;
-  
-  if(ngx_exiting || ngx_quit) {
-    return;
-  }
-  
-  if(ev->timedout) {
-    ev->timedout=0;
-    if((rdata = get_any_connected_cluster_node(cluster)) != NULL) {
-      cluster->node_connections_pending = 0; //enough waiting. assume no more pending connections
-      redis_get_cluster_nodes(rdata);
-    }
-    else {
-      nchan_log_warning("No connected Redis cluster nodes. Wait until a connection can be established to at least one...");
-    }
-  }
-  
-  ngx_add_timer(ev, CLUSTER_NOTREADY_RETRY_TIME);
-}
-
-static ngx_int_t index_rdata_by_cluster_node_id(rdstore_data_t *rdata, cluster_nodes_line_t *line) {
-  struct {
-    rdstore_data_t   *rdata;
-    u_char            chr;
-  } *rdata_ptr_and_buf;
-  
-  ngx_rbtree_node_t      *rbtree_node;
-  
-  if(rdata->node.indexed)
-    return NGX_OK;
-  
-  if((rbtree_node = rbtree_create_node(&redis_cluster_node_id_tree, sizeof(*rdata) + line->id.len + line->address.len + line->slots.len)) == NULL) {
-    ERR("can't create rbtree node for redis connection");
-    return NGX_ERROR;
-  }
-  
-  rdata_ptr_and_buf = rbtree_data_from_node(rbtree_node);
-  rdata_ptr_and_buf->rdata = rdata;
-  
-  rdata->node.id.data = &rdata_ptr_and_buf->chr;
-  nchan_strcpy(&rdata->node.id, &line->id, 0);
-  
-  rdata->node.address.data = &rdata_ptr_and_buf->chr + line->id.len;
-  nchan_strcpy(&rdata->node.address, &line->address, 0);
-  
-  rdata->node.slots.data = &rdata_ptr_and_buf->chr + line->id.len + line->address.len;
-  nchan_strcpy(&rdata->node.slots, &line->slots, 0);
-  
-  if(rbtree_insert_node(&redis_cluster_node_id_tree, rbtree_node) != NGX_OK) {
-    ERR("couldn't insert redis cluster node ");
-    rbtree_destroy_node(&redis_cluster_node_id_tree, rbtree_node);
-    return NGX_ERROR;
-  }
-  
-  rdata->node.indexed = 1;
-  
-  return NGX_OK;
-}
-
-static ngx_int_t unindex_rdata_by_cluster_node_id(rdstore_data_t *rdata) {
-  ngx_rbtree_node_t    *node = rbtree_find_node(&redis_cluster_node_id_tree, &rdata->node.id);
-  if(node) {
-    rbtree_remove_node(&redis_cluster_node_id_tree, node);
-    rbtree_destroy_node(&redis_cluster_node_id_tree, node);
-    ngx_memzero(&rdata->node.id, sizeof(rdata->node.id));
-    ngx_memzero(&rdata->node.address, sizeof(rdata->node.address));
-    ngx_memzero(&rdata->node.slots, sizeof(rdata->node.slots));
-    rdata->node.indexed = 0;
-  }
-  return NGX_OK;
-}
-
-
-#define script_nonlocal_key_error "Lua script attempted to access a non local key in a cluster node"
-
-int clusterKeySlotOk(redisAsyncContext *c, void *r) {
-  redisReply *reply = (redisReply *)r;
-  if(reply && reply->type == REDIS_REPLY_ERROR) {
-    char    *script_error_start = "ERR Error running script";
-    char    *command_move_error = "MOVED ";
-    char    *command_ask_error = "ASK ";
-    
-    if((nchan_cstr_startswith(reply->str, script_error_start) && nchan_strstrn(reply->str, script_nonlocal_key_error))
-     || nchan_cstr_startswith(reply->str, command_move_error)
-     || nchan_cstr_startswith(reply->str, command_ask_error)) {
-      rdstore_data_t  *rdata = c->data;
-      
-      rbtree_empty(&rdata->node.cluster->hashslots, NULL, NULL);
-      cluster_set_status(rdata->node.cluster, CLUSTER_NOTREADY);
-      
-      return 0;
-    }
-    else
-      return 1;
-  }
-  return 1;
-}
-
-void *cluster_retry_palloc(redis_cluster_t *cluster, size_t sz) {
-  return ngx_palloc(nchan_list_get_pool(&cluster->retry_commands), sz);
-}
-void  cluster_retry_pfree(redis_cluster_t *cluster, void *ptr) {
-  ngx_pfree(cluster->retry_commands.pool, ptr);
-}
-
-static redis_cluster_retry_t *cluster_create_retry_command(redis_cluster_t *cluster, void (*handler)(rdstore_data_t *, void *), void *pd) {
-  redis_cluster_retry_t *retry;
-  if((retry = nchan_list_append(&cluster->retry_commands)) == NULL)
-    return NULL;
-  retry->retry = handler;
-  retry->data = pd;
-  return retry;
-}
-
-ngx_int_t cluster_add_retry_command_with_chanhead(rdstore_channel_head_t *chanhead, void (*handler)(rdstore_data_t *, void *), void *pd) {
-  redis_cluster_retry_t         *retry;
-  if((retry = cluster_create_retry_command(chanhead->rdt->node.cluster, handler, pd)) == NULL)
-    return NGX_ERROR;
-  
-  retry->type = CLUSTER_RETRY_BY_CHANHEAD;
-  retry->chanhead = chanhead;
-  chanhead->reserved++;
-  
-  return NGX_OK;
-}
-
-ngx_int_t cluster_add_retry_command_with_key(redis_cluster_t *cluster, ngx_str_t *key, void (*handler)(rdstore_data_t *, void *pd), void *pd) {
-  redis_cluster_retry_t         *retry;
-  if((retry = cluster_create_retry_command(cluster, handler, pd)) == NULL)
-    return NGX_ERROR;
-  
-  retry->type = CLUSTER_RETRY_BY_KEY;
-  retry->str.data = cluster_retry_palloc(cluster, key->len);
-  nchan_strcpy(&retry->str, key, 0);
-  
-  return NGX_OK;
-}
-
-ngx_int_t cluster_add_retry_command_with_channel_id(redis_cluster_t *cluster, ngx_str_t *chid, void (*handler)(rdstore_data_t *, void *pd), void *pd) {
-  redis_cluster_retry_t         *retry;
-  if((retry = cluster_create_retry_command(cluster, handler, pd)) == NULL)
-    return NGX_ERROR;
-  
-  retry->type = CLUSTER_RETRY_BY_CHANNEL_ID;
-  retry->str.data = cluster_retry_palloc(cluster, chid->len);
-  nchan_strcpy(&retry->str, chid, 0);
-  
-  return NGX_OK;
-}
-
-ngx_int_t cluster_add_retry_command_with_cstr(redis_cluster_t *cluster, u_char *cstr, void (*handler)(rdstore_data_t *, void *pd), void *pd) {
-  redis_cluster_retry_t         *retry;
-  size_t                         str_sz = strlen((char *)cstr);
-  
-  if((retry = cluster_create_retry_command(cluster, handler, pd)) == NULL)
-    return NGX_ERROR;
-  
-  retry->type = CLUSTER_RETRY_BY_CSTR;
-  retry->cstr = cluster_retry_palloc(cluster, str_sz + 1);
-  strcpy((char *)retry->cstr, (char *)cstr);
-  
-  return NGX_OK;
-}
-
-static void retry_commands_traverse_callback(void *data, void *pd) {
-  redis_cluster_t         *cluster = pd;
-  redis_cluster_retry_t   *retry = data;
-  rdstore_data_t          *rdata = NULL;
-  rdstore_data_t          *any_rdata = get_any_connected_cluster_node(cluster);
-  switch(retry->type) {
-    case CLUSTER_RETRY_BY_CHANHEAD:
-      retry->chanhead->reserved--;
-      rdata = redis_cluster_rdata_from_channel(retry->chanhead);
-      break;
-    
-    case CLUSTER_RETRY_BY_CHANNEL_ID:
-      rdata = redis_cluster_rdata_from_channel_id(any_rdata, &retry->str);
-      break;
-      
-    case CLUSTER_RETRY_BY_KEY:
-      rdata = redis_cluster_rdata_from_key(any_rdata, &retry->str);
-      break;
-      
-    case CLUSTER_RETRY_BY_CSTR:
-      rdata = redis_cluster_rdata_from_cstr(any_rdata, retry->cstr);
-      break;
-    
-  }
-  retry->retry(rdata, retry->data);
-}
-
-static ngx_int_t cluster_run_retry_commands(redis_cluster_t *cluster) {
-  assert(cluster->status = CLUSTER_READY);
-  nchan_list_traverse_and_empty(&cluster->retry_commands, retry_commands_traverse_callback, cluster);
-  return NGX_OK;
-}
-
-static void retry_commands_traverse_abort_callback(void *data, void *pd) {
-  redis_cluster_retry_t   *retry = data;
-  if(retry->type == CLUSTER_RETRY_BY_CHANHEAD) {
-    retry->chanhead->reserved--;
-  }
-  retry->retry(NULL, retry->data);
-}
-
-static ngx_int_t cluster_abort_retry_commands(redis_cluster_t *cluster) {
-  nchan_list_traverse_and_empty(&cluster->retry_commands, retry_commands_traverse_abort_callback, cluster);
-  return NGX_OK;
-}
-
-
-static redis_cluster_t *create_cluster_data(rdstore_data_t *node_rdata, int num_master_nodes, uint32_t homebrew_cluster_id, int configured_unverified_nodes) {
-  redis_cluster_t               *cluster = NULL;
-  size_t                         reaper_name_len = strlen("redis channel (cluster orphans) ()   ") + 60; //whatever
-  char                          *reaper_name;
-  
-  if((cluster = nchan_list_append_sized(&redis_cluster_list, sizeof(*cluster) + reaper_name_len )) == NULL) { //TODO: don't allocate from heap, use a pool or something
-    ERR("can't allocate cluster data");
-    return NULL;
-  }
-  ngx_memzero(cluster, sizeof(*cluster));
-  
-  rbtree_init(&cluster->hashslots, "redis cluster node (by id) data", rbtree_cluster_hashslots_id, rbtree_cluster_hashslots_bucketer, rbtree_cluster_hashslots_compare);
-  
-  cluster->size = num_master_nodes;
-  cluster->uscf = node_rdata->lcf->redis.upstream;
-  cluster->pool = NULL;
-  cluster->homebrew_id = homebrew_cluster_id;
-  nchan_list_rdata_init(&cluster->nodes.master, "connected master nodes");
-  nchan_list_rdata_init(&cluster->nodes.slave, "connected slave nodes");
-  nchan_list_rdata_init(&cluster->nodes.disconnected, "disconnected nodes");
-  //nchan_list_rdata_init(&cluster->failed_nodes, "failed nodes");
-  
-  nchan_list_pool_init(&cluster->retry_commands, sizeof(redis_cluster_retry_t), NGX_DEFAULT_POOL_SIZE, "retry commands");
-  
-  nchan_init_timer(&cluster->still_notready_timer, cluster_not_ready_timer_handler, cluster);
-  ngx_add_timer(&cluster->still_notready_timer, CLUSTER_NOTREADY_RETRY_TIME);
-  
-  cluster->node_connections_pending = configured_unverified_nodes;
-  
-  reaper_name = (char *)&cluster[1];
-  ngx_sprintf((u_char *)reaper_name, "redis channel (cluster orphans) (%p hid=%i)%Z", cluster, cluster->homebrew_id);
-  
-  rdstore_initialize_chanhead_reaper(&cluster->chanhead_reaper, reaper_name);
-  return cluster;
-}
-/*
-static void print_cluster_slots(redis_cluster_t *cluster) {
-  ngx_rbtree_node_t                   *node;
-  redis_cluster_slot_range_t           range = {0, 0};
-  redis_cluster_keyslot_range_node_t  *keyslot_tree_node;
-  
-  while(range.min <= 16383) {
-    if((node = rbtree_find_node(&cluster->hashslots, &range)) == NULL) {
-      DBG("cluster slots range incomplete: can't find slot %i", range.min);
-      return;
-    }
-    keyslot_tree_node = rbtree_data_from_node(node);
-    
-    if(keyslot_tree_node->rdata->status != CONNECTED) {
-      DBG("cluster node for range %i - %i not connected", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
-      return;
-    }
-    
-    DBG("%p %V : range %i - %i", keyslot_tree_node->rdata, keyslot_tree_node->rdata->connect_url, keyslot_tree_node->range.min, keyslot_tree_node->range.max);
-    range.min = keyslot_tree_node->range.max + 1;
-    range.max = range.min;
-  }
-  DBG("cluster range complete");
-}
-*/
-static int check_cluster_slots_range_ok(redis_cluster_t *cluster) {
-  ngx_rbtree_node_t                   *node;
-  redis_cluster_slot_range_t           range = {0, 0};
-  redis_cluster_keyslot_range_node_t  *keyslot_tree_node;
-  
-  while(range.min <= 16383) {
-    if((node = rbtree_find_node(&cluster->hashslots, &range)) == NULL) {
-      DBG("cluster slots range incomplete: can't find slot %i", range.min);
-      return 0;
-    }
-    keyslot_tree_node = rbtree_data_from_node(node);
-    
-    if(keyslot_tree_node->rdata->status != CONNECTED) {
-      DBG("cluster node for range %i - %i not connected", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
-      return 0;
-    }
-    
-    range.min = keyslot_tree_node->range.max + 1;
-    range.max = range.min;
-  }
-  DBG("cluster range complete");
-  //print_cluster_slots(cluster);
-  return 1;
-}
-
-static rdstore_data_t  **nchan_list_rdata_append(nchan_list_t *list, rdstore_data_t *rdata) {
-  rdstore_data_t   **ptr_rdata;
-  assert(rdata);
-  ptr_rdata = nchan_list_append(list);
-  *ptr_rdata = rdata;
-  return ptr_rdata;
-}
-
-static ngx_int_t update_rdata_cluster_node_lists(rdstore_data_t *rdata) {
-  nchan_list_t      *list;
-  rdstore_data_t   **ptr_rdata;
-  redis_cluster_t   *cluster = rdata->node.cluster;
-  
-  if(!cluster) {
-    nchan_cluster_nodes_list_rdata_remove(rdata);
-    return NGX_DECLINED;
-  }
-  
-  if(rdata->status != CONNECTED)
-    list = &cluster->nodes.disconnected;
-  else if(rdata->node.master)
-    list = &cluster->nodes.master;
-  else
-    list = &cluster->nodes.slave;
-  
-  if(rdata->node.in_node_list != list) {
-    nchan_cluster_nodes_list_rdata_remove(rdata);
-    
-    assert(rdata->node.in_node_list == NULL);
-    assert(rdata->node.node_list_el_data == NULL);
-    
-    ptr_rdata = nchan_list_rdata_append(list, rdata);
-    
-    rdata->node.in_node_list = list;
-    rdata->node.node_list_el_data = ptr_rdata;
-  }
-  return NGX_OK;
-}
-
-
-static ngx_int_t associate_rdata_with_cluster(rdstore_data_t *rdata, redis_cluster_t *cluster) {
-  u_char                              *cur;
-  redis_cluster_slot_range_t           range;
-  ngx_rbtree_node_t                   *rbtree_node;
-  redis_cluster_keyslot_range_node_t  *keyslot_tree_node;
-  
-  if(!rdata->node.cluster) {
-    rdata->node.cluster = cluster;
-  }
-  
-  update_rdata_cluster_node_lists(rdata);
-  
-  if(rdata->node.master) {
-    //hash slots
-    cur = NULL;
-    while((cur = redis_scan_cluster_nodes_slots_string(&rdata->node.slots, cur, &range)) != NULL) {
-      
-      rbtree_node = rbtree_find_node(&cluster->hashslots, &range);
-      if(rbtree_node) {
-        keyslot_tree_node = rbtree_data_from_node(rbtree_node);
-        if(keyslot_tree_node->rdata == rdata && keyslot_tree_node->range.min == range.min && keyslot_tree_node->range.max == range.max) {
-          DBG("cluster node keyslot range already exists. no problem here.");
-        }
-        else {
-          DBG("this slot range is a little different. get rid of the old one");
-          rbtree_remove_node(&cluster->hashslots, rbtree_node);
-          rbtree_destroy_node(&cluster->hashslots, rbtree_node);
-          rbtree_node = NULL;
-        }
-      }
-      
-      if(rbtree_node == NULL) {
-        rbtree_node = rbtree_create_node(&cluster->hashslots, sizeof(*keyslot_tree_node));
-        keyslot_tree_node = rbtree_data_from_node(rbtree_node);
-        keyslot_tree_node->range = range;
-        keyslot_tree_node->rdata = rdata;
-        
-        if(rbtree_insert_node(&cluster->hashslots, rbtree_node) != NGX_OK) {
-          ERR("couldn't insert redis cluster hashslots node ");
-          rbtree_destroy_node(&cluster->hashslots, rbtree_node);
-          assert(0);
-        }
-      }
-    }
-  }
-  
-  if(check_cluster_slots_range_ok(cluster)) {
-    cluster_set_status(cluster, CLUSTER_READY);
-  }
-  return NGX_OK;
-}
-
-static void rdata_set_cluster_node_flags(rdstore_data_t *rdata, cluster_nodes_line_t *l) {
-  if(l->failed != rdata->node.failed) {
-    rdata->node.failed = l->failed;
-  }
-  
-  if(l->master != rdata->node.master) {
-    if(rdata->node.cluster && rdata->node.master)
-      redis_cluster_node_drop_keyslots(rdata);
-    
-    rdata->node.master = l->master;
-  }
-  
-  update_rdata_cluster_node_lists(rdata);
-}
-
-static void redis_get_cluster_nodes_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  redisReply                    *reply = rep;
-  rdstore_data_t                *rdata = ac->data;
-  rdstore_data_t                *found_rdata = NULL, *unassoc_rdata, *my_rdata = NULL; //cluster tree node
-  redis_cluster_t               *cluster = NULL;
-  ngx_uint_t                     num_master_nodes = 0;
-  uint32_t                       homebrew_cluster_id = 0;
-  int                            configured_unverified_nodes = 0;
-  
-  nchan_list_t                   unassociated_nodes;
-  nchan_list_el_t               *cur;
-  nchan_list_rdata_init(&unassociated_nodes, "unassociated nodes");
-  
-  
-  nchan_loc_conf_t              *cf = rdata->lcf;
-  
-  DBG("redis_get_cluster_nodes_callback for %p", rdata);
-  
-  if(cf->redis.upstream) {
-    configured_unverified_nodes = cf->redis.upstream->servers->nelts;
-  }
-  else {
-    assert(0);
-  }
-  
-  if(!redisReplyOk(ac, reply) || reply->type != REDIS_REPLY_STRING) {
-    return;
-  }
-  
-  char                 *line;
-  cluster_nodes_line_t  l;
-  
-  line = reply->str;
-  DBG("\n%s", reply->str);
-  while((line = redis_scan_cluster_nodes_line(line, &l)) != NULL) {
-    found_rdata = NULL;
-    
-    if(l.master && !l.failed) {
-      num_master_nodes++;
-      homebrew_cluster_id += redis_crc16(0, (const char*)l.id.data, l.id.len);
-    }
-      
-    if((found_rdata = find_rdata_by_node_id(&l.id)) == NULL) {
-      redis_connect_params_t rcp;
-      parse_redis_url(&l.address, &rcp);
-      found_rdata = find_rdata_by_connect_params(&rcp);
-    }
-    
-    if(found_rdata) {
-      rdata_set_cluster_node_flags(found_rdata, &l);
-      index_rdata_by_cluster_node_id(found_rdata, &l);
-      if(found_rdata->node.cluster) {
-        if(cluster)
-          assert(cluster == found_rdata->node.cluster);
-        else
-          cluster = found_rdata->node.cluster;
-      }
-      else {
-        nchan_list_rdata_append(&unassociated_nodes, found_rdata);
-      }
-      if(cluster)
-        associate_rdata_with_cluster(found_rdata, cluster);
-    }
-    
-    if(l.self) {
-      //myself
-      rdata_set_cluster_node_flags(rdata, &l);
-      index_rdata_by_cluster_node_id(rdata, &l);
-      if(found_rdata) {
-        assert(found_rdata == rdata);
-        DBG("%p %V %V already added to redis_cluster_node_id_tree... weird... how?...", rdata, &rdata->node.id, &rdata->node.id);
-      }
-      
-      my_rdata = rdata;
-    }
-  }
-  
-  if(my_rdata) {
-    if(!cluster) {
-      cluster = create_cluster_data(my_rdata, num_master_nodes, homebrew_cluster_id, configured_unverified_nodes);
-    }
-    if(cluster->homebrew_id != homebrew_cluster_id && cluster->status != CLUSTER_READY) {
-      DBG("Cluster homebrew_id changed maybe");
-      cluster->homebrew_id = homebrew_cluster_id;
-    }
-    
-    associate_rdata_with_cluster(my_rdata, cluster);
-    
-    if(cluster->node_connections_pending > 0) {
-      cluster->node_connections_pending --;
-    }
-    if(cluster->node_connections_pending == 0 && cluster->nodes.master.n < cluster->size) {
-      redis_cluster_discover_and_connect_to_missing_nodes(reply, cf, cluster);
-    }
-    
-  }
-  else {
-    DBG("my_rdata was blank... eh?...");
-  }
-  
-  if(cluster) {
-    for(cur = unassociated_nodes.head; cur != NULL; cur = cur->next) {
-      unassoc_rdata = nchan_list_rdata_from_el(cur);
-      associate_rdata_with_cluster(unassoc_rdata, cluster);
-    }
-  }
-  nchan_list_empty(&unassociated_nodes);
-  
-}
-
-static ngx_int_t cluster_set_status(redis_cluster_t *cluster, redis_cluster_status_t status) {
-  redis_cluster_status_t     prev_status = cluster->status;
-  rdstore_channel_head_t    *ch_cur;
-  
-  
-  if(status == CLUSTER_READY && prev_status != CLUSTER_READY) {
-    assert(check_cluster_slots_range_ok(cluster));
-    while((ch_cur = cluster->orphan_channels_head) != NULL) {
-      redis_chanhead_gc_withdraw(ch_cur);
-      
-      ensure_chanhead_pubsub_subscribed(ch_cur);
-      
-      cluster->orphan_channels_head = ch_cur->rd_next;
-      if(cluster->orphan_channels_head) {
-        cluster->orphan_channels_head->rd_prev = NULL;
-      }
-      
-      ch_cur->rd_prev = NULL;
-      ch_cur->rd_next = NULL;
-      assert(redis_cluster_associate_chanhead_with_rdata(ch_cur) == NGX_OK);
-      redis_chanhead_catch_up_after_reconnect(ch_cur);
-    }
-    
-    //stop any still running rdata reconnect timers
-    rdstore_data_t    *rcur;
-    nchan_list_el_t   *cur;
-    nchan_list_t     **list;
-    nchan_list_t      *lists[] = {&cluster->nodes.master, &cluster->nodes.slave, &cluster->nodes.disconnected, NULL};
-    for(list = lists; *list != NULL; list++) {
-      for(cur = (*list)->head; cur != NULL; cur = cur->next) {
-        rcur = nchan_list_rdata_from_el(cur);
-        if(rcur->reconnect_timer.timer_set) {
-          ngx_del_timer(&rcur->reconnect_timer);
-        }
-      }
-    }
-    
-    if(cluster->still_notready_timer.timer_set) {
-      ngx_del_timer(&cluster->still_notready_timer);
-    }
-    
-    cluster_run_retry_commands(cluster);
-    
-    nchan_log_notice("Redis cluster ready.");
-    
-  }
-  else if(status != CLUSTER_READY && prev_status == CLUSTER_READY) {
-    for(ch_cur = cluster->orphan_channels_head; ch_cur != NULL; ch_cur = ch_cur->rd_next) {
-      if(ch_cur->in_gc_reaper) {
-        redis_chanhead_gc_withdraw(ch_cur);
-        redis_chanhead_gc_add_to_reaper(&cluster->chanhead_reaper, ch_cur, NCHAN_CHANHEAD_CLUSTER_ORPHAN_EXPIRE_SEC, "redis connection to cluster node gone"); //automatically added to cluster's gc
-      }
-    }
-    
-    if(!cluster->still_notready_timer.timer_set) {
-      ngx_add_timer(&cluster->still_notready_timer, CLUSTER_NOTREADY_RETRY_TIME);
-    }
-    
-  }
-  
-  else if(status == CLUSTER_FAILED && prev_status != CLUSTER_FAILED) {
-    cluster_abort_retry_commands(cluster);
-  }
-  
-  cluster->status = status;
-  
-  return NGX_OK;
-}
-
-static ngx_int_t rdata_make_chanheads_cluster_orphans(rdstore_data_t *rdata) {
-  redis_cluster_t            *cluster = rdata->node.cluster;
-  if(rdata->channels_head) {
-    rdstore_channel_head_t  *cur, *last = NULL;
-    for(cur = rdata->channels_head; cur != NULL; cur = cur->rd_next){
-      last = cur;
-      redis_chanhead_gc_withdraw(cur);
-      cur->status = NOTREADY;
-      cur->pubsub_status = UNSUBBED;
-      cur->cluster.node_rdt = NULL;
-    }
-    if(last) {
-      last->rd_next = cluster->orphan_channels_head;
-      if(cluster->orphan_channels_head)
-        cluster->orphan_channels_head->rd_prev = last;
-      cluster->orphan_channels_head = last;
-    }
-    rdata->channels_head = NULL;
-  }
-  return NGX_OK;
-}
-
-ngx_int_t redis_cluster_node_change_status(rdstore_data_t *rdata, redis_connection_status_t status) {
-  redis_connection_status_t   prev_status = rdata->status;
-  redis_cluster_t            *cluster = rdata->node.cluster;
-  
-  if(status == CONNECTED && prev_status != CONNECTED) {
-    cluster->nodes_connected++;
-  }
-  else if(status != CONNECTED && prev_status == CONNECTED) {
-    
-    cluster->nodes_connected--;
-    //add to orphan chanheads list
-    
-    //wait to reconnect maybe?
-    rdata_make_chanheads_cluster_orphans(rdata);
-    
-    cluster_set_status(cluster, CLUSTER_NOTREADY);
-  }
-
-  return NGX_OK; 
-}
-
-typedef struct {
-  rdstore_data_t      *rdata;
-  ngx_rbtree_node_t   *found;
-} rdata_node_finder_data_t;
-
-rbtree_walk_direction_t rdata_node_finder(rbtree_seed_t *seed, void *data, void *privdata) {
-  redis_cluster_keyslot_range_node_t *d = data;
-  rdata_node_finder_data_t           *pd = privdata;
-  
-  if(d->rdata == pd->rdata) {
-    pd->found = rbtree_node_from_data(d);
-    return RBTREE_WALK_STOP;
-  }
-  else {
-    return RBTREE_WALK_LEFT_RIGHT;
-  }
-}
-
-static void redis_cluster_node_drop_keyslots(rdstore_data_t *rdata) {
-  rdata_node_finder_data_t   finder_data;
-  redis_cluster_t           *cluster = rdata->node.cluster;
-  
-  //remove from hashslots. this is a little tricky, we walk the hashslots tree 
-  // until we can's find this rdata
-  
-  finder_data.rdata = rdata;
-  while(1) {
-    finder_data.found = NULL;
-    rbtree_conditional_walk(&cluster->hashslots, rdata_node_finder, &finder_data);
-    if(finder_data.found != NULL) {
-      DBG("destroyed node %p", finder_data.found);
-      rbtree_remove_node(&cluster->hashslots, finder_data.found);
-      rbtree_destroy_node(&cluster->hashslots, finder_data.found);
-    }
-    else {
-      break;
-    }
-  }
-  
-  rdata_make_chanheads_cluster_orphans(rdata);
-}
-
-
-static ngx_int_t dissociate_rdata_from_cluster(rdstore_data_t *rdata) {
-  assert(rdata->node.cluster != NULL);
-  if((rdata->node.failed || !rdata->node.master) && rdata->reconnect_timer.timer_set) {
-    ngx_del_timer(&rdata->reconnect_timer);
-  }
-  
-  rdata_make_chanheads_cluster_orphans(rdata);
-  
-  redis_cluster_node_drop_keyslots(rdata);
-  
-  rdata->node.cluster = NULL;
-  update_rdata_cluster_node_lists(rdata);
-  return NGX_OK;
-}
-
-
-
-static uint16_t redis_crc16(uint16_t crc, const char *buf, int len);
-static rdstore_data_t *redis_cluster_rdata_from_keyslot(rdstore_data_t *rdata, uint16_t slot);
-
-
-ngx_int_t redis_cluster_associate_chanhead_with_rdata(rdstore_channel_head_t *ch) {
-  if(redis_cluster_rdata_from_channel(ch)) {
-    return NGX_OK;
-  }
-  else {
-    return NGX_ERROR;
-  }
-}
-
-rdstore_data_t *redis_cluster_rdata_from_channel(rdstore_channel_head_t *ch) {
-  rdstore_data_t  *rdata;
-  if(!ch->cluster.enabled) {
-    return ch->rdt;
-  }
-  
-  if(ch->cluster.node_rdt) {
-    return ch->cluster.node_rdt;
-  }
-  
-  rdata = redis_cluster_rdata_from_channel_id(ch->rdt, &ch->id);
-  
-  assert(ch->rd_prev == NULL);
-  assert(ch->rd_next == NULL);
-  
-  if(rdata) {
-    redis_associate_chanhead_with_rdata(ch, rdata);
-  }
-  else {
-    redis_cluster_t   *cluster = ch->rdt->node.cluster;
-    ch->rd_prev = NULL;
-    
-    if(cluster->orphan_channels_head) {
-      cluster->orphan_channels_head = ch;
-    }
-    cluster->orphan_channels_head = ch;
-  }
-  
-  ch->cluster.node_rdt = rdata;
-  return rdata;
-  
-}
-
-rdstore_data_t *redis_cluster_rdata_from_channel_id(rdstore_data_t *rdata, ngx_str_t *str){
-  if(!rdata->node.cluster)
-    return rdata;
-  
-  static uint16_t  prefix_crc = 0;
-  if(prefix_crc == 0) {
-    prefix_crc = redis_crc16(0, "channel:", 8);
-  }
-  uint16_t   slot = redis_crc16(prefix_crc, (const char *)str->data, str->len) % 16384;
-  //DBG("channel id %V (key {channel:%V}) slot %i", str, str, slot);
-  
-  return redis_cluster_rdata_from_keyslot(rdata, slot);
-}
-
-rdstore_data_t *redis_cluster_rdata_from_key(rdstore_data_t *rdata, ngx_str_t *key) {
-  char        *start, *end;
-  ngx_str_t    hashable;
-  
-  if(((start = memchr(key->data, '{', key->len))) != NULL) {
-    start++;
-    end = memchr(start, '}', key->len - ((u_char *)start - key->data));
-    if(end && end - start > 1) {
-      hashable.data = (u_char *)start;
-      hashable.len = (end - start);
-    }
-    else {
-      hashable = *key;
-      // not quite right -- need to ignore zero-length {} and scan to the next {
-      // but it's good enough for the keys we're using
-    }
-    return redis_cluster_rdata(rdata, &hashable);
-  }
-  return redis_cluster_rdata(rdata, key);
-}
-
-rdstore_data_t *redis_cluster_rdata(rdstore_data_t *rdata, ngx_str_t *str) {
-  if(!rdata->node.cluster)
-    return rdata;
-  
-  uint16_t   slot = redis_crc16(0, (const char *)str->data, str->len) % 16384;
-  DBG("str %V slot %i", str, slot);
-  
-  return redis_cluster_rdata_from_keyslot(rdata, slot);
-}
-
-rdstore_data_t *redis_cluster_rdata_from_cstr(rdstore_data_t *rdata, u_char *str) {
-  if(!rdata->node.cluster)
-    return rdata;
-  
-  uint16_t   slot = redis_crc16(0, (const char *)str, strlen((char *)str)) % 16384;
-  DBG("cstr %s slot %i", str, slot);
-  
-  return redis_cluster_rdata_from_keyslot(rdata, slot);
-}
-
-static rdstore_data_t *redis_cluster_rdata_from_keyslot(rdstore_data_t *rdata, uint16_t slot) {
-  
-
-  redis_cluster_slot_range_t           range = {slot, slot};
-  ngx_rbtree_node_t                   *rbtree_node;
-  redis_cluster_keyslot_range_node_t  *keyslot_tree_node;
-  
-  if((rbtree_node = rbtree_find_node(&rdata->node.cluster->hashslots, &range)) == NULL) {
-    DBG("hashslot not found. what do?!");
-    return NULL;
-  }
-  
-  keyslot_tree_node = rbtree_data_from_node(rbtree_node);
-  assert(keyslot_tree_node->range.min <= slot && keyslot_tree_node->range.max >= slot);
-  return keyslot_tree_node->rdata;
-}
-
-
-
-
-
-/*
- * Copyright 2001-2010 Georges Menie (www.menie.org)
- * Copyright 2010 Salvatore Sanfilippo (adapted to Redis coding style)
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the University of California, Berkeley nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* CRC16 implementation according to CCITT standards.
- *
- * Note by @antirez: this is actually the XMODEM CRC 16 algorithm, using the
- * following parameters:
- *
- * Name                       : "XMODEM", also known as "ZMODEM", "CRC-16/ACORN"
- * Width                      : 16 bit
- * Poly                       : 1021 (That is actually x^16 + x^12 + x^5 + 1)
- * Initialization             : 0000
- * Reflect Input byte         : False
- * Reflect Output CRC         : False
- * Xor constant to output CRC : 0000
- * Output for "123456789"     : 31C3
- */
-
-static const uint16_t crc16tab[256]= {
-    0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
-    0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
-    0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
-    0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
-    0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
-    0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
-    0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
-    0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
-    0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
-    0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
-    0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
-    0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
-    0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
-    0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
-    0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
-    0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
-    0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
-    0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
-    0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
-    0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
-    0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
-    0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
-    0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
-    0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
-    0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
-    0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
-    0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
-    0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
-    0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
-    0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
-    0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
-    0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0
-};
-
-static uint16_t redis_crc16(uint16_t crc, const char *buf, int len) {
-    int counter;
-    for (counter = 0; counter < len; counter++)
-            crc = (crc<<8) ^ crc16tab[((crc>>8) ^ *buf++)&0x00FF];
-    return crc;
-}
diff --git a/debian/modules/nchan/src/store/redis/cluster.h b/debian/modules/nchan/src/store/redis/cluster.h
deleted file mode 100644
index b09b70d..0000000
--- a/debian/modules/nchan/src/store/redis/cluster.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef NCHAN_REDIS_CLUSTER_H
-#define NCHAN_REDIS_CLUSTER_H
-
-#include "store-private.h"
-#include "store.h"
-
-void redis_cluster_init_postconfig(ngx_conf_t *cf);
-void redis_cluster_exit_worker(ngx_cycle_t *cycle);
-
-void redis_get_cluster_info(rdstore_data_t *rdata);
-void redis_get_cluster_nodes(rdstore_data_t *rdata);
-
-rdstore_data_t *redis_cluster_rdata(rdstore_data_t *rdata, ngx_str_t *str);
-rdstore_data_t *redis_cluster_rdata_from_cstr(rdstore_data_t *rdata, u_char *str);
-rdstore_data_t *redis_cluster_rdata_from_key(rdstore_data_t *rdata, ngx_str_t *key);
-rdstore_data_t *redis_cluster_rdata_from_channel_id(rdstore_data_t *rdata, ngx_str_t *str);
-rdstore_data_t *redis_cluster_rdata_from_channel(rdstore_channel_head_t *ch);
-ngx_int_t redis_cluster_associate_chanhead_with_rdata(rdstore_channel_head_t *ch);
-
-void *cluster_retry_palloc(redis_cluster_t *, size_t);
-void  cluster_retry_pfree(redis_cluster_t *, void *);
-ngx_int_t cluster_add_retry_command_with_chanhead(rdstore_channel_head_t *, void (*)(rdstore_data_t *, void *), void *);
-ngx_int_t cluster_add_retry_command_with_key(redis_cluster_t *, ngx_str_t *, void (*)(rdstore_data_t *, void *pd), void *pd);
-ngx_int_t cluster_add_retry_command_with_channel_id(redis_cluster_t *, ngx_str_t *, void (*)(rdstore_data_t *, void *pd), void *pd);
-ngx_int_t cluster_add_retry_command_with_cstr(redis_cluster_t *, u_char *, void (*)(rdstore_data_t *, void *pd), void *pd);
-
-int clusterKeySlotOk(redisAsyncContext *c, void *r);
-
-ngx_int_t redis_cluster_node_change_status(rdstore_data_t *rdata, redis_connection_status_t status);
-#endif //NCHAN_REDIS_CLUSTER_H
diff --git a/debian/modules/nchan/src/store/redis/cmp.c b/debian/modules/nchan/src/store/redis/cmp.c
index 4a7fe06..a75bdb1 100644
--- a/debian/modules/nchan/src/store/redis/cmp.c
+++ b/debian/modules/nchan/src/store/redis/cmp.c
@@ -1,7 +1,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2015 Charles Gunyon
+Copyright (c) 2017 Charles Gunyon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@ THE SOFTWARE.
 
 #include "cmp.h"
 
-static const uint32_t version = 14;
+static const uint32_t version = 17;
 static const uint32_t mp_version = 5;
 
 enum {
@@ -71,9 +71,9 @@ enum {
 };
 
 enum {
-  FIXARRAY_SIZE        = 0xF,
-  FIXMAP_SIZE          = 0xF,
-  FIXSTR_SIZE          = 0x1F
+  FIXARRAY_SIZE = 0xF,
+  FIXMAP_SIZE   = 0xF,
+  FIXSTR_SIZE   = 0x1F
 };
 
 enum {
@@ -93,6 +93,8 @@ enum {
   INVALID_TYPE_ERROR,
   LENGTH_READING_ERROR,
   LENGTH_WRITING_ERROR,
+  SKIP_DEPTH_LIMIT_EXCEEDED_ERROR,
+  INTERNAL_ERROR,
   ERROR_MAX
 };
 
@@ -113,6 +115,8 @@ const char *cmp_error_messages[ERROR_MAX + 1] = {
   "Invalid type",
   "Error reading size",
   "Error writing size",
+  "Depth limit exceeded while skipping",
+  "Internal error",
   "Max Error"
 };
 
@@ -177,48 +181,36 @@ static uint64_t be64(uint64_t x) {
   return x;
 }
 
-static float befloat(float x) {
-  char *b = (char *)&x;
+static float decode_befloat(char *b) {
+  float f = 0.;
+  char *fb = (char *)&f;
 
   if (!is_bigendian()) {
-    char swap = 0;
-
-    swap = b[0];
-    b[0] = b[3];
-    b[3] = swap;
-
-    swap = b[1];
-    b[1] = b[2];
-    b[2] = swap;
+    fb[0] = b[3];
+    fb[1] = b[2];
+    fb[2] = b[1];
+    fb[3] = b[0];
   }
 
-  return x;
+  return f;
 }
 
-static double bedouble(double x) {
-  char *b = (char *)&x;
+static double decode_bedouble(char *b) {
+  double d = 0.;
+  char *db = (char *)&d;
 
   if (!is_bigendian()) {
-    char swap = 0;
-
-    swap = b[0];
-    b[0] = b[7];
-    b[7] = swap;
-
-    swap = b[1];
-    b[1] = b[6];
-    b[6] = swap;
-
-    swap = b[2];
-    b[2] = b[5];
-    b[5] = swap;
-
-    swap = b[3];
-    b[3] = b[4];
-    b[4] = swap;
+    db[0] = b[7];
+    db[1] = b[6];
+    db[2] = b[5];
+    db[3] = b[4];
+    db[4] = b[3];
+    db[5] = b[2];
+    db[6] = b[1];
+    db[7] = b[0];
   }
 
-  return x;
+  return d;
 }
 
 static bool read_byte(cmp_ctx_t *ctx, uint8_t *x) {
@@ -229,9 +221,28 @@ static bool write_byte(cmp_ctx_t *ctx, uint8_t x) {
   return (ctx->write(ctx, &x, sizeof(uint8_t)) == (sizeof(uint8_t)));
 }
 
-static bool read_type_marker(cmp_ctx_t *ctx, uint8_t *marker) {
-  if (read_byte(ctx, marker))
+static bool skip_bytes(cmp_ctx_t *ctx, size_t count) {
+  if (ctx->skip) {
+    return ctx->skip(ctx, count);
+  }
+  else {
+    uint8_t floor;
+    size_t i;
+
+    for (i = 0; i < count; i++) {
+      if (!ctx->read(ctx, &floor, sizeof(uint8_t))) {
+        return false;
+      }
+    }
+
     return true;
+  }
+}
+
+static bool read_type_marker(cmp_ctx_t *ctx, uint8_t *marker) {
+  if (read_byte(ctx, marker)) {
+    return true;
+  }
 
   ctx->error = TYPE_MARKER_READING_ERROR;
   return false;
@@ -253,10 +264,499 @@ static bool write_fixed_value(cmp_ctx_t *ctx, uint8_t value) {
   return false;
 }
 
-void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read, cmp_writer write) {
+static bool type_marker_to_cmp_type(uint8_t type_marker, uint8_t *cmp_type) {
+  if (type_marker <= 0x7F) {
+    *cmp_type = CMP_TYPE_POSITIVE_FIXNUM;
+    return true;
+  }
+
+  if (type_marker <= 0x8F) {
+    *cmp_type = CMP_TYPE_FIXMAP;
+    return true;
+  }
+
+  if (type_marker <= 0x9F) {
+    *cmp_type = CMP_TYPE_FIXARRAY;
+    return true;
+  }
+
+  if (type_marker <= 0xBF) {
+    *cmp_type = CMP_TYPE_FIXSTR;
+    return true;
+  }
+
+  if (type_marker >= 0xE0) {
+    *cmp_type = CMP_TYPE_NEGATIVE_FIXNUM;
+    return true;
+  }
+
+  switch (type_marker) {
+    case NIL_MARKER:
+      *cmp_type = CMP_TYPE_NIL;
+      return true;
+    case FALSE_MARKER:
+      *cmp_type = CMP_TYPE_BOOLEAN;
+      return true;
+    case TRUE_MARKER:
+      *cmp_type = CMP_TYPE_BOOLEAN;
+      return true;
+    case BIN8_MARKER:
+      *cmp_type = CMP_TYPE_BIN8;
+      return true;
+    case BIN16_MARKER:
+      *cmp_type = CMP_TYPE_BIN16;
+      return true;
+    case BIN32_MARKER:
+      *cmp_type = CMP_TYPE_BIN32;
+      return true;
+    case EXT8_MARKER:
+      *cmp_type = CMP_TYPE_EXT8;
+      return true;
+    case EXT16_MARKER:
+      *cmp_type = CMP_TYPE_EXT16;
+      return true;
+    case EXT32_MARKER:
+      *cmp_type = CMP_TYPE_EXT32;
+      return true;
+    case FLOAT_MARKER:
+      *cmp_type = CMP_TYPE_FLOAT;
+      return true;
+    case DOUBLE_MARKER:
+      *cmp_type = CMP_TYPE_DOUBLE;
+      return true;
+    case U8_MARKER:
+      *cmp_type = CMP_TYPE_UINT8;
+      return true;
+    case U16_MARKER:
+      *cmp_type = CMP_TYPE_UINT16;
+      return true;
+    case U32_MARKER:
+      *cmp_type = CMP_TYPE_UINT32;
+      return true;
+    case U64_MARKER:
+      *cmp_type = CMP_TYPE_UINT64;
+      return true;
+    case S8_MARKER:
+      *cmp_type = CMP_TYPE_SINT8;
+      return true;
+    case S16_MARKER:
+      *cmp_type = CMP_TYPE_SINT16;
+      return true;
+    case S32_MARKER:
+      *cmp_type = CMP_TYPE_SINT32;
+      return true;
+    case S64_MARKER:
+      *cmp_type = CMP_TYPE_SINT64;
+      return true;
+    case FIXEXT1_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT1;
+      return true;
+    case FIXEXT2_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT2;
+      return true;
+    case FIXEXT4_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT4;
+      return true;
+    case FIXEXT8_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT8;
+      return true;
+    case FIXEXT16_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT16;
+      return true;
+    case STR8_MARKER:
+      *cmp_type = CMP_TYPE_STR8;
+      return true;
+    case STR16_MARKER:
+      *cmp_type = CMP_TYPE_STR16;
+      return true;
+    case STR32_MARKER:
+      *cmp_type = CMP_TYPE_STR32;
+      return true;
+    case ARRAY16_MARKER:
+      *cmp_type = CMP_TYPE_ARRAY16;
+      return true;
+    case ARRAY32_MARKER:
+      *cmp_type = CMP_TYPE_ARRAY32;
+      return true;
+    case MAP16_MARKER:
+      *cmp_type = CMP_TYPE_MAP16;
+      return true;
+    case MAP32_MARKER:
+      *cmp_type = CMP_TYPE_MAP32;
+      return true;
+    default:
+      return false;
+  }
+}
+
+static bool read_type_size(cmp_ctx_t *ctx, uint8_t type_marker,
+                                           uint8_t cmp_type,
+                                           uint32_t *size) {
+  uint8_t u8temp = 0;
+  uint16_t u16temp = 0;
+  uint32_t u32temp = 0;
+
+  switch (cmp_type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+      *size = 0;
+      return true;
+    case CMP_TYPE_FIXMAP:
+      *size = (type_marker & FIXMAP_SIZE);
+      return true;
+    case CMP_TYPE_FIXARRAY:
+      *size = (type_marker & FIXARRAY_SIZE);
+      return true;
+    case CMP_TYPE_FIXSTR:
+      *size = (type_marker & FIXSTR_SIZE);
+      return true;
+    case CMP_TYPE_NIL:
+      *size = 0;
+      return true;
+    case CMP_TYPE_BOOLEAN:
+      *size = 0;
+      return true;
+    case CMP_TYPE_BIN8:
+      if (!ctx->read(ctx, &u8temp, sizeof(uint8_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = u8temp;
+      return true;
+    case CMP_TYPE_BIN16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_BIN32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_EXT8:
+      if (!ctx->read(ctx, &u8temp, sizeof(uint8_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = u8temp;
+      return true;
+    case CMP_TYPE_EXT16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_EXT32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_FLOAT:
+      *size = 4;
+      return true;
+    case CMP_TYPE_DOUBLE:
+      *size = 8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *size = 1;
+      return true;
+    case CMP_TYPE_UINT16:
+      *size = 2;
+      return true;
+    case CMP_TYPE_UINT32:
+      *size = 4;
+      return true;
+    case CMP_TYPE_UINT64:
+      *size = 8;
+      return true;
+    case CMP_TYPE_SINT8:
+      *size = 1;
+      return true;
+    case CMP_TYPE_SINT16:
+      *size = 2;
+      return true;
+    case CMP_TYPE_SINT32:
+      *size = 4;
+      return true;
+    case CMP_TYPE_SINT64:
+      *size = 8;
+      return true;
+    case CMP_TYPE_FIXEXT1:
+      *size = 1;
+      return true;
+    case CMP_TYPE_FIXEXT2:
+      *size = 2;
+      return true;
+    case CMP_TYPE_FIXEXT4:
+      *size = 4;
+      return true;
+    case CMP_TYPE_FIXEXT8:
+      *size = 8;
+      return true;
+    case CMP_TYPE_FIXEXT16:
+      *size = 16;
+      return true;
+    case CMP_TYPE_STR8:
+      if (!ctx->read(ctx, &u8temp, sizeof(uint8_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = u8temp;
+      return true;
+    case CMP_TYPE_STR16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_STR32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_ARRAY16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_ARRAY32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_MAP16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_MAP32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      *size = 0;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+static bool read_obj_data(cmp_ctx_t *ctx, uint8_t type_marker,
+                                          cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+      obj->as.u8 = type_marker;
+      return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      obj->as.s8 = type_marker;
+      return true;
+    case CMP_TYPE_NIL:
+      obj->as.u8 = 0;
+      return true;
+    case CMP_TYPE_BOOLEAN:
+      switch (type_marker) {
+        case TRUE_MARKER:
+          obj->as.boolean = true;
+          return true;
+        case FALSE_MARKER:
+          obj->as.boolean = false;
+          return true;
+        default:
+          break;
+      }
+      ctx->error = INTERNAL_ERROR;
+      return false;
+    case CMP_TYPE_UINT8:
+      if (!ctx->read(ctx, &obj->as.u8, sizeof(uint8_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      return true;
+    case CMP_TYPE_UINT16:
+      if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.u16 = be16(obj->as.u16);
+      return true;
+    case CMP_TYPE_UINT32:
+      if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.u32 = be32(obj->as.u32);
+      return true;
+    case CMP_TYPE_UINT64:
+      if (!ctx->read(ctx, &obj->as.u64, sizeof(uint64_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.u64 = be64(obj->as.u64);
+      return true;
+    case CMP_TYPE_SINT8:
+      if (!ctx->read(ctx, &obj->as.s8, sizeof(int8_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      return true;
+    case CMP_TYPE_SINT16:
+      if (!ctx->read(ctx, &obj->as.s16, sizeof(int16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.s16 = be16(obj->as.s16);
+      return true;
+    case CMP_TYPE_SINT32:
+      if (!ctx->read(ctx, &obj->as.s32, sizeof(int32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.s32 = be32(obj->as.s32);
+      return true;
+    case CMP_TYPE_SINT64:
+      if (!ctx->read(ctx, &obj->as.s64, sizeof(int64_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.s64 = be64(obj->as.s64);
+      return true;
+    case CMP_TYPE_FLOAT:
+    {
+      char bytes[4];
+
+      if (!ctx->read(ctx, bytes, 4)) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.flt = decode_befloat(bytes);
+      return true;
+    }
+    case CMP_TYPE_DOUBLE:
+    {
+      char bytes[8];
+
+      if (!ctx->read(ctx, bytes, 8)) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.dbl = decode_bedouble(bytes);
+      return true;
+    }
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      return read_type_size(ctx, type_marker, obj->type, &obj->as.bin_size);
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      return read_type_size(ctx, type_marker, obj->type, &obj->as.str_size);
+    case CMP_TYPE_FIXARRAY:
+    case CMP_TYPE_ARRAY16:
+    case CMP_TYPE_ARRAY32:
+      return read_type_size(ctx, type_marker, obj->type, &obj->as.array_size);
+    case CMP_TYPE_FIXMAP:
+    case CMP_TYPE_MAP16:
+    case CMP_TYPE_MAP32:
+      return read_type_size(ctx, type_marker, obj->type, &obj->as.map_size);
+    case CMP_TYPE_FIXEXT1:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 1;
+      return true;
+    case CMP_TYPE_FIXEXT2:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 2;
+      return true;
+    case CMP_TYPE_FIXEXT4:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 4;
+      return true;
+    case CMP_TYPE_FIXEXT8:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 8;
+      return true;
+    case CMP_TYPE_FIXEXT16:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 16;
+      return true;
+    case CMP_TYPE_EXT8:
+      if (!read_type_size(ctx, type_marker, obj->type, &obj->as.ext.size)) {
+        return false;
+      }
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      return true;
+    case CMP_TYPE_EXT16:
+      if (!read_type_size(ctx, type_marker, obj->type, &obj->as.ext.size)) {
+        return false;
+      }
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.type = obj->as.ext.type;
+      return true;
+    case CMP_TYPE_EXT32:
+      if (!read_type_size(ctx, type_marker, obj->type, &obj->as.ext.size)) {
+        return false;
+      }
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.type = obj->as.ext.type;
+      return true;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read,
+                                         cmp_skipper skip,
+                                         cmp_writer write) {
   ctx->error = ERROR_NONE;
   ctx->buf = buf;
   ctx->read = read;
+  ctx->skip = skip;
   ctx->write = write;
 }
 
@@ -339,13 +839,13 @@ bool cmp_write_integer(cmp_ctx_t *ctx, int64_t d) {
   if (d >= 0)
     return cmp_write_uinteger(ctx, d);
   if (d >= -32)
-    return cmp_write_nfix(ctx, d);
+    return cmp_write_nfix(ctx, (int8_t)d);
   if (d >= -128)
-    return cmp_write_s8(ctx, d);
+    return cmp_write_s8(ctx, (int8_t)d);
   if (d >= -32768)
-    return cmp_write_s16(ctx, d);
+    return cmp_write_s16(ctx, (int16_t)d);
   if (d >= (-2147483647 - 1))
-    return cmp_write_s32(ctx, (int32_t) d);
+    return cmp_write_s32(ctx, (int32_t)d);
 
   return cmp_write_s64(ctx, d);
 }
@@ -390,13 +890,13 @@ bool cmp_write_u64(cmp_ctx_t *ctx, uint64_t l) {
 
 bool cmp_write_uinteger(cmp_ctx_t *ctx, uint64_t u) {
   if (u <= 0x7F)
-    return cmp_write_pfix(ctx, u);
+    return cmp_write_pfix(ctx, (uint8_t)u);
   if (u <= 0xFF)
-    return cmp_write_u8(ctx, u);
+    return cmp_write_u8(ctx, (uint8_t)u);
   if (u <= 0xFFFF)
-    return cmp_write_u16(ctx, u);
+    return cmp_write_u16(ctx, (uint16_t)u);
   if (u <= 0xFFFFFFFF)
-    return cmp_write_u32(ctx, (uint32_t) u);
+    return cmp_write_u32(ctx, (uint32_t)u);
 
   return cmp_write_u64(ctx, u);
 }
@@ -405,7 +905,21 @@ bool cmp_write_float(cmp_ctx_t *ctx, float f) {
   if (!write_type_marker(ctx, FLOAT_MARKER))
     return false;
 
-  f = befloat(f);
+  /*
+   * We may need to swap the float's bytes, but we can't just swap them inside
+   * the float because the swapped bytes may not constitute a valid float.
+   * Therefore, we have to create a buffer and swap the bytes there.
+   */
+  if (!is_bigendian()) {
+    char swapped[sizeof(float)];
+    char *fbuf = (char *)&f;
+    size_t i;
+
+    for (i = 0; i < sizeof(float); i++)
+      swapped[i] = fbuf[sizeof(float) - i - 1];
+
+    return ctx->write(ctx, swapped, sizeof(float));
+  }
 
   return ctx->write(ctx, &f, sizeof(float));
 }
@@ -414,14 +928,24 @@ bool cmp_write_double(cmp_ctx_t *ctx, double d) {
   if (!write_type_marker(ctx, DOUBLE_MARKER))
     return false;
 
-  d = bedouble(d);
+  /* Same deal for doubles */
+  if (!is_bigendian()) {
+    char swapped[sizeof(double)];
+    char *dbuf = (char *)&d;
+    size_t i;
+
+    for (i = 0; i < sizeof(double); i++)
+      swapped[i] = dbuf[sizeof(double) - i - 1];
+
+    return ctx->write(ctx, swapped, sizeof(double));
+  }
 
   return ctx->write(ctx, &d, sizeof(double));
 }
 
 bool cmp_write_decimal(cmp_ctx_t *ctx, double d) {
   float f = (float)d;
-  float df = (double)f;
+  double df = (double)f;
 
   if (df == d)
     return cmp_write_float(ctx, f);
@@ -558,40 +1082,40 @@ bool cmp_write_str32(cmp_ctx_t *ctx, const char *data, uint32_t size) {
 
 bool cmp_write_str_marker(cmp_ctx_t *ctx, uint32_t size) {
   if (size <= FIXSTR_SIZE)
-    return cmp_write_fixstr_marker(ctx, size);
+    return cmp_write_fixstr_marker(ctx, (uint8_t)size);
   if (size <= 0xFF)
-    return cmp_write_str8_marker(ctx, size);
+    return cmp_write_str8_marker(ctx, (uint8_t)size);
   if (size <= 0xFFFF)
-    return cmp_write_str16_marker(ctx, size);
+    return cmp_write_str16_marker(ctx, (uint16_t)size);
 
   return cmp_write_str32_marker(ctx, size);
 }
 
 bool cmp_write_str_marker_v4(cmp_ctx_t *ctx, uint32_t size) {
   if (size <= FIXSTR_SIZE)
-    return cmp_write_fixstr_marker(ctx, size);
+    return cmp_write_fixstr_marker(ctx, (uint8_t)size);
   if (size <= 0xFFFF)
-    return cmp_write_str16_marker(ctx, size);
+    return cmp_write_str16_marker(ctx, (uint16_t)size);
 
   return cmp_write_str32_marker(ctx, size);
 }
 
 bool cmp_write_str(cmp_ctx_t *ctx, const char *data, uint32_t size) {
   if (size <= FIXSTR_SIZE)
-    return cmp_write_fixstr(ctx, data, size);
+    return cmp_write_fixstr(ctx, data, (uint8_t)size);
   if (size <= 0xFF)
-    return cmp_write_str8(ctx, data, size);
+    return cmp_write_str8(ctx, data, (uint8_t)size);
   if (size <= 0xFFFF)
-    return cmp_write_str16(ctx, data, size);
+    return cmp_write_str16(ctx, data, (uint16_t)size);
 
   return cmp_write_str32(ctx, data, size);
 }
 
 bool cmp_write_str_v4(cmp_ctx_t *ctx, const char *data, uint32_t size) {
   if (size <= FIXSTR_SIZE)
-    return cmp_write_fixstr(ctx, data, size);
+    return cmp_write_fixstr(ctx, data, (uint8_t)size);
   if (size <= 0xFFFF)
-    return cmp_write_str16(ctx, data, size);
+    return cmp_write_str16(ctx, data, (uint16_t)size);
 
   return cmp_write_str32(ctx, data, size);
 }
@@ -677,18 +1201,18 @@ bool cmp_write_bin32(cmp_ctx_t *ctx, const void *data, uint32_t size) {
 
 bool cmp_write_bin_marker(cmp_ctx_t *ctx, uint32_t size) {
   if (size <= 0xFF)
-    return cmp_write_bin8_marker(ctx, size);
+    return cmp_write_bin8_marker(ctx, (uint8_t)size);
   if (size <= 0xFFFF)
-    return cmp_write_bin16_marker(ctx, size);
+    return cmp_write_bin16_marker(ctx, (uint16_t)size);
 
   return cmp_write_bin32_marker(ctx, size);
 }
 
 bool cmp_write_bin(cmp_ctx_t *ctx, const void *data, uint32_t size) {
   if (size <= 0xFF)
-    return cmp_write_bin8(ctx, data, size);
+    return cmp_write_bin8(ctx, data, (uint8_t)size);
   if (size <= 0xFFFF)
-    return cmp_write_bin16(ctx, data, size);
+    return cmp_write_bin16(ctx, data, (uint16_t)size);
 
   return cmp_write_bin32(ctx, data, size);
 }
@@ -729,9 +1253,9 @@ bool cmp_write_array32(cmp_ctx_t *ctx, uint32_t size) {
 
 bool cmp_write_array(cmp_ctx_t *ctx, uint32_t size) {
   if (size <= FIXARRAY_SIZE)
-    return cmp_write_fixarray(ctx, size);
+    return cmp_write_fixarray(ctx, (uint8_t)size);
   if (size <= 0xFFFF)
-    return cmp_write_array16(ctx, size);
+    return cmp_write_array16(ctx, (uint16_t)size);
 
   return cmp_write_array32(ctx, size);
 }
@@ -772,9 +1296,9 @@ bool cmp_write_map32(cmp_ctx_t *ctx, uint32_t size) {
 
 bool cmp_write_map(cmp_ctx_t *ctx, uint32_t size) {
   if (size <= FIXMAP_SIZE)
-    return cmp_write_fixmap(ctx, size);
+    return cmp_write_fixmap(ctx, (uint8_t)size);
   if (size <= 0xFFFF)
-    return cmp_write_map16(ctx, size);
+    return cmp_write_map16(ctx, (uint16_t)size);
 
   return cmp_write_map32(ctx, size);
 }
@@ -986,9 +1510,9 @@ bool cmp_write_ext_marker(cmp_ctx_t *ctx, int8_t tp, uint32_t sz) {
   if (sz == 16)
     return cmp_write_fixext16_marker(ctx, tp);
   if (sz <= 0xFF)
-    return cmp_write_ext8_marker(ctx, tp, sz);
+    return cmp_write_ext8_marker(ctx, tp, (uint8_t)sz);
   if (sz <= 0xFFFF)
-    return cmp_write_ext16_marker(ctx, tp, sz);
+    return cmp_write_ext16_marker(ctx, tp, (uint16_t)sz);
 
   return cmp_write_ext32_marker(ctx, tp, sz);
 }
@@ -1005,9 +1529,9 @@ bool cmp_write_ext(cmp_ctx_t *ctx, int8_t tp, uint32_t sz, const void *data) {
   if (sz == 16)
     return cmp_write_fixext16(ctx, tp, data);
   if (sz <= 0xFF)
-    return cmp_write_ext8(ctx, tp, sz, data);
+    return cmp_write_ext8(ctx, tp, (uint8_t)sz, data);
   if (sz <= 0xFFFF)
-    return cmp_write_ext16(ctx, tp, sz, data);
+    return cmp_write_ext16(ctx, tp, (uint16_t)sz, data);
 
   return cmp_write_ext32(ctx, tp, sz, data);
 }
@@ -1017,11 +1541,11 @@ bool cmp_write_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
     case CMP_TYPE_POSITIVE_FIXNUM:
       return cmp_write_pfix(ctx, obj->as.u8);
     case CMP_TYPE_FIXMAP:
-      return cmp_write_fixmap(ctx, obj->as.map_size);
+      return cmp_write_fixmap(ctx, (uint8_t)obj->as.map_size);
     case CMP_TYPE_FIXARRAY:
-      return cmp_write_fixarray(ctx, obj->as.array_size);
+      return cmp_write_fixarray(ctx, (uint8_t)obj->as.array_size);
     case CMP_TYPE_FIXSTR:
-      return cmp_write_fixstr_marker(ctx, obj->as.str_size);
+      return cmp_write_fixstr_marker(ctx, (uint8_t)obj->as.str_size);
     case CMP_TYPE_NIL:
       return cmp_write_nil(ctx);
     case CMP_TYPE_BOOLEAN:
@@ -1029,15 +1553,19 @@ bool cmp_write_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
         return cmp_write_true(ctx);
       return cmp_write_false(ctx);
     case CMP_TYPE_BIN8:
-      return cmp_write_bin8_marker(ctx, obj->as.bin_size);
+      return cmp_write_bin8_marker(ctx, (uint8_t)obj->as.bin_size);
     case CMP_TYPE_BIN16:
-      return cmp_write_bin16_marker(ctx, obj->as.bin_size);
+      return cmp_write_bin16_marker(ctx, (uint16_t)obj->as.bin_size);
     case CMP_TYPE_BIN32:
       return cmp_write_bin32_marker(ctx, obj->as.bin_size);
     case CMP_TYPE_EXT8:
-      return cmp_write_ext8_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+      return cmp_write_ext8_marker(
+        ctx, obj->as.ext.type, (uint8_t)obj->as.ext.size
+      );
     case CMP_TYPE_EXT16:
-      return cmp_write_ext16_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+      return cmp_write_ext16_marker(
+        ctx, obj->as.ext.type, (uint16_t)obj->as.ext.size
+      );
     case CMP_TYPE_EXT32:
       return cmp_write_ext32_marker(ctx, obj->as.ext.type, obj->as.ext.size);
     case CMP_TYPE_FLOAT:
@@ -1071,17 +1599,17 @@ bool cmp_write_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
     case CMP_TYPE_FIXEXT16:
       return cmp_write_fixext16_marker(ctx, obj->as.ext.type);
     case CMP_TYPE_STR8:
-      return cmp_write_str8_marker(ctx, obj->as.str_size);
+      return cmp_write_str8_marker(ctx, (uint8_t)obj->as.str_size);
     case CMP_TYPE_STR16:
-      return cmp_write_str16_marker(ctx, obj->as.str_size);
+      return cmp_write_str16_marker(ctx, (uint16_t)obj->as.str_size);
     case CMP_TYPE_STR32:
       return cmp_write_str32_marker(ctx, obj->as.str_size);
     case CMP_TYPE_ARRAY16:
-      return cmp_write_array16(ctx, obj->as.array_size);
+      return cmp_write_array16(ctx, (uint16_t)obj->as.array_size);
     case CMP_TYPE_ARRAY32:
       return cmp_write_array32(ctx, obj->as.array_size);
     case CMP_TYPE_MAP16:
-      return cmp_write_map16(ctx, obj->as.map_size);
+      return cmp_write_map16(ctx, (uint16_t)obj->as.map_size);
     case CMP_TYPE_MAP32:
       return cmp_write_map32(ctx, obj->as.map_size);
     case CMP_TYPE_NEGATIVE_FIXNUM:
@@ -1097,27 +1625,23 @@ bool cmp_write_object_v4(cmp_ctx_t *ctx, cmp_object_t *obj) {
     case CMP_TYPE_POSITIVE_FIXNUM:
       return cmp_write_pfix(ctx, obj->as.u8);
     case CMP_TYPE_FIXMAP:
-      return cmp_write_fixmap(ctx, obj->as.map_size);
+      return cmp_write_fixmap(ctx, (uint8_t)obj->as.map_size);
     case CMP_TYPE_FIXARRAY:
-      return cmp_write_fixarray(ctx, obj->as.array_size);
+      return cmp_write_fixarray(ctx, (uint8_t)obj->as.array_size);
     case CMP_TYPE_FIXSTR:
-      return cmp_write_fixstr_marker(ctx, obj->as.str_size);
+      return cmp_write_fixstr_marker(ctx, (uint8_t)obj->as.str_size);
     case CMP_TYPE_NIL:
       return cmp_write_nil(ctx);
     case CMP_TYPE_BOOLEAN:
       if (obj->as.boolean)
         return cmp_write_true(ctx);
       return cmp_write_false(ctx);
-    case CMP_TYPE_BIN8:
-      return cmp_write_bin8_marker(ctx, obj->as.bin_size);
-    case CMP_TYPE_BIN16:
-      return cmp_write_bin16_marker(ctx, obj->as.bin_size);
-    case CMP_TYPE_BIN32:
-      return cmp_write_bin32_marker(ctx, obj->as.bin_size);
     case CMP_TYPE_EXT8:
-      return cmp_write_ext8_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+      return cmp_write_ext8_marker(ctx, obj->as.ext.type, (uint8_t)obj->as.ext.size);
     case CMP_TYPE_EXT16:
-      return cmp_write_ext16_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+      return cmp_write_ext16_marker(
+        ctx, obj->as.ext.type, (uint16_t)obj->as.ext.size
+      );
     case CMP_TYPE_EXT32:
       return cmp_write_ext32_marker(ctx, obj->as.ext.type, obj->as.ext.size);
     case CMP_TYPE_FLOAT:
@@ -1151,15 +1675,15 @@ bool cmp_write_object_v4(cmp_ctx_t *ctx, cmp_object_t *obj) {
     case CMP_TYPE_FIXEXT16:
       return cmp_write_fixext16_marker(ctx, obj->as.ext.type);
     case CMP_TYPE_STR16:
-      return cmp_write_str16_marker(ctx, obj->as.str_size);
+      return cmp_write_str16_marker(ctx, (uint16_t)obj->as.str_size);
     case CMP_TYPE_STR32:
       return cmp_write_str32_marker(ctx, obj->as.str_size);
     case CMP_TYPE_ARRAY16:
-      return cmp_write_array16(ctx, obj->as.array_size);
+      return cmp_write_array16(ctx, (uint16_t)obj->as.array_size);
     case CMP_TYPE_ARRAY32:
       return cmp_write_array32(ctx, obj->as.array_size);
     case CMP_TYPE_MAP16:
-      return cmp_write_map16(ctx, obj->as.map_size);
+      return cmp_write_map16(ctx, (uint16_t)obj->as.map_size);
     case CMP_TYPE_MAP32:
       return cmp_write_map32(ctx, obj->as.map_size);
     case CMP_TYPE_NEGATIVE_FIXNUM:
@@ -1294,10 +1818,13 @@ bool cmp_read_char(cmp_ctx_t *ctx, int8_t *c) {
         *c = obj.as.u8;
         return true;
       }
+      break;
     default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
+      break;
   }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
 }
 
 bool cmp_read_short(cmp_ctx_t *ctx, int16_t *s) {
@@ -1323,10 +1850,13 @@ bool cmp_read_short(cmp_ctx_t *ctx, int16_t *s) {
         *s = obj.as.u16;
         return true;
       }
+      break;
     default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
+      break;
   }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
 }
 
 bool cmp_read_int(cmp_ctx_t *ctx, int32_t *i) {
@@ -1358,10 +1888,13 @@ bool cmp_read_int(cmp_ctx_t *ctx, int32_t *i) {
         *i = obj.as.u32;
         return true;
       }
+      break;
     default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
+      break;
   }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
 }
 
 bool cmp_read_long(cmp_ctx_t *ctx, int64_t *d) {
@@ -1399,10 +1932,13 @@ bool cmp_read_long(cmp_ctx_t *ctx, int64_t *d) {
         *d = obj.as.u64;
         return true;
       }
+      break;
     default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
+      break;
   }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
 }
 
 bool cmp_read_integer(cmp_ctx_t *ctx, int64_t *d) {
@@ -1484,10 +2020,19 @@ bool cmp_read_uchar(cmp_ctx_t *ctx, uint8_t *c) {
     case CMP_TYPE_UINT8:
       *c = obj.as.u8;
       return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      if (obj.as.s8 >= 0) {
+        *c = obj.as.s8;
+        return true;
+      }
+      break;
     default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
+      break;
   }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
 }
 
 bool cmp_read_ushort(cmp_ctx_t *ctx, uint16_t *s) {
@@ -1504,10 +2049,25 @@ bool cmp_read_ushort(cmp_ctx_t *ctx, uint16_t *s) {
     case CMP_TYPE_UINT16:
       *s = obj.as.u16;
       return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      if (obj.as.s8 >= 0) {
+        *s = obj.as.s8;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT16:
+      if (obj.as.s16 >= 0) {
+        *s = obj.as.s16;
+        return true;
+      }
+      break;
     default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
+      break;
   }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
 }
 
 bool cmp_read_uint(cmp_ctx_t *ctx, uint32_t *i) {
@@ -1527,10 +2087,31 @@ bool cmp_read_uint(cmp_ctx_t *ctx, uint32_t *i) {
     case CMP_TYPE_UINT32:
       *i = obj.as.u32;
       return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      if (obj.as.s8 >= 0) {
+        *i = obj.as.s8;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT16:
+      if (obj.as.s16 >= 0) {
+        *i = obj.as.s16;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT32:
+      if (obj.as.s32 >= 0) {
+        *i = obj.as.s32;
+        return true;
+      }
+      break;
     default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
+      break;
   }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
 }
 
 bool cmp_read_ulong(cmp_ctx_t *ctx, uint64_t *u) {
@@ -1553,10 +2134,37 @@ bool cmp_read_ulong(cmp_ctx_t *ctx, uint64_t *u) {
     case CMP_TYPE_UINT64:
       *u = obj.as.u64;
       return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      if (obj.as.s8 >= 0) {
+        *u = obj.as.s8;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT16:
+      if (obj.as.s16 >= 0) {
+        *u = obj.as.s16;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT32:
+      if (obj.as.s32 >= 0) {
+        *u = obj.as.s32;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT64:
+      if (obj.as.s64 >= 0) {
+        *u = obj.as.s64;
+        return true;
+      }
+      break;
     default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
+      break;
   }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
 }
 
 bool cmp_read_uinteger(cmp_ctx_t *ctx, uint64_t *d) {
@@ -1923,7 +2531,7 @@ bool cmp_read_ext8_marker(cmp_ctx_t *ctx, int8_t *type, uint8_t *size) {
   }
 
   *type = obj.as.ext.type;
-  *size = obj.as.ext.size;
+  *size = (uint8_t)obj.as.ext.size;
 
   return true;
 }
@@ -1951,7 +2559,7 @@ bool cmp_read_ext16_marker(cmp_ctx_t *ctx, int8_t *type, uint16_t *size) {
   }
 
   *type = obj.as.ext.type;
-  *size = obj.as.ext.size;
+  *size = (uint16_t)obj.as.ext.size;
 
   return true;
 }
@@ -2036,289 +2644,182 @@ bool cmp_read_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
   if (!read_type_marker(ctx, &type_marker))
     return false;
 
-  if (type_marker <= 0x7F) {
-    obj->type = CMP_TYPE_POSITIVE_FIXNUM;
-    obj->as.u8 = type_marker;
-  }
-  else if (type_marker <= 0x8F) {
-    obj->type = CMP_TYPE_FIXMAP;
-    obj->as.map_size = type_marker & FIXMAP_SIZE;
-  }
-  else if (type_marker <= 0x9F) {
-    obj->type = CMP_TYPE_FIXARRAY;
-    obj->as.array_size = type_marker & FIXARRAY_SIZE;
-  }
-  else if (type_marker <= 0xBF) {
-    obj->type = CMP_TYPE_FIXSTR;
-    obj->as.str_size = type_marker & FIXSTR_SIZE;
-  }
-  else if (type_marker == NIL_MARKER) {
-    obj->type = CMP_TYPE_NIL;
-    obj->as.u8 = 0;
-  }
-  else if (type_marker == FALSE_MARKER) {
-    obj->type = CMP_TYPE_BOOLEAN;
-    obj->as.boolean = false;
-  }
-  else if (type_marker == TRUE_MARKER) {
-    obj->type = CMP_TYPE_BOOLEAN;
-    obj->as.boolean = true;
-  }
-  else if (type_marker == BIN8_MARKER) {
-    obj->type = CMP_TYPE_BIN8;
-    if (!ctx->read(ctx, &obj->as.u8, sizeof(uint8_t))) {
-      ctx->error = LENGTH_READING_ERROR;
-      return false;
-    }
-    obj->as.bin_size = obj->as.u8;
-  }
-  else if (type_marker == BIN16_MARKER) {
-    obj->type = CMP_TYPE_BIN16;
-    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
-      ctx->error = LENGTH_READING_ERROR;
-      return false;
-    }
-    obj->as.bin_size = be16(obj->as.u16);
-  }
-  else if (type_marker == BIN32_MARKER) {
-    obj->type = CMP_TYPE_BIN32;
-    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
-      ctx->error = LENGTH_READING_ERROR;
-      return false;
-    }
-    obj->as.bin_size = be32(obj->as.u32);
-  }
-  else if (type_marker == EXT8_MARKER) {
-    uint8_t ext_size;
-    int8_t ext_type;
-
-    obj->type = CMP_TYPE_EXT8;
-    if (!ctx->read(ctx, &ext_size, sizeof(uint8_t))) {
-      ctx->error = LENGTH_READING_ERROR;
-      return false;
-    }
-    if (!ctx->read(ctx, &ext_type, sizeof(int8_t))) {
-      ctx->error = EXT_TYPE_READING_ERROR;
-      return false;
-    }
-    obj->as.ext.size = ext_size;
-    obj->as.ext.type = ext_type;
-  }
-  else if (type_marker == EXT16_MARKER) {
-    int8_t ext_type;
-    uint16_t ext_size;
-
-    obj->type = CMP_TYPE_EXT16;
-    if (!ctx->read(ctx, &ext_size, sizeof(uint16_t))) {
-      ctx->error = LENGTH_READING_ERROR;
-      return false;
-    }
-    if (!ctx->read(ctx, &ext_type, sizeof(int8_t))) {
-      ctx->error = EXT_TYPE_READING_ERROR;
-      return false;
-    }
-    obj->as.ext.size = be16(ext_size);
-    obj->as.ext.type = ext_type;
-  }
-  else if (type_marker == EXT32_MARKER) {
-    int8_t ext_type;
-    uint32_t ext_size;
-
-    obj->type = CMP_TYPE_EXT32;
-    if (!ctx->read(ctx, &ext_size, sizeof(uint32_t))) {
-      ctx->error = LENGTH_READING_ERROR;
-      return false;
-    }
-    if (!ctx->read(ctx, &ext_type, sizeof(int8_t))) {
-      ctx->error = EXT_TYPE_READING_ERROR;
-      return false;
-    }
-    obj->as.ext.size = be32(ext_size);
-    obj->as.ext.type = ext_type;
-  }
-  else if (type_marker == FLOAT_MARKER) {
-    obj->type = CMP_TYPE_FLOAT;
-    if (!ctx->read(ctx, &obj->as.flt, sizeof(float))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.flt = befloat(obj->as.flt);
-  }
-  else if (type_marker == DOUBLE_MARKER) {
-    obj->type = CMP_TYPE_DOUBLE;
-    if (!ctx->read(ctx, &obj->as.dbl, sizeof(double))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.dbl = bedouble(obj->as.dbl);
-  }
-  else if (type_marker == U8_MARKER) {
-    obj->type = CMP_TYPE_UINT8;
-    if (!ctx->read(ctx, &obj->as.u8, sizeof(uint8_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-  }
-  else if (type_marker == U16_MARKER) {
-    obj->type = CMP_TYPE_UINT16;
-    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.u16 = be16(obj->as.u16);
-  }
-  else if (type_marker == U32_MARKER) {
-    obj->type = CMP_TYPE_UINT32;
-    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.u32 = be32(obj->as.u32);
-  }
-  else if (type_marker == U64_MARKER) {
-    obj->type = CMP_TYPE_UINT64;
-    if (!ctx->read(ctx, &obj->as.u64, sizeof(uint64_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.u64 = be64(obj->as.u64);
-  }
-  else if (type_marker == S8_MARKER) {
-    obj->type = CMP_TYPE_SINT8;
-    if (!ctx->read(ctx, &obj->as.s8, sizeof(int8_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-  }
-  else if (type_marker == S16_MARKER) {
-    obj->type = CMP_TYPE_SINT16;
-    if (!ctx->read(ctx, &obj->as.s16, sizeof(int16_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.s16 = be16(obj->as.s16);
-  }
-  else if (type_marker == S32_MARKER) {
-    obj->type = CMP_TYPE_SINT32;
-    if (!ctx->read(ctx, &obj->as.s32, sizeof(int32_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.s32 = be32(obj->as.s32);
-  }
-  else if (type_marker == S64_MARKER) {
-    obj->type = CMP_TYPE_SINT64;
-    if (!ctx->read(ctx, &obj->as.s64, sizeof(int64_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.s64 = be64(obj->as.s64);
-  }
-  else if (type_marker == FIXEXT1_MARKER) {
-    obj->type = CMP_TYPE_FIXEXT1;
-    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-      ctx->error = EXT_TYPE_READING_ERROR;
-      return false;
-    }
-    obj->as.ext.size = 1;
-  }
-  else if (type_marker == FIXEXT2_MARKER) {
-    obj->type = CMP_TYPE_FIXEXT2;
-    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-      ctx->error = EXT_TYPE_READING_ERROR;
-      return false;
-    }
-    obj->as.ext.size = 2;
-  }
-  else if (type_marker == FIXEXT4_MARKER) {
-    obj->type = CMP_TYPE_FIXEXT4;
-    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-      ctx->error = EXT_TYPE_READING_ERROR;
-      return false;
-    }
-    obj->as.ext.size = 4;
-  }
-  else if (type_marker == FIXEXT8_MARKER) {
-    obj->type = CMP_TYPE_FIXEXT8;
-    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-      ctx->error = EXT_TYPE_READING_ERROR;
-      return false;
-    }
-    obj->as.ext.size = 8;
-  }
-  else if (type_marker == FIXEXT16_MARKER) {
-    obj->type = CMP_TYPE_FIXEXT16;
-    if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-      ctx->error = EXT_TYPE_READING_ERROR;
-      return false;
-    }
-    obj->as.ext.size = 16;
-  }
-  else if (type_marker == STR8_MARKER) {
-    obj->type = CMP_TYPE_STR8;
-    if (!ctx->read(ctx, &obj->as.u8, sizeof(uint8_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.str_size = obj->as.u8;
-  }
-  else if (type_marker == STR16_MARKER) {
-    obj->type = CMP_TYPE_STR16;
-    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.str_size = be16(obj->as.u16);
-  }
-  else if (type_marker == STR32_MARKER) {
-    obj->type = CMP_TYPE_STR32;
-    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.str_size = be32(obj->as.u32);
-  }
-  else if (type_marker == ARRAY16_MARKER) {
-    obj->type = CMP_TYPE_ARRAY16;
-    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.array_size = be16(obj->as.u16);
-  }
-  else if (type_marker == ARRAY32_MARKER) {
-    obj->type = CMP_TYPE_ARRAY32;
-    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.array_size = be32(obj->as.u32);
-  }
-  else if (type_marker == MAP16_MARKER) {
-    obj->type = CMP_TYPE_MAP16;
-    if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.map_size = be16(obj->as.u16);
-  }
-  else if (type_marker == MAP32_MARKER) {
-    obj->type = CMP_TYPE_MAP32;
-    if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
-      ctx->error = DATA_READING_ERROR;
-      return false;
-    }
-    obj->as.map_size = be32(obj->as.u32);
-  }
-  else if (type_marker >= NEGATIVE_FIXNUM_MARKER) {
-    obj->type = CMP_TYPE_NEGATIVE_FIXNUM;
-    obj->as.s8 = type_marker;
-  }
-  else {
+  if (!type_marker_to_cmp_type(type_marker, &obj->type)) {
     ctx->error = INVALID_TYPE_ERROR;
     return false;
   }
 
+  return read_obj_data(ctx, type_marker, obj);
+}
+
+bool cmp_skip_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
+  return cmp_skip_object_limit(ctx, obj, 0);
+}
+
+bool cmp_skip_object_limit(cmp_ctx_t *ctx, cmp_object_t *obj, uint32_t limit) {
+  size_t element_count = 1;
+  uint32_t depth = 0;
+
+  while (element_count) {
+    uint8_t type_marker = 0;
+    uint8_t cmp_type;
+    uint32_t size = 0;
+
+    if (!read_type_marker(ctx, &type_marker)) {
+      return false;
+    }
+
+    if (!type_marker_to_cmp_type(type_marker, &cmp_type)) {
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+    }
+
+    switch (cmp_type) {
+      case CMP_TYPE_FIXARRAY:
+      case CMP_TYPE_ARRAY16:
+      case CMP_TYPE_ARRAY32:
+      case CMP_TYPE_FIXMAP:
+      case CMP_TYPE_MAP16:
+      case CMP_TYPE_MAP32:
+        depth++;
+
+        if (depth > limit) {
+          obj->type = cmp_type;
+
+          if (!read_obj_data(ctx, type_marker, obj)) {
+            return false;
+          }
+
+          ctx->error = SKIP_DEPTH_LIMIT_EXCEEDED_ERROR;
+
+          return false;
+        }
+
+        break;
+      default:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+
+        if (size) {
+          switch (cmp_type) {
+            case CMP_TYPE_FIXEXT1:
+            case CMP_TYPE_FIXEXT2:
+            case CMP_TYPE_FIXEXT4:
+            case CMP_TYPE_FIXEXT8:
+            case CMP_TYPE_FIXEXT16:
+            case CMP_TYPE_EXT8:
+            case CMP_TYPE_EXT16:
+            case CMP_TYPE_EXT32:
+              size++;
+            default:
+              break;
+          }
+
+          skip_bytes(ctx, size);
+        }
+    }
+
+    element_count--;
+
+    switch (cmp_type) {
+      case CMP_TYPE_FIXARRAY:
+      case CMP_TYPE_ARRAY16:
+      case CMP_TYPE_ARRAY32:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+        element_count += size;
+        break;
+      case CMP_TYPE_FIXMAP:
+      case CMP_TYPE_MAP16:
+      case CMP_TYPE_MAP32:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+        element_count += ((size_t)size) * 2;
+        break;
+      default:
+        break;
+    }
+  }
+
+  return true;
+}
+
+bool cmp_skip_object_no_limit(cmp_ctx_t *ctx) {
+  size_t element_count = 1;
+
+  while (element_count) {
+    uint8_t type_marker = 0;
+    uint8_t cmp_type = 0;
+    uint32_t size = 0;
+
+    if (!read_type_marker(ctx, &type_marker)) {
+      return false;
+    }
+
+    if (!type_marker_to_cmp_type(type_marker, &cmp_type)) {
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+    }
+
+    switch (cmp_type) {
+      case CMP_TYPE_FIXARRAY:
+      case CMP_TYPE_ARRAY16:
+      case CMP_TYPE_ARRAY32:
+      case CMP_TYPE_FIXMAP:
+      case CMP_TYPE_MAP16:
+      case CMP_TYPE_MAP32:
+        break;
+      default:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+
+        if (size) {
+          switch (cmp_type) {
+            case CMP_TYPE_FIXEXT1:
+            case CMP_TYPE_FIXEXT2:
+            case CMP_TYPE_FIXEXT4:
+            case CMP_TYPE_FIXEXT8:
+            case CMP_TYPE_FIXEXT16:
+            case CMP_TYPE_EXT8:
+            case CMP_TYPE_EXT16:
+            case CMP_TYPE_EXT32:
+              size++;
+            default:
+              break;
+          }
+
+          skip_bytes(ctx, size);
+        }
+    }
+
+    element_count--;
+
+    switch (cmp_type) {
+      case CMP_TYPE_FIXARRAY:
+      case CMP_TYPE_ARRAY16:
+      case CMP_TYPE_ARRAY32:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+        element_count += size;
+        break;
+      case CMP_TYPE_FIXMAP:
+      case CMP_TYPE_MAP16:
+      case CMP_TYPE_MAP32:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+        element_count += ((size_t)size) * 2;
+        break;
+      default:
+        break;
+    }
+  }
+
   return true;
 }
 
@@ -2524,6 +3025,9 @@ bool cmp_object_as_char(cmp_object_t *obj, int8_t *c) {
         *c = obj->as.s8;
         return true;
       }
+      else {
+        return false;
+      }
     default:
         return false;
   }
@@ -2547,6 +3051,9 @@ bool cmp_object_as_short(cmp_object_t *obj, int16_t *s) {
         *s = obj->as.u16;
         return true;
       }
+      else {
+        return false;
+      }
     default:
         return false;
   }
@@ -2576,6 +3083,9 @@ bool cmp_object_as_int(cmp_object_t *obj, int32_t *i) {
         *i = obj->as.u32;
         return true;
       }
+      else {
+        return false;
+      }
     default:
         return false;
   }
@@ -2611,6 +3121,9 @@ bool cmp_object_as_long(cmp_object_t *obj, int64_t *d) {
         *d = obj->as.u64;
         return true;
       }
+      else {
+        return false;
+      }
     default:
         return false;
   }
@@ -2784,9 +3297,11 @@ bool cmp_object_as_ext(cmp_object_t *obj, int8_t *type, uint32_t *size) {
   }
 }
 
-bool cmp_object_to_str(cmp_ctx_t *ctx, cmp_object_t *obj, char *data, uint32_t buf_size) {
+bool cmp_object_to_str(cmp_ctx_t *ctx, cmp_object_t *obj, char *data,
+                                                          uint32_t buf_size) {
   uint32_t str_size = 0;
-   switch (obj->type) {
+
+  switch (obj->type) {
     case CMP_TYPE_FIXSTR:
     case CMP_TYPE_STR8:
     case CMP_TYPE_STR16:
@@ -2806,12 +3321,14 @@ bool cmp_object_to_str(cmp_ctx_t *ctx, cmp_object_t *obj, char *data, uint32_t b
       return true;
     default:
       return false;
-   }
+  }
 }
 
-bool cmp_object_to_bin(cmp_ctx_t *ctx, cmp_object_t *obj, void *data, uint32_t buf_size) {
+bool cmp_object_to_bin(cmp_ctx_t *ctx, cmp_object_t *obj, void *data,
+                                                          uint32_t buf_size) {
   uint32_t bin_size = 0;
-   switch (obj->type) {
+
+  switch (obj->type) {
     case CMP_TYPE_BIN8:
     case CMP_TYPE_BIN16:
     case CMP_TYPE_BIN32:
@@ -2828,7 +3345,7 @@ bool cmp_object_to_bin(cmp_ctx_t *ctx, cmp_object_t *obj, void *data, uint32_t b
       return true;
     default:
       return false;
-   }
+  }
 }
 
 /* vi: set et ts=2 sw=2: */
diff --git a/debian/modules/nchan/src/store/redis/cmp.h b/debian/modules/nchan/src/store/redis/cmp.h
index 8397588..c78b37b 100644
--- a/debian/modules/nchan/src/store/redis/cmp.h
+++ b/debian/modules/nchan/src/store/redis/cmp.h
@@ -1,7 +1,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2015 Charles Gunyon
+Copyright (c) 2017 Charles Gunyon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,7 @@ THE SOFTWARE.
 struct cmp_ctx_s;
 
 typedef bool   (*cmp_reader)(struct cmp_ctx_s *ctx, void *data, size_t limit);
+typedef bool   (*cmp_skipper)(struct cmp_ctx_s *ctx, size_t count);
 typedef size_t (*cmp_writer)(struct cmp_ctx_s *ctx, const void *data,
                                                     size_t count);
 
@@ -94,10 +95,11 @@ union cmp_object_data_u {
 };
 
 typedef struct cmp_ctx_s {
-  uint8_t     error;
-  void       *buf;
-  cmp_reader  read;
-  cmp_writer  write;
+  uint8_t      error;
+  void        *buf;
+  cmp_reader   read;
+  cmp_skipper  skip;
+  cmp_writer   write;
 } cmp_ctx_t;
 
 typedef struct cmp_object_s {
@@ -115,8 +117,20 @@ extern "C" {
  * ============================================================================
  */
 
-/* Initializes a CMP context */
-void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read, cmp_writer write);
+/*
+ * Initializes a CMP context
+ *
+ * If you don't intend to read, `read` may be NULL, but calling `*read*`
+ * functions will crash; there is no check.
+ *
+ * `skip` may be NULL, in which case skipping functions will use `read`.
+ *
+ * If you don't intend to write, `write` may be NULL, but calling `*write*`
+ * functions will crash; there is no check.
+ */
+void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read,
+                                         cmp_skipper skip,
+                                         cmp_writer write);
 
 /* Returns CMP's version */
 uint32_t cmp_version(void);
@@ -299,6 +313,44 @@ bool cmp_read_ext(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data);
 /* Reads an object from the backend */
 bool cmp_read_object(cmp_ctx_t *ctx, cmp_object_t *obj);
 
+/*
+ * Skips the next object from the backend.  If that object is an array or map,
+ * this function will:
+ *   - If `obj` is not `NULL`, fill in `obj` with that object
+ *   - Set `ctx->error` to `SKIP_DEPTH_LIMIT_EXCEEDED_ERROR`
+ *   - Return `false`
+ * Otherwise:
+ *   - (Don't touch `obj`)
+ *   - Return `true`
+ */
+bool cmp_skip_object(cmp_ctx_t *ctx, cmp_object_t *obj);
+
+/*
+ * This is similar to `cmp_skip_object`, except it tolerates up to `limit`
+ * levels of nesting.  For example, in order to skip an array that contains a
+ * map, call `cmp_skip_object_limit(ctx, &obj, 2)`.  Or in other words,
+ * `cmp_skip_object(ctx, &obj)` acts similarly to `cmp_skip_object_limit(ctx,
+ * &obj, 0)`
+ *
+ * Specifically, `limit` refers to depth, not breadth.  So in order to skip an
+ * array that contains two arrays that each contain 3 strings, you would call
+ * `cmp_skip_object_limit(ctx, &obj, 2).  In order to skip an array that
+ * contains 4 arrays that each contain 1 string, you would still call
+ * `cmp_skip_object_limit(ctx, &obj, 2).
+ */
+bool cmp_skip_object_limit(cmp_ctx_t *ctx, cmp_object_t *obj, uint32_t limit);
+
+/*
+ * This is similar to `cmp_skip_object`, except it will continually skip
+ * nested data structures.
+ *
+ * WARNING: This can cause your application to spend an unbounded amount of
+ *          time reading nested data structures.  Unless you completely trust
+ *          the data source, you should strongly consider `cmp_skip_object` or
+ *          `cmp_skip_object_limit`.
+ */
+bool cmp_skip_object_no_limit(cmp_ctx_t *ctx);
+
 /*
  * ============================================================================
  * === Specific API
diff --git a/debian/modules/nchan/src/store/redis/hiredis/.gitignore b/debian/modules/nchan/src/store/redis/hiredis/.gitignore
new file mode 100644
index 0000000..c44b5c5
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/.gitignore
@@ -0,0 +1,7 @@
+/hiredis-test
+/examples/hiredis-example*
+/*.o
+/*.so
+/*.dylib
+/*.a
+/*.pc
diff --git a/debian/modules/nchan/src/store/redis/hiredis/.travis.yml b/debian/modules/nchan/src/store/redis/hiredis/.travis.yml
new file mode 100644
index 0000000..1e1ce30
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/.travis.yml
@@ -0,0 +1,24 @@
+language: c
+sudo: false
+compiler:
+  - gcc
+  - clang
+
+addons:
+  apt:
+    packages:
+    - libc6-dbg
+    - libc6-dev
+    - libc6:i386
+    - libc6-dev-i386
+    - libc6-dbg:i386
+    - gcc-multilib
+    - valgrind
+
+env:
+    - CFLAGS="-Werror"
+    - PRE="valgrind --track-origins=yes --leak-check=full"
+    - TARGET="32bit" TARGET_VARS="32bit-vars" CFLAGS="-Werror"
+    - TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
+
+script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE" && make $TARGET_VARS hiredis-example
diff --git a/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md b/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md
new file mode 100644
index 0000000..a5015c5
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md
@@ -0,0 +1,110 @@
+### 0.13.3 (2015-09-16)
+
+* Revert "Clear `REDIS_CONNECTED` flag when connection is closed".
+* Make tests pass on FreeBSD (Thanks, Giacomo Olgeni)
+
+
+If the `REDIS_CONNECTED` flag is cleared,
+the async onDisconnect callback function will never be called.
+This causes problems as the disconnect is never reported back to the user.
+
+### 0.13.2 (2015-08-25)
+
+* Prevent crash on pending replies in async code (Thanks, @switch-st)
+* Clear `REDIS_CONNECTED` flag when connection is closed (Thanks, Jerry Jacobs)
+* Add MacOS X addapter (Thanks, @dizzus)
+* Add Qt adapter (Thanks, Pietro Cerutti)
+* Add Ivykis adapter (Thanks, Gergely Nagy)
+
+All adapters are provided as is and are only tested where possible.
+
+### 0.13.1 (2015-05-03)
+
+This is a bug fix release.
+The new `reconnect` method introduced new struct members, which clashed with pre-defined names in pre-C99 code.
+Another commit forced C99 compilation just to make it work, but of course this is not desirable for outside projects.
+Other non-C99 code can now use hiredis as usual again.
+Sorry for the inconvenience.
+
+* Fix memory leak in async reply handling (Salvatore Sanfilippo)
+* Rename struct member to avoid name clash with pre-c99 code (Alex Balashov, ncopa)
+
+### 0.13.0 (2015-04-16)
+
+This release adds a minimal Windows compatibility layer.
+The parser, standalone since v0.12.0, can now be compiled on Windows
+(and thus used in other client libraries as well)
+
+* Windows compatibility layer for parser code (tzickel)
+* Properly escape data printed to PKGCONF file (Dan Skorupski)
+* Fix tests when assert() undefined (Keith Bennett, Matt Stancliff)
+* Implement a reconnect method for the client context, this changes the structure of `redisContext` (Aaron Bedra)
+
+### 0.12.1 (2015-01-26)
+
+* Fix `make install`: DESTDIR support, install all required files, install PKGCONF in proper location
+* Fix `make test` as 32 bit build on 64 bit platform
+
+### 0.12.0 (2015-01-22)
+
+* Add optional KeepAlive support
+
+* Try again on EINTR errors
+
+* Add libuv adapter
+
+* Add IPv6 support
+
+* Remove possiblity of multiple close on same fd
+
+* Add ability to bind source address on connect
+
+* Add redisConnectFd() and redisFreeKeepFd()
+
+* Fix getaddrinfo() memory leak
+
+* Free string if it is unused (fixes memory leak)
+
+* Improve redisAppendCommandArgv performance 2.5x
+
+* Add support for SO_REUSEADDR
+
+* Fix redisvFormatCommand format parsing
+
+* Add GLib 2.0 adapter
+
+* Refactor reading code into read.c
+
+* Fix errno error buffers to not clobber errors
+
+* Generate pkgconf during build
+
+* Silence _BSD_SOURCE warnings
+
+* Improve digit counting for multibulk creation
+
+
+### 0.11.0
+
+* Increase the maximum multi-bulk reply depth to 7.
+
+* Increase the read buffer size from 2k to 16k.
+
+* Use poll(2) instead of select(2) to support large fds (>= 1024).
+
+### 0.10.1
+
+* Makefile overhaul. Important to check out if you override one or more
+  variables using environment variables or via arguments to the "make" tool.
+
+* Issue #45: Fix potential memory leak for a multi bulk reply with 0 elements
+  being created by the default reply object functions.
+
+* Issue #43: Don't crash in an asynchronous context when Redis returns an error
+  reply after the connection has been made (this happens when the maximum
+  number of connections is reached).
+
+### 0.10.0
+
+* See commit log.
+
diff --git a/debian/modules/nchan/src/store/redis/hiredis/COPYING b/debian/modules/nchan/src/store/redis/hiredis/COPYING
new file mode 100644
index 0000000..a5fc973
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/COPYING
@@ -0,0 +1,29 @@
+Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Redis nor the names of its contributors may be used
+  to endorse or promote products derived from this software without specific
+  prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/nchan/src/store/redis/hiredis/Makefile b/debian/modules/nchan/src/store/redis/hiredis/Makefile
new file mode 100644
index 0000000..cff2a84
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/Makefile
@@ -0,0 +1,217 @@
+# Hiredis Makefile
+# Copyright (C) 2010-2011 Salvatore Sanfilippo <antirez at gmail dot com>
+# Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
+# This file is released under the BSD license, see the COPYING file
+
+OBJ=net.o hiredis.o sds.o async.o read.o
+EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib
+TESTS=hiredis-test
+LIBNAME=libhiredis
+PKGCONFNAME=hiredis.pc
+
+HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}')
+HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}')
+HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | awk '{print $$3}')
+HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
+
+# Installation related variables and target
+PREFIX?=/usr/local
+INCLUDE_PATH?=include/hiredis
+LIBRARY_PATH?=lib
+PKGCONF_PATH?=pkgconfig
+INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
+INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
+INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
+
+# redis-server configuration used for testing
+REDIS_PORT=56379
+REDIS_SERVER=redis-server
+define REDIS_TEST_CONFIG
+	daemonize yes
+	pidfile /tmp/hiredis-test-redis.pid
+	port $(REDIS_PORT)
+	bind 127.0.0.1
+	unixsocket /tmp/hiredis-test-redis.sock
+endef
+export REDIS_TEST_CONFIG
+
+# Fallback to gcc when $CC is not in $PATH.
+CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+OPTIMIZATION?=-O3
+WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
+DEBUG?= -g -ggdb
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
+REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
+
+DYLIBSUFFIX=so
+STLIBSUFFIX=a
+DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
+DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
+DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
+DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
+STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
+
+# Platform-specific overrides
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ifeq ($(uname_S),SunOS)
+  REAL_LDFLAGS+= -ldl -lnsl -lsocket
+  DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
+  INSTALL= cp -r
+endif
+ifeq ($(uname_S),Darwin)
+  DYLIBSUFFIX=dylib
+  DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
+  DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+endif
+
+all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
+
+# Deps (use make dep to generate this)
+async.o: async.c fmacros.h async.h hiredis.h read.h sds.h net.h dict.c dict.h
+dict.o: dict.c fmacros.h dict.h
+hiredis.o: hiredis.c fmacros.h hiredis.h read.h sds.h net.h
+net.o: net.c fmacros.h net.h hiredis.h read.h sds.h
+read.o: read.c fmacros.h read.h sds.h
+sds.o: sds.c sds.h
+test.o: test.c fmacros.h hiredis.h read.h sds.h
+
+$(DYLIBNAME): $(OBJ)
+	$(DYLIB_MAKE_CMD) $(OBJ)
+
+$(STLIBNAME): $(OBJ)
+	$(STLIB_MAKE_CMD) $(OBJ)
+
+dynamic: $(DYLIBNAME)
+static: $(STLIBNAME)
+
+# Binaries:
+hiredis-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -levent $(STLIBNAME)
+
+hiredis-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -lev $(STLIBNAME)
+
+hiredis-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) $(shell pkg-config --cflags --libs glib-2.0) -I. $< $(STLIBNAME)
+
+hiredis-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -livykis $(STLIBNAME)
+
+hiredis-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME)
+
+ifndef AE_DIR
+hiredis-example-ae:
+	@echo "Please specify AE_DIR (e.g. <redis repository>/src)"
+	@false
+else
+hiredis-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(AE_DIR) $< $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o $(AE_DIR)/../deps/jemalloc/lib/libjemalloc.a -pthread $(STLIBNAME)
+endif
+
+ifndef LIBUV_DIR
+hiredis-example-libuv:
+	@echo "Please specify LIBUV_DIR (e.g. ../libuv/)"
+	@false
+else
+hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME)
+endif
+
+ifeq ($(and $(QT_MOC),$(QT_INCLUDE_DIR),$(QT_LIBRARY_DIR)),)
+hiredis-example-qt:
+	@echo "Please specify QT_MOC, QT_INCLUDE_DIR AND QT_LIBRARY_DIR"
+	@false
+else
+hiredis-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME)
+	$(QT_MOC) adapters/qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
+	    $(CXX) -x c++ -o qt-adapter-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
+	$(QT_MOC) examples/example-qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
+	    $(CXX) -x c++ -o qt-example-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
+	$(CXX) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore -L$(QT_LIBRARY_DIR) qt-adapter-moc.o qt-example-moc.o $< -pthread $(STLIBNAME) -lQtCore
+endif
+
+hiredis-example: examples/example.c $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< $(STLIBNAME)
+
+examples: $(EXAMPLES)
+
+hiredis-test: test.o $(STLIBNAME)
+
+hiredis-%: %.o $(STLIBNAME)
+	$(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
+
+test: hiredis-test
+	./hiredis-test
+
+check: hiredis-test
+	@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
+	$(PRE) ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
+			( kill `cat /tmp/hiredis-test-redis.pid` && false )
+	kill `cat /tmp/hiredis-test-redis.pid`
+
+.c.o:
+	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
+
+clean:
+	rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
+
+dep:
+	$(CC) -MM *.c
+
+ifeq ($(uname_S),SunOS)
+  INSTALL?= cp -r
+endif
+
+INSTALL?= cp -a
+
+$(PKGCONFNAME): hiredis.h
+	@echo "Generating $@ for pkgconfig..."
+	@echo prefix=$(PREFIX) > $@
+	@echo exec_prefix=\$${prefix} >> $@
+	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
+	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
+	@echo >> $@
+	@echo Name: hiredis >> $@
+	@echo Description: Minimalistic C client library for Redis. >> $@
+	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
+	@echo Libs: -L\$${libdir} -lhiredis >> $@
+	@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
+
+install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
+	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
+	$(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
+	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
+	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
+	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
+	mkdir -p $(INSTALL_PKGCONF_PATH)
+	$(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
+
+32bit:
+	@echo ""
+	@echo "WARNING: if this fails under Linux you probably need to install libc6-dev-i386"
+	@echo ""
+	$(MAKE) CFLAGS="-m32" LDFLAGS="-m32"
+
+32bit-vars:
+	$(eval CFLAGS=-m32)
+	$(eval LDFLAGS=-m32)
+
+gprof:
+	$(MAKE) CFLAGS="-pg" LDFLAGS="-pg"
+
+gcov:
+	$(MAKE) CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs"
+
+coverage: gcov
+	make check
+	mkdir -p tmp/lcov
+	lcov -d . -c -o tmp/lcov/hiredis.info
+	genhtml --legend -o tmp/lcov/report tmp/lcov/hiredis.info
+
+noopt:
+	$(MAKE) OPTIMIZATION=""
+
+.PHONY: all test check clean dep install 32bit 32bit-vars gprof gcov noopt
diff --git a/debian/modules/nchan/src/store/redis/hiredis/README.md b/debian/modules/nchan/src/store/redis/hiredis/README.md
new file mode 100644
index 0000000..4f1a58d
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/README.md
@@ -0,0 +1,392 @@
+[![Build Status](https://travis-ci.org/redis/hiredis.png)](https://travis-ci.org/redis/hiredis)
+
+# HIREDIS
+
+Hiredis is a minimalistic C client library for the [Redis](http://redis.io/) database.
+
+It is minimalistic because it just adds minimal support for the protocol, but
+at the same time it uses a high level printf-alike API in order to make it
+much higher level than otherwise suggested by its minimal code base and the
+lack of explicit bindings for every Redis command.
+
+Apart from supporting sending commands and receiving replies, it comes with
+a reply parser that is decoupled from the I/O layer. It
+is a stream parser designed for easy reusability, which can for instance be used
+in higher level language bindings for efficient reply parsing.
+
+Hiredis only supports the binary-safe Redis protocol, so you can use it with any
+Redis version >= 1.2.0.
+
+The library comes with multiple APIs. There is the
+*synchronous API*, the *asynchronous API* and the *reply parsing API*.
+
+## UPGRADING
+
+Version 0.9.0 is a major overhaul of hiredis in every aspect. However, upgrading existing
+code using hiredis should not be a big pain. The key thing to keep in mind when
+upgrading is that hiredis >= 0.9.0 uses a `redisContext*` to keep state, in contrast to
+the stateless 0.0.1 that only has a file descriptor to work with.
+
+## Synchronous API
+
+To consume the synchronous API, there are only a few function calls that need to be introduced:
+
+```c
+redisContext *redisConnect(const char *ip, int port);
+void *redisCommand(redisContext *c, const char *format, ...);
+void freeReplyObject(void *reply);
+```
+
+### Connecting
+
+The function `redisConnect` is used to create a so-called `redisContext`. The
+context is where Hiredis holds state for a connection. The `redisContext`
+struct has an integer `err` field that is non-zero when the connection is in
+an error state. The field `errstr` will contain a string with a description of
+the error. More information on errors can be found in the **Errors** section.
+After trying to connect to Redis using `redisConnect` you should
+check the `err` field to see if establishing the connection was successful:
+```c
+redisContext *c = redisConnect("127.0.0.1", 6379);
+if (c != NULL && c->err) {
+    printf("Error: %s\n", c->errstr);
+    // handle error
+}
+```
+
+### Sending commands
+
+There are several ways to issue commands to Redis. The first that will be introduced is
+`redisCommand`. This function takes a format similar to printf. In the simplest form,
+it is used like this:
+```c
+reply = redisCommand(context, "SET foo bar");
+```
+
+The specifier `%s` interpolates a string in the command, and uses `strlen` to
+determine the length of the string:
+```c
+reply = redisCommand(context, "SET foo %s", value);
+```
+When you need to pass binary safe strings in a command, the `%b` specifier can be
+used. Together with a pointer to the string, it requires a `size_t` length argument
+of the string:
+```c
+reply = redisCommand(context, "SET foo %b", value, (size_t) valuelen);
+```
+Internally, Hiredis splits the command in different arguments and will
+convert it to the protocol used to communicate with Redis.
+One or more spaces separates arguments, so you can use the specifiers
+anywhere in an argument:
+```c
+reply = redisCommand(context, "SET key:%s %s", myid, value);
+```
+
+### Using replies
+
+The return value of `redisCommand` holds a reply when the command was
+successfully executed. When an error occurs, the return value is `NULL` and
+the `err` field in the context will be set (see section on **Errors**).
+Once an error is returned the context cannot be reused and you should set up
+a new connection.
+
+The standard replies that `redisCommand` are of the type `redisReply`. The
+`type` field in the `redisReply` should be used to test what kind of reply
+was received:
+
+* **`REDIS_REPLY_STATUS`**:
+    * The command replied with a status reply. The status string can be accessed using `reply->str`.
+      The length of this string can be accessed using `reply->len`.
+
+* **`REDIS_REPLY_ERROR`**:
+    *  The command replied with an error. The error string can be accessed identical to `REDIS_REPLY_STATUS`.
+
+* **`REDIS_REPLY_INTEGER`**:
+    * The command replied with an integer. The integer value can be accessed using the
+      `reply->integer` field of type `long long`.
+
+* **`REDIS_REPLY_NIL`**:
+    * The command replied with a **nil** object. There is no data to access.
+
+* **`REDIS_REPLY_STRING`**:
+    * A bulk (string) reply. The value of the reply can be accessed using `reply->str`.
+      The length of this string can be accessed using `reply->len`.
+
+* **`REDIS_REPLY_ARRAY`**:
+    * A multi bulk reply. The number of elements in the multi bulk reply is stored in
+      `reply->elements`. Every element in the multi bulk reply is a `redisReply` object as well
+      and can be accessed via `reply->element[..index..]`.
+      Redis may reply with nested arrays but this is fully supported.
+
+Replies should be freed using the `freeReplyObject()` function.
+Note that this function will take care of freeing sub-reply objects
+contained in arrays and nested arrays, so there is no need for the user to
+free the sub replies (it is actually harmful and will corrupt the memory).
+
+**Important:** the current version of hiredis (0.10.0) frees replies when the
+asynchronous API is used. This means you should not call `freeReplyObject` when
+you use this API. The reply is cleaned up by hiredis _after_ the callback
+returns. This behavior will probably change in future releases, so make sure to
+keep an eye on the changelog when upgrading (see issue #39).
+
+### Cleaning up
+
+To disconnect and free the context the following function can be used:
+```c
+void redisFree(redisContext *c);
+```
+This function immediately closes the socket and then frees the allocations done in
+creating the context.
+
+### Sending commands (cont'd)
+
+Together with `redisCommand`, the function `redisCommandArgv` can be used to issue commands.
+It has the following prototype:
+```c
+void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+```
+It takes the number of arguments `argc`, an array of strings `argv` and the lengths of the
+arguments `argvlen`. For convenience, `argvlen` may be set to `NULL` and the function will
+use `strlen(3)` on every argument to determine its length. Obviously, when any of the arguments
+need to be binary safe, the entire array of lengths `argvlen` should be provided.
+
+The return value has the same semantic as `redisCommand`.
+
+### Pipelining
+
+To explain how Hiredis supports pipelining in a blocking connection, there needs to be
+understanding of the internal execution flow.
+
+When any of the functions in the `redisCommand` family is called, Hiredis first formats the
+command according to the Redis protocol. The formatted command is then put in the output buffer
+of the context. This output buffer is dynamic, so it can hold any number of commands.
+After the command is put in the output buffer, `redisGetReply` is called. This function has the
+following two execution paths:
+
+1. The input buffer is non-empty:
+    * Try to parse a single reply from the input buffer and return it
+    * If no reply could be parsed, continue at *2*
+2. The input buffer is empty:
+    * Write the **entire** output buffer to the socket
+    * Read from the socket until a single reply could be parsed
+
+The function `redisGetReply` is exported as part of the Hiredis API and can be used when a reply
+is expected on the socket. To pipeline commands, the only things that needs to be done is
+filling up the output buffer. For this cause, two commands can be used that are identical
+to the `redisCommand` family, apart from not returning a reply:
+```c
+void redisAppendCommand(redisContext *c, const char *format, ...);
+void redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+```
+After calling either function one or more times, `redisGetReply` can be used to receive the
+subsequent replies. The return value for this function is either `REDIS_OK` or `REDIS_ERR`, where
+the latter means an error occurred while reading a reply. Just as with the other commands,
+the `err` field in the context can be used to find out what the cause of this error is.
+
+The following examples shows a simple pipeline (resulting in only a single call to `write(2)` and
+a single call to `read(2)`):
+```c
+redisReply *reply;
+redisAppendCommand(context,"SET foo bar");
+redisAppendCommand(context,"GET foo");
+redisGetReply(context,&reply); // reply for SET
+freeReplyObject(reply);
+redisGetReply(context,&reply); // reply for GET
+freeReplyObject(reply);
+```
+This API can also be used to implement a blocking subscriber:
+```c
+reply = redisCommand(context,"SUBSCRIBE foo");
+freeReplyObject(reply);
+while(redisGetReply(context,&reply) == REDIS_OK) {
+    // consume message
+    freeReplyObject(reply);
+}
+```
+### Errors
+
+When a function call is not successful, depending on the function either `NULL` or `REDIS_ERR` is
+returned. The `err` field inside the context will be non-zero and set to one of the
+following constants:
+
+* **`REDIS_ERR_IO`**:
+    There was an I/O error while creating the connection, trying to write
+    to the socket or read from the socket. If you included `errno.h` in your
+    application, you can use the global `errno` variable to find out what is
+    wrong.
+
+* **`REDIS_ERR_EOF`**:
+    The server closed the connection which resulted in an empty read.
+
+* **`REDIS_ERR_PROTOCOL`**:
+    There was an error while parsing the protocol.
+
+* **`REDIS_ERR_OTHER`**:
+    Any other error. Currently, it is only used when a specified hostname to connect
+    to cannot be resolved.
+
+In every case, the `errstr` field in the context will be set to hold a string representation
+of the error.
+
+## Asynchronous API
+
+Hiredis comes with an asynchronous API that works easily with any event library.
+Examples are bundled that show using Hiredis with [libev](http://software.schmorp.de/pkg/libev.html)
+and [libevent](http://monkey.org/~provos/libevent/).
+
+### Connecting
+
+The function `redisAsyncConnect` can be used to establish a non-blocking connection to
+Redis. It returns a pointer to the newly created `redisAsyncContext` struct. The `err` field
+should be checked after creation to see if there were errors creating the connection.
+Because the connection that will be created is non-blocking, the kernel is not able to
+instantly return if the specified host and port is able to accept a connection.
+```c
+redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+if (c->err) {
+    printf("Error: %s\n", c->errstr);
+    // handle error
+}
+```
+
+The asynchronous context can hold a disconnect callback function that is called when the
+connection is disconnected (either because of an error or per user request). This function should
+have the following prototype:
+```c
+void(const redisAsyncContext *c, int status);
+```
+On a disconnect, the `status` argument is set to `REDIS_OK` when disconnection was initiated by the
+user, or `REDIS_ERR` when the disconnection was caused by an error. When it is `REDIS_ERR`, the `err`
+field in the context can be accessed to find out the cause of the error.
+
+The context object is always freed after the disconnect callback fired. When a reconnect is needed,
+the disconnect callback is a good point to do so.
+
+Setting the disconnect callback can only be done once per context. For subsequent calls it will
+return `REDIS_ERR`. The function to set the disconnect callback has the following prototype:
+```c
+int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
+```
+### Sending commands and their callbacks
+
+In an asynchronous context, commands are automatically pipelined due to the nature of an event loop.
+Therefore, unlike the synchronous API, there is only a single way to send commands.
+Because commands are sent to Redis asynchronously, issuing a command requires a callback function
+that is called when the reply is received. Reply callbacks should have the following prototype:
+```c
+void(redisAsyncContext *c, void *reply, void *privdata);
+```
+The `privdata` argument can be used to curry arbitrary data to the callback from the point where
+the command is initially queued for execution.
+
+The functions that can be used to issue commands in an asynchronous context are:
+```c
+int redisAsyncCommand(
+  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
+  const char *format, ...);
+int redisAsyncCommandArgv(
+  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
+  int argc, const char **argv, const size_t *argvlen);
+```
+Both functions work like their blocking counterparts. The return value is `REDIS_OK` when the command
+was successfully added to the output buffer and `REDIS_ERR` otherwise. Example: when the connection
+is being disconnected per user-request, no new commands may be added to the output buffer and `REDIS_ERR` is
+returned on calls to the `redisAsyncCommand` family.
+
+If the reply for a command with a `NULL` callback is read, it is immediately freed. When the callback
+for a command is non-`NULL`, the memory is freed immediately following the callback: the reply is only
+valid for the duration of the callback.
+
+All pending callbacks are called with a `NULL` reply when the context encountered an error.
+
+### Disconnecting
+
+An asynchronous connection can be terminated using:
+```c
+void redisAsyncDisconnect(redisAsyncContext *ac);
+```
+When this function is called, the connection is **not** immediately terminated. Instead, new
+commands are no longer accepted and the connection is only terminated when all pending commands
+have been written to the socket, their respective replies have been read and their respective
+callbacks have been executed. After this, the disconnection callback is executed with the
+`REDIS_OK` status and the context object is freed.
+
+### Hooking it up to event library *X*
+
+There are a few hooks that need to be set on the context object after it is created.
+See the `adapters/` directory for bindings to *libev* and *libevent*.
+
+## Reply parsing API
+
+Hiredis comes with a reply parsing API that makes it easy for writing higher
+level language bindings.
+
+The reply parsing API consists of the following functions:
+```c
+redisReader *redisReaderCreate(void);
+void redisReaderFree(redisReader *reader);
+int redisReaderFeed(redisReader *reader, const char *buf, size_t len);
+int redisReaderGetReply(redisReader *reader, void **reply);
+```
+The same set of functions are used internally by hiredis when creating a
+normal Redis context, the above API just exposes it to the user for a direct
+usage.
+
+### Usage
+
+The function `redisReaderCreate` creates a `redisReader` structure that holds a
+buffer with unparsed data and state for the protocol parser.
+
+Incoming data -- most likely from a socket -- can be placed in the internal
+buffer of the `redisReader` using `redisReaderFeed`. This function will make a
+copy of the buffer pointed to by `buf` for `len` bytes. This data is parsed
+when `redisReaderGetReply` is called. This function returns an integer status
+and a reply object (as described above) via `void **reply`. The returned status
+can be either `REDIS_OK` or `REDIS_ERR`, where the latter means something went
+wrong (either a protocol error, or an out of memory error).
+
+The parser limits the level of nesting for multi bulk payloads to 7. If the
+multi bulk nesting level is higher than this, the parser returns an error.
+
+### Customizing replies
+
+The function `redisReaderGetReply` creates `redisReply` and makes the function
+argument `reply` point to the created `redisReply` variable. For instance, if
+the response of type `REDIS_REPLY_STATUS` then the `str` field of `redisReply`
+will hold the status as a vanilla C string. However, the functions that are
+responsible for creating instances of the `redisReply` can be customized by
+setting the `fn` field on the `redisReader` struct. This should be done
+immediately after creating the `redisReader`.
+
+For example, [hiredis-rb](https://github.com/pietern/hiredis-rb/blob/master/ext/hiredis_ext/reader.c)
+uses customized reply object functions to create Ruby objects.
+
+### Reader max buffer
+
+Both when using the Reader API directly or when using it indirectly via a
+normal Redis context, the redisReader structure uses a buffer in order to
+accumulate data from the server.
+Usually this buffer is destroyed when it is empty and is larger than 16
+KiB in order to avoid wasting memory in unused buffers
+
+However when working with very big payloads destroying the buffer may slow
+down performances considerably, so it is possible to modify the max size of
+an idle buffer changing the value of the `maxbuf` field of the reader structure
+to the desired value. The special value of 0 means that there is no maximum
+value for an idle buffer, so the buffer will never get freed.
+
+For instance if you have a normal Redis context you can set the maximum idle
+buffer to zero (unlimited) just with:
+```c
+context->reader->maxbuf = 0;
+```
+This should be done only in order to maximize performances when working with
+large payloads. The context should be set back to `REDIS_READER_MAX_BUF` again
+as soon as possible in order to prevent allocation of useless memory.
+
+## AUTHORS
+
+Hiredis was written by Salvatore Sanfilippo (antirez at gmail) and
+Pieter Noordhuis (pcnoordhuis at gmail) and is released under the BSD license.  
+Hiredis is currently maintained by Matt Stancliff (matt at genges dot com) and
+Jan-Erik Rediger (janerik at fnordig dot com)
diff --git a/debian/modules/nchan/src/store/redis/hiredis/adapters/ae.h b/debian/modules/nchan/src/store/redis/hiredis/adapters/ae.h
new file mode 100644
index 0000000..5c551c2
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/adapters/ae.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_AE_H__
+#define __HIREDIS_AE_H__
+#include <sys/types.h>
+#include <ae.h>
+#include "../hiredis.h"
+#include "../async.h"
+
+typedef struct redisAeEvents {
+    redisAsyncContext *context;
+    aeEventLoop *loop;
+    int fd;
+    int reading, writing;
+} redisAeEvents;
+
+static void redisAeReadEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
+    ((void)el); ((void)fd); ((void)mask);
+
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    redisAsyncHandleRead(e->context);
+}
+
+static void redisAeWriteEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
+    ((void)el); ((void)fd); ((void)mask);
+
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    redisAsyncHandleWrite(e->context);
+}
+
+static void redisAeAddRead(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    aeEventLoop *loop = e->loop;
+    if (!e->reading) {
+        e->reading = 1;
+        aeCreateFileEvent(loop,e->fd,AE_READABLE,redisAeReadEvent,e);
+    }
+}
+
+static void redisAeDelRead(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    aeEventLoop *loop = e->loop;
+    if (e->reading) {
+        e->reading = 0;
+        aeDeleteFileEvent(loop,e->fd,AE_READABLE);
+    }
+}
+
+static void redisAeAddWrite(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    aeEventLoop *loop = e->loop;
+    if (!e->writing) {
+        e->writing = 1;
+        aeCreateFileEvent(loop,e->fd,AE_WRITABLE,redisAeWriteEvent,e);
+    }
+}
+
+static void redisAeDelWrite(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    aeEventLoop *loop = e->loop;
+    if (e->writing) {
+        e->writing = 0;
+        aeDeleteFileEvent(loop,e->fd,AE_WRITABLE);
+    }
+}
+
+static void redisAeCleanup(void *privdata) {
+    redisAeEvents *e = (redisAeEvents*)privdata;
+    redisAeDelRead(privdata);
+    redisAeDelWrite(privdata);
+    free(e);
+}
+
+static int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisAeEvents *e;
+
+    /* Nothing should be attached when something is already attached */
+    if (ac->ev.data != NULL)
+        return REDIS_ERR;
+
+    /* Create container for context and r/w events */
+    e = (redisAeEvents*)malloc(sizeof(*e));
+    e->context = ac;
+    e->loop = loop;
+    e->fd = c->fd;
+    e->reading = e->writing = 0;
+
+    /* Register functions to start/stop listening for events */
+    ac->ev.addRead = redisAeAddRead;
+    ac->ev.delRead = redisAeDelRead;
+    ac->ev.addWrite = redisAeAddWrite;
+    ac->ev.delWrite = redisAeDelWrite;
+    ac->ev.cleanup = redisAeCleanup;
+    ac->ev.data = e;
+
+    return REDIS_OK;
+}
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/adapters/libev.h b/debian/modules/nchan/src/store/redis/hiredis/adapters/libev.h
new file mode 100644
index 0000000..2bf8d52
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/adapters/libev.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_LIBEV_H__
+#define __HIREDIS_LIBEV_H__
+#include <stdlib.h>
+#include <sys/types.h>
+#include <ev.h>
+#include "../hiredis.h"
+#include "../async.h"
+
+typedef struct redisLibevEvents {
+    redisAsyncContext *context;
+    struct ev_loop *loop;
+    int reading, writing;
+    ev_io rev, wev;
+} redisLibevEvents;
+
+static void redisLibevReadEvent(EV_P_ ev_io *watcher, int revents) {
+#if EV_MULTIPLICITY
+    ((void)loop);
+#endif
+    ((void)revents);
+
+    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
+    redisAsyncHandleRead(e->context);
+}
+
+static void redisLibevWriteEvent(EV_P_ ev_io *watcher, int revents) {
+#if EV_MULTIPLICITY
+    ((void)loop);
+#endif
+    ((void)revents);
+
+    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
+    redisAsyncHandleWrite(e->context);
+}
+
+static void redisLibevAddRead(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);
+    if (!e->reading) {
+        e->reading = 1;
+        ev_io_start(EV_A_ &e->rev);
+    }
+}
+
+static void redisLibevDelRead(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);
+    if (e->reading) {
+        e->reading = 0;
+        ev_io_stop(EV_A_ &e->rev);
+    }
+}
+
+static void redisLibevAddWrite(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);
+    if (!e->writing) {
+        e->writing = 1;
+        ev_io_start(EV_A_ &e->wev);
+    }
+}
+
+static void redisLibevDelWrite(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);
+    if (e->writing) {
+        e->writing = 0;
+        ev_io_stop(EV_A_ &e->wev);
+    }
+}
+
+static void redisLibevCleanup(void *privdata) {
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    redisLibevDelRead(privdata);
+    redisLibevDelWrite(privdata);
+    free(e);
+}
+
+static int redisLibevAttach(EV_P_ redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisLibevEvents *e;
+
+    /* Nothing should be attached when something is already attached */
+    if (ac->ev.data != NULL)
+        return REDIS_ERR;
+
+    /* Create container for context and r/w events */
+    e = (redisLibevEvents*)malloc(sizeof(*e));
+    e->context = ac;
+#if EV_MULTIPLICITY
+    e->loop = loop;
+#else
+    e->loop = NULL;
+#endif
+    e->reading = e->writing = 0;
+    e->rev.data = e;
+    e->wev.data = e;
+
+    /* Register functions to start/stop listening for events */
+    ac->ev.addRead = redisLibevAddRead;
+    ac->ev.delRead = redisLibevDelRead;
+    ac->ev.addWrite = redisLibevAddWrite;
+    ac->ev.delWrite = redisLibevDelWrite;
+    ac->ev.cleanup = redisLibevCleanup;
+    ac->ev.data = e;
+
+    /* Initialize read/write events */
+    ev_io_init(&e->rev,redisLibevReadEvent,c->fd,EV_READ);
+    ev_io_init(&e->wev,redisLibevWriteEvent,c->fd,EV_WRITE);
+    return REDIS_OK;
+}
+
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/adapters/libevent.h b/debian/modules/nchan/src/store/redis/hiredis/adapters/libevent.h
new file mode 100644
index 0000000..1c2b271
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/adapters/libevent.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_LIBEVENT_H__
+#define __HIREDIS_LIBEVENT_H__
+#include <event.h>
+#include "../hiredis.h"
+#include "../async.h"
+
+typedef struct redisLibeventEvents {
+    redisAsyncContext *context;
+    struct event rev, wev;
+} redisLibeventEvents;
+
+static void redisLibeventReadEvent(int fd, short event, void *arg) {
+    ((void)fd); ((void)event);
+    redisLibeventEvents *e = (redisLibeventEvents*)arg;
+    redisAsyncHandleRead(e->context);
+}
+
+static void redisLibeventWriteEvent(int fd, short event, void *arg) {
+    ((void)fd); ((void)event);
+    redisLibeventEvents *e = (redisLibeventEvents*)arg;
+    redisAsyncHandleWrite(e->context);
+}
+
+static void redisLibeventAddRead(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_add(&e->rev,NULL);
+}
+
+static void redisLibeventDelRead(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_del(&e->rev);
+}
+
+static void redisLibeventAddWrite(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_add(&e->wev,NULL);
+}
+
+static void redisLibeventDelWrite(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_del(&e->wev);
+}
+
+static void redisLibeventCleanup(void *privdata) {
+    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
+    event_del(&e->rev);
+    event_del(&e->wev);
+    free(e);
+}
+
+static int redisLibeventAttach(redisAsyncContext *ac, struct event_base *base) {
+    redisContext *c = &(ac->c);
+    redisLibeventEvents *e;
+
+    /* Nothing should be attached when something is already attached */
+    if (ac->ev.data != NULL)
+        return REDIS_ERR;
+
+    /* Create container for context and r/w events */
+    e = (redisLibeventEvents*)malloc(sizeof(*e));
+    e->context = ac;
+
+    /* Register functions to start/stop listening for events */
+    ac->ev.addRead = redisLibeventAddRead;
+    ac->ev.delRead = redisLibeventDelRead;
+    ac->ev.addWrite = redisLibeventAddWrite;
+    ac->ev.delWrite = redisLibeventDelWrite;
+    ac->ev.cleanup = redisLibeventCleanup;
+    ac->ev.data = e;
+
+    /* Initialize and install read/write events */
+    event_set(&e->rev,c->fd,EV_READ,redisLibeventReadEvent,e);
+    event_set(&e->wev,c->fd,EV_WRITE,redisLibeventWriteEvent,e);
+    event_base_set(base,&e->rev);
+    event_base_set(base,&e->wev);
+    return REDIS_OK;
+}
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/adapters/libuv.h b/debian/modules/nchan/src/store/redis/hiredis/adapters/libuv.h
new file mode 100644
index 0000000..3cdf3d3
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/adapters/libuv.h
@@ -0,0 +1,121 @@
+#ifndef __HIREDIS_LIBUV_H__
+#define __HIREDIS_LIBUV_H__
+#include <stdlib.h>
+#include <uv.h>
+#include "../hiredis.h"
+#include "../async.h"
+#include <string.h>
+
+typedef struct redisLibuvEvents {
+  redisAsyncContext* context;
+  uv_poll_t          handle;
+  int                events;
+} redisLibuvEvents;
+
+
+static void redisLibuvPoll(uv_poll_t* handle, int status, int events) {
+  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
+
+  if (status != 0) {
+    return;
+  }
+
+  if (events & UV_READABLE) {
+    redisAsyncHandleRead(p->context);
+  }
+  if (events & UV_WRITABLE) {
+    redisAsyncHandleWrite(p->context);
+  }
+}
+
+
+static void redisLibuvAddRead(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  p->events |= UV_READABLE;
+
+  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
+}
+
+
+static void redisLibuvDelRead(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  p->events &= ~UV_READABLE;
+
+  if (p->events) {
+    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
+  } else {
+    uv_poll_stop(&p->handle);
+  }
+}
+
+
+static void redisLibuvAddWrite(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  p->events |= UV_WRITABLE;
+
+  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
+}
+
+
+static void redisLibuvDelWrite(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  p->events &= ~UV_WRITABLE;
+
+  if (p->events) {
+    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
+  } else {
+    uv_poll_stop(&p->handle);
+  }
+}
+
+
+static void on_close(uv_handle_t* handle) {
+  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
+
+  free(p);
+}
+
+
+static void redisLibuvCleanup(void *privdata) {
+  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
+
+  uv_close((uv_handle_t*)&p->handle, on_close);
+}
+
+
+static int redisLibuvAttach(redisAsyncContext* ac, uv_loop_t* loop) {
+  redisContext *c = &(ac->c);
+
+  if (ac->ev.data != NULL) {
+    return REDIS_ERR;
+  }
+
+  ac->ev.addRead  = redisLibuvAddRead;
+  ac->ev.delRead  = redisLibuvDelRead;
+  ac->ev.addWrite = redisLibuvAddWrite;
+  ac->ev.delWrite = redisLibuvDelWrite;
+  ac->ev.cleanup  = redisLibuvCleanup;
+
+  redisLibuvEvents* p = (redisLibuvEvents*)malloc(sizeof(*p));
+
+  if (!p) {
+    return REDIS_ERR;
+  }
+
+  memset(p, 0, sizeof(*p));
+
+  if (uv_poll_init(loop, &p->handle, c->fd) != 0) {
+    return REDIS_ERR;
+  }
+
+  ac->ev.data    = p;
+  p->handle.data = p;
+  p->context     = ac;
+
+  return REDIS_OK;
+}
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/async.c b/debian/modules/nchan/src/store/redis/hiredis/async.c
new file mode 100644
index 0000000..d955203
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/async.c
@@ -0,0 +1,687 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include "async.h"
+#include "net.h"
+#include "dict.c"
+#include "sds.h"
+
+#define _EL_ADD_READ(ctx) do { \
+        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
+    } while(0)
+#define _EL_DEL_READ(ctx) do { \
+        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
+    } while(0)
+#define _EL_ADD_WRITE(ctx) do { \
+        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
+    } while(0)
+#define _EL_DEL_WRITE(ctx) do { \
+        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
+    } while(0)
+#define _EL_CLEANUP(ctx) do { \
+        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
+    } while(0);
+
+/* Forward declaration of function in hiredis.c */
+int __redisAppendCommand(redisContext *c, const char *cmd, size_t len);
+
+/* Functions managing dictionary of callbacks for pub/sub. */
+static unsigned int callbackHash(const void *key) {
+    return dictGenHashFunction((const unsigned char *)key,
+                               sdslen((const sds)key));
+}
+
+static void *callbackValDup(void *privdata, const void *src) {
+    ((void) privdata);
+    redisCallback *dup = malloc(sizeof(*dup));
+    memcpy(dup,src,sizeof(*dup));
+    return dup;
+}
+
+static int callbackKeyCompare(void *privdata, const void *key1, const void *key2) {
+    int l1, l2;
+    ((void) privdata);
+
+    l1 = sdslen((const sds)key1);
+    l2 = sdslen((const sds)key2);
+    if (l1 != l2) return 0;
+    return memcmp(key1,key2,l1) == 0;
+}
+
+static void callbackKeyDestructor(void *privdata, void *key) {
+    ((void) privdata);
+    sdsfree((sds)key);
+}
+
+static void callbackValDestructor(void *privdata, void *val) {
+    ((void) privdata);
+    free(val);
+}
+
+static dictType callbackDict = {
+    callbackHash,
+    NULL,
+    callbackValDup,
+    callbackKeyCompare,
+    callbackKeyDestructor,
+    callbackValDestructor
+};
+
+static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
+    redisAsyncContext *ac;
+
+    ac = realloc(c,sizeof(redisAsyncContext));
+    if (ac == NULL)
+        return NULL;
+
+    c = &(ac->c);
+
+    /* The regular connect functions will always set the flag REDIS_CONNECTED.
+     * For the async API, we want to wait until the first write event is
+     * received up before setting this flag, so reset it here. */
+    c->flags &= ~REDIS_CONNECTED;
+
+    ac->err = 0;
+    ac->errstr = NULL;
+    ac->data = NULL;
+
+    ac->ev.data = NULL;
+    ac->ev.addRead = NULL;
+    ac->ev.delRead = NULL;
+    ac->ev.addWrite = NULL;
+    ac->ev.delWrite = NULL;
+    ac->ev.cleanup = NULL;
+
+    ac->onConnect = NULL;
+    ac->onDisconnect = NULL;
+
+    ac->replies.head = NULL;
+    ac->replies.tail = NULL;
+    ac->sub.invalid.head = NULL;
+    ac->sub.invalid.tail = NULL;
+    ac->sub.channels = dictCreate(&callbackDict,NULL);
+    ac->sub.patterns = dictCreate(&callbackDict,NULL);
+    return ac;
+}
+
+/* We want the error field to be accessible directly instead of requiring
+ * an indirection to the redisContext struct. */
+static void __redisAsyncCopyError(redisAsyncContext *ac) {
+    if (!ac)
+        return;
+
+    redisContext *c = &(ac->c);
+    ac->err = c->err;
+    ac->errstr = c->errstr;
+}
+
+redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
+    redisContext *c;
+    redisAsyncContext *ac;
+
+    c = redisConnectNonBlock(ip,port);
+    if (c == NULL)
+        return NULL;
+
+    ac = redisAsyncInitialize(c);
+    if (ac == NULL) {
+        redisFree(c);
+        return NULL;
+    }
+
+    __redisAsyncCopyError(ac);
+    return ac;
+}
+
+redisAsyncContext *redisAsyncConnectBind(const char *ip, int port,
+                                         const char *source_addr) {
+    redisContext *c = redisConnectBindNonBlock(ip,port,source_addr);
+    redisAsyncContext *ac = redisAsyncInitialize(c);
+    __redisAsyncCopyError(ac);
+    return ac;
+}
+
+redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
+                                                  const char *source_addr) {
+    redisContext *c = redisConnectBindNonBlockWithReuse(ip,port,source_addr);
+    redisAsyncContext *ac = redisAsyncInitialize(c);
+    __redisAsyncCopyError(ac);
+    return ac;
+}
+
+redisAsyncContext *redisAsyncConnectUnix(const char *path) {
+    redisContext *c;
+    redisAsyncContext *ac;
+
+    c = redisConnectUnixNonBlock(path);
+    if (c == NULL)
+        return NULL;
+
+    ac = redisAsyncInitialize(c);
+    if (ac == NULL) {
+        redisFree(c);
+        return NULL;
+    }
+
+    __redisAsyncCopyError(ac);
+    return ac;
+}
+
+int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn) {
+    if (ac->onConnect == NULL) {
+        ac->onConnect = fn;
+
+        /* The common way to detect an established connection is to wait for
+         * the first write event to be fired. This assumes the related event
+         * library functions are already set. */
+        _EL_ADD_WRITE(ac);
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
+int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn) {
+    if (ac->onDisconnect == NULL) {
+        ac->onDisconnect = fn;
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
+/* Helper functions to push/shift callbacks */
+static int __redisPushCallback(redisCallbackList *list, redisCallback *source) {
+    redisCallback *cb;
+
+    /* Copy callback from stack to heap */
+    cb = malloc(sizeof(*cb));
+    if (cb == NULL)
+        return REDIS_ERR_OOM;
+
+    if (source != NULL) {
+        memcpy(cb,source,sizeof(*cb));
+        cb->next = NULL;
+    }
+
+    /* Store callback in list */
+    if (list->head == NULL)
+        list->head = cb;
+    if (list->tail != NULL)
+        list->tail->next = cb;
+    list->tail = cb;
+    return REDIS_OK;
+}
+
+static int __redisShiftCallback(redisCallbackList *list, redisCallback *target) {
+    redisCallback *cb = list->head;
+    if (cb != NULL) {
+        list->head = cb->next;
+        if (cb == list->tail)
+            list->tail = NULL;
+
+        /* Copy callback from heap to stack */
+        if (target != NULL)
+            memcpy(target,cb,sizeof(*cb));
+        free(cb);
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
+static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisReply *reply) {
+    redisContext *c = &(ac->c);
+    if (cb->fn != NULL) {
+        c->flags |= REDIS_IN_CALLBACK;
+        cb->fn(ac,reply,cb->privdata);
+        c->flags &= ~REDIS_IN_CALLBACK;
+    }
+}
+
+/* Helper function to free the context. */
+static void __redisAsyncFree(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisCallback cb;
+    dictIterator *it;
+    dictEntry *de;
+
+    /* Execute pending callbacks with NULL reply. */
+    while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK)
+        __redisRunCallback(ac,&cb,NULL);
+
+    /* Execute callbacks for invalid commands */
+    while (__redisShiftCallback(&ac->sub.invalid,&cb) == REDIS_OK)
+        __redisRunCallback(ac,&cb,NULL);
+
+    /* Run subscription callbacks callbacks with NULL reply */
+    it = dictGetIterator(ac->sub.channels);
+    while ((de = dictNext(it)) != NULL)
+        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
+    dictReleaseIterator(it);
+    dictRelease(ac->sub.channels);
+
+    it = dictGetIterator(ac->sub.patterns);
+    while ((de = dictNext(it)) != NULL)
+        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
+    dictReleaseIterator(it);
+    dictRelease(ac->sub.patterns);
+
+    /* Signal event lib to clean up */
+    _EL_CLEANUP(ac);
+
+    /* Execute disconnect callback. When redisAsyncFree() initiated destroying
+     * this context, the status will always be REDIS_OK. */
+    if (ac->onDisconnect && (c->flags & REDIS_CONNECTED)) {
+        if (c->flags & REDIS_FREEING) {
+            ac->onDisconnect(ac,REDIS_OK);
+        } else {
+            ac->onDisconnect(ac,(ac->err == 0) ? REDIS_OK : REDIS_ERR);
+        }
+    }
+
+    /* Cleanup self */
+    redisFree(c);
+}
+
+/* Free the async context. When this function is called from a callback,
+ * control needs to be returned to redisProcessCallbacks() before actual
+ * free'ing. To do so, a flag is set on the context which is picked up by
+ * redisProcessCallbacks(). Otherwise, the context is immediately free'd. */
+void redisAsyncFree(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    c->flags |= REDIS_FREEING;
+    if (!(c->flags & REDIS_IN_CALLBACK))
+        __redisAsyncFree(ac);
+}
+
+/* Helper function to make the disconnect happen and clean up. */
+static void __redisAsyncDisconnect(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    /* Make sure error is accessible if there is any */
+    __redisAsyncCopyError(ac);
+
+    if (ac->err == 0) {
+        /* For clean disconnects, there should be no pending callbacks. */
+        assert(__redisShiftCallback(&ac->replies,NULL) == REDIS_ERR);
+    } else {
+        /* Disconnection is caused by an error, make sure that pending
+         * callbacks cannot call new commands. */
+        c->flags |= REDIS_DISCONNECTING;
+    }
+
+    /* For non-clean disconnects, __redisAsyncFree() will execute pending
+     * callbacks with a NULL-reply. */
+    __redisAsyncFree(ac);
+}
+
+/* Tries to do a clean disconnect from Redis, meaning it stops new commands
+ * from being issued, but tries to flush the output buffer and execute
+ * callbacks for all remaining replies. When this function is called from a
+ * callback, there might be more replies and we can safely defer disconnecting
+ * to redisProcessCallbacks(). Otherwise, we can only disconnect immediately
+ * when there are no pending callbacks. */
+void redisAsyncDisconnect(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    c->flags |= REDIS_DISCONNECTING;
+    if (!(c->flags & REDIS_IN_CALLBACK) && ac->replies.head == NULL)
+        __redisAsyncDisconnect(ac);
+}
+
+static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, redisCallback *dstcb) {
+    redisContext *c = &(ac->c);
+    dict *callbacks;
+    dictEntry *de;
+    int pvariant;
+    char *stype;
+    sds sname;
+
+    /* Custom reply functions are not supported for pub/sub. This will fail
+     * very hard when they are used... */
+    if (reply->type == REDIS_REPLY_ARRAY) {
+        assert(reply->elements >= 2);
+        assert(reply->element[0]->type == REDIS_REPLY_STRING);
+        stype = reply->element[0]->str;
+        pvariant = (tolower(stype[0]) == 'p') ? 1 : 0;
+
+        if (pvariant)
+            callbacks = ac->sub.patterns;
+        else
+            callbacks = ac->sub.channels;
+
+        /* Locate the right callback */
+        assert(reply->element[1]->type == REDIS_REPLY_STRING);
+        sname = sdsnewlen(reply->element[1]->str,reply->element[1]->len);
+        de = dictFind(callbacks,sname);
+        if (de != NULL) {
+            memcpy(dstcb,dictGetEntryVal(de),sizeof(*dstcb));
+
+            /* If this is an unsubscribe message, remove it. */
+            if (strcasecmp(stype+pvariant,"unsubscribe") == 0) {
+                dictDelete(callbacks,sname);
+
+                /* If this was the last unsubscribe message, revert to
+                 * non-subscribe mode. */
+                assert(reply->element[2]->type == REDIS_REPLY_INTEGER);
+                if (reply->element[2]->integer == 0)
+                    c->flags &= ~REDIS_SUBSCRIBED;
+            }
+        }
+        sdsfree(sname);
+    } else {
+        /* Shift callback for invalid commands. */
+        __redisShiftCallback(&ac->sub.invalid,dstcb);
+    }
+    return REDIS_OK;
+}
+
+void redisProcessCallbacks(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisCallback cb = {NULL, NULL, NULL};
+    void *reply = NULL;
+    int status;
+
+    while((status = redisGetReply(c,&reply)) == REDIS_OK) {
+        if (reply == NULL) {
+            /* When the connection is being disconnected and there are
+             * no more replies, this is the cue to really disconnect. */
+            if (c->flags & REDIS_DISCONNECTING && sdslen(c->obuf) == 0
+                && ac->replies.head == NULL) {
+                __redisAsyncDisconnect(ac);
+                return;
+            }
+
+            /* If monitor mode, repush callback */
+            if(c->flags & REDIS_MONITORING) {
+                __redisPushCallback(&ac->replies,&cb);
+            }
+
+            /* When the connection is not being disconnected, simply stop
+             * trying to get replies and wait for the next loop tick. */
+            break;
+        }
+
+        /* Even if the context is subscribed, pending regular callbacks will
+         * get a reply before pub/sub messages arrive. */
+        if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
+            /*
+             * A spontaneous reply in a not-subscribed context can be the error
+             * reply that is sent when a new connection exceeds the maximum
+             * number of allowed connections on the server side.
+             *
+             * This is seen as an error instead of a regular reply because the
+             * server closes the connection after sending it.
+             *
+             * To prevent the error from being overwritten by an EOF error the
+             * connection is closed here. See issue #43.
+             *
+             * Another possibility is that the server is loading its dataset.
+             * In this case we also want to close the connection, and have the
+             * user wait until the server is ready to take our request.
+             */
+            if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
+                c->err = REDIS_ERR_OTHER;
+                snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
+                c->reader->fn->freeObject(reply);
+                __redisAsyncDisconnect(ac);
+                return;
+            }
+            /* No more regular callbacks and no errors, the context *must* be subscribed or monitoring. */
+            assert((c->flags & REDIS_SUBSCRIBED || c->flags & REDIS_MONITORING));
+            if(c->flags & REDIS_SUBSCRIBED)
+                __redisGetSubscribeCallback(ac,reply,&cb);
+        }
+
+        if (cb.fn != NULL) {
+            __redisRunCallback(ac,&cb,reply);
+            c->reader->fn->freeObject(reply);
+
+            /* Proceed with free'ing when redisAsyncFree() was called. */
+            if (c->flags & REDIS_FREEING) {
+                __redisAsyncFree(ac);
+                return;
+            }
+        } else {
+            /* No callback for this reply. This can either be a NULL callback,
+             * or there were no callbacks to begin with. Either way, don't
+             * abort with an error, but simply ignore it because the client
+             * doesn't know what the server will spit out over the wire. */
+            c->reader->fn->freeObject(reply);
+        }
+    }
+
+    /* Disconnect when there was an error reading the reply */
+    if (status != REDIS_OK)
+        __redisAsyncDisconnect(ac);
+}
+
+/* Internal helper function to detect socket status the first time a read or
+ * write event fires. When connecting was not successful, the connect callback
+ * is called with a REDIS_ERR status and the context is free'd. */
+static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    if (redisCheckSocketError(c) == REDIS_ERR) {
+        /* Try again later when connect(2) is still in progress. */
+        if (errno == EINPROGRESS)
+            return REDIS_OK;
+
+        if (ac->onConnect) ac->onConnect(ac,REDIS_ERR);
+        __redisAsyncDisconnect(ac);
+        return REDIS_ERR;
+    }
+
+    /* Mark context as connected. */
+    c->flags |= REDIS_CONNECTED;
+    if (ac->onConnect) ac->onConnect(ac,REDIS_OK);
+    return REDIS_OK;
+}
+
+/* This function should be called when the socket is readable.
+ * It processes all replies that can be read and executes their callbacks.
+ */
+void redisAsyncHandleRead(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    if (!(c->flags & REDIS_CONNECTED)) {
+        /* Abort connect was not successful. */
+        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
+            return;
+        /* Try again later when the context is still not connected. */
+        if (!(c->flags & REDIS_CONNECTED))
+            return;
+    }
+
+    if (redisBufferRead(c) == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+    } else {
+        /* Always re-schedule reads */
+        _EL_ADD_READ(ac);
+        redisProcessCallbacks(ac);
+    }
+}
+
+void redisAsyncHandleWrite(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    int done = 0;
+
+    if (!(c->flags & REDIS_CONNECTED)) {
+        /* Abort connect was not successful. */
+        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
+            return;
+        /* Try again later when the context is still not connected. */
+        if (!(c->flags & REDIS_CONNECTED))
+            return;
+    }
+
+    if (redisBufferWrite(c,&done) == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+    } else {
+        /* Continue writing when not done, stop writing otherwise */
+        if (!done)
+            _EL_ADD_WRITE(ac);
+        else
+            _EL_DEL_WRITE(ac);
+
+        /* Always schedule reads after writes */
+        _EL_ADD_READ(ac);
+    }
+}
+
+/* Sets a pointer to the first argument and its length starting at p. Returns
+ * the number of bytes to skip to get to the following argument. */
+static const char *nextArgument(const char *start, const char **str, size_t *len) {
+    const char *p = start;
+    if (p[0] != '$') {
+        p = strchr(p,'$');
+        if (p == NULL) return NULL;
+    }
+
+    *len = (int)strtol(p+1,NULL,10);
+    p = strchr(p,'\r');
+    assert(p);
+    *str = p+2;
+    return p+2+(*len)+2;
+}
+
+/* Helper function for the redisAsyncCommand* family of functions. Writes a
+ * formatted command to the output buffer and registers the provided callback
+ * function with the context. */
+static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
+    redisContext *c = &(ac->c);
+    redisCallback cb;
+    int pvariant, hasnext;
+    const char *cstr, *astr;
+    size_t clen, alen;
+    const char *p;
+    sds sname;
+    int ret;
+
+    /* Don't accept new commands when the connection is about to be closed. */
+    if (c->flags & (REDIS_DISCONNECTING | REDIS_FREEING)) return REDIS_ERR;
+
+    /* Setup callback */
+    cb.fn = fn;
+    cb.privdata = privdata;
+
+    /* Find out which command will be appended. */
+    p = nextArgument(cmd,&cstr,&clen);
+    assert(p != NULL);
+    hasnext = (p[0] == '$');
+    pvariant = (tolower(cstr[0]) == 'p') ? 1 : 0;
+    cstr += pvariant;
+    clen -= pvariant;
+
+    if (hasnext && strncasecmp(cstr,"subscribe\r\n",11) == 0) {
+        c->flags |= REDIS_SUBSCRIBED;
+
+        /* Add every channel/pattern to the list of subscription callbacks. */
+        while ((p = nextArgument(p,&astr,&alen)) != NULL) {
+            sname = sdsnewlen(astr,alen);
+            if (pvariant)
+                ret = dictReplace(ac->sub.patterns,sname,&cb);
+            else
+                ret = dictReplace(ac->sub.channels,sname,&cb);
+
+            if (ret == 0) sdsfree(sname);
+        }
+    } else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) {
+        /* It is only useful to call (P)UNSUBSCRIBE when the context is
+         * subscribed to one or more channels or patterns. */
+        if (!(c->flags & REDIS_SUBSCRIBED)) return REDIS_ERR;
+
+        /* (P)UNSUBSCRIBE does not have its own response: every channel or
+         * pattern that is unsubscribed will receive a message. This means we
+         * should not append a callback function for this command. */
+     } else if(strncasecmp(cstr,"monitor\r\n",9) == 0) {
+         /* Set monitor flag and push callback */
+         c->flags |= REDIS_MONITORING;
+         __redisPushCallback(&ac->replies,&cb);
+    } else {
+        if (c->flags & REDIS_SUBSCRIBED)
+            /* This will likely result in an error reply, but it needs to be
+             * received and passed to the callback. */
+            __redisPushCallback(&ac->sub.invalid,&cb);
+        else
+            __redisPushCallback(&ac->replies,&cb);
+    }
+
+    __redisAppendCommand(c,cmd,len);
+
+    /* Always schedule a write when the write buffer is non-empty */
+    _EL_ADD_WRITE(ac);
+
+    return REDIS_OK;
+}
+
+int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap) {
+    char *cmd;
+    int len;
+    int status;
+    len = redisvFormatCommand(&cmd,format,ap);
+
+    /* We don't want to pass -1 or -2 to future functions as a length. */
+    if (len < 0)
+        return REDIS_ERR;
+
+    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
+    free(cmd);
+    return status;
+}
+
+int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...) {
+    va_list ap;
+    int status;
+    va_start(ap,format);
+    status = redisvAsyncCommand(ac,fn,privdata,format,ap);
+    va_end(ap);
+    return status;
+}
+
+int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) {
+    sds cmd;
+    int len;
+    int status;
+    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
+    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
+    sdsfree(cmd);
+    return status;
+}
+
+int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
+    int status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
+    return status;
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/async.h b/debian/modules/nchan/src/store/redis/hiredis/async.h
new file mode 100644
index 0000000..59cbf46
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/async.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_ASYNC_H
+#define __HIREDIS_ASYNC_H
+#include "hiredis.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
+struct dict; /* dictionary header is included in async.c */
+
+/* Reply callback prototype and container */
+typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
+typedef struct redisCallback {
+    struct redisCallback *next; /* simple singly linked list */
+    redisCallbackFn *fn;
+    void *privdata;
+} redisCallback;
+
+/* List of callbacks for either regular replies or pub/sub */
+typedef struct redisCallbackList {
+    redisCallback *head, *tail;
+} redisCallbackList;
+
+/* Connection callback prototypes */
+typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
+typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
+
+/* Context for an async connection to Redis */
+typedef struct redisAsyncContext {
+    /* Hold the regular context, so it can be realloc'ed. */
+    redisContext c;
+
+    /* Setup error flags so they can be used directly. */
+    int err;
+    char *errstr;
+
+    /* Not used by hiredis */
+    void *data;
+
+    /* Event library data and hooks */
+    struct {
+        void *data;
+
+        /* Hooks that are called when the library expects to start
+         * reading/writing. These functions should be idempotent. */
+        void (*addRead)(void *privdata);
+        void (*delRead)(void *privdata);
+        void (*addWrite)(void *privdata);
+        void (*delWrite)(void *privdata);
+        void (*cleanup)(void *privdata);
+    } ev;
+
+    /* Called when either the connection is terminated due to an error or per
+     * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
+    redisDisconnectCallback *onDisconnect;
+
+    /* Called when the first write event was received. */
+    redisConnectCallback *onConnect;
+
+    /* Regular command callbacks */
+    redisCallbackList replies;
+
+    /* Subscription callbacks */
+    struct {
+        redisCallbackList invalid;
+        struct dict *channels;
+        struct dict *patterns;
+    } sub;
+} redisAsyncContext;
+
+/* Functions that proxy to hiredis */
+redisAsyncContext *redisAsyncConnect(const char *ip, int port);
+redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
+redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
+                                                  const char *source_addr);
+redisAsyncContext *redisAsyncConnectUnix(const char *path);
+int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
+int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
+void redisAsyncDisconnect(redisAsyncContext *ac);
+void redisAsyncFree(redisAsyncContext *ac);
+
+/* Handle read/write events */
+void redisAsyncHandleRead(redisAsyncContext *ac);
+void redisAsyncHandleWrite(redisAsyncContext *ac);
+
+/* Command functions for an async context. Write the command to the
+ * output buffer and register the provided callback. */
+int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
+int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
+int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
+int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/dict.c b/debian/modules/nchan/src/store/redis/hiredis/dict.c
new file mode 100644
index 0000000..e17a625
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/dict.c
@@ -0,0 +1,338 @@
+/* Hash table implementation.
+ *
+ * This file implements in memory hash tables with insert/del/replace/find/
+ * get-random-element operations. Hash tables will auto resize if needed
+ * tables of power of two in size are used, collisions are handled by
+ * chaining. See the source code for more information... :)
+ *
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <stdlib.h>
+#include <assert.h>
+#include <limits.h>
+#include "dict.h"
+
+/* -------------------------- private prototypes ---------------------------- */
+
+static int _dictExpandIfNeeded(dict *ht);
+static unsigned long _dictNextPower(unsigned long size);
+static int _dictKeyIndex(dict *ht, const void *key);
+static int _dictInit(dict *ht, dictType *type, void *privDataPtr);
+
+/* -------------------------- hash functions -------------------------------- */
+
+/* Generic hash function (a popular one from Bernstein).
+ * I tested a few and this was the best. */
+static unsigned int dictGenHashFunction(const unsigned char *buf, int len) {
+    unsigned int hash = 5381;
+
+    while (len--)
+        hash = ((hash << 5) + hash) + (*buf++); /* hash * 33 + c */
+    return hash;
+}
+
+/* ----------------------------- API implementation ------------------------- */
+
+/* Reset an hashtable already initialized with ht_init().
+ * NOTE: This function should only called by ht_destroy(). */
+static void _dictReset(dict *ht) {
+    ht->table = NULL;
+    ht->size = 0;
+    ht->sizemask = 0;
+    ht->used = 0;
+}
+
+/* Create a new hash table */
+static dict *dictCreate(dictType *type, void *privDataPtr) {
+    dict *ht = malloc(sizeof(*ht));
+    _dictInit(ht,type,privDataPtr);
+    return ht;
+}
+
+/* Initialize the hash table */
+static int _dictInit(dict *ht, dictType *type, void *privDataPtr) {
+    _dictReset(ht);
+    ht->type = type;
+    ht->privdata = privDataPtr;
+    return DICT_OK;
+}
+
+/* Expand or create the hashtable */
+static int dictExpand(dict *ht, unsigned long size) {
+    dict n; /* the new hashtable */
+    unsigned long realsize = _dictNextPower(size), i;
+
+    /* the size is invalid if it is smaller than the number of
+     * elements already inside the hashtable */
+    if (ht->used > size)
+        return DICT_ERR;
+
+    _dictInit(&n, ht->type, ht->privdata);
+    n.size = realsize;
+    n.sizemask = realsize-1;
+    n.table = calloc(realsize,sizeof(dictEntry*));
+
+    /* Copy all the elements from the old to the new table:
+     * note that if the old hash table is empty ht->size is zero,
+     * so dictExpand just creates an hash table. */
+    n.used = ht->used;
+    for (i = 0; i < ht->size && ht->used > 0; i++) {
+        dictEntry *he, *nextHe;
+
+        if (ht->table[i] == NULL) continue;
+
+        /* For each hash entry on this slot... */
+        he = ht->table[i];
+        while(he) {
+            unsigned int h;
+
+            nextHe = he->next;
+            /* Get the new element index */
+            h = dictHashKey(ht, he->key) & n.sizemask;
+            he->next = n.table[h];
+            n.table[h] = he;
+            ht->used--;
+            /* Pass to the next element */
+            he = nextHe;
+        }
+    }
+    assert(ht->used == 0);
+    free(ht->table);
+
+    /* Remap the new hashtable in the old */
+    *ht = n;
+    return DICT_OK;
+}
+
+/* Add an element to the target hash table */
+static int dictAdd(dict *ht, void *key, void *val) {
+    int index;
+    dictEntry *entry;
+
+    /* Get the index of the new element, or -1 if
+     * the element already exists. */
+    if ((index = _dictKeyIndex(ht, key)) == -1)
+        return DICT_ERR;
+
+    /* Allocates the memory and stores key */
+    entry = malloc(sizeof(*entry));
+    entry->next = ht->table[index];
+    ht->table[index] = entry;
+
+    /* Set the hash entry fields. */
+    dictSetHashKey(ht, entry, key);
+    dictSetHashVal(ht, entry, val);
+    ht->used++;
+    return DICT_OK;
+}
+
+/* Add an element, discarding the old if the key already exists.
+ * Return 1 if the key was added from scratch, 0 if there was already an
+ * element with such key and dictReplace() just performed a value update
+ * operation. */
+static int dictReplace(dict *ht, void *key, void *val) {
+    dictEntry *entry, auxentry;
+
+    /* Try to add the element. If the key
+     * does not exists dictAdd will succeed. */
+    if (dictAdd(ht, key, val) == DICT_OK)
+        return 1;
+    /* It already exists, get the entry */
+    entry = dictFind(ht, key);
+    /* Free the old value and set the new one */
+    /* Set the new value and free the old one. Note that it is important
+     * to do that in this order, as the value may just be exactly the same
+     * as the previous one. In this context, think to reference counting,
+     * you want to increment (set), and then decrement (free), and not the
+     * reverse. */
+    auxentry = *entry;
+    dictSetHashVal(ht, entry, val);
+    dictFreeEntryVal(ht, &auxentry);
+    return 0;
+}
+
+/* Search and remove an element */
+static int dictDelete(dict *ht, const void *key) {
+    unsigned int h;
+    dictEntry *de, *prevde;
+
+    if (ht->size == 0)
+        return DICT_ERR;
+    h = dictHashKey(ht, key) & ht->sizemask;
+    de = ht->table[h];
+
+    prevde = NULL;
+    while(de) {
+        if (dictCompareHashKeys(ht,key,de->key)) {
+            /* Unlink the element from the list */
+            if (prevde)
+                prevde->next = de->next;
+            else
+                ht->table[h] = de->next;
+
+            dictFreeEntryKey(ht,de);
+            dictFreeEntryVal(ht,de);
+            free(de);
+            ht->used--;
+            return DICT_OK;
+        }
+        prevde = de;
+        de = de->next;
+    }
+    return DICT_ERR; /* not found */
+}
+
+/* Destroy an entire hash table */
+static int _dictClear(dict *ht) {
+    unsigned long i;
+
+    /* Free all the elements */
+    for (i = 0; i < ht->size && ht->used > 0; i++) {
+        dictEntry *he, *nextHe;
+
+        if ((he = ht->table[i]) == NULL) continue;
+        while(he) {
+            nextHe = he->next;
+            dictFreeEntryKey(ht, he);
+            dictFreeEntryVal(ht, he);
+            free(he);
+            ht->used--;
+            he = nextHe;
+        }
+    }
+    /* Free the table and the allocated cache structure */
+    free(ht->table);
+    /* Re-initialize the table */
+    _dictReset(ht);
+    return DICT_OK; /* never fails */
+}
+
+/* Clear & Release the hash table */
+static void dictRelease(dict *ht) {
+    _dictClear(ht);
+    free(ht);
+}
+
+static dictEntry *dictFind(dict *ht, const void *key) {
+    dictEntry *he;
+    unsigned int h;
+
+    if (ht->size == 0) return NULL;
+    h = dictHashKey(ht, key) & ht->sizemask;
+    he = ht->table[h];
+    while(he) {
+        if (dictCompareHashKeys(ht, key, he->key))
+            return he;
+        he = he->next;
+    }
+    return NULL;
+}
+
+static dictIterator *dictGetIterator(dict *ht) {
+    dictIterator *iter = malloc(sizeof(*iter));
+
+    iter->ht = ht;
+    iter->index = -1;
+    iter->entry = NULL;
+    iter->nextEntry = NULL;
+    return iter;
+}
+
+static dictEntry *dictNext(dictIterator *iter) {
+    while (1) {
+        if (iter->entry == NULL) {
+            iter->index++;
+            if (iter->index >=
+                    (signed)iter->ht->size) break;
+            iter->entry = iter->ht->table[iter->index];
+        } else {
+            iter->entry = iter->nextEntry;
+        }
+        if (iter->entry) {
+            /* We need to save the 'next' here, the iterator user
+             * may delete the entry we are returning. */
+            iter->nextEntry = iter->entry->next;
+            return iter->entry;
+        }
+    }
+    return NULL;
+}
+
+static void dictReleaseIterator(dictIterator *iter) {
+    free(iter);
+}
+
+/* ------------------------- private functions ------------------------------ */
+
+/* Expand the hash table if needed */
+static int _dictExpandIfNeeded(dict *ht) {
+    /* If the hash table is empty expand it to the initial size,
+     * if the table is "full" dobule its size. */
+    if (ht->size == 0)
+        return dictExpand(ht, DICT_HT_INITIAL_SIZE);
+    if (ht->used == ht->size)
+        return dictExpand(ht, ht->size*2);
+    return DICT_OK;
+}
+
+/* Our hash table capability is a power of two */
+static unsigned long _dictNextPower(unsigned long size) {
+    unsigned long i = DICT_HT_INITIAL_SIZE;
+
+    if (size >= LONG_MAX) return LONG_MAX;
+    while(1) {
+        if (i >= size)
+            return i;
+        i *= 2;
+    }
+}
+
+/* Returns the index of a free slot that can be populated with
+ * an hash entry for the given 'key'.
+ * If the key already exists, -1 is returned. */
+static int _dictKeyIndex(dict *ht, const void *key) {
+    unsigned int h;
+    dictEntry *he;
+
+    /* Expand the hashtable if needed */
+    if (_dictExpandIfNeeded(ht) == DICT_ERR)
+        return -1;
+    /* Compute the key hash value */
+    h = dictHashKey(ht, key) & ht->sizemask;
+    /* Search if this slot does not already contain the given key */
+    he = ht->table[h];
+    while(he) {
+        if (dictCompareHashKeys(ht, key, he->key))
+            return -1;
+        he = he->next;
+    }
+    return h;
+}
+
diff --git a/debian/modules/nchan/src/store/redis/hiredis/dict.h b/debian/modules/nchan/src/store/redis/hiredis/dict.h
new file mode 100644
index 0000000..95fcd28
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/dict.h
@@ -0,0 +1,126 @@
+/* Hash table implementation.
+ *
+ * This file implements in memory hash tables with insert/del/replace/find/
+ * get-random-element operations. Hash tables will auto resize if needed
+ * tables of power of two in size are used, collisions are handled by
+ * chaining. See the source code for more information... :)
+ *
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __DICT_H
+#define __DICT_H
+
+#define DICT_OK 0
+#define DICT_ERR 1
+
+/* Unused arguments generate annoying warnings... */
+#define DICT_NOTUSED(V) ((void) V)
+
+typedef struct dictEntry {
+    void *key;
+    void *val;
+    struct dictEntry *next;
+} dictEntry;
+
+typedef struct dictType {
+    unsigned int (*hashFunction)(const void *key);
+    void *(*keyDup)(void *privdata, const void *key);
+    void *(*valDup)(void *privdata, const void *obj);
+    int (*keyCompare)(void *privdata, const void *key1, const void *key2);
+    void (*keyDestructor)(void *privdata, void *key);
+    void (*valDestructor)(void *privdata, void *obj);
+} dictType;
+
+typedef struct dict {
+    dictEntry **table;
+    dictType *type;
+    unsigned long size;
+    unsigned long sizemask;
+    unsigned long used;
+    void *privdata;
+} dict;
+
+typedef struct dictIterator {
+    dict *ht;
+    int index;
+    dictEntry *entry, *nextEntry;
+} dictIterator;
+
+/* This is the initial size of every hash table */
+#define DICT_HT_INITIAL_SIZE     4
+
+/* ------------------------------- Macros ------------------------------------*/
+#define dictFreeEntryVal(ht, entry) \
+    if ((ht)->type->valDestructor) \
+        (ht)->type->valDestructor((ht)->privdata, (entry)->val)
+
+#define dictSetHashVal(ht, entry, _val_) do { \
+    if ((ht)->type->valDup) \
+        entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
+    else \
+        entry->val = (_val_); \
+} while(0)
+
+#define dictFreeEntryKey(ht, entry) \
+    if ((ht)->type->keyDestructor) \
+        (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
+
+#define dictSetHashKey(ht, entry, _key_) do { \
+    if ((ht)->type->keyDup) \
+        entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
+    else \
+        entry->key = (_key_); \
+} while(0)
+
+#define dictCompareHashKeys(ht, key1, key2) \
+    (((ht)->type->keyCompare) ? \
+        (ht)->type->keyCompare((ht)->privdata, key1, key2) : \
+        (key1) == (key2))
+
+#define dictHashKey(ht, key) (ht)->type->hashFunction(key)
+
+#define dictGetEntryKey(he) ((he)->key)
+#define dictGetEntryVal(he) ((he)->val)
+#define dictSlots(ht) ((ht)->size)
+#define dictSize(ht) ((ht)->used)
+
+/* API */
+static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
+static dict *dictCreate(dictType *type, void *privDataPtr);
+static int dictExpand(dict *ht, unsigned long size);
+static int dictAdd(dict *ht, void *key, void *val);
+static int dictReplace(dict *ht, void *key, void *val);
+static int dictDelete(dict *ht, const void *key);
+static void dictRelease(dict *ht);
+static dictEntry * dictFind(dict *ht, const void *key);
+static dictIterator *dictGetIterator(dict *ht);
+static dictEntry *dictNext(dictIterator *iter);
+static void dictReleaseIterator(dictIterator *iter);
+
+#endif /* __DICT_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example-ae.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example-ae.c
new file mode 100644
index 0000000..8efa730
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/examples/example-ae.c
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include <hiredis.h>
+#include <async.h>
+#include <adapters/ae.h>
+
+/* Put event loop in the global scope, so it can be explicitly stopped */
+static aeEventLoop *loop;
+
+void getCallback(redisAsyncContext *c, void *r, void *privdata) {
+    redisReply *reply = r;
+    if (reply == NULL) return;
+    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
+
+    /* Disconnect after receiving the reply to GET */
+    redisAsyncDisconnect(c);
+}
+
+void connectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        aeStop(loop);
+        return;
+    }
+
+    printf("Connected...\n");
+}
+
+void disconnectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        aeStop(loop);
+        return;
+    }
+
+    printf("Disconnected...\n");
+    aeStop(loop);
+}
+
+int main (int argc, char **argv) {
+    signal(SIGPIPE, SIG_IGN);
+
+    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+    if (c->err) {
+        /* Let *c leak for now... */
+        printf("Error: %s\n", c->errstr);
+        return 1;
+    }
+
+    loop = aeCreateEventLoop(64);
+    redisAeAttach(loop, c);
+    redisAsyncSetConnectCallback(c,connectCallback);
+    redisAsyncSetDisconnectCallback(c,disconnectCallback);
+    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
+    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
+    aeMain(loop);
+    return 0;
+}
+
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example-libev.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example-libev.c
new file mode 100644
index 0000000..cc8b166
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/examples/example-libev.c
@@ -0,0 +1,52 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include <hiredis.h>
+#include <async.h>
+#include <adapters/libev.h>
+
+void getCallback(redisAsyncContext *c, void *r, void *privdata) {
+    redisReply *reply = r;
+    if (reply == NULL) return;
+    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
+
+    /* Disconnect after receiving the reply to GET */
+    redisAsyncDisconnect(c);
+}
+
+void connectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Connected...\n");
+}
+
+void disconnectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Disconnected...\n");
+}
+
+int main (int argc, char **argv) {
+    signal(SIGPIPE, SIG_IGN);
+
+    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+    if (c->err) {
+        /* Let *c leak for now... */
+        printf("Error: %s\n", c->errstr);
+        return 1;
+    }
+
+    redisLibevAttach(EV_DEFAULT_ c);
+    redisAsyncSetConnectCallback(c,connectCallback);
+    redisAsyncSetDisconnectCallback(c,disconnectCallback);
+    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
+    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
+    ev_loop(EV_DEFAULT_ 0);
+    return 0;
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example-libevent.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example-libevent.c
new file mode 100644
index 0000000..d333c22
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/examples/example-libevent.c
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include <hiredis.h>
+#include <async.h>
+#include <adapters/libevent.h>
+
+void getCallback(redisAsyncContext *c, void *r, void *privdata) {
+    redisReply *reply = r;
+    if (reply == NULL) return;
+    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
+
+    /* Disconnect after receiving the reply to GET */
+    redisAsyncDisconnect(c);
+}
+
+void connectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Connected...\n");
+}
+
+void disconnectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Disconnected...\n");
+}
+
+int main (int argc, char **argv) {
+    signal(SIGPIPE, SIG_IGN);
+    struct event_base *base = event_base_new();
+
+    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+    if (c->err) {
+        /* Let *c leak for now... */
+        printf("Error: %s\n", c->errstr);
+        return 1;
+    }
+
+    redisLibeventAttach(c,base);
+    redisAsyncSetConnectCallback(c,connectCallback);
+    redisAsyncSetDisconnectCallback(c,disconnectCallback);
+    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
+    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
+    event_base_dispatch(base);
+    return 0;
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example-libuv.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example-libuv.c
new file mode 100644
index 0000000..a5462d4
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/examples/example-libuv.c
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include <hiredis.h>
+#include <async.h>
+#include <adapters/libuv.h>
+
+void getCallback(redisAsyncContext *c, void *r, void *privdata) {
+    redisReply *reply = r;
+    if (reply == NULL) return;
+    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
+
+    /* Disconnect after receiving the reply to GET */
+    redisAsyncDisconnect(c);
+}
+
+void connectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Connected...\n");
+}
+
+void disconnectCallback(const redisAsyncContext *c, int status) {
+    if (status != REDIS_OK) {
+        printf("Error: %s\n", c->errstr);
+        return;
+    }
+    printf("Disconnected...\n");
+}
+
+int main (int argc, char **argv) {
+    signal(SIGPIPE, SIG_IGN);
+    uv_loop_t* loop = uv_default_loop();
+
+    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+    if (c->err) {
+        /* Let *c leak for now... */
+        printf("Error: %s\n", c->errstr);
+        return 1;
+    }
+
+    redisLibuvAttach(c,loop);
+    redisAsyncSetConnectCallback(c,connectCallback);
+    redisAsyncSetDisconnectCallback(c,disconnectCallback);
+    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
+    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
+    uv_run(loop, UV_RUN_DEFAULT);
+    return 0;
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example.c
new file mode 100644
index 0000000..4d494c5
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/examples/example.c
@@ -0,0 +1,78 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <hiredis.h>
+
+int main(int argc, char **argv) {
+    unsigned int j;
+    redisContext *c;
+    redisReply *reply;
+    const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1";
+    int port = (argc > 2) ? atoi(argv[2]) : 6379;
+
+    struct timeval timeout = { 1, 500000 }; // 1.5 seconds
+    c = redisConnectWithTimeout(hostname, port, timeout);
+    if (c == NULL || c->err) {
+        if (c) {
+            printf("Connection error: %s\n", c->errstr);
+            redisFree(c);
+        } else {
+            printf("Connection error: can't allocate redis context\n");
+        }
+        exit(1);
+    }
+
+    /* PING server */
+    reply = redisCommand(c,"PING");
+    printf("PING: %s\n", reply->str);
+    freeReplyObject(reply);
+
+    /* Set a key */
+    reply = redisCommand(c,"SET %s %s", "foo", "hello world");
+    printf("SET: %s\n", reply->str);
+    freeReplyObject(reply);
+
+    /* Set a key using binary safe API */
+    reply = redisCommand(c,"SET %b %b", "bar", (size_t) 3, "hello", (size_t) 5);
+    printf("SET (binary API): %s\n", reply->str);
+    freeReplyObject(reply);
+
+    /* Try a GET and two INCR */
+    reply = redisCommand(c,"GET foo");
+    printf("GET foo: %s\n", reply->str);
+    freeReplyObject(reply);
+
+    reply = redisCommand(c,"INCR counter");
+    printf("INCR counter: %lld\n", reply->integer);
+    freeReplyObject(reply);
+    /* again ... */
+    reply = redisCommand(c,"INCR counter");
+    printf("INCR counter: %lld\n", reply->integer);
+    freeReplyObject(reply);
+
+    /* Create a list of numbers, from 0 to 9 */
+    reply = redisCommand(c,"DEL mylist");
+    freeReplyObject(reply);
+    for (j = 0; j < 10; j++) {
+        char buf[64];
+
+        snprintf(buf,64,"%u",j);
+        reply = redisCommand(c,"LPUSH mylist element-%s", buf);
+        freeReplyObject(reply);
+    }
+
+    /* Let's check what we have inside the list */
+    reply = redisCommand(c,"LRANGE mylist 0 -1");
+    if (reply->type == REDIS_REPLY_ARRAY) {
+        for (j = 0; j < reply->elements; j++) {
+            printf("%u) %s\n", j, reply->element[j]->str);
+        }
+    }
+    freeReplyObject(reply);
+
+    /* Disconnects and frees the context */
+    redisFree(c);
+
+    return 0;
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/fmacros.h b/debian/modules/nchan/src/store/redis/hiredis/fmacros.h
new file mode 100644
index 0000000..19d7b21
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/fmacros.h
@@ -0,0 +1,21 @@
+#ifndef __HIREDIS_FMACRO_H
+#define __HIREDIS_FMACRO_H
+
+#if defined(__linux__)
+#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
+#endif
+
+#if defined(__sun__)
+#define _POSIX_C_SOURCE 200112L
+#elif defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#define _XOPEN_SOURCE 600
+#else
+#define _XOPEN_SOURCE
+#endif
+
+#if __APPLE__ && __MACH__
+#define _OSX
+#endif
+
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/hiredis.c b/debian/modules/nchan/src/store/redis/hiredis/hiredis.c
new file mode 100644
index 0000000..2b876d9
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/hiredis.c
@@ -0,0 +1,1021 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <assert.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "hiredis.h"
+#include "net.h"
+#include "sds.h"
+
+static redisReply *createReplyObject(int type);
+static void *createStringObject(const redisReadTask *task, char *str, size_t len);
+static void *createArrayObject(const redisReadTask *task, int elements);
+static void *createIntegerObject(const redisReadTask *task, long long value);
+static void *createNilObject(const redisReadTask *task);
+
+/* Default set of functions to build the reply. Keep in mind that such a
+ * function returning NULL is interpreted as OOM. */
+static redisReplyObjectFunctions defaultFunctions = {
+    createStringObject,
+    createArrayObject,
+    createIntegerObject,
+    createNilObject,
+    freeReplyObject
+};
+
+/* Create a reply object */
+static redisReply *createReplyObject(int type) {
+    redisReply *r = calloc(1,sizeof(*r));
+
+    if (r == NULL)
+        return NULL;
+
+    r->type = type;
+    return r;
+}
+
+/* Free a reply object */
+void freeReplyObject(void *reply) {
+    redisReply *r = reply;
+    size_t j;
+
+    if (r == NULL)
+        return;
+
+    switch(r->type) {
+    case REDIS_REPLY_INTEGER:
+        break; /* Nothing to free */
+    case REDIS_REPLY_ARRAY:
+        if (r->element != NULL) {
+            for (j = 0; j < r->elements; j++)
+                if (r->element[j] != NULL)
+                    freeReplyObject(r->element[j]);
+            free(r->element);
+        }
+        break;
+    case REDIS_REPLY_ERROR:
+    case REDIS_REPLY_STATUS:
+    case REDIS_REPLY_STRING:
+        if (r->str != NULL)
+            free(r->str);
+        break;
+    }
+    free(r);
+}
+
+static void *createStringObject(const redisReadTask *task, char *str, size_t len) {
+    redisReply *r, *parent;
+    char *buf;
+
+    r = createReplyObject(task->type);
+    if (r == NULL)
+        return NULL;
+
+    buf = malloc(len+1);
+    if (buf == NULL) {
+        freeReplyObject(r);
+        return NULL;
+    }
+
+    assert(task->type == REDIS_REPLY_ERROR  ||
+           task->type == REDIS_REPLY_STATUS ||
+           task->type == REDIS_REPLY_STRING);
+
+    /* Copy string value */
+    memcpy(buf,str,len);
+    buf[len] = '\0';
+    r->str = buf;
+    r->len = len;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createArrayObject(const redisReadTask *task, int elements) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_ARRAY);
+    if (r == NULL)
+        return NULL;
+
+    if (elements > 0) {
+        r->element = calloc(elements,sizeof(redisReply*));
+        if (r->element == NULL) {
+            freeReplyObject(r);
+            return NULL;
+        }
+    }
+
+    r->elements = elements;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createIntegerObject(const redisReadTask *task, long long value) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_INTEGER);
+    if (r == NULL)
+        return NULL;
+
+    r->integer = value;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createNilObject(const redisReadTask *task) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_NIL);
+    if (r == NULL)
+        return NULL;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+/* Return the number of digits of 'v' when converted to string in radix 10.
+ * Implementation borrowed from link in redis/src/util.c:string2ll(). */
+static uint32_t countDigits(uint64_t v) {
+  uint32_t result = 1;
+  for (;;) {
+    if (v < 10) return result;
+    if (v < 100) return result + 1;
+    if (v < 1000) return result + 2;
+    if (v < 10000) return result + 3;
+    v /= 10000U;
+    result += 4;
+  }
+}
+
+/* Helper that calculates the bulk length given a certain string length. */
+static size_t bulklen(size_t len) {
+    return 1+countDigits(len)+2+len+2;
+}
+
+int redisvFormatCommand(char **target, const char *format, va_list ap) {
+    const char *c = format;
+    char *cmd = NULL; /* final command */
+    int pos; /* position in final command */
+    sds curarg, newarg; /* current argument */
+    int touched = 0; /* was the current argument touched? */
+    char **curargv = NULL, **newargv = NULL;
+    int argc = 0;
+    int totlen = 0;
+    int error_type = 0; /* 0 = no error; -1 = memory error; -2 = format error */
+    int j;
+
+    /* Abort if there is not target to set */
+    if (target == NULL)
+        return -1;
+
+    /* Build the command string accordingly to protocol */
+    curarg = sdsempty();
+    if (curarg == NULL)
+        return -1;
+
+    while(*c != '\0') {
+        if (*c != '%' || c[1] == '\0') {
+            if (*c == ' ') {
+                if (touched) {
+                    newargv = realloc(curargv,sizeof(char*)*(argc+1));
+                    if (newargv == NULL) goto memory_err;
+                    curargv = newargv;
+                    curargv[argc++] = curarg;
+                    totlen += bulklen(sdslen(curarg));
+
+                    /* curarg is put in argv so it can be overwritten. */
+                    curarg = sdsempty();
+                    if (curarg == NULL) goto memory_err;
+                    touched = 0;
+                }
+            } else {
+                newarg = sdscatlen(curarg,c,1);
+                if (newarg == NULL) goto memory_err;
+                curarg = newarg;
+                touched = 1;
+            }
+        } else {
+            char *arg;
+            size_t size;
+
+            /* Set newarg so it can be checked even if it is not touched. */
+            newarg = curarg;
+
+            switch(c[1]) {
+            case 's':
+                arg = va_arg(ap,char*);
+                size = strlen(arg);
+                if (size > 0)
+                    newarg = sdscatlen(curarg,arg,size);
+                break;
+            case 'b':
+                arg = va_arg(ap,char*);
+                size = va_arg(ap,size_t);
+                if (size > 0)
+                    newarg = sdscatlen(curarg,arg,size);
+                break;
+            case '%':
+                newarg = sdscat(curarg,"%");
+                break;
+            default:
+                /* Try to detect printf format */
+                {
+                    static const char intfmts[] = "diouxX";
+                    static const char flags[] = "#0-+ ";
+                    char _format[16];
+                    const char *_p = c+1;
+                    size_t _l = 0;
+                    va_list _cpy;
+
+                    /* Flags */
+                    while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++;
+
+                    /* Field width */
+                    while (*_p != '\0' && isdigit(*_p)) _p++;
+
+                    /* Precision */
+                    if (*_p == '.') {
+                        _p++;
+                        while (*_p != '\0' && isdigit(*_p)) _p++;
+                    }
+
+                    /* Copy va_list before consuming with va_arg */
+                    va_copy(_cpy,ap);
+
+                    /* Integer conversion (without modifiers) */
+                    if (strchr(intfmts,*_p) != NULL) {
+                        va_arg(ap,int);
+                        goto fmt_valid;
+                    }
+
+                    /* Double conversion (without modifiers) */
+                    if (strchr("eEfFgGaA",*_p) != NULL) {
+                        va_arg(ap,double);
+                        goto fmt_valid;
+                    }
+
+                    /* Size: char */
+                    if (_p[0] == 'h' && _p[1] == 'h') {
+                        _p += 2;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,int); /* char gets promoted to int */
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                    /* Size: short */
+                    if (_p[0] == 'h') {
+                        _p += 1;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,int); /* short gets promoted to int */
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                    /* Size: long long */
+                    if (_p[0] == 'l' && _p[1] == 'l') {
+                        _p += 2;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,long long);
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                    /* Size: long */
+                    if (_p[0] == 'l') {
+                        _p += 1;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,long);
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                fmt_invalid:
+                    va_end(_cpy);
+                    goto format_err;
+
+                fmt_valid:
+                    _l = (_p+1)-c;
+                    if (_l < sizeof(_format)-2) {
+                        memcpy(_format,c,_l);
+                        _format[_l] = '\0';
+                        newarg = sdscatvprintf(curarg,_format,_cpy);
+
+                        /* Update current position (note: outer blocks
+                         * increment c twice so compensate here) */
+                        c = _p-1;
+                    }
+
+                    va_end(_cpy);
+                    break;
+                }
+            }
+
+            if (newarg == NULL) goto memory_err;
+            curarg = newarg;
+
+            touched = 1;
+            c++;
+        }
+        c++;
+    }
+
+    /* Add the last argument if needed */
+    if (touched) {
+        newargv = realloc(curargv,sizeof(char*)*(argc+1));
+        if (newargv == NULL) goto memory_err;
+        curargv = newargv;
+        curargv[argc++] = curarg;
+        totlen += bulklen(sdslen(curarg));
+    } else {
+        sdsfree(curarg);
+    }
+
+    /* Clear curarg because it was put in curargv or was free'd. */
+    curarg = NULL;
+
+    /* Add bytes needed to hold multi bulk count */
+    totlen += 1+countDigits(argc)+2;
+
+    /* Build the command at protocol level */
+    cmd = malloc(totlen+1);
+    if (cmd == NULL) goto memory_err;
+
+    pos = sprintf(cmd,"*%d\r\n",argc);
+    for (j = 0; j < argc; j++) {
+        pos += sprintf(cmd+pos,"$%zu\r\n",sdslen(curargv[j]));
+        memcpy(cmd+pos,curargv[j],sdslen(curargv[j]));
+        pos += sdslen(curargv[j]);
+        sdsfree(curargv[j]);
+        cmd[pos++] = '\r';
+        cmd[pos++] = '\n';
+    }
+    assert(pos == totlen);
+    cmd[pos] = '\0';
+
+    free(curargv);
+    *target = cmd;
+    return totlen;
+
+format_err:
+    error_type = -2;
+    goto cleanup;
+
+memory_err:
+    error_type = -1;
+    goto cleanup;
+
+cleanup:
+    if (curargv) {
+        while(argc--)
+            sdsfree(curargv[argc]);
+        free(curargv);
+    }
+
+    sdsfree(curarg);
+
+    /* No need to check cmd since it is the last statement that can fail,
+     * but do it anyway to be as defensive as possible. */
+    if (cmd != NULL)
+        free(cmd);
+
+    return error_type;
+}
+
+/* Format a command according to the Redis protocol. This function
+ * takes a format similar to printf:
+ *
+ * %s represents a C null terminated string you want to interpolate
+ * %b represents a binary safe string
+ *
+ * When using %b you need to provide both the pointer to the string
+ * and the length in bytes as a size_t. Examples:
+ *
+ * len = redisFormatCommand(target, "GET %s", mykey);
+ * len = redisFormatCommand(target, "SET %s %b", mykey, myval, myvallen);
+ */
+int redisFormatCommand(char **target, const char *format, ...) {
+    va_list ap;
+    int len;
+    va_start(ap,format);
+    len = redisvFormatCommand(target,format,ap);
+    va_end(ap);
+
+    /* The API says "-1" means bad result, but we now also return "-2" in some
+     * cases.  Force the return value to always be -1. */
+    if (len < 0)
+        len = -1;
+
+    return len;
+}
+
+/* Format a command according to the Redis protocol using an sds string and
+ * sdscatfmt for the processing of arguments. This function takes the
+ * number of arguments, an array with arguments and an array with their
+ * lengths. If the latter is set to NULL, strlen will be used to compute the
+ * argument lengths.
+ */
+int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
+                              const size_t *argvlen)
+{
+    sds cmd;
+    unsigned long long totlen;
+    int j;
+    size_t len;
+
+    /* Abort on a NULL target */
+    if (target == NULL)
+        return -1;
+
+    /* Calculate our total size */
+    totlen = 1+countDigits(argc)+2;
+    for (j = 0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        totlen += bulklen(len);
+    }
+
+    /* Use an SDS string for command construction */
+    cmd = sdsempty();
+    if (cmd == NULL)
+        return -1;
+
+    /* We already know how much storage we need */
+    cmd = sdsMakeRoomFor(cmd, totlen);
+    if (cmd == NULL)
+        return -1;
+
+    /* Construct command */
+    cmd = sdscatfmt(cmd, "*%i\r\n", argc);
+    for (j=0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        cmd = sdscatfmt(cmd, "$%T\r\n", len);
+        cmd = sdscatlen(cmd, argv[j], len);
+        cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
+    }
+
+    assert(sdslen(cmd)==totlen);
+
+    *target = cmd;
+    return totlen;
+}
+
+void redisFreeSdsCommand(sds cmd) {
+    sdsfree(cmd);
+}
+
+/* Format a command according to the Redis protocol. This function takes the
+ * number of arguments, an array with arguments and an array with their
+ * lengths. If the latter is set to NULL, strlen will be used to compute the
+ * argument lengths.
+ */
+int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen) {
+    char *cmd = NULL; /* final command */
+    int pos; /* position in final command */
+    size_t len;
+    int totlen, j;
+
+    /* Abort on a NULL target */
+    if (target == NULL)
+        return -1;
+
+    /* Calculate number of bytes needed for the command */
+    totlen = 1+countDigits(argc)+2;
+    for (j = 0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        totlen += bulklen(len);
+    }
+
+    /* Build the command at protocol level */
+    cmd = malloc(totlen+1);
+    if (cmd == NULL)
+        return -1;
+
+    pos = sprintf(cmd,"*%d\r\n",argc);
+    for (j = 0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        pos += sprintf(cmd+pos,"$%zu\r\n",len);
+        memcpy(cmd+pos,argv[j],len);
+        pos += len;
+        cmd[pos++] = '\r';
+        cmd[pos++] = '\n';
+    }
+    assert(pos == totlen);
+    cmd[pos] = '\0';
+
+    *target = cmd;
+    return totlen;
+}
+
+void redisFreeCommand(char *cmd) {
+    free(cmd);
+}
+
+void __redisSetError(redisContext *c, int type, const char *str) {
+    size_t len;
+
+    c->err = type;
+    if (str != NULL) {
+        len = strlen(str);
+        len = len < (sizeof(c->errstr)-1) ? len : (sizeof(c->errstr)-1);
+        memcpy(c->errstr,str,len);
+        c->errstr[len] = '\0';
+    } else {
+        /* Only REDIS_ERR_IO may lack a description! */
+        assert(type == REDIS_ERR_IO);
+        __redis_strerror_r(errno, c->errstr, sizeof(c->errstr));
+    }
+}
+
+redisReader *redisReaderCreate(void) {
+    return redisReaderCreateWithFunctions(&defaultFunctions);
+}
+
+static redisContext *redisContextInit(void) {
+    redisContext *c;
+
+    c = calloc(1,sizeof(redisContext));
+    if (c == NULL)
+        return NULL;
+
+    c->err = 0;
+    c->errstr[0] = '\0';
+    c->obuf = sdsempty();
+    c->reader = redisReaderCreate();
+    c->tcp.host = NULL;
+    c->tcp.source_addr = NULL;
+    c->unix_sock.path = NULL;
+    c->timeout = NULL;
+
+    if (c->obuf == NULL || c->reader == NULL) {
+        redisFree(c);
+        return NULL;
+    }
+
+    return c;
+}
+
+void redisFree(redisContext *c) {
+    if (c == NULL)
+        return;
+    if (c->fd > 0)
+        close(c->fd);
+    if (c->obuf != NULL)
+        sdsfree(c->obuf);
+    if (c->reader != NULL)
+        redisReaderFree(c->reader);
+    if (c->tcp.host)
+        free(c->tcp.host);
+    if (c->tcp.source_addr)
+        free(c->tcp.source_addr);
+    if (c->unix_sock.path)
+        free(c->unix_sock.path);
+    if (c->timeout)
+        free(c->timeout);
+    free(c);
+}
+
+int redisFreeKeepFd(redisContext *c) {
+    int fd = c->fd;
+    c->fd = -1;
+    redisFree(c);
+    return fd;
+}
+
+int redisReconnect(redisContext *c) {
+    c->err = 0;
+    memset(c->errstr, '\0', strlen(c->errstr));
+
+    if (c->fd > 0) {
+        close(c->fd);
+    }
+
+    sdsfree(c->obuf);
+    redisReaderFree(c->reader);
+
+    c->obuf = sdsempty();
+    c->reader = redisReaderCreate();
+
+    if (c->connection_type == REDIS_CONN_TCP) {
+        return redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
+                c->timeout, c->tcp.source_addr);
+    } else if (c->connection_type == REDIS_CONN_UNIX) {
+        return redisContextConnectUnix(c, c->unix_sock.path, c->timeout);
+    } else {
+        /* Something bad happened here and shouldn't have. There isn't
+           enough information in the context to reconnect. */
+        __redisSetError(c,REDIS_ERR_OTHER,"Not enough information to reconnect");
+    }
+
+    return REDIS_ERR;
+}
+
+/* Connect to a Redis instance. On error the field error in the returned
+ * context will be set to the return value of the error function.
+ * When no set of reply functions is given, the default set will be used. */
+redisContext *redisConnect(const char *ip, int port) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags |= REDIS_BLOCK;
+    redisContextConnectTcp(c,ip,port,NULL);
+    return c;
+}
+
+redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags |= REDIS_BLOCK;
+    redisContextConnectTcp(c,ip,port,&tv);
+    return c;
+}
+
+redisContext *redisConnectNonBlock(const char *ip, int port) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags &= ~REDIS_BLOCK;
+    redisContextConnectTcp(c,ip,port,NULL);
+    return c;
+}
+
+redisContext *redisConnectBindNonBlock(const char *ip, int port,
+                                       const char *source_addr) {
+    redisContext *c = redisContextInit();
+    c->flags &= ~REDIS_BLOCK;
+    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
+    return c;
+}
+
+redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
+                                                const char *source_addr) {
+    redisContext *c = redisContextInit();
+    c->flags &= ~REDIS_BLOCK;
+    c->flags |= REDIS_REUSEADDR;
+    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
+    return c;
+}
+
+redisContext *redisConnectUnix(const char *path) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags |= REDIS_BLOCK;
+    redisContextConnectUnix(c,path,NULL);
+    return c;
+}
+
+redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags |= REDIS_BLOCK;
+    redisContextConnectUnix(c,path,&tv);
+    return c;
+}
+
+redisContext *redisConnectUnixNonBlock(const char *path) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->flags &= ~REDIS_BLOCK;
+    redisContextConnectUnix(c,path,NULL);
+    return c;
+}
+
+redisContext *redisConnectFd(int fd) {
+    redisContext *c;
+
+    c = redisContextInit();
+    if (c == NULL)
+        return NULL;
+
+    c->fd = fd;
+    c->flags |= REDIS_BLOCK | REDIS_CONNECTED;
+    return c;
+}
+
+/* Set read/write timeout on a blocking socket. */
+int redisSetTimeout(redisContext *c, const struct timeval tv) {
+    if (c->flags & REDIS_BLOCK)
+        return redisContextSetTimeout(c,tv);
+    return REDIS_ERR;
+}
+
+/* Enable connection KeepAlive. */
+int redisEnableKeepAlive(redisContext *c) {
+    if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
+        return REDIS_ERR;
+    return REDIS_OK;
+}
+
+/* Use this function to handle a read event on the descriptor. It will try
+ * and read some bytes from the socket and feed them to the reply parser.
+ *
+ * After this function is called, you may use redisContextReadReply to
+ * see if there is a reply available. */
+int redisBufferRead(redisContext *c) {
+    char buf[1024*16];
+    int nread;
+
+    /* Return early when the context has seen an error. */
+    if (c->err)
+        return REDIS_ERR;
+
+    nread = read(c->fd,buf,sizeof(buf));
+    if (nread == -1) {
+        if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
+            /* Try again later */
+        } else {
+            __redisSetError(c,REDIS_ERR_IO,NULL);
+            return REDIS_ERR;
+        }
+    } else if (nread == 0) {
+        __redisSetError(c,REDIS_ERR_EOF,"Server closed the connection");
+        return REDIS_ERR;
+    } else {
+        if (redisReaderFeed(c->reader,buf,nread) != REDIS_OK) {
+            __redisSetError(c,c->reader->err,c->reader->errstr);
+            return REDIS_ERR;
+        }
+    }
+    return REDIS_OK;
+}
+
+/* Write the output buffer to the socket.
+ *
+ * Returns REDIS_OK when the buffer is empty, or (a part of) the buffer was
+ * successfully written to the socket. When the buffer is empty after the
+ * write operation, "done" is set to 1 (if given).
+ *
+ * Returns REDIS_ERR if an error occurred trying to write and sets
+ * c->errstr to hold the appropriate error string.
+ */
+int redisBufferWrite(redisContext *c, int *done) {
+    int nwritten;
+
+    /* Return early when the context has seen an error. */
+    if (c->err)
+        return REDIS_ERR;
+
+    if (sdslen(c->obuf) > 0) {
+        nwritten = write(c->fd,c->obuf,sdslen(c->obuf));
+        if (nwritten == -1) {
+            if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
+                /* Try again later */
+            } else {
+                __redisSetError(c,REDIS_ERR_IO,NULL);
+                return REDIS_ERR;
+            }
+        } else if (nwritten > 0) {
+            if (nwritten == (signed)sdslen(c->obuf)) {
+                sdsfree(c->obuf);
+                c->obuf = sdsempty();
+            } else {
+                sdsrange(c->obuf,nwritten,-1);
+            }
+        }
+    }
+    if (done != NULL) *done = (sdslen(c->obuf) == 0);
+    return REDIS_OK;
+}
+
+/* Internal helper function to try and get a reply from the reader,
+ * or set an error in the context otherwise. */
+int redisGetReplyFromReader(redisContext *c, void **reply) {
+    if (redisReaderGetReply(c->reader,reply) == REDIS_ERR) {
+        __redisSetError(c,c->reader->err,c->reader->errstr);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+int redisGetReply(redisContext *c, void **reply) {
+    int wdone = 0;
+    void *aux = NULL;
+
+    /* Try to read pending replies */
+    if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
+        return REDIS_ERR;
+
+    /* For the blocking context, flush output buffer and read reply */
+    if (aux == NULL && c->flags & REDIS_BLOCK) {
+        /* Write until done */
+        do {
+            if (redisBufferWrite(c,&wdone) == REDIS_ERR)
+                return REDIS_ERR;
+        } while (!wdone);
+
+        /* Read until there is a reply */
+        do {
+            if (redisBufferRead(c) == REDIS_ERR)
+                return REDIS_ERR;
+            if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
+                return REDIS_ERR;
+        } while (aux == NULL);
+    }
+
+    /* Set reply object */
+    if (reply != NULL) *reply = aux;
+    return REDIS_OK;
+}
+
+
+/* Helper function for the redisAppendCommand* family of functions.
+ *
+ * Write a formatted command to the output buffer. When this family
+ * is used, you need to call redisGetReply yourself to retrieve
+ * the reply (or replies in pub/sub).
+ */
+int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) {
+    sds newbuf;
+
+    newbuf = sdscatlen(c->obuf,cmd,len);
+    if (newbuf == NULL) {
+        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
+        return REDIS_ERR;
+    }
+
+    c->obuf = newbuf;
+    return REDIS_OK;
+}
+
+int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len) {
+
+    if (__redisAppendCommand(c, cmd, len) != REDIS_OK) {
+        return REDIS_ERR;
+    }
+
+    return REDIS_OK;
+}
+
+int redisvAppendCommand(redisContext *c, const char *format, va_list ap) {
+    char *cmd;
+    int len;
+
+    len = redisvFormatCommand(&cmd,format,ap);
+    if (len == -1) {
+        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
+        return REDIS_ERR;
+    } else if (len == -2) {
+        __redisSetError(c,REDIS_ERR_OTHER,"Invalid format string");
+        return REDIS_ERR;
+    }
+
+    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
+        free(cmd);
+        return REDIS_ERR;
+    }
+
+    free(cmd);
+    return REDIS_OK;
+}
+
+int redisAppendCommand(redisContext *c, const char *format, ...) {
+    va_list ap;
+    int ret;
+
+    va_start(ap,format);
+    ret = redisvAppendCommand(c,format,ap);
+    va_end(ap);
+    return ret;
+}
+
+int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
+    sds cmd;
+    int len;
+
+    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
+    if (len == -1) {
+        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
+        return REDIS_ERR;
+    }
+
+    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
+        sdsfree(cmd);
+        return REDIS_ERR;
+    }
+
+    sdsfree(cmd);
+    return REDIS_OK;
+}
+
+/* Helper function for the redisCommand* family of functions.
+ *
+ * Write a formatted command to the output buffer. If the given context is
+ * blocking, immediately read the reply into the "reply" pointer. When the
+ * context is non-blocking, the "reply" pointer will not be used and the
+ * command is simply appended to the write buffer.
+ *
+ * Returns the reply when a reply was successfully retrieved. Returns NULL
+ * otherwise. When NULL is returned in a blocking context, the error field
+ * in the context will be set.
+ */
+static void *__redisBlockForReply(redisContext *c) {
+    void *reply;
+
+    if (c->flags & REDIS_BLOCK) {
+        if (redisGetReply(c,&reply) != REDIS_OK)
+            return NULL;
+        return reply;
+    }
+    return NULL;
+}
+
+void *redisvCommand(redisContext *c, const char *format, va_list ap) {
+    if (redisvAppendCommand(c,format,ap) != REDIS_OK)
+        return NULL;
+    return __redisBlockForReply(c);
+}
+
+void *redisCommand(redisContext *c, const char *format, ...) {
+    va_list ap;
+    void *reply = NULL;
+    va_start(ap,format);
+    reply = redisvCommand(c,format,ap);
+    va_end(ap);
+    return reply;
+}
+
+void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
+    if (redisAppendCommandArgv(c,argc,argv,argvlen) != REDIS_OK)
+        return NULL;
+    return __redisBlockForReply(c);
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/hiredis.h b/debian/modules/nchan/src/store/redis/hiredis/hiredis.h
new file mode 100644
index 0000000..11a75c1
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/hiredis.h
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_H
+#define __HIREDIS_H
+#include "read.h"
+#include <stdarg.h> /* for va_list */
+#include <sys/time.h> /* for struct timeval */
+#include <stdint.h> /* uintXX_t, etc */
+#include "sds.h" /* for sds */
+
+#include <sys/socket.h> /* for struct sockaddr */
+
+#define HIREDIS_MAJOR 0
+#define HIREDIS_MINOR 13
+#define HIREDIS_PATCH 3
+#define HIREDIS_SONAME 0.13
+
+/* Connection type can be blocking or non-blocking and is set in the
+ * least significant bit of the flags field in redisContext. */
+#define REDIS_BLOCK 0x1
+
+/* Connection may be disconnected before being free'd. The second bit
+ * in the flags field is set when the context is connected. */
+#define REDIS_CONNECTED 0x2
+
+/* The async API might try to disconnect cleanly and flush the output
+ * buffer and read all subsequent replies before disconnecting.
+ * This flag means no new commands can come in and the connection
+ * should be terminated once all replies have been read. */
+#define REDIS_DISCONNECTING 0x4
+
+/* Flag specific to the async API which means that the context should be clean
+ * up as soon as possible. */
+#define REDIS_FREEING 0x8
+
+/* Flag that is set when an async callback is executed. */
+#define REDIS_IN_CALLBACK 0x10
+
+/* Flag that is set when the async context has one or more subscriptions. */
+#define REDIS_SUBSCRIBED 0x20
+
+/* Flag that is set when monitor mode is active */
+#define REDIS_MONITORING 0x40
+
+/* Flag that is set when we should set SO_REUSEADDR before calling bind() */
+#define REDIS_REUSEADDR 0x80
+
+#define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
+
+/* number of times we retry to connect in the case of EADDRNOTAVAIL and
+ * SO_REUSEADDR is being used. */
+#define REDIS_CONNECT_RETRIES  10
+
+/* strerror_r has two completely different prototypes and behaviors
+ * depending on system issues, so we need to operate on the error buffer
+ * differently depending on which strerror_r we're using. */
+#ifndef _GNU_SOURCE
+/* "regular" POSIX strerror_r that does the right thing. */
+#define __redis_strerror_r(errno, buf, len)                                    \
+    do {                                                                       \
+        strerror_r((errno), (buf), (len));                                     \
+    } while (0)
+#else
+/* "bad" GNU strerror_r we need to clean up after. */
+#define __redis_strerror_r(errno, buf, len)                                    \
+    do {                                                                       \
+        char *err_str = strerror_r((errno), (buf), (len));                     \
+        /* If return value _isn't_ the start of the buffer we passed in,       \
+         * then GNU strerror_r returned an internal static buffer and we       \
+         * need to copy the result into our private buffer. */                 \
+        if (err_str != (buf)) {                                                \
+            buf[(len)] = '\0';                                                 \
+            strncat((buf), err_str, ((len) - 1));                              \
+        }                                                                      \
+    } while (0)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This is the reply object returned by redisCommand() */
+typedef struct redisReply {
+    int type; /* REDIS_REPLY_* */
+    long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
+    int len; /* Length of string */
+    char *str; /* Used for both REDIS_REPLY_ERROR and REDIS_REPLY_STRING */
+    size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
+    struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
+} redisReply;
+
+redisReader *redisReaderCreate(void);
+
+/* Function to free the reply objects hiredis returns by default. */
+void freeReplyObject(void *reply);
+
+/* Functions to format a command according to the protocol. */
+int redisvFormatCommand(char **target, const char *format, va_list ap);
+int redisFormatCommand(char **target, const char *format, ...);
+int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
+int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
+void redisFreeCommand(char *cmd);
+void redisFreeSdsCommand(sds cmd);
+
+enum redisConnectionType {
+    REDIS_CONN_TCP,
+    REDIS_CONN_UNIX,
+};
+
+/* Context for a connection to Redis */
+typedef struct redisContext {
+    int err; /* Error flags, 0 when there is no error */
+    char errstr[128]; /* String representation of error when applicable */
+    int fd;
+    struct sockaddr sockaddr;
+    int flags;
+    char *obuf; /* Write buffer */
+    redisReader *reader; /* Protocol reader */
+
+    enum redisConnectionType connection_type;
+    struct timeval *timeout;
+
+    struct {
+        char *host;
+        char *source_addr;
+        int port;
+    } tcp;
+
+    struct {
+        char *path;
+    } unix_sock;
+
+} redisContext;
+
+redisContext *redisConnect(const char *ip, int port);
+redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
+redisContext *redisConnectNonBlock(const char *ip, int port);
+redisContext *redisConnectBindNonBlock(const char *ip, int port,
+                                       const char *source_addr);
+redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
+                                                const char *source_addr);
+redisContext *redisConnectUnix(const char *path);
+redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
+redisContext *redisConnectUnixNonBlock(const char *path);
+redisContext *redisConnectFd(int fd);
+
+/**
+ * Reconnect the given context using the saved information.
+ *
+ * This re-uses the exact same connect options as in the initial connection.
+ * host, ip (or path), timeout and bind address are reused,
+ * flags are used unmodified from the existing context.
+ *
+ * Returns REDIS_OK on successful connect or REDIS_ERR otherwise.
+ */
+int redisReconnect(redisContext *c);
+
+int redisSetTimeout(redisContext *c, const struct timeval tv);
+int redisEnableKeepAlive(redisContext *c);
+void redisFree(redisContext *c);
+int redisFreeKeepFd(redisContext *c);
+int redisBufferRead(redisContext *c);
+int redisBufferWrite(redisContext *c, int *done);
+
+/* In a blocking context, this function first checks if there are unconsumed
+ * replies to return and returns one if so. Otherwise, it flushes the output
+ * buffer to the socket and reads until it has a reply. In a non-blocking
+ * context, it will return unconsumed replies until there are no more. */
+int redisGetReply(redisContext *c, void **reply);
+int redisGetReplyFromReader(redisContext *c, void **reply);
+
+/* Write a formatted command to the output buffer. Use these functions in blocking mode
+ * to get a pipeline of commands. */
+int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
+
+/* Write a command to the output buffer. Use these functions in blocking mode
+ * to get a pipeline of commands. */
+int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
+int redisAppendCommand(redisContext *c, const char *format, ...);
+int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+
+/* Issue a command to Redis. In a blocking context, it is identical to calling
+ * redisAppendCommand, followed by redisGetReply. The function will return
+ * NULL if there was an error in performing the request, otherwise it will
+ * return the reply. In a non-blocking context, it is identical to calling
+ * only redisAppendCommand and will always return NULL. */
+void *redisvCommand(redisContext *c, const char *format, va_list ap);
+void *redisCommand(redisContext *c, const char *format, ...);
+void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/net.c b/debian/modules/nchan/src/store/redis/hiredis/net.c
new file mode 100644
index 0000000..f874901
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/net.c
@@ -0,0 +1,461 @@
+/* Extracted from anet.c to work properly with Hiredis error reporting.
+ *
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <netdb.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <poll.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#include "net.h"
+#include "sds.h"
+
+/* Defined in hiredis.c */
+void __redisSetError(redisContext *c, int type, const char *str);
+
+static void redisContextCloseFd(redisContext *c) {
+    if (c && c->fd >= 0) {
+        close(c->fd);
+        c->fd = -1;
+    }
+}
+
+static void __redisSetErrorFromErrno(redisContext *c, int type, const char *prefix) {
+    char buf[128] = { 0 };
+    size_t len = 0;
+
+    if (prefix != NULL)
+        len = snprintf(buf,sizeof(buf),"%s: ",prefix);
+    __redis_strerror_r(errno, (char *)(buf + len), sizeof(buf) - len);
+    __redisSetError(c,type,buf);
+}
+
+static int redisSetReuseAddr(redisContext *c) {
+    int on = 1;
+    if (setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+        redisContextCloseFd(c);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+static int redisCreateSocket(redisContext *c, int type) {
+    int s;
+    if ((s = socket(type, SOCK_STREAM, 0)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+        return REDIS_ERR;
+    }
+    c->fd = s;
+    if (type == AF_INET) {
+        if (redisSetReuseAddr(c) == REDIS_ERR) {
+            return REDIS_ERR;
+        }
+    }
+    return REDIS_OK;
+}
+
+static int redisSetBlocking(redisContext *c, int blocking) {
+    int flags;
+
+    /* Set the socket nonblocking.
+     * Note that fcntl(2) for F_GETFL and F_SETFL can't be
+     * interrupted by a signal. */
+    if ((flags = fcntl(c->fd, F_GETFL)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_GETFL)");
+        redisContextCloseFd(c);
+        return REDIS_ERR;
+    }
+
+    if (blocking)
+        flags &= ~O_NONBLOCK;
+    else
+        flags |= O_NONBLOCK;
+
+    if (fcntl(c->fd, F_SETFL, flags) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_SETFL)");
+        redisContextCloseFd(c);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+int redisKeepAlive(redisContext *c, int interval) {
+    int val = 1;
+    int fd = c->fd;
+
+    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == -1){
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = interval;
+
+#ifdef _OSX
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+#else
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
+    val = interval;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = interval/3;
+    if (val == 0) val = 1;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = 3;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+#endif
+#endif
+
+    return REDIS_OK;
+}
+
+static int redisSetTcpNoDelay(redisContext *c) {
+    int yes = 1;
+    if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(TCP_NODELAY)");
+        redisContextCloseFd(c);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+#define __MAX_MSEC (((LONG_MAX) - 999) / 1000)
+
+static int redisContextWaitReady(redisContext *c, const struct timeval *timeout) {
+    struct pollfd   wfd[1];
+    long msec;
+
+    msec          = -1;
+    wfd[0].fd     = c->fd;
+    wfd[0].events = POLLOUT;
+
+    /* Only use timeout when not NULL. */
+    if (timeout != NULL) {
+        if (timeout->tv_usec > 1000000 || timeout->tv_sec > __MAX_MSEC) {
+            __redisSetErrorFromErrno(c, REDIS_ERR_IO, NULL);
+            redisContextCloseFd(c);
+            return REDIS_ERR;
+        }
+
+        msec = (timeout->tv_sec * 1000) + ((timeout->tv_usec + 999) / 1000);
+
+        if (msec < 0 || msec > INT_MAX) {
+            msec = INT_MAX;
+        }
+    }
+
+    if (errno == EINPROGRESS) {
+        int res;
+
+        if ((res = poll(wfd, 1, msec)) == -1) {
+            __redisSetErrorFromErrno(c, REDIS_ERR_IO, "poll(2)");
+            redisContextCloseFd(c);
+            return REDIS_ERR;
+        } else if (res == 0) {
+            errno = ETIMEDOUT;
+            __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+            redisContextCloseFd(c);
+            return REDIS_ERR;
+        }
+
+        if (redisCheckSocketError(c) != REDIS_OK)
+            return REDIS_ERR;
+
+        return REDIS_OK;
+    }
+
+    __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+    redisContextCloseFd(c);
+    return REDIS_ERR;
+}
+
+int redisCheckSocketError(redisContext *c) {
+    int err = 0;
+    socklen_t errlen = sizeof(err);
+
+    if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"getsockopt(SO_ERROR)");
+        return REDIS_ERR;
+    }
+
+    if (err) {
+        errno = err;
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+        return REDIS_ERR;
+    }
+
+    return REDIS_OK;
+}
+
+int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
+    if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,&tv,sizeof(tv)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_RCVTIMEO)");
+        return REDIS_ERR;
+    }
+    if (setsockopt(c->fd,SOL_SOCKET,SO_SNDTIMEO,&tv,sizeof(tv)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_SNDTIMEO)");
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
+                                   const struct timeval *timeout,
+                                   const char *source_addr) {
+    int s, rv, n;
+    char _port[6];  /* strlen("65535"); */
+    struct addrinfo hints, *servinfo, *bservinfo, *p, *b;
+    int blocking = (c->flags & REDIS_BLOCK);
+    int reuseaddr = (c->flags & REDIS_REUSEADDR);
+    int reuses = 0;
+
+    c->connection_type = REDIS_CONN_TCP;
+    c->tcp.port = port;
+
+    /* We need to take possession of the passed parameters
+     * to make them reusable for a reconnect.
+     * We also carefully check we don't free data we already own,
+     * as in the case of the reconnect method.
+     *
+     * This is a bit ugly, but atleast it works and doesn't leak memory.
+     **/
+    if (c->tcp.host != addr) {
+        if (c->tcp.host)
+            free(c->tcp.host);
+
+        c->tcp.host = strdup(addr);
+    }
+
+    if (timeout) {
+        if (c->timeout != timeout) {
+            if (c->timeout == NULL)
+                c->timeout = malloc(sizeof(struct timeval));
+
+            memcpy(c->timeout, timeout, sizeof(struct timeval));
+        }
+    } else {
+        if (c->timeout)
+            free(c->timeout);
+        c->timeout = NULL;
+    }
+
+    if (source_addr == NULL) {
+        free(c->tcp.source_addr);
+        c->tcp.source_addr = NULL;
+    } else if (c->tcp.source_addr != source_addr) {
+        free(c->tcp.source_addr);
+        c->tcp.source_addr = strdup(source_addr);
+    }
+    c->sockaddr.sa_family = AF_UNSPEC;
+    
+    snprintf(_port, 6, "%d", port);
+    memset(&hints,0,sizeof(hints));
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+
+    /* Try with IPv6 if no IPv4 address was found. We do it in this order since
+     * in a Redis client you can't afford to test if you have IPv6 connectivity
+     * as this would add latency to every connect. Otherwise a more sensible
+     * route could be: Use IPv6 if both addresses are available and there is IPv6
+     * connectivity. */
+    if ((rv = getaddrinfo(c->tcp.host,_port,&hints,&servinfo)) != 0) {
+         hints.ai_family = AF_INET6;
+         if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) {
+            __redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv));
+            return REDIS_ERR;
+        }
+    }
+    for (p = servinfo; p != NULL; p = p->ai_next) {
+addrretry:
+        if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == -1)
+            continue;
+
+        c->fd = s;
+        if (redisSetBlocking(c,0) != REDIS_OK)
+            goto error;
+        if (c->tcp.source_addr) {
+            int bound = 0;
+            /* Using getaddrinfo saves us from self-determining IPv4 vs IPv6 */
+            if ((rv = getaddrinfo(c->tcp.source_addr, NULL, &hints, &bservinfo)) != 0) {
+                char buf[128];
+                snprintf(buf,sizeof(buf),"Can't get addr: %s",gai_strerror(rv));
+                __redisSetError(c,REDIS_ERR_OTHER,buf);
+                goto error;
+            }
+
+            if (reuseaddr) {
+                n = 1;
+                if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*) &n,
+                               sizeof(n)) < 0) {
+                    goto error;
+                }
+            }
+
+            for (b = bservinfo; b != NULL; b = b->ai_next) {
+                if (bind(s,b->ai_addr,b->ai_addrlen) != -1) {
+                    bound = 1;
+                    break;
+                }
+            }
+            freeaddrinfo(bservinfo);
+            if (!bound) {
+                char buf[128];
+                snprintf(buf,sizeof(buf),"Can't bind socket: %s",strerror(errno));
+                __redisSetError(c,REDIS_ERR_OTHER,buf);
+                goto error;
+            }
+        }
+        if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
+            if (errno == EHOSTUNREACH) {
+                redisContextCloseFd(c);
+                continue;
+            } else if (errno == EINPROGRESS && !blocking) {
+                /* This is ok. */
+            } else if (errno == EADDRNOTAVAIL && reuseaddr) {
+                if (++reuses >= REDIS_CONNECT_RETRIES) {
+                    goto error;
+                } else {
+                    goto addrretry;
+                }
+            } else {
+                if (redisContextWaitReady(c,c->timeout) != REDIS_OK)
+                    goto error;
+            }
+        }
+        if (blocking && redisSetBlocking(c,1) != REDIS_OK)
+            goto error;
+        if (redisSetTcpNoDelay(c) != REDIS_OK)
+            goto error;
+        
+        c->sockaddr = *p->ai_addr;
+        
+        c->flags |= REDIS_CONNECTED;
+        rv = REDIS_OK;
+        goto end;
+    }
+    if (p == NULL) {
+        char buf[128];
+        snprintf(buf,sizeof(buf),"Can't create socket: %s",strerror(errno));
+        __redisSetError(c,REDIS_ERR_OTHER,buf);
+        goto error;
+    }
+
+error:
+    rv = REDIS_ERR;
+end:
+    freeaddrinfo(servinfo);
+    return rv;  // Need to return REDIS_OK if alright
+}
+
+int redisContextConnectTcp(redisContext *c, const char *addr, int port,
+                           const struct timeval *timeout) {
+    return _redisContextConnectTcp(c, addr, port, timeout, NULL);
+}
+
+int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
+                               const struct timeval *timeout,
+                               const char *source_addr) {
+    return _redisContextConnectTcp(c, addr, port, timeout, source_addr);
+}
+
+int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout) {
+    int blocking = (c->flags & REDIS_BLOCK);
+    struct sockaddr_un sa;
+
+    if (redisCreateSocket(c,AF_LOCAL) < 0)
+        return REDIS_ERR;
+    if (redisSetBlocking(c,0) != REDIS_OK)
+        return REDIS_ERR;
+
+    c->connection_type = REDIS_CONN_UNIX;
+    if (c->unix_sock.path != path)
+        c->unix_sock.path = strdup(path);
+
+    if (timeout) {
+        if (c->timeout != timeout) {
+            if (c->timeout == NULL)
+                c->timeout = malloc(sizeof(struct timeval));
+
+            memcpy(c->timeout, timeout, sizeof(struct timeval));
+        }
+    } else {
+        if (c->timeout)
+            free(c->timeout);
+        c->timeout = NULL;
+    }
+
+    sa.sun_family = AF_LOCAL;
+    strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
+    if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
+        if (errno == EINPROGRESS && !blocking) {
+            /* This is ok. */
+        } else {
+            if (redisContextWaitReady(c,c->timeout) != REDIS_OK)
+                return REDIS_ERR;
+        }
+    }
+
+    /* Reset socket to be blocking after connect(2). */
+    if (blocking && redisSetBlocking(c,1) != REDIS_OK)
+        return REDIS_ERR;
+
+    c->flags |= REDIS_CONNECTED;
+    return REDIS_OK;
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/net.h b/debian/modules/nchan/src/store/redis/hiredis/net.h
new file mode 100644
index 0000000..2f1a0bf
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/net.h
@@ -0,0 +1,53 @@
+/* Extracted from anet.c to work properly with Hiredis error reporting.
+ *
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __NET_H
+#define __NET_H
+
+#include "hiredis.h"
+
+#if defined(__sun)
+#define AF_LOCAL AF_UNIX
+#endif
+
+int redisCheckSocketError(redisContext *c);
+int redisContextSetTimeout(redisContext *c, const struct timeval tv);
+int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
+int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
+                               const struct timeval *timeout,
+                               const char *source_addr);
+int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
+int redisKeepAlive(redisContext *c, int interval);
+
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/read.c b/debian/modules/nchan/src/store/redis/hiredis/read.c
new file mode 100644
index 0000000..df1a467
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/read.c
@@ -0,0 +1,525 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#include "fmacros.h"
+#include <string.h>
+#include <stdlib.h>
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
+#include <assert.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "read.h"
+#include "sds.h"
+
+static void __redisReaderSetError(redisReader *r, int type, const char *str) {
+    size_t len;
+
+    if (r->reply != NULL && r->fn && r->fn->freeObject) {
+        r->fn->freeObject(r->reply);
+        r->reply = NULL;
+    }
+
+    /* Clear input buffer on errors. */
+    if (r->buf != NULL) {
+        sdsfree(r->buf);
+        r->buf = NULL;
+        r->pos = r->len = 0;
+    }
+
+    /* Reset task stack. */
+    r->ridx = -1;
+
+    /* Set error. */
+    r->err = type;
+    len = strlen(str);
+    len = len < (sizeof(r->errstr)-1) ? len : (sizeof(r->errstr)-1);
+    memcpy(r->errstr,str,len);
+    r->errstr[len] = '\0';
+}
+
+static size_t chrtos(char *buf, size_t size, char byte) {
+    size_t len = 0;
+
+    switch(byte) {
+    case '\\':
+    case '"':
+        len = snprintf(buf,size,"\"\\%c\"",byte);
+        break;
+    case '\n': len = snprintf(buf,size,"\"\\n\""); break;
+    case '\r': len = snprintf(buf,size,"\"\\r\""); break;
+    case '\t': len = snprintf(buf,size,"\"\\t\""); break;
+    case '\a': len = snprintf(buf,size,"\"\\a\""); break;
+    case '\b': len = snprintf(buf,size,"\"\\b\""); break;
+    default:
+        if (isprint(byte))
+            len = snprintf(buf,size,"\"%c\"",byte);
+        else
+            len = snprintf(buf,size,"\"\\x%02x\"",(unsigned char)byte);
+        break;
+    }
+
+    return len;
+}
+
+static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte) {
+    char cbuf[8], sbuf[128];
+
+    chrtos(cbuf,sizeof(cbuf),byte);
+    snprintf(sbuf,sizeof(sbuf),
+        "Protocol error, got %s as reply type byte", cbuf);
+    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
+}
+
+static void __redisReaderSetErrorOOM(redisReader *r) {
+    __redisReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
+}
+
+static char *readBytes(redisReader *r, unsigned int bytes) {
+    char *p;
+    if (r->len-r->pos >= bytes) {
+        p = r->buf+r->pos;
+        r->pos += bytes;
+        return p;
+    }
+    return NULL;
+}
+
+/* Find pointer to \r\n. */
+static char *seekNewline(char *s, size_t len) {
+    int pos = 0;
+    int _len = len-1;
+
+    /* Position should be < len-1 because the character at "pos" should be
+     * followed by a \n. Note that strchr cannot be used because it doesn't
+     * allow to search a limited length and the buffer that is being searched
+     * might not have a trailing NULL character. */
+    while (pos < _len) {
+        while(pos < _len && s[pos] != '\r') pos++;
+        if (s[pos] != '\r') {
+            /* Not found. */
+            return NULL;
+        } else {
+            if (s[pos+1] == '\n') {
+                /* Found. */
+                return s+pos;
+            } else {
+                /* Continue searching. */
+                pos++;
+            }
+        }
+    }
+    return NULL;
+}
+
+/* Read a long long value starting at *s, under the assumption that it will be
+ * terminated by \r\n. Ambiguously returns -1 for unexpected input. */
+static long long readLongLong(char *s) {
+    long long v = 0;
+    int dec, mult = 1;
+    char c;
+
+    if (*s == '-') {
+        mult = -1;
+        s++;
+    } else if (*s == '+') {
+        mult = 1;
+        s++;
+    }
+
+    while ((c = *(s++)) != '\r') {
+        dec = c - '0';
+        if (dec >= 0 && dec < 10) {
+            v *= 10;
+            v += dec;
+        } else {
+            /* Should not happen... */
+            return -1;
+        }
+    }
+
+    return mult*v;
+}
+
+static char *readLine(redisReader *r, int *_len) {
+    char *p, *s;
+    int len;
+
+    p = r->buf+r->pos;
+    s = seekNewline(p,(r->len-r->pos));
+    if (s != NULL) {
+        len = s-(r->buf+r->pos);
+        r->pos += len+2; /* skip \r\n */
+        if (_len) *_len = len;
+        return p;
+    }
+    return NULL;
+}
+
+static void moveToNextTask(redisReader *r) {
+    redisReadTask *cur, *prv;
+    while (r->ridx >= 0) {
+        /* Return a.s.a.p. when the stack is now empty. */
+        if (r->ridx == 0) {
+            r->ridx--;
+            return;
+        }
+
+        cur = &(r->rstack[r->ridx]);
+        prv = &(r->rstack[r->ridx-1]);
+        assert(prv->type == REDIS_REPLY_ARRAY);
+        if (cur->idx == prv->elements-1) {
+            r->ridx--;
+        } else {
+            /* Reset the type because the next item can be anything */
+            assert(cur->idx < prv->elements);
+            cur->type = -1;
+            cur->elements = -1;
+            cur->idx++;
+            return;
+        }
+    }
+}
+
+static int processLineItem(redisReader *r) {
+    redisReadTask *cur = &(r->rstack[r->ridx]);
+    void *obj;
+    char *p;
+    int len;
+
+    if ((p = readLine(r,&len)) != NULL) {
+        if (cur->type == REDIS_REPLY_INTEGER) {
+            if (r->fn && r->fn->createInteger)
+                obj = r->fn->createInteger(cur,readLongLong(p));
+            else
+                obj = (void*)REDIS_REPLY_INTEGER;
+        } else {
+            /* Type will be error or status. */
+            if (r->fn && r->fn->createString)
+                obj = r->fn->createString(cur,p,len);
+            else
+                obj = (void*)(size_t)(cur->type);
+        }
+
+        if (obj == NULL) {
+            __redisReaderSetErrorOOM(r);
+            return REDIS_ERR;
+        }
+
+        /* Set reply if this is the root object. */
+        if (r->ridx == 0) r->reply = obj;
+        moveToNextTask(r);
+        return REDIS_OK;
+    }
+
+    return REDIS_ERR;
+}
+
+static int processBulkItem(redisReader *r) {
+    redisReadTask *cur = &(r->rstack[r->ridx]);
+    void *obj = NULL;
+    char *p, *s;
+    long len;
+    unsigned long bytelen;
+    int success = 0;
+
+    p = r->buf+r->pos;
+    s = seekNewline(p,r->len-r->pos);
+    if (s != NULL) {
+        p = r->buf+r->pos;
+        bytelen = s-(r->buf+r->pos)+2; /* include \r\n */
+        len = readLongLong(p);
+
+        if (len < 0) {
+            /* The nil object can always be created. */
+            if (r->fn && r->fn->createNil)
+                obj = r->fn->createNil(cur);
+            else
+                obj = (void*)REDIS_REPLY_NIL;
+            success = 1;
+        } else {
+            /* Only continue when the buffer contains the entire bulk item. */
+            bytelen += len+2; /* include \r\n */
+            if (r->pos+bytelen <= r->len) {
+                if (r->fn && r->fn->createString)
+                    obj = r->fn->createString(cur,s+2,len);
+                else
+                    obj = (void*)REDIS_REPLY_STRING;
+                success = 1;
+            }
+        }
+
+        /* Proceed when obj was created. */
+        if (success) {
+            if (obj == NULL) {
+                __redisReaderSetErrorOOM(r);
+                return REDIS_ERR;
+            }
+
+            r->pos += bytelen;
+
+            /* Set reply if this is the root object. */
+            if (r->ridx == 0) r->reply = obj;
+            moveToNextTask(r);
+            return REDIS_OK;
+        }
+    }
+
+    return REDIS_ERR;
+}
+
+static int processMultiBulkItem(redisReader *r) {
+    redisReadTask *cur = &(r->rstack[r->ridx]);
+    void *obj;
+    char *p;
+    long elements;
+    int root = 0;
+
+    /* Set error for nested multi bulks with depth > 7 */
+    if (r->ridx == 8) {
+        __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+            "No support for nested multi bulk replies with depth > 7");
+        return REDIS_ERR;
+    }
+
+    if ((p = readLine(r,NULL)) != NULL) {
+        elements = readLongLong(p);
+        root = (r->ridx == 0);
+
+        if (elements == -1) {
+            if (r->fn && r->fn->createNil)
+                obj = r->fn->createNil(cur);
+            else
+                obj = (void*)REDIS_REPLY_NIL;
+
+            if (obj == NULL) {
+                __redisReaderSetErrorOOM(r);
+                return REDIS_ERR;
+            }
+
+            moveToNextTask(r);
+        } else {
+            if (r->fn && r->fn->createArray)
+                obj = r->fn->createArray(cur,elements);
+            else
+                obj = (void*)REDIS_REPLY_ARRAY;
+
+            if (obj == NULL) {
+                __redisReaderSetErrorOOM(r);
+                return REDIS_ERR;
+            }
+
+            /* Modify task stack when there are more than 0 elements. */
+            if (elements > 0) {
+                cur->elements = elements;
+                cur->obj = obj;
+                r->ridx++;
+                r->rstack[r->ridx].type = -1;
+                r->rstack[r->ridx].elements = -1;
+                r->rstack[r->ridx].idx = 0;
+                r->rstack[r->ridx].obj = NULL;
+                r->rstack[r->ridx].parent = cur;
+                r->rstack[r->ridx].privdata = r->privdata;
+            } else {
+                moveToNextTask(r);
+            }
+        }
+
+        /* Set reply if this is the root object. */
+        if (root) r->reply = obj;
+        return REDIS_OK;
+    }
+
+    return REDIS_ERR;
+}
+
+static int processItem(redisReader *r) {
+    redisReadTask *cur = &(r->rstack[r->ridx]);
+    char *p;
+
+    /* check if we need to read type */
+    if (cur->type < 0) {
+        if ((p = readBytes(r,1)) != NULL) {
+            switch (p[0]) {
+            case '-':
+                cur->type = REDIS_REPLY_ERROR;
+                break;
+            case '+':
+                cur->type = REDIS_REPLY_STATUS;
+                break;
+            case ':':
+                cur->type = REDIS_REPLY_INTEGER;
+                break;
+            case '$':
+                cur->type = REDIS_REPLY_STRING;
+                break;
+            case '*':
+                cur->type = REDIS_REPLY_ARRAY;
+                break;
+            default:
+                __redisReaderSetErrorProtocolByte(r,*p);
+                return REDIS_ERR;
+            }
+        } else {
+            /* could not consume 1 byte */
+            return REDIS_ERR;
+        }
+    }
+
+    /* process typed item */
+    switch(cur->type) {
+    case REDIS_REPLY_ERROR:
+    case REDIS_REPLY_STATUS:
+    case REDIS_REPLY_INTEGER:
+        return processLineItem(r);
+    case REDIS_REPLY_STRING:
+        return processBulkItem(r);
+    case REDIS_REPLY_ARRAY:
+        return processMultiBulkItem(r);
+    default:
+        assert(NULL);
+        return REDIS_ERR; /* Avoid warning. */
+    }
+}
+
+redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
+    redisReader *r;
+
+    r = calloc(sizeof(redisReader),1);
+    if (r == NULL)
+        return NULL;
+
+    r->err = 0;
+    r->errstr[0] = '\0';
+    r->fn = fn;
+    r->buf = sdsempty();
+    r->maxbuf = REDIS_READER_MAX_BUF;
+    if (r->buf == NULL) {
+        free(r);
+        return NULL;
+    }
+
+    r->ridx = -1;
+    return r;
+}
+
+void redisReaderFree(redisReader *r) {
+    if (r->reply != NULL && r->fn && r->fn->freeObject)
+        r->fn->freeObject(r->reply);
+    if (r->buf != NULL)
+        sdsfree(r->buf);
+    free(r);
+}
+
+int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
+    sds newbuf;
+
+    /* Return early when this reader is in an erroneous state. */
+    if (r->err)
+        return REDIS_ERR;
+
+    /* Copy the provided buffer. */
+    if (buf != NULL && len >= 1) {
+        /* Destroy internal buffer when it is empty and is quite large. */
+        if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) {
+            sdsfree(r->buf);
+            r->buf = sdsempty();
+            r->pos = 0;
+
+            /* r->buf should not be NULL since we just free'd a larger one. */
+            assert(r->buf != NULL);
+        }
+
+        newbuf = sdscatlen(r->buf,buf,len);
+        if (newbuf == NULL) {
+            __redisReaderSetErrorOOM(r);
+            return REDIS_ERR;
+        }
+
+        r->buf = newbuf;
+        r->len = sdslen(r->buf);
+    }
+
+    return REDIS_OK;
+}
+
+int redisReaderGetReply(redisReader *r, void **reply) {
+    /* Default target pointer to NULL. */
+    if (reply != NULL)
+        *reply = NULL;
+
+    /* Return early when this reader is in an erroneous state. */
+    if (r->err)
+        return REDIS_ERR;
+
+    /* When the buffer is empty, there will never be a reply. */
+    if (r->len == 0)
+        return REDIS_OK;
+
+    /* Set first item to process when the stack is empty. */
+    if (r->ridx == -1) {
+        r->rstack[0].type = -1;
+        r->rstack[0].elements = -1;
+        r->rstack[0].idx = -1;
+        r->rstack[0].obj = NULL;
+        r->rstack[0].parent = NULL;
+        r->rstack[0].privdata = r->privdata;
+        r->ridx = 0;
+    }
+
+    /* Process items in reply. */
+    while (r->ridx >= 0)
+        if (processItem(r) != REDIS_OK)
+            break;
+
+    /* Return ASAP when an error occurred. */
+    if (r->err)
+        return REDIS_ERR;
+
+    /* Discard part of the buffer when we've consumed at least 1k, to avoid
+     * doing unnecessary calls to memmove() in sds.c. */
+    if (r->pos >= 1024) {
+        sdsrange(r->buf,r->pos,-1);
+        r->pos = 0;
+        r->len = sdslen(r->buf);
+    }
+
+    /* Emit a reply when there is one. */
+    if (r->ridx == -1) {
+        if (reply != NULL)
+            *reply = r->reply;
+        r->reply = NULL;
+    }
+    return REDIS_OK;
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/read.h b/debian/modules/nchan/src/store/redis/hiredis/read.h
new file mode 100644
index 0000000..180e6c6
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/read.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#ifndef __HIREDIS_READ_H
+#define __HIREDIS_READ_H
+#include <stdio.h> /* for size_t */
+
+#define REDIS_ERR -1
+#define REDIS_OK 0
+
+/* When an error occurs, the err flag in a context is set to hold the type of
+ * error that occurred. REDIS_ERR_IO means there was an I/O error and you
+ * should use the "errno" variable to find out what is wrong.
+ * For other values, the "errstr" field will hold a description. */
+#define REDIS_ERR_IO 1 /* Error in read or write */
+#define REDIS_ERR_EOF 3 /* End of file */
+#define REDIS_ERR_PROTOCOL 4 /* Protocol error */
+#define REDIS_ERR_OOM 5 /* Out of memory */
+#define REDIS_ERR_OTHER 2 /* Everything else... */
+
+#define REDIS_REPLY_STRING 1
+#define REDIS_REPLY_ARRAY 2
+#define REDIS_REPLY_INTEGER 3
+#define REDIS_REPLY_NIL 4
+#define REDIS_REPLY_STATUS 5
+#define REDIS_REPLY_ERROR 6
+
+#define REDIS_READER_MAX_BUF (1024*16)  /* Default max unused reader buffer. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct redisReadTask {
+    int type;
+    int elements; /* number of elements in multibulk container */
+    int idx; /* index in parent (array) object */
+    void *obj; /* holds user-generated value for a read task */
+    struct redisReadTask *parent; /* parent task */
+    void *privdata; /* user-settable arbitrary field */
+} redisReadTask;
+
+typedef struct redisReplyObjectFunctions {
+    void *(*createString)(const redisReadTask*, char*, size_t);
+    void *(*createArray)(const redisReadTask*, int);
+    void *(*createInteger)(const redisReadTask*, long long);
+    void *(*createNil)(const redisReadTask*);
+    void (*freeObject)(void*);
+} redisReplyObjectFunctions;
+
+typedef struct redisReader {
+    int err; /* Error flags, 0 when there is no error */
+    char errstr[128]; /* String representation of error when applicable */
+
+    char *buf; /* Read buffer */
+    size_t pos; /* Buffer cursor */
+    size_t len; /* Buffer length */
+    size_t maxbuf; /* Max length of unused buffer */
+
+    redisReadTask rstack[9];
+    int ridx; /* Index of current read task */
+    void *reply; /* Temporary reply pointer */
+
+    redisReplyObjectFunctions *fn;
+    void *privdata;
+} redisReader;
+
+/* Public API for the protocol parser. */
+redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn);
+void redisReaderFree(redisReader *r);
+int redisReaderFeed(redisReader *r, const char *buf, size_t len);
+int redisReaderGetReply(redisReader *r, void **reply);
+
+/* Backwards compatibility, can be removed on big version bump. */
+#define redisReplyReaderCreate redisReaderCreate
+#define redisReplyReaderFree redisReaderFree
+#define redisReplyReaderFeed redisReaderFeed
+#define redisReplyReaderGetReply redisReaderGetReply
+#define redisReplyReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
+#define redisReplyReaderGetObject(_r) (((redisReader*)(_r))->reply)
+#define redisReplyReaderGetError(_r) (((redisReader*)(_r))->errstr)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sds.c b/debian/modules/nchan/src/store/redis/hiredis/sds.c
new file mode 100644
index 0000000..f01247d
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/sds.c
@@ -0,0 +1,1095 @@
+/* SDS (Simple Dynamic Strings), A C dynamic strings library.
+ *
+ * Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+
+#include "sds.h"
+
+/* Create a new sds string with the content specified by the 'init' pointer
+ * and 'initlen'.
+ * If NULL is used for 'init' the string is initialized with zero bytes.
+ *
+ * The string is always null-termined (all the sds strings are, always) so
+ * even if you create an sds string with:
+ *
+ * mystring = sdsnewlen("abc",3");
+ *
+ * You can print the string with printf() as there is an implicit \0 at the
+ * end of the string. However the string is binary safe and can contain
+ * \0 characters in the middle, as the length is stored in the sds header. */
+sds sdsnewlen(const void *init, size_t initlen) {
+    struct sdshdr *sh;
+
+    if (init) {
+        sh = malloc(sizeof *sh+initlen+1);
+    } else {
+        sh = calloc(sizeof *sh+initlen+1,1);
+    }
+    if (sh == NULL) return NULL;
+    sh->len = initlen;
+    sh->free = 0;
+    if (initlen && init)
+        memcpy(sh->buf, init, initlen);
+    sh->buf[initlen] = '\0';
+    return (char*)sh->buf;
+}
+
+/* Create an empty (zero length) sds string. Even in this case the string
+ * always has an implicit null term. */
+sds sdsempty(void) {
+    return sdsnewlen("",0);
+}
+
+/* Create a new sds string starting from a null termined C string. */
+sds sdsnew(const char *init) {
+    size_t initlen = (init == NULL) ? 0 : strlen(init);
+    return sdsnewlen(init, initlen);
+}
+
+/* Duplicate an sds string. */
+sds sdsdup(const sds s) {
+    return sdsnewlen(s, sdslen(s));
+}
+
+/* Free an sds string. No operation is performed if 's' is NULL. */
+void sdsfree(sds s) {
+    if (s == NULL) return;
+    free(s-sizeof(struct sdshdr));
+}
+
+/* Set the sds string length to the length as obtained with strlen(), so
+ * considering as content only up to the first null term character.
+ *
+ * This function is useful when the sds string is hacked manually in some
+ * way, like in the following example:
+ *
+ * s = sdsnew("foobar");
+ * s[2] = '\0';
+ * sdsupdatelen(s);
+ * printf("%d\n", sdslen(s));
+ *
+ * The output will be "2", but if we comment out the call to sdsupdatelen()
+ * the output will be "6" as the string was modified but the logical length
+ * remains 6 bytes. */
+void sdsupdatelen(sds s) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    int reallen = strlen(s);
+    sh->free += (sh->len-reallen);
+    sh->len = reallen;
+}
+
+/* Modify an sds string on-place to make it empty (zero length).
+ * However all the existing buffer is not discarded but set as free space
+ * so that next append operations will not require allocations up to the
+ * number of bytes previously available. */
+void sdsclear(sds s) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    sh->free += sh->len;
+    sh->len = 0;
+    sh->buf[0] = '\0';
+}
+
+/* Enlarge the free space at the end of the sds string so that the caller
+ * is sure that after calling this function can overwrite up to addlen
+ * bytes after the end of the string, plus one more byte for nul term.
+ *
+ * Note: this does not change the *length* of the sds string as returned
+ * by sdslen(), but only the free buffer space we have. */
+sds sdsMakeRoomFor(sds s, size_t addlen) {
+    struct sdshdr *sh, *newsh;
+    size_t free = sdsavail(s);
+    size_t len, newlen;
+
+    if (free >= addlen) return s;
+    len = sdslen(s);
+    sh = (void*) (s-sizeof *sh);
+    newlen = (len+addlen);
+    if (newlen < SDS_MAX_PREALLOC)
+        newlen *= 2;
+    else
+        newlen += SDS_MAX_PREALLOC;
+    newsh = realloc(sh, sizeof *newsh+newlen+1);
+    if (newsh == NULL) return NULL;
+
+    newsh->free = newlen - len;
+    return newsh->buf;
+}
+
+/* Reallocate the sds string so that it has no free space at the end. The
+ * contained string remains not altered, but next concatenation operations
+ * will require a reallocation.
+ *
+ * After the call, the passed sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdsRemoveFreeSpace(sds s) {
+    struct sdshdr *sh;
+
+    sh = (void*) (s-sizeof *sh);
+    sh = realloc(sh, sizeof *sh+sh->len+1);
+    sh->free = 0;
+    return sh->buf;
+}
+
+/* Return the total size of the allocation of the specifed sds string,
+ * including:
+ * 1) The sds header before the pointer.
+ * 2) The string.
+ * 3) The free buffer at the end if any.
+ * 4) The implicit null term.
+ */
+size_t sdsAllocSize(sds s) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+
+    return sizeof(*sh)+sh->len+sh->free+1;
+}
+
+/* Increment the sds length and decrements the left free space at the
+ * end of the string according to 'incr'. Also set the null term
+ * in the new end of the string.
+ *
+ * This function is used in order to fix the string length after the
+ * user calls sdsMakeRoomFor(), writes something after the end of
+ * the current string, and finally needs to set the new length.
+ *
+ * Note: it is possible to use a negative increment in order to
+ * right-trim the string.
+ *
+ * Usage example:
+ *
+ * Using sdsIncrLen() and sdsMakeRoomFor() it is possible to mount the
+ * following schema, to cat bytes coming from the kernel to the end of an
+ * sds string without copying into an intermediate buffer:
+ *
+ * oldlen = sdslen(s);
+ * s = sdsMakeRoomFor(s, BUFFER_SIZE);
+ * nread = read(fd, s+oldlen, BUFFER_SIZE);
+ * ... check for nread <= 0 and handle it ...
+ * sdsIncrLen(s, nread);
+ */
+void sdsIncrLen(sds s, int incr) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+
+    assert(sh->free >= incr);
+    sh->len += incr;
+    sh->free -= incr;
+    assert(sh->free >= 0);
+    s[sh->len] = '\0';
+}
+
+/* Grow the sds to have the specified length. Bytes that were not part of
+ * the original length of the sds will be set to zero.
+ *
+ * if the specified length is smaller than the current length, no operation
+ * is performed. */
+sds sdsgrowzero(sds s, size_t len) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    size_t totlen, curlen = sh->len;
+
+    if (len <= curlen) return s;
+    s = sdsMakeRoomFor(s,len-curlen);
+    if (s == NULL) return NULL;
+
+    /* Make sure added region doesn't contain garbage */
+    sh = (void*)(s-sizeof *sh);
+    memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */
+    totlen = sh->len+sh->free;
+    sh->len = len;
+    sh->free = totlen-sh->len;
+    return s;
+}
+
+/* Append the specified binary-safe string pointed by 't' of 'len' bytes to the
+ * end of the specified sds string 's'.
+ *
+ * After the call, the passed sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscatlen(sds s, const void *t, size_t len) {
+    struct sdshdr *sh;
+    size_t curlen = sdslen(s);
+
+    s = sdsMakeRoomFor(s,len);
+    if (s == NULL) return NULL;
+    sh = (void*) (s-sizeof *sh);
+    memcpy(s+curlen, t, len);
+    sh->len = curlen+len;
+    sh->free = sh->free-len;
+    s[curlen+len] = '\0';
+    return s;
+}
+
+/* Append the specified null termianted C string to the sds string 's'.
+ *
+ * After the call, the passed sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscat(sds s, const char *t) {
+    return sdscatlen(s, t, strlen(t));
+}
+
+/* Append the specified sds 't' to the existing sds 's'.
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscatsds(sds s, const sds t) {
+    return sdscatlen(s, t, sdslen(t));
+}
+
+/* Destructively modify the sds string 's' to hold the specified binary
+ * safe string pointed by 't' of length 'len' bytes. */
+sds sdscpylen(sds s, const char *t, size_t len) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    size_t totlen = sh->free+sh->len;
+
+    if (totlen < len) {
+        s = sdsMakeRoomFor(s,len-sh->len);
+        if (s == NULL) return NULL;
+        sh = (void*) (s-sizeof *sh);
+        totlen = sh->free+sh->len;
+    }
+    memcpy(s, t, len);
+    s[len] = '\0';
+    sh->len = len;
+    sh->free = totlen-len;
+    return s;
+}
+
+/* Like sdscpylen() but 't' must be a null-termined string so that the length
+ * of the string is obtained with strlen(). */
+sds sdscpy(sds s, const char *t) {
+    return sdscpylen(s, t, strlen(t));
+}
+
+/* Helper for sdscatlonglong() doing the actual number -> string
+ * conversion. 's' must point to a string with room for at least
+ * SDS_LLSTR_SIZE bytes.
+ *
+ * The function returns the length of the null-terminated string
+ * representation stored at 's'. */
+#define SDS_LLSTR_SIZE 21
+int sdsll2str(char *s, long long value) {
+    char *p, aux;
+    unsigned long long v;
+    size_t l;
+
+    /* Generate the string representation, this method produces
+     * an reversed string. */
+    v = (value < 0) ? -value : value;
+    p = s;
+    do {
+        *p++ = '0'+(v%10);
+        v /= 10;
+    } while(v);
+    if (value < 0) *p++ = '-';
+
+    /* Compute length and add null term. */
+    l = p-s;
+    *p = '\0';
+
+    /* Reverse the string. */
+    p--;
+    while(s < p) {
+        aux = *s;
+        *s = *p;
+        *p = aux;
+        s++;
+        p--;
+    }
+    return l;
+}
+
+/* Identical sdsll2str(), but for unsigned long long type. */
+int sdsull2str(char *s, unsigned long long v) {
+    char *p, aux;
+    size_t l;
+
+    /* Generate the string representation, this method produces
+     * an reversed string. */
+    p = s;
+    do {
+        *p++ = '0'+(v%10);
+        v /= 10;
+    } while(v);
+
+    /* Compute length and add null term. */
+    l = p-s;
+    *p = '\0';
+
+    /* Reverse the string. */
+    p--;
+    while(s < p) {
+        aux = *s;
+        *s = *p;
+        *p = aux;
+        s++;
+        p--;
+    }
+    return l;
+}
+
+/* Like sdscatpritf() but gets va_list instead of being variadic. */
+sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
+    va_list cpy;
+    char *buf, *t;
+    size_t buflen = 16;
+
+    while(1) {
+        buf = malloc(buflen);
+        if (buf == NULL) return NULL;
+        buf[buflen-2] = '\0';
+        va_copy(cpy,ap);
+        vsnprintf(buf, buflen, fmt, cpy);
+        if (buf[buflen-2] != '\0') {
+            free(buf);
+            buflen *= 2;
+            continue;
+        }
+        break;
+    }
+    t = sdscat(s, buf);
+    free(buf);
+    return t;
+}
+
+/* Append to the sds string 's' a string obtained using printf-alike format
+ * specifier.
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call.
+ *
+ * Example:
+ *
+ * s = sdsnew("Sum is: ");
+ * s = sdscatprintf(s,"%d+%d = %d",a,b,a+b);
+ *
+ * Often you need to create a string from scratch with the printf-alike
+ * format. When this is the need, just use sdsempty() as the target string:
+ *
+ * s = sdscatprintf(sdsempty(), "... your format ...", args);
+ */
+sds sdscatprintf(sds s, const char *fmt, ...) {
+    va_list ap;
+    char *t;
+    va_start(ap, fmt);
+    t = sdscatvprintf(s,fmt,ap);
+    va_end(ap);
+    return t;
+}
+
+/* This function is similar to sdscatprintf, but much faster as it does
+ * not rely on sprintf() family functions implemented by the libc that
+ * are often very slow. Moreover directly handling the sds string as
+ * new data is concatenated provides a performance improvement.
+ *
+ * However this function only handles an incompatible subset of printf-alike
+ * format specifiers:
+ *
+ * %s - C String
+ * %S - SDS string
+ * %i - signed int
+ * %I - 64 bit signed integer (long long, int64_t)
+ * %u - unsigned int
+ * %U - 64 bit unsigned integer (unsigned long long, uint64_t)
+ * %T - A size_t variable.
+ * %% - Verbatim "%" character.
+ */
+sds sdscatfmt(sds s, char const *fmt, ...) {
+    struct sdshdr *sh = (void*) (s-(sizeof(struct sdshdr)));
+    size_t initlen = sdslen(s);
+    const char *f = fmt;
+    int i;
+    va_list ap;
+
+    va_start(ap,fmt);
+    f = fmt;    /* Next format specifier byte to process. */
+    i = initlen; /* Position of the next byte to write to dest str. */
+    while(*f) {
+        char next, *str;
+        int l;
+        long long num;
+        unsigned long long unum;
+
+        /* Make sure there is always space for at least 1 char. */
+        if (sh->free == 0) {
+            s = sdsMakeRoomFor(s,1);
+            sh = (void*) (s-(sizeof(struct sdshdr)));
+        }
+
+        switch(*f) {
+        case '%':
+            next = *(f+1);
+            f++;
+            switch(next) {
+            case 's':
+            case 'S':
+                str = va_arg(ap,char*);
+                l = (next == 's') ? strlen(str) : sdslen(str);
+                if (sh->free < l) {
+                    s = sdsMakeRoomFor(s,l);
+                    sh = (void*) (s-(sizeof(struct sdshdr)));
+                }
+                memcpy(s+i,str,l);
+                sh->len += l;
+                sh->free -= l;
+                i += l;
+                break;
+            case 'i':
+            case 'I':
+                if (next == 'i')
+                    num = va_arg(ap,int);
+                else
+                    num = va_arg(ap,long long);
+                {
+                    char buf[SDS_LLSTR_SIZE];
+                    l = sdsll2str(buf,num);
+                    if (sh->free < l) {
+                        s = sdsMakeRoomFor(s,l);
+                        sh = (void*) (s-(sizeof(struct sdshdr)));
+                    }
+                    memcpy(s+i,buf,l);
+                    sh->len += l;
+                    sh->free -= l;
+                    i += l;
+                }
+                break;
+            case 'u':
+            case 'U':
+            case 'T':
+                if (next == 'u')
+                    unum = va_arg(ap,unsigned int);
+                else if(next == 'U')
+                    unum = va_arg(ap,unsigned long long);
+                else
+                    unum = (unsigned long long)va_arg(ap,size_t);
+                {
+                    char buf[SDS_LLSTR_SIZE];
+                    l = sdsull2str(buf,unum);
+                    if (sh->free < l) {
+                        s = sdsMakeRoomFor(s,l);
+                        sh = (void*) (s-(sizeof(struct sdshdr)));
+                    }
+                    memcpy(s+i,buf,l);
+                    sh->len += l;
+                    sh->free -= l;
+                    i += l;
+                }
+                break;
+            default: /* Handle %% and generally %<unknown>. */
+                s[i++] = next;
+                sh->len += 1;
+                sh->free -= 1;
+                break;
+            }
+            break;
+        default:
+            s[i++] = *f;
+            sh->len += 1;
+            sh->free -= 1;
+            break;
+        }
+        f++;
+    }
+    va_end(ap);
+
+    /* Add null-term */
+    s[i] = '\0';
+    return s;
+}
+
+
+/* Remove the part of the string from left and from right composed just of
+ * contiguous characters found in 'cset', that is a null terminted C string.
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call.
+ *
+ * Example:
+ *
+ * s = sdsnew("AA...AA.a.aa.aHelloWorld     :::");
+ * s = sdstrim(s,"A. :");
+ * printf("%s\n", s);
+ *
+ * Output will be just "Hello World".
+ */
+void sdstrim(sds s, const char *cset) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    char *start, *end, *sp, *ep;
+    size_t len;
+
+    sp = start = s;
+    ep = end = s+sdslen(s)-1;
+    while(sp <= end && strchr(cset, *sp)) sp++;
+    while(ep > start && strchr(cset, *ep)) ep--;
+    len = (sp > ep) ? 0 : ((ep-sp)+1);
+    if (sh->buf != sp) memmove(sh->buf, sp, len);
+    sh->buf[len] = '\0';
+    sh->free = sh->free+(sh->len-len);
+    sh->len = len;
+}
+
+/* Turn the string into a smaller (or equal) string containing only the
+ * substring specified by the 'start' and 'end' indexes.
+ *
+ * start and end can be negative, where -1 means the last character of the
+ * string, -2 the penultimate character, and so forth.
+ *
+ * The interval is inclusive, so the start and end characters will be part
+ * of the resulting string.
+ *
+ * The string is modified in-place.
+ *
+ * Example:
+ *
+ * s = sdsnew("Hello World");
+ * sdsrange(s,1,-1); => "ello World"
+ */
+void sdsrange(sds s, int start, int end) {
+    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    size_t newlen, len = sdslen(s);
+
+    if (len == 0) return;
+    if (start < 0) {
+        start = len+start;
+        if (start < 0) start = 0;
+    }
+    if (end < 0) {
+        end = len+end;
+        if (end < 0) end = 0;
+    }
+    newlen = (start > end) ? 0 : (end-start)+1;
+    if (newlen != 0) {
+        if (start >= (signed)len) {
+            newlen = 0;
+        } else if (end >= (signed)len) {
+            end = len-1;
+            newlen = (start > end) ? 0 : (end-start)+1;
+        }
+    } else {
+        start = 0;
+    }
+    if (start && newlen) memmove(sh->buf, sh->buf+start, newlen);
+    sh->buf[newlen] = 0;
+    sh->free = sh->free+(sh->len-newlen);
+    sh->len = newlen;
+}
+
+/* Apply tolower() to every character of the sds string 's'. */
+void sdstolower(sds s) {
+    int len = sdslen(s), j;
+
+    for (j = 0; j < len; j++) s[j] = tolower(s[j]);
+}
+
+/* Apply toupper() to every character of the sds string 's'. */
+void sdstoupper(sds s) {
+    int len = sdslen(s), j;
+
+    for (j = 0; j < len; j++) s[j] = toupper(s[j]);
+}
+
+/* Compare two sds strings s1 and s2 with memcmp().
+ *
+ * Return value:
+ *
+ *     1 if s1 > s2.
+ *    -1 if s1 < s2.
+ *     0 if s1 and s2 are exactly the same binary string.
+ *
+ * If two strings share exactly the same prefix, but one of the two has
+ * additional characters, the longer string is considered to be greater than
+ * the smaller one. */
+int sdscmp(const sds s1, const sds s2) {
+    size_t l1, l2, minlen;
+    int cmp;
+
+    l1 = sdslen(s1);
+    l2 = sdslen(s2);
+    minlen = (l1 < l2) ? l1 : l2;
+    cmp = memcmp(s1,s2,minlen);
+    if (cmp == 0) return l1-l2;
+    return cmp;
+}
+
+/* Split 's' with separator in 'sep'. An array
+ * of sds strings is returned. *count will be set
+ * by reference to the number of tokens returned.
+ *
+ * On out of memory, zero length string, zero length
+ * separator, NULL is returned.
+ *
+ * Note that 'sep' is able to split a string using
+ * a multi-character separator. For example
+ * sdssplit("foo_-_bar","_-_"); will return two
+ * elements "foo" and "bar".
+ *
+ * This version of the function is binary-safe but
+ * requires length arguments. sdssplit() is just the
+ * same function but for zero-terminated strings.
+ */
+sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count) {
+    int elements = 0, slots = 5, start = 0, j;
+    sds *tokens;
+
+    if (seplen < 1 || len < 0) return NULL;
+
+    tokens = malloc(sizeof(sds)*slots);
+    if (tokens == NULL) return NULL;
+
+    if (len == 0) {
+        *count = 0;
+        return tokens;
+    }
+    for (j = 0; j < (len-(seplen-1)); j++) {
+        /* make sure there is room for the next element and the final one */
+        if (slots < elements+2) {
+            sds *newtokens;
+
+            slots *= 2;
+            newtokens = realloc(tokens,sizeof(sds)*slots);
+            if (newtokens == NULL) goto cleanup;
+            tokens = newtokens;
+        }
+        /* search the separator */
+        if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
+            tokens[elements] = sdsnewlen(s+start,j-start);
+            if (tokens[elements] == NULL) goto cleanup;
+            elements++;
+            start = j+seplen;
+            j = j+seplen-1; /* skip the separator */
+        }
+    }
+    /* Add the final element. We are sure there is room in the tokens array. */
+    tokens[elements] = sdsnewlen(s+start,len-start);
+    if (tokens[elements] == NULL) goto cleanup;
+    elements++;
+    *count = elements;
+    return tokens;
+
+cleanup:
+    {
+        int i;
+        for (i = 0; i < elements; i++) sdsfree(tokens[i]);
+        free(tokens);
+        *count = 0;
+        return NULL;
+    }
+}
+
+/* Free the result returned by sdssplitlen(), or do nothing if 'tokens' is NULL. */
+void sdsfreesplitres(sds *tokens, int count) {
+    if (!tokens) return;
+    while(count--)
+        sdsfree(tokens[count]);
+    free(tokens);
+}
+
+/* Create an sds string from a long long value. It is much faster than:
+ *
+ * sdscatprintf(sdsempty(),"%lld\n", value);
+ */
+sds sdsfromlonglong(long long value) {
+    char buf[32], *p;
+    unsigned long long v;
+
+    v = (value < 0) ? -value : value;
+    p = buf+31; /* point to the last character */
+    do {
+        *p-- = '0'+(v%10);
+        v /= 10;
+    } while(v);
+    if (value < 0) *p-- = '-';
+    p++;
+    return sdsnewlen(p,32-(p-buf));
+}
+
+/* Append to the sds string "s" an escaped string representation where
+ * all the non-printable characters (tested with isprint()) are turned into
+ * escapes in the form "\n\r\a...." or "\x<hex-number>".
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscatrepr(sds s, const char *p, size_t len) {
+    s = sdscatlen(s,"\"",1);
+    while(len--) {
+        switch(*p) {
+        case '\\':
+        case '"':
+            s = sdscatprintf(s,"\\%c",*p);
+            break;
+        case '\n': s = sdscatlen(s,"\\n",2); break;
+        case '\r': s = sdscatlen(s,"\\r",2); break;
+        case '\t': s = sdscatlen(s,"\\t",2); break;
+        case '\a': s = sdscatlen(s,"\\a",2); break;
+        case '\b': s = sdscatlen(s,"\\b",2); break;
+        default:
+            if (isprint(*p))
+                s = sdscatprintf(s,"%c",*p);
+            else
+                s = sdscatprintf(s,"\\x%02x",(unsigned char)*p);
+            break;
+        }
+        p++;
+    }
+    return sdscatlen(s,"\"",1);
+}
+
+/* Helper function for sdssplitargs() that returns non zero if 'c'
+ * is a valid hex digit. */
+int is_hex_digit(char c) {
+    return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') ||
+           (c >= 'A' && c <= 'F');
+}
+
+/* Helper function for sdssplitargs() that converts a hex digit into an
+ * integer from 0 to 15 */
+int hex_digit_to_int(char c) {
+    switch(c) {
+    case '0': return 0;
+    case '1': return 1;
+    case '2': return 2;
+    case '3': return 3;
+    case '4': return 4;
+    case '5': return 5;
+    case '6': return 6;
+    case '7': return 7;
+    case '8': return 8;
+    case '9': return 9;
+    case 'a': case 'A': return 10;
+    case 'b': case 'B': return 11;
+    case 'c': case 'C': return 12;
+    case 'd': case 'D': return 13;
+    case 'e': case 'E': return 14;
+    case 'f': case 'F': return 15;
+    default: return 0;
+    }
+}
+
+/* Split a line into arguments, where every argument can be in the
+ * following programming-language REPL-alike form:
+ *
+ * foo bar "newline are supported\n" and "\xff\x00otherstuff"
+ *
+ * The number of arguments is stored into *argc, and an array
+ * of sds is returned.
+ *
+ * The caller should free the resulting array of sds strings with
+ * sdsfreesplitres().
+ *
+ * Note that sdscatrepr() is able to convert back a string into
+ * a quoted string in the same format sdssplitargs() is able to parse.
+ *
+ * The function returns the allocated tokens on success, even when the
+ * input string is empty, or NULL if the input contains unbalanced
+ * quotes or closed quotes followed by non space characters
+ * as in: "foo"bar or "foo'
+ */
+sds *sdssplitargs(const char *line, int *argc) {
+    const char *p = line;
+    char *current = NULL;
+    char **vector = NULL;
+
+    *argc = 0;
+    while(1) {
+        /* skip blanks */
+        while(*p && isspace(*p)) p++;
+        if (*p) {
+            /* get a token */
+            int inq=0;  /* set to 1 if we are in "quotes" */
+            int insq=0; /* set to 1 if we are in 'single quotes' */
+            int done=0;
+
+            if (current == NULL) current = sdsempty();
+            while(!done) {
+                if (inq) {
+                    if (*p == '\\' && *(p+1) == 'x' &&
+                                             is_hex_digit(*(p+2)) &&
+                                             is_hex_digit(*(p+3)))
+                    {
+                        unsigned char byte;
+
+                        byte = (hex_digit_to_int(*(p+2))*16)+
+                                hex_digit_to_int(*(p+3));
+                        current = sdscatlen(current,(char*)&byte,1);
+                        p += 3;
+                    } else if (*p == '\\' && *(p+1)) {
+                        char c;
+
+                        p++;
+                        switch(*p) {
+                        case 'n': c = '\n'; break;
+                        case 'r': c = '\r'; break;
+                        case 't': c = '\t'; break;
+                        case 'b': c = '\b'; break;
+                        case 'a': c = '\a'; break;
+                        default: c = *p; break;
+                        }
+                        current = sdscatlen(current,&c,1);
+                    } else if (*p == '"') {
+                        /* closing quote must be followed by a space or
+                         * nothing at all. */
+                        if (*(p+1) && !isspace(*(p+1))) goto err;
+                        done=1;
+                    } else if (!*p) {
+                        /* unterminated quotes */
+                        goto err;
+                    } else {
+                        current = sdscatlen(current,p,1);
+                    }
+                } else if (insq) {
+                    if (*p == '\\' && *(p+1) == '\'') {
+                        p++;
+                        current = sdscatlen(current,"'",1);
+                    } else if (*p == '\'') {
+                        /* closing quote must be followed by a space or
+                         * nothing at all. */
+                        if (*(p+1) && !isspace(*(p+1))) goto err;
+                        done=1;
+                    } else if (!*p) {
+                        /* unterminated quotes */
+                        goto err;
+                    } else {
+                        current = sdscatlen(current,p,1);
+                    }
+                } else {
+                    switch(*p) {
+                    case ' ':
+                    case '\n':
+                    case '\r':
+                    case '\t':
+                    case '\0':
+                        done=1;
+                        break;
+                    case '"':
+                        inq=1;
+                        break;
+                    case '\'':
+                        insq=1;
+                        break;
+                    default:
+                        current = sdscatlen(current,p,1);
+                        break;
+                    }
+                }
+                if (*p) p++;
+            }
+            /* add the token to the vector */
+            vector = realloc(vector,((*argc)+1)*sizeof(char*));
+            vector[*argc] = current;
+            (*argc)++;
+            current = NULL;
+        } else {
+            /* Even on empty input string return something not NULL. */
+            if (vector == NULL) vector = malloc(sizeof(void*));
+            return vector;
+        }
+    }
+
+err:
+    while((*argc)--)
+        sdsfree(vector[*argc]);
+    free(vector);
+    if (current) sdsfree(current);
+    *argc = 0;
+    return NULL;
+}
+
+/* Modify the string substituting all the occurrences of the set of
+ * characters specified in the 'from' string to the corresponding character
+ * in the 'to' array.
+ *
+ * For instance: sdsmapchars(mystring, "ho", "01", 2)
+ * will have the effect of turning the string "hello" into "0ell1".
+ *
+ * The function returns the sds string pointer, that is always the same
+ * as the input pointer since no resize is needed. */
+sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) {
+    size_t j, i, l = sdslen(s);
+
+    for (j = 0; j < l; j++) {
+        for (i = 0; i < setlen; i++) {
+            if (s[j] == from[i]) {
+                s[j] = to[i];
+                break;
+            }
+        }
+    }
+    return s;
+}
+
+/* Join an array of C strings using the specified separator (also a C string).
+ * Returns the result as an sds string. */
+sds sdsjoin(char **argv, int argc, char *sep, size_t seplen) {
+    sds join = sdsempty();
+    int j;
+
+    for (j = 0; j < argc; j++) {
+        join = sdscat(join, argv[j]);
+        if (j != argc-1) join = sdscatlen(join,sep,seplen);
+    }
+    return join;
+}
+
+/* Like sdsjoin, but joins an array of SDS strings. */
+sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) {
+    sds join = sdsempty();
+    int j;
+
+    for (j = 0; j < argc; j++) {
+        join = sdscatsds(join, argv[j]);
+        if (j != argc-1) join = sdscatlen(join,sep,seplen);
+    }
+    return join;
+}
+
+#ifdef SDS_TEST_MAIN
+#include <stdio.h>
+#include "testhelp.h"
+
+int main(void) {
+    {
+        struct sdshdr *sh;
+        sds x = sdsnew("foo"), y;
+
+        test_cond("Create a string and obtain the length",
+            sdslen(x) == 3 && memcmp(x,"foo\0",4) == 0)
+
+        sdsfree(x);
+        x = sdsnewlen("foo",2);
+        test_cond("Create a string with specified length",
+            sdslen(x) == 2 && memcmp(x,"fo\0",3) == 0)
+
+        x = sdscat(x,"bar");
+        test_cond("Strings concatenation",
+            sdslen(x) == 5 && memcmp(x,"fobar\0",6) == 0);
+
+        x = sdscpy(x,"a");
+        test_cond("sdscpy() against an originally longer string",
+            sdslen(x) == 1 && memcmp(x,"a\0",2) == 0)
+
+        x = sdscpy(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk");
+        test_cond("sdscpy() against an originally shorter string",
+            sdslen(x) == 33 &&
+            memcmp(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk\0",33) == 0)
+
+        sdsfree(x);
+        x = sdscatprintf(sdsempty(),"%d",123);
+        test_cond("sdscatprintf() seems working in the base case",
+            sdslen(x) == 3 && memcmp(x,"123\0",4) ==0)
+
+        sdsfree(x);
+        x = sdsnew("xxciaoyyy");
+        sdstrim(x,"xy");
+        test_cond("sdstrim() correctly trims characters",
+            sdslen(x) == 4 && memcmp(x,"ciao\0",5) == 0)
+
+        y = sdsdup(x);
+        sdsrange(y,1,1);
+        test_cond("sdsrange(...,1,1)",
+            sdslen(y) == 1 && memcmp(y,"i\0",2) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,1,-1);
+        test_cond("sdsrange(...,1,-1)",
+            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,-2,-1);
+        test_cond("sdsrange(...,-2,-1)",
+            sdslen(y) == 2 && memcmp(y,"ao\0",3) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,2,1);
+        test_cond("sdsrange(...,2,1)",
+            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,1,100);
+        test_cond("sdsrange(...,1,100)",
+            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,100,100);
+        test_cond("sdsrange(...,100,100)",
+            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnew("foo");
+        y = sdsnew("foa");
+        test_cond("sdscmp(foo,foa)", sdscmp(x,y) > 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnew("bar");
+        y = sdsnew("bar");
+        test_cond("sdscmp(bar,bar)", sdscmp(x,y) == 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnew("aar");
+        y = sdsnew("bar");
+        test_cond("sdscmp(bar,bar)", sdscmp(x,y) < 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnewlen("\a\n\0foo\r",7);
+        y = sdscatrepr(sdsempty(),x,sdslen(x));
+        test_cond("sdscatrepr(...data...)",
+            memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0)
+
+        {
+            int oldfree;
+
+            sdsfree(x);
+            x = sdsnew("0");
+            sh = (void*) (x-(sizeof(struct sdshdr)));
+            test_cond("sdsnew() free/len buffers", sh->len == 1 && sh->free == 0);
+            x = sdsMakeRoomFor(x,1);
+            sh = (void*) (x-(sizeof(struct sdshdr)));
+            test_cond("sdsMakeRoomFor()", sh->len == 1 && sh->free > 0);
+            oldfree = sh->free;
+            x[1] = '1';
+            sdsIncrLen(x,1);
+            test_cond("sdsIncrLen() -- content", x[0] == '0' && x[1] == '1');
+            test_cond("sdsIncrLen() -- len", sh->len == 2);
+            test_cond("sdsIncrLen() -- free", sh->free == oldfree-1);
+        }
+    }
+    test_report()
+    return 0;
+}
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sds.h b/debian/modules/nchan/src/store/redis/hiredis/sds.h
new file mode 100644
index 0000000..19a2abd
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/sds.h
@@ -0,0 +1,105 @@
+/* SDS (Simple Dynamic Strings), A C dynamic strings library.
+ *
+ * Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __SDS_H
+#define __SDS_H
+
+#define SDS_MAX_PREALLOC (1024*1024)
+
+#include <sys/types.h>
+#include <stdarg.h>
+#ifdef _MSC_VER
+#include "win32.h"
+#endif
+
+typedef char *sds;
+
+struct sdshdr {
+    int len;
+    int free;
+    char buf[];
+};
+
+static inline size_t sdslen(const sds s) {
+    struct sdshdr *sh = (struct sdshdr *)(s-sizeof *sh);
+    return sh->len;
+}
+
+static inline size_t sdsavail(const sds s) {
+    struct sdshdr *sh = (struct sdshdr *)(s-sizeof *sh);
+    return sh->free;
+}
+
+sds sdsnewlen(const void *init, size_t initlen);
+sds sdsnew(const char *init);
+sds sdsempty(void);
+size_t sdslen(const sds s);
+sds sdsdup(const sds s);
+void sdsfree(sds s);
+size_t sdsavail(const sds s);
+sds sdsgrowzero(sds s, size_t len);
+sds sdscatlen(sds s, const void *t, size_t len);
+sds sdscat(sds s, const char *t);
+sds sdscatsds(sds s, const sds t);
+sds sdscpylen(sds s, const char *t, size_t len);
+sds sdscpy(sds s, const char *t);
+
+sds sdscatvprintf(sds s, const char *fmt, va_list ap);
+#ifdef __GNUC__
+sds sdscatprintf(sds s, const char *fmt, ...)
+    __attribute__((format(printf, 2, 3)));
+#else
+sds sdscatprintf(sds s, const char *fmt, ...);
+#endif
+
+sds sdscatfmt(sds s, char const *fmt, ...);
+void sdstrim(sds s, const char *cset);
+void sdsrange(sds s, int start, int end);
+void sdsupdatelen(sds s);
+void sdsclear(sds s);
+int sdscmp(const sds s1, const sds s2);
+sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
+void sdsfreesplitres(sds *tokens, int count);
+void sdstolower(sds s);
+void sdstoupper(sds s);
+sds sdsfromlonglong(long long value);
+sds sdscatrepr(sds s, const char *p, size_t len);
+sds *sdssplitargs(const char *line, int *argc);
+sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
+sds sdsjoin(char **argv, int argc, char *sep, size_t seplen);
+sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
+
+/* Low level functions exposed to the user API */
+sds sdsMakeRoomFor(sds s, size_t addlen);
+void sdsIncrLen(sds s, int incr);
+sds sdsRemoveFreeSpace(sds s);
+size_t sdsAllocSize(sds s);
+
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/test.c b/debian/modules/nchan/src/store/redis/hiredis/test.c
new file mode 100644
index 0000000..d5e8217
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/test.c
@@ -0,0 +1,807 @@
+#include "fmacros.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <unistd.h>
+#include <signal.h>
+#include <errno.h>
+#include <limits.h>
+
+#include "hiredis.h"
+#include "net.h"
+
+enum connection_type {
+    CONN_TCP,
+    CONN_UNIX,
+    CONN_FD
+};
+
+struct config {
+    enum connection_type type;
+
+    struct {
+        const char *host;
+        int port;
+        struct timeval timeout;
+    } tcp;
+
+    struct {
+        const char *path;
+    } unix;
+};
+
+/* The following lines make up our testing "framework" :) */
+static int tests = 0, fails = 0;
+#define test(_s) { printf("#%02d ", ++tests); printf(_s); }
+#define test_cond(_c) if(_c) printf("\033[0;32mPASSED\033[0;0m\n"); else {printf("\033[0;31mFAILED\033[0;0m\n"); fails++;}
+
+static long long usec(void) {
+    struct timeval tv;
+    gettimeofday(&tv,NULL);
+    return (((long long)tv.tv_sec)*1000000)+tv.tv_usec;
+}
+
+/* The assert() calls below have side effects, so we need assert()
+ * even if we are compiling without asserts (-DNDEBUG). */
+#ifdef NDEBUG
+#undef assert
+#define assert(e) (void)(e)
+#endif
+
+static redisContext *select_database(redisContext *c) {
+    redisReply *reply;
+
+    /* Switch to DB 9 for testing, now that we know we can chat. */
+    reply = redisCommand(c,"SELECT 9");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+
+    /* Make sure the DB is emtpy */
+    reply = redisCommand(c,"DBSIZE");
+    assert(reply != NULL);
+    if (reply->type == REDIS_REPLY_INTEGER && reply->integer == 0) {
+        /* Awesome, DB 9 is empty and we can continue. */
+        freeReplyObject(reply);
+    } else {
+        printf("Database #9 is not empty, test can not continue\n");
+        exit(1);
+    }
+
+    return c;
+}
+
+static int disconnect(redisContext *c, int keep_fd) {
+    redisReply *reply;
+
+    /* Make sure we're on DB 9. */
+    reply = redisCommand(c,"SELECT 9");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+    reply = redisCommand(c,"FLUSHDB");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+
+    /* Free the context as well, but keep the fd if requested. */
+    if (keep_fd)
+        return redisFreeKeepFd(c);
+    redisFree(c);
+    return -1;
+}
+
+static redisContext *connect(struct config config) {
+    redisContext *c = NULL;
+
+    if (config.type == CONN_TCP) {
+        c = redisConnect(config.tcp.host, config.tcp.port);
+    } else if (config.type == CONN_UNIX) {
+        c = redisConnectUnix(config.unix.path);
+    } else if (config.type == CONN_FD) {
+        /* Create a dummy connection just to get an fd to inherit */
+        redisContext *dummy_ctx = redisConnectUnix(config.unix.path);
+        if (dummy_ctx) {
+            int fd = disconnect(dummy_ctx, 1);
+            printf("Connecting to inherited fd %d\n", fd);
+            c = redisConnectFd(fd);
+        }
+    } else {
+        assert(NULL);
+    }
+
+    if (c == NULL) {
+        printf("Connection error: can't allocate redis context\n");
+        exit(1);
+    } else if (c->err) {
+        printf("Connection error: %s\n", c->errstr);
+        redisFree(c);
+        exit(1);
+    }
+
+    return select_database(c);
+}
+
+static void test_format_commands(void) {
+    char *cmd;
+    int len;
+
+    test("Format command without interpolation: ");
+    len = redisFormatCommand(&cmd,"SET foo bar");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command with %%s string interpolation: ");
+    len = redisFormatCommand(&cmd,"SET %s %s","foo","bar");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command with %%s and an empty string: ");
+    len = redisFormatCommand(&cmd,"SET %s %s","foo","");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
+    free(cmd);
+
+    test("Format command with an empty string in between proper interpolations: ");
+    len = redisFormatCommand(&cmd,"SET %s %s","","foo");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$0\r\n\r\n$3\r\nfoo\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(0+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command with %%b string interpolation: ");
+    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"b\0r",(size_t)3);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nb\0r\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command with %%b and an empty string: ");
+    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"",(size_t)0);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
+    free(cmd);
+
+    test("Format command with literal %%: ");
+    len = redisFormatCommand(&cmd,"SET %% %%");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$1\r\n%\r\n$1\r\n%\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(1+2)+4+(1+2));
+    free(cmd);
+
+    /* Vararg width depends on the type. These tests make sure that the
+     * width is correctly determined using the format and subsequent varargs
+     * can correctly be interpolated. */
+#define INTEGER_WIDTH_TEST(fmt, type) do {                                                \
+    type value = 123;                                                                     \
+    test("Format command with printf-delegation (" #type "): ");                          \
+    len = redisFormatCommand(&cmd,"key:%08" fmt " str:%s", value, "hello");               \
+    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",len) == 0 && \
+        len == 4+5+(12+2)+4+(9+2));                                                       \
+    free(cmd);                                                                            \
+} while(0)
+
+#define FLOAT_WIDTH_TEST(type) do {                                                       \
+    type value = 123.0;                                                                   \
+    test("Format command with printf-delegation (" #type "): ");                          \
+    len = redisFormatCommand(&cmd,"key:%08.3f str:%s", value, "hello");                   \
+    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",len) == 0 && \
+        len == 4+5+(12+2)+4+(9+2));                                                       \
+    free(cmd);                                                                            \
+} while(0)
+
+    INTEGER_WIDTH_TEST("d", int);
+    INTEGER_WIDTH_TEST("hhd", char);
+    INTEGER_WIDTH_TEST("hd", short);
+    INTEGER_WIDTH_TEST("ld", long);
+    INTEGER_WIDTH_TEST("lld", long long);
+    INTEGER_WIDTH_TEST("u", unsigned int);
+    INTEGER_WIDTH_TEST("hhu", unsigned char);
+    INTEGER_WIDTH_TEST("hu", unsigned short);
+    INTEGER_WIDTH_TEST("lu", unsigned long);
+    INTEGER_WIDTH_TEST("llu", unsigned long long);
+    FLOAT_WIDTH_TEST(float);
+    FLOAT_WIDTH_TEST(double);
+
+    test("Format command with invalid printf format: ");
+    len = redisFormatCommand(&cmd,"key:%08p %b",(void*)1234,"foo",(size_t)3);
+    test_cond(len == -1);
+
+    const char *argv[3];
+    argv[0] = "SET";
+    argv[1] = "foo\0xxx";
+    argv[2] = "bar";
+    size_t lens[3] = { 3, 7, 3 };
+    int argc = 3;
+
+    test("Format command by passing argc/argv without lengths: ");
+    len = redisFormatCommandArgv(&cmd,argc,argv,NULL);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    free(cmd);
+
+    test("Format command by passing argc/argv with lengths: ");
+    len = redisFormatCommandArgv(&cmd,argc,argv,lens);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
+    free(cmd);
+}
+
+static void test_append_formatted_commands(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    char *cmd;
+    int len;
+
+    c = connect(config);
+
+    test("Append format command: ");
+
+    len = redisFormatCommand(&cmd, "SET foo bar");
+
+    test_cond(redisAppendFormattedCommand(c, cmd, len) == REDIS_OK);
+
+    assert(redisGetReply(c, (void*)&reply) == REDIS_OK);
+
+    free(cmd);
+    freeReplyObject(reply);
+
+    disconnect(c, 0);
+}
+
+static void test_reply_reader(void) {
+    redisReader *reader;
+    void *reply;
+    int ret;
+    int i;
+
+    test("Error handling in reply parser: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"@foo\r\n",6);
+    ret = redisReaderGetReply(reader,NULL);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
+    redisReaderFree(reader);
+
+    /* when the reply already contains multiple items, they must be free'd
+     * on an error. valgrind will bark when this doesn't happen. */
+    test("Memory cleanup in reply parser: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"*2\r\n",4);
+    redisReaderFeed(reader,(char*)"$5\r\nhello\r\n",11);
+    redisReaderFeed(reader,(char*)"@foo\r\n",6);
+    ret = redisReaderGetReply(reader,NULL);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
+    redisReaderFree(reader);
+
+    test("Set error on nested multi bulks with depth > 7: ");
+    reader = redisReaderCreate();
+
+    for (i = 0; i < 9; i++) {
+        redisReaderFeed(reader,(char*)"*1\r\n",4);
+    }
+
+    ret = redisReaderGetReply(reader,NULL);
+    test_cond(ret == REDIS_ERR &&
+              strncasecmp(reader->errstr,"No support for",14) == 0);
+    redisReaderFree(reader);
+
+    test("Works with NULL functions for reply: ");
+    reader = redisReaderCreate();
+    reader->fn = NULL;
+    redisReaderFeed(reader,(char*)"+OK\r\n",5);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
+    redisReaderFree(reader);
+
+    test("Works when a single newline (\\r\\n) covers two calls to feed: ");
+    reader = redisReaderCreate();
+    reader->fn = NULL;
+    redisReaderFeed(reader,(char*)"+OK\r",4);
+    ret = redisReaderGetReply(reader,&reply);
+    assert(ret == REDIS_OK && reply == NULL);
+    redisReaderFeed(reader,(char*)"\n",1);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
+    redisReaderFree(reader);
+
+    test("Don't reset state after protocol error: ");
+    reader = redisReaderCreate();
+    reader->fn = NULL;
+    redisReaderFeed(reader,(char*)"x",1);
+    ret = redisReaderGetReply(reader,&reply);
+    assert(ret == REDIS_ERR);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR && reply == NULL);
+    redisReaderFree(reader);
+
+    /* Regression test for issue #45 on GitHub. */
+    test("Don't do empty allocation for empty multi bulk: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"*0\r\n",4);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
+        ((redisReply*)reply)->elements == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+}
+
+static void test_free_null(void) {
+    void *redisContext = NULL;
+    void *reply = NULL;
+
+    test("Don't fail when redisFree is passed a NULL value: ");
+    redisFree(redisContext);
+    test_cond(redisContext == NULL);
+
+    test("Don't fail when freeReplyObject is passed a NULL value: ");
+    freeReplyObject(reply);
+    test_cond(reply == NULL);
+}
+
+static void test_blocking_connection_errors(void) {
+    redisContext *c;
+
+    test("Returns error when host cannot be resolved: ");
+    c = redisConnect((char*)"idontexist.test", 6379);
+    test_cond(c->err == REDIS_ERR_OTHER &&
+        (strcmp(c->errstr,"Name or service not known") == 0 ||
+         strcmp(c->errstr,"Can't resolve: idontexist.test") == 0 ||
+         strcmp(c->errstr,"nodename nor servname provided, or not known") == 0 ||
+         strcmp(c->errstr,"No address associated with hostname") == 0 ||
+         strcmp(c->errstr,"Temporary failure in name resolution") == 0 ||
+         strcmp(c->errstr,"hostname nor servname provided, or not known") == 0 ||
+         strcmp(c->errstr,"no address associated with name") == 0));
+    redisFree(c);
+
+    test("Returns error when the port is not open: ");
+    c = redisConnect((char*)"localhost", 1);
+    test_cond(c->err == REDIS_ERR_IO &&
+        strcmp(c->errstr,"Connection refused") == 0);
+    redisFree(c);
+
+    test("Returns error when the unix socket path doesn't accept connections: ");
+    c = redisConnectUnix((char*)"/tmp/idontexist.sock");
+    test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
+    redisFree(c);
+}
+
+static void test_blocking_connection(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+
+    c = connect(config);
+
+    test("Is able to deliver commands: ");
+    reply = redisCommand(c,"PING");
+    test_cond(reply->type == REDIS_REPLY_STATUS &&
+        strcasecmp(reply->str,"pong") == 0)
+    freeReplyObject(reply);
+
+    test("Is a able to send commands verbatim: ");
+    reply = redisCommand(c,"SET foo bar");
+    test_cond (reply->type == REDIS_REPLY_STATUS &&
+        strcasecmp(reply->str,"ok") == 0)
+    freeReplyObject(reply);
+
+    test("%%s String interpolation works: ");
+    reply = redisCommand(c,"SET %s %s","foo","hello world");
+    freeReplyObject(reply);
+    reply = redisCommand(c,"GET foo");
+    test_cond(reply->type == REDIS_REPLY_STRING &&
+        strcmp(reply->str,"hello world") == 0);
+    freeReplyObject(reply);
+
+    test("%%b String interpolation works: ");
+    reply = redisCommand(c,"SET %b %b","foo",(size_t)3,"hello\x00world",(size_t)11);
+    freeReplyObject(reply);
+    reply = redisCommand(c,"GET foo");
+    test_cond(reply->type == REDIS_REPLY_STRING &&
+        memcmp(reply->str,"hello\x00world",11) == 0)
+
+    test("Binary reply length is correct: ");
+    test_cond(reply->len == 11)
+    freeReplyObject(reply);
+
+    test("Can parse nil replies: ");
+    reply = redisCommand(c,"GET nokey");
+    test_cond(reply->type == REDIS_REPLY_NIL)
+    freeReplyObject(reply);
+
+    /* test 7 */
+    test("Can parse integer replies: ");
+    reply = redisCommand(c,"INCR mycounter");
+    test_cond(reply->type == REDIS_REPLY_INTEGER && reply->integer == 1)
+    freeReplyObject(reply);
+
+    test("Can parse multi bulk replies: ");
+    freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
+    freeReplyObject(redisCommand(c,"LPUSH mylist bar"));
+    reply = redisCommand(c,"LRANGE mylist 0 -1");
+    test_cond(reply->type == REDIS_REPLY_ARRAY &&
+              reply->elements == 2 &&
+              !memcmp(reply->element[0]->str,"bar",3) &&
+              !memcmp(reply->element[1]->str,"foo",3))
+    freeReplyObject(reply);
+
+    /* m/e with multi bulk reply *before* other reply.
+     * specifically test ordering of reply items to parse. */
+    test("Can handle nested multi bulk replies: ");
+    freeReplyObject(redisCommand(c,"MULTI"));
+    freeReplyObject(redisCommand(c,"LRANGE mylist 0 -1"));
+    freeReplyObject(redisCommand(c,"PING"));
+    reply = (redisCommand(c,"EXEC"));
+    test_cond(reply->type == REDIS_REPLY_ARRAY &&
+              reply->elements == 2 &&
+              reply->element[0]->type == REDIS_REPLY_ARRAY &&
+              reply->element[0]->elements == 2 &&
+              !memcmp(reply->element[0]->element[0]->str,"bar",3) &&
+              !memcmp(reply->element[0]->element[1]->str,"foo",3) &&
+              reply->element[1]->type == REDIS_REPLY_STATUS &&
+              strcasecmp(reply->element[1]->str,"pong") == 0);
+    freeReplyObject(reply);
+
+    disconnect(c, 0);
+}
+
+static void test_blocking_connection_timeouts(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    ssize_t s;
+    const char *cmd = "DEBUG SLEEP 3\r\n";
+    struct timeval tv;
+
+    c = connect(config);
+    test("Successfully completes a command when the timeout is not exceeded: ");
+    reply = redisCommand(c,"SET foo fast");
+    freeReplyObject(reply);
+    tv.tv_sec = 0;
+    tv.tv_usec = 10000;
+    redisSetTimeout(c, tv);
+    reply = redisCommand(c, "GET foo");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STRING && memcmp(reply->str, "fast", 4) == 0);
+    freeReplyObject(reply);
+    disconnect(c, 0);
+
+    c = connect(config);
+    test("Does not return a reply when the command times out: ");
+    s = write(c->fd, cmd, strlen(cmd));
+    tv.tv_sec = 0;
+    tv.tv_usec = 10000;
+    redisSetTimeout(c, tv);
+    reply = redisCommand(c, "GET foo");
+    test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Resource temporarily unavailable") == 0);
+    freeReplyObject(reply);
+
+    test("Reconnect properly reconnects after a timeout: ");
+    redisReconnect(c);
+    reply = redisCommand(c, "PING");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
+    freeReplyObject(reply);
+
+    test("Reconnect properly uses owned parameters: ");
+    config.tcp.host = "foo";
+    config.unix.path = "foo";
+    redisReconnect(c);
+    reply = redisCommand(c, "PING");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
+    freeReplyObject(reply);
+
+    disconnect(c, 0);
+}
+
+static void test_blocking_io_errors(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    void *_reply;
+    int major, minor;
+
+    /* Connect to target given by config. */
+    c = connect(config);
+    {
+        /* Find out Redis version to determine the path for the next test */
+        const char *field = "redis_version:";
+        char *p, *eptr;
+
+        reply = redisCommand(c,"INFO");
+        p = strstr(reply->str,field);
+        major = strtol(p+strlen(field),&eptr,10);
+        p = eptr+1; /* char next to the first "." */
+        minor = strtol(p,&eptr,10);
+        freeReplyObject(reply);
+    }
+
+    test("Returns I/O error when the connection is lost: ");
+    reply = redisCommand(c,"QUIT");
+    if (major > 2 || (major == 2 && minor > 0)) {
+        /* > 2.0 returns OK on QUIT and read() should be issued once more
+         * to know the descriptor is at EOF. */
+        test_cond(strcasecmp(reply->str,"OK") == 0 &&
+            redisGetReply(c,&_reply) == REDIS_ERR);
+        freeReplyObject(reply);
+    } else {
+        test_cond(reply == NULL);
+    }
+
+    /* On 2.0, QUIT will cause the connection to be closed immediately and
+     * the read(2) for the reply on QUIT will set the error to EOF.
+     * On >2.0, QUIT will return with OK and another read(2) needed to be
+     * issued to find out the socket was closed by the server. In both
+     * conditions, the error will be set to EOF. */
+    assert(c->err == REDIS_ERR_EOF &&
+        strcmp(c->errstr,"Server closed the connection") == 0);
+    redisFree(c);
+
+    c = connect(config);
+    test("Returns I/O error on socket timeout: ");
+    struct timeval tv = { 0, 1000 };
+    assert(redisSetTimeout(c,tv) == REDIS_OK);
+    test_cond(redisGetReply(c,&_reply) == REDIS_ERR &&
+        c->err == REDIS_ERR_IO && errno == EAGAIN);
+    redisFree(c);
+}
+
+static void test_invalid_timeout_errors(struct config config) {
+    redisContext *c;
+
+    test("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: ");
+
+    config.tcp.timeout.tv_sec = 0;
+    config.tcp.timeout.tv_usec = 10000001;
+
+    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
+
+    test_cond(c->err == REDIS_ERR_IO);
+    redisFree(c);
+
+    test("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
+
+    config.tcp.timeout.tv_sec = (((LONG_MAX) - 999) / 1000) + 1;
+    config.tcp.timeout.tv_usec = 0;
+
+    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
+
+    test_cond(c->err == REDIS_ERR_IO);
+    redisFree(c);
+}
+
+static void test_throughput(struct config config) {
+    redisContext *c = connect(config);
+    redisReply **replies;
+    int i, num;
+    long long t1, t2;
+
+    test("Throughput:\n");
+    for (i = 0; i < 500; i++)
+        freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
+
+    num = 1000;
+    replies = malloc(sizeof(redisReply*)*num);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        replies[i] = redisCommand(c,"PING");
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    free(replies);
+    printf("\t(%dx PING: %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    replies = malloc(sizeof(redisReply*)*num);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        replies[i] = redisCommand(c,"LRANGE mylist 0 499");
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
+        assert(replies[i] != NULL && replies[i]->elements == 500);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    free(replies);
+    printf("\t(%dx LRANGE with 500 elements: %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    num = 10000;
+    replies = malloc(sizeof(redisReply*)*num);
+    for (i = 0; i < num; i++)
+        redisAppendCommand(c,"PING");
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    free(replies);
+    printf("\t(%dx PING (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    replies = malloc(sizeof(redisReply*)*num);
+    for (i = 0; i < num; i++)
+        redisAppendCommand(c,"LRANGE mylist 0 499");
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
+        assert(replies[i] != NULL && replies[i]->elements == 500);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    free(replies);
+    printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    disconnect(c, 0);
+}
+
+// static long __test_callback_flags = 0;
+// static void __test_callback(redisContext *c, void *privdata) {
+//     ((void)c);
+//     /* Shift to detect execution order */
+//     __test_callback_flags <<= 8;
+//     __test_callback_flags |= (long)privdata;
+// }
+//
+// static void __test_reply_callback(redisContext *c, redisReply *reply, void *privdata) {
+//     ((void)c);
+//     /* Shift to detect execution order */
+//     __test_callback_flags <<= 8;
+//     __test_callback_flags |= (long)privdata;
+//     if (reply) freeReplyObject(reply);
+// }
+//
+// static redisContext *__connect_nonblock() {
+//     /* Reset callback flags */
+//     __test_callback_flags = 0;
+//     return redisConnectNonBlock("127.0.0.1", port, NULL);
+// }
+//
+// static void test_nonblocking_connection() {
+//     redisContext *c;
+//     int wdone = 0;
+//
+//     test("Calls command callback when command is issued: ");
+//     c = __connect_nonblock();
+//     redisSetCommandCallback(c,__test_callback,(void*)1);
+//     redisCommand(c,"PING");
+//     test_cond(__test_callback_flags == 1);
+//     redisFree(c);
+//
+//     test("Calls disconnect callback on redisDisconnect: ");
+//     c = __connect_nonblock();
+//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
+//     redisDisconnect(c);
+//     test_cond(__test_callback_flags == 2);
+//     redisFree(c);
+//
+//     test("Calls disconnect callback and free callback on redisFree: ");
+//     c = __connect_nonblock();
+//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
+//     redisSetFreeCallback(c,__test_callback,(void*)4);
+//     redisFree(c);
+//     test_cond(__test_callback_flags == ((2 << 8) | 4));
+//
+//     test("redisBufferWrite against empty write buffer: ");
+//     c = __connect_nonblock();
+//     test_cond(redisBufferWrite(c,&wdone) == REDIS_OK && wdone == 1);
+//     redisFree(c);
+//
+//     test("redisBufferWrite against not yet connected fd: ");
+//     c = __connect_nonblock();
+//     redisCommand(c,"PING");
+//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
+//               strncmp(c->error,"write:",6) == 0);
+//     redisFree(c);
+//
+//     test("redisBufferWrite against closed fd: ");
+//     c = __connect_nonblock();
+//     redisCommand(c,"PING");
+//     redisDisconnect(c);
+//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
+//               strncmp(c->error,"write:",6) == 0);
+//     redisFree(c);
+//
+//     test("Process callbacks in the right sequence: ");
+//     c = __connect_nonblock();
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)1,"PING");
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)3,"PING");
+//
+//     /* Write output buffer */
+//     wdone = 0;
+//     while(!wdone) {
+//         usleep(500);
+//         redisBufferWrite(c,&wdone);
+//     }
+//
+//     /* Read until at least one callback is executed (the 3 replies will
+//      * arrive in a single packet, causing all callbacks to be executed in
+//      * a single pass). */
+//     while(__test_callback_flags == 0) {
+//         assert(redisBufferRead(c) == REDIS_OK);
+//         redisProcessCallbacks(c);
+//     }
+//     test_cond(__test_callback_flags == 0x010203);
+//     redisFree(c);
+//
+//     test("redisDisconnect executes pending callbacks with NULL reply: ");
+//     c = __connect_nonblock();
+//     redisSetDisconnectCallback(c,__test_callback,(void*)1);
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
+//     redisDisconnect(c);
+//     test_cond(__test_callback_flags == 0x0201);
+//     redisFree(c);
+// }
+
+int main(int argc, char **argv) {
+    struct config cfg = {
+        .tcp = {
+            .host = "127.0.0.1",
+            .port = 6379
+        },
+        .unix = {
+            .path = "/tmp/redis.sock"
+        }
+    };
+    int throughput = 1;
+    int test_inherit_fd = 1;
+
+    /* Ignore broken pipe signal (for I/O error tests). */
+    signal(SIGPIPE, SIG_IGN);
+
+    /* Parse command line options. */
+    argv++; argc--;
+    while (argc) {
+        if (argc >= 2 && !strcmp(argv[0],"-h")) {
+            argv++; argc--;
+            cfg.tcp.host = argv[0];
+        } else if (argc >= 2 && !strcmp(argv[0],"-p")) {
+            argv++; argc--;
+            cfg.tcp.port = atoi(argv[0]);
+        } else if (argc >= 2 && !strcmp(argv[0],"-s")) {
+            argv++; argc--;
+            cfg.unix.path = argv[0];
+        } else if (argc >= 1 && !strcmp(argv[0],"--skip-throughput")) {
+            throughput = 0;
+        } else if (argc >= 1 && !strcmp(argv[0],"--skip-inherit-fd")) {
+            test_inherit_fd = 0;
+        } else {
+            fprintf(stderr, "Invalid argument: %s\n", argv[0]);
+            exit(1);
+        }
+        argv++; argc--;
+    }
+
+    test_format_commands();
+    test_reply_reader();
+    test_blocking_connection_errors();
+    test_free_null();
+
+    printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
+    cfg.type = CONN_TCP;
+    test_blocking_connection(cfg);
+    test_blocking_connection_timeouts(cfg);
+    test_blocking_io_errors(cfg);
+    test_invalid_timeout_errors(cfg);
+    test_append_formatted_commands(cfg);
+    if (throughput) test_throughput(cfg);
+
+    printf("\nTesting against Unix socket connection (%s):\n", cfg.unix.path);
+    cfg.type = CONN_UNIX;
+    test_blocking_connection(cfg);
+    test_blocking_connection_timeouts(cfg);
+    test_blocking_io_errors(cfg);
+    if (throughput) test_throughput(cfg);
+
+    if (test_inherit_fd) {
+        printf("\nTesting against inherited fd (%s):\n", cfg.unix.path);
+        cfg.type = CONN_FD;
+        test_blocking_connection(cfg);
+    }
+
+
+    if (fails) {
+        printf("*** %d TESTS FAILED ***\n", fails);
+        return 1;
+    }
+
+    printf("ALL TESTS PASSED\n");
+    return 0;
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/win32.h b/debian/modules/nchan/src/store/redis/hiredis/win32.h
new file mode 100644
index 0000000..1a27c18
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/win32.h
@@ -0,0 +1,42 @@
+#ifndef _WIN32_HELPER_INCLUDE
+#define _WIN32_HELPER_INCLUDE
+#ifdef _MSC_VER
+
+#ifndef inline
+#define inline __inline
+#endif
+
+#ifndef va_copy
+#define va_copy(d,s) ((d) = (s))
+#endif
+
+#ifndef snprintf
+#define snprintf c99_snprintf
+
+__inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
+{
+    int count = -1;
+
+    if (size != 0)
+        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
+    if (count == -1)
+        count = _vscprintf(format, ap);
+
+    return count;
+}
+
+__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
+{
+    int count;
+    va_list ap;
+
+    va_start(ap, format);
+    count = c99_vsnprintf(str, size, format, ap);
+    va_end(ap);
+
+    return count;
+}
+#endif
+
+#endif
+#endif
\ No newline at end of file
diff --git a/debian/modules/nchan/src/store/redis/rdsstore.c b/debian/modules/nchan/src/store/redis/rdsstore.c
index cffffeb..8fbf17f 100755
--- a/debian/modules/nchan/src/store/redis/rdsstore.c
+++ b/debian/modules/nchan/src/store/redis/rdsstore.c
@@ -1,22 +1,23 @@
 #include <nchan_module.h>
 
 #include <assert.h>
+#include <netinet/ip.h>
 #include "store-private.h"
 #include "store.h"
-#include "cluster.h"
 
 #include "redis_nginx_adapter.h"
 
-#include <util/nchan_msgid.h>
+#include <util/nchan_msg.h>
 #include <util/nchan_rbtree.h>
 #include <store/store_common.h>
 
 #include <store/memory/store.h>
 
+#include "redis_nodeset.h"
 #include "redis_lua_commands.h"
 
-#define REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL 300
-#define REDIS_LUA_HASH_LENGTH 40
+#define REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_STEP 600 //10min
+#define REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_MAX 2628000 //whole month
 
 #define REDIS_RECONNECT_TIME 5000
 
@@ -28,35 +29,14 @@
 #define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REDISTORE: " fmt, ##args)
 #define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDISTORE: " fmt, ##args)
 
-u_char            redis_subscriber_id[255];
-u_char            redis_subscriber_channel[255];
+#define REDIS_CONNECTION_FOR_PUBLISH_WAIT 5000
+
+u_char            redis_subscriber_id[255];
+size_t            redis_subscriber_id_len;
 
-static rbtree_seed_t              redis_data_tree;
 static rdstore_channel_head_t    *chanhead_hash = NULL;
 static size_t                     redis_publish_message_msgkey_size;
 
-redis_connection_status_t redis_connection_status(nchan_loc_conf_t *cf) {
-  rdstore_data_t  *rdata = cf->redis.privdata;
-  return rdata->status;
-}
-
-ngx_int_t redis_store_callback_on_connected(nchan_loc_conf_t *cf, callback_pt cb, void *privdata) {
-  rdstore_data_t    *rdata = cf->redis.privdata;
-  callback_chain_t  *d;
-  
-  if(rdata->status == CONNECTED) {
-    cb(NGX_OK, NULL, privdata);
-  }
-  
-  d = ngx_alloc(sizeof(*d), ngx_cycle->log);
-  
-  d->cb = cb;
-  d->pd = privdata;
-  d->next = rdata->on_connected;
-  
-  rdata->on_connected = d;
-  return NGX_OK;
-}
 
 #define CHANNEL_HASH_FIND(id_buf, p)    HASH_FIND( hh, chanhead_hash, (id_buf)->data, (id_buf)->len, p)
 #define CHANNEL_HASH_ADD(chanhead)      HASH_ADD_KEYPTR( hh, chanhead_hash, (chanhead->id).data, (chanhead->id).len, chanhead)
@@ -65,39 +45,59 @@ ngx_int_t redis_store_callback_on_connected(nchan_loc_conf_t *cf, callback_pt cb
 #include <stdbool.h>
 #include "cmp.h"
 
-#define redis_command(rdata, cb, pd, fmt, args...)                   \
-  do {                                                               \
-    if(redis_ensure_connected(rdata) == NGX_OK) {                    \
-      rdata->pending_commands++;                                     \
-      nchan_update_stub_status(redis_pending_commands, 1);           \
-      redisAsyncCommand((rdata)->ctx, cb, pd, fmt, ##args);          \
-    } else {                                                         \
-      ERR("Can't run redis command: no connection to redis server.");\
-    }                                                                \
-  }while(0)                                                          \
 
-#define redis_subscriber_command(rdata, cb, pd, fmt, args...)        \
+#define redis_subscriber_command(node, cb, pd, fmt, args...)        \
   do {                                                               \
-    if(redis_ensure_connected(rdata) == NGX_OK) {                    \
-      redisAsyncCommand((rdata)->sub_ctx, cb, pd, fmt, ##args);      \
+    if((node)->state >= REDIS_NODE_READY) {                    \
+      redisAsyncCommand((node)->ctx.pubsub, cb, pd, fmt, ##args);      \
     } else {                                                         \
       ERR("Can't run redis command: no connection to redis server.");\
     }                                                                \
   }while(0)                                                          \
   
-#define redis_sync_command(rdata, fmt, args...)                      \
+  
+  
+#define redis_sync_command(node, fmt, args...)                       \
   do {                                                               \
-    if((rdata)->sync_ctx == NULL) {                                  \
-      redis_nginx_open_sync_context(&(rdata)->connect_params.host, (rdata)->connect_params.port, (rdata)->connect_params.db, &(rdata)->connect_params.password, &(rdata)->sync_ctx); \
+    if((node)->ctx.sync == NULL) {                                   \
+      redis_nginx_open_sync_context(((node)->connect_params.peername.len > 0 ? &(node)->connect_params.peername : &(node)->connect_params.hostname), (node)->connect_params.port, (node)->connect_params.db, &(node)->connect_params.password, &(node)->ctx.sync); \
     }                                                                \
-    if((rdata)->sync_ctx) {                                          \
-      redisCommand((rdata)->sync_ctx, fmt, ##args);                  \
+    if((node)->ctx.sync) {                                          \
+      redisCommand((node)->ctx.sync, fmt, ##args);                  \
     } else {                                                         \
       ERR("Can't run redis command: no connection to redis server.");\
     }                                                                \
   }while(0)
-  
 
+#define redis_sync_script(script_name, node, fmt, args...)                    \
+  redis_sync_command(node, "EVALSHA %s " fmt, redis_lua_scripts.script_name.hash, ##args)
+
+#define nchan_redis_sync_script(script_name, node, channel_id, fmt, args...)  \
+  redis_sync_script(script_name, node, "0 %b %b " fmt, STR(node->nodeset->settings.namespace), STR(channel_id), ##args)
+
+  
+  
+#define redis_command(node, cb, pd, fmt, args...)                 \
+  do {                                                               \
+    if(node->state >= REDIS_NODE_READY) {                            \
+      if((cb) != NULL) {                                               \
+        /* a reply is expected, so track this command */             \
+        node->pending_commands++;                                    \
+        nchan_update_stub_status(redis_pending_commands, 1);         \
+      }                                                              \
+      redisAsyncCommand((node)->ctx.cmd, cb, pd, fmt, ##args);       \
+    } else {                                                         \
+      node_log_error(node, "Can't run redis command: no connection to redis server.");\
+    }                                                                \
+  }while(0)                                                          \
+  
+#define redis_script(script_name, node, cb, pd, fmt, args...)                         \
+  redis_command(node, cb, pd, "EVALSHA %s " fmt, redis_lua_scripts.script_name.hash, ##args)
+
+#define nchan_redis_script(script_name, node, cb, pd, channel_id, fmt, args...)       \
+  redis_script(script_name, node, cb, pd, "0 %b %b " fmt, STR((node)->nodeset->settings.namespace), STR(channel_id), ##args)
+
+  
 #define CHECK_REPLY_STR(reply) ((reply)->type == REDIS_REPLY_STRING)
 #define CHECK_REPLY_STRVAL(reply, v) ( CHECK_REPLY_STR(reply) && ngx_strcmp((reply)->str, v) == 0 )
 #define CHECK_REPLY_STRNVAL(reply, v, n) ( CHECK_REPLY_STR(reply) && ngx_strncmp((reply)->str, v, n) == 0 )
@@ -107,11 +107,9 @@ ngx_int_t redis_store_callback_on_connected(nchan_loc_conf_t *cf, callback_pt cb
 #define CHECK_REPLY_NIL(reply) ((reply)->type == REDIS_REPLY_NIL)
 #define CHECK_REPLY_INT_OR_STR(reply) ((reply)->type == REDIS_REPLY_INTEGER || (reply)->type == REDIS_REPLY_STRING)
   
-static ngx_int_t nchan_store_publish_generic(ngx_str_t *, rdstore_data_t *, nchan_msg_t *, ngx_int_t, const ngx_str_t *);
-static ngx_str_t * nchan_store_content_type_from_message(nchan_msg_t *, ngx_pool_t *);
-static ngx_str_t * nchan_store_etag_from_message(nchan_msg_t *, ngx_pool_t *);
+static ngx_int_t nchan_store_publish_generic(ngx_str_t *, redis_nodeset_t *, nchan_msg_t *, ngx_int_t, const ngx_str_t *);
 
-static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, rdstore_data_t *rdata);
+static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, redis_nodeset_t *);
 
 static ngx_buf_t *set_buf(ngx_buf_t *buf, u_char *start, off_t len){
   ngx_memzero(buf, sizeof(*buf));
@@ -164,8 +162,12 @@ static size_t ngx_buf_writer(cmp_ctx_t *ctx, const void *data, size_t count) {
   return 0;
 }
 
-ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
+int nchan_store_redis_validate_url(ngx_str_t *url) {
+  redis_connect_params_t rcp;
+  return parse_redis_url(url, &rcp) == NGX_OK;
+}
 
+ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
   u_char                  *cur, *last, *ret;
   
   cur = url->data;
@@ -182,6 +184,7 @@ ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
     if((ret = ngx_strlchr(cur, last, '@')) == NULL) {
       rcp->password.data = NULL;
       rcp->password.len = 0;
+      return NGX_ERROR;
     }
     else {
       rcp->password.data = cur;
@@ -201,22 +204,21 @@ ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
     if((ret = ngx_strlchr(cur, last, '/')) == NULL) {
       ret = last;
     }
-    rcp->host.data = cur;
-    rcp->host.len = ret - cur;
+    rcp->hostname.data = cur;
+    rcp->hostname.len = ret - cur;
   }
   else {
-    rcp->host.data = cur;
-    rcp->host.len = ret - cur;
+    rcp->hostname.data = cur;
+    rcp->hostname.len = ret - cur;
     cur = ret + 1;
     
     //port
     if((ret = ngx_strlchr(cur, last, '/')) == NULL) {
       ret = last;
     }
-    
     rcp->port = ngx_atoi(cur, ret-cur);
     if(rcp->port == NGX_ERROR) {
-      rcp->port = 6379;
+      return NGX_ERROR;
     }
   }
   cur = ret;
@@ -236,44 +238,58 @@ ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
 }
 
 static void redis_store_reap_chanhead(rdstore_channel_head_t *ch) {
-  rdstore_data_t   *rdata;
   if(!ch->shutting_down) {
     assert(ch->sub_count == 0 && ch->fetching_message_count == 0);
   }
   
   DBG("reap channel %V", &ch->id);
 
-  rdata = redis_cluster_rdata_from_channel(ch);
-  if(ch->pubsub_status == SUBBED) {
-    ch->pubsub_status = UNSUBBING;
-    redis_subscriber_command(rdata, NULL, NULL, "UNSUBSCRIBE {channel:%b}:pubsub", STR(&ch->id));
+  if(ch->pubsub_status == REDIS_PUBSUB_SUBSCRIBED) {
+    assert(ch->redis.nodeset->settings.storage_mode >= REDIS_MODE_DISTRIBUTED);
+    assert(ch->redis.node.pubsub);
+    ch->pubsub_status = REDIS_PUBSUB_UNSUBSCRIBED;
+    redis_subscriber_command(ch->redis.node.pubsub, NULL, NULL, "UNSUBSCRIBE %b{channel:%b}:pubsub", STR(ch->redis.nodeset->settings.namespace), STR(&ch->id));
   }
+
+  /*
+  redis_nodeset_t *ns = ch->redis.nodeset;
+  redis_node_t *cmd = ch->redis.node.cmd;
+  redis_node_t *pubsub = ch->redis.node.pubsub;
+  */
   
-  if(ch->rd_prev) {
-    ch->rd_prev->rd_next = ch->rd_next;
-  }
-  if(ch->rd_next) {
-    ch->rd_next->rd_prev = ch->rd_prev;
-  }
-  if(rdata->channels_head == ch) {
-    rdata->channels_head = ch->rd_next;
-  }
+  nodeset_dissociate_chanhead(ch);
   
-  if(rdata->almost_deleted_channels_head) {
-    rdata->almost_deleted_channels_head->rd_prev = ch;
-    ch->rd_next = rdata->almost_deleted_channels_head;
-    ch->rd_prev = NULL;
+  /*  
+  rdstore_channel_head_t *cur;
+
+
+  for(cur = nchan_slist_first(&ns->channels.all); cur != NULL; cur = nchan_slist_next(&ns->channels.all, cur)) {
+    assert(cur != ch);
   }
-  else {
-    ch->rd_next = NULL;
-    ch->rd_prev = NULL;
+  for(cur = nchan_slist_first(&ns->channels.disconnected_cmd); cur != NULL; cur = nchan_slist_next(&ns->channels.disconnected_cmd, cur)) {
+    assert(cur != ch);
   }
+  for(cur = nchan_slist_first(&ns->channels.disconnected_pubsub); cur != NULL; cur = nchan_slist_next(&ns->channels.disconnected_pubsub, cur)) {
+    assert(cur != ch);
+  }
+  if(cmd) {
+    for(cur = nchan_slist_first(&cmd->channels.cmd); cur != NULL; cur = nchan_slist_next(&cmd->channels.cmd, cur)) {
+      assert(cur != ch);
+    }
+    for(cur = nchan_slist_first(&cmd->channels.pubsub); cur != NULL; cur = nchan_slist_next(&cmd->channels.pubsub, cur)) {
+      assert(cur != ch);
+    }
+  }
+  if(pubsub) {
+    for(cur = nchan_slist_first(&pubsub->channels.cmd); cur != NULL; cur = nchan_slist_next(&pubsub->channels.cmd, cur)) {
+      assert(cur != ch);
+    }
+    for(cur = nchan_slist_first(&pubsub->channels.pubsub); cur != NULL; cur = nchan_slist_next(&pubsub->channels.pubsub, cur)) {
+      assert(cur != ch);
+    }
+  }
+*/  
   
-  rdata->almost_deleted_channels_head = ch;
-  
-  if(rdata->node.cluster && rdata->node.cluster->orphan_channels_head == ch) {
-    rdata->node.cluster->orphan_channels_head = ch->rd_next;
-  }
   
   DBG("chanhead %p (%V) is empty and expired. delete.", ch, &ch->id);
   if(ch->keepalive_timer.timer_set) {
@@ -282,26 +298,7 @@ static void redis_store_reap_chanhead(rdstore_channel_head_t *ch) {
   stop_spooler(&ch->spooler, 1);
   CHANNEL_HASH_DEL(ch);
   
-  
-  //don't free the actual chanhead. That will be done once an UNSUBSCRIBE reply is received.
-}
-
-static void free_chanhead(rdstore_channel_head_t *ch) {
-  rdstore_data_t   *rdata = redis_cluster_rdata_from_channel(ch);
-  if(ch->rd_prev) {
-    ch->rd_prev->rd_next = ch->rd_next;
-  }
-  if(ch->rd_next) {
-    ch->rd_next->rd_prev = ch->rd_prev;
-  }
-  if(rdata->almost_deleted_channels_head == ch) {
-    rdata->almost_deleted_channels_head = ch->rd_next;
-  }
-
-  DBG("freed channel %V %p", &ch->id, ch);
-  
   ngx_free(ch);
-
 }
 
 static ngx_int_t nchan_redis_chanhead_ready_to_reap(rdstore_channel_head_t *ch, uint8_t force) {
@@ -315,8 +312,8 @@ static ngx_int_t nchan_redis_chanhead_ready_to_reap(rdstore_channel_head_t *ch,
       return NGX_DECLINED;
     }
     
-    if(ch->gc_time - ngx_time() > 0) {
-      DBG("not yet time to reap %V, %i sec left", &ch->id, ch->gc_time - ngx_time());
+    if(ch->gc.time - ngx_time() > 0) {
+      DBG("not yet time to reap %V, %i sec left", &ch->id, ch->gc.time - ngx_time());
       return NGX_DECLINED;
     }
     
@@ -330,7 +327,7 @@ static ngx_int_t nchan_redis_chanhead_ready_to_reap(rdstore_channel_head_t *ch,
       return NGX_DECLINED;
     }
     
-    //if(ch->pubsub_status == SUBBING) {
+    //if(ch->pubsub_status == REDIS_PUBSUB_SUBSCRIBING) {
     //  return NGX_DECLINED;
     //}
     
@@ -343,171 +340,39 @@ static ngx_int_t nchan_redis_chanhead_ready_to_reap(rdstore_channel_head_t *ch,
   }
 }
 
-static redisAsyncContext **whichRedisContext(rdstore_data_t *rdata, const redisAsyncContext *ac) {
-  if(rdata->ctx == ac) {
-    return &rdata->ctx;
-  }
-  else if(rdata->sub_ctx == ac) {
-    return &rdata->sub_ctx;
-  }
-  return NULL;
-}
-
-static void rdt_set_status(rdstore_data_t *rdata, redis_connection_status_t status, const redisAsyncContext *ac) {
-  redis_connection_status_t prev_status = rdata->status;
-  
-  if(rdata->node.cluster) {
-    redis_cluster_node_change_status(rdata, status);
-  }
-  
-  rdata->status = status;
-  
-  if(status == DISCONNECTED) {
-    if(!rdata->shutting_down && !rdata->reconnect_timer.timer_set) {
-      ngx_add_timer(&rdata->reconnect_timer, REDIS_RECONNECT_TIME);
-    }
-    if(rdata->ping_timer.timer_set) {
-      ngx_del_timer(&rdata->ping_timer);
-    }
-    if(rdata->stall_timer.timer_set) {
-      ngx_del_timer(&rdata->stall_timer);
-    }
-    
-    if(prev_status == CONNECTED) {
-      rdstore_channel_head_t   *cur;
-      
-      //nchan_update_stub_status(redis_pending_commands, -(rdata->pending_commands)); // not  necessary, callbacks will be called
-      nchan_update_stub_status(redis_connected_servers, -1);
-      
-      if(!rdata->node.cluster) {
-        //not in a cluster -- disconnect all subs right away
-        for(cur = rdata->channels_head; cur != NULL; cur = cur->rd_next) {
-          cur->spooler.fn->broadcast_status(&cur->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
-          if(!cur->in_gc_reaper) {
-            redis_chanhead_gc_add(cur, 0, "redis connection gone");
-          }
-        }
-        
-        nchan_reaper_flush(&rdata->chanhead_reaper);
-        
-        while((cur = rdata->almost_deleted_channels_head) != NULL) {
-          free_chanhead(cur);
-        }
-      }
-    }
-    
-    if(ac) {
-      redisAsyncContext **pac = whichRedisContext(rdata, ac);
-      if(pac)
-        *pac = NULL;
-    }
-  }
-  else if(status == CONNECTED && prev_status != CONNECTED) {
-    callback_chain_t    *cur, *next;
-    
-    nchan_update_stub_status(redis_connected_servers, 1);
-    
-    if(!rdata->ping_timer.timer_set && rdata->ping_interval > 0) {
-      ngx_add_timer(&rdata->ping_timer, rdata->ping_interval * 1000);
-    }
-    
-    rdata->pending_commands = 0;
-    if(!rdata->stall_timer.timer_set && REDIS_STALL_CHECK_TIME > 0) {
-      ngx_add_timer(&rdata->stall_timer, REDIS_STALL_CHECK_TIME);
-    }
-    
-    //on_connected callbacks
-    cur = rdata->on_connected;
-    rdata->on_connected = NULL;
-    
-    while(cur != NULL) {
-      next = cur->next;
-      cur->cb(NGX_OK, NULL, cur->pd);
-      ngx_free(cur);
-      cur = next;
-    }
-    rdata->generation++;
-  }
-}
-
-static void redis_reconnect_timer_handler(ngx_event_t *ev) {
-  if(!ev->timedout || ngx_exiting || ngx_quit)
-    return;
-  ev->timedout = 0;
-  redis_ensure_connected((rdstore_data_t *)ev->data);
-}
-
-static void redis_ping_callback(redisAsyncContext *c, void *r, void *privdata) {
-  redisReply         *reply = (redisReply *)r;
-  rdstore_data_t     *rdata = c->data;
-  
-  rdata->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  if(redisReplyOk(c, r)) {
-    if(CHECK_REPLY_INT(reply)) {
-      if(reply->integer < 1) {
-        ERR("failed to forward ping to sub_ctx");
-      }
-    }
-    else {
-      ERR("unexpected reply type for redis_ping_callback");
-    }
-  }
-}
-
-static void redis_ping_timer_handler(ngx_event_t *ev) {
-  rdstore_data_t  *rdata = ev->data, *cmd_rdata;
-  if(!ev->timedout || ngx_exiting || ngx_quit)
-    return;
-  
-  ev->timedout = 0;
-  if(rdata->status == CONNECTED && rdata->ctx && rdata->sub_ctx) {
-    if((cmd_rdata = redis_cluster_rdata_from_cstr(rdata, redis_subscriber_channel)) != NULL) {
-      redis_command(cmd_rdata, redis_ping_callback, NULL, "PUBLISH %s ping", redis_subscriber_channel);
-    }
-    else {
-      //TODO: what to do?...
-    }
-    if(rdata->ping_interval > 0) {
-      ngx_add_timer(ev, rdata->ping_interval * 1000);
-    }
-  }
-}
-
-static ngx_int_t redis_data_tree_connector(rbtree_seed_t *seed, rdstore_data_t *rdata, ngx_int_t *total_rc) {
-  ngx_int_t  rc = redis_ensure_connected(rdata);
-  if(rc != NGX_OK) {
-    *total_rc = rc;
-  }
-  return NGX_OK;
-}
+static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privdata);
 
 static ngx_int_t nchan_store_init_worker(ngx_cycle_t *cycle) {
   ngx_int_t rc = NGX_OK;
-  ngx_memzero(&redis_subscriber_id, sizeof(redis_subscriber_id));
-  ngx_memzero(&redis_subscriber_channel, sizeof(redis_subscriber_channel));
-  ngx_snprintf(redis_subscriber_id, 255, "worker:%i:time:%i", ngx_pid, ngx_time());
-  ngx_snprintf(redis_subscriber_channel, 255, "nchan:%s", redis_subscriber_id);
+  u_char *cur;
+  cur = ngx_snprintf(redis_subscriber_id, 512, "nchan_worker:{%i:time:%i}%Z", ngx_pid, ngx_time());
+  redis_subscriber_id_len = cur - redis_subscriber_id;
+  
+  //DBG("worker id %s len %i", redis_subscriber_id, redis_subscriber_id_len);
   
   redis_nginx_init();
   
-  rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_connector, &rc);
+  nodeset_initialize((char *)redis_subscriber_id, redis_subscriber_callback);
+  nodeset_connect_all();
+  
+  //OLD
+  //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_connector, &rc);
   return rc;
 }
 
 void redisCheckErrorCallback(redisAsyncContext *c, void *r, void *privdata) {
   redisReplyOk(c, r);
 }
-int redisReplyOk(redisAsyncContext *c, void *r) {
+int redisReplyOk(redisAsyncContext *ac, void *r) {
   static const ngx_str_t script_error_start= ngx_string("ERR Error running script (call to f_");
+  redis_node_t         *node = ac->data;
   redisReply *reply = (redisReply *)r;
   if(reply == NULL) { //redis disconnected?...
-    if(c->err) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "connection to redis failed while waiting for reply - %s", c->errstr);
+    if(ac->err) {
+      node_log_error(node, "connection to redis failed while waiting for reply - %s", ac->errstr);
     }
     else {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "got a NULL redis reply for unknown reason");
+      node_log_error(node, "got a NULL redis reply for unknown reason");
     }
     return 0;
   }
@@ -517,14 +382,14 @@ int redisReplyOk(redisAsyncContext *c, void *r) {
       redis_lua_script_t  *script;
       REDIS_LUA_SCRIPTS_EACH(script) {
         if (ngx_strncmp(script->hash, hash, REDIS_LUA_HASH_LENGTH)==0) {
-          ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS SCRIPT ERROR: %s :%s", script->name, &reply->str[script_error_start.len + REDIS_LUA_HASH_LENGTH + 2]);
+          node_log_error(node, "REDIS SCRIPT ERROR: %s :%s", script->name, &reply->str[script_error_start.len + REDIS_LUA_HASH_LENGTH + 2]);
           return 0;
         }
       }
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS SCRIPT ERROR: (unknown): %s", reply->str);
+      node_log_error(node, "REDIS SCRIPT ERROR: (unknown): %s", reply->str);
     }
     else {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS REPLY ERROR: %s", reply->str);
+      node_log_error(node, "REDIS REPLY ERROR: %s", reply->str);
     }
     return 0;
   }
@@ -535,31 +400,28 @@ int redisReplyOk(redisAsyncContext *c, void *r) {
 
 static void redisEchoCallback(redisAsyncContext *ac, void *r, void *privdata) {
   redisReply      *reply = r;
-  rdstore_data_t  *rdata;
+  redis_node_t    *node = NULL;
   unsigned    i;
   //nchan_channel_t * channel = (nchan_channel_t *)privdata;
   if(ac) {
-    rdata = ac->data;
+    node = ac->data;
     if(ac->err) {
-      if(rdata->status != DISCONNECTED) {
-        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "connection to redis failed - %s", ac->errstr);
-        rdt_set_status(rdata, DISCONNECTED, ac);
-      }
+      node_log_error(node, "connection to redis failed - %s", ac->errstr);
       return;
     }
   }
   else {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "connection to redis was terminated");
+    node_log_error(node, "connection to redis was terminated");
     return;
   }
   if(reply == NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS REPLY is NULL");
+    node_log_error(node, "REDIS REPLY is NULL");
     return;
   }  
   
   switch(reply->type) {
     case REDIS_REPLY_STATUS:
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_STATUS  %s", reply->str);
+      node_log_error(node, "REDIS_REPLY_STATUS  %s", reply->str);
       break;
       
     case REDIS_REPLY_ERROR:
@@ -567,19 +429,19 @@ static void redisEchoCallback(redisAsyncContext *ac, void *r, void *privdata) {
       break;
       
     case REDIS_REPLY_INTEGER:
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_INTEGER: %i", reply->integer);
+      node_log_error(node, "REDIS_REPLY_INTEGER: %i", reply->integer);
       break;
       
     case REDIS_REPLY_NIL:
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_NIL: nil");
+      node_log_error(node, "REDIS_REPLY_NIL: nil");
       break;
       
     case REDIS_REPLY_STRING:
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_STRING: %s", reply->str);
+      node_log_error(node, "REDIS_REPLY_STRING: %s", reply->str);
       break;
       
     case REDIS_REPLY_ARRAY:
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS_REPLY_ARRAY: %i", reply->elements);
+      node_log_error(node, "REDIS_REPLY_ARRAY: %i", reply->elements);
       for(i=0; i< reply->elements; i++) {
         redisEchoCallback(ac, reply->element[i], "  ");
       }
@@ -588,231 +450,7 @@ static void redisEchoCallback(redisAsyncContext *ac, void *r, void *privdata) {
   //redis_subscriber_command(NULL, NULL, "UNSUBSCRIBE {channel:%b}:pubsub", str(&(channel->id)));
 }
 
-static void redis_load_script_callback(redisAsyncContext *ac, void *r, void *privdata) {
-  redis_lua_script_t  *script = privdata;
-
-  redisReply *reply = r;
-  if (reply == NULL) return;
-  switch(reply->type) {
-    case REDIS_REPLY_ERROR:
-      nchan_log_error("Failed loading redis lua script %s :%s", script->name, reply->str);
-      break;
-    case REDIS_REPLY_STRING:
-      if(ngx_strncmp(reply->str, script->hash, REDIS_LUA_HASH_LENGTH)!=0) {
-        nchan_log_error("Redis lua script %s has unexpected hash %s (expected %s)", script->name, reply->str, script->hash);
-      }
-      else {
-        //everything went well
-        rdstore_data_t  *rdata = ac->data;
-        if(rdata->status == LOADING_SCRIPTS) {
-          rdata->scripts_loaded_count++;
-          if(rdata->scripts_loaded_count == redis_lua_scripts_count) {
-            
-            if(rdata->generation == 0) {
-              nchan_log_notice( "Established connection to redis at %V.",    rdata->connect_url);
-            }
-            else {
-              nchan_log_warning("Re-established connection to redis at %V.", rdata->connect_url);
-            }
-            
-            rdt_set_status(rdata, CONNECTED, NULL);
-          }
-        }
-      }
-      break;
-  }
-}
-
-static void redisInitScripts(rdstore_data_t *rdata){
-  redis_lua_script_t  *script;
-  if(rdata->ctx == NULL) {
-    ERR("unable to init lua scripts: redis connection not initialized.");
-  }
-  else {
-    rdt_set_status(rdata, LOADING_SCRIPTS, NULL);
-    rdata->scripts_loaded_count = 0;
-    REDIS_LUA_SCRIPTS_EACH(script) {
-      redisAsyncCommand(rdata->ctx, &redis_load_script_callback, script, "SCRIPT LOAD %s", script->script);
-    }
-  }
-}
-
-static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privdata);
-
-static void redis_nginx_connect_event_handler(const redisAsyncContext *ac, int status) {
-  //ERR("redis_nginx_connect_event_handler %v: %i", rdt.connect_url, status);
-  rdstore_data_t    *rdata = ac->data;
-  if(status != REDIS_OK) {
-    if(rdata->status != DISCONNECTED) {
-      char *action = rdata->generation == 0 ? "connect" : "reconnect";
-      if(ac->errstr) {
-        nchan_log_error("Can't %s to redis at %V: %s.", action, rdata->connect_url, ac->errstr);
-      }
-      else {
-        nchan_log_error("Can't %s to redis at %V.", action, rdata->connect_url);
-      }
-    }
-    rdt_set_status(rdata, DISCONNECTED, ac);
-  }
-}
-
-static void redis_nginx_disconnect_event_handler(const redisAsyncContext *ac, int status) {
-  rdstore_data_t    *rdata = ac->data;
-  
-  DBG("connection to redis for %V closed: %s", rdata->connect_url, ac->errstr);
-  
-  if(rdata->status == CONNECTED && !ngx_exiting && !ngx_quit && !rdata->shutting_down) {
-    if(ac->err) {
-      nchan_log_error("Lost connection to redis at %V: %s.", rdata->connect_url, ac->errstr);
-    }
-    else {
-      nchan_log_error("Lost connection to redis at %V.", rdata->connect_url);
-    }
-  }
-  rdt_set_status(rdata, DISCONNECTED, ac);
-  
-}
-
-static void redis_get_server_info(redisAsyncContext *ac);
-
-static void redis_check_if_still_loading_handler(ngx_event_t *ev) {
-  DBG("still loading?,,.");
-  rdstore_data_t   *rdata = ev->data;
-  if(rdata->status != DISCONNECTED && rdata->ctx) {
-    redis_get_server_info(rdata->ctx);
-  }
-  
-  ngx_free(ev);
-}
-
-void redis_get_server_info_callback(redisAsyncContext *ac, void *rep, void *privdata);
-
-
-static void redis_get_server_info(redisAsyncContext *ac) {
-  redisAsyncCommand(ac, redis_get_server_info_callback, NULL, "INFO");
-}
-
-
-
-
-void redis_get_server_info_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  redisReply             *reply = rep;
-  rdstore_data_t         *rdata = ac->data;
-  
-  //DBG("redis_get_server_info_callback %p", ac);
-  if(ac->err || !redisReplyOk(ac, rep) || reply->type != REDIS_REPLY_STRING) {
-    return;
-  }
-  
-  //is it loading?
-  if(ngx_strstrn((u_char *)reply->str, "loading:1", 8)) {
-    nchan_log_warning("Redis server at %V is still loading data.", rdata->connect_url);
-    ngx_event_t      *evt = ngx_calloc(sizeof(*evt), ngx_cycle->log);
-    nchan_init_timer(evt, redis_check_if_still_loading_handler, rdata);
-    rdt_set_status(rdata, LOADING, ac);
-    ngx_add_timer(evt, 1000);
-  }
-  else {
-    DBG("everything loaded and good to go");
-    redisInitScripts(rdata);
-    if(rdata->sub_ctx) {
-      //ERR("rdata->sub_ctx OK, subscribing for %V", rdata->connect_url);
-      if(redis_cluster_rdata_from_cstr(rdata, redis_subscriber_channel) == rdata) {
-        redisAsyncCommand(rdata->sub_ctx, redis_subscriber_callback, NULL, "SUBSCRIBE %s", redis_subscriber_channel);
-      }
-    }
-    else {
-      ERR("rdata->sub_ctx NULL, can't subscribe for %V", rdata->connect_url);
-    }
-  }
-  
-  //is it part of a cluster?
-  if(ac == rdata->ctx && ngx_strstrn((u_char *)reply->str, "cluster_enabled:1", 16)) {
-    DBG("is part of a cluster. learn more.");
-    redis_get_cluster_info(rdata);
-  }
-}
-
-void redis_nginx_select_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  redisReply             *reply = rep;
-  rdstore_data_t         *rdata = ac->data;
-  if ((reply == NULL) || (reply->type == REDIS_REPLY_ERROR)) {
-    if(rdata->status == CONNECTING) {
-      ERR("could not select redis database");
-    }
-    rdt_set_status(rdata, DISCONNECTED, ac);
-    redisAsyncFree(ac);
-  }
-  else if(rdata->ctx && rdata->sub_ctx && rdata->status == CONNECTING && !rdata->ctx->err && !rdata->sub_ctx->err) {
-    rdt_set_status(rdata, AUTHENTICATING, NULL);
-    
-    if(rdata->ctx == ac) {
-      redis_get_server_info(ac);
-    }
-  }
-}
-
-void redis_nginx_auth_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  redisReply             *reply = rep;
-  rdstore_data_t         *rdata = ac->data;
-  if ((reply == NULL) || (reply->type == REDIS_REPLY_ERROR)) {
-    if(rdata->status == CONNECTING) {
-      ERR("AUTH command failed, probably because the password is incorrect");
-      rdt_set_status(rdata, DISCONNECTED, ac);
-    }
-  }
-}
-
-static int redis_initialize_ctx(redisAsyncContext **ctx, rdstore_data_t *rdata) {
-  if(*ctx == NULL) {
-    redis_nginx_open_context(&rdata->connect_params.host, rdata->connect_params.port, rdata->connect_params.db, &rdata->connect_params.password, rdata, ctx);
-    if(*ctx != NULL) {
-      if(rdata->connect_params.password.len > 0) {
-        redisAsyncCommand(*ctx, redis_nginx_auth_callback, NULL, "AUTH %b", STR(&rdata->connect_params.password));
-      }
-      if(rdata->connect_params.db > 0) {
-        redisAsyncCommand(*ctx, redis_nginx_select_callback, NULL, "SELECT %d", rdata->connect_params.db);
-      }
-      else {
-        redis_get_server_info(*ctx);
-      }
-      redisAsyncSetConnectCallback(*ctx, redis_nginx_connect_event_handler);
-      redisAsyncSetDisconnectCallback(*ctx, redis_nginx_disconnect_event_handler);
-      return 1;
-    }
-    else {
-      ERR("can't initialize redis ctx %p", ctx);
-      return 0;
-    }
-  }
-  else {
-    return 0;
-  }
-}
-
-ngx_int_t redis_ensure_connected(rdstore_data_t *rdata) {
-  int connecting = 0;
-  if(redis_initialize_ctx(&rdata->ctx, rdata)) {
-    connecting = 1;
-  }
-  
-  if(redis_initialize_ctx(&rdata->sub_ctx, rdata)) {
-    connecting = 1;
-  }
-    
-  if(rdata->ctx && rdata->sub_ctx) {
-    if(connecting) {
-      rdt_set_status(rdata, CONNECTING, NULL);
-    }
-    return NGX_OK;
-  }
-  else {
-    return NGX_DECLINED;
-  }
-
-}
-
-static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, ngx_buf_t *buf, redisReply *r, uint16_t offset);
+static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, nchan_compressed_msg_t *cmsg, ngx_str_t *content_type, ngx_str_t *eventsource_event, redisReply *r, uint16_t offset);
 
 #define SLOW_REDIS_REPLY 100 //ms
 
@@ -824,7 +462,7 @@ static ngx_int_t log_redis_reply(char *name, ngx_msec_t t) {
   return NGX_OK;
 }
 
-static ngx_int_t redisReply_to_int(redisReply *el, ngx_int_t *integer) {
+static ngx_int_t redisReply_to_ngx_int(redisReply *el, ngx_int_t *integer) {
   if(CHECK_REPLY_INT(el)) {
     *integer=el->integer;
   }
@@ -843,38 +481,41 @@ typedef struct {
   ngx_str_t                     channel_id;
   nchan_msg_id_t               *msg_id;
   ngx_str_t                     msg_key;
-  rdstore_data_t               *rdata;
 } redis_get_message_from_key_data_t;
 
-static void get_msg_from_msgkey_callback(redisAsyncContext *c, void *r, void *privdata);
+static void get_msg_from_msgkey_callback(redisAsyncContext *ac, void *r, void *privdata);
 
-static void get_msg_from_msgkey_send(rdstore_data_t *rdata, void *pd) {
+static ngx_int_t get_msg_from_msgkey_send(redis_nodeset_t *ns, void *pd) {
   redis_get_message_from_key_data_t *d = pd;
-  if(rdata) {
-    redis_command(rdata, &get_msg_from_msgkey_callback, d, "EVALSHA %s 1 %b", redis_lua_scripts.get_message_from_key.hash, STR(&d->msg_key));
+  if(nodeset_ready(ns)) {
+    redis_node_t  *node = nodeset_node_find_by_key(ns, &d->msg_key);
+    redis_script(get_message_from_key, node, &get_msg_from_msgkey_callback, d, "1 %b", STR(&d->msg_key));
   }
   else {
     ngx_free(d);
   }
+  return NGX_OK;
 }
 
-static void get_msg_from_msgkey_callback(redisAsyncContext *c, void *r, void *privdata) {
+static void get_msg_from_msgkey_callback(redisAsyncContext *ac, void *r, void *privdata) {
   redis_get_message_from_key_data_t *d = (redis_get_message_from_key_data_t *)privdata;
   redisReply           *reply = r;
   nchan_msg_t           msg;
-  ngx_buf_t             msgbuf;
+  nchan_compressed_msg_t cmsg;
+  ngx_str_t             content_type;
+  ngx_str_t             eventsource_event;
   ngx_str_t            *chid = &d->channel_id;
-  rdstore_data_t       *rdata = c->data;
+  redis_node_t         *node = ac->data;
   
-  rdata->pending_commands--;
+  node->pending_commands--;
   nchan_update_stub_status(redis_pending_commands, -1);
   
   DBG("get_msg_from_msgkey_callback");
   
   log_redis_reply(d->name, d->t);
   
-  if(!clusterKeySlotOk(c, r)) {
-    cluster_add_retry_command_with_channel_id(rdata->node.cluster, chid, get_msg_from_msgkey_send, d);
+  if(!nodeset_node_reply_keyslot_ok(node, reply)) {
+    nodeset_callback_on_ready(node->nodeset, 1000, get_msg_from_msgkey_send, d);
     return;
   }
   
@@ -883,11 +524,11 @@ static void get_msg_from_msgkey_callback(redisAsyncContext *c, void *r, void *pr
       ERR("get_msg_from_msgkey channel id is NULL");
       return;
     }
-    if(msg_from_redis_get_message_reply(&msg, &msgbuf, reply, 0) != NGX_OK) {
+    if(msg_from_redis_get_message_reply(&msg, &cmsg, &content_type, &eventsource_event, reply, 0) != NGX_OK) {
       ERR("invalid message or message absent after get_msg_from_key");
       return;
     }
-    nchan_store_publish_generic(chid, d->rdata, &msg, 0, NULL);
+    nchan_store_publish_generic(chid, node->nodeset, &msg, 0, NULL);
   }
   else {
     //reply is NULL
@@ -914,11 +555,12 @@ static bool cmp_to_str(cmp_ctx_t *cmp, ngx_str_t *str) {
   }
 }
 
-static bool cmp_to_msg(cmp_ctx_t *cmp, nchan_msg_t *msg, ngx_buf_t *buf) {
+static bool cmp_to_msg(cmp_ctx_t *cmp, nchan_msg_t *msg, nchan_compressed_msg_t *cmsg, ngx_str_t *content_type, ngx_str_t *eventsource_event) {
   ngx_buf_t  *mpb = (ngx_buf_t *)cmp->buf;
   uint32_t    sz;
   uint64_t    msgtag;
   int32_t     ttl;
+  int32_t     compression;
   //ttl 
   if(!cmp_read_int(cmp, &ttl)) {
     return cmp_err(cmp);
@@ -959,34 +601,48 @@ static bool cmp_to_msg(cmp_ctx_t *cmp, nchan_msg_t *msg, ngx_buf_t *buf) {
   if(!cmp_read_str_size(cmp, &sz)) {
     return cmp_err(cmp);
   }
-  set_buf(buf, mpb->pos, sz);
+  set_buf(&msg->buf, mpb->pos, sz);
   fwd_buf(mpb, sz);
-  buf->memory = 1;
-  buf->last_buf = 1;
-  buf->last_in_chain = 1;
-  msg->buf = buf;
+  msg->buf.memory = 1;
+  msg->buf.last_buf = 1;
+  msg->buf.last_in_chain = 1;
 
   //content-type
   if(!cmp_read_str_size(cmp, &sz)) {
     return cmp_err(cmp);
   }
-  fwd_buf_to_str(mpb, sz, &msg->content_type);
+  fwd_buf_to_str(mpb, sz, content_type);
+  msg->content_type = sz > 0 ? content_type : NULL;
   
   //eventsource_event
   if(!cmp_read_str_size(cmp, &sz)) {
     return cmp_err(cmp);
   }
-  fwd_buf_to_str(mpb, sz, &msg->eventsource_event);
+  fwd_buf_to_str(mpb, sz, eventsource_event);
+  msg->eventsource_event = sz > 0 ? eventsource_event : NULL;
+  
+  //compression
+  if(!cmp_read_int(cmp, &compression)) {
+    msg->compressed = NULL;
+  }
+  if(compression > 0) {
+    msg->compressed = cmsg;
+    ngx_memzero(&cmsg->buf, sizeof(cmsg->buf));
+    cmsg->compression = compression;
+  }
+  else {
+    msg->compressed = NULL;
+  }
   
   return true;
 }
 
-static ngx_int_t get_msg_from_msgkey(ngx_str_t *channel_id, rdstore_data_t *rdata, nchan_msg_id_t *msgid, ngx_str_t *msg_redis_hash_key) {
+static ngx_int_t get_msg_from_msgkey(ngx_str_t *channel_id, redis_nodeset_t *nodeset, nchan_msg_id_t *msgid, ngx_str_t *msg_redis_hash_key) {
   rdstore_channel_head_t              *head;
   redis_get_message_from_key_data_t   *d;
   DBG("Get message from msgkey %V", msg_redis_hash_key);
   
-  head = nchan_store_get_chanhead(channel_id, rdata);
+  head = nchan_store_get_chanhead(channel_id, nodeset);
   if(head->sub_count == 0) {
     DBG("Nobody wants this message we'll need to grab with an HMGET");
     return NGX_OK;
@@ -1003,27 +659,56 @@ static ngx_int_t get_msg_from_msgkey(ngx_str_t *channel_id, rdstore_data_t *rdat
   nchan_strcpy(&d->msg_key, msg_redis_hash_key, 0);
   
   d->t = ngx_current_msec;
-  d->rdata = rdata;
   
   d->name = "get_message_from_key";
   
   //d->hcln = put_current_subscribers_in_limbo(head);
   //assert(d->hcln != 0);
-  if((rdata = redis_cluster_rdata_from_key(rdata, msg_redis_hash_key)) == NULL) {
-    return NGX_ERROR;
-  }
-  get_msg_from_msgkey_send(rdata, d);
+  get_msg_from_msgkey_send(nodeset, d);
 
   return NGX_OK;
 }
 
 static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub);
 
+static int str_match_redis_subscriber_channel(ngx_str_t *pubsub_channel, ngx_str_t *ns) {
+  ngx_str_t psch = *pubsub_channel;
+  if(pubsub_channel->len != ns->len + redis_subscriber_id_len || psch.len < ns->len) {
+    return 0;
+  }
+  if(ngx_memcmp(psch.data, ns->data, ns->len) != 0) {
+    return 0;
+  }
+  psch.data += ns->len;
+  psch.len -= ns->len;
+  
+  return ngx_strmatch(&psch, (char *)redis_subscriber_id);
+}
+
+static ngx_str_t *get_channel_id_from_pubsub_channel(ngx_str_t *pubsub_channel, ngx_str_t *ns, ngx_str_t *str_in) {
+  if(str_match_redis_subscriber_channel(pubsub_channel, ns)) {
+    return NULL;
+  }
+  str_in->data = pubsub_channel->data + ns->len + 9; //"<namespace>{channel:"
+  str_in->len = pubsub_channel->len - ns->len - 9;
+  str_in->len -= 8;//"}:pubsub"
+  return str_in;
+}
+
+static rdstore_channel_head_t *find_chanhead_for_pubsub_callback(ngx_str_t *chid) {
+  rdstore_channel_head_t *head;
+  CHANNEL_HASH_FIND(chid, head);
+  return head;
+}
+
 static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privdata) {
   redisReply             *reply = r;
   redisReply             *el = NULL;
   nchan_msg_t             msg;
-  ngx_buf_t               buf;
+  nchan_compressed_msg_t  cmsg;
+  ngx_str_t               content_type;
+  ngx_str_t               eventsource_event;
+  ngx_str_t               chid_str;
   ngx_str_t              *chid = NULL;
   ngx_str_t               pubsub_channel; 
   ngx_str_t               msg_redis_hash_key = ngx_null_string;
@@ -1032,32 +717,37 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
   ngx_buf_t               mpbuf;
   cmp_ctx_t               cmp;
   
-  rdstore_channel_head_t     *chanhead;
-  rdstore_data_t             *rdata = c->data;
-  
-  ngx_memzero(&buf, sizeof(buf)); 
-  
-  //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "redis_subscriber_callback,  privdata=%p", privdata);
-  
-  chanhead = (rdstore_channel_head_t *)privdata;
+  rdstore_channel_head_t     *chanhead = NULL;
+  redis_node_t               *node = c->data;
+  redis_nodeset_t            *nodeset = node->nodeset;
+  ngx_str_t                  *namespace = nodeset->settings.namespace;
   
   msg.expires = 0;
   msg.refcount = 0;
-  msg.buf = NULL;
+  msg.parent = NULL;
+  msg.storage = NCHAN_MSG_STACK;
 
   if(reply == NULL) return;
+  
   if(CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3)
-    && CHECK_REPLY_STRVAL(reply->element[0], "message")
-    && CHECK_REPLY_STR(reply->element[1])
-    && CHECK_REPLY_STR(reply->element[2])) {
-    
+   && CHECK_REPLY_STR(reply->element[0])
+   && CHECK_REPLY_STR(reply->element[1])) {
     pubsub_channel.data = (u_char *)reply->element[1]->str;
     pubsub_channel.len = reply->element[1]->len;
+    chid = get_channel_id_from_pubsub_channel(&pubsub_channel, namespace, &chid_str);
+  }
+  else {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "no PUBSUB message, something else");
+    redisEchoCallback(c,r,privdata);
+    return;
+  }
   
+  if(CHECK_REPLY_STRVAL(reply->element[0], "message") && CHECK_REPLY_STR(reply->element[2])) {
+    
     //reply->element[1] is the pubsub channel name
     el = reply->element[2];
     
-    if(CHECK_REPLY_STRVAL(el, "ping") && ngx_strmatch(&pubsub_channel, (char *)&redis_subscriber_channel)) {
+    if(CHECK_REPLY_STRVAL(el, "ping") && str_match_redis_subscriber_channel(&pubsub_channel, namespace)) {
       DBG("got pinged");
     }
     else if(CHECK_REPLY_STR(el)) {
@@ -1068,7 +758,7 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
       int64_t     msgbuf_size = 0;
       //maybe a message?
       set_buf(&mpbuf, (u_char *)el->str, el->len);
-      cmp_init(&cmp, &mpbuf, ngx_buf_reader, ngx_buf_writer);
+      cmp_init(&cmp, &mpbuf, ngx_buf_reader, NULL, ngx_buf_writer);
       if(cmp_read_array(&cmp, &array_sz)) {
         
         if(array_sz != 0) {
@@ -1093,22 +783,26 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
               cmp_err(&cmp);
             }
           }
-          else if(chanhead) {
-            chid = &chanhead->id;
-          }
+          //else {
+          //  chid already set from the pubsub channel name
+          //}
           
-          if(msgbuf_size_changed && (chanhead || ((chanhead = nchan_store_get_chanhead(chid, rdata)) != NULL))) {
+          if(msgbuf_size_changed && (chanhead = nchan_store_get_chanhead(chid, nodeset)) != NULL) {
             chanhead->spooler.fn->broadcast_notice(&chanhead->spooler, NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE, (void *)(intptr_t )msgbuf_size);
           }
           
+          if(!chanhead) {
+            chanhead = find_chanhead_for_pubsub_callback(chid);
+          }
+          
           if(ngx_strmatch(&msg_type, "msg")) {
-            assert(array_sz == 9 + msgbuf_size_changed + chid_present);
-            if(chanhead != NULL && cmp_to_msg(&cmp, &msg, &buf)) {
+            assert(array_sz >= 9 + msgbuf_size_changed + chid_present);
+            if(chanhead && cmp_to_msg(&cmp, &msg, &cmsg, &content_type, &eventsource_event)) {
               //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "got msg %V", msgid_to_str(&msg));
-              nchan_store_publish_generic(chid, chanhead ? chanhead->rdt : rdata, &msg, 0, NULL);
+              nchan_store_publish_generic(chid, chanhead ? chanhead->redis.nodeset : nodeset, &msg, 0, NULL);
             }
             else {
-              ERR("thought there'd be a channel id around for msg");
+              ERR("thought there'd be a channel for msg");
             }
           }
           else if(ngx_strmatch(&msg_type, "msgkey")) {
@@ -1133,7 +827,7 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
               }
               
               if(cmp_to_str(&cmp, &msg_redis_hash_key)) {
-                get_msg_from_msgkey(chid, chanhead ? chanhead->rdt : rdata, &msgid, &msg_redis_hash_key);
+                get_msg_from_msgkey(chid, chanhead ? chanhead->redis.nodeset : node->nodeset, &msgid, &msg_redis_hash_key);
               }
             }
             else {
@@ -1150,8 +844,8 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
             if(ngx_strmatch(&alerttype, "delete channel") && array_sz > 2) {
               if(cmp_to_str(&cmp, &extracted_channel_id)) {
                 rdstore_channel_head_t *doomed_channel;
-                nchan_store_publish_generic(&extracted_channel_id, rdata, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
-                doomed_channel = nchan_store_get_chanhead(&extracted_channel_id, rdata);
+                nchan_store_publish_generic(&extracted_channel_id, nodeset, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+                doomed_channel = nchan_store_get_chanhead(&extracted_channel_id, nodeset);
                 redis_chanhead_gc_add(doomed_channel, 0, "channel deleted");
               }
               else {
@@ -1169,7 +863,7 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
             }
             else if(ngx_strmatch(&alerttype, "unsub all") && array_sz > 1) {
               if(cmp_to_str(&cmp, &extracted_channel_id)) {
-                nchan_store_publish_generic(&extracted_channel_id, rdata, NULL, NGX_HTTP_CONFLICT, &NCHAN_HTTP_STATUS_409);
+                nchan_store_publish_generic(&extracted_channel_id, nodeset, NULL, NGX_HTTP_CONFLICT, &NCHAN_HTTP_STATUS_409);
               }
             }
             else if(ngx_strmatch(&alerttype, "unsub all except")) {
@@ -1205,52 +899,57 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
     }
   }
 
-  else if(CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3)
-    && CHECK_REPLY_STRVAL(reply->element[0], "subscribe")
-    && CHECK_REPLY_STR(reply->element[1])
-    && CHECK_REPLY_INT(reply->element[2])) {
-
-    if(chanhead != NULL){
-      if(chanhead->pubsub_status != SUBBING) {
-        ERR("expected previous pubsub_status for channel %p (id: %V) to be SUBBING (%i), was %i", chanhead, &chanhead->id, SUBBING, chanhead->pubsub_status);
+  else if(CHECK_REPLY_STRVAL(reply->element[0], "subscribe") && CHECK_REPLY_INT(reply->element[2])) {
+    
+    if(chid) {
+      chanhead = find_chanhead_for_pubsub_callback(chid);
+      if(chanhead != NULL) {
+        if(chanhead->pubsub_status != REDIS_PUBSUB_SUBSCRIBING) {
+          ERR("expected previous pubsub_status for channel %p (id: %V) to be REDIS_PUBSUB_SUBSCRIBING (%i), was %i", chanhead, &chanhead->id, REDIS_PUBSUB_SUBSCRIBING, chanhead->pubsub_status);
+        }
+        chanhead->pubsub_status = REDIS_PUBSUB_SUBSCRIBED;
+        
+        switch(chanhead->status) {
+          case NOTREADY:
+            chanhead->status = READY;
+            chanhead->spooler.fn->handle_channel_status_change(&chanhead->spooler);
+            //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "REDIS: PUB/SUB subscribed to %s, chanhead %p now READY.", reply->element[1]->str, chanhead);
+            break;
+          case READY:
+            ERR("REDIS: PUB/SUB already subscribed to %s, chanhead %p (id %V) already READY.", reply->element[1]->str, chanhead, &chanhead->id);
+            break;
+          case INACTIVE:
+            // this is fine, inactive channels can be pubsubbed, they will be garbage collected
+            // later if needed
+            break;
+          default:
+            ERR("REDIS: PUB/SUB really unexpected chanhead status %i", chanhead->status);
+            assert(0);
+            //not sposed to happen
+        }
       }
-      chanhead->pubsub_status = SUBBED;
-      
-      switch(chanhead->status) {
-        case NOTREADY:
-          chanhead->status = READY;
-          chanhead->spooler.fn->handle_channel_status_change(&chanhead->spooler);
-          //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "REDIS: PUB/SUB subscribed to %s, chanhead %p now READY.", reply->element[1]->str, chanhead);
-          break;
-        case READY:
-          ERR("REDIS: PUB/SUB already subscribed to %s, chanhead %p (id %V) already READY.", reply->element[1]->str, chanhead, &chanhead->id);
-          break;
-        case INACTIVE:
-          ERR("REDIS: PUB/SUB already unsubscribed from %s, chanhead %p (id %V) INACTIVE.", reply->element[1]->str, chanhead, &chanhead->id);
-          break;
-        default:
-          ERR("REDIS: PUB/SUB really unexpected chanhead status %i", chanhead->status);
-          assert(0);
-          //not sposed to happen
+      else {
+        ERR("received SUBSCRIBE acknowledgement for unknown channel %V", chid);
       }
     }
+    else {
+      DBG("subscribed to worker channel %s", redis_subscriber_id);
+    }
     
     DBG("REDIS: PUB/SUB subscribed to %s (%i total)", reply->element[1]->str, reply->element[2]->integer);
   }
-  else if(CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3)
-    && CHECK_REPLY_STRVAL(reply->element[0], "unsubscribe")
-    && CHECK_REPLY_STR(reply->element[1])
-    && CHECK_REPLY_INT(reply->element[2])) {
-
-    DBG("REDIS: PUB/SUB unsubscribed from %s (%i total)", reply->element[1]->str, reply->element[2]->integer);
-    if(chanhead->pubsub_status == UNSUBBING) {
-      chanhead->pubsub_status = UNSUBBED;
-      free_chanhead(chanhead);
+  else if(CHECK_REPLY_STRVAL(reply->element[0], "unsubscribe") && CHECK_REPLY_INT(reply->element[2])) {
+    
+    if(chid) {
+      DBG("received UNSUBSCRIBE acknowledgement for channel %V", chid);
+    }
+    else {
+      DBG("received UNSUBSCRIBE acknowledgement for worker channel %s", redis_subscriber_id);
     }
   }
   
   else {
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "no message, something else");
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "Unexpected PUBSUB message %s", reply->element[0]);
     redisEchoCallback(c,r,privdata);
   }
 }
@@ -1276,9 +975,7 @@ static void spooler_dequeue_handler(channel_spooler_t *spl, subscriber_t *sub, v
     head->internal_sub_count--;
   }
   
-  if(head->rdt->status == CONNECTED) {
-    redis_subscriber_unregister(head, sub, head->shutting_down);
-  }
+  redis_subscriber_unregister(head, sub, head->shutting_down);
   
   if(head->sub_count == 0 && head->fetching_message_count == 0) {
     redis_chanhead_gc_add(head, 0, "sub count == 0 and fetching_message_count == 0 after spooler dequeue");
@@ -1300,6 +997,8 @@ void spooler_get_message_finish_handler(channel_spooler_t *spl, void *pd) {
 }
 
 static ngx_int_t start_chanhead_spooler(rdstore_channel_head_t *head) {
+  static uint8_t channel_buffer_complete = 1;
+  spooler_fetching_strategy_t spooling_strategy;
   static channel_spooler_handlers_t handlers = {
     spooler_add_handler,
     spooler_dequeue_handler,
@@ -1308,11 +1007,20 @@ static ngx_int_t start_chanhead_spooler(rdstore_channel_head_t *head) {
     spooler_get_message_start_handler,
     spooler_get_message_finish_handler
   };
-  start_spooler(&head->spooler, &head->id, &head->status, &nchan_store_redis, head->rdt->lcf, FETCH, &handlers, head);
+  nchan_loc_conf_t *lcf = head->redis.nodeset->first_loc_conf; //any loc_conf that refers to this nodeset will work. 
+  //the spooler needs it to pass to get_message calls, which in rdstore's case only cares about the nodeset referenced in the loc_conf
+  if(head->redis.nodeset->settings.storage_mode == REDIS_MODE_DISTRIBUTED_NOSTORE) {
+    spooling_strategy = NCHAN_SPOOL_PASSTHROUGH;
+  }
+  else {
+    spooling_strategy = NCHAN_SPOOL_FETCH;
+  }
+  
+  start_spooler(&head->spooler, &head->id, &head->status, &channel_buffer_complete, &nchan_store_redis, lcf, spooling_strategy, &handlers, head);
   return NGX_OK;
 }
 
-static void redis_subscriber_register_callback(redisAsyncContext *c, void *vr, void *privdata);
+static void redis_subscriber_register_cb(redisAsyncContext *c, void *vr, void *privdata);
 
 typedef struct {
   rdstore_channel_head_t *chanhead;
@@ -1320,22 +1028,28 @@ typedef struct {
   subscriber_t           *sub;
 } redis_subscriber_register_t;
 
-static void redis_subscriber_register_send(rdstore_data_t *rdata, void *pd) {
+static ngx_int_t redis_subscriber_register_send(redis_nodeset_t *nodeset, void *pd) {
   redis_subscriber_register_t   *d = pd;
-  if(rdata) {
+  if(nodeset_ready(nodeset)) {
     d->chanhead->reserved++;
-    redis_command(rdata, &redis_subscriber_register_callback, d, "EVALSHA %s 0 %b - %i", redis_lua_scripts.subscriber_register.hash, STR(&d->chanhead->id), REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL);
+    redis_node_t *node = nodeset_node_find_by_chanhead(d->chanhead);
+    
+    nchan_redis_script(subscriber_register, node, &redis_subscriber_register_cb, d, &d->chanhead->id,
+                       "- %i %i 1",
+                       REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_STEP,
+                       ngx_time()
+                      );
   }
   else {
     d->sub->fn->release(d->sub, 0);
     ngx_free(d);
   }
+  return NGX_OK;
 }
 
 
 static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub) {
   redis_subscriber_register_t *sdata=NULL;
-  rdstore_data_t              *rdata;
   if((sdata = ngx_alloc(sizeof(*sdata), ngx_cycle->log)) == NULL) {
     ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "No memory for sdata. Part IV, subparagraph 12 of the Cryptic Error Series.");
     return NGX_ERROR;
@@ -1350,46 +1064,65 @@ static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, sub
   //  'subscriber_id' can be '-' for new id, or an existing id
   //  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
   //output: subscriber_id, num_current_subscribers, next_keepalive_time
-  if((rdata = redis_cluster_rdata_from_channel(chanhead)) == NULL) {
-    return NGX_ERROR;
-  }
-  redis_subscriber_register_send(rdata, sdata);
+  redis_subscriber_register_send(chanhead->redis.nodeset, sdata);
   
   return NGX_OK;
 }
 
-static void redis_subscriber_register_callback(redisAsyncContext *c, void *vr, void *privdata) {
+static ngx_int_t redis_subscriber_register_send_retry_wrapper(redis_nodeset_t *nodeset, void *pd) {
+  redis_subscriber_register_t   *d = pd;
+  d->chanhead->reserved--;
+  return redis_subscriber_register_send(nodeset, pd);
+}
+
+static void redis_subscriber_register_cb(redisAsyncContext *c, void *vr, void *privdata) {
   redis_subscriber_register_t *sdata= (redis_subscriber_register_t *) privdata;
   redisReply                  *reply = (redisReply *)vr;
-  rdstore_data_t              *rdata = c->data;
+  redis_node_t                *node = c->data;
   int                          keepalive_ttl;
   
-  rdata->pending_commands--;
+  node->pending_commands--;
   nchan_update_stub_status(redis_pending_commands, -1);
   
   sdata->chanhead->reserved--;
-  sdata->sub->fn->release(sdata->sub, 0);
   
-  if(!clusterKeySlotOk(c, reply)) {
-    cluster_add_retry_command_with_chanhead(sdata->chanhead, redis_subscriber_register_send, sdata);
+  if(!nodeset_node_reply_keyslot_ok(node, reply)) {
+    sdata->chanhead->reserved++;
+    nodeset_callback_on_ready(node->nodeset, 1000, redis_subscriber_register_send_retry_wrapper, sdata);
     return; 
   }
   
   if (!redisReplyOk(c, reply)) {
+    //TODO: fail less silently, maybe retry subscriber registration?
+    sdata->sub->fn->release(sdata->sub, 0);
     ngx_free(sdata);
     return;
   }
   
-  if ( !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3) || !CHECK_REPLY_INT(reply->element[1]) || !CHECK_REPLY_INT(reply->element[2])) {
-    //no good
-    redisEchoCallback(c,reply,privdata);
-    return;
+  if(  CHECK_REPLY_ARRAY_MIN_SIZE(reply, 4)
+    && CHECK_REPLY_INT(reply->element[3])
+  ) {
+    //notify about channel buffer size if it's present
+    sdata->sub->fn->notify(sdata->sub, NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE, (void *)(intptr_t )reply->element[3]->integer);
   }
+  
   if(sdata->generation == sdata->chanhead->generation) {
     //is the subscriber     
     //TODO: set subscriber id
     //sdata->sub->id = reply->element[1]->integer;
   }
+  
+  sdata->sub->fn->release(sdata->sub, 0);
+  sdata->sub = NULL; //don't use it anymore, it might have been freed
+  
+  if ( !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3) || !CHECK_REPLY_INT(reply->element[1]) || !CHECK_REPLY_INT(reply->element[2])) {
+    //no good
+    //TODO: fail less silently, maybe retry subscriber registration?
+    redisEchoCallback(c,reply,privdata);
+    ngx_free(sdata);
+    return;
+  }
+  
   keepalive_ttl = reply->element[2]->integer;
   if(keepalive_ttl > 0) {
     if(!sdata->chanhead->keepalive_timer.timer_set) {
@@ -1403,24 +1136,35 @@ static void redis_subscriber_register_callback(redisAsyncContext *c, void *vr, v
 typedef struct {
   ngx_str_t    *channel_id;
   time_t        channel_timeout;
+  unsigned      allocd:1;
 } subscriber_unregister_data_t;
 
-static void redis_subscriber_unregister_callback(redisAsyncContext *c, void *r, void *privdata);
-static void redis_subscriber_unregister_send(rdstore_data_t *rdata, void *pd) {
-  //input: keys: [], values: [channel_id, subscriber_id, empty_ttl]
+static void redis_subscriber_unregister_cb(redisAsyncContext *c, void *r, void *privdata);
+static ngx_int_t redis_subscriber_unregister_send(redis_nodeset_t *nodeset, void *pd) {
+  //input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]
   // 'subscriber_id' is an existing id
   // 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
   //output: subscriber_id, num_current_subscribers
-  if(rdata) {
-    redis_command(rdata, &redis_subscriber_unregister_callback, NULL, "EVALSHA %s 0 %b %i %i", redis_lua_scripts.subscriber_unregister.hash, STR(((subscriber_unregister_data_t *)pd)->channel_id), 0/*TODO: sub->id*/, ((subscriber_unregister_data_t *)pd)->channel_timeout);
+  subscriber_unregister_data_t *d = pd;
+  if(nodeset_ready(nodeset)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, d->channel_id);
+    nchan_redis_script( subscriber_unregister, node, &redis_subscriber_unregister_cb, NULL, 
+      d->channel_id, "%i %i", 
+                       0/*TODO: sub->id*/,
+                       d->channel_timeout
+                      );
   }
+  if(d->allocd) {
+    ngx_free(d);
+  }
+  return NGX_OK;
 }
 
-static void redis_subscriber_unregister_callback(redisAsyncContext *c, void *r, void *privdata) {
+static void redis_subscriber_unregister_cb(redisAsyncContext *c, void *r, void *privdata) {
   redisReply      *reply = r;
-  rdstore_data_t  *rdata = c->data;
+  redis_node_t    *node = c->data;
   
-  rdata->pending_commands--;
+  node->pending_commands--;
   nchan_update_stub_status(redis_pending_commands, -1);
   
   if(reply && reply->type == REDIS_REPLY_ERROR) {
@@ -1433,12 +1177,12 @@ static void redis_subscriber_unregister_callback(redisAsyncContext *c, void *r,
     errstr.len = strlen(reply->str);
     
     if(ngx_str_chop_if_startswith(&errstr, "CLUSTER KEYSLOT ERROR. ")) {
-      
+      nodeset_node_keyslot_changed(node);
       nchan_scan_until_chr_on_line(&errstr, &countstr, ' ');
       channel_timeout = ngx_atoi(countstr.data, countstr.len);
       channel_id = errstr;
       
-      subscriber_unregister_data_t  *d = cluster_retry_palloc(rdata->node.cluster, sizeof(*d) + sizeof(ngx_str_t) + channel_id.len);
+      subscriber_unregister_data_t  *d = ngx_alloc(sizeof(*d) + sizeof(ngx_str_t) + channel_id.len, ngx_cycle->log);
       if(!d) {
         ERR("can't allocate add_fakesub_data for CLUSTER KEYSLOT ERROR retry");
         return;
@@ -1446,9 +1190,9 @@ static void redis_subscriber_unregister_callback(redisAsyncContext *c, void *r,
       d->channel_timeout = channel_timeout;
       d->channel_id = (ngx_str_t *)&d[1];
       d->channel_id->data = (u_char *)&d->channel_id[1];
+      d->allocd = 1;
       nchan_strcpy(d->channel_id, &channel_id, 0);
-      cluster_add_retry_command_with_channel_id(rdata->node.cluster, &channel_id, redis_subscriber_unregister_send, d);
-      
+      nodeset_callback_on_ready(node->nodeset, 1000, redis_subscriber_unregister_send, d);
       return;
     }
     
@@ -1457,20 +1201,23 @@ static void redis_subscriber_unregister_callback(redisAsyncContext *c, void *r,
 }
 
 static ngx_int_t redis_subscriber_unregister(rdstore_channel_head_t *chanhead, subscriber_t *sub, uint8_t shutting_down) {
-  nchan_loc_conf_t  *cf = sub->cf;
-  rdstore_data_t    *rdata;
+  nchan_loc_conf_t  *cf = sub->cf;;
   
-  if((rdata = redis_cluster_rdata_from_channel(chanhead)) == NULL) {
-    return NGX_ERROR;
-  }
   if(!shutting_down) {
     subscriber_unregister_data_t d;
     d.channel_id = &chanhead->id;
     d.channel_timeout = cf->channel_timeout;
-    redis_subscriber_unregister_send(rdata, &d);
+    d.allocd = 0;
+    redis_subscriber_unregister_send(chanhead->redis.nodeset, &d);
   }
   else {
-    redis_sync_command(rdata, "EVALSHA %s 0 %b %i %i", redis_lua_scripts.subscriber_unregister.hash, STR(&chanhead->id), 0/*TODO: sub->id*/, cf->channel_timeout);
+    if(nodeset_ready(chanhead->redis.nodeset)) {
+      redis_node_t   *node = nodeset_node_find_by_chanhead(chanhead);
+      nchan_redis_sync_script(subscriber_unregister, node, &chanhead->id, "%i %i", 
+                              0/*TODO: sub->id*/,
+                              cf->channel_timeout
+                            );
+    }
   }
   return NGX_OK;
 }
@@ -1478,27 +1225,45 @@ static ngx_int_t redis_subscriber_unregister(rdstore_channel_head_t *chanhead, s
 
 static void redisChannelKeepaliveCallback(redisAsyncContext *c, void *vr, void *privdata);
 
-static void redisChannelKeepaliveCallback_send(rdstore_data_t *rdata, void *pd) {
+static ngx_int_t redisChannelKeepaliveCallback_send(redis_nodeset_t *ns, void *pd) {
   rdstore_channel_head_t   *head = pd;
-  if(rdata) {
+  time_t                    ttl;
+  //TODO: optimize this
+  redis_node_t *node = nodeset_node_find_by_channel_id(head->redis.nodeset, &head->id);
+  if(nodeset_ready(ns)) {
     head->reserved++;
-    redis_command(rdata, &redisChannelKeepaliveCallback, head, "EVALSHA %s 0 %b %i", redis_lua_scripts.channel_keepalive.hash, STR(&head->id), REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL);
+    ttl = REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_STEP * (1+head->keepalive_times_sent);
+    if(ttl > REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_MAX) { //1 week at most
+      ttl = REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_MAX;
+    }
+    nchan_redis_script(channel_keepalive, node, &redisChannelKeepaliveCallback, head, &head->id, "%i", ttl);
   }
+  return NGX_OK;
+}
+
+static ngx_int_t redisChannelKeepaliveCallback_retry_wrapper(redis_nodeset_t *ns, void *pd) {
+  rdstore_channel_head_t   *head = pd;
+  head->reserved--;
+  return redisChannelKeepaliveCallback_send(ns, pd);
 }
 
 static void redisChannelKeepaliveCallback(redisAsyncContext *c, void *vr, void *privdata) {
   rdstore_channel_head_t   *head = (rdstore_channel_head_t *)privdata;
   redisReply               *reply = (redisReply *)vr;
-  rdstore_data_t           *rdata = c->data;
+  redis_node_t             *node = c->data;
   
   head->reserved--;
-  rdata->pending_commands--;
+  node->pending_commands--;
   nchan_update_stub_status(redis_pending_commands, -1);
   
-  if(!clusterKeySlotOk(c, vr)) {
-    cluster_add_retry_command_with_chanhead(head, redisChannelKeepaliveCallback_send, head);
+  if(!nodeset_node_reply_keyslot_ok(node, reply)) {
+    head->reserved++;
+    nodeset_callback_on_ready(node->nodeset, 1000, redisChannelKeepaliveCallback_retry_wrapper, head);
     return;
   }
+  else {
+    head->keepalive_times_sent++;
+  }
   
   if(redisReplyOk(c, vr)) {
     assert(CHECK_REPLY_INT(reply));
@@ -1514,29 +1279,31 @@ static void redisChannelKeepaliveCallback(redisAsyncContext *c, void *vr, void *
 
 static void redis_channel_keepalive_timer_handler(ngx_event_t *ev) {
   rdstore_channel_head_t   *head = ev->data;
-  rdstore_data_t           *rdata;
   if(ev->timedout) {
     ev->timedout=0;
-    if((rdata = redis_cluster_rdata_from_channel(head)) != NULL) {
-      redisChannelKeepaliveCallback_send(rdata, head);
+    if(head->pubsub_status != REDIS_PUBSUB_SUBSCRIBED || head->status == NOTREADY) {
+      //no use trying to keepalive a not-ready (possibly disconnected) chanhead
+      DBG("Tried sending channel keepalive when channel is not ready");
+      ngx_add_timer(ev, REDIS_RECONNECT_TIME); //retry after reconnect timeout
+    }
+    else {
+      redisChannelKeepaliveCallback_send(head->redis.nodeset, head);
     }
   }
 }
 
-void redis_associate_chanhead_with_rdata(rdstore_channel_head_t *head, rdstore_data_t *rdata) {
-  head->rd_prev = NULL;
-  head->rd_next = rdata->channels_head;
-  if(rdata->channels_head) {
-    rdata->channels_head->rd_prev = head;
-  }
-  rdata->channels_head = head;
-}
-
-ngx_int_t ensure_chanhead_pubsub_subscribed(rdstore_channel_head_t *ch) {
-  rdstore_data_t     *rdata;
-  if(ch->pubsub_status != SUBBED && (rdata = redis_cluster_rdata_from_channel(ch)) != NULL) {
-    ch->pubsub_status = SUBBING;
-    redis_subscriber_command(rdata, redis_subscriber_callback, ch, "SUBSCRIBE {channel:%b}:pubsub", STR(&ch->id));
+ngx_int_t ensure_chanhead_pubsub_subscribed_if_needed(rdstore_channel_head_t *ch) {
+  redis_node_t       *pubsub_node;
+  ngx_str_t          *namespace;
+  if( ch->pubsub_status != REDIS_PUBSUB_SUBSCRIBED && ch->pubsub_status != REDIS_PUBSUB_SUBSCRIBING
+   && ch->redis.nodeset->settings.storage_mode >= REDIS_MODE_DISTRIBUTED
+   && nodeset_ready(ch->redis.nodeset)
+  ) {
+    pubsub_node = nodeset_node_pubsub_find_by_chanhead(ch);
+    namespace = ch->redis.nodeset->settings.namespace;
+    DBG("SUBSCRIBING to %V{channel:%V}:pubsub", namespace, &ch->id);
+    ch->pubsub_status = REDIS_PUBSUB_SUBSCRIBING;
+    redis_subscriber_command(pubsub_node, redis_subscriber_callback, NULL, "SUBSCRIBE %b{channel:%b}:pubsub", STR(namespace), STR(&ch->id));
   }
   return NGX_OK;
 }
@@ -1545,7 +1312,7 @@ ngx_int_t redis_chanhead_catch_up_after_reconnect(rdstore_channel_head_t *ch) {
   return spooler_catch_up(&ch->spooler);
 }
 
-static rdstore_channel_head_t *create_chanhead(ngx_str_t *channel_id, rdstore_data_t *rdata) {
+static rdstore_channel_head_t *create_chanhead(ngx_str_t *channel_id, redis_nodeset_t *ns) {
   rdstore_channel_head_t   *head;
   
   head=ngx_calloc(sizeof(*head) + sizeof(u_char)*(channel_id->len), ngx_cycle->log);
@@ -1560,7 +1327,7 @@ static rdstore_channel_head_t *create_chanhead(ngx_str_t *channel_id, rdstore_da
   head->fetching_message_count=0;
   head->redis_subscriber_privdata = NULL;
   head->status = NOTREADY;
-  head->pubsub_status = UNSUBBED;
+  head->pubsub_status = REDIS_PUBSUB_UNSUBSCRIBED;
   head->generation = 0;
   head->last_msgid.time=0;
   head->last_msgid.tag.fixed[0]=0;
@@ -1568,8 +1335,12 @@ static rdstore_channel_head_t *create_chanhead(ngx_str_t *channel_id, rdstore_da
   head->last_msgid.tagactive = 0;
   head->shutting_down = 0;
   head->reserved = 0;
+  head->keepalive_times_sent = 0;
   
-  head->in_gc_reaper = NULL;
+  head->gc.in_reaper = 0;
+  head->gc.time = 0;
+  head->gc.prev = NULL;
+  head->gc.next = NULL;
   
   if(head->id.len >= 5 && ngx_strncmp(head->id.data, "meta/", 5) == 0) {
     head->meta = 1;
@@ -1585,15 +1356,14 @@ static rdstore_channel_head_t *create_chanhead(ngx_str_t *channel_id, rdstore_da
     assert(ngx_strncmp(head->id.data, "m/", 2) != 0);
   }
   
-  head->rd_next = NULL;
-  head->rd_prev = NULL;
-  head->rdt = rdata;
-  if(rdata->node.cluster) {
-    head->cluster.enabled = 1;
-    redis_cluster_associate_chanhead_with_rdata(head);
-  }
-  else {
-    redis_associate_chanhead_with_rdata(head, rdata);
+  head->redis.nodeset = ns;
+  head->redis.generation = 0;
+  head->redis.node.cmd = NULL;
+  head->redis.node.pubsub = NULL;
+  ngx_memzero(&head->redis.slist, sizeof(head->redis.slist));
+  
+  if(head->redis.nodeset->settings.storage_mode == REDIS_MODE_BACKUP) {
+    head->status = READY;
   }
   
   head->spooler.running=0;
@@ -1602,19 +1372,18 @@ static rdstore_channel_head_t *create_chanhead(ngx_str_t *channel_id, rdstore_da
     head->spooler.publish_events = 0;
   }
   
-  DBG("SUBSCRIBING to {channel:%V}:pubsub", channel_id);
-  ensure_chanhead_pubsub_subscribed(head);
+  ensure_chanhead_pubsub_subscribed_if_needed(head);
   CHANNEL_HASH_ADD(head);
   
   return head;
 }
 
-static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, rdstore_data_t *rdata) {
+static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, redis_nodeset_t *nodeset) {
   rdstore_channel_head_t    *head;
   
-  CHANNEL_HASH_FIND(channel_id, head);
+  CHANNEL_HASH_FIND(channel_id, head); //BUG: this doesn't account for namespacing!!
   if(head==NULL) {
-    head = create_chanhead(channel_id, rdata);
+    head = create_chanhead(channel_id, nodeset);
   }
   if(head == NULL) {
     ERR("can't create chanhead for redis store");
@@ -1622,10 +1391,15 @@ static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id,
   }
   
   if (head->status == INACTIVE) { //recycled chanhead
-    ensure_chanhead_pubsub_subscribed(head);
+    ensure_chanhead_pubsub_subscribed_if_needed(head);
     redis_chanhead_gc_withdraw(head);
     
-    head->status = head->pubsub_status == SUBBED ? READY : NOTREADY;
+    if(head->redis.nodeset->settings.storage_mode == REDIS_MODE_BACKUP) {
+      head->status = READY;
+    }
+    else {
+      head->status = head->pubsub_status == REDIS_PUBSUB_SUBSCRIBED ? READY : NOTREADY;
+    }
   }
 
   if(!head->spooler.running) {
@@ -1636,58 +1410,34 @@ static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id,
   return head;
 }
 
-nchan_reaper_t *rdstore_get_chanhead_reaper(rdstore_channel_head_t *ch) {
-  if(ch->cluster.enabled) {
-    rdstore_data_t *rdata;
-    if((rdata = redis_cluster_rdata_from_channel(ch)) != NULL && rdata->status == CONNECTED) {
-      return &rdata->chanhead_reaper;
-    }
-    else {
-      return &ch->rdt->node.cluster->chanhead_reaper;
-    }
-  }
-  else {
-    return &ch->rdt->chanhead_reaper;
-  }
-}
-
-ngx_int_t redis_chanhead_gc_add_to_reaper(nchan_reaper_t *reaper, rdstore_channel_head_t *head, ngx_int_t expire, const char *reason) {
+ngx_int_t redis_chanhead_gc_add(rdstore_channel_head_t *head, ngx_int_t expire, const char *reason) {
   assert(head->sub_count == 0);
-    
-  if(head->in_gc_reaper && head->in_gc_reaper != reaper) {
-    redis_chanhead_gc_withdraw(head);
-  }
-    
-  if(!head->in_gc_reaper) {
+  nchan_reaper_t *reaper = &head->redis.nodeset->chanhead_reaper;
+  if(!head->gc.in_reaper) {
     assert(head->status != INACTIVE);
     head->status = INACTIVE;
-    head->gc_time = ngx_time() + (expire == 0 ? NCHAN_CHANHEAD_EXPIRE_SEC : expire);
-    head->in_gc_reaper = reaper;
+    head->gc.time = ngx_time() + (expire == 0 ? NCHAN_CHANHEAD_EXPIRE_SEC : expire);
+    head->gc.in_reaper = 1;
     
     nchan_reaper_add(reaper, head);
     
     DBG("gc_add chanhead %V to %s (%s)", &head->id, reaper->name, reason);
   }
   else {
-    assert(head->in_gc_reaper == reaper);
     ERR("gc_add chanhead %V to %s: already added (%s)", &head->id, reaper->name, reason);
   }
 
   return NGX_OK;
 }
 
-
-ngx_int_t redis_chanhead_gc_add(rdstore_channel_head_t *head, ngx_int_t expire, const char *reason) {
-  return redis_chanhead_gc_add_to_reaper(rdstore_get_chanhead_reaper(head), head, expire, reason);
-}
-
 ngx_int_t redis_chanhead_gc_withdraw(rdstore_channel_head_t *chanhead) {
-  if(chanhead->in_gc_reaper) {
-    DBG("gc_withdraw chanhead %s from %V", chanhead->in_gc_reaper->name, &chanhead->id);
+  if(chanhead->gc.in_reaper) {
+    nchan_reaper_t *reaper = &chanhead->redis.nodeset->chanhead_reaper;
+    DBG("gc_withdraw chanhead %s from %V", reaper->name, &chanhead->id);
     assert(chanhead->status == INACTIVE);
     
-    nchan_reaper_withdraw(chanhead->in_gc_reaper, chanhead);
-    chanhead->in_gc_reaper = NULL;
+    nchan_reaper_withdraw(reaper, chanhead);
+    chanhead->gc.in_reaper = 0;
   }
   else {
     DBG("gc_withdraw chanhead (%V), but not in gc reaper", &chanhead->id);
@@ -1695,12 +1445,14 @@ ngx_int_t redis_chanhead_gc_withdraw(rdstore_channel_head_t *chanhead) {
   return NGX_OK;
 }
 
-static ngx_int_t nchan_store_publish_generic(ngx_str_t *channel_id, rdstore_data_t *rdata, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line){
+static ngx_int_t nchan_store_publish_generic(ngx_str_t *channel_id, redis_nodeset_t *nodeset, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line){
   rdstore_channel_head_t   *head;
   ngx_int_t                 ret;
   //redis_channel_head_cleanup_t *hcln;
   
-  head = nchan_store_get_chanhead(channel_id, rdata);
+  
+  
+  head = nchan_store_get_chanhead(channel_id, nodeset);
   
   if(head->sub_count > 0) {
     if(msg) {
@@ -1723,39 +1475,39 @@ static ngx_int_t nchan_store_publish_generic(ngx_str_t *channel_id, rdstore_data
   return ret;
 }
 
+
 static ngx_int_t redis_array_to_channel(redisReply *r, nchan_channel_t *ch) {
-  if ( CHECK_REPLY_ARRAY_MIN_SIZE(r, 4)
+  ngx_str_t       msgid;
+  nchan_msg_id_t  zeroid = NCHAN_OLDEST_MSGID;
+  
+  if ( CHECK_REPLY_ARRAY_MIN_SIZE(r, 5)
     && CHECK_REPLY_INT(r->element[0])
     && CHECK_REPLY_INT(r->element[1])
-    && CHECK_REPLY_INT(r->element[2]) ) {
+    && CHECK_REPLY_INT(r->element[2])
+    && CHECK_REPLY_STR(r->element[3])
+    && CHECK_REPLY_INT(r->element[4])) {
     
     //channel info
     ch->expires = ngx_time() + r->element[0]->integer;
     ch->last_seen = r->element[1]->integer;
     ch->subscribers = r->element[2]->integer;
-    ch->messages = r->element[3]->integer;
+  
+    msgid.data = (u_char *)r->element[3]->str;
+    msgid.len = r->element[3]->len;
+      
+    if(msgid.len == 0) {
+      ch->last_published_msg_id = zeroid;
+    }
+    else if(nchan_parse_compound_msgid(&ch->last_published_msg_id, &msgid, 1) != NGX_OK) {
+      ERR("failed to parse last-msgid %V from redis", &msgid);
+    }
+  
+    ch->messages = r->element[4]->integer;
     
     //no id?..
     ch->id.len=0;
     ch->id.data=NULL;
     
-    //last message id
-    if( CHECK_REPLY_ARRAY_MIN_SIZE(r, 5)
-      && CHECK_REPLY_STR(r->element[4])) {
-      
-      ngx_str_t      msgid;
-      msgid.data = (u_char *)r->element[4]->str;
-      msgid.len = r->element[4]->len;
-      
-      if(msgid.len > 0 && nchan_parse_compound_msgid(&ch->last_published_msg_id, &msgid, 1) != NGX_OK) {
-        ERR("failed to parse last-msgid %V from redis", &msgid);
-      }
-      else {
-        nchan_msg_id_t  zeroid = NCHAN_OLDEST_MSGID;
-        ch->last_published_msg_id = zeroid;
-      }
-    }
-    
     //queued messages
     if( CHECK_REPLY_ARRAY_MIN_SIZE(r, 6)
       && CHECK_REPLY_INT(r->element[5])) {
@@ -1781,15 +1533,15 @@ typedef struct {
   void                *privdata;
 } redis_channel_callback_data_t;
 
-#define CREATE_CALLBACK_DATA(d, rdata, namestr, channel_id, callback, privdata) \
+#define CREATE_CALLBACK_DATA(d, nodeset, cf, namestr, channel_id, callback, privdata) \
   do {                                                                       \
-    if ((d = ngx_alloc(sizeof(*d) + ((rdata->node.cluster != NULL) ? (sizeof(*channel_id) + channel_id->len) : 0), ngx_cycle->log)) == NULL) { \
+    if ((d = ngx_alloc(sizeof(*d) + ((nodeset)->cluster.enabled ? (sizeof(*channel_id) + channel_id->len) : 0), ngx_cycle->log)) == NULL) { \
       ERR("Can't allocate redis %s channel callback data", namestr);         \
       return NGX_ERROR;                                                      \
     }                                                                        \
     d->t = ngx_current_msec;                                                 \
     d->name = namestr;                                                       \
-    if(rdata->node.cluster != NULL) {                                        \
+    if((nodeset)->cluster.enabled) {                                            \
       /* might need to use channel id later to retry the command */          \
       d->channel_id = (ngx_str_t *)&d[1];                                    \
       d->channel_id->data = (u_char *)&d->channel_id[1];                     \
@@ -1833,27 +1585,29 @@ static void redisChannelInfoCallback(redisAsyncContext *c, void *r, void *privda
 
 static void redisChannelDeleteCallback(redisAsyncContext *c, void *r, void *privdata);
 
-static void nchan_store_delete_channel_send(rdstore_data_t *rdata, void *pd) {
+static ngx_int_t nchan_store_delete_channel_send(redis_nodeset_t *ns, void *pd) {
   redis_channel_callback_data_t *d = pd;
-  if(rdata) {
-    redis_command(rdata, &redisChannelDeleteCallback, d, "EVALSHA %s 0 %b", redis_lua_scripts.delete.hash, STR(d->channel_id));
+  if(nodeset_ready(ns)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(ns, d->channel_id);
+    nchan_redis_script(delete, node, &redisChannelDeleteCallback, d, d->channel_id, "");
+    return NGX_OK;
   }
   else {
     redisChannelDeleteCallback(NULL, NULL, d);
+    return NGX_ERROR;
   }
 }
 
 static void redisChannelDeleteCallback(redisAsyncContext *ac, void *r, void *privdata) {
-  rdstore_data_t  *rdata;
+  redis_node_t  *node;
   
+  nchan_update_stub_status(redis_pending_commands, -1);
   if(ac) {
-    rdata = ac->data;
-    rdata->pending_commands--;
+    node = ac->data;
+    node->pending_commands--;
     
-    if(!clusterKeySlotOk(ac, r)) {
-      redis_channel_callback_data_t  *d = privdata;
-      
-      cluster_add_retry_command_with_channel_id(rdata->node.cluster, d->channel_id, nchan_store_delete_channel_send, privdata);
+    if(!nodeset_node_reply_keyslot_ok(node, (redisReply *)r)) {
+      nodeset_callback_on_ready(node->nodeset, 1000, nchan_store_delete_channel_send, privdata);
       return;
     }
   }
@@ -1863,45 +1617,39 @@ static void redisChannelDeleteCallback(redisAsyncContext *ac, void *r, void *pri
 
 static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
   redis_channel_callback_data_t *d;
-  rdstore_data_t                *rdata = cf->redis.privdata;
-  
-  CREATE_CALLBACK_DATA(d, rdata, "delete", channel_id, callback, privdata);
-  
-  if((rdata = redis_cluster_rdata_from_channel_id(rdata, channel_id)) == NULL) {
-    return NGX_ERROR;
-  }
-  
-  nchan_store_delete_channel_send(rdata, d);
-  
-  return NGX_OK;
+  redis_nodeset_t               *ns = nodeset_find(&cf->redis);
+  CREATE_CALLBACK_DATA(d, ns, cf, "delete", channel_id, callback, privdata);
+
+  return nchan_store_delete_channel_send(ns, d);
 }
 
 
 static void redisChannelFindCallback(redisAsyncContext *c, void *r, void *privdata);
 
-static void nchan_store_find_channel_send(rdstore_data_t *rdata, void *pd) {
+static ngx_int_t nchan_store_find_channel_send(redis_nodeset_t *ns, void *pd) {
   redis_channel_callback_data_t *d = pd;
-  if(rdata) {
-    redis_command(rdata, &redisChannelFindCallback, d, "EVALSHA %s 0 %b", redis_lua_scripts.find_channel.hash, STR(d->channel_id));
+  if(nodeset_ready(ns)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(ns, d->channel_id);
+    nchan_redis_script(find_channel, node, &redisChannelFindCallback, d, d->channel_id, "");
   }
   else {
     redisChannelFindCallback(NULL, NULL, d);
   }
+  return NGX_OK;
 }
 
 static void redisChannelFindCallback(redisAsyncContext *ac, void *r, void *privdata) {
-  rdstore_data_t                 *rdata = NULL;
+  redis_node_t                 *node = NULL;
   
   if(ac) {
-    rdata = ac->data;
-    rdata->pending_commands--;
+    node = ac->data;
+    node->pending_commands--;
     nchan_update_stub_status(redis_pending_commands, -1);
-  }
-  
-  if(ac && !clusterKeySlotOk(ac, r)) {
-    redis_channel_callback_data_t  *d = privdata;
-    cluster_add_retry_command_with_channel_id(rdata->node.cluster, d->channel_id, nchan_store_find_channel_send, privdata);
-    return;
+    
+    if(!nodeset_node_reply_keyslot_ok(node, (redisReply *)r)) {
+      nodeset_callback_on_ready(node->nodeset, 1000, nchan_store_find_channel_send, privdata);
+      return;
+    }
   }
   
   redisChannelInfoCallback(ac, r, privdata);
@@ -1910,29 +1658,22 @@ static void redisChannelFindCallback(redisAsyncContext *ac, void *r, void *privd
 
 static ngx_int_t nchan_store_find_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
   redis_channel_callback_data_t *d;
-  rdstore_data_t                *rdata = cf->redis.privdata;
-  CREATE_CALLBACK_DATA(d, rdata, "find_channel", channel_id, callback, privdata);
+  redis_nodeset_t               *ns = nodeset_find(&cf->redis);
+  CREATE_CALLBACK_DATA(d, ns, cf, "find_channel", channel_id, callback, privdata);
   
-  if((rdata = redis_cluster_rdata_from_channel_id(rdata, channel_id)) == NULL) {
-    return NGX_ERROR;
-  }
-  nchan_store_find_channel_send(rdata, d);
+  nchan_store_find_channel_send(ns, d);
   
   return NGX_OK;
 }
 
-typedef struct {
-  nchan_msg_t   msg;
-  ngx_buf_t     buf;
-} getmessage_blob_t;
-
-static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, ngx_buf_t *buf, redisReply *r, uint16_t offset) {
+static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, nchan_compressed_msg_t *cmsg, ngx_str_t *content_type, ngx_str_t *eventsource_event, redisReply *r, uint16_t offset) {
   
   redisReply         **els = r->element;
   size_t               content_type_len = 0, es_event_len = 0;
-  ngx_int_t            time_int, ttl;
+  ngx_int_t            time_int = 0, ttl;
+  ngx_int_t            compression;
   
-  if(CHECK_REPLY_ARRAY_MIN_SIZE(r, offset + 7)
+  if(CHECK_REPLY_ARRAY_MIN_SIZE(r, offset + 8)
    && CHECK_REPLY_INT(els[offset])            //msg TTL
    && CHECK_REPLY_INT_OR_STR(els[offset+1])   //id - time
    && CHECK_REPLY_INT_OR_STR(els[offset+2])   //id - tag
@@ -1940,43 +1681,62 @@ static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, ngx_buf_t *b
    && CHECK_REPLY_INT_OR_STR(els[offset+4])   //prev_id - tag
    && CHECK_REPLY_STR(els[offset+5])   //message
    && CHECK_REPLY_STR(els[offset+6])   //content-type
-   && CHECK_REPLY_STR(els[offset+7])){ //eventsource event
-     
+   && CHECK_REPLY_STR(els[offset+7])  //eventsource event
+  ) {
+  
     content_type_len=els[offset+6]->len;
     es_event_len = els[offset+7]->len;
     
     ngx_memzero(msg, sizeof(*msg));
-    ngx_memzero(buf, sizeof(*buf));
-    //set up message buffer;
-    msg->buf = buf;
     
-    buf->start = buf->pos = (u_char *)els[offset+5]->str;
-    buf->end = buf->last = buf->start + els[offset+5]->len;
-    buf->memory = 1;
-    buf->last_buf = 1;
-    buf->last_in_chain = 1;
+    msg->buf.start = msg->buf.pos = (u_char *)els[offset+5]->str;
+    msg->buf.end = msg->buf.last = msg->buf.start + els[offset+5]->len;
+    msg->buf.memory = 1;
+    msg->buf.last_buf = 1;
+    msg->buf.last_in_chain = 1;
     
-    if(redisReply_to_int(els[offset], &ttl) != NGX_OK) {
-      ERR("invalid ttl integer value is msg response from redis");
+    if(redisReply_to_ngx_int(els[offset], &ttl) != NGX_OK) {
+      ERR("invalid ttl integer value in msg response from redis");
       return NGX_ERROR;
     }
     assert(ttl >= 0);
     if(ttl == 0)
       ttl++; // less than a second left for this message... give it a second's lease on life
-
+    
     msg->expires = ngx_time() + ttl;
     
+    msg->compressed = NULL;
+    if(r->elements >= (uint16_t )(offset + 8)) {
+      if(!CHECK_REPLY_INT_OR_STR(els[offset+8]) || redisReply_to_ngx_int(els[offset+8], &compression) != NGX_OK) {
+        ERR("invalid compression type integer value in msg response from redis");
+        return NGX_ERROR;
+      }
+      if((nchan_msg_compression_type_t )compression != NCHAN_MSG_COMPRESSION_INVALID && (nchan_msg_compression_type_t )compression != NCHAN_MSG_NO_COMPRESSION) {
+        msg->compressed = cmsg;
+        ngx_memzero(&cmsg->buf, sizeof(cmsg->buf));
+        cmsg->compression = (nchan_msg_compression_type_t )compression;
+      }
+    }
+    
     if(content_type_len > 0) {
-      msg->content_type.len=content_type_len;
-      msg->content_type.data=(u_char *)els[offset+6]->str;
+      msg->content_type = content_type;
+      msg->content_type->len=content_type_len;
+      msg->content_type->data=(u_char *)els[offset+6]->str;
+    }
+    else {
+      msg->content_type = NULL;
     }
     
     if(es_event_len > 0) {
-      msg->eventsource_event.len=es_event_len;
-      msg->eventsource_event.data=(u_char *)els[offset+7]->str;
+      msg->eventsource_event = eventsource_event;
+      msg->eventsource_event->len=es_event_len;
+      msg->eventsource_event->data=(u_char *)els[offset+7]->str;
+    }
+    else {
+      msg->eventsource_event = NULL;
     }
     
-    if(redisReply_to_int(els[offset+1], &time_int) == NGX_OK) {
+    if(redisReply_to_ngx_int(els[offset+1], &time_int) == NGX_OK) {
       msg->id.time = time_int;
     }
     else {
@@ -1984,13 +1744,13 @@ static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, ngx_buf_t *b
       ERR("invalid msg time from redis");
     }
     
-    redisReply_to_int(els[offset+2], (ngx_int_t *)&msg->id.tag.fixed[0]); // tag is a uint, meh.
+    redisReply_to_ngx_int(els[offset+2], (ngx_int_t *)&msg->id.tag.fixed[0]); // tag is a uint, meh.
     msg->id.tagcount = 1;
     msg->id.tagactive = 0;
     
-    redisReply_to_int(els[offset+3], &time_int);
+    redisReply_to_ngx_int(els[offset+3], &time_int);
     msg->prev_id.time = time_int;
-    redisReply_to_int(els[offset+4], (ngx_int_t *)&msg->prev_id.tag.fixed[0]);
+    redisReply_to_ngx_int(els[offset+4], (ngx_int_t *)&msg->prev_id.tag.fixed[0]);
     msg->prev_id.tagcount = 1;
     msg->prev_id.tagactive = 0;
     
@@ -2013,74 +1773,88 @@ typedef struct {
 
 static void redis_get_message_callback(redisAsyncContext *c, void *r, void *privdata);
 
-static void nchan_store_async_get_message_send(rdstore_data_t *rdata, void *pd) {
+static ngx_int_t nchan_store_async_get_message_send(redis_nodeset_t *ns, void *pd) {
   redis_get_message_data_t           *d = pd;
-  //input:  keys: [], values: [channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl, subscriber_channel]
-  //subscriber channel is not given, because we don't care to subscribe
-  if(rdata) {
-    redis_command(rdata, &redis_get_message_callback, d, "EVALSHA %s 0 %b %i %i %s", redis_lua_scripts.get_message.hash, STR(d->channel_id), d->msg_id.time, d->msg_id.tag, "FILO", 0);
+  //input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
+  //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
+  if(nodeset_ready(ns)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(ns, d->channel_id);
+    nchan_redis_script(get_message, node, &redis_get_message_callback, d, d->channel_id, "%i %i FILO 0", 
+                       d->msg_id.time, 
+                       d->msg_id.tag
+                      );
   }
   else {
     //TODO: pass on a get_msg error status maybe?
     ngx_free(d);
   }
+  return NGX_OK;
 }
 
-static void redis_get_message_callback(redisAsyncContext *c, void *r, void *privdata) {
+static void redis_get_message_callback(redisAsyncContext *ac, void *r, void *privdata) {
   redisReply                *reply= r;
   redis_get_message_data_t  *d= (redis_get_message_data_t *)privdata;
   nchan_msg_t                msg;
-  ngx_buf_t                  msgbuf;
-  rdstore_data_t            *rdata = c->data;
-  
-  rdata->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  if(!clusterKeySlotOk(c, r)) {
-    cluster_add_retry_command_with_channel_id(rdata->node.cluster, d->channel_id, nchan_store_async_get_message_send, d);
-    return;
-  }
-  
+  nchan_compressed_msg_t     cmsg;
+  ngx_str_t                  content_type;
+  ngx_str_t                  eventsource_event;
+  redis_node_t              *node;
+
   if(d == NULL) {
     ERR("redis_get_mesage_callback has NULL userdata");
     return;
   }
   
-  log_redis_reply(d->name, d->t);
+  if(ac) {
+    node = ac->data;
+    
+    node->pending_commands--;
+    nchan_update_stub_status(redis_pending_commands, -1);
+    
+    if(!nodeset_ready(node->nodeset) || !nodeset_node_reply_keyslot_ok(node, reply)) {
+      nodeset_callback_on_ready(node->nodeset, 1000, nchan_store_async_get_message_send, privdata);
+      return;
+    }
   
-  //output: result_code, msg_time, msg_tag, message, content_type,  channel-subscriber-count
-  // result_code can be: 200 - ok, 403 - channel not found, 404 - not found, 410 - gone, 418 - not yet available
+    log_redis_reply(d->name, d->t);
   
-  if (!redisReplyOk(c, r) || !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 1) || !CHECK_REPLY_INT(reply->element[0]) ) {
-    //no good
-    ngx_free(d);
-    return;
+    //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count
+    // result_code can be: 200 - ok, 403 - channel not found, 404 - not found, 410 - gone, 418 - not yet available
+  
+    if (!redisReplyOk(ac, r) || !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 1) || !CHECK_REPLY_INT(reply->element[0]) ) {
+      //no good
+      ngx_free(d);
+      return;
+    }
+  
+    switch(reply->element[0]->integer) {
+      case 200: //ok
+        if(msg_from_redis_get_message_reply(&msg, &cmsg, &content_type, &eventsource_event, reply, 1) == NGX_OK) {
+          d->callback(MSG_FOUND, &msg, d->privdata);
+        }
+        break;
+      case 403: //channel not found
+      case 404: //not found
+        d->callback(MSG_NOTFOUND, NULL, d->privdata);
+        break;
+      case 410: //gone
+        d->callback(MSG_EXPIRED, NULL, d->privdata);
+        break;
+      case 418: //not yet available
+        d->callback(MSG_EXPECTED, NULL, d->privdata);
+        break;
+    }
   }
-  
-  switch(reply->element[0]->integer) {
-    case 200: //ok
-      if(msg_from_redis_get_message_reply(&msg, &msgbuf, reply, 1) == NGX_OK) {
-        d->callback(MSG_FOUND, &msg, d->privdata);
-      }
-      break;
-    case 403: //channel not found
-    case 404: //not found
-      d->callback(MSG_NOTFOUND, NULL, d->privdata);
-      break;
-    case 410: //gone
-      d->callback(MSG_EXPIRED, NULL, d->privdata);
-      break;
-    case 418: //not yet available
-      d->callback(MSG_EXPECTED, NULL, d->privdata);
-      break;
+  else {
+    ERR("redisAsyncContext NULL for redis_get_message_callback");
   }
   
   ngx_free(d);
 }
 
 static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  redis_get_message_data_t           *d;
-  rdstore_data_t                     *rdata = cf->redis.privdata;
+  redis_get_message_data_t      *d;
+  redis_nodeset_t               *ns = nodeset_find(&cf->redis);
   if(callback==NULL) {
     ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "no callback given for async get_message. someone's using the API wrong!");
     return NGX_ERROR;
@@ -2088,41 +1862,36 @@ static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_
   
   assert(msg_id->tagcount == 1);
   
-  CREATE_CALLBACK_DATA(d, rdata, "get_message", channel_id, callback, privdata);
+  CREATE_CALLBACK_DATA(d, ns, cf, "get_message", channel_id, callback, privdata);
   d->msg_id.time = msg_id->time;
   d->msg_id.tag = msg_id->tag.fixed[0];
   
-  if((rdata = redis_cluster_rdata_from_channel_id(rdata, channel_id)) == NULL) {
-    return NGX_ERROR;
-  }
-  nchan_store_async_get_message_send(rdata, d);
+  nchan_store_async_get_message_send(ns, d);
   return NGX_OK; //async only now!
 }
 
 
 typedef struct nchan_redis_conf_ll_s nchan_redis_conf_ll_t;
 struct nchan_redis_conf_ll_s {
-  nchan_redis_conf_t     *cf;
-  nchan_loc_conf_t       *loc_conf;
+  nchan_loc_conf_t       *lcf;
   nchan_redis_conf_ll_t  *next;
 };
 
 nchan_redis_conf_ll_t   *redis_conf_head;
 
-ngx_int_t nchan_store_redis_add_server_conf(ngx_conf_t *cf, nchan_redis_conf_t *rcf, nchan_loc_conf_t *loc_conf) {
+ngx_int_t nchan_store_redis_add_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf) {
   nchan_redis_conf_ll_t  *rcf_ll = ngx_palloc(cf->pool, sizeof(*rcf_ll));
-  rcf_ll->cf = rcf;
-  rcf_ll->loc_conf = loc_conf;
+  rcf_ll->lcf = loc_conf;
   rcf_ll->next = redis_conf_head;
   redis_conf_head = rcf_ll;
   return NGX_OK;
 }
 
-ngx_int_t nchan_store_redis_remove_server_conf(ngx_conf_t *cf, nchan_redis_conf_t *rcf) {
+ngx_int_t nchan_store_redis_remove_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf) {
   nchan_redis_conf_ll_t  *cur, *prev;
   
   for(cur = redis_conf_head, prev = NULL; cur != NULL; prev = cur, cur = cur->next) {
-    if(cur->cf == rcf) { //found it
+    if(cur->lcf == loc_conf) { //found it
       if(prev == NULL) {
         redis_conf_head = cur->next;
       }
@@ -2144,42 +1913,12 @@ static ngx_int_t nchan_store_init_module(ngx_cycle_t *cycle) {
 }
 
 
-//rbtree for all redis connections
-static void *redis_data_rbtree_node_id(void *data) {
-  return &((rdstore_data_t *)data)->connect_params;
-}
-static uint32_t redis_data_rbtree_bucketer(void *vid) {
-  redis_connect_params_t   *id = (redis_connect_params_t *)vid;
-  return (uint32_t )id->port;
-}
-static ngx_int_t redis_data_rbtree_compare(void *v1, void *v2) {
-  redis_connect_params_t   *id1 = (redis_connect_params_t *)v1;
-  redis_connect_params_t   *id2 = (redis_connect_params_t *)v2;
-  
-  if(id1->port > id2->port)
-    return 1;
-  else if (id1->port < id2->port)
-    return -1;
-  
-  if(id1->db > id2->db)
-    return 1;
-  else if (id1->db < id2->db)
-    return -1;
-  
-  if(id1->host.len > id2->host.len)
-    return 1;
-  else if(id1->host.len < id2->host.len)
-    return -1;
-  
-  return ngx_strncmp(id1->host.data, id2->host.data, id1->host.len);
-}
-
 ngx_int_t rdstore_initialize_chanhead_reaper(nchan_reaper_t *reaper, char *name) {
   
   nchan_reaper_start(reaper, 
               name, 
-              offsetof(rdstore_channel_head_t, gc_prev), 
-              offsetof(rdstore_channel_head_t, gc_next), 
+              offsetof(rdstore_channel_head_t, gc.prev), 
+              offsetof(rdstore_channel_head_t, gc.next), 
   (ngx_int_t (*)(void *, uint8_t)) nchan_redis_chanhead_ready_to_reap,
   (void (*)(void *)) redis_store_reap_chanhead,
               4
@@ -2188,183 +1927,48 @@ ngx_int_t rdstore_initialize_chanhead_reaper(nchan_reaper_t *reaper, char *name)
   return NGX_OK;
 }
 
-static void redis_stall_timer_handler(ngx_event_t *ev) {
-  /*rdstore_data_t  *rdata = ev->data;
+static ngx_int_t nchan_store_init_redis_loc_conf_postconfig(nchan_loc_conf_t *lcf) {
+  nchan_redis_conf_t    *rcf = &lcf->redis;
   
+  assert(rcf->enabled);
   
-  if(!ev->timedout || ngx_exiting || ngx_quit || rdata->shutting_down)
-    return;
-  //ERR("redis_stall_timer_handler PRE  ctr: %d ctr_while_checking: %d, chk: %i", rdata->stall_counter, rdata->stall_counter_while_checking, rdata->stall_count_check);
-  ev->timedout = 0;
-  if(rdata->status != CONNECTED) {
-   return;
+  //server-scope loc_conf may have some undefined values (because it was never merged with a prev)
+  //thus we must reduntantly check for unser values
+  if(rcf->ping_interval == NGX_CONF_UNSET) {
+    rcf->ping_interval = NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME;
   }
-  if( 0 ) { //stalled
-    if(rdata->stall_counter > 0) {
-      //yep, it stalled
-      if(rdata->ctx) {
-        redisAsyncFree(rdata->ctx);
-        rdata->ctx = NULL;
-      }
-      if(rdata->sub_ctx) {
-        redisAsyncFree(rdata->sub_ctx);
-        rdata->sub_ctx = NULL;
-      }
-      if(rdata->sync_ctx) {
-        redisFree(rdata->sync_ctx);
-        rdata->sync_ctx = NULL;
-      }
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "Detected stalled connection to Redis server %V.", rdata->connect_url);
-      rdt_set_status(rdata, DISCONNECTED, NULL);
-      //ERR("redis_stall_timer_handler DSCN ctr: %d ctr_while_checking: %d, chk: %i", rdata->stall_counter, rdata->stall_counter_while_checking, rdata->stall_count_check);
-      return;
-    }
-    else {
-      //ERR("all good");
-    }
+  if(rcf->storage_mode == REDIS_MODE_CONF_UNSET) {
+    rcf->storage_mode = REDIS_MODE_DISTRIBUTED;
   }
-  else if(rdata->stall_counter != 0) {
-    //ERR("will check");
-    rdata->stall_count_check = 1;
+  if(rcf->nostore_fastpublish == NGX_CONF_UNSET) {
+    rcf->nostore_fastpublish = 0;
   }
-  //ERR("redis_stall_timer_handler POST ctr: %d ctr_while_checking: %d, chk: %i", rdata->stall_counter, rdata->stall_counter_while_checking, rdata->stall_count_check);
-  if(REDIS_STALL_CHECK_TIME > 0) {
-    ngx_add_timer(ev, REDIS_STALL_CHECK_TIME);
-  }
-  */
-}
-
-rdstore_data_t *redis_create_rdata(ngx_str_t *url, redis_connect_params_t *rcp, nchan_redis_conf_t *rcf, nchan_loc_conf_t *lcf) {
-  ngx_rbtree_node_t     *node;
-  rdstore_data_t        *rdata;
-  size_t                 reaper_name_len;
-  char                  *reaper_name;
-  
-  reaper_name_len = strlen("redis chanhead ()  ") + url->len;
-  
-  if((node = rbtree_create_node(&redis_data_tree, sizeof(*rdata) + reaper_name_len)) == NULL) {
-    ERR("can't create rbtree node for redis connection");
-    return NULL;
-  }
-  
-  rdata = (rdstore_data_t *)rbtree_data_from_node(node);
-  ngx_memzero(rdata, sizeof(*rdata));
-  rdata->connect_params = *rcp;
-  rdata->status = DISCONNECTED;
-  rdata->generation = 0;
-  rdata->shutting_down = 0;
-  rdata->lcf = lcf;
-  nchan_init_timer(&rdata->reconnect_timer, redis_reconnect_timer_handler, rdata);
-  nchan_init_timer(&rdata->ping_timer, redis_ping_timer_handler, rdata);
-
-  rdata->pending_commands = 0;  
-  nchan_init_timer(&rdata->stall_timer, redis_stall_timer_handler, rdata);
-  
-  rdata->channels_head = NULL;
-  rdata->almost_deleted_channels_head = NULL;
-  
-  reaper_name = (char *)&rdata[1];
-  ngx_sprintf((u_char *)reaper_name, "redis chanhead (%V)%Z", url);
-  rdstore_initialize_chanhead_reaper(&rdata->chanhead_reaper, reaper_name);
-  
-  rdata->ping_interval = rcf->ping_interval;
-  rdata->connect_url = url;
-  
-  if(rbtree_insert_node(&redis_data_tree, node) != NGX_OK) {
-    ERR("couldn't insert redis date node");
-    rbtree_destroy_node(&redis_data_tree, node);
-    return NULL;
-  }
-  
-  return rdata;
-}
-
-rdstore_data_t *find_rdata_by_url(ngx_str_t *url) {
-  redis_connect_params_t rcp;
-  parse_redis_url(url, &rcp);
-  return find_rdata_by_connect_params(&rcp);
-}
-
-rdstore_data_t *find_rdata_by_connect_params(redis_connect_params_t *rcp) {
-  rdstore_data_t        *rdata;
-  ngx_rbtree_node_t     *node;
-  if((node = rbtree_find_node(&redis_data_tree, rcp)) == NULL) {
-    return NULL;
-  }
-  rdata = (rdstore_data_t *)rbtree_data_from_node(node);
-  return rdata;
-}
-
-ngx_int_t redis_add_connection_data(nchan_redis_conf_t *rcf, nchan_loc_conf_t *lcf, ngx_str_t *override_url) {
-  rdstore_data_t          *rdata;
-  redis_connect_params_t   rcp;
-  static ngx_str_t         default_redis_url = ngx_string(NCHAN_REDIS_DEFAULT_URL);
-  ngx_str_t               *url;
-  
-  if(rcf->url.len == 0) {
-    rcf->url = default_redis_url;
-  }
-  url = override_url ? override_url : &rcf->url;
-  
-  if(url->len == 0) {
-    url = &default_redis_url;
-  }
-  
-  parse_redis_url(url, &rcp);
-  
-  if((rdata = find_rdata_by_connect_params(&rcp)) == NULL) {
-    rdata = redis_create_rdata(url, &rcp, rcf, lcf);
-  }
-  else {
-    if(rcf->ping_interval > 0 && rcf->ping_interval < rdata->ping_interval) {
-      //shorter ping interval wins
-      rdata->ping_interval = rcf->ping_interval;
-    }
-  }
-  
-  rcf->privdata = rdata;
   
   return NGX_OK;
 }
 
 static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
-  nchan_redis_conf_t    *rcf;
+  nchan_loc_conf_t      *lcf;
   nchan_redis_conf_ll_t *cur;
   nchan_main_conf_t     *mcf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
+  redis_nodeset_t       *nodeset;
   
   if(mcf->redis_publish_message_msgkey_size == NGX_CONF_UNSET_SIZE) {
     mcf->redis_publish_message_msgkey_size = NCHAN_REDIS_DEFAULT_PUBSUB_MESSAGE_MSGKEY_SIZE;
   }
   redis_publish_message_msgkey_size = mcf->redis_publish_message_msgkey_size;
   
-  rbtree_init(&redis_data_tree, "redis connection data", redis_data_rbtree_node_id, redis_data_rbtree_bucketer, redis_data_rbtree_compare);
-  
-  redis_cluster_init_postconfig(cf);
-  
   for(cur = redis_conf_head; cur != NULL; cur = cur->next) {
-    rcf = cur->cf;
-    if(!rcf->enabled) {
-      ERR("there's a non-enabled redis_conf_t here");
-      continue;
-    }
+    lcf = cur->lcf;
+    nchan_store_init_redis_loc_conf_postconfig(lcf);
     
-    if(rcf->upstream) {
-      ngx_uint_t                   i;
-      ngx_array_t                 *servers = rcf->upstream->servers;
-      ngx_http_upstream_server_t  *usrv = servers->elts;
-      ngx_str_t                   *upstream_url;
-      
-      for(i=0; i < servers->nelts; i++) {
-#if nginx_version >= 1007002
-        upstream_url = &usrv[i].name;
-#else
-        upstream_url = &usrv[i].addrs->name;
-#endif
-        redis_add_connection_data(rcf, cur->loc_conf, upstream_url);
-      }
+    if((nodeset = nodeset_find(&lcf->redis)) == NULL) {
+      nodeset = nodeset_create(lcf);
+      rdstore_initialize_chanhead_reaper(&nodeset->chanhead_reaper, "Redis channel reaper");
     }
-    else {
-      redis_add_connection_data(rcf, cur->loc_conf, NULL);
+    if(!nodeset) {
+      ERR("Unable to create Redis nodeset.");
+      continue;
     }
   }
   
@@ -2376,6 +1980,7 @@ static void nchan_store_create_main_conf(ngx_conf_t *cf, nchan_main_conf_t *mcf)
   
   //reset redis_conf_head for reloads
   redis_conf_head = NULL;
+  nodeset_destroy_all(); //reset all nodesets before loading config
 }
 
 void redis_store_prepare_to_exit_worker() {
@@ -2385,86 +1990,51 @@ void redis_store_prepare_to_exit_worker() {
   }
 }
 
-static ngx_int_t redis_data_tree_exiter_stage1(rbtree_seed_t *seed, rdstore_data_t *rdata, void *pd) {
-  rdata->shutting_down = 1;
-  
-  callback_chain_t     *ccur, *cnext;  
-  for(ccur = rdata->on_connected; ccur != NULL; ccur = cnext) {
-    cnext = ccur->next;
-    ngx_free(ccur);
-  }
-  rdata->on_connected = NULL;
-
-  return NGX_OK;
+void nodeset_exiter_stage1(redis_nodeset_t *ns, void *pd) {
+  nodeset_abort_on_ready_callbacks(ns);
+}
+void nodeset_exiter_stage2(redis_nodeset_t *ns, void *pd) {
+  unsigned *chanheads = pd;
+  *chanheads += ns->chanhead_reaper.count;
+  nchan_reaper_stop(&ns->chanhead_reaper);
 }
 
-static ngx_int_t redis_data_tree_exiter_stage2(rbtree_seed_t *seed, rdstore_data_t *rdata, unsigned *chanheads) {
-  
-  *chanheads += rdata->chanhead_reaper.count;
-  
-  nchan_reaper_stop(&rdata->chanhead_reaper);
-  
-  if(rdata->ctx)
-    redis_nginx_force_close_context(&rdata->ctx);
-  if(rdata->sub_ctx)
-    redis_nginx_force_close_context(&rdata->sub_ctx);
-  if(rdata->sync_ctx) {
-    redisFree(rdata->sync_ctx);
-    rdata->sync_ctx = NULL;
-  }
-
-  return NGX_OK;
-}
-
-static ngx_int_t redis_data_tree_exiter_stage3(rbtree_seed_t *seed, rdstore_data_t *rdata, unsigned *chanheads) {
-  
-  DBG("exiting3 rdata %p %V", rdata, rdata->connect_url);
-  
-  if(rdata->ctx)
-    redis_nginx_force_close_context(&rdata->ctx);
-  if(rdata->sub_ctx)
-    redis_nginx_force_close_context(&rdata->sub_ctx);
-  if(rdata->sync_ctx) {
-    redisFree(rdata->sync_ctx);
-    rdata->sync_ctx = NULL;
-  }
-  if(rdata->ping_timer.timer_set) {
-    ngx_del_timer(&rdata->ping_timer);
-  }
-  if(rdata->stall_timer.timer_set) {
-    ngx_del_timer(&rdata->stall_timer);
-  }
-  if(rdata->reconnect_timer.timer_set) {
-    ngx_del_timer(&rdata->reconnect_timer);
-  }
-
-  return NGX_OK;
+void nodeset_exiter_stage3(redis_nodeset_t *ns, void *pd) {
+  nodeset_disconnect(ns);
 }
 
 static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
   rdstore_channel_head_t     *cur, *tmp;
   unsigned                    chanheads = 0;
   DBG("redis exit worker");
-  rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage1, NULL);
+  
+  //old
+  //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage1, NULL);
+  
+  nodeset_each(nodeset_exiter_stage1, NULL);
   
   HASH_ITER(hh, chanhead_hash, cur, tmp) {
     cur->shutting_down = 1;
-    if(!cur->in_gc_reaper) {
+    if(!cur->gc.in_reaper) {
       cur->spooler.fn->broadcast_status(&cur->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
       redis_chanhead_gc_add(cur, 0, "exit worker");
     }
   }
   
-  rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage2, &chanheads);
+  nodeset_each(nodeset_exiter_stage2, &chanheads);
+  
+  //OLD
+  //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage2, &chanheads);
+  nodeset_destroy_all();
+  
+  //OLD
+  //rbtree_empty(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage3, NULL);
   
-  rbtree_empty(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage3, NULL);
   nchan_exit_notice_about_remaining_things("redis channel", "", chanheads);
-  
-  redis_cluster_exit_worker(cycle);
 }
 
 static void nchan_store_exit_master(ngx_cycle_t *cycle) {
-  rbtree_empty(&redis_data_tree, NULL, NULL);
+  nodeset_destroy_all();
 }
 
 typedef struct {
@@ -2480,7 +2050,7 @@ static ngx_int_t subscribe_existing_channel_callback(ngx_int_t status, void *ch,
   redis_subscribe_data_t       *data = (redis_subscribe_data_t *)d;
   
   if(channel == NULL) {
-    data->sub->fn->respond_status(data->sub, NGX_HTTP_FORBIDDEN, NULL);
+    data->sub->fn->respond_status(data->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
     data->sub->fn->release(data->sub, 0);
   }
   else {
@@ -2525,46 +2095,17 @@ static ngx_int_t nchan_store_subscribe_continued(redis_subscribe_data_t *d) {
   //nchan_loc_conf_t           *cf = d->sub->cf;
   rdstore_channel_head_t       *ch;
   //ngx_int_t                   create_channel_ttl = cf->subscribe_only_existing_channel==1 ? 0 : cf->channel_timeout;
-  rdstore_data_t               *rdata = d->sub->cf->redis.privdata;
+  assert(d->sub->cf->redis.enabled);
+  redis_nodeset_t              *nodeset = nodeset_find(&d->sub->cf->redis);
+  ngx_int_t                     rc;
   
-  ch = nchan_store_get_chanhead(d->channel_id, rdata);
+  ch = nchan_store_get_chanhead(d->channel_id, nodeset);
   
   assert(ch != NULL);
   
-  ch->spooler.fn->add(&ch->spooler, d->sub);
+  rc = ch->spooler.fn->add(&ch->spooler, d->sub);
   //redisAsyncCommand(rds_ctx(), &redis_getmessage_callback, (void *)d, "EVALSHA %s 0 %b %i %i %s %i", redis_lua_scripts.get_message.hash, STR(d->channel_id), d->msg_id->time, d->msg_id->tag[0], "FILO", create_channel_ttl);
-  return NGX_OK;
-}
-
-static ngx_str_t * nchan_store_etag_from_message(nchan_msg_t *msg, ngx_pool_t *pool){
-  ngx_str_t       *etag = NULL;
-  if(pool!=NULL && (etag = ngx_palloc(pool, sizeof(*etag) + NGX_INT_T_LEN))==NULL) {
-    nchan_log_error("unable to allocate memory for Etag header in pool");
-    return NULL;
-  }
-  else if(pool==NULL && (etag = ngx_alloc(sizeof(*etag) + NGX_INT_T_LEN, ngx_cycle->log))==NULL) {
-    nchan_log_error("unable to allocate memory for Etag header");
-    return NULL;
-  }
-  etag->data = (u_char *)(etag+1);
-  etag->len = ngx_sprintf(etag->data,"%i", msg->id.tag.fixed[0])- etag->data;
-  return etag;
-}
-
-static ngx_str_t * nchan_store_content_type_from_message(nchan_msg_t *msg, ngx_pool_t *pool){
-  ngx_str_t        *content_type = NULL;
-  if(pool != NULL && (content_type = ngx_palloc(pool, sizeof(*content_type) + msg->content_type.len))==NULL) {
-    nchan_log_error("unable to allocate memory for Content Type header in pool");
-    return NULL;
-  }
-  else if(pool == NULL && (content_type = ngx_alloc(sizeof(*content_type) + msg->content_type.len, ngx_cycle->log))==NULL) {
-    nchan_log_error("unable to allocate memory for Content Type header");
-    return NULL;
-  }
-  content_type->data = (u_char *)(content_type+1);
-  content_type->len = msg->content_type.len;
-  ngx_memcpy(content_type->data, msg->content_type.data, content_type->len);
-  return content_type;
+  return rc;
 }
 
 typedef struct {
@@ -2576,95 +2117,252 @@ typedef struct {
   unsigned              shared_msg:1;
   time_t                message_timeout;
   ngx_int_t             max_messages;
+  nchan_msg_compression_type_t compression;
   ngx_int_t             msglen;
   callback_pt           callback;
   void                 *privdata;
+  uint8_t               retry;
 } redis_publish_callback_data_t;
 
 static void redisPublishCallback(redisAsyncContext *, void *, void *);
+static void redisPublishNostoreCallback(redisAsyncContext *, void *, void *);
+static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd);
 
-static void redis_publish_message_send(rdstore_data_t *rdata, void *pd) {
+static ngx_int_t redis_publish_message_nodeset_maybe_retry(redis_nodeset_t *ns, redis_publish_callback_data_t *d) {
+  //retry maybe
+  if(d->retry < REDIS_NODESET_NOT_READY_MAX_RETRIES) {
+    d->retry++;
+    nodeset_callback_on_ready(ns, 1000, redis_publish_message_send, d);
+  }
+  else {
+    d->callback(NGX_HTTP_SERVICE_UNAVAILABLE, NULL, d->privdata);
+    ngx_free(d);
+  }
+  return NGX_DECLINED;
+}
+
+static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd) {
   redis_publish_callback_data_t  *d = pd;
   ngx_int_t                       mmapped = 0;
   ngx_buf_t                      *buf;
-  u_char                         *msgstart;
-  size_t                          msglen;
+  ngx_str_t                       msgstr;
   nchan_msg_t                    *msg = d->msg;
+  const ngx_str_t                 empty=ngx_string("");
   
-  buf = msg->buf;
+  if(!nodeset_ready(nodeset)) {
+    return redis_publish_message_nodeset_maybe_retry(nodeset, d);
+  }
+  
+  redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, d->channel_id);
+  
+  buf = &msg->buf;
   if(ngx_buf_in_memory(buf)) {
-    msgstart = buf->pos;
-    msglen = buf->last - msgstart;
+    msgstr.data = buf->pos;
+    msgstr.len = buf->last - msgstr.data;
   }
   else { //in a file
     ngx_fd_t fd = buf->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&buf->file->name) : buf->file->fd;
     
-    msglen = buf->file_last - buf->file_pos;
-    msgstart = mmap(NULL, msglen, PROT_READ, MAP_SHARED, fd, 0);
-    if (msgstart != MAP_FAILED) {
+    msgstr.len = buf->file_last - buf->file_pos;
+    msgstr.data = mmap(NULL, msgstr.len, PROT_READ, MAP_SHARED, fd, 0);
+    if (msgstr.data != MAP_FAILED) {
       mmapped = 1;
     }
     else {
-      msgstart = NULL;
-      msglen = 0;
+      msgstr.data = NULL;
+      msgstr.len = 0;
       ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno, "Redis store: Couldn't mmap file %V", &buf->file->name);
     }
   }
-  d->msglen = msglen;
+  d->msglen = msgstr.len;
   
-  
-  //input:  keys: [], values: [channel_id, time, message, content_type, eventsource_event, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]
-  //output: message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
-  redis_command(rdata, &redisPublishCallback, d, "EVALSHA %s 0 %b %i %b %b %b %i %i %i", redis_lua_scripts.publish.hash, STR(d->channel_id), msg->id.time, msgstart, msglen, STR(&(msg->content_type)), STR(&(msg->eventsource_event)), d->message_timeout, d->max_messages, redis_publish_message_msgkey_size);
-  if(mmapped && munmap(msgstart, msglen) == -1) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "munmap was a problem");
+  if(nodeset->settings.storage_mode == REDIS_MODE_DISTRIBUTED_NOSTORE) {
+    //hand-roll the msgpacked message
+    /*
+    9A A3"msg" CE<ttl> CE<time> 00 00 00 DB<len><str> D9<len><str> D9<len><str> 0X
+    |  |       |       |        |  |  |  |            |            |            |
+    |  |       |       |        |  |  |  |            |            |    fixint0/1 compression
+    |  |       |       |        |  |  |  |            |    bin8 <uint8 len> eventsource-event
+    |  |       |       |        |  |  |  |     bin8 <uint8 len> content type
+    |  |       |       |        |  |  |  bin32 <uint32 BE len> msg data
+    |  |       |       |      fixint=0 tag=0, prev_time=0, prev_tag=0
+    |  |       |    uint32 (BE) message time
+    |  |     uint32 (BE) message ttl
+    |  fixstr[3]
+    fixarray[10]
+    */
+    
+    uint32_t ttl, time;
+    uint32_t msglen;
+    uint8_t  content_type_len, eventsource_event_len, compression;
+    char     zero='\0';
+    int      fastpublish = nodeset->settings.nostore_fastpublish;
+    void   (*publish_callback)(redisAsyncContext *, void *, void *) = NULL;
+    void    *publish_pd = NULL;
+    
+    
+    ttl = htonl(d->message_timeout);
+    time = htonl(msg->id.time);
+    msglen = htonl(d->msglen);
+    content_type_len = msg->content_type ? (msg->content_type->len > 255 ? 255 : msg->content_type->len) : 0;
+    eventsource_event_len = msg->eventsource_event ? (msg->eventsource_event->len > 255 ? 255 : msg->eventsource_event->len) : 0;
+    compression = d->compression;
+    
+    if(!fastpublish) {
+      redis_command(node, NULL, NULL, "MULTI");
+    }
+    else {
+      publish_callback = redisPublishNostoreCallback;
+      publish_pd = d;
+    }
+    redis_command(node, publish_callback, publish_pd,
+      "PUBLISH %b{channel:%b}:pubsub "
+      "\x9A\xA3msg\xCE%b\xCE%b%b%b%b\xDB%b%b\xD9%b%b\xD9%b%b%b",
+      
+      STR(nodeset->settings.namespace),
+      STR(d->channel_id),
+      
+      (char *)&ttl, (size_t )4,
+      (char *)&time, (size_t )4,
+      (char *)&zero, (size_t )1,
+      (char *)&zero, (size_t )1,
+      (char *)&zero, (size_t )1,
+      (char *)&msglen, (size_t )4,
+      STR(&msgstr),
+      (char *)&content_type_len, (size_t )1,
+      STR((msg->content_type ? msg->content_type : &empty)),
+      (char *)&eventsource_event_len, (size_t )1,
+      STR((msg->eventsource_event ? msg->eventsource_event : &empty)),
+      (char *)&compression, (size_t )1
+    );
+    if(!fastpublish) {
+      redis_command(node, NULL, NULL, "HMGET %b{channel:%b} last_seen_fake_subscriber fake_subscribers", 
+        STR(nodeset->settings.namespace),
+        STR(d->channel_id)
+      );
+      redis_command(node, &redisPublishNostoreCallback, d, "EXEC");
+    }
+    
   }
+  else {  
+    //input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]
+    //output: message_time, message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
+    nchan_redis_script(publish, node, &redisPublishCallback, d, d->channel_id, 
+                      "%i %b %b %b %i %i %i %i %i", 
+                      msg->id.time, 
+                      STR(&msgstr), 
+                      STR((msg->content_type ? msg->content_type : &empty)), 
+                      STR((msg->eventsource_event ? msg->eventsource_event : &empty)), 
+                      d->compression,
+                      d->message_timeout, 
+                      d->max_messages, 
+                      redis_publish_message_msgkey_size,
+                      nodeset->settings.optimize_target
+                      );
+  }
+  if(mmapped && munmap(msgstr.data, msgstr.len) == -1) {
+    ERR("munmap was a problem");
+    return NGX_ERROR;
+  }
+  return NGX_OK;
 }
 
 static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t *msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
   redis_publish_callback_data_t  *d=NULL;
-  rdstore_data_t                 *rdata = cf->redis.privdata;
-  
+  redis_nodeset_t                *ns = nodeset_find(&cf->redis);
   assert(callback != NULL);
 
-  CREATE_CALLBACK_DATA(d, rdata, "publish_message", channel_id, callback, privdata);
+  CREATE_CALLBACK_DATA(d, ns, cf, "publish_message", channel_id, callback, privdata);
   
-  d->channel_id=channel_id;
   d->msg_time=msg->id.time;
   if(d->msg_time == 0) {
     d->msg_time = ngx_time();
   }
   d->msg = msg;
-  d->shared_msg = msg->shared;
+  d->shared_msg = msg->storage == NCHAN_MSG_SHARED;
   d->message_timeout = nchan_loc_conf_message_timeout(cf);
   d->max_messages = nchan_loc_conf_max_messages(cf);
+  d->compression = cf->message_compression;
+  d->retry = 0;
   
   assert(msg->id.tagcount == 1);
-  if((rdata = redis_cluster_rdata_from_channel_id(rdata, channel_id)) == NULL) {
-    return NGX_ERROR;
-  }
   
   if(d->shared_msg) {
     msg_reserve(d->msg, "redis publish");
   }
-  redis_publish_message_send(rdata, d);
+  redis_publish_message_send(ns, d);
   
   return NGX_OK;
 }
 
+static int64_t redisReply_to_int(redisReply *reply, int nil_value, int wrong_datatype_value) {
+  switch(reply->type) {
+    case REDIS_REPLY_INTEGER:
+      return reply->integer;
+    case REDIS_REPLY_STRING:
+      return atol(reply->str);
+    case REDIS_REPLY_NIL:
+      return nil_value;
+    default:
+      return wrong_datatype_value;
+  }
+}
+
+static void redisPublishNostoreCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
+  redisReply                    *reply=r;
+  redisReply                   **els;
+  nchan_channel_t                ch;
+  
+  
+  
+  redis_node_t                 *node = c->data;
+  node->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  if(d->shared_msg) {
+    msg_release(d->msg, "redis publish");
+  }
+  
+  ngx_memzero(&ch, sizeof(ch)); //for debugging basically. should be removed in the future and zeroed as-needed
+  
+  if(reply) {
+    if(reply->type == REDIS_REPLY_ARRAY && reply->elements == 2 && reply->element[1]->type == REDIS_REPLY_ARRAY && reply->element[1]->elements == 2) {
+      els = reply->element[1]->element;
+      ch.last_seen = redisReply_to_int(els[0], 0, 0);
+      ch.subscribers = redisReply_to_int(els[1], 0, 0);
+    }
+    else if(reply->type == REDIS_REPLY_INTEGER) {
+      ch.last_seen = 0;
+      ch.subscribers = redisReply_to_int(reply, 0, 0);
+    }
+    else {
+      DBG("nonsense nostore-publish reply");
+    }
+    
+    d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
+  }
+  else {
+    redisEchoCallback(c, r, privdata);
+    d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
+  }
+  
+  ngx_free(d);
+}
+
 static void redisPublishCallback(redisAsyncContext *c, void *r, void *privdata) {
   redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
   redisReply                    *reply=r;
   redisReply                    *cur;
   nchan_channel_t                ch;
   
-  rdstore_data_t                *rdata = c->data;
-  rdata->pending_commands--;
+  redis_node_t                 *node = c->data;
+  node->pending_commands--;
   nchan_update_stub_status(redis_pending_commands, -1);
   
-  if(!clusterKeySlotOk(c, r)) {
+  if(!nodeset_node_reply_keyslot_ok(node, reply)) {
     if(d->shared_msg) {
-      cluster_add_retry_command_with_channel_id(rdata->node.cluster, d->channel_id, redis_publish_message_send, d);
+      redis_publish_message_nodeset_maybe_retry(node->nodeset, d);
     }
     else {
       //message probably isn't available anymore...
@@ -2682,12 +2380,7 @@ static void redisPublishCallback(redisAsyncContext *c, void *r, void *privdata)
   ngx_memzero(&ch, sizeof(ch)); //for debugging basically. should be removed in the future and zeroed as-needed
   
   if(reply && CHECK_REPLY_ARRAY_MIN_SIZE(reply, 2)) {
-    ch.last_published_msg_id.time=d->msg_time;
-    ch.last_published_msg_id.tag.fixed[0]=reply->element[0]->integer;
-    ch.last_published_msg_id.tagcount = 1;
-    ch.last_published_msg_id.tagactive = 0;
-    
-    cur=reply->element[1];
+    cur=reply->element[0];
     switch(redis_array_to_channel(cur, &ch)) {
       case NGX_OK:
         d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
@@ -2717,17 +2410,35 @@ typedef struct {
 
 
 static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r, void *privdata);
-static void nchan_store_redis_add_fakesub_send(rdstore_data_t *rdata, void *pd) {
-  if(rdata) {
-    redis_command(rdata, &nchan_store_redis_add_fakesub_callback, NULL, "EVALSHA %s 0 %b %i", redis_lua_scripts.add_fakesub.hash, STR(((add_fakesub_data_t *)pd)->channel_id), ((add_fakesub_data_t *)pd)->count);
+static ngx_int_t nchan_store_redis_add_fakesub_send(redis_nodeset_t *nodeset, void *pd) {
+  add_fakesub_data_t *d = pd;
+  if(nodeset_ready(nodeset)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, d->channel_id);
+    nchan_redis_script(add_fakesub, node, &nchan_store_redis_add_fakesub_callback, NULL, 
+                       d->channel_id,
+                       "%i %i",
+                       d->count,
+                       ngx_time()
+                      );
+    return NGX_OK;
   }
+  else {
+    return NGX_ERROR;
+  }
+}
+
+static ngx_int_t nchan_store_redis_add_fakesub_send_retry_wrapper(redis_nodeset_t *nodeset, void *pd) {
+  add_fakesub_data_t *d = pd;
+  ngx_int_t rc = nchan_store_redis_add_fakesub_send(nodeset, pd);
+  ngx_free(d);
+  return rc;
 }
 
 static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r, void *privdata) {
   redisReply      *reply = r;
-  rdstore_data_t  *rdata = c->data;
+  redis_node_t    *node = c->data;
   
-  rdata->pending_commands--;
+  node->pending_commands--;
   nchan_update_stub_status(redis_pending_commands, -1);
   
   if(reply && reply->type == REDIS_REPLY_ERROR) {
@@ -2740,12 +2451,12 @@ static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r
     errstr.len = strlen(reply->str);
     
     if(ngx_str_chop_if_startswith(&errstr, "CLUSTER KEYSLOT ERROR. ")) {
-      
+      nodeset_node_keyslot_changed(node);
       nchan_scan_until_chr_on_line(&errstr, &countstr, ' ');
       count = ngx_atoi(countstr.data, countstr.len);
       channel_id = errstr;
       
-      add_fakesub_data_t  *d = cluster_retry_palloc(rdata->node.cluster, sizeof(*d) + sizeof(ngx_str_t) + channel_id.len);
+      add_fakesub_data_t  *d = ngx_alloc(sizeof(*d) + sizeof(ngx_str_t) + channel_id.len, ngx_cycle->log);
       if(!d) {
         ERR("can't allocate add_fakesub_data for CLUSTER KEYSLOT ERROR retry");
         return;
@@ -2754,7 +2465,7 @@ static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r
       d->channel_id = (ngx_str_t *)&d[1];
       d->channel_id->data = (u_char *)&d->channel_id[1];
       nchan_strcpy(d->channel_id, &channel_id, 0);
-      cluster_add_retry_command_with_channel_id(rdata->node.cluster, &channel_id, nchan_store_redis_add_fakesub_send, d);
+      nodeset_callback_on_ready(node->nodeset, 1000, nchan_store_redis_add_fakesub_send_retry_wrapper, d);
       
       return;
     }
@@ -2764,43 +2475,47 @@ static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r
 }
 
 ngx_int_t nchan_store_redis_fakesub_add(ngx_str_t *channel_id, nchan_loc_conf_t *cf, ngx_int_t count, uint8_t shutting_down) {
-  rdstore_data_t                 *rdata;
+  redis_nodeset_t  *nodeset = nodeset_find(&cf->redis);
   
-  if((rdata = redis_cluster_rdata_from_channel_id(cf->redis.privdata, channel_id)) == NULL) {
-    return NGX_ERROR;
-  }
   if(!shutting_down) {
     add_fakesub_data_t   data = {channel_id, count};
-    nchan_store_redis_add_fakesub_send(rdata, &data);
+    nchan_store_redis_add_fakesub_send(nodeset, &data);
   }
   else {
-    redis_sync_command(rdata, "EVALSHA %s 0 %b %i", redis_lua_scripts.add_fakesub.hash, STR(channel_id), count);
+    if(nodeset_ready(nodeset)) {
+      redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, channel_id);
+      redis_sync_command(node, "EVALSHA %s 0 %b %i", redis_lua_scripts.add_fakesub.hash, STR(channel_id), count);
+    }
   }
   return NGX_OK;
 }
 
+int nchan_store_redis_ready(nchan_loc_conf_t *cf) {
+  redis_nodeset_t   *nodeset = nodeset_find(&cf->redis);
+  return nodeset && nodeset_ready(nodeset);
+}
+
 nchan_store_t nchan_store_redis = {
-    //init
-    &nchan_store_init_module,
-    &nchan_store_init_worker,
-    &nchan_store_init_postconfig,
-    &nchan_store_create_main_conf,
-    
-    //shutdown
-    &nchan_store_exit_worker,
-    &nchan_store_exit_master,
-    
-    //async-friendly functions with callbacks
-    &nchan_store_async_get_message, //+callback
-    &nchan_store_subscribe, //+callback
-    &nchan_store_publish_message, //+callback
-    
-    &nchan_store_delete_channel, //+callback
-    &nchan_store_find_channel, //+callback
-    
-    //message stuff
-    &nchan_store_etag_from_message,
-    &nchan_store_content_type_from_message,
-    
+  //init
+  &nchan_store_init_module,
+  &nchan_store_init_worker,
+  &nchan_store_init_postconfig,
+  &nchan_store_create_main_conf,
+  
+  //shutdown
+  &nchan_store_exit_worker,
+  &nchan_store_exit_master,
+  
+  //async-friendly functions with callbacks
+  &nchan_store_async_get_message, //+callback
+  &nchan_store_subscribe, //+callback
+  &nchan_store_publish_message, //+callback
+  
+  &nchan_store_delete_channel, //+callback
+  &nchan_store_find_channel, //+callback
+  
+  NULL, //get_group
+  NULL,
+  NULL
 };
 
diff --git a/debian/modules/nchan/src/store/redis/scripts/.gitignore b/debian/modules/nchan/src/store/redis/redis-lua-scripts/.gitignore
similarity index 100%
rename from debian/modules/nchan/src/store/redis/scripts/.gitignore
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/.gitignore
diff --git a/debian/modules/nchan/src/store/redis/scripts/Gemfile b/debian/modules/nchan/src/store/redis/redis-lua-scripts/Gemfile
similarity index 100%
rename from debian/modules/nchan/src/store/redis/scripts/Gemfile
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/Gemfile
diff --git a/debian/modules/nchan/src/store/redis/scripts/add_fakesub.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/add_fakesub.lua
similarity index 65%
rename from debian/modules/nchan/src/store/redis/scripts/add_fakesub.lua
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/add_fakesub.lua
index dfee879..ee2b95f 100644
--- a/debian/modules/nchan/src/store/redis/scripts/add_fakesub.lua
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/add_fakesub.lua
@@ -1,14 +1,16 @@
---input:  keys: [], values: [channel_id, number]
+--input:  keys: [], values: [namespace, channel_id, number, time]
 --output: current_fake_subscribers
   
 redis.call('echo', ' ####### FAKESUBS ####### ')
-local id=ARGV[1]
-local num=tonumber(ARGV[2])
+local ns=ARGV[1]
+local id=ARGV[2]
+local num=tonumber(ARGV[3])
+local time = tonumber(ARGV[4])
 if num==nil then
   return {err="fakesub number not given"}
 end
 
-local chan_key = ('{channel:%s}'):format(id)
+local chan_key = ('%s{channel:%s}'):format(ns, id)
 
 local res = redis.pcall('EXISTS', chan_key)
 if type(res) == "table" and res["err"] then
@@ -21,6 +23,9 @@ local cur = 0
 
 if exists or (not exists and num > 0) then
   cur = redis.call('HINCRBY', chan_key, 'fake_subscribers', num)
+  if time then
+    redis.call('HSET', chan_key, 'last_seen_fake_subscriber', time)
+  end
   if not exists then
     redis.call('EXPIRE', chan_key, 5) --something small
   end
diff --git a/debian/modules/nchan/src/store/redis/scripts/channel_keepalive.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/channel_keepalive.lua
similarity index 85%
rename from debian/modules/nchan/src/store/redis/scripts/channel_keepalive.lua
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/channel_keepalive.lua
index b495087..4d21548 100644
--- a/debian/modules/nchan/src/store/redis/scripts/channel_keepalive.lua
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/channel_keepalive.lua
@@ -1,9 +1,10 @@
---input:  keys: [], values: [channel_id, ttl]
+--input:  keys: [], values: [namespace, channel_id, ttl]
 -- ttl is for when there are no messages but at least 1 subscriber.
 --output: seconds until next keepalive is expected, or -1 for "let it disappear"
 redis.call('ECHO', ' ####### CHANNEL KEEPALIVE ####### ')
-local id=ARGV[1]
-local ttl=tonumber(ARGV[2])
+local ns=ARGV[1]
+local id=ARGV[2]
+local ttl=tonumber(ARGV[3])
 if not ttl then
   return {err="Invalid channel keepalive TTL (2nd arg)"}
 end
@@ -11,7 +12,7 @@ end
 local random_safe_next_ttl = function(ttl)
   return math.floor(ttl/2 + ttl/2.1 * math.random())
 end
-local ch = ('{channel:%s}'):format(id)
+local ch = ('%s{channel:%s}'):format(ns, id)
 local key={
   channel=   ch, --hash
   messages=  ch..':messages', --list
diff --git a/debian/modules/nchan/src/store/redis/scripts/delete.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/delete.lua
similarity index 54%
rename from debian/modules/nchan/src/store/redis/scripts/delete.lua
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/delete.lua
index 382c9db..d951395 100644
--- a/debian/modules/nchan/src/store/redis/scripts/delete.lua
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/delete.lua
@@ -1,8 +1,9 @@
---input: keys: [],  values: [ channel_id ]
+--input: keys: [],  values: [ namespace, channel_id ]
 --output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
 -- delete this channel and all its messages
-local id = ARGV[1]
-local ch = ('{channel:%s}'):format(id)
+local ns = ARGV[1]
+local id = ARGV[2]
+local ch = ('%s{channel:%s}'):format(ns, id)
 local key_msg=    ch..':msg:%s' --not finished yet
 local key_channel=ch
 local messages=   ch..':messages'
@@ -28,31 +29,40 @@ for k,channel_key in pairs(redis.call('SMEMBERS', subscribers)) do
   redis.call('PUBLISH', channel_key, del_msgpack)
 end
 
-local nearly_departed = nil
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+
+local channel = nil
 if redis.call('EXISTS', key_channel) ~= 0 then
-  nearly_departed = redis.call('hmget', key_channel, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')
-  if(nearly_departed[4]) then
-    --replace subscribers count with fake_subscribers
-    nearly_departed[3]=nearly_departed[4]
-    table.remove(nearly_departed, 4)
-  end
-  for i = 1, 4 do
-    nearly_departed[i]=tonumber(nearly_departed[i]) or 0
-  end
-  if type(nearly_departed[5]) ~= "string" then
-    nearly_departed[5]=""
-  end
-  
+  channel = tohash(redis.call('hgetall', key_channel))
   --leave some crumbs behind showing this channel was just deleted
-  redis.call('setex', ch..":deleted", 5, 1)
-  
-  table.insert(nearly_departed, num_messages)
+  redis.call('setex', ch..":deleted", 5, 1)  
 end
 
 redis.call('DEL', key_channel, messages, subscribers)
+redis.call('PUBLISH', pubsub, del_msgpack)
 
-if redis.call('PUBSUB','NUMSUB', pubsub)[2] > 0 then
-  redis.call('PUBLISH', pubsub, del_msgpack)
+if channel then
+  return {
+    tonumber(channel.ttl) or 0,
+    tonumber(channel.last_seen_fake_subscriber) or 0,
+    tonumber(channel.fake_subscribers or channel.subscribers) or 0,
+    channel.current_message or "",
+    tonumber(num_messages)
+  }
+else
+  return nil
 end
-
-return nearly_departed
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/find_channel.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/find_channel.lua
new file mode 100644
index 0000000..4e09598
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/find_channel.lua
@@ -0,0 +1,70 @@
+--input: keys: [],  values: [ namespace, channel_id ]
+--output: channel_hash {ttl, time_last_seen, subscribers, last_channel_id, messages} or nil
+-- finds and return the info hash of a channel, or nil of channel not found
+local ns = ARGV[1]
+local id = ARGV[2]
+local channel_key = ('%s{channel:%s}'):format(ns, id)
+local messages_key = channel_key..':messages'
+
+redis.call('echo', ' #######  FIND_CHANNEL ######## ')
+
+--check old entries
+local oldestmsg=function(list_key, old_fmt)
+  local old, oldkey
+  local n, del=0,0
+  while true do
+    n=n+1
+    old=redis.call('lindex', list_key, -1)
+    if old then
+      oldkey=old_fmt:format(old)
+      local ex=redis.call('exists', oldkey)
+      if ex==1 then
+        return oldkey
+      else
+        redis.call('rpop', list_key)
+        del=del+1
+      end
+    else
+      break
+    end
+  end
+end
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      --dbg(k.."="..v)
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+
+if redis.call('EXISTS', channel_key) ~= 0 then
+  local ch = tohash(redis.call('hgetall', channel_key))
+    
+  local msgs_count
+  if redis.call("TYPE", messages_key)['ok'] == 'list' then
+    oldestmsg(messages_key, channel_key ..':msg:%s')
+    msgs_count = tonumber(redis.call('llen', messages_key))
+  else
+    msgs_count = 0
+  end
+  
+  return {
+    tonumber(ch.ttl) or 0,
+    tonumber(ch.last_seen_fake_subscriber) or 0,
+    tonumber(ch.fake_subscribers or ch.subscribers) or 0,
+    ch.current_message or "",
+    msgs_count
+  }
+else
+  return nil
+end
diff --git a/debian/modules/nchan/src/store/redis/scripts/get_message.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message.lua
similarity index 80%
rename from debian/modules/nchan/src/store/redis/scripts/get_message.lua
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message.lua
index 4cb84e6..986368f 100644
--- a/debian/modules/nchan/src/store/redis/scripts/get_message.lua
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message.lua
@@ -1,11 +1,11 @@
---input:  keys: [], values: [channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
---output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
+--input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
+--output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count
 -- no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent
 -- create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.
 -- result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available
-local id, time, tag, subscribe_if_current = ARGV[1], tonumber(ARGV[2]), tonumber(ARGV[3])
-local no_msgid_order=ARGV[4]
-local create_channel_ttl=tonumber(ARGV[5]) or 0
+local ns, id, time, tag, subscribe_if_current = ARGV[1], ARGV[2], tonumber(ARGV[3]), tonumber(ARGV[4])
+local no_msgid_order=ARGV[5]
+local create_channel_ttl=tonumber(ARGV[6]) or 0
 local msg_id
 if time and time ~= 0 and tag then
   msg_id=("%s:%s"):format(time, tag)
@@ -20,7 +20,7 @@ end
 -- redis doesn't do includes. It could be generated pre-insertion into redis, 
 -- but then error messages become less useful, complicating debugging. If you 
 -- have a solution to this, please help.
-local ch=('{channel:%s}'):format(id)
+local ch=('%s{channel:%s}'):format(ns, id)
 local msgkey_fmt=ch..':msg:%s'
 local key={
   next_message= msgkey_fmt, --hash
@@ -91,8 +91,8 @@ end
 
 local subs_count = tonumber(channel.subscribers)
 
-local found_msg_id
 if msg_id==nil then
+  local found_msg_key
   if new_channel then
     --dbg("new channel")
     return {418, "", "", "", "", subs_count}
@@ -101,24 +101,23 @@ if msg_id==nil then
     
     if no_msgid_order == 'FIFO' then --most recent message
       --dbg("get most recent")
-      found_msg_id=channel.current_message
+      found_msg_key=channel.current_message
     elseif no_msgid_order == 'FILO' then --oldest message
       --dbg("get oldest")
-      
-      found_msg_id=oldestmsg(key.messages, msgkey_fmt)
+      found_msg_key=oldestmsg(key.messages, msgkey_fmt)
     end
-    if found_msg_id == nil then
+    
+    if found_msg_key == nil then
       --we await a message
       return {418, "", "", "", "", subs_count}
     else
-      msg_id = found_msg_id
-      local msg=tohash(redis.call('HGETALL', msg_id))
+      local msg=tohash(redis.call('HGETALL', found_msg_key))
       if not next(msg) then --empty
         return {404, "", "", "", "", subs_count}
       else
         --dbg(("found msg %s:%s  after %s:%s"):format(tostring(msg.time), tostring(msg.tag), tostring(time), tostring(tag)))
-        local ttl = redis.call('TTL', msg_id)
-        return {200, ttl, tonumber(msg.time) or "", tonumber(msg.tag) or "", tonumber(msg.prev_time) or "", tonumber(msg.prev_tag) or "", msg.data or "", msg.content_type or "", msg.eventsource_event or "", subs_count}
+        local ttl = redis.call('TTL', found_msg_key)
+        return {200, ttl, tonumber(msg.time) or "", tonumber(msg.tag) or "", tonumber(msg.prev_time) or "", tonumber(msg.prev_tag) or "", msg.data or "", msg.content_type or "", msg.eventsource_event or "", tonumber(msg.compression or 0), subs_count}
       end
     end
   end
@@ -144,10 +143,10 @@ else
     --dbg("NEXT MESSAGE KEY PRESENT: " .. msg.next)
     key.next_message=key.next_message:format(msg.next)
     if redis.call('EXISTS', key.next_message)~=0 then
-      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event'))
+      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event, ncompression=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))
       local ttl = redis.call('TTL', key.next_message)
       --dbg(("found msg2 %i:%i  after %i:%i"):format(ntime, ntag, time, tag))
-      return {200, ttl, tonumber(ntime) or "", tonumber(ntag) or "", tonumber(prev_time) or "", tonumber(prev_tag) or "", ndata or "", ncontenttype or "", neventsource_event or "", subs_count}
+      return {200, ttl, tonumber(ntime) or "", tonumber(ntag) or "", tonumber(prev_time) or "", tonumber(prev_tag) or "", ndata or "", ncontenttype or "", neventsource_event or "", ncompression or 0, subs_count}
     else
       --dbg("NEXT MESSAGE NOT FOUND")
       return {404, nil}
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message_from_key.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message_from_key.lua
new file mode 100644
index 0000000..ad0d742
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message_from_key.lua
@@ -0,0 +1,8 @@
+--input:  keys: [message_key], values: []
+--output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count
+local key = KEYS[1]
+
+local ttl = redis.call('TTL', key)
+local time, tag, prev_time, prev_tag, data, content_type, es_event, compression = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))
+
+return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or "", content_type or "", es_event or "", tonumber(compression or 0)}
diff --git a/debian/modules/nchan/src/store/redis/scripts/publish.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish.lua
similarity index 71%
rename from debian/modules/nchan/src/store/redis/scripts/publish.lua
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/publish.lua
index 23da3bb..1d8e416 100644
--- a/debian/modules/nchan/src/store/redis/scripts/publish.lua
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish.lua
@@ -1,9 +1,24 @@
---input:  keys: [], values: [channel_id, time, message, content_type, eventsource_event, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]
---output: message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
+--input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, optimize_target]
+--output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?
+
+local ns, id=ARGV[1], ARGV[2]
+
+local msg = {}
+
+local store_at_most_n_messages = tonumber(ARGV[9])
+if store_at_most_n_messages == nil or store_at_most_n_messages == "" then
+  return {err="Argument 9, max_msg_buf_size, can't be empty"}
+end
+if store_at_most_n_messages == 0 then
+  msg.unbuffered = 1
+end
+
+local msgpacked_pubsub_cutoff = tonumber(ARGV[10])
+
+local optimize_target = tonumber(ARGV[11]) == 2 and "bandwidth" or "cpu"
 
-local id=ARGV[1]
 local time
-if redis.replicate_commands then
+if optimize_target == "cpu" and redis.replicate_commands then
   -- we're on redis >= 3.2. We can use We can use 'script effects replication' to allow
   -- writing nondeterministic command values like TIME.
   -- That's exactly what we want to do, use Redis' TIME rather than the given time from Nginx
@@ -12,39 +27,30 @@ if redis.replicate_commands then
   time = tonumber(redis.call('TIME')[1])
 else
   --fallback to the provided time
-  time = tonumber(ARGV[2])
+  time = tonumber(ARGV[3])
 end
 
-local msg={
-  id=nil,
-  data= ARGV[3],
-  content_type=ARGV[4],
-  eventsource_event=ARGV[5],
-  ttl= tonumber(ARGV[6]),
-  time= time,
-  tag= 0
-}
+msg.id=nil
+msg.data= ARGV[4]
+msg.content_type=ARGV[5]
+msg.eventsource_event=ARGV[6]
+msg.compression=tonumber(ARGV[7])
+msg.ttl= tonumber(ARGV[8])
+msg.time= time
+msg.tag= 0
+
 if msg.ttl == 0 then
   msg.ttl = 126144000 --4 years
 end
-local store_at_most_n_messages = tonumber(ARGV[7])
-if store_at_most_n_messages == nil or store_at_most_n_messages == "" then
-  return {err="Argument 7, max_msg_buf_size, can't be empty"}
-end
-if store_at_most_n_messages == 0 then
-  msg.unbuffered = 1
-end
-
-local msgpacked_pubsub_cutoff = tonumber(ARGV[8])
 
 --[[local dbg = function(...)
   local arg = {...}
   for i = 1, #arg do
     arg[i]=tostring(arg[i])
   end
-  redis.call('echo', table.concat(arg))
-end
-]]
+  redis.call('echo', table.concat(arg, ", "))
+end]]
+
 if type(msg.content_type)=='string' and msg.content_type:find(':') then
   return {err='Message content-type cannot contain ":" character.'}
 end
@@ -62,16 +68,6 @@ local hmset = function (key, dict)
   return redis.call('HMSET', key, unpack(bulk))
 end
 
---[[
-local hash_tostr=function(h)
-  local tt = {}
-  for k, v in pairs(h) do
-    table.insert(tt, ("%s: %s"):format(k, v))
-  end
-  return "{" .. table.concat(tt,", ") .. "}"
-end
-]]
-
 local tohash=function(arr)
   if type(arr)~="table" then
     return nil
@@ -88,7 +84,7 @@ local tohash=function(arr)
   return h
 end
 
-local ch = ('{channel:%s}'):format(id)
+local ch = ('%s{channel:%s}'):format(ns, id)
 local msg_fmt = ch..':msg:%s'
 local key={
   last_message= msg_fmt, --not finished yet
@@ -130,7 +126,7 @@ if key.last_message then
   lasttime, lasttag = tonumber(lastmsg[1]), tonumber(lastmsg[2])
   --dbg("New message id: last_time ", lasttime, " last_tag ", lasttag, " msg_time ", msg.time)
   if lasttime and tonumber(lasttime) > tonumber(msg.time) then
-    redis.log(redis.LOG_WARNING, "Nchan: message for " .. id .. " arrived a little late and may be delivered out of order. Redis must be very busy.")
+    redis.log(redis.LOG_WARNING, "Nchan: message for " .. id .. " arrived a little late and may be delivered out of order. Redis must be very busy, or the Nginx servers do not have their times synchronized.")
     msg.time = lasttime
     time = lasttime
   end
@@ -147,11 +143,16 @@ msg.id=('%i:%i'):format(msg.time, msg.tag)
 
 key.message=key.message:format(msg.id)
 if redis.call('EXISTS', key.message) ~= 0 then
-  local errmsg = "Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s"
-  errmsg = errmsg:format(key.message, id, msg.id, time, lasttime, lasttag)
-  --redis.log(redis.LOG_WARNING, errmsg)
-  --redis.log(redis.LOG_WARNING, "channel: " .. key.channel .. hash_tostr(channel))
-  --redis.log(redis.LOG_WARNING, ("messages: %s {%s}"):format(key.messages, table.concat(redis.call('LRANGE', key.messages, 0, -1), ", ")))
+  local hash_tostr=function(h)
+    local tt = {}
+    for k, v in pairs(h) do
+      table.insert(tt, ("%s: %s"):format(k, v))
+    end
+    return "{" .. table.concat(tt,", ") .. "}"
+  end
+  local existing_msg = tohash(redis.call('HGETALL', key.message))
+  local errmsg = "Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s. dbg: channel: %s, messages_key: %s, msglist: %s, msg: %s, msg_expire: %s."
+  errmsg = errmsg:format(key.message, id, msg.id or "-", time or "-", lasttime or "-", lasttag or "-", hash_tostr(channel), key.messages, "["..table.concat(redis.call('LRANGE', key.messages, 0, -1), ", ").."]", hash_tostr(existing_msg), redis.call('TTL', key.message))
   return {err=errmsg}
 end
 
@@ -226,10 +227,10 @@ end
 --set expiration times for all the things
 local channel_ttl = tonumber(redis.call('TTL',  key.channel))
 redis.call('EXPIRE', key.message, msg.ttl)
-if msg.ttl > channel_ttl then
-  redis.call('EXPIRE', key.channel, msg.ttl)
-  redis.call('EXPIRE', key.messages, msg.ttl)
-  redis.call('EXPIRE', key.subscribers, msg.ttl)
+if msg.ttl + 1 > channel_ttl then -- a little extra time for failover weirdness for 1-second TTL messages
+  redis.call('EXPIRE', key.channel, msg.ttl + 1)
+  redis.call('EXPIRE', key.messages, msg.ttl + 1)
+  redis.call('EXPIRE', key.subscribers, msg.ttl + 1)
 end
 
 --publish message
@@ -245,7 +246,8 @@ if msg.unbuffered or #msg.data < msgpacked_pubsub_cutoff then
     (msg.unbuffered and 0 or msg.prev_tag) or 0,
     msg.data or "",
     msg.content_type or "",
-    msg.eventsource_event or ""
+    msg.eventsource_event or "",
+    msg.compression or 0
   }
 else
   unpacked= {
@@ -265,14 +267,21 @@ local msgpacked
 
 --dbg(("Stored message with id %i:%i => %s"):format(msg.time, msg.tag, msg.data))
 
---now publish to the efficient channel
-local numsub = redis.call('PUBSUB','NUMSUB', channel_pubsub)[2]
-if tonumber(numsub) > 0 then
-  msgpacked = cmsgpack.pack(unpacked)
-  redis.call('PUBLISH', channel_pubsub, msgpacked)
-end
+--we used to publish conditionally on subscribers on the Redis pubsub channel
+--but now that we're subscribing to slaves this is not possible
+--so just PUBLISH always.
+msgpacked = cmsgpack.pack(unpacked)
+redis.call('PUBLISH', channel_pubsub, msgpacked)
 
 local num_messages = redis.call('llen', key.messages)
 
 --dbg("channel ", id, " ttl: ",channel.ttl, ", subscribers: ", channel.subscribers, "(fake: ", channel.fake_subscribers or "nil", "), messages: ", num_messages)
-return { msg.tag, {tonumber(channel.ttl or msg.ttl), tonumber(channel.time or msg.time), tonumber(channel.fake_subscribers or channel.subscribers or 0), tonumber(num_messages)}, new_channel}
+local ch = {
+  tonumber(channel.ttl or msg.ttl),
+  tonumber(channel.last_seen_fake_subscriber) or 0,
+  tonumber(channel.fake_subscribers or channel.subscribers) or 0,
+  msg.time and msg.time and ("%i:%i"):format(msg.time, msg.tag) or "",
+  tonumber(num_messages)
+}
+
+return {ch, new_channel}
diff --git a/debian/modules/nchan/src/store/redis/scripts/publish_status.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish_status.lua
similarity index 81%
rename from debian/modules/nchan/src/store/redis/scripts/publish_status.lua
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/publish_status.lua
index a8b5ef0..cdb251d 100644
--- a/debian/modules/nchan/src/store/redis/scripts/publish_status.lua
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish_status.lua
@@ -1,16 +1,16 @@
---input:  keys: [], values: [channel_id, status_code]
+--input:  keys: [], values: [namespace, channel_id, status_code]
 --output: current_subscribers
 
 redis.call('echo', ' ####### PUBLISH STATUS ####### ')
 --local dbg = function(...) redis.call('echo', table.concat({...})); end
-local id=ARGV[1]
-local code=tonumber(ARGV[2])
+local ns, id=ARGV[1], ARGV[2]
+local code=tonumber(ARGV[3])
 if code==nil then
   return {err="non-numeric status code given, bailing!"}
 end
 
 local pubmsg = "status:"..code
-local ch = ('{channel:%s}'):format(id)
+local ch = ('%s{channel:%s}'):format(ns, id)
 local subs_key = ch..':subscribers'
 local chan_key = ch
 --local channel_pubsub = ch..':pubsub'
diff --git a/debian/modules/nchan/src/store/redis/scripts/rsck.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/rsck.lua
similarity index 86%
rename from debian/modules/nchan/src/store/redis/scripts/rsck.lua
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/rsck.lua
index 76dbffe..9d351bc 100644
--- a/debian/modules/nchan/src/store/redis/scripts/rsck.lua
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/rsck.lua
@@ -1,4 +1,8 @@
 --redis-store consistency check
+local ns = ARGV[1]
+if ns and #ns > 0 then
+  ns = ns..":"
+end
 
 local concat = function(...)
   local arg = {...}
@@ -64,9 +68,22 @@ local known_msgs_count=0
 local known_msgkeys = {}
 local known_channel_keys = {}
 
+
+local k = {
+  channel = function(chid)
+    return ("%s{channel:%s}"):format(chid)
+  end,
+  msg = function (chid, msgid)
+    return ("%s:msg:%s"):format(k.channel(chid), msgid)
+  end,
+  messages = function(chid)
+    return k.channel(chid) .. ":messages"
+  end
+}
+
 local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)
   description = description and "msg (" .. description ..")" or "msg"
-  local msgkey = "{channel:"..chid.."}:msg:"..msgid
+  local msgkey = k.msg(chid, msgid)
   if not known_msgkeys[msgkey] then
     known_msgs_count = known_msgs_count + 1
   end
@@ -75,13 +92,13 @@ local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)
   if t == "none" then
     --message is missing, but maybe it expired under normal circumstances. 
     --check if any earlier messages are present
-    local msgids = redis.call('LRANGE', "{channel:"..chid.."}:messages", 0, -1)
+    local msgids = redis.call('LRANGE', k.messages(chid), 0, -1)
     local founds = 0
     for i=#msgids, 1, -1 do
       if msgids[i] == msgid then 
         break
       end
-      local thismsgkey = "{channel:"..chid.."}:msg:".. msgids[i]
+      local thismsgkey = k.msg(chid, msgids[i])
       local ttt = redis.call('type', thismsgkey)['ok']
       redis.breakpoint()
       if ttt == "hash" then
@@ -116,8 +133,8 @@ end
 
 local check_channel = function(id)
   local key={
-    ch = "{channel:"..id.."}",
-    msgs = "{channel:"..id.."}:messages"
+    ch = k.channel(id),
+    msgs = k.messages(id)
   }
   
   local ok, chkey_type = type_is(key.ch, "hash", "channel hash")
@@ -162,10 +179,10 @@ end
 
 local channel_ids = {}
 
-for i, chkey in ipairs(redis.call("KEYS", "{channel:*}")) do
-  local msgs_chid_match = chkey:match("^{channel:(.*)}:messages")
+for i, chkey in ipairs(redis.call("KEYS", k.channel("*"))) do
+  local msgs_chid_match = chkey:match("^"..k.messages("*"))
   if msgs_chid_match then
-    type_is("{channel:" .. msgs_chid_match.."}", "hash", "channel messages' corresponding hash key")
+    type_is(k.channel(msgs_chid_match), "hash", "channel messages' corresponding hash key")
   elseif not chkey:match(":msg$") then
     table.insert(channel_ids, chkey);
     known_channel_keys[chkey] = true
@@ -174,11 +191,11 @@ end
 
 dbg("found", #channel_ids, "channels")
 for i, chkey in ipairs(channel_ids) do
-  local chid = chkey:match("^{channel:(.*)}")
+  local chid = chkey:match("^" .. k.channel(".*"))
   check_channel(chid)
 end
 
-for i, msgkey in ipairs(redis.call("KEYS", "{channel:*}:msg")) do
+for i, msgkey in ipairs(redis.call("KEYS", k.channel("*")..":msg")) do
   if not known_msgkeys[msgkey] then
     local ok, t = type_is(msgkey, "hash")
     if ok then
diff --git a/debian/modules/nchan/src/store/redis/scripts/subscriber_register.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_register.lua
similarity index 62%
rename from debian/modules/nchan/src/store/redis/scripts/subscriber_register.lua
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_register.lua
index 479623f..e2eafca 100644
--- a/debian/modules/nchan/src/store/redis/scripts/subscriber_register.lua
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_register.lua
@@ -1,17 +1,19 @@
---input: keys: [], values: [channel_id, subscriber_id, active_ttl]
+--input: keys: [], values: [namespace, channel_id, subscriber_id, active_ttl, time, want_channel_settings]
 --  'subscriber_id' can be '-' for new id, or an existing id
 --  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
---output: subscriber_id, num_current_subscribers, next_keepalive_time
+--output: subscriber_id, num_current_subscribers, next_keepalive_time, channel_buffer_length
+--  'channel_buffer_length' is returned only if want_channel_settings is 1
 
-local id, sub_id, active_ttl, concurrency = ARGV[1], ARGV[2], tonumber(ARGV[3]) or 20, ARGV[4]
+local ns, id, sub_id, active_ttl, time = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20, tonumber(ARGV[5])
+local want_channel_settings = tonumber(ARGV[6]) == 1
 
 --local dbg = function(...) redis.call('echo', table.concat({...})); end
 
 redis.call('echo', ' ######## SUBSCRIBER REGISTER SCRIPT ####### ')
-local ch=("{channel:%s}"):format(id)
+local ch=("%s{channel:%s}"):format(ns, id)
 local keys = {
   channel =     ch,
-  messages =    ch..':messages:',
+  messages =    ch..':messages',
   subscribers = ch..':subscribers'
 }
 
@@ -37,6 +39,9 @@ if sub_id == "-" then
 else
   sub_count=tonumber(redis.call('hget', keys.channel, 'subscribers'))
 end
+if time then
+  redis.call('hset', keys.channel, "last_seen_subscriber", time)
+end
 
 local next_keepalive 
 local actual_ttl = tonumber(redis.call('ttl', keys.channel))
@@ -47,4 +52,11 @@ else
   next_keepalive = random_safe_next_ttl(actual_ttl)
 end
 
-return {sub_id, sub_count, next_keepalive}
+
+local ret = {sub_id, sub_count, next_keepalive}
+if want_channel_settings then
+  local max_messages = tonumber(redis.call('hget', keys.channel, 'max_stored_messages'))
+  table.insert(ret, max_messages)
+end
+
+return ret
diff --git a/debian/modules/nchan/src/store/redis/scripts/subscriber_unregister.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
similarity index 85%
rename from debian/modules/nchan/src/store/redis/scripts/subscriber_unregister.lua
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
index 9233c78..0343cc5 100644
--- a/debian/modules/nchan/src/store/redis/scripts/subscriber_unregister.lua
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
@@ -1,14 +1,14 @@
---input: keys: [], values: [channel_id, subscriber_id, empty_ttl]
+--input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]
 -- 'subscriber_id' is an existing id
 -- 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
 --output: subscriber_id, num_current_subscribers
 
-local id, sub_id, empty_ttl = ARGV[1], ARGV[2], tonumber(ARGV[3]) or 20
+local ns, id, sub_id, empty_ttl = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20
 
 --local dbg = function(...) redis.call('echo', table.concat({...})); end
 
 redis.call('echo', ' ######## SUBSCRIBER UNREGISTER SCRIPT ####### ')
-local ch=('{channel:%s}'):format(id)
+local ch=('%s{channel:%s}'):format(ns, id)
 local keys = {
   channel =     ch,
   messages =    ch..':messages',
diff --git a/debian/modules/nchan/src/store/redis/scripts/testscripts.rb b/debian/modules/nchan/src/store/redis/redis-lua-scripts/testscripts.rb
similarity index 94%
rename from debian/modules/nchan/src/store/redis/scripts/testscripts.rb
rename to debian/modules/nchan/src/store/redis/redis-lua-scripts/testscripts.rb
index 27f4f9d..739eb42 100755
--- a/debian/modules/nchan/src/store/redis/scripts/testscripts.rb
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/testscripts.rb
@@ -12,6 +12,7 @@ require "pry"
 REDIS_HOST="127.0.0.1"
 REDIS_PORT=8537
 REDIS_DB=1
+NAMESPACE="nchan:"
 
 class PubSubTest < Minitest::Test
   @@redis=nil
@@ -121,14 +122,14 @@ class PubSubTest < Minitest::Test
     end
 
     msg.time= Time.now.utc.to_i unless msg.time
-    msg_tag, channel_info=redis.evalsha hashes[:publish], [], [msg.chid, msg.time, msg.data, msg.content_type, msg.eventsource_event, msg.ttl, msg.max_buf_size]
+    msg_tag, channel_info=redis.evalsha hashes[:publish], [], [NAMESPACE, msg.chid, msg.time, msg.data, msg.content_type, msg.eventsource_event, msg.ttl, msg.max_buf_size]
     msg.tag=msg_tag
     msg.channel_info=channel_info
     return msg
   end
 
   def delete(ch_id)
-    redis.evalsha hashes[:delete], [], [ch_id]
+    redis.evalsha hashes[:delete], [], [NAMESPACE, ch_id]
   end
 
   def getmsg(msg, opt={})
@@ -146,7 +147,7 @@ class PubSubTest < Minitest::Test
     traverse_order=((Hash === opt) && opt[:getfirst]) ? 'FIFO' : 'FILO'
     msg_tag=0 if msg_time && msg_tag.nil?
     #binding.pry
-    status, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, msg_data, msg_content_type, msg_eventsource_event, subscriber_count = redis.evalsha hashes[:get_message], [], [ch_id, msg_time || 0, msg_tag || 0, traverse_order, 15 ]
+    status, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, msg_data, msg_content_type, msg_eventsource_event, subscriber_count = redis.evalsha hashes[:get_message], [], [NAMESPACE, ch_id, msg_time || 0, msg_tag || 0, traverse_order, 15 ]
     if status == 404
       return nil
     elsif status == 418 #not ready
diff --git a/debian/modules/nchan/src/store/redis/redis_lua_commands.c b/debian/modules/nchan/src/store/redis/redis_lua_commands.c
new file mode 100644
index 0000000..ed12b06
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis_lua_commands.c
@@ -0,0 +1,1036 @@
+#include "redis_lua_commands.h"
+
+redis_lua_scripts_t redis_lua_scripts = {
+  {"add_fakesub", "fd2ee193a2518982e607f99623c8200849b21098",
+   "--input:  keys: [], values: [namespace, channel_id, number, time]\n"
+   "--output: current_fake_subscribers\n"
+   "  \n"
+   "redis.call('echo', ' ####### FAKESUBS ####### ')\n"
+   "local ns=ARGV[1]\n"
+   "local id=ARGV[2]\n"
+   "local num=tonumber(ARGV[3])\n"
+   "local time = tonumber(ARGV[4])\n"
+   "if num==nil then\n"
+   "  return {err=\"fakesub number not given\"}\n"
+   "end\n"
+   "\n"
+   "local chan_key = ('%s{channel:%s}'):format(ns, id)\n"
+   "\n"
+   "local res = redis.pcall('EXISTS', chan_key)\n"
+   "if type(res) == \"table\" and res[\"err\"] then\n"
+   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(num, id)}\n"
+   "end\n"
+   "\n"
+   "local exists = res == 1\n"
+   "\n"
+   "local cur = 0\n"
+   "\n"
+   "if exists or (not exists and num > 0) then\n"
+   "  cur = redis.call('HINCRBY', chan_key, 'fake_subscribers', num)\n"
+   "  if time then\n"
+   "    redis.call('HSET', chan_key, 'last_seen_fake_subscriber', time)\n"
+   "  end\n"
+   "  if not exists then\n"
+   "    redis.call('EXPIRE', chan_key, 5) --something small\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "return cur\n"},
+
+  {"channel_keepalive", "7e213d514486887425875dc9835564edfe14e677",
+   "--input:  keys: [], values: [namespace, channel_id, ttl]\n"
+   "-- ttl is for when there are no messages but at least 1 subscriber.\n"
+   "--output: seconds until next keepalive is expected, or -1 for \"let it disappear\"\n"
+   "redis.call('ECHO', ' ####### CHANNEL KEEPALIVE ####### ')\n"
+   "local ns=ARGV[1]\n"
+   "local id=ARGV[2]\n"
+   "local ttl=tonumber(ARGV[3])\n"
+   "if not ttl then\n"
+   "  return {err=\"Invalid channel keepalive TTL (2nd arg)\"}\n"
+   "end\n"
+   "\n"
+   "local random_safe_next_ttl = function(ttl)\n"
+   "  return math.floor(ttl/2 + ttl/2.1 * math.random())\n"
+   "end\n"
+   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
+   "local key={\n"
+   "  channel=   ch, --hash\n"
+   "  messages=  ch..':messages', --list\n"
+   "}\n"
+   "  \n"
+   "local subs_count = tonumber(redis.call('HGET', key.channel, \"subscribers\")) or 0\n"
+   "local msgs_count = tonumber(redis.call('LLEN', key.messages)) or 0\n"
+   "local actual_ttl = tonumber(redis.call('TTL',  key.channel))\n"
+   "\n"
+   "if subs_count > 0 then\n"
+   "  if msgs_count > 0 and actual_ttl > ttl then\n"
+   "    return random_safe_next_ttl(actual_ttl)\n"
+   "  end\n"
+   "  --refresh ttl\n"
+   "  redis.call('expire', key.channel, ttl);\n"
+   "  redis.call('expire', key.messages, ttl);\n"
+   "  return random_safe_next_ttl(ttl)\n"
+   "else\n"
+   "  return -1\n"
+   "end\n"},
+
+  {"delete", "a6008241827ea3bdec215b4460e96ad498cad8cb",
+   "--input: keys: [],  values: [ namespace, channel_id ]\n"
+   "--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil\n"
+   "-- delete this channel and all its messages\n"
+   "local ns = ARGV[1]\n"
+   "local id = ARGV[2]\n"
+   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
+   "local key_msg=    ch..':msg:%s' --not finished yet\n"
+   "local key_channel=ch\n"
+   "local messages=   ch..':messages'\n"
+   "local subscribers=ch..':subscribers'\n"
+   "local pubsub=     ch..':pubsub'\n"
+   "\n"
+   "redis.call('echo', ' ####### DELETE #######')\n"
+   "local num_messages = 0\n"
+   "--delete all the messages right now mister!\n"
+   "local msg\n"
+   "while true do\n"
+   "  msg = redis.call('LPOP', messages)\n"
+   "  if msg then\n"
+   "    num_messages = num_messages + 1\n"
+   "    redis.call('DEL', key_msg:format(msg))\n"
+   "  else\n"
+   "    break\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local del_msgpack =cmsgpack.pack({\"alert\", \"delete channel\", id})\n"
+   "for k,channel_key in pairs(redis.call('SMEMBERS', subscribers)) do\n"
+   "  redis.call('PUBLISH', channel_key, del_msgpack)\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "local channel = nil\n"
+   "if redis.call('EXISTS', key_channel) ~= 0 then\n"
+   "  channel = tohash(redis.call('hgetall', key_channel))\n"
+   "  --leave some crumbs behind showing this channel was just deleted\n"
+   "  redis.call('setex', ch..\":deleted\", 5, 1)  \n"
+   "end\n"
+   "\n"
+   "redis.call('DEL', key_channel, messages, subscribers)\n"
+   "redis.call('PUBLISH', pubsub, del_msgpack)\n"
+   "\n"
+   "if channel then\n"
+   "  return {\n"
+   "    tonumber(channel.ttl) or 0,\n"
+   "    tonumber(channel.last_seen_fake_subscriber) or 0,\n"
+   "    tonumber(channel.fake_subscribers or channel.subscribers) or 0,\n"
+   "    channel.current_message or \"\",\n"
+   "    tonumber(num_messages)\n"
+   "  }\n"
+   "else\n"
+   "  return nil\n"
+   "end\n"},
+
+  {"find_channel", "d027f1bc80eb1afc33f909759dfb7428cf1f9063",
+   "--input: keys: [],  values: [ namespace, channel_id ]\n"
+   "--output: channel_hash {ttl, time_last_seen, subscribers, last_channel_id, messages} or nil\n"
+   "-- finds and return the info hash of a channel, or nil of channel not found\n"
+   "local ns = ARGV[1]\n"
+   "local id = ARGV[2]\n"
+   "local channel_key = ('%s{channel:%s}'):format(ns, id)\n"
+   "local messages_key = channel_key..':messages'\n"
+   "\n"
+   "redis.call('echo', ' #######  FIND_CHANNEL ######## ')\n"
+   "\n"
+   "--check old entries\n"
+   "local oldestmsg=function(list_key, old_fmt)\n"
+   "  local old, oldkey\n"
+   "  local n, del=0,0\n"
+   "  while true do\n"
+   "    n=n+1\n"
+   "    old=redis.call('lindex', list_key, -1)\n"
+   "    if old then\n"
+   "      oldkey=old_fmt:format(old)\n"
+   "      local ex=redis.call('exists', oldkey)\n"
+   "      if ex==1 then\n"
+   "        return oldkey\n"
+   "      else\n"
+   "        redis.call('rpop', list_key)\n"
+   "        del=del+1\n"
+   "      end\n"
+   "    else\n"
+   "      break\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      --dbg(k..\"=\"..v)\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "if redis.call('EXISTS', channel_key) ~= 0 then\n"
+   "  local ch = tohash(redis.call('hgetall', channel_key))\n"
+   "    \n"
+   "  local msgs_count\n"
+   "  if redis.call(\"TYPE\", messages_key)['ok'] == 'list' then\n"
+   "    oldestmsg(messages_key, channel_key ..':msg:%s')\n"
+   "    msgs_count = tonumber(redis.call('llen', messages_key))\n"
+   "  else\n"
+   "    msgs_count = 0\n"
+   "  end\n"
+   "  \n"
+   "  return {\n"
+   "    tonumber(ch.ttl) or 0,\n"
+   "    tonumber(ch.last_seen_fake_subscriber) or 0,\n"
+   "    tonumber(ch.fake_subscribers or ch.subscribers) or 0,\n"
+   "    ch.current_message or \"\",\n"
+   "    msgs_count\n"
+   "  }\n"
+   "else\n"
+   "  return nil\n"
+   "end\n"},
+
+  {"get_message", "fb9c46d33b3798a11d4eca6e0f7a3f92beba8685",
+   "--input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]\n"
+   "--output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count\n"
+   "-- no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent\n"
+   "-- create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.\n"
+   "-- result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available\n"
+   "local ns, id, time, tag, subscribe_if_current = ARGV[1], ARGV[2], tonumber(ARGV[3]), tonumber(ARGV[4])\n"
+   "local no_msgid_order=ARGV[5]\n"
+   "local create_channel_ttl=tonumber(ARGV[6]) or 0\n"
+   "local msg_id\n"
+   "if time and time ~= 0 and tag then\n"
+   "  msg_id=(\"%s:%s\"):format(time, tag)\n"
+   "end\n"
+   "\n"
+   "if redis.replicate_commands then\n"
+   "  redis.replicate_commands()\n"
+   "end\n"
+   "\n"
+   "-- This script has gotten big and ugly, but there are a few good reasons \n"
+   "-- to keep it big and ugly. It needs to do a lot of stuff atomically, and \n"
+   "-- redis doesn't do includes. It could be generated pre-insertion into redis, \n"
+   "-- but then error messages become less useful, complicating debugging. If you \n"
+   "-- have a solution to this, please help.\n"
+   "local ch=('%s{channel:%s}'):format(ns, id)\n"
+   "local msgkey_fmt=ch..':msg:%s'\n"
+   "local key={\n"
+   "  next_message= msgkey_fmt, --hash\n"
+   "  message=      msgkey_fmt, --hash\n"
+   "  channel=      ch, --hash\n"
+   "  messages=     ch..':messages', --list\n"
+   "--  pubsub=       ch..':subscribers:', --set\n"
+   "}\n"
+   "\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "\n"
+   "redis.call('echo', ' #######  GET_MESSAGE ######## ')\n"
+   "\n"
+   "local oldestmsg=function(list_key, old_fmt)\n"
+   "  local old, oldkey\n"
+   "  local n, del=0,0\n"
+   "  while true do\n"
+   "    n=n+1\n"
+   "    old=redis.call('lindex', list_key, -1)\n"
+   "    if old then\n"
+   "      oldkey=old_fmt:format(old)\n"
+   "      local ex=redis.call('exists', oldkey)\n"
+   "      if ex==1 then\n"
+   "        return oldkey\n"
+   "      else\n"
+   "        redis.call('rpop', list_key)\n"
+   "        del=del+1\n"
+   "      end \n"
+   "    else\n"
+   "      --dbg(list_key, \" is empty\")\n"
+   "      break\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      --dbg(k..\"=\"..v)\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "if no_msgid_order ~= 'FIFO' then\n"
+   "  no_msgid_order = 'FILO'\n"
+   "end\n"
+   "\n"
+   "local channel = tohash(redis.call('HGETALL', key.channel))\n"
+   "local new_channel = false\n"
+   "if next(channel) == nil then\n"
+   "  if create_channel_ttl==0 then\n"
+   "    return {404, nil}\n"
+   "  end\n"
+   "  redis.call('HSET', key.channel, 'time', time)\n"
+   "  redis.call('EXPIRE', key.channel, create_channel_ttl)\n"
+   "  channel = {time=time}\n"
+   "  new_channel = true\n"
+   "end\n"
+   "\n"
+   "local subs_count = tonumber(channel.subscribers)\n"
+   "\n"
+   "if msg_id==nil then\n"
+   "  local found_msg_key\n"
+   "  if new_channel then\n"
+   "    --dbg(\"new channel\")\n"
+   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
+   "  else\n"
+   "    --dbg(\"no msg id given, ord=\"..no_msgid_order)\n"
+   "    \n"
+   "    if no_msgid_order == 'FIFO' then --most recent message\n"
+   "      --dbg(\"get most recent\")\n"
+   "      found_msg_key=channel.current_message\n"
+   "    elseif no_msgid_order == 'FILO' then --oldest message\n"
+   "      --dbg(\"get oldest\")\n"
+   "      found_msg_key=oldestmsg(key.messages, msgkey_fmt)\n"
+   "    end\n"
+   "    \n"
+   "    if found_msg_key == nil then\n"
+   "      --we await a message\n"
+   "      return {418, \"\", \"\", \"\", \"\", subs_count}\n"
+   "    else\n"
+   "      local msg=tohash(redis.call('HGETALL', found_msg_key))\n"
+   "      if not next(msg) then --empty\n"
+   "        return {404, \"\", \"\", \"\", \"\", subs_count}\n"
+   "      else\n"
+   "        --dbg((\"found msg %s:%s  after %s:%s\"):format(tostring(msg.time), tostring(msg.tag), tostring(time), tostring(tag)))\n"
+   "        local ttl = redis.call('TTL', found_msg_key)\n"
+   "        return {200, ttl, tonumber(msg.time) or \"\", tonumber(msg.tag) or \"\", tonumber(msg.prev_time) or \"\", tonumber(msg.prev_tag) or \"\", msg.data or \"\", msg.content_type or \"\", msg.eventsource_event or \"\", tonumber(msg.compression or 0), subs_count}\n"
+   "      end\n"
+   "    end\n"
+   "  end\n"
+   "else\n"
+   "  if msg_id and channel.current_message == msg_id\n"
+   "   or not channel.current_message then\n"
+   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
+   "  end\n"
+   "\n"
+   "  key.message=key.message:format(msg_id)\n"
+   "  local msg=tohash(redis.call('HGETALL', key.message))\n"
+   "\n"
+   "  if next(msg) == nil then -- no such message. it might've expired, or maybe it was never there\n"
+   "    --dbg(\"MESSAGE NOT FOUND\")\n"
+   "    return {404, nil}\n"
+   "  end\n"
+   "\n"
+   "  local next_msg, next_msgtime, next_msgtag\n"
+   "  if not msg.next then --this should have been taken care of by the channel.current_message check\n"
+   "    --dbg(\"NEXT MESSAGE KEY NOT PRESENT. ERROR, ERROR!\")\n"
+   "    return {404, nil}\n"
+   "  else\n"
+   "    --dbg(\"NEXT MESSAGE KEY PRESENT: \" .. msg.next)\n"
+   "    key.next_message=key.next_message:format(msg.next)\n"
+   "    if redis.call('EXISTS', key.next_message)~=0 then\n"
+   "      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event, ncompression=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))\n"
+   "      local ttl = redis.call('TTL', key.next_message)\n"
+   "      --dbg((\"found msg2 %i:%i  after %i:%i\"):format(ntime, ntag, time, tag))\n"
+   "      return {200, ttl, tonumber(ntime) or \"\", tonumber(ntag) or \"\", tonumber(prev_time) or \"\", tonumber(prev_tag) or \"\", ndata or \"\", ncontenttype or \"\", neventsource_event or \"\", ncompression or 0, subs_count}\n"
+   "    else\n"
+   "      --dbg(\"NEXT MESSAGE NOT FOUND\")\n"
+   "      return {404, nil}\n"
+   "    end\n"
+   "  end\n"
+   "end\n"},
+
+  {"get_message_from_key", "304efcd42590f99e0016686572530defd3de1383",
+   "--input:  keys: [message_key], values: []\n"
+   "--output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count\n"
+   "local key = KEYS[1]\n"
+   "\n"
+   "local ttl = redis.call('TTL', key)\n"
+   "local time, tag, prev_time, prev_tag, data, content_type, es_event, compression = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))\n"
+   "\n"
+   "return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or \"\", content_type or \"\", es_event or \"\", tonumber(compression or 0)}\n"},
+
+  {"publish", "be28281114137d8e85a25a913c50bed2e93d0c7d",
+   "--input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, optimize_target]\n"
+   "--output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?\n"
+   "\n"
+   "local ns, id=ARGV[1], ARGV[2]\n"
+   "\n"
+   "local msg = {}\n"
+   "\n"
+   "local store_at_most_n_messages = tonumber(ARGV[9])\n"
+   "if store_at_most_n_messages == nil or store_at_most_n_messages == \"\" then\n"
+   "  return {err=\"Argument 9, max_msg_buf_size, can't be empty\"}\n"
+   "end\n"
+   "if store_at_most_n_messages == 0 then\n"
+   "  msg.unbuffered = 1\n"
+   "end\n"
+   "\n"
+   "local msgpacked_pubsub_cutoff = tonumber(ARGV[10])\n"
+   "\n"
+   "local optimize_target = tonumber(ARGV[11]) == 2 and \"bandwidth\" or \"cpu\"\n"
+   "\n"
+   "local time\n"
+   "if optimize_target == \"cpu\" and redis.replicate_commands then\n"
+   "  -- we're on redis >= 3.2. We can use We can use 'script effects replication' to allow\n"
+   "  -- writing nondeterministic command values like TIME.\n"
+   "  -- That's exactly what we want to do, use Redis' TIME rather than the given time from Nginx\n"
+   "  -- Also, it's more efficient to replicate just the commands in this case rather than run the whole script\n"
+   "  redis.replicate_commands()\n"
+   "  time = tonumber(redis.call('TIME')[1])\n"
+   "else\n"
+   "  --fallback to the provided time\n"
+   "  time = tonumber(ARGV[3])\n"
+   "end\n"
+   "\n"
+   "msg.id=nil\n"
+   "msg.data= ARGV[4]\n"
+   "msg.content_type=ARGV[5]\n"
+   "msg.eventsource_event=ARGV[6]\n"
+   "msg.compression=tonumber(ARGV[7])\n"
+   "msg.ttl= tonumber(ARGV[8])\n"
+   "msg.time= time\n"
+   "msg.tag= 0\n"
+   "\n"
+   "if msg.ttl == 0 then\n"
+   "  msg.ttl = 126144000 --4 years\n"
+   "end\n"
+   "\n"
+   "--[[local dbg = function(...)\n"
+   "  local arg = {...}\n"
+   "  for i = 1, #arg do\n"
+   "    arg[i]=tostring(arg[i])\n"
+   "  end\n"
+   "  redis.call('echo', table.concat(arg, \", \"))\n"
+   "end]]\n"
+   "\n"
+   "if type(msg.content_type)=='string' and msg.content_type:find(':') then\n"
+   "  return {err='Message content-type cannot contain \":\" character.'}\n"
+   "end\n"
+   "\n"
+   "redis.call('echo', ' #######  PUBLISH   ######## ')\n"
+   "\n"
+   "-- sets all fields for a hash from a dictionary\n"
+   "local hmset = function (key, dict)\n"
+   "  if next(dict) == nil then return nil end\n"
+   "  local bulk = {}\n"
+   "  for k, v in pairs(dict) do\n"
+   "    table.insert(bulk, k)\n"
+   "    table.insert(bulk, v)\n"
+   "  end\n"
+   "  return redis.call('HMSET', key, unpack(bulk))\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
+   "local msg_fmt = ch..':msg:%s'\n"
+   "local key={\n"
+   "  last_message= msg_fmt, --not finished yet\n"
+   "  message=      msg_fmt, --not finished yet\n"
+   "  channel=      ch,\n"
+   "  messages=     ch..':messages',\n"
+   "  subscribers=  ch..':subscribers'\n"
+   "}\n"
+   "local channel_pubsub = ch..':pubsub'\n"
+   "\n"
+   "local new_channel\n"
+   "local channel\n"
+   "if redis.call('EXISTS', key.channel) ~= 0 then\n"
+   "  channel=tohash(redis.call('HGETALL', key.channel))\n"
+   "  channel.max_stored_messages = tonumber(channel.max_stored_messages)\n"
+   "end\n"
+   "\n"
+   "if channel~=nil then\n"
+   "  --dbg(\"channel present\")\n"
+   "  if channel.current_message ~= nil then\n"
+   "    --dbg(\"channel current_message present\")\n"
+   "    key.last_message=key.last_message:format(channel.current_message, id)\n"
+   "  else\n"
+   "    --dbg(\"channel current_message absent\")\n"
+   "    key.last_message=nil\n"
+   "  end\n"
+   "  new_channel=false\n"
+   "else\n"
+   "  --dbg(\"channel missing\")\n"
+   "  channel={}\n"
+   "  new_channel=true\n"
+   "  key.last_message=nil\n"
+   "end\n"
+   "\n"
+   "--set new message id\n"
+   "local lastmsg, lasttime, lasttag\n"
+   "if key.last_message then\n"
+   "  lastmsg = redis.call('HMGET', key.last_message, 'time', 'tag')\n"
+   "  lasttime, lasttag = tonumber(lastmsg[1]), tonumber(lastmsg[2])\n"
+   "  --dbg(\"New message id: last_time \", lasttime, \" last_tag \", lasttag, \" msg_time \", msg.time)\n"
+   "  if lasttime and tonumber(lasttime) > tonumber(msg.time) then\n"
+   "    redis.log(redis.LOG_WARNING, \"Nchan: message for \" .. id .. \" arrived a little late and may be delivered out of order. Redis must be very busy, or the Nginx servers do not have their times synchronized.\")\n"
+   "    msg.time = lasttime\n"
+   "    time = lasttime\n"
+   "  end\n"
+   "  if lasttime and lasttime==msg.time then\n"
+   "    msg.tag=lasttag+1\n"
+   "  end\n"
+   "  msg.prev_time = lasttime\n"
+   "  msg.prev_tag = lasttag\n"
+   "else\n"
+   "  msg.prev_time = 0\n"
+   "  msg.prev_tag = 0\n"
+   "end\n"
+   "msg.id=('%i:%i'):format(msg.time, msg.tag)\n"
+   "\n"
+   "key.message=key.message:format(msg.id)\n"
+   "if redis.call('EXISTS', key.message) ~= 0 then\n"
+   "  local hash_tostr=function(h)\n"
+   "    local tt = {}\n"
+   "    for k, v in pairs(h) do\n"
+   "      table.insert(tt, (\"%s: %s\"):format(k, v))\n"
+   "    end\n"
+   "    return \"{\" .. table.concat(tt,\", \") .. \"}\"\n"
+   "  end\n"
+   "  local existing_msg = tohash(redis.call('HGETALL', key.message))\n"
+   "  local errmsg = \"Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s. dbg: channel: %s, messages_key: %s, msglist: %s, msg: %s, msg_expire: %s.\"\n"
+   "  errmsg = errmsg:format(key.message, id, msg.id or \"-\", time or \"-\", lasttime or \"-\", lasttag or \"-\", hash_tostr(channel), key.messages, \"[\"..table.concat(redis.call('LRANGE', key.messages, 0, -1), \", \")..\"]\", hash_tostr(existing_msg), redis.call('TTL', key.message))\n"
+   "  return {err=errmsg}\n"
+   "end\n"
+   "\n"
+   "msg.prev=channel.current_message\n"
+   "if key.last_message and redis.call('exists', key.last_message) == 1 then\n"
+   "  redis.call('HSET', key.last_message, 'next', msg.id)\n"
+   "end\n"
+   "\n"
+   "--update channel\n"
+   "redis.call('HSET', key.channel, 'current_message', msg.id)\n"
+   "if msg.prev then\n"
+   "  redis.call('HSET', key.channel, 'prev_message', msg.prev)\n"
+   "end\n"
+   "if time then\n"
+   "  redis.call('HSET', key.channel, 'time', time)\n"
+   "end\n"
+   "\n"
+   "local message_len_changed = false\n"
+   "if channel.max_stored_messages ~= store_at_most_n_messages then\n"
+   "  channel.max_stored_messages = store_at_most_n_messages\n"
+   "  message_len_changed = true\n"
+   "  redis.call('HSET', key.channel, 'max_stored_messages', store_at_most_n_messages)\n"
+   "  --dbg(\"channel.max_stored_messages was not set, but is now \", store_at_most_n_messages)\n"
+   "end\n"
+   "\n"
+   "--write message\n"
+   "hmset(key.message, msg)\n"
+   "\n"
+   "\n"
+   "--check old entries\n"
+   "local oldestmsg=function(list_key, old_fmt)\n"
+   "  local old, oldkey\n"
+   "  local n, del=0,0\n"
+   "  while true do\n"
+   "    n=n+1\n"
+   "    old=redis.call('lindex', list_key, -1)\n"
+   "    if old then\n"
+   "      oldkey=old_fmt:format(old)\n"
+   "      local ex=redis.call('exists', oldkey)\n"
+   "      if ex==1 then\n"
+   "        return oldkey\n"
+   "      else\n"
+   "        redis.call('rpop', list_key)\n"
+   "        del=del+1\n"
+   "      end\n"
+   "    else\n"
+   "      break\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local max_stored_msgs = channel.max_stored_messages or -1\n"
+   "\n"
+   "if max_stored_msgs < 0 then --no limit\n"
+   "  oldestmsg(key.messages, msg_fmt)\n"
+   "  redis.call('LPUSH', key.messages, msg.id)\n"
+   "elseif max_stored_msgs > 0 then\n"
+   "  local stored_messages = tonumber(redis.call('LLEN', key.messages))\n"
+   "  redis.call('LPUSH', key.messages, msg.id)\n"
+   "  -- Reduce the message length if necessary\n"
+   "  local dump_message_ids = redis.call('LRANGE', key.messages, max_stored_msgs, stored_messages);\n"
+   "  if dump_message_ids then\n"
+   "    for _, msgid in ipairs(dump_message_ids) do\n"
+   "      redis.call('DEL', msg_fmt:format(msgid))\n"
+   "    end\n"
+   "  end\n"
+   "  redis.call('LTRIM', key.messages, 0, max_stored_msgs - 1)\n"
+   "  oldestmsg(key.messages, msg_fmt)\n"
+   "end\n"
+   "\n"
+   "\n"
+   "--set expiration times for all the things\n"
+   "local channel_ttl = tonumber(redis.call('TTL',  key.channel))\n"
+   "redis.call('EXPIRE', key.message, msg.ttl)\n"
+   "if msg.ttl + 1 > channel_ttl then -- a little extra time for failover weirdness for 1-second TTL messages\n"
+   "  redis.call('EXPIRE', key.channel, msg.ttl + 1)\n"
+   "  redis.call('EXPIRE', key.messages, msg.ttl + 1)\n"
+   "  redis.call('EXPIRE', key.subscribers, msg.ttl + 1)\n"
+   "end\n"
+   "\n"
+   "--publish message\n"
+   "local unpacked\n"
+   "\n"
+   "if msg.unbuffered or #msg.data < msgpacked_pubsub_cutoff then\n"
+   "  unpacked= {\n"
+   "    \"msg\",\n"
+   "    msg.ttl or 0,\n"
+   "    msg.time,\n"
+   "    tonumber(msg.tag) or 0,\n"
+   "    (msg.unbuffered and 0 or msg.prev_time) or 0,\n"
+   "    (msg.unbuffered and 0 or msg.prev_tag) or 0,\n"
+   "    msg.data or \"\",\n"
+   "    msg.content_type or \"\",\n"
+   "    msg.eventsource_event or \"\",\n"
+   "    msg.compression or 0\n"
+   "  }\n"
+   "else\n"
+   "  unpacked= {\n"
+   "    \"msgkey\",\n"
+   "    msg.time,\n"
+   "    tonumber(msg.tag) or 0,\n"
+   "    key.message\n"
+   "  }\n"
+   "end\n"
+   "\n"
+   "if message_len_changed then\n"
+   "  unpacked[1] = \"max_msgs+\" .. unpacked[1]\n"
+   "  table.insert(unpacked, 2, tonumber(channel.max_stored_messages))\n"
+   "end\n"
+   "\n"
+   "local msgpacked\n"
+   "\n"
+   "--dbg((\"Stored message with id %i:%i => %s\"):format(msg.time, msg.tag, msg.data))\n"
+   "\n"
+   "--we used to publish conditionally on subscribers on the Redis pubsub channel\n"
+   "--but now that we're subscribing to slaves this is not possible\n"
+   "--so just PUBLISH always.\n"
+   "msgpacked = cmsgpack.pack(unpacked)\n"
+   "redis.call('PUBLISH', channel_pubsub, msgpacked)\n"
+   "\n"
+   "local num_messages = redis.call('llen', key.messages)\n"
+   "\n"
+   "--dbg(\"channel \", id, \" ttl: \",channel.ttl, \", subscribers: \", channel.subscribers, \"(fake: \", channel.fake_subscribers or \"nil\", \"), messages: \", num_messages)\n"
+   "local ch = {\n"
+   "  tonumber(channel.ttl or msg.ttl),\n"
+   "  tonumber(channel.last_seen_fake_subscriber) or 0,\n"
+   "  tonumber(channel.fake_subscribers or channel.subscribers) or 0,\n"
+   "  msg.time and msg.time and (\"%i:%i\"):format(msg.time, msg.tag) or \"\",\n"
+   "  tonumber(num_messages)\n"
+   "}\n"
+   "\n"
+   "return {ch, new_channel}\n"},
+
+  {"publish_status", "2f2ce1443b22c8c9cf069d5588bad4bab58d70aa",
+   "--input:  keys: [], values: [namespace, channel_id, status_code]\n"
+   "--output: current_subscribers\n"
+   "\n"
+   "redis.call('echo', ' ####### PUBLISH STATUS ####### ')\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "local ns, id=ARGV[1], ARGV[2]\n"
+   "local code=tonumber(ARGV[3])\n"
+   "if code==nil then\n"
+   "  return {err=\"non-numeric status code given, bailing!\"}\n"
+   "end\n"
+   "\n"
+   "local pubmsg = \"status:\"..code\n"
+   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
+   "local subs_key = ch..':subscribers'\n"
+   "local chan_key = ch\n"
+   "--local channel_pubsub = ch..':pubsub'\n"
+   "\n"
+   "for k,channel_key in pairs(redis.call('SMEMBERS', subs_key)) do\n"
+   "  --not efficient, but useful for a few short-term subscriptions\n"
+   "  redis.call('PUBLISH', channel_key, pubmsg)\n"
+   "end\n"
+   "--clear short-term subscriber list\n"
+   "redis.call('DEL', subs_key)\n"
+   "--now publish to the efficient channel\n"
+   "--what?... redis.call('PUBLISH', channel_pubsub, pubmsg)\n"
+   "return redis.call('HGET', chan_key, 'subscribers') or 0\n"},
+
+  {"rsck", "2fca046fa783d6cc25e493c993c407e59998e6e8",
+   "--redis-store consistency check\n"
+   "local ns = ARGV[1]\n"
+   "if ns and #ns > 0 then\n"
+   "  ns = ns..\":\"\n"
+   "end\n"
+   "\n"
+   "local concat = function(...)\n"
+   "  local arg = {...}\n"
+   "  for i = 1, #arg do\n"
+   "    arg[i]=tostring(arg[i])\n"
+   "  end\n"
+   "  return table.concat(arg, \" \")\n"
+   "end\n"
+   "local dbg =function(...) redis.call('echo', concat(...)); end\n"
+   "local errors={}\n"
+   "local err = function(...)\n"
+   "  local msg = concat(...)\n"
+   "  dbg(msg)\n"
+   "  table.insert(errors, msg)\n"
+   "end\n"
+   "\n"
+   "local tp=function(t, max_n)\n"
+   "  local tt={}\n"
+   "  for i, v in pairs(t) do\n"
+   "    local val = tostring(v)\n"
+   "    if max_n and #val > max_n then\n"
+   "      val = val:sub(1, max_n) .. \"[...]\"\n"
+   "    end\n"
+   "    table.insert(tt, tostring(i) .. \": \" .. val)\n"
+   "  end\n"
+   "  return \"{\" .. table.concat(tt, \", \") .. \"}\"\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "local type_is = function(key, _type, description)\n"
+   "  local t = redis.call(\"TYPE\", key)['ok']\n"
+   "  local type_ok = true\n"
+   "  if type(_type) == \"table\" then\n"
+   "    type_ok = false\n"
+   "    for i, v in pairs(_type) do\n"
+   "      if v == _type then\n"
+   "        type_ok = true\n"
+   "        break\n"
+   "      end\n"
+   "    end\n"
+   "  elseif t ~= _type then\n"
+   "    err((description or \"\"), key, \"should be type \" .. _type .. \", is\", t)\n"
+   "    type_ok = false\n"
+   "  end\n"
+   "  return type_ok, t\n"
+   "end\n"
+   "\n"
+   "local known_msgs_count=0\n"
+   "local known_msgkeys = {}\n"
+   "local known_channel_keys = {}\n"
+   "\n"
+   "\n"
+   "local k = {\n"
+   "  channel = function(chid)\n"
+   "    return (\"%s{channel:%s}\"):format(chid)\n"
+   "  end,\n"
+   "  msg = function (chid, msgid)\n"
+   "    return (\"%s:msg:%s\"):format(k.channel(chid), msgid)\n"
+   "  end,\n"
+   "  messages = function(chid)\n"
+   "    return k.channel(chid) .. \":messages\"\n"
+   "  end\n"
+   "}\n"
+   "\n"
+   "local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)\n"
+   "  description = description and \"msg (\" .. description ..\")\" or \"msg\"\n"
+   "  local msgkey = k.msg(chid, msgid)\n"
+   "  if not known_msgkeys[msgkey] then\n"
+   "    known_msgs_count = known_msgs_count + 1\n"
+   "  end\n"
+   "  known_msgkeys[msgkey]=true\n"
+   "  local ok, t = type_is(msgkey, {\"hash\", \"none\"}, \"message hash\")\n"
+   "  if t == \"none\" then\n"
+   "    --message is missing, but maybe it expired under normal circumstances. \n"
+   "    --check if any earlier messages are present\n"
+   "    local msgids = redis.call('LRANGE', k.messages(chid), 0, -1)\n"
+   "    local founds = 0\n"
+   "    for i=#msgids, 1, -1 do\n"
+   "      if msgids[i] == msgid then \n"
+   "        break\n"
+   "      end\n"
+   "      local thismsgkey = k.msg(chid, msgids[i])\n"
+   "      local ttt = redis.call('type', thismsgkey)['ok']\n"
+   "      redis.breakpoint()\n"
+   "      if ttt == \"hash\" then\n"
+   "        founds = founds + 1\n"
+   "      end\n"
+   "    end\n"
+   "    \n"
+   "    if founds > 0 then\n"
+   "      err(\"message\", msgkey, \"missing, with\", founds, \"prev. msgs in msg list\")\n"
+   "    end\n"
+   "    \n"
+   "  end\n"
+   "  local msg = tohash(redis.call('HGETALL', msgkey))\n"
+   "  local ttl = tonumber(redis.call('TTL', msgkey))\n"
+   "  local n = tonumber(redis.call(\"HLEN\", msgkey))\n"
+   "  if n > 0 and (msg.data == nil or msg.id == nil or msg.time == nil or msg.tag == nil)then\n"
+   "    err(\"incomplete \" .. description ..\"(ttl \"..ttl..\")\", msgkey, tp(msg))\n"
+   "    return false\n"
+   "  end\n"
+   "  if t == \"hash\" and tonumber(ttl) < 0 then\n"
+   "    err(\"message\", msgkey, \"ttl =\", ttl)\n"
+   "  end\n"
+   "  if ttl ~= -2 then\n"
+   "    if prev_msgid ~= false and msg.prev ~= prev_msgid then\n"
+   "      err(description, chid, msgid, \"prev_message wrong. expected\", prev_msgid, \"got\", msg.prev)\n"
+   "    end\n"
+   "    if next_msgid ~= false and msg.next ~= next_msgid then\n"
+   "      err(description, chid, msgid, \"next_message wrong. expected\", next_msgid, \"got\", msg.next)\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local check_channel = function(id)\n"
+   "  local key={\n"
+   "    ch = k.channel(id),\n"
+   "    msgs = k.messages(id)\n"
+   "  }\n"
+   "  \n"
+   "  local ok, chkey_type = type_is(key.ch, \"hash\", \"channel hash\")\n"
+   "  if not ok then\n"
+   "    if chkey_type ~= \"none\" then\n"
+   "      err(\"unecpected channel key\", key.ch, \"type:\", chkey_type);\n"
+   "    end\n"
+   "    return false\n"
+   "  end\n"
+   "  local _, msgs_list_type = type_is(key.msgs, {\"list\", \"none\"}, \"channel messages list\")\n"
+   "  \n"
+   "  local ch = tohash(redis.call('HGETALL', key.ch))\n"
+   "  local len = tonumber(redis.call(\"HLEN\", key.ch))\n"
+   "  local ttl = tonumber(redis.call('TTL',  key.ch))\n"
+   "  if not ch.current_message or not ch.time then\n"
+   "    if msgs_list_type == \"list\" then\n"
+   "      err(\"incomplete channel (ttl \" .. ttl ..\")\", key.ch, tp(ch))\n"
+   "    end  \n"
+   "  elseif (ch.current_message or ch.prev_message) and msgs_list_type ~= \"list\" then\n"
+   "    err(\"channel\", key.ch, \"has a current_message but no message list\")\n"
+   "  end\n"
+   "  \n"
+   "  local msgids = redis.call('LRANGE', key.msgs, 0, -1)\n"
+   "  for i, msgid in ipairs(msgids) do\n"
+   "    check_msg(id, msgid, msgids[i+1], msgids[i-1], \"msglist\")\n"
+   "  end\n"
+   "  \n"
+   "  if ch.prev_message then\n"
+   "    if redis.call('LINDEX', key.msgs, 1) ~= ch.prev_message then\n"
+   "      err(\"channel\", key.ch, \"prev_message doesn't correspond to\", key.msgs, \"second list element\")\n"
+   "    end\n"
+   "    check_msg(id, ch.prev_message, false, ch.current_message, \"channel prev_message\")\n"
+   "  end\n"
+   "  if ch.current_message then\n"
+   "    if redis.call('LINDEX', key.msgs, 0) ~= ch.current_message then\n"
+   "      err(\"channel\", key.ch, \"current_message doesn't correspond to\", key.msgs, \"first list element\")\n"
+   "    end\n"
+   "    check_msg(id, ch.current_message, ch.prev_message, false, \"channel current_message\")\n"
+   "  end\n"
+   "  \n"
+   "end\n"
+   "\n"
+   "local channel_ids = {}\n"
+   "\n"
+   "for i, chkey in ipairs(redis.call(\"KEYS\", k.channel(\"*\"))) do\n"
+   "  local msgs_chid_match = chkey:match(\"^\"..k.messages(\"*\"))\n"
+   "  if msgs_chid_match then\n"
+   "    type_is(k.channel(msgs_chid_match), \"hash\", \"channel messages' corresponding hash key\")\n"
+   "  elseif not chkey:match(\":msg$\") then\n"
+   "    table.insert(channel_ids, chkey);\n"
+   "    known_channel_keys[chkey] = true\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "dbg(\"found\", #channel_ids, \"channels\")\n"
+   "for i, chkey in ipairs(channel_ids) do\n"
+   "  local chid = chkey:match(\"^\" .. k.channel(\".*\"))\n"
+   "  check_channel(chid)\n"
+   "end\n"
+   "\n"
+   "for i, msgkey in ipairs(redis.call(\"KEYS\", k.channel(\"*\")..\":msg\")) do\n"
+   "  if not known_msgkeys[msgkey] then\n"
+   "    local ok, t = type_is(msgkey, \"hash\")\n"
+   "    if ok then\n"
+   "      if not redis.call('HGET', msgkey, 'unbuffered') then\n"
+   "        err(\"orphan message\", msgkey, \"(ttl: \" .. redis.call('TTL', msgkey) .. \")\", tp(tohash(redis.call('HGETALL', msgkey)), 15))\n"
+   "      end\n"
+   "    else\n"
+   "      err(\"orphan message\", msgkey, \"wrong type\", t) \n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "if errors then\n"
+   "  table.insert(errors, 1, concat(#channel_ids, \"channels,\",known_msgs_count,\"messages found\", #errors, \"problems\"))\n"
+   "  return errors\n"
+   "else\n"
+   "  return concat(#channel_ids, \"channels,\", known_msgs_count, \"messages, all ok\")\n"
+   "end\n"},
+
+  {"subscriber_register", "0418d941e41ce9d8cb938860fd340d85c121d4cc",
+   "--input: keys: [], values: [namespace, channel_id, subscriber_id, active_ttl, time, want_channel_settings]\n"
+   "--  'subscriber_id' can be '-' for new id, or an existing id\n"
+   "--  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec\n"
+   "--output: subscriber_id, num_current_subscribers, next_keepalive_time, channel_buffer_length\n"
+   "--  'channel_buffer_length' is returned only if want_channel_settings is 1\n"
+   "\n"
+   "local ns, id, sub_id, active_ttl, time = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20, tonumber(ARGV[5])\n"
+   "local want_channel_settings = tonumber(ARGV[6]) == 1\n"
+   "\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "\n"
+   "redis.call('echo', ' ######## SUBSCRIBER REGISTER SCRIPT ####### ')\n"
+   "local ch=(\"%s{channel:%s}\"):format(ns, id)\n"
+   "local keys = {\n"
+   "  channel =     ch,\n"
+   "  messages =    ch..':messages',\n"
+   "  subscribers = ch..':subscribers'\n"
+   "}\n"
+   "\n"
+   "local setkeyttl=function(ttl)\n"
+   "  for i,v in pairs(keys) do\n"
+   "    if ttl > 0 then\n"
+   "      redis.call('expire', v, ttl)\n"
+   "    else\n"
+   "      redis.call('persist', v)\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local random_safe_next_ttl = function(ttl)\n"
+   "  return math.floor(ttl/2 + ttl/2.1 * math.random())\n"
+   "end\n"
+   "\n"
+   "local sub_count\n"
+   "\n"
+   "if sub_id == \"-\" then\n"
+   "  sub_id = tonumber(redis.call('HINCRBY', keys.channel, \"last_subscriber_id\", 1))\n"
+   "  sub_count=tonumber(redis.call('hincrby', keys.channel, 'subscribers', 1))\n"
+   "else\n"
+   "  sub_count=tonumber(redis.call('hget', keys.channel, 'subscribers'))\n"
+   "end\n"
+   "if time then\n"
+   "  redis.call('hset', keys.channel, \"last_seen_subscriber\", time)\n"
+   "end\n"
+   "\n"
+   "local next_keepalive \n"
+   "local actual_ttl = tonumber(redis.call('ttl', keys.channel))\n"
+   "if actual_ttl < active_ttl then\n"
+   "  setkeyttl(active_ttl)\n"
+   "  next_keepalive = random_safe_next_ttl(active_ttl)\n"
+   "else\n"
+   "  next_keepalive = random_safe_next_ttl(actual_ttl)\n"
+   "end\n"
+   "\n"
+   "\n"
+   "local ret = {sub_id, sub_count, next_keepalive}\n"
+   "if want_channel_settings then\n"
+   "  local max_messages = tonumber(redis.call('hget', keys.channel, 'max_stored_messages'))\n"
+   "  table.insert(ret, max_messages)\n"
+   "end\n"
+   "\n"
+   "return ret\n"},
+
+  {"subscriber_unregister", "a98e07b21485951a7d34cf80736e53db1b6e87a6",
+   "--input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]\n"
+   "-- 'subscriber_id' is an existing id\n"
+   "-- 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec\n"
+   "--output: subscriber_id, num_current_subscribers\n"
+   "\n"
+   "local ns, id, sub_id, empty_ttl = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20\n"
+   "\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "\n"
+   "redis.call('echo', ' ######## SUBSCRIBER UNREGISTER SCRIPT ####### ')\n"
+   "local ch=('%s{channel:%s}'):format(ns, id)\n"
+   "local keys = {\n"
+   "  channel =     ch,\n"
+   "  messages =    ch..':messages',\n"
+   "  subscribers = ch..':subscribers',\n"
+   "}\n"
+   "\n"
+   "local setkeyttl=function(ttl)\n"
+   "  for i,v in pairs(keys) do\n"
+   "    if ttl > 0 then\n"
+   "      redis.call('expire', v, ttl)\n"
+   "    elseif ttl < 0 then\n"
+   "      redis.call('persist', v)\n"
+   "    else\n"
+   "      redis.call('del', v)\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local sub_count = 0\n"
+   "\n"
+   "local res = redis.pcall('EXISTS', keys.channel)\n"
+   "if type(res) == \"table\" and res[\"err\"] then\n"
+   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(empty_ttl, id)}\n"
+   "end\n"
+   "\n"
+   "if res ~= 0 then\n"
+   "   sub_count = redis.call('hincrby', keys.channel, 'subscribers', -1)\n"
+   "\n"
+   "  if sub_count == 0 and tonumber(redis.call('LLEN', keys.messages)) == 0 then\n"
+   "    setkeyttl(empty_ttl)\n"
+   "  elseif sub_count < 0 then\n"
+   "    return {err=\"Subscriber count for channel \" .. id .. \" less than zero: \" .. sub_count}\n"
+   "  end\n"
+   "else\n"
+   "  --dbg(\"channel \", id, \" already gone\")\n"
+   "end\n"
+   "\n"
+   "return {sub_id, sub_count}\n"}
+};
+const int redis_lua_scripts_count=11;
diff --git a/debian/modules/nchan/src/store/redis/redis_lua_commands.h b/debian/modules/nchan/src/store/redis/redis_lua_commands.h
index 6f4477d..76fb7b9 100644
--- a/debian/modules/nchan/src/store/redis/redis_lua_commands.h
+++ b/debian/modules/nchan/src/store/redis/redis_lua_commands.h
@@ -8,1029 +8,62 @@ typedef struct {
 } redis_lua_script_t;
 
 typedef struct {
-  //input:  keys: [], values: [channel_id, number]
+  //input:  keys: [], values: [namespace, channel_id, number, time]
   //output: current_fake_subscribers
   redis_lua_script_t add_fakesub;
 
-  //input:  keys: [], values: [channel_id, ttl]
+  //input:  keys: [], values: [namespace, channel_id, ttl]
   // ttl is for when there are no messages but at least 1 subscriber.
   //output: seconds until next keepalive is expected, or -1 for "let it disappear"
   redis_lua_script_t channel_keepalive;
 
-  //input: keys: [],  values: [ channel_id ]
+  //input: keys: [],  values: [ namespace, channel_id ]
   //output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
   // delete this channel and all its messages
   redis_lua_script_t delete;
 
-  //input: keys: [],  values: [ channel_id ]
-  //output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
+  //input: keys: [],  values: [ namespace, channel_id ]
+  //output: channel_hash {ttl, time_last_seen, subscribers, last_channel_id, messages} or nil
   // finds and return the info hash of a channel, or nil of channel not found
   redis_lua_script_t find_channel;
 
-  //input:  keys: [], values: [channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
-  //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
+  //input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
+  //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count
   // no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent
   // create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.
   // result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available
   redis_lua_script_t get_message;
 
   //input:  keys: [message_key], values: []
-  //output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
+  //output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count
   redis_lua_script_t get_message_from_key;
 
-  //input:  keys: [], values: [channel_id, time, message, content_type, eventsource_event, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]
-  //output: message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
+  //input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, optimize_target]
+  //output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?
   redis_lua_script_t publish;
 
-  //input:  keys: [], values: [channel_id, status_code]
+  //input:  keys: [], values: [namespace, channel_id, status_code]
   //output: current_subscribers
   redis_lua_script_t publish_status;
 
   //redis-store consistency check
   redis_lua_script_t rsck;
 
-  //input: keys: [], values: [channel_id, subscriber_id, active_ttl]
+  //input: keys: [], values: [namespace, channel_id, subscriber_id, active_ttl, time, want_channel_settings]
   //  'subscriber_id' can be '-' for new id, or an existing id
   //  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
-  //output: subscriber_id, num_current_subscribers, next_keepalive_time
+  //output: subscriber_id, num_current_subscribers, next_keepalive_time, channel_buffer_length
+  //  'channel_buffer_length' is returned only if want_channel_settings is 1
   redis_lua_script_t subscriber_register;
 
-  //input: keys: [], values: [channel_id, subscriber_id, empty_ttl]
+  //input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]
   // 'subscriber_id' is an existing id
   // 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
   //output: subscriber_id, num_current_subscribers
   redis_lua_script_t subscriber_unregister;
 
 } redis_lua_scripts_t;
-
-static redis_lua_scripts_t redis_lua_scripts = {
-  {"add_fakesub", "b6511d02062dd6f2a1e99d761fe57ef8c987f299",
-   "--input:  keys: [], values: [channel_id, number]\n"
-   "--output: current_fake_subscribers\n"
-   "  \n"
-   "redis.call('echo', ' ####### FAKESUBS ####### ')\n"
-   "local id=ARGV[1]\n"
-   "local num=tonumber(ARGV[2])\n"
-   "if num==nil then\n"
-   "  return {err=\"fakesub number not given\"}\n"
-   "end\n"
-   "\n"
-   "local chan_key = ('{channel:%s}'):format(id)\n"
-   "\n"
-   "local res = redis.pcall('EXISTS', chan_key)\n"
-   "if type(res) == \"table\" and res[\"err\"] then\n"
-   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(num, id)}\n"
-   "end\n"
-   "\n"
-   "local exists = res == 1\n"
-   "\n"
-   "local cur = 0\n"
-   "\n"
-   "if exists or (not exists and num > 0) then\n"
-   "  cur = redis.call('HINCRBY', chan_key, 'fake_subscribers', num)\n"
-   "  if not exists then\n"
-   "    redis.call('EXPIRE', chan_key, 5) --something small\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "return cur\n"},
-
-  {"channel_keepalive", "e291b7ccc0c11cbd85292ae8b6a443b37f2220f2",
-   "--input:  keys: [], values: [channel_id, ttl]\n"
-   "-- ttl is for when there are no messages but at least 1 subscriber.\n"
-   "--output: seconds until next keepalive is expected, or -1 for \"let it disappear\"\n"
-   "redis.call('ECHO', ' ####### CHANNEL KEEPALIVE ####### ')\n"
-   "local id=ARGV[1]\n"
-   "local ttl=tonumber(ARGV[2])\n"
-   "if not ttl then\n"
-   "  return {err=\"Invalid channel keepalive TTL (2nd arg)\"}\n"
-   "end\n"
-   "\n"
-   "local random_safe_next_ttl = function(ttl)\n"
-   "  return math.floor(ttl/2 + ttl/2.1 * math.random())\n"
-   "end\n"
-   "local ch = ('{channel:%s}'):format(id)\n"
-   "local key={\n"
-   "  channel=   ch, --hash\n"
-   "  messages=  ch..':messages', --list\n"
-   "}\n"
-   "  \n"
-   "local subs_count = tonumber(redis.call('HGET', key.channel, \"subscribers\")) or 0\n"
-   "local msgs_count = tonumber(redis.call('LLEN', key.messages)) or 0\n"
-   "local actual_ttl = tonumber(redis.call('TTL',  key.channel))\n"
-   "\n"
-   "if subs_count > 0 then\n"
-   "  if msgs_count > 0 and actual_ttl > ttl then\n"
-   "    return random_safe_next_ttl(actual_ttl)\n"
-   "  end\n"
-   "  --refresh ttl\n"
-   "  redis.call('expire', key.channel, ttl);\n"
-   "  redis.call('expire', key.messages, ttl);\n"
-   "  return random_safe_next_ttl(ttl)\n"
-   "else\n"
-   "  return -1\n"
-   "end\n"},
-
-  {"delete", "fa52ada69e16947a687f9592529063f3c2d429bd",
-   "--input: keys: [],  values: [ channel_id ]\n"
-   "--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil\n"
-   "-- delete this channel and all its messages\n"
-   "local id = ARGV[1]\n"
-   "local ch = ('{channel:%s}'):format(id)\n"
-   "local key_msg=    ch..':msg:%s' --not finished yet\n"
-   "local key_channel=ch\n"
-   "local messages=   ch..':messages'\n"
-   "local subscribers=ch..':subscribers'\n"
-   "local pubsub=     ch..':pubsub'\n"
-   "\n"
-   "redis.call('echo', ' ####### DELETE #######')\n"
-   "local num_messages = 0\n"
-   "--delete all the messages right now mister!\n"
-   "local msg\n"
-   "while true do\n"
-   "  msg = redis.call('LPOP', messages)\n"
-   "  if msg then\n"
-   "    num_messages = num_messages + 1\n"
-   "    redis.call('DEL', key_msg:format(msg))\n"
-   "  else\n"
-   "    break\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local del_msgpack =cmsgpack.pack({\"alert\", \"delete channel\", id})\n"
-   "for k,channel_key in pairs(redis.call('SMEMBERS', subscribers)) do\n"
-   "  redis.call('PUBLISH', channel_key, del_msgpack)\n"
-   "end\n"
-   "\n"
-   "local nearly_departed = nil\n"
-   "if redis.call('EXISTS', key_channel) ~= 0 then\n"
-   "  nearly_departed = redis.call('hmget', key_channel, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')\n"
-   "  if(nearly_departed[4]) then\n"
-   "    --replace subscribers count with fake_subscribers\n"
-   "    nearly_departed[3]=nearly_departed[4]\n"
-   "    table.remove(nearly_departed, 4)\n"
-   "  end\n"
-   "  for i = 1, 4 do\n"
-   "    nearly_departed[i]=tonumber(nearly_departed[i]) or 0\n"
-   "  end\n"
-   "  if type(nearly_departed[5]) ~= \"string\" then\n"
-   "    nearly_departed[5]=\"\"\n"
-   "  end\n"
-   "  \n"
-   "  --leave some crumbs behind showing this channel was just deleted\n"
-   "  redis.call('setex', ch..\":deleted\", 5, 1)\n"
-   "  \n"
-   "  table.insert(nearly_departed, num_messages)\n"
-   "end\n"
-   "\n"
-   "redis.call('DEL', key_channel, messages, subscribers)\n"
-   "\n"
-   "if redis.call('PUBSUB','NUMSUB', pubsub)[2] > 0 then\n"
-   "  redis.call('PUBLISH', pubsub, del_msgpack)\n"
-   "end\n"
-   "\n"
-   "return nearly_departed\n"},
-
-  {"find_channel", "efe9c3f1dd606b1534ee6948d07c7710c604e233",
-   "--input: keys: [],  values: [ channel_id ]\n"
-   "--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil\n"
-   "-- finds and return the info hash of a channel, or nil of channel not found\n"
-   "local id = ARGV[1]\n"
-   "local channel_key = ('{channel:%s}'):format(id)\n"
-   "local messages_key = channel_key..':messages'\n"
-   "\n"
-   "redis.call('echo', ' #######  FIND_CHANNEL ######## ')\n"
-   "\n"
-   "--check old entries\n"
-   "local oldestmsg=function(list_key, old_fmt)\n"
-   "  local old, oldkey\n"
-   "  local n, del=0,0\n"
-   "  while true do\n"
-   "    n=n+1\n"
-   "    old=redis.call('lindex', list_key, -1)\n"
-   "    if old then\n"
-   "      oldkey=old_fmt:format(old)\n"
-   "      local ex=redis.call('exists', oldkey)\n"
-   "      if ex==1 then\n"
-   "        return oldkey\n"
-   "      else\n"
-   "        redis.call('rpop', list_key)\n"
-   "        del=del+1\n"
-   "      end\n"
-   "    else\n"
-   "      break\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "if redis.call('EXISTS', channel_key) ~= 0 then\n"
-   "  local ch = redis.call('hmget', channel_key, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')\n"
-   "  if(ch[4]) then\n"
-   "    --replace subscribers count with fake_subscribers\n"
-   "    ch[3]=ch[4]\n"
-   "    table.remove(ch, 4)\n"
-   "  end\n"
-   "  for i = 1, 4 do\n"
-   "    ch[i]=tonumber(ch[i]) or 0\n"
-   "  end\n"
-   "  if type(ch[5]) ~= \"string\" then\n"
-   "    ch[5]=\"\"\n"
-   "  end\n"
-   "  \n"
-   "  if redis.call(\"TYPE\", messages_key)['ok'] == 'list' then\n"
-   "    oldestmsg(messages_key, channel_key ..':msg:%s')\n"
-   "    table.insert(ch, tonumber(redis.call('llen', messages_key)))\n"
-   "  else\n"
-   "    table.insert(ch, 0)\n"
-   "  end\n"
-   "  \n"
-   "  return ch\n"
-   "else\n"
-   "  return nil\n"
-   "end\n"},
-
-  {"get_message", "cc3d8f6503731b6580f3a5a5d0de97bfc18c19ca",
-   "--input:  keys: [], values: [channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]\n"
-   "--output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count\n"
-   "-- no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent\n"
-   "-- create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.\n"
-   "-- result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available\n"
-   "local id, time, tag, subscribe_if_current = ARGV[1], tonumber(ARGV[2]), tonumber(ARGV[3])\n"
-   "local no_msgid_order=ARGV[4]\n"
-   "local create_channel_ttl=tonumber(ARGV[5]) or 0\n"
-   "local msg_id\n"
-   "if time and time ~= 0 and tag then\n"
-   "  msg_id=(\"%s:%s\"):format(time, tag)\n"
-   "end\n"
-   "\n"
-   "if redis.replicate_commands then\n"
-   "  redis.replicate_commands()\n"
-   "end\n"
-   "\n"
-   "-- This script has gotten big and ugly, but there are a few good reasons \n"
-   "-- to keep it big and ugly. It needs to do a lot of stuff atomically, and \n"
-   "-- redis doesn't do includes. It could be generated pre-insertion into redis, \n"
-   "-- but then error messages become less useful, complicating debugging. If you \n"
-   "-- have a solution to this, please help.\n"
-   "local ch=('{channel:%s}'):format(id)\n"
-   "local msgkey_fmt=ch..':msg:%s'\n"
-   "local key={\n"
-   "  next_message= msgkey_fmt, --hash\n"
-   "  message=      msgkey_fmt, --hash\n"
-   "  channel=      ch, --hash\n"
-   "  messages=     ch..':messages', --list\n"
-   "--  pubsub=       ch..':subscribers:', --set\n"
-   "}\n"
-   "\n"
-   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
-   "\n"
-   "redis.call('echo', ' #######  GET_MESSAGE ######## ')\n"
-   "\n"
-   "local oldestmsg=function(list_key, old_fmt)\n"
-   "  local old, oldkey\n"
-   "  local n, del=0,0\n"
-   "  while true do\n"
-   "    n=n+1\n"
-   "    old=redis.call('lindex', list_key, -1)\n"
-   "    if old then\n"
-   "      oldkey=old_fmt:format(old)\n"
-   "      local ex=redis.call('exists', oldkey)\n"
-   "      if ex==1 then\n"
-   "        return oldkey\n"
-   "      else\n"
-   "        redis.call('rpop', list_key)\n"
-   "        del=del+1\n"
-   "      end \n"
-   "    else\n"
-   "      --dbg(list_key, \" is empty\")\n"
-   "      break\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local tohash=function(arr)\n"
-   "  if type(arr)~=\"table\" then\n"
-   "    return nil\n"
-   "  end\n"
-   "  local h = {}\n"
-   "  local k=nil\n"
-   "  for i, v in ipairs(arr) do\n"
-   "    if k == nil then\n"
-   "      k=v\n"
-   "    else\n"
-   "      --dbg(k..\"=\"..v)\n"
-   "      h[k]=v; k=nil\n"
-   "    end\n"
-   "  end\n"
-   "  return h\n"
-   "end\n"
-   "\n"
-   "if no_msgid_order ~= 'FIFO' then\n"
-   "  no_msgid_order = 'FILO'\n"
-   "end\n"
-   "\n"
-   "local channel = tohash(redis.call('HGETALL', key.channel))\n"
-   "local new_channel = false\n"
-   "if next(channel) == nil then\n"
-   "  if create_channel_ttl==0 then\n"
-   "    return {404, nil}\n"
-   "  end\n"
-   "  redis.call('HSET', key.channel, 'time', time)\n"
-   "  redis.call('EXPIRE', key.channel, create_channel_ttl)\n"
-   "  channel = {time=time}\n"
-   "  new_channel = true\n"
-   "end\n"
-   "\n"
-   "local subs_count = tonumber(channel.subscribers)\n"
-   "\n"
-   "local found_msg_id\n"
-   "if msg_id==nil then\n"
-   "  if new_channel then\n"
-   "    --dbg(\"new channel\")\n"
-   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
-   "  else\n"
-   "    --dbg(\"no msg id given, ord=\"..no_msgid_order)\n"
-   "    \n"
-   "    if no_msgid_order == 'FIFO' then --most recent message\n"
-   "      --dbg(\"get most recent\")\n"
-   "      found_msg_id=channel.current_message\n"
-   "    elseif no_msgid_order == 'FILO' then --oldest message\n"
-   "      --dbg(\"get oldest\")\n"
-   "      \n"
-   "      found_msg_id=oldestmsg(key.messages, msgkey_fmt)\n"
-   "    end\n"
-   "    if found_msg_id == nil then\n"
-   "      --we await a message\n"
-   "      return {418, \"\", \"\", \"\", \"\", subs_count}\n"
-   "    else\n"
-   "      msg_id = found_msg_id\n"
-   "      local msg=tohash(redis.call('HGETALL', msg_id))\n"
-   "      if not next(msg) then --empty\n"
-   "        return {404, \"\", \"\", \"\", \"\", subs_count}\n"
-   "      else\n"
-   "        --dbg((\"found msg %s:%s  after %s:%s\"):format(tostring(msg.time), tostring(msg.tag), tostring(time), tostring(tag)))\n"
-   "        local ttl = redis.call('TTL', msg_id)\n"
-   "        return {200, ttl, tonumber(msg.time) or \"\", tonumber(msg.tag) or \"\", tonumber(msg.prev_time) or \"\", tonumber(msg.prev_tag) or \"\", msg.data or \"\", msg.content_type or \"\", msg.eventsource_event or \"\", subs_count}\n"
-   "      end\n"
-   "    end\n"
-   "  end\n"
-   "else\n"
-   "  if msg_id and channel.current_message == msg_id\n"
-   "   or not channel.current_message then\n"
-   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
-   "  end\n"
-   "\n"
-   "  key.message=key.message:format(msg_id)\n"
-   "  local msg=tohash(redis.call('HGETALL', key.message))\n"
-   "\n"
-   "  if next(msg) == nil then -- no such message. it might've expired, or maybe it was never there\n"
-   "    --dbg(\"MESSAGE NOT FOUND\")\n"
-   "    return {404, nil}\n"
-   "  end\n"
-   "\n"
-   "  local next_msg, next_msgtime, next_msgtag\n"
-   "  if not msg.next then --this should have been taken care of by the channel.current_message check\n"
-   "    --dbg(\"NEXT MESSAGE KEY NOT PRESENT. ERROR, ERROR!\")\n"
-   "    return {404, nil}\n"
-   "  else\n"
-   "    --dbg(\"NEXT MESSAGE KEY PRESENT: \" .. msg.next)\n"
-   "    key.next_message=key.next_message:format(msg.next)\n"
-   "    if redis.call('EXISTS', key.next_message)~=0 then\n"
-   "      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event'))\n"
-   "      local ttl = redis.call('TTL', key.next_message)\n"
-   "      --dbg((\"found msg2 %i:%i  after %i:%i\"):format(ntime, ntag, time, tag))\n"
-   "      return {200, ttl, tonumber(ntime) or \"\", tonumber(ntag) or \"\", tonumber(prev_time) or \"\", tonumber(prev_tag) or \"\", ndata or \"\", ncontenttype or \"\", neventsource_event or \"\", subs_count}\n"
-   "    else\n"
-   "      --dbg(\"NEXT MESSAGE NOT FOUND\")\n"
-   "      return {404, nil}\n"
-   "    end\n"
-   "  end\n"
-   "end\n"},
-
-  {"get_message_from_key", "173ff5fb759e434296433d6ff2a554ec7a57cbdb",
-   "--input:  keys: [message_key], values: []\n"
-   "--output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count\n"
-   "\n"
-   "local key = KEYS[1]\n"
-   "\n"
-   "local ttl = redis.call('TTL', key)\n"
-   "local time, tag, prev_time, prev_tag, data, content_type, es_event = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event'))\n"
-   "\n"
-   "return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or \"\", content_type or \"\", es_event or \"\"}\n"},
-
-  {"publish", "a3ef246c361dbe55269bce8afc4974c6e555a482",
-   "--input:  keys: [], values: [channel_id, time, message, content_type, eventsource_event, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]\n"
-   "--output: message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}\n"
-   "\n"
-   "local id=ARGV[1]\n"
-   "local time\n"
-   "if redis.replicate_commands then\n"
-   "  -- we're on redis >= 3.2. We can use We can use 'script effects replication' to allow\n"
-   "  -- writing nondeterministic command values like TIME.\n"
-   "  -- That's exactly what we want to do, use Redis' TIME rather than the given time from Nginx\n"
-   "  -- Also, it's more efficient to replicate just the commands in this case rather than run the whole script\n"
-   "  redis.replicate_commands()\n"
-   "  time = tonumber(redis.call('TIME')[1])\n"
-   "else\n"
-   "  --fallback to the provided time\n"
-   "  time = tonumber(ARGV[2])\n"
-   "end\n"
-   "\n"
-   "local msg={\n"
-   "  id=nil,\n"
-   "  data= ARGV[3],\n"
-   "  content_type=ARGV[4],\n"
-   "  eventsource_event=ARGV[5],\n"
-   "  ttl= tonumber(ARGV[6]),\n"
-   "  time= time,\n"
-   "  tag= 0\n"
-   "}\n"
-   "if msg.ttl == 0 then\n"
-   "  msg.ttl = 126144000 --4 years\n"
-   "end\n"
-   "local store_at_most_n_messages = tonumber(ARGV[7])\n"
-   "if store_at_most_n_messages == nil or store_at_most_n_messages == \"\" then\n"
-   "  return {err=\"Argument 7, max_msg_buf_size, can't be empty\"}\n"
-   "end\n"
-   "if store_at_most_n_messages == 0 then\n"
-   "  msg.unbuffered = 1\n"
-   "end\n"
-   "\n"
-   "local msgpacked_pubsub_cutoff = tonumber(ARGV[8])\n"
-   "\n"
-   "--[[local dbg = function(...)\n"
-   "  local arg = {...}\n"
-   "  for i = 1, #arg do\n"
-   "    arg[i]=tostring(arg[i])\n"
-   "  end\n"
-   "  redis.call('echo', table.concat(arg))\n"
-   "end\n"
-   "]]\n"
-   "if type(msg.content_type)=='string' and msg.content_type:find(':') then\n"
-   "  return {err='Message content-type cannot contain \":\" character.'}\n"
-   "end\n"
-   "\n"
-   "redis.call('echo', ' #######  PUBLISH   ######## ')\n"
-   "\n"
-   "-- sets all fields for a hash from a dictionary\n"
-   "local hmset = function (key, dict)\n"
-   "  if next(dict) == nil then return nil end\n"
-   "  local bulk = {}\n"
-   "  for k, v in pairs(dict) do\n"
-   "    table.insert(bulk, k)\n"
-   "    table.insert(bulk, v)\n"
-   "  end\n"
-   "  return redis.call('HMSET', key, unpack(bulk))\n"
-   "end\n"
-   "\n"
-   "--[[\n"
-   "local hash_tostr=function(h)\n"
-   "  local tt = {}\n"
-   "  for k, v in pairs(h) do\n"
-   "    table.insert(tt, (\"%s: %s\"):format(k, v))\n"
-   "  end\n"
-   "  return \"{\" .. table.concat(tt,\", \") .. \"}\"\n"
-   "end\n"
-   "]]\n"
-   "\n"
-   "local tohash=function(arr)\n"
-   "  if type(arr)~=\"table\" then\n"
-   "    return nil\n"
-   "  end\n"
-   "  local h = {}\n"
-   "  local k=nil\n"
-   "  for i, v in ipairs(arr) do\n"
-   "    if k == nil then\n"
-   "      k=v\n"
-   "    else\n"
-   "      h[k]=v; k=nil\n"
-   "    end\n"
-   "  end\n"
-   "  return h\n"
-   "end\n"
-   "\n"
-   "local ch = ('{channel:%s}'):format(id)\n"
-   "local msg_fmt = ch..':msg:%s'\n"
-   "local key={\n"
-   "  last_message= msg_fmt, --not finished yet\n"
-   "  message=      msg_fmt, --not finished yet\n"
-   "  channel=      ch,\n"
-   "  messages=     ch..':messages',\n"
-   "  subscribers=  ch..':subscribers'\n"
-   "}\n"
-   "local channel_pubsub = ch..':pubsub'\n"
-   "\n"
-   "local new_channel\n"
-   "local channel\n"
-   "if redis.call('EXISTS', key.channel) ~= 0 then\n"
-   "  channel=tohash(redis.call('HGETALL', key.channel))\n"
-   "  channel.max_stored_messages = tonumber(channel.max_stored_messages)\n"
-   "end\n"
-   "\n"
-   "if channel~=nil then\n"
-   "  --dbg(\"channel present\")\n"
-   "  if channel.current_message ~= nil then\n"
-   "    --dbg(\"channel current_message present\")\n"
-   "    key.last_message=key.last_message:format(channel.current_message, id)\n"
-   "  else\n"
-   "    --dbg(\"channel current_message absent\")\n"
-   "    key.last_message=nil\n"
-   "  end\n"
-   "  new_channel=false\n"
-   "else\n"
-   "  --dbg(\"channel missing\")\n"
-   "  channel={}\n"
-   "  new_channel=true\n"
-   "  key.last_message=nil\n"
-   "end\n"
-   "\n"
-   "--set new message id\n"
-   "local lastmsg, lasttime, lasttag\n"
-   "if key.last_message then\n"
-   "  lastmsg = redis.call('HMGET', key.last_message, 'time', 'tag')\n"
-   "  lasttime, lasttag = tonumber(lastmsg[1]), tonumber(lastmsg[2])\n"
-   "  --dbg(\"New message id: last_time \", lasttime, \" last_tag \", lasttag, \" msg_time \", msg.time)\n"
-   "  if lasttime and tonumber(lasttime) > tonumber(msg.time) then\n"
-   "    redis.log(redis.LOG_WARNING, \"Nchan: message for \" .. id .. \" arrived a little late and may be delivered out of order. Redis must be very busy.\")\n"
-   "    msg.time = lasttime\n"
-   "    time = lasttime\n"
-   "  end\n"
-   "  if lasttime and lasttime==msg.time then\n"
-   "    msg.tag=lasttag+1\n"
-   "  end\n"
-   "  msg.prev_time = lasttime\n"
-   "  msg.prev_tag = lasttag\n"
-   "else\n"
-   "  msg.prev_time = 0\n"
-   "  msg.prev_tag = 0\n"
-   "end\n"
-   "msg.id=('%i:%i'):format(msg.time, msg.tag)\n"
-   "\n"
-   "key.message=key.message:format(msg.id)\n"
-   "if redis.call('EXISTS', key.message) ~= 0 then\n"
-   "  local errmsg = \"Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s\"\n"
-   "  errmsg = errmsg:format(key.message, id, msg.id, time, lasttime, lasttag)\n"
-   "  --redis.log(redis.LOG_WARNING, errmsg)\n"
-   "  --redis.log(redis.LOG_WARNING, \"channel: \" .. key.channel .. hash_tostr(channel))\n"
-   "  --redis.log(redis.LOG_WARNING, (\"messages: %s {%s}\"):format(key.messages, table.concat(redis.call('LRANGE', key.messages, 0, -1), \", \")))\n"
-   "  return {err=errmsg}\n"
-   "end\n"
-   "\n"
-   "msg.prev=channel.current_message\n"
-   "if key.last_message and redis.call('exists', key.last_message) == 1 then\n"
-   "  redis.call('HSET', key.last_message, 'next', msg.id)\n"
-   "end\n"
-   "\n"
-   "--update channel\n"
-   "redis.call('HSET', key.channel, 'current_message', msg.id)\n"
-   "if msg.prev then\n"
-   "  redis.call('HSET', key.channel, 'prev_message', msg.prev)\n"
-   "end\n"
-   "if time then\n"
-   "  redis.call('HSET', key.channel, 'time', time)\n"
-   "end\n"
-   "\n"
-   "local message_len_changed = false\n"
-   "if channel.max_stored_messages ~= store_at_most_n_messages then\n"
-   "  channel.max_stored_messages = store_at_most_n_messages\n"
-   "  message_len_changed = true\n"
-   "  redis.call('HSET', key.channel, 'max_stored_messages', store_at_most_n_messages)\n"
-   "  --dbg(\"channel.max_stored_messages was not set, but is now \", store_at_most_n_messages)\n"
-   "end\n"
-   "\n"
-   "--write message\n"
-   "hmset(key.message, msg)\n"
-   "\n"
-   "\n"
-   "--check old entries\n"
-   "local oldestmsg=function(list_key, old_fmt)\n"
-   "  local old, oldkey\n"
-   "  local n, del=0,0\n"
-   "  while true do\n"
-   "    n=n+1\n"
-   "    old=redis.call('lindex', list_key, -1)\n"
-   "    if old then\n"
-   "      oldkey=old_fmt:format(old)\n"
-   "      local ex=redis.call('exists', oldkey)\n"
-   "      if ex==1 then\n"
-   "        return oldkey\n"
-   "      else\n"
-   "        redis.call('rpop', list_key)\n"
-   "        del=del+1\n"
-   "      end\n"
-   "    else\n"
-   "      break\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local max_stored_msgs = channel.max_stored_messages or -1\n"
-   "\n"
-   "if max_stored_msgs < 0 then --no limit\n"
-   "  oldestmsg(key.messages, msg_fmt)\n"
-   "  redis.call('LPUSH', key.messages, msg.id)\n"
-   "elseif max_stored_msgs > 0 then\n"
-   "  local stored_messages = tonumber(redis.call('LLEN', key.messages))\n"
-   "  redis.call('LPUSH', key.messages, msg.id)\n"
-   "  -- Reduce the message length if necessary\n"
-   "  local dump_message_ids = redis.call('LRANGE', key.messages, max_stored_msgs, stored_messages);\n"
-   "  if dump_message_ids then\n"
-   "    for _, msgid in ipairs(dump_message_ids) do\n"
-   "      redis.call('DEL', msg_fmt:format(msgid))\n"
-   "    end\n"
-   "  end\n"
-   "  redis.call('LTRIM', key.messages, 0, max_stored_msgs - 1)\n"
-   "  oldestmsg(key.messages, msg_fmt)\n"
-   "end\n"
-   "\n"
-   "\n"
-   "--set expiration times for all the things\n"
-   "local channel_ttl = tonumber(redis.call('TTL',  key.channel))\n"
-   "redis.call('EXPIRE', key.message, msg.ttl)\n"
-   "if msg.ttl > channel_ttl then\n"
-   "  redis.call('EXPIRE', key.channel, msg.ttl)\n"
-   "  redis.call('EXPIRE', key.messages, msg.ttl)\n"
-   "  redis.call('EXPIRE', key.subscribers, msg.ttl)\n"
-   "end\n"
-   "\n"
-   "--publish message\n"
-   "local unpacked\n"
-   "\n"
-   "if msg.unbuffered or #msg.data < msgpacked_pubsub_cutoff then\n"
-   "  unpacked= {\n"
-   "    \"msg\",\n"
-   "    msg.ttl or 0,\n"
-   "    msg.time,\n"
-   "    tonumber(msg.tag) or 0,\n"
-   "    (msg.unbuffered and 0 or msg.prev_time) or 0,\n"
-   "    (msg.unbuffered and 0 or msg.prev_tag) or 0,\n"
-   "    msg.data or \"\",\n"
-   "    msg.content_type or \"\",\n"
-   "    msg.eventsource_event or \"\"\n"
-   "  }\n"
-   "else\n"
-   "  unpacked= {\n"
-   "    \"msgkey\",\n"
-   "    msg.time,\n"
-   "    tonumber(msg.tag) or 0,\n"
-   "    key.message\n"
-   "  }\n"
-   "end\n"
-   "\n"
-   "if message_len_changed then\n"
-   "  unpacked[1] = \"max_msgs+\" .. unpacked[1]\n"
-   "  table.insert(unpacked, 2, tonumber(channel.max_stored_messages))\n"
-   "end\n"
-   "\n"
-   "local msgpacked\n"
-   "\n"
-   "--dbg((\"Stored message with id %i:%i => %s\"):format(msg.time, msg.tag, msg.data))\n"
-   "\n"
-   "--now publish to the efficient channel\n"
-   "local numsub = redis.call('PUBSUB','NUMSUB', channel_pubsub)[2]\n"
-   "if tonumber(numsub) > 0 then\n"
-   "  msgpacked = cmsgpack.pack(unpacked)\n"
-   "  redis.call('PUBLISH', channel_pubsub, msgpacked)\n"
-   "end\n"
-   "\n"
-   "local num_messages = redis.call('llen', key.messages)\n"
-   "\n"
-   "--dbg(\"channel \", id, \" ttl: \",channel.ttl, \", subscribers: \", channel.subscribers, \"(fake: \", channel.fake_subscribers or \"nil\", \"), messages: \", num_messages)\n"
-   "return { msg.tag, {tonumber(channel.ttl or msg.ttl), tonumber(channel.time or msg.time), tonumber(channel.fake_subscribers or channel.subscribers or 0), tonumber(num_messages)}, new_channel}\n"},
-
-  {"publish_status", "cb9ff03713d74f854e3a90f4f77030a0791d3028",
-   "--input:  keys: [], values: [channel_id, status_code]\n"
-   "--output: current_subscribers\n"
-   "\n"
-   "redis.call('echo', ' ####### PUBLISH STATUS ####### ')\n"
-   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
-   "local id=ARGV[1]\n"
-   "local code=tonumber(ARGV[2])\n"
-   "if code==nil then\n"
-   "  return {err=\"non-numeric status code given, bailing!\"}\n"
-   "end\n"
-   "\n"
-   "local pubmsg = \"status:\"..code\n"
-   "local ch = ('{channel:%s}'):format(id)\n"
-   "local subs_key = ch..':subscribers'\n"
-   "local chan_key = ch\n"
-   "--local channel_pubsub = ch..':pubsub'\n"
-   "\n"
-   "for k,channel_key in pairs(redis.call('SMEMBERS', subs_key)) do\n"
-   "  --not efficient, but useful for a few short-term subscriptions\n"
-   "  redis.call('PUBLISH', channel_key, pubmsg)\n"
-   "end\n"
-   "--clear short-term subscriber list\n"
-   "redis.call('DEL', subs_key)\n"
-   "--now publish to the efficient channel\n"
-   "--what?... redis.call('PUBLISH', channel_pubsub, pubmsg)\n"
-   "return redis.call('HGET', chan_key, 'subscribers') or 0\n"},
-
-  {"rsck", "71beb40b0e39f61f6e53dc81d6f8849fd3b23632",
-   "--redis-store consistency check\n"
-   "\n"
-   "local concat = function(...)\n"
-   "  local arg = {...}\n"
-   "  for i = 1, #arg do\n"
-   "    arg[i]=tostring(arg[i])\n"
-   "  end\n"
-   "  return table.concat(arg, \" \")\n"
-   "end\n"
-   "local dbg =function(...) redis.call('echo', concat(...)); end\n"
-   "local errors={}\n"
-   "local err = function(...)\n"
-   "  local msg = concat(...)\n"
-   "  dbg(msg)\n"
-   "  table.insert(errors, msg)\n"
-   "end\n"
-   "\n"
-   "local tp=function(t, max_n)\n"
-   "  local tt={}\n"
-   "  for i, v in pairs(t) do\n"
-   "    local val = tostring(v)\n"
-   "    if max_n and #val > max_n then\n"
-   "      val = val:sub(1, max_n) .. \"[...]\"\n"
-   "    end\n"
-   "    table.insert(tt, tostring(i) .. \": \" .. val)\n"
-   "  end\n"
-   "  return \"{\" .. table.concat(tt, \", \") .. \"}\"\n"
-   "end\n"
-   "\n"
-   "local tohash=function(arr)\n"
-   "  if type(arr)~=\"table\" then\n"
-   "    return nil\n"
-   "  end\n"
-   "  local h = {}\n"
-   "  local k=nil\n"
-   "  for i, v in ipairs(arr) do\n"
-   "    if k == nil then\n"
-   "      k=v\n"
-   "    else\n"
-   "      h[k]=v; k=nil\n"
-   "    end\n"
-   "  end\n"
-   "  return h\n"
-   "end\n"
-   "local type_is = function(key, _type, description)\n"
-   "  local t = redis.call(\"TYPE\", key)['ok']\n"
-   "  local type_ok = true\n"
-   "  if type(_type) == \"table\" then\n"
-   "    type_ok = false\n"
-   "    for i, v in pairs(_type) do\n"
-   "      if v == _type then\n"
-   "        type_ok = true\n"
-   "        break\n"
-   "      end\n"
-   "    end\n"
-   "  elseif t ~= _type then\n"
-   "    err((description or \"\"), key, \"should be type \" .. _type .. \", is\", t)\n"
-   "    type_ok = false\n"
-   "  end\n"
-   "  return type_ok, t\n"
-   "end\n"
-   "\n"
-   "local known_msgs_count=0\n"
-   "local known_msgkeys = {}\n"
-   "local known_channel_keys = {}\n"
-   "\n"
-   "local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)\n"
-   "  description = description and \"msg (\" .. description ..\")\" or \"msg\"\n"
-   "  local msgkey = \"{channel:\"..chid..\"}:msg:\"..msgid\n"
-   "  if not known_msgkeys[msgkey] then\n"
-   "    known_msgs_count = known_msgs_count + 1\n"
-   "  end\n"
-   "  known_msgkeys[msgkey]=true\n"
-   "  local ok, t = type_is(msgkey, {\"hash\", \"none\"}, \"message hash\")\n"
-   "  if t == \"none\" then\n"
-   "    --message is missing, but maybe it expired under normal circumstances. \n"
-   "    --check if any earlier messages are present\n"
-   "    local msgids = redis.call('LRANGE', \"{channel:\"..chid..\"}:messages\", 0, -1)\n"
-   "    local founds = 0\n"
-   "    for i=#msgids, 1, -1 do\n"
-   "      if msgids[i] == msgid then \n"
-   "        break\n"
-   "      end\n"
-   "      local thismsgkey = \"{channel:\"..chid..\"}:msg:\".. msgids[i]\n"
-   "      local ttt = redis.call('type', thismsgkey)['ok']\n"
-   "      redis.breakpoint()\n"
-   "      if ttt == \"hash\" then\n"
-   "        founds = founds + 1\n"
-   "      end\n"
-   "    end\n"
-   "    \n"
-   "    if founds > 0 then\n"
-   "      err(\"message\", msgkey, \"missing, with\", founds, \"prev. msgs in msg list\")\n"
-   "    end\n"
-   "    \n"
-   "  end\n"
-   "  local msg = tohash(redis.call('HGETALL', msgkey))\n"
-   "  local ttl = tonumber(redis.call('TTL', msgkey))\n"
-   "  local n = tonumber(redis.call(\"HLEN\", msgkey))\n"
-   "  if n > 0 and (msg.data == nil or msg.id == nil or msg.time == nil or msg.tag == nil)then\n"
-   "    err(\"incomplete \" .. description ..\"(ttl \"..ttl..\")\", msgkey, tp(msg))\n"
-   "    return false\n"
-   "  end\n"
-   "  if t == \"hash\" and tonumber(ttl) < 0 then\n"
-   "    err(\"message\", msgkey, \"ttl =\", ttl)\n"
-   "  end\n"
-   "  if ttl ~= -2 then\n"
-   "    if prev_msgid ~= false and msg.prev ~= prev_msgid then\n"
-   "      err(description, chid, msgid, \"prev_message wrong. expected\", prev_msgid, \"got\", msg.prev)\n"
-   "    end\n"
-   "    if next_msgid ~= false and msg.next ~= next_msgid then\n"
-   "      err(description, chid, msgid, \"next_message wrong. expected\", next_msgid, \"got\", msg.next)\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local check_channel = function(id)\n"
-   "  local key={\n"
-   "    ch = \"{channel:\"..id..\"}\",\n"
-   "    msgs = \"{channel:\"..id..\"}:messages\"\n"
-   "  }\n"
-   "  \n"
-   "  local ok, chkey_type = type_is(key.ch, \"hash\", \"channel hash\")\n"
-   "  if not ok then\n"
-   "    if chkey_type ~= \"none\" then\n"
-   "      err(\"unecpected channel key\", key.ch, \"type:\", chkey_type);\n"
-   "    end\n"
-   "    return false\n"
-   "  end\n"
-   "  local _, msgs_list_type = type_is(key.msgs, {\"list\", \"none\"}, \"channel messages list\")\n"
-   "  \n"
-   "  local ch = tohash(redis.call('HGETALL', key.ch))\n"
-   "  local len = tonumber(redis.call(\"HLEN\", key.ch))\n"
-   "  local ttl = tonumber(redis.call('TTL',  key.ch))\n"
-   "  if not ch.current_message or not ch.time then\n"
-   "    if msgs_list_type == \"list\" then\n"
-   "      err(\"incomplete channel (ttl \" .. ttl ..\")\", key.ch, tp(ch))\n"
-   "    end  \n"
-   "  elseif (ch.current_message or ch.prev_message) and msgs_list_type ~= \"list\" then\n"
-   "    err(\"channel\", key.ch, \"has a current_message but no message list\")\n"
-   "  end\n"
-   "  \n"
-   "  local msgids = redis.call('LRANGE', key.msgs, 0, -1)\n"
-   "  for i, msgid in ipairs(msgids) do\n"
-   "    check_msg(id, msgid, msgids[i+1], msgids[i-1], \"msglist\")\n"
-   "  end\n"
-   "  \n"
-   "  if ch.prev_message then\n"
-   "    if redis.call('LINDEX', key.msgs, 1) ~= ch.prev_message then\n"
-   "      err(\"channel\", key.ch, \"prev_message doesn't correspond to\", key.msgs, \"second list element\")\n"
-   "    end\n"
-   "    check_msg(id, ch.prev_message, false, ch.current_message, \"channel prev_message\")\n"
-   "  end\n"
-   "  if ch.current_message then\n"
-   "    if redis.call('LINDEX', key.msgs, 0) ~= ch.current_message then\n"
-   "      err(\"channel\", key.ch, \"current_message doesn't correspond to\", key.msgs, \"first list element\")\n"
-   "    end\n"
-   "    check_msg(id, ch.current_message, ch.prev_message, false, \"channel current_message\")\n"
-   "  end\n"
-   "  \n"
-   "end\n"
-   "\n"
-   "local channel_ids = {}\n"
-   "\n"
-   "for i, chkey in ipairs(redis.call(\"KEYS\", \"{channel:*}\")) do\n"
-   "  local msgs_chid_match = chkey:match(\"^{channel:(.*)}:messages\")\n"
-   "  if msgs_chid_match then\n"
-   "    type_is(\"{channel:\" .. msgs_chid_match..\"}\", \"hash\", \"channel messages' corresponding hash key\")\n"
-   "  elseif not chkey:match(\":msg$\") then\n"
-   "    table.insert(channel_ids, chkey);\n"
-   "    known_channel_keys[chkey] = true\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "dbg(\"found\", #channel_ids, \"channels\")\n"
-   "for i, chkey in ipairs(channel_ids) do\n"
-   "  local chid = chkey:match(\"^{channel:(.*)}\")\n"
-   "  check_channel(chid)\n"
-   "end\n"
-   "\n"
-   "for i, msgkey in ipairs(redis.call(\"KEYS\", \"{channel:*}:msg\")) do\n"
-   "  if not known_msgkeys[msgkey] then\n"
-   "    local ok, t = type_is(msgkey, \"hash\")\n"
-   "    if ok then\n"
-   "      if not redis.call('HGET', msgkey, 'unbuffered') then\n"
-   "        err(\"orphan message\", msgkey, \"(ttl: \" .. redis.call('TTL', msgkey) .. \")\", tp(tohash(redis.call('HGETALL', msgkey)), 15))\n"
-   "      end\n"
-   "    else\n"
-   "      err(\"orphan message\", msgkey, \"wrong type\", t) \n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "if errors then\n"
-   "  table.insert(errors, 1, concat(#channel_ids, \"channels,\",known_msgs_count,\"messages found\", #errors, \"problems\"))\n"
-   "  return errors\n"
-   "else\n"
-   "  return concat(#channel_ids, \"channels,\", known_msgs_count, \"messages, all ok\")\n"
-   "end\n"},
-
-  {"subscriber_register", "4e04dbb8bcb66052b49c87e95c30f91a224e9144",
-   "--input: keys: [], values: [channel_id, subscriber_id, active_ttl]\n"
-   "--  'subscriber_id' can be '-' for new id, or an existing id\n"
-   "--  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec\n"
-   "--output: subscriber_id, num_current_subscribers, next_keepalive_time\n"
-   "\n"
-   "local id, sub_id, active_ttl, concurrency = ARGV[1], ARGV[2], tonumber(ARGV[3]) or 20, ARGV[4]\n"
-   "\n"
-   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
-   "\n"
-   "redis.call('echo', ' ######## SUBSCRIBER REGISTER SCRIPT ####### ')\n"
-   "local ch=(\"{channel:%s}\"):format(id)\n"
-   "local keys = {\n"
-   "  channel =     ch,\n"
-   "  messages =    ch..':messages:',\n"
-   "  subscribers = ch..':subscribers'\n"
-   "}\n"
-   "\n"
-   "local setkeyttl=function(ttl)\n"
-   "  for i,v in pairs(keys) do\n"
-   "    if ttl > 0 then\n"
-   "      redis.call('expire', v, ttl)\n"
-   "    else\n"
-   "      redis.call('persist', v)\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local random_safe_next_ttl = function(ttl)\n"
-   "  return math.floor(ttl/2 + ttl/2.1 * math.random())\n"
-   "end\n"
-   "\n"
-   "local sub_count\n"
-   "\n"
-   "if sub_id == \"-\" then\n"
-   "  sub_id = tonumber(redis.call('HINCRBY', keys.channel, \"last_subscriber_id\", 1))\n"
-   "  sub_count=tonumber(redis.call('hincrby', keys.channel, 'subscribers', 1))\n"
-   "else\n"
-   "  sub_count=tonumber(redis.call('hget', keys.channel, 'subscribers'))\n"
-   "end\n"
-   "\n"
-   "local next_keepalive \n"
-   "local actual_ttl = tonumber(redis.call('ttl', keys.channel))\n"
-   "if actual_ttl < active_ttl then\n"
-   "  setkeyttl(active_ttl)\n"
-   "  next_keepalive = random_safe_next_ttl(active_ttl)\n"
-   "else\n"
-   "  next_keepalive = random_safe_next_ttl(actual_ttl)\n"
-   "end\n"
-   "\n"
-   "return {sub_id, sub_count, next_keepalive}\n"},
-
-  {"subscriber_unregister", "841cddb1a9ae8af8f25df7ee53fa8739abdd6f76",
-   "--input: keys: [], values: [channel_id, subscriber_id, empty_ttl]\n"
-   "-- 'subscriber_id' is an existing id\n"
-   "-- 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec\n"
-   "--output: subscriber_id, num_current_subscribers\n"
-   "\n"
-   "local id, sub_id, empty_ttl = ARGV[1], ARGV[2], tonumber(ARGV[3]) or 20\n"
-   "\n"
-   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
-   "\n"
-   "redis.call('echo', ' ######## SUBSCRIBER UNREGISTER SCRIPT ####### ')\n"
-   "local ch=('{channel:%s}'):format(id)\n"
-   "local keys = {\n"
-   "  channel =     ch,\n"
-   "  messages =    ch..':messages',\n"
-   "  subscribers = ch..':subscribers',\n"
-   "}\n"
-   "\n"
-   "local setkeyttl=function(ttl)\n"
-   "  for i,v in pairs(keys) do\n"
-   "    if ttl > 0 then\n"
-   "      redis.call('expire', v, ttl)\n"
-   "    elseif ttl < 0 then\n"
-   "      redis.call('persist', v)\n"
-   "    else\n"
-   "      redis.call('del', v)\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local sub_count = 0\n"
-   "\n"
-   "local res = redis.pcall('EXISTS', keys.channel)\n"
-   "if type(res) == \"table\" and res[\"err\"] then\n"
-   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(empty_ttl, id)}\n"
-   "end\n"
-   "\n"
-   "if res ~= 0 then\n"
-   "   sub_count = redis.call('hincrby', keys.channel, 'subscribers', -1)\n"
-   "\n"
-   "  if sub_count == 0 and tonumber(redis.call('LLEN', keys.messages)) == 0 then\n"
-   "    setkeyttl(empty_ttl)\n"
-   "  elseif sub_count < 0 then\n"
-   "    return {err=\"Subscriber count for channel \" .. id .. \" less than zero: \" .. sub_count}\n"
-   "  end\n"
-   "else\n"
-   "  --dbg(\"channel \", id, \" already gone\")\n"
-   "end\n"
-   "\n"
-   "return {sub_id, sub_count}\n"}
-};
-
-const int redis_lua_scripts_count=11;
+redis_lua_scripts_t redis_lua_scripts;
+const int redis_lua_scripts_count;
 #define REDIS_LUA_SCRIPTS_EACH(script) \
 for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++) 
diff --git a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
index 4c4f351..4f64faa 100644
--- a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
+++ b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
@@ -31,7 +31,7 @@ void redis_nginx_init(void) {
 }
 
 
-redisAsyncContext *redis_nginx_open_context(ngx_str_t *host, int port, int database, ngx_str_t *password, void *privdata, redisAsyncContext **context) {
+redisAsyncContext *redis_nginx_open_context(ngx_str_t *host, int port, void *privdata) {
   redisAsyncContext *ac = NULL;
   u_char             hostchr[1024] = {0};
   if(host->len >= 1023) {
@@ -39,28 +39,25 @@ redisAsyncContext *redis_nginx_open_context(ngx_str_t *host, int port, int datab
     return NULL;
   }
   ngx_memcpy(hostchr, host->data, host->len);
+  ac = redisAsyncConnect((const char *)hostchr, port);
+  if (ac == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not allocate the redis context for %V:%d", host, port);
+    return NULL;
+  }
   
-  if ((context == NULL) || (*context == NULL) || (*context)->err) {
-    ac = redisAsyncConnect((const char *)hostchr, port);
-    if (ac == NULL) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not allocate the redis context for %V:%d", host, port);
-      return NULL;
-    }
-    
-    if (ac->err) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not create the redis context for %V:%d - %s", host, port, ac->errstr);
-      redisAsyncFree(ac);
-      *context = NULL;
-      return NULL;
-    }
-    
-    if(redis_nginx_event_attach(ac) == REDIS_OK) {
-      ac->data = privdata;
-      *context = ac;
-    }
+  if (ac->err) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not create the redis context for %V:%d - %s", host, port, ac->errstr);
+    redisAsyncFree(ac);
+    return NULL;
+  }
+  
+  if(redis_nginx_event_attach(ac) == REDIS_OK) {
+    ac->data = privdata;
   }
   else {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: redis context already open");
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not attach nginx events %V:%d", host, port);
+    redisAsyncFree(ac);
+    return NULL;
   }
 
   return ac;
@@ -141,7 +138,8 @@ void redis_nginx_ping_callback(redisAsyncContext *ac, void *rep, void *privdata)
 
 void redis_nginx_read_event(ngx_event_t *ev) {
   redisAsyncContext *ac = ((ngx_connection_t *)ev->data)->data;
-  int                bytes_left;
+  int                fd = ac->c.fd; //because redisAsyncHandleRead might free the redisAsyncContext
+  int                bytes_left = 0;
   redisAsyncHandleRead(ac);
   
   // we need to do this because hiredis, in its infinite wisdom, will read at 
@@ -149,7 +147,7 @@ void redis_nginx_read_event(ngx_event_t *ev) {
   // whole amount in one gulp. Otherwise, we could just check if 16Kb have 
   //been read and try again. But no, apparently that's not an option.
   
-  ioctl(ac->c.fd, FIONREAD, &bytes_left);
+  ioctl(fd, FIONREAD, &bytes_left);
   if (bytes_left > 0 && !ac->err) {
     //ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "again!");
     redis_nginx_read_event(ev);
@@ -217,22 +215,16 @@ void redis_nginx_cleanup(void *privdata) {
   if (privdata) {
     ngx_connection_t *connection = (ngx_connection_t *) privdata;
     redisAsyncContext *ac = (redisAsyncContext *) connection->data;
-    if (ac->err) {
-      //nchan_store_redis_connection_close_handler(ac);
-      //ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: connection to redis failed - %s", ac->errstr);
-      /**
-        * If the context had an error but the fd still valid is because another context got the same fd from OS.
-        * So we clean the reference to this fd on redisAsyncContext and on ngx_connection, avoiding close a socket in use.
-        */
-      if (redis_nginx_fd_is_valid(ac->c.fd)) {
-        ac->c.fd = -1;
-        connection->fd = NGX_INVALID_FILE;
-      }
-    }
+    // don't care why the connection is being cleaned up. if there's an error, close the fd. if an fd was being shared between
+    // workers or connections -- tough luck
     
     if ((connection->fd != NGX_INVALID_FILE)) {
-      redis_nginx_del_read(privdata);
-      redis_nginx_del_write(privdata);
+      if(connection->read->active) {
+        redis_nginx_del_read(privdata);
+      }
+      if(connection->write->active) {
+        redis_nginx_del_write(privdata);
+      }
       ngx_close_connection(connection);
     } else {
       ngx_free_connection(connection);
diff --git a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
index 716c397..ea11329 100644
--- a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
+++ b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
@@ -2,11 +2,16 @@
 #ifndef __REDIS_NGINX_ADAPTER_H
 #define __REDIS_NGINX_ADAPTER_H
 
+#if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
 #include <hiredis/hiredis.h>
 #include <hiredis/async.h>
+#else
+#include <store/redis/hiredis/hiredis.h>
+#include <store/redis/hiredis/async.h>
+#endif
 
 void redis_nginx_init(void);
-redisAsyncContext *redis_nginx_open_context(ngx_str_t *host, int port, int database, ngx_str_t *password, void *privdata, redisAsyncContext **context);
+redisAsyncContext *redis_nginx_open_context(ngx_str_t *host, int port, void *privdata);
 redisContext *redis_nginx_open_sync_context(ngx_str_t *host, int port, int database, ngx_str_t *password, redisContext **context);
 void redis_nginx_force_close_context(redisAsyncContext **context);
 void redis_nginx_close_context(redisAsyncContext **context);
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset.c b/debian/modules/nchan/src/store/redis/redis_nodeset.c
new file mode 100644
index 0000000..4994eae
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis_nodeset.c
@@ -0,0 +1,2179 @@
+#include "redis_nodeset.h"
+
+#include <assert.h>
+#include "store-private.h"
+#include <store/store_common.h>
+#include "store.h"
+#include "redis_nginx_adapter.h"
+#include "redis_nodeset_parser.h"
+#include "redis_lua_commands.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REDIS NODESET: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS NODESET: " fmt, ##args)
+
+static redis_nodeset_t  redis_nodeset[NCHAN_MAX_NODESETS];
+static int              redis_nodeset_count = 0;
+static char            *redis_worker_id = NULL;
+static redisCallbackFn *redis_subscribe_callback = NULL;
+
+typedef struct {
+  ngx_event_t      ev;
+  ngx_int_t      (*cb)(redis_nodeset_t *, void *);
+  void            *pd;
+  redis_nodeset_t *ns;
+} nodeset_onready_callback_t;
+
+
+static ngx_str_t       default_redis_url = ngx_string(NCHAN_REDIS_DEFAULT_URL);
+
+static void node_connector_callback(redisAsyncContext *ac, void *rep, void *privdata);
+static int nodeset_cluster_keyslot_space_complete(redis_nodeset_t *ns);
+
+static void *rbtree_cluster_keyslots_node_id(void *data) {
+  return &((redis_nodeset_slot_range_node_t *)data)->range;
+}
+static uint32_t rbtree_cluster_keyslots_bucketer(void *vid) {
+  return 1; //no buckets
+}
+static ngx_int_t rbtree_cluster_keyslots_compare(void *v1, void *v2) {
+  redis_slot_range_t   *r1 = v1;
+  redis_slot_range_t   *r2 = v2;
+  
+  if(r1->max < r2->min) //r1 is strictly left of r2
+    return -1;
+  else if(r1->min > r2->max) //r1 is strictly right of r2
+    return 1;
+  else //there's an overlap
+    return 0;
+}
+
+static int nodeset_cluster_node_index_keyslot_ranges(redis_node_t *node) {
+  unsigned                         i;
+  ngx_rbtree_node_t               *rbtree_node;
+  redis_nodeset_slot_range_node_t *keyslot_tree_node;
+  rbtree_seed_t                   *tree = &node->nodeset->cluster.keyslots;
+  if(node->cluster.slot_range.indexed) {
+    node_log_error(node, "cluster keyslot range already indexed");
+    return 0;
+  }
+  
+  for(i=0; i<node->cluster.slot_range.n; i++) {
+    if(nodeset_node_find_by_range(node->nodeset, &node->cluster.slot_range.range[i])) { //overlap!
+      return 0;
+    }
+  }
+  
+  for(i=0; i<node->cluster.slot_range.n; i++) {
+    rbtree_node = rbtree_create_node(tree, sizeof(*keyslot_tree_node));
+    keyslot_tree_node = rbtree_data_from_node(rbtree_node);
+    keyslot_tree_node->range = node->cluster.slot_range.range[i];
+    keyslot_tree_node->node = node;
+    if(rbtree_insert_node(tree, rbtree_node) != NGX_OK) {
+      node_log_error(node, "couldn't insert keyslot node range %d-%d", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
+      rbtree_destroy_node(tree, rbtree_node);
+      return 0;
+    }
+    else {
+      node_log_info(node, "inserted keyslot node range %d-%d", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
+    }
+  }
+  node->cluster.slot_range.indexed = 1;
+  return 1;
+}
+/*
+static ngx_int_t print_slot_range_node(rbtree_seed_t *tree, void *node_data, void *privdata) {
+  redis_nodeset_slot_range_node_t        *rangenode = node_data;
+  node_log_notice(rangenode->node, "slots [%d - %d]", rangenode->range.min, rangenode->range.max);
+  return NGX_OK;
+}
+*/
+static int nodeset_cluster_node_unindex_keyslot_ranges(redis_node_t *node) {
+  ngx_rbtree_node_t               *rbtree_node;
+  redis_slot_range_t              *range;
+  rbtree_seed_t                   *tree = &node->nodeset->cluster.keyslots;
+  unsigned                         i;
+  if(!node->cluster.slot_range.indexed) {
+    //node_log_notice(node, "already unindexed");
+    return 1;
+  }
+  //node_log_notice(node, "unindex keyslot ranges");
+  
+  //rbtree_walk_incr(tree, print_slot_range_node, NULL);
+  
+  for(i=0; i<node->cluster.slot_range.n; i++) {
+    range = &node->cluster.slot_range.range[i];
+    //node_log_notice(node, "unindexing range [%d - %d]", range->min, range->max);
+    if((rbtree_node = rbtree_find_node(tree, range)) != NULL) {
+      rbtree_remove_node(tree, rbtree_node);
+      rbtree_destroy_node(tree, rbtree_node);
+    }
+    else {
+      node_log_error(node, "unable to unindex keyslot range %d-%d: range not found in tree", range->min, range->max);
+      raise(SIGABRT);
+    }
+  }
+  node->cluster.slot_range.indexed = 0;
+  return 1;
+}
+
+#if REDIS_NODESET_DBG
+
+
+static ngx_int_t nodeset_debug_rangetree_collector(rbtree_seed_t *tree, void *node_data, void *privdata) {
+  redis_nodeset_slot_range_node_t     *rangenode = node_data;
+  redis_nodeset_dbg_range_tree_t      *dbg = privdata;
+  dbg->node[dbg->n].range = rangenode->range;
+  dbg->node[dbg->n].node = rangenode->node;
+  dbg->n++;
+  return NGX_OK;
+}
+
+static redis_node_dbg_list_t *nodeset_update_debuginfo(redis_nodeset_t *nodeset) {
+  rbtree_seed_t         *tree = &nodeset->cluster.keyslots;
+  redis_node_dbg_list_t *node_dbg = &nodeset->dbg.nodes;
+  redis_node_t  *cur;
+  ngx_memzero(&nodeset->dbg, sizeof(nodeset->dbg));
+  for(cur = nchan_list_first(&nodeset->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    node_dbg->node[node_dbg->n++]=cur;
+  }
+  nodeset->dbg.keyspace_complete = nodeset_cluster_keyslot_space_complete(nodeset);
+  rbtree_walk_incr(tree, nodeset_debug_rangetree_collector, &nodeset->dbg.ranges);
+  return NGX_OK;
+}
+#endif
+
+static const char *__rcp_cstr(redis_connect_params_t *rcp, char *buf) {
+  ngx_snprintf((u_char *)buf, 512, "%V:%d%Z", &rcp->hostname, rcp->port, &rcp->peername);
+  return buf;
+}
+
+static const char *__node_cstr(redis_node_t *node, char *buf) {
+  return __rcp_cstr(&node->connect_params, buf);
+}
+
+static const char *rcp_cstr(redis_connect_params_t *rcp) {
+  static char    buf[512];
+  return __rcp_cstr(rcp, buf);
+}
+static const char *node_cstr(redis_node_t *node) {
+  return rcp_cstr(&node->connect_params);
+}
+
+#define MAX_RUN_ID_LENGTH 64
+#define MAX_CLUSTER_ID_LENGTH 64
+#define MAX_VERSION_LENGTH 16
+typedef struct {
+  redis_node_t    node;
+  u_char          peername[INET6_ADDRSTRLEN + 2];
+  u_char          run_id[MAX_RUN_ID_LENGTH];
+  u_char          cluster_id[MAX_CLUSTER_ID_LENGTH];
+  u_char          version[MAX_VERSION_LENGTH];
+} node_blob_t;
+
+static void nodeset_check_status_event(ngx_event_t *ev);
+
+int nodeset_ready(redis_nodeset_t *nodeset) {
+  return nodeset && nodeset->status == REDIS_NODESET_READY;
+}
+
+ngx_int_t nodeset_initialize(char *worker_id, redisCallbackFn *subscribe_handler) {
+  redis_worker_id = worker_id;
+  redis_subscribe_callback = subscribe_handler;
+  return NGX_OK;
+}
+
+redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf) {
+  nchan_redis_conf_t  *rcf = &lcf->redis;
+  redis_nodeset_t     *ns = &redis_nodeset[redis_nodeset_count]; //incremented once everything is ok
+  assert(rcf->enabled);
+  assert(!rcf->nodeset);
+  
+  ns->first_loc_conf = lcf;
+  
+  if(redis_nodeset_count >= NCHAN_MAX_NODESETS) {
+    nchan_log_error("Cannot create more than %d Redis nodesets", NCHAN_MAX_NODESETS);
+    return NULL;
+  }
+  
+  assert(!nodeset_find(rcf)); //must be unique
+  
+  nchan_list_init(&ns->urls, sizeof(ngx_str_t *), "redis urls");
+  nchan_list_init(&ns->nodes, sizeof(node_blob_t), "redis nodes");
+  nchan_list_init(&ns->onready_callbacks, sizeof(nodeset_onready_callback_t), "nodeset onReady callbacks");
+  
+  nchan_slist_init(&ns->channels.all, rdstore_channel_head_t, redis.slist.nodeset.prev, redis.slist.nodeset.next);
+  nchan_slist_init(&ns->channels.disconnected_cmd, rdstore_channel_head_t, redis.slist.node_cmd.prev, redis.slist.node_cmd.next);
+  nchan_slist_init(&ns->channels.disconnected_pubsub, rdstore_channel_head_t, redis.slist.node_pubsub.prev, redis.slist.node_pubsub.next);
+  
+  ns->reconnect_delay_sec = 5;
+  ns->current_status_times_checked = 0;
+  ns->current_status_start = 0;
+  ns->generation = 0;
+  ns->settings.namespace = &rcf->namespace;
+  ns->settings.storage_mode = rcf->storage_mode;
+  ns->settings.nostore_fastpublish = rcf->nostore_fastpublish;
+  
+  ns->settings.ping_interval = rcf->ping_interval;
+  
+  ns->status = REDIS_NODESET_DISCONNECTED;
+  ngx_memzero(&ns->status_check_ev, sizeof(ns->status_check_ev));
+  ns->status_msg = NULL;
+  nchan_init_timer(&ns->status_check_ev, nodeset_check_status_event, ns);
+  
+  //init cluster stuff
+  ns->cluster.enabled = 0;
+  rbtree_init(&ns->cluster.keyslots, "redis cluster node (by keyslot) data", rbtree_cluster_keyslots_node_id, rbtree_cluster_keyslots_bucketer, rbtree_cluster_keyslots_compare);
+  
+  //urls
+  if(rcf->upstream) {
+    nchan_srv_conf_t           *scf = NULL;
+    scf = ngx_http_conf_upstream_srv_conf(rcf->upstream, ngx_nchan_module);
+    
+    ngx_uint_t                   i;
+    ngx_array_t                 *servers = rcf->upstream->servers;
+    ngx_http_upstream_server_t  *usrv = servers->elts;
+    ngx_str_t                   *upstream_url, **urlref;
+    ns->upstream = rcf->upstream;
+    
+    ns->settings.connect_timeout = scf->redis.connect_timeout == NGX_CONF_UNSET_MSEC ? NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC : scf->redis.connect_timeout;
+    ns->settings.node_weight.master = scf->redis.master_weight == NGX_CONF_UNSET ? 1 : scf->redis.master_weight;
+    ns->settings.node_weight.slave = scf->redis.slave_weight == NGX_CONF_UNSET ? 1 : scf->redis.slave_weight;
+    
+    ns->settings.optimize_target = scf->redis.optimize_target == NCHAN_REDIS_OPTIMIZE_UNSET ? NCHAN_REDIS_OPTIMIZE_CPU : scf->redis.optimize_target;
+    
+    for(i=0; i < servers->nelts; i++) {
+#if nginx_version >= 1007002
+      upstream_url = &usrv[i].name;
+#else
+      upstream_url = &usrv[i].addrs->name;
+#endif
+      urlref = nchan_list_append(&ns->urls);
+      *urlref = upstream_url;
+    }
+  }
+  else {
+    ns->upstream = NULL;
+    ns->settings.connect_timeout = NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC;
+    ns->settings.node_weight.master = 1;
+    ns->settings.node_weight.slave = 1;
+    ngx_str_t **urlref = nchan_list_append(&ns->urls);
+    *urlref = rcf->url.len > 0 ? &rcf->url : &default_redis_url;
+  }
+  DBG("nodeset created");
+  redis_nodeset_count++;
+  rcf->nodeset = ns;
+  return ns;
+}
+
+redis_nodeset_t *nodeset_find(nchan_redis_conf_t *rcf) {
+  if(rcf->nodeset) {
+    return rcf->nodeset;
+  }
+  else {
+    int              i;
+    redis_nodeset_t *ns;
+    for(i=0; i<redis_nodeset_count; i++) {
+      ns = &redis_nodeset[i];
+      if(nchan_ngx_str_match(&rcf->namespace, ns->settings.namespace) && rcf->storage_mode == ns->settings.storage_mode) {
+        if(rcf->upstream) {
+          if(ns->upstream == rcf->upstream)
+            return ns;
+        }
+        else {
+          ngx_str_t *search_url = rcf->url.len > 0 ? &rcf->url : &default_redis_url;
+          ngx_str_t **first_url = nchan_list_first(&ns->urls);
+          
+          if(first_url && nchan_ngx_str_match(search_url, *first_url)) {
+            //cache it
+            rcf->nodeset = ns;
+            if(rcf->ping_interval > 0 && ns->settings.ping_interval > rcf->ping_interval) {
+              //use the smallest ping interval found in the settings
+              ns->settings.ping_interval = rcf->ping_interval;
+            }
+            return ns;
+          }
+        }
+      }
+    }
+    return NULL;
+  }
+}
+
+static int node_transfer_slaves(redis_node_t *src, redis_node_t *dst) {
+  int transferred = 0;
+  redis_node_t  **cur;
+  for(cur = nchan_list_first(&src->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
+    node_set_master_node(*cur, dst);
+    node_add_slave_node(dst, *cur); //won't be added if it's already there
+    transferred++;
+  }
+  return transferred;
+}
+
+static int equal_redis_connect_params(void *d1, void *d2) {
+  redis_connect_params_t *cp1 = d1;
+  redis_connect_params_t *cp2 = d2;
+  if(cp1->port != cp2->port || cp1->db != cp2->db) {
+    return 0;  
+  }
+  if( nchan_ngx_str_nonzero_match(&cp1->hostname, &cp2->hostname)
+   || nchan_ngx_str_nonzero_match(&cp1->peername, &cp2->peername)
+   || nchan_ngx_str_nonzero_match(&cp1->peername, &cp2->hostname)
+   || nchan_ngx_str_nonzero_match(&cp1->hostname, &cp2->peername)) {
+    return 1;
+  }
+  else {
+    return 0;
+  }
+}
+
+static int equal_nonzero_strings(void *s1, void *s2) {
+  return ((ngx_str_t *)s1)->len > 0 && ((ngx_str_t *)s2)->len > 0 && 
+    nchan_ngx_str_match((ngx_str_t *)s1, (ngx_str_t *)s2);
+}
+
+typedef struct {
+  char          *name;
+  off_t          offset;
+  int          (*match)(void *, void *);
+} node_match_t;
+
+static struct {
+  node_match_t    run_id;
+  node_match_t    cluster_id;
+  node_match_t    connect_params;
+} _node_match = {
+  .run_id =          {"run_id",      offsetof(redis_node_t, run_id),          equal_nonzero_strings},
+  .cluster_id =      {"cluster_id",  offsetof(redis_node_t, cluster.id),      equal_nonzero_strings},
+  .connect_params =  {"url",         offsetof(redis_node_t, connect_params),  equal_redis_connect_params}
+};
+
+static int nodeset_node_deduplicate_by(redis_node_t *node, node_match_t *match) {
+  redis_node_t   *cur;
+  void *d1, *d2;
+  d1 = &((char *)node)[match->offset];
+  for(cur = nchan_list_first(&node->nodeset->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    d2 = &((char *)cur)[match->offset];
+    if(cur != node && match->match(d1, d2)) {
+      node_log_notice(node, "deduplicated by %s", match->name);
+      node_transfer_slaves(node, cur); //node->cur
+      nodeset_node_destroy(node);
+      return 1;
+    }
+  }
+  return 0;
+}
+
+int nodeset_node_deduplicate_by_connect_params(redis_node_t *node) {
+  return nodeset_node_deduplicate_by(node, &_node_match.connect_params);
+}
+int nodeset_node_deduplicate_by_run_id(redis_node_t *node) {
+  return nodeset_node_deduplicate_by(node, &_node_match.run_id);
+}
+int nodeset_node_deduplicate_by_cluster_id(redis_node_t *node) {
+  return nodeset_node_deduplicate_by(node, &_node_match.cluster_id);
+}
+
+static redis_node_t *nodeset_node_find_by(redis_nodeset_t *ns, node_match_t *match, void *data) {
+  redis_node_t *cur;
+  void *d2;
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    d2 = &((char *)cur)[match->offset];
+    if(match->match(data, d2)) {
+      return cur;
+    }
+  }
+  return NULL;
+}
+redis_node_t *nodeset_node_find_by_connect_params(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
+  return nodeset_node_find_by(ns, &_node_match.connect_params, rcp);
+}
+redis_node_t *nodeset_node_find_by_run_id(redis_nodeset_t *ns, ngx_str_t *run_id) {
+  return nodeset_node_find_by(ns, &_node_match.run_id, run_id);
+}
+redis_node_t *nodeset_node_find_by_cluster_id(redis_nodeset_t *ns, ngx_str_t *cluster_id) {
+  return nodeset_node_find_by(ns, &_node_match.cluster_id, cluster_id);
+}
+
+static int keyslot_ranges_overlap(redis_slot_range_t *r1, redis_slot_range_t *r2) {
+  return rbtree_cluster_keyslots_compare(r1, r2) == 0;
+}
+
+redis_node_t *nodeset_node_find_by_range(redis_nodeset_t *ns, redis_slot_range_t *range) {
+  ngx_rbtree_node_t                   *rbtree_node;
+  redis_nodeset_slot_range_node_t     *keyslot_tree_node;
+  
+  if((rbtree_node = rbtree_find_node(&ns->cluster.keyslots, range)) != NULL) {
+    keyslot_tree_node = rbtree_data_from_node(rbtree_node);
+    assert(keyslot_ranges_overlap(range, &keyslot_tree_node->range));
+    return keyslot_tree_node->node;
+  }
+  else {
+    return NULL;
+  }
+}
+
+redis_node_t *nodeset_node_find_by_slot(redis_nodeset_t *ns, uint16_t slot) {
+  redis_slot_range_t range;
+  range.min = slot;
+  range.max = slot;
+  return nodeset_node_find_by_range(ns, &range);
+}
+redis_node_t *nodeset_node_find_any_ready_master(redis_nodeset_t *ns) {
+  redis_node_t *cur;
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    if(cur->state >= REDIS_NODE_READY && cur->role == REDIS_NODE_ROLE_MASTER) {
+      return cur;
+    }
+  }
+  return NULL;
+}
+
+redis_node_t *nodeset_node_find_by_channel_id(redis_nodeset_t *ns, ngx_str_t *channel_id) {
+  redis_node_t      *node;
+  static uint16_t    prefix_crc = 0;
+  uint16_t           slot;
+  
+  if(!ns->cluster.enabled) {
+    node = nodeset_node_find_any_ready_master(ns);
+  }
+  else {
+    if(prefix_crc == 0) {
+      prefix_crc = redis_crc16(0, "channel:", 8);
+    }
+    slot = redis_crc16(prefix_crc, (const char *)channel_id->data, channel_id->len) % 16384;
+    //DBG("channel id %V (key {channel:%V}) slot %i", str, str, slot);
+    
+    node = nodeset_node_find_by_slot(ns, slot);
+  }
+  
+#if REDIS_NODESET_DBG
+  if(node == NULL) {
+    nodeset_update_debuginfo(ns);
+    raise(SIGABRT);
+  }
+#endif
+  
+  return node;
+}
+
+redis_node_t *nodeset_node_find_by_key(redis_nodeset_t *ns, ngx_str_t *key) {
+  if(!ns->cluster.enabled) {
+    return nodeset_node_find_any_ready_master(ns);
+  }
+  
+  char        *start, *end;
+  ngx_str_t    hashable;
+  uint16_t     slot;
+  
+  if(((start = memchr(key->data, '{', key->len))) != NULL) {
+    start++;
+    end = memchr(start, '}', key->len - ((u_char *)start - key->data));
+    if(end && end - start > 1) {
+      hashable.data = (u_char *)start;
+      hashable.len = (end - start);
+    }
+    else {
+      hashable = *key;
+      // not quite right -- need to ignore zero-length {} and scan to the next {
+      // but it's good enough for the keys we're using
+    }
+  }
+  else {
+    hashable = *key;
+  }
+  slot = redis_crc16(0, (const char *)hashable.data, hashable.len) % 16384;
+  
+  return nodeset_node_find_by_slot(ns, slot);
+}
+
+static void ping_command_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                 *reply = rep;
+  redis_node_t               *node = privdata;
+  if(!reply || reply->type == REDIS_REPLY_ERROR || !ac || ac->err) {
+    node_log_error(node, "node ping failed");
+    return;
+  }
+  node_log_debug(node, "node ping command reply ok");
+}
+
+static void node_ping_event(ngx_event_t *ev) {
+  redis_node_t       *node = ev->data;
+  redis_nodeset_t    *ns = node->nodeset;
+  if(!ev->timedout || ngx_exiting || ngx_quit)
+    return;
+  
+  node_log_debug(node, "node ping event");
+  
+  ev->timedout = 0;
+  if(node->state == REDIS_NODE_READY) {
+    assert(node->ctx.cmd);
+    
+    //we used to PUBLISH to the correct keyslot-mapped cluster node
+    //but Redis clusters don't shard the PUBSUB keyspace, so this discrimination isn't necessary
+    //just publish the damn thing if this is a master node, and just a PING for slaves
+    if(node->role == REDIS_NODE_ROLE_MASTER) {
+      redisAsyncCommand(node->ctx.cmd, ping_command_callback, node, "PUBLISH %s ping", redis_worker_id);
+    }
+    else {
+      redisAsyncCommand(node->ctx.cmd, ping_command_callback, node, "PING");
+    }
+    
+    if(ns->settings.ping_interval > 0) {
+      ngx_add_timer(ev, ns->settings.ping_interval * 1000);
+    }
+  }
+}
+
+redis_node_t *nodeset_node_create_with_space(redis_nodeset_t *ns, redis_connect_params_t *rcp, size_t extra_space, void **extraspace_ptr) {
+  assert(!nodeset_node_find_by_connect_params(ns, rcp));
+  node_blob_t      *node_blob;
+  if(extra_space == 0) {
+    assert(extraspace_ptr == NULL);
+    node_blob = nchan_list_append(&ns->nodes);
+  }
+  else {
+    assert(extraspace_ptr);
+    node_blob = nchan_list_append_sized(&ns->nodes, sizeof(*node_blob)+extra_space);
+    if(extra_space) {
+      *extraspace_ptr = (void *)(&node_blob[1]);
+    }
+  }
+  redis_node_t     *node = &node_blob->node;
+  
+  assert((void *)node_blob == (void *)node);
+  assert(node);
+  node->role = REDIS_NODE_ROLE_UNKNOWN,
+  node->state = REDIS_NODE_DISCONNECTED;
+  node->discovered = 0;
+  node->connect_timeout = NULL;
+  node->connect_params = *rcp;
+  node->connect_params.peername.data = node_blob->peername;
+  node->connect_params.peername.len = 0;
+  node->cluster.id.len = 0;
+  node->cluster.id.data = node_blob->cluster_id;
+  node->cluster.enabled = 0;
+  node->cluster.ok = 0;
+  node->cluster.slot_range.indexed = 0;
+  node->cluster.slot_range.n = 0;
+  node->cluster.slot_range.range = NULL;
+  node->pending_commands = 0;
+  node->run_id.len = 0;
+  node->run_id.data = node_blob->run_id;
+  node->nodeset = ns;
+  node->generation = 0;
+  
+  nchan_slist_init(&node->channels.cmd, rdstore_channel_head_t, redis.slist.node_cmd.prev, redis.slist.node_cmd.next);
+  nchan_slist_init(&node->channels.pubsub, rdstore_channel_head_t, redis.slist.node_pubsub.prev, redis.slist.node_pubsub.next);
+  
+  node->peers.master = NULL;
+  nchan_list_init(&node->peers.slaves, sizeof(redis_node_t *), "node slaves");
+  
+  ngx_memzero(&node->ping_timer, sizeof(node->ping_timer));
+  nchan_init_timer(&node->ping_timer, node_ping_event, node);
+  
+  node->ctx.cmd = NULL;
+  node->ctx.pubsub = NULL;
+  node->ctx.sync = NULL;
+  
+  assert(nodeset_node_find_by_connect_params(ns, rcp));
+  return node;
+}
+
+redis_node_t *nodeset_node_create(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
+  return nodeset_node_create_with_space(ns, rcp, 0, NULL);
+}
+
+redis_node_t *nodeset_node_create_with_connect_params(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
+  redis_node_t  *node;
+  u_char        *space;
+  size_t         sz = rcp->hostname.len + rcp->password.len;
+  node = nodeset_node_create_with_space(ns, rcp, sz, (void **)&space);
+  assert(node);
+  node->connect_params.hostname.data = space;
+  node->connect_params.hostname.len = 0;
+  nchan_strcpy(&node->connect_params.hostname, &rcp->hostname, 0);
+  node->connect_params.password.data = &space[rcp->hostname.len];
+  nchan_strcpy(&node->connect_params.password, &rcp->password, 0);
+  return node;
+}
+
+static void node_remove_peer(redis_node_t *node, redis_node_t *peer) {
+  redis_node_t  **cur;
+  if(node->peers.master == peer) {
+    node->peers.master = NULL;
+  }
+  
+  for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
+    if(*cur == peer) {
+      nchan_list_remove(&node->peers.slaves, cur);
+      return;
+    }
+  }
+}
+
+ngx_int_t nodeset_node_destroy(redis_node_t *node) {
+  redisAsyncContext *ac;
+  redisContext      *c;
+  node_set_role(node, REDIS_NODE_ROLE_UNKNOWN); //removes from all peer lists, and clears own slave list
+  if((ac = node->ctx.cmd) != NULL) {
+    node->ctx.cmd = NULL;
+    redisAsyncFree(ac);
+  }
+  if((ac = node->ctx.pubsub) != NULL) { 
+    node->ctx.pubsub = NULL;
+    redisAsyncFree(ac);
+  }
+  if((c = node->ctx.sync) != NULL) {
+    node->ctx.sync = NULL;
+    redisFree(c);
+  }
+  if(node->connect_timeout) {
+    nchan_abort_oneshot_timer(node->connect_timeout);
+    node->connect_timeout = NULL;
+  }
+  nchan_list_remove(&node->nodeset->nodes, node);
+  return NGX_OK;
+}
+
+static void node_discover_slave(redis_node_t *master, redis_connect_params_t *rcp) {
+  redis_node_t    *slave;
+  if((slave = nodeset_node_find_by_connect_params(master->nodeset, rcp))!= NULL) {
+    //we know about it already
+    if(slave->role != REDIS_NODE_ROLE_SLAVE && slave->state > REDIS_NODE_GET_INFO) {
+      node_log_notice(slave, "Node appears to have changed to slave -- need to update");
+      node_set_role(slave, REDIS_NODE_ROLE_UNKNOWN);
+      node_disconnect(slave, REDIS_NODE_FAILED);
+      node_connect(slave);
+    }
+    //assert(slave->peers.master == master);
+  }
+  else {
+    slave = nodeset_node_create_with_connect_params(master->nodeset, rcp);
+    slave->discovered = 1;
+    node_set_role(slave, REDIS_NODE_ROLE_SLAVE);
+    node_log_notice(master, "Discovering own slave %s", rcp_cstr(rcp));
+  }
+  node_set_master_node(slave, master); //this is idempotent
+  node_add_slave_node(master, slave);  //so is this
+  //try to connect
+  if(slave->state <= REDIS_NODE_DISCONNECTED) {
+    node_connect(slave);
+  }
+}
+
+static void node_discover_master(redis_node_t  *slave, redis_connect_params_t *rcp) {
+  redis_node_t *master;
+  if ((master = nodeset_node_find_by_connect_params(slave->nodeset, rcp)) != NULL) {
+      if(master->role != REDIS_NODE_ROLE_MASTER && master->state > REDIS_NODE_GET_INFO) {
+        node_log_notice(master, "Node appears to have changed to master -- need to update");
+        node_set_role(master, REDIS_NODE_ROLE_UNKNOWN);
+        node_disconnect(master, REDIS_NODE_FAILED);
+        node_connect(master);
+      }
+    //assert(node_find_slave_node(master, slave));
+    //node_log_notice(slave, "Discovering master %s... already known", rcp_cstr(rcp));
+  }
+  else {
+    master = nodeset_node_create_with_connect_params(slave->nodeset, rcp);
+    master->discovered = 1;
+    node_set_role(master, REDIS_NODE_ROLE_MASTER);
+    node_log_notice(slave, "Discovering own master %s", rcp_cstr(rcp));
+  }
+  node_set_master_node(slave, master);
+  node_add_slave_node(master, slave);
+  //try to connect
+  if(master->state <= REDIS_NODE_DISCONNECTED) {
+    node_connect(master);
+  }
+}
+
+static int node_skip_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l) {
+  redis_connect_params_t   rcp;
+  char                    *description = "";
+  char                    *role = NULL;
+  ngx_uint_t               loglevel = NGX_LOG_NOTICE;
+  rcp.hostname = l->hostname;
+  rcp.port = l->port;
+  rcp.peername.len = 0;
+  rcp.db = node->connect_params.db;
+  rcp.password = node->connect_params.password;
+  
+  if(l->noaddr) {
+    role = "node";
+    description = "no-address";
+    return 1;
+  }
+  else if(l->handshake) {
+    role = "node";
+    description = "handshaking";
+    
+  }
+  else if(l->hostname.len == 0) {
+    role = "node";
+    description = "empty hostname";
+  }
+  else if(l->failed) {
+    description = "failed";
+  }
+  else if(!l->connected) {
+    description = "disconnected";
+  }
+  else if(l->self) {
+    description = "self";
+    loglevel = NGX_LOG_INFO;
+  }
+  else {
+    return 0;
+  }
+  if(!role) role = l->master ? "master" : "slave";
+  node_log(node, loglevel, "Skipping %s cluster %s %s", description, role, rcp_cstr(&rcp));
+  return 1;
+}
+
+static int node_discover_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l) {
+  redis_connect_params_t   rcp;
+  redis_node_t            *peer;
+  assert(!l->self);
+  if(l->failed || !l->connected || l->noaddr || l->self) {
+    return 0;
+  }
+  rcp.hostname = l->hostname;
+  rcp.port = l->port;
+  rcp.peername.len = 0;
+  rcp.db = node->connect_params.db;
+  rcp.password = node->connect_params.password;
+  
+  if( ((peer = nodeset_node_find_by_connect_params(node->nodeset, &rcp)) != NULL)
+   || ((peer = nodeset_node_find_by_cluster_id(node->nodeset, &l->id)) != NULL)
+  ) {
+    //node_log_notice(node, "Discovering cluster node %s... already known", rcp_cstr(&rcp));
+    return 0; //we already know this one.
+  }
+  node_log_notice(node, "Discovering cluster %s %s", (l->master ? "master" : "slave"), rcp_cstr(&rcp));
+  peer = nodeset_node_create_with_connect_params(node->nodeset, &rcp);
+  peer->discovered = 1;
+  nchan_strcpy(&peer->cluster.id, &l->id, MAX_CLUSTER_ID_LENGTH);
+  node_set_role(peer, l->master ? REDIS_NODE_ROLE_MASTER : REDIS_NODE_ROLE_SLAVE);
+  //ignore all the other things for now
+  node_connect(peer);
+  return 1;
+}
+
+static ngx_int_t set_preallocated_peername(redisAsyncContext *ctx, ngx_str_t *dst);
+
+static void node_connector_fail(redis_node_t *node, const char *err) {
+  const char  *ctxerr = NULL;
+  if(node->ctx.cmd && node->ctx.cmd->err) {
+    ctxerr = node->ctx.cmd->errstr;
+  }
+  else if(node->ctx.pubsub && node->ctx.pubsub->err) {
+    ctxerr = node->ctx.pubsub->errstr;
+  }
+  else if(node->ctx.sync && node->ctx.sync->err) {
+    ctxerr = node->ctx.sync->errstr;
+  }
+  if(node->state == REDIS_NODE_CONNECTION_TIMED_OUT) {
+    node_log_error(node, "connection failed: %s", err);
+  }
+  else if(ctxerr) {
+    node_log_error(node, "connection failed: %s (%s)", err, ctxerr);
+  }
+  else {
+    node_log_error(node, "connection failed: %s", err);
+  }
+  node_disconnect(node, REDIS_NODE_FAILED);
+}
+
+int node_connect(redis_node_t *node) {
+  assert(node->state <= REDIS_NODE_DISCONNECTED);
+  node_connector_callback(NULL, NULL, node);
+  return 1;
+}
+
+int node_disconnect(redis_node_t *node, int disconnected_state) {
+  ngx_int_t prev_state = node->state;
+  node_log_debug(node, "disconnect");
+  redisAsyncContext *ac;
+  redisContext      *c;
+  if((ac = node->ctx.cmd) != NULL) {
+    node->ctx.cmd->onDisconnect = NULL;
+    node->ctx.cmd = NULL;
+    //redisAsyncSetDisconnectCallback(ac, NULL); //this only sets the callback if it's currently null...
+    redisAsyncFree(ac);
+    node_log_debug(node, "redisAsyncFree %p", ac);
+  }
+  if((ac = node->ctx.pubsub) != NULL) {
+    node->ctx.pubsub->onDisconnect = NULL;
+    node->ctx.pubsub = NULL;
+    //redisAsyncSetDisconnectCallback(ac, NULL);  //this only sets the callback if it's currently null...
+    redisAsyncFree(ac);
+    node_log_debug(node, "redisAsyncFree pubsub %p", ac);
+  }
+  if((c = node->ctx.sync) != NULL) {
+    node->ctx.sync = NULL;
+    redisFree(c);
+  }
+  if(node->connect_timeout) {
+    nchan_abort_oneshot_timer(node->connect_timeout);
+    node->connect_timeout = NULL;
+  }
+
+  node->state = disconnected_state;
+  if(prev_state >= REDIS_NODE_READY) {
+    nchan_update_stub_status(redis_connected_servers, -1);
+  }
+  if(node->cluster.enabled) {
+    nodeset_cluster_node_unindex_keyslot_ranges(node);
+  }
+  if(node->cluster.slot_range.range) {
+    ngx_free(node->cluster.slot_range.range);
+    node->cluster.slot_range.n=0;
+    node->cluster.slot_range.range = NULL;
+  }
+  if(node->ping_timer.timer_set) {
+    ngx_del_timer(&node->ping_timer);
+  }
+  
+  rdstore_channel_head_t *cur;
+  nchan_slist_t *cmd = &node->channels.cmd;
+  nchan_slist_t *pubsub = &node->channels.pubsub;
+  nchan_slist_t *disconnected_cmd = &node->nodeset->channels.disconnected_cmd;
+  nchan_slist_t *disconnected_pubsub = &node->nodeset->channels.disconnected_pubsub;
+  
+  for(cur = nchan_slist_first(cmd); cur != NULL; cur = nchan_slist_first(cmd)) {
+    nodeset_node_dissociate_chanhead(cur);
+    nchan_slist_append(disconnected_cmd, cur);
+    cur->redis.slist.in_disconnected_cmd_list = 1;
+    if(cur->status && cur->status == READY) {
+      cur->status = NOTREADY;
+    }
+  }
+  for(cur = nchan_slist_first(pubsub); cur != NULL; cur = nchan_slist_first(pubsub)) {
+    nodeset_node_dissociate_pubsub_chanhead(cur);
+    nchan_slist_append(disconnected_pubsub, cur);
+    cur->redis.slist.in_disconnected_pubsub_list = 1;
+    
+    cur->pubsub_status = REDIS_PUBSUB_UNSUBSCRIBED;
+    
+    if(cur->redis.nodeset->settings.storage_mode == REDIS_MODE_BACKUP && cur->status == READY) {
+      cur->status = NOTREADY;
+    }
+
+  }
+  return 1;
+}
+
+void node_set_role(redis_node_t *node, redis_node_role_t role) {
+  if(node->role == role) {
+    return;
+  }
+  node->role = role;
+  redis_node_t  **cur;
+  switch(node->role) {
+    case REDIS_NODE_ROLE_UNKNOWN:
+      if(node->peers.master) {
+        node_remove_peer(node->peers.master, node);
+        DBG("removed %p from peers of %p", node->peers.master, node);
+        node->peers.master = NULL;
+      }
+      for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
+        node_remove_peer(*cur, node);
+      }
+      nchan_list_empty(&node->peers.slaves);
+      break;
+    
+    case REDIS_NODE_ROLE_MASTER:
+      if(node->peers.master) {
+        node_remove_peer(node->peers.master, node);
+        node->peers.master = NULL;
+      }
+      break;
+    
+    case REDIS_NODE_ROLE_SLAVE:
+      //do nothing
+      break;
+      
+  }
+}
+
+int node_set_master_node(redis_node_t *node, redis_node_t *master) {
+  if(node->peers.master && node->peers.master != master) {
+    node_remove_slave_node(master, node);
+  }
+  node->peers.master = master;
+  return 1;
+}
+redis_node_t *node_find_slave_node(redis_node_t *node, redis_node_t *slave) {
+  redis_node_t **cur;
+  for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
+    if (*cur == slave) {
+      return slave;
+    }
+  }
+  return NULL;
+}
+int node_add_slave_node(redis_node_t *node, redis_node_t *slave) {
+  if(!node_find_slave_node(node, slave)) {
+    redis_node_t **slaveref;
+    slaveref = nchan_list_append(&node->peers.slaves);
+    *slaveref = slave;
+    return 1;
+  }
+  return 1;
+}
+int node_remove_slave_node(redis_node_t *node, redis_node_t *slave) {
+  if(!node_find_slave_node(node, slave)) {
+    nchan_list_remove(&node->peers.slaves, slave);
+  }
+  return 1;
+}
+
+static int node_parseinfo_set_preallocd_str(redis_node_t *node, ngx_str_t *target, const char *info, const char *linestart, size_t maxlen) {
+  ngx_str_t found;
+  if(nchan_get_rest_of_line_in_cstr(info, linestart, &found)) {
+    if(found.len > maxlen) {
+      node_log_error(node, "\"%s\" is too long", linestart);
+      return 0;
+    }
+    else {
+      target->len = found.len;
+      ngx_memcpy(target->data, found.data, found.len);
+      return 1;
+    }
+  }
+  return 0;
+}
+
+static int node_connector_reply_str_ok(redisReply *reply) {
+  return (reply != NULL && reply->type != REDIS_REPLY_ERROR && reply->type == REDIS_REPLY_STRING);
+}
+static int node_connector_reply_status_ok(redisReply *reply) {
+  return (
+    reply != NULL 
+    && reply->type != REDIS_REPLY_ERROR
+    && reply->type == REDIS_REPLY_STATUS
+    && reply->str
+    && strcmp(reply->str, "OK") == 0
+  );
+}
+
+static int node_parseinfo_set_run_id(redis_node_t *node, const char *info) {
+  return node_parseinfo_set_preallocd_str(node, &node->run_id, info, "run_id:", MAX_RUN_ID_LENGTH);
+}
+
+static int node_connector_loadscript_reply_ok(redis_node_t *node, redis_lua_script_t *script, redisReply *reply) {
+  if (reply == NULL) {
+    node_log_error(node, "missing reply after loading Redis Lua script %s", script->name);
+    return 0;
+  }
+  switch(reply->type) {
+    case REDIS_REPLY_ERROR:
+      node_log_error(node, "failed loading Redis Lua script %s: %s", script->name, reply->str);
+      return 0;
+    
+    case REDIS_REPLY_STRING:
+      if(ngx_strncmp(reply->str, script->hash, REDIS_LUA_HASH_LENGTH)!=0) {
+        node_log_error(node, "Lua script %s has unexpected hash %s (expected %s)", script->name, reply->str, script->hash);
+        return 0;
+      }
+      else {
+        return 1;
+      }
+      break;
+      
+    default:
+      node_log_error(node, "unexpected reply type while loading Redis Lua script %s", script->name);
+      return 0;
+  }
+}
+
+static void redis_nginx_unexpected_disconnect_event_handler(const redisAsyncContext *ac, int status) {
+  redis_node_t    *node = ac->data;
+  //char            *which_ctx;
+  //DBG("unexpected disconnect event handler ac %p", ac);
+  if(node) {
+    if(node->ctx.cmd == ac) {
+      //which_ctx = "cmd";
+      node->ctx.cmd = NULL;
+    }
+    else if(node->ctx.pubsub == ac) {
+      node->ctx.pubsub = NULL;
+      //which_ctx = "pubsub";
+    }
+    else {
+      node_log_error(node, "unknown redisAsyncContext disconnected");
+      //which_ctx = "unknown";
+    }
+    
+    if(node->state >= REDIS_NODE_READY && !ngx_exiting && !ngx_quit) {
+      if(ac->err) {
+        node_log_error(node, "connection lost: %s.", ac->errstr);
+      }
+      else {
+        node_log_error(node, "connection lost");
+      }
+    }
+    node_disconnect(node, REDIS_NODE_FAILED);
+    nodeset_examine(node->nodeset);
+  }
+}
+
+static void redis_nginx_connect_event_handler(const redisAsyncContext *ac, int status) {
+  node_connector_callback((redisAsyncContext *)ac, NULL, ac->data);
+}
+
+static redisAsyncContext *node_connect_context(redis_node_t *node, ngx_str_t *host, ngx_int_t port) {
+  redisAsyncContext *ctx = redis_nginx_open_context(host, port, node);
+  if(ctx) {
+    redisAsyncSetConnectCallback(ctx, redis_nginx_connect_event_handler);
+    redisAsyncSetDisconnectCallback(ctx, redis_nginx_unexpected_disconnect_event_handler);
+  }
+  return ctx;
+}
+
+static int node_discover_slaves_from_info_reply(redis_node_t *node, redisReply *reply) {
+  redis_connect_params_t   *rcp;
+  size_t                    i, n;
+  if(!(rcp = parse_info_slaves(node, reply->str, &n))) {
+    return 0;
+  }
+  for(i=0; i<n; i++) {
+    node_discover_slave(node, &rcp[i]);
+  }
+  return 1;
+}
+
+int nodeset_node_keyslot_changed(redis_node_t *node) {
+  if(node->state >= REDIS_NODE_READY) {
+    node_disconnect(node, REDIS_NODE_FAILED);
+  }
+  char errstr[512];
+  ngx_snprintf((u_char *)errstr, 512, "cluster keyspace needs to be updated as reported by node %V:%d%Z", &(node)->connect_params.hostname, node->connect_params.port);
+  nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, errstr);
+  return 1;
+}
+
+int nodeset_node_reply_keyslot_ok(redis_node_t *node, redisReply *reply) {
+  if(reply && reply->type == REDIS_REPLY_ERROR) {
+    char    *script_nonlocal_key_error = "Lua script attempted to access a non local key in a cluster node";
+    char    *script_error_start = "ERR Error running script";
+    char    *command_move_error = "MOVED ";
+    char    *command_ask_error = "ASK ";
+    
+    if((nchan_cstr_startswith(reply->str, script_error_start) && nchan_strstrn(reply->str, script_nonlocal_key_error))
+     || nchan_cstr_startswith(reply->str, command_move_error)
+     || nchan_cstr_startswith(reply->str, command_ask_error)) {
+      if(!node->cluster.enabled) {
+        node_log_error(node, "got a cluster error on a non-cluster redis connection: %s", reply->str);
+        node_disconnect(node, REDIS_NODE_FAILED);
+      }
+      else {
+        nodeset_node_keyslot_changed(node);
+      }
+      return 0;
+    }
+    else
+      return 1;
+  }
+  return 1;
+}
+
+static void node_subscribe_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                 *reply = rep;
+  redis_node_t               *node = privdata;
+  if(node->state == REDIS_NODE_SUBSCRIBING_WORKER) {
+    node_connector_callback(ac, rep, privdata);
+  }
+  else if(reply && reply->type == REDIS_REPLY_ARRAY && reply->elements == 3
+   && reply->element[0]->type == REDIS_REPLY_STRING 
+   && reply->element[1]->type == REDIS_REPLY_STRING
+   && reply->element[2]->type == REDIS_REPLY_STRING
+   && strcmp(reply->element[0]->str, "message") == 0
+   && strcmp(reply->element[1]->str, redis_worker_id) == 0
+   && strcmp(reply->element[2]->str, "ping") == 0
+  ) {
+    node_log_debug(node, "received PUBSUB ping message");
+  }
+  else {
+    redis_subscribe_callback(ac, rep, privdata);
+  }
+}
+
+void node_connector_connect_timeout(void *pd) {
+  redis_node_t  *node = pd;
+  node->connect_timeout = NULL;
+  if(node->state == REDIS_NODE_CMD_CONNECTING || node->state == REDIS_NODE_PUBSUB_CONNECTING) {
+    //onConnect won't be fired, so the connector must be called manually
+    node->state = REDIS_NODE_CONNECTION_TIMED_OUT;
+    node_connector_callback(NULL, NULL, node);
+  }
+  else {
+    node_disconnect(node, REDIS_NODE_CONNECTION_TIMED_OUT);
+  }
+}
+
+static void node_connector_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                 *reply = rep;
+  redis_node_t               *node = privdata;
+  redis_nodeset_t            *nodeset = node->nodeset;
+  char                        errstr[1024];
+  redis_connect_params_t     *cp = &node->connect_params;
+  redis_lua_script_t         *next_script = (redis_lua_script_t *)&redis_lua_scripts;
+  node_log_debug(node, "node_connector_callback state %d", node->state);
+  
+  switch(node->state) {
+    case REDIS_NODE_CONNECTION_TIMED_OUT:
+      return node_connector_fail(node, "connection timed out");
+      break;
+    case REDIS_NODE_FAILED:
+    case REDIS_NODE_DISCONNECTED:
+      assert(!node->connect_timeout);
+      if((node->ctx.cmd = node_connect_context(node, &cp->hostname, cp->port)) == NULL) { //always connect the cmd ctx to the hostname
+        return node_connector_fail(node, "failed to open redis async context for cmd");
+      }
+      else if(cp->peername.len == 0) { //don't know peername yet
+        set_preallocated_peername(node->ctx.cmd, &cp->peername);
+      }
+      node->connect_timeout = nchan_add_oneshot_timer(node_connector_connect_timeout, node, nodeset->settings.connect_timeout);
+      node->state = REDIS_NODE_CMD_CONNECTING;
+      break; //wait until the onConnect callback brings us back
+      
+    case REDIS_NODE_CMD_CONNECTING:
+      if(ac->err || ac->c.err) {
+        node->ctx.cmd = NULL; //to avoid calling redisAsyncFree on the ctx during node_disconnect()
+        //(it will be called automatically when this function returns control back to hiredis
+        return node_connector_fail(node, ac->errstr);
+      }
+      if((node->ctx.pubsub = node_connect_context(node, &cp->peername, cp->port)) == NULL) {
+        return node_connector_fail(node, "failed to open redis async context for pubsub");
+      }
+      node->state++;
+      break; //wait until the onConnect callback brings us back
+    
+    case REDIS_NODE_PUBSUB_CONNECTING:
+      if(ac->err || ac->c.err) {
+        node->ctx.pubsub = NULL; //to avoid calling redisAsyncFree on the ctx during node_disconnect()
+        //(it will be called automatically when this function returns control back to hiredis
+        ngx_snprintf((u_char *)errstr, 1024, "(pubsub) %s%Z", ac->errstr);
+        return node_connector_fail(node, errstr);
+      }
+      //connection established. move on...   
+      node->state++;
+      /* fall through */
+    case REDIS_NODE_CONNECTED:
+      //now we need to authenticate maybe?
+      if(cp->password.len > 0) {
+        if(!node->ctx.cmd) {
+          return node_connector_fail(node, "cmd connection missing, can't send AUTH command");
+        }
+        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "AUTH %b", STR(&cp->password));
+        node->state++;
+      }
+      else {
+        node->state = REDIS_NODE_SELECT_DB;
+        return node_connector_callback(NULL, NULL, node); //continue as if authenticated
+      }
+      break;
+    
+    case REDIS_NODE_CMD_AUTHENTICATING:
+      if(!node_connector_reply_status_ok(reply)) {
+        return node_connector_fail(node, "AUTH command failed");
+      }
+      if(!node->ctx.pubsub) {
+        return node_connector_fail(node, "pubsub connection missing, can't send AUTH command");
+      }
+      //now authenticate pubsub ctx
+      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "AUTH %b", STR(&cp->password));
+      node->state++;
+      break;
+    
+    case REDIS_NODE_PUBSUB_AUTHENTICATING:
+      if(!node_connector_reply_status_ok(reply)) {
+        return node_connector_fail(node, "AUTH command failed");
+      }
+      node->state++;
+      /* fall through */
+    case REDIS_NODE_SELECT_DB:
+      if(cp->db > 0) {
+        if(!node->ctx.cmd) {
+          return node_connector_fail(node, "cmd connection missing, SELECT command");
+        }
+        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "SELECT %d", cp->db);
+        node->state++;
+      }
+      else {
+        node->state = REDIS_NODE_SCRIPTS_LOAD;
+        return node_connector_callback(NULL, NULL, node);
+      }
+      break;
+    
+    case REDIS_NODE_CMD_SELECTING_DB:
+      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "Redis SELECT command failed,");
+      }
+      if(!node->ctx.cmd) {
+        return node_connector_fail(node, "pubsub connection missing, can't send SELECT command");
+      }
+      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "SELECT %d", cp->db);
+      node->state++;
+      break;
+    
+    case REDIS_NODE_PUBSUB_SELECTING_DB:
+      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "Redis SELECT command failed,");
+      }
+      node->state++; // fallthru
+      /* fall through */
+    case REDIS_NODE_SCRIPTS_LOAD:
+      node->scripts_loaded = 0;
+      if(!node->ctx.cmd) {
+        return node_connector_fail(node, "cmd connection missing, can't send SCRIPT LOAD command");
+      }
+      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "SCRIPT LOAD %s", next_script->script);
+      node->state++;
+      break;
+    
+    case REDIS_NODE_SCRIPTS_LOADING:
+      next_script = &next_script[node->scripts_loaded];
+      
+      if(!node_connector_loadscript_reply_ok(node, next_script, reply)) {
+        return node_connector_fail(node, "SCRIPT LOAD failed,");
+      }
+      else {
+        //node_log_debug(node, "loaded script %s", next_script->name);
+        node->scripts_loaded++;
+        next_script++;
+      }
+      if(node->scripts_loaded < redis_lua_scripts_count) {
+        //load next script
+        if(!node->ctx.cmd) {
+          return node_connector_fail(node, "cmd connection missing, can't send SCRIPT LOAD command");
+        }
+        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "SCRIPT LOAD %s", next_script->script);
+        return;
+      }
+      node_log_debug(node, "all scripts loaded");
+      node->state++;
+      /* fall through */
+    case REDIS_NODE_GET_INFO:
+      //getinfo time
+      if(!node->ctx.cmd) {
+        return node_connector_fail(node, "cmd connection missing, can't send INFO ALL command");
+      }
+      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "INFO ALL");
+      node->state++;
+      break;
+      
+    case REDIS_NODE_GETTING_INFO:
+      if(reply && reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")) {
+        return node_connector_fail(node, "authentication required");
+      }
+      else if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "INFO command failed");
+      }
+      else if(!node_parseinfo_set_run_id(node, reply->str)) {
+        return node_connector_fail(node, "failed to set node run_id");
+      }
+      else if(nodeset_node_deduplicate_by_run_id(node)) {
+        // this node already exists
+        // the deduplication has deleted it; we're done here.
+        // commence rejoicing.
+        return;
+      }
+      
+      if(nchan_cstr_match_line(reply->str, "loading:1")) {
+        return node_connector_fail(node, "is busy loading data...");
+      }
+      
+      if(nchan_cstr_match_line(reply->str, "role:master")) {
+        node_set_role(node, REDIS_NODE_ROLE_MASTER);
+        if(!node_discover_slaves_from_info_reply(node, reply)) {
+          return node_connector_fail(node, "failed parsing slaves from INFO");
+        }
+      }
+      else if(nchan_cstr_match_line(reply->str, "role:slave")) {
+        redis_connect_params_t   *rcp;
+        node_set_role(node, REDIS_NODE_ROLE_SLAVE);
+        if(!(rcp = parse_info_master(node, reply->str))) {
+          return node_connector_fail(node, "failed parsing master from INFO");
+        }
+        node_discover_master(node, rcp);
+      }
+      else {
+        return node_connector_fail(node, "can't tell if node is master or slave");
+      }
+      
+      //what's next?
+      if(nchan_cstr_match_line(reply->str, "cluster_enabled:1")) {
+        node->cluster.enabled = 1;
+      }
+      node->state++;
+      /* fall through */
+    case REDIS_NODE_PUBSUB_GET_INFO:
+      if(!node->ctx.pubsub) {
+        return node_connector_fail(node, "cmd connection missing, can't send INFO SERVER command");
+      }
+      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "INFO SERVER");
+      node->state++;
+      break;
+    case REDIS_NODE_PUBSUB_GETTING_INFO:
+      if(reply && reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")) {
+        return node_connector_fail(node, "authentication required");
+      }
+      else if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "INFO command failed");
+      }
+      else {
+        u_char    idbuf[MAX_RUN_ID_LENGTH];
+        ngx_str_t pubsub_run_id = {0, idbuf};
+        node_parseinfo_set_preallocd_str(node, &pubsub_run_id, reply->str, "run_id:", MAX_RUN_ID_LENGTH);
+        if(!nchan_ngx_str_match(&node->run_id, &pubsub_run_id)) {
+          return node_connector_fail(node, "IP address connects to more than one server. Is Redis behind a proxy?");
+        }
+        node->state++;
+      }
+      /* fall through */
+    case REDIS_NODE_SUBSCRIBE_WORKER:
+      if(!node->ctx.pubsub) {
+        return node_connector_fail(node, "pubsub connection missing, can't send worker SUBSCRIBE command");
+      }
+      redisAsyncCommand(node->ctx.pubsub, node_subscribe_callback, node, "SUBSCRIBE %s", redis_worker_id);
+      node->state++;
+      break;
+    
+    case REDIS_NODE_SUBSCRIBING_WORKER:  
+      if(!reply) {
+        return node_connector_fail(node, "disconnected while subscribing to worker PUBSUB channel");
+      }
+      if( reply->type != REDIS_REPLY_ARRAY || reply->elements != 3 
+       || reply->element[0]->type != REDIS_REPLY_STRING || reply->element[1]->type != REDIS_REPLY_STRING
+       || strcmp(reply->element[0]->str, "subscribe") != 0
+       || strcmp(reply->element[1]->str, redis_worker_id) != 0
+      ) {
+        return node_connector_fail(node, "failed to subscribe to worker PUBSUB channel");
+      }
+      nchan_update_stub_status(redis_connected_servers, 1);
+      
+      node->state++;
+      /* fall through */
+    case REDIS_NODE_GET_CLUSTERINFO:
+      if(!node->cluster.enabled) {
+        node->state = REDIS_NODE_READY;
+        return node_connector_callback(NULL, NULL, node);
+      }
+      else {
+        if(!node->ctx.cmd) {
+          return node_connector_fail(node, "cmd connection missing, can't send CLUSTER INFO command");
+        }
+        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "CLUSTER INFO");
+        node->state++;
+      }
+      break;
+    
+    case REDIS_NODE_GETTING_CLUSTERINFO:
+      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "CLUSTER INFO command failed,");
+      }
+      if(!nchan_cstr_match_line(reply->str, "cluster_state:ok")) {
+        node->cluster.ok=0;
+        return node_connector_fail(node, "cluster_state not ok");
+      }
+      node->cluster.ok=1;
+      node->state++;
+      /* fall through */
+    case REDIS_NODE_GET_CLUSTER_NODES:
+      if(!node->ctx.cmd) {
+        return node_connector_fail(node, "cmd connection missing, can't send CLUSTER NODES command");
+      }
+      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "CLUSTER NODES");
+      node->state++;
+      break;
+    
+    case REDIS_NODE_GETTING_CLUSTER_NODES:
+      if(!node_connector_reply_str_ok(reply)) {
+        return node_connector_fail(node, "CLUSTER NODES command failed");
+      }
+      else {
+        size_t                  i, n;
+        cluster_nodes_line_t   *l;
+        if(!(l = parse_cluster_nodes(node, reply->str, &n))) {
+          return node_connector_fail(node, "parsing CLUSTER NODES command failed");
+        }
+        for(i=0; i<n; i++) {
+          if(l[i].self) {
+            nchan_strcpy(&node->cluster.id, &l[i].id, MAX_CLUSTER_ID_LENGTH);
+            if(l[i].slot_ranges_count == 0 && l[i].master) {
+              node_log_notice(node, "is a master cluster node with no keyslots");
+            }
+            else {
+              redis_node_t       *conflict_node;
+              node->cluster.slot_range.n = l[i].slot_ranges_count;
+              size_t                 j;
+              if(node->cluster.slot_range.range) {
+                ngx_free(node->cluster.slot_range.range);
+              }
+              node->cluster.slot_range.range = ngx_alloc(sizeof(redis_slot_range_t) * node->cluster.slot_range.n, ngx_cycle->log);
+              if(!node->cluster.slot_range.range) {
+                return node_connector_fail(node, "failed allocating cluster slots range");
+              }
+              if(!parse_cluster_node_slots(&l[i], node->cluster.slot_range.range)) {
+                return node_connector_fail(node, "failed parsing cluster slots range");
+              }
+              for(j = 0; j<node->cluster.slot_range.n; j++) {
+                if((conflict_node = nodeset_node_find_by_range(nodeset, &node->cluster.slot_range.range[j]))!=NULL) {
+                  u_char buf[1024];
+                  ngx_snprintf(buf, 1024, "keyslot range conflict with node %s. These nodes are probably from different clusters.%Z", node_cstr(conflict_node));
+                  return node_connector_fail(node, (char *)buf);
+                }
+              }
+              
+              if(!nodeset_cluster_node_index_keyslot_ranges(node)) {
+                return node_connector_fail(node, "indexing keyslot ranges failed");
+              }
+            }
+          }
+          else if(!node_skip_cluster_peer(node, &l[i])) {
+            node_discover_cluster_peer(node, &l[i]);
+          }
+        }
+      }
+      node->state = REDIS_NODE_READY;
+      //intentional fall-through is affirmatively consensual
+      //yes, i consent to being fallen through.
+      //                               Signed, 
+      //                                 REDIS_NODE_GETTING_CLUSTER_NODES
+      //NOTE: consent required each time a fallthrough is imposed
+      /* fall through */
+    case REDIS_NODE_READY:
+      if(node->connect_timeout) {
+        nchan_abort_oneshot_timer(node->connect_timeout);
+        node->connect_timeout = NULL;
+      }
+      if(!node->ping_timer.timer_set && nodeset->settings.ping_interval > 0) {
+        ngx_add_timer(&node->ping_timer, nodeset->settings.ping_interval * 1000);
+      }
+      node_log_notice(node, "%s", node->generation == 0 ? "connected" : "reconnected");
+      node->generation++;
+      nodeset_examine(nodeset);
+      break;
+      
+  }
+}
+
+static int nodeset_cluster_keyslot_space_complete(redis_nodeset_t *ns) {
+  ngx_rbtree_node_t                  *node;
+  redis_slot_range_t                  range = {0, 0};
+  redis_nodeset_slot_range_node_t    *rangenode;
+  
+  while(range.min <= 16383) {
+    if((node = rbtree_find_node(&ns->cluster.keyslots, &range)) == NULL) {
+      DBG("cluster slots range incomplete: can't find slot %i", range.min);
+      return 0;
+    }
+    rangenode = rbtree_data_from_node(node);
+    
+    if(rangenode->node->state < REDIS_NODE_READY) {
+      node_log_notice(rangenode->node, "cluster node for range %d - %d not connected", rangenode->range.min, rangenode->range.max);
+      return 0;
+    }
+    
+    range.min = rangenode->range.max + 1;
+    range.max = range.min;
+  }
+  DBG("cluster range complete");
+  //print_cluster_slots(cluster);
+  return 1;
+}
+
+static int nodeset_status_timer_interval(redis_nodeset_status_t status) {
+  switch(status) {
+    case REDIS_NODESET_FAILED:
+    case REDIS_NODESET_INVALID:
+    case REDIS_NODESET_DISCONNECTED:
+      return 2000;
+    case REDIS_NODESET_FAILING:
+    case REDIS_NODESET_CLUSTER_FAILING:
+      return 300;
+    case REDIS_NODESET_CONNECTING:
+      return 1000;
+    case REDIS_NODESET_READY:
+      return 10000;
+  }
+  return 500; //default?
+}
+
+void nodeset_onready_expire_event(ngx_event_t *ev) {
+  nodeset_onready_callback_t *rcb = ev->data;
+  rcb->cb(rcb->ns, rcb->pd);
+  nchan_list_remove(&rcb->ns->onready_callbacks, rcb);
+}
+
+ngx_int_t nodeset_callback_on_ready(redis_nodeset_t *ns, ngx_msec_t max_wait, ngx_int_t (*cb)(redis_nodeset_t *, void *), void *pd) {
+  nodeset_onready_callback_t *ncb;
+  
+  if(ns->status == REDIS_NODESET_READY) {
+    cb(ns, pd);
+    return NGX_OK;
+  }
+  
+  ncb = nchan_list_append(&ns->onready_callbacks);
+  if(ncb == NULL) {
+    ERR("failed to add to onready_callback list");
+    return NGX_ERROR;
+  }
+  
+  ncb->cb = cb;
+  ncb->pd = pd;
+  ncb->ns = ns;
+  ngx_memzero(&ncb->ev, sizeof(ncb->ev));
+  if(max_wait > 0) {
+    nchan_init_timer(&ncb->ev, nodeset_onready_expire_event, ncb);
+    ngx_add_timer(&ncb->ev, max_wait);
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nodeset_run_on_ready_callbacks(redis_nodeset_t *ns) {
+  nodeset_onready_callback_t *rcb;
+  for(rcb = nchan_list_first(&ns->onready_callbacks); rcb != NULL; rcb = nchan_list_next(rcb)) {
+    if(rcb->ev.timer_set) {
+      ngx_del_timer(&rcb->ev);
+    }
+    rcb->cb(ns, rcb->pd);
+  }
+  nchan_list_empty(&ns->onready_callbacks);
+  return NGX_OK;
+}
+
+ngx_int_t nodeset_abort_on_ready_callbacks(redis_nodeset_t *ns) {
+  nodeset_onready_callback_t *rcb;
+  for(rcb = nchan_list_first(&ns->onready_callbacks); rcb != NULL; rcb = nchan_list_next(rcb)) {
+    if(rcb->ev.timer_set) {
+      ngx_del_timer(&rcb->ev);
+    }
+    rcb->cb(ns, rcb->pd);
+  }
+  nchan_list_empty(&ns->onready_callbacks);
+  return NGX_OK;
+}
+
+static ngx_int_t update_chanhead_status_on_reconnect(rdstore_channel_head_t *ch) {
+  if(ch->redis.node.cmd && ch->redis.node.pubsub && ch->pubsub_status == REDIS_PUBSUB_SUBSCRIBED && ch->status == NOTREADY) {
+    ch->status = READY;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nodeset_reconnect_disconnected_channels(redis_nodeset_t *ns) {
+  rdstore_channel_head_t *cur;
+  nchan_slist_t *disconnected_cmd = &ns->channels.disconnected_cmd;
+  nchan_slist_t *disconnected_pubsub = &ns->channels.disconnected_pubsub;
+  assert(nodeset_ready(ns));
+
+  while((cur = nchan_slist_pop(disconnected_cmd)) != NULL) {
+    assert(cur->redis.node.cmd == NULL);
+    cur->redis.slist.in_disconnected_cmd_list = 0;
+    assert(nodeset_node_find_by_chanhead(cur)); // this reuses the linked-list fields
+    update_chanhead_status_on_reconnect(cur);
+  }
+  
+  while((cur = nchan_slist_pop(disconnected_pubsub)) != NULL) {
+    assert(cur->redis.node.pubsub == NULL);
+    cur->redis.slist.in_disconnected_pubsub_list = 0;
+    assert(nodeset_node_pubsub_find_by_chanhead(cur)); // this reuses the linked-list fields
+    redis_chanhead_catch_up_after_reconnect(cur);
+    ensure_chanhead_pubsub_subscribed_if_needed(cur);
+    update_chanhead_status_on_reconnect(cur);
+  }
+  
+  return NGX_OK;
+}
+
+const char *__nodeset_nickname_cstr(redis_nodeset_t *nodeset) {
+  static char str[1024];
+  const char *what = NULL;
+  ngx_str_t  *name = NULL;
+  what = nodeset->cluster.enabled ? "cluster" : "server";
+  if(nodeset->upstream) {
+    name = &nodeset->upstream->host;
+  }
+  else {
+    ngx_str_t **url = nchan_list_first(&nodeset->urls);
+    if(url && *url) {
+      name = *url;
+    }
+  }
+  if(what && name) {
+    ngx_snprintf((u_char *)str, 1024, "%s %V%Z", what, name);
+  }
+  else if(what) {
+    ngx_snprintf((u_char *)str, 1024, "%s%Z", what);
+  }
+  else if(name) {
+    ngx_snprintf((u_char *)str, 1024, "%V%Z", name);
+  }
+  else {
+    ngx_snprintf((u_char *)str, 1024, "node set%Z");
+  }
+  return str;
+}
+
+const char *__node_nickname_cstr(redis_node_t *node) {
+  static char buf[512];
+  if(node) {
+    __node_cstr(node, buf);
+    return buf;
+  }
+  else {
+    return "???";
+  }
+}
+
+ngx_int_t nodeset_set_status(redis_nodeset_t *nodeset, redis_nodeset_status_t status, const char *msg) {
+  nodeset->status_msg = msg;
+  if(nodeset->status != status) {
+    if(msg) {
+      ngx_uint_t  lvl;
+      if(status == REDIS_NODESET_INVALID) {
+        lvl = NGX_LOG_ERR;
+      }
+      else if(status == REDIS_NODESET_DISCONNECTED
+        ||    status == REDIS_NODESET_CLUSTER_FAILING
+        ||    status == REDIS_NODESET_FAILED
+      ) {
+        lvl = NGX_LOG_WARN;
+      }
+      else {
+        lvl = NGX_LOG_NOTICE;
+      }
+      nodeset_log(nodeset, lvl, "%s", msg);
+    }
+    nodeset->current_status_start = ngx_time();
+    nodeset->current_status_times_checked = 0;
+    nodeset->status = status;
+    
+    if(nodeset->status_check_ev.timer_set) {
+      ngx_del_timer(&nodeset->status_check_ev);
+    }
+    
+    switch(status) {
+      case REDIS_NODESET_FAILED:
+      case REDIS_NODESET_DISCONNECTED:
+      case REDIS_NODESET_INVALID:
+        nodeset_disconnect(nodeset);
+        break;
+      case REDIS_NODESET_CLUSTER_FAILING:
+        
+        //very intentional fallthrough
+      case REDIS_NODESET_FAILING:
+        nodeset_connect(nodeset);
+        break;
+      case REDIS_NODESET_CONNECTING:
+        //no special actions
+        break;
+      case REDIS_NODESET_READY:
+        nodeset_reconnect_disconnected_channels(nodeset);
+        nodeset_run_on_ready_callbacks(nodeset);
+        break;
+    }
+  }
+  
+  if(!nodeset->status_check_ev.timer_set) {
+    ngx_add_timer(&nodeset->status_check_ev, nodeset_status_timer_interval(status));
+  }
+  return NGX_OK;
+}
+
+static void node_find_slaves_callback(redisAsyncContext *ac, void *rep, void *pd) {
+  redis_node_t   *node = pd;
+  redisReply     *reply = rep;
+  if(!reply) {
+    node_log_debug(node, "INFO REPLICATION aborted reply");
+    return;
+  }
+  node_discover_slaves_from_info_reply(node, reply);
+}
+
+ngx_int_t nodeset_examine(redis_nodeset_t *nodeset) {
+  redis_node_t *cur, *next;
+  int cluster = 0, masters = 0, slaves = 0, total = 0, connecting = 0, ready = 0, disconnected = 0;
+  int discovered = 0, failed_masters=0, failed_slaves = 0, failed_unknowns = 0;
+  int ready_cluster = 0, ready_non_cluster = 0, connecting_masters = 0;
+  redis_nodeset_status_t current_status = nodeset->status;
+  //ERR("check nodeset %p", nodeset);
+  
+  for(cur = nchan_list_first(&nodeset->nodes); cur != NULL; cur = next) {
+    next = nchan_list_next(cur);
+    total++;
+    if(cur->cluster.enabled == 1) {
+      cluster++;
+    }
+    if(cur->discovered)
+      discovered++;
+    if(cur->role == REDIS_NODE_ROLE_MASTER) {
+      masters++;
+      if(cur->state > REDIS_NODE_DISCONNECTED && cur->state < REDIS_NODE_READY) {
+        connecting_masters++;
+      }
+    }
+    if(cur->role == REDIS_NODE_ROLE_SLAVE)
+      slaves++;
+    if(cur->state <= REDIS_NODE_DISCONNECTED)
+      disconnected++;
+    if(cur->state > REDIS_NODE_DISCONNECTED && cur->state < REDIS_NODE_READY)
+      connecting++;
+    if(cur->state == REDIS_NODE_READY) {
+      ready++;
+      if(cur->cluster.enabled == 1)
+        ready_cluster++;
+      else
+        ready_non_cluster++;
+    }
+    if(cur->state == REDIS_NODE_FAILED) {
+      if(cur->role == REDIS_NODE_ROLE_MASTER) {
+        failed_masters++;
+      }
+      else if(cur->role == REDIS_NODE_ROLE_SLAVE) {
+        failed_slaves++;
+        if(cur->peers.master && cur->peers.master->state >= REDIS_NODE_READY && cur->nodeset->status == REDIS_NODESET_READY) {
+          //rediscover slaves
+          redisAsyncCommand(cur->peers.master->ctx.cmd, node_find_slaves_callback, cur->peers.master, "INFO REPLICATION");
+        }
+        //remove failed slave
+        node_log_notice(cur, "removed failed slave node");
+        node_disconnect(cur, REDIS_NODE_FAILED);
+        nodeset_node_destroy(cur);
+        total--;
+      }
+      else {
+        failed_unknowns++;
+      }
+    }
+  }
+  
+  nodeset->cluster.enabled = cluster > 0;
+  
+  if(current_status == REDIS_NODESET_CONNECTING && connecting > 0) {
+    //still connecting, with a few nodws yet to try to connect
+    return NGX_OK;
+  }
+  if(ready == 0 && total == 0) {
+    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "no reachable servers");
+  }
+  else if(cluster == 0 && masters > 1) {
+    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "invalid config, more than one master in non-cluster");
+  }
+  else if(ready_cluster > 0 && ready_non_cluster > 0) {
+    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "invalid config, cluster and non-cluster servers present");
+  }
+  else if(connecting > 0) {
+    nodeset_set_status(nodeset, REDIS_NODESET_CONNECTING, NULL);
+  }
+  else if(failed_masters > 0) {
+    if(current_status == REDIS_NODESET_READY) {
+      nodeset_set_status(nodeset, REDIS_NODESET_FAILING, NULL);
+    }
+    else {
+      nodeset_set_status(nodeset, REDIS_NODESET_FAILED, NULL);
+    }
+  }
+  else if (masters == 0) {
+    //this prevents slave-of-slave-of-master lookups
+    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "no reachable masters");
+  }
+  else if(cluster > 0 && !nodeset_cluster_keyslot_space_complete(nodeset)) {
+      nodeset_set_status(nodeset, REDIS_NODESET_CONNECTING, "keyslot space incomplete");
+  }
+  else if(current_status == REDIS_NODESET_READY && (ready == 0 || ready < total)) {
+    nodeset_set_status(nodeset, REDIS_NODESET_FAILING, NULL);
+  }
+  else if(ready == 0) {
+    nodeset_set_status(nodeset, REDIS_NODESET_DISCONNECTED, "no connected servers");
+  }
+  else {
+    nodeset_set_status(nodeset, REDIS_NODESET_READY, "ready");
+  } 
+  
+  return NGX_OK;
+}
+
+static void nodeset_check_status_event(ngx_event_t *ev) {
+  redis_nodeset_t *ns = ev->data;
+  
+  if(!ev->timedout) {
+    return;
+  }
+  DBG("nodeset %p status check event", ns);
+  ev->timedout = 0;
+  
+  switch(ns->status) {
+    case REDIS_NODESET_FAILED:
+      //fall-through rather intentionally
+      if(ngx_time() - ns->current_status_start > REDIS_NODESET_RECONNECT_WAIT_TIME_SEC) {
+        nodeset_log_notice(ns, "reconnecting...");
+        nodeset_connect(ns);
+      }
+      break;
+    case REDIS_NODESET_INVALID:
+    case REDIS_NODESET_DISCONNECTED:
+      //connect whatever needs to be connected
+      nodeset_connect(ns);
+      break;
+    
+    case REDIS_NODESET_CONNECTING:
+      //wait it out
+      if(ngx_time() - ns->current_status_start > REDIS_NODESET_MAX_CONNECTING_TIME_SEC) {
+        nodeset_set_status(ns, REDIS_NODESET_DISCONNECTED, "Redis node set took too long to connect");
+      }
+      else {
+        nodeset_examine(ns); // full status check
+      }
+      break;
+    case REDIS_NODESET_CLUSTER_FAILING:
+    case REDIS_NODESET_FAILING:
+      if(ngx_time() - ns->current_status_start > REDIS_NODESET_MAX_FAILING_TIME_SEC) {
+        nodeset_set_status(ns, REDIS_NODESET_FAILED, "Redis node set has failed");
+      }
+      break;
+    
+    case REDIS_NODESET_READY:
+      nodeset_reconnect_disconnected_channels(ns); //in case there are any waiting around
+      nodeset_run_on_ready_callbacks(ns); //in case there are any that got left behind
+      break;
+  }
+  
+  //check again soon!
+  if(!ev->timer_set) {
+    ngx_add_timer(ev, nodeset_status_timer_interval(ns->status));
+  }
+}
+
+int nodeset_connect(redis_nodeset_t *ns) {
+  redis_node_t             *node;
+  ngx_str_t               **url;
+  redis_connect_params_t    rcp;
+  
+  for(url = nchan_list_first(&ns->urls); url != NULL; url = nchan_list_next(url)) {
+    parse_redis_url(*url, &rcp);
+    if((node = nodeset_node_find_by_connect_params(ns, &rcp)) == NULL) {
+      node = nodeset_node_create(ns, &rcp);
+      node_log_debug(node, "created");
+    }
+    assert(node);
+  }
+  for(node = nchan_list_first(&ns->nodes); node != NULL; node = nchan_list_next(node)) {
+    if(node->state <= REDIS_NODE_DISCONNECTED) {
+      node_log_debug(node, "start connecting");
+      node_connect(node);
+    }
+  }
+  nodeset_set_status(ns, REDIS_NODESET_CONNECTING, NULL);
+  return 1;
+}
+
+int nodeset_disconnect(redis_nodeset_t *ns) {
+  redis_node_t *node;
+  for(node = nchan_list_first(&ns->nodes); node != NULL; node = nchan_list_first(&ns->nodes)) {
+    node_log_debug(node, "destroy %p", node);
+    if(node->state > REDIS_NODE_DISCONNECTED) {
+      node_log_debug(node, "intiating disconnect");
+      node_disconnect(node, REDIS_NODE_DISCONNECTED);
+    }
+    nodeset_node_destroy(node);
+  }
+  
+  return 1;
+}
+
+
+ngx_int_t nodeset_connect_all(void) {
+  int                      i;
+  redis_nodeset_t         *ns;
+  DBG("connect all");
+  for(i=0; i<redis_nodeset_count; i++) {
+    ns = &redis_nodeset[i];
+    nodeset_connect(ns);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nodeset_destroy_all(void) {
+  int                      i;
+  redis_nodeset_t         *ns;
+  DBG("nodeset destroy all");
+  for(i=0; i<redis_nodeset_count; i++) {
+    ns = &redis_nodeset[i];
+    nodeset_disconnect(ns);
+    nchan_list_empty(&ns->urls);
+  }
+  redis_nodeset_count = 0;
+  return NGX_OK;
+}
+
+ngx_int_t nodeset_each(void (*cb)(redis_nodeset_t *, void *), void *privdata) {
+  int                      i;
+  redis_nodeset_t         *ns;
+  for(i=0; i<redis_nodeset_count; i++) {
+    ns = &redis_nodeset[i];
+    cb(ns, privdata);
+  }
+  return NGX_OK;
+}
+ngx_int_t nodeset_each_node(redis_nodeset_t *ns, void (*cb)(redis_node_t *, void *), void *privdata) {
+  redis_node_t             *node, *next;
+  for(node = nchan_list_first(&ns->nodes); node != NULL; node = next) {
+    next = nchan_list_next(node);
+    cb(node, privdata);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t set_preallocated_peername(redisAsyncContext *ctx, ngx_str_t *dst) {
+  char                  *ipstr = (char *)dst->data;
+  struct sockaddr_in    *s4;
+  struct sockaddr_in6   *s6;
+  // deal with both IPv4 and IPv6:
+  switch(ctx->c.sockaddr.sa_family) {
+    case AF_INET:
+      s4 = (struct sockaddr_in *)&ctx->c.sockaddr;
+      inet_ntop(AF_INET, &s4->sin_addr, ipstr, INET6_ADDRSTRLEN);
+      break;
+    case AF_INET6:
+      s6 = (struct sockaddr_in6 *)&ctx->c.sockaddr;
+      inet_ntop(AF_INET6, &s6->sin6_addr, ipstr, INET6_ADDRSTRLEN);
+      break;
+    case AF_UNSPEC:
+    default:
+      DBG("couldn't get sockaddr");
+      return NGX_ERROR;
+  }
+  dst->len = strlen(ipstr);
+  return NGX_OK;
+}
+
+
+//sneaky channel stuff
+ngx_int_t nodeset_associate_chanhead(redis_nodeset_t *ns, void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  if(ch->redis.nodeset && ch->redis.nodeset != ns) {
+    nodeset_dissociate_chanhead(ch);
+  }
+  ngx_memzero(&ch->redis.slist, sizeof(ch->redis.slist));
+  ch->redis.nodeset = ns;
+  nchan_slist_append(&ns->channels.all, ch);
+  return NGX_OK;
+}
+ngx_int_t nodeset_dissociate_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  redis_nodeset_t *ns = ch->redis.nodeset;
+  
+  if(ns) {
+    if(ch->redis.node.cmd) {
+      assert(!ch->redis.slist.in_disconnected_cmd_list);
+      nodeset_node_dissociate_chanhead(ch);
+    }
+    else if(ch->redis.slist.in_disconnected_cmd_list) {
+      ch->redis.slist.in_disconnected_cmd_list = 0;
+      nchan_slist_remove(&ns->channels.disconnected_cmd, ch);
+    }
+    
+    if(ch->redis.node.pubsub) {
+      assert(!ch->redis.slist.in_disconnected_pubsub_list);
+      nodeset_node_dissociate_pubsub_chanhead(ch);
+    }
+    else if(ch->redis.slist.in_disconnected_pubsub_list) {
+      ch->redis.slist.in_disconnected_pubsub_list = 0;
+      nchan_slist_remove(&ns->channels.disconnected_pubsub, ch);
+    }
+    
+    ch->redis.nodeset = NULL;
+    nchan_slist_remove(&ns->channels.all, ch);
+  }
+  return NGX_OK;
+}
+ngx_int_t nodeset_node_associate_chanhead(redis_node_t *node, void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  assert(ch->redis.node.cmd == NULL);
+  assert(node->nodeset == ch->redis.nodeset);
+  assert(ch->redis.slist.in_disconnected_cmd_list == 0);
+  if(ch->redis.node.cmd != node) { //dat idempotence tho
+    nchan_slist_append(&node->channels.cmd, ch);
+  }
+  ch->redis.node.cmd = node;
+  return NGX_OK;
+}
+ngx_int_t nodeset_node_associate_pubsub_chanhead(redis_node_t *node, void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  assert(ch->redis.node.pubsub == NULL);
+  assert(node->nodeset == ch->redis.nodeset);
+  assert(ch->redis.slist.in_disconnected_pubsub_list == 0);
+  if(ch->redis.node.pubsub != node) { //dat idempotence tho
+    nchan_slist_append(&node->channels.pubsub, ch);
+  }
+  ch->redis.node.pubsub = node;
+  return NGX_OK;
+}
+ngx_int_t nodeset_node_dissociate_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  if(ch->redis.node.cmd) {
+    nchan_slist_remove(&ch->redis.node.cmd->channels.cmd, ch);
+  }
+  ch->redis.node.cmd = NULL;
+  return NGX_OK;
+}
+ngx_int_t nodeset_node_dissociate_pubsub_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  if(ch->redis.node.pubsub) {
+    nchan_slist_remove(&ch->redis.node.pubsub->channels.pubsub, ch);
+  }
+  ch->redis.node.pubsub = NULL; 
+  return NGX_OK;
+}
+
+static redis_node_t *nodeset_node_random_master_or_slave(redis_node_t *master) {
+  redis_nodeset_t *ns = master->nodeset;
+  int master_total = ns->settings.node_weight.master;
+  int slave_total = master->peers.slaves.n * ns->settings.node_weight.slave;
+  int n;
+  
+  assert(master->role == REDIS_NODE_ROLE_MASTER);
+  
+  if(master_total + slave_total == 0) {
+    return master;
+  }
+  
+  n = ngx_random() % (slave_total + master_total);
+  if(n < master_total) {
+    return master;
+  }
+  else {
+    int           i = 0;
+    n = ngx_random() % master->peers.slaves.n; //random slave
+    redis_node_t **nodeptr;
+    for(nodeptr = nchan_list_first(&master->peers.slaves); nodeptr != NULL && i < n; nodeptr = nchan_list_next(nodeptr)) {
+      i++;
+    }
+    if(nodeptr == NULL || (*nodeptr)->state < REDIS_NODE_READY) {
+      //not ready? play it safe.
+      //node_log_error(*nodeptr, "got slave, but it's not ready. return master instead");
+      return master;
+    }
+    else {
+      //node_log_error(*nodeptr, "got slave");
+      return *nodeptr;
+    }
+  }
+}
+
+redis_node_t *nodeset_node_find_by_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  redis_node_t           *node;
+  if(ch->redis.node.cmd) {
+    return ch->redis.node.cmd;
+  }
+  node = nodeset_node_find_by_channel_id(ch->redis.nodeset, &ch->id);
+  nodeset_node_associate_chanhead(node, ch);
+  return node;
+}
+redis_node_t *nodeset_node_pubsub_find_by_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  redis_node_t           *node;
+  if(ch->redis.node.pubsub) {
+    return ch->redis.node.pubsub;
+  }
+  node = nodeset_node_find_by_channel_id(ch->redis.nodeset, &ch->id);
+  node = nodeset_node_random_master_or_slave(node);
+  nodeset_node_associate_pubsub_chanhead(node, ch);
+  return ch->redis.node.pubsub;
+}
+
+/*
+ * Copyright 2001-2010 Georges Menie (www.menie.org)
+ * Copyright 2010 Salvatore Sanfilippo (adapted to Redis coding style)
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the University of California, Berkeley nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* CRC16 implementation according to CCITT standards.
+ *
+ * Note by @antirez: this is actually the XMODEM CRC 16 algorithm, using the
+ * following parameters:
+ *
+ * Name                       : "XMODEM", also known as "ZMODEM", "CRC-16/ACORN"
+ * Width                      : 16 bit
+ * Poly                       : 1021 (That is actually x^16 + x^12 + x^5 + 1)
+ * Initialization             : 0000
+ * Reflect Input byte         : False
+ * Reflect Output CRC         : False
+ * Xor constant to output CRC : 0000
+ * Output for "123456789"     : 31C3
+ */
+
+static const uint16_t crc16tab[256]= {
+    0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
+    0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
+    0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
+    0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
+    0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
+    0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
+    0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
+    0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
+    0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
+    0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
+    0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
+    0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
+    0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
+    0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
+    0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
+    0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
+    0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
+    0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
+    0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
+    0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
+    0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
+    0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
+    0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
+    0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
+    0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
+    0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
+    0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
+    0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
+    0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
+    0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
+    0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
+    0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0
+};
+
+uint16_t redis_crc16(uint16_t crc, const char *buf, int len) {
+    int counter;
+    for (counter = 0; counter < len; counter++)
+            crc = (crc<<8) ^ crc16tab[((crc>>8) ^ *buf++)&0x00FF];
+    return crc;
+}
+
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset.h b/debian/modules/nchan/src/store/redis/redis_nodeset.h
new file mode 100644
index 0000000..59ee0cf
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis_nodeset.h
@@ -0,0 +1,276 @@
+#ifndef NCHAN_REDIS_NODESET_H
+#define NCHAN_REDIS_NODESET_H
+
+#include <nchan_module.h>
+#if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
+#include <hiredis/hiredis.h>
+#include <hiredis/async.h>
+#else
+#include <store/redis/hiredis/hiredis.h>
+#include <store/redis/hiredis/async.h>
+#endif
+#include <util/nchan_reaper.h>
+#include <util/nchan_rbtree.h>
+#include <util/nchan_list.h>
+#include <util/nchan_slist.h>
+
+//#include "store-private.h"
+
+//#define REDIS_NODESET_DBG 1
+
+#define node_log(node, lvl, fmt, args...) \
+  ngx_log_error(lvl, ngx_cycle->log, 0, "nchan: Redis node %s " fmt, __node_nickname_cstr(node), ##args)
+#define node_log_error(node, fmt, args...)    node_log((node), NGX_LOG_ERR, fmt, ##args)
+#define node_log_warning(node, fmt, args...)  node_log((node), NGX_LOG_WARN, fmt, ##args)
+#define node_log_notice(node, fmt, args...)   node_log((node), NGX_LOG_NOTICE, fmt, ##args)
+#define node_log_info(node, fmt, args...)     node_log((node), NGX_LOG_INFO, fmt, ##args)
+#define node_log_debug(node, fmt, args...)    node_log((node), NGX_LOG_DEBUG, fmt, ##args)
+  
+#define nodeset_log(nodeset, lvl, fmt, args...) \
+  ngx_log_error(lvl, ngx_cycle->log, 0, "nchan: Redis %s: " fmt, __nodeset_nickname_cstr(nodeset), ##args)
+#define nodeset_log_error(nodeset, fmt, args...)    nodeset_log((nodeset), NGX_LOG_ERR, fmt, ##args)
+#define nodeset_log_warning(nodeset, fmt, args...)  nodeset_log((nodeset), NGX_LOG_WARN, fmt, ##args)
+#define nodeset_log_notice(nodeset, fmt, args...)   nodeset_log((nodeset), NGX_LOG_NOTICE, fmt, ##args)
+#define nodeset_log_info(nodeset, fmt, args...)     nodeset_log((nodeset), NGX_LOG_INFO, fmt, ##args)
+#define nodeset_log_debug(nodeset, fmt, args...)    nodeset_log((nodeset), NGX_LOG_DEBUG, fmt, ##args)
+
+#define NCHAN_MAX_NODESETS 128
+#define REDIS_NODESET_STATUS_CHECK_TIME_MSEC 4000
+#define REDIS_NODESET_MAX_CONNECTING_TIME_SEC 5
+#define REDIS_NODESET_RECONNECT_WAIT_TIME_SEC 5
+#define REDIS_NODESET_MAX_FAILING_TIME_SEC 2
+
+#define REDIS_NODE_DEDUPLICATED         -100
+#define REDIS_NODE_CONNECTION_TIMED_OUT   -2
+#define REDIS_NODE_FAILED                 -1
+#define REDIS_NODE_DISCONNECTED            0
+#define REDIS_NODE_CMD_CONNECTING          1
+#define REDIS_NODE_PUBSUB_CONNECTING       2
+#define REDIS_NODE_CONNECTED               3
+#define REDIS_NODE_CMD_AUTHENTICATING      4
+#define REDIS_NODE_PUBSUB_AUTHENTICATING   5
+#define REDIS_NODE_SELECT_DB               6
+#define REDIS_NODE_CMD_SELECTING_DB        7
+#define REDIS_NODE_PUBSUB_SELECTING_DB     8
+#define REDIS_NODE_SCRIPTS_LOAD            9
+#define REDIS_NODE_SCRIPTS_LOADING        10
+#define REDIS_NODE_GET_INFO               11
+#define REDIS_NODE_GETTING_INFO           12
+#define REDIS_NODE_PUBSUB_GET_INFO        13
+#define REDIS_NODE_PUBSUB_GETTING_INFO    14
+#define REDIS_NODE_SUBSCRIBE_WORKER       15
+#define REDIS_NODE_SUBSCRIBING_WORKER     16
+#define REDIS_NODE_GET_CLUSTERINFO        17
+#define REDIS_NODE_GETTING_CLUSTERINFO    18
+#define REDIS_NODE_GET_CLUSTER_NODES      19
+#define REDIS_NODE_GETTING_CLUSTER_NODES  20
+#define REDIS_NODE_READY                  100
+  
+typedef struct redis_nodeset_s redis_nodeset_t;
+typedef struct redis_node_s redis_node_t;
+
+typedef struct { //redis_nodeset_cluster_t
+  unsigned                    enabled:1;
+  rbtree_seed_t               keyslots; //cluster rbtree seed
+} redis_nodeset_cluster_t;
+
+typedef struct {
+  unsigned         min:16;
+  unsigned         max:16;
+} redis_slot_range_t;
+
+typedef enum {
+  REDIS_NODE_ROLE_UNKNOWN = 0, REDIS_NODE_ROLE_MASTER, REDIS_NODE_ROLE_SLAVE
+} redis_node_role_t;
+
+typedef enum {
+  REDIS_NODESET_FAILED = -4,
+  REDIS_NODESET_CLUSTER_FAILING = -3,
+  REDIS_NODESET_FAILING = -2,
+  REDIS_NODESET_INVALID = -1,
+  REDIS_NODESET_DISCONNECTED = 0,
+  REDIS_NODESET_CONNECTING,
+  REDIS_NODESET_READY
+} redis_nodeset_status_t;
+
+#if REDIS_NODESET_DBG
+typedef struct {
+  int  n;
+  redis_node_t *node[128];
+} redis_node_dbg_list_t;
+typedef struct {
+  redis_slot_range_t range;
+  redis_node_t       *node;
+} redis_node_range_dbg_t;
+typedef struct {
+  int  n;
+  redis_node_range_dbg_t node[128];
+} redis_nodeset_dbg_range_tree_t;
+#endif
+
+
+
+struct redis_nodeset_s {
+  //a set of redis nodes
+  //  maybe just 1 master
+  //  maybe a master and its slaves
+  //  maybe a cluster of masters and their slaves
+  //slaves of slaves not included
+  
+  redis_nodeset_status_t      status;
+  ngx_event_t                 status_check_ev;
+  const char                 *status_msg;
+  time_t                      current_status_start;
+  ngx_int_t                   current_status_times_checked;
+  ngx_int_t                   generation;
+  nchan_list_t                urls;
+  nchan_loc_conf_t           *first_loc_conf;
+  ngx_http_upstream_srv_conf_t *upstream;
+  nchan_list_t                nodes;
+  redis_nodeset_cluster_t     cluster;
+  struct {                    //settings
+    nchan_redis_storage_mode_t  storage_mode;
+    ngx_int_t                   nostore_fastpublish;
+    struct {                    //pubsub_subscribe_weight
+      ngx_int_t                   master;
+      ngx_int_t                   slave;
+    }                           node_weight;
+    time_t                      ping_interval;
+    ngx_str_t                  *namespace;
+    nchan_redis_optimize_t      optimize_target;
+    ngx_msec_t                  connect_timeout;
+  }                           settings;
+  
+  struct {
+    nchan_slist_t               all;
+    nchan_slist_t               disconnected_cmd;
+    nchan_slist_t               disconnected_pubsub;
+  }                           channels;
+  
+  nchan_reaper_t              chanhead_reaper;
+  time_t                      reconnect_delay_sec;
+  nchan_list_t                onready_callbacks;
+#if REDIS_NODESET_DBG
+  struct {
+    redis_node_dbg_list_t       nodes;
+    redis_nodeset_dbg_range_tree_t ranges;
+    int                         keyspace_complete;
+  }                           dbg;
+#endif
+  
+}; //redis_nodeset_t
+
+struct redis_node_s {
+  int8_t                    state;
+  unsigned                  discovered:1;
+  redis_node_role_t         role;
+  redis_connect_params_t    connect_params;
+  void                     *connect_timeout;
+  redis_nodeset_t          *nodeset;
+  ngx_str_t                 run_id;
+  ngx_str_t                 version;
+  int                       scripts_loaded;
+  int                       generation;
+  ngx_event_t               ping_timer;
+  struct {
+    unsigned                  enabled:1;
+    unsigned                  ok:1;
+    ngx_str_t                 id;
+    struct {
+      redis_slot_range_t         *range;
+      size_t                      n;
+      unsigned                    indexed:1;
+    }                         slot_range; 
+    char                     *cluster_nodes;
+  }                         cluster;
+  struct {
+    redis_node_t              *master;
+    nchan_list_t               slaves;
+  }                         peers;
+  struct {
+    redisAsyncContext         *cmd;
+    redisAsyncContext         *pubsub;
+    redisContext              *sync;
+  }                         ctx;
+  int                       pending_commands;
+  struct {
+  nchan_slist_t               cmd;
+  nchan_slist_t               pubsub;
+  }                         channels;
+}; //redis_node_t
+
+typedef struct {
+  redis_slot_range_t      range;
+  redis_node_t           *node;
+} redis_nodeset_slot_range_node_t;
+
+
+
+redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf);
+ngx_int_t nodeset_initialize(char *worker_id, redisCallbackFn *subscribe_handler);
+redis_nodeset_t *nodeset_find(nchan_redis_conf_t *rcf);
+ngx_int_t nodeset_examine(redis_nodeset_t *nodeset);
+
+ngx_int_t nodeset_node_destroy(redis_node_t *node);
+
+
+int node_disconnect(redis_node_t *node, int disconnected_state);
+int node_connect(redis_node_t *node);
+void node_set_role(redis_node_t *node, redis_node_role_t role);
+int node_set_master_node(redis_node_t *node, redis_node_t *master);
+redis_node_t *node_find_slave_node(redis_node_t *node, redis_node_t *slave);
+int node_add_slave_node(redis_node_t *node, redis_node_t *slave);
+int node_remove_slave_node(redis_node_t *node, redis_node_t *slave);
+
+ngx_int_t nodeset_connect_all(void);
+int nodeset_connect(redis_nodeset_t *ns);
+int nodeset_node_keyslot_changed(redis_node_t *node);
+int nodeset_disconnect(redis_nodeset_t *ns);
+ngx_int_t nodeset_destroy_all(void);
+ngx_int_t nodeset_each(void (*)(redis_nodeset_t *, void *), void *privdata);
+ngx_int_t nodeset_each_node(redis_nodeset_t *, void (*)(redis_node_t *, void *), void *privdata);
+ngx_int_t nodeset_callback_on_ready(redis_nodeset_t *ns, ngx_msec_t max_wait, ngx_int_t (*cb)(redis_nodeset_t *, void *), void *pd);
+ngx_int_t nodeset_abort_on_ready_callbacks(redis_nodeset_t *ns);
+ngx_int_t nodeset_run_on_ready_callbacks(redis_nodeset_t *ns);
+
+ngx_int_t nodeset_set_status(redis_nodeset_t *nodeset, redis_nodeset_status_t status, const char *msg);
+
+int nodeset_node_deduplicate_by_connect_params(redis_node_t *node);
+int nodeset_node_deduplicate_by_run_id(redis_node_t *node);
+int nodeset_node_deduplicate_by_cluster_id(redis_node_t *node);
+
+redis_node_t *nodeset_node_find_by_connect_params(redis_nodeset_t *ns, redis_connect_params_t *rcp);
+redis_node_t *nodeset_node_find_by_run_id(redis_nodeset_t *ns, ngx_str_t *run_id);
+redis_node_t *nodeset_node_find_by_cluster_id(redis_nodeset_t *ns, ngx_str_t *cluster_id);
+redis_node_t *nodeset_node_find_by_range(redis_nodeset_t *ns, redis_slot_range_t *range);
+redis_node_t *nodeset_node_find_by_slot(redis_nodeset_t *ns, uint16_t slot);
+redis_node_t *nodeset_node_find_by_channel_id(redis_nodeset_t *ns, ngx_str_t *channel_id);
+redis_node_t *nodeset_node_find_by_key(redis_nodeset_t *ns, ngx_str_t *key);
+redis_node_t *nodeset_node_find_any_ready_master(redis_nodeset_t *ns);
+int nodeset_node_reply_keyslot_ok(redis_node_t *node, redisReply *r);
+int nodeset_ready(redis_nodeset_t *nodeset);
+
+//chanheads are (void *) here to avoid circular typedef dependency with store-private.h
+//it's terrible, and dirty -- but quick
+ngx_int_t nodeset_associate_chanhead(redis_nodeset_t *, void *chanhead);
+ngx_int_t nodeset_dissociate_chanhead(void *chanhead);
+
+ngx_int_t nodeset_node_associate_chanhead(redis_node_t *, void *chanhead);
+ngx_int_t nodeset_node_associate_pubsub_chanhead(redis_node_t *, void *chanhead);
+ngx_int_t nodeset_node_dissociate_chanhead(void *chanhead);
+ngx_int_t nodeset_node_dissociate_pubsub_chanhead(void *chanhead);
+
+redis_node_t *nodeset_node_find_by_chanhead(void *chanhead);
+redis_node_t *nodeset_node_pubsub_find_by_chanhead(void *chanhead);
+
+
+
+redis_node_t *nodeset_node_create(redis_nodeset_t *ns, redis_connect_params_t *rcp);
+
+uint16_t redis_crc16(uint16_t crc, const char *buf, int len);
+
+
+const char *__nodeset_nickname_cstr(redis_nodeset_t *nodeset);
+const char *__node_nickname_cstr(redis_node_t *node);
+  
+#endif /* NCHAN_REDIS_NODESET_H */
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset_parser.c b/debian/modules/nchan/src/store/redis/redis_nodeset_parser.c
new file mode 100644
index 0000000..5db30f0
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis_nodeset_parser.c
@@ -0,0 +1,241 @@
+#include <nchan_module.h>
+#include <assert.h>
+
+#include "redis_nginx_adapter.h"
+
+#include <util/nchan_util.h>
+#include <util/nchan_msg.h>
+#include <store/store_common.h>
+#include "redis_nodeset_parser.h"
+#include "redis_nodeset.h"
+
+#define nchan_scan_str(str_src, cur, chr, str)\
+  (str)->data = (u_char *)memchr(cur, chr, (str_src)->len - (cur - (str_src)->data));\
+  if(!(str)->data)                            \
+    (str)->data = (str_src)->data + (str_src)->len;\
+  if((str)->data) {                           \
+    (str)->len = (str)->data - cur;           \
+    (str)->data = cur;                        \
+    cur+=(str)->len+1;                        \
+  }                                           \
+  else                                        \
+    goto fail
+
+
+static cluster_nodes_line_t   cluster_node_parsed_lines[MAX_CLUSTER_NODE_PARSED_LINES];
+static redis_connect_params_t parsed_connect_params[MAX_NODE_SLAVES_PARSED];
+
+static u_char *nodeset_parser_scan_cluster_nodes_slots_string(ngx_str_t *str, u_char *cur, redis_slot_range_t *r) {
+  ngx_str_t       slot_min_str, slot_max_str, slot;
+  ngx_int_t       slot_min,     slot_max;
+  u_char         *dash;
+  
+  if(cur == NULL) {
+    cur = str->data;
+  }
+  else if(cur >= str->data + str->len) {
+    return NULL;
+  }
+  if(str->len == 0) {
+    return NULL;
+  }
+  
+  nchan_scan_str(str, cur, ' ', &slot);
+  if(slot.data[0] == '[') {
+    //transitional special slot. ignore it.
+    return nodeset_parser_scan_cluster_nodes_slots_string(str, cur, r);
+  }
+  
+  dash = (u_char *)memchr(slot.data, '-', slot.len);
+  if(dash) {
+    slot_min_str.data = slot.data;
+    slot_min_str.len = dash - slot.data;
+    
+    slot_max_str.data = dash + 1;
+    slot_max_str.len = slot.len - (slot_max_str.data - slot.data);
+  }
+  else {
+    slot_min_str = slot;
+    slot_max_str = slot;
+  }
+  
+  slot_min = ngx_atoi(slot_min_str.data, slot_min_str.len);
+  slot_max = ngx_atoi(slot_max_str.data, slot_max_str.len);
+  
+  //DBG("slots: %i - %i", slot_min, slot_max);
+  
+  r->min = slot_min;
+  r->max = slot_max;
+  
+  return cur;
+  
+fail:
+  return NULL;
+}
+
+int parse_cluster_node_slots(cluster_nodes_line_t *l, redis_slot_range_t *ranges) {
+  //assumes the correct amount of ranges has already been allocated
+int                    i = 0;
+  redis_slot_range_t   range;
+  u_char              *cur = NULL;
+  while((cur = nodeset_parser_scan_cluster_nodes_slots_string(&l->slots, cur, &range)) != NULL) {
+    if(i > l->slot_ranges_count) {
+      return 0; //parsing more slot ranges than was expected
+    }
+    ranges[i]=range;
+    i++;
+  }
+  if(i !=l->slot_ranges_count) {
+    return 0; //parsed the wrong amount of slot ranges
+  }
+  return 1;
+}
+
+static char *nodeset_parser_scan_cluster_nodes_line(const char *line, cluster_nodes_line_t *l) {
+  u_char     *cur = (u_char *)line;
+  u_char     *max = cur;
+  u_char     *tmp;
+  ngx_str_t   rest_line;
+  
+  if(cur[0]=='\0')
+    return NULL;
+  
+  nchan_scan_split_by_chr(&max, strlen((char *)max), &rest_line, '\n');
+  l->line = rest_line;
+  
+  nchan_scan_until_chr_on_line(&rest_line, &l->id,           ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->address,      ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->flags,        ' ');
+  
+  nchan_scan_until_chr_on_line(&rest_line, &l->master_id,    ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->ping_sent,    ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->pong_recv,    ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->config_epoch, ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->link_state,   ' ');
+  
+  if(nchan_ngx_str_substr((&l->flags), "master")) {
+    l->slots = rest_line;
+    l->master = 1;
+    
+    //how many slot ranges?
+    int                  i = 0;
+    redis_slot_range_t   range;
+    cur = NULL;
+    while((cur = nodeset_parser_scan_cluster_nodes_slots_string(&l->slots, cur, &range)) != NULL) {
+      i++;
+    }
+    l->slot_ranges_count = i;
+  }
+  else {
+    l->slots.data = NULL;
+    l->slots.len = 0;
+    l->slot_ranges_count = 0;
+    l->master = 0;
+  }
+  l->failed = nchan_ngx_str_substr((&l->flags), "fail");
+  l->self = nchan_ngx_str_substr((&l->flags), "myself");
+  l->noaddr = nchan_ngx_str_substr((&l->flags), "noaddr");
+  l->handshake = nchan_ngx_str_substr((&l->flags), "handshake");
+  
+  l->connected = l->link_state.data[0]=='c' ? 1 : 0; //[c]onnected
+  
+  //redis >= 4.0 CLUSTER NODES format compatibility
+  if((tmp = memrchr(l->address.data, '@', l->address.len)) != NULL) {
+    l->address.len = tmp - l->address.data;
+  }
+  
+  if((tmp = memrchr(l->address.data, ':', l->address.len)) != NULL) {
+    //hostname and port from address
+    ngx_str_t   port;
+    l->hostname.data = l->address.data;
+    l->hostname.len = tmp - l->address.data;
+    port.len = l->address.len - l->hostname.len - 1;
+    port.data = &tmp[1];
+    l->port = ngx_atoi(port.data, port.len);
+  }
+  
+  cur = max;
+  if(&cur[-1] > (u_char *)line && cur[-1] == '\0')
+    cur--;
+  return (char *)cur;
+}
+
+redis_connect_params_t *parse_info_slaves(redis_node_t *node, const char *info, size_t *count) {
+  char                   slavebuf[20]="slave0:";
+  int                    i = 0, skipped = 0;
+  redis_connect_params_t rcp;
+  ngx_str_t              line;
+  while(nchan_get_rest_of_line_in_cstr(info, slavebuf, &line)) {
+    //ip=localhost,port=8537,state=online,offset=420,lag=1
+    ngx_str_t hostname, port;
+    nchan_scan_until_chr_on_line(&line, NULL,      '='); //ip=
+    nchan_scan_until_chr_on_line(&line, &hostname, ','); //ip=([^,]*),
+    nchan_scan_until_chr_on_line(&line, NULL,      '='); //port=
+    nchan_scan_until_chr_on_line(&line, &port,     ','); //port=([^,]*),
+    //don't care about the rest
+    rcp.hostname = hostname;
+    rcp.port = ngx_atoi(port.data, port.len);
+    rcp.password = node->connect_params.password;
+    rcp.peername.len = 0;
+    rcp.db = node->connect_params.db;
+    
+    if(i < MAX_NODE_SLAVES_PARSED) {
+      parsed_connect_params[i]=rcp;
+    }
+    else {
+      node_log_error(node, "too many slaves, skipping slave %d", i+1);
+    }
+    i++;
+    ngx_sprintf((u_char *)slavebuf, "slave%d:", i);
+    
+    
+  }
+  *count = i - skipped;
+  return parsed_connect_params;
+}
+
+redis_connect_params_t *parse_info_master(redis_node_t *node, const char *info) {
+  redis_connect_params_t    rcp;
+  ngx_str_t                 port;
+  if(!nchan_get_rest_of_line_in_cstr(info, "master_host:", &rcp.hostname)) {
+    node_log_error(node, "failed to find master_host while discovering master");
+    return 0;
+  }
+  
+  if(!nchan_get_rest_of_line_in_cstr(info, "master_port:", &port)) {
+    node_log_error(node, "failed to find master_port while discovering master");
+    return 0;
+  }
+  rcp.port = ngx_atoi(port.data, port.len);
+  if(rcp.port == NGX_ERROR) {
+    node_log_error(node, "failed to parse master_port while discovering master");
+    return 0;
+  }
+  rcp.db = node->connect_params.db;
+  rcp.password = node->connect_params.password;
+
+  rcp.peername.data = NULL;
+  rcp.peername.len = 0;
+  
+  parsed_connect_params[0]=rcp;
+  return &parsed_connect_params[0];
+}
+
+cluster_nodes_line_t *parse_cluster_nodes(redis_node_t *node, const char *clusternodes, size_t *count) {
+  
+  const char           *line = clusternodes;
+  size_t                n = 0, discarded = 0;
+  cluster_nodes_line_t  l;
+  while((line = nodeset_parser_scan_cluster_nodes_line(line, &l)) != NULL) {
+    if(n > MAX_CLUSTER_NODE_PARSED_LINES) {
+      node_log_error(node, "too many cluster nodes, discarding line %d", n + discarded);
+      discarded++;
+    }
+    else {
+      cluster_node_parsed_lines[n]=l;
+      n++;
+    }
+  }
+  *count = n;
+  return cluster_node_parsed_lines;
+}
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset_parser.h b/debian/modules/nchan/src/store/redis/redis_nodeset_parser.h
new file mode 100644
index 0000000..e9f3575
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis_nodeset_parser.h
@@ -0,0 +1,40 @@
+#ifndef REDIS_NODESET_PARSER_H
+#define REDIS_NODESET_PARSER_H
+
+#define MAX_CLUSTER_NODE_PARSED_LINES 512
+#define MAX_NODE_SLAVES_PARSED 512
+
+#include <nchan_module.h>
+#include "store-private.h"
+
+typedef struct {
+  ngx_str_t      line;
+  ngx_str_t      id;         //node id
+  ngx_str_t      address;    //address as known by redis
+  ngx_str_t      hostname;
+  ngx_int_t      port;
+  ngx_str_t      flags;
+  
+  ngx_str_t      master_id;  //if slave
+  ngx_str_t      ping_sent;
+  ngx_str_t      pong_recv;
+  ngx_str_t      config_epoch;
+  ngx_str_t      link_state; //connected or disconnected
+  
+  ngx_str_t      slots;
+  ngx_int_t      slot_ranges_count;
+  
+  unsigned       connected:1;
+  unsigned       master:1;
+  unsigned       noaddr:1;
+  unsigned       failed:1;
+  unsigned       handshake:1;
+  unsigned       self:1;
+} cluster_nodes_line_t;
+
+redis_connect_params_t *parse_info_slaves(redis_node_t *node, const char *info, size_t *count);
+redis_connect_params_t *parse_info_master(redis_node_t *node, const char *info);
+cluster_nodes_line_t *parse_cluster_nodes(redis_node_t *node, const char *clusternodes, size_t *count);
+int parse_cluster_node_slots(cluster_nodes_line_t *l, redis_slot_range_t *ranges);
+
+#endif /*REDIS_NODESET_PARSER_H */
diff --git a/debian/modules/nchan/src/store/redis/scripts/find_channel.lua b/debian/modules/nchan/src/store/redis/scripts/find_channel.lua
deleted file mode 100644
index 882336c..0000000
--- a/debian/modules/nchan/src/store/redis/scripts/find_channel.lua
+++ /dev/null
@@ -1,56 +0,0 @@
---input: keys: [],  values: [ channel_id ]
---output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
--- finds and return the info hash of a channel, or nil of channel not found
-local id = ARGV[1]
-local channel_key = ('{channel:%s}'):format(id)
-local messages_key = channel_key..':messages'
-
-redis.call('echo', ' #######  FIND_CHANNEL ######## ')
-
---check old entries
-local oldestmsg=function(list_key, old_fmt)
-  local old, oldkey
-  local n, del=0,0
-  while true do
-    n=n+1
-    old=redis.call('lindex', list_key, -1)
-    if old then
-      oldkey=old_fmt:format(old)
-      local ex=redis.call('exists', oldkey)
-      if ex==1 then
-        return oldkey
-      else
-        redis.call('rpop', list_key)
-        del=del+1
-      end
-    else
-      break
-    end
-  end
-end
-
-if redis.call('EXISTS', channel_key) ~= 0 then
-  local ch = redis.call('hmget', channel_key, 'ttl', 'time_last_seen', 'subscribers', 'fake_subscribers', 'current_message')
-  if(ch[4]) then
-    --replace subscribers count with fake_subscribers
-    ch[3]=ch[4]
-    table.remove(ch, 4)
-  end
-  for i = 1, 4 do
-    ch[i]=tonumber(ch[i]) or 0
-  end
-  if type(ch[5]) ~= "string" then
-    ch[5]=""
-  end
-  
-  if redis.call("TYPE", messages_key)['ok'] == 'list' then
-    oldestmsg(messages_key, channel_key ..':msg:%s')
-    table.insert(ch, tonumber(redis.call('llen', messages_key)))
-  else
-    table.insert(ch, 0)
-  end
-  
-  return ch
-else
-  return nil
-end
diff --git a/debian/modules/nchan/src/store/redis/scripts/get_message_from_key.lua b/debian/modules/nchan/src/store/redis/scripts/get_message_from_key.lua
deleted file mode 100644
index 13055ca..0000000
--- a/debian/modules/nchan/src/store/redis/scripts/get_message_from_key.lua
+++ /dev/null
@@ -1,9 +0,0 @@
---input:  keys: [message_key], values: []
---output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
-
-local key = KEYS[1]
-
-local ttl = redis.call('TTL', key)
-local time, tag, prev_time, prev_tag, data, content_type, es_event = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event'))
-
-return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or "", content_type or "", es_event or ""}
diff --git a/debian/modules/nchan/src/store/redis/store-private.h b/debian/modules/nchan/src/store/redis/store-private.h
index 8487efa..fffed5f 100644
--- a/debian/modules/nchan/src/store/redis/store-private.h
+++ b/debian/modules/nchan/src/store/redis/store-private.h
@@ -7,23 +7,32 @@
 
 #include <nchan_module.h>
 #include "uthash.h"
-#include "hiredis/hiredis.h"
-#include "hiredis/async.h"
+#if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
+#include <hiredis/hiredis.h>
+#include <hiredis/async.h>
+#else
+#include <store/redis/hiredis/hiredis.h>
+#include <store/redis/hiredis/async.h>
+#endif
 #include <util/nchan_reaper.h>
 #include <util/nchan_rbtree.h>
 #include <util/nchan_list.h>
 #include <store/spool.h>
 
-typedef struct rdstore_data_s rdstore_data_t;
+#include "redis_nodeset.h"
+#define REDIS_LUA_HASH_LENGTH 40
+#define REDIS_NODESET_NOT_READY_MAX_RETRIES 2
+
+//OBSOLETE
+typedef struct {
+  unsigned         min:16;
+  unsigned         max:16;
+} redis_cluster_slot_range_t;
+
+
 typedef struct rdstore_channel_head_s rdstore_channel_head_t;
 
-typedef struct {
-  rdstore_data_t          *node_rdt;
-  unsigned                 enabled:1;
-} rdstore_channel_head_cluster_data_t;
-
-
-typedef enum {SUBBING, SUBBED, UNSUBBING, UNSUBBED} redis_pubsub_status_t;
+typedef enum {REDIS_PUBSUB_SUBSCRIBING, REDIS_PUBSUB_SUBSCRIBED, REDIS_PUBSUB_UNSUBSCRIBED} redis_pubsub_status_t;
 
 struct rdstore_channel_head_s {
   ngx_str_t                    id; //channel id
@@ -34,22 +43,49 @@ struct rdstore_channel_head_s {
   ngx_int_t                    fetching_message_count;
   ngx_uint_t                   internal_sub_count;
   ngx_event_t                  keepalive_timer;
+  ngx_uint_t                   keepalive_times_sent;
   nchan_msg_id_t               last_msgid;
   
   void                        *redis_subscriber_privdata;
-  rdstore_data_t              *rdt;
-  rdstore_channel_head_cluster_data_t cluster;
+  //rdstore_channel_head_cluster_data_t cluster;
   
   ngx_int_t                    reserved;
   
-  rdstore_channel_head_t      *gc_prev;
-  rdstore_channel_head_t      *gc_next;
+  struct {                   //redis
+    int                          generation;
+    redis_nodeset_t             *nodeset;
+    struct {                   //node
+      redis_node_t                *cmd;
+      redis_node_t                *pubsub;
+    }                            node;
+    
+    struct {                  //linked list links
+      struct {
+        rdstore_channel_head_t      *prev;
+        rdstore_channel_head_t      *next;
+      }                            nodeset;
+      struct {
+        rdstore_channel_head_t      *prev;
+        rdstore_channel_head_t      *next;
+      }                            node_cmd;
+      struct {
+        rdstore_channel_head_t      *prev;
+        rdstore_channel_head_t      *next;
+      }                            node_pubsub;
+      unsigned                     in_disconnected_cmd_list:1;
+      unsigned                     in_disconnected_pubsub_list:1;
+    }                            slist;
+    
+  }                            redis;
+  
+  struct {                   //gc
+    rdstore_channel_head_t      *prev;
+    rdstore_channel_head_t      *next;
+    time_t                       time;
+    unsigned                     in_reaper:1;
+  }                            gc;
   
-  rdstore_channel_head_t      *rd_next;
-  rdstore_channel_head_t      *rd_prev;
   
-  time_t                       gc_time;
-  nchan_reaper_t              *in_gc_reaper;
   
   redis_pubsub_status_t        pubsub_status;
   unsigned                     meta:1;
@@ -57,139 +93,17 @@ struct rdstore_channel_head_s {
   UT_hash_handle               hh;
 };
 
-typedef struct {
-  ngx_str_t     host;
-  ngx_int_t     port;
-  ngx_str_t     password;
-  ngx_int_t     db;
-} redis_connect_params_t;
 
-typedef struct callback_chain_s callback_chain_t;
-struct callback_chain_s {
-  callback_pt                  cb;
-  void                        *pd;
-  callback_chain_t            *next;
-};
-
-typedef enum {DISCONNECTED, CONNECTING, AUTHENTICATING, LOADING, LOADING_SCRIPTS, CONNECTED} redis_connection_status_t;
-
-typedef enum {CLUSTER_DISCONNECTED, CLUSTER_CONNECTING, CLUSTER_NOTREADY, CLUSTER_READY, CLUSTER_FAILED} redis_cluster_status_t;
-
-
-typedef enum {CLUSTER_RETRY_BY_CHANHEAD, CLUSTER_RETRY_BY_CHANNEL_ID, CLUSTER_RETRY_BY_KEY, CLUSTER_RETRY_BY_CSTR} redis_cluster_retry_hashslot_t;
-typedef struct redis_cluster_retry_s redis_cluster_retry_t;
-struct redis_cluster_retry_s {
-  redis_cluster_retry_hashslot_t     type;
-  union {
-    rdstore_channel_head_t          *chanhead;
-    ngx_str_t                        str;
-    u_char                          *cstr;
-  };
-  void                              (*retry)(rdstore_data_t*, void *);
-  void                               *data;
-}; //retry_redis_script_t
-
-typedef struct {
-  redis_cluster_status_t           status;
-  
-  rbtree_seed_t                    hashslots; //cluster rbtree seed
-  struct {
-    nchan_list_t                     master;
-    nchan_list_t                     slave;
-    nchan_list_t                     disconnected;
-  } nodes;
-  ngx_uint_t                       size; //number of master nodes
-  ngx_uint_t                       nodes_connected; //number of connected nodes
-  ngx_int_t                        node_connections_pending; //number of master nodes
-  uint32_t                         homebrew_id;
-  ngx_http_upstream_srv_conf_t    *uscf;
-  ngx_pool_t                      *pool;
-  
-  ngx_event_t                      still_notready_timer;
-  
-  nchan_reaper_t                   chanhead_reaper;
-  rdstore_channel_head_t          *orphan_channels_head;
-  
-  nchan_list_t                     retry_commands;
-} redis_cluster_t;
-
-typedef struct {
-  ngx_str_t         id;
-  ngx_str_t         address;
-  ngx_str_t         slots;
-  redis_cluster_t  *cluster;
-  
-  nchan_list_t     *in_node_list;
-  rdstore_data_t  **node_list_el_data;
-  
-  unsigned          master:1;
-  unsigned          failed:1;
-  unsigned          inactive:1;
-  unsigned          indexed:1;
-} redis_cluster_node_t;
-
-typedef struct {
-  unsigned         min:16;
-  unsigned         max:16;
-} redis_cluster_slot_range_t;
-
-typedef struct {
-  redis_cluster_slot_range_t   range;
-  rdstore_data_t              *rdata;
-} redis_cluster_keyslot_range_node_t;
-
-struct rdstore_data_s {
-  ngx_str_t                       *connect_url;
-  redis_connect_params_t           connect_params;
-  
-  redisAsyncContext               *ctx;
-  redisAsyncContext               *sub_ctx;
-  redisContext                    *sync_ctx;
-  
-  nchan_reaper_t                   chanhead_reaper;
-  
-  redis_connection_status_t        status;
-  int                              scripts_loaded_count;
-  int                              generation;
-  ngx_event_t                      reconnect_timer;
-  ngx_event_t                      ping_timer;
-  time_t                           ping_interval;
-  callback_chain_t                *on_connected;
-  nchan_loc_conf_t                *lcf;
-  
-  //cluster stuff
-  redis_cluster_node_t             node;
-  rdstore_channel_head_t          *channels_head;
-  rdstore_channel_head_t          *almost_deleted_channels_head;
-  
-  ngx_int_t                        pending_commands;
-  ngx_event_t                      stall_timer;
-  
-  unsigned                         shutting_down:1;
-}; // rdstore_data_t
-
-
-redis_connection_status_t redis_connection_status(nchan_loc_conf_t *cf);
 void redisCheckErrorCallback(redisAsyncContext *c, void *r, void *privdata);
 int redisReplyOk(redisAsyncContext *c, void *r);
-ngx_int_t redis_add_connection_data(nchan_redis_conf_t *rcf, nchan_loc_conf_t *lcf, ngx_str_t *override_url);
-rdstore_data_t *redis_create_rdata(ngx_str_t *url, redis_connect_params_t *rcp, nchan_redis_conf_t *rcf, nchan_loc_conf_t *lcf);
-ngx_int_t redis_ensure_connected(rdstore_data_t *rdata);
 ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp);
 ngx_int_t rdstore_initialize_chanhead_reaper(nchan_reaper_t *reaper, char *name);
 
 ngx_int_t redis_chanhead_gc_add(rdstore_channel_head_t *head, ngx_int_t expire, const char *reason);
-ngx_int_t redis_chanhead_gc_add_to_reaper(nchan_reaper_t *, rdstore_channel_head_t *head, ngx_int_t expire, const char *reason);
 ngx_int_t redis_chanhead_gc_withdraw(rdstore_channel_head_t *head);
-ngx_int_t redis_chanhead_gc_withdraw_from_reaper(nchan_reaper_t *, rdstore_channel_head_t *head);
 ngx_int_t redis_chanhead_catch_up_after_reconnect(rdstore_channel_head_t *ch);
 
-
-void redis_associate_chanhead_with_rdata(rdstore_channel_head_t *head, rdstore_data_t *rdata);
-nchan_reaper_t *rdstore_get_chanhead_reaper(rdstore_channel_head_t *ch);
-ngx_int_t ensure_chanhead_pubsub_subscribed(rdstore_channel_head_t *ch);
+ngx_int_t ensure_chanhead_pubsub_subscribed_if_needed(rdstore_channel_head_t *ch);
 
 
-rdstore_data_t *find_rdata_by_connect_params(redis_connect_params_t *rcp);
-rdstore_data_t *find_rdata_by_url(ngx_str_t *url);
 #endif //NCHAN_REDIS_STORE_PRIVATE_H
diff --git a/debian/modules/nchan/src/store/redis/store.h b/debian/modules/nchan/src/store/redis/store.h
index 834cadb..973bbcf 100755
--- a/debian/modules/nchan/src/store/redis/store.h
+++ b/debian/modules/nchan/src/store/redis/store.h
@@ -9,8 +9,13 @@ extern nchan_store_t  nchan_store_redis;
 ngx_int_t nchan_store_redis_fakesub_add(ngx_str_t *channel_id, nchan_loc_conf_t *cf, ngx_int_t count, uint8_t shutting_down);
 void redis_store_prepare_to_exit_worker(); // hark! a hack!!
 
-ngx_int_t nchan_store_redis_add_server_conf(ngx_conf_t *cf, nchan_redis_conf_t *rcf, nchan_loc_conf_t *loc_conf);
-ngx_int_t nchan_store_redis_remove_server_conf(ngx_conf_t *cf, nchan_redis_conf_t *rcf);
+ngx_int_t nchan_store_redis_add_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf);
+ngx_int_t nchan_store_redis_remove_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf);
 
-ngx_int_t redis_store_callback_on_connected(nchan_loc_conf_t *cf, callback_pt cb, void *privdata);
+int nchan_store_redis_ready(nchan_loc_conf_t *cf);
+int nchan_store_redis_validate_url(ngx_str_t *url);
+
+
+
+ngx_int_t redis_store_callback_on_connected(nchan_loc_conf_t *cf, ngx_msec_t max_wait, callback_pt cb, void *privdata);
 #endif // NCHAN_REDIS_STORE_H
diff --git a/debian/modules/nchan/src/store/spool.c b/debian/modules/nchan/src/store/spool.c
index 984f064..1e1592a 100755
--- a/debian/modules/nchan/src/store/spool.c
+++ b/debian/modules/nchan/src/store/spool.c
@@ -8,7 +8,6 @@
 #define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SPOOL:" fmt, ##arg)
 #define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SPOOL:" fmt, ##arg)
 
-#define NCHAN_MSG_NORESPONSE_RETRY_TIME 200
 #define NCHAN_SPOOL_FETCHMSG_MAX_TIMES 20
 
 //////// SPOOLs -- Subscriber Pools  /////////
@@ -25,17 +24,20 @@ static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool);
 static nchan_msg_id_t     latest_msg_id = NCHAN_NEWEST_MSGID;
 static nchan_msg_id_t     oldest_msg_id = NCHAN_OLDEST_MSGID;
 
-
 static subscriber_pool_t *find_spool(channel_spooler_t *spl, nchan_msg_id_t *id) {
   rbtree_seed_t      *seed = &spl->spoolseed;
   ngx_rbtree_node_t  *node;
+  subscriber_pool_t  *spool = NULL;
   
-  if((node = rbtree_find_node(seed, id)) != NULL) {
-    return (subscriber_pool_t *)rbtree_data_from_node(node);
+  if(id->time == NCHAN_NEWEST_MSGID_TIME || spl->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
+    spool = &spl->current_msg_spool;
+    spool->msg_status = MSG_EXPECTED;
   }
-  else {
-    return NULL;
+  else if((node = rbtree_find_node(seed, id)) != NULL) {
+    spool = rbtree_data_from_node(node);
   }
+  
+  return spool;
 }
 /*
 typedef struct {
@@ -84,6 +86,17 @@ static int validate_spooler(channel_spooler_t *spl, char *str) {
 }
 */
 
+static void spool_reserve(subscriber_pool_t *spool) {
+  spool->reserved++;
+}
+static void spool_release(subscriber_pool_t *spool) {
+  spool->reserved--;
+  ngx_int_t immortal_spool = spool->id.time == NCHAN_NEWEST_MSGID_TIME;
+  if(!immortal_spool && spool->reserved == 0 && spool->sub_count == 0) {
+    destroy_spool(spool);
+  }
+}
+
 static int msg_ids_equal(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
   int           i, max;
   int16_t      *tags1, *tags2;
@@ -155,11 +168,11 @@ static ngx_inline void init_spool(channel_spooler_t *spl, subscriber_pool_t *spo
   spool->msg_status = MSG_INVALID;
   
   spool->first = NULL;
-  spool->pool = NULL;
   spool->sub_count = 0;
   spool->non_internal_sub_count = 0;
-  spool->generation = 0;
-  spool->responded_count = 0;
+  //spool->generation = 0;
+  //spool->responded_count = 0;
+  spool->reserved = 0;
   ngx_memzero(&spool->fetchmsg_ev, sizeof(spool->fetchmsg_ev));
   nchan_init_timer(&spool->fetchmsg_ev, fetchmsg_ev_handler, spool);
   spool->fetchmsg_current_count=0;
@@ -173,7 +186,8 @@ static subscriber_pool_t *get_spool(channel_spooler_t *spl, nchan_msg_id_t *id)
   ngx_rbtree_node_t  *node;
   subscriber_pool_t *spool;
   
-  if(id->time == NCHAN_NEWEST_MSGID_TIME) {
+  
+  if(id->time == NCHAN_NEWEST_MSGID_TIME || spl->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
     spool = &spl->current_msg_spool;
     spool->msg_status = MSG_EXPECTED;
     return &spl->current_msg_spool;
@@ -213,6 +227,15 @@ static ngx_int_t spool_nextmsg(subscriber_pool_t *spool, nchan_msg_id_t *new_las
   int16_t                 largetags[NCHAN_MULTITAG_MAX];
   nchan_msg_id_t          new_id = NCHAN_ZERO_MSGID;
   
+  if(spl->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
+    if(immortal_spool) {
+      return NGX_OK; //nothing to do, already on the newest spool
+    }
+    else {
+      new_last_id = &latest_msg_id;
+    }
+  }
+  
   nchan_copy_msg_id(&new_id, &spool->id, largetags);
   nchan_update_multi_msgid(&new_id, new_last_id, largetags);
   
@@ -228,11 +251,13 @@ static ngx_int_t spool_nextmsg(subscriber_pool_t *spool, nchan_msg_id_t *new_las
     newspool = !immortal_spool ? find_spool(spl, &new_id) : get_spool(spl, &new_id);
     
     if(newspool != NULL) {
+      //move subs to next, already existing spool
       assert(spool != newspool);
       spool_transfer_subscribers(spool, newspool, 0);
-      if(!immortal_spool) destroy_spool(spool);
+      if(!immortal_spool && spool->reserved == 0) destroy_spool(spool);
     }
     else {
+      //next spool doesn't exist. reuse this one as the next
       ngx_rbtree_node_t       *node;
       assert(!immortal_spool);
       node = rbtree_node_from_data(spool);
@@ -260,6 +285,7 @@ static ngx_int_t spool_nextmsg(subscriber_pool_t *spool, nchan_msg_id_t *new_las
       switch(newspool->msg_status) {
         case MSG_CHANNEL_NOTREADY:
           newspool->msg_status = MSG_INVALID;
+          /*fallthrough*/
         case MSG_INVALID:
           spool_fetch_msg(newspool);
           break;
@@ -275,36 +301,15 @@ static ngx_int_t spool_nextmsg(subscriber_pool_t *spool, nchan_msg_id_t *new_las
   return NGX_OK;
 }
 
-typedef struct {
-  nchan_msg_id_t     msg_id;
-  channel_spooler_t *spooler;
-} nomsg_retry_data_t;
-
-static void spool_fetch_msg_noresponse_retry_cancel(void *pd) {
-  nomsg_retry_data_t *d = pd;
-  nchan_free_msg_id(&d->msg_id);
-  ngx_free(d);
-}
-
-static void spool_fetch_msg_noresponse_retry_callback(void *pd) {
-  nomsg_retry_data_t *d = pd;
-  subscriber_pool_t *spool = get_spool(d->spooler, &d->msg_id);
-  if(spool && spool->msg_status == MSG_INVALID) {
-    spool_fetch_msg(spool);
-  }
-  else if(!spool) {
-    DBG("spool not found for spool_fetch_msg_noresponse_retry_callback");
-  }
-  
-  spool_fetch_msg_noresponse_retry_cancel(pd);
-}
-
-static ngx_int_t spool_fetch_msg_callback(nchan_msg_status_t findmsg_status, nchan_msg_t *msg, fetchmsg_data_t *data) {
+static ngx_int_t spool_fetch_msg_callback(ngx_int_t code, nchan_msg_t *msg, fetchmsg_data_t *data) {
+  nchan_msg_status_t    findmsg_status = code;
   nchan_msg_status_t    prev_status;
   subscriber_pool_t    *spool, *nuspool;
   channel_spooler_t    *spl = data->spooler;
   int                   free_msg_id = 1;
   
+  assert(spl->fetching_strategy != NCHAN_SPOOL_PASSTHROUGH);
+  
   if(spl && data == spl->fetchmsg_cb_data_list) {
     spl->fetchmsg_cb_data_list = data->next;
   }
@@ -349,8 +354,7 @@ static ngx_int_t spool_fetch_msg_callback(nchan_msg_status_t findmsg_status, nch
       // ♫ It's gonna be the future soon ♫
       if(spool->id.time == NCHAN_NTH_MSGID_TIME) {
         //wait for message in the NEWEST_ID spool
-        nchan_msg_id_t  newest_id = NCHAN_NEWEST_MSGID;
-        spool_nextmsg(spool, &newest_id); 
+        spool_nextmsg(spool, &latest_msg_id); 
       }
       else {
         spool->msg_status = findmsg_status;
@@ -360,28 +364,19 @@ static ngx_int_t spool_fetch_msg_callback(nchan_msg_status_t findmsg_status, nch
         spool->msg = NULL;
       }
       break;
-      
-    case MSG_NORESPONSE:
-      if(prev_status == MSG_PENDING) {
-        spool->msg_status = MSG_INVALID;
-        if(spool->sub_count > 0) {
-          nomsg_retry_data_t *retry_data = ngx_alloc(sizeof(*retry_data), ngx_cycle->log);
-          
-          retry_data->spooler = spl;
-          
-          free_msg_id = 0;
-          retry_data->msg_id = data->msgid;
-          
-          spooler_add_timer(spl, NCHAN_MSG_NORESPONSE_RETRY_TIME, spool_fetch_msg_noresponse_retry_callback, spool_fetch_msg_noresponse_retry_cancel, retry_data);
-        }
-      }
+    
+    case MSG_CHANNEL_NOTREADY:
+      //just wait it out
+      spool->msg = NULL;
+      spool->msg_status = findmsg_status;
       break;
       
     case MSG_NOTFOUND:
-      if(spl->fetching_strategy == FETCH_IGNORE_MSG_NOTFOUND) {
+      if(spl->fetching_strategy == NCHAN_SPOOL_FETCH_IGNORE_MSG_NOTFOUND) {
         spool->msg_status = prev_status;
         break;
       }
+      /*fallthrough*/
     case MSG_EXPIRED:
       //is this right?
       //TODO: maybe message-expired notification
@@ -390,7 +385,24 @@ static ngx_int_t spool_fetch_msg_callback(nchan_msg_status_t findmsg_status, nch
       nuspool = get_spool(spool->spooler, &oldest_msg_id);
       if(spool != nuspool) {
         spool_transfer_subscribers(spool, nuspool, 1);
-        destroy_spool(spool);
+        if(spool->reserved == 0) {
+          destroy_spool(spool);
+        }
+        spool_fetch_msg(nuspool);
+      }
+      else if(spool->id.tagcount == 1 && nchan_compare_msgids(&spool->id, &oldest_msg_id) == 0) {
+        // oldest msgid not found or expired. that means there are no messages in this channel, 
+        // so move these subscribers over to the current_msg_spool
+        nuspool = get_spool(spool->spooler, &latest_msg_id);
+        assert(spool != nuspool);
+        spool_transfer_subscribers(spool, nuspool, 1);
+        if(spool->reserved == 0) {
+          destroy_spool(spool);
+        }
+      }
+      else if(spool == &spool->spooler->current_msg_spool) {
+        //sit there and wait, i guess
+        spool->msg_status = MSG_EXPECTED;
       }
       else {
         ERR("Unexpected spool == nuspool during spool fetch_msg_callback. This is weird, please report this to the developers. findmsg_status: %i", findmsg_status);
@@ -402,8 +414,12 @@ static ngx_int_t spool_fetch_msg_callback(nchan_msg_status_t findmsg_status, nch
       ERR("spool %p set status to MSG_PENDING", spool);
       break;
       
-    default:
-      assert(0);
+    case MSG_ERROR:
+      spool_respond_general(spool, NULL, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 0);
+      break;
+      
+    case MSG_INVALID:
+      assert(0); //should never happen
       break;
   }
   
@@ -436,11 +452,13 @@ static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool) {
     spool->fetchmsg_prev_msec = (ngx_timeofday())->msec;
   }
   
-  if(*spl->channel_status != READY) {
-    DBG("%p wanted to fetch msg %V, but channel %V not ready", spool, msgid_to_str(&spool->id), spl->chid);
+  if(*spl->channel_status != READY || !*spl->channel_buffer_complete) {
+    //DBG("%p wanted to fetch msg %V, but channel %V not ready or buffer not complete", spool, msgid_to_str(&spool->id), spl->chid);
     spool->msg_status = MSG_CHANNEL_NOTREADY;
+    //these will be fetch when channel is ready or when buffer is complete
     return NGX_DECLINED;
   }
+  
   DBG("%p fetch msg %V for channel %V", spool, msgid_to_str(&spool->id), spl->chid);
   data = ngx_alloc(sizeof(*data), ngx_cycle->log); //correctness over efficiency (at first).
   //TODO: optimize this alloc away
@@ -464,12 +482,12 @@ static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool) {
     spl->handlers->get_message_start(spl, spl->handlers_privdata);
   }
   switch(spl->fetching_strategy) {
-    case FETCH:
-    case FETCH_IGNORE_MSG_NOTFOUND:
+    case NCHAN_SPOOL_FETCH:
+    case NCHAN_SPOOL_FETCH_IGNORE_MSG_NOTFOUND:
       spool->spooler->store->get_message(spool->spooler->chid, &spool->id, spool->spooler->cf, (callback_pt )spool_fetch_msg_callback, data);
       break;
-    case NO_FETCH:
-      //do nothing
+    case NCHAN_SPOOL_PASSTHROUGH:
+      spool_fetch_msg_callback(MSG_EXPECTED, NULL, data);
       break;
   }
   return NGX_OK;
@@ -492,6 +510,8 @@ static void spool_sub_dequeue_callback(subscriber_t *sub, void *data) {
 
 static ngx_int_t spool_add_subscriber(subscriber_pool_t *self, subscriber_t *sub, uint8_t enqueue) {
   spooled_subscriber_t       *ssub;
+  ngx_int_t                   rc;
+  ngx_int_t                   internal_sub = sub->type == INTERNAL;
   
   ssub = ngx_calloc(sizeof(*ssub), ngx_cycle->log);
   //DBG("add sub %p to spool %p", sub, self);
@@ -508,15 +528,28 @@ static ngx_int_t spool_add_subscriber(subscriber_pool_t *self, subscriber_t *sub
   }
   self->first = ssub;
   self->sub_count++;
-  if(sub->type != INTERNAL) {
+  if(!internal_sub) {
     self->non_internal_sub_count++;
   }
   ssub->dequeue_callback_data.ssub = ssub;
   ssub->dequeue_callback_data.spool = self;
   
   if(enqueue) {
-    sub->fn->enqueue(sub);
-    if(sub->type != INTERNAL && self->spooler->publish_events) {
+    if((rc = sub->fn->enqueue(sub)) != NGX_OK) {
+      //enqueue failed. undo everything and get out!
+      self->sub_count --;
+      self->first = ssub->next;
+      if(self->first) {
+        assert(self->first->prev == ssub);
+        self->first->prev = NULL;
+      }
+      if(!internal_sub) {
+        self->non_internal_sub_count--;
+      }
+      ngx_free(ssub);
+      return rc;
+    }
+    else if(sub->type != INTERNAL && self->spooler->publish_events) {
       nchan_maybe_send_channel_event_message(sub->request, SUB_ENQUEUE);
     }
   }
@@ -566,7 +599,7 @@ static ngx_int_t spool_respond_general(subscriber_pool_t *self, nchan_msg_t *msg
   //int8_t                     i, max;
   
   ngx_memzero(numsubs, sizeof(numsubs));
-  self->generation++;
+  //self->generation++;
   
   DBG("spool %p (%V) (subs: %i) respond with msg %p or code %i", self, msgid_to_str(&self->id), self->sub_count, msg, code);
   if(msg) {
@@ -594,19 +627,19 @@ static ngx_int_t spool_respond_general(subscriber_pool_t *self, nchan_msg_t *msg
     nnext = nsub->next;
     
     if(msg) {
-      self->responded_count++;
+      //self->responded_count++;
       sub->fn->respond_message(sub, msg);
     }
     else if(!notice) {
-      self->responded_count++;
-      sub->fn->respond_status(sub, code, code_data);
+      //self->responded_count++;
+      sub->fn->respond_status(sub, code, code_data, NULL);
     }
     else {
       sub->fn->notify(sub, code, code_data);
     }
   }
   
-  if(!notice && code != NGX_HTTP_NO_CONTENT) self->responded_count++;
+  //if(!notice && code != NGX_HTTP_NO_CONTENT) self->responded_count++;
   //assert(validate_spooler(spl, "after respond_general"));
   return NGX_OK;
 }
@@ -649,6 +682,7 @@ static ngx_int_t spooler_add_subscriber(channel_spooler_t *self, subscriber_t *s
   nchan_msg_id_t          *msgid = &sub->last_msgid;
   subscriber_pool_t       *spool;
   subscriber_type_t        subtype;
+  ngx_int_t                rc;
   
   if(self->want_to_stop) {
     ERR("Not accepting new subscribers right now. want to stop.");
@@ -659,8 +693,9 @@ static ngx_int_t spooler_add_subscriber(channel_spooler_t *self, subscriber_t *s
   
   spool = get_spool(self, msgid);
   
-  assert(spool->id.time == msgid->time);
-  
+  if(self->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
+    assert(spool->id.time == NCHAN_NEWEST_MSGID_TIME);
+  }
   
   if(spool == NULL) {
     return NGX_ERROR;
@@ -668,9 +703,9 @@ static ngx_int_t spooler_add_subscriber(channel_spooler_t *self, subscriber_t *s
 
   subtype = sub->type;
   
-  if(spool_add_subscriber(spool, sub, 1) != NGX_OK) {
-    ERR("couldn't add subscriber to spool %p", spool);
-    return NGX_ERROR;
+  if((rc = spool_add_subscriber(spool, sub, 1)) != NGX_OK) {
+    DBG("couldn't add subscriber to spool %p", spool);
+    return rc;
   }
   self->handlers->add(self, sub, self->handlers_privdata);
   
@@ -692,13 +727,14 @@ static ngx_int_t spooler_add_subscriber(channel_spooler_t *self, subscriber_t *s
       
     case MSG_EXPECTED:
       //notify subscriber
-      sub->fn->respond_status(sub, NGX_HTTP_NO_CONTENT, NULL);
+      sub->fn->respond_status(sub, NGX_HTTP_NO_CONTENT, NULL, NULL);
       break;
       
     case MSG_EXPIRED:
     case MSG_NOTFOUND:
-    case MSG_NORESPONSE:
+    case MSG_ERROR:
       //shouldn't happen
+      
       assert(0);
   }
   
@@ -730,8 +766,9 @@ static ngx_int_t spool_transfer_subscribers(subscriber_pool_t *spool, subscriber
     if(update_subscriber_last_msgid) {
       sub->last_msgid=newspool->id;
     }
-    spool_add_subscriber(newspool, sub, 0);
-    count++;
+    if(spool_add_subscriber(newspool, sub, 0) == NGX_OK) {
+      count++;
+    }
   }
   
   return count;
@@ -902,49 +939,45 @@ static ngx_int_t spooler_respond_message(channel_spooler_t *self, nchan_msg_t *m
   subscriber_pool_t         *spool;
   ngx_int_t                  responded_subs = 0;
   
-  srdata.min = msg->prev_id;
-  srdata.max = msg->id;
-  srdata.multi = msg->id.tagcount;
-  srdata.overflow = NULL;
-  srdata.msg = msg;
-  srdata.n = 0;
   
-  //spooler_print_contents(self);
-  
-  //find all spools between msg->prev_id and msg->id
-  rbtree_conditional_walk(&self->spoolseed, (rbtree_walk_conditional_callback_pt )collect_spool_range_callback, &srdata);
-  /*
-  if(srdata.n == 0) {
-    DBG("no spools in range %V -- ", msgid_to_str(&msg->prev_id));
-    DBG(" -- %V", msgid_to_str(&msg->id));
-  }
-  */
-  while((spool = spoolcollector_unwind_nextspool(&srdata)) != NULL) {
-    responded_subs += spool->sub_count;
-    if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
-      assert(spool->id.tag.allocd != msg->id.tag.allocd);
+  if(self->fetching_strategy != NCHAN_SPOOL_PASSTHROUGH) {
+    srdata.min = msg->prev_id;
+    srdata.max = msg->id;
+    srdata.multi = msg->id.tagcount;
+    srdata.overflow = NULL;
+    srdata.msg = msg;
+    srdata.n = 0;
+    
+    //spooler_print_contents(self);
+    
+    //find all spools between msg->prev_id and msg->id
+    rbtree_conditional_walk(&self->spoolseed, (rbtree_walk_conditional_callback_pt )collect_spool_range_callback, &srdata);
+    /*
+    if(srdata.n == 0) {
+      DBG("no spools in range %V -- ", msgid_to_str(&msg->prev_id));
+      DBG(" -- %V", msgid_to_str(&msg->id));
     }
-    spool_respond_general(spool, msg, 0, NULL, 0);
-    if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
-      assert(spool->id.tag.allocd != msg->id.tag.allocd);
+    */
+    while((spool = spoolcollector_unwind_nextspool(&srdata)) != NULL) {
+      responded_subs += spool->sub_count;
+      if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+        assert(spool->id.tag.allocd != msg->id.tag.allocd);
+      }
+      spool_respond_general(spool, msg, 0, NULL, 0);
+      if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+        assert(spool->id.tag.allocd != msg->id.tag.allocd);
+      }
+      spool_nextmsg(spool, &msg->id);
     }
-    spool_nextmsg(spool, &msg->id);
   }
-  
   spool = get_spool(self, &latest_msg_id);
-  if(spool->sub_count > 0) {
-#if NCHAN_BENCHMARK
-    responded_subs += spool->sub_count;
-#endif
+  if(spool->sub_count > 0 && *self->channel_buffer_complete) {
     spool_respond_general(spool, msg, 0, NULL, 0);
     spool_nextmsg(spool, &msg->id);
   }
 
   nchan_copy_msg_id(&self->prev_msg_id, &msg->id, NULL);
   
-#if NCHAN_BENCHMARK
-  self->last_responded_subscriber_count = responded_subs;
-#endif
   return NGX_OK;
 }
 
@@ -1041,16 +1074,26 @@ static ngx_int_t spool_rbtree_compare(void *v1, void *v2) {
 }
 
 static int its_time_for_a_spooling_filter(void *data) {
-  return ((subscriber_pool_t *)data)->msg_status == MSG_CHANNEL_NOTREADY;
+  subscriber_pool_t *spool = data;
+  if(spool->msg_status == MSG_CHANNEL_NOTREADY || spool->msg_status == MSG_INVALID) {
+    spool_reserve(spool);
+    return 1;
+  }
+  else {
+    return 0;
+  }
 }
 
 static ngx_int_t its_time_for_a_spooling(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
-  ngx_int_t       rc;
+  ngx_int_t       rc = NGX_OK;
   //validate_spool(spool);
-  assert(spool->msg_status == MSG_CHANNEL_NOTREADY);
-  spool->msg_status = MSG_INVALID;
-  rc = spool_fetch_msg(spool);
-  assert(rc == NGX_OK || rc == NGX_DONE);
+  if(spool->msg_status == MSG_CHANNEL_NOTREADY || spool->msg_status == MSG_INVALID) {
+    //TODO: maybe don't fetch spool with zero subs?
+    spool->msg_status = MSG_INVALID;
+    rc = spool_fetch_msg(spool);
+    assert(rc == NGX_OK || rc == NGX_DONE || NGX_DECLINED);
+  }
+  spool_release(spool);
   return rc;
 }
 
@@ -1115,7 +1158,7 @@ static channel_spooler_fn_t  spooler_fn = {
   spooler_prepare_to_stop
 };
 
-channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata) {
+channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, uint8_t *channel_buffer_complete, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata) {
   if(!spl->running) {
     ngx_memzero(spl, sizeof(*spl));
     rbtree_init(&spl->spoolseed, "spooler msg_id tree", spool_rbtree_node_id, spool_rbtree_bucketer, spool_rbtree_compare);
@@ -1130,6 +1173,7 @@ channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhe
     spl->store = store;
     
     spl->channel_status = channel_status;
+    spl->channel_buffer_complete = channel_buffer_complete;
     
     spl->running = 1;
     //spl->want_to_stop = 0;
@@ -1157,6 +1201,7 @@ static ngx_int_t remove_spool(subscriber_pool_t *spool) {
   channel_spooler_t    *spl = spool->spooler;
   ngx_rbtree_node_t    *node = rbtree_node_from_data(spool);
   
+  assert(spool->reserved == 0);
   DBG("remove spool node %p", node);
   
   assert(spool->spooler->running);
@@ -1176,7 +1221,7 @@ static ngx_int_t remove_spool(subscriber_pool_t *spool) {
 
 static ngx_int_t destroy_spool(subscriber_pool_t *spool) {
   rbtree_seed_t         *seed = &spool->spooler->spoolseed;
-  spooled_subscriber_t  *ssub;
+  spooled_subscriber_t  *ssub, *ssub_next;
   subscriber_t          *sub;
   ngx_rbtree_node_t     *node = rbtree_node_from_data(spool);
   
@@ -1184,15 +1229,16 @@ static ngx_int_t destroy_spool(subscriber_pool_t *spool) {
   
   DBG("destroy spool node %p", node);
   
-  for(ssub = spool->first; ssub!=NULL; ssub=ssub->next) {
+  for(ssub = spool->first; ssub!=NULL; ssub = ssub_next) {
     sub = ssub->sub;
+    ssub_next = ssub->next;
     //DBG("dequeue sub %p in spool %p", sub, spool);
     sub->fn->dequeue(sub);
   }
   assert(spool->sub_count == 0);
   assert(spool->first == NULL);
   
-  ngx_memset(spool, 0x42, sizeof(*spool)); //debug
+  //ngx_memset(spool, 0x42, sizeof(*spool)); //debug
   
   rbtree_destroy_node(seed, node);
   return NGX_OK;
diff --git a/debian/modules/nchan/src/store/spool.h b/debian/modules/nchan/src/store/spool.h
index 097c957..88e8d1a 100644
--- a/debian/modules/nchan/src/store/spool.h
+++ b/debian/modules/nchan/src/store/spool.h
@@ -31,11 +31,11 @@ struct subscriber_pool_s {
   ngx_int_t                   fetchmsg_current_count;
   ngx_event_t                 fetchmsg_ev;
   
-  ngx_pool_t                 *pool;
   ngx_uint_t                  sub_count;
   ngx_uint_t                  non_internal_sub_count;
-  ngx_uint_t                  generation;
-  ngx_uint_t                  responded_count;
+  //ngx_uint_t                  generation;
+  //ngx_uint_t                  responded_count;
+  uint8_t                     reserved;
   struct channel_spooler_s   *spooler;
 }; // subscriber_pool_t
 
@@ -52,7 +52,7 @@ typedef struct {
   ngx_int_t            (*prepare_to_stop)(channel_spooler_t *self);
 } channel_spooler_fn_t;
 
-typedef enum {FETCH, FETCH_IGNORE_MSG_NOTFOUND, NO_FETCH} spooler_fetching_strategy_t;
+typedef enum {NCHAN_SPOOL_FETCH, NCHAN_SPOOL_FETCH_IGNORE_MSG_NOTFOUND, NCHAN_SPOOL_PASSTHROUGH} spooler_fetching_strategy_t;
 
 
 typedef struct fetchmsg_data_s fetchmsg_data_t;
@@ -80,6 +80,7 @@ struct channel_spooler_s {
   ngx_uint_t                  responded_count;
   ngx_str_t                  *chid;
   chanhead_pubsub_status_t   *channel_status;
+  uint8_t                    *channel_buffer_complete;
   nchan_store_t              *store;
   nchan_loc_conf_t           *cf;
   channel_spooler_fn_t       *fn;
@@ -87,9 +88,6 @@ struct channel_spooler_s {
   void                       *handlers_privdata;
   fetchmsg_data_t            *fetchmsg_cb_data_list;
   spooler_event_ll_t         *spooler_dependent_events;
-#if NCHAN_BENCHMARK
-  ngx_int_t                   last_responded_subscriber_count;
-#endif  
   spooler_fetching_strategy_t fetching_strategy;
   unsigned                    publish_events:1;
   unsigned                    running:1;
@@ -106,7 +104,7 @@ struct channel_spooler_handlers_s {
   void                        (*get_message_finish)(channel_spooler_t *, void *);
 };
 
-channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata);
+channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, uint8_t *channel_buffer_complete, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata);
 ngx_int_t stop_spooler(channel_spooler_t *spl, uint8_t dequeue_subscribers);
 
 ngx_int_t spooler_catch_up(channel_spooler_t *spl);
diff --git a/debian/modules/nchan/src/subscribers/benchmark.c b/debian/modules/nchan/src/subscribers/benchmark.c
new file mode 100644
index 0000000..9b97870
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/benchmark.c
@@ -0,0 +1,72 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "internal.h"
+#include "benchmark.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:BENCHMARK:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:BENCHMARK:" fmt, ##arg)
+
+typedef struct {
+  subscriber_t        *sub;
+  nchan_benchmark_t   *bench;
+} sub_data_t;
+
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
+  if(nchan_benchmark_active()) {
+    ngx_atomic_fetch_add(d->bench->shared.subscribers_enqueued, 1);
+  }
+  nchan_update_stub_status(subscribers, 1); //needs to be done manually for INTERNAL subs
+  return NGX_OK;
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  if(nchan_benchmark_active()) {
+    ngx_atomic_fetch_add(d->bench->shared.subscribers_dequeued, 1);
+  }
+  nchan_update_stub_status(subscribers, -1); //needs to be done manually for INTERNAL subs
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
+  nchan_msg_t *msg = ptr;
+  uint64_t msec = nchan_benchmark_message_delivery_msec(msg);
+  if(nchan_benchmark_active()) {
+    hdr_record_value(d->bench->data.msg_delivery_latency, msec);
+    d->bench->data.msg_received++;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_notice(ngx_int_t notice, void *ptr, sub_data_t *d) {
+  return NGX_OK;
+}
+
+static ngx_str_t  sub_name = ngx_string("benchmark");
+
+subscriber_t *benchmark_subscriber_create(nchan_benchmark_t *bench) {
+  static  nchan_msg_id_t      newest_msgid = NCHAN_NEWEST_MSGID;
+  sub_data_t                 *d;
+  subscriber_t               *sub;
+  nchan_loc_conf_t           *cf = bench->loc_conf;
+  struct timeval tv;
+  
+  sub = internal_subscriber_create_init(&sub_name, cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_respond_notice, NULL);
+  
+  sub->last_msgid = newest_msgid;
+  sub->destroy_after_dequeue = 1;
+  d->sub = sub;
+  d->bench = bench;
+  ngx_gettimeofday(&tv);
+  
+  
+  DBG("%p benchmark subscriber created with privdata %p", sub, d);
+  return sub;
+}
diff --git a/debian/modules/nchan/src/subscribers/benchmark.h b/debian/modules/nchan/src/subscribers/benchmark.h
new file mode 100644
index 0000000..dcb52c9
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/benchmark.h
@@ -0,0 +1,3 @@
+#include <util/nchan_benchmark.h>
+
+subscriber_t *benchmark_subscriber_create(nchan_benchmark_t *bench);
diff --git a/debian/modules/nchan/src/subscribers/common.c b/debian/modules/nchan/src/subscribers/common.c
index 7c5cc4a..611d942 100644
--- a/debian/modules/nchan/src/subscribers/common.c
+++ b/debian/modules/nchan/src/subscribers/common.c
@@ -4,6 +4,8 @@
 //#include <util/nchan_fake_request.h>
 #include <util/nchan_subrequest.h>
 
+#include <util/nchan_fake_request.h>
+
 #if FAKESHARD
 #include <store/memory/store.h>
 #endif
@@ -14,181 +16,83 @@
 #define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:COMMON:" fmt, ##arg)
 
 typedef struct {
-  subscriber_t    *sub;
-  ngx_str_t       *ch_id;
-  ngx_int_t        rc;
-  ngx_int_t        http_response_code;
-} nchan_subrequest_data_t;
+  subscriber_t       *sub;
+  ngx_str_t          *ch_id;
+  nchan_fakereq_subrequest_data_t *subrequest;
+} nchan_subscribe_auth_request_data_t;
 
-
-typedef struct {
-  subscriber_t            *sub;
-  subrequest_callback_pt   cb;
-  void                    *cb_data;
-} nchan_subrequest_data_cb_t;
-
-typedef struct {
-  ngx_http_post_subrequest_t     psr;
-  nchan_subrequest_data_t        psr_data;
-} nchan_subrequest_stuff_t;
-
-static ngx_int_t subscriber_subrequest_handler(ngx_http_request_t *sr, void *pd, ngx_int_t rc) {
-  nchan_subrequest_data_cb_t    *psrd = (nchan_subrequest_data_cb_t *)pd;
+static ngx_int_t subscriber_authorize_callback(ngx_int_t rc, ngx_http_request_t *sr, void *data) {
+  nchan_subscribe_auth_request_data_t *d = data;
+  subscriber_t                        *sub = d->sub;
   
-  psrd->sub->fn->release(psrd->sub, 1);
-  
-  if(psrd->cb) {
-    psrd->cb(psrd->sub, sr, rc, psrd->cb_data);
+  if(sub->status == DEAD) {
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    sub->fn->release(d->sub, 0);
   }
-  return NGX_OK;
-}
-
-
-ngx_http_request_t *subscriber_cv_subrequest(subscriber_t *sub, ngx_http_complex_value_t *url_ccv, ngx_buf_t *body, subrequest_callback_pt cb, void *cb_data) {
-  ngx_str_t                     request_url;
-  ngx_http_complex_value(sub->request, url_ccv, &request_url);
-  return subscriber_subrequest(sub, &request_url, body, cb, cb_data);
-}
-
-
-ngx_http_request_t *subscriber_subrequest(subscriber_t *sub, ngx_str_t *url, ngx_buf_t *body, subrequest_callback_pt cb, void *cb_data) {
-  ngx_http_request_t            *r = sub->request;
-  ngx_http_post_subrequest_t    *psr = ngx_pcalloc(r->pool, sizeof(*psr));
-  nchan_subrequest_data_cb_t    *psrd = ngx_pcalloc(r->pool, sizeof(*psrd));
-  ngx_http_request_t            *sr;
-
-  sub->fn->reserve(sub);
-  
-  psr->handler = subscriber_subrequest_handler;
-  psr->data = psrd;
-  psrd->sub = sub;
-  psrd->cb_data = cb_data;
-  psrd->cb = cb;
-  
-  ngx_http_subrequest(r, url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
-  
-  if((sr->request_body = ngx_pcalloc(r->pool, sizeof(*sr->request_body))) == NULL) { //dummy request body 
-    return NULL;
+  else if (rc == NGX_HTTP_CLIENT_CLOSED_REQUEST) {
+    //this shouldn't happen, but if it does, no big deal
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    sub->fn->release(d->sub, 1);
+    sub->fn->respond_status(sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL); //couldn't reach upstream
   }
-  
-  if(body && ngx_buf_size(body) > 0) {
-    static ngx_str_t                   POST_REQUEST_STRING = {4, (u_char *)"POST "};
-    size_t                             sz;
-    ngx_http_request_body_t           *sr_body = sr->request_body;
-    ngx_chain_t                       *fakebody_chain;
-    ngx_buf_t                         *fakebody_buf;
-    
-    fakebody_chain = ngx_palloc(r->pool, sizeof(*fakebody_chain));
-    fakebody_buf = ngx_palloc(r->pool, sizeof(*fakebody_buf));
-    sr_body->bufs = fakebody_chain;
-    fakebody_chain->next = NULL;
-    fakebody_chain->buf = fakebody_buf;
-    ngx_memzero(fakebody_buf, sizeof(*fakebody_buf));
-    fakebody_buf->last_buf = 1;
-    fakebody_buf->last_in_chain = 1;
-    fakebody_buf->flush = 1;
-    fakebody_buf->memory = 1;
-    
-    //just copy the buffer contents. it's inefficient but I don't care at the moment.
-    //this can and should be optimized later
-    sz = ngx_buf_size(body);
-    fakebody_buf->start = ngx_palloc(r->pool, sz); //huuh?
-    ngx_memcpy(fakebody_buf->start, body->start, sz);
-    fakebody_buf->end = fakebody_buf->start + sz;
-    fakebody_buf->pos = fakebody_buf->start;
-    fakebody_buf->last = fakebody_buf->end;
-    
-    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, sr_body, sz, NULL);
-  }
-  else {
-    sr->header_only = 1;
-  }
-  sr->args = sub->request->args;
-  
-  return sr;
-}
-
-static ngx_int_t generic_subscriber_subrequest_old(subscriber_t *sub, ngx_http_complex_value_t *url_ccv, ngx_int_t (*handler)(ngx_http_request_t *, void *, ngx_int_t), ngx_http_request_t **subrequest, ngx_str_t *chid) {
-  ngx_str_t                  request_url;
-  nchan_subrequest_stuff_t  *psr_stuff = ngx_palloc(sub->request->pool, sizeof(*psr_stuff));
-  assert(psr_stuff != NULL);
-  
-  //ngx_http_request_t            *fake_parent_req = fake_cloned_parent_request(sub->request);
-  
-  ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
-  nchan_subrequest_data_t       *psrd = &psr_stuff->psr_data;
-  ngx_http_request_t            *sr;
-  
-  ngx_http_complex_value(sub->request, url_ccv, &request_url);
-  
-  sub->fn->reserve(sub);
-  
-  psr->handler = handler;
-  psr->data = psrd;
-  
-  psrd->sub = sub;
-  if(chid) {
-    psrd->ch_id = chid;
-  }
-  
-  ngx_http_subrequest(sub->request, &request_url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
-  
-  sr->request_body = ngx_pcalloc(sub->request->pool, sizeof(ngx_http_request_body_t)); //dummy request body 
-  if (sr->request_body == NULL) {
-    return NGX_ERROR;
-  }
-  
-  sr->header_only = 1;
-  
-  sr->args = sub->request->args;
-  if(subrequest) {
-    *subrequest = sr;
-  }
-  
-  return NGX_OK;
-}
-
-static void subscriber_authorize_timer_callback_handler(ngx_event_t *ev) {
-  nchan_subrequest_data_t *d = ev->data;
-  
-  d->sub->fn->release(d->sub, 1);
-  
-  if(d->rc == NGX_OK) {
-    ngx_int_t code = d->http_response_code;
+  else if(rc == NGX_OK) {
+    ngx_int_t        code = sr->headers_out.status;
+    sub->fn->release(sub, 1);
     if(code >= 200 && code <299) {
-      //authorized. proceed as planned
-      nchan_subscriber_subscribe(d->sub, d->ch_id);
+      nchan_requestmachine_request_cleanup_manual(d->subrequest);
+      nchan_subscriber_subscribe(sub, d->ch_id);
     }
-    else { //anything else means forbidden
-      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL); //auto-closes subscriber
+    else {
+      //forbidden, but with some data to forward to the subscriber
+      ngx_http_request_t       *r = d->sub->request;
+      ngx_str_t                *content_type;
+      ngx_int_t                 content_length;
+      ngx_chain_t              *request_chain = NULL;
+      content_type = (sr->upstream->headers_in.content_type ? &sr->upstream->headers_in.content_type->value : NULL);
+      content_length = nchan_subrequest_content_length(sr);
+      if(content_length > 0) {
+#if nginx_version >= 1013010
+        request_chain = sr->out;
+#else
+        request_chain = sr->upstream->out_bufs;
+#endif
+      }
+      //copy headers
+      ngx_uint_t                       i;
+      ngx_list_part_t                 *part = &sr->headers_out.headers.part;
+      ngx_table_elt_t                 *header= part->elts;
+      for (i = 0; /* void */ ; i++) {
+        if (i >= part->nelts) {
+          if (part->next == NULL) {
+            break;
+          }
+          part = part->next;
+          header = part->elts;
+          i = 0;
+        }
+        if (!nchan_strmatch(&header[i].key, 4, "Content-Type", "Server", "Content-Length", "Connection")) {
+          //copy header to main request's response
+          nchan_add_response_header(r, &header[i].key, &header[i].value);
+        }
+      }
+      
+      if(content_type) {
+        r->headers_out.content_type = *content_type;
+      }
+      r->headers_out.content_length_n = content_length;
+      nchan_requestmachine_request_cleanup_on_request_finalize(d->subrequest, r);
+      sub->fn->respond_status(sub, code, NULL, request_chain); //auto-closes subscriber
     }
   }
+  else if(rc >= 500 && rc < 600) {
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    sub->fn->release(d->sub, 1);
+    sub->fn->respond_status(sub, rc, NULL, NULL); //auto-closes subscriber
+  }
   else {
-    d->sub->fn->respond_status(d->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL); //auto-closes subscriber
-  }
-
-}
-
-static ngx_int_t subscriber_authorize_callback(ngx_http_request_t *r, void *data, ngx_int_t rc) {
-  nchan_subrequest_data_t       *d = data;
-  ngx_event_t                   *timer;
-  
-  if (rc == NGX_HTTP_CLIENT_CLOSED_REQUEST) {
-    d->sub->fn->release(d->sub, 1);
-    //subscriber will be cleaned up and destroyed because this happens before the 
-    //subscriber's sudden_abort_handler is called
-  }
-  else {
-    d->rc = rc;
-    d->http_response_code = r->headers_out.status;
-    if((timer = ngx_pcalloc(r->pool, sizeof(*timer))) == NULL) {
-      return NGX_ERROR;
-    }
-    timer->handler = subscriber_authorize_timer_callback_handler;
-    timer->log = d->sub->request->connection->log;
-    timer->data = data;
-    
-    ngx_add_timer(timer, 0); //not sure if this needs to be done like this, but i'm just playing it safe here.
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    sub->fn->release(d->sub, 1);
+    d->sub->fn->respond_status(d->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL); //auto-closes subscriber
   }
   
   return NGX_OK;
@@ -197,82 +101,96 @@ static ngx_int_t subscriber_authorize_callback(ngx_http_request_t *r, void *data
 ngx_int_t nchan_subscriber_authorize_subscribe_request(subscriber_t *sub, ngx_str_t *ch_id) {
   
   ngx_http_complex_value_t  *authorize_request_url_ccv = sub->cf->authorize_request_url;
+  //DBG("%p (req %p) nchan_subscriber_authorize_subscribe_request", sub, sub->request);
   
   if(!authorize_request_url_ccv) {
     return nchan_subscriber_subscribe(sub, ch_id);
   }
   else {
-    return generic_subscriber_subrequest_old(sub, authorize_request_url_ccv, subscriber_authorize_callback, NULL, ch_id);
+    nchan_requestmachine_request_params_t param;
+    param.url.cv = authorize_request_url_ccv;
+    param.url_complex = 1;
+    param.pool = ngx_create_pool(1024, ngx_cycle->log);
+    param.body = NULL;
+    param.response_headers_only = 0;
+    param.manual_cleanup = 1;
+    
+    nchan_subscribe_auth_request_data_t  *d = ngx_palloc(param.pool, sizeof(*d));
+    if(!d) {
+      ngx_destroy_pool(param.pool);
+      return NGX_ERROR;
+    }
+    param.cb = (callback_pt )subscriber_authorize_callback;
+    param.pd = d;
+    
+    d->sub = sub;
+    d->ch_id = ch_id;
+    d->subrequest = nchan_subscriber_subrequest(sub, &param);
+    if(d->subrequest != NULL) {
+      sub->fn->reserve(sub);
+      return NGX_OK;
+    }
+    else {
+      ngx_destroy_pool(param.pool);
+      return NGX_ERROR;
+    }
   }
 }
 
-static ngx_int_t subscriber_unsubscribe_request_callback(ngx_http_request_t *r, void *data, ngx_int_t rc) {
-  nchan_subrequest_data_t       *d = data;
-  nchan_request_ctx_t           *ctx = ngx_http_get_module_ctx(d->sub->request, ngx_nchan_module);
-  ngx_int_t                      finalize_code = ctx->unsubscribe_request_callback_finalize_code;
-  DBG("callback %p %p %i", r, data, rc);
-  if(d->sub->request->main->blocked) {
-    d->sub->request->main->blocked = 0;
-  }
-  if(finalize_code != NGX_DONE) {
-    nchan_http_finalize_request(d->sub->request, finalize_code);
-  }
+static ngx_int_t nchan_subscriber_subrequest_fire_and_forget(subscriber_t *sub, ngx_http_complex_value_t *url_cv) {
+  //DBG("%p (req %p) nchan_subscriber_unsubscribe_request", sub, sub->request);
+    
+  nchan_requestmachine_request_params_t param;
+  param.url.cv = url_cv;
+  param.url_complex = 1;
+  param.cb = NULL;
+  param.pd = NULL;
+  param.pool = NULL;
+  param.body = NULL;
+  param.response_headers_only = 1;
+  param.manual_cleanup = 0;
   
-  ctx->unsubscribe_request_callback_finalize_code = NGX_OK;
-  d->sub->fn->release(d->sub, 0);
-  return NGX_OK;
+  return nchan_subscriber_subrequest(sub, &param) == NULL ? NGX_ERROR : NGX_OK;
 }
 
-
-ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub, ngx_int_t finalize_code) {
-  ngx_int_t                    ret;
-  //ngx_http_upstream_conf_t    *ucf;
+ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub) {
+  nchan_request_ctx_t         *ctx;
+  //DBG("%p (req %p) nchan_subscriber_unsubscribe_request", sub, sub->request);
   
-  if(sub->type == LONGPOLL || sub->type == INTERVALPOLL) {
-    //don't do this for longpoll subscribers. It's still buggy and not efficient anyway
+  if(!sub->enable_sub_unsub_callbacks) {
+    return NGX_OK;
+  }
+  
+  ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  if(ctx->sent_unsubscribe_request) {
     return NGX_OK;
   }
   
-  nchan_request_ctx_t         *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
-  ngx_http_request_t          *subrequest;
-  ctx->unsubscribe_request_callback_finalize_code = finalize_code;
-  ret = generic_subscriber_subrequest_old(sub, sub->cf->unsubscribe_request_url, subscriber_unsubscribe_request_callback, &subrequest, NULL);
   ctx->sent_unsubscribe_request = 1;
-  
-  //ucf = ngx_http_get_module_loc_conf(subrequest, ngx_http_upstream_module);
-  //ucf->ignore_client_abort = 1;
-  
-  return ret;
+  return nchan_subscriber_subrequest_fire_and_forget(sub, sub->cf->unsubscribe_request_url);
 }
 
-
-static ngx_int_t subscriber_subscribe_callback(ngx_http_request_t *r, void *data, ngx_int_t rc) {
-  nchan_subrequest_data_t       *d = data;
-  d->sub->fn->release(d->sub, 0);
-  return NGX_OK;
-}
-
-
 ngx_int_t nchan_subscriber_subscribe_request(subscriber_t *sub) {
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
-  if(!ctx->sent_unsubscribe_request) {
-    return generic_subscriber_subrequest_old(sub, sub->cf->subscribe_request_url, subscriber_subscribe_callback, NULL, NULL);
-  }
-  else {
+  if(!sub->enable_sub_unsub_callbacks) {
     return NGX_OK;
   }
+  return nchan_subscriber_subrequest_fire_and_forget(sub, sub->cf->subscribe_request_url);
 }
 
 
+
 ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id) {
   ngx_int_t             ret;
-  //nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
-  subscriber_type_t     sub_type = sub->type;
+  nchan_request_ctx_t  *ctx;
   nchan_loc_conf_t     *cf = sub->cf;
+  int                   enable_sub_unsub_callbacks = sub->enable_sub_unsub_callbacks;
   
+  //DBG("%p (req %p) nchan_subscriber_subscribe", sub, sub->request);
+  
+  ctx = sub->request ? ngx_http_get_module_ctx(sub->request, ngx_nchan_module) : NULL;
   ret = sub->cf->storage_engine->subscribe(ch_id, sub);
   //don't access sub directly, it might have already been freed
-  if(ret == NGX_OK && sub_type != LONGPOLL && sub_type != INTERVALPOLL && cf->subscribe_request_url) {
+  if(ret == NGX_OK && enable_sub_unsub_callbacks && cf->subscribe_request_url && ctx && ctx->sub == sub) {
     nchan_subscriber_subscribe_request(sub);
   }
   return ret;
@@ -370,7 +288,7 @@ void nchan_subscriber_timeout_ev_handler(ngx_event_t *ev) {
   memstore_fakeprocess_push(sub->owner);
 #endif
   sub->dequeue_after_response = 1;
-  sub->fn->respond_status(sub, NGX_HTTP_REQUEST_TIMEOUT, &NCHAN_HTTP_STATUS_408);
+  sub->fn->respond_status(sub, NGX_HTTP_REQUEST_TIMEOUT, &NCHAN_HTTP_STATUS_408, NULL);
 #if FAKESHARD
   memstore_fakeprocess_pop();
 #endif
@@ -382,10 +300,35 @@ void nchan_subscriber_init_timeout_timer(subscriber_t *sub, ngx_event_t *ev) {
   nchan_init_timer(ev, nchan_subscriber_timeout_ev_handler, sub);
 }
 
+nchan_fakereq_subrequest_data_t *nchan_subscriber_subrequest(subscriber_t *sub, nchan_requestmachine_request_params_t *params) {
+  if(sub->upstream_requestmachine == NULL) {
+    sub->upstream_requestmachine = ngx_calloc(sizeof(nchan_requestmachine_t), ngx_cycle->log);
+    if(sub->upstream_requestmachine == NULL) {
+      nchan_log_error("failed to allocate upstream_requestmachine for subscriber %p", sub);
+      return NULL;
+    }
+    else {
+      nchan_requestmachine_initialize(sub->upstream_requestmachine, sub->request);
+    }
+  }
+  
+  return nchan_requestmachine_request(sub->upstream_requestmachine, params);
+}
+
+ngx_int_t nchan_subscriber_subrequest_cleanup(subscriber_t *sub) {
+  if(sub->upstream_requestmachine != NULL) {
+    nchan_requestmachine_shutdown(sub->upstream_requestmachine);
+    ngx_free(sub->upstream_requestmachine);
+    sub->upstream_requestmachine = NULL;
+  }
+  return NGX_OK;
+}
+
 void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http_request_t *r, nchan_msg_id_t *msgid) {
   nchan_request_ctx_t  *ctx = NULL;
   *sub = *tmpl;
   sub->request = r;
+  sub->upstream_requestmachine = NULL;
   if(r) {
     ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
     sub->cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
@@ -415,12 +358,12 @@ void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http
   
 }
 
-void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t dequeue_after_response) {
+void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t enable_sub_unsub_callbacks, ngx_int_t dequeue_after_response) {
   nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
   sub->type = type;
   sub->name = name;
   sub->fn = fn;
-  
+  sub->enable_sub_unsub_callbacks = enable_sub_unsub_callbacks;
   sub->dequeue_after_response = dequeue_after_response;
   if(ctx) {
     ctx->subscriber_type = sub->name;
@@ -461,195 +404,3 @@ ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nc
   
   return ret;
 }
-
-void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end) {
-  ngx_memzero(buf, sizeof(*buf));
-  buf->start = start;
-  buf->pos = start;
-  buf->end = end;
-  buf->last = end;
-  buf->memory = 1;
-}
-
-void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str) {
-  ngx_memzero(buf, sizeof(*buf));
-  buf->start = str->data;
-  buf->pos = str->data;
-  buf->end = str->data + str->len;
-  buf->last = buf->end;
-  buf->memory = 1;
-}
-
-#if nginx_version >= 1003015
-
-static void ngx_http_close_request_dup(ngx_http_request_t *r, ngx_int_t rc) {
-  ngx_connection_t  *c;
-
-  r = r->main;
-  c = r->connection;
-
-  ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                  "http request count:%d blk:%d", r->count, r->blocked);
-
-  if (r->count == 0) {
-    ngx_log_error(NGX_LOG_ALERT, c->log, 0, "http request count is zero");
-  }
-
-  r->count--;
-
-  if (r->count || r->blocked) {
-    return;
-  }
-
-#if (NGX_HTTP_V2)
-  if (r->stream) {
-    ngx_http_v2_close_stream(r->stream, rc);
-    return;
-  }
-#endif
-
-  ngx_http_free_request(r, rc);
-  ngx_http_close_connection(c);
-}
-
-void nchan_subscriber_unsubscribe_callback_http_test_reading(ngx_http_request_t *r) {
-  int                n;
-  char               buf[1];
-  ngx_err_t          err;
-  ngx_event_t       *rev;
-  ngx_connection_t  *c;
-  
-  nchan_request_ctx_t  *nchan_ctx;
-
-  c = r->connection;
-  rev = c->read;
-
-  ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http test reading");
-
-#if (NGX_HTTP_V2)
-
-  if (r->stream) {
-    if (c->error) {
-      err = 0;
-      goto closed;
-    }
-
-    return;
-  }
-
-#endif
-#if (NGX_HTTP_SPDY)
-
-    if (r->spdy_stream) {
-        if (c->error) {
-            err = 0;
-            goto closed;
-        }
-
-        return;
-    }
-
-#endif
-
-#if (NGX_HAVE_KQUEUE)
-
-  if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
-
-    if (!rev->pending_eof) {
-        return;
-    }
-
-    rev->eof = 1;
-    c->error = 1;
-    err = rev->kq_errno;
-
-    goto closed;
-  }
-
-#endif
-
-#if (NGX_HAVE_EPOLLRDHUP)
-#if nginx_version >= 1011000
-  if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && ngx_use_epoll_rdhup) {
-    socklen_t  len;
-
-    if (!rev->pending_eof) {
-        return;
-    }
-#else
-  if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && rev->pending_eof) {
-    socklen_t  len;
-#endif
-
-    rev->eof = 1;
-    c->error = 1;
-
-    err = 0;
-    len = sizeof(ngx_err_t);
-
-    /*
-      * BSDs and Linux return 0 and set a pending error in err
-      * Solaris returns -1 and sets errno
-      */
-
-    if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len)
-        == -1)
-    {
-        err = ngx_socket_errno;
-    }
-
-    goto closed;
-  }
-
-#endif
-
-  n = recv(c->fd, buf, 1, MSG_PEEK);
-
-  if (n == 0) {
-    rev->eof = 1;
-    c->error = 1;
-    err = 0;
-
-    goto closed;
-
-  } else if (n == -1) {
-    err = ngx_socket_errno;
-
-    if (err != NGX_EAGAIN) {
-      rev->eof = 1;
-      c->error = 1;
-
-      goto closed;
-    }
-  }
-
-  /* aio does not call this handler */
-
-  if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && rev->active) {
-
-    if (ngx_del_event(rev, NGX_READ_EVENT, 0) != NGX_OK) {
-      ngx_http_close_request_dup(r, 0);
-    }
-  }
-
-  return;
-
-closed:
-
-  if (err) {
-    rev->error = 1;
-  }
-
-  ngx_log_error(NGX_LOG_INFO, c->log, err,
-                "client prematurely closed connection");
-
-  //send the unsubscribe upstream request before finalize the main request.
-  //otherwise, main request pool will have been wiped by the time we need it.
-  nchan_ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  if(!nchan_ctx->sent_unsubscribe_request && nchan_ctx->sub) {
-    nchan_subscriber_unsubscribe_request(nchan_ctx->sub, NGX_HTTP_CLIENT_CLOSED_REQUEST);
-  }
-}
-
-#endif
-
diff --git a/debian/modules/nchan/src/subscribers/common.h b/debian/modules/nchan/src/subscribers/common.h
index bb4a02a..7ce4184 100644
--- a/debian/modules/nchan/src/subscribers/common.h
+++ b/debian/modules/nchan/src/subscribers/common.h
@@ -2,7 +2,8 @@ ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id);
 
 ngx_int_t nchan_subscriber_authorize_subscribe_request(subscriber_t *sub, ngx_str_t *ch_id);
 ngx_int_t nchan_subscriber_subscribe_request(subscriber_t *sub);
-ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub, ngx_int_t finalize_code);
+ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub);
+ngx_int_t nchan_subscriber_subrequest_cleanup(subscriber_t *sub);
 
 ngx_int_t nchan_cleverly_output_headers_only_for_later_response(ngx_http_request_t *r);
 
@@ -12,18 +13,14 @@ ngx_int_t nchan_request_set_content_type_multipart_boundary_header(ngx_http_requ
 
 ngx_int_t nchan_subscriber_empty_notify(subscriber_t *, ngx_int_t code, void *data);
 
-typedef ngx_int_t (*subrequest_callback_pt)(subscriber_t *sub, ngx_http_request_t *r, ngx_int_t rc, void *);
-ngx_http_request_t *subscriber_cv_subrequest(subscriber_t *sub, ngx_http_complex_value_t *url_ccv, ngx_buf_t *body, subrequest_callback_pt cb, void *cb_data);
-ngx_http_request_t *subscriber_subrequest(subscriber_t *sub, ngx_str_t *url, ngx_buf_t *body, subrequest_callback_pt cb, void *cb_data);
+
+nchan_fakereq_subrequest_data_t *nchan_subscriber_subrequest(subscriber_t *sub, nchan_requestmachine_request_params_t *params);
+
 
 void nchan_subscriber_timeout_ev_handler(ngx_event_t *ev);
 void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http_request_t *r, nchan_msg_id_t *msgid);
 void nchan_subscriber_init_timeout_timer(subscriber_t *sub, ngx_event_t *ev);
-void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t dequeue_after_response);
+void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t enable_sub_unsub_callbacks, ngx_int_t dequeue_after_response);
 ngx_int_t nchan_subscriber_init_msgid_reusepool(nchan_request_ctx_t *ctx, ngx_pool_t *request_pool);
 ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
-void nchan_subscriber_unsubscribe_callback_http_test_reading(ngx_http_request_t *r);
-void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end);
-void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str);
-#define ngx_init_set_membuf_char(buf, str) \
-  ngx_init_set_membuf(buf, (u_char *)str, ((u_char *)str) + sizeof(str)-1)
+
diff --git a/debian/modules/nchan/src/subscribers/eventsource.c b/debian/modules/nchan/src/subscribers/eventsource.c
index 6ff437a..2a6df96 100644
--- a/debian/modules/nchan/src/subscribers/eventsource.c
+++ b/debian/modules/nchan/src/subscribers/eventsource.c
@@ -49,7 +49,10 @@ static void es_ensure_headers_sent(full_subscriber_t *fsub) {
     
     bc->buf.last_buf = 0;
     bc->buf.flush = 1;
-
+    
+    r->chunked = 0;
+    r->header_only = 0;
+    
     nchan_output_filter(fsub->sub.request, &bc->chain);
     
     fsub->data.shook_hands = 1; 
@@ -103,7 +106,7 @@ static ngx_int_t es_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
   static ngx_str_t        terminal_newlines=ngx_string("\n\n");
   full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
   u_char                 *cur = NULL, *last = NULL;
-  ngx_buf_t              *msg_buf = msg->buf;
+  ngx_buf_t              *msg_buf = &msg->buf;
   ngx_buf_t               databuf;
   nchan_buf_and_chain_t  *bc;
   ngx_chain_t            *first_link = NULL, *last_link = NULL;
@@ -233,8 +236,8 @@ static ngx_int_t es_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
   if(sub->cf->eventsource_event.len > 0) {
     prepend_es_response_line(fsub, &event_line, &first_link, &sub->cf->eventsource_event);
   }
-  else if(msg->eventsource_event.len > 0) {
-    prepend_es_response_line(fsub, &event_line, &first_link, &msg->eventsource_event);
+  else if(msg->eventsource_event) {
+    prepend_es_response_line(fsub, &event_line, &first_link, msg->eventsource_event);
   }
   
   return nchan_output_msg_filter(fsub->sub.request, msg, first_link);
@@ -242,7 +245,7 @@ static ngx_int_t es_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
 
 static void empty_handler(void) {}
 
-static ngx_int_t es_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line){
+static ngx_int_t es_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line,  ngx_chain_t *status_body){
   
   static ngx_str_t          empty_line = ngx_string("");
   full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
@@ -255,7 +258,7 @@ static ngx_int_t es_respond_status(subscriber_t *sub, ngx_int_t status_code, con
   }
   
   if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
-    return subscriber_respond_unqueued_status(fsub, status_code, status_line);
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
   }
   
   es_ensure_headers_sent(fsub);
@@ -273,6 +276,7 @@ static ngx_int_t es_respond_status(subscriber_t *sub, ngx_int_t status_code, con
   if((status_code >=400 && status_code <599) || status_code == NGX_HTTP_NOT_MODIFIED) {
     fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
     fsub->sub.request->keepalive=0;
+    sub->request->headers_out.status = status_code;
     fsub->data.finalize_request=1;
     sub->fn->dequeue(sub);
   }
@@ -280,17 +284,90 @@ static ngx_int_t es_respond_status(subscriber_t *sub, ngx_int_t status_code, con
   return NGX_OK;
 }
 
+static void ping_ev_handler(ngx_event_t *ev) {
+  full_subscriber_t    *fsub = (full_subscriber_t *)ev->data;
+  nchan_loc_conf_t     *cf = fsub->sub.cf;
+  
+  if(!ev->timedout) {
+    return;
+  }
+
+  struct {
+    ngx_str_t   prefix;
+    ngx_str_t  *value;
+  } line[3] = {
+    {ngx_string(":"),         &cf->eventsource_ping.comment},
+    {ngx_string("event: "),   &cf->eventsource_ping.event},
+    {ngx_string("data: "),    &cf->eventsource_ping.data}
+  };
+  
+  int chaincount = 1;
+  int i;
+  for(i=0; i<3; i++) {
+    chaincount += line[i].value->len > 0 ? 3 : 0;
+  }
+
+  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), chaincount);
+  ngx_chain_t            *chain = NULL;
+    
+  for(i=0; i<3; i++) {
+    if(line[i].value->len > 0) {
+      chain = chain ? chain->next : &bc->chain;
+      ngx_init_set_membuf_str(chain->buf, &line[i].prefix);
+      
+      chain = chain->next;
+      ngx_init_set_membuf_str(chain->buf, line[i].value);
+      
+      chain = chain->next;
+      ngx_init_set_membuf_char(chain->buf, "\n");
+    }
+  }
+  chain = chain ? chain->next : &bc->chain;
+  if(chaincount > 1) {
+    ngx_init_set_membuf_char(chain->buf, "\n");
+  }
+  else {
+    //everything's empty.
+    //rather than sending a single newline (which is probably a valid event-stream protocol token)
+    //send an empty comment (definitely valid)
+    ngx_init_set_membuf_char(chain->buf, ":\n\n");
+  }
+  chain->buf->last_in_chain = 1;
+  chain->buf->flush = 1;
+  chain->next = NULL;
+  
+  nchan_output_filter(fsub->sub.request, &bc->chain);
+  
+  ev->timedout=0;
+  ngx_add_timer(&fsub->data.ping_ev, fsub->sub.cf->eventsource_ping.interval * 1000);
+}
+
 static ngx_int_t es_enqueue(subscriber_t *sub) {
   ngx_int_t           rc;
   full_subscriber_t  *fsub = (full_subscriber_t *)sub;
   DBG("%p output status to subscriber", sub);
   rc = longpoll_enqueue(sub);
+  if(rc == NGX_OK) {
+    if(sub->cf->eventsource_ping.interval > 0) {
+      nchan_init_timer(&fsub->data.ping_ev, ping_ev_handler, fsub);
+      ngx_add_timer(&fsub->data.ping_ev, sub->cf->eventsource_ping.interval * 1000);
+    }
+  }
+  
   fsub->data.finalize_request = 0;
   es_ensure_headers_sent(fsub);
   sub->enqueued = 1;
   return rc;
 }
 
+static ngx_int_t es_dequeue(subscriber_t *sub) {
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  if(fsub->data.ping_ev.timer_set) {
+    ngx_del_timer(&fsub->data.ping_ev);
+  }
+  return longpoll_dequeue(sub);
+}
+
 static       subscriber_fn_t  eventsource_fn_data;
 static       subscriber_fn_t *eventsource_fn = NULL;
 
@@ -306,10 +383,13 @@ subscriber_t *eventsource_subscriber_create(ngx_http_request_t *r, nchan_msg_id_
     eventsource_fn = &eventsource_fn_data;
     *eventsource_fn = *sub->fn;
     eventsource_fn->enqueue = es_enqueue;
+    eventsource_fn->dequeue = es_dequeue;
     eventsource_fn->respond_message= es_respond_message;
     eventsource_fn->respond_status = es_respond_status;
   }
   
+  ngx_memzero(&fsub->data.ping_ev, sizeof(fsub->data.ping_ev));
+  
   fsub->data.shook_hands = 0;
   
   ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
@@ -318,7 +398,7 @@ subscriber_t *eventsource_subscriber_create(ngx_http_request_t *r, nchan_msg_id_
   //msgid bufs -- unique per response
   nchan_subscriber_init_msgid_reusepool(ctx, r->pool);
   
-  nchan_subscriber_common_setup(sub, EVENTSOURCE, &sub_name, eventsource_fn, 0);
+  nchan_subscriber_common_setup(sub, EVENTSOURCE, &sub_name, eventsource_fn, 1, 0);
   return sub;
 }
 
diff --git a/debian/modules/nchan/src/subscribers/getmsg_proxy.c b/debian/modules/nchan/src/subscribers/getmsg_proxy.c
new file mode 100644
index 0000000..fb77b55
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/getmsg_proxy.c
@@ -0,0 +1,106 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "internal.h"
+#include "getmsg_proxy.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:PROXY:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:PROXY:" fmt, ##arg)
+
+
+typedef struct sub_data_s sub_data_t;
+
+struct sub_data_s {
+  subscriber_t                 *sub;
+  ngx_str_t                    *chid;
+  ngx_event_t                   timeout_ev;
+  callback_pt                   cb;
+  void                         *pd;
+}; //sub_data_t
+
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
+  DBG("%p enqueued ok", d->sub);
+  return NGX_OK;
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)d->sub;
+  DBG("%p dequeue:", d->sub);
+
+  //TODO: make sure proxy target is already taken care of
+  
+  if(fsub->sub.reserved > 0) {
+    DBG("%p  not ready to destroy (reserved for %i)", fsub, fsub->sub.reserved);
+    fsub->awaiting_destruction = 1;
+  }
+  else {
+    DBG("%p destroy", fsub);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
+  DBG("%p forwarding msg", d->sub);
+  nchan_msg_t            *msg = (nchan_msg_t *) ptr;
+  d->cb(MSG_FOUND, msg, d->pd);
+  d->cb = NULL;
+  //TODO : dequeue
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  assert(d->cb);
+  if(!ptr) {
+    switch(status) {
+      case NGX_HTTP_GONE: //delete
+        DBG("%p forwarding MSG_EXPIRED", d->sub);
+        d->cb(MSG_EXPIRED, NULL, d->pd);
+        d->cb = NULL;
+        break;
+      case NGX_HTTP_CONFLICT:
+      case NGX_HTTP_CLOSE: //delete
+      case NGX_HTTP_FORBIDDEN:
+      case NGX_HTTP_NOT_FOUND:
+      case NGX_HTTP_REQUEST_TIMEOUT:
+        DBG("%p forwarding MSG_NOTFOUND", d->sub);
+        d->cb(MSG_NOTFOUND, NULL, d->pd);
+        d->cb = NULL;
+        break;
+      case NGX_HTTP_NO_CONTENT:
+        //translate back to MSG request status code
+        DBG("%p forwarding MSG_EXPECTED", d->sub);
+        d->cb(MSG_EXPECTED, NULL, d->pd);
+        d->cb = NULL;
+        break;
+      case NGX_HTTP_NOT_MODIFIED: //does this even ever happen? I don't think so.
+        assert(0);
+        break;
+      default:
+        ERR("unknown status %i", status);
+    }
+  }
+  return NGX_OK;
+}
+
+static ngx_str_t sub_name = ngx_string("getmsg-proxy");
+
+subscriber_t *getmsg_proxy_subscriber_create(nchan_msg_id_t *msgid, callback_pt cb, void *pd) {
+  sub_data_t                 *d;
+  subscriber_t               *sub;
+  
+  sub = internal_subscriber_create_init(&sub_name, NULL /*no config*/, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, NULL, NULL);
+  
+  
+  DBG("created new getmsg_proxy sub %p", sub);
+  nchan_copy_new_msg_id(&sub->last_msgid, msgid);
+  sub->destroy_after_dequeue = 1;
+  sub->dequeue_after_response = 1;
+  d->sub = sub;
+  d->cb = cb;
+  d->pd = pd;
+  return sub;
+}
diff --git a/debian/modules/nchan/src/subscribers/getmsg_proxy.h b/debian/modules/nchan/src/subscribers/getmsg_proxy.h
new file mode 100644
index 0000000..48a9834
--- /dev/null
+++ b/debian/modules/nchan/src/subscribers/getmsg_proxy.h
@@ -0,0 +1 @@
+subscriber_t *getmsg_proxy_subscriber_create(nchan_msg_id_t *msgid, callback_pt cb, void *pd);
diff --git a/debian/modules/nchan/src/subscribers/http-chunked.c b/debian/modules/nchan/src/subscribers/http-chunked.c
index d356f5d..faa056f 100644
--- a/debian/modules/nchan/src/subscribers/http-chunked.c
+++ b/debian/modules/nchan/src/subscribers/http-chunked.c
@@ -37,6 +37,8 @@ static void chunked_ensure_headers_sent(full_subscriber_t *fsub) {
     nchan_cleverly_output_headers_only_for_later_response(r);
     
     fsub->data.shook_hands = 1; 
+    r->chunked = 0;
+    r->header_only = 0;
   }
 }
 
@@ -49,7 +51,7 @@ static ngx_int_t chunked_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
   ngx_file_t             *file_copy;
   nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(ctx->bcp, 3);
   ngx_chain_t            *chain;
-  ngx_buf_t              *buf, *msg_buf = msg->buf;
+  ngx_buf_t              *buf, *msg_buf = &msg->buf;
   ngx_int_t               rc;
   
   if(fsub->data.timeout_ev.timer_set) {
@@ -110,7 +112,7 @@ static ngx_int_t chunked_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
   return rc;
 }
 
-static ngx_int_t chunked_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line){
+static ngx_int_t chunked_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line,  ngx_chain_t *status_body){
   nchan_buf_and_chain_t     bc;
   ngx_chain_t              *chain = NULL;
   full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
@@ -137,7 +139,7 @@ static ngx_int_t chunked_respond_status(subscriber_t *sub, ngx_int_t status_code
   }
   
   if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code < 600) {
-    return subscriber_respond_unqueued_status(fsub, status_code, status_line);
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
   }
   
   chunked_ensure_headers_sent(fsub);
@@ -189,7 +191,7 @@ subscriber_t *http_chunked_subscriber_create(ngx_http_request_t *r, nchan_msg_id
   ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
   nchan_bufchain_pool_init(ctx->bcp, r->pool);
   
-  nchan_subscriber_common_setup(sub, HTTP_CHUNKED, &sub_name, chunked_fn, 0);
+  nchan_subscriber_common_setup(sub, HTTP_CHUNKED, &sub_name, chunked_fn, 1, 0);
   return sub;
 }
 
diff --git a/debian/modules/nchan/src/subscribers/http-multipart-mixed.c b/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
index 97b9fec..3e12411 100644
--- a/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
+++ b/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
@@ -44,9 +44,12 @@ static void multipart_ensure_headers_sent(full_subscriber_t *fsub) {
     //set preamble in the request ctx. it would be nicer to store in in the subscriber data, 
     //but that would mean not reusing longpoll's fsub directly
     
+    r->header_only = 0;
+    r->chunked = 0;
+    
     if((bc = nchan_bufchain_pool_reserve(ctx->bcp, 1)) == NULL) {
       ERR("can't reserve bufchain for multipart headers");
-      nchan_respond_status(fsub->sub.request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 1);
+      nchan_respond_status(fsub->sub.request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 1);
       return;
     }
     
@@ -72,7 +75,7 @@ static void *headerbuf_alloc(void *pd) {
 static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
   
   full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
-  ngx_buf_t              *buf, *msg_buf = msg->buf, *msgid_buf;
+  ngx_buf_t              *buf, *msg_buf = &msg->buf, *msgid_buf;
   ngx_int_t               rc;
   nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(fsub->sub.request, ngx_nchan_module);
   nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
@@ -107,7 +110,7 @@ static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
   }
   
   n=4;
-  if(msg->content_type.len == 0) {
+  if(!msg->content_type) {
     //don't need content_type buf'n'chain
     n--;
   }
@@ -116,7 +119,7 @@ static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
     n --;
   }
   if((bc = nchan_bufchain_pool_reserve(ctx->bcp, n)) == NULL) {
-    ERR("cant allocate buf-and-chains for multipart/mixed client output");
+    ERR("can't allocate buf-and-chains for multipart/mixed client output");
     return NGX_ERROR;
   }
   
@@ -130,7 +133,7 @@ static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
   chain->buf->pos = headerbuf->charbuf;
   
   //content_type maybe
-  if(msg->content_type.len > 0) {
+  if(msg->content_type) {
     chain = chain->next;
     buf = chain->buf;
     
@@ -141,7 +144,7 @@ static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
     buf->memory = 1;
     buf->start = cur;
     buf->pos = cur;
-    buf->last = ngx_snprintf(cur, 255, "Content-Type: %V\r\n\r\n", &msg->content_type);
+    buf->last = ngx_snprintf(cur, 255, "Content-Type: %V\r\n\r\n", msg->content_type);
     buf->end = buf->last;
   }
   else {
@@ -150,10 +153,10 @@ static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
     msgid_buf->end = cur;
   }
   
-  chain = chain->next;
-  buf = chain->buf;
   //msgbuf
   if(ngx_buf_size(msg_buf) > 0) {
+    chain = chain->next;
+    buf = chain->buf;
     ngx_memcpy(buf, msg_buf, sizeof(*msg_buf));
     if(msg_buf->file) {
       file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
@@ -189,7 +192,7 @@ static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
   return rc;
 }
 
-static ngx_int_t multipart_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line){
+static ngx_int_t multipart_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body){
   nchan_buf_and_chain_t    *bc;
   static u_char            *end_boundary=(u_char *)"--\r\n";
   full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
@@ -201,13 +204,13 @@ static ngx_int_t multipart_respond_status(subscriber_t *sub, ngx_int_t status_co
   }
   
   if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
-    return subscriber_respond_unqueued_status(fsub, status_code, status_line);
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
   }
   
   multipart_ensure_headers_sent(fsub);
   
   if((bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 1)) == NULL) {
-    nchan_respond_status(sub->request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 1);
+    nchan_respond_status(sub->request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 1);
     return NGX_ERROR;
   }
   
@@ -272,7 +275,7 @@ subscriber_t *http_multipart_subscriber_create(ngx_http_request_t *r, nchan_msg_
   ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
   nchan_bufchain_pool_init(ctx->bcp, r->pool);
   
-  nchan_subscriber_common_setup(sub, HTTP_MULTIPART, &sub_name, multipart_fn, 0);
+  nchan_subscriber_common_setup(sub, HTTP_MULTIPART, &sub_name, multipart_fn, 1, 0);
   return sub;
 }
 
diff --git a/debian/modules/nchan/src/subscribers/http-raw-stream.c b/debian/modules/nchan/src/subscribers/http-raw-stream.c
index 7f8007c..7c4ee1b 100644
--- a/debian/modules/nchan/src/subscribers/http-raw-stream.c
+++ b/debian/modules/nchan/src/subscribers/http-raw-stream.c
@@ -18,13 +18,15 @@ static void rawstream_ensure_headers_sent(full_subscriber_t *fsub) {
   if(!fsub->data.shook_hands) {
     nchan_cleverly_output_headers_only_for_later_response(r);
     fsub->data.shook_hands = 1; 
+    r->header_only = 0;
+    r->chunked = 0;
   }
 }
 
 static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
   
   full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
-  ngx_buf_t              *buf, *msg_buf = msg->buf;
+  ngx_buf_t              *buf, *msg_buf = &msg->buf;
   ngx_int_t               rc;
   nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(fsub->sub.request, ngx_nchan_module);
   nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
@@ -33,7 +35,7 @@ static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
   ngx_file_t             *file_copy;
   
   size_t                  separator_len = cf->subscriber_http_raw_stream_separator.len;
-  size_t                  msg_len = ngx_buf_size((msg->buf));
+  size_t                  msg_len = ngx_buf_size(msg_buf);
   
   
   if(fsub->data.timeout_ev.timer_set) {
@@ -47,7 +49,7 @@ static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
   }
   
   if((bc = nchan_bufchain_pool_reserve(ctx->bcp, (1 + (msg_len > 0 ? 1: 0)))) == NULL) {
-    ERR("cant allocate buf-and-chains for http-raw-stream client output");
+    ERR("can't allocate buf-and-chains for http-raw-stream client output");
     return NGX_ERROR;
   }
   
@@ -90,7 +92,7 @@ static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
   return rc;
 }
 
-static ngx_int_t rawstream_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line){
+static ngx_int_t rawstream_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body){
   full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
   //nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
   
@@ -99,8 +101,8 @@ static ngx_int_t rawstream_respond_status(subscriber_t *sub, ngx_int_t status_co
     return NGX_OK;
   }
   
-  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
-    return subscriber_respond_unqueued_status(fsub, status_code, status_line);
+  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code < 600) {
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
   }
   
   subscriber_maybe_dequeue_after_status_response(fsub, status_code);
@@ -144,7 +146,7 @@ subscriber_t *http_raw_stream_subscriber_create(ngx_http_request_t *r, nchan_msg
   ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
   nchan_bufchain_pool_init(ctx->bcp, r->pool);
   
-  nchan_subscriber_common_setup(sub, HTTP_RAW_STREAM, &sub_name, rawstream_fn, 0);
+  nchan_subscriber_common_setup(sub, HTTP_RAW_STREAM, &sub_name, rawstream_fn, 1, 0);
   return sub;
 }
 
diff --git a/debian/modules/nchan/src/subscribers/internal.c b/debian/modules/nchan/src/subscribers/internal.c
index 2b1f534..8f4a8a2 100644
--- a/debian/modules/nchan/src/subscribers/internal.c
+++ b/debian/modules/nchan/src/subscribers/internal.c
@@ -150,7 +150,7 @@ void *internal_subscriber_get_privdata(subscriber_t *sub) {
 }
 
 static void reset_timer(internal_subscriber_t *f) {
-  if(f->sub.cf->subscriber_timeout > 0) {
+  if(f->sub.cf && f->sub.cf->subscriber_timeout > 0) {
     if(f->timeout_ev.timer_set) {
       ngx_del_timer(&f->timeout_ev);
     }
@@ -161,7 +161,7 @@ static void reset_timer(internal_subscriber_t *f) {
 static ngx_int_t internal_enqueue(subscriber_t *self) {
   internal_subscriber_t   *fsub = (internal_subscriber_t *)self;
   DBG("%p (%V) enqueue", self, fsub->sub.name);
-  if(self->cf->subscriber_timeout > 0 && !fsub->timeout_ev.timer_set) {
+  if(self->cf && self->cf->subscriber_timeout > 0 && !fsub->timeout_ev.timer_set) {
     //add timeout timer
     reset_timer(fsub);
   }
@@ -172,12 +172,15 @@ static ngx_int_t internal_enqueue(subscriber_t *self) {
 
 static ngx_int_t internal_dequeue(subscriber_t *self) {
   internal_subscriber_t   *f = (internal_subscriber_t *)self;
-  assert(!f->already_dequeued);
+  if (f->already_dequeued) {
+    return NGX_OK; //it's ok to be dequeued more than once,
+    //because a subscriber may linger a bit before being deleted
+  }
   f->already_dequeued = 1;
   DBG("%p (%V) dequeue sub", self, f->sub.name);
   f->dequeue(NGX_OK, NULL, f->privdata);
   f->dequeue_handler(self, f->dequeue_handler_data);
-  if(self->cf->subscriber_timeout > 0 && f->timeout_ev.timer_set) {
+  if(self->cf && self->cf->subscriber_timeout > 0 && f->timeout_ev.timer_set) {
     ngx_del_timer(&f->timeout_ev);
   }
   self->enqueued = 0;
@@ -205,7 +208,7 @@ static ngx_int_t internal_respond_message(subscriber_t *self, nchan_msg_t *msg)
   return dequeue_maybe(self);
 }
 
-static ngx_int_t internal_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line) {
+static ngx_int_t internal_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
   internal_subscriber_t   *f = (internal_subscriber_t *)self;
   DBG("%p status %i", self, status_code);
   if(status_code == NGX_HTTP_GONE) {
@@ -259,9 +262,13 @@ static const subscriber_t new_internal_sub = {
   NCHAN_ZERO_MSGID,
   NULL,
   NULL,
+  NULL,
   0, //reserved
+  0, //enable sub/unsub callbacks
   0, //stick around after response
   1, //destroy after dequeue
   0, //enqueued
-
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  NULL, NULL, NULL
+#endif
 };
diff --git a/debian/modules/nchan/src/subscribers/longpoll-private.h b/debian/modules/nchan/src/subscribers/longpoll-private.h
index f388c74..111bc4d 100644
--- a/debian/modules/nchan/src/subscribers/longpoll-private.h
+++ b/debian/modules/nchan/src/subscribers/longpoll-private.h
@@ -9,6 +9,7 @@ typedef struct {
   subscriber_callback_pt  dequeue_handler;
   void                   *dequeue_handler_data;
   ngx_event_t             timeout_ev;
+  ngx_event_t             ping_ev;
   
   nchan_longpoll_multimsg_t *multimsg_first;
   nchan_longpoll_multimsg_t *multimsg_last;
@@ -28,7 +29,8 @@ typedef struct {
 } full_subscriber_t;
 
 ngx_int_t longpoll_enqueue(subscriber_t *self);
+ngx_int_t longpoll_dequeue(subscriber_t *self);
 
 void subscriber_maybe_dequeue_after_status_response(full_subscriber_t *fsub, ngx_int_t status_code);
 
-ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line);
+ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t  *status_body);
diff --git a/debian/modules/nchan/src/subscribers/longpoll.c b/debian/modules/nchan/src/subscribers/longpoll.c
index 0c723a7..c14061f 100644
--- a/debian/modules/nchan/src/subscribers/longpoll.c
+++ b/debian/modules/nchan/src/subscribers/longpoll.c
@@ -19,6 +19,9 @@ static const subscriber_t new_longpoll_sub;
 static void empty_handler() { }
 
 static void sudden_abort_handler(subscriber_t *sub) {
+  if(sub->request && sub->status != DEAD) {
+    sub->request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
+  }
 #if FAKESHARD
   full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
   memstore_fakeprocess_push(fsub->sub.owner);
@@ -70,9 +73,6 @@ subscriber_t *longpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *
   
 #if NCHAN_SUBSCRIBER_LEAK_DEBUG
   subscriber_debug_add(&fsub->sub);
-  //set debug label
-  fsub->sub.lbl = ngx_calloc(r->uri.len+1, ngx_cycle->log);
-  ngx_memcpy(fsub->sub.lbl, r->uri.data, r->uri.len);
 #endif
   
   //http request sudden close cleanup
@@ -100,9 +100,9 @@ ngx_int_t longpoll_subscriber_destroy(subscriber_t *sub) {
     DBG("%p destroy for req %p", sub, fsub->sub.request);
     nchan_free_msg_id(&fsub->sub.last_msgid);
     assert(sub->status == DEAD);
+    nchan_subscriber_subrequest_cleanup(sub);
 #if NCHAN_SUBSCRIBER_LEAK_DEBUG
     subscriber_debug_remove(sub);
-    ngx_free(sub->lbl);
     ngx_memset(fsub, 0xB9, sizeof(*fsub)); //debug
 #endif
     ngx_free(fsub);
@@ -110,11 +110,28 @@ ngx_int_t longpoll_subscriber_destroy(subscriber_t *sub) {
   return NGX_OK;
 }
 
+static void finalize_request_handler(ngx_http_request_t *r) {
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  if(ctx->sub == NULL) {
+    ngx_http_test_reading(r);
+    return;
+  }
+  subscriber_t *sub = ctx->sub;
+  #if FAKESHARD
+    memstore_fakeprocess_push(sub->owner);
+  #endif
+    sub->dequeue_after_response = 1;
+    sub->fn->respond_status(sub, NGX_HTTP_BAD_REQUEST, &NCHAN_HTTP_STATUS_400, NULL);
+  #if FAKESHARD
+    memstore_fakeprocess_pop();
+  #endif
+}
+
 static void ensure_request_hold(full_subscriber_t *fsub) {
   if(fsub->data.holding == 0) {
     DBG("hodl request %p", fsub->sub.request);
     fsub->data.holding = 1;
-    fsub->sub.request->read_event_handler = ngx_http_test_reading;
+    fsub->sub.request->read_event_handler = finalize_request_handler;
     fsub->sub.request->write_event_handler = ngx_http_request_empty_handler;
     fsub->sub.request->main->count++; //this is the right way to hold and finalize the request... maybe
   }
@@ -155,17 +172,10 @@ ngx_int_t longpoll_enqueue(subscriber_t *self) {
     ngx_add_timer(&fsub->data.timeout_ev, self->cf->subscriber_timeout * 1000);
   }
 
-  
-#if nginx_version >= 1003015
-  if(self->cf->unsubscribe_request_url) {
-    self->request->read_event_handler = nchan_subscriber_unsubscribe_callback_http_test_reading;
-  }
-#endif
-  
   return NGX_OK;
 }
 
-static ngx_int_t longpoll_dequeue(subscriber_t *self) {
+ngx_int_t longpoll_dequeue(subscriber_t *self) {
   full_subscriber_t    *fsub = (full_subscriber_t  *)self;
   ngx_http_request_t   *r = fsub->sub.request;
   nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
@@ -176,22 +186,8 @@ static ngx_int_t longpoll_dequeue(subscriber_t *self) {
   DBG("%p dequeue", self);
   fsub->data.dequeue_handler(self, fsub->data.dequeue_handler_data);
   
-  if(self->enqueued 
-   && (self->type != LONGPOLL && self->type != INTERVALPOLL) //disabled for longpoll & intervalpoll for now
-   && self->cf->unsubscribe_request_url 
-   && ctx->unsubscribe_request_callback_finalize_code != NGX_HTTP_CLIENT_CLOSED_REQUEST) {
-    r->main->blocked = 1;
-    if(fsub->data.finalize_request) {
-      nchan_subscriber_unsubscribe_request(self, NGX_OK);
-      self->status = DEAD;
-    }
-    else {
-      nchan_subscriber_unsubscribe_request(self, NGX_DONE);
-    }
-    if(ctx->request_ran_content_handler) {
-      ngx_http_run_posted_requests(r->connection);
-    }
-    finalize_now = 0;
+  if(self->enqueued && self->enable_sub_unsub_callbacks && self->cf->unsubscribe_request_url) {
+    nchan_subscriber_unsubscribe_request(self);
   }
   
   self->enqueued = 0;
@@ -218,8 +214,13 @@ static ngx_int_t dequeue_maybe(subscriber_t *self) {
 }
 
 static ngx_int_t abort_response(subscriber_t *sub, char *errmsg) {
-  ERR("abort! %s", errmsg ? errmsg : "unknown error");
-  dequeue_maybe(sub);
+  if(sub->request) {
+    nchan_log_request_warning(sub->request, "%V subscriber: %s", sub->name, errmsg ? errmsg : "weird response error");
+  }
+  else {
+    nchan_log_warning("%V subscriber: %s", sub->name, errmsg ? errmsg : "weird response error");
+  }
+  sub->fn->dequeue(sub);
   return NGX_ERROR;
 }
 
@@ -232,30 +233,14 @@ static ngx_int_t longpoll_multipart_add(full_subscriber_t *fsub, nchan_msg_t *ms
     return NGX_ERROR;
   }
   
-  if(msg->shared) {
-    msg_reserve(msg, "longpoll multipart");
-  }
-  else if(msg->id.tagcount > 1) {
-    //msg from a multiplexed channel
-    assert(!msg->shared && !msg->temp_allocd);
-    nchan_msg_copy_t *cmsg;
-    if((cmsg = ngx_palloc(fsub->sub.request->pool, sizeof(*cmsg))) == NULL) {
-      *err = "can't allocate msgcopy for message from multiplexed channel";
+  if(msg->storage != NCHAN_MSG_SHARED) {
+    if((msg = nchan_msg_derive_palloc(msg, fsub->sub.request->pool)) == NULL) {
+      *err = "can't allocate derived msg in request pool";
       return NGX_ERROR;
-      
     }
-    //  multiplexed channel message should have been created as a nchan_msg_copy_t
-    *cmsg = *(nchan_msg_copy_t *)msg;
-    
-    cmsg->copy.temp_allocd = 1;
-    
-    assert(cmsg->original->shared);
-    msg_reserve(cmsg->original, "longpoll multipart for multiplexed channel");
-    msg = &cmsg->copy;
-  }
-  else {
-    assert(0); //this is not yet an expected scenario;
   }
+  msg_reserve(msg, "longpoll multipart");
+  assert(msg->refcount > 0);
   
   mmsg->msg = msg;
   mmsg->next = NULL;
@@ -309,22 +294,8 @@ static ngx_int_t longpoll_respond_message(subscriber_t *self, nchan_msg_t *msg)
 
 static void multipart_request_cleanup_handler(nchan_longpoll_multimsg_t *first) {
   nchan_longpoll_multimsg_t    *cur;
-  nchan_msg_copy_t             *cmsg;
   for(cur = first; cur != NULL; cur = cur->next) {
-    if(cur->msg->shared) {
-      msg_release(cur->msg, "longpoll multipart");
-    }
-    else if(cur->msg->id.tagcount > 1) {
-      assert(!cur->msg->shared && cur->msg->temp_allocd);
-      // multiplexed channel message should have been created as a nchan_msg_copy_t
-      cmsg = (nchan_msg_copy_t *)cur->msg;
-      
-      assert(cmsg->original->shared);
-      msg_release(cmsg->original, "longpoll multipart for multiplexed channel");
-    }
-    else {
-      assert(0);
-    }
+    msg_release(cur->msg, "longpoll multipart");
   }
 }
 
@@ -336,16 +307,18 @@ static ngx_int_t longpoll_multipart_respond(full_subscriber_t *fsub) {
   u_char                *char_boundary = NULL;
   u_char                *char_boundary_last;
   
-  ngx_buf_t              boundary[3]; //first, mid, and last boundary
-  ngx_buf_t              newline_buf;
-  ngx_chain_t           *chain, *first_chain = NULL, *last_chain = NULL;
-  ngx_buf_t             *buf;
+  struct {
+    ngx_buf_t            first;
+    ngx_buf_t            mid;
+    ngx_buf_t            last;
+  }                      boundary;
+  
   ngx_buf_t              double_newline_buf;
   ngx_str_t             *content_type;
-  size_t                 size = 0;
   nchan_loc_conf_t      *cf = fsub->sub.cf;
   int                    use_raw_stream_separator = cf->longpoll_multimsg_use_raw_stream_separator;
-  nchan_buf_and_chain_t *bc;
+  
+  ngx_init_set_membuf_char(&double_newline_buf, "\r\n\r\n");
   
   nchan_longpoll_multimsg_t *first, *cur;
   
@@ -375,101 +348,64 @@ static ngx_int_t longpoll_multipart_respond(full_subscriber_t *fsub) {
     char_boundary = ngx_palloc(r->pool, 50);
     char_boundary_last = ngx_snprintf(char_boundary, 50, ("\r\n--%V--\r\n"), nchan_request_multipart_boundary(r, ctx));
     
-    ngx_init_set_membuf_char(&double_newline_buf, "\r\n\r\n");
-    
     //set up the boundaries
-    ngx_init_set_membuf(&boundary[0], &char_boundary[2], &char_boundary_last[-4]);
-    ngx_init_set_membuf(&boundary[1], &char_boundary[0], &char_boundary_last[-4]);
-    ngx_init_set_membuf(&boundary[2], &char_boundary[0], char_boundary_last);
-    
-    ngx_init_set_membuf_char(&newline_buf, "\n");
+    ngx_init_set_membuf(&boundary.first, &char_boundary[2], &char_boundary_last[-4]);
+    ngx_init_set_membuf(&boundary.mid, &char_boundary[0], &char_boundary_last[-4]);
+    ngx_init_set_membuf(&boundary.last, &char_boundary[0], char_boundary_last);
   }
   
-  int n=0;
-  
   for(cur = first; cur != NULL; cur = cur->next) {
-    bc = nchan_bufchain_pool_reserve(ctx->bcp, 4);
-    chain = &bc->chain;
-    n++;
-    
-    if(last_chain) {
-      last_chain->next = chain;
-    }
-    if(!first_chain) {
-      first_chain = chain;
-    }
     if(!use_raw_stream_separator) {
       // each buffer needs to be unique for the purpose of dealing with nginx output guts
       // (something about max. 64 iovecs per write call and counting the number of bytes already sent)
-      *chain->buf = cur == first ? boundary[0] : boundary[1];
-      size += ngx_buf_size((chain->buf));
-      chain = chain->next;
       
-      content_type = &cur->msg->content_type;
-      buf = chain->buf;
-      if (content_type->data != NULL) {
-        u_char    *char_cur = ngx_pcalloc(r->pool, content_type->len + 25);
-        ngx_init_set_membuf(buf, char_cur, ngx_snprintf(char_cur, content_type->len + 25, "\r\nContent-Type: %V\r\n\r\n", content_type));
+      nchan_bufchain_append_buf(ctx->bcp, cur == first ? &boundary.first : &boundary.mid);
+      
+      content_type = cur->msg->content_type;
+      if (content_type) {
+        nchan_bufchain_append_cstr(ctx->bcp, "\r\nContent-Type: ");
+        nchan_bufchain_append_str(ctx->bcp, content_type);
       }
-      else {
-        *buf = double_newline_buf;
-      }
-      size += ngx_buf_size(buf);
-      chain = chain->next;
+      nchan_bufchain_append_cstr(ctx->bcp, "\r\n\r\n");
     }
+    
+    if(ngx_buf_size((&cur->msg->buf)) > 0) {
+      ngx_buf_t             msgbuf = cur->msg->buf;
       
-    if(ngx_buf_size(cur->msg->buf) > 0) {
-      buf = chain->buf;
-      *buf = *cur->msg->buf;
-      
-      if(buf->file) {
+      if(msgbuf.file) {
         ngx_file_t  *file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
-        nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
+        nchan_msg_buf_open_fd_if_needed(&msgbuf, file_copy, NULL);
       }
-      buf->last_buf = 0;
-      size += ngx_buf_size(buf);
+      nchan_bufchain_append_buf(ctx->bcp, &msgbuf);
     }
     
     if(use_raw_stream_separator) {
-      chain = chain->next;
-      ngx_init_set_membuf_str(chain->buf, &cf->subscriber_http_raw_stream_separator);
-      size += ngx_buf_size((chain->buf));
+      nchan_bufchain_append_str(ctx->bcp, &cf->subscriber_http_raw_stream_separator);
     }
-    else {
-      if(cur->next == NULL) {
-        chain = chain->next;
-        chain->buf = &boundary[2];
-        size += ngx_buf_size((chain->buf));
-      }
+    else if(cur->next == NULL) { //lastmsg
+      nchan_bufchain_append_buf(ctx->bcp, &boundary.last);
     }
-    last_chain = chain;
   }
-    
-  buf = last_chain->buf;
-  buf->last_buf = 1;
-  buf->last_in_chain = 1;
-  buf->flush = 1;
-  last_chain->next = NULL;
-    
+  
   r->headers_out.status = NGX_HTTP_OK;
-  r->headers_out.content_length_n = size;
+  r->headers_out.content_length_n = nchan_bufchain_length(ctx->bcp);
   nchan_set_msgid_http_response_headers(r, ctx, &fsub->data.multimsg_last->msg->id);
   nchan_include_access_control_if_needed(r, ctx);
-  ngx_http_send_header(r);
-  nchan_output_filter(r, first_chain);
-  
+  if(ngx_http_send_header(r) != NGX_OK) {
+    return abort_response(&fsub->sub, "failed to send longpoll-multipart headers");
+  }
+  if(nchan_output_filter(r, nchan_bufchain_first_chain(ctx->bcp)) != NGX_OK) {
+    return abort_response(&fsub->sub, "failed to send longpoll-multipart body");
+  }
   
   return NGX_OK;
 }
 
-static ngx_int_t longpoll_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line) {
-  
+static ngx_int_t longpoll_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
   full_subscriber_t     *fsub = (full_subscriber_t *)self;
   ngx_http_request_t    *r = fsub->sub.request;
   nchan_loc_conf_t      *cf = fsub->sub.cf;
   
-  //DBG("%p got status %i", self, status_code);
-  
   if(fsub->data.act_as_intervalpoll) {
     if(status_code == NGX_HTTP_NO_CONTENT || status_code == NGX_HTTP_NOT_MODIFIED || status_code == NGX_HTTP_NOT_FOUND ) {
       status_code = NGX_HTTP_NOT_MODIFIED;
@@ -478,8 +414,12 @@ static ngx_int_t longpoll_respond_status(subscriber_t *self, ngx_int_t status_co
   else if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
     if(cf->longpoll_multimsg) {
       if(fsub->data.multimsg_first != NULL) {
-        longpoll_multipart_respond(fsub);
-        dequeue_maybe(self);
+        if(longpoll_multipart_respond(fsub) == NGX_OK) {
+          dequeue_maybe(self);
+        }
+        else {
+          DBG("%p should have been dequeued through abort_response");
+        }
       }
       return NGX_OK;
     }
@@ -498,19 +438,26 @@ static ngx_int_t longpoll_respond_status(subscriber_t *self, ngx_int_t status_co
   //disable abort handler
   fsub->data.cln->handler = empty_handler;
   
-  nchan_respond_status(r, status_code, status_line, 0);
+  nchan_respond_status(r, status_code, status_line, status_body, 0);
 
   dequeue_maybe(self);
   return NGX_OK;
 }
 
-ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line) {
+ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
   ngx_http_request_t     *r = fsub->sub.request;
+  nchan_loc_conf_t       *cf = fsub->sub.cf;
+  nchan_request_ctx_t    *ctx;
+  
   fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
   fsub->data.finalize_request = 0;
   fsub->sub.status = DEAD;
   fsub->sub.fn->dequeue(&fsub->sub);
-  return nchan_respond_status(r, status_code, status_line, 1);
+  if(cf->unsubscribe_request_url || cf->subscribe_request_url) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+    ctx->sent_unsubscribe_request = 1; //lie about having sent the unsub request already to avoid sending it
+  }
+  return nchan_respond_status(r, status_code, status_line, status_body, 1);
 }
 
 void subscriber_maybe_dequeue_after_status_response(full_subscriber_t *fsub, ngx_int_t status_code) {
@@ -518,6 +465,7 @@ void subscriber_maybe_dequeue_after_status_response(full_subscriber_t *fsub, ngx
     fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
     fsub->sub.request->keepalive=0;
     fsub->data.finalize_request=1;
+    fsub->sub.request->headers_out.status = status_code;
     fsub->sub.fn->dequeue(&fsub->sub);
   }
 }
@@ -561,8 +509,14 @@ static const subscriber_t new_longpoll_sub = {
   NCHAN_ZERO_MSGID,
   NULL,
   NULL,
+  NULL,
   0, //reservations
+  0, //enable sub/unsub callbacks
   1, //deque after response
   1, //destroy after dequeue
   0, //enqueued
+  
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  NULL, NULL, NULL
+#endif
 };
diff --git a/debian/modules/nchan/src/subscribers/memstore_ipc.c b/debian/modules/nchan/src/subscribers/memstore_ipc.c
index 87a4cdd..ec0fa93 100644
--- a/debian/modules/nchan/src/subscribers/memstore_ipc.c
+++ b/debian/modules/nchan/src/subscribers/memstore_ipc.c
@@ -20,6 +20,7 @@ struct sub_data_s {
   subscriber_t                 *sub;
   ngx_str_t                    *chid;
   ngx_int_t                     originator;
+  ngx_int_t                     unhooked;
   ngx_int_t                     owner;
   void                         *foreign_chanhead;
   ngx_event_t                   timeout_ev;
@@ -41,7 +42,12 @@ static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
   if(d->timeout_ev.timer_set) {
     ngx_del_timer(&d->timeout_ev);
   }
-  ret = memstore_ipc_send_unsubscribed(d->originator, d->chid, NULL);
+  if(!d->unhooked) {
+    ret = memstore_ipc_send_unsubscribed(d->originator, d->chid, NULL);
+  }
+  else {
+    ret = NGX_OK;
+  }
   
   if(fsub->sub.reserved > 0) {
     DBG("%p (%V) not ready to destroy (reserved for %i)", fsub, d->chid, fsub->sub.reserved);
@@ -62,9 +68,12 @@ static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d)
   //DBG("%p (%V) memstore subscriber (lastid %V) respond with message %V (lastid %V)", d->sub, d->chid, msgid_to_str(&d->sub->last_msg_id), msgid_to_str(&msg->id), msgid_to_str(&msg->prev_id));
   
   //update_subscriber_last_msg_id(d->sub, msg);
-  
-  rc = memstore_ipc_send_publish_message(d->originator, d->chid, msg, d->sub->cf, empty_callback, NULL);
-  
+  if(!d->unhooked) {
+    rc = memstore_ipc_send_publish_message(d->originator, d->chid, msg, d->sub->cf, empty_callback, NULL);
+  }
+  else {
+    rc = NGX_OK;
+  }
   //no multi-ids allowed here
   assert(msg->id.tagcount == 1);
     
@@ -101,8 +110,23 @@ static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d)
         ERR("unknown status %i", status);
     }
   }
-  return memstore_ipc_send_publish_status(d->originator, d->chid, status, status_line, empty_callback, NULL);
+  if(!d->unhooked) {
+    return memstore_ipc_send_publish_status(d->originator, d->chid, status, status_line, empty_callback, NULL);
+  }
+  else {
+    return NGX_OK;
+  }
 }
+
+static ngx_int_t sub_respond_notice(ngx_int_t notice, void *ptr, sub_data_t *d) {
+  if(!d->unhooked) {
+    return memstore_ipc_send_publish_notice(d->originator, d->chid, notice, NULL);
+  }
+  else {
+    return NGX_OK;
+  }
+}
+
 static void reset_timer(sub_data_t *data) {
   if(data->timeout_ev.timer_set) {
     ngx_del_timer(&data->timeout_ev);
@@ -110,18 +134,9 @@ static void reset_timer(sub_data_t *data) {
   ngx_add_timer(&data->timeout_ev, MEMSTORE_IPC_SUBSCRIBER_TIMEOUT * 1000);
 }
 
-
-static ngx_int_t keepalive_reply_handler(ngx_int_t renew, void *_, void* pd) {
-  sub_data_t *d = (sub_data_t *)pd;
-  DBG("%p (%V) keepalive reply - renew: %i.", d->sub, d->chid, renew);
-  if(d->sub->fn->release(d->sub, 0) == NGX_OK) {
-    if(renew) {
-      reset_timer(d);
-    }
-    else {
-      d->sub->fn->dequeue(d->sub);
-    }
-  }
+ngx_int_t memstore_ipc_subscriber_keepalive_renew(subscriber_t *sub) {
+  sub_data_t *d = internal_subscriber_get_privdata(sub);
+  reset_timer(d);
   return NGX_OK;
 }
 
@@ -137,8 +152,9 @@ static void timeout_ev_handler(ngx_event_t *ev) {
   memstore_fakeprocess_push(d->owner);
 #endif
   DBG("%p (%V), timeout event. Ping originator to see if still needed.", d->sub, d->chid);
-  d->sub->fn->reserve(d->sub);
-  memstore_ipc_send_memstore_subscriber_keepalive(d->originator, d->chid, d->sub, d->foreign_chanhead, keepalive_reply_handler, d);
+  if(!d->unhooked) {
+    memstore_ipc_send_memstore_subscriber_keepalive(d->originator, d->chid, d->sub, d->foreign_chanhead);
+  }
 #if FAKESHARD
   memstore_fakeprocess_pop();
 #endif
@@ -152,13 +168,14 @@ subscriber_t *memstore_ipc_subscriber_create(ngx_int_t originator_slot, ngx_str_
   subscriber_t               *sub;
   
   assert(originator_slot != memstore_slot());
-  sub = internal_subscriber_create_init(&sub_name, cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, NULL, NULL);
+  sub = internal_subscriber_create_init(&sub_name, cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_respond_notice, NULL);
   
   sub->last_msgid = newest_msgid;
   sub->destroy_after_dequeue = 1;
   d->sub = sub;
   d->chid = chid;
   d->originator = originator_slot;
+  d->unhooked = 0;
   assert(foreign_chanhead != NULL);
   d->foreign_chanhead = foreign_chanhead;
   //d->chanhead = local_chanhead;
@@ -171,3 +188,9 @@ subscriber_t *memstore_ipc_subscriber_create(ngx_int_t originator_slot, ngx_str_
   DBG("%p (%V) memstore-ipc subscriber created with privdata %p", d->sub, d->chid, d);
   return sub;
 }
+
+ngx_int_t memstore_ipc_subscriber_unhook(subscriber_t *sub) {
+  sub_data_t *d = internal_subscriber_get_privdata(sub);
+  d->unhooked = 1;
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/subscribers/memstore_ipc.h b/debian/modules/nchan/src/subscribers/memstore_ipc.h
index d388ed6..15d58e8 100644
--- a/debian/modules/nchan/src/subscribers/memstore_ipc.h
+++ b/debian/modules/nchan/src/subscribers/memstore_ipc.h
@@ -1,2 +1,5 @@
 #define MEMSTORE_IPC_SUBSCRIBER_TIMEOUT 5
 subscriber_t *memstore_ipc_subscriber_create(ngx_int_t originator_slot, ngx_str_t *chid, nchan_loc_conf_t *cf, void* foreign_chanhead);
+
+ngx_int_t memstore_ipc_subscriber_unhook(subscriber_t *sub);
+ngx_int_t memstore_ipc_subscriber_keepalive_renew(subscriber_t *sub);
diff --git a/debian/modules/nchan/src/subscribers/memstore_multi.c b/debian/modules/nchan/src/subscribers/memstore_multi.c
index ec723a8..873f4d7 100644
--- a/debian/modules/nchan/src/subscribers/memstore_multi.c
+++ b/debian/modules/nchan/src/subscribers/memstore_multi.c
@@ -37,16 +37,16 @@ static void change_sub_count(memstore_channel_head_t *ch, ngx_int_t n) {
   if(ch->shared) {
     ngx_atomic_fetch_add(&ch->shared->sub_count, n);
   }
-  if(ch->cf->redis.enabled) {
+  if(ch->cf->redis.enabled && ch->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
     memstore_fakesub_add(ch, n);
   }
 }
 
 static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
   DBG("%p enqueued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
-  assert(d->multi_chanhead->multi_waiting > 0);
-  d->multi_chanhead->multi_waiting --;
-  if(d->multi_chanhead->multi_waiting == 0) {
+  assert(d->multi_chanhead->multi_subscribers_pending > 0);
+  d->multi_chanhead->multi_subscribers_pending --;
+  if(d->multi_chanhead->multi_subscribers_pending == 0) {
     memstore_ready_chanhead_unless_stub(d->multi_chanhead);
   }
   
@@ -56,15 +56,14 @@ static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
 static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
   DBG("%p dequeued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
   d->multi_chanhead->status = WAITING;
-  d->multi_chanhead->multi_waiting++;
+  d->multi_chanhead->multi_subscribers_pending++;
   d->multi->sub = NULL;
   
   return NGX_OK;
 }
 
 static ngx_int_t sub_respond_message(ngx_int_t status, nchan_msg_t *msg, sub_data_t* d) {
-  nchan_msg_copy_t  remsg;
-  //nchan_msg_id_t   *last_msgid;
+  nchan_msg_t       remsg;
   ngx_int_t         mcount;
   
   int16_t          tags[NCHAN_MULTITAG_MAX], prevtags[NCHAN_MULTITAG_MAX];
@@ -74,49 +73,42 @@ static ngx_int_t sub_respond_message(ngx_int_t status, nchan_msg_t *msg, sub_dat
   
   assert( msg->id.tagcount == 1 );
   assert( msg->prev_id.tagcount == 1 );
-  
-  remsg.original = msg;
-  
-  remsg.copy = *msg;
-  remsg.copy.shared = 0;
-  remsg.copy.temp_allocd = 0;
+  nchan_msg_derive_stack(msg, &remsg, tags);
   
   mcount = d->multi_chanhead->multi_count;
   
-  remsg.copy.prev_id.tagcount = mcount;
-  remsg.copy.prev_id.tagactive = d->n;
+  remsg.prev_id.tagcount = mcount;
+  remsg.prev_id.tagactive = d->n;
   
-  remsg.copy.id.tagcount = mcount;
-  remsg.copy.id.tagactive = d->n;
+  remsg.id.tagcount = mcount;
+  remsg.id.tagactive = d->n;
   
   if(mcount > NCHAN_FIXED_MULTITAG_MAX) {
-    remsg.copy.id.tag.allocd = tags;
+    remsg.id.tag.allocd = tags;
     tags[0]=msg->id.tag.fixed[0];
-    remsg.copy.prev_id.tag.allocd = prevtags;
+    remsg.prev_id.tag.allocd = prevtags;
     prevtags[0]=msg->prev_id.tag.fixed[0];
   }
   
-  
-  nchan_expand_msg_id_multi_tag(&remsg.copy.prev_id, 0, d->n, -1);
-  nchan_expand_msg_id_multi_tag(&remsg.copy.id, 0, d->n, -1);
+  nchan_expand_msg_id_multi_tag(&remsg.prev_id, 0, d->n, -1);
+  nchan_expand_msg_id_multi_tag(&remsg.id, 0, d->n, -1);
   
   memstore_ensure_chanhead_is_ready(d->multi_chanhead, 1);
   
-  DBG("%p respond with transformed message %p %V (%p %V %i) %V", d->multi->sub, &remsg.copy, msgid_to_str(&remsg.copy.id), d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  DBG("%p respond with transformed message %p %V (%p %V %i) %V", d->multi->sub, &remsg, msgid_to_str(&remsg.id), d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
   
-  nchan_memstore_publish_generic(d->multi_chanhead, &remsg.copy, 0, NULL);
+  nchan_memstore_publish_generic(d->multi_chanhead, &remsg, 0, NULL);
   
   return NGX_OK;
 }
 
 static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
-  DBG("%p subscriber respond with status (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  DBG("%p subscriber respond with status %i (%p %V %i) %V", d->multi->sub, status, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
   switch(status) {
     case NGX_HTTP_GONE: //delete
     case NGX_HTTP_CLOSE: //delete
       nchan_memstore_publish_generic(d->multi_chanhead, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
       //nchan_store_memory.delete_channel(d->chid, NULL, NULL);
-      //TODO: change status to NOTREADY and whatnot
       break;
     
     case NGX_HTTP_CONFLICT:
@@ -160,18 +152,19 @@ subscriber_t *memstore_multi_subscriber_create(memstore_channel_head_t *chanhead
   sub->destroy_after_dequeue = 1;
   sub->dequeue_after_response = 0;
 
+  //DBG("create multi sub for %V (n=%i) pending=%i", &chanhead->multi[n].id, n, chanhead->multi_subscribers_pending);
   d->multi = &chanhead->multi[n];
   d->multi->sub = sub;
   d->multi_chanhead = chanhead;
   d->n = n;
-  chanhead->multi_waiting++;  
+  d->target_chanhead = target_ch;
+  
+  assert(chanhead->multi_subscribers_pending > 0);
 
   target_ch->spooler.fn->add(&target_ch->spooler, sub);
   
   multi_subs = chanhead->shared->sub_count;
-  
-  d->target_chanhead = target_ch;
-  
+
   change_sub_count(target_ch, multi_subs);
   
   DBG("%p created with privdata %p", d->multi->sub, d);
diff --git a/debian/modules/nchan/src/subscribers/memstore_redis.c b/debian/modules/nchan/src/subscribers/memstore_redis.c
index fc9bf29..f1302e8 100644
--- a/debian/modules/nchan/src/subscribers/memstore_redis.c
+++ b/debian/modules/nchan/src/subscribers/memstore_redis.c
@@ -8,8 +8,9 @@
 
 #include <store/redis/store.h>
 #include <store/redis/store-private.h>
+#include <store/redis/redis_nodeset.h>
 
-#include <util/nchan_msgid.h>
+#include <util/nchan_msg.h>
 #include "internal.h"
 #include "memstore_redis.h"
 #include <assert.h>
@@ -21,12 +22,6 @@
 #define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-REDIS:" fmt, ##arg)
 
 
-typedef struct msgexpected_callback_llist_s msgexpected_callback_llist_t;
-struct msgexpected_callback_llist_s {
-  void                         (*cb)(nchan_msg_status_t, void *);
-  msgexpected_callback_llist_t  *next;
-};
-
 typedef struct sub_data_s sub_data_t;
 
 struct sub_data_s {
@@ -35,7 +30,6 @@ struct sub_data_s {
   ngx_str_t                    *chid;
   ngx_event_t                   timeout_ev;
   nchan_msg_status_t            last_msg_status;
-  msgexpected_callback_llist_t *waiting_for_msg_expected;
   sub_data_t                  **onconnect_callback_pd;
 }; //sub_data_t
 
@@ -45,41 +39,39 @@ static ngx_int_t empty_callback(){
 }
 */
 
-static void respond_msgexpected_callbacks(sub_data_t *d, nchan_msg_status_t status) {
-  msgexpected_callback_llist_t    *cur, *next;
-  cur = d->waiting_for_msg_expected;
-  d->waiting_for_msg_expected = NULL;
-  for(; cur != NULL; cur = next) {
-    next = cur->next;
-    cur->cb(status, &cur[1]);
-    ngx_free(cur);
-  }
-}
-
 static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
   DBG("%p memstore-redis subsriber enqueued ok", d->sub);
-  
-  d->chanhead->status = READY;
-  d->chanhead->spooler.fn->handle_channel_status_change(&d->chanhead->spooler);
+  if(d->chanhead) {
+    d->chanhead->status = READY;
+    d->chanhead->spooler.fn->handle_channel_status_change(&d->chanhead->spooler);
+  }
   
   return NGX_OK;
 }
 
 ngx_int_t memstore_redis_subscriber_destroy(subscriber_t *sub) {
   DBG("%p destroy", sub);
+  sub_data_t  *d = internal_subscriber_get_privdata(sub);
+  d->chanhead = NULL; //memstore chanhead should be presumed missing
   return internal_subscriber_destroy(sub);
 }
 
 static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
   DBG("%p dequeue", d->sub);
-  respond_msgexpected_callbacks(d, MSG_NORESPONSE);
   return NGX_OK;
 }
 
 static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
   nchan_msg_t       *msg = (nchan_msg_t *) ptr;
   nchan_loc_conf_t   cf;
-  nchan_msg_id_t    *lastid;    
+  nchan_msg_id_t    *lastid;
+  ngx_pool_t        *deflate_pool = NULL;
+  int                nostore_mode;
+  if(!d->chanhead) {
+    DBG("memstore chanhead gone");
+    return NGX_DECLINED;
+  }
+  nostore_mode = d->chanhead->cf->redis.storage_mode == REDIS_MODE_DISTRIBUTED_NOSTORE;
   DBG("%p memstore-redis subscriber respond with message", d->sub);
 
   cf.max_messages = d->chanhead->max_messages;
@@ -87,21 +79,39 @@ static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d)
   cf.message_timeout = msg->expires - ngx_time();
   cf.complex_max_messages = NULL;
   cf.complex_message_timeout = NULL;
+  cf.message_compression = msg->compressed ? msg->compressed->compression : NCHAN_MSG_NO_COMPRESSION;
+  
+  if(cf.message_compression != NCHAN_MSG_NO_COMPRESSION) {
+    deflate_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE / 2, ngx_cycle->log);
+    if(!deflate_pool) {
+      ERR("unable to create deflatepool");
+      return NGX_ERROR;
+    }
+    nchan_deflate_message_if_needed(msg, &cf, NULL, deflate_pool);
+  }
+  else {
+    msg->compressed = NULL;
+  }
   
   lastid = &d->chanhead->latest_msgid;
   
-  respond_msgexpected_callbacks(d, MSG_NORESPONSE);
-  
   assert(lastid->tagcount == 1 && msg->id.tagcount == 1);
-  if(lastid->time < msg->id.time || 
+  if(nostore_mode || lastid->time < msg->id.time || 
     (lastid->time == msg->id.time && lastid->tag.fixed[0] < msg->id.tag.fixed[0])) {
+    if(nostore_mode) {
+      //out of order messages are ok, we don't care. publish them like they just got here. we can't lose messages due to network lag
+      msg->expires = 0;
+      msg->id.time = 0;
+    }
     memstore_ensure_chanhead_is_ready(d->chanhead, 1);
     nchan_store_chanhead_publish_message_generic(d->chanhead, msg, 0, &cf, NULL, NULL);
   }
   else {
     //meh, this message has already been delivered probably hopefully
   }
-  
+  if(deflate_pool) {
+    ngx_destroy_pool(deflate_pool);
+  }
   return NGX_OK;
 }
 
@@ -112,8 +122,11 @@ static ngx_int_t sub_destroy_handler(ngx_int_t status, void *d, sub_data_t *pd)
   return NGX_OK;
 }
 
-static ngx_int_t reconnect_callback(ngx_int_t status, void *d, void *pd) {
+static ngx_int_t reconnect_callback(redis_nodeset_t *ns, void *pd) {
   sub_data_t *sd = *((sub_data_t **) pd);
+  if(!sd->chanhead || !nodeset_ready(ns)) {
+    return NGX_ERROR;
+  }
   if(sd) {
     DBG("%reconnect callback");
     assert(sd->chanhead->redis_sub == sd->sub);
@@ -125,18 +138,22 @@ static ngx_int_t reconnect_callback(ngx_int_t status, void *d, void *pd) {
     ngx_free(pd);
   }
   else {
-    DBG("%reconnect callback skipped");
+    DBG("%reconnect callback skipped"); //probably because the channel was deleted while we were waiting
   }
   return NGX_OK;
 }
 
 static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
   nchan_loc_conf_t  fake_cf;
+  redis_nodeset_t   *nodeset;
+  if(!d->chanhead) {
+    return NGX_DECLINED;
+  }
+  
   DBG("%p memstore-redis subscriber respond with status %i", d->sub, status);
   switch(status) {
     case NGX_HTTP_GONE: //delete
     case NGX_HTTP_CLOSE: //delete
-      respond_msgexpected_callbacks(d, MSG_NORESPONSE);
       fake_cf = *d->sub->cf;
       fake_cf.redis.enabled = 0;
       d->sub->destroy_after_dequeue = 1;
@@ -144,17 +161,23 @@ static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d)
       //now the chanhead will be in the garbage collector
       d->chanhead->redis_sub = NULL;
       
-      if(redis_connection_status(d->sub->cf) != CONNECTED && d->onconnect_callback_pd == NULL) {
+      nodeset = nodeset_find(&d->sub->cf->redis);
+      if(!nodeset_ready(nodeset) && d->onconnect_callback_pd == NULL) {
         sub_data_t **dd = ngx_alloc(sizeof(*d), ngx_cycle->log);
         *dd = d;
         d->onconnect_callback_pd = dd;
-        redis_store_callback_on_connected(d->sub->cf, reconnect_callback, dd);
+        nodeset_callback_on_ready(nodeset, 0, reconnect_callback, dd);
       }
       break;
       
     case NGX_HTTP_NO_CONTENT:
+      if(d->last_msg_status != MSG_EXPECTED) {
+        //the message buffer has just been walked start to finish
+        nchan_memstore_publish_notice(d->chanhead, NCHAN_NOTICE_BUFFER_LOADED, NULL);
+      }
       d->last_msg_status = MSG_EXPECTED;
-      respond_msgexpected_callbacks(d, MSG_EXPECTED);
+      //TODO: stuff about REDIS_MODE_BACKUP
+      
       break;
       
     default:
@@ -166,38 +189,20 @@ static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d)
 }
 
 static ngx_int_t sub_notify_handler(ngx_int_t code, void *data, sub_data_t *d) {
-  if(code == NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE) {
-    intptr_t   max_messages = (intptr_t )data;
-    d->chanhead->max_messages = max_messages;
-    memstore_chanhead_messages_gc(d->chanhead);
+  intptr_t  max_messages;
+  if(!d->chanhead) {
+    return NGX_DECLINED;
+  }
+  switch(code) {
+    case NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE:
+      max_messages = (intptr_t )data;
+      d->chanhead->max_messages = max_messages;
+      memstore_chanhead_messages_gc(d->chanhead);
+      break;
   }
   return NGX_OK;
 }
 
-ngx_int_t nchan_memstore_redis_subscriber_notify_on_MSG_EXPECTED(subscriber_t *sub, nchan_msg_id_t *id, void (*cb)(nchan_msg_status_t, void*), size_t pd_sz, void *pd) {
-  sub_data_t      *d = internal_subscriber_get_privdata(sub);
-  int8_t           cmpval = nchan_compare_msgids(id, &sub->last_msgid);
-  if(cmpval < 0) {
-    cb(MSG_NORESPONSE, pd);
-  }
-  else if(d->last_msg_status == MSG_EXPECTED) {
-    cb(MSG_EXPECTED, pd);
-  }
-  else {
-    msgexpected_callback_llist_t *cbl;
-    void  *pd_copy;
-    if((cbl = ngx_alloc(sizeof(*cbl) + pd_sz, ngx_cycle->log)) == NULL) {
-      ERR("Unable to allocate memory for notify_on_MSG_EXPECTED callback llist");
-      return NGX_ERROR;
-    }
-    pd_copy = &cbl[1];
-    ngx_memcpy(pd_copy, pd, pd_sz);
-    cbl->cb = cb;
-    cbl->next = d->waiting_for_msg_expected;
-    d->waiting_for_msg_expected = cbl;
-  }
-  return NGX_OK;
-}
 /*
 static void reset_timer(sub_data_t *data) {
   if(data->timeout_ev.timer_set) {
@@ -239,7 +244,6 @@ subscriber_t *memstore_redis_subscriber_create(memstore_channel_head_t *chanhead
   d->chanhead = chanhead;
   d->chid = &chanhead->id;
   d->last_msg_status = MSG_PENDING;
-  d->waiting_for_msg_expected = NULL;
   d->onconnect_callback_pd = NULL;
 
   
diff --git a/debian/modules/nchan/src/subscribers/memstore_redis.h b/debian/modules/nchan/src/subscribers/memstore_redis.h
index e1149d1..5c8d0e4 100644
--- a/debian/modules/nchan/src/subscribers/memstore_redis.h
+++ b/debian/modules/nchan/src/subscribers/memstore_redis.h
@@ -1,4 +1,3 @@
 #define MEMSTORE_REDIS_SUBSCRIBER_TIMEOUT 10
 subscriber_t *memstore_redis_subscriber_create(memstore_channel_head_t *chanhead);
 ngx_int_t memstore_redis_subscriber_destroy(subscriber_t *sub);
-ngx_int_t nchan_memstore_redis_subscriber_notify_on_MSG_EXPECTED(subscriber_t *sub, nchan_msg_id_t *id, void (*cb)(nchan_msg_status_t, void*), size_t pd_sz, void *pd);
diff --git a/debian/modules/nchan/src/subscribers/websocket.c b/debian/modules/nchan/src/subscribers/websocket.c
index c5c3947..8265abb 100644
--- a/debian/modules/nchan/src/subscribers/websocket.c
+++ b/debian/modules/nchan/src/subscribers/websocket.c
@@ -1,6 +1,8 @@
 #include <nchan_module.h>
 #include <subscribers/common.h>
 #include <util/nchan_subrequest.h>
+#include <util/nchan_fake_request.h>
+#include <util/nchan_util.h>
 #if nginx_version >= 1000003
 #include <ngx_crypt.h>
 #endif
@@ -8,6 +10,11 @@
 #include <nginx.h>
 
 
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
+
+
 //#define DEBUG_LEVEL NGX_LOG_WARN
 #define DEBUG_LEVEL NGX_LOG_DEBUG
 
@@ -15,7 +22,11 @@
 #define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:WEBSOCKET:" fmt, ##arg)
 #include <assert.h>
 
-#if __AVX2__
+#if 0 //debug WS optimized xor
+  #define WEBSOCKET_OPTIMIZED_UNMASK 1
+  #define WEBSOCKET_FAKEOPTIMIZED_UNMASK 1
+  #define __vector_size_bytes 32
+#elif __AVX2__
   #include <immintrin.h>                     // AVX2 intrinsics
   #define WEBSOCKET_OPTIMIZED_UNMASK 1
   
@@ -37,6 +48,7 @@
 #endif
 
 #define WEBSOCKET_LAST_FRAME                0x8
+#define WEBSOCKET_LAST_FRAME_RSV1           0xC
 
 #define WEBSOCKET_OPCODE_TEXT               0x1
 #define WEBSOCKET_OPCODE_BINARY             0x2
@@ -54,11 +66,15 @@
 
 #define WEBSOCKET_CLOSING_TIMEOUT           250 //ms
 
+#define DEFLATE_MAX_WINDOW_BITS             15
+#define DEFLATE_MIN_WINDOW_BITS             9 //it should be 8, but zlib doesn't support window size of 8 these days
+#define DEFLATE_DEFAULT_CLIENT_WINDOW_BITS  15
+
 /**
  * here's what a websocket frame looks like
  * 
-    0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   0                   1                   2                   3
+   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
   +-+-+-+-+-------+-+-------------+-------------------------------+
   |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
   |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
@@ -92,11 +108,19 @@
 
 static const u_char WEBSOCKET_PAYLOAD_LEN_16_BYTE = 126;
 static const u_char WEBSOCKET_PAYLOAD_LEN_64_BYTE = 127;
+
 static const u_char WEBSOCKET_TEXT_LAST_FRAME_BYTE =  WEBSOCKET_OPCODE_TEXT  | (WEBSOCKET_LAST_FRAME << 4);
+static const u_char WEBSOCKET_TEXT_DEFLATED_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_TEXT | (WEBSOCKET_LAST_FRAME_RSV1 << 4);
+
+static const u_char WEBSOCKET_BINARY_LAST_FRAME_BYTE =  WEBSOCKET_OPCODE_BINARY  | (WEBSOCKET_LAST_FRAME << 4);
+static const u_char WEBSOCKET_BINARY_DEFLATED_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_BINARY  | (WEBSOCKET_LAST_FRAME_RSV1 << 4);
+
 static const u_char WEBSOCKET_CLOSE_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_CLOSE | (WEBSOCKET_LAST_FRAME << 4);
 static const u_char WEBSOCKET_PONG_LAST_FRAME_BYTE  = WEBSOCKET_OPCODE_PONG  | (WEBSOCKET_LAST_FRAME << 4);
 static const u_char WEBSOCKET_PING_LAST_FRAME_BYTE  = WEBSOCKET_OPCODE_PING  | (WEBSOCKET_LAST_FRAME << 4);
 
+static ngx_str_t   binary_mimetype = ngx_string("application/octet-stream");
+
 #define NCHAN_WS_TMP_POOL_SIZE (4*1024)
 
 
@@ -142,18 +166,19 @@ struct nchan_pub_upstream_request_data_s {
   full_subscriber_t                  *fsub;
   nchan_pub_upstream_request_data_t  *next;
   unsigned                            sent:1;
+  unsigned                            binary:1;
 };
 
 typedef struct {
-  ngx_event_t                         upstream_subrequest_ev;
-  ngx_str_t                           request_url;
-  ngx_int_t                           running_upstream_request_count;
-  nchan_pub_upstream_request_data_t  *upstream_request_data_head;
-  nchan_pub_upstream_request_data_t  *upstream_request_data_tail;
-  nchan_pub_upstream_request_data_t  *upstream_request_data_received_head;
-  ngx_pool_t                         *temp_request_pool;
-  ngx_pool_t                         *real_request_pool;
-} nchan_pub_upstream_stuff_t;
+#if (NGX_ZLIB)
+  z_stream               *zstream_in;
+#endif
+  int8_t                  server_max_window_bits;
+  int8_t                  client_max_window_bits;
+  unsigned                server_no_context_takeover:1;
+  unsigned                client_no_context_takeover:1;
+  unsigned                enabled:1;
+} permessage_deflate_t;
 
 struct full_subscriber_s {
   subscriber_t            sub;
@@ -165,17 +190,23 @@ struct full_subscriber_s {
   ngx_event_t             closing_ev;
   ws_frame_t              frame;
   
-  ngx_str_t              *publish_channel_id;
-  nchan_pub_upstream_stuff_t *publish_upstream;
-  
   ngx_event_t             ping_ev;
+  
+  permessage_deflate_t    deflate;
+  
+  struct {
+    ngx_str_t               *channel_id;
+    ngx_str_t               *upstream_request_url;
+    ngx_pool_t              *msg_pool;
+    void                   (*intercept)(subscriber_t *, nchan_msg_t *);
+  }                       publisher;
+  
   unsigned                awaiting_pong:1;
   unsigned                ws_meta_subprotocol:1;
   unsigned                holding:1; //make sure the request doesn't close right away
   unsigned                shook_hands:1;
-  unsigned                connected:1;
-  unsigned                closing:1;
-  unsigned                already_sent_unsub_request:1;
+  unsigned                sent_close_frame:1;
+  unsigned                received_close_frame:1;
   unsigned                finalize_request:1;
   unsigned                awaiting_destruction:1;
 };// full_subscriber_t
@@ -185,12 +216,13 @@ static void empty_handler() { }
 static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *chain);
 static void set_buf_to_str(ngx_buf_t *buf, const ngx_str_t *str);
 static ngx_chain_t *websocket_frame_header_chain(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *chain);
-static ngx_flag_t is_utf8(u_char *, size_t);
+static ngx_flag_t is_utf8(ngx_buf_t *);
 static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err);
 static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err);
-static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line);
+static ngx_int_t websocket_send_close_frame_cstr(full_subscriber_t *fsub, uint16_t code, const char *err);
+static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body);
 
-static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf);
+static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, int binary);
 
 static ngx_int_t websocket_reserve(subscriber_t *self);
 static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy);
@@ -198,13 +230,45 @@ static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy);
 static void websocket_delete_timers(full_subscriber_t *fsub);
 static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg_t *msg);
 
-ngx_int_t websocket_finalize_upstream_handler(subscriber_t *sub, ngx_http_request_t *sr, ngx_int_t rc, void *pd) {
-  ngx_http_request_t *r = sub->request;
-  DBG("websocket_finalize_upstream_handler");
-  r->main->blocked = 0;
-  websocket_release(sub, 0);
-  
-  nchan_http_finalize_request(r, NGX_HTTP_OK);
+/*
+ngx_int_t ws_reserve_tmp_pool(full_subscriber_t *fsub) {
+  if(!fsub->tmp_pool) {
+    fsub->tmp_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, fsub->sub.request->connection->log);
+  }
+  if(!fsub->tmp_pool) {
+    ERR("unable to create temp pool for websocket sub %p", fsub);
+    return NGX_ERROR;
+  }
+  fsub->tmp_pool_use_count++;
+  return NGX_OK;
+}
+
+ngx_int_t ws_release_tmp_pool(full_subscriber_t *fsub) {
+  if(!fsub->tmp_pool) {
+    ERR("attempted to release tmp_pool when it's NULL");
+    return NGX_ERROR;
+  }
+  if(--fsub->tmp_pool_use_count == 0) {
+    ngx_destroy_pool(fsub->tmp_pool);
+    fsub->tmp_pool = NULL;
+  } else {
+  }
+
+  return NGX_OK;
+}
+*/
+
+ngx_pool_t *ws_get_msgpool(full_subscriber_t *fsub) {
+  if(!fsub->publisher.msg_pool) {
+    fsub->publisher.msg_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, fsub->sub.request->connection->log);
+  }
+  return fsub->publisher.msg_pool;
+}
+ngx_int_t ws_destroy_msgpool(full_subscriber_t *fsub) {
+  if(fsub->publisher.msg_pool) {
+    ngx_destroy_pool(fsub->publisher.msg_pool);
+    fsub->publisher.msg_pool = NULL;
+  }
   return NGX_OK;
 }
 
@@ -212,26 +276,20 @@ static ngx_int_t websocket_finalize_request(full_subscriber_t *fsub) {
   subscriber_t       *sub = &fsub->sub;
   ngx_http_request_t *r = sub->request;
   
-  fsub->cln->handler = (ngx_http_cleanup_pt )empty_handler;
+  if(fsub->cln) {
+    fsub->cln->handler = (ngx_http_cleanup_pt )empty_handler;
+  }
+  
   if(sub->cf->unsubscribe_request_url && sub->enqueued) {
-    if(!fsub->already_sent_unsub_request) {
-      r->main->blocked = 1;
-      fsub->already_sent_unsub_request = 1;
-      websocket_reserve(&fsub->sub);
-      if(sub->enqueued) {
-        sub->fn->dequeue(sub);
-      }
-      if(subscriber_cv_subrequest(sub, sub->cf->unsubscribe_request_url, NULL, websocket_finalize_upstream_handler, NULL)) {
-        ngx_http_run_posted_requests(r->connection);
-      }
-    }
+    nchan_subscriber_unsubscribe_request(sub);
   }
-  else {
-    if(sub->enqueued) {
-      sub->fn->dequeue(sub);
-    }
-    nchan_http_finalize_request(r, NGX_HTTP_OK);
+  nchan_subscriber_subrequest_cleanup(sub);
+  
+  sub->status = DEAD;
+  if(sub->enqueued) {
+    sub->fn->dequeue(sub);
   }
+  nchan_http_finalize_request(r, NGX_HTTP_OK);
   return NGX_OK;
 }
 
@@ -239,12 +297,18 @@ static void aborted_ws_close_request_rev_handler(ngx_http_request_t *r) {
   nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
   full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
   if(fsub) {
+    ctx->sub->status = DEAD;
+    fsub->sub.request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
     websocket_finalize_request(fsub);
   }
 }
 
 static void sudden_abort_handler(subscriber_t *sub) {
-  DBG("sudden abort handler for sub %p request %p", sub, sub->request);
+  //DBG("sudden abort handler for sub %p request %p", sub, sub->request);
+  if(!sub) {
+    //DBG("%p already freed apparently?...", sub);
+    return; //websocket subscriber already freed
+  }
 #if FAKESHARD
   full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
   memstore_fakeprocess_push(fsub->sub.owner);
@@ -272,6 +336,7 @@ static void sudden_upstream_request_abort_handler(full_subscriber_t *fsub) {
 }
 */
 
+static void init_buf(ngx_buf_t *buf, int8_t last);
 static void init_msg_buf(ngx_buf_t *buf);
 
 #if WEBSOCKET_OPTIMIZED_UNMASK
@@ -283,10 +348,9 @@ static void websocket_unmask_frame(ws_frame_t *frame) {
   u_char    *mask_key = frame->mask_key;
   uint64_t   preamble_len = payload_len <= __vector_size_bytes ? payload_len : (uintptr_t )payload % __vector_size_bytes;
   uint64_t   fastlen;
-  __vector_type    w, w_mask;
   u_char     extended_mask[__vector_size_bytes];  
   
-  //preamble
+  //preamble -- for alignment or msglen < __vector_size_bytes
   for (i = 0; i < preamble_len && i < payload_len; i++) {
     payload[i] ^= mask_key[i % 4];
   }
@@ -295,22 +359,32 @@ static void websocket_unmask_frame(ws_frame_t *frame) {
     return;
   }
   
-  assert((uintptr_t )(&payload[i]) % __vector_size_bytes == 0);
-  
-  for(j=0; j<__vector_size_bytes; j+=4) {
-    ngx_memcpy(&extended_mask[j], mask_key, 4);
+  if((uintptr_t )(&payload[i]) % __vector_size_bytes != 0) { //didn't get alignment right for some reason
+    fastlen = 0;
   }
-  
-  w_mask = __vector_load_intrinsic((__vector_type *)extended_mask);
-  fastlen = payload_len - ((payload_len - i) % __vector_size_bytes);
-  
-  assert(fastlen % __vector_size_bytes == 0);
-  
-  for (/*void*/; i < fastlen; i += __vector_size_bytes) {           // note that i must be multiple of [__vector_size_bytes]
-    w = __vector_load_intrinsic((__vector_type *)&payload[i]);       // load [__vector_size_bytes] bytes
-    w = __vector_xor_intrinsic(w, w_mask);           // XOR with mask
-    __vector_store_intrinsic((__vector_type *)&payload[i], w);   // store [__vector_size_bytes] masked bytes
+  else {
+    fastlen = ((payload_len - i) / __vector_size_bytes) * __vector_size_bytes;
   }
+    
+#if WEBSOCKET_FAKEOPTIMIZED_UNMASK
+  for (/*void*/; i < fastlen + preamble_len; i++) {
+    payload[i] ^= mask_key[i % 4];
+  }
+#else
+  __vector_type    w, w_mask;
+  
+  if (fastlen > 0) {
+    for(j=0; j<__vector_size_bytes; j+=4) {
+      ngx_memcpy(&extended_mask[j], mask_key, 4);
+    }
+    w_mask = __vector_load_intrinsic((__vector_type *)extended_mask);
+    for (/*void*/; i < fastlen + preamble_len; i += __vector_size_bytes) {
+      w = __vector_load_intrinsic((__vector_type *)&payload[i]);       // load [__vector_size_bytes] bytes
+      w = __vector_xor_intrinsic(w, w_mask);           // XOR with mask
+      __vector_store_intrinsic((__vector_type *)&payload[i], w);   // store [__vector_size_bytes] masked bytes
+    }
+  }
+#endif
   
   //leftovers
   for (/*void*/; i < payload_len; i++) {
@@ -332,7 +406,7 @@ static void websocket_unmask_frame(ws_frame_t *frame) {
 #endif
 
 static ngx_int_t ws_output_filter(full_subscriber_t *fsub, ngx_chain_t *chain) {
-  if(fsub->publish_upstream && fsub->sub.request->pool == fsub->publish_upstream->temp_request_pool) {
+  /*if(fsub->publish_upstream && fsub->sub.request->pool == fsub->publish_upstream->temp_request_pool) {
     ngx_int_t rc;
     fsub->sub.request->pool = fsub->publish_upstream->real_request_pool;
     rc = nchan_output_filter(fsub->sub.request, chain);
@@ -341,26 +415,44 @@ static ngx_int_t ws_output_filter(full_subscriber_t *fsub, ngx_chain_t *chain) {
   }
   else {
     return nchan_output_filter(fsub->sub.request, chain);
-  }
+  }*/
+  //placate google's devious ngx_pagespeed by not using the header_only hack
+  ngx_http_request_t *r = fsub->sub.request;
+  r->header_only = 0;
+  r->chunked = 0;
+  return nchan_output_filter(r, chain);
 }
 
 static ngx_int_t ws_output_msg_filter(full_subscriber_t *fsub, nchan_msg_t *msg) {
-  if(fsub->publish_upstream && fsub->sub.request->pool == fsub->publish_upstream->temp_request_pool) {
+  /*if(fsub->publish_upstream && fsub->sub.request->pool != fsub->publish_upstream->real_request_pool) {
     ngx_int_t rc;
+    ngx_pool_t *fake_pool = fsub->sub.request->pool;
     fsub->sub.request->pool = fsub->publish_upstream->real_request_pool;
     rc = nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
-    fsub->sub.request->pool = fsub->publish_upstream->temp_request_pool;
+    fsub->sub.request->pool = fake_pool;
     return rc;
   }
   else {
     return nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
-  }
+  }*/
+  return nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
 }
 
-static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *ch, full_subscriber_t *fsub) {
+typedef struct {
+  full_subscriber_t *fsub;
+  ngx_pool_t        *pool;
+  ngx_buf_t         *msgbuf;
+  nchan_fakereq_subrequest_data_t *subrequest;
+  unsigned           binary:1;
+  nchan_msg_t        msg;
+} ws_publish_data_t;
+
+
+static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *ch, ws_publish_data_t *d) {
   time_t                 last_seen = 0;
   ngx_uint_t             subscribers = 0;
   ngx_uint_t             messages = 0;
+  full_subscriber_t     *fsub = d->fsub;
   nchan_msg_id_t        *msgid = NULL;
   ngx_http_request_t    *r = fsub->sub.request;
   ngx_str_t             *accept_header = NULL;
@@ -372,8 +464,15 @@ static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *c
     messages  = ch->messages;
     msgid = &ch->last_published_msg_id;
   }
+  if(d->subrequest) {
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+  }
+  else {
+    ngx_destroy_pool(d->pool);
+  }
+  d = NULL;
   
-  if(websocket_release(&fsub->sub, 0) == NGX_ABORT) {
+  if(websocket_release(&fsub->sub, 0) == NGX_ABORT || fsub->sub.status == DEAD) {
     //zombie publisher
     //nothing more to do, we're finished here
     return NGX_OK;
@@ -382,9 +481,10 @@ static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *c
   switch(status) {
     case NCHAN_MESSAGE_QUEUED:
     case NCHAN_MESSAGE_RECEIVED:
+      nchan_maybe_send_channel_event_message(fsub->sub.request, CHAN_PUBLISH);
       if(fsub->sub.cf->sub.websocket) {
         //don't reply with status info, this websocket is used for subscribing too,
-        //so it should only be recieving messages
+        //so it should only be receiving messages
         return NGX_OK;
       }
       accept_header = nchan_get_accept_header_value(r);
@@ -395,54 +495,90 @@ static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *c
       
       ws_output_filter(fsub, websocket_frame_header_chain(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, ngx_buf_size((&bc->buf)), &bc->chain));
       break;
+    case NGX_HTTP_INSUFFICIENT_STORAGE:
+      websocket_respond_status(&fsub->sub, NGX_HTTP_INSUFFICIENT_STORAGE, NULL, NULL);
+      break;
     case NGX_ERROR:
     case NGX_HTTP_INTERNAL_SERVER_ERROR:
-      websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL);
+      websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL);
       break;
   }
   return NGX_OK;
 }
 
-static void websocket_publish_continue(full_subscriber_t *fsub, ngx_buf_t *buf) {
-  nchan_msg_t              msg;
+static void websocket_publish_continue(ws_publish_data_t *d) {
+  nchan_msg_t             *msg = &d->msg;
   struct timeval           tv;
-  ngx_http_request_t      *r = fsub->sub.request;
-  ngx_memzero(&msg, sizeof(msg));
+  full_subscriber_t       *fsub = d->fsub;
+  ngx_http_request_t      *r = d->fsub->sub.request;
   
-  msg.buf=buf;
+  ngx_memzero(msg, sizeof(*msg));
+  
+  msg->buf=*d->msgbuf;
   if(r->headers_in.content_type) {
-    msg.content_type.data = r->headers_in.content_type->value.data;
-    msg.content_type.len = r->headers_in.content_type->value.len;
+    msg->content_type = &r->headers_in.content_type->value;
   }
   
   ngx_gettimeofday(&tv);
-  msg.id.time = tv.tv_sec;
-  msg.id.tag.fixed[0]=0;
-  msg.id.tagcount=1;
-  msg.id.tagactive=0;
+  msg->id.time = tv.tv_sec;
+  msg->id.tag.fixed[0]=0;
+  msg->id.tagcount=1;
+  msg->id.tagactive=0;
   
-  websocket_reserve(&fsub->sub);
-  fsub->sub.cf->storage_engine->publish(fsub->publish_channel_id, &msg, fsub->sub.cf, (callback_pt )websocket_publish_callback, fsub); 
-  nchan_update_stub_status(total_published_messages, 1);
+  if(d->binary) {
+    msg->content_type = &binary_mimetype;
+  }
+  //ERR("%p pool sz %d", fsub, r->pool->total_allocd);
+  msg->storage = NCHAN_MSG_POOL;
+  
+  if(nchan_need_to_deflate_message(fsub->sub.cf)) {
+    nchan_deflate_message_if_needed(msg, fsub->sub.cf, r, d->pool);
+  }
+  
+  if(fsub->publisher.intercept) {
+    fsub->publisher.intercept(&fsub->sub, msg);
+    ngx_destroy_pool(d->pool);
+  }
+  else {
+    websocket_reserve(&fsub->sub);
+    fsub->sub.cf->storage_engine->publish(fsub->publisher.channel_id, msg, fsub->sub.cf, (callback_pt )websocket_publish_callback, d); 
+    nchan_update_stub_status(total_published_messages, 1);
+  }
   
 }
 
-static ngx_int_t websocket_publisher_upstream_handler(subscriber_t *sub, ngx_http_request_t *sr, ngx_int_t rc, void *data) {
-  ngx_http_request_t                  *r = sr->parent;
-  nchan_pub_upstream_request_data_t   *d = (nchan_pub_upstream_request_data_t *)data;
-  full_subscriber_t                   *fsub = (full_subscriber_t *)sub;
-  nchan_pub_upstream_stuff_t          *sup = fsub->publish_upstream;
-#if nginx_version <= 1009004
-  r->main->subrequests++; //avoid tripping up subrequest loop detection
-#endif
-  if(r->connection->data == sr) {
-    r->connection->data = r;
-  }
-  if(r->postponed) {
-    r->postponed = NULL;
+
+static ngx_int_t websocket_heartbeat(full_subscriber_t *fsub, ngx_buf_t *buf) {
+  ngx_str_t      str_in;
+  if(!fsub->sub.cf->websocket_heartbeat.enabled) {
+    return NGX_DECLINED;
   }
   
-  r->count--;
+  str_in.data = buf->pos;
+  str_in.len = buf->last - buf->pos;
+  if(nchan_ngx_str_match(fsub->sub.cf->websocket_heartbeat.in, &str_in)) {
+    nchan_buf_and_chain_t *bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+    init_buf(&bc->buf, 1);
+    set_buf_to_str(&bc->buf, fsub->sub.cf->websocket_heartbeat.out);
+    websocket_send_frame(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, fsub->sub.cf->websocket_heartbeat.out->len, &bc->chain);
+    return NGX_OK;
+  }
+  else {
+    return NGX_DECLINED;
+  }
+}
+
+ngx_int_t websocket_publish_upstream_handler(ngx_int_t rc, ngx_http_request_t *sr, void *pd) {
+  ws_publish_data_t       *d = pd;
+  full_subscriber_t       *fsub = d->fsub;
+  
+  assert(d->subrequest);
+  
+  if(websocket_release(&fsub->sub, 0) == NGX_ABORT || rc == NGX_ABORT) {
+    //websocket client disappered, or subrequest got canceled some other way
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    return NGX_OK;
+  }
   
   if(rc == NGX_OK) {
     ngx_int_t                        code = sr->headers_out.status;
@@ -455,14 +591,16 @@ static ngx_int_t websocket_publisher_upstream_handler(subscriber_t *sub, ngx_htt
       case NGX_HTTP_ACCEPTED:
         if(sr->upstream) {
           ngx_buf_t    *buf;
-          ngx_buf_t     emptybuf;
           
           content_length = nchan_subrequest_content_length(sr);
+#if nginx_version >= 1013010
+          request_chain = sr->out;
+#else
           request_chain = sr->upstream->out_bufs;
-          
+#endif
           if(content_length > 0 && request_chain) {
             if (request_chain->next != NULL) {
-              buf = nchan_chain_to_single_buffer(sup->temp_request_pool, request_chain, content_length);
+              buf = nchan_chain_to_single_buffer(d->pool, request_chain, content_length);
             }
             else {
               buf = request_chain->buf;
@@ -475,14 +613,13 @@ static ngx_int_t websocket_publisher_upstream_handler(subscriber_t *sub, ngx_htt
             }
           }
           else {
-            ngx_memzero((&emptybuf), sizeof(emptybuf));
-            emptybuf.memory=1;
-            emptybuf.last_in_chain=1;
-            emptybuf.last_buf=1;
-            buf=&emptybuf;
+            buf = ngx_pcalloc(d->pool, sizeof(*buf));
+            buf->memory=1;
+            buf->last_in_chain=1;
+            buf->last_buf=1;
           }
-          
-          websocket_publish_continue(fsub, buf);
+          d->msgbuf = buf;
+          websocket_publish_continue(d);
         }
         else {
           request_chain = NULL;
@@ -492,150 +629,70 @@ static ngx_int_t websocket_publisher_upstream_handler(subscriber_t *sub, ngx_htt
         break;
       
       case NGX_HTTP_NOT_MODIFIED:
-        websocket_publish_continue(fsub, &d->body_buf);
-        
+        websocket_publish_continue(d);
+        //cleaned up later
         break;
         
       case NGX_HTTP_NO_CONTENT:
-        //cancel publication
+        //cancel publishing
+        nchan_requestmachine_request_cleanup_manual(d->subrequest);
         break;
       
       default:
-        websocket_respond_status(&fsub->sub, NGX_HTTP_FORBIDDEN, NULL);
+        nchan_requestmachine_request_cleanup_manual(d->subrequest);
+        websocket_respond_status(&fsub->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
         break;
     }
   }
   else {
-    websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL);
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL);
   }
   
-  assert(sup->upstream_request_data_head == d);
-  sup->upstream_request_data_head = d->next;
-  if(sup->upstream_request_data_tail == d) {
-    sup->upstream_request_data_tail = NULL;
-  }  
   
-  sup->upstream_request_data_received_head=d;
-  
-  sup->running_upstream_request_count--;
-  if(!sup->upstream_subrequest_ev.timer_set) {
-    ngx_add_timer(&sup->upstream_subrequest_ev, 0);
-  }
   
   return NGX_OK;
 }
-
-static void send_next_publish_subrequest(full_subscriber_t *fsub) {
-  nchan_pub_upstream_stuff_t        *sup = fsub->publish_upstream;
-  nchan_pub_upstream_request_data_t *scur;
-  ngx_http_request_t                *sr;
-  
-  if(!sup || !sup->upstream_request_data_head) return;
-  
-  scur = sup->upstream_request_data_head;
-  
-  //typedef ngx_int_t (*subrequest_callback_pt)(subscriber_t *sub, ngx_http_request_t *r, ngx_int_t rc, void *);
-  
-  sr = subscriber_subrequest(&fsub->sub, &sup->request_url, &scur->body_buf, websocket_publisher_upstream_handler, scur);
-  scur->sr = sr;
-  scur->sent = 1;
-  ngx_http_run_posted_requests(fsub->sub.request->connection);
-}
-
-static void clean_after_upstream_response(full_subscriber_t *fsub, ngx_int_t force) {
-  nchan_pub_upstream_stuff_t   *sup = fsub->publish_upstream;
-  if(sup) 
-    DBG("running_upstream_request_count %i", sup->running_upstream_request_count);
-  if(sup && (sup->upstream_request_data_head == NULL || force)) {
-    if(!force) assert(sup->running_upstream_request_count == 0);
-    ngx_http_cleanup_t *cln = fsub->sub.request->cleanup;
-    while(cln && cln != fsub->cln) {
-      if (cln->handler) {
-        DBG("run handler");
-        cln->handler(cln->data);
-      }
-      cln = cln->next;
-    }
-    fsub->sub.request->cleanup = cln;
-    
-    //no need for tmp_pool anymore
-    if(sup->temp_request_pool) {
-      ngx_destroy_pool(sup->temp_request_pool);
-      fsub->sub.request->pool = sup->real_request_pool;
-      sup->temp_request_pool = NULL;
-    }
-  }
-}
-
-static void upstream_subrequest_ev_handler(ngx_event_t *ev) {
-  full_subscriber_t            *fsub = ev->data;
-  send_next_publish_subrequest(fsub);
-  clean_after_upstream_response(fsub, 0);
-  //assert(fsub->sub.request->write_event_handler == ws_request_empty_handler);
-}
-
-static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf) {
-  static ngx_str_t         nopublishing = ngx_string("Publishing not allowed.");
-  
-  if(!fsub->sub.cf->pub.websocket) {
-    return websocket_send_close_frame(fsub, CLOSE_POLICY_VIOLATION, &nopublishing);
-  }
-  
+static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, int binary) {
 #if (NGX_DEBUG_POOL)
   ERR("ws request pool size: %V", ngx_http_debug_pool_str(fsub->sub.request->pool));
 #endif
   
-  if(fsub->publish_upstream == NULL) { // don't need to send request upstream
-    websocket_publish_continue(fsub, buf);
+  ngx_int_t          rc = NGX_OK;
+  ws_publish_data_t *d = ngx_palloc(ws_get_msgpool(fsub), sizeof(*d));
+  if(d == NULL) {
+    return NGX_ERROR;
+  }
+  d->fsub = fsub;
+  d->binary = binary;
+  //move the msg pool
+  d->pool = fsub->publisher.msg_pool;
+  d->msgbuf = buf;
+  fsub->publisher.msg_pool = NULL;
+  
+  if(fsub->publisher.intercept || fsub->publisher.upstream_request_url == NULL) { // don't need to send request upstream
+    d->subrequest = NULL;
+    websocket_publish_continue(d);
   }
   else {
-    nchan_pub_upstream_request_data_t *psrd;
-    ngx_http_request_t                *r = fsub->sub.request;
-    size_t                             sz;
-    ngx_pool_t                        *tmp_pool;
-    nchan_pub_upstream_stuff_t        *sup = fsub->publish_upstream;
-    if(!sup->temp_request_pool) {
-      //can't use the client request's pool, it will bloat with every new upstream request
-      sup->temp_request_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, r->connection->log);
-      sup->real_request_pool = r->pool;
-      r->pool = sup->temp_request_pool;
-      //will set back to real request's pool at the end of this function
-    }
-    tmp_pool = fsub->publish_upstream->temp_request_pool;
+    nchan_requestmachine_request_params_t param;
+    param.url.str = fsub->publisher.upstream_request_url;
+    param.url_complex = 0;
+    param.pool = d->pool;
+    param.body = buf;
+    param.response_headers_only = 0;
+    param.cb = (callback_pt )websocket_publish_upstream_handler;
+    param.pd = d;
+    param.manual_cleanup = 1;
     
-    psrd = ngx_pcalloc(tmp_pool, sizeof(*psrd));
+    websocket_reserve(&d->fsub->sub);
     
-    if(sup->upstream_request_data_tail) {
-     sup->upstream_request_data_tail->next = psrd;
-    }
-    sup->upstream_request_data_tail = psrd;
-    if(!sup->upstream_request_data_head) {
-     sup->upstream_request_data_head = psrd;
-    }
+    d->subrequest = nchan_subscriber_subrequest(&fsub->sub, &param);
     
-    psrd->next = NULL;
-    psrd->sent = 0;
-    psrd->fsub = fsub;
-    
-    //copy body out of the websocket framebuffer to the upstream temp pool buffer
-    sz = ngx_buf_size(buf);
-    psrd->body_buf = *buf;
-    psrd->body_buf.start = ngx_palloc(tmp_pool, sz);
-    ngx_memcpy(psrd->body_buf.start, buf->start, sz);
-    psrd->body_buf.end = psrd->body_buf.start + sz;
-    psrd->body_buf.pos = psrd->body_buf.start;
-    psrd->body_buf.last = psrd->body_buf.end;
-    
-    //ERR("request %p tmp pool %p", r, r->pool);
-    
-    
-    sup->running_upstream_request_count++;
-    if(!sup->upstream_subrequest_ev.timer_set) {
-      ngx_add_timer(&sup->upstream_subrequest_ev, 0);
-    }
+    rc = d->subrequest == NULL ? NGX_ERROR : NGX_OK;
   }
   
-  return NGX_OK;
+  return rc;
 }
 
 static void websocket_init_frame(ws_frame_t *frame) {
@@ -652,7 +709,6 @@ static void *framebuf_alloc(void *pd) {
 static void closing_ev_handler(ngx_event_t *ev) {
   full_subscriber_t *fsub = (full_subscriber_t *)ev->data;
   DBG("closing_ev timer handler for %p, delayed", fsub);
-  //fsub->connected = 0;
   //fsub->sub.status = DEAD;
   websocket_finalize_request(fsub);
 }
@@ -675,12 +731,15 @@ subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t
   fsub->finalize_request = 0;
   fsub->holding = 0;
   fsub->shook_hands = 0;
-  fsub->connected = 0;
   fsub->awaiting_pong = 0;
-  fsub->closing = 0;
-  fsub->already_sent_unsub_request = 0;
+  fsub->sent_close_frame = 0;
+  fsub->received_close_frame = 0;
   ngx_memzero(&fsub->ping_ev, sizeof(fsub->ping_ev));
+  
   nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->timeout_ev);
+  
+  ngx_memzero(&fsub->deflate, sizeof(fsub->deflate));
+  
   fsub->dequeue_handler = empty_handler;
   fsub->dequeue_handler_data = NULL;
   fsub->awaiting_destruction = 0;
@@ -699,22 +758,24 @@ subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t
   b->temporary = 0;
   */
   
+  ngx_memzero(&fsub->publisher, sizeof(fsub->publisher));
+  
+  
   if(fsub->sub.cf->pub.websocket) {
-    fsub->publish_channel_id = nchan_get_channel_id(r, PUB, 0);
+    fsub->publisher.channel_id = nchan_get_channel_id(r, PUB, 0);
   }
   
   if(fsub->sub.cf->publisher_upstream_request_url) {
-    if((fsub->publish_upstream = ngx_pcalloc(r->pool, sizeof(*fsub->publish_upstream))) == NULL) {
-      err="Unable to allocate websocket upstream stuff";
+    ngx_str_t *url = ngx_palloc(r->pool, sizeof(*url));
+    if(url == NULL) {
+      err="Unable to allocate websocket upstream url";
       goto fail;
     }
-    nchan_init_timer(&fsub->publish_upstream->upstream_subrequest_ev, upstream_subrequest_ev_handler, fsub);
-    ngx_http_complex_value(r, fsub->sub.cf->publisher_upstream_request_url, &fsub->publish_upstream->request_url);
-    
-    
+    ngx_http_complex_value(r, fsub->sub.cf->publisher_upstream_request_url, url);
+    fsub->publisher.upstream_request_url = url;
   }
   else {
-    fsub->publish_upstream = NULL;
+    fsub->publisher.upstream_request_url = NULL;
   }
   
   websocket_init_frame(&fsub->frame);
@@ -749,6 +810,9 @@ subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t
   
 fail: 
   if(fsub) {
+    if(fsub->cln) {
+      fsub->cln->data = NULL;
+    }
     ngx_free(fsub);
   }
   ERR("%s", (u_char *)err);
@@ -765,54 +829,122 @@ ngx_int_t websocket_subscriber_destroy(subscriber_t *sub) {
   if(sub->reserved > 0) {
     DBG("%p not ready to destroy (reserved for %i) for req %p", sub, sub->reserved, fsub->sub.request);
     fsub->awaiting_destruction = 1;
+    sub->status = DEAD;
   }
   else {
     DBG("%p destroy for req %p", sub, fsub->sub.request);
 #if NCHAN_SUBSCRIBER_LEAK_DEBUG
     subscriber_debug_remove(&fsub->sub);
 #endif
-    clean_after_upstream_response(fsub, 0);
+
     websocket_delete_timers(fsub);
     nchan_free_msg_id(&sub->last_msgid);
-    //debug 
-    DBG("Begone, websocket %p", fsub);
-    ngx_memset(fsub, 0x13, sizeof(*fsub));
+    //ngx_memset(fsub, 0x13, sizeof(*fsub));
+    ws_destroy_msgpool(fsub);
+    if(fsub->deflate.zstream_in) {
+      inflateEnd(fsub->deflate.zstream_in);
+      ngx_free(fsub->deflate.zstream_in);
+      fsub->deflate.zstream_in = NULL;
+    }
+    
+    nchan_subscriber_subrequest_cleanup(sub);
     ngx_free(fsub);
   }
   return NGX_OK;
 }
 
-static void websocket_perform_handshake(full_subscriber_t *fsub) {
+static ngx_int_t extract_deflate_window_bits(full_subscriber_t *fsub, u_char *lcur, u_char *lend, const char* setting_name, int8_t *bits_out) {
+  ngx_int_t bits;
+  u_char    *ltmp;
+  if((ltmp = ngx_strnstr(lcur, (char *)setting_name, lend - lcur)) != NULL) {
+    ltmp += strlen(setting_name); //strlen
+    if(*ltmp == '=') ltmp++;
+    if(*ltmp == '"') ltmp++;
+    u_char    *nend = ltmp;
+    while(nend <= lend && *nend >='0' && *nend <='9') nend++;
+    if(nend - ltmp == 0) {
+      //no value, don't set
+      return NGX_OK;
+    }
+    bits = ngx_atoi(ltmp, nend - ltmp);
+    switch (bits) {
+      case NGX_ERROR: //bad value
+        return NGX_ERROR;
+      case DEFLATE_MIN_WINDOW_BITS ... DEFLATE_MAX_WINDOW_BITS:
+        *bits_out = bits;
+        return NGX_OK;
+      default:
+        return NGX_ERROR; //out of range
+    }
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t respond_with_error(full_subscriber_t *fsub, const char* msg) {
+  fsub->sub.dequeue_after_response = 1;
+  fsub->sub.request->header_only = 0;
+  nchan_respond_sprintf(fsub->sub.request, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, 1, "%s", msg);
+  return NGX_ERROR;
+}
+  
+static ngx_int_t websocket_perform_handshake(full_subscriber_t *fsub) {
   static ngx_str_t    magic = ngx_string("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
   ngx_str_t           ws_accept_key, sha1_str;
   u_char              buf_sha1[21];
   u_char              buf[255];
+  u_char              permessage_deflate_buf[128];
   ngx_str_t          *tmp, *ws_key, *subprotocols;
   ngx_int_t           ws_version;
   ngx_http_request_t *r = fsub->sub.request;
   
+  nchan_main_conf_t  *mcf = ngx_http_get_module_main_conf(r, ngx_nchan_module);
+  int server_window_bits = mcf->zlib_params.windowBits;
+  
+  ngx_str_t          *which_deflate_extension = NULL;
+  static ngx_str_t permessage_deflate = ngx_string("permessage-deflate");
+  static ngx_str_t perframe_deflate = ngx_string("deflate-frame");
+  static ngx_str_t webkit_perframe_deflate = ngx_string("x-webkit-deflate-frame");
+  
+  permessage_deflate_t pmd;
+#if (NGX_ZLIB)
+  pmd.zstream_in = NULL;
+#endif
+  pmd.server_max_window_bits = NGX_CONF_UNSET;
+  pmd.client_max_window_bits = NGX_CONF_UNSET;
+  pmd.server_no_context_takeover = 0;
+  pmd.client_no_context_takeover = 0;
+  pmd.enabled = 0;
+  
   ngx_sha1_t          sha1;
   
   ws_accept_key.data = buf;
   
   r->headers_out.content_length_n = 0;
-  r->header_only = 1;  
+  r->chunked = 0;
+  r->header_only = 1;
   
   if((tmp = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_VERSION)) == NULL) {
-    r->headers_out.status = NGX_HTTP_BAD_REQUEST;
     fsub->sub.dequeue_after_response=1;
+    r->header_only = 0;
+    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "No Sec-Websocket-Version header present", 1);
+    return NGX_ERROR;
   }
   else {
     ws_version=ngx_atoi(tmp->data, tmp->len);
     if(ws_version != 13) {
-      r->headers_out.status = NGX_HTTP_BAD_REQUEST;
+      //only websocket version 13 (RFC 6455) is supported
       fsub->sub.dequeue_after_response=1;
+      r->header_only = 0;
+      nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Unsupported websocket protocol version (only version 13 is supported)", 1);
+      return NGX_ERROR;
     }
   }
   
   if((ws_key = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_KEY)) == NULL) {
-    r->headers_out.status = NGX_HTTP_BAD_REQUEST;
     fsub->sub.dequeue_after_response=1;
+    r->header_only = 0;
+    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "No Sec-Websocket-Key header present", 1);
+    return NGX_ERROR;
   }
   
   if((subprotocols = nchan_get_header_value(r, NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL)) != NULL) {
@@ -829,36 +961,163 @@ static void websocket_perform_handshake(full_subscriber_t *fsub) {
     }
   }
   
-  if(r->headers_out.status != NGX_HTTP_BAD_REQUEST) {
-    //generate accept key
-    ngx_sha1_init(&sha1);
-    ngx_sha1_update(&sha1, ws_key->data, ws_key->len);
-    ngx_sha1_update(&sha1, magic.data, magic.len);
-    ngx_sha1_final(buf_sha1, &sha1);
-    sha1_str.len=20;
-    sha1_str.data=buf_sha1;
+  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS)) != NULL) {
     
-    ws_accept_key.len=ngx_base64_encoded_length(sha1_str.len);
-    assert(ws_accept_key.len < 255);
-    ngx_encode_base64(&ws_accept_key, &sha1_str);
+    u_char      *cur = tmp->data, *end = tmp->data + tmp->len;
+    u_char      *lcur, *lend;
     
-    nchan_include_access_control_if_needed(r, fsub->ctx);
-    nchan_add_response_header(r, &NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT, &ws_accept_key);
-    nchan_add_response_header(r, &NCHAN_HEADER_UPGRADE, &NCHAN_WEBSOCKET);
-#if nginx_version < 1003013
-    nchan_add_response_header(r, &NCHAN_HEADER_CONNECTION, &NCHAN_UPGRADE);
-#endif
-    r->headers_out.status_line = NCHAN_HTTP_STATUS_101;
-    r->headers_out.status = NGX_HTTP_SWITCHING_PROTOCOLS;
-    
-    r->keepalive=0; //apparently, websocket must not use keepalive.
+    if(nchan_strscanstr(&cur, &permessage_deflate, end)) {
+      which_deflate_extension = &permessage_deflate;
+    }
+    else if(nchan_strscanstr(&cur, &webkit_perframe_deflate, end)) {
+      which_deflate_extension = &webkit_perframe_deflate;
+    }
+    else if(nchan_strscanstr(&cur, &perframe_deflate, end)) {
+      which_deflate_extension = &perframe_deflate;
+    }
+
+    if(which_deflate_extension) {
+      lcur = cur;
+      lend = memchr(lcur, ',', end - lcur); 
+      if(lend == NULL) lend = end;
+      
+      pmd.enabled = 1;
+      
+      pmd.client_no_context_takeover = ngx_strnstr(lcur, "client_no_context_takeover", lend - lcur) != NULL ? 1 : 0;
+      pmd.server_no_context_takeover = ngx_strnstr(lcur, "server_no_context_takeover", lend - lcur) != NULL ? 1 : 0;
+      
+      if(which_deflate_extension == &permessage_deflate) {
+        if(extract_deflate_window_bits(fsub, lcur, lend, "client_max_window_bits", &pmd.client_max_window_bits) != NGX_OK) {
+          return respond_with_error(fsub, "invalid client_max_window_bits permessage-deflate setting");
+        }
+        if(extract_deflate_window_bits(fsub, lcur, lend, "server_max_window_bits", &pmd.server_max_window_bits) != NGX_OK) {
+          return respond_with_error(fsub, "invalid server_max_window_bits permessage-deflate setting");
+        }
+      }
+      else if(which_deflate_extension == &webkit_perframe_deflate || which_deflate_extension == &perframe_deflate) {
+        if(extract_deflate_window_bits(fsub, lcur, lend, "max_window_bits", &pmd.server_max_window_bits) == NGX_OK) {
+          pmd.client_max_window_bits = pmd.server_max_window_bits;
+        }
+        else {
+          return respond_with_error(fsub, "invalid max_window_bits perframe-deflate setting");
+        }
+      }
+    }
   }
   
+  //generate permessage-deflate headers
+  if(pmd.enabled) {
+    u_char *ws_ext_end;
+    ngx_str_t ws_extensions;
+    ws_extensions.data = permessage_deflate_buf;
+    
+    if(which_deflate_extension == &webkit_perframe_deflate || which_deflate_extension == &perframe_deflate) {
+      ws_ext_end = ngx_snprintf(permessage_deflate_buf, 128, "%V; ", which_deflate_extension);
+      if (pmd.server_max_window_bits != NGX_CONF_UNSET) {
+        if(pmd.server_max_window_bits < server_window_bits) {
+          return respond_with_error(fsub, "max_window_bits perframe-deflate is too small");
+        }
+        pmd.server_max_window_bits = server_window_bits; //always the configured window bits
+        ws_ext_end = ngx_snprintf(ws_ext_end, (permessage_deflate_buf + 128 - ws_ext_end),
+                                  "max_window_bits=%i; ",
+                                  pmd.server_max_window_bits);
+      }
+      else {
+        pmd.server_max_window_bits = pmd.client_max_window_bits = server_window_bits;
+      }
+    }
+    else {
+      ws_ext_end = ngx_snprintf(permessage_deflate_buf, 128, "%V; %s%s", 
+                                which_deflate_extension,
+                                pmd.server_no_context_takeover ? "server_no_context_takeover; " : "",
+                                pmd.client_no_context_takeover ? "client_no_context_takeover; " : "");
+      if (pmd.server_max_window_bits != NGX_CONF_UNSET) {
+        if(pmd.server_max_window_bits < server_window_bits) {
+          return respond_with_error(fsub, "server_max_window_bits perframe-deflate is too small");
+        }
+        pmd.server_max_window_bits = server_window_bits; //always the configured window bits
+        ws_ext_end = ngx_snprintf(ws_ext_end, (permessage_deflate_buf + 128 - ws_ext_end), "server_max_window_bits=%i; ", pmd.server_max_window_bits);
+      }
+      else {
+        pmd.server_max_window_bits = server_window_bits;
+      }
+      
+      if (pmd.client_max_window_bits != NGX_CONF_UNSET) {
+        ws_ext_end = ngx_snprintf(ws_ext_end, (permessage_deflate_buf + 128 - ws_ext_end), "client_max_window_bits=%i; ", pmd.client_max_window_bits);
+      }
+      else {
+        pmd.client_max_window_bits = DEFLATE_DEFAULT_CLIENT_WINDOW_BITS;
+      }
+    }
+    ws_extensions.len = ws_ext_end - permessage_deflate_buf - 2; //-2 for the trailing "; "
+    nchan_add_response_header(r, &NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS, &ws_extensions);
+  }
+  fsub->deflate = pmd;
+
+  //generate accept key
+  ngx_sha1_init(&sha1);
+  ngx_sha1_update(&sha1, ws_key->data, ws_key->len);
+  ngx_sha1_update(&sha1, magic.data, magic.len);
+  ngx_sha1_final(buf_sha1, &sha1);
+  sha1_str.len=20;
+  sha1_str.data=buf_sha1;
+  
+  ws_accept_key.len=ngx_base64_encoded_length(sha1_str.len);
+  assert(ws_accept_key.len < 255);
+  ngx_encode_base64(&ws_accept_key, &sha1_str);
+  
+  nchan_include_access_control_if_needed(r, fsub->ctx);
+  nchan_add_response_header(r, &NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT, &ws_accept_key);
+  nchan_add_response_header(r, &NCHAN_HEADER_UPGRADE, &NCHAN_WEBSOCKET);
+#if nginx_version < 1003013
+  nchan_add_response_header(r, &NCHAN_HEADER_CONNECTION, &NCHAN_UPGRADE);
+#endif
+  r->headers_out.status_line = NCHAN_HTTP_STATUS_101;
+  r->headers_out.status = NGX_HTTP_SWITCHING_PROTOCOLS;
+  
+  r->keepalive=0; //apparently, websocket must not use keepalive.
+  
   ngx_http_send_header(r);
+  return NGX_OK;
 }
 
 static void websocket_reading(ngx_http_request_t *r);
 
+static ngx_buf_t *websocket_inflate_message(full_subscriber_t *fsub, ngx_buf_t *msgbuf, ngx_pool_t *pool) {
+#if (NGX_ZLIB)
+  z_stream      *strm;
+  int            rc;
+  ngx_buf_t     *outbuf;
+  
+  if(fsub->deflate.zstream_in == NULL) {
+    if((fsub->deflate.zstream_in = ngx_calloc(sizeof(*strm), ngx_cycle->log)) == NULL) {
+      nchan_log_error("couldn't allocate deflate stream.");
+      return NULL;
+    }
+    strm = fsub->deflate.zstream_in;
+    
+    strm->zalloc = Z_NULL;
+    strm->zfree = Z_NULL;
+    strm->opaque = Z_NULL;
+    
+    rc = inflateInit2(strm, -fsub->deflate.client_max_window_bits);
+    
+    if(rc != Z_OK) {
+      nchan_log_error("couldn't initialize inflate stream.");
+      ngx_free(strm);
+      fsub->deflate.zstream_in = NULL;
+      return NULL;
+    }
+  }
+  
+  strm = fsub->deflate.zstream_in;
+  
+  outbuf = nchan_inflate(strm, msgbuf, fsub->sub.request, pool);
+  return outbuf;
+#else
+  return NULL;
+#endif
+}
 
 static void ensure_request_hold(full_subscriber_t *fsub) {
   if(fsub->holding == 0) {
@@ -872,12 +1131,15 @@ static void ensure_request_hold(full_subscriber_t *fsub) {
 static ngx_int_t ensure_handshake(full_subscriber_t *fsub) {
   if(fsub->shook_hands == 0) {
     ensure_request_hold(fsub);
-    websocket_perform_handshake(fsub);
-    fsub->shook_hands = 1;
-    fsub->connected = 1;
-    return NGX_OK;
+    if(websocket_perform_handshake(fsub) == NGX_OK) {
+      fsub->shook_hands = 1;
+      return NGX_OK;
+    }
+    else {
+      return NGX_ERROR;
+    }
   }
-  return NGX_DECLINED;
+  return NGX_OK;
 }
 
 static ngx_int_t websocket_reserve(subscriber_t *self) {
@@ -889,9 +1151,9 @@ static ngx_int_t websocket_reserve(subscriber_t *self) {
 }
 static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy) {
   full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  //DBG("%p release for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
   assert(self->reserved > 0);
   self->reserved--;
-  //DBG("%p release for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
   if(nodestroy == 0 && fsub->awaiting_destruction == 1 && self->reserved == 0) {
     websocket_subscriber_destroy(self);
     return NGX_ABORT;
@@ -920,7 +1182,10 @@ static void ping_ev_handler(ngx_event_t *ev) {
 
 static ngx_int_t websocket_enqueue(subscriber_t *self) {
   full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  ensure_handshake(fsub);
+  ngx_int_t           rc;
+  if((rc = ensure_handshake(fsub)) != NGX_OK) {
+    return rc;
+  }
   self->enqueued = 1;
   
   if(self->cf->websocket_ping_interval > 0) {
@@ -950,11 +1215,6 @@ static void websocket_delete_timers(full_subscriber_t *fsub) {
   if(fsub->timeout_ev.timer_set) {
     ngx_del_timer(&fsub->timeout_ev);
   }
-  if(fsub->publish_upstream) {
-    if(fsub->publish_upstream->upstream_subrequest_ev.timer_set) {
-      ngx_del_timer(&fsub->publish_upstream->upstream_subrequest_ev);
-    }
-  }
 }
 
 static ngx_int_t websocket_dequeue(subscriber_t *self) {
@@ -964,9 +1224,8 @@ static ngx_int_t websocket_dequeue(subscriber_t *self) {
   
   self->enqueued = 0;
   
-  if(fsub->connected) {
-    ngx_str_t          close_msg = ngx_string("410 Gone");
-    websocket_send_close_frame(fsub, CLOSE_NORMAL, &close_msg);
+  if(!fsub->sent_close_frame && fsub->shook_hands) {
+    websocket_send_close_frame_cstr(fsub, CLOSE_NORMAL, "410 Gone");
   }
   
   websocket_delete_timers(fsub);
@@ -1008,17 +1267,6 @@ static ngx_int_t ws_recv(ngx_connection_t *c, ngx_event_t *rev, ngx_buf_t *buf,
   return NGX_OK;
 }
 
-static uint64_t ws_ntohll(uint64_t value) {
-  int num = 42;
-  if (*(char *)&num == 42) {
-    uint32_t high_part = ntohl((uint32_t)(value >> 32));
-    uint32_t low_part = ntohl((uint32_t)(value & 0xFFFFFFFFLL));
-    return (((uint64_t)low_part) << 32) | high_part;
-  } else {
-    return value;
-  }
-}
-
 static void set_buffer(ngx_buf_t *buf, u_char *start, u_char *last, ssize_t len) {
   ngx_memzero(buf, sizeof(*buf));
   buf->start = start;
@@ -1029,19 +1277,10 @@ static void set_buffer(ngx_buf_t *buf, u_char *start, u_char *last, ssize_t len)
   buf->memory = 1;
 }
 
-#define maybe_close_pool(pool) \
-  if (pool != NULL) {          \
-    ngx_destroy_pool(pool);    \
-    pool = NULL;               \
-  }
-
-static void websocket_reading_finalize(ngx_http_request_t *r, ngx_pool_t *temp_pool) {
+static void websocket_reading_finalize(ngx_http_request_t *r) {
   nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
   full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
   
-  maybe_close_pool(temp_pool);
-  
-  //fsub->connected = 0;
   //fsub->sub.status = DEAD;
   if(fsub) {
     websocket_delete_timers(fsub);
@@ -1054,38 +1293,46 @@ static void websocket_reading_finalize(ngx_http_request_t *r, ngx_pool_t *temp_p
  * thanks, guys!
 */
 static void websocket_reading(ngx_http_request_t *r) {
-  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
-  ws_frame_t                 *frame = &fsub->frame;
-  ngx_int_t                   rc = NGX_OK;
+  nchan_request_ctx_t        *ctx;
+  full_subscriber_t          *fsub;
+  ws_frame_t                 *frame;
+  ngx_int_t                   rc;
   ngx_event_t                *rev;
   ngx_connection_t           *c;
-  ngx_buf_t                   buf;
-  ngx_pool_t                 *temp_pool = NULL;
-  int                         free_temp_pool = 1;
-  ngx_buf_t                   msgbuf;
-  //ngx_str_t                   msg_in_str;
-  int                         close_code;
-  ngx_str_t                   close_reason;
+  ngx_buf_t                  *msgbuf, buf;
+  //ngx_str_t                 msg_in_str;
+retry:
+  ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  fsub = (full_subscriber_t *)ctx->sub;
+  frame = &fsub->frame;
+  rc = NGX_OK;
+
+  c = r->connection;
+  rev = c->read;
+  
+  if(!fsub) {
+    nchan_http_finalize_request(r, NGX_OK);
+    return;
+  }
   
   set_buffer(&buf, frame->header, frame->last, 8);
 
   //DBG("websocket_reading fsub: %p, frame: %p", fsub, frame);
   
-  c = r->connection;
-  rev = c->read;
+
 
   for (;;) {
     if (c->error || c->timedout || c->close || c->destroyed || rev->closed || rev->eof || rev->pending_eof) {
       //ERR("c->error %i c->timedout %i c->close %i c->destroyed %i rev->closed %i rev->eof %i", c->error, c->timedout, c->close, c->destroyed, rev->closed, rev->eof);
-      fsub->connected = 0;
-      return websocket_reading_finalize(r, temp_pool);
+      fsub->sub.request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
+      return websocket_reading_finalize(r);
     }
     
     switch (frame->step) {
       case WEBSOCKET_READ_START_STEP:
         //reading frame header
         if ((rc = ws_recv(c, rev, &buf, 2)) != NGX_OK) {
+          fsub->sub.request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
           goto exit;
         }
         
@@ -1117,7 +1364,7 @@ static void websocket_reading(ngx_http_request_t *r) {
               goto exit;
             }
             ngx_memcpy(&len, frame->header, 8);
-            frame->payload_len = ws_ntohll(len);
+            frame->payload_len = nchan_ntohll(len);
             break;
         }
         
@@ -1136,103 +1383,169 @@ static void websocket_reading(ngx_http_request_t *r) {
         break;
       
       case WEBSOCKET_READ_GET_PAYLOAD_STEP:
-        if ((frame->opcode != WEBSOCKET_OPCODE_TEXT) && (frame->opcode != WEBSOCKET_OPCODE_CLOSE) && (frame->opcode != WEBSOCKET_OPCODE_PING) && (frame->opcode != WEBSOCKET_OPCODE_PONG)) {
-          websocket_send_frame(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL);
-          return websocket_reading_finalize(r, temp_pool);
-        }
         
-        if (frame->payload_len > 0) {
-          //create a temporary pool to allocate temporary elements
-          if (temp_pool == NULL) {
-            if ((temp_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, r->connection->log)) == NULL) {
-              ERR("unable to allocate memory for temporary pool");
-              return websocket_reading_finalize(r, temp_pool);
-            }
-            if ((frame->payload = ngx_pcalloc(temp_pool, frame->payload_len)) == NULL) {
-              ERR("unable to allocate memory for payload");
-              return websocket_reading_finalize(r, temp_pool);
-            }
-            frame->last = frame->payload;
-          }
-          
-          set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
-          
-          if ((rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
-            ERR("ws_recv NOT OK when receiving payload");
-            goto exit;
-          }
-          
-          if (frame->mask) {
-            websocket_unmask_frame(frame);
-          }
-        }
-        frame->step = WEBSOCKET_READ_START_STEP;
-        frame->last = NULL;
         switch(frame->opcode) {
-          case WEBSOCKET_OPCODE_TEXT:
-            if (!is_utf8(frame->payload, frame->payload_len)) {
-              return websocket_reading_finalize(r, temp_pool);
-            }
-            //intentional fall-through
-          case WEBSOCKET_OPCODE_BINARY:
-            init_msg_buf(&msgbuf);
-            
-            msgbuf.start = frame->payload;
-            msgbuf.pos = msgbuf.start;
-            msgbuf.end = msgbuf.start + frame->payload_len;
-            msgbuf.last = msgbuf.end;
-            
-            //msg_in_str.data = msgbuf.pos;
-            //msg_in_str.len = frame->payload_len;
-            
-            //ERR("we got data %V", &msg_in_str);
-            
-            websocket_publish(fsub, &msgbuf);
-            break;
-          
           case WEBSOCKET_OPCODE_PING:
-            DBG("%p got pinged", fsub);
-            websocket_send_frame(fsub, WEBSOCKET_PONG_LAST_FRAME_BYTE, 0, NULL);
-            break;
-            
           case WEBSOCKET_OPCODE_PONG:
-            DBG("%p Got ponged", fsub);
-            if(fsub->awaiting_pong) {
-              fsub->awaiting_pong = 0;
-            }
-            // unsolicited pongs are ok too as per 
-            // https://tools.ietf.org/html/rfc6455#page-37
-            break;
-            
           case WEBSOCKET_OPCODE_CLOSE:
-            if(frame->payload_len >= 2) {
-              ngx_memcpy(&close_code, frame->payload, 2);
-              close_code = ntohs(close_code);
-              close_reason.data = frame->payload + 2;
-              close_reason.len = frame->payload_len - 2;
+            { //block-scope these vars
+              u_char                  payloadbuf[1024];
+              int                     close_code;
+              ngx_str_t               payload_str;
+              nchan_buf_and_chain_t  *bc;
+              
+              if (frame->payload_len == 0) {
+                frame->payload = NULL;
+              }
+              else if(frame->payload_len < 1024) {
+                frame->payload = payloadbuf;
+                frame->last = frame->payload;
+                set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
+                if ((rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
+                  ERR("ws_recv NOT OK when receiving payload");
+                  goto exit;
+                }
+                if (frame->mask) {
+                  websocket_unmask_frame(frame);
+                }
+              }
+              else {
+                //ERROR: frame too big
+                websocket_send_close_frame(fsub, CLOSE_MESSAGE_TOO_BIG, NULL);
+                return websocket_reading_finalize(r);
+              }
+              
+              switch(frame->opcode) {
+                case WEBSOCKET_OPCODE_PING:
+                  bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+                  DBG("%p got pinged", fsub);
+                  init_buf(&bc->buf, 1);
+                  payload_str.data = frame->payload;
+                  payload_str.len = frame->payload_len;
+                  set_buf_to_str(&bc->buf, &payload_str);
+                  websocket_send_frame(fsub, WEBSOCKET_PONG_LAST_FRAME_BYTE, frame->payload_len, &bc->chain);
+                  break;
+                
+                case WEBSOCKET_OPCODE_PONG:
+                  DBG("%p Got ponged", fsub);
+                  if(fsub->awaiting_pong) {
+                    fsub->awaiting_pong = 0;
+                  }
+                  // unsolicited pongs are ok too as per 
+                  // https://tools.ietf.org/html/rfc6455#page-37
+                  break;
+                
+                case WEBSOCKET_OPCODE_CLOSE:
+                  fsub->received_close_frame = 1;
+                  if(frame->payload_len >= 2) {
+                    ngx_memcpy(&close_code, frame->payload, 2);
+                    close_code = ntohs(close_code);
+                    payload_str.data = frame->payload + 2;
+                    payload_str.len = frame->payload_len - 2;
+                  }
+                  else {
+                    close_code = 0;
+                    payload_str.data = (u_char *)"";
+                    payload_str.len = 0;
+                  }
+                  DBG("%p wants to close (code %i reason \"%V\")", fsub, close_code, &payload_str);
+                  if(!fsub->sent_close_frame) {
+                    websocket_send_close_frame(fsub, close_code, &payload_str);
+                  }
+                  return websocket_reading_finalize(r);
+                  break; //good practice?
+              }
+            }
+            break;
+          case WEBSOCKET_OPCODE_TEXT:
+          case WEBSOCKET_OPCODE_BINARY:
+            
+            if(!fsub->sub.cf->pub.websocket) {
+              websocket_send_close_frame_cstr(fsub, CLOSE_POLICY_VIOLATION, "Publishing not allowed.");
+              return websocket_reading_finalize(r);
+            }
+            
+            //TODO: check max websocket message length
+            if(frame->payload == NULL) {
+              if(ws_get_msgpool(fsub) == NULL) {
+                ERR("failed to get msgpool");
+                websocket_send_close_frame(fsub, CLOSE_INTERNAL_SERVER_ERROR, NULL);
+                return websocket_reading_finalize(r);
+              }
+              if((frame->payload = ngx_palloc(ws_get_msgpool(fsub), frame->payload_len == 0 ? 1 : frame->payload_len)) == NULL) {
+                ERR("failed to reserve payload len in tmp pool");
+                websocket_send_close_frame(fsub, CLOSE_INTERNAL_SERVER_ERROR, NULL);
+                ws_destroy_msgpool(fsub);
+                fsub->publisher.msg_pool = NULL;
+                return websocket_reading_finalize(r);
+              }
+              frame->last = frame->payload;
+            }
+            
+            set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
+            
+            if (frame->payload_len > 0 && (rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
+              DBG("ws_recv NOT OK when receiving payload, but that's ok");
+              goto exit;
+            }
+            
+            if (frame->mask) {
+              websocket_unmask_frame(frame);
+            }
+            
+            if((msgbuf = ngx_palloc(ws_get_msgpool(fsub), sizeof(*msgbuf))) == NULL) {
+              ERR("failed to reserve payload msgbuf in tmp pool");
+              websocket_send_close_frame(fsub, CLOSE_INTERNAL_SERVER_ERROR, NULL);
+              ws_destroy_msgpool(fsub);
+              fsub->publisher.msg_pool = NULL;
+              return websocket_reading_finalize(r);
+            }
+            
+            init_msg_buf(msgbuf);
+            
+            msgbuf->start = frame->payload;
+            msgbuf->pos = msgbuf->start;
+            msgbuf->end = msgbuf->start + frame->payload_len;
+            msgbuf->last = msgbuf->end;
+            
+            //inflate message if needed
+            if(fsub->deflate.enabled && frame->rsv1) {
+              if((msgbuf = websocket_inflate_message(fsub, msgbuf, ws_get_msgpool(fsub))) == NULL) {
+                websocket_send_close_frame_cstr(fsub, CLOSE_INVALID_PAYLOAD, "Invalid permessage-deflate data");
+                ws_destroy_msgpool(fsub);
+                return websocket_reading_finalize(r);
+              }
+            }
+            
+            if (frame->opcode == WEBSOCKET_OPCODE_TEXT && !is_utf8(msgbuf)) {
+              ws_destroy_msgpool(fsub);
+              websocket_send_close_frame_cstr(fsub, CLOSE_INVALID_PAYLOAD, "Invalid text frame (not UTF8).");
+              return websocket_reading_finalize(r);
+            }
+            
+            if(websocket_heartbeat(fsub, msgbuf) != NGX_OK) {
+              websocket_publish(fsub, msgbuf, frame->opcode == WEBSOCKET_OPCODE_BINARY);
             }
             else {
-              close_code = 0;
-              close_reason.data = (u_char *)"";
-              close_reason.len = 0;
+              ws_destroy_msgpool(fsub);
             }
-            DBG("%p wants to close (code %i reason \"%V\")", fsub, close_code, &close_reason);
-            websocket_send_close_frame(fsub, 0, NULL);
-            maybe_close_pool(temp_pool);
-            return websocket_reading_finalize(r, temp_pool);
-            break; //good practice?
-        }
-        if(free_temp_pool && temp_pool != NULL) {
-          ngx_destroy_pool(temp_pool);
-          temp_pool = NULL;
+            break;
+          default:
+            //invalid frame or something
+            websocket_send_frame(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL); //TODO: more specific close frame plz
+            return websocket_reading_finalize(r);
+            break;
         }
         
-        return websocket_reading(r);
+        frame->step = WEBSOCKET_READ_START_STEP; //restart loop
+        frame->last = NULL;
+        frame->payload = NULL;
+        goto retry; //I know, Dijkstra, I know.
         break;
         
       default:
         nchan_log(NGX_LOG_ERR, c->log, 0, "unknown websocket step (%d)", frame->step);
-        return websocket_reading_finalize(r, temp_pool);
+        return websocket_reading_finalize(r);
     }
     
     set_buffer(&buf, frame->header, NULL, 8);
@@ -1240,13 +1553,12 @@ static void websocket_reading(ngx_http_request_t *r) {
 
 exit:
   
-  maybe_close_pool(temp_pool);
   if (rc == NGX_AGAIN) {
     frame->last = buf.last;
     if (!c->read->ready) {
       if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
         nchan_log(NGX_LOG_INFO, c->log, ngx_socket_errno, "websocket client: failed to restore read events");
-        return websocket_reading_finalize(r, temp_pool);
+        return websocket_reading_finalize(r);
       }
     }
   }
@@ -1255,14 +1567,33 @@ exit:
     rev->eof = 1;
     c->error = 1;
     nchan_log(NGX_LOG_INFO, c->log, ngx_socket_errno, "websocket client prematurely closed connection");
-    return websocket_reading_finalize(r, temp_pool);
+    return websocket_reading_finalize(r);
   }
 }
 
 
-static ngx_flag_t is_utf8(u_char *p, size_t n) {
+static ngx_flag_t is_utf8(ngx_buf_t *buf) {
+  
+  u_char *p;
+  size_t n;
+  
   u_char  c, *last;
   size_t  len;
+  int     mmapped = 0;
+  
+  if(ngx_buf_in_memory(buf)) {
+    n = ngx_buf_size(buf);
+    p = buf->pos;
+  }
+  else {
+    ngx_fd_t fd = buf->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&buf->file->name) : buf->file->fd;
+    n = buf->file_last - buf->file_pos;
+    p = mmap(NULL, n, PROT_READ, MAP_SHARED, fd, buf->file_pos);
+    if (p == MAP_FAILED) {
+      return 0;
+    }
+    mmapped = 1;
+  }
   
   last = p + n;
   
@@ -1274,37 +1605,36 @@ static ngx_flag_t is_utf8(u_char *p, size_t n) {
       continue;
     }
     
-    if (ngx_utf8_decode(&p, n) > 0x10ffff) {
+    if (ngx_utf8_decode(&p, last - p) > 0x10ffff) {
       /* invalid UTF-8 */
+      if(mmapped) {
+        munmap(p, n);
+      }
       return 0;
     }
   }
+  if(mmapped) {
+    munmap(p, n);
+  }
   return 1;
 }
 
-uint64_t ws_htonll(uint64_t value) {
-  int num = 42;
-  if (*(char *)&num == 42) {
-    uint32_t high_part = htonl((uint32_t)(value >> 32));
-    uint32_t low_part = htonl((uint32_t)(value & 0xFFFFFFFFLL));
-    return (((uint64_t)low_part) << 32) | high_part;
-  } else {
-    return value;
+static void init_buf(ngx_buf_t *buf, int8_t last){
+  ngx_memzero(buf, sizeof(*buf));
+  buf->memory = 1;
+  if(last) {
+    buf->last_buf = 1;
+    buf->last_in_chain = 1;
+    buf->flush = 1;
   }
 }
 
-
 static void init_header_buf(ngx_buf_t *buf) {
-  ngx_memzero(buf, sizeof(*buf));
-  buf->memory = 1;
+  init_buf(buf, 0);
 }
 
 static void init_msg_buf(ngx_buf_t *buf) {
-  ngx_memzero(buf, sizeof(*buf));
-  buf->last_buf = 1;
-  buf->last_in_chain = 1;
-  buf->flush = 1;
-  buf->memory = 1;
+  init_buf(buf, 1);
 }
 
 static ngx_int_t websocket_frame_header(full_subscriber_t *fsub, ngx_buf_t *buf, const u_char opcode, off_t len) {
@@ -1316,7 +1646,6 @@ static ngx_int_t websocket_frame_header(full_subscriber_t *fsub, ngx_buf_t *buf,
   buf->start = last;
   *last = opcode;
   last++;
-  
   if (len <= 125) {
     last = ngx_copy(last, &len, 1);
     buf->end++;
@@ -1328,7 +1657,7 @@ static ngx_int_t websocket_frame_header(full_subscriber_t *fsub, ngx_buf_t *buf,
   }
   else {
     last = ngx_copy(last, &WEBSOCKET_PAYLOAD_LEN_64_BYTE, sizeof(WEBSOCKET_PAYLOAD_LEN_64_BYTE));
-    len_net = ws_htonll(len);
+    len_net = nchan_htonll(len);
     last = ngx_copy(last, &len_net, 8);
   }
   buf->end=last;
@@ -1378,87 +1707,153 @@ static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opco
 static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg_t *msg) {
   nchan_buf_and_chain_t *bc;
   ngx_file_t            *file_copy;
-  ngx_buf_t             *chained_msgbuf;
-  size_t                 sz = ngx_buf_size((msg->buf));
+  ngx_buf_t             *chained_msgbuf = NULL;
+  size_t                 sz;
+  u_char                 frame_opcode;
+  int                    compressed;
+  ngx_buf_t             *msgbuf;
+  compressed = fsub->deflate.enabled && msg->compressed && msg->compressed->compression == NCHAN_MSG_COMPRESSION_WEBSOCKET_PERMESSAGE_DEFLATE;
+
+  msgbuf = compressed ? &msg->compressed->buf : &msg->buf;
+  sz = ngx_buf_size(msgbuf);
+  
+  if(msg->content_type && nchan_ngx_str_match(msg->content_type, &binary_mimetype)) {
+    frame_opcode = compressed ? WEBSOCKET_BINARY_DEFLATED_LAST_FRAME_BYTE : WEBSOCKET_BINARY_LAST_FRAME_BYTE;
+  }
+  else {
+    frame_opcode = compressed ? WEBSOCKET_TEXT_DEFLATED_LAST_FRAME_BYTE : WEBSOCKET_TEXT_LAST_FRAME_BYTE;
+  }
+  
   if(fsub->ws_meta_subprotocol) {
-    static ngx_str_t          id_line = ngx_string("id: ");
-    static ngx_str_t          content_type_line = ngx_string("\ncontent-type: ");
-    static ngx_str_t          two_newlines = ngx_string("\n\n");
-    ngx_chain_t              *cur;
-    ngx_str_t                 msgid;
-    bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 4 + (msg->content_type.len > 0 ? 2 : 0));
-    cur = &bc->chain;
-    
-    // id: 
-    ngx_init_set_membuf(cur->buf, id_line.data, id_line.data + id_line.len);
-    sz += id_line.len;
-    cur = cur->next;
-    
-    //msgid value
-    msgid = nchan_subscriber_set_recyclable_msgid_str(fsub->ctx, &fsub->sub.last_msgid);
-    ngx_init_set_membuf(cur->buf, msgid.data, msgid.data + msgid.len);
-    sz += msgid.len;
-    cur = cur->next;
-    
-    if(msg->content_type.len > 0) {
-      // content-type: 
-      ngx_init_set_membuf(cur->buf, content_type_line.data, content_type_line.data + content_type_line.len);
-      sz += content_type_line.len;
+    if(!compressed) {
+      static ngx_str_t          id_line = ngx_string("id: ");
+      static ngx_str_t          content_type_line = ngx_string("\ncontent-type: ");
+      static ngx_str_t          two_newlines = ngx_string("\n\n");
+      ngx_chain_t              *cur;
+      ngx_str_t                 msgid;
+      bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 4 + (msg->content_type ? 2 : 0));
+      cur = &bc->chain;
+      
+      // id: 
+      ngx_init_set_membuf(cur->buf, id_line.data, id_line.data + id_line.len);
+      sz += id_line.len;
       cur = cur->next;
       
-      //content-type value
-      ngx_init_set_membuf(cur->buf, msg->content_type.data, msg->content_type.data + msg->content_type.len);
-      sz += msg->content_type.len;
+      //msgid value
+      msgid = nchan_subscriber_set_recyclable_msgid_str(fsub->ctx, &fsub->sub.last_msgid);
+      ngx_init_set_membuf(cur->buf, msgid.data, msgid.data + msgid.len);
+      sz += msgid.len;
       cur = cur->next;
+      
+      if(msg->content_type) {
+        // content-type: 
+        ngx_init_set_membuf(cur->buf, content_type_line.data, content_type_line.data + content_type_line.len);
+        sz += content_type_line.len;
+        cur = cur->next;
+        
+        //content-type value
+        ngx_init_set_membuf(cur->buf, msg->content_type->data, msg->content_type->data + msg->content_type->len);
+        sz += msg->content_type->len;
+        cur = cur->next;
+      }
+      
+      // \n\n
+      ngx_init_set_membuf(cur->buf, two_newlines.data, two_newlines.data + two_newlines.len);
+      sz += two_newlines.len;
+    
+    
+      if(ngx_buf_size(msgbuf) > 0) {
+        cur = cur->next;
+        //now the message
+        *cur->buf = *msgbuf;
+        chained_msgbuf = cur->buf;
+        assert(cur->next == NULL);
+      }
+      else {
+        cur->next = NULL;
+        cur->buf->last_in_chain = 1;
+        cur->buf->last_buf = 1;
+      }
+    }
+    else {
+#if (NGX_ZLIB)
+      u_char        ws_meta_header[512];
+      static u_char ws_meta_header_deflated[512];
+      ngx_chain_t  *cur;
+      u_char       *end;
+      ngx_str_t     ws_meta_header_str_in;
+      ngx_str_t     ws_meta_header_str_out;
+      
+      ws_meta_header_str_out.data = ws_meta_header_deflated;
+      ws_meta_header_str_out.len = 512;
+      
+      ngx_str_t     msgid = nchan_subscriber_set_recyclable_msgid_str(fsub->ctx, &fsub->sub.last_msgid);
+      if(msg->content_type) {
+        end = ngx_snprintf(ws_meta_header, 512, "id: %V\ncontent-type: %V\n\n", &msgid, msg->content_type);
+      }
+      else {
+        end = ngx_snprintf(ws_meta_header, 512, "id: %V\n\n", &msgid);
+      }
+      
+      ws_meta_header_str_in.data = ws_meta_header;
+      ws_meta_header_str_in.len = end - ws_meta_header;
+      
+      bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 2);
+      cur = &bc->chain;
+      
+      nchan_common_simple_deflate_raw_block(&ws_meta_header_str_in, &ws_meta_header_str_out);
+      
+      ngx_init_set_membuf(cur->buf, ws_meta_header_str_out.data, ws_meta_header_str_out.data + ws_meta_header_str_out.len);
+      sz += ws_meta_header_str_out.len;
+      cur = cur->next;
+      
+      //now the message
+      *cur->buf = *msgbuf;
+      chained_msgbuf = cur->buf;
+#endif
     }
-    
-    // \n\n
-    ngx_init_set_membuf(cur->buf, two_newlines.data, two_newlines.data + two_newlines.len);
-    sz += two_newlines.len;
-    cur = cur->next;
-    
-    //now the message
-    *cur->buf = *msg->buf;
-    chained_msgbuf = cur->buf;
-    assert(cur->next == NULL);
   }
   else {
     bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
     //message first
     chained_msgbuf = &bc->buf;
-    bc->buf = *msg->buf;
+    bc->buf = *msgbuf;
   }
   
-  if(msg->buf->file) {
+  if(chained_msgbuf && msgbuf->file) {
     file_copy = nchan_bufchain_pool_reserve_file(fsub->ctx->bcp);
     nchan_msg_buf_open_fd_if_needed(chained_msgbuf, file_copy, NULL);
   }
   
+  //DBG("opcode: %i, orig sz: %i compressed sz: %i", frame_opcode, ngx_buf_size((&msg->buf)), compressed ? ngx_buf_size(msgbuf) : 0);
   //now the header
-  return websocket_frame_header_chain(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, sz, &bc->chain);
+  return websocket_frame_header_chain(fsub, frame_opcode, sz, &bc->chain);
+}
+
+static ngx_int_t websocket_send_close_frame_cstr(full_subscriber_t *fsub, uint16_t code, const char *err) {
+  ngx_str_t errstr=ngx_string(err);
+  return websocket_send_close_frame(fsub, code, &errstr);
 }
 
 static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err) {
-  ws_output_filter(fsub, websocket_close_frame_chain(fsub, code, err));
-  fsub->connected = 0;
-  if(fsub->closing == 1) {
+  if(fsub->sent_close_frame == 1) {
     DBG("%p already sent close frame");
     websocket_finalize_request(fsub);
   }
   else {
-    fsub->closing = 1;
-    ngx_add_timer(&fsub->closing_ev, WEBSOCKET_CLOSING_TIMEOUT);
+    ws_output_filter(fsub, websocket_close_frame_chain(fsub, code, err));
+    fsub->sent_close_frame = 1;
+    ngx_add_timer(&fsub->closing_ev, fsub->received_close_frame ? 0 : WEBSOCKET_CLOSING_TIMEOUT);
   }
   return NGX_OK;
 }
 
 static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err) {
   nchan_buf_and_chain_t *bc; 
-  ngx_chain_t   *hdr_chain;
-  ngx_buf_t     *hdr_buf;
-  ngx_buf_t     *msg_buf;
-  ngx_str_t      alt_err;
-  uint16_t       code_net;
+  ngx_chain_t    *hdr_chain;
+  ngx_buf_t      *code_buf, *msg_buf;
+  ngx_str_t       alt_err;
+  static uint16_t code_net;
   
   if(err) {
     alt_err.data=err->data;
@@ -1474,30 +1869,43 @@ static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_
     return websocket_frame_header_chain(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL);
   }
   
-  if(code < 1000 || code > 1011) {
+  if(code < 1000 || code == 1005 || code == 1006 || code >= 5000) {
     ERR("invalid websocket close status code %i", code);
     code=CLOSE_NORMAL;
-  }
-  bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
-  msg_buf = &bc->buf;
-  init_msg_buf(msg_buf);
-  set_buf_to_str(msg_buf, err);
-  hdr_chain = websocket_frame_header_chain(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, err->len + 2, &bc->chain);
-  hdr_buf = hdr_chain->buf;
-  //there's definitely enough space at the end for 2 more bytes
-  code_net=htons(code);
-  hdr_buf->last = ngx_copy(hdr_buf->last, &code_net, 2);
-  hdr_buf->end = hdr_buf->last;
+  }  
+  bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, err->len > 0 ? 2 : 1);
   
+  code_buf = &bc->buf;
+  
+  init_buf(code_buf, err->len == 0);
+  code_net=htons(code);
+  code_buf->start = code_buf->pos = (u_char *)&code_net;
+  code_buf->last = code_buf->end = ngx_copy(code_buf->pos, &code_net, 2);
+  
+  if(err->len > 0) {
+    if(err->len > 123) {
+      ERR("websocket close frame reason string is too long (length %i)", err->len);
+      err->len = 123;
+    }
+    msg_buf = bc->chain.next->buf;
+    init_msg_buf(msg_buf);
+    set_buf_to_str(msg_buf, err);
+  }
 
+  
+  hdr_chain = websocket_frame_header_chain(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, err->len + 2, &bc->chain);
   return hdr_chain;
 }
 
 
 static ngx_int_t websocket_respond_message(subscriber_t *self, nchan_msg_t *msg) {
-  ngx_int_t        rc;
-  full_subscriber_t         *fsub = (full_subscriber_t *)self;
-  ensure_handshake(fsub);
+  ngx_int_t            rc;
+  full_subscriber_t   *fsub = (full_subscriber_t *)self;
+  if((rc = ensure_handshake(fsub)) != NGX_OK) {
+    return rc;
+  }
+  ngx_http_request_t *r = self->request;
+  r->header_only = 0;
   
   if(fsub->timeout_ev.timer_set) {
     ngx_del_timer(&fsub->timeout_ev);
@@ -1513,10 +1921,11 @@ static ngx_int_t websocket_respond_message(subscriber_t *self, nchan_msg_t *msg)
   return rc;
 }
 
-static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line) {
+static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
   static const ngx_str_t    STATUS_410=ngx_string("410 Channel Deleted");
   static const ngx_str_t    STATUS_403=ngx_string("403 Forbidden");
   static const ngx_str_t    STATUS_500=ngx_string("500 Internal Server Error");
+  static const ngx_str_t    STATUS_507=ngx_string("507 Insufficient Storage");
   static const ngx_str_t    empty=ngx_string("");
   u_char                    msgbuf[50];
   ngx_str_t                 custom_close_msg;
@@ -1531,28 +1940,38 @@ static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_c
   
   if(!fsub->shook_hands) {
     //still in HTTP land
-    return nchan_respond_status(fsub->sub.request, status_code, status_line, 0);
+    fsub->cln = NULL;
+    return nchan_respond_status(fsub->sub.request, status_code, status_line, status_body, 1);
   }
   
   switch(status_code) {
     case 410:
       close_code = CLOSE_GOING_AWAY;
+      fsub->sub.request->headers_out.status = NGX_HTTP_GONE;
       close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_410);
       break;
     case 403:
       close_code = CLOSE_POLICY_VIOLATION;
+      fsub->sub.request->headers_out.status = NGX_HTTP_FORBIDDEN;
       close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_403);
       break;
     case 500: 
       close_code = CLOSE_INTERNAL_SERVER_ERROR;
+      fsub->sub.request->headers_out.status = NGX_HTTP_INTERNAL_SERVER_ERROR;
       close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_500);
       break;
+    case 507: 
+      close_code = CLOSE_INTERNAL_SERVER_ERROR;
+      fsub->sub.request->headers_out.status = NGX_HTTP_INSUFFICIENT_STORAGE;
+      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_507);
+      break;
     default:
       if((status_code >= 400 && status_code < 600) || status_code == NGX_HTTP_NOT_MODIFIED) {
         custom_close_msg.data=msgbuf;
+        fsub->sub.request->headers_out.status = status_code;
         custom_close_msg.len = ngx_sprintf(msgbuf,"%i %v", status_code, (status_line ? status_line : &empty)) - msgbuf;
         close_msg = &custom_close_msg;
-        close_code = CLOSE_NORMAL;
+        close_code = status_code >=500 && status_code <= 599 ? CLOSE_INTERNAL_SERVER_ERROR : CLOSE_NORMAL;
       }
       else {
         ERR("unhandled code %i, %v", status_code, (status_line ? status_line : &empty));
@@ -1585,6 +2004,12 @@ ngx_int_t nchan_detect_websocket_request(ngx_http_request_t *r) {
   return 1;
 }
 
+ngx_int_t websocket_intercept_published_message(subscriber_t *sub, void (*interceptor)(subscriber_t *, nchan_msg_t *)) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
+  fsub->publisher.intercept = interceptor;
+  return NGX_OK;
+}
+
 static const subscriber_fn_t websocket_fn = {
   &websocket_enqueue,
   &websocket_dequeue,
@@ -1607,12 +2032,13 @@ static const subscriber_t new_websocket_sub = {
   NCHAN_ZERO_MSGID,
   NULL,
   NULL,
+  NULL,
   0, //reserved
+  1, //enable sub/unsub callbacks
   0, //deque after response
   1, //destroy after dequeue
   0, //enqueued
 #if NCHAN_SUBSCRIBER_LEAK_DEBUG
-  NULL,
-  NULL
+  NULL, NULL, NULL
 #endif
 };
diff --git a/debian/modules/nchan/src/subscribers/websocket.h b/debian/modules/nchan/src/subscribers/websocket.h
index ff15b24..034b0b5 100644
--- a/debian/modules/nchan/src/subscribers/websocket.h
+++ b/debian/modules/nchan/src/subscribers/websocket.h
@@ -1,4 +1,5 @@
 subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
 ngx_int_t websocket_subscriber_destroy(subscriber_t *sub);
+ngx_int_t websocket_intercept_published_message(subscriber_t *sub, void (*)(subscriber_t *, nchan_msg_t *));
 
-ngx_int_t nchan_detect_websocket_request(ngx_http_request_t *r);
\ No newline at end of file
+ngx_int_t nchan_detect_websocket_request(ngx_http_request_t *r);
diff --git a/debian/modules/nchan/src/uthash.h b/debian/modules/nchan/src/uthash.h
index 375f9e4..91db592 100644
--- a/debian/modules/nchan/src/uthash.h
+++ b/debian/modules/nchan/src/uthash.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2014, Troy D. Hanson     http://troydhanson.github.com/uthash/
+Copyright (c) 2003-2017, Troy D. Hanson     http://troydhanson.github.com/uthash/
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -22,59 +22,78 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef UTHASH_H
-#define UTHASH_H 
+#define UTHASH_H
 
-#include <string.h>   /* memcmp,strlen */
+#define UTHASH_VERSION 2.0.2
+
+#include <string.h>   /* memcmp, memset, strlen */
 #include <stddef.h>   /* ptrdiff_t */
-#include <stdlib.h>   /* exit() */
+#include <stdlib.h>   /* exit */
 
 /* These macros use decltype or the earlier __typeof GNU extension.
    As decltype is only available in newer compilers (VS2010 or gcc 4.3+
    when compiling c++ source) this code uses whatever method is needed
    or, for VS2008 where neither is available, uses casting workarounds. */
-#ifdef _MSC_VER         /* MS compiler */
+#if !defined(DECLTYPE) && !defined(NO_DECLTYPE)
+#if defined(_MSC_VER)   /* MS compiler */
 #if _MSC_VER >= 1600 && defined(__cplusplus)  /* VS2010 or newer in C++ mode */
 #define DECLTYPE(x) (decltype(x))
 #else                   /* VS2008 or older (or VS2010 in C mode) */
 #define NO_DECLTYPE
-#define DECLTYPE(x)
 #endif
+#elif defined(__BORLANDC__) || defined(__ICCARM__) || defined(__LCC__) || defined(__WATCOMC__)
+#define NO_DECLTYPE
 #else                   /* GNU, Sun and other compilers */
 #define DECLTYPE(x) (__typeof(x))
 #endif
+#endif
 
 #ifdef NO_DECLTYPE
+#define DECLTYPE(x)
 #define DECLTYPE_ASSIGN(dst,src)                                                 \
 do {                                                                             \
   char **_da_dst = (char**)(&(dst));                                             \
   *_da_dst = (char*)(src);                                                       \
-} while(0)
-#else 
+} while (0)
+#else
 #define DECLTYPE_ASSIGN(dst,src)                                                 \
 do {                                                                             \
   (dst) = DECLTYPE(dst)(src);                                                    \
-} while(0)
+} while (0)
 #endif
 
-/* a number of the hash function use uint32_t which isn't defined on win32 */
-#ifdef _MSC_VER
+/* a number of the hash function use uint32_t which isn't defined on Pre VS2010 */
+#if defined(_WIN32)
+#if defined(_MSC_VER) && _MSC_VER >= 1600
+#include <stdint.h>
+#elif defined(__WATCOMC__) || defined(__MINGW32__) || defined(__CYGWIN__)
+#include <stdint.h>
+#else
 typedef unsigned int uint32_t;
 typedef unsigned char uint8_t;
+#endif
+#elif defined(__GNUC__) && !defined(__VXWORKS__)
+#include <stdint.h>
 #else
-#include <inttypes.h>   /* uint32_t */
+typedef unsigned int uint32_t;
+typedef unsigned char uint8_t;
 #endif
 
-#define UTHASH_VERSION 1.9.9
-
-#ifndef uthash_fatal
-#define uthash_fatal(msg) exit(-1)        /* fatal error (out of memory,etc) */
-#endif
 #ifndef uthash_malloc
 #define uthash_malloc(sz) malloc(sz)      /* malloc fcn                      */
 #endif
 #ifndef uthash_free
 #define uthash_free(ptr,sz) free(ptr)     /* free fcn                        */
 #endif
+#ifndef uthash_bzero
+#define uthash_bzero(a,n) memset(a,'\0',n)
+#endif
+#ifndef uthash_memcmp
+#define uthash_memcmp(a,b,n) memcmp(a,b,n)
+#endif
+#ifndef uthash_strlen
+#define uthash_strlen(s) strlen(s)
+#endif
 
 #ifndef uthash_noexpand_fyi
 #define uthash_noexpand_fyi(tbl)          /* can be defined to log noexpand  */
@@ -83,122 +102,335 @@ typedef unsigned char uint8_t;
 #define uthash_expand_fyi(tbl)            /* can be defined to log expands   */
 #endif
 
+#ifndef HASH_NONFATAL_OOM
+#define HASH_NONFATAL_OOM 0
+#endif
+
+#if HASH_NONFATAL_OOM
+/* malloc failures can be recovered from */
+
+#ifndef uthash_nonfatal_oom
+#define uthash_nonfatal_oom(obj) do {} while (0)    /* non-fatal OOM error */
+#endif
+
+#define HASH_RECORD_OOM(oomed) do { (oomed) = 1; } while (0)
+#define IF_HASH_NONFATAL_OOM(x) x
+
+#else
+/* malloc failures result in lost memory, hash tables are unusable */
+
+#ifndef uthash_fatal
+#define uthash_fatal(msg) exit(-1)        /* fatal OOM error */
+#endif
+
+#define HASH_RECORD_OOM(oomed) uthash_fatal("out of memory")
+#define IF_HASH_NONFATAL_OOM(x)
+
+#endif
+
 /* initial number of buckets */
-#define HASH_INITIAL_NUM_BUCKETS 32      /* initial number of buckets        */
-#define HASH_INITIAL_NUM_BUCKETS_LOG2 5  /* lg2 of initial number of buckets */
-#define HASH_BKT_CAPACITY_THRESH 10      /* expand when bucket count reaches */
+#define HASH_INITIAL_NUM_BUCKETS 32U     /* initial number of buckets        */
+#define HASH_INITIAL_NUM_BUCKETS_LOG2 5U /* lg2 of initial number of buckets */
+#define HASH_BKT_CAPACITY_THRESH 10U     /* expand when bucket count reaches */
 
-/* calculate the element whose hash handle address is hhe */
+/* calculate the element whose hash handle address is hhp */
 #define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho)))
+/* calculate the hash handle from element address elp */
+#define HH_FROM_ELMT(tbl,elp) ((UT_hash_handle *)(((char*)(elp)) + ((tbl)->hho)))
 
-#define HASH_FIND(hh,head,keyptr,keylen,out)                                     \
+#define HASH_ROLLBACK_BKT(hh, head, itemptrhh)                                   \
 do {                                                                             \
-  unsigned _hf_bkt,_hf_hashv;                                                    \
-  out=NULL;                                                                      \
+  struct UT_hash_handle *_hd_hh_item = (itemptrhh);                              \
+  unsigned _hd_bkt;                                                              \
+  HASH_TO_BKT(_hd_hh_item->hashv, (head)->hh.tbl->num_buckets, _hd_bkt);         \
+  (head)->hh.tbl->buckets[_hd_bkt].count++;                                      \
+  _hd_hh_item->hh_next = NULL;                                                   \
+  _hd_hh_item->hh_prev = NULL;                                                   \
+} while (0)
+
+#define HASH_VALUE(keyptr,keylen,hashv)                                          \
+do {                                                                             \
+  HASH_FCN(keyptr, keylen, hashv);                                               \
+} while (0)
+
+#define HASH_FIND_BYHASHVALUE(hh,head,keyptr,keylen,hashval,out)                 \
+do {                                                                             \
+  (out) = NULL;                                                                  \
   if (head) {                                                                    \
-     HASH_FCN(keyptr,keylen, (head)->hh.tbl->num_buckets, _hf_hashv, _hf_bkt);   \
-     if (HASH_BLOOM_TEST((head)->hh.tbl, _hf_hashv)) {                           \
-       HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ],  \
-                        keyptr,keylen,out);                                      \
-     }                                                                           \
+    unsigned _hf_bkt;                                                            \
+    HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _hf_bkt);                  \
+    if (HASH_BLOOM_TEST((head)->hh.tbl, hashval) != 0) {                         \
+      HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ], keyptr, keylen, hashval, out); \
+    }                                                                            \
   }                                                                              \
 } while (0)
 
+#define HASH_FIND(hh,head,keyptr,keylen,out)                                     \
+do {                                                                             \
+  unsigned _hf_hashv;                                                            \
+  HASH_VALUE(keyptr, keylen, _hf_hashv);                                         \
+  HASH_FIND_BYHASHVALUE(hh, head, keyptr, keylen, _hf_hashv, out);               \
+} while (0)
+
 #ifdef HASH_BLOOM
-#define HASH_BLOOM_BITLEN (1ULL << HASH_BLOOM)
-#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8) + ((HASH_BLOOM_BITLEN%8) ? 1:0)
-#define HASH_BLOOM_MAKE(tbl)                                                     \
+#define HASH_BLOOM_BITLEN (1UL << HASH_BLOOM)
+#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8UL) + (((HASH_BLOOM_BITLEN%8UL)!=0UL) ? 1UL : 0UL)
+#define HASH_BLOOM_MAKE(tbl,oomed)                                               \
 do {                                                                             \
   (tbl)->bloom_nbits = HASH_BLOOM;                                               \
   (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN);                 \
-  if (!((tbl)->bloom_bv))  { uthash_fatal( "out of memory"); }                   \
-  memset((tbl)->bloom_bv, 0, HASH_BLOOM_BYTELEN);                                \
-  (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE;                                       \
-} while (0) 
+  if (!(tbl)->bloom_bv) {                                                        \
+    HASH_RECORD_OOM(oomed);                                                      \
+  } else {                                                                       \
+    uthash_bzero((tbl)->bloom_bv, HASH_BLOOM_BYTELEN);                           \
+    (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE;                                     \
+  }                                                                              \
+} while (0)
 
 #define HASH_BLOOM_FREE(tbl)                                                     \
 do {                                                                             \
   uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN);                              \
-} while (0) 
+} while (0)
 
-#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8] |= (1U << ((idx)%8)))
-#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8] & (1U << ((idx)%8)))
+#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8U] |= (1U << ((idx)%8U)))
+#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8U] & (1U << ((idx)%8U)))
 
 #define HASH_BLOOM_ADD(tbl,hashv)                                                \
-  HASH_BLOOM_BITSET((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1)))
+  HASH_BLOOM_BITSET((tbl)->bloom_bv, (hashv & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U)))
 
 #define HASH_BLOOM_TEST(tbl,hashv)                                               \
-  HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1)))
+  HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U)))
 
 #else
-#define HASH_BLOOM_MAKE(tbl) 
-#define HASH_BLOOM_FREE(tbl) 
-#define HASH_BLOOM_ADD(tbl,hashv) 
+#define HASH_BLOOM_MAKE(tbl,oomed)
+#define HASH_BLOOM_FREE(tbl)
+#define HASH_BLOOM_ADD(tbl,hashv)
 #define HASH_BLOOM_TEST(tbl,hashv) (1)
-#define HASH_BLOOM_BYTELEN 0
+#define HASH_BLOOM_BYTELEN 0U
 #endif
 
-#define HASH_MAKE_TABLE(hh,head)                                                 \
+#define HASH_MAKE_TABLE(hh,head,oomed)                                           \
 do {                                                                             \
-  (head)->hh.tbl = (UT_hash_table*)uthash_malloc(                                \
-                  sizeof(UT_hash_table));                                        \
-  if (!((head)->hh.tbl))  { uthash_fatal( "out of memory"); }                    \
-  memset((head)->hh.tbl, 0, sizeof(UT_hash_table));                              \
-  (head)->hh.tbl->tail = &((head)->hh);                                          \
-  (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS;                        \
-  (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2;              \
-  (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head);                    \
-  (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc(                      \
-          HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));               \
-  if (! (head)->hh.tbl->buckets) { uthash_fatal( "out of memory"); }             \
-  memset((head)->hh.tbl->buckets, 0,                                             \
-          HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));               \
-  HASH_BLOOM_MAKE((head)->hh.tbl);                                               \
-  (head)->hh.tbl->signature = HASH_SIGNATURE;                                    \
-} while(0)
+  (head)->hh.tbl = (UT_hash_table*)uthash_malloc(sizeof(UT_hash_table));         \
+  if (!(head)->hh.tbl) {                                                         \
+    HASH_RECORD_OOM(oomed);                                                      \
+  } else {                                                                       \
+    uthash_bzero((head)->hh.tbl, sizeof(UT_hash_table));                         \
+    (head)->hh.tbl->tail = &((head)->hh);                                        \
+    (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS;                      \
+    (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2;            \
+    (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head);                  \
+    (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc(                    \
+        HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket));               \
+    (head)->hh.tbl->signature = HASH_SIGNATURE;                                  \
+    if (!(head)->hh.tbl->buckets) {                                              \
+      HASH_RECORD_OOM(oomed);                                                    \
+      uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                        \
+    } else {                                                                     \
+      uthash_bzero((head)->hh.tbl->buckets,                                      \
+          HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket));             \
+      HASH_BLOOM_MAKE((head)->hh.tbl, oomed);                                    \
+      IF_HASH_NONFATAL_OOM(                                                      \
+        if (oomed) {                                                             \
+          uthash_free((head)->hh.tbl->buckets,                                   \
+              HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));           \
+          uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                    \
+        }                                                                        \
+      )                                                                          \
+    }                                                                            \
+  }                                                                              \
+} while (0)
 
-#define HASH_ADD(hh,head,fieldname,keylen_in,add)                                \
-        HASH_ADD_KEYPTR(hh,head,&((add)->fieldname),keylen_in,add)
+#define HASH_REPLACE_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,replaced,cmpfcn) \
+do {                                                                             \
+  (replaced) = NULL;                                                             \
+  HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \
+  if (replaced) {                                                                \
+    HASH_DELETE(hh, head, replaced);                                             \
+  }                                                                              \
+  HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn); \
+} while (0)
+
+#define HASH_REPLACE_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add,replaced) \
+do {                                                                             \
+  (replaced) = NULL;                                                             \
+  HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \
+  if (replaced) {                                                                \
+    HASH_DELETE(hh, head, replaced);                                             \
+  }                                                                              \
+  HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add); \
+} while (0)
 
 #define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced)                   \
 do {                                                                             \
-  replaced=NULL;                                                                 \
-  HASH_FIND(hh,head,&((add)->fieldname),keylen_in,replaced);                     \
-  if (replaced!=NULL) {                                                          \
-     HASH_DELETE(hh,head,replaced);                                              \
-  };                                                                             \
-  HASH_ADD(hh,head,fieldname,keylen_in,add);                                     \
-} while(0)
- 
+  unsigned _hr_hashv;                                                            \
+  HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv);                         \
+  HASH_REPLACE_BYHASHVALUE(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced); \
+} while (0)
+
+#define HASH_REPLACE_INORDER(hh,head,fieldname,keylen_in,add,replaced,cmpfcn)    \
+do {                                                                             \
+  unsigned _hr_hashv;                                                            \
+  HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv);                         \
+  HASH_REPLACE_BYHASHVALUE_INORDER(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced, cmpfcn); \
+} while (0)
+
+#define HASH_APPEND_LIST(hh, head, add)                                          \
+do {                                                                             \
+  (add)->hh.next = NULL;                                                         \
+  (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail);           \
+  (head)->hh.tbl->tail->next = (add);                                            \
+  (head)->hh.tbl->tail = &((add)->hh);                                           \
+} while (0)
+
+#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn)                                 \
+do {                                                                             \
+  do {                                                                           \
+    if (cmpfcn(DECLTYPE(head)(_hs_iter), add) > 0) {                             \
+      break;                                                                     \
+    }                                                                            \
+  } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next));           \
+} while (0)
+
+#ifdef NO_DECLTYPE
+#undef HASH_AKBI_INNER_LOOP
+#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn)                                 \
+do {                                                                             \
+  char *_hs_saved_head = (char*)(head);                                          \
+  do {                                                                           \
+    DECLTYPE_ASSIGN(head, _hs_iter);                                             \
+    if (cmpfcn(head, add) > 0) {                                                 \
+      DECLTYPE_ASSIGN(head, _hs_saved_head);                                     \
+      break;                                                                     \
+    }                                                                            \
+    DECLTYPE_ASSIGN(head, _hs_saved_head);                                       \
+  } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next));           \
+} while (0)
+#endif
+
+#if HASH_NONFATAL_OOM
+
+#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed)            \
+do {                                                                             \
+  if (!(oomed)) {                                                                \
+    unsigned _ha_bkt;                                                            \
+    (head)->hh.tbl->num_items++;                                                 \
+    HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt);                  \
+    HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed);    \
+    if (oomed) {                                                                 \
+      HASH_ROLLBACK_BKT(hh, head, &(add)->hh);                                   \
+      HASH_DELETE_HH(hh, head, &(add)->hh);                                      \
+      (add)->hh.tbl = NULL;                                                      \
+      uthash_nonfatal_oom(add);                                                  \
+    } else {                                                                     \
+      HASH_BLOOM_ADD((head)->hh.tbl, hashval);                                   \
+      HASH_EMIT_KEY(hh, head, keyptr, keylen_in);                                \
+    }                                                                            \
+  } else {                                                                       \
+    (add)->hh.tbl = NULL;                                                        \
+    uthash_nonfatal_oom(add);                                                    \
+  }                                                                              \
+} while (0)
+
+#else
+
+#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed)            \
+do {                                                                             \
+  unsigned _ha_bkt;                                                              \
+  (head)->hh.tbl->num_items++;                                                   \
+  HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt);                    \
+  HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed);      \
+  HASH_BLOOM_ADD((head)->hh.tbl, hashval);                                       \
+  HASH_EMIT_KEY(hh, head, keyptr, keylen_in);                                    \
+} while (0)
+
+#endif
+
+
+#define HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh,head,keyptr,keylen_in,hashval,add,cmpfcn) \
+do {                                                                             \
+  IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; )                                     \
+  (add)->hh.hashv = (hashval);                                                   \
+  (add)->hh.key = (char*) (keyptr);                                              \
+  (add)->hh.keylen = (unsigned) (keylen_in);                                     \
+  if (!(head)) {                                                                 \
+    (add)->hh.next = NULL;                                                       \
+    (add)->hh.prev = NULL;                                                       \
+    HASH_MAKE_TABLE(hh, add, _ha_oomed);                                         \
+    IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { )                                    \
+      (head) = (add);                                                            \
+    IF_HASH_NONFATAL_OOM( } )                                                    \
+  } else {                                                                       \
+    void *_hs_iter = (head);                                                     \
+    (add)->hh.tbl = (head)->hh.tbl;                                              \
+    HASH_AKBI_INNER_LOOP(hh, head, add, cmpfcn);                                 \
+    if (_hs_iter) {                                                              \
+      (add)->hh.next = _hs_iter;                                                 \
+      if (((add)->hh.prev = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev)) {     \
+        HH_FROM_ELMT((head)->hh.tbl, (add)->hh.prev)->next = (add);              \
+      } else {                                                                   \
+        (head) = (add);                                                          \
+      }                                                                          \
+      HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev = (add);                      \
+    } else {                                                                     \
+      HASH_APPEND_LIST(hh, head, add);                                           \
+    }                                                                            \
+  }                                                                              \
+  HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed);       \
+  HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE_INORDER");                    \
+} while (0)
+
+#define HASH_ADD_KEYPTR_INORDER(hh,head,keyptr,keylen_in,add,cmpfcn)             \
+do {                                                                             \
+  unsigned _hs_hashv;                                                            \
+  HASH_VALUE(keyptr, keylen_in, _hs_hashv);                                      \
+  HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, keyptr, keylen_in, _hs_hashv, add, cmpfcn); \
+} while (0)
+
+#define HASH_ADD_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,cmpfcn) \
+  HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn)
+
+#define HASH_ADD_INORDER(hh,head,fieldname,keylen_in,add,cmpfcn)                 \
+  HASH_ADD_KEYPTR_INORDER(hh, head, &((add)->fieldname), keylen_in, add, cmpfcn)
+
+#define HASH_ADD_KEYPTR_BYHASHVALUE(hh,head,keyptr,keylen_in,hashval,add)        \
+do {                                                                             \
+  IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; )                                     \
+  (add)->hh.hashv = (hashval);                                                   \
+  (add)->hh.key = (char*) (keyptr);                                              \
+  (add)->hh.keylen = (unsigned) (keylen_in);                                     \
+  if (!(head)) {                                                                 \
+    (add)->hh.next = NULL;                                                       \
+    (add)->hh.prev = NULL;                                                       \
+    HASH_MAKE_TABLE(hh, add, _ha_oomed);                                         \
+    IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { )                                    \
+      (head) = (add);                                                            \
+    IF_HASH_NONFATAL_OOM( } )                                                    \
+  } else {                                                                       \
+    (add)->hh.tbl = (head)->hh.tbl;                                              \
+    HASH_APPEND_LIST(hh, head, add);                                             \
+  }                                                                              \
+  HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed);       \
+  HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE");                            \
+} while (0)
+
 #define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add)                            \
 do {                                                                             \
- unsigned _ha_bkt;                                                               \
- (add)->hh.next = NULL;                                                          \
- (add)->hh.key = (char*)(keyptr);                                                \
- (add)->hh.keylen = (unsigned)(keylen_in);                                       \
- if (!(head)) {                                                                  \
-    head = (add);                                                                \
-    (head)->hh.prev = NULL;                                                      \
-    HASH_MAKE_TABLE(hh,head);                                                    \
- } else {                                                                        \
-    (head)->hh.tbl->tail->next = (add);                                          \
-    (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail);         \
-    (head)->hh.tbl->tail = &((add)->hh);                                         \
- }                                                                               \
- (head)->hh.tbl->num_items++;                                                    \
- (add)->hh.tbl = (head)->hh.tbl;                                                 \
- HASH_FCN(keyptr,keylen_in, (head)->hh.tbl->num_buckets,                         \
-         (add)->hh.hashv, _ha_bkt);                                              \
- HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt],&(add)->hh);                   \
- HASH_BLOOM_ADD((head)->hh.tbl,(add)->hh.hashv);                                 \
- HASH_EMIT_KEY(hh,head,keyptr,keylen_in);                                        \
- HASH_FSCK(hh,head);                                                             \
-} while(0)
+  unsigned _ha_hashv;                                                            \
+  HASH_VALUE(keyptr, keylen_in, _ha_hashv);                                      \
+  HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, keyptr, keylen_in, _ha_hashv, add);      \
+} while (0)
 
-#define HASH_TO_BKT( hashv, num_bkts, bkt )                                      \
+#define HASH_ADD_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add)            \
+  HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add)
+
+#define HASH_ADD(hh,head,fieldname,keylen_in,add)                                \
+  HASH_ADD_KEYPTR(hh, head, &((add)->fieldname), keylen_in, add)
+
+#define HASH_TO_BKT(hashv,num_bkts,bkt)                                          \
 do {                                                                             \
-  bkt = ((hashv) & ((num_bkts) - 1));                                            \
-} while(0)
+  bkt = ((hashv) & ((num_bkts) - 1U));                                           \
+} while (0)
 
 /* delete "delptr" from the hash table.
  * "the usual" patch-up process for the app-order doubly-linked-list.
@@ -213,48 +445,44 @@ do {
  * scratch pointer rather than through the repointed (users) symbol.
  */
 #define HASH_DELETE(hh,head,delptr)                                              \
-do {                                                                             \
-    unsigned _hd_bkt;                                                            \
-    struct UT_hash_handle *_hd_hh_del;                                           \
-    if ( ((delptr)->hh.prev == NULL) && ((delptr)->hh.next == NULL) )  {         \
-        uthash_free((head)->hh.tbl->buckets,                                     \
-                    (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \
-        HASH_BLOOM_FREE((head)->hh.tbl);                                         \
-        uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                      \
-        head = NULL;                                                             \
-    } else {                                                                     \
-        _hd_hh_del = &((delptr)->hh);                                            \
-        if ((delptr) == ELMT_FROM_HH((head)->hh.tbl,(head)->hh.tbl->tail)) {     \
-            (head)->hh.tbl->tail =                                               \
-                (UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) +               \
-                (head)->hh.tbl->hho);                                            \
-        }                                                                        \
-        if ((delptr)->hh.prev) {                                                 \
-            ((UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) +                  \
-                    (head)->hh.tbl->hho))->next = (delptr)->hh.next;             \
-        } else {                                                                 \
-            DECLTYPE_ASSIGN(head,(delptr)->hh.next);                             \
-        }                                                                        \
-        if (_hd_hh_del->next) {                                                  \
-            ((UT_hash_handle*)((ptrdiff_t)_hd_hh_del->next +                     \
-                    (head)->hh.tbl->hho))->prev =                                \
-                    _hd_hh_del->prev;                                            \
-        }                                                                        \
-        HASH_TO_BKT( _hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt);   \
-        HASH_DEL_IN_BKT(hh,(head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del);        \
-        (head)->hh.tbl->num_items--;                                             \
-    }                                                                            \
-    HASH_FSCK(hh,head);                                                          \
-} while (0)
+    HASH_DELETE_HH(hh, head, &(delptr)->hh)
 
+#define HASH_DELETE_HH(hh,head,delptrhh)                                         \
+do {                                                                             \
+  struct UT_hash_handle *_hd_hh_del = (delptrhh);                                \
+  if ((_hd_hh_del->prev == NULL) && (_hd_hh_del->next == NULL)) {                \
+    HASH_BLOOM_FREE((head)->hh.tbl);                                             \
+    uthash_free((head)->hh.tbl->buckets,                                         \
+                (head)->hh.tbl->num_buckets * sizeof(struct UT_hash_bucket));    \
+    uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                          \
+    (head) = NULL;                                                               \
+  } else {                                                                       \
+    unsigned _hd_bkt;                                                            \
+    if (_hd_hh_del == (head)->hh.tbl->tail) {                                    \
+      (head)->hh.tbl->tail = HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev);     \
+    }                                                                            \
+    if (_hd_hh_del->prev != NULL) {                                              \
+      HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev)->next = _hd_hh_del->next;   \
+    } else {                                                                     \
+      DECLTYPE_ASSIGN(head, _hd_hh_del->next);                                   \
+    }                                                                            \
+    if (_hd_hh_del->next != NULL) {                                              \
+      HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->next)->prev = _hd_hh_del->prev;   \
+    }                                                                            \
+    HASH_TO_BKT(_hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt);        \
+    HASH_DEL_IN_BKT((head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del);               \
+    (head)->hh.tbl->num_items--;                                                 \
+  }                                                                              \
+  HASH_FSCK(hh, head, "HASH_DELETE_HH");                                         \
+} while (0)
 
 /* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
 #define HASH_FIND_STR(head,findstr,out)                                          \
-    HASH_FIND(hh,head,findstr,strlen(findstr),out)
+    HASH_FIND(hh,head,findstr,(unsigned)uthash_strlen(findstr),out)
 #define HASH_ADD_STR(head,strfield,add)                                          \
-    HASH_ADD(hh,head,strfield[0],strlen(add->strfield),add)
+    HASH_ADD(hh,head,strfield[0],(unsigned)uthash_strlen(add->strfield),add)
 #define HASH_REPLACE_STR(head,strfield,add,replaced)                             \
-    HASH_REPLACE(hh,head,strfield[0],strlen(add->strfield),add,replaced)
+    HASH_REPLACE(hh,head,strfield[0],(unsigned)uthash_strlen(add->strfield),add,replaced)
 #define HASH_FIND_INT(head,findint,out)                                          \
     HASH_FIND(hh,head,findint,sizeof(int),out)
 #define HASH_ADD_INT(head,intfield,add)                                          \
@@ -275,120 +503,118 @@ do {
  */
 #ifdef HASH_DEBUG
 #define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
-#define HASH_FSCK(hh,head)                                                       \
+#define HASH_FSCK(hh,head,where)                                                 \
 do {                                                                             \
+  struct UT_hash_handle *_thh;                                                   \
+  if (head) {                                                                    \
     unsigned _bkt_i;                                                             \
-    unsigned _count, _bkt_count;                                                 \
+    unsigned _count = 0;                                                         \
     char *_prev;                                                                 \
-    struct UT_hash_handle *_thh;                                                 \
-    if (head) {                                                                  \
-        _count = 0;                                                              \
-        for( _bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; _bkt_i++) {       \
-            _bkt_count = 0;                                                      \
-            _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head;                      \
-            _prev = NULL;                                                        \
-            while (_thh) {                                                       \
-               if (_prev != (char*)(_thh->hh_prev)) {                            \
-                   HASH_OOPS("invalid hh_prev %p, actual %p\n",                  \
-                    _thh->hh_prev, _prev );                                      \
-               }                                                                 \
-               _bkt_count++;                                                     \
-               _prev = (char*)(_thh);                                            \
-               _thh = _thh->hh_next;                                             \
-            }                                                                    \
-            _count += _bkt_count;                                                \
-            if ((head)->hh.tbl->buckets[_bkt_i].count !=  _bkt_count) {          \
-               HASH_OOPS("invalid bucket count %d, actual %d\n",                 \
-                (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count);              \
-            }                                                                    \
-        }                                                                        \
-        if (_count != (head)->hh.tbl->num_items) {                               \
-            HASH_OOPS("invalid hh item count %d, actual %d\n",                   \
-                (head)->hh.tbl->num_items, _count );                             \
-        }                                                                        \
-        /* traverse hh in app order; check next/prev integrity, count */         \
-        _count = 0;                                                              \
-        _prev = NULL;                                                            \
-        _thh =  &(head)->hh;                                                     \
-        while (_thh) {                                                           \
-           _count++;                                                             \
-           if (_prev !=(char*)(_thh->prev)) {                                    \
-              HASH_OOPS("invalid prev %p, actual %p\n",                          \
-                    _thh->prev, _prev );                                         \
-           }                                                                     \
-           _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh);                    \
-           _thh = ( _thh->next ?  (UT_hash_handle*)((char*)(_thh->next) +        \
-                                  (head)->hh.tbl->hho) : NULL );                 \
-        }                                                                        \
-        if (_count != (head)->hh.tbl->num_items) {                               \
-            HASH_OOPS("invalid app item count %d, actual %d\n",                  \
-                (head)->hh.tbl->num_items, _count );                             \
+    for (_bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; ++_bkt_i) {           \
+      unsigned _bkt_count = 0;                                                   \
+      _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head;                            \
+      _prev = NULL;                                                              \
+      while (_thh) {                                                             \
+        if (_prev != (char*)(_thh->hh_prev)) {                                   \
+          HASH_OOPS("%s: invalid hh_prev %p, actual %p\n",                       \
+              (where), (void*)_thh->hh_prev, (void*)_prev);                      \
         }                                                                        \
+        _bkt_count++;                                                            \
+        _prev = (char*)(_thh);                                                   \
+        _thh = _thh->hh_next;                                                    \
+      }                                                                          \
+      _count += _bkt_count;                                                      \
+      if ((head)->hh.tbl->buckets[_bkt_i].count !=  _bkt_count) {                \
+        HASH_OOPS("%s: invalid bucket count %u, actual %u\n",                    \
+            (where), (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count);         \
+      }                                                                          \
     }                                                                            \
+    if (_count != (head)->hh.tbl->num_items) {                                   \
+      HASH_OOPS("%s: invalid hh item count %u, actual %u\n",                     \
+          (where), (head)->hh.tbl->num_items, _count);                           \
+    }                                                                            \
+    _count = 0;                                                                  \
+    _prev = NULL;                                                                \
+    _thh =  &(head)->hh;                                                         \
+    while (_thh) {                                                               \
+      _count++;                                                                  \
+      if (_prev != (char*)_thh->prev) {                                          \
+        HASH_OOPS("%s: invalid prev %p, actual %p\n",                            \
+            (where), (void*)_thh->prev, (void*)_prev);                           \
+      }                                                                          \
+      _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh);                         \
+      _thh = (_thh->next ? HH_FROM_ELMT((head)->hh.tbl, _thh->next) : NULL);     \
+    }                                                                            \
+    if (_count != (head)->hh.tbl->num_items) {                                   \
+      HASH_OOPS("%s: invalid app item count %u, actual %u\n",                    \
+          (where), (head)->hh.tbl->num_items, _count);                           \
+    }                                                                            \
+  }                                                                              \
 } while (0)
 #else
-#define HASH_FSCK(hh,head) 
+#define HASH_FSCK(hh,head,where)
 #endif
 
-/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to 
+/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to
  * the descriptor to which this macro is defined for tuning the hash function.
  * The app can #include <unistd.h> to get the prototype for write(2). */
 #ifdef HASH_EMIT_KEYS
 #define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                                   \
 do {                                                                             \
-    unsigned _klen = fieldlen;                                                   \
-    write(HASH_EMIT_KEYS, &_klen, sizeof(_klen));                                \
-    write(HASH_EMIT_KEYS, keyptr, fieldlen);                                     \
+  unsigned _klen = fieldlen;                                                     \
+  write(HASH_EMIT_KEYS, &_klen, sizeof(_klen));                                  \
+  write(HASH_EMIT_KEYS, keyptr, (unsigned long)fieldlen);                        \
 } while (0)
-#else 
-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                    
+#else
+#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)
 #endif
 
 /* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */
-#ifdef HASH_FUNCTION 
+#ifdef HASH_FUNCTION
 #define HASH_FCN HASH_FUNCTION
 #else
 #define HASH_FCN HASH_JEN
 #endif
 
 /* The Bernstein hash function, used in Perl prior to v5.6. Note (x<<5+x)=x*33. */
-#define HASH_BER(key,keylen,num_bkts,hashv,bkt)                                  \
+#define HASH_BER(key,keylen,hashv)                                               \
 do {                                                                             \
-  unsigned _hb_keylen=keylen;                                                    \
-  char *_hb_key=(char*)(key);                                                    \
+  unsigned _hb_keylen = (unsigned)keylen;                                        \
+  const unsigned char *_hb_key = (const unsigned char*)(key);                    \
   (hashv) = 0;                                                                   \
-  while (_hb_keylen--)  { (hashv) = (((hashv) << 5) + (hashv)) + *_hb_key++; }   \
-  bkt = (hashv) & (num_bkts-1);                                                  \
+  while (_hb_keylen-- != 0U) {                                                   \
+    (hashv) = (((hashv) << 5) + (hashv)) + *_hb_key++;                           \
+  }                                                                              \
 } while (0)
 
 
-/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at 
+/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at
  * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */
-#define HASH_SAX(key,keylen,num_bkts,hashv,bkt)                                  \
+#define HASH_SAX(key,keylen,hashv)                                               \
 do {                                                                             \
   unsigned _sx_i;                                                                \
-  char *_hs_key=(char*)(key);                                                    \
+  const unsigned char *_hs_key = (const unsigned char*)(key);                    \
   hashv = 0;                                                                     \
-  for(_sx_i=0; _sx_i < keylen; _sx_i++)                                          \
-      hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i];                     \
-  bkt = hashv & (num_bkts-1);                                                    \
+  for (_sx_i=0; _sx_i < keylen; _sx_i++) {                                       \
+    hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i];                       \
+  }                                                                              \
 } while (0)
 /* FNV-1a variation */
-#define HASH_FNV(key,keylen,num_bkts,hashv,bkt)                                  \
+#define HASH_FNV(key,keylen,hashv)                                               \
 do {                                                                             \
   unsigned _fn_i;                                                                \
-  char *_hf_key=(char*)(key);                                                    \
-  hashv = 2166136261UL;                                                          \
-  for(_fn_i=0; _fn_i < keylen; _fn_i++)                                          \
-      hashv = hashv ^ _hf_key[_fn_i];                                            \
-      hashv = hashv * 16777619;                                                  \
-  bkt = hashv & (num_bkts-1);                                                    \
-} while(0) 
- 
-#define HASH_OAT(key,keylen,num_bkts,hashv,bkt)                                  \
+  const unsigned char *_hf_key = (const unsigned char*)(key);                    \
+  (hashv) = 2166136261U;                                                         \
+  for (_fn_i=0; _fn_i < keylen; _fn_i++) {                                       \
+    hashv = hashv ^ _hf_key[_fn_i];                                              \
+    hashv = hashv * 16777619U;                                                   \
+  }                                                                              \
+} while (0)
+
+#define HASH_OAT(key,keylen,hashv)                                               \
 do {                                                                             \
   unsigned _ho_i;                                                                \
-  char *_ho_key=(char*)(key);                                                    \
+  const unsigned char *_ho_key=(const unsigned char*)(key);                      \
   hashv = 0;                                                                     \
   for(_ho_i=0; _ho_i < keylen; _ho_i++) {                                        \
       hashv += _ho_key[_ho_i];                                                   \
@@ -398,8 +624,7 @@ do {
   hashv += (hashv << 3);                                                         \
   hashv ^= (hashv >> 11);                                                        \
   hashv += (hashv << 15);                                                        \
-  bkt = hashv & (num_bkts-1);                                                    \
-} while(0)
+} while (0)
 
 #define HASH_JEN_MIX(a,b,c)                                                      \
 do {                                                                             \
@@ -414,14 +639,14 @@ do {
   c -= a; c -= b; c ^= ( b >> 15 );                                              \
 } while (0)
 
-#define HASH_JEN(key,keylen,num_bkts,hashv,bkt)                                  \
+#define HASH_JEN(key,keylen,hashv)                                               \
 do {                                                                             \
   unsigned _hj_i,_hj_j,_hj_k;                                                    \
-  unsigned char *_hj_key=(unsigned char*)(key);                                  \
-  hashv = 0xfeedbeef;                                                            \
-  _hj_i = _hj_j = 0x9e3779b9;                                                    \
-  _hj_k = (unsigned)(keylen);                                                      \
-  while (_hj_k >= 12) {                                                          \
+  unsigned const char *_hj_key=(unsigned const char*)(key);                      \
+  hashv = 0xfeedbeefu;                                                           \
+  _hj_i = _hj_j = 0x9e3779b9u;                                                   \
+  _hj_k = (unsigned)(keylen);                                                    \
+  while (_hj_k >= 12U) {                                                         \
     _hj_i +=    (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 )                      \
         + ( (unsigned)_hj_key[2] << 16 )                                         \
         + ( (unsigned)_hj_key[3] << 24 ) );                                      \
@@ -435,25 +660,24 @@ do {
      HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                          \
                                                                                  \
      _hj_key += 12;                                                              \
-     _hj_k -= 12;                                                                \
+     _hj_k -= 12U;                                                               \
   }                                                                              \
-  hashv += keylen;                                                               \
+  hashv += (unsigned)(keylen);                                                   \
   switch ( _hj_k ) {                                                             \
-     case 11: hashv += ( (unsigned)_hj_key[10] << 24 );                          \
-     case 10: hashv += ( (unsigned)_hj_key[9] << 16 );                           \
-     case 9:  hashv += ( (unsigned)_hj_key[8] << 8 );                            \
-     case 8:  _hj_j += ( (unsigned)_hj_key[7] << 24 );                           \
-     case 7:  _hj_j += ( (unsigned)_hj_key[6] << 16 );                           \
-     case 6:  _hj_j += ( (unsigned)_hj_key[5] << 8 );                            \
-     case 5:  _hj_j += _hj_key[4];                                               \
-     case 4:  _hj_i += ( (unsigned)_hj_key[3] << 24 );                           \
-     case 3:  _hj_i += ( (unsigned)_hj_key[2] << 16 );                           \
-     case 2:  _hj_i += ( (unsigned)_hj_key[1] << 8 );                            \
-     case 1:  _hj_i += _hj_key[0];                                               \
+    case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); /* FALLTHROUGH */         \
+    case 10: hashv += ( (unsigned)_hj_key[9] << 16 );  /* FALLTHROUGH */         \
+    case 9:  hashv += ( (unsigned)_hj_key[8] << 8 );   /* FALLTHROUGH */         \
+    case 8:  _hj_j += ( (unsigned)_hj_key[7] << 24 );  /* FALLTHROUGH */         \
+    case 7:  _hj_j += ( (unsigned)_hj_key[6] << 16 );  /* FALLTHROUGH */         \
+    case 6:  _hj_j += ( (unsigned)_hj_key[5] << 8 );   /* FALLTHROUGH */         \
+    case 5:  _hj_j += _hj_key[4];                      /* FALLTHROUGH */         \
+    case 4:  _hj_i += ( (unsigned)_hj_key[3] << 24 );  /* FALLTHROUGH */         \
+    case 3:  _hj_i += ( (unsigned)_hj_key[2] << 16 );  /* FALLTHROUGH */         \
+    case 2:  _hj_i += ( (unsigned)_hj_key[1] << 8 );   /* FALLTHROUGH */         \
+    case 1:  _hj_i += _hj_key[0];                                                \
   }                                                                              \
   HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                             \
-  bkt = hashv & (num_bkts-1);                                                    \
-} while(0)
+} while (0)
 
 /* The Paul Hsieh hash function */
 #undef get16bits
@@ -466,21 +690,21 @@ do {
 #define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)             \
                        +(uint32_t)(((const uint8_t *)(d))[0]) )
 #endif
-#define HASH_SFH(key,keylen,num_bkts,hashv,bkt)                                  \
+#define HASH_SFH(key,keylen,hashv)                                               \
 do {                                                                             \
-  unsigned char *_sfh_key=(unsigned char*)(key);                                 \
-  uint32_t _sfh_tmp, _sfh_len = keylen;                                          \
+  unsigned const char *_sfh_key=(unsigned const char*)(key);                     \
+  uint32_t _sfh_tmp, _sfh_len = (uint32_t)keylen;                                \
                                                                                  \
-  int _sfh_rem = _sfh_len & 3;                                                   \
+  unsigned _sfh_rem = _sfh_len & 3U;                                             \
   _sfh_len >>= 2;                                                                \
-  hashv = 0xcafebabe;                                                            \
+  hashv = 0xcafebabeu;                                                           \
                                                                                  \
   /* Main loop */                                                                \
-  for (;_sfh_len > 0; _sfh_len--) {                                              \
+  for (;_sfh_len > 0U; _sfh_len--) {                                             \
     hashv    += get16bits (_sfh_key);                                            \
-    _sfh_tmp       = (uint32_t)(get16bits (_sfh_key+2)) << 11  ^ hashv;          \
+    _sfh_tmp  = ((uint32_t)(get16bits (_sfh_key+2)) << 11) ^ hashv;              \
     hashv     = (hashv << 16) ^ _sfh_tmp;                                        \
-    _sfh_key += 2*sizeof (uint16_t);                                             \
+    _sfh_key += 2U*sizeof (uint16_t);                                            \
     hashv    += hashv >> 11;                                                     \
   }                                                                              \
                                                                                  \
@@ -488,7 +712,7 @@ do {
   switch (_sfh_rem) {                                                            \
     case 3: hashv += get16bits (_sfh_key);                                       \
             hashv ^= hashv << 16;                                                \
-            hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)] << 18);              \
+            hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)]) << 18;              \
             hashv += hashv >> 11;                                                \
             break;                                                               \
     case 2: hashv += get16bits (_sfh_key);                                       \
@@ -500,20 +724,19 @@ do {
             hashv += hashv >> 1;                                                 \
   }                                                                              \
                                                                                  \
-    /* Force "avalanching" of final 127 bits */                                  \
-    hashv ^= hashv << 3;                                                         \
-    hashv += hashv >> 5;                                                         \
-    hashv ^= hashv << 4;                                                         \
-    hashv += hashv >> 17;                                                        \
-    hashv ^= hashv << 25;                                                        \
-    hashv += hashv >> 6;                                                         \
-    bkt = hashv & (num_bkts-1);                                                  \
-} while(0) 
+  /* Force "avalanching" of final 127 bits */                                    \
+  hashv ^= hashv << 3;                                                           \
+  hashv += hashv >> 5;                                                           \
+  hashv ^= hashv << 4;                                                           \
+  hashv += hashv >> 17;                                                          \
+  hashv ^= hashv << 25;                                                          \
+  hashv += hashv >> 6;                                                           \
+} while (0)
 
 #ifdef HASH_USING_NO_STRICT_ALIASING
 /* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads.
  * For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error.
- * MurmurHash uses the faster approach only on CPU's where we know it's safe. 
+ * MurmurHash uses the faster approach only on CPU's where we know it's safe.
  *
  * Note the preprocessor built-in defines can be emitted using:
  *
@@ -523,10 +746,10 @@ do {
 #if (defined(__i386__) || defined(__x86_64__)  || defined(_M_IX86))
 #define MUR_GETBLOCK(p,i) p[i]
 #else /* non intel */
-#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0)
-#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 0x3) == 1)
-#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 0x3) == 2)
-#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 0x3) == 3)
+#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 3UL) == 0UL)
+#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 3UL) == 1UL)
+#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 3UL) == 2UL)
+#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 3UL) == 3UL)
 #define WP(p) ((uint32_t*)((unsigned long)(p) & ~3UL))
 #if (defined(__BIG_ENDIAN__) || defined(SPARC) || defined(__ppc__) || defined(__ppc64__))
 #define MUR_THREE_ONE(p) ((((*WP(p))&0x00ffffff) << 8) | (((*(WP(p)+1))&0xff000000) >> 24))
@@ -546,24 +769,24 @@ do {
 #define MUR_FMIX(_h) \
 do {                 \
   _h ^= _h >> 16;    \
-  _h *= 0x85ebca6b;  \
+  _h *= 0x85ebca6bu; \
   _h ^= _h >> 13;    \
-  _h *= 0xc2b2ae35l; \
+  _h *= 0xc2b2ae35u; \
   _h ^= _h >> 16;    \
-} while(0)
+} while (0)
 
-#define HASH_MUR(key,keylen,num_bkts,hashv,bkt)                        \
+#define HASH_MUR(key,keylen,hashv)                                     \
 do {                                                                   \
   const uint8_t *_mur_data = (const uint8_t*)(key);                    \
-  const int _mur_nblocks = (keylen) / 4;                               \
-  uint32_t _mur_h1 = 0xf88D5353;                                       \
-  uint32_t _mur_c1 = 0xcc9e2d51;                                       \
-  uint32_t _mur_c2 = 0x1b873593;                                       \
+  const int _mur_nblocks = (int)(keylen) / 4;                          \
+  uint32_t _mur_h1 = 0xf88D5353u;                                      \
+  uint32_t _mur_c1 = 0xcc9e2d51u;                                      \
+  uint32_t _mur_c2 = 0x1b873593u;                                      \
   uint32_t _mur_k1 = 0;                                                \
   const uint8_t *_mur_tail;                                            \
-  const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+_mur_nblocks*4); \
+  const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+(_mur_nblocks*4)); \
   int _mur_i;                                                          \
-  for(_mur_i = -_mur_nblocks; _mur_i; _mur_i++) {                      \
+  for (_mur_i = -_mur_nblocks; _mur_i != 0; _mur_i++) {                \
     _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i);                        \
     _mur_k1 *= _mur_c1;                                                \
     _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
@@ -571,150 +794,168 @@ do {                                                                   \
                                                                        \
     _mur_h1 ^= _mur_k1;                                                \
     _mur_h1 = MUR_ROTL32(_mur_h1,13);                                  \
-    _mur_h1 = _mur_h1*5+0xe6546b64;                                    \
+    _mur_h1 = (_mur_h1*5U) + 0xe6546b64u;                              \
   }                                                                    \
-  _mur_tail = (const uint8_t*)(_mur_data + _mur_nblocks*4);            \
+  _mur_tail = (const uint8_t*)(_mur_data + (_mur_nblocks*4));          \
   _mur_k1=0;                                                           \
-  switch((keylen) & 3) {                                               \
-    case 3: _mur_k1 ^= _mur_tail[2] << 16;                             \
-    case 2: _mur_k1 ^= _mur_tail[1] << 8;                              \
-    case 1: _mur_k1 ^= _mur_tail[0];                                   \
+  switch ((keylen) & 3U) {                                             \
+    case 0: break;                                                     \
+    case 3: _mur_k1 ^= (uint32_t)_mur_tail[2] << 16; /* FALLTHROUGH */ \
+    case 2: _mur_k1 ^= (uint32_t)_mur_tail[1] << 8;  /* FALLTHROUGH */ \
+    case 1: _mur_k1 ^= (uint32_t)_mur_tail[0];                         \
     _mur_k1 *= _mur_c1;                                                \
     _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
     _mur_k1 *= _mur_c2;                                                \
     _mur_h1 ^= _mur_k1;                                                \
   }                                                                    \
-  _mur_h1 ^= (keylen);                                                 \
+  _mur_h1 ^= (uint32_t)(keylen);                                       \
   MUR_FMIX(_mur_h1);                                                   \
   hashv = _mur_h1;                                                     \
-  bkt = hashv & (num_bkts-1);                                          \
-} while(0)
+} while (0)
 #endif  /* HASH_USING_NO_STRICT_ALIASING */
 
-/* key comparison function; return 0 if keys equal */
-#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) 
-
 /* iterate over items in a known bucket to find desired item */
-#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out)                       \
+#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,hashval,out)               \
 do {                                                                             \
- if (head.hh_head) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,head.hh_head));          \
- else out=NULL;                                                                  \
- while (out) {                                                                   \
-    if ((out)->hh.keylen == keylen_in) {                                           \
-        if ((HASH_KEYCMP((out)->hh.key,keyptr,keylen_in)) == 0) break;             \
+  if ((head).hh_head != NULL) {                                                  \
+    DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (head).hh_head));                     \
+  } else {                                                                       \
+    (out) = NULL;                                                                \
+  }                                                                              \
+  while ((out) != NULL) {                                                        \
+    if ((out)->hh.hashv == (hashval) && (out)->hh.keylen == (keylen_in)) {       \
+      if (uthash_memcmp((out)->hh.key, keyptr, keylen_in) == 0) {                \
+        break;                                                                   \
+      }                                                                          \
     }                                                                            \
-    if ((out)->hh.hh_next) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,(out)->hh.hh_next)); \
-    else out = NULL;                                                             \
- }                                                                               \
-} while(0)
+    if ((out)->hh.hh_next != NULL) {                                             \
+      DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (out)->hh.hh_next));                \
+    } else {                                                                     \
+      (out) = NULL;                                                              \
+    }                                                                            \
+  }                                                                              \
+} while (0)
 
 /* add an item to a bucket  */
-#define HASH_ADD_TO_BKT(head,addhh)                                              \
+#define HASH_ADD_TO_BKT(head,hh,addhh,oomed)                                     \
 do {                                                                             \
- head.count++;                                                                   \
- (addhh)->hh_next = head.hh_head;                                                \
- (addhh)->hh_prev = NULL;                                                        \
- if (head.hh_head) { (head).hh_head->hh_prev = (addhh); }                        \
- (head).hh_head=addhh;                                                           \
- if (head.count >= ((head.expand_mult+1) * HASH_BKT_CAPACITY_THRESH)             \
-     && (addhh)->tbl->noexpand != 1) {                                           \
-       HASH_EXPAND_BUCKETS((addhh)->tbl);                                        \
- }                                                                               \
-} while(0)
+  UT_hash_bucket *_ha_head = &(head);                                            \
+  _ha_head->count++;                                                             \
+  (addhh)->hh_next = _ha_head->hh_head;                                          \
+  (addhh)->hh_prev = NULL;                                                       \
+  if (_ha_head->hh_head != NULL) {                                               \
+    _ha_head->hh_head->hh_prev = (addhh);                                        \
+  }                                                                              \
+  _ha_head->hh_head = (addhh);                                                   \
+  if ((_ha_head->count >= ((_ha_head->expand_mult + 1U) * HASH_BKT_CAPACITY_THRESH)) \
+      && !(addhh)->tbl->noexpand) {                                              \
+    HASH_EXPAND_BUCKETS(addhh,(addhh)->tbl, oomed);                              \
+    IF_HASH_NONFATAL_OOM(                                                        \
+      if (oomed) {                                                               \
+        HASH_DEL_IN_BKT(head,addhh);                                             \
+      }                                                                          \
+    )                                                                            \
+  }                                                                              \
+} while (0)
 
 /* remove an item from a given bucket */
-#define HASH_DEL_IN_BKT(hh,head,hh_del)                                          \
-    (head).count--;                                                              \
-    if ((head).hh_head == hh_del) {                                              \
-      (head).hh_head = hh_del->hh_next;                                          \
-    }                                                                            \
-    if (hh_del->hh_prev) {                                                       \
-        hh_del->hh_prev->hh_next = hh_del->hh_next;                              \
-    }                                                                            \
-    if (hh_del->hh_next) {                                                       \
-        hh_del->hh_next->hh_prev = hh_del->hh_prev;                              \
-    }                                                                
+#define HASH_DEL_IN_BKT(head,delhh)                                              \
+do {                                                                             \
+  UT_hash_bucket *_hd_head = &(head);                                            \
+  _hd_head->count--;                                                             \
+  if (_hd_head->hh_head == (delhh)) {                                            \
+    _hd_head->hh_head = (delhh)->hh_next;                                        \
+  }                                                                              \
+  if ((delhh)->hh_prev) {                                                        \
+    (delhh)->hh_prev->hh_next = (delhh)->hh_next;                                \
+  }                                                                              \
+  if ((delhh)->hh_next) {                                                        \
+    (delhh)->hh_next->hh_prev = (delhh)->hh_prev;                                \
+  }                                                                              \
+} while (0)
 
 /* Bucket expansion has the effect of doubling the number of buckets
  * and redistributing the items into the new buckets. Ideally the
  * items will distribute more or less evenly into the new buckets
  * (the extent to which this is true is a measure of the quality of
- * the hash function as it applies to the key domain). 
- * 
+ * the hash function as it applies to the key domain).
+ *
  * With the items distributed into more buckets, the chain length
  * (item count) in each bucket is reduced. Thus by expanding buckets
- * the hash keeps a bound on the chain length. This bounded chain 
+ * the hash keeps a bound on the chain length. This bounded chain
  * length is the essence of how a hash provides constant time lookup.
- * 
+ *
  * The calculation of tbl->ideal_chain_maxlen below deserves some
  * explanation. First, keep in mind that we're calculating the ideal
  * maximum chain length based on the *new* (doubled) bucket count.
  * In fractions this is just n/b (n=number of items,b=new num buckets).
- * Since the ideal chain length is an integer, we want to calculate 
+ * Since the ideal chain length is an integer, we want to calculate
  * ceil(n/b). We don't depend on floating point arithmetic in this
  * hash, so to calculate ceil(n/b) with integers we could write
- * 
+ *
  *      ceil(n/b) = (n/b) + ((n%b)?1:0)
- * 
+ *
  * and in fact a previous version of this hash did just that.
  * But now we have improved things a bit by recognizing that b is
  * always a power of two. We keep its base 2 log handy (call it lb),
  * so now we can write this with a bit shift and logical AND:
- * 
+ *
  *      ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0)
- * 
+ *
  */
-#define HASH_EXPAND_BUCKETS(tbl)                                                 \
+#define HASH_EXPAND_BUCKETS(hh,tbl,oomed)                                        \
 do {                                                                             \
-    unsigned _he_bkt;                                                            \
-    unsigned _he_bkt_i;                                                          \
-    struct UT_hash_handle *_he_thh, *_he_hh_nxt;                                 \
-    UT_hash_bucket *_he_new_buckets, *_he_newbkt;                                \
-    _he_new_buckets = (UT_hash_bucket*)uthash_malloc(                            \
-             2 * tbl->num_buckets * sizeof(struct UT_hash_bucket));              \
-    if (!_he_new_buckets) { uthash_fatal( "out of memory"); }                    \
-    memset(_he_new_buckets, 0,                                                   \
-            2 * tbl->num_buckets * sizeof(struct UT_hash_bucket));               \
-    tbl->ideal_chain_maxlen =                                                    \
-       (tbl->num_items >> (tbl->log2_num_buckets+1)) +                           \
-       ((tbl->num_items & ((tbl->num_buckets*2)-1)) ? 1 : 0);                    \
-    tbl->nonideal_items = 0;                                                     \
-    for(_he_bkt_i = 0; _he_bkt_i < tbl->num_buckets; _he_bkt_i++)                \
-    {                                                                            \
-        _he_thh = tbl->buckets[ _he_bkt_i ].hh_head;                             \
-        while (_he_thh) {                                                        \
-           _he_hh_nxt = _he_thh->hh_next;                                        \
-           HASH_TO_BKT( _he_thh->hashv, tbl->num_buckets*2, _he_bkt);            \
-           _he_newbkt = &(_he_new_buckets[ _he_bkt ]);                           \
-           if (++(_he_newbkt->count) > tbl->ideal_chain_maxlen) {                \
-             tbl->nonideal_items++;                                              \
-             _he_newbkt->expand_mult = _he_newbkt->count /                       \
-                                        tbl->ideal_chain_maxlen;                 \
-           }                                                                     \
-           _he_thh->hh_prev = NULL;                                              \
-           _he_thh->hh_next = _he_newbkt->hh_head;                               \
-           if (_he_newbkt->hh_head) _he_newbkt->hh_head->hh_prev =               \
-                _he_thh;                                                         \
-           _he_newbkt->hh_head = _he_thh;                                        \
-           _he_thh = _he_hh_nxt;                                                 \
+  unsigned _he_bkt;                                                              \
+  unsigned _he_bkt_i;                                                            \
+  struct UT_hash_handle *_he_thh, *_he_hh_nxt;                                   \
+  UT_hash_bucket *_he_new_buckets, *_he_newbkt;                                  \
+  _he_new_buckets = (UT_hash_bucket*)uthash_malloc(                              \
+           2UL * (tbl)->num_buckets * sizeof(struct UT_hash_bucket));            \
+  if (!_he_new_buckets) {                                                        \
+    HASH_RECORD_OOM(oomed);                                                      \
+  } else {                                                                       \
+    uthash_bzero(_he_new_buckets,                                                \
+        2UL * (tbl)->num_buckets * sizeof(struct UT_hash_bucket));               \
+    (tbl)->ideal_chain_maxlen =                                                  \
+       ((tbl)->num_items >> ((tbl)->log2_num_buckets+1U)) +                      \
+       ((((tbl)->num_items & (((tbl)->num_buckets*2U)-1U)) != 0U) ? 1U : 0U);    \
+    (tbl)->nonideal_items = 0;                                                   \
+    for (_he_bkt_i = 0; _he_bkt_i < (tbl)->num_buckets; _he_bkt_i++) {           \
+      _he_thh = (tbl)->buckets[ _he_bkt_i ].hh_head;                             \
+      while (_he_thh != NULL) {                                                  \
+        _he_hh_nxt = _he_thh->hh_next;                                           \
+        HASH_TO_BKT(_he_thh->hashv, (tbl)->num_buckets * 2U, _he_bkt);           \
+        _he_newbkt = &(_he_new_buckets[_he_bkt]);                                \
+        if (++(_he_newbkt->count) > (tbl)->ideal_chain_maxlen) {                 \
+          (tbl)->nonideal_items++;                                               \
+          _he_newbkt->expand_mult = _he_newbkt->count / (tbl)->ideal_chain_maxlen; \
         }                                                                        \
+        _he_thh->hh_prev = NULL;                                                 \
+        _he_thh->hh_next = _he_newbkt->hh_head;                                  \
+        if (_he_newbkt->hh_head != NULL) {                                       \
+          _he_newbkt->hh_head->hh_prev = _he_thh;                                \
+        }                                                                        \
+        _he_newbkt->hh_head = _he_thh;                                           \
+        _he_thh = _he_hh_nxt;                                                    \
+      }                                                                          \
     }                                                                            \
-    uthash_free( tbl->buckets, tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \
-    tbl->num_buckets *= 2;                                                       \
-    tbl->log2_num_buckets++;                                                     \
-    tbl->buckets = _he_new_buckets;                                              \
-    tbl->ineff_expands = (tbl->nonideal_items > (tbl->num_items >> 1)) ?         \
-        (tbl->ineff_expands+1) : 0;                                              \
-    if (tbl->ineff_expands > 1) {                                                \
-        tbl->noexpand=1;                                                         \
-        uthash_noexpand_fyi(tbl);                                                \
+    uthash_free((tbl)->buckets, (tbl)->num_buckets * sizeof(struct UT_hash_bucket)); \
+    (tbl)->num_buckets *= 2U;                                                    \
+    (tbl)->log2_num_buckets++;                                                   \
+    (tbl)->buckets = _he_new_buckets;                                            \
+    (tbl)->ineff_expands = ((tbl)->nonideal_items > ((tbl)->num_items >> 1)) ?   \
+        ((tbl)->ineff_expands+1U) : 0U;                                          \
+    if ((tbl)->ineff_expands > 1U) {                                             \
+      (tbl)->noexpand = 1;                                                       \
+      uthash_noexpand_fyi(tbl);                                                  \
     }                                                                            \
     uthash_expand_fyi(tbl);                                                      \
-} while(0)
+  }                                                                              \
+} while (0)
 
 
 /* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
-/* Note that HASH_SORT assumes the hash handle name to be hh. 
+/* Note that HASH_SORT assumes the hash handle name to be hh.
  * HASH_SRT was added to allow the hash handle name to be passed in. */
 #define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn)
 #define HASH_SRT(hh,head,cmpfcn)                                                 \
@@ -722,161 +963,179 @@ do {
   unsigned _hs_i;                                                                \
   unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize;               \
   struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail;            \
-  if (head) {                                                                    \
-      _hs_insize = 1;                                                            \
-      _hs_looping = 1;                                                           \
-      _hs_list = &((head)->hh);                                                  \
-      while (_hs_looping) {                                                      \
-          _hs_p = _hs_list;                                                      \
-          _hs_list = NULL;                                                       \
-          _hs_tail = NULL;                                                       \
-          _hs_nmerges = 0;                                                       \
-          while (_hs_p) {                                                        \
-              _hs_nmerges++;                                                     \
-              _hs_q = _hs_p;                                                     \
-              _hs_psize = 0;                                                     \
-              for ( _hs_i = 0; _hs_i  < _hs_insize; _hs_i++ ) {                  \
-                  _hs_psize++;                                                   \
-                  _hs_q = (UT_hash_handle*)((_hs_q->next) ?                      \
-                          ((void*)((char*)(_hs_q->next) +                        \
-                          (head)->hh.tbl->hho)) : NULL);                         \
-                  if (! (_hs_q) ) break;                                         \
-              }                                                                  \
-              _hs_qsize = _hs_insize;                                            \
-              while ((_hs_psize > 0) || ((_hs_qsize > 0) && _hs_q )) {           \
-                  if (_hs_psize == 0) {                                          \
-                      _hs_e = _hs_q;                                             \
-                      _hs_q = (UT_hash_handle*)((_hs_q->next) ?                  \
-                              ((void*)((char*)(_hs_q->next) +                    \
-                              (head)->hh.tbl->hho)) : NULL);                     \
-                      _hs_qsize--;                                               \
-                  } else if ( (_hs_qsize == 0) || !(_hs_q) ) {                   \
-                      _hs_e = _hs_p;                                             \
-                      if (_hs_p){                                                \
-                        _hs_p = (UT_hash_handle*)((_hs_p->next) ?                \
-                                ((void*)((char*)(_hs_p->next) +                  \
-                                (head)->hh.tbl->hho)) : NULL);                   \
-                       }                                                         \
-                      _hs_psize--;                                               \
-                  } else if ((                                                   \
-                      cmpfcn(DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_p)), \
-                             DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_q))) \
-                             ) <= 0) {                                           \
-                      _hs_e = _hs_p;                                             \
-                      if (_hs_p){                                                \
-                        _hs_p = (UT_hash_handle*)((_hs_p->next) ?                \
-                               ((void*)((char*)(_hs_p->next) +                   \
-                               (head)->hh.tbl->hho)) : NULL);                    \
-                       }                                                         \
-                      _hs_psize--;                                               \
-                  } else {                                                       \
-                      _hs_e = _hs_q;                                             \
-                      _hs_q = (UT_hash_handle*)((_hs_q->next) ?                  \
-                              ((void*)((char*)(_hs_q->next) +                    \
-                              (head)->hh.tbl->hho)) : NULL);                     \
-                      _hs_qsize--;                                               \
-                  }                                                              \
-                  if ( _hs_tail ) {                                              \
-                      _hs_tail->next = ((_hs_e) ?                                \
-                            ELMT_FROM_HH((head)->hh.tbl,_hs_e) : NULL);          \
-                  } else {                                                       \
-                      _hs_list = _hs_e;                                          \
-                  }                                                              \
-                  if (_hs_e) {                                                   \
-                  _hs_e->prev = ((_hs_tail) ?                                    \
-                     ELMT_FROM_HH((head)->hh.tbl,_hs_tail) : NULL);              \
-                  }                                                              \
-                  _hs_tail = _hs_e;                                              \
-              }                                                                  \
-              _hs_p = _hs_q;                                                     \
+  if (head != NULL) {                                                            \
+    _hs_insize = 1;                                                              \
+    _hs_looping = 1;                                                             \
+    _hs_list = &((head)->hh);                                                    \
+    while (_hs_looping != 0U) {                                                  \
+      _hs_p = _hs_list;                                                          \
+      _hs_list = NULL;                                                           \
+      _hs_tail = NULL;                                                           \
+      _hs_nmerges = 0;                                                           \
+      while (_hs_p != NULL) {                                                    \
+        _hs_nmerges++;                                                           \
+        _hs_q = _hs_p;                                                           \
+        _hs_psize = 0;                                                           \
+        for (_hs_i = 0; _hs_i < _hs_insize; ++_hs_i) {                           \
+          _hs_psize++;                                                           \
+          _hs_q = ((_hs_q->next != NULL) ?                                       \
+            HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL);                   \
+          if (_hs_q == NULL) {                                                   \
+            break;                                                               \
           }                                                                      \
-          if (_hs_tail){                                                         \
-            _hs_tail->next = NULL;                                               \
+        }                                                                        \
+        _hs_qsize = _hs_insize;                                                  \
+        while ((_hs_psize != 0U) || ((_hs_qsize != 0U) && (_hs_q != NULL))) {    \
+          if (_hs_psize == 0U) {                                                 \
+            _hs_e = _hs_q;                                                       \
+            _hs_q = ((_hs_q->next != NULL) ?                                     \
+              HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL);                 \
+            _hs_qsize--;                                                         \
+          } else if ((_hs_qsize == 0U) || (_hs_q == NULL)) {                     \
+            _hs_e = _hs_p;                                                       \
+            if (_hs_p != NULL) {                                                 \
+              _hs_p = ((_hs_p->next != NULL) ?                                   \
+                HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL);               \
+            }                                                                    \
+            _hs_psize--;                                                         \
+          } else if ((cmpfcn(                                                    \
+                DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_p)),             \
+                DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_q))              \
+                )) <= 0) {                                                       \
+            _hs_e = _hs_p;                                                       \
+            if (_hs_p != NULL) {                                                 \
+              _hs_p = ((_hs_p->next != NULL) ?                                   \
+                HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL);               \
+            }                                                                    \
+            _hs_psize--;                                                         \
+          } else {                                                               \
+            _hs_e = _hs_q;                                                       \
+            _hs_q = ((_hs_q->next != NULL) ?                                     \
+              HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL);                 \
+            _hs_qsize--;                                                         \
           }                                                                      \
-          if ( _hs_nmerges <= 1 ) {                                              \
-              _hs_looping=0;                                                     \
-              (head)->hh.tbl->tail = _hs_tail;                                   \
-              DECLTYPE_ASSIGN(head,ELMT_FROM_HH((head)->hh.tbl, _hs_list));      \
+          if ( _hs_tail != NULL ) {                                              \
+            _hs_tail->next = ((_hs_e != NULL) ?                                  \
+              ELMT_FROM_HH((head)->hh.tbl, _hs_e) : NULL);                       \
+          } else {                                                               \
+            _hs_list = _hs_e;                                                    \
           }                                                                      \
-          _hs_insize *= 2;                                                       \
+          if (_hs_e != NULL) {                                                   \
+            _hs_e->prev = ((_hs_tail != NULL) ?                                  \
+              ELMT_FROM_HH((head)->hh.tbl, _hs_tail) : NULL);                    \
+          }                                                                      \
+          _hs_tail = _hs_e;                                                      \
+        }                                                                        \
+        _hs_p = _hs_q;                                                           \
       }                                                                          \
-      HASH_FSCK(hh,head);                                                        \
- }                                                                               \
+      if (_hs_tail != NULL) {                                                    \
+        _hs_tail->next = NULL;                                                   \
+      }                                                                          \
+      if (_hs_nmerges <= 1U) {                                                   \
+        _hs_looping = 0;                                                         \
+        (head)->hh.tbl->tail = _hs_tail;                                         \
+        DECLTYPE_ASSIGN(head, ELMT_FROM_HH((head)->hh.tbl, _hs_list));           \
+      }                                                                          \
+      _hs_insize *= 2U;                                                          \
+    }                                                                            \
+    HASH_FSCK(hh, head, "HASH_SRT");                                             \
+  }                                                                              \
 } while (0)
 
-/* This function selects items from one hash into another hash. 
- * The end result is that the selected items have dual presence 
- * in both hashes. There is no copy of the items made; rather 
- * they are added into the new hash through a secondary hash 
+/* This function selects items from one hash into another hash.
+ * The end result is that the selected items have dual presence
+ * in both hashes. There is no copy of the items made; rather
+ * they are added into the new hash through a secondary hash
  * hash handle that must be present in the structure. */
 #define HASH_SELECT(hh_dst, dst, hh_src, src, cond)                              \
 do {                                                                             \
   unsigned _src_bkt, _dst_bkt;                                                   \
-  void *_last_elt=NULL, *_elt;                                                   \
+  void *_last_elt = NULL, *_elt;                                                 \
   UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL;                         \
   ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst));                 \
-  if (src) {                                                                     \
-    for(_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) {     \
-      for(_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head;                \
-          _src_hh;                                                               \
-          _src_hh = _src_hh->hh_next) {                                          \
-          _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh);                       \
-          if (cond(_elt)) {                                                      \
-            _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho);               \
-            _dst_hh->key = _src_hh->key;                                         \
-            _dst_hh->keylen = _src_hh->keylen;                                   \
-            _dst_hh->hashv = _src_hh->hashv;                                     \
-            _dst_hh->prev = _last_elt;                                           \
-            _dst_hh->next = NULL;                                                \
-            if (_last_elt_hh) { _last_elt_hh->next = _elt; }                     \
-            if (!dst) {                                                          \
-              DECLTYPE_ASSIGN(dst,_elt);                                         \
-              HASH_MAKE_TABLE(hh_dst,dst);                                       \
-            } else {                                                             \
-              _dst_hh->tbl = (dst)->hh_dst.tbl;                                  \
-            }                                                                    \
-            HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt);    \
-            HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt],_dst_hh);            \
-            (dst)->hh_dst.tbl->num_items++;                                      \
-            _last_elt = _elt;                                                    \
-            _last_elt_hh = _dst_hh;                                              \
+  if ((src) != NULL) {                                                           \
+    for (_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) {    \
+      for (_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head;               \
+        _src_hh != NULL;                                                         \
+        _src_hh = _src_hh->hh_next) {                                            \
+        _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh);                         \
+        if (cond(_elt)) {                                                        \
+          IF_HASH_NONFATAL_OOM( int _hs_oomed = 0; )                             \
+          _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho);                 \
+          _dst_hh->key = _src_hh->key;                                           \
+          _dst_hh->keylen = _src_hh->keylen;                                     \
+          _dst_hh->hashv = _src_hh->hashv;                                       \
+          _dst_hh->prev = _last_elt;                                             \
+          _dst_hh->next = NULL;                                                  \
+          if (_last_elt_hh != NULL) {                                            \
+            _last_elt_hh->next = _elt;                                           \
           }                                                                      \
+          if ((dst) == NULL) {                                                   \
+            DECLTYPE_ASSIGN(dst, _elt);                                          \
+            HASH_MAKE_TABLE(hh_dst, dst, _hs_oomed);                             \
+            IF_HASH_NONFATAL_OOM(                                                \
+              if (_hs_oomed) {                                                   \
+                uthash_nonfatal_oom(_elt);                                       \
+                (dst) = NULL;                                                    \
+                continue;                                                        \
+              }                                                                  \
+            )                                                                    \
+          } else {                                                               \
+            _dst_hh->tbl = (dst)->hh_dst.tbl;                                    \
+          }                                                                      \
+          HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt);      \
+          HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt], hh_dst, _dst_hh, _hs_oomed); \
+          (dst)->hh_dst.tbl->num_items++;                                        \
+          IF_HASH_NONFATAL_OOM(                                                  \
+            if (_hs_oomed) {                                                     \
+              HASH_ROLLBACK_BKT(hh_dst, dst, _dst_hh);                           \
+              HASH_DELETE_HH(hh_dst, dst, _dst_hh);                              \
+              _dst_hh->tbl = NULL;                                               \
+              uthash_nonfatal_oom(_elt);                                         \
+              continue;                                                          \
+            }                                                                    \
+          )                                                                      \
+          HASH_BLOOM_ADD(_dst_hh->tbl, _dst_hh->hashv);                          \
+          _last_elt = _elt;                                                      \
+          _last_elt_hh = _dst_hh;                                                \
+        }                                                                        \
       }                                                                          \
     }                                                                            \
   }                                                                              \
-  HASH_FSCK(hh_dst,dst);                                                         \
+  HASH_FSCK(hh_dst, dst, "HASH_SELECT");                                         \
 } while (0)
 
 #define HASH_CLEAR(hh,head)                                                      \
 do {                                                                             \
-  if (head) {                                                                    \
+  if ((head) != NULL) {                                                          \
+    HASH_BLOOM_FREE((head)->hh.tbl);                                             \
     uthash_free((head)->hh.tbl->buckets,                                         \
                 (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket));      \
-    HASH_BLOOM_FREE((head)->hh.tbl);                                             \
     uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                          \
-    (head)=NULL;                                                                 \
+    (head) = NULL;                                                               \
   }                                                                              \
-} while(0)
+} while (0)
 
 #define HASH_OVERHEAD(hh,head)                                                   \
- (size_t)((((head)->hh.tbl->num_items   * sizeof(UT_hash_handle))   +            \
-           ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket))   +            \
-            (sizeof(UT_hash_table))                                 +            \
-            (HASH_BLOOM_BYTELEN)))
+ (((head) != NULL) ? (                                                           \
+ (size_t)(((head)->hh.tbl->num_items   * sizeof(UT_hash_handle))   +             \
+          ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket))   +             \
+           sizeof(UT_hash_table)                                   +             \
+           (HASH_BLOOM_BYTELEN))) : 0U)
 
 #ifdef NO_DECLTYPE
 #define HASH_ITER(hh,head,el,tmp)                                                \
-for((el)=(head), (*(char**)(&(tmp)))=(char*)((head)?(head)->hh.next:NULL);       \
-  el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL)) 
+for(((el)=(head)), ((*(char**)(&(tmp)))=(char*)((head!=NULL)?(head)->hh.next:NULL)); \
+  (el) != NULL; ((el)=(tmp)), ((*(char**)(&(tmp)))=(char*)((tmp!=NULL)?(tmp)->hh.next:NULL)))
 #else
 #define HASH_ITER(hh,head,el,tmp)                                                \
-for((el)=(head),(tmp)=DECLTYPE(el)((head)?(head)->hh.next:NULL);                 \
-  el; (el)=(tmp),(tmp)=DECLTYPE(el)((tmp)?(tmp)->hh.next:NULL))
+for(((el)=(head)), ((tmp)=DECLTYPE(el)((head!=NULL)?(head)->hh.next:NULL));      \
+  (el) != NULL; ((el)=(tmp)), ((tmp)=DECLTYPE(el)((tmp!=NULL)?(tmp)->hh.next:NULL)))
 #endif
 
 /* obtain a count of items in the hash */
-#define HASH_COUNT(head) HASH_CNT(hh,head) 
-#define HASH_CNT(hh,head) ((head)?((head)->hh.tbl->num_items):0)
+#define HASH_COUNT(head) HASH_CNT(hh,head)
+#define HASH_CNT(hh,head) ((head != NULL)?((head)->hh.tbl->num_items):0U)
 
 typedef struct UT_hash_bucket {
    struct UT_hash_handle *hh_head;
@@ -884,7 +1143,7 @@ typedef struct UT_hash_bucket {
 
    /* expand_mult is normally set to 0. In this situation, the max chain length
     * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If
-    * the bucket's chain exceeds this length, bucket expansion is triggered). 
+    * the bucket's chain exceeds this length, bucket expansion is triggered).
     * However, setting expand_mult to a non-zero value delays bucket expansion
     * (that would be triggered by additions to this particular bucket)
     * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH.
@@ -892,15 +1151,15 @@ typedef struct UT_hash_bucket {
     * multiplier is to reduce bucket expansions, since they are expensive, in
     * situations where we know that a particular bucket tends to be overused.
     * It is better to let its chain length grow to a longer yet-still-bounded
-    * value, than to do an O(n) bucket expansion too often. 
+    * value, than to do an O(n) bucket expansion too often.
     */
    unsigned expand_mult;
 
 } UT_hash_bucket;
 
 /* random signature used only to find hash tables in external analysis */
-#define HASH_SIGNATURE 0xa0111fe1
-#define HASH_BLOOM_SIGNATURE 0xb12220f2
+#define HASH_SIGNATURE 0xa0111fe1u
+#define HASH_BLOOM_SIGNATURE 0xb12220f2u
 
 typedef struct UT_hash_table {
    UT_hash_bucket *buckets;
@@ -918,7 +1177,7 @@ typedef struct UT_hash_table {
     * hash distribution; reaching them in a chain traversal takes >ideal steps */
    unsigned nonideal_items;
 
-   /* ineffective expands occur when a bucket doubling was performed, but 
+   /* ineffective expands occur when a bucket doubling was performed, but
     * afterward, more than half the items in the hash had nonideal chain
     * positions. If this happens on two consecutive expansions we inhibit any
     * further expansion, as it's not helping; this happens when the hash
@@ -930,7 +1189,7 @@ typedef struct UT_hash_table {
 #ifdef HASH_BLOOM
    uint32_t bloom_sig; /* used only to test bloom exists in external analysis */
    uint8_t *bloom_bv;
-   char bloom_nbits;
+   uint8_t bloom_nbits;
 #endif
 
 } UT_hash_table;
@@ -947,4 +1206,3 @@ typedef struct UT_hash_handle {
 } UT_hash_handle;
 
 #endif /* UTHASH_H */
- 
diff --git a/debian/modules/nchan/src/util/hdr_histogram.c b/debian/modules/nchan/src/util/hdr_histogram.c
new file mode 100644
index 0000000..9b4a770
--- /dev/null
+++ b/debian/modules/nchan/src/util/hdr_histogram.c
@@ -0,0 +1,1015 @@
+/**
+ * hdr_histogram.c
+ * Written by Michael Barker and released to the public domain,
+ * as explained at http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+#include <math.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#include <nchan_module.h>
+#include <util/shmem.h>
+#include <store/memory/store.h>
+
+#include "hdr_histogram.h"
+
+//  ######   #######  ##     ## ##    ## ########  ######
+// ##    ## ##     ## ##     ## ###   ##    ##    ##    ##
+// ##       ##     ## ##     ## ####  ##    ##    ##
+// ##       ##     ## ##     ## ## ## ##    ##     ######
+// ##       ##     ## ##     ## ##  ####    ##          ##
+// ##    ## ##     ## ##     ## ##   ###    ##    ##    ##
+//  ######   #######   #######  ##    ##    ##     ######
+
+static int32_t normalize_index(const struct hdr_histogram* h, int32_t index)
+{
+    if (h->normalizing_index_offset == 0)
+    {
+        return index;
+    }
+
+    int32_t normalized_index = index - h->normalizing_index_offset;
+    int32_t adjustment = 0;
+
+    if (normalized_index < 0)
+    {
+        adjustment = h->counts_len;
+    }
+    else if (normalized_index >= h->counts_len)
+    {
+        adjustment = -h->counts_len;
+    }
+
+    return normalized_index + adjustment;
+}
+
+static int64_t counts_get_direct(const struct hdr_histogram* h, int32_t index)
+{
+    return h->counts[index];
+}
+
+static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t index)
+{
+    return counts_get_direct(h, normalize_index(h, index));
+}
+
+static void counts_inc_normalised(
+    struct hdr_histogram* h, int32_t index, int64_t value)
+{
+    int32_t normalised_index = normalize_index(h, index);
+    h->counts[normalised_index] += value;
+    h->total_count += value;
+}
+
+static void update_min_max(struct hdr_histogram* h, int64_t value)
+{
+    h->min_value = (value < h->min_value && value != 0) ? value : h->min_value;
+    h->max_value = (value > h->max_value) ? value : h->max_value;
+}
+
+// ##     ## ######## #### ##       #### ######## ##    ##
+// ##     ##    ##     ##  ##        ##     ##     ##  ##
+// ##     ##    ##     ##  ##        ##     ##      ####
+// ##     ##    ##     ##  ##        ##     ##       ##
+// ##     ##    ##     ##  ##        ##     ##       ##
+// ##     ##    ##     ##  ##        ##     ##       ##
+//  #######     ##    #### ######## ####    ##       ##
+
+static int64_t power(int64_t base, int64_t exp)
+{
+    int64_t result = 1;
+    while(exp)
+    {
+        result *= base; exp--;
+    }
+    return result;
+}
+
+#if defined(_MSC_VER)
+#pragma intrinsic(_BitScanReverse64)
+#endif
+
+static int32_t get_bucket_index(const struct hdr_histogram* h, int64_t value)
+{
+#if defined(_MSC_VER)
+    uint32_t leading_zero = 0;
+    _BitScanReverse64(&leading_zero, value | h->sub_bucket_mask);
+    int32_t pow2ceiling = 64 - (63 - leading_zero); // smallest power of 2 containing value
+#else
+    int32_t pow2ceiling = 64 - __builtin_clzll(value | h->sub_bucket_mask); // smallest power of 2 containing value
+#endif
+    return pow2ceiling - h->unit_magnitude - (h->sub_bucket_half_count_magnitude + 1);
+}
+
+static int32_t get_sub_bucket_index(int64_t value, int32_t bucket_index, int32_t unit_magnitude)
+{
+    return (int32_t)(value >> (bucket_index + unit_magnitude));
+}
+
+static int32_t counts_index(const struct hdr_histogram* h, int32_t bucket_index, int32_t sub_bucket_index)
+{
+    // Calculate the index for the first entry in the bucket:
+    // (The following is the equivalent of ((bucket_index + 1) * subBucketHalfCount) ):
+    int32_t bucket_base_index = (bucket_index + 1) << h->sub_bucket_half_count_magnitude;
+    // Calculate the offset in the bucket:
+    int32_t offset_in_bucket = sub_bucket_index - h->sub_bucket_half_count;
+    // The following is the equivalent of ((sub_bucket_index  - subBucketHalfCount) + bucketBaseIndex;
+    return bucket_base_index + offset_in_bucket;
+}
+
+static int64_t value_from_index(int32_t bucket_index, int32_t sub_bucket_index, int32_t unit_magnitude)
+{
+    return ((int64_t) sub_bucket_index) << (bucket_index + unit_magnitude);
+}
+
+int32_t counts_index_for(const struct hdr_histogram* h, int64_t value)
+{
+    int32_t bucket_index     = get_bucket_index(h, value);
+    int32_t sub_bucket_index = get_sub_bucket_index(value, bucket_index, h->unit_magnitude);
+
+    return counts_index(h, bucket_index, sub_bucket_index);
+}
+
+int64_t hdr_value_at_index(const struct hdr_histogram *h, int32_t index)
+{
+    int32_t bucket_index = (index >> h->sub_bucket_half_count_magnitude) - 1;
+    int32_t sub_bucket_index = (index & (h->sub_bucket_half_count - 1)) + h->sub_bucket_half_count;
+
+    if (bucket_index < 0)
+    {
+        sub_bucket_index -= h->sub_bucket_half_count;
+        bucket_index = 0;
+    }
+
+    return value_from_index(bucket_index, sub_bucket_index, h->unit_magnitude);
+}
+
+int64_t hdr_size_of_equivalent_value_range(const struct hdr_histogram* h, int64_t value)
+{
+    int32_t bucket_index     = get_bucket_index(h, value);
+    int32_t sub_bucket_index = get_sub_bucket_index(value, bucket_index, h->unit_magnitude);
+    int32_t adjusted_bucket  = (sub_bucket_index >= h->sub_bucket_count) ? (bucket_index + 1) : bucket_index;
+    return INT64_C(1) << (h->unit_magnitude + adjusted_bucket);
+}
+
+static int64_t lowest_equivalent_value(const struct hdr_histogram* h, int64_t value)
+{
+    int32_t bucket_index     = get_bucket_index(h, value);
+    int32_t sub_bucket_index = get_sub_bucket_index(value, bucket_index, h->unit_magnitude);
+    return value_from_index(bucket_index, sub_bucket_index, h->unit_magnitude);
+}
+
+int64_t hdr_next_non_equivalent_value(const struct hdr_histogram *h, int64_t value)
+{
+    return lowest_equivalent_value(h, value) + hdr_size_of_equivalent_value_range(h, value);
+}
+
+static int64_t highest_equivalent_value(const struct hdr_histogram* h, int64_t value)
+{
+    return hdr_next_non_equivalent_value(h, value) - 1;
+}
+
+int64_t hdr_median_equivalent_value(const struct hdr_histogram *h, int64_t value)
+{
+    return lowest_equivalent_value(h, value) + (hdr_size_of_equivalent_value_range(h, value) >> 1);
+}
+
+static int64_t non_zero_min(const struct hdr_histogram* h)
+{
+    if (INT64_MAX == h->min_value)
+    {
+        return INT64_MAX;
+    }
+
+    return lowest_equivalent_value(h, h->min_value);
+}
+
+void hdr_reset_internal_counters(struct hdr_histogram* h)
+{
+    int min_non_zero_index = -1;
+    int max_index = -1;
+    int64_t observed_total_count = 0;
+    int i;
+
+    for (i = 0; i < h->counts_len; i++)
+    {
+        int64_t count_at_index;
+
+        if ((count_at_index = counts_get_direct(h, i)) > 0)
+        {
+            observed_total_count += count_at_index;
+            max_index = i;
+            if (min_non_zero_index == -1 && i != 0)
+            {
+                min_non_zero_index = i;
+            }
+        }
+    }
+
+    if (max_index == -1)
+    {
+        h->max_value = 0;
+    }
+    else
+    {
+        int64_t max_value = hdr_value_at_index(h, max_index);
+        h->max_value = highest_equivalent_value(h, max_value);
+    }
+
+    if (min_non_zero_index == -1)
+    {
+        h->min_value = INT64_MAX;
+    }
+    else
+    {
+        h->min_value = hdr_value_at_index(h, min_non_zero_index);
+    }
+
+    h->total_count = observed_total_count;
+}
+
+static int32_t buckets_needed_to_cover_value(int64_t value, int32_t sub_bucket_count, int32_t unit_magnitude)
+{
+    int64_t smallest_untrackable_value = ((int64_t) sub_bucket_count) << unit_magnitude;
+    int32_t buckets_needed = 1;
+    while (smallest_untrackable_value <= value)
+    {
+        if (smallest_untrackable_value > INT64_MAX / 2)
+        {
+            return buckets_needed + 1;
+        }
+        smallest_untrackable_value <<= 1;
+        buckets_needed++;
+    }
+
+    return buckets_needed;
+}
+
+// ##     ## ######## ##     ##  #######  ########  ##    ##
+// ###   ### ##       ###   ### ##     ## ##     ##  ##  ##
+// #### #### ##       #### #### ##     ## ##     ##   ####
+// ## ### ## ######   ## ### ## ##     ## ########     ##
+// ##     ## ##       ##     ## ##     ## ##   ##      ##
+// ##     ## ##       ##     ## ##     ## ##    ##     ##
+// ##     ## ######## ##     ##  #######  ##     ##    ##
+
+int hdr_calculate_bucket_config(
+        int64_t lowest_trackable_value,
+        int64_t highest_trackable_value,
+        int significant_figures,
+        struct hdr_histogram_bucket_config* cfg)
+{
+    if (lowest_trackable_value < 1 ||
+            significant_figures < 1 || 5 < significant_figures)
+    {
+        return EINVAL;
+    }
+    else if (lowest_trackable_value * 2 > highest_trackable_value)
+    {
+        return EINVAL;
+    }
+
+    cfg->lowest_trackable_value = lowest_trackable_value;
+    cfg->significant_figures = significant_figures;
+    cfg->highest_trackable_value = highest_trackable_value;
+
+    int64_t largest_value_with_single_unit_resolution = 2 * power(10, significant_figures);
+    int32_t sub_bucket_count_magnitude = (int32_t) ceil(log((double)largest_value_with_single_unit_resolution) / log(2));
+    cfg->sub_bucket_half_count_magnitude = ((sub_bucket_count_magnitude > 1) ? sub_bucket_count_magnitude : 1) - 1;
+
+    cfg->unit_magnitude = (int32_t) floor(log((double)lowest_trackable_value) / log(2));
+
+    cfg->sub_bucket_count      = (int32_t) pow(2, (cfg->sub_bucket_half_count_magnitude + 1));
+    cfg->sub_bucket_half_count = cfg->sub_bucket_count / 2;
+    cfg->sub_bucket_mask       = ((int64_t) cfg->sub_bucket_count - 1) << cfg->unit_magnitude;
+
+    if (cfg->unit_magnitude + cfg->sub_bucket_half_count_magnitude > 61)
+    {
+        return EINVAL;
+    }
+
+    cfg->bucket_count = buckets_needed_to_cover_value(highest_trackable_value, cfg->sub_bucket_count, (int32_t)cfg->unit_magnitude);
+    cfg->counts_len = (cfg->bucket_count + 1) * (cfg->sub_bucket_count / 2);
+
+    return 0;
+}
+
+void hdr_init_preallocated(struct hdr_histogram* h, struct hdr_histogram_bucket_config* cfg)
+{
+    h->lowest_trackable_value          = cfg->lowest_trackable_value;
+    h->highest_trackable_value         = cfg->highest_trackable_value;
+    h->unit_magnitude                  = (int32_t)cfg->unit_magnitude;
+    h->significant_figures             = (int32_t)cfg->significant_figures;
+    h->sub_bucket_half_count_magnitude = cfg->sub_bucket_half_count_magnitude;
+    h->sub_bucket_half_count           = cfg->sub_bucket_half_count;
+    h->sub_bucket_mask                 = cfg->sub_bucket_mask;
+    h->sub_bucket_count                = cfg->sub_bucket_count;
+    h->min_value                       = INT64_MAX;
+    h->max_value                       = 0;
+    h->normalizing_index_offset        = 0;
+    h->conversion_ratio                = 1.0;
+    h->bucket_count                    = cfg->bucket_count;
+    h->counts_len                      = cfg->counts_len;
+    h->total_count                     = 0;
+}
+
+int hdr_init_nchan_shm(
+        int64_t lowest_trackable_value,
+        int64_t highest_trackable_value,
+        int significant_figures,
+        struct hdr_histogram** result)
+{
+    struct hdr_histogram_bucket_config cfg;
+
+    int r = hdr_calculate_bucket_config(lowest_trackable_value, highest_trackable_value, significant_figures, &cfg);
+    if (r)
+    {
+        return r;
+    }
+
+    int64_t* counts = shm_calloc(nchan_store_memory_shmem, (size_t) cfg.counts_len * sizeof(int64_t), "hdrhistogram counts");
+    struct hdr_histogram* histogram = shm_calloc(nchan_store_memory_shmem, sizeof(struct hdr_histogram), "hdrhistogram");
+
+    if (!counts || !histogram)
+    {
+        return ENOMEM;
+    }
+
+    histogram->counts = counts;
+
+    hdr_init_preallocated(histogram, &cfg);
+    *result = histogram;
+
+    return 0;
+}
+
+void hdr_close_nchan_shm(struct hdr_histogram* h)
+{
+    shm_free(nchan_store_memory_shmem, h->counts);
+    shm_free(nchan_store_memory_shmem, h);
+}
+
+// reset a histogram to zero.
+void hdr_reset(struct hdr_histogram *h)
+{
+     h->total_count=0;
+     h->min_value = INT64_MAX;
+     h->max_value = 0;
+     memset(h->counts, 0, (sizeof(int64_t) * h->counts_len));
+}
+
+size_t hdr_get_memory_size(struct hdr_histogram *h)
+{
+    return sizeof(struct hdr_histogram) + h->counts_len * sizeof(int64_t);
+}
+
+// ##     ## ########  ########     ###    ######## ########  ######
+// ##     ## ##     ## ##     ##   ## ##      ##    ##       ##    ##
+// ##     ## ##     ## ##     ##  ##   ##     ##    ##       ##
+// ##     ## ########  ##     ## ##     ##    ##    ######    ######
+// ##     ## ##        ##     ## #########    ##    ##             ##
+// ##     ## ##        ##     ## ##     ##    ##    ##       ##    ##
+//  #######  ##        ########  ##     ##    ##    ########  ######
+
+
+bool hdr_record_value(struct hdr_histogram* h, int64_t value)
+{
+    return hdr_record_values(h, value, 1);
+}
+
+bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
+{
+    if (value < 0)
+    {
+        return false;
+    }
+
+    int32_t counts_index = counts_index_for(h, value);
+
+    if (counts_index < 0 || h->counts_len <= counts_index)
+    {
+        return false;
+    }
+
+    counts_inc_normalised(h, counts_index, count);
+    update_min_max(h, value);
+
+    return true;
+}
+
+bool hdr_record_corrected_value(struct hdr_histogram* h, int64_t value, int64_t expected_interval)
+{
+    return hdr_record_corrected_values(h, value, 1, expected_interval);
+}
+
+
+bool hdr_record_corrected_values(struct hdr_histogram* h, int64_t value, int64_t count, int64_t expected_interval)
+{
+    if (!hdr_record_values(h, value, count))
+    {
+        return false;
+    }
+
+    if (expected_interval <= 0 || value <= expected_interval)
+    {
+        return true;
+    }
+
+    int64_t missing_value = value - expected_interval;
+    for (; missing_value >= expected_interval; missing_value -= expected_interval)
+    {
+        if (!hdr_record_values(h, missing_value, count))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+int64_t hdr_add(struct hdr_histogram* h, const struct hdr_histogram* from)
+{
+    struct hdr_iter iter;
+    hdr_iter_recorded_init(&iter, from);
+    int64_t dropped = 0;
+
+    while (hdr_iter_next(&iter))
+    {
+        int64_t value = iter.value;
+        int64_t count = iter.count;
+
+        if (!hdr_record_values(h, value, count))
+        {
+            dropped += count;
+        }
+    }
+
+    return dropped;
+}
+
+int64_t hdr_add_while_correcting_for_coordinated_omission(
+        struct hdr_histogram* h, struct hdr_histogram* from, int64_t expected_interval)
+{
+    struct hdr_iter iter;
+    hdr_iter_recorded_init(&iter, from);
+    int64_t dropped = 0;
+
+    while (hdr_iter_next(&iter))
+    {
+        int64_t value = iter.value;
+        int64_t count = iter.count;
+
+        if (!hdr_record_corrected_values(h, value, count, expected_interval))
+        {
+            dropped += count;
+        }
+    }
+
+    return dropped;
+}
+
+
+
+// ##     ##    ###    ##       ##     ## ########  ######
+// ##     ##   ## ##   ##       ##     ## ##       ##    ##
+// ##     ##  ##   ##  ##       ##     ## ##       ##
+// ##     ## ##     ## ##       ##     ## ######    ######
+//  ##   ##  ######### ##       ##     ## ##             ##
+//   ## ##   ##     ## ##       ##     ## ##       ##    ##
+//    ###    ##     ## ########  #######  ########  ######
+
+
+int64_t hdr_max(const struct hdr_histogram* h)
+{
+    if (0 == h->max_value)
+    {
+        return 0;
+    }
+
+    return highest_equivalent_value(h, h->max_value);
+}
+
+int64_t hdr_min(const struct hdr_histogram* h)
+{
+    if (0 < hdr_count_at_index(h, 0))
+    {
+        return 0;
+    }
+
+    return non_zero_min(h);
+}
+
+int64_t hdr_value_at_percentile(const struct hdr_histogram* h, double percentile)
+{
+    struct hdr_iter iter;
+    hdr_iter_init(&iter, h);
+
+    double requested_percentile = percentile < 100.0 ? percentile : 100.0;
+    int64_t count_at_percentile =
+        (int64_t) (((requested_percentile / 100) * h->total_count) + 0.5);
+    count_at_percentile = count_at_percentile > 1 ? count_at_percentile : 1;
+    int64_t total = 0;
+
+    while (hdr_iter_next(&iter))
+    {
+        total += iter.count;
+
+        if (total >= count_at_percentile)
+        {
+            int64_t value_from_index = iter.value;
+            return highest_equivalent_value(h, value_from_index);
+        }
+    }
+
+    return 0;
+}
+
+double hdr_mean(const struct hdr_histogram* h)
+{
+    struct hdr_iter iter;
+    int64_t total = 0;
+
+    hdr_iter_init(&iter, h);
+
+    while (hdr_iter_next(&iter))
+    {
+        if (0 != iter.count)
+        {
+            total += iter.count * hdr_median_equivalent_value(h, iter.value);
+        }
+    }
+
+    return (total * 1.0) / h->total_count;
+}
+
+double hdr_stddev(const struct hdr_histogram* h)
+{
+    double mean = hdr_mean(h);
+    double geometric_dev_total = 0.0;
+
+    struct hdr_iter iter;
+    hdr_iter_init(&iter, h);
+
+    while (hdr_iter_next(&iter))
+    {
+        if (0 != iter.count)
+        {
+            double dev = (hdr_median_equivalent_value(h, iter.value) * 1.0) - mean;
+            geometric_dev_total += (dev * dev) * iter.count;
+        }
+    }
+
+    return sqrt(geometric_dev_total / h->total_count);
+}
+
+bool hdr_values_are_equivalent(const struct hdr_histogram* h, int64_t a, int64_t b)
+{
+    return lowest_equivalent_value(h, a) == lowest_equivalent_value(h, b);
+}
+
+int64_t hdr_lowest_equivalent_value(const struct hdr_histogram* h, int64_t value)
+{
+    return lowest_equivalent_value(h, value);
+}
+
+int64_t hdr_count_at_value(const struct hdr_histogram* h, int64_t value)
+{
+    return counts_get_normalised(h, counts_index_for(h, value));
+}
+
+int64_t hdr_count_at_index(const struct hdr_histogram* h, int32_t index)
+{
+    return counts_get_normalised(h, index);
+}
+
+
+// #### ######## ######## ########     ###    ########  #######  ########   ######
+//  ##     ##    ##       ##     ##   ## ##      ##    ##     ## ##     ## ##    ##
+//  ##     ##    ##       ##     ##  ##   ##     ##    ##     ## ##     ## ##
+//  ##     ##    ######   ########  ##     ##    ##    ##     ## ########   ######
+//  ##     ##    ##       ##   ##   #########    ##    ##     ## ##   ##         ##
+//  ##     ##    ##       ##    ##  ##     ##    ##    ##     ## ##    ##  ##    ##
+// ####    ##    ######## ##     ## ##     ##    ##     #######  ##     ##  ######
+
+
+static bool has_buckets(struct hdr_iter* iter)
+{
+    return iter->counts_index < iter->h->counts_len;
+}
+
+static bool has_next(struct hdr_iter* iter)
+{
+    return iter->cumulative_count < iter->total_count;
+}
+
+static bool move_next(struct hdr_iter* iter)
+{
+    iter->counts_index++;
+
+    if (!has_buckets(iter))
+    {
+        return false;
+    }
+
+    iter->count = counts_get_normalised(iter->h, iter->counts_index);
+    iter->cumulative_count += iter->count;
+
+    iter->value = hdr_value_at_index(iter->h, iter->counts_index);
+    iter->highest_equivalent_value = highest_equivalent_value(iter->h, iter->value);
+    iter->lowest_equivalent_value = lowest_equivalent_value(iter->h, iter->value);
+    iter->median_equivalent_value = hdr_median_equivalent_value(iter->h, iter->value);
+
+    return true;
+}
+
+static int64_t peek_next_value_from_index(struct hdr_iter* iter)
+{
+    return hdr_value_at_index(iter->h, iter->counts_index + 1);
+}
+
+static bool next_value_greater_than_reporting_level_upper_bound(
+    struct hdr_iter *iter, int64_t reporting_level_upper_bound)
+{
+    if (iter->counts_index >= iter->h->counts_len)
+    {
+        return false;
+    }
+
+    return peek_next_value_from_index(iter) > reporting_level_upper_bound;
+}
+
+static bool _basic_iter_next(struct hdr_iter *iter)
+{
+    if (!has_next(iter) || iter->counts_index >= iter->h->counts_len)
+    {
+        return false;
+    }
+
+    move_next(iter);
+
+    return true;
+}
+
+static void _update_iterated_values(struct hdr_iter* iter, int64_t new_value_iterated_to)
+{
+    iter->value_iterated_from = iter->value_iterated_to;
+    iter->value_iterated_to = new_value_iterated_to;
+}
+
+static bool _all_values_iter_next(struct hdr_iter* iter)
+{
+    bool result = move_next(iter);
+
+    if (result)
+    {
+        _update_iterated_values(iter, iter->value);
+    }
+
+    return result;
+}
+
+void hdr_iter_init(struct hdr_iter* iter, const struct hdr_histogram* h)
+{
+    iter->h = h;
+
+    iter->counts_index = -1;
+    iter->total_count = h->total_count;
+    iter->count = 0;
+    iter->cumulative_count = 0;
+    iter->value = 0;
+    iter->highest_equivalent_value = 0;
+    iter->value_iterated_from = 0;
+    iter->value_iterated_to = 0;
+
+    iter->_next_fp = _all_values_iter_next;
+}
+
+bool hdr_iter_next(struct hdr_iter* iter)
+{
+    return iter->_next_fp(iter);
+}
+
+// ########  ######## ########   ######  ######## ##    ## ######## #### ##       ########  ######
+// ##     ## ##       ##     ## ##    ## ##       ###   ##    ##     ##  ##       ##       ##    ##
+// ##     ## ##       ##     ## ##       ##       ####  ##    ##     ##  ##       ##       ##
+// ########  ######   ########  ##       ######   ## ## ##    ##     ##  ##       ######    ######
+// ##        ##       ##   ##   ##       ##       ##  ####    ##     ##  ##       ##             ##
+// ##        ##       ##    ##  ##    ## ##       ##   ###    ##     ##  ##       ##       ##    ##
+// ##        ######## ##     ##  ######  ######## ##    ##    ##    #### ######## ########  ######
+
+static bool _percentile_iter_next(struct hdr_iter* iter)
+{
+    struct hdr_iter_percentiles* percentiles = &iter->specifics.percentiles;
+
+    if (!has_next(iter))
+    {
+        if (percentiles->seen_last_value)
+        {
+            return false;
+        }
+
+        percentiles->seen_last_value = true;
+        percentiles->percentile = 100.0;
+
+        return true;
+    }
+
+    if (iter->counts_index == -1 && !_basic_iter_next(iter))
+    {
+        return false;
+    }
+
+    do
+    {
+        double current_percentile = (100.0 * (double) iter->cumulative_count) / iter->h->total_count;
+        if (iter->count != 0 &&
+                percentiles->percentile_to_iterate_to <= current_percentile)
+        {
+            _update_iterated_values(iter, highest_equivalent_value(iter->h, iter->value));
+
+            percentiles->percentile = percentiles->percentile_to_iterate_to;
+            int64_t temp = (int64_t)(log(100 / (100.0 - (percentiles->percentile_to_iterate_to))) / log(2)) + 1;
+            int64_t half_distance = (int64_t) pow(2, (double) temp);
+            int64_t percentile_reporting_ticks = percentiles->ticks_per_half_distance * half_distance;
+            percentiles->percentile_to_iterate_to += 100.0 / percentile_reporting_ticks;
+
+            return true;
+        }
+    }
+    while (_basic_iter_next(iter));
+
+    return true;
+}
+
+void hdr_iter_percentile_init(struct hdr_iter* iter, const struct hdr_histogram* h, int32_t ticks_per_half_distance)
+{
+    iter->h = h;
+
+    hdr_iter_init(iter, h);
+
+    iter->specifics.percentiles.seen_last_value          = false;
+    iter->specifics.percentiles.ticks_per_half_distance  = ticks_per_half_distance;
+    iter->specifics.percentiles.percentile_to_iterate_to = 0.0;
+    iter->specifics.percentiles.percentile               = 0.0;
+
+    iter->_next_fp = _percentile_iter_next;
+}
+
+static void format_line_string(char* str, size_t len, int significant_figures, format_type format)
+{
+#if defined(_MSC_VER)
+#define snprintf _snprintf
+#pragma warning(push)
+#pragma warning(disable: 4996)
+#endif
+    const char* format_str = "%s%d%s";
+
+    switch (format)
+    {
+        case CSV:
+            snprintf(str, len, format_str, "%.", significant_figures, "f,%f,%d,%.2f\n");
+            break;
+        case CLASSIC:
+            snprintf(str, len, format_str, "%12.", significant_figures, "f %12f %12d %12.2f\n");
+            break;
+        default:
+            snprintf(str, len, format_str, "%12.", significant_figures, "f %12f %12d %12.2f\n");
+    }
+#if defined(_MSC_VER)
+#undef snprintf
+#pragma warning(pop)
+#endif
+}
+
+
+// ########  ########  ######   #######  ########  ########  ######## ########
+// ##     ## ##       ##    ## ##     ## ##     ## ##     ## ##       ##     ##
+// ##     ## ##       ##       ##     ## ##     ## ##     ## ##       ##     ##
+// ########  ######   ##       ##     ## ########  ##     ## ######   ##     ##
+// ##   ##   ##       ##       ##     ## ##   ##   ##     ## ##       ##     ##
+// ##    ##  ##       ##    ## ##     ## ##    ##  ##     ## ##       ##     ##
+// ##     ## ########  ######   #######  ##     ## ########  ######## ########
+
+
+static bool _recorded_iter_next(struct hdr_iter* iter)
+{
+    while (_basic_iter_next(iter))
+    {
+        if (iter->count != 0)
+        {
+            _update_iterated_values(iter, iter->value);
+
+            iter->specifics.recorded.count_added_in_this_iteration_step = iter->count;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void hdr_iter_recorded_init(struct hdr_iter* iter, const struct hdr_histogram* h)
+{
+    hdr_iter_init(iter, h);
+
+    iter->specifics.recorded.count_added_in_this_iteration_step = 0;
+
+    iter->_next_fp = _recorded_iter_next;
+}
+
+// ##       #### ##    ## ########    ###    ########
+// ##        ##  ###   ## ##         ## ##   ##     ##
+// ##        ##  ####  ## ##        ##   ##  ##     ##
+// ##        ##  ## ## ## ######   ##     ## ########
+// ##        ##  ##  #### ##       ######### ##   ##
+// ##        ##  ##   ### ##       ##     ## ##    ##
+// ######## #### ##    ## ######## ##     ## ##     ##
+
+
+static bool _iter_linear_next(struct hdr_iter* iter)
+{
+    struct hdr_iter_linear* linear = &iter->specifics.linear;
+
+    linear->count_added_in_this_iteration_step = 0;
+
+    if (has_next(iter) ||
+        next_value_greater_than_reporting_level_upper_bound(
+            iter, linear->next_value_reporting_level_lowest_equivalent))
+    {
+        do
+        {
+            if (iter->value >= linear->next_value_reporting_level_lowest_equivalent)
+            {
+                _update_iterated_values(iter, linear->next_value_reporting_level);
+
+                linear->next_value_reporting_level += linear->value_units_per_bucket;
+                linear->next_value_reporting_level_lowest_equivalent =
+                    lowest_equivalent_value(iter->h, linear->next_value_reporting_level);
+
+                return true;
+            }
+
+            if (!move_next(iter))
+            {
+                return true;
+            }
+
+            linear->count_added_in_this_iteration_step += iter->count;
+        }
+        while (true);
+    }
+
+    return false;
+}
+
+
+void hdr_iter_linear_init(struct hdr_iter* iter, const struct hdr_histogram* h, int64_t value_units_per_bucket)
+{
+    hdr_iter_init(iter, h);
+
+    iter->specifics.linear.count_added_in_this_iteration_step = 0;
+    iter->specifics.linear.value_units_per_bucket = value_units_per_bucket;
+    iter->specifics.linear.next_value_reporting_level = value_units_per_bucket;
+    iter->specifics.linear.next_value_reporting_level_lowest_equivalent = lowest_equivalent_value(h, value_units_per_bucket);
+
+    iter->_next_fp = _iter_linear_next;
+}
+
+// ##        #######   ######      ###    ########  #### ######## ##     ## ##     ## ####  ######
+// ##       ##     ## ##    ##    ## ##   ##     ##  ##     ##    ##     ## ###   ###  ##  ##    ##
+// ##       ##     ## ##         ##   ##  ##     ##  ##     ##    ##     ## #### ####  ##  ##
+// ##       ##     ## ##   #### ##     ## ########   ##     ##    ######### ## ### ##  ##  ##
+// ##       ##     ## ##    ##  ######### ##   ##    ##     ##    ##     ## ##     ##  ##  ##
+// ##       ##     ## ##    ##  ##     ## ##    ##   ##     ##    ##     ## ##     ##  ##  ##    ##
+// ########  #######   ######   ##     ## ##     ## ####    ##    ##     ## ##     ## ####  ######
+
+static bool _log_iter_next(struct hdr_iter *iter)
+{
+    struct hdr_iter_log* logarithmic = &iter->specifics.log;
+
+    logarithmic->count_added_in_this_iteration_step = 0;
+
+    if (has_next(iter) ||
+        next_value_greater_than_reporting_level_upper_bound(
+            iter, logarithmic->next_value_reporting_level_lowest_equivalent))
+    {
+        do
+        {
+            if (iter->value >= logarithmic->next_value_reporting_level_lowest_equivalent)
+            {
+                _update_iterated_values(iter, logarithmic->next_value_reporting_level);
+
+                logarithmic->next_value_reporting_level *= (int64_t)logarithmic->log_base;
+                logarithmic->next_value_reporting_level_lowest_equivalent = lowest_equivalent_value(iter->h, logarithmic->next_value_reporting_level);
+
+                return true;
+            }
+
+            if (!move_next(iter))
+            {
+                return true;
+            }
+
+            logarithmic->count_added_in_this_iteration_step += iter->count;
+        }
+        while (true);
+    }
+
+    return false;
+}
+
+void hdr_iter_log_init(
+        struct hdr_iter* iter,
+        const struct hdr_histogram* h,
+        int64_t value_units_first_bucket,
+        double log_base)
+{
+    hdr_iter_init(iter, h);
+    iter->specifics.log.count_added_in_this_iteration_step = 0;
+    iter->specifics.log.log_base = log_base;
+    iter->specifics.log.next_value_reporting_level = value_units_first_bucket;
+    iter->specifics.log.next_value_reporting_level_lowest_equivalent = lowest_equivalent_value(h, value_units_first_bucket);
+
+    iter->_next_fp = _log_iter_next;
+}
+
+// Printing.
+
+static const char* format_head_string(format_type format)
+{
+    switch (format)
+    {
+        case CSV:
+            return "%s,%s,%s,%s\n";
+        case CLASSIC:
+            return "%12s %12s %12s %12s\n\n";
+        default:
+            return "%12s %12s %12s %12s\n\n";
+    }
+}
+
+static const char CLASSIC_FOOTER[] =
+    "#[Mean    = %12.3f, StdDeviation   = %12.3f]\n"
+    "#[Max     = %12.3f, Total count    = %12" PRIu64 "]\n"
+    "#[Buckets = %12d, SubBuckets     = %12d]\n";
+
+int hdr_percentiles_print(
+        struct hdr_histogram* h, FILE* stream, int32_t ticks_per_half_distance,
+        double value_scale, format_type format)
+{
+    char line_format[25];
+    format_line_string(line_format, 25, h->significant_figures, format);
+    const char* head_format = format_head_string(format);
+    int rc = 0;
+
+    struct hdr_iter iter;
+    hdr_iter_percentile_init(&iter, h, ticks_per_half_distance);
+
+    if (fprintf(
+            stream, head_format,
+            "Value", "Percentile", "TotalCount", "1/(1-Percentile)") < 0)
+    {
+        rc = EIO;
+        goto cleanup;
+    }
+
+    struct hdr_iter_percentiles * percentiles = &iter.specifics.percentiles;
+    while (hdr_iter_next(&iter))
+    {
+        double  value               = iter.highest_equivalent_value / value_scale;
+        double  percentile          = percentiles->percentile / 100.0;
+        int64_t total_count         = iter.cumulative_count;
+        double  inverted_percentile = (1.0 / (1.0 - percentile));
+
+        if (fprintf(
+                stream, line_format, value, percentile, total_count, inverted_percentile) < 0)
+        {
+            rc = EIO;
+            goto cleanup;
+        }
+    }
+
+    if (CLASSIC == format)
+    {
+        double mean   = hdr_mean(h)   / value_scale;
+        double stddev = hdr_stddev(h) / value_scale;
+        double max    = hdr_max(h)    / value_scale;
+
+        if (fprintf(
+                stream, CLASSIC_FOOTER,  mean, stddev, max,
+                h->total_count, h->bucket_count, h->sub_bucket_count) < 0)
+        {
+            rc = EIO;
+            goto cleanup;
+        }
+    }
+
+    cleanup:
+    return rc;
+}
diff --git a/debian/modules/nchan/src/util/hdr_histogram.h b/debian/modules/nchan/src/util/hdr_histogram.h
new file mode 100644
index 0000000..010a4b8
--- /dev/null
+++ b/debian/modules/nchan/src/util/hdr_histogram.h
@@ -0,0 +1,427 @@
+/**
+ * hdr_histogram.h
+ * Written by Michael Barker and released to the public domain,
+ * as explained at http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * The source for the hdr_histogram utilises a few C99 constructs, specifically
+ * the use of stdint/stdbool and inline variable declaration.
+ */
+
+#ifndef HDR_HISTOGRAM_H
+#define HDR_HISTOGRAM_H 1
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+struct hdr_histogram
+{
+    int64_t lowest_trackable_value;
+    int64_t highest_trackable_value;
+    int32_t unit_magnitude;
+    int32_t significant_figures;
+    int32_t sub_bucket_half_count_magnitude;
+    int32_t sub_bucket_half_count;
+    int64_t sub_bucket_mask;
+    int32_t sub_bucket_count;
+    int32_t bucket_count;
+    int64_t min_value;
+    int64_t max_value;
+    int32_t normalizing_index_offset;
+    double conversion_ratio;
+    int32_t counts_len;
+    int64_t total_count;
+    int64_t* counts;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Allocate the memory and initialise the hdr_histogram.
+ *
+ * Due to the size of the histogram being the result of some reasonably
+ * involved math on the input parameters this function it is tricky to stack allocate.
+ * The histogram is allocated in a single contigious block so can be delete via free,
+ * without any structure specific destructor.
+ *
+ * @param lowest_trackable_value The smallest possible value to be put into the
+ * histogram.
+ * @param highest_trackable_value The largest possible value to be put into the
+ * histogram.
+ * @param significant_figures The level of precision for this histogram, i.e. the number
+ * of figures in a decimal number that will be maintained.  E.g. a value of 3 will mean
+ * the results from the histogram will be accurate up to the first three digits.  Must
+ * be a value between 1 and 5 (inclusive).
+ * @param result Output parameter to capture allocated histogram.
+ * @return 0 on success, EINVAL if lowest_trackable_value is < 1 or the
+ * significant_figure value is outside of the allowed range, ENOMEM if malloc
+ * failed.
+ */
+int hdr_init_nchan_shm(
+    int64_t lowest_trackable_value,
+    int64_t highest_trackable_value,
+    int significant_figures,
+    struct hdr_histogram** result);
+
+/**
+ * Free the memory and close the hdr_histogram.
+ *
+ * @param h The histogram you want to close.
+ */
+void hdr_close_nchan_shm(struct hdr_histogram* h);
+
+
+/**
+ * Reset a histogram to zero - empty out a histogram and re-initialise it
+ *
+ * If you want to re-use an existing histogram, but reset everything back to zero, this
+ * is the routine to use.
+ *
+ * @param h The histogram you want to reset to empty.
+ *
+ */
+void hdr_reset(struct hdr_histogram* h);
+
+/**
+ * Get the memory size of the hdr_histogram.
+ *
+ * @param h "This" pointer
+ * @return The amount of memory used by the hdr_histogram in bytes
+ */
+size_t hdr_get_memory_size(struct hdr_histogram* h);
+
+/**
+ * Records a value in the histogram, will round this value of to a precision at or better
+ * than the significant_figure specified at construction time.
+ *
+ * @param h "This" pointer
+ * @param value Value to add to the histogram
+ * @return false if the value is larger than the highest_trackable_value and can't be recorded,
+ * true otherwise.
+ */
+bool hdr_record_value(struct hdr_histogram* h, int64_t value);
+
+/**
+ * Records count values in the histogram, will round this value of to a
+ * precision at or better than the significant_figure specified at construction
+ * time.
+ *
+ * @param h "This" pointer
+ * @param value Value to add to the histogram
+ * @param count Number of 'value's to add to the histogram
+ * @return false if any value is larger than the highest_trackable_value and can't be recorded,
+ * true otherwise.
+ */
+bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count);
+
+
+/**
+ * Record a value in the histogram and backfill based on an expected interval.
+ *
+ * Records a value in the histogram, will round this value of to a precision at or better
+ * than the significant_figure specified at contruction time.  This is specifically used
+ * for recording latency.  If the value is larger than the expected_interval then the
+ * latency recording system has experienced co-ordinated omission.  This method fills in the
+ * values that would have occured had the client providing the load not been blocked.
+
+ * @param h "This" pointer
+ * @param value Value to add to the histogram
+ * @param expected_interval The delay between recording values.
+ * @return false if the value is larger than the highest_trackable_value and can't be recorded,
+ * true otherwise.
+ */
+bool hdr_record_corrected_value(struct hdr_histogram* h, int64_t value, int64_t expexcted_interval);
+/**
+ * Record a value in the histogram 'count' times.  Applies the same correcting logic
+ * as 'hdr_record_corrected_value'.
+ *
+ * @param h "This" pointer
+ * @param value Value to add to the histogram
+ * @param count Number of 'value's to add to the histogram
+ * @param expected_interval The delay between recording values.
+ * @return false if the value is larger than the highest_trackable_value and can't be recorded,
+ * true otherwise.
+ */
+bool hdr_record_corrected_values(struct hdr_histogram* h, int64_t value, int64_t count, int64_t expected_interval);
+
+/**
+ * Adds all of the values from 'from' to 'this' histogram.  Will return the
+ * number of values that are dropped when copying.  Values will be dropped
+ * if they around outside of h.lowest_trackable_value and
+ * h.highest_trackable_value.
+ *
+ * @param h "This" pointer
+ * @param from Histogram to copy values from.
+ * @return The number of values dropped when copying.
+ */
+int64_t hdr_add(struct hdr_histogram* h, const struct hdr_histogram* from);
+
+/**
+ * Adds all of the values from 'from' to 'this' histogram.  Will return the
+ * number of values that are dropped when copying.  Values will be dropped
+ * if they around outside of h.lowest_trackable_value and
+ * h.highest_trackable_value.
+ *
+ * @param h "This" pointer
+ * @param from Histogram to copy values from.
+ * @return The number of values dropped when copying.
+ */
+int64_t hdr_add_while_correcting_for_coordinated_omission(
+    struct hdr_histogram* h, struct hdr_histogram* from, int64_t expected_interval);
+
+/**
+ * Get minimum value from the histogram.  Will return 2^63-1 if the histogram
+ * is empty.
+ *
+ * @param h "This" pointer
+ */
+int64_t hdr_min(const struct hdr_histogram* h);
+
+/**
+ * Get maximum value from the histogram.  Will return 0 if the histogram
+ * is empty.
+ *
+ * @param h "This" pointer
+ */
+int64_t hdr_max(const struct hdr_histogram* h);
+
+/**
+ * Get the value at a specific percentile.
+ *
+ * @param h "This" pointer.
+ * @param percentile The percentile to get the value for
+ */
+int64_t hdr_value_at_percentile(const struct hdr_histogram* h, double percentile);
+
+/**
+ * Gets the standard deviation for the values in the histogram.
+ *
+ * @param h "This" pointer
+ * @return The standard deviation
+ */
+double hdr_stddev(const struct hdr_histogram* h);
+
+/**
+ * Gets the mean for the values in the histogram.
+ *
+ * @param h "This" pointer
+ * @return The mean
+ */
+double hdr_mean(const struct hdr_histogram* h);
+
+/**
+ * Determine if two values are equivalent with the histogram's resolution.
+ * Where "equivalent" means that value samples recorded for any two
+ * equivalent values are counted in a common total count.
+ *
+ * @param h "This" pointer
+ * @param a first value to compare
+ * @param b second value to compare
+ * @return 'true' if values are equivalent with the histogram's resolution.
+ */
+bool hdr_values_are_equivalent(const struct hdr_histogram* h, int64_t a, int64_t b);
+
+/**
+ * Get the lowest value that is equivalent to the given value within the histogram's resolution.
+ * Where "equivalent" means that value samples recorded for any two
+ * equivalent values are counted in a common total count.
+ *
+ * @param h "This" pointer
+ * @param value The given value
+ * @return The lowest value that is equivalent to the given value within the histogram's resolution.
+ */
+int64_t hdr_lowest_equivalent_value(const struct hdr_histogram* h, int64_t value);
+
+/**
+ * Get the count of recorded values at a specific value
+ * (to within the histogram resolution at the value level).
+ *
+ * @param h "This" pointer
+ * @param value The value for which to provide the recorded count
+ * @return The total count of values recorded in the histogram within the value range that is
+ * {@literal >=} lowestEquivalentValue(<i>value</i>) and {@literal <=} highestEquivalentValue(<i>value</i>)
+ */
+int64_t hdr_count_at_value(const struct hdr_histogram* h, int64_t value);
+
+int64_t hdr_count_at_index(const struct hdr_histogram* h, int32_t index);
+
+int64_t hdr_value_at_index(const struct hdr_histogram* h, int32_t index);
+
+struct hdr_iter_percentiles
+{
+    bool seen_last_value;
+    int32_t ticks_per_half_distance;
+    double percentile_to_iterate_to;
+    double percentile;
+};
+
+struct hdr_iter_recorded
+{
+    int64_t count_added_in_this_iteration_step;
+};
+
+struct hdr_iter_linear
+{
+    int64_t value_units_per_bucket;
+    int64_t count_added_in_this_iteration_step;
+    int64_t next_value_reporting_level;
+    int64_t next_value_reporting_level_lowest_equivalent;
+};
+
+struct hdr_iter_log
+{
+    double log_base;
+    int64_t count_added_in_this_iteration_step;
+    int64_t next_value_reporting_level;
+    int64_t next_value_reporting_level_lowest_equivalent;
+};
+
+/**
+ * The basic iterator.  This is a generic structure
+ * that supports all of the types of iteration.  Use
+ * the appropriate initialiser to get the desired
+ * iteration.
+ *
+ * @
+ */
+struct hdr_iter
+{
+    const struct hdr_histogram* h;
+    /** raw index into the counts array */
+    int32_t counts_index;
+    /** snapshot of the length at the time the iterator is created */
+    int32_t total_count;
+    /** value directly from array for the current counts_index */
+    int64_t count;
+    /** sum of all of the counts up to and including the count at this index */
+    int64_t cumulative_count;
+    /** The current value based on counts_index */
+    int64_t value;
+    int64_t highest_equivalent_value;
+    int64_t lowest_equivalent_value;
+    int64_t median_equivalent_value;
+    int64_t value_iterated_from;
+    int64_t value_iterated_to;
+
+    union
+    {
+        struct hdr_iter_percentiles percentiles;
+        struct hdr_iter_recorded recorded;
+        struct hdr_iter_linear linear;
+        struct hdr_iter_log log;
+    } specifics;
+
+    bool (* _next_fp)(struct hdr_iter* iter);
+
+};
+
+/**
+ * Initalises the basic iterator.
+ *
+ * @param itr 'This' pointer
+ * @param h The histogram to iterate over
+ */
+void hdr_iter_init(struct hdr_iter* iter, const struct hdr_histogram* h);
+
+/**
+ * Initialise the iterator for use with percentiles.
+ */
+void hdr_iter_percentile_init(struct hdr_iter* iter, const struct hdr_histogram* h, int32_t ticks_per_half_distance);
+
+/**
+ * Initialise the iterator for use with recorded values.
+ */
+void hdr_iter_recorded_init(struct hdr_iter* iter, const struct hdr_histogram* h);
+
+/**
+ * Initialise the iterator for use with linear values.
+ */
+void hdr_iter_linear_init(
+    struct hdr_iter* iter,
+    const struct hdr_histogram* h,
+    int64_t value_units_per_bucket);
+
+/**
+ * Initialise the iterator for use with logarithmic values
+ */
+void hdr_iter_log_init(
+    struct hdr_iter* iter,
+    const struct hdr_histogram* h,
+    int64_t value_units_first_bucket,
+    double log_base);
+
+/**
+ * Iterate to the next value for the iterator.  If there are no more values
+ * available return faluse.
+ *
+ * @param itr 'This' pointer
+ * @return 'false' if there are no values remaining for this iterator.
+ */
+bool hdr_iter_next(struct hdr_iter* iter);
+
+typedef enum
+{
+    CLASSIC,
+    CSV
+} format_type;
+
+/**
+ * Print out a percentile based histogram to the supplied stream.  Note that
+ * this call will not flush the FILE, this is left up to the user.
+ *
+ * @param h 'This' pointer
+ * @param stream The FILE to write the output to
+ * @param ticks_per_half_distance The number of iteration steps per half-distance to 100%
+ * @param value_scale Scale the output values by this amount
+ * @param format_type Format to use, e.g. CSV.
+ * @return 0 on success, error code on failure.  EIO if an error occurs writing
+ * the output.
+ */
+int hdr_percentiles_print(
+    struct hdr_histogram* h, FILE* stream, int32_t ticks_per_half_distance,
+    double value_scale, format_type format);
+
+/**
+* Internal allocation methods, used by hdr_dbl_histogram.
+*/
+struct hdr_histogram_bucket_config
+{
+    int64_t lowest_trackable_value;
+    int64_t highest_trackable_value;
+    int64_t unit_magnitude;
+    int64_t significant_figures;
+    int32_t sub_bucket_half_count_magnitude;
+    int32_t sub_bucket_half_count;
+    int64_t sub_bucket_mask;
+    int32_t sub_bucket_count;
+    int32_t bucket_count;
+    int32_t counts_len;
+};
+
+int hdr_calculate_bucket_config(
+    int64_t lowest_trackable_value,
+    int64_t highest_trackable_value,
+    int significant_figures,
+    struct hdr_histogram_bucket_config* cfg);
+
+void hdr_init_preallocated(struct hdr_histogram* h, struct hdr_histogram_bucket_config* cfg);
+
+int64_t hdr_size_of_equivalent_value_range(const struct hdr_histogram* h, int64_t value);
+
+int64_t hdr_next_non_equivalent_value(const struct hdr_histogram* h, int64_t value);
+
+int64_t hdr_median_equivalent_value(const struct hdr_histogram* h, int64_t value);
+
+/**
+ * Used to reset counters after importing data manuallying into the histogram, used by the logging code
+ * and other custom serialisation tools.
+ */
+void hdr_reset_internal_counters(struct hdr_histogram* h);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/debian/modules/nchan/src/util/nchan_benchmark.c b/debian/modules/nchan/src/util/nchan_benchmark.c
new file mode 100644
index 0000000..767f8c7
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_benchmark.c
@@ -0,0 +1,804 @@
+#include "nchan_benchmark.h"
+#include <subscribers/benchmark.h>
+#include <subscribers/websocket.h>
+#include <util/shmem.h>
+#include <store/memory/store.h>
+#include <store/memory/ipc-handlers.h>
+#include <assert.h>
+#include <sys/time.h> /* for struct timeval */
+#include <inttypes.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "BENCHMARK: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "BENCHMARK: " fmt, ##args)
+
+nchan_benchmark_t    bench;
+
+ngx_atomic_int_t    *worker_counter = NULL;
+ngx_int_t            bench_worker_number = 0;
+
+int nchan_benchmark_active(void) {
+  return bench.state && *bench.state > NCHAN_BENCHMARK_INACTIVE;
+}
+
+static ngx_int_t benchmark_client_respond(char *cstr) {
+  if(!bench.client) {
+    return NGX_ERROR;
+  }
+  nchan_msg_t    msg;
+  nchan_msg_id_t msgid = NCHAN_NEWEST_MSGID;
+  ngx_memzero(&msg, sizeof(msg));
+  msg.storage = NCHAN_MSG_STACK;
+  msg.id = msgid;
+  ngx_init_set_membuf(&msg.buf, (u_char *)cstr, (u_char *)&cstr[strlen(cstr)]);
+  msg.buf.last_buf = 1;
+  msg.buf.last_in_chain = 1;
+  bench.client->fn->respond_message(bench.client, &msg);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_init_module(ngx_cycle_t *cycle) {
+  bench.state = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_int_t), "benchmark state");
+  worker_counter = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_int_t), "benchmark worker counter");
+  bench.config = shm_calloc(nchan_store_memory_shmem, sizeof(*bench.config), "benchmark config (shared)");
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_init_worker(ngx_cycle_t *cycle) {
+  DBG("init worker");
+  bench_worker_number = ngx_atomic_fetch_add((ngx_atomic_uint_t *)worker_counter, 1);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_exit_master(ngx_cycle_t *cycle) {
+  shm_free(nchan_store_memory_shmem, bench.state);
+  shm_free(nchan_store_memory_shmem, worker_counter);
+  shm_free(nchan_store_memory_shmem, bench.config);
+  bench.state = NULL;
+  bench.config = NULL;
+  worker_counter = NULL;
+  return NGX_OK;
+}
+
+static ngx_int_t benchmark_publish_callback(ngx_int_t status, void *data, void *pd) {
+  struct      timeval tv;
+  uint64_t    t1;
+  uintptr_t   t0 = (uintptr_t )pd;
+  if(nchan_benchmark_active()) {
+    ngx_gettimeofday(&tv);
+    t1 = (tv.tv_sec - bench.time.init) * (uint64_t)1000000 + tv.tv_usec;
+    switch(status) {
+      case NCHAN_MESSAGE_QUEUED:
+      case NCHAN_MESSAGE_RECEIVED:
+        bench.data.msg_send_confirmed++;
+        break;
+      default:
+        bench.data.msg_send_failed++;
+    }
+    hdr_record_value(bench.data.msg_publishing_latency, t1-t0);
+  }
+  return NGX_OK;
+}
+
+static void benchmark_publish_message(nchan_benchmark_channel_t *chan) {
+  struct      timeval tv;
+  uint64_t    now;
+  u_char     *last;
+  uint64_t    msgnum;
+  nchan_msg_t msg;
+  ngx_str_t   channel_id;
+  
+  nchan_benchmark_channel_id(chan->n, &channel_id);
+  
+  msgnum = ngx_atomic_fetch_add(&chan->msg_count, 1);
+  
+  ngx_gettimeofday(&tv);
+  now = (tv.tv_sec - bench.time.init) * (uint64_t)1000000 + tv.tv_usec;
+  
+  last = ngx_snprintf(bench.msgbuf, 64, "%D %D zzzzzzzz", now, msgnum);
+  
+  //DBG("publish to channel %V msg #%D (t: %D)", &channel_id, msgnum, now);
+  
+  ngx_memzero(&msg, sizeof(msg));
+  msg.buf.temporary = 1;
+  msg.buf.memory = 1;
+  msg.buf.last_buf = 1;
+  msg.buf.pos = msg.buf.start = bench.msgbuf;
+  msg.buf.last = msg.buf.end = &last[bench.config->msg_padding];
+  msg.id.time = 0;
+  msg.id.tag.fixed[0] = 0;
+  msg.id.tagactive = 0;
+  msg.id.tagcount = 1;
+  msg.storage = NCHAN_MSG_STACK;
+  
+  msg.content_type = (ngx_str_t *)&NCHAN_CONTENT_TYPE_TEXT_PLAIN;
+  
+  bench.loc_conf->storage_engine->publish(&channel_id, &msg, bench.loc_conf, (callback_pt )benchmark_publish_callback, (void *)(uintptr_t)now);
+  bench.data.msg_sent++;
+}
+
+static ngx_int_t benchmark_publish_message_interval_timer(void *pd) {  
+  nchan_benchmark_channel_t *chan = pd;
+  if(!nchan_benchmark_active()) {
+    DBG("benchmark not running. stop trying to publish");
+    bench.timer.publishers[chan->n] = NULL;
+    return NGX_ABORT; //we're done here
+  }
+  
+  benchmark_publish_message(chan);
+  
+  return bench.base_msg_period;
+}
+
+static void benchmark_timer_running_stop(void *pd);
+static void benchmark_timer_finishing_check(void *pd);
+
+ngx_int_t nchan_benchmark_initialize(void) {
+  int           c, i;
+  subscriber_t **sub;
+  ngx_str_t     channel_id;
+  ngx_int_t     subs_per_channel;
+      
+  assert(bench.subs.array == NULL);
+  assert(bench.subs.n == 0);
+  
+  if(bench.config->subscriber_distribution == NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM) {
+    ngx_int_t divided_subs = bench.config->subscribers_per_channel / nchan_worker_processes;
+    ngx_int_t leftover_subs = bench.config->subscribers_per_channel % nchan_worker_processes;
+    for(c=0; c<bench.config->channels; c++) {
+      bench.subs.n += divided_subs;
+      if (c%nchan_worker_processes == bench_worker_number) {
+        bench.subs.n += leftover_subs;
+      }
+    }
+    DBG("bench.subs.n = %d", bench.subs.n);
+    bench.subs.array = ngx_alloc(sizeof(subscriber_t *) * bench.subs.n, ngx_cycle->log);
+    sub = &bench.subs.array[0];
+    
+    for(c=0; c<bench.config->channels; c++) {
+      subs_per_channel = divided_subs + (((c % nchan_worker_processes) == bench_worker_number) ? leftover_subs : 0);
+      //DBG("worker number %d channel %d subs %d", bench_worker_number, c, subs_per_channel);
+      nchan_benchmark_channel_id(c, &channel_id);
+      for(i=0; i<subs_per_channel; i++) {
+        *sub = benchmark_subscriber_create(&bench);
+        if((*sub)->fn->subscribe(*sub, &channel_id) != NGX_OK) {
+          return NGX_ERROR;
+        }
+        sub++;
+      }
+    }
+  }
+  else {
+    subs_per_channel = bench.config->subscribers_per_channel;
+    for(c=0; c<bench.config->channels; c++) {
+      nchan_benchmark_channel_id(c, &channel_id);
+      if(memstore_channel_owner(&channel_id) == ngx_process_slot) {
+        bench.subs.n += subs_per_channel;
+      }
+    }
+    bench.subs.array = ngx_alloc(sizeof(subscriber_t *) * bench.subs.n, ngx_cycle->log);
+    sub = &bench.subs.array[0];
+    
+    for(c=0; c<bench.config->channels; c++) {
+      nchan_benchmark_channel_id(c, &channel_id);
+      if(memstore_channel_owner(&channel_id) == ngx_process_slot) {
+        for(i=0; i<subs_per_channel; i++) {
+          *sub = benchmark_subscriber_create(&bench);
+          if((*sub)->fn->subscribe(*sub, &channel_id) != NGX_OK) {
+            return NGX_ERROR;
+          }
+          sub++;
+        }
+      }
+    }
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_run(void) {
+  uint64_t required_subs = bench.config->subscribers_per_channel * bench.config->channels;
+  assert(*bench.shared.subscribers_enqueued == required_subs);
+  int       i;
+  size_t msgbuf_maxlen = bench.config->msg_padding + 64;
+  unsigned pubstart;
+  int64_t total_offset = 0;
+  bench.msgbuf = ngx_alloc(msgbuf_maxlen, ngx_cycle->log);
+  ngx_memset(bench.msgbuf, 'z', msgbuf_maxlen);
+  
+  bench.base_msg_period = 1000.0/((double)bench.config->msgs_per_minute / 60.0);
+  assert(bench.timer.publishers == NULL);
+  bench.timer.publishers = ngx_alloc(sizeof(void *) * bench.config->channels, ngx_cycle->log);
+  if(bench.config->publisher_distribution == NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM) {
+    bench.base_msg_period *= nchan_worker_processes;
+    for(i=0; i < bench.config->channels; i++) {
+      pubstart = (rand() / (RAND_MAX / bench.base_msg_period));
+      total_offset += pubstart;
+      bench.timer.publishers[i] = nchan_add_interval_timer(benchmark_publish_message_interval_timer, &bench.shared.channels[i], pubstart);
+    }
+  }
+  else if(bench.config->publisher_distribution == NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_OPTIMAL) {
+    ngx_str_t channel_id;
+    for(i=0; i < bench.config->channels; i++) {
+      nchan_benchmark_channel_id(i, &channel_id);
+      if(memstore_channel_owner(&channel_id) == ngx_process_slot) {
+        pubstart = (rand() / (RAND_MAX / bench.base_msg_period));
+        total_offset += pubstart;
+        bench.timer.publishers[i] = nchan_add_interval_timer(benchmark_publish_message_interval_timer, &bench.shared.channels[i], pubstart);
+      }
+      else {
+        bench.timer.publishers[i] = NULL;
+      }
+    }
+  }
+  
+  return NGX_OK;
+}
+
+
+ngx_int_t nchan_benchmark_dequeue_subscribers(void) {
+  unsigned i;
+  for(i=0; i < bench.subs.n; i++) {
+    bench.subs.array[i]->fn->dequeue(bench.subs.array[i]);
+  }
+  ngx_free(bench.subs.array);
+  bench.subs.array = NULL;
+  bench.subs.n = 0;
+  return NGX_OK;
+}
+
+static void benchmark_timer_running_stop(void *pd) {
+  bench.timer.running = NULL;
+  bench.time.end = ngx_time();
+  memstore_ipc_broadcast_benchmark_stop();
+  nchan_benchmark_stop();
+  bench.timer.finishing = nchan_add_oneshot_timer(benchmark_timer_finishing_check, NULL, 3000);
+}
+static void benchmark_timer_finishing_check(void *pd) {
+  bench.timer.finishing = NULL;
+  nchan_benchmark_dequeue_subscribers();
+  bench.waiting_for_results = nchan_worker_processes - 1;
+  if(bench.waiting_for_results == 0) {
+    nchan_benchmark_finish_response();
+    nchan_benchmark_finish();
+  }
+  else {
+    memstore_ipc_broadcast_benchmark_finish();
+  }
+}
+
+ngx_int_t nchan_benchmark_receive_finished_data(nchan_benchmark_data_t *data) {
+  DBG("received benchmark data");
+  assert(bench.waiting_for_results > 0);
+  bench.waiting_for_results  --;
+  bench.data.msg_sent += data->msg_sent;
+  bench.data.msg_send_confirmed += data->msg_send_confirmed;
+  bench.data.msg_send_failed += data->msg_send_failed;
+  bench.data.msg_received += data->msg_received;
+  hdr_add(bench.data.msg_delivery_latency, data->msg_delivery_latency);
+  hdr_close_nchan_shm(data->msg_delivery_latency);
+  hdr_add(bench.data.msg_publishing_latency, data->msg_publishing_latency);
+  hdr_close_nchan_shm(data->msg_publishing_latency);
+  hdr_add(bench.data.subscriber_readiness_latency, data->subscriber_readiness_latency);
+  hdr_close_nchan_shm(data->subscriber_readiness_latency);
+  
+  if(bench.waiting_for_results  == 0) {
+    nchan_benchmark_finish_response();
+    nchan_benchmark_finish();
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_finish_response(void) {
+  u_char                *str;
+  ngx_http_request_t    *r = bench.client->request;
+  ngx_str_t             *accept_header = nchan_get_accept_header_value(r);
+  const char            *fmt;
+  char stats[2048];
+  fmt = 
+    "  \"start_time\":           %d,\n"
+    "  \"run_time_sec\":         %d,\n"
+    "  \"channels\":             %d,\n"
+    "  \"subscribers\":          %d,\n"
+    "  \"message_length\":       %d,\n"
+    "  \"messages\": {\n"
+    "    \"sent\":               %d,\n"
+    "    \"send_confirmed\":     %d,\n"
+    "    \"send_unconfirmed\":   %d,\n"
+    "    \"send_failed\":        %d,\n"
+    "    \"received\":           %d,\n"
+    "    \"unreceived\":         %d\n"
+    "  },\n"
+    "  \"message_publishing_latency\": {\n"
+    "    \"min\":               \"%.3fms\",\n"
+    "    \"avg\":               \"%.3fms\",\n"
+    "    \"99th_percentile\":   \"%.3fms\",\n"
+    "    \"max\":               \"%.3fms\",\n"
+    "    \"stddev\":            \"%.3fms\",\n"
+    "    \"samples\":            %D\n"
+    "  },\n"
+    "  \"message_delivery_latency\": {\n"
+    "    \"min\":               \"%.3fms\",\n"
+    "    \"avg\":               \"%.3fms\",\n"
+    "    \"99th_percentile\":   \"%.3fms\",\n"
+    "    \"max\":               \"%.3fms\",\n"
+    "    \"stddev\":            \"%.3fms\",\n"
+    "    \"samples\":            %D\n"
+    "  }%Z";
+    
+  ngx_snprintf((u_char *)stats, 2048, fmt, 
+    bench.time.start,
+    bench.time.end - bench.time.start,
+    bench.config->channels,
+    *bench.shared.subscribers_enqueued,
+    bench.config->msg_padding + 5,
+    bench.data.msg_sent,
+    bench.data.msg_send_confirmed,
+    bench.data.msg_sent - bench.data.msg_send_confirmed,
+    bench.data.msg_send_failed,
+    bench.data.msg_received,
+    bench.data.msg_sent * bench.config->subscribers_per_channel - bench.data.msg_received,
+    (double )hdr_min(bench.data.msg_publishing_latency)/1000.0,
+    (double )hdr_mean(bench.data.msg_publishing_latency)/1000.0,
+    (double )hdr_value_at_percentile(bench.data.msg_publishing_latency, 99.0)/1000.0,
+    (double )hdr_max(bench.data.msg_publishing_latency)/1000.0,
+    (double )hdr_stddev(bench.data.msg_publishing_latency)/1000.0,
+    bench.data.msg_publishing_latency->total_count,
+    
+    (double )hdr_min(bench.data.msg_delivery_latency)/1000.0,
+    (double )hdr_mean(bench.data.msg_delivery_latency)/1000.0,
+    (double )hdr_value_at_percentile(bench.data.msg_delivery_latency, 99.0)/1000.0,
+    (double )hdr_max(bench.data.msg_delivery_latency)/1000.0,
+    (double )hdr_stddev(bench.data.msg_delivery_latency)/1000.0,
+    bench.data.msg_delivery_latency->total_count
+  );
+  if(accept_header && ngx_strnstr(accept_header->data, "text/x-json-hdrhistogram", accept_header->len)) {
+    ngx_str_t *serialized_publishing_histogram, *serialized_delivery_histogram;
+    size_t sz;
+    fmt = 
+      "RESULTS\n"
+      "{\n"
+      "%s,\n"
+      "  \"message_publishing_histogram\":\n"
+      "    \"%V\",\n"
+      "  \"message_delivery_histogram\":\n"
+      "    \"%V\"\n"
+      "}\n"
+      "%Z";
+    sz = strlen(stats) + strlen(fmt);
+    serialized_publishing_histogram = nchan_hdrhistogram_serialize(bench.data.msg_publishing_latency, r->pool);
+    serialized_delivery_histogram = nchan_hdrhistogram_serialize(bench.data.msg_delivery_latency, r->pool);
+    
+    sz += serialized_publishing_histogram->len;
+    sz += serialized_delivery_histogram->len;
+    str = ngx_palloc(r->pool, sz);
+    if(str == NULL) {
+      benchmark_client_respond("ERROR: unable to create results response");
+      return NGX_ERROR;
+    }
+    
+    ngx_snprintf(str, sz, fmt, 
+      stats,
+      serialized_publishing_histogram,
+      serialized_delivery_histogram
+    );
+  }
+  else {
+        fmt = 
+      "RESULTS\n"
+      "{\n"
+      "%s\n"
+      "}\n"
+      "%Z";
+    str = ngx_palloc(r->pool, strlen(stats) + strlen(fmt));
+    ngx_sprintf(str, fmt, stats);
+  } 
+  
+  benchmark_client_respond((char *)str);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_abort(void) {
+  int active = nchan_benchmark_active();
+  
+  nchan_benchmark_dequeue_subscribers();
+  nchan_benchmark_stop();
+  nchan_benchmark_cleanup();
+  
+  return active ? NGX_OK : NGX_DECLINED;
+}
+
+ngx_int_t nchan_benchmark_stop(void) {
+  int i;
+  DBG("stop benchmark");
+  if(bench.timer.publishers) {
+    for(i=0; i< bench.config->channels; i++) {
+      if(bench.timer.publishers[i]) {
+        nchan_abort_interval_timer(bench.timer.publishers[i]);
+      }
+    }
+    ngx_free(bench.timer.publishers);
+    bench.timer.publishers = NULL;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_finish(void) {
+  //free all the things
+  shm_free(nchan_store_memory_shmem, (void *)bench.shared.subscribers_enqueued);
+  shm_free(nchan_store_memory_shmem, (void *)bench.shared.subscribers_dequeued);
+  shm_free(nchan_store_memory_shmem, bench.shared.channels);
+  hdr_close_nchan_shm(bench.data.msg_publishing_latency);
+  hdr_close_nchan_shm(bench.data.msg_delivery_latency);
+  hdr_close_nchan_shm(bench.data.subscriber_readiness_latency);
+  bench.client->fn->respond_status(bench.client, NGX_HTTP_GONE, NULL, NULL);
+  nchan_benchmark_cleanup();
+  DBG("benchmark finished");
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_cleanup(void) {
+  DBG("benchmark cleanup");
+  bench.client = NULL;
+  assert(bench.timer.publishers == NULL);
+  assert(bench.subs.array == NULL);
+  assert(bench.subs.n == 0);
+  bench.id = 0;
+  if(bench.msgbuf) {
+    ngx_free(bench.msgbuf);
+    bench.msgbuf = NULL;
+  }
+  
+  ngx_memzero(&bench.time, sizeof(bench.time));
+  *bench.state = NCHAN_BENCHMARK_INACTIVE;
+  bench.waiting_for_results = 0;
+  
+  if(bench.timer.ready) {
+    nchan_abort_interval_timer(bench.timer.ready);
+    bench.timer.ready = NULL;
+  }
+  if(bench.timer.running) {
+    nchan_abort_oneshot_timer(bench.timer.running);
+    bench.timer.running = NULL;
+  }
+  if(bench.timer.finishing) {
+    nchan_abort_oneshot_timer(bench.timer.finishing);
+    bench.timer.finishing = NULL;
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_channel_id(int n, ngx_str_t *chid) {
+  static u_char  id[255];
+  u_char        *last;
+  chid->data = id;
+  last = ngx_snprintf(id, 255, "/benchmark.%T-%D.%D", bench.time.init, bench.id, n);
+  chid->len = last - id;
+  return NGX_OK;
+}
+
+uint64_t nchan_benchmark_message_delivery_msec(nchan_msg_t *msg) {
+  struct timeval tv;
+  ngx_gettimeofday(&tv);
+  
+  uint64_t now = (tv.tv_sec - bench.time.init) * (uint64_t)1000000 + tv.tv_usec;
+  int then;
+  
+  if(ngx_buf_in_memory((&msg->buf))) {
+    then = atoi((char *)msg->buf.start);
+  }
+  else {
+    //not supported yet
+    then = now;
+    raise(SIGABRT);
+  }
+  
+  return now - then;
+}
+
+nchan_benchmark_t *nchan_benchmark_get_active(void) {
+  return &bench;
+}
+
+char throwaway_buf[128];
+static void serialize_int64_t(int write, char **cur, int64_t val) {
+  char  *buf;
+  buf = write ? *cur : throwaway_buf;
+  *cur += sprintf(buf, "%" PRId64 " ", val);
+}
+static void serialize_int32_t(int write, char **cur, int32_t val) {
+  char  *buf;
+  buf = write ? *cur : throwaway_buf;
+  *cur += sprintf(buf, "%" PRId32 " ", val);
+}
+static void serialize_double(int write, char **cur, double val) {
+  char  *buf;
+  buf = write ? *cur : throwaway_buf;
+  *cur += sprintf(buf, "%lf ", val);
+}
+static void serialize_numrun(int write, char **cur, int num, int runcount) {
+  char  *numrun="~!@#$%^&*";
+  char  *buf;
+  assert((size_t)num < strlen(numrun));
+  buf = write ? *cur : throwaway_buf;
+  if(runcount == 0) {
+    *cur += sprintf(buf, "%i ", num);
+  }
+  else {
+    *cur += sprintf(buf, "%c%i ", numrun[num], runcount);
+  }
+}
+
+size_t hdrhistogram_serialize(int write, char *start, const struct hdr_histogram* hdr) {
+  int    i;
+  char  *fakestart = NULL;
+  char **cur;
+  if(start == NULL) {
+    start = fakestart;
+  }
+  cur = &start;
+  char *first = start;
+  
+  serialize_int64_t(write, cur, hdr->lowest_trackable_value);
+  serialize_int64_t(write, cur, hdr->highest_trackable_value);
+  serialize_int32_t(write, cur, hdr->unit_magnitude);
+  serialize_int32_t(write, cur, hdr->significant_figures);
+  serialize_int32_t(write, cur, hdr->sub_bucket_half_count_magnitude);
+  serialize_int32_t(write, cur, hdr->sub_bucket_half_count);
+  serialize_int64_t(write, cur, hdr->sub_bucket_mask);
+  serialize_int32_t(write, cur, hdr->sub_bucket_count);
+  serialize_int32_t(write, cur, hdr->bucket_count);
+  serialize_int64_t(write, cur, hdr->min_value);
+  serialize_int64_t(write, cur, hdr->max_value);
+  serialize_int32_t(write, cur, hdr->normalizing_index_offset);
+  serialize_double (write, cur, hdr->conversion_ratio);
+  serialize_int32_t(write, cur, hdr->counts_len);
+  serialize_int64_t(write, cur, hdr->total_count);
+  
+  if(write) {
+    **cur='[';
+  }
+  (*cur)++;
+  
+  int runcount=0;
+  int64_t ncur=0, nprev=0;
+  for(i=1, nprev=hdr->counts[0]; i<hdr->counts_len; i++) {
+    ncur = hdr->counts[i];
+    nprev = hdr->counts[i-1];
+    if(ncur <= 8 && ncur == nprev) {
+      runcount++;
+    }
+    else {
+      if(runcount > 0) {
+        serialize_numrun(write, cur, nprev, runcount+1);
+        runcount = 0;
+      }
+      else {
+        serialize_int64_t(write, cur, nprev);
+      }
+    }
+  }
+  if(runcount > 0) {
+    serialize_numrun(write, cur, ncur, runcount+1);
+  }
+  else {
+    serialize_int64_t(write, cur, ncur);
+  }
+  
+  if(write) {
+    **cur=']';
+  }
+  (*cur)++;
+  
+  return *cur - first;
+}
+
+
+ngx_str_t *nchan_hdrhistogram_serialize(const struct hdr_histogram* hdr, ngx_pool_t *pool) {
+  char *start=NULL;
+  ngx_str_t *str = ngx_palloc(pool, sizeof(*str));
+  size_t sz = hdrhistogram_serialize(0, NULL, hdr);
+  start = ngx_palloc(pool, sz);
+  hdrhistogram_serialize(1, start, hdr);
+  str->data = (u_char *)start;
+  str->len = sz;
+  return str;
+}
+
+static ngx_int_t benchmark_timer_ready_check(void *pd) {
+  uint64_t required_subs = bench.config->subscribers_per_channel * bench.config->channels;
+  if(*bench.shared.subscribers_enqueued == required_subs) {
+    char     ready_reply[512];
+    assert(*bench.state == NCHAN_BENCHMARK_INITIALIZING);
+    *bench.state = NCHAN_BENCHMARK_READY;
+    ngx_snprintf((u_char *)ready_reply, 512, "READY\n"
+      "{\n"
+      "  \"init_time\":                        %T,\n"
+      "  \"time\":                             %T,\n"
+      "  \"messages_per_channel_per_minute\":  %d,\n"
+      "  \"message_padding_bytes\":            %d,\n"
+      "  \"channels\":                         %d,\n"
+      "  \"subscribers_per_channel\":          %d\n"
+      "}\n%Z",
+      bench.time.init,
+      bench.config->time,
+      bench.config->msgs_per_minute,
+      bench.config->msg_padding,
+      bench.config->channels,
+      bench.config->subscribers_per_channel);
+    
+    benchmark_client_respond(ready_reply);
+    bench.timer.ready = NULL;
+    return NGX_DONE;
+  }
+  else {
+    return NGX_AGAIN;
+  }
+}
+
+ngx_int_t nchan_benchmark_initialize_from_ipc(ngx_int_t initiating_worker_slot, nchan_loc_conf_t *cf, time_t init_time, uint32_t id, nchan_benchmark_shared_t *shared_data) {
+  DBG("init benchmark via IPC (time %d src %d)", init_time, initiating_worker_slot);
+  bench.loc_conf = cf;
+  bench.time.init = init_time;
+  bench.id = id;
+  bench.shared = *shared_data;
+  ngx_memzero(&bench.data, sizeof(bench.data));
+  hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_delivery_latency);
+  hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_publishing_latency);
+  hdr_init_nchan_shm(1, 10000000, 3, &bench.data.subscriber_readiness_latency);
+  
+  nchan_benchmark_initialize();
+  
+  return NGX_OK;
+}
+
+static ngx_int_t init_command_get_config_value(const char *config, ngx_str_t *cmd, ngx_int_t *val) {
+  ngx_str_t find;
+  u_char   *cur = cmd->data, *end = cmd->data + cmd->len, *vend;
+  find.data = (u_char *)config;
+  find.len = strlen(config);
+  if(nchan_strscanstr(&cur, &find, end)) {
+    if((vend = memchr(cur, ' ', end - cur)) == NULL) {
+      vend = end;
+    }
+    if((*val = ngx_atoi(cur, vend - cur)) == NGX_ERROR) {
+      return 0;
+    }
+    else {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+void benchmark_controller(subscriber_t *sub, nchan_msg_t *msg) {
+  ngx_str_t            cmd = {msg->buf.last - msg->buf.pos, msg->buf.pos};
+  ngx_http_request_t  *r = sub->request;
+  nchan_loc_conf_t   *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  
+  if(nchan_str_startswith(&cmd, "init")) {
+    int       i;
+    ngx_int_t val;
+    
+    if(!ngx_atomic_cmp_set((ngx_atomic_uint_t *)bench.state, NCHAN_BENCHMARK_INACTIVE, NCHAN_BENCHMARK_INITIALIZING)) {
+      benchmark_client_respond("ERROR: a benchmark is already initialized");
+      return;
+    }
+    
+    DBG("init benchmark");
+    benchmark_client_respond("INITIALIZING");
+    
+    bench.loc_conf = cf;
+    *bench.config = cf->benchmark;
+    
+    if(init_command_get_config_value(" time=", &cmd, &val)) {
+      bench.config->time = val;
+    }
+    if(init_command_get_config_value(" messages_per_channel_per_minute=", &cmd, &val)) {
+      bench.config->msgs_per_minute = val;
+    }
+    if(init_command_get_config_value(" message_padding_bytes=", &cmd, &val)) {
+      bench.config->msg_padding = val;
+    }
+    if(init_command_get_config_value(" channels=", &cmd, &val)) {
+      bench.config->channels = val;
+    }
+    if(init_command_get_config_value(" subscribers_per_channel=", &cmd, &val)) {
+      bench.config->subscribers_per_channel = val;
+    }
+    
+    bench.time.init = ngx_time();
+    bench.id = rand();
+    bench.client = sub;
+    ngx_memzero(&bench.data, sizeof(bench.data));
+    
+    bench.shared.subscribers_enqueued = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_t), "hdrhistogram subscribers_enqueued count");
+    bench.shared.subscribers_dequeued = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_t), "hdrhistogram subscribers_dequeued count");
+    bench.shared.channels = shm_calloc(nchan_store_memory_shmem, sizeof(nchan_benchmark_channel_t) * bench.config->channels, "benchmark channel states");
+    hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_delivery_latency);
+    hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_publishing_latency);
+    hdr_init_nchan_shm(1, 10000000, 3, &bench.data.subscriber_readiness_latency);
+    
+    for(i=0; i<bench.config->channels; i++) {
+      bench.shared.channels[i].n=i;
+      bench.shared.channels[i].msg_count=0;
+    }
+    
+    bench.msgbuf = NULL;
+    
+    //broadcast workload to other workers
+    memstore_ipc_broadcast_benchmark_initialize(&bench);
+    
+    nchan_benchmark_initialize();
+    
+    bench.timer.ready = nchan_add_interval_timer(benchmark_timer_ready_check, NULL, 250);
+  }
+  else if(nchan_strmatch(&cmd, 2, "run", "start")) {
+    if(!ngx_atomic_cmp_set((ngx_atomic_uint_t *)bench.state, NCHAN_BENCHMARK_READY, NCHAN_BENCHMARK_RUNNING)) {
+      benchmark_client_respond(*bench.state < NCHAN_BENCHMARK_READY ? "ERROR: not ready" : "ERROR: already running");
+      return;
+    }
+    
+    bench.time.start = ngx_time();
+    benchmark_client_respond("RUNNING");
+    
+    memstore_ipc_broadcast_benchmark_run();
+    nchan_benchmark_run();
+    
+    bench.timer.running = nchan_add_oneshot_timer(benchmark_timer_running_stop, NULL, bench.config->time * 1000);
+  }
+  else if(nchan_strmatch(&cmd, 2, "finish", "end")) {
+    //benchmark_finish();
+  }
+  else if(nchan_strmatch(&cmd, 1, "abort"))  {
+    if(nchan_benchmark_abort() == NGX_OK) {
+      memstore_ipc_broadcast_benchmark_abort();
+      benchmark_client_respond("ABORTED");
+    }
+    else {
+      benchmark_client_respond("ERROR: no active benchmark to abort");
+    }
+  }
+  else {
+    benchmark_client_respond("ERROR: unknown command");
+  }
+}
+
+void benchmark_request_cleanup_handler(void *pd) {
+  if(nchan_benchmark_abort() == NGX_OK) {
+    memstore_ipc_broadcast_benchmark_abort();
+  }
+  bench.client = NULL;
+}
+
+ngx_int_t nchan_benchmark_ws_initialize(ngx_http_request_t *r) {
+  nchan_msg_id_t          newest_msgid = NCHAN_NEWEST_MSGID;
+  ngx_http_cleanup_t     *cln;
+  if(!nchan_detect_websocket_request(r)) {
+    return NGX_HTTP_BAD_REQUEST;
+  }
+  
+  if(nchan_benchmark_active()) {
+    return nchan_respond_cstring(r, NGX_HTTP_CONFLICT, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "benchmark already running", 0);
+  }
+  if(bench.client) {
+    return nchan_respond_cstring(r, NGX_HTTP_CONFLICT, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "benchmark client already running", 0);
+  }
+  if((cln = ngx_http_cleanup_add(r, 0)) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  cln->data = NULL;
+  cln->handler = benchmark_request_cleanup_handler;
+  if((bench.client = websocket_subscriber_create(r, &newest_msgid)) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  websocket_intercept_published_message(bench.client, &benchmark_controller);
+  bench.client->fn->enqueue(bench.client);
+  
+  
+  return NGX_DONE;
+}
diff --git a/debian/modules/nchan/src/util/nchan_benchmark.h b/debian/modules/nchan/src/util/nchan_benchmark.h
new file mode 100644
index 0000000..c9bab81
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_benchmark.h
@@ -0,0 +1,91 @@
+#ifndef NCHAN_BENCHMARK_H
+#define NCHAN_BENCHMARK_H
+
+#include <nchan_module.h>
+#include <util/hdr_histogram.h>
+
+typedef struct {
+  struct hdr_histogram* msg_publishing_latency;
+  struct hdr_histogram* msg_delivery_latency;
+  struct hdr_histogram* subscriber_readiness_latency;
+  uint64_t              msg_sent;
+  uint64_t              msg_send_confirmed;
+  uint64_t              msg_send_failed;
+  uint64_t              msg_received;
+} nchan_benchmark_data_t;
+
+typedef struct {
+  uint64_t              n;
+  ngx_atomic_t          msg_count;
+  u_char               *msgbuf;
+} nchan_benchmark_channel_t;
+
+typedef struct {
+  ngx_atomic_t              *subscribers_enqueued;
+  ngx_atomic_t              *subscribers_dequeued;
+  nchan_benchmark_channel_t *channels;
+} nchan_benchmark_shared_t;
+
+
+#define NCHAN_BENCHMARK_INACTIVE      0
+#define NCHAN_BENCHMARK_INITIALIZING  1
+#define NCHAN_BENCHMARK_READY         2
+#define NCHAN_BENCHMARK_RUNNING       3
+#define NCHAN_BENCHMARK_FINISHED      4
+
+typedef struct nchan_benchmark_s nchan_benchmark_t;
+struct nchan_benchmark_s {
+  subscriber_t       *client;
+  nchan_benchmark_conf_t   *config;
+  nchan_loc_conf_t   *loc_conf;
+  uint32_t            id;
+  struct {
+    time_t              init;
+    time_t              start;
+    time_t              end;
+  }                   time;
+  struct {
+    void             *ready;
+    void             *running;
+    void             *finishing;
+    void            **publishers;
+  }                   timer;
+  u_char             *msgbuf;
+  ngx_atomic_int_t   *state;
+  struct {
+    size_t              n;
+    subscriber_t      **array;
+  }                   subs;
+  unsigned            base_msg_period;
+  int                 waiting_for_results;
+  nchan_benchmark_shared_t shared;
+  nchan_benchmark_data_t data;
+  
+}; //nchan_benchmark_t
+
+int nchan_benchmark_active(void);
+  
+ngx_int_t nchan_benchmark_init_module(ngx_cycle_t *cycle);
+ngx_int_t nchan_benchmark_init_worker(ngx_cycle_t *cycle);
+ngx_int_t nchan_benchmark_exit_master(ngx_cycle_t *cycle);
+
+ngx_int_t nchan_benchmark_initialize(void);
+ngx_int_t nchan_benchmark_initialize_from_ipc(ngx_int_t initiating_worker_slot, nchan_loc_conf_t *cf, time_t time_start, uint32_t id, nchan_benchmark_shared_t *shared_data);
+ngx_int_t nchan_benchmark_run(void);
+
+ngx_int_t nchan_benchmark_stop(void);
+ngx_int_t nchan_benchmark_dequeue_subscribers(void);
+ngx_int_t nchan_benchmark_finish_response(void);
+ngx_str_t *nchan_hdrhistogram_serialize(const struct hdr_histogram* hdr, ngx_pool_t *pool);
+ngx_int_t nchan_benchmark_receive_finished_data(nchan_benchmark_data_t *data);
+ngx_int_t nchan_benchmark_finish(void);
+ngx_int_t nchan_benchmark_abort(void);
+ngx_int_t nchan_benchmark_cleanup(void);
+
+ngx_int_t nchan_benchmark_channel_id(int n, ngx_str_t *chid);
+uint64_t nchan_benchmark_message_delivery_msec(nchan_msg_t *msg);
+nchan_benchmark_t *nchan_benchmark_get_active(void);
+
+
+ngx_int_t nchan_benchmark_ws_initialize(ngx_http_request_t *r);
+#endif //NCHAN_BENCHMARK_H
diff --git a/debian/modules/nchan/src/util/nchan_bufchainpool.c b/debian/modules/nchan/src/util/nchan_bufchainpool.c
index 175c044..2148c11 100644
--- a/debian/modules/nchan/src/util/nchan_bufchainpool.c
+++ b/debian/modules/nchan/src/util/nchan_bufchainpool.c
@@ -31,6 +31,8 @@ static void validate_stuff(nchan_bufchain_pool_t *bcp) {
 }
 */
 
+
+
 nchan_buf_and_chain_t *nchan_bufchain_pool_reserve(nchan_bufchain_pool_t *bcp, ngx_int_t count) {
   nchan_bufchain_link_t      *cur = NULL, *last = NULL, *first = NULL;
   nchan_bufchain_link_t      **rhead = &bcp->bc_recycle_head;
@@ -66,6 +68,82 @@ nchan_buf_and_chain_t *nchan_bufchain_pool_reserve(nchan_bufchain_pool_t *bcp, n
   return &first->bc;
 }
 
+static ngx_buf_t *nchan_bufchain_append(nchan_bufchain_pool_t *bcp) {
+  static ngx_buf_t            throwaway;
+  ngx_chain_t                *chain;
+  ngx_chain_t               **rhead = &bcp->bc.recycle_head;
+  
+  if(*rhead) {
+    chain = *rhead;
+    *rhead = chain->next;
+    bcp->bc.recycle_count --;
+  } 
+  else {
+    nchan_buf_and_chain_t *bufchain = ngx_palloc(bcp->pool, sizeof(*bufchain));
+    if(bufchain == NULL) {
+      nchan_log_error("unable to palloc bufchain");
+      return &throwaway;
+    }
+    chain = &bufchain->chain;
+    chain->buf = &bufchain->buf;
+  }
+  
+  chain->buf->last_buf = 1;
+  chain->buf->last_in_chain = 1;
+  chain->next = NULL;
+  
+  if(!bcp->bc.head) {
+    bcp->bc.head = chain;
+  }
+  
+  if(bcp->bc.tail) {
+    ngx_buf_t *tbuf = bcp->bc.tail->buf;
+    tbuf->last_buf = 0;
+    tbuf->last_in_chain = 0;
+    bcp->bc.tail->next = chain;
+  }
+  bcp->bc.tail = chain;
+  bcp->bc.count++;
+  return chain->buf;
+}
+
+ngx_int_t nchan_bufchain_append_buf(nchan_bufchain_pool_t *bcp, ngx_buf_t *inbuf) {
+  ngx_buf_t *buf = nchan_bufchain_append(bcp);
+  *buf = *inbuf;
+  buf->last_buf = 1;
+  buf->last_in_chain = 1;
+  bcp->bc.length += ngx_buf_size(inbuf);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_bufchain_append_str(nchan_bufchain_pool_t *bcp, ngx_str_t *str) {
+  ngx_buf_t *buf = nchan_bufchain_append(bcp);
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = str->data;
+  buf->pos = buf->start;
+  buf->end = str->data + str->len;
+  buf->last = buf->end;
+  buf->memory = 1;
+  buf->last_buf = 1;
+  buf->last_in_chain = 1;
+  bcp->bc.length += str->len;
+  return NGX_OK;
+}
+ngx_int_t nchan_bufchain_append_cstr(nchan_bufchain_pool_t *bcp, char *cstr) {
+  ngx_str_t str;
+  str.data = (u_char *)cstr;
+  str.len = strlen(cstr);
+  return nchan_bufchain_append_str(bcp, &str);
+}
+
+size_t nchan_bufchain_length(nchan_bufchain_pool_t *bcp) {
+  return bcp->bc.length;
+}
+ngx_chain_t *nchan_bufchain_first_chain(nchan_bufchain_pool_t *bcp) {
+  return bcp->bc.head;
+}
+
+
 ngx_file_t *nchan_bufchain_pool_reserve_file(nchan_bufchain_pool_t *bcp) {
   nchan_file_link_t    *cur;
   //validate_stuff(bcp);
@@ -103,6 +181,13 @@ ngx_int_t nchan_bufchain_pool_init(nchan_bufchain_pool_t *bcp, ngx_pool_t *pool)
   bcp->bc_head = NULL;
   bcp->bc_recycle_head = NULL;
   
+  bcp->bc.head = NULL;
+  bcp->bc.tail = NULL;
+  bcp->bc.recycle_head = NULL;
+  bcp->bc.count = 0;
+  bcp->bc.recycle_count = 0;
+  bcp->bc.length = 0;
+  
   bcp->file_head = NULL;
   bcp->file_recycle_head = NULL;
   
@@ -115,6 +200,17 @@ void nchan_bufchain_pool_flush(nchan_bufchain_pool_t *bcp) {
   nchan_bufchain_link_t      *cur;
   nchan_file_link_t          *fcur, **fhead = &bcp->file_head, **rfhead = &bcp->file_recycle_head;
   //validate_stuff(bcp);
+  
+  if(bcp->bc.tail) {
+    bcp->bc.tail->next = bcp->bc.recycle_head; //link just-used and recycled-in-waiting chains
+  }
+  bcp->bc.recycle_head = bcp->bc.head;
+  bcp->bc.recycle_count += bcp->bc.count;
+  bcp->bc.count = 0;
+  bcp->bc.length = 0;
+  bcp->bc.tail = NULL;
+  bcp->bc.head = NULL;
+  
   while(bcp->bc_head != NULL) {
     cur = bcp->bc_head;
     bcp->bc_head = cur->next;
diff --git a/debian/modules/nchan/src/util/nchan_bufchainpool.h b/debian/modules/nchan/src/util/nchan_bufchainpool.h
index 67f7d1a..fa12299 100644
--- a/debian/modules/nchan/src/util/nchan_bufchainpool.h
+++ b/debian/modules/nchan/src/util/nchan_bufchainpool.h
@@ -29,6 +29,16 @@ typedef struct {
   nchan_file_link_t         *file_head;
   nchan_file_link_t         *file_recycle_head;
   ngx_pool_t                *pool;
+  
+  struct {
+    size_t                     length;
+    ngx_int_t                  count;
+    ngx_chain_t               *head;
+    ngx_chain_t               *tail;
+    
+    ngx_int_t                  recycle_count;
+    ngx_chain_t               *recycle_head;
+  }                          bc;
 } nchan_bufchain_pool_t;
 
 ngx_int_t nchan_bufchain_pool_init(nchan_bufchain_pool_t *bcp, ngx_pool_t *pool);
@@ -36,4 +46,11 @@ nchan_buf_and_chain_t *nchan_bufchain_pool_reserve(nchan_bufchain_pool_t *bcp, n
 ngx_file_t *nchan_bufchain_pool_reserve_file(nchan_bufchain_pool_t *bcp);
 void nchan_bufchain_pool_refresh_files(nchan_bufchain_pool_t *bcp);
 void nchan_bufchain_pool_flush(nchan_bufchain_pool_t *bcp);
+
+ngx_chain_t *nchan_bufchain_first_chain(nchan_bufchain_pool_t *bcp);
+size_t nchan_bufchain_length(nchan_bufchain_pool_t *bcp);
+ngx_int_t nchan_bufchain_append_buf(nchan_bufchain_pool_t *bcp, ngx_buf_t *buf);
+ngx_int_t nchan_bufchain_append_str(nchan_bufchain_pool_t *bcp, ngx_str_t *str);
+ngx_int_t nchan_bufchain_append_cstr(nchan_bufchain_pool_t *bcp, char *cstr);
+
 #endif //NCHAN_BUFCHAINPOOL_H
diff --git a/debian/modules/nchan/src/util/nchan_channel_id.c b/debian/modules/nchan/src/util/nchan_channel_id.c
index 532d0be..4a2deca 100644
--- a/debian/modules/nchan/src/util/nchan_channel_id.c
+++ b/debian/modules/nchan/src/util/nchan_channel_id.c
@@ -9,18 +9,27 @@ static ngx_int_t validate_id(ngx_http_request_t *r, ngx_str_t *id, nchan_loc_con
   return NGX_OK;
 }
 
+ngx_int_t nchan_channel_id_is_multi(ngx_str_t *id) {
+  u_char         *cur = id->data;
+  return (id->len >= 3 && cur[0] == 'm' && cur[1] == '/' && cur[2] == NCHAN_MULTI_SEP_CHR);
+}
+
+
+
 static ngx_int_t nchan_process_multi_channel_id(ngx_http_request_t *r, nchan_complex_value_arr_t *idcf, nchan_loc_conf_t *cf, ngx_str_t **ret_id) {
   ngx_int_t                   i, n = idcf->n, n_out = 0;
   ngx_str_t                   id[NCHAN_MULTITAG_MAX];
   ngx_str_t                  *id_out;
-  ngx_str_t                  *group = &cf->channel_group;
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_str_t                  *group = nchan_get_group_name(r, cf, ctx);
+  if(group == NULL) {
+    return NGX_ERROR;
+  }
   size_t                      sz = 0, grouplen = group->len;
   u_char                     *cur;
   
   //static ngx_str_t            empty_string = ngx_string("");
   
-  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
   for(i=0; i < n && n_out < NCHAN_MULTITAG_MAX; i++) {
     ngx_http_complex_value(r, idcf->cv[i], &id[n_out]);
     if(validate_id(r, &id[n_out], cf) != NGX_OK) {
@@ -101,12 +110,13 @@ static ngx_int_t nchan_process_legacy_channel_id(ngx_http_request_t *r, nchan_lo
   static ngx_str_t            channel_id_var_name = ngx_string("push_channel_id");
   ngx_uint_t                  key = ngx_hash_key(channel_id_var_name.data, channel_id_var_name.len);
   ngx_http_variable_value_t  *vv = NULL;
-  ngx_str_t                  *group = &cf->channel_group;
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_str_t                  *group = nchan_get_group_name(r, cf, ctx);
   ngx_str_t                   tmpid;
   ngx_str_t                  *id;
   size_t                      sz;
   u_char                     *cur;
-  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
   
   ctx->channel_id_count = 0;
   
@@ -148,12 +158,68 @@ static ngx_int_t nchan_process_legacy_channel_id(ngx_http_request_t *r, nchan_lo
   return NGX_OK;
 }
 
+ngx_str_t nchan_get_group_from_channel_id(ngx_str_t *id) {
+  ngx_str_t group;
+  u_char *cur, *end;
+  size_t  len;
+  if(nchan_channel_id_is_multi(id)) {
+    cur = &id->data[3];
+    len = id->len - 3;
+  }
+  else {
+    cur = id->data;
+    len = id->len;
+  }
+  end = memchr(cur, '/', len);
+  
+  assert(end); //if slash wasn't found, we have a malformed id string. 
+  //this is crashworthy to investigate how it happened.
+  
+  group.data = cur;
+  group.len = (end - cur);
+  
+  return group;
+}
+
+ngx_str_t *nchan_get_group_name(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx) {
+  if(!ctx->channel_group_name) {
+    if((ctx->channel_group_name = ngx_palloc(r->pool, sizeof(*ctx->channel_group_name))) == NULL) {
+      nchan_log_request_error(r, "couldn't allocate a tiny little channel group string.");
+      return NULL;
+    }
+    
+    if(cf->channel_group == NULL) {
+      ctx->channel_group_name->len = 0;
+      ctx->channel_group_name->data = NULL;
+    }
+    else {
+      ngx_http_complex_value(r, cf->channel_group, ctx->channel_group_name);
+    }
+  }
+  
+  return ctx->channel_group_name;
+}
+
 ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_int_t fail_hard) {
   static const ngx_str_t          NO_CHANNEL_ID_MESSAGE = ngx_string("No channel id provided.");
   nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
   ngx_int_t                       rc;
   ngx_str_t                      *id = NULL;
-  nchan_complex_value_arr_t          *chid_conf;
+  nchan_complex_value_arr_t      *chid_conf;
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_str_t                      *group = nchan_get_group_name(r, cf, ctx);
+  
+  //validate group
+  if(group->len == 1 && group->data[0]=='m') {
+    nchan_log_request_warning(r, "channel group \"m\" is reserved and cannot be used in a request.");
+    rc = NGX_DECLINED;
+    goto done;
+  }
+  else if(memchr(group->data, '/', group->len)) {
+    nchan_log_request_warning(r, "character \"/\" not allowed in channel group.");
+    rc = NGX_DECLINED;
+    goto done;
+  }
   
   chid_conf = what == PUB ? &cf->pub_chid : &cf->sub_chid;
   if(chid_conf->n == 0) {
@@ -193,11 +259,11 @@ done:
     assert(rc != NGX_OK);
     switch(rc) {
       case NGX_ERROR:
-        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 0);
+        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
         break;
       
       case NGX_DECLINED:
-        nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, 0);
+        nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
         break;
       
       case NGX_ABORT:
diff --git a/debian/modules/nchan/src/util/nchan_channel_id.h b/debian/modules/nchan/src/util/nchan_channel_id.h
index f8e4084..56958fd 100644
--- a/debian/modules/nchan/src/util/nchan_channel_id.h
+++ b/debian/modules/nchan/src/util/nchan_channel_id.h
@@ -1 +1,4 @@
-ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_int_t fail_hard);
\ No newline at end of file
+ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_int_t fail_hard);
+ngx_int_t nchan_channel_id_is_multi(ngx_str_t *id);
+ngx_str_t *nchan_get_group_name(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
+ngx_str_t nchan_get_group_from_channel_id(ngx_str_t *id);
diff --git a/debian/modules/nchan/src/util/nchan_channel_info.c b/debian/modules/nchan/src/util/nchan_channel_info.c
deleted file mode 100644
index 5a4fbd1..0000000
--- a/debian/modules/nchan/src/util/nchan_channel_info.c
+++ /dev/null
@@ -1,128 +0,0 @@
-#include <nchan_module.h>
-
-void nchan_match_channel_info_subtype(size_t off, u_char *cur, size_t rem, u_char **priority, const ngx_str_t **format, ngx_str_t *content_type) {
-  static nchan_content_subtype_t subtypes[] = {
-    { "json"  , 4, &NCHAN_CHANNEL_INFO_JSON },
-    { "yaml"  , 4, &NCHAN_CHANNEL_INFO_YAML },
-    { "xml"   , 3, &NCHAN_CHANNEL_INFO_XML  },
-    { "x-json", 6, &NCHAN_CHANNEL_INFO_JSON },
-    { "x-yaml", 6, &NCHAN_CHANNEL_INFO_YAML }
-  };
-  u_char                         *start = cur + off;
-  ngx_uint_t                      i;
-  
-  for(i=0; i<(sizeof(subtypes)/sizeof(nchan_content_subtype_t)); i++) {
-    if(ngx_strncmp(start, subtypes[i].subtype, rem<subtypes[i].len ? rem : subtypes[i].len)==0) {
-      if(*priority>start) {
-        *format = subtypes[i].format;
-        *priority = start;
-        content_type->data=cur;
-        content_type->len= off + subtypes[i].len;
-      }
-    }
-  }
-}
-
-ngx_buf_t                       channel_info_buf;
-u_char                          channel_info_buf_str[512]; //big enough
-ngx_str_t                       channel_info_content_type;
-
-ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type) {
-  ngx_buf_t                      *b = &channel_info_buf;
-  ngx_uint_t                      len;
-  const ngx_str_t                *format = &NCHAN_CHANNEL_INFO_PLAIN;
-  time_t                          time_elapsed = ngx_time() - last_seen;
-  static nchan_msg_id_t           zero_msgid = NCHAN_ZERO_MSGID;
-  if(!last_msgid) {
-    last_msgid = &zero_msgid;
-  }
- 
-  ngx_memcpy(&channel_info_content_type, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, sizeof(NCHAN_CONTENT_TYPE_TEXT_PLAIN));
-  
-  b->start = channel_info_buf_str;
-  b->pos = b->start;
-  b->last_buf = 1;
-  b->last_in_chain = 1;
-  b->flush = 1;
-  b->memory = 1;
-  
-  if(accept_header) {
-    //lame content-negotiation (without regard for qvalues)
-    u_char                    *accept = accept_header->data;
-    len = accept_header->len;
-    size_t                     rem;
-    u_char                    *cur = accept;
-    u_char                    *priority=&accept[len-1];
-    
-    for(rem=len; (cur = ngx_strnstr(cur, "text/", rem))!=NULL; cur += sizeof("text/")-1) {
-      rem=len - ((size_t)(cur-accept)+sizeof("text/")-1);
-      if(ngx_strncmp(cur+sizeof("text/")-1, "plain", rem<5 ? rem : 5)==0) {
-        if(priority) {
-          format = &NCHAN_CHANNEL_INFO_PLAIN;
-          priority = cur+sizeof("text/")-1;
-          //content-type is already set by default
-        }
-      }
-      nchan_match_channel_info_subtype(sizeof("text/")-1, cur, rem, &priority, &format, &channel_info_content_type);
-    }
-    cur = accept;
-    for(rem=len; (cur = ngx_strnstr(cur, "application/", rem))!=NULL; cur += sizeof("application/")-1) {
-      rem=len - ((size_t)(cur-accept)+sizeof("application/")-1);
-      nchan_match_channel_info_subtype(sizeof("application/")-1, cur, rem, &priority, &format, &channel_info_content_type);
-    }
-  }
-  
-  if(generated_content_type) {
-    *generated_content_type = &channel_info_content_type;
-  }
-  
-  len = format->len - 8 - 1 + 3*NGX_INT_T_LEN; //minus 8 sprintf
-  
-  if(len > 512) {
-    nchan_log_error("NCHAN: Channel info string too long: max: 512, is: %i", len);
-  }
-  
-  b->last = ngx_snprintf(b->start, 512, (char *)format->data, messages, last_seen==0 ? -1 : (ngx_int_t) time_elapsed, subscribers, msgid_to_str(last_msgid));
-  b->end = b->last;
-  
-  return b;
-}
-
-//print information about a channel
-ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid) {
-  ngx_buf_t                      *b;
-  ngx_str_t                      *content_type;
-  ngx_str_t                      *accept_header = nchan_get_accept_header_value(r);
-
-  b = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, &content_type);
-  
-  return nchan_respond_membuf(r, NGX_HTTP_OK, content_type, b, 0);
-}
-
-ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code) {
-  static const ngx_str_t CREATED_LINE = ngx_string("201 Created");
-  static const ngx_str_t ACCEPTED_LINE = ngx_string("202 Accepted");
-  
-  time_t             last_seen = 0;
-  ngx_uint_t         subscribers = 0;
-  ngx_uint_t         messages = 0;
-  nchan_msg_id_t    *msgid = NULL;
-  if(channel!=NULL) {
-    subscribers = channel->subscribers;
-    last_seen = channel->last_seen;
-    messages  = channel->messages;
-    msgid = &channel->last_published_msg_id;
-    r->headers_out.status = status_code == (ngx_int_t) NULL ? NGX_HTTP_OK : status_code;
-    if (status_code == NGX_HTTP_CREATED) {
-      ngx_memcpy(&r->headers_out.status_line, &CREATED_LINE, sizeof(ngx_str_t));
-    }
-    else if (status_code == NGX_HTTP_ACCEPTED) {
-      ngx_memcpy(&r->headers_out.status_line, &ACCEPTED_LINE, sizeof(ngx_str_t));
-    }
-    return nchan_channel_info(r, messages, subscribers, last_seen, msgid);
-  }
-  else {
-    //404!
-    return nchan_respond_status(r, NGX_HTTP_NOT_FOUND, NULL, 0);
-  }
-}
diff --git a/debian/modules/nchan/src/util/nchan_channel_info.h b/debian/modules/nchan/src/util/nchan_channel_info.h
deleted file mode 100644
index 6028e4a..0000000
--- a/debian/modules/nchan/src/util/nchan_channel_info.h
+++ /dev/null
@@ -1,7 +0,0 @@
-void nchan_match_channel_info_subtype(size_t off, u_char *cur, size_t rem, u_char **priority, const ngx_str_t **format, ngx_str_t *content_type);
-
-ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type);
-
-ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid);
-
-ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/util/nchan_debug.c b/debian/modules/nchan/src/util/nchan_debug.c
new file mode 100644
index 0000000..0092c51
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_debug.c
@@ -0,0 +1,81 @@
+#include "nchan_debug.h"
+#include <assert.h>
+
+#define STRINGIFY_ENUM(val) \
+  case val:                 \
+    return #val;
+
+char *nchan_msg_status_to_cstr(nchan_msg_status_t status) {
+  switch(status) {
+    STRINGIFY_ENUM(MSG_CHANNEL_NOTREADY)
+    STRINGIFY_ENUM(MSG_INVALID)
+    STRINGIFY_ENUM(MSG_PENDING)
+    STRINGIFY_ENUM(MSG_NOTFOUND)
+    STRINGIFY_ENUM(MSG_FOUND)
+    STRINGIFY_ENUM(MSG_EXPECTED)
+    STRINGIFY_ENUM(MSG_EXPIRED)
+    STRINGIFY_ENUM(MSG_ERROR)
+  }
+  return "???";
+}
+
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+
+subscriber_t *subdebug_head = NULL;
+
+void subscriber_debug_add(subscriber_t *sub) {
+  if(subdebug_head == NULL) {
+    sub->dbg_next = NULL;
+    sub->dbg_prev = NULL;
+  }
+  else {
+    sub->dbg_next = subdebug_head;
+    sub->dbg_prev = NULL;
+    assert(subdebug_head->dbg_prev == NULL);
+    subdebug_head->dbg_prev = sub;
+  }
+  if(sub->request) {
+    sub->lbl = ngx_calloc(sub->request->uri.len+1, ngx_cycle->log);
+    ngx_memcpy(sub->lbl, sub->request->uri.data, sub->request->uri.len);
+  }
+  else {
+    sub->lbl = NULL;
+  }
+  
+  subdebug_head = sub;
+}
+void subscriber_debug_remove(subscriber_t *sub) {
+  subscriber_t *prev, *next;
+  prev = sub->dbg_prev;
+  next = sub->dbg_next;
+  if(subdebug_head == sub) {
+    assert(sub->dbg_prev == NULL);
+    if(next) {
+      next->dbg_prev = NULL;
+    }
+    subdebug_head = next;
+  }
+  else {
+    if(prev) {
+      prev->dbg_next = next;
+    }
+    if(next) {
+      next->dbg_prev = prev;
+    }
+  }
+  
+  sub->dbg_next = NULL;
+  sub->dbg_prev = NULL;
+  ngx_free(sub->lbl);
+  sub->lbl = NULL;
+}
+void subscriber_debug_assert_isempty(void) {
+  if(subdebug_head != NULL) {
+    subscriber_t *cur;
+    for(cur = subdebug_head; cur != NULL; cur = cur->dbg_next) {
+      nchan_log_error("  LEFTOVER: %V sub (req. %p (pool %p) cf %p rsv: %d) lbl %s", cur->name, cur->request, cur->request ? cur->request->pool : NULL, cur->cf, cur->reserved, cur->lbl ? cur->lbl : (u_char *)"nolbl");
+    }
+    raise(SIGABRT);
+  }
+}
+#endif
diff --git a/debian/modules/nchan/src/util/nchan_debug.h b/debian/modules/nchan/src/util/nchan_debug.h
new file mode 100644
index 0000000..640870a
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_debug.h
@@ -0,0 +1,13 @@
+#ifndef NCHAN_DEBUG_H
+#define NCHAN_DEBUG_H
+#include <nchan_module.h>
+
+char *nchan_msg_status_to_cstr(nchan_msg_status_t status);
+
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+void subscriber_debug_add(subscriber_t *);
+void subscriber_debug_remove(subscriber_t *);
+void subscriber_debug_assert_isempty(void);
+#endif
+
+#endif //NCHAN_DEBUG_H
diff --git a/debian/modules/nchan/src/util/nchan_fake_request.c b/debian/modules/nchan/src/util/nchan_fake_request.c
index 5a36501..62151de 100644
--- a/debian/modules/nchan/src/util/nchan_fake_request.c
+++ b/debian/modules/nchan/src/util/nchan_fake_request.c
@@ -1,14 +1,16 @@
-#include <nchan_module.h>
 #include "nchan_fake_request.h"
-
+#include <util/nchan_subrequest.h>
+#include <assert.h>
 //fake request and connection code adapted from lua-nginx-module by agentzh
 
 static void nchan_close_fake_request(ngx_http_request_t *r);
+static void nchan_close_fake_connection(ngx_connection_t *c);
 
-ngx_connection_t *nchan_create_fake_connection(ngx_pool_t *pool) {
+static ngx_connection_t *nchan_create_fake_connection(ngx_pool_t *pool) {
   ngx_log_t               *log;
   ngx_connection_t        *c;
   ngx_connection_t        *saved_c = NULL;
+  assert(pool);
 
   /* (we temporarily use a valid fd (0) to make ngx_get_connection happy) */
   if (ngx_cycle->files) {
@@ -28,29 +30,27 @@ ngx_connection_t *nchan_create_fake_connection(ngx_pool_t *pool) {
   c->fd = (ngx_socket_t) -1;
   c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
 
-  if (pool) {
-    c->pool = pool;
-  } 
-  else {
-    c->pool = ngx_create_pool(128, c->log);
-    if (c->pool == NULL) {
-      goto failed;
-    }
-  }
+  c->pool = pool;
 
   log = ngx_pcalloc(c->pool, sizeof(ngx_log_t));
   if (log == NULL) {
       goto failed;
   }
 
+  c->write->active = 1;
+  
   c->log = log;
   c->log->connection = c->number;
   c->log->action = NULL;
   c->log->data = NULL;
+  c->log->data = ngx_pcalloc(c->pool, sizeof(ngx_http_log_ctx_t));
+  if(c->log->data == NULL) {
+    goto failed;
+  }
 
   c->log_error = NGX_ERROR_INFO;
 
-  c->error = 1;
+  c->error = 0;
 
   return c;
 
@@ -60,7 +60,7 @@ failed:
   return NULL;
 }
 
-void nchan_close_fake_connection(ngx_connection_t *c) {
+static void nchan_close_fake_connection(ngx_connection_t *c) {
   ngx_pool_t          *pool;
   ngx_connection_t    *saved_c = NULL;
 
@@ -80,6 +80,7 @@ void nchan_close_fake_connection(ngx_connection_t *c) {
   }
 
   c->read->closed = 1;
+  c->write->active = 0;
   c->write->closed = 1;
 
   /* we temporarily use a valid fd (0) to make ngx_free_connection happy */
@@ -103,19 +104,25 @@ void nchan_close_fake_connection(ngx_connection_t *c) {
   }
 }
 
-ngx_http_request_t *nchan_create_fake_request(ngx_connection_t *c) {
-  ngx_http_request_t      *r;
-
-  r = ngx_pcalloc(c->pool, sizeof(ngx_http_request_t));
+static ngx_http_request_t *nchan_new_fake_request(ngx_connection_t *c) {
+  ngx_http_request_t *r = ngx_palloc(c->pool, sizeof(ngx_http_request_t));
+  assert(c->data == NULL);
   if (r == NULL) {
     return NULL;
   }
 
   c->requests++;
 
+  c->data = r;
+  return r;
+}
+/*
+static ngx_int_t nchan_initialize_fake_request(ngx_http_request_t *r, ngx_connection_t *c) {
+  ngx_memzero(r, sizeof(*r));
   r->pool = c->pool;
-
-#if 0
+  assert(c->data == r);
+  
+  #if 0
   hc = ngx_pcalloc(c->pool, sizeof(ngx_http_connection_t));
   if (hc == NULL) {
       goto failed;
@@ -139,9 +146,9 @@ ngx_http_request_t *nchan_create_fake_request(ngx_connection_t *c) {
   }
 #endif
 
-  r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
+  r->ctx = ngx_pcalloc(c->pool, sizeof(void *) * ngx_http_max_module);
   if (r->ctx == NULL) {
-      return NULL;
+      return NGX_ERROR;
   }
 
 #if 0
@@ -153,7 +160,7 @@ ngx_http_request_t *nchan_create_fake_request(ngx_connection_t *c) {
       goto failed;
   }
 #endif
-
+  
   r->connection = c;
 
   r->headers_in.content_length_n = 0;
@@ -174,8 +181,32 @@ ngx_http_request_t *nchan_create_fake_request(ngx_connection_t *c) {
 
   r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
   r->discard_body = 1;
+  return NGX_OK;
+}
+*/
+void empty_handler(ngx_http_request_t *r) {
+  //do nothing
+}
 
-  return r;
+ngx_http_request_t *nchan_create_derivative_fake_request(ngx_connection_t *c, ngx_http_request_t *rsrc) {
+  ngx_http_request_t      *fr = nchan_new_fake_request(c);
+  if(fr == NULL) {
+    return NULL;
+  }
+  
+  *fr = *rsrc;
+  fr->read_event_handler = empty_handler;
+  fr->write_event_handler = empty_handler;
+  fr->connection = c;
+  fr->main = fr;
+  fr->pool = c->pool;
+  fr->parent = NULL;
+  fr->cleanup = NULL;
+  fr->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
+  fr->signature = NGX_HTTP_MODULE;
+  fr->count = 1;
+  
+  return fr;
 }
 
 void nchan_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc) {
@@ -275,3 +306,215 @@ void nchan_free_fake_request(ngx_http_request_t *r) {
 
   r->connection->destroyed = 1;
 }
+
+
+
+ngx_int_t nchan_requestmachine_initialize(nchan_requestmachine_t *rm, ngx_http_request_t *template_request) {
+  rm->template_request = template_request;
+  nchan_slist_init(&rm->request_queue, nchan_fakereq_subrequest_data_t, slist.prev, slist.next);
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_requestmachine_run(nchan_requestmachine_t *rm) {
+  nchan_fakereq_subrequest_data_t *head = nchan_slist_first(&rm->request_queue);
+  if(head && !head->running) {
+    head->running = 1;
+    ngx_http_run_posted_requests(head->r->connection);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_requestmachine_subrequest_handler(ngx_http_request_t *sr, void *pd, ngx_int_t code) {
+  nchan_fakereq_subrequest_data_t *d = pd;
+  d->running = 0;
+  if(d->rm) {
+    assert(d->rm->request_queue.head == d);
+    if(d->cb) {
+      d->cb(code, sr, d->pd);
+    }
+    if(d->rm) {
+      nchan_slist_remove(&d->rm->request_queue, d);
+      nchan_requestmachine_run(d->rm);
+    }
+  }
+  else if(d->cb) {
+    d->cb(NGX_ABORT, sr, d->pd);
+  }
+  if(!d->manual_cleanup && !d->cleanup_timer.timer_set) {
+    ngx_add_timer(&d->cleanup_timer, 0);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_requestmachine_request_cleanup_manual(nchan_fakereq_subrequest_data_t *d) {
+  if(!d->cleanup_timer.timer_set) {
+    ngx_add_timer(&d->cleanup_timer, 0);
+  }
+  return NGX_OK;
+}
+
+static void nchan_requestmachine_request_cleanup_on_request_finalize_cln_handler(void *d) {
+  nchan_requestmachine_request_cleanup_manual(d);
+}
+
+ngx_int_t nchan_requestmachine_request_cleanup_on_request_finalize(nchan_fakereq_subrequest_data_t *d, ngx_http_request_t *r) {
+  ngx_http_cleanup_t     *cln = ngx_http_cleanup_add(r, 0);
+  if(cln == NULL) {
+    return NGX_ERROR;
+  }
+  cln->data = d;
+  cln->handler = nchan_requestmachine_request_cleanup_on_request_finalize_cln_handler;
+  return NGX_OK;
+}
+
+static void fakerequest_cleanup_timer_handler(ngx_event_t *ev) {
+  nchan_fakereq_subrequest_data_t *d = ev->data;
+  d->r->main->count--;
+  assert(d->r->main->count == 1);
+  nchan_finalize_fake_request(d->r, NGX_OK);
+}
+
+nchan_fakereq_subrequest_data_t *nchan_requestmachine_request(nchan_requestmachine_t *rm, nchan_requestmachine_request_params_t *params) {
+  nchan_fakereq_subrequest_data_t *d;
+  ngx_pool_t *pool = params->pool;
+  int         created_pool = 0;
+  ngx_str_t url;
+  
+  if(!pool) {
+    if((pool = ngx_create_pool(1024, ngx_cycle->log)) == NULL) {
+      nchan_log_error("failed to create requestmachine pool");
+      return NULL;
+    }
+    created_pool = 1;
+  }
+  
+  if(params->url_complex) {
+    if(ngx_http_complex_value_custom_pool(rm->template_request, params->url.cv, &url, pool) != NGX_OK) {
+      if(created_pool) {
+        ngx_destroy_pool(pool);
+      }
+      nchan_log_error("failed to create subrequest url");
+      return NULL;
+    }
+    params->url.str = &url;
+  }
+  
+  ngx_connection_t            *fc = nchan_create_fake_connection(pool);
+  if(fc == NULL) {
+    if(created_pool) {
+      ngx_destroy_pool(pool);
+    }
+    return NULL;
+  }
+  ngx_http_request_t          *fr = nchan_create_derivative_fake_request(fc, rm->template_request);
+  ngx_http_request_t          *sr;
+  
+  d = ngx_palloc(pool, sizeof(*d));
+  ngx_http_post_subrequest_t  *psr = ngx_pcalloc(pool, sizeof(*psr));
+  if(fr == NULL || d == NULL || psr == NULL) {
+    if(created_pool) {
+      ngx_destroy_pool(pool);
+    }
+    return NULL;
+  }
+  
+  fr->main_conf = rm->template_request->main_conf;
+  fr->srv_conf = rm->template_request->srv_conf;
+  fr->loc_conf = rm->template_request->loc_conf;
+  
+  d->pd = params->pd;
+  d->cb = params->cb;
+  d->running = 0;
+  d->r = fr;
+  d->rm = rm;
+  d->manual_cleanup = params->manual_cleanup;
+  ngx_memzero(&d->cleanup_timer, sizeof(d->cleanup_timer));
+  nchan_init_timer(&d->cleanup_timer, fakerequest_cleanup_timer_handler, d);
+  
+  fr->main->count++; //make sure the fake request doesn't auto-finalize on subrequest completion
+  
+  psr->handler = nchan_requestmachine_subrequest_handler;
+  psr->data = d;
+  
+  ngx_http_subrequest(fr, params->url.str, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
+  if(sr == NULL) {
+    if(created_pool) {
+      ngx_destroy_pool(pool);
+    }
+    return NULL;
+  }
+  d->sr = sr;
+  
+  if((sr->request_body = ngx_pcalloc(pool, sizeof(*sr->request_body))) == NULL) { //dummy request body 
+    if(created_pool) {
+      ngx_destroy_pool(pool);
+    }
+    return NULL;
+  }
+  
+  if(params->body && ngx_buf_size(params->body) > 0) {
+    static ngx_str_t                   POST_REQUEST_STRING = {4, (u_char *)"POST "};
+    size_t                             sz = ngx_buf_size(params->body);;
+    ngx_http_request_body_t           *sr_body = sr->request_body;
+    ngx_chain_t                       *fakebody_chain;
+    ngx_buf_t                         *fakebody_buf;
+    
+    fakebody_chain = ngx_palloc(pool, sizeof(*fakebody_chain));
+    fakebody_buf = ngx_pcalloc(pool, sizeof(*fakebody_buf));
+    sr_body->bufs = fakebody_chain;
+    fakebody_chain->next = NULL;
+    fakebody_chain->buf = fakebody_buf;
+    *fakebody_buf = *params->body;
+    fakebody_buf->last_buf = 1;
+    fakebody_buf->last_in_chain = 1;
+    fakebody_buf->flush = 1;
+    fakebody_buf->memory = 1;
+    
+    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, sr_body, sz);
+  }
+  else {
+    nchan_set_content_length_header(sr, 0);
+  }
+  
+  sr->header_only = params->response_headers_only;
+  
+  sr->args = fr->args;
+  
+  nchan_slist_append(&rm->request_queue, d);
+  
+  nchan_requestmachine_run(rm);
+  return d;
+}
+ngx_int_t nchan_requestmachine_shutdown(nchan_requestmachine_t *rm) {
+  return nchan_requestmachine_abort(rm);
+}
+
+ngx_int_t nchan_requestmachine_abort(nchan_requestmachine_t *rm) {
+  nchan_fakereq_subrequest_data_t *cur;
+  ngx_http_request_t              *r;
+  ngx_http_core_main_conf_t       *cmcf;
+  while((cur = nchan_slist_pop(&rm->request_queue)) != NULL) {
+    cur->rm = NULL; //no requestmachine ref means the machine stopped.
+    r = cur->r;
+    //clear stuff that might be used after the upstream request finishes
+    /*
+    if (ngx_list_init(&r->headers_out.headers, r->pool, 0, sizeof(ngx_table_elt_t)) != NGX_OK) {
+      nchan_log_error("couldn't create headers_out for requestmachine request");
+    }
+    if (ngx_list_init(&r->headers_in.headers, r->pool, 0,sizeof(ngx_table_elt_t)) != NGX_OK) {
+      nchan_log_error("couldn't create headers_in for requestmachine request");
+    }
+    */
+
+    r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
+    if (r->ctx == NULL) {
+      nchan_log_error("couldn't create ctx for requestmachine request");
+    }
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+    r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts * sizeof(ngx_http_variable_value_t));
+    if (r->variables == NULL) {
+      nchan_log_error("couldn't create vars for requestmachine request");
+    }
+  }
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/util/nchan_fake_request.h b/debian/modules/nchan/src/util/nchan_fake_request.h
index 2097aaa..eab1de9 100644
--- a/debian/modules/nchan/src/util/nchan_fake_request.h
+++ b/debian/modules/nchan/src/util/nchan_fake_request.h
@@ -1,6 +1,58 @@
+#ifndef NCHAN_FAKE_REQUEST_H
+#define NCHAN_FAKE_REQUEST_H
 
-ngx_connection_t *nchan_create_fake_connection(ngx_pool_t *pool);
-void nchan_close_fake_connection(ngx_connection_t *c);
-ngx_http_request_t *nchan_create_fake_request(ngx_connection_t *c);
+#include <nchan_module.h>
+#include <util/nchan_slist.h>
+
+ngx_http_request_t *nchan_create_derivative_fake_request(ngx_connection_t *c, ngx_http_request_t *rsrc);
 void nchan_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc);
 void nchan_free_fake_request(ngx_http_request_t *r);
+
+typedef struct nchan_fakereq_subrequest_data_s nchan_fakereq_subrequest_data_t;
+typedef struct nchan_requestmachine_s nchan_requestmachine_t;
+
+struct nchan_fakereq_subrequest_data_s {
+  ngx_http_request_t *r;
+  ngx_http_request_t *sr;
+  void          *pd;
+  callback_pt    cb;
+  nchan_requestmachine_t *rm;
+  ngx_event_t    cleanup_timer;
+  unsigned       manual_cleanup:1;
+  unsigned       running:1;
+  unsigned       aborted:1;
+  struct {
+    nchan_fakereq_subrequest_data_t *prev;
+    nchan_fakereq_subrequest_data_t *next;
+  }              slist;
+};// nchan_fakereq_subrequest_data_t
+
+struct nchan_requestmachine_s {
+  ngx_http_request_t *template_request;
+  nchan_slist_t       request_queue;
+  unsigned            shutdown_when_finished;
+};// nchan_requestmachine_t;
+
+typedef struct {
+  union {
+    ngx_str_t                 *str;
+    ngx_http_complex_value_t  *cv;
+  }                          url;
+  ngx_pool_t                *pool;
+  ngx_buf_t                 *body;
+  
+  callback_pt                cb;
+  void                      *pd;
+  unsigned                   manual_cleanup:1;
+  unsigned                   response_headers_only:1;
+  unsigned                   url_complex:1;
+} nchan_requestmachine_request_params_t;
+
+ngx_int_t nchan_requestmachine_initialize(nchan_requestmachine_t *rm, ngx_http_request_t *template_request);
+nchan_fakereq_subrequest_data_t *nchan_requestmachine_request(nchan_requestmachine_t *rm, nchan_requestmachine_request_params_t *params);
+ngx_int_t nchan_requestmachine_request_cleanup_manual(nchan_fakereq_subrequest_data_t *d);
+ngx_int_t nchan_requestmachine_request_cleanup_on_request_finalize(nchan_fakereq_subrequest_data_t *d, ngx_http_request_t *r);
+ngx_int_t nchan_requestmachine_abort(nchan_requestmachine_t *rm);
+ngx_int_t nchan_requestmachine_shutdown(nchan_requestmachine_t *rm);
+
+#endif //NCHAN_FAKE_REQUEST_H
diff --git a/debian/modules/nchan/src/util/nchan_list.c b/debian/modules/nchan/src/util/nchan_list.c
index cfe9e7b..8368b30 100644
--- a/debian/modules/nchan/src/util/nchan_list.c
+++ b/debian/modules/nchan/src/util/nchan_list.c
@@ -34,6 +34,32 @@ void *nchan_list_append(nchan_list_t *list) {
  return nchan_list_append_sized(list, list->data_sz);
 }
 
+void *nchan_list_first(nchan_list_t *list) {
+  if(list->head) {
+    return nchan_list_data_from_el(list->head);
+  }
+  else {
+    return NULL;
+  }
+}
+void *nchan_list_last(nchan_list_t *list) {
+  if(list->tail) {
+    return nchan_list_data_from_el(list->tail);
+  }
+  else {
+    return NULL;
+  }
+}
+
+void *nchan_list_prev(void *data) {
+  nchan_list_el_t  *el = nchan_list_el_from_data(data)->prev;
+  return el == NULL ? NULL : nchan_list_data_from_el(el);
+}
+void *nchan_list_next(void *data) {
+  nchan_list_el_t  *el = nchan_list_el_from_data(data)->next;
+  return el == NULL ? NULL : nchan_list_data_from_el(el);
+}
+
 void *nchan_list_append_sized(nchan_list_t *list, size_t sz) {
   nchan_list_el_t  *el, *tail = list->tail;
   if(list->pool_sz > 0) {
diff --git a/debian/modules/nchan/src/util/nchan_list.h b/debian/modules/nchan/src/util/nchan_list.h
index d9728a6..4b590ab 100644
--- a/debian/modules/nchan/src/util/nchan_list.h
+++ b/debian/modules/nchan/src/util/nchan_list.h
@@ -32,6 +32,11 @@ ngx_pool_t *nchan_list_get_pool(nchan_list_t *list);
 void *nchan_list_append(nchan_list_t *list);
 void *nchan_list_prepend(nchan_list_t *list);
 
+void *nchan_list_first(nchan_list_t *list);
+void *nchan_list_last(nchan_list_t *list);
+void *nchan_list_prev(void *data);
+void *nchan_list_next(void *data);
+
 void *nchan_list_prepend_sized(nchan_list_t *list, size_t sz);
 void *nchan_list_append_sized(nchan_list_t *list, size_t sz);
 
diff --git a/debian/modules/nchan/src/util/nchan_msgid.c b/debian/modules/nchan/src/util/nchan_msg.c
similarity index 65%
rename from debian/modules/nchan/src/util/nchan_msgid.c
rename to debian/modules/nchan/src/util/nchan_msg.c
index 8d501ca..c1fe850 100644
--- a/debian/modules/nchan/src/util/nchan_msgid.c
+++ b/debian/modules/nchan/src/util/nchan_msg.c
@@ -1,7 +1,175 @@
 #include <nchan_module.h>
 #include <assert.h>
+#include <store/memory/store.h>
+#include <util/shmem.h>
 
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "NCHAN MSG_ID:" fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "NCHAN MSG:" fmt, ##args)
+
+#define MSG_REFCOUNT_INVALID -9000
+
+#if NCHAN_MSG_RESERVE_DEBUG  
+static void nchan_msg_reserve_debug(nchan_msg_t *msg, char *lbl) {
+  msg_rsv_dbg_t     *rsv;
+  int shared = msg->storage == NCHAN_MSG_SHARED;
+  
+  if(shared) 
+    shmtx_lock(nchan_store_memory_shmem);  
+  
+  if(shared) 
+    rsv=shm_locked_calloc(nchan_store_memory_shmem, sizeof(*rsv) + ngx_strlen(lbl) + 1, "msgdebug");
+  else
+    rsv=ngx_calloc(sizeof(*rsv) + ngx_strlen(lbl) + 1, ngx_cycle->log);
+    
+  rsv->lbl = (char *)(&rsv[1]);
+  ngx_memcpy(rsv->lbl, lbl, ngx_strlen(lbl));
+  if(msg->rsv == NULL) {
+    msg->rsv = rsv;
+    rsv->prev = NULL;
+    rsv->next = NULL;
+  }
+  else {
+    msg->rsv->prev = rsv;
+    rsv->next = msg->rsv;
+    rsv->prev = NULL;
+    msg->rsv = rsv;
+  }
+  
+  if(shared)
+    shmtx_unlock(nchan_store_memory_shmem);
+}
+
+static void nchan_msg_release_debug(nchan_msg_t *msg, char *lbl) {
+  msg_rsv_dbg_t     *cur, *prev, *next;
+  size_t             sz = ngx_strlen(lbl);
+  ngx_int_t          rsv_found=0;
+  int shared = msg->storage == NCHAN_MSG_SHARED;
+  
+  if(shared)
+    shmtx_lock(nchan_store_memory_shmem);
+  
+  assert(msg->refcount > 0);
+  for(cur = msg->rsv; cur != NULL; cur = cur->next) {
+    if(ngx_memcmp(lbl, cur->lbl, sz) == 0) {
+      prev = cur->prev;
+      next = cur->next;
+      if(prev) {
+        prev->next = next;
+      }
+      if(next) {
+        next->prev = prev;
+      }
+      if(cur == msg->rsv) {
+        msg->rsv = next;
+      }
+      
+      if(shared)
+        shm_locked_free(nchan_store_memory_shmem, cur);
+      else
+        ngx_free(cur);
+      
+      rsv_found = 1;
+      break;
+    }
+  }
+  assert(rsv_found);
+  if(shared)
+    shmtx_unlock(nchan_store_memory_shmem);
+}
+#endif
+
+int msg_refcount_valid(nchan_msg_t *msg) {
+  return msg->refcount >= 0;
+}
+
+int msg_refcount_invalidate_if_zero(nchan_msg_t *msg) {
+  return ngx_atomic_cmp_set((ngx_atomic_uint_t *)&msg->refcount, 0, MSG_REFCOUNT_INVALID);
+}
+void msg_refcount_invalidate(nchan_msg_t *msg) {
+  msg->refcount = MSG_REFCOUNT_INVALID;
+}
+
+
+ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl) {
+  if(msg->parent) {
+    assert(msg->storage != NCHAN_MSG_SHARED);
+    msg->refcount++;
+#if NCHAN_MSG_RESERVE_DEBUG
+    nchan_msg_reserve_debug(msg, lbl);
+#endif
+    return msg_reserve(msg->parent, lbl);
+  }
+  assert(!msg->parent);
+  
+  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, 1);
+  assert(msg->refcount >= 0);
+  if(msg->refcount < 0) {
+    msg->refcount = MSG_REFCOUNT_INVALID;
+    return NGX_ERROR;
+  }
+#if NCHAN_MSG_RESERVE_DEBUG  
+  nchan_msg_reserve_debug(msg, lbl);
+#endif
+
+  //DBG("msg %p reserved (%i) %s", msg, msg->refcount, lbl);
+  return NGX_OK;
+}
+
+ngx_int_t msg_release(nchan_msg_t *msg, char *lbl) {
+  nchan_msg_t    *parent = msg->parent;
+  if(parent) {
+    assert(msg->storage != NCHAN_MSG_SHARED);
+#if NCHAN_MSG_RESERVE_DEBUG
+    nchan_msg_release_debug(msg, lbl);
+#endif
+    msg->refcount--;
+    assert(msg->refcount >= 0);
+    
+    if(msg->refcount == 0) {
+      switch(msg->storage) {
+        case NCHAN_MSG_POOL:
+          //free the id, the rest of the msg will be cleaned with the pool
+          nchan_free_msg_id(&msg->id);
+          break;
+          
+        case NCHAN_MSG_HEAP:
+          nchan_free_msg_id(&msg->id);
+          ngx_free(msg);
+          break;
+          
+        default:
+          break;
+          //do nothing for NCHAN_MSG_STACK. NCHAN_MSG_SHARED should never be seen here.
+      }
+    }
+    return msg_release(parent, lbl);
+  }
+  assert(!parent);
+  
+#if NCHAN_MSG_RESERVE_DEBUG
+  nchan_msg_release_debug(msg, lbl);
+#endif
+  assert(msg->refcount > 0);
+  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, -1);
+  //DBG("msg %p released (%i) %s", msg, msg->refcount, lbl);
+  return NGX_OK;
+}
+
+
+int nchan_msgid_tagcount_match(nchan_msg_id_t *id, int count) {
+  switch(id->time) {
+    case NCHAN_OLDEST_MSGID_TIME:
+    case NCHAN_NEWEST_MSGID_TIME:
+    case NCHAN_NTH_MSGID_TIME:
+      if(id->tagcount == 1 && id->tagactive == 0)
+        return 1;
+      break;
+    default:
+      if(id->tagcount == count && id->tagactive >= 0 && id->tagactive < count)
+        return 1;
+      break;
+  }
+  return 0;
+}
 
 void nchan_expand_msg_id_multi_tag(nchan_msg_id_t *id, uint8_t in_n, uint8_t out_n, int16_t fill) {
   int16_t v, n = id->tagcount;
@@ -237,8 +405,11 @@ static ngx_int_t nchan_parse_msg_tag(u_char *first, u_char *last, nchan_msg_id_t
   int8_t            sign = 1;
   int16_t           val = 0;
   static int16_t    tags[NCHAN_MULTITAG_MAX];
+  int brace_open_total = 0;
+  int brace_close_total = 0;
+  int tagactive = NGX_ERROR;
   
-  while(cur <= last && i < NCHAN_MULTITAG_MAX) {
+  while(first != NULL && last != NULL && cur <= last && i < NCHAN_MULTITAG_MAX) {
     if(cur == last) {
       tags[i]=(val == 0 && sign == -1) ? -1 : val * sign; //shorthand "-" for "-1";
       i++;
@@ -253,7 +424,15 @@ static ngx_int_t nchan_parse_msg_tag(u_char *first, u_char *last, nchan_msg_id_t
       val = 10 * val + (c - '0');
     }
     else if (c == '[') {
-      mid->tagactive = i;
+      if(++brace_open_total > 1) {
+        return NGX_ERROR;
+      }
+      tagactive = i;
+    }
+    else if (c == ']') {
+      if(++brace_close_total > 1 || brace_open_total - brace_close_total != 0) {
+        return NGX_ERROR;
+      }
     }
     else if (c == ',') {
       tags[i]=(val == 0 && sign == -1) ? -1 : val * sign; //shorthand "-" for "-1"
@@ -263,9 +442,30 @@ static ngx_int_t nchan_parse_msg_tag(u_char *first, u_char *last, nchan_msg_id_t
     }
     cur++;
   }
-  if(expected_tag_count > i) {
-    return NGX_ERROR;
+  
+  if (i == 0) {
+    mid->tagactive = -1; // No tags, so no active tag
   }
+  if(tagactive == NGX_ERROR) {
+    if(i==1) {
+      //single message tag, so it's active by defaiult
+      mid->tagactive = 0;
+    }
+    else {
+      //got a multitag with no tag braced as [active]. That's invalid.
+      return NGX_ERROR;
+    }
+  }
+  else {
+    mid->tagactive = tagactive;
+  }
+  
+  // We fill the rest of the tag needed with value '-1'
+  while (i < expected_tag_count) {
+    tags[i] = -1;
+    i++;
+  }
+  
   mid->tagcount = i;
   
   if(i <= NCHAN_FIXED_MULTITAG_MAX) {
@@ -296,7 +496,7 @@ ngx_int_t nchan_extract_from_multi_msgid(nchan_msg_id_t *src, uint16_t n, nchan_
     return NGX_OK; 
   }
   
-  if(n > count) {
+  if(n >= count) {
     ERR("can't extract msgid %i from multi-msg of count %i", n, count);
     return NGX_ERROR;
   }
@@ -342,6 +542,7 @@ static ngx_str_t *nchan_subscriber_get_etag(ngx_http_request_t * r) {
 }
 
 ngx_int_t nchan_parse_compound_msgid(nchan_msg_id_t *id, ngx_str_t *str, ngx_int_t expected_tag_count) {
+  //parse url-unescaped compound msgid
   u_char       *split, *last;
   ngx_int_t     time;
   uint8_t       len;
@@ -350,10 +551,6 @@ ngx_int_t nchan_parse_compound_msgid(nchan_msg_id_t *id, ngx_str_t *str, ngx_int
   if((split = ngx_strlchr(str->data, last, ':')) != NULL) {
     len = 1;
   }
-  else if( (str->len > 3 && (split = ngx_strnstr(str->data, "%3A", str->len)) != NULL)
-        || (str->len > 3 && (split = ngx_strnstr(str->data, "%3a", str->len)) != NULL)) {
-    len = 3;
-  }
   else {
     len = 0; //placate dumb GCC warning
   }
@@ -373,11 +570,27 @@ ngx_int_t nchan_parse_compound_msgid(nchan_msg_id_t *id, ngx_str_t *str, ngx_int
 
 
 
-nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r) {
-  static nchan_msg_id_t           id = NCHAN_ZERO_MSGID;
+static ngx_int_t set_default_id(nchan_loc_conf_t *cf, nchan_msg_id_t *id) {
   static nchan_msg_id_t           nth_msg_id = NCHAN_NTH_MSGID;
   static nchan_msg_id_t           oldest_msg_id = NCHAN_OLDEST_MSGID;
   static nchan_msg_id_t           newest_msg_id = NCHAN_NEWEST_MSGID;
+  switch(cf->subscriber_first_message) {
+    case 1:
+      *id = oldest_msg_id;
+      break;
+    case 0: 
+      *id = newest_msg_id;
+      break;
+    default:
+      *id = nth_msg_id;
+      id->tag.fixed[0] = cf->subscriber_first_message;
+      break;
+  }
+  return NGX_OK;
+}
+
+nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r) {
+  static nchan_msg_id_t           id = NCHAN_ZERO_MSGID;
   
   ngx_str_t                      *if_none_match;
   nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
@@ -390,15 +603,21 @@ nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r) {
   if(!cf->msg_in_etag_only && r->headers_in.if_modified_since != NULL) {
     id.time=ngx_http_parse_time(r->headers_in.if_modified_since->value.data, r->headers_in.if_modified_since->value.len);
     
-    if(if_none_match==NULL) {
-      id.tagcount=1;
-      id.tagactive=0;
+    if(id.time <= 0) { //anything before 1-1-1970 is reserved and treated as no msgid provided
+      set_default_id(cf, &id);
+      return &id;
     }
-    else {
-      if(nchan_parse_msg_tag(if_none_match->data, if_none_match->data + if_none_match->len, &id, ctx->channel_id_count) == NGX_ERROR) {
-        return NULL;
-      }
+
+    u_char *first = NULL, *last = NULL;
+    if(if_none_match != NULL) {
+      first = if_none_match->data;
+      last = if_none_match->data + if_none_match->len;
     }
+
+    if(nchan_parse_msg_tag(first, last, &id, ctx->channel_id_count) == NGX_ERROR) {
+      return NULL;
+    }
+
     return &id;
   }
   else if((cf->msg_in_etag_only || r->headers_in.if_modified_since == NULL) && if_none_match) {
@@ -423,7 +642,7 @@ nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r) {
     for(i=0; i < n; i++) {
       rc = ngx_http_complex_value_noalloc(r, alt_msgid_cv_arr->cv[i], &str, 128);
       if(str.len > 0 && rc == NGX_OK) {
-        rc2 = nchan_parse_compound_msgid(&id, &str, ctx->channel_id_count);
+        rc2 = nchan_parse_compound_msgid(&id, nchan_urldecode_str(r, &str), ctx->channel_id_count);
         if(rc2 == NGX_OK) {
           return &id;
         }
@@ -434,19 +653,7 @@ nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r) {
     }
   }
   
-  //eh, we didn't find a valid alt_msgid value from variables. use the defaults
-  switch(cf->subscriber_first_message) {
-    case 1:
-      id = oldest_msg_id;
-      break;
-    case 0: 
-      id = newest_msg_id;
-      break;
-    default:
-      id = nth_msg_id;
-      id.tag.fixed[0] = cf->subscriber_first_message;
-      break;
-  }
+  set_default_id(cf, &id);
   return &id;
 }
 
@@ -513,3 +720,54 @@ int8_t nchan_compare_msgids(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
     }
   }
 }
+
+
+static nchan_msg_t *get_shared_msg(nchan_msg_t *msg) {
+  if(msg->storage == NCHAN_MSG_SHARED) {
+    assert(msg->parent == NULL);
+    return msg;
+  }
+  else {
+    assert(msg->parent);
+    assert(msg->parent->storage == NCHAN_MSG_SHARED);
+    return msg->parent;
+  }
+}
+
+static ngx_inline nchan_msg_t *msg_derive_init(nchan_msg_t *parent, nchan_msg_t *msg, nchan_msg_storage_t storage_type) {
+  nchan_msg_t    *shared = get_shared_msg(parent);
+  if(!msg) { return NULL; }
+  *msg = *shared;
+  msg->id.tagcount=1;
+  msg->parent = shared;
+  msg->storage = storage_type;
+#if NCHAN_MSG_RESERVE_DEBUG
+  msg->rsv = NULL;
+#endif
+  msg->refcount = 0;
+  return msg;
+}
+
+nchan_msg_t *nchan_msg_derive_alloc(nchan_msg_t *parent) {
+  nchan_msg_t *msg = msg_derive_init(parent, ngx_alloc(sizeof(nchan_msg_t), ngx_cycle->log), NCHAN_MSG_HEAP);
+  if(!msg || nchan_copy_new_msg_id(&msg->id, &parent->id) != NGX_OK) {
+    ngx_free(msg);
+    return NULL;
+  }
+  return msg;
+}
+nchan_msg_t *nchan_msg_derive_palloc(nchan_msg_t *parent, ngx_pool_t *pool) {
+  nchan_msg_t *msg = msg_derive_init(parent, ngx_palloc(pool, sizeof(nchan_msg_t)), NCHAN_MSG_POOL);
+  if(!msg || nchan_copy_new_msg_id(&msg->id, &parent->id) != NGX_OK) {
+    return NULL;
+  }
+  return msg;
+}
+nchan_msg_t *nchan_msg_derive_stack(nchan_msg_t *parent, nchan_msg_t *child, int16_t *largetags) {
+  nchan_msg_t *msg = msg_derive_init(parent, child, NCHAN_MSG_STACK);
+  if(!msg || nchan_copy_msg_id(&msg->id, &parent->id, largetags) != NGX_OK) {
+    return NULL;
+  }
+  return msg;
+}
+
diff --git a/debian/modules/nchan/src/util/nchan_msgid.h b/debian/modules/nchan/src/util/nchan_msg.h
similarity index 63%
rename from debian/modules/nchan/src/util/nchan_msgid.h
rename to debian/modules/nchan/src/util/nchan_msg.h
index ceeb129..99d35d8 100644
--- a/debian/modules/nchan/src/util/nchan_msgid.h
+++ b/debian/modules/nchan/src/util/nchan_msg.h
@@ -1,3 +1,11 @@
+#ifndef NCHAN_MSG_H
+#define NCHAN_MSG_H
+ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl);
+ngx_int_t msg_release(nchan_msg_t *msg, char *lbl);
+int msg_refcount_valid(nchan_msg_t *msg);
+int msg_refcount_invalidate_if_zero(nchan_msg_t *msg);
+void msg_refcount_invalidate(nchan_msg_t *msg);
+
 void nchan_expand_msg_id_multi_tag(nchan_msg_id_t *id, uint8_t in_n, uint8_t out_n, int16_t fill);
 ngx_int_t nchan_copy_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src, int16_t *largetags);
 ngx_int_t nchan_copy_new_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src);
@@ -12,5 +20,16 @@ ngx_int_t nchan_extract_from_multi_msgid(nchan_msg_id_t *src, uint16_t n, nchan_
 int8_t nchan_compare_msgid_tags(nchan_msg_id_t *id1, nchan_msg_id_t *id2);
 int8_t nchan_compare_msgids(nchan_msg_id_t *id1, nchan_msg_id_t *id2);
 
+int nchan_msgid_tagcount_match(nchan_msg_id_t *id, int count);
+
 void nchan_expand_tiny_msgid(nchan_msg_tiny_id_t *tinyid, nchan_msg_id_t *id);
 void nchan_shrink_normal_msgid(nchan_msg_id_t *id, nchan_msg_tiny_id_t *tinyid);
+
+
+nchan_msg_t *nchan_msg_derive_alloc(nchan_msg_t *parent);
+nchan_msg_t *nchan_msg_derive_palloc(nchan_msg_t *parent, ngx_pool_t *pool);
+nchan_msg_t *nchan_msg_derive_stack(nchan_msg_t *parent, nchan_msg_t *child, int16_t *largetags);
+
+
+
+#endif //NCHAN_MSG_H
diff --git a/debian/modules/nchan/src/util/nchan_output.c b/debian/modules/nchan/src/util/nchan_output.c
index 31e2924..1f62028 100644
--- a/debian/modules/nchan/src/util/nchan_output.c
+++ b/debian/modules/nchan/src/util/nchan_output.c
@@ -133,6 +133,14 @@ static void nchan_reserve_msg_cleanup(void *pd) {
 static void nchan_output_reserve_message_queue(ngx_http_request_t *r, nchan_msg_t *msg) {
   nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
   ngx_http_cleanup_t   *cln;
+  
+  if(msg->storage != NCHAN_MSG_SHARED) {
+    if((msg = nchan_msg_derive_alloc(msg)) == NULL) {
+      ERR("Coudln't alloc derived msg for output_reserve_message_queue");
+      return;
+    }
+  }
+  
   if(!ctx->reserved_msg_queue) {
     if((ctx->reserved_msg_queue = ngx_palloc(r->pool, sizeof(*ctx->reserved_msg_queue))) == NULL) {
       ERR("Coudln't palloc reserved_msg_queue");
@@ -157,7 +165,7 @@ static void nchan_output_reserve_message_queue(ngx_http_request_t *r, nchan_msg_
 
 //general request-output functions and the iraq and the asian countries and dated references and the, uh, such
 
-static void nchan_flush_pending_output(ngx_http_request_t *r) {
+void nchan_flush_pending_output(ngx_http_request_t *r) {
   int                        rc;
   ngx_event_t               *wev;
   ngx_connection_t          *c;
@@ -246,7 +254,7 @@ static ngx_int_t nchan_output_filter_generic(ngx_http_request_t *r, nchan_msg_t
   c = r->connection;
   wev = c->write;
 
-  if(ctx->bcp) {
+  if(ctx && ctx->bcp) {
     nchan_bufchain_pool_refresh_files(ctx->bcp);
   }
   
@@ -265,7 +273,9 @@ static ngx_int_t nchan_output_filter_generic(ngx_http_request_t *r, nchan_msg_t
       ngx_add_timer(wev, clcf->send_timeout);
     }
     if ((ngx_handle_write_event(wev, clcf->send_lowat)) != NGX_OK) {
-      flush_all_the_reserved_things(ctx);
+      if(ctx) {
+        flush_all_the_reserved_things(ctx);
+      }
       return NGX_ERROR;
     }
     return NGX_OK;
@@ -278,7 +288,9 @@ static ngx_int_t nchan_output_filter_generic(ngx_http_request_t *r, nchan_msg_t
   }
   
   if(r->out == NULL) {
-    flush_all_the_reserved_things(ctx);
+    if(ctx) {
+      flush_all_the_reserved_things(ctx);
+    }
   }
   
   return rc;
@@ -292,32 +304,51 @@ ngx_int_t nchan_output_msg_filter(ngx_http_request_t *r, nchan_msg_t *msg, ngx_c
 }
 
 void nchan_include_access_control_if_needed(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
+  ngx_str_t          *origin;
+  ngx_str_t          *allow_origin_val;
+  static ngx_str_t    true_string = ngx_string("true");
+  nchan_loc_conf_t   *cf;
   if(!ctx) {
     ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
   }
-  nchan_loc_conf_t       *cf;
   if(!ctx) {
     return;
   }
-  if(ctx->request_origin_header.data) {
+  
+  if((origin = nchan_get_header_value_origin(r, ctx)) != NULL) {
     cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-    nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, &cf->allow_origin);
+    
+    if(cf->allow_credentials) {
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS, &true_string);
+    }
+    allow_origin_val = nchan_get_allow_origin_value(r, cf, ctx);
+    if(allow_origin_val && allow_origin_val->len == 1 && allow_origin_val->data[0]=='*') {
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, allow_origin_val);
+    }
+    else { //otherwise echo the origin
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, origin);
+    }
   }
 }
 
-ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_int_t finalize) {
+ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body, ngx_int_t finalize) {
   ngx_int_t    rc = NGX_OK;
   r->headers_out.status=status_code;
   if(status_line!=NULL) {
     r->headers_out.status_line.len =status_line->len;
     r->headers_out.status_line.data=status_line->data;
   }
-  r->headers_out.content_length_n = 0;
-  r->header_only = 1;
+  if(status_body == NULL) {
+    r->headers_out.content_length_n = 0;
+    r->header_only = 1;
+  }
   
   nchan_include_access_control_if_needed(r, NULL);
   
   rc= ngx_http_send_header(r);
+  if(status_body) {
+    rc = ngx_http_output_filter(r, status_body);
+  }
   if(finalize) {
     nchan_http_finalize_request(r, rc);
   }
@@ -331,6 +362,26 @@ ngx_int_t nchan_respond_cstring(ngx_http_request_t *r, ngx_int_t status_code, co
   return nchan_respond_string(r, status_code, content_type, &str, finalize);
 }
 
+ngx_int_t nchan_respond_sprintf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_int_t finalize, char *fmt, ...) {
+  u_char *p;
+  ngx_str_t str;
+  va_list   args;
+    
+  str.len = 1024;
+  str.data = ngx_palloc(r->pool, 1024);
+  if(str.data == NULL) {
+    return nchan_respond_status(r, status_code, NULL, NULL, finalize);
+    return NGX_ERROR;
+  }
+
+  va_start(args, fmt);
+  p = ngx_vslprintf(str.data, str.data + str.len, fmt, args);
+  va_end(args);
+  
+  str.len = p - str.data;
+  return nchan_respond_string(r, status_code, content_type, &str, finalize);
+}
+
 ngx_int_t nchan_respond_membuf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, ngx_buf_t *body, ngx_int_t finalize) {
   ngx_str_t str;
   str.len = ngx_buf_size(body);
@@ -355,7 +406,6 @@ size_t msgtag_to_strptr(nchan_msg_id_t *id, char *ch) {
   uint8_t   i;
   char     *cur;
   
-  assert(max < 255);
   static char* inactive="%i,";
   static char*  active="[%i],";
   if(max == 1) {
@@ -403,12 +453,13 @@ ngx_str_t *msgid_to_str(nchan_msg_id_t *id) {
 ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid) {
   ngx_str_t                 *etag, *tmp_etag;
   nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  int8_t                     output_etag = 1, cross_origin;
+  int8_t                     output_etag = 1;
+  ngx_str_t                 *origin_header;
   
   if(!ctx) {
     ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
   }
-  cross_origin = ctx && ctx->request_origin_header.data;
+  origin_header = ctx ? nchan_get_header_value_origin(r, ctx) : NULL; 
 
   if(!cf->msg_in_etag_only) {
     //last-modified
@@ -435,7 +486,7 @@ ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_req
     if(output_etag) {
       nchan_add_response_header(r, &NCHAN_HEADER_ETAG, etag);
     }
-    if(cross_origin) {
+    if(origin_header) {
       nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS, &NCHAN_MSG_RESPONSE_ALLOWED_HEADERS);
     }
   }
@@ -443,7 +494,7 @@ ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_req
     if(output_etag) {
       nchan_add_response_header(r, &cf->custom_msgtag_header, etag);
     }
-    if(cross_origin) {
+    if(origin_header) {
       u_char        *cur = ngx_palloc(r->pool, 255);
       if(cur == NULL) {
         return NGX_ERROR;
@@ -462,7 +513,7 @@ ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_req
 }
 
 ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_id_t *msgid, ngx_int_t finalize, char **err) {
-  ngx_buf_t                 *buffer = msg->buf;
+  ngx_buf_t                 *buffer = &msg->buf;
   nchan_buf_and_chain_t     *cb;
   ngx_int_t                  rc;
   ngx_chain_t               *rchain = NULL;
@@ -491,9 +542,8 @@ ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_i
     r->header_only = 1;
   }
 
-  if (msg->content_type.data!=NULL) {
-    r->headers_out.content_type.len=msg->content_type.len;
-    r->headers_out.content_type.data = msg->content_type.data;
+  if (msg->content_type) {
+    r->headers_out.content_type = *msg->content_type;
   }
   
   if(msgid == NULL) {
@@ -518,6 +568,7 @@ ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_i
   
   if(rchain) {
     rc= nchan_output_filter(r, rchain);
+    if(rc != NGX_OK && err) *err="failed to write data to connection socket, probably because the connection got closed";
   }
   
   if(finalize) {
@@ -594,17 +645,17 @@ ngx_table_elt_t * nchan_add_response_header(ngx_http_request_t *r, const ngx_str
   return h;
 }
 
-ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allow_origin, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods) {
+ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods) {
   nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
   
   nchan_add_response_header(r, &NCHAN_HEADER_ALLOW, allowed_methods);
   
-  if(ctx && ctx->request_origin_header.data) {
+  if(ctx && nchan_get_header_value_origin(r, ctx)) {
     //Access-Control-Allow-Origin is included later
     nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS, allowed_headers);
     nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS, allowed_methods);
   }
-  return nchan_respond_status(r, NGX_HTTP_OK, NULL, 0);
+  return nchan_respond_status(r, NGX_HTTP_OK, NULL, NULL, 0);
 }
 
 void nchan_http_finalize_request(ngx_http_request_t *r, ngx_int_t code) {
diff --git a/debian/modules/nchan/src/util/nchan_output.h b/debian/modules/nchan/src/util/nchan_output.h
index f145cfd..d465de8 100644
--- a/debian/modules/nchan/src/util/nchan_output.h
+++ b/debian/modules/nchan/src/util/nchan_output.h
@@ -7,15 +7,17 @@ void nchan_output_shutdown(void);
 ngx_int_t nchan_output_filter(ngx_http_request_t *r, ngx_chain_t *in);
 ngx_int_t nchan_output_msg_filter(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in);
 
-ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_int_t finalize);
+ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *body, ngx_int_t finalize);
 ngx_int_t nchan_respond_string(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_str_t *body, ngx_int_t finalize);
+ngx_int_t nchan_respond_sprintf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_int_t finalize, char *fmt, ...);
 ngx_int_t nchan_respond_cstring(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, char *body, ngx_int_t finalize);
 ngx_int_t nchan_respond_membuf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, ngx_buf_t *body, ngx_int_t finalize);
 ngx_table_elt_t * nchan_add_response_header(ngx_http_request_t *r, const ngx_str_t *header_name, const ngx_str_t *header_value);
 ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
-ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allow_origin, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods);
+ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods);
 ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_id_t *msgid, ngx_int_t finalize, char **err);
 void nchan_include_access_control_if_needed(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
+void nchan_flush_pending_output(ngx_http_request_t *r);
 
 void nchan_http_finalize_request(ngx_http_request_t *r, ngx_int_t code);
 
diff --git a/debian/modules/nchan/src/util/nchan_output_info.c b/debian/modules/nchan/src/util/nchan_output_info.c
new file mode 100644
index 0000000..ebde84c
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_output_info.c
@@ -0,0 +1,271 @@
+#include <nchan_module.h>
+
+typedef struct {
+  ngx_str_t            subtype;
+  nchan_content_type_t ct;
+} nchan_content_subtype_t;
+
+nchan_content_type_t nchan_output_info_type(ngx_str_t *accept) {
+  nchan_content_subtype_t subtypes[] = {
+    { ngx_string("plain"),    NCHAN_CONTENT_TYPE_PLAIN },
+    { ngx_string("json"),     NCHAN_CONTENT_TYPE_JSON },
+    { ngx_string("x-json"),   NCHAN_CONTENT_TYPE_JSON },
+    { ngx_string("yaml"),     NCHAN_CONTENT_TYPE_YAML },
+    { ngx_string("x-yaml"),   NCHAN_CONTENT_TYPE_YAML },
+    { ngx_string("xml"),      NCHAN_CONTENT_TYPE_XML }
+  };
+  
+  ngx_str_t  text_ = ngx_string("text/");
+  ngx_str_t  application_ = ngx_string("application/");
+  
+  if(!accept) {
+    return NCHAN_CONTENT_TYPE_PLAIN;
+  }
+  
+  unsigned i;
+  size_t len;
+  u_char *cur, *last, *curend;
+  
+  for(cur = accept->data, last = accept->data + accept->len; cur < last; cur = curend) {
+    if((curend = memchr(cur, ',', last - cur)) != NULL) {
+      curend++;
+    }
+    else {
+      curend = last;
+    }
+    
+    if(nchan_strscanstr(&cur, &text_, curend) || nchan_strscanstr(&cur, &application_, curend)) {
+      len = curend - cur;
+      for(i=0; i<(sizeof(subtypes)/sizeof(nchan_content_subtype_t)); i++) {
+        if(len >= subtypes[i].subtype.len && ngx_memcmp(cur, subtypes[i].subtype.data, subtypes[i].subtype.len) == 0) {
+          return subtypes[i].ct;
+        }
+      }
+    }
+    else {
+      continue;
+    }
+  }
+  
+  return NCHAN_CONTENT_TYPE_PLAIN;
+}
+
+#define NCHAN_CHANNEL_INFO_MAX_LEN 512
+ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type) {
+  static ngx_buf_t                channel_info_buf;
+  static u_char                   channel_info_buf_str[NCHAN_CHANNEL_INFO_MAX_LEN]; //big enough
+  
+  ngx_buf_t                      *b = &channel_info_buf;
+  ngx_uint_t                      len;
+  const ngx_str_t                *format;
+  time_t                          time_elapsed = ngx_time() - last_seen;
+  static nchan_msg_id_t           zero_msgid = NCHAN_ZERO_MSGID;
+  nchan_content_type_t            ct;
+  
+  static struct {
+    ngx_str_t        content_type;
+    const ngx_str_t *format_string;
+  } content_type_map[] = {
+    [NCHAN_CONTENT_TYPE_PLAIN]    = { ngx_string("text/plain"), &NCHAN_CHANNEL_INFO_PLAIN }, 
+    [NCHAN_CONTENT_TYPE_JSON]     = { ngx_string("text/json"), &NCHAN_CHANNEL_INFO_JSON },
+    [NCHAN_CONTENT_TYPE_YAML]     = { ngx_string("text/yaml"), &NCHAN_CHANNEL_INFO_YAML },
+    [NCHAN_CONTENT_TYPE_XML]      = { ngx_string("text/xml"), &NCHAN_CHANNEL_INFO_XML }
+  };
+  
+  if(!last_msgid) {
+    last_msgid = &zero_msgid;
+  }
+ 
+  b->start = channel_info_buf_str;
+  b->pos = b->start;
+  b->last_buf = 1;
+  b->last_in_chain = 1;
+  b->flush = 1;
+  b->memory = 1;
+  
+  ct = nchan_output_info_type(accept_header);
+
+  if(generated_content_type) {
+    *generated_content_type = &content_type_map[ct].content_type;
+  }
+  
+  format = content_type_map[ct].format_string;
+  
+  len = format->len - 8 - 1 + 3*NGX_INT_T_LEN; //minus 8 sprintf
+  
+  if(len > NCHAN_CHANNEL_INFO_MAX_LEN) {
+    nchan_log_error("Channel info string too long: max: %i, is: %i", NCHAN_CHANNEL_INFO_MAX_LEN, len);
+  }
+  
+  b->last = ngx_snprintf(b->start, NCHAN_CHANNEL_INFO_MAX_LEN, (char *)format->data, messages, last_seen==0 ? -1 : (ngx_int_t) time_elapsed, subscribers, msgid_to_str(last_msgid));
+  b->end = b->last;
+  
+  return b;
+}
+
+
+#define NCHAN_GROUP_INFO_MAX_LEN 1024
+static ngx_buf_t *nchan_group_info_buf(ngx_str_t *accept_header, const nchan_group_t *group, ngx_str_t **generated_content_type) {
+  static ngx_buf_t                info_buf;
+  static u_char                   info_buf_str[NCHAN_GROUP_INFO_MAX_LEN]; //big enough
+  
+  ngx_buf_t                      *b = &info_buf;
+  ngx_uint_t                      len;
+  const ngx_str_t                *format;
+  nchan_content_type_t            ct;
+  
+  static struct {
+    ngx_str_t        content_type;
+    const ngx_str_t  format_string;
+  } content_type_map[] = {
+    [NCHAN_CONTENT_TYPE_PLAIN]    = { ngx_string("text/plain"), ngx_string(
+      "channels: %ui" CRLF
+      "subscribers: %ui" CRLF
+      "messages: %ui" CRLF
+      "shared memory used by messages: %ui bytes" CRLF
+      "disk space used by messages: %ui bytes" CRLF
+      "limits:" CRLF
+      "  max channels: %ui" CRLF
+      "  max subscribers: %ui" CRLF
+      "  max messages: %ui" CRLF
+      "  max messages shared memory: %ui" CRLF
+      "  max messages disk space: %ui" CRLF
+    )}, 
+    [NCHAN_CONTENT_TYPE_JSON]     = { ngx_string("text/json"), ngx_string(
+      "{" CRLF
+      "  \"channels\": %ui," CRLF
+      "  \"subscribers\": %ui," CRLF
+      "  \"messages\": %ui," CRLF
+      "  \"messages_memory\": %ui," CRLF
+      "  \"messages_disk\": %ui," CRLF
+      "  \"limits\": {" CRLF
+      "    \"channels\": %ui," CRLF
+      "    \"subscribers\": %ui," CRLF
+      "    \"messages\": %ui," CRLF
+      "    \"messages_memory\": %ui,"CRLF
+      "    \"messages_disk\": %ui" CRLF  
+      "  }" CRLF
+      "}"
+    )},
+    [NCHAN_CONTENT_TYPE_YAML]     = { ngx_string("text/yaml"), ngx_string(
+      "---" CRLF
+      "channels: %ui" CRLF
+      "subscribers: %ui" CRLF
+      "messages: %ui" CRLF
+      "messages_memory: %ui" CRLF
+      "messages_disk: %ui" CRLF
+      "limits:" CRLF
+      "  channels: %ui" CRLF
+      "  subscribers: %ui" CRLF
+      "  messages: %ui" CRLF
+      "  messages_memory: %ui" CRLF
+      "  messages_disk: %ui" CRLF
+      CRLF
+    )},
+    [NCHAN_CONTENT_TYPE_XML]      = { ngx_string("text/xml"), ngx_string(
+      "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" CRLF
+      "<group>" CRLF
+      "  <channels>%ui</channels>" CRLF
+      "  <subscribers>%ui</subscribers>" CRLF
+      "  <messages>%ui</messages>" CRLF
+      "  <messages_memory>%ui</messages_memory>" CRLF
+      "  <messages_disk>%ui</messages_disk>" CRLF
+      "  <limits>" CRLF
+      "    <channels>%ui</channels>" CRLF
+      "    <subscribers>%ui</subscribers>" CRLF
+      "    <messages>%ui</messages>" CRLF
+      "    <messages_memory>%ui</messages_memory>" CRLF
+      "    <messages_disk>%ui</messages_disk>" CRLF
+      "  </limits>" CRLF
+      "</group>"
+    )}
+  };
+ 
+  b->start = info_buf_str;
+  b->pos = b->start;
+  b->last_buf = 1;
+  b->last_in_chain = 1;
+  b->flush = 1;
+  b->memory = 1;
+  
+  ct = nchan_output_info_type(accept_header);
+
+  if(generated_content_type) {
+    *generated_content_type = &content_type_map[ct].content_type;
+  }
+  
+  format = &content_type_map[ct].format_string;
+  
+  len = format->len + 5*NGX_INT_T_LEN; //minus 8 sprintf
+  
+  if(len > NCHAN_GROUP_INFO_MAX_LEN) {
+    nchan_log_error("Group info string too long: max: %i, is: %i", NCHAN_GROUP_INFO_MAX_LEN, len);
+  }
+  
+  b->last = ngx_snprintf(b->start, NCHAN_GROUP_INFO_MAX_LEN, (char *)format->data, 
+                         group->channels, 
+                         group->subscribers, 
+                         group->messages, 
+                         group->messages_shmem_bytes, 
+                         group->messages_file_bytes, 
+                         //now limits
+                         group->limit.channels, 
+                         group->limit.subscribers,
+                         group->limit.messages,
+                         group->limit.messages_shmem_bytes,
+                         group->limit.messages_file_bytes
+                        );
+  b->end = b->last;
+  
+  return b;
+}
+
+//print information about a group
+ngx_int_t nchan_group_info(ngx_http_request_t *r, const nchan_group_t *group) {
+  ngx_buf_t                      *b;
+  ngx_str_t                      *content_type;
+  ngx_str_t                      *accept_header = nchan_get_accept_header_value(r);
+
+  b = nchan_group_info_buf(accept_header, group, &content_type);
+  
+  return nchan_respond_membuf(r, NGX_HTTP_OK, content_type, b, 0);
+}
+
+//print information about a channel
+ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_int_t status_code, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid) {
+  ngx_buf_t                      *b;
+  ngx_str_t                      *content_type;
+  ngx_str_t                      *accept_header = nchan_get_accept_header_value(r);
+
+  b = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, &content_type);
+  
+  return nchan_respond_membuf(r, status_code, content_type, b, 0);
+}
+
+ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code) {
+  static const ngx_str_t CREATED_LINE = ngx_string("201 Created");
+  static const ngx_str_t ACCEPTED_LINE = ngx_string("202 Accepted");
+  
+  time_t             last_seen = 0;
+  ngx_uint_t         subscribers = 0;
+  ngx_uint_t         messages = 0;
+  nchan_msg_id_t    *msgid = NULL;
+  if(channel!=NULL) {
+    subscribers = channel->subscribers;
+    last_seen = channel->last_seen;
+    messages  = channel->messages;
+    msgid = &channel->last_published_msg_id;
+    r->headers_out.status = status_code == NGX_OK ? NGX_HTTP_OK : status_code;
+    if (status_code == NGX_HTTP_CREATED) {
+      ngx_memcpy(&r->headers_out.status_line, &CREATED_LINE, sizeof(ngx_str_t));
+    }
+    else if (status_code == NGX_HTTP_ACCEPTED) {
+      ngx_memcpy(&r->headers_out.status_line, &ACCEPTED_LINE, sizeof(ngx_str_t));
+    }
+    return nchan_channel_info(r, r->headers_out.status, messages, subscribers, last_seen, msgid);
+  }
+  else {
+    //404!
+    return nchan_respond_status(r, NGX_HTTP_NOT_FOUND, NULL, NULL, 0);
+  }
+}
diff --git a/debian/modules/nchan/src/util/nchan_output_info.h b/debian/modules/nchan/src/util/nchan_output_info.h
new file mode 100644
index 0000000..36c5152
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_output_info.h
@@ -0,0 +1,6 @@
+ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type);
+
+ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_int_t status_code, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid);
+ngx_int_t nchan_group_info(ngx_http_request_t *r, const nchan_group_t *group);
+
+ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code);
diff --git a/debian/modules/nchan/src/util/nchan_rbtree.h b/debian/modules/nchan/src/util/nchan_rbtree.h
index 7a18dfc..f67ad3b 100644
--- a/debian/modules/nchan/src/util/nchan_rbtree.h
+++ b/debian/modules/nchan/src/util/nchan_rbtree.h
@@ -35,18 +35,18 @@ struct ngx_rbtree_debug_node_s {
 
 typedef enum {RBTREE_WALK_LEFT, RBTREE_WALK_RIGHT, RBTREE_WALK_LEFT_RIGHT, RBTREE_WALK_STOP} rbtree_walk_direction_t;
 
-typedef ngx_int_t (*rbtree_walk_callback_pt)(rbtree_seed_t *, void *, void *);
+typedef ngx_int_t (*rbtree_walk_callback_pt)(rbtree_seed_t *, void *node_data, void *privdata);
 typedef rbtree_walk_direction_t (*rbtree_walk_conditional_callback_pt)(rbtree_seed_t *, void *, void *);
 
 ngx_int_t rbtree_init(rbtree_seed_t *seed, char *name, void *(*id)(void *), uint32_t (*hash)(void *), ngx_int_t (*compare)(void *, void *));
 unsigned             rbtree_empty(rbtree_seed_t *, rbtree_walk_callback_pt, void *data);
 
-ngx_rbtree_node_t   *rbtree_create_node(rbtree_seed_t *, size_t);
+ngx_rbtree_node_t   *rbtree_create_node(rbtree_seed_t *, size_t data_size);
 ngx_int_t            rbtree_insert_node(rbtree_seed_t *, ngx_rbtree_node_t *);
 ngx_int_t            rbtree_remove_node(rbtree_seed_t *, ngx_rbtree_node_t *);
 ngx_int_t            rbtree_destroy_node(rbtree_seed_t *, ngx_rbtree_node_t *);
 
-ngx_rbtree_node_t   *rbtree_find_node(rbtree_seed_t *, void *);
+ngx_rbtree_node_t   *rbtree_find_node(rbtree_seed_t *, void *id);
 
 ngx_int_t            rbtree_walk(rbtree_seed_t *seed, rbtree_walk_callback_pt, void *data);
 ngx_int_t            rbtree_walk_incr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data);
diff --git a/debian/modules/nchan/src/util/nchan_slist.c b/debian/modules/nchan/src/util/nchan_slist.c
new file mode 100644
index 0000000..8d67318
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_slist.c
@@ -0,0 +1,164 @@
+#include "nchan_slist.h"
+#include <assert.h>
+
+ /*
+  * Boring non-allocating doubly-linked "static" list.
+  *uses preset offsets for the prev and next fields on pre-allocated data
+  */
+ 
+ngx_int_t __nchan_slist_init(nchan_slist_t *list, off_t offset_prev, off_t offset_next) {
+  list->offset.prev = offset_prev;
+  list->offset.next = offset_next;
+  return nchan_slist_reset(list);
+}
+
+ngx_int_t nchan_slist_reset(nchan_slist_t *list) {
+  list->head = NULL;
+  list->tail = NULL;
+  list->n = 0;
+  return NGX_OK;
+}
+
+void *nchan_slist_first(nchan_slist_t *list) {
+  return list->head;
+}
+void *nchan_slist_last(nchan_slist_t *list) {
+  return list->tail;
+}
+static void **nchan_slist_next_ptr(nchan_slist_t *list, void *el) {
+  return (void **)&(((char *)el)[list->offset.next]);
+}
+static void **nchan_slist_prev_ptr(nchan_slist_t *list, void *el) {
+  return (void **)&(((char *)el)[list->offset.prev]);
+}
+
+void *nchan_slist_next(nchan_slist_t *list, void *el) {
+  void **ptr = nchan_slist_next_ptr(list, el);
+  return *ptr;
+}
+void *nchan_slist_prev(nchan_slist_t *list, void *el) {
+  void **ptr = nchan_slist_prev_ptr(list, el);
+  return *ptr;
+}
+
+ngx_int_t nchan_slist_append(nchan_slist_t *list, void *el) {
+  void **el_prev_ptr = nchan_slist_prev_ptr(list, el);
+  void **el_next_ptr = nchan_slist_next_ptr(list, el);
+  if(list->head == NULL) {
+    list->head = el;
+  }
+  if(list->tail == NULL) {
+    *el_prev_ptr = NULL;
+  }
+  else {
+    void **tail_next = nchan_slist_next_ptr(list, list->tail);
+    *el_prev_ptr = list->tail;
+    *tail_next = el;
+  }
+  list->tail = el;
+  *el_next_ptr = NULL;
+  list->n++;
+  return NGX_OK;
+}
+ngx_int_t nchan_slist_prepend(nchan_slist_t *list, void *el) {
+  void **el_prev_ptr = nchan_slist_prev_ptr(list, el);
+  void **el_next_ptr = nchan_slist_next_ptr(list, el);
+  if(list->tail == NULL) {
+    list->tail = el;
+  }
+  if(list->head == NULL) {
+    *el_next_ptr = NULL;
+  }
+  else {
+    void **head_prev_ptr = nchan_slist_prev_ptr(list, list->head);
+    *el_next_ptr = list->head;
+    *head_prev_ptr = el;
+  }
+  list->head = el;
+  *el_prev_ptr = NULL;
+  list->n++;
+  return NGX_OK;
+}
+ngx_int_t nchan_slist_remove(nchan_slist_t *list, void *el) {
+  void **el_prev_ptr = nchan_slist_prev_ptr(list, el);
+  void **el_next_ptr = nchan_slist_next_ptr(list, el);
+  void *el_prev = *el_prev_ptr, *el_next = *el_next_ptr;
+  if(list->head == el) {
+    list->head = el_next;
+  }
+  if(list->tail == el) {
+    list->tail = el_prev;
+  }
+  if(el_prev) {
+    void **el_prev_next_ptr = nchan_slist_next_ptr(list, el_prev);
+    *el_prev_next_ptr = el_next;
+  }
+  if(el_next) {
+    void **el_next_prev_ptr = nchan_slist_prev_ptr(list, el_next);
+    *el_next_prev_ptr = el_prev;
+  }
+  list->n--;
+  *el_prev_ptr = NULL;
+  *el_next_ptr = NULL;
+  return NGX_OK;
+}
+
+ngx_int_t nchan_slist_transfer(nchan_slist_t *dst, nchan_slist_t *src) {
+  assert(dst->offset.prev == src->offset.prev); //same-ish slists
+  assert(dst->offset.next == src->offset.next); //same-ish slists
+  void **src_head_prev_ptr = nchan_slist_prev_ptr(src, src->head);
+  void **dst_tail_next_ptr = nchan_slist_next_ptr(dst, src->tail);
+  
+  if(src->n == 0) {
+    assert(src->head == NULL);
+    assert(src->tail == NULL);
+    return NGX_OK; //nothing to do
+  }
+  
+  *src_head_prev_ptr = dst->tail;
+  if(dst->tail) {
+    *dst_tail_next_ptr = src->head;
+  }
+  dst->tail = src->tail;
+  
+  if(dst->head == NULL) {
+    dst->head = src->head;
+  }
+  dst->tail = src->tail;
+  dst->n += src->n;
+  
+  src->n = 0;
+  src->head = NULL;
+  src->tail = NULL;
+  
+  return NGX_OK;
+}
+
+void *nchan_slist_shift(nchan_slist_t *list) {
+  void *head = list->head;
+  if(head) {
+    nchan_slist_remove(list, head);
+  }
+  return head;
+}
+
+void *nchan_slist_pop(nchan_slist_t *list) {
+  void *tail = list->tail;
+  if(tail) {
+    nchan_slist_remove(list, tail);
+  }
+  return tail;
+}
+
+int nchan_slist_is_empty(nchan_slist_t *list) {
+  if(list->n == 0) {
+    assert(list->head == NULL);
+    assert(list->tail == NULL);
+    return 1;
+  }
+  else {
+    assert(list->head != NULL);
+    assert(list->tail != NULL);
+    return 0;
+  }
+}
diff --git a/debian/modules/nchan/src/util/nchan_slist.h b/debian/modules/nchan/src/util/nchan_slist.h
new file mode 100644
index 0000000..df8dcb9
--- /dev/null
+++ b/debian/modules/nchan/src/util/nchan_slist.h
@@ -0,0 +1,41 @@
+#ifndef NCHAN_SLIST_H
+#define NCHAN_SLIST_H
+
+#define NCHAN_SLIST_DEBUG 0
+
+#include <nginx.h>
+#include <ngx_http.h>
+
+typedef struct {
+  off_t           prev;
+  off_t           next;
+} nchan_slist_offsets_t;
+
+typedef struct {
+  void                 *head;
+  void                 *tail;
+  ngx_uint_t            n;
+  nchan_slist_offsets_t offset;
+} nchan_slist_t;
+
+
+
+#define nchan_slist_init(slist, data_type, prev_field, next_field) \
+  __nchan_slist_init(slist, offsetof(data_type, prev_field), offsetof(data_type, next_field))
+ngx_int_t __nchan_slist_init(nchan_slist_t *list, off_t offset_prev, off_t offset_next);
+void *nchan_slist_first(nchan_slist_t *list);
+void *nchan_slist_last(nchan_slist_t *list);
+void *nchan_slist_next(nchan_slist_t *list, void *el);
+void *nchan_slist_prev(nchan_slist_t *list, void *el);
+ngx_int_t nchan_slist_append(nchan_slist_t *list, void *el);
+ngx_int_t nchan_slist_prepend(nchan_slist_t *list, void *el);
+ngx_int_t nchan_slist_remove(nchan_slist_t *list, void *el);
+
+ngx_int_t nchan_slist_reset(nchan_slist_t *list);
+ngx_int_t nchan_slist_transfer(nchan_slist_t *dst, nchan_slist_t *src);
+void *nchan_slist_pop(nchan_slist_t *list);
+void *nchan_slist_shift(nchan_slist_t *list);
+
+int nchan_slist_is_empty(nchan_slist_t *list);
+
+#endif /*NCHAN_SLIST_H*/
diff --git a/debian/modules/nchan/src/util/nchan_subrequest.c b/debian/modules/nchan/src/util/nchan_subrequest.c
index 02a7b0d..a9f5141 100644
--- a/debian/modules/nchan/src/util/nchan_subrequest.c
+++ b/debian/modules/nchan/src/util/nchan_subrequest.c
@@ -45,11 +45,12 @@ static ngx_inline ngx_uint_t nchan_hash_str(u_char *src, size_t n) {
 #define nchan_hash_literal(s)                                        \
   nchan_hash_str((u_char *) s, sizeof(s) - 1)
 
-static ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t len, u_char *p) {
+ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t len) {
   ngx_table_elt_t                 *h, *header;
   ngx_list_part_t                 *part;
   ngx_http_request_t              *pr;
   ngx_uint_t                       i;
+  u_char                          *p;
   static ngx_uint_t                nchan_content_length_hash = 0;
   if(nchan_content_length_hash == 0) {
     nchan_content_length_hash = nchan_hash_literal("content-length");
@@ -70,11 +71,9 @@ static ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t le
   h->lowcase_key= (u_char *)"content-length";
 
   r->headers_in.content_length = h;
-  if(p == NULL) {
-    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
-    if (p == NULL) {
-      return NGX_ERROR;
-    }
+  p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+  if (p == NULL) {
+    return NGX_ERROR;
   }
 
   h->value.data = p;
@@ -120,7 +119,7 @@ static ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t le
   return NGX_OK;
 }
 
-ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n, u_char *content_len_str) {
+ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n) {
   //ngx_http_core_main_conf_t  *cmcf;
   ngx_http_request_t         *r;
   ngx_http_request_body_t    *body;
@@ -154,7 +153,7 @@ ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx
   if ((body = request_body)!=NULL) {
     sr->request_body = body;
 
-    rc = nchan_set_content_length_header(sr, content_length_n, content_len_str);
+    rc = nchan_set_content_length_header(sr, content_length_n);
     
     if (rc != NGX_OK) {
       return NGX_ERROR;
@@ -253,9 +252,17 @@ size_t nchan_subrequest_content_length(ngx_http_request_t *sr) {
   size_t                            len = 0;
   ngx_http_upstream_headers_in_t   *headers_in = &sr->upstream->headers_in;
   ngx_chain_t                      *chain;
+  ngx_chain_t                      *body_chain;
+#if nginx_version >= 1013010
+  body_chain = sr->out;
+#else
+  body_chain = sr->upstream->out_bufs;
+#endif
+  
+  
   if(headers_in->chunked || headers_in->content_length_n == -1) {
     //count it
-    for(chain = sr->upstream->out_bufs; chain != NULL; chain = chain->next) {
+    for(chain = body_chain; chain != NULL; chain = chain->next) {
       len += ngx_buf_size((chain->buf));
     }
   }
@@ -265,3 +272,53 @@ size_t nchan_subrequest_content_length(ngx_http_request_t *sr) {
   
   return len;
 }
+
+
+ngx_http_request_t *nchan_create_subrequest(ngx_http_request_t *r, ngx_str_t *url, ngx_buf_t *body, ngx_http_post_subrequest_pt cb, void *pd) {
+  ngx_http_post_subrequest_t    *psr = ngx_pcalloc(r->pool, sizeof(*psr));
+  ngx_http_request_t            *sr;
+  
+  psr->handler = cb;
+  psr->data = pd;
+  
+  ngx_http_subrequest(r, url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
+  
+  if((sr->request_body = ngx_pcalloc(r->pool, sizeof(*sr->request_body))) == NULL) { //dummy request body 
+    return NULL;
+  }
+  
+  if(body && ngx_buf_size(body) > 0) {
+    static ngx_str_t                   POST_REQUEST_STRING = {4, (u_char *)"POST "};
+    size_t                             sz;
+    ngx_http_request_body_t           *sr_body = sr->request_body;
+    ngx_chain_t                       *fakebody_chain;
+    ngx_buf_t                         *fakebody_buf;
+    
+    fakebody_chain = ngx_palloc(r->pool, sizeof(*fakebody_chain));
+    fakebody_buf = ngx_pcalloc(r->pool, sizeof(*fakebody_buf));
+    sr_body->bufs = fakebody_chain;
+    fakebody_chain->next = NULL;
+    fakebody_chain->buf = fakebody_buf;
+    fakebody_buf->last_buf = 1;
+    fakebody_buf->last_in_chain = 1;
+    fakebody_buf->flush = 1;
+    fakebody_buf->memory = 1;
+    
+    //just copy the buffer contents. it's inefficient but I don't care at the moment.
+    //this can and should be optimized later
+    sz = ngx_buf_size(body);
+    fakebody_buf->start = ngx_palloc(r->pool, sz); //huuh?
+    ngx_memcpy(fakebody_buf->start, body->start, sz);
+    fakebody_buf->end = fakebody_buf->start + sz;
+    fakebody_buf->pos = fakebody_buf->start;
+    fakebody_buf->last = fakebody_buf->end;
+    
+    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, sr_body, sz);
+  }
+  else {
+    sr->header_only = 1;
+  }
+  sr->args = r->args;
+  
+  return sr;
+}
diff --git a/debian/modules/nchan/src/util/nchan_subrequest.h b/debian/modules/nchan/src/util/nchan_subrequest.h
index 356f4a4..b96b78d 100644
--- a/debian/modules/nchan/src/util/nchan_subrequest.h
+++ b/debian/modules/nchan/src/util/nchan_subrequest.h
@@ -1,3 +1,6 @@
-ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n, u_char *content_len_str);
+ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t len);
+ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n);
 size_t nchan_subrequest_content_length(ngx_http_request_t *sr);
 ngx_int_t nchan_recover_x_accel_redirected_request_method(ngx_http_request_t *r);
+
+ngx_http_request_t *nchan_create_subrequest(ngx_http_request_t *r, ngx_str_t *url, ngx_buf_t *body, ngx_http_post_subrequest_pt cb, void *pd);
diff --git a/debian/modules/nchan/src/util/nchan_util.c b/debian/modules/nchan/src/util/nchan_util.c
index cfbe8d1..f675381 100644
--- a/debian/modules/nchan/src/util/nchan_util.c
+++ b/debian/modules/nchan/src/util/nchan_util.c
@@ -1,35 +1,73 @@
 #include <nchan_module.h>
 #include <assert.h>
 
-char *nchan_msgstatus_to_str(nchan_msg_status_t status) {
-  switch(status) {
-    case MSG_CHANNEL_NOTREADY:
-      return "MSG_CHANNEL_NOTREADY";
-    case MSG_NORESPONSE:
-      return "MSG_NORESPONSE";
-    case MSG_INVALID:
-      return "MSG_INVALID";
-    case MSG_PENDING:
-      return "MSG_PENDING";
-    case MSG_NOTFOUND:
-      return "MSG_NOTFOUND";
-    case MSG_FOUND:
-      return "MSG_FOUND";
-    case MSG_EXPECTED:
-      return "MSG_EXPECTED";
-    case MSG_EXPIRED:
-      return "MSG_EXPIRED";
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
+
+#ifndef NCHAN_HAVE_MEMRCHR
+void *memrchr(const void *s, int c, size_t n) {
+  const char *start = s;
+  const char *end = &start[n]; //one too much on purpose
+  while(--end >= start) { //and this is why
+    if(c == *end) {
+      return (void *)end;
+    }
   }
-  return "???";
+  return NULL;
 }
+#endif
 
 int nchan_ngx_str_match(ngx_str_t *str1, ngx_str_t *str2) {
+  if(str1 == str2) {
+    return 1;
+  }
   if(str1->len != str2->len) {
     return 0;
   }
+  if(str1->len == 0) {
+    return 1;
+  }
   return memcmp(str1->data, str2->data, str1->len) == 0;
 }
 
+
+int nchan_ngx_str_nonzero_match(ngx_str_t *str1, ngx_str_t *str2) {
+  if(str1->len == 0) {
+    return 0;
+  }
+  else {
+    return nchan_ngx_str_match(str1, str2);
+  }
+}
+
+int nchan_strscanstr(u_char **cur, ngx_str_t *find, u_char *last) {
+  //inspired by ngx_strnstr
+  char   *s2 = (char *)find->data;
+  u_char *s1 = *cur;
+  size_t  len = last - s1;
+  u_char  c1, c2;
+  size_t  n;
+  c2 = *(u_char *) s2++;
+  n = find->len - 1;
+  do {
+    do {
+      if (len-- == 0) {
+        return 0;
+      }
+      c1 = *s1++;
+      if (c1 == 0) {
+        return 0;
+      }
+    } while (c1 != c2);
+    if (n > len) {
+      return 0;
+    }
+  } while (ngx_strncmp(s1, (u_char *) s2, n) != 0);
+  *cur = s1 + n;
+  return 1;
+}
+
 ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen) {
   size_t                        len;
   ngx_http_script_code_pt       code;
@@ -76,6 +114,53 @@ ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex
   return NGX_OK;
 }
 
+ngx_int_t ngx_http_complex_value_custom_pool(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, ngx_pool_t *pool) {
+  size_t                        len;
+  ngx_http_script_code_pt       code;
+  ngx_http_script_len_code_pt   lcode;
+  ngx_http_script_engine_t      e;
+
+  if (val->lengths == NULL) {
+    *value = val->value;
+    return NGX_OK;
+  }
+
+  ngx_http_script_flush_complex_value(r, val);
+
+  ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
+
+  e.ip = val->lengths;
+  e.request = r;
+  e.flushed = 1;
+
+  len = 0;
+
+  while (*(uintptr_t *) e.ip) {
+    lcode = *(ngx_http_script_len_code_pt *) e.ip;
+    len += lcode(&e);
+  }
+  
+  value->data = ngx_palloc(pool, len);
+  if(value->data == NULL) {
+    nchan_log_error("couldn't palloc for ngx_http_complex_value_custom_pool");
+    return NGX_ERROR;
+  }
+  value->len = len;
+
+  e.ip = val->values;
+  e.pos = value->data;
+  e.buf = *value;
+
+  while (*(uintptr_t *) e.ip) {
+    code = *(ngx_http_script_code_pt *) e.ip;
+    code((ngx_http_script_engine_t *) &e);
+  }
+
+  *value = e.buf;
+
+  return NGX_OK;
+}
+
 u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char) {
   u_char   *delim = sub->data;
   size_t    delim_sz = sub->len;
@@ -121,6 +206,25 @@ ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name)
   return NULL;
 }
 
+ngx_str_t *nchan_get_header_value_origin(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
+  ngx_str_t         *origin_header;
+  static ngx_str_t   empty_str = ngx_string("");
+  if(!ctx) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  }
+  
+  if(!ctx->request_origin_header) {
+    if((origin_header = nchan_get_header_value(r, NCHAN_HEADER_ORIGIN)) != NULL) {
+      ctx->request_origin_header = origin_header;
+    }
+    else {
+      ctx->request_origin_header = &empty_str;
+    }
+  }
+  
+  return ctx->request_origin_header == &empty_str ? NULL : ctx->request_origin_header;
+}
+
 ngx_str_t *nchan_get_accept_header_value(ngx_http_request_t *r) {
 #if (NGX_HTTP_HEADERS)  
   if(r->headers_in.accept == NULL) {
@@ -175,31 +279,50 @@ int nchan_cstr_startswith(char *cstr, char *match) {
   }
   return 1;
 }
+int nchan_str_startswith(ngx_str_t *str, const char *match) {
+  size_t sz = strlen(match);
+  if(sz > str->len) {
+    return 0;
+  }
+  if(memcmp(str->data, match, sz) == 0) {
+    return 1;
+  }
+  return 0;
+}
 
-void nchan_scan_nearest_chr(u_char **cur, ngx_str_t *str, ngx_int_t n, ...) {
-  u_char    chr;
-  va_list   args;
+int nchan_str_after(ngx_str_t **str, const char *match) {
+  if(nchan_str_startswith(*str, match)) {
+    size_t sz = strlen(match);
+    (*str)->data+=sz;
+    (*str)->len-=sz;
+    return 1;
+  }
+  else {
+    return 0;
+  }
+}
+
+
+void nchan_scan_split_by_chr(u_char **cur, size_t max_len, ngx_str_t *str, u_char chr) {
   u_char   *shortest = NULL;
+  u_char   *start = *cur;
+  u_char   *tmp_cur;
   
-  u_char *tmp_cur;
-  
-  ngx_int_t i;
-  
-  for(tmp_cur = *cur; shortest == NULL && (tmp_cur == *cur || tmp_cur[-1] != '\0'); tmp_cur++) {
-    va_start(args, n);
-    for(i=0; shortest == NULL && i<n; i++) {
-      chr = (u_char )va_arg(args, int);
-      if(*tmp_cur == chr) {
-        shortest = tmp_cur;
-      }
+  for(tmp_cur = *cur; shortest == NULL && (tmp_cur == *cur || tmp_cur - start < (ssize_t )max_len); tmp_cur++) {
+    if(*tmp_cur == chr) {
+      shortest = tmp_cur;
     }
-    va_end(args);
   }
   if(shortest) {
     str->data = (u_char *)*cur;
     str->len = shortest - *cur;
     *cur = shortest + 1;
   }
+  else if(tmp_cur - start == (ssize_t )max_len) {
+    str->data = start;
+    str->len = max_len;
+    *cur = start + max_len;
+  }
   else {
     str->data = NULL;
     str->len = 0;
@@ -211,22 +334,26 @@ void nchan_scan_until_chr_on_line(ngx_str_t *line, ngx_str_t *str, u_char chr) {
   //ERR("rest_line: \"%V\"", line);
   cur = (u_char *)memchr(line->data, chr, line->len);
   if(!cur) {
-    *str = *line;
+    if(str) {
+      *str = *line;
+    }
     line->data += line->len;
     line->len = 0;
   }
   else {
-    str->data = line->data;
-    str->len = (cur - line->data);
-    line->len -= str->len + 1;
-    line->data += str->len + 1;
+    if(str) {
+      str->data = line->data;
+      str->len = (cur - line->data);
+    }
+    line->len -= (cur - line->data) + 1;
+    line->data += (cur - line->data) + 1;
   }
   //ERR("str: \"%V\"", str);
 }
 
 void nchan_strcpy(ngx_str_t *dst, ngx_str_t *src, size_t maxlen) {
   size_t len = src->len > maxlen && maxlen > 0 ? maxlen : src->len;
-  ngx_memcpy(dst->data, src->data, len);
+  memcpy(dst->data, src->data, len);
   dst->len = len;
 }
 
@@ -243,6 +370,50 @@ static ngx_buf_t *ensure_last_buf(ngx_pool_t *pool, ngx_buf_t *buf) {
   }
 }
 
+ngx_str_t *nchan_get_allow_origin_value(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx) {
+  if(!ctx) ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  if(!cf)  cf  = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  if(!ctx->allow_origin && cf->allow_origin) {
+    ngx_str_t                 *allow_origin = ngx_palloc(r->pool, sizeof(*allow_origin));
+    ngx_http_complex_value(r, cf->allow_origin, allow_origin);
+    ctx->allow_origin = allow_origin;
+  }
+  
+  return ctx->allow_origin;
+}
+
+int nchan_match_origin_header(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx) {
+  ngx_str_t                 *origin_header;
+  ngx_str_t                 *allow_origin;
+  ngx_str_t                  curstr;
+  u_char                    *cur, *end;
+  
+  if(cf->allow_origin == NULL) { //default is to always match
+    return 1;
+  }
+  
+  if((origin_header = nchan_get_header_value_origin(r, ctx)) == NULL) {
+    return 1;
+  }
+
+  allow_origin = nchan_get_allow_origin_value(r, cf, ctx);
+  
+  cur = allow_origin->data;
+  end = cur + allow_origin->len;
+  
+  while(cur < end) {
+    nchan_scan_split_by_chr(&cur, end - cur, &curstr, ' ');
+    if(curstr.len == 1 && curstr.data[0] == '*') {
+      return 1;
+    }
+    if(nchan_ngx_str_match(&curstr, origin_header)) {
+      return 1;
+    }
+  }
+  
+  return 0;
+}
+
 // this function adapted from push stream module. thanks Wandenberg Peixoto <wandenberg@gmail.com> and Rogério Carvalho Schneider <stockrt@gmail.com>
 ngx_buf_t * nchan_chain_to_single_buffer(ngx_pool_t *pool, ngx_chain_t *chain, size_t content_length) {
   ngx_buf_t *buf = NULL;
@@ -316,21 +487,89 @@ void oneshot_timer_callback(ngx_event_t *ev) {
   ngx_free(timer);
  }
 
-ngx_int_t nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay) {
+void *nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay) {
   oneshot_timer_t *timer = ngx_alloc(sizeof(*timer), ngx_cycle->log);
   ngx_memzero(&timer->ev, sizeof(timer->ev));
   timer->cb = cb;
   nchan_init_timer(&timer->ev, oneshot_timer_callback, pd);
   ngx_add_timer(&timer->ev, delay);
-  return NGX_OK;
+  return timer;
+}
+
+void nchan_abort_oneshot_timer(void *t) {
+  oneshot_timer_t *timer = t;
+  if(timer->ev.timer_set) {
+    ngx_del_timer(&timer->ev);
+  }
+  ngx_free(timer);
+}
+
+typedef struct {
+  ngx_event_t    ev;
+  ngx_msec_t     wait;
+  ngx_int_t    (*cb)(void *pd);
+} interval_timer_t;
+
+void interval_timer_callback(ngx_event_t *ev) {
+  interval_timer_t  *timer = container_of(ev, interval_timer_t, ev);
+  ngx_int_t rc = timer->cb(ev->data);
+  if((rc == NGX_OK || rc == NGX_AGAIN) && ev->timedout) {
+    ev->timedout=0;
+    ngx_add_timer(&timer->ev, timer->wait);
+  }
+  else if(rc > NGX_OK && ev->timedout) {
+    timer->wait = rc;
+    ev->timedout=0;
+    ngx_add_timer(&timer->ev, timer->wait);
+  }
+  else { //rc < 0, != NGX_EAGAIN
+    //NGX_DONE, for example, or NGX_ABORT
+    ngx_free(timer);
+  }
+}
+
+void *nchan_add_interval_timer(ngx_int_t (*cb)(void *), void *pd, ngx_msec_t interval) {
+  interval_timer_t *timer = ngx_alloc(sizeof(*timer), ngx_cycle->log);
+  ngx_memzero(&timer->ev, sizeof(timer->ev));
+  timer->cb = cb;
+  timer->wait = interval;
+  nchan_init_timer(&timer->ev, interval_timer_callback, pd);
+  ngx_add_timer(&timer->ev, interval);
+  return timer;
+}
+void nchan_abort_interval_timer(void *t) {
+  interval_timer_t *timer = t;
+  if(timer->ev.timer_set) {
+    ngx_del_timer(&timer->ev);
+  }
+  ngx_free(timer);
+}
+
+
+ngx_str_t *nchan_urldecode_str(ngx_http_request_t *r, ngx_str_t *str) {
+  ngx_str_t   *out;
+  u_char      *dst, *src;
+  if(memchr(str->data, '%', str->len) == NULL) {
+    return str;
+  }
+  
+  out = ngx_palloc(r->pool, sizeof(*out) + str->len);
+  out->data = (u_char *)&out[1];
+  
+  dst = out->data;
+  src = str->data;
+  
+  ngx_unescape_uri(&dst, &src, str->len, 0);
+  out->len = dst - out->data;
+  
+  return out;
 }
 
 int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz) {
   //naive non-null-terminated string matcher. don't use it in tight loops!
-  char *cur;
-  size_t len = str->len;
-  
-  for(cur = (char *)str->data, len = str->len; len >= sz; cur++, len--) {
+  char   *cur = (char *)str->data;
+  size_t  len;
+  for(len = str->len; len >= sz; cur++, len--) {
     if(strncmp(cur, substr, sz) == 0) {
       return 1;
     }
@@ -338,6 +577,586 @@ int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz) {
   return 0;
 }
 
+int nchan_cstr_match_line(const char *cstr, const char *line) {
+  ngx_str_t rest;
+  if(nchan_get_rest_of_line_in_cstr(cstr, line, &rest)) {
+    return rest.len == 0 ? 1 : 0;
+  }
+  return 0;
+}
+
+int nchan_get_rest_of_line_in_cstr(const char *cstr, const char *line_start, ngx_str_t *rest) {
+  const char *cur = cstr;
+  const char *end = cur + strlen(cur);
+  
+  while(cur && cur < end) {
+    char *first = strstr(cstr, line_start);
+    if(!first) { //not found at all
+      if(rest) rest->len = 0;
+      return 0;
+    }
+    
+    if(first == cstr || first[-1]=='\n') { //start of line or start of string
+      const char *last = strchr(first, '\n');
+      if(!last) { // end of string
+        last = end;
+      }
+      else if(last > first && last[-1]=='\r') {
+        last--;
+      }
+      if(rest) {
+        rest->len = last - first - strlen(line_start);
+        rest->data = (u_char *)first + strlen(line_start);
+      }
+      return 1;
+    }
+    else {
+      //we found a match in the middle of the string
+      cur = strchr(cur, '\n'); //move on, redo
+    }
+  }
+  return 0;
+}
+
+//converts string to positive double float
+static double nchan_atof(u_char *line, ssize_t n) {
+  ssize_t cutoff, cutlim;
+  double  value = 0;
+  
+  u_char *decimal, *cur, *last = line + n;
+  
+  if (n == 0) {
+    return NGX_ERROR;
+  }
+
+  cutoff = NGX_MAX_SIZE_T_VALUE / 10;
+  cutlim = NGX_MAX_SIZE_T_VALUE % 10;
+  
+  decimal = memchr(line, '.', n);
+  
+  if(decimal == NULL) {
+    decimal = line + n;
+  }
+  
+  for (n = decimal - line; n-- > 0; line++) {
+    if (*line < '0' || *line > '9') {
+      return NGX_ERROR;
+    }
+
+    if (value >= cutoff && (value > cutoff || (*line - '0') > cutlim)) {
+      return NGX_ERROR;
+    }
+
+    value = value * 10 + (*line - '0');
+  }
+  
+  double decval = 0;
+  
+  
+  
+  for(cur = (decimal - last) > 10 ? decimal + 10 : last-1; cur > decimal && cur < last; cur--) {
+    if (*cur < '0' || *cur > '9') {
+      return NGX_ERROR;
+    }
+    decval = decval / 10 + (*cur - '0');
+  }
+  value = value + decval/10;
+  
+  return value;
+}
+
+ssize_t nchan_parse_size(ngx_str_t *line) {
+  u_char   unit;
+  size_t   len;
+  ssize_t  size, scale, max;
+  double   floaty;
+  
+  len = line->len;
+  unit = line->data[len - 1];
+
+  switch (unit) {
+  case 'K':
+  case 'k':
+      len--;
+      max = NGX_MAX_SIZE_T_VALUE / 1024;
+      scale = 1024;
+      break;
+
+  case 'M':
+  case 'm':
+      len--;
+      max = NGX_MAX_SIZE_T_VALUE / (1024 * 1024);
+      scale = 1024 * 1024;
+      break;
+  
+  case 'G':
+  case 'g':
+      len--;
+      max = NGX_MAX_SIZE_T_VALUE / (1024 * 1024 * 1024);
+      scale = 1024 * 1024 * 1024;
+      break;
+
+  default:
+      max = NGX_MAX_SIZE_T_VALUE;
+      scale = 1;
+  }
+
+  floaty = nchan_atof(line->data, len);
+  
+  if (floaty == NGX_ERROR || floaty > max) {
+      return NGX_ERROR;
+  }
+
+  size = floaty * scale;
+
+  return size;
+}
+
+char *nchan_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  char  *p = conf;
+
+  size_t           *sp;
+  ngx_str_t        *value;
+  ngx_conf_post_t  *post;
+
+
+  sp = (size_t *) (p + cmd->offset);
+  if (*sp != NGX_CONF_UNSET_SIZE) {
+      return "is duplicate";
+  }
+
+  value = cf->args->elts;
+
+  *sp = nchan_parse_size(&value[1]);
+  if (*sp == (size_t) NGX_ERROR) {
+    return "invalid value";
+  }
+
+  if (cmd->post) {
+    post = cmd->post;
+    return post->post_handler(cf, post, sp);
+  }
+
+  return NGX_CONF_OK;
+}
+
+void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = start;
+  buf->pos = start;
+  buf->end = end;
+  buf->last = end;
+  buf->memory = 1;
+}
+
+void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = str->data;
+  buf->pos = str->data;
+  buf->end = str->data + str->len;
+  buf->last = buf->end;
+  buf->memory = 1;
+}
+
+
+#if (NGX_ZLIB)
+static z_stream        *deflate_zstream = NULL;
+static z_stream        *deflate_dummy_zstream = NULL;
+
+static ngx_path_t      *message_temp_path = NULL;
+
+ngx_int_t nchan_common_deflate_init(nchan_main_conf_t  *mcf) {
+  int rc;
+  int windowBits;
+  message_temp_path = mcf->message_temp_path;
+  
+  if((deflate_zstream = ngx_calloc(sizeof(*deflate_zstream), ngx_cycle->log)) == NULL) {
+    nchan_log_error("couldn't allocate deflate stream.");
+    return NGX_ERROR;
+  }
+  
+  windowBits = -mcf->zlib_params.windowBits; //negative to disable headers and use a raw stream
+  
+  deflate_zstream->zalloc = Z_NULL;
+  deflate_zstream->zfree = Z_NULL;
+  deflate_zstream->opaque = Z_NULL;
+  
+  rc = deflateInit2(deflate_zstream, (int) mcf->zlib_params.level, Z_DEFLATED, windowBits, mcf->zlib_params.memLevel, mcf->zlib_params.strategy);
+  if(rc != Z_OK) {
+    nchan_log_error("couldn't initialize deflate stream.");
+    deflate_zstream = NULL;
+    return NGX_ERROR;
+  }
+  
+  if((deflate_dummy_zstream = ngx_calloc(sizeof(*deflate_dummy_zstream), ngx_cycle->log)) == NULL) {
+    nchan_log_error("couldn't allocate dummy deflate stream.");
+    return NGX_ERROR;
+  }
+  
+  deflate_dummy_zstream->zalloc = Z_NULL;
+  deflate_dummy_zstream->zfree = Z_NULL;
+  deflate_dummy_zstream->opaque = Z_NULL;
+  
+  rc = deflateInit2(deflate_dummy_zstream, 0, Z_DEFLATED, -9, 1, Z_DEFAULT_STRATEGY);
+  if(rc != Z_OK) {
+    nchan_log_error("couldn't initialize deflate stream.");
+    deflate_dummy_zstream = NULL;
+    return NGX_ERROR;
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_common_deflate_shutdown(void) {
+  if(deflate_zstream) {
+    deflateEnd(deflate_zstream);
+    ngx_free(deflate_zstream);
+    deflate_zstream = NULL;
+  }
+  
+  if(deflate_dummy_zstream) {
+    deflateEnd(deflate_dummy_zstream);
+    ngx_free(deflate_dummy_zstream);
+    deflate_dummy_zstream = NULL;
+  }
+  return NGX_OK;
+}
+
+#define ZLIB_CHUNK 16384
+
+static ngx_temp_file_t *make_temp_file(ngx_http_request_t *r, ngx_pool_t *pool) {
+  ngx_temp_file_t           *tf;
+  ngx_path_t                *temp_path;
+  if(r) {
+    ngx_http_core_loc_conf_t  *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+    temp_path = clcf->client_body_temp_path;
+  }
+  else {
+    temp_path = message_temp_path;
+  }
+  tf = ngx_pcalloc(pool, sizeof(*tf));
+  if(!tf) {
+    if(r) {
+      nchan_log_request_error(r, "failed to allocate space for temp_file struct.");
+    } else {
+      nchan_log_error("failed to allocate space for temp_file struct.");
+    }
+    return NULL;
+  }
+  tf->file.fd = NGX_INVALID_FILE;
+  if(r) {
+    tf->file.log = r->connection->log;
+  }
+  else if(pool && pool->log) {
+    tf->file.log = pool->log;
+  }
+  else {
+    tf->file.log = ngx_cycle->log;
+  }
+  tf->path = temp_path;
+  tf->pool = pool;
+  tf->persistent = 1;
+  tf->clean = 0; //this will close the file on pool cleanup
+  tf->access = 0;
+  if(ngx_create_temp_file(&tf->file, tf->path, tf->pool, tf->persistent, tf->clean, tf->access) != NGX_OK) {
+    if(r) {
+      nchan_log_request_error(r, "failed to create temp file for deflated message");
+    } else {
+      nchan_log_error("failed to create temp file for deflated message");
+    }
+    return NULL;
+  }
+  return tf;
+}
+
+ngx_buf_t *nchan_common_deflate(ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool) {
+  ngx_str_t           mm_instr;
+  int                 mmapped = 0;
+  ngx_temp_file_t    *tf = NULL;
+  
+  int                 rc;
+  ngx_buf_t          *out = NULL;
+  u_char              outbuf[ZLIB_CHUNK];
+  unsigned            have = 0;
+  off_t               written = 0;
+  
+  //input
+  
+  if(ngx_buf_in_memory(in)) {
+    deflate_zstream->avail_in = ngx_buf_size(in);
+    deflate_zstream->next_in = in->pos;
+  }
+  else {
+    ngx_fd_t fd = in->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&in->file->name) : in->file->fd;
+    mm_instr.len = in->file_last - in->file_pos;
+    mm_instr.data = mmap(NULL, mm_instr.len, PROT_READ, MAP_SHARED, fd, in->file_pos);
+    if (mm_instr.data == MAP_FAILED) {
+      nchan_log_request_error(r, "failed to mmap input file for deflated message");
+      return NULL;
+    }
+    deflate_zstream->avail_in = mm_instr.len;
+    deflate_zstream->next_in = mm_instr.data;
+    mmapped = 1;
+  }
+
+  //output
+  
+  do {
+    deflate_zstream->avail_out = ZLIB_CHUNK;
+    deflate_zstream->next_out = outbuf;
+    
+    rc = deflate(deflate_zstream, Z_SYNC_FLUSH);
+    assert(rc != Z_STREAM_ERROR);
+    
+    have = ZLIB_CHUNK - deflate_zstream->avail_out;
+    
+    if(deflate_zstream->avail_out == 0 && tf == NULL) {
+      //if we filled up the buffer, let's start dumping to a file.
+      tf = make_temp_file(r, pool);
+      if(tf == NULL) { //couldn't make temp file for some reason
+        nchan_log_request_error(r, "failed to allocate output buf for deflated message");
+        deflateReset(deflate_zstream);
+        return NULL;
+      }
+    }
+    if(tf) {
+      ngx_write_file(&tf->file, outbuf, have, written);
+    }
+    
+    written += have;
+  } while(rc != Z_BUF_ERROR);
+  
+  if(mmapped) {
+    munmap(mm_instr.data, mm_instr.len);
+  }
+  
+  if((out = ngx_palloc(pool, sizeof(*out))) == NULL) {
+    nchan_log_request_error(r, "failed to allocate output buf for deflated message");
+    deflateReset(deflate_zstream);
+    return NULL;
+  }
+  
+  if(written > 4) { //there will be a 00 00 FF FF chunk at the end. remove it as the permessage-deflate spec demands
+    written -= 4;
+  }
+  
+  if(tf) { //using a tempfile
+    //thanks to tf->clean = 0, file will be closed on pool cleanup
+    ngx_memzero(out, sizeof(*out));
+    out->file_pos = 0;
+    out->file_last = written;
+    out->in_file = 1;
+    out->file = &tf->file;
+  }
+  else {
+    u_char  *outpooled = ngx_palloc(pool, written);
+    if(!outpooled) {
+      nchan_log_request_error(r, "failed to allocate output data for deflated message");
+      deflateReset(deflate_zstream);
+      return NULL;
+    }
+    ngx_memcpy(outpooled, outbuf, written);
+    ngx_init_set_membuf(out, outpooled, outpooled + written);
+  }
+  out->last_buf = 1;
+  
+  deflateReset(deflate_zstream);
+  return out;
+}
+
+ngx_buf_t *nchan_inflate(z_stream *stream, ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool) {
+  ngx_str_t           mm_instr = {0, NULL};
+  int                 mmapped = 0;
+  ngx_temp_file_t    *tf = NULL;
+  
+  int                 rc;
+  ngx_buf_t          *out = NULL;
+  u_char              outbuf[ZLIB_CHUNK];
+  unsigned            have = 0;
+  off_t               written = 0;
+  int                 trailer_appended = 0;
+  
+  //input
+  if(ngx_buf_in_memory(in)) {
+    stream->avail_in = ngx_buf_size(in);
+    stream->next_in = in->pos;
+  }
+  else {
+    ngx_fd_t fd = in->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&in->file->name) : in->file->fd;
+    mm_instr.len = in->file_last - in->file_pos;
+    mm_instr.data = mmap(NULL, mm_instr.len, PROT_READ, MAP_SHARED, fd, in->file_pos);
+    if (mm_instr.data == MAP_FAILED) {
+      nchan_log_request_error(r, "failed to mmap input file for deflated message");
+      return NULL;
+    }
+    stream->avail_in = mm_instr.len;
+    stream->next_in = mm_instr.data;
+    mmapped = 1;
+  }
+
+  //output
+  
+  do {
+    stream->avail_out = ZLIB_CHUNK;
+    stream->next_out = outbuf;
+    
+    if(stream->avail_in == 0 && !trailer_appended) {
+      stream->avail_in = 4;
+      stream->next_in = (u_char *)"\x00\x00\xFF\xFF";
+      trailer_appended = 1;
+    }
+    rc = inflate(stream, trailer_appended ? Z_SYNC_FLUSH : Z_NO_FLUSH);
+    assert(rc != Z_STREAM_ERROR);
+    switch (rc) {
+      case Z_DATA_ERROR:
+        nchan_log_request_error(r, "inflate error %d: %s", rc, stream->msg);
+        break;
+      case Z_NEED_DICT:
+      case Z_MEM_ERROR:
+        nchan_log_request_error(r, "inflate error %d", rc);
+        break;
+    }
+
+    have = ZLIB_CHUNK - stream->avail_out;
+    
+    if(stream->avail_out == 0 && tf == NULL) {
+      //if we filled up the buffer, let's start dumping to a file.
+      tf = make_temp_file(r, pool);
+    }
+    if(tf) {
+      ngx_write_file(&tf->file, outbuf, have, written);
+    }
+    written += have;
+  } while(rc == Z_OK);
+  
+  if(mmapped) {
+    munmap(mm_instr.data, mm_instr.len);
+  }
+  
+  if((out = ngx_palloc(pool, sizeof(*out))) == NULL) {
+    nchan_log_request_error(r, "failed to allocate output buf for deflated message");
+    deflateReset(deflate_zstream);
+    return NULL;
+  }
+  
+  if(tf) { //using a tempfile
+    //thanks to tf->clean = 0, file will be closed on pool cleanup
+    ngx_memzero(out, sizeof(*out));
+    out->file_pos = 0;
+    out->file_last = written;
+    out->in_file = 1;
+    out->file = &tf->file;
+  }
+  else {
+    u_char  *outpooled = ngx_palloc(pool, written);
+    if(!outpooled) {
+      nchan_log_request_error(r, "failed to allocate output data for deflated message");
+      deflateReset(deflate_zstream);
+      return NULL;
+    }
+    ngx_memcpy(outpooled, outbuf, written);
+    ngx_init_set_membuf(out, outpooled, outpooled + written);
+  }
+  out->last_buf = 1;
+  
+  deflateReset(deflate_zstream);
+  return out;
+}
+
+
+static ngx_int_t nchan_common_simple_deflate_internal(z_stream *strm, ngx_str_t *in, ngx_str_t *out) {
+  int rc;
+  strm->avail_in = in->len;
+  strm->next_in = in->data;
+
+  //output
+  strm->avail_out = out->len;
+  strm->next_out = out->data;
+
+  rc = deflate(strm, Z_SYNC_FLUSH);
+  if(rc != Z_STREAM_ERROR) {
+    out->len = strm->total_out;
+  }
+  
+  deflateReset(strm);
+  
+  return rc != Z_STREAM_ERROR ? NGX_OK : NGX_ERROR;
+}
+
+ngx_int_t nchan_common_simple_deflate(ngx_str_t *in, ngx_str_t *out) {
+  return nchan_common_simple_deflate_internal(deflate_zstream, in, out);
+}
+
+ngx_int_t nchan_common_simple_deflate_raw_block(ngx_str_t *in, ngx_str_t *out) {
+  return nchan_common_simple_deflate_internal(deflate_dummy_zstream, in, out);
+}
+  
+#endif
+
+ngx_flag_t nchan_need_to_deflate_message(nchan_loc_conf_t *cf) {
+#if (NGX_ZLIB)
+  if(cf->redis.enabled && cf->redis.storage_mode != REDIS_MODE_BACKUP) {
+    //redis mode ns non-backup storage mode gets the messages deflated later on
+    return 0;
+  }  
+  return cf->message_compression == NCHAN_MSG_COMPRESSION_WEBSOCKET_PERMESSAGE_DEFLATE;
+#else
+  return 0;
+#endif
+}
+
+ngx_int_t nchan_deflate_message_if_needed(nchan_msg_t *msg, nchan_loc_conf_t *cf, ngx_http_request_t *r, ngx_pool_t  *pool) {
+#if (NGX_ZLIB)
+  if(nchan_need_to_deflate_message(cf)) {
+    msg->compressed = ngx_pcalloc(pool, sizeof(*msg->compressed));
+    if(!msg->compressed) {
+      if(r) {
+        nchan_log_request_error(r, "no memory to compress message");
+      }
+      else {
+        nchan_log_error("no memory to compress message");
+      }
+    }
+    else {
+      ngx_buf_t  *compressed_buf = nchan_common_deflate(&msg->buf, r, pool);
+      if(!compressed_buf) {
+        if(r) {
+          nchan_log_request_error(r, "failed to compress message");
+        }
+        else {
+          nchan_log_error("failed to compress message");
+        }
+      }
+      else {
+        msg->compressed->compression = cf->message_compression;
+        msg->compressed->buf = *compressed_buf;
+      }
+    }
+  }
+  return NGX_OK;
+#else
+  return NGX_DECLINED;
+#endif
+}
+
+static uint64_t flip_uint64_if_little_endian(uint64_t value) {
+int num = 42;
+  if (*(char *)&num == 42) {
+    uint32_t high_part = htonl((uint32_t)(value >> 32));
+    uint32_t low_part = htonl((uint32_t)(value & 0xFFFFFFFFLL));
+    return (((uint64_t)low_part) << 32) | high_part;
+  } else {
+    return value;
+  }
+}
+
+uint64_t nchan_htonll(uint64_t value) {
+  return flip_uint64_if_little_endian(value); 
+}
+uint64_t nchan_ntohll(uint64_t value) {
+  return flip_uint64_if_little_endian(value);
+}
+
 #if (NGX_DEBUG_POOL)
 //Copyright (C) 2015 Alibaba Group Holding Limited
 static ngx_str_t            debug_pool_str;
diff --git a/debian/modules/nchan/src/util/nchan_util.h b/debian/modules/nchan/src/util/nchan_util.h
index f7ae941..3dd2358 100644
--- a/debian/modules/nchan/src/util/nchan_util.h
+++ b/debian/modules/nchan/src/util/nchan_util.h
@@ -1,23 +1,52 @@
+#include <string.h>
+#include <stddef.h>
+#ifndef NCHAN_HAVE_MEMRCHR
+void *memrchr(const void *s, int c, size_t n);
+#endif
 ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen);
+ngx_int_t ngx_http_complex_value_custom_pool(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, ngx_pool_t *pool);
 u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char);
 ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name);
+ngx_str_t *nchan_get_header_value_origin(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
+
+int nchan_match_origin_header(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
+ngx_str_t *nchan_get_allow_origin_value(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
+
 ngx_str_t *nchan_get_accept_header_value(ngx_http_request_t *r);
 ngx_buf_t *nchan_chain_to_single_buffer(ngx_pool_t *pool, ngx_chain_t *chain, size_t content_length);
 ngx_str_t *ngx_http_debug_pool_str(ngx_pool_t *pool);
 int nchan_strmatch(ngx_str_t *val, ngx_int_t n, ...);
 int nchan_cstrmatch(char *cstr, ngx_int_t n, ...);
 int nchan_cstr_startswith(char *cstr, char *match);
+int nchan_str_startswith(ngx_str_t *str, const char *match);
+int nchan_str_after(ngx_str_t **str, const char *match);
 
-void nchan_scan_nearest_chr(u_char **cur, ngx_str_t *str, ngx_int_t n, ...);
+void nchan_scan_split_by_chr(u_char **cur, size_t max_len, ngx_str_t *str, u_char chr);
 void nchan_scan_until_chr_on_line(ngx_str_t *line, ngx_str_t *str, u_char chr);
+int nchan_get_rest_of_line_in_cstr(const char *cstr, const char *line_start, ngx_str_t *rest);
 
 int nchan_ngx_str_match(ngx_str_t *str1, ngx_str_t *str2);
+int nchan_ngx_str_nonzero_match(ngx_str_t *str1, ngx_str_t *str2);
+int nchan_cstr_match_line(const char *cstr, const char *line);
 
 void nchan_strcpy(ngx_str_t *dst, ngx_str_t *src, size_t maxlen);
 ngx_int_t nchan_init_timer(ngx_event_t *ev, void (*cb)(ngx_event_t *), void *pd);
-ngx_int_t nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay);
-char *nchan_msgstatus_to_str(nchan_msg_status_t status);
+void *nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay);
+void nchan_abort_oneshot_timer(void *timer);
 
+void *nchan_add_interval_timer(ngx_int_t (*cb)(void *), void *pd, ngx_msec_t interval);
+void nchan_abort_interval_timer(void *t);
+int nchan_strscanstr(u_char **cur, ngx_str_t *find, u_char *last);
+
+char *nchan_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+ssize_t nchan_parse_size(ngx_str_t *line);
+
+void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end);
+void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str);
+#define ngx_init_set_membuf_char(buf, str) \
+  ngx_init_set_membuf(buf, (u_char *)str, ((u_char *)str) + sizeof(str)-1)
+
+ngx_str_t *nchan_urldecode_str(ngx_http_request_t *r, ngx_str_t *str);
 
 int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz);
 #define nchan_ngx_str_substr(str, substr) \
@@ -31,3 +60,18 @@ int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz);
         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
         (type *)( (char *)__mptr - offsetof(type,member) );})
 #endif
+
+ngx_flag_t nchan_need_to_deflate_message(nchan_loc_conf_t *cf);
+ngx_int_t nchan_deflate_message_if_needed(nchan_msg_t *msg, nchan_loc_conf_t *cf, ngx_http_request_t *r, ngx_pool_t  *pool);
+#if (NGX_ZLIB)
+#include <zlib.h>
+ngx_int_t nchan_common_deflate_shutdown(void);
+ngx_int_t nchan_common_deflate_init(nchan_main_conf_t  *mcf);
+ngx_buf_t *nchan_common_deflate(ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool);
+ngx_int_t nchan_common_simple_deflate_raw_block(ngx_str_t *in, ngx_str_t *out);
+ngx_int_t nchan_common_simple_deflate(ngx_str_t *in, ngx_str_t *out);
+ngx_buf_t *nchan_inflate(z_stream *stream, ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool);
+
+uint64_t nchan_htonll(uint64_t value);
+uint64_t nchan_ntohll(uint64_t value);
+#endif
diff --git a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
index 98b6b8d..5670b73 100644
--- a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
+++ b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
@@ -4,6 +4,8 @@
  * Copyright (C) Nginx, Inc.
  */
 
+#if nginx_version <= 1011006
+
 #include "ngx_nchan_hacked_slab.h"
 
 #define NGX_SLAB_PAGE_MASK   3
@@ -764,3 +766,5 @@ ngx_slab_error(ngx_slab_pool_t *pool, ngx_uint_t level, char *text)
 {
     ngx_log_error(level, ngx_cycle->log, 0, "%s%s", text, pool->log_ctx);
 }
+
+#endif
diff --git a/debian/modules/nchan/src/util/shmem.c b/debian/modules/nchan/src/util/shmem.c
index 9a68240..817579d 100644
--- a/debian/modules/nchan/src/util/shmem.c
+++ b/debian/modules/nchan/src/util/shmem.c
@@ -1,7 +1,11 @@
 #include <nchan_module.h>
 #include "shmem.h"
 #include "assert.h"
+
+#if nginx_version <= 1011006
+//old ugly slab-hack to track alloc'd pages
 #include <util/ngx_nchan_hacked_slab.h>
+#endif
 
 #define DEBUG_SHM_ALLOC 0
 
@@ -45,23 +49,42 @@ shmem_t *shm_create(ngx_str_t *name, ngx_conf_t *cf, size_t shm_size, ngx_int_t
   return shm;
 }
 
+#if nginx_version <= 1011006
 void shm_set_allocd_pages_tracker(shmem_t *shm, ngx_atomic_uint_t *ptr) {
   nchan_slab_set_reserved_pages_tracker(SHPOOL(shm), ptr);
 }
+#else
+size_t shm_used_pages(shmem_t *shm) {
+  ngx_slab_pool_t    *shpool = SHPOOL(shm);
+  ngx_slab_page_t    *slots = (ngx_slab_page_t *) ((u_char *) (shpool) + sizeof(ngx_slab_pool_t));
+  size_t              size = shpool->end - (u_char *) slots;
+  
+  ngx_uint_t          max = (ngx_uint_t) (size / (ngx_pagesize + sizeof(ngx_slab_page_t)));
+  return max - shpool->pfree;
+}
+#endif
 
 ngx_int_t shm_init(shmem_t *shm) {
   ngx_slab_pool_t    *shpool = SHPOOL(shm);
   #if (DEBUG_SHM_ALLOC == 1)
   ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "nchan_shpool start %p size %i", shpool->start, (u_char *)shpool->end - (u_char *)shpool->start);
   #endif
+#if nginx_version <= 1011006
   nchan_slab_init(shpool);
+#else
+  ngx_slab_init(shpool);
+#endif  
   
   return NGX_OK;
 }
 
 ngx_int_t shm_reinit(shmem_t *shm) {
   ngx_slab_pool_t    *shpool = SHPOOL(shm);
+#if nginx_version <= 1011006
   nchan_slab_init(shpool);
+#else
+  ngx_slab_init(shpool);
+#endif  
   
   return NGX_OK;
 }
@@ -81,10 +104,14 @@ ngx_int_t shm_destroy(shmem_t *shm) {
 }
 void *shm_alloc(shmem_t *shm, size_t size, const char *label) {
   void         *p;
-#if FAKESHARD  
+#if (FAKESHARD || FAKE_SHMEM)
   p = ngx_alloc(size, ngx_cycle->log);
 #else
+  #if nginx_version <= 1011006
   p = nchan_slab_alloc(SHPOOL(shm), size);  
+  #else
+  p = ngx_slab_alloc(SHPOOL(shm), size);
+  #endif
 #endif
   if(p == NULL) {
     ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "shpool alloc failed");
@@ -107,10 +134,14 @@ void *shm_calloc(shmem_t *shm, size_t size, const char *label) {
 }
 
 void shm_free(shmem_t *shm, void *p) {
-#if FAKESHARD
+#if (FAKESHARD || FAKE_SHMEM)
   ngx_free(p);
 #else
+  #if nginx_version <= 1011006
   nchan_slab_free(SHPOOL(shm), p);
+  #else
+  ngx_slab_free(SHPOOL(shm), p);
+  #endif
 #endif
 #if (DEBUG_SHM_ALLOC == 1)
   ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool free addr %p", p);
@@ -123,10 +154,14 @@ void shm_free(shmem_t *shm, void *p) {
 
 void *shm_locked_alloc(shmem_t *shm, size_t size, const char *label) {
   void         *p;
-#if FAKESHARD  
+#if (FAKESHARD || FAKE_SHMEM)
   p = ngx_alloc(size, ngx_cycle->log);
 #else
-  p = nchan_slab_alloc_locked(SHPOOL(shm), size);  
+  #if nginx_version <= 1011006
+  p = nchan_slab_alloc_locked(SHPOOL(shm), size);
+  #else 
+  p = ngx_slab_alloc_locked(SHPOOL(shm), size);
+  #endif
 #endif
   if(p == NULL) {
     ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "shpool alloc failed");
@@ -149,10 +184,14 @@ void *shm_locked_calloc(shmem_t *shm, size_t size, const char *label) {
 }
 
 void shm_locked_free(shmem_t *shm, void *p) {
-#if FAKESHARD
+#if (FAKESHARD || FAKE_SHMEM)
   ngx_free(p);
 #else
+  #if nginx_version <= 1011006
   nchan_slab_free_locked(SHPOOL(shm), p);
+  #else
+  ngx_slab_free_locked(SHPOOL(shm), p);
+  #endif
 #endif
 #if (DEBUG_SHM_ALLOC == 1)
   ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool free addr %p", p);
diff --git a/debian/modules/nchan/src/util/shmem.h b/debian/modules/nchan/src/util/shmem.h
index 18514c4..52417dc 100644
--- a/debian/modules/nchan/src/util/shmem.h
+++ b/debian/modules/nchan/src/util/shmem.h
@@ -23,6 +23,11 @@ ngx_str_t        *shm_copy_immutable_string(shmem_t *shm, ngx_str_t *str);
 void              shm_free_immutable_string(shmem_t *shm, ngx_str_t *str);
 void              shm_verify_immutable_string(shmem_t *shm, ngx_str_t *str);
 
+#if nginx_version <= 1011006
 void shm_set_allocd_pages_tracker(shmem_t *shm, ngx_atomic_uint_t *ptr);
+#else
+ngx_uint_t shm_used_pages(shmem_t *shm);
+#endif
+
 
 #endif //NCHAN_SHMEM_H

From f33d2ab4085ffbc4e29138472b8c822a2c5d8b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 22:02:54 +0200
Subject: [PATCH 300/600] d/watch: Change to 1.18.x

---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 1aeff3e..5ea7cc0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-https://nginx.org/download/nginx-(1\.16\.\d+)\.tar\.gz
+https://nginx.org/download/nginx-(1\.18\.\d+)\.tar\.gz

From b283023b77a29f9f4415fd101b51d7c2c8541659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 22:03:09 +0200
Subject: [PATCH 301/600] New upstream version 1.18.0

---
 CHANGES                                       | 189 +++++++-
 CHANGES.ru                                    | 194 +++++++-
 auto/modules                                  |  19 +-
 auto/options                                  |   1 -
 auto/unix                                     |  12 +
 contrib/vim/syntax/nginx.vim                  |   5 +
 man/nginx.8                                   |  15 +-
 src/core/nginx.h                              |   4 +-
 src/core/ngx_conf_file.h                      |   2 +-
 src/core/ngx_connection.h                     |   3 +-
 src/core/ngx_core.h                           |   1 +
 src/core/ngx_hash.c                           |  31 +-
 src/core/ngx_proxy_protocol.c                 | 237 ++++++----
 src/core/ngx_proxy_protocol.h                 |   8 +
 src/core/ngx_rbtree.c                         |   7 +-
 src/core/ngx_resolver.c                       |   3 +-
 src/event/modules/ngx_devpoll_module.c        |   1 +
 src/event/modules/ngx_epoll_module.c          |   3 +-
 src/event/modules/ngx_eventport_module.c      |   1 +
 src/event/modules/ngx_poll_module.c           |   1 +
 src/event/modules/ngx_select_module.c         |   1 +
 src/event/modules/ngx_win32_poll_module.c     |   1 +
 src/event/modules/ngx_win32_select_module.c   |   1 +
 src/event/ngx_event.c                         |   6 +
 src/event/ngx_event.h                         |   9 +-
 src/event/ngx_event_openssl.c                 |  95 ++--
 src/event/ngx_event_openssl_stapling.c        |   5 +-
 src/event/ngx_event_pipe.c                    |   6 +-
 src/event/ngx_event_posted.c                  |  25 ++
 src/event/ngx_event_posted.h                  |   2 +
 src/http/modules/ngx_http_auth_basic_module.c |  37 +-
 src/http/modules/ngx_http_dav_module.c        |  38 +-
 src/http/modules/ngx_http_grpc_module.c       | 230 ++++++++--
 .../modules/ngx_http_gzip_filter_module.c     | 137 +-----
 src/http/modules/ngx_http_index_module.c      |   2 +-
 src/http/modules/ngx_http_limit_conn_module.c | 188 +++++---
 src/http/modules/ngx_http_limit_req_module.c  | 108 ++++-
 src/http/modules/ngx_http_mp4_module.c        |  75 +++-
 .../modules/ngx_http_range_filter_module.c    |  58 ++-
 src/http/modules/ngx_http_realip_module.c     |   7 +-
 src/http/modules/ngx_http_rewrite_module.c    |   5 +
 src/http/modules/ngx_http_ssi_filter_module.c |   4 +-
 src/http/modules/ngx_http_ssl_module.c        |   2 +-
 src/http/modules/ngx_http_static_module.c     |   4 +-
 .../modules/ngx_http_upstream_hash_module.c   |   4 +-
 .../ngx_http_upstream_keepalive_module.c      |   1 +
 .../modules/ngx_http_xslt_filter_module.c     |   6 +-
 src/http/modules/perl/nginx.xs                | 414 ++++++++++++------
 src/http/modules/perl/ngx_http_perl_module.c  |  81 +++-
 src/http/modules/perl/ngx_http_perl_module.h  |  10 +-
 src/http/ngx_http_core_module.c               | 176 ++++++--
 src/http/ngx_http_core_module.h               |   6 +-
 src/http/ngx_http_parse.c                     |  51 ++-
 src/http/ngx_http_request.c                   |  57 ++-
 src/http/ngx_http_request.h                   |   9 +-
 src/http/ngx_http_script.c                    |  70 ++-
 src/http/ngx_http_script.h                    |   8 +
 src/http/ngx_http_special_response.c          |   6 +
 src/http/ngx_http_upstream.c                  |  50 ++-
 src/http/ngx_http_upstream_round_robin.c      |   5 +-
 src/http/ngx_http_variables.c                 |  95 ++--
 src/http/ngx_http_write_filter_module.c       |  12 +-
 src/http/v2/ngx_http_v2.c                     | 173 +++-----
 src/http/v2/ngx_http_v2.h                     |   3 +
 src/http/v2/ngx_http_v2_filter_module.c       |  19 +-
 src/mail/ngx_mail_smtp_handler.c              |  43 ++
 src/mail/ngx_mail_ssl_module.c                |   2 +-
 src/os/unix/ngx_readv_chain.c                 |  36 +-
 src/os/unix/ngx_recv.c                        |  36 +-
 src/os/unix/ngx_socket.h                      |   7 +
 src/stream/ngx_stream.h                       |   2 +
 src/stream/ngx_stream_limit_conn_module.c     | 185 ++++++--
 src/stream/ngx_stream_proxy_module.c          |  29 +-
 src/stream/ngx_stream_realip_module.c         |   8 +-
 src/stream/ngx_stream_script.c                |  61 +++
 src/stream/ngx_stream_script.h                |   8 +
 src/stream/ngx_stream_ssl_module.c            |   2 +-
 src/stream/ngx_stream_upstream.h              |   3 +
 src/stream/ngx_stream_upstream_hash_module.c  |   4 +-
 src/stream/ngx_stream_upstream_round_robin.c  |   5 +-
 src/stream/ngx_stream_variables.c             |  40 +-
 81 files changed, 2553 insertions(+), 957 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8e7382b..6da9172 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,14 +1,197 @@
 
-Changes with nginx 1.16.1                                        13 Aug 2019
+Changes with nginx 1.18.0                                        21 Apr 2020
+
+    *) 1.18.x stable branch.
+
+
+Changes with nginx 1.17.10                                       14 Apr 2020
+
+    *) Feature: the "auth_delay" directive.
+
+
+Changes with nginx 1.17.9                                        03 Mar 2020
+
+    *) Change: now nginx does not allow several "Host" request header lines.
+
+    *) Bugfix: nginx ignored additional "Transfer-Encoding" request header
+       lines.
+
+    *) Bugfix: socket leak when using HTTP/2.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if OCSP
+       stapling was used.
+
+    *) Bugfix: in the ngx_http_mp4_module.
+
+    *) Bugfix: nginx used status code 494 instead of 400 if errors with code
+       494 were redirected with the "error_page" directive.
+
+    *) Bugfix: socket leak when using subrequests in the njs module and the
+       "aio" directive.
+
+
+Changes with nginx 1.17.8                                        21 Jan 2020
+
+    *) Feature: variables support in the "grpc_pass" directive.
+
+    *) Bugfix: a timeout might occur while handling pipelined requests in an
+       SSL connection; the bug had appeared in 1.17.5.
+
+    *) Bugfix: in the "debug_points" directive when using HTTP/2.
+       Thanks to Daniil Bondarev.
+
+
+Changes with nginx 1.17.7                                        24 Dec 2019
+
+    *) Bugfix: a segmentation fault might occur on start or during
+       reconfiguration if the "rewrite" directive with an empty replacement
+       string was used in the configuration.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if the
+       "break" directive was used with the "alias" directive or with the
+       "proxy_pass" directive with a URI.
+
+    *) Bugfix: the "Location" response header line might contain garbage if
+       the request URI was rewritten to the one containing a null character.
+
+    *) Bugfix: requests with bodies were handled incorrectly when returning
+       redirections with the "error_page" directive; the bug had appeared in
+       0.7.12.
+
+    *) Bugfix: socket leak when using HTTP/2.
+
+    *) Bugfix: a timeout might occur while handling pipelined requests in an
+       SSL connection; the bug had appeared in 1.17.5.
+
+    *) Bugfix: in the ngx_http_dav_module.
+
+
+Changes with nginx 1.17.6                                        19 Nov 2019
+
+    *) Feature: the $proxy_protocol_server_addr and
+       $proxy_protocol_server_port variables.
+
+    *) Feature: the "limit_conn_dry_run" directive.
+
+    *) Feature: the $limit_req_status and $limit_conn_status variables.
+
+
+Changes with nginx 1.17.5                                        22 Oct 2019
+
+    *) Feature: now nginx uses ioctl(FIONREAD), if available, to avoid
+       reading from a fast connection for a long time.
+
+    *) Bugfix: incomplete escaped characters at the end of the request URI
+       were ignored.
+
+    *) Bugfix: "/." and "/.." at the end of the request URI were not
+       normalized.
+
+    *) Bugfix: in the "merge_slashes" directive.
+
+    *) Bugfix: in the "ignore_invalid_headers" directive.
+       Thanks to Alan Kemp.
+
+    *) Bugfix: nginx could not be built with MinGW-w64 gcc 8.1 or newer.
+
+
+Changes with nginx 1.17.4                                        24 Sep 2019
+
+    *) Change: better detection of incorrect client behavior in HTTP/2.
+
+    *) Change: in handling of not fully read client request body when
+       returning errors in HTTP/2.
+
+    *) Bugfix: the "worker_shutdown_timeout" directive might not work when
+       using HTTP/2.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2 and the "proxy_request_buffering" directive.
+
+    *) Bugfix: the ECONNABORTED error log level was "crit" instead of
+       "error" on Windows when using SSL.
+
+    *) Bugfix: nginx ignored extra data when using chunked transfer
+       encoding.
+
+    *) Bugfix: nginx always returned the 500 error if the "return" directive
+       was used and an error occurred during reading client request body.
+
+    *) Bugfix: in memory allocation error handling.
+
+
+Changes with nginx 1.17.3                                        13 Aug 2019
 
     *) Security: when using HTTP/2 a client might cause excessive memory
        consumption and CPU usage (CVE-2019-9511, CVE-2019-9513,
        CVE-2019-9516).
 
+    *) Bugfix: "zero size buf" alerts might appear in logs when using
+       gzipping; the bug had appeared in 1.17.2.
 
-Changes with nginx 1.16.0                                        23 Apr 2019
+    *) Bugfix: a segmentation fault might occur in a worker process if the
+       "resolver" directive was used in SMTP proxy.
 
-    *) 1.16.x stable branch.
+
+Changes with nginx 1.17.2                                        23 Jul 2019
+
+    *) Change: minimum supported zlib version is 1.2.0.4.
+       Thanks to Ilya Leoshkevich.
+
+    *) Change: the $r->internal_redirect() embedded perl method now expects
+       escaped URIs.
+
+    *) Feature: it is now possible to switch to a named location using the
+       $r->internal_redirect() embedded perl method.
+
+    *) Bugfix: in error handling in embedded perl.
+
+    *) Bugfix: a segmentation fault might occur on start or during
+       reconfiguration if hash bucket size larger than 64 kilobytes was used
+       in the configuration.
+
+    *) Bugfix: nginx might hog CPU during unbuffered proxying and when
+       proxying WebSocket connections if the select, poll, or /dev/poll
+       methods were used.
+
+    *) Bugfix: in the ngx_http_xslt_filter_module.
+
+    *) Bugfix: in the ngx_http_ssi_filter_module.
+
+
+Changes with nginx 1.17.1                                        25 Jun 2019
+
+    *) Feature: the "limit_req_dry_run" directive.
+
+    *) Feature: when using the "hash" directive inside the "upstream" block
+       an empty hash key now triggers round-robin balancing.
+       Thanks to Niklas Keller.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if
+       caching was used along with the "image_filter" directive, and errors
+       with code 415 were redirected with the "error_page" directive; the
+       bug had appeared in 1.11.10.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if
+       embedded perl was used; the bug had appeared in 1.7.3.
+
+
+Changes with nginx 1.17.0                                        21 May 2019
+
+    *) Feature: variables support in the "limit_rate" and "limit_rate_after"
+       directives.
+
+    *) Feature: variables support in the "proxy_upload_rate" and
+       "proxy_download_rate" directives in the stream module.
+
+    *) Change: minimum supported OpenSSL version is 0.9.8.
+
+    *) Change: now the postpone filter is always built.
+
+    *) Bugfix: the "include" directive did not work inside the "if" and
+       "limit_except" blocks.
+
+    *) Bugfix: in byte ranges processing.
 
 
 Changes with nginx 1.15.12                                       16 Apr 2019
diff --git a/CHANGES.ru b/CHANGES.ru
index 5d60f41..e430021 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,14 +1,202 @@
 
-Изменения в nginx 1.16.1                                          13.08.2019
+Изменения в nginx 1.18.0                                          21.04.2020
+
+    *) Стабильная ветка 1.18.x.
+
+
+Изменения в nginx 1.17.10                                         14.04.2020
+
+    *) Добавление: директива auth_delay.
+
+
+Изменения в nginx 1.17.9                                          03.03.2020
+
+    *) Изменение: теперь nginx не разрешает несколько строк "Host" в
+       заголовке запроса.
+
+    *) Исправление: nginx игнорировал дополнительные строки
+       "Transfer-Encoding" в заголовке запроса.
+
+    *) Исправление: утечки сокетов при использовании HTTP/2.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если использовался OCSP stapling.
+
+    *) Исправление: в модуле ngx_http_mp4_module.
+
+    *) Исправление: при перенаправлении ошибок с кодом 494 с помощью
+       директивы error_page nginx возвращал ответ с кодом 494 вместо 400.
+
+    *) Исправление: утечки сокетов при использовании подзапросов в модуле
+       njs и директивы aio.
+
+
+Изменения в nginx 1.17.8                                          21.01.2020
+
+    *) Добавление: директива grpc_pass поддерживает переменные.
+
+    *) Исправление: при обработке pipelined-запросов по SSL-соединению мог
+       произойти таймаут; ошибка появилась в 1.17.5.
+
+    *) Исправление: в директиве debug_points при использовании HTTP/2.
+       Спасибо Даниилу Бондареву.
+
+
+Изменения в nginx 1.17.7                                          24.12.2019
+
+    *) Исправление: на старте или во время переконфигурации мог произойти
+       segmentation fault, если в конфигурации использовалась директива
+       rewrite с пустой строкой замены.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если директива break использовалась совместно с директивой alias или
+       директивой proxy_pass с URI.
+
+    *) Исправление: строка Location заголовка ответа могла содержать мусор,
+       если URI запроса был изменён на URI, содержащий нулевой символ.
+
+    *) Исправление: при возврате перенаправлений с помощью директивы
+       error_page запросы с телом обрабатывались некорректно; ошибка
+       появилась в 0.7.12.
+
+    *) Исправление: утечки сокетов при использовании HTTP/2.
+
+    *) Исправление: при обработке pipelined-запросов по SSL-соединению мог
+       произойти таймаут; ошибка появилась в 1.17.5.
+
+    *) Исправление: в модуле ngx_http_dav_module.
+
+
+Изменения в nginx 1.17.6                                          19.11.2019
+
+    *) Добавление: переменные $proxy_protocol_server_addr и
+       $proxy_protocol_server_port.
+
+    *) Добавление: директива limit_conn_dry_run.
+
+    *) Добавление: переменные $limit_req_status и $limit_conn_status.
+
+
+Изменения в nginx 1.17.5                                          22.10.2019
+
+    *) Добавление: теперь nginx использует вызов ioctl(FIONREAD), если он
+       доступен, чтобы избежать чтения из быстрого соединения в течение
+       долгого времени.
+
+    *) Исправление: неполные закодированные символы в конце URI запроса
+       игнорировались.
+
+    *) Исправление: "/." и "/.." в конце URI запроса не нормализовывались.
+
+    *) Исправление: в директиве merge_slashes.
+
+    *) Исправление: в директиве ignore_invalid_headers.
+       Спасибо Alan Kemp.
+
+    *) Исправление: nginx не собирался с MinGW-w64 gcc 8.1 и новее.
+
+
+Изменения в nginx 1.17.4                                          24.09.2019
+
+    *) Изменение: улучшено детектирование некорректного поведения клиентов в
+       HTTP/2.
+
+    *) Изменение: в обработке непрочитанного тела запроса при возврате
+       ошибок в HTTP/2.
+
+    *) Исправление: директива worker_shutdown_timeout могла не работать при
+       использовании HTTP/2.
+
+    *) Исправление: при использовании HTTP/2 и директивы
+       proxy_request_buffering в рабочем процессе мог произойти segmentation
+       fault.
+
+    *) Исправление: на Windows при использовании SSL уровень записи в лог
+       ошибки ECONNABORTED был "crit" вместо "error".
+
+    *) Исправление: nginx игнорировал лишние данные при использовании
+       chunked transfer encoding.
+
+    *) Исправление: если использовалась директива return и при чтении тела
+       запроса возникала ошибка, nginx всегда возвращал ошибку 500.
+
+    *) Исправление: в обработке ошибок выделения памяти.
+
+
+Изменения в nginx 1.17.3                                          13.08.2019
 
     *) Безопасность: при использовании HTTP/2 клиент мог вызвать чрезмерное
        потребление памяти и ресурсов процессора (CVE-2019-9511,
        CVE-2019-9513, CVE-2019-9516).
 
+    *) Исправление: при использовании сжатия в логах могли появляться
+       сообщения "zero size buf"; ошибка появилась в 1.17.2.
 
-Изменения в nginx 1.16.0                                          23.04.2019
+    *) Исправление: при использовании директивы resolver в SMTP
+       прокси-сервере в рабочем процессе мог произойти segmentation fault.
 
-    *) Стабильная ветка 1.16.x.
+
+Изменения в nginx 1.17.2                                          23.07.2019
+
+    *) Изменение: минимальная поддерживаемая версия zlib - 1.2.0.4.
+       Спасибо Илье Леошкевичу.
+
+    *) Изменение: метод $r->internal_redirect() встроенного перла теперь
+       ожидает закодированный URI.
+
+    *) Добавление: теперь с помощью метода $r->internal_redirect()
+       встроенного перла можно перейти в именованный location.
+
+    *) Исправление: в обработке ошибок во встроенном перле.
+
+    *) Исправление: на старте или во время переконфигурации мог произойти
+       segmentation fault, если в конфигурации использовалось значение hash
+       bucket size больше 64 килобайт.
+
+    *) Исправление: при использовании методов обработки соединений select,
+       poll и /dev/poll nginx мог нагружать процессор во время
+       небуферизованного проксирования и при проксировании
+       WebSocket-соединений.
+
+    *) Исправление: в модуле ngx_http_xslt_filter_module.
+
+    *) Исправление: в модуле ngx_http_ssi_filter_module.
+
+
+Изменения в nginx 1.17.1                                          25.06.2019
+
+    *) Добавление: директива limit_req_dry_run.
+
+    *) Добавление: при использовании директивы hash в блоке upstream пустой
+       ключ хэширования теперь приводит к переключению на round-robin
+       балансировку.
+       Спасибо Niklas Keller.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если использовалось кэширование и директива image_filter, а ошибки с
+       кодом 415 перенаправлялись с помощью директивы error_page; ошибка
+       появилась в 1.11.10.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если использовался встроенный перл; ошибка появилась в 1.7.3.
+
+
+Изменения в nginx 1.17.0                                          21.05.2019
+
+    *) Добавление: директивы limit_rate и limit_rate_after поддерживают
+       переменные.
+
+    *) Добавление: директивы proxy_upload_rate и proxy_download_rate в
+       модуле stream поддерживают переменные.
+
+    *) Изменение: минимальная поддерживаемая версия OpenSSL - 0.9.8.
+
+    *) Изменение: теперь postpone-фильтр собирается всегда.
+
+    *) Исправление: директива include не работала в блоках if и
+       limit_except.
+
+    *) Исправление: в обработке byte ranges.
 
 
 Изменения в nginx 1.15.12                                         16.04.2019
diff --git a/auto/modules b/auto/modules
index 09bfcb0..d78e282 100644
--- a/auto/modules
+++ b/auto/modules
@@ -102,21 +102,6 @@ if [ $HTTP = YES ]; then
     fi
 
 
-    if [ $HTTP_SSI = YES ]; then
-        HTTP_POSTPONE=YES
-    fi
-
-
-    if [ $HTTP_SLICE = YES ]; then
-        HTTP_POSTPONE=YES
-    fi
-
-
-    if [ $HTTP_ADDITION = YES ]; then
-        HTTP_POSTPONE=YES
-    fi
-
-
     # the module order is important
     #     ngx_http_static_module
     #     ngx_http_gzip_static_module
@@ -252,13 +237,13 @@ if [ $HTTP = YES ]; then
         . auto/module
     fi
 
-    if [ $HTTP_POSTPONE = YES ]; then
+    if :; then
         ngx_module_name=ngx_http_postpone_filter_module
         ngx_module_incs=
         ngx_module_deps=
         ngx_module_srcs=src/http/ngx_http_postpone_filter_module.c
         ngx_module_libs=
-        ngx_module_link=$HTTP_POSTPONE
+        ngx_module_link=YES
 
         . auto/module
     fi
diff --git a/auto/options b/auto/options
index d8b421b..521c976 100644
--- a/auto/options
+++ b/auto/options
@@ -60,7 +60,6 @@ HTTP_GZIP=YES
 HTTP_SSL=NO
 HTTP_V2=NO
 HTTP_SSI=YES
-HTTP_POSTPONE=NO
 HTTP_REALIP=NO
 HTTP_XSLT=NO
 HTTP_IMAGE_FILTER=NO
diff --git a/auto/unix b/auto/unix
index 43d3b25..ff9697a 100644
--- a/auto/unix
+++ b/auto/unix
@@ -943,6 +943,18 @@ ngx_feature_test="int i = FIONBIO; printf(\"%d\", i)"
 . auto/feature
 
 
+ngx_feature="ioctl(FIONREAD)"
+ngx_feature_name="NGX_HAVE_FIONREAD"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/ioctl.h>
+                  #include <stdio.h>
+                  $NGX_INCLUDE_SYS_FILIO_H"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="int i = FIONREAD; printf(\"%d\", i)"
+. auto/feature
+
+
 ngx_feature="struct tm.tm_gmtoff"
 ngx_feature_name="NGX_HAVE_GMTOFF"
 ngx_feature_run=no
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 6bee7a2..1a3a7b7 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -333,6 +333,7 @@ syn keyword ngxDirective contained js_access
 syn keyword ngxDirective contained js_content
 syn keyword ngxDirective contained js_filter
 syn keyword ngxDirective contained js_include
+syn keyword ngxDirective contained js_path
 syn keyword ngxDirective contained js_preread
 syn keyword ngxDirective contained js_set
 syn keyword ngxDirective contained keepalive
@@ -353,6 +354,7 @@ syn keyword ngxDirective contained limit_conn_zone
 syn keyword ngxDirective contained limit_rate
 syn keyword ngxDirective contained limit_rate_after
 syn keyword ngxDirective contained limit_req
+syn keyword ngxDirective contained limit_req_dry_run
 syn keyword ngxDirective contained limit_req_log_level
 syn keyword ngxDirective contained limit_req_status
 syn keyword ngxDirective contained limit_req_zone
@@ -472,6 +474,7 @@ syn keyword ngxDirective contained proxy_requests
 syn keyword ngxDirective contained proxy_responses
 syn keyword ngxDirective contained proxy_send_lowat
 syn keyword ngxDirective contained proxy_send_timeout
+syn keyword ngxDirective contained proxy_session_drop
 syn keyword ngxDirective contained proxy_set_body
 syn keyword ngxDirective contained proxy_set_header
 syn keyword ngxDirective contained proxy_socket_keepalive
@@ -1325,6 +1328,7 @@ syn keyword ngxDirectiveThirdParty contained lua_check_client_abort
 syn keyword ngxDirectiveThirdParty contained lua_code_cache
 syn keyword ngxDirectiveThirdParty contained lua_fake_shm
 syn keyword ngxDirectiveThirdParty contained lua_http10_buffering
+syn keyword ngxDirectiveThirdParty contained lua_load_resty_core
 syn keyword ngxDirectiveThirdParty contained lua_malloc_trim
 syn keyword ngxDirectiveThirdParty contained lua_max_pending_timers
 syn keyword ngxDirectiveThirdParty contained lua_max_running_timers
@@ -1779,6 +1783,7 @@ syn keyword ngxDirectiveThirdParty contained vod_expires_live_time_dependent
 syn keyword ngxDirectiveThirdParty contained vod_fallback_upstream_location
 syn keyword ngxDirectiveThirdParty contained vod_force_continuous_timestamps
 syn keyword ngxDirectiveThirdParty contained vod_force_playlist_type_vod
+syn keyword ngxDirectiveThirdParty contained vod_force_sequence_index
 syn keyword ngxDirectiveThirdParty contained vod_gop_look_ahead
 syn keyword ngxDirectiveThirdParty contained vod_gop_look_behind
 syn keyword ngxDirectiveThirdParty contained vod_ignore_edit_list
diff --git a/man/nginx.8 b/man/nginx.8
index 1f4dc89..573d935 100644
--- a/man/nginx.8
+++ b/man/nginx.8
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (C) 2010 Sergey A. Osokin
+.\" Copyright (C) 2010, 2019 Sergey A. Osokin
 .\" Copyright (C) Nginx, Inc.
 .\" All rights reserved.
 .\"
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd June 16, 2015
+.Dd December 5, 2019
 .Dt NGINX 8
 .Os
 .Sh NAME
@@ -42,7 +42,8 @@
 .Nm
 (pronounced
 .Dq engine x )
-is an HTTP and reverse proxy server, as well as a mail proxy server.
+is an HTTP and reverse proxy server, a mail proxy server, and a generic
+TCP/UDP proxy server.
 It is known for its high performance, stability, rich feature set, simple
 configuration, and low resource consumption.
 .Pp
@@ -82,15 +83,15 @@ The following table shows the corresponding system signals:
 .It Cm reload
 .Dv SIGHUP
 .El
+.It Fl T
+Same as
+.Fl t ,
+but additionally dump configuration files to standard output.
 .It Fl t
 Do not run, just test the configuration file.
 .Nm
 checks the configuration file syntax and then tries to open files
 referenced in the configuration file.
-.It Fl T
-Same as
-.Fl t ,
-but additionally dump configuration files to standard output.
 .It Fl V
 Print the
 .Nm
diff --git a/src/core/nginx.h b/src/core/nginx.h
index c59a0e7..9656f98 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1016001
-#define NGINX_VERSION      "1.16.1"
+#define nginx_version      1018000
+#define NGINX_VERSION      "1.18.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 9cd5806..ed2d2ba 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -49,7 +49,7 @@
 #define NGX_DIRECT_CONF      0x00010000
 
 #define NGX_MAIN_CONF        0x01000000
-#define NGX_ANY_CONF         0x1F000000
+#define NGX_ANY_CONF         0xFF000000
 
 
 
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 5405962..ad6556d 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -147,8 +147,7 @@ struct ngx_connection_s {
     socklen_t           socklen;
     ngx_str_t           addr_text;
 
-    ngx_str_t           proxy_protocol_addr;
-    in_port_t           proxy_protocol_port;
+    ngx_proxy_protocol_t  *proxy_protocol;
 
 #if (NGX_SSL || NGX_COMPAT)
     ngx_ssl_connection_t  *ssl;
diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index 93ca917..7ecdca0 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -26,6 +26,7 @@ typedef struct ngx_event_aio_s       ngx_event_aio_t;
 typedef struct ngx_connection_s      ngx_connection_t;
 typedef struct ngx_thread_task_s     ngx_thread_task_t;
 typedef struct ngx_ssl_s             ngx_ssl_t;
+typedef struct ngx_proxy_protocol_s  ngx_proxy_protocol_t;
 typedef struct ngx_ssl_connection_s  ngx_ssl_connection_t;
 typedef struct ngx_udp_connection_s  ngx_udp_connection_t;
 
diff --git a/src/core/ngx_hash.c b/src/core/ngx_hash.c
index 1944c7a..d9c157c 100644
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -265,6 +265,14 @@ ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, ngx_uint_t nelts)
         return NGX_ERROR;
     }
 
+    if (hinit->bucket_size > 65536 - ngx_cacheline_size) {
+        ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0,
+                      "could not build %s, too large "
+                      "%s_bucket_size: %i",
+                      hinit->name, hinit->name, hinit->bucket_size);
+        return NGX_ERROR;
+    }
+
     for (n = 0; n < nelts; n++) {
         if (hinit->bucket_size < NGX_HASH_ELT_SIZE(&names[n]) + sizeof(void *))
         {
@@ -300,17 +308,19 @@ ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, ngx_uint_t nelts)
             }
 
             key = names[n].key_hash % size;
-            test[key] = (u_short) (test[key] + NGX_HASH_ELT_SIZE(&names[n]));
+            len = test[key] + NGX_HASH_ELT_SIZE(&names[n]);
 
 #if 0
             ngx_log_error(NGX_LOG_ALERT, hinit->pool->log, 0,
-                          "%ui: %ui %ui \"%V\"",
-                          size, key, test[key], &names[n].key);
+                          "%ui: %ui %uz \"%V\"",
+                          size, key, len, &names[n].key);
 #endif
 
-            if (test[key] > (u_short) bucket_size) {
+            if (len > bucket_size) {
                 goto next;
             }
+
+            test[key] = (u_short) len;
         }
 
         goto found;
@@ -341,7 +351,18 @@ found:
         }
 
         key = names[n].key_hash % size;
-        test[key] = (u_short) (test[key] + NGX_HASH_ELT_SIZE(&names[n]));
+        len = test[key] + NGX_HASH_ELT_SIZE(&names[n]);
+
+        if (len > 65536 - ngx_cacheline_size) {
+            ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0,
+                          "could not build %s, you should "
+                          "increase %s_max_size: %i",
+                          hinit->name, hinit->name, hinit->max_size);
+            ngx_free(test);
+            return NGX_ERROR;
+        }
+
+        test[key] = (u_short) len;
     }
 
     len = 0;
diff --git a/src/core/ngx_proxy_protocol.c b/src/core/ngx_proxy_protocol.c
index c3d7fd3..7a9e7f9 100644
--- a/src/core/ngx_proxy_protocol.c
+++ b/src/core/ngx_proxy_protocol.c
@@ -40,6 +40,10 @@ typedef struct {
 } ngx_proxy_protocol_inet6_addrs_t;
 
 
+static u_char *ngx_proxy_protocol_read_addr(ngx_connection_t *c, u_char *p,
+    u_char *last, ngx_str_t *addr);
+static u_char *ngx_proxy_protocol_read_port(u_char *p, u_char *last,
+    in_port_t *port, u_char sep);
 static u_char *ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf,
     u_char *last);
 
@@ -47,9 +51,9 @@ static u_char *ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf,
 u_char *
 ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last)
 {
-    size_t     len;
-    u_char     ch, *p, *addr, *port;
-    ngx_int_t  n;
+    size_t                 len;
+    u_char                *p;
+    ngx_proxy_protocol_t  *pp;
 
     static const u_char signature[] = "\r\n\r\n\0\r\nQUIT\n";
 
@@ -83,73 +87,47 @@ ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last)
     }
 
     p += 5;
-    addr = p;
 
-    for ( ;; ) {
-        if (p == last) {
-            goto invalid;
-        }
-
-        ch = *p++;
-
-        if (ch == ' ') {
-            break;
-        }
-
-        if (ch != ':' && ch != '.'
-            && (ch < 'a' || ch > 'f')
-            && (ch < 'A' || ch > 'F')
-            && (ch < '0' || ch > '9'))
-        {
-            goto invalid;
-        }
-    }
-
-    len = p - addr - 1;
-    c->proxy_protocol_addr.data = ngx_pnalloc(c->pool, len);
-
-    if (c->proxy_protocol_addr.data == NULL) {
+    pp = ngx_pcalloc(c->pool, sizeof(ngx_proxy_protocol_t));
+    if (pp == NULL) {
         return NULL;
     }
 
-    ngx_memcpy(c->proxy_protocol_addr.data, addr, len);
-    c->proxy_protocol_addr.len = len;
-
-    for ( ;; ) {
-        if (p == last) {
-            goto invalid;
-        }
-
-        if (*p++ == ' ') {
-            break;
-        }
-    }
-
-    port = p;
-
-    for ( ;; ) {
-        if (p == last) {
-            goto invalid;
-        }
-
-        if (*p++ == ' ') {
-            break;
-        }
-    }
-
-    len = p - port - 1;
-
-    n = ngx_atoi(port, len);
-
-    if (n < 0 || n > 65535) {
+    p = ngx_proxy_protocol_read_addr(c, p, last, &pp->src_addr);
+    if (p == NULL) {
         goto invalid;
     }
 
-    c->proxy_protocol_port = (in_port_t) n;
+    p = ngx_proxy_protocol_read_addr(c, p, last, &pp->dst_addr);
+    if (p == NULL) {
+        goto invalid;
+    }
 
-    ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0,
-                   "PROXY protocol address: %V %d", &c->proxy_protocol_addr,
-                   c->proxy_protocol_port);
+    p = ngx_proxy_protocol_read_port(p, last, &pp->src_port, ' ');
+    if (p == NULL) {
+        goto invalid;
+    }
+
+    p = ngx_proxy_protocol_read_port(p, last, &pp->dst_port, CR);
+    if (p == NULL) {
+        goto invalid;
+    }
+
+    if (p == last) {
+        goto invalid;
+    }
+
+    if (*p++ != LF) {
+        goto invalid;
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_CORE, c->log, 0,
+                   "PROXY protocol src: %V %d, dst: %V %d",
+                   &pp->src_addr, pp->src_port, &pp->dst_addr, pp->dst_port);
+
+    c->proxy_protocol = pp;
+
+    return p;
 
 skip:
 
@@ -168,6 +146,82 @@ invalid:
 }
 
 
+static u_char *
+ngx_proxy_protocol_read_addr(ngx_connection_t *c, u_char *p, u_char *last,
+    ngx_str_t *addr)
+{
+    size_t  len;
+    u_char  ch, *pos;
+
+    pos = p;
+
+    for ( ;; ) {
+        if (p == last) {
+            return NULL;
+        }
+
+        ch = *p++;
+
+        if (ch == ' ') {
+            break;
+        }
+
+        if (ch != ':' && ch != '.'
+            && (ch < 'a' || ch > 'f')
+            && (ch < 'A' || ch > 'F')
+            && (ch < '0' || ch > '9'))
+        {
+            return NULL;
+        }
+    }
+
+    len = p - pos - 1;
+
+    addr->data = ngx_pnalloc(c->pool, len);
+    if (addr->data == NULL) {
+        return NULL;
+    }
+
+    ngx_memcpy(addr->data, pos, len);
+    addr->len = len;
+
+    return p;
+}
+
+
+static u_char *
+ngx_proxy_protocol_read_port(u_char *p, u_char *last, in_port_t *port,
+    u_char sep)
+{
+    size_t      len;
+    u_char     *pos;
+    ngx_int_t   n;
+
+    pos = p;
+
+    for ( ;; ) {
+        if (p == last) {
+            return NULL;
+        }
+
+        if (*p++ == sep) {
+            break;
+        }
+    }
+
+    len = p - pos - 1;
+
+    n = ngx_atoi(pos, len);
+    if (n < 0 || n > 65535) {
+        return NULL;
+    }
+
+    *port = (in_port_t) n;
+
+    return p;
+}
+
+
 u_char *
 ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last)
 {
@@ -219,7 +273,8 @@ ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last)
     size_t                              len;
     socklen_t                           socklen;
     ngx_uint_t                          version, command, family, transport;
-    ngx_sockaddr_t                      sockaddr;
+    ngx_sockaddr_t                      src_sockaddr, dst_sockaddr;
+    ngx_proxy_protocol_t               *pp;
     ngx_proxy_protocol_header_t        *header;
     ngx_proxy_protocol_inet_addrs_t    *in;
 #if (NGX_HAVE_INET6)
@@ -266,6 +321,11 @@ ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last)
         return end;
     }
 
+    pp = ngx_pcalloc(c->pool, sizeof(ngx_proxy_protocol_t));
+    if (pp == NULL) {
+        return NULL;
+    }
+
     family = header->family_transport >> 4;
 
     switch (family) {
@@ -278,11 +338,16 @@ ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last)
 
         in = (ngx_proxy_protocol_inet_addrs_t *) buf;
 
-        sockaddr.sockaddr_in.sin_family = AF_INET;
-        sockaddr.sockaddr_in.sin_port = 0;
-        memcpy(&sockaddr.sockaddr_in.sin_addr, in->src_addr, 4);
+        src_sockaddr.sockaddr_in.sin_family = AF_INET;
+        src_sockaddr.sockaddr_in.sin_port = 0;
+        memcpy(&src_sockaddr.sockaddr_in.sin_addr, in->src_addr, 4);
 
-        c->proxy_protocol_port = ngx_proxy_protocol_parse_uint16(in->src_port);
+        dst_sockaddr.sockaddr_in.sin_family = AF_INET;
+        dst_sockaddr.sockaddr_in.sin_port = 0;
+        memcpy(&dst_sockaddr.sockaddr_in.sin_addr, in->dst_addr, 4);
+
+        pp->src_port = ngx_proxy_protocol_parse_uint16(in->src_port);
+        pp->dst_port = ngx_proxy_protocol_parse_uint16(in->dst_port);
 
         socklen = sizeof(struct sockaddr_in);
 
@@ -300,11 +365,16 @@ ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last)
 
         in6 = (ngx_proxy_protocol_inet6_addrs_t *) buf;
 
-        sockaddr.sockaddr_in6.sin6_family = AF_INET6;
-        sockaddr.sockaddr_in6.sin6_port = 0;
-        memcpy(&sockaddr.sockaddr_in6.sin6_addr, in6->src_addr, 16);
+        src_sockaddr.sockaddr_in6.sin6_family = AF_INET6;
+        src_sockaddr.sockaddr_in6.sin6_port = 0;
+        memcpy(&src_sockaddr.sockaddr_in6.sin6_addr, in6->src_addr, 16);
 
-        c->proxy_protocol_port = ngx_proxy_protocol_parse_uint16(in6->src_port);
+        dst_sockaddr.sockaddr_in6.sin6_family = AF_INET6;
+        dst_sockaddr.sockaddr_in6.sin6_port = 0;
+        memcpy(&dst_sockaddr.sockaddr_in6.sin6_addr, in6->dst_addr, 16);
+
+        pp->src_port = ngx_proxy_protocol_parse_uint16(in6->src_port);
+        pp->dst_port = ngx_proxy_protocol_parse_uint16(in6->dst_port);
 
         socklen = sizeof(struct sockaddr_in6);
 
@@ -321,23 +391,32 @@ ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last)
         return end;
     }
 
-    c->proxy_protocol_addr.data = ngx_pnalloc(c->pool, NGX_SOCKADDR_STRLEN);
-    if (c->proxy_protocol_addr.data == NULL) {
+    pp->src_addr.data = ngx_pnalloc(c->pool, NGX_SOCKADDR_STRLEN);
+    if (pp->src_addr.data == NULL) {
         return NULL;
     }
 
-    c->proxy_protocol_addr.len = ngx_sock_ntop(&sockaddr.sockaddr, socklen,
-                                               c->proxy_protocol_addr.data,
-                                               NGX_SOCKADDR_STRLEN, 0);
+    pp->src_addr.len = ngx_sock_ntop(&src_sockaddr.sockaddr, socklen,
+                                     pp->src_addr.data, NGX_SOCKADDR_STRLEN, 0);
 
-    ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0,
-                   "PROXY protocol v2 address: %V %d", &c->proxy_protocol_addr,
-                   c->proxy_protocol_port);
+    pp->dst_addr.data = ngx_pnalloc(c->pool, NGX_SOCKADDR_STRLEN);
+    if (pp->dst_addr.data == NULL) {
+        return NULL;
+    }
+
+    pp->dst_addr.len = ngx_sock_ntop(&dst_sockaddr.sockaddr, socklen,
+                                     pp->dst_addr.data, NGX_SOCKADDR_STRLEN, 0);
+
+    ngx_log_debug4(NGX_LOG_DEBUG_CORE, c->log, 0,
+                   "PROXY protocol v2 src: %V %d, dst: %V %d",
+                   &pp->src_addr, pp->src_port, &pp->dst_addr, pp->dst_port);
 
     if (buf < end) {
         ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
                        "PROXY protocol v2 %z bytes of tlv ignored", end - buf);
     }
 
+    c->proxy_protocol = pp;
+
     return end;
 }
diff --git a/src/core/ngx_proxy_protocol.h b/src/core/ngx_proxy_protocol.h
index fb848f6..b716220 100644
--- a/src/core/ngx_proxy_protocol.h
+++ b/src/core/ngx_proxy_protocol.h
@@ -16,6 +16,14 @@
 #define NGX_PROXY_PROTOCOL_MAX_HEADER  107
 
 
+struct ngx_proxy_protocol_s {
+    ngx_str_t           src_addr;
+    ngx_str_t           dst_addr;
+    in_port_t           src_port;
+    in_port_t           dst_port;
+};
+
+
 u_char *ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf,
     u_char *last);
 u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf,
diff --git a/src/core/ngx_rbtree.c b/src/core/ngx_rbtree.c
index 969d549..377b82f 100644
--- a/src/core/ngx_rbtree.c
+++ b/src/core/ngx_rbtree.c
@@ -174,12 +174,7 @@ ngx_rbtree_delete(ngx_rbtree_t *tree, ngx_rbtree_node_t *node)
 
     } else {
         subst = ngx_rbtree_min(node->right, sentinel);
-
-        if (subst->left != sentinel) {
-            temp = subst->left;
-        } else {
-            temp = subst->right;
-        }
+        temp = subst->right;
     }
 
     if (subst == *root) {
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 593645d..e51712c 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -972,7 +972,8 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
 
             name = ngx_resolver_dup(r, rn->name, rn->nlen);
             if (name == NULL) {
-                goto failed;
+                ngx_resolver_free(r, ctx);
+                return NGX_ERROR;
             }
 
             ctx->name.len = rn->nlen;
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index ee9f854..590eb28 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -495,6 +495,7 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
         if ((revents & POLLIN) && rev->active) {
             rev->ready = 1;
+            rev->available = -1;
 
             if (flags & NGX_POST_EVENTS) {
                 queue = rev->accept ? &ngx_posted_accept_events
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index 76aee08..98e3ce7 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -886,11 +886,10 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
             if (revents & EPOLLRDHUP) {
                 rev->pending_eof = 1;
             }
-
-            rev->available = 1;
 #endif
 
             rev->ready = 1;
+            rev->available = -1;
 
             if (flags & NGX_POST_EVENTS) {
                 queue = rev->accept ? &ngx_posted_accept_events
diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c
index 11ad093..f67c704 100644
--- a/src/event/modules/ngx_eventport_module.c
+++ b/src/event/modules/ngx_eventport_module.c
@@ -559,6 +559,7 @@ ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
             if (revents & POLLIN) {
                 rev->ready = 1;
+                rev->available = -1;
 
                 if (flags & NGX_POST_EVENTS) {
                     queue = rev->accept ? &ngx_posted_accept_events
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index b46ab53..c16f024 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -370,6 +370,7 @@ ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
 
             ev = c->read;
             ev->ready = 1;
+            ev->available = -1;
 
             queue = ev->accept ? &ngx_posted_accept_events
                                : &ngx_posted_events;
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 0644621..b9fceb3 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -330,6 +330,7 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
         if (found) {
             ev->ready = 1;
+            ev->available = -1;
 
             queue = ev->accept ? &ngx_posted_accept_events
                                : &ngx_posted_events;
diff --git a/src/event/modules/ngx_win32_poll_module.c b/src/event/modules/ngx_win32_poll_module.c
index 9fe867f..2fbc1b3 100644
--- a/src/event/modules/ngx_win32_poll_module.c
+++ b/src/event/modules/ngx_win32_poll_module.c
@@ -380,6 +380,7 @@ ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
 
             ev = c->read;
             ev->ready = 1;
+            ev->available = -1;
 
             queue = ev->accept ? &ngx_posted_accept_events
                                : &ngx_posted_events;
diff --git a/src/event/modules/ngx_win32_select_module.c b/src/event/modules/ngx_win32_select_module.c
index 8093a60..962514a 100644
--- a/src/event/modules/ngx_win32_select_module.c
+++ b/src/event/modules/ngx_win32_select_module.c
@@ -330,6 +330,7 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
         if (found) {
             ev->ready = 1;
+            ev->available = -1;
 
             queue = ev->accept ? &ngx_posted_accept_events
                                : &ngx_posted_events;
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 69c55d7..402a7f5 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -237,6 +237,11 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
         }
     }
 
+    if (!ngx_queue_empty(&ngx_posted_next_events)) {
+        ngx_event_move_posted_next(cycle);
+        timer = 0;
+    }
+
     delta = ngx_current_msec;
 
     (void) ngx_process_events(cycle, timer, flags);
@@ -639,6 +644,7 @@ ngx_event_process_init(ngx_cycle_t *cycle)
 #endif
 
     ngx_queue_init(&ngx_posted_accept_events);
+    ngx_queue_init(&ngx_posted_next_events);
     ngx_queue_init(&ngx_posted_events);
 
     if (ngx_event_timer_init(cycle->log) == NGX_ERROR) {
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index bb77c4a..97f9673 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -91,21 +91,14 @@ struct ngx_event_s {
      *   write:      available space in buffer when event is ready
      *               or lowat when event is set with NGX_LOWAT_EVENT flag
      *
-     * epoll with EPOLLRDHUP:
-     *   accept:     1 if accept many, 0 otherwise
-     *   read:       1 if there can be data to read, 0 otherwise
-     *
      * iocp: TODO
      *
      * otherwise:
      *   accept:     1 if accept many, 0 otherwise
+     *   read:       bytes to read when event is ready, -1 if not known
      */
 
-#if (NGX_HAVE_KQUEUE) || (NGX_HAVE_IOCP)
     int              available;
-#else
-    unsigned         available:1;
-#endif
 
     ngx_event_handler_pt  handler;
 
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 7be4fb4..91b415c 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -164,7 +164,6 @@ ngx_ssl_init(ngx_log_t *log)
 
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
 #ifndef SSL_OP_NO_COMPRESSION
     {
     /*
@@ -181,7 +180,6 @@ ngx_ssl_init(ngx_log_t *log)
         (void) sk_SSL_COMP_pop(ssl_comp_methods);
     }
     }
-#endif
 #endif
 
     ngx_ssl_connection_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
@@ -904,13 +902,6 @@ ngx_ssl_client_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
         return NGX_ERROR;
     }
 
-    /*
-     * before 0.9.7h and 0.9.8 SSL_load_client_CA_file()
-     * always leaved an error in the error queue
-     */
-
-    ERR_clear_error();
-
     SSL_CTX_set_client_CA_list(ssl->ctx, list);
 
     return NGX_OK;
@@ -1076,8 +1067,8 @@ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
              * added to wbio, and set buffer size.
              */
 
-            rbio = SSL_get_rbio((ngx_ssl_conn_t *) ssl_conn);
-            wbio = SSL_get_wbio((ngx_ssl_conn_t *) ssl_conn);
+            rbio = SSL_get_rbio(ssl_conn);
+            wbio = SSL_get_wbio(ssl_conn);
 
             if (rbio != wbio) {
                 (void) BIO_set_write_buffer_size(wbio, NGX_SSL_BUFSIZE);
@@ -1360,7 +1351,6 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
 ngx_int_t
 ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
 {
-#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
 #ifndef OPENSSL_NO_ECDH
 
     /*
@@ -1434,7 +1424,6 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
 
     EC_KEY_free(ecdh);
 #endif
-#endif
 #endif
 
     return NGX_OK;
@@ -1933,6 +1922,10 @@ ngx_ssl_recv_chain(ngx_connection_t *c, ngx_chain_t *cl, off_t limit)
             last += n;
             bytes += n;
 
+            if (!c->read->ready) {
+                return bytes;
+            }
+
             if (last == b->end) {
                 cl = cl->next;
 
@@ -2010,6 +2003,47 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
 
             if (size == 0) {
                 c->read->ready = 1;
+
+                if (c->read->available >= 0) {
+                    c->read->available -= bytes;
+
+                    /*
+                     * there can be data buffered at SSL layer,
+                     * so we post an event to continue reading on the next
+                     * iteration of the event loop
+                     */
+
+                    if (c->read->available < 0) {
+                        c->read->available = 0;
+                        c->read->ready = 0;
+
+                        if (c->read->posted) {
+                            ngx_delete_posted_event(c->read);
+                        }
+
+                        ngx_post_event(c->read, &ngx_posted_next_events);
+                    }
+
+                    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                                   "SSL_read: avail:%d", c->read->available);
+
+                } else {
+
+#if (NGX_HAVE_FIONREAD)
+
+                    if (ngx_socket_nread(c->fd, &c->read->available) == -1) {
+                        c->read->error = 1;
+                        ngx_connection_error(c, ngx_socket_errno,
+                                             ngx_socket_nread_n " failed");
+                        return NGX_ERROR;
+                    }
+
+                    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                                   "SSL_read: avail:%d", c->read->available);
+
+#endif
+                }
+
                 return bytes;
             }
 
@@ -2825,6 +2859,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
     if (sslerr == SSL_ERROR_SYSCALL) {
 
         if (err == NGX_ECONNRESET
+#if (NGX_WIN32)
+            || err == NGX_ECONNABORTED
+#endif
             || err == NGX_EPIPE
             || err == NGX_ENOTCONN
             || err == NGX_ETIMEDOUT
@@ -3364,17 +3401,8 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
         }
     }
 
-#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
-
     session_id = (u_char *) SSL_SESSION_get_id(sess, &session_id_length);
 
-#else
-
-    session_id = sess->session_id;
-    session_id_length = sess->session_id_length;
-
-#endif
-
 #if (NGX_PTR_SIZE == 8)
 
     id = sess_id->sess_id;
@@ -3450,13 +3478,10 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn,
 #endif
     u_char *id, int len, int *copy)
 {
-#if OPENSSL_VERSION_NUMBER >= 0x0090707fL
-    const
-#endif
-    u_char                   *p;
     size_t                    slen;
     uint32_t                  hash;
     ngx_int_t                 rc;
+    const u_char             *p;
     ngx_shm_zone_t           *shm_zone;
     ngx_slab_pool_t          *shpool;
     ngx_rbtree_node_t        *node, *sentinel;
@@ -3578,17 +3603,8 @@ ngx_ssl_remove_session(SSL_CTX *ssl, ngx_ssl_session_t *sess)
 
     cache = shm_zone->data;
 
-#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
-
     id = (u_char *) SSL_SESSION_get_id(sess, &len);
 
-#else
-
-    id = sess->session_id;
-    len = sess->session_id_length;
-
-#endif
-
     hash = ngx_crc32_short(id, len);
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
@@ -4387,17 +4403,8 @@ ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
         return NGX_OK;
     }
 
-#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
-
     buf = (u_char *) SSL_SESSION_get_id(sess, &len);
 
-#else
-
-    buf = sess->session_id;
-    len = sess->session_id_length;
-
-#endif
-
     s->len = 2 * len;
     s->data = ngx_pnalloc(pool, 2 * len);
     if (s->data == NULL) {
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index c832aa0..5a7e40e 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -589,15 +589,12 @@ ngx_ssl_stapling_update(ngx_ssl_stapling_t *staple)
 static void
 ngx_ssl_stapling_ocsp_handler(ngx_ssl_ocsp_ctx_t *ctx)
 {
-#if OPENSSL_VERSION_NUMBER >= 0x0090707fL
-    const
-#endif
-    u_char                *p;
     int                    n;
     size_t                 len;
     time_t                 now, valid;
     ngx_str_t              response;
     X509_STORE            *store;
+    const u_char          *p;
     STACK_OF(X509)        *chain;
     OCSP_CERTID           *id;
     OCSP_RESPONSE         *ocsp;
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index da7c4ee..531b13a 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -172,7 +172,11 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
              */
 
             if (p->upstream->read->available == 0
-                && p->upstream->read->pending_eof)
+                && p->upstream->read->pending_eof
+#if (NGX_SSL)
+                && !p->upstream->ssl
+#endif
+                )
             {
                 p->upstream->read->ready = 0;
                 p->upstream->read->eof = 1;
diff --git a/src/event/ngx_event_posted.c b/src/event/ngx_event_posted.c
index d851f3d..fa575bd 100644
--- a/src/event/ngx_event_posted.c
+++ b/src/event/ngx_event_posted.c
@@ -11,6 +11,7 @@
 
 
 ngx_queue_t  ngx_posted_accept_events;
+ngx_queue_t  ngx_posted_next_events;
 ngx_queue_t  ngx_posted_events;
 
 
@@ -33,3 +34,27 @@ ngx_event_process_posted(ngx_cycle_t *cycle, ngx_queue_t *posted)
         ev->handler(ev);
     }
 }
+
+
+void
+ngx_event_move_posted_next(ngx_cycle_t *cycle)
+{
+    ngx_queue_t  *q;
+    ngx_event_t  *ev;
+
+    for (q = ngx_queue_head(&ngx_posted_next_events);
+         q != ngx_queue_sentinel(&ngx_posted_next_events);
+         q = ngx_queue_next(q))
+    {
+        ev = ngx_queue_data(q, ngx_event_t, queue);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                      "posted next event %p", ev);
+
+        ev->ready = 1;
+        ev->available = -1;
+    }
+
+    ngx_queue_add(&ngx_posted_events, &ngx_posted_next_events);
+    ngx_queue_init(&ngx_posted_next_events);
+}
diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h
index 145d30f..b1a85c4 100644
--- a/src/event/ngx_event_posted.h
+++ b/src/event/ngx_event_posted.h
@@ -39,9 +39,11 @@
 
 
 void ngx_event_process_posted(ngx_cycle_t *cycle, ngx_queue_t *posted);
+void ngx_event_move_posted_next(ngx_cycle_t *cycle);
 
 
 extern ngx_queue_t  ngx_posted_accept_events;
+extern ngx_queue_t  ngx_posted_next_events;
 extern ngx_queue_t  ngx_posted_events;
 
 
diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c
index a6f9ec4..ed9df34 100644
--- a/src/http/modules/ngx_http_auth_basic_module.c
+++ b/src/http/modules/ngx_http_auth_basic_module.c
@@ -25,7 +25,6 @@ static ngx_int_t ngx_http_auth_basic_crypt_handler(ngx_http_request_t *r,
     ngx_str_t *passwd, ngx_str_t *realm);
 static ngx_int_t ngx_http_auth_basic_set_realm(ngx_http_request_t *r,
     ngx_str_t *realm);
-static void ngx_http_auth_basic_close(ngx_file_t *file);
 static void *ngx_http_auth_basic_create_loc_conf(ngx_conf_t *cf);
 static char *ngx_http_auth_basic_merge_loc_conf(ngx_conf_t *cf,
     void *parent, void *child);
@@ -177,8 +176,8 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
                           offset);
 
         if (n == NGX_ERROR) {
-            ngx_http_auth_basic_close(&file);
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+            goto cleanup;
         }
 
         if (n == 0) {
@@ -219,12 +218,11 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
                 if (buf[i] == LF || buf[i] == CR || buf[i] == ':') {
                     buf[i] = '\0';
 
-                    ngx_http_auth_basic_close(&file);
-
                     pwd.len = i - passwd;
                     pwd.data = &buf[passwd];
 
-                    return ngx_http_auth_basic_crypt_handler(r, &pwd, &realm);
+                    rc = ngx_http_auth_basic_crypt_handler(r, &pwd, &realm);
+                    goto cleanup;
                 }
 
                 break;
@@ -251,8 +249,6 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
         offset += n;
     }
 
-    ngx_http_auth_basic_close(&file);
-
     if (state == sw_passwd) {
         pwd.len = i - passwd;
         pwd.data = ngx_pnalloc(r->pool, pwd.len + 1);
@@ -262,14 +258,26 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
 
         ngx_cpystrn(pwd.data, &buf[passwd], pwd.len + 1);
 
-        return ngx_http_auth_basic_crypt_handler(r, &pwd, &realm);
+        rc = ngx_http_auth_basic_crypt_handler(r, &pwd, &realm);
+        goto cleanup;
     }
 
     ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                   "user \"%V\" was not found in \"%s\"",
                   &r->headers_in.user, user_file.data);
 
-    return ngx_http_auth_basic_set_realm(r, &realm);
+    rc = ngx_http_auth_basic_set_realm(r, &realm);
+
+cleanup:
+
+    if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
+                      ngx_close_file_n " \"%s\" failed", user_file.data);
+    }
+
+    ngx_explicit_memzero(buf, NGX_HTTP_AUTH_BUF_SIZE);
+
+    return rc;
 }
 
 
@@ -338,15 +346,6 @@ ngx_http_auth_basic_set_realm(ngx_http_request_t *r, ngx_str_t *realm)
     return NGX_HTTP_UNAUTHORIZED;
 }
 
-static void
-ngx_http_auth_basic_close(ngx_file_t *file)
-{
-    if (ngx_close_file(file->fd) == NGX_FILE_ERROR) {
-        ngx_log_error(NGX_LOG_ALERT, file->log, ngx_errno,
-                      ngx_close_file_n " \"%s\" failed", file->name.data);
-    }
-}
-
 
 static void *
 ngx_http_auth_basic_create_loc_conf(ngx_conf_t *cf)
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 95c7b32..8b69e6f 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -56,7 +56,7 @@ static ngx_int_t ngx_http_dav_copy_tree_file(ngx_tree_ctx_t *ctx,
 static ngx_int_t ngx_http_dav_depth(ngx_http_request_t *r, ngx_int_t dflt);
 static ngx_int_t ngx_http_dav_error(ngx_log_t *log, ngx_err_t err,
     ngx_int_t not_found, char *failed, u_char *path);
-static ngx_int_t ngx_http_dav_location(ngx_http_request_t *r, u_char *path);
+static ngx_int_t ngx_http_dav_location(ngx_http_request_t *r);
 static void *ngx_http_dav_create_loc_conf(ngx_conf_t *cf);
 static char *ngx_http_dav_merge_loc_conf(ngx_conf_t *cf,
     void *parent, void *child);
@@ -285,7 +285,7 @@ ngx_http_dav_put_handler(ngx_http_request_t *r)
     }
 
     if (status == NGX_HTTP_CREATED) {
-        if (ngx_http_dav_location(r, path.data) != NGX_OK) {
+        if (ngx_http_dav_location(r) != NGX_OK) {
             ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
             return;
         }
@@ -312,7 +312,7 @@ ngx_http_dav_delete_handler(ngx_http_request_t *r)
     ngx_file_info_t           fi;
     ngx_http_dav_loc_conf_t  *dlcf;
 
-    if (r->headers_in.content_length_n > 0) {
+    if (r->headers_in.content_length_n > 0 || r->headers_in.chunked) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "DELETE with body is unsupported");
         return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE;
@@ -495,7 +495,7 @@ ngx_http_dav_mkcol_handler(ngx_http_request_t *r, ngx_http_dav_loc_conf_t *dlcf)
     size_t     root;
     ngx_str_t  path;
 
-    if (r->headers_in.content_length_n > 0) {
+    if (r->headers_in.content_length_n > 0 || r->headers_in.chunked) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "MKCOL with body is unsupported");
         return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE;
@@ -513,7 +513,6 @@ ngx_http_dav_mkcol_handler(ngx_http_request_t *r, ngx_http_dav_loc_conf_t *dlcf)
     }
 
     *(p - 1) = '\0';
-    r->uri.len--;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http mkcol path: \"%s\"", path.data);
@@ -521,7 +520,7 @@ ngx_http_dav_mkcol_handler(ngx_http_request_t *r, ngx_http_dav_loc_conf_t *dlcf)
     if (ngx_create_dir(path.data, ngx_dir_access(dlcf->access))
         != NGX_FILE_ERROR)
     {
-        if (ngx_http_dav_location(r, path.data) != NGX_OK) {
+        if (ngx_http_dav_location(r) != NGX_OK) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
 
@@ -550,7 +549,9 @@ ngx_http_dav_copy_move_handler(ngx_http_request_t *r)
     ngx_http_dav_copy_ctx_t   copy;
     ngx_http_dav_loc_conf_t  *dlcf;
 
-    if (r->headers_in.content_length_n > 0) {
+    if (r->headers_in.content_length_n > 0 || r->headers_in.chunked) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "COPY and MOVE with body are unsupported");
         return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE;
     }
 
@@ -1069,35 +1070,16 @@ ngx_http_dav_error(ngx_log_t *log, ngx_err_t err, ngx_int_t not_found,
 
 
 static ngx_int_t
-ngx_http_dav_location(ngx_http_request_t *r, u_char *path)
+ngx_http_dav_location(ngx_http_request_t *r)
 {
-    u_char                    *location;
-    ngx_http_core_loc_conf_t  *clcf;
-
     r->headers_out.location = ngx_list_push(&r->headers_out.headers);
     if (r->headers_out.location == NULL) {
         return NGX_ERROR;
     }
 
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-    if (!clcf->alias && clcf->root_lengths == NULL) {
-        location = path + clcf->root.len;
-
-    } else {
-        location = ngx_pnalloc(r->pool, r->uri.len);
-        if (location == NULL) {
-            ngx_http_clear_location(r);
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(location, r->uri.data, r->uri.len);
-    }
-
     r->headers_out.location->hash = 1;
     ngx_str_set(&r->headers_out.location->key, "Location");
-    r->headers_out.location->value.len = r->uri.len;
-    r->headers_out.location->value.data = location;
+    r->headers_out.location->value = r->uri;
 
     return NGX_OK;
 }
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
index f59ecbd..d4af66d 100644
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -27,6 +27,9 @@ typedef struct {
     ngx_str_t                  host;
     ngx_uint_t                 host_set;
 
+    ngx_array_t               *grpc_lengths;
+    ngx_array_t               *grpc_values;
+
 #if (NGX_HTTP_SSL)
     ngx_uint_t                 ssl;
     ngx_uint_t                 ssl_protocols;
@@ -119,6 +122,8 @@ typedef struct {
     unsigned                   status:1;
 
     ngx_http_request_t        *request;
+
+    ngx_str_t                  host;
 } ngx_http_grpc_ctx_t;
 
 
@@ -135,6 +140,8 @@ typedef struct {
 } ngx_http_grpc_frame_t;
 
 
+static ngx_int_t ngx_http_grpc_eval(ngx_http_request_t *r,
+    ngx_http_grpc_ctx_t *ctx, ngx_http_grpc_loc_conf_t *glcf);
 static ngx_int_t ngx_http_grpc_create_request(ngx_http_request_t *r);
 static ngx_int_t ngx_http_grpc_reinit_request(ngx_http_request_t *r);
 static ngx_int_t ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in);
@@ -524,22 +531,40 @@ ngx_http_grpc_handler(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
+    ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_grpc_ctx_t));
+    if (ctx == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    ctx->request = r;
+
+    ngx_http_set_ctx(r, ctx, ngx_http_grpc_module);
+
     glcf = ngx_http_get_module_loc_conf(r, ngx_http_grpc_module);
 
     u = r->upstream;
 
-#if (NGX_HTTP_SSL)
-    u->ssl = (glcf->upstream.ssl != NULL);
+    if (glcf->grpc_lengths == NULL) {
+        ctx->host = glcf->host;
 
-    if (u->ssl) {
-        ngx_str_set(&u->schema, "grpcs://");
+#if (NGX_HTTP_SSL)
+        u->ssl = (glcf->upstream.ssl != NULL);
+
+        if (u->ssl) {
+            ngx_str_set(&u->schema, "grpcs://");
+
+        } else {
+            ngx_str_set(&u->schema, "grpc://");
+        }
+#else
+        ngx_str_set(&u->schema, "grpc://");
+#endif
 
     } else {
-        ngx_str_set(&u->schema, "grpc://");
+        if (ngx_http_grpc_eval(r, ctx, glcf) != NGX_OK) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
     }
-#else
-    ngx_str_set(&u->schema, "grpc://");
-#endif
 
     u->output.tag = (ngx_buf_tag_t) &ngx_http_grpc_module;
 
@@ -551,15 +576,6 @@ ngx_http_grpc_handler(ngx_http_request_t *r)
     u->abort_request = ngx_http_grpc_abort_request;
     u->finalize_request = ngx_http_grpc_finalize_request;
 
-    ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_grpc_ctx_t));
-    if (ctx == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    ctx->request = r;
-
-    ngx_http_set_ctx(r, ctx, ngx_http_grpc_module);
-
     u->input_filter_init = ngx_http_grpc_filter_init;
     u->input_filter = ngx_http_grpc_filter;
     u->input_filter_ctx = ctx;
@@ -576,6 +592,103 @@ ngx_http_grpc_handler(ngx_http_request_t *r)
 }
 
 
+static ngx_int_t
+ngx_http_grpc_eval(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
+    ngx_http_grpc_loc_conf_t *glcf)
+{
+    size_t                add;
+    ngx_url_t             url;
+    ngx_http_upstream_t  *u;
+
+    ngx_memzero(&url, sizeof(ngx_url_t));
+
+    if (ngx_http_script_run(r, &url.url, glcf->grpc_lengths->elts, 0,
+                            glcf->grpc_values->elts)
+        == NULL)
+    {
+        return NGX_ERROR;
+    }
+
+    if (url.url.len > 7
+        && ngx_strncasecmp(url.url.data, (u_char *) "grpc://", 7) == 0)
+    {
+        add = 7;
+
+    } else if (url.url.len > 8
+               && ngx_strncasecmp(url.url.data, (u_char *) "grpcs://", 8) == 0)
+    {
+
+#if (NGX_HTTP_SSL)
+        add = 8;
+        r->upstream->ssl = 1;
+#else
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "grpcs protocol requires SSL support");
+        return NGX_ERROR;
+#endif
+
+    } else {
+        add = 0;
+    }
+
+    u = r->upstream;
+
+    if (add) {
+        u->schema.len = add;
+        u->schema.data = url.url.data;
+
+        url.url.data += add;
+        url.url.len -= add;
+
+    } else {
+        ngx_str_set(&u->schema, "grpc://");
+    }
+
+    url.no_resolve = 1;
+
+    if (ngx_parse_url(r->pool, &url) != NGX_OK) {
+        if (url.err) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "%s in upstream \"%V\"", url.err, &url.url);
+        }
+
+        return NGX_ERROR;
+    }
+
+    u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t));
+    if (u->resolved == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (url.addrs) {
+        u->resolved->sockaddr = url.addrs[0].sockaddr;
+        u->resolved->socklen = url.addrs[0].socklen;
+        u->resolved->name = url.addrs[0].name;
+        u->resolved->naddrs = 1;
+    }
+
+    u->resolved->host = url.host;
+    u->resolved->port = url.port;
+    u->resolved->no_port = url.no_port;
+
+    if (url.family != AF_UNIX) {
+
+        if (url.no_port) {
+            ctx->host = url.host;
+
+        } else {
+            ctx->host.len = url.host.len + 1 + url.port_text.len;
+            ctx->host.data = url.host.data;
+        }
+
+    } else {
+        ngx_str_set(&ctx->host, "localhost");
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_grpc_create_request(ngx_http_request_t *r)
 {
@@ -587,6 +700,7 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
     ngx_chain_t                  *cl, *body;
     ngx_list_part_t              *part;
     ngx_table_elt_t              *header;
+    ngx_http_grpc_ctx_t          *ctx;
     ngx_http_upstream_t          *u;
     ngx_http_grpc_frame_t        *f;
     ngx_http_script_code_pt       code;
@@ -598,6 +712,8 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
 
     glcf = ngx_http_get_module_loc_conf(r, ngx_http_grpc_module);
 
+    ctx = ngx_http_get_module_ctx(r, ngx_http_grpc_module);
+
     len = sizeof(ngx_http_grpc_connection_start) - 1
           + sizeof(ngx_http_grpc_frame_t);             /* headers frame */
 
@@ -637,10 +753,10 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
     /* :authority header */
 
     if (!glcf->host_set) {
-        len += 1 + NGX_HTTP_V2_INT_OCTETS + glcf->host.len;
+        len += 1 + NGX_HTTP_V2_INT_OCTETS + ctx->host.len;
 
-        if (tmp_len < glcf->host.len) {
-            tmp_len = glcf->host.len;
+        if (tmp_len < ctx->host.len) {
+            tmp_len = ctx->host.len;
         }
     }
 
@@ -785,7 +901,7 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
     }
 
 #if (NGX_HTTP_SSL)
-    if (glcf->ssl) {
+    if (u->ssl) {
         *b->last++ = ngx_http_v2_indexed(NGX_HTTP_V2_SCHEME_HTTPS_INDEX);
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -846,11 +962,11 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
 
     if (!glcf->host_set) {
         *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_AUTHORITY_INDEX);
-        b->last = ngx_http_v2_write_value(b->last, glcf->host.data,
-                                          glcf->host.len, tmp);
+        b->last = ngx_http_v2_write_value(b->last, ctx->host.data,
+                                          ctx->host.len, tmp);
 
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "grpc header: \":authority: %V\"", &glcf->host);
+                       "grpc header: \":authority: %V\"", &ctx->host);
     }
 
     ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
@@ -4319,15 +4435,23 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
 
-    if (clcf->noname && conf->upstream.upstream == NULL) {
+    if (clcf->noname
+        && conf->upstream.upstream == NULL && conf->grpc_lengths == NULL)
+    {
         conf->upstream.upstream = prev->upstream.upstream;
         conf->host = prev->host;
+
+        conf->grpc_lengths = prev->grpc_lengths;
+        conf->grpc_values = prev->grpc_values;
+
 #if (NGX_HTTP_SSL)
         conf->upstream.ssl = prev->upstream.ssl;
 #endif
     }
 
-    if (clcf->lmt_excpt && clcf->handler == NULL && conf->upstream.upstream) {
+    if (clcf->lmt_excpt && clcf->handler == NULL
+        && (conf->upstream.upstream || conf->grpc_lengths))
+    {
         clcf->handler = ngx_http_grpc_handler;
     }
 
@@ -4537,18 +4661,54 @@ ngx_http_grpc_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_http_grpc_loc_conf_t *glcf = conf;
 
-    size_t                     add;
-    ngx_str_t                 *value, *url;
-    ngx_url_t                  u;
-    ngx_http_core_loc_conf_t  *clcf;
+    size_t                      add;
+    ngx_str_t                  *value, *url;
+    ngx_url_t                   u;
+    ngx_uint_t                  n;
+    ngx_http_core_loc_conf_t   *clcf;
+    ngx_http_script_compile_t   sc;
 
-    if (glcf->upstream.upstream) {
+    if (glcf->upstream.upstream || glcf->grpc_lengths) {
         return "is duplicate";
     }
 
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
+    clcf->handler = ngx_http_grpc_handler;
+
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
+        clcf->auto_redirect = 1;
+    }
+
     value = cf->args->elts;
+
     url = &value[1];
 
+    n = ngx_http_script_variables_count(url);
+
+    if (n) {
+
+        ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
+
+        sc.cf = cf;
+        sc.source = url;
+        sc.lengths = &glcf->grpc_lengths;
+        sc.values = &glcf->grpc_values;
+        sc.variables = n;
+        sc.complete_lengths = 1;
+        sc.complete_values = 1;
+
+        if (ngx_http_script_compile(&sc) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+
+#if (NGX_HTTP_SSL)
+        glcf->ssl = 1;
+#endif
+
+        return NGX_CONF_OK;
+    }
+
     if (ngx_strncasecmp(url->data, (u_char *) "grpc://", 7) == 0) {
         add = 7;
 
@@ -4593,14 +4753,6 @@ ngx_http_grpc_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         ngx_str_set(&glcf->host, "localhost");
     }
 
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-
-    clcf->handler = ngx_http_grpc_handler;
-
-    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
-        clcf->auto_redirect = 1;
-    }
-
     return NGX_CONF_OK;
 }
 
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index e4c343c..c75169c 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -55,44 +55,23 @@ typedef struct {
     unsigned             redo:1;
     unsigned             done:1;
     unsigned             nomem:1;
-    unsigned             gzheader:1;
     unsigned             buffering:1;
     unsigned             intel:1;
 
     size_t               zin;
     size_t               zout;
 
-    uint32_t             crc32;
     z_stream             zstream;
     ngx_http_request_t  *request;
 } ngx_http_gzip_ctx_t;
 
 
-#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
-
-struct gztrailer {
-    uint32_t  crc32;
-    uint32_t  zlen;
-};
-
-#else /* NGX_HAVE_BIG_ENDIAN || !NGX_HAVE_NONALIGNED */
-
-struct gztrailer {
-    u_char  crc32[4];
-    u_char  zlen[4];
-};
-
-#endif
-
-
 static void ngx_http_gzip_filter_memory(ngx_http_request_t *r,
     ngx_http_gzip_ctx_t *ctx);
 static ngx_int_t ngx_http_gzip_filter_buffer(ngx_http_gzip_ctx_t *ctx,
     ngx_chain_t *in);
 static ngx_int_t ngx_http_gzip_filter_deflate_start(ngx_http_request_t *r,
     ngx_http_gzip_ctx_t *ctx);
-static ngx_int_t ngx_http_gzip_filter_gzheader(ngx_http_request_t *r,
-    ngx_http_gzip_ctx_t *ctx);
 static ngx_int_t ngx_http_gzip_filter_add_data(ngx_http_request_t *r,
     ngx_http_gzip_ctx_t *ctx);
 static ngx_int_t ngx_http_gzip_filter_get_buf(ngx_http_request_t *r,
@@ -446,12 +425,6 @@ ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
             return ctx->busy ? NGX_AGAIN : NGX_OK;
         }
 
-        if (!ctx->gzheader) {
-            if (ngx_http_gzip_filter_gzheader(r, ctx) != NGX_OK) {
-                goto failed;
-            }
-        }
-
         rc = ngx_http_next_body_filter(r, ctx->out);
 
         if (rc == NGX_ERROR) {
@@ -643,7 +616,7 @@ ngx_http_gzip_filter_deflate_start(ngx_http_request_t *r,
     ctx->zstream.opaque = ctx;
 
     rc = deflateInit2(&ctx->zstream, (int) conf->level, Z_DEFLATED,
-                      - ctx->wbits, ctx->memlevel, Z_DEFAULT_STRATEGY);
+                      ctx->wbits + 16, ctx->memlevel, Z_DEFAULT_STRATEGY);
 
     if (rc != Z_OK) {
         ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
@@ -652,45 +625,12 @@ ngx_http_gzip_filter_deflate_start(ngx_http_request_t *r,
     }
 
     ctx->last_out = &ctx->out;
-    ctx->crc32 = crc32(0L, Z_NULL, 0);
     ctx->flush = Z_NO_FLUSH;
 
     return NGX_OK;
 }
 
 
-static ngx_int_t
-ngx_http_gzip_filter_gzheader(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
-{
-    ngx_buf_t      *b;
-    ngx_chain_t    *cl;
-    static u_char  gzheader[10] =
-                               { 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 };
-
-    b = ngx_calloc_buf(r->pool);
-    if (b == NULL) {
-        return NGX_ERROR;
-    }
-
-    b->memory = 1;
-    b->pos = gzheader;
-    b->last = b->pos + 10;
-
-    cl = ngx_alloc_chain_link(r->pool);
-    if (cl == NULL) {
-        return NGX_ERROR;
-    }
-
-    cl->buf = b;
-    cl->next = ctx->out;
-    ctx->out = cl;
-
-    ctx->gzheader = 1;
-
-    return NGX_OK;
-}
-
-
 static ngx_int_t
 ngx_http_gzip_filter_add_data(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
 {
@@ -743,14 +683,9 @@ ngx_http_gzip_filter_add_data(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
 
     } else if (ctx->in_buf->flush) {
         ctx->flush = Z_SYNC_FLUSH;
-    }
 
-    if (ctx->zstream.avail_in) {
-
-        ctx->crc32 = crc32(ctx->crc32, ctx->zstream.next_in,
-                           ctx->zstream.avail_in);
-
-    } else if (ctx->flush == Z_NO_FLUSH) {
+    } else if (ctx->zstream.avail_in == 0) {
+        /* ctx->flush == Z_NO_FLUSH */
         return NGX_AGAIN;
     }
 
@@ -843,7 +778,7 @@ ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
 
     ctx->out_buf->last = ctx->zstream.next_out;
 
-    if (ctx->zstream.avail_out == 0) {
+    if (ctx->zstream.avail_out == 0 && rc != Z_STREAM_END) {
 
         /* zlib wants to output some more gzipped data */
 
@@ -932,13 +867,12 @@ static ngx_int_t
 ngx_http_gzip_filter_deflate_end(ngx_http_request_t *r,
     ngx_http_gzip_ctx_t *ctx)
 {
-    int                rc;
-    ngx_buf_t         *b;
-    ngx_chain_t       *cl;
-    struct gztrailer  *trailer;
+    int           rc;
+    ngx_buf_t    *b;
+    ngx_chain_t  *cl;
 
     ctx->zin = ctx->zstream.total_in;
-    ctx->zout = 10 + ctx->zstream.total_out + 8;
+    ctx->zout = ctx->zstream.total_out;
 
     rc = deflateEnd(&ctx->zstream);
 
@@ -955,56 +889,19 @@ ngx_http_gzip_filter_deflate_end(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    cl->buf = ctx->out_buf;
+    b = ctx->out_buf;
+
+    if (ngx_buf_size(b) == 0) {
+        b->temporary = 0;
+    }
+
+    b->last_buf = 1;
+
+    cl->buf = b;
     cl->next = NULL;
     *ctx->last_out = cl;
     ctx->last_out = &cl->next;
 
-    if (ctx->zstream.avail_out >= 8) {
-        trailer = (struct gztrailer *) ctx->out_buf->last;
-        ctx->out_buf->last += 8;
-        ctx->out_buf->last_buf = 1;
-
-    } else {
-        b = ngx_create_temp_buf(r->pool, 8);
-        if (b == NULL) {
-            return NGX_ERROR;
-        }
-
-        b->last_buf = 1;
-
-        cl = ngx_alloc_chain_link(r->pool);
-        if (cl == NULL) {
-            return NGX_ERROR;
-        }
-
-        cl->buf = b;
-        cl->next = NULL;
-        *ctx->last_out = cl;
-        ctx->last_out = &cl->next;
-        trailer = (struct gztrailer *) b->pos;
-        b->last += 8;
-    }
-
-#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
-
-    trailer->crc32 = ctx->crc32;
-    trailer->zlen = ctx->zin;
-
-#else
-
-    trailer->crc32[0] = (u_char) (ctx->crc32 & 0xff);
-    trailer->crc32[1] = (u_char) ((ctx->crc32 >> 8) & 0xff);
-    trailer->crc32[2] = (u_char) ((ctx->crc32 >> 16) & 0xff);
-    trailer->crc32[3] = (u_char) ((ctx->crc32 >> 24) & 0xff);
-
-    trailer->zlen[0] = (u_char) (ctx->zin & 0xff);
-    trailer->zlen[1] = (u_char) ((ctx->zin >> 8) & 0xff);
-    trailer->zlen[2] = (u_char) ((ctx->zin >> 16) & 0xff);
-    trailer->zlen[3] = (u_char) ((ctx->zin >> 24) & 0xff);
-
-#endif
-
     ctx->zstream.avail_in = 0;
     ctx->zstream.avail_out = 0;
 
diff --git a/src/http/modules/ngx_http_index_module.c b/src/http/modules/ngx_http_index_module.c
index c144b31..2ee1dd5 100644
--- a/src/http/modules/ngx_http_index_module.c
+++ b/src/http/modules/ngx_http_index_module.c
@@ -163,7 +163,7 @@ ngx_http_index_handler(ngx_http_request_t *r)
 
             name = ngx_http_map_uri_to_path(r, &path, &root, reserve);
             if (name == NULL) {
-                return NGX_ERROR;
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
 
             allocated = path.data + path.len - name;
diff --git a/src/http/modules/ngx_http_limit_conn_module.c b/src/http/modules/ngx_http_limit_conn_module.c
index 913d599..4e3e7d5 100644
--- a/src/http/modules/ngx_http_limit_conn_module.c
+++ b/src/http/modules/ngx_http_limit_conn_module.c
@@ -10,36 +10,49 @@
 #include <ngx_http.h>
 
 
+#define NGX_HTTP_LIMIT_CONN_PASSED            1
+#define NGX_HTTP_LIMIT_CONN_REJECTED          2
+#define NGX_HTTP_LIMIT_CONN_REJECTED_DRY_RUN  3
+
+
 typedef struct {
-    u_char                     color;
-    u_char                     len;
-    u_short                    conn;
-    u_char                     data[1];
+    u_char                        color;
+    u_char                        len;
+    u_short                       conn;
+    u_char                        data[1];
 } ngx_http_limit_conn_node_t;
 
 
 typedef struct {
-    ngx_shm_zone_t            *shm_zone;
-    ngx_rbtree_node_t         *node;
+    ngx_shm_zone_t               *shm_zone;
+    ngx_rbtree_node_t            *node;
 } ngx_http_limit_conn_cleanup_t;
 
 
 typedef struct {
-    ngx_rbtree_t              *rbtree;
-    ngx_http_complex_value_t   key;
+    ngx_rbtree_t                  rbtree;
+    ngx_rbtree_node_t             sentinel;
+} ngx_http_limit_conn_shctx_t;
+
+
+typedef struct {
+    ngx_http_limit_conn_shctx_t  *sh;
+    ngx_slab_pool_t              *shpool;
+    ngx_http_complex_value_t      key;
 } ngx_http_limit_conn_ctx_t;
 
 
 typedef struct {
-    ngx_shm_zone_t            *shm_zone;
-    ngx_uint_t                 conn;
+    ngx_shm_zone_t               *shm_zone;
+    ngx_uint_t                    conn;
 } ngx_http_limit_conn_limit_t;
 
 
 typedef struct {
-    ngx_array_t                limits;
-    ngx_uint_t                 log_level;
-    ngx_uint_t                 status_code;
+    ngx_array_t                   limits;
+    ngx_uint_t                    log_level;
+    ngx_uint_t                    status_code;
+    ngx_flag_t                    dry_run;
 } ngx_http_limit_conn_conf_t;
 
 
@@ -48,6 +61,8 @@ static ngx_rbtree_node_t *ngx_http_limit_conn_lookup(ngx_rbtree_t *rbtree,
 static void ngx_http_limit_conn_cleanup(void *data);
 static ngx_inline void ngx_http_limit_conn_cleanup_all(ngx_pool_t *pool);
 
+static ngx_int_t ngx_http_limit_conn_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 static void *ngx_http_limit_conn_create_conf(ngx_conf_t *cf);
 static char *ngx_http_limit_conn_merge_conf(ngx_conf_t *cf, void *parent,
     void *child);
@@ -55,6 +70,7 @@ static char *ngx_http_limit_conn_zone(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_limit_conn(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static ngx_int_t ngx_http_limit_conn_add_variables(ngx_conf_t *cf);
 static ngx_int_t ngx_http_limit_conn_init(ngx_conf_t *cf);
 
 
@@ -102,12 +118,19 @@ static ngx_command_t  ngx_http_limit_conn_commands[] = {
       offsetof(ngx_http_limit_conn_conf_t, status_code),
       &ngx_http_limit_conn_status_bounds },
 
+    { ngx_string("limit_conn_dry_run"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_limit_conn_conf_t, dry_run),
+      NULL },
+
       ngx_null_command
 };
 
 
 static ngx_http_module_t  ngx_http_limit_conn_module_ctx = {
-    NULL,                                  /* preconfiguration */
+    ngx_http_limit_conn_add_variables,     /* preconfiguration */
     ngx_http_limit_conn_init,              /* postconfiguration */
 
     NULL,                                  /* create main configuration */
@@ -137,6 +160,22 @@ ngx_module_t  ngx_http_limit_conn_module = {
 };
 
 
+static ngx_http_variable_t  ngx_http_limit_conn_vars[] = {
+
+    { ngx_string("limit_conn_status"), NULL,
+      ngx_http_limit_conn_status_variable, 0, NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+      ngx_http_null_variable
+};
+
+
+static ngx_str_t  ngx_http_limit_conn_status[] = {
+    ngx_string("PASSED"),
+    ngx_string("REJECTED"),
+    ngx_string("REJECTED_DRY_RUN")
+};
+
+
 static ngx_int_t
 ngx_http_limit_conn_handler(ngx_http_request_t *r)
 {
@@ -144,7 +183,6 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
     uint32_t                        hash;
     ngx_str_t                       key;
     ngx_uint_t                      i;
-    ngx_slab_pool_t                *shpool;
     ngx_rbtree_node_t              *node;
     ngx_pool_cleanup_t             *cln;
     ngx_http_limit_conn_ctx_t      *ctx;
@@ -153,7 +191,7 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
     ngx_http_limit_conn_limit_t    *limits;
     ngx_http_limit_conn_cleanup_t  *lccln;
 
-    if (r->main->limit_conn_set) {
+    if (r->main->limit_conn_status) {
         return NGX_DECLINED;
     }
 
@@ -179,15 +217,13 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
             continue;
         }
 
-        r->main->limit_conn_set = 1;
+        r->main->limit_conn_status = NGX_HTTP_LIMIT_CONN_PASSED;
 
         hash = ngx_crc32_short(key.data, key.len);
 
-        shpool = (ngx_slab_pool_t *) limits[i].shm_zone->shm.addr;
+        ngx_shmtx_lock(&ctx->shpool->mutex);
 
-        ngx_shmtx_lock(&shpool->mutex);
-
-        node = ngx_http_limit_conn_lookup(ctx->rbtree, &key, hash);
+        node = ngx_http_limit_conn_lookup(&ctx->sh->rbtree, &key, hash);
 
         if (node == NULL) {
 
@@ -195,11 +231,20 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
                 + offsetof(ngx_http_limit_conn_node_t, data)
                 + key.len;
 
-            node = ngx_slab_alloc_locked(shpool, n);
+            node = ngx_slab_alloc_locked(ctx->shpool, n);
 
             if (node == NULL) {
-                ngx_shmtx_unlock(&shpool->mutex);
+                ngx_shmtx_unlock(&ctx->shpool->mutex);
                 ngx_http_limit_conn_cleanup_all(r->pool);
+
+                if (lccf->dry_run) {
+                    r->main->limit_conn_status =
+                                          NGX_HTTP_LIMIT_CONN_REJECTED_DRY_RUN;
+                    return NGX_DECLINED;
+                }
+
+                r->main->limit_conn_status = NGX_HTTP_LIMIT_CONN_REJECTED;
+
                 return lccf->status_code;
             }
 
@@ -210,7 +255,7 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
             lc->conn = 1;
             ngx_memcpy(lc->data, key.data, key.len);
 
-            ngx_rbtree_insert(ctx->rbtree, node);
+            ngx_rbtree_insert(&ctx->sh->rbtree, node);
 
         } else {
 
@@ -218,13 +263,23 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
 
             if ((ngx_uint_t) lc->conn >= limits[i].conn) {
 
-                ngx_shmtx_unlock(&shpool->mutex);
+                ngx_shmtx_unlock(&ctx->shpool->mutex);
 
                 ngx_log_error(lccf->log_level, r->connection->log, 0,
-                              "limiting connections by zone \"%V\"",
+                              "limiting connections%s by zone \"%V\"",
+                              lccf->dry_run ? ", dry run," : "",
                               &limits[i].shm_zone->shm.name);
 
                 ngx_http_limit_conn_cleanup_all(r->pool);
+
+                if (lccf->dry_run) {
+                    r->main->limit_conn_status =
+                                          NGX_HTTP_LIMIT_CONN_REJECTED_DRY_RUN;
+                    return NGX_DECLINED;
+                }
+
+                r->main->limit_conn_status = NGX_HTTP_LIMIT_CONN_REJECTED;
+
                 return lccf->status_code;
             }
 
@@ -234,7 +289,7 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "limit conn: %08Xi %d", node->key, lc->conn);
 
-        ngx_shmtx_unlock(&shpool->mutex);
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
 
         cln = ngx_pool_cleanup_add(r->pool,
                                    sizeof(ngx_http_limit_conn_cleanup_t));
@@ -338,17 +393,15 @@ ngx_http_limit_conn_cleanup(void *data)
 {
     ngx_http_limit_conn_cleanup_t  *lccln = data;
 
-    ngx_slab_pool_t             *shpool;
     ngx_rbtree_node_t           *node;
     ngx_http_limit_conn_ctx_t   *ctx;
     ngx_http_limit_conn_node_t  *lc;
 
     ctx = lccln->shm_zone->data;
-    shpool = (ngx_slab_pool_t *) lccln->shm_zone->shm.addr;
     node = lccln->node;
     lc = (ngx_http_limit_conn_node_t *) &node->color;
 
-    ngx_shmtx_lock(&shpool->mutex);
+    ngx_shmtx_lock(&ctx->shpool->mutex);
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, lccln->shm_zone->shm.log, 0,
                    "limit conn cleanup: %08Xi %d", node->key, lc->conn);
@@ -356,11 +409,11 @@ ngx_http_limit_conn_cleanup(void *data)
     lc->conn--;
 
     if (lc->conn == 0) {
-        ngx_rbtree_delete(ctx->rbtree, node);
-        ngx_slab_free_locked(shpool, node);
+        ngx_rbtree_delete(&ctx->sh->rbtree, node);
+        ngx_slab_free_locked(ctx->shpool, node);
     }
 
-    ngx_shmtx_unlock(&shpool->mutex);
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
 }
 
 
@@ -386,8 +439,6 @@ ngx_http_limit_conn_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     ngx_http_limit_conn_ctx_t  *octx = data;
 
     size_t                      len;
-    ngx_slab_pool_t            *shpool;
-    ngx_rbtree_node_t          *sentinel;
     ngx_http_limit_conn_ctx_t  *ctx;
 
     ctx = shm_zone->data;
@@ -406,48 +457,63 @@ ngx_http_limit_conn_init_zone(ngx_shm_zone_t *shm_zone, void *data)
             return NGX_ERROR;
         }
 
-        ctx->rbtree = octx->rbtree;
+        ctx->sh = octx->sh;
+        ctx->shpool = octx->shpool;
 
         return NGX_OK;
     }
 
-    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+    ctx->shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
 
     if (shm_zone->shm.exists) {
-        ctx->rbtree = shpool->data;
+        ctx->sh = ctx->shpool->data;
 
         return NGX_OK;
     }
 
-    ctx->rbtree = ngx_slab_alloc(shpool, sizeof(ngx_rbtree_t));
-    if (ctx->rbtree == NULL) {
+    ctx->sh = ngx_slab_alloc(ctx->shpool, sizeof(ngx_http_limit_conn_shctx_t));
+    if (ctx->sh == NULL) {
         return NGX_ERROR;
     }
 
-    shpool->data = ctx->rbtree;
+    ctx->shpool->data = ctx->sh;
 
-    sentinel = ngx_slab_alloc(shpool, sizeof(ngx_rbtree_node_t));
-    if (sentinel == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_rbtree_init(ctx->rbtree, sentinel,
+    ngx_rbtree_init(&ctx->sh->rbtree, &ctx->sh->sentinel,
                     ngx_http_limit_conn_rbtree_insert_value);
 
     len = sizeof(" in limit_conn_zone \"\"") + shm_zone->shm.name.len;
 
-    shpool->log_ctx = ngx_slab_alloc(shpool, len);
-    if (shpool->log_ctx == NULL) {
+    ctx->shpool->log_ctx = ngx_slab_alloc(ctx->shpool, len);
+    if (ctx->shpool->log_ctx == NULL) {
         return NGX_ERROR;
     }
 
-    ngx_sprintf(shpool->log_ctx, " in limit_conn_zone \"%V\"%Z",
+    ngx_sprintf(ctx->shpool->log_ctx, " in limit_conn_zone \"%V\"%Z",
                 &shm_zone->shm.name);
 
     return NGX_OK;
 }
 
 
+static ngx_int_t
+ngx_http_limit_conn_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    if (r->main->limit_conn_status == 0) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->len = ngx_http_limit_conn_status[r->main->limit_conn_status - 1].len;
+    v->data = ngx_http_limit_conn_status[r->main->limit_conn_status - 1].data;
+
+    return NGX_OK;
+}
+
+
 static void *
 ngx_http_limit_conn_create_conf(ngx_conf_t *cf)
 {
@@ -466,6 +532,7 @@ ngx_http_limit_conn_create_conf(ngx_conf_t *cf)
 
     conf->log_level = NGX_CONF_UNSET_UINT;
     conf->status_code = NGX_CONF_UNSET_UINT;
+    conf->dry_run = NGX_CONF_UNSET;
 
     return conf;
 }
@@ -485,6 +552,8 @@ ngx_http_limit_conn_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_uint_value(conf->status_code, prev->status_code,
                               NGX_HTTP_SERVICE_UNAVAILABLE);
 
+    ngx_conf_merge_value(conf->dry_run, prev->dry_run, 0);
+
     return NGX_CONF_OK;
 }
 
@@ -651,6 +720,25 @@ ngx_http_limit_conn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static ngx_int_t
+ngx_http_limit_conn_add_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t  *var, *v;
+
+    for (v = ngx_http_limit_conn_vars; v->name.len; v++) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_limit_conn_init(ngx_conf_t *cf)
 {
diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c
index e81d57f..6bd3e6a 100644
--- a/src/http/modules/ngx_http_limit_req_module.c
+++ b/src/http/modules/ngx_http_limit_req_module.c
@@ -10,6 +10,13 @@
 #include <ngx_http.h>
 
 
+#define NGX_HTTP_LIMIT_REQ_PASSED            1
+#define NGX_HTTP_LIMIT_REQ_DELAYED           2
+#define NGX_HTTP_LIMIT_REQ_REJECTED          3
+#define NGX_HTTP_LIMIT_REQ_DELAYED_DRY_RUN   4
+#define NGX_HTTP_LIMIT_REQ_REJECTED_DRY_RUN  5
+
+
 typedef struct {
     u_char                       color;
     u_char                       dummy;
@@ -53,6 +60,7 @@ typedef struct {
     ngx_uint_t                   limit_log_level;
     ngx_uint_t                   delay_log_level;
     ngx_uint_t                   status_code;
+    ngx_flag_t                   dry_run;
 } ngx_http_limit_req_conf_t;
 
 
@@ -64,6 +72,8 @@ static ngx_msec_t ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits,
 static void ngx_http_limit_req_expire(ngx_http_limit_req_ctx_t *ctx,
     ngx_uint_t n);
 
+static ngx_int_t ngx_http_limit_req_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 static void *ngx_http_limit_req_create_conf(ngx_conf_t *cf);
 static char *ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent,
     void *child);
@@ -71,6 +81,7 @@ static char *ngx_http_limit_req_zone(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static ngx_int_t ngx_http_limit_req_add_variables(ngx_conf_t *cf);
 static ngx_int_t ngx_http_limit_req_init(ngx_conf_t *cf);
 
 
@@ -118,12 +129,19 @@ static ngx_command_t  ngx_http_limit_req_commands[] = {
       offsetof(ngx_http_limit_req_conf_t, status_code),
       &ngx_http_limit_req_status_bounds },
 
+    { ngx_string("limit_req_dry_run"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_limit_req_conf_t, dry_run),
+      NULL },
+
       ngx_null_command
 };
 
 
 static ngx_http_module_t  ngx_http_limit_req_module_ctx = {
-    NULL,                                  /* preconfiguration */
+    ngx_http_limit_req_add_variables,      /* preconfiguration */
     ngx_http_limit_req_init,               /* postconfiguration */
 
     NULL,                                  /* create main configuration */
@@ -153,6 +171,24 @@ ngx_module_t  ngx_http_limit_req_module = {
 };
 
 
+static ngx_http_variable_t  ngx_http_limit_req_vars[] = {
+
+    { ngx_string("limit_req_status"), NULL,
+      ngx_http_limit_req_status_variable, 0, NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+      ngx_http_null_variable
+};
+
+
+static ngx_str_t  ngx_http_limit_req_status[] = {
+    ngx_string("PASSED"),
+    ngx_string("DELAYED"),
+    ngx_string("REJECTED"),
+    ngx_string("DELAYED_DRY_RUN"),
+    ngx_string("REJECTED_DRY_RUN")
+};
+
+
 static ngx_int_t
 ngx_http_limit_req_handler(ngx_http_request_t *r)
 {
@@ -165,7 +201,7 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
     ngx_http_limit_req_conf_t   *lrcf;
     ngx_http_limit_req_limit_t  *limit, *limits;
 
-    if (r->main->limit_req_set) {
+    if (r->main->limit_req_status) {
         return NGX_DECLINED;
     }
 
@@ -224,15 +260,14 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
         return NGX_DECLINED;
     }
 
-    r->main->limit_req_set = 1;
-
     if (rc == NGX_BUSY || rc == NGX_ERROR) {
 
         if (rc == NGX_BUSY) {
             ngx_log_error(lrcf->limit_log_level, r->connection->log, 0,
-                          "limiting requests, excess: %ui.%03ui by zone \"%V\"",
-                          excess / 1000, excess % 1000,
-                          &limit->shm_zone->shm.name);
+                        "limiting requests%s, excess: %ui.%03ui by zone \"%V\"",
+                        lrcf->dry_run ? ", dry run" : "",
+                        excess / 1000, excess % 1000,
+                        &limit->shm_zone->shm.name);
         }
 
         while (n--) {
@@ -251,6 +286,13 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
             ctx->node = NULL;
         }
 
+        if (lrcf->dry_run) {
+            r->main->limit_req_status = NGX_HTTP_LIMIT_REQ_REJECTED_DRY_RUN;
+            return NGX_DECLINED;
+        }
+
+        r->main->limit_req_status = NGX_HTTP_LIMIT_REQ_REJECTED;
+
         return lrcf->status_code;
     }
 
@@ -263,13 +305,22 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
     delay = ngx_http_limit_req_account(limits, n, &excess, &limit);
 
     if (!delay) {
+        r->main->limit_req_status = NGX_HTTP_LIMIT_REQ_PASSED;
         return NGX_DECLINED;
     }
 
     ngx_log_error(lrcf->delay_log_level, r->connection->log, 0,
-                  "delaying request, excess: %ui.%03ui, by zone \"%V\"",
+                  "delaying request%s, excess: %ui.%03ui, by zone \"%V\"",
+                  lrcf->dry_run ? ", dry run" : "",
                   excess / 1000, excess % 1000, &limit->shm_zone->shm.name);
 
+    if (lrcf->dry_run) {
+        r->main->limit_req_status = NGX_HTTP_LIMIT_REQ_DELAYED_DRY_RUN;
+        return NGX_DECLINED;
+    }
+
+    r->main->limit_req_status = NGX_HTTP_LIMIT_REQ_DELAYED;
+
     if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -693,6 +744,25 @@ ngx_http_limit_req_init_zone(ngx_shm_zone_t *shm_zone, void *data)
 }
 
 
+static ngx_int_t
+ngx_http_limit_req_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    if (r->main->limit_req_status == 0) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->len = ngx_http_limit_req_status[r->main->limit_req_status - 1].len;
+    v->data = ngx_http_limit_req_status[r->main->limit_req_status - 1].data;
+
+    return NGX_OK;
+}
+
+
 static void *
 ngx_http_limit_req_create_conf(ngx_conf_t *cf)
 {
@@ -711,6 +781,7 @@ ngx_http_limit_req_create_conf(ngx_conf_t *cf)
 
     conf->limit_log_level = NGX_CONF_UNSET_UINT;
     conf->status_code = NGX_CONF_UNSET_UINT;
+    conf->dry_run = NGX_CONF_UNSET;
 
     return conf;
 }
@@ -735,6 +806,8 @@ ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_uint_value(conf->status_code, prev->status_code,
                               NGX_HTTP_SERVICE_UNAVAILABLE);
 
+    ngx_conf_merge_value(conf->dry_run, prev->dry_run, 0);
+
     return NGX_CONF_OK;
 }
 
@@ -974,6 +1047,25 @@ ngx_http_limit_req(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static ngx_int_t
+ngx_http_limit_req_add_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t  *var, *v;
+
+    for (v = ngx_http_limit_req_vars; v->name.len; v++) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_limit_req_init(ngx_conf_t *cf)
 {
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 618bf78..c1006ab 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -3116,6 +3116,13 @@ ngx_http_mp4_update_stsz_atom(ngx_http_mp4_file_t *mp4,
                        "chunk samples sizes:%uL",
                        trak->start_chunk_samples_size);
 
+        if (trak->start_chunk_samples_size > (uint64_t) mp4->end) {
+            ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                          "too large mp4 start samples size in \"%s\"",
+                          mp4->file.name.data);
+            return NGX_ERROR;
+        }
+
         if (mp4->length) {
             if (trak->end_sample - trak->start_sample > entries) {
                 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
@@ -3135,6 +3142,13 @@ ngx_http_mp4_update_stsz_atom(ngx_http_mp4_file_t *mp4,
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
                            "mp4 stsz end_chunk_samples_size:%uL",
                            trak->end_chunk_samples_size);
+
+            if (trak->end_chunk_samples_size > (uint64_t) mp4->end) {
+                ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                              "too large mp4 end samples size in \"%s\"",
+                              mp4->file.name.data);
+                return NGX_ERROR;
+            }
         }
 
         atom_size = sizeof(ngx_mp4_stsz_atom_t) + (data->last - data->pos);
@@ -3226,6 +3240,7 @@ ngx_http_mp4_update_stco_atom(ngx_http_mp4_file_t *mp4,
 {
     size_t                atom_size;
     uint32_t              entries;
+    uint64_t              chunk_offset, samples_size;
     ngx_buf_t            *atom, *data;
     ngx_mp4_stco_atom_t  *stco_atom;
 
@@ -3256,8 +3271,19 @@ ngx_http_mp4_update_stco_atom(ngx_http_mp4_file_t *mp4,
 
     data->pos += trak->start_chunk * sizeof(uint32_t);
 
-    trak->start_offset = ngx_mp4_get_32value(data->pos);
-    trak->start_offset += trak->start_chunk_samples_size;
+    chunk_offset = ngx_mp4_get_32value(data->pos);
+    samples_size = trak->start_chunk_samples_size;
+
+    if (chunk_offset > (uint64_t) mp4->end - samples_size
+        || chunk_offset + samples_size > NGX_MAX_UINT32_VALUE)
+    {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "too large chunk offset in \"%s\"",
+                      mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
+    trak->start_offset = chunk_offset + samples_size;
     ngx_mp4_set_32value(data->pos, trak->start_offset);
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
@@ -3276,9 +3302,19 @@ ngx_http_mp4_update_stco_atom(ngx_http_mp4_file_t *mp4,
         data->last = data->pos + entries * sizeof(uint32_t);
 
         if (entries) {
-            trak->end_offset =
-                            ngx_mp4_get_32value(data->last - sizeof(uint32_t));
-            trak->end_offset += trak->end_chunk_samples_size;
+            chunk_offset = ngx_mp4_get_32value(data->last - sizeof(uint32_t));
+            samples_size = trak->end_chunk_samples_size;
+
+            if (chunk_offset > (uint64_t) mp4->end - samples_size
+                || chunk_offset + samples_size > NGX_MAX_UINT32_VALUE)
+            {
+                ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                              "too large chunk offset in \"%s\"",
+                              mp4->file.name.data);
+                return NGX_ERROR;
+            }
+
+            trak->end_offset = chunk_offset + samples_size;
 
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
                            "end chunk offset:%O", trak->end_offset);
@@ -3409,7 +3445,7 @@ ngx_http_mp4_update_co64_atom(ngx_http_mp4_file_t *mp4,
     ngx_http_mp4_trak_t *trak)
 {
     size_t                atom_size;
-    uint64_t              entries;
+    uint64_t              entries, chunk_offset, samples_size;
     ngx_buf_t            *atom, *data;
     ngx_mp4_co64_atom_t  *co64_atom;
 
@@ -3440,8 +3476,17 @@ ngx_http_mp4_update_co64_atom(ngx_http_mp4_file_t *mp4,
 
     data->pos += trak->start_chunk * sizeof(uint64_t);
 
-    trak->start_offset = ngx_mp4_get_64value(data->pos);
-    trak->start_offset += trak->start_chunk_samples_size;
+    chunk_offset = ngx_mp4_get_64value(data->pos);
+    samples_size = trak->start_chunk_samples_size;
+
+    if (chunk_offset > (uint64_t) mp4->end - samples_size) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "too large chunk offset in \"%s\"",
+                      mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
+    trak->start_offset = chunk_offset + samples_size;
     ngx_mp4_set_64value(data->pos, trak->start_offset);
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
@@ -3460,9 +3505,17 @@ ngx_http_mp4_update_co64_atom(ngx_http_mp4_file_t *mp4,
         data->last = data->pos + entries * sizeof(uint64_t);
 
         if (entries) {
-            trak->end_offset =
-                            ngx_mp4_get_64value(data->last - sizeof(uint64_t));
-            trak->end_offset += trak->end_chunk_samples_size;
+            chunk_offset = ngx_mp4_get_64value(data->last - sizeof(uint64_t));
+            samples_size = trak->end_chunk_samples_size;
+
+            if (chunk_offset > (uint64_t) mp4->end - samples_size) {
+                ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                              "too large chunk offset in \"%s\"",
+                              mp4->file.name.data);
+                return NGX_ERROR;
+            }
+
+            trak->end_offset = chunk_offset + samples_size;
 
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
                            "end chunk offset:%O", trak->end_offset);
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index 819c5c9..ae08ebb 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -700,8 +700,9 @@ ngx_http_range_singlepart_body(ngx_http_request_t *r,
     ngx_http_range_filter_ctx_t *ctx, ngx_chain_t *in)
 {
     off_t              start, last;
+    ngx_int_t          rc;
     ngx_buf_t         *buf;
-    ngx_chain_t       *out, *cl, **ll;
+    ngx_chain_t       *out, *cl, *tl, **ll;
     ngx_http_range_t  *range;
 
     out = NULL;
@@ -721,8 +722,22 @@ ngx_http_range_singlepart_body(ngx_http_request_t *r,
                        "http range body buf: %O-%O", start, last);
 
         if (ngx_buf_special(buf)) {
-            *ll = cl;
-            ll = &cl->next;
+
+            if (range->end <= start) {
+                continue;
+            }
+
+            tl = ngx_alloc_chain_link(r->pool);
+            if (tl == NULL) {
+                return NGX_ERROR;
+            }
+
+            tl->buf = buf;
+            tl->next = NULL;
+
+            *ll = tl;
+            ll = &tl->next;
+
             continue;
         }
 
@@ -764,21 +779,42 @@ ngx_http_range_singlepart_body(ngx_http_request_t *r,
 
             buf->last_buf = (r == r->main) ? 1 : 0;
             buf->last_in_chain = 1;
-            *ll = cl;
-            cl->next = NULL;
 
-            break;
+            tl = ngx_alloc_chain_link(r->pool);
+            if (tl == NULL) {
+                return NGX_ERROR;
+            }
+
+            tl->buf = buf;
+            tl->next = NULL;
+
+            *ll = tl;
+            ll = &tl->next;
+
+            continue;
         }
 
-        *ll = cl;
-        ll = &cl->next;
+        tl = ngx_alloc_chain_link(r->pool);
+        if (tl == NULL) {
+            return NGX_ERROR;
+        }
+
+        tl->buf = buf;
+        tl->next = NULL;
+
+        *ll = tl;
+        ll = &tl->next;
     }
 
-    if (out == NULL) {
-        return NGX_OK;
+    rc = ngx_http_next_body_filter(r, out);
+
+    while (out) {
+        cl = out;
+        out = out->next;
+        ngx_free_chain(r->pool, cl);
     }
 
-    return ngx_http_next_body_filter(r, out);
+    return rc;
 }
 
 
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index 7d3f2a9..9586ebe 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -180,12 +180,11 @@ ngx_http_realip_handler(ngx_http_request_t *r)
 
     case NGX_HTTP_REALIP_PROXY:
 
-        value = &r->connection->proxy_protocol_addr;
-
-        if (value->len == 0) {
+        if (r->connection->proxy_protocol == NULL) {
             return NGX_DECLINED;
         }
 
+        value = &r->connection->proxy_protocol->src_addr;
         xfwd = NULL;
 
         break;
@@ -238,7 +237,7 @@ found:
         != NGX_DECLINED)
     {
         if (rlcf->type == NGX_HTTP_REALIP_PROXY) {
-            ngx_inet_set_port(addr.sockaddr, c->proxy_protocol_port);
+            ngx_inet_set_port(addr.sockaddr, c->proxy_protocol->src_port);
         }
 
         return ngx_http_realip_set_addr(r, &addr);
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index 3b49c45..0e6d4df 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -318,6 +318,11 @@ ngx_http_rewrite(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     value = cf->args->elts;
 
+    if (value[2].len == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "empty replacement");
+        return NGX_CONF_ERROR;
+    }
+
     ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
 
     rc.pattern = value[1];
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index d608df9..6737965 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -1254,9 +1254,9 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx)
             case '-':
                 state = ssi_error_end0_state;
 
-                ctx->param->key.data[ctx->param->key.len++] = ch;
                 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                              "invalid \"%V\" parameter in \"%V\" SSI command",
+                              "unexpected \"-\" symbol after \"%V\" "
+                              "parameter in \"%V\" SSI command",
                               &ctx->param->key, &ctx->command);
                 break;
 
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index b3f8f47..495e628 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -777,7 +777,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
         if (conf->client_certificate.len == 0 && conf->verify != 3) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no ssl_client_certificate for ssl_client_verify");
+                          "no ssl_client_certificate for ssl_verify_client");
             return NGX_CONF_ERROR;
         }
 
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index 0e16c05..282d6ee 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -157,8 +157,8 @@ ngx_http_static_handler(ngx_http_request_t *r)
 
         len = r->uri.len + 1;
 
-        if (!clcf->alias && clcf->root_lengths == NULL && r->args.len == 0) {
-            location = path.data + clcf->root.len;
+        if (!clcf->alias && r->args.len == 0) {
+            location = path.data + root;
 
             *last = '/';
 
diff --git a/src/http/modules/ngx_http_upstream_hash_module.c b/src/http/modules/ngx_http_upstream_hash_module.c
index 6c247b5..e741eb2 100644
--- a/src/http/modules/ngx_http_upstream_hash_module.c
+++ b/src/http/modules/ngx_http_upstream_hash_module.c
@@ -178,7 +178,7 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
 
     ngx_http_upstream_rr_peers_rlock(hp->rrp.peers);
 
-    if (hp->tries > 20 || hp->rrp.peers->single) {
+    if (hp->tries > 20 || hp->rrp.peers->single || hp->key.len == 0) {
         ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
         return hp->get_rr_peer(pc, &hp->rrp);
     }
@@ -509,7 +509,7 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
 
     ngx_http_upstream_rr_peers_wlock(hp->rrp.peers);
 
-    if (hp->tries > 20 || hp->rrp.peers->single) {
+    if (hp->tries > 20 || hp->rrp.peers->single || hp->key.len == 0) {
         ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
         return hp->get_rr_peer(pc, &hp->rrp);
     }
diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index bdc4ae5..1560807 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -275,6 +275,7 @@ found:
 
     c->idle = 0;
     c->sent = 0;
+    c->data = NULL;
     c->log = pc->log;
     c->read->log = pc->log;
     c->write->log = pc->log;
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index ea7ce2a..b2f107d 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -628,7 +628,7 @@ static ngx_int_t
 ngx_http_xslt_params(ngx_http_request_t *r, ngx_http_xslt_filter_ctx_t *ctx,
     ngx_array_t *params, ngx_uint_t final)
 {
-    u_char                 *p, *last, *value, *dst, *src, **s;
+    u_char                 *p, *value, *dst, *src, **s;
     size_t                  len;
     ngx_uint_t              i;
     ngx_str_t               string;
@@ -698,8 +698,6 @@ ngx_http_xslt_params(ngx_http_request_t *r, ngx_http_xslt_filter_ctx_t *ctx,
             ngx_memcpy(p, string.data, string.len + 1);
         }
 
-        last = p + string.len;
-
         while (p && *p) {
 
             value = p;
@@ -729,7 +727,7 @@ ngx_http_xslt_params(ngx_http_request_t *r, ngx_http_xslt_filter_ctx_t *ctx,
                 *p++ = '\0';
 
             } else {
-                len = last - value;
+                len = ngx_strlen(value);
             }
 
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs
index ad12632..caf7c08 100644
--- a/src/http/modules/perl/nginx.xs
+++ b/src/http/modules/perl/nginx.xs
@@ -15,8 +15,10 @@
 #include "XSUB.h"
 
 
-#define ngx_http_perl_set_request(r)                                          \
-    r = INT2PTR(ngx_http_request_t *, SvIV((SV *) SvRV(ST(0))))
+#define ngx_http_perl_set_request(r, ctx)                                     \
+                                                                              \
+    ctx = INT2PTR(ngx_http_perl_ctx_t *, SvIV((SV *) SvRV(ST(0))));           \
+    r = ctx->request
 
 
 #define ngx_http_perl_set_targ(p, len)                                        \
@@ -64,14 +66,12 @@ ngx_http_perl_sv2str(pTHX_ ngx_http_request_t *r, ngx_str_t *s, SV *sv)
 
 
 static ngx_int_t
-ngx_http_perl_output(ngx_http_request_t *r, ngx_buf_t *b)
+ngx_http_perl_output(ngx_http_request_t *r, ngx_http_perl_ctx_t *ctx,
+    ngx_buf_t *b)
 {
-    ngx_chain_t           out;
+    ngx_chain_t   out;
 #if (NGX_HTTP_SSI)
-    ngx_chain_t          *cl;
-    ngx_http_perl_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module);
+    ngx_chain_t  *cl;
 
     if (ctx->ssi) {
         cl = ngx_alloc_chain_link(r->pool);
@@ -105,9 +105,14 @@ void
 status(r, code)
     CODE:
 
-    ngx_http_request_t  *r;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->variable) {
+        croak("status(): cannot be used in variable handler");
+    }
 
     r->headers_out.status = SvIV(ST(1));
 
@@ -121,10 +126,28 @@ void
 send_http_header(r, ...)
     CODE:
 
-    ngx_http_request_t  *r;
-    SV                  *sv;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
+    SV                   *sv;
+    ngx_int_t             rc;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->error) {
+        croak("send_http_header(): called after error");
+    }
+
+    if (ctx->variable) {
+        croak("send_http_header(): cannot be used in variable handler");
+    }
+
+    if (ctx->header_sent) {
+        croak("send_http_header(): header already sent");
+    }
+
+    if (ctx->redirect_uri.len) {
+        croak("send_http_header(): cannot be used with internal_redirect()");
+    }
 
     if (r->headers_out.status == 0) {
         r->headers_out.status = NGX_HTTP_OK;
@@ -136,18 +159,30 @@ send_http_header(r, ...)
         if (ngx_http_perl_sv2str(aTHX_ r, &r->headers_out.content_type, sv)
             != NGX_OK)
         {
-            XSRETURN_EMPTY;
+            ctx->error = 1;
+            croak("ngx_http_perl_sv2str() failed");
         }
 
         r->headers_out.content_type_len = r->headers_out.content_type.len;
 
     } else {
         if (ngx_http_set_content_type(r) != NGX_OK) {
-            XSRETURN_EMPTY;
+            ctx->error = 1;
+            croak("ngx_http_set_content_type() failed");
         }
     }
 
-    (void) ngx_http_send_header(r);
+    ctx->header_sent = 1;
+
+    r->disable_not_modified = 1;
+
+    rc = ngx_http_send_header(r);
+
+    if (rc == NGX_ERROR || rc > NGX_OK) {
+        ctx->error = 1;
+        ctx->status = rc;
+        croak("ngx_http_send_header() failed");
+    }
 
 
 void
@@ -155,9 +190,10 @@ header_only(r)
     CODE:
 
     dXSTARG;
-    ngx_http_request_t  *r;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
 
     sv_upgrade(TARG, SVt_IV);
     sv_setiv(TARG, r->header_only);
@@ -170,9 +206,10 @@ uri(r)
     CODE:
 
     dXSTARG;
-    ngx_http_request_t  *r;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
     ngx_http_perl_set_targ(r->uri.data, r->uri.len);
 
     ST(0) = TARG;
@@ -183,9 +220,10 @@ args(r)
     CODE:
 
     dXSTARG;
-    ngx_http_request_t  *r;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
     ngx_http_perl_set_targ(r->args.data, r->args.len);
 
     ST(0) = TARG;
@@ -196,9 +234,10 @@ request_method(r)
     CODE:
 
     dXSTARG;
-    ngx_http_request_t  *r;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
     ngx_http_perl_set_targ(r->method_name.data, r->method_name.len);
 
     ST(0) = TARG;
@@ -209,9 +248,10 @@ remote_addr(r)
     CODE:
 
     dXSTARG;
-    ngx_http_request_t  *r;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
     ngx_http_perl_set_targ(r->connection->addr_text.data,
                            r->connection->addr_text.len);
 
@@ -224,6 +264,7 @@ header_in(r, key)
 
     dXSTARG;
     ngx_http_request_t         *r;
+    ngx_http_perl_ctx_t        *ctx;
     SV                         *key;
     u_char                     *p, *lowcase_key, *value, sep;
     STRLEN                      len;
@@ -235,7 +276,7 @@ header_in(r, key)
     ngx_http_header_t          *hh;
     ngx_http_core_main_conf_t  *cmcf;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
 
     key = ST(1);
 
@@ -249,7 +290,8 @@ header_in(r, key)
 
     lowcase_key = ngx_pnalloc(r->pool, len);
     if (lowcase_key == NULL) {
-        XSRETURN_UNDEF;
+        ctx->error = 1;
+        croak("ngx_pnalloc() failed");
     }
 
     hash = ngx_hash_strlow(lowcase_key, p, len);
@@ -309,7 +351,8 @@ header_in(r, key)
 
         value = ngx_pnalloc(r->pool, size);
         if (value == NULL) {
-            XSRETURN_UNDEF;
+            ctx->error = 1;
+            croak("ngx_pnalloc() failed");
         }
 
         p = value;
@@ -371,14 +414,22 @@ has_request_body(r, next)
     dXSTARG;
     ngx_http_request_t   *r;
     ngx_http_perl_ctx_t  *ctx;
+    ngx_int_t             rc;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->variable) {
+        croak("has_request_body(): cannot be used in variable handler");
+    }
+
+    if (ctx->next) {
+        croak("has_request_body(): another handler active");
+    }
 
     if (r->headers_in.content_length_n <= 0 && !r->headers_in.chunked) {
         XSRETURN_UNDEF;
     }
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module);
     ctx->next = SvRV(ST(1));
 
     r->request_body_in_single_buf = 1;
@@ -389,7 +440,14 @@ has_request_body(r, next)
         r->request_body_file_log_level = 0;
     }
 
-    ngx_http_read_client_request_body(r, ngx_http_perl_handle_request);
+    rc = ngx_http_read_client_request_body(r, ngx_http_perl_handle_request);
+
+    if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+        ctx->error = 1;
+        ctx->status = rc;
+        ctx->next = NULL;
+        croak("ngx_http_read_client_request_body() failed");
+    }
 
     sv_upgrade(TARG, SVt_IV);
     sv_setiv(TARG, 1);
@@ -402,13 +460,14 @@ request_body(r)
     CODE:
 
     dXSTARG;
-    ngx_http_request_t  *r;
-    u_char              *p, *data;
-    size_t               len;
-    ngx_buf_t           *buf;
-    ngx_chain_t         *cl;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
+    u_char               *p, *data;
+    size_t                len;
+    ngx_buf_t            *buf;
+    ngx_chain_t          *cl;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
 
     if (r->request_body == NULL
         || r->request_body->temp_file
@@ -436,7 +495,8 @@ request_body(r)
 
     p = ngx_pnalloc(r->pool, len);
     if (p == NULL) {
-        XSRETURN_UNDEF;
+        ctx->error = 1;
+        croak("ngx_pnalloc() failed");
     }
 
     data = p;
@@ -463,9 +523,10 @@ request_body_file(r)
     CODE:
 
     dXSTARG;
-    ngx_http_request_t  *r;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
 
     if (r->request_body == NULL || r->request_body->temp_file == NULL) {
         XSRETURN_UNDEF;
@@ -481,42 +542,66 @@ void
 discard_request_body(r)
     CODE:
 
-    ngx_http_request_t  *r;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
+    ngx_int_t             rc;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
 
-    ngx_http_discard_request_body(r);
+    if (ctx->variable) {
+        croak("discard_request_body(): cannot be used in variable handler");
+    }
+
+    rc = ngx_http_discard_request_body(r);
+
+    if (rc != NGX_OK) {
+        ctx->error = 1;
+        ctx->status = rc;
+        croak("ngx_http_discard_request_body() failed");
+    }
 
 
 void
 header_out(r, key, value)
     CODE:
 
-    ngx_http_request_t  *r;
-    SV                  *key;
-    SV                  *value;
-    ngx_table_elt_t     *header;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
+    SV                   *key;
+    SV                   *value;
+    ngx_table_elt_t      *header;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->error) {
+        croak("header_out(): called after error");
+    }
+
+    if (ctx->variable) {
+        croak("header_out(): cannot be used in variable handler");
+    }
 
     key = ST(1);
     value = ST(2);
 
     header = ngx_list_push(&r->headers_out.headers);
     if (header == NULL) {
-        XSRETURN_EMPTY;
+        ctx->error = 1;
+        croak("ngx_list_push() failed");
     }
 
     header->hash = 1;
 
     if (ngx_http_perl_sv2str(aTHX_ r, &header->key, key) != NGX_OK) {
         header->hash = 0;
-        XSRETURN_EMPTY;
+        ctx->error = 1;
+        croak("ngx_http_perl_sv2str() failed");
     }
 
     if (ngx_http_perl_sv2str(aTHX_ r, &header->value, value) != NGX_OK) {
         header->hash = 0;
-        XSRETURN_EMPTY;
+        ctx->error = 1;
+        croak("ngx_http_perl_sv2str() failed");
     }
 
     if (header->key.len == sizeof("Content-Length") - 1
@@ -540,19 +625,19 @@ filename(r)
     CODE:
 
     dXSTARG;
-    size_t                root;
     ngx_http_request_t   *r;
     ngx_http_perl_ctx_t  *ctx;
+    size_t                root;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module);
     if (ctx->filename.data) {
         goto done;
     }
 
     if (ngx_http_map_uri_to_path(r, &ctx->filename, &root, 0) == NULL) {
-        XSRETURN_UNDEF;
+        ctx->error = 1;
+        croak("ngx_http_map_uri_to_path() failed");
     }
 
     ctx->filename.len--;
@@ -569,15 +654,29 @@ void
 print(r, ...)
     CODE:
 
-    ngx_http_request_t  *r;
-    SV                  *sv;
-    int                  i;
-    u_char              *p;
-    size_t               size;
-    STRLEN               len;
-    ngx_buf_t           *b;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
+    SV                   *sv;
+    int                   i;
+    u_char               *p;
+    size_t                size;
+    STRLEN                len;
+    ngx_int_t             rc;
+    ngx_buf_t            *b;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->error) {
+        croak("print(): called after error");
+    }
+
+    if (ctx->variable) {
+        croak("print(): cannot be used in variable handler");
+    }
+
+    if (!ctx->header_sent) {
+        croak("print(): header not sent");
+    }
 
     if (items == 2) {
 
@@ -602,7 +701,8 @@ print(r, ...)
 
             b = ngx_calloc_buf(r->pool);
             if (b == NULL) {
-                XSRETURN_EMPTY;
+                ctx->error = 1;
+                croak("ngx_calloc_buf() failed");
             }
 
             b->memory = 1;
@@ -642,7 +742,8 @@ print(r, ...)
 
     b = ngx_create_temp_buf(r->pool, size);
     if (b == NULL) {
-        XSRETURN_EMPTY;
+        ctx->error = 1;
+        croak("ngx_create_temp_buf() failed");
     }
 
     for (i = 1; i < items; i++) {
@@ -658,7 +759,12 @@ print(r, ...)
 
     out:
 
-    (void) ngx_http_perl_output(r, b);
+    rc = ngx_http_perl_output(r, ctx, b);
+
+    if (rc == NGX_ERROR) {
+        ctx->error = 1;
+        croak("ngx_http_perl_output() failed");
+    }
 
 
 void
@@ -666,15 +772,29 @@ sendfile(r, filename, offset = -1, bytes = 0)
     CODE:
 
     ngx_http_request_t        *r;
+    ngx_http_perl_ctx_t       *ctx;
     char                      *filename;
     off_t                      offset;
     size_t                     bytes;
+    ngx_int_t                  rc;
     ngx_str_t                  path;
     ngx_buf_t                 *b;
     ngx_open_file_info_t       of;
     ngx_http_core_loc_conf_t  *clcf;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->error) {
+        croak("sendfile(): called after error");
+    }
+
+    if (ctx->variable) {
+        croak("sendfile(): cannot be used in variable handler");
+    }
+
+    if (!ctx->header_sent) {
+        croak("sendfile(): header not sent");
+    }
 
     filename = SvPV_nolen(ST(1));
 
@@ -687,19 +807,22 @@ sendfile(r, filename, offset = -1, bytes = 0)
 
     b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
-        XSRETURN_EMPTY;
+        ctx->error = 1;
+        croak("ngx_calloc_buf() failed");
     }
 
     b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t));
     if (b->file == NULL) {
-        XSRETURN_EMPTY;
+        ctx->error = 1;
+        croak("ngx_pcalloc() failed");
     }
 
     path.len = ngx_strlen(filename);
 
     path.data = ngx_pnalloc(r->pool, path.len + 1);
     if (path.data == NULL) {
-        XSRETURN_EMPTY;
+        ctx->error = 1;
+        croak("ngx_pnalloc() failed");
     }
 
     (void) ngx_cpystrn(path.data, (u_char *) filename, path.len + 1);
@@ -716,19 +839,23 @@ sendfile(r, filename, offset = -1, bytes = 0)
     of.events = clcf->open_file_cache_events;
 
     if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) {
-        XSRETURN_EMPTY;
+        ctx->error = 1;
+        croak("ngx_http_set_disable_symlinks() failed");
     }
 
     if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool)
         != NGX_OK)
     {
         if (of.err == 0) {
-            XSRETURN_EMPTY;
+            ctx->error = 1;
+            croak("ngx_open_cached_file() failed");
         }
 
         ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
                       "%s \"%s\" failed", of.failed, filename);
-        XSRETURN_EMPTY;
+
+        ctx->error = 1;
+        croak("ngx_open_cached_file() failed");
     }
 
     if (offset == -1) {
@@ -748,28 +875,53 @@ sendfile(r, filename, offset = -1, bytes = 0)
     b->file->log = r->connection->log;
     b->file->directio = of.is_directio;
 
-    (void) ngx_http_perl_output(r, b);
+    rc = ngx_http_perl_output(r, ctx, b);
+
+    if (rc == NGX_ERROR) {
+        ctx->error = 1;
+        croak("ngx_http_perl_output() failed");
+    }
 
 
 void
 flush(r)
     CODE:
 
-    ngx_http_request_t  *r;
-    ngx_buf_t           *b;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
+    ngx_int_t             rc;
+    ngx_buf_t            *b;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->error) {
+        croak("flush(): called after error");
+    }
+
+    if (ctx->variable) {
+        croak("flush(): cannot be used in variable handler");
+    }
+
+    if (!ctx->header_sent) {
+        croak("flush(): header not sent");
+    }
 
     b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
-        XSRETURN_EMPTY;
+        ctx->error = 1;
+        croak("ngx_calloc_buf() failed");
     }
 
     b->flush = 1;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "$r->flush");
 
-    (void) ngx_http_perl_output(r, b);
+    rc = ngx_http_perl_output(r, ctx, b);
+
+    if (rc == NGX_ERROR) {
+        ctx->error = 1;
+        croak("ngx_http_perl_output() failed");
+    }
 
     XSRETURN_EMPTY;
 
@@ -779,29 +931,24 @@ internal_redirect(r, uri)
     CODE:
 
     ngx_http_request_t   *r;
-    SV                   *uri;
-    ngx_uint_t            i;
     ngx_http_perl_ctx_t  *ctx;
+    SV                   *uri;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->variable) {
+        croak("internal_redirect(): cannot be used in variable handler");
+    }
+
+    if (ctx->header_sent) {
+        croak("internal_redirect(): header already sent");
+    }
 
     uri = ST(1);
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module);
-
     if (ngx_http_perl_sv2str(aTHX_ r, &ctx->redirect_uri, uri) != NGX_OK) {
-        XSRETURN_EMPTY;
-    }
-
-    for (i = 0; i < ctx->redirect_uri.len; i++) {
-        if (ctx->redirect_uri.data[i] == '?') {
-
-            ctx->redirect_args.len = ctx->redirect_uri.len - (i + 1);
-            ctx->redirect_args.data = &ctx->redirect_uri.data[i + 1];
-            ctx->redirect_uri.len = i;
-
-            XSRETURN_EMPTY;
-        }
+        ctx->error = 1;
+        croak("ngx_http_perl_sv2str() failed");
     }
 
 
@@ -809,9 +956,14 @@ void
 allow_ranges(r)
     CODE:
 
-    ngx_http_request_t  *r;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->variable) {
+        croak("allow_ranges(): cannot be used in variable handler");
+    }
 
     r->allow_ranges = 1;
 
@@ -821,13 +973,14 @@ unescape(r, text, type = 0)
     CODE:
 
     dXSTARG;
-    ngx_http_request_t  *r;
-    SV                  *text;
-    int                  type;
-    u_char              *p, *dst, *src;
-    STRLEN               len;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
+    SV                   *text;
+    int                   type;
+    u_char               *p, *dst, *src;
+    STRLEN                len;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
 
     text = ST(1);
 
@@ -835,7 +988,8 @@ unescape(r, text, type = 0)
 
     p = ngx_pnalloc(r->pool, len + 1);
     if (p == NULL) {
-        XSRETURN_UNDEF;
+        ctx->error = 1;
+        croak("ngx_pnalloc() failed");
     }
 
     dst = p;
@@ -856,16 +1010,16 @@ variable(r, name, value = NULL)
 
     dXSTARG;
     ngx_http_request_t         *r;
+    ngx_http_perl_ctx_t        *ctx;
     SV                         *name, *value;
     u_char                     *p, *lowcase;
     STRLEN                      len;
     ngx_str_t                   var, val;
     ngx_uint_t                  i, hash;
     ngx_http_perl_var_t        *v;
-    ngx_http_perl_ctx_t        *ctx;
     ngx_http_variable_value_t  *vv;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
 
     name = ST(1);
 
@@ -884,7 +1038,8 @@ variable(r, name, value = NULL)
         }
 
         if (ngx_http_perl_sv2str(aTHX_ r, &val, value) != NGX_OK) {
-            XSRETURN_UNDEF;
+            ctx->error = 1;
+            croak("ngx_http_perl_sv2str() failed");
         }
     }
 
@@ -892,7 +1047,8 @@ variable(r, name, value = NULL)
 
     lowcase = ngx_pnalloc(r->pool, len);
     if (lowcase == NULL) {
-        XSRETURN_UNDEF;
+        ctx->error = 1;
+        croak("ngx_pnalloc() failed");
     }
 
     hash = ngx_hash_strlow(lowcase, p, len);
@@ -912,13 +1068,12 @@ variable(r, name, value = NULL)
 
     vv = ngx_http_get_variable(r, &var, hash);
     if (vv == NULL) {
-        XSRETURN_UNDEF;
+        ctx->error = 1;
+        croak("ngx_http_get_variable() failed");
     }
 
     if (vv->not_found) {
 
-        ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module);
-
         if (ctx->variables) {
 
             v = ctx->variables->elts;
@@ -947,13 +1102,15 @@ variable(r, name, value = NULL)
                 ctx->variables = ngx_array_create(r->pool, 1,
                                                   sizeof(ngx_http_perl_var_t));
                 if (ctx->variables == NULL) {
-                    XSRETURN_UNDEF;
+                    ctx->error = 1;
+                    croak("ngx_array_create() failed");
                 }
             }
 
             v = ngx_array_push(ctx->variables);
             if (v == NULL) {
-                XSRETURN_UNDEF;
+                ctx->error = 1;
+                croak("ngx_array_push() failed");
             }
 
             v->hash = hash;
@@ -989,18 +1146,24 @@ sleep(r, sleep, next)
     CODE:
 
     ngx_http_request_t   *r;
-    ngx_msec_t            sleep;
     ngx_http_perl_ctx_t  *ctx;
+    ngx_msec_t            sleep;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
+
+    if (ctx->variable) {
+        croak("sleep(): cannot be used in variable handler");
+    }
+
+    if (ctx->next) {
+        croak("sleep(): another handler active");
+    }
 
     sleep = (ngx_msec_t) SvIV(ST(1));
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "perl sleep: %M", sleep);
 
-    ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module);
-
     ctx->next = SvRV(ST(2));
 
     r->connection->write->delayed = 1;
@@ -1014,13 +1177,14 @@ void
 log_error(r, err, msg)
     CODE:
 
-    ngx_http_request_t  *r;
-    SV                  *err, *msg;
-    u_char              *p;
-    STRLEN               len;
-    ngx_err_t            e;
+    ngx_http_request_t   *r;
+    ngx_http_perl_ctx_t  *ctx;
+    SV                   *err, *msg;
+    u_char               *p;
+    STRLEN                len;
+    ngx_err_t             e;
 
-    ngx_http_perl_set_request(r);
+    ngx_http_perl_set_request(r, ctx);
 
     err = ST(1);
 
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index 6d3be91..f3fc629 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -43,7 +43,8 @@ static PerlInterpreter *ngx_http_perl_create_interpreter(ngx_conf_t *cf,
 static ngx_int_t ngx_http_perl_run_requires(pTHX_ ngx_array_t *requires,
     ngx_log_t *log);
 static ngx_int_t ngx_http_perl_call_handler(pTHX_ ngx_http_request_t *r,
-    HV *nginx, SV *sub, SV **args, ngx_str_t *handler, ngx_str_t *rv);
+    ngx_http_perl_ctx_t *ctx, HV *nginx, SV *sub, SV **args,
+    ngx_str_t *handler, ngx_str_t *rv);
 static void ngx_http_perl_eval_anon_sub(pTHX_ ngx_str_t *handler, SV **sv);
 
 static ngx_int_t ngx_http_perl_preconfiguration(ngx_conf_t *cf);
@@ -183,6 +184,7 @@ ngx_http_perl_handle_request(ngx_http_request_t *r)
     SV                         *sub;
     ngx_int_t                   rc;
     ngx_str_t                   uri, args, *handler;
+    ngx_uint_t                  flags;
     ngx_http_perl_ctx_t        *ctx;
     ngx_http_perl_loc_conf_t   *plcf;
     ngx_http_perl_main_conf_t  *pmcf;
@@ -199,6 +201,8 @@ ngx_http_perl_handle_request(ngx_http_request_t *r)
         }
 
         ngx_http_set_ctx(r, ctx, ngx_http_perl_module);
+
+        ctx->request = r;
     }
 
     pmcf = ngx_http_get_module_main_conf(r, ngx_http_perl_module);
@@ -220,26 +224,20 @@ ngx_http_perl_handle_request(ngx_http_request_t *r)
         ctx->next = NULL;
     }
 
-    rc = ngx_http_perl_call_handler(aTHX_ r, pmcf->nginx, sub, NULL, handler,
-                                    NULL);
+    rc = ngx_http_perl_call_handler(aTHX_ r, ctx, pmcf->nginx, sub, NULL,
+                                    handler, NULL);
 
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "perl handler done: %i", rc);
 
-    if (rc == NGX_DONE) {
-        ngx_http_finalize_request(r, rc);
-        return;
-    }
-
     if (rc > 600) {
         rc = NGX_OK;
     }
 
     if (ctx->redirect_uri.len) {
         uri = ctx->redirect_uri;
-        args = ctx->redirect_args;
 
     } else {
         uri.len = 0;
@@ -248,13 +246,32 @@ ngx_http_perl_handle_request(ngx_http_request_t *r)
     ctx->filename.data = NULL;
     ctx->redirect_uri.len = 0;
 
+    if (rc == NGX_ERROR) {
+        ngx_http_finalize_request(r, rc);
+        return;
+    }
+
     if (ctx->done || ctx->next) {
         ngx_http_finalize_request(r, NGX_DONE);
         return;
     }
 
     if (uri.len) {
-        ngx_http_internal_redirect(r, &uri, &args);
+        if (uri.data[0] == '@') {
+            ngx_http_named_location(r, &uri);
+
+        } else {
+            ngx_str_null(&args);
+            flags = NGX_HTTP_LOG_UNSAFE;
+
+            if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags) != NGX_OK) {
+                ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+                return;
+            }
+
+            ngx_http_internal_redirect(r, &uri, &args);
+        }
+
         ngx_http_finalize_request(r, NGX_DONE);
         return;
     }
@@ -299,6 +316,7 @@ ngx_http_perl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
 
     ngx_int_t                   rc;
     ngx_str_t                   value;
+    ngx_uint_t                  saved;
     ngx_http_perl_ctx_t        *ctx;
     ngx_http_perl_main_conf_t  *pmcf;
 
@@ -314,8 +332,13 @@ ngx_http_perl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
         }
 
         ngx_http_set_ctx(r, ctx, ngx_http_perl_module);
+
+        ctx->request = r;
     }
 
+    saved = ctx->variable;
+    ctx->variable = 1;
+
     pmcf = ngx_http_get_module_main_conf(r, ngx_http_perl_module);
 
     value.data = NULL;
@@ -326,7 +349,7 @@ ngx_http_perl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
     PERL_SET_CONTEXT(pmcf->perl);
     PERL_SET_INTERP(pmcf->perl);
 
-    rc = ngx_http_perl_call_handler(aTHX_ r, pmcf->nginx, pv->sub, NULL,
+    rc = ngx_http_perl_call_handler(aTHX_ r, ctx, pmcf->nginx, pv->sub, NULL,
                                     &pv->handler, &value);
 
     }
@@ -342,6 +365,7 @@ ngx_http_perl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
         v->not_found = 1;
     }
 
+    ctx->variable = saved;
     ctx->filename.data = NULL;
     ctx->redirect_uri.len = 0;
 
@@ -377,11 +401,14 @@ ngx_http_perl_ssi(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ssi_ctx,
         }
 
         ngx_http_set_ctx(r, ctx, ngx_http_perl_module);
+
+        ctx->request = r;
     }
 
     pmcf = ngx_http_get_module_main_conf(r, ngx_http_perl_module);
 
     ctx->ssi = ssi_ctx;
+    ctx->header_sent = 1;
 
     handler = params[NGX_HTTP_PERL_SSI_SUB];
     handler->data[handler->len] = '\0';
@@ -435,8 +462,8 @@ ngx_http_perl_ssi(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ssi_ctx,
         asv = NULL;
     }
 
-    rc = ngx_http_perl_call_handler(aTHX_ r, pmcf->nginx, sv, asv, handler,
-                                    NULL);
+    rc = ngx_http_perl_call_handler(aTHX_ r, ctx, pmcf->nginx, sv, asv,
+                                    handler, NULL);
 
     SvREFCNT_dec(sv);
 
@@ -672,8 +699,9 @@ ngx_http_perl_run_requires(pTHX_ ngx_array_t *requires, ngx_log_t *log)
 
 
 static ngx_int_t
-ngx_http_perl_call_handler(pTHX_ ngx_http_request_t *r, HV *nginx, SV *sub,
-    SV **args, ngx_str_t *handler, ngx_str_t *rv)
+ngx_http_perl_call_handler(pTHX_ ngx_http_request_t *r,
+    ngx_http_perl_ctx_t *ctx, HV *nginx, SV *sub, SV **args,
+    ngx_str_t *handler, ngx_str_t *rv)
 {
     SV                *sv;
     int                n, status;
@@ -687,12 +715,15 @@ ngx_http_perl_call_handler(pTHX_ ngx_http_request_t *r, HV *nginx, SV *sub,
 
     status = 0;
 
+    ctx->error = 0;
+    ctx->status = NGX_OK;
+
     ENTER;
     SAVETMPS;
 
     PUSHMARK(sp);
 
-    sv = sv_2mortal(sv_bless(newRV_noinc(newSViv(PTR2IV(r))), nginx));
+    sv = sv_2mortal(sv_bless(newRV_noinc(newSViv(PTR2IV(ctx))), nginx));
     XPUSHs(sv);
 
     if (args) {
@@ -736,6 +767,18 @@ ngx_http_perl_call_handler(pTHX_ ngx_http_request_t *r, HV *nginx, SV *sub,
     FREETMPS;
     LEAVE;
 
+    if (ctx->error) {
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "call_sv: error, %d", ctx->status);
+
+        if (ctx->status != NGX_OK) {
+            return ctx->status;
+        }
+
+        return NGX_ERROR;
+    }
+
     /* check $@ */
 
     if (SvTRUE(ERRSV)) {
@@ -750,6 +793,12 @@ ngx_http_perl_call_handler(pTHX_ ngx_http_request_t *r, HV *nginx, SV *sub,
             return NGX_ERROR;
         }
 
+        ctx->redirect_uri.len = 0;
+
+        if (ctx->header_sent) {
+            return NGX_ERROR;
+        }
+
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
diff --git a/src/http/modules/perl/ngx_http_perl_module.h b/src/http/modules/perl/ngx_http_perl_module.h
index 5e60b03..8fa59a4 100644
--- a/src/http/modules/perl/ngx_http_perl_module.h
+++ b/src/http/modules/perl/ngx_http_perl_module.h
@@ -21,13 +21,19 @@
 typedef ngx_http_request_t   *nginx;
 
 typedef struct {
+    ngx_http_request_t       *request;
+
     ngx_str_t                 filename;
     ngx_str_t                 redirect_uri;
-    ngx_str_t                 redirect_args;
 
     SV                       *next;
 
-    ngx_uint_t                done;       /* unsigned  done:1; */
+    ngx_int_t                 status;
+
+    unsigned                  done:1;
+    unsigned                  error:1;
+    unsigned                  variable:1;
+    unsigned                  header_sent:1;
 
     ngx_array_t              *variables;  /* array of ngx_http_perl_var_t */
 
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index cb49ef7..3671558 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -21,6 +21,9 @@ typedef struct {
 #define NGX_HTTP_REQUEST_BODY_FILE_CLEAN  2
 
 
+static ngx_int_t ngx_http_core_auth_delay(ngx_http_request_t *r);
+static void ngx_http_core_auth_delay_handler(ngx_http_request_t *r);
+
 static ngx_int_t ngx_http_core_find_location(ngx_http_request_t *r);
 static ngx_int_t ngx_http_core_find_static_location(ngx_http_request_t *r,
     ngx_http_location_tree_node_t *node);
@@ -479,7 +482,7 @@ static ngx_command_t  ngx_http_core_commands[] = {
     { ngx_string("limit_rate"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
                         |NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
+      ngx_http_set_complex_value_size_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_core_loc_conf_t, limit_rate),
       NULL },
@@ -487,7 +490,7 @@ static ngx_command_t  ngx_http_core_commands[] = {
     { ngx_string("limit_rate_after"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
                         |NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
+      ngx_http_set_complex_value_size_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_core_loc_conf_t, limit_rate_after),
       NULL },
@@ -520,6 +523,13 @@ static ngx_command_t  ngx_http_core_commands[] = {
       offsetof(ngx_http_core_loc_conf_t, satisfy),
       &ngx_http_core_satisfy },
 
+    { ngx_string("auth_delay"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_core_loc_conf_t, auth_delay),
+      NULL },
+
     { ngx_string("internal"),
       NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
       ngx_http_core_internal,
@@ -1124,6 +1134,10 @@ ngx_http_core_access_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph)
 
     /* rc == NGX_ERROR || rc == NGX_HTTP_...  */
 
+    if (rc == NGX_HTTP_UNAUTHORIZED) {
+        return ngx_http_core_auth_delay(r);
+    }
+
     ngx_http_finalize_request(r, rc);
     return NGX_OK;
 }
@@ -1141,12 +1155,17 @@ ngx_http_core_post_access_phase(ngx_http_request_t *r,
     access_code = r->access_code;
 
     if (access_code) {
+        r->access_code = 0;
+
         if (access_code == NGX_HTTP_FORBIDDEN) {
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                           "access forbidden by rule");
         }
 
-        r->access_code = 0;
+        if (access_code == NGX_HTTP_UNAUTHORIZED) {
+            return ngx_http_core_auth_delay(r);
+        }
+
         ngx_http_finalize_request(r, access_code);
         return NGX_OK;
     }
@@ -1156,6 +1175,65 @@ ngx_http_core_post_access_phase(ngx_http_request_t *r,
 }
 
 
+static ngx_int_t
+ngx_http_core_auth_delay(ngx_http_request_t *r)
+{
+    ngx_http_core_loc_conf_t  *clcf;
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    if (clcf->auth_delay == 0) {
+        ngx_http_finalize_request(r, NGX_HTTP_UNAUTHORIZED);
+        return NGX_OK;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                  "delaying unauthorized request");
+
+    if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    r->read_event_handler = ngx_http_test_reading;
+    r->write_event_handler = ngx_http_core_auth_delay_handler;
+
+    r->connection->write->delayed = 1;
+    ngx_add_timer(r->connection->write, clcf->auth_delay);
+
+    /*
+     * trigger an additional event loop iteration
+     * to ensure constant-time processing
+     */
+
+    ngx_post_event(r->connection->write, &ngx_posted_next_events);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_core_auth_delay_handler(ngx_http_request_t *r)
+{
+    ngx_event_t  *wev;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "auth delay handler");
+
+    wev = r->connection->write;
+
+    if (wev->delayed) {
+
+        if (ngx_handle_write_event(wev, 0) != NGX_OK) {
+            ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        }
+
+        return;
+    }
+
+    ngx_http_finalize_request(r, NGX_HTTP_UNAUTHORIZED);
+}
+
+
 ngx_int_t
 ngx_http_core_content_phase(ngx_http_request_t *r,
     ngx_http_phase_handler_t *ph)
@@ -1281,10 +1359,6 @@ ngx_http_update_location_config(ngx_http_request_t *r)
         r->connection->tcp_nopush = NGX_TCP_NOPUSH_DISABLED;
     }
 
-    if (r->limit_rate == 0) {
-        r->limit_rate = clcf->limit_rate;
-    }
-
     if (clcf->handler) {
         r->content_handler = clcf->handler;
     }
@@ -1664,8 +1738,10 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
     ngx_buf_t    *b;
     ngx_chain_t   out;
 
-    if (ngx_http_discard_request_body(r) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    rc = ngx_http_discard_request_body(r);
+
+    if (rc != NGX_OK) {
+        return rc;
     }
 
     r->headers_out.status = status;
@@ -1845,7 +1921,8 @@ ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *path,
         }
     }
 
-    last = ngx_cpystrn(last, r->uri.data + alias, r->uri.len - alias + 1);
+    last = ngx_copy(last, r->uri.data + alias, r->uri.len - alias);
+    *last = '\0';
 
     return last;
 }
@@ -2668,43 +2745,41 @@ ngx_http_get_forwarded_addr_internal(ngx_http_request_t *r, ngx_addr_t *addr,
     u_char *xff, size_t xfflen, ngx_array_t *proxies, int recursive)
 {
     u_char      *p;
-    ngx_int_t    rc;
     ngx_addr_t   paddr;
+    ngx_uint_t   found;
 
-    if (ngx_cidr_match(addr->sockaddr, proxies) != NGX_OK) {
-        return NGX_DECLINED;
-    }
+    found = 0;
 
-    for (p = xff + xfflen - 1; p > xff; p--, xfflen--) {
-        if (*p != ' ' && *p != ',') {
-            break;
-        }
-    }
+    do {
 
-    for ( /* void */ ; p > xff; p--) {
-        if (*p == ' ' || *p == ',') {
-            p++;
-            break;
-        }
-    }
-
-    if (ngx_parse_addr_port(r->pool, &paddr, p, xfflen - (p - xff)) != NGX_OK) {
-        return NGX_DECLINED;
-    }
-
-    *addr = paddr;
-
-    if (recursive && p > xff) {
-        rc = ngx_http_get_forwarded_addr_internal(r, addr, xff, p - 1 - xff,
-                                                  proxies, 1);
-
-        if (rc == NGX_DECLINED) {
-            return NGX_DONE;
+        if (ngx_cidr_match(addr->sockaddr, proxies) != NGX_OK) {
+            return found ? NGX_DONE : NGX_DECLINED;
         }
 
-        /* rc == NGX_OK || rc == NGX_DONE  */
-        return rc;
-    }
+        for (p = xff + xfflen - 1; p > xff; p--, xfflen--) {
+            if (*p != ' ' && *p != ',') {
+                break;
+            }
+        }
+
+        for ( /* void */ ; p > xff; p--) {
+            if (*p == ' ' || *p == ',') {
+                p++;
+                break;
+            }
+        }
+
+        if (ngx_parse_addr_port(r->pool, &paddr, p, xfflen - (p - xff))
+            != NGX_OK)
+        {
+            return found ? NGX_DONE : NGX_DECLINED;
+        }
+
+        *addr = paddr;
+        found = 1;
+        xfflen = p - 1 - xff;
+
+    } while (recursive && p > xff);
 
     return NGX_OK;
 }
@@ -3387,6 +3462,8 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
      *     clcf->exact_match = 0;
      *     clcf->auto_redirect = 0;
      *     clcf->alias = 0;
+     *     clcf->limit_rate = NULL;
+     *     clcf->limit_rate_after = NULL;
      *     clcf->gzip_proxied = 0;
      *     clcf->keepalive_disable = 0;
      */
@@ -3395,6 +3472,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
     clcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
     clcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
     clcf->satisfy = NGX_CONF_UNSET_UINT;
+    clcf->auth_delay = NGX_CONF_UNSET_MSEC;
     clcf->if_modified_since = NGX_CONF_UNSET_UINT;
     clcf->max_ranges = NGX_CONF_UNSET_UINT;
     clcf->client_body_in_file_only = NGX_CONF_UNSET_UINT;
@@ -3417,8 +3495,6 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
     clcf->send_timeout = NGX_CONF_UNSET_MSEC;
     clcf->send_lowat = NGX_CONF_UNSET_SIZE;
     clcf->postpone_output = NGX_CONF_UNSET_SIZE;
-    clcf->limit_rate = NGX_CONF_UNSET_SIZE;
-    clcf->limit_rate_after = NGX_CONF_UNSET_SIZE;
     clcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
     clcf->keepalive_header = NGX_CONF_UNSET;
     clcf->keepalive_requests = NGX_CONF_UNSET_UINT;
@@ -3612,6 +3688,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                                |NGX_HTTP_KEEPALIVE_DISABLE_MSIE6));
     ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy,
                               NGX_HTTP_SATISFY_ALL);
+    ngx_conf_merge_msec_value(conf->auth_delay, prev->auth_delay, 0);
     ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,
                               NGX_HTTP_IMS_EXACT);
     ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges,
@@ -3647,9 +3724,15 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0);
     ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output,
                               1460);
-    ngx_conf_merge_size_value(conf->limit_rate, prev->limit_rate, 0);
-    ngx_conf_merge_size_value(conf->limit_rate_after, prev->limit_rate_after,
-                              0);
+
+    if (conf->limit_rate == NULL) {
+        conf->limit_rate = prev->limit_rate;
+    }
+
+    if (conf->limit_rate_after == NULL) {
+        conf->limit_rate_after = prev->limit_rate_after;
+    }
+
     ngx_conf_merge_msec_value(conf->keepalive_timeout,
                               prev->keepalive_timeout, 75000);
     ngx_conf_merge_sec_value(conf->keepalive_header,
@@ -4684,6 +4767,7 @@ ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 case NGX_HTTP_TO_HTTPS:
                 case NGX_HTTPS_CERT_ERROR:
                 case NGX_HTTPS_NO_CERT:
+                case NGX_HTTP_REQUEST_HEADER_TOO_LARGE:
                     err->overwrite = NGX_HTTP_BAD_REQUEST;
             }
         }
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 85f6d66..2aadae7 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -349,19 +349,21 @@ struct ngx_http_core_loc_conf_s {
     size_t        client_body_buffer_size; /* client_body_buffer_size */
     size_t        send_lowat;              /* send_lowat */
     size_t        postpone_output;         /* postpone_output */
-    size_t        limit_rate;              /* limit_rate */
-    size_t        limit_rate_after;        /* limit_rate_after */
     size_t        sendfile_max_chunk;      /* sendfile_max_chunk */
     size_t        read_ahead;              /* read_ahead */
     size_t        subrequest_output_buffer_size;
                                            /* subrequest_output_buffer_size */
 
+    ngx_http_complex_value_t  *limit_rate; /* limit_rate */
+    ngx_http_complex_value_t  *limit_rate_after; /* limit_rate_after */
+
     ngx_msec_t    client_body_timeout;     /* client_body_timeout */
     ngx_msec_t    send_timeout;            /* send_timeout */
     ngx_msec_t    keepalive_timeout;       /* keepalive_timeout */
     ngx_msec_t    lingering_time;          /* lingering_time */
     ngx_msec_t    lingering_timeout;       /* lingering_timeout */
     ngx_msec_t    resolver_timeout;        /* resolver_timeout */
+    ngx_msec_t    auth_delay;              /* auth_delay */
 
     ngx_resolver_t  *resolver;             /* resolver */
 
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index d9a1dbe..cfc42f9 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -912,6 +912,8 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
                         i = 1;
 
                     } else {
+                        hash = 0;
+                        i = 0;
                         r->invalid_header = 1;
                     }
 
@@ -922,6 +924,8 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
                     return NGX_HTTP_PARSE_INVALID_HEADER;
                 }
 
+                hash = 0;
+                i = 0;
                 r->invalid_header = 1;
 
                 break;
@@ -1437,9 +1441,11 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
                 state = sw_quoted;
                 break;
             case '?':
+                u--;
                 r->args_start = p;
                 goto args;
             case '#':
+                u--;
                 goto done;
             case '+':
                 r->plus_in_uri = 1;
@@ -1467,8 +1473,9 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
             case '\\':
 #endif
             case '/':
-                state = sw_slash;
-                u -= 5;
+            case '?':
+            case '#':
+                u -= 4;
                 for ( ;; ) {
                     if (u < r->uri.data) {
                         return NGX_HTTP_PARSE_INVALID_REQUEST;
@@ -1479,16 +1486,19 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
                     }
                     u--;
                 }
+                if (ch == '?') {
+                    r->args_start = p;
+                    goto args;
+                }
+                if (ch == '#') {
+                    goto done;
+                }
+                state = sw_slash;
                 break;
             case '%':
                 quoted_state = state;
                 state = sw_quoted;
                 break;
-            case '?':
-                r->args_start = p;
-                goto args;
-            case '#':
-                goto done;
             case '+':
                 r->plus_in_uri = 1;
                 /* fall through */
@@ -1561,6 +1571,30 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
         }
     }
 
+    if (state == sw_quoted || state == sw_quoted_second) {
+        return NGX_HTTP_PARSE_INVALID_REQUEST;
+    }
+
+    if (state == sw_dot) {
+        u--;
+
+    } else if (state == sw_dot_dot) {
+        u -= 4;
+
+        for ( ;; ) {
+            if (u < r->uri.data) {
+                return NGX_HTTP_PARSE_INVALID_REQUEST;
+            }
+
+            if (*u == '/') {
+                u++;
+                break;
+            }
+
+            u--;
+        }
+    }
+
 done:
 
     r->uri.len = u - r->uri.data;
@@ -2268,6 +2302,9 @@ ngx_http_parse_chunked(ngx_http_request_t *r, ngx_buf_t *b,
                 break;
             case LF:
                 state = sw_chunk_start;
+                break;
+            default:
+                goto invalid;
             }
             break;
 
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 80c1965..eb53996 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -131,7 +131,7 @@ ngx_http_header_t  ngx_http_headers_in[] = {
 
     { ngx_string("Transfer-Encoding"),
                  offsetof(ngx_http_headers_in_t, transfer_encoding),
-                 ngx_http_process_header_line },
+                 ngx_http_process_unique_header_line },
 
     { ngx_string("TE"),
                  offsetof(ngx_http_headers_in_t, te),
@@ -748,6 +748,8 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
                 return;
             }
 
+            ngx_reusable_connection(c, 0);
+
             rc = ngx_ssl_handshake(c);
 
             if (rc == NGX_AGAIN) {
@@ -756,8 +758,6 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
                     ngx_add_timer(rev, c->listening->post_accept_timeout);
                 }
 
-                ngx_reusable_connection(c, 0);
-
                 c->ssl->handler = ngx_http_ssl_handshake_handler;
                 return;
             }
@@ -1755,10 +1755,18 @@ ngx_http_process_host(ngx_http_request_t *r, ngx_table_elt_t *h,
     ngx_int_t  rc;
     ngx_str_t  host;
 
-    if (r->headers_in.host == NULL) {
-        r->headers_in.host = h;
+    if (r->headers_in.host) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent duplicate host header: \"%V: %V\", "
+                      "previous value: \"%V: %V\"",
+                      &h->key, &h->value, &r->headers_in.host->key,
+                      &r->headers_in.host->value);
+        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+        return NGX_ERROR;
     }
 
+    r->headers_in.host = h;
+
     host = h->value;
 
     rc = ngx_http_validate_host(&host, r->pool, 0);
@@ -1952,10 +1960,7 @@ ngx_http_process_request_header(ngx_http_request_t *r)
             r->headers_in.content_length_n = -1;
             r->headers_in.chunked = 1;
 
-        } else if (r->headers_in.transfer_encoding->value.len != 8
-            || ngx_strncasecmp(r->headers_in.transfer_encoding->value.data,
-                               (u_char *) "identity", 8) != 0)
-        {
+        } else {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                           "client sent unknown \"Transfer-Encoding\": \"%V\"",
                           &r->headers_in.transfer_encoding->value);
@@ -2483,26 +2488,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
     }
 
     if (r != r->main) {
-        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-        if (r->background) {
-            if (!r->logged) {
-                if (clcf->log_subrequest) {
-                    ngx_http_log_request(r);
-                }
-
-                r->logged = 1;
-
-            } else {
-                ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                              "subrequest: \"%V?%V\" logged again",
-                              &r->uri, &r->args);
-            }
-
-            r->done = 1;
-            ngx_http_finalize_connection(r);
-            return;
-        }
 
         if (r->buffered || r->postponed) {
 
@@ -2515,11 +2500,12 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
 
         pr = r->parent;
 
-        if (r == c->data) {
-
-            r->main->count--;
+        if (r == c->data || r->background) {
 
             if (!r->logged) {
+
+                clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
                 if (clcf->log_subrequest) {
                     ngx_http_log_request(r);
                 }
@@ -2534,6 +2520,13 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
 
             r->done = 1;
 
+            if (r->background) {
+                ngx_http_finalize_connection(r);
+                return;
+            }
+
+            r->main->count--;
+
             if (pr->postponed && pr->postponed->request == r) {
                 pr->postponed = pr->postponed->next;
             }
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index fce70ef..70c2d42 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -510,10 +510,13 @@ struct ngx_http_request_s {
     /*
      * instead of using the request context data in
      * ngx_http_limit_conn_module and ngx_http_limit_req_module
-     * we use the single bits in the request structure
+     * we use the bit fields in the request structure
      */
-    unsigned                          limit_conn_set:1;
-    unsigned                          limit_req_set:1;
+    unsigned                          limit_conn_status:2;
+    unsigned                          limit_req_status:3;
+
+    unsigned                          limit_rate_set:1;
+    unsigned                          limit_rate_after_set:1;
 
 #if 0
     unsigned                          cacheable:1;
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 4153889..13c57d6 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -104,6 +104,37 @@ ngx_http_complex_value(ngx_http_request_t *r, ngx_http_complex_value_t *val,
 }
 
 
+size_t
+ngx_http_complex_value_size(ngx_http_request_t *r,
+    ngx_http_complex_value_t *val, size_t default_value)
+{
+    size_t     size;
+    ngx_str_t  value;
+
+    if (val == NULL) {
+        return default_value;
+    }
+
+    if (val->lengths == NULL) {
+        return val->u.size;
+    }
+
+    if (ngx_http_complex_value(r, val, &value) != NGX_OK) {
+        return default_value;
+    }
+
+    size = ngx_parse_size(&value);
+
+    if (size == (size_t) NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "invalid size \"%V\"", &value);
+        return default_value;
+    }
+
+    return size;
+}
+
+
 ngx_int_t
 ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv)
 {
@@ -244,6 +275,36 @@ ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+char *
+ngx_http_set_complex_value_size_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char  *p = conf;
+
+    char                      *rv;
+    ngx_http_complex_value_t  *cv;
+
+    rv = ngx_http_set_complex_value_slot(cf, cmd, conf);
+
+    if (rv != NGX_CONF_OK) {
+        return rv;
+    }
+
+    cv = *(ngx_http_complex_value_t **) (p + cmd->offset);
+
+    if (cv->lengths) {
+        return NGX_CONF_OK;
+    }
+
+    cv->u.size = ngx_parse_size(&cv->value);
+    if (cv->u.size == (size_t) NGX_ERROR) {
+        return "invalid value";
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 ngx_int_t
 ngx_http_test_predicates(ngx_http_request_t *r, ngx_array_t *predicates)
 {
@@ -1409,7 +1470,14 @@ ngx_http_script_return_code(ngx_http_script_engine_t *e)
 void
 ngx_http_script_break_code(ngx_http_script_engine_t *e)
 {
-    e->request->uri_changed = 0;
+    ngx_http_request_t  *r;
+
+    r = e->request;
+
+    if (r->uri_changed) {
+        r->valid_location = 0;
+        r->uri_changed = 0;
+    }
 
     e->ip = ngx_http_script_exit;
 }
diff --git a/src/http/ngx_http_script.h b/src/http/ngx_http_script.h
index 25bb6d7..a6b345e 100644
--- a/src/http/ngx_http_script.h
+++ b/src/http/ngx_http_script.h
@@ -68,6 +68,10 @@ typedef struct {
     ngx_uint_t                 *flushes;
     void                       *lengths;
     void                       *values;
+
+    union {
+        size_t                  size;
+    } u;
 } ngx_http_complex_value_t;
 
 
@@ -207,9 +211,13 @@ void ngx_http_script_flush_complex_value(ngx_http_request_t *r,
     ngx_http_complex_value_t *val);
 ngx_int_t ngx_http_complex_value(ngx_http_request_t *r,
     ngx_http_complex_value_t *val, ngx_str_t *value);
+size_t ngx_http_complex_value_size(ngx_http_request_t *r,
+    ngx_http_complex_value_t *val, size_t default_value);
 ngx_int_t ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv);
 char *ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+char *ngx_http_set_complex_value_size_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 
 
 ngx_int_t ngx_http_test_predicates(ngx_http_request_t *r,
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 4ffb2cc..76e6705 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -623,6 +623,12 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
         return ngx_http_named_location(r, &uri);
     }
 
+    r->expect_tested = 1;
+
+    if (ngx_http_discard_request_body(r) != NGX_OK) {
+        r->keepalive = 0;
+    }
+
     location = ngx_list_push(&r->headers_out.headers);
 
     if (location == NULL) {
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index a7391d0..89e1319 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -597,10 +597,6 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
                 u->cache_status = NGX_HTTP_CACHE_MISS;
                 u->request_sent = 1;
             }
-
-            if (ngx_http_upstream_cache_background_update(r, u) != NGX_OK) {
-                rc = NGX_ERROR;
-            }
         }
 
         if (rc != NGX_DECLINED) {
@@ -902,9 +898,14 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
              || c->stale_updating) && !r->background
             && u->conf->cache_background_update)
         {
-            r->cache->background = 1;
-            u->cache_status = rc;
-            rc = NGX_OK;
+            if (ngx_http_upstream_cache_background_update(r, u) == NGX_OK) {
+                r->cache->background = 1;
+                u->cache_status = rc;
+                rc = NGX_OK;
+
+            } else {
+                rc = NGX_ERROR;
+            }
         }
 
         break;
@@ -1106,10 +1107,6 @@ ngx_http_upstream_cache_background_update(ngx_http_request_t *r,
 {
     ngx_http_request_t  *sr;
 
-    if (!r->cached || !r->cache->background) {
-        return NGX_OK;
-    }
-
     if (r == r->main) {
         r->preserve_body = 1;
     }
@@ -2979,6 +2976,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
                              ngx_http_upstream_process_non_buffered_downstream;
 
         r->limit_rate = 0;
+        r->limit_rate_set = 1;
 
         if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) {
             ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
@@ -3336,6 +3334,7 @@ ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
     size_t                     size;
     ssize_t                    n;
     ngx_buf_t                 *b;
+    ngx_uint_t                 flags;
     ngx_connection_t          *c, *downstream, *upstream, *dst, *src;
     ngx_http_upstream_t       *u;
     ngx_http_core_loc_conf_t  *clcf;
@@ -3474,7 +3473,14 @@ ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
         ngx_del_timer(upstream->write);
     }
 
-    if (ngx_handle_read_event(upstream->read, 0) != NGX_OK) {
+    if (upstream->read->eof || upstream->read->error) {
+        flags = NGX_CLOSE_EVENT;
+
+    } else {
+        flags = 0;
+    }
+
+    if (ngx_handle_read_event(upstream->read, flags) != NGX_OK) {
         ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
         return;
     }
@@ -3493,7 +3499,14 @@ ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
         return;
     }
 
-    if (ngx_handle_read_event(downstream->read, 0) != NGX_OK) {
+    if (downstream->read->eof || downstream->read->error) {
+        flags = NGX_CLOSE_EVENT;
+
+    } else {
+        flags = 0;
+    }
+
+    if (ngx_handle_read_event(downstream->read, flags) != NGX_OK) {
         ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
         return;
     }
@@ -3565,6 +3578,7 @@ ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
     ssize_t                    n;
     ngx_buf_t                 *b;
     ngx_int_t                  rc;
+    ngx_uint_t                 flags;
     ngx_connection_t          *downstream, *upstream;
     ngx_http_upstream_t       *u;
     ngx_http_core_loc_conf_t  *clcf;
@@ -3668,7 +3682,14 @@ ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
         ngx_del_timer(downstream->write);
     }
 
-    if (ngx_handle_read_event(upstream->read, 0) != NGX_OK) {
+    if (upstream->read->eof || upstream->read->error) {
+        flags = NGX_CLOSE_EVENT;
+
+    } else {
+        flags = 0;
+    }
+
+    if (ngx_handle_read_event(upstream->read, flags) != NGX_OK) {
         ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
         return;
     }
@@ -4806,6 +4827,7 @@ ngx_http_upstream_process_limit_rate(ngx_http_request_t *r, ngx_table_elt_t *h,
 
     if (n != NGX_ERROR) {
         r->limit_rate = (size_t) n;
+        r->limit_rate_set = 1;
     }
 
     return NGX_OK;
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index f72de3e..8e7b4ea 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -669,10 +669,7 @@ ngx_http_upstream_set_round_robin_peer_session(ngx_peer_connection_t *pc,
     ngx_http_upstream_rr_peer_t   *peer;
 #if (NGX_HTTP_UPSTREAM_ZONE)
     int                            len;
-#if OPENSSL_VERSION_NUMBER >= 0x0090707fL
-    const
-#endif
-    u_char                        *p;
+    const u_char                  *p;
     ngx_http_upstream_rr_peers_t  *peers;
     u_char                         buf[NGX_SSL_MAX_SESSION_SIZE];
 #endif
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 31321b2..e067cf0 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -22,8 +22,6 @@ static void ngx_http_variable_request_set(ngx_http_request_t *r,
 #endif
 static ngx_int_t ngx_http_variable_request_get_size(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
-static void ngx_http_variable_request_set_size(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_header(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 
@@ -124,6 +122,8 @@ static ngx_int_t ngx_http_variable_sent_keep_alive(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_sent_transfer_encoding(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
+static void ngx_http_variable_set_limit_rate(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 static ngx_int_t ngx_http_variable_connection(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
@@ -199,10 +199,20 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("remote_port"), NULL, ngx_http_variable_remote_port, 0, 0, 0 },
 
     { ngx_string("proxy_protocol_addr"), NULL,
-      ngx_http_variable_proxy_protocol_addr, 0, 0, 0 },
+      ngx_http_variable_proxy_protocol_addr,
+      offsetof(ngx_proxy_protocol_t, src_addr), 0, 0 },
 
     { ngx_string("proxy_protocol_port"), NULL,
-      ngx_http_variable_proxy_protocol_port, 0, 0, 0 },
+      ngx_http_variable_proxy_protocol_port,
+      offsetof(ngx_proxy_protocol_t, src_port), 0, 0 },
+
+    { ngx_string("proxy_protocol_server_addr"), NULL,
+      ngx_http_variable_proxy_protocol_addr,
+      offsetof(ngx_proxy_protocol_t, dst_addr), 0, 0 },
+
+    { ngx_string("proxy_protocol_server_port"), NULL,
+      ngx_http_variable_proxy_protocol_port,
+      offsetof(ngx_proxy_protocol_t, dst_port), 0, 0 },
 
     { ngx_string("server_addr"), NULL, ngx_http_variable_server_addr, 0, 0, 0 },
 
@@ -321,7 +331,7 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("sent_http_link"), NULL, ngx_http_variable_headers,
       offsetof(ngx_http_request_t, headers_out.link), 0, 0 },
 
-    { ngx_string("limit_rate"), ngx_http_variable_request_set_size,
+    { ngx_string("limit_rate"), ngx_http_variable_set_limit_rate,
       ngx_http_variable_request_get_size,
       offsetof(ngx_http_request_t, limit_rate),
       NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
@@ -788,32 +798,6 @@ ngx_http_variable_request_get_size(ngx_http_request_t *r,
 }
 
 
-static void
-ngx_http_variable_request_set_size(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    ssize_t    s, *sp;
-    ngx_str_t  val;
-
-    val.len = v->len;
-    val.data = v->data;
-
-    s = ngx_parse_size(&val);
-
-    if (s == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "invalid size \"%V\"", &val);
-        return;
-    }
-
-    sp = (ssize_t *) ((char *) r + data);
-
-    *sp = s;
-
-    return;
-}
-
-
 static ngx_int_t
 ngx_http_variable_header(ngx_http_request_t *r, ngx_http_variable_value_t *v,
     uintptr_t data)
@@ -1319,11 +1303,22 @@ static ngx_int_t
 ngx_http_variable_proxy_protocol_addr(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
-    v->len = r->connection->proxy_protocol_addr.len;
+    ngx_str_t             *addr;
+    ngx_proxy_protocol_t  *pp;
+
+    pp = r->connection->proxy_protocol;
+    if (pp == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    addr = (ngx_str_t *) ((char *) pp + data);
+
+    v->len = addr->len;
     v->valid = 1;
     v->no_cacheable = 0;
     v->not_found = 0;
-    v->data = r->connection->proxy_protocol_addr.data;
+    v->data = addr->data;
 
     return NGX_OK;
 }
@@ -1333,7 +1328,14 @@ static ngx_int_t
 ngx_http_variable_proxy_protocol_port(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
-    ngx_uint_t  port;
+    ngx_uint_t             port;
+    ngx_proxy_protocol_t  *pp;
+
+    pp = r->connection->proxy_protocol;
+    if (pp == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
 
     v->len = 0;
     v->valid = 1;
@@ -1345,7 +1347,7 @@ ngx_http_variable_proxy_protocol_port(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    port = r->connection->proxy_protocol_port;
+    port = *(in_port_t *) ((char *) pp + data);
 
     if (port > 0 && port < 65536) {
         v->len = ngx_sprintf(v->data, "%ui", port) - v->data;
@@ -1993,6 +1995,29 @@ ngx_http_variable_sent_transfer_encoding(ngx_http_request_t *r,
 }
 
 
+static void
+ngx_http_variable_set_limit_rate(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ssize_t    s;
+    ngx_str_t  val;
+
+    val.len = v->len;
+    val.data = v->data;
+
+    s = ngx_parse_size(&val);
+
+    if (s == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "invalid $limit_rate \"%V\"", &val);
+        return;
+    }
+
+    r->limit_rate = s;
+    r->limit_rate_set = 1;
+}
+
+
 static ngx_int_t
 ngx_http_variable_request_completion(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
diff --git a/src/http/ngx_http_write_filter_module.c b/src/http/ngx_http_write_filter_module.c
index 3f18d76..6a5d957 100644
--- a/src/http/ngx_http_write_filter_module.c
+++ b/src/http/ngx_http_write_filter_module.c
@@ -250,9 +250,17 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return NGX_ERROR;
     }
 
+    if (!r->limit_rate_set) {
+        r->limit_rate = ngx_http_complex_value_size(r, clcf->limit_rate, 0);
+        r->limit_rate_set = 1;
+    }
+
     if (r->limit_rate) {
-        if (r->limit_rate_after == 0) {
-            r->limit_rate_after = clcf->limit_rate_after;
+
+        if (!r->limit_rate_after_set) {
+            r->limit_rate_after = ngx_http_complex_value_size(r,
+                                                    clcf->limit_rate_after, 0);
+            r->limit_rate_after_set = 1;
         }
 
         limit = (off_t) r->limit_rate * (ngx_time() - r->start_sec + 1)
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index e55f9ba..8b0fc53 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -178,6 +178,7 @@ static void ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r);
 static ngx_int_t ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_stream_t *stream, ngx_uint_t status);
 static void ngx_http_v2_close_stream_handler(ngx_event_t *ev);
+static void ngx_http_v2_retry_close_stream_handler(ngx_event_t *ev);
 static void ngx_http_v2_handle_connection_handler(ngx_event_t *rev);
 static void ngx_http_v2_idle_handler(ngx_event_t *rev);
 static void ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
@@ -354,6 +355,11 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
     if (c->close) {
         c->close = 0;
 
+        if (c->error) {
+            ngx_http_v2_finalize_connection(h2c, 0);
+            return;
+        }
+
         if (!h2c->goaway) {
             h2c->goaway = 1;
 
@@ -419,6 +425,14 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
 
         } while (p != end);
 
+        h2c->total_bytes += n;
+
+        if (h2c->total_bytes / 8 > h2c->payload_bytes + 1048576) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0, "http2 flood detected");
+            ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
+            return;
+        }
+
     } while (rev->ready);
 
     if (ngx_handle_read_event(rev, 0) != NGX_OK) {
@@ -505,13 +519,12 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
     ngx_http_core_loc_conf_t  *clcf;
 
     c = h2c->connection;
+    wev = c->write;
 
     if (c->error) {
-        return NGX_ERROR;
+        goto error;
     }
 
-    wev = c->write;
-
     if (!wev->ready) {
         return NGX_AGAIN;
     }
@@ -947,6 +960,15 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
+    r = stream->request;
+
+    if (r->reading_body && !r->request_body_no_buffering) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "skipping http2 DATA frame");
+
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
     size = end - pos;
 
     if (size >= h2c->state.length) {
@@ -954,7 +976,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
         stream->in_closed = h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG;
     }
 
-    r = stream->request;
+    h2c->payload_bytes += size;
 
     if (r->request_body) {
         rc = ngx_http_v2_process_request_body(r, pos, size, stream->in_closed);
@@ -1100,20 +1122,19 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
     }
 
-    h2c->last_sid = h2c->state.sid;
-
-    h2c->state.pool = ngx_create_pool(1024, h2c->connection->log);
-    if (h2c->state.pool == NULL) {
-        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
-    }
-
     if (depend == h2c->state.sid) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "client sent HEADERS frame for stream %ui "
                       "with incorrect dependency", h2c->state.sid);
 
-        status = NGX_HTTP_V2_PROTOCOL_ERROR;
-        goto rst_stream;
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
+    h2c->last_sid = h2c->state.sid;
+
+    h2c->state.pool = ngx_create_pool(1024, h2c->connection->log);
+    if (h2c->state.pool == NULL) {
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
     }
 
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@@ -1698,8 +1719,13 @@ ngx_http_v2_state_header_complete(ngx_http_v2_connection_t *h2c, u_char *pos,
     ngx_http_v2_stream_t  *stream;
 
     if (h2c->state.length) {
-        h2c->state.handler = ngx_http_v2_state_header_block;
-        return pos;
+        if (end - pos > 0) {
+            h2c->state.handler = ngx_http_v2_state_header_block;
+            return pos;
+        }
+
+        return ngx_http_v2_state_headers_save(h2c, pos, end,
+                                              ngx_http_v2_state_header_block);
     }
 
     if (!(h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG)) {
@@ -1842,28 +1868,7 @@ ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c, u_char *pos,
                       "client sent PRIORITY frame for stream %ui "
                       "with incorrect dependency", h2c->state.sid);
 
-        node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 0);
-
-        if (node && node->stream) {
-            if (ngx_http_v2_terminate_stream(h2c, node->stream,
-                                             NGX_HTTP_V2_PROTOCOL_ERROR)
-                == NGX_ERROR)
-            {
-                return ngx_http_v2_connection_error(h2c,
-                                                    NGX_HTTP_V2_INTERNAL_ERROR);
-            }
-
-        } else {
-            if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid,
-                                            NGX_HTTP_V2_PROTOCOL_ERROR)
-                == NGX_ERROR)
-            {
-                return ngx_http_v2_connection_error(h2c,
-                                                    NGX_HTTP_V2_INTERNAL_ERROR);
-            }
-        }
-
-        return ngx_http_v2_state_complete(h2c, pos, end);
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
     }
 
     node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 1);
@@ -2246,41 +2251,11 @@ ngx_http_v2_state_window_update(ngx_http_v2_connection_t *h2c, u_char *pos,
                    h2c->state.sid, window);
 
     if (window == 0) {
-        if (h2c->state.sid == 0) {
-            ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-                          "client sent WINDOW_UPDATE frame "
-                          "with incorrect window increment 0");
-
-            return ngx_http_v2_connection_error(h2c,
-                                                NGX_HTTP_V2_PROTOCOL_ERROR);
-        }
-
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-                      "client sent WINDOW_UPDATE frame for stream %ui "
-                      "with incorrect window increment 0", h2c->state.sid);
+                      "client sent WINDOW_UPDATE frame "
+                      "with incorrect window increment 0");
 
-        node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 0);
-
-        if (node && node->stream) {
-            if (ngx_http_v2_terminate_stream(h2c, node->stream,
-                                             NGX_HTTP_V2_PROTOCOL_ERROR)
-                == NGX_ERROR)
-            {
-                return ngx_http_v2_connection_error(h2c,
-                                                    NGX_HTTP_V2_INTERNAL_ERROR);
-            }
-
-        } else {
-            if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid,
-                                            NGX_HTTP_V2_PROTOCOL_ERROR)
-                == NGX_ERROR)
-            {
-                return ngx_http_v2_connection_error(h2c,
-                                                    NGX_HTTP_V2_INTERNAL_ERROR);
-            }
-        }
-
-        return ngx_http_v2_state_complete(h2c, pos, end);
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
     }
 
     if (h2c->state.sid) {
@@ -2496,10 +2471,6 @@ ngx_http_v2_connection_error(ngx_http_v2_connection_t *h2c,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
                    "http2 state connection error");
 
-    if (err == NGX_HTTP_V2_INTERNAL_ERROR) {
-        ngx_debug_point();
-    }
-
     ngx_http_v2_finalize_connection(h2c, err);
 
     return NULL;
@@ -2954,9 +2925,9 @@ ngx_http_v2_get_frame(ngx_http_v2_connection_t *h2c, size_t length,
                       "requested control frame is too large: %uz", length);
         return NULL;
     }
+#endif
 
     frame->length = length;
-#endif
 
     buf->last = ngx_http_v2_write_len_and_type(buf->pos, length, type);
 
@@ -2983,6 +2954,8 @@ ngx_http_v2_frame_handler(ngx_http_v2_connection_t *h2c,
     frame->next = h2c->free_frames;
     h2c->free_frames = frame;
 
+    h2c->total_bytes += NGX_HTTP_V2_FRAME_HEADER_SIZE + frame->length;
+
     return NGX_OK;
 }
 
@@ -3768,7 +3741,8 @@ ngx_http_v2_construct_cookie_header(ngx_http_request_t *r)
 static void
 ngx_http_v2_run_request(ngx_http_request_t *r)
 {
-    ngx_connection_t  *fc;
+    ngx_connection_t          *fc;
+    ngx_http_v2_connection_t  *h2c;
 
     fc = r->connection;
 
@@ -3800,6 +3774,10 @@ ngx_http_v2_run_request(ngx_http_request_t *r)
         r->headers_in.chunked = 1;
     }
 
+    h2c = r->stream->connection;
+
+    h2c->payload_bytes += r->request_length;
+
     ngx_http_process_request(r);
 
 failed:
@@ -4312,8 +4290,9 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
     fc = stream->request->connection;
 
     if (stream->queued) {
-        fc->write->handler = ngx_http_v2_close_stream_handler;
-        fc->read->handler = ngx_http_empty_handler;
+        fc->error = 1;
+        fc->write->handler = ngx_http_v2_retry_close_stream_handler;
+        fc->read->handler = ngx_http_v2_retry_close_stream_handler;
         return;
     }
 
@@ -4329,33 +4308,11 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
             }
 
         } else if (!stream->in_closed) {
-#if 0
             if (ngx_http_v2_send_rst_stream(h2c, node->id, NGX_HTTP_V2_NO_ERROR)
                 != NGX_OK)
             {
                 h2c->connection->error = 1;
             }
-#else
-            /*
-             * At the time of writing at least the latest versions of Chrome
-             * do not properly handle RST_STREAM with NO_ERROR status.
-             *
-             * See: https://bugs.chromium.org/p/chromium/issues/detail?id=603182
-             *
-             * As a workaround, the stream window is maximized before closing
-             * the stream.  This allows a client to send up to 2 GB of data
-             * before getting blocked on flow control.
-             */
-
-            if (stream->recv_window < NGX_HTTP_V2_MAX_WINDOW
-                && ngx_http_v2_send_window_update(h2c, node->id,
-                                                  NGX_HTTP_V2_MAX_WINDOW
-                                                  - stream->recv_window)
-                   != NGX_OK)
-            {
-                h2c->connection->error = 1;
-            }
-#endif
         }
     }
 
@@ -4457,6 +4414,22 @@ ngx_http_v2_close_stream_handler(ngx_event_t *ev)
 }
 
 
+static void
+ngx_http_v2_retry_close_stream_handler(ngx_event_t *ev)
+{
+    ngx_connection_t    *fc;
+    ngx_http_request_t  *r;
+
+    fc = ev->data;
+    r = fc->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 retry close stream handler");
+
+    ngx_http_v2_close_stream(r->stream, 0);
+}
+
+
 static void
 ngx_http_v2_handle_connection_handler(ngx_event_t *rev)
 {
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 69d55d1..59ddf54 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -119,6 +119,9 @@ struct ngx_http_v2_connection_s {
     ngx_connection_t                *connection;
     ngx_http_connection_t           *http_connection;
 
+    off_t                            total_bytes;
+    off_t                            payload_bytes;
+
     ngx_uint_t                       processing;
     ngx_uint_t                       frames;
     ngx_uint_t                       idle;
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 7735b5b..a6e5e7d 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -1444,6 +1444,12 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
 
     if (in == NULL || stream->out_closed) {
 
+        if (size) {
+            ngx_log_error(NGX_LOG_ERR, fc->log, 0,
+                          "output on closed stream");
+            return NGX_CHAIN_ERROR;
+        }
+
         if (stream->queued) {
             fc->write->active = 1;
             fc->write->ready = 0;
@@ -1871,6 +1877,8 @@ ngx_http_v2_headers_frame_handler(ngx_http_v2_connection_t *h2c,
     stream->request->header_size += NGX_HTTP_V2_FRAME_HEADER_SIZE
                                     + frame->length;
 
+    h2c->payload_bytes += frame->length;
+
     ngx_http_v2_handle_frame(stream, frame);
 
     ngx_http_v2_handle_stream(h2c, stream);
@@ -1925,6 +1933,8 @@ ngx_http_v2_push_frame_handler(ngx_http_v2_connection_t *h2c,
     stream->request->header_size += NGX_HTTP_V2_FRAME_HEADER_SIZE
                                     + frame->length;
 
+    h2c->payload_bytes += frame->length;
+
     ngx_http_v2_handle_frame(stream, frame);
 
     ngx_http_v2_handle_stream(h2c, stream);
@@ -2018,6 +2028,8 @@ done:
 
     stream->request->header_size += NGX_HTTP_V2_FRAME_HEADER_SIZE;
 
+    h2c->payload_bytes += frame->length;
+
     ngx_http_v2_handle_frame(stream, frame);
 
     ngx_http_v2_handle_stream(h2c, stream);
@@ -2030,12 +2042,17 @@ static ngx_inline void
 ngx_http_v2_handle_frame(ngx_http_v2_stream_t *stream,
     ngx_http_v2_out_frame_t *frame)
 {
-    ngx_http_request_t  *r;
+    ngx_http_request_t        *r;
+    ngx_http_v2_connection_t  *h2c;
 
     r = stream->request;
 
     r->connection->sent += NGX_HTTP_V2_FRAME_HEADER_SIZE + frame->length;
 
+    h2c = stream->connection;
+
+    h2c->total_bytes += NGX_HTTP_V2_FRAME_HEADER_SIZE + frame->length;
+
     if (frame->fin) {
         stream->out_closed = 1;
     }
diff --git a/src/mail/ngx_mail_smtp_handler.c b/src/mail/ngx_mail_smtp_handler.c
index 939fb1a..f1017e0 100644
--- a/src/mail/ngx_mail_smtp_handler.c
+++ b/src/mail/ngx_mail_smtp_handler.c
@@ -15,6 +15,7 @@
 static void ngx_mail_smtp_resolve_addr_handler(ngx_resolver_ctx_t *ctx);
 static void ngx_mail_smtp_resolve_name(ngx_event_t *rev);
 static void ngx_mail_smtp_resolve_name_handler(ngx_resolver_ctx_t *ctx);
+static void ngx_mail_smtp_block_reading(ngx_event_t *rev);
 static void ngx_mail_smtp_greeting(ngx_mail_session_t *s, ngx_connection_t *c);
 static void ngx_mail_smtp_invalid_pipelining(ngx_event_t *rev);
 static ngx_int_t ngx_mail_smtp_create_buffer(ngx_mail_session_t *s,
@@ -88,6 +89,9 @@ ngx_mail_smtp_init_session(ngx_mail_session_t *s, ngx_connection_t *c)
     ctx->data = s;
     ctx->timeout = cscf->resolver_timeout;
 
+    s->resolver_ctx = ctx;
+    c->read->handler = ngx_mail_smtp_block_reading;
+
     if (ngx_resolve_addr(ctx) != NGX_OK) {
         ngx_mail_close_connection(c);
     }
@@ -169,6 +173,9 @@ ngx_mail_smtp_resolve_name(ngx_event_t *rev)
     ctx->data = s;
     ctx->timeout = cscf->resolver_timeout;
 
+    s->resolver_ctx = ctx;
+    c->read->handler = ngx_mail_smtp_block_reading;
+
     if (ngx_resolve_name(ctx) != NGX_OK) {
         ngx_mail_close_connection(c);
     }
@@ -238,6 +245,38 @@ found:
 }
 
 
+static void
+ngx_mail_smtp_block_reading(ngx_event_t *rev)
+{
+    ngx_connection_t    *c;
+    ngx_mail_session_t  *s;
+    ngx_resolver_ctx_t  *ctx;
+
+    c = rev->data;
+    s = c->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "smtp reading blocked");
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+
+        if (s->resolver_ctx) {
+            ctx = s->resolver_ctx;
+
+            if (ctx->handler == ngx_mail_smtp_resolve_addr_handler) {
+                ngx_resolve_addr_done(ctx);
+
+            } else if (ctx->handler == ngx_mail_smtp_resolve_name_handler) {
+                ngx_resolve_name_done(ctx);
+            }
+
+            s->resolver_ctx = NULL;
+        }
+
+        ngx_mail_close_connection(c);
+    }
+}
+
+
 static void
 ngx_mail_smtp_greeting(ngx_mail_session_t *s, ngx_connection_t *c)
 {
@@ -258,6 +297,10 @@ ngx_mail_smtp_greeting(ngx_mail_session_t *s, ngx_connection_t *c)
         ngx_mail_close_connection(c);
     }
 
+    if (c->read->ready) {
+        ngx_post_event(c->read, &ngx_posted_events);
+    }
+
     if (sscf->greeting_delay) {
          c->read->handler = ngx_mail_smtp_invalid_pipelining;
          return;
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index 5544f75..e193b29 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -388,7 +388,7 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
         if (conf->client_certificate.len == 0 && conf->verify != 3) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no ssl_client_certificate for ssl_client_verify");
+                          "no ssl_client_certificate for ssl_verify_client");
             return NGX_CONF_ERROR;
         }
 
diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c
index 454cfdc..a3577ce 100644
--- a/src/os/unix/ngx_readv_chain.c
+++ b/src/os/unix/ngx_readv_chain.c
@@ -60,7 +60,7 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
                        "readv: eof:%d, avail:%d",
                        rev->pending_eof, rev->available);
 
-        if (!rev->available && !rev->pending_eof) {
+        if (rev->available == 0 && !rev->pending_eof) {
             return NGX_AGAIN;
         }
     }
@@ -165,6 +165,40 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
 
 #endif
 
+#if (NGX_HAVE_FIONREAD)
+
+            if (rev->available >= 0) {
+                rev->available -= n;
+
+                /*
+                 * negative rev->available means some additional bytes
+                 * were received between kernel notification and readv(),
+                 * and therefore ev->ready can be safely reset even for
+                 * edge-triggered event methods
+                 */
+
+                if (rev->available < 0) {
+                    rev->available = 0;
+                    rev->ready = 0;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                               "readv: avail:%d", rev->available);
+
+            } else if (n == size) {
+
+                if (ngx_socket_nread(c->fd, &rev->available) == -1) {
+                    n = ngx_connection_error(c, ngx_socket_errno,
+                                             ngx_socket_nread_n " failed");
+                    break;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                               "readv: avail:%d", rev->available);
+            }
+
+#endif
+
 #if (NGX_HAVE_EPOLLRDHUP)
 
             if ((ngx_event_flags & NGX_USE_EPOLL_EVENT)
diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index c85fd45..ddfae4d 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -57,7 +57,7 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
                        "recv: eof:%d, avail:%d",
                        rev->pending_eof, rev->available);
 
-        if (!rev->available && !rev->pending_eof) {
+        if (rev->available == 0 && !rev->pending_eof) {
             rev->ready = 0;
             return NGX_AGAIN;
         }
@@ -116,6 +116,40 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 
 #endif
 
+#if (NGX_HAVE_FIONREAD)
+
+            if (rev->available >= 0) {
+                rev->available -= n;
+
+                /*
+                 * negative rev->available means some additional bytes
+                 * were received between kernel notification and recv(),
+                 * and therefore ev->ready can be safely reset even for
+                 * edge-triggered event methods
+                 */
+
+                if (rev->available < 0) {
+                    rev->available = 0;
+                    rev->ready = 0;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                               "recv: avail:%d", rev->available);
+
+            } else if ((size_t) n == size) {
+
+                if (ngx_socket_nread(c->fd, &rev->available) == -1) {
+                    n = ngx_connection_error(c, ngx_socket_errno,
+                                             ngx_socket_nread_n " failed");
+                    break;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                               "recv: avail:%d", rev->available);
+            }
+
+#endif
+
 #if (NGX_HAVE_EPOLLRDHUP)
 
             if ((ngx_event_flags & NGX_USE_EPOLL_EVENT)
diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h
index fcc5153..ec66a6f 100644
--- a/src/os/unix/ngx_socket.h
+++ b/src/os/unix/ngx_socket.h
@@ -38,6 +38,13 @@ int ngx_blocking(ngx_socket_t s);
 
 #endif
 
+#if (NGX_HAVE_FIONREAD)
+
+#define ngx_socket_nread(s, n)  ioctl(s, FIONREAD, n)
+#define ngx_socket_nread_n      "ioctl(FIONREAD)"
+
+#endif
+
 int ngx_tcp_nopush(ngx_socket_t s);
 int ngx_tcp_push(ngx_socket_t s);
 
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 57e73e0..9e35832 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -226,6 +226,8 @@ struct ngx_stream_session_s {
     unsigned                       stat_processing:1;
 
     unsigned                       health_check:1;
+
+    unsigned                       limit_conn_status:2;
 };
 
 
diff --git a/src/stream/ngx_stream_limit_conn_module.c b/src/stream/ngx_stream_limit_conn_module.c
index b64a426..bae034a 100644
--- a/src/stream/ngx_stream_limit_conn_module.c
+++ b/src/stream/ngx_stream_limit_conn_module.c
@@ -10,35 +10,48 @@
 #include <ngx_stream.h>
 
 
+#define NGX_STREAM_LIMIT_CONN_PASSED            1
+#define NGX_STREAM_LIMIT_CONN_REJECTED          2
+#define NGX_STREAM_LIMIT_CONN_REJECTED_DRY_RUN  3
+
+
 typedef struct {
-    u_char                       color;
-    u_char                       len;
-    u_short                      conn;
-    u_char                       data[1];
+    u_char                          color;
+    u_char                          len;
+    u_short                         conn;
+    u_char                          data[1];
 } ngx_stream_limit_conn_node_t;
 
 
 typedef struct {
-    ngx_shm_zone_t              *shm_zone;
-    ngx_rbtree_node_t           *node;
+    ngx_shm_zone_t                 *shm_zone;
+    ngx_rbtree_node_t              *node;
 } ngx_stream_limit_conn_cleanup_t;
 
 
 typedef struct {
-    ngx_rbtree_t                *rbtree;
-    ngx_stream_complex_value_t   key;
+    ngx_rbtree_t                    rbtree;
+    ngx_rbtree_node_t               sentinel;
+} ngx_stream_limit_conn_shctx_t;
+
+
+typedef struct {
+    ngx_stream_limit_conn_shctx_t  *sh;
+    ngx_slab_pool_t                *shpool;
+    ngx_stream_complex_value_t      key;
 } ngx_stream_limit_conn_ctx_t;
 
 
 typedef struct {
-    ngx_shm_zone_t              *shm_zone;
-    ngx_uint_t                   conn;
+    ngx_shm_zone_t                 *shm_zone;
+    ngx_uint_t                      conn;
 } ngx_stream_limit_conn_limit_t;
 
 
 typedef struct {
-    ngx_array_t                  limits;
-    ngx_uint_t                   log_level;
+    ngx_array_t                     limits;
+    ngx_uint_t                      log_level;
+    ngx_flag_t                      dry_run;
 } ngx_stream_limit_conn_conf_t;
 
 
@@ -47,6 +60,8 @@ static ngx_rbtree_node_t *ngx_stream_limit_conn_lookup(ngx_rbtree_t *rbtree,
 static void ngx_stream_limit_conn_cleanup(void *data);
 static ngx_inline void ngx_stream_limit_conn_cleanup_all(ngx_pool_t *pool);
 
+static ngx_int_t ngx_stream_limit_conn_status_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
 static void *ngx_stream_limit_conn_create_conf(ngx_conf_t *cf);
 static char *ngx_stream_limit_conn_merge_conf(ngx_conf_t *cf, void *parent,
     void *child);
@@ -54,6 +69,7 @@ static char *ngx_stream_limit_conn_zone(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_stream_limit_conn(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static ngx_int_t ngx_stream_limit_conn_add_variables(ngx_conf_t *cf);
 static ngx_int_t ngx_stream_limit_conn_init(ngx_conf_t *cf);
 
 
@@ -89,12 +105,19 @@ static ngx_command_t  ngx_stream_limit_conn_commands[] = {
       offsetof(ngx_stream_limit_conn_conf_t, log_level),
       &ngx_stream_limit_conn_log_levels },
 
+    { ngx_string("limit_conn_dry_run"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_limit_conn_conf_t, dry_run),
+      NULL },
+
       ngx_null_command
 };
 
 
 static ngx_stream_module_t  ngx_stream_limit_conn_module_ctx = {
-    NULL,                                  /* preconfiguration */
+    ngx_stream_limit_conn_add_variables,   /* preconfiguration */
     ngx_stream_limit_conn_init,            /* postconfiguration */
 
     NULL,                                  /* create main configuration */
@@ -121,6 +144,22 @@ ngx_module_t  ngx_stream_limit_conn_module = {
 };
 
 
+static ngx_stream_variable_t  ngx_stream_limit_conn_vars[] = {
+
+    { ngx_string("limit_conn_status"), NULL,
+      ngx_stream_limit_conn_status_variable, 0, NGX_STREAM_VAR_NOCACHEABLE, 0 },
+
+      ngx_stream_null_variable
+};
+
+
+static ngx_str_t  ngx_stream_limit_conn_status[] = {
+    ngx_string("PASSED"),
+    ngx_string("REJECTED"),
+    ngx_string("REJECTED_DRY_RUN")
+};
+
+
 static ngx_int_t
 ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
 {
@@ -128,7 +167,6 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
     uint32_t                          hash;
     ngx_str_t                         key;
     ngx_uint_t                        i;
-    ngx_slab_pool_t                  *shpool;
     ngx_rbtree_node_t                *node;
     ngx_pool_cleanup_t               *cln;
     ngx_stream_limit_conn_ctx_t      *ctx;
@@ -159,13 +197,13 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
             continue;
         }
 
+        s->limit_conn_status = NGX_STREAM_LIMIT_CONN_PASSED;
+
         hash = ngx_crc32_short(key.data, key.len);
 
-        shpool = (ngx_slab_pool_t *) limits[i].shm_zone->shm.addr;
+        ngx_shmtx_lock(&ctx->shpool->mutex);
 
-        ngx_shmtx_lock(&shpool->mutex);
-
-        node = ngx_stream_limit_conn_lookup(ctx->rbtree, &key, hash);
+        node = ngx_stream_limit_conn_lookup(&ctx->sh->rbtree, &key, hash);
 
         if (node == NULL) {
 
@@ -173,11 +211,20 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
                 + offsetof(ngx_stream_limit_conn_node_t, data)
                 + key.len;
 
-            node = ngx_slab_alloc_locked(shpool, n);
+            node = ngx_slab_alloc_locked(ctx->shpool, n);
 
             if (node == NULL) {
-                ngx_shmtx_unlock(&shpool->mutex);
+                ngx_shmtx_unlock(&ctx->shpool->mutex);
                 ngx_stream_limit_conn_cleanup_all(s->connection->pool);
+
+                if (lccf->dry_run) {
+                    s->limit_conn_status =
+                                        NGX_STREAM_LIMIT_CONN_REJECTED_DRY_RUN;
+                    return NGX_DECLINED;
+                }
+
+                s->limit_conn_status = NGX_STREAM_LIMIT_CONN_REJECTED;
+
                 return NGX_STREAM_SERVICE_UNAVAILABLE;
             }
 
@@ -188,7 +235,7 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
             lc->conn = 1;
             ngx_memcpy(lc->data, key.data, key.len);
 
-            ngx_rbtree_insert(ctx->rbtree, node);
+            ngx_rbtree_insert(&ctx->sh->rbtree, node);
 
         } else {
 
@@ -196,13 +243,23 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
 
             if ((ngx_uint_t) lc->conn >= limits[i].conn) {
 
-                ngx_shmtx_unlock(&shpool->mutex);
+                ngx_shmtx_unlock(&ctx->shpool->mutex);
 
                 ngx_log_error(lccf->log_level, s->connection->log, 0,
-                              "limiting connections by zone \"%V\"",
+                              "limiting connections%s by zone \"%V\"",
+                              lccf->dry_run ? ", dry run," : "",
                               &limits[i].shm_zone->shm.name);
 
                 ngx_stream_limit_conn_cleanup_all(s->connection->pool);
+
+                if (lccf->dry_run) {
+                    s->limit_conn_status =
+                                        NGX_STREAM_LIMIT_CONN_REJECTED_DRY_RUN;
+                    return NGX_DECLINED;
+                }
+
+                s->limit_conn_status = NGX_STREAM_LIMIT_CONN_REJECTED;
+
                 return NGX_STREAM_SERVICE_UNAVAILABLE;
             }
 
@@ -212,7 +269,7 @@ ngx_stream_limit_conn_handler(ngx_stream_session_t *s)
         ngx_log_debug2(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
                        "limit conn: %08Xi %d", node->key, lc->conn);
 
-        ngx_shmtx_unlock(&shpool->mutex);
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
 
         cln = ngx_pool_cleanup_add(s->connection->pool,
                                    sizeof(ngx_stream_limit_conn_cleanup_t));
@@ -317,17 +374,15 @@ ngx_stream_limit_conn_cleanup(void *data)
 {
     ngx_stream_limit_conn_cleanup_t  *lccln = data;
 
-    ngx_slab_pool_t               *shpool;
     ngx_rbtree_node_t             *node;
     ngx_stream_limit_conn_ctx_t   *ctx;
     ngx_stream_limit_conn_node_t  *lc;
 
     ctx = lccln->shm_zone->data;
-    shpool = (ngx_slab_pool_t *) lccln->shm_zone->shm.addr;
     node = lccln->node;
     lc = (ngx_stream_limit_conn_node_t *) &node->color;
 
-    ngx_shmtx_lock(&shpool->mutex);
+    ngx_shmtx_lock(&ctx->shpool->mutex);
 
     ngx_log_debug2(NGX_LOG_DEBUG_STREAM, lccln->shm_zone->shm.log, 0,
                    "limit conn cleanup: %08Xi %d", node->key, lc->conn);
@@ -335,11 +390,11 @@ ngx_stream_limit_conn_cleanup(void *data)
     lc->conn--;
 
     if (lc->conn == 0) {
-        ngx_rbtree_delete(ctx->rbtree, node);
-        ngx_slab_free_locked(shpool, node);
+        ngx_rbtree_delete(&ctx->sh->rbtree, node);
+        ngx_slab_free_locked(ctx->shpool, node);
     }
 
-    ngx_shmtx_unlock(&shpool->mutex);
+    ngx_shmtx_unlock(&ctx->shpool->mutex);
 }
 
 
@@ -365,8 +420,6 @@ ngx_stream_limit_conn_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     ngx_stream_limit_conn_ctx_t  *octx = data;
 
     size_t                        len;
-    ngx_slab_pool_t              *shpool;
-    ngx_rbtree_node_t            *sentinel;
     ngx_stream_limit_conn_ctx_t  *ctx;
 
     ctx = shm_zone->data;
@@ -385,48 +438,64 @@ ngx_stream_limit_conn_init_zone(ngx_shm_zone_t *shm_zone, void *data)
             return NGX_ERROR;
         }
 
-        ctx->rbtree = octx->rbtree;
+        ctx->sh = octx->sh;
+        ctx->shpool = octx->shpool;
 
         return NGX_OK;
     }
 
-    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+    ctx->shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
 
     if (shm_zone->shm.exists) {
-        ctx->rbtree = shpool->data;
+        ctx->sh = ctx->shpool->data;
 
         return NGX_OK;
     }
 
-    ctx->rbtree = ngx_slab_alloc(shpool, sizeof(ngx_rbtree_t));
-    if (ctx->rbtree == NULL) {
+    ctx->sh = ngx_slab_alloc(ctx->shpool,
+                             sizeof(ngx_stream_limit_conn_shctx_t));
+    if (ctx->sh == NULL) {
         return NGX_ERROR;
     }
 
-    shpool->data = ctx->rbtree;
+    ctx->shpool->data = ctx->sh;
 
-    sentinel = ngx_slab_alloc(shpool, sizeof(ngx_rbtree_node_t));
-    if (sentinel == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_rbtree_init(ctx->rbtree, sentinel,
+    ngx_rbtree_init(&ctx->sh->rbtree, &ctx->sh->sentinel,
                     ngx_stream_limit_conn_rbtree_insert_value);
 
     len = sizeof(" in limit_conn_zone \"\"") + shm_zone->shm.name.len;
 
-    shpool->log_ctx = ngx_slab_alloc(shpool, len);
-    if (shpool->log_ctx == NULL) {
+    ctx->shpool->log_ctx = ngx_slab_alloc(ctx->shpool, len);
+    if (ctx->shpool->log_ctx == NULL) {
         return NGX_ERROR;
     }
 
-    ngx_sprintf(shpool->log_ctx, " in limit_conn_zone \"%V\"%Z",
+    ngx_sprintf(ctx->shpool->log_ctx, " in limit_conn_zone \"%V\"%Z",
                 &shm_zone->shm.name);
 
     return NGX_OK;
 }
 
 
+static ngx_int_t
+ngx_stream_limit_conn_status_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    if (s->limit_conn_status == 0) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->len = ngx_stream_limit_conn_status[s->limit_conn_status - 1].len;
+    v->data = ngx_stream_limit_conn_status[s->limit_conn_status - 1].data;
+
+    return NGX_OK;
+}
+
+
 static void *
 ngx_stream_limit_conn_create_conf(ngx_conf_t *cf)
 {
@@ -444,6 +513,7 @@ ngx_stream_limit_conn_create_conf(ngx_conf_t *cf)
      */
 
     conf->log_level = NGX_CONF_UNSET_UINT;
+    conf->dry_run = NGX_CONF_UNSET;
 
     return conf;
 }
@@ -461,6 +531,8 @@ ngx_stream_limit_conn_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR);
 
+    ngx_conf_merge_value(conf->dry_run, prev->dry_run, 0);
+
     return NGX_CONF_OK;
 }
 
@@ -627,6 +699,25 @@ ngx_stream_limit_conn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static ngx_int_t
+ngx_stream_limit_conn_add_variables(ngx_conf_t *cf)
+{
+    ngx_stream_variable_t  *var, *v;
+
+    for (v = ngx_stream_limit_conn_vars; v->name.len; v++) {
+        var = ngx_stream_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_limit_conn_init(ngx_conf_t *cf)
 {
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 127c8a4..7484a72 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -24,8 +24,8 @@ typedef struct {
     ngx_msec_t                       timeout;
     ngx_msec_t                       next_upstream_timeout;
     size_t                           buffer_size;
-    size_t                           upload_rate;
-    size_t                           download_rate;
+    ngx_stream_complex_value_t      *upload_rate;
+    ngx_stream_complex_value_t      *download_rate;
     ngx_uint_t                       requests;
     ngx_uint_t                       responses;
     ngx_uint_t                       next_upstream_tries;
@@ -184,14 +184,14 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
 
     { ngx_string("proxy_upload_rate"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
+      ngx_stream_set_complex_value_size_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
       offsetof(ngx_stream_proxy_srv_conf_t, upload_rate),
       NULL },
 
     { ngx_string("proxy_download_rate"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
+      ngx_stream_set_complex_value_size_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
       offsetof(ngx_stream_proxy_srv_conf_t, download_rate),
       NULL },
@@ -895,6 +895,9 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
         u->proxy_protocol = 0;
     }
 
+    u->upload_rate = ngx_stream_complex_value_size(s, pscf->upload_rate, 0);
+    u->download_rate = ngx_stream_complex_value_size(s, pscf->download_rate, 0);
+
     u->connected = 1;
 
     pc->read->handler = ngx_stream_proxy_upstream_handler;
@@ -1532,7 +1535,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         src = pc;
         dst = c;
         b = &u->upstream_buf;
-        limit_rate = pscf->download_rate;
+        limit_rate = u->download_rate;
         received = &u->received;
         packets = &u->responses;
         out = &u->downstream_out;
@@ -1544,7 +1547,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
         src = c;
         dst = pc;
         b = &u->downstream_buf;
-        limit_rate = pscf->upload_rate;
+        limit_rate = u->upload_rate;
         received = &s->received;
         packets = &u->requests;
         out = &u->upstream_out;
@@ -1955,6 +1958,8 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
      *     conf->ssl_certificate = { 0, NULL };
      *     conf->ssl_certificate_key = { 0, NULL };
      *
+     *     conf->upload_rate = NULL;
+     *     conf->download_rate = NULL;
      *     conf->ssl = NULL;
      *     conf->upstream = NULL;
      *     conf->upstream_value = NULL;
@@ -1964,8 +1969,6 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
     conf->timeout = NGX_CONF_UNSET_MSEC;
     conf->next_upstream_timeout = NGX_CONF_UNSET_MSEC;
     conf->buffer_size = NGX_CONF_UNSET_SIZE;
-    conf->upload_rate = NGX_CONF_UNSET_SIZE;
-    conf->download_rate = NGX_CONF_UNSET_SIZE;
     conf->requests = NGX_CONF_UNSET_UINT;
     conf->responses = NGX_CONF_UNSET_UINT;
     conf->next_upstream_tries = NGX_CONF_UNSET_UINT;
@@ -2005,11 +2008,13 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_size_value(conf->buffer_size,
                               prev->buffer_size, 16384);
 
-    ngx_conf_merge_size_value(conf->upload_rate,
-                              prev->upload_rate, 0);
+    if (conf->upload_rate == NULL) {
+        conf->upload_rate = prev->upload_rate;
+    }
 
-    ngx_conf_merge_size_value(conf->download_rate,
-                              prev->download_rate, 0);
+    if (conf->download_rate == NULL) {
+        conf->download_rate = prev->download_rate;
+    }
 
     ngx_conf_merge_uint_value(conf->requests,
                               prev->requests, 0);
diff --git a/src/stream/ngx_stream_realip_module.c b/src/stream/ngx_stream_realip_module.c
index 57b1ac2..603f597 100644
--- a/src/stream/ngx_stream_realip_module.c
+++ b/src/stream/ngx_stream_realip_module.c
@@ -108,7 +108,7 @@ ngx_stream_realip_handler(ngx_stream_session_t *s)
 
     c = s->connection;
 
-    if (c->proxy_protocol_addr.len == 0) {
+    if (c->proxy_protocol == NULL) {
         return NGX_DECLINED;
     }
 
@@ -116,14 +116,14 @@ ngx_stream_realip_handler(ngx_stream_session_t *s)
         return NGX_DECLINED;
     }
 
-    if (ngx_parse_addr(c->pool, &addr, c->proxy_protocol_addr.data,
-                       c->proxy_protocol_addr.len)
+    if (ngx_parse_addr(c->pool, &addr, c->proxy_protocol->src_addr.data,
+                       c->proxy_protocol->src_addr.len)
         != NGX_OK)
     {
         return NGX_DECLINED;
     }
 
-    ngx_inet_set_port(addr.sockaddr, c->proxy_protocol_port);
+    ngx_inet_set_port(addr.sockaddr, c->proxy_protocol->src_port);
 
     return ngx_stream_realip_set_addr(s, &addr);
 }
diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c
index b00e708..a15f772 100644
--- a/src/stream/ngx_stream_script.c
+++ b/src/stream/ngx_stream_script.c
@@ -105,6 +105,37 @@ ngx_stream_complex_value(ngx_stream_session_t *s,
 }
 
 
+size_t
+ngx_stream_complex_value_size(ngx_stream_session_t *s,
+    ngx_stream_complex_value_t *val, size_t default_value)
+{
+    size_t     size;
+    ngx_str_t  value;
+
+    if (val == NULL) {
+        return default_value;
+    }
+
+    if (val->lengths == NULL) {
+        return val->u.size;
+    }
+
+    if (ngx_stream_complex_value(s, val, &value) != NGX_OK) {
+        return default_value;
+    }
+
+    size = ngx_parse_size(&value);
+
+    if (size == (size_t) NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "invalid size \"%V\"", &value);
+        return default_value;
+    }
+
+    return size;
+}
+
+
 ngx_int_t
 ngx_stream_compile_complex_value(ngx_stream_compile_complex_value_t *ccv)
 {
@@ -246,6 +277,36 @@ ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 }
 
 
+char *
+ngx_stream_set_complex_value_size_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char  *p = conf;
+
+    char                        *rv;
+    ngx_stream_complex_value_t  *cv;
+
+    rv = ngx_stream_set_complex_value_slot(cf, cmd, conf);
+
+    if (rv != NGX_CONF_OK) {
+        return rv;
+    }
+
+    cv = *(ngx_stream_complex_value_t **) (p + cmd->offset);
+
+    if (cv->lengths) {
+        return NGX_CONF_OK;
+    }
+
+    cv->u.size = ngx_parse_size(&cv->value);
+    if (cv->u.size == (size_t) NGX_ERROR) {
+        return "invalid value";
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 ngx_uint_t
 ngx_stream_script_variables_count(ngx_str_t *value)
 {
diff --git a/src/stream/ngx_stream_script.h b/src/stream/ngx_stream_script.h
index 25a450d..a481ca3 100644
--- a/src/stream/ngx_stream_script.h
+++ b/src/stream/ngx_stream_script.h
@@ -56,6 +56,10 @@ typedef struct {
     ngx_uint_t                   *flushes;
     void                         *lengths;
     void                         *values;
+
+    union {
+        size_t                    size;
+    } u;
 } ngx_stream_complex_value_t;
 
 
@@ -102,10 +106,14 @@ void ngx_stream_script_flush_complex_value(ngx_stream_session_t *s,
     ngx_stream_complex_value_t *val);
 ngx_int_t ngx_stream_complex_value(ngx_stream_session_t *s,
     ngx_stream_complex_value_t *val, ngx_str_t *value);
+size_t ngx_stream_complex_value_size(ngx_stream_session_t *s,
+    ngx_stream_complex_value_t *val, size_t default_value);
 ngx_int_t ngx_stream_compile_complex_value(
     ngx_stream_compile_complex_value_t *ccv);
 char *ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+char *ngx_stream_set_complex_value_size_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 
 
 ngx_uint_t ngx_stream_script_variables_count(ngx_str_t *value);
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index ec9524e..79f30a8 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -745,7 +745,7 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
         if (conf->client_certificate.len == 0 && conf->verify != 3) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no ssl_client_certificate for ssl_client_verify");
+                          "no ssl_client_certificate for ssl_verify_client");
             return NGX_CONF_ERROR;
         }
 
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index 0fe416b..9857e0b 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -132,6 +132,9 @@ typedef struct {
     ngx_uint_t                         responses;
     ngx_msec_t                         start_time;
 
+    size_t                             upload_rate;
+    size_t                             download_rate;
+
     ngx_str_t                          ssl_name;
 
     ngx_stream_upstream_srv_conf_t    *upstream;
diff --git a/src/stream/ngx_stream_upstream_hash_module.c b/src/stream/ngx_stream_upstream_hash_module.c
index 4fa9a2d..b764fcb 100644
--- a/src/stream/ngx_stream_upstream_hash_module.c
+++ b/src/stream/ngx_stream_upstream_hash_module.c
@@ -178,7 +178,7 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
 
     ngx_stream_upstream_rr_peers_rlock(hp->rrp.peers);
 
-    if (hp->tries > 20 || hp->rrp.peers->single) {
+    if (hp->tries > 20 || hp->rrp.peers->single || hp->key.len == 0) {
         ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
         return hp->get_rr_peer(pc, &hp->rrp);
     }
@@ -511,7 +511,7 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
 
     ngx_stream_upstream_rr_peers_wlock(hp->rrp.peers);
 
-    if (hp->tries > 20 || hp->rrp.peers->single) {
+    if (hp->tries > 20 || hp->rrp.peers->single || hp->key.len == 0) {
         ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
         return hp->get_rr_peer(pc, &hp->rrp);
     }
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
index 36e2ec5..c207667 100644
--- a/src/stream/ngx_stream_upstream_round_robin.c
+++ b/src/stream/ngx_stream_upstream_round_robin.c
@@ -701,10 +701,7 @@ ngx_stream_upstream_set_round_robin_peer_session(ngx_peer_connection_t *pc,
     ngx_stream_upstream_rr_peer_t   *peer;
 #if (NGX_STREAM_UPSTREAM_ZONE)
     int                              len;
-#if OPENSSL_VERSION_NUMBER >= 0x0090707fL
-    const
-#endif
-    u_char                          *p;
+    const u_char                    *p;
     ngx_stream_upstream_rr_peers_t  *peers;
     u_char                           buf[NGX_SSL_MAX_SESSION_SIZE];
 #endif
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
index d1526a9..8b59668 100644
--- a/src/stream/ngx_stream_variables.c
+++ b/src/stream/ngx_stream_variables.c
@@ -64,10 +64,20 @@ static ngx_stream_variable_t  ngx_stream_core_variables[] = {
       ngx_stream_variable_remote_port, 0, 0, 0 },
 
     { ngx_string("proxy_protocol_addr"), NULL,
-      ngx_stream_variable_proxy_protocol_addr, 0, 0, 0 },
+      ngx_stream_variable_proxy_protocol_addr,
+      offsetof(ngx_proxy_protocol_t, src_addr), 0, 0 },
 
     { ngx_string("proxy_protocol_port"), NULL,
-      ngx_stream_variable_proxy_protocol_port, 0, 0, 0 },
+      ngx_stream_variable_proxy_protocol_port,
+      offsetof(ngx_proxy_protocol_t, src_port), 0, 0 },
+
+    { ngx_string("proxy_protocol_server_addr"), NULL,
+      ngx_stream_variable_proxy_protocol_addr,
+      offsetof(ngx_proxy_protocol_t, dst_addr), 0, 0 },
+
+    { ngx_string("proxy_protocol_server_port"), NULL,
+      ngx_stream_variable_proxy_protocol_port,
+      offsetof(ngx_proxy_protocol_t, dst_port), 0, 0 },
 
     { ngx_string("server_addr"), NULL,
       ngx_stream_variable_server_addr, 0, 0, 0 },
@@ -557,11 +567,22 @@ static ngx_int_t
 ngx_stream_variable_proxy_protocol_addr(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data)
 {
-    v->len = s->connection->proxy_protocol_addr.len;
+    ngx_str_t             *addr;
+    ngx_proxy_protocol_t  *pp;
+
+    pp = s->connection->proxy_protocol;
+    if (pp == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    addr = (ngx_str_t *) ((char *) pp + data);
+
+    v->len = addr->len;
     v->valid = 1;
     v->no_cacheable = 0;
     v->not_found = 0;
-    v->data = s->connection->proxy_protocol_addr.data;
+    v->data = addr->data;
 
     return NGX_OK;
 }
@@ -571,7 +592,14 @@ static ngx_int_t
 ngx_stream_variable_proxy_protocol_port(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data)
 {
-    ngx_uint_t  port;
+    ngx_uint_t             port;
+    ngx_proxy_protocol_t  *pp;
+
+    pp = s->connection->proxy_protocol;
+    if (pp == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
 
     v->len = 0;
     v->valid = 1;
@@ -583,7 +611,7 @@ ngx_stream_variable_proxy_protocol_port(ngx_stream_session_t *s,
         return NGX_ERROR;
     }
 
-    port = s->connection->proxy_protocol_port;
+    port = *(in_port_t *) ((char *) pp + data);
 
     if (port > 0 && port < 65536) {
         v->len = ngx_sprintf(v->data, "%ui", port) - v->data;

From f1ae99061b95a0e38570f3ec60a1a6bd99cc9254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 22:04:34 +0200
Subject: [PATCH 302/600] d/patches/CVE-2019-20372.patch: Rebase

---
 debian/patches/CVE-2019-20372.patch | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/patches/CVE-2019-20372.patch b/debian/patches/CVE-2019-20372.patch
index 7793fa4..741b0a9 100644
--- a/debian/patches/CVE-2019-20372.patch
+++ b/debian/patches/CVE-2019-20372.patch
@@ -9,12 +9,10 @@ Reported by Bert JW Regeer and Francisco Oca Gonzalez.
  src/http/ngx_http_special_response.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
-index 2c1ff174..e2a5e9dc 100644
 --- a/src/http/ngx_http_special_response.c
 +++ b/src/http/ngx_http_special_response.c
-@@ -623,6 +623,12 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
-         return ngx_http_named_location(r, &uri);
+@@ -629,6 +629,12 @@
+         r->keepalive = 0;
      }
  
 +    r->expect_tested = 1;
@@ -26,6 +24,3 @@ index 2c1ff174..e2a5e9dc 100644
      location = ngx_list_push(&r->headers_out.headers);
  
      if (location == NULL) {
--- 
-2.23.0
-

From 3c7832e4c7a11c06ff9242600e8945b4f35b1dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 22:11:02 +0200
Subject: [PATCH 303/600] New upstream version.

---
 debian/changelog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4f12422..cc8aeb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.18.0-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Ondřej Nový <onovy@debian.org>  Thu, 28 May 2020 22:05:22 +0200
+
 nginx (1.16.1-3) unstable; urgency=high
 
   * Handle CVE-2019-20372, error page request smuggling
@@ -2345,4 +2351,3 @@ nginx (0.4.2-1) unstable; urgency=low
   * Tweaked the configuration file and the path handling for Debian.
 
  -- Jose Parrella <joseparrella@cantv.net>  Thu, 14 Sep 2006 11:40:20 -0400
-

From 6ac8972bb0578098ba4810dd3d7be3a2b112baa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 22:38:58 +0200
Subject: [PATCH 304/600] Convert d/ngxmod to Python 3 (Closes: #953025)

---
 debian/ngxmod | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/debian/ngxmod b/debian/ngxmod
index dba82e8..0ceb399 100755
--- a/debian/ngxmod
+++ b/debian/ngxmod
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Handy Debian nginx module management helper
 """
@@ -13,12 +13,12 @@ import tempfile
 
 from subprocess import call
 
-import deb822
+import debian.deb822 as deb822
 
 DEBIAN_PATH = os.path.dirname(os.path.realpath(__file__))
 MODULES_PATH = os.path.join(DEBIAN_PATH, 'modules')
 CTRL_PATH = os.path.join(MODULES_PATH, 'control')
-CTRL = [p for p in deb822.Deb822.iter_paragraphs(file(CTRL_PATH))]
+CTRL = [p for p in deb822.Deb822.iter_paragraphs(open(CTRL_PATH))]
 
 
 def ctrl(name):
@@ -50,7 +50,7 @@ def prompt(query):
     :returns: The yes (True) or no (False) answer
     """
     sys.stdout.write('%s [y/N]: ' % query)
-    choice = raw_input().lower()
+    choice = input().lower()
 
     return choice == 'y'
 
@@ -80,7 +80,7 @@ def unpack(module, version, exclude):
     tar_gz = os.path.join(
         "..", "libnginx-mod-%s-%s.tar.gz" % (module, version))
     if not os.path.exists(tar_gz):
-        print "%s doesn't exist!" % tar_gz
+        print("%s doesn't exist!" % tar_gz)
         exit(1)
 
     module_path = os.path.join(MODULES_PATH, module)
@@ -91,12 +91,12 @@ def unpack(module, version, exclude):
         # stip top-level directory from tar
         topdir = members[0]
         if not topdir or not topdir.isdir():
-            print "No top directory found!"
+            print("No top directory found!")
             exit(1)
 
         topdir = members[0].path
         if any(topdir not in ti.path for ti in members):
-            print "Not all files are under the top directory '%s'" % topdir
+            print("Not all files are under the top directory '%s'" % topdir)
             exit(1)
 
         def remove_topdir_prefix(tarinfo):
@@ -110,12 +110,16 @@ def unpack(module, version, exclude):
     shutil.move(tmpdir, module_path)
 
     for e in exclude:
-        print "Removing %s..." % e
+        print("Removing %s..." % e)
         abspath = os.path.join(module_path, e)
         if os.path.isdir(abspath):
             shutil.rmtree(abspath)
         else:
-            os.remove(abspath)
+            try:
+                os.remove(abspath)
+            except FileNotFoundError as e:
+                # if it not exists, ignore it
+                pass
 
 
 def cmd_uupdate(args):
@@ -156,7 +160,7 @@ def cmd_uscan(args):
         watchfile = os.path.join(MODULES_PATH, 'watch', mi['Module'])
 
         if not os.path.isfile(watchfile):
-            print 'no watchfile available.'
+            print('no watchfile available.')
             continue
 
         # Check
@@ -166,7 +170,7 @@ def cmd_uscan(args):
             mi['Module']
         ]
         if call(uscan_check_cmd) != 0:
-            print 'up-to-date'
+            print('up-to-date')
             continue
 
         # Ask
@@ -179,7 +183,7 @@ def cmd_uscan(args):
             '--watchfile', watchfile, '--no-symlink'
         ]
         if call(uscan_upgrade_cmd, stdout=open(os.devnull, 'w')) != 0:
-            print "Uscan for %s failed!" % mi['Module']
+            print("Uscan for %s failed!" % mi['Module'])
             exit(1)
 
 

From bc6e1b3c082d45d3f3734959f024c53a2c905652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 22:48:18 +0200
Subject: [PATCH 305/600] nchan: Upgrade to 1.2.7

---
 debian/modules/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index f27ca7c..17a4474 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -34,8 +34,8 @@ Patch:
 
 Module: nchan
 Homepage: https://github.com/slact/nchan
-Version: 1.0.8
-Files-Excluded: dev nchan_logo.png NchanSubscriber.js src/hiredis
+Version: 1.2.7
+Files-Excluded: dev nchan_logo.png NchanSubscriber.js src/hiredis nchan
 
 Module: http-uploadprogress
 Homepage: https://github.com/masterzen/nginx-upload-progress-module

From 5e6d8fe10accab8418c7712f5074c56145f50004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 28 May 2020 22:50:24 +0200
Subject: [PATCH 306/600] http-fancyindex: Upgrade to 0.4.4

---
 debian/modules/control                        |  2 +-
 debian/modules/http-fancyindex/CHANGELOG.md   | 21 +++++++++-
 debian/modules/http-fancyindex/HACKING.md     |  7 +++-
 debian/modules/http-fancyindex/README.rst     | 18 ++++++---
 .../ngx_http_fancyindex_module.c              | 39 ++++++++++++++-----
 .../http-fancyindex/t/06-hide_parent.test     | 23 +++++++++++
 .../t/bug95-square-brackets.test              | 19 +++++++++
 .../t/child-directory/empty-file.txt          |  0
 debian/modules/http-fancyindex/template.h     |  6 +--
 debian/modules/http-fancyindex/template.html  |  6 +--
 10 files changed, 117 insertions(+), 24 deletions(-)
 create mode 100644 debian/modules/http-fancyindex/t/06-hide_parent.test
 create mode 100644 debian/modules/http-fancyindex/t/bug95-square-brackets.test
 create mode 100644 debian/modules/http-fancyindex/t/child-directory/empty-file.txt

diff --git a/debian/modules/control b/debian/modules/control
index 17a4474..d36b386 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -55,7 +55,7 @@ Version: 3.0.0
 
 Module: http-fancyindex
 Homepage: https://github.com/aperezdc/ngx-fancyindex
-Version: 0.4.3
+Version: 0.4.4
 Files-Excluded: .gitignore .travis.yml
 
 Module: http-subs-filter
diff --git a/debian/modules/http-fancyindex/CHANGELOG.md b/debian/modules/http-fancyindex/CHANGELOG.md
index 580ec92..57569e8 100644
--- a/debian/modules/http-fancyindex/CHANGELOG.md
+++ b/debian/modules/http-fancyindex/CHANGELOG.md
@@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.4.4] - 2020-02-19
+### Added
+- New option `fancyindex_hide_parent_dir`, which disables generating
+  links to parent directories in listings. (Patch by Kawai Ryota
+  <<admin@mail.kr-kp.com>>.)
+
+### Changed
+- Each table row is now separated by a new line (as a matter of fact,
+  a `CRLF` sequence), which makes it easier to parse output using simple
+  text tools. (Patch by Anders Trier <<anders.trier.olesen@gmail.com>>.)
+- Some corrections and additions to the README file. (Patches by Nicolas
+  Carpi <<nicolas.carpi@curie.fr>> and David Beitey <<david@davidjb.com>>.)
+
+### Fixed
+- Use correct character references for `&` characters in table sorter URLs
+  within the template (Patch by David Beitey <<david@davidjb.com>>.)
+- Properly encode filenames when used as URI components.
+
 ## [0.4.3] - 2018-07-03
 ### Added
 - Table cells now have class names, which allows for better CSS styling.
@@ -130,7 +148,8 @@ All notable changes to this project will be documented in this file.
 - `NEWS.rst` file, to act as change log.
 
 
-[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.3...HEAD
+[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.4...HEAD
+[0.4.4]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.3...v0.4.4
 [0.4.3]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.0...v0.4.1
diff --git a/debian/modules/http-fancyindex/HACKING.md b/debian/modules/http-fancyindex/HACKING.md
index 0748517..4c8608a 100644
--- a/debian/modules/http-fancyindex/HACKING.md
+++ b/debian/modules/http-fancyindex/HACKING.md
@@ -21,4 +21,9 @@ is known to work flawlessly. Just do:
     $ awk -f template.awk template.html > template.h
 
 If your copy of `awk` is not the GNU implementation, you will need to
-install it and use `gawk` instead in the command line above.
+install it and use `gawk` instead in the command line above. 
+
+This includes macOS where the current built-in `awk` (currently version
+20070501 at time of testing on 10.13.6) doesn't apply correctly and causes
+characters to be omitted from the output. `gawk` can be installed with a 
+package manager such as [Homebrew](https://brew.sh).
diff --git a/debian/modules/http-fancyindex/README.rst b/debian/modules/http-fancyindex/README.rst
index b282b8b..4d178da 100644
--- a/debian/modules/http-fancyindex/README.rst
+++ b/debian/modules/http-fancyindex/README.rst
@@ -11,7 +11,7 @@ Nginx Fancy Index module
 The Fancy Index module makes possible the generation of file listings, like
 the built-in `autoindex <http://wiki.nginx.org/NginxHttpAutoindexModule>`__
 module does, but adding a touch of style. This is possible because the module
-module allows a certain degree of customization of the generated content:
+allows a certain degree of customization of the generated content:
 
 * Custom headers. Either local or stored remotely.
 * Custom footers. Either local or stored remotely.
@@ -52,7 +52,7 @@ versions in the 0.6 series by applying ``nginx-0.6-support.patch``, but this
 is unsupported (YMMV).
 
 In order to use the ``fancyindex_header_`` and ``fancyindex_footer_`` directives
-you will also need the `ngx_http_addition_module <http://nginx.org/en/docs/http/ngx_http_addition_module.html>`_
+you will also need the `ngx_http_addition_module <https://nginx.org/en/docs/http/ngx_http_addition_module.html>`_
 built into Nginx.
 
 
@@ -217,7 +217,7 @@ fancyindex_header
    into Nginx.
 
 fancyindex_show_path
-~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~
 :Syntax: *fancyindex_show_path* [*on* | *off*]
 :Default: fancyindex_show_path on
 :Context: http, server, location
@@ -247,6 +247,14 @@ fancyindex_hide_symlinks
 :Description:
   When enabled, generated listings will not contain symbolic links.
 
+fancyindex_hide_parent_dir
+~~~~~~~~~~~~~~~~~~~~~~~~
+:Syntax: *fancyindex_hide_parent_dir* [*on* | *off*]
+:Default: fancyindex_hide_parent_dir off
+:Context: http, server, location
+:Description:
+  When enabled, it will not show parent directory.
+
 fancyindex_localtime
 ~~~~~~~~~~~~~~~~~~~~
 :Syntax: *fancyindex_localtime* [*on* | *off*]
@@ -262,7 +270,7 @@ fancyindex_time_format
 :Context: http, server, location
 :Description:
   Format string used for timestamps. The format specifiers are a subset of
-  those supported by the `strftime <http://linux.die.net/man/3/strftime>`_
+  those supported by the `strftime <https://linux.die.net/man/3/strftime>`_
   function, and the behavior is locale-independent (for example, day and month
   names are always in English). The supported formats are:
 
@@ -295,6 +303,6 @@ fancyindex_time_format
   * ``%Y``: Year as a decimal number including the century.
 
 
-.. _nginx: http://nginx.net
+.. _nginx: https://nginx.org
 
 .. vim:ft=rst:spell:spelllang=en:
diff --git a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
index 64f98a1..9ce5a38 100644
--- a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
+++ b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
@@ -154,6 +154,7 @@ typedef struct {
     ngx_uint_t name_length;  /**< Maximum length of file names in bytes. */
     ngx_flag_t hide_symlinks;/**< Hide symbolic links in listings. */
     ngx_flag_t show_path;    /**< Whether to display or not the path + '</h1>' after the header */
+    ngx_flag_t hide_parent;  /**< Hide parent directory. */
 
     ngx_str_t  header;       /**< File name for header, or empty if none. */
     ngx_str_t  footer;       /**< File name for footer, or empty if none. */
@@ -258,7 +259,7 @@ static char *ngx_http_fancyindex_ignore(ngx_conf_t    *cf,
                                         void          *conf);
 
 static uintptr_t
-    ngx_fancyindex_escape_uri(u_char *dst, u_char*src, size_t size);
+    ngx_fancyindex_escape_filename(u_char *dst, u_char*src, size_t size);
 
 /*
  * These are used only once per handler invocation. We can tell GCC to
@@ -361,6 +362,13 @@ static ngx_command_t  ngx_http_fancyindex_commands[] = {
       offsetof(ngx_http_fancyindex_loc_conf_t, show_path),
       NULL },
 
+    { ngx_string("fancyindex_hide_parent_dir"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fancyindex_loc_conf_t, hide_parent),
+      NULL },
+
     { ngx_string("fancyindex_time_format"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
       ngx_conf_set_str_slot,
@@ -410,8 +418,15 @@ static const ngx_str_t css_href_post =
     ngx_string("\" type=\"text/css\"/>\n");
 
 
+#ifdef NGX_ESCAPE_URI_COMPONENT
+static inline uintptr_t
+ngx_fancyindex_escape_filename(u_char *dst, u_char *src, size_t size)
+{
+    return ngx_escape_uri(dst, src, size, NGX_ESCAPE_URI_COMPONENT);
+}
+#else /* !NGX_ESCAPE_URI_COMPONENT */
 static uintptr_t
-ngx_fancyindex_escape_uri(u_char *dst, u_char *src, size_t size)
+ngx_fancyindex_escape_filename(u_char *dst, u_char *src, size_t size)
 {
     /*
      * The ngx_escape_uri() function will not escape colons or the
@@ -483,6 +498,7 @@ ngx_fancyindex_escape_uri(u_char *dst, u_char *src, size_t size)
         return escapes + uescapes;
     }
 }
+#endif /* NGX_ESCAPE_URI_COMPONENT */
 
 
 static ngx_inline ngx_buf_t*
@@ -716,9 +732,9 @@ make_content_buf(
             return ngx_http_fancyindex_error(r, &dir, &path);
 
         ngx_cpystrn(entry->name.data, ngx_de_name(&dir), len + 1);
-        entry->escape = 2 * ngx_fancyindex_escape_uri(NULL,
-                                                      ngx_de_name(&dir),
-                                                      len);
+        entry->escape = 2 * ngx_fancyindex_escape_filename(NULL,
+                                                           ngx_de_name(&dir),
+                                                           len);
 
         entry->dir     = ngx_de_is_dir(&dir);
         entry->mtime   = ngx_de_mtime(&dir);
@@ -901,7 +917,7 @@ make_content_buf(
     tp = ngx_timeofday();
 
     /* "Parent dir" entry, always first if displayed */
-    if (r->uri.len > 1) {
+    if (r->uri.len > 1 && alcf->hide_parent == 0) {
         b->last = ngx_cpymem_ssz(b->last,
                                  "<tr>"
                                  "<td class=\"link\"><a href=\"../");
@@ -914,7 +930,8 @@ make_content_buf(
                                  "\">Parent directory/</a></td>"
                                  "<td class=\"size\">-</td>"
                                  "<td class=\"date\">-</td>"
-                                 "</tr>");
+                                 "</tr>"
+                                 CRLF);
     }
 
     /* Entries for directories and files */
@@ -922,9 +939,9 @@ make_content_buf(
         b->last = ngx_cpymem_ssz(b->last, "<tr><td class=\"link\"><a href=\"");
 
         if (entry[i].escape) {
-            ngx_fancyindex_escape_uri(b->last,
-                                      entry[i].name.data,
-                                      entry[i].name.len);
+            ngx_fancyindex_escape_filename(b->last,
+                                           entry[i].name.data,
+                                           entry[i].name.len);
 
             b->last += entry[i].name.len + entry[i].escape;
 
@@ -1315,6 +1332,7 @@ ngx_http_fancyindex_create_loc_conf(ngx_conf_t *cf)
     conf->ignore        = NGX_CONF_UNSET_PTR;
     conf->hide_symlinks = NGX_CONF_UNSET;
     conf->show_path     = NGX_CONF_UNSET;
+    conf->hide_parent   = NGX_CONF_UNSET;
 
     return conf;
 }
@@ -1343,6 +1361,7 @@ ngx_http_fancyindex_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_ptr_value(conf->ignore, prev->ignore, NULL);
     ngx_conf_merge_value(conf->hide_symlinks, prev->hide_symlinks, 0);
+    ngx_conf_merge_value(conf->hide_parent, prev->hide_parent, 0);
 
     /* Just make sure we haven't disabled the show_path directive without providing a custom header */
     if (conf->show_path == 0 && conf->header.len == 0)
diff --git a/debian/modules/http-fancyindex/t/06-hide_parent.test b/debian/modules/http-fancyindex/t/06-hide_parent.test
new file mode 100644
index 0000000..494c958
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/06-hide_parent.test
@@ -0,0 +1,23 @@
+#! /bin/bash
+cat <<---
+This test check the output using "fancyindex_hide_parent_dir on"
+--
+use pup
+nginx_start 'fancyindex_hide_parent_dir on;'
+
+content=$( fetch /child-directory/ )
+
+# Check page title
+[[ $(pup -p title text{} <<< "${content}") = "Index of /child-directory/" ]]
+
+# Check table headers
+[[ $(pup -n body table tbody tr:first-child td <<< "${content}") -eq 3 ]]
+{
+	read -r name_label
+	read -r size_label
+	read -r date_label
+} < <(  pup -p body table tbody tr:first-child td text{} <<< "${content}" )
+[[ ${name_label} != Parent\ Directory/ ]]
+[[ ${name_label} = empty-file.txt ]]
+[[ ${size_label} != - ]]
+[[ ${date_label} != - ]]
diff --git a/debian/modules/http-fancyindex/t/bug95-square-brackets.test b/debian/modules/http-fancyindex/t/bug95-square-brackets.test
new file mode 100644
index 0000000..16e1ddc
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/bug95-square-brackets.test
@@ -0,0 +1,19 @@
+#! /bin/bash
+cat <<---
+Bug #95: FancyIndex does not encode square brackets
+https://github.com/aperezdc/ngx-fancyindex/issues/95
+--
+use pup
+
+# Prepare a directory with a file that contains square brackets in the name.
+mkdir -p "${TESTDIR}/bug95"
+touch "${TESTDIR}"/bug95/'bug[95].txt'
+
+nginx_start
+content=$(fetch /bug95/)
+test -n "${content}" || fail 'Empty response'
+
+expected_href='bug%5B95%5D.txt'
+obtained_href=$(pup -p body tbody 'tr:nth-child(2)' a 'attr{href}' <<< "${content}")
+test "${expected_href}" = "${obtained_href}" || \
+	fail 'Expected: %s - Obtained: %s' "${expected_href}" "${obtained_href}"
diff --git a/debian/modules/http-fancyindex/t/child-directory/empty-file.txt b/debian/modules/http-fancyindex/t/child-directory/empty-file.txt
new file mode 100644
index 0000000..e69de29
diff --git a/debian/modules/http-fancyindex/template.h b/debian/modules/http-fancyindex/template.h
index 27b9500..2d6604b 100644
--- a/debian/modules/http-fancyindex/template.h
+++ b/debian/modules/http-fancyindex/template.h
@@ -57,9 +57,9 @@ static const u_char t06_list1[] = ""
 "<table id=\"list\">"
 "<thead>"
 "<tr>"
-"<th style=\"width:55%\"><a href=\"?C=N&O=A\">File Name</a>&nbsp;<a href=\"?C=N&O=D\">&nbsp;&darr;&nbsp;</a></th>"
-"<th style=\"width:20%\"><a href=\"?C=S&O=A\">File Size</a>&nbsp;<a href=\"?C=S&O=D\">&nbsp;&darr;&nbsp;</a></th>"
-"<th style=\"width:25%\"><a href=\"?C=M&O=A\">Date</a>&nbsp;<a href=\"?C=M&O=D\">&nbsp;&darr;&nbsp;</a></th>"
+"<th style=\"width:55%\"><a href=\"?C=N&amp;O=A\">File Name</a>&nbsp;<a href=\"?C=N&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
+"<th style=\"width:20%\"><a href=\"?C=S&amp;O=A\">File Size</a>&nbsp;<a href=\"?C=S&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
+"<th style=\"width:25%\"><a href=\"?C=M&amp;O=A\">Date</a>&nbsp;<a href=\"?C=M&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
 "</tr>"
 "</thead>"
 "\n"
diff --git a/debian/modules/http-fancyindex/template.html b/debian/modules/http-fancyindex/template.html
index 8e478f8..b2a3174 100644
--- a/debian/modules/http-fancyindex/template.html
+++ b/debian/modules/http-fancyindex/template.html
@@ -55,9 +55,9 @@
 		<table id="list">
 			<thead>
 				<tr>
-					<th style="width:55%"><a href="?C=N&O=A">File Name</a>&nbsp;<a href="?C=N&O=D">&nbsp;&darr;&nbsp;</a></th>
-					<th style="width:20%"><a href="?C=S&O=A">File Size</a>&nbsp;<a href="?C=S&O=D">&nbsp;&darr;&nbsp;</a></th>
-					<th style="width:25%"><a href="?C=M&O=A">Date</a>&nbsp;<a href="?C=M&O=D">&nbsp;&darr;&nbsp;</a></th>
+					<th style="width:55%"><a href="?C=N&amp;O=A">File Name</a>&nbsp;<a href="?C=N&amp;O=D">&nbsp;&darr;&nbsp;</a></th>
+					<th style="width:20%"><a href="?C=S&amp;O=A">File Size</a>&nbsp;<a href="?C=S&amp;O=D">&nbsp;&darr;&nbsp;</a></th>
+					<th style="width:25%"><a href="?C=M&amp;O=A">Date</a>&nbsp;<a href="?C=M&amp;O=D">&nbsp;&darr;&nbsp;</a></th>
 				</tr>
 			</thead>
 

From dd794d9830967ad1ff407c78699201fb53ff3237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Fri, 29 May 2020 07:59:08 +0200
Subject: [PATCH 307/600] Enable CI

---
 debian/gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 debian/gitlab-ci.yml

diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
new file mode 100644
index 0000000..557434c
--- /dev/null
+++ b/debian/gitlab-ci.yml
@@ -0,0 +1,8 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+# Disable reprotest which is failing now
+variables:
+  SALSA_CI_DISABLE_REPROTEST: 1

From ead863a42cf70ce2ba6f98dd2cfe560f9c8b0c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Fri, 29 May 2020 19:00:17 +0200
Subject: [PATCH 308/600] d/copyright: Add myself for Debian part

---
 debian/copyright | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/copyright b/debian/copyright
index 66a44d8..29d7d04 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,6 +35,7 @@ Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
            2011       Dmitry E. Oboukhov <unera@debian.org>
            2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
            2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
+           2020,      Ondřej Nový <onovy@debian.org>
 License: BSD-2-clause
 
 Files: debian/modules/http-headers-more-filter/*

From 8838bdc5f148f2e14218243362d557f876fc87f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Fri, 29 May 2020 19:00:50 +0200
Subject: [PATCH 309/600] Add myself as uploader

---
 debian/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 835af43..ffea058 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: nginx
 Section: httpd
 Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
-Uploaders: Christos Trochalakis <ctrochalakis@debian.org>
+Uploaders: Christos Trochalakis <ctrochalakis@debian.org>,
+           Ondřej Nový <onovy@debian.org>,
 Build-Depends: debhelper-compat (= 13),
                dpkg-dev (>= 1.15.5),
                libexpat-dev,

From 693c482e5c75d757d609d5c61691842fdc016e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Fri, 29 May 2020 19:03:44 +0200
Subject: [PATCH 310/600] releasing package nginx version 1.18.0-1

---
 debian/changelog | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc8aeb0..3eeacf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,28 @@
-nginx (1.18.0-1) UNRELEASED; urgency=medium
+nginx (1.18.0-1) unstable; urgency=medium
 
-  * New upstream version.
+  [ Ondřej Nový ]
+  * New upstream version 1.18.0
+  * Add REMOTE_USER fastcgi param
+  * Use debhelper-compat instead of debian/compat
+  * Replace dh_systemd_enable with dh_installsystemd
+  * Set Rules-Requires-Root: no
+  * d/rules/dh_installinit: Replace --no-restart-on-upgrade with
+    --no-stop-on-upgrade
+  * Bump debhelper compat level to 13
+  * Use package.maintscript instead of dpkg-maintscript-helper
+  * Bump standards version to 4.5.0
+  * d/watch: Change to 1.18.x
+  * d/patches/CVE-2019-20372.patch: Rebase
+  * Convert d/ngxmod to Python 3 (Closes: #953025)
+  * nchan: Upgrade to 1.2.7
+  * http-fancyindex: Upgrade to 0.4.4
+  * d/copyright: Add myself for Debian part
+  * Add myself as uploader
 
- -- Ondřej Nový <onovy@debian.org>  Thu, 28 May 2020 22:05:22 +0200
+  [ Mohamed Akram ]
+  * Enable --with-compat configure option (Closes: #897926)
+
+ -- Ondřej Nový <onovy@debian.org>  Fri, 29 May 2020 19:03:30 +0200
 
 nginx (1.16.1-3) unstable; urgency=high
 

From 134d203c26598258fa5e4991dd21e4f0a1b6841f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 09:38:07 +0200
Subject: [PATCH 311/600] d/conf/sites-available/default: Update PHP path for
 PHP 7.4

---
 debian/conf/sites-available/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/conf/sites-available/default b/debian/conf/sites-available/default
index f5c5e1b..c5af914 100644
--- a/debian/conf/sites-available/default
+++ b/debian/conf/sites-available/default
@@ -57,7 +57,7 @@ server {
 	#	include snippets/fastcgi-php.conf;
 	#
 	#	# With php-fpm (or other unix sockets):
-	#	fastcgi_pass unix:/run/php/php7.3-fpm.sock;
+	#	fastcgi_pass unix:/run/php/php7.4-fpm.sock;
 	#	# With php-cgi (or other tcp sockets):
 	#	fastcgi_pass 127.0.0.1:9000;
 	#}

From c6872b4f53c1198a59deb80f65c7d43a988c0e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 09:41:10 +0200
Subject: [PATCH 312/600] d/conf/nginx.conf: Enable TLSv1.3

---
 debian/conf/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index 132f680..9ee6e06 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -31,7 +31,7 @@ http {
 	# SSL Settings
 	##
 
-	ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE
 	ssl_prefer_server_ciphers on;
 
 	##

From 4851b6ec88ae2597acd344d74d8f9997e6229f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Fri, 4 Jan 2019 09:14:41 +0000
Subject: [PATCH 313/600] http-geoip2: Add ngx_http_geoip2_module 3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ondřej Nový <onovy@debian.org>
---
 debian/control                                |  13 +
 debian/copyright                              |   4 +
 debian/libnginx-mod-http-geoip2.nginx         |  13 +
 debian/libnginx-mod.conf/mod-http-geoip2.conf |   1 +
 debian/modules/control                        |   4 +
 debian/modules/http-geoip2/LICENSE            |  23 +
 debian/modules/http-geoip2/README.md          | 133 +++
 debian/modules/http-geoip2/config             |  43 +
 .../http-geoip2/ngx_http_geoip2_module.c      | 793 ++++++++++++++++++
 .../http-geoip2/ngx_stream_geoip2_module.c    | 694 +++++++++++++++
 debian/modules/watch/http-geoip2              |   4 +
 debian/rules                                  |   2 +
 debian/tests/control                          |   3 +
 13 files changed, 1730 insertions(+)
 create mode 100755 debian/libnginx-mod-http-geoip2.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-http-geoip2.conf
 create mode 100644 debian/modules/http-geoip2/LICENSE
 create mode 100644 debian/modules/http-geoip2/README.md
 create mode 100644 debian/modules/http-geoip2/config
 create mode 100644 debian/modules/http-geoip2/ngx_http_geoip2_module.c
 create mode 100644 debian/modules/http-geoip2/ngx_stream_geoip2_module.c
 create mode 100644 debian/modules/watch/http-geoip2

diff --git a/debian/control b/debian/control
index ffea058..b3ec941 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper-compat (= 13),
                libhiredis-dev,
                liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !armel !armhf !powerpc !powerpcspe !mips !mipsel],
                libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel],
+               libmaxminddb-dev,
                libmhash-dev,
                libpam0g-dev,
                libpcre3-dev,
@@ -71,6 +72,7 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-dav-ext (= ${binary:Version}),
          libnginx-mod-http-echo (= ${binary:Version}),
          libnginx-mod-http-geoip (= ${binary:Version}),
+         libnginx-mod-http-geoip2 (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
          libnginx-mod-http-subs-filter (= ${binary:Version}),
          libnginx-mod-http-upstream-fair (= ${binary:Version}),
@@ -142,6 +144,7 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-echo (= ${binary:Version}),
          libnginx-mod-http-fancyindex (= ${binary:Version}),
          libnginx-mod-http-geoip (= ${binary:Version}),
+         libnginx-mod-http-geoip2 (= ${binary:Version}),
          libnginx-mod-http-headers-more-filter (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
          libnginx-mod-http-lua (= ${binary:Version}),
@@ -195,6 +198,16 @@ Description: GeoIP HTTP module for Nginx
  Those variables include country, region, city, latitude, longitude, postal
  code, etc.
 
+Package: libnginx-mod-http-geoip2
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: GeoIP2 HTTP module for Nginx
+ The ngx_http_geoip2 module creates variables with values depending on the
+ client IP address, using the precompiled MaxMind GeoIP2 databases.
+ .
+ Those variables include country, region, city, latitude, longitude, postal
+ code, etc.
+
 Package: libnginx-mod-http-image-filter
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/copyright b/debian/copyright
index 29d7d04..3fb1c3f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -44,6 +44,10 @@ Copyright: Copyright (c) 2009-2014, Yichun "agentzh" Zhang (章亦春) <agentzh@
            Copyright (c) Igor Sysoev
 License: BSD-2-clause
 
+Files: debian/modules/http-geoip2/*
+Copyright: Copyright (c) 2014, Lee Valentine <lee@leev.net>
+License: BSD-2-clause
+
 Files: debian/modules/http-ndk/*
 Copyright: Marcus Clyne
 License: BSD-3-clause
diff --git a/debian/libnginx-mod-http-geoip2.nginx b/debian/libnginx-mod-http-geoip2.nginx
new file mode 100755
index 0000000..78c206f
--- /dev/null
+++ b/debian/libnginx-mod-http-geoip2.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-geoip2.conf b/debian/libnginx-mod.conf/mod-http-geoip2.conf
new file mode 100644
index 0000000..9441b29
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-http-geoip2.conf
@@ -0,0 +1 @@
+load_module modules/ngx_http_geoip2_module.so;
diff --git a/debian/modules/control b/debian/modules/control
index d36b386..8f9964d 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -16,6 +16,10 @@ Homepage: https://github.com/agentzh/echo-nginx-module
 Version: v0.61
 Files-Excluded: .gitignore .gitattributes .travis.yml
 
+Module: http-geoip2
+Homepage: https://github.com/leev/ngx_http_geoip2_module
+Version: 3.3
+
 Module: http-lua
 Homepage: https://github.com/openresty/lua-nginx-module
 Version: 0.10.13
diff --git a/debian/modules/http-geoip2/LICENSE b/debian/modules/http-geoip2/LICENSE
new file mode 100644
index 0000000..fdc13a7
--- /dev/null
+++ b/debian/modules/http-geoip2/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2014, Lee Valentine <lee@leev.net>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/http-geoip2/README.md b/debian/modules/http-geoip2/README.md
new file mode 100644
index 0000000..a5aec97
--- /dev/null
+++ b/debian/modules/http-geoip2/README.md
@@ -0,0 +1,133 @@
+Description
+===========
+
+**ngx_http_geoip2_module** - creates variables with values from the maxmind geoip2 databases based on the client IP (default) or from a specific variable (supports both IPv4 and IPv6)
+
+The module now supports nginx streams and can be used in the same way the http module can be used.
+
+## Installing
+First install [libmaxminddb](https://github.com/maxmind/libmaxminddb) as described in its [README.md
+file](https://github.com/maxmind/libmaxminddb/blob/master/README.md#installing-from-a-tarball).
+
+#### Download nginx source
+```
+wget http://nginx.org/download/nginx-VERSION.tar.gz
+tar zxvf nginx-VERSION.tar.gz
+cd nginx-VERSION
+```
+
+##### To build as a dynamic module (nginx 1.9.11+):
+```
+./configure --add-dynamic-module=/path/to/ngx_http_geoip2_module
+make
+make install
+```
+
+This will produce ```objs/ngx_http_geoip2_module.so```. It can be copied to your nginx module path manually if you wish.
+
+Add the following line to your nginx.conf:
+```
+load_module modules/ngx_http_geoip2_module.so;
+```
+
+##### To build as a static module:
+```
+./configure --add-module=/path/to/ngx_http_geoip2_module
+make
+make install
+```
+
+## Download Maxmind GeoLite2 Database (optional)
+The free GeoLite2 databases are available from [Maxminds website](http://dev.maxmind.com/geoip/geoip2/geolite2/)
+
+[GeoLite2 City](http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz)
+[GeoLite2 Country](http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz)
+
+## Example Usage:
+```
+http {
+    ...
+    geoip2 /etc/maxmind-country.mmdb {
+        auto_reload 5m;
+        $geoip2_metadata_country_build metadata build_epoch;
+        $geoip2_data_country_code default=US source=$variable_with_ip country iso_code;
+        $geoip2_data_country_name country names en;
+    }
+
+    geoip2 /etc/maxmind-city.mmdb {
+        $geoip2_data_city_name default=London city names en;
+    }
+    ....
+
+    fastcgi_param COUNTRY_CODE $geoip2_data_country_code;
+    fastcgi_param COUNTRY_NAME $geoip2_data_country_name;
+    fastcgi_param CITY_NAME    $geoip2_data_city_name;
+    ....
+}
+
+stream {
+    ...
+    geoip2 /etc/maxmind-country.mmdb {
+        $geoip2_data_country_code default=US source=$remote_addr country iso_code;
+    }
+    ...
+}
+```
+
+##### Metadata:
+Retrieve metadata regarding the geoip database.
+```
+$variable_name metadata <field>
+```
+Available fields:
+  - build_epoch: the build timestamp of the maxmind database.
+  - last_check: the last time the database was checked for changes (when using auto_reload)
+  - last_change: the last time the database was reloaded (when using auto_reload)
+
+##### Autoreload (default: disabled):
+Enabling auto reload will have nginx check the modification time of the database at the specified
+interval and reload it if it has changed.
+```
+auto_reload <interval>
+```
+
+##### GeoIP:
+```
+$variable_name [default=<value] [source=$variable_with_ip] path ...
+```
+If default is not specified, the variable will be empty if not found.
+
+If source is not specified, $remote_addr will be used to perform the lookup.
+
+To find the path of the data you want (eg: country names en), use the [mmdblookup tool](https://maxmind.github.io/libmaxminddb/mmdblookup.html):
+
+```
+$ mmdblookup --file /usr/share/GeoIP/GeoIP2-Country.mmdb --ip 8.8.8.8
+
+  {
+    "country":
+      {
+        "geoname_id":
+          6252001 <uint32>
+        "iso_code":
+          "US" <utf8_string>
+        "names":
+          {
+            "de":
+              "USA" <utf8_string>
+            "en":
+              "United States" <utf8_string>
+          }
+      }
+  }
+
+$ mmdblookup --file /usr/share/GeoIP/GeoIP2-Country.mmdb --ip 8.8.8.8 country names en
+
+  "United States" <utf8_string>
+```
+
+This translates to:
+
+```
+$country_name "default=United States" source=$remote_addr country names en
+```
diff --git a/debian/modules/http-geoip2/config b/debian/modules/http-geoip2/config
new file mode 100644
index 0000000..48bf15d
--- /dev/null
+++ b/debian/modules/http-geoip2/config
@@ -0,0 +1,43 @@
+ngx_feature="MaxmindDB library"
+ngx_feature_name=
+ngx_feature_run=no
+ngx_feature_incs="#include <maxminddb.h>"
+ngx_feature_libs=-lmaxminddb
+ngx_feature_test="MMDB_s mmdb"
+. auto/feature
+
+ngx_addon_name="ngx_geoip2_module"
+
+if [ $ngx_found = yes ]; then
+	if test -n "$ngx_module_link"; then
+		if [ $HTTP != NO ]; then
+			ngx_module_type=HTTP
+			ngx_module_name="ngx_http_geoip2_module"
+			ngx_module_incs=
+			ngx_module_deps=
+			ngx_module_srcs="$ngx_addon_dir/ngx_http_geoip2_module.c"
+			ngx_module_libs="$ngx_feature_libs"
+			. auto/module
+		fi
+
+		nginx_version=`awk '/^#define nginx_version / {print $3}' src/core/nginx.h`
+		if [ $STREAM != NO -a $nginx_version -gt 1011001 ]; then
+			ngx_module_type=STREAM
+			ngx_module_name="ngx_stream_geoip2_module"
+			ngx_module_incs=
+			ngx_module_deps=
+			ngx_module_srcs="$ngx_addon_dir/ngx_stream_geoip2_module.c"
+			ngx_module_libs="$ngx_feature_libs"
+			. auto/module
+		fi
+	else
+		HTTP_MODULES="$HTTP_MODULES ngx_http_geoip2_module"
+		NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_geoip2_module.c"
+		CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+	fi
+else   
+	cat << END
+$0: error: the geoip2 module requires the maxminddb library.
+END
+	exit 1
+fi
diff --git a/debian/modules/http-geoip2/ngx_http_geoip2_module.c b/debian/modules/http-geoip2/ngx_http_geoip2_module.c
new file mode 100644
index 0000000..d27c94d
--- /dev/null
+++ b/debian/modules/http-geoip2/ngx_http_geoip2_module.c
@@ -0,0 +1,793 @@
+/*
+ * Copyright (C) Lee Valentine <lee@leev.net>
+ *
+ * Based on nginx's 'ngx_http_geoip_module.c' by Igor Sysoev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+#include <maxminddb.h>
+
+
+typedef struct {
+    MMDB_s                   mmdb;
+    MMDB_lookup_result_s     result;
+    time_t                   last_check;
+    time_t                   last_change;
+    time_t                   check_interval;
+#if (NGX_HAVE_INET6)
+    uint8_t                  address[16];
+#else
+    unsigned long            address;
+#endif
+    ngx_queue_t              queue;
+} ngx_http_geoip2_db_t;
+
+typedef struct {
+    ngx_queue_t              databases;
+    ngx_array_t              *proxies;
+    ngx_flag_t               proxy_recursive;
+} ngx_http_geoip2_conf_t;
+
+typedef struct {
+    ngx_http_geoip2_db_t     *database;
+    const char               **lookup;
+    ngx_str_t                default_value;
+    ngx_http_complex_value_t source;
+} ngx_http_geoip2_ctx_t;
+
+typedef struct {
+    ngx_http_geoip2_db_t     *database;
+    ngx_str_t                metavalue;
+} ngx_http_geoip2_metadata_t;
+
+
+static ngx_int_t ngx_http_geoip2_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_geoip2_metadata(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+static void *ngx_http_geoip2_create_conf(ngx_conf_t *cf);
+static char *ngx_http_geoip2_init_conf(ngx_conf_t *cf, void *conf);
+static char *ngx_http_geoip2(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_http_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy,
+    void *conf);
+static char *ngx_http_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy,
+    void *conf);
+static char *ngx_http_geoip2_add_variable_geodata(ngx_conf_t *cf,
+    ngx_http_geoip2_db_t *database);
+static char *ngx_http_geoip2_add_variable_metadata(ngx_conf_t *cf,
+    ngx_http_geoip2_db_t *database);
+static char *ngx_http_geoip2_proxy(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static ngx_int_t ngx_http_geoip2_cidr_value(ngx_conf_t *cf, ngx_str_t *net,
+    ngx_cidr_t *cidr);
+static void ngx_http_geoip2_cleanup(void *data);
+static ngx_int_t ngx_http_geoip2_init(ngx_conf_t *cf);
+
+
+#define FORMAT(fmt, ...) do {                           \
+        p = ngx_palloc(r->pool, NGX_OFF_T_LEN);         \
+        if (p == NULL) {                                \
+            return NGX_ERROR;                           \
+        }                                               \
+        v->len = ngx_sprintf(p, fmt, __VA_ARGS__) - p;  \
+        v->data = p;                                    \
+} while (0)
+
+static ngx_command_t  ngx_http_geoip2_commands[] = {
+
+    { ngx_string("geoip2"),
+        NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
+        ngx_http_geoip2,
+        NGX_HTTP_MAIN_CONF_OFFSET,
+        0,
+        NULL },
+
+    { ngx_string("geoip2_proxy"),
+        NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+        ngx_http_geoip2_proxy,
+        NGX_HTTP_MAIN_CONF_OFFSET,
+        0,
+        NULL },
+
+    { ngx_string("geoip2_proxy_recursive"),
+        NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
+        ngx_conf_set_flag_slot,
+        NGX_HTTP_MAIN_CONF_OFFSET,
+        offsetof(ngx_http_geoip2_conf_t, proxy_recursive),
+        NULL },
+
+    ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_geoip2_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_http_geoip2_init,                  /* postconfiguration */
+
+    ngx_http_geoip2_create_conf,           /* create main configuration */
+    ngx_http_geoip2_init_conf,             /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    NULL,                                  /* create location configuration */
+    NULL                                   /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_geoip2_module = {
+    NGX_MODULE_V1,
+    &ngx_http_geoip2_module_ctx,           /* module context */
+    ngx_http_geoip2_commands,              /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_http_geoip2_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
+    uintptr_t data)
+{
+    ngx_http_geoip2_ctx_t   *geoip2 = (ngx_http_geoip2_ctx_t *) data;
+    ngx_http_geoip2_db_t    *database = geoip2->database;
+    int                     mmdb_error;
+    MMDB_entry_data_s       entry_data;
+    ngx_http_geoip2_conf_t  *gcf;
+    ngx_addr_t              addr;
+    ngx_array_t             *xfwd;
+    u_char                  *p;
+    ngx_str_t               val;
+
+#if (NGX_HAVE_INET6)
+    uint8_t address[16], *addressp = address;
+#else
+    unsigned long address;
+#endif
+
+    if (geoip2->source.value.len > 0) {
+         if (ngx_http_complex_value(r, &geoip2->source, &val) != NGX_OK) {
+             goto not_found;
+         }
+
+        if (ngx_parse_addr(r->pool, &addr, val.data, val.len) != NGX_OK) {
+            goto not_found;
+        }
+    } else {
+        gcf = ngx_http_get_module_main_conf(r, ngx_http_geoip2_module);
+        addr.sockaddr = r->connection->sockaddr;
+        addr.socklen = r->connection->socklen;
+
+        xfwd = &r->headers_in.x_forwarded_for;
+
+        if (xfwd->nelts > 0 && gcf->proxies != NULL) {
+            (void) ngx_http_get_forwarded_addr(r, &addr, xfwd, NULL,
+                                               gcf->proxies, gcf->proxy_recursive);
+        }
+    }
+
+    switch (addr.sockaddr->sa_family) {
+        case AF_INET:
+#if (NGX_HAVE_INET6)
+            ngx_memset(addressp, 0, 12);
+            ngx_memcpy(addressp + 12, &((struct sockaddr_in *)
+                                        addr.sockaddr)->sin_addr.s_addr, 4);
+            break;
+
+        case AF_INET6:
+            ngx_memcpy(addressp, &((struct sockaddr_in6 *)
+                                   addr.sockaddr)->sin6_addr.s6_addr, 16);
+#else
+            address = ((struct sockaddr_in *)addr.sockaddr)->sin_addr.s_addr;
+#endif
+            break;
+
+        default:
+            goto not_found;
+    }
+
+#if (NGX_HAVE_INET6)
+    if (ngx_memcmp(&address, &database->address, sizeof(address))
+        != 0) {
+#else
+    if (address != database->address) {
+#endif
+        memcpy(&database->address, &address, sizeof(address));
+        database->result = MMDB_lookup_sockaddr(&database->mmdb,
+                                           addr.sockaddr, &mmdb_error);
+
+        if (mmdb_error != MMDB_SUCCESS) {
+            goto not_found;
+        }
+    }
+
+    if (!database->result.found_entry
+            || MMDB_aget_value(&database->result.entry, &entry_data,
+                               geoip2->lookup) != MMDB_SUCCESS) {
+        goto not_found;
+    }
+
+    if (!entry_data.has_data) {
+        goto not_found;
+    }
+
+    switch (entry_data.type) {
+        case MMDB_DATA_TYPE_BOOLEAN:
+            FORMAT("%d", entry_data.boolean);
+            break;
+        case MMDB_DATA_TYPE_UTF8_STRING:
+            v->len = entry_data.data_size;
+            v->data = ngx_pnalloc(r->pool, v->len);
+            if (v->data == NULL) {
+                return NGX_ERROR;
+            }
+            ngx_memcpy(v->data, (u_char *) entry_data.utf8_string, v->len);
+            break;
+        case MMDB_DATA_TYPE_BYTES:
+            v->len = entry_data.data_size;
+            v->data = ngx_pnalloc(r->pool, v->len);
+            if (v->data == NULL) {
+                return NGX_ERROR;
+            }
+            ngx_memcpy(v->data, (u_char *) entry_data.bytes, v->len);
+            break;
+        case MMDB_DATA_TYPE_FLOAT:
+            FORMAT("%.5f", entry_data.float_value);
+            break;
+        case MMDB_DATA_TYPE_DOUBLE:
+            FORMAT("%.5f", entry_data.double_value);
+            break;
+        case MMDB_DATA_TYPE_UINT16:
+            FORMAT("%uD", entry_data.uint16);
+            break;
+        case MMDB_DATA_TYPE_UINT32:
+            FORMAT("%uD", entry_data.uint32);
+            break;
+        case MMDB_DATA_TYPE_INT32:
+            FORMAT("%D", entry_data.int32);
+            break;
+        case MMDB_DATA_TYPE_UINT64:
+            FORMAT("%uL", entry_data.uint64);
+            break;
+        case MMDB_DATA_TYPE_UINT128: ;
+#if MMDB_UINT128_IS_BYTE_ARRAY
+            uint8_t *val = (uint8_t *)entry_data.uint128;
+            FORMAT( "0x%02x%02x%02x%02x%02x%02x%02x%02x"
+                      "%02x%02x%02x%02x%02x%02x%02x%02x",
+                    val[0], val[1], val[2], val[3],
+                    val[4], val[5], val[6], val[7],
+                    val[8], val[9], val[10], val[11],
+                    val[12], val[13], val[14], val[15]);
+#else
+            mmdb_uint128_t val = entry_data.uint128;
+            FORMAT("0x%016uxL%016uxL",
+                    (uint64_t) (val >> 64), (uint64_t) val);
+#endif
+            break;
+        default:
+            goto not_found;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+
+not_found:
+    if (geoip2->default_value.len > 0) {
+        v->data = geoip2->default_value.data;
+        v->len = geoip2->default_value.len;
+
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+    } else {
+        v->not_found = 1;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_geoip2_metadata(ngx_http_request_t *r, ngx_http_variable_value_t *v,
+    uintptr_t data)
+{
+    ngx_http_geoip2_metadata_t  *metadata = (ngx_http_geoip2_metadata_t *) data;
+    ngx_http_geoip2_db_t        *database = metadata->database;
+    u_char                      *p;
+
+    if (ngx_strncmp(metadata->metavalue.data, "build_epoch", 11) == 0) {
+        FORMAT("%uL", database->mmdb.metadata.build_epoch);
+    } else if (ngx_strncmp(metadata->metavalue.data, "last_check", 10) == 0) {
+        FORMAT("%T", database->last_check);
+    } else if (ngx_strncmp(metadata->metavalue.data, "last_change", 11) == 0) {
+        FORMAT("%T", database->last_change);
+    } else {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_http_geoip2_create_conf(ngx_conf_t *cf)
+{
+    ngx_pool_cleanup_t      *cln;
+    ngx_http_geoip2_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->proxy_recursive = NGX_CONF_UNSET;
+
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NULL;
+    }
+
+    ngx_queue_init(&conf->databases);
+
+    cln->handler = ngx_http_geoip2_cleanup;
+    cln->data = conf;
+
+    return conf;
+}
+
+
+static char *
+ngx_http_geoip2(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_geoip2_conf_t  *gcf = conf;
+    ngx_str_t               *value;
+    int                     status;
+    ngx_http_geoip2_db_t    *database;
+    char                    *rv;
+    ngx_conf_t              save;
+    ngx_queue_t             *q;
+
+    value = cf->args->elts;
+
+    if (value[1].data && value[1].data[0] != '/') {
+        if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (!ngx_queue_empty(&gcf->databases)) {
+        for (q = ngx_queue_head(&gcf->databases);
+             q != ngx_queue_sentinel(&gcf->databases);
+             q = ngx_queue_next(q))
+        {
+            database = ngx_queue_data(q, ngx_http_geoip2_db_t, queue);
+            if (ngx_strcmp(value[1].data, database->mmdb.filename) == 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "Duplicate GeoIP2 mmdb - %V", &value[1]);
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+    database = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_db_t));
+    if (database == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_queue_insert_tail(&gcf->databases, &database->queue);
+    database->last_check = database->last_change = ngx_time();
+
+    status = MMDB_open((char *) value[1].data, MMDB_MODE_MMAP, &database->mmdb);
+
+    if (status != MMDB_SUCCESS) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "MMDB_open(\"%V\") failed - %s", &value[1],
+                           MMDB_strerror(status));
+        return NGX_CONF_ERROR;
+    }
+
+    save = *cf;
+    cf->handler = ngx_http_geoip2_parse_config;
+    cf->handler_conf = (void *) database;
+
+    rv = ngx_conf_parse(cf, NULL);
+    *cf = save;
+    return rv;
+}
+
+
+static char *
+ngx_http_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    ngx_http_geoip2_db_t  *database;
+    ngx_str_t             *value;
+    time_t                interval;
+
+    value = cf->args->elts;
+
+    if (value[0].data[0] == '$') {
+        return ngx_http_geoip2_add_variable(cf, dummy, conf);
+    }
+
+    if (value[0].len == 11
+            && ngx_strncmp(value[0].data, "auto_reload", 11) == 0) {
+        if ((int) cf->args->nelts != 2) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid number of arguments for auto_reload");
+            return NGX_CONF_ERROR;
+        }
+
+        interval = ngx_parse_time(&value[1], true);
+
+        if (interval == (time_t) NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid interval for auto_reload \"%V\"",
+                               value[1]);
+            return NGX_CONF_ERROR;
+        }
+
+
+        database = (ngx_http_geoip2_db_t *) conf;
+        database->check_interval = interval;
+        return NGX_CONF_OK;
+    }
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "invalid setting \"%V\"", &value[0]);
+    return NGX_CONF_ERROR;
+}
+
+
+static char *
+ngx_http_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    ngx_http_geoip2_db_t  *database;
+    ngx_str_t             *value;
+    int                   nelts;
+
+    value = cf->args->elts;
+
+    if (value[0].data[0] != '$') {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"%V\"", &value[0]);
+        return NGX_CONF_ERROR;
+    }
+
+    value[0].len--;
+    value[0].data++;
+
+    nelts = (int) cf->args->nelts;
+    database = (ngx_http_geoip2_db_t *) conf;
+
+    if (nelts > 0 && value[1].len == 8 && ngx_strncmp(value[1].data, "metadata", 8) == 0) {
+        return ngx_http_geoip2_add_variable_metadata(cf, database);
+    }
+
+    return ngx_http_geoip2_add_variable_geodata(cf, database);
+}
+
+
+static char *
+ngx_http_geoip2_add_variable_metadata(ngx_conf_t *cf, ngx_http_geoip2_db_t *database)
+{
+    ngx_http_geoip2_metadata_t  *metadata;
+    ngx_str_t                   *value, name;
+    ngx_http_variable_t         *var;
+
+    metadata = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_metadata_t));
+    if (metadata == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+    name = value[0];
+
+    metadata->database = database;
+    metadata->metavalue = value[2];
+
+    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    var->get_handler = ngx_http_geoip2_metadata;
+    var->data = (uintptr_t) metadata;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_geoip2_add_variable_geodata(ngx_conf_t *cf, ngx_http_geoip2_db_t *database)
+{
+    ngx_http_geoip2_ctx_t             *geoip2;
+    ngx_http_compile_complex_value_t  ccv;
+    ngx_str_t                         *value, name, source;
+    ngx_http_variable_t               *var;
+    int                               i, nelts, idx;
+
+    geoip2 = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_ctx_t));
+    if (geoip2 == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    geoip2->database = database;
+    ngx_str_null(&source);
+
+    value = cf->args->elts;
+    name = value[0];
+
+    nelts = (int) cf->args->nelts;
+    idx = 1;
+
+    if (nelts > idx) {
+        for (i = idx; i < nelts; i++) {
+            if (ngx_strnstr(value[idx].data, "=", value[idx].len) == NULL) {
+                break;
+            }
+
+            if (value[idx].len > 8 && ngx_strncmp(value[idx].data, "default=", 8) == 0) {
+                if (geoip2->default_value.len > 0) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "default has already been declared for  \"$%V\"", &name);
+                    return NGX_CONF_ERROR;
+                }
+
+                geoip2->default_value.len  = value[idx].len - 8;
+                geoip2->default_value.data = value[idx].data + 8;
+            } else if (value[idx].len > 7 && ngx_strncmp(value[idx].data, "source=", 7) == 0) {
+                if (source.len > 0) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "source has already been declared for  \"$%V\"", &name);
+                    return NGX_CONF_ERROR;
+                }
+
+                source.len  = value[idx].len - 7;
+                source.data = value[idx].data + 7;
+
+                if (source.data[0] != '$') {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "invalid source variable name \"%V\"", &source);
+                    return NGX_CONF_ERROR;
+                }
+
+                ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+                ccv.cf = cf;
+                ccv.value = &source;
+                ccv.complex_value = &geoip2->source;
+
+                if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "unable to compile \"%V\" for \"$%V\"", &source, &name);
+                    return NGX_CONF_ERROR;
+                }
+            } else {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "invalid setting \"%V\" for \"$%V\"", &value[idx], &name);
+                    return NGX_CONF_ERROR;
+            }
+
+            idx++;
+        }
+    }
+
+    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    geoip2->lookup = ngx_pcalloc(cf->pool, sizeof(const char *) *
+                                 (cf->args->nelts - (idx - 1)));
+
+    if (geoip2->lookup == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    for (i = idx; i < nelts; i++) {
+        geoip2->lookup[i - idx] = (char *) value[i].data;
+    }
+    geoip2->lookup[i - idx] = NULL;
+
+    var->get_handler = ngx_http_geoip2_variable;
+    var->data = (uintptr_t) geoip2;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_geoip2_init_conf(ngx_conf_t *cf, void *conf)
+{
+    ngx_http_geoip2_conf_t  *gcf = conf;
+    ngx_conf_init_value(gcf->proxy_recursive, 0);
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_geoip2_proxy(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_geoip2_conf_t  *gcf = conf;
+    ngx_str_t               *value;
+    ngx_cidr_t              cidr, *c;
+
+    value = cf->args->elts;
+
+    if (ngx_http_geoip2_cidr_value(cf, &value[1], &cidr) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (gcf->proxies == NULL) {
+        gcf->proxies = ngx_array_create(cf->pool, 4, sizeof(ngx_cidr_t));
+        if (gcf->proxies == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    c = ngx_array_push(gcf->proxies);
+    if (c == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *c = cidr;
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_geoip2_cidr_value(ngx_conf_t *cf, ngx_str_t *net, ngx_cidr_t *cidr)
+{
+    ngx_int_t  rc;
+
+    if (ngx_strcmp(net->data, "255.255.255.255") == 0) {
+        cidr->family = AF_INET;
+        cidr->u.in.addr = 0xffffffff;
+        cidr->u.in.mask = 0xffffffff;
+
+        return NGX_OK;
+    }
+
+    rc = ngx_ptocidr(net, cidr);
+
+    if (rc == NGX_ERROR) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid network \"%V\"", net);
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "low address bits of %V are meaningless", net);
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_geoip2_cleanup(void *data)
+{
+    ngx_http_geoip2_conf_t  *gcf = data;
+    ngx_queue_t             *q;
+    ngx_http_geoip2_db_t    *database;
+
+    while (!ngx_queue_empty(&gcf->databases)) {
+        q = ngx_queue_head(&gcf->databases);
+        ngx_queue_remove(q);
+        database = ngx_queue_data(q, ngx_http_geoip2_db_t, queue);
+        MMDB_close(&database->mmdb);
+    }
+}
+
+
+static ngx_int_t
+ngx_http_geoip2_log_handler(ngx_http_request_t *r)
+{
+    int                      status;
+    MMDB_s                   tmpdb;
+    ngx_queue_t              *q;
+    ngx_file_info_t          fi;
+    ngx_http_geoip2_db_t    *database;
+    ngx_http_geoip2_conf_t  *gcf;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "geoip2 http log handler");
+
+    gcf = ngx_http_get_module_main_conf(r, ngx_http_geoip2_module);
+
+    if (ngx_queue_empty(&gcf->databases)) {
+        return NGX_OK;
+    }
+
+    for (q = ngx_queue_head(&gcf->databases);
+         q != ngx_queue_sentinel(&gcf->databases);
+         q = ngx_queue_next(q))
+    {
+        database = ngx_queue_data(q, ngx_http_geoip2_db_t, queue);
+        if (database->check_interval == 0) {
+            continue;
+        }
+
+        if ((database->last_check + database->check_interval)
+            > ngx_time())
+        {
+            continue;
+        }
+
+        database->last_check = ngx_time();
+
+        if (ngx_file_info(database->mmdb.filename, &fi) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_EMERG, r->connection->log, ngx_errno,
+                          ngx_file_info_n " \"%s\" failed",
+                          database->mmdb.filename);
+
+            continue;
+        }
+
+        if (ngx_file_mtime(&fi) <= database->last_change) {
+            continue;
+        }
+
+        /* do the reload */
+
+        ngx_memzero(&tmpdb, sizeof(MMDB_s));
+        status = MMDB_open(database->mmdb.filename, MMDB_MODE_MMAP, &tmpdb);
+
+        if (status != MMDB_SUCCESS) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "MMDB_open(\"%s\") failed to reload - %s",
+                          database->mmdb.filename, MMDB_strerror(status));
+
+            continue;
+        }
+
+        database->last_change = ngx_file_mtime(&fi);
+        MMDB_close(&database->mmdb);
+        database->mmdb = tmpdb;
+
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "Reload MMDB \"%s\"",
+                      database->mmdb.filename);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_geoip2_init(ngx_conf_t *cf)
+{
+    ngx_http_handler_pt        *h;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_HTTP_LOG_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_http_geoip2_log_handler;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/http-geoip2/ngx_stream_geoip2_module.c b/debian/modules/http-geoip2/ngx_stream_geoip2_module.c
new file mode 100644
index 0000000..eb59082
--- /dev/null
+++ b/debian/modules/http-geoip2/ngx_stream_geoip2_module.c
@@ -0,0 +1,694 @@
+/*
+ * Copyright (C) Lee Valentine <lee@leev.net>
+ * Copyright (C) Andrei Belov <defanator@gmail.com>
+ *
+ * Based on nginx's 'ngx_stream_geoip_module.c' by Igor Sysoev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+#include <maxminddb.h>
+
+
+typedef struct {
+    MMDB_s                   mmdb;
+    MMDB_lookup_result_s     result;
+    time_t                   last_check;
+    time_t                   last_change;
+    time_t                   check_interval;
+#if (NGX_HAVE_INET6)
+    uint8_t                  address[16];
+#else
+    unsigned long            address;
+#endif
+    ngx_queue_t              queue;
+} ngx_stream_geoip2_db_t;
+
+typedef struct {
+    ngx_queue_t              databases;
+} ngx_stream_geoip2_conf_t;
+
+typedef struct {
+    ngx_stream_geoip2_db_t   *database;
+    const char               **lookup;
+    ngx_str_t                default_value;
+    ngx_stream_complex_value_t source;
+} ngx_stream_geoip2_ctx_t;
+
+typedef struct {
+    ngx_stream_geoip2_db_t   *database;
+    ngx_str_t                metavalue;
+} ngx_stream_geoip2_metadata_t;
+
+
+static ngx_int_t ngx_stream_geoip2_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_geoip2_metadata(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static void *ngx_stream_geoip2_create_conf(ngx_conf_t *cf);
+static char *ngx_stream_geoip2(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy,
+    void *conf);
+static char *ngx_stream_geoip2(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy,
+    void *conf);
+static char *ngx_stream_geoip2_add_variable_geodata(ngx_conf_t *cf,
+    ngx_stream_geoip2_db_t *database);
+static char *ngx_stream_geoip2_add_variable_metadata(ngx_conf_t *cf,
+    ngx_stream_geoip2_db_t *database);
+static void ngx_stream_geoip2_cleanup(void *data);
+static ngx_int_t ngx_stream_geoip2_init(ngx_conf_t *cf);
+
+
+#define FORMAT(fmt, ...) do {                               \
+        p = ngx_palloc(s->connection->pool, NGX_OFF_T_LEN); \
+        if (p == NULL) {                                    \
+            return NGX_ERROR;                               \
+        }                                                   \
+        v->len = ngx_sprintf(p, fmt, __VA_ARGS__) - p;      \
+        v->data = p;                                        \
+} while (0)
+
+static ngx_command_t  ngx_stream_geoip2_commands[] = {
+
+    { ngx_string("geoip2"),
+        NGX_STREAM_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
+        ngx_stream_geoip2,
+        NGX_STREAM_MAIN_CONF_OFFSET,
+        0,
+        NULL },
+
+    ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_geoip2_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_stream_geoip2_init,                /* postconfiguration */
+
+    ngx_stream_geoip2_create_conf,         /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_geoip2_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_geoip2_module_ctx,         /* module context */
+    ngx_stream_geoip2_commands,            /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_stream_geoip2_variable(ngx_stream_session_t *s, ngx_stream_variable_value_t *v,
+    uintptr_t data)
+{
+    int                       mmdb_error;
+    u_char                   *p;
+    ngx_str_t                 val;
+    ngx_addr_t                addr;
+    MMDB_entry_data_s         entry_data;
+    ngx_stream_geoip2_ctx_t  *geoip2 = (ngx_stream_geoip2_ctx_t *) data;
+    ngx_stream_geoip2_db_t   *database = geoip2->database;
+
+#if (NGX_HAVE_INET6)
+    uint8_t address[16], *addressp = address;
+#else
+    unsigned long address;
+#endif
+
+    if (geoip2->source.value.len > 0) {
+         if (ngx_stream_complex_value(s, &geoip2->source, &val) != NGX_OK) {
+             goto not_found;
+         }
+
+        if (ngx_parse_addr(s->connection->pool, &addr, val.data, val.len) != NGX_OK) {
+            goto not_found;
+        }
+    } else {
+        addr.sockaddr = s->connection->sockaddr;
+        addr.socklen = s->connection->socklen;
+    }
+
+    switch (addr.sockaddr->sa_family) {
+        case AF_INET:
+#if (NGX_HAVE_INET6)
+            ngx_memset(addressp, 0, 12);
+            ngx_memcpy(addressp + 12, &((struct sockaddr_in *)
+                                        addr.sockaddr)->sin_addr.s_addr, 4);
+            break;
+
+        case AF_INET6:
+            ngx_memcpy(addressp, &((struct sockaddr_in6 *)
+                                   addr.sockaddr)->sin6_addr.s6_addr, 16);
+#else
+            address = ((struct sockaddr_in *)addr.sockaddr)->sin_addr.s_addr;
+#endif
+            break;
+
+        default:
+            goto not_found;
+    }
+
+#if (NGX_HAVE_INET6)
+    if (ngx_memcmp(&address, &database->address, sizeof(address)) != 0) {
+#else
+    if (address != database->address) {
+#endif
+        memcpy(&database->address, &address, sizeof(address));
+        database->result = MMDB_lookup_sockaddr(&database->mmdb,
+                                                addr.sockaddr, &mmdb_error);
+
+        if (mmdb_error != MMDB_SUCCESS) {
+            goto not_found;
+        }
+    }
+
+    if (!database->result.found_entry
+        || MMDB_aget_value(&database->result.entry, &entry_data, geoip2->lookup)
+        != MMDB_SUCCESS)
+    {
+        goto not_found;
+    }
+
+    if (!entry_data.has_data) {
+        goto not_found;
+    }
+
+    switch (entry_data.type) {
+        case MMDB_DATA_TYPE_BOOLEAN:
+            FORMAT("%d", entry_data.boolean);
+            break;
+        case MMDB_DATA_TYPE_UTF8_STRING:
+            v->len = entry_data.data_size;
+            v->data = ngx_pnalloc(s->connection->pool, v->len);
+            if (v->data == NULL) {
+                return NGX_ERROR;
+            }
+            ngx_memcpy(v->data, (u_char *) entry_data.utf8_string, v->len);
+            break;
+        case MMDB_DATA_TYPE_BYTES:
+            v->len = entry_data.data_size;
+            v->data = ngx_pnalloc(s->connection->pool, v->len);
+            if (v->data == NULL) {
+                return NGX_ERROR;
+            }
+            ngx_memcpy(v->data, (u_char *) entry_data.bytes, v->len);
+            break;
+        case MMDB_DATA_TYPE_FLOAT:
+            FORMAT("%.5f", entry_data.float_value);
+            break;
+        case MMDB_DATA_TYPE_DOUBLE:
+            FORMAT("%.5f", entry_data.double_value);
+            break;
+        case MMDB_DATA_TYPE_UINT16:
+            FORMAT("%uD", entry_data.uint16);
+            break;
+        case MMDB_DATA_TYPE_UINT32:
+            FORMAT("%uD", entry_data.uint32);
+            break;
+        case MMDB_DATA_TYPE_INT32:
+            FORMAT("%D", entry_data.int32);
+            break;
+        case MMDB_DATA_TYPE_UINT64:
+            FORMAT("%uL", entry_data.uint64);
+            break;
+        case MMDB_DATA_TYPE_UINT128: ;
+#if MMDB_UINT128_IS_BYTE_ARRAY
+            uint8_t *val = (uint8_t *) entry_data.uint128;
+            FORMAT("0x%02x%02x%02x%02x%02x%02x%02x%02x"
+                   "%02x%02x%02x%02x%02x%02x%02x%02x",
+                   val[0], val[1], val[2], val[3],
+                   val[4], val[5], val[6], val[7],
+                   val[8], val[9], val[10], val[11],
+                   val[12], val[13], val[14], val[15]);
+#else
+            mmdb_uint128_t val = entry_data.uint128;
+            FORMAT("0x%016uxL%016uxL",
+                   (uint64_t) (val >> 64), (uint64_t) val);
+#endif
+            break;
+        default:
+            goto not_found;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+
+not_found:
+    if (geoip2->default_value.len > 0) {
+        v->data = geoip2->default_value.data;
+        v->len = geoip2->default_value.len;
+
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+
+        return NGX_OK;
+    }
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip2_metadata(ngx_stream_session_t *s, ngx_stream_variable_value_t *v,
+    uintptr_t data)
+{
+    ngx_stream_geoip2_metadata_t  *metadata = (ngx_stream_geoip2_metadata_t *) data;
+    ngx_stream_geoip2_db_t        *database = metadata->database;
+    u_char                        *p;
+
+    if (ngx_strncmp(metadata->metavalue.data, "build_epoch", 11) == 0) {
+        FORMAT("%uL", database->mmdb.metadata.build_epoch);
+    } else if (ngx_strncmp(metadata->metavalue.data, "last_check", 10) == 0) {
+        FORMAT("%T", database->last_check);
+    } else if (ngx_strncmp(metadata->metavalue.data, "last_change", 11) == 0) {
+        FORMAT("%T", database->last_change);
+    } else {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_stream_geoip2_create_conf(ngx_conf_t *cf)
+{
+    ngx_pool_cleanup_t        *cln;
+    ngx_stream_geoip2_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NULL;
+    }
+
+    ngx_queue_init(&conf->databases);
+
+    cln->handler = ngx_stream_geoip2_cleanup;
+    cln->data = conf;
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_geoip2(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    int                       status;
+    char                      *rv;
+    ngx_str_t                 *value;
+    ngx_conf_t                save;
+    ngx_stream_geoip2_db_t    *database;
+    ngx_stream_geoip2_conf_t  *gcf = conf;
+    ngx_queue_t               *q;
+
+    value = cf->args->elts;
+
+    if (value[1].data && value[1].data[0] != '/') {
+        if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (!ngx_queue_empty(&gcf->databases)) {
+        for (q = ngx_queue_head(&gcf->databases);
+             q != ngx_queue_sentinel(&gcf->databases);
+             q = ngx_queue_next(q))
+        {
+            database = ngx_queue_data(q, ngx_stream_geoip2_db_t, queue);
+            if (ngx_strcmp(value[1].data, database->mmdb.filename) == 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "Duplicate GeoIP2 mmdb - %V", &value[1]);
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+    database = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_db_t));
+    if (database == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_queue_insert_tail(&gcf->databases, &database->queue);
+    database->last_check = database->last_change = ngx_time();
+
+    status = MMDB_open((char *) value[1].data, MMDB_MODE_MMAP, &database->mmdb);
+
+    if (status != MMDB_SUCCESS) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "MMDB_open(\"%V\") failed - %s", &value[1],
+                           MMDB_strerror(status));
+        return NGX_CONF_ERROR;
+    }
+
+    save = *cf;
+    cf->handler = ngx_stream_geoip2_parse_config;
+    cf->handler_conf = (void *) database;
+
+    rv = ngx_conf_parse(cf, NULL);
+    *cf = save;
+    return rv;
+}
+
+
+static char *
+ngx_stream_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    ngx_stream_geoip2_db_t  *database;
+    ngx_str_t             *value;
+    time_t                interval;
+
+    value = cf->args->elts;
+
+    if (value[0].data[0] == '$') {
+        return ngx_stream_geoip2_add_variable(cf, dummy, conf);
+    }
+
+    if (value[0].len == 11
+            && ngx_strncmp(value[0].data, "auto_reload", 11) == 0) {
+        if ((int) cf->args->nelts != 2) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid number of arguments for auto_reload");
+            return NGX_CONF_ERROR;
+        }
+
+        interval = ngx_parse_time(&value[1], true);
+
+        if (interval == (time_t) NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid interval for auto_reload \"%V\"",
+                               value[1]);
+            return NGX_CONF_ERROR;
+        }
+
+
+        database = (ngx_stream_geoip2_db_t *) conf;
+        database->check_interval = interval;
+        return NGX_CONF_OK;
+    }
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "invalid setting \"%V\"", &value[0]);
+    return NGX_CONF_ERROR;
+}
+
+
+static char *
+ngx_stream_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    ngx_stream_geoip2_db_t  *database;
+    ngx_str_t               *value;
+    int                     nelts;
+
+    value = cf->args->elts;
+
+    if (value[0].data[0] != '$') {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"%V\"", &value[0]);
+        return NGX_CONF_ERROR;
+    }
+
+    value[0].len--;
+    value[0].data++;
+
+    nelts = (int) cf->args->nelts;
+    database = (ngx_stream_geoip2_db_t *) conf;
+
+    if (nelts > 0 && value[1].len == 8 && ngx_strncmp(value[1].data, "metadata", 8) == 0) {
+        return ngx_stream_geoip2_add_variable_metadata(cf, database);
+    }
+
+    return ngx_stream_geoip2_add_variable_geodata(cf, database);
+}
+
+
+static char *
+ngx_stream_geoip2_add_variable_metadata(ngx_conf_t *cf, ngx_stream_geoip2_db_t *database)
+{
+    ngx_stream_geoip2_metadata_t  *metadata;
+    ngx_str_t                     *value, name;
+    ngx_stream_variable_t         *var;
+
+    metadata = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_metadata_t));
+    if (metadata == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+    name = value[0];
+
+    metadata->database = database;
+    metadata->metavalue = value[2];
+
+    var = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    var->get_handler = ngx_stream_geoip2_metadata;
+    var->data = (uintptr_t) metadata;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_stream_geoip2_add_variable_geodata(ngx_conf_t *cf, ngx_stream_geoip2_db_t *database)
+{
+    ngx_stream_geoip2_ctx_t             *geoip2;
+    ngx_stream_compile_complex_value_t  ccv;
+    ngx_str_t                           *value, name, source;
+    ngx_stream_variable_t               *var;
+    int                                 i, nelts, idx;
+
+    geoip2 = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_ctx_t));
+    if (geoip2 == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    geoip2->database = database;
+    ngx_str_null(&source);
+
+    value = cf->args->elts;
+    name = value[0];
+
+    nelts = (int) cf->args->nelts;
+    idx = 1;
+
+    if (nelts > idx) {
+        for (i = idx; i < nelts; i++) {
+            if (ngx_strnstr(value[idx].data, "=", value[idx].len) == NULL) {
+                break;
+            }
+
+            if (value[idx].len > 8 && ngx_strncmp(value[idx].data, "default=", 8) == 0) {
+                if (geoip2->default_value.len > 0) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "default has already been declared for  \"$%V\"", &name);
+                    return NGX_CONF_ERROR;
+                }
+
+                geoip2->default_value.len  = value[idx].len - 8;
+                geoip2->default_value.data = value[idx].data + 8;
+
+            } else if (value[idx].len > 7 && ngx_strncmp(value[idx].data, "source=", 7) == 0) {
+                if (source.len > 0) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "source has already been declared for  \"$%V\"", &name);
+                    return NGX_CONF_ERROR;
+                }
+
+                source.len  = value[idx].len - 7;
+                source.data = value[idx].data + 7;
+
+                if (source.data[0] != '$') {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "invalid source variable name \"%V\"", &source);
+                    return NGX_CONF_ERROR;
+                }
+
+                ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+                ccv.cf = cf;
+                ccv.value = &source;
+                ccv.complex_value = &geoip2->source;
+
+                if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "unable to compile \"%V\" for \"$%V\"", &source, &name);
+                    return NGX_CONF_ERROR;
+                }
+
+            } else {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "invalid setting \"%V\" for \"$%V\"", &value[idx], &name);
+                    return NGX_CONF_ERROR;
+            }
+
+            idx++;
+        }
+    }
+
+    var = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    geoip2->lookup = ngx_pcalloc(cf->pool,
+                         sizeof(const char *) * (cf->args->nelts - (idx - 1)));
+
+    if (geoip2->lookup == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    for (i = idx; i < nelts; i++) {
+        geoip2->lookup[i - idx] = (char *) value[i].data;
+    }
+    geoip2->lookup[i - idx] = NULL;
+
+    var->get_handler = ngx_stream_geoip2_variable;
+    var->data = (uintptr_t) geoip2;
+
+    return NGX_CONF_OK;
+}
+
+
+static void
+ngx_stream_geoip2_cleanup(void *data)
+{
+    ngx_queue_t               *q;
+    ngx_stream_geoip2_db_t    *database;
+    ngx_stream_geoip2_conf_t  *gcf = data;
+
+    while (!ngx_queue_empty(&gcf->databases)) {
+        q = ngx_queue_head(&gcf->databases);
+        ngx_queue_remove(q);
+        database = ngx_queue_data(q, ngx_stream_geoip2_db_t, queue);
+        MMDB_close(&database->mmdb);
+    }
+}
+
+
+static ngx_int_t
+ngx_stream_geoip2_log_handler(ngx_stream_session_t *s)
+{
+    int                        status;
+    MMDB_s                     tmpdb;
+    ngx_queue_t                *q;
+    ngx_file_info_t            fi;
+    ngx_stream_geoip2_db_t    *database;
+    ngx_stream_geoip2_conf_t  *gcf;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "geoip2 stream log handler");
+
+    gcf = ngx_stream_get_module_main_conf(s, ngx_stream_geoip2_module);
+
+    if (ngx_queue_empty(&gcf->databases)) {
+        return NGX_OK;
+    }
+
+    for (q = ngx_queue_head(&gcf->databases);
+         q != ngx_queue_sentinel(&gcf->databases);
+         q = ngx_queue_next(q))
+    {
+        database = ngx_queue_data(q, ngx_stream_geoip2_db_t, queue);
+        if (database->check_interval == 0) {
+            continue;
+        }
+
+        if ((database->last_check + database->check_interval)
+            > ngx_time())
+        {
+            continue;
+        }
+
+        database->last_check = ngx_time();
+
+        if (ngx_file_info(database->mmdb.filename, &fi) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_EMERG, s->connection->log, ngx_errno,
+                          ngx_file_info_n " \"%s\" failed",
+                          database->mmdb.filename);
+
+            continue;
+        }
+
+        if (ngx_file_mtime(&fi) <= database->last_change) {
+            continue;
+        }
+
+        /* do the reload */
+
+        ngx_memzero(&tmpdb, sizeof(MMDB_s));
+        status = MMDB_open(database->mmdb.filename, MMDB_MODE_MMAP, &tmpdb);
+
+        if (status != MMDB_SUCCESS) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "MMDB_open(\"%s\") failed to reload - %s",
+                          database->mmdb.filename, MMDB_strerror(status));
+
+            continue;
+        }
+
+        database->last_change = ngx_file_mtime(&fi);
+        MMDB_close(&database->mmdb);
+        database->mmdb = tmpdb;
+
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                      "Reload MMDB \"%s\"",
+                      database->mmdb.filename);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip2_init(ngx_conf_t *cf)
+{
+    ngx_stream_handler_pt        *h;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_STREAM_LOG_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_stream_geoip2_log_handler;
+
+    return NGX_OK;
+}
diff --git a/debian/modules/watch/http-geoip2 b/debian/modules/watch/http-geoip2
new file mode 100644
index 0000000..da23145
--- /dev/null
+++ b/debian/modules/watch/http-geoip2
@@ -0,0 +1,4 @@
+version=4
+opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-geoip2-$1.tar.gz%" \
+    https://github.com/leev/ngx_http_geoip2_module/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-geoip2
diff --git a/debian/rules b/debian/rules
index bf4b9f3..bc9a234 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ DYN_MODS := \
 	http-echo \
 	http-fancyindex \
 	http-geoip \
+	http-geoip2 \
 	http-headers-more-filter \
 	http-image-filter \
 	http-lua \
@@ -131,6 +132,7 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/http-ndk \
 			--add-dynamic-module=$(MODULESDIR)/http-echo \
 			--add-dynamic-module=$(MODULESDIR)/http-fancyindex \
+			--add-dynamic-module=$(MODULESDIR)/http-geoip2 \
 			--add-dynamic-module=$(MODULESDIR)/nchan \
 			--add-dynamic-module=$(MODULESDIR)/http-lua \
 			--add-dynamic-module=$(MODULESDIR)/rtmp \
diff --git a/debian/tests/control b/debian/tests/control
index b491482..45f26e5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -28,6 +28,7 @@ Depends: nginx-full,
          libnginx-mod-http-echo,
          libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip,
+         libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
@@ -51,6 +52,7 @@ Depends: nginx-light,
          libnginx-mod-http-echo,
          libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip,
+         libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,
@@ -74,6 +76,7 @@ Depends: nginx-extras,
          libnginx-mod-http-echo,
          libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip,
+         libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
          libnginx-mod-http-lua,

From e3540f5188a2983e7c0f41c40cd3c567bbe6185f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 10:58:53 +0200
Subject: [PATCH 314/600] d/copyright: Update for release

---
 debian/copyright | 98 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 64 insertions(+), 34 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3fb1c3f..82b44ee 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,12 @@ Upstream-Name: nginx
 Source: https://nginx.org/en/download.html
 
 Files: *
-Copyright: 2002-2014 Igor Sysoev
-           2011-2014 Nginx, Inc.
-                     Maxim Dounin
-                     Valentin V. Bartenev
-                     Roman Arutyunyan
-                     Ruslan Ermilov
+Copyright: 2002-2019, Igor Sysoev
+           2011-2019, Nginx, Inc.
+                      Maxim Dounin
+                      Valentin V. Bartenev
+                      Roman Arutyunyan
+                      Ruslan Ermilov
 License: BSD-2-clause
 
 Files: src/core/ngx_murmurhash.c
@@ -17,10 +17,16 @@ License: BSD-2-clause
 
 Files: src/http/modules/ngx_http_scgi_module.c
        src/http/modules/ngx_http_uwsgi_module.c
-Copyright: Copyright (C) Igor Sysoev
-           Copyright (C) Nginx, Inc.
-           2009-2010 Unbit S.a.s.
-           2008      Manlio Perillo (manlio.perillo@gmail.com)
+Copyright: 2009-2010, Unbit S.a.s.
+           2008,      Manlio Perillo (manlio.perillo@gmail.com)
+                      Igor Sysoev
+                      Nginx, Inc.
+License: BSD-2-clause
+
+Files: nginx/src/http/v2/ngx_http_v2_huff_encode.c
+Copyright: 2015, Vlad Krasnov
+                 Nginx, Inc.
+                 Valentin V. Bartenev
 License: BSD-2-clause
 
 Files: contrib/geo2nginx.pl
@@ -39,74 +45,98 @@ Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
 License: BSD-2-clause
 
 Files: debian/modules/http-headers-more-filter/*
-Copyright: Copyright (c) 2009-2014, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
-           Copyright (c) 2010-2013, Bernd Dorn
-           Copyright (c) Igor Sysoev
+Copyright: 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+           2010-2013, Bernd Dorn
+                      Igor Sysoev
 License: BSD-2-clause
 
 Files: debian/modules/http-geoip2/*
-Copyright: Copyright (c) 2014, Lee Valentine <lee@leev.net>
+Copyright: 2014, Lee Valentine <lee@leev.net>
 License: BSD-2-clause
 
 Files: debian/modules/http-ndk/*
-Copyright: Marcus Clyne
+Copyright: 2010-2018, Marcus Clyne
 License: BSD-3-clause
 
 Files: debian/modules/http-ndk/src/hash/md5.h
        debian/modules/http-ndk/src/hash/sha.h
-Copyright: Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+Copyright: 1995-1998, Eric Young <eay@cryptsoft.com>
 License: BSD-4-clause
 
+Files: debian/modules/http-ndk/src/hash/murmurhash2.c
+Copyright: Austin Appleby
+License: BSD-3-clause
+
 Files: debian/modules/http-auth-pam/*
-Copyright: 2008-2013, Sergio Talens Oliag
+Copyright: 2008-2016, Sergio Talens Oliag
 License: BSD-2-clause
 
 Files: debian/modules/http-echo/*
-Copyright: Copyright (c) 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>
+Copyright: 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>
 License: BSD-2-clause
 
 Files: debian/modules/http-lua/*
-Copyright: Copyright (C) 2009-2014, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
-           Copyright (C) 2009-2014, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright: 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
+           2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 License: BSD-2-clause
 
+Files: debian/modules/http-lua/t/lib/CRC32.lua
+Copyright: 2007-2008, Neil Richardson (nrich@iinet.net.au)
+License: Expat
+
 Files: debian/modules/http-upstream-fair/*
-Copyright: Copyright (c) 2007 Grzegorz Nosek
-           Igor Sysoev
+Copyright: 2007, Grzegorz Nosek
+                 Igor Sysoev
 License: BSD-2-clause
 
 Files: debian/modules/nchan/*
-Copyright: 2009-2016 Leo Ponomarev
-License: MIT
+Copyright: 2009-2016, Leo Ponomarev (slact)
+           2014,      Wandenberg Peixoto
+                      Alexander Lyalin
+                      Rogério Carvalho Schneider <stockrt@gmail.com>
+License: Expat
+
+Files: debian/modules/nchan/src/store/redis/hiredis/*
+Copyright: 2006-2014, Salvatore Sanfilippo <antirez@gmail.com>
+           2010-2011, Pieter Noordhuis <pcnoordhuis@gmail.com>
+           2015,      Matt Stancliff <matt@genges.com>
+                      Jan-Erik Rediger <janerik.fnordig.com>
+License: BSD-3-clause
 
 Files: debian/modules/nchan/src/store/redis/cmp.*
-Copyright: 2015 Charles Gunyon
-License: MIT
+Copyright: 2017, Charles Gunyon
+License: Expat
 
 Files: debian/modules/http-uploadprogress/*
-Copyright: Brice Figureau
+Copyright: 2007, Brice Figureau
            2002-2007, Igor Sysoev
 License: BSD-2-clause
 
 Files: debian/modules/http-cache-purge/*
-Copyright: 2009-2012, FRiCKLE <info@frickle.com>,
-           2009-2012, Piotr Sikora <piotr.sikora@frickle.com>
+Copyright: 2009-2014, FRiCKLE <info@frickle.com>,
+           2009-2014, Piotr Sikora <piotr.sikora@frickle.com>
 License: BSD-2-clause
 
 Files: debian/modules/http-dav-ext/*
-Copyright: Arutyunyan Roman <arut@qip.ru>
+Copyright: 2012-2018, Roman Arutyunyan <arut@qip.ru>
 License: BSD-2-clause
 
 Files: debian/modules/http-fancyindex/*
-Copyright: Copyright (c) Adrian Perez <aperez@igalia.com>
+Copyright: 2007-2016, Adrian Perez <aperez@igalia.com>
 License: BSD-2-clause
 
 Files: debian/modules/http-subs-filter/*
-Copyright: Copyright (C) 2014 by Weibin Yao <yaoweibin@gmail.com>
+Copyright: 2014, Weibin Yao <yaoweibin@gmail.com>
 License: BSD-2-clause
 
+Files: debian/modules/http-subs-filter/test/*
+Copyright: 2009-2011, Taobao Inc., Alibaba Group
+                      Antoine BONAVITA "<antoine.bonavita@gmail.com>"
+                      agentzh (章亦春) "<agentzh@gmail.com>"
+License: BSD-3-clause
+
 Files: debian/modules/rtmp/*
-Copyright: Copyright (C) 2012-2014, Roman Arutyunyan
+Copyright: 2012-2014, Roman Arutyunyan
 License: BSD-2-clause
 
 License: BSD-2-clause
@@ -186,7 +216,7 @@ License: BSD-4-clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-License: MIT
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to
  deal in the Software without restriction, including without limitation the

From 1459087c8f82f6b0855d61844bec493224a6e2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 11:36:23 +0200
Subject: [PATCH 315/600] d/conf/nginx.conf: Remove tcp_nodelay on, which is
 same as default

---
 debian/conf/nginx.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index 9ee6e06..d8f88b0 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -16,7 +16,6 @@ http {
 
 	sendfile on;
 	tcp_nopush on;
-	tcp_nodelay on;
 	keepalive_timeout 65;
 	types_hash_max_size 2048;
 	# server_tokens off;

From 9fbad86c59ba7ae68d211f929527ac2a7a435c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 11:37:11 +0200
Subject: [PATCH 316/600] d/conf/nginx.conf: Remove keepalive_timeout 65 and
 use default value 75s.

---
 debian/conf/nginx.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index d8f88b0..162bc7f 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -16,7 +16,6 @@ http {
 
 	sendfile on;
 	tcp_nopush on;
-	keepalive_timeout 65;
 	types_hash_max_size 2048;
 	# server_tokens off;
 

From 478b7377229e954941026db88334925d7c1a25f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 11:37:49 +0200
Subject: [PATCH 317/600] d/conf/nginx.conf: Remove trailing whitespaces

---
 debian/conf/nginx.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index 162bc7f..136753e 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -64,17 +64,17 @@ http {
 #mail {
 #	# See sample authentication script at:
 #	# http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
-# 
+#
 #	# auth_http localhost/auth.php;
 #	# pop3_capabilities "TOP" "USER";
 #	# imap_capabilities "IMAP4rev1" "UIDPLUS";
-# 
+#
 #	server {
 #		listen     localhost:110;
 #		protocol   pop3;
 #		proxy      on;
 #	}
-# 
+#
 #	server {
 #		listen     localhost:143;
 #		protocol   imap;

From 3edca8428c0fd3b4a470da1b60ea48be63a66dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 20:23:32 +0200
Subject: [PATCH 318/600] Build dynamic modules only in extras flavour

---
 debian/rules | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/debian/rules b/debian/rules
index bc9a234..45a337a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,28 +83,14 @@ light_configure_flags := \
 			--without-http_memcached_module \
 			--without-http_referer_module \
 			--without-http_split_clients_module \
-			--without-http_userid_module \
-			--add-dynamic-module=$(MODULESDIR)/http-echo
+			--without-http_userid_module
 
 full_configure_flags := \
 			$(common_configure_flags) \
 			--with-http_addition_module \
-			--with-http_geoip_module=dynamic \
 			--with-http_gunzip_module \
 			--with-http_gzip_static_module \
-			--with-http_image_filter_module=dynamic \
 			--with-http_sub_module \
-			--with-http_xslt_module=dynamic \
-			--with-stream=dynamic \
-			--with-stream_ssl_module \
-			--with-stream_ssl_preread_module \
-			--with-mail=dynamic \
-			--with-mail_ssl_module \
-			--add-dynamic-module=$(MODULESDIR)/http-auth-pam \
-			--add-dynamic-module=$(MODULESDIR)/http-dav-ext \
-			--add-dynamic-module=$(MODULESDIR)/http-echo \
-			--add-dynamic-module=$(MODULESDIR)/http-upstream-fair \
-			--add-dynamic-module=$(MODULESDIR)/http-subs-filter
 
 extras_configure_flags := \
 			$(common_configure_flags) \

From a2ddfe2d0e30516f984cf2dfc51f817397d55bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 20:35:46 +0200
Subject: [PATCH 319/600] d/ngx-conf: Convert to Python 3

---
 debian/ngx-conf/ngx-conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/ngx-conf/ngx-conf b/debian/ngx-conf/ngx-conf
index de24fcc..658766a 100755
--- a/debian/ngx-conf/ngx-conf
+++ b/debian/ngx-conf/ngx-conf
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##
 # copyright (c) 2015 Michael Lustfield <michael@lustfield.net>
@@ -37,7 +37,7 @@ import subprocess
 
 
 # Read configuration values
-config_opts = ConfigParser.SafeConfigParser({
+config_opts = ConfigParser.ConfigParser({
     'base_dir': '/etc/nginx/',
     'conf_dir': 'conf.d/',
     'sites_en': 'sites-enabled/',
@@ -211,7 +211,7 @@ def remove_configs(configs, verbose, force):
         for f in files:
             if os.path.isfile(f):
                 if not force:
-                    answer = str(raw_input('Are you sure you want to delete {}? (y/N) '.format(f)))
+                    answer = str(input('Are you sure you want to delete {}? (y/N) '.format(f)))
                     if answer.lower() != 'y' and answer.lower() != 'yes':
                         break
                 try:

From a681a84cf0ecc555ae27ffe57e41828e7c066812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 20:43:40 +0200
Subject: [PATCH 320/600] d/control: Add GeoIP2 into description

---
 debian/control | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index b3ec941..f28ce4b 100644
--- a/debian/control
+++ b/debian/control
@@ -106,8 +106,8 @@ Description: nginx web/proxy server (standard version)
  .
  MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
  .
- THIRD PARTY MODULES: Auth PAM, DAV Ext, Echo, HTTP Substitutions, Upstream
- Fair Queue.
+ THIRD PARTY MODULES: Auth PAM, DAV Ext, Echo, GeoIP2, HTTP Substitutions
+ Upstream Fair Queue.
 
 Package: nginx-light
 Architecture: any
@@ -185,7 +185,7 @@ Description: nginx web/proxy server (extended version)
  MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
  .
  THIRD PARTY MODULES: Auth PAM, Cache Purge, DAV Ext, Echo, Fancy Index,
- Headers More, Embedded Lua, HTTP Substitutions, Nchan, Upload Progress,
+ GeoIP2, Headers More, Embedded Lua, HTTP Substitutions, Nchan, Upload Progress,
  Upstream Fair Queue.
 
 Package: libnginx-mod-http-geoip

From b39ced7d98a32c4eda52d7fad5a4b2e481d14c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 22:23:09 +0200
Subject: [PATCH 321/600] d/copyright: Fix wrong filename

---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 82b44ee..6177c46 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,7 +23,7 @@ Copyright: 2009-2010, Unbit S.a.s.
                       Nginx, Inc.
 License: BSD-2-clause
 
-Files: nginx/src/http/v2/ngx_http_v2_huff_encode.c
+Files: src/http/v2/ngx_http_v2_huff_encode.c
 Copyright: 2015, Vlad Krasnov
                  Nginx, Inc.
                  Valentin V. Bartenev

From 6982ab38dda9a1904b4fa01cd68552a5c3301f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 22:32:04 +0200
Subject: [PATCH 322/600] Introduce nginx-core and make it new default for
 "nginx"

Version of nginx identical to that of nginx-full, but without
any third-party modules, and only modules in the original nginx
code base.
---
 debian/control                                | 65 ++++++++++++++-----
 debian/{nginx-full.dirs => nginx-core.dirs}   |  0
 debian/nginx-core.install                     |  1 +
 debian/nginx-core.manpages                    |  1 +
 ...ginx-full.postinst => nginx-core.postinst} |  0
 debian/{nginx-full.prerm => nginx-core.prerm} |  0
 ...ginx-full.triggers => nginx-core.triggers} |  0
 debian/nginx-full.install                     |  1 -
 debian/nginx-full.manpages                    |  1 -
 debian/rules                                  |  4 +-
 debian/tests/control                          | 28 ++++++++
 debian/tests/core-module-deps                 |  3 +
 debian/tests/core-simple                      |  3 +
 13 files changed, 86 insertions(+), 21 deletions(-)
 rename debian/{nginx-full.dirs => nginx-core.dirs} (100%)
 create mode 100644 debian/nginx-core.install
 create mode 100644 debian/nginx-core.manpages
 rename debian/{nginx-full.postinst => nginx-core.postinst} (100%)
 rename debian/{nginx-full.prerm => nginx-core.prerm} (100%)
 rename debian/{nginx-full.triggers => nginx-core.triggers} (100%)
 delete mode 100644 debian/nginx-full.install
 delete mode 100644 debian/nginx-full.manpages
 create mode 100644 debian/tests/core-module-deps
 create mode 100644 debian/tests/core-simple

diff --git a/debian/control b/debian/control
index f28ce4b..5d4fdde 100644
--- a/debian/control
+++ b/debian/control
@@ -30,16 +30,16 @@ Rules-Requires-Root: no
 
 Package: nginx
 Architecture: all
-Depends: nginx-full (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
-         nginx-full (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version}),
+Depends: nginx-core (<< ${source:Version}.1~) | nginx-full (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
+         nginx-core (>= ${source:Version}) | nginx-full (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version}),
          ${misc:Depends}
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This is a dependency package to install either nginx-full (by default),
- nginx-light or nginx-extras.
+ This is a dependency package to install either nginx-core (by default),
+ nginx-full, nginx-light or nginx-extras.
 
 Package: nginx-doc
 Architecture: all
@@ -66,23 +66,19 @@ Description: small, powerful, scalable web/proxy server - common files
  This package contains base configuration files used by all versions of
  nginx.
 
-Package: nginx-full
+Package: nginx-core
 Architecture: any
-Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
-         libnginx-mod-http-dav-ext (= ${binary:Version}),
-         libnginx-mod-http-echo (= ${binary:Version}),
-         libnginx-mod-http-geoip (= ${binary:Version}),
-         libnginx-mod-http-geoip2 (= ${binary:Version}),
+Depends: libnginx-mod-http-geoip (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
-         libnginx-mod-http-subs-filter (= ${binary:Version}),
-         libnginx-mod-http-upstream-fair (= ${binary:Version}),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
          nginx-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: nginx (<< 1.4.5-1)
+Breaks: nginx (<< 1.4.5-1),
+        nginx-full (<< 1.18.0-1),
+Replaces: nginx-full (<< 1.18.0-1),
 Provides: httpd, httpd-cgi, nginx
 Conflicts: nginx-extras, nginx-light
 Suggests: nginx-doc (= ${source:Version})
@@ -91,9 +87,44 @@ Description: nginx web/proxy server (standard version)
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This package provides a version of nginx with the complete set of
+ This package provides a version of nginx identical to that of nginx-full,
+ but without any third-party modules, and only modules in the original
+ nginx code base.
+ .
+ STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty
+ GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy,
+ Referer, Rewrite, SCGI, Split Clients, UWSGI.
+ .
+ OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip,
+ Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP,
+ Slice, SSI, SSL, Stream, SSL Preread, Stub Status, Substitution, Thread  Pool,
+ Upstream, User ID, XSLT.
+ .
+ MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
+
+Package: nginx-full
+Architecture: all
+Depends: libnginx-mod-http-auth-pam,
+         libnginx-mod-http-dav-ext,
+         libnginx-mod-http-echo,
+         libnginx-mod-http-geoip2,
+         libnginx-mod-http-subs-filter,
+         libnginx-mod-http-upstream-fair,
+         nginx-core (>= ${source:Version}),
+         nginx-core (<< ${source:Version}.1~),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: nginx (<< 1.4.5-1)
+Provides: httpd, httpd-cgi, nginx
+Suggests: nginx-doc (= ${source:Version})
+Description: nginx web/proxy server (standard version with 3rd parties)
+ Nginx ("engine X") is a high-performance web and reverse proxy server
+ created by Igor Sysoev. It can be used both as a standalone web server
+ and as a proxy to reduce the load on back-end HTTP or mail servers.
+ .
+ This metapackage provides a version of nginx with the complete set of
  standard modules included (but omitting some of those included in
- nginx-extra).
+ nginx-extras).
  .
  STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty
  GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy,
@@ -117,7 +148,7 @@ Depends: libnginx-mod-http-echo (= ${binary:Version}),
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
 Provides: httpd, httpd-cgi, nginx
-Conflicts: nginx-extras, nginx-full
+Conflicts: nginx-extras, nginx-core
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (basic version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -161,7 +192,7 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
 Provides: httpd, httpd-cgi, nginx
-Conflicts: nginx-full, nginx-light
+Conflicts: nginx-core, nginx-light
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (extended version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
diff --git a/debian/nginx-full.dirs b/debian/nginx-core.dirs
similarity index 100%
rename from debian/nginx-full.dirs
rename to debian/nginx-core.dirs
diff --git a/debian/nginx-core.install b/debian/nginx-core.install
new file mode 100644
index 0000000..a82f702
--- /dev/null
+++ b/debian/nginx-core.install
@@ -0,0 +1 @@
+debian/build-core/objs/nginx usr/sbin
diff --git a/debian/nginx-core.manpages b/debian/nginx-core.manpages
new file mode 100644
index 0000000..3b6d0bd
--- /dev/null
+++ b/debian/nginx-core.manpages
@@ -0,0 +1 @@
+debian/build-core/objs/nginx.8
diff --git a/debian/nginx-full.postinst b/debian/nginx-core.postinst
similarity index 100%
rename from debian/nginx-full.postinst
rename to debian/nginx-core.postinst
diff --git a/debian/nginx-full.prerm b/debian/nginx-core.prerm
similarity index 100%
rename from debian/nginx-full.prerm
rename to debian/nginx-core.prerm
diff --git a/debian/nginx-full.triggers b/debian/nginx-core.triggers
similarity index 100%
rename from debian/nginx-full.triggers
rename to debian/nginx-core.triggers
diff --git a/debian/nginx-full.install b/debian/nginx-full.install
deleted file mode 100644
index ccd2676..0000000
--- a/debian/nginx-full.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/build-full/objs/nginx usr/sbin
diff --git a/debian/nginx-full.manpages b/debian/nginx-full.manpages
deleted file mode 100644
index 28267c2..0000000
--- a/debian/nginx-full.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/build-full/objs/nginx.8
diff --git a/debian/rules b/debian/rules
index 45a337a..9fead04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) -fPIC $(shell dpkg-buildflags --get CPPFLAGS)
 debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC
 
-FLAVOURS := full light extras
+FLAVOURS := core light extras
 DYN_MODS := \
 	http-auth-pam \
 	http-cache-purge \
@@ -85,7 +85,7 @@ light_configure_flags := \
 			--without-http_split_clients_module \
 			--without-http_userid_module
 
-full_configure_flags := \
+core_configure_flags := \
 			$(common_configure_flags) \
 			--with-http_addition_module \
 			--with-http_gunzip_module \
diff --git a/debian/tests/control b/debian/tests/control
index 45f26e5..2ea2832 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -10,6 +10,10 @@ Tests: lua
 Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-extras, curl
 
+Tests: core-simple
+Restrictions: allow-stderr isolation-container
+Depends: nginx-core, curl
+
 Tests: full-simple
 Restrictions: allow-stderr isolation-container
 Depends: nginx-full, curl
@@ -18,6 +22,30 @@ Tests: extras-simple
 Restrictions: allow-stderr isolation-container
 Depends: nginx-extras, curl
 
+Tests: core-module-deps
+Restrictions: allow-stderr isolation-container
+Depends: nginx-core,
+         curl,
+         libnginx-mod-http-auth-pam,
+         libnginx-mod-http-cache-purge,
+         libnginx-mod-http-dav-ext,
+         libnginx-mod-http-echo,
+         libnginx-mod-http-fancyindex,
+         libnginx-mod-http-geoip,
+         libnginx-mod-http-geoip2,
+         libnginx-mod-http-headers-more-filter,
+         libnginx-mod-http-image-filter,
+         libnginx-mod-http-lua,
+         libnginx-mod-http-perl,
+         libnginx-mod-http-subs-filter,
+         libnginx-mod-http-uploadprogress,
+         libnginx-mod-http-upstream-fair,
+         libnginx-mod-http-xslt-filter,
+         libnginx-mod-mail,
+         libnginx-mod-nchan,
+         libnginx-mod-rtmp,
+         libnginx-mod-stream
+
 Tests: full-module-deps
 Restrictions: allow-stderr isolation-container
 Depends: nginx-full,
diff --git a/debian/tests/core-module-deps b/debian/tests/core-module-deps
new file mode 100644
index 0000000..cefed50
--- /dev/null
+++ b/debian/tests/core-module-deps
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/core-simple b/debian/tests/core-simple
new file mode 100644
index 0000000..cefed50
--- /dev/null
+++ b/debian/tests/core-simple
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/

From 8dfca737efad4030f0b1b54cf71843fe49efc9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 22:33:47 +0200
Subject: [PATCH 323/600] libnginx-mod-* now depends on nginx-<any flavour>

---
 debian/control | 60 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/debian/control b/debian/control
index 5d4fdde..d18e602 100644
--- a/debian/control
+++ b/debian/control
@@ -221,7 +221,8 @@ Description: nginx web/proxy server (extended version)
 
 Package: libnginx-mod-http-geoip
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: GeoIP HTTP module for Nginx
  The ngx_http_geoip module creates variables with values depending on the
  client IP address, using the precompiled MaxMind databases.
@@ -231,7 +232,8 @@ Description: GeoIP HTTP module for Nginx
 
 Package: libnginx-mod-http-geoip2
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: GeoIP2 HTTP module for Nginx
  The ngx_http_geoip2 module creates variables with values depending on the
  client IP address, using the precompiled MaxMind GeoIP2 databases.
@@ -241,7 +243,8 @@ Description: GeoIP2 HTTP module for Nginx
 
 Package: libnginx-mod-http-image-filter
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: HTTP image filter module for Nginx
  The ngx_http_image_filter module is a filter that transforms images in JPEG,
  GIF, and PNG formats.
@@ -251,7 +254,8 @@ Description: HTTP image filter module for Nginx
 
 Package: libnginx-mod-http-xslt-filter
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: XSLT Transformation module for Nginx
  The ngx_http_xslt_filter module is a filter that transforms XML responses
  using one or more XSLT stylesheets.
@@ -261,7 +265,8 @@ Description: XSLT Transformation module for Nginx
 
 Package: libnginx-mod-mail
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Mail module for Nginx
  The nginx_mail module adds mail proxy support to nginx.
  .
@@ -270,7 +275,8 @@ Description: Mail module for Nginx
 
 Package: libnginx-mod-stream
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Stream module for Nginx
  The nginx_stream module adds stream proxy support to nginx.
  .
@@ -280,7 +286,8 @@ Description: Stream module for Nginx
 
 Package: libnginx-mod-http-perl
 Architecture: any
-Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Replaces: nginx-extras (<< 1.9.14-1)
 Description: Perl module for Nginx
  Embed Perl runtime into nginx.
@@ -292,7 +299,8 @@ Description: Perl module for Nginx
 
 Package: libnginx-mod-http-auth-pam
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: PAM authentication module for Nginx
  The nginx_http_auth_pam module enables authentication using PAM.
  .
@@ -303,7 +311,8 @@ Package: libnginx-mod-http-lua
 Architecture: any
 Depends: libnginx-mod-http-ndk (= ${binary:Version}),
          ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Lua module for Nginx
  Embed Lua runtime into nginx.
  .
@@ -314,7 +323,8 @@ Description: Lua module for Nginx
 
 Package: libnginx-mod-http-ndk
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Nginx Development Kit module
  The NDK is an Nginx module that is designed to extend the core functionality of
  the excellent Nginx webserver in a way that can be used as a basis of other
@@ -327,7 +337,8 @@ Description: Nginx Development Kit module
 
 Package: libnginx-mod-nchan
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Fast, flexible pub/sub server for Nginx
  Nchan is a scalable, flexible pub/sub server for the modern web, It can be
  configured as a standalone server, or as a shim between your application and
@@ -340,7 +351,8 @@ Description: Fast, flexible pub/sub server for Nginx
 
 Package: libnginx-mod-http-echo
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Bring echo and more shell style goodies to Nginx
  Echo module wraps lots of Nginx internal APIs for streaming input and output,
  parallel/sequential subrequests, timers and sleeping, as well as various meta
@@ -361,7 +373,8 @@ Description: Bring echo and more shell style goodies to Nginx
 
 Package: libnginx-mod-http-upstream-fair
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Nginx Upstream Fair Proxy Load Balancer
  The Nginx fair proxy balancer enhances the standard round-robin load balancer
  provided with Nginx so that it tracks busy backend servers and adjusts
@@ -369,7 +382,8 @@ Description: Nginx Upstream Fair Proxy Load Balancer
 
 Package: libnginx-mod-http-headers-more-filter
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Set and clear input and output headers for Nginx
  The Headers More module allows you to add, set, or clear any output or input
  header that you specify.
@@ -380,7 +394,8 @@ Description: Set and clear input and output headers for Nginx
 
 Package: libnginx-mod-http-cache-purge
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Purge content from Nginx caches
  Cache Purge module adds purging capabilities to Nginx. It allows purging
  content from caches used by all of Nginx proxy modules, like FastCGI, Proxy,
@@ -388,7 +403,8 @@ Description: Purge content from Nginx caches
 
 Package: libnginx-mod-http-fancyindex
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Fancy indexes module for the Nginx
  The Fancy Index module makes possible the generation of file listings, like
  the built-in autoindex module does, but adding a touch of style by introducing
@@ -396,7 +412,8 @@ Description: Fancy indexes module for the Nginx
 
 Package: libnginx-mod-http-uploadprogress
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Upload progress system for Nginx
  Upload progress module is an implementation of an upload progress system, that
  monitors RFC1867 POST uploads as they are transmitted to upstream servers.
@@ -407,7 +424,8 @@ Description: Upload progress system for Nginx
 
 Package: libnginx-mod-http-subs-filter
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: Substitution filter module for Nginx
  Subsitution Nginx module can do both regular expression and fixed string
  substitutions on response bodies. The module is quite different from Nginx's
@@ -416,7 +434,8 @@ Description: Substitution filter module for Nginx
 
 Package: libnginx-mod-http-dav-ext
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: WebDAV missing commands support for Nginx
  WebDAV Ext module complements the Nginx WebDAV module to provide a full
  WebDAV support.
@@ -425,7 +444,8 @@ Description: WebDAV missing commands support for Nginx
 
 Package: libnginx-mod-rtmp
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
 Description: RTMP support for Nginx
  The nginx RTMP module is a fully-featured streaming solution implemented in
  nginx.

From 6930b5ac144786de45f79b0231656a6a1968ed51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 4 Jun 2020 23:05:12 +0200
Subject: [PATCH 324/600] Add stream-geoip and stream-geoip2 modules

---
 debian/control                                | 45 ++++++++++++++++---
 debian/libnginx-mod-stream-geoip.nginx        | 13 ++++++
 debian/libnginx-mod-stream-geoip2.nginx       | 13 ++++++
 .../libnginx-mod.conf/mod-stream-geoip.conf   |  1 +
 .../libnginx-mod.conf/mod-stream-geoip2.conf  |  1 +
 debian/rules                                  |  5 ++-
 debian/tests/control                          | 16 +++++--
 7 files changed, 83 insertions(+), 11 deletions(-)
 create mode 100755 debian/libnginx-mod-stream-geoip.nginx
 create mode 100755 debian/libnginx-mod-stream-geoip2.nginx
 create mode 100644 debian/libnginx-mod.conf/mod-stream-geoip.conf
 create mode 100644 debian/libnginx-mod.conf/mod-stream-geoip2.conf

diff --git a/debian/control b/debian/control
index d18e602..d1fc34b 100644
--- a/debian/control
+++ b/debian/control
@@ -73,6 +73,7 @@ Depends: libnginx-mod-http-geoip (= ${binary:Version}),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
+         libnginx-mod-stream-geoip (= ${binary:Version}),
          nginx-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -97,10 +98,12 @@ Description: nginx web/proxy server (standard version)
  .
  OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip,
  Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP,
- Slice, SSI, SSL, Stream, SSL Preread, Stub Status, Substitution, Thread  Pool,
+ Slice, SSI, SSL, SSL Preread, Stub Status, Substitution, Thread  Pool,
  Upstream, User ID, XSLT.
  .
- MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
+ OPTIONAL MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
+ .
+ OPTIONAL STREAM MODULES: Stream Core, GeoIP
 
 Package: nginx-full
 Architecture: all
@@ -110,6 +113,7 @@ Depends: libnginx-mod-http-auth-pam,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-upstream-fair,
+         libnginx-mod-stream-geoip2,
          nginx-core (>= ${source:Version}),
          nginx-core (<< ${source:Version}.1~),
          ${misc:Depends},
@@ -135,7 +139,9 @@ Description: nginx web/proxy server (standard version with 3rd parties)
  Slice, SSI, SSL, Stream, SSL Preread, Stub Status, Substitution, Thread  Pool,
  Upstream, User ID, XSLT.
  .
- MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
+ OPTIONAL MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
+ .
+ OPTIONAL STREAM MODULES: Stream Core, GeoIP, GeoIP2
  .
  THIRD PARTY MODULES: Auth PAM, DAV Ext, Echo, GeoIP2, HTTP Substitutions
  Upstream Fair Queue.
@@ -187,6 +193,8 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-nchan (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
+         libnginx-mod-stream-geoip (= ${binary:Version}),
+         libnginx-mod-stream-geoip2 (= ${binary:Version}),
          nginx-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -210,10 +218,11 @@ Description: nginx web/proxy server (extended version)
  OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, FLV, GeoIP,
  Gunzip, Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log,
  MP4, Embedded Perl, Random Index, Real IP, Slice, Secure Link, SSI, SSL,
- Stream, SSL Preread, Stub Status, Substitution, Thread Pool, Upstream,
- User ID, XSLT.
+ SSL Preread, Stub Status, Substitution, Thread Pool, Upstream, User ID, XSLT.
  .
- MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
+ OPTIONAL MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
+ .
+ OPTIONAL STREAM MODULES: Stream, GeoIP, GeoIP2
  .
  THIRD PARTY MODULES: Auth PAM, Cache Purge, DAV Ext, Echo, Fancy Index,
  GeoIP2, Headers More, Embedded Lua, HTTP Substitutions, Nchan, Upload Progress,
@@ -284,6 +293,30 @@ Description: Stream module for Nginx
  also supports ACLs/connection limiting and configuring multiple operational
  parameters.
 
+Package: libnginx-mod-stream-geoip
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ libnginx-mod-stream (= ${binary:Version}),
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Description: GeoIP Stream module for Nginx
+ The ngx_stream_geoip module creates variables with values depending on the
+ client IP address, using the precompiled MaxMind databases.
+ .
+ Those variables include country, region, city, latitude, longitude, postal
+ code, etc.
+
+Package: libnginx-mod-stream-geoip2
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ libnginx-mod-stream (= ${binary:Version}),
+ nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Description: GeoIP2 Stream module for Nginx
+ The ngx_stream_geoip2 module creates variables with values depending on the
+ client IP address, using the precompiled MaxMind GeoIP2 databases.
+ .
+ Those variables include country, region, city, latitude, longitude, postal
+ code, etc.
+
 Package: libnginx-mod-http-perl
 Architecture: any
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
diff --git a/debian/libnginx-mod-stream-geoip.nginx b/debian/libnginx-mod-stream-geoip.nginx
new file mode 100755
index 0000000..9acb103
--- /dev/null
+++ b/debian/libnginx-mod-stream-geoip.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf 70\n";
diff --git a/debian/libnginx-mod-stream-geoip2.nginx b/debian/libnginx-mod-stream-geoip2.nginx
new file mode 100755
index 0000000..9acb103
--- /dev/null
+++ b/debian/libnginx-mod-stream-geoip2.nginx
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf 70\n";
diff --git a/debian/libnginx-mod.conf/mod-stream-geoip.conf b/debian/libnginx-mod.conf/mod-stream-geoip.conf
new file mode 100644
index 0000000..7195856
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-stream-geoip.conf
@@ -0,0 +1 @@
+load_module modules/ngx_stream_geoip_module.so;
diff --git a/debian/libnginx-mod.conf/mod-stream-geoip2.conf b/debian/libnginx-mod.conf/mod-stream-geoip2.conf
new file mode 100644
index 0000000..4072597
--- /dev/null
+++ b/debian/libnginx-mod.conf/mod-stream-geoip2.conf
@@ -0,0 +1 @@
+load_module modules/ngx_stream_geoip2_module.so;
diff --git a/debian/rules b/debian/rules
index 9fead04..f777843 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,9 @@ DYN_MODS := \
 	mail \
 	nchan \
 	rtmp \
-	stream
+	stream \
+	stream-geoip \
+	stream-geoip2
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
@@ -109,6 +111,7 @@ extras_configure_flags := \
 			--with-mail=dynamic \
 			--with-mail_ssl_module \
 			--with-stream=dynamic \
+			--with-stream_geoip_module=dynamic \
 			--with-stream_ssl_module \
 			--with-stream_ssl_preread_module \
 			--add-dynamic-module=$(MODULESDIR)/http-headers-more-filter \
diff --git a/debian/tests/control b/debian/tests/control
index 2ea2832..52690ae 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -44,7 +44,9 @@ Depends: nginx-core,
          libnginx-mod-mail,
          libnginx-mod-nchan,
          libnginx-mod-rtmp,
-         libnginx-mod-stream
+         libnginx-mod-stream-geoip,
+         libnginx-mod-stream-geoip2,
+         libnginx-mod-stream,
 
 Tests: full-module-deps
 Restrictions: allow-stderr isolation-container
@@ -68,7 +70,9 @@ Depends: nginx-full,
          libnginx-mod-mail,
          libnginx-mod-nchan,
          libnginx-mod-rtmp,
-         libnginx-mod-stream
+         libnginx-mod-stream-geoip,
+         libnginx-mod-stream-geoip2,
+         libnginx-mod-stream,
 
 Tests: light-module-deps
 Restrictions: allow-stderr isolation-container
@@ -92,7 +96,9 @@ Depends: nginx-light,
          libnginx-mod-mail,
          libnginx-mod-nchan,
          libnginx-mod-rtmp,
-         libnginx-mod-stream
+         libnginx-mod-stream-geoip,
+         libnginx-mod-stream-geoip2,
+         libnginx-mod-stream,
 
 Tests: extras-module-deps
 Restrictions: allow-stderr isolation-container
@@ -116,4 +122,6 @@ Depends: nginx-extras,
          libnginx-mod-mail,
          libnginx-mod-nchan,
          libnginx-mod-rtmp,
-         libnginx-mod-stream
+         libnginx-mod-stream-geoip,
+         libnginx-mod-stream-geoip2,
+         libnginx-mod-stream,

From d9b51eb2edf6d0723192cfe3115201a76ed54933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Fri, 5 Jun 2020 09:39:38 +0200
Subject: [PATCH 325/600] d/copyright: Add Thomas Ward from Ubuntu

---
 debian/copyright | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/copyright b/debian/copyright
index 6177c46..3a43c25 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,6 +41,7 @@ Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
            2011       Dmitry E. Oboukhov <unera@debian.org>
            2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
            2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
+           2019-2020, Thomas Ward <teward@ubuntu.com>
            2020,      Ondřej Nový <onovy@debian.org>
 License: BSD-2-clause
 

From cc65b80eb0bebe0e2d61c4e4b413b3bac729cf39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Fri, 5 Jun 2020 09:47:08 +0200
Subject: [PATCH 326/600] Check if port 80 is free before starting during
 install

---
 debian/control               | 3 +++
 debian/nginx-core.postinst   | 7 ++++++-
 debian/nginx-extras.postinst | 7 ++++++-
 debian/nginx-light.postinst  | 7 ++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index d1fc34b..4f00178 100644
--- a/debian/control
+++ b/debian/control
@@ -75,6 +75,7 @@ Depends: libnginx-mod-http-geoip (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
          nginx-common (= ${source:Version}),
+         iproute2,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1),
@@ -150,6 +151,7 @@ Package: nginx-light
 Architecture: any
 Depends: libnginx-mod-http-echo (= ${binary:Version}),
          nginx-common (= ${source:Version}),
+         iproute2,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
@@ -196,6 +198,7 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
          libnginx-mod-stream-geoip2 (= ${binary:Version}),
          nginx-common (= ${source:Version}),
+         iproute2,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx (<< 1.4.5-1)
diff --git a/debian/nginx-core.postinst b/debian/nginx-core.postinst
index 2a1730f..b43571a 100644
--- a/debian/nginx-core.postinst
+++ b/debian/nginx-core.postinst
@@ -24,7 +24,12 @@ if [ -x /etc/init.d/nginx ]; then
     invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
     exit $?
   else
-    invoke-rc.d nginx start || exit $?
+    if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
+      invoke-rc.d nginx start || exit $?
+    else
+      echo "Not attempting to start NGINX, port 80 is already in use."
+      exit 0
+    fi
   fi
 fi
 
diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst
index 2a1730f..b43571a 100644
--- a/debian/nginx-extras.postinst
+++ b/debian/nginx-extras.postinst
@@ -24,7 +24,12 @@ if [ -x /etc/init.d/nginx ]; then
     invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
     exit $?
   else
-    invoke-rc.d nginx start || exit $?
+    if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
+      invoke-rc.d nginx start || exit $?
+    else
+      echo "Not attempting to start NGINX, port 80 is already in use."
+      exit 0
+    fi
   fi
 fi
 
diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst
index 2a1730f..b43571a 100644
--- a/debian/nginx-light.postinst
+++ b/debian/nginx-light.postinst
@@ -24,7 +24,12 @@ if [ -x /etc/init.d/nginx ]; then
     invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
     exit $?
   else
-    invoke-rc.d nginx start || exit $?
+    if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
+      invoke-rc.d nginx start || exit $?
+    else
+      echo "Not attempting to start NGINX, port 80 is already in use."
+      exit 0
+    fi
   fi
 fi
 

From 886b03658ead117ab38d2fcfc0cd46fe526b8562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Fri, 5 Jun 2020 18:28:44 +0200
Subject: [PATCH 327/600] releasing package nginx version 1.18.0-2

---
 debian/changelog | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3eeacf1..84d1e27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+nginx (1.18.0-2) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * d/copyright:
+    - Update for upstream release
+    - Add Thomas Ward from Ubuntu for debian/*
+  * d/conf/sites-available/default: Update PHP path for PHP 7.4
+  * d/conf/nginx.conf:
+    - Enable TLSv1.3
+    - Remove tcp_nodelay on, which is same as default
+    - Remove keepalive_timeout 65 and use default value 75s.
+    - Remove trailing whitespaces
+  * Introduce nginx-core and make it new default for "nginx"
+  * Add stream-geoip and stream-geoip2 modules
+  * d/ngx-conf: Convert to Python 3
+  * d/control: Add GeoIP2 into description
+  * Build dynamic modules only in extras flavour
+  * libnginx-mod-* now depends on nginx-<any flavour>
+  * Check if port 80 is free before starting during install
+
+  [ Ondřej Surý ]
+  * http-geoip2: Add ngx_http_geoip2_module 3.3
+
+ -- Ondřej Nový <onovy@debian.org>  Fri, 05 Jun 2020 18:28:40 +0200
+
 nginx (1.18.0-1) unstable; urgency=medium
 
   [ Ondřej Nový ]

From fd2d73b10f34e0a6ebaefa106d9e5fe0b2d5b6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 11 Jun 2020 15:14:41 +0200
Subject: [PATCH 328/600] Source-only upload to allow migration.

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 84d1e27..09a6e1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.18.0-3) UNRELEASED; urgency=medium
+
+  * Source-only upload to allow migration.
+
+ -- Ondřej Nový <onovy@debian.org>  Thu, 11 Jun 2020 15:14:29 +0200
+
 nginx (1.18.0-2) unstable; urgency=medium
 
   [ Ondřej Nový ]

From f039c694b28eab9187a6f1caba4b5138724834ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Thu, 11 Jun 2020 15:15:05 +0200
Subject: [PATCH 329/600] releasing package nginx version 1.18.0-3

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09a6e1e..c2bed08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-nginx (1.18.0-3) UNRELEASED; urgency=medium
+nginx (1.18.0-3) unstable; urgency=medium
 
   * Source-only upload to allow migration.
 
- -- Ondřej Nový <onovy@debian.org>  Thu, 11 Jun 2020 15:14:29 +0200
+ -- Ondřej Nový <onovy@debian.org>  Thu, 11 Jun 2020 15:14:59 +0200
 
 nginx (1.18.0-2) unstable; urgency=medium
 

From b760bb04de1e98b65e86c9b3135897055a1c2b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Wed, 24 Jun 2020 15:19:02 +0200
Subject: [PATCH 330/600] Update ngx_http_auth_pam_module upstream URL

---
 debian/modules/control             | 2 +-
 debian/modules/watch/http-auth-pam | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index 8f9964d..94b5538 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -8,7 +8,7 @@ Homepage: https://github.com/simpl/ngx_devel_kit/
 Version: 0.3.1
 
 Module: http-auth-pam
-Homepage: https://github.com/stogh/ngx_http_auth_pam_module
+Homepage: https://github.com/sto/ngx_http_auth_pam_module
 Version: 1.5.1
 
 Module: http-echo
diff --git a/debian/modules/watch/http-auth-pam b/debian/modules/watch/http-auth-pam
index 3fb5a27..8c0a5c0 100644
--- a/debian/modules/watch/http-auth-pam
+++ b/debian/modules/watch/http-auth-pam
@@ -1,4 +1,4 @@
 version=4
 opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-auth-pam-$1.tar.gz%" \
-    https://github.com/stogh/ngx_http_auth_pam_module/tags \
+    https://github.com/sto/ngx_http_auth_pam_module/tags \
     (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-auth-pam

From 704b0f0e37c33338c95c51108715fa4451c95262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Wed, 24 Jun 2020 15:19:53 +0200
Subject: [PATCH 331/600] http-auth-pam: Upgrade to 1.5.2 (Closes: #963567)

---
 debian/modules/control                        |  2 +-
 debian/modules/http-auth-pam/ChangeLog        | 10 ++++++++-
 debian/modules/http-auth-pam/LICENSE          |  2 +-
 debian/modules/http-auth-pam/README.md        | 10 ++++-----
 debian/modules/http-auth-pam/VERSION          |  2 +-
 .../http-auth-pam/ngx_http_auth_pam_module.c  | 21 +++++++++++++------
 6 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index 94b5538..e980b2f 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -9,7 +9,7 @@ Version: 0.3.1
 
 Module: http-auth-pam
 Homepage: https://github.com/sto/ngx_http_auth_pam_module
-Version: 1.5.1
+Version: 1.5.2
 
 Module: http-echo
 Homepage: https://github.com/agentzh/echo-nginx-module
diff --git a/debian/modules/http-auth-pam/ChangeLog b/debian/modules/http-auth-pam/ChangeLog
index d45eae4..084c99a 100644
--- a/debian/modules/http-auth-pam/ChangeLog
+++ b/debian/modules/http-auth-pam/ChangeLog
@@ -1,6 +1,14 @@
+2020-06-23  sto@mixinet.net
+
+	* Version 1.5.2.
+	* Log authentication errors as errors instead of debug (patch provided by
+	  Juha Koho, see https://github.com/sto/ngx_http_auth_pam_module/pull/11)
+	* Send client IP address to PAM (patch provided by Marcin Łojewski, see
+	  https://github.com/sto/ngx_http_auth_pam_module/pull/14)
+
 2016-04-06  sto@iti.es
 
-    * Version 1.5.1.
+	* Version 1.5.1.
 	* Fix building alongside other modules in nginx 1.9.11+ (patch provided by
 	  Graham Edgecombe <grahamedgecombe@gmail.com>)
 
diff --git a/debian/modules/http-auth-pam/LICENSE b/debian/modules/http-auth-pam/LICENSE
index b2d9324..a9d6313 100644
--- a/debian/modules/http-auth-pam/LICENSE
+++ b/debian/modules/http-auth-pam/LICENSE
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2008-2016 Sergio Talens Oliag
+ * Copyright (C) 2008-2020 Sergio Talens Oliag
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/debian/modules/http-auth-pam/README.md b/debian/modules/http-auth-pam/README.md
index a4eea45..975bafe 100644
--- a/debian/modules/http-auth-pam/README.md
+++ b/debian/modules/http-auth-pam/README.md
@@ -75,11 +75,11 @@ If you want use the ``pam_exec.so`` plugin for request based authentication the
 module can add to the PAM environment the ``HOST`` and ``REQUEST`` variables if
 you set the ``auth_pam_set_pam_env`` flag::
 
-  location /pam_exec_protected {
-    auth_pam              "Exec Zone";
-    auth_pam_service_name "nginx_exec";
-    auth_pam_set_pam_env  on;
-  }
+	location /pam_exec_protected {
+	  auth_pam              "Exec Zone";
+	  auth_pam_service_name "nginx_exec";
+	  auth_pam_set_pam_env  on;
+	}
 
 With this configuration if you access an URL like:
 
diff --git a/debian/modules/http-auth-pam/VERSION b/debian/modules/http-auth-pam/VERSION
index c239c60..4cda8f1 100644
--- a/debian/modules/http-auth-pam/VERSION
+++ b/debian/modules/http-auth-pam/VERSION
@@ -1 +1 @@
-1.5
+1.5.2
diff --git a/debian/modules/http-auth-pam/ngx_http_auth_pam_module.c b/debian/modules/http-auth-pam/ngx_http_auth_pam_module.c
index 167a37f..55eeb92 100644
--- a/debian/modules/http-auth-pam/ngx_http_auth_pam_module.c
+++ b/debian/modules/http-auth-pam/ngx_http_auth_pam_module.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2016 Sergio Talens-Oliag <sto@iti.es>
+ * Copyright (C) 2008-2020 Sergio Talens-Oliag <sto@mixinet.net>
  *
  * Based on nginx's 'ngx_http_auth_basic_module.c' by Igor Sysoev and apache's
  * 'mod_auth_pam.c' by Ingo Luetkebolhe.
@@ -182,7 +182,7 @@ ngx_auth_pam_talker(int num_msg, const struct pam_message ** msg,
         case PAM_PROMPT_ECHO_OFF:
             response[i].resp = strdup((const char *)ainfo->password.data);
             break;
-	case PAM_ERROR_MSG:
+        case PAM_ERROR_MSG:
             ngx_log_error(NGX_LOG_ERR, ainfo->log, 0,
                           "PAM: \'%s\'.", msg[i]->msg);
             break;
@@ -335,12 +335,21 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
                         (const char *) ainfo.username.data,
                         &conv_info,
                         &pamh)) != PAM_SUCCESS) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+        ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
                       "PAM: Could not start pam service: %s",
                       pam_strerror(pamh, rc));
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
+    /* send client IP address to PAM */
+    char *client_ip_addr = ngx_strncpy_s(r->connection->addr_text, r->pool);
+    if ((rc = pam_set_item(pamh, PAM_RHOST, client_ip_addr)) != PAM_SUCCESS) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                      "PAM: Could not set item PAM_RHOST: %s",
+                      pam_strerror(pamh, rc));
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+
     if (alcf->set_pam_env) {
         add_request_info_to_pam_env(pamh, r);
     }
@@ -348,7 +357,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
     /* try to authenticate user, log error on failure */
     if ((rc = pam_authenticate(pamh,
                                PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "PAM: user '%s' - not authenticated: %s",
                       ainfo.username.data, pam_strerror(pamh, rc));
         pam_end(pamh, PAM_SUCCESS);
@@ -357,8 +366,8 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
 
     /* check that the account is healthy */
     if ((rc = pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                      "PAM: user '%s'  - invalid account: %s",
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "PAM: user '%s' - invalid account: %s",
                       ainfo.username.data, pam_strerror(pamh, rc));
         pam_end(pamh, PAM_SUCCESS);
         return ngx_http_auth_pam_set_realm(r, &alcf->realm);

From d08f16833f7bb9d8e3cc40225eb09c9fbacd2994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Wed, 24 Jun 2020 15:21:16 +0200
Subject: [PATCH 332/600] d/copyright: Bump year of http-auth-pam

---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 3a43c25..c2a5f97 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -69,7 +69,7 @@ Copyright: Austin Appleby
 License: BSD-3-clause
 
 Files: debian/modules/http-auth-pam/*
-Copyright: 2008-2016, Sergio Talens Oliag
+Copyright: 2008-2020, Sergio Talens Oliag
 License: BSD-2-clause
 
 Files: debian/modules/http-echo/*

From 7df3da6863e378b949868c9289755e8d8690351f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 30 Jun 2020 18:27:15 +0200
Subject: [PATCH 333/600] Revert: libnginx-mod-* now depends on nginx-<any
 flavour> (Closes: 963860).

* Revert: libnginx-mod-* now depends on nginx-<any flavour> (Closes: 963860).
* libnginx-mod-* recommends nginx now.
---
 debian/changelog |  7 +++++++
 debian/control   | 44 ++++++++++++++++++++++----------------------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2bed08..fe36eea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.18.0-4) UNRELEASED; urgency=medium
+
+  * Revert: libnginx-mod-* now depends on nginx-<any flavour> (Closes: #963860)
+  * libnginx-mod-* recommends nginx now.
+
+ -- Ondřej Nový <onovy@debian.org>  Tue, 30 Jun 2020 18:26:36 +0200
+
 nginx (1.18.0-3) unstable; urgency=medium
 
   * Source-only upload to allow migration.
diff --git a/debian/control b/debian/control
index 4f00178..fe24d3e 100644
--- a/debian/control
+++ b/debian/control
@@ -234,7 +234,7 @@ Description: nginx web/proxy server (extended version)
 Package: libnginx-mod-http-geoip
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: GeoIP HTTP module for Nginx
  The ngx_http_geoip module creates variables with values depending on the
  client IP address, using the precompiled MaxMind databases.
@@ -245,7 +245,7 @@ Description: GeoIP HTTP module for Nginx
 Package: libnginx-mod-http-geoip2
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: GeoIP2 HTTP module for Nginx
  The ngx_http_geoip2 module creates variables with values depending on the
  client IP address, using the precompiled MaxMind GeoIP2 databases.
@@ -256,7 +256,7 @@ Description: GeoIP2 HTTP module for Nginx
 Package: libnginx-mod-http-image-filter
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: HTTP image filter module for Nginx
  The ngx_http_image_filter module is a filter that transforms images in JPEG,
  GIF, and PNG formats.
@@ -267,7 +267,7 @@ Description: HTTP image filter module for Nginx
 Package: libnginx-mod-http-xslt-filter
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: XSLT Transformation module for Nginx
  The ngx_http_xslt_filter module is a filter that transforms XML responses
  using one or more XSLT stylesheets.
@@ -278,7 +278,7 @@ Description: XSLT Transformation module for Nginx
 Package: libnginx-mod-mail
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Mail module for Nginx
  The nginx_mail module adds mail proxy support to nginx.
  .
@@ -288,7 +288,7 @@ Description: Mail module for Nginx
 Package: libnginx-mod-stream
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Stream module for Nginx
  The nginx_stream module adds stream proxy support to nginx.
  .
@@ -300,7 +300,7 @@ Package: libnginx-mod-stream-geoip
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
  libnginx-mod-stream (= ${binary:Version}),
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: GeoIP Stream module for Nginx
  The ngx_stream_geoip module creates variables with values depending on the
  client IP address, using the precompiled MaxMind databases.
@@ -312,7 +312,7 @@ Package: libnginx-mod-stream-geoip2
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
  libnginx-mod-stream (= ${binary:Version}),
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: GeoIP2 Stream module for Nginx
  The ngx_stream_geoip2 module creates variables with values depending on the
  client IP address, using the precompiled MaxMind GeoIP2 databases.
@@ -323,7 +323,7 @@ Description: GeoIP2 Stream module for Nginx
 Package: libnginx-mod-http-perl
 Architecture: any
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Replaces: nginx-extras (<< 1.9.14-1)
 Description: Perl module for Nginx
  Embed Perl runtime into nginx.
@@ -336,7 +336,7 @@ Description: Perl module for Nginx
 Package: libnginx-mod-http-auth-pam
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: PAM authentication module for Nginx
  The nginx_http_auth_pam module enables authentication using PAM.
  .
@@ -348,7 +348,7 @@ Architecture: any
 Depends: libnginx-mod-http-ndk (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
-         nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Lua module for Nginx
  Embed Lua runtime into nginx.
  .
@@ -360,7 +360,7 @@ Description: Lua module for Nginx
 Package: libnginx-mod-http-ndk
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Nginx Development Kit module
  The NDK is an Nginx module that is designed to extend the core functionality of
  the excellent Nginx webserver in a way that can be used as a basis of other
@@ -374,7 +374,7 @@ Description: Nginx Development Kit module
 Package: libnginx-mod-nchan
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Fast, flexible pub/sub server for Nginx
  Nchan is a scalable, flexible pub/sub server for the modern web, It can be
  configured as a standalone server, or as a shim between your application and
@@ -388,7 +388,7 @@ Description: Fast, flexible pub/sub server for Nginx
 Package: libnginx-mod-http-echo
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Bring echo and more shell style goodies to Nginx
  Echo module wraps lots of Nginx internal APIs for streaming input and output,
  parallel/sequential subrequests, timers and sleeping, as well as various meta
@@ -410,7 +410,7 @@ Description: Bring echo and more shell style goodies to Nginx
 Package: libnginx-mod-http-upstream-fair
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Nginx Upstream Fair Proxy Load Balancer
  The Nginx fair proxy balancer enhances the standard round-robin load balancer
  provided with Nginx so that it tracks busy backend servers and adjusts
@@ -419,7 +419,7 @@ Description: Nginx Upstream Fair Proxy Load Balancer
 Package: libnginx-mod-http-headers-more-filter
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Set and clear input and output headers for Nginx
  The Headers More module allows you to add, set, or clear any output or input
  header that you specify.
@@ -431,7 +431,7 @@ Description: Set and clear input and output headers for Nginx
 Package: libnginx-mod-http-cache-purge
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Purge content from Nginx caches
  Cache Purge module adds purging capabilities to Nginx. It allows purging
  content from caches used by all of Nginx proxy modules, like FastCGI, Proxy,
@@ -440,7 +440,7 @@ Description: Purge content from Nginx caches
 Package: libnginx-mod-http-fancyindex
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Suggests: nginx,
 Description: Fancy indexes module for the Nginx
  The Fancy Index module makes possible the generation of file listings, like
  the built-in autoindex module does, but adding a touch of style by introducing
@@ -449,7 +449,7 @@ Description: Fancy indexes module for the Nginx
 Package: libnginx-mod-http-uploadprogress
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Upload progress system for Nginx
  Upload progress module is an implementation of an upload progress system, that
  monitors RFC1867 POST uploads as they are transmitted to upstream servers.
@@ -461,7 +461,7 @@ Description: Upload progress system for Nginx
 Package: libnginx-mod-http-subs-filter
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: Substitution filter module for Nginx
  Subsitution Nginx module can do both regular expression and fixed string
  substitutions on response bodies. The module is quite different from Nginx's
@@ -471,7 +471,7 @@ Description: Substitution filter module for Nginx
 Package: libnginx-mod-http-dav-ext
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: WebDAV missing commands support for Nginx
  WebDAV Ext module complements the Nginx WebDAV module to provide a full
  WebDAV support.
@@ -481,7 +481,7 @@ Description: WebDAV missing commands support for Nginx
 Package: libnginx-mod-rtmp
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
- nginx-core (= ${binary:Version}) | nginx-full (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version}),
+Recommends: nginx,
 Description: RTMP support for Nginx
  The nginx RTMP module is a fully-featured streaming solution implemented in
  nginx.

From bfdc885afc36da25bf5f5df8db8cebc75eddd63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Fri, 3 Jul 2020 09:34:57 +0200
Subject: [PATCH 334/600] releasing package nginx version 1.18.0-4

---
 debian/changelog | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe36eea..f28e340 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-nginx (1.18.0-4) UNRELEASED; urgency=medium
+nginx (1.18.0-4) unstable; urgency=medium
 
-  * Revert: libnginx-mod-* now depends on nginx-<any flavour> (Closes: #963860)
+  * Revert: libnginx-mod-* now depends on nginx-<any flavour> (Closes: #963860).
+  * Update ngx_http_auth_pam_module upstream URL.
   * libnginx-mod-* recommends nginx now.
+  * http-auth-pam: Upgrade to 1.5.2 (Closes: #963567).
+  * d/copyright: Bump year of http-auth-pam.
 
- -- Ondřej Nový <onovy@debian.org>  Tue, 30 Jun 2020 18:26:36 +0200
+ -- Ondřej Nový <onovy@debian.org>  Fri, 03 Jul 2020 09:34:49 +0200
 
 nginx (1.18.0-3) unstable; urgency=medium
 

From aa1f93ee247cd7d21473f35bcba4a95cdfb388ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 14 Jul 2020 09:53:45 +0200
Subject: [PATCH 335/600] Prevented request smuggling in LUA CVE-2020-11724
 Closes: #964950

---
 debian/changelog                              |   8 +
 .../patches/http-lua/CVE-2020-11724.patch     | 856 ++++++++++++++++++
 debian/modules/patches/http-lua/series        |   1 +
 3 files changed, 865 insertions(+)
 create mode 100644 debian/modules/patches/http-lua/CVE-2020-11724.patch

diff --git a/debian/changelog b/debian/changelog
index f28e340..ddd6387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.18.0-5) UNRELEASED; urgency=medium
+
+  * Prevented request smuggling in LUA
+    CVE-2020-11724
+    Closes: #964950
+
+ -- Ondřej Nový <onovy@debian.org>  Tue, 14 Jul 2020 09:51:13 +0200
+
 nginx (1.18.0-4) unstable; urgency=medium
 
   * Revert: libnginx-mod-* now depends on nginx-<any flavour> (Closes: #963860).
diff --git a/debian/modules/patches/http-lua/CVE-2020-11724.patch b/debian/modules/patches/http-lua/CVE-2020-11724.patch
new file mode 100644
index 0000000..5e0eff7
--- /dev/null
+++ b/debian/modules/patches/http-lua/CVE-2020-11724.patch
@@ -0,0 +1,856 @@
+From 9ab38e8ee35fc08a57636b1b6190dca70b0076fa Mon Sep 17 00:00:00 2001
+From: Thibault Charbonnier <thibaultcha@me.com>
+Date: Mon, 23 Mar 2020 19:40:47 -0700
+Origin: https://github.com/openresty/lua-nginx-module/commit/9ab38e8ee35fc08a57636b1b6190dca70b0076fa
+Subject: [PATCH] bugfix: prevented request smuggling in the
+ ngx.location.capture API.
+
+Signed-off-by: Yichun Zhang (agentzh) <yichun@openresty.com>
+---
+ src/ngx_http_lua_subrequest.c | 196 +++++--------
+ t/020-subrequest.t            | 520 +++++++++++++++++++++++++++++++++-
+ 2 files changed, 585 insertions(+), 131 deletions(-)
+
+Index: http-lua/src/ngx_http_lua_subrequest.c
+===================================================================
+--- http-lua.orig/src/ngx_http_lua_subrequest.c	2020-07-14 09:50:35.830928117 +0200
++++ http-lua/src/ngx_http_lua_subrequest.c	2020-07-14 09:50:35.826928232 +0200
+@@ -56,8 +56,6 @@
+     ngx_string("Content-Length");
+ 
+ 
+-static ngx_int_t ngx_http_lua_set_content_length_header(ngx_http_request_t *r,
+-    off_t len);
+ static ngx_int_t ngx_http_lua_adjust_subrequest(ngx_http_request_t *sr,
+     ngx_uint_t method, int forward_body,
+     ngx_http_request_body_t *body, unsigned vars_action,
+@@ -78,7 +76,7 @@
+ static ngx_int_t ngx_http_post_request_to_head(ngx_http_request_t *r);
+ static ngx_int_t ngx_http_lua_copy_in_file_request_body(ngx_http_request_t *r);
+ static ngx_int_t ngx_http_lua_copy_request_headers(ngx_http_request_t *sr,
+-    ngx_http_request_t *r);
++    ngx_http_request_t *pr, int pr_not_chunked);
+ 
+ 
+ /* ngx.location.capture is just a thin wrapper around
+@@ -628,8 +626,8 @@
+     unsigned vars_action, ngx_array_t *extra_vars)
+ {
+     ngx_http_request_t          *r;
+-    ngx_int_t                    rc;
+     ngx_http_core_main_conf_t   *cmcf;
++    int                          pr_not_chunked = 0;
+     size_t                       size;
+ 
+     r = sr->parent;
+@@ -639,46 +637,32 @@
+     if (body) {
+         sr->request_body = body;
+ 
+-        rc = ngx_http_lua_set_content_length_header(sr,
+-                                                    body->buf
+-                                                    ? ngx_buf_size(body->buf)
+-                                                    : 0);
+-
+-        if (rc != NGX_OK) {
+-            return NGX_ERROR;
+-        }
+-
+     } else if (!always_forward_body
+                && method != NGX_HTTP_PUT
+                && method != NGX_HTTP_POST
+                && r->headers_in.content_length_n > 0)
+     {
+-        rc = ngx_http_lua_set_content_length_header(sr, 0);
+-        if (rc != NGX_OK) {
+-            return NGX_ERROR;
+-        }
+-
+-#if 1
+         sr->request_body = NULL;
+-#endif
+ 
+     } else {
+-        if (ngx_http_lua_copy_request_headers(sr, r) != NGX_OK) {
+-            return NGX_ERROR;
++        if (!r->headers_in.chunked) {
++            pr_not_chunked = 1;
+         }
+ 
+-        if (sr->request_body) {
++        if (sr->request_body && sr->request_body->temp_file) {
+ 
+             /* deep-copy the request body */
+ 
+-            if (sr->request_body->temp_file) {
+-                if (ngx_http_lua_copy_in_file_request_body(sr) != NGX_OK) {
+-                    return NGX_ERROR;
+-                }
++            if (ngx_http_lua_copy_in_file_request_body(sr) != NGX_OK) {
++                return NGX_ERROR;
+             }
+         }
+     }
+ 
++    if (ngx_http_lua_copy_request_headers(sr, r, pr_not_chunked) != NGX_OK) {
++        return NGX_ERROR;
++    }
++
+     sr->method = method;
+ 
+     switch (method) {
+@@ -1124,100 +1108,6 @@
+ }
+ 
+ 
+-static ngx_int_t
+-ngx_http_lua_set_content_length_header(ngx_http_request_t *r, off_t len)
+-{
+-    ngx_table_elt_t                 *h, *header;
+-    u_char                          *p;
+-    ngx_list_part_t                 *part;
+-    ngx_http_request_t              *pr;
+-    ngx_uint_t                       i;
+-
+-    r->headers_in.content_length_n = len;
+-
+-    if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
+-                      sizeof(ngx_table_elt_t)) != NGX_OK)
+-    {
+-        return NGX_ERROR;
+-    }
+-
+-    h = ngx_list_push(&r->headers_in.headers);
+-    if (h == NULL) {
+-        return NGX_ERROR;
+-    }
+-
+-    h->key = ngx_http_lua_content_length_header_key;
+-    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
+-    if (h->lowcase_key == NULL) {
+-        return NGX_ERROR;
+-    }
+-
+-    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
+-
+-    r->headers_in.content_length = h;
+-
+-    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+-    if (p == NULL) {
+-        return NGX_ERROR;
+-    }
+-
+-    h->value.data = p;
+-
+-    h->value.len = ngx_sprintf(h->value.data, "%O", len) - h->value.data;
+-
+-    h->hash = ngx_http_lua_content_length_hash;
+-
+-#if 0
+-    dd("content length hash: %lu == %lu", (unsigned long) h->hash,
+-       ngx_hash_key_lc((u_char *) "Content-Length",
+-                       sizeof("Content-Length") - 1));
+-#endif
+-
+-    dd("r content length: %.*s",
+-       (int) r->headers_in.content_length->value.len,
+-       r->headers_in.content_length->value.data);
+-
+-    pr = r->parent;
+-
+-    if (pr == NULL) {
+-        return NGX_OK;
+-    }
+-
+-    /* forward the parent request's all other request headers */
+-
+-    part = &pr->headers_in.headers.part;
+-    header = part->elts;
+-
+-    for (i = 0; /* void */; i++) {
+-
+-        if (i >= part->nelts) {
+-            if (part->next == NULL) {
+-                break;
+-            }
+-
+-            part = part->next;
+-            header = part->elts;
+-            i = 0;
+-        }
+-
+-        if (header[i].key.len == sizeof("Content-Length") - 1
+-            && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length",
+-                               sizeof("Content-Length") - 1) == 0)
+-        {
+-            continue;
+-        }
+-
+-        if (ngx_http_lua_set_input_header(r, header[i].key,
+-                                          header[i].value, 0) == NGX_ERROR)
+-        {
+-            return NGX_ERROR;
+-        }
+-    }
+-
+-    return NGX_OK;
+-}
+-
+-
+ static void
+ ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
+     ngx_http_lua_ctx_t *ctx)
+@@ -1732,11 +1622,17 @@
+ 
+ 
+ static ngx_int_t
+-ngx_http_lua_copy_request_headers(ngx_http_request_t *sr, ngx_http_request_t *r)
++ngx_http_lua_copy_request_headers(ngx_http_request_t *sr,
++    ngx_http_request_t *pr, int pr_not_chunked)
+ {
+-    ngx_table_elt_t                 *header;
++    ngx_table_elt_t                 *clh, *header;
+     ngx_list_part_t                 *part;
+     ngx_uint_t                       i;
++    u_char                          *p;
++    off_t                            len;
++
++    dd("before: parent req headers count: %d",
++       (int) pr->headers_in.headers.part.nelts);
+ 
+     if (ngx_list_init(&sr->headers_in.headers, sr->pool, 20,
+                       sizeof(ngx_table_elt_t)) != NGX_OK)
+@@ -1744,10 +1640,46 @@
+         return NGX_ERROR;
+     }
+ 
+-    dd("before: parent req headers count: %d",
+-       (int) r->headers_in.headers.part.nelts);
++    if (sr->request_body && !pr_not_chunked) {
++
++        /* craft our own Content-Length */
++
++        len = sr->request_body->buf ? ngx_buf_size(sr->request_body->buf) : 0;
++
++        clh = ngx_list_push(&sr->headers_in.headers);
++        if (clh == NULL) {
++            return NGX_ERROR;
++        }
+ 
+-    part = &r->headers_in.headers.part;
++        clh->hash = ngx_http_lua_content_length_hash;
++        clh->key = ngx_http_lua_content_length_header_key;
++        clh->lowcase_key = ngx_pnalloc(sr->pool, clh->key.len);
++        if (clh->lowcase_key == NULL) {
++            return NGX_ERROR;
++        }
++
++        ngx_strlow(clh->lowcase_key, clh->key.data, clh->key.len);
++
++        p = ngx_palloc(sr->pool, NGX_OFF_T_LEN);
++        if (p == NULL) {
++            return NGX_ERROR;
++        }
++
++        clh->value.data = p;
++        clh->value.len = ngx_sprintf(clh->value.data, "%O", len)
++                         - clh->value.data;
++
++        sr->headers_in.content_length = clh;
++        sr->headers_in.content_length_n = len;
++
++        dd("sr crafted content-length: %.*s",
++           (int) sr->headers_in.content_length->value.len,
++           sr->headers_in.content_length->value.data);
++    }
++
++    /* copy the parent request's headers */
++
++    part = &pr->headers_in.headers.part;
+     header = part->elts;
+ 
+     for (i = 0; /* void */; i++) {
+@@ -1762,7 +1694,14 @@
+             i = 0;
+         }
+ 
+-        dd("setting request header %.*s: %.*s", (int) header[i].key.len,
++        if (!pr_not_chunked && header[i].key.len == sizeof("Content-Length") - 1
++            && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length",
++                               sizeof("Content-Length") - 1) == 0)
++        {
++            continue;
++        }
++
++        dd("sr copied req header %.*s: %.*s", (int) header[i].key.len,
+            header[i].key.data, (int) header[i].value.len,
+            header[i].value.data);
+ 
+@@ -1774,9 +1713,10 @@
+     }
+ 
+     dd("after: parent req headers count: %d",
+-       (int) r->headers_in.headers.part.nelts);
++       (int) pr->headers_in.headers.part.nelts);
+ 
+     return NGX_OK;
+ }
+ 
++
+ /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
+Index: http-lua/t/020-subrequest.t
+===================================================================
+--- http-lua.orig/t/020-subrequest.t	2020-07-14 09:50:35.830928117 +0200
++++ http-lua/t/020-subrequest.t	2020-07-14 09:50:35.826928232 +0200
+@@ -14,6 +14,7 @@
+ plan tests => repeat_each() * (blocks() * 3 + 23);
+ 
+ $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
++$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+ 
+ #no_diff();
+ no_long_string();
+@@ -210,7 +211,7 @@
+ 
+ 
+ 
+-=== TEST 8: PUT (nobody, proxy method)
++=== TEST 8: PUT (with body, proxy method)
+ --- config
+     location /other {
+         default_type 'foo/bar';
+@@ -242,7 +243,7 @@
+ 
+ 
+ 
+-=== TEST 9: PUT (nobody, no proxy method)
++=== TEST 9: PUT (with body, no proxy method)
+ --- config
+     location /other {
+         default_type 'foo/bar';
+@@ -271,7 +272,7 @@
+ 
+ 
+ 
+-=== TEST 10: PUT (nobody, no proxy method)
++=== TEST 10: PUT (no body, no proxy method)
+ --- config
+     location /other {
+         default_type 'foo/bar';
+@@ -2877,3 +2878,516 @@
+ --- no_error_log
+ [error]
+ --- error_code: 200
++
++
++
++=== TEST 77: avoid request smuggling 1/4 (default capture + smuggle in header)
++--- http_config
++    upstream backend {
++        server unix:$TEST_NGINX_HTML_DIR/nginx.sock;
++        keepalive 32;
++    }
++
++    server {
++        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
++
++        location / {
++            content_by_lua_block {
++                ngx.say("method: ", ngx.var.request_method,
++                        ", uri: ", ngx.var.uri,
++                        ", X: ", ngx.var.http_x)
++            }
++        }
++    }
++--- config
++    location /proxy {
++        proxy_http_version 1.1;
++        proxy_set_header   Connection "";
++        proxy_pass         http://backend/foo;
++    }
++
++    location /capture {
++        server_tokens off;
++        more_clear_headers Date;
++
++        content_by_lua_block {
++            local res = ngx.location.capture("/proxy")
++            ngx.print(res.body)
++        }
++    }
++
++    location /t {
++        content_by_lua_block {
++            local req = [[
++GET /capture HTTP/1.1
++Host: test.com
++Content-Length: 37
++Transfer-Encoding: chunked
++
++0
++
++GET /capture HTTP/1.1
++Host: test.com
++X: GET /bar HTTP/1.0
++
++]]
++
++            local sock = ngx.socket.tcp()
++            sock:settimeout(1000)
++
++            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_PORT)
++            if not ok then
++                ngx.say("failed to connect: ", err)
++                return
++            end
++
++            local bytes, err = sock:send(req)
++            if not bytes then
++                ngx.say("failed to send req: ", err)
++                return
++            end
++
++            ngx.say("req bytes: ", bytes)
++
++            local n_resp = 0
++
++            local reader = sock:receiveuntil("\r\n")
++            while true do
++                local line, err = reader()
++                if line then
++                    ngx.say(line)
++                    if line == "0" then
++                        n_resp = n_resp + 1
++                    end
++
++                    if n_resp >= 2 then
++                        break
++                    end
++
++                else
++                    ngx.say("err: ", err)
++                    break
++                end
++            end
++
++            sock:close()
++        }
++    }
++--- request
++GET /t
++--- response_body
++req bytes: 146
++HTTP/1.1 200 OK
++Server: nginx
++Content-Type: text/plain
++Transfer-Encoding: chunked
++Connection: keep-alive
++
++1f
++method: GET, uri: /foo, X: nil
++
++0
++
++HTTP/1.1 200 OK
++Server: nginx
++Content-Type: text/plain
++Transfer-Encoding: chunked
++Connection: keep-alive
++
++2d
++method: GET, uri: /foo, X: GET /bar HTTP/1.0
++
++0
++--- no_error_log
++[error]
++
++
++
++=== TEST 78: avoid request smuggling 2/4 (POST capture + smuggle in body)
++--- http_config
++    upstream backend {
++        server unix:$TEST_NGINX_HTML_DIR/nginx.sock;
++        keepalive 32;
++    }
++
++    server {
++        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
++
++        location / {
++            content_by_lua_block {
++                ngx.say("method: ", ngx.var.request_method,
++                        ", uri: ", ngx.var.uri)
++            }
++        }
++    }
++--- config
++    location /proxy {
++        proxy_http_version 1.1;
++        proxy_set_header   Connection "";
++        proxy_pass         http://backend/foo;
++    }
++
++    location /capture {
++        server_tokens off;
++        more_clear_headers Date;
++
++        content_by_lua_block {
++            ngx.req.read_body()
++            local res = ngx.location.capture("/proxy", { method = ngx.HTTP_POST })
++            ngx.print(res.body)
++        }
++    }
++
++    location /t {
++        content_by_lua_block {
++            local req = [[
++GET /capture HTTP/1.1
++Host: test.com
++Content-Length: 57
++Transfer-Encoding: chunked
++
++0
++
++POST /capture HTTP/1.1
++Host: test.com
++Content-Length: 60
++
++POST /bar HTTP/1.1
++Host: test.com
++Content-Length: 5
++
++hello
++
++]]
++
++            local sock = ngx.socket.tcp()
++            sock:settimeout(1000)
++
++            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_PORT)
++            if not ok then
++                ngx.say("failed to connect: ", err)
++                return
++            end
++
++            local bytes, err = sock:send(req)
++            if not bytes then
++                ngx.say("failed to send req: ", err)
++                return
++            end
++
++            ngx.say("req bytes: ", bytes)
++
++            local n_resp = 0
++
++            local reader = sock:receiveuntil("\r\n")
++            while true do
++                local line, err = reader()
++                if line then
++                    ngx.say(line)
++                    if line == "0" then
++                        n_resp = n_resp + 1
++                    end
++
++                    if n_resp >= 2 then
++                        break
++                    end
++
++                else
++                    ngx.say("err: ", err)
++                    break
++                end
++            end
++
++            sock:close()
++        }
++    }
++--- request
++GET /t
++--- response_body
++req bytes: 205
++HTTP/1.1 200 OK
++Server: nginx
++Content-Type: text/plain
++Transfer-Encoding: chunked
++Connection: keep-alive
++
++18
++method: POST, uri: /foo
++
++0
++
++HTTP/1.1 200 OK
++Server: nginx
++Content-Type: text/plain
++Transfer-Encoding: chunked
++Connection: keep-alive
++
++18
++method: POST, uri: /foo
++
++0
++--- no_error_log
++[error]
++
++
++
++=== TEST 79: avoid request smuggling 3/4 (POST capture w/ always_forward_body + smuggle in body)
++--- http_config
++    upstream backend {
++        server unix:$TEST_NGINX_HTML_DIR/nginx.sock;
++        keepalive 32;
++    }
++
++    server {
++        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
++
++        location / {
++            content_by_lua_block {
++                ngx.say("method: ", ngx.var.request_method,
++                        ", uri: ", ngx.var.uri)
++            }
++        }
++    }
++--- config
++    location /proxy {
++        proxy_http_version 1.1;
++        proxy_set_header   Connection "";
++        proxy_pass         http://backend/foo;
++    }
++
++    location /capture {
++        server_tokens off;
++        more_clear_headers Date;
++
++        content_by_lua_block {
++            ngx.req.read_body()
++            local res = ngx.location.capture("/proxy", {
++                method = ngx.HTTP_POST,
++                always_forward_body = true
++            })
++            ngx.print(res.body)
++        }
++    }
++
++    location /t {
++        content_by_lua_block {
++            local req = [[
++GET /capture HTTP/1.1
++Host: test.com
++Content-Length: 57
++Transfer-Encoding: chunked
++
++0
++
++POST /capture HTTP/1.1
++Host: test.com
++Content-Length: 60
++
++POST /bar HTTP/1.1
++Host: test.com
++Content-Length: 5
++
++hello
++
++]]
++
++            local sock = ngx.socket.tcp()
++            sock:settimeout(1000)
++
++            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_PORT)
++            if not ok then
++                ngx.say("failed to connect: ", err)
++                return
++            end
++
++            local bytes, err = sock:send(req)
++            if not bytes then
++                ngx.say("failed to send req: ", err)
++                return
++            end
++
++            ngx.say("req bytes: ", bytes)
++
++            local n_resp = 0
++
++            local reader = sock:receiveuntil("\r\n")
++            while true do
++                local line, err = reader()
++                if line then
++                    ngx.say(line)
++                    if line == "0" then
++                        n_resp = n_resp + 1
++                    end
++
++                    if n_resp >= 2 then
++                        break
++                    end
++
++                else
++                    ngx.say("err: ", err)
++                    break
++                end
++            end
++
++            sock:close()
++        }
++    }
++--- request
++GET /t
++--- response_body
++req bytes: 205
++HTTP/1.1 200 OK
++Server: nginx
++Content-Type: text/plain
++Transfer-Encoding: chunked
++Connection: keep-alive
++
++18
++method: POST, uri: /foo
++
++0
++
++HTTP/1.1 200 OK
++Server: nginx
++Content-Type: text/plain
++Transfer-Encoding: chunked
++Connection: keep-alive
++
++18
++method: POST, uri: /foo
++
++0
++--- no_error_log
++[error]
++
++
++
++=== TEST 80: avoid request smuggling 4/4 (POST capture w/ body + smuggle in body)
++--- http_config
++    upstream backend {
++        server unix:$TEST_NGINX_HTML_DIR/nginx.sock;
++        keepalive 32;
++    }
++
++    server {
++        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
++
++        location / {
++            content_by_lua_block {
++                ngx.say("method: ", ngx.var.request_method,
++                        ", uri: ", ngx.var.uri)
++            }
++        }
++    }
++--- config
++    location /proxy {
++        proxy_http_version 1.1;
++        proxy_set_header   Connection "";
++        proxy_pass         http://backend/foo;
++    }
++
++    location /capture {
++        server_tokens off;
++        more_clear_headers Date;
++
++        content_by_lua_block {
++            ngx.req.read_body()
++            local res = ngx.location.capture("/proxy", {
++                method = ngx.HTTP_POST,
++                always_forward_body = true,
++                body = ngx.req.get_body_data()
++            })
++            ngx.print(res.body)
++        }
++    }
++
++    location /t {
++        content_by_lua_block {
++            local req = [[
++GET /capture HTTP/1.1
++Host: test.com
++Content-Length: 57
++Transfer-Encoding: chunked
++
++0
++
++POST /capture HTTP/1.1
++Host: test.com
++Content-Length: 60
++
++POST /bar HTTP/1.1
++Host: test.com
++Content-Length: 5
++
++hello
++
++]]
++
++            local sock = ngx.socket.tcp()
++            sock:settimeout(1000)
++
++            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_PORT)
++            if not ok then
++                ngx.say("failed to connect: ", err)
++                return
++            end
++
++            local bytes, err = sock:send(req)
++            if not bytes then
++                ngx.say("failed to send req: ", err)
++                return
++            end
++
++            ngx.say("req bytes: ", bytes)
++
++            local n_resp = 0
++
++            local reader = sock:receiveuntil("\r\n")
++            while true do
++                local line, err = reader()
++                if line then
++                    ngx.say(line)
++                    if line == "0" then
++                        n_resp = n_resp + 1
++                    end
++
++                    if n_resp >= 2 then
++                        break
++                    end
++
++                else
++                    ngx.say("err: ", err)
++                    break
++                end
++            end
++
++            sock:close()
++        }
++    }
++--- request
++GET /t
++--- response_body
++req bytes: 205
++HTTP/1.1 200 OK
++Server: nginx
++Content-Type: text/plain
++Transfer-Encoding: chunked
++Connection: keep-alive
++
++18
++method: POST, uri: /foo
++
++0
++
++HTTP/1.1 200 OK
++Server: nginx
++Content-Type: text/plain
++Transfer-Encoding: chunked
++Connection: keep-alive
++
++18
++method: POST, uri: /foo
++
++0
++--- no_error_log
++[error]
diff --git a/debian/modules/patches/http-lua/series b/debian/modules/patches/http-lua/series
index 6a8b245..1c68a88 100644
--- a/debian/modules/patches/http-lua/series
+++ b/debian/modules/patches/http-lua/series
@@ -1 +1,2 @@
 discover-luajit-2.1.patch
+CVE-2020-11724.patch

From 0c7efeffcd8c4c21208891e19c252da2274b405d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 14 Jul 2020 10:08:21 +0200
Subject: [PATCH 336/600] releasing package nginx version 1.18.0-5

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ddd6387..9516633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-nginx (1.18.0-5) UNRELEASED; urgency=medium
+nginx (1.18.0-5) unstable; urgency=medium
 
   * Prevented request smuggling in LUA
     CVE-2020-11724
     Closes: #964950
 
- -- Ondřej Nový <onovy@debian.org>  Tue, 14 Jul 2020 09:51:13 +0200
+ -- Ondřej Nový <onovy@debian.org>  Tue, 14 Jul 2020 10:08:15 +0200
 
 nginx (1.18.0-4) unstable; urgency=medium
 

From 371e61084fa4ddb1daf676d6d02741c2a87119c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Wed, 19 Aug 2020 15:19:52 +0200
Subject: [PATCH 337/600] Fix GCC-10 compatibility (Closes: #957605).

---
 debian/changelog                              |  6 ++
 .../patches/nchan/gcc-10-compatibility.patch  | 58 +++++++++++++++++++
 debian/modules/patches/nchan/series           |  1 +
 3 files changed, 65 insertions(+)
 create mode 100644 debian/modules/patches/nchan/gcc-10-compatibility.patch
 create mode 100644 debian/modules/patches/nchan/series

diff --git a/debian/changelog b/debian/changelog
index 9516633..be0e809 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.18.0-6) UNRELEASED; urgency=medium
+
+  * Fix GCC-10 compatibility (Closes: #957605).
+
+ -- Ondřej Nový <onovy@debian.org>  Wed, 19 Aug 2020 15:19:33 +0200
+
 nginx (1.18.0-5) unstable; urgency=medium
 
   * Prevented request smuggling in LUA
diff --git a/debian/modules/patches/nchan/gcc-10-compatibility.patch b/debian/modules/patches/nchan/gcc-10-compatibility.patch
new file mode 100644
index 0000000..00e3b45
--- /dev/null
+++ b/debian/modules/patches/nchan/gcc-10-compatibility.patch
@@ -0,0 +1,58 @@
+From f484c603a81c3bddd3f0160cfdbe231b8a453cde Mon Sep 17 00:00:00 2001
+From: Leo P <junk@slact.net>
+Date: Wed, 24 Jun 2020 15:28:07 -0400
+Subject: [PATCH] GCC 10 compatibility
+Origin: https://github.com/slact/nchan/commit/f484c603a81c3bddd3f0160cfdbe231b8a453cde
+
+---
+ src/store/memory/memstore.c          | 2 ++
+ src/store/memory/store-private.h     | 2 +-
+ src/store/redis/redis_lua_commands.h | 7 +++++--
+ 5 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/store/memory/memstore.c b/src/store/memory/memstore.c
+index 2844220c..f0f78acc 100755
+--- a/src/store/memory/memstore.c
++++ b/src/store/memory/memstore.c
+@@ -40,6 +40,8 @@ static ngx_int_t redis_fakesub_timer_interval;
+ 
+ #endif
+ 
++uint16_t  memstore_worker_generation;
++
+ 
+ typedef struct {
+   //memstore_channel_head_t       unbuffered_dummy_chanhead;
+diff --git a/src/store/memory/store-private.h b/src/store/memory/store-private.h
+index e4a426a3..49de940b 100644
+--- a/src/store/memory/store-private.h
++++ b/src/store/memory/store-private.h
+@@ -172,6 +172,6 @@ ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *chanhead, const char *);
+ void memstore_chanhead_release(memstore_channel_head_t *ch, char *label);
+ void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label);
+ 
+-uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
++extern uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
+ 
+ #endif /*MEMSTORE_PRIVATE_HEADER*/
+diff --git a/src/store/redis/redis_lua_commands.h b/src/store/redis/redis_lua_commands.h
+index 76fb7b95..2efb25bd 100644
+--- a/src/store/redis/redis_lua_commands.h
++++ b/src/store/redis/redis_lua_commands.h
+@@ -1,3 +1,5 @@
++#ifndef NCHAN_REDIS_LUA_SCRIPTS_H
++#define NCHAN_REDIS_LUA_SCRIPTS_H
+ // don't edit this please, it was auto-generated by hsss
+ // https://github.com/slact/hsss
+ 
+@@ -63,7 +65,8 @@ typedef struct {
+   redis_lua_script_t subscriber_unregister;
+ 
+ } redis_lua_scripts_t;
+-redis_lua_scripts_t redis_lua_scripts;
+-const int redis_lua_scripts_count;
++extern redis_lua_scripts_t redis_lua_scripts;
++extern const int redis_lua_scripts_count;
+ #define REDIS_LUA_SCRIPTS_EACH(script) \
+ for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++) 
++#endif //NCHAN_REDIS_LUA_SCRIPTS_H
diff --git a/debian/modules/patches/nchan/series b/debian/modules/patches/nchan/series
new file mode 100644
index 0000000..80f5dee
--- /dev/null
+++ b/debian/modules/patches/nchan/series
@@ -0,0 +1 @@
+gcc-10-compatibility.patch

From d5edfb4e7a674fc06881872e54a4dfd964ea7a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Wed, 19 Aug 2020 15:27:14 +0200
Subject: [PATCH 338/600] releasing package nginx version 1.18.0-6

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be0e809..266e3ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-nginx (1.18.0-6) UNRELEASED; urgency=medium
+nginx (1.18.0-6) unstable; urgency=medium
 
   * Fix GCC-10 compatibility (Closes: #957605).
 
- -- Ondřej Nový <onovy@debian.org>  Wed, 19 Aug 2020 15:19:33 +0200
+ -- Ondřej Nový <onovy@debian.org>  Wed, 19 Aug 2020 15:27:02 +0200
 
 nginx (1.18.0-5) unstable; urgency=medium
 

From 28cea613e4d327458cc715425cfa9ee399c68b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Fri, 21 Aug 2020 14:14:23 +0200
Subject: [PATCH 339/600] d/p/CVE-2019-20372.patch: Drop, applied upstream.

---
 debian/changelog                    |  6 ++++++
 debian/patches/CVE-2019-20372.patch | 26 --------------------------
 debian/patches/series               |  1 -
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 debian/patches/CVE-2019-20372.patch

diff --git a/debian/changelog b/debian/changelog
index 266e3ea..05a740b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.18.0-7) UNRELEASED; urgency=medium
+
+  * d/p/CVE-2019-20372.patch: Drop, applied upstream.
+
+ -- Ondřej Nový <onovy@debian.org>  Fri, 21 Aug 2020 14:14:13 +0200
+
 nginx (1.18.0-6) unstable; urgency=medium
 
   * Fix GCC-10 compatibility (Closes: #957605).
diff --git a/debian/patches/CVE-2019-20372.patch b/debian/patches/CVE-2019-20372.patch
deleted file mode 100644
index 741b0a9..0000000
--- a/debian/patches/CVE-2019-20372.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8bffc01d084b4881e3eed2052c115b8f04268cb9 Mon Sep 17 00:00:00 2001
-From: Ruslan Ermilov <ru@nginx.com>
-Date: Mon, 23 Dec 2019 15:45:46 +0300
-Subject: [PATCH] Discard request body when redirecting to a URL via
- error_page.
-
-Reported by Bert JW Regeer and Francisco Oca Gonzalez.
----
- src/http/ngx_http_special_response.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/src/http/ngx_http_special_response.c
-+++ b/src/http/ngx_http_special_response.c
-@@ -629,6 +629,12 @@
-         r->keepalive = 0;
-     }
- 
-+    r->expect_tested = 1;
-+
-+    if (ngx_http_discard_request_body(r) != NGX_OK) {
-+        r->keepalive = 0;
-+    }
-+
-     location = ngx_list_push(&r->headers_out.headers);
- 
-     if (location == NULL) {
diff --git a/debian/patches/series b/debian/patches/series
index b221db7..5b6b799 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
-CVE-2019-20372.patch

From da49114fdc5bf958678fc432802408e05f4cb07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 8 Oct 2019 22:48:47 +0200
Subject: [PATCH 340/600] Add arm64 and ppc64el to list of luajit platforms

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index fe24d3e..d55777f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends: debhelper-compat (= 13),
                libgd-dev,
                libgeoip-dev,
                libhiredis-dev,
-               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !armel !armhf !powerpc !powerpcspe !mips !mipsel],
-               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel],
+               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !armel !armhf !powerpc !powerpcspe !mips !mipsel !arm64 !ppc64el],
+               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel arm64 ppc64el],
                libmaxminddb-dev,
                libmhash-dev,
                libpam0g-dev,

From ecdfceccf1f12f440c0890056d145b27dbb3c1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:01:10 +0100
Subject: [PATCH 341/600] http-auth-pam: Upgrade to 1.5.3

---
 debian/modules/control                 | 2 +-
 debian/modules/http-auth-pam/ChangeLog | 6 ++++++
 debian/modules/http-auth-pam/VERSION   | 2 +-
 debian/modules/http-auth-pam/config    | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index e980b2f..86b6094 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -9,7 +9,7 @@ Version: 0.3.1
 
 Module: http-auth-pam
 Homepage: https://github.com/sto/ngx_http_auth_pam_module
-Version: 1.5.2
+Version: 1.5.3
 
 Module: http-echo
 Homepage: https://github.com/agentzh/echo-nginx-module
diff --git a/debian/modules/http-auth-pam/ChangeLog b/debian/modules/http-auth-pam/ChangeLog
index 084c99a..5974d79 100644
--- a/debian/modules/http-auth-pam/ChangeLog
+++ b/debian/modules/http-auth-pam/ChangeLog
@@ -1,3 +1,9 @@
+2021-08-23  sto@mixinet.net
+
+	* Version 1.5.3.
+	* Always load after ngx_http_access_module (patch provided by khimaros, see
+	  https://github.com/sto/ngx_http_auth_pam_module/pull/26)
+
 2020-06-23  sto@mixinet.net
 
 	* Version 1.5.2.
diff --git a/debian/modules/http-auth-pam/VERSION b/debian/modules/http-auth-pam/VERSION
index 4cda8f1..8af85be 100644
--- a/debian/modules/http-auth-pam/VERSION
+++ b/debian/modules/http-auth-pam/VERSION
@@ -1 +1 @@
-1.5.2
+1.5.3
diff --git a/debian/modules/http-auth-pam/config b/debian/modules/http-auth-pam/config
index 2275262..6965eea 100644
--- a/debian/modules/http-auth-pam/config
+++ b/debian/modules/http-auth-pam/config
@@ -7,10 +7,11 @@ if test -n "$ngx_module_link"; then
     ngx_module_deps=
     ngx_module_srcs="$ngx_addon_dir/ngx_http_auth_pam_module.c"
     ngx_module_libs="-lpam"
+    ngx_module_order="$ngx_module_name ngx_http_access_module"
 
     . auto/module
 else
    HTTP_MODULES="$HTTP_MODULES ngx_http_auth_pam_module"
    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_pam_module.c"
    CORE_LIBS="$CORE_LIBS -lpam"
-fi
\ No newline at end of file
+fi

From 0b739c803e9b15111d84aae1d2fbf8b538960aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:01:16 +0100
Subject: [PATCH 342/600] http-echo: Upgrade to 0.62

---
 debian/modules/control                        |  2 +-
 debian/modules/http-echo/README.markdown      |  7 +++-
 debian/modules/http-echo/config               | 29 ++++++++--------
 .../http-echo/src/ngx_http_echo_util.h        |  2 +-
 debian/modules/http-echo/valgrind.suppress    | 33 +++++++++++--------
 5 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index 86b6094..83deeab 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -13,7 +13,7 @@ Version: 1.5.3
 
 Module: http-echo
 Homepage: https://github.com/agentzh/echo-nginx-module
-Version: v0.61
+Version: 0.62
 Files-Excluded: .gitignore .gitattributes .travis.yml
 
 Module: http-geoip2
diff --git a/debian/modules/http-echo/README.markdown b/debian/modules/http-echo/README.markdown
index 71ac080..02d4608 100644
--- a/debian/modules/http-echo/README.markdown
+++ b/debian/modules/http-echo/README.markdown
@@ -1606,6 +1606,11 @@ Compatibility
 
 The following versions of Nginx should work with this module:
 
+* **1.16.x**
+* **1.15.x**                      (last tested: 1.15.8)
+* **1.14.x**
+* **1.13.x**                      (last tested: 1.13.6)
+* **1.12.x**
 * **1.11.x**                      (last tested: 1.11.2)
 * **1.10.x**
 * **1.9.x**                       (last tested: 1.9.15)
@@ -1809,7 +1814,7 @@ This wiki page is also maintained by the author himself, and everybody is encour
 Copyright & License
 ===================
 
-Copyright (c) 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (c) 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 This module is licensed under the terms of the BSD license.
 
diff --git a/debian/modules/http-echo/config b/debian/modules/http-echo/config
index 32b54bf..4bf0f00 100644
--- a/debian/modules/http-echo/config
+++ b/debian/modules/http-echo/config
@@ -30,21 +30,24 @@ ECHO_DEPS="                                                                 \
         $ngx_addon_dir/src/ngx_http_echo_foreach.h                          \
         "
 
-# nginx won't have HTTP_POSTPONE_FILTER_MODULE & HTTP_POSTPONE_FILTER_SRCS
-# defined since 1.9.11
-if test -z "$HTTP_POSTPONE_FILTER_MODULE"; then
-    HTTP_POSTPONE_FILTER_MODULE=ngx_http_postpone_filter_module
-    HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
+# nginx 1.17.0+ unconditionally enables the postpone filter
+if [ ! -z "$HTTP_POSTPONE" ]; then
+    # nginx won't have HTTP_POSTPONE_FILTER_MODULE & HTTP_POSTPONE_FILTER_SRCS
+    # defined since 1.9.11
+    if [ -z "$HTTP_POSTPONE_FILTER_MODULE" ]; then
+        HTTP_POSTPONE_FILTER_MODULE=ngx_http_postpone_filter_module
+        HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
+    fi
+
+    # This module depends upon the postpone filter being activated
+    if [ "$HTTP_POSTPONE" != YES ]; then
+        HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
+        HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
+        HTTP_POSTPONE=YES
+    fi
 fi
 
-# This module depends upon the postpone filter being activated
-if [ $HTTP_POSTPONE != YES ]; then
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
-    HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
-    HTTP_POSTPONE=YES
-fi
-
-if test -n "$ngx_module_link"; then
+if [ -n "$ngx_module_link" ]; then
     ngx_module_type=HTTP_AUX_FILTER
     ngx_module_name=$ngx_addon_name
     ngx_module_incs=
diff --git a/debian/modules/http-echo/src/ngx_http_echo_util.h b/debian/modules/http-echo/src/ngx_http_echo_util.h
index 24b3e15..d620d09 100644
--- a/debian/modules/http-echo/src/ngx_http_echo_util.h
+++ b/debian/modules/http-echo/src/ngx_http_echo_util.h
@@ -11,7 +11,7 @@
 #include "ngx_http_echo_module.h"
 
 
-#define ngx_http_echo_strcmp_const(a, b) \
+#define ngx_http_echo_strcmp_const(a, b)                                     \
     ngx_strncmp(a, b, sizeof(b) - 1)
 
 
diff --git a/debian/modules/http-echo/valgrind.suppress b/debian/modules/http-echo/valgrind.suppress
index d4bfe63..975415e 100644
--- a/debian/modules/http-echo/valgrind.suppress
+++ b/debian/modules/http-echo/valgrind.suppress
@@ -1,17 +1,3 @@
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:lj_str_new
-   fun:lua_setfield
-   fun:ngx_http_lua_cache_store_code
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:lj_str_new
-   fun:lua_getfield
-   fun:ngx_http_lua_cache_load_code
-}
 {
    <insert_a_suppression_name_here>
    Memcheck:Param
@@ -46,3 +32,22 @@
    fun:ngx_single_process_cycle
    fun:main
 }
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+}

From e5cbfb9f4badbb07dcef050c5afdd54a567b9bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:01:27 +0100
Subject: [PATCH 343/600] nchan: Upgrade to 1.2.15

---
 debian/modules/control                        |   2 +-
 debian/modules/nchan/README.md                | 107 ++-
 debian/modules/nchan/changelog.txt            |  36 +
 debian/modules/nchan/config                   |  16 +-
 debian/modules/nchan/src/nchan_commands.rb    | 149 +++-
 .../modules/nchan/src/nchan_config_commands.c | 616 +++++++++++++-
 debian/modules/nchan/src/nchan_defs.h         |   5 +-
 debian/modules/nchan/src/nchan_module.c       | 158 ++++
 debian/modules/nchan/src/nchan_module.h       |   1 +
 debian/modules/nchan/src/nchan_setup.c        | 185 ++++-
 debian/modules/nchan/src/nchan_types.h        |  66 ++
 debian/modules/nchan/src/nchan_variables.c    |  44 +
 debian/modules/nchan/src/nchan_version.h      |   2 +-
 .../nchan/src/store/memory/ipc-handlers.c     |   1 -
 .../modules/nchan/src/store/memory/memstore.c | 105 ++-
 .../nchan/src/store/memory/store-private.h    |   4 +-
 .../nchan/src/store/redis/hiredis/.gitignore  |   2 +
 .../nchan/src/store/redis/hiredis/.travis.yml | 119 ++-
 .../src/store/redis/hiredis/CHANGELOG.md      | 258 +++++-
 .../nchan/src/store/redis/hiredis/Makefile    | 179 +++-
 .../nchan/src/store/redis/hiredis/README.md   | 300 ++++++-
 .../src/store/redis/hiredis/adapters/ae.h     | 127 ---
 .../src/store/redis/hiredis/adapters/libev.h  | 147 ----
 .../store/redis/hiredis/adapters/libevent.h   | 108 ---
 .../src/store/redis/hiredis/adapters/libuv.h  | 121 ---
 .../nchan/src/store/redis/hiredis/alloc.c     |  86 ++
 .../nchan/src/store/redis/hiredis/alloc.h     |  91 ++
 .../nchan/src/store/redis/hiredis/async.c     | 406 ++++++---
 .../nchan/src/store/redis/hiredis/async.h     |  18 +
 .../src/store/redis/hiredis/async_private.h   |  75 ++
 .../nchan/src/store/redis/hiredis/dict.c      |  41 +-
 .../store/redis/hiredis/examples/example-ae.c |  62 --
 .../redis/hiredis/examples/example-libev.c    |  52 --
 .../redis/hiredis/examples/example-libevent.c |  53 --
 .../redis/hiredis/examples/example-libuv.c    |  53 --
 .../store/redis/hiredis/examples/example.c    |  78 --
 .../nchan/src/store/redis/hiredis/fmacros.h   |  17 +-
 .../nchan/src/store/redis/hiredis/hiredis.c   | 513 ++++++++----
 .../nchan/src/store/redis/hiredis/hiredis.h   | 179 +++-
 .../src/store/redis/hiredis/hiredis_ssl.h     | 127 +++
 .../nchan/src/store/redis/hiredis/net.c       | 324 ++++++--
 .../nchan/src/store/redis/hiredis/net.h       |   9 +-
 .../nchan/src/store/redis/hiredis/read.c      | 392 +++++++--
 .../nchan/src/store/redis/hiredis/read.h      |  37 +-
 .../nchan/src/store/redis/hiredis/sds.c       | 555 +++++++++----
 .../nchan/src/store/redis/hiredis/sds.h       | 207 ++++-
 .../nchan/src/store/redis/hiredis/sdsalloc.h  |  44 +
 .../src/store/redis/hiredis/sockcompat.c      | 248 ++++++
 .../src/store/redis/hiredis/sockcompat.h      |  92 +++
 .../nchan/src/store/redis/hiredis/ssl.c       | 526 ++++++++++++
 .../nchan/src/store/redis/hiredis/test.c      | 782 +++++++++++++++---
 .../nchan/src/store/redis/hiredis/win32.h     |  18 +-
 .../modules/nchan/src/store/redis/rdsstore.c  | 201 ++++-
 .../get_subscriber_info_id.lua                |  18 +
 .../request_subscriber_info.lua               |  15 +
 .../src/store/redis/redis_lua_commands.c      |  39 +-
 .../src/store/redis/redis_lua_commands.h      |  15 +-
 .../src/store/redis/redis_nginx_adapter.c     | 100 +--
 .../src/store/redis/redis_nginx_adapter.h     |   8 +-
 .../nchan/src/store/redis/redis_nodeset.c     | 601 ++++++++++++--
 .../nchan/src/store/redis/redis_nodeset.h     |  71 +-
 .../redis/scripts/get_unique_request_id.lua   |   1 +
 .../nchan/src/store/redis/store-private.h     |   2 +
 debian/modules/nchan/src/store/redis/store.h  |   1 +
 debian/modules/nchan/src/subscribers/common.c |  52 +-
 debian/modules/nchan/src/subscribers/common.h |   3 +-
 .../nchan/src/subscribers/http-raw-stream.c   |  30 +-
 .../modules/nchan/src/subscribers/internal.c  |  38 +-
 .../modules/nchan/src/subscribers/internal.h  |   6 +-
 .../nchan/src/subscribers/longpoll-private.h  |   6 +-
 .../modules/nchan/src/subscribers/longpoll.c  |  42 +-
 .../nchan/src/subscribers/memstore_ipc.c      |   3 +-
 .../nchan/src/subscribers/memstore_multi.c    |   3 +
 .../nchan/src/subscribers/memstore_redis.c    |   4 +
 .../modules/nchan/src/subscribers/websocket.c |  38 +-
 .../modules/nchan/src/util/nchan_channel_id.c |  36 +
 .../modules/nchan/src/util/nchan_channel_id.h |   2 +
 .../nchan/src/util/nchan_fake_request.c       |   6 +-
 .../nchan/src/util/nchan_output_info.c        |  21 +-
 debian/modules/nchan/src/util/nchan_util.c    |  57 ++
 debian/modules/nchan/src/util/nchan_util.h    |   5 +-
 81 files changed, 7374 insertions(+), 1993 deletions(-)
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/adapters/ae.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/adapters/libev.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/adapters/libevent.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/adapters/libuv.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/alloc.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/alloc.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/async_private.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example-ae.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example-libev.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example-libevent.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example-libuv.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/examples/example.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/hiredis_ssl.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/sdsalloc.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/sockcompat.c
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/sockcompat.h
 create mode 100644 debian/modules/nchan/src/store/redis/hiredis/ssl.c
 create mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua
 create mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/request_subscriber_info.lua
 create mode 100644 debian/modules/nchan/src/store/redis/scripts/get_unique_request_id.lua

diff --git a/debian/modules/control b/debian/modules/control
index 83deeab..2fe5622 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -38,7 +38,7 @@ Patch:
 
 Module: nchan
 Homepage: https://github.com/slact/nchan
-Version: 1.2.7
+Version: 1.2.15
 Files-Excluded: dev nchan_logo.png NchanSubscriber.js src/hiredis nchan
 
 Module: http-uploadprogress
diff --git a/debian/modules/nchan/README.md b/debian/modules/nchan/README.md
index 152396d..f1c2a4d 100644
--- a/debian/modules/nchan/README.md
+++ b/debian/modules/nchan/README.md
@@ -22,7 +22,7 @@ In a web browser, you can use Websocket or EventSource natively, or the [NchanSu
 
 ## Status and History
 
-The latest Nchan release is 1.2.7 (March 17, 2020) ([changelog](https://nchan.io/changelog)).
+The latest Nchan release is 1.2.15 (December 27, 2021) ([changelog](https://nchan.io/changelog)).
 
 The first iteration of Nchan was written in 2009-2010 as the [Nginx HTTP Push Module](https://pushmodule.slact.net), and was vastly refactored into its present state in 2014-2016.
 
@@ -704,6 +704,14 @@ Redis Cluster connections are designed to be resilient and try to recover from e
 
 All Nchan servers sharing a Redis server or cluster should have their times synchronized (via ntpd or your favorite ntp daemon). Failure to do so may result in missed or duplicate messages.
 
+#### Using Redis securely
+
+Redis servers can be connected to via TLS by using the [nchan_redis_ssl](#nchan_redis_ssl) config setting in an `upstream` block, or by using the `rediss://`  schema for the server URLs.
+
+A password and optional username for the `AUTH` command can be set by the [nchan_redis_username](#nchan_redis_username) and [nchan_redis_password](#nchan_redis_password) config settings in an `upstream` block, or by using the `redis://<username>:<password>@hostname` server URL schema.
+
+Note that autodiscovered Redis nodes inherit their parent's SSL, username, and password settings.
+
 #### Tweaks and Optimizations
 
 As of version 1.2.0, Nchan uses Redis slaves to load-balance PUBSUB traffic. By default, there is an equal chance that a channel's PUBSUB subscription will go to any master or slave. The [`nchan_redis_subscribe_weights`](#nchan_redis_subscribe_weights) setting is available to fine-tune this load-balancing.
@@ -1003,16 +1011,25 @@ Nchan makes several variables usabled in the config file:
 - `$nchan_subscriber_type`  
   For subscriber locations, this variable is set to the subscriber type (websocket, longpoll, etc.).
 
+- `$nchan_channel_subscriber_last_seen`  
+  For publisher locations, this variable is set to the timestamp for the last connected subscriber.
+  
+- `$nchan_channel_subscriber_count`  
+  For publisher locations, this variable is set to the number of subscribers in the published channel.
+  
+- `$nchan_channel_message_count`  
+  For publisher locations, this variable is set to the number of messages buffered in the published channel.
+  
 - `$nchan_publisher_type`  
   For publisher locations, this variable is set to the subscriber type (http or websocket).
   
-- `$nchan_prev_message_id`, `$nchan_message_id`
+- `$nchan_prev_message_id`, `$nchan_message_id`  
   The current and previous (if applicable) message id for publisher request or subscriber response.
 
-- `$nchan_channel_event`
+- `$nchan_channel_event`  
   For channel events, this is the event name. Useful when configuring `nchan_channel_event_string`.
 
-- `$nchan_version`
+- `$nchan_version`  
   Current Nchan version. Available since 1.1.5.
   
 Additionally, `nchan_stub_status` data is also exposed as variables. These are available only when `nchan_stub_status` is enabled on at least one location:
@@ -1180,7 +1197,18 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   arguments: 1  
   default: `\n`  
   context: server, location, if  
-  > Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character.    
+  > Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character if not explicitly set to an empty string.    
+
+- **nchan_subscriber_info**  
+  arguments: 0  
+  context: location  
+  > A subscriber location for debugging the state of subscribers on a given channel. The subscribers of the channel specified by `nchan_channel_id` evaluate `nchan_subscriber_info_string` and send it back to the requested on this location. This is useful to see where subscribers are in an Nchan cluster, as well as debugging subscriber connection issues.    
+
+- **nchan_subscriber_info_string**  
+  arguments: 1  
+  default: `$nchan_subscriber_type $remote_addr:$remote_port $http_user_agent $server_name $request_uri $pid`  
+  context: server, location  
+  > this string is evaluated by each subscriber on a given channel and sent to the requester of a `nchan_subscriber_info` location    
 
 - **nchan_subscriber_last_message_id**  
   arguments: 1 - 5  
@@ -1327,12 +1355,23 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   legacy name: push_message_timeout  
   > Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Note that messages always expire from oldest to newest, so an older message may prevent a newer one with a shorter timeout from expiring. An Nginx variable can also be used to set the timeout dynamically.    
 
+- **nchan_redis_cluster_check_interval**  
+  arguments: 1  
+  default: `5s`  
+  context: http, server, upstream, location  
+  > Send a CLUSTER INFO command to each connected Redis node to see if the cluster config epoch has changed. Sent only when in Cluster mode and if any other command that may result in a MOVE error has not been sent in the configured time.    
+
 - **nchan_redis_connect_timeout**  
   arguments: 1  
   default: `600ms`  
   context: upstream  
   > Redis server connection timeout.    
 
+- **nchan_redis_discovered_ip_range_blacklist** `<CIDR range>`  
+  arguments: 1 - 7  
+  context: upstream  
+  > do not attempt to connect to **autodiscovered** nodes with IPs in the specified ranges. Useful for blacklisting private network ranges for clusters and Redis slaves. NOTE that this blacklist applies only to autodiscovered nodes, and not ones specified in the upstream block    
+
 - **nchan_redis_idle_channel_cache_timeout** `<time>`  
   arguments: 1  
   default: `30s`  
@@ -1362,6 +1401,12 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   > Use an upstream config block for Redis servers.    
   [more details](#connecting-to-a-redis-server)  
 
+- **nchan_redis_password**  
+  arguments: 1  
+  default: `<none>`  
+  context: upstream  
+  > Set Redis password for AUTH command. All servers in the upstream block will use this password _unless_ a different password is specified by a server URL.    
+
 - **nchan_redis_ping_interval**  
   arguments: 1  
   default: `4m`  
@@ -1374,10 +1419,54 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   > Used in upstream { } blocks to set redis servers. Redis url is in the form 'redis://:password@hostname:6379/0'. Shorthands 'host:port' or 'host' are permitted.    
   [more details](#connecting-to-a-redis-server)  
 
+- **nchan_redis_ssl** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: upstream  
+  > Enables SSL/TLS for all connections to Redis servers in this upstream block. When enabled, no unsecured connections are permitted    
+
+- **nchan_redis_ssl_ciphers**  
+  arguments: 1  
+  default: `<system default>`  
+  context: upstream  
+  > Acceptable cipers when using TLS for Redis connections    
+
+- **nchan_redis_ssl_client_certificate**  
+  arguments: 1  
+  context: upstream  
+  > Path to client certificate when using TLS for Redis connections    
+
+- **nchan_redis_ssl_client_certificate_key**  
+  arguments: 1  
+  context: upstream  
+  > Path to client certificate key when using TLS for Redis connections    
+
+- **nchan_redis_ssl_server_name**  
+  arguments: 1  
+  context: upstream  
+  > Server name to verify (CN) when using TLS for Redis connections    
+
+- **nchan_redis_ssl_trusted_certificate**  
+  arguments: 1  
+  context: upstream  
+  > Trusted certificate (CA) when using TLS for Redis connections    
+
+- **nchan_redis_ssl_trusted_certificate_path**  
+  arguments: 1  
+  default: `<system default>`  
+  context: upstream  
+  > Trusted certificate (CA) when using TLS for Redis connections. Defaults tothe system's SSL cert path unless nchan_redis_ssl_trusted_certificate is set    
+
+- **nchan_redis_ssl_verify_certificate** `[ on | off ]`  
+  arguments: 1  
+  default: `on`  
+  context: upstream  
+  > Should the server certificate be verified when using TLS for Redis connections? Useful to disable when testing with a self-signed server certificate.    
+
 - **nchan_redis_storage_mode** `[ distributed | backup | nostore ]`  
   arguments: 1  
   default: `distributed`  
-  context: http, server, upstream  
+  context: http, server, upstream, location  
   > The mode of operation of the Redis server. In `distributed` mode, messages are published directly to Redis, and retrieved in real-time. Any number of Nchan servers in distributed mode can share the Redis server (or cluster). Useful for horizontal scalability, but suffers the latency penalty of all message publishing going through Redis first.  
   >   
   > In `backup` mode, messages are published locally first, then later forwarded to Redis, and are retrieved only upon chanel initialization. Only one Nchan server should use a Redis server (or cluster) in this mode. Useful for data persistence without sacrificing response times to the latency of a round-trip to Redis.  
@@ -1397,6 +1486,12 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
   > Use of this command is discouraged in favor of upstreams blocks with (`nchan_redis_server`)[#nchan_redis_server]. The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.    
   [more details](#connecting-to-a-redis-server)  
 
+- **nchan_redis_username**  
+  arguments: 1  
+  default: `<none>`  
+  context: upstream  
+  > Set Redis username for AUTH command (available when using ACLs on the Redis server). All servers in the upstream block will use this username _unless_ a different username is specified by a server URL.    
+
 - **nchan_shared_memory_size** `<size>`  
   arguments: 1  
   default: `128M`  
diff --git a/debian/modules/nchan/changelog.txt b/debian/modules/nchan/changelog.txt
index 88f481e..3763e6d 100644
--- a/debian/modules/nchan/changelog.txt
+++ b/debian/modules/nchan/changelog.txt
@@ -1,3 +1,39 @@
+1.2.15 (Dec. 27 2021)
+ fix: publishing to >255 string-delimitered channels could result in a crash
+ fix: Redis connection failures (since 1 2.14)
+1.2.14 [WITHDRAWN] (Dec. 20 2021)
+ fix: compiler warnings from the use of the 'typeof' macro
+ fix: Nchan can't be built without the Nginx SSL module (bug introduced in 1.2.13)
+ update: hiredis updated to 1.0.2
+ fix: some Redis connection failures could result in a crash (bug introduced in 1.2.13)
+ fix: upstream subrequests crashed with Nginx >= 1.19.9
+1.2.13 [WITHDRAWN] (Dec. 13 2021)
+ feature: Redis ACL support with username and passwword
+ feature: Redis TLS support
+1.2.12 (Sep. 22 2021)
+ fix: better Redis cluster connection logging
+ fix: redundant method to discover Redis slave nodes in cluster mode could result in receiving unreachable IPs
+1.2.11 (Sep. 17 2021)
+ feature: nchan_redis_discovered_ip_range_blacklist for ignoring autotiscoreved nodes
+ feature: nchan_redis_storage_mode is now configurable in location contexts 
+1.2.10 (Aug. 25 2021)
+ fix: Nchan could not be built without openssl due to hiredis dependency
+      (introduced in v1.2.9)
+ feature: allow no separator for http-raw-stream (thanks @sclem)
+1.2.9 (Aug. 12 2021)
+ feature: Redis cluster reconfiguration check timer,
+      nchan_redis_cluster_check_interval setting
+ fix: detect Redis cluster reconfiguration when publishing messages in "nostore" mode
+ update: hiredis updated to v1.0.0 
+ fix: segfault on out-of-shared-memory condition for multiplexed publishers
+1.2.8 (Apr. 12 2021)
+ feature: nchan_subscriber_info locations for receiving customizable info from 
+      subscribers of a given channel.
+ fix: incorrect lgging of disconnected subscribers with 400 error instead of 499
+      (bug introduced in v1.2.7)
+ feature: add $nchan_channel_subscriber_last_seen, $nchan_channel_subscriber_count 
+      and $nchan_channel_message_count variables
+ fix: GCC 10 compatibility
 1.2.7 (Mar. 17 2020)
  fix: unidirectional subscribers have their connection terminated if they send any data to the server
       after the initial request handshake. This applies to all subscribers except Websocket
diff --git a/debian/modules/nchan/config b/debian/modules/nchan/config
index 324deef..a246ed1 100644
--- a/debian/modules/nchan/config
+++ b/debian/modules/nchan/config
@@ -22,12 +22,22 @@ ngx_feature_test=" \
 . auto/feature
 if [ $ngx_found = no ]; then
   _NCHAN_HIREDIS_SRCS="\
-    ${ngx_addon_dir}/src/store/redis/hiredis/hiredis.c \
-    ${ngx_addon_dir}/src/store/redis/hiredis/read.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/alloc.c \
     ${ngx_addon_dir}/src/store/redis/hiredis/async.c \
-    ${ngx_addon_dir}/src/store/redis/hiredis/sds.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/dict.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/hiredis.c \
     ${ngx_addon_dir}/src/store/redis/hiredis/net.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/read.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/sds.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/sockcompat.c \
   "
+  
+  if [ $USE_OPENSSL = YES ]; then
+    _NCHAN_HIREDIS_SRCS="$_NCHAN_HIREDIS_SRCS\
+      ${ngx_addon_dir}/src/store/redis/hiredis/ssl.c \
+    "
+  fi
+  
   ngx_feature_libs=""
 else
   nchan_libs="$nchan_libs $ngx_feature_libs"
diff --git a/debian/modules/nchan/src/nchan_commands.rb b/debian/modules/nchan/src/nchan_commands.rb
index eae0ea9..9ffc27a 100644
--- a/debian/modules/nchan/src/nchan_commands.rb
+++ b/debian/modules/nchan/src/nchan_commands.rb
@@ -62,7 +62,7 @@ CfCmd.new do
       :nchan_set_sub_channel_id,
       :loc_conf,
       args: 1..7,
-      alt: [ :nchan_sub_channel_id ],
+      alt: :nchan_sub_channel_id,
       group: "pubsub",
       tags: ["pubsub", 'channel-id'],
       
@@ -73,7 +73,7 @@ CfCmd.new do
       :nchan_pubsub_directive,
       :loc_conf,
       args: 0..6,
-      alt: ["nchan_pubsub_location"],
+      alt: :nchan_pubsub_location,
       
       group: "pubsub",
       tags: [ 'publisher', 'subscriber', 'pubsub' ],
@@ -82,6 +82,24 @@ CfCmd.new do
       info: "Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server.",
       uri: '#pubsub-endpoint'
   
+  nchan_subscriber_info [:loc],
+      :nchan_subscriber_info_directive,
+      :loc_conf,
+      args: 0,
+      
+      group: "pubsub",
+      tags: ["subscriber", "debug"],
+      info: "A subscriber location for debugging the state of subscribers on a given channel. The subscribers of the channel specified by `nchan_channel_id` evaluate `nchan_subscriber_info_string` and send it back to the requested on this location. This is useful to see where subscribers are in an Nchan cluster, as well as debugging subscriber connection issues."
+  
+  nchan_subscriber_info_string [:srv, :loc],
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :subscriber_info_string],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ["subscriber", "debug"],
+      default: "$nchan_subscriber_type $remote_addr:$remote_port $http_user_agent $server_name $request_uri $pid",
+      info: "this string is evaluated by each subscriber on a given channel and sent to the requester of a `nchan_subscriber_info` location"
   
   nchan_longpoll_multipart_response [:srv, :loc, :if],
       :nchan_set_longpoll_multipart,
@@ -149,7 +167,7 @@ CfCmd.new do
       :loc_conf,
       args: 0..5,
       legacy: "push_subscriber",
-      alt: ["nchan_subscriber_location"],
+      alt: :nchan_subscriber_location,
       
       group: "pubsub",
       tags: ['subscriber'],
@@ -204,7 +222,7 @@ CfCmd.new do
       tags: ['subscriber-rawstream'],
       value: "<string>",
       default: "\\n",
-      info: "Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character."
+      info: "Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character if not explicitly set to an empty string."
   
   nchan_subscriber_first_message [:srv, :loc, :if],
       :nchan_subscriber_first_message_directive,
@@ -256,7 +274,7 @@ CfCmd.new do
       :loc_conf,
       args: 0..2,
       legacy: "push_publisher",
-      alt: ["nchan_publisher_location"],
+      alt: :nchan_publisher_location,
       
       group: "pubsub",
       tags: ['publisher'],
@@ -415,6 +433,15 @@ CfCmd.new do
       undocumented: true,
       group: "storage"
   
+  nchan_redis_discovered_ip_range_blacklist [:upstream],
+      :ngx_conf_set_redis_ip_blacklist,
+      :srv_conf,
+      args: 1..7,
+      group: "storage",
+      tags: ['redis'],
+      value: "<CIDR range>",
+      info: "do not attempt to connect to **autodiscovered** nodes with IPs in the specified ranges. Useful for blacklisting private network ranges for clusters and Redis slaves. NOTE that this blacklist applies only to autodiscovered nodes, and not ones specified in the upstream block"
+  
   nchan_redis_server [:upstream],
       :ngx_conf_upstream_redis_server,
       :loc_conf,
@@ -424,7 +451,7 @@ CfCmd.new do
       info: "Used in upstream { } blocks to set redis servers. Redis url is in the form 'redis://:password@hostname:6379/0'. Shorthands 'host:port' or 'host' are permitted.",
       uri: "#connecting-to-a-redis-server"
   
-  nchan_redis_storage_mode [:main, :srv, :upstream], 
+  nchan_redis_storage_mode [:main, :srv, :upstream, :loc], 
       :ngx_conf_set_redis_storage_mode_slot,
       [:loc_conf, :"redis.storage_mode"],
       
@@ -450,6 +477,101 @@ CfCmd.new do
       default: :off,
       info: "Increases publishing capacity by 2-3x for Redis nostore mode at the expense of inaccurate subscriber counts in the publisher response."
   
+  nchan_redis_username [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.username"],
+      
+      group: "storage",
+      tags: ['redis'],
+      default: "<none>",
+      info: "Set Redis username for AUTH command (available when using ACLs on the Redis server). All servers in the upstream block will use this username _unless_ a different username is specified by a server URL."
+  
+  nchan_redis_password [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.password"],
+      
+      group: "storage",
+      tags: ['redis'],
+      default: "<none>",
+      info: "Set Redis password for AUTH command. All servers in the upstream block will use this password _unless_ a different password is specified by a server URL."
+  
+  nchan_redis_ssl [:upstream],
+      :ngx_conf_set_flag_slot,
+      [:srv_conf, :"redis.tls.enabled"],
+      alt: :nchan_redis_tls,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      value: [:on, :off],
+      default: :off,
+      info: "Enables SSL/TLS for all connections to Redis servers in this upstream block. When enabled, no unsecured connections are permitted"
+  
+  nchan_redis_ssl_client_certificate [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.client_certificate"],
+      alt: :nchan_redis_tls_client_certificate,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      info: "Path to client certificate when using TLS for Redis connections"
+  
+  nchan_redis_ssl_client_certificate_key [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.client_certificate_key"],
+      alt: :nchan_redis_tls_client_certificate,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      info: "Path to client certificate key when using TLS for Redis connections"
+  
+  nchan_redis_ssl_server_name [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.server_name"],
+      alt: :nchan_redis_tls_server_name,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      info: "Server name to verify (CN) when using TLS for Redis connections"
+  
+  nchan_redis_ssl_trusted_certificate [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.trusted_certificate"],
+      alt: :nchan_redis_tls_trusted_certificate,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      info: "Trusted certificate (CA) when using TLS for Redis connections"
+      
+  nchan_redis_ssl_trusted_certificate_path [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.trusted_certificate_path"],
+      alt: :nchan_redis_tls_trusted_certificate_path,
+      
+      group: "storage",
+      default: "<system default>",
+      tags: ['redis', 'ssl'],
+      info: "Trusted certificate (CA) when using TLS for Redis connections. Defaults tothe system's SSL cert path unless nchan_redis_ssl_trusted_certificate is set"
+  
+  nchan_redis_ssl_ciphers [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.ciphers"],
+      alt: :nchan_redis_tls_ciphers,
+      
+      group: "storage",
+      default: "<system default>",
+      tags: ['redis', 'ssl'],
+      info: "Acceptable cipers when using TLS for Redis connections"
+  
+  nchan_redis_ssl_verify_certificate [:upstream],
+      :ngx_conf_set_flag_slot,
+      [:srv_conf, :"redis.tls.ciphers"],
+      alt: :nchan_redis_tls_verify_certificate,
+      
+      group: "storage",
+      value: [:on, :off],
+      default: :on,
+      tags: ['redis', 'ssl'],
+      info: "Should the server certificate be verified when using TLS for Redis connections? Useful to disable when testing with a self-signed server certificate."
   
   nchan_use_redis [:main, :srv, :loc],
       :ngx_conf_enable_redis,
@@ -471,6 +593,15 @@ CfCmd.new do
       default: "4m",
       info: "Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable."
   
+  nchan_redis_cluster_check_interval [:main, :srv, :upstream, :loc],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :"redis.cluster_check_interval"],
+      
+      group: "storage",
+      tags: ['redis'],
+      default: "5s",
+      info: "Send a CLUSTER INFO command to each connected Redis node to see if the cluster config epoch has changed. Sent only when in Cluster mode and if any other command that may result in a MOVE error has not been sent in the configured time."
+  
   nchan_redis_wait_after_connecting [:main, :srv, :loc],
       :nchan_ignore_obsolete_setting,
       :loc_conf,
@@ -553,7 +684,7 @@ CfCmd.new do
       :nchan_set_message_buffer_length,
       [:loc_conf, :max_messages],
       legacy: [ "push_max_message_buffer_length", "push_message_buffer_length" ],
-      alt: ["nchan_message_max_buffer_length"],
+      alt: :nchan_message_max_buffer_length,
       
       group: "storage",
       tags: ['publisher'],
@@ -775,12 +906,12 @@ CfCmd.new do
       [:loc_conf, "benchmark.subscribers_per_channel"],
       group: "development",
       undocumented: true
-    nchan_benchmark_subscriber_distribution [:loc],
+  nchan_benchmark_subscriber_distribution [:loc],
       :nchan_benchmark_subscriber_distribution_directive,
       [:loc_conf, "benchmark.subscriber_distribution"],
       group: "development",
       undocumented: true
-    nchan_benchmark_publisher_distribution [:loc],
+  nchan_benchmark_publisher_distribution [:loc],
       :nchan_benchmark_publisher_distribution_directive,
       [:loc_conf, "benchmark.publisher_distribution"],
       group: "development",
diff --git a/debian/modules/nchan/src/nchan_config_commands.c b/debian/modules/nchan/src/nchan_config_commands.c
index 4cbde2a..19d2fb0 100644
--- a/debian/modules/nchan/src/nchan_config_commands.c
+++ b/debian/modules/nchan/src/nchan_config_commands.c
@@ -36,6 +36,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, publisher_upstream_request_url),
     NULL } ,
+  { ngx_string("nchan_publisher_upstream_request"), //alt for nchan_publisher_upstream_request
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, publisher_upstream_request_url),
+    NULL } ,
 
   { ngx_string("nchan_deflate_message_for_websocket"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -43,6 +49,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_deflate_message_for_websocket"), //alt for nchan_deflate_message_for_websocket
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_compression_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_channel_id_split_delimiter"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -50,6 +62,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, channel_id_split_delimiter),
     NULL } ,
+  { ngx_string("nchan_channel_id_split_delimiter"), //alt for nchan_channel_id_split_delimiter
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_id_split_delimiter),
+    NULL } ,
 
   { ngx_string("nchan_subscriber_channel_id"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
@@ -77,12 +95,44 @@ static ngx_command_t  nchan_commands[] = {
     0,
     NULL } ,
 
+  { ngx_string("nchan_subscriber_info"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
+    nchan_subscriber_info_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_subscriber_info"), //alt for nchan_subscriber_info
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
+    nchan_subscriber_info_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_info_string"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_info_string),
+    NULL } ,
+  { ngx_string("nchan_subscriber_info_string"), //alt for nchan_subscriber_info_string
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_info_string),
+    NULL } ,
+
   { ngx_string("nchan_longpoll_multipart_response"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
     nchan_set_longpoll_multipart,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, longpoll_multimsg),
     NULL } ,
+  { ngx_string("nchan_longpoll_multipart_response"), //alt for nchan_longpoll_multipart_response
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_set_longpoll_multipart,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, longpoll_multimsg),
+    NULL } ,
 
   { ngx_string("nchan_eventsource_event"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -90,6 +140,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, eventsource_event),
     NULL } ,
+  { ngx_string("nchan_eventsource_event"), //alt for nchan_eventsource_event
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_event),
+    NULL } ,
 
   { ngx_string("nchan_eventsource_ping_comment"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -97,6 +153,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, eventsource_ping.comment),
     NULL } ,
+  { ngx_string("nchan_eventsource_ping_comment"), //alt for nchan_eventsource_ping_comment
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot_no_newlines,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.comment),
+    NULL } ,
 
   { ngx_string("nchan_eventsource_ping_event"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -104,6 +166,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, eventsource_ping.event),
     NULL } ,
+  { ngx_string("nchan_eventsource_ping_event"), //alt for nchan_eventsource_ping_event
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot_no_newlines,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.event),
+    NULL } ,
 
   { ngx_string("nchan_eventsource_ping_data"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -111,6 +179,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, eventsource_ping.data),
     NULL } ,
+  { ngx_string("nchan_eventsource_ping_data"), //alt for nchan_eventsource_ping_data
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot_no_newlines,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.data),
+    NULL } ,
 
   { ngx_string("nchan_eventsource_ping_interval"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -118,6 +192,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, eventsource_ping.interval),
     NULL } ,
+  { ngx_string("nchan_eventsource_ping_interval"), //alt for nchan_eventsource_ping_interval
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.interval),
+    NULL } ,
 
   { ngx_string("nchan_subscriber"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
@@ -144,6 +224,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, msg_in_etag_only),
     NULL } ,
+  { ngx_string("nchan_subscriber_compound_etag_message_id"), //alt for nchan_subscriber_compound_etag_message_id
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, msg_in_etag_only),
+    NULL } ,
 
   { ngx_string("nchan_subscriber_message_id_custom_etag_header"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -151,6 +237,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, custom_msgtag_header),
     NULL } ,
+  { ngx_string("nchan_subscriber_message_id_custom_etag_header"), //alt for nchan_subscriber_message_id_custom_etag_header
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, custom_msgtag_header),
+    NULL } ,
 
   { ngx_string("nchan_subscriber_last_message_id"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
@@ -158,6 +250,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_subscriber_last_message_id"), //alt for nchan_subscriber_last_message_id
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
+    nchan_subscriber_last_message_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_subscriber_http_raw_stream_separator"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -165,6 +263,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, subscriber_http_raw_stream_separator),
     NULL } ,
+  { ngx_string("nchan_subscriber_http_raw_stream_separator"), //alt for nchan_subscriber_http_raw_stream_separator
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_set_raw_subscriber_separator,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_http_raw_stream_separator),
+    NULL } ,
 
   { ngx_string("nchan_subscriber_first_message"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -172,6 +276,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_subscriber_first_message"), //alt for nchan_subscriber_first_message
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_subscriber_first_message_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_websocket_ping_interval"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -179,6 +289,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, websocket_ping_interval),
     NULL } ,
+  { ngx_string("nchan_websocket_ping_interval"), //alt for nchan_websocket_ping_interval
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, websocket_ping_interval),
+    NULL } ,
 
   { ngx_string("nchan_websocket_client_heartbeat"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE2,
@@ -186,6 +302,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, websocket_heartbeat),
     NULL } ,
+  { ngx_string("nchan_websocket_client_heartbeat"), //alt for nchan_websocket_client_heartbeat
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE2,
+    nchan_websocket_heartbeat_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, websocket_heartbeat),
+    NULL } ,
 
   { ngx_string("nchan_publisher"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
@@ -218,6 +340,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, subscriber_timeout),
     NULL } ,
+  { ngx_string("nchan_subscriber_timeout"), //alt for nchan_subscriber_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_timeout),
+    NULL } ,
 
   { ngx_string("nchan_authorize_request"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -225,6 +353,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, authorize_request_url),
     NULL } ,
+  { ngx_string("nchan_authorize_request"), //alt for nchan_authorize_request
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, authorize_request_url),
+    NULL } ,
 
   { ngx_string("nchan_subscribe_request"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -232,6 +366,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, subscribe_request_url),
     NULL } ,
+  { ngx_string("nchan_subscribe_request"), //alt for nchan_subscribe_request
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscribe_request_url),
+    NULL } ,
 
   { ngx_string("nchan_unsubscribe_request"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -239,6 +379,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, unsubscribe_request_url),
     NULL } ,
+  { ngx_string("nchan_unsubscribe_request"), //alt for nchan_unsubscribe_request
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_unsubscribe_request_url,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, unsubscribe_request_url),
+    NULL } ,
 
   { ngx_string("nchan_message_temp_path"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -246,6 +392,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_MAIN_CONF_OFFSET,
     offsetof(nchan_main_conf_t, message_temp_path),
     NULL } ,
+  { ngx_string("nchan_message_temp_path"), //alt for nchan_message_temp_path
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_path_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, message_temp_path),
+    NULL } ,
 
   { ngx_string("nchan_store_messages"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -259,6 +411,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_store_messages"), //alt for nchan_store_messages
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_store_messages_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_shared_memory_size"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -278,6 +436,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_MAIN_CONF_OFFSET,
     offsetof(nchan_main_conf_t, shm_size),
     NULL } ,
+  { ngx_string("nchan_shared_memory_size"), //alt for nchan_shared_memory_size
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, shm_size),
+    NULL } ,
 
   { ngx_string("nchan_permessage_deflate_compression_level"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -285,6 +449,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_MAIN_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_permessage_deflate_compression_level"), //alt for nchan_permessage_deflate_compression_level
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_level_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_permessage_deflate_compression_strategy"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -292,6 +462,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_MAIN_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_permessage_deflate_compression_strategy"), //alt for nchan_permessage_deflate_compression_strategy
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_strategy_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_permessage_deflate_compression_window"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -299,6 +475,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_MAIN_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_permessage_deflate_compression_window"), //alt for nchan_permessage_deflate_compression_window
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_window_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_permessage_deflate_compression_memlevel"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -306,6 +488,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_MAIN_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_permessage_deflate_compression_memlevel"), //alt for nchan_permessage_deflate_compression_memlevel
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_memlevel_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_redis_url"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -313,6 +501,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis.url),
     NULL } ,
+  { ngx_string("nchan_redis_url"), //alt for nchan_redis_url
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_url,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.url),
+    NULL } ,
 
   { ngx_string("nchan_redis_pass"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -320,6 +514,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis),
     NULL } ,
+  { ngx_string("nchan_redis_pass"), //alt for nchan_redis_pass
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_upstream_pass,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis),
+    NULL } ,
 
   { ngx_string("nchan_redis_pass_inheritable"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -327,6 +527,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis.upstream_inheritable),
     NULL } ,
+  { ngx_string("nchan_redis_pass_inheritable"), //alt for nchan_redis_pass_inheritable
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.upstream_inheritable),
+    NULL } ,
 
   { ngx_string("nchan_redis_publish_msgpacked_max_size"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -334,6 +540,25 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_MAIN_CONF_OFFSET,
     offsetof(nchan_main_conf_t, redis_publish_message_msgkey_size),
     NULL } ,
+  { ngx_string("nchan_redis_publish_msgpacked_max_size"), //alt for nchan_redis_publish_msgpacked_max_size
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, redis_publish_message_msgkey_size),
+    NULL } ,
+
+  { ngx_string("nchan_redis_discovered_ip_range_blacklist"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    ngx_conf_set_redis_ip_blacklist,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_redis_discovered_ip_range_blacklist"), //alt for nchan_redis_discovered_ip_range_blacklist
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    ngx_conf_set_redis_ip_blacklist,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_redis_server"),
     NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
@@ -341,9 +566,21 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_redis_server"), //alt for nchan_redis_server
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_upstream_redis_server,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_redis_storage_mode"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_storage_mode_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.storage_mode),
+    NULL } ,
+  { ngx_string("nchan_redis_storage_mode"), //alt for nchan_redis_storage_mode
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
     ngx_conf_set_redis_storage_mode_slot,
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis.storage_mode),
@@ -355,6 +592,142 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis.nostore_fastpublish),
     NULL } ,
+  { ngx_string("nchan_redis_nostore_fastpublish"), //alt for nchan_redis_nostore_fastpublish
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.nostore_fastpublish),
+    NULL } ,
+
+  { ngx_string("nchan_redis_username"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.username),
+    NULL } ,
+  { ngx_string("nchan_redis_username"), //alt for nchan_redis_username
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.username),
+    NULL } ,
+
+  { ngx_string("nchan_redis_password"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.password),
+    NULL } ,
+  { ngx_string("nchan_redis_password"), //alt for nchan_redis_password
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.password),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.enabled),
+    NULL } ,
+  { ngx_string("nchan_redis_tls"), //alt for nchan_redis_ssl
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.enabled),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_client_certificate"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.client_certificate),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_client_certificate"), //alt for nchan_redis_ssl_client_certificate
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.client_certificate),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_client_certificate_key"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.client_certificate_key),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_client_certificate"), //alt for nchan_redis_ssl_client_certificate_key
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.client_certificate_key),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_server_name"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.server_name),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_server_name"), //alt for nchan_redis_ssl_server_name
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.server_name),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_trusted_certificate"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_trusted_certificate"), //alt for nchan_redis_ssl_trusted_certificate
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_trusted_certificate_path"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate_path),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_trusted_certificate_path"), //alt for nchan_redis_ssl_trusted_certificate_path
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate_path),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_ciphers"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_ciphers"), //alt for nchan_redis_ssl_ciphers
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_verify_certificate"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_verify_certificate"), //alt for nchan_redis_ssl_verify_certificate
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
+    NULL } ,
 
   { ngx_string("nchan_use_redis"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -362,6 +735,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis.url_enabled),
     NULL } ,
+  { ngx_string("nchan_use_redis"), //alt for nchan_use_redis
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_enable_redis,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.url_enabled),
+    NULL } ,
 
   { ngx_string("nchan_redis_ping_interval"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -369,6 +748,25 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis.ping_interval),
     NULL } ,
+  { ngx_string("nchan_redis_ping_interval"), //alt for nchan_redis_ping_interval
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.ping_interval),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_check_interval"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.cluster_check_interval),
+    NULL } ,
+  { ngx_string("nchan_redis_cluster_check_interval"), //alt for nchan_redis_cluster_check_interval
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.cluster_check_interval),
+    NULL } ,
 
   { ngx_string("nchan_redis_wait_after_connecting"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -376,6 +774,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_redis_wait_after_connecting"), //alt for nchan_redis_wait_after_connecting
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_obsolete_setting,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_redis_connect_timeout"),
     NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
@@ -383,6 +787,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_SRV_CONF_OFFSET,
     offsetof(nchan_srv_conf_t, redis.connect_timeout),
     NULL } ,
+  { ngx_string("nchan_redis_connect_timeout"), //alt for nchan_redis_connect_timeout
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.connect_timeout),
+    NULL } ,
 
   { ngx_string("nchan_redis_subscribe_weights"),
     NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
@@ -390,6 +800,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_SRV_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_redis_subscribe_weights"), //alt for nchan_redis_subscribe_weights
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    ngx_conf_set_redis_subscribe_weights,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_redis_optimize_target"),
     NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
@@ -397,6 +813,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_SRV_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_redis_optimize_target"), //alt for nchan_redis_optimize_target
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_optimize_target,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_redis_namespace"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -404,6 +826,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis.namespace),
     &nchan_redis_namespace__post_handler } ,
+  { ngx_string("nchan_redis_namespace"), //alt for nchan_redis_namespace
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.namespace),
+    &nchan_redis_namespace__post_handler } ,
 
   { ngx_string("nchan_redis_fakesub_timer_interval"),
     NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -411,6 +839,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_MAIN_CONF_OFFSET,
     offsetof(nchan_main_conf_t, redis_fakesub_timer_interval),
     NULL } ,
+  { ngx_string("nchan_redis_fakesub_timer_interval"), //alt for nchan_redis_fakesub_timer_interval
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, redis_fakesub_timer_interval),
+    NULL } ,
 
   { ngx_string("nchan_redis_idle_channel_cache_timeout"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -418,6 +852,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, redis_idle_channel_cache_timeout),
     NULL } ,
+  { ngx_string("nchan_redis_idle_channel_cache_timeout"), //alt for nchan_redis_idle_channel_cache_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis_idle_channel_cache_timeout),
+    NULL } ,
 
   { ngx_string("nchan_message_timeout"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -431,6 +871,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, message_timeout),
     NULL } ,
+  { ngx_string("nchan_message_timeout"), //alt for nchan_message_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_timeout,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, message_timeout),
+    NULL } ,
 
   { ngx_string("nchan_message_buffer_length"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -469,6 +915,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, subscribe_only_existing_channel),
     NULL } ,
+  { ngx_string("nchan_subscribe_existing_channels_only"), //alt for nchan_subscribe_existing_channels_only
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscribe_only_existing_channel),
+    NULL } ,
 
   { ngx_string("nchan_access_control_allow_origin"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -476,6 +928,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, allow_origin),
     NULL } ,
+  { ngx_string("nchan_access_control_allow_origin"), //alt for nchan_access_control_allow_origin
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, allow_origin),
+    NULL } ,
 
   { ngx_string("nchan_access_control_allow_credentials"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -483,6 +941,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, allow_credentials),
     NULL } ,
+  { ngx_string("nchan_access_control_allow_credentials"), //alt for nchan_access_control_allow_credentials
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, allow_credentials),
+    NULL } ,
 
   { ngx_string("nchan_channel_group"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -496,6 +960,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, channel_group),
     NULL } ,
+  { ngx_string("nchan_channel_group"), //alt for nchan_channel_group
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_group),
+    NULL } ,
 
   { ngx_string("nchan_channel_group_accounting"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -503,6 +973,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, group.enable_accounting),
     NULL } ,
+  { ngx_string("nchan_channel_group_accounting"), //alt for nchan_channel_group_accounting
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.enable_accounting),
+    NULL } ,
 
   { ngx_string("nchan_group_location"),
     NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3,
@@ -510,6 +986,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_group_location"), //alt for nchan_group_location
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3,
+    nchan_group_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_group_max_channels"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -517,6 +999,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, group.max_channels),
     NULL } ,
+  { ngx_string("nchan_group_max_channels"), //alt for nchan_group_max_channels
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_channels),
+    NULL } ,
 
   { ngx_string("nchan_group_max_messages"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -524,6 +1012,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, group.max_messages),
     NULL } ,
+  { ngx_string("nchan_group_max_messages"), //alt for nchan_group_max_messages
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_messages),
+    NULL } ,
 
   { ngx_string("nchan_group_max_messages_memory"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -531,6 +1025,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, group.max_messages_shm_bytes),
     NULL } ,
+  { ngx_string("nchan_group_max_messages_memory"), //alt for nchan_group_max_messages_memory
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_messages_shm_bytes),
+    NULL } ,
 
   { ngx_string("nchan_group_max_messages_disk"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -538,6 +1038,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, group.max_messages_file_bytes),
     NULL } ,
+  { ngx_string("nchan_group_max_messages_disk"), //alt for nchan_group_max_messages_disk
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_messages_file_bytes),
+    NULL } ,
 
   { ngx_string("nchan_group_max_subscribers"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -545,6 +1051,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, group.max_subscribers),
     NULL } ,
+  { ngx_string("nchan_group_max_subscribers"), //alt for nchan_group_max_subscribers
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_subscribers),
+    NULL } ,
 
   { ngx_string("nchan_channel_events_channel_id"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -552,6 +1064,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_channel_events_channel_id"), //alt for nchan_channel_events_channel_id
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_set_channel_events_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_stub_status"),
     NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
@@ -559,6 +1077,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_stub_status"), //alt for nchan_stub_status
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
+    nchan_stub_status_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_channel_event_string"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -566,6 +1090,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, channel_event_string),
     NULL } ,
+  { ngx_string("nchan_channel_event_string"), //alt for nchan_channel_event_string
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_event_string),
+    NULL } ,
 
   { ngx_string("nchan_max_channel_id_length"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -579,6 +1109,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, max_channel_id_length),
     NULL } ,
+  { ngx_string("nchan_max_channel_id_length"), //alt for nchan_max_channel_id_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_id_length),
+    NULL } ,
 
   { ngx_string("nchan_max_channel_subscribers"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -592,6 +1128,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, max_channel_subscribers),
     NULL } ,
+  { ngx_string("nchan_max_channel_subscribers"), //alt for nchan_max_channel_subscribers
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_subscribers),
+    NULL } ,
 
   { ngx_string("nchan_channel_timeout"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -605,6 +1147,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, channel_timeout),
     NULL } ,
+  { ngx_string("nchan_channel_timeout"), //alt for nchan_channel_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_timeout),
+    NULL } ,
 
   { ngx_string("nchan_storage_engine"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -612,6 +1160,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, storage_engine),
     NULL } ,
+  { ngx_string("nchan_storage_engine"), //alt for nchan_storage_engine
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_storage_engine,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, storage_engine),
+    NULL } ,
 
   { ngx_string("nchan_benchmark"),
     NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
@@ -619,6 +1173,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("nchan_benchmark"), //alt for nchan_benchmark
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
+    nchan_benchmark_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("nchan_benchmark_time"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -626,6 +1186,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, benchmark.time),
     NULL } ,
+  { ngx_string("nchan_benchmark_time"), //alt for nchan_benchmark_time
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.time),
+    NULL } ,
 
   { ngx_string("nchan_benchmark_messages_per_channel_per_minute"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -633,6 +1199,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, benchmark.msgs_per_minute),
     NULL } ,
+  { ngx_string("nchan_benchmark_messages_per_channel_per_minute"), //alt for nchan_benchmark_messages_per_channel_per_minute
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.msgs_per_minute),
+    NULL } ,
 
   { ngx_string("nchan_benchmark_message_padding_bytes"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -640,6 +1212,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, benchmark.msg_padding),
     NULL } ,
+  { ngx_string("nchan_benchmark_message_padding_bytes"), //alt for nchan_benchmark_message_padding_bytes
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.msg_padding),
+    NULL } ,
 
   { ngx_string("nchan_benchmark_channels"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -647,6 +1225,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, benchmark.channels),
     NULL } ,
+  { ngx_string("nchan_benchmark_channels"), //alt for nchan_benchmark_channels
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.channels),
+    NULL } ,
 
   { ngx_string("nchan_benchmark_subscribers_per_channel"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -654,6 +1238,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, benchmark.subscribers_per_channel),
     NULL } ,
+  { ngx_string("nchan_benchmark_subscribers_per_channel"), //alt for nchan_benchmark_subscribers_per_channel
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.subscribers_per_channel),
+    NULL } ,
 
   { ngx_string("nchan_benchmark_subscriber_distribution"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -661,6 +1251,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, benchmark.subscriber_distribution),
     NULL } ,
+  { ngx_string("nchan_benchmark_subscriber_distribution"), //alt for nchan_benchmark_subscriber_distribution
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_benchmark_subscriber_distribution_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.subscriber_distribution),
+    NULL } ,
 
   { ngx_string("nchan_benchmark_publisher_distribution"),
     NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -668,6 +1264,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     offsetof(nchan_loc_conf_t, benchmark.publisher_distribution),
     NULL } ,
+  { ngx_string("nchan_benchmark_publisher_distribution"), //alt for nchan_benchmark_publisher_distribution
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_benchmark_publisher_distribution_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.publisher_distribution),
+    NULL } ,
 
   { ngx_string("push_min_message_buffer_length"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -675,6 +1277,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("push_min_message_buffer_length"), //alt for push_min_message_buffer_length
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_obsolete_setting,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
   { ngx_string("push_subscriber_concurrency"),
     NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
@@ -682,6 +1290,12 @@ static ngx_command_t  nchan_commands[] = {
     NGX_HTTP_LOC_CONF_OFFSET,
     0,
     NULL } ,
+  { ngx_string("push_subscriber_concurrency"), //alt for push_subscriber_concurrency
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_subscriber_concurrency,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
 
 
   ngx_null_command
diff --git a/debian/modules/nchan/src/nchan_defs.h b/debian/modules/nchan/src/nchan_defs.h
index 0809080..0110c80 100644
--- a/debian/modules/nchan/src/nchan_defs.h
+++ b/debian/modules/nchan/src/nchan_defs.h
@@ -47,10 +47,13 @@
 #define NGX_HTTP_ACCEPTED 202
 #endif
 
-
 #define NCHAN_MESSAGE_RECEIVED  9000
 #define NCHAN_MESSAGE_QUEUED    9001
 
+#define NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST 1337
+
+#define NCHAN_SUBSCRIBER_INFO_CHANNEL_ID_BUFFER_SIZE 64
+
 extern const ngx_str_t NCHAN_HEADER_ETAG;
 extern const ngx_str_t NCHAN_HEADER_IF_NONE_MATCH;
 extern const ngx_str_t NCHAN_HEADER_VARY;
diff --git a/debian/modules/nchan/src/nchan_module.c b/debian/modules/nchan/src/nchan_module.c
index 4555c5d..f60e396 100644
--- a/debian/modules/nchan/src/nchan_module.c
+++ b/debian/modules/nchan/src/nchan_module.c
@@ -473,6 +473,164 @@ ngx_int_t nchan_group_handler(ngx_http_request_t *r) {
   return rc;
 }
 
+static ngx_int_t nchan_subscriber_info_handler_continued(ngx_int_t, void *, void *);
+static void nchan_subscriber_info_publish_info_request_after_subscribing(subscriber_t *, void *);
+
+ngx_int_t nchan_subscriber_info_handler(ngx_http_request_t *r) {
+  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
+    ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+    return NGX_ERROR;
+  } 
+  
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  
+  nchan_request_ctx_t    *ctx;
+  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
+  
+  
+  if(r->upstream && r->upstream->headers_in.x_accel_redirect) {
+    nchan_recover_x_accel_redirected_request_method(r);
+  }
+  
+  if(!nchan_match_origin_header(r, cf, ctx)) {
+    nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+    ctx->request_ran_content_handler = 1;
+    return NGX_OK;
+  }
+  
+  if(cf->redis.enabled && !nchan_store_redis_ready(cf)) {
+    nchan_respond_status(r, NGX_HTTP_SERVICE_UNAVAILABLE, NULL, NULL, 0);
+    return NGX_OK;
+  }
+  
+  ngx_int_t rc = cf->storage_engine->get_subscriber_info_id(cf, nchan_subscriber_info_handler_continued, r);
+  //get_unique_request is expected to never complete in the current event loop cycle.
+  if(rc == NGX_ERROR) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  
+  r->main->count++; //hold that request!
+  ctx->request_ran_content_handler = 1;
+  return NGX_DONE;
+}
+
+static ngx_int_t nchan_subscriber_info_handler_continued(ngx_int_t rc, void *d, void *pd) {
+  ngx_http_request_t     *r = pd;
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  
+  uintptr_t               response_id = (uintptr_t )d;
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ctx->subscriber_info_response_id = response_id;
+  
+  if(rc == NGX_ERROR) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  if(r->method == NGX_HTTP_OPTIONS) {
+    nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS, &NCHAN_ALLOW_GET);
+    return NGX_ERROR;
+  }
+  
+  ngx_str_t              *channel_id = nchan_get_subscriber_info_response_channel_id(r, response_id);
+  if(channel_id == NULL) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  subscriber_t *(*sub_create)(ngx_http_request_t *r, nchan_msg_id_t *msg_id) = NULL;
+  
+  if(nchan_detect_websocket_request(r)) {
+    if(!cf->sub.websocket) {
+      nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+      return NGX_ERROR;
+    }
+    sub_create = websocket_subscriber_create;
+  }
+  else if(r->method != NGX_HTTP_GET) {
+    nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  else {
+    if(cf->sub.eventsource && nchan_detect_eventsource_request(r)) {
+      sub_create = eventsource_subscriber_create;
+    }
+    else if(cf->sub.http_chunked && nchan_detect_chunked_subscriber_request(r)) {
+      sub_create = http_chunked_subscriber_create;
+    }
+    else if(cf->sub.http_multipart && nchan_detect_multipart_subscriber_request(r)) {
+      sub_create = http_multipart_subscriber_create;
+    }
+    else if(cf->sub.poll) {
+      sub_create = intervalpoll_subscriber_create;
+    }
+    else if(cf->sub.http_raw_stream) {
+      sub_create = http_raw_stream_subscriber_create;
+    }
+    else if(cf->sub.longpoll) {
+      sub_create = longpoll_subscriber_create;
+    }
+  }
+  
+  if(!sub_create) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  nchan_msg_id_t *msg_id;
+  if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
+    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Message ID invalid", 0);
+    return NGX_ERROR;
+  }
+  
+  subscriber_t *sub;
+  if((sub = sub_create(r, msg_id)) == NULL) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  if(sub->fn->set_enqueue_callback(sub, nchan_subscriber_info_publish_info_request_after_subscribing, r) != NGX_OK) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  if(sub->fn->subscribe(sub, channel_id) != NGX_OK) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t info_request_publish_callback(ngx_int_t status, void *d, void *pd) {
+  //whatever
+  return NGX_OK;
+}
+
+static void really_publish_info_request(void *pd) {
+  subscriber_t           *sub = pd;
+  ngx_http_request_t     *r = sub->request;
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_str_t              *channel_id;
+  if((channel_id = nchan_get_channel_id(r, PUB, 1))==NULL) {
+    sub->fn->respond_status(sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL);
+    return;
+  }
+  
+  cf->storage_engine->request_subscriber_info(channel_id, ctx->subscriber_info_response_id, cf, (callback_pt) &info_request_publish_callback, r);
+  nchan_update_stub_status(total_published_messages, 1);
+}
+
+static void nchan_subscriber_info_publish_info_request_after_subscribing(subscriber_t *sub, void *pd) {
+  //publishing needs to happen AFTER this subscriber has enqueued, not during.
+  nchan_add_oneshot_timer(really_publish_info_request, sub, 0);
+}
+
+
 ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
   nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
   ngx_str_t              *channel_id;
diff --git a/debian/modules/nchan/src/nchan_module.h b/debian/modules/nchan/src/nchan_module.h
index b337e54..c3230a5 100644
--- a/debian/modules/nchan/src/nchan_module.h
+++ b/debian/modules/nchan/src/nchan_module.h
@@ -45,6 +45,7 @@ extern int nchan_stub_status_enabled;
 ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r);
 ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r);
 ngx_int_t nchan_group_handler(ngx_http_request_t *r);
+ngx_int_t nchan_subscriber_info_handler(ngx_http_request_t *r);
 ngx_int_t nchan_benchmark_handler(ngx_http_request_t *r);
 
 time_t nchan_loc_conf_message_timeout(nchan_loc_conf_t *cf);
diff --git a/debian/modules/nchan/src/nchan_setup.c b/debian/modules/nchan/src/nchan_setup.c
index 8d416a0..efa2406 100644
--- a/debian/modules/nchan/src/nchan_setup.c
+++ b/debian/modules/nchan/src/nchan_setup.c
@@ -8,8 +8,13 @@
 #include <zlib.h>
 #endif
 
+static char *nchan_set_complex_value_array(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, nchan_complex_value_arr_t *chid);
+static ngx_int_t set_complex_value_array_size1(ngx_conf_t *cf, nchan_complex_value_arr_t *chid, char *val);
+
 static ngx_str_t      DEFAULT_CHANNEL_EVENT_STRING = ngx_string("$nchan_channel_event $nchan_channel_id");
 
+static ngx_str_t      DEFAULT_SUBSCRIBER_INFO_STRING = ngx_string("$nchan_subscriber_type $remote_addr:$remote_port $http_user_agent $server_name $request_uri $pid");
+
 nchan_store_t   *default_storage_engine = &nchan_store_memory;
 ngx_flag_t       global_nchan_enabled = 0;
 ngx_flag_t       global_redis_enabled = 0;
@@ -135,6 +140,10 @@ static void *nchan_create_srv_conf(ngx_conf_t *cf) {
   scf->redis.optimize_target = NCHAN_REDIS_OPTIMIZE_UNSET;
   scf->redis.master_weight = NGX_CONF_UNSET;
   scf->redis.slave_weight = NGX_CONF_UNSET;
+  scf->redis.blacklist_count = NGX_CONF_UNSET;
+  scf->redis.blacklist = NULL;
+  scf->redis.tls.enabled = NGX_CONF_UNSET;
+  scf->redis.tls.verify_certificate = NGX_CONF_UNSET;
   scf->upstream_nchan_loc_conf = NULL;
   return scf;
 }
@@ -145,6 +154,22 @@ static char *nchan_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) {
   MERGE_UNSET_CONF(conf->redis.optimize_target, prev->redis.optimize_target, NCHAN_REDIS_OPTIMIZE_UNSET, NCHAN_REDIS_OPTIMIZE_CPU);
   ngx_conf_merge_value(conf->redis.master_weight, prev->redis.master_weight, 1);
   ngx_conf_merge_value(conf->redis.slave_weight, prev->redis.slave_weight, 1);
+  ngx_conf_merge_value(conf->redis.blacklist_count, prev->redis.blacklist_count, 0);
+  if(conf->redis.blacklist == NULL) {
+    conf->redis.blacklist = prev->redis.blacklist;
+  }
+  ngx_conf_merge_value(conf->redis.tls.enabled, prev->redis.tls.enabled, 0);
+  ngx_conf_merge_value(conf->redis.tls.verify_certificate, prev->redis.tls.verify_certificate, 1);
+  ngx_conf_merge_str_value(conf->redis.tls.trusted_certificate, prev->redis.tls.trusted_certificate, "");
+    ngx_conf_merge_str_value(conf->redis.tls.trusted_certificate_path, prev->redis.tls.trusted_certificate_path, "");
+  ngx_conf_merge_str_value(conf->redis.tls.client_certificate, prev->redis.tls.client_certificate, "");
+  ngx_conf_merge_str_value(conf->redis.tls.client_certificate_key, prev->redis.tls.client_certificate_key, "");
+  ngx_conf_merge_str_value(conf->redis.tls.server_name, prev->redis.tls.server_name, "");
+  ngx_conf_merge_str_value(conf->redis.tls.ciphers, prev->redis.tls.ciphers, "");
+  
+  ngx_conf_merge_str_value(conf->redis.username, prev->redis.username, "");
+  ngx_conf_merge_str_value(conf->redis.password, prev->redis.password, "");
+  
   return NGX_CONF_OK;
 }
 
@@ -183,6 +208,9 @@ static void *nchan_create_loc_conf(ngx_conf_t *cf) {
   
   lcf->subscriber_first_message=NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET;
   
+  lcf->subscriber_info_string=NULL;
+  lcf->subscriber_info_location=NGX_CONF_UNSET;
+  
   lcf->subscriber_timeout=NGX_CONF_UNSET;
   lcf->subscribe_only_existing_channel=NGX_CONF_UNSET;
   lcf->redis_idle_channel_cache_timeout=NGX_CONF_UNSET;
@@ -218,6 +246,7 @@ static void *nchan_create_loc_conf(ngx_conf_t *cf) {
   ngx_memzero(&lcf->redis, sizeof(lcf->redis));
   lcf->redis.url_enabled=NGX_CONF_UNSET;
   lcf->redis.ping_interval = NGX_CONF_UNSET;
+  lcf->redis.cluster_check_interval=NGX_CONF_UNSET;
   lcf->redis.upstream_inheritable=NGX_CONF_UNSET;
   lcf->redis.storage_mode = REDIS_MODE_CONF_UNSET;
   lcf->redis.nostore_fastpublish = NGX_CONF_UNSET;
@@ -379,6 +408,15 @@ static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
     conf->subscriber_first_message = (prev->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) ? NCHAN_SUBSCRIBER_DEFAULT_FIRST_MESSAGE : prev->subscriber_first_message;
   }
   
+  MERGE_CONF(conf, prev, subscriber_info_string);
+  if(conf->subscriber_info_string == NULL) { //still null? use the default string
+    if(create_complex_value_from_ngx_str(cf, &conf->subscriber_info_string, &DEFAULT_SUBSCRIBER_INFO_STRING) == NGX_CONF_ERROR) {
+      return NGX_CONF_ERROR;
+    }
+  }
+  
+  ngx_conf_merge_value(conf->subscriber_info_location, prev->subscriber_info_location, 0);
+  
   ngx_conf_merge_sec_value(conf->websocket_ping_interval, prev->websocket_ping_interval, NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL);
   
   ngx_conf_merge_sec_value(conf->eventsource_ping.interval, prev->eventsource_ping.interval, NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL);
@@ -475,6 +513,10 @@ static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
     ngx_conf_merge_value(conf->redis.ping_interval, up->redis.ping_interval, NGX_CONF_UNSET);
   ngx_conf_merge_value(conf->redis.ping_interval, prev->redis.ping_interval, NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME);
   
+  if(up)
+    ngx_conf_merge_value(conf->redis.cluster_check_interval, up->redis.cluster_check_interval, NGX_CONF_UNSET);
+  ngx_conf_merge_value(conf->redis.cluster_check_interval, prev->redis.cluster_check_interval, NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_TIME);
+  
   if(up)
     ngx_conf_merge_value(conf->redis.nostore_fastpublish, up->redis.nostore_fastpublish, NGX_CONF_UNSET);
   ngx_conf_merge_value(conf->redis.nostore_fastpublish, prev->redis.nostore_fastpublish, 0);
@@ -685,6 +727,28 @@ static char *nchan_pubsub_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *co
   return NGX_CONF_OK;
 }
 
+static char *nchan_subscriber_info_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t     *lcf = conf;
+  nchan_conf_subscriber_types_t *subt = &lcf->sub;
+  
+  // doesn't make sense to have longpoll be the default HTTP subscriber, since channel info locations are likely to be curl'd by developers
+  subt->poll=0;
+  subt->http_raw_stream = 1;
+  subt->longpoll=0;
+  subt->websocket=1;
+  subt->eventsource=1;
+  subt->http_chunked=1;
+  subt->http_multipart=1;
+  
+  lcf->subscriber_info_location = 1;
+  
+  lcf->message_timeout=10;
+  lcf->complex_message_timeout = NULL;
+  
+  lcf->request_handler = &nchan_subscriber_info_handler;
+  return NGX_CONF_OK;
+}
+
 static char *nchan_group_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
   nchan_loc_conf_t     *lcf = conf;
   ngx_str_t            *val;
@@ -1018,11 +1082,13 @@ static char *nchan_set_pub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *
 }
 
 static char *nchan_set_sub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->sub_chid);
+  nchan_loc_conf_t *lcf = conf;
+  return nchan_set_complex_value_array(cf, cmd, conf, &lcf->sub_chid);
 }
 
 static char *nchan_set_pubsub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->pubsub_chid);
+  nchan_loc_conf_t *lcf = conf;
+  return nchan_set_complex_value_array(cf, cmd, conf, &lcf->pubsub_chid);
 }
 
 static char *nchan_subscriber_last_message_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
@@ -1133,7 +1199,7 @@ static char *nchan_set_raw_subscriber_separator(ngx_conf_t *cf, ngx_command_t *c
   nchan_loc_conf_t   *lcf = conf;
   ngx_str_t          *cf_val = &lcf->subscriber_http_raw_stream_separator;
   
-  if( val->data[val->len - 1] != '\n' ) { //must end in a newline
+  if( val->len && val->data[val->len - 1] != '\n' ) { //must end in a newline if not empty
     u_char   *cur;
     if((cur = ngx_palloc(cf->pool, val->len + 1)) == NULL) {
       return NGX_CONF_ERROR;
@@ -1315,6 +1381,119 @@ static char *ngx_conf_upstream_redis_server(ngx_conf_t *cf, ngx_command_t *cmd,
   return NGX_CONF_OK;
 }
 
+static void ipv6_prefix_size_to_mask(int prefix_size, struct in6_addr *mask) {
+  ngx_memzero(mask, sizeof(*mask));
+  int i;
+  for(i=0; prefix_size > 0; prefix_size-=8, i++) {
+    mask->s6_addr[i]= (prefix_size >= 8) ? 0xFF : (unsigned long)(0xFFU << (8 - prefix_size));
+  }
+}
+
+static void ipv4_prefix_size_to_mask(int prefix_size, struct in_addr *mask) {
+  mask->s_addr= (in_addr_t )(prefix_size > 0 ? htonl(~((1 << (32 - prefix_size)) - 1)) : 0);
+}
+
+static char *ngx_conf_set_redis_ip_blacklist(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_srv_conf_t    *scf = conf;
+  ngx_str_t           *cur;
+  ngx_str_t           *val = cf->args->elts;
+  int                  i;
+  nchan_redis_ip_range_t *blacklist = ngx_palloc(cf->pool, sizeof(*blacklist) * (cf->args->nelts - 1));
+  if(blacklist == NULL) {
+    return "couldn't allocate Redis server blacklist";
+  }
+  
+  scf->redis.blacklist = blacklist;
+  scf->redis.blacklist_count = cf->args->nelts - 1;
+  
+  for(i=1; i <= scf->redis.blacklist_count; i++) {
+    cur = &val[i];
+    nchan_redis_ip_range_t *entry = &blacklist[i-1];
+    entry->str = *cur;
+    int                     prefix_size;
+    u_char                 *slash = memchr(cur->data, '/', cur->len);
+    if(slash) {
+      prefix_size = ngx_atoi(slash+1, cur->len - (slash + 1 - cur->data));
+      if(prefix_size == NGX_ERROR) {
+        return "invalid CIDR range prefix size";
+      }
+    }
+    else {
+      prefix_size = -1;
+      slash = &cur->data[cur->len];
+    }
+    
+    char buf[64];
+    ngx_memzero(buf, sizeof(buf));
+    memcpy(buf, cur->data, (slash - cur->data));
+    
+    struct addrinfo hints = {0};
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags    = AI_PASSIVE;
+    
+    struct addrinfo *res;
+    if(getaddrinfo(buf, NULL, &hints, &res) != 0) {
+      return "unable to parse IP address";
+    }
+    entry->family = res->ai_family;
+    if(entry->family == AF_INET) {
+      struct sockaddr_in *sa = (struct sockaddr_in *)res->ai_addr;
+      entry->addr.ipv4 = sa->sin_addr;
+      entry->addr_block.ipv4 = sa->sin_addr;
+    }
+#ifdef AF_INET6
+    else if(entry->family == AF_INET6) {
+      struct sockaddr_in6 *sa = (struct sockaddr_in6 *)res->ai_addr;
+      entry->addr.ipv6 = sa->sin6_addr;
+      entry->addr_block.ipv6 = sa->sin6_addr;
+    }
+#endif
+    else {
+      return "invalid address family";
+    }
+    
+    if(prefix_size == 0) {
+      return "netmask size of 0 would block everything";
+    }
+    
+    if(prefix_size == -1) {
+      //no prefix size given, assume we're blacklisting single ip.
+      //prefix size depends on ipv4 or ipv6
+      prefix_size = entry->family == AF_INET ? 32 : 128;
+    }
+    entry->prefix_size = prefix_size;
+    
+    if(entry->family == AF_INET) {
+      if(prefix_size > 32) {
+        return "netmask size cannot exceed 32 for IPv4";
+      }
+      ipv4_prefix_size_to_mask(prefix_size, &entry->mask.ipv4);
+      entry->addr_block.ipv4.s_addr &= entry->mask.ipv4.s_addr;
+      
+    }
+#ifdef AF_INET6
+    else if(entry->family == AF_INET6) {
+      if(prefix_size > 128) {
+        return "netmask size cannot exceed 128 for IPv4";
+      }
+      ipv6_prefix_size_to_mask(prefix_size, &entry->mask.ipv6);
+      unsigned j;
+      uint8_t *addr = entry->addr_block.ipv6.s6_addr;
+      uint8_t *mask = entry->mask.ipv6.s6_addr;
+      for(j=0; j<sizeof(entry->addr_block.ipv6.s6_addr); j++) {
+        addr[j] &= mask[j];
+      }
+    }
+#endif
+    else {
+      return "invalid address family";
+    }
+    freeaddrinfo(res);
+  }
+  return NGX_OK;
+}
+
 static char *ngx_conf_set_str_slot_no_newlines(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
   ngx_str_t *val = cf->args->elts;
   ngx_str_t *arg = &val[1];
diff --git a/debian/modules/nchan/src/nchan_types.h b/debian/modules/nchan/src/nchan_types.h
index d8733c0..5a3890e 100644
--- a/debian/modules/nchan/src/nchan_types.h
+++ b/debian/modules/nchan/src/nchan_types.h
@@ -39,6 +39,7 @@ typedef struct {
   ngx_str_t                     url;
   ngx_flag_t                    url_enabled;
   time_t                        ping_interval;
+  time_t                        cluster_check_interval;
   ngx_str_t                     namespace;
   nchan_redis_storage_mode_t    storage_mode;
   ngx_int_t                     nostore_fastpublish;
@@ -221,6 +222,10 @@ typedef struct{
   ngx_int_t (*set_group_limits)(ngx_str_t *name, nchan_loc_conf_t *, nchan_group_limits_t *limits, callback_pt, void *);
   ngx_int_t (*delete_group)(ngx_str_t *name, nchan_loc_conf_t *, callback_pt, void *);
 
+  //subscriber info stuff
+  ngx_int_t (*get_subscriber_info_id)(nchan_loc_conf_t *,  callback_pt, void *);
+  ngx_int_t (*request_subscriber_info)(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *, callback_pt, void *);
+  
 } nchan_store_t;
 
 #define NCHAN_MULTI_SEP_CHR '\0'
@@ -271,12 +276,61 @@ typedef enum {
   NCHAN_REDIS_OPTIMIZE_BANDWIDTH = 2
 } nchan_redis_optimize_t;
 
+typedef struct {
+  int family;
+  int prefix_size;
+  ngx_str_t str;
+  struct {
+    union {
+      struct in_addr ipv4;
+#ifdef AF_INET6
+      struct in6_addr ipv6;
+      char            str[16];
+#endif
+    };
+  } addr;
+  struct {
+    union {
+      struct in_addr ipv4;
+#ifdef AF_INET6
+      struct in6_addr ipv6;
+      char            str[16];
+#endif
+    };
+  } addr_block;
+  struct {
+    union {
+      struct in_addr ipv4;
+#ifdef AF_INET6
+      struct in6_addr ipv6;
+#endif
+      char            str[16];
+    };
+  } mask;
+} nchan_redis_ip_range_t;
+
+typedef struct {
+  ngx_int_t         enabled;
+  ngx_str_t         trusted_certificate;
+  ngx_str_t         trusted_certificate_path;
+  ngx_str_t         client_certificate;
+  ngx_str_t         client_certificate_key;
+  ngx_str_t         server_name;
+  ngx_str_t         ciphers;
+  ngx_int_t         verify_certificate;
+} nchan_redis_tls_settings_t;
+
 typedef struct {
   struct {
       ngx_msec_t                    connect_timeout;
       nchan_redis_optimize_t        optimize_target;
       ngx_int_t                     master_weight;
       ngx_int_t                     slave_weight;
+      ngx_int_t                     blacklist_count;
+      nchan_redis_ip_range_t       *blacklist;
+      ngx_str_t                     username;
+      ngx_str_t                     password;
+      nchan_redis_tls_settings_t    tls;
   }                               redis;
   nchan_loc_conf_t                *upstream_nchan_loc_conf;
 } nchan_srv_conf_t;
@@ -359,6 +413,9 @@ struct nchan_loc_conf_s { //nchan_loc_conf_t
   
   ngx_int_t                       subscriber_first_message;
   
+  ngx_http_complex_value_t       *subscriber_info_string;
+  ngx_int_t                       subscriber_info_location;
+  
   ngx_http_complex_value_t       *channel_events_channel_id;
   ngx_http_complex_value_t       *channel_event_string;
   
@@ -393,6 +450,7 @@ typedef struct {
   ngx_int_t              (*dequeue)(struct subscriber_s *);
   ngx_int_t              (*respond_message)(struct subscriber_s *, nchan_msg_t *);
   ngx_int_t              (*respond_status)(struct subscriber_s *, ngx_int_t, const ngx_str_t *, ngx_chain_t *);
+  ngx_int_t              (*set_enqueue_callback)(subscriber_t *self, subscriber_callback_pt cb, void *privdata);
   ngx_int_t              (*set_dequeue_callback)(subscriber_t *self, subscriber_callback_pt cb, void *privdata);
   ngx_int_t              (*reserve)(struct subscriber_s *);
   ngx_int_t              (*release)(struct subscriber_s *, uint8_t nodestroy);
@@ -444,11 +502,17 @@ typedef struct {
   ngx_str_t                     *channel_event_name;
   ngx_str_t                      channel_id[NCHAN_MULTITAG_REQUEST_CTX_MAX];
   int                            channel_id_count;
+  time_t                         channel_subscriber_last_seen;
+  int                            channel_subscriber_count;
+  int                            channel_message_count;
   ngx_str_t                     *channel_group_name;
   
   ngx_str_t                     *request_origin_header;
   ngx_str_t                     *allow_origin;
   
+  ngx_int_t                      subscriber_info_response_id;
+  ngx_str_t                     *subscriber_info_response_channel_id;
+  
   unsigned                       sent_unsubscribe_request:1;
   unsigned                       request_ran_content_handler:1;
   
@@ -459,8 +523,10 @@ typedef struct {
   ngx_str_t     hostname;
   ngx_str_t     peername; // resolved hostname (ip address)
   ngx_int_t     port;
+  ngx_str_t     username;
   ngx_str_t     password;
   ngx_int_t     db;
+  ngx_int_t     use_tls;
 } redis_connect_params_t;
 
 #endif  /* NCHAN_TYPES_H */
diff --git a/debian/modules/nchan/src/nchan_variables.c b/debian/modules/nchan/src/nchan_variables.c
index fbf2944..8d31f2a 100644
--- a/debian/modules/nchan/src/nchan_variables.c
+++ b/debian/modules/nchan/src/nchan_variables.c
@@ -116,6 +116,47 @@ static ngx_int_t nchan_prev_message_id_variable(ngx_http_request_t *r, ngx_http_
   return NGX_OK;
 }
 
+static ngx_int_t nchan_channel_subscriber_last_seen_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[NGX_INT_T_LEN + 4];
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  ngx_str_t             str;
+  str.data = &buf[0];
+  str.len = ngx_sprintf(str.data, "%l", (long)ctx->channel_subscriber_last_seen) - str.data;
+  set_varval(v, str.data, str.len);  
+  return NGX_OK;
+}
+static ngx_int_t nchan_channel_subscriber_count_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[NGX_INT_T_LEN + 4];
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  ngx_str_t             str;
+  str.data = &buf[0];
+  str.len = ngx_sprintf(str.data, "%i", (int)ctx->channel_subscriber_count) - str.data;
+  set_varval(v, str.data, str.len);
+  return NGX_OK;
+}
+static ngx_int_t nchan_channel_message_count_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[NGX_INT_T_LEN + 4];
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  ngx_str_t             str;
+  str.data = &buf[0];
+  str.len = ngx_sprintf(str.data, "%i", (int)ctx->channel_message_count) - str.data;
+  set_varval(v, str.data, str.len); 
+  return NGX_OK;
+}
+
+
 /*
 static ngx_int_t nchan_message_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
   
@@ -191,6 +232,9 @@ nchan_variable_t nchan_vars[] = {
   { ngx_string("nchan_channel_id2"),        nchan_channel_id_variable, 1},
   { ngx_string("nchan_channel_id3"),        nchan_channel_id_variable, 2},
   { ngx_string("nchan_channel_id4"),        nchan_channel_id_variable, 3},
+  { ngx_string("nchan_channel_subscriber_last_seen"), nchan_channel_subscriber_last_seen_variable, 0},
+  { ngx_string("nchan_channel_subscriber_count"),     nchan_channel_subscriber_count_variable, 0},
+  { ngx_string("nchan_channel_message_count"),        nchan_channel_message_count_variable, 0},
   { ngx_string("nchan_channel_event"),      nchan_channel_event, 0},
   { ngx_string("nchan_subscriber_type"),    nchan_subscriber_type_variable, 0},
   { ngx_string("nchan_publisher_type"),     nchan_publisher_type_variable, 0},
diff --git a/debian/modules/nchan/src/nchan_version.h b/debian/modules/nchan/src/nchan_version.h
index a8c02ae..731f179 100644
--- a/debian/modules/nchan/src/nchan_version.h
+++ b/debian/modules/nchan/src/nchan_version.h
@@ -1 +1 @@
-#define NCHAN_VERSION "1.2.7"
+#define NCHAN_VERSION "1.2.15"
diff --git a/debian/modules/nchan/src/store/memory/ipc-handlers.c b/debian/modules/nchan/src/store/memory/ipc-handlers.c
index 8203b0c..5b7a6bc 100644
--- a/debian/modules/nchan/src/store/memory/ipc-handlers.c
+++ b/debian/modules/nchan/src/store/memory/ipc-handlers.c
@@ -350,7 +350,6 @@ ngx_int_t memstore_ipc_send_publish_notice(ngx_int_t dst, ngx_str_t *chid, ngx_i
 
 static void receive_publish_notice(ngx_int_t sender, publish_code_data_t *d) {
   memstore_channel_head_t       *chead;
-  
   if((chead = nchan_memstore_find_chanhead(d->shm_chid)) == NULL) {
     if(ngx_exiting || ngx_quit) {
       ERR("can't find chanhead for id %V, but it's okay.", d->shm_chid);
diff --git a/debian/modules/nchan/src/store/memory/memstore.c b/debian/modules/nchan/src/store/memory/memstore.c
index 2844220..4571659 100755
--- a/debian/modules/nchan/src/store/memory/memstore.c
+++ b/debian/modules/nchan/src/store/memory/memstore.c
@@ -32,14 +32,18 @@ static ngx_int_t redis_fakesub_timer_interval;
 
 #define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
 #define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
+#define WARN(fmt, args...) ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
 
 #else
 
 #define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
 #define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
+#define WARN(fmt, args...) ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
 
 #endif
 
+uint16_t  memstore_worker_generation;
+
 
 typedef struct {
   //memstore_channel_head_t       unbuffered_dummy_chanhead;
@@ -557,6 +561,7 @@ static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
     shdata->max_workers = NGX_CONF_UNSET;
     shdata->old_max_workers = NGX_CONF_UNSET;
     shdata->generation = 0;
+    shdata->subscriber_info_response_id = 1;
     shdata->total_active_workers = 0;
     shdata->current_active_workers = 0;
     shdata->reloading = 0;
@@ -2584,7 +2589,7 @@ static ngx_int_t nchan_store_async_get_multi_message_callback(ngx_int_t code, vo
 
 static void get_multimsg_timeout(ngx_event_t *ev) {
   get_multi_message_data_t    *d = (get_multi_message_data_t *)ev->data;
-  ERR("multimsg %p timeout!!", d);  
+  WARN("multimsg %p timeout!!", d);
   d->expired = ngx_time();
   
   memstore_chanhead_release(d->chanhead, "multimsg");
@@ -3024,16 +3029,18 @@ static ngx_int_t publish_multi_callback(ngx_int_t status, void *rptr, void *priv
     pd->rc = status;
   }
   
-  if(pd->ch.last_seen < ch->last_seen) {
-    pd->ch.last_seen = ch->last_seen;
+  if(ch) {
+    if(pd->ch.last_seen < ch->last_seen) {
+      pd->ch.last_seen = ch->last_seen;
+    }
+    
+    if(pd->ch.messages < ch->messages) {
+      pd->ch.messages = ch->messages;
+    }
+    
+    pd->ch.subscribers += ch->subscribers;
   }
   
-  if(pd->ch.messages < ch->messages) {
-    pd->ch.messages = ch->messages;
-  }
-  
-  pd->ch.subscribers += ch->subscribers;
-  
   pd->n--;
   
   if(pd->n == 0) {
@@ -3432,6 +3439,82 @@ static ngx_int_t nchan_store_delete_group(ngx_str_t *name, nchan_loc_conf_t *cf,
   return memstore_group_delete(groups, name, cb, pd);
 }
 
+typedef struct {
+  callback_pt       cb;
+  void             *pd;
+  nchan_loc_conf_t *lcf;
+} get_unique_request_id_data_t;
+
+static void get_unique_request_delay_callback(void *pd);
+static ngx_int_t nchan_store_get_subscriber_info_id(nchan_loc_conf_t *lcf, callback_pt cb, void *pd) {
+  
+  if(lcf->redis.enabled && lcf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+    return nchan_store_redis.get_subscriber_info_id(lcf, cb, pd);
+  }
+  
+  get_unique_request_id_data_t *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+  if(d == NULL) {
+    return NGX_ERROR;
+  }
+  
+  d->cb = cb;
+  d->pd = pd;
+  d->lcf = lcf;
+  
+  if(nchan_add_oneshot_timer(get_unique_request_delay_callback, d, 1) == NULL) {
+    return NGX_ERROR;
+  }
+  
+  return NGX_DONE;
+}
+
+static void get_unique_request_delay_callback(void *pd) {
+  get_unique_request_id_data_t *d = pd;
+  ngx_atomic_int_t id = ngx_atomic_fetch_add(&shdata->subscriber_info_response_id, 1);
+  
+  d->cb(NGX_OK, (void *)(uintptr_t )id, d->pd);
+  ngx_free(d);
+}
+
+static ngx_int_t nchan_store_request_subscriber_info_single_channel(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *lcf, callback_pt cb, void *pd) {
+  memstore_channel_head_t     *ch = nchan_memstore_get_chanhead(channel_id, lcf);
+  if(!ch || !ch->cf) {
+    return NGX_ERROR;
+  }
+  if(ch->cf->redis.enabled && ch->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+    return nchan_store_redis.request_subscriber_info(channel_id, request_id, ch->cf, cb, pd);
+  }
+  else {
+    if(ch->owner == memstore_slot()) {
+      return nchan_memstore_publish_notice(ch, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, (void *)(intptr_t )request_id);
+    }
+    else {
+      return memstore_ipc_send_publish_notice(ch->owner, channel_id, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, (void *)(intptr_t )request_id);
+    }
+  }
+}
+
+static ngx_int_t nchan_store_request_subscriber_info(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *lcf, callback_pt cb, void *pd) {
+  if(!nchan_channel_id_is_multi(channel_id)) {
+    return nchan_store_request_subscriber_info_single_channel(channel_id, request_id, lcf, cb, pd);
+  }
+  else {
+    //send the delete to all the individually multiplexed channels
+    ngx_int_t             i, n = 0;
+    ngx_str_t             ids[NCHAN_MULTITAG_MAX];
+    
+    n = parse_multi_id(channel_id, ids);
+
+    for(i=0; i<n; i++) {
+      ngx_int_t rc = nchan_store_request_subscriber_info_single_channel(channel_id, request_id, lcf, cb, pd);
+      if(rc != NGX_OK && rc != NGX_DONE) {
+        return rc;
+      }
+    }
+    return NGX_OK;
+  }
+}
+
 nchan_store_t  nchan_store_memory = {
    //init
   &nchan_store_init_module,
@@ -3454,6 +3537,8 @@ nchan_store_t  nchan_store_memory = {
   &nchan_store_get_group, //+callback
   &nchan_store_set_group_limits, //+callback
   &nchan_store_delete_group, //+callback
-    
+  
+  &nchan_store_get_subscriber_info_id, //+callback
+  &nchan_store_request_subscriber_info, //+callback
 };
 
diff --git a/debian/modules/nchan/src/store/memory/store-private.h b/debian/modules/nchan/src/store/memory/store-private.h
index e4a426a..c062274 100644
--- a/debian/modules/nchan/src/store/memory/store-private.h
+++ b/debian/modules/nchan/src/store/memory/store-private.h
@@ -5,6 +5,7 @@
 //#define MEMSTORE_CHANHEAD_RESERVE_DEBUG 1
 
 #define NCHAN_NOTICE_BUFFER_LOADED 0x356F
+#define NCHAN_NOTICE_CHANNEL_SUBSCRIBER_INFO_REQUEST 0x1337
 
 #if MEMSTORE_CHANHEAD_RESERVE_DEBUG
 #include <util/nchan_list.h>
@@ -122,6 +123,7 @@ typedef struct {
   ngx_atomic_int_t                   current_active_workers;
   ngx_atomic_int_t                   reloading;
   ngx_atomic_uint_t                  generation;
+  ngx_atomic_uint_t                  subscriber_info_response_id;
   
   nchan_loc_conf_shared_data_t      *conf_data;
   
@@ -172,6 +174,6 @@ ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *chanhead, const char *);
 void memstore_chanhead_release(memstore_channel_head_t *ch, char *label);
 void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label);
 
-uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
+extern uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
 
 #endif /*MEMSTORE_PRIVATE_HEADER*/
diff --git a/debian/modules/nchan/src/store/redis/hiredis/.gitignore b/debian/modules/nchan/src/store/redis/hiredis/.gitignore
index c44b5c5..056959f 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/.gitignore
+++ b/debian/modules/nchan/src/store/redis/hiredis/.gitignore
@@ -5,3 +5,5 @@
 /*.dylib
 /*.a
 /*.pc
+*.dSYM
+tags
diff --git a/debian/modules/nchan/src/store/redis/hiredis/.travis.yml b/debian/modules/nchan/src/store/redis/hiredis/.travis.yml
index 1e1ce30..f9a9460 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/.travis.yml
+++ b/debian/modules/nchan/src/store/redis/hiredis/.travis.yml
@@ -1,11 +1,40 @@
 language: c
-sudo: false
 compiler:
   - gcc
   - clang
 
+os:
+  - linux
+  - osx
+
+dist: bionic
+
+branches:
+  only:
+    - staging
+    - trying
+    - master
+    - /^release\/.*$/
+
+install:
+    - if [ "$BITS" == "64" ]; then
+        wget https://github.com/redis/redis/archive/6.0.6.tar.gz;
+        tar -xzvf 6.0.6.tar.gz;
+        pushd redis-6.0.6 && BUILD_TLS=yes make && export PATH=$PWD/src:$PATH && popd;
+      fi
+
+before_script:
+    - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+        curl -O https://distfiles.macports.org/MacPorts/MacPorts-2.6.2-10.13-HighSierra.pkg;
+        sudo installer -pkg MacPorts-2.6.2-10.13-HighSierra.pkg -target /;
+        export PATH=$PATH:/opt/local/bin && sudo port -v selfupdate;
+        sudo port -N install openssl redis;
+      fi;
+
 addons:
   apt:
+    sources:
+    - sourceline: 'ppa:chris-lea/redis-server'
     packages:
     - libc6-dbg
     - libc6-dev
@@ -13,12 +42,90 @@ addons:
     - libc6-dev-i386
     - libc6-dbg:i386
     - gcc-multilib
+    - g++-multilib
+    - libssl-dev
+    - libssl-dev:i386
     - valgrind
+    - redis
 
 env:
-    - CFLAGS="-Werror"
-    - PRE="valgrind --track-origins=yes --leak-check=full"
-    - TARGET="32bit" TARGET_VARS="32bit-vars" CFLAGS="-Werror"
-    - TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
+  - BITS="32"
+  - BITS="64"
 
-script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE" && make $TARGET_VARS hiredis-example
+script:
+  - EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON -DENABLE_SSL:BOOL=ON";
+    if [ "$BITS" == "64" ]; then
+      EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DENABLE_SSL_TESTS:BOOL=ON";
+    fi;
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      if [ "$BITS" == "32" ]; then
+        CFLAGS="-m32 -Werror";
+        CXXFLAGS="-m32 -Werror";
+        LDFLAGS="-m32";
+        EXTRA_CMAKE_OPTS=;
+      else
+        CFLAGS="-Werror";
+        CXXFLAGS="-Werror";
+      fi;
+    else
+      TEST_PREFIX="valgrind --track-origins=yes --leak-check=full";
+      if [ "$BITS" == "32" ]; then
+        CFLAGS="-m32 -Werror";
+        CXXFLAGS="-m32 -Werror";
+        LDFLAGS="-m32";
+        EXTRA_CMAKE_OPTS=;
+      else
+        CFLAGS="-Werror";
+        CXXFLAGS="-Werror";
+      fi;
+    fi;
+    export CFLAGS CXXFLAGS LDFLAGS TEST_PREFIX EXTRA_CMAKE_OPTS
+  - make && make clean;
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      if [ "$BITS" == "64" ]; then
+        OPENSSL_PREFIX="$(ls -d /usr/local/Cellar/openssl@1.1/*)" USE_SSL=1 make;
+      fi;
+    else
+      USE_SSL=1 make;
+    fi;
+  - mkdir build/ && cd build/
+  - cmake .. ${EXTRA_CMAKE_OPTS}
+  - make VERBOSE=1
+  - if [ "$BITS" == "64" ]; then
+      TEST_SSL=1 SKIPS_AS_FAILS=1 ctest -V;
+    else
+      SKIPS_AS_FAILS=1 ctest -V;
+    fi;
+
+jobs:
+  include:
+    # Windows MinGW cross compile on Linux
+    - os: linux
+      dist: xenial
+      compiler: mingw
+      addons:
+        apt:
+          packages:
+            - ninja-build
+            - gcc-mingw-w64-x86-64
+            - g++-mingw-w64-x86-64
+      script:
+        - mkdir build && cd build
+        - CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_WITH_INSTALL_RPATH=on
+        - ninja -v
+
+    # Windows MSVC 2017
+    - os: windows
+      compiler: msvc
+      env:
+        - MATRIX_EVAL="CC=cl.exe && CXX=cl.exe"
+      before_install:
+        - eval "${MATRIX_EVAL}"
+      install:
+        - choco install ninja
+        - choco install -y memurai-developer
+      script:
+        - mkdir build && cd build
+        - cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' amd64 '&&'
+          cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_EXAMPLES=ON '&&' ninja -v
+        - ./hiredis-test.exe
diff --git a/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md b/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md
index a5015c5..2a2bc31 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md
+++ b/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md
@@ -1,3 +1,258 @@
+## [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2) - (2021-10-07)
+
+Announcing Hiredis v1.0.2, which fixes CVE-2021-32765 but returns the SONAME to the correct value of `1.0.0`.
+
+- [Revert SONAME bump](https://github.com/redis/hiredis/commit/d4e6f109a064690cde64765c654e679fea1d3548)
+  ([Michael Grunder](https://github.com/michael-grunder))
+
+## [1.0.1](https://github.com/redis/hiredis/tree/v1.0.1) - (2021-10-04)
+
+<span style="color:red">This release erroneously bumped the SONAME, please use [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2)</span>
+
+Announcing Hiredis v1.0.1, a security release fixing CVE-2021-32765
+
+- Fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2)
+  [commit](https://github.com/redis/hiredis/commit/76a7b10005c70babee357a7d0f2becf28ec7ed1e)
+  ([Yossi Gottlieb](https://github.com/yossigo))
+
+_Thanks to [Yossi Gottlieb](https://github.com/yossigo) for the security fix and to [Microsoft Security Vulnerability Research](https://www.microsoft.com/en-us/msrc/msvr) for finding the bug._ :sparkling_heart:
+
+## [1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) - (2020-08-03)
+
+Announcing Hiredis v1.0.0, which adds support for RESP3, SSL connections, allocator injection, and better Windows support! :tada:
+
+_A big thanks to everyone who helped with this release.  The following list includes everyone who contributed at least five lines, sorted by lines contributed._ :sparkling_heart:
+
+[Michael Grunder](https://github.com/michael-grunder), [Yossi Gottlieb](https://github.com/yossigo),
+[Mark Nunberg](https://github.com/mnunberg), [Marcus Geelnard](https://github.com/mbitsnbites),
+[Justin Brewer](https://github.com/justinbrewer), [Valentino Geron](https://github.com/valentinogeron),
+[Minun Dragonation](https://github.com/dragonation), [Omri Steiner](https://github.com/OmriSteiner),
+[Sangmoon Yi](https://github.com/jman-krafton), [Jinjiazh](https://github.com/jinjiazhang),
+[Odin Hultgren Van Der Horst](https://github.com/Miniwoffer), [Muhammad Zahalqa](https://github.com/tryfinally),
+[Nick Rivera](https://github.com/heronr), [Qi Yang](https://github.com/movebean),
+[kevin1018](https://github.com/kevin1018)
+
+[Full Changelog](https://github.com/redis/hiredis/compare/v0.14.1...v1.0.0)
+
+**BREAKING CHANGES**:
+
+* `redisOptions` now has two timeout fields.  One for connecting, and one for commands.  If you're presently using `options->timeout` you will need to change it to use `options->connect_timeout`. (See [example](https://github.com/redis/hiredis/commit/38b5ae543f5c99eb4ccabbe277770fc6bc81226f#diff-86ba39d37aa829c8c82624cce4f049fbL36))
+
+* Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now protocol errors. This is consistent
+  with the RESP specification. On 32-bit platforms, the upper bound is lowered to `SIZE_MAX`.
+
+* `redisReplyObjectFunctions.createArray` now takes `size_t` for its length parameter.
+
+**New features:**
+- Support for RESP3
+  [\#697](https://github.com/redis/hiredis/pull/697),
+  [\#805](https://github.com/redis/hiredis/pull/805),
+  [\#819](https://github.com/redis/hiredis/pull/819),
+  [\#841](https://github.com/redis/hiredis/pull/841)
+  ([Yossi Gottlieb](https://github.com/yossigo), [Michael Grunder](https://github.com/michael-grunder))
+- Support for SSL connections
+  [\#645](https://github.com/redis/hiredis/pull/645),
+  [\#699](https://github.com/redis/hiredis/pull/699),
+  [\#702](https://github.com/redis/hiredis/pull/702),
+  [\#708](https://github.com/redis/hiredis/pull/708),
+  [\#711](https://github.com/redis/hiredis/pull/711),
+  [\#821](https://github.com/redis/hiredis/pull/821),
+  [more](https://github.com/redis/hiredis/pulls?q=is%3Apr+is%3Amerged+SSL)
+  ([Mark Nunberg](https://github.com/mnunberg), [Yossi Gottlieb](https://github.com/yossigo))
+- Run-time allocator injection
+  [\#800](https://github.com/redis/hiredis/pull/800)
+  ([Michael Grunder](https://github.com/michael-grunder))
+- Improved Windows support (including MinGW and Windows CI)
+  [\#652](https://github.com/redis/hiredis/pull/652),
+  [\#663](https://github.com/redis/hiredis/pull/663)
+  ([Marcus Geelnard](https://www.bitsnbites.eu/author/m/))
+- Adds support for distinct connect and command timeouts
+  [\#839](https://github.com/redis/hiredis/pull/839),
+  [\#829](https://github.com/redis/hiredis/pull/829)
+  ([Valentino Geron](https://github.com/valentinogeron))
+- Add generic pointer and destructor to `redisContext` that users can use for context.
+  [\#855](https://github.com/redis/hiredis/pull/855)
+  ([Michael Grunder](https://github.com/michael-grunder))
+
+**Closed issues (that involved code changes):**
+
+- Makefile does not install TLS libraries  [\#809](https://github.com/redis/hiredis/issues/809)
+- redisConnectWithOptions should not set command timeout [\#722](https://github.com/redis/hiredis/issues/722), [\#829](https://github.com/redis/hiredis/pull/829) ([valentinogeron](https://github.com/valentinogeron))
+- Fix integer overflow in `sdsrange` [\#827](https://github.com/redis/hiredis/issues/827)
+- INFO & CLUSTER commands failed when using RESP3 [\#802](https://github.com/redis/hiredis/issues/802)
+- Windows compatibility patches [\#687](https://github.com/redis/hiredis/issues/687), [\#838](https://github.com/redis/hiredis/issues/838), [\#842](https://github.com/redis/hiredis/issues/842)
+- RESP3 PUSH messages incorrectly use pending callback [\#825](https://github.com/redis/hiredis/issues/825)
+- Asynchronous PSUBSCRIBE command fails when using RESP3 [\#815](https://github.com/redis/hiredis/issues/815)
+- New SSL API [\#804](https://github.com/redis/hiredis/issues/804), [\#813](https://github.com/redis/hiredis/issues/813)
+- Hard-coded limit of nested reply depth [\#794](https://github.com/redis/hiredis/issues/794)
+- Fix TCP_NODELAY in Windows/OSX [\#679](https://github.com/redis/hiredis/issues/679), [\#690](https://github.com/redis/hiredis/issues/690), [\#779](https://github.com/redis/hiredis/issues/779), [\#785](https://github.com/redis/hiredis/issues/785),
+- Added timers to libev adapter.  [\#778](https://github.com/redis/hiredis/issues/778), [\#795](https://github.com/redis/hiredis/pull/795)
+- Initialization discards const qualifier [\#777](https://github.com/redis/hiredis/issues/777)
+- \[BUG\]\[MinGW64\] Error setting socket timeout  [\#775](https://github.com/redis/hiredis/issues/775)
+- undefined reference to hi_malloc [\#769](https://github.com/redis/hiredis/issues/769)
+- hiredis pkg-config file incorrectly ignores multiarch libdir spec'n [\#767](https://github.com/redis/hiredis/issues/767)
+- Don't use -G to build shared object on Solaris [\#757](https://github.com/redis/hiredis/issues/757)
+- error when make USE\_SSL=1 [\#748](https://github.com/redis/hiredis/issues/748)
+- Allow to change SSL Mode [\#646](https://github.com/redis/hiredis/issues/646)
+- hiredis/adapters/libevent.h memleak [\#618](https://github.com/redis/hiredis/issues/618)
+- redisLibuvPoll crash when server closes the connetion [\#545](https://github.com/redis/hiredis/issues/545)
+- about redisAsyncDisconnect question [\#518](https://github.com/redis/hiredis/issues/518)
+- hiredis adapters libuv error for help [\#508](https://github.com/redis/hiredis/issues/508)
+- API/ABI changes analysis [\#506](https://github.com/redis/hiredis/issues/506)
+- Memory leak patch in Redis [\#502](https://github.com/redis/hiredis/issues/502)
+- Remove the depth limitation [\#421](https://github.com/redis/hiredis/issues/421)
+
+**Merged pull requests:**
+
+- Move SSL management to a distinct private pointer [\#855](https://github.com/redis/hiredis/pull/855) ([michael-grunder](https://github.com/michael-grunder))
+- Move include to sockcompat.h to maintain style [\#850](https://github.com/redis/hiredis/pull/850) ([michael-grunder](https://github.com/michael-grunder))
+- Remove erroneous tag and add license to push example [\#849](https://github.com/redis/hiredis/pull/849) ([michael-grunder](https://github.com/michael-grunder))
+- fix windows compiling with mingw [\#848](https://github.com/redis/hiredis/pull/848) ([rmalizia44](https://github.com/rmalizia44))
+- Some Windows quality of life improvements. [\#846](https://github.com/redis/hiredis/pull/846) ([michael-grunder](https://github.com/michael-grunder))
+- Use \_WIN32 define instead of WIN32 [\#845](https://github.com/redis/hiredis/pull/845) ([michael-grunder](https://github.com/michael-grunder))
+- Non Linux CI fixes [\#844](https://github.com/redis/hiredis/pull/844) ([michael-grunder](https://github.com/michael-grunder))
+- Resp3 oob push support [\#841](https://github.com/redis/hiredis/pull/841) ([michael-grunder](https://github.com/michael-grunder))
+- fix \#785: defer TCP\_NODELAY in async tcp connections [\#836](https://github.com/redis/hiredis/pull/836) ([OmriSteiner](https://github.com/OmriSteiner))
+- sdsrange overflow fix [\#830](https://github.com/redis/hiredis/pull/830) ([michael-grunder](https://github.com/michael-grunder))
+- Use explicit pointer casting for c++ compatibility [\#826](https://github.com/redis/hiredis/pull/826) ([aureus1](https://github.com/aureus1))
+- Document allocator injection and completeness fix in test.c [\#824](https://github.com/redis/hiredis/pull/824) ([michael-grunder](https://github.com/michael-grunder))
+- Use unique names for allocator struct members [\#823](https://github.com/redis/hiredis/pull/823) ([michael-grunder](https://github.com/michael-grunder))
+- New SSL API to replace redisSecureConnection\(\). [\#821](https://github.com/redis/hiredis/pull/821) ([yossigo](https://github.com/yossigo))
+- Add logic to handle RESP3 push messages [\#819](https://github.com/redis/hiredis/pull/819) ([michael-grunder](https://github.com/michael-grunder))
+- Use standrad isxdigit instead of custom helper function. [\#814](https://github.com/redis/hiredis/pull/814) ([tryfinally](https://github.com/tryfinally))
+- Fix missing SSL build/install options. [\#812](https://github.com/redis/hiredis/pull/812) ([yossigo](https://github.com/yossigo))
+- Add link to ABI tracker [\#808](https://github.com/redis/hiredis/pull/808) ([michael-grunder](https://github.com/michael-grunder))
+- Resp3 verbatim string support [\#805](https://github.com/redis/hiredis/pull/805) ([michael-grunder](https://github.com/michael-grunder))
+- Allow users to replace allocator and handle OOM everywhere. [\#800](https://github.com/redis/hiredis/pull/800) ([michael-grunder](https://github.com/michael-grunder))
+- Remove nested depth limitation. [\#797](https://github.com/redis/hiredis/pull/797) ([michael-grunder](https://github.com/michael-grunder))
+- Attempt to fix compilation on Solaris [\#796](https://github.com/redis/hiredis/pull/796) ([michael-grunder](https://github.com/michael-grunder))
+- Support timeouts in libev adapater [\#795](https://github.com/redis/hiredis/pull/795) ([michael-grunder](https://github.com/michael-grunder))
+- Fix pkgconfig when installing to a custom lib dir [\#793](https://github.com/redis/hiredis/pull/793) ([michael-grunder](https://github.com/michael-grunder))
+- Fix USE\_SSL=1 make/cmake on OSX and CMake tests [\#789](https://github.com/redis/hiredis/pull/789) ([michael-grunder](https://github.com/michael-grunder))
+- Use correct libuv call on Windows [\#784](https://github.com/redis/hiredis/pull/784) ([michael-grunder](https://github.com/michael-grunder))
+- Added CMake package config and fixed hiredis\_ssl on Windows [\#783](https://github.com/redis/hiredis/pull/783) ([michael-grunder](https://github.com/michael-grunder))
+- CMake: Set hiredis\_ssl shared object version. [\#780](https://github.com/redis/hiredis/pull/780) ([yossigo](https://github.com/yossigo))
+- Win32 tests and timeout fix [\#776](https://github.com/redis/hiredis/pull/776) ([michael-grunder](https://github.com/michael-grunder))
+- Provides an optional cleanup callback for async data. [\#768](https://github.com/redis/hiredis/pull/768) ([heronr](https://github.com/heronr))
+- Housekeeping fixes [\#764](https://github.com/redis/hiredis/pull/764) ([michael-grunder](https://github.com/michael-grunder))
+- install alloc.h [\#756](https://github.com/redis/hiredis/pull/756) ([ch1aki](https://github.com/ch1aki))
+- fix spelling mistakes [\#746](https://github.com/redis/hiredis/pull/746) ([ShooterIT](https://github.com/ShooterIT))
+- Free the reply in redisGetReply when passed NULL [\#741](https://github.com/redis/hiredis/pull/741) ([michael-grunder](https://github.com/michael-grunder))
+- Fix dead code in sslLogCallback relating to should\_log variable. [\#737](https://github.com/redis/hiredis/pull/737) ([natoscott](https://github.com/natoscott))
+- Fix typo in dict.c. [\#731](https://github.com/redis/hiredis/pull/731) ([Kevin-Xi](https://github.com/Kevin-Xi))
+- Adding an option to DISABLE\_TESTS [\#727](https://github.com/redis/hiredis/pull/727) ([pbotros](https://github.com/pbotros))
+- Update README with SSL support. [\#720](https://github.com/redis/hiredis/pull/720) ([yossigo](https://github.com/yossigo))
+- Fixes leaks in unit tests [\#715](https://github.com/redis/hiredis/pull/715) ([michael-grunder](https://github.com/michael-grunder))
+- SSL Tests [\#711](https://github.com/redis/hiredis/pull/711) ([yossigo](https://github.com/yossigo))
+- SSL Reorganization [\#708](https://github.com/redis/hiredis/pull/708) ([yossigo](https://github.com/yossigo))
+- Fix MSVC build. [\#706](https://github.com/redis/hiredis/pull/706) ([yossigo](https://github.com/yossigo))
+- SSL: Properly report SSL\_connect\(\) errors. [\#702](https://github.com/redis/hiredis/pull/702) ([yossigo](https://github.com/yossigo))
+- Silent SSL trace to stdout by default. [\#699](https://github.com/redis/hiredis/pull/699) ([yossigo](https://github.com/yossigo))
+- Port RESP3 support from Redis. [\#697](https://github.com/redis/hiredis/pull/697) ([yossigo](https://github.com/yossigo))
+- Removed whitespace before newline [\#691](https://github.com/redis/hiredis/pull/691) ([Miniwoffer](https://github.com/Miniwoffer))
+- Add install adapters header files [\#688](https://github.com/redis/hiredis/pull/688) ([kevin1018](https://github.com/kevin1018))
+- Remove unnecessary null check before free [\#684](https://github.com/redis/hiredis/pull/684) ([qlyoung](https://github.com/qlyoung))
+- redisReaderGetReply leak memory [\#671](https://github.com/redis/hiredis/pull/671) ([movebean](https://github.com/movebean))
+- fix timeout code in windows [\#670](https://github.com/redis/hiredis/pull/670) ([jman-krafton](https://github.com/jman-krafton))
+- test: fix errstr matching for musl libc [\#665](https://github.com/redis/hiredis/pull/665) ([ghost](https://github.com/ghost))
+- Windows: MinGW fixes and Windows Travis builders [\#663](https://github.com/redis/hiredis/pull/663) ([mbitsnbites](https://github.com/mbitsnbites))
+- The setsockopt and getsockopt API diffs from BSD socket and WSA one [\#662](https://github.com/redis/hiredis/pull/662) ([dragonation](https://github.com/dragonation))
+- Fix Compile Error On Windows \(Visual Studio\) [\#658](https://github.com/redis/hiredis/pull/658) ([jinjiazhang](https://github.com/jinjiazhang))
+- Fix NXDOMAIN test case [\#653](https://github.com/redis/hiredis/pull/653) ([michael-grunder](https://github.com/michael-grunder))
+- Add MinGW support [\#652](https://github.com/redis/hiredis/pull/652) ([mbitsnbites](https://github.com/mbitsnbites))
+- SSL Support [\#645](https://github.com/redis/hiredis/pull/645) ([mnunberg](https://github.com/mnunberg))
+- Fix Invalid argument after redisAsyncConnectUnix [\#644](https://github.com/redis/hiredis/pull/644) ([codehz](https://github.com/codehz))
+- Makefile: use predefined AR [\#632](https://github.com/redis/hiredis/pull/632) ([Mic92](https://github.com/Mic92))
+- FreeBSD  build fix [\#628](https://github.com/redis/hiredis/pull/628) ([devnexen](https://github.com/devnexen))
+- Fix errors not propagating properly with libuv.h. [\#624](https://github.com/redis/hiredis/pull/624) ([yossigo](https://github.com/yossigo))
+- Update README.md [\#621](https://github.com/redis/hiredis/pull/621) ([Crunsher](https://github.com/Crunsher))
+- Fix redisBufferRead documentation [\#620](https://github.com/redis/hiredis/pull/620) ([hacst](https://github.com/hacst))
+- Add CPPFLAGS to REAL\_CFLAGS [\#614](https://github.com/redis/hiredis/pull/614) ([thomaslee](https://github.com/thomaslee))
+- Update createArray to take size\_t [\#597](https://github.com/redis/hiredis/pull/597) ([justinbrewer](https://github.com/justinbrewer))
+- fix common realloc mistake and add null check more [\#580](https://github.com/redis/hiredis/pull/580) ([charsyam](https://github.com/charsyam))
+- Proper error reporting for connect failures [\#578](https://github.com/redis/hiredis/pull/578) ([mnunberg](https://github.com/mnunberg))
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
+
+## [1.0.0-rc1](https://github.com/redis/hiredis/tree/v1.0.0-rc1) - (2020-07-29)
+
+_Note:  There were no changes to code between v1.0.0-rc1 and v1.0.0 so see v1.0.0 for changelog_
+
+### 0.14.1 (2020-03-13)
+
+* Adds safe allocation wrappers (CVE-2020-7105, #747, #752) (Michael Grunder)
+
+### 0.14.0 (2018-09-25)
+**BREAKING CHANGES**:
+
+* Change `redisReply.len` to `size_t`, as it denotes the the size of a string
+
+  User code should compare this to `size_t` values as well.
+  If it was used to compare to other values, casting might be necessary or can be removed, if casting was applied before.
+
+* Make string2ll static to fix conflict with Redis (Tom Lee [c3188b])
+* Use -dynamiclib instead of -shared for OSX (Ryan Schmidt [a65537])
+* Use string2ll from Redis w/added tests (Michael Grunder [7bef04, 60f622])
+* Makefile - OSX compilation fixes (Ryan Schmidt [881fcb, 0e9af8])
+* Remove redundant NULL checks (Justin Brewer [54acc8, 58e6b8])
+* Fix bulk and multi-bulk length truncation (Justin Brewer [109197])
+* Fix SIGSEGV in OpenBSD by checking for NULL before calling freeaddrinfo (Justin Brewer [546d94])
+* Several POSIX compatibility fixes (Justin Brewer [bbeab8, 49bbaa, d1c1b6])
+* Makefile - Compatibility fixes (Dimitri Vorobiev [3238cf, 12a9d1])
+* Makefile - Fix make install on FreeBSD (Zach Shipko [a2ef2b])
+* Makefile - don't assume $(INSTALL) is cp (Igor Gnatenko [725a96])
+* Separate side-effect causing function from assert and small cleanup (amallia [b46413, 3c3234])
+* Don't send negative values to `__redisAsyncCommand` (Frederik Deweerdt [706129])
+* Fix leak if setsockopt fails (Frederik Deweerdt [e21c9c])
+* Fix libevent leak (zfz [515228])
+* Clean up GCC warning (Ichito Nagata [2ec774])
+* Keep track of errno in `__redisSetErrorFromErrno()` as snprintf may use it (Jin Qing [25cd88])
+* Solaris compilation fix (Donald Whyte [41b07d])
+* Reorder linker arguments when building examples (Tustfarm-heart [06eedd])
+* Keep track of subscriptions in case of rapid subscribe/unsubscribe (Hyungjin Kim [073dc8, be76c5, d46999])
+* libuv use after free fix (Paul Scott [cbb956])
+* Properly close socket fd on reconnect attempt (WSL [64d1ec])
+* Skip valgrind in OSX tests (Jan-Erik Rediger [9deb78])
+* Various updates for Travis testing OSX (Ted Nyman [fa3774, 16a459, bc0ea5])
+* Update libevent (Chris Xin [386802])
+* Change sds.h for building in C++ projects (Ali Volkan ATLI [f5b32e])
+* Use proper format specifier in redisFormatSdsCommandArgv (Paulino Huerta, Jan-Erik Rediger [360a06, 8655a6])
+* Better handling of NULL reply in example code (Jan-Erik Rediger [1b8ed3])
+* Prevent overflow when formatting an error (Jan-Erik Rediger [0335cb])
+* Compatibility fix for strerror_r (Tom Lee [bb1747])
+* Properly detect integer parse/overflow errors (Justin Brewer [93421f])
+* Adds CI for Windows and cygwin fixes (owent, [6c53d6, 6c3e40])
+* Catch a buffer overflow when formatting the error message
+* Import latest upstream sds. This breaks applications that are linked against the old hiredis v0.13
+* Fix warnings, when compiled with -Wshadow
+* Make hiredis compile in Cygwin on Windows, now CI-tested
+* Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
+  protocol errors. This is consistent with the RESP specification. On 32-bit
+  platforms, the upper bound is lowered to `SIZE_MAX`.
+
+* Remove backwards compatibility macro's
+
+This removes the following old function aliases, use the new name now:
+
+| Old                         | New                    |
+| --------------------------- | ---------------------- |
+| redisReplyReaderCreate      | redisReaderCreate      |
+| redisReplyReaderCreate      | redisReaderCreate      |
+| redisReplyReaderFree        | redisReaderFree        |
+| redisReplyReaderFeed        | redisReaderFeed        |
+| redisReplyReaderGetReply    | redisReaderGetReply    |
+| redisReplyReaderSetPrivdata | redisReaderSetPrivdata |
+| redisReplyReaderGetObject   | redisReaderGetObject   |
+| redisReplyReaderGetError    | redisReaderGetError    |
+
+* The `DEBUG` variable in the Makefile was renamed to `DEBUG_FLAGS`
+
+Previously it broke some builds for people that had `DEBUG` set to some arbitrary value,
+due to debugging other software.
+By renaming we avoid unintentional name clashes.
+
+Simply rename `DEBUG` to `DEBUG_FLAGS` in your environment to make it working again.
+
 ### 0.13.3 (2015-09-16)
 
 * Revert "Clear `REDIS_CONNECTED` flag when connection is closed".
@@ -55,7 +310,7 @@ The parser, standalone since v0.12.0, can now be compiled on Windows
 
 * Add IPv6 support
 
-* Remove possiblity of multiple close on same fd
+* Remove possibility of multiple close on same fd
 
 * Add ability to bind source address on connect
 
@@ -107,4 +362,3 @@ The parser, standalone since v0.12.0, can now be compiled on Windows
 ### 0.10.0
 
 * See commit log.
-
diff --git a/debian/modules/nchan/src/store/redis/hiredis/Makefile b/debian/modules/nchan/src/store/redis/hiredis/Makefile
index cff2a84..a8d37a2 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/Makefile
+++ b/debian/modules/nchan/src/store/redis/hiredis/Makefile
@@ -3,11 +3,17 @@
 # Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
 # This file is released under the BSD license, see the COPYING file
 
-OBJ=net.o hiredis.o sds.o async.o read.o
-EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib
+OBJ=alloc.o net.o hiredis.o sds.o async.o read.o sockcompat.o
+SSL_OBJ=ssl.o
+EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib hiredis-example-push
+ifeq ($(USE_SSL),1)
+EXAMPLES+=hiredis-example-ssl hiredis-example-libevent-ssl
+endif
 TESTS=hiredis-test
 LIBNAME=libhiredis
 PKGCONFNAME=hiredis.pc
+SSL_LIBNAME=libhiredis_ssl
+SSL_PKGCONFNAME=hiredis_ssl.pc
 
 HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}')
 HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}')
@@ -36,71 +42,125 @@ endef
 export REDIS_TEST_CONFIG
 
 # Fallback to gcc when $CC is not in $PATH.
-CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
-CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
 OPTIMIZATION?=-O3
-WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
-DEBUG?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
-REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
+WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+DEBUG_FLAGS?= -g -ggdb
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+REAL_LDFLAGS=$(LDFLAGS)
 
 DYLIBSUFFIX=so
 STLIBSUFFIX=a
 DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
 DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
 DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
-DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+
+DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME)
 STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
-STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
+STLIB_MAKE_CMD=$(AR) rcs
+
+SSL_DYLIB_MINOR_NAME=$(SSL_LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
+SSL_DYLIB_MAJOR_NAME=$(SSL_LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
+SSL_DYLIBNAME=$(SSL_LIBNAME).$(DYLIBSUFFIX)
+SSL_STLIBNAME=$(SSL_LIBNAME).$(STLIBSUFFIX)
+SSL_DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(SSL_DYLIB_MINOR_NAME)
 
 # Platform-specific overrides
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+
+USE_SSL?=0
+
+# This is required for test.c only
+ifeq ($(USE_SSL),1)
+  CFLAGS+=-DHIREDIS_TEST_SSL
+endif
+
+ifeq ($(uname_S),Linux)
+  SSL_LDFLAGS=-lssl -lcrypto
+else
+  OPENSSL_PREFIX?=/usr/local/opt/openssl
+  CFLAGS+=-I$(OPENSSL_PREFIX)/include
+  SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
+endif
+
 ifeq ($(uname_S),SunOS)
+  IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
+  ifeq ($(IS_SUN_CC),1)
+    SUN_SHARED_FLAG=-G
+  else
+    SUN_SHARED_FLAG=-shared
+  endif
   REAL_LDFLAGS+= -ldl -lnsl -lsocket
-  DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-  INSTALL= cp -r
+  DYLIB_MAKE_CMD=$(CC) $(SUN_SHARED_FLAG) -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
+  SSL_DYLIB_MAKE_CMD=$(CC) $(SUN_SHARED_FLAG) -o $(SSL_DYLIBNAME) -h $(SSL_DYLIB_MINOR_NAME) $(LDFLAGS) $(SSL_LDFLAGS)
 endif
 ifeq ($(uname_S),Darwin)
   DYLIBSUFFIX=dylib
   DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
-  DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+  DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+  SSL_DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME) -o $(SSL_DYLIBNAME) $(LDFLAGS) $(SSL_LDFLAGS)
+  DYLIB_PLUGIN=-Wl,-undefined -Wl,dynamic_lookup
 endif
 
 all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
+ifeq ($(USE_SSL),1)
+all: $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(SSL_PKGCONFNAME)
+endif
 
 # Deps (use make dep to generate this)
-async.o: async.c fmacros.h async.h hiredis.h read.h sds.h net.h dict.c dict.h
-dict.o: dict.c fmacros.h dict.h
-hiredis.o: hiredis.c fmacros.h hiredis.h read.h sds.h net.h
-net.o: net.c fmacros.h net.h hiredis.h read.h sds.h
-read.o: read.c fmacros.h read.h sds.h
-sds.o: sds.c sds.h
-test.o: test.c fmacros.h hiredis.h read.h sds.h
+alloc.o: alloc.c fmacros.h alloc.h
+async.o: async.c fmacros.h alloc.h async.h hiredis.h read.h sds.h net.h dict.c dict.h win32.h async_private.h
+dict.o: dict.c fmacros.h alloc.h dict.h
+hiredis.o: hiredis.c fmacros.h hiredis.h read.h sds.h alloc.h net.h async.h win32.h
+net.o: net.c fmacros.h net.h hiredis.h read.h sds.h alloc.h sockcompat.h win32.h
+read.o: read.c fmacros.h alloc.h read.h sds.h win32.h
+sds.o: sds.c sds.h sdsalloc.h alloc.h
+sockcompat.o: sockcompat.c sockcompat.h
+ssl.o: ssl.c hiredis.h read.h sds.h alloc.h async.h win32.h async_private.h
+test.o: test.c fmacros.h hiredis.h read.h sds.h alloc.h net.h sockcompat.h win32.h
 
 $(DYLIBNAME): $(OBJ)
-	$(DYLIB_MAKE_CMD) $(OBJ)
+	$(DYLIB_MAKE_CMD) -o $(DYLIBNAME) $(OBJ) $(REAL_LDFLAGS)
 
 $(STLIBNAME): $(OBJ)
-	$(STLIB_MAKE_CMD) $(OBJ)
+	$(STLIB_MAKE_CMD) $(STLIBNAME) $(OBJ)
+
+$(SSL_DYLIBNAME): $(SSL_OBJ)
+	$(SSL_DYLIB_MAKE_CMD) $(DYLIB_PLUGIN) -o $(SSL_DYLIBNAME) $(SSL_OBJ) $(REAL_LDFLAGS) $(LDFLAGS) $(SSL_LDFLAGS)
+
+$(SSL_STLIBNAME): $(SSL_OBJ)
+	$(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ)
 
 dynamic: $(DYLIBNAME)
 static: $(STLIBNAME)
+ifeq ($(USE_SSL),1)
+dynamic: $(SSL_DYLIBNAME)
+static: $(SSL_STLIBNAME)
+endif
 
 # Binaries:
 hiredis-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -levent $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(REAL_LDFLAGS)
+
+hiredis-example-libevent-ssl: examples/example-libevent-ssl.c adapters/libevent.h $(STLIBNAME) $(SSL_STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS)
 
 hiredis-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -lev $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -lev $(STLIBNAME) $(REAL_LDFLAGS)
 
 hiredis-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) $(shell pkg-config --cflags --libs glib-2.0) -I. $< $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(shell pkg-config --cflags --libs glib-2.0) $(STLIBNAME) $(REAL_LDFLAGS)
 
 hiredis-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -livykis $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -livykis $(STLIBNAME) $(REAL_LDFLAGS)
 
 hiredis-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME) $(REAL_LDFLAGS)
+
+hiredis-example-ssl: examples/example-ssl.c $(STLIBNAME) $(SSL_STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS)
+
 
 ifndef AE_DIR
 hiredis-example-ae:
@@ -117,7 +177,7 @@ hiredis-example-libuv:
 	@false
 else
 hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME) $(REAL_LDFLAGS)
 endif
 
 ifeq ($(and $(QT_MOC),$(QT_INCLUDE_DIR),$(QT_LIBRARY_DIR)),)
@@ -134,38 +194,41 @@ hiredis-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME)
 endif
 
 hiredis-example: examples/example.c $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS)
+
+hiredis-example-push: examples/example-push.c $(STLIBNAME)
+	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS)
 
 examples: $(EXAMPLES)
 
-hiredis-test: test.o $(STLIBNAME)
+TEST_LIBS = $(STLIBNAME)
+ifeq ($(USE_SSL),1)
+    TEST_LIBS += $(SSL_STLIBNAME)
+    TEST_LDFLAGS = $(SSL_LDFLAGS) -lssl -lcrypto -lpthread
+endif
+
+hiredis-test: test.o $(TEST_LIBS)
+	$(CC) -o $@ $(REAL_CFLAGS) -I. $^ $(REAL_LDFLAGS) $(TEST_LDFLAGS)
 
 hiredis-%: %.o $(STLIBNAME)
-	$(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
+	$(CC) $(REAL_CFLAGS) -o $@ $< $(TEST_LIBS) $(REAL_LDFLAGS)
 
 test: hiredis-test
 	./hiredis-test
 
 check: hiredis-test
-	@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
-	$(PRE) ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
-			( kill `cat /tmp/hiredis-test-redis.pid` && false )
-	kill `cat /tmp/hiredis-test-redis.pid`
+	TEST_SSL=$(USE_SSL) ./test.sh
 
 .c.o:
 	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
 
 clean:
-	rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
+	rm -rf $(DYLIBNAME) $(STLIBNAME) $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
 
 dep:
-	$(CC) -MM *.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -MM *.c
 
-ifeq ($(uname_S),SunOS)
-  INSTALL?= cp -r
-endif
-
-INSTALL?= cp -a
+INSTALL?= cp -pPR
 
 $(PKGCONFNAME): hiredis.h
 	@echo "Generating $@ for pkgconfig..."
@@ -180,15 +243,43 @@ $(PKGCONFNAME): hiredis.h
 	@echo Libs: -L\$${libdir} -lhiredis >> $@
 	@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
 
+$(SSL_PKGCONFNAME): hiredis_ssl.h
+	@echo "Generating $@ for pkgconfig..."
+	@echo prefix=$(PREFIX) > $@
+	@echo exec_prefix=\$${prefix} >> $@
+	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
+	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
+	@echo >> $@
+	@echo Name: hiredis_ssl >> $@
+	@echo Description: SSL Support for hiredis. >> $@
+	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
+	@echo Requires: hiredis >> $@
+	@echo Libs: -L\$${libdir} -lhiredis_ssl >> $@
+	@echo Libs.private: -lssl -lcrypto >> $@
+
 install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
-	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-	$(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
+	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH)
+	$(INSTALL) hiredis.h async.h read.h sds.h alloc.h $(INSTALL_INCLUDE_PATH)
+	$(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters
 	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
 	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
 	mkdir -p $(INSTALL_PKGCONF_PATH)
 	$(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
 
+ifeq ($(USE_SSL),1)
+install: install-ssl
+
+install-ssl: $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(SSL_PKGCONFNAME)
+	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
+	$(INSTALL) hiredis_ssl.h $(INSTALL_INCLUDE_PATH)
+	$(INSTALL) $(SSL_DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME)
+	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(SSL_DYLIB_MINOR_NAME) $(SSL_DYLIBNAME)
+	$(INSTALL) $(SSL_STLIBNAME) $(INSTALL_LIBRARY_PATH)
+	mkdir -p $(INSTALL_PKGCONF_PATH)
+	$(INSTALL) $(SSL_PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
+endif
+
 32bit:
 	@echo ""
 	@echo "WARNING: if this fails under Linux you probably need to install libc6-dev-i386"
diff --git a/debian/modules/nchan/src/store/redis/hiredis/README.md b/debian/modules/nchan/src/store/redis/hiredis/README.md
index 4f1a58d..c544d57 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/README.md
+++ b/debian/modules/nchan/src/store/redis/hiredis/README.md
@@ -1,5 +1,7 @@
 [![Build Status](https://travis-ci.org/redis/hiredis.png)](https://travis-ci.org/redis/hiredis)
 
+**This Readme reflects the latest changed in the master branch. See [v1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) for the Readme and documentation for the latest release ([API/ABI history](https://abi-laboratory.pro/?view=timeline&l=hiredis)).**
+
 # HIREDIS
 
 Hiredis is a minimalistic C client library for the [Redis](http://redis.io/) database.
@@ -20,7 +22,40 @@ Redis version >= 1.2.0.
 The library comes with multiple APIs. There is the
 *synchronous API*, the *asynchronous API* and the *reply parsing API*.
 
-## UPGRADING
+## Upgrading to `1.0.2`
+
+<span style="color:red">NOTE:  v1.0.1 erroneously bumped SONAME, which is why it is skipped here.</span>
+
+Version 1.0.2 is simply 1.0.0 with a fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2).  They are otherwise identical.
+
+## Upgrading to `1.0.0`
+
+Version 1.0.0 marks the first stable release of Hiredis.
+It includes some minor breaking changes, mostly to make the exposed API more uniform and self-explanatory.
+It also bundles the updated `sds` library, to sync up with upstream and Redis.
+For code changes see the [Changelog](CHANGELOG.md).
+
+_Note:  As described below, a few member names have been changed but most applications should be able to upgrade with minor code changes and recompiling._
+
+## IMPORTANT:  Breaking changes from `0.14.1` -> `1.0.0`
+
+* `redisContext` has two additional members (`free_privdata`, and `privctx`).
+* `redisOptions.timeout` has been renamed to `redisOptions.connect_timeout`, and we've added `redisOptions.command_timeout`.
+* `redisReplyObjectFunctions.createArray` now takes `size_t` instead of `int` for its length parameter.
+
+## IMPORTANT:  Breaking changes when upgrading from 0.13.x -> 0.14.x
+
+Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
+protocol errors. This is consistent with the RESP specification. On 32-bit
+platforms, the upper bound is lowered to `SIZE_MAX`.
+
+Change `redisReply.len` to `size_t`, as it denotes the the size of a string
+
+User code should compare this to `size_t` values as well.  If it was used to
+compare to other values, casting might be necessary or can be removed, if
+casting was applied before.
+
+## Upgrading from `<0.9.0`
 
 Version 0.9.0 is a major overhaul of hiredis in every aspect. However, upgrading existing
 code using hiredis should not be a big pain. The key thing to keep in mind when
@@ -48,12 +83,18 @@ After trying to connect to Redis using `redisConnect` you should
 check the `err` field to see if establishing the connection was successful:
 ```c
 redisContext *c = redisConnect("127.0.0.1", 6379);
-if (c != NULL && c->err) {
-    printf("Error: %s\n", c->errstr);
-    // handle error
+if (c == NULL || c->err) {
+    if (c) {
+        printf("Error: %s\n", c->errstr);
+        // handle error
+    } else {
+        printf("Can't allocate redis context\n");
+    }
 }
 ```
 
+*Note: A `redisContext` is not thread-safe.*
+
 ### Sending commands
 
 There are several ways to issue commands to Redis. The first that will be introduced is
@@ -94,6 +135,8 @@ The standard replies that `redisCommand` are of the type `redisReply`. The
 `type` field in the `redisReply` should be used to test what kind of reply
 was received:
 
+### RESP2
+
 * **`REDIS_REPLY_STATUS`**:
     * The command replied with a status reply. The status string can be accessed using `reply->str`.
       The length of this string can be accessed using `reply->len`.
@@ -118,16 +161,51 @@ was received:
       and can be accessed via `reply->element[..index..]`.
       Redis may reply with nested arrays but this is fully supported.
 
+### RESP3
+
+Hiredis also supports every new `RESP3` data type which are as follows.  For more information about the protocol see the `RESP3` [specification.](https://github.com/antirez/RESP3/blob/master/spec.md)
+
+* **`REDIS_REPLY_DOUBLE`**:
+    * The command replied with a double-precision floating point number.
+      The value is stored as a string in the `str` member, and can be converted with `strtod` or similar.
+
+* **`REDIS_REPLY_BOOL`**:
+    * A boolean true/false reply.
+      The value is stored in the `integer` member and will be either `0` or `1`.
+
+* **`REDIS_REPLY_MAP`**:
+    * An array with the added invariant that there will always be an even number of elements.
+      The MAP is functionally equivelant to `REDIS_REPLY_ARRAY` except for the previously mentioned invariant.
+
+* **`REDIS_REPLY_SET`**:
+    * An array response where each entry is unique.
+      Like the MAP type, the data is identical to an array response except there are no duplicate values.
+
+* **`REDIS_REPLY_PUSH`**:
+    * An array that can be generated spontaneously by Redis.
+      This array response will always contain at least two subelements.  The first contains the type of `PUSH` message (e.g. `message`, or `invalidate`), and the second being a sub-array with the `PUSH` payload itself.
+
+* **`REDIS_REPLY_ATTR`**:
+    * An array structurally identical to a `MAP` but intended as meta-data about a reply.
+      _As of Redis 6.0.6 this reply type is not used in Redis_
+
+* **`REDIS_REPLY_BIGNUM`**:
+    * A string representing an arbitrarily large signed or unsigned integer value.
+      The number will be encoded as a string in the `str` member of `redisReply`.
+
+* **`REDIS_REPLY_VERB`**:
+    * A verbatim string, intended to be presented to the user without modification.
+      The string payload is stored in the `str` memeber, and type data is stored in the `vtype` member (e.g. `txt` for raw text or `md` for markdown).
+
 Replies should be freed using the `freeReplyObject()` function.
 Note that this function will take care of freeing sub-reply objects
 contained in arrays and nested arrays, so there is no need for the user to
 free the sub replies (it is actually harmful and will corrupt the memory).
 
-**Important:** the current version of hiredis (0.10.0) frees replies when the
+**Important:** the current version of hiredis (1.0.0) frees replies when the
 asynchronous API is used. This means you should not call `freeReplyObject` when
 you use this API. The reply is cleaned up by hiredis _after_ the callback
-returns. This behavior will probably change in future releases, so make sure to
-keep an eye on the changelog when upgrading (see issue #39).
+returns.  We may introduce a flag to make this configurable in future versions of the library.
 
 ### Cleaning up
 
@@ -189,16 +267,16 @@ a single call to `read(2)`):
 redisReply *reply;
 redisAppendCommand(context,"SET foo bar");
 redisAppendCommand(context,"GET foo");
-redisGetReply(context,&reply); // reply for SET
+redisGetReply(context,(void *)&reply); // reply for SET
 freeReplyObject(reply);
-redisGetReply(context,&reply); // reply for GET
+redisGetReply(context,(void *)&reply); // reply for GET
 freeReplyObject(reply);
 ```
 This API can also be used to implement a blocking subscriber:
 ```c
 reply = redisCommand(context,"SUBSCRIBE foo");
 freeReplyObject(reply);
-while(redisGetReply(context,&reply) == REDIS_OK) {
+while(redisGetReply(context,(void *)&reply) == REDIS_OK) {
     // consume message
     freeReplyObject(reply);
 }
@@ -241,6 +319,9 @@ Redis. It returns a pointer to the newly created `redisAsyncContext` struct. The
 should be checked after creation to see if there were errors creating the connection.
 Because the connection that will be created is non-blocking, the kernel is not able to
 instantly return if the specified host and port is able to accept a connection.
+
+*Note: A `redisAsyncContext` is not thread-safe.*
+
 ```c
 redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
 if (c->err) {
@@ -267,6 +348,7 @@ return `REDIS_ERR`. The function to set the disconnect callback has the followin
 ```c
 int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
 ```
+`ac->data` may be used to pass user data to this callback, the same can be done for redisConnectCallback.
 ### Sending commands and their callbacks
 
 In an asynchronous context, commands are automatically pipelined due to the nature of an event loop.
@@ -384,9 +466,199 @@ This should be done only in order to maximize performances when working with
 large payloads. The context should be set back to `REDIS_READER_MAX_BUF` again
 as soon as possible in order to prevent allocation of useless memory.
 
+### Reader max array elements
+
+By default the hiredis reply parser sets the maximum number of multi-bulk elements
+to 2^32 - 1 or 4,294,967,295 entries.  If you need to process multi-bulk replies
+with more than this many elements you can set the value higher or to zero, meaning
+unlimited with:
+```c
+context->reader->maxelements = 0;
+```
+
+## SSL/TLS Support
+
+### Building
+
+SSL/TLS support is not built by default and requires an explicit flag:
+
+    make USE_SSL=1
+
+This requires OpenSSL development package (e.g. including header files to be
+available.
+
+When enabled, SSL/TLS support is built into extra `libhiredis_ssl.a` and
+`libhiredis_ssl.so` static/dynamic libraries. This leaves the original libraries
+unaffected so no additional dependencies are introduced.
+
+### Using it
+
+First, you'll need to make sure you include the SSL header file:
+
+```c
+#include "hiredis.h"
+#include "hiredis_ssl.h"
+```
+
+You will also need to link against `libhiredis_ssl`, **in addition** to
+`libhiredis` and add `-lssl -lcrypto` to satisfy its dependencies.
+
+Hiredis implements SSL/TLS on top of its normal `redisContext` or
+`redisAsyncContext`, so you will need to establish a connection first and then
+initiate an SSL/TLS handshake.
+
+#### Hiredis OpenSSL Wrappers
+
+Before Hiredis can negotiate an SSL/TLS connection, it is necessary to
+initialize OpenSSL and create a context. You can do that in two ways:
+
+1. Work directly with the OpenSSL API to initialize the library's global context
+   and create `SSL_CTX *` and `SSL *` contexts. With an `SSL *` object you can
+   call `redisInitiateSSL()`.
+2. Work with a set of Hiredis-provided wrappers around OpenSSL, create a
+   `redisSSLContext` object to hold configuration and use
+   `redisInitiateSSLWithContext()` to initiate the SSL/TLS handshake.
+
+```c
+/* An Hiredis SSL context. It holds SSL configuration and can be reused across
+ * many contexts.
+ */
+redisSSLContext *ssl;
+
+/* An error variable to indicate what went wrong, if the context fails to
+ * initialize.
+ */
+redisSSLContextError ssl_error;
+
+/* Initialize global OpenSSL state.
+ *
+ * You should call this only once when your app initializes, and only if
+ * you don't explicitly or implicitly initialize OpenSSL it elsewhere.
+ */
+redisInitOpenSSL();
+
+/* Create SSL context */
+ssl = redisCreateSSLContext(
+    "cacertbundle.crt",     /* File name of trusted CA/ca bundle file, optional */
+    "/path/to/certs",       /* Path of trusted certificates, optional */
+    "client_cert.pem",      /* File name of client certificate file, optional */
+    "client_key.pem",       /* File name of client private key, optional */
+    "redis.mydomain.com",   /* Server name to request (SNI), optional */
+    &ssl_error
+    ) != REDIS_OK) {
+        printf("SSL error: %s\n", redisSSLContextGetError(ssl_error);
+        /* Abort... */
+    }
+
+/* Create Redis context and establish connection */
+c = redisConnect("localhost", 6443);
+if (c == NULL || c->err) {
+    /* Handle error and abort... */
+}
+
+/* Negotiate SSL/TLS */
+if (redisInitiateSSLWithContext(c, ssl) != REDIS_OK) {
+    /* Handle error, in c->err / c->errstr */
+}
+```
+
+## RESP3 PUSH replies
+Redis 6.0 introduced PUSH replies with the reply-type `>`.  These messages are generated spontaneously and can arrive at any time, so must be handled using callbacks.
+
+### Default behavior
+Hiredis installs handlers on `redisContext` and `redisAsyncContext` by default, which will intercept and free any PUSH replies detected.  This means existing code will work as-is after upgrading to Redis 6 and switching to `RESP3`.
+
+### Custom PUSH handler prototypes
+The callback prototypes differ between `redisContext` and `redisAsyncContext`.
+
+#### redisContext
+```c
+void my_push_handler(void *privdata, void *reply) {
+    /* Handle the reply */
+
+    /* Note: We need to free the reply in our custom handler for
+             blocking contexts.  This lets us keep the reply if
+             we want. */
+    freeReplyObject(reply);
+}
+```
+
+#### redisAsyncContext
+```c
+void my_async_push_handler(redisAsyncContext *ac, void *reply) {
+    /* Handle the reply */
+
+    /* Note:  Because async hiredis always frees replies, you should
+              not call freeReplyObject in an async push callback. */
+}
+```
+
+### Installing a custom handler
+There are two ways to set your own PUSH handlers.
+
+1. Set `push_cb` or `async_push_cb` in the `redisOptions` struct and connect with `redisConnectWithOptions` or `redisAsyncConnectWithOptions`.
+    ```c
+    redisOptions = {0};
+    REDIS_OPTIONS_SET_TCP(&options, "127.0.0.1", 6379);
+    options->push_cb = my_push_handler;
+    redisContext *context = redisConnectWithOptions(&options);
+    ```
+2.  Call `redisSetPushCallback` or `redisAsyncSetPushCallback` on a connected context.
+    ```c
+    redisContext *context = redisConnect("127.0.0.1", 6379);
+    redisSetPushCallback(context, my_push_handler);
+    ```
+
+    _Note `redisSetPushCallback` and `redisAsyncSetPushCallback` both return any currently configured handler,  making it easy to override and then return to the old value._
+
+### Specifying no handler
+If you have a unique use-case where you don't want hiredis to automatically intercept and free PUSH replies, you will want to configure no handler at all.  This can be done in two ways.
+1.  Set the `REDIS_OPT_NO_PUSH_AUTOFREE` flag in `redisOptions` and leave the callback function pointer `NULL`.
+    ```c
+    redisOptions = {0};
+    REDIS_OPTIONS_SET_TCP(&options, "127.0.0.1", 6379);
+    options->options |= REDIS_OPT_NO_PUSH_AUTOFREE;
+    redisContext *context = redisConnectWithOptions(&options);
+    ```
+3.  Call `redisSetPushCallback` with `NULL` once connected.
+    ```c
+    redisContext *context = redisConnect("127.0.0.1", 6379);
+    redisSetPushCallback(context, NULL);
+    ```
+
+    _Note:  With no handler configured, calls to `redisCommand` may generate more than one reply, so this strategy is only applicable when there's some kind of blocking`redisGetReply()` loop (e.g. `MONITOR` or `SUBSCRIBE` workloads)._
+
+## Allocator injection
+
+Hiredis uses a pass-thru structure of function pointers defined in [alloc.h](https://github.com/redis/hiredis/blob/f5d25850/alloc.h#L41) that contain the currently configured allocation and deallocation functions.  By default they just point to libc (`malloc`, `calloc`, `realloc`, etc).
+
+### Overriding
+
+One can override the allocators like so:
+
+```c
+hiredisAllocFuncs myfuncs = {
+    .mallocFn = my_malloc,
+    .callocFn = my_calloc,
+    .reallocFn = my_realloc,
+    .strdupFn = my_strdup,
+    .freeFn = my_free,
+};
+
+// Override allocators (function returns current allocators if needed)
+hiredisAllocFuncs orig = hiredisSetAllocators(&myfuncs);
+```
+
+To reset the allocators to their default libc function simply call:
+
+```c
+hiredisResetAllocators();
+```
+
 ## AUTHORS
 
-Hiredis was written by Salvatore Sanfilippo (antirez at gmail) and
-Pieter Noordhuis (pcnoordhuis at gmail) and is released under the BSD license.  
-Hiredis is currently maintained by Matt Stancliff (matt at genges dot com) and
-Jan-Erik Rediger (janerik at fnordig dot com)
+Salvatore Sanfilippo (antirez at gmail),\
+Pieter Noordhuis (pcnoordhuis at gmail)\
+Michael Grunder (michael dot grunder at gmail)
+
+_Hiredis is released under the BSD license._
diff --git a/debian/modules/nchan/src/store/redis/hiredis/adapters/ae.h b/debian/modules/nchan/src/store/redis/hiredis/adapters/ae.h
deleted file mode 100644
index 5c551c2..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/adapters/ae.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_AE_H__
-#define __HIREDIS_AE_H__
-#include <sys/types.h>
-#include <ae.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisAeEvents {
-    redisAsyncContext *context;
-    aeEventLoop *loop;
-    int fd;
-    int reading, writing;
-} redisAeEvents;
-
-static void redisAeReadEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
-    ((void)el); ((void)fd); ((void)mask);
-
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisAeWriteEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
-    ((void)el); ((void)fd); ((void)mask);
-
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisAeAddRead(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (!e->reading) {
-        e->reading = 1;
-        aeCreateFileEvent(loop,e->fd,AE_READABLE,redisAeReadEvent,e);
-    }
-}
-
-static void redisAeDelRead(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (e->reading) {
-        e->reading = 0;
-        aeDeleteFileEvent(loop,e->fd,AE_READABLE);
-    }
-}
-
-static void redisAeAddWrite(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (!e->writing) {
-        e->writing = 1;
-        aeCreateFileEvent(loop,e->fd,AE_WRITABLE,redisAeWriteEvent,e);
-    }
-}
-
-static void redisAeDelWrite(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (e->writing) {
-        e->writing = 0;
-        aeDeleteFileEvent(loop,e->fd,AE_WRITABLE);
-    }
-}
-
-static void redisAeCleanup(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAeDelRead(privdata);
-    redisAeDelWrite(privdata);
-    free(e);
-}
-
-static int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisAeEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisAeEvents*)malloc(sizeof(*e));
-    e->context = ac;
-    e->loop = loop;
-    e->fd = c->fd;
-    e->reading = e->writing = 0;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisAeAddRead;
-    ac->ev.delRead = redisAeDelRead;
-    ac->ev.addWrite = redisAeAddWrite;
-    ac->ev.delWrite = redisAeDelWrite;
-    ac->ev.cleanup = redisAeCleanup;
-    ac->ev.data = e;
-
-    return REDIS_OK;
-}
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/adapters/libev.h b/debian/modules/nchan/src/store/redis/hiredis/adapters/libev.h
deleted file mode 100644
index 2bf8d52..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/adapters/libev.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_LIBEV_H__
-#define __HIREDIS_LIBEV_H__
-#include <stdlib.h>
-#include <sys/types.h>
-#include <ev.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisLibevEvents {
-    redisAsyncContext *context;
-    struct ev_loop *loop;
-    int reading, writing;
-    ev_io rev, wev;
-} redisLibevEvents;
-
-static void redisLibevReadEvent(EV_P_ ev_io *watcher, int revents) {
-#if EV_MULTIPLICITY
-    ((void)loop);
-#endif
-    ((void)revents);
-
-    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisLibevWriteEvent(EV_P_ ev_io *watcher, int revents) {
-#if EV_MULTIPLICITY
-    ((void)loop);
-#endif
-    ((void)revents);
-
-    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisLibevAddRead(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (!e->reading) {
-        e->reading = 1;
-        ev_io_start(EV_A_ &e->rev);
-    }
-}
-
-static void redisLibevDelRead(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (e->reading) {
-        e->reading = 0;
-        ev_io_stop(EV_A_ &e->rev);
-    }
-}
-
-static void redisLibevAddWrite(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (!e->writing) {
-        e->writing = 1;
-        ev_io_start(EV_A_ &e->wev);
-    }
-}
-
-static void redisLibevDelWrite(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (e->writing) {
-        e->writing = 0;
-        ev_io_stop(EV_A_ &e->wev);
-    }
-}
-
-static void redisLibevCleanup(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    redisLibevDelRead(privdata);
-    redisLibevDelWrite(privdata);
-    free(e);
-}
-
-static int redisLibevAttach(EV_P_ redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisLibevEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisLibevEvents*)malloc(sizeof(*e));
-    e->context = ac;
-#if EV_MULTIPLICITY
-    e->loop = loop;
-#else
-    e->loop = NULL;
-#endif
-    e->reading = e->writing = 0;
-    e->rev.data = e;
-    e->wev.data = e;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisLibevAddRead;
-    ac->ev.delRead = redisLibevDelRead;
-    ac->ev.addWrite = redisLibevAddWrite;
-    ac->ev.delWrite = redisLibevDelWrite;
-    ac->ev.cleanup = redisLibevCleanup;
-    ac->ev.data = e;
-
-    /* Initialize read/write events */
-    ev_io_init(&e->rev,redisLibevReadEvent,c->fd,EV_READ);
-    ev_io_init(&e->wev,redisLibevWriteEvent,c->fd,EV_WRITE);
-    return REDIS_OK;
-}
-
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/adapters/libevent.h b/debian/modules/nchan/src/store/redis/hiredis/adapters/libevent.h
deleted file mode 100644
index 1c2b271..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/adapters/libevent.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_LIBEVENT_H__
-#define __HIREDIS_LIBEVENT_H__
-#include <event.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisLibeventEvents {
-    redisAsyncContext *context;
-    struct event rev, wev;
-} redisLibeventEvents;
-
-static void redisLibeventReadEvent(int fd, short event, void *arg) {
-    ((void)fd); ((void)event);
-    redisLibeventEvents *e = (redisLibeventEvents*)arg;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisLibeventWriteEvent(int fd, short event, void *arg) {
-    ((void)fd); ((void)event);
-    redisLibeventEvents *e = (redisLibeventEvents*)arg;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisLibeventAddRead(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_add(&e->rev,NULL);
-}
-
-static void redisLibeventDelRead(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_del(&e->rev);
-}
-
-static void redisLibeventAddWrite(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_add(&e->wev,NULL);
-}
-
-static void redisLibeventDelWrite(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_del(&e->wev);
-}
-
-static void redisLibeventCleanup(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_del(&e->rev);
-    event_del(&e->wev);
-    free(e);
-}
-
-static int redisLibeventAttach(redisAsyncContext *ac, struct event_base *base) {
-    redisContext *c = &(ac->c);
-    redisLibeventEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisLibeventEvents*)malloc(sizeof(*e));
-    e->context = ac;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisLibeventAddRead;
-    ac->ev.delRead = redisLibeventDelRead;
-    ac->ev.addWrite = redisLibeventAddWrite;
-    ac->ev.delWrite = redisLibeventDelWrite;
-    ac->ev.cleanup = redisLibeventCleanup;
-    ac->ev.data = e;
-
-    /* Initialize and install read/write events */
-    event_set(&e->rev,c->fd,EV_READ,redisLibeventReadEvent,e);
-    event_set(&e->wev,c->fd,EV_WRITE,redisLibeventWriteEvent,e);
-    event_base_set(base,&e->rev);
-    event_base_set(base,&e->wev);
-    return REDIS_OK;
-}
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/adapters/libuv.h b/debian/modules/nchan/src/store/redis/hiredis/adapters/libuv.h
deleted file mode 100644
index 3cdf3d3..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/adapters/libuv.h
+++ /dev/null
@@ -1,121 +0,0 @@
-#ifndef __HIREDIS_LIBUV_H__
-#define __HIREDIS_LIBUV_H__
-#include <stdlib.h>
-#include <uv.h>
-#include "../hiredis.h"
-#include "../async.h"
-#include <string.h>
-
-typedef struct redisLibuvEvents {
-  redisAsyncContext* context;
-  uv_poll_t          handle;
-  int                events;
-} redisLibuvEvents;
-
-
-static void redisLibuvPoll(uv_poll_t* handle, int status, int events) {
-  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
-
-  if (status != 0) {
-    return;
-  }
-
-  if (events & UV_READABLE) {
-    redisAsyncHandleRead(p->context);
-  }
-  if (events & UV_WRITABLE) {
-    redisAsyncHandleWrite(p->context);
-  }
-}
-
-
-static void redisLibuvAddRead(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events |= UV_READABLE;
-
-  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-}
-
-
-static void redisLibuvDelRead(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events &= ~UV_READABLE;
-
-  if (p->events) {
-    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-  } else {
-    uv_poll_stop(&p->handle);
-  }
-}
-
-
-static void redisLibuvAddWrite(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events |= UV_WRITABLE;
-
-  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-}
-
-
-static void redisLibuvDelWrite(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events &= ~UV_WRITABLE;
-
-  if (p->events) {
-    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-  } else {
-    uv_poll_stop(&p->handle);
-  }
-}
-
-
-static void on_close(uv_handle_t* handle) {
-  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
-
-  free(p);
-}
-
-
-static void redisLibuvCleanup(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  uv_close((uv_handle_t*)&p->handle, on_close);
-}
-
-
-static int redisLibuvAttach(redisAsyncContext* ac, uv_loop_t* loop) {
-  redisContext *c = &(ac->c);
-
-  if (ac->ev.data != NULL) {
-    return REDIS_ERR;
-  }
-
-  ac->ev.addRead  = redisLibuvAddRead;
-  ac->ev.delRead  = redisLibuvDelRead;
-  ac->ev.addWrite = redisLibuvAddWrite;
-  ac->ev.delWrite = redisLibuvDelWrite;
-  ac->ev.cleanup  = redisLibuvCleanup;
-
-  redisLibuvEvents* p = (redisLibuvEvents*)malloc(sizeof(*p));
-
-  if (!p) {
-    return REDIS_ERR;
-  }
-
-  memset(p, 0, sizeof(*p));
-
-  if (uv_poll_init(loop, &p->handle, c->fd) != 0) {
-    return REDIS_ERR;
-  }
-
-  ac->ev.data    = p;
-  p->handle.data = p;
-  p->context     = ac;
-
-  return REDIS_OK;
-}
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/alloc.c b/debian/modules/nchan/src/store/redis/hiredis/alloc.c
new file mode 100644
index 0000000..7fb6b35
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/alloc.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include "alloc.h"
+#include <string.h>
+#include <stdlib.h>
+
+hiredisAllocFuncs hiredisAllocFns = {
+    .mallocFn = malloc,
+    .callocFn = calloc,
+    .reallocFn = realloc,
+    .strdupFn = strdup,
+    .freeFn = free,
+};
+
+/* Override hiredis' allocators with ones supplied by the user */
+hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *override) {
+    hiredisAllocFuncs orig = hiredisAllocFns;
+
+    hiredisAllocFns = *override;
+
+    return orig;
+}
+
+/* Reset allocators to use libc defaults */
+void hiredisResetAllocators(void) {
+    hiredisAllocFns = (hiredisAllocFuncs) {
+        .mallocFn = malloc,
+        .callocFn = calloc,
+        .reallocFn = realloc,
+        .strdupFn = strdup,
+        .freeFn = free,
+    };
+}
+
+#ifdef _WIN32
+
+void *hi_malloc(size_t size) {
+    return hiredisAllocFns.mallocFn(size);
+}
+
+void *hi_calloc(size_t nmemb, size_t size) {
+    return hiredisAllocFns.callocFn(nmemb, size);
+}
+
+void *hi_realloc(void *ptr, size_t size) {
+    return hiredisAllocFns.reallocFn(ptr, size);
+}
+
+char *hi_strdup(const char *str) {
+    return hiredisAllocFns.strdupFn(str);
+}
+
+void hi_free(void *ptr) {
+    hiredisAllocFns.freeFn(ptr);
+}
+
+#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/alloc.h b/debian/modules/nchan/src/store/redis/hiredis/alloc.h
new file mode 100644
index 0000000..34a05f4
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/alloc.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef HIREDIS_ALLOC_H
+#define HIREDIS_ALLOC_H
+
+#include <stddef.h> /* for size_t */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Structure pointing to our actually configured allocators */
+typedef struct hiredisAllocFuncs {
+    void *(*mallocFn)(size_t);
+    void *(*callocFn)(size_t,size_t);
+    void *(*reallocFn)(void*,size_t);
+    char *(*strdupFn)(const char*);
+    void (*freeFn)(void*);
+} hiredisAllocFuncs;
+
+hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *ha);
+void hiredisResetAllocators(void);
+
+#ifndef _WIN32
+
+/* Hiredis' configured allocator function pointer struct */
+extern hiredisAllocFuncs hiredisAllocFns;
+
+static inline void *hi_malloc(size_t size) {
+    return hiredisAllocFns.mallocFn(size);
+}
+
+static inline void *hi_calloc(size_t nmemb, size_t size) {
+    return hiredisAllocFns.callocFn(nmemb, size);
+}
+
+static inline void *hi_realloc(void *ptr, size_t size) {
+    return hiredisAllocFns.reallocFn(ptr, size);
+}
+
+static inline char *hi_strdup(const char *str) {
+    return hiredisAllocFns.strdupFn(str);
+}
+
+static inline void hi_free(void *ptr) {
+    hiredisAllocFns.freeFn(ptr);
+}
+
+#else
+
+void *hi_malloc(size_t size);
+void *hi_calloc(size_t nmemb, size_t size);
+void *hi_realloc(void *ptr, size_t size);
+char *hi_strdup(const char *str);
+void hi_free(void *ptr);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HIREDIS_ALLOC_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/async.c b/debian/modules/nchan/src/store/redis/hiredis/async.c
index d955203..020cb09 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/async.c
+++ b/debian/modules/nchan/src/store/redis/hiredis/async.c
@@ -30,9 +30,12 @@
  */
 
 #include "fmacros.h"
+#include "alloc.h"
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <strings.h>
+#endif
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -40,25 +43,13 @@
 #include "net.h"
 #include "dict.c"
 #include "sds.h"
+#include "win32.h"
 
-#define _EL_ADD_READ(ctx) do { \
-        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
-    } while(0)
-#define _EL_DEL_READ(ctx) do { \
-        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
-    } while(0)
-#define _EL_ADD_WRITE(ctx) do { \
-        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
-    } while(0)
-#define _EL_DEL_WRITE(ctx) do { \
-        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
-    } while(0)
-#define _EL_CLEANUP(ctx) do { \
-        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
-    } while(0);
+#include "async_private.h"
 
-/* Forward declaration of function in hiredis.c */
+/* Forward declarations of hiredis.c functions */
 int __redisAppendCommand(redisContext *c, const char *cmd, size_t len);
+void __redisSetError(redisContext *c, int type, const char *str);
 
 /* Functions managing dictionary of callbacks for pub/sub. */
 static unsigned int callbackHash(const void *key) {
@@ -68,7 +59,12 @@ static unsigned int callbackHash(const void *key) {
 
 static void *callbackValDup(void *privdata, const void *src) {
     ((void) privdata);
-    redisCallback *dup = malloc(sizeof(*dup));
+    redisCallback *dup;
+
+    dup = hi_malloc(sizeof(*dup));
+    if (dup == NULL)
+        return NULL;
+
     memcpy(dup,src,sizeof(*dup));
     return dup;
 }
@@ -90,7 +86,7 @@ static void callbackKeyDestructor(void *privdata, void *key) {
 
 static void callbackValDestructor(void *privdata, void *val) {
     ((void) privdata);
-    free(val);
+    hi_free(val);
 }
 
 static dictType callbackDict = {
@@ -104,10 +100,19 @@ static dictType callbackDict = {
 
 static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
     redisAsyncContext *ac;
+    dict *channels = NULL, *patterns = NULL;
 
-    ac = realloc(c,sizeof(redisAsyncContext));
+    channels = dictCreate(&callbackDict,NULL);
+    if (channels == NULL)
+        goto oom;
+
+    patterns = dictCreate(&callbackDict,NULL);
+    if (patterns == NULL)
+        goto oom;
+
+    ac = hi_realloc(c,sizeof(redisAsyncContext));
     if (ac == NULL)
-        return NULL;
+        goto oom;
 
     c = &(ac->c);
 
@@ -119,6 +124,7 @@ static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
     ac->err = 0;
     ac->errstr = NULL;
     ac->data = NULL;
+    ac->dataCleanup = NULL;
 
     ac->ev.data = NULL;
     ac->ev.addRead = NULL;
@@ -126,6 +132,7 @@ static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
     ac->ev.addWrite = NULL;
     ac->ev.delWrite = NULL;
     ac->ev.cleanup = NULL;
+    ac->ev.scheduleTimer = NULL;
 
     ac->onConnect = NULL;
     ac->onDisconnect = NULL;
@@ -134,9 +141,14 @@ static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
     ac->replies.tail = NULL;
     ac->sub.invalid.head = NULL;
     ac->sub.invalid.tail = NULL;
-    ac->sub.channels = dictCreate(&callbackDict,NULL);
-    ac->sub.patterns = dictCreate(&callbackDict,NULL);
+    ac->sub.channels = channels;
+    ac->sub.patterns = patterns;
+
     return ac;
+oom:
+    if (channels) dictRelease(channels);
+    if (patterns) dictRelease(patterns);
+    return NULL;
 }
 
 /* We want the error field to be accessible directly instead of requiring
@@ -150,13 +162,21 @@ static void __redisAsyncCopyError(redisAsyncContext *ac) {
     ac->errstr = c->errstr;
 }
 
-redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
+redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options) {
+    redisOptions myOptions = *options;
     redisContext *c;
     redisAsyncContext *ac;
 
-    c = redisConnectNonBlock(ip,port);
-    if (c == NULL)
+    /* Clear any erroneously set sync callback and flag that we don't want to
+     * use freeReplyObject by default. */
+    myOptions.push_cb = NULL;
+    myOptions.options |= REDIS_OPT_NO_PUSH_AUTOFREE;
+
+    myOptions.options |= REDIS_OPT_NONBLOCK;
+    c = redisConnectWithOptions(&myOptions);
+    if (c == NULL) {
         return NULL;
+    }
 
     ac = redisAsyncInitialize(c);
     if (ac == NULL) {
@@ -164,42 +184,40 @@ redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
         return NULL;
     }
 
+    /* Set any configured async push handler */
+    redisAsyncSetPushCallback(ac, myOptions.async_push_cb);
+
     __redisAsyncCopyError(ac);
     return ac;
 }
 
+redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    return redisAsyncConnectWithOptions(&options);
+}
+
 redisAsyncContext *redisAsyncConnectBind(const char *ip, int port,
                                          const char *source_addr) {
-    redisContext *c = redisConnectBindNonBlock(ip,port,source_addr);
-    redisAsyncContext *ac = redisAsyncInitialize(c);
-    __redisAsyncCopyError(ac);
-    return ac;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.endpoint.tcp.source_addr = source_addr;
+    return redisAsyncConnectWithOptions(&options);
 }
 
 redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
                                                   const char *source_addr) {
-    redisContext *c = redisConnectBindNonBlockWithReuse(ip,port,source_addr);
-    redisAsyncContext *ac = redisAsyncInitialize(c);
-    __redisAsyncCopyError(ac);
-    return ac;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.options |= REDIS_OPT_REUSEADDR;
+    options.endpoint.tcp.source_addr = source_addr;
+    return redisAsyncConnectWithOptions(&options);
 }
 
 redisAsyncContext *redisAsyncConnectUnix(const char *path) {
-    redisContext *c;
-    redisAsyncContext *ac;
-
-    c = redisConnectUnixNonBlock(path);
-    if (c == NULL)
-        return NULL;
-
-    ac = redisAsyncInitialize(c);
-    if (ac == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    __redisAsyncCopyError(ac);
-    return ac;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_UNIX(&options, path);
+    return redisAsyncConnectWithOptions(&options);
 }
 
 int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn) {
@@ -228,7 +246,7 @@ static int __redisPushCallback(redisCallbackList *list, redisCallback *source) {
     redisCallback *cb;
 
     /* Copy callback from stack to heap */
-    cb = malloc(sizeof(*cb));
+    cb = hi_malloc(sizeof(*cb));
     if (cb == NULL)
         return REDIS_ERR_OOM;
 
@@ -256,7 +274,7 @@ static int __redisShiftCallback(redisCallbackList *list, redisCallback *target)
         /* Copy callback from heap to stack */
         if (target != NULL)
             memcpy(target,cb,sizeof(*cb));
-        free(cb);
+        hi_free(cb);
         return REDIS_OK;
     }
     return REDIS_ERR;
@@ -271,6 +289,14 @@ static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisRe
     }
 }
 
+static void __redisRunPushCallback(redisAsyncContext *ac, redisReply *reply) {
+    if (ac->push_cb != NULL) {
+        ac->c.flags |= REDIS_IN_CALLBACK;
+        ac->push_cb(ac, reply);
+        ac->c.flags &= ~REDIS_IN_CALLBACK;
+    }
+}
+
 /* Helper function to free the context. */
 static void __redisAsyncFree(redisAsyncContext *ac) {
     redisContext *c = &(ac->c);
@@ -286,18 +312,28 @@ static void __redisAsyncFree(redisAsyncContext *ac) {
     while (__redisShiftCallback(&ac->sub.invalid,&cb) == REDIS_OK)
         __redisRunCallback(ac,&cb,NULL);
 
-    /* Run subscription callbacks callbacks with NULL reply */
-    it = dictGetIterator(ac->sub.channels);
-    while ((de = dictNext(it)) != NULL)
-        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-    dictReleaseIterator(it);
-    dictRelease(ac->sub.channels);
+    /* Run subscription callbacks with NULL reply */
+    if (ac->sub.channels) {
+        it = dictGetIterator(ac->sub.channels);
+        if (it != NULL) {
+            while ((de = dictNext(it)) != NULL)
+                __redisRunCallback(ac,dictGetEntryVal(de),NULL);
+            dictReleaseIterator(it);
+        }
 
-    it = dictGetIterator(ac->sub.patterns);
-    while ((de = dictNext(it)) != NULL)
-        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-    dictReleaseIterator(it);
-    dictRelease(ac->sub.patterns);
+        dictRelease(ac->sub.channels);
+    }
+
+    if (ac->sub.patterns) {
+        it = dictGetIterator(ac->sub.patterns);
+        if (it != NULL) {
+            while ((de = dictNext(it)) != NULL)
+                __redisRunCallback(ac,dictGetEntryVal(de),NULL);
+            dictReleaseIterator(it);
+        }
+
+        dictRelease(ac->sub.patterns);
+    }
 
     /* Signal event lib to clean up */
     _EL_CLEANUP(ac);
@@ -312,6 +348,10 @@ static void __redisAsyncFree(redisAsyncContext *ac) {
         }
     }
 
+    if (ac->dataCleanup) {
+        ac->dataCleanup(ac->data);
+    }
+
     /* Cleanup self */
     redisFree(c);
 }
@@ -328,7 +368,7 @@ void redisAsyncFree(redisAsyncContext *ac) {
 }
 
 /* Helper function to make the disconnect happen and clean up. */
-static void __redisAsyncDisconnect(redisAsyncContext *ac) {
+void __redisAsyncDisconnect(redisAsyncContext *ac) {
     redisContext *c = &(ac->c);
 
     /* Make sure error is accessible if there is any */
@@ -336,16 +376,23 @@ static void __redisAsyncDisconnect(redisAsyncContext *ac) {
 
     if (ac->err == 0) {
         /* For clean disconnects, there should be no pending callbacks. */
-        assert(__redisShiftCallback(&ac->replies,NULL) == REDIS_ERR);
+        int ret = __redisShiftCallback(&ac->replies,NULL);
+        assert(ret == REDIS_ERR);
     } else {
         /* Disconnection is caused by an error, make sure that pending
          * callbacks cannot call new commands. */
         c->flags |= REDIS_DISCONNECTING;
     }
 
+    /* cleanup event library on disconnect.
+     * this is safe to call multiple times */
+    _EL_CLEANUP(ac);
+
     /* For non-clean disconnects, __redisAsyncFree() will execute pending
      * callbacks with a NULL-reply. */
-    __redisAsyncFree(ac);
+    if (!(c->flags & REDIS_NO_AUTO_FREE)) {
+      __redisAsyncFree(ac);
+    }
 }
 
 /* Tries to do a clean disconnect from Redis, meaning it stops new commands
@@ -357,6 +404,9 @@ static void __redisAsyncDisconnect(redisAsyncContext *ac) {
 void redisAsyncDisconnect(redisAsyncContext *ac) {
     redisContext *c = &(ac->c);
     c->flags |= REDIS_DISCONNECTING;
+
+    /** unset the auto-free flag here, because disconnect undoes this */
+    c->flags &= ~REDIS_NO_AUTO_FREE;
     if (!(c->flags & REDIS_IN_CALLBACK) && ac->replies.head == NULL)
         __redisAsyncDisconnect(ac);
 }
@@ -364,6 +414,7 @@ void redisAsyncDisconnect(redisAsyncContext *ac) {
 static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, redisCallback *dstcb) {
     redisContext *c = &(ac->c);
     dict *callbacks;
+    redisCallback *cb;
     dictEntry *de;
     int pvariant;
     char *stype;
@@ -371,7 +422,7 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply,
 
     /* Custom reply functions are not supported for pub/sub. This will fail
      * very hard when they are used... */
-    if (reply->type == REDIS_REPLY_ARRAY) {
+    if (reply->type == REDIS_REPLY_ARRAY || reply->type == REDIS_REPLY_PUSH) {
         assert(reply->elements >= 2);
         assert(reply->element[0]->type == REDIS_REPLY_STRING);
         stype = reply->element[0]->str;
@@ -385,18 +436,33 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply,
         /* Locate the right callback */
         assert(reply->element[1]->type == REDIS_REPLY_STRING);
         sname = sdsnewlen(reply->element[1]->str,reply->element[1]->len);
+        if (sname == NULL)
+            goto oom;
+
         de = dictFind(callbacks,sname);
         if (de != NULL) {
-            memcpy(dstcb,dictGetEntryVal(de),sizeof(*dstcb));
+            cb = dictGetEntryVal(de);
+
+            /* If this is an subscribe reply decrease pending counter. */
+            if (strcasecmp(stype+pvariant,"subscribe") == 0) {
+                cb->pending_subs -= 1;
+            }
+
+            memcpy(dstcb,cb,sizeof(*dstcb));
 
             /* If this is an unsubscribe message, remove it. */
             if (strcasecmp(stype+pvariant,"unsubscribe") == 0) {
-                dictDelete(callbacks,sname);
+                if (cb->pending_subs == 0)
+                    dictDelete(callbacks,sname);
 
                 /* If this was the last unsubscribe message, revert to
                  * non-subscribe mode. */
                 assert(reply->element[2]->type == REDIS_REPLY_INTEGER);
-                if (reply->element[2]->integer == 0)
+
+                /* Unset subscribed flag only when no pipelined pending subscribe. */
+                if (reply->element[2]->integer == 0
+                    && dictSize(ac->sub.channels) == 0
+                    && dictSize(ac->sub.patterns) == 0)
                     c->flags &= ~REDIS_SUBSCRIBED;
             }
         }
@@ -406,11 +472,38 @@ static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply,
         __redisShiftCallback(&ac->sub.invalid,dstcb);
     }
     return REDIS_OK;
+oom:
+    __redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
+    return REDIS_ERR;
+}
+
+#define redisIsSpontaneousPushReply(r) \
+    (redisIsPushReply(r) && !redisIsSubscribeReply(r))
+
+static int redisIsSubscribeReply(redisReply *reply) {
+    char *str;
+    size_t len, off;
+
+    /* We will always have at least one string with the subscribe/message type */
+    if (reply->elements < 1 || reply->element[0]->type != REDIS_REPLY_STRING ||
+        reply->element[0]->len < sizeof("message") - 1)
+    {
+        return 0;
+    }
+
+    /* Get the string/len moving past 'p' if needed */
+    off = tolower(reply->element[0]->str[0]) == 'p';
+    str = reply->element[0]->str + off;
+    len = reply->element[0]->len - off;
+
+    return !strncasecmp(str, "subscribe", len) ||
+           !strncasecmp(str, "message", len);
+
 }
 
 void redisProcessCallbacks(redisAsyncContext *ac) {
     redisContext *c = &(ac->c);
-    redisCallback cb = {NULL, NULL, NULL};
+    redisCallback cb = {NULL, NULL, 0, NULL};
     void *reply = NULL;
     int status;
 
@@ -434,8 +527,18 @@ void redisProcessCallbacks(redisAsyncContext *ac) {
             break;
         }
 
-        /* Even if the context is subscribed, pending regular callbacks will
-         * get a reply before pub/sub messages arrive. */
+        /* Send any non-subscribe related PUSH messages to our PUSH handler
+         * while allowing subscribe related PUSH messages to pass through.
+         * This allows existing code to be backward compatible and work in
+         * either RESP2 or RESP3 mode. */
+        if (redisIsSpontaneousPushReply(reply)) {
+            __redisRunPushCallback(ac, reply);
+            c->reader->fn->freeObject(reply);
+            continue;
+        }
+
+        /* Even if the context is subscribed, pending regular
+         * callbacks will get a reply before pub/sub messages arrive. */
         if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
             /*
              * A spontaneous reply in a not-subscribed context can be the error
@@ -488,26 +591,49 @@ void redisProcessCallbacks(redisAsyncContext *ac) {
         __redisAsyncDisconnect(ac);
 }
 
+static void __redisAsyncHandleConnectFailure(redisAsyncContext *ac) {
+    if (ac->onConnect) ac->onConnect(ac, REDIS_ERR);
+    __redisAsyncDisconnect(ac);
+}
+
 /* Internal helper function to detect socket status the first time a read or
  * write event fires. When connecting was not successful, the connect callback
  * is called with a REDIS_ERR status and the context is free'd. */
 static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
+    int completed = 0;
     redisContext *c = &(ac->c);
 
-    if (redisCheckSocketError(c) == REDIS_ERR) {
-        /* Try again later when connect(2) is still in progress. */
-        if (errno == EINPROGRESS)
-            return REDIS_OK;
-
-        if (ac->onConnect) ac->onConnect(ac,REDIS_ERR);
-        __redisAsyncDisconnect(ac);
+    if (redisCheckConnectDone(c, &completed) == REDIS_ERR) {
+        /* Error! */
+        redisCheckSocketError(c);
+        __redisAsyncHandleConnectFailure(ac);
         return REDIS_ERR;
-    }
+    } else if (completed == 1) {
+        /* connected! */
+        if (c->connection_type == REDIS_CONN_TCP &&
+            redisSetTcpNoDelay(c) == REDIS_ERR) {
+            __redisAsyncHandleConnectFailure(ac);
+            return REDIS_ERR;
+        }
 
-    /* Mark context as connected. */
-    c->flags |= REDIS_CONNECTED;
-    if (ac->onConnect) ac->onConnect(ac,REDIS_OK);
-    return REDIS_OK;
+        if (ac->onConnect) ac->onConnect(ac, REDIS_OK);
+        c->flags |= REDIS_CONNECTED;
+        return REDIS_OK;
+    } else {
+        return REDIS_OK;
+    }
+}
+
+void redisAsyncRead(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    if (redisBufferRead(c) == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+    } else {
+        /* Always re-schedule reads */
+        _EL_ADD_READ(ac);
+        redisProcessCallbacks(ac);
+    }
 }
 
 /* This function should be called when the socket is readable.
@@ -525,28 +651,13 @@ void redisAsyncHandleRead(redisAsyncContext *ac) {
             return;
     }
 
-    if (redisBufferRead(c) == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        /* Always re-schedule reads */
-        _EL_ADD_READ(ac);
-        redisProcessCallbacks(ac);
-    }
+    c->funcs->async_read(ac);
 }
 
-void redisAsyncHandleWrite(redisAsyncContext *ac) {
+void redisAsyncWrite(redisAsyncContext *ac) {
     redisContext *c = &(ac->c);
     int done = 0;
 
-    if (!(c->flags & REDIS_CONNECTED)) {
-        /* Abort connect was not successful. */
-        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
-            return;
-        /* Try again later when the context is still not connected. */
-        if (!(c->flags & REDIS_CONNECTED))
-            return;
-    }
-
     if (redisBufferWrite(c,&done) == REDIS_ERR) {
         __redisAsyncDisconnect(ac);
     } else {
@@ -561,6 +672,49 @@ void redisAsyncHandleWrite(redisAsyncContext *ac) {
     }
 }
 
+void redisAsyncHandleWrite(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    if (!(c->flags & REDIS_CONNECTED)) {
+        /* Abort connect was not successful. */
+        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
+            return;
+        /* Try again later when the context is still not connected. */
+        if (!(c->flags & REDIS_CONNECTED))
+            return;
+    }
+
+    c->funcs->async_write(ac);
+}
+
+void redisAsyncHandleTimeout(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisCallback cb;
+
+    if ((c->flags & REDIS_CONNECTED) && ac->replies.head == NULL) {
+        /* Nothing to do - just an idle timeout */
+        return;
+    }
+
+    if (!c->err) {
+        __redisSetError(c, REDIS_ERR_TIMEOUT, "Timeout");
+    }
+
+    if (!(c->flags & REDIS_CONNECTED) && ac->onConnect) {
+        ac->onConnect(ac, REDIS_ERR);
+    }
+
+    while (__redisShiftCallback(&ac->replies, &cb) == REDIS_OK) {
+        __redisRunCallback(ac, &cb, NULL);
+    }
+
+    /**
+     * TODO: Don't automatically sever the connection,
+     * rather, allow to ignore <x> responses before the queue is clear
+     */
+    __redisAsyncDisconnect(ac);
+}
+
 /* Sets a pointer to the first argument and its length starting at p. Returns
  * the number of bytes to skip to get to the following argument. */
 static const char *nextArgument(const char *start, const char **str, size_t *len) {
@@ -583,6 +737,9 @@ static const char *nextArgument(const char *start, const char **str, size_t *len
 static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
     redisContext *c = &(ac->c);
     redisCallback cb;
+    struct dict *cbdict;
+    dictEntry *de;
+    redisCallback *existcb;
     int pvariant, hasnext;
     const char *cstr, *astr;
     size_t clen, alen;
@@ -596,6 +753,7 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void
     /* Setup callback */
     cb.fn = fn;
     cb.privdata = privdata;
+    cb.pending_subs = 1;
 
     /* Find out which command will be appended. */
     p = nextArgument(cmd,&cstr,&clen);
@@ -611,10 +769,22 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void
         /* Add every channel/pattern to the list of subscription callbacks. */
         while ((p = nextArgument(p,&astr,&alen)) != NULL) {
             sname = sdsnewlen(astr,alen);
+            if (sname == NULL)
+                goto oom;
+
             if (pvariant)
-                ret = dictReplace(ac->sub.patterns,sname,&cb);
+                cbdict = ac->sub.patterns;
             else
-                ret = dictReplace(ac->sub.channels,sname,&cb);
+                cbdict = ac->sub.channels;
+
+            de = dictFind(cbdict,sname);
+
+            if (de != NULL) {
+                existcb = dictGetEntryVal(de);
+                cb.pending_subs = existcb->pending_subs + 1;
+            }
+
+            ret = dictReplace(cbdict,sname,&cb);
 
             if (ret == 0) sdsfree(sname);
         }
@@ -645,6 +815,9 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void
     _EL_ADD_WRITE(ac);
 
     return REDIS_OK;
+oom:
+    __redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
+    return REDIS_ERR;
 }
 
 int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap) {
@@ -658,7 +831,7 @@ int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdat
         return REDIS_ERR;
 
     status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    free(cmd);
+    hi_free(cmd);
     return status;
 }
 
@@ -676,6 +849,8 @@ int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *priv
     int len;
     int status;
     len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
+    if (len < 0)
+        return REDIS_ERR;
     status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
     sdsfree(cmd);
     return status;
@@ -685,3 +860,28 @@ int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void
     int status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
     return status;
 }
+
+redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn) {
+    redisAsyncPushFn *old = ac->push_cb;
+    ac->push_cb = fn;
+    return old;
+}
+
+int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv) {
+    if (!ac->c.command_timeout) {
+        ac->c.command_timeout = hi_calloc(1, sizeof(tv));
+        if (ac->c.command_timeout == NULL) {
+            __redisSetError(&ac->c, REDIS_ERR_OOM, "Out of memory");
+            __redisAsyncCopyError(ac);
+            return REDIS_ERR;
+        }
+    }
+
+    if (tv.tv_sec != ac->c.command_timeout->tv_sec ||
+        tv.tv_usec != ac->c.command_timeout->tv_usec)
+    {
+        *ac->c.command_timeout = tv;
+    }
+
+    return REDIS_OK;
+}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/async.h b/debian/modules/nchan/src/store/redis/hiredis/async.h
index 59cbf46..b1d2cb2 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/async.h
+++ b/debian/modules/nchan/src/store/redis/hiredis/async.h
@@ -45,6 +45,7 @@ typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
 typedef struct redisCallback {
     struct redisCallback *next; /* simple singly linked list */
     redisCallbackFn *fn;
+    int pending_subs;
     void *privdata;
 } redisCallback;
 
@@ -56,6 +57,7 @@ typedef struct redisCallbackList {
 /* Connection callback prototypes */
 typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
 typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
+typedef void(redisTimerCallback)(void *timer, void *privdata);
 
 /* Context for an async connection to Redis */
 typedef struct redisAsyncContext {
@@ -68,6 +70,7 @@ typedef struct redisAsyncContext {
 
     /* Not used by hiredis */
     void *data;
+    void (*dataCleanup)(void *privdata);
 
     /* Event library data and hooks */
     struct {
@@ -80,6 +83,7 @@ typedef struct redisAsyncContext {
         void (*addWrite)(void *privdata);
         void (*delWrite)(void *privdata);
         void (*cleanup)(void *privdata);
+        void (*scheduleTimer)(void *privdata, struct timeval tv);
     } ev;
 
     /* Called when either the connection is terminated due to an error or per
@@ -92,15 +96,23 @@ typedef struct redisAsyncContext {
     /* Regular command callbacks */
     redisCallbackList replies;
 
+    /* Address used for connect() */
+    struct sockaddr *saddr;
+    size_t addrlen;
+
     /* Subscription callbacks */
     struct {
         redisCallbackList invalid;
         struct dict *channels;
         struct dict *patterns;
     } sub;
+
+    /* Any configured RESP3 PUSH handler */
+    redisAsyncPushFn *push_cb;
 } redisAsyncContext;
 
 /* Functions that proxy to hiredis */
+redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options);
 redisAsyncContext *redisAsyncConnect(const char *ip, int port);
 redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
 redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
@@ -108,12 +120,18 @@ redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
 redisAsyncContext *redisAsyncConnectUnix(const char *path);
 int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
 int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
+
+redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn);
+int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv);
 void redisAsyncDisconnect(redisAsyncContext *ac);
 void redisAsyncFree(redisAsyncContext *ac);
 
 /* Handle read/write events */
 void redisAsyncHandleRead(redisAsyncContext *ac);
 void redisAsyncHandleWrite(redisAsyncContext *ac);
+void redisAsyncHandleTimeout(redisAsyncContext *ac);
+void redisAsyncRead(redisAsyncContext *ac);
+void redisAsyncWrite(redisAsyncContext *ac);
 
 /* Command functions for an async context. Write the command to the
  * output buffer and register the provided callback. */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/async_private.h b/debian/modules/nchan/src/store/redis/hiredis/async_private.h
new file mode 100644
index 0000000..b9d23ff
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/async_private.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_ASYNC_PRIVATE_H
+#define __HIREDIS_ASYNC_PRIVATE_H
+
+#define _EL_ADD_READ(ctx)                                         \
+    do {                                                          \
+        refreshTimeout(ctx);                                      \
+        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
+    } while (0)
+#define _EL_DEL_READ(ctx) do { \
+        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
+    } while(0)
+#define _EL_ADD_WRITE(ctx)                                          \
+    do {                                                            \
+        refreshTimeout(ctx);                                        \
+        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
+    } while (0)
+#define _EL_DEL_WRITE(ctx) do { \
+        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
+    } while(0)
+#define _EL_CLEANUP(ctx) do { \
+        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
+        ctx->ev.cleanup = NULL; \
+    } while(0);
+
+static inline void refreshTimeout(redisAsyncContext *ctx) {
+    #define REDIS_TIMER_ISSET(tvp) \
+        (tvp && ((tvp)->tv_sec || (tvp)->tv_usec))
+
+    #define REDIS_EL_TIMER(ac, tvp) \
+        if ((ac)->ev.scheduleTimer && REDIS_TIMER_ISSET(tvp)) { \
+            (ac)->ev.scheduleTimer((ac)->ev.data, *(tvp)); \
+        }
+
+    if (ctx->c.flags & REDIS_CONNECTED) {
+        REDIS_EL_TIMER(ctx, ctx->c.command_timeout);
+    } else {
+        REDIS_EL_TIMER(ctx, ctx->c.connect_timeout);
+    }
+}
+
+void __redisAsyncDisconnect(redisAsyncContext *ac);
+void redisProcessCallbacks(redisAsyncContext *ac);
+
+#endif  /* __HIREDIS_ASYNC_PRIVATE_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/dict.c b/debian/modules/nchan/src/store/redis/hiredis/dict.c
index e17a625..74a4633 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/dict.c
+++ b/debian/modules/nchan/src/store/redis/hiredis/dict.c
@@ -34,11 +34,15 @@
  */
 
 #include "fmacros.h"
+#include "alloc.h"
 #include <stdlib.h>
 #include <assert.h>
 #include <limits.h>
 #include "dict.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+
 /* -------------------------- private prototypes ---------------------------- */
 
 static int _dictExpandIfNeeded(dict *ht);
@@ -71,7 +75,10 @@ static void _dictReset(dict *ht) {
 
 /* Create a new hash table */
 static dict *dictCreate(dictType *type, void *privDataPtr) {
-    dict *ht = malloc(sizeof(*ht));
+    dict *ht = hi_malloc(sizeof(*ht));
+    if (ht == NULL)
+        return NULL;
+
     _dictInit(ht,type,privDataPtr);
     return ht;
 }
@@ -97,7 +104,9 @@ static int dictExpand(dict *ht, unsigned long size) {
     _dictInit(&n, ht->type, ht->privdata);
     n.size = realsize;
     n.sizemask = realsize-1;
-    n.table = calloc(realsize,sizeof(dictEntry*));
+    n.table = hi_calloc(realsize,sizeof(dictEntry*));
+    if (n.table == NULL)
+        return DICT_ERR;
 
     /* Copy all the elements from the old to the new table:
      * note that if the old hash table is empty ht->size is zero,
@@ -124,7 +133,7 @@ static int dictExpand(dict *ht, unsigned long size) {
         }
     }
     assert(ht->used == 0);
-    free(ht->table);
+    hi_free(ht->table);
 
     /* Remap the new hashtable in the old */
     *ht = n;
@@ -142,7 +151,10 @@ static int dictAdd(dict *ht, void *key, void *val) {
         return DICT_ERR;
 
     /* Allocates the memory and stores key */
-    entry = malloc(sizeof(*entry));
+    entry = hi_malloc(sizeof(*entry));
+    if (entry == NULL)
+        return DICT_ERR;
+
     entry->next = ht->table[index];
     ht->table[index] = entry;
 
@@ -166,6 +178,9 @@ static int dictReplace(dict *ht, void *key, void *val) {
         return 1;
     /* It already exists, get the entry */
     entry = dictFind(ht, key);
+    if (entry == NULL)
+        return 0;
+
     /* Free the old value and set the new one */
     /* Set the new value and free the old one. Note that it is important
      * to do that in this order, as the value may just be exactly the same
@@ -199,7 +214,7 @@ static int dictDelete(dict *ht, const void *key) {
 
             dictFreeEntryKey(ht,de);
             dictFreeEntryVal(ht,de);
-            free(de);
+            hi_free(de);
             ht->used--;
             return DICT_OK;
         }
@@ -222,13 +237,13 @@ static int _dictClear(dict *ht) {
             nextHe = he->next;
             dictFreeEntryKey(ht, he);
             dictFreeEntryVal(ht, he);
-            free(he);
+            hi_free(he);
             ht->used--;
             he = nextHe;
         }
     }
     /* Free the table and the allocated cache structure */
-    free(ht->table);
+    hi_free(ht->table);
     /* Re-initialize the table */
     _dictReset(ht);
     return DICT_OK; /* never fails */
@@ -237,7 +252,7 @@ static int _dictClear(dict *ht) {
 /* Clear & Release the hash table */
 static void dictRelease(dict *ht) {
     _dictClear(ht);
-    free(ht);
+    hi_free(ht);
 }
 
 static dictEntry *dictFind(dict *ht, const void *key) {
@@ -256,7 +271,9 @@ static dictEntry *dictFind(dict *ht, const void *key) {
 }
 
 static dictIterator *dictGetIterator(dict *ht) {
-    dictIterator *iter = malloc(sizeof(*iter));
+    dictIterator *iter = hi_malloc(sizeof(*iter));
+    if (iter == NULL)
+        return NULL;
 
     iter->ht = ht;
     iter->index = -1;
@@ -286,7 +303,7 @@ static dictEntry *dictNext(dictIterator *iter) {
 }
 
 static void dictReleaseIterator(dictIterator *iter) {
-    free(iter);
+    hi_free(iter);
 }
 
 /* ------------------------- private functions ------------------------------ */
@@ -294,7 +311,7 @@ static void dictReleaseIterator(dictIterator *iter) {
 /* Expand the hash table if needed */
 static int _dictExpandIfNeeded(dict *ht) {
     /* If the hash table is empty expand it to the initial size,
-     * if the table is "full" dobule its size. */
+     * if the table is "full" double its size. */
     if (ht->size == 0)
         return dictExpand(ht, DICT_HT_INITIAL_SIZE);
     if (ht->used == ht->size)
@@ -336,3 +353,5 @@ static int _dictKeyIndex(dict *ht, const void *key) {
     return h;
 }
 
+
+#pragma GCC diagnostic pop
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example-ae.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example-ae.c
deleted file mode 100644
index 8efa730..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/examples/example-ae.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/ae.h>
-
-/* Put event loop in the global scope, so it can be explicitly stopped */
-static aeEventLoop *loop;
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        aeStop(loop);
-        return;
-    }
-
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        aeStop(loop);
-        return;
-    }
-
-    printf("Disconnected...\n");
-    aeStop(loop);
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    loop = aeCreateEventLoop(64);
-    redisAeAttach(loop, c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    aeMain(loop);
-    return 0;
-}
-
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example-libev.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example-libev.c
deleted file mode 100644
index cc8b166..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/examples/example-libev.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libev.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibevAttach(EV_DEFAULT_ c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    ev_loop(EV_DEFAULT_ 0);
-    return 0;
-}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example-libevent.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example-libevent.c
deleted file mode 100644
index d333c22..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/examples/example-libevent.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libevent.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-    struct event_base *base = event_base_new();
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibeventAttach(c,base);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    event_base_dispatch(base);
-    return 0;
-}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example-libuv.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example-libuv.c
deleted file mode 100644
index a5462d4..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/examples/example-libuv.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libuv.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-    uv_loop_t* loop = uv_default_loop();
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibuvAttach(c,loop);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    uv_run(loop, UV_RUN_DEFAULT);
-    return 0;
-}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/examples/example.c b/debian/modules/nchan/src/store/redis/hiredis/examples/example.c
deleted file mode 100644
index 4d494c5..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/examples/example.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <hiredis.h>
-
-int main(int argc, char **argv) {
-    unsigned int j;
-    redisContext *c;
-    redisReply *reply;
-    const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1";
-    int port = (argc > 2) ? atoi(argv[2]) : 6379;
-
-    struct timeval timeout = { 1, 500000 }; // 1.5 seconds
-    c = redisConnectWithTimeout(hostname, port, timeout);
-    if (c == NULL || c->err) {
-        if (c) {
-            printf("Connection error: %s\n", c->errstr);
-            redisFree(c);
-        } else {
-            printf("Connection error: can't allocate redis context\n");
-        }
-        exit(1);
-    }
-
-    /* PING server */
-    reply = redisCommand(c,"PING");
-    printf("PING: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key */
-    reply = redisCommand(c,"SET %s %s", "foo", "hello world");
-    printf("SET: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key using binary safe API */
-    reply = redisCommand(c,"SET %b %b", "bar", (size_t) 3, "hello", (size_t) 5);
-    printf("SET (binary API): %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Try a GET and two INCR */
-    reply = redisCommand(c,"GET foo");
-    printf("GET foo: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-    /* again ... */
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-
-    /* Create a list of numbers, from 0 to 9 */
-    reply = redisCommand(c,"DEL mylist");
-    freeReplyObject(reply);
-    for (j = 0; j < 10; j++) {
-        char buf[64];
-
-        snprintf(buf,64,"%u",j);
-        reply = redisCommand(c,"LPUSH mylist element-%s", buf);
-        freeReplyObject(reply);
-    }
-
-    /* Let's check what we have inside the list */
-    reply = redisCommand(c,"LRANGE mylist 0 -1");
-    if (reply->type == REDIS_REPLY_ARRAY) {
-        for (j = 0; j < reply->elements; j++) {
-            printf("%u) %s\n", j, reply->element[j]->str);
-        }
-    }
-    freeReplyObject(reply);
-
-    /* Disconnects and frees the context */
-    redisFree(c);
-
-    return 0;
-}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/fmacros.h b/debian/modules/nchan/src/store/redis/hiredis/fmacros.h
index 19d7b21..3227faa 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/fmacros.h
+++ b/debian/modules/nchan/src/store/redis/hiredis/fmacros.h
@@ -1,21 +1,12 @@
 #ifndef __HIREDIS_FMACRO_H
 #define __HIREDIS_FMACRO_H
 
-#if defined(__linux__)
-#define _BSD_SOURCE
-#define _DEFAULT_SOURCE
-#endif
-
-#if defined(__sun__)
-#define _POSIX_C_SOURCE 200112L
-#elif defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
 #define _XOPEN_SOURCE 600
-#else
-#define _XOPEN_SOURCE
-#endif
+#define _POSIX_C_SOURCE 200112L
 
-#if __APPLE__ && __MACH__
-#define _OSX
+#if defined(__APPLE__) && defined(__MACH__)
+/* Enable TCP_KEEPALIVE */
+#define _DARWIN_C_SOURCE
 #endif
 
 #endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/hiredis.c b/debian/modules/nchan/src/store/redis/hiredis/hiredis.c
index 2b876d9..ab0e398 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/hiredis.c
+++ b/debian/modules/nchan/src/store/redis/hiredis/hiredis.c
@@ -34,7 +34,6 @@
 #include "fmacros.h"
 #include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 #include <ctype.h>
@@ -42,12 +41,27 @@
 #include "hiredis.h"
 #include "net.h"
 #include "sds.h"
+#include "async.h"
+#include "win32.h"
+
+extern int redisContextUpdateConnectTimeout(redisContext *c, const struct timeval *timeout);
+extern int redisContextUpdateCommandTimeout(redisContext *c, const struct timeval *timeout);
+
+static redisContextFuncs redisContextDefaultFuncs = {
+    .free_privctx = NULL,
+    .async_read = redisAsyncRead,
+    .async_write = redisAsyncWrite,
+    .read = redisNetRead,
+    .write = redisNetWrite
+};
 
 static redisReply *createReplyObject(int type);
 static void *createStringObject(const redisReadTask *task, char *str, size_t len);
-static void *createArrayObject(const redisReadTask *task, int elements);
+static void *createArrayObject(const redisReadTask *task, size_t elements);
 static void *createIntegerObject(const redisReadTask *task, long long value);
+static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len);
 static void *createNilObject(const redisReadTask *task);
+static void *createBoolObject(const redisReadTask *task, int bval);
 
 /* Default set of functions to build the reply. Keep in mind that such a
  * function returning NULL is interpreted as OOM. */
@@ -55,13 +69,15 @@ static redisReplyObjectFunctions defaultFunctions = {
     createStringObject,
     createArrayObject,
     createIntegerObject,
+    createDoubleObject,
     createNilObject,
+    createBoolObject,
     freeReplyObject
 };
 
 /* Create a reply object */
 static redisReply *createReplyObject(int type) {
-    redisReply *r = calloc(1,sizeof(*r));
+    redisReply *r = hi_calloc(1,sizeof(*r));
 
     if (r == NULL)
         return NULL;
@@ -82,21 +98,24 @@ void freeReplyObject(void *reply) {
     case REDIS_REPLY_INTEGER:
         break; /* Nothing to free */
     case REDIS_REPLY_ARRAY:
+    case REDIS_REPLY_MAP:
+    case REDIS_REPLY_SET:
+    case REDIS_REPLY_PUSH:
         if (r->element != NULL) {
             for (j = 0; j < r->elements; j++)
-                if (r->element[j] != NULL)
-                    freeReplyObject(r->element[j]);
-            free(r->element);
+                freeReplyObject(r->element[j]);
+            hi_free(r->element);
         }
         break;
     case REDIS_REPLY_ERROR:
     case REDIS_REPLY_STATUS:
     case REDIS_REPLY_STRING:
-        if (r->str != NULL)
-            free(r->str);
+    case REDIS_REPLY_DOUBLE:
+    case REDIS_REPLY_VERB:
+        hi_free(r->str);
         break;
     }
-    free(r);
+    hi_free(r);
 }
 
 static void *createStringObject(const redisReadTask *task, char *str, size_t len) {
@@ -107,39 +126,56 @@ static void *createStringObject(const redisReadTask *task, char *str, size_t len
     if (r == NULL)
         return NULL;
 
-    buf = malloc(len+1);
-    if (buf == NULL) {
-        freeReplyObject(r);
-        return NULL;
-    }
-
     assert(task->type == REDIS_REPLY_ERROR  ||
            task->type == REDIS_REPLY_STATUS ||
-           task->type == REDIS_REPLY_STRING);
+           task->type == REDIS_REPLY_STRING ||
+           task->type == REDIS_REPLY_VERB);
 
     /* Copy string value */
-    memcpy(buf,str,len);
-    buf[len] = '\0';
+    if (task->type == REDIS_REPLY_VERB) {
+        buf = hi_malloc(len-4+1); /* Skip 4 bytes of verbatim type header. */
+        if (buf == NULL) goto oom;
+
+        memcpy(r->vtype,str,3);
+        r->vtype[3] = '\0';
+        memcpy(buf,str+4,len-4);
+        buf[len-4] = '\0';
+        r->len = len - 4;
+    } else {
+        buf = hi_malloc(len+1);
+        if (buf == NULL) goto oom;
+
+        memcpy(buf,str,len);
+        buf[len] = '\0';
+        r->len = len;
+    }
     r->str = buf;
-    r->len = len;
 
     if (task->parent) {
         parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET ||
+               parent->type == REDIS_REPLY_PUSH);
         parent->element[task->idx] = r;
     }
     return r;
+
+oom:
+    freeReplyObject(r);
+    return NULL;
 }
 
-static void *createArrayObject(const redisReadTask *task, int elements) {
+static void *createArrayObject(const redisReadTask *task, size_t elements) {
     redisReply *r, *parent;
 
-    r = createReplyObject(REDIS_REPLY_ARRAY);
+    r = createReplyObject(task->type);
     if (r == NULL)
         return NULL;
 
     if (elements > 0) {
-        r->element = calloc(elements,sizeof(redisReply*));
+        if (SIZE_MAX / sizeof(redisReply*) < elements) return NULL;  /* Don't overflow */
+        r->element = hi_calloc(elements,sizeof(redisReply*));
         if (r->element == NULL) {
             freeReplyObject(r);
             return NULL;
@@ -150,7 +186,10 @@ static void *createArrayObject(const redisReadTask *task, int elements) {
 
     if (task->parent) {
         parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET ||
+               parent->type == REDIS_REPLY_PUSH);
         parent->element[task->idx] = r;
     }
     return r;
@@ -167,7 +206,42 @@ static void *createIntegerObject(const redisReadTask *task, long long value) {
 
     if (task->parent) {
         parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET ||
+               parent->type == REDIS_REPLY_PUSH);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_DOUBLE);
+    if (r == NULL)
+        return NULL;
+
+    r->dval = value;
+    r->str = hi_malloc(len+1);
+    if (r->str == NULL) {
+        freeReplyObject(r);
+        return NULL;
+    }
+
+    /* The double reply also has the original protocol string representing a
+     * double as a null terminated string. This way the caller does not need
+     * to format back for string conversion, especially since Redis does efforts
+     * to make the string more human readable avoiding the calssical double
+     * decimal string conversion artifacts. */
+    memcpy(r->str, str, len);
+    r->str[len] = '\0';
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET);
         parent->element[task->idx] = r;
     }
     return r;
@@ -182,7 +256,28 @@ static void *createNilObject(const redisReadTask *task) {
 
     if (task->parent) {
         parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createBoolObject(const redisReadTask *task, int bval) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_BOOL);
+    if (r == NULL)
+        return NULL;
+
+    r->integer = bval != 0;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET);
         parent->element[task->idx] = r;
     }
     return r;
@@ -232,7 +327,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
         if (*c != '%' || c[1] == '\0') {
             if (*c == ' ') {
                 if (touched) {
-                    newargv = realloc(curargv,sizeof(char*)*(argc+1));
+                    newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
                     if (newargv == NULL) goto memory_err;
                     curargv = newargv;
                     curargv[argc++] = curarg;
@@ -381,7 +476,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
 
     /* Add the last argument if needed */
     if (touched) {
-        newargv = realloc(curargv,sizeof(char*)*(argc+1));
+        newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
         if (newargv == NULL) goto memory_err;
         curargv = newargv;
         curargv[argc++] = curarg;
@@ -397,7 +492,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
     totlen += 1+countDigits(argc)+2;
 
     /* Build the command at protocol level */
-    cmd = malloc(totlen+1);
+    cmd = hi_malloc(totlen+1);
     if (cmd == NULL) goto memory_err;
 
     pos = sprintf(cmd,"*%d\r\n",argc);
@@ -412,7 +507,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
     assert(pos == totlen);
     cmd[pos] = '\0';
 
-    free(curargv);
+    hi_free(curargv);
     *target = cmd;
     return totlen;
 
@@ -428,15 +523,11 @@ cleanup:
     if (curargv) {
         while(argc--)
             sdsfree(curargv[argc]);
-        free(curargv);
+        hi_free(curargv);
     }
 
     sdsfree(curarg);
-
-    /* No need to check cmd since it is the last statement that can fail,
-     * but do it anyway to be as defensive as possible. */
-    if (cmd != NULL)
-        free(cmd);
+    hi_free(cmd);
 
     return error_type;
 }
@@ -477,7 +568,7 @@ int redisFormatCommand(char **target, const char *format, ...) {
 int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
                               const size_t *argvlen)
 {
-    sds cmd;
+    sds cmd, aux;
     unsigned long long totlen;
     int j;
     size_t len;
@@ -499,15 +590,19 @@ int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
         return -1;
 
     /* We already know how much storage we need */
-    cmd = sdsMakeRoomFor(cmd, totlen);
-    if (cmd == NULL)
+    aux = sdsMakeRoomFor(cmd, totlen);
+    if (aux == NULL) {
+        sdsfree(cmd);
         return -1;
+    }
+
+    cmd = aux;
 
     /* Construct command */
     cmd = sdscatfmt(cmd, "*%i\r\n", argc);
     for (j=0; j < argc; j++) {
         len = argvlen ? argvlen[j] : strlen(argv[j]);
-        cmd = sdscatfmt(cmd, "$%T\r\n", len);
+        cmd = sdscatfmt(cmd, "$%u\r\n", len);
         cmd = sdscatlen(cmd, argv[j], len);
         cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
     }
@@ -545,7 +640,7 @@ int redisFormatCommandArgv(char **target, int argc, const char **argv, const siz
     }
 
     /* Build the command at protocol level */
-    cmd = malloc(totlen+1);
+    cmd = hi_malloc(totlen+1);
     if (cmd == NULL)
         return -1;
 
@@ -566,7 +661,7 @@ int redisFormatCommandArgv(char **target, int argc, const char **argv, const siz
 }
 
 void redisFreeCommand(char *cmd) {
-    free(cmd);
+    hi_free(cmd);
 }
 
 void __redisSetError(redisContext *c, int type, const char *str) {
@@ -581,7 +676,7 @@ void __redisSetError(redisContext *c, int type, const char *str) {
     } else {
         /* Only REDIS_ERR_IO may lack a description! */
         assert(type == REDIS_ERR_IO);
-        __redis_strerror_r(errno, c->errstr, sizeof(c->errstr));
+        strerror_r(errno, c->errstr, sizeof(c->errstr));
     }
 }
 
@@ -589,21 +684,23 @@ redisReader *redisReaderCreate(void) {
     return redisReaderCreateWithFunctions(&defaultFunctions);
 }
 
+static void redisPushAutoFree(void *privdata, void *reply) {
+    (void)privdata;
+    freeReplyObject(reply);
+}
+
 static redisContext *redisContextInit(void) {
     redisContext *c;
 
-    c = calloc(1,sizeof(redisContext));
+    c = hi_calloc(1, sizeof(*c));
     if (c == NULL)
         return NULL;
 
-    c->err = 0;
-    c->errstr[0] = '\0';
+    c->funcs = &redisContextDefaultFuncs;
+
     c->obuf = sdsempty();
     c->reader = redisReaderCreate();
-    c->tcp.host = NULL;
-    c->tcp.source_addr = NULL;
-    c->unix_sock.path = NULL;
-    c->timeout = NULL;
+    c->fd = REDIS_INVALID_FD;
 
     if (c->obuf == NULL || c->reader == NULL) {
         redisFree(c);
@@ -616,26 +713,30 @@ static redisContext *redisContextInit(void) {
 void redisFree(redisContext *c) {
     if (c == NULL)
         return;
-    if (c->fd > 0)
-        close(c->fd);
-    if (c->obuf != NULL)
-        sdsfree(c->obuf);
-    if (c->reader != NULL)
-        redisReaderFree(c->reader);
-    if (c->tcp.host)
-        free(c->tcp.host);
-    if (c->tcp.source_addr)
-        free(c->tcp.source_addr);
-    if (c->unix_sock.path)
-        free(c->unix_sock.path);
-    if (c->timeout)
-        free(c->timeout);
-    free(c);
+    redisNetClose(c);
+
+    sdsfree(c->obuf);
+    redisReaderFree(c->reader);
+    hi_free(c->tcp.host);
+    hi_free(c->tcp.source_addr);
+    hi_free(c->unix_sock.path);
+    hi_free(c->connect_timeout);
+    hi_free(c->command_timeout);
+    hi_free(c->saddr);
+
+    if (c->privdata && c->free_privdata)
+        c->free_privdata(c->privdata);
+
+    if (c->funcs->free_privctx)
+        c->funcs->free_privctx(c->privctx);
+
+    memset(c, 0xff, sizeof(*c));
+    hi_free(c);
 }
 
-int redisFreeKeepFd(redisContext *c) {
-    int fd = c->fd;
-    c->fd = -1;
+redisFD redisFreeKeepFd(redisContext *c) {
+    redisFD fd = c->fd;
+    c->fd = REDIS_INVALID_FD;
     redisFree(c);
     return fd;
 }
@@ -644,132 +745,163 @@ int redisReconnect(redisContext *c) {
     c->err = 0;
     memset(c->errstr, '\0', strlen(c->errstr));
 
-    if (c->fd > 0) {
-        close(c->fd);
+    if (c->privctx && c->funcs->free_privctx) {
+        c->funcs->free_privctx(c->privctx);
+        c->privctx = NULL;
     }
 
+    redisNetClose(c);
+
     sdsfree(c->obuf);
     redisReaderFree(c->reader);
 
     c->obuf = sdsempty();
     c->reader = redisReaderCreate();
 
+    if (c->obuf == NULL || c->reader == NULL) {
+        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+        return REDIS_ERR;
+    }
+
+    int ret = REDIS_ERR;
     if (c->connection_type == REDIS_CONN_TCP) {
-        return redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
-                c->timeout, c->tcp.source_addr);
+        ret = redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
+               c->connect_timeout, c->tcp.source_addr);
     } else if (c->connection_type == REDIS_CONN_UNIX) {
-        return redisContextConnectUnix(c, c->unix_sock.path, c->timeout);
+        ret = redisContextConnectUnix(c, c->unix_sock.path, c->connect_timeout);
     } else {
         /* Something bad happened here and shouldn't have. There isn't
            enough information in the context to reconnect. */
         __redisSetError(c,REDIS_ERR_OTHER,"Not enough information to reconnect");
+        ret = REDIS_ERR;
     }
 
-    return REDIS_ERR;
+    if (c->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
+        redisContextSetTimeout(c, *c->command_timeout);
+    }
+
+    return ret;
+}
+
+redisContext *redisConnectWithOptions(const redisOptions *options) {
+    redisContext *c = redisContextInit();
+    if (c == NULL) {
+        return NULL;
+    }
+    if (!(options->options & REDIS_OPT_NONBLOCK)) {
+        c->flags |= REDIS_BLOCK;
+    }
+    if (options->options & REDIS_OPT_REUSEADDR) {
+        c->flags |= REDIS_REUSEADDR;
+    }
+    if (options->options & REDIS_OPT_NOAUTOFREE) {
+        c->flags |= REDIS_NO_AUTO_FREE;
+    }
+
+    /* Set any user supplied RESP3 PUSH handler or use freeReplyObject
+     * as a default unless specifically flagged that we don't want one. */
+    if (options->push_cb != NULL)
+        redisSetPushCallback(c, options->push_cb);
+    else if (!(options->options & REDIS_OPT_NO_PUSH_AUTOFREE))
+        redisSetPushCallback(c, redisPushAutoFree);
+
+    c->privdata = options->privdata;
+    c->free_privdata = options->free_privdata;
+
+    if (redisContextUpdateConnectTimeout(c, options->connect_timeout) != REDIS_OK ||
+        redisContextUpdateCommandTimeout(c, options->command_timeout) != REDIS_OK) {
+        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+        return c;
+    }
+
+    if (options->type == REDIS_CONN_TCP) {
+        redisContextConnectBindTcp(c, options->endpoint.tcp.ip,
+                                   options->endpoint.tcp.port, options->connect_timeout,
+                                   options->endpoint.tcp.source_addr);
+    } else if (options->type == REDIS_CONN_UNIX) {
+        redisContextConnectUnix(c, options->endpoint.unix_socket,
+                                options->connect_timeout);
+    } else if (options->type == REDIS_CONN_USERFD) {
+        c->fd = options->endpoint.fd;
+        c->flags |= REDIS_CONNECTED;
+    } else {
+        // Unknown type - FIXME - FREE
+        return NULL;
+    }
+
+    if (options->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
+        redisContextSetTimeout(c, *options->command_timeout);
+    }
+
+    return c;
 }
 
 /* Connect to a Redis instance. On error the field error in the returned
  * context will be set to the return value of the error function.
  * When no set of reply functions is given, the default set will be used. */
 redisContext *redisConnect(const char *ip, int port) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,NULL);
-    return c;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    return redisConnectWithOptions(&options);
 }
 
 redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,&tv);
-    return c;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.connect_timeout = &tv;
+    return redisConnectWithOptions(&options);
 }
 
 redisContext *redisConnectNonBlock(const char *ip, int port) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags &= ~REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,NULL);
-    return c;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.options |= REDIS_OPT_NONBLOCK;
+    return redisConnectWithOptions(&options);
 }
 
 redisContext *redisConnectBindNonBlock(const char *ip, int port,
                                        const char *source_addr) {
-    redisContext *c = redisContextInit();
-    c->flags &= ~REDIS_BLOCK;
-    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
-    return c;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.endpoint.tcp.source_addr = source_addr;
+    options.options |= REDIS_OPT_NONBLOCK;
+    return redisConnectWithOptions(&options);
 }
 
 redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
                                                 const char *source_addr) {
-    redisContext *c = redisContextInit();
-    c->flags &= ~REDIS_BLOCK;
-    c->flags |= REDIS_REUSEADDR;
-    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
-    return c;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.endpoint.tcp.source_addr = source_addr;
+    options.options |= REDIS_OPT_NONBLOCK|REDIS_OPT_REUSEADDR;
+    return redisConnectWithOptions(&options);
 }
 
 redisContext *redisConnectUnix(const char *path) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectUnix(c,path,NULL);
-    return c;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_UNIX(&options, path);
+    return redisConnectWithOptions(&options);
 }
 
 redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectUnix(c,path,&tv);
-    return c;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_UNIX(&options, path);
+    options.connect_timeout = &tv;
+    return redisConnectWithOptions(&options);
 }
 
 redisContext *redisConnectUnixNonBlock(const char *path) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags &= ~REDIS_BLOCK;
-    redisContextConnectUnix(c,path,NULL);
-    return c;
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_UNIX(&options, path);
+    options.options |= REDIS_OPT_NONBLOCK;
+    return redisConnectWithOptions(&options);
 }
 
-redisContext *redisConnectFd(int fd) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->fd = fd;
-    c->flags |= REDIS_BLOCK | REDIS_CONNECTED;
-    return c;
+redisContext *redisConnectFd(redisFD fd) {
+    redisOptions options = {0};
+    options.type = REDIS_CONN_USERFD;
+    options.endpoint.fd = fd;
+    return redisConnectWithOptions(&options);
 }
 
 /* Set read/write timeout on a blocking socket. */
@@ -786,10 +918,17 @@ int redisEnableKeepAlive(redisContext *c) {
     return REDIS_OK;
 }
 
+/* Set a user provided RESP3 PUSH handler and return any old one set. */
+redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn) {
+    redisPushFn *old = c->push_cb;
+    c->push_cb = fn;
+    return old;
+}
+
 /* Use this function to handle a read event on the descriptor. It will try
  * and read some bytes from the socket and feed them to the reply parser.
  *
- * After this function is called, you may use redisContextReadReply to
+ * After this function is called, you may use redisGetReplyFromReader to
  * see if there is a reply available. */
 int redisBufferRead(redisContext *c) {
     char buf[1024*16];
@@ -799,22 +938,15 @@ int redisBufferRead(redisContext *c) {
     if (c->err)
         return REDIS_ERR;
 
-    nread = read(c->fd,buf,sizeof(buf));
-    if (nread == -1) {
-        if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-            /* Try again later */
+    nread = c->funcs->read(c, buf, sizeof(buf));
+    if (nread > 0) {
+        if (redisReaderFeed(c->reader, buf, nread) != REDIS_OK) {
+            __redisSetError(c, c->reader->err, c->reader->errstr);
+            return REDIS_ERR;
         } else {
-            __redisSetError(c,REDIS_ERR_IO,NULL);
-            return REDIS_ERR;
         }
-    } else if (nread == 0) {
-        __redisSetError(c,REDIS_ERR_EOF,"Server closed the connection");
+    } else if (nread < 0) {
         return REDIS_ERR;
-    } else {
-        if (redisReaderFeed(c->reader,buf,nread) != REDIS_OK) {
-            __redisSetError(c,c->reader->err,c->reader->errstr);
-            return REDIS_ERR;
-        }
     }
     return REDIS_OK;
 }
@@ -829,32 +961,32 @@ int redisBufferRead(redisContext *c) {
  * c->errstr to hold the appropriate error string.
  */
 int redisBufferWrite(redisContext *c, int *done) {
-    int nwritten;
 
     /* Return early when the context has seen an error. */
     if (c->err)
         return REDIS_ERR;
 
     if (sdslen(c->obuf) > 0) {
-        nwritten = write(c->fd,c->obuf,sdslen(c->obuf));
-        if (nwritten == -1) {
-            if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-                /* Try again later */
-            } else {
-                __redisSetError(c,REDIS_ERR_IO,NULL);
-                return REDIS_ERR;
-            }
+        ssize_t nwritten = c->funcs->write(c);
+        if (nwritten < 0) {
+            return REDIS_ERR;
         } else if (nwritten > 0) {
-            if (nwritten == (signed)sdslen(c->obuf)) {
+            if (nwritten == (ssize_t)sdslen(c->obuf)) {
                 sdsfree(c->obuf);
                 c->obuf = sdsempty();
+                if (c->obuf == NULL)
+                    goto oom;
             } else {
-                sdsrange(c->obuf,nwritten,-1);
+                if (sdsrange(c->obuf,nwritten,-1) < 0) goto oom;
             }
         }
     }
     if (done != NULL) *done = (sdslen(c->obuf) == 0);
     return REDIS_OK;
+
+oom:
+    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+    return REDIS_ERR;
 }
 
 /* Internal helper function to try and get a reply from the reader,
@@ -864,9 +996,21 @@ int redisGetReplyFromReader(redisContext *c, void **reply) {
         __redisSetError(c,c->reader->err,c->reader->errstr);
         return REDIS_ERR;
     }
+
     return REDIS_OK;
 }
 
+/* Internal helper that returns 1 if the reply was a RESP3 PUSH
+ * message and we handled it with a user-provided callback. */
+static int redisHandledPushReply(redisContext *c, void *reply) {
+    if (reply && c->push_cb && redisIsPushReply(reply)) {
+        c->push_cb(c->privdata, reply);
+        return 1;
+    }
+
+    return 0;
+}
+
 int redisGetReply(redisContext *c, void **reply) {
     int wdone = 0;
     void *aux = NULL;
@@ -887,13 +1031,23 @@ int redisGetReply(redisContext *c, void **reply) {
         do {
             if (redisBufferRead(c) == REDIS_ERR)
                 return REDIS_ERR;
-            if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
-                return REDIS_ERR;
+
+            /* We loop here in case the user has specified a RESP3
+             * PUSH handler (e.g. for client tracking). */
+            do {
+                if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
+                    return REDIS_ERR;
+            } while (redisHandledPushReply(c, aux));
         } while (aux == NULL);
     }
 
-    /* Set reply object */
-    if (reply != NULL) *reply = aux;
+    /* Set reply or free it if we were passed NULL */
+    if (reply != NULL) {
+        *reply = aux;
+    } else {
+        freeReplyObject(aux);
+    }
+
     return REDIS_OK;
 }
 
@@ -940,11 +1094,11 @@ int redisvAppendCommand(redisContext *c, const char *format, va_list ap) {
     }
 
     if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
-        free(cmd);
+        hi_free(cmd);
         return REDIS_ERR;
     }
 
-    free(cmd);
+    hi_free(cmd);
     return REDIS_OK;
 }
 
@@ -1007,9 +1161,8 @@ void *redisvCommand(redisContext *c, const char *format, va_list ap) {
 
 void *redisCommand(redisContext *c, const char *format, ...) {
     va_list ap;
-    void *reply = NULL;
     va_start(ap,format);
-    reply = redisvCommand(c,format,ap);
+    void *reply = redisvCommand(c,format,ap);
     va_end(ap);
     return reply;
 }
diff --git a/debian/modules/nchan/src/store/redis/hiredis/hiredis.h b/debian/modules/nchan/src/store/redis/hiredis/hiredis.h
index 11a75c1..21593b6 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/hiredis.h
+++ b/debian/modules/nchan/src/store/redis/hiredis/hiredis.h
@@ -35,16 +35,22 @@
 #define __HIREDIS_H
 #include "read.h"
 #include <stdarg.h> /* for va_list */
+#ifndef _MSC_VER
 #include <sys/time.h> /* for struct timeval */
+#else
+struct timeval; /* forward declaration */
+typedef long long ssize_t;
+#endif
 #include <stdint.h> /* uintXX_t, etc */
 #include "sds.h" /* for sds */
+#include "alloc.h" /* for allocation wrappers */
 
 #include <sys/socket.h> /* for struct sockaddr */
 
-#define HIREDIS_MAJOR 0
-#define HIREDIS_MINOR 13
-#define HIREDIS_PATCH 3
-#define HIREDIS_SONAME 0.13
+#define HIREDIS_MAJOR 1
+#define HIREDIS_MINOR 0
+#define HIREDIS_PATCH 2
+#define HIREDIS_SONAME 1.0.0
 
 /* Connection type can be blocking or non-blocking and is set in the
  * least significant bit of the flags field in redisContext. */
@@ -76,35 +82,26 @@
 /* Flag that is set when we should set SO_REUSEADDR before calling bind() */
 #define REDIS_REUSEADDR 0x80
 
+/**
+ * Flag that indicates the user does not want the context to
+ * be automatically freed upon error
+ */
+#define REDIS_NO_AUTO_FREE 0x200
+
 #define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
 
 /* number of times we retry to connect in the case of EADDRNOTAVAIL and
  * SO_REUSEADDR is being used. */
 #define REDIS_CONNECT_RETRIES  10
 
-/* strerror_r has two completely different prototypes and behaviors
- * depending on system issues, so we need to operate on the error buffer
- * differently depending on which strerror_r we're using. */
-#ifndef _GNU_SOURCE
-/* "regular" POSIX strerror_r that does the right thing. */
-#define __redis_strerror_r(errno, buf, len)                                    \
-    do {                                                                       \
-        strerror_r((errno), (buf), (len));                                     \
-    } while (0)
-#else
-/* "bad" GNU strerror_r we need to clean up after. */
-#define __redis_strerror_r(errno, buf, len)                                    \
-    do {                                                                       \
-        char *err_str = strerror_r((errno), (buf), (len));                     \
-        /* If return value _isn't_ the start of the buffer we passed in,       \
-         * then GNU strerror_r returned an internal static buffer and we       \
-         * need to copy the result into our private buffer. */                 \
-        if (err_str != (buf)) {                                                \
-            buf[(len)] = '\0';                                                 \
-            strncat((buf), err_str, ((len) - 1));                              \
-        }                                                                      \
-    } while (0)
-#endif
+/* Forward declarations for structs defined elsewhere */
+struct redisAsyncContext;
+struct redisContext;
+
+/* RESP3 push helpers and callback prototypes */
+#define redisIsPushReply(r) (((redisReply*)(r))->type == REDIS_REPLY_PUSH)
+typedef void (redisPushFn)(void *, void *);
+typedef void (redisAsyncPushFn)(struct redisAsyncContext *, void *);
 
 #ifdef __cplusplus
 extern "C" {
@@ -114,8 +111,12 @@ extern "C" {
 typedef struct redisReply {
     int type; /* REDIS_REPLY_* */
     long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
-    int len; /* Length of string */
-    char *str; /* Used for both REDIS_REPLY_ERROR and REDIS_REPLY_STRING */
+    double dval; /* The double when type is REDIS_REPLY_DOUBLE */
+    size_t len; /* Length of string */
+    char *str; /* Used for REDIS_REPLY_ERROR, REDIS_REPLY_STRING
+                  REDIS_REPLY_VERB, and REDIS_REPLY_DOUBLE (in additional to dval). */
+    char vtype[4]; /* Used for REDIS_REPLY_VERB, contains the null
+                      terminated 3 character content type, such as "txt". */
     size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
     struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
 } redisReply;
@@ -136,20 +137,115 @@ void redisFreeSdsCommand(sds cmd);
 enum redisConnectionType {
     REDIS_CONN_TCP,
     REDIS_CONN_UNIX,
+    REDIS_CONN_USERFD
 };
 
+struct redisSsl;
+
+#define REDIS_OPT_NONBLOCK 0x01
+#define REDIS_OPT_REUSEADDR 0x02
+
+/**
+ * Don't automatically free the async object on a connection failure,
+ * or other implicit conditions. Only free on an explicit call to disconnect() or free()
+ */
+#define REDIS_OPT_NOAUTOFREE 0x04
+
+/* Don't automatically intercept and free RESP3 PUSH replies. */
+#define REDIS_OPT_NO_PUSH_AUTOFREE 0x08
+
+/* In Unix systems a file descriptor is a regular signed int, with -1
+ * representing an invalid descriptor. In Windows it is a SOCKET
+ * (32- or 64-bit unsigned integer depending on the architecture), where
+ * all bits set (~0) is INVALID_SOCKET.  */
+#ifndef _WIN32
+typedef int redisFD;
+#define REDIS_INVALID_FD -1
+#else
+#ifdef _WIN64
+typedef unsigned long long redisFD; /* SOCKET = 64-bit UINT_PTR */
+#else
+typedef unsigned long redisFD;      /* SOCKET = 32-bit UINT_PTR */
+#endif
+#define REDIS_INVALID_FD ((redisFD)(~0)) /* INVALID_SOCKET */
+#endif
+
+typedef struct {
+    /*
+     * the type of connection to use. This also indicates which
+     * `endpoint` member field to use
+     */
+    int type;
+    /* bit field of REDIS_OPT_xxx */
+    int options;
+    /* timeout value for connect operation. If NULL, no timeout is used */
+    const struct timeval *connect_timeout;
+    /* timeout value for commands. If NULL, no timeout is used.  This can be
+     * updated at runtime with redisSetTimeout/redisAsyncSetTimeout. */
+    const struct timeval *command_timeout;
+    union {
+        /** use this field for tcp/ip connections */
+        struct {
+            const char *source_addr;
+            const char *ip;
+            int port;
+        } tcp;
+        /** use this field for unix domain sockets */
+        const char *unix_socket;
+        /**
+         * use this field to have hiredis operate an already-open
+         * file descriptor */
+        redisFD fd;
+    } endpoint;
+
+    /* Optional user defined data/destructor */
+    void *privdata;
+    void (*free_privdata)(void *);
+
+    /* A user defined PUSH message callback */
+    redisPushFn *push_cb;
+    redisAsyncPushFn *async_push_cb;
+} redisOptions;
+
+/**
+ * Helper macros to initialize options to their specified fields.
+ */
+#define REDIS_OPTIONS_SET_TCP(opts, ip_, port_) \
+    (opts)->type = REDIS_CONN_TCP; \
+    (opts)->endpoint.tcp.ip = ip_; \
+    (opts)->endpoint.tcp.port = port_;
+
+#define REDIS_OPTIONS_SET_UNIX(opts, path) \
+    (opts)->type = REDIS_CONN_UNIX;        \
+    (opts)->endpoint.unix_socket = path;
+
+#define REDIS_OPTIONS_SET_PRIVDATA(opts, data, dtor) \
+    (opts)->privdata = data;                         \
+    (opts)->free_privdata = dtor;                    \
+
+typedef struct redisContextFuncs {
+    void (*free_privctx)(void *);
+    void (*async_read)(struct redisAsyncContext *);
+    void (*async_write)(struct redisAsyncContext *);
+    ssize_t (*read)(struct redisContext *, char *, size_t);
+    ssize_t (*write)(struct redisContext *);
+} redisContextFuncs;
+
 /* Context for a connection to Redis */
 typedef struct redisContext {
+    const redisContextFuncs *funcs;   /* Function table */
+
     int err; /* Error flags, 0 when there is no error */
     char errstr[128]; /* String representation of error when applicable */
-    int fd;
+    redisFD fd;
     struct sockaddr sockaddr;
     int flags;
     char *obuf; /* Write buffer */
     redisReader *reader; /* Protocol reader */
 
     enum redisConnectionType connection_type;
-    struct timeval *timeout;
+    struct timeval *connect_timeout;
+    struct timeval *command_timeout;
 
     struct {
         char *host;
@@ -161,8 +257,24 @@ typedef struct redisContext {
         char *path;
     } unix_sock;
 
+    /* For non-blocking connect */
+    struct sockadr *saddr;
+    size_t addrlen;
+
+    /* Optional data and corresponding destructor users can use to provide
+     * context to a given redisContext.  Not used by hiredis. */
+    void *privdata;
+    void (*free_privdata)(void *);
+
+    /* Internal context pointer presently used by hiredis to manage
+     * SSL connections. */
+    void *privctx;
+
+    /* An optional RESP3 PUSH handler */
+    redisPushFn *push_cb;
 } redisContext;
 
+redisContext *redisConnectWithOptions(const redisOptions *options);
 redisContext *redisConnect(const char *ip, int port);
 redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
 redisContext *redisConnectNonBlock(const char *ip, int port);
@@ -173,7 +285,7 @@ redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
 redisContext *redisConnectUnix(const char *path);
 redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
 redisContext *redisConnectUnixNonBlock(const char *path);
-redisContext *redisConnectFd(int fd);
+redisContext *redisConnectFd(redisFD fd);
 
 /**
  * Reconnect the given context using the saved information.
@@ -186,10 +298,11 @@ redisContext *redisConnectFd(int fd);
  */
 int redisReconnect(redisContext *c);
 
+redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn);
 int redisSetTimeout(redisContext *c, const struct timeval tv);
 int redisEnableKeepAlive(redisContext *c);
 void redisFree(redisContext *c);
-int redisFreeKeepFd(redisContext *c);
+redisFD redisFreeKeepFd(redisContext *c);
 int redisBufferRead(redisContext *c);
 int redisBufferWrite(redisContext *c, int *done);
 
diff --git a/debian/modules/nchan/src/store/redis/hiredis/hiredis_ssl.h b/debian/modules/nchan/src/store/redis/hiredis/hiredis_ssl.h
new file mode 100644
index 0000000..604efe0
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/hiredis_ssl.h
@@ -0,0 +1,127 @@
+
+/*
+ * Copyright (c) 2019, Redis Labs
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_SSL_H
+#define __HIREDIS_SSL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This is the underlying struct for SSL in ssl.h, which is not included to
+ * keep build dependencies short here.
+ */
+struct ssl_st;
+
+/* A wrapper around OpenSSL SSL_CTX to allow easy SSL use without directly
+ * calling OpenSSL.
+ */
+typedef struct redisSSLContext redisSSLContext;
+
+/**
+ * Initialization errors that redisCreateSSLContext() may return.
+ */
+
+typedef enum {
+    REDIS_SSL_CTX_NONE = 0,                     /* No Error */
+    REDIS_SSL_CTX_CREATE_FAILED,                /* Failed to create OpenSSL SSL_CTX */
+    REDIS_SSL_CTX_CERT_KEY_REQUIRED,            /* Client cert and key must both be specified or skipped */
+    REDIS_SSL_CTX_CA_CERT_LOAD_FAILED,          /* Failed to load CA Certificate or CA Path */
+    REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED,      /* Failed to load client certificate */
+    REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED       /* Failed to load private key */
+} redisSSLContextError;
+
+/**
+ * Return the error message corresponding with the specified error code.
+ */
+
+const char *redisSSLContextGetError(redisSSLContextError error);
+
+/**
+ * Helper function to initialize the OpenSSL library.
+ *
+ * OpenSSL requires one-time initialization before it can be used. Callers should
+ * call this function only once, and only if OpenSSL is not directly initialized
+ * elsewhere.
+ */
+int redisInitOpenSSL(void);
+
+/**
+ * Helper function to initialize an OpenSSL context that can be used
+ * to initiate SSL connections.
+ *
+ * cacert_filename is an optional name of a CA certificate/bundle file to load
+ * and use for validation.
+ *
+ * capath is an optional directory path where trusted CA certificate files are
+ * stored in an OpenSSL-compatible structure.
+ *
+ * cert_filename and private_key_filename are optional names of a client side
+ * certificate and private key files to use for authentication. They need to
+ * be both specified or omitted.
+ *
+ * server_name is an optional and will be used as a server name indication
+ * (SNI) TLS extension.
+ *
+ * If error is non-null, it will be populated in case the context creation fails
+ * (returning a NULL).
+ */
+
+redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
+        const char *cert_filename, const char *private_key_filename,
+        const char *server_name, redisSSLContextError *error);
+
+/**
+ * Free a previously created OpenSSL context.
+ */
+void redisFreeSSLContext(redisSSLContext *redis_ssl_ctx);
+
+/**
+ * Initiate SSL on an existing redisContext.
+ *
+ * This is similar to redisInitiateSSL() but does not require the caller
+ * to directly interact with OpenSSL, and instead uses a redisSSLContext
+ * previously created using redisCreateSSLContext().
+ */
+
+int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx);
+
+/**
+ * Initiate SSL/TLS negotiation on a provided OpenSSL SSL object.
+ */
+
+int redisInitiateSSL(redisContext *c, struct ssl_st *ssl);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __HIREDIS_SSL_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/net.c b/debian/modules/nchan/src/store/redis/hiredis/net.c
index f874901..3737430 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/net.c
+++ b/debian/modules/nchan/src/store/redis/hiredis/net.c
@@ -34,43 +34,72 @@
 
 #include "fmacros.h"
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
-#include <netdb.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <poll.h>
 #include <limits.h>
 #include <stdlib.h>
 
 #include "net.h"
 #include "sds.h"
+#include "sockcompat.h"
+#include "win32.h"
 
 /* Defined in hiredis.c */
 void __redisSetError(redisContext *c, int type, const char *str);
 
-static void redisContextCloseFd(redisContext *c) {
-    if (c && c->fd >= 0) {
+void redisNetClose(redisContext *c) {
+    if (c && c->fd != REDIS_INVALID_FD) {
         close(c->fd);
-        c->fd = -1;
+        c->fd = REDIS_INVALID_FD;
     }
 }
 
+ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap) {
+    ssize_t nread = recv(c->fd, buf, bufcap, 0);
+    if (nread == -1) {
+        if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
+            /* Try again later */
+            return 0;
+        } else if(errno == ETIMEDOUT && (c->flags & REDIS_BLOCK)) {
+            /* especially in windows */
+            __redisSetError(c, REDIS_ERR_TIMEOUT, "recv timeout");
+            return -1;
+        } else {
+            __redisSetError(c, REDIS_ERR_IO, NULL);
+            return -1;
+        }
+    } else if (nread == 0) {
+        __redisSetError(c, REDIS_ERR_EOF, "Server closed the connection");
+        return -1;
+    } else {
+        return nread;
+    }
+}
+
+ssize_t redisNetWrite(redisContext *c) {
+    ssize_t nwritten = send(c->fd, c->obuf, sdslen(c->obuf), 0);
+    if (nwritten < 0) {
+        if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
+            /* Try again later */
+        } else {
+            __redisSetError(c, REDIS_ERR_IO, NULL);
+            return -1;
+        }
+    }
+    return nwritten;
+}
+
 static void __redisSetErrorFromErrno(redisContext *c, int type, const char *prefix) {
+    int errorno = errno;  /* snprintf() may change errno */
     char buf[128] = { 0 };
     size_t len = 0;
 
     if (prefix != NULL)
         len = snprintf(buf,sizeof(buf),"%s: ",prefix);
-    __redis_strerror_r(errno, (char *)(buf + len), sizeof(buf) - len);
+    strerror_r(errorno, (char *)(buf + len), sizeof(buf) - len);
     __redisSetError(c,type,buf);
 }
 
@@ -78,15 +107,15 @@ static int redisSetReuseAddr(redisContext *c) {
     int on = 1;
     if (setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
         __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        redisContextCloseFd(c);
+        redisNetClose(c);
         return REDIS_ERR;
     }
     return REDIS_OK;
 }
 
 static int redisCreateSocket(redisContext *c, int type) {
-    int s;
-    if ((s = socket(type, SOCK_STREAM, 0)) == -1) {
+    redisFD s;
+    if ((s = socket(type, SOCK_STREAM, 0)) == REDIS_INVALID_FD) {
         __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
         return REDIS_ERR;
     }
@@ -100,6 +129,7 @@ static int redisCreateSocket(redisContext *c, int type) {
 }
 
 static int redisSetBlocking(redisContext *c, int blocking) {
+#ifndef _WIN32
     int flags;
 
     /* Set the socket nonblocking.
@@ -107,7 +137,7 @@ static int redisSetBlocking(redisContext *c, int blocking) {
      * interrupted by a signal. */
     if ((flags = fcntl(c->fd, F_GETFL)) == -1) {
         __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_GETFL)");
-        redisContextCloseFd(c);
+        redisNetClose(c);
         return REDIS_ERR;
     }
 
@@ -118,15 +148,23 @@ static int redisSetBlocking(redisContext *c, int blocking) {
 
     if (fcntl(c->fd, F_SETFL, flags) == -1) {
         __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_SETFL)");
-        redisContextCloseFd(c);
+        redisNetClose(c);
         return REDIS_ERR;
     }
+#else
+    u_long mode = blocking ? 0 : 1;
+    if (ioctl(c->fd, FIONBIO, &mode) == -1) {
+        __redisSetErrorFromErrno(c, REDIS_ERR_IO, "ioctl(FIONBIO)");
+        redisNetClose(c);
+        return REDIS_ERR;
+    }
+#endif /* _WIN32 */
     return REDIS_OK;
 }
 
 int redisKeepAlive(redisContext *c, int interval) {
     int val = 1;
-    int fd = c->fd;
+    redisFD fd = c->fd;
 
     if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == -1){
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
@@ -135,14 +173,13 @@ int redisKeepAlive(redisContext *c, int interval) {
 
     val = interval;
 
-#ifdef _OSX
+#if defined(__APPLE__) && defined(__MACH__)
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }
 #else
 #if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
-    val = interval;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
@@ -166,11 +203,11 @@ int redisKeepAlive(redisContext *c, int interval) {
     return REDIS_OK;
 }
 
-static int redisSetTcpNoDelay(redisContext *c) {
+int redisSetTcpNoDelay(redisContext *c) {
     int yes = 1;
     if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)) == -1) {
         __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(TCP_NODELAY)");
-        redisContextCloseFd(c);
+        redisNetClose(c);
         return REDIS_ERR;
     }
     return REDIS_OK;
@@ -178,19 +215,15 @@ static int redisSetTcpNoDelay(redisContext *c) {
 
 #define __MAX_MSEC (((LONG_MAX) - 999) / 1000)
 
-static int redisContextWaitReady(redisContext *c, const struct timeval *timeout) {
-    struct pollfd   wfd[1];
-    long msec;
-
-    msec          = -1;
-    wfd[0].fd     = c->fd;
-    wfd[0].events = POLLOUT;
+static int redisContextTimeoutMsec(redisContext *c, long *result)
+{
+    const struct timeval *timeout = c->connect_timeout;
+    long msec = -1;
 
     /* Only use timeout when not NULL. */
     if (timeout != NULL) {
         if (timeout->tv_usec > 1000000 || timeout->tv_sec > __MAX_MSEC) {
-            __redisSetErrorFromErrno(c, REDIS_ERR_IO, NULL);
-            redisContextCloseFd(c);
+            *result = msec;
             return REDIS_ERR;
         }
 
@@ -201,33 +234,65 @@ static int redisContextWaitReady(redisContext *c, const struct timeval *timeout)
         }
     }
 
+    *result = msec;
+    return REDIS_OK;
+}
+
+static int redisContextWaitReady(redisContext *c, long msec) {
+    struct pollfd   wfd[1];
+
+    wfd[0].fd     = c->fd;
+    wfd[0].events = POLLOUT;
+
     if (errno == EINPROGRESS) {
         int res;
 
         if ((res = poll(wfd, 1, msec)) == -1) {
             __redisSetErrorFromErrno(c, REDIS_ERR_IO, "poll(2)");
-            redisContextCloseFd(c);
+            redisNetClose(c);
             return REDIS_ERR;
         } else if (res == 0) {
             errno = ETIMEDOUT;
             __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-            redisContextCloseFd(c);
+            redisNetClose(c);
             return REDIS_ERR;
         }
 
-        if (redisCheckSocketError(c) != REDIS_OK)
+        if (redisCheckConnectDone(c, &res) != REDIS_OK || res == 0) {
+            redisCheckSocketError(c);
             return REDIS_ERR;
+        }
 
         return REDIS_OK;
     }
 
     __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-    redisContextCloseFd(c);
+    redisNetClose(c);
     return REDIS_ERR;
 }
 
+int redisCheckConnectDone(redisContext *c, int *completed) {
+    int rc = connect(c->fd, (const struct sockaddr *)c->saddr, c->addrlen);
+    if (rc == 0) {
+        *completed = 1;
+        return REDIS_OK;
+    }
+    switch (errno) {
+    case EISCONN:
+        *completed = 1;
+        return REDIS_OK;
+    case EALREADY:
+    case EINPROGRESS:
+    case EWOULDBLOCK:
+        *completed = 0;
+        return REDIS_OK;
+    default:
+        return REDIS_ERR;
+    }
+}
+
 int redisCheckSocketError(redisContext *c) {
-    int err = 0;
+    int err = 0, errno_saved = errno;
     socklen_t errlen = sizeof(err);
 
     if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
@@ -235,6 +300,10 @@ int redisCheckSocketError(redisContext *c) {
         return REDIS_ERR;
     }
 
+    if (err == 0) {
+        err = errno_saved;
+    }
+
     if (err) {
         errno = err;
         __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
@@ -245,27 +314,65 @@ int redisCheckSocketError(redisContext *c) {
 }
 
 int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
-    if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,&tv,sizeof(tv)) == -1) {
+    const void *to_ptr = &tv;
+    size_t to_sz = sizeof(tv);
+
+    if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,to_ptr,to_sz) == -1) {
         __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_RCVTIMEO)");
         return REDIS_ERR;
     }
-    if (setsockopt(c->fd,SOL_SOCKET,SO_SNDTIMEO,&tv,sizeof(tv)) == -1) {
+    if (setsockopt(c->fd,SOL_SOCKET,SO_SNDTIMEO,to_ptr,to_sz) == -1) {
         __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_SNDTIMEO)");
         return REDIS_ERR;
     }
     return REDIS_OK;
 }
 
+int redisContextUpdateConnectTimeout(redisContext *c, const struct timeval *timeout) {
+    /* Same timeval struct, short circuit */
+    if (c->connect_timeout == timeout)
+        return REDIS_OK;
+
+    /* Allocate context timeval if we need to */
+    if (c->connect_timeout == NULL) {
+        c->connect_timeout = hi_malloc(sizeof(*c->connect_timeout));
+        if (c->connect_timeout == NULL)
+            return REDIS_ERR;
+    }
+
+    memcpy(c->connect_timeout, timeout, sizeof(*c->connect_timeout));
+    return REDIS_OK;
+}
+
+int redisContextUpdateCommandTimeout(redisContext *c, const struct timeval *timeout) {
+    /* Same timeval struct, short circuit */
+    if (c->command_timeout == timeout)
+        return REDIS_OK;
+
+    /* Allocate context timeval if we need to */
+    if (c->command_timeout == NULL) {
+        c->command_timeout = hi_malloc(sizeof(*c->command_timeout));
+        if (c->command_timeout == NULL)
+            return REDIS_ERR;
+    }
+
+    memcpy(c->command_timeout, timeout, sizeof(*c->command_timeout));
+    return REDIS_OK;
+}
+
 static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
                                    const struct timeval *timeout,
                                    const char *source_addr) {
-    int s, rv, n;
+    redisFD s;
+    int rv, n;
     char _port[6];  /* strlen("65535"); */
     struct addrinfo hints, *servinfo, *bservinfo, *p, *b;
     int blocking = (c->flags & REDIS_BLOCK);
     int reuseaddr = (c->flags & REDIS_REUSEADDR);
     int reuses = 0;
+    long timeout_msec = -1;
 
+    servinfo = NULL;
     c->connection_type = REDIS_CONN_TCP;
     c->tcp.port = port;
 
@@ -277,34 +384,35 @@ static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
      * This is a bit ugly, but atleast it works and doesn't leak memory.
      **/
     if (c->tcp.host != addr) {
-        if (c->tcp.host)
-            free(c->tcp.host);
+        hi_free(c->tcp.host);
 
-        c->tcp.host = strdup(addr);
+        c->tcp.host = hi_strdup(addr);
+        if (c->tcp.host == NULL)
+            goto oom;
     }
 
     if (timeout) {
-        if (c->timeout != timeout) {
-            if (c->timeout == NULL)
-                c->timeout = malloc(sizeof(struct timeval));
-
-            memcpy(c->timeout, timeout, sizeof(struct timeval));
-        }
+        if (redisContextUpdateConnectTimeout(c, timeout) == REDIS_ERR)
+            goto oom;
     } else {
-        if (c->timeout)
-            free(c->timeout);
-        c->timeout = NULL;
+        hi_free(c->connect_timeout);
+        c->connect_timeout = NULL;
+    }
+
+    if (redisContextTimeoutMsec(c, &timeout_msec) != REDIS_OK) {
+        __redisSetError(c, REDIS_ERR_IO, "Invalid timeout specified");
+        goto error;
     }
 
     if (source_addr == NULL) {
-        free(c->tcp.source_addr);
+        hi_free(c->tcp.source_addr);
         c->tcp.source_addr = NULL;
     } else if (c->tcp.source_addr != source_addr) {
-        free(c->tcp.source_addr);
-        c->tcp.source_addr = strdup(source_addr);
+        hi_free(c->tcp.source_addr);
+        c->tcp.source_addr = hi_strdup(source_addr);
     }
     c->sockaddr.sa_family = AF_UNSPEC;
-    
+
     snprintf(_port, 6, "%d", port);
     memset(&hints,0,sizeof(hints));
     hints.ai_family = AF_INET;
@@ -324,7 +432,7 @@ static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
     }
     for (p = servinfo; p != NULL; p = p->ai_next) {
 addrretry:
-        if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == -1)
+        if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == REDIS_INVALID_FD)
             continue;
 
         c->fd = s;
@@ -344,6 +452,7 @@ addrretry:
                 n = 1;
                 if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*) &n,
                                sizeof(n)) < 0) {
+                    freeaddrinfo(bservinfo);
                     goto error;
                 }
             }
@@ -362,30 +471,48 @@ addrretry:
                 goto error;
             }
         }
+
+        /* For repeat connection */
+        hi_free(c->saddr);
+        c->saddr = hi_malloc(p->ai_addrlen);
+        if (c->saddr == NULL)
+            goto oom;
+
+        memcpy(c->saddr, p->ai_addr, p->ai_addrlen);
+        c->addrlen = p->ai_addrlen;
+
         if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
             if (errno == EHOSTUNREACH) {
-                redisContextCloseFd(c);
+                redisNetClose(c);
                 continue;
-            } else if (errno == EINPROGRESS && !blocking) {
-                /* This is ok. */
+            } else if (errno == EINPROGRESS) {
+                if (blocking) {
+                    goto wait_for_ready;
+                }
+                /* This is ok.
+                 * Note that even when it's in blocking mode, we unset blocking
+                 * for `connect()`
+                 */
             } else if (errno == EADDRNOTAVAIL && reuseaddr) {
                 if (++reuses >= REDIS_CONNECT_RETRIES) {
                     goto error;
                 } else {
+                    redisNetClose(c);
                     goto addrretry;
                 }
             } else {
-                if (redisContextWaitReady(c,c->timeout) != REDIS_OK)
+                wait_for_ready:
+                if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
+                    goto error;
+                if (redisSetTcpNoDelay(c) != REDIS_OK)
                     goto error;
             }
         }
         if (blocking && redisSetBlocking(c,1) != REDIS_OK)
             goto error;
-        if (redisSetTcpNoDelay(c) != REDIS_OK)
-            goto error;
-        
+
         c->sockaddr = *p->ai_addr;
-        
+
         c->flags |= REDIS_CONNECTED;
         rv = REDIS_OK;
         goto end;
@@ -397,10 +524,15 @@ addrretry:
         goto error;
     }
 
+oom:
+    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
 error:
     rv = REDIS_ERR;
 end:
-    freeaddrinfo(servinfo);
+    if(servinfo) {
+        freeaddrinfo(servinfo);
+    }
+
     return rv;  // Need to return REDIS_OK if alright
 }
 
@@ -416,38 +548,51 @@ int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
 }
 
 int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout) {
+#ifndef _WIN32
     int blocking = (c->flags & REDIS_BLOCK);
-    struct sockaddr_un sa;
+    struct sockaddr_un *sa;
+    long timeout_msec = -1;
 
-    if (redisCreateSocket(c,AF_LOCAL) < 0)
+    if (redisCreateSocket(c,AF_UNIX) < 0)
         return REDIS_ERR;
     if (redisSetBlocking(c,0) != REDIS_OK)
         return REDIS_ERR;
 
     c->connection_type = REDIS_CONN_UNIX;
-    if (c->unix_sock.path != path)
-        c->unix_sock.path = strdup(path);
+    if (c->unix_sock.path != path) {
+        hi_free(c->unix_sock.path);
 
-    if (timeout) {
-        if (c->timeout != timeout) {
-            if (c->timeout == NULL)
-                c->timeout = malloc(sizeof(struct timeval));
-
-            memcpy(c->timeout, timeout, sizeof(struct timeval));
-        }
-    } else {
-        if (c->timeout)
-            free(c->timeout);
-        c->timeout = NULL;
+        c->unix_sock.path = hi_strdup(path);
+        if (c->unix_sock.path == NULL)
+            goto oom;
     }
 
-    sa.sun_family = AF_LOCAL;
-    strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
-    if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
+    if (timeout) {
+        if (redisContextUpdateConnectTimeout(c, timeout) == REDIS_ERR)
+            goto oom;
+    } else {
+        hi_free(c->connect_timeout);
+        c->connect_timeout = NULL;
+    }
+
+    if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
+        return REDIS_ERR;
+
+    /* Don't leak sockaddr if we're reconnecting */
+    if (c->saddr) hi_free(c->saddr);
+
+    sa = (struct sockaddr_un*)(c->saddr = hi_malloc(sizeof(struct sockaddr_un)));
+    if (sa == NULL)
+        goto oom;
+
+    c->addrlen = sizeof(struct sockaddr_un);
+    sa->sun_family = AF_UNIX;
+    strncpy(sa->sun_path, path, sizeof(sa->sun_path) - 1);
+    if (connect(c->fd, (struct sockaddr*)sa, sizeof(*sa)) == -1) {
         if (errno == EINPROGRESS && !blocking) {
             /* This is ok. */
         } else {
-            if (redisContextWaitReady(c,c->timeout) != REDIS_OK)
+            if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
                 return REDIS_ERR;
         }
     }
@@ -458,4 +603,13 @@ int redisContextConnectUnix(redisContext *c, const char *path, const struct time
 
     c->flags |= REDIS_CONNECTED;
     return REDIS_OK;
+#else
+    /* We currently do not support Unix sockets for Windows. */
+    /* TODO(m): https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/ */
+    errno = EPROTONOSUPPORT;
+    return REDIS_ERR;
+#endif /* _WIN32 */
+oom:
+    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+    return REDIS_ERR;
 }
diff --git a/debian/modules/nchan/src/store/redis/hiredis/net.h b/debian/modules/nchan/src/store/redis/hiredis/net.h
index 2f1a0bf..9f43283 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/net.h
+++ b/debian/modules/nchan/src/store/redis/hiredis/net.h
@@ -37,9 +37,9 @@
 
 #include "hiredis.h"
 
-#if defined(__sun)
-#define AF_LOCAL AF_UNIX
-#endif
+void redisNetClose(redisContext *c);
+ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap);
+ssize_t redisNetWrite(redisContext *c);
 
 int redisCheckSocketError(redisContext *c);
 int redisContextSetTimeout(redisContext *c, const struct timeval tv);
@@ -49,5 +49,8 @@ int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
                                const char *source_addr);
 int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
 int redisKeepAlive(redisContext *c, int interval);
+int redisCheckConnectDone(redisContext *c, int *completed);
+
+int redisSetTcpNoDelay(redisContext *c);
 
 #endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/read.c b/debian/modules/nchan/src/store/redis/hiredis/read.c
index df1a467..0952469 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/read.c
+++ b/debian/modules/nchan/src/store/redis/hiredis/read.c
@@ -29,19 +29,26 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "fmacros.h"
 #include <string.h>
 #include <stdlib.h>
 #ifndef _MSC_VER
 #include <unistd.h>
+#include <strings.h>
 #endif
 #include <assert.h>
 #include <errno.h>
 #include <ctype.h>
+#include <limits.h>
+#include <math.h>
 
+#include "alloc.h"
 #include "read.h"
 #include "sds.h"
+#include "win32.h"
+
+/* Initial size of our nested reply stack and how much we grow it when needd */
+#define REDIS_READER_STACK_SIZE 9
 
 static void __redisReaderSetError(redisReader *r, int type, const char *str) {
     size_t len;
@@ -52,11 +59,9 @@ static void __redisReaderSetError(redisReader *r, int type, const char *str) {
     }
 
     /* Clear input buffer on errors. */
-    if (r->buf != NULL) {
-        sdsfree(r->buf);
-        r->buf = NULL;
-        r->pos = r->len = 0;
-    }
+    sdsfree(r->buf);
+    r->buf = NULL;
+    r->pos = r->len = 0;
 
     /* Reset task stack. */
     r->ridx = -1;
@@ -127,7 +132,7 @@ static char *seekNewline(char *s, size_t len) {
      * might not have a trailing NULL character. */
     while (pos < _len) {
         while(pos < _len && s[pos] != '\r') pos++;
-        if (s[pos] != '\r') {
+        if (pos==_len) {
             /* Not found. */
             return NULL;
         } else {
@@ -143,33 +148,79 @@ static char *seekNewline(char *s, size_t len) {
     return NULL;
 }
 
-/* Read a long long value starting at *s, under the assumption that it will be
- * terminated by \r\n. Ambiguously returns -1 for unexpected input. */
-static long long readLongLong(char *s) {
-    long long v = 0;
-    int dec, mult = 1;
-    char c;
+/* Convert a string into a long long. Returns REDIS_OK if the string could be
+ * parsed into a (non-overflowing) long long, REDIS_ERR otherwise. The value
+ * will be set to the parsed value when appropriate.
+ *
+ * Note that this function demands that the string strictly represents
+ * a long long: no spaces or other characters before or after the string
+ * representing the number are accepted, nor zeroes at the start if not
+ * for the string "0" representing the zero number.
+ *
+ * Because of its strictness, it is safe to use this function to check if
+ * you can convert a string into a long long, and obtain back the string
+ * from the number without any loss in the string representation. */
+static int string2ll(const char *s, size_t slen, long long *value) {
+    const char *p = s;
+    size_t plen = 0;
+    int negative = 0;
+    unsigned long long v;
 
-    if (*s == '-') {
-        mult = -1;
-        s++;
-    } else if (*s == '+') {
-        mult = 1;
-        s++;
+    if (plen == slen)
+        return REDIS_ERR;
+
+    /* Special case: first and only digit is 0. */
+    if (slen == 1 && p[0] == '0') {
+        if (value != NULL) *value = 0;
+        return REDIS_OK;
     }
 
-    while ((c = *(s++)) != '\r') {
-        dec = c - '0';
-        if (dec >= 0 && dec < 10) {
-            v *= 10;
-            v += dec;
-        } else {
-            /* Should not happen... */
-            return -1;
-        }
+    if (p[0] == '-') {
+        negative = 1;
+        p++; plen++;
+
+        /* Abort on only a negative sign. */
+        if (plen == slen)
+            return REDIS_ERR;
     }
 
-    return mult*v;
+    /* First digit should be 1-9, otherwise the string should just be 0. */
+    if (p[0] >= '1' && p[0] <= '9') {
+        v = p[0]-'0';
+        p++; plen++;
+    } else if (p[0] == '0' && slen == 1) {
+        *value = 0;
+        return REDIS_OK;
+    } else {
+        return REDIS_ERR;
+    }
+
+    while (plen < slen && p[0] >= '0' && p[0] <= '9') {
+        if (v > (ULLONG_MAX / 10)) /* Overflow. */
+            return REDIS_ERR;
+        v *= 10;
+
+        if (v > (ULLONG_MAX - (p[0]-'0'))) /* Overflow. */
+            return REDIS_ERR;
+        v += p[0]-'0';
+
+        p++; plen++;
+    }
+
+    /* Return if not all bytes were used. */
+    if (plen < slen)
+        return REDIS_ERR;
+
+    if (negative) {
+        if (v > ((unsigned long long)(-(LLONG_MIN+1))+1)) /* Overflow. */
+            return REDIS_ERR;
+        if (value != NULL) *value = -v;
+    } else {
+        if (v > LLONG_MAX) /* Overflow. */
+            return REDIS_ERR;
+        if (value != NULL) *value = v;
+    }
+    return REDIS_OK;
 }
 
 static char *readLine(redisReader *r, int *_len) {
@@ -196,9 +247,12 @@ static void moveToNextTask(redisReader *r) {
             return;
         }
 
-        cur = &(r->rstack[r->ridx]);
-        prv = &(r->rstack[r->ridx-1]);
-        assert(prv->type == REDIS_REPLY_ARRAY);
+        cur = r->task[r->ridx];
+        prv = r->task[r->ridx-1];
+        assert(prv->type == REDIS_REPLY_ARRAY ||
+               prv->type == REDIS_REPLY_MAP ||
+               prv->type == REDIS_REPLY_SET ||
+               prv->type == REDIS_REPLY_PUSH);
         if (cur->idx == prv->elements-1) {
             r->ridx--;
         } else {
@@ -213,17 +267,65 @@ static void moveToNextTask(redisReader *r) {
 }
 
 static int processLineItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
+    redisReadTask *cur = r->task[r->ridx];
     void *obj;
     char *p;
     int len;
 
     if ((p = readLine(r,&len)) != NULL) {
         if (cur->type == REDIS_REPLY_INTEGER) {
-            if (r->fn && r->fn->createInteger)
-                obj = r->fn->createInteger(cur,readLongLong(p));
-            else
+            if (r->fn && r->fn->createInteger) {
+                long long v;
+                if (string2ll(p, len, &v) == REDIS_ERR) {
+                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                            "Bad integer value");
+                    return REDIS_ERR;
+                }
+                obj = r->fn->createInteger(cur,v);
+            } else {
                 obj = (void*)REDIS_REPLY_INTEGER;
+            }
+        } else if (cur->type == REDIS_REPLY_DOUBLE) {
+            if (r->fn && r->fn->createDouble) {
+                char buf[326], *eptr;
+                double d;
+
+                if ((size_t)len >= sizeof(buf)) {
+                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                            "Double value is too large");
+                    return REDIS_ERR;
+                }
+
+                memcpy(buf,p,len);
+                buf[len] = '\0';
+
+                if (strcasecmp(buf,",inf") == 0) {
+                    d = INFINITY; /* Positive infinite. */
+                } else if (strcasecmp(buf,",-inf") == 0) {
+                    d = -INFINITY; /* Negative infinite. */
+                } else {
+                    d = strtod((char*)buf,&eptr);
+                    if (buf[0] == '\0' || eptr[0] != '\0' || isnan(d)) {
+                        __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                                "Bad double value");
+                        return REDIS_ERR;
+                    }
+                }
+                obj = r->fn->createDouble(cur,d,buf,len);
+            } else {
+                obj = (void*)REDIS_REPLY_DOUBLE;
+            }
+        } else if (cur->type == REDIS_REPLY_NIL) {
+            if (r->fn && r->fn->createNil)
+                obj = r->fn->createNil(cur);
+            else
+                obj = (void*)REDIS_REPLY_NIL;
+        } else if (cur->type == REDIS_REPLY_BOOL) {
+            int bval = p[0] == 't' || p[0] == 'T';
+            if (r->fn && r->fn->createBool)
+                obj = r->fn->createBool(cur,bval);
+            else
+                obj = (void*)REDIS_REPLY_BOOL;
         } else {
             /* Type will be error or status. */
             if (r->fn && r->fn->createString)
@@ -247,10 +349,10 @@ static int processLineItem(redisReader *r) {
 }
 
 static int processBulkItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
+    redisReadTask *cur = r->task[r->ridx];
     void *obj = NULL;
     char *p, *s;
-    long len;
+    long long len;
     unsigned long bytelen;
     int success = 0;
 
@@ -259,9 +361,20 @@ static int processBulkItem(redisReader *r) {
     if (s != NULL) {
         p = r->buf+r->pos;
         bytelen = s-(r->buf+r->pos)+2; /* include \r\n */
-        len = readLongLong(p);
 
-        if (len < 0) {
+        if (string2ll(p, bytelen - 2, &len) == REDIS_ERR) {
+            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                    "Bad bulk string length");
+            return REDIS_ERR;
+        }
+
+        if (len < -1 || (LLONG_MAX > SIZE_MAX && len > (long long)SIZE_MAX)) {
+            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                    "Bulk string length out of range");
+            return REDIS_ERR;
+        }
+
+        if (len == -1) {
             /* The nil object can always be created. */
             if (r->fn && r->fn->createNil)
                 obj = r->fn->createNil(cur);
@@ -272,10 +385,18 @@ static int processBulkItem(redisReader *r) {
             /* Only continue when the buffer contains the entire bulk item. */
             bytelen += len+2; /* include \r\n */
             if (r->pos+bytelen <= r->len) {
+                if ((cur->type == REDIS_REPLY_VERB && len < 4) ||
+                    (cur->type == REDIS_REPLY_VERB && s[5] != ':'))
+                {
+                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                            "Verbatim string 4 bytes of content type are "
+                            "missing or incorrectly encoded.");
+                    return REDIS_ERR;
+                }
                 if (r->fn && r->fn->createString)
                     obj = r->fn->createString(cur,s+2,len);
                 else
-                    obj = (void*)REDIS_REPLY_STRING;
+                    obj = (void*)(long)cur->type;
                 success = 1;
             }
         }
@@ -299,24 +420,62 @@ static int processBulkItem(redisReader *r) {
     return REDIS_ERR;
 }
 
-static int processMultiBulkItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
-    void *obj;
-    char *p;
-    long elements;
-    int root = 0;
+static int redisReaderGrow(redisReader *r) {
+    redisReadTask **aux;
+    int newlen;
 
-    /* Set error for nested multi bulks with depth > 7 */
-    if (r->ridx == 8) {
-        __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-            "No support for nested multi bulk replies with depth > 7");
-        return REDIS_ERR;
+    /* Grow our stack size */
+    newlen = r->tasks + REDIS_READER_STACK_SIZE;
+    aux = hi_realloc(r->task, sizeof(*r->task) * newlen);
+    if (aux == NULL)
+        goto oom;
+
+    r->task = aux;
+
+    /* Allocate new tasks */
+    for (; r->tasks < newlen; r->tasks++) {
+        r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
+        if (r->task[r->tasks] == NULL)
+            goto oom;
     }
 
-    if ((p = readLine(r,NULL)) != NULL) {
-        elements = readLongLong(p);
+    return REDIS_OK;
+oom:
+    __redisReaderSetErrorOOM(r);
+    return REDIS_ERR;
+}
+
+/* Process the array, map and set types. */
+static int processAggregateItem(redisReader *r) {
+    redisReadTask *cur = r->task[r->ridx];
+    void *obj;
+    char *p;
+    long long elements;
+    int root = 0, len;
+
+    /* Set error for nested multi bulks with depth > 7 */
+    if (r->ridx == r->tasks - 1) {
+        if (redisReaderGrow(r) == REDIS_ERR)
+            return REDIS_ERR;
+    }
+
+    if ((p = readLine(r,&len)) != NULL) {
+        if (string2ll(p, len, &elements) == REDIS_ERR) {
+            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                    "Bad multi-bulk length");
+            return REDIS_ERR;
+        }
+
         root = (r->ridx == 0);
 
+        if (elements < -1 || (LLONG_MAX > SIZE_MAX && elements > SIZE_MAX) ||
+            (r->maxelements > 0 && elements > r->maxelements))
+        {
+            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                    "Multi-bulk length out of range");
+            return REDIS_ERR;
+        }
+
         if (elements == -1) {
             if (r->fn && r->fn->createNil)
                 obj = r->fn->createNil(cur);
@@ -330,10 +489,12 @@ static int processMultiBulkItem(redisReader *r) {
 
             moveToNextTask(r);
         } else {
+            if (cur->type == REDIS_REPLY_MAP) elements *= 2;
+
             if (r->fn && r->fn->createArray)
                 obj = r->fn->createArray(cur,elements);
             else
-                obj = (void*)REDIS_REPLY_ARRAY;
+                obj = (void*)(long)cur->type;
 
             if (obj == NULL) {
                 __redisReaderSetErrorOOM(r);
@@ -345,12 +506,12 @@ static int processMultiBulkItem(redisReader *r) {
                 cur->elements = elements;
                 cur->obj = obj;
                 r->ridx++;
-                r->rstack[r->ridx].type = -1;
-                r->rstack[r->ridx].elements = -1;
-                r->rstack[r->ridx].idx = 0;
-                r->rstack[r->ridx].obj = NULL;
-                r->rstack[r->ridx].parent = cur;
-                r->rstack[r->ridx].privdata = r->privdata;
+                r->task[r->ridx]->type = -1;
+                r->task[r->ridx]->elements = -1;
+                r->task[r->ridx]->idx = 0;
+                r->task[r->ridx]->obj = NULL;
+                r->task[r->ridx]->parent = cur;
+                r->task[r->ridx]->privdata = r->privdata;
             } else {
                 moveToNextTask(r);
             }
@@ -365,7 +526,7 @@ static int processMultiBulkItem(redisReader *r) {
 }
 
 static int processItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
+    redisReadTask *cur = r->task[r->ridx];
     char *p;
 
     /* check if we need to read type */
@@ -381,12 +542,33 @@ static int processItem(redisReader *r) {
             case ':':
                 cur->type = REDIS_REPLY_INTEGER;
                 break;
+            case ',':
+                cur->type = REDIS_REPLY_DOUBLE;
+                break;
+            case '_':
+                cur->type = REDIS_REPLY_NIL;
+                break;
             case '$':
                 cur->type = REDIS_REPLY_STRING;
                 break;
             case '*':
                 cur->type = REDIS_REPLY_ARRAY;
                 break;
+            case '%':
+                cur->type = REDIS_REPLY_MAP;
+                break;
+            case '~':
+                cur->type = REDIS_REPLY_SET;
+                break;
+            case '#':
+                cur->type = REDIS_REPLY_BOOL;
+                break;
+            case '=':
+                cur->type = REDIS_REPLY_VERB;
+                break;
+            case '>':
+                cur->type = REDIS_REPLY_PUSH;
+                break;
             default:
                 __redisReaderSetErrorProtocolByte(r,*p);
                 return REDIS_ERR;
@@ -402,11 +584,18 @@ static int processItem(redisReader *r) {
     case REDIS_REPLY_ERROR:
     case REDIS_REPLY_STATUS:
     case REDIS_REPLY_INTEGER:
+    case REDIS_REPLY_DOUBLE:
+    case REDIS_REPLY_NIL:
+    case REDIS_REPLY_BOOL:
         return processLineItem(r);
     case REDIS_REPLY_STRING:
+    case REDIS_REPLY_VERB:
         return processBulkItem(r);
     case REDIS_REPLY_ARRAY:
-        return processMultiBulkItem(r);
+    case REDIS_REPLY_MAP:
+    case REDIS_REPLY_SET:
+    case REDIS_REPLY_PUSH:
+        return processAggregateItem(r);
     default:
         assert(NULL);
         return REDIS_ERR; /* Avoid warning. */
@@ -416,30 +605,53 @@ static int processItem(redisReader *r) {
 redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
     redisReader *r;
 
-    r = calloc(sizeof(redisReader),1);
+    r = hi_calloc(1,sizeof(redisReader));
     if (r == NULL)
         return NULL;
 
-    r->err = 0;
-    r->errstr[0] = '\0';
-    r->fn = fn;
     r->buf = sdsempty();
-    r->maxbuf = REDIS_READER_MAX_BUF;
-    if (r->buf == NULL) {
-        free(r);
-        return NULL;
+    if (r->buf == NULL)
+        goto oom;
+
+    r->task = hi_calloc(REDIS_READER_STACK_SIZE, sizeof(*r->task));
+    if (r->task == NULL)
+        goto oom;
+
+    for (; r->tasks < REDIS_READER_STACK_SIZE; r->tasks++) {
+        r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
+        if (r->task[r->tasks] == NULL)
+            goto oom;
     }
 
+    r->fn = fn;
+    r->maxbuf = REDIS_READER_MAX_BUF;
+    r->maxelements = REDIS_READER_MAX_ARRAY_ELEMENTS;
     r->ridx = -1;
+
     return r;
+oom:
+    redisReaderFree(r);
+    return NULL;
 }
 
 void redisReaderFree(redisReader *r) {
+    if (r == NULL)
+        return;
+
     if (r->reply != NULL && r->fn && r->fn->freeObject)
         r->fn->freeObject(r->reply);
-    if (r->buf != NULL)
-        sdsfree(r->buf);
-    free(r);
+
+    if (r->task) {
+        /* We know r->task[i] is allocated if i < r->tasks */
+        for (int i = 0; i < r->tasks; i++) {
+            hi_free(r->task[i]);
+        }
+
+        hi_free(r->task);
+    }
+
+    sdsfree(r->buf);
+    hi_free(r);
 }
 
 int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
@@ -455,23 +667,22 @@ int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
         if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) {
             sdsfree(r->buf);
             r->buf = sdsempty();
-            r->pos = 0;
+            if (r->buf == 0) goto oom;
 
-            /* r->buf should not be NULL since we just free'd a larger one. */
-            assert(r->buf != NULL);
+            r->pos = 0;
         }
 
         newbuf = sdscatlen(r->buf,buf,len);
-        if (newbuf == NULL) {
-            __redisReaderSetErrorOOM(r);
-            return REDIS_ERR;
-        }
+        if (newbuf == NULL) goto oom;
 
         r->buf = newbuf;
         r->len = sdslen(r->buf);
     }
 
     return REDIS_OK;
+oom:
+    __redisReaderSetErrorOOM(r);
+    return REDIS_ERR;
 }
 
 int redisReaderGetReply(redisReader *r, void **reply) {
@@ -489,12 +700,12 @@ int redisReaderGetReply(redisReader *r, void **reply) {
 
     /* Set first item to process when the stack is empty. */
     if (r->ridx == -1) {
-        r->rstack[0].type = -1;
-        r->rstack[0].elements = -1;
-        r->rstack[0].idx = -1;
-        r->rstack[0].obj = NULL;
-        r->rstack[0].parent = NULL;
-        r->rstack[0].privdata = r->privdata;
+        r->task[0]->type = -1;
+        r->task[0]->elements = -1;
+        r->task[0]->idx = -1;
+        r->task[0]->obj = NULL;
+        r->task[0]->parent = NULL;
+        r->task[0]->privdata = r->privdata;
         r->ridx = 0;
     }
 
@@ -510,15 +721,18 @@ int redisReaderGetReply(redisReader *r, void **reply) {
     /* Discard part of the buffer when we've consumed at least 1k, to avoid
      * doing unnecessary calls to memmove() in sds.c. */
     if (r->pos >= 1024) {
-        sdsrange(r->buf,r->pos,-1);
+        if (sdsrange(r->buf,r->pos,-1) < 0) return REDIS_ERR;
         r->pos = 0;
         r->len = sdslen(r->buf);
     }
 
     /* Emit a reply when there is one. */
     if (r->ridx == -1) {
-        if (reply != NULL)
+        if (reply != NULL) {
             *reply = r->reply;
+        } else if (r->reply != NULL && r->fn && r->fn->freeObject) {
+            r->fn->freeObject(r->reply);
+        }
         r->reply = NULL;
     }
     return REDIS_OK;
diff --git a/debian/modules/nchan/src/store/redis/hiredis/read.h b/debian/modules/nchan/src/store/redis/hiredis/read.h
index 180e6c6..2d74d77 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/read.h
+++ b/debian/modules/nchan/src/store/redis/hiredis/read.h
@@ -45,6 +45,7 @@
 #define REDIS_ERR_EOF 3 /* End of file */
 #define REDIS_ERR_PROTOCOL 4 /* Protocol error */
 #define REDIS_ERR_OOM 5 /* Out of memory */
+#define REDIS_ERR_TIMEOUT 6 /* Timed out */
 #define REDIS_ERR_OTHER 2 /* Everything else... */
 
 #define REDIS_REPLY_STRING 1
@@ -53,8 +54,20 @@
 #define REDIS_REPLY_NIL 4
 #define REDIS_REPLY_STATUS 5
 #define REDIS_REPLY_ERROR 6
+#define REDIS_REPLY_DOUBLE 7
+#define REDIS_REPLY_BOOL 8
+#define REDIS_REPLY_MAP 9
+#define REDIS_REPLY_SET 10
+#define REDIS_REPLY_ATTR 11
+#define REDIS_REPLY_PUSH 12
+#define REDIS_REPLY_BIGNUM 13
+#define REDIS_REPLY_VERB 14
 
-#define REDIS_READER_MAX_BUF (1024*16)  /* Default max unused reader buffer. */
+/* Default max unused reader buffer. */
+#define REDIS_READER_MAX_BUF (1024*16)
+
+/* Default multi-bulk element limit */
+#define REDIS_READER_MAX_ARRAY_ELEMENTS ((1LL<<32) - 1)
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,7 +75,7 @@ extern "C" {
 
 typedef struct redisReadTask {
     int type;
-    int elements; /* number of elements in multibulk container */
+    long long elements; /* number of elements in multibulk container */
     int idx; /* index in parent (array) object */
     void *obj; /* holds user-generated value for a read task */
     struct redisReadTask *parent; /* parent task */
@@ -71,9 +84,11 @@ typedef struct redisReadTask {
 
 typedef struct redisReplyObjectFunctions {
     void *(*createString)(const redisReadTask*, char*, size_t);
-    void *(*createArray)(const redisReadTask*, int);
+    void *(*createArray)(const redisReadTask*, size_t);
     void *(*createInteger)(const redisReadTask*, long long);
+    void *(*createDouble)(const redisReadTask*, double, char*, size_t);
     void *(*createNil)(const redisReadTask*);
+    void *(*createBool)(const redisReadTask*, int);
     void (*freeObject)(void*);
 } redisReplyObjectFunctions;
 
@@ -85,8 +100,11 @@ typedef struct redisReader {
     size_t pos; /* Buffer cursor */
     size_t len; /* Buffer length */
     size_t maxbuf; /* Max length of unused buffer */
+    long long maxelements; /* Max multi-bulk elements */
+
+    redisReadTask **task;
+    int tasks;
 
-    redisReadTask rstack[9];
     int ridx; /* Index of current read task */
     void *reply; /* Temporary reply pointer */
 
@@ -100,14 +118,9 @@ void redisReaderFree(redisReader *r);
 int redisReaderFeed(redisReader *r, const char *buf, size_t len);
 int redisReaderGetReply(redisReader *r, void **reply);
 
-/* Backwards compatibility, can be removed on big version bump. */
-#define redisReplyReaderCreate redisReaderCreate
-#define redisReplyReaderFree redisReaderFree
-#define redisReplyReaderFeed redisReaderFeed
-#define redisReplyReaderGetReply redisReaderGetReply
-#define redisReplyReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
-#define redisReplyReaderGetObject(_r) (((redisReader*)(_r))->reply)
-#define redisReplyReaderGetError(_r) (((redisReader*)(_r))->errstr)
+#define redisReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
+#define redisReaderGetObject(_r) (((redisReader*)(_r))->reply)
+#define redisReaderGetError(_r) (((redisReader*)(_r))->errstr)
 
 #ifdef __cplusplus
 }
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sds.c b/debian/modules/nchan/src/store/redis/hiredis/sds.c
index f01247d..feedfe3 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/sds.c
+++ b/debian/modules/nchan/src/store/redis/hiredis/sds.c
@@ -1,6 +1,8 @@
-/* SDS (Simple Dynamic Strings), A C dynamic strings library.
+/* SDSLib 2.0 -- A C dynamic strings library
  *
- * Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2015, Oran Agra
+ * Copyright (c) 2015, Redis Labs, Inc
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,13 +30,46 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "fmacros.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
-
+#include <limits.h>
 #include "sds.h"
+#include "sdsalloc.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+
+static inline int sdsHdrSize(char type) {
+    switch(type&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            return sizeof(struct sdshdr5);
+        case SDS_TYPE_8:
+            return sizeof(struct sdshdr8);
+        case SDS_TYPE_16:
+            return sizeof(struct sdshdr16);
+        case SDS_TYPE_32:
+            return sizeof(struct sdshdr32);
+        case SDS_TYPE_64:
+            return sizeof(struct sdshdr64);
+    }
+    return 0;
+}
+
+static inline char sdsReqType(size_t string_size) {
+    if (string_size < 32)
+        return SDS_TYPE_5;
+    if (string_size < 0xff)
+        return SDS_TYPE_8;
+    if (string_size < 0xffff)
+        return SDS_TYPE_16;
+    if (string_size < 0xffffffff)
+        return SDS_TYPE_32;
+    return SDS_TYPE_64;
+}
 
 /* Create a new sds string with the content specified by the 'init' pointer
  * and 'initlen'.
@@ -43,26 +78,65 @@
  * The string is always null-termined (all the sds strings are, always) so
  * even if you create an sds string with:
  *
- * mystring = sdsnewlen("abc",3");
+ * mystring = sdsnewlen("abc",3);
  *
  * You can print the string with printf() as there is an implicit \0 at the
  * end of the string. However the string is binary safe and can contain
  * \0 characters in the middle, as the length is stored in the sds header. */
 sds sdsnewlen(const void *init, size_t initlen) {
-    struct sdshdr *sh;
+    void *sh;
+    sds s;
+    char type = sdsReqType(initlen);
+    /* Empty strings are usually created in order to append. Use type 8
+     * since type 5 is not good at this. */
+    if (type == SDS_TYPE_5 && initlen == 0) type = SDS_TYPE_8;
+    int hdrlen = sdsHdrSize(type);
+    unsigned char *fp; /* flags pointer. */
 
-    if (init) {
-        sh = malloc(sizeof *sh+initlen+1);
-    } else {
-        sh = calloc(sizeof *sh+initlen+1,1);
-    }
+    sh = s_malloc(hdrlen+initlen+1);
     if (sh == NULL) return NULL;
-    sh->len = initlen;
-    sh->free = 0;
+    if (!init)
+        memset(sh, 0, hdrlen+initlen+1);
+    s = (char*)sh+hdrlen;
+    fp = ((unsigned char*)s)-1;
+    switch(type) {
+        case SDS_TYPE_5: {
+            *fp = type | (initlen << SDS_TYPE_BITS);
+            break;
+        }
+        case SDS_TYPE_8: {
+            SDS_HDR_VAR(8,s);
+            sh->len = initlen;
+            sh->alloc = initlen;
+            *fp = type;
+            break;
+        }
+        case SDS_TYPE_16: {
+            SDS_HDR_VAR(16,s);
+            sh->len = initlen;
+            sh->alloc = initlen;
+            *fp = type;
+            break;
+        }
+        case SDS_TYPE_32: {
+            SDS_HDR_VAR(32,s);
+            sh->len = initlen;
+            sh->alloc = initlen;
+            *fp = type;
+            break;
+        }
+        case SDS_TYPE_64: {
+            SDS_HDR_VAR(64,s);
+            sh->len = initlen;
+            sh->alloc = initlen;
+            *fp = type;
+            break;
+        }
+    }
     if (initlen && init)
-        memcpy(sh->buf, init, initlen);
-    sh->buf[initlen] = '\0';
-    return (char*)sh->buf;
+        memcpy(s, init, initlen);
+    s[initlen] = '\0';
+    return s;
 }
 
 /* Create an empty (zero length) sds string. Even in this case the string
@@ -71,7 +145,7 @@ sds sdsempty(void) {
     return sdsnewlen("",0);
 }
 
-/* Create a new sds string starting from a null termined C string. */
+/* Create a new sds string starting from a null terminated C string. */
 sds sdsnew(const char *init) {
     size_t initlen = (init == NULL) ? 0 : strlen(init);
     return sdsnewlen(init, initlen);
@@ -85,7 +159,7 @@ sds sdsdup(const sds s) {
 /* Free an sds string. No operation is performed if 's' is NULL. */
 void sdsfree(sds s) {
     if (s == NULL) return;
-    free(s-sizeof(struct sdshdr));
+    s_free((char*)s-sdsHdrSize(s[-1]));
 }
 
 /* Set the sds string length to the length as obtained with strlen(), so
@@ -103,21 +177,17 @@ void sdsfree(sds s) {
  * the output will be "6" as the string was modified but the logical length
  * remains 6 bytes. */
 void sdsupdatelen(sds s) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
     int reallen = strlen(s);
-    sh->free += (sh->len-reallen);
-    sh->len = reallen;
+    sdssetlen(s, reallen);
 }
 
-/* Modify an sds string on-place to make it empty (zero length).
+/* Modify an sds string in-place to make it empty (zero length).
  * However all the existing buffer is not discarded but set as free space
  * so that next append operations will not require allocations up to the
  * number of bytes previously available. */
 void sdsclear(sds s) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-    sh->free += sh->len;
-    sh->len = 0;
-    sh->buf[0] = '\0';
+    sdssetlen(s, 0);
+    s[0] = '\0';
 }
 
 /* Enlarge the free space at the end of the sds string so that the caller
@@ -127,23 +197,48 @@ void sdsclear(sds s) {
  * Note: this does not change the *length* of the sds string as returned
  * by sdslen(), but only the free buffer space we have. */
 sds sdsMakeRoomFor(sds s, size_t addlen) {
-    struct sdshdr *sh, *newsh;
-    size_t free = sdsavail(s);
+    void *sh, *newsh;
+    size_t avail = sdsavail(s);
     size_t len, newlen;
+    char type, oldtype = s[-1] & SDS_TYPE_MASK;
+    int hdrlen;
+
+    /* Return ASAP if there is enough space left. */
+    if (avail >= addlen) return s;
 
-    if (free >= addlen) return s;
     len = sdslen(s);
-    sh = (void*) (s-sizeof *sh);
+    sh = (char*)s-sdsHdrSize(oldtype);
     newlen = (len+addlen);
     if (newlen < SDS_MAX_PREALLOC)
         newlen *= 2;
     else
         newlen += SDS_MAX_PREALLOC;
-    newsh = realloc(sh, sizeof *newsh+newlen+1);
-    if (newsh == NULL) return NULL;
 
-    newsh->free = newlen - len;
-    return newsh->buf;
+    type = sdsReqType(newlen);
+
+    /* Don't use type 5: the user is appending to the string and type 5 is
+     * not able to remember empty space, so sdsMakeRoomFor() must be called
+     * at every appending operation. */
+    if (type == SDS_TYPE_5) type = SDS_TYPE_8;
+
+    hdrlen = sdsHdrSize(type);
+    if (oldtype==type) {
+        newsh = s_realloc(sh, hdrlen+newlen+1);
+        if (newsh == NULL) return NULL;
+        s = (char*)newsh+hdrlen;
+    } else {
+        /* Since the header size changes, need to move the string forward,
+         * and can't use realloc */
+        newsh = s_malloc(hdrlen+newlen+1);
+        if (newsh == NULL) return NULL;
+        memcpy((char*)newsh+hdrlen, s, len+1);
+        s_free(sh);
+        s = (char*)newsh+hdrlen;
+        s[-1] = type;
+        sdssetlen(s, len);
+    }
+    sdssetalloc(s, newlen);
+    return s;
 }
 
 /* Reallocate the sds string so that it has no free space at the end. The
@@ -153,12 +248,29 @@ sds sdsMakeRoomFor(sds s, size_t addlen) {
  * After the call, the passed sds string is no longer valid and all the
  * references must be substituted with the new pointer returned by the call. */
 sds sdsRemoveFreeSpace(sds s) {
-    struct sdshdr *sh;
+    void *sh, *newsh;
+    char type, oldtype = s[-1] & SDS_TYPE_MASK;
+    int hdrlen;
+    size_t len = sdslen(s);
+    sh = (char*)s-sdsHdrSize(oldtype);
 
-    sh = (void*) (s-sizeof *sh);
-    sh = realloc(sh, sizeof *sh+sh->len+1);
-    sh->free = 0;
-    return sh->buf;
+    type = sdsReqType(len);
+    hdrlen = sdsHdrSize(type);
+    if (oldtype==type) {
+        newsh = s_realloc(sh, hdrlen+len+1);
+        if (newsh == NULL) return NULL;
+        s = (char*)newsh+hdrlen;
+    } else {
+        newsh = s_malloc(hdrlen+len+1);
+        if (newsh == NULL) return NULL;
+        memcpy((char*)newsh+hdrlen, s, len+1);
+        s_free(sh);
+        s = (char*)newsh+hdrlen;
+        s[-1] = type;
+        sdssetlen(s, len);
+    }
+    sdssetalloc(s, len);
+    return s;
 }
 
 /* Return the total size of the allocation of the specifed sds string,
@@ -169,9 +281,14 @@ sds sdsRemoveFreeSpace(sds s) {
  * 4) The implicit null term.
  */
 size_t sdsAllocSize(sds s) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
+    size_t alloc = sdsalloc(s);
+    return sdsHdrSize(s[-1])+alloc+1;
+}
 
-    return sizeof(*sh)+sh->len+sh->free+1;
+/* Return the pointer of the actual SDS allocation (normally SDS strings
+ * are referenced by the start of the string buffer). */
+void *sdsAllocPtr(sds s) {
+    return (void*) (s-sdsHdrSize(s[-1]));
 }
 
 /* Increment the sds length and decrements the left free space at the
@@ -198,13 +315,44 @@ size_t sdsAllocSize(sds s) {
  * sdsIncrLen(s, nread);
  */
 void sdsIncrLen(sds s, int incr) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-
-    assert(sh->free >= incr);
-    sh->len += incr;
-    sh->free -= incr;
-    assert(sh->free >= 0);
-    s[sh->len] = '\0';
+    unsigned char flags = s[-1];
+    size_t len;
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5: {
+            unsigned char *fp = ((unsigned char*)s)-1;
+            unsigned char oldlen = SDS_TYPE_5_LEN(flags);
+            assert((incr > 0 && oldlen+incr < 32) || (incr < 0 && oldlen >= (unsigned int)(-incr)));
+            *fp = SDS_TYPE_5 | ((oldlen+incr) << SDS_TYPE_BITS);
+            len = oldlen+incr;
+            break;
+        }
+        case SDS_TYPE_8: {
+            SDS_HDR_VAR(8,s);
+            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
+            len = (sh->len += incr);
+            break;
+        }
+        case SDS_TYPE_16: {
+            SDS_HDR_VAR(16,s);
+            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
+            len = (sh->len += incr);
+            break;
+        }
+        case SDS_TYPE_32: {
+            SDS_HDR_VAR(32,s);
+            assert((incr >= 0 && sh->alloc-sh->len >= (unsigned int)incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
+            len = (sh->len += incr);
+            break;
+        }
+        case SDS_TYPE_64: {
+            SDS_HDR_VAR(64,s);
+            assert((incr >= 0 && sh->alloc-sh->len >= (uint64_t)incr) || (incr < 0 && sh->len >= (uint64_t)(-incr)));
+            len = (sh->len += incr);
+            break;
+        }
+        default: len = 0; /* Just to avoid compilation warnings. */
+    }
+    s[len] = '\0';
 }
 
 /* Grow the sds to have the specified length. Bytes that were not part of
@@ -213,19 +361,15 @@ void sdsIncrLen(sds s, int incr) {
  * if the specified length is smaller than the current length, no operation
  * is performed. */
 sds sdsgrowzero(sds s, size_t len) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-    size_t totlen, curlen = sh->len;
+    size_t curlen = sdslen(s);
 
     if (len <= curlen) return s;
     s = sdsMakeRoomFor(s,len-curlen);
     if (s == NULL) return NULL;
 
     /* Make sure added region doesn't contain garbage */
-    sh = (void*)(s-sizeof *sh);
     memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */
-    totlen = sh->len+sh->free;
-    sh->len = len;
-    sh->free = totlen-sh->len;
+    sdssetlen(s, len);
     return s;
 }
 
@@ -235,15 +379,12 @@ sds sdsgrowzero(sds s, size_t len) {
  * After the call, the passed sds string is no longer valid and all the
  * references must be substituted with the new pointer returned by the call. */
 sds sdscatlen(sds s, const void *t, size_t len) {
-    struct sdshdr *sh;
     size_t curlen = sdslen(s);
 
     s = sdsMakeRoomFor(s,len);
     if (s == NULL) return NULL;
-    sh = (void*) (s-sizeof *sh);
     memcpy(s+curlen, t, len);
-    sh->len = curlen+len;
-    sh->free = sh->free-len;
+    sdssetlen(s, curlen+len);
     s[curlen+len] = '\0';
     return s;
 }
@@ -267,19 +408,13 @@ sds sdscatsds(sds s, const sds t) {
 /* Destructively modify the sds string 's' to hold the specified binary
  * safe string pointed by 't' of length 'len' bytes. */
 sds sdscpylen(sds s, const char *t, size_t len) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
-    size_t totlen = sh->free+sh->len;
-
-    if (totlen < len) {
-        s = sdsMakeRoomFor(s,len-sh->len);
+    if (sdsalloc(s) < len) {
+        s = sdsMakeRoomFor(s,len-sdslen(s));
         if (s == NULL) return NULL;
-        sh = (void*) (s-sizeof *sh);
-        totlen = sh->free+sh->len;
     }
     memcpy(s, t, len);
     s[len] = '\0';
-    sh->len = len;
-    sh->free = totlen-len;
+    sdssetlen(s, len);
     return s;
 }
 
@@ -356,27 +491,52 @@ int sdsull2str(char *s, unsigned long long v) {
     return l;
 }
 
-/* Like sdscatpritf() but gets va_list instead of being variadic. */
+/* Create an sds string from a long long value. It is much faster than:
+ *
+ * sdscatprintf(sdsempty(),"%lld\n", value);
+ */
+sds sdsfromlonglong(long long value) {
+    char buf[SDS_LLSTR_SIZE];
+    int len = sdsll2str(buf,value);
+
+    return sdsnewlen(buf,len);
+}
+
+/* Like sdscatprintf() but gets va_list instead of being variadic. */
 sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
     va_list cpy;
-    char *buf, *t;
-    size_t buflen = 16;
+    char staticbuf[1024], *buf = staticbuf, *t;
+    size_t buflen = strlen(fmt)*2;
 
-    while(1) {
-        buf = malloc(buflen);
+    /* We try to start using a static buffer for speed.
+     * If not possible we revert to heap allocation. */
+    if (buflen > sizeof(staticbuf)) {
+        buf = s_malloc(buflen);
         if (buf == NULL) return NULL;
+    } else {
+        buflen = sizeof(staticbuf);
+    }
+
+    /* Try with buffers two times bigger every time we fail to
+     * fit the string in the current buffer size. */
+    while(1) {
         buf[buflen-2] = '\0';
         va_copy(cpy,ap);
         vsnprintf(buf, buflen, fmt, cpy);
+        va_end(cpy);
         if (buf[buflen-2] != '\0') {
-            free(buf);
+            if (buf != staticbuf) s_free(buf);
             buflen *= 2;
+            buf = s_malloc(buflen);
+            if (buf == NULL) return NULL;
             continue;
         }
         break;
     }
+
+    /* Finally concat the obtained string to the SDS string and return it. */
     t = sdscat(s, buf);
-    free(buf);
+    if (buf != staticbuf) s_free(buf);
     return t;
 }
 
@@ -389,7 +549,7 @@ sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
  * Example:
  *
  * s = sdsnew("Sum is: ");
- * s = sdscatprintf(s,"%d+%d = %d",a,b,a+b);
+ * s = sdscatprintf(s,"%d+%d = %d",a,b,a+b).
  *
  * Often you need to create a string from scratch with the printf-alike
  * format. When this is the need, just use sdsempty() as the target string:
@@ -419,29 +579,25 @@ sds sdscatprintf(sds s, const char *fmt, ...) {
  * %I - 64 bit signed integer (long long, int64_t)
  * %u - unsigned int
  * %U - 64 bit unsigned integer (unsigned long long, uint64_t)
- * %T - A size_t variable.
  * %% - Verbatim "%" character.
  */
 sds sdscatfmt(sds s, char const *fmt, ...) {
-    struct sdshdr *sh = (void*) (s-(sizeof(struct sdshdr)));
-    size_t initlen = sdslen(s);
     const char *f = fmt;
     int i;
     va_list ap;
 
     va_start(ap,fmt);
-    f = fmt;    /* Next format specifier byte to process. */
-    i = initlen; /* Position of the next byte to write to dest str. */
+    i = sdslen(s); /* Position of the next byte to write to dest str. */
     while(*f) {
         char next, *str;
-        int l;
+        size_t l;
         long long num;
         unsigned long long unum;
 
         /* Make sure there is always space for at least 1 char. */
-        if (sh->free == 0) {
+        if (sdsavail(s)==0) {
             s = sdsMakeRoomFor(s,1);
-            sh = (void*) (s-(sizeof(struct sdshdr)));
+            if (s == NULL) goto fmt_error;
         }
 
         switch(*f) {
@@ -453,13 +609,12 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
             case 'S':
                 str = va_arg(ap,char*);
                 l = (next == 's') ? strlen(str) : sdslen(str);
-                if (sh->free < l) {
+                if (sdsavail(s) < l) {
                     s = sdsMakeRoomFor(s,l);
-                    sh = (void*) (s-(sizeof(struct sdshdr)));
+                    if (s == NULL) goto fmt_error;
                 }
                 memcpy(s+i,str,l);
-                sh->len += l;
-                sh->free -= l;
+                sdsinclen(s,l);
                 i += l;
                 break;
             case 'i':
@@ -471,49 +626,42 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
                 {
                     char buf[SDS_LLSTR_SIZE];
                     l = sdsll2str(buf,num);
-                    if (sh->free < l) {
+                    if (sdsavail(s) < l) {
                         s = sdsMakeRoomFor(s,l);
-                        sh = (void*) (s-(sizeof(struct sdshdr)));
+                        if (s == NULL) goto fmt_error;
                     }
                     memcpy(s+i,buf,l);
-                    sh->len += l;
-                    sh->free -= l;
+                    sdsinclen(s,l);
                     i += l;
                 }
                 break;
             case 'u':
             case 'U':
-            case 'T':
                 if (next == 'u')
                     unum = va_arg(ap,unsigned int);
-                else if(next == 'U')
-                    unum = va_arg(ap,unsigned long long);
                 else
-                    unum = (unsigned long long)va_arg(ap,size_t);
+                    unum = va_arg(ap,unsigned long long);
                 {
                     char buf[SDS_LLSTR_SIZE];
                     l = sdsull2str(buf,unum);
-                    if (sh->free < l) {
+                    if (sdsavail(s) < l) {
                         s = sdsMakeRoomFor(s,l);
-                        sh = (void*) (s-(sizeof(struct sdshdr)));
+                        if (s == NULL) goto fmt_error;
                     }
                     memcpy(s+i,buf,l);
-                    sh->len += l;
-                    sh->free -= l;
+                    sdsinclen(s,l);
                     i += l;
                 }
                 break;
             default: /* Handle %% and generally %<unknown>. */
                 s[i++] = next;
-                sh->len += 1;
-                sh->free -= 1;
+                sdsinclen(s,1);
                 break;
             }
             break;
         default:
             s[i++] = *f;
-            sh->len += 1;
-            sh->free -= 1;
+            sdsinclen(s,1);
             break;
         }
         f++;
@@ -523,8 +671,11 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
     /* Add null-term */
     s[i] = '\0';
     return s;
-}
 
+fmt_error:
+    va_end(ap);
+    return NULL;
+}
 
 /* Remove the part of the string from left and from right composed just of
  * contiguous characters found in 'cset', that is a null terminted C string.
@@ -535,25 +686,24 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
  * Example:
  *
  * s = sdsnew("AA...AA.a.aa.aHelloWorld     :::");
- * s = sdstrim(s,"A. :");
+ * s = sdstrim(s,"Aa. :");
  * printf("%s\n", s);
  *
  * Output will be just "Hello World".
  */
-void sdstrim(sds s, const char *cset) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
+sds sdstrim(sds s, const char *cset) {
     char *start, *end, *sp, *ep;
     size_t len;
 
     sp = start = s;
     ep = end = s+sdslen(s)-1;
     while(sp <= end && strchr(cset, *sp)) sp++;
-    while(ep > start && strchr(cset, *ep)) ep--;
+    while(ep > sp && strchr(cset, *ep)) ep--;
     len = (sp > ep) ? 0 : ((ep-sp)+1);
-    if (sh->buf != sp) memmove(sh->buf, sp, len);
-    sh->buf[len] = '\0';
-    sh->free = sh->free+(sh->len-len);
-    sh->len = len;
+    if (s != sp) memmove(s, sp, len);
+    s[len] = '\0';
+    sdssetlen(s,len);
+    return s;
 }
 
 /* Turn the string into a smaller (or equal) string containing only the
@@ -567,16 +717,20 @@ void sdstrim(sds s, const char *cset) {
  *
  * The string is modified in-place.
  *
+ * Return value:
+ * -1 (error) if sdslen(s) is larger than maximum positive ssize_t value.
+ *  0 on success.
+ *
  * Example:
  *
  * s = sdsnew("Hello World");
  * sdsrange(s,1,-1); => "ello World"
  */
-void sdsrange(sds s, int start, int end) {
-    struct sdshdr *sh = (void*) (s-sizeof *sh);
+int sdsrange(sds s, ssize_t start, ssize_t end) {
     size_t newlen, len = sdslen(s);
+    if (len > SSIZE_MAX) return -1;
 
-    if (len == 0) return;
+    if (len == 0) return 0;
     if (start < 0) {
         start = len+start;
         if (start < 0) start = 0;
@@ -587,19 +741,19 @@ void sdsrange(sds s, int start, int end) {
     }
     newlen = (start > end) ? 0 : (end-start)+1;
     if (newlen != 0) {
-        if (start >= (signed)len) {
+        if (start >= (ssize_t)len) {
             newlen = 0;
-        } else if (end >= (signed)len) {
+        } else if (end >= (ssize_t)len) {
             end = len-1;
             newlen = (start > end) ? 0 : (end-start)+1;
         }
     } else {
         start = 0;
     }
-    if (start && newlen) memmove(sh->buf, sh->buf+start, newlen);
-    sh->buf[newlen] = 0;
-    sh->free = sh->free+(sh->len-newlen);
-    sh->len = newlen;
+    if (start && newlen) memmove(s, s+start, newlen);
+    s[newlen] = 0;
+    sdssetlen(s,newlen);
+    return 0;
 }
 
 /* Apply tolower() to every character of the sds string 's'. */
@@ -620,8 +774,8 @@ void sdstoupper(sds s) {
  *
  * Return value:
  *
- *     1 if s1 > s2.
- *    -1 if s1 < s2.
+ *     positive if s1 > s2.
+ *     negative if s1 < s2.
  *     0 if s1 and s2 are exactly the same binary string.
  *
  * If two strings share exactly the same prefix, but one of the two has
@@ -661,7 +815,7 @@ sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count
 
     if (seplen < 1 || len < 0) return NULL;
 
-    tokens = malloc(sizeof(sds)*slots);
+    tokens = s_malloc(sizeof(sds)*slots);
     if (tokens == NULL) return NULL;
 
     if (len == 0) {
@@ -674,7 +828,7 @@ sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count
             sds *newtokens;
 
             slots *= 2;
-            newtokens = realloc(tokens,sizeof(sds)*slots);
+            newtokens = s_realloc(tokens,sizeof(sds)*slots);
             if (newtokens == NULL) goto cleanup;
             tokens = newtokens;
         }
@@ -698,7 +852,7 @@ cleanup:
     {
         int i;
         for (i = 0; i < elements; i++) sdsfree(tokens[i]);
-        free(tokens);
+        s_free(tokens);
         *count = 0;
         return NULL;
     }
@@ -709,26 +863,7 @@ void sdsfreesplitres(sds *tokens, int count) {
     if (!tokens) return;
     while(count--)
         sdsfree(tokens[count]);
-    free(tokens);
-}
-
-/* Create an sds string from a long long value. It is much faster than:
- *
- * sdscatprintf(sdsempty(),"%lld\n", value);
- */
-sds sdsfromlonglong(long long value) {
-    char buf[32], *p;
-    unsigned long long v;
-
-    v = (value < 0) ? -value : value;
-    p = buf+31; /* point to the last character */
-    do {
-        *p-- = '0'+(v%10);
-        v /= 10;
-    } while(v);
-    if (value < 0) *p-- = '-';
-    p++;
-    return sdsnewlen(p,32-(p-buf));
+    s_free(tokens);
 }
 
 /* Append to the sds string "s" an escaped string representation where
@@ -762,13 +897,6 @@ sds sdscatrepr(sds s, const char *p, size_t len) {
     return sdscatlen(s,"\"",1);
 }
 
-/* Helper function for sdssplitargs() that returns non zero if 'c'
- * is a valid hex digit. */
-int is_hex_digit(char c) {
-    return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') ||
-           (c >= 'A' && c <= 'F');
-}
-
 /* Helper function for sdssplitargs() that converts a hex digit into an
  * integer from 0 to 15 */
 int hex_digit_to_int(char c) {
@@ -831,8 +959,8 @@ sds *sdssplitargs(const char *line, int *argc) {
             while(!done) {
                 if (inq) {
                     if (*p == '\\' && *(p+1) == 'x' &&
-                                             is_hex_digit(*(p+2)) &&
-                                             is_hex_digit(*(p+3)))
+                                             isxdigit(*(p+2)) &&
+                                             isxdigit(*(p+3)))
                     {
                         unsigned char byte;
 
@@ -902,13 +1030,21 @@ sds *sdssplitargs(const char *line, int *argc) {
                 if (*p) p++;
             }
             /* add the token to the vector */
-            vector = realloc(vector,((*argc)+1)*sizeof(char*));
-            vector[*argc] = current;
-            (*argc)++;
-            current = NULL;
+            {
+                char **new_vector = s_realloc(vector,((*argc)+1)*sizeof(char*));
+                if (new_vector == NULL) {
+                    s_free(vector);
+                    return NULL;
+                }
+
+                vector = new_vector;
+                vector[*argc] = current;
+                (*argc)++;
+                current = NULL;
+            }
         } else {
             /* Even on empty input string return something not NULL. */
-            if (vector == NULL) vector = malloc(sizeof(void*));
+            if (vector == NULL) vector = s_malloc(sizeof(void*));
             return vector;
         }
     }
@@ -916,7 +1052,7 @@ sds *sdssplitargs(const char *line, int *argc) {
 err:
     while((*argc)--)
         sdsfree(vector[*argc]);
-    free(vector);
+    s_free(vector);
     if (current) sdsfree(current);
     *argc = 0;
     return NULL;
@@ -947,13 +1083,13 @@ sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) {
 
 /* Join an array of C strings using the specified separator (also a C string).
  * Returns the result as an sds string. */
-sds sdsjoin(char **argv, int argc, char *sep, size_t seplen) {
+sds sdsjoin(char **argv, int argc, char *sep) {
     sds join = sdsempty();
     int j;
 
     for (j = 0; j < argc; j++) {
         join = sdscat(join, argv[j]);
-        if (j != argc-1) join = sdscatlen(join,sep,seplen);
+        if (j != argc-1) join = sdscat(join,sep);
     }
     return join;
 }
@@ -970,13 +1106,23 @@ sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) {
     return join;
 }
 
-#ifdef SDS_TEST_MAIN
+/* Wrappers to the allocators used by SDS. Note that SDS will actually
+ * just use the macros defined into sdsalloc.h in order to avoid to pay
+ * the overhead of function calls. Here we define these wrappers only for
+ * the programs SDS is linked to, if they want to touch the SDS internals
+ * even if they use a different allocator. */
+void *sds_malloc(size_t size) { return s_malloc(size); }
+void *sds_realloc(void *ptr, size_t size) { return s_realloc(ptr,size); }
+void sds_free(void *ptr) { s_free(ptr); }
+
+#if defined(SDS_TEST_MAIN)
 #include <stdio.h>
 #include "testhelp.h"
+#include "limits.h"
 
-int main(void) {
+#define UNUSED(x) (void)(x)
+int sdsTest(void) {
     {
-        struct sdshdr *sh;
         sds x = sdsnew("foo"), y;
 
         test_cond("Create a string and obtain the length",
@@ -1003,7 +1149,35 @@ int main(void) {
         sdsfree(x);
         x = sdscatprintf(sdsempty(),"%d",123);
         test_cond("sdscatprintf() seems working in the base case",
-            sdslen(x) == 3 && memcmp(x,"123\0",4) ==0)
+            sdslen(x) == 3 && memcmp(x,"123\0",4) == 0)
+
+        sdsfree(x);
+        x = sdsnew("--");
+        x = sdscatfmt(x, "Hello %s World %I,%I--", "Hi!", LLONG_MIN,LLONG_MAX);
+        test_cond("sdscatfmt() seems working in the base case",
+            sdslen(x) == 60 &&
+            memcmp(x,"--Hello Hi! World -9223372036854775808,"
+                     "9223372036854775807--",60) == 0)
+        printf("[%s]\n",x);
+
+        sdsfree(x);
+        x = sdsnew("--");
+        x = sdscatfmt(x, "%u,%U--", UINT_MAX, ULLONG_MAX);
+        test_cond("sdscatfmt() seems working with unsigned numbers",
+            sdslen(x) == 35 &&
+            memcmp(x,"--4294967295,18446744073709551615--",35) == 0)
+
+        sdsfree(x);
+        x = sdsnew(" x ");
+        sdstrim(x," x");
+        test_cond("sdstrim() works when all chars match",
+            sdslen(x) == 0)
+
+        sdsfree(x);
+        x = sdsnew(" x ");
+        sdstrim(x," ");
+        test_cond("sdstrim() works when a single char remains",
+            sdslen(x) == 1 && x[0] == 'x')
 
         sdsfree(x);
         x = sdsnew("xxciaoyyy");
@@ -1072,24 +1246,49 @@ int main(void) {
             memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0)
 
         {
-            int oldfree;
+            unsigned int oldfree;
+            char *p;
+            int step = 10, j, i;
 
             sdsfree(x);
+            sdsfree(y);
             x = sdsnew("0");
-            sh = (void*) (x-(sizeof(struct sdshdr)));
-            test_cond("sdsnew() free/len buffers", sh->len == 1 && sh->free == 0);
-            x = sdsMakeRoomFor(x,1);
-            sh = (void*) (x-(sizeof(struct sdshdr)));
-            test_cond("sdsMakeRoomFor()", sh->len == 1 && sh->free > 0);
-            oldfree = sh->free;
-            x[1] = '1';
-            sdsIncrLen(x,1);
-            test_cond("sdsIncrLen() -- content", x[0] == '0' && x[1] == '1');
-            test_cond("sdsIncrLen() -- len", sh->len == 2);
-            test_cond("sdsIncrLen() -- free", sh->free == oldfree-1);
+            test_cond("sdsnew() free/len buffers", sdslen(x) == 1 && sdsavail(x) == 0);
+
+            /* Run the test a few times in order to hit the first two
+             * SDS header types. */
+            for (i = 0; i < 10; i++) {
+                int oldlen = sdslen(x);
+                x = sdsMakeRoomFor(x,step);
+                int type = x[-1]&SDS_TYPE_MASK;
+
+                test_cond("sdsMakeRoomFor() len", sdslen(x) == oldlen);
+                if (type != SDS_TYPE_5) {
+                    test_cond("sdsMakeRoomFor() free", sdsavail(x) >= step);
+                    oldfree = sdsavail(x);
+                }
+                p = x+oldlen;
+                for (j = 0; j < step; j++) {
+                    p[j] = 'A'+j;
+                }
+                sdsIncrLen(x,step);
+            }
+            test_cond("sdsMakeRoomFor() content",
+                memcmp("0ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ",x,101) == 0);
+            test_cond("sdsMakeRoomFor() final length",sdslen(x)==101);
+
+            sdsfree(x);
         }
     }
     test_report()
     return 0;
 }
 #endif
+
+#ifdef SDS_TEST_MAIN
+int main(void) {
+    return sdsTest();
+}
+#endif
+
+#pragma GCC diagnostic pop
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sds.h b/debian/modules/nchan/src/store/redis/hiredis/sds.h
index 19a2abd..eda8833 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/sds.h
+++ b/debian/modules/nchan/src/store/redis/hiredis/sds.h
@@ -1,6 +1,8 @@
-/* SDS (Simple Dynamic Strings), A C dynamic strings library.
+/* SDSLib 2.0 -- A C dynamic strings library
  *
- * Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2015, Oran Agra
+ * Copyright (c) 2015, Redis Labs, Inc
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,38 +34,196 @@
 #define __SDS_H
 
 #define SDS_MAX_PREALLOC (1024*1024)
+#ifdef _MSC_VER
+#define __attribute__(x)
+typedef long long ssize_t;
+#define SSIZE_MAX (LLONG_MAX >> 1)
+#endif
 
 #include <sys/types.h>
 #include <stdarg.h>
-#ifdef _MSC_VER
-#include "win32.h"
-#endif
+#include <stdint.h>
 
 typedef char *sds;
 
-struct sdshdr {
-    int len;
-    int free;
+/* Note: sdshdr5 is never used, we just access the flags byte directly.
+ * However is here to document the layout of type 5 SDS strings. */
+struct __attribute__ ((__packed__)) sdshdr5 {
+    unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr8 {
+    uint8_t len; /* used */
+    uint8_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr16 {
+    uint16_t len; /* used */
+    uint16_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr32 {
+    uint32_t len; /* used */
+    uint32_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr64 {
+    uint64_t len; /* used */
+    uint64_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
     char buf[];
 };
 
+#define SDS_TYPE_5  0
+#define SDS_TYPE_8  1
+#define SDS_TYPE_16 2
+#define SDS_TYPE_32 3
+#define SDS_TYPE_64 4
+#define SDS_TYPE_MASK 7
+#define SDS_TYPE_BITS 3
+#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)));
+#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
+#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
+
 static inline size_t sdslen(const sds s) {
-    struct sdshdr *sh = (struct sdshdr *)(s-sizeof *sh);
-    return sh->len;
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            return SDS_TYPE_5_LEN(flags);
+        case SDS_TYPE_8:
+            return SDS_HDR(8,s)->len;
+        case SDS_TYPE_16:
+            return SDS_HDR(16,s)->len;
+        case SDS_TYPE_32:
+            return SDS_HDR(32,s)->len;
+        case SDS_TYPE_64:
+            return SDS_HDR(64,s)->len;
+    }
+    return 0;
 }
 
 static inline size_t sdsavail(const sds s) {
-    struct sdshdr *sh = (struct sdshdr *)(s-sizeof *sh);
-    return sh->free;
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5: {
+            return 0;
+        }
+        case SDS_TYPE_8: {
+            SDS_HDR_VAR(8,s);
+            return sh->alloc - sh->len;
+        }
+        case SDS_TYPE_16: {
+            SDS_HDR_VAR(16,s);
+            return sh->alloc - sh->len;
+        }
+        case SDS_TYPE_32: {
+            SDS_HDR_VAR(32,s);
+            return sh->alloc - sh->len;
+        }
+        case SDS_TYPE_64: {
+            SDS_HDR_VAR(64,s);
+            return sh->alloc - sh->len;
+        }
+    }
+    return 0;
+}
+
+static inline void sdssetlen(sds s, size_t newlen) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            {
+                unsigned char *fp = ((unsigned char*)s)-1;
+                *fp = (unsigned char)(SDS_TYPE_5 | (newlen << SDS_TYPE_BITS));
+            }
+            break;
+        case SDS_TYPE_8:
+            SDS_HDR(8,s)->len = (uint8_t)newlen;
+            break;
+        case SDS_TYPE_16:
+            SDS_HDR(16,s)->len = (uint16_t)newlen;
+            break;
+        case SDS_TYPE_32:
+            SDS_HDR(32,s)->len = (uint32_t)newlen;
+            break;
+        case SDS_TYPE_64:
+            SDS_HDR(64,s)->len = (uint64_t)newlen;
+            break;
+    }
+}
+
+static inline void sdsinclen(sds s, size_t inc) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            {
+                unsigned char *fp = ((unsigned char*)s)-1;
+                unsigned char newlen = SDS_TYPE_5_LEN(flags)+(unsigned char)inc;
+                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
+            }
+            break;
+        case SDS_TYPE_8:
+            SDS_HDR(8,s)->len += (uint8_t)inc;
+            break;
+        case SDS_TYPE_16:
+            SDS_HDR(16,s)->len += (uint16_t)inc;
+            break;
+        case SDS_TYPE_32:
+            SDS_HDR(32,s)->len += (uint32_t)inc;
+            break;
+        case SDS_TYPE_64:
+            SDS_HDR(64,s)->len += (uint64_t)inc;
+            break;
+    }
+}
+
+/* sdsalloc() = sdsavail() + sdslen() */
+static inline size_t sdsalloc(const sds s) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            return SDS_TYPE_5_LEN(flags);
+        case SDS_TYPE_8:
+            return SDS_HDR(8,s)->alloc;
+        case SDS_TYPE_16:
+            return SDS_HDR(16,s)->alloc;
+        case SDS_TYPE_32:
+            return SDS_HDR(32,s)->alloc;
+        case SDS_TYPE_64:
+            return SDS_HDR(64,s)->alloc;
+    }
+    return 0;
+}
+
+static inline void sdssetalloc(sds s, size_t newlen) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            /* Nothing to do, this type has no total allocation info. */
+            break;
+        case SDS_TYPE_8:
+            SDS_HDR(8,s)->alloc = (uint8_t)newlen;
+            break;
+        case SDS_TYPE_16:
+            SDS_HDR(16,s)->alloc = (uint16_t)newlen;
+            break;
+        case SDS_TYPE_32:
+            SDS_HDR(32,s)->alloc = (uint32_t)newlen;
+            break;
+        case SDS_TYPE_64:
+            SDS_HDR(64,s)->alloc = (uint64_t)newlen;
+            break;
+    }
 }
 
 sds sdsnewlen(const void *init, size_t initlen);
 sds sdsnew(const char *init);
 sds sdsempty(void);
-size_t sdslen(const sds s);
 sds sdsdup(const sds s);
 void sdsfree(sds s);
-size_t sdsavail(const sds s);
 sds sdsgrowzero(sds s, size_t len);
 sds sdscatlen(sds s, const void *t, size_t len);
 sds sdscat(sds s, const char *t);
@@ -80,8 +240,8 @@ sds sdscatprintf(sds s, const char *fmt, ...);
 #endif
 
 sds sdscatfmt(sds s, char const *fmt, ...);
-void sdstrim(sds s, const char *cset);
-void sdsrange(sds s, int start, int end);
+sds sdstrim(sds s, const char *cset);
+int sdsrange(sds s, ssize_t start, ssize_t end);
 void sdsupdatelen(sds s);
 void sdsclear(sds s);
 int sdscmp(const sds s1, const sds s2);
@@ -93,7 +253,7 @@ sds sdsfromlonglong(long long value);
 sds sdscatrepr(sds s, const char *p, size_t len);
 sds *sdssplitargs(const char *line, int *argc);
 sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
-sds sdsjoin(char **argv, int argc, char *sep, size_t seplen);
+sds sdsjoin(char **argv, int argc, char *sep);
 sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
 
 /* Low level functions exposed to the user API */
@@ -101,5 +261,18 @@ sds sdsMakeRoomFor(sds s, size_t addlen);
 void sdsIncrLen(sds s, int incr);
 sds sdsRemoveFreeSpace(sds s);
 size_t sdsAllocSize(sds s);
+void *sdsAllocPtr(sds s);
+
+/* Export the allocator used by SDS to the program using SDS.
+ * Sometimes the program SDS is linked to, may use a different set of
+ * allocators, but may want to allocate or free things that SDS will
+ * respectively free or allocate. */
+void *sds_malloc(size_t size);
+void *sds_realloc(void *ptr, size_t size);
+void sds_free(void *ptr);
+
+#ifdef REDIS_TEST
+int sdsTest(int argc, char *argv[]);
+#endif
 
 #endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sdsalloc.h b/debian/modules/nchan/src/store/redis/hiredis/sdsalloc.h
new file mode 100644
index 0000000..5538dd9
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/sdsalloc.h
@@ -0,0 +1,44 @@
+/* SDSLib 2.0 -- A C dynamic strings library
+ *
+ * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2015, Oran Agra
+ * Copyright (c) 2015, Redis Labs, Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* SDS allocator selection.
+ *
+ * This file is used in order to change the SDS allocator at compile time.
+ * Just define the following defines to what you want to use. Also add
+ * the include of your alternate allocator if needed (not needed in order
+ * to use the default libc allocator). */
+
+#include "alloc.h"
+
+#define s_malloc hi_malloc
+#define s_realloc hi_realloc
+#define s_free hi_free
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sockcompat.c b/debian/modules/nchan/src/store/redis/hiredis/sockcompat.c
new file mode 100644
index 0000000..f99d14b
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/sockcompat.c
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2019, Marcus Geelnard <m at bitsnbites dot eu>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define REDIS_SOCKCOMPAT_IMPLEMENTATION
+#include "sockcompat.h"
+
+#ifdef _WIN32
+static int _wsaErrorToErrno(int err) {
+    switch (err) {
+        case WSAEWOULDBLOCK:
+            return EWOULDBLOCK;
+        case WSAEINPROGRESS:
+            return EINPROGRESS;
+        case WSAEALREADY:
+            return EALREADY;
+        case WSAENOTSOCK:
+            return ENOTSOCK;
+        case WSAEDESTADDRREQ:
+            return EDESTADDRREQ;
+        case WSAEMSGSIZE:
+            return EMSGSIZE;
+        case WSAEPROTOTYPE:
+            return EPROTOTYPE;
+        case WSAENOPROTOOPT:
+            return ENOPROTOOPT;
+        case WSAEPROTONOSUPPORT:
+            return EPROTONOSUPPORT;
+        case WSAEOPNOTSUPP:
+            return EOPNOTSUPP;
+        case WSAEAFNOSUPPORT:
+            return EAFNOSUPPORT;
+        case WSAEADDRINUSE:
+            return EADDRINUSE;
+        case WSAEADDRNOTAVAIL:
+            return EADDRNOTAVAIL;
+        case WSAENETDOWN:
+            return ENETDOWN;
+        case WSAENETUNREACH:
+            return ENETUNREACH;
+        case WSAENETRESET:
+            return ENETRESET;
+        case WSAECONNABORTED:
+            return ECONNABORTED;
+        case WSAECONNRESET:
+            return ECONNRESET;
+        case WSAENOBUFS:
+            return ENOBUFS;
+        case WSAEISCONN:
+            return EISCONN;
+        case WSAENOTCONN:
+            return ENOTCONN;
+        case WSAETIMEDOUT:
+            return ETIMEDOUT;
+        case WSAECONNREFUSED:
+            return ECONNREFUSED;
+        case WSAELOOP:
+            return ELOOP;
+        case WSAENAMETOOLONG:
+            return ENAMETOOLONG;
+        case WSAEHOSTUNREACH:
+            return EHOSTUNREACH;
+        case WSAENOTEMPTY:
+            return ENOTEMPTY;
+        default:
+            /* We just return a generic I/O error if we could not find a relevant error. */
+            return EIO;
+    }
+}
+
+static void _updateErrno(int success) {
+    errno = success ? 0 : _wsaErrorToErrno(WSAGetLastError());
+}
+
+static int _initWinsock() {
+    static int s_initialized = 0;
+    if (!s_initialized) {
+        static WSADATA wsadata;
+        int err = WSAStartup(MAKEWORD(2,2), &wsadata);
+        if (err != 0) {
+            errno = _wsaErrorToErrno(err);
+            return 0;
+        }
+        s_initialized = 1;
+    }
+    return 1;
+}
+
+int win32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) {
+    /* Note: This function is likely to be called before other functions, so run init here. */
+    if (!_initWinsock()) {
+        return EAI_FAIL;
+    }
+
+    switch (getaddrinfo(node, service, hints, res)) {
+        case 0:                     return 0;
+        case WSATRY_AGAIN:          return EAI_AGAIN;
+        case WSAEINVAL:             return EAI_BADFLAGS;
+        case WSAEAFNOSUPPORT:       return EAI_FAMILY;
+        case WSA_NOT_ENOUGH_MEMORY: return EAI_MEMORY;
+        case WSAHOST_NOT_FOUND:     return EAI_NONAME;
+        case WSATYPE_NOT_FOUND:     return EAI_SERVICE;
+        case WSAESOCKTNOSUPPORT:    return EAI_SOCKTYPE;
+        default:                    return EAI_FAIL;     /* Including WSANO_RECOVERY */
+    }
+}
+
+const char *win32_gai_strerror(int errcode) {
+    switch (errcode) {
+        case 0:            errcode = 0;                     break;
+        case EAI_AGAIN:    errcode = WSATRY_AGAIN;          break;
+        case EAI_BADFLAGS: errcode = WSAEINVAL;             break;
+        case EAI_FAMILY:   errcode = WSAEAFNOSUPPORT;       break;
+        case EAI_MEMORY:   errcode = WSA_NOT_ENOUGH_MEMORY; break;
+        case EAI_NONAME:   errcode = WSAHOST_NOT_FOUND;     break;
+        case EAI_SERVICE:  errcode = WSATYPE_NOT_FOUND;     break;
+        case EAI_SOCKTYPE: errcode = WSAESOCKTNOSUPPORT;    break;
+        default:           errcode = WSANO_RECOVERY;        break; /* Including EAI_FAIL */
+    }
+    return gai_strerror(errcode);
+}
+
+void win32_freeaddrinfo(struct addrinfo *res) {
+    freeaddrinfo(res);
+}
+
+SOCKET win32_socket(int domain, int type, int protocol) {
+    SOCKET s;
+
+    /* Note: This function is likely to be called before other functions, so run init here. */
+    if (!_initWinsock()) {
+        return INVALID_SOCKET;
+    }
+
+    _updateErrno((s = socket(domain, type, protocol)) != INVALID_SOCKET);
+    return s;
+}
+
+int win32_ioctl(SOCKET fd, unsigned long request, unsigned long *argp) {
+    int ret = ioctlsocket(fd, (long)request, argp);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_bind(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen) {
+    int ret = bind(sockfd, addr, addrlen);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen) {
+    int ret = connect(sockfd, addr, addrlen);
+    _updateErrno(ret != SOCKET_ERROR);
+
+    /* For Winsock connect(), the WSAEWOULDBLOCK error means the same thing as
+     * EINPROGRESS for POSIX connect(), so we do that translation to keep POSIX
+     * logic consistent. */
+    if (errno == EWOULDBLOCK) {
+        errno = EINPROGRESS;
+    }
+
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, socklen_t *optlen) {
+    int ret = 0;
+    if ((level == SOL_SOCKET) && ((optname == SO_RCVTIMEO) || (optname == SO_SNDTIMEO))) {
+        if (*optlen >= sizeof (struct timeval)) {
+            struct timeval *tv = optval;
+            DWORD timeout = 0;
+            socklen_t dwlen = 0;
+            ret = getsockopt(sockfd, level, optname, (char *)&timeout, &dwlen);
+            tv->tv_sec = timeout / 1000;
+            tv->tv_usec = (timeout * 1000) % 1000000;
+        } else {
+            ret = WSAEFAULT;
+        }
+        *optlen = sizeof (struct timeval);
+    } else {
+        ret = getsockopt(sockfd, level, optname, (char*)optval, optlen);
+    }
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_setsockopt(SOCKET sockfd, int level, int optname, const void *optval, socklen_t optlen) {
+    int ret = 0;
+    if ((level == SOL_SOCKET) && ((optname == SO_RCVTIMEO) || (optname == SO_SNDTIMEO))) {
+        const struct timeval *tv = optval;
+        DWORD timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+        ret = setsockopt(sockfd, level, optname, (const char*)&timeout, sizeof(DWORD));
+    } else {
+        ret = setsockopt(sockfd, level, optname, (const char*)optval, optlen);
+    }
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_close(SOCKET fd) {
+    int ret = closesocket(fd);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+ssize_t win32_recv(SOCKET sockfd, void *buf, size_t len, int flags) {
+    int ret = recv(sockfd, (char*)buf, (int)len, flags);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+ssize_t win32_send(SOCKET sockfd, const void *buf, size_t len, int flags) {
+    int ret = send(sockfd, (const char*)buf, (int)len, flags);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_poll(struct pollfd *fds, nfds_t nfds, int timeout) {
+    int ret = WSAPoll(fds, nfds, timeout);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+#endif /* _WIN32 */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sockcompat.h b/debian/modules/nchan/src/store/redis/hiredis/sockcompat.h
new file mode 100644
index 0000000..85810e8
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/sockcompat.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2019, Marcus Geelnard <m at bitsnbites dot eu>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __SOCKCOMPAT_H
+#define __SOCKCOMPAT_H
+
+#ifndef _WIN32
+/* For POSIX systems we use the standard BSD socket API. */
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <poll.h>
+#else
+/* For Windows we use winsock. */
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600 /* To get WSAPoll etc. */
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <stddef.h>
+#include <errno.h>
+
+#ifdef _MSC_VER
+typedef long long ssize_t;
+#endif
+
+/* Emulate the parts of the BSD socket API that we need (override the winsock signatures). */
+int win32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
+const char *win32_gai_strerror(int errcode);
+void win32_freeaddrinfo(struct addrinfo *res);
+SOCKET win32_socket(int domain, int type, int protocol);
+int win32_ioctl(SOCKET fd, unsigned long request, unsigned long *argp);
+int win32_bind(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
+int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
+int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, socklen_t *optlen);
+int win32_setsockopt(SOCKET sockfd, int level, int optname, const void *optval, socklen_t optlen);
+int win32_close(SOCKET fd);
+ssize_t win32_recv(SOCKET sockfd, void *buf, size_t len, int flags);
+ssize_t win32_send(SOCKET sockfd, const void *buf, size_t len, int flags);
+typedef ULONG nfds_t;
+int win32_poll(struct pollfd *fds, nfds_t nfds, int timeout);
+
+#ifndef REDIS_SOCKCOMPAT_IMPLEMENTATION
+#define getaddrinfo(node, service, hints, res) win32_getaddrinfo(node, service, hints, res)
+#undef gai_strerror
+#define gai_strerror(errcode) win32_gai_strerror(errcode)
+#define freeaddrinfo(res) win32_freeaddrinfo(res)
+#define socket(domain, type, protocol) win32_socket(domain, type, protocol)
+#define ioctl(fd, request, argp) win32_ioctl(fd, request, argp)
+#define bind(sockfd, addr, addrlen) win32_bind(sockfd, addr, addrlen)
+#define connect(sockfd, addr, addrlen) win32_connect(sockfd, addr, addrlen)
+#define getsockopt(sockfd, level, optname, optval, optlen) win32_getsockopt(sockfd, level, optname, optval, optlen)
+#define setsockopt(sockfd, level, optname, optval, optlen) win32_setsockopt(sockfd, level, optname, optval, optlen)
+#define close(fd) win32_close(fd)
+#define recv(sockfd, buf, len, flags) win32_recv(sockfd, buf, len, flags)
+#define send(sockfd, buf, len, flags) win32_send(sockfd, buf, len, flags)
+#define poll(fds, nfds, timeout) win32_poll(fds, nfds, timeout)
+#endif /* REDIS_SOCKCOMPAT_IMPLEMENTATION */
+#endif /* _WIN32 */
+
+#endif /* __SOCKCOMPAT_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/ssl.c b/debian/modules/nchan/src/store/redis/hiredis/ssl.c
new file mode 100644
index 0000000..7df58fb
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/hiredis/ssl.c
@@ -0,0 +1,526 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2019, Redis Labs
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hiredis.h"
+#include "async.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <pthread.h>
+#endif
+
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+#include "win32.h"
+#include "async_private.h"
+#include "hiredis_ssl.h"
+
+void __redisSetError(redisContext *c, int type, const char *str);
+
+struct redisSSLContext {
+    /* Associated OpenSSL SSL_CTX as created by redisCreateSSLContext() */
+    SSL_CTX *ssl_ctx;
+
+    /* Requested SNI, or NULL */
+    char *server_name;
+};
+
+/* The SSL connection context is attached to SSL/TLS connections as a privdata. */
+typedef struct redisSSL {
+    /**
+     * OpenSSL SSL object.
+     */
+    SSL *ssl;
+
+    /**
+     * SSL_write() requires to be called again with the same arguments it was
+     * previously called with in the event of an SSL_read/SSL_write situation
+     */
+    size_t lastLen;
+
+    /** Whether the SSL layer requires read (possibly before a write) */
+    int wantRead;
+
+    /**
+     * Whether a write was requested prior to a read. If set, the write()
+     * should resume whenever a read takes place, if possible
+     */
+    int pendingWrite;
+} redisSSL;
+
+/* Forward declaration */
+redisContextFuncs redisContextSSLFuncs;
+
+/**
+ * OpenSSL global initialization and locking handling callbacks.
+ * Note that this is only required for OpenSSL < 1.1.0.
+ */
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define HIREDIS_USE_CRYPTO_LOCKS
+#endif
+
+#ifdef HIREDIS_USE_CRYPTO_LOCKS
+#ifdef _WIN32
+typedef CRITICAL_SECTION sslLockType;
+static void sslLockInit(sslLockType* l) {
+    InitializeCriticalSection(l);
+}
+static void sslLockAcquire(sslLockType* l) {
+    EnterCriticalSection(l);
+}
+static void sslLockRelease(sslLockType* l) {
+    LeaveCriticalSection(l);
+}
+#else
+typedef pthread_mutex_t sslLockType;
+static void sslLockInit(sslLockType *l) {
+    pthread_mutex_init(l, NULL);
+}
+static void sslLockAcquire(sslLockType *l) {
+    pthread_mutex_lock(l);
+}
+static void sslLockRelease(sslLockType *l) {
+    pthread_mutex_unlock(l);
+}
+#endif
+
+static sslLockType* ossl_locks;
+
+static void opensslDoLock(int mode, int lkid, const char *f, int line) {
+    sslLockType *l = ossl_locks + lkid;
+
+    if (mode & CRYPTO_LOCK) {
+        sslLockAcquire(l);
+    } else {
+        sslLockRelease(l);
+    }
+
+    (void)f;
+    (void)line;
+}
+
+static int initOpensslLocks(void) {
+    unsigned ii, nlocks;
+    if (CRYPTO_get_locking_callback() != NULL) {
+        /* Someone already set the callback before us. Don't destroy it! */
+        return REDIS_OK;
+    }
+    nlocks = CRYPTO_num_locks();
+    ossl_locks = hi_malloc(sizeof(*ossl_locks) * nlocks);
+    if (ossl_locks == NULL)
+        return REDIS_ERR;
+
+    for (ii = 0; ii < nlocks; ii++) {
+        sslLockInit(ossl_locks + ii);
+    }
+    CRYPTO_set_locking_callback(opensslDoLock);
+    return REDIS_OK;
+}
+#endif /* HIREDIS_USE_CRYPTO_LOCKS */
+
+int redisInitOpenSSL(void)
+{
+    SSL_library_init();
+#ifdef HIREDIS_USE_CRYPTO_LOCKS
+    initOpensslLocks();
+#endif
+
+    return REDIS_OK;
+}
+
+/**
+ * redisSSLContext helper context destruction.
+ */
+
+const char *redisSSLContextGetError(redisSSLContextError error)
+{
+    switch (error) {
+        case REDIS_SSL_CTX_NONE:
+            return "No Error";
+        case REDIS_SSL_CTX_CREATE_FAILED:
+            return "Failed to create OpenSSL SSL_CTX";
+        case REDIS_SSL_CTX_CERT_KEY_REQUIRED:
+            return "Client cert and key must both be specified or skipped";
+        case REDIS_SSL_CTX_CA_CERT_LOAD_FAILED:
+            return "Failed to load CA Certificate or CA Path";
+        case REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED:
+            return "Failed to load client certificate";
+        case REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED:
+            return "Failed to load private key";
+        default:
+            return "Unknown error code";
+    }
+}
+
+void redisFreeSSLContext(redisSSLContext *ctx)
+{
+    if (!ctx)
+        return;
+
+    if (ctx->server_name) {
+        hi_free(ctx->server_name);
+        ctx->server_name = NULL;
+    }
+
+    if (ctx->ssl_ctx) {
+        SSL_CTX_free(ctx->ssl_ctx);
+        ctx->ssl_ctx = NULL;
+    }
+
+    hi_free(ctx);
+}
+
+
+/**
+ * redisSSLContext helper context initialization.
+ */
+
+redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
+        const char *cert_filename, const char *private_key_filename,
+        const char *server_name, redisSSLContextError *error)
+{
+    redisSSLContext *ctx = hi_calloc(1, sizeof(redisSSLContext));
+    if (ctx == NULL)
+        goto error;
+
+    ctx->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+    if (!ctx->ssl_ctx) {
+        if (error) *error = REDIS_SSL_CTX_CREATE_FAILED;
+        goto error;
+    }
+
+    SSL_CTX_set_options(ctx->ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+    SSL_CTX_set_verify(ctx->ssl_ctx, SSL_VERIFY_PEER, NULL);
+
+    if ((cert_filename != NULL && private_key_filename == NULL) ||
+            (private_key_filename != NULL && cert_filename == NULL)) {
+        if (error) *error = REDIS_SSL_CTX_CERT_KEY_REQUIRED;
+        goto error;
+    }
+
+    if (capath || cacert_filename) {
+        if (!SSL_CTX_load_verify_locations(ctx->ssl_ctx, cacert_filename, capath)) {
+            if (error) *error = REDIS_SSL_CTX_CA_CERT_LOAD_FAILED;
+            goto error;
+        }
+    }
+
+    if (cert_filename) {
+        if (!SSL_CTX_use_certificate_chain_file(ctx->ssl_ctx, cert_filename)) {
+            if (error) *error = REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED;
+            goto error;
+        }
+        if (!SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, private_key_filename, SSL_FILETYPE_PEM)) {
+            if (error) *error = REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED;
+            goto error;
+        }
+    }
+
+    if (server_name)
+        ctx->server_name = hi_strdup(server_name);
+
+    return ctx;
+
+error:
+    redisFreeSSLContext(ctx);
+    return NULL;
+}
+
+/**
+ * SSL Connection initialization.
+ */
+
+
+static int redisSSLConnect(redisContext *c, SSL *ssl) {
+    if (c->privctx) {
+        __redisSetError(c, REDIS_ERR_OTHER, "redisContext was already associated");
+        return REDIS_ERR;
+    }
+
+    redisSSL *rssl = hi_calloc(1, sizeof(redisSSL));
+    if (rssl == NULL) {
+        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+        return REDIS_ERR;
+    }
+
+    c->funcs = &redisContextSSLFuncs;
+    rssl->ssl = ssl;
+
+    SSL_set_mode(rssl->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+    SSL_set_fd(rssl->ssl, c->fd);
+    SSL_set_connect_state(rssl->ssl);
+
+    ERR_clear_error();
+    int rv = SSL_connect(rssl->ssl);
+    if (rv == 1) {
+        c->privctx = rssl;
+        return REDIS_OK;
+    }
+
+    rv = SSL_get_error(rssl->ssl, rv);
+    if (((c->flags & REDIS_BLOCK) == 0) &&
+        (rv == SSL_ERROR_WANT_READ || rv == SSL_ERROR_WANT_WRITE)) {
+        c->privctx = rssl;
+        return REDIS_OK;
+    }
+
+    if (c->err == 0) {
+        char err[512];
+        if (rv == SSL_ERROR_SYSCALL)
+            snprintf(err,sizeof(err)-1,"SSL_connect failed: %s",strerror(errno));
+        else {
+            unsigned long e = ERR_peek_last_error();
+            snprintf(err,sizeof(err)-1,"SSL_connect failed: %s",
+                    ERR_reason_error_string(e));
+        }
+        __redisSetError(c, REDIS_ERR_IO, err);
+    }
+
+    hi_free(rssl);
+    return REDIS_ERR;
+}
+
+/**
+ * A wrapper around redisSSLConnect() for users who manage their own context and
+ * create their own SSL object.
+ */
+
+int redisInitiateSSL(redisContext *c, SSL *ssl) {
+    return redisSSLConnect(c, ssl);
+}
+
+/**
+ * A wrapper around redisSSLConnect() for users who use redisSSLContext and don't
+ * manage their own SSL objects.
+ */
+
+int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx)
+{
+    if (!c || !redis_ssl_ctx)
+        return REDIS_ERR;
+
+    /* We want to verify that redisSSLConnect() won't fail on this, as it will
+     * not own the SSL object in that case and we'll end up leaking.
+     */
+    if (c->privctx)
+        return REDIS_ERR;
+
+    SSL *ssl = SSL_new(redis_ssl_ctx->ssl_ctx);
+    if (!ssl) {
+        __redisSetError(c, REDIS_ERR_OTHER, "Couldn't create new SSL instance");
+        goto error;
+    }
+
+    if (redis_ssl_ctx->server_name) {
+        if (!SSL_set_tlsext_host_name(ssl, redis_ssl_ctx->server_name)) {
+            __redisSetError(c, REDIS_ERR_OTHER, "Failed to set server_name/SNI");
+            goto error;
+        }
+    }
+
+    return redisSSLConnect(c, ssl);
+
+error:
+    if (ssl)
+        SSL_free(ssl);
+    return REDIS_ERR;
+}
+
+static int maybeCheckWant(redisSSL *rssl, int rv) {
+    /**
+     * If the error is WANT_READ or WANT_WRITE, the appropriate flags are set
+     * and true is returned. False is returned otherwise
+     */
+    if (rv == SSL_ERROR_WANT_READ) {
+        rssl->wantRead = 1;
+        return 1;
+    } else if (rv == SSL_ERROR_WANT_WRITE) {
+        rssl->pendingWrite = 1;
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+/**
+ * Implementation of redisContextFuncs for SSL connections.
+ */
+
+static void redisSSLFree(void *privctx){
+    redisSSL *rsc = privctx;
+
+    if (!rsc) return;
+    if (rsc->ssl) {
+        SSL_free(rsc->ssl);
+        rsc->ssl = NULL;
+    }
+    hi_free(rsc);
+}
+
+static ssize_t redisSSLRead(redisContext *c, char *buf, size_t bufcap) {
+    redisSSL *rssl = c->privctx;
+
+    int nread = SSL_read(rssl->ssl, buf, bufcap);
+    if (nread > 0) {
+        return nread;
+    } else if (nread == 0) {
+        __redisSetError(c, REDIS_ERR_EOF, "Server closed the connection");
+        return -1;
+    } else {
+        int err = SSL_get_error(rssl->ssl, nread);
+        if (c->flags & REDIS_BLOCK) {
+            /**
+             * In blocking mode, we should never end up in a situation where
+             * we get an error without it being an actual error, except
+             * in the case of EINTR, which can be spuriously received from
+             * debuggers or whatever.
+             */
+            if (errno == EINTR) {
+                return 0;
+            } else {
+                const char *msg = NULL;
+                if (errno == EAGAIN) {
+                    msg = "Resource temporarily unavailable";
+                }
+                __redisSetError(c, REDIS_ERR_IO, msg);
+                return -1;
+            }
+        }
+
+        /**
+         * We can very well get an EWOULDBLOCK/EAGAIN, however
+         */
+        if (maybeCheckWant(rssl, err)) {
+            return 0;
+        } else {
+            __redisSetError(c, REDIS_ERR_IO, NULL);
+            return -1;
+        }
+    }
+}
+
+static ssize_t redisSSLWrite(redisContext *c) {
+    redisSSL *rssl = c->privctx;
+
+    size_t len = rssl->lastLen ? rssl->lastLen : sdslen(c->obuf);
+    int rv = SSL_write(rssl->ssl, c->obuf, len);
+
+    if (rv > 0) {
+        rssl->lastLen = 0;
+    } else if (rv < 0) {
+        rssl->lastLen = len;
+
+        int err = SSL_get_error(rssl->ssl, rv);
+        if ((c->flags & REDIS_BLOCK) == 0 && maybeCheckWant(rssl, err)) {
+            return 0;
+        } else {
+            __redisSetError(c, REDIS_ERR_IO, NULL);
+            return -1;
+        }
+    }
+    return rv;
+}
+
+static void redisSSLAsyncRead(redisAsyncContext *ac) {
+    int rv;
+    redisSSL *rssl = ac->c.privctx;
+    redisContext *c = &ac->c;
+
+    rssl->wantRead = 0;
+
+    if (rssl->pendingWrite) {
+        int done;
+
+        /* This is probably just a write event */
+        rssl->pendingWrite = 0;
+        rv = redisBufferWrite(c, &done);
+        if (rv == REDIS_ERR) {
+            __redisAsyncDisconnect(ac);
+            return;
+        } else if (!done) {
+            _EL_ADD_WRITE(ac);
+        }
+    }
+
+    rv = redisBufferRead(c);
+    if (rv == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+    } else {
+        _EL_ADD_READ(ac);
+        redisProcessCallbacks(ac);
+    }
+}
+
+static void redisSSLAsyncWrite(redisAsyncContext *ac) {
+    int rv, done = 0;
+    redisSSL *rssl = ac->c.privctx;
+    redisContext *c = &ac->c;
+
+    rssl->pendingWrite = 0;
+    rv = redisBufferWrite(c, &done);
+    if (rv == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+        return;
+    }
+
+    if (!done) {
+        if (rssl->wantRead) {
+            /* Need to read-before-write */
+            rssl->pendingWrite = 1;
+            _EL_DEL_WRITE(ac);
+        } else {
+            /* No extra reads needed, just need to write more */
+            _EL_ADD_WRITE(ac);
+        }
+    } else {
+        /* Already done! */
+        _EL_DEL_WRITE(ac);
+    }
+
+    /* Always reschedule a read */
+    _EL_ADD_READ(ac);
+}
+
+redisContextFuncs redisContextSSLFuncs = {
+    .free_privctx = redisSSLFree,
+    .async_read = redisSSLAsyncRead,
+    .async_write = redisSSLAsyncWrite,
+    .read = redisSSLRead,
+    .write = redisSSLWrite
+};
+
diff --git a/debian/modules/nchan/src/store/redis/hiredis/test.c b/debian/modules/nchan/src/store/redis/hiredis/test.c
index d5e8217..c0eeca7 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/test.c
+++ b/debian/modules/nchan/src/store/redis/hiredis/test.c
@@ -1,22 +1,30 @@
 #include "fmacros.h"
+#include "sockcompat.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _WIN32
 #include <strings.h>
 #include <sys/time.h>
+#endif
 #include <assert.h>
-#include <unistd.h>
 #include <signal.h>
 #include <errno.h>
 #include <limits.h>
 
 #include "hiredis.h"
+#include "async.h"
+#ifdef HIREDIS_TEST_SSL
+#include "hiredis_ssl.h"
+#endif
 #include "net.h"
+#include "win32.h"
 
 enum connection_type {
     CONN_TCP,
     CONN_UNIX,
-    CONN_FD
+    CONN_FD,
+    CONN_SSL
 };
 
 struct config {
@@ -30,18 +38,41 @@ struct config {
 
     struct {
         const char *path;
-    } unix;
+    } unix_sock;
+
+    struct {
+        const char *host;
+        int port;
+        const char *ca_cert;
+        const char *cert;
+        const char *key;
+    } ssl;
 };
 
+struct privdata {
+    int dtor_counter;
+};
+
+#ifdef HIREDIS_TEST_SSL
+redisSSLContext *_ssl_ctx = NULL;
+#endif
+
 /* The following lines make up our testing "framework" :) */
-static int tests = 0, fails = 0;
+static int tests = 0, fails = 0, skips = 0;
 #define test(_s) { printf("#%02d ", ++tests); printf(_s); }
 #define test_cond(_c) if(_c) printf("\033[0;32mPASSED\033[0;0m\n"); else {printf("\033[0;31mFAILED\033[0;0m\n"); fails++;}
+#define test_skipped() { printf("\033[01;33mSKIPPED\033[0;0m\n"); skips++; }
 
 static long long usec(void) {
+#ifndef _MSC_VER
     struct timeval tv;
     gettimeofday(&tv,NULL);
     return (((long long)tv.tv_sec)*1000000)+tv.tv_usec;
+#else
+    FILETIME ft;
+    GetSystemTimeAsFileTime(&ft);
+    return (((long long)ft.dwHighDateTime << 32) | ft.dwLowDateTime) / 10;
+#endif
 }
 
 /* The assert() calls below have side effects, so we need assert()
@@ -51,6 +82,43 @@ static long long usec(void) {
 #define assert(e) (void)(e)
 #endif
 
+/* Helper to extract Redis version information.  Aborts on any failure. */
+#define REDIS_VERSION_FIELD "redis_version:"
+void get_redis_version(redisContext *c, int *majorptr, int *minorptr) {
+    redisReply *reply;
+    char *eptr, *s, *e;
+    int major, minor;
+
+    reply = redisCommand(c, "INFO");
+    if (reply == NULL || c->err || reply->type != REDIS_REPLY_STRING)
+        goto abort;
+    if ((s = strstr(reply->str, REDIS_VERSION_FIELD)) == NULL)
+        goto abort;
+
+    s += strlen(REDIS_VERSION_FIELD);
+
+    /* We need a field terminator and at least 'x.y.z' (5) bytes of data */
+    if ((e = strstr(s, "\r\n")) == NULL || (e - s) < 5)
+        goto abort;
+
+    /* Extract version info */
+    major = strtol(s, &eptr, 10);
+    if (*eptr != '.') goto abort;
+    minor = strtol(eptr+1, NULL, 10);
+
+    /* Push info the caller wants */
+    if (majorptr) *majorptr = major;
+    if (minorptr) *minorptr = minor;
+
+    freeReplyObject(reply);
+    return;
+
+abort:
+    freeReplyObject(reply);
+    fprintf(stderr, "Error:  Cannot determine Redis version, aborting\n");
+    exit(1);
+}
+
 static redisContext *select_database(redisContext *c) {
     redisReply *reply;
 
@@ -73,6 +141,26 @@ static redisContext *select_database(redisContext *c) {
     return c;
 }
 
+/* Switch protocol */
+static void send_hello(redisContext *c, int version) {
+    redisReply *reply;
+    int expected;
+
+    reply = redisCommand(c, "HELLO %d", version);
+    expected = version == 3 ? REDIS_REPLY_MAP : REDIS_REPLY_ARRAY;
+    assert(reply != NULL && reply->type == expected);
+    freeReplyObject(reply);
+}
+
+/* Togggle client tracking */
+static void send_client_tracking(redisContext *c, const char *str) {
+    redisReply *reply;
+
+    reply = redisCommand(c, "CLIENT TRACKING %s", str);
+    assert(reply != NULL && reply->type == REDIS_REPLY_STATUS);
+    freeReplyObject(reply);
+}
+
 static int disconnect(redisContext *c, int keep_fd) {
     redisReply *reply;
 
@@ -91,16 +179,31 @@ static int disconnect(redisContext *c, int keep_fd) {
     return -1;
 }
 
-static redisContext *connect(struct config config) {
+static void do_ssl_handshake(redisContext *c) {
+#ifdef HIREDIS_TEST_SSL
+    redisInitiateSSLWithContext(c, _ssl_ctx);
+    if (c->err) {
+        printf("SSL error: %s\n", c->errstr);
+        redisFree(c);
+        exit(1);
+    }
+#else
+    (void) c;
+#endif
+}
+
+static redisContext *do_connect(struct config config) {
     redisContext *c = NULL;
 
     if (config.type == CONN_TCP) {
         c = redisConnect(config.tcp.host, config.tcp.port);
+    } else if (config.type == CONN_SSL) {
+        c = redisConnect(config.ssl.host, config.ssl.port);
     } else if (config.type == CONN_UNIX) {
-        c = redisConnectUnix(config.unix.path);
+        c = redisConnectUnix(config.unix_sock.path);
     } else if (config.type == CONN_FD) {
         /* Create a dummy connection just to get an fd to inherit */
-        redisContext *dummy_ctx = redisConnectUnix(config.unix.path);
+        redisContext *dummy_ctx = redisConnectUnix(config.unix_sock.path);
         if (dummy_ctx) {
             int fd = disconnect(dummy_ctx, 1);
             printf("Connecting to inherited fd %d\n", fd);
@@ -119,9 +222,21 @@ static redisContext *connect(struct config config) {
         exit(1);
     }
 
+    if (config.type == CONN_SSL) {
+        do_ssl_handshake(c);
+    }
+
     return select_database(c);
 }
 
+static void do_reconnect(redisContext *c, struct config config) {
+    redisReconnect(c);
+
+    if (config.type == CONN_SSL) {
+        do_ssl_handshake(c);
+    }
+}
+
 static void test_format_commands(void) {
     char *cmd;
     int len;
@@ -130,43 +245,43 @@ static void test_format_commands(void) {
     len = redisFormatCommand(&cmd,"SET foo bar");
     test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
         len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
+    hi_free(cmd);
 
     test("Format command with %%s string interpolation: ");
     len = redisFormatCommand(&cmd,"SET %s %s","foo","bar");
     test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
         len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
+    hi_free(cmd);
 
     test("Format command with %%s and an empty string: ");
     len = redisFormatCommand(&cmd,"SET %s %s","foo","");
     test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
         len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    free(cmd);
+    hi_free(cmd);
 
     test("Format command with an empty string in between proper interpolations: ");
     len = redisFormatCommand(&cmd,"SET %s %s","","foo");
     test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$0\r\n\r\n$3\r\nfoo\r\n",len) == 0 &&
         len == 4+4+(3+2)+4+(0+2)+4+(3+2));
-    free(cmd);
+    hi_free(cmd);
 
     test("Format command with %%b string interpolation: ");
     len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"b\0r",(size_t)3);
     test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nb\0r\r\n",len) == 0 &&
         len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
+    hi_free(cmd);
 
     test("Format command with %%b and an empty string: ");
     len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"",(size_t)0);
     test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
         len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    free(cmd);
+    hi_free(cmd);
 
     test("Format command with literal %%: ");
     len = redisFormatCommand(&cmd,"SET %% %%");
     test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$1\r\n%\r\n$1\r\n%\r\n",len) == 0 &&
         len == 4+4+(3+2)+4+(1+2)+4+(1+2));
-    free(cmd);
+    hi_free(cmd);
 
     /* Vararg width depends on the type. These tests make sure that the
      * width is correctly determined using the format and subsequent varargs
@@ -177,7 +292,7 @@ static void test_format_commands(void) {
     len = redisFormatCommand(&cmd,"key:%08" fmt " str:%s", value, "hello");               \
     test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",len) == 0 && \
         len == 4+5+(12+2)+4+(9+2));                                                       \
-    free(cmd);                                                                            \
+    hi_free(cmd);                                                                         \
 } while(0)
 
 #define FLOAT_WIDTH_TEST(type) do {                                                       \
@@ -186,7 +301,7 @@ static void test_format_commands(void) {
     len = redisFormatCommand(&cmd,"key:%08.3f str:%s", value, "hello");                   \
     test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",len) == 0 && \
         len == 4+5+(12+2)+4+(9+2));                                                       \
-    free(cmd);                                                                            \
+    hi_free(cmd);                                                                         \
 } while(0)
 
     INTEGER_WIDTH_TEST("d", int);
@@ -217,13 +332,29 @@ static void test_format_commands(void) {
     len = redisFormatCommandArgv(&cmd,argc,argv,NULL);
     test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
         len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
+    hi_free(cmd);
 
     test("Format command by passing argc/argv with lengths: ");
     len = redisFormatCommandArgv(&cmd,argc,argv,lens);
     test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
         len == 4+4+(3+2)+4+(7+2)+4+(3+2));
-    free(cmd);
+    hi_free(cmd);
+
+    sds sds_cmd;
+
+    sds_cmd = NULL;
+    test("Format command into sds by passing argc/argv without lengths: ");
+    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,NULL);
+    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    sdsfree(sds_cmd);
+
+    sds_cmd = NULL;
+    test("Format command into sds by passing argc/argv with lengths: ");
+    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,lens);
+    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
+    sdsfree(sds_cmd);
 }
 
 static void test_append_formatted_commands(struct config config) {
@@ -232,7 +363,7 @@ static void test_append_formatted_commands(struct config config) {
     char *cmd;
     int len;
 
-    c = connect(config);
+    c = do_connect(config);
 
     test("Append format command: ");
 
@@ -242,7 +373,7 @@ static void test_append_formatted_commands(struct config config) {
 
     assert(redisGetReply(c, (void*)&reply) == REDIS_OK);
 
-    free(cmd);
+    hi_free(cmd);
     freeReplyObject(reply);
 
     disconnect(c, 0);
@@ -250,7 +381,7 @@ static void test_append_formatted_commands(struct config config) {
 
 static void test_reply_reader(void) {
     redisReader *reader;
-    void *reply;
+    void *reply, *root;
     int ret;
     int i;
 
@@ -274,18 +405,114 @@ static void test_reply_reader(void) {
               strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
     redisReaderFree(reader);
 
-    test("Set error on nested multi bulks with depth > 7: ");
     reader = redisReaderCreate();
-
-    for (i = 0; i < 9; i++) {
-        redisReaderFeed(reader,(char*)"*1\r\n",4);
+    test("Can handle arbitrarily nested multi-bulks: ");
+    for (i = 0; i < 128; i++) {
+        redisReaderFeed(reader,(char*)"*1\r\n", 4);
     }
+    redisReaderFeed(reader,(char*)"$6\r\nLOLWUT\r\n",12);
+    ret = redisReaderGetReply(reader,&reply);
+    root = reply; /* Keep track of the root reply */
+    test_cond(ret == REDIS_OK &&
+        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
+        ((redisReply*)reply)->elements == 1);
 
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strncasecmp(reader->errstr,"No support for",14) == 0);
+    test("Can parse arbitrarily nested multi-bulks correctly: ");
+    while(i--) {
+        assert(reply != NULL && ((redisReply*)reply)->type == REDIS_REPLY_ARRAY);
+        reply = ((redisReply*)reply)->element[0];
+    }
+    test_cond(((redisReply*)reply)->type == REDIS_REPLY_STRING &&
+        !memcmp(((redisReply*)reply)->str, "LOLWUT", 6));
+    freeReplyObject(root);
     redisReaderFree(reader);
 
+    test("Correctly parses LLONG_MAX: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, ":9223372036854775807\r\n",22);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
+            ((redisReply*)reply)->integer == LLONG_MAX);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when > LLONG_MAX: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, ":9223372036854775808\r\n",22);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Bad integer value") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Correctly parses LLONG_MIN: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, ":-9223372036854775808\r\n",23);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
+            ((redisReply*)reply)->integer == LLONG_MIN);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when < LLONG_MIN: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, ":-9223372036854775809\r\n",23);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Bad integer value") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when array < -1: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, "*-2\r\n+asdf\r\n",12);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when bulk < -1: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, "$-2\r\nasdf\r\n",11);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Can configure maximum multi-bulk elements: ");
+    reader = redisReaderCreate();
+    reader->maxelements = 1024;
+    redisReaderFeed(reader, "*1025\r\n", 7);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr, "Multi-bulk length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+#if LLONG_MAX > SIZE_MAX
+    test("Set error when array > SIZE_MAX: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, "*9223372036854775807\r\n+asdf\r\n",29);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+            strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when bulk > SIZE_MAX: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, "$9223372036854775807\r\nasdf\r\n",28);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+            strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+#endif
+
     test("Works with NULL functions for reply: ");
     reader = redisReaderCreate();
     reader->fn = NULL;
@@ -325,53 +552,271 @@ static void test_reply_reader(void) {
         ((redisReply*)reply)->elements == 0);
     freeReplyObject(reply);
     redisReaderFree(reader);
+
+    /* RESP3 verbatim strings (GitHub issue #802) */
+    test("Can parse RESP3 verbatim strings: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"=10\r\ntxt:LOLWUT\r\n",17);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+        ((redisReply*)reply)->type == REDIS_REPLY_VERB &&
+         !memcmp(((redisReply*)reply)->str,"LOLWUT", 6));
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    /* RESP3 push messages (Github issue #815) */
+    test("Can parse RESP3 push messages: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)">2\r\n$6\r\nLOLWUT\r\n:42\r\n",21);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+        ((redisReply*)reply)->type == REDIS_REPLY_PUSH &&
+        ((redisReply*)reply)->elements == 2 &&
+        ((redisReply*)reply)->element[0]->type == REDIS_REPLY_STRING &&
+        !memcmp(((redisReply*)reply)->element[0]->str,"LOLWUT",6) &&
+        ((redisReply*)reply)->element[1]->type == REDIS_REPLY_INTEGER &&
+        ((redisReply*)reply)->element[1]->integer == 42);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
 }
 
 static void test_free_null(void) {
-    void *redisContext = NULL;
+    void *redisCtx = NULL;
     void *reply = NULL;
 
     test("Don't fail when redisFree is passed a NULL value: ");
-    redisFree(redisContext);
-    test_cond(redisContext == NULL);
+    redisFree(redisCtx);
+    test_cond(redisCtx == NULL);
 
     test("Don't fail when freeReplyObject is passed a NULL value: ");
     freeReplyObject(reply);
     test_cond(reply == NULL);
 }
 
+static void *hi_malloc_fail(size_t size) {
+    (void)size;
+    return NULL;
+}
+
+static void *hi_calloc_fail(size_t nmemb, size_t size) {
+    (void)nmemb;
+    (void)size;
+    return NULL;
+}
+
+static void *hi_realloc_fail(void *ptr, size_t size) {
+    (void)ptr;
+    (void)size;
+    return NULL;
+}
+
+static void test_allocator_injection(void) {
+    hiredisAllocFuncs ha = {
+        .mallocFn = hi_malloc_fail,
+        .callocFn = hi_calloc_fail,
+        .reallocFn = hi_realloc_fail,
+        .strdupFn = strdup,
+        .freeFn = free,
+    };
+
+    // Override hiredis allocators
+    hiredisSetAllocators(&ha);
+
+    test("redisContext uses injected allocators: ");
+    redisContext *c = redisConnect("localhost", 6379);
+    test_cond(c == NULL);
+
+    test("redisReader uses injected allocators: ");
+    redisReader *reader = redisReaderCreate();
+    test_cond(reader == NULL);
+
+    // Return allocators to default
+    hiredisResetAllocators();
+}
+
+#define HIREDIS_BAD_DOMAIN "idontexist-noreally.com"
 static void test_blocking_connection_errors(void) {
     redisContext *c;
+    struct addrinfo hints = {.ai_family = AF_INET};
+    struct addrinfo *ai_tmp = NULL;
 
-    test("Returns error when host cannot be resolved: ");
-    c = redisConnect((char*)"idontexist.test", 6379);
-    test_cond(c->err == REDIS_ERR_OTHER &&
-        (strcmp(c->errstr,"Name or service not known") == 0 ||
-         strcmp(c->errstr,"Can't resolve: idontexist.test") == 0 ||
-         strcmp(c->errstr,"nodename nor servname provided, or not known") == 0 ||
-         strcmp(c->errstr,"No address associated with hostname") == 0 ||
-         strcmp(c->errstr,"Temporary failure in name resolution") == 0 ||
-         strcmp(c->errstr,"hostname nor servname provided, or not known") == 0 ||
-         strcmp(c->errstr,"no address associated with name") == 0));
-    redisFree(c);
+    int rv = getaddrinfo(HIREDIS_BAD_DOMAIN, "6379", &hints, &ai_tmp);
+    if (rv != 0) {
+        // Address does *not* exist
+        test("Returns error when host cannot be resolved: ");
+        // First see if this domain name *actually* resolves to NXDOMAIN
+        c = redisConnect(HIREDIS_BAD_DOMAIN, 6379);
+        test_cond(
+            c->err == REDIS_ERR_OTHER &&
+            (strcmp(c->errstr, "Name or service not known") == 0 ||
+             strcmp(c->errstr, "Can't resolve: " HIREDIS_BAD_DOMAIN) == 0 ||
+             strcmp(c->errstr, "Name does not resolve") == 0 ||
+             strcmp(c->errstr, "nodename nor servname provided, or not known") == 0 ||
+             strcmp(c->errstr, "No address associated with hostname") == 0 ||
+             strcmp(c->errstr, "Temporary failure in name resolution") == 0 ||
+             strcmp(c->errstr, "hostname nor servname provided, or not known") == 0 ||
+             strcmp(c->errstr, "no address associated with name") == 0 ||
+             strcmp(c->errstr, "No such host is known. ") == 0));
+        redisFree(c);
+    } else {
+        printf("Skipping NXDOMAIN test. Found evil ISP!\n");
+        freeaddrinfo(ai_tmp);
+    }
 
+#ifndef _WIN32
     test("Returns error when the port is not open: ");
     c = redisConnect((char*)"localhost", 1);
     test_cond(c->err == REDIS_ERR_IO &&
         strcmp(c->errstr,"Connection refused") == 0);
     redisFree(c);
 
-    test("Returns error when the unix socket path doesn't accept connections: ");
+    test("Returns error when the unix_sock socket path doesn't accept connections: ");
     c = redisConnectUnix((char*)"/tmp/idontexist.sock");
     test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
     redisFree(c);
+#endif
+}
+
+/* Dummy push handler */
+void push_handler(void *privdata, void *reply) {
+    int *counter = privdata;
+    freeReplyObject(reply);
+    *counter += 1;
+}
+
+/* Dummy function just to test setting a callback with redisOptions */
+void push_handler_async(redisAsyncContext *ac, void *reply) {
+    (void)ac;
+    (void)reply;
+}
+
+static void test_resp3_push_handler(redisContext *c) {
+    redisPushFn *old = NULL;
+    redisReply *reply;
+    void *privdata;
+    int n = 0;
+
+    /* Switch to RESP3 and turn on client tracking */
+    send_hello(c, 3);
+    send_client_tracking(c, "ON");
+    privdata = c->privdata;
+    c->privdata = &n;
+
+    reply = redisCommand(c, "GET key:0");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+
+    test("RESP3 PUSH messages are handled out of band by default: ");
+    reply = redisCommand(c, "SET key:0 val:0");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS);
+    freeReplyObject(reply);
+
+    assert((reply = redisCommand(c, "GET key:0")) != NULL);
+    freeReplyObject(reply);
+
+    old = redisSetPushCallback(c, push_handler);
+    test("We can set a custom RESP3 PUSH handler: ");
+    reply = redisCommand(c, "SET key:0 val:0");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && n == 1);
+    freeReplyObject(reply);
+
+    /* Unset the push callback and generate an invalidate message making
+     * sure it is not handled out of band. */
+    test("With no handler, PUSH replies come in-band: ");
+    redisSetPushCallback(c, NULL);
+    assert((reply = redisCommand(c, "GET key:0")) != NULL);
+    freeReplyObject(reply);
+    assert((reply = redisCommand(c, "SET key:0 invalid")) != NULL);
+    test_cond(reply->type == REDIS_REPLY_PUSH);
+    freeReplyObject(reply);
+
+    test("With no PUSH handler, no replies are lost: ");
+    assert(redisGetReply(c, (void**)&reply) == REDIS_OK);
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS);
+    freeReplyObject(reply);
+
+    /* Return to the originally set PUSH handler */
+    assert(old != NULL);
+    redisSetPushCallback(c, old);
+
+    /* Switch back to RESP2 and disable tracking */
+    c->privdata = privdata;
+    send_client_tracking(c, "OFF");
+    send_hello(c, 2);
+}
+
+redisOptions get_redis_tcp_options(struct config config) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, config.tcp.host, config.tcp.port);
+    return options;
+}
+
+static void test_resp3_push_options(struct config config) {
+    redisAsyncContext *ac;
+    redisContext *c;
+    redisOptions options;
+
+    test("We set a default RESP3 handler for redisContext: ");
+    options = get_redis_tcp_options(config);
+    assert((c = redisConnectWithOptions(&options)) != NULL);
+    test_cond(c->push_cb != NULL);
+    redisFree(c);
+
+    test("We don't set a default RESP3 push handler for redisAsyncContext: ");
+    options = get_redis_tcp_options(config);
+    assert((ac = redisAsyncConnectWithOptions(&options)) != NULL);
+    test_cond(ac->c.push_cb == NULL);
+    redisAsyncFree(ac);
+
+    test("Our REDIS_OPT_NO_PUSH_AUTOFREE flag works: ");
+    options = get_redis_tcp_options(config);
+    options.options |= REDIS_OPT_NO_PUSH_AUTOFREE;
+    assert((c = redisConnectWithOptions(&options)) != NULL);
+    test_cond(c->push_cb == NULL);
+    redisFree(c);
+
+    test("We can use redisOptions to set a custom PUSH handler for redisContext: ");
+    options = get_redis_tcp_options(config);
+    options.push_cb = push_handler;
+    assert((c = redisConnectWithOptions(&options)) != NULL);
+    test_cond(c->push_cb == push_handler);
+    redisFree(c);
+
+    test("We can use redisOptions to set a custom PUSH handler for redisAsyncContext: ");
+    options = get_redis_tcp_options(config);
+    options.async_push_cb = push_handler_async;
+    assert((ac = redisAsyncConnectWithOptions(&options)) != NULL);
+    test_cond(ac->push_cb == push_handler_async);
+    redisAsyncFree(ac);
+}
+
+void free_privdata(void *privdata) {
+    struct privdata *data = privdata;
+    data->dtor_counter++;
+}
+
+static void test_privdata_hooks(struct config config) {
+    struct privdata data = {0};
+    redisOptions options;
+    redisContext *c;
+
+    test("We can use redisOptions to set privdata: ");
+    options = get_redis_tcp_options(config);
+    REDIS_OPTIONS_SET_PRIVDATA(&options, &data, free_privdata);
+    assert((c = redisConnectWithOptions(&options)) != NULL);
+    test_cond(c->privdata == &data);
+
+    test("Our privdata destructor fires when we free the context: ");
+    redisFree(c);
+    test_cond(data.dtor_counter == 1);
 }
 
 static void test_blocking_connection(struct config config) {
     redisContext *c;
     redisReply *reply;
+    int major;
 
-    c = connect(config);
+    c = do_connect(config);
 
     test("Is able to deliver commands: ");
     reply = redisCommand(c,"PING");
@@ -442,17 +887,45 @@ static void test_blocking_connection(struct config config) {
               strcasecmp(reply->element[1]->str,"pong") == 0);
     freeReplyObject(reply);
 
+    /* Make sure passing NULL to redisGetReply is safe */
+    test("Can pass NULL to redisGetReply: ");
+    assert(redisAppendCommand(c, "PING") == REDIS_OK);
+    test_cond(redisGetReply(c, NULL) == REDIS_OK);
+
+    get_redis_version(c, &major, NULL);
+    if (major >= 6) test_resp3_push_handler(c);
+    test_resp3_push_options(config);
+
+    test_privdata_hooks(config);
+
     disconnect(c, 0);
 }
 
+/* Send DEBUG SLEEP 0 to detect if we have this command */
+static int detect_debug_sleep(redisContext *c) {
+    int detected;
+    redisReply *reply = redisCommand(c, "DEBUG SLEEP 0\r\n");
+
+    if (reply == NULL || c->err) {
+        const char *cause = c->err ? c->errstr : "(none)";
+        fprintf(stderr, "Error testing for DEBUG SLEEP (Redis error: %s), exiting\n", cause);
+        exit(-1);
+    }
+
+    detected = reply->type == REDIS_REPLY_STATUS;
+    freeReplyObject(reply);
+
+    return detected;
+}
+
 static void test_blocking_connection_timeouts(struct config config) {
     redisContext *c;
     redisReply *reply;
     ssize_t s;
-    const char *cmd = "DEBUG SLEEP 3\r\n";
+    const char *sleep_cmd = "DEBUG SLEEP 3\r\n";
     struct timeval tv;
 
-    c = connect(config);
+    c = do_connect(config);
     test("Successfully completes a command when the timeout is not exceeded: ");
     reply = redisCommand(c,"SET foo fast");
     freeReplyObject(reply);
@@ -464,26 +937,37 @@ static void test_blocking_connection_timeouts(struct config config) {
     freeReplyObject(reply);
     disconnect(c, 0);
 
-    c = connect(config);
+    c = do_connect(config);
     test("Does not return a reply when the command times out: ");
-    s = write(c->fd, cmd, strlen(cmd));
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000;
-    redisSetTimeout(c, tv);
-    reply = redisCommand(c, "GET foo");
-    test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Resource temporarily unavailable") == 0);
-    freeReplyObject(reply);
+    if (detect_debug_sleep(c)) {
+        redisAppendFormattedCommand(c, sleep_cmd, strlen(sleep_cmd));
+        s = c->funcs->write(c);
+        tv.tv_sec = 0;
+        tv.tv_usec = 10000;
+        redisSetTimeout(c, tv);
+        reply = redisCommand(c, "GET foo");
+#ifndef _WIN32
+        test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_IO &&
+                  strcmp(c->errstr, "Resource temporarily unavailable") == 0);
+#else
+        test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_TIMEOUT &&
+                  strcmp(c->errstr, "recv timeout") == 0);
+#endif
+        freeReplyObject(reply);
+    } else {
+        test_skipped();
+    }
 
     test("Reconnect properly reconnects after a timeout: ");
-    redisReconnect(c);
+    do_reconnect(c, config);
     reply = redisCommand(c, "PING");
     test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
     freeReplyObject(reply);
 
     test("Reconnect properly uses owned parameters: ");
     config.tcp.host = "foo";
-    config.unix.path = "foo";
-    redisReconnect(c);
+    config.unix_sock.path = "foo";
+    do_reconnect(c, config);
     reply = redisCommand(c, "PING");
     test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
     freeReplyObject(reply);
@@ -498,19 +982,8 @@ static void test_blocking_io_errors(struct config config) {
     int major, minor;
 
     /* Connect to target given by config. */
-    c = connect(config);
-    {
-        /* Find out Redis version to determine the path for the next test */
-        const char *field = "redis_version:";
-        char *p, *eptr;
-
-        reply = redisCommand(c,"INFO");
-        p = strstr(reply->str,field);
-        major = strtol(p+strlen(field),&eptr,10);
-        p = eptr+1; /* char next to the first "." */
-        minor = strtol(p,&eptr,10);
-        freeReplyObject(reply);
-    }
+    c = do_connect(config);
+    get_redis_version(c, &major, &minor);
 
     test("Returns I/O error when the connection is lost: ");
     reply = redisCommand(c,"QUIT");
@@ -524,6 +997,7 @@ static void test_blocking_io_errors(struct config config) {
         test_cond(reply == NULL);
     }
 
+#ifndef _WIN32
     /* On 2.0, QUIT will cause the connection to be closed immediately and
      * the read(2) for the reply on QUIT will set the error to EOF.
      * On >2.0, QUIT will return with OK and another read(2) needed to be
@@ -531,14 +1005,19 @@ static void test_blocking_io_errors(struct config config) {
      * conditions, the error will be set to EOF. */
     assert(c->err == REDIS_ERR_EOF &&
         strcmp(c->errstr,"Server closed the connection") == 0);
+#endif
     redisFree(c);
 
-    c = connect(config);
+    c = do_connect(config);
     test("Returns I/O error on socket timeout: ");
     struct timeval tv = { 0, 1000 };
     assert(redisSetTimeout(c,tv) == REDIS_OK);
-    test_cond(redisGetReply(c,&_reply) == REDIS_ERR &&
-        c->err == REDIS_ERR_IO && errno == EAGAIN);
+    int respcode = redisGetReply(c,&_reply);
+#ifndef _WIN32
+    test_cond(respcode == REDIS_ERR && c->err == REDIS_ERR_IO && errno == EAGAIN);
+#else
+    test_cond(respcode == REDIS_ERR && c->err == REDIS_ERR_TIMEOUT);
+#endif
     redisFree(c);
 }
 
@@ -552,7 +1031,7 @@ static void test_invalid_timeout_errors(struct config config) {
 
     c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
 
-    test_cond(c->err == REDIS_ERR_IO);
+    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
     redisFree(c);
 
     test("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
@@ -562,12 +1041,24 @@ static void test_invalid_timeout_errors(struct config config) {
 
     c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
 
-    test_cond(c->err == REDIS_ERR_IO);
+    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
     redisFree(c);
 }
 
+/* Wrap malloc to abort on failure so OOM checks don't make the test logic
+ * harder to follow. */
+void *hi_malloc_safe(size_t size) {
+    void *ptr = hi_malloc(size);
+    if (ptr == NULL) {
+        fprintf(stderr, "Error:  Out of memory\n");
+        exit(-1);
+    }
+
+    return ptr;
+}
+
 static void test_throughput(struct config config) {
-    redisContext *c = connect(config);
+    redisContext *c = do_connect(config);
     redisReply **replies;
     int i, num;
     long long t1, t2;
@@ -577,7 +1068,7 @@ static void test_throughput(struct config config) {
         freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
 
     num = 1000;
-    replies = malloc(sizeof(redisReply*)*num);
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
     t1 = usec();
     for (i = 0; i < num; i++) {
         replies[i] = redisCommand(c,"PING");
@@ -585,10 +1076,10 @@ static void test_throughput(struct config config) {
     }
     t2 = usec();
     for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
+    hi_free(replies);
     printf("\t(%dx PING: %.3fs)\n", num, (t2-t1)/1000000.0);
 
-    replies = malloc(sizeof(redisReply*)*num);
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
     t1 = usec();
     for (i = 0; i < num; i++) {
         replies[i] = redisCommand(c,"LRANGE mylist 0 499");
@@ -597,11 +1088,22 @@ static void test_throughput(struct config config) {
     }
     t2 = usec();
     for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
+    hi_free(replies);
     printf("\t(%dx LRANGE with 500 elements: %.3fs)\n", num, (t2-t1)/1000000.0);
 
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        replies[i] = redisCommand(c, "INCRBY incrkey %d", 1000000);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    hi_free(replies);
+    printf("\t(%dx INCRBY: %.3fs)\n", num, (t2-t1)/1000000.0);
+
     num = 10000;
-    replies = malloc(sizeof(redisReply*)*num);
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
     for (i = 0; i < num; i++)
         redisAppendCommand(c,"PING");
     t1 = usec();
@@ -611,10 +1113,10 @@ static void test_throughput(struct config config) {
     }
     t2 = usec();
     for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
+    hi_free(replies);
     printf("\t(%dx PING (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
 
-    replies = malloc(sizeof(redisReply*)*num);
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
     for (i = 0; i < num; i++)
         redisAppendCommand(c,"LRANGE mylist 0 499");
     t1 = usec();
@@ -625,9 +1127,22 @@ static void test_throughput(struct config config) {
     }
     t2 = usec();
     for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
+    hi_free(replies);
     printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
 
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
+    for (i = 0; i < num; i++)
+        redisAppendCommand(c,"INCRBY incrkey %d", 1000000);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    hi_free(replies);
+    printf("\t(%dx INCRBY (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
+
     disconnect(c, 0);
 }
 
@@ -736,15 +1251,14 @@ int main(int argc, char **argv) {
             .host = "127.0.0.1",
             .port = 6379
         },
-        .unix = {
+        .unix_sock = {
             .path = "/tmp/redis.sock"
         }
     };
     int throughput = 1;
     int test_inherit_fd = 1;
-
-    /* Ignore broken pipe signal (for I/O error tests). */
-    signal(SIGPIPE, SIG_IGN);
+    int skips_as_fails = 0;
+    int test_unix_socket;
 
     /* Parse command line options. */
     argv++; argc--;
@@ -757,11 +1271,30 @@ int main(int argc, char **argv) {
             cfg.tcp.port = atoi(argv[0]);
         } else if (argc >= 2 && !strcmp(argv[0],"-s")) {
             argv++; argc--;
-            cfg.unix.path = argv[0];
+            cfg.unix_sock.path = argv[0];
         } else if (argc >= 1 && !strcmp(argv[0],"--skip-throughput")) {
             throughput = 0;
         } else if (argc >= 1 && !strcmp(argv[0],"--skip-inherit-fd")) {
             test_inherit_fd = 0;
+        } else if (argc >= 1 && !strcmp(argv[0],"--skips-as-fails")) {
+            skips_as_fails = 1;
+#ifdef HIREDIS_TEST_SSL
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-port")) {
+            argv++; argc--;
+            cfg.ssl.port = atoi(argv[0]);
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-host")) {
+            argv++; argc--;
+            cfg.ssl.host = argv[0];
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-ca-cert")) {
+            argv++; argc--;
+            cfg.ssl.ca_cert  = argv[0];
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-cert")) {
+            argv++; argc--;
+            cfg.ssl.cert = argv[0];
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-key")) {
+            argv++; argc--;
+            cfg.ssl.key = argv[0];
+#endif
         } else {
             fprintf(stderr, "Invalid argument: %s\n", argv[0]);
             exit(1);
@@ -769,6 +1302,19 @@ int main(int argc, char **argv) {
         argv++; argc--;
     }
 
+#ifndef _WIN32
+    /* Ignore broken pipe signal (for I/O error tests). */
+    signal(SIGPIPE, SIG_IGN);
+
+    test_unix_socket = access(cfg.unix_sock.path, F_OK) == 0;
+
+#else
+    /* Unix sockets don't exist in Windows */
+    test_unix_socket = 0;
+#endif
+
+    test_allocator_injection();
+
     test_format_commands();
     test_reply_reader();
     test_blocking_connection_errors();
@@ -783,25 +1329,59 @@ int main(int argc, char **argv) {
     test_append_formatted_commands(cfg);
     if (throughput) test_throughput(cfg);
 
-    printf("\nTesting against Unix socket connection (%s):\n", cfg.unix.path);
-    cfg.type = CONN_UNIX;
-    test_blocking_connection(cfg);
-    test_blocking_connection_timeouts(cfg);
-    test_blocking_io_errors(cfg);
-    if (throughput) test_throughput(cfg);
-
-    if (test_inherit_fd) {
-        printf("\nTesting against inherited fd (%s):\n", cfg.unix.path);
-        cfg.type = CONN_FD;
+    printf("\nTesting against Unix socket connection (%s): ", cfg.unix_sock.path);
+    if (test_unix_socket) {
+        printf("\n");
+        cfg.type = CONN_UNIX;
         test_blocking_connection(cfg);
+        test_blocking_connection_timeouts(cfg);
+        test_blocking_io_errors(cfg);
+        if (throughput) test_throughput(cfg);
+    } else {
+        test_skipped();
     }
 
+#ifdef HIREDIS_TEST_SSL
+    if (cfg.ssl.port && cfg.ssl.host) {
 
-    if (fails) {
+        redisInitOpenSSL();
+        _ssl_ctx = redisCreateSSLContext(cfg.ssl.ca_cert, NULL, cfg.ssl.cert, cfg.ssl.key, NULL, NULL);
+        assert(_ssl_ctx != NULL);
+
+        printf("\nTesting against SSL connection (%s:%d):\n", cfg.ssl.host, cfg.ssl.port);
+        cfg.type = CONN_SSL;
+
+        test_blocking_connection(cfg);
+        test_blocking_connection_timeouts(cfg);
+        test_blocking_io_errors(cfg);
+        test_invalid_timeout_errors(cfg);
+        test_append_formatted_commands(cfg);
+        if (throughput) test_throughput(cfg);
+
+        redisFreeSSLContext(_ssl_ctx);
+        _ssl_ctx = NULL;
+    }
+#endif
+
+    if (test_inherit_fd) {
+        printf("\nTesting against inherited fd (%s): ", cfg.unix_sock.path);
+        if (test_unix_socket) {
+            printf("\n");
+            cfg.type = CONN_FD;
+            test_blocking_connection(cfg);
+        } else {
+            test_skipped();
+        }
+    }
+
+    if (fails || (skips_as_fails && skips)) {
         printf("*** %d TESTS FAILED ***\n", fails);
+        if (skips) {
+            printf("*** %d TESTS SKIPPED ***\n", skips);
+        }
         return 1;
     }
 
-    printf("ALL TESTS PASSED\n");
+    printf("ALL TESTS PASSED (%d skipped)\n", skips);
     return 0;
 }
diff --git a/debian/modules/nchan/src/store/redis/hiredis/win32.h b/debian/modules/nchan/src/store/redis/hiredis/win32.h
index 1a27c18..04289c6 100644
--- a/debian/modules/nchan/src/store/redis/hiredis/win32.h
+++ b/debian/modules/nchan/src/store/redis/hiredis/win32.h
@@ -2,10 +2,20 @@
 #define _WIN32_HELPER_INCLUDE
 #ifdef _MSC_VER
 
+#include <winsock2.h> /* for struct timeval */
+
 #ifndef inline
 #define inline __inline
 #endif
 
+#ifndef strcasecmp
+#define strcasecmp stricmp
+#endif
+
+#ifndef strncasecmp
+#define strncasecmp strnicmp
+#endif
+
 #ifndef va_copy
 #define va_copy(d,s) ((d) = (s))
 #endif
@@ -37,6 +47,10 @@ __inline int c99_snprintf(char* str, size_t size, const char* format, ...)
     return count;
 }
 #endif
+#endif /* _MSC_VER */
 
-#endif
-#endif
\ No newline at end of file
+#ifdef _WIN32
+#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
+#endif /* _WIN32 */
+
+#endif /* _WIN32_HELPER_INCLUDE */
diff --git a/debian/modules/nchan/src/store/redis/rdsstore.c b/debian/modules/nchan/src/store/redis/rdsstore.c
index 8fbf17f..4080927 100755
--- a/debian/modules/nchan/src/store/redis/rdsstore.c
+++ b/debian/modules/nchan/src/store/redis/rdsstore.c
@@ -60,10 +60,10 @@ static size_t                     redis_publish_message_msgkey_size;
 #define redis_sync_command(node, fmt, args...)                       \
   do {                                                               \
     if((node)->ctx.sync == NULL) {                                   \
-      redis_nginx_open_sync_context(((node)->connect_params.peername.len > 0 ? &(node)->connect_params.peername : &(node)->connect_params.hostname), (node)->connect_params.port, (node)->connect_params.db, &(node)->connect_params.password, &(node)->ctx.sync); \
+      (node)->ctx.sync = node_connect_sync_context(node);            \
     }                                                                \
-    if((node)->ctx.sync) {                                          \
-      redisCommand((node)->ctx.sync, fmt, ##args);                  \
+    if((node)->ctx.sync) {                                           \
+      redisCommand((node)->ctx.sync, fmt, ##args);                   \
     } else {                                                         \
       ERR("Can't run redis command: no connection to redis server.");\
     }                                                                \
@@ -101,6 +101,7 @@ static size_t                     redis_publish_message_msgkey_size;
 #define CHECK_REPLY_STR(reply) ((reply)->type == REDIS_REPLY_STRING)
 #define CHECK_REPLY_STRVAL(reply, v) ( CHECK_REPLY_STR(reply) && ngx_strcmp((reply)->str, v) == 0 )
 #define CHECK_REPLY_STRNVAL(reply, v, n) ( CHECK_REPLY_STR(reply) && ngx_strncmp((reply)->str, v, n) == 0 )
+#define CHECK_REPLY_STATUSVAL(reply, v) ( (reply)->type == REDIS_REPLY_STATUS && ngx_strcmp((reply)->str, v) == 0 )
 #define CHECK_REPLY_INT(reply) ((reply)->type == REDIS_REPLY_INTEGER)
 #define CHECK_REPLY_INTVAL(reply, v) ( CHECK_REPLY_INT(reply) && (reply)->integer == v )
 #define CHECK_REPLY_ARRAY_MIN_SIZE(reply, size) ( (reply)->type == REDIS_REPLY_ARRAY && (reply)->elements >= (unsigned )size )
@@ -175,26 +176,34 @@ ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
   
   
   //ignore redis://
+  rcp->use_tls = 0;
   if(ngx_strnstr(cur, "redis://", 8) != NULL) {
     cur += 8;
   }
+  else if(ngx_strnstr(cur, "rediss://", 9) != NULL) {
+    cur += 9;
+    rcp->use_tls = 1;
+  }
   
-  if(cur[0] == ':') {
-    cur++;
-    if((ret = ngx_strlchr(cur, last, '@')) == NULL) {
-      rcp->password.data = NULL;
-      rcp->password.len = 0;
+  //username:password@
+  if((ret = ngx_strlchr(cur, last, '@')) != NULL) {
+    u_char *split = ngx_strlchr(cur, ret, ':');
+    if(!split) {
       return NGX_ERROR;
     }
-    else {
-      rcp->password.data = cur;
-      rcp->password.len = ret - cur;
-      cur = ret + 1;
-    }
+    rcp->username.len = (split - cur);
+    rcp->username.data = rcp->username.len == 0 ? NULL : cur;
+    
+    rcp->password.len = (ret - split - 1);
+    rcp->password.data = rcp->password.len == 0 ? NULL : &split[1];
+    
+    cur = ret + 1;
   }
   else {
-    rcp->password.data = NULL;
+    rcp->username.len = 0;
+    rcp->username.data = NULL;
     rcp->password.len = 0;
+    rcp->password.data = NULL;
   }
   
   ///port:host
@@ -233,7 +242,7 @@ ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
   else {
     rcp->db = 0;
   }
-  
+
   return NGX_OK;
 }
 
@@ -731,7 +740,7 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
   
   if(CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3)
    && CHECK_REPLY_STR(reply->element[0])
-   && CHECK_REPLY_STR(reply->element[1])) {
+   && (CHECK_REPLY_STR(reply->element[1]) || CHECK_REPLY_INT(reply->element[1]))) {
     pubsub_channel.data = (u_char *)reply->element[1]->str;
     pubsub_channel.len = reply->element[1]->len;
     chid = get_channel_id_from_pubsub_channel(&pubsub_channel, namespace, &chid_str);
@@ -859,7 +868,6 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
                 //TODO
               }
               ERR("unsub one not yet implemented");
-              assert(0);
             }
             else if(ngx_strmatch(&alerttype, "unsub all") && array_sz > 1) {
               if(cmp_to_str(&cmp, &extracted_channel_id)) {
@@ -872,28 +880,36 @@ static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privd
                 //TODO
               }
               ERR("unsub all except not yet  implemented");
-              assert(0);
             }
+            else if(ngx_strmatch(&alerttype, "subscriber info")) {
+              uint64_t request_id;
+              cmp_read_uinteger(&cmp, &request_id);
+              
+              if((chanhead = nchan_store_get_chanhead(chid, nodeset)) == NULL) {
+                ERR("received invalid subscriber info notice with bad channel name");
+              }
+              else {
+                chanhead->spooler.fn->broadcast_notice(&chanhead->spooler, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, (void *)(intptr_t )request_id);
+              }
+            }
+            
             else {
               ERR("unexpected msgpack alert from redis");
-              assert(0);
             }
           }
           else {
             ERR("unexpected msgpack message from redis");
-            assert(0);
           }
         }
         else {
           ERR("unexpected msgpack object from redis");
-          assert(0);
         }
       }
       else {
         ERR("invalid msgpack message from redis: %s", cmp_strerror(&cmp));
-        assert(0);
       }
     }
+
     else { //not a string
       redisEchoCallback(c, el, NULL);
     }
@@ -1964,12 +1980,11 @@ static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
     
     if((nodeset = nodeset_find(&lcf->redis)) == NULL) {
       nodeset = nodeset_create(lcf);
-      rdstore_initialize_chanhead_reaper(&nodeset->chanhead_reaper, "Redis channel reaper");
     }
     if(!nodeset) {
-      ERR("Unable to create Redis nodeset.");
-      continue;
+      return NGX_ERROR;
     }
+    rdstore_initialize_chanhead_reaper(&nodeset->chanhead_reaper, "Redis channel reaper");
   }
   
   return NGX_OK;
@@ -2115,6 +2130,7 @@ typedef struct {
   time_t                msg_time;
   nchan_msg_t          *msg;
   unsigned              shared_msg:1;
+  unsigned              cluster_move_error:1;
   time_t                message_timeout;
   ngx_int_t             max_messages;
   nchan_msg_compression_type_t compression;
@@ -2126,6 +2142,7 @@ typedef struct {
 
 static void redisPublishCallback(redisAsyncContext *, void *, void *);
 static void redisPublishNostoreCallback(redisAsyncContext *, void *, void *);
+static void redisPublishNostoreQueuedCheckCallback(redisAsyncContext *, void *, void *);
 static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd);
 
 static ngx_int_t redis_publish_message_nodeset_maybe_retry(redis_nodeset_t *ns, redis_publish_callback_data_t *d) {
@@ -2198,7 +2215,6 @@ static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd)
     char     zero='\0';
     int      fastpublish = nodeset->settings.nostore_fastpublish;
     void   (*publish_callback)(redisAsyncContext *, void *, void *) = NULL;
-    void    *publish_pd = NULL;
     
     
     ttl = htonl(d->message_timeout);
@@ -2209,13 +2225,13 @@ static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd)
     compression = d->compression;
     
     if(!fastpublish) {
-      redis_command(node, NULL, NULL, "MULTI");
+      redis_command(node, NULL, d, "MULTI");
+      publish_callback = redisPublishNostoreQueuedCheckCallback;
     }
     else {
       publish_callback = redisPublishNostoreCallback;
-      publish_pd = d;
     }
-    redis_command(node, publish_callback, publish_pd,
+    redis_command(node, publish_callback, d,
       "PUBLISH %b{channel:%b}:pubsub "
       "\x9A\xA3msg\xCE%b\xCE%b%b%b%b\xDB%b%b\xD9%b%b\xD9%b%b%b",
       
@@ -2236,7 +2252,7 @@ static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd)
       (char *)&compression, (size_t )1
     );
     if(!fastpublish) {
-      redis_command(node, NULL, NULL, "HMGET %b{channel:%b} last_seen_fake_subscriber fake_subscribers", 
+      redis_command(node, publish_callback, d, "HMGET %b{channel:%b} last_seen_fake_subscriber fake_subscribers", 
         STR(nodeset->settings.namespace),
         STR(d->channel_id)
       );
@@ -2284,6 +2300,7 @@ static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t
   d->max_messages = nchan_loc_conf_max_messages(cf);
   d->compression = cf->message_compression;
   d->retry = 0;
+  d->cluster_move_error = 0;
   
   assert(msg->id.tagcount == 1);
   
@@ -2325,22 +2342,26 @@ static void redisPublishNostoreCallback(redisAsyncContext *c, void *r, void *pri
   }
   
   ngx_memzero(&ch, sizeof(ch)); //for debugging basically. should be removed in the future and zeroed as-needed
-  
-  if(reply) {
+  if(d->cluster_move_error) {
+    nodeset_node_keyslot_changed(node);
+    d->callback(NGX_HTTP_SERVICE_UNAVAILABLE, NULL, d->privdata);
+  }
+  else if(reply) {
     if(reply->type == REDIS_REPLY_ARRAY && reply->elements == 2 && reply->element[1]->type == REDIS_REPLY_ARRAY && reply->element[1]->elements == 2) {
       els = reply->element[1]->element;
       ch.last_seen = redisReply_to_int(els[0], 0, 0);
       ch.subscribers = redisReply_to_int(els[1], 0, 0);
+      d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
     }
     else if(reply->type == REDIS_REPLY_INTEGER) {
       ch.last_seen = 0;
       ch.subscribers = redisReply_to_int(reply, 0, 0);
+      d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
     }
     else {
-      DBG("nonsense nostore-publish reply");
+      redisEchoCallback(c, r, privdata);
+      d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
     }
-    
-    d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
   }
   else {
     redisEchoCallback(c, r, privdata);
@@ -2350,6 +2371,24 @@ static void redisPublishNostoreCallback(redisAsyncContext *c, void *r, void *pri
   ngx_free(d);
 }
 
+static void redisPublishNostoreQueuedCheckCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
+  redisReply                    *reply=r;
+  
+  redis_node_t                 *node = c->data;
+  node->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  if(reply && !CHECK_REPLY_STATUSVAL(reply, "QUEUED")) {
+    if(!nodeset_node_reply_keyslot_ok(node, reply)) {
+      d->cluster_move_error = 1;
+    }
+    else {
+      redisEchoCallback(c, r, privdata);
+    }
+  }
+}
+
 static void redisPublishCallback(redisAsyncContext *c, void *r, void *privdata) {
   redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
   redisReply                    *reply=r;
@@ -2495,6 +2534,90 @@ int nchan_store_redis_ready(nchan_loc_conf_t *cf) {
   return nodeset && nodeset_ready(nodeset);
 }
 
+
+typedef struct {
+  callback_pt  cb;
+  void        *pd;
+} redis_subscriber_info_id_data_t;
+
+static void get_subscriber_info_id_callback(redisAsyncContext *c, void *r, void *privdata);
+
+static ngx_int_t nchan_store_get_subscriber_info_id(nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  redis_nodeset_t  *nodeset = nodeset_find(&cf->redis);
+  
+  if(!nodeset_ready(nodeset)) {
+    return NGX_ERROR;
+  }
+  
+  ngx_str_t request_id_key = ngx_string(NCHAN_REDIS_UNIQUE_REQUEST_ID_KEY);
+  redis_node_t  *node = nodeset_node_find_by_key(nodeset, &request_id_key);
+  if(!node) {
+    return NGX_ERROR;
+  }
+  
+  redis_subscriber_info_id_data_t *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+  if(d == NULL) {
+    return NGX_ERROR;
+  }
+  
+  d->cb = cb;
+  d->pd = pd;
+  
+  redis_script(get_subscriber_info_id, node, &get_subscriber_info_id_callback, d, "1 %b", STR(&request_id_key));
+  
+  return NGX_DONE;
+}
+
+static void get_subscriber_info_id_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_subscriber_info_id_data_t *d = privdata;
+  redisReply                    *reply = r;
+  
+  redis_node_t                 *node = c->data;
+  node->pending_commands--;
+  nchan_update_stub_status(redis_pending_commands, -1);
+  
+  callback_pt  cb = d->cb;
+  void        *cb_pd = d->pd;
+  
+  ngx_free(d);
+  
+  if (!redisReplyOk(c, reply)) {
+    cb(NGX_ERROR, NULL, cb_pd);
+    return;
+  }
+  
+  int64_t new_id = redisReply_to_int(reply, 0, 0);
+  cb(NGX_OK, (void *)(uintptr_t )new_id, cb_pd);
+}
+
+static ngx_int_t nchan_store_request_subscriber_info(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  if(nchan_channel_id_is_multi(channel_id)) {
+    ERR("redis nchan_store_request_subscriber_info can't handle multi-channel ids");
+    return NGX_ERROR;
+  }
+  
+  redis_nodeset_t               *nodeset = nodeset_find(&cf->redis);
+  if(!nodeset) {
+    ERR("redis nodeset not found for nchan_store_request_subscriber_info");
+    return NGX_ERROR;
+  }
+  
+  if(!nodeset_ready(nodeset)) {
+    ERR("redis nodeset not ready for nchan_store_request_subscriber_info");
+    return NGX_ERROR;
+  }
+  
+  redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, channel_id);
+  if(!node) {
+    ERR("couldn't find Redis node for nchan_store_request_subscriber_info");
+    return NGX_ERROR;
+  }
+  
+  nchan_redis_script( request_subscriber_info, node, &redisCheckErrorCallback, NULL, channel_id, "%i", (int )request_id);
+  
+  return NGX_DONE;
+}
+
 nchan_store_t nchan_store_redis = {
   //init
   &nchan_store_init_module,
@@ -2515,7 +2638,11 @@ nchan_store_t nchan_store_redis = {
   &nchan_store_find_channel, //+callback
   
   NULL, //get_group
-  NULL,
-  NULL
+  NULL, //set group
+  NULL, //delete group
+  
+  &nchan_store_get_subscriber_info_id, //+callback
+  &nchan_store_request_subscriber_info //+callback
+  
 };
 
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua
new file mode 100644
index 0000000..54cac88
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua
@@ -0,0 +1,18 @@
+--input:  keys: [unique_request_id_key], values: []
+--output: next_unique_request_id_integer
+local key = KEYS[1]
+
+redis.call("ECHO", "###### GET SUBSCRIBER INFO ID ##########")
+
+local resp = redis.pcall("INCR", key)
+local val
+if type(resp) ~= "number" then
+  redis.call("SET", key, "0")
+  val = redis.call("INCR", key)
+else
+  val = resp
+end
+
+redis.call("ECHO", "val: " .. val)
+
+return val
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/request_subscriber_info.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/request_subscriber_info.lua
new file mode 100644
index 0000000..afe4090
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/redis-lua-scripts/request_subscriber_info.lua
@@ -0,0 +1,15 @@
+--input: keys: [],  values: [ namespace, channel_id, info_response_id ]
+--output: -nothing-
+
+local ns = ARGV[1]
+local channel_id = ARGV[2]
+local response_id = tonumber(ARGV[3])
+local pubsub = ('%s{channel:%s}:pubsub'):format(ns, channel_id)
+
+redis.call('echo', ' ####### REQUEST_SUBSCRIBER_INFO #######')
+
+local alert_msgpack =cmsgpack.pack({"alert", "subscriber info", response_id})
+
+redis.call('PUBLISH', pubsub, alert_msgpack)
+
+return true
diff --git a/debian/modules/nchan/src/store/redis/redis_lua_commands.c b/debian/modules/nchan/src/store/redis/redis_lua_commands.c
index ed12b06..b4e8fdb 100644
--- a/debian/modules/nchan/src/store/redis/redis_lua_commands.c
+++ b/debian/modules/nchan/src/store/redis/redis_lua_commands.c
@@ -383,6 +383,26 @@ redis_lua_scripts_t redis_lua_scripts = {
    "\n"
    "return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or \"\", content_type or \"\", es_event or \"\", tonumber(compression or 0)}\n"},
 
+  {"get_subscriber_info_id", "3490d5bc3fdc7ed065d9d54b4a0cb8ad6b62c180",
+   "--input:  keys: [unique_request_id_key], values: []\n"
+   "--output: next_unique_request_id_integer\n"
+   "local key = KEYS[1]\n"
+   "\n"
+   "redis.call(\"ECHO\", \"###### GET SUBSCRIBER INFO ID ##########\")\n"
+   "\n"
+   "local resp = redis.pcall(\"INCR\", key)\n"
+   "local val\n"
+   "if type(resp) ~= \"number\" then\n"
+   "  redis.call(\"SET\", key, \"0\")\n"
+   "  val = redis.call(\"INCR\", key)\n"
+   "else\n"
+   "  val = resp\n"
+   "end\n"
+   "\n"
+   "redis.call(\"ECHO\", \"val: \" .. val)\n"
+   "\n"
+   "return val\n"},
+
   {"publish", "be28281114137d8e85a25a913c50bed2e93d0c7d",
    "--input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, optimize_target]\n"
    "--output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?\n"
@@ -700,6 +720,23 @@ redis_lua_scripts_t redis_lua_scripts = {
    "--what?... redis.call('PUBLISH', channel_pubsub, pubmsg)\n"
    "return redis.call('HGET', chan_key, 'subscribers') or 0\n"},
 
+  {"request_subscriber_info", "93c500e094dfc5364251854eeac8d4331a0223c0",
+   "--input: keys: [],  values: [ namespace, channel_id, info_response_id ]\n"
+   "--output: -nothing-\n"
+   "\n"
+   "local ns = ARGV[1]\n"
+   "local channel_id = ARGV[2]\n"
+   "local response_id = tonumber(ARGV[3])\n"
+   "local pubsub = ('%s{channel:%s}:pubsub'):format(ns, channel_id)\n"
+   "\n"
+   "redis.call('echo', ' ####### REQUEST_SUBSCRIBER_INFO #######')\n"
+   "\n"
+   "local alert_msgpack =cmsgpack.pack({\"alert\", \"subscriber info\", response_id})\n"
+   "\n"
+   "redis.call('PUBLISH', pubsub, alert_msgpack)\n"
+   "\n"
+   "return true\n"},
+
   {"rsck", "2fca046fa783d6cc25e493c993c407e59998e6e8",
    "--redis-store consistency check\n"
    "local ns = ARGV[1]\n"
@@ -1033,4 +1070,4 @@ redis_lua_scripts_t redis_lua_scripts = {
    "\n"
    "return {sub_id, sub_count}\n"}
 };
-const int redis_lua_scripts_count=11;
+const int redis_lua_scripts_count=13;
diff --git a/debian/modules/nchan/src/store/redis/redis_lua_commands.h b/debian/modules/nchan/src/store/redis/redis_lua_commands.h
index 76fb7b9..58eeb17 100644
--- a/debian/modules/nchan/src/store/redis/redis_lua_commands.h
+++ b/debian/modules/nchan/src/store/redis/redis_lua_commands.h
@@ -1,3 +1,5 @@
+#ifndef NCHAN_REDIS_LUA_SCRIPTS_H
+#define NCHAN_REDIS_LUA_SCRIPTS_H
 // don't edit this please, it was auto-generated by hsss
 // https://github.com/slact/hsss
 
@@ -38,6 +40,10 @@ typedef struct {
   //output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count
   redis_lua_script_t get_message_from_key;
 
+  //input:  keys: [unique_request_id_key], values: []
+  //output: next_unique_request_id_integer
+  redis_lua_script_t get_subscriber_info_id;
+
   //input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, optimize_target]
   //output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?
   redis_lua_script_t publish;
@@ -46,6 +52,10 @@ typedef struct {
   //output: current_subscribers
   redis_lua_script_t publish_status;
 
+  //input: keys: [],  values: [ namespace, channel_id, info_response_id ]
+  //output: -nothing-
+  redis_lua_script_t request_subscriber_info;
+
   //redis-store consistency check
   redis_lua_script_t rsck;
 
@@ -63,7 +73,8 @@ typedef struct {
   redis_lua_script_t subscriber_unregister;
 
 } redis_lua_scripts_t;
-redis_lua_scripts_t redis_lua_scripts;
-const int redis_lua_scripts_count;
+extern redis_lua_scripts_t redis_lua_scripts;
+extern const int redis_lua_scripts_count;
 #define REDIS_LUA_SCRIPTS_EACH(script) \
 for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++) 
+#endif //NCHAN_REDIS_LUA_SCRIPTS_H
diff --git a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
index 4f64faa..fb5d0a3 100644
--- a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
+++ b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
@@ -1,6 +1,6 @@
 //Copyright (c) 2014 Wandenberg Peixoto under the MIT Licence'
 //additional code from Alexander Lyalin's redis_nginx_module (New BSD licence)
-//edited by slact 2015-2016
+//edited by slact 2015-2021
 
 #include <ngx_event.h>
 #include <ngx_connection.h>
@@ -21,102 +21,13 @@
 //NGX_CLEAR_EVENT for kqueue, epoll
 //NGX_LEVEL_EVENT for select, poll, /dev/poll
 
-int redis_nginx_event_attach(redisAsyncContext *ac);
 void redis_nginx_cleanup(void *privdata);
-void redis_nginx_ping_callback(redisAsyncContext *ac, void *rep, void *privdata);
-
 
 void redis_nginx_init(void) {
   signal(SIGPIPE, SIG_IGN);
 }
 
 
-redisAsyncContext *redis_nginx_open_context(ngx_str_t *host, int port, void *privdata) {
-  redisAsyncContext *ac = NULL;
-  u_char             hostchr[1024] = {0};
-  if(host->len >= 1023) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: hostname is too long");
-    return NULL;
-  }
-  ngx_memcpy(hostchr, host->data, host->len);
-  ac = redisAsyncConnect((const char *)hostchr, port);
-  if (ac == NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not allocate the redis context for %V:%d", host, port);
-    return NULL;
-  }
-  
-  if (ac->err) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not create the redis context for %V:%d - %s", host, port, ac->errstr);
-    redisAsyncFree(ac);
-    return NULL;
-  }
-  
-  if(redis_nginx_event_attach(ac) == REDIS_OK) {
-    ac->data = privdata;
-  }
-  else {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not attach nginx events %V:%d", host, port);
-    redisAsyncFree(ac);
-    return NULL;
-  }
-
-  return ac;
-}
-
-
-redisContext *redis_nginx_open_sync_context(ngx_str_t *host, int port, int database, ngx_str_t *password, redisContext **context) {
-  redisContext  *c = NULL;
-  redisReply    *reply;
-  
-  u_char        hostchr[1024] = {0};
-  if(host->len >= 1023) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: hostname is too long");
-    return NULL;
-  }
-  ngx_memcpy(hostchr, host->data, host->len);
-  
-  if ((context == NULL) || (*context == NULL) || (*context)->err) {
-    c = redisConnect((const char *)hostchr, port);
-    if (c == NULL) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not allocate the redis sync context for %s:%d", host, port);
-      return NULL;
-    }
-    
-    if (c->err) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not create the redis sync context for %s:%d - %s", host, port, c->errstr);
-      goto fail;
-    }
-    
-    if (context != NULL) {
-      *context = c;
-    }
-    if(password->len > 0) {
-      reply = redisCommand(c, "AUTH %b", password->data, password->len);
-      if ((reply == NULL) || (reply->type == REDIS_REPLY_ERROR)) {
-        goto fail;
-      }
-    }
-    if(database != -1) {
-      reply = redisCommand(c, "SELECT %d", database);
-      if ((reply == NULL) || (reply->type == REDIS_REPLY_ERROR)) {
-        goto fail;
-      }
-    }
-  }
-  else {
-    c = *context;
-  }
-
-  return c;
-fail:
-  if (context != NULL) {
-    *context = NULL;
-  }
-  redisFree(c);
-  return NULL;
-}
-
-
 void redis_nginx_force_close_context(redisAsyncContext **context) {
   if ((context != NULL) && (*context != NULL)) {
     redisAsyncContext *ac = *context;
@@ -127,15 +38,6 @@ void redis_nginx_force_close_context(redisAsyncContext **context) {
   }
 }
 
-void redis_nginx_ping_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  void *data = ac->data;
-  void (*callback) (void *) = privdata;
-  redisAsyncDisconnect(ac);
-  if (callback != NULL) {
-    callback(data);
-  }
-}
-
 void redis_nginx_read_event(ngx_event_t *ev) {
   redisAsyncContext *ac = ((ngx_connection_t *)ev->data)->data;
   int                fd = ac->c.fd; //because redisAsyncHandleRead might free the redisAsyncContext
diff --git a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
index ea11329..a3a956b 100644
--- a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
+++ b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
@@ -1,4 +1,5 @@
 //Copyright (c) 2014 Wandenberg Peixoto under the MIT Licence
+//Coptright (c) 2015-2021 slact
 #ifndef __REDIS_NGINX_ADAPTER_H
 #define __REDIS_NGINX_ADAPTER_H
 
@@ -10,11 +11,12 @@
 #include <store/redis/hiredis/async.h>
 #endif
 
+#include <nchan_module.h>
+#include <store/redis/redis_nodeset.h>
+
 void redis_nginx_init(void);
-redisAsyncContext *redis_nginx_open_context(ngx_str_t *host, int port, void *privdata);
-redisContext *redis_nginx_open_sync_context(ngx_str_t *host, int port, int database, ngx_str_t *password, redisContext **context);
+int redis_nginx_event_attach(redisAsyncContext *ac);
 void redis_nginx_force_close_context(redisAsyncContext **context);
 void redis_nginx_close_context(redisAsyncContext **context);
-void redis_nginx_ping_callback(redisAsyncContext *ac, void *rep, void *privdata);
 
 #endif // __REDIS_NGINX_ADAPTER_H
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset.c b/debian/modules/nchan/src/store/redis/redis_nodeset.c
index 4994eae..df2d086 100644
--- a/debian/modules/nchan/src/store/redis/redis_nodeset.c
+++ b/debian/modules/nchan/src/store/redis/redis_nodeset.c
@@ -17,6 +17,7 @@
 static redis_nodeset_t  redis_nodeset[NCHAN_MAX_NODESETS];
 static int              redis_nodeset_count = 0;
 static char            *redis_worker_id = NULL;
+static char            *nchan_redis_blankname = "";
 static redisCallbackFn *redis_subscribe_callback = NULL;
 
 typedef struct {
@@ -31,6 +32,8 @@ static ngx_str_t       default_redis_url = ngx_string(NCHAN_REDIS_DEFAULT_URL);
 
 static void node_connector_callback(redisAsyncContext *ac, void *rep, void *privdata);
 static int nodeset_cluster_keyslot_space_complete(redis_nodeset_t *ns);
+static nchan_redis_ip_range_t *node_ip_blacklisted(redis_nodeset_t *ns, redis_connect_params_t *rcp);
+static char *nodeset_name_cstr(redis_nodeset_t *nodeset, char *buf, size_t maxlen);
 
 static void *rbtree_cluster_keyslots_node_id(void *data) {
   return &((redis_nodeset_slot_range_node_t *)data)->range;
@@ -50,6 +53,19 @@ static ngx_int_t rbtree_cluster_keyslots_compare(void *v1, void *v2) {
     return 0;
 }
 
+static int reply_str_ok(redisReply *reply) {
+  return (reply != NULL && reply->type != REDIS_REPLY_ERROR && reply->type == REDIS_REPLY_STRING);
+}
+static int reply_status_ok(redisReply *reply) {
+  return (
+    reply != NULL 
+    && reply->type != REDIS_REPLY_ERROR
+    && reply->type == REDIS_REPLY_STATUS
+    && reply->str
+    && strcmp(reply->str, "OK") == 0
+  );
+}
+
 static int nodeset_cluster_node_index_keyslot_ranges(redis_node_t *node) {
   unsigned                         i;
   ngx_rbtree_node_t               *rbtree_node;
@@ -185,6 +201,78 @@ ngx_int_t nodeset_initialize(char *worker_id, redisCallbackFn *subscribe_handler
   return NGX_OK;
 }
 
+
+#if (NGX_OPENSSL)
+static ngx_int_t nodeset_create_ssl_ctx(redis_nodeset_t *ns, char **err) {
+  char        *ca_cert =  ns->settings.tls.trusted_certificate.len > 0 ? 
+                            (char *)ns->settings.tls.trusted_certificate.data
+                            : NULL;
+  char        *ca_path = ns->settings.tls.trusted_certificate_path.len > 0 ?
+                            (char *)ns->settings.tls.trusted_certificate_path.data
+                            : NULL;
+  char        *client_cert_filename = ns->settings.tls.client_certificate.len > 0 ?
+                            (char *)ns->settings.tls.client_certificate.data
+                            : NULL;
+  char        *client_cert_key_filename = ns->settings.tls.client_certificate_key.len > 0 ?
+                            (char *)ns->settings.tls.client_certificate_key.data
+                            : NULL;
+  char        *ciphers = ns->settings.tls.ciphers.len > 0 ?
+                            (char *)ns->settings.tls.ciphers.data
+                            : NULL;
+  int          verify_cert = ns->settings.tls.verify_certificate;
+  
+  SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+  if(!ssl_ctx) {
+    *err = "failed to create SSL_CTX";
+    return 0;
+  }
+  SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+  SSL_CTX_set_verify(ssl_ctx, verify_cert ? SSL_VERIFY_NONE : SSL_VERIFY_PEER, NULL);
+  
+  if(ca_cert || ca_path) {
+    if (!SSL_CTX_load_verify_locations(ssl_ctx, ca_cert, ca_path)) {
+      *err = "Invalid CA Certificate File/Directory";
+      SSL_CTX_free(ssl_ctx);
+      return 0;
+    }
+  }
+  else {
+    if (!SSL_CTX_set_default_verify_paths(ssl_ctx)) {
+      *err = "Failed to use default CA paths";
+      SSL_CTX_free(ssl_ctx);
+      return 0;
+    }
+  }
+  
+  if (client_cert_filename && !SSL_CTX_use_certificate_chain_file(ssl_ctx, client_cert_filename)) {
+    *err = "Invalid client certificate";
+    SSL_CTX_free(ssl_ctx);
+    return 0;
+  }
+  
+  if (client_cert_key_filename && !SSL_CTX_use_PrivateKey_file(ssl_ctx, client_cert_key_filename, SSL_FILETYPE_PEM)) {
+    *err = "Invalid private key";
+    SSL_CTX_free(ssl_ctx);
+    return 0;
+  }
+#ifdef TLS1_3_VERSION
+  if (ciphers && !SSL_CTX_set_cipher_list(ssl_ctx, ciphers)) {
+    *err = "Error while configuring ciphers";
+    SSL_CTX_free(ssl_ctx);
+    return 0;
+  }
+#endif
+
+  ns->ssl_context = ssl_ctx;
+  return 1;
+}
+#else
+static ngx_int_t nodeset_create_ssl_ctx(redis_nodeset_t *ns, char **err) {
+  *err = "Can't create Redis SSL context: Nginx was built without SSL support";
+  return 0;
+}
+#endif
+
 redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf) {
   nchan_redis_conf_t  *rcf = &lcf->redis;
   redis_nodeset_t     *ns = &redis_nodeset[redis_nodeset_count]; //incremented once everything is ok
@@ -217,6 +305,7 @@ redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf) {
   ns->settings.nostore_fastpublish = rcf->nostore_fastpublish;
   
   ns->settings.ping_interval = rcf->ping_interval;
+  ns->settings.cluster_check_interval = rcf->cluster_check_interval;
   
   ns->status = REDIS_NODESET_DISCONNECTED;
   ngx_memzero(&ns->status_check_ev, sizeof(ns->status_check_ev));
@@ -244,6 +333,21 @@ redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf) {
     
     ns->settings.optimize_target = scf->redis.optimize_target == NCHAN_REDIS_OPTIMIZE_UNSET ? NCHAN_REDIS_OPTIMIZE_CPU : scf->redis.optimize_target;
     
+    ns->settings.blacklist.count = scf->redis.blacklist_count;
+    ns->settings.blacklist.list = scf->redis.blacklist;
+    
+    ns->settings.username = scf->redis.username;
+    ns->settings.password = scf->redis.password;
+    
+    ns->settings.tls = scf->redis.tls;
+    //clean up unset values
+    if(ns->settings.tls.enabled == NGX_CONF_UNSET) {
+      ns->settings.tls.enabled = 0;
+    }
+    if(ns->settings.tls.verify_certificate == NGX_CONF_UNSET) {
+      ns->settings.tls.verify_certificate = 1;
+    }
+    
     for(i=0; i < servers->nelts; i++) {
 #if nginx_version >= 1007002
       upstream_url = &usrv[i].name;
@@ -259,12 +363,46 @@ redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf) {
     ns->settings.connect_timeout = NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC;
     ns->settings.node_weight.master = 1;
     ns->settings.node_weight.slave = 1;
+    ns->settings.blacklist.count = 0;
+    ns->settings.blacklist.list = NULL;
     ngx_str_t **urlref = nchan_list_append(&ns->urls);
     *urlref = rcf->url.len > 0 ? &rcf->url : &default_redis_url;
   }
   DBG("nodeset created");
+  
+  char buf[1024];
+  nodeset_name_cstr(ns, buf, 1024);
+  if(strlen(buf)>0) {
+    ns->name = ngx_alloc(strlen(buf)+1, ngx_cycle->log);
+    strcpy(ns->name, buf);
+  }
+  else {
+    ns->name = nchan_redis_blankname;
+  }
+  
+  if(ns->settings.tls.enabled) {
+    //if all the URLs are rediss://, then turn on SSL for the nodeset
+    redis_connect_params_t    rcp;
+    int                       use_tls = 1;
+    ngx_str_t               **url;
+    
+    for(url = nchan_list_first(&ns->urls); url != NULL; url = nchan_list_next(url)) {
+      parse_redis_url(*url, &rcp);
+      use_tls &= rcp.use_tls;
+    }
+    if(use_tls) {
+      ns->settings.tls.enabled = 1;
+    }
+    
+    char *err = NULL;
+    if(!nodeset_create_ssl_ctx(ns, &err)) {
+      nodeset_log_error(ns, "Error creating Redis SSL context: %s", err ? err : "unknown error");
+      return NULL;
+    }
+  }
   redis_nodeset_count++;
   rcf->nodeset = ns;
+
   return ns;
 }
 
@@ -528,6 +666,89 @@ static void node_ping_event(ngx_event_t *ev) {
   }
 }
 
+static void rearm_cluster_check_event(ngx_event_t *ev, redis_node_t *node) {
+  time_t              max_interval = node->nodeset->settings.cluster_check_interval;
+  time_t              interval_since_last_check = ngx_time() - node->cluster.last_successful_check;
+  
+  if(interval_since_last_check <= 0 || interval_since_last_check >= max_interval) {
+    ngx_add_timer(ev, max_interval * 1000);
+  }
+  else {
+    ngx_add_timer(ev, (max_interval - interval_since_last_check) * 1000);
+  }
+}
+
+static void node_cluster_check_event_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                 *reply = rep;
+  redis_node_t               *node = privdata;
+  
+  ngx_str_t                   epoch_str;
+  int                         epoch;
+  
+  if(reply == NULL) {
+    node_log_error(node, "CLUSTER INFO command reply is NULL. Node should have already disconnected");
+    return;
+  }
+  
+  if(!reply_str_ok(reply)) {
+    node_log_error(node, "CLUSTER INFO command failed");
+    if(node->state >= REDIS_NODE_READY) {
+      node_disconnect(node, REDIS_NODE_FAILED);
+      nodeset_examine(node->nodeset);
+    }
+    return;
+  } 
+  if(!nchan_get_rest_of_line_in_cstr(reply->str, "cluster_current_epoch:", &epoch_str)) {
+    node_log_error(node, "CLUSTER INFO command reply is weird");
+    //why would this happen? dunno, fail node just in case
+    if(node->state >= REDIS_NODE_READY) {
+      node_disconnect(node, REDIS_NODE_FAILED);
+      nodeset_examine(node->nodeset);
+    }
+    return;
+  }
+  if((epoch = ngx_atoi(epoch_str.data, epoch_str.len)) == NGX_ERROR) {
+    node_log_error(node, "CLUSTER INFO command failed to parse current epoch number");
+    //why would this happen? dunno, fail node just in case
+    if(node->state >= REDIS_NODE_READY) {
+      node_disconnect(node, REDIS_NODE_FAILED);
+      nodeset_examine(node->nodeset);
+    }
+    return;
+  }
+  
+  if(node->cluster.current_epoch < epoch) {
+    node_disconnect(node, REDIS_NODE_FAILED);
+    char errstr[512];
+    ngx_snprintf((u_char *)errstr, 512, "config epoch has changed on node %V:%d. Disconnecting to reconfigure.%Z", &(node)->connect_params.hostname, node->connect_params.port);
+    nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, errstr);
+  }
+  else {
+    rearm_cluster_check_event(&node->cluster.check_timer, node);
+  }
+}
+
+static void node_cluster_check_event(ngx_event_t *ev) {
+  if(!ev->timedout || ngx_exiting || ngx_quit)
+    return;
+  
+  redis_node_t       *node = ev->data;
+  redis_nodeset_t    *ns = node->nodeset;
+  time_t              max_interval = ns->settings.cluster_check_interval;
+  time_t              interval_since_last_check = ngx_time() - node->cluster.last_successful_check;
+  ev->timedout = 0;
+  
+  if(node->state != REDIS_NODE_READY || !node->cluster.ok) {
+    rearm_cluster_check_event(ev, node);
+    return;
+  }
+  if(interval_since_last_check < max_interval) {
+    rearm_cluster_check_event(ev, node);
+    return;
+  }
+  redisAsyncCommand(node->ctx.cmd, node_cluster_check_event_callback, node, "CLUSTER INFO");
+}
+
 redis_node_t *nodeset_node_create_with_space(redis_nodeset_t *ns, redis_connect_params_t *rcp, size_t extra_space, void **extraspace_ptr) {
   assert(!nodeset_node_find_by_connect_params(ns, rcp));
   node_blob_t      *node_blob;
@@ -560,12 +781,23 @@ redis_node_t *nodeset_node_create_with_space(redis_nodeset_t *ns, redis_connect_
   node->cluster.slot_range.indexed = 0;
   node->cluster.slot_range.n = 0;
   node->cluster.slot_range.range = NULL;
+  node->cluster.last_successful_check = 0;
+  node->cluster.current_epoch = 0;
+  ngx_memzero(&node->cluster.check_timer, sizeof(node->cluster.check_timer));
+  nchan_init_timer(&node->cluster.check_timer, node_cluster_check_event, node);
   node->pending_commands = 0;
   node->run_id.len = 0;
   node->run_id.data = node_blob->run_id;
   node->nodeset = ns;
   node->generation = 0;
   
+  if(rcp->password.len == 0 && ns->settings.password.len > 0) {
+    node->connect_params.password = ns->settings.password;
+  }
+  if(rcp->username.len == 0 && ns->settings.username.len > 0) {
+    node->connect_params.username = ns->settings.username;
+  }
+  
   nchan_slist_init(&node->channels.cmd, rdstore_channel_head_t, redis.slist.node_cmd.prev, redis.slist.node_cmd.next);
   nchan_slist_init(&node->channels.pubsub, rdstore_channel_head_t, redis.slist.node_pubsub.prev, redis.slist.node_pubsub.next);
   
@@ -598,6 +830,7 @@ redis_node_t *nodeset_node_create_with_connect_params(redis_nodeset_t *ns, redis
   nchan_strcpy(&node->connect_params.hostname, &rcp->hostname, 0);
   node->connect_params.password.data = &space[rcp->hostname.len];
   nchan_strcpy(&node->connect_params.password, &rcp->password, 0);
+  
   return node;
 }
 
@@ -652,6 +885,8 @@ static void node_discover_slave(redis_node_t *master, redis_connect_params_t *rc
     //assert(slave->peers.master == master);
   }
   else {
+    
+    
     slave = nodeset_node_create_with_connect_params(master->nodeset, rcp);
     slave->discovered = 1;
     node_set_role(slave, REDIS_NODE_ROLE_SLAVE);
@@ -694,8 +929,11 @@ static void node_discover_master(redis_node_t  *slave, redis_connect_params_t *r
 static int node_skip_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l) {
   redis_connect_params_t   rcp;
   char                    *description = "";
+  char                    *detail = "";
+  char                     detail_buf[64];
   char                    *role = NULL;
   ngx_uint_t               loglevel = NGX_LOG_NOTICE;
+  nchan_redis_ip_range_t  *matched;
   rcp.hostname = l->hostname;
   rcp.port = l->port;
   rcp.peername.len = 0;
@@ -726,11 +964,16 @@ static int node_skip_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l) {
     description = "self";
     loglevel = NGX_LOG_INFO;
   }
+  else if((matched = node_ip_blacklisted(node->nodeset, &rcp)) != NULL) {
+    description = "blacklisted";
+    detail = detail_buf;
+    ngx_snprintf((u_char *)detail_buf, 64, " (matched blacklist entry %V)%Z", &matched->str);
+  }
   else {
     return 0;
   }
   if(!role) role = l->master ? "master" : "slave";
-  node_log(node, loglevel, "Skipping %s cluster %s %s", description, role, rcp_cstr(&rcp));
+  nodeset_log(node->nodeset, loglevel, "Skipping %s %s node %s%s", description, role, rcp_cstr(&rcp), detail);
   return 1;
 }
 
@@ -746,6 +989,7 @@ static int node_discover_cluster_peer(redis_node_t *node, cluster_nodes_line_t *
   rcp.peername.len = 0;
   rcp.db = node->connect_params.db;
   rcp.password = node->connect_params.password;
+  rcp.username = node->connect_params.username;
   
   if( ((peer = nodeset_node_find_by_connect_params(node->nodeset, &rcp)) != NULL)
    || ((peer = nodeset_node_find_by_cluster_id(node->nodeset, &l->id)) != NULL)
@@ -753,7 +997,7 @@ static int node_discover_cluster_peer(redis_node_t *node, cluster_nodes_line_t *
     //node_log_notice(node, "Discovering cluster node %s... already known", rcp_cstr(&rcp));
     return 0; //we already know this one.
   }
-  node_log_notice(node, "Discovering cluster %s %s", (l->master ? "master" : "slave"), rcp_cstr(&rcp));
+  nodeset_log_notice(node->nodeset, "Discovering cluster %s %s", (l->master ? "master" : "slave"), rcp_cstr(&rcp));
   peer = nodeset_node_create_with_connect_params(node->nodeset, &rcp);
   peer->discovered = 1;
   nchan_strcpy(&peer->cluster.id, &l->id, MAX_CLUSTER_ID_LENGTH);
@@ -777,13 +1021,21 @@ static void node_connector_fail(redis_node_t *node, const char *err) {
     ctxerr = node->ctx.sync->errstr;
   }
   if(node->state == REDIS_NODE_CONNECTION_TIMED_OUT) {
-    node_log_error(node, "connection failed: %s", err);
+    node_log_error(node, "connection failed: %s", err == NULL ? "timeout" : err);
   }
   else if(ctxerr) {
-    node_log_error(node, "connection failed: %s (%s)", err, ctxerr);
+    if(err) {
+      node_log_error(node, "connection failed: %s (%s)", err, ctxerr);
+    }
+    else {
+      node_log_error(node, "connection failed: %s", ctxerr);
+    }
+  }
+  else if(err) {
+    node_log_error(node, "connection failed: %s", err);
   }
   else {
-    node_log_error(node, "connection failed: %s", err);
+    node_log_error(node, "connection failed");
   }
   node_disconnect(node, REDIS_NODE_FAILED);
 }
@@ -837,6 +1089,9 @@ int node_disconnect(redis_node_t *node, int disconnected_state) {
   if(node->ping_timer.timer_set) {
     ngx_del_timer(&node->ping_timer);
   }
+  if(node->cluster.check_timer.timer_set) {
+    ngx_del_timer(&node->cluster.check_timer);
+  }
   
   rdstore_channel_head_t *cur;
   nchan_slist_t *cmd = &node->channels.cmd;
@@ -948,19 +1203,6 @@ static int node_parseinfo_set_preallocd_str(redis_node_t *node, ngx_str_t *targe
   return 0;
 }
 
-static int node_connector_reply_str_ok(redisReply *reply) {
-  return (reply != NULL && reply->type != REDIS_REPLY_ERROR && reply->type == REDIS_REPLY_STRING);
-}
-static int node_connector_reply_status_ok(redisReply *reply) {
-  return (
-    reply != NULL 
-    && reply->type != REDIS_REPLY_ERROR
-    && reply->type == REDIS_REPLY_STATUS
-    && reply->str
-    && strcmp(reply->str, "OK") == 0
-  );
-}
-
 static int node_parseinfo_set_run_id(redis_node_t *node, const char *info) {
   return node_parseinfo_set_preallocd_str(node, &node->run_id, info, "run_id:", MAX_RUN_ID_LENGTH);
 }
@@ -1026,13 +1268,193 @@ static void redis_nginx_connect_event_handler(const redisAsyncContext *ac, int s
   node_connector_callback((redisAsyncContext *)ac, NULL, ac->data);
 }
 
-static redisAsyncContext *node_connect_context(redis_node_t *node, ngx_str_t *host, ngx_int_t port) {
-  redisAsyncContext *ctx = redis_nginx_open_context(host, port, node);
-  if(ctx) {
-    redisAsyncSetConnectCallback(ctx, redis_nginx_connect_event_handler);
-    redisAsyncSetDisconnectCallback(ctx, redis_nginx_unexpected_disconnect_event_handler);
+static redisAsyncContext *node_connect_context(redis_node_t *node) {
+  redisAsyncContext       *ac = NULL;
+  redis_connect_params_t  *rcp = &node->connect_params;
+  u_char                   hostchr[1024] = {0};
+    if(rcp->hostname.len >= 1023) {
+    node_log_error(node, "redis hostname is too long");
+    return NULL;
   }
-  return ctx;
+  ngx_memcpy(hostchr, rcp->hostname.data, rcp->hostname.len);
+  ac = redisAsyncConnect((const char *)hostchr, rcp->port);
+  if (ac == NULL) {
+    node_log_error(node, "count not allocate Redis context");
+    return NULL;
+  }
+  if(ac->err) {
+    node_log_error(node, "could not create Redis context: %s", ac->errstr);
+    redisAsyncFree(ac);
+    return NULL;
+  }
+  
+#if (NGX_OPENSSL)
+  if(node->nodeset->settings.tls.enabled) {
+    SSL *ssl = SSL_new(node->nodeset->ssl_context);
+    if (!ssl) {
+      redisAsyncFree(ac);
+      node_log_error(node, "Failed to create SSL object");
+      return NULL;
+    }
+    
+    if (node->nodeset->settings.tls.server_name.len > 0 && !SSL_set_tlsext_host_name(ssl, (char *)node->nodeset->settings.tls.server_name.data)) {
+        node_log_error(node, "Failed to configure SSL server name");
+        SSL_free(ssl);
+        redisAsyncFree(ac);
+        return NULL;
+    }
+    
+    if(redisInitiateSSL(&ac->c, ssl) != REDIS_OK) {
+      node_log_error(node, "could not initialize Redis SSL context: %s", (ac->errstr ? ac->errstr : "unknown error"));
+      redisAsyncFree(ac);
+      return NULL;
+    }
+  }
+#endif
+  
+  if(redis_nginx_event_attach(ac) != REDIS_OK) {
+    node_log_error(node, "could not attach Nginx events");
+    redisAsyncFree(ac);
+    return NULL;
+  }
+    
+  ac->data = node;
+  
+  redisAsyncSetConnectCallback(ac, redis_nginx_connect_event_handler);
+  redisAsyncSetDisconnectCallback(ac, redis_nginx_unexpected_disconnect_event_handler);
+  return ac;
+}
+
+redisContext *node_connect_sync_context(redis_node_t *node) {
+  redisReply              *reply;
+  redisContext            *c;
+  redis_connect_params_t  *rcp = &node->connect_params;
+  u_char                   hostchr[1024] = {0};
+    if(rcp->hostname.len >= 1023) {
+    node_log_error(node, "redis hostname is too long");
+    return NULL;
+  }
+  ngx_memcpy(hostchr, rcp->hostname.data, rcp->hostname.len);
+  
+  c = redisConnect((const char *)hostchr, rcp->port);
+  if(c == NULL) {
+    node_log_error(node, "could not connect synchronously to Redis");
+    return NULL;
+  }
+  else if(c->err) {
+    node_log_error(node, "could not connect synchronously to Redis: %s", c->errstr);
+    redisFree(c);
+    return NULL;
+  }
+  
+#if (NGX_OPENSSL)
+  if(node->nodeset->settings.tls.enabled) {
+    
+    SSL *ssl = SSL_new(node->nodeset->ssl_context);
+    if (!ssl) {
+      redisFree(c);
+      node_log_error(node, "could not connect synchronously to Redis: Failed to create SSL object");
+      return NULL;
+    }
+    
+    if (node->nodeset->settings.tls.server_name.len > 0 && !SSL_set_tlsext_host_name(ssl, (char *)node->nodeset->settings.tls.server_name.data)) {
+      node_log_error(node, "could not connect synchronously to Redis: Failed to configure SSL server name");
+      SSL_free(ssl);
+      redisFree(c);
+      return NULL;
+    }
+    
+    if(redisInitiateSSL(c, ssl) != REDIS_OK) {
+      node_log_error(node, "could not initialize Redis SSL context: %s", c->errstr);
+      SSL_free(ssl);
+      redisFree(c);
+      return NULL;
+    }
+  }
+#endif
+
+  if(rcp->password.len > 0) {
+    if(rcp->username.len > 0) {
+      reply = redisCommand(c, "AUTH %b %b", rcp->username.data, rcp->username.len, rcp->password.data, rcp->password.len);
+    }
+    else {
+      reply = redisCommand(c, "AUTH %b", rcp->password.data, rcp->password.len);
+    }
+    if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+      node_log_error(node, "could not connect synchronously to Redis: bad password");
+      redisFree(c);
+      return NULL;
+    }
+  }
+  if(rcp->db != -1) {
+    reply = redisCommand(c, "SELECT %d", rcp->db);
+    if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+      node_log_error(node, "could not connect synchronously to Redis: bad database number");
+      redisFree(c);
+      return NULL;
+    }
+  }
+  
+  return c;
+}
+
+static nchan_redis_ip_range_t *node_ip_blacklisted(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
+  struct addrinfo *res;
+  char hostname_buf[128];
+  ngx_memzero(hostname_buf, sizeof(hostname_buf));
+  ngx_memcpy(hostname_buf, rcp->hostname.data, rcp->hostname.len);
+  
+  if(getaddrinfo(hostname_buf, NULL, NULL, &res) != 0) {
+    nodeset_log_error(ns, "Failed to getaddrinfo for hostname %V while deciding if IP is blacklisted");
+    return NULL;
+  }
+  int fam = res->ai_family;
+  union {
+    struct in_addr  ipv4;
+#ifdef AF_INET6
+    struct in6_addr ipv6;
+#endif
+  } addr;
+  
+  if(res->ai_family == AF_INET) {
+    addr.ipv4 = ((struct sockaddr_in *)res->ai_addr)->sin_addr;
+  }
+#ifdef AF_INET6
+  else if(res->ai_family == AF_INET6) {
+    addr.ipv6 = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
+  }
+#endif
+  freeaddrinfo(res);
+  int i;
+  for(i=0; i < ns->settings.blacklist.count; i++) {
+    nchan_redis_ip_range_t *entry = &ns->settings.blacklist.list[i];
+    if(entry->family != fam) {
+      continue;
+    }
+    if(fam == AF_INET) {
+      if(entry->addr_block.ipv4.s_addr == (addr.ipv4.s_addr & entry->mask.ipv4.s_addr)) {
+        return entry;
+      }
+    }
+#ifdef AF_INET6
+    else if(fam == AF_INET6) {
+      unsigned           j;
+      struct in6_addr    buf = addr.ipv6;
+      uint8_t           *masked_addr = entry->addr_block.ipv6.s6_addr;
+      uint8_t           *mask = entry->mask.ipv6.s6_addr;
+      
+      for(j=0; j<sizeof(entry->addr_block.ipv6.s6_addr); j++) {
+        masked_addr[j] &= mask[j];
+      }
+      
+      if(memcmp(entry->addr_block.ipv6.s6_addr, &buf, sizeof(buf)) == 0) {
+        return entry;
+      }
+    }
+#endif
+  }
+  
+  return NULL;
 }
 
 static int node_discover_slaves_from_info_reply(redis_node_t *node, redisReply *reply) {
@@ -1042,7 +1464,13 @@ static int node_discover_slaves_from_info_reply(redis_node_t *node, redisReply *
     return 0;
   }
   for(i=0; i<n; i++) {
-    node_discover_slave(node, &rcp[i]);
+    nchan_redis_ip_range_t *matched = node_ip_blacklisted(node->nodeset, &rcp[i]);
+    if(matched) {
+      nodeset_log_notice(node->nodeset, "Skipping slave node %V blacklisted by %V", &rcp->hostname, &matched->str);
+    }
+    else {
+      node_discover_slave(node, &rcp[i]);
+    }
   }
   return 1;
 }
@@ -1051,6 +1479,7 @@ int nodeset_node_keyslot_changed(redis_node_t *node) {
   if(node->state >= REDIS_NODE_READY) {
     node_disconnect(node, REDIS_NODE_FAILED);
   }
+  
   char errstr[512];
   ngx_snprintf((u_char *)errstr, 512, "cluster keyspace needs to be updated as reported by node %V:%d%Z", &(node)->connect_params.hostname, node->connect_params.port);
   nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, errstr);
@@ -1070,14 +1499,16 @@ int nodeset_node_reply_keyslot_ok(redis_node_t *node, redisReply *reply) {
       if(!node->cluster.enabled) {
         node_log_error(node, "got a cluster error on a non-cluster redis connection: %s", reply->str);
         node_disconnect(node, REDIS_NODE_FAILED);
+        nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, "Strange response from node");
       }
       else {
         nodeset_node_keyslot_changed(node);
       }
       return 0;
     }
-    else
-      return 1;
+  }
+  if(node->cluster.enabled) {
+    node->cluster.last_successful_check = ngx_time();
   }
   return 1;
 }
@@ -1124,6 +1555,7 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
   redis_connect_params_t     *cp = &node->connect_params;
   redis_lua_script_t         *next_script = (redis_lua_script_t *)&redis_lua_scripts;
   node_log_debug(node, "node_connector_callback state %d", node->state);
+  ngx_str_t                   rest;
   
   switch(node->state) {
     case REDIS_NODE_CONNECTION_TIMED_OUT:
@@ -1132,7 +1564,7 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
     case REDIS_NODE_FAILED:
     case REDIS_NODE_DISCONNECTED:
       assert(!node->connect_timeout);
-      if((node->ctx.cmd = node_connect_context(node, &cp->hostname, cp->port)) == NULL) { //always connect the cmd ctx to the hostname
+      if((node->ctx.cmd = node_connect_context(node)) == NULL) { //always connect the cmd ctx to the hostname
         return node_connector_fail(node, "failed to open redis async context for cmd");
       }
       else if(cp->peername.len == 0) { //don't know peername yet
@@ -1148,7 +1580,7 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
         //(it will be called automatically when this function returns control back to hiredis
         return node_connector_fail(node, ac->errstr);
       }
-      if((node->ctx.pubsub = node_connect_context(node, &cp->peername, cp->port)) == NULL) {
+      if((node->ctx.pubsub = node_connect_context(node)) == NULL) {
         return node_connector_fail(node, "failed to open redis async context for pubsub");
       }
       node->state++;
@@ -1164,13 +1596,50 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
       //connection established. move on...   
       node->state++;
       /* fall through */
+      
+    case REDIS_NODE_CMD_CHECKING_CONNECTION:
+      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "PING");
+      node->state++;
+      break;
+      
+    case REDIS_NODE_CMD_CHECKED_CONNECTION:
+      //Was the ping ok? it's alright if there was an AUTH error, as long as we have a response
+      if(!reply || ac->err) {
+        return node_connector_fail(node, NULL);
+      }
+      if(reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")  && cp->password.len == 0) {
+        return node_connector_fail(node, "server expects a password, but none was configured");
+      }
+      node->state++;
+      /* fall through */
+      
+    case REDIS_NODE_PUBSUB_CHECKING_CONNECTION:
+      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "PING");
+      node->state++;
+      break;
+      
+    case REDIS_NODE_PUBSUB_CHECKED_CONNECTION:
+      if(!reply || ac->err) {
+        return node_connector_fail(node, NULL);
+      }
+      if(reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")  && cp->password.len == 0) {
+        return node_connector_fail(node, "server expects a password, but none was configured");
+      }
+      node->state++;
+      /* fall through */
+      
     case REDIS_NODE_CONNECTED:
       //now we need to authenticate maybe?
       if(cp->password.len > 0) {
         if(!node->ctx.cmd) {
           return node_connector_fail(node, "cmd connection missing, can't send AUTH command");
         }
-        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "AUTH %b", STR(&cp->password));
+        if(cp->username.len > 0) {
+          redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "AUTH %b %b", STR(&cp->username), STR(&cp->password));
+        }
+        else {
+          redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "AUTH %b", STR(&cp->password));
+        }
         node->state++;
       }
       else {
@@ -1178,9 +1647,9 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
         return node_connector_callback(NULL, NULL, node); //continue as if authenticated
       }
       break;
-    
+      
     case REDIS_NODE_CMD_AUTHENTICATING:
-      if(!node_connector_reply_status_ok(reply)) {
+      if(!reply_status_ok(reply)) {
         return node_connector_fail(node, "AUTH command failed");
       }
       if(!node->ctx.pubsub) {
@@ -1192,7 +1661,7 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
       break;
     
     case REDIS_NODE_PUBSUB_AUTHENTICATING:
-      if(!node_connector_reply_status_ok(reply)) {
+      if(!reply_status_ok(reply)) {
         return node_connector_fail(node, "AUTH command failed");
       }
       node->state++;
@@ -1289,9 +1758,13 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
         return node_connector_fail(node, "is busy loading data...");
       }
       
+      if(nchan_cstr_match_line(reply->str, "cluster_enabled:1")) {
+        node->cluster.enabled = 1;
+      }
+      
       if(nchan_cstr_match_line(reply->str, "role:master")) {
         node_set_role(node, REDIS_NODE_ROLE_MASTER);
-        if(!node_discover_slaves_from_info_reply(node, reply)) {
+        if(!node->cluster.enabled && !node_discover_slaves_from_info_reply(node, reply)) {
           return node_connector_fail(node, "failed parsing slaves from INFO");
         }
       }
@@ -1301,16 +1774,13 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
         if(!(rcp = parse_info_master(node, reply->str))) {
           return node_connector_fail(node, "failed parsing master from INFO");
         }
-        node_discover_master(node, rcp);
+        if(!node->cluster.enabled) {
+          node_discover_master(node, rcp);
+        }
       }
       else {
         return node_connector_fail(node, "can't tell if node is master or slave");
       }
-      
-      //what's next?
-      if(nchan_cstr_match_line(reply->str, "cluster_enabled:1")) {
-        node->cluster.enabled = 1;
-      }
       node->state++;
       /* fall through */
     case REDIS_NODE_PUBSUB_GET_INFO:
@@ -1376,12 +1846,20 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
     
     case REDIS_NODE_GETTING_CLUSTERINFO:
       if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
-        return node_connector_fail(node, "CLUSTER INFO command failed,");
+        return node_connector_fail(node, "CLUSTER INFO command failed");
       }
       if(!nchan_cstr_match_line(reply->str, "cluster_state:ok")) {
         node->cluster.ok=0;
         return node_connector_fail(node, "cluster_state not ok");
       }
+      
+      if(!nchan_get_rest_of_line_in_cstr(reply->str, "cluster_current_epoch:", &rest)) {
+        return node_connector_fail(node, "CLUSTER INFO command failed to get current epoch");
+      }
+      if((node->cluster.current_epoch = ngx_atoi(rest.data, rest.len)) == NGX_ERROR) {
+        return node_connector_fail(node, "CLUSTER INFO command failed to parse current epoch number");
+      }
+      
       node->cluster.ok=1;
       node->state++;
       /* fall through */
@@ -1394,7 +1872,7 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
       break;
     
     case REDIS_NODE_GETTING_CLUSTER_NODES:
-      if(!node_connector_reply_str_ok(reply)) {
+      if(!reply_str_ok(reply)) {
         return node_connector_fail(node, "CLUSTER NODES command failed");
       }
       else {
@@ -1456,11 +1934,16 @@ static void node_connector_callback(redisAsyncContext *ac, void *rep, void *priv
       if(!node->ping_timer.timer_set && nodeset->settings.ping_interval > 0) {
         ngx_add_timer(&node->ping_timer, nodeset->settings.ping_interval * 1000);
       }
+      if(node->cluster.enabled) {
+        if(!node->cluster.check_timer.timer_set && nodeset->settings.cluster_check_interval > 0) {
+          ngx_add_timer(&node->cluster.check_timer, nodeset->settings.cluster_check_interval * 1000);
+        }
+        node->cluster.last_successful_check = ngx_time();
+      }
       node_log_notice(node, "%s", node->generation == 0 ? "connected" : "reconnected");
       node->generation++;
       nodeset_examine(nodeset);
       break;
-      
   }
 }
 
@@ -1480,6 +1963,10 @@ static int nodeset_cluster_keyslot_space_complete(redis_nodeset_t *ns) {
       node_log_notice(rangenode->node, "cluster node for range %d - %d not connected", rangenode->range.min, rangenode->range.max);
       return 0;
     }
+    if(rangenode->node->role != REDIS_NODE_ROLE_MASTER) {
+      node_log_notice(rangenode->node, "cluster node for range %d - %d is not a master. That's weird.", rangenode->range.min, rangenode->range.max);
+      return 0;
+    }
     
     range.min = rangenode->range.max + 1;
     range.max = range.min;
@@ -1594,12 +2081,11 @@ ngx_int_t nodeset_reconnect_disconnected_channels(redis_nodeset_t *ns) {
   return NGX_OK;
 }
 
-const char *__nodeset_nickname_cstr(redis_nodeset_t *nodeset) {
-  static char str[1024];
+static char* nodeset_name_cstr(redis_nodeset_t *nodeset, char *buf, size_t maxlen) {
   const char *what = NULL;
   ngx_str_t  *name = NULL;
-  what = nodeset->cluster.enabled ? "cluster" : "server";
   if(nodeset->upstream) {
+    what = "upstream";
     name = &nodeset->upstream->host;
   }
   else {
@@ -1607,20 +2093,22 @@ const char *__nodeset_nickname_cstr(redis_nodeset_t *nodeset) {
     if(url && *url) {
       name = *url;
     }
+    what = "host";
   }
+  
   if(what && name) {
-    ngx_snprintf((u_char *)str, 1024, "%s %V%Z", what, name);
+    ngx_snprintf((u_char *)buf, maxlen, "%s %V%Z", what, name);
   }
   else if(what) {
-    ngx_snprintf((u_char *)str, 1024, "%s%Z", what);
+    ngx_snprintf((u_char *)buf, maxlen, "%s%Z", what);
   }
   else if(name) {
-    ngx_snprintf((u_char *)str, 1024, "%V%Z", name);
+    ngx_snprintf((u_char *)buf, maxlen, "%V%Z", name);
   }
   else {
-    ngx_snprintf((u_char *)str, 1024, "node set%Z");
+    ngx_snprintf((u_char *)buf, maxlen, "node set%Z");
   }
-  return str;
+  return buf;
 }
 
 const char *__node_nickname_cstr(redis_node_t *node) {
@@ -1909,6 +2397,15 @@ ngx_int_t nodeset_destroy_all(void) {
   for(i=0; i<redis_nodeset_count; i++) {
     ns = &redis_nodeset[i];
     nodeset_disconnect(ns);
+    if(ns->name && ns->name != nchan_redis_blankname) {
+      ngx_free(ns->name);
+    }
+#if (NGX_OPENSSL)
+    if(ns->ssl_context) {
+      SSL_CTX_free(ns->ssl_context);
+      ns->ssl_context = NULL;
+    }
+#endif
     nchan_list_empty(&ns->urls);
   }
   redis_nodeset_count = 0;
@@ -1943,10 +2440,12 @@ static ngx_int_t set_preallocated_peername(redisAsyncContext *ctx, ngx_str_t *ds
       s4 = (struct sockaddr_in *)&ctx->c.sockaddr;
       inet_ntop(AF_INET, &s4->sin_addr, ipstr, INET6_ADDRSTRLEN);
       break;
+#ifdef AF_INET6
     case AF_INET6:
       s6 = (struct sockaddr_in6 *)&ctx->c.sockaddr;
       inet_ntop(AF_INET6, &s6->sin6_addr, ipstr, INET6_ADDRSTRLEN);
       break;
+#endif
     case AF_UNSPEC:
     default:
       DBG("couldn't get sockaddr");
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset.h b/debian/modules/nchan/src/store/redis/redis_nodeset.h
index 59ee0cf..1f93b06 100644
--- a/debian/modules/nchan/src/store/redis/redis_nodeset.h
+++ b/debian/modules/nchan/src/store/redis/redis_nodeset.h
@@ -5,9 +5,19 @@
 #if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
 #include <hiredis/hiredis.h>
 #include <hiredis/async.h>
+#if (NGX_OPENSSL)
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <hiredis/hiredis_ssl.h>
+#endif
 #else
 #include <store/redis/hiredis/hiredis.h>
 #include <store/redis/hiredis/async.h>
+#if (NGX_OPENSSL)
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <store/redis/hiredis/hiredis_ssl.h>
+#endif
 #endif
 #include <util/nchan_reaper.h>
 #include <util/nchan_rbtree.h>
@@ -27,7 +37,7 @@
 #define node_log_debug(node, fmt, args...)    node_log((node), NGX_LOG_DEBUG, fmt, ##args)
   
 #define nodeset_log(nodeset, lvl, fmt, args...) \
-  ngx_log_error(lvl, ngx_cycle->log, 0, "nchan: Redis %s: " fmt, __nodeset_nickname_cstr(nodeset), ##args)
+  ngx_log_error(lvl, ngx_cycle->log, 0, "nchan: Redis %s: " fmt, (nodeset)->name, ##args)
 #define nodeset_log_error(nodeset, fmt, args...)    nodeset_log((nodeset), NGX_LOG_ERR, fmt, ##args)
 #define nodeset_log_warning(nodeset, fmt, args...)  nodeset_log((nodeset), NGX_LOG_WARN, fmt, ##args)
 #define nodeset_log_notice(nodeset, fmt, args...)   nodeset_log((nodeset), NGX_LOG_NOTICE, fmt, ##args)
@@ -46,24 +56,28 @@
 #define REDIS_NODE_DISCONNECTED            0
 #define REDIS_NODE_CMD_CONNECTING          1
 #define REDIS_NODE_PUBSUB_CONNECTING       2
-#define REDIS_NODE_CONNECTED               3
-#define REDIS_NODE_CMD_AUTHENTICATING      4
-#define REDIS_NODE_PUBSUB_AUTHENTICATING   5
-#define REDIS_NODE_SELECT_DB               6
-#define REDIS_NODE_CMD_SELECTING_DB        7
-#define REDIS_NODE_PUBSUB_SELECTING_DB     8
-#define REDIS_NODE_SCRIPTS_LOAD            9
-#define REDIS_NODE_SCRIPTS_LOADING        10
-#define REDIS_NODE_GET_INFO               11
-#define REDIS_NODE_GETTING_INFO           12
-#define REDIS_NODE_PUBSUB_GET_INFO        13
-#define REDIS_NODE_PUBSUB_GETTING_INFO    14
-#define REDIS_NODE_SUBSCRIBE_WORKER       15
-#define REDIS_NODE_SUBSCRIBING_WORKER     16
-#define REDIS_NODE_GET_CLUSTERINFO        17
-#define REDIS_NODE_GETTING_CLUSTERINFO    18
-#define REDIS_NODE_GET_CLUSTER_NODES      19
-#define REDIS_NODE_GETTING_CLUSTER_NODES  20
+#define REDIS_NODE_CMD_CHECKING_CONNECTION 3
+#define REDIS_NODE_CMD_CHECKED_CONNECTION  4
+#define REDIS_NODE_PUBSUB_CHECKING_CONNECTION 5
+#define REDIS_NODE_PUBSUB_CHECKED_CONNECTION 6
+#define REDIS_NODE_CONNECTED               7
+#define REDIS_NODE_CMD_AUTHENTICATING      8
+#define REDIS_NODE_PUBSUB_AUTHENTICATING   9
+#define REDIS_NODE_SELECT_DB              10
+#define REDIS_NODE_CMD_SELECTING_DB       11
+#define REDIS_NODE_PUBSUB_SELECTING_DB    12
+#define REDIS_NODE_SCRIPTS_LOAD           13
+#define REDIS_NODE_SCRIPTS_LOADING        14
+#define REDIS_NODE_GET_INFO               15
+#define REDIS_NODE_GETTING_INFO           16
+#define REDIS_NODE_PUBSUB_GET_INFO        17
+#define REDIS_NODE_PUBSUB_GETTING_INFO    18
+#define REDIS_NODE_SUBSCRIBE_WORKER       19
+#define REDIS_NODE_SUBSCRIBING_WORKER     20
+#define REDIS_NODE_GET_CLUSTERINFO        21
+#define REDIS_NODE_GETTING_CLUSTERINFO    22
+#define REDIS_NODE_GET_CLUSTER_NODES      23
+#define REDIS_NODE_GETTING_CLUSTER_NODES  24
 #define REDIS_NODE_READY                  100
   
 typedef struct redis_nodeset_s redis_nodeset_t;
@@ -116,7 +130,7 @@ struct redis_nodeset_s {
   //  maybe a master and its slaves
   //  maybe a cluster of masters and their slaves
   //slaves of slaves not included
-  
+  char                       *name;
   redis_nodeset_status_t      status;
   ngx_event_t                 status_check_ev;
   const char                 *status_msg;
@@ -136,11 +150,23 @@ struct redis_nodeset_s {
       ngx_int_t                   slave;
     }                           node_weight;
     time_t                      ping_interval;
+    time_t                      cluster_check_interval;
     ngx_str_t                  *namespace;
     nchan_redis_optimize_t      optimize_target;
     ngx_msec_t                  connect_timeout;
+    struct {
+      int                         count;
+      nchan_redis_ip_range_t     *list;
+    }                           blacklist;
+    nchan_redis_tls_settings_t  tls;
+    ngx_str_t                   username;
+    ngx_str_t                   password;
   }                           settings;
   
+  #if (NGX_OPENSSL)
+  SSL_CTX                    *ssl_context;
+  #endif
+  
   struct {
     nchan_slist_t               all;
     nchan_slist_t               disconnected_cmd;
@@ -176,6 +202,9 @@ struct redis_node_s {
     unsigned                  enabled:1;
     unsigned                  ok:1;
     ngx_str_t                 id;
+    ngx_event_t               check_timer;
+    time_t                    last_successful_check;
+    int                       current_epoch; //as reported on this node
     struct {
       redis_slot_range_t         *range;
       size_t                      n;
@@ -216,6 +245,7 @@ ngx_int_t nodeset_node_destroy(redis_node_t *node);
 
 int node_disconnect(redis_node_t *node, int disconnected_state);
 int node_connect(redis_node_t *node);
+redisContext *node_connect_sync_context(redis_node_t *node);
 void node_set_role(redis_node_t *node, redis_node_role_t role);
 int node_set_master_node(redis_node_t *node, redis_node_t *master);
 redis_node_t *node_find_slave_node(redis_node_t *node, redis_node_t *slave);
@@ -270,7 +300,6 @@ redis_node_t *nodeset_node_create(redis_nodeset_t *ns, redis_connect_params_t *r
 uint16_t redis_crc16(uint16_t crc, const char *buf, int len);
 
 
-const char *__nodeset_nickname_cstr(redis_nodeset_t *nodeset);
 const char *__node_nickname_cstr(redis_node_t *node);
   
 #endif /* NCHAN_REDIS_NODESET_H */
diff --git a/debian/modules/nchan/src/store/redis/scripts/get_unique_request_id.lua b/debian/modules/nchan/src/store/redis/scripts/get_unique_request_id.lua
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/debian/modules/nchan/src/store/redis/scripts/get_unique_request_id.lua
@@ -0,0 +1 @@
+ 
diff --git a/debian/modules/nchan/src/store/redis/store-private.h b/debian/modules/nchan/src/store/redis/store-private.h
index fffed5f..f1292f6 100644
--- a/debian/modules/nchan/src/store/redis/store-private.h
+++ b/debian/modules/nchan/src/store/redis/store-private.h
@@ -5,6 +5,8 @@
 #define NCHAN_CHANHEAD_CLUSTER_ORPHAN_EXPIRE_SEC 15
 #define NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE 0xB00F
 
+#define NCHAN_REDIS_UNIQUE_REQUEST_ID_KEY "nchan:unique_request_id"
+
 #include <nchan_module.h>
 #include "uthash.h"
 #if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
diff --git a/debian/modules/nchan/src/store/redis/store.h b/debian/modules/nchan/src/store/redis/store.h
index 973bbcf..6bfa30c 100755
--- a/debian/modules/nchan/src/store/redis/store.h
+++ b/debian/modules/nchan/src/store/redis/store.h
@@ -2,6 +2,7 @@
 #define NCHAN_REDIS_STORE_H
 
 #define NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME 4*60
+#define NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_TIME 5
 #define NCHAN_REDIS_DEFAULT_PUBSUB_MESSAGE_MSGKEY_SIZE 1024*5
 
 extern nchan_store_t  nchan_store_redis;
diff --git a/debian/modules/nchan/src/subscribers/common.c b/debian/modules/nchan/src/subscribers/common.c
index 611d942..c165334 100644
--- a/debian/modules/nchan/src/subscribers/common.c
+++ b/debian/modules/nchan/src/subscribers/common.c
@@ -370,7 +370,53 @@ void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ng
   }
 }
 
-ngx_int_t nchan_subscriber_empty_notify(subscriber_t *self, ngx_int_t code, void *data) {
+ngx_int_t nchan_subscriber_receive_notice(subscriber_t *self, ngx_int_t code, void *data) {
+  if(code == NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST) {
+    nchan_loc_conf_t     *cf = self->cf;
+    ngx_str_t             result;
+    int                   result_allocd = 0;
+    ngx_str_t             content_type = ngx_string("text/plain");
+    ngx_str_t             bad_info_string = ngx_string("bad subscriber info string");
+    intptr_t              response_id = (intptr_t )data;
+    if(!cf->subscriber_info_string) {
+      result = bad_info_string;
+    }
+    else {
+      if(ngx_http_complex_value_alloc(self->request, cf->subscriber_info_string, &result, 4096) == NGX_ERROR) {
+        result = bad_info_string;
+      }
+      else {
+        result_allocd = 1;
+      }
+    }
+    
+    ngx_str_t *response_channel_id = nchan_get_subscriber_info_response_channel_id(self->request, response_id);
+    
+    nchan_msg_t             msg;
+    ngx_memzero(&msg, sizeof(msg));
+    msg.id.time = 0;
+    msg.id.tag.fixed[0]=0;
+    msg.id.tagcount=1;
+    msg.id.tagactive=0;
+    
+    msg.content_type=&content_type;
+    
+    msg.storage = NCHAN_MSG_STACK;
+    
+    msg.buf.temporary = 1;
+    msg.buf.memory = 1;
+    msg.buf.last_buf = 1;
+    msg.buf.pos = result.data;
+    msg.buf.last = result.data + result.len;
+    msg.buf.start = msg.buf.pos;
+    msg.buf.end = msg.buf.last;
+    
+    cf->storage_engine->publish(response_channel_id, &msg, cf, NULL, NULL);
+    
+    if(result_allocd) {
+      ngx_http_complex_value_free(&result);
+    }
+  }
   return NGX_OK;
 }
 
@@ -404,3 +450,7 @@ ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nc
   
   return ret;
 }
+
+ngx_int_t nchan_subscriber_publish_info(subscriber_t *sub, uintptr_t destination_channel_id_number) {
+  return NGX_OK;
+}
diff --git a/debian/modules/nchan/src/subscribers/common.h b/debian/modules/nchan/src/subscribers/common.h
index 7ce4184..03edec4 100644
--- a/debian/modules/nchan/src/subscribers/common.h
+++ b/debian/modules/nchan/src/subscribers/common.h
@@ -11,7 +11,7 @@ ngx_str_t *nchan_request_multipart_boundary(ngx_http_request_t *r, nchan_request
 
 ngx_int_t nchan_request_set_content_type_multipart_boundary_header(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
 
-ngx_int_t nchan_subscriber_empty_notify(subscriber_t *, ngx_int_t code, void *data);
+ngx_int_t nchan_subscriber_receive_notice(subscriber_t *, ngx_int_t code, void *data);
 
 
 nchan_fakereq_subrequest_data_t *nchan_subscriber_subrequest(subscriber_t *sub, nchan_requestmachine_request_params_t *params);
@@ -24,3 +24,4 @@ void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ng
 ngx_int_t nchan_subscriber_init_msgid_reusepool(nchan_request_ctx_t *ctx, ngx_pool_t *request_pool);
 ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
 
+ngx_int_t nchan_subscriber_publish_info(subscriber_t *sub, uintptr_t channel_id_number);
diff --git a/debian/modules/nchan/src/subscribers/http-raw-stream.c b/debian/modules/nchan/src/subscribers/http-raw-stream.c
index 7c4ee1b..7d1bc90 100644
--- a/debian/modules/nchan/src/subscribers/http-raw-stream.c
+++ b/debian/modules/nchan/src/subscribers/http-raw-stream.c
@@ -26,7 +26,7 @@ static void rawstream_ensure_headers_sent(full_subscriber_t *fsub) {
 static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
   
   full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
-  ngx_buf_t              *buf, *msg_buf = &msg->buf;
+  ngx_buf_t              *buf = NULL, *msg_buf = &msg->buf;
   ngx_int_t               rc;
   nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(fsub->sub.request, ngx_nchan_module);
   nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
@@ -48,7 +48,7 @@ static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
     return NGX_OK;
   }
   
-  if((bc = nchan_bufchain_pool_reserve(ctx->bcp, (1 + (msg_len > 0 ? 1: 0)))) == NULL) {
+  if((bc = nchan_bufchain_pool_reserve(ctx->bcp, ((separator_len > 0 ? 1 : 0) + (msg_len > 0 ? 1: 0)))) == NULL) {
     ERR("can't allocate buf-and-chains for http-raw-stream client output");
     return NGX_ERROR;
   }
@@ -71,17 +71,21 @@ static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg)
   }
   
   //separator 
-  buf = chain->buf;
-  ngx_memzero(buf, sizeof(ngx_buf_t));
-  buf->start = cf->subscriber_http_raw_stream_separator.data;
-  buf->pos = buf->start;
-  buf->end = buf->start + separator_len;
-  buf->last = buf->end;
-  buf->memory = 1;
-  
-  buf->last_buf = 0;
-  buf->last_in_chain = 1;
-  buf->flush = 1;
+  if(separator_len) {
+    buf = chain->buf;
+    ngx_memzero(buf, sizeof(ngx_buf_t));
+    buf->start = cf->subscriber_http_raw_stream_separator.data;
+    buf->pos = buf->start;
+    buf->end = buf->start + separator_len;
+    buf->last = buf->end;
+    buf->memory = 1;
+  }
+
+  if(buf) {
+    buf->last_buf = 0;
+    buf->last_in_chain = 1;
+    buf->flush = 1;
+  }
   
   rawstream_ensure_headers_sent(fsub);
   
diff --git a/debian/modules/nchan/src/subscribers/internal.c b/debian/modules/nchan/src/subscribers/internal.c
index 8f4a8a2..aba5bbc 100644
--- a/debian/modules/nchan/src/subscribers/internal.c
+++ b/debian/modules/nchan/src/subscribers/internal.c
@@ -71,7 +71,11 @@ subscriber_t *internal_subscriber_create(ngx_str_t *name, nchan_loc_conf_t *cf,
   fsub->already_dequeued = 0;
   fsub->awaiting_destruction = 0;
   
-  fsub->dequeue_handler_data = NULL;
+  fsub->enqueue_callback = NULL;
+  fsub->enqueue_callback_data = NULL;
+  
+  fsub->dequeue_callback = NULL;
+  fsub->dequeue_callback_data = NULL;
   
 #if NCHAN_SUBSCRIBER_LEAK_DEBUG
   subscriber_debug_add(&fsub->sub);
@@ -166,6 +170,9 @@ static ngx_int_t internal_enqueue(subscriber_t *self) {
     reset_timer(fsub);
   }
   fsub->enqueue(NGX_OK, NULL, fsub->privdata);
+  if(fsub->enqueue_callback) {
+    fsub->enqueue_callback(self, fsub->enqueue_callback_data);
+  }
   self->enqueued = 1;
   return NGX_OK;
 }
@@ -179,7 +186,9 @@ static ngx_int_t internal_dequeue(subscriber_t *self) {
   f->already_dequeued = 1;
   DBG("%p (%V) dequeue sub", self, f->sub.name);
   f->dequeue(NGX_OK, NULL, f->privdata);
-  f->dequeue_handler(self, f->dequeue_handler_data);
+  if(f->dequeue_callback) {
+    f->dequeue_callback(self, f->dequeue_callback_data);
+  }
   if(self->cf && self->cf->subscriber_timeout > 0 && f->timeout_ev.timer_set) {
     ngx_del_timer(&f->timeout_ev);
   }
@@ -219,19 +228,33 @@ static ngx_int_t internal_respond_status(subscriber_t *self, ngx_int_t status_co
   return dequeue_maybe(self);
 }
 
-static ngx_int_t internal_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+static ngx_int_t internal_set_enqueue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
   internal_subscriber_t   *f = (internal_subscriber_t *)self;
   if(cb != NULL) {
-    DBG("%p set dequeue handler to %p", self, cb);
-    f->dequeue_handler = cb;
+    DBG("%p set enqueue callback to %p", self, cb);
+    f->dequeue_callback = cb;
   }
   if(privdata != NULL) {
-    DBG("%p set dequeue handler data to %p", self, cb);
-    f->dequeue_handler_data = privdata;
+    DBG("%p set enqueue callback data to %p", self, cb);
+    f->dequeue_callback_data = privdata;
   }
   return NGX_OK;
 }
 
+static ngx_int_t internal_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  if(cb != NULL) {
+    DBG("%p set dequeue callback to %p", self, cb);
+    f->dequeue_callback = cb;
+  }
+  if(privdata != NULL) {
+    DBG("%p set dequeue callback data to %p", self, cb);
+    f->dequeue_callback_data = privdata;
+  }
+  return NGX_OK;
+}
+
+
 ngx_int_t internal_subscriber_set_name(subscriber_t *self, ngx_str_t *name) {
   self->name = name;
   return NGX_OK;
@@ -247,6 +270,7 @@ static const subscriber_fn_t internal_sub_fn = {
   &internal_dequeue,
   &internal_respond_message,
   &internal_respond_status,
+  &internal_set_enqueue_callback,
   &internal_set_dequeue_callback,
   &internal_reserve,
   &internal_release,
diff --git a/debian/modules/nchan/src/subscribers/internal.h b/debian/modules/nchan/src/subscribers/internal.h
index eb89a0c..0c9e609 100644
--- a/debian/modules/nchan/src/subscribers/internal.h
+++ b/debian/modules/nchan/src/subscribers/internal.h
@@ -9,8 +9,10 @@ typedef struct {
   callback_pt             notify;
   callback_pt             destroy;
   ngx_event_t             timeout_ev;
-  subscriber_callback_pt  dequeue_handler;
-  void                   *dequeue_handler_data;
+  subscriber_callback_pt  enqueue_callback;
+  void                   *enqueue_callback_data;
+  subscriber_callback_pt  dequeue_callback;
+  void                   *dequeue_callback_data;
   void                   *privdata;
   unsigned                already_dequeued:1;
   unsigned                awaiting_destruction:1;
diff --git a/debian/modules/nchan/src/subscribers/longpoll-private.h b/debian/modules/nchan/src/subscribers/longpoll-private.h
index 111bc4d..cd9d85c 100644
--- a/debian/modules/nchan/src/subscribers/longpoll-private.h
+++ b/debian/modules/nchan/src/subscribers/longpoll-private.h
@@ -6,8 +6,10 @@ struct nchan_longpoll_multimsg_s {
 
 typedef struct {
   ngx_http_cleanup_t      *cln;
-  subscriber_callback_pt  dequeue_handler;
-  void                   *dequeue_handler_data;
+  subscriber_callback_pt  enqueue_callback;
+  void                   *enqueue_callback_data;
+  subscriber_callback_pt  dequeue_callback;
+  void                   *dequeue_callback_data;
   ngx_event_t             timeout_ev;
   ngx_event_t             ping_ev;
   
diff --git a/debian/modules/nchan/src/subscribers/longpoll.c b/debian/modules/nchan/src/subscribers/longpoll.c
index c14061f..e7a6a65 100644
--- a/debian/modules/nchan/src/subscribers/longpoll.c
+++ b/debian/modules/nchan/src/subscribers/longpoll.c
@@ -55,8 +55,12 @@ subscriber_t *longpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *
   
   nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->data.timeout_ev);
   
-  fsub->data.dequeue_handler = empty_handler;
-  fsub->data.dequeue_handler_data = NULL;
+  fsub->data.enqueue_callback = empty_handler;
+  fsub->data.enqueue_callback_data = NULL;
+  
+  fsub->data.dequeue_callback = empty_handler;
+  fsub->data.dequeue_callback_data = NULL;
+  
   fsub->data.already_responded = 0;
   fsub->data.awaiting_destruction = 0;
   
@@ -120,6 +124,16 @@ static void finalize_request_handler(ngx_http_request_t *r) {
   #if FAKESHARD
     memstore_fakeprocess_push(sub->owner);
   #endif
+    
+    ngx_connection_t *c = r->connection;
+    ngx_event_t      *rev = c->read;
+  
+  
+    if (c->error || c->timedout || c->close || c->destroyed || rev->closed || rev->eof || rev->pending_eof) {
+      ngx_http_test_reading(r);
+      return;
+    }
+    
     sub->dequeue_after_response = 1;
     sub->fn->respond_status(sub, NGX_HTTP_BAD_REQUEST, &NCHAN_HTTP_STATUS_400, NULL);
   #if FAKESHARD
@@ -171,7 +185,11 @@ ngx_int_t longpoll_enqueue(subscriber_t *self) {
     //add timeout timer
     ngx_add_timer(&fsub->data.timeout_ev, self->cf->subscriber_timeout * 1000);
   }
-
+  
+  if(fsub->data.enqueue_callback) {
+    fsub->data.enqueue_callback(self, fsub->data.enqueue_callback_data);
+  }
+  
   return NGX_OK;
 }
 
@@ -184,7 +202,9 @@ ngx_int_t longpoll_dequeue(subscriber_t *self) {
     ngx_del_timer(&fsub->data.timeout_ev);
   }
   DBG("%p dequeue", self);
-  fsub->data.dequeue_handler(self, fsub->data.dequeue_handler_data);
+  if(fsub->data.dequeue_callback) {
+    fsub->data.dequeue_callback(self, fsub->data.dequeue_callback_data);
+  }
   
   if(self->enqueued && self->enable_sub_unsub_callbacks && self->cf->unsubscribe_request_url) {
     nchan_subscriber_unsubscribe_request(self);
@@ -475,6 +495,13 @@ static void request_cleanup_handler(subscriber_t *sub) {
 }
 
 
+static ngx_int_t longpoll_set_enqueue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  fsub->data.enqueue_callback = cb;
+  fsub->data.enqueue_callback_data = privdata;
+  return NGX_OK;
+}
+
 static ngx_int_t longpoll_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
   full_subscriber_t  *fsub = (full_subscriber_t  *)self;
   if(fsub->data.cln == NULL) {
@@ -482,8 +509,8 @@ static ngx_int_t longpoll_set_dequeue_callback(subscriber_t *self, subscriber_ca
     fsub->data.cln->data = self;
     fsub->data.cln->handler = (ngx_http_cleanup_pt )request_cleanup_handler;
   }
-  fsub->data.dequeue_handler = cb;
-  fsub->data.dequeue_handler_data = privdata;
+  fsub->data.dequeue_callback = cb;
+  fsub->data.dequeue_callback_data = privdata;
   return NGX_OK;
 }
 
@@ -492,10 +519,11 @@ static const subscriber_fn_t longpoll_fn = {
   &longpoll_dequeue,
   &longpoll_respond_message,
   &longpoll_respond_status,
+  &longpoll_set_enqueue_callback,
   &longpoll_set_dequeue_callback,
   &longpoll_reserve,
   &longpoll_release,
-  &nchan_subscriber_empty_notify,
+  &nchan_subscriber_receive_notice,
   &nchan_subscriber_authorize_subscribe_request
 };
 
diff --git a/debian/modules/nchan/src/subscribers/memstore_ipc.c b/debian/modules/nchan/src/subscribers/memstore_ipc.c
index ec0fa93..a0a2579 100644
--- a/debian/modules/nchan/src/subscribers/memstore_ipc.c
+++ b/debian/modules/nchan/src/subscribers/memstore_ipc.c
@@ -119,8 +119,9 @@ static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d)
 }
 
 static ngx_int_t sub_respond_notice(ngx_int_t notice, void *ptr, sub_data_t *d) {
+  
   if(!d->unhooked) {
-    return memstore_ipc_send_publish_notice(d->originator, d->chid, notice, NULL);
+    return memstore_ipc_send_publish_notice(d->originator, d->chid, notice, ptr);
   }
   else {
     return NGX_OK;
diff --git a/debian/modules/nchan/src/subscribers/memstore_multi.c b/debian/modules/nchan/src/subscribers/memstore_multi.c
index 873f4d7..8bc2118 100644
--- a/debian/modules/nchan/src/subscribers/memstore_multi.c
+++ b/debian/modules/nchan/src/subscribers/memstore_multi.c
@@ -127,6 +127,9 @@ static ngx_int_t sub_notify_handler(ngx_int_t code, void *data, sub_data_t *d) {
   if(code == NCHAN_SUB_MULTI_NOTIFY_ADDSUB) {
     change_sub_count(d->target_chanhead, (ngx_int_t )data);
   }
+  else if(code == NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST) {
+    nchan_memstore_publish_notice(d->multi_chanhead, code, data);
+  }
   return NGX_OK;
 }
 
diff --git a/debian/modules/nchan/src/subscribers/memstore_redis.c b/debian/modules/nchan/src/subscribers/memstore_redis.c
index f1302e8..73d4e91 100644
--- a/debian/modules/nchan/src/subscribers/memstore_redis.c
+++ b/debian/modules/nchan/src/subscribers/memstore_redis.c
@@ -199,6 +199,10 @@ static ngx_int_t sub_notify_handler(ngx_int_t code, void *data, sub_data_t *d) {
       d->chanhead->max_messages = max_messages;
       memstore_chanhead_messages_gc(d->chanhead);
       break;
+      
+    case NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST:
+      nchan_memstore_publish_notice(d->chanhead, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, data);
+      break;
   }
   return NGX_OK;
 }
diff --git a/debian/modules/nchan/src/subscribers/websocket.c b/debian/modules/nchan/src/subscribers/websocket.c
index 8265abb..beb762b 100644
--- a/debian/modules/nchan/src/subscribers/websocket.c
+++ b/debian/modules/nchan/src/subscribers/websocket.c
@@ -184,8 +184,10 @@ struct full_subscriber_s {
   subscriber_t            sub;
   ngx_http_cleanup_t     *cln;
   nchan_request_ctx_t    *ctx;
-  subscriber_callback_pt  dequeue_handler;
-  void                   *dequeue_handler_data;
+  subscriber_callback_pt  enqueue_callback;
+  void                   *enqueue_callback_data;
+  subscriber_callback_pt  dequeue_callback;
+  void                   *dequeue_callback_data;
   ngx_event_t             timeout_ev;
   ngx_event_t             closing_ev;
   ws_frame_t              frame;
@@ -463,6 +465,9 @@ static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *c
     last_seen = ch->last_seen;
     messages  = ch->messages;
     msgid = &ch->last_published_msg_id;
+    fsub->ctx->channel_subscriber_last_seen = last_seen;
+    fsub->ctx->channel_subscriber_count = subscribers;
+    fsub->ctx->channel_message_count = messages;
   }
   if(d->subrequest) {
     nchan_requestmachine_request_cleanup_manual(d->subrequest);
@@ -740,8 +745,11 @@ subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t
   
   ngx_memzero(&fsub->deflate, sizeof(fsub->deflate));
   
-  fsub->dequeue_handler = empty_handler;
-  fsub->dequeue_handler_data = NULL;
+  fsub->enqueue_callback = empty_handler;
+  fsub->enqueue_callback_data = NULL;
+  
+  fsub->dequeue_callback = empty_handler;
+  fsub->dequeue_callback_data = NULL;
   fsub->awaiting_destruction = 0;
   
   ngx_memzero(&fsub->closing_ev, sizeof(fsub->closing_ev));
@@ -1188,6 +1196,10 @@ static ngx_int_t websocket_enqueue(subscriber_t *self) {
   }
   self->enqueued = 1;
   
+  if(fsub->enqueue_callback) {
+    fsub->enqueue_callback(&fsub->sub, fsub->enqueue_callback_data);
+  }
+  
   if(self->cf->websocket_ping_interval > 0) {
     //add timeout timer
     //nextsub->ev should be zeroed;
@@ -1220,7 +1232,9 @@ static void websocket_delete_timers(full_subscriber_t *fsub) {
 static ngx_int_t websocket_dequeue(subscriber_t *self) {
   full_subscriber_t  *fsub = (full_subscriber_t  *)self;
   DBG("%p dequeue", self);
-  fsub->dequeue_handler(&fsub->sub, fsub->dequeue_handler_data);
+  if(fsub->dequeue_callback) {
+    fsub->dequeue_callback(&fsub->sub, fsub->dequeue_callback_data);
+  }
   
   self->enqueued = 0;
   
@@ -1236,10 +1250,17 @@ static ngx_int_t websocket_dequeue(subscriber_t *self) {
   return NGX_OK;
 }
 
+static ngx_int_t websocket_set_enqueue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  fsub->enqueue_callback = cb;
+  fsub->enqueue_callback_data = privdata;
+  return NGX_OK;
+}
+
 static ngx_int_t websocket_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
   full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  fsub->dequeue_handler = cb;
-  fsub->dequeue_handler_data = privdata;
+  fsub->dequeue_callback = cb;
+  fsub->dequeue_callback_data = privdata;
   return NGX_OK;
 }
 
@@ -2015,10 +2036,11 @@ static const subscriber_fn_t websocket_fn = {
   &websocket_dequeue,
   &websocket_respond_message,
   &websocket_respond_status,
+  &websocket_set_enqueue_callback,
   &websocket_set_dequeue_callback,
   &websocket_reserve,
   &websocket_release,
-  &nchan_subscriber_empty_notify,
+  &nchan_subscriber_receive_notice,
   &nchan_subscriber_authorize_subscribe_request
 };
 
diff --git a/debian/modules/nchan/src/util/nchan_channel_id.c b/debian/modules/nchan/src/util/nchan_channel_id.c
index 4a2deca..1c761e1 100644
--- a/debian/modules/nchan/src/util/nchan_channel_id.c
+++ b/debian/modules/nchan/src/util/nchan_channel_id.c
@@ -45,6 +45,11 @@ static ngx_int_t nchan_process_multi_channel_id(ngx_http_request_t *r, nchan_com
       
       u_char     *cur_first = cur;
       while ((cur_last = nchan_strsplit(&cur, delim, last)) != NULL) {
+        if(n_out >= NCHAN_MULTITAG_MAX) {
+          nchan_log_warning("can't exceed %d channels on a single multiplexed location", NCHAN_MULTITAG_MAX);
+          *ret_id = NULL;
+          return NGX_DECLINED;
+        }
         id[n_out].data = cur_first;
         id[n_out].len = cur_last - cur_first;
         cur_first = cur;
@@ -57,6 +62,11 @@ static ngx_int_t nchan_process_multi_channel_id(ngx_http_request_t *r, nchan_com
       
     }
     else {
+      if(n_out >= NCHAN_MULTITAG_MAX) {
+        nchan_log_warning("can't exceed %d channels on a single multiplexed location", NCHAN_MULTITAG_MAX);
+        *ret_id = NULL;
+        return NGX_DECLINED;
+      }
       sz += id[n_out].len + 1 + grouplen; // "group/<channel-id>"
       if(n_out < NCHAN_MULTITAG_REQUEST_CTX_MAX) {
         ctx->channel_id[n_out] = id[n_out];
@@ -278,3 +288,29 @@ done:
   
   return id;
 }
+
+
+ngx_str_t *nchan_get_subscriber_info_response_channel_id(ngx_http_request_t *r, uintptr_t request_id) {
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  ngx_str_t *chid = ctx->subscriber_info_response_channel_id;
+  if(!chid) {
+    chid = ngx_palloc(r->pool, sizeof(ngx_str_t));
+    if(chid == NULL) {
+      return NULL;
+    }
+    ctx->subscriber_info_response_channel_id = chid;
+    
+    chid->data = ngx_palloc(r->pool, NCHAN_SUBSCRIBER_INFO_CHANNEL_ID_BUFFER_SIZE);
+    if(chid->data == NULL) {
+      ctx->subscriber_info_response_channel_id = NULL;
+      return NULL;
+    }
+  }
+    
+  u_char *end = ngx_snprintf(chid->data, NCHAN_SUBSCRIBER_INFO_CHANNEL_ID_BUFFER_SIZE, "meta/sr%d", (ngx_int_t )request_id);
+  chid->len = end - chid->data;
+  
+  return chid;
+  
+}
diff --git a/debian/modules/nchan/src/util/nchan_channel_id.h b/debian/modules/nchan/src/util/nchan_channel_id.h
index 56958fd..0276227 100644
--- a/debian/modules/nchan/src/util/nchan_channel_id.h
+++ b/debian/modules/nchan/src/util/nchan_channel_id.h
@@ -2,3 +2,5 @@ ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_in
 ngx_int_t nchan_channel_id_is_multi(ngx_str_t *id);
 ngx_str_t *nchan_get_group_name(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
 ngx_str_t nchan_get_group_from_channel_id(ngx_str_t *id);
+
+ngx_str_t *nchan_get_subscriber_info_response_channel_id(ngx_http_request_t *r, uintptr_t request_id);
diff --git a/debian/modules/nchan/src/util/nchan_fake_request.c b/debian/modules/nchan/src/util/nchan_fake_request.c
index 62151de..868a739 100644
--- a/debian/modules/nchan/src/util/nchan_fake_request.c
+++ b/debian/modules/nchan/src/util/nchan_fake_request.c
@@ -47,7 +47,11 @@ static ngx_connection_t *nchan_create_fake_connection(ngx_pool_t *pool) {
   if(c->log->data == NULL) {
     goto failed;
   }
-
+  c->read->log = log;
+  c->write->log = log;
+#if nginx_version >= 1019009
+  c->read->active = 1;
+#endif  
   c->log_error = NGX_ERROR_INFO;
 
   c->error = 0;
diff --git a/debian/modules/nchan/src/util/nchan_output_info.c b/debian/modules/nchan/src/util/nchan_output_info.c
index ebde84c..217af88 100644
--- a/debian/modules/nchan/src/util/nchan_output_info.c
+++ b/debian/modules/nchan/src/util/nchan_output_info.c
@@ -246,10 +246,12 @@ ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_req
   static const ngx_str_t CREATED_LINE = ngx_string("201 Created");
   static const ngx_str_t ACCEPTED_LINE = ngx_string("202 Accepted");
   
-  time_t             last_seen = 0;
-  ngx_uint_t         subscribers = 0;
-  ngx_uint_t         messages = 0;
-  nchan_msg_id_t    *msgid = NULL;
+  time_t                last_seen = 0;
+  ngx_uint_t            subscribers = 0;
+  ngx_uint_t            messages = 0;
+  nchan_msg_id_t       *msgid = NULL;
+  nchan_request_ctx_t  *ctx;
+  
   if(channel!=NULL) {
     subscribers = channel->subscribers;
     last_seen = channel->last_seen;
@@ -262,6 +264,17 @@ ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_req
     else if (status_code == NGX_HTTP_ACCEPTED) {
       ngx_memcpy(&r->headers_out.status_line, &ACCEPTED_LINE, sizeof(ngx_str_t));
     }
+    
+    //set request context values for vars that could be used for logging
+    //does this really belong here? nope.
+    //it's getting refactored out soon though, so these noodles are, for now, acceptable
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+    if(ctx) {
+      ctx->channel_subscriber_last_seen = last_seen;
+      ctx->channel_subscriber_count = subscribers;
+      ctx->channel_message_count = messages;
+    }
+    
     return nchan_channel_info(r, r->headers_out.status, messages, subscribers, last_seen, msgid);
   }
   else {
diff --git a/debian/modules/nchan/src/util/nchan_util.c b/debian/modules/nchan/src/util/nchan_util.c
index f675381..d3fb428 100644
--- a/debian/modules/nchan/src/util/nchan_util.c
+++ b/debian/modules/nchan/src/util/nchan_util.c
@@ -114,6 +114,63 @@ ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex
   return NGX_OK;
 }
 
+ngx_int_t ngx_http_complex_value_alloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen) {
+  size_t                        len;
+  ngx_http_script_code_pt       code;
+  ngx_http_script_len_code_pt   lcode;
+  ngx_http_script_engine_t      e;
+
+  if (val->lengths == NULL) {
+    *value = val->value;
+    return NGX_OK;
+  }
+
+  ngx_http_script_flush_complex_value(r, val);
+
+  ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
+
+  e.ip = val->lengths;
+  e.request = r;
+  e.flushed = 1;
+
+  len = 0;
+
+  while (*(uintptr_t *) e.ip) {
+    lcode = *(ngx_http_script_len_code_pt *) e.ip;
+    len += lcode(&e);
+  }
+  
+  if(len > maxlen) {
+    return NGX_ERROR;
+  }
+  
+  if((value->data = ngx_alloc(len, r->connection->log)) == NULL) {
+    return NGX_ERROR;
+  }
+  
+  value->len = len;
+
+  e.ip = val->values;
+  e.pos = value->data;
+  e.buf = *value;
+
+  while (*(uintptr_t *) e.ip) {
+    code = *(ngx_http_script_code_pt *) e.ip;
+    code((ngx_http_script_engine_t *) &e);
+  }
+
+  *value = e.buf;
+
+  return NGX_OK;
+}
+
+ngx_int_t ngx_http_complex_value_free(ngx_str_t *value) {
+  ngx_free(value->data);
+  value->data = NULL;
+  value->len = 0;
+  return NGX_OK;
+}
+
 ngx_int_t ngx_http_complex_value_custom_pool(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, ngx_pool_t *pool) {
   size_t                        len;
   ngx_http_script_code_pt       code;
diff --git a/debian/modules/nchan/src/util/nchan_util.h b/debian/modules/nchan/src/util/nchan_util.h
index 3dd2358..bba0bd5 100644
--- a/debian/modules/nchan/src/util/nchan_util.h
+++ b/debian/modules/nchan/src/util/nchan_util.h
@@ -4,6 +4,9 @@
 void *memrchr(const void *s, int c, size_t n);
 #endif
 ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen);
+ngx_int_t ngx_http_complex_value_alloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen);
+ngx_int_t ngx_http_complex_value_free(ngx_str_t *value);
+
 ngx_int_t ngx_http_complex_value_custom_pool(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, ngx_pool_t *pool);
 u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char);
 ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name);
@@ -57,7 +60,7 @@ int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz);
 #ifndef container_of
 
 #define container_of(ptr, type, member) ({                      \
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
+        const __typeof__( ((type *)0)->member ) *__mptr = (ptr);    \
         (type *)( (char *)__mptr - offsetof(type,member) );})
 #endif
 

From 16da4dccd217a2aa5a28cada7739ab8bca99d9c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:01:34 +0100
Subject: [PATCH 344/600] http-fancyindex: Upgrade to 0.5.2

---
 debian/modules/control                        |   2 +-
 debian/modules/http-fancyindex/.gitattributes |   4 +
 .../http-fancyindex/.github/workflows/ci.yml  |  40 ++
 debian/modules/http-fancyindex/CHANGELOG.md   |  39 +-
 debian/modules/http-fancyindex/README.rst     |  31 +-
 .../http-fancyindex/nginx-0.6-support.patch   |  23 -
 .../ngx_http_fancyindex_module.c              | 418 ++++++++++++------
 .../http-fancyindex/t/07-directory-first.test |  50 +++
 .../http-fancyindex/t/07-show_dotfiles.test   |  21 +
 .../http-fancyindex/t/08-local-footer.test    |  17 +
 .../http-fancyindex/t/09-local-header.test    |  17 +
 .../t/10-local-headerfooter.test              |  26 ++
 .../t/11-local-footer-nested.test             |  31 ++
 .../t/12-local-footer-nested.test             |  11 +
 debian/modules/http-fancyindex/t/preamble     |   9 +-
 debian/modules/http-fancyindex/t/run          |   2 +-
 .../http-fancyindex/t/show_dotfiles/.okay     |   0
 17 files changed, 565 insertions(+), 176 deletions(-)
 create mode 100644 debian/modules/http-fancyindex/.gitattributes
 create mode 100644 debian/modules/http-fancyindex/.github/workflows/ci.yml
 delete mode 100644 debian/modules/http-fancyindex/nginx-0.6-support.patch
 create mode 100644 debian/modules/http-fancyindex/t/07-directory-first.test
 create mode 100644 debian/modules/http-fancyindex/t/07-show_dotfiles.test
 create mode 100644 debian/modules/http-fancyindex/t/08-local-footer.test
 create mode 100644 debian/modules/http-fancyindex/t/09-local-header.test
 create mode 100644 debian/modules/http-fancyindex/t/10-local-headerfooter.test
 create mode 100644 debian/modules/http-fancyindex/t/11-local-footer-nested.test
 create mode 100644 debian/modules/http-fancyindex/t/12-local-footer-nested.test
 create mode 100644 debian/modules/http-fancyindex/t/show_dotfiles/.okay

diff --git a/debian/modules/control b/debian/modules/control
index 2fe5622..a9bf5e6 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -59,7 +59,7 @@ Version: 3.0.0
 
 Module: http-fancyindex
 Homepage: https://github.com/aperezdc/ngx-fancyindex
-Version: 0.4.4
+Version: 0.5.2
 Files-Excluded: .gitignore .travis.yml
 
 Module: http-subs-filter
diff --git a/debian/modules/http-fancyindex/.gitattributes b/debian/modules/http-fancyindex/.gitattributes
new file mode 100644
index 0000000..c710740
--- /dev/null
+++ b/debian/modules/http-fancyindex/.gitattributes
@@ -0,0 +1,4 @@
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/make-dist export-ignore
+t/* text eol=lf
diff --git a/debian/modules/http-fancyindex/.github/workflows/ci.yml b/debian/modules/http-fancyindex/.github/workflows/ci.yml
new file mode 100644
index 0000000..a7bb1f8
--- /dev/null
+++ b/debian/modules/http-fancyindex/.github/workflows/ci.yml
@@ -0,0 +1,40 @@
+---
+name: Build
+on: [pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [gcc, clang]
+        dynamic: [0, 1]
+        nginx:
+          # Mainline
+          - 1.21.3
+          # Stable.
+          - 1.20.1
+          # First version with loadable module support.
+          - 1.9.15
+          # Oldest supported version.
+          - 0.8.55
+        exclude:
+          - nginx: 0.8.55
+            dynamic: 1
+    runs-on: ubuntu-18.04
+    env:
+      CFLAGS: "-Wno-error"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install Packages
+        run: |
+          sudo apt update
+          sudo apt install -y libpcre3-dev libssl-dev
+          t/get-pup || echo 'Tests needing pup will be skipped'
+      - name: Test
+        env:
+          CC: ${{ matrix.compiler }}
+        run: |
+          CC=${{ matrix.compiler }}
+          t/build-and-run ${{ matrix.nginx }} ${{ matrix.dynamic }}
diff --git a/debian/modules/http-fancyindex/CHANGELOG.md b/debian/modules/http-fancyindex/CHANGELOG.md
index 57569e8..ebeb379 100644
--- a/debian/modules/http-fancyindex/CHANGELOG.md
+++ b/debian/modules/http-fancyindex/CHANGELOG.md
@@ -3,6 +3,40 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.5.2] - 2021-10-28
+### Fixed
+- Properly escape file names to ensure that file names are never renreded
+  as HTML. (Patch by Anthony Ryan <<anthonyryan1@gmail.com>>,
+  [#128](https://github.com/aperezdc/ngx-fancyindex/pull/128).)
+
+## [0.5.1] - 2020-10-26
+### Fixed
+- Properly handle optional second argument to `fancyindex_header` and
+  `fancyindex_footer`
+  ([#117](https://github.com/aperezdc/ngx-fancyindex/issues/117)).
+
+## [0.5.0] - 2020-10-24
+### Added
+- New option `fancyindex_show_dotfiles`. (Path by Joshua Shaffer
+  <<joshua.shaffer@icmrl.net>>.)
+- The `fancyindex_header` and `fancyindex_footer` options now support local
+  files properly, by means of a `local` flag. (Patches by JoungKyun Kim
+  <<joungkyun@gmail.com>> and Adrián Pérez <<aperez@igalia.com>>.)
+
+### Changed
+- Improved performance of directory entry sorting, which should be quite
+  noticeable for directories with thousands of files. (Patch by
+  [Yuxiang Zhang](https://github.com/z4yx).)
+- The minimum Nginx version supported by the module is now 0.8.x.
+
+### Fixed
+- Properly escape square brackets in directory entry names when the module
+  is built with older versions of Nginx. (Patch by Adrián Pérez
+  <<aperez@igalia.com>>.)
+- Fix directory entry listing not being shown when using the
+  [nginx-auth-ldap](https://github.com/kvspb/nginx-auth-ldap) module. (Patch
+  by JoungKyun Kim <<joungkyun@gmail.com>>.)
+
 ## [0.4.4] - 2020-02-19
 ### Added
 - New option `fancyindex_hide_parent_dir`, which disables generating
@@ -148,7 +182,10 @@ All notable changes to this project will be documented in this file.
 - `NEWS.rst` file, to act as change log.
 
 
-[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.4...HEAD
+[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.5.2...HEAD
+[0.5.2]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.5.1...v0.5.2
+[0.5.1]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.5.0...v0.5.1
+[0.5.0]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.4...v0.5.0
 [0.4.4]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.3...v0.4.4
 [0.4.3]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.1...v0.4.2
diff --git a/debian/modules/http-fancyindex/README.rst b/debian/modules/http-fancyindex/README.rst
index 4d178da..c61a6a4 100644
--- a/debian/modules/http-fancyindex/README.rst
+++ b/debian/modules/http-fancyindex/README.rst
@@ -2,8 +2,8 @@
 Nginx Fancy Index module
 ========================
 
-.. image:: https://travis-ci.org/aperezdc/ngx-fancyindex.svg?branch=master
-   :target: https://travis-ci.org/aperezdc/ngx-fancyindex
+.. image:: https://travis-ci.com/aperezdc/ngx-fancyindex.svg?branch=master
+   :target: https://travis-ci.com/aperezdc/ngx-fancyindex
    :alt: Build Status
 
 .. contents::
@@ -46,10 +46,8 @@ Then load the module in `/etc/nginx/nginx.conf` using::
 Other platforms
 ~~~~~~~~~~~~~~~
 
-In most other cases you will need the sources for Nginx_. Any version starting from the 0.7
-series onwards will work.  Note that the modules *might* compile with
-versions in the 0.6 series by applying ``nginx-0.6-support.patch``, but this
-is unsupported (YMMV).
+In most other cases you will need the sources for Nginx_. Any version starting
+from the 0.8 series should work.
 
 In order to use the ``fancyindex_header_`` and ``fancyindex_footer_`` directives
 you will also need the `ngx_http_addition_module <https://nginx.org/en/docs/http/ngx_http_addition_module.html>`_
@@ -184,13 +182,15 @@ fancyindex_name_length
 
 fancyindex_footer
 ~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_footer path*
+:Syntax: *fancyindex_footer path* [*subrequest* | *local*]
 :Default: fancyindex_footer ""
 :Context: http, server, location
 :Description:
   Specifies which file should be inserted at the foot of directory listings.
   If set to an empty string, the default footer supplied by the module will
-  be sent.
+  be sent. The optional parameter indicates whether the *path* is to be
+  treated as an URI to load using a *subrequest* (the default), or whether
+  it refers to a *local* file.
 
 .. note:: Using this directive needs the ngx_http_addition_module_ built
    into Nginx.
@@ -205,13 +205,15 @@ fancyindex_footer
 
 fancyindex_header
 ~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_header path*
+:Syntax: *fancyindex_header path* [*subrequest* | *local*]
 :Default: fancyindex_header ""
 :Context: http, server, location
 :Description:
   Specifies which file should be inserted at the head of directory listings.
   If set to an empty string, the default header supplied by the module will
-  be sent.
+  be sent. The optional parameter indicates whether the *path* is to be
+  treated as an URI to load using a *subrequest* (the default), or whether
+  it refers to a *local* file.
 
 .. note:: Using this directive needs the ngx_http_addition_module_ built
    into Nginx.
@@ -229,6 +231,15 @@ fancyindex_show_path
 .. warning:: This directive can be turned off only if a custom header is provided
    using fancyindex_header.
 
+fancyindex_show_dotfiles
+~~~~~~~~~~~~~~~~~~~~
+:Syntax: *fancyindex_show_dotfiles* [*on* | *off*]
+:Default: fancyindex_show_dotfiles off
+:Context: http, server, location
+:Description:
+  Whether to list files that are proceeded with a dot. Normal convention is to
+  hide these. 
+
 fancyindex_ignore
 ~~~~~~~~~~~~~~~~~
 :Syntax: *fancyindex_ignore string1 [string2 [... stringN]]*
diff --git a/debian/modules/http-fancyindex/nginx-0.6-support.patch b/debian/modules/http-fancyindex/nginx-0.6-support.patch
deleted file mode 100644
index e79e0b3..0000000
--- a/debian/modules/http-fancyindex/nginx-0.6-support.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-=== modified file 'ngx_http_fancyindex_module.c'
---- ngx_http_fancyindex_module.c	2008-09-11 17:55:52 +0000
-+++ ngx_http_fancyindex_module.c	2008-12-10 01:33:43 +0000
-@@ -383,7 +383,7 @@
-         entry->mtime   = ngx_de_mtime(&dir);
-         entry->size    = ngx_de_size(&dir);
-         entry->utf_len = (r->utf8)
--            ?  ngx_utf8_length(entry->name.data, entry->name.len)
-+            ?  ngx_utf_length(entry->name.data, entry->name.len)
-             : len;
-     }
- 
-@@ -478,8 +478,7 @@
-                 copy = NGX_HTTP_FANCYINDEX_NAME_LEN + 1;
-             }
- 
--            b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
--                                          copy, entry[i].name.len);
-+            b->last = ngx_utf_cpystrn(b->last, entry[i].name.data, copy);
-             last = b->last;
- 
-         } else {
-
diff --git a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
index 9ce5a38..d5f1722 100644
--- a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
+++ b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
@@ -140,28 +140,34 @@ ngx_fancyindex_timefmt (u_char *buffer, const ngx_str_t *fmt, const ngx_tm_t *tm
 #undef DATETIME_CASE
 }
 
+typedef struct {
+    ngx_str_t path;
+    ngx_str_t local;
+} ngx_fancyindex_headerfooter_conf_t;
 
 /**
  * Configuration structure for the fancyindex module. The configuration
  * commands defined in the module do fill in the members of this structure.
  */
 typedef struct {
-    ngx_flag_t enable;       /**< Module is enabled. */
-    ngx_uint_t default_sort; /**< Default sort criterion. */
-    ngx_flag_t dirs_first;   /**< Group directories together first when sorting */
-    ngx_flag_t localtime;    /**< File mtime dates are sent in local time. */
-    ngx_flag_t exact_size;   /**< Sizes are sent always in bytes. */
-    ngx_uint_t name_length;  /**< Maximum length of file names in bytes. */
-    ngx_flag_t hide_symlinks;/**< Hide symbolic links in listings. */
-    ngx_flag_t show_path;    /**< Whether to display or not the path + '</h1>' after the header */
-    ngx_flag_t hide_parent;  /**< Hide parent directory. */
+    ngx_flag_t enable;         /**< Module is enabled. */
+    ngx_uint_t default_sort;   /**< Default sort criterion. */
+    ngx_flag_t dirs_first;     /**< Group directories together first when sorting */
+    ngx_flag_t localtime;      /**< File mtime dates are sent in local time. */
+    ngx_flag_t exact_size;     /**< Sizes are sent always in bytes. */
+    ngx_uint_t name_length;    /**< Maximum length of file names in bytes. */
+    ngx_flag_t hide_symlinks;  /**< Hide symbolic links in listings. */
+    ngx_flag_t show_path;      /**< Whether to display or not the path + '</h1>' after the header */
+    ngx_flag_t hide_parent;    /**< Hide parent directory. */
+    ngx_flag_t show_dot_files; /**< Show files that start with a dot.*/
 
-    ngx_str_t  header;       /**< File name for header, or empty if none. */
-    ngx_str_t  footer;       /**< File name for footer, or empty if none. */
-    ngx_str_t  css_href;     /**< Link to a CSS stylesheet, or empty if none. */
-    ngx_str_t  time_format;  /**< Format used for file timestamps. */
+    ngx_str_t  css_href;       /**< Link to a CSS stylesheet, or empty if none. */
+    ngx_str_t  time_format;    /**< Format used for file timestamps. */
 
-    ngx_array_t *ignore;     /**< List of files to ignore in listings. */
+    ngx_array_t *ignore;       /**< List of files to ignore in listings. */
+
+    ngx_fancyindex_headerfooter_conf_t header;
+    ngx_fancyindex_headerfooter_conf_t footer;
 } ngx_http_fancyindex_loc_conf_t;
 
 #define NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME       0
@@ -181,6 +187,106 @@ static ngx_conf_enum_t ngx_http_fancyindex_sort_criteria[] = {
     { ngx_null_string, 0 }
 };
 
+enum {
+    NGX_HTTP_FANCYINDEX_HEADERFOOTER_SUBREQUEST,
+    NGX_HTTP_FANCYINDEX_HEADERFOOTER_LOCAL,
+};
+
+static ngx_uint_t
+headerfooter_kind(const ngx_str_t *value)
+{
+    static const struct {
+        ngx_str_t name;
+        ngx_uint_t value;
+    } values[] = {
+        { ngx_string("subrequest"), NGX_HTTP_FANCYINDEX_HEADERFOOTER_SUBREQUEST },
+        { ngx_string("local"), NGX_HTTP_FANCYINDEX_HEADERFOOTER_LOCAL },
+    };
+
+    unsigned i;
+
+    for (i = 0; i < sizeof(values) / sizeof(values[0]); i++) {
+        if (value->len == values[i].name.len &&
+            ngx_strcasecmp(value->data, values[i].name.data) == 0)
+        {
+            return values[i].value;
+        }
+    }
+
+    return NGX_CONF_UNSET_UINT;
+}
+
+static char*
+ngx_fancyindex_conf_set_headerfooter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_fancyindex_headerfooter_conf_t *item =
+        (void*) (((char*) conf) + cmd->offset);
+    ngx_str_t *values = cf->args->elts;
+
+    if (item->path.data)
+        return "is duplicate";
+
+    item->path = values[1];
+
+    /* Kind of path. Default is "subrequest". */
+    ngx_uint_t kind = NGX_HTTP_FANCYINDEX_HEADERFOOTER_SUBREQUEST;
+    if (cf->args->nelts == 3) {
+        kind = headerfooter_kind(&values[2]);
+        if (kind == NGX_CONF_UNSET_UINT) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "unknown header/footer kind \"%V\"", &values[2]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (kind == NGX_HTTP_FANCYINDEX_HEADERFOOTER_LOCAL) {
+        ngx_file_t file;
+        ngx_file_info_t fi;
+        ssize_t n;
+
+        ngx_memzero(&file, sizeof(ngx_file_t));
+        file.log = cf->log;
+        file.fd = ngx_open_file(item->path.data, NGX_FILE_RDONLY, 0, 0);
+        if (file.fd == NGX_INVALID_FILE) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
+                               "cannot open file \"%V\"", &values[1]);
+            return NGX_CONF_ERROR;
+        }
+
+        if (ngx_fd_info(file.fd, &fi) == NGX_FILE_ERROR) {
+            ngx_close_file(file.fd);
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
+                               "cannot get info for file \"%V\"", &values[1]);
+            return NGX_CONF_ERROR;
+        }
+
+        item->local.len = ngx_file_size(&fi);
+        item->local.data = ngx_pcalloc(cf->pool, item->local.len + 1);
+        if (item->local.data == NULL) {
+            ngx_close_file(file.fd);
+            return NGX_CONF_ERROR;
+        }
+
+        n = item->local.len;
+        while (n > 0) {
+            ssize_t r = ngx_read_file(&file,
+                                      item->local.data + file.offset,
+                                      n,
+                                      file.offset);
+            if (r == NGX_ERROR) {
+                ngx_close_file(file.fd);
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
+                                   "cannot read file \"%V\"", &values[1]);
+                return NGX_CONF_ERROR;
+            }
+
+            n -= r;
+        }
+        item->local.data[item->local.len] = '\0';
+    }
+
+    return NGX_CONF_OK;
+}
 
 #define NGX_HTTP_FANCYINDEX_PREALLOCATE  50
 
@@ -222,6 +328,7 @@ typedef struct {
     ngx_str_t      name;
     size_t         utf_len;
     ngx_uint_t     escape;
+    ngx_uint_t     escape_html;
     ngx_uint_t     dir;
     time_t         mtime;
     off_t          size;
@@ -229,19 +336,17 @@ typedef struct {
 
 
 
-static ngx_int_t ngx_libc_cdecl
-    ngx_http_fancyindex_cmp_entries_dirs_first(const void *one, const void *two);
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_name_desc(const void *one, const void *two);
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_size_desc(const void *one, const void *two);
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_mtime_desc(const void *one, const void *two);
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_name_asc(const void *one, const void *two);
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_size_asc(const void *one, const void *two);
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
     ngx_http_fancyindex_cmp_entries_mtime_asc(const void *one, const void *two);
 
 static ngx_int_t ngx_http_fancyindex_error(ngx_http_request_t *r,
@@ -270,11 +375,6 @@ static ngx_inline ngx_buf_t*
     make_header_buf(ngx_http_request_t *r, const ngx_str_t css_href)
     ngx_force_inline;
 
-static ngx_inline ngx_buf_t*
-    make_footer_buf(ngx_http_request_t *r)
-    ngx_force_inline;
-
-
 
 static ngx_command_t  ngx_http_fancyindex_commands[] = {
 
@@ -321,15 +421,15 @@ static ngx_command_t  ngx_http_fancyindex_commands[] = {
       NULL },
 
     { ngx_string("fancyindex_header"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
+      ngx_fancyindex_conf_set_headerfooter,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_fancyindex_loc_conf_t, header),
       NULL },
 
     { ngx_string("fancyindex_footer"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
+      ngx_fancyindex_conf_set_headerfooter,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_fancyindex_loc_conf_t, footer),
       NULL },
@@ -362,6 +462,13 @@ static ngx_command_t  ngx_http_fancyindex_commands[] = {
       offsetof(ngx_http_fancyindex_loc_conf_t, show_path),
       NULL },
 
+    { ngx_string("fancyindex_show_dotfiles"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fancyindex_loc_conf_t, show_dot_files),
+      NULL },
+
     { ngx_string("fancyindex_hide_parent_dir"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -390,8 +497,8 @@ static ngx_http_module_t  ngx_http_fancyindex_module_ctx = {
     NULL,                                  /* create server configuration */
     NULL,                                  /* merge server configuration */
 
-    ngx_http_fancyindex_create_loc_conf,   /* create location configration */
-    ngx_http_fancyindex_merge_loc_conf     /* merge location configration */
+    ngx_http_fancyindex_create_loc_conf,   /* create location configuration */
+    ngx_http_fancyindex_merge_loc_conf     /* merge location configuration */
 };
 
 
@@ -444,6 +551,8 @@ ngx_fancyindex_escape_filename(u_char *dst, u_char *src, size_t size)
         switch (*psrc++) {
             case ':':
             case '?':
+            case '[':
+            case ']':
                 escapes++;
                 break;
         }
@@ -485,6 +594,16 @@ ngx_fancyindex_escape_filename(u_char *dst, u_char *src, size_t size)
                     *dst++ = '3';
                     *dst++ = 'F';
                     break;
+                case '[':
+                    *dst++ = '%';
+                    *dst++ = '5';
+                    *dst++ = 'B';
+                    break;
+                case ']':
+                    *dst++ = '%';
+                    *dst++ = '5';
+                    *dst++ = 'D';
+                    break;
                 default:
                     *dst++ = *buf;
             }
@@ -504,6 +623,7 @@ ngx_fancyindex_escape_filename(u_char *dst, u_char *src, size_t size)
 static ngx_inline ngx_buf_t*
 make_header_buf(ngx_http_request_t *r, const ngx_str_t css_href)
 {
+    ngx_buf_t *b;
     size_t blen = r->uri.len
         + ngx_sizeof_ssz(t01_head1)
         + ngx_sizeof_ssz(t02_head2)
@@ -518,9 +638,8 @@ make_header_buf(ngx_http_request_t *r, const ngx_str_t css_href)
               ;
     }
 
-    ngx_buf_t *b = ngx_create_temp_buf(r->pool, blen);
-
-    if (b == NULL) goto bailout;
+    if ((b = ngx_create_temp_buf(r->pool, blen)) == NULL)
+        return NULL;
 
     b->last = ngx_cpymem_ssz(b->last, t01_head1);
 
@@ -535,31 +654,10 @@ make_header_buf(ngx_http_request_t *r, const ngx_str_t css_href)
     b->last = ngx_cpymem_ssz(b->last, t03_head3);
     b->last = ngx_cpymem_ssz(b->last, t04_body1);
 
-bailout:
     return b;
 }
 
 
-
-static ngx_inline ngx_buf_t*
-make_footer_buf(ngx_http_request_t *r)
-{
-    /*
-     * TODO: Make this buffer static (i.e. readonly and reusable from
-     * one request to another.
-     */
-    ngx_buf_t *b = ngx_create_temp_buf(r->pool, ngx_sizeof_ssz(t08_foot1));
-
-    if (b == NULL) goto bailout;
-
-    b->last = ngx_cpymem_ssz(b->last, t08_foot1);
-
-bailout:
-    return b;
-}
-
-
-
 static ngx_inline ngx_int_t
 make_content_buf(
         ngx_http_request_t *r, ngx_buf_t **pb,
@@ -567,11 +665,11 @@ make_content_buf(
 {
     ngx_http_fancyindex_entry_t *entry;
 
-    ngx_int_t (*sort_cmp_func) (const void*, const void*);
+    int (*sort_cmp_func)(const void *, const void *);
     const char  *sort_url_args = "";
 
     off_t        length;
-    size_t       len, root, copy, allocated;
+    size_t       len, root, copy, allocated, escape_html;
     int64_t      multiplier;
     u_char      *filename, *last;
     ngx_tm_t     tm;
@@ -654,7 +752,7 @@ make_content_buf(
 
         len = ngx_de_namelen(&dir);
 
-        if (ngx_de_name(&dir)[0] == '.')
+        if (!alcf->show_dot_files && ngx_de_name(&dir)[0] == '.')
             continue;
 
         if (alcf->hide_symlinks && ngx_de_is_link (&dir))
@@ -735,6 +833,9 @@ make_content_buf(
         entry->escape = 2 * ngx_fancyindex_escape_filename(NULL,
                                                            ngx_de_name(&dir),
                                                            len);
+        entry->escape_html = ngx_escape_html(NULL,
+                                             entry->name.data,
+                                             entry->name.len);
 
         entry->dir     = ngx_de_is_dir(&dir);
         entry->mtime   = ngx_de_mtime(&dir);
@@ -753,8 +854,11 @@ make_content_buf(
     /*
      * Calculate needed buffer length.
      */
+
+    escape_html = ngx_escape_html(NULL, r->uri.data, r->uri.len);
+
     if (alcf->show_path)
-        len = r->uri.len
+        len = r->uri.len + escape_html
           + ngx_sizeof_ssz(t05_body2)
           + ngx_sizeof_ssz(t06_list1)
           + ngx_sizeof_ssz(t_parentdir_entry)
@@ -762,7 +866,7 @@ make_content_buf(
           + ngx_fancyindex_timefmt_calc_size (&alcf->time_format) * entries.nelts
           ;
    else
-        len = r->uri.len
+        len = r->uri.len + escape_html
           + ngx_sizeof_ssz(t06_list1)
           + ngx_sizeof_ssz(t_parentdir_entry)
           + ngx_sizeof_ssz(t07_list2)
@@ -792,9 +896,9 @@ make_content_buf(
             + entry[i].name.len + entry[i].escape /* Escaped URL */
             + ngx_sizeof_ssz("?C=x&amp;O=y") /* URL sorting arguments */
             + ngx_sizeof_ssz("\" title=\"")
-            + entry[i].name.len + entry[i].utf_len
+            + entry[i].name.len + entry[i].utf_len + entry[i].escape_html
             + ngx_sizeof_ssz("\">")
-            + entry[i].name.len + entry[i].utf_len
+            + entry[i].name.len + entry[i].utf_len + entry[i].escape_html
             + alcf->name_length + ngx_sizeof_ssz("&gt;")
             + ngx_sizeof_ssz("</a></td><td class=\"size\">")
             + 20 /* File size */
@@ -890,24 +994,46 @@ make_content_buf(
 
     /* Sort entries, if needed */
     if (entries.nelts > 1) {
-        /* Use ngx_sort for stability */ 
-        ngx_sort(entry, (size_t) entries.nelts,
-                  sizeof(ngx_http_fancyindex_entry_t),
-                  sort_cmp_func);
-
         if (alcf->dirs_first)
         {
-            /* Sort directories first */
-            ngx_sort(entry, (size_t) entries.nelts,
-                      sizeof(ngx_http_fancyindex_entry_t),
-                      ngx_http_fancyindex_cmp_entries_dirs_first);
-        }
+            ngx_http_fancyindex_entry_t *l, *r;
 
+            l = entry;
+            r = entry + entries.nelts - 1;
+            while (l < r)
+            {
+                while (l < r && l->dir)
+                    l++;
+                while (l < r && !r->dir)
+                    r--;
+                if (l < r) {
+                    /* Now l points a file while r points a directory */
+                    ngx_http_fancyindex_entry_t tmp;
+                    tmp = *l;
+                    *l = *r;
+                    *r = tmp;
+                }
+            }
+            if (r->dir)
+                r++;
+
+            if (r > entry)
+                /* Sort directories */
+                ngx_qsort(entry, (size_t)(r - entry),
+                        sizeof(ngx_http_fancyindex_entry_t), sort_cmp_func);
+            if (r < entry + entries.nelts)
+                /* Sort files */
+                ngx_qsort(r, (size_t)(entry + entries.nelts - r),
+                        sizeof(ngx_http_fancyindex_entry_t), sort_cmp_func);
+        } else {
+            ngx_qsort(entry, (size_t)entries.nelts,
+                    sizeof(ngx_http_fancyindex_entry_t), sort_cmp_func);
+        }
     }
 
     /* Display the path, if needed */
     if (alcf->show_path){
-        b->last = ngx_cpymem_str(b->last, r->uri);
+        b->last = last = (u_char *) ngx_escape_html(b->last, r->uri.data, r->uri.len);
         b->last = ngx_cpymem_ssz(b->last, t05_body2);
     }
 
@@ -960,26 +1086,32 @@ make_content_buf(
 
         *b->last++ = '"';
         b->last = ngx_cpymem_ssz(b->last, " title=\"");
-        b->last = ngx_cpymem_str(b->last, entry[i].name);
+        b->last = (u_char *) ngx_escape_html(b->last, entry[i].name.data, entry[i].name.len);
         *b->last++ = '"';
         *b->last++ = '>';
 
         len = entry[i].utf_len;
 
-        if (entry[i].name.len - len) {
+        if (entry[i].name.len != len) {
             if (len > alcf->name_length) {
                 copy = alcf->name_length - 3 + 1;
             } else {
                 copy = alcf->name_length + 1;
             }
 
+            last = b->last;
             b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
-                                          copy, entry[i].name.len);
+                copy, entry[i].name.len);
+
+            b->last = (u_char *) ngx_escape_html(last, entry[i].name.data, b->last - last);
             last = b->last;
 
         } else {
-            b->last = ngx_cpystrn(b->last, entry[i].name.data,
-                                  alcf->name_length + 1);
+            if (len > alcf->name_length) {
+                b->last = (u_char *) ngx_escape_html(b->last, entry[i].name.data, alcf->name_length + 1);
+            } else {
+                b->last = (u_char *) ngx_escape_html(b->last, entry[i].name.data, entry[i].name.len);
+            }
             last = b->last - 3;
         }
 
@@ -1016,7 +1148,7 @@ make_content_buf(
                 if (j == DIM(sizes) - 1)
                     b->last = ngx_sprintf(b->last, "%O %s", length, sizes[j]);
                 else
-                    b->last = ngx_sprintf(b->last, "%.1f %s", 
+                    b->last = ngx_sprintf(b->last, "%.1f %s",
                                           (float) length / multiplier, sizes[j]);
             }
         }
@@ -1088,19 +1220,19 @@ ngx_http_fancyindex_handler(ngx_http_request_t *r)
     if (rc == NGX_ERROR || rc > NGX_OK || r->header_only)
         return rc;
 
-    if (alcf->header.len > 0) {
+    if (alcf->header.path.len > 0 && alcf->header.local.len == 0) {
         /* URI is configured, make Nginx take care of with a subrequest. */
-        sr_uri = &alcf->header;
+        sr_uri = &alcf->header.path;
 
         if (*sr_uri->data != '/') {
             /* Relative path */
-            rel_uri.len  = r->uri.len + alcf->header.len;
+            rel_uri.len  = r->uri.len + alcf->header.path.len;
             rel_uri.data = ngx_palloc(r->pool, rel_uri.len);
             if (rel_uri.data == NULL) {
                 return NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
             ngx_memcpy(ngx_cpymem(rel_uri.data, r->uri.data, r->uri.len),
-                    alcf->header.data, alcf->header.len);
+                    alcf->header.path.data, alcf->header.path.len);
             sr_uri = &rel_uri;
         }
 
@@ -1128,25 +1260,42 @@ ngx_http_fancyindex_handler(ngx_http_request_t *r)
     }
     else {
 add_builtin_header:
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "http fancyindex: adding built-in header");
         /* Make space before */
         out[1].next = out[0].next;
         out[1].buf  = out[0].buf;
         /* Chain header buffer */
         out[0].next = &out[1];
-        out[0].buf  = make_header_buf(r, alcf->css_href);
+        if (alcf->header.local.len > 0) {
+            /* Header buffer is local, make a buffer pointing to the data. */
+            out[0].buf = ngx_calloc_buf(r->pool);
+            if (out[0].buf == NULL)
+                return NGX_ERROR;
+            out[0].buf->memory = 1;
+            out[0].buf->pos = alcf->header.local.data;
+            out[0].buf->last = alcf->header.local.data + alcf->header.local.len;
+        } else {
+            /* Prepare a buffer with the contents of the builtin header. */
+            out[0].buf = make_header_buf(r, alcf->css_href);
+        }
     }
 
     /* If footer is disabled, chain up footer buffer. */
-    if (alcf->footer.len == 0) {
-        ngx_uint_t last  = (alcf->header.len == 0) ? 2 : 1;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "http fancyindex: adding built-in footer at %i", last);
+    if (alcf->footer.path.len == 0 || alcf->footer.local.len > 0) {
+        ngx_uint_t last = (alcf->header.path.len == 0) ? 2 : 1;
 
         out[last-1].next = &out[last];
-        out[last].buf    = make_footer_buf(r);
+        out[last].buf = ngx_calloc_buf(r->pool);
+        if (out[last].buf == NULL)
+            return NGX_ERROR;
+
+        out[last].buf->memory = 1;
+        if (alcf->footer.local.len > 0) {
+            out[last].buf->pos = alcf->footer.local.data;
+            out[last].buf->last = alcf->footer.local.data + alcf->footer.local.len;
+        } else {
+            out[last].buf->pos = (u_char*) t08_foot1;
+            out[last].buf->last = (u_char*) t08_foot1 + sizeof(t08_foot1) - 1;
+        }
 
         out[last-1].buf->last_in_chain = 0;
         out[last].buf->last_in_chain   = 1;
@@ -1167,17 +1316,17 @@ add_builtin_header:
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
 
     /* URI is configured, make Nginx take care of with a subrequest. */
-    sr_uri = &alcf->footer;
+    sr_uri = &alcf->footer.path;
 
     if (*sr_uri->data != '/') {
         /* Relative path */
-        rel_uri.len  = r->uri.len + alcf->footer.len;
+        rel_uri.len  = r->uri.len + alcf->footer.path.len;
         rel_uri.data = ngx_palloc(r->pool, rel_uri.len);
         if (rel_uri.data == NULL) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
         ngx_memcpy(ngx_cpymem(rel_uri.data, r->uri.data, r->uri.len),
-                alcf->footer.data, alcf->footer.len);
+                alcf->footer.path.data, alcf->footer.path.len);
         sr_uri = &rel_uri;
     }
 
@@ -1202,7 +1351,12 @@ add_builtin_header:
          * we get something different from a 404?
          */
         out[0].next = NULL;
-        out[0].buf  = make_footer_buf(r);
+        out[0].buf = ngx_calloc_buf(r->pool);
+        if (out[0].buf == NULL)
+            return NGX_ERROR;
+        out[0].buf->memory = 1;
+        out[0].buf->pos = (u_char*) t08_foot1;
+        out[0].buf->last = (u_char*) t08_foot1 + sizeof(t08_foot1) - 1;
         out[0].buf->last_in_chain = 1;
         out[0].buf->last_buf = 1;
         /* Directly send out the builtin footer */
@@ -1212,25 +1366,8 @@ add_builtin_header:
     return (r != r->main) ? rc : ngx_http_send_special(r, NGX_HTTP_LAST);
 }
 
-static ngx_int_t ngx_libc_cdecl
-ngx_http_fancyindex_cmp_entries_dirs_first(const void *one, const void *two)
-{
-    ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
-    ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
 
-    /* move the directories to the start */
-    if (first->dir && !second->dir) {
-        return -1;
-    }
-    if (!first->dir && second->dir) {
-        return 1;
-    }
-
-    return 0;
-}
-
-
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_name_desc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
@@ -1240,7 +1377,7 @@ ngx_http_fancyindex_cmp_entries_name_desc(const void *one, const void *two)
 }
 
 
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_size_desc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
@@ -1250,7 +1387,7 @@ ngx_http_fancyindex_cmp_entries_size_desc(const void *one, const void *two)
 }
 
 
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_mtime_desc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
@@ -1260,7 +1397,7 @@ ngx_http_fancyindex_cmp_entries_mtime_desc(const void *one, const void *two)
 }
 
 
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_name_asc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
@@ -1270,7 +1407,7 @@ ngx_http_fancyindex_cmp_entries_name_asc(const void *one, const void *two)
 }
 
 
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_size_asc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
@@ -1280,7 +1417,7 @@ ngx_http_fancyindex_cmp_entries_size_asc(const void *one, const void *two)
 }
 
 
-static ngx_int_t ngx_libc_cdecl
+static int ngx_libc_cdecl
 ngx_http_fancyindex_cmp_entries_mtime_asc(const void *one, const void *two)
 {
     ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
@@ -1314,25 +1451,26 @@ ngx_http_fancyindex_create_loc_conf(ngx_conf_t *cf)
 
     /*
      * Set by ngx_pcalloc:
-     *    conf->header.len       = 0
-     *    conf->header.data      = NULL
-     *    conf->footer.len       = 0
-     *    conf->footer.data      = NULL
+     *    conf->header.*.len     = 0
+     *    conf->header.*.data    = NULL
+     *    conf->footer.*.len     = 0
+     *    conf->footer.*.data    = NULL
      *    conf->css_href.len     = 0
      *    conf->css_href.data    = NULL
      *    conf->time_format.len  = 0
      *    conf->time_format.data = NULL
      */
-    conf->enable        = NGX_CONF_UNSET;
-    conf->default_sort  = NGX_CONF_UNSET_UINT;
-    conf->dirs_first    = NGX_CONF_UNSET;
-    conf->localtime     = NGX_CONF_UNSET;
-    conf->name_length   = NGX_CONF_UNSET_UINT;
-    conf->exact_size    = NGX_CONF_UNSET;
-    conf->ignore        = NGX_CONF_UNSET_PTR;
-    conf->hide_symlinks = NGX_CONF_UNSET;
-    conf->show_path     = NGX_CONF_UNSET;
-    conf->hide_parent   = NGX_CONF_UNSET;
+    conf->enable         = NGX_CONF_UNSET;
+    conf->default_sort   = NGX_CONF_UNSET_UINT;
+    conf->dirs_first     = NGX_CONF_UNSET;
+    conf->localtime      = NGX_CONF_UNSET;
+    conf->name_length    = NGX_CONF_UNSET_UINT;
+    conf->exact_size     = NGX_CONF_UNSET;
+    conf->ignore         = NGX_CONF_UNSET_PTR;
+    conf->hide_symlinks  = NGX_CONF_UNSET;
+    conf->show_path      = NGX_CONF_UNSET;
+    conf->hide_parent    = NGX_CONF_UNSET;
+    conf->show_dot_files = NGX_CONF_UNSET;
 
     return conf;
 }
@@ -1352,10 +1490,14 @@ ngx_http_fancyindex_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->localtime, prev->localtime, 0);
     ngx_conf_merge_value(conf->exact_size, prev->exact_size, 1);
     ngx_conf_merge_value(conf->show_path, prev->show_path, 1);
+    ngx_conf_merge_value(conf->show_dot_files, prev->show_dot_files, 0);
     ngx_conf_merge_uint_value(conf->name_length, prev->name_length, 50);
 
-    ngx_conf_merge_str_value(conf->header, prev->header, "");
-    ngx_conf_merge_str_value(conf->footer, prev->footer, "");
+    ngx_conf_merge_str_value(conf->header.path, prev->header.path, "");
+    ngx_conf_merge_str_value(conf->header.path, prev->header.local, "");
+    ngx_conf_merge_str_value(conf->footer.path, prev->footer.path, "");
+    ngx_conf_merge_str_value(conf->footer.path, prev->footer.local, "");
+
     ngx_conf_merge_str_value(conf->css_href, prev->css_href, "");
     ngx_conf_merge_str_value(conf->time_format, prev->time_format, "%Y-%b-%d %H:%M");
 
@@ -1364,7 +1506,7 @@ ngx_http_fancyindex_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->hide_parent, prev->hide_parent, 0);
 
     /* Just make sure we haven't disabled the show_path directive without providing a custom header */
-    if (conf->show_path == 0 && conf->header.len == 0)
+    if (conf->show_path == 0 && conf->header.path.len == 0)
     {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "FancyIndex : cannot set show_path to off without providing a custom header !");
         return NGX_CONF_ERROR;
diff --git a/debian/modules/http-fancyindex/t/07-directory-first.test b/debian/modules/http-fancyindex/t/07-directory-first.test
new file mode 100644
index 0000000..82c37cc
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/07-directory-first.test
@@ -0,0 +1,50 @@
+#! /bin/bash
+cat <<---
+This test check the output using "fancyindex_directories_first on"
+--
+use pup
+
+for d in "008d" "000d" "004d" ; do
+	mkdir -p "${TESTDIR}/dir_first/${d}"
+done
+for f in "005f" "001f" "003f"; do
+	touch "${TESTDIR}/dir_first/${f}"
+done
+for d in "006d" "002d" ; do
+	mkdir -p "${TESTDIR}/dir_first/${d}"
+done
+
+nginx_start 'fancyindex_directories_first on;'
+previous=''
+cur_type=''
+while read -r name ; do
+	case "$name" in
+	*Parent*)
+		;;
+	*d*)
+		echo "dir $name"
+		[[ "$cur_type" = f ]] && fail 'Directories should come before Files'
+		cur_type=d
+		if [[ -z ${previous} ]] ; then
+			previous=${name}
+		else
+			[[ ${previous} < ${name} ]] || fail \
+				'Name %s should come before %s\n' "${previous}" "${name}"
+		fi
+		;;
+	*f*)
+		echo "file $name"
+		[[ -z "$cur_type" ]] && fail 'Directories should come before Files'
+		if [[ "$cur_type" = d ]] ; then
+			cur_type=f
+			previous=${name}
+		else
+			[[ ${previous} < ${name} ]] || fail \
+				'Name %s should come before %s\n' "${previous}" "${name}"
+		fi
+		;;
+	esac
+done < <( fetch '/dir_first/' \
+		| pup -p body table tbody 'td:nth-child(1)' text{} )
+
+nginx_is_running || fail "Nginx died"
diff --git a/debian/modules/http-fancyindex/t/07-show_dotfiles.test b/debian/modules/http-fancyindex/t/07-show_dotfiles.test
new file mode 100644
index 0000000..6b56410
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/07-show_dotfiles.test
@@ -0,0 +1,21 @@
+#! /bin/bash
+cat <<---
+Test the option to show dotfiles.
+--
+# Turn it on.
+nginx_start 'fancyindex_show_dotfiles on;'
+on_content=$(fetch /show_dotfiles/)
+nginx_stop
+if [ $(grep '.okay'  <<< "${on_content}") -ne 0 ] ; then
+    exit 1
+fi
+
+# Turn it off.
+nginx_start
+off_content=$(fetch /show_dotfiles/)
+nginx_stop
+if [ $(grep '.okay'  <<< "${on_content}") -eq 0] ; then
+    exit 1
+fi
+
+exit 0
diff --git a/debian/modules/http-fancyindex/t/08-local-footer.test b/debian/modules/http-fancyindex/t/08-local-footer.test
new file mode 100644
index 0000000..6d6318b
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/08-local-footer.test
@@ -0,0 +1,17 @@
+#! /bin/bash
+cat <<---
+This test checks that a local footer can be included with
+"fancyindex_header ... local"
+--
+use pup
+
+cat > "${TESTDIR}/footer" <<EOF
+<div id="customfooter">yes</div>
+EOF
+
+nginx_start "fancyindex_footer \"${TESTDIR}/footer\" local;"
+
+T=$(fetch / | pup -p body 'div#customfooter' text{})
+[[ $T == yes ]] ||  fail 'Custom header missing'
+
+nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/09-local-header.test b/debian/modules/http-fancyindex/t/09-local-header.test
new file mode 100644
index 0000000..455b966
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/09-local-header.test
@@ -0,0 +1,17 @@
+#! /bin/bash
+cat <<---
+This test checks that a local header can be included with
+"fancyindex_header ... local"
+--
+use pup
+
+cat > "${TESTDIR}/header" <<EOF
+<div id="customheader">yes</div>
+EOF
+
+nginx_start "fancyindex_header \"${TESTDIR}/header\" local;"
+
+T=$(fetch / | pup -p body 'div#customheader' text{})
+[[ $T == yes ]] ||  fail 'Custom header missing'
+
+nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/10-local-headerfooter.test b/debian/modules/http-fancyindex/t/10-local-headerfooter.test
new file mode 100644
index 0000000..6adfb45
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/10-local-headerfooter.test
@@ -0,0 +1,26 @@
+#! /bin/bash
+cat <<---
+This test checks that both a local header and footer can be included with
+"fancyindex_{header,footer} ... local"
+--
+use pup
+
+cat > "${TESTDIR}/header" <<EOF
+<div id="customheader">yes</div>
+EOF
+cat > "${TESTDIR}/footer" <<EOF
+<div id="customfooter">yes</div>
+EOF
+
+nginx_start "fancyindex_header \"${TESTDIR}/header\" local;
+             fancyindex_footer \"${TESTDIR}/footer\" local;"
+
+P=$(fetch /)
+
+H=$(pup -p body 'div#customheader' text{} <<< "$P")
+[[ $H == yes ]] ||  fail 'Custom header missing'
+
+F=$(pup -p body 'div#customfooter' text{} <<< "$P")
+[[ $F == yes ]] || fail 'Custom footer missing'
+
+nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/11-local-footer-nested.test b/debian/modules/http-fancyindex/t/11-local-footer-nested.test
new file mode 100644
index 0000000..0530853
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/11-local-footer-nested.test
@@ -0,0 +1,31 @@
+#! /bin/bash
+cat <<---
+This test checks that local footers are correctly included in presence of
+directives in nested locations:
+
+	fancyindex_footer <one> local;
+	location /sub {
+		fancyindex_footer <another> local;
+	}
+
+--
+use pup
+
+echo '<div id="topfooter">yes</div>' > "${TESTDIR}/top-footer"
+echo '<div id="subfooter">yes</div>' > "${TESTDIR}/sub-footer"
+
+nginx_start "fancyindex_footer \"${TESTDIR}/top-footer\" local;
+             location /child-directory {
+			    fancyindex_footer \"${TESTDIR}/sub-footer\" local;
+			 }"
+
+T=$(fetch /)
+echo "$T" > "$TESTDIR/top.html"
+[[ $(pup -p body 'div#topfooter' text{} <<< "$T") = yes ]] || fail 'Custom header missing at /'
+[[ -z $(pup -p body 'div#subfooter' text{} <<< "$T") ]] || fail 'Wrong header at /'
+
+T=$(fetch /child-directory/)
+[[ $(pup -p body 'div#subfooter' text{} <<< "$T") = yes ]] || fail 'Custom header missing at /sub/'
+[[ -z $(pup -p body 'div#topfooter' text{} <<< "$T") ]] || fail 'Wrong header at /sub/'
+
+nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/12-local-footer-nested.test b/debian/modules/http-fancyindex/t/12-local-footer-nested.test
new file mode 100644
index 0000000..7c0aef7
--- /dev/null
+++ b/debian/modules/http-fancyindex/t/12-local-footer-nested.test
@@ -0,0 +1,11 @@
+#! /bin/bash
+cat <<---
+This test checks that the configuration file is properly parsed if there
+is only one parameter passed to the fancyndex_header and fancyindex_footer
+configuration directives.
+--
+
+nginx_start 'fancyindex_header "/header";
+	         fancyindex_footer "/footer";'
+
+nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/preamble b/debian/modules/http-fancyindex/t/preamble
index d3e4e30..26f2819 100644
--- a/debian/modules/http-fancyindex/t/preamble
+++ b/debian/modules/http-fancyindex/t/preamble
@@ -20,7 +20,7 @@ function nginx_conf_generate () {
 		keepalive_timeout 65;
 		server {
 			server_name localhost;
-			listen 127.0.0.1:8888;
+			listen 127.0.0.1:${NGINX_PORT};
 			root ${TESTDIR};
 			error_page 500 502 503 504 /50x.html;
 			location = /50x.html { root html; }
@@ -36,6 +36,11 @@ function nginx_conf_generate () {
 
 readonly NGINX_CONF="${PREFIX}/conf/nginx.conf"
 readonly NGINX_PID="${PREFIX}/logs/nginx.pid"
+
+NGINX_PORT=$(ss -4Htnl | awk '{ sub("[^:]+:", "", $4) ; seen[$4]=1 }
+END { p=1025 ; while (seen[p]) p++; print p}')
+readonly NGINX_PORT
+
 rm -f "${NGINX_CONF}" "${NGINX_PID}"
 mkdir -p "${PREFIX}/logs"
 
@@ -85,7 +90,7 @@ function fetch () {
 		opts+=( -S )
 		shift
 	fi
-	wget "${opts[@]}" -O- "http://localhost:8888${1:-/}" 2>&1
+	wget "${opts[@]}" -O- "http://localhost:${NGINX_PORT}${1:-/}" 2>&1
 }
 
 function skip () {
diff --git a/debian/modules/http-fancyindex/t/run b/debian/modules/http-fancyindex/t/run
index 06cc3db..9988fa2 100755
--- a/debian/modules/http-fancyindex/t/run
+++ b/debian/modules/http-fancyindex/t/run
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 set -e
 
 if [[ $# -lt 1 || $# -gt 2 ]] ; then
diff --git a/debian/modules/http-fancyindex/t/show_dotfiles/.okay b/debian/modules/http-fancyindex/t/show_dotfiles/.okay
new file mode 100644
index 0000000..e69de29

From a63400c839e50677ba4b0b1b8bc79348651ffeef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:01:40 +0100
Subject: [PATCH 345/600] rtmp: Upgrade to 1.2.2

---
 debian/modules/control                 | 2 +-
 debian/modules/rtmp/ngx_rtmp_amf.c     | 2 +-
 debian/modules/rtmp/ngx_rtmp_eval.c    | 2 ++
 debian/modules/rtmp/ngx_rtmp_handler.c | 4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/modules/control b/debian/modules/control
index a9bf5e6..8ba5644 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -70,5 +70,5 @@ Patch: dynamic-module.patch
 Module: rtmp
 Homepage: https://github.com/arut/nginx-rtmp-module
 Files-Excluded: test
-Version: 1.2.1
+Version: 1.2.2
 
diff --git a/debian/modules/rtmp/ngx_rtmp_amf.c b/debian/modules/rtmp/ngx_rtmp_amf.c
index b20989c..3fe3ccf 100644
--- a/debian/modules/rtmp/ngx_rtmp_amf.c
+++ b/debian/modules/rtmp/ngx_rtmp_amf.c
@@ -328,7 +328,7 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
         } else {
             switch (ngx_rtmp_amf_get(ctx, &type8, 1)) {
                 case NGX_DONE:
-                    if (elts->type & NGX_RTMP_AMF_OPTIONAL) {
+                    if (elts && elts->type & NGX_RTMP_AMF_OPTIONAL) {
                         return NGX_OK;
                     }
                     /* fall through */
diff --git a/debian/modules/rtmp/ngx_rtmp_eval.c b/debian/modules/rtmp/ngx_rtmp_eval.c
index 1e5195a..a92a863 100644
--- a/debian/modules/rtmp/ngx_rtmp_eval.c
+++ b/debian/modules/rtmp/ngx_rtmp_eval.c
@@ -167,6 +167,8 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e, ngx_str_t *out,
                         continue;
                 }
 
+                /* fall through */
+
             case ESCAPE:
                 ngx_rtmp_eval_append(&b, &c, 1, log);
                 state = NORMAL;
diff --git a/debian/modules/rtmp/ngx_rtmp_handler.c b/debian/modules/rtmp/ngx_rtmp_handler.c
index 17eadee..f42a3bb 100644
--- a/debian/modules/rtmp/ngx_rtmp_handler.c
+++ b/debian/modules/rtmp/ngx_rtmp_handler.c
@@ -241,7 +241,9 @@ ngx_rtmp_recv(ngx_event_t *rev)
                     "reusing formerly read data: %d", old_size);
 
             b->pos = b->start;
-            b->last = ngx_movemem(b->pos, old_pos, old_size);
+
+            size = ngx_min((size_t) (b->end - b->start), old_size);
+            b->last = ngx_movemem(b->pos, old_pos, size);
 
             if (s->in_chunk_size_changing) {
                 ngx_rtmp_finalize_set_chunk_size(s);

From 70f87643c9a5e34fc1dc902f4c4d8d1215b4db84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:03:47 +0100
Subject: [PATCH 346/600] http-lua: Upgrade to 0.10.15

---
 debian/modules/control                        |    2 +-
 debian/modules/http-lua/README.markdown       |  235 +-
 debian/modules/http-lua/config                |   45 +
 .../modules/http-lua/doc/HttpLuaModule.wiki   |  213 +-
 .../http-lua/src/api/ngx_http_lua_api.h       |    2 +-
 .../http-lua/src/ngx_http_lua_accessby.c      |    4 +-
 .../modules/http-lua/src/ngx_http_lua_api.c   |    2 +-
 .../http-lua/src/ngx_http_lua_balancer.c      |    3 +
 .../http-lua/src/ngx_http_lua_bodyfilterby.c  |   50 +-
 .../http-lua/src/ngx_http_lua_bodyfilterby.h  |    2 +-
 .../modules/http-lua/src/ngx_http_lua_cache.c |   23 +-
 .../http-lua/src/ngx_http_lua_clfactory.c     |   45 +-
 .../http-lua/src/ngx_http_lua_common.h        |   49 +-
 .../http-lua/src/ngx_http_lua_contentby.c     |    2 +
 .../http-lua/src/ngx_http_lua_control.c       |    3 +-
 .../http-lua/src/ngx_http_lua_coroutine.c     |   18 +-
 .../http-lua/src/ngx_http_lua_directive.c     |   11 +-
 .../src/ngx_http_lua_headerfilterby.c         |    3 +-
 .../http-lua/src/ngx_http_lua_headers.c       |   83 +-
 .../http-lua/src/ngx_http_lua_headers_in.c    |   10 +-
 .../http-lua/src/ngx_http_lua_headers_out.c   |   20 +-
 .../http-lua/src/ngx_http_lua_headers_out.h   |    6 +-
 .../http-lua/src/ngx_http_lua_initworkerby.c  |   19 +
 .../http-lua/src/ngx_http_lua_input_filters.c |  137 +
 .../http-lua/src/ngx_http_lua_input_filters.h |   29 +
 .../modules/http-lua/src/ngx_http_lua_logby.c |    3 +-
 .../modules/http-lua/src/ngx_http_lua_misc.c  |   27 +
 .../http-lua/src/ngx_http_lua_module.c        |   56 +
 .../modules/http-lua/src/ngx_http_lua_ndk.c   |   41 +
 .../modules/http-lua/src/ngx_http_lua_pipe.c  | 2475 +++++++++++++++++
 .../modules/http-lua/src/ngx_http_lua_pipe.h  |   95 +
 .../modules/http-lua/src/ngx_http_lua_regex.c |   10 +-
 .../http-lua/src/ngx_http_lua_rewriteby.c     |    4 +-
 .../http-lua/src/ngx_http_lua_script.c        |    4 +-
 .../modules/http-lua/src/ngx_http_lua_setby.c |   34 +-
 .../modules/http-lua/src/ngx_http_lua_setby.h |    2 +-
 .../http-lua/src/ngx_http_lua_shdict.c        |   44 +-
 .../http-lua/src/ngx_http_lua_socket_tcp.c    | 1608 +++++++----
 .../http-lua/src/ngx_http_lua_socket_tcp.h    |   29 +-
 .../http-lua/src/ngx_http_lua_socket_udp.c    |   12 +-
 .../http-lua/src/ngx_http_lua_ssl_certby.c    |    2 +
 .../src/ngx_http_lua_ssl_session_fetchby.c    |    2 +
 .../src/ngx_http_lua_ssl_session_storeby.c    |    3 +
 .../http-lua/src/ngx_http_lua_string.c        |   14 +
 .../http-lua/src/ngx_http_lua_subrequest.c    |    8 +
 .../modules/http-lua/src/ngx_http_lua_timer.c |   44 +-
 .../http-lua/src/ngx_http_lua_uthread.c       |    3 +-
 .../modules/http-lua/src/ngx_http_lua_util.c  |  168 +-
 .../modules/http-lua/src/ngx_http_lua_util.h  |   28 +-
 .../http-lua/src/ngx_http_lua_worker.c        |   11 +
 debian/modules/http-lua/t/000--init.t         |    5 -
 debian/modules/http-lua/t/001-set.t           |   23 +-
 debian/modules/http-lua/t/002-content.t       |   38 +-
 debian/modules/http-lua/t/004-require.t       |   12 +-
 debian/modules/http-lua/t/005-exit.t          |    2 +-
 debian/modules/http-lua/t/009-log.t           |   12 +-
 debian/modules/http-lua/t/011-md5_bin.t       |    2 +-
 debian/modules/http-lua/t/013-base64.t        |    2 +-
 debian/modules/http-lua/t/014-bugs.t          |   49 +-
 debian/modules/http-lua/t/016-resp-header.t   |  504 +++-
 debian/modules/http-lua/t/017-exec.t          |    4 +-
 debian/modules/http-lua/t/020-subrequest.t    |  134 +-
 .../http-lua/t/023-rewrite/client-abort.t     |    6 +-
 debian/modules/http-lua/t/023-rewrite/exec.t  |    4 +-
 debian/modules/http-lua/t/023-rewrite/mixed.t |    4 +-
 .../http-lua/t/023-rewrite/multi-capture.t    |    2 +-
 .../http-lua/t/023-rewrite/req-socket.t       |    6 +-
 .../modules/http-lua/t/023-rewrite/sanity.t   |   28 +-
 .../http-lua/t/023-rewrite/socket-keepalive.t |   12 +-
 .../http-lua/t/023-rewrite/subrequest.t       |   42 +-
 .../t/023-rewrite/tcp-socket-timeout.t        |   12 +-
 .../http-lua/t/023-rewrite/tcp-socket.t       |   32 +-
 .../http-lua/t/023-rewrite/uthread-exec.t     |   12 +-
 .../http-lua/t/023-rewrite/uthread-exit.t     |   40 +-
 .../http-lua/t/023-rewrite/uthread-redirect.t |    4 +-
 .../http-lua/t/023-rewrite/uthread-spawn.t    |   62 +-
 .../http-lua/t/024-access/client-abort.t      |    6 +-
 debian/modules/http-lua/t/024-access/exec.t   |    2 +-
 debian/modules/http-lua/t/024-access/mixed.t  |   10 +-
 .../http-lua/t/024-access/multi-capture.t     |    2 +-
 debian/modules/http-lua/t/024-access/sanity.t |   30 +-
 .../http-lua/t/024-access/subrequest.t        |   42 +-
 .../http-lua/t/024-access/uthread-exec.t      |   12 +-
 .../http-lua/t/024-access/uthread-exit.t      |   38 +-
 .../http-lua/t/024-access/uthread-redirect.t  |    4 +-
 .../http-lua/t/024-access/uthread-spawn.t     |   62 +-
 debian/modules/http-lua/t/025-codecache.t     |  174 +-
 debian/modules/http-lua/t/027-multi-capture.t |    4 +-
 debian/modules/http-lua/t/028-req-header.t    |   24 +-
 debian/modules/http-lua/t/030-uri-args.t      |   23 +-
 debian/modules/http-lua/t/034-match.t         |   65 +-
 debian/modules/http-lua/t/035-gmatch.t        |   22 +-
 debian/modules/http-lua/t/036-sub.t           |    4 +-
 debian/modules/http-lua/t/037-gsub.t          |    2 +-
 debian/modules/http-lua/t/038-match-o.t       |   44 +-
 debian/modules/http-lua/t/041-header-filter.t |   15 +-
 debian/modules/http-lua/t/043-shdict.t        |    4 +-
 debian/modules/http-lua/t/047-match-jit.t     |   12 +-
 debian/modules/http-lua/t/048-match-dfa.t     |   12 +-
 debian/modules/http-lua/t/055-subreq-vars.t   |   18 +-
 debian/modules/http-lua/t/056-flush.t         |    2 +-
 debian/modules/http-lua/t/057-flush-timeout.t |    2 +-
 debian/modules/http-lua/t/058-tcp-socket.t    |  364 ++-
 debian/modules/http-lua/t/062-count.t         |   31 +-
 debian/modules/http-lua/t/063-abort.t         |   62 +-
 debian/modules/http-lua/t/064-pcall.t         |   14 +-
 .../http-lua/t/065-tcp-socket-timeout.t       |   24 +-
 .../http-lua/t/066-socket-receiveuntil.t      |   30 +-
 debian/modules/http-lua/t/067-req-socket.t    |    6 +-
 .../modules/http-lua/t/068-socket-keepalive.t | 1467 +++++++++-
 debian/modules/http-lua/t/073-backtrace.t     |   14 +-
 debian/modules/http-lua/t/075-logby.t         |   11 +-
 debian/modules/http-lua/t/081-bytecode.t      |   45 +-
 debian/modules/http-lua/t/082-body-filter.t   |    3 +-
 .../http-lua/t/084-inclusive-receiveuntil.t   |   20 +-
 debian/modules/http-lua/t/087-udp-socket.t    |   12 +-
 .../http-lua/t/090-log-socket-errors.t        |   10 +-
 debian/modules/http-lua/t/091-coroutine.t     |   81 +-
 debian/modules/http-lua/t/093-uthread-spawn.t |   66 +-
 debian/modules/http-lua/t/094-uthread-exit.t  |   46 +-
 debian/modules/http-lua/t/095-uthread-exec.t  |   14 +-
 .../modules/http-lua/t/096-uthread-redirect.t |    6 +-
 .../modules/http-lua/t/097-uthread-rewrite.t  |   12 +-
 debian/modules/http-lua/t/098-uthread-wait.t  |   74 +-
 debian/modules/http-lua/t/099-c-api.t         |   10 +-
 debian/modules/http-lua/t/100-client-abort.t  |    6 +-
 debian/modules/http-lua/t/106-timer.t         |   18 +-
 debian/modules/http-lua/t/108-timer-safe.t    |   16 +-
 debian/modules/http-lua/t/109-timer-hup.t     |   18 +-
 debian/modules/http-lua/t/120-re-find.t       |    4 +-
 debian/modules/http-lua/t/123-lua-path.t      |   10 +-
 debian/modules/http-lua/t/124-init-worker.t   |   10 +-
 debian/modules/http-lua/t/126-shdict-frag.t   |    4 +-
 debian/modules/http-lua/t/127-uthread-kill.t  |   26 +-
 .../http-lua/t/128-duplex-tcp-socket.t        |    6 +-
 debian/modules/http-lua/t/129-ssl-socket.t    |   16 +-
 debian/modules/http-lua/t/130-internal-api.t  |   17 +-
 .../modules/http-lua/t/134-worker-count-5.t   |    4 +-
 debian/modules/http-lua/t/138-balancer.t      |    2 -
 debian/modules/http-lua/t/139-ssl-cert-by.t   |    2 +-
 debian/modules/http-lua/t/140-ssl-c-api.t     |   23 +-
 .../http-lua/t/143-ssl-session-fetch.t        |  105 +
 .../http-lua/t/147-tcp-socket-timeouts.t      |    8 +-
 debian/modules/http-lua/t/152-timer-every.t   |    4 +-
 debian/modules/http-lua/t/153-semaphore-hup.t |    2 +-
 debian/modules/http-lua/t/156-slow-network.t  |  138 +
 .../http-lua/t/157-socket-keepalive-hup.t     |   91 +
 debian/modules/http-lua/t/158-global-var.t    |  508 ++++
 debian/modules/http-lua/t/159-sa-restart.t    |  180 ++
 .../http-lua/t/160-disable-init-by-lua.t      |  194 ++
 .../modules/http-lua/t/161-load-resty-core.t  |   68 +
 .../ngx_http_lua_fake_shm_module.c            |   22 +-
 debian/modules/http-lua/util/build.sh         |    4 +-
 153 files changed, 9493 insertions(+), 1866 deletions(-)
 create mode 100644 debian/modules/http-lua/src/ngx_http_lua_input_filters.c
 create mode 100644 debian/modules/http-lua/src/ngx_http_lua_input_filters.h
 create mode 100644 debian/modules/http-lua/src/ngx_http_lua_pipe.c
 create mode 100644 debian/modules/http-lua/src/ngx_http_lua_pipe.h
 create mode 100644 debian/modules/http-lua/t/156-slow-network.t
 create mode 100644 debian/modules/http-lua/t/157-socket-keepalive-hup.t
 create mode 100644 debian/modules/http-lua/t/158-global-var.t
 create mode 100644 debian/modules/http-lua/t/159-sa-restart.t
 create mode 100644 debian/modules/http-lua/t/160-disable-init-by-lua.t
 create mode 100644 debian/modules/http-lua/t/161-load-resty-core.t

diff --git a/debian/modules/control b/debian/modules/control
index 8ba5644..4034f4d 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -22,7 +22,7 @@ Version: 3.3
 
 Module: http-lua
 Homepage: https://github.com/openresty/lua-nginx-module
-Version: 0.10.13
+Version: 0.10.15
 Patch:
   openssl-1.1.0.patch
   discover-luajit-2.1.patch
diff --git a/debian/modules/http-lua/README.markdown b/debian/modules/http-lua/README.markdown
index 15ad00e..ed0c72d 100644
--- a/debian/modules/http-lua/README.markdown
+++ b/debian/modules/http-lua/README.markdown
@@ -8,6 +8,8 @@ Name
 
 ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
+This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
+
 *This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
 
 Table of Contents
@@ -23,7 +25,6 @@ Table of Contents
 * [Installation](#installation)
     * [Building as a dynamic module](#building-as-a-dynamic-module)
     * [C Macro Configurations](#c-macro-configurations)
-    * [Installation on Ubuntu 11.10](#installation-on-ubuntu-1110)
 * [Community](#community)
     * [English Mailing List](#english-mailing-list)
     * [Chinese Mailing List](#chinese-mailing-list)
@@ -62,7 +63,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.13](https://github.com/openresty/lua-nginx-module/tags) released on 22 April 2018.
+This document describes ngx_lua [v0.10.15](https://github.com/openresty/lua-nginx-module/tags) released on March 14th, 2019.
 
 Synopsis
 ========
@@ -187,7 +188,9 @@ Synopsis
 Description
 ===========
 
-This module embeds Lua, via the standard Lua 5.1 interpreter or [LuaJIT 2.0/2.1](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.
+This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
+
+This module embeds Lua, via [LuaJIT 2.0/2.1](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](https://httpd.apache.org/docs/trunk/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](#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.
@@ -265,11 +268,11 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 Installation
 ============
 
-It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
+It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, OpenResty's LuaJIT 2.1 branch version, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-1. Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is *not* supported yet). LuaJIT can be downloaded from 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. LuaJIT can be downloaded from the [latest release of OpenResty's LuaJIT branch version](https://github.com/openresty/luajit2/releases). The official LuaJIT 2.0 and 2.1 releases are also supported, although the performance will be significantly lower in many cases.
 1. Download the latest version of the ngx_devel_kit (NDK) module [HERE](https://github.com/simplresty/ngx_devel_kit/tags).
 1. Download the latest version of ngx_lua [HERE](https://github.com/openresty/lua-nginx-module/tags).
 1. Download the latest version of Nginx [HERE](http://nginx.org/) (See [Nginx Compatibility](#nginx-compatibility))
@@ -345,29 +348,6 @@ To enable one or more of these macros, just pass extra C compiler options to the
     ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
 
 
-[Back to TOC](#table-of-contents)
-
-Installation on Ubuntu 11.10
-----------------------------
-
-Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever possible.
-
-If the standard Lua 5.1 interpreter is required however, run the following command to install it from the Ubuntu repository:
-
-```bash
-
- 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.
-
-```bash
-
- ln -s /usr/lib/x86_64-linux-gnu/liblua5.1.so /usr/lib/liblua.so
-```
-
 [Back to TOC](#table-of-contents)
 
 Community
@@ -411,7 +391,7 @@ Lua/LuaJIT bytecode support
 
 As from the `v0.5.0rc32` release, all `*_by_lua_file` configure directives (such as [content_by_lua_file](#content_by_lua_file)) support loading Lua 5.1 and LuaJIT 2.0/2.1 raw bytecode files directly.
 
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if you are using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
 
 ```bash
 
@@ -431,20 +411,6 @@ Please refer to the official LuaJIT documentation on the `-b` option for more de
 
 Also, the bytecode files generated by LuaJIT 2.1 is *not* compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
 
-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:
-
-```bash
-
- 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:
-
-```bash
-
- 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/2.1 or vice versa, will result in an error message, such as that below, being logged into the Nginx `error.log` file:
 
 
@@ -642,8 +608,7 @@ This issue is due to limitations in the Nginx event model and only appears to af
 
 Lua Coroutine Yielding/Resuming
 -------------------------------
-* Because Lua's `dofile` and `require` builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by `dofile` or `require` invokes [ngx.location.capture*](#ngxlocationcapture), [ngx.exec](#ngxexec), [ngx.exit](#ngxexit), or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
-* As the standard Lua 5.1 interpreter's VM is not fully resumable, the methods [ngx.location.capture](#ngxlocationcapture), [ngx.location.capture_multi](#ngxlocationcapture_multi), [ngx.redirect](#ngxredirect), [ngx.exec](#ngxexec), and [ngx.exit](#ngxexit) 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) or even the first line of the `for ... in ...` statement 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.x, which supports a fully resumable VM, to avoid this.
+* Because Lua's `dofile` and `require` builtins are currently implemented as C functions in LuaJIT 2.0/2.1, if the Lua file being loaded by `dofile` or `require` invokes [ngx.location.capture*](#ngxlocationcapture), [ngx.exec](#ngxexec), [ngx.exit](#ngxexit), or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
 
 [Back to TOC](#table-of-contents)
 
@@ -995,7 +960,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2019, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -1039,6 +1004,7 @@ See Also
 Directives
 ==========
 
+* [lua_load_resty_core](#lua_load_resty_core)
 * [lua_capture_error_log](#lua_capture_error_log)
 * [lua_use_default_type](#lua_use_default_type)
 * [lua_malloc_trim](#lua_malloc_trim)
@@ -1104,6 +1070,7 @@ Directives
 * [lua_check_client_abort](#lua_check_client_abort)
 * [lua_max_pending_timers](#lua_max_pending_timers)
 * [lua_max_running_timers](#lua_max_running_timers)
+* [lua_sa_restart](#lua_sa_restart)
 
 
 The basic building blocks of scripting Nginx with Lua are directives. Directives are used to specify when the user Lua code is run and
@@ -1113,6 +1080,38 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 [Back to TOC](#table-of-contents)
 
+lua_load_resty_core
+-------------------
+
+**syntax:** *lua_load_resty_core on|off*
+
+**default:** *lua_load_resty_core on*
+
+**context:** *http*
+
+Controls whether the `resty.core` module (from
+[lua-resty-core](https://github.com/openresty/lua-resty-core)) should be loaded
+or not. When enabled, this directive is equivalent to executing the following
+when the Lua VM is created:
+
+```lua
+
+ require "resty.core"
+```
+
+Note that usage of the `resty.core` module is recommended, as its
+FFI implementation is both faster, safer, and more complete than the Lua C API
+of the ngx_lua module.
+
+It must also be noted that the Lua C API of the ngx_lua module will eventually
+be removed, and usage of the FFI-based API (i.e. the `resty.core`
+module) will become mandatory. This directive only aims at providing a
+temporary backwards-compatibility mode in case of edge-cases.
+
+This directive was first introduced in the `v0.10.15` release.
+
+[Back to TOC](#directives)
+
 lua_capture_error_log
 ---------------------
 **syntax:** *lua_capture_error_log size*
@@ -2602,14 +2601,14 @@ SSL session resumption can then get immediately initiated and bypass the full SS
 Please note that TLS session tickets are very different and it is the clients' responsibility
 to cache the SSL session state when session tickets are used. SSL session resumptions based on
 TLS session tickets would happen automatically without going through this hook (nor the
-[ssl_session_store_by_lua_block](#ssl_session_store_by_lua) hook). This hook is mainly
+[ssl_session_store_by_lua*](#ssl_session_store_by_lua_block) hook). This hook is mainly
 for older or less capable SSL clients that can only do SSL sessions by session IDs.
 
 When [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block) is specified at the same time,
 this hook usually runs before [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
 When the SSL session is found and successfully loaded for the current SSL connection,
 SSL session resumption will happen and thus bypass the [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block)
-hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua_block](#ssl_session_store_by_lua)
+hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block)
 hook, for obvious reasons.
 
 To easily test this hook locally with a modern web browser, you can temporarily put the following line
@@ -3108,6 +3107,23 @@ This directive was first introduced in the `v0.8.0` release.
 
 [Back to TOC](#directives)
 
+lua_sa_restart
+--------------
+
+**syntax:** *lua_sa_restart on|off*
+
+**default:** *lua_sa_restart on*
+
+**context:** *http*
+
+When enabled, this module will set the `SA_RESTART` flag on nginx workers signal dispositions.
+
+This allows Lua I/O primitives to not be interrupted by nginx's handling of various signals.
+
+This directive was first introduced in the `v0.10.14` release.
+
+[Back to TOC](#directives)
+
 Nginx API for Lua
 =================
 
@@ -3221,6 +3237,7 @@ Nginx API for Lua
 * [tcpsock:sslhandshake](#tcpsocksslhandshake)
 * [tcpsock:send](#tcpsocksend)
 * [tcpsock:receive](#tcpsockreceive)
+* [tcpsock:receiveany](#tcpsockreceiveany)
 * [tcpsock:receiveuntil](#tcpsockreceiveuntil)
 * [tcpsock:close](#tcpsockclose)
 * [tcpsock:settimeout](#tcpsocksettimeout)
@@ -4302,7 +4319,7 @@ ngx.req.get_method
 ------------------
 **syntax:** *method_name = ngx.req.get_method()*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, balancer_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, balancer_by_lua&#42;, log_by_lua&#42;*
 
 Retrieves the current request's request method name. Strings like `"GET"` and `"POST"` are returned instead of numerical [method constants](#http-method-constants).
 
@@ -4887,7 +4904,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](#ngxreqread_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 not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn 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](#ngxreqget_body_file) function instead.
 
@@ -4911,7 +4928,7 @@ Retrieves the file name for the in-file request body data. Returns `nil` if the
 
 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](#ngxreqread_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 not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn 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](#ngxreqget_body_data) function instead.
 
@@ -4931,7 +4948,9 @@ ngx.req.set_body_data
 
 Set the current request's request body using the in-memory data specified by the `data` argument.
 
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
+If the request body has not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn on [lua_need_request_body](#lua_need_request_body) to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [ngx.req.discard_body](#ngxreqdiscard_body).
+
+Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the `v0.3.1rc18` release.
 
@@ -4947,11 +4966,13 @@ 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 request body has not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn on [lua_need_request_body](#lua_need_request_body) to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [ngx.req.discard_body](#ngxreqdiscard_body).
+
 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](#ngxreqset_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.
 
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
+Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the `v0.3.1rc18` release.
 
@@ -6717,7 +6738,7 @@ ngx.shared.DICT.flush_expired
 
 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.
 
-Unlike the [flush_all](#ngxshareddictflush_all) method, this method actually free up the memory used by the expired items.
+Unlike the [flush_all](#ngxshareddictflush_all) method, this method actually frees up the memory used by the expired items.
 
 This feature was first introduced in the `v0.6.3` release.
 
@@ -7002,6 +7023,7 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [settimeout](#tcpsocksettimeout)
 * [settimeouts](#tcpsocksettimeouts)
 * [setoption](#tcpsocksetoption)
+* [receiveany](#tcpsockreceiveany)
 * [receiveuntil](#tcpsockreceiveuntil)
 * [setkeepalive](#tcpsocksetkeepalive)
 * [getreusedtimes](#tcpsockgetreusedtimes)
@@ -7106,6 +7128,43 @@ An optional Lua table can be specified as the last argument to this method to sp
 * `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>"`.
 
+* `pool_size`
+	specify the size of the connection pool. If omitted and no
+	`backlog` option was provided, no pool will be created. If omitted
+	but `backlog` was provided, the pool will be created with a default
+	size equal to the value of the [lua_socket_pool_size](#lua_socket_pool_size)
+	directive.
+	The connection pool holds up to `pool_size` alive connections
+	ready to be reused by subsequent calls to [connect](#tcpsockconnect), but
+	note that there is no upper limit to the total number of opened connections
+	outside of the pool. If you need to restrict the total number of opened
+	connections, specify the `backlog` option.
+	When the connection pool would exceed its size limit, the least recently used
+	(kept-alive) 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. Also note that the size of the connection
+	pool cannot be changed once it has been created.
+	This option was first introduced in the `v0.10.14` release.
+
+* `backlog`
+	if specified, this module will limit the total number of opened connections
+	for this pool. No more connections than `pool_size` can be opened
+	for this pool at any time. If the connection pool is full, subsequent
+	connect operations will be queued into a queue equal to this option's
+	value (the "backlog" queue).
+	If the number of queued connect operations is equal to `backlog`,
+	subsequent connect operations will fail and return `nil` plus the
+	error string `"too many waiting connect operations"`.
+	The queued connect operations will be resumed once the number of connections
+	in the pool is less than `pool_size`.
+	The queued connect operation will abort once they have been queued for more
+	than `connect_timeout`, controlled by
+	[settimeouts](#tcpsocksettimeouts), and will return `nil` plus
+	the error string `"timeout"`.
+	This option was first introduced in the `v0.10.14` release.
+
 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.
@@ -7231,6 +7290,40 @@ This feature was first introduced in the `v0.5.0rc1` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
+tcpsock:receiveany
+------------------
+**syntax:** *data, err = tcpsock:receiveany(max)*
+
+**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
+
+Returns any data received by the connected socket, at most `max` bytes.
+
+This method is a synchronous operation just like the [send](#tcpsocksend) method 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 received data is more than this size, this method will return with exactly this size of data.
+The remaining data in the underlying receive buffer could be returned in the next reading operation.
+
+Timeout for the reading operation is controlled by the [lua_socket_read_timeout](#lua_socket_read_timeout) config directive and the [settimeouts](#tcpsocksettimeouts) method. And the latter takes priority. For example:
+
+```lua
+
+ sock:settimeouts(1000, 1000, 1000)  -- one second timeout for connect/read/write
+ local data, err = sock:receiveany(10 * 1024 * 1024) -- read any data, at most 10K
+ if not data then
+     ngx.say("failed to read any data: ", err)
+     return
+ end
+ ngx.say("successfully read: ", data)
+```
+
+This method doesn't automatically close the current connection when the read timeout error occurs. For other connection errors, this method always automatically closes the connection.
+
+This feature was first introduced in the `v0.10.14` release.
+
+[Back to TOC](#nginx-api-for-lua)
+
 tcpsock:receiveuntil
 --------------------
 **syntax:** *iterator = tcpsock:receiveuntil(pattern, options?)*
@@ -7403,13 +7496,31 @@ Puts the current socket's connection immediately into the cosocket built-in conn
 
 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](#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](#lua_socket_pool_size) config directive will be used.
-
-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.
-
-Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
+The second optional argument `size` is considered deprecated since
+the `v0.10.14` release of this module, in favor of the
+`pool_size` option of the [connect](#tcpsockconnect) method.
+Since the `v0.10.14` release, this option will only take effect if
+the call to [connect](#tcpsockconnect) did not already create a connection
+pool.
+When this option takes effect (no connection pool was previously created by
+[connect](#tcpsockconnect)), it will specify the size of the connection pool,
+and create it.
+If omitted (and no pool was previously created), the default size is the value
+of the [lua_socket_pool_size](#lua_socket_pool_size) directive.
+The connection pool holds up to `size` alive connections ready to be
+reused by subsequent calls to [connect](#tcpsockconnect), but note that there
+is no upper limit to the total number of opened connections outside of the
+pool.
+When the connection pool would exceed its size limit, the least recently used
+(kept-alive) 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. Also note that the size of the connection
+pool cannot be changed once it has been created.
+If you need to restrict the total number of opened connections, specify both
+the `pool_size` and `backlog` option in the call to
+[connect](#tcpsockconnect).
 
 In case of success, this method returns `1`; otherwise, it returns `nil` and a string describing the error.
 
@@ -8181,7 +8292,7 @@ This Lua module does not ship with this ngx_lua module itself rather it is shipp
 the
 [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
 
-Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md)
+Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md)
 for this `ngx.ocsp` Lua module for more details.
 
 This feature requires at least ngx_lua `v0.10.0`.
diff --git a/debian/modules/http-lua/config b/debian/modules/http-lua/config
index 044deb9..e1d5e35 100644
--- a/debian/modules/http-lua/config
+++ b/debian/modules/http-lua/config
@@ -361,6 +361,8 @@ HTTP_LUA_SRCS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.c \
             $ngx_addon_dir/src/ngx_http_lua_ssl.c \
             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.c \
+            $ngx_addon_dir/src/ngx_http_lua_input_filters.c \
+            $ngx_addon_dir/src/ngx_http_lua_pipe.c \
             "
 
 HTTP_LUA_DEPS=" \
@@ -422,6 +424,8 @@ HTTP_LUA_DEPS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.h \
             $ngx_addon_dir/src/ngx_http_lua_ssl.h \
             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.h \
+            $ngx_addon_dir/src/ngx_http_lua_input_filters.h \
+            $ngx_addon_dir/src/ngx_http_lua_pipe.h \
             "
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
@@ -474,6 +478,17 @@ ngx_feature_test='setsockopt(1, SOL_SOCKET, SO_PASSCRED, NULL, 0);'
 
 . auto/feature
 
+ngx_feature="SA_RESTART"
+ngx_feature_libs=
+ngx_feature_name="NGX_HTTP_LUA_HAVE_SA_RESTART"
+ngx_feature_run=no
+ngx_feature_incs="#include <signal.h>"
+ngx_feature_path=
+ngx_feature_test='struct sigaction act;
+                  act.sa_flags |= SA_RESTART;'
+
+. auto/feature
+
 ngx_feature="__attribute__(constructor)"
 ngx_feature_libs=
 ngx_feature_name="NGX_HTTP_LUA_HAVE_CONSTRUCTOR"
@@ -512,6 +527,36 @@ CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
 
 # ----------------------------------------
 
+ngx_feature="pipe2"
+ngx_feature_libs=
+ngx_feature_name="NGX_HTTP_LUA_HAVE_PIPE2"
+ngx_feature_run=no
+ngx_feature_incs="#include <fcntl.h>"
+ngx_feature_test="int fd[2]; pipe2(fd, O_CLOEXEC|O_NONBLOCK);"
+SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
+
+. auto/feature
+
+CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+
+# ----------------------------------------
+
+ngx_feature="signalfd"
+ngx_feature_libs=
+ngx_feature_name="NGX_HTTP_LUA_HAVE_SIGNALFD"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/signalfd.h>"
+ngx_feature_test="sigset_t set; signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);"
+SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
+
+. auto/feature
+
+CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+
+# ----------------------------------------
+
 if test -n "$ngx_module_link"; then
     ngx_module_type=HTTP_AUX_FILTER
     ngx_module_name=$ngx_addon_name
diff --git a/debian/modules/http-lua/doc/HttpLuaModule.wiki b/debian/modules/http-lua/doc/HttpLuaModule.wiki
index e3c61e2..ff9b269 100644
--- a/debian/modules/http-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/http-lua/doc/HttpLuaModule.wiki
@@ -2,6 +2,8 @@
 
 ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
+This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
+
 ''This module is not distributed with the Nginx source.'' See [[#Installation|the installation instructions]].
 
 = Status =
@@ -10,7 +12,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.13] released on 22 April 2018.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.15] released on March 14th, 2019.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -130,7 +132,9 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
 
 = Description =
 
-This module embeds Lua, via the standard Lua 5.1 interpreter or [http://luajit.org/luajit.html LuaJIT 2.0/2.1], 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 is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
+
+This module embeds Lua, via [http://luajit.org/luajit.html LuaJIT 2.0/2.1], into Nginx and by leveraging Nginx's subrequests, allows the integration of the powerful Lua threads (Lua coroutines) into the Nginx event model.
 
 Unlike [https://httpd.apache.org/docs/trunk/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.
@@ -199,11 +203,11 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 
 = Installation =
 
-It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
+It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, OpenResty's LuaJIT 2.1 branch version, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-# Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is ''not'' supported yet). LuaJIT can be downloaded from the [http://luajit.org/download.html 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.
+# LuaJIT can be downloaded from the [https://github.com/openresty/luajit2/releases latest release of OpenResty's LuaJIT branch version]. The official LuaJIT 2.0 and 2.1 releases are also supported, although the performance will be significantly lower in many cases.
 # Download the latest version of the ngx_devel_kit (NDK) module [https://github.com/simplresty/ngx_devel_kit/tags HERE].
 # Download the latest version of ngx_lua [https://github.com/openresty/lua-nginx-module/tags HERE].
 # Download the latest version of Nginx [http://nginx.org/ HERE] (See [[#Nginx Compatibility|Nginx Compatibility]])
@@ -271,24 +275,6 @@ To enable one or more of these macros, just pass extra C compiler options to the
     ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
 </geshi>
 
-== Installation on Ubuntu 11.10 ==
-
-Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever 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 ==
@@ -314,7 +300,7 @@ Please submit bug reports, wishlists, or patches by
 
 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/2.1 raw bytecode files directly.
 
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if you are using LuaJIT 2.0/2.1 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.ljbc
@@ -332,18 +318,6 @@ http://luajit.org/running.html#opt_b
 
 Also, the bytecode files generated by LuaJIT 2.1 is ''not'' compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
 
-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/2.1 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">
@@ -510,8 +484,7 @@ However, later attempts to manipulate the cosocket object will fail and return t
 This issue is due to limitations in the Nginx event model and only appears to affect Mac OS X.
 
 == Lua Coroutine Yielding/Resuming ==
-* Because Lua's <code>dofile</code> and <code>require</code> builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by <code>dofile</code> or <code>require</code> invokes [[#ngx.location.capture|ngx.location.capture*]], [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]], or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
-* 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()] or even the first line of the <code>for ... in ...</code> statement 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.x, which supports a fully resumable VM, to avoid this.
+* Because Lua's <code>dofile</code> and <code>require</code> builtins are currently implemented as C functions in LuaJIT 2.0/2.1, if the Lua file being loaded by <code>dofile</code> or <code>require</code> invokes [[#ngx.location.capture|ngx.location.capture*]], [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]], or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
 
 == Lua Variable Scope ==
 Care must be taken when importing modules and this form should be used:
@@ -817,7 +790,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2019, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -862,6 +835,34 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 ![Lua Nginx Modules Directives](https://cloud.githubusercontent.com/assets/2137369/15272097/77d1c09e-1a37-11e6-97ef-d9767035fc3e.png)
 
+== lua_load_resty_core ==
+
+'''syntax:''' ''lua_load_resty_core on|off''
+
+'''default:''' ''lua_load_resty_core on''
+
+'''context:''' ''http''
+
+Controls whether the <code>resty.core</code> module (from
+[https://github.com/openresty/lua-resty-core lua-resty-core]) should be loaded
+or not. When enabled, this directive is equivalent to executing the following
+when the Lua VM is created:
+
+<geshi lang="lua">
+    require "resty.core"
+</geshi>
+
+Note that usage of the <code>resty.core</code> module is recommended, as its
+FFI implementation is both faster, safer, and more complete than the Lua C API
+of the ngx_lua module.
+
+It must also be noted that the Lua C API of the ngx_lua module will eventually
+be removed, and usage of the FFI-based API (i.e. the <code>resty.core</code>
+module) will become mandatory. This directive only aims at providing a
+temporary backwards-compatibility mode in case of edge-cases.
+
+This directive was first introduced in the <code>v0.10.15</code> release.
+
 == lua_capture_error_log ==
 '''syntax:''' ''lua_capture_error_log size''
 
@@ -2196,14 +2197,14 @@ SSL session resumption can then get immediately initiated and bypass the full SS
 Please note that TLS session tickets are very different and it is the clients' responsibility
 to cache the SSL session state when session tickets are used. SSL session resumptions based on
 TLS session tickets would happen automatically without going through this hook (nor the
-[[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]] hook). This hook is mainly
+[[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]] hook). This hook is mainly
 for older or less capable SSL clients that can only do SSL sessions by session IDs.
 
 When [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]] is specified at the same time,
 this hook usually runs before [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]].
 When the SSL session is found and successfully loaded for the current SSL connection,
 SSL session resumption will happen and thus bypass the [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]]
-hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]]
+hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]]
 hook, for obvious reasons.
 
 To easily test this hook locally with a modern web browser, you can temporarily put the following line
@@ -2626,6 +2627,20 @@ When exceeding this limit, Nginx will stop running the callbacks of newly expire
 
 This directive was first introduced in the <code>v0.8.0</code> release.
 
+== lua_sa_restart ==
+
+'''syntax:''' ''lua_sa_restart on|off''
+
+'''default:''' ''lua_sa_restart on''
+
+'''context:''' ''http''
+
+When enabled, this module will set the `SA_RESTART` flag on nginx workers signal dispositions.
+
+This allows Lua I/O primitives to not be interrupted by nginx's handling of various signals.
+
+This directive was first introduced in the <code>v0.10.14</code> release.
+
 = Nginx API for Lua =
 
 <!-- inline-toc -->
@@ -3563,7 +3578,7 @@ This method does not work in HTTP/2 requests yet.
 == 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*, balancer_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, balancer_by_lua*, log_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]].
 
@@ -4071,7 +4086,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. This is not recommended however).
+If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn 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.
 
@@ -4092,7 +4107,7 @@ Retrieves the file name for the in-file request body data. Returns <code>nil</co
 
 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. This is not recommended however).
+If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn 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.
 
@@ -4109,7 +4124,9 @@ See also [[#ngx.req.get_body_data|ngx.req.get_body_data]].
 
 Set the current request's request body using the in-memory data specified by the <code>data</code> argument.
 
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
+If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [[#ngx.req.discard_body|ngx.req.discard_body]].
+
+Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the <code>v0.3.1rc18</code> release.
 
@@ -4122,11 +4139,13 @@ 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 request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [[#ngx.req.discard_body|ngx.req.discard_body]].
+
 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.
 
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
+Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the <code>v0.3.1rc18</code> release.
 
@@ -5648,7 +5667,7 @@ See also [[#ngx.shared.DICT.flush_expired|ngx.shared.DICT.flush_expired]] and [[
 
 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.
 
-Unlike the [[#ngx.shared.DICT.flush_all|flush_all]] method, this method actually free up the memory used by the expired items.
+Unlike the [[#ngx.shared.DICT.flush_all|flush_all]] method, this method actually frees up the memory used by the expired items.
 
 This feature was first introduced in the <code>v0.6.3</code> release.
 
@@ -5894,6 +5913,7 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [[#tcpsock:settimeout|settimeout]]
 * [[#tcpsock:settimeouts|settimeouts]]
 * [[#tcpsock:setoption|setoption]]
+* [[#tcpsock:receiveany|receiveany]]
 * [[#tcpsock:receiveuntil|receiveuntil]]
 * [[#tcpsock:setkeepalive|setkeepalive]]
 * [[#tcpsock:getreusedtimes|getreusedtimes]]
@@ -5991,6 +6011,43 @@ An optional Lua table can be specified as the last argument to this method to sp
 * <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>.
 
+* <code>pool_size</code>
+: specify the size of the connection pool. If omitted and no
+: <code>backlog</code> option was provided, no pool will be created. If omitted
+: but <code>backlog</code> was provided, the pool will be created with a default
+: size equal to the value of the [[#lua_socket_pool_size|lua_socket_pool_size]]
+: directive.
+: The connection pool holds up to <code>pool_size</code> alive connections
+: ready to be reused by subsequent calls to [[#tcpsock:connect|connect]], but
+: note that there is no upper limit to the total number of opened connections
+: outside of the pool. If you need to restrict the total number of opened
+: connections, specify the <code>backlog</code> option.
+: When the connection pool would exceed its size limit, the least recently used
+: (kept-alive) 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. Also note that the size of the connection
+: pool cannot be changed once it has been created.
+: This option was first introduced in the <code>v0.10.14</code> release.
+
+* <code>backlog</code>
+: if specified, this module will limit the total number of opened connections
+: for this pool. No more connections than <code>pool_size</code> can be opened
+: for this pool at any time. If the connection pool is full, subsequent
+: connect operations will be queued into a queue equal to this option's
+: value (the "backlog" queue).
+: If the number of queued connect operations is equal to <code>backlog</code>,
+: subsequent connect operations will fail and return <code>nil</code> plus the
+: error string <code>"too many waiting connect operations"</code>.
+: The queued connect operations will be resumed once the number of connections
+: in the pool is less than <code>pool_size</code>.
+: The queued connect operation will abort once they have been queued for more
+: than <code>connect_timeout</code>, controlled by
+: [[#tcpsock:settimeouts|settimeouts]], and will return <code>nil</code> plus
+: the error string <code>"timeout"</code>.
+: This option was first introduced in the <code>v0.10.14</code> release.
+
 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.
@@ -6103,6 +6160,36 @@ Since the <code>v0.8.8</code> release, this method no longer automatically close
 
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
+== tcpsock:receiveany ==
+'''syntax:''' ''data, err = tcpsock:receiveany(max)''
+
+'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
+
+Returns any data received by the connected socket, at most <code>max</code> bytes.
+
+This method is a synchronous operation just like the [[#tcpsock:send|send]] method 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 received data is more than this size, this method will return with exactly this size of data.
+The remaining data in the underlying receive buffer could be returned in the next reading operation.
+
+Timeout for the reading operation is controlled by the [[#lua_socket_read_timeout|lua_socket_read_timeout]] config directive and the [[#tcpsock:settimeouts|settimeouts]] method. And the latter takes priority. For example:
+
+<geshi lang="lua">
+    sock:settimeouts(1000, 1000, 1000)  -- one second timeout for connect/read/write
+    local data, err = sock:receiveany(10 * 1024 * 1024) -- read any data, at most 10K
+    if not data then
+        ngx.say("failed to read any data: ", err)
+        return
+    end
+    ngx.say("successfully read: ", data)
+</geshi>
+
+This method doesn't automatically close the current connection when the read timeout error occurs. For other connection errors, this method always automatically closes the connection.
+
+This feature was first introduced in the <code>v0.10.14</code> release.
+
 == tcpsock:receiveuntil ==
 '''syntax:''' ''iterator = tcpsock:receiveuntil(pattern, options?)''
 
@@ -6255,13 +6342,31 @@ Puts the current socket's connection immediately into the cosocket built-in conn
 
 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 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.
-
-Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
+The second optional argument <code>size</code> is considered deprecated since
+the <code>v0.10.14</code> release of this module, in favor of the
+<code>pool_size</code> option of the [[#tcpsock:connect|connect]] method.
+Since the <code>v0.10.14</code> release, this option will only take effect if
+the call to [[#tcpsock:connect|connect]] did not already create a connection
+pool.
+When this option takes effect (no connection pool was previously created by
+[[#tcpsock:connect|connect]]), it will specify the size of the connection pool,
+and create it.
+If omitted (and no pool was previously created), the default size is the value
+of the [[#lua_socket_pool_size|lua_socket_pool_size]] directive.
+The connection pool holds up to <code>size</code> alive connections ready to be
+reused by subsequent calls to [[#tcpsock:connect|connect]], but note that there
+is no upper limit to the total number of opened connections outside of the
+pool.
+When the connection pool would exceed its size limit, the least recently used
+(kept-alive) 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. Also note that the size of the connection
+pool cannot be changed once it has been created.
+If you need to restrict the total number of opened connections, specify both
+the <code>pool_size</code> and <code>backlog</code> option in the call to
+[[#tcpsock:connect|connect]].
 
 In case of success, this method returns <code>1</code>; otherwise, it returns <code>nil</code> and a string describing the error.
 
@@ -6950,7 +7055,7 @@ This Lua module does not ship with this ngx_lua module itself rather it is shipp
 the
 [https://github.com/openresty/lua-resty-core lua-resty-core] library.
 
-Please refer to the [https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md documentation]
+Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md documentation]
 for this <code>ngx.ocsp</code> Lua module for more details.
 
 This feature requires at least ngx_lua <code>v0.10.0</code>.
diff --git a/debian/modules/http-lua/src/api/ngx_http_lua_api.h b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
index c7c0e6b..129eb99 100644
--- a/debian/modules/http-lua/src/api/ngx_http_lua_api.h
+++ b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10013
+#define ngx_http_lua_version  10015
 
 
 typedef struct {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_accessby.c b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
index 56bf0fa..d3fe294 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_accessby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
@@ -60,7 +60,7 @@ ngx_http_lua_access_handler(ngx_http_request_t *r)
 #endif
 
         if (cur_ph < last_ph) {
-            dd("swaping the contents of cur_ph and last_ph...");
+            dd("swapping the contents of cur_ph and last_ph...");
 
             tmp = *cur_ph;
 
@@ -261,9 +261,11 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_api.c b/debian/modules/http-lua/src/ngx_http_lua_api.c
index 7b590e7..ac014f2 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_api.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_api.c
@@ -195,7 +195,7 @@ ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
     lmcf->shm_zones_inited++;
 
     if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
-        && lmcf->init_handler)
+        && lmcf->init_handler && !ngx_test_config)
     {
         saved_cycle = ngx_cycle;
         ngx_cycle = ctx->cycle;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_balancer.c b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
index fdf2af3..3ecd592 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
@@ -362,6 +362,8 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     /* init nginx context in Lua VM */
     ngx_http_lua_set_req(L, r);
+
+#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ make new env inheriting main thread's globals table */
@@ -372,6 +374,7 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif /* OPENRESTY_LUAJIT */
 
     lua_pushcfunction(L, ngx_http_lua_traceback);
     lua_insert(L, 1);  /* put it under chunk and args */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
index 2b3c38f..f3af14c 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
@@ -32,10 +32,6 @@ static void ngx_http_lua_body_filter_by_lua_env(lua_State *L,
 static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
 
 
-/* key for the ngx_chain_t *in pointer in the Lua thread */
-#define ngx_http_lua_chain_key  "__ngx_cl"
-
-
 /**
  * Set environment table for the given code closure.
  *
@@ -51,12 +47,14 @@ 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 */
+    ngx_http_lua_main_conf_t    *lmcf;
+
     ngx_http_lua_set_req(L, r);
 
-    lua_pushlightuserdata(L, in);
-    lua_setglobal(L, ngx_http_lua_chain_key);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    lmcf->body_filter_chain = in;
 
+#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -79,6 +77,7 @@ ngx_http_lua_body_filter_by_lua_env(lua_State *L, ngx_http_request_t *r,
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif /* OPENRESTY_LUAJIT */
 }
 
 
@@ -236,8 +235,8 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_int_t                    rc;
     uint16_t                     old_context;
     ngx_http_cleanup_t          *cln;
-    lua_State                   *L;
     ngx_chain_t                 *out;
+    ngx_http_lua_main_conf_t    *lmcf;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua body filter for user lua code, uri \"%V\"", &r->uri);
@@ -299,11 +298,8 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return NGX_ERROR;
     }
 
-    L = ngx_http_lua_get_lua_vm(r, ctx);
-
-    lua_getglobal(L, ngx_http_lua_chain_key);
-    out = lua_touserdata(L, -1);
-    lua_pop(L, 1);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    out = lmcf->body_filter_chain;
 
     if (in == out) {
         return ngx_http_next_body_filter(r, in);
@@ -345,7 +341,7 @@ ngx_http_lua_body_filter_init(void)
 
 
 int
-ngx_http_lua_body_filter_param_get(lua_State *L)
+ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
 {
     u_char              *data, *p;
     size_t               size;
@@ -354,6 +350,8 @@ ngx_http_lua_body_filter_param_get(lua_State *L)
     int                  idx;
     ngx_chain_t         *in;
 
+    ngx_http_lua_main_conf_t    *lmcf;
+
     idx = luaL_checkint(L, 2);
 
     dd("index: %d", idx);
@@ -363,8 +361,8 @@ ngx_http_lua_body_filter_param_get(lua_State *L)
         return 1;
     }
 
-    lua_getglobal(L, ngx_http_lua_chain_key);
-    in = lua_touserdata(L, -1);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    in = lmcf->body_filter_chain;
 
     if (idx == 2) {
         /* asking for the eof argument */
@@ -442,6 +440,8 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     ngx_chain_t             *cl;
     ngx_chain_t             *in;
 
+    ngx_http_lua_main_conf_t    *lmcf;
+
     idx = luaL_checkint(L, 2);
 
     dd("index: %d", idx);
@@ -450,13 +450,13 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
         return luaL_error(L, "bad index: %d", idx);
     }
 
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
     if (idx == 2) {
         /* overwriting the eof flag */
         last = lua_toboolean(L, 3);
 
-        lua_getglobal(L, ngx_http_lua_chain_key);
-        in = lua_touserdata(L, -1);
-        lua_pop(L, 1);
+        in = lmcf->body_filter_chain;
 
         if (last) {
             ctx->seen_last_in_filter = 1;
@@ -521,9 +521,7 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     case LUA_TNIL:
         /* discard the buffers */
 
-        lua_getglobal(L, ngx_http_lua_chain_key); /* key val */
-        in = lua_touserdata(L, -1);
-        lua_pop(L, 1);
+        in = lmcf->body_filter_chain;
 
         last = 0;
 
@@ -557,9 +555,7 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
                           lua_typename(L, type));
     }
 
-    lua_getglobal(L, ngx_http_lua_chain_key);
-    in = lua_touserdata(L, -1);
-    lua_pop(L, 1);
+    in = lmcf->body_filter_chain;
 
     last = 0;
 
@@ -625,8 +621,8 @@ done:
         }
     }
 
-    lua_pushlightuserdata(L, cl);
-    lua_setglobal(L, ngx_http_lua_chain_key);
+    lmcf->body_filter_chain = cl;
+
     return 0;
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
index 6a4b306..b108202 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
@@ -21,7 +21,7 @@ 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_get(lua_State *L, ngx_http_request_t *r);
 int ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     ngx_http_lua_ctx_t *ctx);
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_cache.c b/debian/modules/http-lua/src/ngx_http_lua_cache.c
index 5ea3069..5b29527 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_cache.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_cache.c
@@ -35,11 +35,14 @@ static ngx_int_t
 ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
     const char *key)
 {
+#ifndef OPENRESTY_LUAJIT
     int          rc;
     u_char      *err;
+#endif
 
     /*  get code cache table */
-    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          code_cache_key));
     lua_rawget(L, LUA_REGISTRYINDEX);    /*  sp++ */
 
     dd("Code cache table to load: %p", lua_topointer(L, -1));
@@ -52,6 +55,10 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
     lua_getfield(L, -1, key);    /*  sp++ */
 
     if (lua_isfunction(L, -1)) {
+#ifdef OPENRESTY_LUAJIT
+        lua_remove(L, -2);   /*  sp-- */
+        return NGX_OK;
+#else
         /*  call closure factory to gen new closure */
         rc = lua_pcall(L, 0, 1, 0);
         if (rc == 0) {
@@ -73,6 +80,7 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
                       key, err);
         lua_pop(L, 2);
         return NGX_ERROR;
+#endif /* OPENRESTY_LUAJIT */
     }
 
     dd("Value associated with given key in code cache table is not code "
@@ -102,10 +110,13 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
 static ngx_int_t
 ngx_http_lua_cache_store_code(lua_State *L, const char *key)
 {
+#ifndef OPENRESTY_LUAJIT
     int rc;
+#endif
 
     /*  get code cache table */
-    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          code_cache_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     dd("Code cache table to store: %p", lua_topointer(L, -1));
@@ -121,12 +132,14 @@ ngx_http_lua_cache_store_code(lua_State *L, const char *key)
     /*  remove cache table, leave closure factory at top of stack */
     lua_pop(L, 1); /* closure */
 
+#ifndef OPENRESTY_LUAJIT
     /*  call closure factory to generate new closure */
     rc = lua_pcall(L, 0, 1, 0);
     if (rc != 0) {
         dd("Error: failed to call closure factory!!");
         return NGX_ERROR;
     }
+#endif
 
     return NGX_OK;
 }
@@ -143,7 +156,8 @@ ngx_http_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
 
     n = lua_gettop(L);
 
-    dd("XXX cache key: [%s]", cache_key);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
+                   "looking up Lua code cache with key '%s'", cache_key);
 
     rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
@@ -227,7 +241,8 @@ ngx_http_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
         dd("CACHE file key already pre-calculated");
     }
 
-    dd("XXX cache key for file: [%s]", cache_key);
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
+                   "looking up Lua code cache with key '%s'", cache_key);
 
     rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
index 041f046..754ed8d 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
@@ -15,11 +15,13 @@
 #include "ngx_http_lua_clfactory.h"
 
 
+#ifndef OPENRESTY_LUAJIT
 #define CLFACTORY_BEGIN_CODE "return function() "
 #define CLFACTORY_BEGIN_SIZE (sizeof(CLFACTORY_BEGIN_CODE) - 1)
 
 #define CLFACTORY_END_CODE "\nend"
 #define CLFACTORY_END_SIZE (sizeof(CLFACTORY_END_CODE) - 1)
+#endif
 
 
 /*
@@ -59,6 +61,7 @@
  * length(Instruction) = 4 or 8
  * little endian or big endian
 */
+#ifndef OPENRESTY_LUAJIT
 #define    LUA_LITTLE_ENDIAN_4BYTES_CODE                                     \
     "\x24\x00\x00\x00\x1e\x00\x00\x01\x1e\x00\x80\x00"
 #define    LUA_LITTLE_ENDIAN_8BYTES_CODE                                     \
@@ -75,6 +78,7 @@
 #define    LUA_BIG_ENDIAN_8BYTES_CODE_LEN           (8 + 8 + 8)
 #define    LUAC_HEADERSIZE         12
 #define    LUAC_VERSION            0x51
+#endif /* OPENRESTY_LUAJIT */
 
 
 /*
@@ -147,6 +151,7 @@
  * ---------------------
 */
 
+#ifndef OPENRESTY_LUAJIT
 #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))
@@ -160,6 +165,7 @@
     (POS_BYTECODE + LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN                        \
     + sizeof(int) + sizeof(int))
 #define    MAX_END_CODE_SIZE       (sizeof(int) + sizeof(int) + sizeof(int))
+#endif /* OPENRESTY_LUAJIT */
 
 /*
  * taken from chaoslawful:
@@ -225,6 +231,7 @@
 
 /* bytecode for luajit 2.0 */
 
+#ifndef OPENRESTY_LUAJIT
 #define    LJ20_LITTLE_ENDIAN_CODE_STRIPPED                                  \
     "\x14\x03\x00\x01\x00\x01\x00\x03"                                       \
     "\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00"                       \
@@ -275,6 +282,7 @@
 #define    LJ21_BCDUMP_VERSION        2
 #define    LJ20_BCDUMP_VERSION        1
 #define    LJ_SIGNATURE             "\x1b\x4c\x4a"
+#endif /* OPENRESTY_LUAJIT */
 
 
 typedef enum {
@@ -292,10 +300,11 @@ enum {
 typedef struct {
     ngx_http_lua_clfactory_file_type_e file_type;
 
-    int         sent_begin;
-    int         sent_end;
     int         extraline;
     FILE       *f;
+#ifndef OPENRESTY_LUAJIT
+    int         sent_begin;
+    int         sent_end;
     size_t      begin_code_len;
     size_t      end_code_len;
     size_t      rest_len;
@@ -307,13 +316,16 @@ typedef struct {
         char   *ptr;
         char    str[MAX_END_CODE_SIZE];
     }           end_code;
+#endif /* OPENRESTY_LUAJIT */
     char        buff[NGX_LUA_READER_BUFSIZE];
 } ngx_http_lua_clfactory_file_ctx_t;
 
 
 typedef struct {
+#ifndef OPENRESTY_LUAJIT
     int         sent_begin;
     int         sent_end;
+#endif
     const char *s;
     size_t      size;
 } ngx_http_lua_clfactory_buffer_ctx_t;
@@ -325,9 +337,12 @@ static int ngx_http_lua_clfactory_errfile(lua_State *L, const char *what,
     int fname_index);
 static const char *ngx_http_lua_clfactory_getS(lua_State *L, void *ud,
     size_t *size);
+#ifndef OPENRESTY_LUAJIT
 static long ngx_http_lua_clfactory_file_size(FILE *f);
+#endif
 
 
+#ifndef OPENRESTY_LUAJIT
 int
 ngx_http_lua_clfactory_bytecode_prepare(lua_State *L,
     ngx_http_lua_clfactory_file_ctx_t *lf, int fname_index)
@@ -593,6 +608,7 @@ error:
 
     return LUA_ERRFILE;
 }
+#endif /* OPENRESTY_LUAJIT */
 
 
 ngx_int_t
@@ -612,10 +628,12 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
     lf.extraline = 0;
     lf.file_type = NGX_LUA_TEXT_FILE;
 
+#ifndef OPENRESTY_LUAJIT
     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;
+#endif
 
     lua_pushfstring(L, "@%s", filename);
 
@@ -683,20 +701,27 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
             /* skip eventual `#!...' */
         }
 
+#ifndef OPENRESTY_LUAJIT
         status = ngx_http_lua_clfactory_bytecode_prepare(L, &lf, fname_index);
 
         if (status != 0) {
             return status;
         }
+#endif
 
         lf.extraline = 0;
     }
 
+#ifndef OPENRESTY_LUAJIT
     if (lf.file_type == NGX_LUA_TEXT_FILE) {
         ungetc(c, lf.f);
     }
 
     lf.sent_begin = lf.sent_end = 0;
+
+#else
+    ungetc(c, lf.f);
+#endif
     status = lua_load(L, ngx_http_lua_clfactory_getF, &lf,
                       lua_tostring(L, -1));
 
@@ -725,8 +750,10 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 
     ls.s = buff;
     ls.size = size;
+#ifndef OPENRESTY_LUAJIT
     ls.sent_begin = 0;
     ls.sent_end = 0;
+#endif
 
     return lua_load(L, ngx_http_lua_clfactory_getS, &ls, name);
 }
@@ -735,7 +762,9 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 static const char *
 ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 {
+#ifndef OPENRESTY_LUAJIT
     char                        *buf;
+#endif
     size_t                       num;
 
     ngx_http_lua_clfactory_file_ctx_t        *lf;
@@ -748,6 +777,7 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
         return "\n";
     }
 
+#ifndef OPENRESTY_LUAJIT
     if (lf->sent_begin == 0) {
         lf->sent_begin = 1;
         *size = lf->begin_code_len;
@@ -761,12 +791,14 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 
         return buf;
     }
+#endif /* OPENRESTY_LUAJIT */
 
     num = fread(lf->buff, 1, sizeof(lf->buff), lf->f);
 
     dd("fread returned %d", (int) num);
 
     if (num == 0) {
+#ifndef OPENRESTY_LUAJIT
         if (lf->sent_end == 0) {
             lf->sent_end = 1;
             *size = lf->end_code_len;
@@ -780,11 +812,13 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 
             return buf;
         }
+#endif /* OPENRESTY_LUAJIT */
 
         *size = 0;
         return NULL;
     }
 
+#ifndef OPENRESTY_LUAJIT
     if (lf->file_type == NGX_LUA_BT_LJ) {
         /* skip the footer(\x00) in luajit */
 
@@ -800,6 +834,7 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
             }
         }
     }
+#endif /* OPENRESTY_LUAJIT */
 
     *size = num;
     return lf->buff;
@@ -833,19 +868,23 @@ ngx_http_lua_clfactory_getS(lua_State *L, void *ud, size_t *size)
 {
     ngx_http_lua_clfactory_buffer_ctx_t      *ls = ud;
 
+#ifndef OPENRESTY_LUAJIT
     if (ls->sent_begin == 0) {
         ls->sent_begin = 1;
         *size = CLFACTORY_BEGIN_SIZE;
 
         return CLFACTORY_BEGIN_CODE;
     }
+#endif
 
     if (ls->size == 0) {
+#ifndef OPENRESTY_LUAJIT
         if (ls->sent_end == 0) {
             ls->sent_end = 1;
             *size = CLFACTORY_END_SIZE;
             return CLFACTORY_END_CODE;
         }
+#endif
 
         return NULL;
     }
@@ -857,6 +896,7 @@ ngx_http_lua_clfactory_getS(lua_State *L, void *ud, size_t *size)
 }
 
 
+#ifndef OPENRESTY_LUAJIT
 static long
 ngx_http_lua_clfactory_file_size(FILE *f)
 {
@@ -882,6 +922,7 @@ ngx_http_lua_clfactory_file_size(FILE *f)
 
     return len;
 }
+#endif /* OPENRESTY_LUAJIT */
 
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_common.h b/debian/modules/http-lua/src/ngx_http_lua_common.h
index 01ef2be..dae5245 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_common.h
@@ -17,7 +17,7 @@
 #include <setjmp.h>
 #include <stdint.h>
 
-#include <lua.h>
+#include <luajit.h>
 #include <lualib.h>
 #include <lauxlib.h>
 
@@ -140,6 +140,15 @@ typedef struct {
 #endif
 
 
+#if (NGX_PTR_SIZE >= 8 && !defined(_WIN64))
+#define ngx_http_lua_lightudata_mask(ludata)                                 \
+    ((void *) ((uintptr_t) (&ngx_http_lua_##ludata) & ((1UL << 47) - 1)))
+
+#else
+#define ngx_http_lua_lightudata_mask(ludata)    (&ngx_http_lua_##ludata)
+#endif
+
+
 typedef struct ngx_http_lua_main_conf_s  ngx_http_lua_main_conf_t;
 typedef union ngx_http_lua_srv_conf_u  ngx_http_lua_srv_conf_t;
 
@@ -173,6 +182,8 @@ struct ngx_http_lua_main_conf_s {
     ngx_cycle_t         *cycle;
     ngx_pool_t          *pool;
 
+    ngx_flag_t           load_resty_core;
+
     ngx_int_t            max_pending_timers;
     ngx_int_t            pending_timers;
 
@@ -208,9 +219,31 @@ struct ngx_http_lua_main_conf_s {
     ngx_str_t                            init_worker_src;
 
     ngx_http_lua_balancer_peer_data_t      *balancer_peer_data;
-                    /* balancer_by_lua does not support yielding and
-                     * there cannot be any conflicts among concurrent requests,
-                     * thus it is safe to store the peer data in the main conf.
+                    /* neither yielding nor recursion is possible in
+                     * balancer_by_lua*, so there cannot be any races among
+                     * concurrent requests and it is safe to store the peer
+                     * data pointer in the main conf.
+                     */
+
+    ngx_chain_t                            *body_filter_chain;
+                    /* neither yielding nor recursion is possible in
+                     * body_filter_by_lua*, so there cannot be any races among
+                     * concurrent requests when storing the chain
+                     * data pointer in the main conf.
+                     */
+
+    ngx_http_variable_value_t              *setby_args;
+                    /* neither yielding nor recursion is possible in
+                     * set_by_lua*, so there cannot be any races among
+                     * concurrent requests when storing the args pointer
+                     * in the main conf.
+                     */
+
+    size_t                                  setby_nargs;
+                    /* neither yielding nor recursion is possible in
+                     * set_by_lua*, so there cannot be any races among
+                     * concurrent requests when storing the nargs in the
+                     * main conf.
                      */
 
     ngx_uint_t                      shm_zones_inited;
@@ -227,6 +260,10 @@ struct ngx_http_lua_main_conf_s {
     ngx_int_t            busy_buf_ptr_count;
 #endif
 
+    ngx_int_t            host_var_index;
+
+    ngx_flag_t           set_sa_restart;
+
     unsigned             requires_header_filter:1;
     unsigned             requires_body_filter:1;
     unsigned             requires_capture_filter:1;
@@ -444,7 +481,7 @@ typedef struct {
 
 
 typedef struct ngx_http_lua_ctx_s {
-    /* for lua_coce_cache off: */
+    /* for lua_code_cache off: */
     ngx_http_lua_vm_state_t  *vm_state;
 
     ngx_http_request_t      *request;
@@ -531,6 +568,8 @@ typedef struct ngx_http_lua_ctx_s {
 
     unsigned         headers_set:1; /* whether the user has set custom
                                        response headers */
+    unsigned         mime_set:1;    /* whether the user has set Content-Type
+                                       response header */
 
     unsigned         entered_rewrite_phase:1;
     unsigned         entered_access_phase:1;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_contentby.c b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
index ecd6c0e..274c9ad 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_contentby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
@@ -63,9 +63,11 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_control.c b/debian/modules/http-lua/src/ngx_http_lua_control.c
index 6ac2cbf..5cd1d64 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_control.c
@@ -432,7 +432,8 @@ ngx_http_lua_on_abort(lua_State *L)
 
     ngx_http_lua_coroutine_create_helper(L, r, ctx, &coctx);
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushvalue(L, -2);
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
index b790814..99a2423 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
@@ -104,11 +104,15 @@ ngx_http_lua_coroutine_create_helper(lua_State *L, ngx_http_request_t *r,
     coctx->co = co;
     coctx->co_status = NGX_HTTP_LUA_CO_SUSPENDED;
 
+#ifdef OPENRESTY_LUAJIT
+    ngx_http_lua_set_req(co, r);
+#else
     /* make new coroutine share globals of the parent coroutine.
      * NOTE: globals don't have to be separated! */
     ngx_http_lua_get_globals_table(L);
     lua_xmove(L, co, 1);
     ngx_http_lua_set_globals_table(co);
+#endif
 
     lua_xmove(vm, L, 1);    /* move coroutine from main thread to L */
 
@@ -288,15 +292,27 @@ ngx_http_lua_inject_coroutine_api(ngx_log_t *log, lua_State *L)
     {
         const char buf[] =
             "local keys = {'create', 'yield', 'resume', 'status'}\n"
+#ifdef OPENRESTY_LUAJIT
+            "local get_req = require 'thread.exdata'\n"
+#else
             "local getfenv = getfenv\n"
+#endif
             "for _, key in ipairs(keys) do\n"
                "local std = coroutine['_' .. key]\n"
                "local ours = coroutine['__' .. key]\n"
                "local raw_ctx = ngx._phase_ctx\n"
                "coroutine[key] = function (...)\n"
+#ifdef OPENRESTY_LUAJIT
+                    "local r = get_req()\n"
+#else
                     "local r = getfenv(0).__ngx_req\n"
-                    "if r then\n"
+#endif
+                    "if r ~= nil then\n"
+#ifdef OPENRESTY_LUAJIT
+                        "local ctx = raw_ctx()\n"
+#else
                         "local ctx = raw_ctx(r)\n"
+#endif
                         /* ignore header and body filters */
                         "if ctx ~= 0x020 and ctx ~= 0x040 then\n"
                             "return ours(...)\n"
diff --git a/debian/modules/http-lua/src/ngx_http_lua_directive.c b/debian/modules/http-lua/src/ngx_http_lua_directive.c
index fb8c6dc..a989c26 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_directive.c
@@ -1304,11 +1304,12 @@ ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
 
 found:
 
-    ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
-                 tag_len, tag, cf->conf_file->file.name.data
-                               + cf->conf_file->file.name.len - p,
-                 p, cf->conf_file->line);
-    *chunkname_len = len;
+    p = ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
+                     tag_len, tag, cf->conf_file->file.name.data
+                     + cf->conf_file->file.name.len - p,
+                     p, cf->conf_file->line);
+
+    *chunkname_len = p - out - 1;  /* exclude the trailing '\0' byte */
 
     return out;
 }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
index b504530..a0acd4a 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
@@ -42,9 +42,9 @@ 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)
 {
-    /*  set nginx request pointer to current lua thread's globals table */
     ngx_http_lua_set_req(L, r);
 
+#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -68,6 +68,7 @@ ngx_http_lua_header_filter_by_lua_env(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif /* OPENRESTY_LUAJIT */
 }
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers.c b/debian/modules/http-lua/src/ngx_http_lua_headers.c
index b833577..e3f48bc 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers.c
@@ -442,7 +442,8 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L)
     lua_createtable(L, 0, count);
 
     if (!raw) {
-        lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              headers_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -504,7 +505,6 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     ngx_table_elt_t    *header;
     ngx_http_request_t *r;
     ngx_http_lua_ctx_t *ctx;
-    ngx_int_t           rc;
     u_char             *lowcase_key = NULL;
     size_t              lowcase_key_sz = 0;
     ngx_uint_t          i;
@@ -543,17 +543,6 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
         return luaL_error(L, "no ctx found");
     }
 
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            return luaL_error(L,
-                              "failed to set default content type: %d",
-                              (int) rc);
-        }
-
-        ctx->headers_set = 1;
-    }
-
     ngx_http_lua_check_fake_request(L, r);
 
     part = &r->headers_out.headers.part;
@@ -566,7 +555,8 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     lua_createtable(L, 0, count + 2);
 
     if (!raw) {
-        lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              headers_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -694,7 +684,6 @@ ngx_http_lua_ngx_header_get(lua_State *L)
     size_t                       len;
     ngx_http_lua_loc_conf_t     *llcf;
     ngx_http_lua_ctx_t          *ctx;
-    ngx_int_t                    rc;
 
     r = ngx_http_lua_get_req(L);
     if (r == NULL) {
@@ -737,18 +726,7 @@ ngx_http_lua_ngx_header_get(lua_State *L)
 
     key.len = len;
 
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            return luaL_error(L,
-                              "failed to set default content type: %d",
-                              (int) rc);
-        }
-
-        ctx->headers_set = 1;
-    }
-
-    return ngx_http_lua_get_output_header(L, r, &key);
+    return ngx_http_lua_get_output_header(L, r, ctx, &key);
 }
 
 
@@ -811,16 +789,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
         }
     }
 
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            return luaL_error(L,
-                              "failed to set default content type: %d",
-                              (int) rc);
-        }
-
-        ctx->headers_set = 1;
-    }
+    ctx->headers_set = 1;
 
     if (lua_type(L, 3) == LUA_TNIL) {
         ngx_str_null(&value);
@@ -845,7 +814,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, key, value,
+                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
                                                     i == 1 /* override */);
 
                 if (rc == NGX_ERROR) {
@@ -872,7 +841,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, key, value, 1 /* override */);
+    rc = ngx_http_lua_set_output_header(r, ctx, key, value, 1 /* override */);
 
     if (rc == NGX_ERROR) {
         return luaL_error(L, "failed to set header %s (error: %d)",
@@ -1081,7 +1050,8 @@ ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L)
         "local new_key = string.gsub(string.lower(key), '_', '-')\n"
         "if new_key ~= key then return tb[new_key] else return nil end";
 
-    lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          headers_metatable_key));
 
     /* metatable for ngx.req.get_headers(_, true) and
      * ngx.resp.get_headers(_, true) */
@@ -1241,15 +1211,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
         }
     }
 
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            *errmsg = "failed to set default content type";
-            return NGX_ERROR;
-        }
-
-        ctx->headers_set = 1;
-    }
+    ctx->headers_set = 1;
 
     if (is_nil) {
         value.data = NULL;
@@ -1276,7 +1238,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, key, value,
+                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
                                                     override && i == 0);
 
                 if (rc == NGX_ERROR) {
@@ -1302,7 +1264,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, key, value, override);
+    rc = ngx_http_lua_set_output_header(r, ctx, key, value, override);
 
     if (rc == NGX_ERROR) {
         *errmsg = "failed to set header";
@@ -1370,7 +1332,8 @@ ngx_http_lua_ffi_req_header_set_single_value(ngx_http_request_t *r,
 int
 ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
     const u_char *key, size_t key_len,
-    u_char *key_buf, ngx_http_lua_ffi_str_t *values, int max_nvalues)
+    u_char *key_buf, ngx_http_lua_ffi_str_t *values, int max_nvalues,
+    char **errmsg)
 {
     int                  found;
     u_char               c, *p;
@@ -1387,19 +1350,10 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
-        /* *errmsg = "no ctx found"; */
+        *errmsg = "no ctx found";
         return NGX_ERROR;
     }
 
-    if (!ctx->headers_set) {
-        if (ngx_http_lua_set_content_type(r) != NGX_OK) {
-            /* *errmsg = "failed to set default content type"; */
-            return NGX_ERROR;
-        }
-
-        ctx->headers_set = 1;
-    }
-
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->transform_underscores_in_resp_headers
         && memchr(key, '_', key_len) != NULL)
@@ -1425,6 +1379,7 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
         {
             p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
             if (p == NULL) {
+                *errmsg = "no memory";
                 return NGX_ERROR;
             }
 
@@ -1438,8 +1393,8 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
         break;
 
     case 12:
-        if (r->headers_out.content_type.len
-            && ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0)
+        if (ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0
+            && r->headers_out.content_type.len)
         {
             values[0].data = r->headers_out.content_type.data;
             values[0].len = r->headers_out.content_type.len;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
index 4852b2f..c52cd13 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
@@ -432,10 +432,14 @@ 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)
 {
-    ngx_str_t host;
+    ngx_str_t                    host;
+    ngx_http_lua_main_conf_t    *lmcf;
+    ngx_http_variable_value_t   *var;
 
     dd("server new value len: %d", (int) value->len);
 
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
     if (value->len) {
         host= *value;
 
@@ -449,6 +453,10 @@ ngx_http_set_host_header(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
         r->headers_in.server = *value;
     }
 
+    var = &r->variables[lmcf->host_var_index];
+    var->valid = 0;
+    var->not_found = 0;
+
     return ngx_http_set_builtin_header(r, hv, value);
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
index b908eae..cf94bd0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
@@ -106,6 +106,12 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
                  offsetof(ngx_http_headers_out_t, cache_control),
                  ngx_http_set_builtin_multi_header },
 
+#if defined(nginx_version) && nginx_version >= 1013009
+    { ngx_string("Link"),
+                 offsetof(ngx_http_headers_out_t, link),
+                 ngx_http_set_builtin_multi_header },
+#endif
+
     { ngx_null_string, 0, ngx_http_set_header }
 };
 
@@ -476,8 +482,8 @@ ngx_http_clear_builtin_header(ngx_http_request_t *r,
 
 
 ngx_int_t
-ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override)
+ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
+    ngx_str_t key, ngx_str_t value, unsigned override)
 {
     ngx_http_lua_header_val_t         hv;
     ngx_http_lua_set_header_t        *handlers = ngx_http_lua_set_handlers;
@@ -508,6 +514,10 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
         hv.offset = handlers[i].offset;
         hv.handler = handlers[i].handler;
 
+        if (hv.handler == ngx_http_set_content_type_header) {
+            ctx->mime_set = 1;
+        }
+
         break;
     }
 
@@ -528,7 +538,7 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
 
 int
 ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_str_t *key)
+    ngx_http_lua_ctx_t *ctx, ngx_str_t *key)
 {
     ngx_table_elt_t            *h;
     ngx_list_part_t            *part;
@@ -550,8 +560,8 @@ ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
         break;
 
     case 12:
-        if (r->headers_out.content_type.len
-            && ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0)
+        if (ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0
+            && r->headers_out.content_type.len)
         {
             lua_pushlstring(L, (char *) r->headers_out.content_type.data,
                             r->headers_out.content_type.len);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
index ef5e6d4..6ec1fe3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
@@ -12,10 +12,10 @@
 #include "ngx_http_lua_common.h"
 
 
-ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override);
+ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, ngx_str_t key, ngx_str_t value, unsigned override);
 int ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_str_t *key);
+    ngx_http_lua_ctx_t *ctx, ngx_str_t *key);
 
 
 #endif /* _NGX_HTTP_LUA_HEADERS_OUT_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
index 4a722a0..76acdc3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
@@ -12,6 +12,7 @@
 
 #include "ngx_http_lua_initworkerby.h"
 #include "ngx_http_lua_util.h"
+#include "ngx_http_lua_pipe.h"
 
 
 static u_char *ngx_http_lua_log_init_worker_error(ngx_log_t *log,
@@ -25,6 +26,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     void                        *cur, *prev;
     ngx_uint_t                   i;
     ngx_conf_t                   conf;
+    ngx_conf_file_t              cf_file;
     ngx_cycle_t                 *fake_cycle;
     ngx_module_t               **modules;
     ngx_open_file_t             *file, *ofile;
@@ -64,8 +66,21 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
 
         return NGX_OK;
     }
+
+#ifdef HAVE_NGX_LUA_PIPE
+    if (ngx_http_lua_pipe_add_signal_handler(cycle) != NGX_OK) {
+        return NGX_ERROR;
+    }
+#endif
+
 #endif  /* NGX_WIN32 */
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+    if (lmcf->set_sa_restart) {
+        ngx_http_lua_set_sa_restart(ngx_cycle->log);
+    }
+#endif
+
     if (lmcf->init_worker_handler == NULL) {
         return NGX_OK;
     }
@@ -166,6 +181,10 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     conf.pool = fake_cycle->pool;
     conf.log = cycle->log;
 
+    ngx_memzero(&cf_file, sizeof(cf_file));
+    cf_file.file.name = cycle->conf_file;
+    conf.conf_file = &cf_file;
+
     http_ctx.loc_conf = ngx_pcalloc(conf.pool,
                                     sizeof(void *) * ngx_http_max_module);
     if (http_ctx.loc_conf == NULL) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_input_filters.c b/debian/modules/http-lua/src/ngx_http_lua_input_filters.c
new file mode 100644
index 0000000..87a9d8c
--- /dev/null
+++ b/debian/modules/http-lua/src/ngx_http_lua_input_filters.c
@@ -0,0 +1,137 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_common.h"
+
+
+ngx_int_t
+ngx_http_lua_read_bytes(ngx_buf_t *src, ngx_chain_t *buf_in, size_t *rest,
+    ssize_t bytes, ngx_log_t *log)
+{
+    if (bytes == 0) {
+        return NGX_ERROR;
+    }
+
+    if ((size_t) bytes >= *rest) {
+
+        buf_in->buf->last += *rest;
+        src->pos += *rest;
+        *rest = 0;
+
+        return NGX_OK;
+    }
+
+    /* bytes < *rest */
+
+    buf_in->buf->last += bytes;
+    src->pos += bytes;
+    *rest -= bytes;
+
+    return NGX_AGAIN;
+}
+
+
+ngx_int_t
+ngx_http_lua_read_all(ngx_buf_t *src, ngx_chain_t *buf_in, ssize_t bytes,
+    ngx_log_t *log)
+{
+    if (bytes == 0) {
+        return NGX_OK;
+    }
+
+    buf_in->buf->last += bytes;
+    src->pos += bytes;
+
+    return NGX_AGAIN;
+}
+
+
+ngx_int_t
+ngx_http_lua_read_any(ngx_buf_t *src, ngx_chain_t *buf_in, size_t *max,
+    ssize_t bytes, ngx_log_t *log)
+{
+    if (bytes == 0) {
+        return NGX_ERROR;
+    }
+
+    if (bytes >= (ssize_t) *max) {
+        bytes = (ssize_t) *max;
+    }
+
+    buf_in->buf->last += bytes;
+    src->pos += bytes;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_lua_read_line(ngx_buf_t *src, ngx_chain_t *buf_in, ssize_t bytes,
+    ngx_log_t *log)
+{
+    u_char                      *dst;
+    u_char                       c;
+#if (NGX_DEBUG)
+    u_char                      *begin;
+#endif
+
+#if (NGX_DEBUG)
+    begin = src->pos;
+#endif
+
+    if (bytes == 0) {
+        return NGX_ERROR;
+    }
+
+    dd("already read: %p: %.*s", buf_in,
+       (int) (buf_in->buf->last - buf_in->buf->pos), buf_in->buf->pos);
+
+    dd("data read: %.*s", (int) bytes, src->pos);
+
+    dst = buf_in->buf->last;
+
+    while (bytes--) {
+
+        c = *src->pos++;
+
+        switch (c) {
+        case '\n':
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
+                           "lua read the final line part: \"%*s\"",
+                           src->pos - 1 - begin, begin);
+
+            buf_in->buf->last = dst;
+
+            dd("read a line: %p: %.*s", buf_in,
+               (int) (buf_in->buf->last - buf_in->buf->pos), buf_in->buf->pos);
+
+            return NGX_OK;
+
+        case '\r':
+            /* ignore it */
+            break;
+
+        default:
+            *dst++ = c;
+            break;
+        }
+    }
+
+#if (NGX_DEBUG)
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
+                   "lua read partial line data: %*s", dst - begin, begin);
+#endif
+
+    buf_in->buf->last = dst;
+
+    return NGX_AGAIN;
+}
diff --git a/debian/modules/http-lua/src/ngx_http_lua_input_filters.h b/debian/modules/http-lua/src/ngx_http_lua_input_filters.h
new file mode 100644
index 0000000..046d40f
--- /dev/null
+++ b/debian/modules/http-lua/src/ngx_http_lua_input_filters.h
@@ -0,0 +1,29 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_
+#define _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+ngx_int_t ngx_http_lua_read_bytes(ngx_buf_t *src, ngx_chain_t *buf_in,
+    size_t *rest, ssize_t bytes, ngx_log_t *log);
+
+ngx_int_t ngx_http_lua_read_all(ngx_buf_t *src, ngx_chain_t *buf_in,
+    ssize_t bytes, ngx_log_t *log);
+
+ngx_int_t ngx_http_lua_read_any(ngx_buf_t *src, ngx_chain_t *buf_in,
+    size_t *max, ssize_t bytes, ngx_log_t *log);
+
+ngx_int_t ngx_http_lua_read_line(ngx_buf_t *src, ngx_chain_t *buf_in,
+    ssize_t bytes, ngx_log_t *log);
+
+
+#endif /* _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_logby.c b/debian/modules/http-lua/src/ngx_http_lua_logby.c
index 0f1d2f3..32d1cba 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_logby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_logby.c
@@ -38,9 +38,9 @@ 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 */
     ngx_http_lua_set_req(L, r);
 
+#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -64,6 +64,7 @@ ngx_http_lua_log_by_lua_env(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif /* OPENRESTY_LUAJIT */
 }
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_misc.c b/debian/modules/http-lua/src/ngx_http_lua_misc.c
index f96e2f2..145ca9b 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_misc.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_misc.c
@@ -286,6 +286,33 @@ ngx_http_lua_ffi_headers_sent(ngx_http_request_t *r)
 
     return r->header_sent ? 1 : 0;
 }
+
+
+int
+ngx_http_lua_ffi_get_conf_env(u_char *name, u_char **env_buf, size_t *name_len)
+{
+    ngx_uint_t            i;
+    ngx_str_t            *var;
+    ngx_core_conf_t      *ccf;
+
+    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                           ngx_core_module);
+
+    var = ccf->env.elts;
+
+    for (i = 0; i < ccf->env.nelts; i++) {
+        if (var[i].data[var[i].len] == '='
+            && ngx_strncmp(name, var[i].data, var[i].len) == 0)
+        {
+            *env_buf = var[i].data;
+            *name_len = var[i].len;
+
+            return NGX_OK;
+        }
+    }
+
+    return NGX_DECLINED;
+}
 #endif /* NGX_LUA_NO_FFI_API */
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_module.c b/debian/modules/http-lua/src/ngx_http_lua_module.c
index ae8bc0e..2a3f5d5 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_module.c
@@ -29,6 +29,7 @@
 #include "ngx_http_lua_ssl_session_storeby.h"
 #include "ngx_http_lua_ssl_session_fetchby.h"
 #include "ngx_http_lua_headers.h"
+#include "ngx_http_lua_pipe.h"
 
 
 static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
@@ -76,6 +77,13 @@ static ngx_conf_bitmask_t  ngx_http_lua_ssl_protocols[] = {
 
 static ngx_command_t ngx_http_lua_cmds[] = {
 
+    { ngx_string("lua_load_resty_core"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(ngx_http_lua_main_conf_t, load_resty_core),
+      NULL },
+
     { ngx_string("lua_max_running_timers"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -104,6 +112,13 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       NULL },
 
+    { ngx_string("lua_sa_restart"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(ngx_http_lua_main_conf_t, set_sa_restart),
+      NULL },
+
 #if (NGX_PCRE)
     { ngx_string("lua_regex_cache_max_entries"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -638,9 +653,19 @@ ngx_http_lua_init(ngx_conf_t *cf)
 #if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
     ngx_pool_cleanup_t         *cln;
 #endif
+    ngx_str_t                   name = ngx_string("host");
+
+    if (ngx_process == NGX_PROCESS_SIGNALLER || ngx_test_config) {
+        return NGX_OK;
+    }
 
     lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
 
+    lmcf->host_var_index = ngx_http_get_variable_index(cf, &name);
+    if (lmcf->host_var_index == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
     if (ngx_http_lua_prev_cycle != ngx_cycle) {
         ngx_http_lua_prev_cycle = ngx_cycle;
         multi_http_blocks = 0;
@@ -725,6 +750,11 @@ ngx_http_lua_init(ngx_conf_t *cf)
 
     cln->data = lmcf;
     cln->handler = ngx_http_lua_sema_mm_cleanup;
+
+#ifdef HAVE_NGX_LUA_PIPE
+    ngx_http_lua_pipe_init();
+#endif
+
 #endif
 
 #if nginx_version >= 1011011
@@ -740,6 +770,19 @@ ngx_http_lua_init(ngx_conf_t *cf)
     if (lmcf->lua == NULL) {
         dd("initializing lua vm");
 
+#ifndef OPENRESTY_LUAJIT
+        if (ngx_process != NGX_PROCESS_SIGNALLER && !ngx_test_config) {
+            ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
+                          "detected a LuaJIT version which is not OpenResty's"
+                          "; many optimizations will be disabled and "
+                          "performance will be compromised (see "
+                          "https://github.com/openresty/luajit2 for "
+                          "OpenResty's LuaJIT or, even better, consider using "
+                          "the OpenResty releases from https://openresty.org/"
+                          "en/download.html)");
+        }
+#endif
+
         ngx_http_lua_content_length_hash =
                                   ngx_http_lua_hash_literal("content-length");
         ngx_http_lua_location_hash = ngx_http_lua_hash_literal("location");
@@ -841,6 +884,7 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
      */
 
     lmcf->pool = cf->pool;
+    lmcf->load_resty_core = NGX_CONF_UNSET;
     lmcf->max_pending_timers = NGX_CONF_UNSET;
     lmcf->max_running_timers = NGX_CONF_UNSET;
 #if (NGX_PCRE)
@@ -850,6 +894,8 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
     lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
     lmcf->postponed_to_access_phase_end = NGX_CONF_UNSET;
 
+    lmcf->set_sa_restart = NGX_CONF_UNSET;
+
 #if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
     lmcf->malloc_trim_cycle = NGX_CONF_UNSET_UINT;
 #endif
@@ -872,6 +918,10 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
 {
     ngx_http_lua_main_conf_t *lmcf = conf;
 
+    if (lmcf->load_resty_core == NGX_CONF_UNSET) {
+        lmcf->load_resty_core = 1;
+    }
+
 #if (NGX_PCRE)
     if (lmcf->regex_cache_max_entries == NGX_CONF_UNSET) {
         lmcf->regex_cache_max_entries = 1024;
@@ -890,6 +940,12 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
         lmcf->max_running_timers = 256;
     }
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+    if (lmcf->set_sa_restart == NGX_CONF_UNSET) {
+        lmcf->set_sa_restart = 1;
+    }
+#endif
+
 #if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
     if (lmcf->malloc_trim_cycle == NGX_CONF_UNSET_UINT) {
         lmcf->malloc_trim_cycle = 1000;  /* number of reqs */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ndk.c b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
index 24b80b4..6344183 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ndk.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
@@ -186,6 +186,47 @@ ngx_http_lua_inject_ndk_api(lua_State *L)
 }
 
 
+int
+ngx_http_lua_ffi_ndk_lookup_directive(const u_char *var_data,
+    size_t var_len, ndk_set_var_value_pt *func)
+{
+    *func = ngx_http_lookup_ndk_set_var_directive((u_char *) var_data, var_len);
+
+    if (*func == NULL) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_ndk_set_var_get(ngx_http_request_t *r,
+    ndk_set_var_value_pt func, const u_char *arg_data, size_t arg_len,
+    ngx_http_lua_ffi_str_t *value)
+{
+    ngx_int_t                            rc;
+    ngx_str_t                            res;
+    ngx_http_variable_value_t            arg;
+
+    ngx_memzero(&arg, sizeof(ngx_http_variable_value_t));
+    arg.valid = 1;
+
+    arg.data = (u_char *) arg_data;
+    arg.len = arg_len;
+
+    rc = func(r, &res, &arg);
+
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    value->data = res.data;
+    value->len = res.len;
+    return NGX_OK;
+}
+
+
 #endif /* defined(NDK) && NDK */
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pipe.c b/debian/modules/http-lua/src/ngx_http_lua_pipe.c
new file mode 100644
index 0000000..8c8221f
--- /dev/null
+++ b/debian/modules/http-lua/src/ngx_http_lua_pipe.c
@@ -0,0 +1,2475 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_common.h"
+#include "ngx_http_lua_input_filters.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_pipe.h"
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+#include <sys/signalfd.h>
+#endif
+
+
+#ifdef HAVE_NGX_LUA_PIPE
+static ngx_rbtree_node_t *ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key);
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+static void ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
+    void *ucontext);
+#endif
+static void ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev);
+static ssize_t ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf,
+    size_t size);
+static ssize_t ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf,
+    size_t size);
+static ngx_int_t ngx_http_lua_pipe_close_helper(
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, ngx_event_t *ev, int forced);
+static ngx_int_t ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe,
+    int forced);
+static ngx_int_t ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe,
+    int forced);
+static ngx_int_t ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe,
+    int forced);
+static void ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc,
+    int forced);
+static ngx_int_t ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size);
+static void ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx,
+    u_char *errbuf, size_t *errbuf_size);
+static void ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size);
+static ngx_int_t ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx);
+static ngx_int_t ngx_http_lua_pipe_read_all(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read_line(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read_any(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx);
+static ngx_int_t ngx_http_lua_pipe_init_ctx(
+    ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd, ngx_pool_t *pool,
+    u_char *errbuf, size_t *errbuf_size);
+static ngx_int_t ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx);
+static int ngx_http_lua_pipe_read_stdout_retval(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
+static int ngx_http_lua_pipe_read_stderr_retval(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
+static int ngx_http_lua_pipe_read_retval_helper(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L, int from_stderr);
+static int ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L);
+static int ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L);
+static void ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
+    ngx_http_lua_co_ctx_t *wait_co_ctx);
+static void ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev);
+static ngx_int_t ngx_http_lua_pipe_resume(ngx_http_request_t *r);
+static void ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_clear_event(ngx_event_t *ev);
+static void ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data);
+static void ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data);
+static void ngx_http_lua_pipe_proc_write_cleanup(void *data);
+static void ngx_http_lua_pipe_proc_wait_cleanup(void *data);
+
+
+static ngx_rbtree_t       ngx_http_lua_pipe_rbtree;
+static ngx_rbtree_node_t  ngx_http_lua_pipe_proc_sentinel;
+
+
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+static int                                ngx_http_lua_signalfd;
+static struct signalfd_siginfo            ngx_http_lua_pipe_notification;
+
+#define ngx_http_lua_read_sigfd           ngx_http_lua_signalfd
+
+#else
+static int                                ngx_http_lua_sigchldfd[2];
+static u_char                             ngx_http_lua_pipe_notification[1];
+
+#define ngx_http_lua_read_sigfd           ngx_http_lua_sigchldfd[0]
+#define ngx_http_lua_write_sigfd          ngx_http_lua_sigchldfd[1]
+#endif
+
+
+static ngx_connection_t                  *ngx_http_lua_sigfd_conn = NULL;
+
+
+/* The below signals are ignored by Nginx.
+ * We need to reset them for the spawned child processes. */
+ngx_http_lua_pipe_signal_t ngx_signals[] = {
+    { SIGSYS, "SIGSYS" },
+    { SIGPIPE, "SIGPIPE" },
+    { 0, NULL }
+};
+
+
+enum {
+    PIPE_ERR_CLOSED = 1,
+    PIPE_ERR_SYSCALL,
+    PIPE_ERR_NOMEM,
+    PIPE_ERR_TIMEOUT,
+    PIPE_ERR_ADD_READ_EV,
+    PIPE_ERR_ADD_WRITE_EV
+};
+
+
+enum {
+    PIPE_READ_ALL = 0,
+    PIPE_READ_BYTES,
+    PIPE_READ_LINE,
+    PIPE_READ_ANY
+};
+
+
+#define REASON_EXIT         "exit"
+#define REASON_SIGNAL       "signal"
+#define REASON_UNKNOWN      "unknown"
+
+#define REASON_RUNNING_CODE  0
+#define REASON_EXIT_CODE     1
+#define REASON_SIGNAL_CODE   2
+#define REASON_UNKNOWN_CODE  3
+
+
+void
+ngx_http_lua_pipe_init(void)
+{
+    ngx_rbtree_init(&ngx_http_lua_pipe_rbtree,
+                    &ngx_http_lua_pipe_proc_sentinel, ngx_rbtree_insert_value);
+}
+
+
+ngx_int_t
+ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle)
+{
+    ngx_event_t         *rev;
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+    sigset_t             set;
+
+#else
+    int                  rc;
+    struct sigaction     sa;
+#endif
+
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+    if (sigemptyset(&set) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe init signal set failed");
+        return NGX_ERROR;
+    }
+
+    if (sigaddset(&set, SIGCHLD) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe add SIGCHLD to signal set failed");
+        return NGX_ERROR;
+    }
+
+    if (sigprocmask(SIG_BLOCK, &set, NULL) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe block SIGCHLD failed");
+        return NGX_ERROR;
+    }
+
+    ngx_http_lua_signalfd = signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);
+    if (ngx_http_lua_signalfd < 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe create signalfd instance failed");
+        return NGX_ERROR;
+    }
+
+#else /* !(NGX_HTTP_LUA_HAVE_SIGNALFD) */
+#   if (NGX_HTTP_LUA_HAVE_PIPE2)
+    rc = pipe2(ngx_http_lua_sigchldfd, O_NONBLOCK|O_CLOEXEC);
+#   else
+    rc = pipe(ngx_http_lua_sigchldfd);
+#   endif
+
+    if (rc == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe init SIGCHLD fd failed");
+        return NGX_ERROR;
+    }
+
+#   if !(NGX_HTTP_LUA_HAVE_PIPE2)
+    if (ngx_nonblocking(ngx_http_lua_read_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
+                      ngx_nonblocking_n " SIGCHLD read fd failed");
+        goto failed;
+    }
+
+    if (ngx_nonblocking(ngx_http_lua_write_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
+                      ngx_nonblocking_n " SIGCHLD write fd failed");
+        goto failed;
+    }
+
+    /* it's ok not to set the pipe fd with O_CLOEXEC. This requires
+     * extra syscall */
+#   endif /* !(NGX_HTTP_LUA_HAVE_PIPE2) */
+#endif /* NGX_HTTP_LUA_HAVE_SIGNALFD */
+
+    ngx_http_lua_sigfd_conn = ngx_get_connection(ngx_http_lua_read_sigfd,
+                                                 cycle->log);
+    if (ngx_http_lua_sigfd_conn == NULL) {
+        goto failed;
+    }
+
+    ngx_http_lua_sigfd_conn->log = cycle->log;
+    ngx_http_lua_sigfd_conn->recv = ngx_http_lua_pipe_fd_read;
+    rev = ngx_http_lua_sigfd_conn->read;
+    rev->log = ngx_http_lua_sigfd_conn->log;
+    rev->handler = ngx_http_lua_pipe_sigchld_event_handler;
+
+#ifdef HAVE_SOCKET_CLOEXEC_PATCH
+    rev->skip_socket_leak_check = 1;
+#endif
+
+    if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
+        goto failed;
+    }
+
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+    ngx_memzero(&sa, sizeof(struct sigaction));
+    sa.sa_sigaction = ngx_http_lua_pipe_sigchld_handler;
+    sa.sa_flags = SA_SIGINFO;
+
+    if (sigemptyset(&sa.sa_mask) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe init signal mask failed");
+        goto failed;
+    }
+
+    if (sigaction(SIGCHLD, &sa, NULL) == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe sigaction(SIGCHLD) failed");
+        goto failed;
+    }
+#endif
+
+    return NGX_OK;
+
+failed:
+
+    if (ngx_http_lua_sigfd_conn != NULL) {
+        ngx_close_connection(ngx_http_lua_sigfd_conn);
+        ngx_http_lua_sigfd_conn = NULL;
+    }
+
+    if (close(ngx_http_lua_read_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                      "lua pipe close the read sigfd failed");
+    }
+
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+    if (close(ngx_http_lua_write_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                      "lua pipe close the write sigfd failed");
+    }
+#endif
+
+    return NGX_ERROR;
+}
+
+
+static ngx_rbtree_node_t *
+ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key)
+{
+    ngx_rbtree_node_t    *node, *sentinel;
+
+    node = ngx_http_lua_pipe_rbtree.root;
+    sentinel = ngx_http_lua_pipe_rbtree.sentinel;
+
+    while (node != sentinel) {
+        if (key < node->key) {
+            node = node->left;
+            continue;
+        }
+
+        if (key > node->key) {
+            node = node->right;
+            continue;
+        }
+
+        return node;
+    }
+
+    return NULL;
+}
+
+
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+static void
+ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
+    void *ucontext)
+{
+    ngx_err_t                        err, saved_err;
+    ngx_int_t                        n;
+
+    saved_err = ngx_errno;
+
+    for ( ;; ) {
+        n = write(ngx_http_lua_write_sigfd, ngx_http_lua_pipe_notification,
+                  sizeof(ngx_http_lua_pipe_notification));
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
+                       "lua pipe SIGCHLD fd write siginfo:%p", siginfo);
+
+        if (n >= 0) {
+            break;
+        }
+
+        err = ngx_errno;
+
+        if (err != NGX_EINTR) {
+            if (err != NGX_EAGAIN) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, err,
+                              "lua pipe SIGCHLD fd write failed");
+            }
+
+            break;
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, err,
+                       "lua pipe SIGCHLD fd write was interrupted");
+    }
+
+    ngx_set_errno(saved_err);
+}
+#endif
+
+
+static void
+ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev)
+{
+    int                              n;
+    int                              status;
+    ngx_pid_t                        pid;
+    ngx_connection_t                *c = ev->data;
+    ngx_rbtree_node_t               *node;
+    ngx_http_lua_pipe_node_t        *pipe_node;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
+                   "lua pipe reaping children");
+
+    for ( ;; ) {
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+        n = c->recv(c, (u_char *) &ngx_http_lua_pipe_notification,
+#else
+        n = c->recv(c, ngx_http_lua_pipe_notification,
+#endif
+                    sizeof(ngx_http_lua_pipe_notification));
+
+        if (n <= 0) {
+            if (n == NGX_ERROR) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe SIGCHLD fd read failed");
+            }
+
+            break;
+        }
+
+        for ( ;; ) {
+            pid = waitpid(-1, &status, WNOHANG);
+
+            if (pid == 0) {
+                break;
+            }
+
+            if (pid < 0) {
+                if (ngx_errno != NGX_ECHILD) {
+                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                                  "lua pipe waitpid failed");
+                }
+
+                break;
+            }
+
+            /* This log is ported from Nginx's signal handler since we override
+             * or block it in this implementation. */
+            ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
+                          "signal %d (SIGCHLD) received from %P",
+                          SIGCHLD, pid);
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua pipe SIGCHLD fd read pid:%P status:%d", pid,
+                           status);
+
+            node = ngx_http_lua_pipe_lookup_pid(pid);
+            if (node != NULL) {
+                pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+                if (pipe_node->wait_co_ctx != NULL) {
+                    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                                   "lua pipe resume process:%p waiting for %P",
+                                   pipe_node->proc, pid);
+
+                    /*
+                     * We need the extra parentheses around the first argument
+                     * of ngx_post_event() just to work around macro issues in
+                     * nginx cores older than 1.7.12 (exclusive).
+                     */
+                    ngx_post_event((&pipe_node->wait_co_ctx->sleep),
+                                   &ngx_posted_events);
+                }
+
+                pipe_node->proc->pipe->dead = 1;
+
+                if (WIFSIGNALED(status)) {
+                    pipe_node->status = WTERMSIG(status);
+                    pipe_node->reason_code = REASON_SIGNAL_CODE;
+
+                } else if (WIFEXITED(status)) {
+                    pipe_node->status = WEXITSTATUS(status);
+                    pipe_node->reason_code = REASON_EXIT_CODE;
+
+                } else {
+                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                                  "lua pipe unknown exit status %d from "
+                                  "process %P", status, pid);
+                    pipe_node->status = status;
+                    pipe_node->reason_code = REASON_UNKNOWN_CODE;
+                }
+            }
+        }
+    }
+}
+
+
+static ssize_t
+ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ssize_t       n;
+    ngx_err_t     err;
+    ngx_event_t  *rev;
+
+    rev = c->read;
+
+    do {
+        n = read(c->fd, buf, size);
+
+        err = ngx_errno;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "read: fd:%d %z of %uz", c->fd, n, size);
+
+        if (n == 0) {
+            rev->ready = 0;
+            rev->eof = 1;
+            return 0;
+        }
+
+        if (n > 0) {
+            if ((size_t) n < size
+                && !(ngx_event_flags & NGX_USE_GREEDY_EVENT))
+            {
+                rev->ready = 0;
+            }
+
+            return n;
+        }
+
+        if (err == NGX_EAGAIN || err == NGX_EINTR) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "read() not ready");
+            n = NGX_AGAIN;
+
+        } else {
+            n = ngx_connection_error(c, err, "read() failed");
+            break;
+        }
+
+    } while (err == NGX_EINTR);
+
+    rev->ready = 0;
+
+    if (n == NGX_ERROR) {
+        rev->error = 1;
+    }
+
+    return n;
+}
+
+
+static ssize_t
+ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ssize_t       n;
+    ngx_err_t     err;
+    ngx_event_t  *wev;
+
+    wev = c->write;
+
+    do {
+        n = write(c->fd, buf, size);
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "write: fd:%d %z of %uz", c->fd, n, size);
+
+        if (n >= 0) {
+            if ((size_t) n != size) {
+                wev->ready = 0;
+            }
+
+            return n;
+        }
+
+        err = ngx_errno;
+
+        if (err == NGX_EAGAIN || err == NGX_EINTR) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "write() not ready");
+            n = NGX_AGAIN;
+
+        } else if (err != NGX_EPIPE) {
+            n = ngx_connection_error(c, err, "write() failed");
+            break;
+        }
+
+    } while (err == NGX_EINTR);
+
+    wev->ready = 0;
+
+    if (n == NGX_ERROR) {
+        wev->error = 1;
+    }
+
+    return n;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_spawn(ngx_http_lua_ffi_pipe_proc_t *proc,
+    const char *file, const char **argv, int merge_stderr, size_t buffer_size,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    int                             rc;
+    int                             in[2];
+    int                             out[2];
+    int                             err[2];
+    int                             stdin_fd, stdout_fd, stderr_fd;
+    int                             errlog_fd, temp_errlog_fd;
+    ngx_pid_t                       pid;
+    ssize_t                         pool_size;
+    ngx_pool_t                     *pool;
+    ngx_uint_t                      i;
+    ngx_listening_t                *ls;
+    ngx_http_lua_pipe_t            *pp;
+    ngx_rbtree_node_t              *node;
+    ngx_http_lua_pipe_node_t       *pipe_node;
+    struct sigaction                sa;
+    ngx_http_lua_pipe_signal_t     *sig;
+    sigset_t                        set;
+
+    pool_size = ngx_align(NGX_MIN_POOL_SIZE + buffer_size * 2,
+                          NGX_POOL_ALIGNMENT);
+
+    pool = ngx_create_pool(pool_size, ngx_cycle->log);
+    if (pool == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    pp = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_t)
+                     + offsetof(ngx_rbtree_node_t, color)
+                     + sizeof(ngx_http_lua_pipe_node_t));
+    if (pp == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        goto free_pool;
+    }
+
+    rc = pipe(in);
+    if (rc == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto free_pool;
+    }
+
+    rc = pipe(out);
+    if (rc == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_fd;
+    }
+
+    if (!merge_stderr) {
+        rc = pipe(err);
+        if (rc == -1) {
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                        "pipe failed: %s", strerror(errno))
+                           - errbuf;
+            goto close_in_out_fd;
+        }
+    }
+
+    pid = fork();
+    if (pid == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "fork failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_out_err_fd;
+    }
+
+    if (pid == 0) {
+
+#if (NGX_HAVE_CPU_AFFINITY)
+        /* reset the CPU affinity mask */
+        ngx_uint_t     log_level;
+        ngx_cpuset_t   child_cpu_affinity;
+
+        if (ngx_process == NGX_PROCESS_WORKER
+            && ngx_get_cpu_affinity(ngx_worker) != NULL)
+        {
+            CPU_ZERO(&child_cpu_affinity);
+
+            for (i = 0; i < (ngx_uint_t) ngx_min(ngx_ncpu, CPU_SETSIZE); i++) {
+                CPU_SET(i, &child_cpu_affinity);
+            }
+
+            log_level = ngx_cycle->log->log_level;
+            ngx_cycle->log->log_level = NGX_LOG_WARN;
+            ngx_setaffinity(&child_cpu_affinity, ngx_cycle->log);
+            ngx_cycle->log->log_level = log_level;
+        }
+#endif
+
+        /* reset the handler of ignored signals to the default */
+        for (sig = ngx_signals; sig->signo != 0; sig++) {
+            ngx_memzero(&sa, sizeof(struct sigaction));
+            sa.sa_handler = SIG_DFL;
+
+            if (sigemptyset(&sa.sa_mask) != 0) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child init signal mask failed");
+                exit(EXIT_FAILURE);
+            }
+
+            if (sigaction(sig->signo, &sa, NULL) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child reset signal handler for %s "
+                              "failed", sig->signame);
+                exit(EXIT_FAILURE);
+            }
+        }
+
+        /* reset signal mask */
+        if (sigemptyset(&set) != 0) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child init signal set failed");
+            exit(EXIT_FAILURE);
+        }
+
+        if (sigprocmask(SIG_SETMASK, &set, NULL) != 0) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child reset signal mask failed");
+            exit(EXIT_FAILURE);
+        }
+
+        /* close listening socket fd */
+        ls = ngx_cycle->listening.elts;
+        for (i = 0; i < ngx_cycle->listening.nelts; i++) {
+            if (ngx_close_socket(ls[i].fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_socket_errno,
+                              "lua pipe child " ngx_close_socket_n
+                              " %V failed", &ls[i].addr_text);
+            }
+        }
+
+        /* close and dup pipefd */
+        if (close(in[1]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "lua pipe child failed to close the in[1] "
+                          "pipe fd");
+        }
+
+        if (close(out[0]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "lua pipe child failed to close the out[0] "
+                          "pipe fd");
+        }
+
+        if (ngx_cycle->log->file && ngx_cycle->log->file->fd == STDERR_FILENO) {
+            errlog_fd = ngx_cycle->log->file->fd;
+            temp_errlog_fd = dup(errlog_fd);
+
+            if (temp_errlog_fd == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child dup errlog fd failed");
+                exit(EXIT_FAILURE);
+            }
+
+            if (ngx_cloexec(temp_errlog_fd) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child new errlog fd " ngx_cloexec_n
+                              " failed");
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua pipe child dup old errlog fd %d to new fd %d",
+                           ngx_cycle->log->file->fd, temp_errlog_fd);
+
+            ngx_cycle->log->file->fd = temp_errlog_fd;
+        }
+
+        if (dup2(in[0], STDIN_FILENO) == -1) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child dup2 stdin failed");
+            exit(EXIT_FAILURE);
+        }
+
+        if (dup2(out[1], STDOUT_FILENO) == -1) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child dup2 stdout failed");
+            exit(EXIT_FAILURE);
+        }
+
+        if (merge_stderr) {
+            if (dup2(STDOUT_FILENO, STDERR_FILENO) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child dup2 stderr failed");
+                exit(EXIT_FAILURE);
+            }
+
+        } else {
+            if (close(err[0]) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "lua pipe child failed to close the err[0] "
+                              "pipe fd");
+            }
+
+            if (dup2(err[1], STDERR_FILENO) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child dup2 stderr failed");
+                exit(EXIT_FAILURE);
+            }
+        }
+
+        if (execvp(file, (char * const *) argv) == -1) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child execvp() failed while executing %s",
+                          file);
+        }
+
+        exit(EXIT_FAILURE);
+    }
+
+    /* parent process */
+    if (close(in[0]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "lua pipe: failed to close the in[0] pipe fd");
+    }
+
+    stdin_fd = in[1];
+
+    if (ngx_nonblocking(stdin_fd) == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    ngx_nonblocking_n " failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_out_err_fd;
+    }
+
+    pp->stdin_fd = stdin_fd;
+
+    if (close(out[1]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "lua pipe: failed to close the out[1] pipe fd");
+    }
+
+    stdout_fd = out[0];
+
+    if (ngx_nonblocking(stdout_fd) == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    ngx_nonblocking_n " failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_out_err_fd;
+    }
+
+    pp->stdout_fd = stdout_fd;
+
+    if (!merge_stderr) {
+        if (close(err[1]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "lua pipe: failed to close the err[1] pipe fd");
+        }
+
+        stderr_fd = err[0];
+
+        if (ngx_nonblocking(stderr_fd) == -1) {
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                        ngx_nonblocking_n " failed: %s",
+                                        strerror(errno))
+                           - errbuf;
+            goto close_in_out_err_fd;
+        }
+
+        pp->stderr_fd = stderr_fd;
+    }
+
+    node = (ngx_rbtree_node_t *) (pp + 1);
+    node->key = pid;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    pipe_node->proc = proc;
+    ngx_rbtree_insert(&ngx_http_lua_pipe_rbtree, node);
+
+    pp->node = node;
+    pp->pool = pool;
+    pp->merge_stderr = merge_stderr;
+    pp->buffer_size = buffer_size;
+
+    proc->_pid = pid;
+    proc->write_timeout = 10000;
+    proc->stdout_read_timeout = 10000;
+    proc->stderr_read_timeout = 10000;
+    proc->wait_timeout = 10000;
+    proc->pipe = pp;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe spawn process:%p pid:%P merge_stderr:%d "
+                   "buffer_size:%uz", proc, pid, merge_stderr, buffer_size);
+    return NGX_OK;
+
+close_in_out_err_fd:
+
+    if (!merge_stderr) {
+        if (close(err[0]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "failed to close the err[0] pipe fd");
+        }
+
+        if (close(err[1]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "failed to close the err[1] pipe fd");
+        }
+    }
+
+close_in_out_fd:
+
+    if (close(out[0]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the out[0] pipe fd");
+    }
+
+    if (close(out[1]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the out[1] pipe fd");
+    }
+
+close_in_fd:
+
+    if (close(in[0]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the in[0] pipe fd");
+    }
+
+    if (close(in[1]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the in[1] pipe fd");
+    }
+
+free_pool:
+
+    ngx_destroy_pool(pool);
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_close_helper(ngx_http_lua_pipe_ctx_t *pipe_ctx,
+    ngx_event_t *ev, int forced)
+{
+    if (ev->handler != ngx_http_lua_pipe_dummy_event_handler && !forced) {
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe cannot close fd:%d without "
+                       "forced pipe:%p ev:%p", pipe_ctx->c->fd, pipe_ctx, ev);
+        return NGX_ERROR;
+    }
+
+    ngx_close_connection(pipe_ctx->c);
+    pipe_ctx->c = NULL;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe, int forced)
+{
+    ngx_event_t                     *wev;
+
+    if (pipe->stdin_ctx == NULL) {
+        if (pipe->stdin_fd != -1) {
+            if (close(pipe->stdin_fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "failed to close the stdin pipe fd");
+            }
+
+            pipe->stdin_fd = -1;
+        }
+
+    } else if (pipe->stdin_ctx->c != NULL) {
+        wev = pipe->stdin_ctx->c->write;
+        return ngx_http_lua_pipe_close_helper(pipe->stdin_ctx, wev, forced);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe, int forced)
+{
+    ngx_event_t                     *rev;
+
+    if (pipe->stdout_ctx == NULL) {
+        if (pipe->stdout_fd != -1) {
+            if (close(pipe->stdout_fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "failed to close the stdout pipe fd");
+            }
+
+            pipe->stdout_fd = -1;
+        }
+
+    } else if (pipe->stdout_ctx->c != NULL) {
+        rev = pipe->stdout_ctx->c->read;
+        return ngx_http_lua_pipe_close_helper(pipe->stdout_ctx, rev, forced);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe, int forced)
+{
+    ngx_event_t                     *rev;
+
+    if (pipe->stderr_ctx == NULL) {
+        if (pipe->stderr_fd != -1) {
+            if (close(pipe->stderr_fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "failed to close the stderr pipe fd");
+            }
+
+            pipe->stderr_fd = -1;
+        }
+
+    } else if (pipe->stderr_ctx->c != NULL) {
+        rev = pipe->stderr_ctx->c->read;
+        return ngx_http_lua_pipe_close_helper(pipe->stderr_ctx, rev, forced);
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_shutdown_stdin(ngx_http_lua_ffi_pipe_proc_t *proc,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_int_t                        rc;
+    ngx_http_lua_pipe_t             *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_lua_pipe_close_stdin(pipe, 0);
+    if (rc != NGX_OK) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy writing")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_shutdown_stdout(ngx_http_lua_ffi_pipe_proc_t *proc,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_int_t                        rc;
+    ngx_http_lua_pipe_t             *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_lua_pipe_close_stdout(pipe, 0);
+    if (rc != NGX_OK) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_shutdown_stderr(ngx_http_lua_ffi_pipe_proc_t *proc,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t             *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe->merge_stderr) {
+        /* stdout is used internally as stderr when merge_stderr is true */
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (ngx_http_lua_pipe_close_stderr(pipe, 0) != NGX_OK) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc, int forced)
+{
+    ngx_http_lua_pipe_t          *pipe;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe finalize process:%p pid:%P forced:%d", proc,
+                   proc->_pid, forced);
+    pipe = proc->pipe;
+
+    if (pipe->node) {
+        ngx_rbtree_delete(&ngx_http_lua_pipe_rbtree, pipe->node);
+        pipe->node = NULL;
+    }
+
+    pipe->dead = 1;
+
+    ngx_http_lua_pipe_close_stdin(pipe, forced);
+    ngx_http_lua_pipe_close_stdout(pipe, forced);
+
+    if (!pipe->merge_stderr) {
+        ngx_http_lua_pipe_close_stderr(pipe, forced);
+    }
+
+    pipe->closed = 1;
+}
+
+
+void
+ngx_http_lua_ffi_pipe_proc_destroy(ngx_http_lua_ffi_pipe_proc_t *proc)
+{
+    ngx_http_lua_pipe_t          *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL) {
+        return;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe destroy process:%p pid:%P", proc, proc->_pid);
+
+    if (!pipe->dead) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe kill process:%p pid:%P", proc, proc->_pid);
+
+        if (kill(proc->_pid, SIGKILL) == -1) {
+            if (ngx_errno != ESRCH) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe failed to kill process:%p pid:%P");
+            }
+        }
+    }
+
+    ngx_http_lua_pipe_proc_finalize(proc, 1);
+    ngx_destroy_pool(pipe->pool);
+    proc->pipe = NULL;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size)
+{
+    int                                 rc;
+
+    *ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
+    }
+
+    rc = ngx_http_lua_ffi_check_context(*ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                                        | NGX_HTTP_LUA_CONTEXT_ACCESS
+                                        | NGX_HTTP_LUA_CONTEXT_CONTENT
+                                        | NGX_HTTP_LUA_CONTEXT_TIMER
+                                        | NGX_HTTP_LUA_CONTEXT_SSL_CERT
+                                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH,
+                                        errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char *errbuf,
+    size_t *errbuf_size)
+{
+    switch (pipe_ctx->err_type) {
+
+    case PIPE_ERR_CLOSED:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        break;
+
+    case PIPE_ERR_SYSCALL:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
+                                    strerror(pipe_ctx->pipe_errno))
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_NOMEM:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_TIMEOUT:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "timeout")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_ADD_READ_EV:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "failed to add read event")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_ADD_WRITE_EV:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "failed to add write event")
+                       - errbuf;
+        break;
+
+    default:
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                      "unexpected err type: %d", pipe_ctx->err_type);
+        ngx_http_lua_assert(NULL);
+    }
+}
+
+
+static void
+ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size)
+{
+    size_t                   size = 0;
+    size_t                   chunk_size;
+    size_t                   nbufs;
+    u_char                  *p;
+    ngx_buf_t               *b;
+    ngx_chain_t             *cl;
+    ngx_chain_t            **ll;
+
+    nbufs = 0;
+    ll = NULL;
+
+    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
+        b = cl->buf;
+        chunk_size = b->last - b->pos;
+
+        if (cl->next) {
+            ll = &cl->next;
+        }
+
+        size += chunk_size;
+
+        nbufs++;
+    }
+
+    if (*buf_size < size) {
+        *buf = NULL;
+        *buf_size = size;
+
+        return;
+    }
+
+    *buf_size = size;
+
+    p = *buf;
+    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
+        b = cl->buf;
+        chunk_size = b->last - b->pos;
+        p = ngx_cpymem(p, b->pos, chunk_size);
+    }
+
+    if (nbufs > 1 && ll) {
+        *ll = pipe->free_bufs;
+        pipe->free_bufs = pipe_ctx->bufs_in;
+        pipe_ctx->bufs_in = pipe_ctx->buf_in;
+    }
+
+    if (pipe_ctx->buffer.pos == pipe_ctx->buffer.last) {
+        pipe_ctx->buffer.pos = pipe_ctx->buffer.start;
+        pipe_ctx->buffer.last = pipe_ctx->buffer.start;
+    }
+
+    if (pipe_ctx->bufs_in) {
+        pipe_ctx->buf_in->buf->last = pipe_ctx->buffer.pos;
+        pipe_ctx->buf_in->buf->pos = pipe_ctx->buffer.pos;
+    }
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx)
+{
+    ngx_chain_t             *cl;
+
+    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
+                                         &pipe->free_bufs,
+                                         pipe->buffer_size);
+
+    if (cl == NULL) {
+        pipe_ctx->err_type = PIPE_ERR_NOMEM;
+        return NGX_ERROR;
+    }
+
+    pipe_ctx->buf_in->next = cl;
+    pipe_ctx->buf_in = cl;
+    pipe_ctx->buffer = *cl->buf;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_all(void *data, ssize_t bytes)
+{
+    ngx_http_lua_pipe_ctx_t      *pipe_ctx = data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read all");
+    return ngx_http_lua_read_all(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
+                                 ngx_cycle->log);
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes)
+{
+    ngx_int_t                          rc;
+    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe read bytes %z", bytes);
+
+    rc = ngx_http_lua_read_bytes(&pipe_ctx->buffer, pipe_ctx->buf_in,
+                                 &pipe_ctx->rest, bytes, ngx_cycle->log);
+    if (rc == NGX_ERROR) {
+        pipe_ctx->err_type = PIPE_ERR_CLOSED;
+        return NGX_ERROR;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_line(void *data, ssize_t bytes)
+{
+    ngx_int_t                          rc;
+    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe read line");
+    rc = ngx_http_lua_read_line(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
+                                ngx_cycle->log);
+    if (rc == NGX_ERROR) {
+        pipe_ctx->err_type = PIPE_ERR_CLOSED;
+        return NGX_ERROR;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_any(void *data, ssize_t bytes)
+{
+    ngx_int_t                          rc;
+    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read any");
+    rc = ngx_http_lua_read_any(&pipe_ctx->buffer, pipe_ctx->buf_in,
+                               &pipe_ctx->rest, bytes, ngx_cycle->log);
+    if (rc == NGX_ERROR) {
+        pipe_ctx->err_type = PIPE_ERR_CLOSED;
+        return NGX_ERROR;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx)
+{
+    int                                 rc;
+    int                                 read;
+    size_t                              size;
+    ssize_t                             n;
+    ngx_buf_t                          *b;
+    ngx_event_t                        *rev;
+    ngx_connection_t                   *c;
+
+    c = pipe_ctx->c;
+    rev = c->read;
+    b = &pipe_ctx->buffer;
+    read = 0;
+
+    for ( ;; ) {
+        size = b->last - b->pos;
+
+        if (size || pipe_ctx->eof) {
+            rc = pipe_ctx->input_filter(pipe_ctx->input_filter_ctx, size);
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (rc == NGX_OK) {
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                               "lua pipe read done pipe:%p", pipe_ctx);
+                return NGX_OK;
+            }
+
+            /* rc == NGX_AGAIN */
+            continue;
+        }
+
+        if (read && !rev->ready) {
+            break;
+        }
+
+        size = b->end - b->last;
+
+        if (size == 0) {
+            rc = ngx_http_lua_pipe_add_input_buffer(pipe, pipe_ctx);
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            b = &pipe_ctx->buffer;
+            size = (size_t) (b->end - b->last);
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe try to read data %uz pipe:%p",
+                       size, pipe_ctx);
+
+        n = c->recv(c, b->last, size);
+        read = 1;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe read data returned %z pipe:%p", n, pipe_ctx);
+
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
+        if (n == 0) {
+            pipe_ctx->eof = 1;
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua pipe closed pipe:%p", pipe_ctx);
+            continue;
+        }
+
+        if (n == NGX_ERROR) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
+                           "lua pipe read data error pipe:%p", pipe_ctx);
+
+            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
+            pipe_ctx->pipe_errno = ngx_errno;
+            return NGX_ERROR;
+        }
+
+        b->last += n;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_init_ctx(ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd,
+    ngx_pool_t *pool, u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_connection_t                   *c;
+
+    if (fd == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    *pipe_ctx_pt = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_ctx_t));
+    if (*pipe_ctx_pt == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    c = ngx_get_connection(fd, ngx_cycle->log);
+    if (c == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no connection")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    c->log = ngx_cycle->log;
+    c->recv = ngx_http_lua_pipe_fd_read;
+    c->read->handler = ngx_http_lua_pipe_dummy_event_handler;
+    c->read->log = c->log;
+
+#ifdef HAVE_SOCKET_CLOEXEC_PATCH
+    c->read->skip_socket_leak_check = 1;
+#endif
+
+    c->send = ngx_http_lua_pipe_fd_write;
+    c->write->handler = ngx_http_lua_pipe_dummy_event_handler;
+    c->write->log = c->log;
+    (*pipe_ctx_pt)->c = c;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe init pipe ctx:%p fd:*%d", *pipe_ctx_pt, fd);
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_read(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, int reader_type,
+    size_t length, u_char **buf, size_t *buf_size, u_char *errbuf,
+    size_t *errbuf_size)
+{
+    int                                 rc;
+    ngx_msec_t                          timeout;
+    ngx_event_t                        *rev;
+    ngx_connection_t                   *c;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_co_ctx_t              *wait_co_ctx;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe read process:%p pid:%P", proc, proc->_pid);
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe->merge_stderr && from_stderr) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (from_stderr) {
+        if (pipe->stderr_ctx == NULL) {
+            if (ngx_http_lua_pipe_init_ctx(&pipe->stderr_ctx, pipe->stderr_fd,
+                                           pipe->pool, errbuf,
+                                           errbuf_size)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+        } else {
+            pipe->stderr_ctx->err_type = 0;
+        }
+
+        pipe_ctx = pipe->stderr_ctx;
+
+    } else {
+        if (pipe->stdout_ctx == NULL) {
+            if (ngx_http_lua_pipe_init_ctx(&pipe->stdout_ctx, pipe->stdout_fd,
+                                           pipe->pool, errbuf,
+                                           errbuf_size)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+        } else {
+            pipe->stdout_ctx->err_type = 0;
+        }
+
+        pipe_ctx = pipe->stdout_ctx;
+    }
+
+    c = pipe_ctx->c;
+    if (c == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    rev = c->read;
+    if (rev->handler != ngx_http_lua_pipe_dummy_event_handler) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    pipe_ctx->input_filter_ctx = pipe_ctx;
+
+    switch (reader_type) {
+
+    case PIPE_READ_ALL:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_all;
+        break;
+
+    case PIPE_READ_BYTES:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_bytes;
+        break;
+
+    case PIPE_READ_LINE:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_line;
+        break;
+
+    case PIPE_READ_ANY:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_any;
+        break;
+
+    default:
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                      "unexpected reader_type: %d", reader_type);
+        ngx_http_lua_assert(NULL);
+    }
+
+    pipe_ctx->rest = length;
+
+    if (pipe_ctx->bufs_in == NULL) {
+        pipe_ctx->bufs_in =
+            ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
+                                            &pipe->free_bufs,
+                                            pipe->buffer_size);
+
+        if (pipe_ctx->bufs_in == NULL) {
+            pipe_ctx->err_type = PIPE_ERR_NOMEM;
+            goto error;
+        }
+
+        pipe_ctx->buf_in = pipe_ctx->bufs_in;
+        pipe_ctx->buffer = *pipe_ctx->buf_in->buf;
+    }
+
+    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
+    if (rc == NGX_ERROR) {
+        goto error;
+    }
+
+    if (rc == NGX_OK) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        return NGX_OK;
+    }
+
+    /* rc == NGX_AGAIN */
+    wait_co_ctx = ctx->cur_co_ctx;
+
+    c->data = wait_co_ctx;
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        pipe_ctx->err_type = PIPE_ERR_ADD_READ_EV;
+        goto error;
+    }
+
+    wait_co_ctx->data = proc;
+
+    if (from_stderr) {
+        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
+        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stderr_cleanup;
+        timeout = proc->stderr_read_timeout;
+
+    } else {
+        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
+        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stdout_cleanup;
+        timeout = proc->stdout_read_timeout;
+    }
+
+    if (timeout > 0) {
+        ngx_add_timer(rev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua pipe add timer for reading: %d(ms) process:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       rev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+
+error:
+
+    if (pipe_ctx->bufs_in) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+        return NGX_DECLINED;
+    }
+
+    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+
+    return NGX_ERROR;
+}
+
+
+/*
+ * ngx_http_lua_ffi_pipe_get_read_result should only be called just after
+ * ngx_http_lua_ffi_pipe_proc_read, so we omit most of the sanity check already
+ * done in ngx_http_lua_ffi_pipe_proc_read.
+ */
+int
+ngx_http_lua_ffi_pipe_get_read_result(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, u_char **buf,
+    size_t *buf_size, u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe get read result process:%p pid:%P", proc,
+                   proc->_pid);
+
+    pipe = proc->pipe;
+    pipe_ctx = from_stderr ? pipe->stderr_ctx : pipe->stdout_ctx;
+
+    if (!pipe_ctx->err_type) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        return NGX_OK;
+    }
+
+    if (pipe_ctx->bufs_in) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+        return NGX_DECLINED;
+    }
+
+    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx)
+{
+    size_t                       size;
+    ngx_int_t                    n;
+    ngx_buf_t                   *b;
+    ngx_connection_t            *c;
+
+    c = pipe_ctx->c;
+    b = pipe_ctx->buf_in->buf;
+
+    for ( ;; ) {
+        size = b->last - b->pos;
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe try to write data %uz pipe:%p", size,
+                       pipe_ctx);
+
+        n = c->send(c, b->pos, size);
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe write returned %i pipe:%p", n, pipe_ctx);
+
+        if (n >= 0) {
+            b->pos += n;
+
+            if (b->pos == b->last) {
+                b->pos = b->start;
+                b->last = b->start;
+
+                if (!pipe->free_bufs) {
+                    pipe->free_bufs = pipe_ctx->buf_in;
+
+                } else {
+                    pipe->free_bufs->next = pipe_ctx->buf_in;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                               "lua pipe write done pipe:%p", pipe_ctx);
+                return NGX_OK;
+            }
+
+            continue;
+        }
+
+        /* NGX_ERROR || NGX_AGAIN */
+        break;
+    }
+
+    if (n == NGX_ERROR) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
+                       "lua pipe write data error pipe:%p", pipe_ctx);
+
+        if (ngx_errno == NGX_EPIPE) {
+            pipe_ctx->err_type = PIPE_ERR_CLOSED;
+
+        } else {
+            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
+            pipe_ctx->pipe_errno = ngx_errno;
+        }
+
+        return NGX_ERROR;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+ssize_t
+ngx_http_lua_ffi_pipe_proc_write(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, const u_char *data, size_t len,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    int                                 rc;
+    ngx_buf_t                          *b;
+    ngx_msec_t                          timeout;
+    ngx_chain_t                        *cl;
+    ngx_event_t                        *wev;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_co_ctx_t              *wait_co_ctx;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe write process:%p pid:%P", proc, proc->_pid);
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe->stdin_ctx == NULL) {
+        if (ngx_http_lua_pipe_init_ctx(&pipe->stdin_ctx, pipe->stdin_fd,
+                                       pipe->pool, errbuf,
+                                       errbuf_size)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+    } else {
+        pipe->stdin_ctx->err_type = 0;
+    }
+
+    pipe_ctx = pipe->stdin_ctx;
+    if (pipe_ctx->c == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    wev = pipe_ctx->c->write;
+    if (wev->handler != ngx_http_lua_pipe_dummy_event_handler) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy writing")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    pipe_ctx->rest = len;
+
+    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
+                                         &pipe->free_bufs, len);
+    if (cl == NULL) {
+        pipe_ctx->err_type = PIPE_ERR_NOMEM;
+        goto error;
+    }
+
+    pipe_ctx->buf_in = cl;
+    b = pipe_ctx->buf_in->buf;
+    b->last = ngx_copy(b->last, data, len);
+
+    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
+    if (rc == NGX_ERROR) {
+        goto error;
+    }
+
+    if (rc == NGX_OK) {
+        return len;
+    }
+
+    /* rc == NGX_AGAIN */
+    wait_co_ctx = ctx->cur_co_ctx;
+    pipe_ctx->c->data = wait_co_ctx;
+
+    wev->handler = ngx_http_lua_pipe_resume_write_handler;
+    if (ngx_handle_write_event(wev, 0) != NGX_OK) {
+        pipe_ctx->err_type = PIPE_ERR_ADD_WRITE_EV;
+        goto error;
+    }
+
+    wait_co_ctx->data = proc;
+    wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_write_cleanup;
+    timeout = proc->write_timeout;
+
+    if (timeout > 0) {
+        ngx_add_timer(wev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua pipe add timer for writing: %d(ms) process:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       wev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+
+error:
+
+    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+    return NGX_ERROR;
+}
+
+
+/*
+ * ngx_http_lua_ffi_pipe_get_write_result should only be called just after
+ * ngx_http_lua_ffi_pipe_proc_write, so we omit most of the sanity check
+ * already done in ngx_http_lua_ffi_pipe_proc_write.
+ */
+ssize_t
+ngx_http_lua_ffi_pipe_get_write_result(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe get write result process:%p pid:%P", proc,
+                   proc->_pid);
+
+    pipe = proc->pipe;
+    pipe_ctx = pipe->stdin_ctx;
+
+    if (pipe_ctx->err_type) {
+        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+        return NGX_ERROR;
+    }
+
+    return pipe_ctx->rest;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_wait(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, char **reason, int *status,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    int                                 rc;
+    ngx_rbtree_node_t                  *node;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_co_ctx_t              *wait_co_ctx;
+    ngx_http_lua_pipe_node_t           *pipe_node;
+
+    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe wait process:%p pid:%P", proc, proc->_pid);
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
+        return NGX_ERROR;
+    }
+
+    node = pipe->node;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    if (pipe_node->wait_co_ctx) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy waiting")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe_node->reason_code == REASON_RUNNING_CODE) {
+        wait_co_ctx = ctx->cur_co_ctx;
+        wait_co_ctx->data = proc;
+        ngx_memzero(&wait_co_ctx->sleep, sizeof(ngx_event_t));
+        wait_co_ctx->sleep.handler = ngx_http_lua_pipe_resume_wait_handler;
+        wait_co_ctx->sleep.data = wait_co_ctx;
+        wait_co_ctx->sleep.log = r->connection->log;
+        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_wait_cleanup;
+
+        pipe_node->wait_co_ctx = wait_co_ctx;
+
+        if (proc->wait_timeout > 0) {
+            ngx_add_timer(&wait_co_ctx->sleep, proc->wait_timeout);
+            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua pipe add timer for waiting: %d(ms) process:%p "
+                           "pid:%P ev:%p", proc->wait_timeout, proc,
+                           proc->_pid, &wait_co_ctx->sleep);
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua pipe wait yielding process:%p pid:%P", proc,
+                       proc->_pid);
+
+        return NGX_AGAIN;
+    }
+
+    *status = pipe_node->status;
+
+    switch (pipe_node->reason_code) {
+
+    case REASON_EXIT_CODE:
+        *reason = REASON_EXIT;
+        break;
+
+    case REASON_SIGNAL_CODE:
+        *reason = REASON_SIGNAL;
+        break;
+
+    default:
+        *reason = REASON_UNKNOWN;
+    }
+
+    ngx_http_lua_pipe_proc_finalize(proc, 0);
+
+    if (*status == 0) {
+        return NGX_OK;
+    }
+
+    return NGX_DECLINED;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_kill(ngx_http_lua_ffi_pipe_proc_t *proc, int signal,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_pid_t                           pid;
+    ngx_http_lua_pipe_t                *pipe;
+
+    pipe = proc->pipe;
+
+    if (pipe == NULL || pipe->dead) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
+        return NGX_ERROR;
+    }
+
+    pid = proc->_pid;
+
+    if (kill(pid, signal) == -1) {
+        switch (ngx_errno) {
+        case EINVAL:
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "invalid signal")
+                           - errbuf;
+            break;
+
+        case ESRCH:
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited")
+                           - errbuf;
+            break;
+
+        default:
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
+                                        strerror(ngx_errno))
+                           - errbuf;
+        }
+
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static int
+ngx_http_lua_pipe_read_stdout_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L)
+{
+    return ngx_http_lua_pipe_read_retval_helper(proc, L, 0);
+}
+
+
+static int
+ngx_http_lua_pipe_read_stderr_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L)
+{
+    return ngx_http_lua_pipe_read_retval_helper(proc, L, 1);
+}
+
+
+static int
+ngx_http_lua_pipe_read_retval_helper(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L, int from_stderr)
+{
+    int                              rc;
+    ngx_msec_t                       timeout;
+    ngx_event_t                     *rev;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
+
+    pipe = proc->pipe;
+    if (from_stderr) {
+        pipe_ctx = pipe->stderr_ctx;
+
+    } else {
+        pipe_ctx = pipe->stdout_ctx;
+    }
+
+    if (pipe->timeout) {
+        pipe->timeout = 0;
+        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
+        return 0;
+    }
+
+    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
+    if (rc != NGX_AGAIN) {
+        return 0;
+    }
+
+    rev = pipe_ctx->c->read;
+
+    if (from_stderr) {
+        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
+        timeout = proc->stderr_read_timeout;
+
+    } else {
+        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
+        timeout = proc->stdout_read_timeout;
+    }
+
+    if (timeout > 0) {
+        ngx_add_timer(rev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe add timer for reading: %d(ms) proc:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       rev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+}
+
+
+static int
+ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L)
+{
+    int                              rc;
+    ngx_msec_t                       timeout;
+    ngx_event_t                     *wev;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
+
+    pipe = proc->pipe;
+    pipe_ctx = pipe->stdin_ctx;
+
+    if (pipe->timeout) {
+        pipe->timeout = 0;
+        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
+        return 0;
+    }
+
+    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
+    if (rc != NGX_AGAIN) {
+        return 0;
+    }
+
+    wev = pipe_ctx->c->write;
+    wev->handler = ngx_http_lua_pipe_resume_write_handler;
+    timeout = proc->write_timeout;
+
+    if (timeout > 0) {
+        ngx_add_timer(wev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe add timer for writing: %d(ms) proc:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       wev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+}
+
+
+static int
+ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L)
+{
+    int                              nret;
+    ngx_rbtree_node_t               *node;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_pipe_node_t        *pipe_node;
+
+    pipe = proc->pipe;
+    node = pipe->node;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    pipe_node->wait_co_ctx = NULL;
+
+    if (pipe->timeout) {
+        pipe->timeout = 0;
+        lua_pushnil(L);
+        lua_pushliteral(L, "timeout");
+        return 2;
+    }
+
+    ngx_http_lua_pipe_proc_finalize(pipe_node->proc, 0);
+
+    if (pipe_node->status == 0) {
+        lua_pushboolean(L, 1);
+        lua_pushliteral(L, REASON_EXIT);
+        lua_pushinteger(L, pipe_node->status);
+        nret = 3;
+
+    } else {
+        lua_pushboolean(L, 0);
+
+        switch (pipe_node->reason_code) {
+
+        case REASON_EXIT_CODE:
+            lua_pushliteral(L, REASON_EXIT);
+            break;
+
+        case REASON_SIGNAL_CODE:
+            lua_pushliteral(L, REASON_SIGNAL);
+            break;
+
+        default:
+            lua_pushliteral(L, REASON_UNKNOWN);
+        }
+
+        lua_pushinteger(L, pipe_node->status);
+        nret = 3;
+    }
+
+    return nret;
+}
+
+
+static void
+ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
+    ngx_http_lua_co_ctx_t *wait_co_ctx)
+{
+    ngx_connection_t                *c;
+    ngx_http_request_t              *r;
+    ngx_http_lua_ctx_t              *ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    if (ev->timedout) {
+        proc = wait_co_ctx->data;
+        pipe = proc->pipe;
+        pipe->timeout = 1;
+        ev->timedout = 0;
+    }
+
+    ngx_http_lua_pipe_clear_event(ev);
+
+    r = ngx_http_lua_get_req(wait_co_ctx->co);
+    c = r->connection;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    ngx_http_lua_assert(ctx != NULL);
+
+    ctx->cur_co_ctx = wait_co_ctx;
+
+    if (ctx->entered_content_phase) {
+        (void) ngx_http_lua_pipe_resume(r);
+
+    } else {
+        ctx->resume_handler = ngx_http_lua_pipe_resume;
+        ngx_http_core_run_phases(r);
+    }
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c = ev->data;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    wait_co_ctx = c->data;
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_read_stdout_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c = ev->data;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    wait_co_ctx = c->data;
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_read_stderr_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c = ev->data;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    wait_co_ctx = c->data;
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_write_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev)
+{
+    ngx_http_lua_co_ctx_t           *wait_co_ctx = ev->data;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_wait_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_resume(ngx_http_request_t *r)
+{
+    int                              nret;
+    lua_State                       *vm;
+    ngx_int_t                        rc;
+    ngx_uint_t                       nreqs;
+    ngx_connection_t                *c;
+    ngx_http_lua_ctx_t              *ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    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;
+    ctx->cur_co_ctx->cleanup = NULL;
+
+    proc = ctx->cur_co_ctx->data;
+    pipe = proc->pipe;
+    nret = pipe->retval_handler(proc, ctx->cur_co_ctx->co);
+    if (nret == NGX_AGAIN) {
+        return NGX_DONE;
+    }
+
+    c = r->connection;
+    vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
+
+    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_lua_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
+    }
+
+    /* rc == NGX_ERROR || rc >= NGX_OK */
+
+    if (ctx->entered_content_phase) {
+        ngx_http_lua_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+static void
+ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev)
+{
+    /* do nothing */
+}
+
+
+static void
+ngx_http_lua_pipe_clear_event(ngx_event_t *ev)
+{
+    ev->handler = ngx_http_lua_pipe_dummy_event_handler;
+
+    if (ev->timer_set) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
+                       "lua pipe del timer for ev:%p", ev);
+        ngx_del_timer(ev);
+    }
+
+    if (ev->posted) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
+                       "lua pipe del posted event for ev:%p", ev);
+        ngx_delete_posted_event(ev);
+    }
+}
+
+
+static void
+ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data)
+{
+    ngx_event_t                    *rev;
+    ngx_connection_t               *c;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc read stdout cleanup");
+
+    proc = wait_co_ctx->data;
+    c = proc->pipe->stdout_ctx->c;
+    if (c) {
+        rev = c->read;
+        ngx_http_lua_pipe_clear_event(rev);
+    }
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data)
+{
+    ngx_event_t                    *rev;
+    ngx_connection_t               *c;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc read stderr cleanup");
+
+    proc = wait_co_ctx->data;
+    c = proc->pipe->stderr_ctx->c;
+    if (c) {
+        rev = c->read;
+        ngx_http_lua_pipe_clear_event(rev);
+    }
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_write_cleanup(void *data)
+{
+    ngx_event_t                    *wev;
+    ngx_connection_t               *c;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc write cleanup");
+
+    proc = wait_co_ctx->data;
+    c = proc->pipe->stdin_ctx->c;
+    if (c) {
+        wev = c->write;
+        ngx_http_lua_pipe_clear_event(wev);
+    }
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_wait_cleanup(void *data)
+{
+    ngx_rbtree_node_t              *node;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_pipe_node_t       *pipe_node;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc wait cleanup");
+
+    proc = wait_co_ctx->data;
+    node = proc->pipe->node;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    pipe_node->wait_co_ctx = NULL;
+
+    ngx_http_lua_pipe_clear_event(&wait_co_ctx->sleep);
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+#endif /* HAVE_NGX_LUA_PIPE */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pipe.h b/debian/modules/http-lua/src/ngx_http_lua_pipe.h
new file mode 100644
index 0000000..b5cea89
--- /dev/null
+++ b/debian/modules/http-lua/src/ngx_http_lua_pipe.h
@@ -0,0 +1,95 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef _NGX_HTTP_LUA_PIPE_H_INCLUDED_
+#define _NGX_HTTP_LUA_PIPE_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+typedef ngx_int_t (*ngx_http_lua_pipe_input_filter)(void *data, ssize_t bytes);
+
+
+typedef struct {
+    ngx_connection_t                   *c;
+    ngx_http_lua_pipe_input_filter      input_filter;
+    void                               *input_filter_ctx;
+    size_t                              rest;
+    ngx_chain_t                        *buf_in;
+    ngx_chain_t                        *bufs_in;
+    ngx_buf_t                           buffer;
+    ngx_err_t                           pipe_errno;
+    unsigned                            err_type:16;
+    unsigned                            eof:1;
+} ngx_http_lua_pipe_ctx_t;
+
+
+typedef struct ngx_http_lua_pipe_s  ngx_http_lua_pipe_t;
+
+
+typedef struct {
+    ngx_pid_t               _pid;
+    ngx_msec_t              write_timeout;
+    ngx_msec_t              stdout_read_timeout;
+    ngx_msec_t              stderr_read_timeout;
+    ngx_msec_t              wait_timeout;
+    /* pipe hides the implementation from the Lua binding */
+    ngx_http_lua_pipe_t    *pipe;
+} ngx_http_lua_ffi_pipe_proc_t;
+
+
+typedef int (*ngx_http_lua_pipe_retval_handler)(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
+
+
+struct ngx_http_lua_pipe_s {
+    ngx_pool_t                         *pool;
+    ngx_chain_t                        *free_bufs;
+    ngx_rbtree_node_t                  *node;
+    int                                 stdin_fd;
+    int                                 stdout_fd;
+    int                                 stderr_fd;
+    ngx_http_lua_pipe_ctx_t            *stdin_ctx;
+    ngx_http_lua_pipe_ctx_t            *stdout_ctx;
+    ngx_http_lua_pipe_ctx_t            *stderr_ctx;
+    ngx_http_lua_pipe_retval_handler    retval_handler;
+    size_t                              buffer_size;
+    unsigned                            closed:1;
+    unsigned                            dead:1;
+    unsigned                            timeout:1;
+    unsigned                            merge_stderr:1;
+};
+
+
+typedef struct {
+    u_char                           color;
+    u_char                           reason_code;
+    int                              status;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+} ngx_http_lua_pipe_node_t;
+
+
+typedef struct {
+    int     signo;
+    char   *signame;
+} ngx_http_lua_pipe_signal_t;
+
+
+#if !(NGX_WIN32) && !defined(NGX_LUA_NO_FFI_API)                             \
+    && defined(HAVE_SOCKET_CLOEXEC_PATCH)
+#define HAVE_NGX_LUA_PIPE   1
+
+
+void ngx_http_lua_pipe_init(void);
+ngx_int_t ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle);
+#endif
+
+
+#endif /* _NGX_HTTP_LUA_PIPE_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_regex.c b/debian/modules/http-lua/src/ngx_http_lua_regex.c
index 843d1e4..8f3373b 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_regex.c
@@ -15,7 +15,6 @@
 #include "ngx_http_lua_regex.h"
 #include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_script.h"
-#include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_util.h"
 
 
@@ -249,7 +248,8 @@ ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              regex_cache_key));
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
@@ -720,7 +720,8 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              regex_cache_key));
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
@@ -1388,7 +1389,8 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              regex_cache_key));
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "s");
diff --git a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
index 1bbe87c..1de9968 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
@@ -62,7 +62,7 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
 #endif
 
         if (cur_ph < last_ph) {
-            dd("swaping the contents of cur_ph and last_ph...");
+            dd("swapping the contents of cur_ph and last_ph...");
 
             tmp      = *cur_ph;
 
@@ -261,9 +261,11 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_script.c b/debian/modules/http-lua/src/ngx_http_lua_script.c
index 95ebadf..c675a16 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_script.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_script.c
@@ -329,7 +329,7 @@ ngx_http_lua_script_add_copy_code(ngx_http_lua_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_lua_script_code_pt)
+    code->code = (ngx_http_lua_script_code_pt) (void *)
                  ngx_http_lua_script_copy_len_code;
     code->len = len;
 
@@ -399,7 +399,7 @@ ngx_http_lua_script_add_capture_code(ngx_http_lua_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_lua_script_code_pt)
+    code->code = (ngx_http_lua_script_code_pt) (void *)
                  ngx_http_lua_script_copy_capture_len_code;
     code->n = 2 * n;
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.c b/debian/modules/http-lua/src/ngx_http_lua_setby.c
index 2e8762a..d4288b5 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_setby.c
@@ -30,13 +30,6 @@ 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);
 
 
-/* keys in Lua thread for fetching args and nargs in set_by_lua* */
-
-#define ngx_http_lua_nargs_key  "__ngx_nargs"
-
-#define ngx_http_lua_args_key  "__ngx_args"
-
-
 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)
@@ -134,23 +127,24 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
 
 
 int
-ngx_http_lua_setby_param_get(lua_State *L)
+ngx_http_lua_setby_param_get(lua_State *L, ngx_http_request_t *r)
 {
     int         idx;
     int         n;
 
     ngx_http_variable_value_t       *v;
+    ngx_http_lua_main_conf_t        *lmcf;
 
     idx = luaL_checkint(L, 2);
     idx--;
 
-    /*  get number of args from globals */
-    lua_getglobal(L, ngx_http_lua_nargs_key);
-    n = (int) lua_tointeger(L, -1);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
-    /*  get args from globals */
-    lua_getglobal(L, ngx_http_lua_args_key);
-    v = lua_touserdata(L, -1);
+    /*  get number of args from lmcf */
+    n = lmcf->setby_nargs;
+
+    /*  get args from lmcf */
+    v = lmcf->setby_args;
 
     if (idx < 0 || idx > n - 1) {
         lua_pushnil(L);
@@ -178,15 +172,16 @@ 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)
 {
-    /*  set nginx request pointer to current lua thread's globals table */
+    ngx_http_lua_main_conf_t        *lmcf;
+
     ngx_http_lua_set_req(L, r);
 
-    lua_pushinteger(L, nargs);
-    lua_setglobal(L, ngx_http_lua_nargs_key);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
-    lua_pushlightuserdata(L, args);
-    lua_setglobal(L, ngx_http_lua_args_key);
+    lmcf->setby_nargs = nargs;
+    lmcf->setby_args = args;
 
+#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -211,6 +206,7 @@ ngx_http_lua_set_by_lua_env(lua_State *L, ngx_http_request_t *r, size_t nargs,
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif
 }
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.h b/debian/modules/http-lua/src/ngx_http_lua_setby.h
index da71753..f43eef7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_setby.h
@@ -7,7 +7,7 @@
 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);
+int ngx_http_lua_setby_param_get(lua_State *L, ngx_http_request_t *r);
 
 
 #endif /* _NGX_HTTP_LUA_SET_BY_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_shdict.c b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
index 5fb7930..b017bea 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
@@ -325,6 +325,7 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_uint_t                   i;
     ngx_shm_zone_t             **zone;
+    ngx_shm_zone_t             **zone_udata;
 
     if (lmcf->shdict_zones != NULL) {
         lua_createtable(L, 0, lmcf->shdict_zones->nelts /* nrec */);
@@ -396,7 +397,9 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
 
             lua_createtable(L, 1 /* narr */, 0 /* nrec */);
                 /* table of zone[i] */
-            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
+            zone_udata = lua_newuserdata(L, sizeof(ngx_shm_zone_t *));
+                /* shared mt key ud */
+            *zone_udata = zone[i];
             lua_rawseti(L, -2, SHDICT_USERDATA_INDEX); /* {zone[i]} */
             lua_pushvalue(L, -3); /* shared mt key ud mt */
             lua_setmetatable(L, -2); /* shared mt key ud */
@@ -431,11 +434,17 @@ static ngx_inline ngx_shm_zone_t *
 ngx_http_lua_shdict_get_zone(lua_State *L, int index)
 {
     ngx_shm_zone_t      *zone;
+    ngx_shm_zone_t     **zone_udata;
 
     lua_rawgeti(L, index, SHDICT_USERDATA_INDEX);
-    zone = lua_touserdata(L, -1);
+    zone_udata = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
+    if (zone_udata == NULL) {
+        return NULL;
+    }
+
+    zone = *zone_udata;
     return zone;
 }
 
@@ -2209,6 +2218,17 @@ ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
 
 
 #ifndef NGX_LUA_NO_FFI_API
+ngx_shm_zone_t *
+ngx_http_lua_ffi_shdict_udata_to_zone(void *zone_udata)
+{
+    if (zone_udata == NULL) {
+        return NULL;
+    }
+
+    return *(ngx_shm_zone_t **) zone_udata;
+}
+
+
 int
 ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     size_t key_len, int value_type, u_char *str_value_buf,
@@ -2225,10 +2245,6 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     dd("exptime: %ld", exptime);
 
     ctx = zone->data;
@@ -2490,10 +2506,6 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_node_t  *sd;
     ngx_str_t                    value;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     *err = NULL;
 
     ctx = zone->data;
@@ -2636,10 +2648,6 @@ ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
     u_char                      *p;
     ngx_queue_t                 *queue, *q;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     if (init_ttl > 0) {
         tp = ngx_timeofday();
     }
@@ -2915,10 +2923,6 @@ ngx_http_lua_ffi_shdict_get_ttl(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     ctx = zone->data;
     hash = ngx_crc32_short(key, key_len);
 
@@ -2959,10 +2963,6 @@ ngx_http_lua_ffi_shdict_set_expire(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
     if (exptime > 0) {
         tp = ngx_timeofday();
     }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
index efdf427..87461e6 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
@@ -11,6 +11,7 @@
 
 
 #include "ngx_http_lua_socket_tcp.h"
+#include "ngx_http_lua_input_filters.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_uthread.h"
 #include "ngx_http_lua_output.h"
@@ -24,6 +25,7 @@ static int ngx_http_lua_socket_tcp_connect(lua_State *L);
 static int ngx_http_lua_socket_tcp_sslhandshake(lua_State *L);
 #endif
 static int ngx_http_lua_socket_tcp_receive(lua_State *L);
+static int ngx_http_lua_socket_tcp_receiveany(lua_State *L);
 static int ngx_http_lua_socket_tcp_send(lua_State *L);
 static int ngx_http_lua_socket_tcp_close(lua_State *L);
 static int ngx_http_lua_socket_tcp_setoption(lua_State *L);
@@ -69,6 +71,8 @@ static int ngx_http_lua_socket_tcp_conn_retval_handler(ngx_http_request_t *r,
     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_tcp_upstream_t *u);
+static int ngx_http_lua_socket_tcp_receive_helper(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 static ngx_int_t ngx_http_lua_socket_tcp_read(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u);
 static int ngx_http_lua_socket_tcp_receive_retval_handler(ngx_http_request_t *r,
@@ -86,6 +90,7 @@ static int ngx_http_lua_socket_write_error_retval_handler(ngx_http_request_t *r,
 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);
+static ngx_int_t ngx_http_lua_socket_read_any(void *data, ssize_t bytes);
 static int ngx_http_lua_socket_tcp_receiveuntil(lua_State *L);
 static int ngx_http_lua_socket_receiveuntil_iterator(lua_State *L);
 static ngx_int_t ngx_http_lua_socket_compile_pattern(u_char *data, size_t len,
@@ -95,12 +100,28 @@ static int ngx_http_lua_req_socket(lua_State *L);
 static void ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r);
 static int ngx_http_lua_socket_tcp_getreusedtimes(lua_State *L);
 static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L);
+static void ngx_http_lua_socket_tcp_create_socket_pool(lua_State *L,
+    ngx_http_request_t *r, ngx_str_t key, ngx_int_t pool_size,
+    ngx_int_t backlog, ngx_http_lua_socket_pool_t **spool);
 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_tcp_upstream_t *u);
 static void ngx_http_lua_socket_keepalive_dummy_handler(ngx_event_t *ev);
+static int ngx_http_lua_socket_tcp_connect_helper(lua_State *L,
+    ngx_http_lua_socket_tcp_upstream_t *u, ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, u_char *host_ref, size_t host_len, in_port_t port,
+    unsigned resuming);
+static void ngx_http_lua_socket_tcp_conn_op_timeout_handler(
+    ngx_event_t *ev);
+static int ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler(
+    ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
+static void ngx_http_lua_socket_tcp_resume_conn_op(
+    ngx_http_lua_socket_pool_t *spool);
+static void ngx_http_lua_socket_tcp_conn_op_ctx_cleanup(void *data);
+static void ngx_http_lua_socket_tcp_conn_op_resume_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 int ngx_http_lua_socket_tcp_conn_op_resume_retval_handler(
+    ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u, 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,
@@ -113,11 +134,13 @@ static ngx_int_t ngx_http_lua_socket_add_input_buffer(ngx_http_request_t *r,
     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_tcp_upstream_t *u, u_char *pat, size_t prefix);
+static ngx_int_t ngx_http_lua_socket_tcp_conn_op_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_conn_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_read_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r,
     int socket_op);
+static void ngx_http_lua_tcp_queue_conn_op_cleanup(void *data);
 static void ngx_http_lua_tcp_resolve_cleanup(void *data);
 static void ngx_http_lua_coctx_cleanup(void *data);
 static void ngx_http_lua_socket_free_pool(ngx_log_t *log,
@@ -150,7 +173,8 @@ enum {
 enum {
     SOCKET_OP_CONNECT,
     SOCKET_OP_READ,
-    SOCKET_OP_WRITE
+    SOCKET_OP_WRITE,
+    SOCKET_OP_RESUME_CONN
 };
 
 
@@ -229,7 +253,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_setfield(L, -2, "socket");
 
     /* {{{req socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          req_socket_metatable_key));
     lua_createtable(L, 0 /* narr */, 5 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
@@ -251,7 +276,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{raw req socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          raw_req_socket_metatable_key));
     lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
@@ -276,7 +302,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{tcp object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          tcp_socket_metatable_key));
     lua_createtable(L, 0 /* narr */, 12 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_connect);
@@ -292,6 +319,9 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
     lua_setfield(L, -2, "receive");
 
+    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveany);
+    lua_setfield(L, -2, "receiveany");
+
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveuntil);
     lua_setfield(L, -2, "receiveuntil");
 
@@ -322,7 +352,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{upstream userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          upstream_udata_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_upstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -330,7 +361,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{downstream userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          downstream_udata_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_downstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -338,7 +370,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{socket pool userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          pool_udata_metatable_key));
     lua_createtable(L, 0, 1); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_shutdown_pool);
     lua_setfield(L, -2, "__gc");
@@ -346,7 +379,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{socket compiled pattern userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          pattern_udata_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_cleanup_compiled_pattern);
     lua_setfield(L, -2, "__gc");
@@ -356,7 +390,8 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 #if (NGX_HTTP_SSL)
 
     /* {{{ssl session userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          ssl_session_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_ssl_free_session);
     lua_setfield(L, -2, "__gc");
@@ -404,7 +439,8 @@ ngx_http_lua_socket_tcp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     lua_createtable(L, 5 /* narr */, 1 /* nrec */);
-    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          tcp_socket_metatable_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -414,31 +450,421 @@ ngx_http_lua_socket_tcp(lua_State *L)
 }
 
 
+static void
+ngx_http_lua_socket_tcp_create_socket_pool(lua_State *L, ngx_http_request_t *r,
+    ngx_str_t key, ngx_int_t pool_size, ngx_int_t backlog,
+    ngx_http_lua_socket_pool_t **spool)
+{
+    u_char                              *p;
+    size_t                               size, key_len;
+    ngx_int_t                            i;
+    ngx_http_lua_socket_pool_t          *sp;
+    ngx_http_lua_socket_pool_item_t     *items;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket connection pool size: %i, backlog: %i",
+                   pool_size, backlog);
+
+    key_len = ngx_align(key.len + 1, sizeof(void *));
+
+    size = sizeof(ngx_http_lua_socket_pool_t) - 1 + key_len
+           + sizeof(ngx_http_lua_socket_pool_item_t) * pool_size;
+
+    /* before calling this function, the Lua stack is:
+     * -1 key
+     * -2 pools
+     */
+    sp = lua_newuserdata(L, size);
+    if (sp == NULL) {
+        luaL_error(L, "no memory");
+        return;
+    }
+
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          pool_udata_metatable_key));
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_setmetatable(L, -2);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket keepalive create connection pool for key"
+                   " \"%V\"", &key);
+
+    /* a new socket pool with metatable is push to the stack, so now we have:
+     * -1 sp
+     * -2 key
+     * -3 pools
+     *
+     * it is time to set pools[key] to sp.
+     */
+    lua_rawset(L, -3);
+
+    /* clean up the stack for consistency's sake */
+    lua_pop(L, 1);
+
+    sp->backlog = backlog;
+    sp->size = pool_size;
+    sp->connections = 0;
+    sp->lua_vm = ngx_http_lua_get_lua_vm(r, NULL);
+
+    ngx_queue_init(&sp->cache_connect_op);
+    ngx_queue_init(&sp->wait_connect_op);
+    ngx_queue_init(&sp->cache);
+    ngx_queue_init(&sp->free);
+
+    p = ngx_copy(sp->key, key.data, key.len);
+    *p++ = '\0';
+
+    items = (ngx_http_lua_socket_pool_item_t *) (sp->key + key_len);
+
+    dd("items: %p", items);
+
+    ngx_http_lua_assert((void *) items == ngx_align_ptr(items, sizeof(void *)));
+
+    for (i = 0; i < pool_size; i++) {
+        ngx_queue_insert_head(&sp->free, &items[i].queue);
+        items[i].socket_pool = sp;
+    }
+
+    *spool = sp;
+}
+
+
+static int
+ngx_http_lua_socket_tcp_connect_helper(lua_State *L,
+    ngx_http_lua_socket_tcp_upstream_t *u, ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, u_char *host_ref, size_t host_len, in_port_t port,
+    unsigned resuming)
+{
+    int                                    n;
+    int                                    host_size;
+    int                                    saved_top;
+    ngx_int_t                              rc;
+    ngx_str_t                              host;
+    ngx_str_t                             *conn_op_host;
+    ngx_url_t                              url;
+    ngx_queue_t                           *q;
+    ngx_resolver_ctx_t                    *rctx, temp;
+    ngx_http_lua_co_ctx_t                 *coctx;
+    ngx_http_core_loc_conf_t              *clcf;
+    ngx_http_lua_socket_pool_t            *spool;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t *conn_op_ctx;
+
+    spool = u->socket_pool;
+    if (spool != NULL) {
+        rc = ngx_http_lua_get_keepalive_peer(r, u);
+
+        if (rc == NGX_OK) {
+            lua_pushinteger(L, 1);
+            return 1;
+        }
+
+        /* rc == NGX_DECLINED */
+
+        spool->connections++;
+
+        /* check if backlog is enabled and
+         * don't queue resuming connection operation */
+        if (spool->backlog >= 0 && !resuming) {
+
+            dd("lua tcp socket %s connections %ld",
+               spool->key, spool->connections);
+
+            if (spool->connections > spool->size + spool->backlog) {
+                spool->connections--;
+                lua_pushnil(L);
+                lua_pushliteral(L, "too many waiting connect operations");
+                return 2;
+            }
+
+            if (spool->connections > spool->size) {
+                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->peer.log, 0,
+                               "lua tcp socket queue connect operation for "
+                               "connection pool \"%s\", connections: %i",
+                               spool->key, spool->connections);
+
+                host_size = sizeof(u_char) *
+                    (ngx_max(host_len, NGX_INET_ADDRSTRLEN) + 1);
+
+                if (!ngx_queue_empty(&spool->cache_connect_op)) {
+                    q = ngx_queue_last(&spool->cache_connect_op);
+                    ngx_queue_remove(q);
+                    conn_op_ctx = ngx_queue_data(
+                        q, ngx_http_lua_socket_tcp_conn_op_ctx_t, queue);
+
+                    conn_op_host = &conn_op_ctx->host;
+                    if (host_len > conn_op_host->len
+                        && host_len > NGX_INET_ADDRSTRLEN)
+                    {
+                        ngx_free(conn_op_host->data);
+                        conn_op_host->data = ngx_alloc(host_size,
+                                                       ngx_cycle->log);
+                        if (conn_op_host->data == NULL) {
+                            ngx_free(conn_op_ctx);
+                            goto no_memory_and_not_resuming;
+                        }
+                    }
+
+                } else {
+                    conn_op_ctx = ngx_alloc(
+                        sizeof(ngx_http_lua_socket_tcp_conn_op_ctx_t),
+                        ngx_cycle->log);
+                    if (conn_op_ctx == NULL) {
+                        goto no_memory_and_not_resuming;
+                    }
+
+                    conn_op_host = &conn_op_ctx->host;
+                    conn_op_host->data = ngx_alloc(host_size, ngx_cycle->log);
+                    if (conn_op_host->data == NULL) {
+                        ngx_free(conn_op_ctx);
+                        goto no_memory_and_not_resuming;
+                    }
+                }
+
+                conn_op_ctx->cleanup = NULL;
+
+                ngx_memcpy(conn_op_host->data, host_ref, host_len);
+                conn_op_host->data[host_len] = '\0';
+                conn_op_host->len = host_len;
+
+                conn_op_ctx->port = port;
+
+                u->write_co_ctx = ctx->cur_co_ctx;
+
+                conn_op_ctx->u = u;
+                ctx->cur_co_ctx->cleanup =
+                    ngx_http_lua_tcp_queue_conn_op_cleanup;
+                ctx->cur_co_ctx->data = conn_op_ctx;
+
+                ngx_memzero(&conn_op_ctx->event, sizeof(ngx_event_t));
+                conn_op_ctx->event.handler =
+                    ngx_http_lua_socket_tcp_conn_op_timeout_handler;
+                conn_op_ctx->event.data = conn_op_ctx;
+                conn_op_ctx->event.log = ngx_cycle->log;
+
+                ngx_add_timer(&conn_op_ctx->event, u->connect_timeout);
+
+                ngx_queue_insert_tail(&spool->wait_connect_op,
+                                      &conn_op_ctx->queue);
+
+                ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                               "lua tcp socket queued connect operation for "
+                               "%d(ms), u: %p, ctx: %p",
+                               u->connect_timeout, conn_op_ctx->u, conn_op_ctx);
+
+                return lua_yield(L, 0);
+            }
+        }
+
+    } /* end spool != NULL */
+
+    host.data = ngx_palloc(r->pool, host_len + 1);
+    if (host.data == NULL) {
+        return luaL_error(L, "no memory");
+    }
+
+    host.len = host_len;
+
+    ngx_memcpy(host.data, host_ref, host_len);
+    host.data[host_len] = '\0';
+
+    ngx_memzero(&url, sizeof(ngx_url_t));
+    url.url = host;
+    url.default_port = port;
+    url.no_resolve = 1;
+
+    coctx = ctx->cur_co_ctx;
+
+    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",
+                            url.url.data, url.err);
+
+        } else {
+            lua_pushfstring(L, "failed to parse host name \"%s\"",
+                            url.url.data);
+        }
+
+        goto failed;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "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) {
+        if (resuming) {
+            lua_pushnil(L);
+            lua_pushliteral(L, "no memory");
+            goto failed;
+        }
+
+        goto no_memory_and_not_resuming;
+    }
+
+    if (url.addrs && url.addrs[0].sockaddr) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp 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 = url.default_port;
+    }
+
+    if (u->resolved->sockaddr) {
+        rc = ngx_http_lua_socket_resolve_retval_handler(r, u, L);
+        if (rc == NGX_AGAIN && !resuming) {
+            return lua_yield(L, 0);
+        }
+
+        if (rc > 1) {
+            goto failed;
+        }
+
+        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");
+        goto failed;
+    }
+
+    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);
+        goto failed;
+    }
+
+    rctx->name = host;
+#if !defined(nginx_version) || nginx_version < 1005008
+    rctx->type = NGX_RESOLVE_A;
+#endif
+    rctx->handler = ngx_http_lua_socket_resolve_handler;
+    rctx->data = u;
+    rctx->timeout = clcf->resolver_timeout;
+
+    u->resolved->ctx = rctx;
+    u->write_co_ctx = ctx->cur_co_ctx;
+
+    ngx_http_lua_cleanup_pending_operation(coctx);
+    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
+    coctx->data = u;
+
+    saved_top = lua_gettop(L);
+
+    if (ngx_resolve_name(rctx) != NGX_OK) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket fail to run resolver immediately");
+
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
+
+        coctx->cleanup = NULL;
+        coctx->data = NULL;
+
+        u->resolved->ctx = NULL;
+        lua_pushnil(L);
+        lua_pushfstring(L, "%s could not be resolved", host.data);
+        goto failed;
+    }
+
+    if (u->conn_waiting) {
+        dd("resolved and already connecting");
+
+        if (resuming) {
+            return NGX_AGAIN;
+        }
+
+        return lua_yield(L, 0);
+    }
+
+    n = lua_gettop(L) - saved_top;
+    if (n) {
+        dd("errors occurred during resolving or connecting"
+           "or already connected");
+
+        if (n > 1) {
+            goto failed;
+        }
+
+        return n;
+    }
+
+    /* still resolving */
+
+    u->conn_waiting = 1;
+    u->write_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;
+
+    } else {
+        r->write_event_handler = ngx_http_core_run_phases;
+    }
+
+    if (resuming) {
+        return NGX_AGAIN;
+    }
+
+    return lua_yield(L, 0);
+
+failed:
+
+    if (spool != NULL) {
+        spool->connections--;
+        ngx_http_lua_socket_tcp_resume_conn_op(spool);
+    }
+
+    return 2;
+
+no_memory_and_not_resuming:
+
+    if (spool != NULL) {
+        spool->connections--;
+        ngx_http_lua_socket_tcp_resume_conn_op(spool);
+    }
+
+    return luaL_error(L, "no memory");
+}
+
+
 static int
 ngx_http_lua_socket_tcp_connect(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_peer_connection_t       *pc;
     int                          connect_timeout, send_timeout, read_timeout;
     unsigned                     custom_pool;
     int                          key_index;
+    ngx_int_t                    backlog;
+    ngx_int_t                    pool_size;
+    ngx_str_t                    key;
     const char                  *msg;
-    ngx_http_lua_co_ctx_t       *coctx;
 
     ngx_http_lua_socket_tcp_upstream_t      *u;
 
+    ngx_http_lua_socket_pool_t              *spool;
+
     n = lua_gettop(L);
     if (n != 2 && n != 3 && n != 4) {
         return luaL_error(L, "ngx.socket connect: expecting 2, 3, or 4 "
@@ -466,13 +892,54 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     p = (u_char *) luaL_checklstring(L, 2, &len);
 
+    backlog = -1;
     key_index = 2;
+    pool_size = 0;
     custom_pool = 0;
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
     if (lua_type(L, n) == LUA_TTABLE) {
 
         /* found the last optional option table */
 
+        lua_getfield(L, n, "pool_size");
+
+        if (lua_isnumber(L, -1)) {
+            pool_size = (ngx_int_t) lua_tointeger(L, -1);
+
+            if (pool_size <= 0) {
+                msg = lua_pushfstring(L, "bad \"pool_size\" option value: %i",
+                                      pool_size);
+                return luaL_argerror(L, n, msg);
+            }
+
+        } else if (!lua_isnil(L, -1)) {
+            msg = lua_pushfstring(L, "bad \"pool_size\" option type: %s",
+                                  lua_typename(L, lua_type(L, -1)));
+            return luaL_argerror(L, n, msg);
+        }
+
+        lua_pop(L, 1);
+
+        lua_getfield(L, n, "backlog");
+
+        if (lua_isnumber(L, -1)) {
+            backlog = (ngx_int_t) lua_tointeger(L, -1);
+
+            if (backlog < 0) {
+                msg = lua_pushfstring(L, "bad \"backlog\" option value: %i",
+                                      backlog);
+                return luaL_argerror(L, n, msg);
+            }
+
+            /* use default value for pool size if only backlog specified */
+            if (pool_size == 0) {
+                pool_size = llcf->pool_size;
+            }
+        }
+
+        lua_pop(L, 1);
+
         lua_getfield(L, n, "pool");
 
         switch (lua_type(L, -1)) {
@@ -572,7 +1039,8 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         }
 
 #if 1
-        lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              upstream_udata_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
 #endif
@@ -582,12 +1050,8 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     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;
 
     pc = &u->peer;
@@ -628,163 +1092,28 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         u->read_timeout = u->conf->read_timeout;
     }
 
-    rc = ngx_http_lua_get_keepalive_peer(r, L, key_index, u);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
+    lua_rawget(L, LUA_REGISTRYINDEX); /* table */
+    lua_pushvalue(L, key_index); /* key */
 
-    if (rc == NGX_OK) {
-        lua_pushinteger(L, 1);
-        return 1;
+    lua_rawget(L, -2);
+    spool = lua_touserdata(L, -1);
+    lua_pop(L, 1);
+
+    if (spool != NULL) {
+        u->socket_pool = spool;
+
+    } else if (pool_size > 0) {
+        lua_pushvalue(L, key_index);
+        key.data = (u_char *) lua_tolstring(L, -1, &key.len);
+
+        ngx_http_lua_socket_tcp_create_socket_pool(L, r, key, pool_size,
+                                                   backlog, &spool);
+        u->socket_pool = spool;
     }
 
-    if (rc == NGX_ERROR) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "error in get keepalive peer");
-        return 2;
-    }
-
-    /* rc == NGX_DECLINED */
-
-    /* TODO: we should avoid this in-pool allocation */
-
-    host.data = ngx_palloc(r->pool, len + 1);
-    if (host.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    host.len = len;
-
-    ngx_memcpy(host.data, p, len);
-    host.data[len] = '\0';
-
-    ngx_memzero(&url, sizeof(ngx_url_t));
-
-    url.url.len = host.len;
-    url.url.data = host.data;
-    url.default_port = (in_port_t) 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;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "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) {
-        return luaL_error(L, "no memory");
-    }
-
-    if (url.addrs && url.addrs[0].sockaddr) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp 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;
-#if !defined(nginx_version) || nginx_version < 1005008
-    rctx->type = NGX_RESOLVE_A;
-#endif
-    rctx->handler = ngx_http_lua_socket_resolve_handler;
-    rctx->data = u;
-    rctx->timeout = clcf->resolver_timeout;
-
-    u->resolved->ctx = rctx;
-    u->write_co_ctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
-    coctx->data = u;
-
-    saved_top = lua_gettop(L);
-
-    if (ngx_resolve_name(rctx) != NGX_OK) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket fail to run resolver immediately");
-
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
-
-        coctx->cleanup = NULL;
-        coctx->data = NULL;
-
-        u->resolved->ctx = NULL;
-        lua_pushnil(L);
-        lua_pushfstring(L, "%s could not be resolved", host.data);
-
-        return 2;
-    }
-
-    if (u->conn_waiting) {
-        dd("resolved and already connecting");
-        return lua_yield(L, 0);
-    }
-
-    n = lua_gettop(L) - saved_top;
-    if (n) {
-        dd("errors occurred during resolving or connecting"
-           "or already connected");
-        return n;
-    }
-
-    /* still resolving */
-
-    u->conn_waiting = 1;
-    u->write_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;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    return lua_yield(L, 0);
+    return ngx_http_lua_socket_tcp_connect_helper(L, u, r, ctx, p,
+                                                  len, port, 0);
 }
 
 
@@ -1638,7 +1967,8 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
                       "lua ssl save session: %p", ssl_session);
 
         /* set up the __gc metamethod */
-        lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              ssl_session_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -1755,20 +2085,173 @@ ngx_http_lua_socket_tcp_conn_retval_handler(ngx_http_request_t *r,
 }
 
 
+static int
+ngx_http_lua_socket_tcp_receive_helper(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
+{
+    ngx_int_t                            rc;
+    ngx_http_lua_ctx_t                  *ctx;
+    ngx_http_lua_co_ctx_t               *coctx;
+
+    u->input_filter_ctx = u;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (u->bufs_in == NULL) {
+        u->bufs_in =
+            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
+                                            &ctx->free_recv_bufs,
+                                            u->conf->buffer_size);
+
+        if (u->bufs_in == NULL) {
+            return luaL_error(L, "no memory");
+        }
+
+        u->buf_in = u->bufs_in;
+        u->buffer = *u->buf_in->buf;
+    }
+
+    dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket read timeout: %M", u->read_timeout);
+
+    if (u->raw_downstream || u->body_downstream) {
+        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
+    }
+
+    u->read_waiting = 0;
+    u->read_co_ctx = NULL;
+
+    rc = ngx_http_lua_socket_tcp_read(r, u);
+
+    if (rc == NGX_ERROR) {
+        dd("read failed: %d", (int) u->ft_type);
+        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
+        dd("tcp receive retval returned: %d", (int) rc);
+        return rc;
+    }
+
+    if (rc == NGX_OK) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket receive done in a single run");
+
+        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
+    }
+
+    /* rc == NGX_AGAIN */
+
+    u->read_event_handler = ngx_http_lua_socket_read_handler;
+
+    coctx = ctx->cur_co_ctx;
+
+    ngx_http_lua_cleanup_pending_operation(coctx);
+    coctx->cleanup = ngx_http_lua_coctx_cleanup;
+    coctx->data = u;
+
+    if (ctx->entered_content_phase) {
+        r->write_event_handler = ngx_http_lua_content_wev_handler;
+
+    } else {
+        r->write_event_handler = ngx_http_core_run_phases;
+    }
+
+    u->read_co_ctx = coctx;
+    u->read_waiting = 1;
+    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
+
+    dd("setting data to %p, coctx:%p", u, coctx);
+
+    if (u->raw_downstream || u->body_downstream) {
+        ctx->downstream = u;
+    }
+
+    return lua_yield(L, 0);
+}
+
+
+static int
+ngx_http_lua_socket_tcp_receiveany(lua_State *L)
+{
+    int                                  n;
+    lua_Integer                          bytes;
+    ngx_http_request_t                  *r;
+    ngx_http_lua_loc_conf_t             *llcf;
+    ngx_http_lua_socket_tcp_upstream_t  *u;
+
+    n = lua_gettop(L);
+    if (n != 2) {
+        return luaL_error(L, "expecting 2 arguments "
+                          "(including the object), but got %d", n);
+    }
+
+    r = ngx_http_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    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->read_closed) {
+
+        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:%d eof:%d",
+                          u, u ? u->peer.connection : NULL,
+                          u ? (int) u->ft_type : 0, u ? (int) u->eof : 0);
+        }
+
+        lua_pushnil(L);
+        lua_pushliteral(L, "closed");
+        return 2;
+    }
+
+    if (u->request != r) {
+        return luaL_error(L, "bad request");
+    }
+
+    ngx_http_lua_socket_check_busy_connecting(r, u, L);
+    ngx_http_lua_socket_check_busy_reading(r, u, L);
+
+    if (!lua_isnumber(L, 2)) {
+        return luaL_argerror(L, 2, "bad max argument");
+    }
+
+    bytes = lua_tointeger(L, 2);
+    if (bytes <= 0) {
+        return luaL_argerror(L, 2, "bad max argument");
+    }
+
+    u->input_filter = ngx_http_lua_socket_read_any;
+    u->rest = (size_t) bytes;
+    u->length = u->rest;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket calling receiveany() method to read at "
+                   "most %uz bytes", u->rest);
+
+    return ngx_http_lua_socket_tcp_receive_helper(r, u, L);
+}
+
+
 static int
 ngx_http_lua_socket_tcp_receive(lua_State *L)
 {
     ngx_http_request_t                  *r;
     ngx_http_lua_socket_tcp_upstream_t  *u;
-    ngx_int_t                            rc;
-    ngx_http_lua_ctx_t                  *ctx;
     int                                  n;
     ngx_str_t                            pat;
     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) {
@@ -1883,119 +2366,27 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
         u->rest = 0;
     }
 
-    u->input_filter_ctx = u;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (u->bufs_in == NULL) {
-        u->bufs_in =
-            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                            &ctx->free_recv_bufs,
-                                            u->conf->buffer_size);
-
-        if (u->bufs_in == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        u->buf_in = u->bufs_in;
-        u->buffer = *u->buf_in->buf;
-    }
-
-    dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
-
-    if (u->raw_downstream || u->body_downstream) {
-        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
-    }
-
-    u->read_waiting = 0;
-    u->read_co_ctx = NULL;
-
-    rc = ngx_http_lua_socket_tcp_read(r, u);
-
-    if (rc == NGX_ERROR) {
-        dd("read failed: %d", (int) u->ft_type);
-        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-        dd("tcp receive retval returned: %d", (int) rc);
-        return rc;
-    }
-
-    if (rc == NGX_OK) {
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket receive done in a single run");
-
-        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-    }
-
-    /* rc == NGX_AGAIN */
-
-    u->read_event_handler = ngx_http_lua_socket_read_handler;
-
-    coctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_coctx_cleanup;
-    coctx->data = u;
-
-    if (ctx->entered_content_phase) {
-        r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    u->read_co_ctx = coctx;
-    u->read_waiting = 1;
-    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
-
-    dd("setting data to %p, coctx:%p", u, coctx);
-
-    if (u->raw_downstream || u->body_downstream) {
-        ctx->downstream = u;
-    }
-
-    return lua_yield(L, 0);
+    return ngx_http_lua_socket_tcp_receive_helper(r, u, L);
 }
 
 
 static ngx_int_t
 ngx_http_lua_socket_read_chunk(void *data, ssize_t bytes)
 {
+    ngx_int_t                                rc;
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_buf_t                   *b;
-#if (NGX_DEBUG)
-    ngx_http_request_t          *r;
-
-    r = u->request;
-#endif
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
                    "lua tcp socket read chunk %z", bytes);
 
-    if (bytes == 0) {
+    rc = ngx_http_lua_read_bytes(&u->buffer, u->buf_in, &u->rest,
+                                 bytes, u->request->connection->log);
+    if (rc == NGX_ERROR) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
         return NGX_ERROR;
     }
 
-    b = &u->buffer;
-
-    if (bytes >= (ssize_t) u->rest) {
-
-        u->buf_in->buf->last += u->rest;
-        b->pos += u->rest;
-        u->rest = 0;
-
-        return NGX_OK;
-    }
-
-    /* bytes < u->rest */
-
-    u->buf_in->buf->last += bytes;
-    b->pos += bytes;
-    u->rest -= bytes;
-
-    return NGX_AGAIN;
+    return rc;
 }
 
 
@@ -2004,26 +2395,10 @@ ngx_http_lua_socket_read_all(void *data, ssize_t bytes)
 {
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_buf_t                   *b;
-#if (NGX_DEBUG)
-    ngx_http_request_t          *r;
-
-    r = u->request;
-#endif
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
                    "lua tcp socket read all");
-
-    if (bytes == 0) {
-        return NGX_OK;
-    }
-
-    b = &u->buffer;
-
-    u->buf_in->buf->last += bytes;
-    b->pos += bytes;
-
-    return NGX_AGAIN;
+    return ngx_http_lua_read_all(&u->buffer, u->buf_in, bytes,
+                                 u->request->connection->log);
 }
 
 
@@ -2032,72 +2407,40 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
 {
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_buf_t                   *b;
-    u_char                      *dst;
-    u_char                       c;
-#if (NGX_DEBUG)
-    u_char                      *begin;
-#endif
+    ngx_int_t                    rc;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
                    "lua tcp socket read line");
 
-    if (bytes == 0) {
+    rc = ngx_http_lua_read_line(&u->buffer, u->buf_in, bytes,
+                                u->request->connection->log);
+    if (rc == NGX_ERROR) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
         return NGX_ERROR;
     }
 
-    b = &u->buffer;
+    return rc;
+}
 
-#if (NGX_DEBUG)
-    begin = b->pos;
-#endif
 
-    dd("already read: %p: %.*s", u->buf_in,
-       (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
-       u->buf_in->buf->pos);
+static ngx_int_t
+ngx_http_lua_socket_read_any(void *data, ssize_t bytes)
+{
+    ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    dd("data read: %.*s", (int) bytes, b->pos);
+    ngx_int_t                    rc;
 
-    dst = u->buf_in->buf->last;
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+                   "lua tcp socket read any");
 
-    while (bytes--) {
-
-        c = *b->pos++;
-
-        switch (c) {
-        case '\n':
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                           "lua tcp socket read the final line part: \"%*s\"",
-                           b->pos - 1 - begin, begin);
-
-            u->buf_in->buf->last = dst;
-
-            dd("read a line: %p: %.*s", u->buf_in,
-               (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
-               u->buf_in->buf->pos);
-
-            return NGX_OK;
-
-        case '\r':
-            /* ignore it */
-            break;
-
-        default:
-            *dst++ = c;
-            break;
-        }
+    rc = ngx_http_lua_read_any(&u->buffer, u->buf_in, &u->rest, bytes,
+                               u->request->connection->log);
+    if (rc == NGX_ERROR) {
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
+        return NGX_ERROR;
     }
 
-#if (NGX_DEBUG)
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "lua tcp socket read partial line data: %*s",
-                   dst - begin, begin);
-#endif
-
-    u->buf_in->buf->last = dst;
-
-    return NGX_AGAIN;
+    return rc;
 }
 
 
@@ -3539,6 +3882,267 @@ ngx_http_lua_socket_tcp_finalize_write_part(ngx_http_request_t *r,
 }
 
 
+static void
+ngx_http_lua_socket_tcp_conn_op_timeout_handler(ngx_event_t *ev)
+{
+    ngx_http_lua_socket_tcp_upstream_t      *u;
+    ngx_http_lua_ctx_t                      *ctx;
+    ngx_connection_t                        *c;
+    ngx_http_request_t                      *r;
+    ngx_http_lua_co_ctx_t                   *coctx;
+    ngx_http_lua_loc_conf_t                 *llcf;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+
+    conn_op_ctx = ev->data;
+    ngx_queue_remove(&conn_op_ctx->queue);
+
+    u = conn_op_ctx->u;
+    r = u->request;
+
+    coctx = u->write_co_ctx;
+    coctx->cleanup = NULL;
+    /* note that we store conn_op_ctx in coctx->data instead of u */
+    coctx->data = conn_op_ctx;
+    u->write_co_ctx = 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,
+                      "lua tcp socket queued connect timed out,"
+                      " when trying to connect to %V:%ud",
+                      &conn_op_ctx->host, conn_op_ctx->port);
+    }
+
+    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
+                          &conn_op_ctx->queue);
+    u->socket_pool->connections--;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    ctx->cur_co_ctx = coctx;
+
+    ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
+                        || coctx->co_ref >= 0));
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket waking up the current request");
+
+    u->write_prepare_retvals =
+        ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler;
+
+    c = r->connection;
+
+    if (ctx->entered_content_phase) {
+        (void) ngx_http_lua_socket_tcp_conn_op_resume(r);
+
+    } else {
+        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_op_resume;
+        ngx_http_core_run_phases(r);
+    }
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+static int
+ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
+{
+    lua_pushnil(L);
+    lua_pushliteral(L, "timeout");
+    return 2;
+}
+
+
+static void
+ngx_http_lua_socket_tcp_resume_conn_op(ngx_http_lua_socket_pool_t *spool)
+{
+    ngx_queue_t                             *q;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+
+#if (NGX_DEBUG)
+    ngx_http_lua_assert(spool->connections >= 0);
+
+#else
+    if (spool->connections < 0) {
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                      "lua tcp socket connections count mismatched for "
+                      "connection pool \"%s\", connections: %i, size: %i",
+                      spool->key, spool->connections, spool->size);
+        spool->connections = 0;
+    }
+#endif
+
+    /* we manually destroy wait_connect_op before triggering connect
+     * operation resumption, so that there is no resumption happens when Nginx
+     * is exiting.
+     */
+    if (ngx_queue_empty(&spool->wait_connect_op)) {
+        return;
+    }
+
+    q = ngx_queue_head(&spool->wait_connect_op);
+    conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
+                                 queue);
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua tcp socket post connect operation resumption "
+                   "u: %p, ctx: %p for connection pool \"%s\", "
+                   "connections: %i",
+                   conn_op_ctx->u, conn_op_ctx, spool->key, spool->connections);
+
+    if (conn_op_ctx->event.timer_set) {
+        ngx_del_timer(&conn_op_ctx->event);
+    }
+
+    conn_op_ctx->event.handler =
+        ngx_http_lua_socket_tcp_conn_op_resume_handler;
+
+    ngx_post_event((&conn_op_ctx->event), &ngx_posted_events);
+}
+
+
+static void
+ngx_http_lua_socket_tcp_conn_op_ctx_cleanup(void *data)
+{
+    ngx_http_lua_socket_tcp_upstream_t     *u;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t  *conn_op_ctx = data;
+
+    u = conn_op_ctx->u;
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+                   "cleanup lua tcp socket conn_op_ctx: \"%V\"",
+                   &u->request->uri);
+
+    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
+                          &conn_op_ctx->queue);
+}
+
+
+static void
+ngx_http_lua_socket_tcp_conn_op_resume_handler(ngx_event_t *ev)
+{
+    ngx_queue_t                             *q;
+    ngx_connection_t                        *c;
+    ngx_http_lua_ctx_t                      *ctx;
+    ngx_http_request_t                      *r;
+    ngx_http_cleanup_t                      *cln;
+    ngx_http_lua_co_ctx_t                   *coctx;
+    ngx_http_lua_socket_pool_t              *spool;
+    ngx_http_lua_socket_tcp_upstream_t      *u;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+
+    conn_op_ctx = ev->data;
+    u = conn_op_ctx->u;
+    r = u->request;
+    spool = u->socket_pool;
+
+    if (ngx_queue_empty(&spool->wait_connect_op)) {
+#if (NGX_DEBUG)
+        ngx_http_lua_assert(!(spool->backlog >= 0
+                              && spool->connections > spool->size));
+
+#else
+        if (spool->backlog >= 0 && spool->connections > spool->size) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                          "lua tcp socket connections count mismatched for "
+                          "connection pool \"%s\", connections: %i, size: %i",
+                          spool->key, spool->connections, spool->size);
+            spool->connections = spool->size;
+        }
+#endif
+
+        return;
+    }
+
+    q = ngx_queue_head(&spool->wait_connect_op);
+    ngx_queue_remove(q);
+
+    coctx = u->write_co_ctx;
+    coctx->cleanup = NULL;
+    /* note that we store conn_op_ctx in coctx->data instead of u */
+    coctx->data = conn_op_ctx;
+    /* clear ngx_http_lua_tcp_queue_conn_op_cleanup */
+    u->write_co_ctx = NULL;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        ngx_queue_insert_head(&spool->cache_connect_op,
+                              &conn_op_ctx->queue);
+        return;
+    }
+
+    ctx->cur_co_ctx = coctx;
+
+    ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
+                        || coctx->co_ref >= 0));
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua tcp socket waking up the current request");
+
+    u->write_prepare_retvals =
+        ngx_http_lua_socket_tcp_conn_op_resume_retval_handler;
+
+    c = r->connection;
+
+    if (ctx->entered_content_phase) {
+        (void) ngx_http_lua_socket_tcp_conn_op_resume(r);
+
+    } else {
+        cln = ngx_http_lua_cleanup_add(r, 0);
+        if (cln != NULL) {
+            cln->handler = ngx_http_lua_socket_tcp_conn_op_ctx_cleanup;
+            cln->data = conn_op_ctx;
+            conn_op_ctx->cleanup = &cln->handler;
+        }
+
+        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_op_resume;
+        ngx_http_core_run_phases(r);
+    }
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+static int
+ngx_http_lua_socket_tcp_conn_op_resume_retval_handler(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
+{
+    int                                      nret;
+    ngx_http_lua_ctx_t                      *ctx;
+    ngx_http_lua_co_ctx_t                   *coctx;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    coctx = ctx->cur_co_ctx;
+    dd("coctx: %p", coctx);
+    conn_op_ctx = coctx->data;
+    if (conn_op_ctx->cleanup != NULL) {
+        *conn_op_ctx->cleanup = NULL;
+        ngx_http_lua_cleanup_free(r, conn_op_ctx->cleanup);
+        conn_op_ctx->cleanup = NULL;
+    }
+
+    /* decrease pending connect operation counter */
+    u->socket_pool->connections--;
+
+    nret = ngx_http_lua_socket_tcp_connect_helper(L, u, r, ctx,
+                                                  conn_op_ctx->host.data,
+                                                  conn_op_ctx->host.len,
+                                                  conn_op_ctx->port, 1);
+    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
+                          &conn_op_ctx->queue);
+
+    return nret;
+}
+
+
 static void
 ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u)
@@ -3589,21 +4193,21 @@ ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
 
         ngx_http_lua_socket_tcp_close_connection(c);
         u->peer.connection = NULL;
-
-        if (!u->reused) {
-            return;
-        }
+        u->conn_closed = 1;
 
         spool = u->socket_pool;
         if (spool == NULL) {
             return;
         }
 
-        spool->active_connections--;
+        spool->connections--;
 
-        if (spool->active_connections == 0) {
+        if (spool->connections == 0) {
             ngx_http_lua_socket_free_pool(r->connection->log, spool);
+            return;
         }
+
+        ngx_http_lua_socket_tcp_resume_conn_op(spool);
     }
 }
 
@@ -3775,7 +4379,8 @@ ngx_http_lua_socket_tcp_receiveuntil(lua_State *L)
         return luaL_error(L, "no memory");
     }
 
-    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          pattern_udata_metatable_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -4430,10 +5035,12 @@ ngx_http_lua_req_socket(lua_State *L)
     lua_createtable(L, 2 /* narr */, 3 /* nrec */); /* the object */
 
     if (raw) {
-        lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              raw_req_socket_metatable_key));
 
     } else {
-        lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              req_socket_metatable_key));
     }
 
     lua_rawget(L, LUA_REGISTRYINDEX);
@@ -4445,7 +5052,8 @@ ngx_http_lua_req_socket(lua_State *L)
     }
 
 #if 1
-    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          downstream_udata_metatable_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 #endif
@@ -4572,20 +5180,18 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     ngx_http_lua_socket_tcp_upstream_t  *u;
     ngx_connection_t                    *c;
     ngx_http_lua_socket_pool_t          *spool;
-    size_t                               size, key_len;
     ngx_str_t                            key;
-    ngx_uint_t                           i;
     ngx_queue_t                         *q;
     ngx_peer_connection_t               *pc;
-    u_char                              *p;
     ngx_http_request_t                  *r;
     ngx_msec_t                           timeout;
-    ngx_uint_t                           pool_size;
+    ngx_int_t                            pool_size;
     int                                  n;
     ngx_int_t                            rc;
     ngx_buf_t                           *b;
+    const char                          *msg;
 
-    ngx_http_lua_socket_pool_item_t     *items, *item;
+    ngx_http_lua_socket_pool_item_t     *item;
 
     n = lua_gettop(L);
 
@@ -4596,17 +5202,6 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
 
     luaL_checktype(L, 1, LUA_TTABLE);
 
-    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);
-    if (key.data == NULL) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key not found");
-        return 2;
-    }
-
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
     lua_pop(L, 1);
@@ -4617,7 +5212,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         return 2;
     }
 
-    /* stack: obj cache key */
+    /* stack: obj timeout? size? */
 
     pc = &u->peer;
     c = pc->connection;
@@ -4669,9 +5264,32 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         return 2;
     }
 
+    if (ngx_terminate || ngx_exiting) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                       "lua tcp socket set keepalive while process exiting, "
+                       "closing connection %p", c);
+
+        ngx_http_lua_socket_tcp_finalize(r, u);
+        lua_pushinteger(L, 1);
+        return 1;
+    }
+
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket set keepalive: saving connection %p", c);
 
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
+    lua_rawget(L, LUA_REGISTRYINDEX);
+
+    /* stack: obj timeout? size? pools */
+
+    lua_rawgeti(L, 1, SOCKET_KEY_INDEX);
+    key.data = (u_char *) lua_tolstring(L, -1, &key.len);
+    if (key.data == NULL) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "key not found");
+        return 2;
+    }
+
     dd("saving connection to key %s", lua_tostring(L, -1));
 
     lua_pushvalue(L, -1);
@@ -4679,7 +5297,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     spool = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    /* stack: obj timeout? size? cache key */
+    /* stack: obj timeout? size? pools cache_key */
 
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
@@ -4693,82 +5311,49 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
             pool_size = llcf->pool_size;
         }
 
-        if (pool_size == 0) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "zero pool size");
-            return 2;
+        if (pool_size <= 0) {
+            msg = lua_pushfstring(L, "bad \"pool_size\" option value: %i",
+                                  pool_size);
+            return luaL_argerror(L, n, msg);
         }
 
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket connection pool size: %ui", pool_size);
-
-        key_len = ngx_align(key.len + 1, sizeof(void *));
-
-        size = sizeof(ngx_http_lua_socket_pool_t) + key_len - 1
-               + sizeof(ngx_http_lua_socket_pool_item_t)
-               * pool_size;
-
-        spool = lua_newuserdata(L, size);
-        if (spool == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
-        lua_rawget(L, LUA_REGISTRYINDEX);
-        lua_setmetatable(L, -2);
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "lua tcp socket keepalive create connection pool for key"
-                       " \"%s\"", lua_tostring(L, -2));
-
-        lua_rawset(L, -3);
-
-        spool->active_connections = 0;
-        spool->lua_vm = ngx_http_lua_get_lua_vm(r, NULL);
-
-        ngx_queue_init(&spool->cache);
-        ngx_queue_init(&spool->free);
-
-        p = ngx_copy(spool->key, key.data, key.len);
-        *p++ = '\0';
-
-        items = (ngx_http_lua_socket_pool_item_t *) (spool->key + key_len);
-
-        dd("items: %p", items);
-
-        ngx_http_lua_assert((void *) items == ngx_align_ptr(items,
-                                                            sizeof(void *)));
-
-        for (i = 0; i < pool_size; i++) {
-            ngx_queue_insert_head(&spool->free, &items[i].queue);
-            items[i].socket_pool = spool;
-        }
+        ngx_http_lua_socket_tcp_create_socket_pool(L, r, key, pool_size, -1,
+                                                   &spool);
     }
 
     if (ngx_queue_empty(&spool->free)) {
 
         q = ngx_queue_last(&spool->cache);
         ngx_queue_remove(q);
-        spool->active_connections--;
 
         item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
 
         ngx_http_lua_socket_tcp_close_connection(item->connection);
 
+        /* only decrease the counter for connections which were counted */
+        if (u->socket_pool != NULL) {
+            u->socket_pool->connections--;
+        }
+
     } else {
         q = ngx_queue_head(&spool->free);
         ngx_queue_remove(q);
 
         item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
+
+        /* we should always increase connections after getting connected,
+         * and decrease connections after getting closed.
+         * however, we don't create connection pool in previous connect method.
+         * so we increase connections here for backward compatibility.
+         */
+        if (u->socket_pool == NULL) {
+            spool->connections++;
+        }
     }
 
     item->connection = c;
     ngx_queue_insert_head(&spool->cache, q);
 
-    if (!u->reused) {
-        spool->active_connections++;
-    }
-
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket clear current socket connection");
 
@@ -4837,48 +5422,33 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     ngx_http_lua_socket_tcp_finalize(r, u);
 #endif
 
+    /* since we set u->peer->connection to NULL previously, the connect
+     * operation won't be resumed in the ngx_http_lua_socket_tcp_finalize.
+     * Therefore we need to resume it here.
+     */
+    ngx_http_lua_socket_tcp_resume_conn_op(spool);
+
     lua_pushinteger(L, 1);
     return 1;
 }
 
 
 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_tcp_upstream_t *u)
+ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
+    ngx_http_lua_socket_tcp_upstream_t *u)
 {
     ngx_http_lua_socket_pool_item_t     *item;
     ngx_http_lua_socket_pool_t          *spool;
     ngx_http_cleanup_t                  *cln;
     ngx_queue_t                         *q;
-    int                                  top;
     ngx_peer_connection_t               *pc;
     ngx_connection_t                    *c;
 
-    top = lua_gettop(L);
-
-    if (key_index < 0) {
-        key_index = top + key_index + 1;
-    }
-
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua tcp socket pool get keepalive peer");
 
     pc = &u->peer;
-
-    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 tcp socket keepalive connection pool not found");
-        lua_settop(L, top);
-        return NGX_DECLINED;
-    }
-
-    u->socket_pool = spool;
+    spool = u->socket_pool;
 
     if (!ngx_queue_empty(&spool->cache)) {
         q = ngx_queue_head(&spool->cache);
@@ -4923,7 +5493,6 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
             cln = ngx_http_lua_cleanup_add(r, 0);
             if (cln == NULL) {
                 u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-                lua_settop(L, top);
                 return NGX_ERROR;
             }
 
@@ -4932,16 +5501,12 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
             u->cleanup = &cln->handler;
         }
 
-        lua_settop(L, top);
-
         return NGX_OK;
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket keepalive: connection pool empty");
 
-    lua_settop(L, top);
-
     return NGX_DECLINED;
 }
 
@@ -5013,13 +5578,15 @@ close:
 
     ngx_queue_remove(&item->queue);
     ngx_queue_insert_head(&spool->free, &item->queue);
-    spool->active_connections--;
+    spool->connections--;
 
-    dd("keepalive: active connections: %u",
-       (unsigned) spool->active_connections);
+    dd("keepalive: connections: %u", (unsigned) spool->connections);
 
-    if (spool->active_connections == 0) {
+    if (spool->connections == 0) {
         ngx_http_lua_socket_free_pool(ev->log, spool);
+
+    } else {
+        ngx_http_lua_socket_tcp_resume_conn_op(spool);
     }
 
     return NGX_DECLINED;
@@ -5037,7 +5604,7 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 
     L = spool->lua_vm;
 
-    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushstring(L, (char *) spool->key);
     lua_pushnil(L);
@@ -5049,9 +5616,10 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 static void
 ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
 {
-    ngx_queue_t                         *q;
-    ngx_connection_t                    *c;
-    ngx_http_lua_socket_pool_item_t     *item;
+    ngx_queue_t                             *q;
+    ngx_connection_t                        *c;
+    ngx_http_lua_socket_pool_item_t         *item;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
 
     while (!ngx_queue_empty(&spool->cache)) {
         q = ngx_queue_head(&spool->cache);
@@ -5065,7 +5633,29 @@ ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
         ngx_queue_insert_head(&spool->free, q);
     }
 
-    spool->active_connections = 0;
+    while (!ngx_queue_empty(&spool->cache_connect_op)) {
+        q = ngx_queue_head(&spool->cache_connect_op);
+        ngx_queue_remove(q);
+        conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
+                                     queue);
+        ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx);
+    }
+
+    while (!ngx_queue_empty(&spool->wait_connect_op)) {
+        q = ngx_queue_head(&spool->wait_connect_op);
+        ngx_queue_remove(q);
+        conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
+                                     queue);
+
+        if (conn_op_ctx->event.timer_set) {
+            ngx_del_timer(&conn_op_ctx->event);
+        }
+
+        ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx);
+    }
+
+    /* spool->connections will be decreased down to zero in
+     * ngx_http_lua_socket_tcp_finalize */
 }
 
 
@@ -5319,6 +5909,13 @@ static ngx_int_t ngx_http_lua_socket_insert_buffer(ngx_http_request_t *r,
 }
 
 
+static ngx_int_t
+ngx_http_lua_socket_tcp_conn_op_resume(ngx_http_request_t *r)
+{
+    return ngx_http_lua_socket_tcp_resume_helper(r, SOCKET_OP_RESUME_CONN);
+}
+
+
 static ngx_int_t
 ngx_http_lua_socket_tcp_conn_resume(ngx_http_request_t *r)
 {
@@ -5343,13 +5940,14 @@ ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 {
-    int                          nret;
-    lua_State                   *vm;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_connection_t            *c;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
+    int                                    nret;
+    lua_State                             *vm;
+    ngx_int_t                              rc;
+    ngx_uint_t                             nreqs;
+    ngx_connection_t                      *c;
+    ngx_http_lua_ctx_t                    *ctx;
+    ngx_http_lua_co_ctx_t                 *coctx;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t *conn_op_ctx;
 
     ngx_http_lua_socket_tcp_retval_handler  prepare_retvals;
 
@@ -5369,15 +5967,22 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 
     dd("coctx: %p", coctx);
 
-    u = coctx->data;
-
     switch (socket_op) {
+
+    case SOCKET_OP_RESUME_CONN:
+        conn_op_ctx = coctx->data;
+        u = conn_op_ctx->u;
+        prepare_retvals = u->write_prepare_retvals;
+        break;
+
     case SOCKET_OP_CONNECT:
     case SOCKET_OP_WRITE:
+        u = coctx->data;
         prepare_retvals = u->write_prepare_retvals;
         break;
 
     case SOCKET_OP_READ:
+        u = coctx->data;
         prepare_retvals = u->read_prepare_retvals;
         break;
 
@@ -5391,6 +5996,15 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
                    "u:%p", prepare_retvals, u);
 
     nret = prepare_retvals(r, u, ctx->cur_co_ctx->co);
+    if (socket_op == SOCKET_OP_CONNECT
+        && nret > 1
+        && !u->conn_closed
+        && u->socket_pool != NULL)
+    {
+        u->socket_pool->connections--;
+        ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
+    }
+
     if (nret == NGX_AGAIN) {
         return NGX_DONE;
     }
@@ -5422,6 +6036,36 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 }
 
 
+static void
+ngx_http_lua_tcp_queue_conn_op_cleanup(void *data)
+{
+    ngx_http_lua_co_ctx_t                  *coctx = data;
+    ngx_http_lua_socket_tcp_upstream_t     *u;
+    ngx_http_lua_socket_tcp_conn_op_ctx_t  *conn_op_ctx;
+
+    conn_op_ctx = coctx->data;
+    u = conn_op_ctx->u;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua tcp socket abort queueing, conn_op_ctx: %p, u: %p",
+                   conn_op_ctx, u);
+
+    if (conn_op_ctx->event.posted) {
+        ngx_delete_posted_event(&conn_op_ctx->event);
+
+    } else if (conn_op_ctx->event.timer_set) {
+        ngx_del_timer(&conn_op_ctx->event);
+    }
+
+    ngx_queue_remove(&conn_op_ctx->queue);
+    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
+                          &conn_op_ctx->queue);
+
+    u->socket_pool->connections--;
+    ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
+}
+
+
 static void
 ngx_http_lua_tcp_resolve_cleanup(void *data)
 {
@@ -5437,6 +6081,11 @@ ngx_http_lua_tcp_resolve_cleanup(void *data)
         return;
     }
 
+    if (u->socket_pool != NULL) {
+        u->socket_pool->connections--;
+        ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
+    }
+
     rctx = u->resolved->ctx;
     if (rctx == NULL) {
         return;
@@ -5496,7 +6145,8 @@ ngx_http_lua_cleanup_conn_pools(lua_State *L)
 {
     ngx_http_lua_socket_pool_t          *spool;
 
-    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          socket_pool_key));
     lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
     lua_pushnil(L);  /* first key */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
index dbdee41..091e437 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
@@ -35,17 +35,39 @@ 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 {
+    ngx_event_t                         event;
+    ngx_queue_t                         queue;
+    ngx_str_t                           host;
+    ngx_http_cleanup_pt                *cleanup;
+    ngx_http_lua_socket_tcp_upstream_t *u;
+    in_port_t                           port;
+} ngx_http_lua_socket_tcp_conn_op_ctx_t;
+
+
+#define ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx)                \
+    ngx_free(conn_op_ctx->host.data);                                        \
+    ngx_free(conn_op_ctx)
+
+
 typedef struct {
     lua_State                         *lua_vm;
 
-    /* active connections == out-of-pool reused connections
-     *                       + in-pool connections */
-    ngx_uint_t                         active_connections;
+    ngx_int_t                          size;
+    ngx_queue_t                        cache_connect_op;
+    ngx_queue_t                        wait_connect_op;
+
+    /* connections == active connections + pending connect operations,
+     * while active connections == out-of-pool reused connections
+     *                             + in-pool connections */
+    ngx_int_t                          connections;
 
     /* queues of ngx_http_lua_socket_pool_item_t: */
     ngx_queue_t                        cache;
     ngx_queue_t                        free;
 
+    ngx_int_t                          backlog;
+
     u_char                             key[1];
 
 } ngx_http_lua_socket_pool_t;
@@ -104,6 +126,7 @@ struct ngx_http_lua_socket_tcp_upstream_s {
     unsigned                         raw_downstream:1;
     unsigned                         read_closed:1;
     unsigned                         write_closed:1;
+    unsigned                         conn_closed:1;
 #if (NGX_HTTP_SSL)
     unsigned                         ssl_verify:1;
     unsigned                         ssl_session_reuse:1;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
index 8927f41..cbc32d6 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
@@ -81,7 +81,8 @@ ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
     lua_setfield(L, -2, "udp"); /* ngx socket */
 
     /* udp socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          socket_udp_metatable_key));
     lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_udp_setpeername);
@@ -105,7 +106,8 @@ ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* udp socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          udp_udata_metatable_key));
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_udp_upstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -144,7 +146,8 @@ ngx_http_lua_socket_udp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     lua_createtable(L, 3 /* narr */, 1 /* nrec */);
-    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          socket_udp_metatable_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -263,7 +266,8 @@ ngx_http_lua_socket_udp_setpeername(lua_State *L)
         }
 
 #if 1
-        lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              udp_udata_metatable_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
 #endif
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
index 453a5c7..622d0a5 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
@@ -498,9 +498,11 @@ ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /* save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
index 0b88a87..303efb4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
@@ -505,9 +505,11 @@ ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
+#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /* save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
index 7609c39..a02f729 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
@@ -380,6 +380,8 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     /* init nginx context in Lua VM */
     ngx_http_lua_set_req(L, r);
+
+#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ make new env inheriting main thread's globals table */
@@ -390,6 +392,7 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
+#endif
 
     lua_pushcfunction(L, ngx_http_lua_traceback);
     lua_insert(L, 1);  /* put it under chunk and args */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_string.c b/debian/modules/http-lua/src/ngx_http_lua_string.c
index 239b232..bdadeb4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_string.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_string.c
@@ -762,6 +762,20 @@ ngx_http_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst)
     ngx_http_lua_escape_uri(dst, (u_char *) src, len, NGX_ESCAPE_URI_COMPONENT);
 }
 
+
+void
+ngx_http_lua_ffi_str_replace_char(u_char *buf, size_t len, const u_char find,
+    const u_char replace)
+{
+    while (len) {
+        if (*buf == find) {
+            *buf = replace;
+        }
+
+        buf++;
+        len--;
+    }
+}
 #endif
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
index 826a43c..f312b65 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
@@ -1031,6 +1031,14 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
     dd("pr_coctx status: %d", (int) pr_coctx->sr_statuses[ctx->index]);
 
     /* copy subrequest response headers */
+    if (ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r, ctx);
+        if (rc != NGX_OK) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "failed to set default content type: %i", rc);
+            return NGX_ERROR;
+        }
+    }
 
     pr_coctx->sr_headers[ctx->index] = &r->headers_out;
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_timer.c b/debian/modules/http-lua/src/ngx_http_lua_timer.c
index 596b2f7..e92c211 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_timer.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_timer.c
@@ -220,6 +220,7 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
 
     ngx_http_lua_probe_user_coroutine_create(r, L, co);
 
+#ifndef OPENRESTY_LUAJIT
     lua_createtable(co, 0, 0);  /* the new globals table */
 
     /* co stack: global_tb */
@@ -232,6 +233,7 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
     /* co stack: global_tb */
 
     ngx_http_lua_set_globals_table(co);
+#endif
 
     /* co stack: <empty> */
 
@@ -251,12 +253,15 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
     /* L stack: time func [args] thread */
     /* co stack: func */
 
+#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /* co stack: func */
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     /* L stack: time func [args] thread coroutines */
@@ -345,6 +350,9 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
 
     ngx_add_timer(ev, delay);
 
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "created timer (co: %p delay: %M ms)", tctx->co, delay);
+
     lua_pushinteger(L, 1);
     return 1;
 
@@ -358,7 +366,8 @@ nomem:
         ngx_free(ev);
     }
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     luaL_unref(L, -1, co_ref);
 
@@ -387,6 +396,7 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
 
     co = lua_newthread(vm);
 
+#ifndef OPENRESTY_LUAJIT
     lua_createtable(co, 0, 0);  /* the new globals table */
 
     /* co stack: global_tb */
@@ -399,6 +409,7 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
     /* co stack: global_tb */
 
     ngx_http_lua_set_globals_table(co);
+#endif
 
     /* co stack: <empty> */
 
@@ -418,12 +429,15 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
     /* L stack: func [args] thread */
     /* co stack: func */
 
+#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
+#endif
 
     /* co stack: func */
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     /* L stack: func [args] thread coroutines */
@@ -498,6 +512,10 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
 
     ngx_add_timer(ev, tctx->delay);
 
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "created next timer (co: %p delay: %M ms)", tctx->co,
+                   tctx->delay);
+
     return NGX_OK;
 
 nomem:
@@ -512,7 +530,8 @@ nomem:
 
     /* L stack: func [args] */
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     luaL_unref(L, -1, co_ref);
 
@@ -568,6 +587,9 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     c = ngx_http_lua_create_fake_connection(tctx.pool);
     if (c == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "failed to create fake connection to run timer (co: %p)",
+                      tctx.co);
         goto failed;
     }
 
@@ -579,6 +601,9 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     r = ngx_http_lua_create_fake_request(c);
     if (r == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "failed to create fake request to run timer (co: %p)",
+                      tctx.co);
         goto failed;
     }
 
@@ -614,6 +639,8 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     ctx = ngx_http_lua_create_ctx(r);
     if (ctx == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "failed to create ctx to run timer (co: %p)", tctx.co);
         goto failed;
     }
 
@@ -622,6 +649,9 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
         pcln = ngx_pool_cleanup_add(r->pool, 0);
         if (pcln == NULL) {
+            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                          "failed to add vm cleanup to run timer (co: %p)",
+                          tctx.co);
             goto failed;
         }
 
@@ -635,6 +665,9 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     cln = ngx_http_cleanup_add(r, 0);
     if (cln == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "failed to add request cleanup to run timer (co: %p)",
+                      tctx.co);
         goto failed;
     }
 
@@ -692,7 +725,8 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 failed:
 
     if (tctx.co_ref && tctx.co) {
-        lua_pushlightuserdata(tctx.co, &ngx_http_lua_coroutines_key);
+        lua_pushlightuserdata(tctx.co, ngx_http_lua_lightudata_mask(
+                              coroutines_key));
         lua_rawget(tctx.co, LUA_REGISTRYINDEX);
         luaL_unref(tctx.co, -1, tctx.co_ref);
         lua_settop(tctx.co, 0);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_uthread.c b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
index 8195ec0..43517a0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_uthread.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
@@ -70,7 +70,8 @@ ngx_http_lua_uthread_spawn(lua_State *L)
 
     /* anchor the newly created coroutine into the Lua registry */
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushvalue(L, -2);
     coctx->co_ref = luaL_ref(L, -2);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.c b/debian/modules/http-lua/src/ngx_http_lua_util.c
index f7a537e..c12262e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.c
@@ -70,6 +70,25 @@
 #endif
 
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+#define NGX_HTTP_LUA_SA_RESTART_SIGS {                                       \
+    ngx_signal_value(NGX_RECONFIGURE_SIGNAL),                                \
+    ngx_signal_value(NGX_REOPEN_SIGNAL),                                     \
+    ngx_signal_value(NGX_NOACCEPT_SIGNAL),                                   \
+    ngx_signal_value(NGX_TERMINATE_SIGNAL),                                  \
+    ngx_signal_value(NGX_SHUTDOWN_SIGNAL),                                   \
+    ngx_signal_value(NGX_CHANGEBIN_SIGNAL),                                  \
+    SIGALRM,                                                                 \
+    SIGINT,                                                                  \
+    SIGIO,                                                                   \
+    SIGCHLD,                                                                 \
+    SIGSYS,                                                                  \
+    SIGPIPE,                                                                 \
+    0                                                                        \
+};
+#endif
+
+
 char ngx_http_lua_code_cache_key;
 char ngx_http_lua_regex_cache_key;
 char ngx_http_lua_socket_pool_key;
@@ -128,6 +147,13 @@ static int ngx_http_lua_get_raw_phase_context(lua_State *L);
 #define LUA_PATH_SEP ";"
 #endif
 
+
+#if !defined(LUA_DEFAULT_PATH) && (NGX_DEBUG)
+#define LUA_DEFAULT_PATH "../lua-resty-core/lib/?.lua;"                      \
+                         "../lua-resty-lrucache/lib/?.lua"
+#endif
+
+
 #define AUX_MARK "\1"
 
 
@@ -171,6 +197,7 @@ ngx_http_lua_set_path(ngx_cycle_t *cycle, lua_State *L, int tab_idx,
 }
 
 
+#ifndef OPENRESTY_LUAJIT
 /**
  * Create new table and set _G field to itself.
  *
@@ -185,6 +212,7 @@ ngx_http_lua_create_new_globals_table(lua_State *L, int narr, int nrec)
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "_G");
 }
+#endif /* OPENRESTY_LUAJIT */
 
 
 static lua_State *
@@ -313,11 +341,13 @@ ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
 
     base = lua_gettop(L);
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     co = lua_newthread(L);
 
+#ifndef OPENRESTY_LUAJIT
     /*  {{{ inherit coroutine's globals to main thread's globals table
      *  for print() function will try to find tostring() in current
      *  globals table.
@@ -332,6 +362,7 @@ ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
 
     ngx_http_lua_set_globals_table(co);
     /*  }}} */
+#endif /* OPENRESTY_LUAJIT */
 
     *ref = luaL_ref(L, -2);
 
@@ -356,7 +387,8 @@ ngx_http_lua_del_thread(ngx_http_request_t *r, lua_State *L,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua deleting light thread");
 
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
@@ -408,7 +440,9 @@ ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
             r->headers_out.status = NGX_HTTP_OK;
         }
 
-        if (!ctx->headers_set && ngx_http_lua_set_content_type(r) != NGX_OK) {
+        if (!ctx->mime_set
+            && ngx_http_lua_set_content_type(r, ctx) != NGX_OK)
+        {
             return NGX_ERROR;
         }
 
@@ -657,7 +691,8 @@ ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log)
 
     /* {{{ register a table to anchor lua coroutines reliably:
      * {([int]ref) = [cort]} */
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          coroutines_key));
     lua_createtable(L, 0, 32 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
@@ -668,20 +703,23 @@ ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log)
     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_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          socket_pool_key));
     lua_createtable(L, 0, 8 /* nrec */);
     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_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          regex_cache_key));
     lua_createtable(L, 0, 16 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
 #endif
 
     /* {{{ register table to cache user code:
      * { [(string)cache_key] = <code closure> } */
-    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
+    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                          code_cache_key));
     lua_createtable(L, 0, 8 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
@@ -695,9 +733,6 @@ ngx_http_lua_init_globals(lua_State *L, ngx_cycle_t *cycle,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
                    "lua initializing lua globals");
 
-    lua_pushlightuserdata(L, cycle);
-    lua_setglobal(L, "__ngx_cycle");
-
 #if defined(NDK) && NDK
     ngx_http_lua_inject_ndk_api(L);
 #endif /* defined(NDK) && NDK */
@@ -756,6 +791,52 @@ ngx_http_lua_inject_ngx_api(lua_State *L, ngx_http_lua_main_conf_t *lmcf,
     lua_setglobal(L, "ngx");
 
     ngx_http_lua_inject_coroutine_api(log, L);
+
+#ifdef OPENRESTY_LUAJIT
+    {
+        int         rc;
+
+        const char buf[] =
+            "local ngx_log = ngx.log\n"
+            "local ngx_WARN = ngx.WARN\n"
+            "local tostring = tostring\n"
+            "local ngx_get_phase = ngx.get_phase\n"
+            "local traceback = require 'debug'.traceback\n"
+            "local function newindex(table, key, value)\n"
+                "rawset(table, key, value)\n"
+                "local phase = ngx_get_phase()\n"
+                "if phase == 'init_worker' or phase == 'init' then\n"
+                    "return\n"
+                "end\n"
+                "ngx_log(ngx_WARN, 'writing a global lua variable "
+                         "(\\'', tostring(key), '\\') which may lead to "
+                         "race conditions between concurrent requests, so "
+                         "prefer the use of \\'local\\' variables', "
+                         "traceback('', 2))\n"
+            "end\n"
+            "setmetatable(_G, { __newindex = newindex })\n"
+            ;
+
+        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "=_G write guard");
+
+        if (rc != 0) {
+            ngx_log_error(NGX_LOG_ERR, log, 0,
+                          "failed to load Lua code (%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 Lua code (%i): %s",
+                          rc, lua_tostring(L, -1));
+            lua_pop(L, 1);
+        }
+    }
+#endif
 }
 
 
@@ -2954,12 +3035,12 @@ ngx_http_lua_param_get(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_BODY_FILTER);
 
     if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SET)) {
-        return ngx_http_lua_setby_param_get(L);
+        return ngx_http_lua_setby_param_get(L, r);
     }
 
     /* ctx->context & (NGX_HTTP_LUA_CONTEXT_BODY_FILTER) */
 
-    return ngx_http_lua_body_filter_param_get(L);
+    return ngx_http_lua_body_filter_param_get(L, r);
 }
 
 
@@ -3156,7 +3237,8 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
 
         ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
-        lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                              coroutines_key));
         lua_rawget(L, LUA_REGISTRYINDEX);
         inited = 1;
 
@@ -3194,7 +3276,8 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
                 ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
                 if (!inited) {
-                    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+                    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                                          coroutines_key));
                     lua_rawget(L, LUA_REGISTRYINDEX);
                     inited = 1;
                 }
@@ -3223,7 +3306,8 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
         ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
         if (!inited) {
-            lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+            lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
+                                  coroutines_key));
             lua_rawget(L, LUA_REGISTRYINDEX);
             inited = 1;
         }
@@ -3736,6 +3820,7 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
     ngx_pool_t *pool, ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log,
     ngx_pool_cleanup_t **pcln)
 {
+    int                              rc;
     lua_State                       *L;
     ngx_uint_t                       i;
     ngx_pool_cleanup_t              *cln;
@@ -3778,6 +3863,11 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
         *pcln = cln;
     }
 
+#ifdef OPENRESTY_LUAJIT
+    /* load FFI library first since cdata needs it */
+    luaopen_ffi(L);
+#endif
+
     if (lmcf->preload_hooks) {
 
         /* register the 3rd-party module's preload hooks */
@@ -3798,6 +3888,21 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
         lua_pop(L, 2);
     }
 
+    if (lmcf->load_resty_core) {
+        lua_getglobal(L, "require");
+        lua_pushstring(L, "resty.core");
+
+        rc = lua_pcall(L, 1, 1, 0);
+        if (rc != 0) {
+            ngx_log_error(NGX_LOG_ERR, log, 0,
+                          "lua_load_resty_core failed to load the resty.core "
+                          "module from https://github.com/openresty/lua-resty"
+                          "-core; ensure you are using an OpenResty release "
+                          "from https://openresty.org/en/download.html "
+                          "(rc: %i, reason: %s)", rc, lua_tostring(L, -1));
+        }
+    }
+
     return L;
 }
 
@@ -4041,7 +4146,12 @@ ngx_http_lua_get_raw_phase_context(lua_State *L)
     ngx_http_request_t      *r;
     ngx_http_lua_ctx_t      *ctx;
 
+#ifdef OPENRESTY_LUAJIT
+    r = lua_getexdata(L);
+#else
     r = lua_touserdata(L, 1);
+#endif
+
     if (r == NULL) {
         return 0;
     }
@@ -4129,4 +4239,32 @@ ngx_http_lua_cleanup_free(ngx_http_request_t *r, ngx_http_cleanup_pt *cleanup)
 }
 
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+void
+ngx_http_lua_set_sa_restart(ngx_log_t *log)
+{
+    int                    *signo;
+    int                     sigs[] = NGX_HTTP_LUA_SA_RESTART_SIGS;
+    struct sigaction        act;
+
+    for (signo = sigs; *signo != 0; signo++) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
+                       "setting SA_RESTART for signal %d", *signo);
+
+        if (sigaction(*signo, NULL, &act) != 0) {
+            ngx_log_error(NGX_LOG_WARN, log, ngx_errno, "failed to get "
+                          "sigaction for signal %d", *signo);
+        }
+
+        act.sa_flags |= SA_RESTART;
+
+        if (sigaction(*signo, &act, NULL) != 0) {
+            ngx_log_error(NGX_LOG_WARN, log, ngx_errno, "failed to set "
+                          "sigaction for signal %d", *signo);
+        }
+    }
+}
+#endif
+
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.h b/debian/modules/http-lua/src/ngx_http_lua_util.h
index 7dcc6f7..f08f481 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.h
@@ -9,6 +9,11 @@
 #define _NGX_HTTP_LUA_UTIL_H_INCLUDED_
 
 
+#ifdef DDEBUG
+#include "ddebug.h"
+#endif
+
+
 #include "ngx_http_lua_common.h"
 #include "ngx_http_lua_api.h"
 
@@ -188,7 +193,9 @@ ngx_int_t ngx_http_lua_open_and_stat_file(u_char *name,
 ngx_chain_t *ngx_http_lua_chain_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
     ngx_chain_t **free, size_t len);
 
+#ifndef OPENRESTY_LUAJIT
 void ngx_http_lua_create_new_globals_table(lua_State *L, int narr, int nrec);
+#endif
 
 int ngx_http_lua_traceback(lua_State *L);
 
@@ -243,6 +250,9 @@ ngx_http_cleanup_t *ngx_http_lua_cleanup_add(ngx_http_request_t *r,
 void ngx_http_lua_cleanup_free(ngx_http_request_t *r,
     ngx_http_cleanup_pt *cleanup);
 
+#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
+void ngx_http_lua_set_sa_restart(ngx_log_t *log);
+#endif
 
 #define ngx_http_lua_check_if_abortable(L, ctx)                              \
     if ((ctx)->no_abort) {                                                   \
@@ -282,7 +292,9 @@ ngx_http_lua_create_ctx(ngx_http_request_t *r)
     if (!llcf->enable_code_cache && r->connection->fd != (ngx_socket_t) -1) {
         lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
+#ifdef DDEBUG
         dd("lmcf: %p", lmcf);
+#endif
 
         L = ngx_http_lua_init_vm(lmcf->lua, lmcf->cycle, r->pool, lmcf,
                                  r->connection->log, &cln);
@@ -323,7 +335,11 @@ ngx_http_lua_get_lua_vm(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
     }
 
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+
+#ifdef DDEBUG
     dd("lmcf->lua: %p", lmcf->lua);
+#endif
+
     return lmcf->lua;
 }
 
@@ -334,6 +350,9 @@ ngx_http_lua_get_lua_vm(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 static ngx_inline ngx_http_request_t *
 ngx_http_lua_get_req(lua_State *L)
 {
+#ifdef OPENRESTY_LUAJIT
+    return lua_getexdata(L);
+#else
     ngx_http_request_t    *r;
 
     lua_getglobal(L, ngx_http_lua_req_key);
@@ -341,14 +360,19 @@ ngx_http_lua_get_req(lua_State *L)
     lua_pop(L, 1);
 
     return r;
+#endif
 }
 
 
 static ngx_inline void
 ngx_http_lua_set_req(lua_State *L, ngx_http_request_t *r)
 {
+#ifdef OPENRESTY_LUAJIT
+    lua_setexdata(L, (void *) r);
+#else
     lua_pushlightuserdata(L, r);
     lua_setglobal(L, ngx_http_lua_req_key);
+#endif
 }
 
 
@@ -387,10 +411,12 @@ ngx_http_lua_hash_str(u_char *src, size_t n)
 
 
 static ngx_inline ngx_int_t
-ngx_http_lua_set_content_type(ngx_http_request_t *r)
+ngx_http_lua_set_content_type(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 {
     ngx_http_lua_loc_conf_t     *llcf;
 
+    ctx->mime_set = 1;
+
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->use_default_type
         && r->headers_out.status != NGX_HTTP_NOT_MODIFIED)
diff --git a/debian/modules/http-lua/src/ngx_http_lua_worker.c b/debian/modules/http-lua/src/ngx_http_lua_worker.c
index 461509b..33cfa11 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_worker.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_worker.c
@@ -153,6 +153,8 @@ ngx_http_lua_ffi_master_pid(void)
 int
 ngx_http_lua_ffi_get_process_type(void)
 {
+    ngx_core_conf_t  *ccf;
+
 #if defined(HAVE_PRIVILEGED_PROCESS_PATCH) && !NGX_WIN32
     if (ngx_process == NGX_PROCESS_HELPER) {
         if (ngx_is_privileged_agent) {
@@ -161,6 +163,15 @@ ngx_http_lua_ffi_get_process_type(void)
     }
 #endif
 
+    if (ngx_process == NGX_PROCESS_SINGLE) {
+        ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
+                                               ngx_core_module);
+
+        if (ccf->master) {
+            return NGX_PROCESS_MASTER;
+        }
+    }
+
     return ngx_process;
 }
 
diff --git a/debian/modules/http-lua/t/000--init.t b/debian/modules/http-lua/t/000--init.t
index dbe2c33..5865755 100644
--- a/debian/modules/http-lua/t/000--init.t
+++ b/debian/modules/http-lua/t/000--init.t
@@ -10,11 +10,6 @@ $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
 
 our $http_config = <<'_EOC_';
-    upstream database {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
-                       dbname=ngx_test user=ngx_test password=ngx_test;
-    }
-
     lua_package_path "../lua-resty-mysql/lib/?.lua;;";
 _EOC_
 
diff --git a/debian/modules/http-lua/t/001-set.t b/debian/modules/http-lua/t/001-set.t
index ba8f22c..9e8ee7b 100644
--- a/debian/modules/http-lua/t/001-set.t
+++ b/debian/modules/http-lua/t/001-set.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 4);
+plan tests => repeat_each() * (blocks() * 3 + 5);
 
 #log_level("warn");
 no_long_string();
@@ -46,7 +46,7 @@ helloworld
 === TEST 3: internal only
 --- config
     location /lua {
-        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(10)";
+        set_by_lua $res "local function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(10)";
         echo $res;
     }
 --- request
@@ -76,7 +76,7 @@ GET /lua?a=1&b=2
 === TEST 5: fib by arg
 --- config
     location /fib {
-        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(tonumber(ngx.arg[1]))" $arg_n;
+        set_by_lua $res "local function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(tonumber(ngx.arg[1]))" $arg_n;
         echo $res;
     }
 --- request
@@ -592,25 +592,30 @@ failed to run set_by_lua*: unknown reason
 
 
 
-=== TEST 37: globals get cleared for every single request
+=== TEST 37: globals are shared in all requests.
 --- config
     location /lua {
-        set_by_lua $res '
+        set_by_lua_block $res {
             if not foo then
                 foo = 1
             else
+                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             return foo
-        ';
+        }
         echo $res;
     }
 --- request
 GET /lua
---- response_body
-1
+--- response_body_like chomp
+\A[12]
+\z
 --- no_error_log
 [error]
+--- grep_error_log eval: qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
+--- grep_error_log_out eval
+["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
 
 
 
@@ -755,6 +760,8 @@ GET /lua?name=jim
 --- config
     location /t {
         set_by_lua $a '
+            local bar
+            local foo
             function foo()
                 bar()
             end
diff --git a/debian/modules/http-lua/t/002-content.t b/debian/modules/http-lua/t/002-content.t
index cc92d6f..bb569f5 100644
--- a/debian/modules/http-lua/t/002-content.t
+++ b/debian/modules/http-lua/t/002-content.t
@@ -86,7 +86,7 @@ qr/content_by_lua\(nginx\.conf:\d+\):1: attempt to call field 'echo' \(a nil val
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        content_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        content_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
     }
 --- request
 GET /lua?a=1&b=2
@@ -102,7 +102,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-v = ngx.var["request_uri"]
+local v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -154,7 +154,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        content_by_lua 'who = ngx.var.arg_who
+        content_by_lua 'local who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
     }
 --- request
@@ -171,7 +171,7 @@ Hello, agentzh!
     }
 
     location /lua {
-        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status, " "); ngx.print("body=", res.body)';
+        content_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status, " "); ngx.print("body=", res.body)';
     }
 --- request
 GET /lua
@@ -183,7 +183,7 @@ status=200 body=hello, world
 ei= TEST 9: capture non-existed location
 --- config
     location /lua {
-        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        content_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
     }
 --- request
 GET /lua
@@ -194,7 +194,7 @@ GET /lua
 === TEST 9: invalid capture location (not as expected...)
 --- config
     location /lua {
-        content_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        content_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
     }
 --- request
 GET /lua
@@ -247,7 +247,7 @@ GET /lua
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body, "\\n");
            else
@@ -271,7 +271,7 @@ end
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -353,7 +353,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    content_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    content_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
 }
 --- request
 GET /parent
@@ -369,7 +369,7 @@ location /sub {
 location /parent {
     set $a 12;
     content_by_lua '
-        res = ngx.location.capture(
+        local res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -390,7 +390,7 @@ location /sub {
 }
 location /parent {
     content_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = true });
+        local res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 }
@@ -408,7 +408,7 @@ location /sub {
 }
 location /parent {
     content_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = false });
+        local res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
 }
@@ -427,7 +427,7 @@ GET /parent
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
     }
@@ -454,7 +454,7 @@ type: foo/bar
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", type(res.header["Set-Cookie"]));
             ngx.say("len: ", #res.header["Set-Cookie"]);
             ngx.say("value: ", table.concat(res.header["Set-Cookie"], "|"))
@@ -482,7 +482,7 @@ value: a|hello, world|foo
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -507,7 +507,7 @@ Bar: Bah
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
@@ -524,7 +524,7 @@ Bar: nil
 --- config
     location /lua {
         content_by_lua '
-            data = "hello, world"
+            local data = "hello, world"
             -- ngx.header["Content-Length"] = #data
             -- ngx.header.content_length = #data
             ngx.print(data)
@@ -742,7 +742,7 @@ true
 --- config
     location /lua {
         content_by_lua '
-            data = "hello,\\nworld\\n"
+            local data = "hello,\\nworld\\n"
             ngx.header["Content-Length"] = #data
             ngx.say("hello,")
             ngx.flush()
@@ -801,7 +801,7 @@ world
     }
 --- user_files
 >>> test.lua
-v = ngx.var["request_uri"]
+local v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
diff --git a/debian/modules/http-lua/t/004-require.t b/debian/modules/http-lua/t/004-require.t
index 35e04db..17e1d57 100644
--- a/debian/modules/http-lua/t/004-require.t
+++ b/debian/modules/http-lua/t/004-require.t
@@ -24,7 +24,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /main {
         echo_location /load;
@@ -85,7 +85,7 @@ hello, foo
 --- request
 GET /main
 --- user_files
---- response_body_like: ^[^;]+/servroot/html/\?.so$
+--- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.so$
 
 
 
@@ -100,7 +100,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^[^;]+/servroot/html/\?.lua;.+\.lua;$
+--- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.lua;(.+\.lua)?;*$
 
 
 
@@ -115,7 +115,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^[^;]+/servroot/html/\?.so;.+\.so;$
+--- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.so;(.+\.so)?;*$
 
 
 
@@ -130,7 +130,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^.+\.lua;[^;]+/servroot/html/\?.lua$
+--- response_body_like: ^(.+\.lua)?;*?[^;]+/servroot(_\d+)?/html/\?\.lua$
 
 
 
@@ -145,7 +145,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^.+\.so;[^;]+/servroot/html/\?.so$
+--- response_body_like: ^(.+\.so)?;*?[^;]+/servroot(_\d+)?/html/\?\.so$
 
 
 
diff --git a/debian/modules/http-lua/t/005-exit.t b/debian/modules/http-lua/t/005-exit.t
index a5a28b3..a416a75 100644
--- a/debian/modules/http-lua/t/005-exit.t
+++ b/debian/modules/http-lua/t/005-exit.t
@@ -452,7 +452,7 @@ Hi
 --- config
     location /lua {
         content_by_lua '
-            function f ()
+            local function f ()
                 ngx.say("hello")
                 ngx.exit(200)
             end
diff --git a/debian/modules/http-lua/t/009-log.t b/debian/modules/http-lua/t/009-log.t
index 68c057f..cb3895b 100644
--- a/debian/modules/http-lua/t/009-log.t
+++ b/debian/modules/http-lua/t/009-log.t
@@ -414,6 +414,8 @@ GET /log
 --- config
     location /log {
         content_by_lua '
+            local foo
+            local bar
             function foo()
                 bar()
             end
@@ -431,7 +433,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):7: bar\(\): hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):9: bar\(\): hello, log12343.14159/
 
 
 
@@ -439,6 +441,8 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):7: bar\(\): hell
 --- config
     location /log {
         content_by_lua '
+            local foo
+            local bar
             function foo()
                 return bar(5)
             end
@@ -461,7 +465,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8:(?: foo\(\):)? hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):10:(?: foo\(\):)? hello, log12343.14159/
 
 
 
@@ -472,6 +476,8 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8:(?: foo\(\):)?
     }
 --- user_files
 >>> test.lua
+local foo
+local bar
 function foo()
     bar()
 end
@@ -488,7 +494,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] test.lua:6: bar\(\): hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] test.lua:8: bar\(\): hello, log12343.14159/
 
 
 
diff --git a/debian/modules/http-lua/t/011-md5_bin.t b/debian/modules/http-lua/t/011-md5_bin.t
index ae7c974..dc0fd9c 100644
--- a/debian/modules/http-lua/t/011-md5_bin.t
+++ b/debian/modules/http-lua/t/011-md5_bin.t
@@ -156,7 +156,7 @@ d41d8cd98f00b204e9800998ecf8427e
 --- config
     location = /t {
         content_by_lua '
-            s = ngx.md5_bin(45)
+            local s = ngx.md5_bin(45)
             s = string.gsub(s, ".", function (c)
                     return string.format("%02x", string.byte(c))
                 end)
diff --git a/debian/modules/http-lua/t/013-base64.t b/debian/modules/http-lua/t/013-base64.t
index 1cc27de..d1a8d8b 100644
--- a/debian/modules/http-lua/t/013-base64.t
+++ b/debian/modules/http-lua/t/013-base64.t
@@ -242,4 +242,4 @@ GET /t
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
 --- error_log eval
-qr/bad argument \#2 to 'encode_base64' \(boolean expected, got number\)|\[error\] .*? boolean argument only/
+qr/bad argument \#2 to 'encode_base64' \(boolean expected, got number\)|\[error\] .*? bad no_padding: boolean expected, got number/
diff --git a/debian/modules/http-lua/t/014-bugs.t b/debian/modules/http-lua/t/014-bugs.t
index 9aadff0..dad084e 100644
--- a/debian/modules/http-lua/t/014-bugs.t
+++ b/debian/modules/http-lua/t/014-bugs.t
@@ -43,7 +43,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /load {
         content_by_lua '
@@ -69,7 +69,7 @@ end
 
 === TEST 2: sanity
 --- http_config
-lua_package_path '/home/agentz/rpm/BUILD/lua-yajl-1.1/build/?.so;/home/lz/luax/?.so;./?.so';
+lua_package_cpath '/home/agentz/rpm/BUILD/lua-yajl-1.1/build/?.so;/home/lz/luax/?.so;./?.so';
 --- config
     location = '/report/listBidwordPrices4lzExtra.htm' {
         content_by_lua '
@@ -112,7 +112,7 @@ GET /report/listBidwordPrices4lzExtra.htm?words=123,156,2532
     }
     location = /main {
         content_by_lua '
-            res = ngx.location.capture("/memc?c=get&k=foo&v=")
+            local res = ngx.location.capture("/memc?c=get&k=foo&v=")
             ngx.say("1: ", res.body)
 
             res = ngx.location.capture("/memc?c=set&k=foo&v=bar");
@@ -204,7 +204,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/37
         content_by_lua '
             -- local yajl = require "yajl"
             ngx.header["Set-Cookie"] = {}
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
 
             for i,j in pairs(res.header) do
                 ngx.header[i] = j
@@ -231,7 +231,7 @@ Set-Cookie: TestCookie2=bar.*"
     }
 --- user_files
 >>> foo.lua
-res = {}
+local res = {}
 res = {'good 1', 'good 2', 'good 3'}
 return ngx.redirect("/somedir/" .. ngx.escape_uri(res[math.random(1,#res)]))
 --- request
@@ -579,7 +579,7 @@ $s
 
 
 
-=== TEST 26: unexpected globals sharing by using _G
+=== TEST 26: globals sharing by using _G
 --- config
     location /test {
         content_by_lua '
@@ -593,12 +593,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body eval
-["0", "0", "0"]
+--- response_body_like eval
+[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
 
 
 
-=== TEST 27: unexpected globals sharing by using _G (set_by_lua*)
+=== TEST 27: globals sharing by using _G (set_by_lua*)
 --- config
     location /test {
         set_by_lua $a '
@@ -613,12 +613,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body eval
-["0", "0", "0"]
+--- response_body_like eval
+[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
 
 
 
-=== TEST 28: unexpected globals sharing by using _G (log_by_lua*)
+=== TEST 28: globals sharing by using _G (log_by_lua*)
 --- http_config
     lua_shared_dict log_dict 100k;
 --- config
@@ -633,19 +633,19 @@ $s
             if _G.t then
                 _G.t = _G.t + 1
             else
-                _G.t = 0
+                _G.t = 1
             end
             log_dict:set("cnt", t)
         ';
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body eval
-["0", "0", "0"]
+--- response_body_like eval
+[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
 
 
 
-=== TEST 29: unexpected globals sharing by using _G (header_filter_by_lua*)
+=== TEST 29: globals sharing by using _G (header_filter_by_lua*)
 --- config
     location /test {
         header_filter_by_lua '
@@ -663,12 +663,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body eval
-["0", "0", "0"]
+--- response_body_like eval
+[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
 
 
 
-=== TEST 30: unexpected globals sharing by using _G (body_filter_by_lua*)
+=== TEST 30: globals sharing by using _G (body_filter_by_lua*)
 --- config
     location /test {
         body_filter_by_lua '
@@ -686,8 +686,9 @@ $s
     }
 --- request
 GET /test
---- response_body
-a0
+--- response_body_like eval
+qr/\Aa[036]
+\z/
 --- no_error_log
 [error]
 
@@ -846,7 +847,7 @@ ok
 
 === TEST 37: resolving names with a trailing dot
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -864,7 +865,7 @@ GET /t
 
 === TEST 38: resolving names with a trailing dot
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen 12354;
 
@@ -891,7 +892,7 @@ args: foo=1&bar=2
 
 === TEST 39: lua_code_cache off + setkeepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location = /t {
diff --git a/debian/modules/http-lua/t/016-resp-header.t b/debian/modules/http-lua/t/016-resp-header.t
index 72c1e05..e38202b 100644
--- a/debian/modules/http-lua/t/016-resp-header.t
+++ b/debian/modules/http-lua/t/016-resp-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 46);
+plan tests => repeat_each() * (blocks() * 3 + 59);
 
 #no_diff();
 no_long_string();
@@ -630,7 +630,46 @@ Cache-Control: private, no-store
 
 
 
-=== TEST 32: set multi values to cache-control and override it with a single value
+=== TEST 32: set single value to Link header
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.header.link = "</foo.jpg>; rel=preload"
+            ngx.say("Link: ", ngx.var.sent_http_link)
+        }
+    }
+--- request
+GET /t
+--- response_headers
+Link: </foo.jpg>; rel=preload
+--- response_body
+Link: </foo.jpg>; rel=preload
+
+
+
+=== TEST 33: set multi values to Link header
+--- config
+    location = /t {
+        content_by_lua_block {
+            ngx.header.link = {
+                "</foo.jpg>; rel=preload",
+                "</bar.css>; rel=preload; as=style"
+            }
+
+            ngx.say("Link: ", ngx.var.sent_http_link)
+        }
+    }
+--- request
+GET /t
+--- response_headers
+Link: </foo.jpg>; rel=preload, </bar.css>; rel=preload; as=style
+--- response_body_like chop
+^Link: </foo.jpg>; rel=preload[;,] </bar.css>; rel=preload; as=style$
+--- skip_nginx: 3: < 1.13.9
+
+
+
+=== TEST 34: set multi values to cache-control and override it with a single value
 --- config
     location /lua {
         content_by_lua '
@@ -650,7 +689,30 @@ Cache-Control: no-cache
 
 
 
-=== TEST 33: set multi values to cache-control and override it with multiple values
+=== TEST 35: set multi values to Link header and override it with a single value
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.header.link = {
+                "</foo.jpg>; rel=preload",
+                "</bar.css>; rel=preload; as=style"
+            }
+            ngx.header.link = "</hello.jpg>; rel=preload"
+            ngx.say("Link: ", ngx.var.sent_http_link)
+            ngx.say("Link: ", ngx.header.link)
+        }
+    }
+--- request
+    GET /lua
+--- response_headers
+Link: </hello.jpg>; rel=preload
+--- response_body
+Link: </hello.jpg>; rel=preload
+Link: </hello.jpg>; rel=preload
+
+
+
+=== TEST 36: set multi values to cache-control and override it with multiple values
 --- config
     location /lua {
         content_by_lua '
@@ -672,7 +734,37 @@ Cache-Control: no-cache[;,] blah[;,] foo$
 
 
 
-=== TEST 34: set the www-authenticate response header
+=== TEST 37: set multi values to Link header and override it with multiple values
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.header.link = {
+                "</foo.jpg>; rel=preload",
+                "</bar.css>; rel=preload; as=style"
+            }
+            ngx.header.link = {
+                "</foo.jpg>; rel=preload",
+                "</hello.css>; rel=preload",
+                "</bar.css>; rel=preload; as=style"
+            }
+            ngx.say("Link: ", ngx.var.sent_http_link)
+            ngx.say("Link: ", table.concat(ngx.header.link, ", "))
+        }
+    }
+--- request
+    GET /lua
+--- response_headers
+Link: </foo.jpg>; rel=preload, </hello.css>; rel=preload, </bar.css>; rel=preload; as=style
+--- response_body_like chop
+^Link: </foo.jpg>; rel=preload[;,] </hello.css>; rel=preload[;,] </bar.css>; rel=preload; as=style
+Link: </foo.jpg>; rel=preload[;,] </hello.css>; rel=preload[;,] </bar.css>; rel=preload; as=style$
+--- no_error_log
+[error]
+--- skip_nginx: 4: < 1.13.9
+
+
+
+=== TEST 38: set the www-authenticate response header
 --- config
     location /lua {
         content_by_lua '
@@ -689,7 +781,7 @@ WWW-Authenticate: blah
 
 
 
-=== TEST 35: set and clear the www-authenticate response header
+=== TEST 39: set and clear the www-authenticate response header
 --- config
     location /lua {
         content_by_lua '
@@ -707,7 +799,7 @@ Foo: nil
 
 
 
-=== TEST 36: set multi values to cache-control and override it with multiple values (to reproduce a bug)
+=== TEST 40: set multi values to cache-control and override it with multiple values (to reproduce a bug)
 --- config
     location /lua {
         content_by_lua '
@@ -727,7 +819,7 @@ Cache-Control: blah
 
 
 
-=== TEST 37: set last-modified and return 304
+=== TEST 41: set last-modified and return 304
 --- config
   location /lua {
         content_by_lua '
@@ -745,7 +837,7 @@ Last-Modified: Thu, 18 Nov 2010 11:27:35 GMT
 
 
 
-=== TEST 38: set last-modified and return 200
+=== TEST 42: set last-modified and return 200
 --- config
   location /lua {
         content_by_lua '
@@ -764,7 +856,7 @@ Thu, 18 Nov 2010 11:27:35 GMT
 
 
 
-=== TEST 39: set response content-encoding header should bypass ngx_http_gzip_filter_module
+=== TEST 43: set response content-encoding header should bypass ngx_http_gzip_filter_module
 --- config
     default_type text/plain;
     gzip             on;
@@ -781,13 +873,16 @@ GET /read
 --- more_headers
 Accept-Encoding: gzip
 --- response_headers
-Content-Type: text/plain
+Content-Encoding: gzip
+--- no_error_log
+[error]
+http gzip filter
 --- response_body
 Hello, world, my dear friend!
 
 
 
-=== TEST 40: no transform underscores (write)
+=== TEST 44: no transform underscores (write)
 --- config
     lua_transform_underscores_in_response_headers off;
     location = /t {
@@ -807,7 +902,7 @@ nil
 
 
 
-=== TEST 41: with transform underscores (write)
+=== TEST 45: with transform underscores (write)
 --- config
     lua_transform_underscores_in_response_headers on;
     location = /t {
@@ -827,7 +922,7 @@ Hello
 
 
 
-=== TEST 42: github issue #199: underscores in lua variables
+=== TEST 46: github issue #199: underscores in lua variables
 --- config
     location /read {
         content_by_lua '
@@ -860,7 +955,7 @@ something: hello
 
 
 
-=== TEST 43: set multiple response header
+=== TEST 47: set multiple response header
 --- config
     location /read {
         content_by_lua '
@@ -880,7 +975,7 @@ text/my-plain-50
 
 
 
-=== TEST 44: set multiple response header and then reset and then clear
+=== TEST 48: set multiple response header and then reset and then clear
 --- config
     location /read {
         content_by_lua '
@@ -909,7 +1004,7 @@ ok
 
 
 
-=== TEST 45: set response content-type header for multiple times
+=== TEST 49: set response content-type header for multiple times
 --- config
     location /read {
         content_by_lua '
@@ -927,7 +1022,7 @@ Hi
 
 
 
-=== TEST 46: set Last-Modified response header for multiple times
+=== TEST 50: set Last-Modified response header for multiple times
 --- config
     location /read {
         content_by_lua '
@@ -945,7 +1040,7 @@ ok
 
 
 
-=== TEST 47: set Last-Modified response header and then clear
+=== TEST 51: set Last-Modified response header and then clear
 --- config
     location /read {
         content_by_lua '
@@ -963,7 +1058,7 @@ ok
 
 
 
-=== TEST 48: github #20: segfault caused by the nasty optimization in the nginx core (write)
+=== TEST 52: github #20: segfault caused by the nasty optimization in the nginx core (write)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -985,7 +1080,7 @@ Location: http://localhost:$ServerPort/t/
 
 
 
-=== TEST 49: github #20: segfault caused by the nasty optimization in the nginx core (read)
+=== TEST 53: github #20: segfault caused by the nasty optimization in the nginx core (read)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1007,7 +1102,7 @@ Location: http://localhost:$ServerPort/t/
 
 
 
-=== TEST 50: github #20: segfault caused by the nasty optimization in the nginx core (read Location)
+=== TEST 54: github #20: segfault caused by the nasty optimization in the nginx core (read Location)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1030,7 +1125,7 @@ Foo: /t/
 
 
 
-=== TEST 51: github #20: segfault caused by the nasty optimization in the nginx core (set Foo and read Location)
+=== TEST 55: github #20: segfault caused by the nasty optimization in the nginx core (set Foo and read Location)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1054,7 +1149,7 @@ Foo: /t/
 
 
 
-=== TEST 52: case sensitive cache-control header
+=== TEST 56: case sensitive cache-control header
 --- config
     location /lua {
         content_by_lua '
@@ -1071,7 +1166,24 @@ Cache-Control: private
 
 
 
-=== TEST 53: clear Cache-Control when there was no Cache-Control
+=== TEST 57: case sensitive Link header
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.header["link"] = "</foo.jpg>; rel=preload"
+            ngx.say("Link: ", ngx.var.sent_http_link)
+        }
+    }
+--- request
+    GET /lua
+--- raw_response_headers_like chop
+link: </foo.jpg>; rel=preload
+--- response_body
+Link: </foo.jpg>; rel=preload
+
+
+
+=== TEST 58: clear Cache-Control when there was no Cache-Control
 --- config
     location /lua {
         content_by_lua '
@@ -1088,7 +1200,24 @@ Cache-Control: nil
 
 
 
-=== TEST 54: set response content-type header
+=== TEST 59: clear Link header when there was no Link
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.header["Link"] = nil
+            ngx.say("Link: ", ngx.var.sent_http_link)
+        }
+    }
+--- request
+    GET /lua
+--- raw_response_headers_unlike eval
+qr/Link/i
+--- response_body
+Link: nil
+
+
+
+=== TEST 60: set response content-type header
 --- config
     location /read {
         content_by_lua '
@@ -1107,7 +1236,7 @@ s = content_type
 
 
 
-=== TEST 55: set a number header name
+=== TEST 61: set a number header name
 --- config
     location /lua {
         content_by_lua '
@@ -1126,7 +1255,7 @@ s = content_type
 
 
 
-=== TEST 56: set a number header name (in a table value)
+=== TEST 62: set a number header name (in a table value)
 --- config
     location /lua {
         content_by_lua '
@@ -1145,7 +1274,7 @@ foo: 32
 
 
 
-=== TEST 57: random access resp headers
+=== TEST 63: random access resp headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1185,7 +1314,7 @@ bar: baz
 
 
 
-=== TEST 58: iterating through raw resp headers
+=== TEST 64: iterating through raw resp headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1221,7 +1350,7 @@ bar: nil
 
 
 
-=== TEST 59: removed response headers
+=== TEST 65: removed response headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1254,7 +1383,7 @@ bar: baz
 
 
 
-=== TEST 60: built-in Content-Type header
+=== TEST 66: built-in Content-Type header
 --- config
     location = /t {
         content_by_lua '
@@ -1287,7 +1416,7 @@ my content_type: text/plain
 
 
 
-=== TEST 61: built-in Content-Length header
+=== TEST 67: built-in Content-Length header
 --- config
     location = /t {
         content_by_lua '
@@ -1320,7 +1449,7 @@ my content_length: 3
 
 
 
-=== TEST 62: built-in Connection header
+=== TEST 68: built-in Connection header
 --- config
     location = /t {
         content_by_lua '
@@ -1351,7 +1480,7 @@ my connection: close
 
 
 
-=== TEST 63: built-in Transfer-Encoding header (chunked)
+=== TEST 69: built-in Transfer-Encoding header (chunked)
 --- config
     location = /t {
         content_by_lua '
@@ -1383,7 +1512,7 @@ my transfer-encoding: chunked
 
 
 
-=== TEST 64: built-in Transfer-Encoding header (none)
+=== TEST 70: built-in Transfer-Encoding header (none)
 --- config
     location = /t {
         content_by_lua '
@@ -1416,7 +1545,7 @@ my transfer_encoding: nil
 
 
 
-=== TEST 65: set Location (no host)
+=== TEST 71: set Location (no host)
 --- config
     location = /t {
         content_by_lua '
@@ -1435,7 +1564,7 @@ Location: /foo/bar
 
 
 
-=== TEST 66: set Location (with host)
+=== TEST 72: set Location (with host)
 --- config
     location = /t {
         content_by_lua '
@@ -1454,7 +1583,7 @@ Location: http://test.com/foo/bar
 
 
 
-=== TEST 67: ngx.header["Content-Type"] with ngx_gzip
+=== TEST 73: ngx.header["Content-Type"] with ngx_gzip
 --- config
     gzip             on;
     gzip_min_length  1;
@@ -1478,7 +1607,7 @@ Content-Type: text/html; charset=utf-8
 
 
 
-=== TEST 68: ngx.header["Content-Type"] with "; blah"
+=== TEST 74: ngx.header["Content-Type"] with "; blah"
 --- config
     location = /test2 {
         content_by_lua '
@@ -1498,84 +1627,11 @@ test
 
 
 
-=== TEST 69: return the matched content-type instead of default_type
---- http_config
-types {
-    image/png png;
-}
---- config
-location /set/ {
-     default_type text/html;
-     content_by_lua_block {
-       ngx.say(ngx.header["content-type"])
-   }
-}
---- request
-GET /set/hello.png
---- response_headers
-Content-Type: image/png
---- response_body
-image/png
---- no_error_log
-[error]
-
-
-
-=== TEST 70: always return the matched content-type
---- config
-    location /set/ {
-        default_type "image/png";
-        content_by_lua_block {
-            ngx.say(ngx.header["content-type"])
-            ngx.say(ngx.header["content-type"])
-        }
-    }
---- request
-GET /set/hello.png
---- response_headers
-Content-Type: image/png
---- response_body
-image/png
-image/png
---- no_error_log
-[error]
-
-
-
-=== TEST 71: return the matched content-type after ngx.resp.get_headers()
---- http_config
-types {
-    image/png png;
-}
---- config
-    location /set/ {
-        default_type text/html;
-        content_by_lua_block {
-            local h, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say(h["content-type"])
-        }
-    }
---- request
-GET /set/hello.png
---- response_headers
-Content-Type: image/png
---- response_body
-image/png
---- no_error_log
-[error]
-
-
-
-=== TEST 72: exceeding max header limit (default 100)
+=== TEST 75: exceeding max header limit (default 100)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 99 do
+            for i = 1, 100 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1605,11 +1661,11 @@ lua exceeding response header limit 101 > 100
 
 
 
-=== TEST 73: NOT exceeding max header limit (default 100)
+=== TEST 76: NOT exceeding max header limit (default 100)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 98 do
+            for i = 1, 99 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1637,11 +1693,11 @@ lua exceeding response header limit
 
 
 
-=== TEST 74: exceeding max header limit (custom limit, 3)
+=== TEST 77: exceeding max header limit (custom limit, 3)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 2 do
+            for i = 1, 3 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1671,11 +1727,11 @@ lua exceeding response header limit 4 > 3
 
 
 
-=== TEST 75: NOT exceeding max header limit (custom limit, 3)
+=== TEST 78: NOT exceeding max header limit (custom limit, 3)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 1 do
+            for i = 1, 2 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1699,3 +1755,211 @@ found 3 resp headers
 --- no_error_log
 [error]
 lua exceeding response header limit
+
+
+
+=== TEST 79: return nil if Content-Type is not set yet
+--- config
+    location /t {
+        default_type text/html;
+        content_by_lua_block {
+            ngx.log(ngx.WARN, "Content-Type: ", ngx.header["content-type"])
+            ngx.say("Content-Type: ", ngx.header["content-type"])
+        }
+    }
+--- request
+GET /t
+--- response_headers
+Content-Type: text/html
+--- response_body
+Content-Type: nil
+--- no_error_log
+[error]
+--- error_log
+Content-Type: nil
+
+
+
+=== TEST 80: don't generate Content-Type when setting other response header
+--- config
+    location = /backend {
+        content_by_lua_block {
+            ngx.say("foo")
+        }
+        header_filter_by_lua_block {
+            ngx.header.content_type = nil
+        }
+    }
+
+    location = /t {
+        default_type text/html;
+        rewrite_by_lua_block {
+            ngx.header.blah = "foo"
+        }
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+blah: foo
+!Content-Type
+--- no_error_log
+[error]
+
+
+
+=== TEST 81: don't generate Content-Type when getting other response header
+--- config
+    location = /backend {
+        content_by_lua_block {
+            ngx.say("foo")
+        }
+        header_filter_by_lua_block {
+            ngx.header.content_type = nil
+        }
+    }
+
+    location = /t {
+        default_type text/html;
+        rewrite_by_lua_block {
+            local h = ngx.header.content_length
+        }
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+!Content-Type
+--- no_error_log
+[error]
+
+
+
+=== TEST 82: don't generate Content-Type when getting it
+--- config
+    location = /backend {
+        content_by_lua_block {
+            ngx.say("foo")
+        }
+        header_filter_by_lua_block {
+            ngx.header.content_type = nil
+        }
+    }
+
+    location /t {
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
+        header_filter_by_lua_block {
+            ngx.log(ngx.WARN, "Content-Type: ", ngx.header["content-type"])
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+!Content-Type
+--- no_error_log
+[error]
+--- error_log
+Content-Type: nil
+
+
+
+=== TEST 83: generate default Content-Type when setting other response header
+--- config
+    location = /t {
+        default_type text/html;
+        content_by_lua_block {
+            ngx.header.blah = "foo"
+            ngx.say("foo")
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+blah: foo
+Content-Type: text/html
+--- no_error_log
+[error]
+
+
+
+=== TEST 84: don't generate Content-Type when calling ngx.resp.get_headers()
+--- config
+    location = /backend {
+        content_by_lua_block {
+            ngx.say("foo")
+        }
+        header_filter_by_lua_block {
+            ngx.header.content_type = nil
+        }
+    }
+
+    location /t {
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
+        header_filter_by_lua_block {
+            local h, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return
+            end
+
+            ngx.log(ngx.WARN, "Content-Type: ", h["content-type"])
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+!Content-Type
+--- no_error_log
+[error]
+--- error_log
+Content-Type: nil
+
+
+
+=== TEST 85: don't generate default Content-Type when Content-Type is cleared
+--- config
+    location = /t {
+        default_type text/html;
+        content_by_lua_block {
+            ngx.header["Content-Type"] = nil
+            ngx.say("foo")
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+!Content-Type
+--- no_error_log
+[error]
+
+
+
+=== TEST 86: don't generate default Content-Type when Content-Type is set
+--- config
+    location = /t {
+        default_type text/html;
+        content_by_lua_block {
+            ngx.header["Content-Type"] = "application/json"
+            ngx.say("foo")
+        }
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+Content-Type: application/json
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/017-exec.t b/debian/modules/http-lua/t/017-exec.t
index 544b8bb..a73e93e 100644
--- a/debian/modules/http-lua/t/017-exec.t
+++ b/debian/modules/http-lua/t/017-exec.t
@@ -382,7 +382,7 @@ hello
 --- config
     location /lua {
         content_by_lua '
-            function f ()
+            local function f ()
                 ngx.exec("/hi")
             end
 
@@ -524,7 +524,7 @@ hello
 --- config
     location /main {
         rewrite_by_lua '
-            res = ngx.location.capture("/test_loc");
+            local res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/020-subrequest.t b/debian/modules/http-lua/t/020-subrequest.t
index 658a1d2..5a386db 100644
--- a/debian/modules/http-lua/t/020-subrequest.t
+++ b/debian/modules/http-lua/t/020-subrequest.t
@@ -32,7 +32,7 @@ __DATA__
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -62,7 +62,7 @@ lua http subrequest "/other?"
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -90,7 +90,7 @@ DELETE
 
     location /t {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -114,7 +114,7 @@ POST
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -141,7 +141,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -169,7 +169,7 @@ GET
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo")
+            local res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -196,7 +196,7 @@ GET
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo", {})
+            local res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -226,7 +226,7 @@ GET
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -255,7 +255,7 @@ hello
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -291,7 +291,7 @@ hello
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -329,7 +329,7 @@ GET
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -362,7 +362,7 @@ hello
         content_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -404,7 +404,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            res = ngx.location.capture("/memc",
+            local res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -435,7 +435,7 @@ cached: hello
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -456,7 +456,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -478,7 +478,7 @@ fo%3D=%3D%3E
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -503,7 +503,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -526,7 +526,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -548,7 +548,7 @@ attempt to use a non-string key in the "args" option table
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -570,7 +570,7 @@ attempt to use a non-string key in the "args" option table
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -592,7 +592,7 @@ a=3&b=4
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
@@ -685,7 +685,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/38
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_GET });
             ngx.say("header foo: [", res.body, "]")
         ';
@@ -711,7 +711,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/38
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { body = "abc" });
             ngx.say("header foo: [", res.body, "]")
         ';
@@ -746,8 +746,8 @@ header foo: [bar]
     }
     location /main {
         content_by_lua '
-            res1, res2 = ngx.location.capture_multi({{"/a"}, {"/b"}})
-            res3 = ngx.location.capture("/c")
+            local res1, res2 = ngx.location.capture_multi({{"/a"}, {"/b"}})
+            local res3 = ngx.location.capture("/c")
             ngx.print(res1.body, res2.body, res3.body)
         ';
     }
@@ -780,7 +780,7 @@ lua reuse free buf memory
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -801,7 +801,7 @@ hello
 --- config
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo.html")
+            local res = ngx.location.capture("/foo.html")
 
             ngx.say(res.status)
             ngx.say(res.header["Last-Modified"])
@@ -832,7 +832,7 @@ hello, static file$
     location /lua {
         content_by_lua '
             local ctx = {}
-            res = ngx.location.capture("/sub", { ctx = ctx })
+            local res = ngx.location.capture("/sub", { ctx = ctx })
 
             ngx.say(ctx.foo);
             ngx.say(ngx.ctx.foo);
@@ -857,7 +857,7 @@ nil
     }
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/sub", { ctx = ngx.ctx })
+            local res = ngx.location.capture("/sub", { ctx = ngx.ctx })
             ngx.say(ngx.ctx.foo);
         ';
     }
@@ -885,7 +885,7 @@ bar
 
     location /t {
         content_by_lua '
-            res = ngx.location.capture("/memc",
+            local res = ngx.location.capture("/memc",
                 { method = ngx.HTTP_PUT, body = "hello 1234" });
             -- ngx.say("PUT: " .. res.status);
 
@@ -922,7 +922,7 @@ lua reuse free buf chain, but reallocate memory because
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -959,7 +959,7 @@ nil
         content_by_lua '
             ngx.req.read_body()
 
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -996,7 +996,7 @@ nil
         content_by_lua '
             ngx.req.read_body()
 
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -1033,7 +1033,7 @@ hello, world
         content_by_lua '
             ngx.req.read_body()
 
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT });
 
             ngx.print(res.body)
@@ -1074,7 +1074,7 @@ lua subrequests cycle while processing "/t"
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_OPTIONS });
 
             ngx.print(res.body)
@@ -1099,7 +1099,7 @@ OPTIONS
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_OPTIONS, body = "hello world" });
 
             ngx.print(res.body)
@@ -1151,7 +1151,7 @@ r%5B%5D=http%3A%2F%2Fajax.googleapis.com%3A80%2Fajax%2Flibs%2Fjquery%2F1.7.2%2Fj
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1172,7 +1172,7 @@ body:
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1196,7 +1196,7 @@ body:
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1242,7 +1242,7 @@ F(ngx_http_finalize_request) {
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/memc")
+            local res = ngx.location.capture("/memc")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1312,7 +1312,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/memc")
+            local res = ngx.location.capture("/memc")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1385,7 +1385,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1445,7 +1445,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1507,7 +1507,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1567,7 +1567,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1630,7 +1630,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1690,7 +1690,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1756,7 +1756,7 @@ upstream timed out
             ngx.req.read_body()
 
             for i = 1, 2 do
-                res = ngx.location.capture("/other",
+                local res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1796,7 +1796,7 @@ hello world
             ngx.req.read_body()
 
             for i = 1, 2 do
-                res = ngx.location.capture("/other",
+                local res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1836,7 +1836,7 @@ hello world
             ngx.req.read_body()
 
             for i = 1, 2 do
-                res = ngx.location.capture("/other",
+                local res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1916,7 +1916,7 @@ a client request body is buffered to a temporary file
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1979,7 +1979,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2040,7 +2040,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2102,7 +2102,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2160,7 +2160,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2219,7 +2219,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/proxy")
+            local res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2288,7 +2288,7 @@ upstream prematurely closed connection
             }
 
             for i, method in ipairs(methods) do
-                res = ngx.location.capture("/other",
+                local res = ngx.location.capture("/other",
                     { method = method })
                 ngx.print(res.body)
             end
@@ -2324,7 +2324,7 @@ method: TRACE
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -2353,7 +2353,7 @@ nil
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE, always_forward_body = true });
 
             ngx.print(res.body)
@@ -2382,7 +2382,7 @@ hello world
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE, always_forward_body = true });
 
             ngx.print(res.body)
@@ -2410,7 +2410,7 @@ hello world
 --- config
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
         ';
     }
@@ -2603,7 +2603,7 @@ qr/Assertion .*? failed/
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2636,7 +2636,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2669,7 +2669,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2699,7 +2699,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: Cookie: ", ngx.var.http_cookie)
         ';
@@ -2727,7 +2727,7 @@ pr: Cookie: foo; bar
 
     location = /t {
         content_by_lua '
-            res = ngx.location.capture("/sub")
+            local res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: Cookie: ", ngx.var.http_cookie)
         ';
@@ -2750,7 +2750,7 @@ pr: Cookie: foo; bar
 --- config
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/index.html",
+            local res = ngx.location.capture("/index.html",
                 { method = ngx.HTTP_HEAD });
             ngx.say("content-length: ", res.header["Content-Length"])
             ngx.say("body: [", res.body, "]")
diff --git a/debian/modules/http-lua/t/023-rewrite/client-abort.t b/debian/modules/http-lua/t/023-rewrite/client-abort.t
index 117d17e..0d6f2b3 100644
--- a/debian/modules/http-lua/t/023-rewrite/client-abort.t
+++ b/debian/modules/http-lua/t/023-rewrite/client-abort.t
@@ -199,7 +199,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 
     location = /sleep {
@@ -240,7 +240,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 --- request
 GET /t
@@ -545,7 +545,7 @@ client prematurely closed connection
                 return
             end
 
-            ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            local 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
diff --git a/debian/modules/http-lua/t/023-rewrite/exec.t b/debian/modules/http-lua/t/023-rewrite/exec.t
index edd4607..59691cb 100644
--- a/debian/modules/http-lua/t/023-rewrite/exec.t
+++ b/debian/modules/http-lua/t/023-rewrite/exec.t
@@ -326,7 +326,7 @@ hello
 --- config
     location /main {
         rewrite_by_lua '
-            res = ngx.location.capture("/test_loc");
+            local res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
@@ -354,7 +354,7 @@ hello, bah
 --- config
     location /main {
         rewrite_by_lua '
-            res = ngx.location.capture("/test_loc");
+            local res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/023-rewrite/mixed.t b/debian/modules/http-lua/t/023-rewrite/mixed.t
index 0f742b2..5b38d3f 100644
--- a/debian/modules/http-lua/t/023-rewrite/mixed.t
+++ b/debian/modules/http-lua/t/023-rewrite/mixed.t
@@ -35,7 +35,7 @@ __DATA__
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             print("rewrite GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -49,7 +49,7 @@ __DATA__
         content_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
diff --git a/debian/modules/http-lua/t/023-rewrite/multi-capture.t b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
index 083ec78..a0a02b7 100644
--- a/debian/modules/http-lua/t/023-rewrite/multi-capture.t
+++ b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
@@ -154,7 +154,7 @@ res2.body = b
 
     location /main {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo?n=1")
+            local res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/req-socket.t b/debian/modules/http-lua/t/023-rewrite/req-socket.t
index 87cbbbe..9292385 100644
--- a/debian/modules/http-lua/t/023-rewrite/req-socket.t
+++ b/debian/modules/http-lua/t/023-rewrite/req-socket.t
@@ -325,7 +325,7 @@ found the end of the stream
 
 === TEST 4: attempt to use the req socket across request boundary
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         rewrite_by_lua '
@@ -376,7 +376,7 @@ hello world
 === 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         rewrite_by_lua '
@@ -440,7 +440,7 @@ done
 
 === TEST 6: pipelined POST requests
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         rewrite_by_lua '
diff --git a/debian/modules/http-lua/t/023-rewrite/sanity.t b/debian/modules/http-lua/t/023-rewrite/sanity.t
index b90aa0e..73a85dc 100644
--- a/debian/modules/http-lua/t/023-rewrite/sanity.t
+++ b/debian/modules/http-lua/t/023-rewrite/sanity.t
@@ -69,7 +69,7 @@ GET /lua
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        rewrite_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        rewrite_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -87,7 +87,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-v = ngx.var["request_uri"]
+local v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -140,7 +140,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        rewrite_by_lua 'who = ngx.var.arg_who
+        rewrite_by_lua 'local who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
@@ -159,7 +159,7 @@ Hello, agentzh!
 
     location /lua {
         rewrite_by_lua '
-res = ngx.location.capture("/other")
+local res = ngx.location.capture("/other")
 ngx.print("status=", res.status, " ")
 ngx.print("body=", res.body)
 ';
@@ -175,7 +175,7 @@ status=200 body=hello, world
 === TEST 9: capture non-existed location
 --- config
     location /lua {
-        rewrite_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        rewrite_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -187,7 +187,7 @@ GET /lua
 === TEST 10: invalid capture location (not as expected...)
 --- config
     location /lua {
-        rewrite_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        rewrite_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -270,7 +270,7 @@ end
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -359,7 +359,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    rewrite_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    rewrite_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
     content_by_lua 'ngx.exit(ngx.OK)';
 }
 --- request
@@ -377,7 +377,7 @@ location /parent {
     set $a '';
     rewrite_by_lua '
         ngx.var.a = 12;
-        res = ngx.location.capture(
+        local res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -399,7 +399,7 @@ location /sub {
 }
 location /parent {
     rewrite_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = true });
+        local res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 
@@ -421,7 +421,7 @@ location /sub {
 
 location /parent {
     rewrite_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = false });
+        local res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
     content_by_lua return;
@@ -441,7 +441,7 @@ GET /parent
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
 
@@ -466,7 +466,7 @@ type: foo/bar
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -494,7 +494,7 @@ Bar: Bah
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
index 489a70f..8b532ea 100644
--- a/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
+++ b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
@@ -27,7 +27,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -104,7 +104,7 @@ lua tcp socket get keepalive peer: using connection
 
 === TEST 2: free up the whole connection pool if no active connections
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -177,7 +177,7 @@ received: OK
 
 === TEST 3: upstream sockets close prematurely
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
    server_tokens off;
    keepalive_timeout 100ms;
@@ -254,7 +254,7 @@ done
 
 === TEST 4: http keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
    server_tokens off;
    location /t {
@@ -815,7 +815,7 @@ lua tcp socket keepalive timeout: unlimited
 === TEST 11: sanity (uds)
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -953,7 +953,7 @@ lua tcp socket get keepalive peer: using connection
 
 === 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     error_page 404 /404.html;
     location /t {
diff --git a/debian/modules/http-lua/t/023-rewrite/subrequest.t b/debian/modules/http-lua/t/023-rewrite/subrequest.t
index 5d1e8f0..cb8523c 100644
--- a/debian/modules/http-lua/t/023-rewrite/subrequest.t
+++ b/debian/modules/http-lua/t/023-rewrite/subrequest.t
@@ -27,7 +27,7 @@ __DATA__
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -54,7 +54,7 @@ DELETE
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ DELETE
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -105,7 +105,7 @@ POST
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -131,7 +131,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -158,7 +158,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo")
+            local res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -184,7 +184,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo", {})
+            local res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -213,7 +213,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -241,7 +241,7 @@ hello
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -276,7 +276,7 @@ hello
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -313,7 +313,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -345,7 +345,7 @@ hello
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -386,7 +386,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            res = ngx.location.capture("/memc",
+            local res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -417,7 +417,7 @@ cached: hello
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -437,7 +437,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -458,7 +458,7 @@ fo%3D=%3D%3E
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -480,7 +480,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -502,7 +502,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -523,7 +523,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -544,7 +544,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -565,7 +565,7 @@ a=3&b=4
 
     location /lua {
         rewrite_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
index 329c045..e713bb5 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
@@ -46,7 +46,7 @@ __DATA__
     location /t1 {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -63,7 +63,7 @@ GET /t1
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -79,7 +79,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(150)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -114,7 +114,7 @@ lua tcp socket connect timeout: 150
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(nil)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -149,7 +149,7 @@ lua tcp socket connect timeout: 102
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(0)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -185,7 +185,7 @@ lua tcp socket connect timeout: 102
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(-1)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
index 41aeab7..5258487 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
@@ -250,11 +250,11 @@ attempt to send data on a closed socket:
     }
 --- request
 GET /t
---- response_body
+--- response_body_like
 connected: 1
 request sent: 56
-first line received: HTTP/1.1 200 OK
-second line received: Server: openresty
+first line received: HTTP\/1\.1 200 OK
+second line received: (?:Date|Server): .*?
 --- no_error_log
 [error]
 
@@ -304,7 +304,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
     location /test {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -329,7 +329,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -940,7 +940,7 @@ close: 1 nil
                 end
             end
 
-            ok, err = sock:close()
+            local ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
 
@@ -1082,7 +1082,7 @@ close: 1 nil
 
 === TEST 19: cannot survive across request boundary (send)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1143,7 +1143,7 @@ received: OK|failed to send request: closed)\$"
 
 === TEST 20: cannot survive across request boundary (receive)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1214,7 +1214,7 @@ 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1285,7 +1285,7 @@ received: OK|failed to close: closed)$/
 
 === TEST 22: cannot survive across request boundary (connect)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -2041,7 +2041,7 @@ close: 1 nil
 
 === TEST 33: bad request tries to connect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2097,7 +2097,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):7: bad request/
 
 === TEST 34: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2156,7 +2156,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 35: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2215,7 +2215,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 36: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2274,7 +2274,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 37: bad request tries to set keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2333,7 +2333,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 38: bad request tries to receiveuntil
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
index 2bea7e7..9428bd6 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.exec("/foo")
             end
 
@@ -59,7 +59,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -95,7 +95,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -178,12 +178,12 @@ hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
             end
 
@@ -270,7 +270,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
index 6ebbb67..e25f7f8 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -172,13 +172,13 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -262,7 +262,7 @@ f
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -298,10 +298,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -311,7 +311,7 @@ exiting the user thread
             ngx.thread.spawn(f)
             ngx.say("after")
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -403,11 +403,11 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         #resolver 127.0.0.1;
         resolver_timeout 12s;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -510,7 +510,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -521,7 +521,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("172.105.207.225", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -600,7 +600,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -700,7 +700,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -806,7 +806,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -901,7 +901,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -995,7 +995,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1080,7 +1080,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1164,7 +1164,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1247,7 +1247,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
index 83de1a3..0e636f7 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -113,7 +113,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
index 5552107..dccef87 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
             end
 
@@ -68,11 +68,11 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("in thread 1")
             end
 
-            function g()
+            local function g()
                 ngx.say("in thread 2")
             end
 
@@ -117,7 +117,7 @@ after 2
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -154,13 +154,13 @@ after sleep
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            function g()
+            local function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -210,7 +210,7 @@ delete thread 2
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.blah()
             end
 
@@ -241,9 +241,9 @@ qr/lua user thread aborted: runtime error: rewrite_by_lua\(nginx\.conf:\d+\):3:
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
-                res = ngx.location.capture("/proxy")
+                local res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -287,7 +287,7 @@ after capture: hello world
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -340,7 +340,7 @@ after capture: hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -394,13 +394,13 @@ capture: hello bar
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            function g()
+            local function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -472,7 +472,8 @@ g: after capture: hello bah
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -518,7 +519,8 @@ after g
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -566,7 +568,7 @@ hello in g()
     location /lua {
         rewrite_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -599,7 +601,7 @@ status: running
     location /lua {
         rewrite_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
             end
 
@@ -631,7 +633,8 @@ status: zombie
     location /lua {
         rewrite_by_lua '
             local co
-            function f()
+            local g
+            local function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -670,7 +673,8 @@ status: normal
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -717,7 +721,7 @@ after f
         rewrite_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -770,7 +774,7 @@ f 3
         rewrite_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -779,7 +783,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            function g()
+            local function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -826,7 +830,7 @@ g 3
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -863,12 +867,12 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            function g()
+            local function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -914,7 +918,7 @@ hello from g
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -966,7 +970,7 @@ received: OK
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1027,7 +1031,7 @@ after)$
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1073,7 +1077,7 @@ body: hello world)$
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
diff --git a/debian/modules/http-lua/t/024-access/client-abort.t b/debian/modules/http-lua/t/024-access/client-abort.t
index c16f4ea..83bf0a4 100644
--- a/debian/modules/http-lua/t/024-access/client-abort.t
+++ b/debian/modules/http-lua/t/024-access/client-abort.t
@@ -200,7 +200,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 
     location = /sleep {
@@ -241,7 +241,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 --- request
 GET /t
@@ -546,7 +546,7 @@ client prematurely closed connection
                 return
             end
 
-            ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            local 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
diff --git a/debian/modules/http-lua/t/024-access/exec.t b/debian/modules/http-lua/t/024-access/exec.t
index 43c1a77..d168a47 100644
--- a/debian/modules/http-lua/t/024-access/exec.t
+++ b/debian/modules/http-lua/t/024-access/exec.t
@@ -326,7 +326,7 @@ hello
 --- config
     location /main {
         access_by_lua '
-            res = ngx.location.capture("/test_loc");
+            local res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/024-access/mixed.t b/debian/modules/http-lua/t/024-access/mixed.t
index a9f8039..22f0037 100644
--- a/debian/modules/http-lua/t/024-access/mixed.t
+++ b/debian/modules/http-lua/t/024-access/mixed.t
@@ -35,7 +35,7 @@ __DATA__
         access_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             print("access GET: ", res.status);
 
             res = ngx.location.capture("/memc",
@@ -49,7 +49,7 @@ __DATA__
         content_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -187,7 +187,7 @@ world\x03\x04\xff
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             print("rewrite GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -201,7 +201,7 @@ world\x03\x04\xff
         access_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             print("access GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -215,7 +215,7 @@ world\x03\x04\xff
         content_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
diff --git a/debian/modules/http-lua/t/024-access/multi-capture.t b/debian/modules/http-lua/t/024-access/multi-capture.t
index 930b74d..b1757dd 100644
--- a/debian/modules/http-lua/t/024-access/multi-capture.t
+++ b/debian/modules/http-lua/t/024-access/multi-capture.t
@@ -154,7 +154,7 @@ res2.body = b
 
     location /main {
         access_by_lua '
-            res = ngx.location.capture("/foo?n=1")
+            local res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
diff --git a/debian/modules/http-lua/t/024-access/sanity.t b/debian/modules/http-lua/t/024-access/sanity.t
index 7ff177f..e5612a8 100644
--- a/debian/modules/http-lua/t/024-access/sanity.t
+++ b/debian/modules/http-lua/t/024-access/sanity.t
@@ -69,7 +69,7 @@ GET /lua
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        access_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        access_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -87,7 +87,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-v = ngx.var["request_uri"]
+local v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -140,7 +140,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        access_by_lua 'who = ngx.var.arg_who
+        access_by_lua 'local who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
@@ -159,7 +159,7 @@ Hello, agentzh!
 
     location /lua {
         access_by_lua '
-res = ngx.location.capture("/other")
+local res = ngx.location.capture("/other")
 ngx.print("status=", res.status, " ")
 ngx.print("body=", res.body)
 ';
@@ -175,7 +175,7 @@ status=200 body=hello, world
 === TEST 9: capture non-existed location
 --- config
     location /lua {
-        access_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        access_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -187,7 +187,7 @@ GET /lua
 === TEST 10: invalid capture location (not as expected...)
 --- config
     location /lua {
-        access_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        access_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -244,7 +244,7 @@ GET /lua
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body, "\\n");
            else
@@ -271,7 +271,7 @@ access phase not running in subrequests
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -357,7 +357,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    access_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    access_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
     content_by_lua 'ngx.exit(ngx.OK)';
 }
 --- request
@@ -375,7 +375,7 @@ location /parent {
     set $a '';
     access_by_lua '
         ngx.var.a = 12;
-        res = ngx.location.capture(
+        local res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -397,7 +397,7 @@ location /sub {
 }
 location /parent {
     access_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = true });
+        local res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 
@@ -419,7 +419,7 @@ location /sub {
 
 location /parent {
     access_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = false });
+        local res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
     content_by_lua return;
@@ -439,7 +439,7 @@ GET /parent
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
 
@@ -464,7 +464,7 @@ type: foo/bar
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -492,7 +492,7 @@ Bar: Bah
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other");
+            local res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
diff --git a/debian/modules/http-lua/t/024-access/subrequest.t b/debian/modules/http-lua/t/024-access/subrequest.t
index b6ccf11..665780a 100644
--- a/debian/modules/http-lua/t/024-access/subrequest.t
+++ b/debian/modules/http-lua/t/024-access/subrequest.t
@@ -27,7 +27,7 @@ __DATA__
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -54,7 +54,7 @@ DELETE
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ DELETE
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -105,7 +105,7 @@ POST
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -131,7 +131,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -158,7 +158,7 @@ GET
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo")
+            local res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -184,7 +184,7 @@ GET
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo", {})
+            local res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -213,7 +213,7 @@ GET
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -241,7 +241,7 @@ hello
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -276,7 +276,7 @@ hello
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -313,7 +313,7 @@ GET
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -345,7 +345,7 @@ hello
         access_by_lua '
             ngx.location.capture("/flush");
 
-            res = ngx.location.capture("/memc");
+            local res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -386,7 +386,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            res = ngx.location.capture("/memc",
+            local res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -417,7 +417,7 @@ cached: hello
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -437,7 +437,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -458,7 +458,7 @@ fo%3D=%3D%3E
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -480,7 +480,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -502,7 +502,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -523,7 +523,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo",
+            local res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -544,7 +544,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -565,7 +565,7 @@ a=3&b=4
 
     location /lua {
         access_by_lua '
-            res = ngx.location.capture("/foo?a=3",
+            local res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
diff --git a/debian/modules/http-lua/t/024-access/uthread-exec.t b/debian/modules/http-lua/t/024-access/uthread-exec.t
index 7add3d4..9c88eb3 100644
--- a/debian/modules/http-lua/t/024-access/uthread-exec.t
+++ b/debian/modules/http-lua/t/024-access/uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.exec("/foo")
             end
 
@@ -59,7 +59,7 @@ i am foo
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -95,7 +95,7 @@ i am foo
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -179,12 +179,12 @@ hello foo
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
             end
 
@@ -271,7 +271,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-exit.t b/debian/modules/http-lua/t/024-access/uthread-exit.t
index 02c2a1f..2757237 100644
--- a/debian/modules/http-lua/t/024-access/uthread-exit.t
+++ b/debian/modules/http-lua/t/024-access/uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -172,13 +172,13 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -262,7 +262,7 @@ f
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -298,10 +298,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -394,10 +394,10 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -491,7 +491,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -502,7 +502,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("172.105.207.225", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -582,7 +582,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -682,7 +682,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -788,7 +788,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -883,7 +883,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -977,7 +977,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1062,7 +1062,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1146,7 +1146,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1229,7 +1229,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-redirect.t b/debian/modules/http-lua/t/024-access/uthread-redirect.t
index 4eb4759..cb99a35 100644
--- a/debian/modules/http-lua/t/024-access/uthread-redirect.t
+++ b/debian/modules/http-lua/t/024-access/uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -113,7 +113,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-spawn.t b/debian/modules/http-lua/t/024-access/uthread-spawn.t
index 7c7ba3b..bc92ccd 100644
--- a/debian/modules/http-lua/t/024-access/uthread-spawn.t
+++ b/debian/modules/http-lua/t/024-access/uthread-spawn.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
             end
 
@@ -68,11 +68,11 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("in thread 1")
             end
 
-            function g()
+            local function g()
                 ngx.say("in thread 2")
             end
 
@@ -117,7 +117,7 @@ after 2
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -154,13 +154,13 @@ after sleep
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            function g()
+            local function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -210,7 +210,7 @@ delete thread 2
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.blah()
             end
 
@@ -241,9 +241,9 @@ qr/lua user thread aborted: runtime error: access_by_lua\(nginx\.conf:\d+\):3: a
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
-                res = ngx.location.capture("/proxy")
+                local res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -287,7 +287,7 @@ after capture: hello world
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -340,7 +340,7 @@ after capture: hello foo
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -395,13 +395,13 @@ capture: hello bar
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            function g()
+            local function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -473,7 +473,8 @@ g: after capture: hello bah
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -519,7 +520,8 @@ after g
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -567,7 +569,7 @@ hello in g()
     location /lua {
         access_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -600,7 +602,7 @@ status: running
     location /lua {
         access_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
             end
 
@@ -632,7 +634,8 @@ status: zombie
     location /lua {
         access_by_lua '
             local co
-            function f()
+            local g
+            local function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -671,7 +674,8 @@ status: normal
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -718,7 +722,7 @@ after f
         access_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -771,7 +775,7 @@ f 3
         access_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -780,7 +784,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            function g()
+            local function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -827,7 +831,7 @@ g 3
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -864,12 +868,12 @@ after
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            function g()
+            local function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -915,7 +919,7 @@ hello from g
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -967,7 +971,7 @@ received: OK
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1028,7 +1032,7 @@ after)$
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1073,7 +1077,7 @@ body: hello world)$
 --- config
     location /lua {
         access_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
diff --git a/debian/modules/http-lua/t/025-codecache.t b/debian/modules/http-lua/t/025-codecache.t
index 20791d7..22b78b2 100644
--- a/debian/modules/http-lua/t/025-codecache.t
+++ b/debian/modules/http-lua/t/025-codecache.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 155;
+plan tests => repeat_each() * 163;
 
 #$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
 
@@ -27,7 +27,7 @@ __DATA__
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -61,7 +61,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -95,7 +95,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -130,7 +130,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -166,7 +166,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -193,7 +193,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 6: code cache explicitly off (affects require) + content_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -204,7 +204,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
             f:write("module(..., package.seeall); ngx.say(102);")
             f:close()
             ngx.say("updated")
@@ -231,7 +231,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 7: code cache explicitly off (affects require) + content_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -240,7 +240,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
             f:write("module(..., package.seeall); ngx.say(102);")
             f:close()
             ngx.say("updated")
@@ -269,7 +269,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 8: code cache explicitly off (affects require) + set_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -279,7 +279,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
             f:write("module(..., package.seeall); return 102;")
             f:close()
             ngx.say("updated")
@@ -308,7 +308,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 9: code cache explicitly on (affects require) + set_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /lua {
         lua_code_cache on;
@@ -318,7 +318,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
             f:write("module(..., package.seeall); return 102;")
             f:close()
             ngx.say("updated")
@@ -355,7 +355,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("return 101")
             f:close()
             ngx.say("updated")
@@ -390,7 +390,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
             f:write("return 101")
             f:close()
             ngx.say("updated")
@@ -468,7 +468,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 14: no clear builtin lib "string"
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location /lua {
@@ -504,7 +504,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 15: do not skip luarocks
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
      lua_code_cache off;"
 --- config
     location /main {
@@ -554,7 +554,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 16: do not skip luarocks*
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
      lua_code_cache off;"
 --- config
     location /main {
@@ -604,7 +604,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 17: clear _G table
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location /t {
@@ -1050,7 +1050,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
 
 === TEST 29: cosocket connection pool timeout (after Lua VM destroys)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location = /t {
@@ -1118,7 +1118,7 @@ qr/\blua tcp socket keepalive: free connection pool [0-9A-F]+ for "127.0.0.1:/,
 
 === TEST 30: cosocket connection pool timeout (before Lua VM destroys)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     lua_code_cache off;
     location = /t {
@@ -1244,3 +1244,133 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
 "decrementing the reference count for Lua VM: 1",
 "lua close the global Lua VM",
 ]
+
+
+
+=== TEST 32: make sure inline code keys are correct
+GitHub issue #1428
+--- config
+include ../html/a/proxy.conf;
+include ../html/b/proxy.conf;
+include ../html/c/proxy.conf;
+
+location /t {
+    echo_location /a/;
+    echo_location /b/;
+    echo_location /a/;
+    echo_location /c/;
+}
+
+--- user_files
+>>> a/proxy.conf
+location /a/ {
+    content_by_lua_block { ngx.say("/a/ is called") }
+}
+
+>>> b/proxy.conf
+location /b/ {
+    content_by_lua_block { ngx.say("/b/ is called") }
+}
+
+>>> c/proxy.conf
+location /c/ {
+    content_by_lua_block { ngx.say("/b/ is called") }
+}
+
+--- request
+GET /t
+--- response_body
+/a/ is called
+/b/ is called
+/a/ is called
+/b/ is called
+--- grep_error_log eval: qr/looking up Lua code cache with key '.*?'/
+--- grep_error_log_out eval
+[
+"looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+",
+"looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
+looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
+"]
+--- log_level: debug
+--- no_error_log
+[error]
+
+
+
+=== TEST 33: make sure Lua code file keys are correct
+GitHub issue #1428
+--- config
+include ../html/a/proxy.conf;
+include ../html/b/proxy.conf;
+include ../html/c/proxy.conf;
+
+location /t {
+    echo_location /a/;
+    echo_location /b/;
+    echo_location /a/;
+    echo_location /c/;
+}
+
+--- user_files
+>>> a.lua
+ngx.say("/a/ is called")
+
+>>> b.lua
+ngx.say("/b/ is called")
+
+>>> c.lua
+ngx.say("/b/ is called")
+
+>>> a/proxy.conf
+location /a/ {
+    content_by_lua_file html/a.lua;
+}
+
+>>> b/proxy.conf
+location /b/ {
+    content_by_lua_file html/b.lua;
+}
+
+>>> c/proxy.conf
+location /c/ {
+    content_by_lua_file html/c.lua;
+}
+
+--- request
+GET /t
+--- response_body
+/a/ is called
+/b/ is called
+/a/ is called
+/b/ is called
+--- grep_error_log eval: qr/looking up Lua code cache with key '.*?'/
+--- grep_error_log_out eval
+[
+"looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
+looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
+",
+"looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
+looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
+looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
+looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
+looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
+"
+]
+--- log_level: debug
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/027-multi-capture.t b/debian/modules/http-lua/t/027-multi-capture.t
index 9227fe5..9299561 100644
--- a/debian/modules/http-lua/t/027-multi-capture.t
+++ b/debian/modules/http-lua/t/027-multi-capture.t
@@ -151,7 +151,7 @@ res2.body = b
 
     location /main {
         content_by_lua '
-            res = ngx.location.capture("/foo?n=1")
+            local res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
@@ -743,7 +743,7 @@ proxy_cache_path conf/cache levels=1:2 keys_zone=STATIC:10m inactive=10m max_siz
 
     location = /proxy {
             proxy_cache STATIC;
-            proxy_pass http://agentzh.org:12345;
+            proxy_pass http://127.0.0.2:12345;
             proxy_cache_key $proxy_host$uri$args;
             proxy_cache_valid any 1s;
             #proxy_http_version 1.1;
diff --git a/debian/modules/http-lua/t/028-req-header.t b/debian/modules/http-lua/t/028-req-header.t
index ca92daa..8ddbb29 100644
--- a/debian/modules/http-lua/t/028-req-header.t
+++ b/debian/modules/http-lua/t/028-req-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 43);
+plan tests => repeat_each() * (2 * blocks() + 44);
 
 #no_diff();
 no_long_string();
@@ -2008,3 +2008,25 @@ found 3 headers.
 --- no_error_log
 lua exceeding request header limit
 [error]
+
+
+
+=== TEST 61: setting Host header clears cached $host variable
+--- config
+    location /req-header {
+        # this makes $host indexed and cacheable
+        set $foo $host;
+
+        content_by_lua_block {
+            ngx.say(ngx.var.host)
+            ngx.req.set_header("Host", "new");
+            ngx.say(ngx.var.host)
+        }
+    }
+--- request
+GET /req-header
+--- response_body
+localhost
+new
+--- no_error_log
+[error]
diff --git a/debian/modules/http-lua/t/030-uri-args.t b/debian/modules/http-lua/t/030-uri-args.t
index a9d46ff..7af63c4 100644
--- a/debian/modules/http-lua/t/030-uri-args.t
+++ b/debian/modules/http-lua/t/030-uri-args.t
@@ -421,7 +421,7 @@ done
             ngx.req.set_uri_args("hello")
             ngx.req.set_uri("/bar", true);
         ';
-        proxy_pass http://agentzh.org:12345;
+        proxy_pass http://127.0.0.2:12345;
     }
 --- request
     GET /foo?world
@@ -568,7 +568,7 @@ HTTP/1.0 ca%20t=%25
             ngx.req.set_uri("/bar", true);
             ngx.exit(503)
         ';
-        proxy_pass http://agentzh.org:12345;
+        proxy_pass http://127.0.0.2:12345;
     }
 --- request
     GET /foo?world
@@ -586,7 +586,7 @@ hello
         #set $args 'hello';
         set $err '';
         access_by_lua '
-            res, err = pcall(ngx.req.set_uri, "/bar", true);
+            local res, err = pcall(ngx.req.set_uri, "/bar", true);
             ngx.var.err = err
         ';
         echo "err: $err";
@@ -626,7 +626,7 @@ uri: /bar
     location /foo {
         #set $args 'hello';
         content_by_lua '
-            res, err = pcall(ngx.req.set_uri, "/bar", true);
+            local res, err = pcall(ngx.req.set_uri, "/bar", true);
             ngx.say("err: ", err)
         ';
     }
@@ -665,7 +665,7 @@ uri: /bar
     location /foo {
         #set $args 'hello';
         set_by_lua $err '
-            res, err = pcall(ngx.req.set_uri, "/bar", true);
+            local res, err = pcall(ngx.req.set_uri, "/bar", true);
             return err
         ';
         echo "err: $err";
@@ -788,7 +788,7 @@ GET /lua
     location /lua {
         content_by_lua '
             local t = {bar = ngx.shared.dogs, foo = 3}
-            rc, err = pcall(ngx.encode_args, t)
+            local rc, err = pcall(ngx.encode_args, t)
             ngx.say("rc: ", rc, ", err: ", err)
         ';
     }
@@ -1112,6 +1112,7 @@ HTTP/1.0 a=3&b=5&b=6
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args)
 
@@ -1135,6 +1136,7 @@ b = foo
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=bar&b=foo&a=baz"
             args, err = ngx.decode_args(args)
 
@@ -1158,6 +1160,7 @@ b = foo
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = ""
             args, err = ngx.decode_args(args)
             if err then
@@ -1178,6 +1181,7 @@ n = 0
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a&b"
             args, err = ngx.decode_args(args)
             if err then
@@ -1200,6 +1204,7 @@ b = true
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=&b="
             args, err = ngx.decode_args(args)
 
@@ -1223,6 +1228,7 @@ b =
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args, 1)
             if err then
@@ -1246,6 +1252,7 @@ b = nil
 --- config
     location /lua {
         content_by_lua '
+            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args, -1)
 
@@ -1270,7 +1277,7 @@ b = foo
     location /lua {
         content_by_lua '
             local s = "f+f=bar&B=foo"
-            args, err = ngx.decode_args(s)
+            local args, err = ngx.decode_args(s)
             if err then
                 ngx.say("err: ", err)
             end
@@ -1302,7 +1309,7 @@ s = f+f=bar&B=foo
     lua_need_request_body on;
     location /t {
         content_by_lua '
-            function split(s, delimiter)
+            local function split(s, delimiter)
                 local result = {}
                 local from = 1
                 local delim_from, delim_to = string.find(s, delimiter, from)
diff --git a/debian/modules/http-lua/t/034-match.t b/debian/modules/http-lua/t/034-match.t
index ebe5762..473a11f 100644
--- a/debian/modules/http-lua/t/034-match.t
+++ b/debian/modules/http-lua/t/034-match.t
@@ -21,7 +21,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)")
             if m then
                 ngx.say(m[0])
             else
@@ -40,7 +40,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\\\d+)")
+            local m = ngx.re.match("hello, 1234", "(\\\\d+)")
             if m then
                 ngx.say(m[0])
             else
@@ -59,7 +59,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\d+)")
+            local m = ngx.re.match("hello, 1234", "(\\d+)")
             if m then
                 ngx.say(m[0])
             else
@@ -80,7 +80,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "[[\\d+]]")
+            local m = ngx.re.match("hello, 1234", "[[\\d+]]")
             if m then
                 ngx.say(m[0])
             else
@@ -101,7 +101,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+")
+            local m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -122,7 +122,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "")
+            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -145,7 +145,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
+            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -168,7 +168,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "foo")
+            local m = ngx.re.match("hello, 1234", "foo")
             if m then
                 ngx.say(m[0])
             else
@@ -187,7 +187,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO")
+            local m = ngx.re.match("hello, 1234", "HELLO")
             if m then
                 ngx.say(m[0])
             else
@@ -206,7 +206,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO", "i")
+            local m = ngx.re.match("hello, 1234", "HELLO", "i")
             if m then
                 ngx.say(m[0])
             else
@@ -225,7 +225,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            rc, err = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iu")
+            local rc, err = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iu")
             if not rc then
                 ngx.say("FAIL: ", err)
                 return
@@ -249,7 +249,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "m")
+            local m = ngx.re.match("hello\\nworld", "^world", "m")
             if m then
                 ngx.say(m[0])
             else
@@ -268,7 +268,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "m")
+            local m = ngx.re.match("hello\\nworld", ".*", "m")
             if m then
                 ngx.say(m[0])
             else
@@ -287,7 +287,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "s")
+            local m = ngx.re.match("hello\\nworld", "^world", "s")
             if m then
                 ngx.say(m[0])
             else
@@ -306,7 +306,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "s")
+            local m = ngx.re.match("hello\\nworld", ".*", "s")
             if m then
                 ngx.say(m[0])
             else
@@ -326,7 +326,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "x")
+            local m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "x")
             if m then
                 ngx.say(m[0])
             else
@@ -372,7 +372,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Hm")
+            local rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Hm")
             if rc then
                 if m then
                     ngx.say(m[0])
@@ -395,7 +395,7 @@ error: .*?unknown flag "H" \(flags "Hm"\)
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, world", "(world)|(hello)", "x")
+            local m = ngx.re.match("hello, world", "(world)|(hello)", "x")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -418,7 +418,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)(h?)")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -442,7 +442,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "a")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "a")
             if m then
                 ngx.say(m[0])
             else
@@ -461,7 +461,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("1234, hello", "([0-9]+)", "a")
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "a")
             if m then
                 ngx.say(m[0])
             else
@@ -481,7 +481,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = {}
-            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -504,7 +504,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = { pos = 3 }
-            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -526,7 +526,7 @@ not matched!
 --- config
     location /re {
         set_by_lua $res '
-            m = ngx.re.match("hello, 1234", "([0-9]+)")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)")
             if m then
                 return m[0]
             else
@@ -569,7 +569,7 @@ baz
     }
 --- user_files
 >>> a.lua
-m = ngx.re.match("hello, 1234", "(\\\s+)")
+local m = ngx.re.match("hello, 1234", "(\\\s+)")
 if m then
     ngx.say("[", m[0], "]")
 else
@@ -595,7 +595,7 @@ end
 local uri = "<impact>2</impact>"
 local regex = '(?:>[\\w\\s]*</?\\w{2,}>)';
 ngx.say("regex: ", regex)
-m = ngx.re.match(uri, regex, "oi")
+local m = ngx.re.match(uri, regex, "oi")
 if m then
     ngx.say("[", m[0], "]")
 else
@@ -613,7 +613,7 @@ regex: (?:>[\w\s]*</?\w{2,}>)
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", [[\\d+]])
+            local m = ngx.re.match("hello, 1234", [[\\d+]])
             if m then
                 ngx.say(m[0])
             else
@@ -660,7 +660,7 @@ error: pcre_compile() failed: missing ) in "([0-9]+"
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", [[([0-9]+)]])
+            local m = ngx.re.match("hello, 1234", [[([0-9]+)]])
             if m then
                 ngx.say(m[0])
             else
@@ -1027,7 +1027,7 @@ exec opts: 0
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -1067,7 +1067,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -1101,7 +1101,7 @@ failed to match
         content_by_lua '
             local res = {}
             local s = "hello, 1234"
-            m = ngx.re.match(s, [[(\\d)(\\d)]], "o", nil, res)
+            local m = ngx.re.match(s, [[(\\d)(\\d)]], "o", nil, res)
             if m then
                 ngx.say("1: m size: ", #m)
                 ngx.say("1: res size: ", #res)
@@ -1132,11 +1132,12 @@ failed to match
 === TEST 48: init_by_lua
 --- http_config
     init_by_lua '
-        m = ngx.re.match("hello, 1234", "(\\\\d+)")
+        package.loaded.m = ngx.re.match("hello, 1234", "(\\\\d+)")
     ';
 --- config
     location /re {
         content_by_lua '
+            local m = package.loaded.m
             if m then
                 ngx.say(m[0])
             else
diff --git a/debian/modules/http-lua/t/035-gmatch.t b/debian/modules/http-lua/t/035-gmatch.t
index 0426997..0dfeaea 100644
--- a/debian/modules/http-lua/t/035-gmatch.t
+++ b/debian/modules/http-lua/t/035-gmatch.t
@@ -123,7 +123,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "a")
+            local it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "a")
             ngx.say(it())
         ';
     }
@@ -418,7 +418,7 @@ hello
         content_by_lua '
             local a = {}
             for i = 1, 3 do
-                it = ngx.re.gmatch("hello, world", "[a-z]+")
+                local it = ngx.re.gmatch("hello, world", "[a-z]+")
                 it()
                 collectgarbage()
                 table.insert(a, {"hello", "world"})
@@ -482,9 +482,9 @@ end
     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
+matched
+--- no_error_log
+[error]
 
 
 
@@ -518,7 +518,7 @@ matched: []
     location /re {
         content_by_lua '
             local it = ngx.re.gmatch("1234, 1234", "(?<first>[0-9]+)")
-            m = it()
+            local m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -555,7 +555,7 @@ matched: []
         content_by_lua '
             local it = ngx.re.gmatch("1234, abcd, 1234", "(?<first>[0-9]+)|(?<second>[a-z]+)")
 
-            m = it()
+            local m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -599,7 +599,7 @@ abcd
     location /re {
         content_by_lua '
             local it = ngx.re.gmatch("hello, 1234", "(?<first>[a-z]+), (?<first>[0-9]+)", "D")
-            m = it()
+            local m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -825,7 +825,7 @@ exec opts: 0
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -871,7 +871,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -881,7 +881,7 @@ if not it then
     return
 end
 
-res, err = it()
+local res, err = it()
 
 --[[
 ngx.update_time()
diff --git a/debian/modules/http-lua/t/036-sub.t b/debian/modules/http-lua/t/036-sub.t
index 2b4b075..3e88eba 100644
--- a/debian/modules/http-lua/t/036-sub.t
+++ b/debian/modules/http-lua/t/036-sub.t
@@ -590,7 +590,7 @@ s: a好
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -693,7 +693,7 @@ ab.cd
 
 location = /t {
     content_by_lua '
-        function test()
+        local function test()
             local data = [[
                 OUTER {FIRST}
 ]]
diff --git a/debian/modules/http-lua/t/037-gsub.t b/debian/modules/http-lua/t/037-gsub.t
index 4c5810d..41f86ac 100644
--- a/debian/modules/http-lua/t/037-gsub.t
+++ b/debian/modules/http-lua/t/037-gsub.t
@@ -511,7 +511,7 @@ s: aa
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/038-match-o.t b/debian/modules/http-lua/t/038-match-o.t
index d61ff1f..f6ae010 100644
--- a/debian/modules/http-lua/t/038-match-o.t
+++ b/debian/modules/http-lua/t/038-match-o.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -39,7 +39,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\\\d+)", "o")
+            local m = ngx.re.match("hello, 1234", "(\\\\d+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -58,7 +58,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\d+)", "o")
+            local m = ngx.re.match("hello, 1234", "(\\d+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -79,7 +79,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "[[\\d+]]", "o")
+            local m = ngx.re.match("hello, 1234", "[[\\d+]]", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -100,7 +100,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+", "o")
+            local m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -121,7 +121,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
+            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -144,7 +144,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "foo", "o")
+            local m = ngx.re.match("hello, 1234", "foo", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -163,7 +163,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO", "o")
+            local m = ngx.re.match("hello, 1234", "HELLO", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -182,7 +182,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO", "oi")
+            local m = ngx.re.match("hello, 1234", "HELLO", "oi")
             if m then
                 ngx.say(m[0])
             else
@@ -224,7 +224,7 @@ this version of PCRE is not compiled with PCRE_UTF8 support|^hello章亦$
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "mo")
+            local m = ngx.re.match("hello\\nworld", "^world", "mo")
             if m then
                 ngx.say(m[0])
             else
@@ -243,7 +243,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "om")
+            local m = ngx.re.match("hello\\nworld", ".*", "om")
             if m then
                 ngx.say(m[0])
             else
@@ -262,7 +262,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "so")
+            local m = ngx.re.match("hello\\nworld", "^world", "so")
             if m then
                 ngx.say(m[0])
             else
@@ -281,7 +281,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "os")
+            local m = ngx.re.match("hello\\nworld", ".*", "os")
             if m then
                 ngx.say(m[0])
             else
@@ -301,7 +301,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "xo")
+            local m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "xo")
             if m then
                 ngx.say(m[0])
             else
@@ -347,7 +347,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Ho")
+            local rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Ho")
             if rc then
                 if m then
                     ngx.say(m[0])
@@ -370,7 +370,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, world", "(world)|(hello)", "xo")
+            local m = ngx.re.match("hello, world", "(world)|(hello)", "xo")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -393,7 +393,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)", "o")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)(h?)", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -417,7 +417,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "oa")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "oa")
             if m then
                 ngx.say(m[0])
             else
@@ -436,7 +436,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("1234, hello", "([0-9]+)", "ao")
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "ao")
             if m then
                 ngx.say(m[0])
             else
@@ -456,7 +456,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = {}
-            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -479,7 +479,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = { pos = 3 }
-            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
+            local m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -501,7 +501,7 @@ not matched!
 --- config
     location /re {
         set_by_lua $res '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
             if m then
                 return m[0]
             else
diff --git a/debian/modules/http-lua/t/041-header-filter.t b/debian/modules/http-lua/t/041-header-filter.t
index 7d8ee74..0adc699 100644
--- a/debian/modules/http-lua/t/041-header-filter.t
+++ b/debian/modules/http-lua/t/041-header-filter.t
@@ -10,7 +10,7 @@ log_level('debug');
 
 repeat_each(2);
 
-plan tests => repeat_each() * 94;
+plan tests => repeat_each() * (blocks() * 2 + 13);
 
 #no_diff();
 #no_long_string();
@@ -416,7 +416,7 @@ lua release ngx.ctx
 
 
 
-=== TEST 20: global got cleared for each single request
+=== TEST 20: globals are shared by all requests
 --- config
     location /lua {
         set $foo '';
@@ -428,6 +428,7 @@ lua release ngx.ctx
             if not foo then
                 foo = 1
             else
+                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             ngx.var.foo = foo
@@ -435,10 +436,13 @@ lua release ngx.ctx
     }
 --- request
 GET /lua
---- response_body
-1
+--- response_body_like
+^[12]$
 --- no_error_log
 [error]
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["", "old foo: 1\n"]
 
 
 
@@ -730,7 +734,8 @@ hello world
 --- config
     location /t {
         header_filter_by_lua '
-            function foo()
+            local bar
+            local function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/043-shdict.t b/debian/modules/http-lua/t/043-shdict.t
index 9183bf5..b0528e5 100644
--- a/debian/modules/http-lua/t/043-shdict.t
+++ b/debian/modules/http-lua/t/043-shdict.t
@@ -420,7 +420,7 @@ ngx_slab_alloc() failed: no memory in lua_shared_dict zone
             ngx.say(dogs:get(key))
 
             key = string.rep("a", 65536)
-            ok, err = dogs:set(key, "world")
+            local ok, err = dogs:set(key, "world")
             if not ok then
                 ngx.say("not ok: ", err)
                 return
@@ -2048,7 +2048,7 @@ get_stale ok: false, stale: false
                 ngx.say("get not ok: ", err)
                 return
             end
-            flags = err
+            local flags = err
             ngx.say("get_stale ok: ", data, ", flags: ", flags,
                     ", stale: ", stale)
 
diff --git a/debian/modules/http-lua/t/047-match-jit.t b/debian/modules/http-lua/t/047-match-jit.t
index 2417a63..f53a408 100644
--- a/debian/modules/http-lua/t/047-match-jit.t
+++ b/debian/modules/http-lua/t/047-match-jit.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "j")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "j")
             if m then
                 ngx.say(m[0])
             else
@@ -41,7 +41,7 @@ pcre JIT compiling result: 1
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, world", "([0-9]+)", "j")
+            local m = ngx.re.match("hello, world", "([0-9]+)", "j")
             if m then
                 ngx.say(m[0])
             else
@@ -62,7 +62,7 @@ pcre JIT compiling result: 1
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "jo")
+            local m = ngx.re.match("hello, 1234", "([0-9]+)", "jo")
             if m then
                 ngx.say(m[0])
             else
@@ -87,7 +87,7 @@ qr/pcre JIT compiling result: \d+/
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello, world", "([0-9]+)", "jo")
+            local m = ngx.re.match("hello, world", "([0-9]+)", "jo")
             if m then
                 ngx.say(m[0])
             else
@@ -147,7 +147,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 21)
+local s = string.rep([[ABCDEFG]], 21)
 
 local start = ngx.now()
 
@@ -187,7 +187,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 21)
+local s = string.rep([[ABCDEFG]], 21)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/048-match-dfa.t b/debian/modules/http-lua/t/048-match-dfa.t
index 28b5a60..edf3662 100644
--- a/debian/modules/http-lua/t/048-match-dfa.t
+++ b/debian/modules/http-lua/t/048-match-dfa.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello", "(he|hell)", "d")
+            local m = ngx.re.match("hello", "(he|hell)", "d")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -43,7 +43,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello", "(he|hell)", "do")
+            local m = ngx.re.match("hello", "(he|hell)", "do")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -66,7 +66,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello", "(he|hell)", "jd")
+            local m = ngx.re.match("hello", "(he|hell)", "jd")
             if m then
                 ngx.say(m[0])
             else
@@ -85,7 +85,7 @@ hell
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("world", "(he|hell)", "d")
+            local m = ngx.re.match("world", "(he|hell)", "d")
             if m then
                 ngx.say(m[0])
             else
@@ -104,7 +104,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("hello", "he|hell", "do")
+            local m = ngx.re.match("hello", "he|hell", "do")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -127,7 +127,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            m = ngx.re.match("world", "([0-9]+)", "do")
+            local m = ngx.re.match("world", "([0-9]+)", "do")
             if m then
                 ngx.say(m[0])
             else
diff --git a/debian/modules/http-lua/t/055-subreq-vars.t b/debian/modules/http-lua/t/055-subreq-vars.t
index eb5e24d..1369992 100644
--- a/debian/modules/http-lua/t/055-subreq-vars.t
+++ b/debian/modules/http-lua/t/055-subreq-vars.t
@@ -28,7 +28,7 @@ __DATA__
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ qr/variable "(dog|cat)" cannot be assigned a value \(maybe you forgot to define
     location /lua {
         set $dog '';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -110,7 +110,7 @@ variable "cat" cannot be assigned a value (maybe you forgot to define it first?)
         set $dog '';
         set $cat '';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -137,7 +137,7 @@ cat = 32
         set $dog '';
         set $cat '';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = "hello" });
 
             ngx.print(res.body)
@@ -165,7 +165,7 @@ Bad vars option value
         set $dog '';
         set $cat '';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { cat = true } });
 
             ngx.print(res.body)
@@ -188,7 +188,7 @@ attempt to use bad variable value type boolean
 
     location /lua {
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { args = "a=hello&b=32" }});
 
             ngx.print(res.body)
@@ -234,7 +234,7 @@ variable "query_string" not changeable
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { copy_all_vars = true });
 
             ngx.print(res.body)
@@ -259,7 +259,7 @@ GET /lua
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { share_all_vars = true });
 
             ngx.print(res.body)
@@ -284,7 +284,7 @@ GET /lua
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            res = ngx.location.capture("/other",
+            local res = ngx.location.capture("/other",
                 { vars = { dog = "hiya" }, copy_all_vars = true });
 
             ngx.print(res.body)
diff --git a/debian/modules/http-lua/t/056-flush.t b/debian/modules/http-lua/t/056-flush.t
index 6b697a4..bdd33d4 100644
--- a/debian/modules/http-lua/t/056-flush.t
+++ b/debian/modules/http-lua/t/056-flush.t
@@ -317,7 +317,7 @@ lua http 1.0 buffering makes ngx.flush() a no-op
 --- config
     location /test {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello, world")
                 ngx.flush(true)
                 coroutine.yield()
diff --git a/debian/modules/http-lua/t/057-flush-timeout.t b/debian/modules/http-lua/t/057-flush-timeout.t
index a046539..1f8cfaa 100644
--- a/debian/modules/http-lua/t/057-flush-timeout.t
+++ b/debian/modules/http-lua/t/057-flush-timeout.t
@@ -127,7 +127,7 @@ del timer 1234
     send_timeout 200ms;
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
diff --git a/debian/modules/http-lua/t/058-tcp-socket.t b/debian/modules/http-lua/t/058-tcp-socket.t
index 354a876..837006c 100644
--- a/debian/modules/http-lua/t/058-tcp-socket.t
+++ b/debian/modules/http-lua/t/058-tcp-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 199;
+plan tests => repeat_each() * 219;
 
 our $HtmlDir = html_dir;
 
@@ -245,11 +245,11 @@ attempt to send data on a closed socket:
 
 --- request
 GET /t
---- response_body
+--- response_body_like
 connected: 1
 request sent: 56
-first line received: HTTP/1.1 200 OK
-second line received: Server: openresty
+first line received: HTTP\/1\.1 200 OK
+second line received: (?:Date|Server): .*?
 --- no_error_log
 [error]
 --- timeout: 10
@@ -298,7 +298,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
     location /test {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -321,7 +321,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -914,7 +914,7 @@ close: 1 nil
                 end
             end
 
-            ok, err = sock:close()
+            local ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
     }
@@ -961,7 +961,7 @@ close: 1 nil
             line, err = sock:receive()
             ngx.say("receive: ", line, " ", err)
 
-            ok, err = sock:close()
+            local ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
     }
@@ -1057,7 +1057,7 @@ close: 1 nil
 
 === TEST 19: cannot survive across request boundary (send)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1116,7 +1116,7 @@ received: OK|failed to send request: closed)\$"
 
 === TEST 20: cannot survive across request boundary (receive)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1191,7 +1191,7 @@ 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -1260,7 +1260,7 @@ received: OK|failed to close: closed)$/
 
 === TEST 22: cannot survive across request boundary (connect)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location /t {
@@ -2611,7 +2611,7 @@ close: 1 nil
             local ready = false
             local fatal = false
 
-            function f()
+            local function f()
                 local line, err, part = sock:receive()
                 if not line then
                     ngx.say("failed to receive the 1st line: ", err, " [", part, "]")
@@ -2672,7 +2672,7 @@ lua clean up the timer for pending ngx.sleep
 
 === TEST 44: bad request tries to connect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2726,7 +2726,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):7: bad request/
 
 === TEST 45: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2783,7 +2783,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 46: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2840,7 +2840,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 47: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2897,7 +2897,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 48: bad request tries to set keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -2954,7 +2954,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 49: bad request tries to receiveuntil
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -3315,7 +3315,7 @@ close: 1 nil
 
             local thr = ngx.thread.spawn(function ()
                 sock = ngx.socket.tcp()
-                local ok, err = sock:connect("agentzh.org", 12345)
+                local ok, err = sock:connect("127.0.0.2", 12345)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -3464,7 +3464,7 @@ lua http cleanup reuse
                 ngx.say("failed to create timer: ", err)
             end
 
-            i = 1
+            local i = 1
             while not done do
                 local time = 0.005 * i
                 if time > 0.1 then
@@ -3545,7 +3545,7 @@ lua http cleanup reuse
                 ngx.say("failed to create timer: ", err)
             end
 
-            i = 1
+            local i = 1
             while not done do
                 local time = 0.005 * i
                 if time > 0.1 then
@@ -3720,10 +3720,10 @@ sudo iptables -I OUTPUT 1 -p udp --dport 10086 -j REJECT
     }
 --- request
 GET /t
---- response_body
-failed to connect: www.google.com could not be resolved
-failed to connect: www.google.com could not be resolved
-failed to connect: www.google.com could not be resolved
+--- response_body_like
+failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
+failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
+failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
 hello!
 --- error_log eval
 qr{\[alert\] .*? send\(\) failed \(\d+: Operation not permitted\) while resolving}
@@ -3808,3 +3808,315 @@ received:
 received: truefalsenil
 --- no_error_log
 [error]
+
+
+
+=== TEST 64: receiveany method in cosocket
+--- config
+    server_tokens off;
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+            local req = {
+                'GET /foo HTTP/1.0\r\n',
+                'Host: localhost\r\n',
+                'Connection: close\r\n\r\n',
+            }
+            local ok, err = sock:send(req)
+            if not ok then
+                ngx.say("send request failed: ", err)
+                return
+            end
+
+            -- skip http header
+            while true do
+                local data, err, _ = sock:receive('*l')
+                if err then
+                    ngx.say('unexpected error occurs when receiving http head: ', err)
+                    return
+                end
+
+                if #data == 0 then -- read last line of head
+                    break
+                end
+            end
+
+            -- receive http body
+            while true do
+                local data, err = sock:receiveany(1024)
+                if err then
+                    if err ~= 'closed' then
+                        ngx.say('unexpected err: ', err)
+                    end
+                    break
+                end
+                ngx.say(data)
+            end
+
+            sock:close()
+        }
+    }
+
+    location = /foo {
+        content_by_lua_block {
+            local resp = {
+                '1',
+                '22',
+                'hello world',
+            }
+
+            local length = 0
+            for _, v in ipairs(resp) do
+                length = length + #v
+            end
+
+            -- flush http header
+            ngx.header['Content-Length'] = length
+            ngx.flush(true)
+            ngx.sleep(0.01)
+
+            -- send http body
+            for _, v in ipairs(resp) do
+                ngx.print(v)
+                ngx.flush(true)
+                ngx.sleep(0.01)
+            end
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+1
+22
+hello world
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket read any
+
+
+
+=== TEST 65: receiveany send data after read side closed
+--- config
+    server_tokens off;
+    location = /t {
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", 7658))
+
+            while true do
+                local data, err = sock:receiveany(1024)
+                if err then
+                    if err ~= 'closed' then
+                        ngx.say('unexpected err: ', err)
+                        break
+                    end
+
+                    local data = "send data after read side closed"
+                    local bytes, err = sock:send(data)
+                    if not bytes then
+                        ngx.say(err)
+                    end
+
+                    break
+                end
+                ngx.say(data)
+            end
+
+            sock:close()
+        }
+    }
+
+--- request
+GET /t
+--- tcp_listen: 7658
+--- tcp_shutdown: 1
+--- tcp_query eval: "send data after read side closed"
+--- tcp_query_len: 32
+--- response_body
+--- no_error_log
+[error]
+
+
+
+=== TEST 66: receiveany with limited, max <= 0
+--- config
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+
+            local function receiveany_say_err(...)
+                local ok, err = pcall(sock.receiveany, sock, ...)
+                if not ok then
+                    ngx.say(err)
+                end
+            end
+
+
+            receiveany_say_err(0)
+            receiveany_say_err(-1)
+            receiveany_say_err()
+            receiveany_say_err(nil)
+        }
+    }
+
+--- response_body
+bad argument #2 to '?' (bad max argument)
+bad argument #2 to '?' (bad max argument)
+expecting 2 arguments (including the object), but got 1
+bad argument #2 to '?' (bad max argument)
+--- request
+GET /t
+--- no_error_log
+[error]
+
+
+
+=== TEST 67: receiveany with limited, max is larger than data
+--- config
+    server_tokens off;
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+            local req = {
+                'GET /foo HTTP/1.0\r\n',
+                'Host: localhost\r\n',
+                'Connection: close\r\n\r\n',
+            }
+            local ok, err = sock:send(req)
+            if not ok then
+                ngx.say("send request failed: ", err)
+                return
+            end
+
+            while true do
+                local data, err, _ = sock:receive('*l')
+                if err then
+                    ngx.say('unexpected error occurs when receiving http head: ', err)
+                    return
+                end
+
+                if #data == 0 then -- read last line of head
+                    break
+                end
+            end
+
+            local data, err = sock:receiveany(128)
+            if err then
+                if err ~= 'closed' then
+                    ngx.say('unexpected err: ', err)
+                end
+            else
+                ngx.say(data)
+            end
+
+            sock:close()
+        }
+    }
+
+    location = /foo {
+        content_by_lua_block {
+            local resp = 'hello world'
+            local length = #resp
+
+            ngx.header['Content-Length'] = length
+            ngx.flush(true)
+            ngx.sleep(0.01)
+
+            ngx.print(resp)
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+hello world
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket calling receiveany() method to read at most 128 bytes
+
+
+
+=== TEST 68: receiveany with limited, max is smaller than data
+--- config
+    server_tokens off;
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+            local req = {
+                'GET /foo HTTP/1.0\r\n',
+                'Host: localhost\r\n',
+                'Connection: close\r\n\r\n',
+            }
+            local ok, err = sock:send(req)
+            if not ok then
+                ngx.say("send request failed: ", err)
+                return
+            end
+
+            while true do
+                local data, err, _ = sock:receive('*l')
+                if err then
+                    ngx.say('unexpected error occurs when receiving http head: ', err)
+                    return
+                end
+
+                if #data == 0 then -- read last line of head
+                    break
+                end
+            end
+
+            while true do
+                local data, err = sock:receiveany(7)
+                if err then
+                    if err ~= 'closed' then
+                        ngx.say('unexpected err: ', err)
+                    end
+                    break
+
+                else
+                    ngx.say(data)
+                end
+            end
+
+            sock:close()
+        }
+    }
+
+    location = /foo {
+        content_by_lua_block {
+            local resp = 'hello world'
+            local length = #resp
+
+            ngx.header['Content-Length'] = length
+            ngx.flush(true)
+            ngx.sleep(0.01)
+
+            ngx.print(resp)
+        }
+    }
+
+--- request
+GET /t
+--- response_body
+hello w
+orld
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket calling receiveany() method to read at most 7 bytes
diff --git a/debian/modules/http-lua/t/062-count.t b/debian/modules/http-lua/t/062-count.t
index 2ad2f9f..9b0afe8 100644
--- a/debian/modules/http-lua/t/062-count.t
+++ b/debian/modules/http-lua/t/062-count.t
@@ -283,7 +283,7 @@ n = 5
 --- request
 GET /test
 --- response_body
-n = 18
+n = 22
 --- no_error_log
 [error]
 
@@ -444,7 +444,28 @@ worker: 4
 
 
 
-=== TEST 20: entries under the metatable of udp sockets
+=== TEST 20: entries under the metatable of tcp sockets
+--- config
+        location = /test {
+            content_by_lua_block {
+                local n = 0
+                local sock = ngx.socket.tcp()
+                for k, v in pairs(getmetatable(sock)) do
+                    n = n + 1
+                end
+                ngx.say("n = ", n)
+            }
+        }
+--- request
+GET /test
+--- response_body
+n = 13
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: entries under the metatable of udp sockets
 --- config
         location = /test {
             content_by_lua '
@@ -465,7 +486,7 @@ n = 6
 
 
 
-=== TEST 21: entries under the metatable of req raw sockets
+=== TEST 22: entries under the metatable of req raw sockets
 --- config
         location = /test {
             content_by_lua '
@@ -497,7 +518,7 @@ n = 6
 
 
 
-=== TEST 22: entries under the req raw sockets
+=== TEST 23: entries under the req raw sockets
 --- config
         location = /test {
             content_by_lua_block {
@@ -536,7 +557,7 @@ nrec = 3
 
 
 
-=== TEST 23: entries under the req sockets
+=== TEST 24: entries under the req sockets
 --- config
         location = /test {
             content_by_lua_block {
diff --git a/debian/modules/http-lua/t/063-abort.t b/debian/modules/http-lua/t/063-abort.t
index 411a07e..7c90eaa 100644
--- a/debian/modules/http-lua/t/063-abort.t
+++ b/debian/modules/http-lua/t/063-abort.t
@@ -22,7 +22,7 @@ __DATA__
 
 === TEST 1: ngx.exit(400) should abort print
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /memc_query {
             internal;
@@ -68,7 +68,7 @@ GET /test?a
 
 === TEST 2: ngx.exit(400) should abort ngx.log
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /memc_query {
             internal;
@@ -116,7 +116,7 @@ GET /test?a
 
 === TEST 3: ngx.exit(400) should abort ngx.location.capture
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /memc_query {
             internal;
@@ -161,7 +161,7 @@ the "$memc_key" variable is not set
 
 === TEST 4: ngx.exit(400) should abort ngx.location.capture_multi
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /memc_query {
             internal;
@@ -206,7 +206,7 @@ the "$memc_key" variable is not set
 
 === TEST 5: ngx.exit(400) should abort ngx.redirect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -233,7 +233,7 @@ lua redirect to "/blah" with code 302
 
 === TEST 6: ngx.exit(400) should abort ngx.exit
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -260,7 +260,7 @@ lua exit with code 503
 
 === TEST 7: ngx.exit(400) should abort ngx.exec
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -287,7 +287,7 @@ lua exec "/blah?"
 
 === TEST 8: ngx.exit(400) should abort ngx.send_headers
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -314,7 +314,7 @@ lua send headers
 
 === TEST 9: ngx.exit(400) should abort ngx.print
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -341,7 +341,7 @@ lua print response
 
 === TEST 10: ngx.exit(400) should abort ngx.say
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -368,7 +368,7 @@ lua say response
 
 === TEST 11: ngx.exit(400) should abort ngx.flush
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -395,7 +395,7 @@ lua flush asynchronously
 
 === TEST 12: ngx.exit(400) should abort ngx.eof
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -422,7 +422,7 @@ lua send eof
 
 === TEST 13: ngx.exit(400) should abort ngx.re.match
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -449,7 +449,7 @@ lua compiling match regex "a" with options "jo"
 
 === TEST 14: ngx.exit(400) should abort ngx.re.gmatch
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -476,7 +476,7 @@ lua compiling gmatch regex "a" with options "jo"
 
 === TEST 15: ngx.exit(400) should abort ngx.re.sub
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -503,7 +503,7 @@ lua compiling sub regex "a" with options "jo"
 
 === TEST 16: ngx.exit(400) should abort ngx.re.gsub
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -530,7 +530,7 @@ lua compiling gsub regex "a" with options "jo"
 
 === TEST 17: ngx.exit(400) should abort ngx.shared.DICT (set)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -560,7 +560,7 @@ foo = 56
 
 === TEST 18: ngx.exit(400) should abort ngx.shared.DICT (replace)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -590,7 +590,7 @@ foo = 56
 
 === TEST 19: ngx.exit(400) should abort ngx.shared.DICT (incr)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -620,7 +620,7 @@ foo = 88
 
 === TEST 20: ngx.exit(400) should abort ngx.shared.DICT (get)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -649,7 +649,7 @@ fetching key "foo" in shared dict "dogs"
 
 === TEST 21: ngx.exit(400) should skip os.execute
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -679,7 +679,7 @@ GET /test
 
 === TEST 22: ngx.exit(400) should break pcall and skip os.execute
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -709,7 +709,7 @@ fetching key "foo" in shared dict "dogs"
 
 === TEST 23: ngx.exit(400) should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -739,7 +739,7 @@ GET /test
 
 === TEST 24: ngx.redirect() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -769,7 +769,7 @@ GET /test
 
 === TEST 25: ngx.redirect() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -799,7 +799,7 @@ GET /test
 
 === TEST 26: ngx.exec() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -832,7 +832,7 @@ foo
 
 === TEST 27: ngx.exec() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -865,7 +865,7 @@ foo
 
 === TEST 28: ngx.set_uri(uri, true) should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             rewrite_by_lua '
@@ -921,7 +921,7 @@ hello world
 
 === TEST 30: ngx.exit(400) should break xpcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -955,7 +955,7 @@ GET /test
 
 === TEST 31: ngx.exec() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
@@ -988,7 +988,7 @@ foo
 
 === TEST 32: ngx.exec() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
diff --git a/debian/modules/http-lua/t/064-pcall.t b/debian/modules/http-lua/t/064-pcall.t
index 3011f3e..9af2de7 100644
--- a/debian/modules/http-lua/t/064-pcall.t
+++ b/debian/modules/http-lua/t/064-pcall.t
@@ -22,11 +22,11 @@ __DATA__
 
 === TEST 1: pcall works
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
-                function f(a, b)
+                local function f(a, b)
                     if a == 0 and b == 0 then
                         error("zero error")
                     end
@@ -58,11 +58,11 @@ $/s
 
 === TEST 2: xpcall works
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
         location = /test {
             content_by_lua '
-                function f(a, b)
+                local function f(a, b)
                     if a == 0 and b == 0 then
                         error("zero error")
                     end
@@ -70,15 +70,15 @@ $/s
                     return 23, "hello", true
                 end
 
-                function g()
+                local function g()
                     return f(0, 0)
                 end
 
-                function h()
+                local function h()
                     return f(0)
                 end
 
-                function err(...)
+                local function err(...)
                     ngx.say("error handler called: ", ...)
                     return "this is the new err"
                 end
diff --git a/debian/modules/http-lua/t/065-tcp-socket-timeout.t b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
index 78b8cff..092094a 100644
--- a/debian/modules/http-lua/t/065-tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
@@ -51,7 +51,7 @@ __DATA__
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -66,7 +66,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -81,7 +81,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(150)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -96,7 +96,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 150
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -110,7 +110,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(nil)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -125,7 +125,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 
 
 
@@ -139,7 +139,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(0)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -154,7 +154,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -168,7 +168,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(-1)
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -584,7 +584,7 @@ bad timeout value
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -683,7 +683,7 @@ after
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("1: failed to connect: ", err)
 
@@ -707,7 +707,7 @@ GET /t
 2: connected: 1
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
diff --git a/debian/modules/http-lua/t/066-socket-receiveuntil.t b/debian/modules/http-lua/t/066-socket-receiveuntil.t
index ffe74aa..89d2abf 100644
--- a/debian/modules/http-lua/t/066-socket-receiveuntil.t
+++ b/debian/modules/http-lua/t/066-socket-receiveuntil.t
@@ -245,7 +245,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -316,7 +316,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -387,7 +387,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaa")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -458,7 +458,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -530,7 +530,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -602,7 +602,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -673,7 +673,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -744,7 +744,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -815,7 +815,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -886,7 +886,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -957,7 +957,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -1028,7 +1028,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1105,7 +1105,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1182,7 +1182,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1270,7 +1270,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd")
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
diff --git a/debian/modules/http-lua/t/067-req-socket.t b/debian/modules/http-lua/t/067-req-socket.t
index 229d5cc..6593360 100644
--- a/debian/modules/http-lua/t/067-req-socket.t
+++ b/debian/modules/http-lua/t/067-req-socket.t
@@ -320,7 +320,7 @@ found the end of the stream
 
 === TEST 4: attempt to use the req socket across request boundary
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         content_by_lua '
@@ -369,7 +369,7 @@ hello world
 === 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';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         content_by_lua '
@@ -431,7 +431,7 @@ done
 
 === TEST 6: pipelined POST requests
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         content_by_lua '
diff --git a/debian/modules/http-lua/t/068-socket-keepalive.t b/debian/modules/http-lua/t/068-socket-keepalive.t
index f052e9a..e4c6988 100644
--- a/debian/modules/http-lua/t/068-socket-keepalive.t
+++ b/debian/modules/http-lua/t/068-socket-keepalive.t
@@ -4,13 +4,14 @@ use Test::Nginx::Socket::Lua;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 5 + 9);
+plan tests => repeat_each() * (blocks() * 4 + 31);
 
 our $HtmlDir = html_dir;
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
 $ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
+$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
 
 $ENV{LUA_PATH} ||=
     '/usr/local/openresty-debug/lualib/?.lua;/usr/local/openresty/lualib/?.lua;;';
@@ -29,7 +30,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -97,7 +98,7 @@ lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGI
 
 === TEST 2: free up the whole connection pool if no active connections
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -168,7 +169,7 @@ received: OK
 
 === TEST 3: upstream sockets close prematurely
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
    server_tokens off;
    keepalive_timeout 100ms;
@@ -243,7 +244,7 @@ done
 
 === TEST 4: http keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
    server_tokens off;
    location /t {
@@ -701,7 +702,35 @@ qr/lua tcp socket connection pool size: 25\b/]
 
 
 
-=== TEST 10: sock:keepalive_timeout(0) means unlimited
+=== TEST 10: setkeepalive() 'pool_size' should be greater than zero
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        content_by_lua_block {
+            local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
+            if not sock then
+                ngx.say(err)
+                return
+            end
+
+            local ok, err = pcall(sock.setkeepalive, sock, 0, 0)
+            if not ok then
+                ngx.say(err)
+                return
+            end
+            ngx.say(ok)
+        }
+    }
+--- request
+GET /t
+--- response_body
+bad argument #3 to '?' (bad "pool_size" option value: 0)
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: sock:keepalive_timeout(0) means unlimited
 --- config
    server_tokens off;
    location /t {
@@ -776,10 +805,10 @@ qr/lua tcp socket connection pool size: 30\b/]
 
 
 
-=== TEST 11: sanity (uds)
+=== TEST 12: sanity (uds)
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -858,7 +887,7 @@ received response of 119 bytes
 
 
 
-=== TEST 12: github issue #108: ngx.locaiton.capture + redis.set_keepalive
+=== TEST 13: github issue #108: ngx.locaiton.capture + redis.set_keepalive
 --- http_config eval
     qq{
         lua_package_path "$::HtmlDir/?.lua;;";
@@ -905,9 +934,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 13: github issue #110: ngx.exit with HTTP_NOT_FOUND causes worker process to exit
+=== TEST 14: github issue #110: ngx.exit with HTTP_NOT_FOUND causes worker process to exit
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     error_page 404 /404.html;
     location /t {
@@ -964,9 +993,9 @@ Not found, dear...
 
 
 
-=== TEST 14: custom pools (different pool for the same host:port) - tcp
+=== TEST 15: custom pools (different pool for the same host:port) - tcp
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1012,9 +1041,9 @@ lua tcp socket keepalive create connection pool for key "B"
 
 
 
-=== TEST 15: custom pools (same pool for different host:port) - tcp
+=== TEST 16: custom pools (same pool for different host:port) - tcp
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1059,10 +1088,10 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 16: custom pools (different pool for the same host:port) - unix
+=== TEST 17: custom pools (different pool for the same host:port) - unix
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -1119,10 +1148,10 @@ lua tcp socket keepalive create connection pool for key "B"
 
 
 
-=== TEST 17: custom pools (same pool for the same path) - unix
+=== TEST 18: custom pools (same pool for the same path) - unix
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -1174,9 +1203,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 18: numeric pool option value
+=== TEST 19: numeric pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1221,9 +1250,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 19: nil pool option value
+=== TEST 20: nil pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1264,9 +1293,9 @@ connected: 1, reused: 0
 
 
 
-=== TEST 20: (bad) table pool option value
+=== TEST 21: (bad) table pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1305,9 +1334,9 @@ bad argument #3 to 'connect' (bad "pool" option type: table)
 
 
 
-=== TEST 21: (bad) boolean pool option value
+=== TEST 22: (bad) boolean pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1346,7 +1375,7 @@ bad argument #3 to 'connect' (bad "pool" option type: boolean)
 
 
 
-=== TEST 22: clear the redis store
+=== TEST 23: clear the redis store
 --- config
     location /t {
         redis2_query flushall;
@@ -1363,9 +1392,9 @@ bad argument #3 to 'connect' (bad "pool" option type: boolean)
 
 
 
-=== TEST 23: bug in send(): clear the chain writer ctx
+=== TEST 24: bug in send(): clear the chain writer ctx
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     location /t {
         set $port $TEST_NGINX_REDIS_PORT;
@@ -1478,7 +1507,7 @@ done
 
 
 
-=== TEST 24: setkeepalive() with explicit nil args
+=== TEST 25: setkeepalive() with explicit nil args
 --- config
    server_tokens off;
    location /t {
@@ -1551,3 +1580,1379 @@ done
 "lua tcp socket keepalive timeout: 100 ms",
 qr/lua tcp socket connection pool size: 30\b/]
 --- timeout: 4
+
+
+
+=== TEST 26: conn queuing: connect() verifies the options for connection pool
+--- config
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local function check_opts_for_connect(opts)
+                local ok, err = pcall(function()
+                    sock:connect("127.0.0.1", ngx.var.port, opts)
+                end)
+                if not ok then
+                    ngx.say(err)
+                else
+                    ngx.say("ok")
+                end
+            end
+
+            check_opts_for_connect({pool_size = 'a'})
+            check_opts_for_connect({pool_size = 0})
+            check_opts_for_connect({backlog = -1})
+            check_opts_for_connect({backlog = 0})
+        }
+    }
+--- request
+GET /t
+--- response_body_like
+.+ 'connect' \(bad "pool_size" option type: string\)
+.+ 'connect' \(bad "pool_size" option value: 0\)
+.+ 'connect' \(bad "backlog" option value: -1\)
+ok
+--- no_error_log
+[error]
+
+
+
+=== TEST 27: conn queuing: connect() can specify 'pool_size' which overrides setkeepalive()
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local function go()
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", port, {pool_size = 1})
+                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(0, 20)
+                if not ok then
+                    ngx.say("failed to set reusable: ", err)
+                end
+            end
+
+            -- reuse ok
+            go()
+            go()
+
+            local sock1 = ngx.socket.connect("127.0.0.1", port)
+            local sock2 = ngx.socket.connect("127.0.0.1", port)
+            local ok, err = sock1:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+            local ok, err = sock2:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+
+            -- the pool_size is 1 instead of 20
+            sock1 = ngx.socket.connect("127.0.0.1", port)
+            sock2 = ngx.socket.connect("127.0.0.1", port)
+            ngx.say("reused: ", sock1:getreusedtimes())
+            ngx.say("reused: ", sock2:getreusedtimes())
+            sock1:setkeepalive(0, 20)
+            sock2:setkeepalive(0, 20)
+        }
+    }
+--- request
+GET /t
+--- response_body
+connected: 1, reused: 0
+request sent: 11
+received: OK
+connected: 1, reused: 1
+request sent: 11
+received: OK
+reused: 1
+reused: 0
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket connection pool size: 20"]
+--- error_log eval
+[qq{lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"},
+"lua tcp socket connection pool size: 1",
+]
+
+
+
+=== TEST 28: conn queuing: connect() can specify 'pool_size' for unix domain socket
+--- http_config eval
+"
+    server {
+        listen unix:$::HtmlDir/nginx.sock;
+    }
+"
+--- config
+    location /t {
+        content_by_lua_block {
+            local path = "unix:" .. "$TEST_NGINX_HTML_DIR/nginx.sock";
+            local function go()
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect(path, {pool_size = 1})
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
+
+                local ok, err = sock:setkeepalive(0, 20)
+                if not ok then
+                    ngx.say("failed to set reusable: ", err)
+                end
+            end
+
+            go()
+            go()
+
+            local sock1 = ngx.socket.connect(path)
+            local sock2 = ngx.socket.connect(path)
+            local ok, err = sock1:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+            local ok, err = sock2:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+
+            -- the pool_size is 1 instead of 20
+            sock1 = ngx.socket.connect(path)
+            sock2 = ngx.socket.connect(path)
+            ngx.say("reused: ", sock1:getreusedtimes())
+            ngx.say("reused: ", sock2:getreusedtimes())
+            sock1:setkeepalive(0, 20)
+            sock2:setkeepalive(0, 20)
+        }
+    }
+--- request
+GET /t
+--- response_body
+connected: 1, reused: 0
+connected: 1, reused: 1
+reused: 1
+reused: 0
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket connection pool size: 20"]
+--- error_log eval
+["lua tcp socket get keepalive peer: using connection",
+'lua tcp socket keepalive create connection pool for key "unix:',
+"lua tcp socket connection pool size: 1",
+]
+
+
+
+=== TEST 29: conn queuing: connect() can specify 'pool_size' for custom pool
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local function go(pool)
+                local sock = ngx.socket.tcp()
+                local ok, err = sock:connect("127.0.0.1", port, {pool = pool, pool_size = 1})
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", pool, ", reused: ", sock:getreusedtimes())
+
+                local ok, err = sock:setkeepalive(0, 20)
+                if not ok then
+                    ngx.say("failed to set reusable: ", err)
+                end
+            end
+
+            go('A')
+            go('B')
+            go('A')
+            go('B')
+
+            local sock1 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
+            local sock2 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
+            local ok, err = sock1:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+            local ok, err = sock2:setkeepalive(0, 20)
+            if not ok then
+                ngx.say(err)
+            end
+
+            -- the pool_size is 1 instead of 20
+            sock1 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
+            sock2 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
+            ngx.say("reused: ", sock1:getreusedtimes())
+            ngx.say("reused: ", sock2:getreusedtimes())
+            sock1:setkeepalive(0, 20)
+            sock2:setkeepalive(0, 20)
+        }
+    }
+--- request
+GET /t
+--- response_body
+connected: A, reused: 0
+connected: B, reused: 0
+connected: A, reused: 1
+connected: B, reused: 1
+reused: 1
+reused: 0
+--- no_error_log eval
+["[error]",
+"lua tcp socket keepalive: free connection pool for ",
+"lua tcp socket connection pool size: 20"]
+--- error_log eval
+[qq{lua tcp socket keepalive create connection pool for key "A"},
+qq{lua tcp socket keepalive create connection pool for key "B"},
+"lua tcp socket connection pool size: 1",
+]
+
+
+
+=== TEST 30: conn queuing: connect() uses lua_socket_pool_size as default if 'backlog' is given
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+        lua_socket_pool_size 1234;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {backlog = 0}
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.say(err)
+            else
+                ngx.say("ok")
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- error_log
+lua tcp socket connection pool size: 1234
+--- no_error_log
+[error]
+
+
+
+=== TEST 31: conn queuing: more connect operations than 'backlog' size
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 2, backlog = 0}
+            local sock = ngx.socket.connect("127.0.0.1", port, opts)
+            local not_reused_socket, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not not_reused_socket then
+                ngx.say(err)
+                return
+            end
+            -- burst
+            local ok, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say(err)
+                return
+            end
+
+            ok, err = sock:connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+            ngx.say("reused: ", sock:getreusedtimes())
+            -- both queue and pool is full
+            ok, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+reused: 1
+too many waiting connect operations
+--- no_error_log
+[error]
+
+
+
+=== TEST 32: conn queuing: once 'pool_size' is reached and pool has 'backlog'
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 2, backlog = 2}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            ngx.timer.at(0, function(premature)
+                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock2 then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                ngx.log(ngx.WARN, "start to handle timer")
+                ngx.sleep(0.1)
+                sock2:close()
+                -- resume connect operation
+                ngx.log(ngx.WARN, "continue to handle timer")
+            end)
+
+            ngx.sleep(0.05)
+            ngx.log(ngx.WARN, "start to handle cosocket")
+            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock3 then
+                ngx.say(err)
+                return
+            end
+            ngx.log(ngx.WARN, "continue to handle cosocket")
+
+            local req = "flush_all\r\n"
+            local bytes, err = sock3:send(req)
+            if not bytes then
+                ngx.say("failed to send request: ", err)
+                return
+            end
+            ngx.say("request sent: ", bytes)
+
+            local line, err, part = sock3:receive()
+            if line then
+                ngx.say("received: ", line)
+            else
+                ngx.say("failed to receive a line: ", err, " [", part, "]")
+            end
+
+            local ok, err = sock3:setkeepalive()
+            if not ok then
+                ngx.say("failed to set reusable: ", err)
+            end
+            ngx.say("setkeepalive: OK")
+        }
+    }
+--- request
+GET /t
+--- response_body
+request sent: 11
+received: OK
+setkeepalive: OK
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket queue connect operation for connection pool "127.0.0.1
+--- grep_error_log eval: qr/(start|continue) to handle \w+/
+--- grep_error_log_out
+start to handle timer
+start to handle cosocket
+continue to handle timer
+continue to handle cosocket
+
+
+
+=== TEST 33: conn queuing: do not count failed connect operations
+--- config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    resolver_timeout 3s;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 0}
+
+            local sock = ngx.socket.tcp()
+            sock:settimeouts(100, 3000, 3000)
+            local ok, err = sock:connect("127.0.0.2", 12345, opts)
+            if not ok then
+                ngx.say(err)
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.say(err)
+            end
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- error_log
+lua tcp socket connect timed out, when connecting to
+--- response_body
+timeout
+ok
+
+
+
+=== TEST 34: conn queuing: connect until backlog is reached
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 1}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            ngx.timer.at(0.01, function(premature)
+                ngx.log(ngx.WARN, "start to handle timer")
+                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock2 then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                ngx.sleep(0.02)
+                local ok, err = sock2:close()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+                ngx.log(ngx.WARN, "continue to handle timer")
+            end)
+
+            ngx.sleep(0.02)
+            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock3 then
+                ngx.say(err)
+            end
+            local ok, err = sock1:setkeepalive()
+            if not ok then
+                ngx.say(err)
+                return
+            end
+            ngx.sleep(0.01) -- run sock2
+
+            ngx.log(ngx.WARN, "start to handle cosocket")
+            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock3 then
+                ngx.say(err)
+                return
+            end
+            ngx.log(ngx.WARN, "continue to handle cosocket")
+
+            local ok, err = sock3:setkeepalive()
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket queue connect operation for connection pool "127.0.0.1
+--- grep_error_log eval: qr/queue connect operation for connection pool|(start|continue) to handle \w+/
+--- grep_error_log_out
+start to handle timer
+queue connect operation for connection pool
+start to handle cosocket
+queue connect operation for connection pool
+continue to handle timer
+continue to handle cosocket
+
+
+
+=== TEST 35: conn queuing: memory reuse for host in queueing connect operation ctx
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 3}
+            local sock = ngx.socket.connect("127.0.0.1", port, opts)
+
+            ngx.timer.at(0.01, function(premature)
+                local sock, err = ngx.socket.connect("0.0.0.0", port, opts)
+                if not sock then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                local ok, err = sock:close()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+            end)
+
+            ngx.timer.at(0.015, function(premature)
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                local ok, err = sock:close()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+            end)
+
+            ngx.timer.at(0.02, function(premature)
+                local sock, err = ngx.socket.connect("0.0.0.0", port, opts)
+                if not sock then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                local ok, err = sock:close()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+            end)
+
+            ngx.sleep(0.03)
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say(err)
+                return
+            end
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 36: conn queuing: connect() returns error after connect operation resumed
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+            local sock = ngx.socket.connect("127.0.0.1", port, opts)
+
+            ngx.timer.at(0, function(premature)
+                local sock, err = ngx.socket.connect("", port, opts)
+                if not sock then
+                    ngx.log(ngx.WARN, err)
+                end
+            end)
+
+            ngx.sleep(0.01)
+            -- use 'close' to force parsing host instead of reusing conn
+            local ok, err = sock:close()
+            if not ok then
+                ngx.say(err)
+                return
+            end
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- no_error_log
+[error]
+--- error_log
+failed to parse host name
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+
+
+
+=== TEST 37: conn queuing: in uthread
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 2}
+
+            local conn_sock = function()
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("start to handle uthread")
+
+                ngx.sleep(0.01)
+                sock:close()
+                ngx.say("continue to handle other uthread")
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock)
+            local co2 = ngx.thread.spawn(conn_sock)
+            local co3 = ngx.thread.spawn(conn_sock)
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.log(ngx.ERR, err)
+            end
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.thread.wait(co3)
+            ngx.say("all uthreads ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+start to handle uthread
+continue to handle other uthread
+start to handle uthread
+continue to handle other uthread
+all uthreads ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 38: conn queuing: in access_by_lua
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        access_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 2}
+
+            local conn_sock = function()
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("start to handle uthread")
+
+                ngx.sleep(0.01)
+                sock:close()
+                ngx.say("continue to handle other uthread")
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock)
+            local co2 = ngx.thread.spawn(conn_sock)
+            local co3 = ngx.thread.spawn(conn_sock)
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.log(ngx.ERR, err)
+            end
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.thread.wait(co3)
+            ngx.say("all uthreads ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+start to handle uthread
+continue to handle other uthread
+start to handle uthread
+continue to handle other uthread
+all uthreads ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 39: conn queuing: in rewrite_by_lua
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        rewrite_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 2}
+
+            local conn_sock = function()
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("start to handle uthread")
+
+                ngx.sleep(0.01)
+                sock:close()
+                ngx.say("continue to handle other uthread")
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock)
+            local co2 = ngx.thread.spawn(conn_sock)
+            local co3 = ngx.thread.spawn(conn_sock)
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.log(ngx.ERR, err)
+            end
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.thread.wait(co3)
+            ngx.say("all uthreads ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+too many waiting connect operations
+start to handle uthread
+continue to handle other uthread
+start to handle uthread
+continue to handle other uthread
+all uthreads ok
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 40: conn queuing: in subrequest
+--- config
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /t {
+        content_by_lua_block {
+            local port = ngx.var.port
+            ngx.timer.at(0, function()
+                local opts = {pool_size = 1, backlog = 2}
+                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+                if not sock then
+                    ngx.log(ngx.ERR, err)
+                    return
+                end
+
+                ngx.sleep(0.1)
+                local ok, err = sock:setkeepalive()
+                if not ok then
+                    ngx.log(ngx.ERR, err)
+                end
+            end)
+
+            ngx.sleep(0.01)
+            local res1, res2, res3 = ngx.location.capture_multi{
+                {"/conn"}, {"/conn"}, {"/conn"}
+            }
+            ngx.say(res1.body)
+            ngx.say(res2.body)
+            ngx.say(res3.body)
+        }
+    }
+
+    location /conn {
+        content_by_lua_block {
+            local port = ngx.var.port
+            local sock, err = ngx.socket.connect("127.0.0.1", port)
+            if not sock then
+                ngx.print(err)
+                return
+            end
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.print(err)
+            else
+                ngx.print("ok")
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+ok
+too many waiting connect operations
+--- no_error_log
+[error]
+--- grep_error_log eval: qr/queue connect operation for connection pool/
+--- grep_error_log_out
+queue connect operation for connection pool
+queue connect operation for connection pool
+
+
+
+=== TEST 41: conn queuing: timeouts when 'connect_timeout' is reached
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 1}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            local sock2 = ngx.socket.tcp()
+            sock2:settimeouts(10, 3000, 3000)
+            local ok, err = sock2:connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+timeout
+--- error_log eval
+"lua tcp socket queued connect timed out, when trying to connect to 127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
+
+
+
+=== TEST 42: conn queuing: set timeout via lua_socket_connect_timeout
+--- config
+    lua_socket_connect_timeout 10ms;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 1}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            local sock2 = ngx.socket.tcp()
+            local ok, err = sock2:connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+timeout
+--- error_log eval
+"lua tcp socket queued connect timed out, when trying to connect to 127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
+
+
+
+=== TEST 43: conn queuing: client aborting while connect operation is queued
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool_size = 1, backlog = 1}
+            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
+
+            local sock2 = ngx.socket.tcp()
+            sock2:settimeouts(3000, 3000, 3000)
+            local ok, err = sock2:connect("127.0.0.1", port, opts)
+            if not ok then
+                ngx.say(err)
+            end
+        }
+    }
+--- request
+GET /t
+--- ignore_response
+--- timeout: 0.1
+--- abort
+--- no_error_log
+[error]
+
+
+
+=== TEST 44: conn queuing: resume next connect operation if resumed connect failed immediately
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 2}
+
+            local conn_sock = function(should_timeout)
+                local sock = ngx.socket.tcp()
+                local ok, err
+                if should_timeout then
+                    ok, err = sock:connect("", port, opts)
+                else
+                    ok, err = sock:connect("127.0.0.1", port, opts)
+                end
+                if not ok then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("connected in uthread")
+                sock:close()
+            end
+
+            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock, true)
+            local co2 = ngx.thread.spawn(conn_sock)
+
+            local ok, err = sock:close()
+            if not ok then
+                ngx.log(ngx.ERR, err)
+            end
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+failed to parse host name "": no host
+connected in uthread
+ok
+--- no_error_log
+[error]
+
+
+
+=== TEST 45: conn queuing: resume connect operation if resumed connect failed (timeout)
+--- config
+    resolver $TEST_NGINX_RESOLVER ipv6=off;
+    resolver_timeout 3s;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+
+            local conn_sock = function(should_timeout)
+                local sock = ngx.socket.tcp()
+                local ok, err
+                if should_timeout then
+                    sock:settimeouts(100, 3000, 3000)
+                    ok, err = sock:connect("127.0.0.2", 12345, opts)
+                else
+                    ok, err = sock:connect("127.0.0.1", port, opts)
+                end
+                if not ok then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("connected in uthread")
+                sock:close()
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock, true)
+            local co2 = ngx.thread.spawn(conn_sock)
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+timeout
+connected in uthread
+ok
+--- error_log
+queue connect operation for connection pool "test"
+lua tcp socket connect timed out, when connecting to
+
+
+
+=== TEST 46: conn queuing: resume connect operation if resumed connect failed (could not be resolved)
+--- config
+    resolver 127.0.0.2:12345 ipv6=off;
+    resolver_timeout 1s;
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+
+            local conn_sock = function(should_timeout)
+                local sock = ngx.socket.tcp()
+                local ok, err
+                if should_timeout then
+                    sock:settimeouts(1, 3000, 3000)
+                    ok, err = sock:connect("agentzh.org", 80, opts)
+                else
+                    ok, err = sock:connect("127.0.0.1", port, opts)
+                end
+                if not ok then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("connected in uthread")
+                sock:close()
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock, true)
+            local co2 = ngx.thread.spawn(conn_sock)
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+agentzh.org could not be resolved (110: Operation timed out)
+connected in uthread
+ok
+--- error_log
+queue connect operation for connection pool "test"
+
+
+
+=== TEST 47: conn queuing: resume connect operation if resumed connect failed (connection refused)
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local port = ngx.var.port
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+
+            local conn_sock = function(should_timeout)
+                local sock = ngx.socket.tcp()
+                local ok, err
+                if should_timeout then
+                    sock:settimeouts(100, 3000, 3000)
+                    ok, err = sock:connect("127.0.0.1", 62345, opts)
+                else
+                    ok, err = sock:connect("127.0.0.1", port, opts)
+                end
+                if not ok then
+                    ngx.say(err)
+                    return
+                end
+                ngx.say("connected in uthread")
+                sock:close()
+            end
+
+            local co1 = ngx.thread.spawn(conn_sock, true)
+            local co2 = ngx.thread.spawn(conn_sock)
+
+            ngx.thread.wait(co1)
+            ngx.thread.wait(co2)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+connection refused
+connected in uthread
+ok
+--- error_log
+queue connect operation for connection pool "test"
+
+
+
+=== TEST 48: conn queuing: resume connect operation if resumed connect failed (uthread aborted while resolving)
+--- http_config
+    lua_package_path '../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;';
+--- config
+    resolver 127.0.0.1 ipv6=off;
+    resolver_timeout 100s;
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /sub {
+        content_by_lua_block {
+            local semaphore = require "ngx.semaphore"
+            local sem = semaphore.new()
+
+            local function f()
+                sem:wait(0.1)
+                ngx.exit(0)
+            end
+
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+            local port = ngx.var.port
+            ngx.timer.at(0, function()
+                sem:post()
+                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
+                package.loaded.for_timer_to_resume:post()
+                if not sock2 then
+                    ngx.log(ngx.ALERT, "resume connect failed: ", err)
+                    return
+                end
+
+                ngx.log(ngx.INFO, "resume success")
+            end)
+
+            ngx.thread.spawn(f)
+            local sock1, err = ngx.socket.connect("openresty.org", 80, opts)
+            if not sock1 then
+                ngx.say(err)
+                return
+            end
+        }
+    }
+
+    location /t {
+        content_by_lua_block {
+            local semaphore = require "ngx.semaphore"
+            local for_timer_to_resume = semaphore.new()
+            package.loaded.for_timer_to_resume = for_timer_to_resume
+
+            ngx.location.capture("/sub")
+            for_timer_to_resume:wait(0.1)
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[alert]
+--- error_log
+resume success
+
+
+
+=== TEST 49: conn queuing: resume connect operation if resumed connect failed (uthread killed while resolving)
+--- config
+    resolver 127.0.0.1 ipv6=off;
+    resolver_timeout 100s;
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /t {
+        content_by_lua_block {
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+            local port = ngx.var.port
+
+            local function resolve()
+                local sock1, err = ngx.socket.connect("openresty.org", 80, opts)
+                if not sock1 then
+                    ngx.say(err)
+                    return
+                end
+            end
+
+            local th = ngx.thread.spawn(resolve)
+            local ok, err = ngx.thread.kill(th)
+            if not ok then
+                ngx.log(ngx.ALERT, "kill thread failed: ", err)
+                return
+            end
+
+            local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
+            if not sock2 then
+                ngx.log(ngx.ALERT, "resume connect failed: ", err)
+                return
+            end
+
+            ngx.log(ngx.INFO, "resume success")
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[alert]
+--- error_log
+resume success
+
+
+
+=== TEST 50: conn queuing: increase the counter for connections created before creating the pool with setkeepalive()
+--- config
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /t {
+        content_by_lua_block {
+            local function connect()
+                local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
+                if not sock then
+                    error("connect failed: " .. err)
+                end
+
+                return sock
+            end
+
+            local sock1 = connect()
+            local sock2 = connect()
+            assert(sock1:setkeepalive())
+            assert(sock2:setkeepalive())
+
+            local sock1 = connect()
+            local sock2 = connect()
+            assert(sock1:close())
+            assert(sock2:close())
+
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+ok
+
+
+
+=== TEST 51: conn queuing: only decrease the counter for connections which were counted by the pool
+--- config
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /t {
+        content_by_lua_block {
+            local function connect()
+                local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
+                if not sock then
+                    error("connect failed: " .. err)
+                end
+
+                return sock
+            end
+
+            local sock1 = connect()
+            local sock2 = connect()
+            assert(sock1:setkeepalive(1000, 1))
+            assert(sock2:setkeepalive(1000, 1))
+
+            local sock1 = connect()
+            local sock2 = connect()
+            assert(sock1:close())
+            assert(sock2:close())
+
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+ok
+
+
+
+=== TEST 52: conn queuing: clean up pending connect operations which are in queue
+--- config
+    set $port $TEST_NGINX_MEMCACHED_PORT;
+
+    location /sub {
+        content_by_lua_block {
+            local opts = {pool = "test", pool_size = 1, backlog = 1}
+            local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port, opts)
+            if not sock then
+                ngx.say("connect failed: " .. err)
+                return
+            end
+
+            local function f()
+                assert(ngx.socket.connect("127.0.0.1", ngx.var.port, opts))
+            end
+
+            local th = ngx.thread.spawn(f)
+            local ok, err = ngx.thread.kill(th)
+            if not ok then
+                ngx.log(ngx.ERR, "kill thread failed: ", err)
+                return
+            end
+
+            sock:close()
+        }
+    }
+
+    location /t {
+        content_by_lua_block {
+            ngx.location.capture("/sub")
+            -- let pending connect operation resumes first
+            ngx.sleep(0)
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- error_log
+lua tcp socket abort queueing
+--- response_body
+ok
diff --git a/debian/modules/http-lua/t/073-backtrace.t b/debian/modules/http-lua/t/073-backtrace.t
index 6c54692..663c3af 100644
--- a/debian/modules/http-lua/t/073-backtrace.t
+++ b/debian/modules/http-lua/t/073-backtrace.t
@@ -21,10 +21,10 @@ __DATA__
 --- config
     location /lua {
         content_by_lua
-        '   function bar()
+        '   local function bar()
                 return lua_concat(3)
             end
-            function foo()
+            local function foo()
                 bar()
             end
             foo()
@@ -37,7 +37,7 @@ GET /lua
 attempt to call global 'lua_concat'
 : in function 'bar'
 :5: in function 'foo'
-:7: in function
+:7: in main chunk
 
 
 
@@ -45,10 +45,10 @@ attempt to call global 'lua_concat'
 --- config
     location /lua {
         content_by_lua
-        '   function bar()
+        '   local function bar()
                 error(nil)
             end
-            function foo()
+            local function foo()
                 bar()
             end
             foo()
@@ -64,7 +64,7 @@ GET /lua
 " in function 'error'",
 ": in function 'bar'",
 ":5: in function 'foo'",
-qr/:7: in function <content_by_lua\(nginx\.conf:\d+\):1>/,
+qr/:7: in main chunk/,
 ]
 
 
@@ -125,7 +125,7 @@ probe process("$LIBLUA_PATH").function("lua_concat") {
 :63: in function 'func16'
 :67: in function 'func17'
 :71: in function 'func18'
-:74: in function
+:74: in main chunk
 
 
 
diff --git a/debian/modules/http-lua/t/075-logby.t b/debian/modules/http-lua/t/075-logby.t
index 520c62e..8eece69 100644
--- a/debian/modules/http-lua/t/075-logby.t
+++ b/debian/modules/http-lua/t/075-logby.t
@@ -220,7 +220,7 @@ failed to run log_by_lua*: unknown reason
 
 
 
-=== TEST 11: globals get cleared for every single request
+=== TEST 11: globals sharing
 --- config
     location /lua {
         echo ok;
@@ -228,6 +228,7 @@ failed to run log_by_lua*: unknown reason
             if not foo then
                 foo = 1
             else
+                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             ngx.log(ngx.WARN, "foo = ", foo)
@@ -237,8 +238,9 @@ failed to run log_by_lua*: unknown reason
 GET /lua
 --- response_body
 ok
---- error_log
-foo = 1
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["", "old foo: 1\n"]
 
 
 
@@ -495,7 +497,8 @@ API disabled in the context of log_by_lua*
     location /t {
         echo ok;
         log_by_lua '
-            function foo()
+            local bar
+            local function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/081-bytecode.t b/debian/modules/http-lua/t/081-bytecode.t
index cb50e94..92383bc 100644
--- a/debian/modules/http-lua/t/081-bytecode.t
+++ b/debian/modules/http-lua/t/081-bytecode.t
@@ -24,7 +24,7 @@ __DATA__
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             if jit then
                 if not string.find(jit.version, "LuaJIT 2.0") then
@@ -35,7 +35,8 @@ __DATA__
             else
                 f:write(string.sub(b, 1, 147));
             end
-            f:close(); res = ngx.location.capture("/call");
+            f:close();
+            local res = ngx.location.capture("/call");
             ngx.print(res.body)
         ';
     }
@@ -60,14 +61,15 @@ __DATA__
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local 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");
+            f:close();
+            local res = ngx.location.capture("/call");
             if res.status == 200 then
                 ngx.print(res.body)
             else
@@ -85,7 +87,7 @@ __DATA__
 --- response_body
 error
 --- error_log eval
-qr/failed to load external Lua file ".*?test\.lua": bad byte-code header/
+qr/failed to load external Lua file ".*?test\.lua": .* cannot load incompatible bytecode/
 
 
 
@@ -96,14 +98,15 @@ qr/failed to load external Lua file ".*?test\.lua": bad byte-code header/
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local 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");
+            f:close();
+            local res = ngx.location.capture("/call");
             if res.status == 200 then
                 ngx.print(res.body)
             else
@@ -121,7 +124,7 @@ qr/failed to load external Lua file ".*?test\.lua": bad byte-code header/
 --- response_body
 error
 --- error_log
-bytecode format version unsupported
+cannot load incompatible bytecode
 
 
 
@@ -132,7 +135,7 @@ bytecode format version unsupported
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             local do_jit
             if jit then
@@ -176,7 +179,7 @@ bytecode format version unsupported
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local 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
@@ -220,7 +223,7 @@ error
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             if jit then
                 if not string.find(jit.version, "LuaJIT 2.0") then
@@ -256,9 +259,9 @@ error
         content_by_lua '
             local bcsave = require "jit.bcsave"
             if jit then
-                local prefix = ngx.config.prefix()
-                local infile = prefix .. "html/a.lua"
-                local outfile = prefix .. "html/a.luac"
+                local prefix = "$TEST_NGINX_SERVER_ROOT"
+                local infile = prefix .. "/html/a.lua"
+                local outfile = prefix .. "/html/a.luac"
                 bcsave.start("-s", infile, outfile)
                 return ngx.exec("/call")
             end
@@ -289,9 +292,9 @@ ngx.status = 201 ngx.say("hello from Lua!")
         content_by_lua '
             local bcsave = require "jit.bcsave"
             if jit then
-                local prefix = ngx.config.prefix()
-                local infile = prefix .. "html/a.lua"
-                local outfile = prefix .. "html/a.luac"
+                local prefix = "$TEST_NGINX_SERVER_ROOT"
+                local infile = prefix .. "/html/a.lua"
+                local outfile = prefix .. "/html/a.luac"
                 bcsave.start("-g", infile, outfile)
                 return ngx.exec("/call")
             end
@@ -320,9 +323,9 @@ ngx.status = 201 ngx.say("hello from Lua!")
 --- config
     location = /t {
         content_by_lua_block {
-            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
+            local f = assert(loadstring("local a = 1 ngx.say('a = ', a)", "=code"))
             local bc = string.dump(f)
-            local f = assert(io.open("t/servroot/html/a.luac", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
             f:write(bc)
             f:close()
         }
@@ -349,9 +352,9 @@ a = 1
 --- config
     location = /t {
         content_by_lua_block {
-            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
+            local f = assert(loadstring("local a = 1 ngx.say('a = ', a)", "=code"))
             local bc = string.dump(f, true)
-            local f = assert(io.open("t/servroot/html/a.luac", "w"))
+            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
             f:write(bc)
             f:close()
         }
diff --git a/debian/modules/http-lua/t/082-body-filter.t b/debian/modules/http-lua/t/082-body-filter.t
index 98efa84..5f765fa 100644
--- a/debian/modules/http-lua/t/082-body-filter.t
+++ b/debian/modules/http-lua/t/082-body-filter.t
@@ -460,7 +460,8 @@ GET /t
 --- config
     location /t {
         body_filter_by_lua '
-            function foo()
+            local bar
+            local function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/084-inclusive-receiveuntil.t b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
index f7d5d3d..66be893 100644
--- a/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
+++ b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
@@ -56,7 +56,7 @@ __DATA__
             local reader = sock:receiveuntil("abcabd", { inclusive = true })
 
             for i = 1, 3 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -128,7 +128,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe", { inclusive = true })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -200,7 +200,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd", { inclusive = true })
 
             for i = 1, 3 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -272,7 +272,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = nil })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -343,7 +343,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = false })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -414,7 +414,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = true })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -485,7 +485,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = "true" })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -552,7 +552,7 @@ bad "inclusive" option value type: string
             local reader = sock:receiveuntil("aa", { inclusive = "true" })
 
             for i = 1, 2 do
-                line, err, part = reader()
+                local line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -620,7 +620,7 @@ bad "inclusive" option value type: string
             local reader = sock:receiveuntil("--abc", { inclusive = true })
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -697,7 +697,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc", { inclusive = true })
 
             for i = 1, 7 do
-                line, err, part = reader(4)
+                local line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
diff --git a/debian/modules/http-lua/t/087-udp-socket.t b/debian/modules/http-lua/t/087-udp-socket.t
index 8bedc32..dc6cad5 100644
--- a/debian/modules/http-lua/t/087-udp-socket.t
+++ b/debian/modules/http-lua/t/087-udp-socket.t
@@ -555,7 +555,7 @@ lua udp socket read timed out
 
             local udp = socket.udp()
 
-            udp:settimeout(2000) -- 2 sec
+            udp:settimeout(5000) -- 5 sec
 
             local ok, err = udp:setpeername("$TEST_NGINX_RESOLVER", 53)
             if not ok then
@@ -824,7 +824,7 @@ probe syscall.socket.return, syscall.connect.return {
 
 === TEST 15: bad request tries to setpeer
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -881,7 +881,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 16: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -938,7 +938,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 17: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -995,7 +995,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 18: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
@@ -1052,7 +1052,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 19: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 --- config
     server_tokens off;
     location = /main {
diff --git a/debian/modules/http-lua/t/090-log-socket-errors.t b/debian/modules/http-lua/t/090-log-socket-errors.t
index 16576b6..f5a9f80 100644
--- a/debian/modules/http-lua/t/090-log-socket-errors.t
+++ b/debian/modules/http-lua/t/090-log-socket-errors.t
@@ -28,7 +28,7 @@ __DATA__
         lua_socket_log_errors off;
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say(err)
         ';
     }
@@ -50,7 +50,7 @@ timeout
         lua_socket_log_errors on;
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say(err)
         ';
     }
@@ -59,7 +59,7 @@ GET /t
 --- response_body
 timeout
 --- error_log
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 
 
 
@@ -72,7 +72,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
         lua_socket_read_timeout 1ms;
         content_by_lua '
             local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("agentzh.org", 12345)
+            local ok, err = sock:setpeername("127.0.0.2", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
@@ -95,7 +95,7 @@ lua udp socket read timed out
         lua_socket_read_timeout 1ms;
         content_by_lua '
             local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("agentzh.org", 12345)
+            local ok, err = sock:setpeername("127.0.0.2", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
diff --git a/debian/modules/http-lua/t/091-coroutine.t b/debian/modules/http-lua/t/091-coroutine.t
index bceb512..7cf60f9 100644
--- a/debian/modules/http-lua/t/091-coroutine.t
+++ b/debian/modules/http-lua/t/091-coroutine.t
@@ -85,7 +85,7 @@ __DATA__
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("Hello, ", cnt)
@@ -120,7 +120,7 @@ Hello, 2
 --- config
     location /lua {
         content_by_lua '
-            function f(fid)
+            local function f(fid)
                 local cnt = 0
                 while true do
                     ngx.say("cc", fid, ": ", cnt)
@@ -163,7 +163,7 @@ cc3: 2
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            function worker(url)
+            local function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -178,7 +178,7 @@ cc3: 2
 
             local urls = {
                 "agentzh.org",
-                "iscribblet.org",
+                "openresty.com",
                 "openresty.org"
             }
 
@@ -204,7 +204,7 @@ cc3: 2
 GET /lua
 --- response_body
 successfully connected to: agentzh.org
-successfully connected to: iscribblet.org
+successfully connected to: openresty.com
 successfully connected to: openresty.org
 *** All Done ***
 --- no_error_log
@@ -218,14 +218,14 @@ successfully connected to: openresty.org
     location /lua {
         content_by_lua '
             -- generate all the numbers from 2 to n
-            function gen (n)
+            local 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)
+            local function filter (p, g)
               return coroutine.wrap(function ()
                 while 1 do
                   local n = g()
@@ -235,8 +235,8 @@ successfully connected to: openresty.org
               end)
             end
 
-            N = 10
-            x = gen(N)		-- generate primes up to N
+            local N = 10
+            local 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
@@ -264,14 +264,14 @@ GET /lua
             coroutine.create = nil
             coroutine.resume = nil
             -- generate all the numbers from 2 to n
-            function gen (n)
+            local 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)
+            local function filter (p, g)
               return coroutine.wrap(function ()
                 while 1 do
                   local n = g()
@@ -281,8 +281,8 @@ GET /lua
               end)
             end
 
-            N = 10 
-            x = gen(N)		-- generate primes up to N
+            local N = 10 
+            local 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
@@ -307,7 +307,7 @@ GET /lua
 --- config
     location /lua {
         content_by_lua '
-            function generatefib (n)
+            local function generatefib (n)
               return coroutine.wrap(function ()
                 local a,b = 1, 1
                 while a <= n do
@@ -362,7 +362,7 @@ GET /lua
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            function worker(url)
+            local function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -377,7 +377,7 @@ GET /lua
 
             local urls = {
                 "agentzh.org",
-                "iscribblet.org",
+                "openresty.com",
                 "openresty.org"
             }
 
@@ -398,7 +398,7 @@ GET /lua
 GET /lua
 --- response_body
 successfully connected to: agentzh.org
-successfully connected to: iscribblet.org
+successfully connected to: openresty.com
 successfully connected to: openresty.org
 *** All Done ***
 --- no_error_log
@@ -414,7 +414,7 @@ successfully connected to: openresty.org
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
             local st, rn = coroutine.status, coroutine.running
 
-            function f(self)
+            local function f(self)
                 local cnt = 0
                 if rn() ~= self then ngx.say("error"); return end
                 ngx.say("running: ", st(self)) --running
@@ -509,7 +509,7 @@ GET /lua
 --- config
     location /lua {
         content_by_lua '
-            function print(...)
+            local function print(...)
                 local args = {...}
                 local is_first = true
                 for i,v in ipairs(args) do
@@ -523,12 +523,12 @@ GET /lua
                 ngx.print("\\\n")
             end
 
-            function foo (a)
+            local function foo (a)
                 print("foo", a)
                 return coroutine.yield(2*a)
             end
 
-            co = coroutine.create(function (a,b)
+            local co = coroutine.create(function (a,b)
                     print("co-body", a, b)
                     local r = foo(a+1)
                     print("co-body", r)
@@ -566,7 +566,8 @@ main false cannot resume dead coroutine
             local create = coroutine.create
             local resume = coroutine.resume
             local yield = coroutine.yield
-            function f()
+            local g
+            local function f()
                 ngx.say("f begin")
                 yield()
                 local c2 = create(g)
@@ -627,8 +628,9 @@ main done
             local yield = coroutine.yield
 
             local code = 400
+            local g
 
-            function f()
+            local function f()
                 local c2 = create(g)
                 yield()
                 code = code + 1
@@ -683,8 +685,9 @@ exit
             local yield = coroutine.yield
 
             local code = 0
+            local g
 
-            function f()
+            local function f()
                 local c2 = create(g)
                 yield()
                 code = code + 1
@@ -740,7 +743,7 @@ num: 3
     location /lua {
         echo hello;
         header_filter_by_lua '
-            function f()
+            local function f()
                 yield()
             end
 
@@ -764,13 +767,13 @@ API disabled in the context of header_filter_by_lua*
 
             local c1, c2
 
-            function f()
+            local function f()
                 print("f 1")
                 print(coroutine.resume(c2))
                 print("f 2")
             end
 
-            function g()
+            local function g()
                 print("g 1")
                 -- print(coroutine.resume(c1))
                 print("g 2")
@@ -803,13 +806,13 @@ f 2
 
             local c1, c2
 
-            function f()
+            local function f()
                 print("f 1")
                 print(coroutine.resume(c2))
                 print("f 2")
             end
 
-            function g()
+            local function g()
                 print("g 1")
                 print(coroutine.resume(c1))
                 print("g 2")
@@ -859,7 +862,7 @@ falsecannot resume running coroutine
     location /t {
         content_by_lua '
             local co
-            function f()
+            local function f()
                 ngx.say("f: ", coroutine.status(co))
                 ngx.say("f: ", coroutine.resume(co))
             end
@@ -885,7 +888,7 @@ chunk: true
     location /t {
         content_by_lua '
             local co
-            function f()
+            local function f()
                 error("bad")
             end
             co = coroutine.create(f)
@@ -990,7 +993,7 @@ test10
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            function worker(url)
+            local function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -1044,7 +1047,7 @@ successfully connected to: agentzh.org
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            function worker(url)
+            local function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -1104,7 +1107,7 @@ successfully connected to: agentzh.org
 --- config
     location /cotest {
         content_by_lua '
-            function generator()
+            local function generator()
                 return co_wrap(function()
                     co_yield("data")
                 end)
@@ -1133,7 +1136,7 @@ data
 --- config
     location /cotest {
         content_by_lua '
-            function generator()
+            local function generator()
                 return co_wrap(function()
                     co_yield("data")
                 end)
@@ -1166,7 +1169,7 @@ data
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 return 3
             end
 
@@ -1199,7 +1202,7 @@ ok
             local coroutine = require "coroutine"
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("Hello, ", cnt)
@@ -1238,7 +1241,7 @@ Hello, 2
         header_filter_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     print("co yield: ", cnt)
@@ -1278,7 +1281,7 @@ co yield: 2
         body_filter_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     print("co yield: ", cnt)
diff --git a/debian/modules/http-lua/t/093-uthread-spawn.t b/debian/modules/http-lua/t/093-uthread-spawn.t
index b622d30..ab6db2f 100644
--- a/debian/modules/http-lua/t/093-uthread-spawn.t
+++ b/debian/modules/http-lua/t/093-uthread-spawn.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
             end
 
@@ -58,11 +58,11 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("in thread 1")
             end
 
-            function g()
+            local function g()
                 ngx.say("in thread 2")
             end
 
@@ -107,7 +107,7 @@ after 2
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -144,13 +144,13 @@ after sleep
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            function g()
+            local function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -200,7 +200,7 @@ delete thread 2
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.blah()
             end
 
@@ -231,9 +231,9 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):3:
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
-                res = ngx.location.capture("/proxy")
+                local res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -277,7 +277,7 @@ after capture: hello world
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -330,7 +330,7 @@ after capture: hello foo
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -384,13 +384,13 @@ capture: hello bar
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            function g()
+            local function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -462,7 +462,8 @@ g: after capture: hello bah
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -508,7 +509,8 @@ after g
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -556,7 +558,7 @@ hello in g()
     location /lua {
         content_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -589,7 +591,7 @@ status: running
     location /lua {
         content_by_lua '
             local co
-            function f()
+            local function f()
                 co = coroutine.running()
             end
 
@@ -621,7 +623,8 @@ status: zombie
     location /lua {
         content_by_lua '
             local co
-            function f()
+            local g
+            local function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -660,7 +663,8 @@ status: normal
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local g
+            local function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -707,7 +711,7 @@ after f
         content_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -760,7 +764,7 @@ f 3
         content_by_lua '
             local yield = coroutine.yield
 
-            function f()
+            local function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -769,7 +773,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            function g()
+            local function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -816,7 +820,7 @@ g 3
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -853,12 +857,12 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            function g()
+            local function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -904,7 +908,7 @@ hello from g
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -956,7 +960,7 @@ received: OK
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1018,7 +1022,7 @@ after)$
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1063,7 +1067,7 @@ body: hello world)$
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
@@ -1113,7 +1117,7 @@ body: hello world)$
 --- config
     location /lua {
         content_by_lua '
-            function f(a, b)
+            local function f(a, b)
                 ngx.say("hello ", a, " and ", b)
             end
 
@@ -1647,7 +1651,7 @@ ok
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
             end
diff --git a/debian/modules/http-lua/t/094-uthread-exit.t b/debian/modules/http-lua/t/094-uthread-exit.t
index 2f7d9ba..58d8d0b 100644
--- a/debian/modules/http-lua/t/094-uthread-exit.t
+++ b/debian/modules/http-lua/t/094-uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -171,13 +171,13 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -261,7 +261,7 @@ f
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -297,10 +297,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -393,10 +393,10 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver agentzh.org;
+        resolver 127.0.0.2:12345;
         resolver_timeout 12s;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -490,7 +490,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -501,7 +501,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("172.105.207.225", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -580,7 +580,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -680,7 +680,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -786,7 +786,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -881,7 +881,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -974,7 +974,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1059,7 +1059,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1142,7 +1142,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1225,7 +1225,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1315,7 +1315,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture_multi{
                     {"/echo"},
                     {"/sleep"}
@@ -1407,7 +1407,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(444)
@@ -1490,7 +1490,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(408)
@@ -1573,7 +1573,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(499)
diff --git a/debian/modules/http-lua/t/095-uthread-exec.t b/debian/modules/http-lua/t/095-uthread-exec.t
index 56156c4..7bf37c0 100644
--- a/debian/modules/http-lua/t/095-uthread-exec.t
+++ b/debian/modules/http-lua/t/095-uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.exec("/foo")
             end
 
@@ -58,7 +58,7 @@ i am foo
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -93,7 +93,7 @@ i am foo
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -175,12 +175,12 @@ hello foo
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
             end
 
@@ -267,7 +267,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -348,7 +348,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture("/sleep")
                 ngx.say("end")
             end
diff --git a/debian/modules/http-lua/t/096-uthread-redirect.t b/debian/modules/http-lua/t/096-uthread-redirect.t
index 003c642..95bff01 100644
--- a/debian/modules/http-lua/t/096-uthread-redirect.t
+++ b/debian/modules/http-lua/t/096-uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -114,7 +114,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -194,7 +194,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture_multi{
                     {"/echo"},
                     {"/sleep"}
diff --git a/debian/modules/http-lua/t/097-uthread-rewrite.t b/debian/modules/http-lua/t/097-uthread-rewrite.t
index 2f0c06f..998e256 100644
--- a/debian/modules/http-lua/t/097-uthread-rewrite.t
+++ b/debian/modules/http-lua/t/097-uthread-rewrite.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.req.set_uri("/foo", true)
             end
 
@@ -58,7 +58,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
@@ -93,7 +93,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
@@ -175,12 +175,12 @@ hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
 
-            function g()
+            local function g()
                 ngx.sleep(1)
             end
 
@@ -267,7 +267,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
diff --git a/debian/modules/http-lua/t/098-uthread-wait.t b/debian/modules/http-lua/t/098-uthread-wait.t
index 4948596..c2819ae 100644
--- a/debian/modules/http-lua/t/098-uthread-wait.t
+++ b/debian/modules/http-lua/t/098-uthread-wait.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 return "done"
             end
@@ -72,7 +72,7 @@ done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done"
@@ -120,13 +120,13 @@ done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -200,13 +200,13 @@ f: done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -228,7 +228,7 @@ f: done
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            ok, res = ngx.thread.wait(tf)
+            local ok, res = ngx.thread.wait(tf)
             if not ok then
                 ngx.say("failed to wait f: ", res)
                 return
@@ -281,7 +281,7 @@ g: done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 return "done", 3.14
             end
@@ -330,7 +330,7 @@ res: done 3.14
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done", 3.14
@@ -378,7 +378,7 @@ res: done 3.14
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 error("bad bad!")
             end
@@ -427,7 +427,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):4:
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 error("bad bad!")
@@ -477,12 +477,12 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):5:
 --- config
     location /lua {
         content_by_lua '
-            function g()
+            local function g()
                 ngx.say("hello in thread")
                 return "done"
             end
 
-            function f()
+            local function f()
                 local t, err = ngx.thread.spawn(g)
                 if not t then
                     ngx.say("failed to spawn thread: ", err)
@@ -533,13 +533,13 @@ done
 --- config
     location /lua {
         content_by_lua '
-            function g()
+            local function g()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done"
             end
 
-            function f()
+            local function f()
                 local t, err = ngx.thread.spawn(g)
                 if not t then
                     ngx.say("failed to spawn thread: ", err)
@@ -593,12 +593,12 @@ done
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 out("f: hello")
                 return "f done"
             end
 
-            function g()
+            local function g()
                 out("g: hello")
                 return "g done"
             end
@@ -668,13 +668,13 @@ g status: zombie
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 out("f: hello")
                 return "f done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 out("g: hello")
                 return "g done"
@@ -745,13 +745,13 @@ g: hello
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 ngx.sleep(0.2)
                 out("f: hello")
                 return "f done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.1)
                 out("g: hello")
                 return "g done"
@@ -822,12 +822,12 @@ f: hello
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 out("f: hello")
                 error("f done")
             end
 
-            function g()
+            local function g()
                 out("g: hello")
                 error("g done")
             end
@@ -896,13 +896,13 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):7:
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 out("f: hello")
                 error("f done")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 out("g: hello")
                 error("g done")
@@ -969,13 +969,13 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):8:
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -997,7 +997,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):8:
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            ok, res = ngx.thread.wait(tf, tg)
+            local ok, res = ngx.thread.wait(tf, tg)
             if not ok then
                 ngx.say("failed to wait: ", res)
                 return
@@ -1038,13 +1038,13 @@ res: done
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.2)
                 ngx.say("f: hello")
                 return "f done"
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.1)
                 ngx.say("g: hello")
                 return "g done"
@@ -1066,7 +1066,7 @@ res: done
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            ok, res = ngx.thread.wait(tf, tg)
+            local ok, res = ngx.thread.wait(tf, tg)
             if not ok then
                 ngx.say("failed to wait: ", res)
                 return
@@ -1109,12 +1109,12 @@ res: g done
         content_by_lua '
             local t
 
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 return "done"
             end
 
-            function g()
+            local function g()
                 t = ngx.thread.spawn(f)
             end
 
@@ -1154,7 +1154,7 @@ only the parent coroutine can wait on the thread
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 coroutine.yield()
                 return "done"
@@ -1192,7 +1192,7 @@ qr/lua entry thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):11
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.sleep(0.1)
                 collectgarbage()
                 error("f done")
@@ -1228,7 +1228,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):5:
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello in thread")
                 return "done"
             end
@@ -1283,7 +1283,7 @@ failed to run thread: already waited or killed
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 -- ngx.say("hello in thread")
                 return "done"
             end
diff --git a/debian/modules/http-lua/t/099-c-api.t b/debian/modules/http-lua/t/099-c-api.t
index a0b375c..5033462 100644
--- a/debian/modules/http-lua/t/099-c-api.t
+++ b/debian/modules/http-lua/t/099-c-api.t
@@ -86,7 +86,7 @@ dogs zone: defined
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -149,7 +149,7 @@ bar: rc=0, type=3, val=3.14159
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -212,7 +212,7 @@ bar: rc=0, type=1, val=0
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -272,7 +272,7 @@ bar: rc=-5
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local s = ffi.new("char[?]", 20)
 
@@ -344,7 +344,7 @@ bar: rc=0, type=4, val=, len=0
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
diff --git a/debian/modules/http-lua/t/100-client-abort.t b/debian/modules/http-lua/t/100-client-abort.t
index 89c1f6a..f571387 100644
--- a/debian/modules/http-lua/t/100-client-abort.t
+++ b/debian/modules/http-lua/t/100-client-abort.t
@@ -195,7 +195,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 
     location = /sleep {
@@ -236,7 +236,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://agentzh.org:12345/;
+        proxy_pass http://127.0.0.2:12345/;
     }
 --- request
 GET /t
@@ -540,7 +540,7 @@ client prematurely closed connection
                 return
             end
 
-            ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            local 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
diff --git a/debian/modules/http-lua/t/106-timer.t b/debian/modules/http-lua/t/106-timer.t
index 3e4741e..7b7c85e 100644
--- a/debian/modules/http-lua/t/106-timer.t
+++ b/debian/modules/http-lua/t/106-timer.t
@@ -76,7 +76,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])
 
 
 
-=== TEST 2: separated global env
+=== TEST 2: globals are shared
 --- config
     location /t {
         content_by_lua '
@@ -104,7 +104,7 @@ F(ngx_http_lua_timer_handler) {
 
 --- response_body
 registered timer
-foo = nil
+foo = 3
 
 --- wait: 0.1
 --- no_error_log
@@ -320,7 +320,7 @@ qr/received: Server: \S+/,
 
 === TEST 6: tcp cosocket in timer handler (keep-alive connections)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -596,7 +596,7 @@ qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
 
 === TEST 10: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -693,7 +693,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 11: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -799,7 +799,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 12: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -912,7 +912,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 13: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -1023,7 +1023,7 @@ qr/go\(\): connected: 1, reused: \d+/,
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
             local function f()
-                function f()
+                local function f()
                     local cnt = 0
                     for i = 1, 20 do
                         print("cnt = ", cnt)
@@ -1090,7 +1090,7 @@ registered timer
                 ngx.log(ngx.ERR, ...)
             end
             local function handle()
-                function f()
+                local function f()
                     print("hello in thread")
                     return "done"
                 end
diff --git a/debian/modules/http-lua/t/108-timer-safe.t b/debian/modules/http-lua/t/108-timer-safe.t
index 2795998..758d01a 100644
--- a/debian/modules/http-lua/t/108-timer-safe.t
+++ b/debian/modules/http-lua/t/108-timer-safe.t
@@ -229,7 +229,7 @@ qr/received: Server: \S+/,
 
 === TEST 4: tcp cosocket in timer handler (keep-alive connections)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -489,7 +489,7 @@ delete thread 2
 --- response_body
 hello world
 
---- wait: 0.1
+--- wait: 0.15
 --- no_error_log
 [error]
 [alert]
@@ -499,7 +499,7 @@ hello world
 [
 "registered timer",
 qr/\[lua\] .*? my lua timer handler/,
-qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
+qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-9]|8[0-6])/,
 "lua ngx.timer expired",
 "http lua close fake http connection"
 ]
@@ -508,7 +508,7 @@ qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
 
 === TEST 8: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -606,7 +606,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 9: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -713,7 +713,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 10: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -827,7 +827,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 11: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
 
 --- config
     location = /t {
@@ -1007,7 +1007,7 @@ registered timer
                 ngx.log(ngx.ERR, ...)
             end
             local function handle()
-                function f()
+                local function f()
                     print("hello in thread")
                     return "done"
                 end
diff --git a/debian/modules/http-lua/t/109-timer-hup.t b/debian/modules/http-lua/t/109-timer-hup.t
index 0864046..2c197c2 100644
--- a/debian/modules/http-lua/t/109-timer-hup.t
+++ b/debian/modules/http-lua/t/109-timer-hup.t
@@ -46,7 +46,7 @@ __DATA__
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -99,7 +99,7 @@ timer prematurely expired: true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -163,7 +163,7 @@ timer prematurely expired: true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -219,7 +219,7 @@ failed to register a new timer after reload: process exiting, context: ngx.timer
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -284,7 +284,7 @@ g: exiting=true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -363,7 +363,7 @@ lua found 100 pending timers
                 local line, err = sock:receive("*l")
             until not line or string.find(line, "^%s*$")
 
-            function foo()
+            local function foo()
                 repeat
                     -- Get and read chunk
                     local line, err = sock:receive("*l")
@@ -379,7 +379,7 @@ lua found 100 pending timers
                 until len == 0
             end
 
-            co = coroutine.create(foo)
+            local co = coroutine.create(foo)
             repeat
                 local chunk = select(2,coroutine.resume(co))
             until chunk == nil
@@ -399,7 +399,7 @@ lua found 100 pending timers
                 end
                 local ok, err = ngx.timer.at(1, background_thread)
 
-                local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+                local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
                 if not f then
                     ngx.say("failed to open nginx.pid: ", err)
                     return
@@ -453,7 +453,7 @@ lua found 1 pending timers
                 end
 
                 if kill then
-                    local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+                    local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
                     if not f then
                         ngx.log(ngx.ERR, "failed to open nginx.pid: ", err)
                         return
diff --git a/debian/modules/http-lua/t/120-re-find.t b/debian/modules/http-lua/t/120-re-find.t
index 73e6134..f80ca4f 100644
--- a/debian/modules/http-lua/t/120-re-find.t
+++ b/debian/modules/http-lua/t/120-re-find.t
@@ -622,7 +622,7 @@ matched: 你
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -664,7 +664,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-s = string.rep([[ABCDEFG]], 10)
+local s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/123-lua-path.t b/debian/modules/http-lua/t/123-lua-path.t
index 23681a9..e30132f 100644
--- a/debian/modules/http-lua/t/123-lua-path.t
+++ b/debian/modules/http-lua/t/123-lua-path.t
@@ -11,7 +11,7 @@ repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 3 + 1);
 
-$ENV{LUA_PATH} = "/foo/bar/baz";
+$ENV{LUA_PATH} = "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;/foo/bar/baz";
 $ENV{LUA_CPATH} = "/baz/bar/foo";
 #no_diff();
 #no_long_string();
@@ -36,8 +36,8 @@ env LUA_CPATH;
     }
 --- request
 GET /lua
---- response_body
-/foo/bar/baz
+--- response_body_like
+(?:\.\.\/lua-resty-core\/lib\/\?\.lua;\.\.\/lua-resty-lrucache\/lib\/\?\.lua;){1,2}\/foo\/bar\/baz
 /baz/bar/foo
 
 --- no_error_log
@@ -60,8 +60,8 @@ env LUA_CPATH;
     }
 --- request
 GET /lua
---- response_body
-/foo/bar/baz
+--- response_body_like
+(?:\.\.\/lua-resty-core\/lib\/\?\.lua;\.\.\/lua-resty-lrucache\/lib\/\?\.lua;){1,2}\/foo\/bar\/baz
 /baz/bar/foo
 
 --- no_error_log
diff --git a/debian/modules/http-lua/t/124-init-worker.t b/debian/modules/http-lua/t/124-init-worker.t
index 9b2a91f..b648d55 100644
--- a/debian/modules/http-lua/t/124-init-worker.t
+++ b/debian/modules/http-lua/t/124-init-worker.t
@@ -521,12 +521,11 @@ warn(): Thu, 01 Jan 1970 01:34:38 GMT
     }
 --- request
 GET /t
---- response_body
-timer created
+--- response_body_like
 connected: 1
 request sent: 56
-first line received: HTTP/1.1 200 OK
-second line received: Server: openresty
+first line received: HTTP\/1\.1 200 OK
+second line received: (?:Date|Server): .*?
 --- no_error_log
 [error]
 --- timeout: 10
@@ -550,6 +549,7 @@ second line received: Server: openresty
             else
                 say("connect: ", ok, " ", err)
             end
+            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
@@ -600,6 +600,7 @@ qr/connect\(\) failed \(\d+: Connection refused\), context: ngx\.timer$/
             else
                 say("connect: ", ok, " ", err)
             end
+            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
@@ -650,6 +651,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
             else
                 say("connect: ", ok, " ", err)
             end
+            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
diff --git a/debian/modules/http-lua/t/126-shdict-frag.t b/debian/modules/http-lua/t/126-shdict-frag.t
index 5a2aff8..33646d1 100644
--- a/debian/modules/http-lua/t/126-shdict-frag.t
+++ b/debian/modules/http-lua/t/126-shdict-frag.t
@@ -1240,8 +1240,8 @@ failed to safe set baz: no memory
                 local key = "mylittlekey" .. rand(maxkeyidx)
                 local ok, err = dogs:get(key)
                 if not ok or rand() > 0.6 then
-                    sz = rand(maxsz)
-                    val = rep("a", sz)
+                    local sz = rand(maxsz)
+                    local val = rep("a", sz)
                     local ok, err, forcible = dogs:set(key, val)
                     if err then
                         ngx.log(ngx.ERR, "failed to set key: ", err)
diff --git a/debian/modules/http-lua/t/127-uthread-kill.t b/debian/modules/http-lua/t/127-uthread-kill.t
index cc43c62..5542153 100644
--- a/debian/modules/http-lua/t/127-uthread-kill.t
+++ b/debian/modules/http-lua/t/127-uthread-kill.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f()")
                 ngx.sleep(1)
             end
@@ -81,7 +81,7 @@ lua clean up the timer for pending ngx.sleep
 --- config
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.say("hello from f()")
                 ngx.sleep(0.001)
                 return 32
@@ -138,12 +138,12 @@ lua clean up the timer for pending ngx.sleep
 
 === TEST 3: kill pending resolver
 --- config
-    resolver agentzh.org:12345;
+    resolver 127.0.0.2:12345;
     location /lua {
         content_by_lua '
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
-                sock:connect("some.agentzh.org", 12345)
+                sock:connect("some.127.0.0.2", 12345)
             end
 
             local t, err = ngx.thread.spawn(f)
@@ -194,13 +194,13 @@ resolve name done: -2
     location /lua {
         content_by_lua '
             local ready = false
-            function f()
+            local function f()
                 local sock = ngx.socket.tcp()
                 sock:connect("agentzh.org", 80)
                 sock:close()
                 ready = true
                 sock:settimeout(10000)
-                sock:connect("agentzh.org", 12345)
+                sock:connect("127.0.0.2", 12345)
             end
 
             local t, err = ngx.thread.spawn(f)
@@ -262,7 +262,7 @@ lua finalize socket
 
     location = /t {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture("/sub")
             end
 
@@ -309,11 +309,11 @@ lua tcp socket abort resolver
 
     location = /t {
         content_by_lua '
-            function f()
+            local function f()
                 ngx.location.capture("/sub")
             end
 
-            function g()
+            local function g()
                 ngx.sleep(0.3)
             end
 
@@ -376,7 +376,7 @@ lua tcp socket abort resolver
     location = /t {
         content_by_lua '
             local ready = false
-            function f()
+            local function f()
                 ngx.location.capture("/sub")
                 ready = true
                 ngx.sleep(0.5)
@@ -424,7 +424,7 @@ lua tcp socket abort resolver
 --- config
     location = /t {
         content_by_lua '
-            function f()
+            local function f()
                 return
             end
 
@@ -473,7 +473,7 @@ lua tcp socket abort resolver
                 ngx.say("killed main thread.")
             end
 
-            function f()
+            local function f()
                 local ok, err = ngx.thread.kill(coroutine.running())
                 if not ok then
                     ngx.say("failed to kill user thread: ", err)
diff --git a/debian/modules/http-lua/t/128-duplex-tcp-socket.t b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
index aed560c..22b9f03 100644
--- a/debian/modules/http-lua/t/128-duplex-tcp-socket.t
+++ b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
@@ -396,7 +396,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("172.105.207.225", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
@@ -425,7 +425,7 @@ close: nil closed
 --- config
     server_tokens off;
     lua_socket_log_errors off;
-    resolver agentzh.org:12345;
+    resolver 127.0.0.2:12345;
     resolver_timeout 300ms;
     location /t {
         content_by_lua '
@@ -459,7 +459,7 @@ close: nil closed
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("some2.agentzh.org", 12345)
+            local ok, err = sock:connect("some2.agentzh.org", 80)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
diff --git a/debian/modules/http-lua/t/129-ssl-socket.t b/debian/modules/http-lua/t/129-ssl-socket.t
index 3f05640..f2fa26b 100644
--- a/debian/modules/http-lua/t/129-ssl-socket.t
+++ b/debian/modules/http-lua/t/129-ssl-socket.t
@@ -301,7 +301,7 @@ SSL reused session
 
         content_by_lua '
             local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
+            sock:settimeout(7000)
 
             do
 
@@ -380,7 +380,7 @@ lua ssl free session
 --- no_error_log
 [error]
 [alert]
---- timeout: 5
+--- timeout: 10
 
 
 
@@ -573,7 +573,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET / HTTP/1.1\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET /en/linux-packages.html HTTP/1.1\\r\\nHost: openresty.com\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -602,7 +602,7 @@ GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 56 bytes.
+sent http request: 80 bytes.
 received: HTTP/1.1 404 Not Found
 close: 1 nil
 
@@ -1333,13 +1333,13 @@ failed to send http request: closed
 --- grep_error_log_out
 --- error_log eval
 [
-qr/\[crit\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
+qr/\[(crit|error)\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
 'lua ssl server name: "openresty.org"',
 ]
 --- no_error_log
 SSL reused session
-[error]
 [alert]
+[emerg]
 --- timeout: 5
 
 
@@ -2508,7 +2508,7 @@ SSL reused session
 
         content_by_lua_block {
             local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
+            sock:settimeout(7000)
 
             local ok, err = sock:connect("openresty.org", 443)
             if not ok then
@@ -2529,4 +2529,4 @@ GET /t
 qr/\[error\] .* ngx.socket sslhandshake: expecting 1 ~ 5 arguments \(including the object\), but seen 0/
 --- no_error_log
 [alert]
---- timeout: 5
+--- timeout: 10
diff --git a/debian/modules/http-lua/t/130-internal-api.t b/debian/modules/http-lua/t/130-internal-api.t
index eba0980..2158e87 100644
--- a/debian/modules/http-lua/t/130-internal-api.t
+++ b/debian/modules/http-lua/t/130-internal-api.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 3;
+plan tests => repeat_each() * blocks() * 3;
 
 #no_diff();
 no_long_string();
@@ -19,12 +19,7 @@ run_tests();
 
 __DATA__
 
-=== TEST 1: __ngx_req and __ngx_cycle
---- http_config
-    init_by_lua '
-        my_cycle = __ngx_cycle
-    ';
-
+=== TEST 1: req
 --- config
     location = /t {
         content_by_lua '
@@ -32,18 +27,14 @@ __DATA__
             local function tonum(ud)
                 return tonumber(ffi.cast("uintptr_t", ud))
             end
-            ngx.say(string.format("init: cycle=%#x", tonum(my_cycle)))
-            ngx.say(string.format("content cycle=%#x", tonum(__ngx_cycle)))
-            ngx.say(string.format("content req=%#x", tonum(__ngx_req)))
+            ngx.say(string.format("content req=%#x", tonum(exdata())))
         ';
     }
 --- request
 GET /t
 
 --- response_body_like chop
-^init: cycle=(0x[a-f0-9]{4,})
-content cycle=\1
-content req=0x[a-f0-9]{4,}
+^content req=0x[a-f0-9]{4,}
 $
 --- no_error_log
 [error]
diff --git a/debian/modules/http-lua/t/134-worker-count-5.t b/debian/modules/http-lua/t/134-worker-count-5.t
index b257c12..ec6d0e7 100644
--- a/debian/modules/http-lua/t/134-worker-count-5.t
+++ b/debian/modules/http-lua/t/134-worker-count-5.t
@@ -3,7 +3,7 @@
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
-#master_on();
+master_on();
 workers(5);
 #log_level('warn');
 
@@ -55,7 +55,7 @@ workers: 5
 
 === TEST 3: init_by_lua + module (github #681)
 --- http_config
-    lua_package_path "t/servroot/html/?.lua;;";
+    lua_package_path "$TEST_NGINX_SERVER_ROOT/html/?.lua;;";
 
     init_by_lua_block {
         local blah = require "file"
diff --git a/debian/modules/http-lua/t/138-balancer.t b/debian/modules/http-lua/t/138-balancer.t
index 0aba66d..151db7b 100644
--- a/debian/modules/http-lua/t/138-balancer.t
+++ b/debian/modules/http-lua/t/138-balancer.t
@@ -362,8 +362,6 @@ me: 101
 
 === TEST 13: lua subrequests
 --- http_config
-    lua_package_path "t/servroot/html/?.lua;;";
-
     lua_code_cache off;
 
     upstream backend {
diff --git a/debian/modules/http-lua/t/139-ssl-cert-by.t b/debian/modules/http-lua/t/139-ssl-cert-by.t
index a65d703..bebbdb2 100644
--- a/debian/modules/http-lua/t/139-ssl-cert-by.t
+++ b/debian/modules/http-lua/t/139-ssl-cert-by.t
@@ -1278,7 +1278,7 @@ lua ssl server name: "test.com"
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
         ssl_certificate_by_lua_block {
-            function f()
+            local function f()
                 ngx.sleep(0.01)
                 print("uthread: hello in thread")
                 return "done"
diff --git a/debian/modules/http-lua/t/140-ssl-c-api.t b/debian/modules/http-lua/t/140-ssl-c-api.t
index 8734d14..a77f5d4 100644
--- a/debian/modules/http-lua/t/140-ssl-c-api.t
+++ b/debian/modules/http-lua/t/140-ssl-c-api.t
@@ -10,6 +10,7 @@ my $openssl_version = eval { `$NginxBinary -V 2>&1` };
 
 if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
     plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
+
 } else {
     plan tests => repeat_each() * (blocks() * 5 + 1);
 }
@@ -68,7 +69,7 @@ _EOC_
 
     my $http_config = $block->http_config || '';
     $http_config .= <<'_EOC_';
-lua_package_path "$prefix/html/?.lua;;";
+lua_package_path "$prefix/html/?.lua;../lua-resty-core/lib/?.lua;;";
 _EOC_
     $block->set_value("http_config", $http_config);
 });
@@ -91,8 +92,8 @@ __DATA__
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -245,8 +246,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -399,8 +400,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -528,8 +529,8 @@ failed to parse PEM priv key: PEM_read_bio_PrivateKey() failed
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -678,8 +679,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = getfenv(0).__ngx_req
-            if not r then
+            local r = require "resty.core.base" .get_request()
+            if r == nil then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
diff --git a/debian/modules/http-lua/t/143-ssl-session-fetch.t b/debian/modules/http-lua/t/143-ssl-session-fetch.t
index 4dc992d..78a66cf 100644
--- a/debian/modules/http-lua/t/143-ssl-session-fetch.t
+++ b/debian/modules/http-lua/t/143-ssl-session-fetch.t
@@ -1114,3 +1114,108 @@ qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
 [error]
 [alert]
 [emerg]
+
+
+
+=== TEST 14: keep global variable in ssl_session_(store|fetch)_by_lua when OpenResty LuaJIT is used
+--- http_config
+    ssl_session_store_by_lua_block {
+        ngx.log(ngx.WARN, "new foo: ", foo)
+        if not foo then
+            foo = 1
+        else
+            ngx.log(ngx.WARN, "old foo: ", foo)
+            foo = foo + 1
+        end
+    }
+    ssl_session_fetch_by_lua_block {
+        ngx.log(ngx.WARN, "new bar: ", foo)
+        if not bar then
+            bar = 1
+        else
+            ngx.log(ngx.WARN, "old bar: ", bar)
+            bar = bar + 1
+        end
+    }
+
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+        ssl_session_tickets off;
+
+        server_tokens off;
+        location /foo {
+            content_by_lua_block {
+                ngx.say("foo: ", foo)
+                ngx.say("bar: ", bar)
+            }
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                local sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                package.loaded.session = sess
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    local m, err = ngx.re.match(line, "^foo: (.*)$", "jo")
+                    if err then
+                        ngx.say("failed to match line: ", err)
+                    end
+
+                    if m and m[1] then
+                        ngx.print(m[1])
+                    end
+                end
+
+                local ok, err = sock:close()
+                ngx.say("done")
+            end  -- do
+        }
+    }
+
+--- request
+GET /t
+--- response_body_like chomp
+\A[123]done\n\z
+--- grep_error_log eval: qr/old (foo|bar): \d+/
+--- grep_error_log_out eval
+["", "old foo: 1\n", "old bar: 1\nold foo: 2\n"]
+--- no_error_log
+[error]
+[alert]
+[emerg]
diff --git a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
index 4ebc8f3..8566c0b 100644
--- a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
+++ b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
@@ -323,7 +323,7 @@ lua tcp socket write timed out
 
             sock:settimeouts(100, 100, 100)
 
-            local ok, err = sock:connect("agentzh.org", 12345)
+            local ok, err = sock:connect("127.0.0.2", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -346,7 +346,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
+lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 --- timeout: 10
 
 
@@ -411,7 +411,7 @@ lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 
             local chunk = 4
 
-            function read()
+            local function read()
                 sock:settimeout(200) -- read: 200 ms
 
                 local data, err = sock:receive(content_length)
@@ -506,7 +506,7 @@ failed to receive data: timeout
 
             local chunk = 4
 
-            function read()
+            local function read()
                 local data, err = sock:receive(content_length)
                 if not data then
                     ngx.log(ngx.ERR, "failed to receive data: ", err)
diff --git a/debian/modules/http-lua/t/152-timer-every.t b/debian/modules/http-lua/t/152-timer-every.t
index c8d62e7..7b42d2d 100644
--- a/debian/modules/http-lua/t/152-timer-every.t
+++ b/debian/modules/http-lua/t/152-timer-every.t
@@ -63,7 +63,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, cont
 
 
 
-=== TEST 2: separated global env
+=== TEST 2: shared global env
 --- config
     location /t {
         content_by_lua_block {
@@ -84,7 +84,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, cont
 --- request
 GET /t
 --- response_body
-foo = nil
+foo = 3
 --- wait: 0.12
 --- no_error_log
 [error]
diff --git a/debian/modules/http-lua/t/153-semaphore-hup.t b/debian/modules/http-lua/t/153-semaphore-hup.t
index c85a21d..5c271a4 100644
--- a/debian/modules/http-lua/t/153-semaphore-hup.t
+++ b/debian/modules/http-lua/t/153-semaphore-hup.t
@@ -67,7 +67,7 @@ add_block_preprocessor(sub {
                 return
             end
 
-            shdict = ngx.shared.shdict
+            local shdict = ngx.shared.shdict
             local success = shdict:add("reloaded", 1)
             if not success then
                 return
diff --git a/debian/modules/http-lua/t/156-slow-network.t b/debian/modules/http-lua/t/156-slow-network.t
new file mode 100644
index 0000000..2d80506
--- /dev/null
+++ b/debian/modules/http-lua/t/156-slow-network.t
@@ -0,0 +1,138 @@
+BEGIN {
+    if (!defined $ENV{LD_PRELOAD}) {
+        $ENV{LD_PRELOAD} = '';
+    }
+
+    if ($ENV{LD_PRELOAD} !~ /\bmockeagain\.so\b/) {
+        $ENV{LD_PRELOAD} = "mockeagain.so $ENV{LD_PRELOAD}";
+    }
+
+    if ($ENV{MOCKEAGAIN} eq 'r') {
+        $ENV{MOCKEAGAIN} = 'rw';
+
+    } else {
+        $ENV{MOCKEAGAIN} = 'w';
+    }
+
+    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
+}
+
+use Test::Nginx::Socket::Lua;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4);
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->error_log) {
+        $block->set_value("no_error_log", "[error]");
+    }
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+
+});
+
+
+log_level("debug");
+no_long_string();
+#no_diff();
+run_tests();
+
+__DATA__
+
+=== TEST 1: receiveany returns anything once socket receives
+--- config
+    server_tokens off;
+    location = /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            sock:settimeout(500)
+            assert(sock:connect("127.0.0.1", ngx.var.port))
+            local req = {
+                'GET /foo HTTP/1.0\r\n',
+                'Host: localhost\r\n',
+                'Connection: close\r\n\r\n',
+            }
+            local ok, err = sock:send(req)
+            if not ok then
+                ngx.say("send request failed: ", err)
+                return
+            end
+
+
+            -- skip http header
+            while true do
+                local data, err, _ = sock:receive('*l')
+                if err then
+                    ngx.say('unexpected error occurs when receiving http head: ' .. err)
+                    return
+                end
+                if #data == 0 then -- read last line of head
+                    break
+                end
+            end
+
+            -- receive http body
+            while true do
+                local data, err = sock:receiveany(1024)
+                if err then
+                    if err ~= 'closed' then
+                        ngx.say('unexpected err: ', err)
+                    end
+                    break
+                end
+                ngx.say(data)
+            end
+
+            sock:close()
+        }
+    }
+
+    location = /foo {
+        content_by_lua_block {
+            local resp = {
+                '1',
+                'hello',
+            }
+
+            local length = 0
+            for _, v in ipairs(resp) do
+                length = length + #v
+            end
+
+            -- flush http header
+            ngx.header['Content-Length'] = length
+            ngx.flush(true)
+            ngx.sleep(0.01)
+
+            -- send http body bytes by bytes
+            for _, v in ipairs(resp) do
+                ngx.print(v)
+                ngx.flush(true)
+                ngx.sleep(0.01)
+            end
+        }
+    }
+
+--- response_body
+1
+h
+e
+l
+l
+o
+--- grep_error_log eval
+qr/lua tcp socket read any/
+--- grep_error_log_out
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
+lua tcp socket read any
diff --git a/debian/modules/http-lua/t/157-socket-keepalive-hup.t b/debian/modules/http-lua/t/157-socket-keepalive-hup.t
new file mode 100644
index 0000000..357bb59
--- /dev/null
+++ b/debian/modules/http-lua/t/157-socket-keepalive-hup.t
@@ -0,0 +1,91 @@
+# 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;
+        undef $ENV{TEST_NGINX_USE_STAP};
+    }
+}
+
+use Test::Nginx::Socket::Lua $SkipReason ? (skip_all => $SkipReason) : ();
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 8);
+
+#no_diff();
+no_long_string();
+
+worker_connections(1024);
+run_tests();
+
+__DATA__
+
+=== TEST 1: exiting
+--- config
+    location /t {
+        set $port $TEST_NGINX_SERVER_PORT;
+
+        content_by_lua_block {
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            if not f then
+                ngx.say("failed to open nginx.pid: ", err)
+                return
+            end
+
+            local pid = f:read()
+            -- ngx.say("master pid: [", pid, "]")
+
+            f:close()
+
+            local i = 0
+            local port = ngx.var.port
+
+            local function f(premature)
+                print("timer prematurely expired: ", premature)
+
+                local sock = ngx.socket.tcp()
+
+                local ok, err = sock:connect("127.0.0.1", port)
+                if not ok then
+                    print("failed to connect: ", err)
+                    return
+                end
+
+                local ok, err = sock:setkeepalive()
+                if not ok then
+                    print("failed to setkeepalive: ", err)
+                    return
+                end
+
+                print("setkeepalive successfully")
+            end
+            local ok, err = ngx.timer.at(3, f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+            ngx.say("registered timer")
+            os.execute("kill -HUP " .. pid)
+        }
+    }
+--- request
+GET /t
+
+--- response_body
+registered timer
+
+--- wait: 0.3
+--- no_error_log
+[error]
+[alert]
+[crit]
+--- error_log
+timer prematurely expired: true
+setkeepalive successfully
+lua tcp socket set keepalive while process exiting, closing connection
diff --git a/debian/modules/http-lua/t/158-global-var.t b/debian/modules/http-lua/t/158-global-var.t
new file mode 100644
index 0000000..414a43a
--- /dev/null
+++ b/debian/modules/http-lua/t/158-global-var.t
@@ -0,0 +1,508 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+log_level('debug');
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3 + 14);
+
+our $HtmlDir = html_dir;
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+
+no_long_string();
+
+sub read_file {
+    my $infile = shift;
+    open my $in, $infile
+        or die "cannot open $infile for reading: $!";
+    my $cert = do { local $/; <$in> };
+    close $in;
+    $cert;
+}
+
+our $TestCertificate = read_file("t/cert/test.crt");
+our $TestCertificateKey = read_file("t/cert/test.key");
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->error_log) {
+        $block->set_value("no_error_log", "[error]");
+    }
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+
+});
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set_by_lua
+--- config
+    location /t {
+        set_by_lua_block $res {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            return foo
+        }
+        echo $res;
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|set_by_lua:\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+set_by_lua:3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 2: rewrite_by_lua
+--- config
+    location /t {
+        rewrite_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+rewrite_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 3: access_by_lua
+--- config
+    location /t {
+        access_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+access_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 4: content_by_lua
+--- config
+    location /t {
+        content_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+content_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 5: header_filter_by_lua
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say(foo)
+        }
+        header_filter_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+    }
+--- response_body_like chomp
+\A(?:nil|1)\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+header_filter_by_lua:3: in main chunk, \n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 6: body_filter_by_lua
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say(foo)
+        }
+        body_filter_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+    }
+--- response_body_like chomp
+\A(?:nil|2)\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk, )/
+--- grep_error_log_out eval
+[qr/\[warn\] .*?writing a global lua variable \('foo'\)
+body_filter_by_lua:3: in main chunk, 
+old foo: 1\n\z/, "old foo: 2\nold foo: 3\n"]
+
+
+
+=== TEST 7: log_by_lua
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say(foo)
+        }
+        log_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+    }
+--- response_body_like chomp
+\A(?:nil|1)\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk)/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+log_by_lua\(nginx\.conf:50\):3: in main chunk\n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 8: ssl_certificate_by_lua
+--- http_config
+    server {
+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
+        server_name   test.com;
+        ssl_certificate_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+        ssl_certificate ../../cert/test.crt;
+        ssl_certificate_key ../../cert/test.key;
+
+        server_tokens off;
+        location /foo {
+            content_by_lua_block {
+                ngx.say("foo: ", foo)
+            }
+        }
+    }
+--- config
+    server_tokens off;
+    lua_ssl_trusted_certificate ../../cert/test.crt;
+
+    location /t {
+        content_by_lua_block {
+            do
+                local sock = ngx.socket.tcp()
+
+                sock:settimeout(2000)
+
+                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 sess, err = sock:sslhandshake(nil, "test.com", true)
+                if not sess then
+                    ngx.say("failed to do SSL handshake: ", err)
+                    return
+                end
+
+                -- ngx.say("ssl handshake: ", type(sess))
+
+                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
+                local bytes, err = sock:send(req)
+                if not bytes then
+                    ngx.say("failed to send http request: ", err)
+                    return
+                end
+
+                -- ngx.say("sent http request: ", bytes, " bytes.")
+
+                while true do
+                    local line, err = sock:receive()
+                    if not line then
+                        -- ngx.say("failed to receive response status line: ", err)
+                        break
+                    end
+
+                    local m, err = ngx.re.match(line, "^foo: (.*)$", "jo")
+                    if err then
+                        ngx.say("failed to match line: ", err)
+                    end
+
+                    if m and m[1] then
+                        ngx.print(m[1])
+                    end
+                end
+
+                local ok, err = sock:close()
+                ngx.say("done")
+            end  -- do
+        }
+    }
+
+--- response_body_like chomp
+\A[12]done\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk)/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+ssl_certificate_by_lua:3: in main chunk\n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 9: timer
+--- config
+    location /t {
+        content_by_lua_block {
+            local function f()
+                if not foo then
+                    foo = 1
+                else
+                    ngx.log(ngx.WARN, "old foo: ", foo)
+                    foo = foo + 1
+                end
+            end
+            local ok, err = ngx.timer.at(0, f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+            ngx.sleep(0.01)
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in\b)/
+--- grep_error_log_out eval
+[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
+content_by_lua\(nginx\.conf:56\):4: in\n\z/, "old foo: 1\n"]
+
+
+
+=== TEST 10: init_by_lua
+--- http_config
+    init_by_lua_block {
+        foo = 1
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[23]\n\z
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["old foo: 1\n", "old foo: 2\n"]
+
+
+
+=== TEST 11: init_worker_by_lua
+--- http_config
+    init_worker_by_lua_block {
+        if not foo then
+            foo = 1
+        else
+            ngx.log(ngx.WARN, "old foo: ", foo)
+            foo = foo + 1
+        end
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[23]\n\z
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["old foo: 1\n", "old foo: 2\n"]
+
+
+
+=== TEST 12: init_by_lua + init_worker_by_lua
+--- http_config
+    init_by_lua_block {
+        if not foo then
+            foo = 1
+        else
+            ngx.log(ngx.WARN, "old foo: ", foo)
+            foo = foo + 1
+        end
+    }
+    init_worker_by_lua_block {
+        if not foo then
+            foo = 1
+        else
+            ngx.log(ngx.WARN, "old foo: ", foo)
+            foo = foo + 1
+        end
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[34]\n\z
+--- grep_error_log eval: qr/old foo: \d+/
+--- grep_error_log_out eval
+["old foo: 1\nold foo: 2\n", "old foo: 3\n"]
+
+
+
+=== TEST 13: don't show warn messages in init/init_worker
+--- http_config
+    init_by_lua_block {
+        foo = 1
+    }
+
+    init_worker_by_lua_block {
+        bar = 2
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say(foo)
+            ngx.say(bar)
+        }
+    }
+--- response_body
+1
+2
+--- no_error_log
+setting global variable
+
+
+
+=== TEST 14: uthread
+--- config
+    location /t {
+        content_by_lua_block {
+            local function f()
+                if not foo then
+                    foo = 1
+                else
+                    ngx.log(ngx.WARN, "old foo: ", foo)
+                    foo = foo + 1
+                end
+            end
+            local ok, err = ngx.thread.spawn(f)
+            if not ok then
+                ngx.say("failed to set timer: ", err)
+                return
+            end
+            ngx.sleep(0.01)
+            ngx.say(foo)
+        }
+    }
+--- response_body_like chomp
+\A[12]\n\z
+--- grep_error_log eval
+qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
+--- grep_error_log_out eval
+["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
+
+
+
+=== TEST 15: balancer_by_lua
+--- http_config
+    upstream backend {
+        server 0.0.0.1;
+        balancer_by_lua_block {
+            if not foo then
+                foo = 1
+            else
+                ngx.log(ngx.WARN, "old foo: ", foo)
+                foo = foo + 1
+            end
+        }
+    }
+--- config
+    location = /t {
+        proxy_pass http://backend;
+    }
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+--- error_log eval
+qr/\[crit\].*?\Qconnect() to 0.0.0.1:80 failed\E/
+--- grep_error_log eval: qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
+--- grep_error_log_out eval
+["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
diff --git a/debian/modules/http-lua/t/159-sa-restart.t b/debian/modules/http-lua/t/159-sa-restart.t
new file mode 100644
index 0000000..a0f0c0e
--- /dev/null
+++ b/debian/modules/http-lua/t/159-sa-restart.t
@@ -0,0 +1,180 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use Test::Nginx::Socket::Lua;
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    my $http_config = $block->http_config || '';
+
+    $http_config .= <<_EOC_;
+    init_by_lua_block {
+        function test_sa_restart()
+            local signals = {
+                --"HUP",
+                --"INFO",
+                --"XCPU",
+                --"USR1",
+                --"USR2",
+                "ALRM",
+                --"INT",
+                "IO",
+                "CHLD",
+                --"WINCH",
+            }
+
+            for _, signame in ipairs(signals) do
+                local cmd = string.format("kill -s %s %d && sleep 0.01",
+                                          signame, ngx.worker.pid())
+                local err = select(2, io.popen(cmd):read("*a"))
+                if err then
+                    error("SIG" .. signame .. " caused: " .. err)
+                end
+            end
+        end
+    }
+_EOC_
+
+    $block->set_value("http_config", $http_config);
+
+    if (!defined $block->config) {
+        my $config = <<_EOC_;
+        location /t {
+            echo ok;
+        }
+_EOC_
+
+        $block->set_value("config", $config);
+    }
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+
+    if (!defined $block->response_body) {
+        $block->set_value("ignore_response_body");
+    }
+
+    if (!defined $block->no_error_log) {
+        $block->set_value("no_error_log", "[error]");
+    }
+});
+
+plan tests => repeat_each() * (blocks() * 2 + 1);
+
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: lua_sa_restart default - sets SA_RESTART in init_worker_by_lua*
+--- http_config
+    init_worker_by_lua_block {
+        test_sa_restart()
+    }
+
+
+
+=== TEST 2: lua_sa_restart off - does not set SA_RESTART
+--- http_config
+    lua_sa_restart off;
+
+    init_worker_by_lua_block {
+        test_sa_restart()
+    }
+--- no_error_log
+[crit]
+--- error_log
+Interrupted system call
+
+
+
+=== TEST 3: lua_sa_restart on (default) - sets SA_RESTART if no init_worker_by_lua* phase is defined
+--- config
+    location /t {
+        content_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 4: lua_sa_restart on (default) - SA_RESTART is effective in rewrite_by_lua*
+--- config
+    location /t {
+        rewrite_by_lua_block {
+            test_sa_restart()
+        }
+
+        echo ok;
+    }
+
+
+
+=== TEST 5: lua_sa_restart on (default) - SA_RESTART is effective in access_by_lua*
+--- config
+    location /t {
+        access_by_lua_block {
+            test_sa_restart()
+        }
+
+        echo ok;
+    }
+
+
+
+=== TEST 6: lua_sa_restart on (default) - SA_RESTART is effective in content_by_lua*
+--- config
+    location /t {
+        content_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 7: lua_sa_restart on (default) - SA_RESTART is effective in header_filter_by_lua*
+--- config
+    location /t {
+        echo ok;
+
+        header_filter_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 8: lua_sa_restart on (default) - SA_RESTART is effective in body_filter_by_lua*
+--- config
+    location /t {
+        echo ok;
+
+        body_filter_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 9: lua_sa_restart on (default) - SA_RESTART is effective in log_by_lua*
+--- config
+    location /t {
+        echo ok;
+
+        log_by_lua_block {
+            test_sa_restart()
+        }
+    }
+
+
+
+=== TEST 10: lua_sa_restart on (default) - SA_RESTART is effective in timer phase
+--- config
+    location /t {
+        echo ok;
+
+        log_by_lua_block {
+            ngx.timer.at(0, test_sa_restart)
+        }
+    }
diff --git a/debian/modules/http-lua/t/160-disable-init-by-lua.t b/debian/modules/http-lua/t/160-disable-init-by-lua.t
new file mode 100644
index 0000000..541771e
--- /dev/null
+++ b/debian/modules/http-lua/t/160-disable-init-by-lua.t
@@ -0,0 +1,194 @@
+use Test::Nginx::Socket::Lua;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
+
+my $html_dir = $ENV{TEST_NGINX_HTML_DIR};
+my $http_config = <<_EOC_;
+    init_by_lua_block {
+        function set_up_ngx_tmp_conf(conf)
+            if conf == nil then
+                conf = [[
+                    events {
+                        worker_connections 64;
+                    }
+                    http {
+                        init_by_lua_block {
+                            ngx.log(ngx.ERR, "run init_by_lua")
+                        }
+                    }
+                ]]
+            end
+
+            assert(os.execute("mkdir -p $html_dir/logs"))
+
+            local conf_file = "$html_dir/nginx.conf"
+            local f, err = io.open(conf_file, "w")
+            if not f then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            assert(f:write(conf))
+
+            return conf_file
+        end
+
+        function get_ngx_bin_path()
+            local ffi = require "ffi"
+            ffi.cdef[[char **ngx_argv;]]
+            return ffi.string(ffi.C.ngx_argv[0])
+        end
+    }
+_EOC_
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->http_config) {
+        $block->set_value("http_config", $http_config);
+    }
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+});
+
+env_to_nginx("PATH");
+log_level("warn");
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: ensure init_by_lua* is not run in signaller process
+--- config
+    location = /t {
+        content_by_lua_block {
+            local conf_file = set_up_ngx_tmp_conf()
+            local nginx = get_ngx_bin_path()
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -s reopen"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+        }
+    }
+--- error_log
+failed (2: No such file or directory)
+--- no_error_log eval
+qr/\[error\] .*? init_by_lua:\d+: run init_by_lua/
+
+
+
+=== TEST 2: init_by_lua* does not run when testing Nginx configuration
+--- config
+    location = /t {
+        content_by_lua_block {
+            local conf_file = set_up_ngx_tmp_conf()
+            local nginx = get_ngx_bin_path()
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -t"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -T"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+        }
+    }
+--- error_log
+test is successful
+--- no_error_log eval
+qr/\[error\] .*? init_by_lua:\d+: run init_by_lua/
+
+
+
+=== TEST 3: init_by_lua* does not run when testing Nginx configuration which contains 'lua_shared_dict' (GitHub #1462)
+--- config
+    location = /t {
+        content_by_lua_block {
+            local conf = [[
+                events {
+                    worker_connections 64;
+                }
+                http {
+                    lua_shared_dict test 64k;
+                    init_by_lua_block {
+                        ngx.log(ngx.ERR, "run init_by_lua with lua_shared_dict")
+                    }
+                }
+            ]]
+            local conf_file = set_up_ngx_tmp_conf(conf)
+            local nginx = get_ngx_bin_path()
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -t"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -T"
+            local p, err = io.popen(cmd)
+            if not p then
+                ngx.log(ngx.ERR, err)
+                return
+            end
+
+            local out, err = p:read("*a")
+            if not out then
+                ngx.log(ngx.ERR, err)
+
+            else
+                ngx.log(ngx.WARN, out)
+            end
+        }
+    }
+--- error_log
+test is successful
+--- no_error_log eval
+qr/\[error\] .*? init_by_lua:\d+: run init_by_lua with lua_shared_dict/
diff --git a/debian/modules/http-lua/t/161-load-resty-core.t b/debian/modules/http-lua/t/161-load-resty-core.t
new file mode 100644
index 0000000..41b18f0
--- /dev/null
+++ b/debian/modules/http-lua/t/161-load-resty-core.t
@@ -0,0 +1,68 @@
+use Test::Nginx::Socket::Lua;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->request) {
+        $block->set_value("request", "GET /t");
+    }
+
+    if (!defined $block->no_error_log) {
+        $block->set_value("no_error_log", "[error]");
+    }
+});
+
+no_long_string();
+run_tests();
+
+__DATA__
+
+=== TEST 1: lua_load_resty_core is enabled by default
+--- config
+    location = /t {
+        content_by_lua_block {
+            local loaded_resty_core = package.loaded["resty.core"]
+            local resty_core = require "resty.core"
+
+            ngx.say("resty.core loaded: ", loaded_resty_core == resty_core)
+        }
+    }
+--- response_body
+resty.core loaded: true
+
+
+
+=== TEST 2: lua_load_resty_core can be disabled
+--- http_config
+    lua_load_resty_core off;
+--- config
+    location = /t {
+        content_by_lua_block {
+            local loaded_resty_core = package.loaded["resty.core"]
+
+            ngx.say("resty.core loaded: ", loaded_resty_core ~= nil)
+        }
+    }
+--- response_body
+resty.core loaded: false
+
+
+
+=== TEST 3: lua_load_resty_core is effective when using lua_shared_dict
+--- http_config
+    lua_shared_dict dogs 128k;
+--- config
+    location = /t {
+        content_by_lua_block {
+            local loaded_resty_core = package.loaded["resty.core"]
+            local resty_core = require "resty.core"
+
+            ngx.say("resty.core loaded: ", loaded_resty_core == resty_core)
+        }
+    }
+--- response_body
+resty.core loaded: true
diff --git a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
index 0286853..ffc32f5 100644
--- a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
+++ b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
@@ -213,10 +213,9 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 
     ngx_uint_t                   i;
     ngx_shm_zone_t             **zone;
+    ngx_shm_zone_t             **zone_udata;
 
-    lua_getglobal(L, "__ngx_cycle");
-    cycle = lua_touserdata(L, -1);
-    lua_pop(L, 1);
+    cycle = (ngx_cycle_t *) ngx_cycle;
 
     hmcf_ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index];
     lfsmcf = hmcf_ctx->main_conf[ngx_http_lua_fake_shm_module.ctx_index];
@@ -242,7 +241,9 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 
             lua_createtable(L, 1 /* narr */, 0 /* nrec */);
                 /* table of zone[i] */
-            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
+            zone_udata = lua_newuserdata(L, sizeof(ngx_shm_zone_t *));
+                /* shared mt key ud */
+            *zone_udata = zone[i];
             lua_rawseti(L, -2, 1); /* {zone[i]} */
             lua_pushvalue(L, -3); /* shared mt key ud mt */
             lua_setmetatable(L, -2); /* shared mt key ud */
@@ -262,9 +263,10 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 static int
 ngx_http_lua_fake_shm_get_info(lua_State *L)
 {
-    ngx_int_t                    n;
-    ngx_shm_zone_t              *zone;
-    ngx_http_lua_fake_shm_ctx_t *ctx;
+    ngx_int_t                         n;
+    ngx_shm_zone_t                   *zone;
+    ngx_shm_zone_t                  **zone_udata;
+    ngx_http_lua_fake_shm_ctx_t      *ctx;
 
     n = lua_gettop(L);
 
@@ -276,13 +278,15 @@ ngx_http_lua_fake_shm_get_info(lua_State *L)
     luaL_checktype(L, 1, LUA_TTABLE);
 
     lua_rawgeti(L, 1, 1);
-    zone = lua_touserdata(L, -1);
+    zone_udata = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    if (zone == NULL) {
+    if (zone_udata == NULL) {
         return luaL_error(L, "bad \"zone\" argument");
     }
 
+    zone = *zone_udata;
+
     ctx = (ngx_http_lua_fake_shm_ctx_t *) zone->data;
 
     lua_pushlstring(L, (char *) zone->shm.name.data, zone->shm.name.len);
diff --git a/debian/modules/http-lua/util/build.sh b/debian/modules/http-lua/util/build.sh
index 164bf9f..14e9fd4 100755
--- a/debian/modules/http-lua/util/build.sh
+++ b/debian/modules/http-lua/util/build.sh
@@ -22,6 +22,8 @@ force=$2
             #--without-http_referer_module \
             #--with-http_spdy_module \
 
+add_fake_shm_module="--add-module=$root/t/data/fake-shm-module"
+
 time ngx-build $force $version \
             --with-pcre-jit \
             --with-ipv6 \
@@ -55,7 +57,7 @@ time ngx-build $force $version \
                 --add-module=$root/../redis2-nginx-module \
                 --add-module=$root/../stream-lua-nginx-module \
                 --add-module=$root/t/data/fake-module \
-                --add-module=$root/t/data/fake-shm-module \
+                $add_fake_shm_module \
                 --add-module=$root/t/data/fake-delayed-load-module \
                 --with-http_gunzip_module \
                 --with-http_dav_module \

From 7bc0cfe077ec67ac0e4cde241114d571ae40c1c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:13:17 +0100
Subject: [PATCH 347/600] http-lua: Rebase patch

---
 .../patches/http-lua/CVE-2020-11724.patch      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/modules/patches/http-lua/CVE-2020-11724.patch b/debian/modules/patches/http-lua/CVE-2020-11724.patch
index 5e0eff7..5b47abe 100644
--- a/debian/modules/patches/http-lua/CVE-2020-11724.patch
+++ b/debian/modules/patches/http-lua/CVE-2020-11724.patch
@@ -13,8 +13,8 @@ Signed-off-by: Yichun Zhang (agentzh) <yichun@openresty.com>
 
 Index: http-lua/src/ngx_http_lua_subrequest.c
 ===================================================================
---- http-lua.orig/src/ngx_http_lua_subrequest.c	2020-07-14 09:50:35.830928117 +0200
-+++ http-lua/src/ngx_http_lua_subrequest.c	2020-07-14 09:50:35.826928232 +0200
+--- http-lua.orig/src/ngx_http_lua_subrequest.c	2022-03-15 11:11:11.303357830 +0100
++++ http-lua/src/ngx_http_lua_subrequest.c	2022-03-15 11:11:11.299357831 +0100
 @@ -56,8 +56,6 @@
      ngx_string("Content-Length");
  
@@ -99,7 +99,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
      sr->method = method;
  
      switch (method) {
-@@ -1124,100 +1108,6 @@
+@@ -1132,100 +1116,6 @@
  }
  
  
@@ -200,7 +200,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
  static void
  ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
      ngx_http_lua_ctx_t *ctx)
-@@ -1732,11 +1622,17 @@
+@@ -1740,11 +1630,17 @@
  
  
  static ngx_int_t
@@ -220,7 +220,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
  
      if (ngx_list_init(&sr->headers_in.headers, sr->pool, 20,
                        sizeof(ngx_table_elt_t)) != NGX_OK)
-@@ -1744,10 +1640,46 @@
+@@ -1752,10 +1648,46 @@
          return NGX_ERROR;
      }
  
@@ -270,7 +270,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
      header = part->elts;
  
      for (i = 0; /* void */; i++) {
-@@ -1762,7 +1694,14 @@
+@@ -1770,7 +1702,14 @@
              i = 0;
          }
  
@@ -286,7 +286,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
             header[i].key.data, (int) header[i].value.len,
             header[i].value.data);
  
-@@ -1774,9 +1713,10 @@
+@@ -1782,9 +1721,10 @@
      }
  
      dd("after: parent req headers count: %d",
@@ -300,8 +300,8 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
  /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
 Index: http-lua/t/020-subrequest.t
 ===================================================================
---- http-lua.orig/t/020-subrequest.t	2020-07-14 09:50:35.830928117 +0200
-+++ http-lua/t/020-subrequest.t	2020-07-14 09:50:35.826928232 +0200
+--- http-lua.orig/t/020-subrequest.t	2022-03-15 11:11:11.303357830 +0100
++++ http-lua/t/020-subrequest.t	2022-03-15 11:11:11.299357831 +0100
 @@ -14,6 +14,7 @@
  plan tests => repeat_each() * (blocks() * 3 + 23);
  

From 976d4826bba96c5b3c8e3fd454606da59a50b7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:13:34 +0100
Subject: [PATCH 348/600] nchan: Drop GCC 10 patch, applied upstream

---
 .../patches/nchan/gcc-10-compatibility.patch  | 58 -------------------
 debian/modules/patches/nchan/series           |  1 -
 2 files changed, 59 deletions(-)
 delete mode 100644 debian/modules/patches/nchan/gcc-10-compatibility.patch
 delete mode 100644 debian/modules/patches/nchan/series

diff --git a/debian/modules/patches/nchan/gcc-10-compatibility.patch b/debian/modules/patches/nchan/gcc-10-compatibility.patch
deleted file mode 100644
index 00e3b45..0000000
--- a/debian/modules/patches/nchan/gcc-10-compatibility.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f484c603a81c3bddd3f0160cfdbe231b8a453cde Mon Sep 17 00:00:00 2001
-From: Leo P <junk@slact.net>
-Date: Wed, 24 Jun 2020 15:28:07 -0400
-Subject: [PATCH] GCC 10 compatibility
-Origin: https://github.com/slact/nchan/commit/f484c603a81c3bddd3f0160cfdbe231b8a453cde
-
----
- src/store/memory/memstore.c          | 2 ++
- src/store/memory/store-private.h     | 2 +-
- src/store/redis/redis_lua_commands.h | 7 +++++--
- 5 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/store/memory/memstore.c b/src/store/memory/memstore.c
-index 2844220c..f0f78acc 100755
---- a/src/store/memory/memstore.c
-+++ b/src/store/memory/memstore.c
-@@ -40,6 +40,8 @@ static ngx_int_t redis_fakesub_timer_interval;
- 
- #endif
- 
-+uint16_t  memstore_worker_generation;
-+
- 
- typedef struct {
-   //memstore_channel_head_t       unbuffered_dummy_chanhead;
-diff --git a/src/store/memory/store-private.h b/src/store/memory/store-private.h
-index e4a426a3..49de940b 100644
---- a/src/store/memory/store-private.h
-+++ b/src/store/memory/store-private.h
-@@ -172,6 +172,6 @@ ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *chanhead, const char *);
- void memstore_chanhead_release(memstore_channel_head_t *ch, char *label);
- void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label);
- 
--uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
-+extern uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
- 
- #endif /*MEMSTORE_PRIVATE_HEADER*/
-diff --git a/src/store/redis/redis_lua_commands.h b/src/store/redis/redis_lua_commands.h
-index 76fb7b95..2efb25bd 100644
---- a/src/store/redis/redis_lua_commands.h
-+++ b/src/store/redis/redis_lua_commands.h
-@@ -1,3 +1,5 @@
-+#ifndef NCHAN_REDIS_LUA_SCRIPTS_H
-+#define NCHAN_REDIS_LUA_SCRIPTS_H
- // don't edit this please, it was auto-generated by hsss
- // https://github.com/slact/hsss
- 
-@@ -63,7 +65,8 @@ typedef struct {
-   redis_lua_script_t subscriber_unregister;
- 
- } redis_lua_scripts_t;
--redis_lua_scripts_t redis_lua_scripts;
--const int redis_lua_scripts_count;
-+extern redis_lua_scripts_t redis_lua_scripts;
-+extern const int redis_lua_scripts_count;
- #define REDIS_LUA_SCRIPTS_EACH(script) \
- for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++) 
-+#endif //NCHAN_REDIS_LUA_SCRIPTS_H
diff --git a/debian/modules/patches/nchan/series b/debian/modules/patches/nchan/series
deleted file mode 100644
index 80f5dee..0000000
--- a/debian/modules/patches/nchan/series
+++ /dev/null
@@ -1 +0,0 @@
-gcc-10-compatibility.patch

From 4499fb4947e2e86632d1aef513e79872afae54f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:29:20 +0100
Subject: [PATCH 349/600] d/watch: Bump version to 4

---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 5ea7cc0..26440a9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
 opts=pgpsigurlmangle=s/$/.asc/ \
 https://nginx.org/download/nginx-(1\.18\.\d+)\.tar\.gz

From a13d46c86515c9be61741dac706085b4c9f02879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:37:01 +0100
Subject: [PATCH 350/600] d/nginx-common.nginx.service: Fix service shutdown
 desctiption to mention SIGQUIT instead of SIGSTOP (LP: #1919965) (Thanks
 Athos Ribeiro)

---
 debian/nginx-common.nginx.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/nginx-common.nginx.service b/debian/nginx-common.nginx.service
index 2f4286f..78bf0ce 100644
--- a/debian/nginx-common.nginx.service
+++ b/debian/nginx-common.nginx.service
@@ -1,7 +1,7 @@
 # Stop dance for nginx
 # =======================
 #
-# ExecStop sends SIGSTOP (graceful stop) to the nginx process.
+# ExecStop sends SIGQUIT (graceful stop) to the nginx process.
 # If, after 5s (--retry QUIT/5) nginx is still running, systemd takes control
 # and sends SIGTERM (fast shutdown) to the main process.
 # After another 5s (TimeoutStopSec=5), and if nginx is alive, systemd sends

From bd32060ee7b03cb55d7d3fc72ce9a2b16ce0277d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:39:40 +0100
Subject: [PATCH 351/600] Bump standards version to 4.6.1 (no changes)

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d55777f..719dcc7 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: debhelper-compat (= 13),
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Homepage: https://nginx.net
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx

From 4ea741ae27bb497632a7d960520aba039dc771ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:44:33 +0100
Subject: [PATCH 352/600] d/copyright: Bump my copyright year

---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index c2a5f97..03ef16d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,7 +42,7 @@ Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
            2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
            2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
            2019-2020, Thomas Ward <teward@ubuntu.com>
-           2020,      Ondřej Nový <onovy@debian.org>
+           2020-2022, Ondřej Nový <onovy@debian.org>
 License: BSD-2-clause
 
 Files: debian/modules/http-headers-more-filter/*

From 4f1a2c590c57119733fdc975bf9030bb3afe3a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 11:50:23 +0100
Subject: [PATCH 353/600] releasing package nginx version 1.18.0-7

---
 debian/changelog | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05a740b..9cbe50c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,27 @@
-nginx (1.18.0-7) UNRELEASED; urgency=medium
+nginx (1.18.0-7) unstable; urgency=medium
 
+  [ Ondřej Nový ]
   * d/p/CVE-2019-20372.patch: Drop, applied upstream.
+  * http-auth-pam: Upgrade to 1.5.3.
+  * http-echo: Upgrade to 0.62.
+  * nchan: Upgrade to 1.2.15.
+  * http-fancyindex: Upgrade to 0.5.2.
+  * rtmp: Upgrade to 1.2.2.
+  * http-lua: Upgrade to 0.10.15 (Closes: #994178).
+  * http-lua: Rebase patch.
+  * nchan: Drop GCC 10 patch, applied upstream.
+  * d/watch: Bump version to 4.
+  * Bump standards version to 4.6.1 (no changes).
+  * d/copyright: Bump my copyright year.
 
- -- Ondřej Nový <onovy@debian.org>  Fri, 21 Aug 2020 14:14:13 +0200
+  [ Ondřej Surý ]
+  * Add arm64 and ppc64el to list of luajit platforms.
+
+  [ Athos Ribeiro ]
+  * d/nginx-common.nginx.service: Fix service shutdown desctiption to mention
+    SIGQUIT instead of SIGSTOP (LP: #1919965).
+
+ -- Ondřej Nový <onovy@debian.org>  Tue, 15 Mar 2022 11:50:18 +0100
 
 nginx (1.18.0-6) unstable; urgency=medium
 

From bc5f19ef77b6d4fc6094283b5180862386a72cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 13:23:10 +0100
Subject: [PATCH 354/600] releasing package nginx version 1.18.0-8

---
 debian/changelog                              | 15 ++++++++
 ...ff-by-one-write-in-ngx_resolver_copy.patch | 34 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 50 insertions(+)
 create mode 100644 debian/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch

diff --git a/debian/changelog b/debian/changelog
index 9cbe50c..8b0d9f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.18.0-8) unstable; urgency=medium
+
+  * Restore patch:
+    d/p/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch
+
+ -- Ondřej Nový <onovy@debian.org>  Tue, 15 Mar 2022 13:23:06 +0100
+
 nginx (1.18.0-7) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -23,6 +30,14 @@ nginx (1.18.0-7) unstable; urgency=medium
 
  -- Ondřej Nový <onovy@debian.org>  Tue, 15 Mar 2022 11:50:18 +0100
 
+nginx (1.18.0-6.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Resolver: fixed off-by-one write in ngx_resolver_copy() (CVE-2021-23017)
+    (Closes: #989095)
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 29 May 2021 16:21:37 +0200
+
 nginx (1.18.0-6) unstable; urgency=medium
 
   * Fix GCC-10 compatibility (Closes: #957605).
diff --git a/debian/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch b/debian/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch
new file mode 100644
index 0000000..449c096
--- /dev/null
+++ b/debian/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch
@@ -0,0 +1,34 @@
+From: Maxim Dounin <mdounin@mdounin.ru>
+Date: Tue, 25 May 2021 15:17:36 +0300
+Subject: Resolver: fixed off-by-one write in ngx_resolver_copy().
+Origin: https://github.com/nginx/nginx/commit/7199ebc203f74fd9e44595474de6bdc41740c5cf
+Bug-Debian: https://bugs.debian.org/989095
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2021-23017
+
+Reported by Luis Merino, Markus Vervier, Eric Sesterhenn, X41 D-Sec GmbH.
+---
+ src/core/ngx_resolver.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/src/core/ngx_resolver.c
++++ b/src/core/ngx_resolver.c
+@@ -3993,15 +3993,15 @@
+             n = *src++;
+ 
+         } else {
++            if (dst != name->data) {
++                *dst++ = '.';
++            }
++
+             ngx_strlow(dst, src, n);
+             dst += n;
+             src += n;
+ 
+             n = *src++;
+-
+-            if (n != 0) {
+-                *dst++ = '.';
+-            }
+         }
+ 
+         if (n == 0) {
diff --git a/debian/patches/series b/debian/patches/series
index 5b6b799..9416267 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
+Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch

From 31e3a6a61bc63dbc1254b5e68094e20d9f98a7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Tue, 15 Mar 2022 14:30:13 +0100
Subject: [PATCH 355/600] d/changelog: Fix typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8b0d9f0..8af7ecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,7 @@ nginx (1.18.0-7) unstable; urgency=medium
   * Add arm64 and ppc64el to list of luajit platforms.
 
   [ Athos Ribeiro ]
-  * d/nginx-common.nginx.service: Fix service shutdown desctiption to mention
+  * d/nginx-common.nginx.service: Fix service shutdown description to mention
     SIGQUIT instead of SIGSTOP (LP: #1919965).
 
  -- Ondřej Nový <onovy@debian.org>  Tue, 15 Mar 2022 11:50:18 +0100

From 6a0621d22796eb499cc430096aa7e8e5d0d957aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 5 Apr 2022 19:05:32 +0200
Subject: [PATCH 356/600] http-lua: Downgrade to v0.10.13

---
 debian/modules/control                        |    2 +-
 debian/modules/http-lua/README.markdown       |  235 +-
 debian/modules/http-lua/config                |   45 -
 .../modules/http-lua/doc/HttpLuaModule.wiki   |  213 +-
 .../http-lua/src/api/ngx_http_lua_api.h       |    2 +-
 .../http-lua/src/ngx_http_lua_accessby.c      |    4 +-
 .../modules/http-lua/src/ngx_http_lua_api.c   |    2 +-
 .../http-lua/src/ngx_http_lua_balancer.c      |    3 -
 .../http-lua/src/ngx_http_lua_bodyfilterby.c  |   50 +-
 .../http-lua/src/ngx_http_lua_bodyfilterby.h  |    2 +-
 .../modules/http-lua/src/ngx_http_lua_cache.c |   23 +-
 .../http-lua/src/ngx_http_lua_clfactory.c     |   45 +-
 .../http-lua/src/ngx_http_lua_common.h        |   49 +-
 .../http-lua/src/ngx_http_lua_contentby.c     |    2 -
 .../http-lua/src/ngx_http_lua_control.c       |    3 +-
 .../http-lua/src/ngx_http_lua_coroutine.c     |   18 +-
 .../http-lua/src/ngx_http_lua_directive.c     |   11 +-
 .../src/ngx_http_lua_headerfilterby.c         |    3 +-
 .../http-lua/src/ngx_http_lua_headers.c       |   83 +-
 .../http-lua/src/ngx_http_lua_headers_in.c    |   10 +-
 .../http-lua/src/ngx_http_lua_headers_out.c   |   20 +-
 .../http-lua/src/ngx_http_lua_headers_out.h   |    6 +-
 .../http-lua/src/ngx_http_lua_initworkerby.c  |   19 -
 .../http-lua/src/ngx_http_lua_input_filters.c |  137 -
 .../http-lua/src/ngx_http_lua_input_filters.h |   29 -
 .../modules/http-lua/src/ngx_http_lua_logby.c |    3 +-
 .../modules/http-lua/src/ngx_http_lua_misc.c  |   27 -
 .../http-lua/src/ngx_http_lua_module.c        |   56 -
 .../modules/http-lua/src/ngx_http_lua_ndk.c   |   41 -
 .../modules/http-lua/src/ngx_http_lua_pipe.c  | 2475 -----------------
 .../modules/http-lua/src/ngx_http_lua_pipe.h  |   95 -
 .../modules/http-lua/src/ngx_http_lua_regex.c |   10 +-
 .../http-lua/src/ngx_http_lua_rewriteby.c     |    4 +-
 .../http-lua/src/ngx_http_lua_script.c        |    4 +-
 .../modules/http-lua/src/ngx_http_lua_setby.c |   34 +-
 .../modules/http-lua/src/ngx_http_lua_setby.h |    2 +-
 .../http-lua/src/ngx_http_lua_shdict.c        |   44 +-
 .../http-lua/src/ngx_http_lua_socket_tcp.c    | 1608 ++++-------
 .../http-lua/src/ngx_http_lua_socket_tcp.h    |   29 +-
 .../http-lua/src/ngx_http_lua_socket_udp.c    |   12 +-
 .../http-lua/src/ngx_http_lua_ssl_certby.c    |    2 -
 .../src/ngx_http_lua_ssl_session_fetchby.c    |    2 -
 .../src/ngx_http_lua_ssl_session_storeby.c    |    3 -
 .../http-lua/src/ngx_http_lua_string.c        |   14 -
 .../http-lua/src/ngx_http_lua_subrequest.c    |    8 -
 .../modules/http-lua/src/ngx_http_lua_timer.c |   44 +-
 .../http-lua/src/ngx_http_lua_uthread.c       |    3 +-
 .../modules/http-lua/src/ngx_http_lua_util.c  |  168 +-
 .../modules/http-lua/src/ngx_http_lua_util.h  |   28 +-
 .../http-lua/src/ngx_http_lua_worker.c        |   11 -
 debian/modules/http-lua/t/.gitignore          |    2 -
 debian/modules/http-lua/t/000--init.t         |    5 +
 debian/modules/http-lua/t/001-set.t           |   23 +-
 debian/modules/http-lua/t/002-content.t       |   38 +-
 debian/modules/http-lua/t/004-require.t       |   12 +-
 debian/modules/http-lua/t/005-exit.t          |    2 +-
 debian/modules/http-lua/t/009-log.t           |   12 +-
 debian/modules/http-lua/t/011-md5_bin.t       |    2 +-
 debian/modules/http-lua/t/013-base64.t        |    2 +-
 debian/modules/http-lua/t/014-bugs.t          |   49 +-
 debian/modules/http-lua/t/016-resp-header.t   |  504 +---
 debian/modules/http-lua/t/017-exec.t          |    4 +-
 debian/modules/http-lua/t/020-subrequest.t    |  134 +-
 .../http-lua/t/023-rewrite/client-abort.t     |    6 +-
 debian/modules/http-lua/t/023-rewrite/exec.t  |    4 +-
 debian/modules/http-lua/t/023-rewrite/mixed.t |    4 +-
 .../http-lua/t/023-rewrite/multi-capture.t    |    2 +-
 .../http-lua/t/023-rewrite/req-socket.t       |    6 +-
 .../modules/http-lua/t/023-rewrite/sanity.t   |   28 +-
 .../http-lua/t/023-rewrite/socket-keepalive.t |   12 +-
 .../http-lua/t/023-rewrite/subrequest.t       |   42 +-
 .../t/023-rewrite/tcp-socket-timeout.t        |   12 +-
 .../http-lua/t/023-rewrite/tcp-socket.t       |   32 +-
 .../http-lua/t/023-rewrite/uthread-exec.t     |   12 +-
 .../http-lua/t/023-rewrite/uthread-exit.t     |   40 +-
 .../http-lua/t/023-rewrite/uthread-redirect.t |    4 +-
 .../http-lua/t/023-rewrite/uthread-spawn.t    |   62 +-
 .../http-lua/t/024-access/client-abort.t      |    6 +-
 debian/modules/http-lua/t/024-access/exec.t   |    2 +-
 debian/modules/http-lua/t/024-access/mixed.t  |   10 +-
 .../http-lua/t/024-access/multi-capture.t     |    2 +-
 debian/modules/http-lua/t/024-access/sanity.t |   30 +-
 .../http-lua/t/024-access/subrequest.t        |   42 +-
 .../http-lua/t/024-access/uthread-exec.t      |   12 +-
 .../http-lua/t/024-access/uthread-exit.t      |   38 +-
 .../http-lua/t/024-access/uthread-redirect.t  |    4 +-
 .../http-lua/t/024-access/uthread-spawn.t     |   62 +-
 debian/modules/http-lua/t/025-codecache.t     |  174 +-
 debian/modules/http-lua/t/027-multi-capture.t |    4 +-
 debian/modules/http-lua/t/028-req-header.t    |   24 +-
 debian/modules/http-lua/t/030-uri-args.t      |   23 +-
 debian/modules/http-lua/t/034-match.t         |   65 +-
 debian/modules/http-lua/t/035-gmatch.t        |   22 +-
 debian/modules/http-lua/t/036-sub.t           |    4 +-
 debian/modules/http-lua/t/037-gsub.t          |    2 +-
 debian/modules/http-lua/t/038-match-o.t       |   44 +-
 debian/modules/http-lua/t/041-header-filter.t |   15 +-
 debian/modules/http-lua/t/043-shdict.t        |    4 +-
 debian/modules/http-lua/t/047-match-jit.t     |   12 +-
 debian/modules/http-lua/t/048-match-dfa.t     |   12 +-
 debian/modules/http-lua/t/055-subreq-vars.t   |   18 +-
 debian/modules/http-lua/t/056-flush.t         |    2 +-
 debian/modules/http-lua/t/057-flush-timeout.t |    2 +-
 debian/modules/http-lua/t/058-tcp-socket.t    |  364 +--
 debian/modules/http-lua/t/062-count.t         |   31 +-
 debian/modules/http-lua/t/063-abort.t         |   62 +-
 debian/modules/http-lua/t/064-pcall.t         |   14 +-
 .../http-lua/t/065-tcp-socket-timeout.t       |   24 +-
 .../http-lua/t/066-socket-receiveuntil.t      |   30 +-
 debian/modules/http-lua/t/067-req-socket.t    |    6 +-
 .../modules/http-lua/t/068-socket-keepalive.t | 1467 +---------
 debian/modules/http-lua/t/073-backtrace.t     |   14 +-
 debian/modules/http-lua/t/075-logby.t         |   11 +-
 debian/modules/http-lua/t/081-bytecode.t      |   45 +-
 debian/modules/http-lua/t/082-body-filter.t   |    3 +-
 .../http-lua/t/084-inclusive-receiveuntil.t   |   20 +-
 debian/modules/http-lua/t/087-udp-socket.t    |   12 +-
 .../http-lua/t/090-log-socket-errors.t        |   10 +-
 debian/modules/http-lua/t/091-coroutine.t     |   81 +-
 debian/modules/http-lua/t/093-uthread-spawn.t |   66 +-
 debian/modules/http-lua/t/094-uthread-exit.t  |   46 +-
 debian/modules/http-lua/t/095-uthread-exec.t  |   14 +-
 .../modules/http-lua/t/096-uthread-redirect.t |    6 +-
 .../modules/http-lua/t/097-uthread-rewrite.t  |   12 +-
 debian/modules/http-lua/t/098-uthread-wait.t  |   74 +-
 debian/modules/http-lua/t/099-c-api.t         |   10 +-
 debian/modules/http-lua/t/100-client-abort.t  |    6 +-
 debian/modules/http-lua/t/106-timer.t         |   18 +-
 debian/modules/http-lua/t/108-timer-safe.t    |   16 +-
 debian/modules/http-lua/t/109-timer-hup.t     |   18 +-
 debian/modules/http-lua/t/120-re-find.t       |    4 +-
 debian/modules/http-lua/t/123-lua-path.t      |   10 +-
 debian/modules/http-lua/t/124-init-worker.t   |   10 +-
 debian/modules/http-lua/t/126-shdict-frag.t   |    4 +-
 debian/modules/http-lua/t/127-uthread-kill.t  |   26 +-
 .../http-lua/t/128-duplex-tcp-socket.t        |    6 +-
 debian/modules/http-lua/t/129-ssl-socket.t    |   16 +-
 debian/modules/http-lua/t/130-internal-api.t  |   17 +-
 .../modules/http-lua/t/134-worker-count-5.t   |    4 +-
 debian/modules/http-lua/t/138-balancer.t      |    2 +
 debian/modules/http-lua/t/139-ssl-cert-by.t   |    2 +-
 debian/modules/http-lua/t/140-ssl-c-api.t     |   23 +-
 .../http-lua/t/143-ssl-session-fetch.t        |  105 -
 .../http-lua/t/147-tcp-socket-timeouts.t      |    8 +-
 debian/modules/http-lua/t/152-timer-every.t   |    4 +-
 debian/modules/http-lua/t/153-semaphore-hup.t |    2 +-
 debian/modules/http-lua/t/156-slow-network.t  |  138 -
 .../http-lua/t/157-socket-keepalive-hup.t     |   91 -
 debian/modules/http-lua/t/158-global-var.t    |  508 ----
 debian/modules/http-lua/t/159-sa-restart.t    |  180 --
 .../http-lua/t/160-disable-init-by-lua.t      |  194 --
 .../modules/http-lua/t/161-load-resty-core.t  |   68 -
 .../ngx_http_lua_fake_shm_module.c            |   22 +-
 debian/modules/http-lua/util/build.sh         |    4 +-
 .../patches/http-lua/CVE-2020-11724.patch     |   18 +-
 155 files changed, 1875 insertions(+), 9504 deletions(-)
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_input_filters.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_input_filters.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_pipe.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_pipe.h
 delete mode 100644 debian/modules/http-lua/t/.gitignore
 delete mode 100644 debian/modules/http-lua/t/156-slow-network.t
 delete mode 100644 debian/modules/http-lua/t/157-socket-keepalive-hup.t
 delete mode 100644 debian/modules/http-lua/t/158-global-var.t
 delete mode 100644 debian/modules/http-lua/t/159-sa-restart.t
 delete mode 100644 debian/modules/http-lua/t/160-disable-init-by-lua.t
 delete mode 100644 debian/modules/http-lua/t/161-load-resty-core.t

diff --git a/debian/modules/control b/debian/modules/control
index 4034f4d..b3e517e 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -22,7 +22,7 @@ Version: 3.3
 
 Module: http-lua
 Homepage: https://github.com/openresty/lua-nginx-module
-Version: 0.10.15
+Version: v0.10.13
 Patch:
   openssl-1.1.0.patch
   discover-luajit-2.1.patch
diff --git a/debian/modules/http-lua/README.markdown b/debian/modules/http-lua/README.markdown
index ed0c72d..15ad00e 100644
--- a/debian/modules/http-lua/README.markdown
+++ b/debian/modules/http-lua/README.markdown
@@ -8,8 +8,6 @@ Name
 
 ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
-This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
-
 *This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
 
 Table of Contents
@@ -25,6 +23,7 @@ Table of Contents
 * [Installation](#installation)
     * [Building as a dynamic module](#building-as-a-dynamic-module)
     * [C Macro Configurations](#c-macro-configurations)
+    * [Installation on Ubuntu 11.10](#installation-on-ubuntu-1110)
 * [Community](#community)
     * [English Mailing List](#english-mailing-list)
     * [Chinese Mailing List](#chinese-mailing-list)
@@ -63,7 +62,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.10.15](https://github.com/openresty/lua-nginx-module/tags) released on March 14th, 2019.
+This document describes ngx_lua [v0.10.13](https://github.com/openresty/lua-nginx-module/tags) released on 22 April 2018.
 
 Synopsis
 ========
@@ -188,9 +187,7 @@ Synopsis
 Description
 ===========
 
-This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
-
-This module embeds Lua, via [LuaJIT 2.0/2.1](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.
+This module embeds Lua, via the standard Lua 5.1 interpreter or [LuaJIT 2.0/2.1](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](https://httpd.apache.org/docs/trunk/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](#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.
@@ -268,11 +265,11 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 Installation
 ============
 
-It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, OpenResty's LuaJIT 2.1 branch version, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
+It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-1. LuaJIT can be downloaded from the [latest release of OpenResty's LuaJIT branch version](https://github.com/openresty/luajit2/releases). The official LuaJIT 2.0 and 2.1 releases are also supported, although the performance will be significantly lower in many cases.
+1. Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is *not* supported yet). LuaJIT can be downloaded from 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](https://github.com/simplresty/ngx_devel_kit/tags).
 1. Download the latest version of ngx_lua [HERE](https://github.com/openresty/lua-nginx-module/tags).
 1. Download the latest version of Nginx [HERE](http://nginx.org/) (See [Nginx Compatibility](#nginx-compatibility))
@@ -348,6 +345,29 @@ To enable one or more of these macros, just pass extra C compiler options to the
     ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
 
 
+[Back to TOC](#table-of-contents)
+
+Installation on Ubuntu 11.10
+----------------------------
+
+Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever possible.
+
+If the standard Lua 5.1 interpreter is required however, run the following command to install it from the Ubuntu repository:
+
+```bash
+
+ 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.
+
+```bash
+
+ ln -s /usr/lib/x86_64-linux-gnu/liblua5.1.so /usr/lib/liblua.so
+```
+
 [Back to TOC](#table-of-contents)
 
 Community
@@ -391,7 +411,7 @@ Lua/LuaJIT bytecode support
 
 As from the `v0.5.0rc32` release, all `*_by_lua_file` configure directives (such as [content_by_lua_file](#content_by_lua_file)) support loading Lua 5.1 and LuaJIT 2.0/2.1 raw bytecode files directly.
 
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if you are using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
 
 ```bash
 
@@ -411,6 +431,20 @@ Please refer to the official LuaJIT documentation on the `-b` option for more de
 
 Also, the bytecode files generated by LuaJIT 2.1 is *not* compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
 
+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:
+
+```bash
+
+ 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:
+
+```bash
+
+ 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/2.1 or vice versa, will result in an error message, such as that below, being logged into the Nginx `error.log` file:
 
 
@@ -608,7 +642,8 @@ This issue is due to limitations in the Nginx event model and only appears to af
 
 Lua Coroutine Yielding/Resuming
 -------------------------------
-* Because Lua's `dofile` and `require` builtins are currently implemented as C functions in LuaJIT 2.0/2.1, if the Lua file being loaded by `dofile` or `require` invokes [ngx.location.capture*](#ngxlocationcapture), [ngx.exec](#ngxexec), [ngx.exit](#ngxexit), or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
+* Because Lua's `dofile` and `require` builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by `dofile` or `require` invokes [ngx.location.capture*](#ngxlocationcapture), [ngx.exec](#ngxexec), [ngx.exit](#ngxexit), or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
+* As the standard Lua 5.1 interpreter's VM is not fully resumable, the methods [ngx.location.capture](#ngxlocationcapture), [ngx.location.capture_multi](#ngxlocationcapture_multi), [ngx.redirect](#ngxredirect), [ngx.exec](#ngxexec), and [ngx.exit](#ngxexit) 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) or even the first line of the `for ... in ...` statement 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.x, which supports a fully resumable VM, to avoid this.
 
 [Back to TOC](#table-of-contents)
 
@@ -960,7 +995,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2019, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -1004,7 +1039,6 @@ See Also
 Directives
 ==========
 
-* [lua_load_resty_core](#lua_load_resty_core)
 * [lua_capture_error_log](#lua_capture_error_log)
 * [lua_use_default_type](#lua_use_default_type)
 * [lua_malloc_trim](#lua_malloc_trim)
@@ -1070,7 +1104,6 @@ Directives
 * [lua_check_client_abort](#lua_check_client_abort)
 * [lua_max_pending_timers](#lua_max_pending_timers)
 * [lua_max_running_timers](#lua_max_running_timers)
-* [lua_sa_restart](#lua_sa_restart)
 
 
 The basic building blocks of scripting Nginx with Lua are directives. Directives are used to specify when the user Lua code is run and
@@ -1080,38 +1113,6 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 [Back to TOC](#table-of-contents)
 
-lua_load_resty_core
--------------------
-
-**syntax:** *lua_load_resty_core on|off*
-
-**default:** *lua_load_resty_core on*
-
-**context:** *http*
-
-Controls whether the `resty.core` module (from
-[lua-resty-core](https://github.com/openresty/lua-resty-core)) should be loaded
-or not. When enabled, this directive is equivalent to executing the following
-when the Lua VM is created:
-
-```lua
-
- require "resty.core"
-```
-
-Note that usage of the `resty.core` module is recommended, as its
-FFI implementation is both faster, safer, and more complete than the Lua C API
-of the ngx_lua module.
-
-It must also be noted that the Lua C API of the ngx_lua module will eventually
-be removed, and usage of the FFI-based API (i.e. the `resty.core`
-module) will become mandatory. This directive only aims at providing a
-temporary backwards-compatibility mode in case of edge-cases.
-
-This directive was first introduced in the `v0.10.15` release.
-
-[Back to TOC](#directives)
-
 lua_capture_error_log
 ---------------------
 **syntax:** *lua_capture_error_log size*
@@ -2601,14 +2602,14 @@ SSL session resumption can then get immediately initiated and bypass the full SS
 Please note that TLS session tickets are very different and it is the clients' responsibility
 to cache the SSL session state when session tickets are used. SSL session resumptions based on
 TLS session tickets would happen automatically without going through this hook (nor the
-[ssl_session_store_by_lua*](#ssl_session_store_by_lua_block) hook). This hook is mainly
+[ssl_session_store_by_lua_block](#ssl_session_store_by_lua) hook). This hook is mainly
 for older or less capable SSL clients that can only do SSL sessions by session IDs.
 
 When [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block) is specified at the same time,
 this hook usually runs before [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
 When the SSL session is found and successfully loaded for the current SSL connection,
 SSL session resumption will happen and thus bypass the [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block)
-hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block)
+hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua_block](#ssl_session_store_by_lua)
 hook, for obvious reasons.
 
 To easily test this hook locally with a modern web browser, you can temporarily put the following line
@@ -3107,23 +3108,6 @@ This directive was first introduced in the `v0.8.0` release.
 
 [Back to TOC](#directives)
 
-lua_sa_restart
---------------
-
-**syntax:** *lua_sa_restart on|off*
-
-**default:** *lua_sa_restart on*
-
-**context:** *http*
-
-When enabled, this module will set the `SA_RESTART` flag on nginx workers signal dispositions.
-
-This allows Lua I/O primitives to not be interrupted by nginx's handling of various signals.
-
-This directive was first introduced in the `v0.10.14` release.
-
-[Back to TOC](#directives)
-
 Nginx API for Lua
 =================
 
@@ -3237,7 +3221,6 @@ Nginx API for Lua
 * [tcpsock:sslhandshake](#tcpsocksslhandshake)
 * [tcpsock:send](#tcpsocksend)
 * [tcpsock:receive](#tcpsockreceive)
-* [tcpsock:receiveany](#tcpsockreceiveany)
 * [tcpsock:receiveuntil](#tcpsockreceiveuntil)
 * [tcpsock:close](#tcpsockclose)
 * [tcpsock:settimeout](#tcpsocksettimeout)
@@ -4319,7 +4302,7 @@ ngx.req.get_method
 ------------------
 **syntax:** *method_name = ngx.req.get_method()*
 
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, balancer_by_lua&#42;, log_by_lua&#42;*
+**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, balancer_by_lua&#42;*
 
 Retrieves the current request's request method name. Strings like `"GET"` and `"POST"` are returned instead of numerical [method constants](#http-method-constants).
 
@@ -4904,7 +4887,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](#ngxreqread_body) first (or turn 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 not been read yet, call [ngx.req.read_body](#ngxreqread_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](#ngxreqget_body_file) function instead.
 
@@ -4928,7 +4911,7 @@ Retrieves the file name for the in-file request body data. Returns `nil` if the
 
 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](#ngxreqread_body) first (or turn 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 not been read yet, call [ngx.req.read_body](#ngxreqread_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](#ngxreqget_body_data) function instead.
 
@@ -4948,9 +4931,7 @@ ngx.req.set_body_data
 
 Set the current request's request body using the in-memory data specified by the `data` argument.
 
-If the request body has not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn on [lua_need_request_body](#lua_need_request_body) to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [ngx.req.discard_body](#ngxreqdiscard_body).
-
-Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
+If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the `v0.3.1rc18` release.
 
@@ -4966,13 +4947,11 @@ 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 request body has not been read yet, call [ngx.req.read_body](#ngxreqread_body) first (or turn on [lua_need_request_body](#lua_need_request_body) to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [ngx.req.discard_body](#ngxreqdiscard_body).
-
 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](#ngxreqset_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.
 
-Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
+If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the `v0.3.1rc18` release.
 
@@ -6738,7 +6717,7 @@ ngx.shared.DICT.flush_expired
 
 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.
 
-Unlike the [flush_all](#ngxshareddictflush_all) method, this method actually frees up the memory used by the expired items.
+Unlike the [flush_all](#ngxshareddictflush_all) method, this method actually free up the memory used by the expired items.
 
 This feature was first introduced in the `v0.6.3` release.
 
@@ -7023,7 +7002,6 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [settimeout](#tcpsocksettimeout)
 * [settimeouts](#tcpsocksettimeouts)
 * [setoption](#tcpsocksetoption)
-* [receiveany](#tcpsockreceiveany)
 * [receiveuntil](#tcpsockreceiveuntil)
 * [setkeepalive](#tcpsocksetkeepalive)
 * [getreusedtimes](#tcpsockgetreusedtimes)
@@ -7128,43 +7106,6 @@ An optional Lua table can be specified as the last argument to this method to sp
 * `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>"`.
 
-* `pool_size`
-	specify the size of the connection pool. If omitted and no
-	`backlog` option was provided, no pool will be created. If omitted
-	but `backlog` was provided, the pool will be created with a default
-	size equal to the value of the [lua_socket_pool_size](#lua_socket_pool_size)
-	directive.
-	The connection pool holds up to `pool_size` alive connections
-	ready to be reused by subsequent calls to [connect](#tcpsockconnect), but
-	note that there is no upper limit to the total number of opened connections
-	outside of the pool. If you need to restrict the total number of opened
-	connections, specify the `backlog` option.
-	When the connection pool would exceed its size limit, the least recently used
-	(kept-alive) 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. Also note that the size of the connection
-	pool cannot be changed once it has been created.
-	This option was first introduced in the `v0.10.14` release.
-
-* `backlog`
-	if specified, this module will limit the total number of opened connections
-	for this pool. No more connections than `pool_size` can be opened
-	for this pool at any time. If the connection pool is full, subsequent
-	connect operations will be queued into a queue equal to this option's
-	value (the "backlog" queue).
-	If the number of queued connect operations is equal to `backlog`,
-	subsequent connect operations will fail and return `nil` plus the
-	error string `"too many waiting connect operations"`.
-	The queued connect operations will be resumed once the number of connections
-	in the pool is less than `pool_size`.
-	The queued connect operation will abort once they have been queued for more
-	than `connect_timeout`, controlled by
-	[settimeouts](#tcpsocksettimeouts), and will return `nil` plus
-	the error string `"timeout"`.
-	This option was first introduced in the `v0.10.14` release.
-
 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.
@@ -7290,40 +7231,6 @@ This feature was first introduced in the `v0.5.0rc1` release.
 
 [Back to TOC](#nginx-api-for-lua)
 
-tcpsock:receiveany
-------------------
-**syntax:** *data, err = tcpsock:receiveany(max)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-Returns any data received by the connected socket, at most `max` bytes.
-
-This method is a synchronous operation just like the [send](#tcpsocksend) method 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 received data is more than this size, this method will return with exactly this size of data.
-The remaining data in the underlying receive buffer could be returned in the next reading operation.
-
-Timeout for the reading operation is controlled by the [lua_socket_read_timeout](#lua_socket_read_timeout) config directive and the [settimeouts](#tcpsocksettimeouts) method. And the latter takes priority. For example:
-
-```lua
-
- sock:settimeouts(1000, 1000, 1000)  -- one second timeout for connect/read/write
- local data, err = sock:receiveany(10 * 1024 * 1024) -- read any data, at most 10K
- if not data then
-     ngx.say("failed to read any data: ", err)
-     return
- end
- ngx.say("successfully read: ", data)
-```
-
-This method doesn't automatically close the current connection when the read timeout error occurs. For other connection errors, this method always automatically closes the connection.
-
-This feature was first introduced in the `v0.10.14` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
 tcpsock:receiveuntil
 --------------------
 **syntax:** *iterator = tcpsock:receiveuntil(pattern, options?)*
@@ -7496,31 +7403,13 @@ Puts the current socket's connection immediately into the cosocket built-in conn
 
 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](#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` is considered deprecated since
-the `v0.10.14` release of this module, in favor of the
-`pool_size` option of the [connect](#tcpsockconnect) method.
-Since the `v0.10.14` release, this option will only take effect if
-the call to [connect](#tcpsockconnect) did not already create a connection
-pool.
-When this option takes effect (no connection pool was previously created by
-[connect](#tcpsockconnect)), it will specify the size of the connection pool,
-and create it.
-If omitted (and no pool was previously created), the default size is the value
-of the [lua_socket_pool_size](#lua_socket_pool_size) directive.
-The connection pool holds up to `size` alive connections ready to be
-reused by subsequent calls to [connect](#tcpsockconnect), but note that there
-is no upper limit to the total number of opened connections outside of the
-pool.
-When the connection pool would exceed its size limit, the least recently used
-(kept-alive) 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. Also note that the size of the connection
-pool cannot be changed once it has been created.
-If you need to restrict the total number of opened connections, specify both
-the `pool_size` and `backlog` option in the call to
-[connect](#tcpsockconnect).
+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](#lua_socket_pool_size) config directive will be used.
+
+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.
+
+Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
 
 In case of success, this method returns `1`; otherwise, it returns `nil` and a string describing the error.
 
@@ -8292,7 +8181,7 @@ This Lua module does not ship with this ngx_lua module itself rather it is shipp
 the
 [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
 
-Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md)
+Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md)
 for this `ngx.ocsp` Lua module for more details.
 
 This feature requires at least ngx_lua `v0.10.0`.
diff --git a/debian/modules/http-lua/config b/debian/modules/http-lua/config
index e1d5e35..044deb9 100644
--- a/debian/modules/http-lua/config
+++ b/debian/modules/http-lua/config
@@ -361,8 +361,6 @@ HTTP_LUA_SRCS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.c \
             $ngx_addon_dir/src/ngx_http_lua_ssl.c \
             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.c \
-            $ngx_addon_dir/src/ngx_http_lua_input_filters.c \
-            $ngx_addon_dir/src/ngx_http_lua_pipe.c \
             "
 
 HTTP_LUA_DEPS=" \
@@ -424,8 +422,6 @@ HTTP_LUA_DEPS=" \
             $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.h \
             $ngx_addon_dir/src/ngx_http_lua_ssl.h \
             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.h \
-            $ngx_addon_dir/src/ngx_http_lua_input_filters.h \
-            $ngx_addon_dir/src/ngx_http_lua_pipe.h \
             "
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
@@ -478,17 +474,6 @@ ngx_feature_test='setsockopt(1, SOL_SOCKET, SO_PASSCRED, NULL, 0);'
 
 . auto/feature
 
-ngx_feature="SA_RESTART"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_SA_RESTART"
-ngx_feature_run=no
-ngx_feature_incs="#include <signal.h>"
-ngx_feature_path=
-ngx_feature_test='struct sigaction act;
-                  act.sa_flags |= SA_RESTART;'
-
-. auto/feature
-
 ngx_feature="__attribute__(constructor)"
 ngx_feature_libs=
 ngx_feature_name="NGX_HTTP_LUA_HAVE_CONSTRUCTOR"
@@ -527,36 +512,6 @@ CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
 
 # ----------------------------------------
 
-ngx_feature="pipe2"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_PIPE2"
-ngx_feature_run=no
-ngx_feature_incs="#include <fcntl.h>"
-ngx_feature_test="int fd[2]; pipe2(fd, O_CLOEXEC|O_NONBLOCK);"
-SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
-
-. auto/feature
-
-CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-
-# ----------------------------------------
-
-ngx_feature="signalfd"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_SIGNALFD"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/signalfd.h>"
-ngx_feature_test="sigset_t set; signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);"
-SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
-
-. auto/feature
-
-CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-
-# ----------------------------------------
-
 if test -n "$ngx_module_link"; then
     ngx_module_type=HTTP_AUX_FILTER
     ngx_module_name=$ngx_addon_name
diff --git a/debian/modules/http-lua/doc/HttpLuaModule.wiki b/debian/modules/http-lua/doc/HttpLuaModule.wiki
index ff9b269..e3c61e2 100644
--- a/debian/modules/http-lua/doc/HttpLuaModule.wiki
+++ b/debian/modules/http-lua/doc/HttpLuaModule.wiki
@@ -2,8 +2,6 @@
 
 ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
 
-This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
-
 ''This module is not distributed with the Nginx source.'' See [[#Installation|the installation instructions]].
 
 = Status =
@@ -12,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.15] released on March 14th, 2019.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.13] released on 22 April 2018.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -132,9 +130,7 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
 
 = Description =
 
-This module is a core component of OpenResty. If you are using this module, then you are essentially using OpenResty :)
-
-This module embeds Lua, via [http://luajit.org/luajit.html LuaJIT 2.0/2.1], 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 5.1 interpreter or [http://luajit.org/luajit.html LuaJIT 2.0/2.1], into Nginx and by leveraging Nginx's subrequests, allows the integration of the powerful Lua threads (Lua coroutines) into the Nginx event model.
 
 Unlike [https://httpd.apache.org/docs/trunk/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.
@@ -203,11 +199,11 @@ Nginx cores older than 1.6.0 (exclusive) are *not* supported.
 
 = Installation =
 
-It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, OpenResty's LuaJIT 2.1 branch version, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
+It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
-# LuaJIT can be downloaded from the [https://github.com/openresty/luajit2/releases latest release of OpenResty's LuaJIT branch version]. The official LuaJIT 2.0 and 2.1 releases are also supported, although the performance will be significantly lower in many cases.
+# Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is ''not'' supported yet). LuaJIT can be downloaded from the [http://luajit.org/download.html 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 [https://github.com/simplresty/ngx_devel_kit/tags HERE].
 # Download the latest version of ngx_lua [https://github.com/openresty/lua-nginx-module/tags HERE].
 # Download the latest version of Nginx [http://nginx.org/ HERE] (See [[#Nginx Compatibility|Nginx Compatibility]])
@@ -275,6 +271,24 @@ To enable one or more of these macros, just pass extra C compiler options to the
     ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
 </geshi>
 
+== Installation on Ubuntu 11.10 ==
+
+Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever 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 ==
@@ -300,7 +314,7 @@ Please submit bug reports, wishlists, or patches by
 
 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/2.1 raw bytecode files directly.
 
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if you are using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
+Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 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.ljbc
@@ -318,6 +332,18 @@ http://luajit.org/running.html#opt_b
 
 Also, the bytecode files generated by LuaJIT 2.1 is ''not'' compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
 
+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/2.1 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">
@@ -484,7 +510,8 @@ However, later attempts to manipulate the cosocket object will fail and return t
 This issue is due to limitations in the Nginx event model and only appears to affect Mac OS X.
 
 == Lua Coroutine Yielding/Resuming ==
-* Because Lua's <code>dofile</code> and <code>require</code> builtins are currently implemented as C functions in LuaJIT 2.0/2.1, if the Lua file being loaded by <code>dofile</code> or <code>require</code> invokes [[#ngx.location.capture|ngx.location.capture*]], [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]], or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
+* Because Lua's <code>dofile</code> and <code>require</code> builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by <code>dofile</code> or <code>require</code> invokes [[#ngx.location.capture|ngx.location.capture*]], [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]], or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
+* 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()] or even the first line of the <code>for ... in ...</code> statement 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.x, which supports a fully resumable VM, to avoid this.
 
 == Lua Variable Scope ==
 Care must be taken when importing modules and this form should be used:
@@ -790,7 +817,7 @@ This module is licensed under the BSD license.
 
 Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2019, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
 
 All rights reserved.
 
@@ -835,34 +862,6 @@ how the result will be used. Below is a diagram showing the order in which direc
 
 ![Lua Nginx Modules Directives](https://cloud.githubusercontent.com/assets/2137369/15272097/77d1c09e-1a37-11e6-97ef-d9767035fc3e.png)
 
-== lua_load_resty_core ==
-
-'''syntax:''' ''lua_load_resty_core on|off''
-
-'''default:''' ''lua_load_resty_core on''
-
-'''context:''' ''http''
-
-Controls whether the <code>resty.core</code> module (from
-[https://github.com/openresty/lua-resty-core lua-resty-core]) should be loaded
-or not. When enabled, this directive is equivalent to executing the following
-when the Lua VM is created:
-
-<geshi lang="lua">
-    require "resty.core"
-</geshi>
-
-Note that usage of the <code>resty.core</code> module is recommended, as its
-FFI implementation is both faster, safer, and more complete than the Lua C API
-of the ngx_lua module.
-
-It must also be noted that the Lua C API of the ngx_lua module will eventually
-be removed, and usage of the FFI-based API (i.e. the <code>resty.core</code>
-module) will become mandatory. This directive only aims at providing a
-temporary backwards-compatibility mode in case of edge-cases.
-
-This directive was first introduced in the <code>v0.10.15</code> release.
-
 == lua_capture_error_log ==
 '''syntax:''' ''lua_capture_error_log size''
 
@@ -2197,14 +2196,14 @@ SSL session resumption can then get immediately initiated and bypass the full SS
 Please note that TLS session tickets are very different and it is the clients' responsibility
 to cache the SSL session state when session tickets are used. SSL session resumptions based on
 TLS session tickets would happen automatically without going through this hook (nor the
-[[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]] hook). This hook is mainly
+[[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]] hook). This hook is mainly
 for older or less capable SSL clients that can only do SSL sessions by session IDs.
 
 When [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]] is specified at the same time,
 this hook usually runs before [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]].
 When the SSL session is found and successfully loaded for the current SSL connection,
 SSL session resumption will happen and thus bypass the [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]]
-hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]]
+hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]]
 hook, for obvious reasons.
 
 To easily test this hook locally with a modern web browser, you can temporarily put the following line
@@ -2627,20 +2626,6 @@ When exceeding this limit, Nginx will stop running the callbacks of newly expire
 
 This directive was first introduced in the <code>v0.8.0</code> release.
 
-== lua_sa_restart ==
-
-'''syntax:''' ''lua_sa_restart on|off''
-
-'''default:''' ''lua_sa_restart on''
-
-'''context:''' ''http''
-
-When enabled, this module will set the `SA_RESTART` flag on nginx workers signal dispositions.
-
-This allows Lua I/O primitives to not be interrupted by nginx's handling of various signals.
-
-This directive was first introduced in the <code>v0.10.14</code> release.
-
 = Nginx API for Lua =
 
 <!-- inline-toc -->
@@ -3578,7 +3563,7 @@ This method does not work in HTTP/2 requests yet.
 == 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*, body_filter_by_lua*, balancer_by_lua*, log_by_lua*''
+'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, balancer_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]].
 
@@ -4086,7 +4071,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 turn 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 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.
 
@@ -4107,7 +4092,7 @@ Retrieves the file name for the in-file request body data. Returns <code>nil</co
 
 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 turn 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 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.
 
@@ -4124,9 +4109,7 @@ See also [[#ngx.req.get_body_data|ngx.req.get_body_data]].
 
 Set the current request's request body using the in-memory data specified by the <code>data</code> argument.
 
-If the request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [[#ngx.req.discard_body|ngx.req.discard_body]].
-
-Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
+If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the <code>v0.3.1rc18</code> release.
 
@@ -4139,13 +4122,11 @@ 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 request body has not been read yet, call [[#ngx.req.read_body|ngx.req.read_body]] first (or turn on [[#lua_need_request_body|lua_need_request_body]] to force this module to read the request body. This is not recommended however). Additionally, the request body must not have been previously discarded by [[#ngx.req.discard_body|ngx.req.discard_body]].
-
 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.
 
-Whether the previous request body has been read into memory or buffered into a disk file, it will be freed or the disk file will be cleaned up immediately, respectively.
+If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
 
 This function was first introduced in the <code>v0.3.1rc18</code> release.
 
@@ -5667,7 +5648,7 @@ See also [[#ngx.shared.DICT.flush_expired|ngx.shared.DICT.flush_expired]] and [[
 
 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.
 
-Unlike the [[#ngx.shared.DICT.flush_all|flush_all]] method, this method actually frees up the memory used by the expired items.
+Unlike the [[#ngx.shared.DICT.flush_all|flush_all]] method, this method actually free up the memory used by the expired items.
 
 This feature was first introduced in the <code>v0.6.3</code> release.
 
@@ -5913,7 +5894,6 @@ Creates and returns a TCP or stream-oriented unix domain socket object (also kno
 * [[#tcpsock:settimeout|settimeout]]
 * [[#tcpsock:settimeouts|settimeouts]]
 * [[#tcpsock:setoption|setoption]]
-* [[#tcpsock:receiveany|receiveany]]
 * [[#tcpsock:receiveuntil|receiveuntil]]
 * [[#tcpsock:setkeepalive|setkeepalive]]
 * [[#tcpsock:getreusedtimes|getreusedtimes]]
@@ -6011,43 +5991,6 @@ An optional Lua table can be specified as the last argument to this method to sp
 * <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>.
 
-* <code>pool_size</code>
-: specify the size of the connection pool. If omitted and no
-: <code>backlog</code> option was provided, no pool will be created. If omitted
-: but <code>backlog</code> was provided, the pool will be created with a default
-: size equal to the value of the [[#lua_socket_pool_size|lua_socket_pool_size]]
-: directive.
-: The connection pool holds up to <code>pool_size</code> alive connections
-: ready to be reused by subsequent calls to [[#tcpsock:connect|connect]], but
-: note that there is no upper limit to the total number of opened connections
-: outside of the pool. If you need to restrict the total number of opened
-: connections, specify the <code>backlog</code> option.
-: When the connection pool would exceed its size limit, the least recently used
-: (kept-alive) 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. Also note that the size of the connection
-: pool cannot be changed once it has been created.
-: This option was first introduced in the <code>v0.10.14</code> release.
-
-* <code>backlog</code>
-: if specified, this module will limit the total number of opened connections
-: for this pool. No more connections than <code>pool_size</code> can be opened
-: for this pool at any time. If the connection pool is full, subsequent
-: connect operations will be queued into a queue equal to this option's
-: value (the "backlog" queue).
-: If the number of queued connect operations is equal to <code>backlog</code>,
-: subsequent connect operations will fail and return <code>nil</code> plus the
-: error string <code>"too many waiting connect operations"</code>.
-: The queued connect operations will be resumed once the number of connections
-: in the pool is less than <code>pool_size</code>.
-: The queued connect operation will abort once they have been queued for more
-: than <code>connect_timeout</code>, controlled by
-: [[#tcpsock:settimeouts|settimeouts]], and will return <code>nil</code> plus
-: the error string <code>"timeout"</code>.
-: This option was first introduced in the <code>v0.10.14</code> release.
-
 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.
@@ -6160,36 +6103,6 @@ Since the <code>v0.8.8</code> release, this method no longer automatically close
 
 This feature was first introduced in the <code>v0.5.0rc1</code> release.
 
-== tcpsock:receiveany ==
-'''syntax:''' ''data, err = tcpsock:receiveany(max)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-Returns any data received by the connected socket, at most <code>max</code> bytes.
-
-This method is a synchronous operation just like the [[#tcpsock:send|send]] method 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 received data is more than this size, this method will return with exactly this size of data.
-The remaining data in the underlying receive buffer could be returned in the next reading operation.
-
-Timeout for the reading operation is controlled by the [[#lua_socket_read_timeout|lua_socket_read_timeout]] config directive and the [[#tcpsock:settimeouts|settimeouts]] method. And the latter takes priority. For example:
-
-<geshi lang="lua">
-    sock:settimeouts(1000, 1000, 1000)  -- one second timeout for connect/read/write
-    local data, err = sock:receiveany(10 * 1024 * 1024) -- read any data, at most 10K
-    if not data then
-        ngx.say("failed to read any data: ", err)
-        return
-    end
-    ngx.say("successfully read: ", data)
-</geshi>
-
-This method doesn't automatically close the current connection when the read timeout error occurs. For other connection errors, this method always automatically closes the connection.
-
-This feature was first introduced in the <code>v0.10.14</code> release.
-
 == tcpsock:receiveuntil ==
 '''syntax:''' ''iterator = tcpsock:receiveuntil(pattern, options?)''
 
@@ -6342,31 +6255,13 @@ Puts the current socket's connection immediately into the cosocket built-in conn
 
 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> is considered deprecated since
-the <code>v0.10.14</code> release of this module, in favor of the
-<code>pool_size</code> option of the [[#tcpsock:connect|connect]] method.
-Since the <code>v0.10.14</code> release, this option will only take effect if
-the call to [[#tcpsock:connect|connect]] did not already create a connection
-pool.
-When this option takes effect (no connection pool was previously created by
-[[#tcpsock:connect|connect]]), it will specify the size of the connection pool,
-and create it.
-If omitted (and no pool was previously created), the default size is the value
-of the [[#lua_socket_pool_size|lua_socket_pool_size]] directive.
-The connection pool holds up to <code>size</code> alive connections ready to be
-reused by subsequent calls to [[#tcpsock:connect|connect]], but note that there
-is no upper limit to the total number of opened connections outside of the
-pool.
-When the connection pool would exceed its size limit, the least recently used
-(kept-alive) 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. Also note that the size of the connection
-pool cannot be changed once it has been created.
-If you need to restrict the total number of opened connections, specify both
-the <code>pool_size</code> and <code>backlog</code> option in the call to
-[[#tcpsock:connect|connect]].
+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 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.
+
+Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
 
 In case of success, this method returns <code>1</code>; otherwise, it returns <code>nil</code> and a string describing the error.
 
@@ -7055,7 +6950,7 @@ This Lua module does not ship with this ngx_lua module itself rather it is shipp
 the
 [https://github.com/openresty/lua-resty-core lua-resty-core] library.
 
-Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md documentation]
+Please refer to the [https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md documentation]
 for this <code>ngx.ocsp</code> Lua module for more details.
 
 This feature requires at least ngx_lua <code>v0.10.0</code>.
diff --git a/debian/modules/http-lua/src/api/ngx_http_lua_api.h b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
index 129eb99..c7c0e6b 100644
--- a/debian/modules/http-lua/src/api/ngx_http_lua_api.h
+++ b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  10015
+#define ngx_http_lua_version  10013
 
 
 typedef struct {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_accessby.c b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
index d3fe294..56bf0fa 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_accessby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
@@ -60,7 +60,7 @@ ngx_http_lua_access_handler(ngx_http_request_t *r)
 #endif
 
         if (cur_ph < last_ph) {
-            dd("swapping the contents of cur_ph and last_ph...");
+            dd("swaping the contents of cur_ph and last_ph...");
 
             tmp = *cur_ph;
 
@@ -261,11 +261,9 @@ ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_api.c b/debian/modules/http-lua/src/ngx_http_lua_api.c
index ac014f2..7b590e7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_api.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_api.c
@@ -195,7 +195,7 @@ ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
     lmcf->shm_zones_inited++;
 
     if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
-        && lmcf->init_handler && !ngx_test_config)
+        && lmcf->init_handler)
     {
         saved_cycle = ngx_cycle;
         ngx_cycle = ctx->cycle;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_balancer.c b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
index 3ecd592..fdf2af3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_balancer.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
@@ -362,8 +362,6 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     /* init nginx context in Lua VM */
     ngx_http_lua_set_req(L, r);
-
-#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ make new env inheriting main thread's globals table */
@@ -374,7 +372,6 @@ ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif /* OPENRESTY_LUAJIT */
 
     lua_pushcfunction(L, ngx_http_lua_traceback);
     lua_insert(L, 1);  /* put it under chunk and args */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
index f3af14c..2b3c38f 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
@@ -32,6 +32,10 @@ static void ngx_http_lua_body_filter_by_lua_env(lua_State *L,
 static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
 
 
+/* key for the ngx_chain_t *in pointer in the Lua thread */
+#define ngx_http_lua_chain_key  "__ngx_cl"
+
+
 /**
  * Set environment table for the given code closure.
  *
@@ -47,14 +51,12 @@ static void
 ngx_http_lua_body_filter_by_lua_env(lua_State *L, ngx_http_request_t *r,
     ngx_chain_t *in)
 {
-    ngx_http_lua_main_conf_t    *lmcf;
-
+    /*  set nginx request pointer to current lua thread's globals table */
     ngx_http_lua_set_req(L, r);
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-    lmcf->body_filter_chain = in;
+    lua_pushlightuserdata(L, in);
+    lua_setglobal(L, ngx_http_lua_chain_key);
 
-#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -77,7 +79,6 @@ ngx_http_lua_body_filter_by_lua_env(lua_State *L, ngx_http_request_t *r,
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif /* OPENRESTY_LUAJIT */
 }
 
 
@@ -235,8 +236,8 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_int_t                    rc;
     uint16_t                     old_context;
     ngx_http_cleanup_t          *cln;
+    lua_State                   *L;
     ngx_chain_t                 *out;
-    ngx_http_lua_main_conf_t    *lmcf;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua body filter for user lua code, uri \"%V\"", &r->uri);
@@ -298,8 +299,11 @@ ngx_http_lua_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return NGX_ERROR;
     }
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-    out = lmcf->body_filter_chain;
+    L = ngx_http_lua_get_lua_vm(r, ctx);
+
+    lua_getglobal(L, ngx_http_lua_chain_key);
+    out = lua_touserdata(L, -1);
+    lua_pop(L, 1);
 
     if (in == out) {
         return ngx_http_next_body_filter(r, in);
@@ -341,7 +345,7 @@ ngx_http_lua_body_filter_init(void)
 
 
 int
-ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
+ngx_http_lua_body_filter_param_get(lua_State *L)
 {
     u_char              *data, *p;
     size_t               size;
@@ -350,8 +354,6 @@ ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
     int                  idx;
     ngx_chain_t         *in;
 
-    ngx_http_lua_main_conf_t    *lmcf;
-
     idx = luaL_checkint(L, 2);
 
     dd("index: %d", idx);
@@ -361,8 +363,8 @@ ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
         return 1;
     }
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-    in = lmcf->body_filter_chain;
+    lua_getglobal(L, ngx_http_lua_chain_key);
+    in = lua_touserdata(L, -1);
 
     if (idx == 2) {
         /* asking for the eof argument */
@@ -440,8 +442,6 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     ngx_chain_t             *cl;
     ngx_chain_t             *in;
 
-    ngx_http_lua_main_conf_t    *lmcf;
-
     idx = luaL_checkint(L, 2);
 
     dd("index: %d", idx);
@@ -450,13 +450,13 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
         return luaL_error(L, "bad index: %d", idx);
     }
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
     if (idx == 2) {
         /* overwriting the eof flag */
         last = lua_toboolean(L, 3);
 
-        in = lmcf->body_filter_chain;
+        lua_getglobal(L, ngx_http_lua_chain_key);
+        in = lua_touserdata(L, -1);
+        lua_pop(L, 1);
 
         if (last) {
             ctx->seen_last_in_filter = 1;
@@ -521,7 +521,9 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     case LUA_TNIL:
         /* discard the buffers */
 
-        in = lmcf->body_filter_chain;
+        lua_getglobal(L, ngx_http_lua_chain_key); /* key val */
+        in = lua_touserdata(L, -1);
+        lua_pop(L, 1);
 
         last = 0;
 
@@ -555,7 +557,9 @@ ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
                           lua_typename(L, type));
     }
 
-    in = lmcf->body_filter_chain;
+    lua_getglobal(L, ngx_http_lua_chain_key);
+    in = lua_touserdata(L, -1);
+    lua_pop(L, 1);
 
     last = 0;
 
@@ -621,8 +625,8 @@ done:
         }
     }
 
-    lmcf->body_filter_chain = cl;
-
+    lua_pushlightuserdata(L, cl);
+    lua_setglobal(L, ngx_http_lua_chain_key);
     return 0;
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
index b108202..6a4b306 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
@@ -21,7 +21,7 @@ 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, ngx_http_request_t *r);
+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);
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_cache.c b/debian/modules/http-lua/src/ngx_http_lua_cache.c
index 5b29527..5ea3069 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_cache.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_cache.c
@@ -35,14 +35,11 @@ static ngx_int_t
 ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
     const char *key)
 {
-#ifndef OPENRESTY_LUAJIT
     int          rc;
     u_char      *err;
-#endif
 
     /*  get code cache table */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          code_cache_key));
+    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));
@@ -55,10 +52,6 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
     lua_getfield(L, -1, key);    /*  sp++ */
 
     if (lua_isfunction(L, -1)) {
-#ifdef OPENRESTY_LUAJIT
-        lua_remove(L, -2);   /*  sp-- */
-        return NGX_OK;
-#else
         /*  call closure factory to gen new closure */
         rc = lua_pcall(L, 0, 1, 0);
         if (rc == 0) {
@@ -80,7 +73,6 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
                       key, err);
         lua_pop(L, 2);
         return NGX_ERROR;
-#endif /* OPENRESTY_LUAJIT */
     }
 
     dd("Value associated with given key in code cache table is not code "
@@ -110,13 +102,10 @@ ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
 static ngx_int_t
 ngx_http_lua_cache_store_code(lua_State *L, const char *key)
 {
-#ifndef OPENRESTY_LUAJIT
     int rc;
-#endif
 
     /*  get code cache table */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          code_cache_key));
+    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));
@@ -132,14 +121,12 @@ ngx_http_lua_cache_store_code(lua_State *L, const char *key)
     /*  remove cache table, leave closure factory at top of stack */
     lua_pop(L, 1); /* closure */
 
-#ifndef OPENRESTY_LUAJIT
     /*  call closure factory to generate new closure */
     rc = lua_pcall(L, 0, 1, 0);
     if (rc != 0) {
         dd("Error: failed to call closure factory!!");
         return NGX_ERROR;
     }
-#endif
 
     return NGX_OK;
 }
@@ -156,8 +143,7 @@ ngx_http_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
 
     n = lua_gettop(L);
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "looking up Lua code cache with key '%s'", cache_key);
+    dd("XXX cache key: [%s]", cache_key);
 
     rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
@@ -241,8 +227,7 @@ ngx_http_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
         dd("CACHE file key already pre-calculated");
     }
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "looking up Lua code cache with key '%s'", cache_key);
+    dd("XXX cache key for file: [%s]", cache_key);
 
     rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
index 754ed8d..041f046 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
@@ -15,13 +15,11 @@
 #include "ngx_http_lua_clfactory.h"
 
 
-#ifndef OPENRESTY_LUAJIT
 #define CLFACTORY_BEGIN_CODE "return function() "
 #define CLFACTORY_BEGIN_SIZE (sizeof(CLFACTORY_BEGIN_CODE) - 1)
 
 #define CLFACTORY_END_CODE "\nend"
 #define CLFACTORY_END_SIZE (sizeof(CLFACTORY_END_CODE) - 1)
-#endif
 
 
 /*
@@ -61,7 +59,6 @@
  * length(Instruction) = 4 or 8
  * little endian or big endian
 */
-#ifndef OPENRESTY_LUAJIT
 #define    LUA_LITTLE_ENDIAN_4BYTES_CODE                                     \
     "\x24\x00\x00\x00\x1e\x00\x00\x01\x1e\x00\x80\x00"
 #define    LUA_LITTLE_ENDIAN_8BYTES_CODE                                     \
@@ -78,7 +75,6 @@
 #define    LUA_BIG_ENDIAN_8BYTES_CODE_LEN           (8 + 8 + 8)
 #define    LUAC_HEADERSIZE         12
 #define    LUAC_VERSION            0x51
-#endif /* OPENRESTY_LUAJIT */
 
 
 /*
@@ -151,7 +147,6 @@
  * ---------------------
 */
 
-#ifndef OPENRESTY_LUAJIT
 #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))
@@ -165,7 +160,6 @@
     (POS_BYTECODE + LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN                        \
     + sizeof(int) + sizeof(int))
 #define    MAX_END_CODE_SIZE       (sizeof(int) + sizeof(int) + sizeof(int))
-#endif /* OPENRESTY_LUAJIT */
 
 /*
  * taken from chaoslawful:
@@ -231,7 +225,6 @@
 
 /* bytecode for luajit 2.0 */
 
-#ifndef OPENRESTY_LUAJIT
 #define    LJ20_LITTLE_ENDIAN_CODE_STRIPPED                                  \
     "\x14\x03\x00\x01\x00\x01\x00\x03"                                       \
     "\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00"                       \
@@ -282,7 +275,6 @@
 #define    LJ21_BCDUMP_VERSION        2
 #define    LJ20_BCDUMP_VERSION        1
 #define    LJ_SIGNATURE             "\x1b\x4c\x4a"
-#endif /* OPENRESTY_LUAJIT */
 
 
 typedef enum {
@@ -300,11 +292,10 @@ enum {
 typedef struct {
     ngx_http_lua_clfactory_file_type_e file_type;
 
-    int         extraline;
-    FILE       *f;
-#ifndef OPENRESTY_LUAJIT
     int         sent_begin;
     int         sent_end;
+    int         extraline;
+    FILE       *f;
     size_t      begin_code_len;
     size_t      end_code_len;
     size_t      rest_len;
@@ -316,16 +307,13 @@ typedef struct {
         char   *ptr;
         char    str[MAX_END_CODE_SIZE];
     }           end_code;
-#endif /* OPENRESTY_LUAJIT */
     char        buff[NGX_LUA_READER_BUFSIZE];
 } ngx_http_lua_clfactory_file_ctx_t;
 
 
 typedef struct {
-#ifndef OPENRESTY_LUAJIT
     int         sent_begin;
     int         sent_end;
-#endif
     const char *s;
     size_t      size;
 } ngx_http_lua_clfactory_buffer_ctx_t;
@@ -337,12 +325,9 @@ static int ngx_http_lua_clfactory_errfile(lua_State *L, const char *what,
     int fname_index);
 static const char *ngx_http_lua_clfactory_getS(lua_State *L, void *ud,
     size_t *size);
-#ifndef OPENRESTY_LUAJIT
 static long ngx_http_lua_clfactory_file_size(FILE *f);
-#endif
 
 
-#ifndef OPENRESTY_LUAJIT
 int
 ngx_http_lua_clfactory_bytecode_prepare(lua_State *L,
     ngx_http_lua_clfactory_file_ctx_t *lf, int fname_index)
@@ -608,7 +593,6 @@ error:
 
     return LUA_ERRFILE;
 }
-#endif /* OPENRESTY_LUAJIT */
 
 
 ngx_int_t
@@ -628,12 +612,10 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
     lf.extraline = 0;
     lf.file_type = NGX_LUA_TEXT_FILE;
 
-#ifndef OPENRESTY_LUAJIT
     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;
-#endif
 
     lua_pushfstring(L, "@%s", filename);
 
@@ -701,27 +683,20 @@ ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
             /* skip eventual `#!...' */
         }
 
-#ifndef OPENRESTY_LUAJIT
         status = ngx_http_lua_clfactory_bytecode_prepare(L, &lf, fname_index);
 
         if (status != 0) {
             return status;
         }
-#endif
 
         lf.extraline = 0;
     }
 
-#ifndef OPENRESTY_LUAJIT
     if (lf.file_type == NGX_LUA_TEXT_FILE) {
         ungetc(c, lf.f);
     }
 
     lf.sent_begin = lf.sent_end = 0;
-
-#else
-    ungetc(c, lf.f);
-#endif
     status = lua_load(L, ngx_http_lua_clfactory_getF, &lf,
                       lua_tostring(L, -1));
 
@@ -750,10 +725,8 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 
     ls.s = buff;
     ls.size = size;
-#ifndef OPENRESTY_LUAJIT
     ls.sent_begin = 0;
     ls.sent_end = 0;
-#endif
 
     return lua_load(L, ngx_http_lua_clfactory_getS, &ls, name);
 }
@@ -762,9 +735,7 @@ ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
 static const char *
 ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 {
-#ifndef OPENRESTY_LUAJIT
     char                        *buf;
-#endif
     size_t                       num;
 
     ngx_http_lua_clfactory_file_ctx_t        *lf;
@@ -777,7 +748,6 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
         return "\n";
     }
 
-#ifndef OPENRESTY_LUAJIT
     if (lf->sent_begin == 0) {
         lf->sent_begin = 1;
         *size = lf->begin_code_len;
@@ -791,14 +761,12 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 
         return buf;
     }
-#endif /* OPENRESTY_LUAJIT */
 
     num = fread(lf->buff, 1, sizeof(lf->buff), lf->f);
 
     dd("fread returned %d", (int) num);
 
     if (num == 0) {
-#ifndef OPENRESTY_LUAJIT
         if (lf->sent_end == 0) {
             lf->sent_end = 1;
             *size = lf->end_code_len;
@@ -812,13 +780,11 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
 
             return buf;
         }
-#endif /* OPENRESTY_LUAJIT */
 
         *size = 0;
         return NULL;
     }
 
-#ifndef OPENRESTY_LUAJIT
     if (lf->file_type == NGX_LUA_BT_LJ) {
         /* skip the footer(\x00) in luajit */
 
@@ -834,7 +800,6 @@ ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
             }
         }
     }
-#endif /* OPENRESTY_LUAJIT */
 
     *size = num;
     return lf->buff;
@@ -868,23 +833,19 @@ ngx_http_lua_clfactory_getS(lua_State *L, void *ud, size_t *size)
 {
     ngx_http_lua_clfactory_buffer_ctx_t      *ls = ud;
 
-#ifndef OPENRESTY_LUAJIT
     if (ls->sent_begin == 0) {
         ls->sent_begin = 1;
         *size = CLFACTORY_BEGIN_SIZE;
 
         return CLFACTORY_BEGIN_CODE;
     }
-#endif
 
     if (ls->size == 0) {
-#ifndef OPENRESTY_LUAJIT
         if (ls->sent_end == 0) {
             ls->sent_end = 1;
             *size = CLFACTORY_END_SIZE;
             return CLFACTORY_END_CODE;
         }
-#endif
 
         return NULL;
     }
@@ -896,7 +857,6 @@ ngx_http_lua_clfactory_getS(lua_State *L, void *ud, size_t *size)
 }
 
 
-#ifndef OPENRESTY_LUAJIT
 static long
 ngx_http_lua_clfactory_file_size(FILE *f)
 {
@@ -922,7 +882,6 @@ ngx_http_lua_clfactory_file_size(FILE *f)
 
     return len;
 }
-#endif /* OPENRESTY_LUAJIT */
 
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_common.h b/debian/modules/http-lua/src/ngx_http_lua_common.h
index dae5245..01ef2be 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_common.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_common.h
@@ -17,7 +17,7 @@
 #include <setjmp.h>
 #include <stdint.h>
 
-#include <luajit.h>
+#include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 
@@ -140,15 +140,6 @@ typedef struct {
 #endif
 
 
-#if (NGX_PTR_SIZE >= 8 && !defined(_WIN64))
-#define ngx_http_lua_lightudata_mask(ludata)                                 \
-    ((void *) ((uintptr_t) (&ngx_http_lua_##ludata) & ((1UL << 47) - 1)))
-
-#else
-#define ngx_http_lua_lightudata_mask(ludata)    (&ngx_http_lua_##ludata)
-#endif
-
-
 typedef struct ngx_http_lua_main_conf_s  ngx_http_lua_main_conf_t;
 typedef union ngx_http_lua_srv_conf_u  ngx_http_lua_srv_conf_t;
 
@@ -182,8 +173,6 @@ struct ngx_http_lua_main_conf_s {
     ngx_cycle_t         *cycle;
     ngx_pool_t          *pool;
 
-    ngx_flag_t           load_resty_core;
-
     ngx_int_t            max_pending_timers;
     ngx_int_t            pending_timers;
 
@@ -219,31 +208,9 @@ struct ngx_http_lua_main_conf_s {
     ngx_str_t                            init_worker_src;
 
     ngx_http_lua_balancer_peer_data_t      *balancer_peer_data;
-                    /* neither yielding nor recursion is possible in
-                     * balancer_by_lua*, so there cannot be any races among
-                     * concurrent requests and it is safe to store the peer
-                     * data pointer in the main conf.
-                     */
-
-    ngx_chain_t                            *body_filter_chain;
-                    /* neither yielding nor recursion is possible in
-                     * body_filter_by_lua*, so there cannot be any races among
-                     * concurrent requests when storing the chain
-                     * data pointer in the main conf.
-                     */
-
-    ngx_http_variable_value_t              *setby_args;
-                    /* neither yielding nor recursion is possible in
-                     * set_by_lua*, so there cannot be any races among
-                     * concurrent requests when storing the args pointer
-                     * in the main conf.
-                     */
-
-    size_t                                  setby_nargs;
-                    /* neither yielding nor recursion is possible in
-                     * set_by_lua*, so there cannot be any races among
-                     * concurrent requests when storing the nargs in the
-                     * main conf.
+                    /* balancer_by_lua does not support yielding and
+                     * there cannot be any conflicts among concurrent requests,
+                     * thus it is safe to store the peer data in the main conf.
                      */
 
     ngx_uint_t                      shm_zones_inited;
@@ -260,10 +227,6 @@ struct ngx_http_lua_main_conf_s {
     ngx_int_t            busy_buf_ptr_count;
 #endif
 
-    ngx_int_t            host_var_index;
-
-    ngx_flag_t           set_sa_restart;
-
     unsigned             requires_header_filter:1;
     unsigned             requires_body_filter:1;
     unsigned             requires_capture_filter:1;
@@ -481,7 +444,7 @@ typedef struct {
 
 
 typedef struct ngx_http_lua_ctx_s {
-    /* for lua_code_cache off: */
+    /* for lua_coce_cache off: */
     ngx_http_lua_vm_state_t  *vm_state;
 
     ngx_http_request_t      *request;
@@ -568,8 +531,6 @@ typedef struct ngx_http_lua_ctx_s {
 
     unsigned         headers_set:1; /* whether the user has set custom
                                        response headers */
-    unsigned         mime_set:1;    /* whether the user has set Content-Type
-                                       response header */
 
     unsigned         entered_rewrite_phase:1;
     unsigned         entered_access_phase:1;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_contentby.c b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
index 274c9ad..ecd6c0e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_contentby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
@@ -63,11 +63,9 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_control.c b/debian/modules/http-lua/src/ngx_http_lua_control.c
index 5cd1d64..6ac2cbf 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_control.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_control.c
@@ -432,8 +432,7 @@ ngx_http_lua_on_abort(lua_State *L)
 
     ngx_http_lua_coroutine_create_helper(L, r, ctx, &coctx);
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushvalue(L, -2);
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
index 99a2423..b790814 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
@@ -104,15 +104,11 @@ ngx_http_lua_coroutine_create_helper(lua_State *L, ngx_http_request_t *r,
     coctx->co = co;
     coctx->co_status = NGX_HTTP_LUA_CO_SUSPENDED;
 
-#ifdef OPENRESTY_LUAJIT
-    ngx_http_lua_set_req(co, r);
-#else
     /* make new coroutine share globals of the parent coroutine.
      * NOTE: globals don't have to be separated! */
     ngx_http_lua_get_globals_table(L);
     lua_xmove(L, co, 1);
     ngx_http_lua_set_globals_table(co);
-#endif
 
     lua_xmove(vm, L, 1);    /* move coroutine from main thread to L */
 
@@ -292,27 +288,15 @@ ngx_http_lua_inject_coroutine_api(ngx_log_t *log, lua_State *L)
     {
         const char buf[] =
             "local keys = {'create', 'yield', 'resume', 'status'}\n"
-#ifdef OPENRESTY_LUAJIT
-            "local get_req = require 'thread.exdata'\n"
-#else
             "local getfenv = getfenv\n"
-#endif
             "for _, key in ipairs(keys) do\n"
                "local std = coroutine['_' .. key]\n"
                "local ours = coroutine['__' .. key]\n"
                "local raw_ctx = ngx._phase_ctx\n"
                "coroutine[key] = function (...)\n"
-#ifdef OPENRESTY_LUAJIT
-                    "local r = get_req()\n"
-#else
                     "local r = getfenv(0).__ngx_req\n"
-#endif
-                    "if r ~= nil then\n"
-#ifdef OPENRESTY_LUAJIT
-                        "local ctx = raw_ctx()\n"
-#else
+                    "if r then\n"
                         "local ctx = raw_ctx(r)\n"
-#endif
                         /* ignore header and body filters */
                         "if ctx ~= 0x020 and ctx ~= 0x040 then\n"
                             "return ours(...)\n"
diff --git a/debian/modules/http-lua/src/ngx_http_lua_directive.c b/debian/modules/http-lua/src/ngx_http_lua_directive.c
index a989c26..fb8c6dc 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_directive.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_directive.c
@@ -1304,12 +1304,11 @@ ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
 
 found:
 
-    p = ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
-                     tag_len, tag, cf->conf_file->file.name.data
-                     + cf->conf_file->file.name.len - p,
-                     p, cf->conf_file->line);
-
-    *chunkname_len = p - out - 1;  /* exclude the trailing '\0' byte */
+    ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
+                 tag_len, tag, cf->conf_file->file.name.data
+                               + cf->conf_file->file.name.len - p,
+                 p, cf->conf_file->line);
+    *chunkname_len = len;
 
     return out;
 }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
index a0acd4a..b504530 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
@@ -42,9 +42,9 @@ 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)
 {
+    /*  set nginx request pointer to current lua thread's globals table */
     ngx_http_lua_set_req(L, r);
 
-#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -68,7 +68,6 @@ ngx_http_lua_header_filter_by_lua_env(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif /* OPENRESTY_LUAJIT */
 }
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers.c b/debian/modules/http-lua/src/ngx_http_lua_headers.c
index e3f48bc..b833577 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers.c
@@ -442,8 +442,7 @@ ngx_http_lua_ngx_req_get_headers(lua_State *L)
     lua_createtable(L, 0, count);
 
     if (!raw) {
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              headers_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -505,6 +504,7 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     ngx_table_elt_t    *header;
     ngx_http_request_t *r;
     ngx_http_lua_ctx_t *ctx;
+    ngx_int_t           rc;
     u_char             *lowcase_key = NULL;
     size_t              lowcase_key_sz = 0;
     ngx_uint_t          i;
@@ -543,6 +543,17 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
         return luaL_error(L, "no ctx found");
     }
 
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            return luaL_error(L,
+                              "failed to set default content type: %d",
+                              (int) rc);
+        }
+
+        ctx->headers_set = 1;
+    }
+
     ngx_http_lua_check_fake_request(L, r);
 
     part = &r->headers_out.headers.part;
@@ -555,8 +566,7 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     lua_createtable(L, 0, count + 2);
 
     if (!raw) {
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              headers_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -684,6 +694,7 @@ ngx_http_lua_ngx_header_get(lua_State *L)
     size_t                       len;
     ngx_http_lua_loc_conf_t     *llcf;
     ngx_http_lua_ctx_t          *ctx;
+    ngx_int_t                    rc;
 
     r = ngx_http_lua_get_req(L);
     if (r == NULL) {
@@ -726,7 +737,18 @@ ngx_http_lua_ngx_header_get(lua_State *L)
 
     key.len = len;
 
-    return ngx_http_lua_get_output_header(L, r, ctx, &key);
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            return luaL_error(L,
+                              "failed to set default content type: %d",
+                              (int) rc);
+        }
+
+        ctx->headers_set = 1;
+    }
+
+    return ngx_http_lua_get_output_header(L, r, &key);
 }
 
 
@@ -789,7 +811,16 @@ ngx_http_lua_ngx_header_set(lua_State *L)
         }
     }
 
-    ctx->headers_set = 1;
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            return luaL_error(L,
+                              "failed to set default content type: %d",
+                              (int) rc);
+        }
+
+        ctx->headers_set = 1;
+    }
 
     if (lua_type(L, 3) == LUA_TNIL) {
         ngx_str_null(&value);
@@ -814,7 +845,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
+                rc = ngx_http_lua_set_output_header(r, key, value,
                                                     i == 1 /* override */);
 
                 if (rc == NGX_ERROR) {
@@ -841,7 +872,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, ctx, key, value, 1 /* override */);
+    rc = ngx_http_lua_set_output_header(r, key, value, 1 /* override */);
 
     if (rc == NGX_ERROR) {
         return luaL_error(L, "failed to set header %s (error: %d)",
@@ -1050,8 +1081,7 @@ ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L)
         "local new_key = string.gsub(string.lower(key), '_', '-')\n"
         "if new_key ~= key then return tb[new_key] else return nil end";
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          headers_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
 
     /* metatable for ngx.req.get_headers(_, true) and
      * ngx.resp.get_headers(_, true) */
@@ -1211,7 +1241,15 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
         }
     }
 
-    ctx->headers_set = 1;
+    if (!ctx->headers_set) {
+        rc = ngx_http_lua_set_content_type(r);
+        if (rc != NGX_OK) {
+            *errmsg = "failed to set default content type";
+            return NGX_ERROR;
+        }
+
+        ctx->headers_set = 1;
+    }
 
     if (is_nil) {
         value.data = NULL;
@@ -1238,7 +1276,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
+                rc = ngx_http_lua_set_output_header(r, key, value,
                                                     override && i == 0);
 
                 if (rc == NGX_ERROR) {
@@ -1264,7 +1302,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, ctx, key, value, override);
+    rc = ngx_http_lua_set_output_header(r, key, value, override);
 
     if (rc == NGX_ERROR) {
         *errmsg = "failed to set header";
@@ -1332,8 +1370,7 @@ ngx_http_lua_ffi_req_header_set_single_value(ngx_http_request_t *r,
 int
 ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
     const u_char *key, size_t key_len,
-    u_char *key_buf, ngx_http_lua_ffi_str_t *values, int max_nvalues,
-    char **errmsg)
+    u_char *key_buf, ngx_http_lua_ffi_str_t *values, int max_nvalues)
 {
     int                  found;
     u_char               c, *p;
@@ -1350,10 +1387,19 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
-        *errmsg = "no ctx found";
+        /* *errmsg = "no ctx found"; */
         return NGX_ERROR;
     }
 
+    if (!ctx->headers_set) {
+        if (ngx_http_lua_set_content_type(r) != NGX_OK) {
+            /* *errmsg = "failed to set default content type"; */
+            return NGX_ERROR;
+        }
+
+        ctx->headers_set = 1;
+    }
+
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->transform_underscores_in_resp_headers
         && memchr(key, '_', key_len) != NULL)
@@ -1379,7 +1425,6 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
         {
             p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
             if (p == NULL) {
-                *errmsg = "no memory";
                 return NGX_ERROR;
             }
 
@@ -1393,8 +1438,8 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
         break;
 
     case 12:
-        if (ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0
-            && r->headers_out.content_type.len)
+        if (r->headers_out.content_type.len
+            && ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0)
         {
             values[0].data = r->headers_out.content_type.data;
             values[0].len = r->headers_out.content_type.len;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
index c52cd13..4852b2f 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
@@ -432,14 +432,10 @@ 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)
 {
-    ngx_str_t                    host;
-    ngx_http_lua_main_conf_t    *lmcf;
-    ngx_http_variable_value_t   *var;
+    ngx_str_t host;
 
     dd("server new value len: %d", (int) value->len);
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
     if (value->len) {
         host= *value;
 
@@ -453,10 +449,6 @@ ngx_http_set_host_header(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
         r->headers_in.server = *value;
     }
 
-    var = &r->variables[lmcf->host_var_index];
-    var->valid = 0;
-    var->not_found = 0;
-
     return ngx_http_set_builtin_header(r, hv, value);
 }
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
index cf94bd0..b908eae 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
@@ -106,12 +106,6 @@ static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
                  offsetof(ngx_http_headers_out_t, cache_control),
                  ngx_http_set_builtin_multi_header },
 
-#if defined(nginx_version) && nginx_version >= 1013009
-    { ngx_string("Link"),
-                 offsetof(ngx_http_headers_out_t, link),
-                 ngx_http_set_builtin_multi_header },
-#endif
-
     { ngx_null_string, 0, ngx_http_set_header }
 };
 
@@ -482,8 +476,8 @@ ngx_http_clear_builtin_header(ngx_http_request_t *r,
 
 
 ngx_int_t
-ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
-    ngx_str_t key, ngx_str_t value, unsigned override)
+ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
+    ngx_str_t value, unsigned override)
 {
     ngx_http_lua_header_val_t         hv;
     ngx_http_lua_set_header_t        *handlers = ngx_http_lua_set_handlers;
@@ -514,10 +508,6 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
         hv.offset = handlers[i].offset;
         hv.handler = handlers[i].handler;
 
-        if (hv.handler == ngx_http_set_content_type_header) {
-            ctx->mime_set = 1;
-        }
-
         break;
     }
 
@@ -538,7 +528,7 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
 
 int
 ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, ngx_str_t *key)
+    ngx_str_t *key)
 {
     ngx_table_elt_t            *h;
     ngx_list_part_t            *part;
@@ -560,8 +550,8 @@ ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
         break;
 
     case 12:
-        if (ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0
-            && r->headers_out.content_type.len)
+        if (r->headers_out.content_type.len
+            && ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0)
         {
             lua_pushlstring(L, (char *) r->headers_out.content_type.data,
                             r->headers_out.content_type.len);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
index 6ec1fe3..ef5e6d4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
@@ -12,10 +12,10 @@
 #include "ngx_http_lua_common.h"
 
 
-ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, ngx_str_t key, ngx_str_t value, unsigned override);
+ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
+    ngx_str_t value, unsigned override);
 int ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, ngx_str_t *key);
+    ngx_str_t *key);
 
 
 #endif /* _NGX_HTTP_LUA_HEADERS_OUT_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
index 76acdc3..4a722a0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
@@ -12,7 +12,6 @@
 
 #include "ngx_http_lua_initworkerby.h"
 #include "ngx_http_lua_util.h"
-#include "ngx_http_lua_pipe.h"
 
 
 static u_char *ngx_http_lua_log_init_worker_error(ngx_log_t *log,
@@ -26,7 +25,6 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     void                        *cur, *prev;
     ngx_uint_t                   i;
     ngx_conf_t                   conf;
-    ngx_conf_file_t              cf_file;
     ngx_cycle_t                 *fake_cycle;
     ngx_module_t               **modules;
     ngx_open_file_t             *file, *ofile;
@@ -66,21 +64,8 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
 
         return NGX_OK;
     }
-
-#ifdef HAVE_NGX_LUA_PIPE
-    if (ngx_http_lua_pipe_add_signal_handler(cycle) != NGX_OK) {
-        return NGX_ERROR;
-    }
-#endif
-
 #endif  /* NGX_WIN32 */
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-    if (lmcf->set_sa_restart) {
-        ngx_http_lua_set_sa_restart(ngx_cycle->log);
-    }
-#endif
-
     if (lmcf->init_worker_handler == NULL) {
         return NGX_OK;
     }
@@ -181,10 +166,6 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
     conf.pool = fake_cycle->pool;
     conf.log = cycle->log;
 
-    ngx_memzero(&cf_file, sizeof(cf_file));
-    cf_file.file.name = cycle->conf_file;
-    conf.conf_file = &cf_file;
-
     http_ctx.loc_conf = ngx_pcalloc(conf.pool,
                                     sizeof(void *) * ngx_http_max_module);
     if (http_ctx.loc_conf == NULL) {
diff --git a/debian/modules/http-lua/src/ngx_http_lua_input_filters.c b/debian/modules/http-lua/src/ngx_http_lua_input_filters.c
deleted file mode 100644
index 87a9d8c..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_input_filters.c
+++ /dev/null
@@ -1,137 +0,0 @@
-
-/*
- * Copyright (C) by OpenResty Inc.
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t
-ngx_http_lua_read_bytes(ngx_buf_t *src, ngx_chain_t *buf_in, size_t *rest,
-    ssize_t bytes, ngx_log_t *log)
-{
-    if (bytes == 0) {
-        return NGX_ERROR;
-    }
-
-    if ((size_t) bytes >= *rest) {
-
-        buf_in->buf->last += *rest;
-        src->pos += *rest;
-        *rest = 0;
-
-        return NGX_OK;
-    }
-
-    /* bytes < *rest */
-
-    buf_in->buf->last += bytes;
-    src->pos += bytes;
-    *rest -= bytes;
-
-    return NGX_AGAIN;
-}
-
-
-ngx_int_t
-ngx_http_lua_read_all(ngx_buf_t *src, ngx_chain_t *buf_in, ssize_t bytes,
-    ngx_log_t *log)
-{
-    if (bytes == 0) {
-        return NGX_OK;
-    }
-
-    buf_in->buf->last += bytes;
-    src->pos += bytes;
-
-    return NGX_AGAIN;
-}
-
-
-ngx_int_t
-ngx_http_lua_read_any(ngx_buf_t *src, ngx_chain_t *buf_in, size_t *max,
-    ssize_t bytes, ngx_log_t *log)
-{
-    if (bytes == 0) {
-        return NGX_ERROR;
-    }
-
-    if (bytes >= (ssize_t) *max) {
-        bytes = (ssize_t) *max;
-    }
-
-    buf_in->buf->last += bytes;
-    src->pos += bytes;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_lua_read_line(ngx_buf_t *src, ngx_chain_t *buf_in, ssize_t bytes,
-    ngx_log_t *log)
-{
-    u_char                      *dst;
-    u_char                       c;
-#if (NGX_DEBUG)
-    u_char                      *begin;
-#endif
-
-#if (NGX_DEBUG)
-    begin = src->pos;
-#endif
-
-    if (bytes == 0) {
-        return NGX_ERROR;
-    }
-
-    dd("already read: %p: %.*s", buf_in,
-       (int) (buf_in->buf->last - buf_in->buf->pos), buf_in->buf->pos);
-
-    dd("data read: %.*s", (int) bytes, src->pos);
-
-    dst = buf_in->buf->last;
-
-    while (bytes--) {
-
-        c = *src->pos++;
-
-        switch (c) {
-        case '\n':
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
-                           "lua read the final line part: \"%*s\"",
-                           src->pos - 1 - begin, begin);
-
-            buf_in->buf->last = dst;
-
-            dd("read a line: %p: %.*s", buf_in,
-               (int) (buf_in->buf->last - buf_in->buf->pos), buf_in->buf->pos);
-
-            return NGX_OK;
-
-        case '\r':
-            /* ignore it */
-            break;
-
-        default:
-            *dst++ = c;
-            break;
-        }
-    }
-
-#if (NGX_DEBUG)
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "lua read partial line data: %*s", dst - begin, begin);
-#endif
-
-    buf_in->buf->last = dst;
-
-    return NGX_AGAIN;
-}
diff --git a/debian/modules/http-lua/src/ngx_http_lua_input_filters.h b/debian/modules/http-lua/src/ngx_http_lua_input_filters.h
deleted file mode 100644
index 046d40f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_input_filters.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-/*
- * Copyright (C) by OpenResty Inc.
- */
-
-
-#ifndef _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_
-#define _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_read_bytes(ngx_buf_t *src, ngx_chain_t *buf_in,
-    size_t *rest, ssize_t bytes, ngx_log_t *log);
-
-ngx_int_t ngx_http_lua_read_all(ngx_buf_t *src, ngx_chain_t *buf_in,
-    ssize_t bytes, ngx_log_t *log);
-
-ngx_int_t ngx_http_lua_read_any(ngx_buf_t *src, ngx_chain_t *buf_in,
-    size_t *max, ssize_t bytes, ngx_log_t *log);
-
-ngx_int_t ngx_http_lua_read_line(ngx_buf_t *src, ngx_chain_t *buf_in,
-    ssize_t bytes, ngx_log_t *log);
-
-
-#endif /* _NGX_HTTP_LUA_INPUT_FILTERS_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_logby.c b/debian/modules/http-lua/src/ngx_http_lua_logby.c
index 32d1cba..0f1d2f3 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_logby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_logby.c
@@ -38,9 +38,9 @@ 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 */
     ngx_http_lua_set_req(L, r);
 
-#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -64,7 +64,6 @@ ngx_http_lua_log_by_lua_env(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif /* OPENRESTY_LUAJIT */
 }
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_misc.c b/debian/modules/http-lua/src/ngx_http_lua_misc.c
index 145ca9b..f96e2f2 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_misc.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_misc.c
@@ -286,33 +286,6 @@ ngx_http_lua_ffi_headers_sent(ngx_http_request_t *r)
 
     return r->header_sent ? 1 : 0;
 }
-
-
-int
-ngx_http_lua_ffi_get_conf_env(u_char *name, u_char **env_buf, size_t *name_len)
-{
-    ngx_uint_t            i;
-    ngx_str_t            *var;
-    ngx_core_conf_t      *ccf;
-
-    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                           ngx_core_module);
-
-    var = ccf->env.elts;
-
-    for (i = 0; i < ccf->env.nelts; i++) {
-        if (var[i].data[var[i].len] == '='
-            && ngx_strncmp(name, var[i].data, var[i].len) == 0)
-        {
-            *env_buf = var[i].data;
-            *name_len = var[i].len;
-
-            return NGX_OK;
-        }
-    }
-
-    return NGX_DECLINED;
-}
 #endif /* NGX_LUA_NO_FFI_API */
 
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_module.c b/debian/modules/http-lua/src/ngx_http_lua_module.c
index 2a3f5d5..ae8bc0e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_module.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_module.c
@@ -29,7 +29,6 @@
 #include "ngx_http_lua_ssl_session_storeby.h"
 #include "ngx_http_lua_ssl_session_fetchby.h"
 #include "ngx_http_lua_headers.h"
-#include "ngx_http_lua_pipe.h"
 
 
 static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
@@ -77,13 +76,6 @@ static ngx_conf_bitmask_t  ngx_http_lua_ssl_protocols[] = {
 
 static ngx_command_t ngx_http_lua_cmds[] = {
 
-    { ngx_string("lua_load_resty_core"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, load_resty_core),
-      NULL },
-
     { ngx_string("lua_max_running_timers"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -112,13 +104,6 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       0,
       NULL },
 
-    { ngx_string("lua_sa_restart"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, set_sa_restart),
-      NULL },
-
 #if (NGX_PCRE)
     { ngx_string("lua_regex_cache_max_entries"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
@@ -653,19 +638,9 @@ ngx_http_lua_init(ngx_conf_t *cf)
 #if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
     ngx_pool_cleanup_t         *cln;
 #endif
-    ngx_str_t                   name = ngx_string("host");
-
-    if (ngx_process == NGX_PROCESS_SIGNALLER || ngx_test_config) {
-        return NGX_OK;
-    }
 
     lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
 
-    lmcf->host_var_index = ngx_http_get_variable_index(cf, &name);
-    if (lmcf->host_var_index == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
     if (ngx_http_lua_prev_cycle != ngx_cycle) {
         ngx_http_lua_prev_cycle = ngx_cycle;
         multi_http_blocks = 0;
@@ -750,11 +725,6 @@ ngx_http_lua_init(ngx_conf_t *cf)
 
     cln->data = lmcf;
     cln->handler = ngx_http_lua_sema_mm_cleanup;
-
-#ifdef HAVE_NGX_LUA_PIPE
-    ngx_http_lua_pipe_init();
-#endif
-
 #endif
 
 #if nginx_version >= 1011011
@@ -770,19 +740,6 @@ ngx_http_lua_init(ngx_conf_t *cf)
     if (lmcf->lua == NULL) {
         dd("initializing lua vm");
 
-#ifndef OPENRESTY_LUAJIT
-        if (ngx_process != NGX_PROCESS_SIGNALLER && !ngx_test_config) {
-            ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
-                          "detected a LuaJIT version which is not OpenResty's"
-                          "; many optimizations will be disabled and "
-                          "performance will be compromised (see "
-                          "https://github.com/openresty/luajit2 for "
-                          "OpenResty's LuaJIT or, even better, consider using "
-                          "the OpenResty releases from https://openresty.org/"
-                          "en/download.html)");
-        }
-#endif
-
         ngx_http_lua_content_length_hash =
                                   ngx_http_lua_hash_literal("content-length");
         ngx_http_lua_location_hash = ngx_http_lua_hash_literal("location");
@@ -884,7 +841,6 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
      */
 
     lmcf->pool = cf->pool;
-    lmcf->load_resty_core = NGX_CONF_UNSET;
     lmcf->max_pending_timers = NGX_CONF_UNSET;
     lmcf->max_running_timers = NGX_CONF_UNSET;
 #if (NGX_PCRE)
@@ -894,8 +850,6 @@ ngx_http_lua_create_main_conf(ngx_conf_t *cf)
     lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
     lmcf->postponed_to_access_phase_end = NGX_CONF_UNSET;
 
-    lmcf->set_sa_restart = NGX_CONF_UNSET;
-
 #if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
     lmcf->malloc_trim_cycle = NGX_CONF_UNSET_UINT;
 #endif
@@ -918,10 +872,6 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
 {
     ngx_http_lua_main_conf_t *lmcf = conf;
 
-    if (lmcf->load_resty_core == NGX_CONF_UNSET) {
-        lmcf->load_resty_core = 1;
-    }
-
 #if (NGX_PCRE)
     if (lmcf->regex_cache_max_entries == NGX_CONF_UNSET) {
         lmcf->regex_cache_max_entries = 1024;
@@ -940,12 +890,6 @@ ngx_http_lua_init_main_conf(ngx_conf_t *cf, void *conf)
         lmcf->max_running_timers = 256;
     }
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-    if (lmcf->set_sa_restart == NGX_CONF_UNSET) {
-        lmcf->set_sa_restart = 1;
-    }
-#endif
-
 #if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
     if (lmcf->malloc_trim_cycle == NGX_CONF_UNSET_UINT) {
         lmcf->malloc_trim_cycle = 1000;  /* number of reqs */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ndk.c b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
index 6344183..24b80b4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ndk.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
@@ -186,47 +186,6 @@ ngx_http_lua_inject_ndk_api(lua_State *L)
 }
 
 
-int
-ngx_http_lua_ffi_ndk_lookup_directive(const u_char *var_data,
-    size_t var_len, ndk_set_var_value_pt *func)
-{
-    *func = ngx_http_lookup_ndk_set_var_directive((u_char *) var_data, var_len);
-
-    if (*func == NULL) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_ndk_set_var_get(ngx_http_request_t *r,
-    ndk_set_var_value_pt func, const u_char *arg_data, size_t arg_len,
-    ngx_http_lua_ffi_str_t *value)
-{
-    ngx_int_t                            rc;
-    ngx_str_t                            res;
-    ngx_http_variable_value_t            arg;
-
-    ngx_memzero(&arg, sizeof(ngx_http_variable_value_t));
-    arg.valid = 1;
-
-    arg.data = (u_char *) arg_data;
-    arg.len = arg_len;
-
-    rc = func(r, &res, &arg);
-
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    value->data = res.data;
-    value->len = res.len;
-    return NGX_OK;
-}
-
-
 #endif /* defined(NDK) && NDK */
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pipe.c b/debian/modules/http-lua/src/ngx_http_lua_pipe.c
deleted file mode 100644
index 8c8221f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_pipe.c
+++ /dev/null
@@ -1,2475 +0,0 @@
-
-/*
- * Copyright (C) by OpenResty Inc.
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_common.h"
-#include "ngx_http_lua_input_filters.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_pipe.h"
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-#include <sys/signalfd.h>
-#endif
-
-
-#ifdef HAVE_NGX_LUA_PIPE
-static ngx_rbtree_node_t *ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key);
-#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
-static void ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
-    void *ucontext);
-#endif
-static void ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev);
-static ssize_t ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf,
-    size_t size);
-static ssize_t ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf,
-    size_t size);
-static ngx_int_t ngx_http_lua_pipe_close_helper(
-    ngx_http_lua_pipe_ctx_t *pipe_ctx, ngx_event_t *ev, int forced);
-static ngx_int_t ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe,
-    int forced);
-static ngx_int_t ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe,
-    int forced);
-static ngx_int_t ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe,
-    int forced);
-static void ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc,
-    int forced);
-static ngx_int_t ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size);
-static void ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx,
-    u_char *errbuf, size_t *errbuf_size);
-static void ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size);
-static ngx_int_t ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx);
-static ngx_int_t ngx_http_lua_pipe_read_all(void *data, ssize_t bytes);
-static ngx_int_t ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes);
-static ngx_int_t ngx_http_lua_pipe_read_line(void *data, ssize_t bytes);
-static ngx_int_t ngx_http_lua_pipe_read_any(void *data, ssize_t bytes);
-static ngx_int_t ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx);
-static ngx_int_t ngx_http_lua_pipe_init_ctx(
-    ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd, ngx_pool_t *pool,
-    u_char *errbuf, size_t *errbuf_size);
-static ngx_int_t ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx);
-static int ngx_http_lua_pipe_read_stdout_retval(
-    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
-static int ngx_http_lua_pipe_read_stderr_retval(
-    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
-static int ngx_http_lua_pipe_read_retval_helper(
-    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L, int from_stderr);
-static int ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L);
-static int ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L);
-static void ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
-    ngx_http_lua_co_ctx_t *wait_co_ctx);
-static void ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev);
-static void ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev);
-static void ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev);
-static void ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev);
-static ngx_int_t ngx_http_lua_pipe_resume(ngx_http_request_t *r);
-static void ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev);
-static void ngx_http_lua_pipe_clear_event(ngx_event_t *ev);
-static void ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data);
-static void ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data);
-static void ngx_http_lua_pipe_proc_write_cleanup(void *data);
-static void ngx_http_lua_pipe_proc_wait_cleanup(void *data);
-
-
-static ngx_rbtree_t       ngx_http_lua_pipe_rbtree;
-static ngx_rbtree_node_t  ngx_http_lua_pipe_proc_sentinel;
-
-
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-static int                                ngx_http_lua_signalfd;
-static struct signalfd_siginfo            ngx_http_lua_pipe_notification;
-
-#define ngx_http_lua_read_sigfd           ngx_http_lua_signalfd
-
-#else
-static int                                ngx_http_lua_sigchldfd[2];
-static u_char                             ngx_http_lua_pipe_notification[1];
-
-#define ngx_http_lua_read_sigfd           ngx_http_lua_sigchldfd[0]
-#define ngx_http_lua_write_sigfd          ngx_http_lua_sigchldfd[1]
-#endif
-
-
-static ngx_connection_t                  *ngx_http_lua_sigfd_conn = NULL;
-
-
-/* The below signals are ignored by Nginx.
- * We need to reset them for the spawned child processes. */
-ngx_http_lua_pipe_signal_t ngx_signals[] = {
-    { SIGSYS, "SIGSYS" },
-    { SIGPIPE, "SIGPIPE" },
-    { 0, NULL }
-};
-
-
-enum {
-    PIPE_ERR_CLOSED = 1,
-    PIPE_ERR_SYSCALL,
-    PIPE_ERR_NOMEM,
-    PIPE_ERR_TIMEOUT,
-    PIPE_ERR_ADD_READ_EV,
-    PIPE_ERR_ADD_WRITE_EV
-};
-
-
-enum {
-    PIPE_READ_ALL = 0,
-    PIPE_READ_BYTES,
-    PIPE_READ_LINE,
-    PIPE_READ_ANY
-};
-
-
-#define REASON_EXIT         "exit"
-#define REASON_SIGNAL       "signal"
-#define REASON_UNKNOWN      "unknown"
-
-#define REASON_RUNNING_CODE  0
-#define REASON_EXIT_CODE     1
-#define REASON_SIGNAL_CODE   2
-#define REASON_UNKNOWN_CODE  3
-
-
-void
-ngx_http_lua_pipe_init(void)
-{
-    ngx_rbtree_init(&ngx_http_lua_pipe_rbtree,
-                    &ngx_http_lua_pipe_proc_sentinel, ngx_rbtree_insert_value);
-}
-
-
-ngx_int_t
-ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle)
-{
-    ngx_event_t         *rev;
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-    sigset_t             set;
-
-#else
-    int                  rc;
-    struct sigaction     sa;
-#endif
-
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-    if (sigemptyset(&set) != 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe init signal set failed");
-        return NGX_ERROR;
-    }
-
-    if (sigaddset(&set, SIGCHLD) != 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe add SIGCHLD to signal set failed");
-        return NGX_ERROR;
-    }
-
-    if (sigprocmask(SIG_BLOCK, &set, NULL) != 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe block SIGCHLD failed");
-        return NGX_ERROR;
-    }
-
-    ngx_http_lua_signalfd = signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);
-    if (ngx_http_lua_signalfd < 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe create signalfd instance failed");
-        return NGX_ERROR;
-    }
-
-#else /* !(NGX_HTTP_LUA_HAVE_SIGNALFD) */
-#   if (NGX_HTTP_LUA_HAVE_PIPE2)
-    rc = pipe2(ngx_http_lua_sigchldfd, O_NONBLOCK|O_CLOEXEC);
-#   else
-    rc = pipe(ngx_http_lua_sigchldfd);
-#   endif
-
-    if (rc == -1) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe init SIGCHLD fd failed");
-        return NGX_ERROR;
-    }
-
-#   if !(NGX_HTTP_LUA_HAVE_PIPE2)
-    if (ngx_nonblocking(ngx_http_lua_read_sigfd) == -1) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
-                      ngx_nonblocking_n " SIGCHLD read fd failed");
-        goto failed;
-    }
-
-    if (ngx_nonblocking(ngx_http_lua_write_sigfd) == -1) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
-                      ngx_nonblocking_n " SIGCHLD write fd failed");
-        goto failed;
-    }
-
-    /* it's ok not to set the pipe fd with O_CLOEXEC. This requires
-     * extra syscall */
-#   endif /* !(NGX_HTTP_LUA_HAVE_PIPE2) */
-#endif /* NGX_HTTP_LUA_HAVE_SIGNALFD */
-
-    ngx_http_lua_sigfd_conn = ngx_get_connection(ngx_http_lua_read_sigfd,
-                                                 cycle->log);
-    if (ngx_http_lua_sigfd_conn == NULL) {
-        goto failed;
-    }
-
-    ngx_http_lua_sigfd_conn->log = cycle->log;
-    ngx_http_lua_sigfd_conn->recv = ngx_http_lua_pipe_fd_read;
-    rev = ngx_http_lua_sigfd_conn->read;
-    rev->log = ngx_http_lua_sigfd_conn->log;
-    rev->handler = ngx_http_lua_pipe_sigchld_event_handler;
-
-#ifdef HAVE_SOCKET_CLOEXEC_PATCH
-    rev->skip_socket_leak_check = 1;
-#endif
-
-    if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
-        goto failed;
-    }
-
-#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
-    ngx_memzero(&sa, sizeof(struct sigaction));
-    sa.sa_sigaction = ngx_http_lua_pipe_sigchld_handler;
-    sa.sa_flags = SA_SIGINFO;
-
-    if (sigemptyset(&sa.sa_mask) != 0) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe init signal mask failed");
-        goto failed;
-    }
-
-    if (sigaction(SIGCHLD, &sa, NULL) == -1) {
-        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
-                      "lua pipe sigaction(SIGCHLD) failed");
-        goto failed;
-    }
-#endif
-
-    return NGX_OK;
-
-failed:
-
-    if (ngx_http_lua_sigfd_conn != NULL) {
-        ngx_close_connection(ngx_http_lua_sigfd_conn);
-        ngx_http_lua_sigfd_conn = NULL;
-    }
-
-    if (close(ngx_http_lua_read_sigfd) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
-                      "lua pipe close the read sigfd failed");
-    }
-
-#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
-    if (close(ngx_http_lua_write_sigfd) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
-                      "lua pipe close the write sigfd failed");
-    }
-#endif
-
-    return NGX_ERROR;
-}
-
-
-static ngx_rbtree_node_t *
-ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key)
-{
-    ngx_rbtree_node_t    *node, *sentinel;
-
-    node = ngx_http_lua_pipe_rbtree.root;
-    sentinel = ngx_http_lua_pipe_rbtree.sentinel;
-
-    while (node != sentinel) {
-        if (key < node->key) {
-            node = node->left;
-            continue;
-        }
-
-        if (key > node->key) {
-            node = node->right;
-            continue;
-        }
-
-        return node;
-    }
-
-    return NULL;
-}
-
-
-#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
-static void
-ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
-    void *ucontext)
-{
-    ngx_err_t                        err, saved_err;
-    ngx_int_t                        n;
-
-    saved_err = ngx_errno;
-
-    for ( ;; ) {
-        n = write(ngx_http_lua_write_sigfd, ngx_http_lua_pipe_notification,
-                  sizeof(ngx_http_lua_pipe_notification));
-
-        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
-                       "lua pipe SIGCHLD fd write siginfo:%p", siginfo);
-
-        if (n >= 0) {
-            break;
-        }
-
-        err = ngx_errno;
-
-        if (err != NGX_EINTR) {
-            if (err != NGX_EAGAIN) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, err,
-                              "lua pipe SIGCHLD fd write failed");
-            }
-
-            break;
-        }
-
-        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, err,
-                       "lua pipe SIGCHLD fd write was interrupted");
-    }
-
-    ngx_set_errno(saved_err);
-}
-#endif
-
-
-static void
-ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev)
-{
-    int                              n;
-    int                              status;
-    ngx_pid_t                        pid;
-    ngx_connection_t                *c = ev->data;
-    ngx_rbtree_node_t               *node;
-    ngx_http_lua_pipe_node_t        *pipe_node;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
-                   "lua pipe reaping children");
-
-    for ( ;; ) {
-#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
-        n = c->recv(c, (u_char *) &ngx_http_lua_pipe_notification,
-#else
-        n = c->recv(c, ngx_http_lua_pipe_notification,
-#endif
-                    sizeof(ngx_http_lua_pipe_notification));
-
-        if (n <= 0) {
-            if (n == NGX_ERROR) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe SIGCHLD fd read failed");
-            }
-
-            break;
-        }
-
-        for ( ;; ) {
-            pid = waitpid(-1, &status, WNOHANG);
-
-            if (pid == 0) {
-                break;
-            }
-
-            if (pid < 0) {
-                if (ngx_errno != NGX_ECHILD) {
-                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                                  "lua pipe waitpid failed");
-                }
-
-                break;
-            }
-
-            /* This log is ported from Nginx's signal handler since we override
-             * or block it in this implementation. */
-            ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
-                          "signal %d (SIGCHLD) received from %P",
-                          SIGCHLD, pid);
-
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "lua pipe SIGCHLD fd read pid:%P status:%d", pid,
-                           status);
-
-            node = ngx_http_lua_pipe_lookup_pid(pid);
-            if (node != NULL) {
-                pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-                if (pipe_node->wait_co_ctx != NULL) {
-                    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                                   "lua pipe resume process:%p waiting for %P",
-                                   pipe_node->proc, pid);
-
-                    /*
-                     * We need the extra parentheses around the first argument
-                     * of ngx_post_event() just to work around macro issues in
-                     * nginx cores older than 1.7.12 (exclusive).
-                     */
-                    ngx_post_event((&pipe_node->wait_co_ctx->sleep),
-                                   &ngx_posted_events);
-                }
-
-                pipe_node->proc->pipe->dead = 1;
-
-                if (WIFSIGNALED(status)) {
-                    pipe_node->status = WTERMSIG(status);
-                    pipe_node->reason_code = REASON_SIGNAL_CODE;
-
-                } else if (WIFEXITED(status)) {
-                    pipe_node->status = WEXITSTATUS(status);
-                    pipe_node->reason_code = REASON_EXIT_CODE;
-
-                } else {
-                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                                  "lua pipe unknown exit status %d from "
-                                  "process %P", status, pid);
-                    pipe_node->status = status;
-                    pipe_node->reason_code = REASON_UNKNOWN_CODE;
-                }
-            }
-        }
-    }
-}
-
-
-static ssize_t
-ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf, size_t size)
-{
-    ssize_t       n;
-    ngx_err_t     err;
-    ngx_event_t  *rev;
-
-    rev = c->read;
-
-    do {
-        n = read(c->fd, buf, size);
-
-        err = ngx_errno;
-
-        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "read: fd:%d %z of %uz", c->fd, n, size);
-
-        if (n == 0) {
-            rev->ready = 0;
-            rev->eof = 1;
-            return 0;
-        }
-
-        if (n > 0) {
-            if ((size_t) n < size
-                && !(ngx_event_flags & NGX_USE_GREEDY_EVENT))
-            {
-                rev->ready = 0;
-            }
-
-            return n;
-        }
-
-        if (err == NGX_EAGAIN || err == NGX_EINTR) {
-            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
-                           "read() not ready");
-            n = NGX_AGAIN;
-
-        } else {
-            n = ngx_connection_error(c, err, "read() failed");
-            break;
-        }
-
-    } while (err == NGX_EINTR);
-
-    rev->ready = 0;
-
-    if (n == NGX_ERROR) {
-        rev->error = 1;
-    }
-
-    return n;
-}
-
-
-static ssize_t
-ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf, size_t size)
-{
-    ssize_t       n;
-    ngx_err_t     err;
-    ngx_event_t  *wev;
-
-    wev = c->write;
-
-    do {
-        n = write(c->fd, buf, size);
-
-        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "write: fd:%d %z of %uz", c->fd, n, size);
-
-        if (n >= 0) {
-            if ((size_t) n != size) {
-                wev->ready = 0;
-            }
-
-            return n;
-        }
-
-        err = ngx_errno;
-
-        if (err == NGX_EAGAIN || err == NGX_EINTR) {
-            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
-                           "write() not ready");
-            n = NGX_AGAIN;
-
-        } else if (err != NGX_EPIPE) {
-            n = ngx_connection_error(c, err, "write() failed");
-            break;
-        }
-
-    } while (err == NGX_EINTR);
-
-    wev->ready = 0;
-
-    if (n == NGX_ERROR) {
-        wev->error = 1;
-    }
-
-    return n;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_spawn(ngx_http_lua_ffi_pipe_proc_t *proc,
-    const char *file, const char **argv, int merge_stderr, size_t buffer_size,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    int                             rc;
-    int                             in[2];
-    int                             out[2];
-    int                             err[2];
-    int                             stdin_fd, stdout_fd, stderr_fd;
-    int                             errlog_fd, temp_errlog_fd;
-    ngx_pid_t                       pid;
-    ssize_t                         pool_size;
-    ngx_pool_t                     *pool;
-    ngx_uint_t                      i;
-    ngx_listening_t                *ls;
-    ngx_http_lua_pipe_t            *pp;
-    ngx_rbtree_node_t              *node;
-    ngx_http_lua_pipe_node_t       *pipe_node;
-    struct sigaction                sa;
-    ngx_http_lua_pipe_signal_t     *sig;
-    sigset_t                        set;
-
-    pool_size = ngx_align(NGX_MIN_POOL_SIZE + buffer_size * 2,
-                          NGX_POOL_ALIGNMENT);
-
-    pool = ngx_create_pool(pool_size, ngx_cycle->log);
-    if (pool == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    pp = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_t)
-                     + offsetof(ngx_rbtree_node_t, color)
-                     + sizeof(ngx_http_lua_pipe_node_t));
-    if (pp == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
-                       - errbuf;
-        goto free_pool;
-    }
-
-    rc = pipe(in);
-    if (rc == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto free_pool;
-    }
-
-    rc = pipe(out);
-    if (rc == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto close_in_fd;
-    }
-
-    if (!merge_stderr) {
-        rc = pipe(err);
-        if (rc == -1) {
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                        "pipe failed: %s", strerror(errno))
-                           - errbuf;
-            goto close_in_out_fd;
-        }
-    }
-
-    pid = fork();
-    if (pid == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "fork failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto close_in_out_err_fd;
-    }
-
-    if (pid == 0) {
-
-#if (NGX_HAVE_CPU_AFFINITY)
-        /* reset the CPU affinity mask */
-        ngx_uint_t     log_level;
-        ngx_cpuset_t   child_cpu_affinity;
-
-        if (ngx_process == NGX_PROCESS_WORKER
-            && ngx_get_cpu_affinity(ngx_worker) != NULL)
-        {
-            CPU_ZERO(&child_cpu_affinity);
-
-            for (i = 0; i < (ngx_uint_t) ngx_min(ngx_ncpu, CPU_SETSIZE); i++) {
-                CPU_SET(i, &child_cpu_affinity);
-            }
-
-            log_level = ngx_cycle->log->log_level;
-            ngx_cycle->log->log_level = NGX_LOG_WARN;
-            ngx_setaffinity(&child_cpu_affinity, ngx_cycle->log);
-            ngx_cycle->log->log_level = log_level;
-        }
-#endif
-
-        /* reset the handler of ignored signals to the default */
-        for (sig = ngx_signals; sig->signo != 0; sig++) {
-            ngx_memzero(&sa, sizeof(struct sigaction));
-            sa.sa_handler = SIG_DFL;
-
-            if (sigemptyset(&sa.sa_mask) != 0) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child init signal mask failed");
-                exit(EXIT_FAILURE);
-            }
-
-            if (sigaction(sig->signo, &sa, NULL) == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child reset signal handler for %s "
-                              "failed", sig->signame);
-                exit(EXIT_FAILURE);
-            }
-        }
-
-        /* reset signal mask */
-        if (sigemptyset(&set) != 0) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child init signal set failed");
-            exit(EXIT_FAILURE);
-        }
-
-        if (sigprocmask(SIG_SETMASK, &set, NULL) != 0) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child reset signal mask failed");
-            exit(EXIT_FAILURE);
-        }
-
-        /* close listening socket fd */
-        ls = ngx_cycle->listening.elts;
-        for (i = 0; i < ngx_cycle->listening.nelts; i++) {
-            if (ngx_close_socket(ls[i].fd) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_socket_errno,
-                              "lua pipe child " ngx_close_socket_n
-                              " %V failed", &ls[i].addr_text);
-            }
-        }
-
-        /* close and dup pipefd */
-        if (close(in[1]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "lua pipe child failed to close the in[1] "
-                          "pipe fd");
-        }
-
-        if (close(out[0]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "lua pipe child failed to close the out[0] "
-                          "pipe fd");
-        }
-
-        if (ngx_cycle->log->file && ngx_cycle->log->file->fd == STDERR_FILENO) {
-            errlog_fd = ngx_cycle->log->file->fd;
-            temp_errlog_fd = dup(errlog_fd);
-
-            if (temp_errlog_fd == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child dup errlog fd failed");
-                exit(EXIT_FAILURE);
-            }
-
-            if (ngx_cloexec(temp_errlog_fd) == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child new errlog fd " ngx_cloexec_n
-                              " failed");
-            }
-
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "lua pipe child dup old errlog fd %d to new fd %d",
-                           ngx_cycle->log->file->fd, temp_errlog_fd);
-
-            ngx_cycle->log->file->fd = temp_errlog_fd;
-        }
-
-        if (dup2(in[0], STDIN_FILENO) == -1) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child dup2 stdin failed");
-            exit(EXIT_FAILURE);
-        }
-
-        if (dup2(out[1], STDOUT_FILENO) == -1) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child dup2 stdout failed");
-            exit(EXIT_FAILURE);
-        }
-
-        if (merge_stderr) {
-            if (dup2(STDOUT_FILENO, STDERR_FILENO) == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child dup2 stderr failed");
-                exit(EXIT_FAILURE);
-            }
-
-        } else {
-            if (close(err[0]) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                              "lua pipe child failed to close the err[0] "
-                              "pipe fd");
-            }
-
-            if (dup2(err[1], STDERR_FILENO) == -1) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe child dup2 stderr failed");
-                exit(EXIT_FAILURE);
-            }
-        }
-
-        if (execvp(file, (char * const *) argv) == -1) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "lua pipe child execvp() failed while executing %s",
-                          file);
-        }
-
-        exit(EXIT_FAILURE);
-    }
-
-    /* parent process */
-    if (close(in[0]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "lua pipe: failed to close the in[0] pipe fd");
-    }
-
-    stdin_fd = in[1];
-
-    if (ngx_nonblocking(stdin_fd) == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    ngx_nonblocking_n " failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto close_in_out_err_fd;
-    }
-
-    pp->stdin_fd = stdin_fd;
-
-    if (close(out[1]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "lua pipe: failed to close the out[1] pipe fd");
-    }
-
-    stdout_fd = out[0];
-
-    if (ngx_nonblocking(stdout_fd) == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    ngx_nonblocking_n " failed: %s",
-                                    strerror(errno))
-                       - errbuf;
-        goto close_in_out_err_fd;
-    }
-
-    pp->stdout_fd = stdout_fd;
-
-    if (!merge_stderr) {
-        if (close(err[1]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "lua pipe: failed to close the err[1] pipe fd");
-        }
-
-        stderr_fd = err[0];
-
-        if (ngx_nonblocking(stderr_fd) == -1) {
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                        ngx_nonblocking_n " failed: %s",
-                                        strerror(errno))
-                           - errbuf;
-            goto close_in_out_err_fd;
-        }
-
-        pp->stderr_fd = stderr_fd;
-    }
-
-    node = (ngx_rbtree_node_t *) (pp + 1);
-    node->key = pid;
-    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-    pipe_node->proc = proc;
-    ngx_rbtree_insert(&ngx_http_lua_pipe_rbtree, node);
-
-    pp->node = node;
-    pp->pool = pool;
-    pp->merge_stderr = merge_stderr;
-    pp->buffer_size = buffer_size;
-
-    proc->_pid = pid;
-    proc->write_timeout = 10000;
-    proc->stdout_read_timeout = 10000;
-    proc->stderr_read_timeout = 10000;
-    proc->wait_timeout = 10000;
-    proc->pipe = pp;
-
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe spawn process:%p pid:%P merge_stderr:%d "
-                   "buffer_size:%uz", proc, pid, merge_stderr, buffer_size);
-    return NGX_OK;
-
-close_in_out_err_fd:
-
-    if (!merge_stderr) {
-        if (close(err[0]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "failed to close the err[0] pipe fd");
-        }
-
-        if (close(err[1]) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                          "failed to close the err[1] pipe fd");
-        }
-    }
-
-close_in_out_fd:
-
-    if (close(out[0]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "failed to close the out[0] pipe fd");
-    }
-
-    if (close(out[1]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "failed to close the out[1] pipe fd");
-    }
-
-close_in_fd:
-
-    if (close(in[0]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "failed to close the in[0] pipe fd");
-    }
-
-    if (close(in[1]) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                      "failed to close the in[1] pipe fd");
-    }
-
-free_pool:
-
-    ngx_destroy_pool(pool);
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_close_helper(ngx_http_lua_pipe_ctx_t *pipe_ctx,
-    ngx_event_t *ev, int forced)
-{
-    if (ev->handler != ngx_http_lua_pipe_dummy_event_handler && !forced) {
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe cannot close fd:%d without "
-                       "forced pipe:%p ev:%p", pipe_ctx->c->fd, pipe_ctx, ev);
-        return NGX_ERROR;
-    }
-
-    ngx_close_connection(pipe_ctx->c);
-    pipe_ctx->c = NULL;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe, int forced)
-{
-    ngx_event_t                     *wev;
-
-    if (pipe->stdin_ctx == NULL) {
-        if (pipe->stdin_fd != -1) {
-            if (close(pipe->stdin_fd) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                              "failed to close the stdin pipe fd");
-            }
-
-            pipe->stdin_fd = -1;
-        }
-
-    } else if (pipe->stdin_ctx->c != NULL) {
-        wev = pipe->stdin_ctx->c->write;
-        return ngx_http_lua_pipe_close_helper(pipe->stdin_ctx, wev, forced);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe, int forced)
-{
-    ngx_event_t                     *rev;
-
-    if (pipe->stdout_ctx == NULL) {
-        if (pipe->stdout_fd != -1) {
-            if (close(pipe->stdout_fd) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                              "failed to close the stdout pipe fd");
-            }
-
-            pipe->stdout_fd = -1;
-        }
-
-    } else if (pipe->stdout_ctx->c != NULL) {
-        rev = pipe->stdout_ctx->c->read;
-        return ngx_http_lua_pipe_close_helper(pipe->stdout_ctx, rev, forced);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe, int forced)
-{
-    ngx_event_t                     *rev;
-
-    if (pipe->stderr_ctx == NULL) {
-        if (pipe->stderr_fd != -1) {
-            if (close(pipe->stderr_fd) == -1) {
-                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
-                              "failed to close the stderr pipe fd");
-            }
-
-            pipe->stderr_fd = -1;
-        }
-
-    } else if (pipe->stderr_ctx->c != NULL) {
-        rev = pipe->stderr_ctx->c->read;
-        return ngx_http_lua_pipe_close_helper(pipe->stderr_ctx, rev, forced);
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_shutdown_stdin(ngx_http_lua_ffi_pipe_proc_t *proc,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_int_t                        rc;
-    ngx_http_lua_pipe_t             *pipe;
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_lua_pipe_close_stdin(pipe, 0);
-    if (rc != NGX_OK) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy writing")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_shutdown_stdout(ngx_http_lua_ffi_pipe_proc_t *proc,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_int_t                        rc;
-    ngx_http_lua_pipe_t             *pipe;
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_lua_pipe_close_stdout(pipe, 0);
-    if (rc != NGX_OK) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_shutdown_stderr(ngx_http_lua_ffi_pipe_proc_t *proc,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_http_lua_pipe_t             *pipe;
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (pipe->merge_stderr) {
-        /* stdout is used internally as stderr when merge_stderr is true */
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (ngx_http_lua_pipe_close_stderr(pipe, 0) != NGX_OK) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc, int forced)
-{
-    ngx_http_lua_pipe_t          *pipe;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe finalize process:%p pid:%P forced:%d", proc,
-                   proc->_pid, forced);
-    pipe = proc->pipe;
-
-    if (pipe->node) {
-        ngx_rbtree_delete(&ngx_http_lua_pipe_rbtree, pipe->node);
-        pipe->node = NULL;
-    }
-
-    pipe->dead = 1;
-
-    ngx_http_lua_pipe_close_stdin(pipe, forced);
-    ngx_http_lua_pipe_close_stdout(pipe, forced);
-
-    if (!pipe->merge_stderr) {
-        ngx_http_lua_pipe_close_stderr(pipe, forced);
-    }
-
-    pipe->closed = 1;
-}
-
-
-void
-ngx_http_lua_ffi_pipe_proc_destroy(ngx_http_lua_ffi_pipe_proc_t *proc)
-{
-    ngx_http_lua_pipe_t          *pipe;
-
-    pipe = proc->pipe;
-    if (pipe == NULL) {
-        return;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe destroy process:%p pid:%P", proc, proc->_pid);
-
-    if (!pipe->dead) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe kill process:%p pid:%P", proc, proc->_pid);
-
-        if (kill(proc->_pid, SIGKILL) == -1) {
-            if (ngx_errno != ESRCH) {
-                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                              "lua pipe failed to kill process:%p pid:%P");
-            }
-        }
-    }
-
-    ngx_http_lua_pipe_proc_finalize(proc, 1);
-    ngx_destroy_pool(pipe->pool);
-    proc->pipe = NULL;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size)
-{
-    int                                 rc;
-
-    *ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
-    }
-
-    rc = ngx_http_lua_ffi_check_context(*ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
-                                        | NGX_HTTP_LUA_CONTEXT_ACCESS
-                                        | NGX_HTTP_LUA_CONTEXT_CONTENT
-                                        | NGX_HTTP_LUA_CONTEXT_TIMER
-                                        | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH,
-                                        errbuf, errbuf_size);
-    if (rc != NGX_OK) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char *errbuf,
-    size_t *errbuf_size)
-{
-    switch (pipe_ctx->err_type) {
-
-    case PIPE_ERR_CLOSED:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        break;
-
-    case PIPE_ERR_SYSCALL:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
-                                    strerror(pipe_ctx->pipe_errno))
-                       - errbuf;
-        break;
-
-    case PIPE_ERR_NOMEM:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
-                       - errbuf;
-        break;
-
-    case PIPE_ERR_TIMEOUT:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "timeout")
-                       - errbuf;
-        break;
-
-    case PIPE_ERR_ADD_READ_EV:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "failed to add read event")
-                       - errbuf;
-        break;
-
-    case PIPE_ERR_ADD_WRITE_EV:
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "failed to add write event")
-                       - errbuf;
-        break;
-
-    default:
-        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                      "unexpected err type: %d", pipe_ctx->err_type);
-        ngx_http_lua_assert(NULL);
-    }
-}
-
-
-static void
-ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size)
-{
-    size_t                   size = 0;
-    size_t                   chunk_size;
-    size_t                   nbufs;
-    u_char                  *p;
-    ngx_buf_t               *b;
-    ngx_chain_t             *cl;
-    ngx_chain_t            **ll;
-
-    nbufs = 0;
-    ll = NULL;
-
-    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
-        b = cl->buf;
-        chunk_size = b->last - b->pos;
-
-        if (cl->next) {
-            ll = &cl->next;
-        }
-
-        size += chunk_size;
-
-        nbufs++;
-    }
-
-    if (*buf_size < size) {
-        *buf = NULL;
-        *buf_size = size;
-
-        return;
-    }
-
-    *buf_size = size;
-
-    p = *buf;
-    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
-        b = cl->buf;
-        chunk_size = b->last - b->pos;
-        p = ngx_cpymem(p, b->pos, chunk_size);
-    }
-
-    if (nbufs > 1 && ll) {
-        *ll = pipe->free_bufs;
-        pipe->free_bufs = pipe_ctx->bufs_in;
-        pipe_ctx->bufs_in = pipe_ctx->buf_in;
-    }
-
-    if (pipe_ctx->buffer.pos == pipe_ctx->buffer.last) {
-        pipe_ctx->buffer.pos = pipe_ctx->buffer.start;
-        pipe_ctx->buffer.last = pipe_ctx->buffer.start;
-    }
-
-    if (pipe_ctx->bufs_in) {
-        pipe_ctx->buf_in->buf->last = pipe_ctx->buffer.pos;
-        pipe_ctx->buf_in->buf->pos = pipe_ctx->buffer.pos;
-    }
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx)
-{
-    ngx_chain_t             *cl;
-
-    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
-                                         &pipe->free_bufs,
-                                         pipe->buffer_size);
-
-    if (cl == NULL) {
-        pipe_ctx->err_type = PIPE_ERR_NOMEM;
-        return NGX_ERROR;
-    }
-
-    pipe_ctx->buf_in->next = cl;
-    pipe_ctx->buf_in = cl;
-    pipe_ctx->buffer = *cl->buf;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read_all(void *data, ssize_t bytes)
-{
-    ngx_http_lua_pipe_ctx_t      *pipe_ctx = data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read all");
-    return ngx_http_lua_read_all(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
-                                 ngx_cycle->log);
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes)
-{
-    ngx_int_t                          rc;
-    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe read bytes %z", bytes);
-
-    rc = ngx_http_lua_read_bytes(&pipe_ctx->buffer, pipe_ctx->buf_in,
-                                 &pipe_ctx->rest, bytes, ngx_cycle->log);
-    if (rc == NGX_ERROR) {
-        pipe_ctx->err_type = PIPE_ERR_CLOSED;
-        return NGX_ERROR;
-    }
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read_line(void *data, ssize_t bytes)
-{
-    ngx_int_t                          rc;
-    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe read line");
-    rc = ngx_http_lua_read_line(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
-                                ngx_cycle->log);
-    if (rc == NGX_ERROR) {
-        pipe_ctx->err_type = PIPE_ERR_CLOSED;
-        return NGX_ERROR;
-    }
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read_any(void *data, ssize_t bytes)
-{
-    ngx_int_t                          rc;
-    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read any");
-    rc = ngx_http_lua_read_any(&pipe_ctx->buffer, pipe_ctx->buf_in,
-                               &pipe_ctx->rest, bytes, ngx_cycle->log);
-    if (rc == NGX_ERROR) {
-        pipe_ctx->err_type = PIPE_ERR_CLOSED;
-        return NGX_ERROR;
-    }
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx)
-{
-    int                                 rc;
-    int                                 read;
-    size_t                              size;
-    ssize_t                             n;
-    ngx_buf_t                          *b;
-    ngx_event_t                        *rev;
-    ngx_connection_t                   *c;
-
-    c = pipe_ctx->c;
-    rev = c->read;
-    b = &pipe_ctx->buffer;
-    read = 0;
-
-    for ( ;; ) {
-        size = b->last - b->pos;
-
-        if (size || pipe_ctx->eof) {
-            rc = pipe_ctx->input_filter(pipe_ctx->input_filter_ctx, size);
-            if (rc == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            if (rc == NGX_OK) {
-                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                               "lua pipe read done pipe:%p", pipe_ctx);
-                return NGX_OK;
-            }
-
-            /* rc == NGX_AGAIN */
-            continue;
-        }
-
-        if (read && !rev->ready) {
-            break;
-        }
-
-        size = b->end - b->last;
-
-        if (size == 0) {
-            rc = ngx_http_lua_pipe_add_input_buffer(pipe, pipe_ctx);
-            if (rc == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            b = &pipe_ctx->buffer;
-            size = (size_t) (b->end - b->last);
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe try to read data %uz pipe:%p",
-                       size, pipe_ctx);
-
-        n = c->recv(c, b->last, size);
-        read = 1;
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe read data returned %z pipe:%p", n, pipe_ctx);
-
-        if (n == NGX_AGAIN) {
-            break;
-        }
-
-        if (n == 0) {
-            pipe_ctx->eof = 1;
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "lua pipe closed pipe:%p", pipe_ctx);
-            continue;
-        }
-
-        if (n == NGX_ERROR) {
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
-                           "lua pipe read data error pipe:%p", pipe_ctx);
-
-            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
-            pipe_ctx->pipe_errno = ngx_errno;
-            return NGX_ERROR;
-        }
-
-        b->last += n;
-    }
-
-    return NGX_AGAIN;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_init_ctx(ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd,
-    ngx_pool_t *pool, u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_connection_t                   *c;
-
-    if (fd == -1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    *pipe_ctx_pt = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_ctx_t));
-    if (*pipe_ctx_pt == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    c = ngx_get_connection(fd, ngx_cycle->log);
-    if (c == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no connection")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    c->log = ngx_cycle->log;
-    c->recv = ngx_http_lua_pipe_fd_read;
-    c->read->handler = ngx_http_lua_pipe_dummy_event_handler;
-    c->read->log = c->log;
-
-#ifdef HAVE_SOCKET_CLOEXEC_PATCH
-    c->read->skip_socket_leak_check = 1;
-#endif
-
-    c->send = ngx_http_lua_pipe_fd_write;
-    c->write->handler = ngx_http_lua_pipe_dummy_event_handler;
-    c->write->log = c->log;
-    (*pipe_ctx_pt)->c = c;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe init pipe ctx:%p fd:*%d", *pipe_ctx_pt, fd);
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_read(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, int reader_type,
-    size_t length, u_char **buf, size_t *buf_size, u_char *errbuf,
-    size_t *errbuf_size)
-{
-    int                                 rc;
-    ngx_msec_t                          timeout;
-    ngx_event_t                        *rev;
-    ngx_connection_t                   *c;
-    ngx_http_lua_ctx_t                 *ctx;
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_co_ctx_t              *wait_co_ctx;
-    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
-
-    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe read process:%p pid:%P", proc, proc->_pid);
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (pipe->merge_stderr && from_stderr) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (from_stderr) {
-        if (pipe->stderr_ctx == NULL) {
-            if (ngx_http_lua_pipe_init_ctx(&pipe->stderr_ctx, pipe->stderr_fd,
-                                           pipe->pool, errbuf,
-                                           errbuf_size)
-                != NGX_OK)
-            {
-                return NGX_ERROR;
-            }
-
-        } else {
-            pipe->stderr_ctx->err_type = 0;
-        }
-
-        pipe_ctx = pipe->stderr_ctx;
-
-    } else {
-        if (pipe->stdout_ctx == NULL) {
-            if (ngx_http_lua_pipe_init_ctx(&pipe->stdout_ctx, pipe->stdout_fd,
-                                           pipe->pool, errbuf,
-                                           errbuf_size)
-                != NGX_OK)
-            {
-                return NGX_ERROR;
-            }
-
-        } else {
-            pipe->stdout_ctx->err_type = 0;
-        }
-
-        pipe_ctx = pipe->stdout_ctx;
-    }
-
-    c = pipe_ctx->c;
-    if (c == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    rev = c->read;
-    if (rev->handler != ngx_http_lua_pipe_dummy_event_handler) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    pipe_ctx->input_filter_ctx = pipe_ctx;
-
-    switch (reader_type) {
-
-    case PIPE_READ_ALL:
-        pipe_ctx->input_filter = ngx_http_lua_pipe_read_all;
-        break;
-
-    case PIPE_READ_BYTES:
-        pipe_ctx->input_filter = ngx_http_lua_pipe_read_bytes;
-        break;
-
-    case PIPE_READ_LINE:
-        pipe_ctx->input_filter = ngx_http_lua_pipe_read_line;
-        break;
-
-    case PIPE_READ_ANY:
-        pipe_ctx->input_filter = ngx_http_lua_pipe_read_any;
-        break;
-
-    default:
-        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                      "unexpected reader_type: %d", reader_type);
-        ngx_http_lua_assert(NULL);
-    }
-
-    pipe_ctx->rest = length;
-
-    if (pipe_ctx->bufs_in == NULL) {
-        pipe_ctx->bufs_in =
-            ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
-                                            &pipe->free_bufs,
-                                            pipe->buffer_size);
-
-        if (pipe_ctx->bufs_in == NULL) {
-            pipe_ctx->err_type = PIPE_ERR_NOMEM;
-            goto error;
-        }
-
-        pipe_ctx->buf_in = pipe_ctx->bufs_in;
-        pipe_ctx->buffer = *pipe_ctx->buf_in->buf;
-    }
-
-    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
-    if (rc == NGX_ERROR) {
-        goto error;
-    }
-
-    if (rc == NGX_OK) {
-        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
-        return NGX_OK;
-    }
-
-    /* rc == NGX_AGAIN */
-    wait_co_ctx = ctx->cur_co_ctx;
-
-    c->data = wait_co_ctx;
-    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
-        pipe_ctx->err_type = PIPE_ERR_ADD_READ_EV;
-        goto error;
-    }
-
-    wait_co_ctx->data = proc;
-
-    if (from_stderr) {
-        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
-        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stderr_cleanup;
-        timeout = proc->stderr_read_timeout;
-
-    } else {
-        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
-        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stdout_cleanup;
-        timeout = proc->stdout_read_timeout;
-    }
-
-    if (timeout > 0) {
-        ngx_add_timer(rev, timeout);
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua pipe add timer for reading: %d(ms) process:%p "
-                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
-                       rev);
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
-                   proc->_pid, pipe);
-
-    return NGX_AGAIN;
-
-error:
-
-    if (pipe_ctx->bufs_in) {
-        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
-        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-        return NGX_DECLINED;
-    }
-
-    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-
-    return NGX_ERROR;
-}
-
-
-/*
- * ngx_http_lua_ffi_pipe_get_read_result should only be called just after
- * ngx_http_lua_ffi_pipe_proc_read, so we omit most of the sanity check already
- * done in ngx_http_lua_ffi_pipe_proc_read.
- */
-int
-ngx_http_lua_ffi_pipe_get_read_result(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, u_char **buf,
-    size_t *buf_size, u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe get read result process:%p pid:%P", proc,
-                   proc->_pid);
-
-    pipe = proc->pipe;
-    pipe_ctx = from_stderr ? pipe->stderr_ctx : pipe->stdout_ctx;
-
-    if (!pipe_ctx->err_type) {
-        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
-        return NGX_OK;
-    }
-
-    if (pipe_ctx->bufs_in) {
-        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
-        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-        return NGX_DECLINED;
-    }
-
-    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
-    ngx_http_lua_pipe_ctx_t *pipe_ctx)
-{
-    size_t                       size;
-    ngx_int_t                    n;
-    ngx_buf_t                   *b;
-    ngx_connection_t            *c;
-
-    c = pipe_ctx->c;
-    b = pipe_ctx->buf_in->buf;
-
-    for ( ;; ) {
-        size = b->last - b->pos;
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe try to write data %uz pipe:%p", size,
-                       pipe_ctx);
-
-        n = c->send(c, b->pos, size);
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe write returned %i pipe:%p", n, pipe_ctx);
-
-        if (n >= 0) {
-            b->pos += n;
-
-            if (b->pos == b->last) {
-                b->pos = b->start;
-                b->last = b->start;
-
-                if (!pipe->free_bufs) {
-                    pipe->free_bufs = pipe_ctx->buf_in;
-
-                } else {
-                    pipe->free_bufs->next = pipe_ctx->buf_in;
-                }
-
-                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                               "lua pipe write done pipe:%p", pipe_ctx);
-                return NGX_OK;
-            }
-
-            continue;
-        }
-
-        /* NGX_ERROR || NGX_AGAIN */
-        break;
-    }
-
-    if (n == NGX_ERROR) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
-                       "lua pipe write data error pipe:%p", pipe_ctx);
-
-        if (ngx_errno == NGX_EPIPE) {
-            pipe_ctx->err_type = PIPE_ERR_CLOSED;
-
-        } else {
-            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
-            pipe_ctx->pipe_errno = ngx_errno;
-        }
-
-        return NGX_ERROR;
-    }
-
-    return NGX_AGAIN;
-}
-
-
-ssize_t
-ngx_http_lua_ffi_pipe_proc_write(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, const u_char *data, size_t len,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    int                                 rc;
-    ngx_buf_t                          *b;
-    ngx_msec_t                          timeout;
-    ngx_chain_t                        *cl;
-    ngx_event_t                        *wev;
-    ngx_http_lua_ctx_t                 *ctx;
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_co_ctx_t              *wait_co_ctx;
-    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
-
-    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe write process:%p pid:%P", proc, proc->_pid);
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (pipe->stdin_ctx == NULL) {
-        if (ngx_http_lua_pipe_init_ctx(&pipe->stdin_ctx, pipe->stdin_fd,
-                                       pipe->pool, errbuf,
-                                       errbuf_size)
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-    } else {
-        pipe->stdin_ctx->err_type = 0;
-    }
-
-    pipe_ctx = pipe->stdin_ctx;
-    if (pipe_ctx->c == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
-        return NGX_ERROR;
-    }
-
-    wev = pipe_ctx->c->write;
-    if (wev->handler != ngx_http_lua_pipe_dummy_event_handler) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy writing")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    pipe_ctx->rest = len;
-
-    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
-                                         &pipe->free_bufs, len);
-    if (cl == NULL) {
-        pipe_ctx->err_type = PIPE_ERR_NOMEM;
-        goto error;
-    }
-
-    pipe_ctx->buf_in = cl;
-    b = pipe_ctx->buf_in->buf;
-    b->last = ngx_copy(b->last, data, len);
-
-    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
-    if (rc == NGX_ERROR) {
-        goto error;
-    }
-
-    if (rc == NGX_OK) {
-        return len;
-    }
-
-    /* rc == NGX_AGAIN */
-    wait_co_ctx = ctx->cur_co_ctx;
-    pipe_ctx->c->data = wait_co_ctx;
-
-    wev->handler = ngx_http_lua_pipe_resume_write_handler;
-    if (ngx_handle_write_event(wev, 0) != NGX_OK) {
-        pipe_ctx->err_type = PIPE_ERR_ADD_WRITE_EV;
-        goto error;
-    }
-
-    wait_co_ctx->data = proc;
-    wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_write_cleanup;
-    timeout = proc->write_timeout;
-
-    if (timeout > 0) {
-        ngx_add_timer(wev, timeout);
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua pipe add timer for writing: %d(ms) process:%p "
-                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
-                       wev);
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
-                   proc->_pid, pipe);
-
-    return NGX_AGAIN;
-
-error:
-
-    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-    return NGX_ERROR;
-}
-
-
-/*
- * ngx_http_lua_ffi_pipe_get_write_result should only be called just after
- * ngx_http_lua_ffi_pipe_proc_write, so we omit most of the sanity check
- * already done in ngx_http_lua_ffi_pipe_proc_write.
- */
-ssize_t
-ngx_http_lua_ffi_pipe_get_write_result(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe get write result process:%p pid:%P", proc,
-                   proc->_pid);
-
-    pipe = proc->pipe;
-    pipe_ctx = pipe->stdin_ctx;
-
-    if (pipe_ctx->err_type) {
-        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
-        return NGX_ERROR;
-    }
-
-    return pipe_ctx->rest;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_wait(ngx_http_request_t *r,
-    ngx_http_lua_ffi_pipe_proc_t *proc, char **reason, int *status,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    int                                 rc;
-    ngx_rbtree_node_t                  *node;
-    ngx_http_lua_ctx_t                 *ctx;
-    ngx_http_lua_pipe_t                *pipe;
-    ngx_http_lua_co_ctx_t              *wait_co_ctx;
-    ngx_http_lua_pipe_node_t           *pipe_node;
-
-    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua pipe wait process:%p pid:%P", proc, proc->_pid);
-
-    pipe = proc->pipe;
-    if (pipe == NULL || pipe->closed) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
-        return NGX_ERROR;
-    }
-
-    node = pipe->node;
-    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-    if (pipe_node->wait_co_ctx) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy waiting")
-                       - errbuf;
-        return NGX_ERROR;
-    }
-
-    if (pipe_node->reason_code == REASON_RUNNING_CODE) {
-        wait_co_ctx = ctx->cur_co_ctx;
-        wait_co_ctx->data = proc;
-        ngx_memzero(&wait_co_ctx->sleep, sizeof(ngx_event_t));
-        wait_co_ctx->sleep.handler = ngx_http_lua_pipe_resume_wait_handler;
-        wait_co_ctx->sleep.data = wait_co_ctx;
-        wait_co_ctx->sleep.log = r->connection->log;
-        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_wait_cleanup;
-
-        pipe_node->wait_co_ctx = wait_co_ctx;
-
-        if (proc->wait_timeout > 0) {
-            ngx_add_timer(&wait_co_ctx->sleep, proc->wait_timeout);
-            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua pipe add timer for waiting: %d(ms) process:%p "
-                           "pid:%P ev:%p", proc->wait_timeout, proc,
-                           proc->_pid, &wait_co_ctx->sleep);
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua pipe wait yielding process:%p pid:%P", proc,
-                       proc->_pid);
-
-        return NGX_AGAIN;
-    }
-
-    *status = pipe_node->status;
-
-    switch (pipe_node->reason_code) {
-
-    case REASON_EXIT_CODE:
-        *reason = REASON_EXIT;
-        break;
-
-    case REASON_SIGNAL_CODE:
-        *reason = REASON_SIGNAL;
-        break;
-
-    default:
-        *reason = REASON_UNKNOWN;
-    }
-
-    ngx_http_lua_pipe_proc_finalize(proc, 0);
-
-    if (*status == 0) {
-        return NGX_OK;
-    }
-
-    return NGX_DECLINED;
-}
-
-
-int
-ngx_http_lua_ffi_pipe_proc_kill(ngx_http_lua_ffi_pipe_proc_t *proc, int signal,
-    u_char *errbuf, size_t *errbuf_size)
-{
-    ngx_pid_t                           pid;
-    ngx_http_lua_pipe_t                *pipe;
-
-    pipe = proc->pipe;
-
-    if (pipe == NULL || pipe->dead) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
-        return NGX_ERROR;
-    }
-
-    pid = proc->_pid;
-
-    if (kill(pid, signal) == -1) {
-        switch (ngx_errno) {
-        case EINVAL:
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "invalid signal")
-                           - errbuf;
-            break;
-
-        case ESRCH:
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited")
-                           - errbuf;
-            break;
-
-        default:
-            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
-                                        strerror(ngx_errno))
-                           - errbuf;
-        }
-
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static int
-ngx_http_lua_pipe_read_stdout_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L)
-{
-    return ngx_http_lua_pipe_read_retval_helper(proc, L, 0);
-}
-
-
-static int
-ngx_http_lua_pipe_read_stderr_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L)
-{
-    return ngx_http_lua_pipe_read_retval_helper(proc, L, 1);
-}
-
-
-static int
-ngx_http_lua_pipe_read_retval_helper(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L, int from_stderr)
-{
-    int                              rc;
-    ngx_msec_t                       timeout;
-    ngx_event_t                     *rev;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
-
-    pipe = proc->pipe;
-    if (from_stderr) {
-        pipe_ctx = pipe->stderr_ctx;
-
-    } else {
-        pipe_ctx = pipe->stdout_ctx;
-    }
-
-    if (pipe->timeout) {
-        pipe->timeout = 0;
-        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
-        return 0;
-    }
-
-    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
-    if (rc != NGX_AGAIN) {
-        return 0;
-    }
-
-    rev = pipe_ctx->c->read;
-
-    if (from_stderr) {
-        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
-        timeout = proc->stderr_read_timeout;
-
-    } else {
-        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
-        timeout = proc->stdout_read_timeout;
-    }
-
-    if (timeout > 0) {
-        ngx_add_timer(rev, timeout);
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe add timer for reading: %d(ms) proc:%p "
-                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
-                       rev);
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
-                   proc->_pid, pipe);
-
-    return NGX_AGAIN;
-}
-
-
-static int
-ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
-    lua_State *L)
-{
-    int                              rc;
-    ngx_msec_t                       timeout;
-    ngx_event_t                     *wev;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
-
-    pipe = proc->pipe;
-    pipe_ctx = pipe->stdin_ctx;
-
-    if (pipe->timeout) {
-        pipe->timeout = 0;
-        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
-        return 0;
-    }
-
-    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
-    if (rc != NGX_AGAIN) {
-        return 0;
-    }
-
-    wev = pipe_ctx->c->write;
-    wev->handler = ngx_http_lua_pipe_resume_write_handler;
-    timeout = proc->write_timeout;
-
-    if (timeout > 0) {
-        ngx_add_timer(wev, timeout);
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua pipe add timer for writing: %d(ms) proc:%p "
-                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
-                       wev);
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
-                   proc->_pid, pipe);
-
-    return NGX_AGAIN;
-}
-
-
-static int
-ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L)
-{
-    int                              nret;
-    ngx_rbtree_node_t               *node;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_pipe_node_t        *pipe_node;
-
-    pipe = proc->pipe;
-    node = pipe->node;
-    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-    pipe_node->wait_co_ctx = NULL;
-
-    if (pipe->timeout) {
-        pipe->timeout = 0;
-        lua_pushnil(L);
-        lua_pushliteral(L, "timeout");
-        return 2;
-    }
-
-    ngx_http_lua_pipe_proc_finalize(pipe_node->proc, 0);
-
-    if (pipe_node->status == 0) {
-        lua_pushboolean(L, 1);
-        lua_pushliteral(L, REASON_EXIT);
-        lua_pushinteger(L, pipe_node->status);
-        nret = 3;
-
-    } else {
-        lua_pushboolean(L, 0);
-
-        switch (pipe_node->reason_code) {
-
-        case REASON_EXIT_CODE:
-            lua_pushliteral(L, REASON_EXIT);
-            break;
-
-        case REASON_SIGNAL_CODE:
-            lua_pushliteral(L, REASON_SIGNAL);
-            break;
-
-        default:
-            lua_pushliteral(L, REASON_UNKNOWN);
-        }
-
-        lua_pushinteger(L, pipe_node->status);
-        nret = 3;
-    }
-
-    return nret;
-}
-
-
-static void
-ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
-    ngx_http_lua_co_ctx_t *wait_co_ctx)
-{
-    ngx_connection_t                *c;
-    ngx_http_request_t              *r;
-    ngx_http_lua_ctx_t              *ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    if (ev->timedout) {
-        proc = wait_co_ctx->data;
-        pipe = proc->pipe;
-        pipe->timeout = 1;
-        ev->timedout = 0;
-    }
-
-    ngx_http_lua_pipe_clear_event(ev);
-
-    r = ngx_http_lua_get_req(wait_co_ctx->co);
-    c = r->connection;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    ngx_http_lua_assert(ctx != NULL);
-
-    ctx->cur_co_ctx = wait_co_ctx;
-
-    if (ctx->entered_content_phase) {
-        (void) ngx_http_lua_pipe_resume(r);
-
-    } else {
-        ctx->resume_handler = ngx_http_lua_pipe_resume;
-        ngx_http_core_run_phases(r);
-    }
-
-    ngx_http_run_posted_requests(c);
-}
-
-
-static void
-ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev)
-{
-    ngx_connection_t                *c = ev->data;
-    ngx_http_lua_co_ctx_t           *wait_co_ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    wait_co_ctx = c->data;
-    proc = wait_co_ctx->data;
-    pipe = proc->pipe;
-    pipe->retval_handler = ngx_http_lua_pipe_read_stdout_retval;
-    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
-}
-
-
-static void
-ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev)
-{
-    ngx_connection_t                *c = ev->data;
-    ngx_http_lua_co_ctx_t           *wait_co_ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    wait_co_ctx = c->data;
-    proc = wait_co_ctx->data;
-    pipe = proc->pipe;
-    pipe->retval_handler = ngx_http_lua_pipe_read_stderr_retval;
-    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
-}
-
-
-static void
-ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev)
-{
-    ngx_connection_t                *c = ev->data;
-    ngx_http_lua_co_ctx_t           *wait_co_ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    wait_co_ctx = c->data;
-    proc = wait_co_ctx->data;
-    pipe = proc->pipe;
-    pipe->retval_handler = ngx_http_lua_pipe_write_retval;
-    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
-}
-
-
-static void
-ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev)
-{
-    ngx_http_lua_co_ctx_t           *wait_co_ctx = ev->data;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    proc = wait_co_ctx->data;
-    pipe = proc->pipe;
-    pipe->retval_handler = ngx_http_lua_pipe_wait_retval;
-    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
-}
-
-
-static ngx_int_t
-ngx_http_lua_pipe_resume(ngx_http_request_t *r)
-{
-    int                              nret;
-    lua_State                       *vm;
-    ngx_int_t                        rc;
-    ngx_uint_t                       nreqs;
-    ngx_connection_t                *c;
-    ngx_http_lua_ctx_t              *ctx;
-    ngx_http_lua_pipe_t             *pipe;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-
-    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;
-    ctx->cur_co_ctx->cleanup = NULL;
-
-    proc = ctx->cur_co_ctx->data;
-    pipe = proc->pipe;
-    nret = pipe->retval_handler(proc, ctx->cur_co_ctx->co);
-    if (nret == NGX_AGAIN) {
-        return NGX_DONE;
-    }
-
-    c = r->connection;
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    /* rc == NGX_ERROR || rc >= NGX_OK */
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_finalize_request(r, rc);
-        return NGX_DONE;
-    }
-
-    return rc;
-}
-
-
-static void
-ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev)
-{
-    /* do nothing */
-}
-
-
-static void
-ngx_http_lua_pipe_clear_event(ngx_event_t *ev)
-{
-    ev->handler = ngx_http_lua_pipe_dummy_event_handler;
-
-    if (ev->timer_set) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                       "lua pipe del timer for ev:%p", ev);
-        ngx_del_timer(ev);
-    }
-
-    if (ev->posted) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                       "lua pipe del posted event for ev:%p", ev);
-        ngx_delete_posted_event(ev);
-    }
-}
-
-
-static void
-ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data)
-{
-    ngx_event_t                    *rev;
-    ngx_connection_t               *c;
-    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
-    ngx_http_lua_ffi_pipe_proc_t   *proc;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe proc read stdout cleanup");
-
-    proc = wait_co_ctx->data;
-    c = proc->pipe->stdout_ctx->c;
-    if (c) {
-        rev = c->read;
-        ngx_http_lua_pipe_clear_event(rev);
-    }
-
-    wait_co_ctx->cleanup = NULL;
-}
-
-
-static void
-ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data)
-{
-    ngx_event_t                    *rev;
-    ngx_connection_t               *c;
-    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
-    ngx_http_lua_ffi_pipe_proc_t   *proc;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe proc read stderr cleanup");
-
-    proc = wait_co_ctx->data;
-    c = proc->pipe->stderr_ctx->c;
-    if (c) {
-        rev = c->read;
-        ngx_http_lua_pipe_clear_event(rev);
-    }
-
-    wait_co_ctx->cleanup = NULL;
-}
-
-
-static void
-ngx_http_lua_pipe_proc_write_cleanup(void *data)
-{
-    ngx_event_t                    *wev;
-    ngx_connection_t               *c;
-    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
-    ngx_http_lua_ffi_pipe_proc_t   *proc;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe proc write cleanup");
-
-    proc = wait_co_ctx->data;
-    c = proc->pipe->stdin_ctx->c;
-    if (c) {
-        wev = c->write;
-        ngx_http_lua_pipe_clear_event(wev);
-    }
-
-    wait_co_ctx->cleanup = NULL;
-}
-
-
-static void
-ngx_http_lua_pipe_proc_wait_cleanup(void *data)
-{
-    ngx_rbtree_node_t              *node;
-    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
-    ngx_http_lua_pipe_node_t       *pipe_node;
-    ngx_http_lua_ffi_pipe_proc_t   *proc;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua pipe proc wait cleanup");
-
-    proc = wait_co_ctx->data;
-    node = proc->pipe->node;
-    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
-    pipe_node->wait_co_ctx = NULL;
-
-    ngx_http_lua_pipe_clear_event(&wait_co_ctx->sleep);
-
-    wait_co_ctx->cleanup = NULL;
-}
-
-
-#endif /* HAVE_NGX_LUA_PIPE */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pipe.h b/debian/modules/http-lua/src/ngx_http_lua_pipe.h
deleted file mode 100644
index b5cea89..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_pipe.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-/*
- * Copyright (C) by OpenResty Inc.
- */
-
-
-#ifndef _NGX_HTTP_LUA_PIPE_H_INCLUDED_
-#define _NGX_HTTP_LUA_PIPE_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-typedef ngx_int_t (*ngx_http_lua_pipe_input_filter)(void *data, ssize_t bytes);
-
-
-typedef struct {
-    ngx_connection_t                   *c;
-    ngx_http_lua_pipe_input_filter      input_filter;
-    void                               *input_filter_ctx;
-    size_t                              rest;
-    ngx_chain_t                        *buf_in;
-    ngx_chain_t                        *bufs_in;
-    ngx_buf_t                           buffer;
-    ngx_err_t                           pipe_errno;
-    unsigned                            err_type:16;
-    unsigned                            eof:1;
-} ngx_http_lua_pipe_ctx_t;
-
-
-typedef struct ngx_http_lua_pipe_s  ngx_http_lua_pipe_t;
-
-
-typedef struct {
-    ngx_pid_t               _pid;
-    ngx_msec_t              write_timeout;
-    ngx_msec_t              stdout_read_timeout;
-    ngx_msec_t              stderr_read_timeout;
-    ngx_msec_t              wait_timeout;
-    /* pipe hides the implementation from the Lua binding */
-    ngx_http_lua_pipe_t    *pipe;
-} ngx_http_lua_ffi_pipe_proc_t;
-
-
-typedef int (*ngx_http_lua_pipe_retval_handler)(
-    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
-
-
-struct ngx_http_lua_pipe_s {
-    ngx_pool_t                         *pool;
-    ngx_chain_t                        *free_bufs;
-    ngx_rbtree_node_t                  *node;
-    int                                 stdin_fd;
-    int                                 stdout_fd;
-    int                                 stderr_fd;
-    ngx_http_lua_pipe_ctx_t            *stdin_ctx;
-    ngx_http_lua_pipe_ctx_t            *stdout_ctx;
-    ngx_http_lua_pipe_ctx_t            *stderr_ctx;
-    ngx_http_lua_pipe_retval_handler    retval_handler;
-    size_t                              buffer_size;
-    unsigned                            closed:1;
-    unsigned                            dead:1;
-    unsigned                            timeout:1;
-    unsigned                            merge_stderr:1;
-};
-
-
-typedef struct {
-    u_char                           color;
-    u_char                           reason_code;
-    int                              status;
-    ngx_http_lua_co_ctx_t           *wait_co_ctx;
-    ngx_http_lua_ffi_pipe_proc_t    *proc;
-} ngx_http_lua_pipe_node_t;
-
-
-typedef struct {
-    int     signo;
-    char   *signame;
-} ngx_http_lua_pipe_signal_t;
-
-
-#if !(NGX_WIN32) && !defined(NGX_LUA_NO_FFI_API)                             \
-    && defined(HAVE_SOCKET_CLOEXEC_PATCH)
-#define HAVE_NGX_LUA_PIPE   1
-
-
-void ngx_http_lua_pipe_init(void);
-ngx_int_t ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_PIPE_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_regex.c b/debian/modules/http-lua/src/ngx_http_lua_regex.c
index 8f3373b..843d1e4 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_regex.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_regex.c
@@ -15,6 +15,7 @@
 #include "ngx_http_lua_regex.h"
 #include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_script.h"
+#include "ngx_http_lua_pcrefix.h"
 #include "ngx_http_lua_util.h"
 
 
@@ -248,8 +249,7 @@ ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              regex_cache_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
@@ -720,8 +720,7 @@ ngx_http_lua_ngx_re_gmatch(lua_State *L)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              regex_cache_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "m");
@@ -1389,8 +1388,7 @@ ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
 
         dd("server pool %p", lmcf->pool);
 
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              regex_cache_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
         lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
         lua_pushliteral(L, "s");
diff --git a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
index 1de9968..1bbe87c 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
@@ -62,7 +62,7 @@ ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
 #endif
 
         if (cur_ph < last_ph) {
-            dd("swapping the contents of cur_ph and last_ph...");
+            dd("swaping the contents of cur_ph and last_ph...");
 
             tmp      = *cur_ph;
 
@@ -261,11 +261,9 @@ ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /*  save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_script.c b/debian/modules/http-lua/src/ngx_http_lua_script.c
index c675a16..95ebadf 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_script.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_script.c
@@ -329,7 +329,7 @@ ngx_http_lua_script_add_copy_code(ngx_http_lua_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_lua_script_code_pt) (void *)
+    code->code = (ngx_http_lua_script_code_pt)
                  ngx_http_lua_script_copy_len_code;
     code->len = len;
 
@@ -399,7 +399,7 @@ ngx_http_lua_script_add_capture_code(ngx_http_lua_script_compile_t *sc,
         return NGX_ERROR;
     }
 
-    code->code = (ngx_http_lua_script_code_pt) (void *)
+    code->code = (ngx_http_lua_script_code_pt)
                  ngx_http_lua_script_copy_capture_len_code;
     code->n = 2 * n;
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.c b/debian/modules/http-lua/src/ngx_http_lua_setby.c
index d4288b5..2e8762a 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_setby.c
@@ -30,6 +30,13 @@ 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);
 
 
+/* keys in Lua thread for fetching args and nargs in set_by_lua* */
+
+#define ngx_http_lua_nargs_key  "__ngx_nargs"
+
+#define ngx_http_lua_args_key  "__ngx_args"
+
+
 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)
@@ -127,24 +134,23 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
 
 
 int
-ngx_http_lua_setby_param_get(lua_State *L, ngx_http_request_t *r)
+ngx_http_lua_setby_param_get(lua_State *L)
 {
     int         idx;
     int         n;
 
     ngx_http_variable_value_t       *v;
-    ngx_http_lua_main_conf_t        *lmcf;
 
     idx = luaL_checkint(L, 2);
     idx--;
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    /*  get number of args from globals */
+    lua_getglobal(L, ngx_http_lua_nargs_key);
+    n = (int) lua_tointeger(L, -1);
 
-    /*  get number of args from lmcf */
-    n = lmcf->setby_nargs;
-
-    /*  get args from lmcf */
-    v = lmcf->setby_args;
+    /*  get args from globals */
+    lua_getglobal(L, ngx_http_lua_args_key);
+    v = lua_touserdata(L, -1);
 
     if (idx < 0 || idx > n - 1) {
         lua_pushnil(L);
@@ -172,16 +178,15 @@ 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;
-
+    /*  set nginx request pointer to current lua thread's globals table */
     ngx_http_lua_set_req(L, r);
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    lua_pushinteger(L, nargs);
+    lua_setglobal(L, ngx_http_lua_nargs_key);
 
-    lmcf->setby_nargs = nargs;
-    lmcf->setby_args = args;
+    lua_pushlightuserdata(L, args);
+    lua_setglobal(L, ngx_http_lua_args_key);
 
-#ifndef OPENRESTY_LUAJIT
     /**
      * we want to create empty environment for current script
      *
@@ -206,7 +211,6 @@ ngx_http_lua_set_by_lua_env(lua_State *L, ngx_http_request_t *r, size_t nargs,
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif
 }
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.h b/debian/modules/http-lua/src/ngx_http_lua_setby.h
index f43eef7..da71753 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_setby.h
@@ -7,7 +7,7 @@
 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, ngx_http_request_t *r);
+int ngx_http_lua_setby_param_get(lua_State *L);
 
 
 #endif /* _NGX_HTTP_LUA_SET_BY_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_shdict.c b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
index b017bea..5fb7930 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_shdict.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
@@ -325,7 +325,6 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_uint_t                   i;
     ngx_shm_zone_t             **zone;
-    ngx_shm_zone_t             **zone_udata;
 
     if (lmcf->shdict_zones != NULL) {
         lua_createtable(L, 0, lmcf->shdict_zones->nelts /* nrec */);
@@ -397,9 +396,7 @@ ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
 
             lua_createtable(L, 1 /* narr */, 0 /* nrec */);
                 /* table of zone[i] */
-            zone_udata = lua_newuserdata(L, sizeof(ngx_shm_zone_t *));
-                /* shared mt key ud */
-            *zone_udata = zone[i];
+            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
             lua_rawseti(L, -2, SHDICT_USERDATA_INDEX); /* {zone[i]} */
             lua_pushvalue(L, -3); /* shared mt key ud mt */
             lua_setmetatable(L, -2); /* shared mt key ud */
@@ -434,17 +431,11 @@ static ngx_inline ngx_shm_zone_t *
 ngx_http_lua_shdict_get_zone(lua_State *L, int index)
 {
     ngx_shm_zone_t      *zone;
-    ngx_shm_zone_t     **zone_udata;
 
     lua_rawgeti(L, index, SHDICT_USERDATA_INDEX);
-    zone_udata = lua_touserdata(L, -1);
+    zone = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    if (zone_udata == NULL) {
-        return NULL;
-    }
-
-    zone = *zone_udata;
     return zone;
 }
 
@@ -2218,17 +2209,6 @@ ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
 
 
 #ifndef NGX_LUA_NO_FFI_API
-ngx_shm_zone_t *
-ngx_http_lua_ffi_shdict_udata_to_zone(void *zone_udata)
-{
-    if (zone_udata == NULL) {
-        return NULL;
-    }
-
-    return *(ngx_shm_zone_t **) zone_udata;
-}
-
-
 int
 ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     size_t key_len, int value_type, u_char *str_value_buf,
@@ -2245,6 +2225,10 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     dd("exptime: %ld", exptime);
 
     ctx = zone->data;
@@ -2506,6 +2490,10 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_node_t  *sd;
     ngx_str_t                    value;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     *err = NULL;
 
     ctx = zone->data;
@@ -2648,6 +2636,10 @@ ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
     u_char                      *p;
     ngx_queue_t                 *queue, *q;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     if (init_ttl > 0) {
         tp = ngx_timeofday();
     }
@@ -2923,6 +2915,10 @@ ngx_http_lua_ffi_shdict_get_ttl(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     ctx = zone->data;
     hash = ngx_crc32_short(key, key_len);
 
@@ -2963,6 +2959,10 @@ ngx_http_lua_ffi_shdict_set_expire(ngx_shm_zone_t *zone, u_char *key,
     ngx_http_lua_shdict_ctx_t   *ctx;
     ngx_http_lua_shdict_node_t  *sd;
 
+    if (zone == NULL) {
+        return NGX_ERROR;
+    }
+
     if (exptime > 0) {
         tp = ngx_timeofday();
     }
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
index 87461e6..efdf427 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
@@ -11,7 +11,6 @@
 
 
 #include "ngx_http_lua_socket_tcp.h"
-#include "ngx_http_lua_input_filters.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_uthread.h"
 #include "ngx_http_lua_output.h"
@@ -25,7 +24,6 @@ static int ngx_http_lua_socket_tcp_connect(lua_State *L);
 static int ngx_http_lua_socket_tcp_sslhandshake(lua_State *L);
 #endif
 static int ngx_http_lua_socket_tcp_receive(lua_State *L);
-static int ngx_http_lua_socket_tcp_receiveany(lua_State *L);
 static int ngx_http_lua_socket_tcp_send(lua_State *L);
 static int ngx_http_lua_socket_tcp_close(lua_State *L);
 static int ngx_http_lua_socket_tcp_setoption(lua_State *L);
@@ -71,8 +69,6 @@ static int ngx_http_lua_socket_tcp_conn_retval_handler(ngx_http_request_t *r,
     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_tcp_upstream_t *u);
-static int ngx_http_lua_socket_tcp_receive_helper(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
 static ngx_int_t ngx_http_lua_socket_tcp_read(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u);
 static int ngx_http_lua_socket_tcp_receive_retval_handler(ngx_http_request_t *r,
@@ -90,7 +86,6 @@ static int ngx_http_lua_socket_write_error_retval_handler(ngx_http_request_t *r,
 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);
-static ngx_int_t ngx_http_lua_socket_read_any(void *data, ssize_t bytes);
 static int ngx_http_lua_socket_tcp_receiveuntil(lua_State *L);
 static int ngx_http_lua_socket_receiveuntil_iterator(lua_State *L);
 static ngx_int_t ngx_http_lua_socket_compile_pattern(u_char *data, size_t len,
@@ -100,28 +95,12 @@ static int ngx_http_lua_req_socket(lua_State *L);
 static void ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r);
 static int ngx_http_lua_socket_tcp_getreusedtimes(lua_State *L);
 static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L);
-static void ngx_http_lua_socket_tcp_create_socket_pool(lua_State *L,
-    ngx_http_request_t *r, ngx_str_t key, ngx_int_t pool_size,
-    ngx_int_t backlog, ngx_http_lua_socket_pool_t **spool);
 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_tcp_upstream_t *u);
 static void ngx_http_lua_socket_keepalive_dummy_handler(ngx_event_t *ev);
-static int ngx_http_lua_socket_tcp_connect_helper(lua_State *L,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, u_char *host_ref, size_t host_len, in_port_t port,
-    unsigned resuming);
-static void ngx_http_lua_socket_tcp_conn_op_timeout_handler(
-    ngx_event_t *ev);
-static int ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler(
-    ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
-static void ngx_http_lua_socket_tcp_resume_conn_op(
-    ngx_http_lua_socket_pool_t *spool);
-static void ngx_http_lua_socket_tcp_conn_op_ctx_cleanup(void *data);
-static void ngx_http_lua_socket_tcp_conn_op_resume_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 int ngx_http_lua_socket_tcp_conn_op_resume_retval_handler(
-    ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u, 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,
@@ -134,13 +113,11 @@ static ngx_int_t ngx_http_lua_socket_add_input_buffer(ngx_http_request_t *r,
     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_tcp_upstream_t *u, u_char *pat, size_t prefix);
-static ngx_int_t ngx_http_lua_socket_tcp_conn_op_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_conn_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_read_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r);
 static ngx_int_t ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r,
     int socket_op);
-static void ngx_http_lua_tcp_queue_conn_op_cleanup(void *data);
 static void ngx_http_lua_tcp_resolve_cleanup(void *data);
 static void ngx_http_lua_coctx_cleanup(void *data);
 static void ngx_http_lua_socket_free_pool(ngx_log_t *log,
@@ -173,8 +150,7 @@ enum {
 enum {
     SOCKET_OP_CONNECT,
     SOCKET_OP_READ,
-    SOCKET_OP_WRITE,
-    SOCKET_OP_RESUME_CONN
+    SOCKET_OP_WRITE
 };
 
 
@@ -253,8 +229,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_setfield(L, -2, "socket");
 
     /* {{{req socket object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          req_socket_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
     lua_createtable(L, 0 /* narr */, 5 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
@@ -276,8 +251,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{raw req socket object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          raw_req_socket_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
     lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
@@ -302,8 +276,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{tcp object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          tcp_socket_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
     lua_createtable(L, 0 /* narr */, 12 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_connect);
@@ -319,9 +292,6 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
     lua_setfield(L, -2, "receive");
 
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveany);
-    lua_setfield(L, -2, "receiveany");
-
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveuntil);
     lua_setfield(L, -2, "receiveuntil");
 
@@ -352,8 +322,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{upstream userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          upstream_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_tcp_upstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -361,8 +330,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{downstream userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          downstream_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_downstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -370,8 +338,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{socket pool userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          pool_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
     lua_createtable(L, 0, 1); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_shutdown_pool);
     lua_setfield(L, -2, "__gc");
@@ -379,8 +346,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* {{{socket compiled pattern userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          pattern_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_cleanup_compiled_pattern);
     lua_setfield(L, -2, "__gc");
@@ -390,8 +356,7 @@ ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
 #if (NGX_HTTP_SSL)
 
     /* {{{ssl session userdata metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          ssl_session_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_ssl_free_session);
     lua_setfield(L, -2, "__gc");
@@ -439,8 +404,7 @@ ngx_http_lua_socket_tcp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
 
     lua_createtable(L, 5 /* narr */, 1 /* nrec */);
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          tcp_socket_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -450,421 +414,31 @@ ngx_http_lua_socket_tcp(lua_State *L)
 }
 
 
-static void
-ngx_http_lua_socket_tcp_create_socket_pool(lua_State *L, ngx_http_request_t *r,
-    ngx_str_t key, ngx_int_t pool_size, ngx_int_t backlog,
-    ngx_http_lua_socket_pool_t **spool)
-{
-    u_char                              *p;
-    size_t                               size, key_len;
-    ngx_int_t                            i;
-    ngx_http_lua_socket_pool_t          *sp;
-    ngx_http_lua_socket_pool_item_t     *items;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket connection pool size: %i, backlog: %i",
-                   pool_size, backlog);
-
-    key_len = ngx_align(key.len + 1, sizeof(void *));
-
-    size = sizeof(ngx_http_lua_socket_pool_t) - 1 + key_len
-           + sizeof(ngx_http_lua_socket_pool_item_t) * pool_size;
-
-    /* before calling this function, the Lua stack is:
-     * -1 key
-     * -2 pools
-     */
-    sp = lua_newuserdata(L, size);
-    if (sp == NULL) {
-        luaL_error(L, "no memory");
-        return;
-    }
-
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          pool_udata_metatable_key));
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    lua_setmetatable(L, -2);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket keepalive create connection pool for key"
-                   " \"%V\"", &key);
-
-    /* a new socket pool with metatable is push to the stack, so now we have:
-     * -1 sp
-     * -2 key
-     * -3 pools
-     *
-     * it is time to set pools[key] to sp.
-     */
-    lua_rawset(L, -3);
-
-    /* clean up the stack for consistency's sake */
-    lua_pop(L, 1);
-
-    sp->backlog = backlog;
-    sp->size = pool_size;
-    sp->connections = 0;
-    sp->lua_vm = ngx_http_lua_get_lua_vm(r, NULL);
-
-    ngx_queue_init(&sp->cache_connect_op);
-    ngx_queue_init(&sp->wait_connect_op);
-    ngx_queue_init(&sp->cache);
-    ngx_queue_init(&sp->free);
-
-    p = ngx_copy(sp->key, key.data, key.len);
-    *p++ = '\0';
-
-    items = (ngx_http_lua_socket_pool_item_t *) (sp->key + key_len);
-
-    dd("items: %p", items);
-
-    ngx_http_lua_assert((void *) items == ngx_align_ptr(items, sizeof(void *)));
-
-    for (i = 0; i < pool_size; i++) {
-        ngx_queue_insert_head(&sp->free, &items[i].queue);
-        items[i].socket_pool = sp;
-    }
-
-    *spool = sp;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_connect_helper(lua_State *L,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, u_char *host_ref, size_t host_len, in_port_t port,
-    unsigned resuming)
-{
-    int                                    n;
-    int                                    host_size;
-    int                                    saved_top;
-    ngx_int_t                              rc;
-    ngx_str_t                              host;
-    ngx_str_t                             *conn_op_host;
-    ngx_url_t                              url;
-    ngx_queue_t                           *q;
-    ngx_resolver_ctx_t                    *rctx, temp;
-    ngx_http_lua_co_ctx_t                 *coctx;
-    ngx_http_core_loc_conf_t              *clcf;
-    ngx_http_lua_socket_pool_t            *spool;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t *conn_op_ctx;
-
-    spool = u->socket_pool;
-    if (spool != NULL) {
-        rc = ngx_http_lua_get_keepalive_peer(r, u);
-
-        if (rc == NGX_OK) {
-            lua_pushinteger(L, 1);
-            return 1;
-        }
-
-        /* rc == NGX_DECLINED */
-
-        spool->connections++;
-
-        /* check if backlog is enabled and
-         * don't queue resuming connection operation */
-        if (spool->backlog >= 0 && !resuming) {
-
-            dd("lua tcp socket %s connections %ld",
-               spool->key, spool->connections);
-
-            if (spool->connections > spool->size + spool->backlog) {
-                spool->connections--;
-                lua_pushnil(L);
-                lua_pushliteral(L, "too many waiting connect operations");
-                return 2;
-            }
-
-            if (spool->connections > spool->size) {
-                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->peer.log, 0,
-                               "lua tcp socket queue connect operation for "
-                               "connection pool \"%s\", connections: %i",
-                               spool->key, spool->connections);
-
-                host_size = sizeof(u_char) *
-                    (ngx_max(host_len, NGX_INET_ADDRSTRLEN) + 1);
-
-                if (!ngx_queue_empty(&spool->cache_connect_op)) {
-                    q = ngx_queue_last(&spool->cache_connect_op);
-                    ngx_queue_remove(q);
-                    conn_op_ctx = ngx_queue_data(
-                        q, ngx_http_lua_socket_tcp_conn_op_ctx_t, queue);
-
-                    conn_op_host = &conn_op_ctx->host;
-                    if (host_len > conn_op_host->len
-                        && host_len > NGX_INET_ADDRSTRLEN)
-                    {
-                        ngx_free(conn_op_host->data);
-                        conn_op_host->data = ngx_alloc(host_size,
-                                                       ngx_cycle->log);
-                        if (conn_op_host->data == NULL) {
-                            ngx_free(conn_op_ctx);
-                            goto no_memory_and_not_resuming;
-                        }
-                    }
-
-                } else {
-                    conn_op_ctx = ngx_alloc(
-                        sizeof(ngx_http_lua_socket_tcp_conn_op_ctx_t),
-                        ngx_cycle->log);
-                    if (conn_op_ctx == NULL) {
-                        goto no_memory_and_not_resuming;
-                    }
-
-                    conn_op_host = &conn_op_ctx->host;
-                    conn_op_host->data = ngx_alloc(host_size, ngx_cycle->log);
-                    if (conn_op_host->data == NULL) {
-                        ngx_free(conn_op_ctx);
-                        goto no_memory_and_not_resuming;
-                    }
-                }
-
-                conn_op_ctx->cleanup = NULL;
-
-                ngx_memcpy(conn_op_host->data, host_ref, host_len);
-                conn_op_host->data[host_len] = '\0';
-                conn_op_host->len = host_len;
-
-                conn_op_ctx->port = port;
-
-                u->write_co_ctx = ctx->cur_co_ctx;
-
-                conn_op_ctx->u = u;
-                ctx->cur_co_ctx->cleanup =
-                    ngx_http_lua_tcp_queue_conn_op_cleanup;
-                ctx->cur_co_ctx->data = conn_op_ctx;
-
-                ngx_memzero(&conn_op_ctx->event, sizeof(ngx_event_t));
-                conn_op_ctx->event.handler =
-                    ngx_http_lua_socket_tcp_conn_op_timeout_handler;
-                conn_op_ctx->event.data = conn_op_ctx;
-                conn_op_ctx->event.log = ngx_cycle->log;
-
-                ngx_add_timer(&conn_op_ctx->event, u->connect_timeout);
-
-                ngx_queue_insert_tail(&spool->wait_connect_op,
-                                      &conn_op_ctx->queue);
-
-                ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                               "lua tcp socket queued connect operation for "
-                               "%d(ms), u: %p, ctx: %p",
-                               u->connect_timeout, conn_op_ctx->u, conn_op_ctx);
-
-                return lua_yield(L, 0);
-            }
-        }
-
-    } /* end spool != NULL */
-
-    host.data = ngx_palloc(r->pool, host_len + 1);
-    if (host.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    host.len = host_len;
-
-    ngx_memcpy(host.data, host_ref, host_len);
-    host.data[host_len] = '\0';
-
-    ngx_memzero(&url, sizeof(ngx_url_t));
-    url.url = host;
-    url.default_port = port;
-    url.no_resolve = 1;
-
-    coctx = ctx->cur_co_ctx;
-
-    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",
-                            url.url.data, url.err);
-
-        } else {
-            lua_pushfstring(L, "failed to parse host name \"%s\"",
-                            url.url.data);
-        }
-
-        goto failed;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "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) {
-        if (resuming) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "no memory");
-            goto failed;
-        }
-
-        goto no_memory_and_not_resuming;
-    }
-
-    if (url.addrs && url.addrs[0].sockaddr) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp 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 = url.default_port;
-    }
-
-    if (u->resolved->sockaddr) {
-        rc = ngx_http_lua_socket_resolve_retval_handler(r, u, L);
-        if (rc == NGX_AGAIN && !resuming) {
-            return lua_yield(L, 0);
-        }
-
-        if (rc > 1) {
-            goto failed;
-        }
-
-        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");
-        goto failed;
-    }
-
-    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);
-        goto failed;
-    }
-
-    rctx->name = host;
-#if !defined(nginx_version) || nginx_version < 1005008
-    rctx->type = NGX_RESOLVE_A;
-#endif
-    rctx->handler = ngx_http_lua_socket_resolve_handler;
-    rctx->data = u;
-    rctx->timeout = clcf->resolver_timeout;
-
-    u->resolved->ctx = rctx;
-    u->write_co_ctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
-    coctx->data = u;
-
-    saved_top = lua_gettop(L);
-
-    if (ngx_resolve_name(rctx) != NGX_OK) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket fail to run resolver immediately");
-
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
-
-        coctx->cleanup = NULL;
-        coctx->data = NULL;
-
-        u->resolved->ctx = NULL;
-        lua_pushnil(L);
-        lua_pushfstring(L, "%s could not be resolved", host.data);
-        goto failed;
-    }
-
-    if (u->conn_waiting) {
-        dd("resolved and already connecting");
-
-        if (resuming) {
-            return NGX_AGAIN;
-        }
-
-        return lua_yield(L, 0);
-    }
-
-    n = lua_gettop(L) - saved_top;
-    if (n) {
-        dd("errors occurred during resolving or connecting"
-           "or already connected");
-
-        if (n > 1) {
-            goto failed;
-        }
-
-        return n;
-    }
-
-    /* still resolving */
-
-    u->conn_waiting = 1;
-    u->write_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;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    if (resuming) {
-        return NGX_AGAIN;
-    }
-
-    return lua_yield(L, 0);
-
-failed:
-
-    if (spool != NULL) {
-        spool->connections--;
-        ngx_http_lua_socket_tcp_resume_conn_op(spool);
-    }
-
-    return 2;
-
-no_memory_and_not_resuming:
-
-    if (spool != NULL) {
-        spool->connections--;
-        ngx_http_lua_socket_tcp_resume_conn_op(spool);
-    }
-
-    return luaL_error(L, "no memory");
-}
-
-
 static int
 ngx_http_lua_socket_tcp_connect(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_peer_connection_t       *pc;
     int                          connect_timeout, send_timeout, read_timeout;
     unsigned                     custom_pool;
     int                          key_index;
-    ngx_int_t                    backlog;
-    ngx_int_t                    pool_size;
-    ngx_str_t                    key;
     const char                  *msg;
+    ngx_http_lua_co_ctx_t       *coctx;
 
     ngx_http_lua_socket_tcp_upstream_t      *u;
 
-    ngx_http_lua_socket_pool_t              *spool;
-
     n = lua_gettop(L);
     if (n != 2 && n != 3 && n != 4) {
         return luaL_error(L, "ngx.socket connect: expecting 2, 3, or 4 "
@@ -892,54 +466,13 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     p = (u_char *) luaL_checklstring(L, 2, &len);
 
-    backlog = -1;
     key_index = 2;
-    pool_size = 0;
     custom_pool = 0;
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
     if (lua_type(L, n) == LUA_TTABLE) {
 
         /* found the last optional option table */
 
-        lua_getfield(L, n, "pool_size");
-
-        if (lua_isnumber(L, -1)) {
-            pool_size = (ngx_int_t) lua_tointeger(L, -1);
-
-            if (pool_size <= 0) {
-                msg = lua_pushfstring(L, "bad \"pool_size\" option value: %i",
-                                      pool_size);
-                return luaL_argerror(L, n, msg);
-            }
-
-        } else if (!lua_isnil(L, -1)) {
-            msg = lua_pushfstring(L, "bad \"pool_size\" option type: %s",
-                                  lua_typename(L, lua_type(L, -1)));
-            return luaL_argerror(L, n, msg);
-        }
-
-        lua_pop(L, 1);
-
-        lua_getfield(L, n, "backlog");
-
-        if (lua_isnumber(L, -1)) {
-            backlog = (ngx_int_t) lua_tointeger(L, -1);
-
-            if (backlog < 0) {
-                msg = lua_pushfstring(L, "bad \"backlog\" option value: %i",
-                                      backlog);
-                return luaL_argerror(L, n, msg);
-            }
-
-            /* use default value for pool size if only backlog specified */
-            if (pool_size == 0) {
-                pool_size = llcf->pool_size;
-            }
-        }
-
-        lua_pop(L, 1);
-
         lua_getfield(L, n, "pool");
 
         switch (lua_type(L, -1)) {
@@ -1039,8 +572,7 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         }
 
 #if 1
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              upstream_udata_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
 #endif
@@ -1050,8 +582,12 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
 
     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;
 
     pc = &u->peer;
@@ -1092,28 +628,163 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
         u->read_timeout = u->conf->read_timeout;
     }
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
-    lua_rawget(L, LUA_REGISTRYINDEX); /* table */
-    lua_pushvalue(L, key_index); /* key */
+    rc = ngx_http_lua_get_keepalive_peer(r, L, key_index, u);
 
-    lua_rawget(L, -2);
-    spool = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    if (spool != NULL) {
-        u->socket_pool = spool;
-
-    } else if (pool_size > 0) {
-        lua_pushvalue(L, key_index);
-        key.data = (u_char *) lua_tolstring(L, -1, &key.len);
-
-        ngx_http_lua_socket_tcp_create_socket_pool(L, r, key, pool_size,
-                                                   backlog, &spool);
-        u->socket_pool = spool;
+    if (rc == NGX_OK) {
+        lua_pushinteger(L, 1);
+        return 1;
     }
 
-    return ngx_http_lua_socket_tcp_connect_helper(L, u, r, ctx, p,
-                                                  len, port, 0);
+    if (rc == NGX_ERROR) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "error in get keepalive peer");
+        return 2;
+    }
+
+    /* rc == NGX_DECLINED */
+
+    /* TODO: we should avoid this in-pool allocation */
+
+    host.data = ngx_palloc(r->pool, len + 1);
+    if (host.data == NULL) {
+        return luaL_error(L, "no memory");
+    }
+
+    host.len = len;
+
+    ngx_memcpy(host.data, p, len);
+    host.data[len] = '\0';
+
+    ngx_memzero(&url, sizeof(ngx_url_t));
+
+    url.url.len = host.len;
+    url.url.data = host.data;
+    url.default_port = (in_port_t) 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;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "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) {
+        return luaL_error(L, "no memory");
+    }
+
+    if (url.addrs && url.addrs[0].sockaddr) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp 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;
+#if !defined(nginx_version) || nginx_version < 1005008
+    rctx->type = NGX_RESOLVE_A;
+#endif
+    rctx->handler = ngx_http_lua_socket_resolve_handler;
+    rctx->data = u;
+    rctx->timeout = clcf->resolver_timeout;
+
+    u->resolved->ctx = rctx;
+    u->write_co_ctx = ctx->cur_co_ctx;
+
+    ngx_http_lua_cleanup_pending_operation(coctx);
+    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
+    coctx->data = u;
+
+    saved_top = lua_gettop(L);
+
+    if (ngx_resolve_name(rctx) != NGX_OK) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket fail to run resolver immediately");
+
+        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
+
+        coctx->cleanup = NULL;
+        coctx->data = NULL;
+
+        u->resolved->ctx = NULL;
+        lua_pushnil(L);
+        lua_pushfstring(L, "%s could not be resolved", host.data);
+
+        return 2;
+    }
+
+    if (u->conn_waiting) {
+        dd("resolved and already connecting");
+        return lua_yield(L, 0);
+    }
+
+    n = lua_gettop(L) - saved_top;
+    if (n) {
+        dd("errors occurred during resolving or connecting"
+           "or already connected");
+        return n;
+    }
+
+    /* still resolving */
+
+    u->conn_waiting = 1;
+    u->write_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;
+
+    } else {
+        r->write_event_handler = ngx_http_core_run_phases;
+    }
+
+    return lua_yield(L, 0);
 }
 
 
@@ -1967,8 +1638,7 @@ ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
                       "lua ssl save session: %p", ssl_session);
 
         /* set up the __gc metamethod */
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              ssl_session_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
     }
@@ -2085,173 +1755,20 @@ ngx_http_lua_socket_tcp_conn_retval_handler(ngx_http_request_t *r,
 }
 
 
-static int
-ngx_http_lua_socket_tcp_receive_helper(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    ngx_int_t                            rc;
-    ngx_http_lua_ctx_t                  *ctx;
-    ngx_http_lua_co_ctx_t               *coctx;
-
-    u->input_filter_ctx = u;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (u->bufs_in == NULL) {
-        u->bufs_in =
-            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                            &ctx->free_recv_bufs,
-                                            u->conf->buffer_size);
-
-        if (u->bufs_in == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        u->buf_in = u->bufs_in;
-        u->buffer = *u->buf_in->buf;
-    }
-
-    dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket read timeout: %M", u->read_timeout);
-
-    if (u->raw_downstream || u->body_downstream) {
-        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
-    }
-
-    u->read_waiting = 0;
-    u->read_co_ctx = NULL;
-
-    rc = ngx_http_lua_socket_tcp_read(r, u);
-
-    if (rc == NGX_ERROR) {
-        dd("read failed: %d", (int) u->ft_type);
-        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-        dd("tcp receive retval returned: %d", (int) rc);
-        return rc;
-    }
-
-    if (rc == NGX_OK) {
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket receive done in a single run");
-
-        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-    }
-
-    /* rc == NGX_AGAIN */
-
-    u->read_event_handler = ngx_http_lua_socket_read_handler;
-
-    coctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_coctx_cleanup;
-    coctx->data = u;
-
-    if (ctx->entered_content_phase) {
-        r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    u->read_co_ctx = coctx;
-    u->read_waiting = 1;
-    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
-
-    dd("setting data to %p, coctx:%p", u, coctx);
-
-    if (u->raw_downstream || u->body_downstream) {
-        ctx->downstream = u;
-    }
-
-    return lua_yield(L, 0);
-}
-
-
-static int
-ngx_http_lua_socket_tcp_receiveany(lua_State *L)
-{
-    int                                  n;
-    lua_Integer                          bytes;
-    ngx_http_request_t                  *r;
-    ngx_http_lua_loc_conf_t             *llcf;
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-
-    n = lua_gettop(L);
-    if (n != 2) {
-        return luaL_error(L, "expecting 2 arguments "
-                          "(including the object), but got %d", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    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->read_closed) {
-
-        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:%d eof:%d",
-                          u, u ? u->peer.connection : NULL,
-                          u ? (int) u->ft_type : 0, u ? (int) u->eof : 0);
-        }
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    if (u->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    ngx_http_lua_socket_check_busy_connecting(r, u, L);
-    ngx_http_lua_socket_check_busy_reading(r, u, L);
-
-    if (!lua_isnumber(L, 2)) {
-        return luaL_argerror(L, 2, "bad max argument");
-    }
-
-    bytes = lua_tointeger(L, 2);
-    if (bytes <= 0) {
-        return luaL_argerror(L, 2, "bad max argument");
-    }
-
-    u->input_filter = ngx_http_lua_socket_read_any;
-    u->rest = (size_t) bytes;
-    u->length = u->rest;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket calling receiveany() method to read at "
-                   "most %uz bytes", u->rest);
-
-    return ngx_http_lua_socket_tcp_receive_helper(r, u, L);
-}
-
-
 static int
 ngx_http_lua_socket_tcp_receive(lua_State *L)
 {
     ngx_http_request_t                  *r;
     ngx_http_lua_socket_tcp_upstream_t  *u;
+    ngx_int_t                            rc;
+    ngx_http_lua_ctx_t                  *ctx;
     int                                  n;
     ngx_str_t                            pat;
     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) {
@@ -2366,27 +1883,119 @@ ngx_http_lua_socket_tcp_receive(lua_State *L)
         u->rest = 0;
     }
 
-    return ngx_http_lua_socket_tcp_receive_helper(r, u, L);
+    u->input_filter_ctx = u;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+
+    if (u->bufs_in == NULL) {
+        u->bufs_in =
+            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
+                                            &ctx->free_recv_bufs,
+                                            u->conf->buffer_size);
+
+        if (u->bufs_in == NULL) {
+            return luaL_error(L, "no memory");
+        }
+
+        u->buf_in = u->bufs_in;
+        u->buffer = *u->buf_in->buf;
+    }
+
+    dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
+
+    if (u->raw_downstream || u->body_downstream) {
+        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
+    }
+
+    u->read_waiting = 0;
+    u->read_co_ctx = NULL;
+
+    rc = ngx_http_lua_socket_tcp_read(r, u);
+
+    if (rc == NGX_ERROR) {
+        dd("read failed: %d", (int) u->ft_type);
+        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
+        dd("tcp receive retval returned: %d", (int) rc);
+        return rc;
+    }
+
+    if (rc == NGX_OK) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket receive done in a single run");
+
+        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
+    }
+
+    /* rc == NGX_AGAIN */
+
+    u->read_event_handler = ngx_http_lua_socket_read_handler;
+
+    coctx = ctx->cur_co_ctx;
+
+    ngx_http_lua_cleanup_pending_operation(coctx);
+    coctx->cleanup = ngx_http_lua_coctx_cleanup;
+    coctx->data = u;
+
+    if (ctx->entered_content_phase) {
+        r->write_event_handler = ngx_http_lua_content_wev_handler;
+
+    } else {
+        r->write_event_handler = ngx_http_core_run_phases;
+    }
+
+    u->read_co_ctx = coctx;
+    u->read_waiting = 1;
+    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
+
+    dd("setting data to %p, coctx:%p", u, coctx);
+
+    if (u->raw_downstream || u->body_downstream) {
+        ctx->downstream = u;
+    }
+
+    return lua_yield(L, 0);
 }
 
 
 static ngx_int_t
 ngx_http_lua_socket_read_chunk(void *data, ssize_t bytes)
 {
-    ngx_int_t                                rc;
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+    ngx_buf_t                   *b;
+#if (NGX_DEBUG)
+    ngx_http_request_t          *r;
+
+    r = u->request;
+#endif
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua tcp socket read chunk %z", bytes);
 
-    rc = ngx_http_lua_read_bytes(&u->buffer, u->buf_in, &u->rest,
-                                 bytes, u->request->connection->log);
-    if (rc == NGX_ERROR) {
+    if (bytes == 0) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
         return NGX_ERROR;
     }
 
-    return rc;
+    b = &u->buffer;
+
+    if (bytes >= (ssize_t) u->rest) {
+
+        u->buf_in->buf->last += u->rest;
+        b->pos += u->rest;
+        u->rest = 0;
+
+        return NGX_OK;
+    }
+
+    /* bytes < u->rest */
+
+    u->buf_in->buf->last += bytes;
+    b->pos += bytes;
+    u->rest -= bytes;
+
+    return NGX_AGAIN;
 }
 
 
@@ -2395,10 +2004,26 @@ ngx_http_lua_socket_read_all(void *data, ssize_t bytes)
 {
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+    ngx_buf_t                   *b;
+#if (NGX_DEBUG)
+    ngx_http_request_t          *r;
+
+    r = u->request;
+#endif
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua tcp socket read all");
-    return ngx_http_lua_read_all(&u->buffer, u->buf_in, bytes,
-                                 u->request->connection->log);
+
+    if (bytes == 0) {
+        return NGX_OK;
+    }
+
+    b = &u->buffer;
+
+    u->buf_in->buf->last += bytes;
+    b->pos += bytes;
+
+    return NGX_AGAIN;
 }
 
 
@@ -2407,40 +2032,72 @@ ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
 {
     ngx_http_lua_socket_tcp_upstream_t      *u = data;
 
-    ngx_int_t                    rc;
+    ngx_buf_t                   *b;
+    u_char                      *dst;
+    u_char                       c;
+#if (NGX_DEBUG)
+    u_char                      *begin;
+#endif
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
                    "lua tcp socket read line");
 
-    rc = ngx_http_lua_read_line(&u->buffer, u->buf_in, bytes,
-                                u->request->connection->log);
-    if (rc == NGX_ERROR) {
+    if (bytes == 0) {
         u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
         return NGX_ERROR;
     }
 
-    return rc;
-}
+    b = &u->buffer;
 
+#if (NGX_DEBUG)
+    begin = b->pos;
+#endif
 
-static ngx_int_t
-ngx_http_lua_socket_read_any(void *data, ssize_t bytes)
-{
-    ngx_http_lua_socket_tcp_upstream_t      *u = data;
+    dd("already read: %p: %.*s", u->buf_in,
+       (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
+       u->buf_in->buf->pos);
 
-    ngx_int_t                    rc;
+    dd("data read: %.*s", (int) bytes, b->pos);
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "lua tcp socket read any");
+    dst = u->buf_in->buf->last;
 
-    rc = ngx_http_lua_read_any(&u->buffer, u->buf_in, &u->rest, bytes,
-                               u->request->connection->log);
-    if (rc == NGX_ERROR) {
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
-        return NGX_ERROR;
+    while (bytes--) {
+
+        c = *b->pos++;
+
+        switch (c) {
+        case '\n':
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+                           "lua tcp socket read the final line part: \"%*s\"",
+                           b->pos - 1 - begin, begin);
+
+            u->buf_in->buf->last = dst;
+
+            dd("read a line: %p: %.*s", u->buf_in,
+               (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
+               u->buf_in->buf->pos);
+
+            return NGX_OK;
+
+        case '\r':
+            /* ignore it */
+            break;
+
+        default:
+            *dst++ = c;
+            break;
+        }
     }
 
-    return rc;
+#if (NGX_DEBUG)
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
+                   "lua tcp socket read partial line data: %*s",
+                   dst - begin, begin);
+#endif
+
+    u->buf_in->buf->last = dst;
+
+    return NGX_AGAIN;
 }
 
 
@@ -3882,267 +3539,6 @@ ngx_http_lua_socket_tcp_finalize_write_part(ngx_http_request_t *r,
 }
 
 
-static void
-ngx_http_lua_socket_tcp_conn_op_timeout_handler(ngx_event_t *ev)
-{
-    ngx_http_lua_socket_tcp_upstream_t      *u;
-    ngx_http_lua_ctx_t                      *ctx;
-    ngx_connection_t                        *c;
-    ngx_http_request_t                      *r;
-    ngx_http_lua_co_ctx_t                   *coctx;
-    ngx_http_lua_loc_conf_t                 *llcf;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
-
-    conn_op_ctx = ev->data;
-    ngx_queue_remove(&conn_op_ctx->queue);
-
-    u = conn_op_ctx->u;
-    r = u->request;
-
-    coctx = u->write_co_ctx;
-    coctx->cleanup = NULL;
-    /* note that we store conn_op_ctx in coctx->data instead of u */
-    coctx->data = conn_op_ctx;
-    u->write_co_ctx = 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,
-                      "lua tcp socket queued connect timed out,"
-                      " when trying to connect to %V:%ud",
-                      &conn_op_ctx->host, conn_op_ctx->port);
-    }
-
-    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
-                          &conn_op_ctx->queue);
-    u->socket_pool->connections--;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    ctx->cur_co_ctx = coctx;
-
-    ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                        || coctx->co_ref >= 0));
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket waking up the current request");
-
-    u->write_prepare_retvals =
-        ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler;
-
-    c = r->connection;
-
-    if (ctx->entered_content_phase) {
-        (void) ngx_http_lua_socket_tcp_conn_op_resume(r);
-
-    } else {
-        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_op_resume;
-        ngx_http_core_run_phases(r);
-    }
-
-    ngx_http_run_posted_requests(c);
-}
-
-
-static int
-ngx_http_lua_socket_tcp_conn_op_timeout_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    lua_pushnil(L);
-    lua_pushliteral(L, "timeout");
-    return 2;
-}
-
-
-static void
-ngx_http_lua_socket_tcp_resume_conn_op(ngx_http_lua_socket_pool_t *spool)
-{
-    ngx_queue_t                             *q;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
-
-#if (NGX_DEBUG)
-    ngx_http_lua_assert(spool->connections >= 0);
-
-#else
-    if (spool->connections < 0) {
-        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                      "lua tcp socket connections count mismatched for "
-                      "connection pool \"%s\", connections: %i, size: %i",
-                      spool->key, spool->connections, spool->size);
-        spool->connections = 0;
-    }
-#endif
-
-    /* we manually destroy wait_connect_op before triggering connect
-     * operation resumption, so that there is no resumption happens when Nginx
-     * is exiting.
-     */
-    if (ngx_queue_empty(&spool->wait_connect_op)) {
-        return;
-    }
-
-    q = ngx_queue_head(&spool->wait_connect_op);
-    conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
-                                 queue);
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua tcp socket post connect operation resumption "
-                   "u: %p, ctx: %p for connection pool \"%s\", "
-                   "connections: %i",
-                   conn_op_ctx->u, conn_op_ctx, spool->key, spool->connections);
-
-    if (conn_op_ctx->event.timer_set) {
-        ngx_del_timer(&conn_op_ctx->event);
-    }
-
-    conn_op_ctx->event.handler =
-        ngx_http_lua_socket_tcp_conn_op_resume_handler;
-
-    ngx_post_event((&conn_op_ctx->event), &ngx_posted_events);
-}
-
-
-static void
-ngx_http_lua_socket_tcp_conn_op_ctx_cleanup(void *data)
-{
-    ngx_http_lua_socket_tcp_upstream_t     *u;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t  *conn_op_ctx = data;
-
-    u = conn_op_ctx->u;
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "cleanup lua tcp socket conn_op_ctx: \"%V\"",
-                   &u->request->uri);
-
-    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
-                          &conn_op_ctx->queue);
-}
-
-
-static void
-ngx_http_lua_socket_tcp_conn_op_resume_handler(ngx_event_t *ev)
-{
-    ngx_queue_t                             *q;
-    ngx_connection_t                        *c;
-    ngx_http_lua_ctx_t                      *ctx;
-    ngx_http_request_t                      *r;
-    ngx_http_cleanup_t                      *cln;
-    ngx_http_lua_co_ctx_t                   *coctx;
-    ngx_http_lua_socket_pool_t              *spool;
-    ngx_http_lua_socket_tcp_upstream_t      *u;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
-
-    conn_op_ctx = ev->data;
-    u = conn_op_ctx->u;
-    r = u->request;
-    spool = u->socket_pool;
-
-    if (ngx_queue_empty(&spool->wait_connect_op)) {
-#if (NGX_DEBUG)
-        ngx_http_lua_assert(!(spool->backlog >= 0
-                              && spool->connections > spool->size));
-
-#else
-        if (spool->backlog >= 0 && spool->connections > spool->size) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                          "lua tcp socket connections count mismatched for "
-                          "connection pool \"%s\", connections: %i, size: %i",
-                          spool->key, spool->connections, spool->size);
-            spool->connections = spool->size;
-        }
-#endif
-
-        return;
-    }
-
-    q = ngx_queue_head(&spool->wait_connect_op);
-    ngx_queue_remove(q);
-
-    coctx = u->write_co_ctx;
-    coctx->cleanup = NULL;
-    /* note that we store conn_op_ctx in coctx->data instead of u */
-    coctx->data = conn_op_ctx;
-    /* clear ngx_http_lua_tcp_queue_conn_op_cleanup */
-    u->write_co_ctx = NULL;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        ngx_queue_insert_head(&spool->cache_connect_op,
-                              &conn_op_ctx->queue);
-        return;
-    }
-
-    ctx->cur_co_ctx = coctx;
-
-    ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                        || coctx->co_ref >= 0));
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket waking up the current request");
-
-    u->write_prepare_retvals =
-        ngx_http_lua_socket_tcp_conn_op_resume_retval_handler;
-
-    c = r->connection;
-
-    if (ctx->entered_content_phase) {
-        (void) ngx_http_lua_socket_tcp_conn_op_resume(r);
-
-    } else {
-        cln = ngx_http_lua_cleanup_add(r, 0);
-        if (cln != NULL) {
-            cln->handler = ngx_http_lua_socket_tcp_conn_op_ctx_cleanup;
-            cln->data = conn_op_ctx;
-            conn_op_ctx->cleanup = &cln->handler;
-        }
-
-        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_op_resume;
-        ngx_http_core_run_phases(r);
-    }
-
-    ngx_http_run_posted_requests(c);
-}
-
-
-static int
-ngx_http_lua_socket_tcp_conn_op_resume_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    int                                      nret;
-    ngx_http_lua_ctx_t                      *ctx;
-    ngx_http_lua_co_ctx_t                   *coctx;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    coctx = ctx->cur_co_ctx;
-    dd("coctx: %p", coctx);
-    conn_op_ctx = coctx->data;
-    if (conn_op_ctx->cleanup != NULL) {
-        *conn_op_ctx->cleanup = NULL;
-        ngx_http_lua_cleanup_free(r, conn_op_ctx->cleanup);
-        conn_op_ctx->cleanup = NULL;
-    }
-
-    /* decrease pending connect operation counter */
-    u->socket_pool->connections--;
-
-    nret = ngx_http_lua_socket_tcp_connect_helper(L, u, r, ctx,
-                                                  conn_op_ctx->host.data,
-                                                  conn_op_ctx->host.len,
-                                                  conn_op_ctx->port, 1);
-    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
-                          &conn_op_ctx->queue);
-
-    return nret;
-}
-
-
 static void
 ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
     ngx_http_lua_socket_tcp_upstream_t *u)
@@ -4193,21 +3589,21 @@ ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
 
         ngx_http_lua_socket_tcp_close_connection(c);
         u->peer.connection = NULL;
-        u->conn_closed = 1;
+
+        if (!u->reused) {
+            return;
+        }
 
         spool = u->socket_pool;
         if (spool == NULL) {
             return;
         }
 
-        spool->connections--;
+        spool->active_connections--;
 
-        if (spool->connections == 0) {
+        if (spool->active_connections == 0) {
             ngx_http_lua_socket_free_pool(r->connection->log, spool);
-            return;
         }
-
-        ngx_http_lua_socket_tcp_resume_conn_op(spool);
     }
 }
 
@@ -4379,8 +3775,7 @@ ngx_http_lua_socket_tcp_receiveuntil(lua_State *L)
         return luaL_error(L, "no memory");
     }
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          pattern_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -5035,12 +4430,10 @@ ngx_http_lua_req_socket(lua_State *L)
     lua_createtable(L, 2 /* narr */, 3 /* nrec */); /* the object */
 
     if (raw) {
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              raw_req_socket_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
 
     } else {
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              req_socket_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
     }
 
     lua_rawget(L, LUA_REGISTRYINDEX);
@@ -5052,8 +4445,7 @@ ngx_http_lua_req_socket(lua_State *L)
     }
 
 #if 1
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          downstream_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 #endif
@@ -5180,18 +4572,20 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     ngx_http_lua_socket_tcp_upstream_t  *u;
     ngx_connection_t                    *c;
     ngx_http_lua_socket_pool_t          *spool;
+    size_t                               size, key_len;
     ngx_str_t                            key;
+    ngx_uint_t                           i;
     ngx_queue_t                         *q;
     ngx_peer_connection_t               *pc;
+    u_char                              *p;
     ngx_http_request_t                  *r;
     ngx_msec_t                           timeout;
-    ngx_int_t                            pool_size;
+    ngx_uint_t                           pool_size;
     int                                  n;
     ngx_int_t                            rc;
     ngx_buf_t                           *b;
-    const char                          *msg;
 
-    ngx_http_lua_socket_pool_item_t     *item;
+    ngx_http_lua_socket_pool_item_t     *items, *item;
 
     n = lua_gettop(L);
 
@@ -5202,6 +4596,17 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
 
     luaL_checktype(L, 1, LUA_TTABLE);
 
+    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);
+    if (key.data == NULL) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "key not found");
+        return 2;
+    }
+
     lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
     u = lua_touserdata(L, -1);
     lua_pop(L, 1);
@@ -5212,7 +4617,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         return 2;
     }
 
-    /* stack: obj timeout? size? */
+    /* stack: obj cache key */
 
     pc = &u->peer;
     c = pc->connection;
@@ -5264,32 +4669,9 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
         return 2;
     }
 
-    if (ngx_terminate || ngx_exiting) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "lua tcp socket set keepalive while process exiting, "
-                       "closing connection %p", c);
-
-        ngx_http_lua_socket_tcp_finalize(r, u);
-        lua_pushinteger(L, 1);
-        return 1;
-    }
-
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket set keepalive: saving connection %p", c);
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
-    lua_rawget(L, LUA_REGISTRYINDEX);
-
-    /* stack: obj timeout? size? pools */
-
-    lua_rawgeti(L, 1, SOCKET_KEY_INDEX);
-    key.data = (u_char *) lua_tolstring(L, -1, &key.len);
-    if (key.data == NULL) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key not found");
-        return 2;
-    }
-
     dd("saving connection to key %s", lua_tostring(L, -1));
 
     lua_pushvalue(L, -1);
@@ -5297,7 +4679,7 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     spool = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    /* stack: obj timeout? size? pools cache_key */
+    /* stack: obj timeout? size? cache key */
 
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
@@ -5311,49 +4693,82 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
             pool_size = llcf->pool_size;
         }
 
-        if (pool_size <= 0) {
-            msg = lua_pushfstring(L, "bad \"pool_size\" option value: %i",
-                                  pool_size);
-            return luaL_argerror(L, n, msg);
+        if (pool_size == 0) {
+            lua_pushnil(L);
+            lua_pushliteral(L, "zero pool size");
+            return 2;
         }
 
-        ngx_http_lua_socket_tcp_create_socket_pool(L, r, key, pool_size, -1,
-                                                   &spool);
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua tcp socket connection pool size: %ui", pool_size);
+
+        key_len = ngx_align(key.len + 1, sizeof(void *));
+
+        size = sizeof(ngx_http_lua_socket_pool_t) + key_len - 1
+               + sizeof(ngx_http_lua_socket_pool_item_t)
+               * pool_size;
+
+        spool = lua_newuserdata(L, size);
+        if (spool == NULL) {
+            return luaL_error(L, "no memory");
+        }
+
+        lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
+        lua_rawget(L, LUA_REGISTRYINDEX);
+        lua_setmetatable(L, -2);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                       "lua tcp socket keepalive create connection pool for key"
+                       " \"%s\"", lua_tostring(L, -2));
+
+        lua_rawset(L, -3);
+
+        spool->active_connections = 0;
+        spool->lua_vm = ngx_http_lua_get_lua_vm(r, NULL);
+
+        ngx_queue_init(&spool->cache);
+        ngx_queue_init(&spool->free);
+
+        p = ngx_copy(spool->key, key.data, key.len);
+        *p++ = '\0';
+
+        items = (ngx_http_lua_socket_pool_item_t *) (spool->key + key_len);
+
+        dd("items: %p", items);
+
+        ngx_http_lua_assert((void *) items == ngx_align_ptr(items,
+                                                            sizeof(void *)));
+
+        for (i = 0; i < pool_size; i++) {
+            ngx_queue_insert_head(&spool->free, &items[i].queue);
+            items[i].socket_pool = spool;
+        }
     }
 
     if (ngx_queue_empty(&spool->free)) {
 
         q = ngx_queue_last(&spool->cache);
         ngx_queue_remove(q);
+        spool->active_connections--;
 
         item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
 
         ngx_http_lua_socket_tcp_close_connection(item->connection);
 
-        /* only decrease the counter for connections which were counted */
-        if (u->socket_pool != NULL) {
-            u->socket_pool->connections--;
-        }
-
     } else {
         q = ngx_queue_head(&spool->free);
         ngx_queue_remove(q);
 
         item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
-
-        /* we should always increase connections after getting connected,
-         * and decrease connections after getting closed.
-         * however, we don't create connection pool in previous connect method.
-         * so we increase connections here for backward compatibility.
-         */
-        if (u->socket_pool == NULL) {
-            spool->connections++;
-        }
     }
 
     item->connection = c;
     ngx_queue_insert_head(&spool->cache, q);
 
+    if (!u->reused) {
+        spool->active_connections++;
+    }
+
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket clear current socket connection");
 
@@ -5422,33 +4837,48 @@ ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     ngx_http_lua_socket_tcp_finalize(r, u);
 #endif
 
-    /* since we set u->peer->connection to NULL previously, the connect
-     * operation won't be resumed in the ngx_http_lua_socket_tcp_finalize.
-     * Therefore we need to resume it here.
-     */
-    ngx_http_lua_socket_tcp_resume_conn_op(spool);
-
     lua_pushinteger(L, 1);
     return 1;
 }
 
 
 static ngx_int_t
-ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
+ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r, lua_State *L,
+    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;
     ngx_http_cleanup_t                  *cln;
     ngx_queue_t                         *q;
+    int                                  top;
     ngx_peer_connection_t               *pc;
     ngx_connection_t                    *c;
 
+    top = lua_gettop(L);
+
+    if (key_index < 0) {
+        key_index = top + key_index + 1;
+    }
+
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua tcp socket pool get keepalive peer");
 
     pc = &u->peer;
-    spool = u->socket_pool;
+
+    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 tcp socket keepalive connection pool not found");
+        lua_settop(L, top);
+        return NGX_DECLINED;
+    }
+
+    u->socket_pool = spool;
 
     if (!ngx_queue_empty(&spool->cache)) {
         q = ngx_queue_head(&spool->cache);
@@ -5493,6 +4923,7 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
             cln = ngx_http_lua_cleanup_add(r, 0);
             if (cln == NULL) {
                 u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
+                lua_settop(L, top);
                 return NGX_ERROR;
             }
 
@@ -5501,12 +4932,16 @@ ngx_http_lua_get_keepalive_peer(ngx_http_request_t *r,
             u->cleanup = &cln->handler;
         }
 
+        lua_settop(L, top);
+
         return NGX_OK;
     }
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                    "lua tcp socket keepalive: connection pool empty");
 
+    lua_settop(L, top);
+
     return NGX_DECLINED;
 }
 
@@ -5578,15 +5013,13 @@ close:
 
     ngx_queue_remove(&item->queue);
     ngx_queue_insert_head(&spool->free, &item->queue);
-    spool->connections--;
+    spool->active_connections--;
 
-    dd("keepalive: connections: %u", (unsigned) spool->connections);
+    dd("keepalive: active connections: %u",
+       (unsigned) spool->active_connections);
 
-    if (spool->connections == 0) {
+    if (spool->active_connections == 0) {
         ngx_http_lua_socket_free_pool(ev->log, spool);
-
-    } else {
-        ngx_http_lua_socket_tcp_resume_conn_op(spool);
     }
 
     return NGX_DECLINED;
@@ -5604,7 +5037,7 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 
     L = spool->lua_vm;
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(socket_pool_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushstring(L, (char *) spool->key);
     lua_pushnil(L);
@@ -5616,10 +5049,9 @@ ngx_http_lua_socket_free_pool(ngx_log_t *log, ngx_http_lua_socket_pool_t *spool)
 static void
 ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
 {
-    ngx_queue_t                             *q;
-    ngx_connection_t                        *c;
-    ngx_http_lua_socket_pool_item_t         *item;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t   *conn_op_ctx;
+    ngx_queue_t                         *q;
+    ngx_connection_t                    *c;
+    ngx_http_lua_socket_pool_item_t     *item;
 
     while (!ngx_queue_empty(&spool->cache)) {
         q = ngx_queue_head(&spool->cache);
@@ -5633,29 +5065,7 @@ ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
         ngx_queue_insert_head(&spool->free, q);
     }
 
-    while (!ngx_queue_empty(&spool->cache_connect_op)) {
-        q = ngx_queue_head(&spool->cache_connect_op);
-        ngx_queue_remove(q);
-        conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
-                                     queue);
-        ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx);
-    }
-
-    while (!ngx_queue_empty(&spool->wait_connect_op)) {
-        q = ngx_queue_head(&spool->wait_connect_op);
-        ngx_queue_remove(q);
-        conn_op_ctx = ngx_queue_data(q, ngx_http_lua_socket_tcp_conn_op_ctx_t,
-                                     queue);
-
-        if (conn_op_ctx->event.timer_set) {
-            ngx_del_timer(&conn_op_ctx->event);
-        }
-
-        ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx);
-    }
-
-    /* spool->connections will be decreased down to zero in
-     * ngx_http_lua_socket_tcp_finalize */
+    spool->active_connections = 0;
 }
 
 
@@ -5909,13 +5319,6 @@ static ngx_int_t ngx_http_lua_socket_insert_buffer(ngx_http_request_t *r,
 }
 
 
-static ngx_int_t
-ngx_http_lua_socket_tcp_conn_op_resume(ngx_http_request_t *r)
-{
-    return ngx_http_lua_socket_tcp_resume_helper(r, SOCKET_OP_RESUME_CONN);
-}
-
-
 static ngx_int_t
 ngx_http_lua_socket_tcp_conn_resume(ngx_http_request_t *r)
 {
@@ -5940,14 +5343,13 @@ ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 {
-    int                                    nret;
-    lua_State                             *vm;
-    ngx_int_t                              rc;
-    ngx_uint_t                             nreqs;
-    ngx_connection_t                      *c;
-    ngx_http_lua_ctx_t                    *ctx;
-    ngx_http_lua_co_ctx_t                 *coctx;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t *conn_op_ctx;
+    int                          nret;
+    lua_State                   *vm;
+    ngx_int_t                    rc;
+    ngx_uint_t                   nreqs;
+    ngx_connection_t            *c;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx;
 
     ngx_http_lua_socket_tcp_retval_handler  prepare_retvals;
 
@@ -5967,22 +5369,15 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 
     dd("coctx: %p", coctx);
 
+    u = coctx->data;
+
     switch (socket_op) {
-
-    case SOCKET_OP_RESUME_CONN:
-        conn_op_ctx = coctx->data;
-        u = conn_op_ctx->u;
-        prepare_retvals = u->write_prepare_retvals;
-        break;
-
     case SOCKET_OP_CONNECT:
     case SOCKET_OP_WRITE:
-        u = coctx->data;
         prepare_retvals = u->write_prepare_retvals;
         break;
 
     case SOCKET_OP_READ:
-        u = coctx->data;
         prepare_retvals = u->read_prepare_retvals;
         break;
 
@@ -5996,15 +5391,6 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
                    "u:%p", prepare_retvals, u);
 
     nret = prepare_retvals(r, u, ctx->cur_co_ctx->co);
-    if (socket_op == SOCKET_OP_CONNECT
-        && nret > 1
-        && !u->conn_closed
-        && u->socket_pool != NULL)
-    {
-        u->socket_pool->connections--;
-        ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
-    }
-
     if (nret == NGX_AGAIN) {
         return NGX_DONE;
     }
@@ -6036,36 +5422,6 @@ ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
 }
 
 
-static void
-ngx_http_lua_tcp_queue_conn_op_cleanup(void *data)
-{
-    ngx_http_lua_co_ctx_t                  *coctx = data;
-    ngx_http_lua_socket_tcp_upstream_t     *u;
-    ngx_http_lua_socket_tcp_conn_op_ctx_t  *conn_op_ctx;
-
-    conn_op_ctx = coctx->data;
-    u = conn_op_ctx->u;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua tcp socket abort queueing, conn_op_ctx: %p, u: %p",
-                   conn_op_ctx, u);
-
-    if (conn_op_ctx->event.posted) {
-        ngx_delete_posted_event(&conn_op_ctx->event);
-
-    } else if (conn_op_ctx->event.timer_set) {
-        ngx_del_timer(&conn_op_ctx->event);
-    }
-
-    ngx_queue_remove(&conn_op_ctx->queue);
-    ngx_queue_insert_head(&u->socket_pool->cache_connect_op,
-                          &conn_op_ctx->queue);
-
-    u->socket_pool->connections--;
-    ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
-}
-
-
 static void
 ngx_http_lua_tcp_resolve_cleanup(void *data)
 {
@@ -6081,11 +5437,6 @@ ngx_http_lua_tcp_resolve_cleanup(void *data)
         return;
     }
 
-    if (u->socket_pool != NULL) {
-        u->socket_pool->connections--;
-        ngx_http_lua_socket_tcp_resume_conn_op(u->socket_pool);
-    }
-
     rctx = u->resolved->ctx;
     if (rctx == NULL) {
         return;
@@ -6145,8 +5496,7 @@ ngx_http_lua_cleanup_conn_pools(lua_State *L)
 {
     ngx_http_lua_socket_pool_t          *spool;
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          socket_pool_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
     lua_rawget(L, LUA_REGISTRYINDEX); /* table */
 
     lua_pushnil(L);  /* first key */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
index 091e437..dbdee41 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
@@ -35,39 +35,17 @@ 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 {
-    ngx_event_t                         event;
-    ngx_queue_t                         queue;
-    ngx_str_t                           host;
-    ngx_http_cleanup_pt                *cleanup;
-    ngx_http_lua_socket_tcp_upstream_t *u;
-    in_port_t                           port;
-} ngx_http_lua_socket_tcp_conn_op_ctx_t;
-
-
-#define ngx_http_lua_socket_tcp_free_conn_op_ctx(conn_op_ctx)                \
-    ngx_free(conn_op_ctx->host.data);                                        \
-    ngx_free(conn_op_ctx)
-
-
 typedef struct {
     lua_State                         *lua_vm;
 
-    ngx_int_t                          size;
-    ngx_queue_t                        cache_connect_op;
-    ngx_queue_t                        wait_connect_op;
-
-    /* connections == active connections + pending connect operations,
-     * while active connections == out-of-pool reused connections
-     *                             + in-pool connections */
-    ngx_int_t                          connections;
+    /* active connections == out-of-pool reused connections
+     *                       + in-pool connections */
+    ngx_uint_t                         active_connections;
 
     /* queues of ngx_http_lua_socket_pool_item_t: */
     ngx_queue_t                        cache;
     ngx_queue_t                        free;
 
-    ngx_int_t                          backlog;
-
     u_char                             key[1];
 
 } ngx_http_lua_socket_pool_t;
@@ -126,7 +104,6 @@ struct ngx_http_lua_socket_tcp_upstream_s {
     unsigned                         raw_downstream:1;
     unsigned                         read_closed:1;
     unsigned                         write_closed:1;
-    unsigned                         conn_closed:1;
 #if (NGX_HTTP_SSL)
     unsigned                         ssl_verify:1;
     unsigned                         ssl_session_reuse:1;
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
index cbc32d6..8927f41 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
@@ -81,8 +81,7 @@ ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
     lua_setfield(L, -2, "udp"); /* ngx socket */
 
     /* udp socket object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          socket_udp_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
     lua_createtable(L, 0 /* narr */, 6 /* nrec */);
 
     lua_pushcfunction(L, ngx_http_lua_socket_udp_setpeername);
@@ -106,8 +105,7 @@ ngx_http_lua_inject_socket_udp_api(ngx_log_t *log, lua_State *L)
     /* }}} */
 
     /* udp socket object metatable */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          udp_udata_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
     lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
     lua_pushcfunction(L, ngx_http_lua_socket_udp_upstream_destroy);
     lua_setfield(L, -2, "__gc");
@@ -146,8 +144,7 @@ ngx_http_lua_socket_udp(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
 
     lua_createtable(L, 3 /* narr */, 1 /* nrec */);
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          socket_udp_metatable_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_udp_metatable_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_setmetatable(L, -2);
 
@@ -266,8 +263,7 @@ ngx_http_lua_socket_udp_setpeername(lua_State *L)
         }
 
 #if 1
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              udp_udata_metatable_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         lua_setmetatable(L, -2);
 #endif
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
index 622d0a5..453a5c7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
@@ -498,11 +498,9 @@ ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /* save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
index 303efb4..0b88a87 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
@@ -505,11 +505,9 @@ ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  move code closure to new coroutine */
     lua_xmove(L, co, 1);
 
-#ifndef OPENRESTY_LUAJIT
     /*  set closure's env table to new coroutine's globals table */
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /* save nginx request in coroutine globals table */
     ngx_http_lua_set_req(co, r);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
index a02f729..7609c39 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
@@ -380,8 +380,6 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
 
     /* init nginx context in Lua VM */
     ngx_http_lua_set_req(L, r);
-
-#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
 
     /*  {{{ make new env inheriting main thread's globals table */
@@ -392,7 +390,6 @@ ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
     /*  }}} */
 
     lua_setfenv(L, -2);    /*  set new running env for the code closure */
-#endif
 
     lua_pushcfunction(L, ngx_http_lua_traceback);
     lua_insert(L, 1);  /* put it under chunk and args */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_string.c b/debian/modules/http-lua/src/ngx_http_lua_string.c
index bdadeb4..239b232 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_string.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_string.c
@@ -762,20 +762,6 @@ ngx_http_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst)
     ngx_http_lua_escape_uri(dst, (u_char *) src, len, NGX_ESCAPE_URI_COMPONENT);
 }
 
-
-void
-ngx_http_lua_ffi_str_replace_char(u_char *buf, size_t len, const u_char find,
-    const u_char replace)
-{
-    while (len) {
-        if (*buf == find) {
-            *buf = replace;
-        }
-
-        buf++;
-        len--;
-    }
-}
 #endif
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
index f312b65..826a43c 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
@@ -1031,14 +1031,6 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
     dd("pr_coctx status: %d", (int) pr_coctx->sr_statuses[ctx->index]);
 
     /* copy subrequest response headers */
-    if (ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r, ctx);
-        if (rc != NGX_OK) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "failed to set default content type: %i", rc);
-            return NGX_ERROR;
-        }
-    }
 
     pr_coctx->sr_headers[ctx->index] = &r->headers_out;
 
diff --git a/debian/modules/http-lua/src/ngx_http_lua_timer.c b/debian/modules/http-lua/src/ngx_http_lua_timer.c
index e92c211..596b2f7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_timer.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_timer.c
@@ -220,7 +220,6 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
 
     ngx_http_lua_probe_user_coroutine_create(r, L, co);
 
-#ifndef OPENRESTY_LUAJIT
     lua_createtable(co, 0, 0);  /* the new globals table */
 
     /* co stack: global_tb */
@@ -233,7 +232,6 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
     /* co stack: global_tb */
 
     ngx_http_lua_set_globals_table(co);
-#endif
 
     /* co stack: <empty> */
 
@@ -253,15 +251,12 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
     /* L stack: time func [args] thread */
     /* co stack: func */
 
-#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /* co stack: func */
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     /* L stack: time func [args] thread coroutines */
@@ -350,9 +345,6 @@ ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
 
     ngx_add_timer(ev, delay);
 
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "created timer (co: %p delay: %M ms)", tctx->co, delay);
-
     lua_pushinteger(L, 1);
     return 1;
 
@@ -366,8 +358,7 @@ nomem:
         ngx_free(ev);
     }
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     luaL_unref(L, -1, co_ref);
 
@@ -396,7 +387,6 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
 
     co = lua_newthread(vm);
 
-#ifndef OPENRESTY_LUAJIT
     lua_createtable(co, 0, 0);  /* the new globals table */
 
     /* co stack: global_tb */
@@ -409,7 +399,6 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
     /* co stack: global_tb */
 
     ngx_http_lua_set_globals_table(co);
-#endif
 
     /* co stack: <empty> */
 
@@ -429,15 +418,12 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
     /* L stack: func [args] thread */
     /* co stack: func */
 
-#ifndef OPENRESTY_LUAJIT
     ngx_http_lua_get_globals_table(co);
     lua_setfenv(co, -2);
-#endif
 
     /* co stack: func */
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     /* L stack: func [args] thread coroutines */
@@ -512,10 +498,6 @@ ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
 
     ngx_add_timer(ev, tctx->delay);
 
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "created next timer (co: %p delay: %M ms)", tctx->co,
-                   tctx->delay);
-
     return NGX_OK;
 
 nomem:
@@ -530,8 +512,7 @@ nomem:
 
     /* L stack: func [args] */
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     luaL_unref(L, -1, co_ref);
 
@@ -587,9 +568,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     c = ngx_http_lua_create_fake_connection(tctx.pool);
     if (c == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "failed to create fake connection to run timer (co: %p)",
-                      tctx.co);
         goto failed;
     }
 
@@ -601,9 +579,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     r = ngx_http_lua_create_fake_request(c);
     if (r == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "failed to create fake request to run timer (co: %p)",
-                      tctx.co);
         goto failed;
     }
 
@@ -639,8 +614,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     ctx = ngx_http_lua_create_ctx(r);
     if (ctx == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "failed to create ctx to run timer (co: %p)", tctx.co);
         goto failed;
     }
 
@@ -649,9 +622,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
         pcln = ngx_pool_cleanup_add(r->pool, 0);
         if (pcln == NULL) {
-            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                          "failed to add vm cleanup to run timer (co: %p)",
-                          tctx.co);
             goto failed;
         }
 
@@ -665,9 +635,6 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 
     cln = ngx_http_cleanup_add(r, 0);
     if (cln == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "failed to add request cleanup to run timer (co: %p)",
-                      tctx.co);
         goto failed;
     }
 
@@ -725,8 +692,7 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
 failed:
 
     if (tctx.co_ref && tctx.co) {
-        lua_pushlightuserdata(tctx.co, ngx_http_lua_lightudata_mask(
-                              coroutines_key));
+        lua_pushlightuserdata(tctx.co, &ngx_http_lua_coroutines_key);
         lua_rawget(tctx.co, LUA_REGISTRYINDEX);
         luaL_unref(tctx.co, -1, tctx.co_ref);
         lua_settop(tctx.co, 0);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_uthread.c b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
index 43517a0..8195ec0 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_uthread.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
@@ -70,8 +70,7 @@ ngx_http_lua_uthread_spawn(lua_State *L)
 
     /* anchor the newly created coroutine into the Lua registry */
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
     lua_pushvalue(L, -2);
     coctx->co_ref = luaL_ref(L, -2);
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.c b/debian/modules/http-lua/src/ngx_http_lua_util.c
index c12262e..f7a537e 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.c
@@ -70,25 +70,6 @@
 #endif
 
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-#define NGX_HTTP_LUA_SA_RESTART_SIGS {                                       \
-    ngx_signal_value(NGX_RECONFIGURE_SIGNAL),                                \
-    ngx_signal_value(NGX_REOPEN_SIGNAL),                                     \
-    ngx_signal_value(NGX_NOACCEPT_SIGNAL),                                   \
-    ngx_signal_value(NGX_TERMINATE_SIGNAL),                                  \
-    ngx_signal_value(NGX_SHUTDOWN_SIGNAL),                                   \
-    ngx_signal_value(NGX_CHANGEBIN_SIGNAL),                                  \
-    SIGALRM,                                                                 \
-    SIGINT,                                                                  \
-    SIGIO,                                                                   \
-    SIGCHLD,                                                                 \
-    SIGSYS,                                                                  \
-    SIGPIPE,                                                                 \
-    0                                                                        \
-};
-#endif
-
-
 char ngx_http_lua_code_cache_key;
 char ngx_http_lua_regex_cache_key;
 char ngx_http_lua_socket_pool_key;
@@ -147,13 +128,6 @@ static int ngx_http_lua_get_raw_phase_context(lua_State *L);
 #define LUA_PATH_SEP ";"
 #endif
 
-
-#if !defined(LUA_DEFAULT_PATH) && (NGX_DEBUG)
-#define LUA_DEFAULT_PATH "../lua-resty-core/lib/?.lua;"                      \
-                         "../lua-resty-lrucache/lib/?.lua"
-#endif
-
-
 #define AUX_MARK "\1"
 
 
@@ -197,7 +171,6 @@ ngx_http_lua_set_path(ngx_cycle_t *cycle, lua_State *L, int tab_idx,
 }
 
 
-#ifndef OPENRESTY_LUAJIT
 /**
  * Create new table and set _G field to itself.
  *
@@ -212,7 +185,6 @@ ngx_http_lua_create_new_globals_table(lua_State *L, int narr, int nrec)
     lua_pushvalue(L, -1);
     lua_setfield(L, -2, "_G");
 }
-#endif /* OPENRESTY_LUAJIT */
 
 
 static lua_State *
@@ -341,13 +313,11 @@ ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
 
     base = lua_gettop(L);
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     co = lua_newthread(L);
 
-#ifndef OPENRESTY_LUAJIT
     /*  {{{ inherit coroutine's globals to main thread's globals table
      *  for print() function will try to find tostring() in current
      *  globals table.
@@ -362,7 +332,6 @@ ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
 
     ngx_http_lua_set_globals_table(co);
     /*  }}} */
-#endif /* OPENRESTY_LUAJIT */
 
     *ref = luaL_ref(L, -2);
 
@@ -387,8 +356,7 @@ ngx_http_lua_del_thread(ngx_http_request_t *r, lua_State *L,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua deleting light thread");
 
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_rawget(L, LUA_REGISTRYINDEX);
 
     ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
@@ -440,9 +408,7 @@ ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
             r->headers_out.status = NGX_HTTP_OK;
         }
 
-        if (!ctx->mime_set
-            && ngx_http_lua_set_content_type(r, ctx) != NGX_OK)
-        {
+        if (!ctx->headers_set && ngx_http_lua_set_content_type(r) != NGX_OK) {
             return NGX_ERROR;
         }
 
@@ -691,8 +657,7 @@ ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log)
 
     /* {{{ register a table to anchor lua coroutines reliably:
      * {([int]ref) = [cort]} */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          coroutines_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
     lua_createtable(L, 0, 32 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
@@ -703,23 +668,20 @@ ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log)
     lua_rawset(L, LUA_REGISTRYINDEX);
 
     /* create the registry entry for the Lua socket connection pool table */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          socket_pool_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
     lua_createtable(L, 0, 8 /* nrec */);
     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_lightudata_mask(
-                          regex_cache_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
     lua_createtable(L, 0, 16 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
 #endif
 
     /* {{{ register table to cache user code:
      * { [(string)cache_key] = <code closure> } */
-    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                          code_cache_key));
+    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
     lua_createtable(L, 0, 8 /* nrec */);
     lua_rawset(L, LUA_REGISTRYINDEX);
     /* }}} */
@@ -733,6 +695,9 @@ ngx_http_lua_init_globals(lua_State *L, ngx_cycle_t *cycle,
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
                    "lua initializing lua globals");
 
+    lua_pushlightuserdata(L, cycle);
+    lua_setglobal(L, "__ngx_cycle");
+
 #if defined(NDK) && NDK
     ngx_http_lua_inject_ndk_api(L);
 #endif /* defined(NDK) && NDK */
@@ -791,52 +756,6 @@ ngx_http_lua_inject_ngx_api(lua_State *L, ngx_http_lua_main_conf_t *lmcf,
     lua_setglobal(L, "ngx");
 
     ngx_http_lua_inject_coroutine_api(log, L);
-
-#ifdef OPENRESTY_LUAJIT
-    {
-        int         rc;
-
-        const char buf[] =
-            "local ngx_log = ngx.log\n"
-            "local ngx_WARN = ngx.WARN\n"
-            "local tostring = tostring\n"
-            "local ngx_get_phase = ngx.get_phase\n"
-            "local traceback = require 'debug'.traceback\n"
-            "local function newindex(table, key, value)\n"
-                "rawset(table, key, value)\n"
-                "local phase = ngx_get_phase()\n"
-                "if phase == 'init_worker' or phase == 'init' then\n"
-                    "return\n"
-                "end\n"
-                "ngx_log(ngx_WARN, 'writing a global lua variable "
-                         "(\\'', tostring(key), '\\') which may lead to "
-                         "race conditions between concurrent requests, so "
-                         "prefer the use of \\'local\\' variables', "
-                         "traceback('', 2))\n"
-            "end\n"
-            "setmetatable(_G, { __newindex = newindex })\n"
-            ;
-
-        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "=_G write guard");
-
-        if (rc != 0) {
-            ngx_log_error(NGX_LOG_ERR, log, 0,
-                          "failed to load Lua code (%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 Lua code (%i): %s",
-                          rc, lua_tostring(L, -1));
-            lua_pop(L, 1);
-        }
-    }
-#endif
 }
 
 
@@ -3035,12 +2954,12 @@ ngx_http_lua_param_get(lua_State *L)
                                | NGX_HTTP_LUA_CONTEXT_BODY_FILTER);
 
     if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SET)) {
-        return ngx_http_lua_setby_param_get(L, r);
+        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, r);
+    return ngx_http_lua_body_filter_param_get(L);
 }
 
 
@@ -3237,8 +3156,7 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
 
         ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
-        lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                              coroutines_key));
+        lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
         lua_rawget(L, LUA_REGISTRYINDEX);
         inited = 1;
 
@@ -3276,8 +3194,7 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
                 ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
                 if (!inited) {
-                    lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                                          coroutines_key));
+                    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
                     lua_rawget(L, LUA_REGISTRYINDEX);
                     inited = 1;
                 }
@@ -3306,8 +3223,7 @@ ngx_http_lua_finalize_threads(ngx_http_request_t *r,
         ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
 
         if (!inited) {
-            lua_pushlightuserdata(L, ngx_http_lua_lightudata_mask(
-                                  coroutines_key));
+            lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
             lua_rawget(L, LUA_REGISTRYINDEX);
             inited = 1;
         }
@@ -3820,7 +3736,6 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
     ngx_pool_t *pool, ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log,
     ngx_pool_cleanup_t **pcln)
 {
-    int                              rc;
     lua_State                       *L;
     ngx_uint_t                       i;
     ngx_pool_cleanup_t              *cln;
@@ -3863,11 +3778,6 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
         *pcln = cln;
     }
 
-#ifdef OPENRESTY_LUAJIT
-    /* load FFI library first since cdata needs it */
-    luaopen_ffi(L);
-#endif
-
     if (lmcf->preload_hooks) {
 
         /* register the 3rd-party module's preload hooks */
@@ -3888,21 +3798,6 @@ ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
         lua_pop(L, 2);
     }
 
-    if (lmcf->load_resty_core) {
-        lua_getglobal(L, "require");
-        lua_pushstring(L, "resty.core");
-
-        rc = lua_pcall(L, 1, 1, 0);
-        if (rc != 0) {
-            ngx_log_error(NGX_LOG_ERR, log, 0,
-                          "lua_load_resty_core failed to load the resty.core "
-                          "module from https://github.com/openresty/lua-resty"
-                          "-core; ensure you are using an OpenResty release "
-                          "from https://openresty.org/en/download.html "
-                          "(rc: %i, reason: %s)", rc, lua_tostring(L, -1));
-        }
-    }
-
     return L;
 }
 
@@ -4146,12 +4041,7 @@ ngx_http_lua_get_raw_phase_context(lua_State *L)
     ngx_http_request_t      *r;
     ngx_http_lua_ctx_t      *ctx;
 
-#ifdef OPENRESTY_LUAJIT
-    r = lua_getexdata(L);
-#else
     r = lua_touserdata(L, 1);
-#endif
-
     if (r == NULL) {
         return 0;
     }
@@ -4239,32 +4129,4 @@ ngx_http_lua_cleanup_free(ngx_http_request_t *r, ngx_http_cleanup_pt *cleanup)
 }
 
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-void
-ngx_http_lua_set_sa_restart(ngx_log_t *log)
-{
-    int                    *signo;
-    int                     sigs[] = NGX_HTTP_LUA_SA_RESTART_SIGS;
-    struct sigaction        act;
-
-    for (signo = sigs; *signo != 0; signo++) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                       "setting SA_RESTART for signal %d", *signo);
-
-        if (sigaction(*signo, NULL, &act) != 0) {
-            ngx_log_error(NGX_LOG_WARN, log, ngx_errno, "failed to get "
-                          "sigaction for signal %d", *signo);
-        }
-
-        act.sa_flags |= SA_RESTART;
-
-        if (sigaction(*signo, &act, NULL) != 0) {
-            ngx_log_error(NGX_LOG_WARN, log, ngx_errno, "failed to set "
-                          "sigaction for signal %d", *signo);
-        }
-    }
-}
-#endif
-
-
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.h b/debian/modules/http-lua/src/ngx_http_lua_util.h
index f08f481..7dcc6f7 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_util.h
+++ b/debian/modules/http-lua/src/ngx_http_lua_util.h
@@ -9,11 +9,6 @@
 #define _NGX_HTTP_LUA_UTIL_H_INCLUDED_
 
 
-#ifdef DDEBUG
-#include "ddebug.h"
-#endif
-
-
 #include "ngx_http_lua_common.h"
 #include "ngx_http_lua_api.h"
 
@@ -193,9 +188,7 @@ ngx_int_t ngx_http_lua_open_and_stat_file(u_char *name,
 ngx_chain_t *ngx_http_lua_chain_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
     ngx_chain_t **free, size_t len);
 
-#ifndef OPENRESTY_LUAJIT
 void ngx_http_lua_create_new_globals_table(lua_State *L, int narr, int nrec);
-#endif
 
 int ngx_http_lua_traceback(lua_State *L);
 
@@ -250,9 +243,6 @@ ngx_http_cleanup_t *ngx_http_lua_cleanup_add(ngx_http_request_t *r,
 void ngx_http_lua_cleanup_free(ngx_http_request_t *r,
     ngx_http_cleanup_pt *cleanup);
 
-#if (NGX_HTTP_LUA_HAVE_SA_RESTART)
-void ngx_http_lua_set_sa_restart(ngx_log_t *log);
-#endif
 
 #define ngx_http_lua_check_if_abortable(L, ctx)                              \
     if ((ctx)->no_abort) {                                                   \
@@ -292,9 +282,7 @@ ngx_http_lua_create_ctx(ngx_http_request_t *r)
     if (!llcf->enable_code_cache && r->connection->fd != (ngx_socket_t) -1) {
         lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
-#ifdef DDEBUG
         dd("lmcf: %p", lmcf);
-#endif
 
         L = ngx_http_lua_init_vm(lmcf->lua, lmcf->cycle, r->pool, lmcf,
                                  r->connection->log, &cln);
@@ -335,11 +323,7 @@ ngx_http_lua_get_lua_vm(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
     }
 
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-#ifdef DDEBUG
     dd("lmcf->lua: %p", lmcf->lua);
-#endif
-
     return lmcf->lua;
 }
 
@@ -350,9 +334,6 @@ ngx_http_lua_get_lua_vm(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 static ngx_inline ngx_http_request_t *
 ngx_http_lua_get_req(lua_State *L)
 {
-#ifdef OPENRESTY_LUAJIT
-    return lua_getexdata(L);
-#else
     ngx_http_request_t    *r;
 
     lua_getglobal(L, ngx_http_lua_req_key);
@@ -360,19 +341,14 @@ ngx_http_lua_get_req(lua_State *L)
     lua_pop(L, 1);
 
     return r;
-#endif
 }
 
 
 static ngx_inline void
 ngx_http_lua_set_req(lua_State *L, ngx_http_request_t *r)
 {
-#ifdef OPENRESTY_LUAJIT
-    lua_setexdata(L, (void *) r);
-#else
     lua_pushlightuserdata(L, r);
     lua_setglobal(L, ngx_http_lua_req_key);
-#endif
 }
 
 
@@ -411,12 +387,10 @@ ngx_http_lua_hash_str(u_char *src, size_t n)
 
 
 static ngx_inline ngx_int_t
-ngx_http_lua_set_content_type(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
+ngx_http_lua_set_content_type(ngx_http_request_t *r)
 {
     ngx_http_lua_loc_conf_t     *llcf;
 
-    ctx->mime_set = 1;
-
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->use_default_type
         && r->headers_out.status != NGX_HTTP_NOT_MODIFIED)
diff --git a/debian/modules/http-lua/src/ngx_http_lua_worker.c b/debian/modules/http-lua/src/ngx_http_lua_worker.c
index 33cfa11..461509b 100644
--- a/debian/modules/http-lua/src/ngx_http_lua_worker.c
+++ b/debian/modules/http-lua/src/ngx_http_lua_worker.c
@@ -153,8 +153,6 @@ ngx_http_lua_ffi_master_pid(void)
 int
 ngx_http_lua_ffi_get_process_type(void)
 {
-    ngx_core_conf_t  *ccf;
-
 #if defined(HAVE_PRIVILEGED_PROCESS_PATCH) && !NGX_WIN32
     if (ngx_process == NGX_PROCESS_HELPER) {
         if (ngx_is_privileged_agent) {
@@ -163,15 +161,6 @@ ngx_http_lua_ffi_get_process_type(void)
     }
 #endif
 
-    if (ngx_process == NGX_PROCESS_SINGLE) {
-        ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                               ngx_core_module);
-
-        if (ccf->master) {
-            return NGX_PROCESS_MASTER;
-        }
-    }
-
     return ngx_process;
 }
 
diff --git a/debian/modules/http-lua/t/.gitignore b/debian/modules/http-lua/t/.gitignore
deleted file mode 100644
index 3170741..0000000
--- a/debian/modules/http-lua/t/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-servroot
-
diff --git a/debian/modules/http-lua/t/000--init.t b/debian/modules/http-lua/t/000--init.t
index 5865755..dbe2c33 100644
--- a/debian/modules/http-lua/t/000--init.t
+++ b/debian/modules/http-lua/t/000--init.t
@@ -10,6 +10,11 @@ $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
 
 our $http_config = <<'_EOC_';
+    upstream database {
+        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+
     lua_package_path "../lua-resty-mysql/lib/?.lua;;";
 _EOC_
 
diff --git a/debian/modules/http-lua/t/001-set.t b/debian/modules/http-lua/t/001-set.t
index 9e8ee7b..ba8f22c 100644
--- a/debian/modules/http-lua/t/001-set.t
+++ b/debian/modules/http-lua/t/001-set.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 5);
+plan tests => repeat_each() * (blocks() * 3 + 4);
 
 #log_level("warn");
 no_long_string();
@@ -46,7 +46,7 @@ helloworld
 === TEST 3: internal only
 --- config
     location /lua {
-        set_by_lua $res "local function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(10)";
+        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(10)";
         echo $res;
     }
 --- request
@@ -76,7 +76,7 @@ GET /lua?a=1&b=2
 === TEST 5: fib by arg
 --- config
     location /fib {
-        set_by_lua $res "local function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(tonumber(ngx.arg[1]))" $arg_n;
+        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(tonumber(ngx.arg[1]))" $arg_n;
         echo $res;
     }
 --- request
@@ -592,30 +592,25 @@ failed to run set_by_lua*: unknown reason
 
 
 
-=== TEST 37: globals are shared in all requests.
+=== TEST 37: globals get cleared for every single request
 --- config
     location /lua {
-        set_by_lua_block $res {
+        set_by_lua $res '
             if not foo then
                 foo = 1
             else
-                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             return foo
-        }
+        ';
         echo $res;
     }
 --- request
 GET /lua
---- response_body_like chomp
-\A[12]
-\z
+--- response_body
+1
 --- no_error_log
 [error]
---- grep_error_log eval: qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
---- grep_error_log_out eval
-["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
 
 
 
@@ -760,8 +755,6 @@ GET /lua?name=jim
 --- config
     location /t {
         set_by_lua $a '
-            local bar
-            local foo
             function foo()
                 bar()
             end
diff --git a/debian/modules/http-lua/t/002-content.t b/debian/modules/http-lua/t/002-content.t
index bb569f5..cc92d6f 100644
--- a/debian/modules/http-lua/t/002-content.t
+++ b/debian/modules/http-lua/t/002-content.t
@@ -86,7 +86,7 @@ qr/content_by_lua\(nginx\.conf:\d+\):1: attempt to call field 'echo' \(a nil val
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        content_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        content_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
     }
 --- request
 GET /lua?a=1&b=2
@@ -102,7 +102,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-local v = ngx.var["request_uri"]
+v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -154,7 +154,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        content_by_lua 'local who = ngx.var.arg_who
+        content_by_lua 'who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
     }
 --- request
@@ -171,7 +171,7 @@ Hello, agentzh!
     }
 
     location /lua {
-        content_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status, " "); ngx.print("body=", res.body)';
+        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status, " "); ngx.print("body=", res.body)';
     }
 --- request
 GET /lua
@@ -183,7 +183,7 @@ status=200 body=hello, world
 ei= TEST 9: capture non-existed location
 --- config
     location /lua {
-        content_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
     }
 --- request
 GET /lua
@@ -194,7 +194,7 @@ GET /lua
 === TEST 9: invalid capture location (not as expected...)
 --- config
     location /lua {
-        content_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        content_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
     }
 --- request
 GET /lua
@@ -247,7 +247,7 @@ GET /lua
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body, "\\n");
            else
@@ -271,7 +271,7 @@ end
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -353,7 +353,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    content_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    content_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
 }
 --- request
 GET /parent
@@ -369,7 +369,7 @@ location /sub {
 location /parent {
     set $a 12;
     content_by_lua '
-        local res = ngx.location.capture(
+        res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -390,7 +390,7 @@ location /sub {
 }
 location /parent {
     content_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = true });
+        res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 }
@@ -408,7 +408,7 @@ location /sub {
 }
 location /parent {
     content_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = false });
+        res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
 }
@@ -427,7 +427,7 @@ GET /parent
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
     }
@@ -454,7 +454,7 @@ type: foo/bar
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", type(res.header["Set-Cookie"]));
             ngx.say("len: ", #res.header["Set-Cookie"]);
             ngx.say("value: ", table.concat(res.header["Set-Cookie"], "|"))
@@ -482,7 +482,7 @@ value: a|hello, world|foo
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -507,7 +507,7 @@ Bar: Bah
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
@@ -524,7 +524,7 @@ Bar: nil
 --- config
     location /lua {
         content_by_lua '
-            local data = "hello, world"
+            data = "hello, world"
             -- ngx.header["Content-Length"] = #data
             -- ngx.header.content_length = #data
             ngx.print(data)
@@ -742,7 +742,7 @@ true
 --- config
     location /lua {
         content_by_lua '
-            local data = "hello,\\nworld\\n"
+            data = "hello,\\nworld\\n"
             ngx.header["Content-Length"] = #data
             ngx.say("hello,")
             ngx.flush()
@@ -801,7 +801,7 @@ world
     }
 --- user_files
 >>> test.lua
-local v = ngx.var["request_uri"]
+v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
diff --git a/debian/modules/http-lua/t/004-require.t b/debian/modules/http-lua/t/004-require.t
index 17e1d57..35e04db 100644
--- a/debian/modules/http-lua/t/004-require.t
+++ b/debian/modules/http-lua/t/004-require.t
@@ -24,7 +24,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /main {
         echo_location /load;
@@ -85,7 +85,7 @@ hello, foo
 --- request
 GET /main
 --- user_files
---- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.so$
+--- response_body_like: ^[^;]+/servroot/html/\?.so$
 
 
 
@@ -100,7 +100,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.lua;(.+\.lua)?;*$
+--- response_body_like: ^[^;]+/servroot/html/\?.lua;.+\.lua;$
 
 
 
@@ -115,7 +115,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^[^;]+/servroot(_\d+)?/html/\?\.so;(.+\.so)?;*$
+--- response_body_like: ^[^;]+/servroot/html/\?.so;.+\.so;$
 
 
 
@@ -130,7 +130,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^(.+\.lua)?;*?[^;]+/servroot(_\d+)?/html/\?\.lua$
+--- response_body_like: ^.+\.lua;[^;]+/servroot/html/\?.lua$
 
 
 
@@ -145,7 +145,7 @@ GET /main
     }
 --- request
 GET /main
---- response_body_like: ^(.+\.so)?;*?[^;]+/servroot(_\d+)?/html/\?\.so$
+--- response_body_like: ^.+\.so;[^;]+/servroot/html/\?.so$
 
 
 
diff --git a/debian/modules/http-lua/t/005-exit.t b/debian/modules/http-lua/t/005-exit.t
index a416a75..a5a28b3 100644
--- a/debian/modules/http-lua/t/005-exit.t
+++ b/debian/modules/http-lua/t/005-exit.t
@@ -452,7 +452,7 @@ Hi
 --- config
     location /lua {
         content_by_lua '
-            local function f ()
+            function f ()
                 ngx.say("hello")
                 ngx.exit(200)
             end
diff --git a/debian/modules/http-lua/t/009-log.t b/debian/modules/http-lua/t/009-log.t
index cb3895b..68c057f 100644
--- a/debian/modules/http-lua/t/009-log.t
+++ b/debian/modules/http-lua/t/009-log.t
@@ -414,8 +414,6 @@ GET /log
 --- config
     location /log {
         content_by_lua '
-            local foo
-            local bar
             function foo()
                 bar()
             end
@@ -433,7 +431,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):9: bar\(\): hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):7: bar\(\): hello, log12343.14159/
 
 
 
@@ -441,8 +439,6 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):9: bar\(\): hell
 --- config
     location /log {
         content_by_lua '
-            local foo
-            local bar
             function foo()
                 return bar(5)
             end
@@ -465,7 +461,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):10:(?: foo\(\):)? hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8:(?: foo\(\):)? hello, log12343.14159/
 
 
 
@@ -476,8 +472,6 @@ qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):10:(?: foo\(\):)
     }
 --- user_files
 >>> test.lua
-local foo
-local bar
 function foo()
     bar()
 end
@@ -494,7 +488,7 @@ GET /log
 --- response_body
 done
 --- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] test.lua:8: bar\(\): hello, log12343.14159/
+qr/\[error\] \S+: \S+ \[lua\] test.lua:6: bar\(\): hello, log12343.14159/
 
 
 
diff --git a/debian/modules/http-lua/t/011-md5_bin.t b/debian/modules/http-lua/t/011-md5_bin.t
index dc0fd9c..ae7c974 100644
--- a/debian/modules/http-lua/t/011-md5_bin.t
+++ b/debian/modules/http-lua/t/011-md5_bin.t
@@ -156,7 +156,7 @@ d41d8cd98f00b204e9800998ecf8427e
 --- config
     location = /t {
         content_by_lua '
-            local s = ngx.md5_bin(45)
+            s = ngx.md5_bin(45)
             s = string.gsub(s, ".", function (c)
                     return string.format("%02x", string.byte(c))
                 end)
diff --git a/debian/modules/http-lua/t/013-base64.t b/debian/modules/http-lua/t/013-base64.t
index d1a8d8b..1cc27de 100644
--- a/debian/modules/http-lua/t/013-base64.t
+++ b/debian/modules/http-lua/t/013-base64.t
@@ -242,4 +242,4 @@ GET /t
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
 --- error_log eval
-qr/bad argument \#2 to 'encode_base64' \(boolean expected, got number\)|\[error\] .*? bad no_padding: boolean expected, got number/
+qr/bad argument \#2 to 'encode_base64' \(boolean expected, got number\)|\[error\] .*? boolean argument only/
diff --git a/debian/modules/http-lua/t/014-bugs.t b/debian/modules/http-lua/t/014-bugs.t
index dad084e..9aadff0 100644
--- a/debian/modules/http-lua/t/014-bugs.t
+++ b/debian/modules/http-lua/t/014-bugs.t
@@ -43,7 +43,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /load {
         content_by_lua '
@@ -69,7 +69,7 @@ end
 
 === TEST 2: sanity
 --- http_config
-lua_package_cpath '/home/agentz/rpm/BUILD/lua-yajl-1.1/build/?.so;/home/lz/luax/?.so;./?.so';
+lua_package_path '/home/agentz/rpm/BUILD/lua-yajl-1.1/build/?.so;/home/lz/luax/?.so;./?.so';
 --- config
     location = '/report/listBidwordPrices4lzExtra.htm' {
         content_by_lua '
@@ -112,7 +112,7 @@ GET /report/listBidwordPrices4lzExtra.htm?words=123,156,2532
     }
     location = /main {
         content_by_lua '
-            local res = ngx.location.capture("/memc?c=get&k=foo&v=")
+            res = ngx.location.capture("/memc?c=get&k=foo&v=")
             ngx.say("1: ", res.body)
 
             res = ngx.location.capture("/memc?c=set&k=foo&v=bar");
@@ -204,7 +204,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/37
         content_by_lua '
             -- local yajl = require "yajl"
             ngx.header["Set-Cookie"] = {}
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
 
             for i,j in pairs(res.header) do
                 ngx.header[i] = j
@@ -231,7 +231,7 @@ Set-Cookie: TestCookie2=bar.*"
     }
 --- user_files
 >>> foo.lua
-local res = {}
+res = {}
 res = {'good 1', 'good 2', 'good 3'}
 return ngx.redirect("/somedir/" .. ngx.escape_uri(res[math.random(1,#res)]))
 --- request
@@ -579,7 +579,7 @@ $s
 
 
 
-=== TEST 26: globals sharing by using _G
+=== TEST 26: unexpected globals sharing by using _G
 --- config
     location /test {
         content_by_lua '
@@ -593,12 +593,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body_like eval
-[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
+--- response_body eval
+["0", "0", "0"]
 
 
 
-=== TEST 27: globals sharing by using _G (set_by_lua*)
+=== TEST 27: unexpected globals sharing by using _G (set_by_lua*)
 --- config
     location /test {
         set_by_lua $a '
@@ -613,12 +613,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body_like eval
-[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
+--- response_body eval
+["0", "0", "0"]
 
 
 
-=== TEST 28: globals sharing by using _G (log_by_lua*)
+=== TEST 28: unexpected globals sharing by using _G (log_by_lua*)
 --- http_config
     lua_shared_dict log_dict 100k;
 --- config
@@ -633,19 +633,19 @@ $s
             if _G.t then
                 _G.t = _G.t + 1
             else
-                _G.t = 1
+                _G.t = 0
             end
             log_dict:set("cnt", t)
         ';
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body_like eval
-[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
+--- response_body eval
+["0", "0", "0"]
 
 
 
-=== TEST 29: globals sharing by using _G (header_filter_by_lua*)
+=== TEST 29: unexpected globals sharing by using _G (header_filter_by_lua*)
 --- config
     location /test {
         header_filter_by_lua '
@@ -663,12 +663,12 @@ $s
     }
 --- pipelined_requests eval
 ["GET /test", "GET /test", "GET /test"]
---- response_body_like eval
-[qr/\A[036]\z/, qr/\A[147]\z/, qr/\A[258]\z/]
+--- response_body eval
+["0", "0", "0"]
 
 
 
-=== TEST 30: globals sharing by using _G (body_filter_by_lua*)
+=== TEST 30: unexpected globals sharing by using _G (body_filter_by_lua*)
 --- config
     location /test {
         body_filter_by_lua '
@@ -686,9 +686,8 @@ $s
     }
 --- request
 GET /test
---- response_body_like eval
-qr/\Aa[036]
-\z/
+--- response_body
+a0
 --- no_error_log
 [error]
 
@@ -847,7 +846,7 @@ ok
 
 === TEST 37: resolving names with a trailing dot
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -865,7 +864,7 @@ GET /t
 
 === TEST 38: resolving names with a trailing dot
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen 12354;
 
@@ -892,7 +891,7 @@ args: foo=1&bar=2
 
 === TEST 39: lua_code_cache off + setkeepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location = /t {
diff --git a/debian/modules/http-lua/t/016-resp-header.t b/debian/modules/http-lua/t/016-resp-header.t
index e38202b..72c1e05 100644
--- a/debian/modules/http-lua/t/016-resp-header.t
+++ b/debian/modules/http-lua/t/016-resp-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 59);
+plan tests => repeat_each() * (blocks() * 3 + 46);
 
 #no_diff();
 no_long_string();
@@ -630,46 +630,7 @@ Cache-Control: private, no-store
 
 
 
-=== TEST 32: set single value to Link header
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.header.link = "</foo.jpg>; rel=preload"
-            ngx.say("Link: ", ngx.var.sent_http_link)
-        }
-    }
---- request
-GET /t
---- response_headers
-Link: </foo.jpg>; rel=preload
---- response_body
-Link: </foo.jpg>; rel=preload
-
-
-
-=== TEST 33: set multi values to Link header
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.header.link = {
-                "</foo.jpg>; rel=preload",
-                "</bar.css>; rel=preload; as=style"
-            }
-
-            ngx.say("Link: ", ngx.var.sent_http_link)
-        }
-    }
---- request
-GET /t
---- response_headers
-Link: </foo.jpg>; rel=preload, </bar.css>; rel=preload; as=style
---- response_body_like chop
-^Link: </foo.jpg>; rel=preload[;,] </bar.css>; rel=preload; as=style$
---- skip_nginx: 3: < 1.13.9
-
-
-
-=== TEST 34: set multi values to cache-control and override it with a single value
+=== TEST 32: set multi values to cache-control and override it with a single value
 --- config
     location /lua {
         content_by_lua '
@@ -689,30 +650,7 @@ Cache-Control: no-cache
 
 
 
-=== TEST 35: set multi values to Link header and override it with a single value
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.header.link = {
-                "</foo.jpg>; rel=preload",
-                "</bar.css>; rel=preload; as=style"
-            }
-            ngx.header.link = "</hello.jpg>; rel=preload"
-            ngx.say("Link: ", ngx.var.sent_http_link)
-            ngx.say("Link: ", ngx.header.link)
-        }
-    }
---- request
-    GET /lua
---- response_headers
-Link: </hello.jpg>; rel=preload
---- response_body
-Link: </hello.jpg>; rel=preload
-Link: </hello.jpg>; rel=preload
-
-
-
-=== TEST 36: set multi values to cache-control and override it with multiple values
+=== TEST 33: set multi values to cache-control and override it with multiple values
 --- config
     location /lua {
         content_by_lua '
@@ -734,37 +672,7 @@ Cache-Control: no-cache[;,] blah[;,] foo$
 
 
 
-=== TEST 37: set multi values to Link header and override it with multiple values
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.header.link = {
-                "</foo.jpg>; rel=preload",
-                "</bar.css>; rel=preload; as=style"
-            }
-            ngx.header.link = {
-                "</foo.jpg>; rel=preload",
-                "</hello.css>; rel=preload",
-                "</bar.css>; rel=preload; as=style"
-            }
-            ngx.say("Link: ", ngx.var.sent_http_link)
-            ngx.say("Link: ", table.concat(ngx.header.link, ", "))
-        }
-    }
---- request
-    GET /lua
---- response_headers
-Link: </foo.jpg>; rel=preload, </hello.css>; rel=preload, </bar.css>; rel=preload; as=style
---- response_body_like chop
-^Link: </foo.jpg>; rel=preload[;,] </hello.css>; rel=preload[;,] </bar.css>; rel=preload; as=style
-Link: </foo.jpg>; rel=preload[;,] </hello.css>; rel=preload[;,] </bar.css>; rel=preload; as=style$
---- no_error_log
-[error]
---- skip_nginx: 4: < 1.13.9
-
-
-
-=== TEST 38: set the www-authenticate response header
+=== TEST 34: set the www-authenticate response header
 --- config
     location /lua {
         content_by_lua '
@@ -781,7 +689,7 @@ WWW-Authenticate: blah
 
 
 
-=== TEST 39: set and clear the www-authenticate response header
+=== TEST 35: set and clear the www-authenticate response header
 --- config
     location /lua {
         content_by_lua '
@@ -799,7 +707,7 @@ Foo: nil
 
 
 
-=== TEST 40: set multi values to cache-control and override it with multiple values (to reproduce a bug)
+=== TEST 36: set multi values to cache-control and override it with multiple values (to reproduce a bug)
 --- config
     location /lua {
         content_by_lua '
@@ -819,7 +727,7 @@ Cache-Control: blah
 
 
 
-=== TEST 41: set last-modified and return 304
+=== TEST 37: set last-modified and return 304
 --- config
   location /lua {
         content_by_lua '
@@ -837,7 +745,7 @@ Last-Modified: Thu, 18 Nov 2010 11:27:35 GMT
 
 
 
-=== TEST 42: set last-modified and return 200
+=== TEST 38: set last-modified and return 200
 --- config
   location /lua {
         content_by_lua '
@@ -856,7 +764,7 @@ Thu, 18 Nov 2010 11:27:35 GMT
 
 
 
-=== TEST 43: set response content-encoding header should bypass ngx_http_gzip_filter_module
+=== TEST 39: set response content-encoding header should bypass ngx_http_gzip_filter_module
 --- config
     default_type text/plain;
     gzip             on;
@@ -873,16 +781,13 @@ GET /read
 --- more_headers
 Accept-Encoding: gzip
 --- response_headers
-Content-Encoding: gzip
---- no_error_log
-[error]
-http gzip filter
+Content-Type: text/plain
 --- response_body
 Hello, world, my dear friend!
 
 
 
-=== TEST 44: no transform underscores (write)
+=== TEST 40: no transform underscores (write)
 --- config
     lua_transform_underscores_in_response_headers off;
     location = /t {
@@ -902,7 +807,7 @@ nil
 
 
 
-=== TEST 45: with transform underscores (write)
+=== TEST 41: with transform underscores (write)
 --- config
     lua_transform_underscores_in_response_headers on;
     location = /t {
@@ -922,7 +827,7 @@ Hello
 
 
 
-=== TEST 46: github issue #199: underscores in lua variables
+=== TEST 42: github issue #199: underscores in lua variables
 --- config
     location /read {
         content_by_lua '
@@ -955,7 +860,7 @@ something: hello
 
 
 
-=== TEST 47: set multiple response header
+=== TEST 43: set multiple response header
 --- config
     location /read {
         content_by_lua '
@@ -975,7 +880,7 @@ text/my-plain-50
 
 
 
-=== TEST 48: set multiple response header and then reset and then clear
+=== TEST 44: set multiple response header and then reset and then clear
 --- config
     location /read {
         content_by_lua '
@@ -1004,7 +909,7 @@ ok
 
 
 
-=== TEST 49: set response content-type header for multiple times
+=== TEST 45: set response content-type header for multiple times
 --- config
     location /read {
         content_by_lua '
@@ -1022,7 +927,7 @@ Hi
 
 
 
-=== TEST 50: set Last-Modified response header for multiple times
+=== TEST 46: set Last-Modified response header for multiple times
 --- config
     location /read {
         content_by_lua '
@@ -1040,7 +945,7 @@ ok
 
 
 
-=== TEST 51: set Last-Modified response header and then clear
+=== TEST 47: set Last-Modified response header and then clear
 --- config
     location /read {
         content_by_lua '
@@ -1058,7 +963,7 @@ ok
 
 
 
-=== TEST 52: github #20: segfault caused by the nasty optimization in the nginx core (write)
+=== TEST 48: github #20: segfault caused by the nasty optimization in the nginx core (write)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1080,7 +985,7 @@ Location: http://localhost:$ServerPort/t/
 
 
 
-=== TEST 53: github #20: segfault caused by the nasty optimization in the nginx core (read)
+=== TEST 49: github #20: segfault caused by the nasty optimization in the nginx core (read)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1102,7 +1007,7 @@ Location: http://localhost:$ServerPort/t/
 
 
 
-=== TEST 54: github #20: segfault caused by the nasty optimization in the nginx core (read Location)
+=== TEST 50: github #20: segfault caused by the nasty optimization in the nginx core (read Location)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1125,7 +1030,7 @@ Foo: /t/
 
 
 
-=== TEST 55: github #20: segfault caused by the nasty optimization in the nginx core (set Foo and read Location)
+=== TEST 51: github #20: segfault caused by the nasty optimization in the nginx core (set Foo and read Location)
 --- config
     location = /t/ {
         header_filter_by_lua '
@@ -1149,7 +1054,7 @@ Foo: /t/
 
 
 
-=== TEST 56: case sensitive cache-control header
+=== TEST 52: case sensitive cache-control header
 --- config
     location /lua {
         content_by_lua '
@@ -1166,24 +1071,7 @@ Cache-Control: private
 
 
 
-=== TEST 57: case sensitive Link header
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.header["link"] = "</foo.jpg>; rel=preload"
-            ngx.say("Link: ", ngx.var.sent_http_link)
-        }
-    }
---- request
-    GET /lua
---- raw_response_headers_like chop
-link: </foo.jpg>; rel=preload
---- response_body
-Link: </foo.jpg>; rel=preload
-
-
-
-=== TEST 58: clear Cache-Control when there was no Cache-Control
+=== TEST 53: clear Cache-Control when there was no Cache-Control
 --- config
     location /lua {
         content_by_lua '
@@ -1200,24 +1088,7 @@ Cache-Control: nil
 
 
 
-=== TEST 59: clear Link header when there was no Link
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.header["Link"] = nil
-            ngx.say("Link: ", ngx.var.sent_http_link)
-        }
-    }
---- request
-    GET /lua
---- raw_response_headers_unlike eval
-qr/Link/i
---- response_body
-Link: nil
-
-
-
-=== TEST 60: set response content-type header
+=== TEST 54: set response content-type header
 --- config
     location /read {
         content_by_lua '
@@ -1236,7 +1107,7 @@ s = content_type
 
 
 
-=== TEST 61: set a number header name
+=== TEST 55: set a number header name
 --- config
     location /lua {
         content_by_lua '
@@ -1255,7 +1126,7 @@ s = content_type
 
 
 
-=== TEST 62: set a number header name (in a table value)
+=== TEST 56: set a number header name (in a table value)
 --- config
     location /lua {
         content_by_lua '
@@ -1274,7 +1145,7 @@ foo: 32
 
 
 
-=== TEST 63: random access resp headers
+=== TEST 57: random access resp headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1314,7 +1185,7 @@ bar: baz
 
 
 
-=== TEST 64: iterating through raw resp headers
+=== TEST 58: iterating through raw resp headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1350,7 +1221,7 @@ bar: nil
 
 
 
-=== TEST 65: removed response headers
+=== TEST 59: removed response headers
 --- config
     location /resp-header {
         content_by_lua '
@@ -1383,7 +1254,7 @@ bar: baz
 
 
 
-=== TEST 66: built-in Content-Type header
+=== TEST 60: built-in Content-Type header
 --- config
     location = /t {
         content_by_lua '
@@ -1416,7 +1287,7 @@ my content_type: text/plain
 
 
 
-=== TEST 67: built-in Content-Length header
+=== TEST 61: built-in Content-Length header
 --- config
     location = /t {
         content_by_lua '
@@ -1449,7 +1320,7 @@ my content_length: 3
 
 
 
-=== TEST 68: built-in Connection header
+=== TEST 62: built-in Connection header
 --- config
     location = /t {
         content_by_lua '
@@ -1480,7 +1351,7 @@ my connection: close
 
 
 
-=== TEST 69: built-in Transfer-Encoding header (chunked)
+=== TEST 63: built-in Transfer-Encoding header (chunked)
 --- config
     location = /t {
         content_by_lua '
@@ -1512,7 +1383,7 @@ my transfer-encoding: chunked
 
 
 
-=== TEST 70: built-in Transfer-Encoding header (none)
+=== TEST 64: built-in Transfer-Encoding header (none)
 --- config
     location = /t {
         content_by_lua '
@@ -1545,7 +1416,7 @@ my transfer_encoding: nil
 
 
 
-=== TEST 71: set Location (no host)
+=== TEST 65: set Location (no host)
 --- config
     location = /t {
         content_by_lua '
@@ -1564,7 +1435,7 @@ Location: /foo/bar
 
 
 
-=== TEST 72: set Location (with host)
+=== TEST 66: set Location (with host)
 --- config
     location = /t {
         content_by_lua '
@@ -1583,7 +1454,7 @@ Location: http://test.com/foo/bar
 
 
 
-=== TEST 73: ngx.header["Content-Type"] with ngx_gzip
+=== TEST 67: ngx.header["Content-Type"] with ngx_gzip
 --- config
     gzip             on;
     gzip_min_length  1;
@@ -1607,7 +1478,7 @@ Content-Type: text/html; charset=utf-8
 
 
 
-=== TEST 74: ngx.header["Content-Type"] with "; blah"
+=== TEST 68: ngx.header["Content-Type"] with "; blah"
 --- config
     location = /test2 {
         content_by_lua '
@@ -1627,11 +1498,84 @@ test
 
 
 
-=== TEST 75: exceeding max header limit (default 100)
+=== TEST 69: return the matched content-type instead of default_type
+--- http_config
+types {
+    image/png png;
+}
+--- config
+location /set/ {
+     default_type text/html;
+     content_by_lua_block {
+       ngx.say(ngx.header["content-type"])
+   }
+}
+--- request
+GET /set/hello.png
+--- response_headers
+Content-Type: image/png
+--- response_body
+image/png
+--- no_error_log
+[error]
+
+
+
+=== TEST 70: always return the matched content-type
+--- config
+    location /set/ {
+        default_type "image/png";
+        content_by_lua_block {
+            ngx.say(ngx.header["content-type"])
+            ngx.say(ngx.header["content-type"])
+        }
+    }
+--- request
+GET /set/hello.png
+--- response_headers
+Content-Type: image/png
+--- response_body
+image/png
+image/png
+--- no_error_log
+[error]
+
+
+
+=== TEST 71: return the matched content-type after ngx.resp.get_headers()
+--- http_config
+types {
+    image/png png;
+}
+--- config
+    location /set/ {
+        default_type text/html;
+        content_by_lua_block {
+            local h, err = ngx.resp.get_headers()
+            if err then
+                ngx.log(ngx.ERR, "err: ", err)
+                return ngx.exit(500)
+            end
+
+            ngx.say(h["content-type"])
+        }
+    }
+--- request
+GET /set/hello.png
+--- response_headers
+Content-Type: image/png
+--- response_body
+image/png
+--- no_error_log
+[error]
+
+
+
+=== TEST 72: exceeding max header limit (default 100)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 100 do
+            for i = 1, 99 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1661,11 +1605,11 @@ lua exceeding response header limit 101 > 100
 
 
 
-=== TEST 76: NOT exceeding max header limit (default 100)
+=== TEST 73: NOT exceeding max header limit (default 100)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 99 do
+            for i = 1, 98 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1693,11 +1637,11 @@ lua exceeding response header limit
 
 
 
-=== TEST 77: exceeding max header limit (custom limit, 3)
+=== TEST 74: exceeding max header limit (custom limit, 3)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 3 do
+            for i = 1, 2 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1727,11 +1671,11 @@ lua exceeding response header limit 4 > 3
 
 
 
-=== TEST 78: NOT exceeding max header limit (custom limit, 3)
+=== TEST 75: NOT exceeding max header limit (custom limit, 3)
 --- config
     location /resp-header {
         content_by_lua_block {
-            for i = 1, 2 do
+            for i = 1, 1 do
                 ngx.header["Foo" .. i] = "Foo"
             end
 
@@ -1755,211 +1699,3 @@ found 3 resp headers
 --- no_error_log
 [error]
 lua exceeding response header limit
-
-
-
-=== TEST 79: return nil if Content-Type is not set yet
---- config
-    location /t {
-        default_type text/html;
-        content_by_lua_block {
-            ngx.log(ngx.WARN, "Content-Type: ", ngx.header["content-type"])
-            ngx.say("Content-Type: ", ngx.header["content-type"])
-        }
-    }
---- request
-GET /t
---- response_headers
-Content-Type: text/html
---- response_body
-Content-Type: nil
---- no_error_log
-[error]
---- error_log
-Content-Type: nil
-
-
-
-=== TEST 80: don't generate Content-Type when setting other response header
---- config
-    location = /backend {
-        content_by_lua_block {
-            ngx.say("foo")
-        }
-        header_filter_by_lua_block {
-            ngx.header.content_type = nil
-        }
-    }
-
-    location = /t {
-        default_type text/html;
-        rewrite_by_lua_block {
-            ngx.header.blah = "foo"
-        }
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-blah: foo
-!Content-Type
---- no_error_log
-[error]
-
-
-
-=== TEST 81: don't generate Content-Type when getting other response header
---- config
-    location = /backend {
-        content_by_lua_block {
-            ngx.say("foo")
-        }
-        header_filter_by_lua_block {
-            ngx.header.content_type = nil
-        }
-    }
-
-    location = /t {
-        default_type text/html;
-        rewrite_by_lua_block {
-            local h = ngx.header.content_length
-        }
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-!Content-Type
---- no_error_log
-[error]
-
-
-
-=== TEST 82: don't generate Content-Type when getting it
---- config
-    location = /backend {
-        content_by_lua_block {
-            ngx.say("foo")
-        }
-        header_filter_by_lua_block {
-            ngx.header.content_type = nil
-        }
-    }
-
-    location /t {
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
-        header_filter_by_lua_block {
-            ngx.log(ngx.WARN, "Content-Type: ", ngx.header["content-type"])
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-!Content-Type
---- no_error_log
-[error]
---- error_log
-Content-Type: nil
-
-
-
-=== TEST 83: generate default Content-Type when setting other response header
---- config
-    location = /t {
-        default_type text/html;
-        content_by_lua_block {
-            ngx.header.blah = "foo"
-            ngx.say("foo")
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-blah: foo
-Content-Type: text/html
---- no_error_log
-[error]
-
-
-
-=== TEST 84: don't generate Content-Type when calling ngx.resp.get_headers()
---- config
-    location = /backend {
-        content_by_lua_block {
-            ngx.say("foo")
-        }
-        header_filter_by_lua_block {
-            ngx.header.content_type = nil
-        }
-    }
-
-    location /t {
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
-        header_filter_by_lua_block {
-            local h, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return
-            end
-
-            ngx.log(ngx.WARN, "Content-Type: ", h["content-type"])
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-!Content-Type
---- no_error_log
-[error]
---- error_log
-Content-Type: nil
-
-
-
-=== TEST 85: don't generate default Content-Type when Content-Type is cleared
---- config
-    location = /t {
-        default_type text/html;
-        content_by_lua_block {
-            ngx.header["Content-Type"] = nil
-            ngx.say("foo")
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-!Content-Type
---- no_error_log
-[error]
-
-
-
-=== TEST 86: don't generate default Content-Type when Content-Type is set
---- config
-    location = /t {
-        default_type text/html;
-        content_by_lua_block {
-            ngx.header["Content-Type"] = "application/json"
-            ngx.say("foo")
-        }
-    }
---- request
-GET /t
---- response_body
-foo
---- response_headers
-Content-Type: application/json
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/017-exec.t b/debian/modules/http-lua/t/017-exec.t
index a73e93e..544b8bb 100644
--- a/debian/modules/http-lua/t/017-exec.t
+++ b/debian/modules/http-lua/t/017-exec.t
@@ -382,7 +382,7 @@ hello
 --- config
     location /lua {
         content_by_lua '
-            local function f ()
+            function f ()
                 ngx.exec("/hi")
             end
 
@@ -524,7 +524,7 @@ hello
 --- config
     location /main {
         rewrite_by_lua '
-            local res = ngx.location.capture("/test_loc");
+            res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/020-subrequest.t b/debian/modules/http-lua/t/020-subrequest.t
index 5a386db..658a1d2 100644
--- a/debian/modules/http-lua/t/020-subrequest.t
+++ b/debian/modules/http-lua/t/020-subrequest.t
@@ -32,7 +32,7 @@ __DATA__
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -62,7 +62,7 @@ lua http subrequest "/other?"
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -90,7 +90,7 @@ DELETE
 
     location /t {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -114,7 +114,7 @@ POST
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -141,7 +141,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -169,7 +169,7 @@ GET
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo")
+            res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -196,7 +196,7 @@ GET
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo", {})
+            res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -226,7 +226,7 @@ GET
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -255,7 +255,7 @@ hello
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -291,7 +291,7 @@ hello
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -329,7 +329,7 @@ GET
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -362,7 +362,7 @@ hello
         content_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -404,7 +404,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            local res = ngx.location.capture("/memc",
+            res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -435,7 +435,7 @@ cached: hello
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -456,7 +456,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -478,7 +478,7 @@ fo%3D=%3D%3E
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -503,7 +503,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -526,7 +526,7 @@ GET /lua
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -548,7 +548,7 @@ attempt to use a non-string key in the "args" option table
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -570,7 +570,7 @@ attempt to use a non-string key in the "args" option table
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -592,7 +592,7 @@ a=3&b=4
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
@@ -685,7 +685,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/38
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_GET });
             ngx.say("header foo: [", res.body, "]")
         ';
@@ -711,7 +711,7 @@ https://github.com/chaoslawful/lua-nginx-module/issues/38
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { body = "abc" });
             ngx.say("header foo: [", res.body, "]")
         ';
@@ -746,8 +746,8 @@ header foo: [bar]
     }
     location /main {
         content_by_lua '
-            local res1, res2 = ngx.location.capture_multi({{"/a"}, {"/b"}})
-            local res3 = ngx.location.capture("/c")
+            res1, res2 = ngx.location.capture_multi({{"/a"}, {"/b"}})
+            res3 = ngx.location.capture("/c")
             ngx.print(res1.body, res2.body, res3.body)
         ';
     }
@@ -780,7 +780,7 @@ lua reuse free buf memory
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -801,7 +801,7 @@ hello
 --- config
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo.html")
+            res = ngx.location.capture("/foo.html")
 
             ngx.say(res.status)
             ngx.say(res.header["Last-Modified"])
@@ -832,7 +832,7 @@ hello, static file$
     location /lua {
         content_by_lua '
             local ctx = {}
-            local res = ngx.location.capture("/sub", { ctx = ctx })
+            res = ngx.location.capture("/sub", { ctx = ctx })
 
             ngx.say(ctx.foo);
             ngx.say(ngx.ctx.foo);
@@ -857,7 +857,7 @@ nil
     }
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/sub", { ctx = ngx.ctx })
+            res = ngx.location.capture("/sub", { ctx = ngx.ctx })
             ngx.say(ngx.ctx.foo);
         ';
     }
@@ -885,7 +885,7 @@ bar
 
     location /t {
         content_by_lua '
-            local res = ngx.location.capture("/memc",
+            res = ngx.location.capture("/memc",
                 { method = ngx.HTTP_PUT, body = "hello 1234" });
             -- ngx.say("PUT: " .. res.status);
 
@@ -922,7 +922,7 @@ lua reuse free buf chain, but reallocate memory because
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -959,7 +959,7 @@ nil
         content_by_lua '
             ngx.req.read_body()
 
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -996,7 +996,7 @@ nil
         content_by_lua '
             ngx.req.read_body()
 
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -1033,7 +1033,7 @@ hello, world
         content_by_lua '
             ngx.req.read_body()
 
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT });
 
             ngx.print(res.body)
@@ -1074,7 +1074,7 @@ lua subrequests cycle while processing "/t"
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_OPTIONS });
 
             ngx.print(res.body)
@@ -1099,7 +1099,7 @@ OPTIONS
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_OPTIONS, body = "hello world" });
 
             ngx.print(res.body)
@@ -1151,7 +1151,7 @@ r%5B%5D=http%3A%2F%2Fajax.googleapis.com%3A80%2Fajax%2Flibs%2Fjquery%2F1.7.2%2Fj
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1172,7 +1172,7 @@ body:
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1196,7 +1196,7 @@ body:
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
         ';
@@ -1242,7 +1242,7 @@ F(ngx_http_finalize_request) {
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/memc")
+            res = ngx.location.capture("/memc")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1312,7 +1312,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/memc")
+            res = ngx.location.capture("/memc")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1385,7 +1385,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1445,7 +1445,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1507,7 +1507,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1567,7 +1567,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1630,7 +1630,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1690,7 +1690,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1756,7 +1756,7 @@ upstream timed out
             ngx.req.read_body()
 
             for i = 1, 2 do
-                local res = ngx.location.capture("/other",
+                res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1796,7 +1796,7 @@ hello world
             ngx.req.read_body()
 
             for i = 1, 2 do
-                local res = ngx.location.capture("/other",
+                res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1836,7 +1836,7 @@ hello world
             ngx.req.read_body()
 
             for i = 1, 2 do
-                local res = ngx.location.capture("/other",
+                res = ngx.location.capture("/other",
                     { method = ngx.HTTP_POST });
 
                 ngx.say(res.body)
@@ -1916,7 +1916,7 @@ a client request body is buffered to a temporary file
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -1979,7 +1979,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2040,7 +2040,7 @@ upstream prematurely closed connection
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2102,7 +2102,7 @@ upstream timed out
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2160,7 +2160,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2219,7 +2219,7 @@ truncated: false
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/proxy")
+            res = ngx.location.capture("/proxy")
             ngx.say("status: ", res.status)
             ngx.say("body: ", res.body)
             ngx.say("truncated: ", res.truncated)
@@ -2288,7 +2288,7 @@ upstream prematurely closed connection
             }
 
             for i, method in ipairs(methods) do
-                local res = ngx.location.capture("/other",
+                res = ngx.location.capture("/other",
                     { method = method })
                 ngx.print(res.body)
             end
@@ -2324,7 +2324,7 @@ method: TRACE
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -2353,7 +2353,7 @@ nil
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE, always_forward_body = true });
 
             ngx.print(res.body)
@@ -2382,7 +2382,7 @@ hello world
     location /lua {
         content_by_lua '
             ngx.req.read_body()
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE, always_forward_body = true });
 
             ngx.print(res.body)
@@ -2410,7 +2410,7 @@ hello world
 --- config
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
         ';
     }
@@ -2603,7 +2603,7 @@ qr/Assertion .*? failed/
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2636,7 +2636,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2669,7 +2669,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
             ngx.say("pr: Host: ", ngx.var.http_host)
@@ -2699,7 +2699,7 @@ pr: Host: localhost
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: Cookie: ", ngx.var.http_cookie)
         ';
@@ -2727,7 +2727,7 @@ pr: Cookie: foo; bar
 
     location = /t {
         content_by_lua '
-            local res = ngx.location.capture("/sub")
+            res = ngx.location.capture("/sub")
             ngx.print(res.body)
             ngx.say("pr: Cookie: ", ngx.var.http_cookie)
         ';
@@ -2750,7 +2750,7 @@ pr: Cookie: foo; bar
 --- config
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/index.html",
+            res = ngx.location.capture("/index.html",
                 { method = ngx.HTTP_HEAD });
             ngx.say("content-length: ", res.header["Content-Length"])
             ngx.say("body: [", res.body, "]")
diff --git a/debian/modules/http-lua/t/023-rewrite/client-abort.t b/debian/modules/http-lua/t/023-rewrite/client-abort.t
index 0d6f2b3..117d17e 100644
--- a/debian/modules/http-lua/t/023-rewrite/client-abort.t
+++ b/debian/modules/http-lua/t/023-rewrite/client-abort.t
@@ -199,7 +199,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 
     location = /sleep {
@@ -240,7 +240,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 --- request
 GET /t
@@ -545,7 +545,7 @@ client prematurely closed connection
                 return
             end
 
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            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
diff --git a/debian/modules/http-lua/t/023-rewrite/exec.t b/debian/modules/http-lua/t/023-rewrite/exec.t
index 59691cb..edd4607 100644
--- a/debian/modules/http-lua/t/023-rewrite/exec.t
+++ b/debian/modules/http-lua/t/023-rewrite/exec.t
@@ -326,7 +326,7 @@ hello
 --- config
     location /main {
         rewrite_by_lua '
-            local res = ngx.location.capture("/test_loc");
+            res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
@@ -354,7 +354,7 @@ hello, bah
 --- config
     location /main {
         rewrite_by_lua '
-            local res = ngx.location.capture("/test_loc");
+            res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/023-rewrite/mixed.t b/debian/modules/http-lua/t/023-rewrite/mixed.t
index 5b38d3f..0f742b2 100644
--- a/debian/modules/http-lua/t/023-rewrite/mixed.t
+++ b/debian/modules/http-lua/t/023-rewrite/mixed.t
@@ -35,7 +35,7 @@ __DATA__
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             print("rewrite GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -49,7 +49,7 @@ __DATA__
         content_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
diff --git a/debian/modules/http-lua/t/023-rewrite/multi-capture.t b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
index a0a02b7..083ec78 100644
--- a/debian/modules/http-lua/t/023-rewrite/multi-capture.t
+++ b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
@@ -154,7 +154,7 @@ res2.body = b
 
     location /main {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo?n=1")
+            res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/req-socket.t b/debian/modules/http-lua/t/023-rewrite/req-socket.t
index 9292385..87cbbbe 100644
--- a/debian/modules/http-lua/t/023-rewrite/req-socket.t
+++ b/debian/modules/http-lua/t/023-rewrite/req-socket.t
@@ -325,7 +325,7 @@ found the end of the stream
 
 === TEST 4: attempt to use the req socket across request boundary
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         rewrite_by_lua '
@@ -376,7 +376,7 @@ hello world
 === 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         rewrite_by_lua '
@@ -440,7 +440,7 @@ done
 
 === TEST 6: pipelined POST requests
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         rewrite_by_lua '
diff --git a/debian/modules/http-lua/t/023-rewrite/sanity.t b/debian/modules/http-lua/t/023-rewrite/sanity.t
index 73a85dc..b90aa0e 100644
--- a/debian/modules/http-lua/t/023-rewrite/sanity.t
+++ b/debian/modules/http-lua/t/023-rewrite/sanity.t
@@ -69,7 +69,7 @@ GET /lua
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        rewrite_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        rewrite_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -87,7 +87,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-local v = ngx.var["request_uri"]
+v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -140,7 +140,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        rewrite_by_lua 'local who = ngx.var.arg_who
+        rewrite_by_lua 'who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
@@ -159,7 +159,7 @@ Hello, agentzh!
 
     location /lua {
         rewrite_by_lua '
-local res = ngx.location.capture("/other")
+res = ngx.location.capture("/other")
 ngx.print("status=", res.status, " ")
 ngx.print("body=", res.body)
 ';
@@ -175,7 +175,7 @@ status=200 body=hello, world
 === TEST 9: capture non-existed location
 --- config
     location /lua {
-        rewrite_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        rewrite_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -187,7 +187,7 @@ GET /lua
 === TEST 10: invalid capture location (not as expected...)
 --- config
     location /lua {
-        rewrite_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        rewrite_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -270,7 +270,7 @@ end
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -359,7 +359,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    rewrite_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    rewrite_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
     content_by_lua 'ngx.exit(ngx.OK)';
 }
 --- request
@@ -377,7 +377,7 @@ location /parent {
     set $a '';
     rewrite_by_lua '
         ngx.var.a = 12;
-        local res = ngx.location.capture(
+        res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -399,7 +399,7 @@ location /sub {
 }
 location /parent {
     rewrite_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = true });
+        res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 
@@ -421,7 +421,7 @@ location /sub {
 
 location /parent {
     rewrite_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = false });
+        res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
     content_by_lua return;
@@ -441,7 +441,7 @@ GET /parent
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
 
@@ -466,7 +466,7 @@ type: foo/bar
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -494,7 +494,7 @@ Bar: Bah
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
index 8b532ea..489a70f 100644
--- a/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
+++ b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
@@ -27,7 +27,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -104,7 +104,7 @@ lua tcp socket get keepalive peer: using connection
 
 === TEST 2: free up the whole connection pool if no active connections
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -177,7 +177,7 @@ received: OK
 
 === TEST 3: upstream sockets close prematurely
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
    server_tokens off;
    keepalive_timeout 100ms;
@@ -254,7 +254,7 @@ done
 
 === TEST 4: http keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
    server_tokens off;
    location /t {
@@ -815,7 +815,7 @@ lua tcp socket keepalive timeout: unlimited
 === TEST 11: sanity (uds)
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -953,7 +953,7 @@ lua tcp socket get keepalive peer: using connection
 
 === 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     error_page 404 /404.html;
     location /t {
diff --git a/debian/modules/http-lua/t/023-rewrite/subrequest.t b/debian/modules/http-lua/t/023-rewrite/subrequest.t
index cb8523c..5d1e8f0 100644
--- a/debian/modules/http-lua/t/023-rewrite/subrequest.t
+++ b/debian/modules/http-lua/t/023-rewrite/subrequest.t
@@ -27,7 +27,7 @@ __DATA__
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -54,7 +54,7 @@ DELETE
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ DELETE
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -105,7 +105,7 @@ POST
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -131,7 +131,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -158,7 +158,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo")
+            res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -184,7 +184,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo", {})
+            res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -213,7 +213,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -241,7 +241,7 @@ hello
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -276,7 +276,7 @@ hello
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -313,7 +313,7 @@ GET
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -345,7 +345,7 @@ hello
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -386,7 +386,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            local res = ngx.location.capture("/memc",
+            res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -417,7 +417,7 @@ cached: hello
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -437,7 +437,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -458,7 +458,7 @@ fo%3D=%3D%3E
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -480,7 +480,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -502,7 +502,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -523,7 +523,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -544,7 +544,7 @@ GET /lua
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -565,7 +565,7 @@ a=3&b=4
 
     location /lua {
         rewrite_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
index e713bb5..329c045 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
@@ -46,7 +46,7 @@ __DATA__
     location /t1 {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -63,7 +63,7 @@ GET /t1
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -79,7 +79,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(150)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -114,7 +114,7 @@ lua tcp socket connect timeout: 150
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(nil)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -149,7 +149,7 @@ lua tcp socket connect timeout: 102
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(0)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -185,7 +185,7 @@ lua tcp socket connect timeout: 102
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(-1)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
index 5258487..41aeab7 100644
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
+++ b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
@@ -250,11 +250,11 @@ attempt to send data on a closed socket:
     }
 --- request
 GET /t
---- response_body_like
+--- response_body
 connected: 1
 request sent: 56
-first line received: HTTP\/1\.1 200 OK
-second line received: (?:Date|Server): .*?
+first line received: HTTP/1.1 200 OK
+second line received: Server: openresty
 --- no_error_log
 [error]
 
@@ -304,7 +304,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
     location /test {
         rewrite_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -329,7 +329,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -940,7 +940,7 @@ close: 1 nil
                 end
             end
 
-            local ok, err = sock:close()
+            ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
 
@@ -1082,7 +1082,7 @@ close: 1 nil
 
 === TEST 19: cannot survive across request boundary (send)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1143,7 +1143,7 @@ received: OK|failed to send request: closed)\$"
 
 === TEST 20: cannot survive across request boundary (receive)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1214,7 +1214,7 @@ 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1285,7 +1285,7 @@ received: OK|failed to close: closed)$/
 
 === TEST 22: cannot survive across request boundary (connect)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -2041,7 +2041,7 @@ close: 1 nil
 
 === TEST 33: bad request tries to connect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2097,7 +2097,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):7: bad request/
 
 === TEST 34: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2156,7 +2156,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 35: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2215,7 +2215,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 36: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2274,7 +2274,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 37: bad request tries to set keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2333,7 +2333,7 @@ qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 38: bad request tries to receiveuntil
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
index 9428bd6..2bea7e7 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.exec("/foo")
             end
 
@@ -59,7 +59,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -95,7 +95,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -178,12 +178,12 @@ hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
             end
 
@@ -270,7 +270,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
index e25f7f8..6ebbb67 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -172,13 +172,13 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -262,7 +262,7 @@ f
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -298,10 +298,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -311,7 +311,7 @@ exiting the user thread
             ngx.thread.spawn(f)
             ngx.say("after")
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -403,11 +403,11 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         #resolver 127.0.0.1;
         resolver_timeout 12s;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -510,7 +510,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -521,7 +521,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -600,7 +600,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -700,7 +700,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -806,7 +806,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -901,7 +901,7 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -995,7 +995,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1080,7 +1080,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1164,7 +1164,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1247,7 +1247,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
index 0e636f7..83de1a3 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -113,7 +113,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
index dccef87..5552107 100644
--- a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
+++ b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
             end
 
@@ -68,11 +68,11 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("in thread 1")
             end
 
-            local function g()
+            function g()
                 ngx.say("in thread 2")
             end
 
@@ -117,7 +117,7 @@ after 2
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -154,13 +154,13 @@ after sleep
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            local function g()
+            function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -210,7 +210,7 @@ delete thread 2
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.blah()
             end
 
@@ -241,9 +241,9 @@ qr/lua user thread aborted: runtime error: rewrite_by_lua\(nginx\.conf:\d+\):3:
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
-                local res = ngx.location.capture("/proxy")
+                res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -287,7 +287,7 @@ after capture: hello world
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -340,7 +340,7 @@ after capture: hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -394,13 +394,13 @@ capture: hello bar
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            local function g()
+            function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -472,8 +472,7 @@ g: after capture: hello bah
 --- config
     location /lua {
         rewrite_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -519,8 +518,7 @@ after g
 --- config
     location /lua {
         rewrite_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -568,7 +566,7 @@ hello in g()
     location /lua {
         rewrite_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -601,7 +599,7 @@ status: running
     location /lua {
         rewrite_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
             end
 
@@ -633,8 +631,7 @@ status: zombie
     location /lua {
         rewrite_by_lua '
             local co
-            local g
-            local function f()
+            function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -673,8 +670,7 @@ status: normal
 --- config
     location /lua {
         rewrite_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -721,7 +717,7 @@ after f
         rewrite_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -774,7 +770,7 @@ f 3
         rewrite_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -783,7 +779,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            local function g()
+            function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -830,7 +826,7 @@ g 3
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -867,12 +863,12 @@ after
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            local function g()
+            function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -918,7 +914,7 @@ hello from g
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -970,7 +966,7 @@ received: OK
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1031,7 +1027,7 @@ after)$
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1077,7 +1073,7 @@ body: hello world)$
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
diff --git a/debian/modules/http-lua/t/024-access/client-abort.t b/debian/modules/http-lua/t/024-access/client-abort.t
index 83bf0a4..c16f4ea 100644
--- a/debian/modules/http-lua/t/024-access/client-abort.t
+++ b/debian/modules/http-lua/t/024-access/client-abort.t
@@ -200,7 +200,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 
     location = /sleep {
@@ -241,7 +241,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 --- request
 GET /t
@@ -546,7 +546,7 @@ client prematurely closed connection
                 return
             end
 
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            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
diff --git a/debian/modules/http-lua/t/024-access/exec.t b/debian/modules/http-lua/t/024-access/exec.t
index d168a47..43c1a77 100644
--- a/debian/modules/http-lua/t/024-access/exec.t
+++ b/debian/modules/http-lua/t/024-access/exec.t
@@ -326,7 +326,7 @@ hello
 --- config
     location /main {
         access_by_lua '
-            local res = ngx.location.capture("/test_loc");
+            res = ngx.location.capture("/test_loc");
             ngx.print("hello, ", res.body)
         ';
         content_by_lua return;
diff --git a/debian/modules/http-lua/t/024-access/mixed.t b/debian/modules/http-lua/t/024-access/mixed.t
index 22f0037..a9f8039 100644
--- a/debian/modules/http-lua/t/024-access/mixed.t
+++ b/debian/modules/http-lua/t/024-access/mixed.t
@@ -35,7 +35,7 @@ __DATA__
         access_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             print("access GET: ", res.status);
 
             res = ngx.location.capture("/memc",
@@ -49,7 +49,7 @@ __DATA__
         content_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -187,7 +187,7 @@ world\x03\x04\xff
         rewrite_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             print("rewrite GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -201,7 +201,7 @@ world\x03\x04\xff
         access_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             print("access GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -215,7 +215,7 @@ world\x03\x04\xff
         content_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("content GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
diff --git a/debian/modules/http-lua/t/024-access/multi-capture.t b/debian/modules/http-lua/t/024-access/multi-capture.t
index b1757dd..930b74d 100644
--- a/debian/modules/http-lua/t/024-access/multi-capture.t
+++ b/debian/modules/http-lua/t/024-access/multi-capture.t
@@ -154,7 +154,7 @@ res2.body = b
 
     location /main {
         access_by_lua '
-            local res = ngx.location.capture("/foo?n=1")
+            res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
diff --git a/debian/modules/http-lua/t/024-access/sanity.t b/debian/modules/http-lua/t/024-access/sanity.t
index e5612a8..7ff177f 100644
--- a/debian/modules/http-lua/t/024-access/sanity.t
+++ b/debian/modules/http-lua/t/024-access/sanity.t
@@ -69,7 +69,7 @@ GET /lua
     location /lua {
         # NOTE: the newline escape sequence must be double-escaped, as nginx config
         # parser will unescape first!
-        access_by_lua 'local v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
+        access_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -87,7 +87,7 @@ request_uri: /lua?a=1&b=2
     }
 --- user_files
 >>> test.lua
-local v = ngx.var["request_uri"]
+v = ngx.var["request_uri"]
 ngx.print("request_uri: ", v, "\n")
 --- request
 GET /lua?a=1&b=2
@@ -140,7 +140,7 @@ result: -0.4090441561579
 === TEST 7: read $arg_xxx
 --- config
     location = /lua {
-        access_by_lua 'local who = ngx.var.arg_who
+        access_by_lua 'who = ngx.var.arg_who
             ngx.print("Hello, ", who, "!")';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
@@ -159,7 +159,7 @@ Hello, agentzh!
 
     location /lua {
         access_by_lua '
-local res = ngx.location.capture("/other")
+res = ngx.location.capture("/other")
 ngx.print("status=", res.status, " ")
 ngx.print("body=", res.body)
 ';
@@ -175,7 +175,7 @@ status=200 body=hello, world
 === TEST 9: capture non-existed location
 --- config
     location /lua {
-        access_by_lua 'local res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
+        access_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -187,7 +187,7 @@ GET /lua
 === TEST 10: invalid capture location (not as expected...)
 --- config
     location /lua {
-        access_by_lua 'local res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
+        access_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
         content_by_lua 'ngx.exit(ngx.OK)';
     }
 --- request
@@ -244,7 +244,7 @@ GET /lua
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body, "\\n");
            else
@@ -271,7 +271,7 @@ access phase not running in subrequests
            ngx.print("num is: ", num, "\\n");
 
            if (num > 0) then
-               local res = ngx.location.capture("/recur?num="..tostring(num - 1));
+               res = ngx.location.capture("/recur?num="..tostring(num - 1));
                ngx.print("status=", res.status, " ");
                ngx.print("body=", res.body);
            else
@@ -357,7 +357,7 @@ location /sub {
 }
 location /parent {
     set $a 12;
-    access_by_lua 'local res = ngx.location.capture("/sub"); ngx.print(res.body)';
+    access_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
     content_by_lua 'ngx.exit(ngx.OK)';
 }
 --- request
@@ -375,7 +375,7 @@ location /parent {
     set $a '';
     access_by_lua '
         ngx.var.a = 12;
-        local res = ngx.location.capture(
+        res = ngx.location.capture(
             "/sub",
             { share_all_vars = true }
         );
@@ -397,7 +397,7 @@ location /sub {
 }
 location /parent {
     access_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = true });
+        res = ngx.location.capture("/sub", { share_all_vars = true });
         ngx.say(ngx.var.a)
     ';
 
@@ -419,7 +419,7 @@ location /sub {
 
 location /parent {
     access_by_lua '
-        local res = ngx.location.capture("/sub", { share_all_vars = false });
+        res = ngx.location.capture("/sub", { share_all_vars = false });
         ngx.say(ngx.var.a)
     ';
     content_by_lua return;
@@ -439,7 +439,7 @@ GET /parent
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
         ';
 
@@ -464,7 +464,7 @@ type: foo/bar
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"]);
         ';
@@ -492,7 +492,7 @@ Bar: Bah
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other");
+            res = ngx.location.capture("/other");
             ngx.say("type: ", res.header["Content-Type"]);
             ngx.say("Bar: ", res.header["Bar"] or "nil");
         ';
diff --git a/debian/modules/http-lua/t/024-access/subrequest.t b/debian/modules/http-lua/t/024-access/subrequest.t
index 665780a..b6ccf11 100644
--- a/debian/modules/http-lua/t/024-access/subrequest.t
+++ b/debian/modules/http-lua/t/024-access/subrequest.t
@@ -27,7 +27,7 @@ __DATA__
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -54,7 +54,7 @@ DELETE
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_DELETE });
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ DELETE
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST });
 
             ngx.print(res.body)
@@ -105,7 +105,7 @@ POST
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_HEAD });
 
             ngx.print(res.body)
@@ -131,7 +131,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_GET });
 
             ngx.print(res.body)
@@ -158,7 +158,7 @@ GET
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo")
+            res = ngx.location.capture("/foo")
 
             ngx.print(res.body)
         ';
@@ -184,7 +184,7 @@ GET
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo", {})
+            res = ngx.location.capture("/foo", {})
 
             ngx.print(res.body)
         ';
@@ -213,7 +213,7 @@ GET
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -241,7 +241,7 @@ hello
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -276,7 +276,7 @@ hello
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { method = ngx.HTTP_PUT, body = "hello" });
 
             ngx.print(res.body)
@@ -313,7 +313,7 @@ GET
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { method = ngx.HTTP_POST, body = "hello" });
 
             ngx.print(res.body)
@@ -345,7 +345,7 @@ hello
         access_by_lua '
             ngx.location.capture("/flush");
 
-            local res = ngx.location.capture("/memc");
+            res = ngx.location.capture("/memc");
             ngx.say("GET: " .. res.status);
 
             res = ngx.location.capture("/memc",
@@ -386,7 +386,7 @@ cached: hello
             ngx.location.capture("/flush",
                 { share_all_vars = true });
 
-            local res = ngx.location.capture("/memc",
+            res = ngx.location.capture("/memc",
                 { share_all_vars = true });
             ngx.say("GET: " .. res.status);
 
@@ -417,7 +417,7 @@ cached: hello
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = {} })
             ngx.print(res.body)
         ';
@@ -437,7 +437,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>" } })
             ngx.print(res.body)
         ';
@@ -458,7 +458,7 @@ fo%3D=%3D%3E
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { ["fo="] = "=>",
                     ["="] = ":" } })
             ngx.print(res.body)
@@ -480,7 +480,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { foo = 3,
                     bar = "hello" } })
             ngx.print(res.body)
@@ -502,7 +502,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { [57] = "hi" } })
             ngx.print(res.body)
         ';
@@ -523,7 +523,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo",
+            res = ngx.location.capture("/foo",
                 { args = { "hi" } })
             ngx.print(res.body)
         ';
@@ -544,7 +544,7 @@ GET /lua
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = { b = 4 } })
             ngx.print(res.body)
         ';
@@ -565,7 +565,7 @@ a=3&b=4
 
     location /lua {
         access_by_lua '
-            local res = ngx.location.capture("/foo?a=3",
+            res = ngx.location.capture("/foo?a=3",
                 { args = "b=4" })
             ngx.print(res.body)
         ';
diff --git a/debian/modules/http-lua/t/024-access/uthread-exec.t b/debian/modules/http-lua/t/024-access/uthread-exec.t
index 9c88eb3..7add3d4 100644
--- a/debian/modules/http-lua/t/024-access/uthread-exec.t
+++ b/debian/modules/http-lua/t/024-access/uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.exec("/foo")
             end
 
@@ -59,7 +59,7 @@ i am foo
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -95,7 +95,7 @@ i am foo
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -179,12 +179,12 @@ hello foo
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
             end
 
@@ -271,7 +271,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-exit.t b/debian/modules/http-lua/t/024-access/uthread-exit.t
index 2757237..02c2a1f 100644
--- a/debian/modules/http-lua/t/024-access/uthread-exit.t
+++ b/debian/modules/http-lua/t/024-access/uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -172,13 +172,13 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -262,7 +262,7 @@ f
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -298,10 +298,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -394,10 +394,10 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -491,7 +491,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -502,7 +502,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -582,7 +582,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -682,7 +682,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -788,7 +788,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -883,7 +883,7 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -977,7 +977,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1062,7 +1062,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1146,7 +1146,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1229,7 +1229,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-redirect.t b/debian/modules/http-lua/t/024-access/uthread-redirect.t
index cb99a35..4eb4759 100644
--- a/debian/modules/http-lua/t/024-access/uthread-redirect.t
+++ b/debian/modules/http-lua/t/024-access/uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -113,7 +113,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
diff --git a/debian/modules/http-lua/t/024-access/uthread-spawn.t b/debian/modules/http-lua/t/024-access/uthread-spawn.t
index bc92ccd..7c7ba3b 100644
--- a/debian/modules/http-lua/t/024-access/uthread-spawn.t
+++ b/debian/modules/http-lua/t/024-access/uthread-spawn.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
             end
 
@@ -68,11 +68,11 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("in thread 1")
             end
 
-            local function g()
+            function g()
                 ngx.say("in thread 2")
             end
 
@@ -117,7 +117,7 @@ after 2
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -154,13 +154,13 @@ after sleep
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            local function g()
+            function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -210,7 +210,7 @@ delete thread 2
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.blah()
             end
 
@@ -241,9 +241,9 @@ qr/lua user thread aborted: runtime error: access_by_lua\(nginx\.conf:\d+\):3: a
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
-                local res = ngx.location.capture("/proxy")
+                res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -287,7 +287,7 @@ after capture: hello world
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -340,7 +340,7 @@ after capture: hello foo
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -395,13 +395,13 @@ capture: hello bar
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            local function g()
+            function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -473,8 +473,7 @@ g: after capture: hello bah
 --- config
     location /lua {
         access_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -520,8 +519,7 @@ after g
 --- config
     location /lua {
         access_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -569,7 +567,7 @@ hello in g()
     location /lua {
         access_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -602,7 +600,7 @@ status: running
     location /lua {
         access_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
             end
 
@@ -634,8 +632,7 @@ status: zombie
     location /lua {
         access_by_lua '
             local co
-            local g
-            local function f()
+            function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -674,8 +671,7 @@ status: normal
 --- config
     location /lua {
         access_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -722,7 +718,7 @@ after f
         access_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -775,7 +771,7 @@ f 3
         access_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -784,7 +780,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            local function g()
+            function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -831,7 +827,7 @@ g 3
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -868,12 +864,12 @@ after
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            local function g()
+            function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -919,7 +915,7 @@ hello from g
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -971,7 +967,7 @@ received: OK
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1032,7 +1028,7 @@ after)$
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1077,7 +1073,7 @@ body: hello world)$
 --- config
     location /lua {
         access_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
diff --git a/debian/modules/http-lua/t/025-codecache.t b/debian/modules/http-lua/t/025-codecache.t
index 22b78b2..20791d7 100644
--- a/debian/modules/http-lua/t/025-codecache.t
+++ b/debian/modules/http-lua/t/025-codecache.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 163;
+plan tests => repeat_each() * 155;
 
 #$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
 
@@ -27,7 +27,7 @@ __DATA__
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -61,7 +61,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -95,7 +95,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -130,7 +130,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -166,7 +166,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("ngx.say(101)")
             f:close()
             ngx.say("updated")
@@ -193,7 +193,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 6: code cache explicitly off (affects require) + content_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -204,7 +204,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
+            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
             f:write("module(..., package.seeall); ngx.say(102);")
             f:close()
             ngx.say("updated")
@@ -231,7 +231,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 7: code cache explicitly off (affects require) + content_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -240,7 +240,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
+            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
             f:write("module(..., package.seeall); ngx.say(102);")
             f:close()
             ngx.say("updated")
@@ -269,7 +269,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 8: code cache explicitly off (affects require) + set_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /lua {
         lua_code_cache off;
@@ -279,7 +279,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
+            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
             f:write("module(..., package.seeall); return 102;")
             f:close()
             ngx.say("updated")
@@ -308,7 +308,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 9: code cache explicitly on (affects require) + set_by_lua_file
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /lua {
         lua_code_cache on;
@@ -318,7 +318,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
+            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
             f:write("module(..., package.seeall); return 102;")
             f:close()
             ngx.say("updated")
@@ -355,7 +355,7 @@ updated
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("return 101")
             f:close()
             ngx.say("updated")
@@ -390,7 +390,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
     location /update {
         content_by_lua '
             -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
+            local f = assert(io.open("t/servroot/html/test.lua", "w"))
             f:write("return 101")
             f:close()
             ngx.say("updated")
@@ -468,7 +468,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 14: no clear builtin lib "string"
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location /lua {
@@ -504,7 +504,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 15: do not skip luarocks
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
      lua_code_cache off;"
 --- config
     location /main {
@@ -554,7 +554,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 16: do not skip luarocks*
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
      lua_code_cache off;"
 --- config
     location /main {
@@ -604,7 +604,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
 
 === TEST 17: clear _G table
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location /t {
@@ -1050,7 +1050,7 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
 
 === TEST 29: cosocket connection pool timeout (after Lua VM destroys)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location = /t {
@@ -1118,7 +1118,7 @@ qr/\blua tcp socket keepalive: free connection pool [0-9A-F]+ for "127.0.0.1:/,
 
 === TEST 30: cosocket connection pool timeout (before Lua VM destroys)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     lua_code_cache off;
     location = /t {
@@ -1244,133 +1244,3 @@ qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
 "decrementing the reference count for Lua VM: 1",
 "lua close the global Lua VM",
 ]
-
-
-
-=== TEST 32: make sure inline code keys are correct
-GitHub issue #1428
---- config
-include ../html/a/proxy.conf;
-include ../html/b/proxy.conf;
-include ../html/c/proxy.conf;
-
-location /t {
-    echo_location /a/;
-    echo_location /b/;
-    echo_location /a/;
-    echo_location /c/;
-}
-
---- user_files
->>> a/proxy.conf
-location /a/ {
-    content_by_lua_block { ngx.say("/a/ is called") }
-}
-
->>> b/proxy.conf
-location /b/ {
-    content_by_lua_block { ngx.say("/b/ is called") }
-}
-
->>> c/proxy.conf
-location /c/ {
-    content_by_lua_block { ngx.say("/b/ is called") }
-}
-
---- request
-GET /t
---- response_body
-/a/ is called
-/b/ is called
-/a/ is called
-/b/ is called
---- grep_error_log eval: qr/looking up Lua code cache with key '.*?'/
---- grep_error_log_out eval
-[
-"looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-",
-"looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_3c7137b8371d10bc148c8f8bb3042ee6'
-looking up Lua code cache with key '=content_by_lua(proxy.conf:2)nhli_1dfe09105792ef65c8d576cc486d5e04'
-"]
---- log_level: debug
---- no_error_log
-[error]
-
-
-
-=== TEST 33: make sure Lua code file keys are correct
-GitHub issue #1428
---- config
-include ../html/a/proxy.conf;
-include ../html/b/proxy.conf;
-include ../html/c/proxy.conf;
-
-location /t {
-    echo_location /a/;
-    echo_location /b/;
-    echo_location /a/;
-    echo_location /c/;
-}
-
---- user_files
->>> a.lua
-ngx.say("/a/ is called")
-
->>> b.lua
-ngx.say("/b/ is called")
-
->>> c.lua
-ngx.say("/b/ is called")
-
->>> a/proxy.conf
-location /a/ {
-    content_by_lua_file html/a.lua;
-}
-
->>> b/proxy.conf
-location /b/ {
-    content_by_lua_file html/b.lua;
-}
-
->>> c/proxy.conf
-location /c/ {
-    content_by_lua_file html/c.lua;
-}
-
---- request
-GET /t
---- response_body
-/a/ is called
-/b/ is called
-/a/ is called
-/b/ is called
---- grep_error_log eval: qr/looking up Lua code cache with key '.*?'/
---- grep_error_log_out eval
-[
-"looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
-looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
-",
-"looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
-looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
-looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_68f5f4e946c3efd1cc206452b807e8b6'
-looking up Lua code cache with key 'nhlf_48a9a7def61143c003a7de1644e026e4'
-looking up Lua code cache with key 'nhlf_042c9b3a136fbacbbd0e4b9ad10896b7'
-"
-]
---- log_level: debug
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/027-multi-capture.t b/debian/modules/http-lua/t/027-multi-capture.t
index 9299561..9227fe5 100644
--- a/debian/modules/http-lua/t/027-multi-capture.t
+++ b/debian/modules/http-lua/t/027-multi-capture.t
@@ -151,7 +151,7 @@ res2.body = b
 
     location /main {
         content_by_lua '
-            local res = ngx.location.capture("/foo?n=1")
+            res = ngx.location.capture("/foo?n=1")
             ngx.say("top res.status = " .. res.status)
             ngx.say("top res.body = [" .. res.body .. "]")
         ';
@@ -743,7 +743,7 @@ proxy_cache_path conf/cache levels=1:2 keys_zone=STATIC:10m inactive=10m max_siz
 
     location = /proxy {
             proxy_cache STATIC;
-            proxy_pass http://127.0.0.2:12345;
+            proxy_pass http://agentzh.org:12345;
             proxy_cache_key $proxy_host$uri$args;
             proxy_cache_valid any 1s;
             #proxy_http_version 1.1;
diff --git a/debian/modules/http-lua/t/028-req-header.t b/debian/modules/http-lua/t/028-req-header.t
index 8ddbb29..ca92daa 100644
--- a/debian/modules/http-lua/t/028-req-header.t
+++ b/debian/modules/http-lua/t/028-req-header.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks() + 44);
+plan tests => repeat_each() * (2 * blocks() + 43);
 
 #no_diff();
 no_long_string();
@@ -2008,25 +2008,3 @@ found 3 headers.
 --- no_error_log
 lua exceeding request header limit
 [error]
-
-
-
-=== TEST 61: setting Host header clears cached $host variable
---- config
-    location /req-header {
-        # this makes $host indexed and cacheable
-        set $foo $host;
-
-        content_by_lua_block {
-            ngx.say(ngx.var.host)
-            ngx.req.set_header("Host", "new");
-            ngx.say(ngx.var.host)
-        }
-    }
---- request
-GET /req-header
---- response_body
-localhost
-new
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/030-uri-args.t b/debian/modules/http-lua/t/030-uri-args.t
index 7af63c4..a9d46ff 100644
--- a/debian/modules/http-lua/t/030-uri-args.t
+++ b/debian/modules/http-lua/t/030-uri-args.t
@@ -421,7 +421,7 @@ done
             ngx.req.set_uri_args("hello")
             ngx.req.set_uri("/bar", true);
         ';
-        proxy_pass http://127.0.0.2:12345;
+        proxy_pass http://agentzh.org:12345;
     }
 --- request
     GET /foo?world
@@ -568,7 +568,7 @@ HTTP/1.0 ca%20t=%25
             ngx.req.set_uri("/bar", true);
             ngx.exit(503)
         ';
-        proxy_pass http://127.0.0.2:12345;
+        proxy_pass http://agentzh.org:12345;
     }
 --- request
     GET /foo?world
@@ -586,7 +586,7 @@ hello
         #set $args 'hello';
         set $err '';
         access_by_lua '
-            local res, err = pcall(ngx.req.set_uri, "/bar", true);
+            res, err = pcall(ngx.req.set_uri, "/bar", true);
             ngx.var.err = err
         ';
         echo "err: $err";
@@ -626,7 +626,7 @@ uri: /bar
     location /foo {
         #set $args 'hello';
         content_by_lua '
-            local res, err = pcall(ngx.req.set_uri, "/bar", true);
+            res, err = pcall(ngx.req.set_uri, "/bar", true);
             ngx.say("err: ", err)
         ';
     }
@@ -665,7 +665,7 @@ uri: /bar
     location /foo {
         #set $args 'hello';
         set_by_lua $err '
-            local res, err = pcall(ngx.req.set_uri, "/bar", true);
+            res, err = pcall(ngx.req.set_uri, "/bar", true);
             return err
         ';
         echo "err: $err";
@@ -788,7 +788,7 @@ GET /lua
     location /lua {
         content_by_lua '
             local t = {bar = ngx.shared.dogs, foo = 3}
-            local rc, err = pcall(ngx.encode_args, t)
+            rc, err = pcall(ngx.encode_args, t)
             ngx.say("rc: ", rc, ", err: ", err)
         ';
     }
@@ -1112,7 +1112,6 @@ HTTP/1.0 a=3&b=5&b=6
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args)
 
@@ -1136,7 +1135,6 @@ b = foo
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=bar&b=foo&a=baz"
             args, err = ngx.decode_args(args)
 
@@ -1160,7 +1158,6 @@ b = foo
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = ""
             args, err = ngx.decode_args(args)
             if err then
@@ -1181,7 +1178,6 @@ n = 0
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a&b"
             args, err = ngx.decode_args(args)
             if err then
@@ -1204,7 +1200,6 @@ b = true
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=&b="
             args, err = ngx.decode_args(args)
 
@@ -1228,7 +1223,6 @@ b =
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args, 1)
             if err then
@@ -1252,7 +1246,6 @@ b = nil
 --- config
     location /lua {
         content_by_lua '
-            local err
             local args = "a=bar&b=foo"
             args, err = ngx.decode_args(args, -1)
 
@@ -1277,7 +1270,7 @@ b = foo
     location /lua {
         content_by_lua '
             local s = "f+f=bar&B=foo"
-            local args, err = ngx.decode_args(s)
+            args, err = ngx.decode_args(s)
             if err then
                 ngx.say("err: ", err)
             end
@@ -1309,7 +1302,7 @@ s = f+f=bar&B=foo
     lua_need_request_body on;
     location /t {
         content_by_lua '
-            local function split(s, delimiter)
+            function split(s, delimiter)
                 local result = {}
                 local from = 1
                 local delim_from, delim_to = string.find(s, delimiter, from)
diff --git a/debian/modules/http-lua/t/034-match.t b/debian/modules/http-lua/t/034-match.t
index 473a11f..ebe5762 100644
--- a/debian/modules/http-lua/t/034-match.t
+++ b/debian/modules/http-lua/t/034-match.t
@@ -21,7 +21,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)")
+            m = ngx.re.match("hello, 1234", "([0-9]+)")
             if m then
                 ngx.say(m[0])
             else
@@ -40,7 +40,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(\\\\d+)")
+            m = ngx.re.match("hello, 1234", "(\\\\d+)")
             if m then
                 ngx.say(m[0])
             else
@@ -59,7 +59,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(\\d+)")
+            m = ngx.re.match("hello, 1234", "(\\d+)")
             if m then
                 ngx.say(m[0])
             else
@@ -80,7 +80,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "[[\\d+]]")
+            m = ngx.re.match("hello, 1234", "[[\\d+]]")
             if m then
                 ngx.say(m[0])
             else
@@ -101,7 +101,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+")
+            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -122,7 +122,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "")
+            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -145,7 +145,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
+            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -168,7 +168,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "foo")
+            m = ngx.re.match("hello, 1234", "foo")
             if m then
                 ngx.say(m[0])
             else
@@ -187,7 +187,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "HELLO")
+            m = ngx.re.match("hello, 1234", "HELLO")
             if m then
                 ngx.say(m[0])
             else
@@ -206,7 +206,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "HELLO", "i")
+            m = ngx.re.match("hello, 1234", "HELLO", "i")
             if m then
                 ngx.say(m[0])
             else
@@ -225,7 +225,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local rc, err = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iu")
+            rc, err = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iu")
             if not rc then
                 ngx.say("FAIL: ", err)
                 return
@@ -249,7 +249,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "^world", "m")
+            m = ngx.re.match("hello\\nworld", "^world", "m")
             if m then
                 ngx.say(m[0])
             else
@@ -268,7 +268,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", ".*", "m")
+            m = ngx.re.match("hello\\nworld", ".*", "m")
             if m then
                 ngx.say(m[0])
             else
@@ -287,7 +287,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "^world", "s")
+            m = ngx.re.match("hello\\nworld", "^world", "s")
             if m then
                 ngx.say(m[0])
             else
@@ -306,7 +306,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", ".*", "s")
+            m = ngx.re.match("hello\\nworld", ".*", "s")
             if m then
                 ngx.say(m[0])
             else
@@ -326,7 +326,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "x")
+            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "x")
             if m then
                 ngx.say(m[0])
             else
@@ -372,7 +372,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            local rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Hm")
+            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Hm")
             if rc then
                 if m then
                     ngx.say(m[0])
@@ -395,7 +395,7 @@ error: .*?unknown flag "H" \(flags "Hm"\)
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, world", "(world)|(hello)", "x")
+            m = ngx.re.match("hello, world", "(world)|(hello)", "x")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -418,7 +418,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)(h?)")
+            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -442,7 +442,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "a")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "a")
             if m then
                 ngx.say(m[0])
             else
@@ -461,7 +461,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "a")
+            m = ngx.re.match("1234, hello", "([0-9]+)", "a")
             if m then
                 ngx.say(m[0])
             else
@@ -481,7 +481,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = {}
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
+            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -504,7 +504,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = { pos = 3 }
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
+            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -526,7 +526,7 @@ not matched!
 --- config
     location /re {
         set_by_lua $res '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)")
+            m = ngx.re.match("hello, 1234", "([0-9]+)")
             if m then
                 return m[0]
             else
@@ -569,7 +569,7 @@ baz
     }
 --- user_files
 >>> a.lua
-local m = ngx.re.match("hello, 1234", "(\\\s+)")
+m = ngx.re.match("hello, 1234", "(\\\s+)")
 if m then
     ngx.say("[", m[0], "]")
 else
@@ -595,7 +595,7 @@ end
 local uri = "<impact>2</impact>"
 local regex = '(?:>[\\w\\s]*</?\\w{2,}>)';
 ngx.say("regex: ", regex)
-local m = ngx.re.match(uri, regex, "oi")
+m = ngx.re.match(uri, regex, "oi")
 if m then
     ngx.say("[", m[0], "]")
 else
@@ -613,7 +613,7 @@ regex: (?:>[\w\s]*</?\w{2,}>)
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", [[\\d+]])
+            m = ngx.re.match("hello, 1234", [[\\d+]])
             if m then
                 ngx.say(m[0])
             else
@@ -660,7 +660,7 @@ error: pcre_compile() failed: missing ) in "([0-9]+"
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", [[([0-9]+)]])
+            m = ngx.re.match("hello, 1234", [[([0-9]+)]])
             if m then
                 ngx.say(m[0])
             else
@@ -1027,7 +1027,7 @@ exec opts: 0
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -1067,7 +1067,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -1101,7 +1101,7 @@ failed to match
         content_by_lua '
             local res = {}
             local s = "hello, 1234"
-            local m = ngx.re.match(s, [[(\\d)(\\d)]], "o", nil, res)
+            m = ngx.re.match(s, [[(\\d)(\\d)]], "o", nil, res)
             if m then
                 ngx.say("1: m size: ", #m)
                 ngx.say("1: res size: ", #res)
@@ -1132,12 +1132,11 @@ failed to match
 === TEST 48: init_by_lua
 --- http_config
     init_by_lua '
-        package.loaded.m = ngx.re.match("hello, 1234", "(\\\\d+)")
+        m = ngx.re.match("hello, 1234", "(\\\\d+)")
     ';
 --- config
     location /re {
         content_by_lua '
-            local m = package.loaded.m
             if m then
                 ngx.say(m[0])
             else
diff --git a/debian/modules/http-lua/t/035-gmatch.t b/debian/modules/http-lua/t/035-gmatch.t
index 0dfeaea..0426997 100644
--- a/debian/modules/http-lua/t/035-gmatch.t
+++ b/debian/modules/http-lua/t/035-gmatch.t
@@ -123,7 +123,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            local it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "a")
+            it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "a")
             ngx.say(it())
         ';
     }
@@ -418,7 +418,7 @@ hello
         content_by_lua '
             local a = {}
             for i = 1, 3 do
-                local it = ngx.re.gmatch("hello, world", "[a-z]+")
+                it = ngx.re.gmatch("hello, world", "[a-z]+")
                 it()
                 collectgarbage()
                 table.insert(a, {"hello", "world"})
@@ -482,9 +482,9 @@ end
     GET /main
 --- response_body
 matched
-matched
---- no_error_log
-[error]
+sr failed: 500
+--- error_log
+attempt to use ngx.re.gmatch iterator in a request that did not create it
 
 
 
@@ -518,7 +518,7 @@ matched: []
     location /re {
         content_by_lua '
             local it = ngx.re.gmatch("1234, 1234", "(?<first>[0-9]+)")
-            local m = it()
+            m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -555,7 +555,7 @@ matched: []
         content_by_lua '
             local it = ngx.re.gmatch("1234, abcd, 1234", "(?<first>[0-9]+)|(?<second>[a-z]+)")
 
-            local m = it()
+            m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -599,7 +599,7 @@ abcd
     location /re {
         content_by_lua '
             local it = ngx.re.gmatch("hello, 1234", "(?<first>[a-z]+), (?<first>[0-9]+)", "D")
-            local m = it()
+            m = it()
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -825,7 +825,7 @@ exec opts: 0
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -871,7 +871,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -881,7 +881,7 @@ if not it then
     return
 end
 
-local res, err = it()
+res, err = it()
 
 --[[
 ngx.update_time()
diff --git a/debian/modules/http-lua/t/036-sub.t b/debian/modules/http-lua/t/036-sub.t
index 3e88eba..2b4b075 100644
--- a/debian/modules/http-lua/t/036-sub.t
+++ b/debian/modules/http-lua/t/036-sub.t
@@ -590,7 +590,7 @@ s: a好
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -693,7 +693,7 @@ ab.cd
 
 location = /t {
     content_by_lua '
-        local function test()
+        function test()
             local data = [[
                 OUTER {FIRST}
 ]]
diff --git a/debian/modules/http-lua/t/037-gsub.t b/debian/modules/http-lua/t/037-gsub.t
index 41f86ac..4c5810d 100644
--- a/debian/modules/http-lua/t/037-gsub.t
+++ b/debian/modules/http-lua/t/037-gsub.t
@@ -511,7 +511,7 @@ s: aa
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/038-match-o.t b/debian/modules/http-lua/t/038-match-o.t
index f6ae010..d61ff1f 100644
--- a/debian/modules/http-lua/t/038-match-o.t
+++ b/debian/modules/http-lua/t/038-match-o.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -39,7 +39,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(\\\\d+)", "o")
+            m = ngx.re.match("hello, 1234", "(\\\\d+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -58,7 +58,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(\\d+)", "o")
+            m = ngx.re.match("hello, 1234", "(\\d+)", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -79,7 +79,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "[[\\d+]]", "o")
+            m = ngx.re.match("hello, 1234", "[[\\d+]]", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -100,7 +100,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+", "o")
+            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -121,7 +121,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
+            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -144,7 +144,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "foo", "o")
+            m = ngx.re.match("hello, 1234", "foo", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -163,7 +163,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "HELLO", "o")
+            m = ngx.re.match("hello, 1234", "HELLO", "o")
             if m then
                 ngx.say(m[0])
             else
@@ -182,7 +182,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "HELLO", "oi")
+            m = ngx.re.match("hello, 1234", "HELLO", "oi")
             if m then
                 ngx.say(m[0])
             else
@@ -224,7 +224,7 @@ this version of PCRE is not compiled with PCRE_UTF8 support|^hello章亦$
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "^world", "mo")
+            m = ngx.re.match("hello\\nworld", "^world", "mo")
             if m then
                 ngx.say(m[0])
             else
@@ -243,7 +243,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", ".*", "om")
+            m = ngx.re.match("hello\\nworld", ".*", "om")
             if m then
                 ngx.say(m[0])
             else
@@ -262,7 +262,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "^world", "so")
+            m = ngx.re.match("hello\\nworld", "^world", "so")
             if m then
                 ngx.say(m[0])
             else
@@ -281,7 +281,7 @@ not matched: nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", ".*", "os")
+            m = ngx.re.match("hello\\nworld", ".*", "os")
             if m then
                 ngx.say(m[0])
             else
@@ -301,7 +301,7 @@ world
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "xo")
+            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "xo")
             if m then
                 ngx.say(m[0])
             else
@@ -347,7 +347,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            local rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Ho")
+            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Ho")
             if rc then
                 if m then
                     ngx.say(m[0])
@@ -370,7 +370,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, world", "(world)|(hello)", "xo")
+            m = ngx.re.match("hello, world", "(world)|(hello)", "xo")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -393,7 +393,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)(h?)", "o")
+            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)", "o")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -417,7 +417,7 @@ hello
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "oa")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "oa")
             if m then
                 ngx.say(m[0])
             else
@@ -436,7 +436,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "ao")
+            m = ngx.re.match("1234, hello", "([0-9]+)", "ao")
             if m then
                 ngx.say(m[0])
             else
@@ -456,7 +456,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = {}
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
+            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -479,7 +479,7 @@ not matched!
     location /re {
         content_by_lua '
             local ctx = { pos = 3 }
-            local m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
+            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
             if m then
                 ngx.say(m[0])
                 ngx.say(ctx.pos)
@@ -501,7 +501,7 @@ not matched!
 --- config
     location /re {
         set_by_lua $res '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
             if m then
                 return m[0]
             else
diff --git a/debian/modules/http-lua/t/041-header-filter.t b/debian/modules/http-lua/t/041-header-filter.t
index 0adc699..7d8ee74 100644
--- a/debian/modules/http-lua/t/041-header-filter.t
+++ b/debian/modules/http-lua/t/041-header-filter.t
@@ -10,7 +10,7 @@ log_level('debug');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 13);
+plan tests => repeat_each() * 94;
 
 #no_diff();
 #no_long_string();
@@ -416,7 +416,7 @@ lua release ngx.ctx
 
 
 
-=== TEST 20: globals are shared by all requests
+=== TEST 20: global got cleared for each single request
 --- config
     location /lua {
         set $foo '';
@@ -428,7 +428,6 @@ lua release ngx.ctx
             if not foo then
                 foo = 1
             else
-                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             ngx.var.foo = foo
@@ -436,13 +435,10 @@ lua release ngx.ctx
     }
 --- request
 GET /lua
---- response_body_like
-^[12]$
+--- response_body
+1
 --- no_error_log
 [error]
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["", "old foo: 1\n"]
 
 
 
@@ -734,8 +730,7 @@ hello world
 --- config
     location /t {
         header_filter_by_lua '
-            local bar
-            local function foo()
+            function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/043-shdict.t b/debian/modules/http-lua/t/043-shdict.t
index b0528e5..9183bf5 100644
--- a/debian/modules/http-lua/t/043-shdict.t
+++ b/debian/modules/http-lua/t/043-shdict.t
@@ -420,7 +420,7 @@ ngx_slab_alloc() failed: no memory in lua_shared_dict zone
             ngx.say(dogs:get(key))
 
             key = string.rep("a", 65536)
-            local ok, err = dogs:set(key, "world")
+            ok, err = dogs:set(key, "world")
             if not ok then
                 ngx.say("not ok: ", err)
                 return
@@ -2048,7 +2048,7 @@ get_stale ok: false, stale: false
                 ngx.say("get not ok: ", err)
                 return
             end
-            local flags = err
+            flags = err
             ngx.say("get_stale ok: ", data, ", flags: ", flags,
                     ", stale: ", stale)
 
diff --git a/debian/modules/http-lua/t/047-match-jit.t b/debian/modules/http-lua/t/047-match-jit.t
index f53a408..2417a63 100644
--- a/debian/modules/http-lua/t/047-match-jit.t
+++ b/debian/modules/http-lua/t/047-match-jit.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "j")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "j")
             if m then
                 ngx.say(m[0])
             else
@@ -41,7 +41,7 @@ pcre JIT compiling result: 1
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, world", "([0-9]+)", "j")
+            m = ngx.re.match("hello, world", "([0-9]+)", "j")
             if m then
                 ngx.say(m[0])
             else
@@ -62,7 +62,7 @@ pcre JIT compiling result: 1
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "jo")
+            m = ngx.re.match("hello, 1234", "([0-9]+)", "jo")
             if m then
                 ngx.say(m[0])
             else
@@ -87,7 +87,7 @@ qr/pcre JIT compiling result: \d+/
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello, world", "([0-9]+)", "jo")
+            m = ngx.re.match("hello, world", "([0-9]+)", "jo")
             if m then
                 ngx.say(m[0])
             else
@@ -147,7 +147,7 @@ error: pcre_compile() failed: missing ) in "(abc"
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 21)
+s = string.rep([[ABCDEFG]], 21)
 
 local start = ngx.now()
 
@@ -187,7 +187,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 21)
+s = string.rep([[ABCDEFG]], 21)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/048-match-dfa.t b/debian/modules/http-lua/t/048-match-dfa.t
index edf3662..28b5a60 100644
--- a/debian/modules/http-lua/t/048-match-dfa.t
+++ b/debian/modules/http-lua/t/048-match-dfa.t
@@ -20,7 +20,7 @@ __DATA__
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello", "(he|hell)", "d")
+            m = ngx.re.match("hello", "(he|hell)", "d")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -43,7 +43,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello", "(he|hell)", "do")
+            m = ngx.re.match("hello", "(he|hell)", "do")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -66,7 +66,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello", "(he|hell)", "jd")
+            m = ngx.re.match("hello", "(he|hell)", "jd")
             if m then
                 ngx.say(m[0])
             else
@@ -85,7 +85,7 @@ hell
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("world", "(he|hell)", "d")
+            m = ngx.re.match("world", "(he|hell)", "d")
             if m then
                 ngx.say(m[0])
             else
@@ -104,7 +104,7 @@ not matched!
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("hello", "he|hell", "do")
+            m = ngx.re.match("hello", "he|hell", "do")
             if m then
                 ngx.say(m[0])
                 ngx.say(m[1])
@@ -127,7 +127,7 @@ nil
 --- config
     location /re {
         content_by_lua '
-            local m = ngx.re.match("world", "([0-9]+)", "do")
+            m = ngx.re.match("world", "([0-9]+)", "do")
             if m then
                 ngx.say(m[0])
             else
diff --git a/debian/modules/http-lua/t/055-subreq-vars.t b/debian/modules/http-lua/t/055-subreq-vars.t
index 1369992..eb5e24d 100644
--- a/debian/modules/http-lua/t/055-subreq-vars.t
+++ b/debian/modules/http-lua/t/055-subreq-vars.t
@@ -28,7 +28,7 @@ __DATA__
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -82,7 +82,7 @@ qr/variable "(dog|cat)" cannot be assigned a value \(maybe you forgot to define
     location /lua {
         set $dog '';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -110,7 +110,7 @@ variable "cat" cannot be assigned a value (maybe you forgot to define it first?)
         set $dog '';
         set $cat '';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { dog = "hello", cat = 32 }});
 
             ngx.print(res.body)
@@ -137,7 +137,7 @@ cat = 32
         set $dog '';
         set $cat '';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = "hello" });
 
             ngx.print(res.body)
@@ -165,7 +165,7 @@ Bad vars option value
         set $dog '';
         set $cat '';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { cat = true } });
 
             ngx.print(res.body)
@@ -188,7 +188,7 @@ attempt to use bad variable value type boolean
 
     location /lua {
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { args = "a=hello&b=32" }});
 
             ngx.print(res.body)
@@ -234,7 +234,7 @@ variable "query_string" not changeable
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { copy_all_vars = true });
 
             ngx.print(res.body)
@@ -259,7 +259,7 @@ GET /lua
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { share_all_vars = true });
 
             ngx.print(res.body)
@@ -284,7 +284,7 @@ GET /lua
     location /lua {
         set $dog 'hello';
         content_by_lua '
-            local res = ngx.location.capture("/other",
+            res = ngx.location.capture("/other",
                 { vars = { dog = "hiya" }, copy_all_vars = true });
 
             ngx.print(res.body)
diff --git a/debian/modules/http-lua/t/056-flush.t b/debian/modules/http-lua/t/056-flush.t
index bdd33d4..6b697a4 100644
--- a/debian/modules/http-lua/t/056-flush.t
+++ b/debian/modules/http-lua/t/056-flush.t
@@ -317,7 +317,7 @@ lua http 1.0 buffering makes ngx.flush() a no-op
 --- config
     location /test {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello, world")
                 ngx.flush(true)
                 coroutine.yield()
diff --git a/debian/modules/http-lua/t/057-flush-timeout.t b/debian/modules/http-lua/t/057-flush-timeout.t
index 1f8cfaa..a046539 100644
--- a/debian/modules/http-lua/t/057-flush-timeout.t
+++ b/debian/modules/http-lua/t/057-flush-timeout.t
@@ -127,7 +127,7 @@ del timer 1234
     send_timeout 200ms;
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
diff --git a/debian/modules/http-lua/t/058-tcp-socket.t b/debian/modules/http-lua/t/058-tcp-socket.t
index 837006c..354a876 100644
--- a/debian/modules/http-lua/t/058-tcp-socket.t
+++ b/debian/modules/http-lua/t/058-tcp-socket.t
@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 219;
+plan tests => repeat_each() * 199;
 
 our $HtmlDir = html_dir;
 
@@ -245,11 +245,11 @@ attempt to send data on a closed socket:
 
 --- request
 GET /t
---- response_body_like
+--- response_body
 connected: 1
 request sent: 56
-first line received: HTTP\/1\.1 200 OK
-second line received: (?:Date|Server): .*?
+first line received: HTTP/1.1 200 OK
+second line received: Server: openresty
 --- no_error_log
 [error]
 --- timeout: 10
@@ -298,7 +298,7 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
     location /test {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -321,7 +321,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -914,7 +914,7 @@ close: 1 nil
                 end
             end
 
-            local ok, err = sock:close()
+            ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
     }
@@ -961,7 +961,7 @@ close: 1 nil
             line, err = sock:receive()
             ngx.say("receive: ", line, " ", err)
 
-            local ok, err = sock:close()
+            ok, err = sock:close()
             ngx.say("close: ", ok, " ", err)
         ';
     }
@@ -1057,7 +1057,7 @@ close: 1 nil
 
 === TEST 19: cannot survive across request boundary (send)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1116,7 +1116,7 @@ received: OK|failed to send request: closed)\$"
 
 === TEST 20: cannot survive across request boundary (receive)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1191,7 +1191,7 @@ 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -1260,7 +1260,7 @@ received: OK|failed to close: closed)$/
 
 === TEST 22: cannot survive across request boundary (connect)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location /t {
@@ -2611,7 +2611,7 @@ close: 1 nil
             local ready = false
             local fatal = false
 
-            local function f()
+            function f()
                 local line, err, part = sock:receive()
                 if not line then
                     ngx.say("failed to receive the 1st line: ", err, " [", part, "]")
@@ -2672,7 +2672,7 @@ lua clean up the timer for pending ngx.sleep
 
 === TEST 44: bad request tries to connect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2726,7 +2726,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):7: bad request/
 
 === TEST 45: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2783,7 +2783,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 46: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2840,7 +2840,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 47: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2897,7 +2897,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 48: bad request tries to set keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -2954,7 +2954,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 49: bad request tries to receiveuntil
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -3315,7 +3315,7 @@ close: 1 nil
 
             local thr = ngx.thread.spawn(function ()
                 sock = ngx.socket.tcp()
-                local ok, err = sock:connect("127.0.0.2", 12345)
+                local ok, err = sock:connect("agentzh.org", 12345)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -3464,7 +3464,7 @@ lua http cleanup reuse
                 ngx.say("failed to create timer: ", err)
             end
 
-            local i = 1
+            i = 1
             while not done do
                 local time = 0.005 * i
                 if time > 0.1 then
@@ -3545,7 +3545,7 @@ lua http cleanup reuse
                 ngx.say("failed to create timer: ", err)
             end
 
-            local i = 1
+            i = 1
             while not done do
                 local time = 0.005 * i
                 if time > 0.1 then
@@ -3720,10 +3720,10 @@ sudo iptables -I OUTPUT 1 -p udp --dport 10086 -j REJECT
     }
 --- request
 GET /t
---- response_body_like
-failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
-failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
-failed to connect: www.google.com could not be resolved(?: \(\d+: Operation timed out\))?
+--- response_body
+failed to connect: www.google.com could not be resolved
+failed to connect: www.google.com could not be resolved
+failed to connect: www.google.com could not be resolved
 hello!
 --- error_log eval
 qr{\[alert\] .*? send\(\) failed \(\d+: Operation not permitted\) while resolving}
@@ -3808,315 +3808,3 @@ received:
 received: truefalsenil
 --- no_error_log
 [error]
-
-
-
-=== TEST 64: receiveany method in cosocket
---- config
-    server_tokens off;
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-            local req = {
-                'GET /foo HTTP/1.0\r\n',
-                'Host: localhost\r\n',
-                'Connection: close\r\n\r\n',
-            }
-            local ok, err = sock:send(req)
-            if not ok then
-                ngx.say("send request failed: ", err)
-                return
-            end
-
-            -- skip http header
-            while true do
-                local data, err, _ = sock:receive('*l')
-                if err then
-                    ngx.say('unexpected error occurs when receiving http head: ', err)
-                    return
-                end
-
-                if #data == 0 then -- read last line of head
-                    break
-                end
-            end
-
-            -- receive http body
-            while true do
-                local data, err = sock:receiveany(1024)
-                if err then
-                    if err ~= 'closed' then
-                        ngx.say('unexpected err: ', err)
-                    end
-                    break
-                end
-                ngx.say(data)
-            end
-
-            sock:close()
-        }
-    }
-
-    location = /foo {
-        content_by_lua_block {
-            local resp = {
-                '1',
-                '22',
-                'hello world',
-            }
-
-            local length = 0
-            for _, v in ipairs(resp) do
-                length = length + #v
-            end
-
-            -- flush http header
-            ngx.header['Content-Length'] = length
-            ngx.flush(true)
-            ngx.sleep(0.01)
-
-            -- send http body
-            for _, v in ipairs(resp) do
-                ngx.print(v)
-                ngx.flush(true)
-                ngx.sleep(0.01)
-            end
-        }
-    }
-
---- request
-GET /t
---- response_body
-1
-22
-hello world
---- no_error_log
-[error]
---- error_log
-lua tcp socket read any
-
-
-
-=== TEST 65: receiveany send data after read side closed
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", 7658))
-
-            while true do
-                local data, err = sock:receiveany(1024)
-                if err then
-                    if err ~= 'closed' then
-                        ngx.say('unexpected err: ', err)
-                        break
-                    end
-
-                    local data = "send data after read side closed"
-                    local bytes, err = sock:send(data)
-                    if not bytes then
-                        ngx.say(err)
-                    end
-
-                    break
-                end
-                ngx.say(data)
-            end
-
-            sock:close()
-        }
-    }
-
---- request
-GET /t
---- tcp_listen: 7658
---- tcp_shutdown: 1
---- tcp_query eval: "send data after read side closed"
---- tcp_query_len: 32
---- response_body
---- no_error_log
-[error]
-
-
-
-=== TEST 66: receiveany with limited, max <= 0
---- config
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-
-            local function receiveany_say_err(...)
-                local ok, err = pcall(sock.receiveany, sock, ...)
-                if not ok then
-                    ngx.say(err)
-                end
-            end
-
-
-            receiveany_say_err(0)
-            receiveany_say_err(-1)
-            receiveany_say_err()
-            receiveany_say_err(nil)
-        }
-    }
-
---- response_body
-bad argument #2 to '?' (bad max argument)
-bad argument #2 to '?' (bad max argument)
-expecting 2 arguments (including the object), but got 1
-bad argument #2 to '?' (bad max argument)
---- request
-GET /t
---- no_error_log
-[error]
-
-
-
-=== TEST 67: receiveany with limited, max is larger than data
---- config
-    server_tokens off;
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-            local req = {
-                'GET /foo HTTP/1.0\r\n',
-                'Host: localhost\r\n',
-                'Connection: close\r\n\r\n',
-            }
-            local ok, err = sock:send(req)
-            if not ok then
-                ngx.say("send request failed: ", err)
-                return
-            end
-
-            while true do
-                local data, err, _ = sock:receive('*l')
-                if err then
-                    ngx.say('unexpected error occurs when receiving http head: ', err)
-                    return
-                end
-
-                if #data == 0 then -- read last line of head
-                    break
-                end
-            end
-
-            local data, err = sock:receiveany(128)
-            if err then
-                if err ~= 'closed' then
-                    ngx.say('unexpected err: ', err)
-                end
-            else
-                ngx.say(data)
-            end
-
-            sock:close()
-        }
-    }
-
-    location = /foo {
-        content_by_lua_block {
-            local resp = 'hello world'
-            local length = #resp
-
-            ngx.header['Content-Length'] = length
-            ngx.flush(true)
-            ngx.sleep(0.01)
-
-            ngx.print(resp)
-        }
-    }
-
---- request
-GET /t
---- response_body
-hello world
---- no_error_log
-[error]
---- error_log
-lua tcp socket calling receiveany() method to read at most 128 bytes
-
-
-
-=== TEST 68: receiveany with limited, max is smaller than data
---- config
-    server_tokens off;
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-            local req = {
-                'GET /foo HTTP/1.0\r\n',
-                'Host: localhost\r\n',
-                'Connection: close\r\n\r\n',
-            }
-            local ok, err = sock:send(req)
-            if not ok then
-                ngx.say("send request failed: ", err)
-                return
-            end
-
-            while true do
-                local data, err, _ = sock:receive('*l')
-                if err then
-                    ngx.say('unexpected error occurs when receiving http head: ', err)
-                    return
-                end
-
-                if #data == 0 then -- read last line of head
-                    break
-                end
-            end
-
-            while true do
-                local data, err = sock:receiveany(7)
-                if err then
-                    if err ~= 'closed' then
-                        ngx.say('unexpected err: ', err)
-                    end
-                    break
-
-                else
-                    ngx.say(data)
-                end
-            end
-
-            sock:close()
-        }
-    }
-
-    location = /foo {
-        content_by_lua_block {
-            local resp = 'hello world'
-            local length = #resp
-
-            ngx.header['Content-Length'] = length
-            ngx.flush(true)
-            ngx.sleep(0.01)
-
-            ngx.print(resp)
-        }
-    }
-
---- request
-GET /t
---- response_body
-hello w
-orld
---- no_error_log
-[error]
---- error_log
-lua tcp socket calling receiveany() method to read at most 7 bytes
diff --git a/debian/modules/http-lua/t/062-count.t b/debian/modules/http-lua/t/062-count.t
index 9b0afe8..2ad2f9f 100644
--- a/debian/modules/http-lua/t/062-count.t
+++ b/debian/modules/http-lua/t/062-count.t
@@ -283,7 +283,7 @@ n = 5
 --- request
 GET /test
 --- response_body
-n = 22
+n = 18
 --- no_error_log
 [error]
 
@@ -444,28 +444,7 @@ worker: 4
 
 
 
-=== TEST 20: entries under the metatable of tcp sockets
---- config
-        location = /test {
-            content_by_lua_block {
-                local n = 0
-                local sock = ngx.socket.tcp()
-                for k, v in pairs(getmetatable(sock)) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            }
-        }
---- request
-GET /test
---- response_body
-n = 13
---- no_error_log
-[error]
-
-
-
-=== TEST 21: entries under the metatable of udp sockets
+=== TEST 20: entries under the metatable of udp sockets
 --- config
         location = /test {
             content_by_lua '
@@ -486,7 +465,7 @@ n = 6
 
 
 
-=== TEST 22: entries under the metatable of req raw sockets
+=== TEST 21: entries under the metatable of req raw sockets
 --- config
         location = /test {
             content_by_lua '
@@ -518,7 +497,7 @@ n = 6
 
 
 
-=== TEST 23: entries under the req raw sockets
+=== TEST 22: entries under the req raw sockets
 --- config
         location = /test {
             content_by_lua_block {
@@ -557,7 +536,7 @@ nrec = 3
 
 
 
-=== TEST 24: entries under the req sockets
+=== TEST 23: entries under the req sockets
 --- config
         location = /test {
             content_by_lua_block {
diff --git a/debian/modules/http-lua/t/063-abort.t b/debian/modules/http-lua/t/063-abort.t
index 7c90eaa..411a07e 100644
--- a/debian/modules/http-lua/t/063-abort.t
+++ b/debian/modules/http-lua/t/063-abort.t
@@ -22,7 +22,7 @@ __DATA__
 
 === TEST 1: ngx.exit(400) should abort print
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /memc_query {
             internal;
@@ -68,7 +68,7 @@ GET /test?a
 
 === TEST 2: ngx.exit(400) should abort ngx.log
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /memc_query {
             internal;
@@ -116,7 +116,7 @@ GET /test?a
 
 === TEST 3: ngx.exit(400) should abort ngx.location.capture
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /memc_query {
             internal;
@@ -161,7 +161,7 @@ the "$memc_key" variable is not set
 
 === TEST 4: ngx.exit(400) should abort ngx.location.capture_multi
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /memc_query {
             internal;
@@ -206,7 +206,7 @@ the "$memc_key" variable is not set
 
 === TEST 5: ngx.exit(400) should abort ngx.redirect
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -233,7 +233,7 @@ lua redirect to "/blah" with code 302
 
 === TEST 6: ngx.exit(400) should abort ngx.exit
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -260,7 +260,7 @@ lua exit with code 503
 
 === TEST 7: ngx.exit(400) should abort ngx.exec
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -287,7 +287,7 @@ lua exec "/blah?"
 
 === TEST 8: ngx.exit(400) should abort ngx.send_headers
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -314,7 +314,7 @@ lua send headers
 
 === TEST 9: ngx.exit(400) should abort ngx.print
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -341,7 +341,7 @@ lua print response
 
 === TEST 10: ngx.exit(400) should abort ngx.say
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -368,7 +368,7 @@ lua say response
 
 === TEST 11: ngx.exit(400) should abort ngx.flush
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -395,7 +395,7 @@ lua flush asynchronously
 
 === TEST 12: ngx.exit(400) should abort ngx.eof
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -422,7 +422,7 @@ lua send eof
 
 === TEST 13: ngx.exit(400) should abort ngx.re.match
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -449,7 +449,7 @@ lua compiling match regex "a" with options "jo"
 
 === TEST 14: ngx.exit(400) should abort ngx.re.gmatch
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -476,7 +476,7 @@ lua compiling gmatch regex "a" with options "jo"
 
 === TEST 15: ngx.exit(400) should abort ngx.re.sub
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -503,7 +503,7 @@ lua compiling sub regex "a" with options "jo"
 
 === TEST 16: ngx.exit(400) should abort ngx.re.gsub
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -530,7 +530,7 @@ lua compiling gsub regex "a" with options "jo"
 
 === TEST 17: ngx.exit(400) should abort ngx.shared.DICT (set)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -560,7 +560,7 @@ foo = 56
 
 === TEST 18: ngx.exit(400) should abort ngx.shared.DICT (replace)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -590,7 +590,7 @@ foo = 56
 
 === TEST 19: ngx.exit(400) should abort ngx.shared.DICT (incr)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -620,7 +620,7 @@ foo = 88
 
 === TEST 20: ngx.exit(400) should abort ngx.shared.DICT (get)
 --- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -649,7 +649,7 @@ fetching key "foo" in shared dict "dogs"
 
 === TEST 21: ngx.exit(400) should skip os.execute
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -679,7 +679,7 @@ GET /test
 
 === TEST 22: ngx.exit(400) should break pcall and skip os.execute
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -709,7 +709,7 @@ fetching key "foo" in shared dict "dogs"
 
 === TEST 23: ngx.exit(400) should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -739,7 +739,7 @@ GET /test
 
 === TEST 24: ngx.redirect() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -769,7 +769,7 @@ GET /test
 
 === TEST 25: ngx.redirect() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -799,7 +799,7 @@ GET /test
 
 === TEST 26: ngx.exec() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -832,7 +832,7 @@ foo
 
 === TEST 27: ngx.exec() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -865,7 +865,7 @@ foo
 
 === TEST 28: ngx.set_uri(uri, true) should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             rewrite_by_lua '
@@ -921,7 +921,7 @@ hello world
 
 === TEST 30: ngx.exit(400) should break xpcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -955,7 +955,7 @@ GET /test
 
 === TEST 31: ngx.exec() should skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
@@ -988,7 +988,7 @@ foo
 
 === TEST 32: ngx.exec() should break pcall and skip os.execute (all in user module)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
diff --git a/debian/modules/http-lua/t/064-pcall.t b/debian/modules/http-lua/t/064-pcall.t
index 9af2de7..3011f3e 100644
--- a/debian/modules/http-lua/t/064-pcall.t
+++ b/debian/modules/http-lua/t/064-pcall.t
@@ -22,11 +22,11 @@ __DATA__
 
 === TEST 1: pcall works
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
-                local function f(a, b)
+                function f(a, b)
                     if a == 0 and b == 0 then
                         error("zero error")
                     end
@@ -58,11 +58,11 @@ $/s
 
 === TEST 2: xpcall works
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
         location = /test {
             content_by_lua '
-                local function f(a, b)
+                function f(a, b)
                     if a == 0 and b == 0 then
                         error("zero error")
                     end
@@ -70,15 +70,15 @@ $/s
                     return 23, "hello", true
                 end
 
-                local function g()
+                function g()
                     return f(0, 0)
                 end
 
-                local function h()
+                function h()
                     return f(0)
                 end
 
-                local function err(...)
+                function err(...)
                     ngx.say("error handler called: ", ...)
                     return "this is the new err"
                 end
diff --git a/debian/modules/http-lua/t/065-tcp-socket-timeout.t b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
index 092094a..78b8cff 100644
--- a/debian/modules/http-lua/t/065-tcp-socket-timeout.t
+++ b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
@@ -51,7 +51,7 @@ __DATA__
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -66,7 +66,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -81,7 +81,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(150)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -96,7 +96,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 150
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -110,7 +110,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(nil)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -125,7 +125,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 
 
 
@@ -139,7 +139,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(0)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -154,7 +154,7 @@ GET /t
 failed to connect: timeout
 --- error_log
 lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -168,7 +168,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         content_by_lua '
             local sock = ngx.socket.tcp()
             sock:settimeout(-1)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -584,7 +584,7 @@ bad timeout value
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -683,7 +683,7 @@ after
     location /t {
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             if not ok then
                 ngx.say("1: failed to connect: ", err)
 
@@ -707,7 +707,7 @@ GET /t
 2: connected: 1
 --- error_log
 lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
diff --git a/debian/modules/http-lua/t/066-socket-receiveuntil.t b/debian/modules/http-lua/t/066-socket-receiveuntil.t
index 89d2abf..ffe74aa 100644
--- a/debian/modules/http-lua/t/066-socket-receiveuntil.t
+++ b/debian/modules/http-lua/t/066-socket-receiveuntil.t
@@ -245,7 +245,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -316,7 +316,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -387,7 +387,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaa")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -458,7 +458,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -530,7 +530,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -602,7 +602,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aaaaad")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -673,7 +673,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -744,7 +744,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -815,7 +815,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -886,7 +886,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -957,7 +957,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -1028,7 +1028,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1105,7 +1105,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1182,7 +1182,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc")
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -1270,7 +1270,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd")
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
diff --git a/debian/modules/http-lua/t/067-req-socket.t b/debian/modules/http-lua/t/067-req-socket.t
index 6593360..229d5cc 100644
--- a/debian/modules/http-lua/t/067-req-socket.t
+++ b/debian/modules/http-lua/t/067-req-socket.t
@@ -320,7 +320,7 @@ found the end of the stream
 
 === TEST 4: attempt to use the req socket across request boundary
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         content_by_lua '
@@ -369,7 +369,7 @@ hello world
 === 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         content_by_lua '
@@ -431,7 +431,7 @@ done
 
 === TEST 6: pipelined POST requests
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         content_by_lua '
diff --git a/debian/modules/http-lua/t/068-socket-keepalive.t b/debian/modules/http-lua/t/068-socket-keepalive.t
index e4c6988..f052e9a 100644
--- a/debian/modules/http-lua/t/068-socket-keepalive.t
+++ b/debian/modules/http-lua/t/068-socket-keepalive.t
@@ -4,14 +4,13 @@ use Test::Nginx::Socket::Lua;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 31);
+plan tests => repeat_each() * (blocks() * 5 + 9);
 
 our $HtmlDir = html_dir;
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
 $ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
 
 $ENV{LUA_PATH} ||=
     '/usr/local/openresty-debug/lualib/?.lua;/usr/local/openresty/lualib/?.lua;;';
@@ -30,7 +29,7 @@ __DATA__
 
 === TEST 1: sanity
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -98,7 +97,7 @@ lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGI
 
 === TEST 2: free up the whole connection pool if no active connections
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -169,7 +168,7 @@ received: OK
 
 === TEST 3: upstream sockets close prematurely
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
    server_tokens off;
    keepalive_timeout 100ms;
@@ -244,7 +243,7 @@ done
 
 === TEST 4: http keepalive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
    server_tokens off;
    location /t {
@@ -702,35 +701,7 @@ qr/lua tcp socket connection pool size: 25\b/]
 
 
 
-=== TEST 10: setkeepalive() 'pool_size' should be greater than zero
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-        content_by_lua_block {
-            local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
-            if not sock then
-                ngx.say(err)
-                return
-            end
-
-            local ok, err = pcall(sock.setkeepalive, sock, 0, 0)
-            if not ok then
-                ngx.say(err)
-                return
-            end
-            ngx.say(ok)
-        }
-    }
---- request
-GET /t
---- response_body
-bad argument #3 to '?' (bad "pool_size" option value: 0)
---- no_error_log
-[error]
-
-
-
-=== TEST 11: sock:keepalive_timeout(0) means unlimited
+=== TEST 10: sock:keepalive_timeout(0) means unlimited
 --- config
    server_tokens off;
    location /t {
@@ -805,10 +776,10 @@ qr/lua tcp socket connection pool size: 30\b/]
 
 
 
-=== TEST 12: sanity (uds)
+=== TEST 11: sanity (uds)
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -887,7 +858,7 @@ received response of 119 bytes
 
 
 
-=== TEST 13: github issue #108: ngx.locaiton.capture + redis.set_keepalive
+=== TEST 12: github issue #108: ngx.locaiton.capture + redis.set_keepalive
 --- http_config eval
     qq{
         lua_package_path "$::HtmlDir/?.lua;;";
@@ -934,9 +905,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 14: github issue #110: ngx.exit with HTTP_NOT_FOUND causes worker process to exit
+=== 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;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     error_page 404 /404.html;
     location /t {
@@ -993,9 +964,9 @@ Not found, dear...
 
 
 
-=== TEST 15: custom pools (different pool for the same host:port) - tcp
+=== TEST 14: custom pools (different pool for the same host:port) - tcp
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1041,9 +1012,9 @@ lua tcp socket keepalive create connection pool for key "B"
 
 
 
-=== TEST 16: custom pools (same pool for different host:port) - tcp
+=== TEST 15: custom pools (same pool for different host:port) - tcp
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1088,10 +1059,10 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 17: custom pools (different pool for the same host:port) - unix
+=== TEST 16: custom pools (different pool for the same host:port) - unix
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -1148,10 +1119,10 @@ lua tcp socket keepalive create connection pool for key "B"
 
 
 
-=== TEST 18: custom pools (same pool for the same path) - unix
+=== TEST 17: custom pools (same pool for the same path) - unix
 --- http_config eval
 "
-    lua_package_path '$::HtmlDir/?.lua;./?.lua;;';
+    lua_package_path '$::HtmlDir/?.lua;./?.lua';
     server {
         listen unix:$::HtmlDir/nginx.sock;
         default_type 'text/plain';
@@ -1203,9 +1174,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 19: numeric pool option value
+=== TEST 18: numeric pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1250,9 +1221,9 @@ lua tcp socket get keepalive peer: using connection
 
 
 
-=== TEST 20: nil pool option value
+=== TEST 19: nil pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1293,9 +1264,9 @@ connected: 1, reused: 0
 
 
 
-=== TEST 21: (bad) table pool option value
+=== TEST 20: (bad) table pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1334,9 +1305,9 @@ bad argument #3 to 'connect' (bad "pool" option type: table)
 
 
 
-=== TEST 22: (bad) boolean pool option value
+=== TEST 21: (bad) boolean pool option value
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -1375,7 +1346,7 @@ bad argument #3 to 'connect' (bad "pool" option type: boolean)
 
 
 
-=== TEST 23: clear the redis store
+=== TEST 22: clear the redis store
 --- config
     location /t {
         redis2_query flushall;
@@ -1392,9 +1363,9 @@ bad argument #3 to 'connect' (bad "pool" option type: boolean)
 
 
 
-=== TEST 24: bug in send(): clear the chain writer ctx
+=== TEST 23: bug in send(): clear the chain writer ctx
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     location /t {
         set $port $TEST_NGINX_REDIS_PORT;
@@ -1507,7 +1478,7 @@ done
 
 
 
-=== TEST 25: setkeepalive() with explicit nil args
+=== TEST 24: setkeepalive() with explicit nil args
 --- config
    server_tokens off;
    location /t {
@@ -1580,1379 +1551,3 @@ done
 "lua tcp socket keepalive timeout: 100 ms",
 qr/lua tcp socket connection pool size: 30\b/]
 --- timeout: 4
-
-
-
-=== TEST 26: conn queuing: connect() verifies the options for connection pool
---- config
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local function check_opts_for_connect(opts)
-                local ok, err = pcall(function()
-                    sock:connect("127.0.0.1", ngx.var.port, opts)
-                end)
-                if not ok then
-                    ngx.say(err)
-                else
-                    ngx.say("ok")
-                end
-            end
-
-            check_opts_for_connect({pool_size = 'a'})
-            check_opts_for_connect({pool_size = 0})
-            check_opts_for_connect({backlog = -1})
-            check_opts_for_connect({backlog = 0})
-        }
-    }
---- request
-GET /t
---- response_body_like
-.+ 'connect' \(bad "pool_size" option type: string\)
-.+ 'connect' \(bad "pool_size" option value: 0\)
-.+ 'connect' \(bad "backlog" option value: -1\)
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 27: conn queuing: connect() can specify 'pool_size' which overrides setkeepalive()
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local function go()
-                local sock = ngx.socket.tcp()
-                local ok, err = sock:connect("127.0.0.1", port, {pool_size = 1})
-                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(0, 20)
-                if not ok then
-                    ngx.say("failed to set reusable: ", err)
-                end
-            end
-
-            -- reuse ok
-            go()
-            go()
-
-            local sock1 = ngx.socket.connect("127.0.0.1", port)
-            local sock2 = ngx.socket.connect("127.0.0.1", port)
-            local ok, err = sock1:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-            local ok, err = sock2:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-
-            -- the pool_size is 1 instead of 20
-            sock1 = ngx.socket.connect("127.0.0.1", port)
-            sock2 = ngx.socket.connect("127.0.0.1", port)
-            ngx.say("reused: ", sock1:getreusedtimes())
-            ngx.say("reused: ", sock2:getreusedtimes())
-            sock1:setkeepalive(0, 20)
-            sock2:setkeepalive(0, 20)
-        }
-    }
---- request
-GET /t
---- response_body
-connected: 1, reused: 0
-request sent: 11
-received: OK
-connected: 1, reused: 1
-request sent: 11
-received: OK
-reused: 1
-reused: 0
---- no_error_log eval
-["[error]",
-"lua tcp socket keepalive: free connection pool for ",
-"lua tcp socket connection pool size: 20"]
---- error_log eval
-[qq{lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"},
-"lua tcp socket connection pool size: 1",
-]
-
-
-
-=== TEST 28: conn queuing: connect() can specify 'pool_size' for unix domain socket
---- http_config eval
-"
-    server {
-        listen unix:$::HtmlDir/nginx.sock;
-    }
-"
---- config
-    location /t {
-        content_by_lua_block {
-            local path = "unix:" .. "$TEST_NGINX_HTML_DIR/nginx.sock";
-            local function go()
-                local sock = ngx.socket.tcp()
-                local ok, err = sock:connect(path, {pool_size = 1})
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-                local ok, err = sock:setkeepalive(0, 20)
-                if not ok then
-                    ngx.say("failed to set reusable: ", err)
-                end
-            end
-
-            go()
-            go()
-
-            local sock1 = ngx.socket.connect(path)
-            local sock2 = ngx.socket.connect(path)
-            local ok, err = sock1:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-            local ok, err = sock2:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-
-            -- the pool_size is 1 instead of 20
-            sock1 = ngx.socket.connect(path)
-            sock2 = ngx.socket.connect(path)
-            ngx.say("reused: ", sock1:getreusedtimes())
-            ngx.say("reused: ", sock2:getreusedtimes())
-            sock1:setkeepalive(0, 20)
-            sock2:setkeepalive(0, 20)
-        }
-    }
---- request
-GET /t
---- response_body
-connected: 1, reused: 0
-connected: 1, reused: 1
-reused: 1
-reused: 0
---- no_error_log eval
-["[error]",
-"lua tcp socket keepalive: free connection pool for ",
-"lua tcp socket connection pool size: 20"]
---- error_log eval
-["lua tcp socket get keepalive peer: using connection",
-'lua tcp socket keepalive create connection pool for key "unix:',
-"lua tcp socket connection pool size: 1",
-]
-
-
-
-=== TEST 29: conn queuing: connect() can specify 'pool_size' for custom pool
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local function go(pool)
-                local sock = ngx.socket.tcp()
-                local ok, err = sock:connect("127.0.0.1", port, {pool = pool, pool_size = 1})
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", pool, ", reused: ", sock:getreusedtimes())
-
-                local ok, err = sock:setkeepalive(0, 20)
-                if not ok then
-                    ngx.say("failed to set reusable: ", err)
-                end
-            end
-
-            go('A')
-            go('B')
-            go('A')
-            go('B')
-
-            local sock1 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
-            local sock2 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
-            local ok, err = sock1:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-            local ok, err = sock2:setkeepalive(0, 20)
-            if not ok then
-                ngx.say(err)
-            end
-
-            -- the pool_size is 1 instead of 20
-            sock1 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
-            sock2 = ngx.socket.connect("127.0.0.1", port, {pool = 'A'})
-            ngx.say("reused: ", sock1:getreusedtimes())
-            ngx.say("reused: ", sock2:getreusedtimes())
-            sock1:setkeepalive(0, 20)
-            sock2:setkeepalive(0, 20)
-        }
-    }
---- request
-GET /t
---- response_body
-connected: A, reused: 0
-connected: B, reused: 0
-connected: A, reused: 1
-connected: B, reused: 1
-reused: 1
-reused: 0
---- no_error_log eval
-["[error]",
-"lua tcp socket keepalive: free connection pool for ",
-"lua tcp socket connection pool size: 20"]
---- error_log eval
-[qq{lua tcp socket keepalive create connection pool for key "A"},
-qq{lua tcp socket keepalive create connection pool for key "B"},
-"lua tcp socket connection pool size: 1",
-]
-
-
-
-=== TEST 30: conn queuing: connect() uses lua_socket_pool_size as default if 'backlog' is given
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-        lua_socket_pool_size 1234;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {backlog = 0}
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.say(err)
-            else
-                ngx.say("ok")
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- error_log
-lua tcp socket connection pool size: 1234
---- no_error_log
-[error]
-
-
-
-=== TEST 31: conn queuing: more connect operations than 'backlog' size
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 2, backlog = 0}
-            local sock = ngx.socket.connect("127.0.0.1", port, opts)
-            local not_reused_socket, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not not_reused_socket then
-                ngx.say(err)
-                return
-            end
-            -- burst
-            local ok, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.say(err)
-                return
-            end
-
-            ok, err = sock:connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-            ngx.say("reused: ", sock:getreusedtimes())
-            -- both queue and pool is full
-            ok, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
-reused: 1
-too many waiting connect operations
---- no_error_log
-[error]
-
-
-
-=== TEST 32: conn queuing: once 'pool_size' is reached and pool has 'backlog'
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 2, backlog = 2}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            ngx.timer.at(0, function(premature)
-                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock2 then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                ngx.log(ngx.WARN, "start to handle timer")
-                ngx.sleep(0.1)
-                sock2:close()
-                -- resume connect operation
-                ngx.log(ngx.WARN, "continue to handle timer")
-            end)
-
-            ngx.sleep(0.05)
-            ngx.log(ngx.WARN, "start to handle cosocket")
-            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock3 then
-                ngx.say(err)
-                return
-            end
-            ngx.log(ngx.WARN, "continue to handle cosocket")
-
-            local req = "flush_all\r\n"
-            local bytes, err = sock3:send(req)
-            if not bytes then
-                ngx.say("failed to send request: ", err)
-                return
-            end
-            ngx.say("request sent: ", bytes)
-
-            local line, err, part = sock3:receive()
-            if line then
-                ngx.say("received: ", line)
-            else
-                ngx.say("failed to receive a line: ", err, " [", part, "]")
-            end
-
-            local ok, err = sock3:setkeepalive()
-            if not ok then
-                ngx.say("failed to set reusable: ", err)
-            end
-            ngx.say("setkeepalive: OK")
-        }
-    }
---- request
-GET /t
---- response_body
-request sent: 11
-received: OK
-setkeepalive: OK
---- no_error_log
-[error]
---- error_log
-lua tcp socket queue connect operation for connection pool "127.0.0.1
---- grep_error_log eval: qr/(start|continue) to handle \w+/
---- grep_error_log_out
-start to handle timer
-start to handle cosocket
-continue to handle timer
-continue to handle cosocket
-
-
-
-=== TEST 33: conn queuing: do not count failed connect operations
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 0}
-
-            local sock = ngx.socket.tcp()
-            sock:settimeouts(100, 3000, 3000)
-            local ok, err = sock:connect("127.0.0.2", 12345, opts)
-            if not ok then
-                ngx.say(err)
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.say(err)
-            end
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- error_log
-lua tcp socket connect timed out, when connecting to
---- response_body
-timeout
-ok
-
-
-
-=== TEST 34: conn queuing: connect until backlog is reached
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 1}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            ngx.timer.at(0.01, function(premature)
-                ngx.log(ngx.WARN, "start to handle timer")
-                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock2 then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                ngx.sleep(0.02)
-                local ok, err = sock2:close()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-                ngx.log(ngx.WARN, "continue to handle timer")
-            end)
-
-            ngx.sleep(0.02)
-            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock3 then
-                ngx.say(err)
-            end
-            local ok, err = sock1:setkeepalive()
-            if not ok then
-                ngx.say(err)
-                return
-            end
-            ngx.sleep(0.01) -- run sock2
-
-            ngx.log(ngx.WARN, "start to handle cosocket")
-            local sock3, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock3 then
-                ngx.say(err)
-                return
-            end
-            ngx.log(ngx.WARN, "continue to handle cosocket")
-
-            local ok, err = sock3:setkeepalive()
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
---- no_error_log
-[error]
---- error_log
-lua tcp socket queue connect operation for connection pool "127.0.0.1
---- grep_error_log eval: qr/queue connect operation for connection pool|(start|continue) to handle \w+/
---- grep_error_log_out
-start to handle timer
-queue connect operation for connection pool
-start to handle cosocket
-queue connect operation for connection pool
-continue to handle timer
-continue to handle cosocket
-
-
-
-=== TEST 35: conn queuing: memory reuse for host in queueing connect operation ctx
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 3}
-            local sock = ngx.socket.connect("127.0.0.1", port, opts)
-
-            ngx.timer.at(0.01, function(premature)
-                local sock, err = ngx.socket.connect("0.0.0.0", port, opts)
-                if not sock then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                local ok, err = sock:close()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-            end)
-
-            ngx.timer.at(0.015, function(premature)
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                local ok, err = sock:close()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-            end)
-
-            ngx.timer.at(0.02, function(premature)
-                local sock, err = ngx.socket.connect("0.0.0.0", port, opts)
-                if not sock then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                local ok, err = sock:close()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-            end)
-
-            ngx.sleep(0.03)
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.say(err)
-                return
-            end
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 36: conn queuing: connect() returns error after connect operation resumed
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-            local sock = ngx.socket.connect("127.0.0.1", port, opts)
-
-            ngx.timer.at(0, function(premature)
-                local sock, err = ngx.socket.connect("", port, opts)
-                if not sock then
-                    ngx.log(ngx.WARN, err)
-                end
-            end)
-
-            ngx.sleep(0.01)
-            -- use 'close' to force parsing host instead of reusing conn
-            local ok, err = sock:close()
-            if not ok then
-                ngx.say(err)
-                return
-            end
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- error_log
-failed to parse host name
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-
-
-
-=== TEST 37: conn queuing: in uthread
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 2}
-
-            local conn_sock = function()
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("start to handle uthread")
-
-                ngx.sleep(0.01)
-                sock:close()
-                ngx.say("continue to handle other uthread")
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock)
-            local co2 = ngx.thread.spawn(conn_sock)
-            local co3 = ngx.thread.spawn(conn_sock)
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.log(ngx.ERR, err)
-            end
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.thread.wait(co3)
-            ngx.say("all uthreads ok")
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
-start to handle uthread
-continue to handle other uthread
-start to handle uthread
-continue to handle other uthread
-all uthreads ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 38: conn queuing: in access_by_lua
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        access_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 2}
-
-            local conn_sock = function()
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("start to handle uthread")
-
-                ngx.sleep(0.01)
-                sock:close()
-                ngx.say("continue to handle other uthread")
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock)
-            local co2 = ngx.thread.spawn(conn_sock)
-            local co3 = ngx.thread.spawn(conn_sock)
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.log(ngx.ERR, err)
-            end
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.thread.wait(co3)
-            ngx.say("all uthreads ok")
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
-start to handle uthread
-continue to handle other uthread
-start to handle uthread
-continue to handle other uthread
-all uthreads ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 39: conn queuing: in rewrite_by_lua
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        rewrite_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 2}
-
-            local conn_sock = function()
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("start to handle uthread")
-
-                ngx.sleep(0.01)
-                sock:close()
-                ngx.say("continue to handle other uthread")
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock)
-            local co2 = ngx.thread.spawn(conn_sock)
-            local co3 = ngx.thread.spawn(conn_sock)
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.log(ngx.ERR, err)
-            end
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.thread.wait(co3)
-            ngx.say("all uthreads ok")
-        }
-    }
---- request
-GET /t
---- response_body
-too many waiting connect operations
-start to handle uthread
-continue to handle other uthread
-start to handle uthread
-continue to handle other uthread
-all uthreads ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 40: conn queuing: in subrequest
---- config
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /t {
-        content_by_lua_block {
-            local port = ngx.var.port
-            ngx.timer.at(0, function()
-                local opts = {pool_size = 1, backlog = 2}
-                local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-                if not sock then
-                    ngx.log(ngx.ERR, err)
-                    return
-                end
-
-                ngx.sleep(0.1)
-                local ok, err = sock:setkeepalive()
-                if not ok then
-                    ngx.log(ngx.ERR, err)
-                end
-            end)
-
-            ngx.sleep(0.01)
-            local res1, res2, res3 = ngx.location.capture_multi{
-                {"/conn"}, {"/conn"}, {"/conn"}
-            }
-            ngx.say(res1.body)
-            ngx.say(res2.body)
-            ngx.say(res3.body)
-        }
-    }
-
-    location /conn {
-        content_by_lua_block {
-            local port = ngx.var.port
-            local sock, err = ngx.socket.connect("127.0.0.1", port)
-            if not sock then
-                ngx.print(err)
-                return
-            end
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.print(err)
-            else
-                ngx.print("ok")
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-ok
-ok
-too many waiting connect operations
---- no_error_log
-[error]
---- grep_error_log eval: qr/queue connect operation for connection pool/
---- grep_error_log_out
-queue connect operation for connection pool
-queue connect operation for connection pool
-
-
-
-=== TEST 41: conn queuing: timeouts when 'connect_timeout' is reached
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 1}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            local sock2 = ngx.socket.tcp()
-            sock2:settimeouts(10, 3000, 3000)
-            local ok, err = sock2:connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-timeout
---- error_log eval
-"lua tcp socket queued connect timed out, when trying to connect to 127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
-
-
-
-=== TEST 42: conn queuing: set timeout via lua_socket_connect_timeout
---- config
-    lua_socket_connect_timeout 10ms;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 1}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            local sock2 = ngx.socket.tcp()
-            local ok, err = sock2:connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-timeout
---- error_log eval
-"lua tcp socket queued connect timed out, when trying to connect to 127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
-
-
-
-=== TEST 43: conn queuing: client aborting while connect operation is queued
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool_size = 1, backlog = 1}
-            local sock1 = ngx.socket.connect("127.0.0.1", port, opts)
-
-            local sock2 = ngx.socket.tcp()
-            sock2:settimeouts(3000, 3000, 3000)
-            local ok, err = sock2:connect("127.0.0.1", port, opts)
-            if not ok then
-                ngx.say(err)
-            end
-        }
-    }
---- request
-GET /t
---- ignore_response
---- timeout: 0.1
---- abort
---- no_error_log
-[error]
-
-
-
-=== TEST 44: conn queuing: resume next connect operation if resumed connect failed immediately
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 2}
-
-            local conn_sock = function(should_timeout)
-                local sock = ngx.socket.tcp()
-                local ok, err
-                if should_timeout then
-                    ok, err = sock:connect("", port, opts)
-                else
-                    ok, err = sock:connect("127.0.0.1", port, opts)
-                end
-                if not ok then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("connected in uthread")
-                sock:close()
-            end
-
-            local sock, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock, true)
-            local co2 = ngx.thread.spawn(conn_sock)
-
-            local ok, err = sock:close()
-            if not ok then
-                ngx.log(ngx.ERR, err)
-            end
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-failed to parse host name "": no host
-connected in uthread
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 45: conn queuing: resume connect operation if resumed connect failed (timeout)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-
-            local conn_sock = function(should_timeout)
-                local sock = ngx.socket.tcp()
-                local ok, err
-                if should_timeout then
-                    sock:settimeouts(100, 3000, 3000)
-                    ok, err = sock:connect("127.0.0.2", 12345, opts)
-                else
-                    ok, err = sock:connect("127.0.0.1", port, opts)
-                end
-                if not ok then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("connected in uthread")
-                sock:close()
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock, true)
-            local co2 = ngx.thread.spawn(conn_sock)
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-timeout
-connected in uthread
-ok
---- error_log
-queue connect operation for connection pool "test"
-lua tcp socket connect timed out, when connecting to
-
-
-
-=== TEST 46: conn queuing: resume connect operation if resumed connect failed (could not be resolved)
---- config
-    resolver 127.0.0.2:12345 ipv6=off;
-    resolver_timeout 1s;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-
-            local conn_sock = function(should_timeout)
-                local sock = ngx.socket.tcp()
-                local ok, err
-                if should_timeout then
-                    sock:settimeouts(1, 3000, 3000)
-                    ok, err = sock:connect("agentzh.org", 80, opts)
-                else
-                    ok, err = sock:connect("127.0.0.1", port, opts)
-                end
-                if not ok then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("connected in uthread")
-                sock:close()
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock, true)
-            local co2 = ngx.thread.spawn(conn_sock)
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-agentzh.org could not be resolved (110: Operation timed out)
-connected in uthread
-ok
---- error_log
-queue connect operation for connection pool "test"
-
-
-
-=== TEST 47: conn queuing: resume connect operation if resumed connect failed (connection refused)
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local port = ngx.var.port
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-
-            local conn_sock = function(should_timeout)
-                local sock = ngx.socket.tcp()
-                local ok, err
-                if should_timeout then
-                    sock:settimeouts(100, 3000, 3000)
-                    ok, err = sock:connect("127.0.0.1", 62345, opts)
-                else
-                    ok, err = sock:connect("127.0.0.1", port, opts)
-                end
-                if not ok then
-                    ngx.say(err)
-                    return
-                end
-                ngx.say("connected in uthread")
-                sock:close()
-            end
-
-            local co1 = ngx.thread.spawn(conn_sock, true)
-            local co2 = ngx.thread.spawn(conn_sock)
-
-            ngx.thread.wait(co1)
-            ngx.thread.wait(co2)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-connection refused
-connected in uthread
-ok
---- error_log
-queue connect operation for connection pool "test"
-
-
-
-=== TEST 48: conn queuing: resume connect operation if resumed connect failed (uthread aborted while resolving)
---- http_config
-    lua_package_path '../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;';
---- config
-    resolver 127.0.0.1 ipv6=off;
-    resolver_timeout 100s;
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /sub {
-        content_by_lua_block {
-            local semaphore = require "ngx.semaphore"
-            local sem = semaphore.new()
-
-            local function f()
-                sem:wait(0.1)
-                ngx.exit(0)
-            end
-
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-            local port = ngx.var.port
-            ngx.timer.at(0, function()
-                sem:post()
-                local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
-                package.loaded.for_timer_to_resume:post()
-                if not sock2 then
-                    ngx.log(ngx.ALERT, "resume connect failed: ", err)
-                    return
-                end
-
-                ngx.log(ngx.INFO, "resume success")
-            end)
-
-            ngx.thread.spawn(f)
-            local sock1, err = ngx.socket.connect("openresty.org", 80, opts)
-            if not sock1 then
-                ngx.say(err)
-                return
-            end
-        }
-    }
-
-    location /t {
-        content_by_lua_block {
-            local semaphore = require "ngx.semaphore"
-            local for_timer_to_resume = semaphore.new()
-            package.loaded.for_timer_to_resume = for_timer_to_resume
-
-            ngx.location.capture("/sub")
-            for_timer_to_resume:wait(0.1)
-        }
-    }
---- request
-GET /t
---- no_error_log
-[alert]
---- error_log
-resume success
-
-
-
-=== TEST 49: conn queuing: resume connect operation if resumed connect failed (uthread killed while resolving)
---- config
-    resolver 127.0.0.1 ipv6=off;
-    resolver_timeout 100s;
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /t {
-        content_by_lua_block {
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-            local port = ngx.var.port
-
-            local function resolve()
-                local sock1, err = ngx.socket.connect("openresty.org", 80, opts)
-                if not sock1 then
-                    ngx.say(err)
-                    return
-                end
-            end
-
-            local th = ngx.thread.spawn(resolve)
-            local ok, err = ngx.thread.kill(th)
-            if not ok then
-                ngx.log(ngx.ALERT, "kill thread failed: ", err)
-                return
-            end
-
-            local sock2, err = ngx.socket.connect("127.0.0.1", port, opts)
-            if not sock2 then
-                ngx.log(ngx.ALERT, "resume connect failed: ", err)
-                return
-            end
-
-            ngx.log(ngx.INFO, "resume success")
-        }
-    }
---- request
-GET /t
---- no_error_log
-[alert]
---- error_log
-resume success
-
-
-
-=== TEST 50: conn queuing: increase the counter for connections created before creating the pool with setkeepalive()
---- config
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /t {
-        content_by_lua_block {
-            local function connect()
-                local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
-                if not sock then
-                    error("connect failed: " .. err)
-                end
-
-                return sock
-            end
-
-            local sock1 = connect()
-            local sock2 = connect()
-            assert(sock1:setkeepalive())
-            assert(sock2:setkeepalive())
-
-            local sock1 = connect()
-            local sock2 = connect()
-            assert(sock1:close())
-            assert(sock2:close())
-
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- no_error_log
-[error]
---- response_body
-ok
-
-
-
-=== TEST 51: conn queuing: only decrease the counter for connections which were counted by the pool
---- config
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /t {
-        content_by_lua_block {
-            local function connect()
-                local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port)
-                if not sock then
-                    error("connect failed: " .. err)
-                end
-
-                return sock
-            end
-
-            local sock1 = connect()
-            local sock2 = connect()
-            assert(sock1:setkeepalive(1000, 1))
-            assert(sock2:setkeepalive(1000, 1))
-
-            local sock1 = connect()
-            local sock2 = connect()
-            assert(sock1:close())
-            assert(sock2:close())
-
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- no_error_log
-[error]
---- response_body
-ok
-
-
-
-=== TEST 52: conn queuing: clean up pending connect operations which are in queue
---- config
-    set $port $TEST_NGINX_MEMCACHED_PORT;
-
-    location /sub {
-        content_by_lua_block {
-            local opts = {pool = "test", pool_size = 1, backlog = 1}
-            local sock, err = ngx.socket.connect("127.0.0.1", ngx.var.port, opts)
-            if not sock then
-                ngx.say("connect failed: " .. err)
-                return
-            end
-
-            local function f()
-                assert(ngx.socket.connect("127.0.0.1", ngx.var.port, opts))
-            end
-
-            local th = ngx.thread.spawn(f)
-            local ok, err = ngx.thread.kill(th)
-            if not ok then
-                ngx.log(ngx.ERR, "kill thread failed: ", err)
-                return
-            end
-
-            sock:close()
-        }
-    }
-
-    location /t {
-        content_by_lua_block {
-            ngx.location.capture("/sub")
-            -- let pending connect operation resumes first
-            ngx.sleep(0)
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- no_error_log
-[error]
---- error_log
-lua tcp socket abort queueing
---- response_body
-ok
diff --git a/debian/modules/http-lua/t/073-backtrace.t b/debian/modules/http-lua/t/073-backtrace.t
index 663c3af..6c54692 100644
--- a/debian/modules/http-lua/t/073-backtrace.t
+++ b/debian/modules/http-lua/t/073-backtrace.t
@@ -21,10 +21,10 @@ __DATA__
 --- config
     location /lua {
         content_by_lua
-        '   local function bar()
+        '   function bar()
                 return lua_concat(3)
             end
-            local function foo()
+            function foo()
                 bar()
             end
             foo()
@@ -37,7 +37,7 @@ GET /lua
 attempt to call global 'lua_concat'
 : in function 'bar'
 :5: in function 'foo'
-:7: in main chunk
+:7: in function
 
 
 
@@ -45,10 +45,10 @@ attempt to call global 'lua_concat'
 --- config
     location /lua {
         content_by_lua
-        '   local function bar()
+        '   function bar()
                 error(nil)
             end
-            local function foo()
+            function foo()
                 bar()
             end
             foo()
@@ -64,7 +64,7 @@ GET /lua
 " in function 'error'",
 ": in function 'bar'",
 ":5: in function 'foo'",
-qr/:7: in main chunk/,
+qr/:7: in function <content_by_lua\(nginx\.conf:\d+\):1>/,
 ]
 
 
@@ -125,7 +125,7 @@ probe process("$LIBLUA_PATH").function("lua_concat") {
 :63: in function 'func16'
 :67: in function 'func17'
 :71: in function 'func18'
-:74: in main chunk
+:74: in function
 
 
 
diff --git a/debian/modules/http-lua/t/075-logby.t b/debian/modules/http-lua/t/075-logby.t
index 8eece69..520c62e 100644
--- a/debian/modules/http-lua/t/075-logby.t
+++ b/debian/modules/http-lua/t/075-logby.t
@@ -220,7 +220,7 @@ failed to run log_by_lua*: unknown reason
 
 
 
-=== TEST 11: globals sharing
+=== TEST 11: globals get cleared for every single request
 --- config
     location /lua {
         echo ok;
@@ -228,7 +228,6 @@ failed to run log_by_lua*: unknown reason
             if not foo then
                 foo = 1
             else
-                ngx.log(ngx.INFO, "old foo: ", foo)
                 foo = foo + 1
             end
             ngx.log(ngx.WARN, "foo = ", foo)
@@ -238,9 +237,8 @@ failed to run log_by_lua*: unknown reason
 GET /lua
 --- response_body
 ok
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["", "old foo: 1\n"]
+--- error_log
+foo = 1
 
 
 
@@ -497,8 +495,7 @@ API disabled in the context of log_by_lua*
     location /t {
         echo ok;
         log_by_lua '
-            local bar
-            local function foo()
+            function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/081-bytecode.t b/debian/modules/http-lua/t/081-bytecode.t
index 92383bc..cb50e94 100644
--- a/debian/modules/http-lua/t/081-bytecode.t
+++ b/debian/modules/http-lua/t/081-bytecode.t
@@ -24,7 +24,7 @@ __DATA__
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             if jit then
                 if not string.find(jit.version, "LuaJIT 2.0") then
@@ -35,8 +35,7 @@ __DATA__
             else
                 f:write(string.sub(b, 1, 147));
             end
-            f:close();
-            local res = ngx.location.capture("/call");
+            f:close(); res = ngx.location.capture("/call");
             ngx.print(res.body)
         ';
     }
@@ -61,15 +60,14 @@ __DATA__
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            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();
-            local res = ngx.location.capture("/call");
+            f:close(); res = ngx.location.capture("/call");
             if res.status == 200 then
                 ngx.print(res.body)
             else
@@ -87,7 +85,7 @@ __DATA__
 --- response_body
 error
 --- error_log eval
-qr/failed to load external Lua file ".*?test\.lua": .* cannot load incompatible bytecode/
+qr/failed to load external Lua file ".*?test\.lua": bad byte-code header/
 
 
 
@@ -98,15 +96,14 @@ qr/failed to load external Lua file ".*?test\.lua": .* cannot load incompatible
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            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();
-            local res = ngx.location.capture("/call");
+            f:close(); res = ngx.location.capture("/call");
             if res.status == 200 then
                 ngx.print(res.body)
             else
@@ -124,7 +121,7 @@ qr/failed to load external Lua file ".*?test\.lua": .* cannot load incompatible
 --- response_body
 error
 --- error_log
-cannot load incompatible bytecode
+bytecode format version unsupported
 
 
 
@@ -135,7 +132,7 @@ cannot load incompatible bytecode
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             local do_jit
             if jit then
@@ -179,7 +176,7 @@ cannot load incompatible bytecode
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            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
@@ -223,7 +220,7 @@ error
         content_by_lua '
             ngx.req.read_body();
             local b = ngx.req.get_body_data();
-            local f = io.open(ngx.var.realpath_root.."/test.lua", "w");
+            f = io.open(ngx.var.realpath_root.."/test.lua", "w");
             -- luajit bytecode: sub(149,-1), lua bytecode: sub(1,147)
             if jit then
                 if not string.find(jit.version, "LuaJIT 2.0") then
@@ -259,9 +256,9 @@ error
         content_by_lua '
             local bcsave = require "jit.bcsave"
             if jit then
-                local prefix = "$TEST_NGINX_SERVER_ROOT"
-                local infile = prefix .. "/html/a.lua"
-                local outfile = prefix .. "/html/a.luac"
+                local prefix = ngx.config.prefix()
+                local infile = prefix .. "html/a.lua"
+                local outfile = prefix .. "html/a.luac"
                 bcsave.start("-s", infile, outfile)
                 return ngx.exec("/call")
             end
@@ -292,9 +289,9 @@ ngx.status = 201 ngx.say("hello from Lua!")
         content_by_lua '
             local bcsave = require "jit.bcsave"
             if jit then
-                local prefix = "$TEST_NGINX_SERVER_ROOT"
-                local infile = prefix .. "/html/a.lua"
-                local outfile = prefix .. "/html/a.luac"
+                local prefix = ngx.config.prefix()
+                local infile = prefix .. "html/a.lua"
+                local outfile = prefix .. "html/a.luac"
                 bcsave.start("-g", infile, outfile)
                 return ngx.exec("/call")
             end
@@ -323,9 +320,9 @@ ngx.status = 201 ngx.say("hello from Lua!")
 --- config
     location = /t {
         content_by_lua_block {
-            local f = assert(loadstring("local a = 1 ngx.say('a = ', a)", "=code"))
+            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
             local bc = string.dump(f)
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
+            local f = assert(io.open("t/servroot/html/a.luac", "w"))
             f:write(bc)
             f:close()
         }
@@ -352,9 +349,9 @@ a = 1
 --- config
     location = /t {
         content_by_lua_block {
-            local f = assert(loadstring("local a = 1 ngx.say('a = ', a)", "=code"))
+            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
             local bc = string.dump(f, true)
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
+            local f = assert(io.open("t/servroot/html/a.luac", "w"))
             f:write(bc)
             f:close()
         }
diff --git a/debian/modules/http-lua/t/082-body-filter.t b/debian/modules/http-lua/t/082-body-filter.t
index 5f765fa..98efa84 100644
--- a/debian/modules/http-lua/t/082-body-filter.t
+++ b/debian/modules/http-lua/t/082-body-filter.t
@@ -460,8 +460,7 @@ GET /t
 --- config
     location /t {
         body_filter_by_lua '
-            local bar
-            local function foo()
+            function foo()
                 bar()
             end
 
diff --git a/debian/modules/http-lua/t/084-inclusive-receiveuntil.t b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
index 66be893..f7d5d3d 100644
--- a/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
+++ b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
@@ -56,7 +56,7 @@ __DATA__
             local reader = sock:receiveuntil("abcabd", { inclusive = true })
 
             for i = 1, 3 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -128,7 +128,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabdabcabe", { inclusive = true })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -200,7 +200,7 @@ close: 1 nil
             local reader = sock:receiveuntil("abcabd", { inclusive = true })
 
             for i = 1, 3 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -272,7 +272,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = nil })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -343,7 +343,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = false })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -414,7 +414,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = true })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -485,7 +485,7 @@ close: 1 nil
             local reader = sock:receiveuntil("aa", { inclusive = "true" })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -552,7 +552,7 @@ bad "inclusive" option value type: string
             local reader = sock:receiveuntil("aa", { inclusive = "true" })
 
             for i = 1, 2 do
-                local line, err, part = reader()
+                line, err, part = reader()
                 if line then
                     ngx.say("read: ", line)
 
@@ -620,7 +620,7 @@ bad "inclusive" option value type: string
             local reader = sock:receiveuntil("--abc", { inclusive = true })
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
@@ -697,7 +697,7 @@ close: 1 nil
             local reader = sock:receiveuntil("--abc", { inclusive = true })
 
             for i = 1, 7 do
-                local line, err, part = reader(4)
+                line, err, part = reader(4)
                 if line then
                     ngx.say("read: ", line)
 
diff --git a/debian/modules/http-lua/t/087-udp-socket.t b/debian/modules/http-lua/t/087-udp-socket.t
index dc6cad5..8bedc32 100644
--- a/debian/modules/http-lua/t/087-udp-socket.t
+++ b/debian/modules/http-lua/t/087-udp-socket.t
@@ -555,7 +555,7 @@ lua udp socket read timed out
 
             local udp = socket.udp()
 
-            udp:settimeout(5000) -- 5 sec
+            udp:settimeout(2000) -- 2 sec
 
             local ok, err = udp:setpeername("$TEST_NGINX_RESOLVER", 53)
             if not ok then
@@ -824,7 +824,7 @@ probe syscall.socket.return, syscall.connect.return {
 
 === TEST 15: bad request tries to setpeer
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -881,7 +881,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 16: bad request tries to send
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -938,7 +938,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 17: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -995,7 +995,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 18: bad request tries to close
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
@@ -1052,7 +1052,7 @@ qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
 
 === TEST 19: bad request tries to receive
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 --- config
     server_tokens off;
     location = /main {
diff --git a/debian/modules/http-lua/t/090-log-socket-errors.t b/debian/modules/http-lua/t/090-log-socket-errors.t
index f5a9f80..16576b6 100644
--- a/debian/modules/http-lua/t/090-log-socket-errors.t
+++ b/debian/modules/http-lua/t/090-log-socket-errors.t
@@ -28,7 +28,7 @@ __DATA__
         lua_socket_log_errors off;
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say(err)
         ';
     }
@@ -50,7 +50,7 @@ timeout
         lua_socket_log_errors on;
         content_by_lua '
             local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say(err)
         ';
     }
@@ -59,7 +59,7 @@ GET /t
 --- response_body
 timeout
 --- error_log
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 
 
 
@@ -72,7 +72,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
         lua_socket_read_timeout 1ms;
         content_by_lua '
             local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("127.0.0.2", 12345)
+            local ok, err = sock:setpeername("agentzh.org", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
@@ -95,7 +95,7 @@ lua udp socket read timed out
         lua_socket_read_timeout 1ms;
         content_by_lua '
             local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("127.0.0.2", 12345)
+            local ok, err = sock:setpeername("agentzh.org", 12345)
             ok, err = sock:receive()
             ngx.say(err)
         ';
diff --git a/debian/modules/http-lua/t/091-coroutine.t b/debian/modules/http-lua/t/091-coroutine.t
index 7cf60f9..bceb512 100644
--- a/debian/modules/http-lua/t/091-coroutine.t
+++ b/debian/modules/http-lua/t/091-coroutine.t
@@ -85,7 +85,7 @@ __DATA__
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("Hello, ", cnt)
@@ -120,7 +120,7 @@ Hello, 2
 --- config
     location /lua {
         content_by_lua '
-            local function f(fid)
+            function f(fid)
                 local cnt = 0
                 while true do
                     ngx.say("cc", fid, ": ", cnt)
@@ -163,7 +163,7 @@ cc3: 2
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            local function worker(url)
+            function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -178,7 +178,7 @@ cc3: 2
 
             local urls = {
                 "agentzh.org",
-                "openresty.com",
+                "iscribblet.org",
                 "openresty.org"
             }
 
@@ -204,7 +204,7 @@ cc3: 2
 GET /lua
 --- response_body
 successfully connected to: agentzh.org
-successfully connected to: openresty.com
+successfully connected to: iscribblet.org
 successfully connected to: openresty.org
 *** All Done ***
 --- no_error_log
@@ -218,14 +218,14 @@ successfully connected to: openresty.org
     location /lua {
         content_by_lua '
             -- generate all the numbers from 2 to n
-            local function gen (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
-            local function filter (p, g)
+            function filter (p, g)
               return coroutine.wrap(function ()
                 while 1 do
                   local n = g()
@@ -235,8 +235,8 @@ successfully connected to: openresty.org
               end)
             end
 
-            local N = 10
-            local x = gen(N)		-- generate primes up to N
+            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
@@ -264,14 +264,14 @@ GET /lua
             coroutine.create = nil
             coroutine.resume = nil
             -- generate all the numbers from 2 to n
-            local function gen (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
-            local function filter (p, g)
+            function filter (p, g)
               return coroutine.wrap(function ()
                 while 1 do
                   local n = g()
@@ -281,8 +281,8 @@ GET /lua
               end)
             end
 
-            local N = 10 
-            local x = gen(N)		-- generate primes up to N
+            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
@@ -307,7 +307,7 @@ GET /lua
 --- config
     location /lua {
         content_by_lua '
-            local function generatefib (n)
+            function generatefib (n)
               return coroutine.wrap(function ()
                 local a,b = 1, 1
                 while a <= n do
@@ -362,7 +362,7 @@ GET /lua
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            local function worker(url)
+            function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -377,7 +377,7 @@ GET /lua
 
             local urls = {
                 "agentzh.org",
-                "openresty.com",
+                "iscribblet.org",
                 "openresty.org"
             }
 
@@ -398,7 +398,7 @@ GET /lua
 GET /lua
 --- response_body
 successfully connected to: agentzh.org
-successfully connected to: openresty.com
+successfully connected to: iscribblet.org
 successfully connected to: openresty.org
 *** All Done ***
 --- no_error_log
@@ -414,7 +414,7 @@ successfully connected to: openresty.org
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
             local st, rn = coroutine.status, coroutine.running
 
-            local function f(self)
+            function f(self)
                 local cnt = 0
                 if rn() ~= self then ngx.say("error"); return end
                 ngx.say("running: ", st(self)) --running
@@ -509,7 +509,7 @@ GET /lua
 --- config
     location /lua {
         content_by_lua '
-            local function print(...)
+            function print(...)
                 local args = {...}
                 local is_first = true
                 for i,v in ipairs(args) do
@@ -523,12 +523,12 @@ GET /lua
                 ngx.print("\\\n")
             end
 
-            local function foo (a)
+            function foo (a)
                 print("foo", a)
                 return coroutine.yield(2*a)
             end
 
-            local co = coroutine.create(function (a,b)
+            co = coroutine.create(function (a,b)
                     print("co-body", a, b)
                     local r = foo(a+1)
                     print("co-body", r)
@@ -566,8 +566,7 @@ main false cannot resume dead coroutine
             local create = coroutine.create
             local resume = coroutine.resume
             local yield = coroutine.yield
-            local g
-            local function f()
+            function f()
                 ngx.say("f begin")
                 yield()
                 local c2 = create(g)
@@ -628,9 +627,8 @@ main done
             local yield = coroutine.yield
 
             local code = 400
-            local g
 
-            local function f()
+            function f()
                 local c2 = create(g)
                 yield()
                 code = code + 1
@@ -685,9 +683,8 @@ exit
             local yield = coroutine.yield
 
             local code = 0
-            local g
 
-            local function f()
+            function f()
                 local c2 = create(g)
                 yield()
                 code = code + 1
@@ -743,7 +740,7 @@ num: 3
     location /lua {
         echo hello;
         header_filter_by_lua '
-            local function f()
+            function f()
                 yield()
             end
 
@@ -767,13 +764,13 @@ API disabled in the context of header_filter_by_lua*
 
             local c1, c2
 
-            local function f()
+            function f()
                 print("f 1")
                 print(coroutine.resume(c2))
                 print("f 2")
             end
 
-            local function g()
+            function g()
                 print("g 1")
                 -- print(coroutine.resume(c1))
                 print("g 2")
@@ -806,13 +803,13 @@ f 2
 
             local c1, c2
 
-            local function f()
+            function f()
                 print("f 1")
                 print(coroutine.resume(c2))
                 print("f 2")
             end
 
-            local function g()
+            function g()
                 print("g 1")
                 print(coroutine.resume(c1))
                 print("g 2")
@@ -862,7 +859,7 @@ falsecannot resume running coroutine
     location /t {
         content_by_lua '
             local co
-            local function f()
+            function f()
                 ngx.say("f: ", coroutine.status(co))
                 ngx.say("f: ", coroutine.resume(co))
             end
@@ -888,7 +885,7 @@ chunk: true
     location /t {
         content_by_lua '
             local co
-            local function f()
+            function f()
                 error("bad")
             end
             co = coroutine.create(f)
@@ -993,7 +990,7 @@ test10
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            local function worker(url)
+            function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -1047,7 +1044,7 @@ successfully connected to: agentzh.org
     resolver $TEST_NGINX_RESOLVER ipv6=off;
     location /lua {
         content_by_lua '
-            local function worker(url)
+            function worker(url)
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect(url, 80)
                 coroutine.yield()
@@ -1107,7 +1104,7 @@ successfully connected to: agentzh.org
 --- config
     location /cotest {
         content_by_lua '
-            local function generator()
+            function generator()
                 return co_wrap(function()
                     co_yield("data")
                 end)
@@ -1136,7 +1133,7 @@ data
 --- config
     location /cotest {
         content_by_lua '
-            local function generator()
+            function generator()
                 return co_wrap(function()
                     co_yield("data")
                 end)
@@ -1169,7 +1166,7 @@ data
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 return 3
             end
 
@@ -1202,7 +1199,7 @@ ok
             local coroutine = require "coroutine"
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("Hello, ", cnt)
@@ -1241,7 +1238,7 @@ Hello, 2
         header_filter_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 local cnt = 0
                 for i = 1, 20 do
                     print("co yield: ", cnt)
@@ -1281,7 +1278,7 @@ co yield: 2
         body_filter_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
 
-            local function f()
+            function f()
                 local cnt = 0
                 for i = 1, 20 do
                     print("co yield: ", cnt)
diff --git a/debian/modules/http-lua/t/093-uthread-spawn.t b/debian/modules/http-lua/t/093-uthread-spawn.t
index ab6db2f..b622d30 100644
--- a/debian/modules/http-lua/t/093-uthread-spawn.t
+++ b/debian/modules/http-lua/t/093-uthread-spawn.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
             end
 
@@ -58,11 +58,11 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("in thread 1")
             end
 
-            local function g()
+            function g()
                 ngx.say("in thread 2")
             end
 
@@ -107,7 +107,7 @@ after 2
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("before sleep")
                 ngx.sleep(0.1)
                 ngx.say("after sleep")
@@ -144,13 +144,13 @@ after sleep
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("1: before sleep")
                 ngx.sleep(0.2)
                 ngx.say("1: after sleep")
             end
 
-            local function g()
+            function g()
                 ngx.say("2: before sleep")
                 ngx.sleep(0.1)
                 ngx.say("2: after sleep")
@@ -200,7 +200,7 @@ delete thread 2
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.blah()
             end
 
@@ -231,9 +231,9 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):3:
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
-                local res = ngx.location.capture("/proxy")
+                res = ngx.location.capture("/proxy")
                 ngx.say("after capture: ", res.body)
             end
 
@@ -277,7 +277,7 @@ after capture: hello world
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -330,7 +330,7 @@ after capture: hello foo
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("after capture: ", res.body)
@@ -384,13 +384,13 @@ capture: hello bar
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("f: before capture")
                 local res = ngx.location.capture("/proxy?foo")
                 ngx.say("f: after capture: ", res.body)
             end
 
-            local function g()
+            function g()
                 ngx.say("g: before capture")
                 local res = ngx.location.capture("/proxy?bah")
                 ngx.say("g: after capture: ", res.body)
@@ -462,8 +462,7 @@ g: after capture: hello bah
 --- config
     location /lua {
         content_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -509,8 +508,7 @@ after g
 --- config
     location /lua {
         content_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -558,7 +556,7 @@ hello in g()
     location /lua {
         content_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
                 ngx.sleep(0.1)
             end
@@ -591,7 +589,7 @@ status: running
     location /lua {
         content_by_lua '
             local co
-            local function f()
+            function f()
                 co = coroutine.running()
             end
 
@@ -623,8 +621,7 @@ status: zombie
     location /lua {
         content_by_lua '
             local co
-            local g
-            local function f()
+            function f()
                 co = coroutine.running()
                 local co2 = coroutine.create(g)
                 coroutine.resume(co2)
@@ -663,8 +660,7 @@ status: normal
 --- config
     location /lua {
         content_by_lua '
-            local g
-            local function f()
+            function f()
                 ngx.say("before g")
                 ngx.thread.spawn(g)
                 ngx.say("after g")
@@ -711,7 +707,7 @@ after f
         content_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -764,7 +760,7 @@ f 3
         content_by_lua '
             local yield = coroutine.yield
 
-            local function f()
+            function f()
                 local self = coroutine.running()
                 ngx.say("f 1")
                 yield(self)
@@ -773,7 +769,7 @@ f 3
                 ngx.say("f 3")
             end
 
-            local function g()
+            function g()
                 local self = coroutine.running()
                 ngx.say("g 1")
                 yield(self)
@@ -820,7 +816,7 @@ g 3
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 coroutine.yield(coroutine.running)
                 ngx.flush(true)
@@ -857,12 +853,12 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f")
                 ngx.flush(true)
             end
 
-            local function g()
+            function g()
                 ngx.say("hello from g")
                 ngx.flush(true)
             end
@@ -908,7 +904,7 @@ hello from g
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
                 local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
                 if not ok then
@@ -960,7 +956,7 @@ received: OK
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.udp()
                 local ok, err = sock:setpeername("127.0.0.1", 12345)
                 local bytes, err = sock:send("blah")
@@ -1022,7 +1018,7 @@ after)$
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.req.read_body()
                 local body = ngx.req.get_body_data()
                 ngx.say("body: ", body)
@@ -1067,7 +1063,7 @@ body: hello world)$
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.req.socket()
                 local body, err = sock:receive(11)
                 if not body then
@@ -1117,7 +1113,7 @@ body: hello world)$
 --- config
     location /lua {
         content_by_lua '
-            local function f(a, b)
+            function f(a, b)
                 ngx.say("hello ", a, " and ", b)
             end
 
@@ -1651,7 +1647,7 @@ ok
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
             end
diff --git a/debian/modules/http-lua/t/094-uthread-exit.t b/debian/modules/http-lua/t/094-uthread-exit.t
index 58d8d0b..2f7d9ba 100644
--- a/debian/modules/http-lua/t/094-uthread-exit.t
+++ b/debian/modules/http-lua/t/094-uthread-exit.t
@@ -24,7 +24,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.exit(0)
             end
@@ -87,7 +87,7 @@ hello in thread
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -171,13 +171,13 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f")
                 ngx.exit(0)
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
                 ngx.say("g")
             end
@@ -261,7 +261,7 @@ f
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("exiting the user thread")
                 ngx.exit(0)
@@ -297,10 +297,10 @@ exiting the user thread
 === TEST 5: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.tcp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -393,10 +393,10 @@ after
 === TEST 6: exit in user thread (entry thread is still pending on the DNS resolver for ngx.socket.udp)
 --- config
     location /lua {
-        resolver 127.0.0.2:12345;
+        resolver agentzh.org;
         resolver_timeout 12s;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.001)
                 ngx.exit(0)
@@ -490,7 +490,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -501,7 +501,7 @@ after
             ngx.say("after")
             local sock = ngx.socket.tcp()
             sock:settimeout(12000)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             if not ok then
                 ngx.say("failed to connect: ", err)
                 return
@@ -580,7 +580,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -680,7 +680,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -786,7 +786,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -881,7 +881,7 @@ after
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -974,7 +974,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1059,7 +1059,7 @@ after
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(0)
@@ -1142,7 +1142,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1225,7 +1225,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exit(0)
             end
@@ -1315,7 +1315,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture_multi{
                     {"/echo"},
                     {"/sleep"}
@@ -1407,7 +1407,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(444)
@@ -1490,7 +1490,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(408)
@@ -1573,7 +1573,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 ngx.sleep(0.1)
                 ngx.exit(499)
diff --git a/debian/modules/http-lua/t/095-uthread-exec.t b/debian/modules/http-lua/t/095-uthread-exec.t
index 7bf37c0..56156c4 100644
--- a/debian/modules/http-lua/t/095-uthread-exec.t
+++ b/debian/modules/http-lua/t/095-uthread-exec.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.exec("/foo")
             end
 
@@ -58,7 +58,7 @@ i am foo
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -93,7 +93,7 @@ i am foo
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -175,12 +175,12 @@ hello foo
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
             end
 
@@ -267,7 +267,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.exec("/foo")
             end
@@ -348,7 +348,7 @@ attempt to abort with pending subrequests
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture("/sleep")
                 ngx.say("end")
             end
diff --git a/debian/modules/http-lua/t/096-uthread-redirect.t b/debian/modules/http-lua/t/096-uthread-redirect.t
index 95bff01..003c642 100644
--- a/debian/modules/http-lua/t/096-uthread-redirect.t
+++ b/debian/modules/http-lua/t/096-uthread-redirect.t
@@ -25,7 +25,7 @@ __DATA__
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -114,7 +114,7 @@ attempt to abort with pending subrequests
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.redirect(301)
             end
@@ -194,7 +194,7 @@ free request
     location /lua {
         client_body_timeout 12000ms;
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture_multi{
                     {"/echo"},
                     {"/sleep"}
diff --git a/debian/modules/http-lua/t/097-uthread-rewrite.t b/debian/modules/http-lua/t/097-uthread-rewrite.t
index 998e256..2f0c06f 100644
--- a/debian/modules/http-lua/t/097-uthread-rewrite.t
+++ b/debian/modules/http-lua/t/097-uthread-rewrite.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.req.set_uri("/foo", true)
             end
 
@@ -58,7 +58,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
@@ -93,7 +93,7 @@ i am foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
@@ -175,12 +175,12 @@ hello foo
 --- config
     location /lua {
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
 
-            local function g()
+            function g()
                 ngx.sleep(1)
             end
 
@@ -267,7 +267,7 @@ hello foo
     location /lua {
         client_body_timeout 12000ms;
         rewrite_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.req.set_uri("/foo", true)
             end
diff --git a/debian/modules/http-lua/t/098-uthread-wait.t b/debian/modules/http-lua/t/098-uthread-wait.t
index c2819ae..4948596 100644
--- a/debian/modules/http-lua/t/098-uthread-wait.t
+++ b/debian/modules/http-lua/t/098-uthread-wait.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 return "done"
             end
@@ -72,7 +72,7 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done"
@@ -120,13 +120,13 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -200,13 +200,13 @@ f: done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -228,7 +228,7 @@ f: done
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            local ok, res = ngx.thread.wait(tf)
+            ok, res = ngx.thread.wait(tf)
             if not ok then
                 ngx.say("failed to wait f: ", res)
                 return
@@ -281,7 +281,7 @@ g: done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 return "done", 3.14
             end
@@ -330,7 +330,7 @@ res: done 3.14
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done", 3.14
@@ -378,7 +378,7 @@ res: done 3.14
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 error("bad bad!")
             end
@@ -427,7 +427,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):4:
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 error("bad bad!")
@@ -477,12 +477,12 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):5:
 --- config
     location /lua {
         content_by_lua '
-            local function g()
+            function g()
                 ngx.say("hello in thread")
                 return "done"
             end
 
-            local function f()
+            function f()
                 local t, err = ngx.thread.spawn(g)
                 if not t then
                     ngx.say("failed to spawn thread: ", err)
@@ -533,13 +533,13 @@ done
 --- config
     location /lua {
         content_by_lua '
-            local function g()
+            function g()
                 ngx.sleep(0.1)
                 ngx.say("hello in thread")
                 return "done"
             end
 
-            local function f()
+            function f()
                 local t, err = ngx.thread.spawn(g)
                 if not t then
                     ngx.say("failed to spawn thread: ", err)
@@ -593,12 +593,12 @@ done
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 out("f: hello")
                 return "f done"
             end
 
-            local function g()
+            function g()
                 out("g: hello")
                 return "g done"
             end
@@ -668,13 +668,13 @@ g status: zombie
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 out("f: hello")
                 return "f done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 out("g: hello")
                 return "g done"
@@ -745,13 +745,13 @@ g: hello
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 ngx.sleep(0.2)
                 out("f: hello")
                 return "f done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.1)
                 out("g: hello")
                 return "g done"
@@ -822,12 +822,12 @@ f: hello
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 out("f: hello")
                 error("f done")
             end
 
-            local function g()
+            function g()
                 out("g: hello")
                 error("g done")
             end
@@ -896,13 +896,13 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):7:
             -- local out = function (...) ngx.log(ngx.ERR, ...) end
             local out = ngx.say
 
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 out("f: hello")
                 error("f done")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 out("g: hello")
                 error("g done")
@@ -969,13 +969,13 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):8:
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 ngx.say("f: hello")
                 return "done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.2)
                 ngx.say("g: hello")
                 return "done"
@@ -997,7 +997,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):8:
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            local ok, res = ngx.thread.wait(tf, tg)
+            ok, res = ngx.thread.wait(tf, tg)
             if not ok then
                 ngx.say("failed to wait: ", res)
                 return
@@ -1038,13 +1038,13 @@ res: done
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.2)
                 ngx.say("f: hello")
                 return "f done"
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.1)
                 ngx.say("g: hello")
                 return "g done"
@@ -1066,7 +1066,7 @@ res: done
 
             ngx.say("g thread created: ", coroutine.status(tg))
 
-            local ok, res = ngx.thread.wait(tf, tg)
+            ok, res = ngx.thread.wait(tf, tg)
             if not ok then
                 ngx.say("failed to wait: ", res)
                 return
@@ -1109,12 +1109,12 @@ res: g done
         content_by_lua '
             local t
 
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 return "done"
             end
 
-            local function g()
+            function g()
                 t = ngx.thread.spawn(f)
             end
 
@@ -1154,7 +1154,7 @@ only the parent coroutine can wait on the thread
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 coroutine.yield()
                 return "done"
@@ -1192,7 +1192,7 @@ qr/lua entry thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):11
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.sleep(0.1)
                 collectgarbage()
                 error("f done")
@@ -1228,7 +1228,7 @@ qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):5:
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello in thread")
                 return "done"
             end
@@ -1283,7 +1283,7 @@ failed to run thread: already waited or killed
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 -- ngx.say("hello in thread")
                 return "done"
             end
diff --git a/debian/modules/http-lua/t/099-c-api.t b/debian/modules/http-lua/t/099-c-api.t
index 5033462..a0b375c 100644
--- a/debian/modules/http-lua/t/099-c-api.t
+++ b/debian/modules/http-lua/t/099-c-api.t
@@ -86,7 +86,7 @@ dogs zone: defined
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -149,7 +149,7 @@ bar: rc=0, type=3, val=3.14159
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -212,7 +212,7 @@ bar: rc=0, type=1, val=0
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
@@ -272,7 +272,7 @@ bar: rc=-5
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local s = ffi.new("char[?]", 20)
 
@@ -344,7 +344,7 @@ bar: rc=0, type=4, val=, len=0
             local buf = ffi.new("char[?]", 4)
 
             ffi.copy(buf, "dogs", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
+            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
 
             local val = ffi.new("ngx_http_lua_value_t[?]", 1)
 
diff --git a/debian/modules/http-lua/t/100-client-abort.t b/debian/modules/http-lua/t/100-client-abort.t
index f571387..89c1f6a 100644
--- a/debian/modules/http-lua/t/100-client-abort.t
+++ b/debian/modules/http-lua/t/100-client-abort.t
@@ -195,7 +195,7 @@ bad things happen
 
     location = /sub {
         proxy_ignore_client_abort on;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 
     location = /sleep {
@@ -236,7 +236,7 @@ client prematurely closed connection
 
     location = /sub {
         proxy_ignore_client_abort off;
-        proxy_pass http://127.0.0.2:12345/;
+        proxy_pass http://agentzh.org:12345/;
     }
 --- request
 GET /t
@@ -540,7 +540,7 @@ client prematurely closed connection
                 return
             end
 
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
+            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
diff --git a/debian/modules/http-lua/t/106-timer.t b/debian/modules/http-lua/t/106-timer.t
index 7b7c85e..3e4741e 100644
--- a/debian/modules/http-lua/t/106-timer.t
+++ b/debian/modules/http-lua/t/106-timer.t
@@ -76,7 +76,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])
 
 
 
-=== TEST 2: globals are shared
+=== TEST 2: separated global env
 --- config
     location /t {
         content_by_lua '
@@ -104,7 +104,7 @@ F(ngx_http_lua_timer_handler) {
 
 --- response_body
 registered timer
-foo = 3
+foo = nil
 
 --- wait: 0.1
 --- no_error_log
@@ -320,7 +320,7 @@ qr/received: Server: \S+/,
 
 === TEST 6: tcp cosocket in timer handler (keep-alive connections)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -596,7 +596,7 @@ qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
 
 === TEST 10: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -693,7 +693,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 11: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -799,7 +799,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 12: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -912,7 +912,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 13: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -1023,7 +1023,7 @@ qr/go\(\): connected: 1, reused: \d+/,
         content_by_lua '
             local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
             local function f()
-                local function f()
+                function f()
                     local cnt = 0
                     for i = 1, 20 do
                         print("cnt = ", cnt)
@@ -1090,7 +1090,7 @@ registered timer
                 ngx.log(ngx.ERR, ...)
             end
             local function handle()
-                local function f()
+                function f()
                     print("hello in thread")
                     return "done"
                 end
diff --git a/debian/modules/http-lua/t/108-timer-safe.t b/debian/modules/http-lua/t/108-timer-safe.t
index 758d01a..2795998 100644
--- a/debian/modules/http-lua/t/108-timer-safe.t
+++ b/debian/modules/http-lua/t/108-timer-safe.t
@@ -229,7 +229,7 @@ qr/received: Server: \S+/,
 
 === TEST 4: tcp cosocket in timer handler (keep-alive connections)
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -489,7 +489,7 @@ delete thread 2
 --- response_body
 hello world
 
---- wait: 0.15
+--- wait: 0.1
 --- no_error_log
 [error]
 [alert]
@@ -499,7 +499,7 @@ hello world
 [
 "registered timer",
 qr/\[lua\] .*? my lua timer handler/,
-qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-9]|8[0-6])/,
+qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
 "lua ngx.timer expired",
 "http lua close fake http connection"
 ]
@@ -508,7 +508,7 @@ qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-9]|8[0-
 
 === TEST 8: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -606,7 +606,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 9: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -713,7 +713,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 10: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -827,7 +827,7 @@ qr/go\(\): connected: 1, reused: \d+/,
 
 === TEST 11: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
 --- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';"
+    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
 
 --- config
     location = /t {
@@ -1007,7 +1007,7 @@ registered timer
                 ngx.log(ngx.ERR, ...)
             end
             local function handle()
-                local function f()
+                function f()
                     print("hello in thread")
                     return "done"
                 end
diff --git a/debian/modules/http-lua/t/109-timer-hup.t b/debian/modules/http-lua/t/109-timer-hup.t
index 2c197c2..0864046 100644
--- a/debian/modules/http-lua/t/109-timer-hup.t
+++ b/debian/modules/http-lua/t/109-timer-hup.t
@@ -46,7 +46,7 @@ __DATA__
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -99,7 +99,7 @@ timer prematurely expired: true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -163,7 +163,7 @@ timer prematurely expired: true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -219,7 +219,7 @@ failed to register a new timer after reload: process exiting, context: ngx.timer
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -284,7 +284,7 @@ g: exiting=true
 --- config
     location /t {
         content_by_lua '
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -363,7 +363,7 @@ lua found 100 pending timers
                 local line, err = sock:receive("*l")
             until not line or string.find(line, "^%s*$")
 
-            local function foo()
+            function foo()
                 repeat
                     -- Get and read chunk
                     local line, err = sock:receive("*l")
@@ -379,7 +379,7 @@ lua found 100 pending timers
                 until len == 0
             end
 
-            local co = coroutine.create(foo)
+            co = coroutine.create(foo)
             repeat
                 local chunk = select(2,coroutine.resume(co))
             until chunk == nil
@@ -399,7 +399,7 @@ lua found 100 pending timers
                 end
                 local ok, err = ngx.timer.at(1, background_thread)
 
-                local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+                local f, err = io.open("t/servroot/logs/nginx.pid", "r")
                 if not f then
                     ngx.say("failed to open nginx.pid: ", err)
                     return
@@ -453,7 +453,7 @@ lua found 1 pending timers
                 end
 
                 if kill then
-                    local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
+                    local f, err = io.open("t/servroot/logs/nginx.pid", "r")
                     if not f then
                         ngx.log(ngx.ERR, "failed to open nginx.pid: ", err)
                         return
diff --git a/debian/modules/http-lua/t/120-re-find.t b/debian/modules/http-lua/t/120-re-find.t
index f80ca4f..73e6134 100644
--- a/debian/modules/http-lua/t/120-re-find.t
+++ b/debian/modules/http-lua/t/120-re-find.t
@@ -622,7 +622,7 @@ matched: 你
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
@@ -664,7 +664,7 @@ error: pcre_exec() failed: -8
 >>> a.lua
 local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
 
-local s = string.rep([[ABCDEFG]], 10)
+s = string.rep([[ABCDEFG]], 10)
 
 local start = ngx.now()
 
diff --git a/debian/modules/http-lua/t/123-lua-path.t b/debian/modules/http-lua/t/123-lua-path.t
index e30132f..23681a9 100644
--- a/debian/modules/http-lua/t/123-lua-path.t
+++ b/debian/modules/http-lua/t/123-lua-path.t
@@ -11,7 +11,7 @@ repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 3 + 1);
 
-$ENV{LUA_PATH} = "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;/foo/bar/baz";
+$ENV{LUA_PATH} = "/foo/bar/baz";
 $ENV{LUA_CPATH} = "/baz/bar/foo";
 #no_diff();
 #no_long_string();
@@ -36,8 +36,8 @@ env LUA_CPATH;
     }
 --- request
 GET /lua
---- response_body_like
-(?:\.\.\/lua-resty-core\/lib\/\?\.lua;\.\.\/lua-resty-lrucache\/lib\/\?\.lua;){1,2}\/foo\/bar\/baz
+--- response_body
+/foo/bar/baz
 /baz/bar/foo
 
 --- no_error_log
@@ -60,8 +60,8 @@ env LUA_CPATH;
     }
 --- request
 GET /lua
---- response_body_like
-(?:\.\.\/lua-resty-core\/lib\/\?\.lua;\.\.\/lua-resty-lrucache\/lib\/\?\.lua;){1,2}\/foo\/bar\/baz
+--- response_body
+/foo/bar/baz
 /baz/bar/foo
 
 --- no_error_log
diff --git a/debian/modules/http-lua/t/124-init-worker.t b/debian/modules/http-lua/t/124-init-worker.t
index b648d55..9b2a91f 100644
--- a/debian/modules/http-lua/t/124-init-worker.t
+++ b/debian/modules/http-lua/t/124-init-worker.t
@@ -521,11 +521,12 @@ warn(): Thu, 01 Jan 1970 01:34:38 GMT
     }
 --- request
 GET /t
---- response_body_like
+--- response_body
+timer created
 connected: 1
 request sent: 56
-first line received: HTTP\/1\.1 200 OK
-second line received: (?:Date|Server): .*?
+first line received: HTTP/1.1 200 OK
+second line received: Server: openresty
 --- no_error_log
 [error]
 --- timeout: 10
@@ -549,7 +550,6 @@ second line received: (?:Date|Server): .*?
             else
                 say("connect: ", ok, " ", err)
             end
-            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
@@ -600,7 +600,6 @@ qr/connect\(\) failed \(\d+: Connection refused\), context: ngx\.timer$/
             else
                 say("connect: ", ok, " ", err)
             end
-            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
@@ -651,7 +650,6 @@ qr/connect\(\) failed \(\d+: Connection refused\)/
             else
                 say("connect: ", ok, " ", err)
             end
-            done = true
         end
 
         local ok, err = ngx.timer.at(0, handler)
diff --git a/debian/modules/http-lua/t/126-shdict-frag.t b/debian/modules/http-lua/t/126-shdict-frag.t
index 33646d1..5a2aff8 100644
--- a/debian/modules/http-lua/t/126-shdict-frag.t
+++ b/debian/modules/http-lua/t/126-shdict-frag.t
@@ -1240,8 +1240,8 @@ failed to safe set baz: no memory
                 local key = "mylittlekey" .. rand(maxkeyidx)
                 local ok, err = dogs:get(key)
                 if not ok or rand() > 0.6 then
-                    local sz = rand(maxsz)
-                    local val = rep("a", sz)
+                    sz = rand(maxsz)
+                    val = rep("a", sz)
                     local ok, err, forcible = dogs:set(key, val)
                     if err then
                         ngx.log(ngx.ERR, "failed to set key: ", err)
diff --git a/debian/modules/http-lua/t/127-uthread-kill.t b/debian/modules/http-lua/t/127-uthread-kill.t
index 5542153..cc43c62 100644
--- a/debian/modules/http-lua/t/127-uthread-kill.t
+++ b/debian/modules/http-lua/t/127-uthread-kill.t
@@ -23,7 +23,7 @@ __DATA__
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f()")
                 ngx.sleep(1)
             end
@@ -81,7 +81,7 @@ lua clean up the timer for pending ngx.sleep
 --- config
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.say("hello from f()")
                 ngx.sleep(0.001)
                 return 32
@@ -138,12 +138,12 @@ lua clean up the timer for pending ngx.sleep
 
 === TEST 3: kill pending resolver
 --- config
-    resolver 127.0.0.2:12345;
+    resolver agentzh.org:12345;
     location /lua {
         content_by_lua '
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
-                sock:connect("some.127.0.0.2", 12345)
+                sock:connect("some.agentzh.org", 12345)
             end
 
             local t, err = ngx.thread.spawn(f)
@@ -194,13 +194,13 @@ resolve name done: -2
     location /lua {
         content_by_lua '
             local ready = false
-            local function f()
+            function f()
                 local sock = ngx.socket.tcp()
                 sock:connect("agentzh.org", 80)
                 sock:close()
                 ready = true
                 sock:settimeout(10000)
-                sock:connect("127.0.0.2", 12345)
+                sock:connect("agentzh.org", 12345)
             end
 
             local t, err = ngx.thread.spawn(f)
@@ -262,7 +262,7 @@ lua finalize socket
 
     location = /t {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture("/sub")
             end
 
@@ -309,11 +309,11 @@ lua tcp socket abort resolver
 
     location = /t {
         content_by_lua '
-            local function f()
+            function f()
                 ngx.location.capture("/sub")
             end
 
-            local function g()
+            function g()
                 ngx.sleep(0.3)
             end
 
@@ -376,7 +376,7 @@ lua tcp socket abort resolver
     location = /t {
         content_by_lua '
             local ready = false
-            local function f()
+            function f()
                 ngx.location.capture("/sub")
                 ready = true
                 ngx.sleep(0.5)
@@ -424,7 +424,7 @@ lua tcp socket abort resolver
 --- config
     location = /t {
         content_by_lua '
-            local function f()
+            function f()
                 return
             end
 
@@ -473,7 +473,7 @@ lua tcp socket abort resolver
                 ngx.say("killed main thread.")
             end
 
-            local function f()
+            function f()
                 local ok, err = ngx.thread.kill(coroutine.running())
                 if not ok then
                     ngx.say("failed to kill user thread: ", err)
diff --git a/debian/modules/http-lua/t/128-duplex-tcp-socket.t b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
index 22b9f03..aed560c 100644
--- a/debian/modules/http-lua/t/128-duplex-tcp-socket.t
+++ b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
@@ -396,7 +396,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("172.105.207.225", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
@@ -425,7 +425,7 @@ close: nil closed
 --- config
     server_tokens off;
     lua_socket_log_errors off;
-    resolver 127.0.0.2:12345;
+    resolver agentzh.org:12345;
     resolver_timeout 300ms;
     location /t {
         content_by_lua '
@@ -459,7 +459,7 @@ close: nil closed
             end
 
             sock:settimeout(300)
-            local ok, err = sock:connect("some2.agentzh.org", 80)
+            local ok, err = sock:connect("some2.agentzh.org", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local ok, err = sock:close()
diff --git a/debian/modules/http-lua/t/129-ssl-socket.t b/debian/modules/http-lua/t/129-ssl-socket.t
index f2fa26b..3f05640 100644
--- a/debian/modules/http-lua/t/129-ssl-socket.t
+++ b/debian/modules/http-lua/t/129-ssl-socket.t
@@ -301,7 +301,7 @@ SSL reused session
 
         content_by_lua '
             local sock = ngx.socket.tcp()
-            sock:settimeout(7000)
+            sock:settimeout(2000)
 
             do
 
@@ -380,7 +380,7 @@ lua ssl free session
 --- no_error_log
 [error]
 [alert]
---- timeout: 10
+--- timeout: 5
 
 
 
@@ -573,7 +573,7 @@ SSL reused session
 
                 ngx.say("ssl handshake: ", type(session))
 
-                local req = "GET /en/linux-packages.html HTTP/1.1\\r\\nHost: openresty.com\\r\\nConnection: close\\r\\n\\r\\n"
+                local req = "GET / HTTP/1.1\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -602,7 +602,7 @@ GET /t
 --- response_body
 connected: 1
 ssl handshake: userdata
-sent http request: 80 bytes.
+sent http request: 56 bytes.
 received: HTTP/1.1 404 Not Found
 close: 1 nil
 
@@ -1333,13 +1333,13 @@ failed to send http request: closed
 --- grep_error_log_out
 --- error_log eval
 [
-qr/\[(crit|error)\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
+qr/\[crit\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
 'lua ssl server name: "openresty.org"',
 ]
 --- no_error_log
 SSL reused session
+[error]
 [alert]
-[emerg]
 --- timeout: 5
 
 
@@ -2508,7 +2508,7 @@ SSL reused session
 
         content_by_lua_block {
             local sock = ngx.socket.tcp()
-            sock:settimeout(7000)
+            sock:settimeout(2000)
 
             local ok, err = sock:connect("openresty.org", 443)
             if not ok then
@@ -2529,4 +2529,4 @@ GET /t
 qr/\[error\] .* ngx.socket sslhandshake: expecting 1 ~ 5 arguments \(including the object\), but seen 0/
 --- no_error_log
 [alert]
---- timeout: 10
+--- timeout: 5
diff --git a/debian/modules/http-lua/t/130-internal-api.t b/debian/modules/http-lua/t/130-internal-api.t
index 2158e87..eba0980 100644
--- a/debian/modules/http-lua/t/130-internal-api.t
+++ b/debian/modules/http-lua/t/130-internal-api.t
@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * blocks() * 3;
+plan tests => repeat_each() * 3;
 
 #no_diff();
 no_long_string();
@@ -19,7 +19,12 @@ run_tests();
 
 __DATA__
 
-=== TEST 1: req
+=== TEST 1: __ngx_req and __ngx_cycle
+--- http_config
+    init_by_lua '
+        my_cycle = __ngx_cycle
+    ';
+
 --- config
     location = /t {
         content_by_lua '
@@ -27,14 +32,18 @@ __DATA__
             local function tonum(ud)
                 return tonumber(ffi.cast("uintptr_t", ud))
             end
-            ngx.say(string.format("content req=%#x", tonum(exdata())))
+            ngx.say(string.format("init: cycle=%#x", tonum(my_cycle)))
+            ngx.say(string.format("content cycle=%#x", tonum(__ngx_cycle)))
+            ngx.say(string.format("content req=%#x", tonum(__ngx_req)))
         ';
     }
 --- request
 GET /t
 
 --- response_body_like chop
-^content req=0x[a-f0-9]{4,}
+^init: cycle=(0x[a-f0-9]{4,})
+content cycle=\1
+content req=0x[a-f0-9]{4,}
 $
 --- no_error_log
 [error]
diff --git a/debian/modules/http-lua/t/134-worker-count-5.t b/debian/modules/http-lua/t/134-worker-count-5.t
index ec6d0e7..b257c12 100644
--- a/debian/modules/http-lua/t/134-worker-count-5.t
+++ b/debian/modules/http-lua/t/134-worker-count-5.t
@@ -3,7 +3,7 @@
 use Test::Nginx::Socket::Lua;
 
 #worker_connections(1014);
-master_on();
+#master_on();
 workers(5);
 #log_level('warn');
 
@@ -55,7 +55,7 @@ workers: 5
 
 === TEST 3: init_by_lua + module (github #681)
 --- http_config
-    lua_package_path "$TEST_NGINX_SERVER_ROOT/html/?.lua;;";
+    lua_package_path "t/servroot/html/?.lua;;";
 
     init_by_lua_block {
         local blah = require "file"
diff --git a/debian/modules/http-lua/t/138-balancer.t b/debian/modules/http-lua/t/138-balancer.t
index 151db7b..0aba66d 100644
--- a/debian/modules/http-lua/t/138-balancer.t
+++ b/debian/modules/http-lua/t/138-balancer.t
@@ -362,6 +362,8 @@ me: 101
 
 === TEST 13: lua subrequests
 --- http_config
+    lua_package_path "t/servroot/html/?.lua;;";
+
     lua_code_cache off;
 
     upstream backend {
diff --git a/debian/modules/http-lua/t/139-ssl-cert-by.t b/debian/modules/http-lua/t/139-ssl-cert-by.t
index bebbdb2..a65d703 100644
--- a/debian/modules/http-lua/t/139-ssl-cert-by.t
+++ b/debian/modules/http-lua/t/139-ssl-cert-by.t
@@ -1278,7 +1278,7 @@ lua ssl server name: "test.com"
         listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
         server_name   test.com;
         ssl_certificate_by_lua_block {
-            local function f()
+            function f()
                 ngx.sleep(0.01)
                 print("uthread: hello in thread")
                 return "done"
diff --git a/debian/modules/http-lua/t/140-ssl-c-api.t b/debian/modules/http-lua/t/140-ssl-c-api.t
index a77f5d4..8734d14 100644
--- a/debian/modules/http-lua/t/140-ssl-c-api.t
+++ b/debian/modules/http-lua/t/140-ssl-c-api.t
@@ -10,7 +10,6 @@ my $openssl_version = eval { `$NginxBinary -V 2>&1` };
 
 if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
     plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
-
 } else {
     plan tests => repeat_each() * (blocks() * 5 + 1);
 }
@@ -69,7 +68,7 @@ _EOC_
 
     my $http_config = $block->http_config || '';
     $http_config .= <<'_EOC_';
-lua_package_path "$prefix/html/?.lua;../lua-resty-core/lib/?.lua;;";
+lua_package_path "$prefix/html/?.lua;;";
 _EOC_
     $block->set_value("http_config", $http_config);
 });
@@ -92,8 +91,8 @@ __DATA__
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -246,8 +245,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -400,8 +399,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -529,8 +528,8 @@ failed to parse PEM priv key: PEM_read_bio_PrivateKey() failed
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
@@ -679,8 +678,8 @@ lua ssl server name: "test.com"
 
             local errmsg = ffi.new("char *[1]")
 
-            local r = require "resty.core.base" .get_request()
-            if r == nil then
+            local r = getfenv(0).__ngx_req
+            if not r then
                 ngx.log(ngx.ERR, "no request found")
                 return
             end
diff --git a/debian/modules/http-lua/t/143-ssl-session-fetch.t b/debian/modules/http-lua/t/143-ssl-session-fetch.t
index 78a66cf..4dc992d 100644
--- a/debian/modules/http-lua/t/143-ssl-session-fetch.t
+++ b/debian/modules/http-lua/t/143-ssl-session-fetch.t
@@ -1114,108 +1114,3 @@ qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
 [error]
 [alert]
 [emerg]
-
-
-
-=== TEST 14: keep global variable in ssl_session_(store|fetch)_by_lua when OpenResty LuaJIT is used
---- http_config
-    ssl_session_store_by_lua_block {
-        ngx.log(ngx.WARN, "new foo: ", foo)
-        if not foo then
-            foo = 1
-        else
-            ngx.log(ngx.WARN, "old foo: ", foo)
-            foo = foo + 1
-        end
-    }
-    ssl_session_fetch_by_lua_block {
-        ngx.log(ngx.WARN, "new bar: ", foo)
-        if not bar then
-            bar = 1
-        else
-            ngx.log(ngx.WARN, "old bar: ", bar)
-            bar = bar + 1
-        end
-    }
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-        location /foo {
-            content_by_lua_block {
-                ngx.say("foo: ", foo)
-                ngx.say("bar: ", bar)
-            }
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                local sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                package.loaded.session = sess
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    local m, err = ngx.re.match(line, "^foo: (.*)$", "jo")
-                    if err then
-                        ngx.say("failed to match line: ", err)
-                    end
-
-                    if m and m[1] then
-                        ngx.print(m[1])
-                    end
-                end
-
-                local ok, err = sock:close()
-                ngx.say("done")
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body_like chomp
-\A[123]done\n\z
---- grep_error_log eval: qr/old (foo|bar): \d+/
---- grep_error_log_out eval
-["", "old foo: 1\n", "old bar: 1\nold foo: 2\n"]
---- no_error_log
-[error]
-[alert]
-[emerg]
diff --git a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
index 8566c0b..4ebc8f3 100644
--- a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
+++ b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
@@ -323,7 +323,7 @@ lua tcp socket write timed out
 
             sock:settimeouts(100, 100, 100)
 
-            local ok, err = sock:connect("127.0.0.2", 12345)
+            local ok, err = sock:connect("agentzh.org", 12345)
             ngx.say("connect: ", ok, " ", err)
 
             local bytes
@@ -346,7 +346,7 @@ send: nil closed
 receive: nil closed
 close: nil closed
 --- error_log
-lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
+lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
 --- timeout: 10
 
 
@@ -411,7 +411,7 @@ lua tcp socket connect timed out, when connecting to 127.0.0.2:12345
 
             local chunk = 4
 
-            local function read()
+            function read()
                 sock:settimeout(200) -- read: 200 ms
 
                 local data, err = sock:receive(content_length)
@@ -506,7 +506,7 @@ failed to receive data: timeout
 
             local chunk = 4
 
-            local function read()
+            function read()
                 local data, err = sock:receive(content_length)
                 if not data then
                     ngx.log(ngx.ERR, "failed to receive data: ", err)
diff --git a/debian/modules/http-lua/t/152-timer-every.t b/debian/modules/http-lua/t/152-timer-every.t
index 7b42d2d..c8d62e7 100644
--- a/debian/modules/http-lua/t/152-timer-every.t
+++ b/debian/modules/http-lua/t/152-timer-every.t
@@ -63,7 +63,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, cont
 
 
 
-=== TEST 2: shared global env
+=== TEST 2: separated global env
 --- config
     location /t {
         content_by_lua_block {
@@ -84,7 +84,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, cont
 --- request
 GET /t
 --- response_body
-foo = 3
+foo = nil
 --- wait: 0.12
 --- no_error_log
 [error]
diff --git a/debian/modules/http-lua/t/153-semaphore-hup.t b/debian/modules/http-lua/t/153-semaphore-hup.t
index 5c271a4..c85a21d 100644
--- a/debian/modules/http-lua/t/153-semaphore-hup.t
+++ b/debian/modules/http-lua/t/153-semaphore-hup.t
@@ -67,7 +67,7 @@ add_block_preprocessor(sub {
                 return
             end
 
-            local shdict = ngx.shared.shdict
+            shdict = ngx.shared.shdict
             local success = shdict:add("reloaded", 1)
             if not success then
                 return
diff --git a/debian/modules/http-lua/t/156-slow-network.t b/debian/modules/http-lua/t/156-slow-network.t
deleted file mode 100644
index 2d80506..0000000
--- a/debian/modules/http-lua/t/156-slow-network.t
+++ /dev/null
@@ -1,138 +0,0 @@
-BEGIN {
-    if (!defined $ENV{LD_PRELOAD}) {
-        $ENV{LD_PRELOAD} = '';
-    }
-
-    if ($ENV{LD_PRELOAD} !~ /\bmockeagain\.so\b/) {
-        $ENV{LD_PRELOAD} = "mockeagain.so $ENV{LD_PRELOAD}";
-    }
-
-    if ($ENV{MOCKEAGAIN} eq 'r') {
-        $ENV{MOCKEAGAIN} = 'rw';
-
-    } else {
-        $ENV{MOCKEAGAIN} = 'w';
-    }
-
-    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
-}
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4);
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    if (!defined $block->error_log) {
-        $block->set_value("no_error_log", "[error]");
-    }
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-
-});
-
-
-log_level("debug");
-no_long_string();
-#no_diff();
-run_tests();
-
-__DATA__
-
-=== TEST 1: receiveany returns anything once socket receives
---- config
-    server_tokens off;
-    location = /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(500)
-            assert(sock:connect("127.0.0.1", ngx.var.port))
-            local req = {
-                'GET /foo HTTP/1.0\r\n',
-                'Host: localhost\r\n',
-                'Connection: close\r\n\r\n',
-            }
-            local ok, err = sock:send(req)
-            if not ok then
-                ngx.say("send request failed: ", err)
-                return
-            end
-
-
-            -- skip http header
-            while true do
-                local data, err, _ = sock:receive('*l')
-                if err then
-                    ngx.say('unexpected error occurs when receiving http head: ' .. err)
-                    return
-                end
-                if #data == 0 then -- read last line of head
-                    break
-                end
-            end
-
-            -- receive http body
-            while true do
-                local data, err = sock:receiveany(1024)
-                if err then
-                    if err ~= 'closed' then
-                        ngx.say('unexpected err: ', err)
-                    end
-                    break
-                end
-                ngx.say(data)
-            end
-
-            sock:close()
-        }
-    }
-
-    location = /foo {
-        content_by_lua_block {
-            local resp = {
-                '1',
-                'hello',
-            }
-
-            local length = 0
-            for _, v in ipairs(resp) do
-                length = length + #v
-            end
-
-            -- flush http header
-            ngx.header['Content-Length'] = length
-            ngx.flush(true)
-            ngx.sleep(0.01)
-
-            -- send http body bytes by bytes
-            for _, v in ipairs(resp) do
-                ngx.print(v)
-                ngx.flush(true)
-                ngx.sleep(0.01)
-            end
-        }
-    }
-
---- response_body
-1
-h
-e
-l
-l
-o
---- grep_error_log eval
-qr/lua tcp socket read any/
---- grep_error_log_out
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
-lua tcp socket read any
diff --git a/debian/modules/http-lua/t/157-socket-keepalive-hup.t b/debian/modules/http-lua/t/157-socket-keepalive-hup.t
deleted file mode 100644
index 357bb59..0000000
--- a/debian/modules/http-lua/t/157-socket-keepalive-hup.t
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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;
-        undef $ENV{TEST_NGINX_USE_STAP};
-    }
-}
-
-use Test::Nginx::Socket::Lua $SkipReason ? (skip_all => $SkipReason) : ();
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 8);
-
-#no_diff();
-no_long_string();
-
-worker_connections(1024);
-run_tests();
-
-__DATA__
-
-=== TEST 1: exiting
---- config
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua_block {
-            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
-            if not f then
-                ngx.say("failed to open nginx.pid: ", err)
-                return
-            end
-
-            local pid = f:read()
-            -- ngx.say("master pid: [", pid, "]")
-
-            f:close()
-
-            local i = 0
-            local port = ngx.var.port
-
-            local function f(premature)
-                print("timer prematurely expired: ", premature)
-
-                local sock = ngx.socket.tcp()
-
-                local ok, err = sock:connect("127.0.0.1", port)
-                if not ok then
-                    print("failed to connect: ", err)
-                    return
-                end
-
-                local ok, err = sock:setkeepalive()
-                if not ok then
-                    print("failed to setkeepalive: ", err)
-                    return
-                end
-
-                print("setkeepalive successfully")
-            end
-            local ok, err = ngx.timer.at(3, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            os.execute("kill -HUP " .. pid)
-        }
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.3
---- no_error_log
-[error]
-[alert]
-[crit]
---- error_log
-timer prematurely expired: true
-setkeepalive successfully
-lua tcp socket set keepalive while process exiting, closing connection
diff --git a/debian/modules/http-lua/t/158-global-var.t b/debian/modules/http-lua/t/158-global-var.t
deleted file mode 100644
index 414a43a..0000000
--- a/debian/modules/http-lua/t/158-global-var.t
+++ /dev/null
@@ -1,508 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-log_level('debug');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 14);
-
-our $HtmlDir = html_dir;
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-
-no_long_string();
-
-sub read_file {
-    my $infile = shift;
-    open my $in, $infile
-        or die "cannot open $infile for reading: $!";
-    my $cert = do { local $/; <$in> };
-    close $in;
-    $cert;
-}
-
-our $TestCertificate = read_file("t/cert/test.crt");
-our $TestCertificateKey = read_file("t/cert/test.key");
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    if (!defined $block->error_log) {
-        $block->set_value("no_error_log", "[error]");
-    }
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-
-});
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set_by_lua
---- config
-    location /t {
-        set_by_lua_block $res {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            return foo
-        }
-        echo $res;
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|set_by_lua:\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-set_by_lua:3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 2: rewrite_by_lua
---- config
-    location /t {
-        rewrite_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-rewrite_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 3: access_by_lua
---- config
-    location /t {
-        access_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-access_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 4: content_by_lua
---- config
-    location /t {
-        content_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-content_by_lua\(nginx\.conf:48\):3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 5: header_filter_by_lua
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.say(foo)
-        }
-        header_filter_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-    }
---- response_body_like chomp
-\A(?:nil|1)\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-header_filter_by_lua:3: in main chunk, \n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 6: body_filter_by_lua
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.say(foo)
-        }
-        body_filter_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-    }
---- response_body_like chomp
-\A(?:nil|2)\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk, )/
---- grep_error_log_out eval
-[qr/\[warn\] .*?writing a global lua variable \('foo'\)
-body_filter_by_lua:3: in main chunk, 
-old foo: 1\n\z/, "old foo: 2\nold foo: 3\n"]
-
-
-
-=== TEST 7: log_by_lua
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.say(foo)
-        }
-        log_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-    }
---- response_body_like chomp
-\A(?:nil|1)\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in main chunk)/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-log_by_lua\(nginx\.conf:50\):3: in main chunk\n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 8: ssl_certificate_by_lua
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            content_by_lua_block {
-                ngx.say("foo: ", foo)
-            }
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                -- ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                -- ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    local m, err = ngx.re.match(line, "^foo: (.*)$", "jo")
-                    if err then
-                        ngx.say("failed to match line: ", err)
-                    end
-
-                    if m and m[1] then
-                        ngx.print(m[1])
-                    end
-                end
-
-                local ok, err = sock:close()
-                ngx.say("done")
-            end  -- do
-        }
-    }
-
---- response_body_like chomp
-\A[12]done\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua:\d+: in main chunk)/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-ssl_certificate_by_lua:3: in main chunk\n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 9: timer
---- config
-    location /t {
-        content_by_lua_block {
-            local function f()
-                if not foo then
-                    foo = 1
-                else
-                    ngx.log(ngx.WARN, "old foo: ", foo)
-                    foo = foo + 1
-                end
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.sleep(0.01)
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|\[\w+\].*?writing a global lua variable \('[^'\s]+'\)|\w+_by_lua\(.*?\):\d+: in\b)/
---- grep_error_log_out eval
-[qr/\A\[warn\] .*?writing a global lua variable \('foo'\)
-content_by_lua\(nginx\.conf:56\):4: in\n\z/, "old foo: 1\n"]
-
-
-
-=== TEST 10: init_by_lua
---- http_config
-    init_by_lua_block {
-        foo = 1
-    }
---- config
-    location /t {
-        content_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[23]\n\z
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["old foo: 1\n", "old foo: 2\n"]
-
-
-
-=== TEST 11: init_worker_by_lua
---- http_config
-    init_worker_by_lua_block {
-        if not foo then
-            foo = 1
-        else
-            ngx.log(ngx.WARN, "old foo: ", foo)
-            foo = foo + 1
-        end
-    }
---- config
-    location /t {
-        content_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[23]\n\z
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["old foo: 1\n", "old foo: 2\n"]
-
-
-
-=== TEST 12: init_by_lua + init_worker_by_lua
---- http_config
-    init_by_lua_block {
-        if not foo then
-            foo = 1
-        else
-            ngx.log(ngx.WARN, "old foo: ", foo)
-            foo = foo + 1
-        end
-    }
-    init_worker_by_lua_block {
-        if not foo then
-            foo = 1
-        else
-            ngx.log(ngx.WARN, "old foo: ", foo)
-            foo = foo + 1
-        end
-    }
---- config
-    location /t {
-        content_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[34]\n\z
---- grep_error_log eval: qr/old foo: \d+/
---- grep_error_log_out eval
-["old foo: 1\nold foo: 2\n", "old foo: 3\n"]
-
-
-
-=== TEST 13: don't show warn messages in init/init_worker
---- http_config
-    init_by_lua_block {
-        foo = 1
-    }
-
-    init_worker_by_lua_block {
-        bar = 2
-    }
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.say(foo)
-            ngx.say(bar)
-        }
-    }
---- response_body
-1
-2
---- no_error_log
-setting global variable
-
-
-
-=== TEST 14: uthread
---- config
-    location /t {
-        content_by_lua_block {
-            local function f()
-                if not foo then
-                    foo = 1
-                else
-                    ngx.log(ngx.WARN, "old foo: ", foo)
-                    foo = foo + 1
-                end
-            end
-            local ok, err = ngx.thread.spawn(f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.sleep(0.01)
-            ngx.say(foo)
-        }
-    }
---- response_body_like chomp
-\A[12]\n\z
---- grep_error_log eval
-qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
---- grep_error_log_out eval
-["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
-
-
-
-=== TEST 15: balancer_by_lua
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            if not foo then
-                foo = 1
-            else
-                ngx.log(ngx.WARN, "old foo: ", foo)
-                foo = foo + 1
-            end
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-qr/\[crit\].*?\Qconnect() to 0.0.0.1:80 failed\E/
---- grep_error_log eval: qr/(old foo: \d+|writing a global lua variable \('\w+'\))/
---- grep_error_log_out eval
-["writing a global lua variable \('foo'\)\n", "old foo: 1\n"]
diff --git a/debian/modules/http-lua/t/159-sa-restart.t b/debian/modules/http-lua/t/159-sa-restart.t
deleted file mode 100644
index a0f0c0e..0000000
--- a/debian/modules/http-lua/t/159-sa-restart.t
+++ /dev/null
@@ -1,180 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    my $http_config = $block->http_config || '';
-
-    $http_config .= <<_EOC_;
-    init_by_lua_block {
-        function test_sa_restart()
-            local signals = {
-                --"HUP",
-                --"INFO",
-                --"XCPU",
-                --"USR1",
-                --"USR2",
-                "ALRM",
-                --"INT",
-                "IO",
-                "CHLD",
-                --"WINCH",
-            }
-
-            for _, signame in ipairs(signals) do
-                local cmd = string.format("kill -s %s %d && sleep 0.01",
-                                          signame, ngx.worker.pid())
-                local err = select(2, io.popen(cmd):read("*a"))
-                if err then
-                    error("SIG" .. signame .. " caused: " .. err)
-                end
-            end
-        end
-    }
-_EOC_
-
-    $block->set_value("http_config", $http_config);
-
-    if (!defined $block->config) {
-        my $config = <<_EOC_;
-        location /t {
-            echo ok;
-        }
-_EOC_
-
-        $block->set_value("config", $config);
-    }
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-
-    if (!defined $block->response_body) {
-        $block->set_value("ignore_response_body");
-    }
-
-    if (!defined $block->no_error_log) {
-        $block->set_value("no_error_log", "[error]");
-    }
-});
-
-plan tests => repeat_each() * (blocks() * 2 + 1);
-
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: lua_sa_restart default - sets SA_RESTART in init_worker_by_lua*
---- http_config
-    init_worker_by_lua_block {
-        test_sa_restart()
-    }
-
-
-
-=== TEST 2: lua_sa_restart off - does not set SA_RESTART
---- http_config
-    lua_sa_restart off;
-
-    init_worker_by_lua_block {
-        test_sa_restart()
-    }
---- no_error_log
-[crit]
---- error_log
-Interrupted system call
-
-
-
-=== TEST 3: lua_sa_restart on (default) - sets SA_RESTART if no init_worker_by_lua* phase is defined
---- config
-    location /t {
-        content_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 4: lua_sa_restart on (default) - SA_RESTART is effective in rewrite_by_lua*
---- config
-    location /t {
-        rewrite_by_lua_block {
-            test_sa_restart()
-        }
-
-        echo ok;
-    }
-
-
-
-=== TEST 5: lua_sa_restart on (default) - SA_RESTART is effective in access_by_lua*
---- config
-    location /t {
-        access_by_lua_block {
-            test_sa_restart()
-        }
-
-        echo ok;
-    }
-
-
-
-=== TEST 6: lua_sa_restart on (default) - SA_RESTART is effective in content_by_lua*
---- config
-    location /t {
-        content_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 7: lua_sa_restart on (default) - SA_RESTART is effective in header_filter_by_lua*
---- config
-    location /t {
-        echo ok;
-
-        header_filter_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 8: lua_sa_restart on (default) - SA_RESTART is effective in body_filter_by_lua*
---- config
-    location /t {
-        echo ok;
-
-        body_filter_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 9: lua_sa_restart on (default) - SA_RESTART is effective in log_by_lua*
---- config
-    location /t {
-        echo ok;
-
-        log_by_lua_block {
-            test_sa_restart()
-        }
-    }
-
-
-
-=== TEST 10: lua_sa_restart on (default) - SA_RESTART is effective in timer phase
---- config
-    location /t {
-        echo ok;
-
-        log_by_lua_block {
-            ngx.timer.at(0, test_sa_restart)
-        }
-    }
diff --git a/debian/modules/http-lua/t/160-disable-init-by-lua.t b/debian/modules/http-lua/t/160-disable-init-by-lua.t
deleted file mode 100644
index 541771e..0000000
--- a/debian/modules/http-lua/t/160-disable-init-by-lua.t
+++ /dev/null
@@ -1,194 +0,0 @@
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-
-my $html_dir = $ENV{TEST_NGINX_HTML_DIR};
-my $http_config = <<_EOC_;
-    init_by_lua_block {
-        function set_up_ngx_tmp_conf(conf)
-            if conf == nil then
-                conf = [[
-                    events {
-                        worker_connections 64;
-                    }
-                    http {
-                        init_by_lua_block {
-                            ngx.log(ngx.ERR, "run init_by_lua")
-                        }
-                    }
-                ]]
-            end
-
-            assert(os.execute("mkdir -p $html_dir/logs"))
-
-            local conf_file = "$html_dir/nginx.conf"
-            local f, err = io.open(conf_file, "w")
-            if not f then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            assert(f:write(conf))
-
-            return conf_file
-        end
-
-        function get_ngx_bin_path()
-            local ffi = require "ffi"
-            ffi.cdef[[char **ngx_argv;]]
-            return ffi.string(ffi.C.ngx_argv[0])
-        end
-    }
-_EOC_
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    if (!defined $block->http_config) {
-        $block->set_value("http_config", $http_config);
-    }
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-});
-
-env_to_nginx("PATH");
-log_level("warn");
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: ensure init_by_lua* is not run in signaller process
---- config
-    location = /t {
-        content_by_lua_block {
-            local conf_file = set_up_ngx_tmp_conf()
-            local nginx = get_ngx_bin_path()
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -s reopen"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-        }
-    }
---- error_log
-failed (2: No such file or directory)
---- no_error_log eval
-qr/\[error\] .*? init_by_lua:\d+: run init_by_lua/
-
-
-
-=== TEST 2: init_by_lua* does not run when testing Nginx configuration
---- config
-    location = /t {
-        content_by_lua_block {
-            local conf_file = set_up_ngx_tmp_conf()
-            local nginx = get_ngx_bin_path()
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -t"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -T"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-        }
-    }
---- error_log
-test is successful
---- no_error_log eval
-qr/\[error\] .*? init_by_lua:\d+: run init_by_lua/
-
-
-
-=== TEST 3: init_by_lua* does not run when testing Nginx configuration which contains 'lua_shared_dict' (GitHub #1462)
---- config
-    location = /t {
-        content_by_lua_block {
-            local conf = [[
-                events {
-                    worker_connections 64;
-                }
-                http {
-                    lua_shared_dict test 64k;
-                    init_by_lua_block {
-                        ngx.log(ngx.ERR, "run init_by_lua with lua_shared_dict")
-                    }
-                }
-            ]]
-            local conf_file = set_up_ngx_tmp_conf(conf)
-            local nginx = get_ngx_bin_path()
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -t"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-
-            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file .. " -T"
-            local p, err = io.popen(cmd)
-            if not p then
-                ngx.log(ngx.ERR, err)
-                return
-            end
-
-            local out, err = p:read("*a")
-            if not out then
-                ngx.log(ngx.ERR, err)
-
-            else
-                ngx.log(ngx.WARN, out)
-            end
-        }
-    }
---- error_log
-test is successful
---- no_error_log eval
-qr/\[error\] .*? init_by_lua:\d+: run init_by_lua with lua_shared_dict/
diff --git a/debian/modules/http-lua/t/161-load-resty-core.t b/debian/modules/http-lua/t/161-load-resty-core.t
deleted file mode 100644
index 41b18f0..0000000
--- a/debian/modules/http-lua/t/161-load-resty-core.t
+++ /dev/null
@@ -1,68 +0,0 @@
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    if (!defined $block->request) {
-        $block->set_value("request", "GET /t");
-    }
-
-    if (!defined $block->no_error_log) {
-        $block->set_value("no_error_log", "[error]");
-    }
-});
-
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: lua_load_resty_core is enabled by default
---- config
-    location = /t {
-        content_by_lua_block {
-            local loaded_resty_core = package.loaded["resty.core"]
-            local resty_core = require "resty.core"
-
-            ngx.say("resty.core loaded: ", loaded_resty_core == resty_core)
-        }
-    }
---- response_body
-resty.core loaded: true
-
-
-
-=== TEST 2: lua_load_resty_core can be disabled
---- http_config
-    lua_load_resty_core off;
---- config
-    location = /t {
-        content_by_lua_block {
-            local loaded_resty_core = package.loaded["resty.core"]
-
-            ngx.say("resty.core loaded: ", loaded_resty_core ~= nil)
-        }
-    }
---- response_body
-resty.core loaded: false
-
-
-
-=== TEST 3: lua_load_resty_core is effective when using lua_shared_dict
---- http_config
-    lua_shared_dict dogs 128k;
---- config
-    location = /t {
-        content_by_lua_block {
-            local loaded_resty_core = package.loaded["resty.core"]
-            local resty_core = require "resty.core"
-
-            ngx.say("resty.core loaded: ", loaded_resty_core == resty_core)
-        }
-    }
---- response_body
-resty.core loaded: true
diff --git a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
index ffc32f5..0286853 100644
--- a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
+++ b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
@@ -213,9 +213,10 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 
     ngx_uint_t                   i;
     ngx_shm_zone_t             **zone;
-    ngx_shm_zone_t             **zone_udata;
 
-    cycle = (ngx_cycle_t *) ngx_cycle;
+    lua_getglobal(L, "__ngx_cycle");
+    cycle = lua_touserdata(L, -1);
+    lua_pop(L, 1);
 
     hmcf_ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index];
     lfsmcf = hmcf_ctx->main_conf[ngx_http_lua_fake_shm_module.ctx_index];
@@ -241,9 +242,7 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 
             lua_createtable(L, 1 /* narr */, 0 /* nrec */);
                 /* table of zone[i] */
-            zone_udata = lua_newuserdata(L, sizeof(ngx_shm_zone_t *));
-                /* shared mt key ud */
-            *zone_udata = zone[i];
+            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
             lua_rawseti(L, -2, 1); /* {zone[i]} */
             lua_pushvalue(L, -3); /* shared mt key ud mt */
             lua_setmetatable(L, -2); /* shared mt key ud */
@@ -263,10 +262,9 @@ ngx_http_lua_fake_shm_preload(lua_State *L)
 static int
 ngx_http_lua_fake_shm_get_info(lua_State *L)
 {
-    ngx_int_t                         n;
-    ngx_shm_zone_t                   *zone;
-    ngx_shm_zone_t                  **zone_udata;
-    ngx_http_lua_fake_shm_ctx_t      *ctx;
+    ngx_int_t                    n;
+    ngx_shm_zone_t              *zone;
+    ngx_http_lua_fake_shm_ctx_t *ctx;
 
     n = lua_gettop(L);
 
@@ -278,15 +276,13 @@ ngx_http_lua_fake_shm_get_info(lua_State *L)
     luaL_checktype(L, 1, LUA_TTABLE);
 
     lua_rawgeti(L, 1, 1);
-    zone_udata = lua_touserdata(L, -1);
+    zone = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
-    if (zone_udata == NULL) {
+    if (zone == NULL) {
         return luaL_error(L, "bad \"zone\" argument");
     }
 
-    zone = *zone_udata;
-
     ctx = (ngx_http_lua_fake_shm_ctx_t *) zone->data;
 
     lua_pushlstring(L, (char *) zone->shm.name.data, zone->shm.name.len);
diff --git a/debian/modules/http-lua/util/build.sh b/debian/modules/http-lua/util/build.sh
index 14e9fd4..164bf9f 100755
--- a/debian/modules/http-lua/util/build.sh
+++ b/debian/modules/http-lua/util/build.sh
@@ -22,8 +22,6 @@ force=$2
             #--without-http_referer_module \
             #--with-http_spdy_module \
 
-add_fake_shm_module="--add-module=$root/t/data/fake-shm-module"
-
 time ngx-build $force $version \
             --with-pcre-jit \
             --with-ipv6 \
@@ -57,7 +55,7 @@ time ngx-build $force $version \
                 --add-module=$root/../redis2-nginx-module \
                 --add-module=$root/../stream-lua-nginx-module \
                 --add-module=$root/t/data/fake-module \
-                $add_fake_shm_module \
+                --add-module=$root/t/data/fake-shm-module \
                 --add-module=$root/t/data/fake-delayed-load-module \
                 --with-http_gunzip_module \
                 --with-http_dav_module \
diff --git a/debian/modules/patches/http-lua/CVE-2020-11724.patch b/debian/modules/patches/http-lua/CVE-2020-11724.patch
index 5b47abe..5e0eff7 100644
--- a/debian/modules/patches/http-lua/CVE-2020-11724.patch
+++ b/debian/modules/patches/http-lua/CVE-2020-11724.patch
@@ -13,8 +13,8 @@ Signed-off-by: Yichun Zhang (agentzh) <yichun@openresty.com>
 
 Index: http-lua/src/ngx_http_lua_subrequest.c
 ===================================================================
---- http-lua.orig/src/ngx_http_lua_subrequest.c	2022-03-15 11:11:11.303357830 +0100
-+++ http-lua/src/ngx_http_lua_subrequest.c	2022-03-15 11:11:11.299357831 +0100
+--- http-lua.orig/src/ngx_http_lua_subrequest.c	2020-07-14 09:50:35.830928117 +0200
++++ http-lua/src/ngx_http_lua_subrequest.c	2020-07-14 09:50:35.826928232 +0200
 @@ -56,8 +56,6 @@
      ngx_string("Content-Length");
  
@@ -99,7 +99,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
      sr->method = method;
  
      switch (method) {
-@@ -1132,100 +1116,6 @@
+@@ -1124,100 +1108,6 @@
  }
  
  
@@ -200,7 +200,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
  static void
  ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
      ngx_http_lua_ctx_t *ctx)
-@@ -1740,11 +1630,17 @@
+@@ -1732,11 +1622,17 @@
  
  
  static ngx_int_t
@@ -220,7 +220,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
  
      if (ngx_list_init(&sr->headers_in.headers, sr->pool, 20,
                        sizeof(ngx_table_elt_t)) != NGX_OK)
-@@ -1752,10 +1648,46 @@
+@@ -1744,10 +1640,46 @@
          return NGX_ERROR;
      }
  
@@ -270,7 +270,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
      header = part->elts;
  
      for (i = 0; /* void */; i++) {
-@@ -1770,7 +1702,14 @@
+@@ -1762,7 +1694,14 @@
              i = 0;
          }
  
@@ -286,7 +286,7 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
             header[i].key.data, (int) header[i].value.len,
             header[i].value.data);
  
-@@ -1782,9 +1721,10 @@
+@@ -1774,9 +1713,10 @@
      }
  
      dd("after: parent req headers count: %d",
@@ -300,8 +300,8 @@ Index: http-lua/src/ngx_http_lua_subrequest.c
  /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
 Index: http-lua/t/020-subrequest.t
 ===================================================================
---- http-lua.orig/t/020-subrequest.t	2022-03-15 11:11:11.303357830 +0100
-+++ http-lua/t/020-subrequest.t	2022-03-15 11:11:11.299357831 +0100
+--- http-lua.orig/t/020-subrequest.t	2020-07-14 09:50:35.830928117 +0200
++++ http-lua/t/020-subrequest.t	2020-07-14 09:50:35.826928232 +0200
 @@ -14,6 +14,7 @@
  plan tests => repeat_each() * (blocks() * 3 + 23);
  

From 054b32430f5190016e23c5f4ec8c2b0d564731a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 5 Apr 2022 19:20:29 +0200
Subject: [PATCH 357/600] http-lus: Backport segfault bugfix

---
 debian/changelog                              |  8 +++++
 .../http-lua/bug-994178-segfault.patch        | 31 +++++++++++++++++++
 debian/modules/patches/http-lua/series        |  1 +
 3 files changed, 40 insertions(+)
 create mode 100644 debian/modules/patches/http-lua/bug-994178-segfault.patch

diff --git a/debian/changelog b/debian/changelog
index 8af7ecf..58f262e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.18.0-9) UNRELEASED; urgency=medium
+
+  * http-lua: Downgrade to 0.10.13 (Closes: #1008787).
+  * http-lus: Backport upstream bugfix for segfault in nginx core >= 1.15.0 when
+    libnginx-mod-http-lua is loaded and init_worker_by_lua* is used.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 05 Apr 2022 19:11:47 +0200
+
 nginx (1.18.0-8) unstable; urgency=medium
 
   * Restore patch:
diff --git a/debian/modules/patches/http-lua/bug-994178-segfault.patch b/debian/modules/patches/http-lua/bug-994178-segfault.patch
new file mode 100644
index 0000000..89dee6a
--- /dev/null
+++ b/debian/modules/patches/http-lua/bug-994178-segfault.patch
@@ -0,0 +1,31 @@
+From: Datong Sun <dndx@idndx.com>
+Date: Wed Jul 18 16:21:09 2018 -0700
+Origin: https://github.com/openresty/lua-nginx-module/commit/e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
+Subject: fixed segfault in NGINX core >= 1.15.0 when init_worker_by_lua* is
+ used.
+
+Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
+
+diff --git a/src/ngx_http_lua_initworkerby.c b/src/ngx_http_lua_initworkerby.c
+index 4a722a06..2a82fcb9 100644
+--- a/src/ngx_http_lua_initworkerby.c
++++ b/src/ngx_http_lua_initworkerby.c
+@@ -25,6 +25,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
+     void                        *cur, *prev;
+     ngx_uint_t                   i;
+     ngx_conf_t                   conf;
++    ngx_conf_file_t              cf_file;
+     ngx_cycle_t                 *fake_cycle;
+     ngx_module_t               **modules;
+     ngx_open_file_t             *file, *ofile;
+@@ -166,6 +167,10 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
+     conf.pool = fake_cycle->pool;
+     conf.log = cycle->log;
+
++    ngx_memzero(&cf_file, sizeof(cf_file));
++    cf_file.file.name = cycle->conf_file;
++    conf.conf_file = &cf_file;
++
+     http_ctx.loc_conf = ngx_pcalloc(conf.pool,
+                                     sizeof(void *) * ngx_http_max_module);
+     if (http_ctx.loc_conf == NULL) {
diff --git a/debian/modules/patches/http-lua/series b/debian/modules/patches/http-lua/series
index 1c68a88..61d5c01 100644
--- a/debian/modules/patches/http-lua/series
+++ b/debian/modules/patches/http-lua/series
@@ -1,2 +1,3 @@
 discover-luajit-2.1.patch
 CVE-2020-11724.patch
+bug-994178-segfault.patch

From b58e677848e4dd9a33c6d43dd157de35489b56ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 5 Apr 2022 19:25:57 +0200
Subject: [PATCH 358/600] d/control: fix Homepage nginx.net -> nginx.org

---
 debian/changelog | 5 +++--
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58f262e..12a7a37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 nginx (1.18.0-9) UNRELEASED; urgency=medium
 
   * http-lua: Downgrade to 0.10.13 (Closes: #1008787).
-  * http-lus: Backport upstream bugfix for segfault in nginx core >= 1.15.0 when
-    libnginx-mod-http-lua is loaded and init_worker_by_lua* is used.
+  * http-lua: Backport upstream bugfix for segfault in nginx core >= 1.15.0
+    when libnginx-mod-http-lua is loaded and init_worker_by_lua* is used.
+  * d/control: fix Homepage nginx.net -> nginx.org (Closes: #976158)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 05 Apr 2022 19:11:47 +0200
 
diff --git a/debian/control b/debian/control
index 719dcc7..158de5b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper-compat (= 13),
                quilt,
                zlib1g-dev
 Standards-Version: 4.6.0
-Homepage: https://nginx.net
+Homepage: https://nginx.org
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx
 Rules-Requires-Root: no

From ced892ac0d0422b6032915918d904d74266bc061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 5 Apr 2022 19:38:33 +0200
Subject: [PATCH 359/600] d/control: Add mips64el,ppc64,kfreebsd-amd64 to list
 of luajit platforms.

---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12a7a37..6938cd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nginx (1.18.0-9) UNRELEASED; urgency=medium
   * http-lua: Downgrade to 0.10.13 (Closes: #1008787).
   * http-lua: Backport upstream bugfix for segfault in nginx core >= 1.15.0
     when libnginx-mod-http-lua is loaded and init_worker_by_lua* is used.
+  * d/control: Add mips64el,ppc64,kfreebsd-amd64 to list of luajit platforms.
   * d/control: fix Homepage nginx.net -> nginx.org (Closes: #976158)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 05 Apr 2022 19:11:47 +0200
diff --git a/debian/control b/debian/control
index 158de5b..44b741e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends: debhelper-compat (= 13),
                libgd-dev,
                libgeoip-dev,
                libhiredis-dev,
-               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !armel !armhf !powerpc !powerpcspe !mips !mipsel !arm64 !ppc64el],
-               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel arm64 ppc64el],
+               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64 !ppc64el],
+               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64 ppc64el],
                libmaxminddb-dev,
                libmhash-dev,
                libpam0g-dev,

From c3be1137f3ca56d5a8e4c3f0c5351b14221f8c72 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Thu, 7 Apr 2022 15:35:33 -0400
Subject: [PATCH 360/600] Update watch file syntax for proper version
 matching/reporting

---
 debian/changelog | 6 ++++++
 debian/watch     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6938cd8..921ba09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
 nginx (1.18.0-9) UNRELEASED; urgency=medium
 
+  [ Jan Mojžíš ]
   * http-lua: Downgrade to 0.10.13 (Closes: #1008787).
   * http-lua: Backport upstream bugfix for segfault in nginx core >= 1.15.0
     when libnginx-mod-http-lua is loaded and init_worker_by_lua* is used.
   * d/control: Add mips64el,ppc64,kfreebsd-amd64 to list of luajit platforms.
   * d/control: fix Homepage nginx.net -> nginx.org (Closes: #976158)
 
+  [ Thomas Ward ]
+  * d/watch: Update watch syntax to match all even versions of NGINX releases
+    rather than use a watch syntax that is static to one specific version.
+    This will fix the untracked "New upstream stable versions" problem.
+
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 05 Apr 2022 19:11:47 +0200
 
 nginx (1.18.0-8) unstable; urgency=medium
diff --git a/debian/watch b/debian/watch
index 26440a9..86d8da1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
 opts=pgpsigurlmangle=s/$/.asc/ \
-https://nginx.org/download/nginx-(1\.18\.\d+)\.tar\.gz
+https://nginx.org/download/nginx-(\d+\.\d+[02468]\.\d+)\.tar\.gz

From 7e21f77a9033fdd9b86f16c79b3b26f02be5a146 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 12 Apr 2022 12:54:09 -0400
Subject: [PATCH 361/600] Update uploaders as Thomas Ward is now a maintainer
 in Salsa

---
 debian/changelog | 2 ++
 debian/control   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 921ba09..8dd544e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ nginx (1.18.0-9) UNRELEASED; urgency=medium
   * d/watch: Update watch syntax to match all even versions of NGINX releases
     rather than use a watch syntax that is static to one specific version.
     This will fix the untracked "New upstream stable versions" problem.
+  * d/control: Update 'uploaders' as Thomas Ward is now a maintainer in 
+    the Salsa repository.
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 05 Apr 2022 19:11:47 +0200
 
diff --git a/debian/control b/debian/control
index 44b741e..52b24de 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>,
            Ondřej Nový <onovy@debian.org>,
+           Thomas Ward <teward@ubuntu.com>,
 Build-Depends: debhelper-compat (= 13),
                dpkg-dev (>= 1.15.5),
                libexpat-dev,

From 2a278d9a5566eae406f7151b98dc2a9be8a5b899 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Thu, 14 Apr 2022 16:28:34 -0400
Subject: [PATCH 362/600] Release of 1.18.0-9

---
 debian/changelog | 2 +-
 debian/copyright | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dd544e..e65ef2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.18.0-9) UNRELEASED; urgency=medium
+nginx (1.18.0-9) unstable; urgency=medium
 
   [ Jan Mojžíš ]
   * http-lua: Downgrade to 0.10.13 (Closes: #1008787).
diff --git a/debian/copyright b/debian/copyright
index 03ef16d..f82fc2d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,7 +41,7 @@ Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
            2011       Dmitry E. Oboukhov <unera@debian.org>
            2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
            2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
-           2019-2020, Thomas Ward <teward@ubuntu.com>
+           2019-2022, Thomas Ward <teward@ubuntu.com>
            2020-2022, Ondřej Nový <onovy@debian.org>
 License: BSD-2-clause
 

From 5c35f1696fdb5521e72e0c0f79b3203140d34327 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 19 Apr 2022 09:50:28 -0400
Subject: [PATCH 363/600] New upstream version 1.20.2

---
 CHANGES                                       |  261 +++-
 CHANGES.ru                                    |  263 +++-
 LICENSE                                       |    4 +-
 auto/init                                     |    2 +
 auto/install                                  |    2 +
 auto/make                                     |   13 +-
 auto/module                                   |   44 +-
 auto/modules                                  |   16 +
 auto/options                                  |    5 +
 auto/os/linux                                 |   25 +
 auto/unix                                     |   79 +-
 configure                                     |    4 +
 contrib/vim/syntax/nginx.vim                  |  155 ++-
 man/nginx.8                                   |   13 +-
 src/core/nginx.c                              |   42 +-
 src/core/nginx.h                              |    4 +-
 src/core/ngx_buf.c                            |    8 +-
 src/core/ngx_buf.h                            |   20 +-
 src/core/ngx_conf_file.c                      |    2 +-
 src/core/ngx_connection.c                     |   41 +-
 src/core/ngx_connection.h                     |    3 +-
 src/core/ngx_cycle.c                          |   17 +-
 src/core/ngx_cycle.h                          |    2 +
 src/core/ngx_log.c                            |   19 +-
 src/core/ngx_log.h                            |    2 +-
 src/core/ngx_resolver.c                       |  100 +-
 src/core/ngx_string.c                         |   87 +-
 src/event/modules/ngx_eventport_module.c      |    2 +-
 src/event/ngx_event.c                         |    6 +-
 src/event/ngx_event_accept.c                  |    2 +
 src/event/ngx_event_connect.c                 |    2 +
 src/event/ngx_event_openssl.c                 |  395 +++++-
 src/event/ngx_event_openssl.h                 |   35 +
 src/event/ngx_event_openssl_stapling.c        | 1230 ++++++++++++++---
 src/event/ngx_event_pipe.c                    |   28 +
 src/event/ngx_event_udp.c                     |    2 +
 src/http/modules/ngx_http_fastcgi_module.c    |  136 +-
 src/http/modules/ngx_http_flv_module.c        |    6 -
 src/http/modules/ngx_http_grpc_module.c       |  167 ++-
 .../modules/ngx_http_gzip_filter_module.c     |   30 +-
 src/http/modules/ngx_http_limit_req_module.c  |   51 +-
 src/http/modules/ngx_http_memcached_module.c  |    9 +-
 src/http/modules/ngx_http_mp4_module.c        |    6 -
 src/http/modules/ngx_http_proxy_module.c      |  851 ++++++++++--
 src/http/modules/ngx_http_scgi_module.c       |   36 +
 .../modules/ngx_http_slice_filter_module.c    |    5 +
 src/http/modules/ngx_http_ssl_module.c        |  281 +++-
 src/http/modules/ngx_http_ssl_module.h        |    6 +
 .../modules/ngx_http_stub_status_module.c     |   10 -
 .../ngx_http_upstream_keepalive_module.c      |   16 +-
 .../modules/ngx_http_userid_filter_module.c   |   74 +
 src/http/modules/ngx_http_uwsgi_module.c      |   71 +
 .../modules/ngx_http_xslt_filter_module.c     |    1 +
 src/http/ngx_http.c                           |    5 +-
 src/http/ngx_http_cache.h                     |    3 +
 src/http/ngx_http_core_module.c               |   36 +-
 src/http/ngx_http_core_module.h               |    1 +
 src/http/ngx_http_file_cache.c                |   50 +-
 src/http/ngx_http_parse.c                     |   17 +
 src/http/ngx_http_request.c                   |  171 ++-
 src/http/ngx_http_request.h                   |    3 +
 src/http/ngx_http_request_body.c              |  208 ++-
 src/http/ngx_http_special_response.c          |    4 +
 src/http/ngx_http_upstream.c                  |   52 +-
 src/http/ngx_http_upstream.h                  |    3 +
 src/http/ngx_http_upstream_round_robin.c      |   20 +-
 src/http/ngx_http_upstream_round_robin.h      |    1 +
 src/http/ngx_http_variables.c                 |   36 +-
 src/http/v2/ngx_http_v2.c                     |  319 ++++-
 src/http/v2/ngx_http_v2.h                     |    2 +
 src/http/v2/ngx_http_v2_module.c              |  146 +-
 src/http/v2/ngx_http_v2_module.h              |    5 -
 src/mail/ngx_mail.c                           |    2 +
 src/mail/ngx_mail.h                           |    9 +-
 src/mail/ngx_mail_auth_http_module.c          |   78 +-
 src/mail/ngx_mail_core_module.c               |    5 +
 src/mail/ngx_mail_handler.c                   |  136 +-
 src/mail/ngx_mail_imap_handler.c              |   22 +-
 src/mail/ngx_mail_pop3_handler.c              |   22 +-
 src/mail/ngx_mail_proxy_module.c              |  260 +++-
 src/mail/ngx_mail_realip_module.c             |  269 ++++
 src/mail/ngx_mail_smtp_handler.c              |   22 +-
 src/mail/ngx_mail_ssl_module.c                |   32 +
 src/mail/ngx_mail_ssl_module.h                |    1 +
 src/misc/ngx_cpp_test_module.cpp              |    2 +
 src/os/unix/ngx_errno.c                       |  137 +-
 src/os/unix/ngx_files.c                       |   45 +
 src/os/unix/ngx_files.h                       |    6 +-
 src/os/unix/ngx_process_cycle.c               |   71 +-
 src/os/unix/ngx_udp_sendmsg_chain.c           |    7 +
 src/stream/ngx_stream_proxy_module.c          |   37 +-
 src/stream/ngx_stream_set_module.c            |  226 +++
 src/stream/ngx_stream_ssl_module.c            |   33 +
 src/stream/ngx_stream_ssl_module.h            |    1 +
 src/stream/ngx_stream_upstream_round_robin.c  |   20 +-
 src/stream/ngx_stream_upstream_round_robin.h  |    1 +
 src/stream/ngx_stream_write_filter_module.c   |    3 +-
 97 files changed, 6154 insertions(+), 1066 deletions(-)
 create mode 100644 src/mail/ngx_mail_realip_module.c
 create mode 100644 src/stream/ngx_stream_set_module.c

diff --git a/CHANGES b/CHANGES
index 6da9172..7881653 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,264 @@
 
-Changes with nginx 1.18.0                                        21 Apr 2020
+Changes with nginx 1.20.2                                        16 Nov 2021
 
-    *) 1.18.x stable branch.
+    *) Feature: OpenSSL 3.0 compatibility.
+
+    *) Bugfix: SSL variables might be empty when used in logs; the bug had
+       appeared in 1.19.5.
+
+    *) Bugfix: keepalive connections with gRPC backends might not be closed
+       after receiving a GOAWAY frame.
+
+    *) Bugfix: backend SSL connections in the stream module might hang after
+       an SSL handshake.
+
+    *) Bugfix: SSL connections with gRPC backends might hang if select,
+       poll, or /dev/poll methods were used.
+
+    *) Bugfix: in the $content_length variable when using chunked transfer
+       encoding.
+
+    *) Bugfix: requests might hang when using HTTP/2 and the "aio_write"
+       directive.
+
+
+Changes with nginx 1.20.1                                        25 May 2021
+
+    *) Security: 1-byte memory overwrite might occur during DNS server
+       response processing if the "resolver" directive was used, allowing an
+       attacker who is able to forge UDP packets from the DNS server to
+       cause worker process crash or, potentially, arbitrary code execution
+       (CVE-2021-23017).
+
+
+Changes with nginx 1.20.0                                        20 Apr 2021
+
+    *) 1.20.x stable branch.
+
+
+Changes with nginx 1.19.10                                       13 Apr 2021
+
+    *) Change: the default value of the "keepalive_requests" directive was
+       changed to 1000.
+
+    *) Feature: the "keepalive_time" directive.
+
+    *) Feature: the $connection_time variable.
+
+    *) Workaround: "gzip filter failed to use preallocated memory" alerts
+       appeared in logs when using zlib-ng.
+
+
+Changes with nginx 1.19.9                                        30 Mar 2021
+
+    *) Bugfix: nginx could not be built with the mail proxy module, but
+       without the ngx_mail_ssl_module; the bug had appeared in 1.19.8.
+
+    *) Bugfix: "upstream sent response body larger than indicated content
+       length" errors might occur when working with gRPC backends; the bug
+       had appeared in 1.19.1.
+
+    *) Bugfix: nginx might not close a connection till keepalive timeout
+       expiration if the connection was closed by the client while
+       discarding the request body.
+
+    *) Bugfix: nginx might not detect that a connection was already closed
+       by the client when waiting for auth_delay or limit_req delay, or when
+       working with backends.
+
+    *) Bugfix: in the eventport method.
+
+
+Changes with nginx 1.19.8                                        09 Mar 2021
+
+    *) Feature: flags in the "proxy_cookie_flags" directive can now contain
+       variables.
+
+    *) Feature: the "proxy_protocol" parameter of the "listen" directive,
+       the "proxy_protocol" and "set_real_ip_from" directives in mail proxy.
+
+    *) Bugfix: HTTP/2 connections were immediately closed when using
+       "keepalive_timeout 0"; the bug had appeared in 1.19.7.
+
+    *) Bugfix: some errors were logged as unknown if nginx was built with
+       glibc 2.32.
+
+    *) Bugfix: in the eventport method.
+
+
+Changes with nginx 1.19.7                                        16 Feb 2021
+
+    *) Change: connections handling in HTTP/2 has been changed to better
+       match HTTP/1.x; the "http2_recv_timeout", "http2_idle_timeout", and
+       "http2_max_requests" directives have been removed, the
+       "keepalive_timeout" and "keepalive_requests" directives should be
+       used instead.
+
+    *) Change: the "http2_max_field_size" and "http2_max_header_size"
+       directives have been removed, the "large_client_header_buffers"
+       directive should be used instead.
+
+    *) Feature: now, if free worker connections are exhausted, nginx starts
+       closing not only keepalive connections, but also connections in
+       lingering close.
+
+    *) Bugfix: "zero size buf in output" alerts might appear in logs if an
+       upstream server returned an incorrect response during unbuffered
+       proxying; the bug had appeared in 1.19.1.
+
+    *) Bugfix: HEAD requests were handled incorrectly if the "return"
+       directive was used with the "image_filter" or "xslt_stylesheet"
+       directives.
+
+    *) Bugfix: in the "add_trailer" directive.
+
+
+Changes with nginx 1.19.6                                        15 Dec 2020
+
+    *) Bugfix: "no live upstreams" errors if a "server" inside "upstream"
+       block was marked as "down".
+
+    *) Bugfix: a segmentation fault might occur in a worker process if HTTPS
+       was used; the bug had appeared in 1.19.5.
+
+    *) Bugfix: nginx returned the 400 response on requests like
+       "GET http://example.com?args HTTP/1.0".
+
+    *) Bugfix: in the ngx_http_flv_module and ngx_http_mp4_module.
+       Thanks to Chris Newton.
+
+
+Changes with nginx 1.19.5                                        24 Nov 2020
+
+    *) Feature: the -e switch.
+
+    *) Feature: the same source files can now be specified in different
+       modules while building addon modules.
+
+    *) Bugfix: SSL shutdown did not work when lingering close was used.
+
+    *) Bugfix: "upstream sent frame for closed stream" errors might occur
+       when working with gRPC backends.
+
+    *) Bugfix: in request body filters internal API.
+
+
+Changes with nginx 1.19.4                                        27 Oct 2020
+
+    *) Feature: the "ssl_conf_command", "proxy_ssl_conf_command",
+       "grpc_ssl_conf_command", and "uwsgi_ssl_conf_command" directives.
+
+    *) Feature: the "ssl_reject_handshake" directive.
+
+    *) Feature: the "proxy_smtp_auth" directive in mail proxy.
+
+
+Changes with nginx 1.19.3                                        29 Sep 2020
+
+    *) Feature: the ngx_stream_set_module.
+
+    *) Feature: the "proxy_cookie_flags" directive.
+
+    *) Feature: the "userid_flags" directive.
+
+    *) Bugfix: the "stale-if-error" cache control extension was erroneously
+       applied if backend returned a response with status code 500, 502,
+       503, 504, 403, 404, or 429.
+
+    *) Bugfix: "[crit] cache file ... has too long header" messages might
+       appear in logs if caching was used and the backend returned responses
+       with the "Vary" header line.
+
+    *) Workaround: "[crit] SSL_write() failed" messages might appear in logs
+       when using OpenSSL 1.1.1.
+
+    *) Bugfix: "SSL_shutdown() failed (SSL: ... bad write retry)" messages
+       might appear in logs; the bug had appeared in 1.19.2.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2 if errors with code 400 were redirected to a proxied
+       location using the "error_page" directive.
+
+    *) Bugfix: socket leak when using HTTP/2 and subrequests in the njs
+       module.
+
+
+Changes with nginx 1.19.2                                        11 Aug 2020
+
+    *) Change: now nginx starts closing keepalive connections before all
+       free worker connections are exhausted, and logs a warning about this
+       to the error log.
+
+    *) Change: optimization of client request body reading when using
+       chunked transfer encoding.
+
+    *) Bugfix: memory leak if the "ssl_ocsp" directive was used.
+
+    *) Bugfix: "zero size buf in output" alerts might appear in logs if a
+       FastCGI server returned an incorrect response; the bug had appeared
+       in 1.19.1.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if
+       different large_client_header_buffers sizes were used in different
+       virtual servers.
+
+    *) Bugfix: SSL shutdown might not work.
+
+    *) Bugfix: "SSL_shutdown() failed (SSL: ... bad write retry)" messages
+       might appear in logs.
+
+    *) Bugfix: in the ngx_http_slice_module.
+
+    *) Bugfix: in the ngx_http_xslt_filter_module.
+
+
+Changes with nginx 1.19.1                                        07 Jul 2020
+
+    *) Change: the "lingering_close", "lingering_time", and
+       "lingering_timeout" directives now work when using HTTP/2.
+
+    *) Change: now extra data sent by a backend are always discarded.
+
+    *) Change: now after receiving a too short response from a FastCGI
+       server nginx tries to send the available part of the response to the
+       client, and then closes the client connection.
+
+    *) Change: now after receiving a response with incorrect length from a
+       gRPC backend nginx stops response processing with an error.
+
+    *) Feature: the "min_free" parameter of the "proxy_cache_path",
+       "fastcgi_cache_path", "scgi_cache_path", and "uwsgi_cache_path"
+       directives.
+       Thanks to Adam Bambuch.
+
+    *) Bugfix: nginx did not delete unix domain listen sockets during
+       graceful shutdown on the SIGQUIT signal.
+
+    *) Bugfix: zero length UDP datagrams were not proxied.
+
+    *) Bugfix: proxying to uwsgi backends using SSL might not work.
+       Thanks to Guanzhong Chen.
+
+    *) Bugfix: in error handling when using the "ssl_ocsp" directive.
+
+    *) Bugfix: on XFS and NFS file systems disk cache size might be
+       calculated incorrectly.
+
+    *) Bugfix: "negative size buf in writer" alerts might appear in logs if
+       a memcached server returned a malformed response.
+
+
+Changes with nginx 1.19.0                                        26 May 2020
+
+    *) Feature: client certificate validation with OCSP.
+
+    *) Bugfix: "upstream sent frame for closed stream" errors might occur
+       when working with gRPC backends.
+
+    *) Bugfix: OCSP stapling might not work if the "resolver" directive was
+       not specified.
+
+    *) Bugfix: connections with incorrect HTTP/2 preface were not logged.
 
 
 Changes with nginx 1.17.10                                       14 Apr 2020
diff --git a/CHANGES.ru b/CHANGES.ru
index e430021..a766cc5 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,7 +1,266 @@
 
-Изменения в nginx 1.18.0                                          21.04.2020
+Изменения в nginx 1.20.2                                          16.11.2021
 
-    *) Стабильная ветка 1.18.x.
+    *) Добавление: совместимость с OpenSSL 3.0.
+
+    *) Исправление: SSL-переменные могли быть пустыми при записи в лог;
+       ошибка появилась в 1.19.5.
+
+    *) Исправление: keepalive-соединения с gRPC-бэкендами могли не
+       закрываться после получения GOAWAY-фрейма.
+
+    *) Исправление: SSL-соединения к бэкендам в модуле stream могли зависать
+       после SSL handshake.
+
+    *) Исправление: SSL-соединения с gRPC-бэкендами могли зависать, если
+       использовались методы select, poll или /dev/poll.
+
+    *) Исправление: в переменной $content_length при использовании chunked
+       transfer encoding.
+
+    *) Исправление: при использовании HTTP/2 и директивы aio_write запросы
+       могли зависать.
+
+
+Изменения в nginx 1.20.1                                          25.05.2021
+
+    *) Безопасность: при использовании директивы resolver во время обработки
+       ответа DNS-сервера могла происходить перезапись одного байта памяти,
+       что позволяло атакующему, имеющему возможность подделывать UDP-пакеты
+       от DNS-сервера, вызвать падение рабочего процесса или, потенциально,
+       выполнение произвольного кода (CVE-2021-23017).
+
+
+Изменения в nginx 1.20.0                                          20.04.2021
+
+    *) Стабильная ветка 1.20.x.
+
+
+Изменения в nginx 1.19.10                                         13.04.2021
+
+    *) Изменение: в директиве keepalive_requests значение по умолчанию
+       изменено на 1000.
+
+    *) Добавление: директива keepalive_time.
+
+    *) Добавление: переменная $connection_time.
+
+    *) Изменение: при использовании zlib-ng в логах появлялись сообщения
+       "gzip filter failed to use preallocated memory".
+
+
+Изменения в nginx 1.19.9                                          30.03.2021
+
+    *) Исправление: nginx не собирался с почтовым прокси-сервером, но без
+       модуля ngx_mail_ssl_module; ошибка появилась в 1.19.8.
+
+    *) Исправление: при работе с gRPC-бэкендами могли возникать ошибки
+       "upstream sent response body larger than indicated content length";
+       ошибка появилась в 1.19.1.
+
+    *) Исправление: если клиент закрывал соединение в момент отбрасывания
+       тела запроса, nginx мог не закрыть соединение до истечения
+       keepalive-таймаута.
+
+    *) Исправление: при ожидании задержки limit_req или auth_delay, а также
+       при работе с бэкендами nginx мог не обнаружить, что соединение уже
+       закрыто клиентом.
+
+    *) Исправление: в методе обработки соединений eventport.
+
+
+Изменения в nginx 1.19.8                                          09.03.2021
+
+    *) Добавление: в директиве proxy_cookie_flags теперь флаги можно
+       задавать с помощью переменных.
+
+    *) Добавление: параметр proxy_protocol в директиве listen, директивы
+       proxy_protocol и set_real_ip_from в почтовом прокси-сервере.
+
+    *) Исправление: HTTP/2-соединения сразу закрывались при использовании
+       "keepalive_timeout 0"; ошибка появилась в 1.19.7.
+
+    *) Исправление: некоторые ошибки логгировались как неизвестные, если
+       nginx был собран с glibc 2.32.
+
+    *) Исправление: в методе обработки соединений eventport.
+
+
+Изменения в nginx 1.19.7                                          16.02.2021
+
+    *) Изменение: обработка соединений в HTTP/2 была изменена и теперь более
+       соответствует HTTP/1.x; директивы http2_recv_timeout,
+       http2_idle_timeout и http2_max_requests упразднены, вместо них
+       следует использовать директивы keepalive_timeout и
+       keepalive_requests.
+
+    *) Изменение: директивы http2_max_field_size и http2_max_header_size
+       упразднены, вместо них следует использовать директиву
+       large_client_header_buffers.
+
+    *) Добавление: теперь при исчерпании свободных соединений nginx
+       закрывает не только keepalive-соединения, но и соединения в lingering
+       close.
+
+    *) Исправление: в логах могли появляться сообщения "zero size buf in
+       output", если бэкенд возвращал некорректный ответ при
+       небуферизированном проксировании; ошибка появилась в 1.19.1.
+
+    *) Исправление: при использовании директивы return вместе с image_filter
+       или xslt_stylesheet HEAD-запросы обрабатывались некорректно.
+
+    *) Исправление: в директиве add_trailer.
+
+
+Изменения в nginx 1.19.6                                          15.12.2020
+
+    *) Исправление: ошибки "no live upstreams", если server в блоке upstream
+       был помечен как down.
+
+    *) Исправление: при использовании HTTPS в рабочем процессе мог произойти
+       segmentation fault; ошибка появилась в 1.19.5.
+
+    *) Исправление: nginx возвращал ошибку 400 на запросы вида
+       "GET http://example.com?args HTTP/1.0".
+
+    *) Исправление: в модулях ngx_http_flv_module и ngx_http_mp4_module.
+       Спасибо Chris Newton.
+
+
+Изменения в nginx 1.19.5                                          24.11.2020
+
+    *) Добавление: ключ -e.
+
+    *) Добавление: при сборке дополнительных модулей теперь можно указывать
+       одни и те же исходные файлы в разных модулях.
+
+    *) Исправление: SSL shutdown не работал при закрытии соединений с
+       ожиданием дополнительных данных (lingering close).
+
+    *) Исправление: при работе с gRPC-бэкендами могли возникать ошибки
+       "upstream sent frame for closed stream".
+
+    *) Исправление: во внутреннем API для обработки тела запроса.
+
+
+Изменения в nginx 1.19.4                                          27.10.2020
+
+    *) Добавление: директивы ssl_conf_command, proxy_ssl_conf_command,
+       grpc_ssl_conf_command и uwsgi_ssl_conf_command.
+
+    *) Добавление: директива ssl_reject_handshake.
+
+    *) Добавление: директива proxy_smtp_auth в почтовом прокси-сервере.
+
+
+Изменения в nginx 1.19.3                                          29.09.2020
+
+    *) Добавление: модуль ngx_stream_set_module.
+
+    *) Добавление: директива proxy_cookie_flags.
+
+    *) Добавление: директива userid_flags.
+
+    *) Исправление: расширение управления кэшированием stale-if-error
+       ошибочно применялось, если бэкенд возвращал ответ с кодом 500, 502,
+       503, 504, 403, 404 или 429.
+
+    *) Исправление: если использовалось кэширование и бэкенд возвращал
+       ответы с строкой заголовка Vary, в логах могли появляться сообщения
+       "[crit] cache file ... has too long header".
+
+    *) Изменение: при использовании OpenSSL 1.1.1 в логах могли появляться
+       сообщения "[crit] SSL_write() failed".
+
+    *) Исправление: в логах могли появляться сообщения "SSL_shutdown()
+       failed (SSL: ... bad write retry)"; ошибка появилась в 1.19.2.
+
+    *) Исправление: при использовании HTTP/2 в рабочем процессе мог
+       произойти segmentation fault, если ошибки с кодом 400 с помощью
+       директивы error_page перенаправлялись в проксируемый location.
+
+    *) Исправление: утечки сокетов при использовании HTTP/2 и подзапросов в
+       модуле njs.
+
+
+Изменения в nginx 1.19.2                                          11.08.2020
+
+    *) Изменение: теперь nginx начинает закрывать keepalive-соединения, не
+       дожидаясь исчерпания всех свободных соединений, а также пишет об этом
+       предупреждение в лог ошибок.
+
+    *) Изменение: оптимизация чтения тела запроса при использовании chunked
+       transfer encoding.
+
+    *) Исправление: утечки памяти при использовании директивы ssl_ocsp.
+
+    *) Исправление: в логах могли появляться сообщения "zero size buf in
+       output", если FastCGI-сервер возвращал некорректный ответ; ошибка
+       появилась в 1.19.1.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если размеры large_client_header_buffers отличались в разных
+       виртуальных серверах.
+
+    *) Исправление: SSL shutdown мог не работать.
+
+    *) Исправление: в логах могли появляться сообщения "SSL_shutdown()
+       failed (SSL: ... bad write retry)".
+
+    *) Исправление: в модуле ngx_http_slice_module.
+
+    *) Исправление: в модуле ngx_http_xslt_filter_module.
+
+
+Изменения в nginx 1.19.1                                          07.07.2020
+
+    *) Изменение: директивы lingering_close, lingering_time и
+       lingering_timeout теперь работают при использовании HTTP/2.
+
+    *) Изменение: теперь лишние данные, присланные бэкендом, всегда
+       отбрасываются.
+
+    *) Изменение: теперь при получении слишком короткого ответа от
+       FastCGI-сервера nginx пытается отправить клиенту доступную часть
+       ответа, после чего закрывает соединение с клиентом.
+
+    *) Изменение: теперь при получении ответа некорректной длины от
+       gRPC-бэкенда nginx прекращает обработку ответа с ошибкой.
+
+    *) Добавление: параметр min_free в директивах proxy_cache_path,
+       fastcgi_cache_path, scgi_cache_path и uwsgi_cache_path.
+       Спасибо Adam Bambuch.
+
+    *) Исправление: nginx не удалял unix domain listen-сокеты при плавном
+       завершении по сигналу SIGQUIT.
+
+    *) Исправление: UDP-пакеты нулевого размера не проксировались.
+
+    *) Исправление: проксирование на uwsgi-бэкенды с использованием SSL
+       могло не работать.
+       Спасибо Guanzhong Chen.
+
+    *) Исправление: в обработке ошибок при использовании директивы ssl_ocsp.
+
+    *) Исправление: при использовании файловых систем XFS и NFS размер кэша
+       на диске мог считаться некорректно.
+
+    *) Исправление: если сервер memcached возвращал некорректный ответ, в
+       логах могли появляться сообщения "negative size buf in writer".
+
+
+Изменения в nginx 1.19.0                                          26.05.2020
+
+    *) Добавление: проверка клиентских сертификатов с помощью OCSP.
+
+    *) Исправление: при работе с gRPC-бэкендами могли возникать ошибки
+       "upstream sent frame for closed stream".
+
+    *) Исправление: OCSP stapling мог не работать, если не была указана
+       директива resolver.
+
+    *) Исправление: соединения с некорректным HTTP/2 preface не
+       логгировались.
 
 
 Изменения в nginx 1.17.10                                         14.04.2020
diff --git a/LICENSE b/LICENSE
index c63e0ba..fd0c72d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2002-2019 Igor Sysoev
- * Copyright (C) 2011-2019 Nginx, Inc.
+ * Copyright (C) 2002-2021 Igor Sysoev
+ * Copyright (C) 2011-2021 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/auto/init b/auto/init
index 910f529..f816dfc 100644
--- a/auto/init
+++ b/auto/init
@@ -48,4 +48,6 @@ default:	build
 
 clean:
 	rm -rf Makefile $NGX_OBJS
+
+.PHONY:	default clean
 END
diff --git a/auto/install b/auto/install
index d884487..c764fdd 100644
--- a/auto/install
+++ b/auto/install
@@ -215,4 +215,6 @@ upgrade:
 	test -f $NGX_PID_PATH.oldbin
 
 	kill -QUIT \`cat $NGX_PID_PATH.oldbin\`
+
+.PHONY:	build install modules upgrade
 END
diff --git a/auto/make b/auto/make
index 34c40cd..ef7c9f6 100644
--- a/auto/make
+++ b/auto/make
@@ -313,7 +313,7 @@ $ngx_obj:	\$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src
 END
 
         fi
-     done
+    done
 
 fi
 
@@ -343,7 +343,7 @@ $ngx_obj:	\$(CORE_DEPS) \$(MAIL_DEPS)$ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
 
 END
-     done
+    done
 
 fi
 
@@ -373,7 +373,7 @@ $ngx_obj:	\$(CORE_DEPS) \$(STREAM_DEPS)$ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
 
 END
-     done
+    done
 
 fi
 
@@ -399,7 +399,7 @@ $ngx_obj:	\$(CORE_DEPS) $ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
 
 END
-     done
+    done
 
 fi
 
@@ -431,7 +431,7 @@ $ngx_obj:	\$(ADDON_DEPS)$ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
 
 END
-     done
+    done
 
 fi
 
@@ -502,6 +502,7 @@ fi
 for ngx_module in $DYNAMIC_MODULES
 do
     eval ngx_module_srcs="\$${ngx_module}_SRCS"
+    eval ngx_module_shrd="\$${ngx_module}_SHRD"
     eval eval ngx_module_libs="\\\"\$${ngx_module}_LIBS\\\""
 
     eval ngx_module_modules="\$${ngx_module}_MODULES"
@@ -567,7 +568,7 @@ END
         | sed -e "s/\(.*\.\)c/\1$ngx_objext/"`
 
     ngx_module_objs=
-    for ngx_src in $ngx_module_srcs
+    for ngx_src in $ngx_module_srcs $ngx_module_shrd
     do
         case "$ngx_src" in
             src/*)
diff --git a/auto/module b/auto/module
index a2b578d..3857d04 100644
--- a/auto/module
+++ b/auto/module
@@ -17,7 +17,6 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
     done
 
     DYNAMIC_MODULES="$DYNAMIC_MODULES $ngx_module"
-    eval ${ngx_module}_SRCS=\"$ngx_module_srcs\"
 
     eval ${ngx_module}_MODULES=\"$ngx_module_name\"
 
@@ -31,6 +30,30 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
         eval ${ngx_module}_ORDER=\"$ngx_module_order\"
     fi
 
+    srcs=
+    shrd=
+    for src in $ngx_module_srcs
+    do
+        found=no
+        for old in $DYNAMIC_MODULES_SRCS
+        do
+            if [ $src = $old ]; then
+                found=yes
+                break
+            fi
+        done
+
+        if [ $found = no ]; then
+            srcs="$srcs $src"
+        else
+            shrd="$shrd $src"
+        fi
+    done
+    eval ${ngx_module}_SRCS=\"$srcs\"
+    eval ${ngx_module}_SHRD=\"$shrd\"
+
+    DYNAMIC_MODULES_SRCS="$DYNAMIC_MODULES_SRCS $srcs"
+
     if test -n "$ngx_module_incs"; then
         CORE_INCS="$CORE_INCS $ngx_module_incs"
     fi
@@ -107,7 +130,24 @@ elif [ "$ngx_module_link" = ADDON ]; then
     eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
                                       $ngx_module_name\"
 
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_module_srcs"
+    srcs=
+    for src in $ngx_module_srcs
+    do
+        found=no
+        for old in $NGX_ADDON_SRCS
+        do
+            if [ $src = $old ]; then
+                found=yes
+                break
+            fi
+        done
+
+        if [ $found = no ]; then
+            srcs="$srcs $src"
+        fi
+    done
+
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $srcs"
 
     if test -n "$ngx_module_incs"; then
         eval ${ngx_var}_INCS=\"\$${ngx_var}_INCS $ngx_module_incs\"
diff --git a/auto/modules b/auto/modules
index d78e282..f5a4597 100644
--- a/auto/modules
+++ b/auto/modules
@@ -985,6 +985,12 @@ if [ $MAIL != NO ]; then
     ngx_module_srcs=src/mail/ngx_mail_proxy_module.c
 
     . auto/module
+
+    ngx_module_name=ngx_mail_realip_module
+    ngx_module_deps=
+    ngx_module_srcs=src/mail/ngx_mail_realip_module.c
+
+    . auto/module
 fi
 
 
@@ -1119,6 +1125,16 @@ if [ $STREAM != NO ]; then
         . auto/module
     fi
 
+    if [ $STREAM_SET = YES ]; then
+        ngx_module_name=ngx_stream_set_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_set_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_SET
+
+        . auto/module
+    fi
+
     if [ $STREAM_UPSTREAM_HASH = YES ]; then
         ngx_module_name=ngx_stream_upstream_hash_module
         ngx_module_deps=
diff --git a/auto/options b/auto/options
index 521c976..80be906 100644
--- a/auto/options
+++ b/auto/options
@@ -124,6 +124,7 @@ STREAM_GEOIP=NO
 STREAM_MAP=YES
 STREAM_SPLIT_CLIENTS=YES
 STREAM_RETURN=YES
+STREAM_SET=YES
 STREAM_UPSTREAM_HASH=YES
 STREAM_UPSTREAM_LEAST_CONN=YES
 STREAM_UPSTREAM_RANDOM=YES
@@ -131,8 +132,10 @@ STREAM_UPSTREAM_ZONE=YES
 STREAM_SSL_PREREAD=NO
 
 DYNAMIC_MODULES=
+DYNAMIC_MODULES_SRCS=
 
 NGX_ADDONS=
+NGX_ADDON_SRCS=
 NGX_ADDON_DEPS=
 DYNAMIC_ADDONS=
 
@@ -324,6 +327,7 @@ use the \"--with-mail_ssl_module\" option instead"
         --without-stream_split_clients_module)
                                          STREAM_SPLIT_CLIENTS=NO    ;;
         --without-stream_return_module)  STREAM_RETURN=NO           ;;
+        --without-stream_set_module)     STREAM_SET=NO              ;;
         --without-stream_upstream_hash_module)
                                          STREAM_UPSTREAM_HASH=NO    ;;
         --without-stream_upstream_least_conn_module)
@@ -538,6 +542,7 @@ cat << END
   --without-stream_split_clients_module
                                      disable ngx_stream_split_clients_module
   --without-stream_return_module     disable ngx_stream_return_module
+  --without-stream_set_module        disable ngx_stream_set_module
   --without-stream_upstream_hash_module
                                      disable ngx_stream_upstream_hash_module
   --without-stream_upstream_least_conn_module
diff --git a/auto/os/linux b/auto/os/linux
index 5e280ec..74b5870 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -86,6 +86,31 @@ if [ $ngx_found = yes ]; then
                       ee.data.ptr = NULL;
                       epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ee)"
     . auto/feature
+
+
+    # eventfd()
+
+    ngx_feature="eventfd()"
+    ngx_feature_name="NGX_HAVE_EVENTFD"
+    ngx_feature_run=no
+    ngx_feature_incs="#include <sys/eventfd.h>"
+    ngx_feature_path=
+    ngx_feature_libs=
+    ngx_feature_test="(void) eventfd(0, 0)"
+    . auto/feature
+
+    if [ $ngx_found = yes ]; then
+        have=NGX_HAVE_SYS_EVENTFD_H . auto/have
+    fi
+
+
+    if [ $ngx_found = no ]; then
+
+        ngx_feature="eventfd() (SYS_eventfd)"
+        ngx_feature_incs="#include <sys/syscall.h>"
+        ngx_feature_test="(void) SYS_eventfd"
+        . auto/feature
+    fi
 fi
 
 
diff --git a/auto/unix b/auto/unix
index ff9697a..8671019 100644
--- a/auto/unix
+++ b/auto/unix
@@ -582,29 +582,6 @@ Currently file AIO is supported on FreeBSD 4.3+ and Linux 2.6.22+ only
 END
         exit 1
     fi
-
-else
-
-    ngx_feature="eventfd()"
-    ngx_feature_name="NGX_HAVE_EVENTFD"
-    ngx_feature_run=no
-    ngx_feature_incs="#include <sys/eventfd.h>"
-    ngx_feature_path=
-    ngx_feature_libs=
-    ngx_feature_test="(void) eventfd(0, 0)"
-    . auto/feature
-
-    if [ $ngx_found = yes ]; then
-        have=NGX_HAVE_SYS_EVENTFD_H . auto/have
-    fi
-
-    if [ $ngx_found = no ]; then
-
-        ngx_feature="eventfd() (SYS_eventfd)"
-        ngx_feature_incs="#include <sys/syscall.h>"
-        ngx_feature_test="(void) SYS_eventfd"
-        . auto/feature
-    fi
 fi
 
 
@@ -727,17 +704,33 @@ ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n;
 . auto/feature
 
 
-ngx_feature="sys_nerr"
-ngx_feature_name="NGX_SYS_NERR"
-ngx_feature_run=value
-ngx_feature_incs='#include <errno.h>
-                  #include <stdio.h>'
+# strerrordesc_np(), introduced in glibc 2.32
+
+ngx_feature="strerrordesc_np()"
+ngx_feature_name="NGX_HAVE_STRERRORDESC_NP"
+ngx_feature_run=no
+ngx_feature_incs='#include <string.h>'
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test='printf("%d", sys_nerr);'
+ngx_feature_test="char *p; p = strerrordesc_np(0);
+                  if (p == NULL) return 1"
 . auto/feature
 
 
+if [ $ngx_found = no ]; then
+
+    ngx_feature="sys_nerr"
+    ngx_feature_name="NGX_SYS_NERR"
+    ngx_feature_run=value
+    ngx_feature_incs='#include <errno.h>
+                      #include <stdio.h>'
+    ngx_feature_path=
+    ngx_feature_libs=
+    ngx_feature_test='printf("%d", sys_nerr);'
+    . auto/feature
+fi
+
+
 if [ $ngx_found = no ]; then
 
     # Cygiwn defines _sys_nerr
@@ -753,34 +746,6 @@ if [ $ngx_found = no ]; then
 fi
 
 
-if [ $ngx_found = no ]; then
-
-    # Solaris has no sys_nerr
-    ngx_feature='maximum errno'
-    ngx_feature_name=NGX_SYS_NERR
-    ngx_feature_run=value
-    ngx_feature_incs='#include <errno.h>
-                      #include <string.h>
-                      #include <stdio.h>'
-    ngx_feature_path=
-    ngx_feature_libs=
-    ngx_feature_test='int  n;
-                      char *p;
-                      for (n = 1; n < 1000; n++) {
-                          errno = 0;
-                          p = strerror(n);
-                          if (errno == EINVAL
-                              || p == NULL
-                              || strncmp(p, "Unknown error", 13) == 0)
-                          {
-                              break;
-                          }
-                      }
-                      printf("%d", n);'
-    . auto/feature
-fi
-
-
 ngx_feature="localtime_r()"
 ngx_feature_name="NGX_HAVE_LOCALTIME_R"
 ngx_feature_run=no
diff --git a/configure b/configure
index 7e6e33a..474d69e 100755
--- a/configure
+++ b/configure
@@ -87,6 +87,10 @@ have=NGX_PID_PATH value="\"$NGX_PID_PATH\"" . auto/define
 have=NGX_LOCK_PATH value="\"$NGX_LOCK_PATH\"" . auto/define
 have=NGX_ERROR_LOG_PATH value="\"$NGX_ERROR_LOG_PATH\"" . auto/define
 
+if [ ".$NGX_ERROR_LOG_PATH" = "." ]; then
+    have=NGX_ERROR_LOG_STDERR . auto/have
+fi
+
 have=NGX_HTTP_LOG_PATH value="\"$NGX_HTTP_LOG_PATH\"" . auto/define
 have=NGX_HTTP_CLIENT_TEMP_PATH value="\"$NGX_HTTP_CLIENT_TEMP_PATH\""
 . auto/define
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 1a3a7b7..88ec847 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -141,6 +141,7 @@ syn keyword ngxDirective contained ancient_browser_value
 syn keyword ngxDirective contained api
 syn keyword ngxDirective contained auth_basic
 syn keyword ngxDirective contained auth_basic_user_file
+syn keyword ngxDirective contained auth_delay
 syn keyword ngxDirective contained auth_http
 syn keyword ngxDirective contained auth_http_header
 syn keyword ngxDirective contained auth_http_pass_client_cert
@@ -267,6 +268,7 @@ syn keyword ngxDirective contained grpc_socket_keepalive
 syn keyword ngxDirective contained grpc_ssl_certificate
 syn keyword ngxDirective contained grpc_ssl_certificate_key
 syn keyword ngxDirective contained grpc_ssl_ciphers
+syn keyword ngxDirective contained grpc_ssl_conf_command
 syn keyword ngxDirective contained grpc_ssl_crl
 syn keyword ngxDirective contained grpc_ssl_name
 syn keyword ngxDirective contained grpc_ssl_password_file
@@ -332,6 +334,7 @@ syn keyword ngxDirective contained ip_hash
 syn keyword ngxDirective contained js_access
 syn keyword ngxDirective contained js_content
 syn keyword ngxDirective contained js_filter
+syn keyword ngxDirective contained js_import
 syn keyword ngxDirective contained js_include
 syn keyword ngxDirective contained js_path
 syn keyword ngxDirective contained js_preread
@@ -348,6 +351,7 @@ syn keyword ngxDirective contained large_client_header_buffers
 syn keyword ngxDirective contained least_conn
 syn keyword ngxDirective contained least_time
 syn keyword ngxDirective contained limit_conn
+syn keyword ngxDirective contained limit_conn_dry_run
 syn keyword ngxDirective contained limit_conn_log_level
 syn keyword ngxDirective contained limit_conn_status
 syn keyword ngxDirective contained limit_conn_zone
@@ -444,6 +448,7 @@ syn keyword ngxDirective contained proxy_cache_use_stale
 syn keyword ngxDirective contained proxy_cache_valid
 syn keyword ngxDirective contained proxy_connect_timeout
 syn keyword ngxDirective contained proxy_cookie_domain
+syn keyword ngxDirective contained proxy_cookie_flags
 syn keyword ngxDirective contained proxy_cookie_path
 syn keyword ngxDirective contained proxy_download_rate
 syn keyword ngxDirective contained proxy_force_ranges
@@ -477,11 +482,13 @@ syn keyword ngxDirective contained proxy_send_timeout
 syn keyword ngxDirective contained proxy_session_drop
 syn keyword ngxDirective contained proxy_set_body
 syn keyword ngxDirective contained proxy_set_header
+syn keyword ngxDirective contained proxy_smtp_auth
 syn keyword ngxDirective contained proxy_socket_keepalive
 syn keyword ngxDirective contained proxy_ssl
 syn keyword ngxDirective contained proxy_ssl_certificate
 syn keyword ngxDirective contained proxy_ssl_certificate_key
 syn keyword ngxDirective contained proxy_ssl_ciphers
+syn keyword ngxDirective contained proxy_ssl_conf_command
 syn keyword ngxDirective contained proxy_ssl_crl
 syn keyword ngxDirective contained proxy_ssl_name
 syn keyword ngxDirective contained proxy_ssl_password_file
@@ -589,16 +596,21 @@ syn keyword ngxDirective contained ssl_certificate
 syn keyword ngxDirective contained ssl_certificate_key
 syn keyword ngxDirective contained ssl_ciphers
 syn keyword ngxDirective contained ssl_client_certificate
+syn keyword ngxDirective contained ssl_conf_command
 syn keyword ngxDirective contained ssl_crl
 syn keyword ngxDirective contained ssl_dhparam
 syn keyword ngxDirective contained ssl_early_data
 syn keyword ngxDirective contained ssl_ecdh_curve
 syn keyword ngxDirective contained ssl_engine
 syn keyword ngxDirective contained ssl_handshake_timeout
+syn keyword ngxDirective contained ssl_ocsp
+syn keyword ngxDirective contained ssl_ocsp_cache
+syn keyword ngxDirective contained ssl_ocsp_responder
 syn keyword ngxDirective contained ssl_password_file
 syn keyword ngxDirective contained ssl_prefer_server_ciphers
 syn keyword ngxDirective contained ssl_preread
 syn keyword ngxDirective contained ssl_protocols
+syn keyword ngxDirective contained ssl_reject_handshake
 syn keyword ngxDirective contained ssl_session_cache
 syn keyword ngxDirective contained ssl_session_ticket_key
 syn keyword ngxDirective contained ssl_session_tickets
@@ -637,6 +649,7 @@ syn keyword ngxDirective contained user
 syn keyword ngxDirective contained userid
 syn keyword ngxDirective contained userid_domain
 syn keyword ngxDirective contained userid_expires
+syn keyword ngxDirective contained userid_flags
 syn keyword ngxDirective contained userid_mark
 syn keyword ngxDirective contained userid_name
 syn keyword ngxDirective contained userid_p3p
@@ -687,6 +700,7 @@ syn keyword ngxDirective contained uwsgi_socket_keepalive
 syn keyword ngxDirective contained uwsgi_ssl_certificate
 syn keyword ngxDirective contained uwsgi_ssl_certificate_key
 syn keyword ngxDirective contained uwsgi_ssl_ciphers
+syn keyword ngxDirective contained uwsgi_ssl_conf_command
 syn keyword ngxDirective contained uwsgi_ssl_crl
 syn keyword ngxDirective contained uwsgi_ssl_name
 syn keyword ngxDirective contained uwsgi_ssl_password_file
@@ -732,6 +746,7 @@ syn keyword ngxDirective contained zone_sync_ssl
 syn keyword ngxDirective contained zone_sync_ssl_certificate
 syn keyword ngxDirective contained zone_sync_ssl_certificate_key
 syn keyword ngxDirective contained zone_sync_ssl_ciphers
+syn keyword ngxDirective contained zone_sync_ssl_conf_command
 syn keyword ngxDirective contained zone_sync_ssl_crl
 syn keyword ngxDirective contained zone_sync_ssl_name
 syn keyword ngxDirective contained zone_sync_ssl_password_file
@@ -770,6 +785,7 @@ syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal
 syn keyword ngxDirectiveThirdParty contained auth_gss_force_realm
 syn keyword ngxDirectiveThirdParty contained auth_gss_format_full
 syn keyword ngxDirectiveThirdParty contained auth_gss_keytab
+syn keyword ngxDirectiveThirdParty contained auth_gss_map_to_local
 syn keyword ngxDirectiveThirdParty contained auth_gss_realm
 syn keyword ngxDirectiveThirdParty contained auth_gss_service_name
 
@@ -791,8 +807,8 @@ syn keyword ngxDirectiveThirdParty contained auth_pam_set_pam_env
 
 " AJP protocol proxy
 " https://github.com/yaoweibin/nginx_ajp_module
-syn keyword ngxDirectiveThirdParty contained ajp_buffer_size
 syn keyword ngxDirectiveThirdParty contained ajp_buffers
+syn keyword ngxDirectiveThirdParty contained ajp_buffer_size
 syn keyword ngxDirectiveThirdParty contained ajp_busy_buffers_size
 syn keyword ngxDirectiveThirdParty contained ajp_cache
 syn keyword ngxDirectiveThirdParty contained ajp_cache_key
@@ -818,6 +834,7 @@ syn keyword ngxDirectiveThirdParty contained ajp_pass_header
 syn keyword ngxDirectiveThirdParty contained ajp_pass_request_body
 syn keyword ngxDirectiveThirdParty contained ajp_pass_request_headers
 syn keyword ngxDirectiveThirdParty contained ajp_read_timeout
+syn keyword ngxDirectiveThirdParty contained ajp_secret
 syn keyword ngxDirectiveThirdParty contained ajp_send_lowat
 syn keyword ngxDirectiveThirdParty contained ajp_send_timeout
 syn keyword ngxDirectiveThirdParty contained ajp_store
@@ -854,8 +871,8 @@ syn keyword ngxDirectiveThirdParty contained content_handler_property
 syn keyword ngxDirectiveThirdParty contained content_handler_type
 syn keyword ngxDirectiveThirdParty contained handler_code
 syn keyword ngxDirectiveThirdParty contained handler_name
-syn keyword ngxDirectiveThirdParty contained handler_type
 syn keyword ngxDirectiveThirdParty contained handlers_lazy_init
+syn keyword ngxDirectiveThirdParty contained handler_type
 syn keyword ngxDirectiveThirdParty contained header_filter_code
 syn keyword ngxDirectiveThirdParty contained header_filter_name
 syn keyword ngxDirectiveThirdParty contained header_filter_property
@@ -871,6 +888,10 @@ syn keyword ngxDirectiveThirdParty contained jvm_options
 syn keyword ngxDirectiveThirdParty contained jvm_path
 syn keyword ngxDirectiveThirdParty contained jvm_var
 syn keyword ngxDirectiveThirdParty contained jvm_workers
+syn keyword ngxDirectiveThirdParty contained log_handler_code
+syn keyword ngxDirectiveThirdParty contained log_handler_name
+syn keyword ngxDirectiveThirdParty contained log_handler_property
+syn keyword ngxDirectiveThirdParty contained log_handler_type
 syn keyword ngxDirectiveThirdParty contained max_balanced_tcp_connections
 syn keyword ngxDirectiveThirdParty contained rewrite_handler_code
 syn keyword ngxDirectiveThirdParty contained rewrite_handler_name
@@ -879,6 +900,7 @@ syn keyword ngxDirectiveThirdParty contained rewrite_handler_type
 syn keyword ngxDirectiveThirdParty contained shared_map
 syn keyword ngxDirectiveThirdParty contained write_page_size
 
+
 " Certificate Transparency
 " https://github.com/grahamedgecombe/nginx-ct
 syn keyword ngxDirectiveThirdParty contained ssl_ct
@@ -942,6 +964,7 @@ syn keyword ngxDirectiveThirdParty contained fancyindex_hide_symlinks
 syn keyword ngxDirectiveThirdParty contained fancyindex_ignore
 syn keyword ngxDirectiveThirdParty contained fancyindex_localtime
 syn keyword ngxDirectiveThirdParty contained fancyindex_name_length
+syn keyword ngxDirectiveThirdParty contained fancyindex_show_dotfiles
 syn keyword ngxDirectiveThirdParty contained fancyindex_show_path
 syn keyword ngxDirectiveThirdParty contained fancyindex_time_format
 
@@ -991,8 +1014,8 @@ syn keyword ngxDirectiveThirdParty contained nchan_benchmark_publisher_distribut
 syn keyword ngxDirectiveThirdParty contained nchan_benchmark_subscriber_distribution
 syn keyword ngxDirectiveThirdParty contained nchan_benchmark_subscribers_per_channel
 syn keyword ngxDirectiveThirdParty contained nchan_benchmark_time
-syn keyword ngxDirectiveThirdParty contained nchan_channel_event_string
 syn keyword ngxDirectiveThirdParty contained nchan_channel_events_channel_id
+syn keyword ngxDirectiveThirdParty contained nchan_channel_event_string
 syn keyword ngxDirectiveThirdParty contained nchan_channel_group
 syn keyword ngxDirectiveThirdParty contained nchan_channel_group_accounting
 syn keyword ngxDirectiveThirdParty contained nchan_channel_id
@@ -1000,6 +1023,10 @@ syn keyword ngxDirectiveThirdParty contained nchan_channel_id_split_delimiter
 syn keyword ngxDirectiveThirdParty contained nchan_channel_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_deflate_message_for_websocket
 syn keyword ngxDirectiveThirdParty contained nchan_eventsource_event
+syn keyword ngxDirectiveThirdParty contained nchan_eventsource_ping_comment
+syn keyword ngxDirectiveThirdParty contained nchan_eventsource_ping_data
+syn keyword ngxDirectiveThirdParty contained nchan_eventsource_ping_event
+syn keyword ngxDirectiveThirdParty contained nchan_eventsource_ping_interval
 syn keyword ngxDirectiveThirdParty contained nchan_group_location
 syn keyword ngxDirectiveThirdParty contained nchan_group_max_channels
 syn keyword ngxDirectiveThirdParty contained nchan_group_max_messages
@@ -1047,10 +1074,10 @@ syn keyword ngxDirectiveThirdParty contained nchan_store_messages
 syn keyword ngxDirectiveThirdParty contained nchan_stub_status
 syn keyword ngxDirectiveThirdParty contained nchan_sub_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_subscribe_existing_channels_only
-syn keyword ngxDirectiveThirdParty contained nchan_subscribe_request
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_compound_etag_message_id
+syn keyword ngxDirectiveThirdParty contained nchan_subscribe_request
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_first_message
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_http_raw_stream_separator
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_last_message_id
@@ -1311,6 +1338,8 @@ syn keyword ngxDirectiveThirdParty contained body_filter_by_lua_file
 syn keyword ngxDirectiveThirdParty contained content_by_lua
 syn keyword ngxDirectiveThirdParty contained content_by_lua_block
 syn keyword ngxDirectiveThirdParty contained content_by_lua_file
+syn keyword ngxDirectiveThirdParty contained exit_worker_by_lua_block
+syn keyword ngxDirectiveThirdParty contained exit_worker_by_lua_file
 syn keyword ngxDirectiveThirdParty contained header_filter_by_lua
 syn keyword ngxDirectiveThirdParty contained header_filter_by_lua_block
 syn keyword ngxDirectiveThirdParty contained header_filter_by_lua_file
@@ -1352,6 +1381,7 @@ syn keyword ngxDirectiveThirdParty contained lua_ssl_crl
 syn keyword ngxDirectiveThirdParty contained lua_ssl_protocols
 syn keyword ngxDirectiveThirdParty contained lua_ssl_trusted_certificate
 syn keyword ngxDirectiveThirdParty contained lua_ssl_verify_depth
+syn keyword ngxDirectiveThirdParty contained lua_thread_cache_max_entries
 syn keyword ngxDirectiveThirdParty contained lua_transform_underscores_in_response_headers
 syn keyword ngxDirectiveThirdParty contained lua_use_default_type
 syn keyword ngxDirectiveThirdParty contained rewrite_by_lua
@@ -1987,11 +2017,7 @@ syn keyword ngxDirectiveThirdParty contained concat_unique
 " update upstreams' config by restful interface
 " https://github.com/yzprofile/ngx_http_dyups_module
 syn keyword ngxDirectiveThirdParty contained dyups_interface
-syn keyword ngxDirectiveThirdParty contained dyups_read_msg_log
-syn keyword ngxDirectiveThirdParty contained dyups_read_msg_timeout
 syn keyword ngxDirectiveThirdParty contained dyups_shm_zone_size
-syn keyword ngxDirectiveThirdParty contained dyups_trylock
-syn keyword ngxDirectiveThirdParty contained dyups_upstream_conf
 
 " add given content to the end of the response according to the condition specified
 " https://github.com/flygoast/ngx_http_footer_if_filter
@@ -2271,6 +2297,7 @@ syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie_i
 syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie_key
 syn keyword ngxDirectiveThirdParty contained testcookie_refresh_status
 syn keyword ngxDirectiveThirdParty contained testcookie_refresh_template
+syn keyword ngxDirectiveThirdParty contained testcookie_samesite
 syn keyword ngxDirectiveThirdParty contained testcookie_secret
 syn keyword ngxDirectiveThirdParty contained testcookie_secure_flag
 syn keyword ngxDirectiveThirdParty contained testcookie_session
@@ -2308,31 +2335,105 @@ syn keyword ngxDirectiveThirdParty contained user_agent
 " https://github.com/flygoast/ngx_http_upstream_ketama_chash
 syn keyword ngxDirectiveThirdParty contained ketama_chash
 
+" nginx-sticky-module-ng
+" https://github.com/ayty-adrianomartins/nginx-sticky-module-ng
+syn keyword ngxDirectiveThirdParty contained sticky_no_fallback
+
+" dynamic linking and call the function of your application
+" https://github.com/Taymindis/nginx-link-function
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_add_prop
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_add_req_header
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_ca_cert
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_call
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_download_link_lib
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_lib
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_shm_size
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_subrequest
+
+" purge content from FastCGI, proxy, SCGI and uWSGI caches
+" https://github.com/torden/ngx_cache_purge
+syn keyword ngxDirectiveThirdParty contained cache_purge_response_type
+
+" set the flags "HttpOnly", "secure" and "SameSite" for cookies
+" https://github.com/AirisX/nginx_cookie_flag_module
+syn keyword ngxDirectiveThirdParty contained set_cookie_flag
+
+" Embed websockify into Nginx (convert any tcp connection into websocket)
+" https://github.com/tg123/websockify-nginx-module
+syn keyword ngxDirectiveThirdParty contained websockify_buffer_size
+syn keyword ngxDirectiveThirdParty contained websockify_connect_timeout
+syn keyword ngxDirectiveThirdParty contained websockify_pass
+syn keyword ngxDirectiveThirdParty contained websockify_read_timeout
+syn keyword ngxDirectiveThirdParty contained websockify_send_timeout
+
+" IP2Location Nginx
+" https://github.com/ip2location/ip2location-nginx
+syn keyword ngxDirectiveThirdParty contained ip2location_proxy
+syn keyword ngxDirectiveThirdParty contained ip2location_proxy_recursive
+syn keyword ngxDirectiveThirdParty contained ip2location_areacode
+syn keyword ngxDirectiveThirdParty contained ip2location_city
+syn keyword ngxDirectiveThirdParty contained ip2location_country_long
+syn keyword ngxDirectiveThirdParty contained ip2location_country_short
+syn keyword ngxDirectiveThirdParty contained ip2location_domain
+syn keyword ngxDirectiveThirdParty contained ip2location_elevation
+syn keyword ngxDirectiveThirdParty contained ip2location_iddcode
+syn keyword ngxDirectiveThirdParty contained ip2location_isp
+syn keyword ngxDirectiveThirdParty contained ip2location_latitude
+syn keyword ngxDirectiveThirdParty contained ip2location_longitude
+syn keyword ngxDirectiveThirdParty contained ip2location_mcc
+syn keyword ngxDirectiveThirdParty contained ip2location_mnc
+syn keyword ngxDirectiveThirdParty contained ip2location_mobilebrand
+syn keyword ngxDirectiveThirdParty contained ip2location_netspeed
+syn keyword ngxDirectiveThirdParty contained ip2location_region
+syn keyword ngxDirectiveThirdParty contained ip2location_timezone
+syn keyword ngxDirectiveThirdParty contained ip2location_usagetype
+syn keyword ngxDirectiveThirdParty contained ip2location_weatherstationcode
+syn keyword ngxDirectiveThirdParty contained ip2location_weatherstationname
+syn keyword ngxDirectiveThirdParty contained ip2location_zipcode
+
+" IP2Proxy module for Nginx
+" https://github.com/ip2location/ip2proxy-nginx
+syn keyword ngxDirectiveThirdParty contained ip2proxy_as
+syn keyword ngxDirectiveThirdParty contained ip2proxy_asn
+syn keyword ngxDirectiveThirdParty contained ip2proxy_city
+syn keyword ngxDirectiveThirdParty contained ip2proxy_country_long
+syn keyword ngxDirectiveThirdParty contained ip2proxy_country_short
+syn keyword ngxDirectiveThirdParty contained ip2proxy_database
+syn keyword ngxDirectiveThirdParty contained ip2proxy_domain
+syn keyword ngxDirectiveThirdParty contained ip2proxy_isp
+syn keyword ngxDirectiveThirdParty contained ip2proxy_is_proxy
+syn keyword ngxDirectiveThirdParty contained ip2proxy_last_seen
+syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy
+syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy_recursive
+syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy_type
+syn keyword ngxDirectiveThirdParty contained ip2proxy_region
+syn keyword ngxDirectiveThirdParty contained ip2proxy_threat
+syn keyword ngxDirectiveThirdParty contained ip2proxy_usage_type
 
 
 
 " highlight
 
-hi link ngxComment Comment
-hi link ngxParamComment Comment
-hi link ngxListenComment Comment
-hi link ngxVariable Identifier
-hi link ngxVariableString PreProc
-hi link ngxString String
-hi link ngxListenString String
+hi def link ngxComment Comment
+hi def link ngxParamComment Comment
+hi def link ngxListenComment Comment
+hi def link ngxVariable Identifier
+hi def link ngxVariableString PreProc
+hi def link ngxString String
+hi def link ngxListenString String
 
-hi link ngxBoolean Boolean
-hi link ngxDirectiveBlock Statement
-hi link ngxDirectiveImportant Type
-hi link ngxDirectiveListen Type
-hi link ngxDirectiveControl Keyword
-hi link ngxDirectiveError Constant
-hi link ngxDirectiveDeprecated Error
-hi link ngxDirective Identifier
-hi link ngxDirectiveThirdParty Special
-hi link ngxDirectiveThirdPartyDeprecated Error
+hi def link ngxBoolean Boolean
+hi def link ngxDirectiveBlock Statement
+hi def link ngxDirectiveImportant Type
+hi def link ngxDirectiveListen Type
+hi def link ngxDirectiveControl Keyword
+hi def link ngxDirectiveError Constant
+hi def link ngxDirectiveDeprecated Error
+hi def link ngxDirective Identifier
+hi def link ngxDirectiveThirdParty Special
+hi def link ngxDirectiveThirdPartyDeprecated Error
 
-hi link ngxListenOptions Keyword
-hi link ngxListenOptionsDeprecated Error
+hi def link ngxListenOptions Keyword
+hi def link ngxListenOptionsDeprecated Error
 
 let b:current_syntax = "nginx"
diff --git a/man/nginx.8 b/man/nginx.8
index 573d935..10db3e6 100644
--- a/man/nginx.8
+++ b/man/nginx.8
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd December 5, 2019
+.Dd November 5, 2020
 .Dt NGINX 8
 .Os
 .Sh NAME
@@ -35,6 +35,7 @@
 .Nm
 .Op Fl ?hqTtVv
 .Op Fl c Ar file
+.Op Fl e Ar file
 .Op Fl g Ar directives
 .Op Fl p Ar prefix
 .Op Fl s Ar signal
@@ -54,6 +55,12 @@ Print help.
 .It Fl c Ar file
 Use an alternative configuration
 .Ar file .
+.It Fl e Ar file
+Use an alternative error log
+.Ar file .
+Special value
+.Cm stderr
+indicates that the standard error output should be used.
 .It Fl g Ar directives
 Set global configuration directives.
 See
@@ -198,10 +205,10 @@ Development of
 started in 2002, with the first public release on October 4, 2004.
 .Sh AUTHORS
 .An -nosplit
-.An Igor Sysoev Aq igor@sysoev.ru .
+.An Igor Sysoev Aq Mt igor@sysoev.ru .
 .Pp
 This manual page was originally written by
-.An Sergey A. Osokin Aq osa@FreeBSD.org.ru
+.An Sergey A. Osokin Aq Mt osa@FreeBSD.org.ru
 as a result of compiling many
 .Nm
 documents from all over the world.
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 9fcb0eb..48a20e9 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -183,6 +183,7 @@ static ngx_uint_t   ngx_show_help;
 static ngx_uint_t   ngx_show_version;
 static ngx_uint_t   ngx_show_configure;
 static u_char      *ngx_prefix;
+static u_char      *ngx_error_log;
 static u_char      *ngx_conf_file;
 static u_char      *ngx_conf_params;
 static char        *ngx_signal;
@@ -230,7 +231,7 @@ main(int argc, char *const *argv)
     ngx_pid = ngx_getpid();
     ngx_parent = ngx_getppid();
 
-    log = ngx_log_init(ngx_prefix);
+    log = ngx_log_init(ngx_prefix, ngx_error_log);
     if (log == NULL) {
         return 1;
     }
@@ -393,9 +394,9 @@ ngx_show_version_info(void)
 
     if (ngx_show_help) {
         ngx_write_stderr(
-            "Usage: nginx [-?hvVtTq] [-s signal] [-c filename] "
-                         "[-p prefix] [-g directives]" NGX_LINEFEED
-                         NGX_LINEFEED
+            "Usage: nginx [-?hvVtTq] [-s signal] [-p prefix]" NGX_LINEFEED
+            "             [-e filename] [-c filename] [-g directives]"
+                          NGX_LINEFEED NGX_LINEFEED
             "Options:" NGX_LINEFEED
             "  -?,-h         : this help" NGX_LINEFEED
             "  -v            : show version and exit" NGX_LINEFEED
@@ -413,6 +414,12 @@ ngx_show_version_info(void)
                                NGX_LINEFEED
 #else
             "  -p prefix     : set prefix path (default: NONE)" NGX_LINEFEED
+#endif
+            "  -e filename   : set error log file (default: "
+#ifdef NGX_ERROR_LOG_STDERR
+                               "stderr)" NGX_LINEFEED
+#else
+                               NGX_ERROR_LOG_PATH ")" NGX_LINEFEED
 #endif
             "  -c filename   : set configuration file (default: " NGX_CONF_PATH
                                ")" NGX_LINEFEED
@@ -492,6 +499,7 @@ ngx_add_inherited_sockets(ngx_cycle_t *cycle)
             ngx_memzero(ls, sizeof(ngx_listening_t));
 
             ls->fd = (ngx_socket_t) s;
+            ls->inherited = 1;
         }
     }
 
@@ -799,6 +807,24 @@ ngx_get_options(int argc, char *const *argv)
                 ngx_log_stderr(0, "option \"-p\" requires directory name");
                 return NGX_ERROR;
 
+            case 'e':
+                if (*p) {
+                    ngx_error_log = p;
+
+                } else if (argv[++i]) {
+                    ngx_error_log = (u_char *) argv[i];
+
+                } else {
+                    ngx_log_stderr(0, "option \"-e\" requires file name");
+                    return NGX_ERROR;
+                }
+
+                if (ngx_strcmp(ngx_error_log, "stderr") == 0) {
+                    ngx_error_log = (u_char *) "";
+                }
+
+                goto next;
+
             case 'c':
                 if (*p) {
                     ngx_conf_file = p;
@@ -991,6 +1017,14 @@ ngx_process_options(ngx_cycle_t *cycle)
         }
     }
 
+    if (ngx_error_log) {
+        cycle->error_log.len = ngx_strlen(ngx_error_log);
+        cycle->error_log.data = ngx_error_log;
+
+    } else {
+        ngx_str_set(&cycle->error_log, NGX_ERROR_LOG_PATH);
+    }
+
     if (ngx_conf_params) {
         cycle->conf_param.len = ngx_strlen(ngx_conf_params);
         cycle->conf_param.data = ngx_conf_params;
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 9656f98..7b873a1 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1018000
-#define NGINX_VERSION      "1.18.0"
+#define nginx_version      1020002
+#define NGINX_VERSION      "1.20.2"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_buf.c b/src/core/ngx_buf.c
index c3783c4..811f24d 100644
--- a/src/core/ngx_buf.c
+++ b/src/core/ngx_buf.c
@@ -203,16 +203,16 @@ ngx_chain_update_chains(ngx_pool_t *p, ngx_chain_t **free, ngx_chain_t **busy,
     while (*busy) {
         cl = *busy;
 
-        if (ngx_buf_size(cl->buf) != 0) {
-            break;
-        }
-
         if (cl->buf->tag != tag) {
             *busy = cl->next;
             ngx_free_chain(p, cl);
             continue;
         }
 
+        if (ngx_buf_size(cl->buf) != 0) {
+            break;
+        }
+
         cl->buf->pos = cl->buf->start;
         cl->buf->last = cl->buf->start;
 
diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h
index 12781a7..4b66562 100644
--- a/src/core/ngx_buf.h
+++ b/src/core/ngx_buf.h
@@ -125,20 +125,20 @@ typedef struct {
 #define NGX_CHAIN_ERROR     (ngx_chain_t *) NGX_ERROR
 
 
-#define ngx_buf_in_memory(b)        (b->temporary || b->memory || b->mmap)
-#define ngx_buf_in_memory_only(b)   (ngx_buf_in_memory(b) && !b->in_file)
+#define ngx_buf_in_memory(b)       ((b)->temporary || (b)->memory || (b)->mmap)
+#define ngx_buf_in_memory_only(b)  (ngx_buf_in_memory(b) && !(b)->in_file)
 
 #define ngx_buf_special(b)                                                   \
-    ((b->flush || b->last_buf || b->sync)                                    \
-     && !ngx_buf_in_memory(b) && !b->in_file)
+    (((b)->flush || (b)->last_buf || (b)->sync)                              \
+     && !ngx_buf_in_memory(b) && !(b)->in_file)
 
 #define ngx_buf_sync_only(b)                                                 \
-    (b->sync                                                                 \
-     && !ngx_buf_in_memory(b) && !b->in_file && !b->flush && !b->last_buf)
+    ((b)->sync && !ngx_buf_in_memory(b)                                      \
+     && !(b)->in_file && !(b)->flush && !(b)->last_buf)
 
 #define ngx_buf_size(b)                                                      \
-    (ngx_buf_in_memory(b) ? (off_t) (b->last - b->pos):                      \
-                            (b->file_last - b->file_pos))
+    (ngx_buf_in_memory(b) ? (off_t) ((b)->last - (b)->pos):                  \
+                            ((b)->file_last - (b)->file_pos))
 
 ngx_buf_t *ngx_create_temp_buf(ngx_pool_t *pool, size_t size);
 ngx_chain_t *ngx_create_chain_of_bufs(ngx_pool_t *pool, ngx_bufs_t *bufs);
@@ -149,8 +149,8 @@ ngx_chain_t *ngx_create_chain_of_bufs(ngx_pool_t *pool, ngx_bufs_t *bufs);
 
 ngx_chain_t *ngx_alloc_chain_link(ngx_pool_t *pool);
 #define ngx_free_chain(pool, cl)                                             \
-    cl->next = pool->chain;                                                  \
-    pool->chain = cl
+    (cl)->next = (pool)->chain;                                              \
+    (pool)->chain = (cl)
 
 
 
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 6d1629e..fec7bb8 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -1137,7 +1137,7 @@ ngx_conf_set_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     a = (ngx_array_t **) (p + cmd->offset);
 
-    if (*a == NULL) {
+    if (*a == NGX_CONF_UNSET_PTR || *a == NULL) {
         *a = ngx_array_create(cf->pool, 4, sizeof(ngx_keyval_t));
         if (*a == NULL) {
             return NGX_CONF_ERROR;
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 3368253..8339e2b 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -1070,7 +1070,8 @@ ngx_close_listening_sockets(ngx_cycle_t *cycle)
 
         if (ls[i].sockaddr->sa_family == AF_UNIX
             && ngx_process <= NGX_PROCESS_MASTER
-            && ngx_new_binary == 0)
+            && ngx_new_binary == 0
+            && (!ls[i].inherited || ngx_getppid() != ngx_parent))
         {
             u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1;
 
@@ -1106,12 +1107,9 @@ ngx_get_connection(ngx_socket_t s, ngx_log_t *log)
         return NULL;
     }
 
-    c = ngx_cycle->free_connections;
+    ngx_drain_connections((ngx_cycle_t *) ngx_cycle);
 
-    if (c == NULL) {
-        ngx_drain_connections((ngx_cycle_t *) ngx_cycle);
-        c = ngx_cycle->free_connections;
-    }
+    c = ngx_cycle->free_connections;
 
     if (c == NULL) {
         ngx_log_error(NGX_LOG_ALERT, log, 0,
@@ -1297,6 +1295,22 @@ ngx_drain_connections(ngx_cycle_t *cycle)
     ngx_queue_t       *q;
     ngx_connection_t  *c;
 
+    if (cycle->free_connection_n > cycle->connection_n / 16
+        || cycle->reusable_connections_n == 0)
+    {
+        return;
+    }
+
+    if (cycle->connections_reuse_time != ngx_time()) {
+        cycle->connections_reuse_time = ngx_time();
+
+        ngx_log_error(NGX_LOG_WARN, cycle->log, 0,
+                      "%ui worker_connections are not enough, "
+                      "reusing connections",
+                      cycle->connection_n);
+    }
+
+    c = NULL;
     n = ngx_max(ngx_min(32, cycle->reusable_connections_n / 8), 1);
 
     for (i = 0; i < n; i++) {
@@ -1313,6 +1327,21 @@ ngx_drain_connections(ngx_cycle_t *cycle)
         c->close = 1;
         c->read->handler(c->read);
     }
+
+    if (cycle->free_connection_n == 0 && c && c->reusable) {
+
+        /*
+         * if no connections were freed, try to reuse the last
+         * connection again: this should free it as long as
+         * previous reuse moved it to lingering close
+         */
+
+        ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0,
+                       "reusing connection again");
+
+        c->close = 1;
+        c->read->handler(c->read);
+    }
 }
 
 
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index ad6556d..4716da4 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -45,8 +45,6 @@ struct ngx_listening_s {
     size_t              pool_size;
     /* should be here because of the AcceptEx() preread */
     size_t              post_accept_buffer_size;
-    /* should be here because of the deferred accept */
-    ngx_msec_t          post_accept_timeout;
 
     ngx_listening_t    *previous;
     ngx_connection_t   *connection;
@@ -164,6 +162,7 @@ struct ngx_connection_s {
 
     ngx_atomic_uint_t   number;
 
+    ngx_msec_t          start_time;
     ngx_uint_t          requests;
 
     unsigned            buffered:8;
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 95f4bdf..6978c3e 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -96,6 +96,15 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
         return NULL;
     }
 
+    cycle->error_log.len = old_cycle->error_log.len;
+    cycle->error_log.data = ngx_pnalloc(pool, old_cycle->error_log.len + 1);
+    if (cycle->error_log.data == NULL) {
+        ngx_destroy_pool(pool);
+        return NULL;
+    }
+    ngx_cpystrn(cycle->error_log.data, old_cycle->error_log.data,
+                old_cycle->error_log.len + 1);
+
     cycle->conf_file.len = old_cycle->conf_file.len;
     cycle->conf_file.data = ngx_pnalloc(pool, old_cycle->conf_file.len + 1);
     if (cycle->conf_file.data == NULL) {
@@ -520,6 +529,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
                     == NGX_OK)
                 {
                     nls[n].fd = ls[i].fd;
+                    nls[n].inherited = ls[i].inherited;
                     nls[n].previous = &ls[i];
                     ls[i].remain = 1;
 
@@ -1008,6 +1018,7 @@ ngx_int_t
 ngx_create_pidfile(ngx_str_t *name, ngx_log_t *log)
 {
     size_t      len;
+    ngx_int_t   rc;
     ngx_uint_t  create;
     ngx_file_t  file;
     u_char      pid[NGX_INT64_LEN + 2];
@@ -1032,11 +1043,13 @@ ngx_create_pidfile(ngx_str_t *name, ngx_log_t *log)
         return NGX_ERROR;
     }
 
+    rc = NGX_OK;
+
     if (!ngx_test_config) {
         len = ngx_snprintf(pid, NGX_INT64_LEN + 2, "%P%N", ngx_pid) - pid;
 
         if (ngx_write_file(&file, pid, len, 0) == NGX_ERROR) {
-            return NGX_ERROR;
+            rc = NGX_ERROR;
         }
     }
 
@@ -1045,7 +1058,7 @@ ngx_create_pidfile(ngx_str_t *name, ngx_log_t *log)
                       ngx_close_file_n " \"%s\" failed", file.name.data);
     }
 
-    return NGX_OK;
+    return rc;
 }
 
 
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index 54fa2e6..0c47f25 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -55,6 +55,7 @@ struct ngx_cycle_s {
 
     ngx_queue_t               reusable_connections_queue;
     ngx_uint_t                reusable_connections_n;
+    time_t                    connections_reuse_time;
 
     ngx_array_t               listening;
     ngx_array_t               paths;
@@ -79,6 +80,7 @@ struct ngx_cycle_s {
     ngx_str_t                 conf_param;
     ngx_str_t                 conf_prefix;
     ngx_str_t                 prefix;
+    ngx_str_t                 error_log;
     ngx_str_t                 lock_file;
     ngx_str_t                 hostname;
 };
diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index 8e9408d..0c09426 100644
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -315,7 +315,7 @@ ngx_log_errno(u_char *buf, u_char *last, ngx_err_t err)
 
 
 ngx_log_t *
-ngx_log_init(u_char *prefix)
+ngx_log_init(u_char *prefix, u_char *error_log)
 {
     u_char  *p, *name;
     size_t   nlen, plen;
@@ -323,13 +323,11 @@ ngx_log_init(u_char *prefix)
     ngx_log.file = &ngx_log_file;
     ngx_log.log_level = NGX_LOG_NOTICE;
 
-    name = (u_char *) NGX_ERROR_LOG_PATH;
-
-    /*
-     * we use ngx_strlen() here since BCC warns about
-     * condition is always false and unreachable code
-     */
+    if (error_log == NULL) {
+        error_log = (u_char *) NGX_ERROR_LOG_PATH;
+    }
 
+    name = error_log;
     nlen = ngx_strlen(name);
 
     if (nlen == 0) {
@@ -369,7 +367,7 @@ ngx_log_init(u_char *prefix)
                 *p++ = '/';
             }
 
-            ngx_cpystrn(p, (u_char *) NGX_ERROR_LOG_PATH, nlen + 1);
+            ngx_cpystrn(p, error_log, nlen + 1);
 
             p = name;
         }
@@ -403,8 +401,7 @@ ngx_log_init(u_char *prefix)
 ngx_int_t
 ngx_log_open_default(ngx_cycle_t *cycle)
 {
-    ngx_log_t         *log;
-    static ngx_str_t   error_log = ngx_string(NGX_ERROR_LOG_PATH);
+    ngx_log_t  *log;
 
     if (ngx_log_get_file_log(&cycle->new_log) != NULL) {
         return NGX_OK;
@@ -425,7 +422,7 @@ ngx_log_open_default(ngx_cycle_t *cycle)
 
     log->log_level = NGX_LOG_ERR;
 
-    log->file = ngx_conf_open_file(cycle, &error_log);
+    log->file = ngx_conf_open_file(cycle, &cycle->error_log);
     if (log->file == NULL) {
         return NGX_ERROR;
     }
diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h
index afb73bf..ab64a5a 100644
--- a/src/core/ngx_log.h
+++ b/src/core/ngx_log.h
@@ -228,7 +228,7 @@ void ngx_cdecl ngx_log_debug_core(ngx_log_t *log, ngx_err_t err,
 
 /*********************************/
 
-ngx_log_t *ngx_log_init(u_char *prefix);
+ngx_log_t *ngx_log_init(u_char *prefix, u_char *error_log);
 void ngx_cdecl ngx_log_abort(ngx_err_t err, const char *fmt, ...);
 void ngx_cdecl ngx_log_stderr(ngx_err_t err, const char *fmt, ...);
 u_char *ngx_log_errno(u_char *buf, u_char *last, ngx_err_t err);
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index e51712c..58d5f3e 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1563,13 +1563,28 @@ ngx_resolver_udp_read(ngx_event_t *rev)
     do {
         n = ngx_udp_recv(c, buf, NGX_RESOLVER_UDP_SIZE);
 
-        if (n < 0) {
-            return;
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
+        if (n == NGX_ERROR) {
+            goto failed;
         }
 
         ngx_resolver_process_response(rec->resolver, buf, n, 0);
 
     } while (rev->ready);
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        goto failed;
+    }
+
+    return;
+
+failed:
+
+    ngx_close_connection(rec->udp);
+    rec->udp = NULL;
 }
 
 
@@ -1783,6 +1798,12 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n,
     i = sizeof(ngx_resolver_hdr_t);
 
     while (i < (ngx_uint_t) n) {
+
+        if (buf[i] & 0xc0) {
+            err = "unexpected compression pointer in DNS response";
+            goto done;
+        }
+
         if (buf[i] == '\0') {
             goto found;
         }
@@ -1918,7 +1939,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
 
     if (rn == NULL) {
         ngx_log_error(r->log_level, r->log, 0,
-                      "unexpected response for %V", &name);
+                      "unexpected DNS response for %V", &name);
         ngx_resolver_free(r, name.data);
         goto failed;
     }
@@ -1930,7 +1951,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
 
         if (rn->query6 == NULL || rn->naddrs6 != (u_short) -1) {
             ngx_log_error(r->log_level, r->log, 0,
-                          "unexpected response for %V", &name);
+                          "unexpected DNS response for %V", &name);
             ngx_resolver_free(r, name.data);
             goto failed;
         }
@@ -1949,7 +1970,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
 
         if (rn->query == NULL || rn->naddrs != (u_short) -1) {
             ngx_log_error(r->log_level, r->log, 0,
-                          "unexpected response for %V", &name);
+                          "unexpected DNS response for %V", &name);
             ngx_resolver_free(r, name.data);
             goto failed;
         }
@@ -1964,7 +1985,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
 
     if (ident != qident) {
         ngx_log_error(r->log_level, r->log, 0,
-                      "wrong ident %ui response for %V, expect %ui",
+                      "wrong ident %ui in DNS response for %V, expect %ui",
                       ident, &name, qident);
         ngx_resolver_free(r, name.data);
         goto failed;
@@ -2149,7 +2170,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
 
         if (class != 1) {
             ngx_log_error(r->log_level, r->log, 0,
-                          "unexpected RR class %ui", class);
+                          "unexpected RR class %ui in DNS response", class);
             goto failed;
         }
 
@@ -2218,7 +2239,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
         default:
 
             ngx_log_error(r->log_level, r->log, 0,
-                          "unexpected RR type %ui", type);
+                          "unexpected RR type %ui in DNS response", type);
         }
 
         i += len;
@@ -2567,7 +2588,7 @@ ngx_resolver_process_srv(ngx_resolver_t *r, u_char *buf, size_t n,
 
     if (rn == NULL || rn->query == NULL) {
         ngx_log_error(r->log_level, r->log, 0,
-                      "unexpected response for %V", &name);
+                      "unexpected DNS response for %V", &name);
         ngx_resolver_free(r, name.data);
         goto failed;
     }
@@ -2581,7 +2602,7 @@ ngx_resolver_process_srv(ngx_resolver_t *r, u_char *buf, size_t n,
 
     if (ident != qident) {
         ngx_log_error(r->log_level, r->log, 0,
-                      "wrong ident %ui response for %V, expect %ui",
+                      "wrong ident %ui in DNS response for %V, expect %ui",
                       ident, &name, qident);
         ngx_resolver_free(r, name.data);
         goto failed;
@@ -2691,7 +2712,7 @@ ngx_resolver_process_srv(ngx_resolver_t *r, u_char *buf, size_t n,
 
         if (class != 1) {
             ngx_log_error(r->log_level, r->log, 0,
-                          "unexpected RR class %ui", class);
+                          "unexpected RR class %ui in DNS response", class);
             goto failed;
         }
 
@@ -2734,7 +2755,7 @@ ngx_resolver_process_srv(ngx_resolver_t *r, u_char *buf, size_t n,
         default:
 
             ngx_log_error(r->log_level, r->log, 0,
-                          "unexpected RR type %ui", type);
+                          "unexpected RR type %ui in DNS response", type);
         }
 
         i += len;
@@ -3165,7 +3186,7 @@ valid:
 
     if (rn == NULL || rn->query == NULL) {
         ngx_log_error(r->log_level, r->log, 0,
-                      "unexpected response for %V", &name);
+                      "unexpected DNS response for %V", &name);
         ngx_resolver_free(r, name.data);
         goto failed;
     }
@@ -3174,7 +3195,7 @@ valid:
 
     if (ident != qident) {
         ngx_log_error(r->log_level, r->log, 0,
-                      "wrong ident %ui response for %V, expect %ui",
+                      "wrong ident %ui in DNS response for %V, expect %ui",
                       ident, &name, qident);
         ngx_resolver_free(r, name.data);
         goto failed;
@@ -3256,7 +3277,7 @@ valid:
 
         if (class != 1) {
             ngx_log_error(r->log_level, r->log, 0,
-                          "unexpected RR class %ui", class);
+                          "unexpected RR class %ui in DNS response", class);
             goto failed;
         }
 
@@ -3283,7 +3304,7 @@ valid:
         default:
 
             ngx_log_error(r->log_level, r->log, 0,
-                          "unexpected RR type %ui", type);
+                          "unexpected RR type %ui in DNS response", type);
         }
 
         i += len;
@@ -3924,11 +3945,11 @@ ngx_resolver_copy(ngx_resolver_t *r, ngx_str_t *name, u_char *buf, u_char *src,
 {
     char        *err;
     u_char      *p, *dst;
-    ssize_t      len;
+    size_t       len;
     ngx_uint_t   i, n;
 
     p = src;
-    len = -1;
+    len = 0;
 
     /*
      * compression pointers allow to create endless loop, so we set limit;
@@ -3943,6 +3964,16 @@ ngx_resolver_copy(ngx_resolver_t *r, ngx_str_t *name, u_char *buf, u_char *src,
         }
 
         if (n & 0xc0) {
+            if ((n & 0xc0) != 0xc0) {
+                err = "invalid label type in DNS response";
+                goto invalid;
+            }
+
+            if (p >= last) {
+                err = "name is out of DNS response";
+                goto invalid;
+            }
+
             n = ((n & 0x3f) << 8) + *p;
             p = &buf[n];
 
@@ -3952,12 +3983,12 @@ ngx_resolver_copy(ngx_resolver_t *r, ngx_str_t *name, u_char *buf, u_char *src,
         }
 
         if (p >= last) {
-            err = "name is out of response";
+            err = "name is out of DNS response";
             goto invalid;
         }
     }
 
-    err = "compression pointers loop";
+    err = "compression pointers loop in DNS response";
 
 invalid:
 
@@ -3971,7 +4002,7 @@ done:
         return NGX_OK;
     }
 
-    if (len == -1) {
+    if (len == 0) {
         ngx_str_null(name);
         return NGX_OK;
     }
@@ -3983,30 +4014,23 @@ done:
 
     name->data = dst;
 
-    n = *src++;
-
     for ( ;; ) {
+        n = *src++;
+
+        if (n == 0) {
+            name->len = dst - name->data - 1;
+            return NGX_OK;
+        }
+
         if (n & 0xc0) {
             n = ((n & 0x3f) << 8) + *src;
             src = &buf[n];
 
-            n = *src++;
-
         } else {
             ngx_strlow(dst, src, n);
             dst += n;
             src += n;
-
-            n = *src++;
-
-            if (n != 0) {
-                *dst++ = '.';
-            }
-        }
-
-        if (n == 0) {
-            name->len = dst - name->data;
-            return NGX_OK;
+            *dst++ = '.';
         }
     }
 }
@@ -4444,6 +4468,8 @@ ngx_udp_connect(ngx_resolver_connection_t *rec)
 
     c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
 
+    c->start_time = ngx_current_msec;
+
     ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &rec->log, 0,
                    "connect to %V, fd:%d #%uA", &rec->server, s, c->number);
 
@@ -4530,6 +4556,8 @@ ngx_tcp_connect(ngx_resolver_connection_t *rec)
 
     c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
 
+    c->start_time = ngx_current_msec;
+
     if (ngx_add_conn) {
         if (ngx_add_conn(c) == NGX_ERROR) {
             goto failed;
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 468e960..93f32ea 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -11,6 +11,8 @@
 
 static u_char *ngx_sprintf_num(u_char *buf, u_char *last, uint64_t ui64,
     u_char zero, ngx_uint_t hexadecimal, ngx_uint_t width);
+static u_char *ngx_sprintf_str(u_char *buf, u_char *last, u_char *src,
+    size_t len, ngx_uint_t hexadecimal);
 static void ngx_encode_base64_internal(ngx_str_t *dst, ngx_str_t *src,
     const u_char *basis, ngx_uint_t padding);
 static ngx_int_t ngx_decode_base64_internal(ngx_str_t *dst, ngx_str_t *src,
@@ -101,10 +103,10 @@ ngx_pstrdup(ngx_pool_t *pool, ngx_str_t *src)
  *    %M                        ngx_msec_t
  *    %r                        rlim_t
  *    %p                        void *
- *    %V                        ngx_str_t *
- *    %v                        ngx_variable_value_t *
- *    %s                        null-terminated string
- *    %*s                       length and string
+ *    %[x|X]V                   ngx_str_t *
+ *    %[x|X]v                   ngx_variable_value_t *
+ *    %[x|X]s                   null-terminated string
+ *    %*[x|X]s                  length and string
  *    %Z                        '\0'
  *    %N                        '\n'
  *    %c                        char
@@ -165,7 +167,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
     u_char                *p, zero;
     int                    d;
     double                 f;
-    size_t                 len, slen;
+    size_t                 slen;
     int64_t                i64;
     uint64_t               ui64, frac;
     ngx_msec_t             ms;
@@ -250,8 +252,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
             case 'V':
                 v = va_arg(args, ngx_str_t *);
 
-                len = ngx_min(((size_t) (last - buf)), v->len);
-                buf = ngx_cpymem(buf, v->data, len);
+                buf = ngx_sprintf_str(buf, last, v->data, v->len, hex);
                 fmt++;
 
                 continue;
@@ -259,8 +260,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
             case 'v':
                 vv = va_arg(args, ngx_variable_value_t *);
 
-                len = ngx_min(((size_t) (last - buf)), vv->len);
-                buf = ngx_cpymem(buf, vv->data, len);
+                buf = ngx_sprintf_str(buf, last, vv->data, vv->len, hex);
                 fmt++;
 
                 continue;
@@ -268,16 +268,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
             case 's':
                 p = va_arg(args, u_char *);
 
-                if (slen == (size_t) -1) {
-                    while (*p && buf < last) {
-                        *buf++ = *p++;
-                    }
-
-                } else {
-                    len = ngx_min(((size_t) (last - buf)), slen);
-                    buf = ngx_cpymem(buf, p, len);
-                }
-
+                buf = ngx_sprintf_str(buf, last, p, slen, hex);
                 fmt++;
 
                 continue;
@@ -576,6 +567,64 @@ ngx_sprintf_num(u_char *buf, u_char *last, uint64_t ui64, u_char zero,
 }
 
 
+static u_char *
+ngx_sprintf_str(u_char *buf, u_char *last, u_char *src, size_t len,
+    ngx_uint_t hexadecimal)
+{
+    static u_char   hex[] = "0123456789abcdef";
+    static u_char   HEX[] = "0123456789ABCDEF";
+
+    if (hexadecimal == 0) {
+
+        if (len == (size_t) -1) {
+            while (*src && buf < last) {
+                *buf++ = *src++;
+            }
+
+        } else {
+            len = ngx_min((size_t) (last - buf), len);
+            buf = ngx_cpymem(buf, src, len);
+        }
+
+    } else if (hexadecimal == 1) {
+
+        if (len == (size_t) -1) {
+
+            while (*src && buf < last - 1) {
+                *buf++ = hex[*src >> 4];
+                *buf++ = hex[*src++ & 0xf];
+            }
+
+        } else {
+
+            while (len-- && buf < last - 1) {
+                *buf++ = hex[*src >> 4];
+                *buf++ = hex[*src++ & 0xf];
+            }
+        }
+
+    } else { /* hexadecimal == 2 */
+
+        if (len == (size_t) -1) {
+
+            while (*src && buf < last - 1) {
+                *buf++ = HEX[*src >> 4];
+                *buf++ = HEX[*src++ & 0xf];
+            }
+
+        } else {
+
+            while (len-- && buf < last - 1) {
+                *buf++ = HEX[*src >> 4];
+                *buf++ = HEX[*src++ & 0xf];
+            }
+        }
+    }
+
+    return buf;
+}
+
+
 /*
  * We use ngx_strcasecmp()/ngx_strncasecmp() for 7-bit ASCII strings only,
  * and implement our own ngx_strcasecmp()/ngx_strncasecmp()
diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c
index f67c704..d304e1c 100644
--- a/src/event/modules/ngx_eventport_module.c
+++ b/src/event/modules/ngx_eventport_module.c
@@ -399,7 +399,7 @@ ngx_eventport_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
             return NGX_ERROR;
         }
 
-    } else {
+    } else if (ev->active) {
         ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
                        "eventport del event: fd:%d", c->fd);
 
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 402a7f5..7777d04 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -257,9 +257,7 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
         ngx_shmtx_unlock(&ngx_accept_mutex);
     }
 
-    if (delta) {
-        ngx_event_expire_timers();
-    }
+    ngx_event_expire_timers();
 
     ngx_event_process_posted(cycle, &ngx_posted_events);
 }
@@ -318,7 +316,7 @@ ngx_handle_read_event(ngx_event_t *rev, ngx_uint_t flags)
             return NGX_OK;
         }
 
-        if (rev->oneshot && !rev->ready) {
+        if (rev->oneshot && rev->ready) {
             if (ngx_del_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
                 return NGX_ERROR;
             }
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 4364240..b05666c 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -256,6 +256,8 @@ ngx_event_accept(ngx_event_t *ev)
 
         c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
 
+        c->start_time = ngx_current_msec;
+
 #if (NGX_STAT_STUB)
         (void) ngx_atomic_fetch_add(ngx_stat_handled, 1);
 #endif
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 1ffa798..adbbde6 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -193,6 +193,8 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
 
     c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
 
+    c->start_time = ngx_current_msec;
+
     if (ngx_add_conn) {
         if (ngx_add_conn(c) == NGX_ERROR) {
             goto failed;
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 91b415c..ce2a566 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -83,7 +83,7 @@ static time_t ngx_ssl_parse_time(
 #if OPENSSL_VERSION_NUMBER > 0x10100000L
     const
 #endif
-    ASN1_TIME *asn1time);
+    ASN1_TIME *asn1time, ngx_log_t *log);
 
 static void *ngx_openssl_create_conf(ngx_cycle_t *cycle);
 static char *ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
@@ -130,6 +130,7 @@ int  ngx_ssl_connection_index;
 int  ngx_ssl_server_conf_index;
 int  ngx_ssl_session_cache_index;
 int  ngx_ssl_session_ticket_keys_index;
+int  ngx_ssl_ocsp_index;
 int  ngx_ssl_certificate_index;
 int  ngx_ssl_next_certificate_index;
 int  ngx_ssl_certificate_name_index;
@@ -213,6 +214,13 @@ ngx_ssl_init(ngx_log_t *log)
         return NGX_ERROR;
     }
 
+    ngx_ssl_ocsp_index = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL, NULL);
+    if (ngx_ssl_ocsp_index == -1) {
+        ngx_ssl_error(NGX_LOG_ALERT, log, 0,
+                      "SSL_CTX_get_ex_new_index() failed");
+        return NGX_ERROR;
+    }
+
     ngx_ssl_certificate_index = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL,
                                                          NULL);
     if (ngx_ssl_certificate_index == -1) {
@@ -370,6 +378,10 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
     SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_CLIENT_RENEGOTIATION);
 #endif
 
+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
+    SSL_CTX_set_options(ssl->ctx, SSL_OP_IGNORE_UNEXPECTED_EOF);
+#endif
+
 #ifdef SSL_MODE_RELEASE_BUFFERS
     SSL_CTX_set_mode(ssl->ctx, SSL_MODE_RELEASE_BUFFERS);
 #endif
@@ -912,6 +924,9 @@ ngx_int_t
 ngx_ssl_trusted_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
     ngx_int_t depth)
 {
+    SSL_CTX_set_verify(ssl->ctx, SSL_CTX_get_verify_mode(ssl->ctx),
+                       ngx_ssl_verify_callback);
+
     SSL_CTX_set_verify_depth(ssl->ctx, depth);
 
     if (cert->len == 0) {
@@ -1003,26 +1018,52 @@ ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store)
 
     c = ngx_ssl_get_connection(ssl_conn);
 
+    if (!(c->log->log_level & NGX_LOG_DEBUG_EVENT)) {
+        return 1;
+    }
+
     cert = X509_STORE_CTX_get_current_cert(x509_store);
     err = X509_STORE_CTX_get_error(x509_store);
     depth = X509_STORE_CTX_get_error_depth(x509_store);
 
     sname = X509_get_subject_name(cert);
-    subject = sname ? X509_NAME_oneline(sname, NULL, 0) : "(none)";
+
+    if (sname) {
+        subject = X509_NAME_oneline(sname, NULL, 0);
+        if (subject == NULL) {
+            ngx_ssl_error(NGX_LOG_ALERT, c->log, 0,
+                          "X509_NAME_oneline() failed");
+        }
+
+    } else {
+        subject = NULL;
+    }
 
     iname = X509_get_issuer_name(cert);
-    issuer = iname ? X509_NAME_oneline(iname, NULL, 0) : "(none)";
+
+    if (iname) {
+        issuer = X509_NAME_oneline(iname, NULL, 0);
+        if (issuer == NULL) {
+            ngx_ssl_error(NGX_LOG_ALERT, c->log, 0,
+                          "X509_NAME_oneline() failed");
+        }
+
+    } else {
+        issuer = NULL;
+    }
 
     ngx_log_debug5(NGX_LOG_DEBUG_EVENT, c->log, 0,
                    "verify:%d, error:%d, depth:%d, "
                    "subject:\"%s\", issuer:\"%s\"",
-                   ok, err, depth, subject, issuer);
+                   ok, err, depth,
+                   subject ? subject : "(none)",
+                   issuer ? issuer : "(none)");
 
-    if (sname) {
+    if (subject) {
         OPENSSL_free(subject);
     }
 
-    if (iname) {
+    if (issuer) {
         OPENSSL_free(issuer);
     }
 #endif
@@ -1079,6 +1120,8 @@ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
 }
 
 
+#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
+
 RSA *
 ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export,
     int key_length)
@@ -1089,7 +1132,7 @@ ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export,
         return NULL;
     }
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100003L && !defined OPENSSL_NO_DEPRECATED)
+#ifndef OPENSSL_NO_DEPRECATED
 
     if (key == NULL) {
         key = RSA_generate_key(512, RSA_F4, NULL, NULL);
@@ -1100,6 +1143,8 @@ ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export,
     return key;
 }
 
+#endif
+
 
 ngx_array_t *
 ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file)
@@ -1313,7 +1358,6 @@ ngx_ssl_passwords_cleanup(void *data)
 ngx_int_t
 ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
 {
-    DH   *dh;
     BIO  *bio;
 
     if (file->len == 0) {
@@ -1331,6 +1375,10 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
         return NGX_ERROR;
     }
 
+#ifdef SSL_CTX_set_tmp_dh
+    {
+    DH  *dh;
+
     dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
     if (dh == NULL) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
@@ -1339,9 +1387,42 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
         return NGX_ERROR;
     }
 
-    SSL_CTX_set_tmp_dh(ssl->ctx, dh);
+    if (SSL_CTX_set_tmp_dh(ssl->ctx, dh) != 1) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CTX_set_tmp_dh(\"%s\") failed", file->data);
+        DH_free(dh);
+        BIO_free(bio);
+        return NGX_ERROR;
+    }
 
     DH_free(dh);
+    }
+#else
+    {
+    EVP_PKEY  *dh;
+
+    /*
+     * PEM_read_bio_DHparams() and SSL_CTX_set_tmp_dh()
+     * are deprecated in OpenSSL 3.0
+     */
+
+    dh = PEM_read_bio_Parameters(bio, NULL);
+    if (dh == NULL) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "PEM_read_bio_Parameters(\"%s\") failed", file->data);
+        BIO_free(bio);
+        return NGX_ERROR;
+    }
+
+    if (SSL_CTX_set0_tmp_dh_pkey(ssl->ctx, dh) != 1) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CTX_set0_tmp_dh_pkey(\%s\") failed", file->data);
+        BIO_free(bio);
+        return NGX_ERROR;
+    }
+    }
+#endif
+
     BIO_free(bio);
 
     return NGX_OK;
@@ -1459,6 +1540,78 @@ ngx_ssl_early_data(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_uint_t enable)
 }
 
 
+ngx_int_t
+ngx_ssl_conf_commands(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *commands)
+{
+    if (commands == NULL) {
+        return NGX_OK;
+    }
+
+#ifdef SSL_CONF_FLAG_FILE
+    {
+    int            type;
+    u_char        *key, *value;
+    ngx_uint_t     i;
+    ngx_keyval_t  *cmd;
+    SSL_CONF_CTX  *cctx;
+
+    cctx = SSL_CONF_CTX_new();
+    if (cctx == NULL) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CONF_CTX_new() failed");
+        return NGX_ERROR;
+    }
+
+    SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_FILE);
+    SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER);
+    SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT);
+    SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE);
+    SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SHOW_ERRORS);
+
+    SSL_CONF_CTX_set_ssl_ctx(cctx, ssl->ctx);
+
+    cmd = commands->elts;
+    for (i = 0; i < commands->nelts; i++) {
+
+        key = cmd[i].key.data;
+        type = SSL_CONF_cmd_value_type(cctx, (char *) key);
+
+        if (type == SSL_CONF_TYPE_FILE || type == SSL_CONF_TYPE_DIR) {
+            if (ngx_conf_full_name(cf->cycle, &cmd[i].value, 1) != NGX_OK) {
+                SSL_CONF_CTX_free(cctx);
+                return NGX_ERROR;
+            }
+        }
+
+        value = cmd[i].value.data;
+
+        if (SSL_CONF_cmd(cctx, (char *) key, (char *) value) <= 0) {
+            ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                          "SSL_CONF_cmd(\"%s\", \"%s\") failed", key, value);
+            SSL_CONF_CTX_free(cctx);
+            return NGX_ERROR;
+        }
+    }
+
+    if (SSL_CONF_CTX_finish(cctx) != 1) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CONF_finish() failed");
+        SSL_CONF_CTX_free(cctx);
+        return NGX_ERROR;
+    }
+
+    SSL_CONF_CTX_free(cctx);
+
+    return NGX_OK;
+    }
+#else
+    ngx_log_error(NGX_LOG_EMERG, ssl->log, 0,
+                  "SSL_CONF_cmd() is not available on this platform");
+    return NGX_ERROR;
+#endif
+}
+
+
 ngx_int_t
 ngx_ssl_client_session_cache(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_uint_t enable)
 {
@@ -1594,6 +1747,7 @@ ngx_ssl_handshake(ngx_connection_t *c)
 {
     int        n, sslerr;
     ngx_err_t  err;
+    ngx_int_t  rc;
 
 #ifdef SSL_READ_EARLY_DATA_SUCCESS
     if (c->ssl->try_early_data) {
@@ -1601,6 +1755,10 @@ ngx_ssl_handshake(ngx_connection_t *c)
     }
 #endif
 
+    if (c->ssl->in_ocsp) {
+        return ngx_ssl_ocsp_validate(c);
+    }
+
     ngx_ssl_clear_error(c->log);
 
     n = SSL_do_handshake(c->ssl->connection);
@@ -1621,13 +1779,14 @@ ngx_ssl_handshake(ngx_connection_t *c)
         ngx_ssl_handshake_log(c);
 #endif
 
-        c->ssl->handshaked = 1;
-
         c->recv = ngx_ssl_recv;
         c->send = ngx_ssl_write;
         c->recv_chain = ngx_ssl_recv_chain;
         c->send_chain = ngx_ssl_send_chain;
 
+        c->read->ready = 1;
+        c->write->ready = 1;
+
 #ifndef SSL_OP_NO_RENEGOTIATION
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 #ifdef SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
@@ -1641,6 +1800,20 @@ ngx_ssl_handshake(ngx_connection_t *c)
 #endif
 #endif
 
+        rc = ngx_ssl_ocsp_validate(c);
+
+        if (rc == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        if (rc == NGX_AGAIN) {
+            c->read->handler = ngx_ssl_handshake_handler;
+            c->write->handler = ngx_ssl_handshake_handler;
+            return NGX_AGAIN;
+        }
+
+        c->ssl->handshaked = 1;
+
         return NGX_OK;
     }
 
@@ -1693,6 +1866,13 @@ ngx_ssl_handshake(ngx_connection_t *c)
         return NGX_ERROR;
     }
 
+    if (c->ssl->handshake_rejected) {
+        ngx_connection_error(c, err, "handshake rejected");
+        ERR_clear_error();
+
+        return NGX_ERROR;
+    }
+
     c->read->error = 1;
 
     ngx_ssl_connection_error(c, sslerr, err, "SSL_do_handshake() failed");
@@ -1710,6 +1890,7 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
     u_char     buf;
     size_t     readbytes;
     ngx_err_t  err;
+    ngx_int_t  rc;
 
     ngx_ssl_clear_error(c->log);
 
@@ -1744,7 +1925,6 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
         c->ssl->early_buf = buf;
         c->ssl->early_preread = 1;
 
-        c->ssl->handshaked = 1;
         c->ssl->in_early = 1;
 
         c->recv = ngx_ssl_recv;
@@ -1752,6 +1932,23 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
         c->recv_chain = ngx_ssl_recv_chain;
         c->send_chain = ngx_ssl_send_chain;
 
+        c->read->ready = 1;
+        c->write->ready = 1;
+
+        rc = ngx_ssl_ocsp_validate(c);
+
+        if (rc == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        if (rc == NGX_AGAIN) {
+            c->read->handler = ngx_ssl_handshake_handler;
+            c->write->handler = ngx_ssl_handshake_handler;
+            return NGX_AGAIN;
+        }
+
+        c->ssl->handshaked = 1;
+
         return NGX_OK;
     }
 
@@ -1827,6 +2024,10 @@ ngx_ssl_handshake_log(ngx_connection_t *c)
 #endif
     SSL_CIPHER  *cipher;
 
+    if (!(c->log->log_level & NGX_LOG_DEBUG_EVENT)) {
+        return;
+    }
+
     cipher = SSL_get_current_cipher(c->ssl->connection);
 
     if (cipher) {
@@ -2531,6 +2732,18 @@ ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size)
 
     sslerr = SSL_get_error(c->ssl->connection, n);
 
+    if (sslerr == SSL_ERROR_ZERO_RETURN) {
+
+        /*
+         * OpenSSL 1.1.1 fails to return SSL_ERROR_SYSCALL if an error
+         * happens during SSL_write() after close_notify alert from the
+         * peer, and returns SSL_ERROR_ZERO_RETURN instead,
+         * https://git.openssl.org/?p=openssl.git;a=commitdiff;h=8051ab2
+         */
+
+        sslerr = SSL_ERROR_SYSCALL;
+    }
+
     err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
 
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d", sslerr);
@@ -2732,8 +2945,14 @@ ngx_ssl_free_buffer(ngx_connection_t *c)
 ngx_int_t
 ngx_ssl_shutdown(ngx_connection_t *c)
 {
-    int        n, sslerr, mode;
-    ngx_err_t  err;
+    int         n, sslerr, mode;
+    ngx_int_t   rc;
+    ngx_err_t   err;
+    ngx_uint_t  tries;
+
+    rc = NGX_OK;
+
+    ngx_ssl_ocsp_cleanup(c);
 
     if (SSL_in_init(c->ssl->connection)) {
         /*
@@ -2742,13 +2961,10 @@ ngx_ssl_shutdown(ngx_connection_t *c)
          * Avoid calling SSL_shutdown() if handshake wasn't completed.
          */
 
-        SSL_free(c->ssl->connection);
-        c->ssl = NULL;
-
-        return NGX_OK;
+        goto done;
     }
 
-    if (c->timedout) {
+    if (c->timedout || c->error || c->buffered) {
         mode = SSL_RECEIVED_SHUTDOWN|SSL_SENT_SHUTDOWN;
         SSL_set_quiet_shutdown(c->ssl->connection, 1);
 
@@ -2772,55 +2988,87 @@ ngx_ssl_shutdown(ngx_connection_t *c)
 
     ngx_ssl_clear_error(c->log);
 
-    n = SSL_shutdown(c->ssl->connection);
+    tries = 2;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_shutdown: %d", n);
+    for ( ;; ) {
 
-    sslerr = 0;
+        /*
+         * For bidirectional shutdown, SSL_shutdown() needs to be called
+         * twice: first call sends the "close notify" alert and returns 0,
+         * second call waits for the peer's "close notify" alert.
+         */
 
-    /* before 0.9.8m SSL_shutdown() returned 0 instead of -1 on errors */
+        n = SSL_shutdown(c->ssl->connection);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_shutdown: %d", n);
+
+        if (n == 1) {
+            goto done;
+        }
+
+        if (n == 0 && tries-- > 1) {
+            continue;
+        }
+
+        /* before 0.9.8m SSL_shutdown() returned 0 instead of -1 on errors */
 
-    if (n != 1 && ERR_peek_error()) {
         sslerr = SSL_get_error(c->ssl->connection, n);
 
         ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
                        "SSL_get_error: %d", sslerr);
-    }
 
-    if (n == 1 || sslerr == 0 || sslerr == SSL_ERROR_ZERO_RETURN) {
-        SSL_free(c->ssl->connection);
-        c->ssl = NULL;
+        if (sslerr == SSL_ERROR_WANT_READ || sslerr == SSL_ERROR_WANT_WRITE) {
+            c->read->handler = ngx_ssl_shutdown_handler;
+            c->write->handler = ngx_ssl_shutdown_handler;
 
-        return NGX_OK;
-    }
+            if (sslerr == SSL_ERROR_WANT_READ) {
+                c->read->ready = 0;
 
-    if (sslerr == SSL_ERROR_WANT_READ || sslerr == SSL_ERROR_WANT_WRITE) {
-        c->read->handler = ngx_ssl_shutdown_handler;
-        c->write->handler = ngx_ssl_shutdown_handler;
+            } else {
+                c->write->ready = 0;
+            }
 
-        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-            return NGX_ERROR;
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                goto failed;
+            }
+
+            if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+                goto failed;
+            }
+
+            ngx_add_timer(c->read, 3000);
+
+            return NGX_AGAIN;
         }
 
-        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
-            return NGX_ERROR;
+        if (sslerr == SSL_ERROR_ZERO_RETURN || ERR_peek_error() == 0) {
+            goto done;
         }
 
-        if (sslerr == SSL_ERROR_WANT_READ) {
-            ngx_add_timer(c->read, 30000);
-        }
+        err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
 
-        return NGX_AGAIN;
+        ngx_ssl_connection_error(c, sslerr, err, "SSL_shutdown() failed");
+
+        break;
     }
 
-    err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
+failed:
 
-    ngx_ssl_connection_error(c, sslerr, err, "SSL_shutdown() failed");
+    rc = NGX_ERROR;
+
+done:
+
+    if (c->ssl->shutdown_without_free) {
+        c->ssl->shutdown_without_free = 0;
+        c->recv = ngx_recv;
+        return rc;
+    }
 
     SSL_free(c->ssl->connection);
     c->ssl = NULL;
+    c->recv = ngx_recv;
 
-    return NGX_ERROR;
+    return rc;
 }
 
 
@@ -3036,7 +3284,7 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, char *fmt, ...)
 
         for ( ;; ) {
 
-            n = ERR_peek_error_line_data(NULL, NULL, &data, &flags);
+            n = ERR_peek_error_data(&data, &flags);
 
             if (n == 0) {
                 break;
@@ -3202,8 +3450,9 @@ ngx_ssl_session_id_context(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
         }
     }
 
-    if (SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index) == NULL) {
-
+    if (SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_certificate_index) == NULL
+        && certificates != NULL)
+    {
         /*
          * If certificates are loaded dynamically, we use certificate
          * names as specified in the configuration (with variables).
@@ -3897,9 +4146,6 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     ngx_ssl_session_ticket_key_t  *key;
     const EVP_MD                  *digest;
     const EVP_CIPHER              *cipher;
-#if (NGX_DEBUG)
-    u_char                         buf[32];
-#endif
 
     c = ngx_ssl_get_connection(ssl_conn);
     ssl_ctx = c->ssl->session_ctx;
@@ -3921,8 +4167,8 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
         /* encrypt session ticket */
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "ssl session ticket encrypt, key: \"%*s\" (%s session)",
-                       ngx_hex_dump(buf, key[0].name, 16) - buf, buf,
+                       "ssl session ticket encrypt, key: \"%*xs\" (%s session)",
+                       (size_t) 16, key[0].name,
                        SSL_session_reused(ssl_conn) ? "reused" : "new");
 
         if (key[0].size == 48) {
@@ -3968,17 +4214,16 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "ssl session ticket decrypt, key: \"%*s\" not found",
-                       ngx_hex_dump(buf, name, 16) - buf, buf);
+                       "ssl session ticket decrypt, key: \"%*xs\" not found",
+                       (size_t) 16, name);
 
         return 0;
 
     found:
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "ssl session ticket decrypt, key: \"%*s\"%s",
-                       ngx_hex_dump(buf, key[i].name, 16) - buf, buf,
-                       (i == 0) ? " (default)" : "");
+                       "ssl session ticket decrypt, key: \"%*xs\"%s",
+                       (size_t) 16, key[i].name, (i == 0) ? " (default)" : "");
 
         if (key[i].size == 48) {
             cipher = EVP_aes_128_cbc();
@@ -4635,11 +4880,13 @@ ngx_ssl_get_subject_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 
     bio = BIO_new(BIO_s_mem());
     if (bio == NULL) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "BIO_new() failed");
         X509_free(cert);
         return NGX_ERROR;
     }
 
     if (X509_NAME_print_ex(bio, name, 0, XN_FLAG_RFC2253) < 0) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "X509_NAME_print_ex() failed");
         goto failed;
     }
 
@@ -4687,11 +4934,13 @@ ngx_ssl_get_issuer_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 
     bio = BIO_new(BIO_s_mem());
     if (bio == NULL) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "BIO_new() failed");
         X509_free(cert);
         return NGX_ERROR;
     }
 
     if (X509_NAME_print_ex(bio, name, 0, XN_FLAG_RFC2253) < 0) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "X509_NAME_print_ex() failed");
         goto failed;
     }
 
@@ -4740,6 +4989,11 @@ ngx_ssl_get_subject_dn_legacy(ngx_connection_t *c, ngx_pool_t *pool,
     }
 
     p = X509_NAME_oneline(name, NULL, 0);
+    if (p == NULL) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "X509_NAME_oneline() failed");
+        X509_free(cert);
+        return NGX_ERROR;
+    }
 
     for (len = 0; p[len]; len++) { /* void */ }
 
@@ -4783,6 +5037,11 @@ ngx_ssl_get_issuer_dn_legacy(ngx_connection_t *c, ngx_pool_t *pool,
     }
 
     p = X509_NAME_oneline(name, NULL, 0);
+    if (p == NULL) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "X509_NAME_oneline() failed");
+        X509_free(cert);
+        return NGX_ERROR;
+    }
 
     for (len = 0; p[len]; len++) { /* void */ }
 
@@ -4819,6 +5078,7 @@ ngx_ssl_get_serial_number(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 
     bio = BIO_new(BIO_s_mem());
     if (bio == NULL) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "BIO_new() failed");
         X509_free(cert);
         return NGX_ERROR;
     }
@@ -4857,6 +5117,7 @@ ngx_ssl_get_fingerprint(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
     }
 
     if (!X509_digest(cert, EVP_sha1(), buf, &len)) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "X509_digest() failed");
         X509_free(cert);
         return NGX_ERROR;
     }
@@ -4894,11 +5155,14 @@ ngx_ssl_get_client_verify(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
     rc = SSL_get_verify_result(c->ssl->connection);
 
     if (rc == X509_V_OK) {
-        ngx_str_set(s, "SUCCESS");
-        return NGX_OK;
-    }
+        if (ngx_ssl_ocsp_get_status(c, &str) == NGX_OK) {
+            ngx_str_set(s, "SUCCESS");
+            return NGX_OK;
+        }
 
-    str = X509_verify_cert_error_string(rc);
+    } else {
+        str = X509_verify_cert_error_string(rc);
+    }
 
     s->data = ngx_pnalloc(pool, sizeof("FAILED:") - 1 + ngx_strlen(str));
     if (s->data == NULL) {
@@ -4927,6 +5191,7 @@ ngx_ssl_get_client_v_start(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 
     bio = BIO_new(BIO_s_mem());
     if (bio == NULL) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "BIO_new() failed");
         X509_free(cert);
         return NGX_ERROR;
     }
@@ -4971,6 +5236,7 @@ ngx_ssl_get_client_v_end(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 
     bio = BIO_new(BIO_s_mem());
     if (bio == NULL) {
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "BIO_new() failed");
         X509_free(cert);
         return NGX_ERROR;
     }
@@ -5013,9 +5279,9 @@ ngx_ssl_get_client_v_remain(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
     }
 
 #if OPENSSL_VERSION_NUMBER > 0x10100000L
-    end = ngx_ssl_parse_time(X509_get0_notAfter(cert));
+    end = ngx_ssl_parse_time(X509_get0_notAfter(cert), c->log);
 #else
-    end = ngx_ssl_parse_time(X509_get_notAfter(cert));
+    end = ngx_ssl_parse_time(X509_get_notAfter(cert), c->log);
 #endif
 
     if (end == (time_t) NGX_ERROR) {
@@ -5050,7 +5316,7 @@ ngx_ssl_parse_time(
 #if OPENSSL_VERSION_NUMBER > 0x10100000L
     const
 #endif
-    ASN1_TIME *asn1time)
+    ASN1_TIME *asn1time, ngx_log_t *log)
 {
     BIO     *bio;
     char    *value;
@@ -5066,6 +5332,7 @@ ngx_ssl_parse_time(
 
     bio = BIO_new(BIO_s_mem());
     if (bio == NULL) {
+        ngx_ssl_error(NGX_LOG_ALERT, log, 0, "BIO_new() failed");
         return NGX_ERROR;
     }
 
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 61da0c5..81b87d7 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -12,6 +12,8 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/bn.h>
@@ -64,6 +66,19 @@
 #endif
 
 
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined SSL_get_peer_certificate)
+#define SSL_get_peer_certificate(s)  SSL_get1_peer_certificate(s)
+#endif
+
+
+#if (OPENSSL_VERSION_NUMBER < 0x30000000L && !defined ERR_peek_error_data)
+#define ERR_peek_error_data(d, f)    ERR_peek_error_line_data(NULL, NULL, d, f)
+#endif
+
+
+typedef struct ngx_ssl_ocsp_s  ngx_ssl_ocsp_t;
+
+
 struct ngx_ssl_s {
     SSL_CTX                    *ctx;
     ngx_log_t                  *log;
@@ -87,16 +102,21 @@ struct ngx_ssl_connection_s {
     ngx_event_handler_pt        saved_read_handler;
     ngx_event_handler_pt        saved_write_handler;
 
+    ngx_ssl_ocsp_t             *ocsp;
+
     u_char                      early_buf;
 
     unsigned                    handshaked:1;
+    unsigned                    handshake_rejected:1;
     unsigned                    renegotiation:1;
     unsigned                    buffer:1;
     unsigned                    no_wait_shutdown:1;
     unsigned                    no_send_shutdown:1;
+    unsigned                    shutdown_without_free:1;
     unsigned                    handshake_buffer_set:1;
     unsigned                    try_early_data:1;
     unsigned                    in_early:1;
+    unsigned                    in_ocsp:1;
     unsigned                    early_preread:1;
     unsigned                    write_blocked:1;
 };
@@ -180,8 +200,18 @@ ngx_int_t ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_str_t *file, ngx_str_t *responder, ngx_uint_t verify);
 ngx_int_t ngx_ssl_stapling_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_resolver_t *resolver, ngx_msec_t resolver_timeout);
+ngx_int_t ngx_ssl_ocsp(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *responder,
+    ngx_uint_t depth, ngx_shm_zone_t *shm_zone);
+ngx_int_t ngx_ssl_ocsp_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_resolver_t *resolver, ngx_msec_t resolver_timeout);
+ngx_int_t ngx_ssl_ocsp_validate(ngx_connection_t *c);
+ngx_int_t ngx_ssl_ocsp_get_status(ngx_connection_t *c, const char **s);
+void ngx_ssl_ocsp_cleanup(ngx_connection_t *c);
+ngx_int_t ngx_ssl_ocsp_cache_init(ngx_shm_zone_t *shm_zone, void *data);
+#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
 RSA *ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export,
     int key_length);
+#endif
 ngx_array_t *ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file);
 ngx_array_t *ngx_ssl_preserve_passwords(ngx_conf_t *cf,
     ngx_array_t *passwords);
@@ -189,6 +219,9 @@ ngx_int_t ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file);
 ngx_int_t ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name);
 ngx_int_t ngx_ssl_early_data(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_uint_t enable);
+ngx_int_t ngx_ssl_conf_commands(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_array_t *commands);
+
 ngx_int_t ngx_ssl_client_session_cache(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_uint_t enable);
 ngx_int_t ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
@@ -197,6 +230,7 @@ ngx_int_t ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx,
 ngx_int_t ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_array_t *paths);
 ngx_int_t ngx_ssl_session_cache_init(ngx_shm_zone_t *shm_zone, void *data);
+
 ngx_int_t ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c,
     ngx_uint_t flags);
 
@@ -281,6 +315,7 @@ extern int  ngx_ssl_connection_index;
 extern int  ngx_ssl_server_conf_index;
 extern int  ngx_ssl_session_cache_index;
 extern int  ngx_ssl_session_ticket_keys_index;
+extern int  ngx_ssl_ocsp_index;
 extern int  ngx_ssl_certificate_index;
 extern int  ngx_ssl_next_certificate_index;
 extern int  ngx_ssl_certificate_name_index;
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index 5a7e40e..e3fa8c4 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -22,6 +22,7 @@ typedef struct {
     ngx_msec_t                   resolver_timeout;
 
     ngx_addr_t                  *addrs;
+    ngx_uint_t                   naddrs;
     ngx_str_t                    host;
     ngx_str_t                    uri;
     in_port_t                    port;
@@ -30,6 +31,7 @@ typedef struct {
 
     X509                        *cert;
     X509                        *issuer;
+    STACK_OF(X509)              *chain;
 
     u_char                      *name;
 
@@ -41,15 +43,66 @@ typedef struct {
 } ngx_ssl_stapling_t;
 
 
+typedef struct {
+    ngx_addr_t                  *addrs;
+    ngx_uint_t                   naddrs;
+
+    ngx_str_t                    host;
+    ngx_str_t                    uri;
+    in_port_t                    port;
+    ngx_uint_t                   depth;
+
+    ngx_shm_zone_t              *shm_zone;
+
+    ngx_resolver_t              *resolver;
+    ngx_msec_t                   resolver_timeout;
+} ngx_ssl_ocsp_conf_t;
+
+
+typedef struct {
+    ngx_rbtree_t                 rbtree;
+    ngx_rbtree_node_t            sentinel;
+    ngx_queue_t                  expire_queue;
+} ngx_ssl_ocsp_cache_t;
+
+
+typedef struct {
+    ngx_str_node_t               node;
+    ngx_queue_t                  queue;
+    int                          status;
+    time_t                       valid;
+} ngx_ssl_ocsp_cache_node_t;
+
+
 typedef struct ngx_ssl_ocsp_ctx_s  ngx_ssl_ocsp_ctx_t;
 
+
+struct ngx_ssl_ocsp_s {
+    STACK_OF(X509)              *certs;
+    ngx_uint_t                   ncert;
+
+    int                          cert_status;
+    ngx_int_t                    status;
+
+    ngx_ssl_ocsp_conf_t         *conf;
+    ngx_ssl_ocsp_ctx_t          *ctx;
+};
+
+
 struct ngx_ssl_ocsp_ctx_s {
+    SSL_CTX                     *ssl_ctx;
+
     X509                        *cert;
     X509                        *issuer;
+    STACK_OF(X509)              *chain;
+
+    int                          status;
+    time_t                       valid;
 
     u_char                      *name;
 
     ngx_uint_t                   naddrs;
+    ngx_uint_t                   naddr;
 
     ngx_addr_t                  *addrs;
     ngx_str_t                    host;
@@ -64,17 +117,20 @@ struct ngx_ssl_ocsp_ctx_s {
     void                       (*handler)(ngx_ssl_ocsp_ctx_t *ctx);
     void                        *data;
 
+    ngx_str_t                    key;
     ngx_buf_t                   *request;
     ngx_buf_t                   *response;
     ngx_peer_connection_t        peer;
 
+    ngx_shm_zone_t              *shm_zone;
+
     ngx_int_t                  (*process)(ngx_ssl_ocsp_ctx_t *ctx);
 
     ngx_uint_t                   state;
 
     ngx_uint_t                   code;
     ngx_uint_t                   count;
-
+    ngx_uint_t                   flags;
     ngx_uint_t                   done;
 
     u_char                      *header_name_start;
@@ -105,8 +161,14 @@ static time_t ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time);
 
 static void ngx_ssl_stapling_cleanup(void *data);
 
-static ngx_ssl_ocsp_ctx_t *ngx_ssl_ocsp_start(void);
+static void ngx_ssl_ocsp_validate_next(ngx_connection_t *c);
+static void ngx_ssl_ocsp_handler(ngx_ssl_ocsp_ctx_t *ctx);
+static ngx_int_t ngx_ssl_ocsp_responder(ngx_connection_t *c,
+    ngx_ssl_ocsp_ctx_t *ctx);
+
+static ngx_ssl_ocsp_ctx_t *ngx_ssl_ocsp_start(ngx_log_t *log);
 static void ngx_ssl_ocsp_done(ngx_ssl_ocsp_ctx_t *ctx);
+static void ngx_ssl_ocsp_next(ngx_ssl_ocsp_ctx_t *ctx);
 static void ngx_ssl_ocsp_request(ngx_ssl_ocsp_ctx_t *ctx);
 static void ngx_ssl_ocsp_resolve_handler(ngx_resolver_ctx_t *resolve);
 static void ngx_ssl_ocsp_connect(ngx_ssl_ocsp_ctx_t *ctx);
@@ -120,6 +182,11 @@ static ngx_int_t ngx_ssl_ocsp_parse_status_line(ngx_ssl_ocsp_ctx_t *ctx);
 static ngx_int_t ngx_ssl_ocsp_process_headers(ngx_ssl_ocsp_ctx_t *ctx);
 static ngx_int_t ngx_ssl_ocsp_parse_header_line(ngx_ssl_ocsp_ctx_t *ctx);
 static ngx_int_t ngx_ssl_ocsp_process_body(ngx_ssl_ocsp_ctx_t *ctx);
+static ngx_int_t ngx_ssl_ocsp_verify(ngx_ssl_ocsp_ctx_t *ctx);
+
+static ngx_int_t ngx_ssl_ocsp_cache_lookup(ngx_ssl_ocsp_ctx_t *ctx);
+static ngx_int_t ngx_ssl_ocsp_cache_store(ngx_ssl_ocsp_ctx_t *ctx);
+static ngx_int_t ngx_ssl_ocsp_create_key(ngx_ssl_ocsp_ctx_t *ctx);
 
 static u_char *ngx_ssl_ocsp_log_error(ngx_log_t *log, u_char *buf, size_t len);
 
@@ -173,6 +240,18 @@ ngx_ssl_stapling_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, X509 *cert,
         return NGX_ERROR;
     }
 
+#ifdef SSL_CTRL_SELECT_CURRENT_CERT
+    /* OpenSSL 1.0.2+ */
+    SSL_CTX_select_current_cert(ssl->ctx, cert);
+#endif
+
+#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
+    /* OpenSSL 1.0.1+ */
+    SSL_CTX_get_extra_chain_certs(ssl->ctx, &staple->chain);
+#else
+    staple->chain = ssl->ctx->extra_certs;
+#endif
+
     staple->ssl_ctx = ssl->ctx;
     staple->timeout = 60000;
     staple->verify = verify;
@@ -289,29 +368,16 @@ ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl,
     X509            *cert, *issuer;
     X509_STORE      *store;
     X509_STORE_CTX  *store_ctx;
-    STACK_OF(X509)  *chain;
 
     cert = staple->cert;
 
-#ifdef SSL_CTRL_SELECT_CURRENT_CERT
-    /* OpenSSL 1.0.2+ */
-    SSL_CTX_select_current_cert(ssl->ctx, cert);
-#endif
-
-#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-    /* OpenSSL 1.0.1+ */
-    SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
-#else
-    chain = ssl->ctx->extra_certs;
-#endif
-
-    n = sk_X509_num(chain);
+    n = sk_X509_num(staple->chain);
 
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ssl->log, 0,
                    "SSL get issuer: %d extra certs", n);
 
     for (i = 0; i < n; i++) {
-        issuer = sk_X509_value(chain, i);
+        issuer = sk_X509_value(staple->chain, i);
         if (X509_check_issued(issuer, cert) == X509_V_OK) {
 #if OPENSSL_VERSION_NUMBER >= 0x10100001L
             X509_up_ref(issuer);
@@ -462,6 +528,7 @@ ngx_ssl_stapling_responder(ngx_conf_t *cf, ngx_ssl_t *ssl,
     }
 
     staple->addrs = u.addrs;
+    staple->naddrs = u.naddrs;
     staple->host = u.host;
     staple->uri = u.uri;
     staple->port = u.port;
@@ -559,16 +626,20 @@ ngx_ssl_stapling_update(ngx_ssl_stapling_t *staple)
 
     staple->loading = 1;
 
-    ctx = ngx_ssl_ocsp_start();
+    ctx = ngx_ssl_ocsp_start(ngx_cycle->log);
     if (ctx == NULL) {
         return;
     }
 
+    ctx->ssl_ctx = staple->ssl_ctx;
     ctx->cert = staple->cert;
     ctx->issuer = staple->issuer;
+    ctx->chain = staple->chain;
     ctx->name = staple->name;
+    ctx->flags = (staple->verify ? OCSP_TRUSTOTHER : OCSP_NOVERIFY);
 
     ctx->addrs = staple->addrs;
+    ctx->naddrs = staple->naddrs;
     ctx->host = staple->host;
     ctx->uri = staple->uri;
     ctx->port = staple->port;
@@ -589,137 +660,27 @@ ngx_ssl_stapling_update(ngx_ssl_stapling_t *staple)
 static void
 ngx_ssl_stapling_ocsp_handler(ngx_ssl_ocsp_ctx_t *ctx)
 {
-    int                    n;
-    size_t                 len;
-    time_t                 now, valid;
-    ngx_str_t              response;
-    X509_STORE            *store;
-    const u_char          *p;
-    STACK_OF(X509)        *chain;
-    OCSP_CERTID           *id;
-    OCSP_RESPONSE         *ocsp;
-    OCSP_BASICRESP        *basic;
-    ngx_ssl_stapling_t    *staple;
-    ASN1_GENERALIZEDTIME  *thisupdate, *nextupdate;
+    time_t               now;
+    ngx_str_t            response;
+    ngx_ssl_stapling_t  *staple;
 
     staple = ctx->data;
     now = ngx_time();
-    ocsp = NULL;
-    basic = NULL;
-    id = NULL;
 
-    if (ctx->code != 200) {
+    if (ngx_ssl_ocsp_verify(ctx) != NGX_OK) {
         goto error;
     }
 
-    /* check the response */
-
-    len = ctx->response->last - ctx->response->pos;
-    p = ctx->response->pos;
-
-    ocsp = d2i_OCSP_RESPONSE(NULL, &p, len);
-    if (ocsp == NULL) {
-        ngx_ssl_error(NGX_LOG_ERR, ctx->log, 0,
-                      "d2i_OCSP_RESPONSE() failed");
-        goto error;
-    }
-
-    n = OCSP_response_status(ocsp);
-
-    if (n != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
-        ngx_log_error(NGX_LOG_ERR, ctx->log, 0,
-                      "OCSP response not successful (%d: %s)",
-                      n, OCSP_response_status_str(n));
-        goto error;
-    }
-
-    basic = OCSP_response_get1_basic(ocsp);
-    if (basic == NULL) {
-        ngx_ssl_error(NGX_LOG_ERR, ctx->log, 0,
-                      "OCSP_response_get1_basic() failed");
-        goto error;
-    }
-
-    store = SSL_CTX_get_cert_store(staple->ssl_ctx);
-    if (store == NULL) {
-        ngx_ssl_error(NGX_LOG_CRIT, ctx->log, 0,
-                      "SSL_CTX_get_cert_store() failed");
-        goto error;
-    }
-
-#ifdef SSL_CTRL_SELECT_CURRENT_CERT
-    /* OpenSSL 1.0.2+ */
-    SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
-#endif
-
-#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-    /* OpenSSL 1.0.1+ */
-    SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
-#else
-    chain = staple->ssl_ctx->extra_certs;
-#endif
-
-    if (OCSP_basic_verify(basic, chain, store,
-                          staple->verify ? OCSP_TRUSTOTHER : OCSP_NOVERIFY)
-        != 1)
-    {
-        ngx_ssl_error(NGX_LOG_ERR, ctx->log, 0,
-                      "OCSP_basic_verify() failed");
-        goto error;
-    }
-
-    id = OCSP_cert_to_id(NULL, ctx->cert, ctx->issuer);
-    if (id == NULL) {
-        ngx_ssl_error(NGX_LOG_CRIT, ctx->log, 0,
-                      "OCSP_cert_to_id() failed");
-        goto error;
-    }
-
-    if (OCSP_resp_find_status(basic, id, &n, NULL, NULL,
-                              &thisupdate, &nextupdate)
-        != 1)
-    {
-        ngx_log_error(NGX_LOG_ERR, ctx->log, 0,
-                      "certificate status not found in the OCSP response");
-        goto error;
-    }
-
-    if (n != V_OCSP_CERTSTATUS_GOOD) {
+    if (ctx->status != V_OCSP_CERTSTATUS_GOOD) {
         ngx_log_error(NGX_LOG_ERR, ctx->log, 0,
                       "certificate status \"%s\" in the OCSP response",
-                      OCSP_cert_status_str(n));
+                      OCSP_cert_status_str(ctx->status));
         goto error;
     }
 
-    if (OCSP_check_validity(thisupdate, nextupdate, 300, -1) != 1) {
-        ngx_ssl_error(NGX_LOG_ERR, ctx->log, 0,
-                      "OCSP_check_validity() failed");
-        goto error;
-    }
-
-    if (nextupdate) {
-        valid = ngx_ssl_stapling_time(nextupdate);
-        if (valid == (time_t) NGX_ERROR) {
-            ngx_log_error(NGX_LOG_ERR, ctx->log, 0,
-                          "invalid nextUpdate time in certificate status");
-            goto error;
-        }
-
-    } else {
-        valid = NGX_MAX_TIME_T_VALUE;
-    }
-
-    OCSP_CERTID_free(id);
-    OCSP_BASICRESP_free(basic);
-    OCSP_RESPONSE_free(ocsp);
-
-    id = NULL;
-    basic = NULL;
-    ocsp = NULL;
-
     /* copy the response to memory not in ctx->pool */
 
-    response.len = len;
+    response.len = ctx->response->last - ctx->response->pos;
     response.data = ngx_alloc(response.len, ctx->log);
 
     if (response.data == NULL) {
@@ -728,16 +689,12 @@ ngx_ssl_stapling_ocsp_handler(ngx_ssl_ocsp_ctx_t *ctx)
 
     ngx_memcpy(response.data, ctx->response->pos, response.len);
 
-    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
-                   "ssl ocsp response, %s, %uz",
-                   OCSP_cert_status_str(n), response.len);
-
     if (staple->staple.data) {
         ngx_free(staple->staple.data);
     }
 
     staple->staple = response;
-    staple->valid = valid;
+    staple->valid = ctx->valid;
 
     /*
      * refresh before the response expires,
@@ -745,7 +702,7 @@ ngx_ssl_stapling_ocsp_handler(ngx_ssl_ocsp_ctx_t *ctx)
      */
 
     staple->loading = 0;
-    staple->refresh = ngx_max(ngx_min(valid - 300, now + 3600), now + 300);
+    staple->refresh = ngx_max(ngx_min(ctx->valid - 300, now + 3600), now + 300);
 
     ngx_ssl_ocsp_done(ctx);
     return;
@@ -755,18 +712,6 @@ error:
     staple->loading = 0;
     staple->refresh = now + 300;
 
-    if (id) {
-        OCSP_CERTID_free(id);
-    }
-
-    if (basic) {
-        OCSP_BASICRESP_free(basic);
-    }
-
-    if (ocsp) {
-        OCSP_RESPONSE_free(ocsp);
-    }
-
     ngx_ssl_ocsp_done(ctx);
 }
 
@@ -820,14 +765,507 @@ ngx_ssl_stapling_cleanup(void *data)
 }
 
 
-static ngx_ssl_ocsp_ctx_t *
-ngx_ssl_ocsp_start(void)
+ngx_int_t
+ngx_ssl_ocsp(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *responder,
+    ngx_uint_t depth, ngx_shm_zone_t *shm_zone)
+{
+    ngx_url_t             u;
+    ngx_ssl_ocsp_conf_t  *ocf;
+
+    ocf = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_ocsp_conf_t));
+    if (ocf == NULL) {
+        return NGX_ERROR;
+    }
+
+    ocf->depth = depth;
+    ocf->shm_zone = shm_zone;
+
+    if (responder->len) {
+        ngx_memzero(&u, sizeof(ngx_url_t));
+
+        u.url = *responder;
+        u.default_port = 80;
+        u.uri_part = 1;
+
+        if (u.url.len > 7
+            && ngx_strncasecmp(u.url.data, (u_char *) "http://", 7) == 0)
+        {
+            u.url.len -= 7;
+            u.url.data += 7;
+
+        } else {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "invalid URL prefix in OCSP responder \"%V\" "
+                          "in \"ssl_ocsp_responder\"", &u.url);
+            return NGX_ERROR;
+        }
+
+        if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
+            if (u.err) {
+                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                              "%s in OCSP responder \"%V\" "
+                              "in \"ssl_ocsp_responder\"", u.err, &u.url);
+            }
+
+            return NGX_ERROR;
+        }
+
+        ocf->addrs = u.addrs;
+        ocf->naddrs = u.naddrs;
+        ocf->host = u.host;
+        ocf->uri = u.uri;
+        ocf->port = u.port;
+    }
+
+    if (SSL_CTX_set_ex_data(ssl->ctx, ngx_ssl_ocsp_index, ocf) == 0) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CTX_set_ex_data() failed");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_ocsp_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_resolver_t *resolver, ngx_msec_t resolver_timeout)
+{
+    ngx_ssl_ocsp_conf_t  *ocf;
+
+    ocf = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_ocsp_index);
+    ocf->resolver = resolver;
+    ocf->resolver_timeout = resolver_timeout;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_ocsp_validate(ngx_connection_t *c)
+{
+    X509                 *cert;
+    SSL_CTX              *ssl_ctx;
+    ngx_int_t             rc;
+    X509_STORE           *store;
+    X509_STORE_CTX       *store_ctx;
+    STACK_OF(X509)       *chain;
+    ngx_ssl_ocsp_t       *ocsp;
+    ngx_ssl_ocsp_conf_t  *ocf;
+
+    if (c->ssl->in_ocsp) {
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        return NGX_AGAIN;
+    }
+
+    ssl_ctx = SSL_get_SSL_CTX(c->ssl->connection);
+
+    ocf = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_ocsp_index);
+    if (ocf == NULL) {
+        return NGX_OK;
+    }
+
+    if (SSL_get_verify_result(c->ssl->connection) != X509_V_OK) {
+        return NGX_OK;
+    }
+
+    cert = SSL_get_peer_certificate(c->ssl->connection);
+    if (cert == NULL) {
+        return NGX_OK;
+    }
+
+    ocsp = ngx_pcalloc(c->pool, sizeof(ngx_ssl_ocsp_t));
+    if (ocsp == NULL) {
+        X509_free(cert);
+        return NGX_ERROR;
+    }
+
+    c->ssl->ocsp = ocsp;
+
+    ocsp->status = NGX_AGAIN;
+    ocsp->cert_status = V_OCSP_CERTSTATUS_GOOD;
+    ocsp->conf = ocf;
+
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER)
+
+    ocsp->certs = SSL_get0_verified_chain(c->ssl->connection);
+
+    if (ocsp->certs) {
+        ocsp->certs = X509_chain_up_ref(ocsp->certs);
+        if (ocsp->certs == NULL) {
+            X509_free(cert);
+            return NGX_ERROR;
+        }
+    }
+
+#endif
+
+    if (ocsp->certs == NULL) {
+        store = SSL_CTX_get_cert_store(ssl_ctx);
+        if (store == NULL) {
+            ngx_ssl_error(NGX_LOG_ERR, c->log, 0,
+                          "SSL_CTX_get_cert_store() failed");
+            X509_free(cert);
+            return NGX_ERROR;
+        }
+
+        store_ctx = X509_STORE_CTX_new();
+        if (store_ctx == NULL) {
+            ngx_ssl_error(NGX_LOG_ERR, c->log, 0,
+                          "X509_STORE_CTX_new() failed");
+            X509_free(cert);
+            return NGX_ERROR;
+        }
+
+        chain = SSL_get_peer_cert_chain(c->ssl->connection);
+
+        if (X509_STORE_CTX_init(store_ctx, store, cert, chain) == 0) {
+            ngx_ssl_error(NGX_LOG_ERR, c->log, 0,
+                          "X509_STORE_CTX_init() failed");
+            X509_STORE_CTX_free(store_ctx);
+            X509_free(cert);
+            return NGX_ERROR;
+        }
+
+        rc = X509_verify_cert(store_ctx);
+        if (rc <= 0) {
+            ngx_ssl_error(NGX_LOG_ERR, c->log, 0, "X509_verify_cert() failed");
+            X509_STORE_CTX_free(store_ctx);
+            X509_free(cert);
+            return NGX_ERROR;
+        }
+
+        ocsp->certs = X509_STORE_CTX_get1_chain(store_ctx);
+        if (ocsp->certs == NULL) {
+            ngx_ssl_error(NGX_LOG_ERR, c->log, 0,
+                          "X509_STORE_CTX_get1_chain() failed");
+            X509_STORE_CTX_free(store_ctx);
+            X509_free(cert);
+            return NGX_ERROR;
+        }
+
+        X509_STORE_CTX_free(store_ctx);
+    }
+
+    X509_free(cert);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "ssl ocsp validate, certs:%d", sk_X509_num(ocsp->certs));
+
+    ngx_ssl_ocsp_validate_next(c);
+
+    if (ocsp->status == NGX_AGAIN) {
+        c->ssl->in_ocsp = 1;
+        return NGX_AGAIN;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_ssl_ocsp_validate_next(ngx_connection_t *c)
+{
+    ngx_int_t             rc;
+    ngx_uint_t            n;
+    ngx_ssl_ocsp_t       *ocsp;
+    ngx_ssl_ocsp_ctx_t   *ctx;
+    ngx_ssl_ocsp_conf_t  *ocf;
+
+    ocsp = c->ssl->ocsp;
+    ocf = ocsp->conf;
+
+    n = sk_X509_num(ocsp->certs);
+
+    for ( ;; ) {
+
+        if (ocsp->ncert == n - 1 || (ocf->depth == 2 && ocsp->ncert == 1)) {
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "ssl ocsp validated, certs:%ui", ocsp->ncert);
+            rc = NGX_OK;
+            goto done;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "ssl ocsp validate cert:%ui", ocsp->ncert);
+
+        ctx = ngx_ssl_ocsp_start(c->log);
+        if (ctx == NULL) {
+            rc = NGX_ERROR;
+            goto done;
+        }
+
+        ocsp->ctx = ctx;
+
+        ctx->ssl_ctx = SSL_get_SSL_CTX(c->ssl->connection);
+        ctx->cert = sk_X509_value(ocsp->certs, ocsp->ncert);
+        ctx->issuer = sk_X509_value(ocsp->certs, ocsp->ncert + 1);
+        ctx->chain = ocsp->certs;
+
+        ctx->resolver = ocf->resolver;
+        ctx->resolver_timeout = ocf->resolver_timeout;
+
+        ctx->handler = ngx_ssl_ocsp_handler;
+        ctx->data = c;
+
+        ctx->shm_zone = ocf->shm_zone;
+
+        ctx->addrs = ocf->addrs;
+        ctx->naddrs = ocf->naddrs;
+        ctx->host = ocf->host;
+        ctx->uri = ocf->uri;
+        ctx->port = ocf->port;
+
+        rc = ngx_ssl_ocsp_responder(c, ctx);
+        if (rc != NGX_OK) {
+            goto done;
+        }
+
+        if (ctx->uri.len == 0) {
+            ngx_str_set(&ctx->uri, "/");
+        }
+
+        ocsp->ncert++;
+
+        rc = ngx_ssl_ocsp_cache_lookup(ctx);
+
+        if (rc == NGX_ERROR) {
+            goto done;
+        }
+
+        if (rc == NGX_DECLINED) {
+            break;
+        }
+
+        /* rc == NGX_OK */
+
+        if (ctx->status != V_OCSP_CERTSTATUS_GOOD) {
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                           "ssl ocsp cached status \"%s\"",
+                           OCSP_cert_status_str(ctx->status));
+            ocsp->cert_status = ctx->status;
+            goto done;
+        }
+
+        ocsp->ctx = NULL;
+        ngx_ssl_ocsp_done(ctx);
+    }
+
+    ngx_ssl_ocsp_request(ctx);
+    return;
+
+done:
+
+    ocsp->status = rc;
+
+    if (c->ssl->in_ocsp) {
+        c->ssl->handshaked = 1;
+        c->ssl->handler(c);
+    }
+}
+
+
+static void
+ngx_ssl_ocsp_handler(ngx_ssl_ocsp_ctx_t *ctx)
+{
+    ngx_int_t          rc;
+    ngx_ssl_ocsp_t    *ocsp;
+    ngx_connection_t  *c;
+
+    c = ctx->data;
+    ocsp = c->ssl->ocsp;
+    ocsp->ctx = NULL;
+
+    rc = ngx_ssl_ocsp_verify(ctx);
+    if (rc != NGX_OK) {
+        goto done;
+    }
+
+    rc = ngx_ssl_ocsp_cache_store(ctx);
+    if (rc != NGX_OK) {
+        goto done;
+    }
+
+    if (ctx->status != V_OCSP_CERTSTATUS_GOOD) {
+        ocsp->cert_status = ctx->status;
+        goto done;
+    }
+
+    ngx_ssl_ocsp_done(ctx);
+
+    ngx_ssl_ocsp_validate_next(c);
+
+    return;
+
+done:
+
+    ocsp->status = rc;
+    ngx_ssl_ocsp_done(ctx);
+
+    if (c->ssl->in_ocsp) {
+        c->ssl->handshaked = 1;
+        c->ssl->handler(c);
+    }
+}
+
+
+static ngx_int_t
+ngx_ssl_ocsp_responder(ngx_connection_t *c, ngx_ssl_ocsp_ctx_t *ctx)
+{
+    char                      *s;
+    ngx_str_t                  responder;
+    ngx_url_t                  u;
+    STACK_OF(OPENSSL_STRING)  *aia;
+
+    if (ctx->host.len) {
+        return NGX_OK;
+    }
+
+    /* extract OCSP responder URL from certificate */
+
+    aia = X509_get1_ocsp(ctx->cert);
+    if (aia == NULL) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                      "no OCSP responder URL in certificate");
+        return NGX_ERROR;
+    }
+
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    s = sk_OPENSSL_STRING_value(aia, 0);
+#else
+    s = sk_value(aia, 0);
+#endif
+    if (s == NULL) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                      "no OCSP responder URL in certificate");
+        X509_email_free(aia);
+        return NGX_ERROR;
+    }
+
+    responder.len = ngx_strlen(s);
+    responder.data = ngx_palloc(ctx->pool, responder.len);
+    if (responder.data == NULL) {
+        X509_email_free(aia);
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(responder.data, s, responder.len);
+    X509_email_free(aia);
+
+    ngx_memzero(&u, sizeof(ngx_url_t));
+
+    u.url = responder;
+    u.default_port = 80;
+    u.uri_part = 1;
+    u.no_resolve = 1;
+
+    if (u.url.len > 7
+        && ngx_strncasecmp(u.url.data, (u_char *) "http://", 7) == 0)
+    {
+        u.url.len -= 7;
+        u.url.data += 7;
+
+    } else {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                      "invalid URL prefix in OCSP responder \"%V\" "
+                      "in certificate", &u.url);
+        return NGX_ERROR;
+    }
+
+    if (ngx_parse_url(ctx->pool, &u) != NGX_OK) {
+        if (u.err) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                          "%s in OCSP responder \"%V\" in certificate",
+                          u.err, &u.url);
+        }
+
+        return NGX_ERROR;
+    }
+
+    if (u.host.len == 0) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                      "empty host in OCSP responder in certificate");
+        return NGX_ERROR;
+    }
+
+    ctx->addrs = u.addrs;
+    ctx->naddrs = u.naddrs;
+    ctx->host = u.host;
+    ctx->uri = u.uri;
+    ctx->port = u.port;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_ocsp_get_status(ngx_connection_t *c, const char **s)
+{
+    ngx_ssl_ocsp_t  *ocsp;
+
+    ocsp = c->ssl->ocsp;
+    if (ocsp == NULL) {
+        return NGX_OK;
+    }
+
+    if (ocsp->status == NGX_ERROR) {
+        *s = "certificate status request failed";
+        return NGX_DECLINED;
+    }
+
+    switch (ocsp->cert_status) {
+
+    case V_OCSP_CERTSTATUS_GOOD:
+        return NGX_OK;
+
+    case V_OCSP_CERTSTATUS_REVOKED:
+        *s = "certificate revoked";
+        break;
+
+    default: /* V_OCSP_CERTSTATUS_UNKNOWN */
+        *s = "certificate status unknown";
+    }
+
+    return NGX_DECLINED;
+}
+
+
+void
+ngx_ssl_ocsp_cleanup(ngx_connection_t *c)
+{
+    ngx_ssl_ocsp_t  *ocsp;
+
+    ocsp = c->ssl->ocsp;
+    if (ocsp == NULL) {
+        return;
+    }
+
+    if (ocsp->ctx) {
+        ngx_ssl_ocsp_done(ocsp->ctx);
+        ocsp->ctx = NULL;
+    }
+
+    if (ocsp->certs) {
+        sk_X509_pop_free(ocsp->certs, X509_free);
+        ocsp->certs = NULL;
+    }
+}
+
+
+static ngx_ssl_ocsp_ctx_t *
+ngx_ssl_ocsp_start(ngx_log_t *log)
 {
-    ngx_log_t           *log;
     ngx_pool_t          *pool;
     ngx_ssl_ocsp_ctx_t  *ctx;
 
-    pool = ngx_create_pool(2048, ngx_cycle->log);
+    pool = ngx_create_pool(2048, log);
     if (pool == NULL) {
         return NULL;
     }
@@ -884,6 +1322,36 @@ ngx_ssl_ocsp_error(ngx_ssl_ocsp_ctx_t *ctx)
 }
 
 
+static void
+ngx_ssl_ocsp_next(ngx_ssl_ocsp_ctx_t *ctx)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                   "ssl ocsp next");
+
+    if (++ctx->naddr >= ctx->naddrs) {
+        ngx_ssl_ocsp_error(ctx);
+        return;
+    }
+
+    ctx->request->pos = ctx->request->start;
+
+    if (ctx->response) {
+        ctx->response->last = ctx->response->pos;
+    }
+
+    if (ctx->peer.connection) {
+        ngx_close_connection(ctx->peer.connection);
+        ctx->peer.connection = NULL;
+    }
+
+    ctx->state = 0;
+    ctx->count = 0;
+    ctx->done = 0;
+
+    ngx_ssl_ocsp_connect(ctx);
+}
+
+
 static void
 ngx_ssl_ocsp_request(ngx_ssl_ocsp_ctx_t *ctx)
 {
@@ -909,6 +1377,14 @@ ngx_ssl_ocsp_request(ngx_ssl_ocsp_ctx_t *ctx)
         }
 
         if (resolve == NGX_NO_RESOLVER) {
+            if (ctx->naddrs == 0) {
+                ngx_log_error(NGX_LOG_ERR, ctx->log, 0,
+                              "no resolver defined to resolve %V", &ctx->host);
+
+                ngx_ssl_ocsp_error(ctx);
+                return;
+            }
+
             ngx_log_error(NGX_LOG_WARN, ctx->log, 0,
                           "no resolver defined to resolve %V", &ctx->host);
             goto connect;
@@ -1022,16 +1498,17 @@ failed:
 static void
 ngx_ssl_ocsp_connect(ngx_ssl_ocsp_ctx_t *ctx)
 {
-    ngx_int_t  rc;
+    ngx_int_t    rc;
+    ngx_addr_t  *addr;
 
-    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
-                   "ssl ocsp connect");
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                   "ssl ocsp connect %ui/%ui", ctx->naddr, ctx->naddrs);
 
-    /* TODO: use all ip addresses */
+    addr = &ctx->addrs[ctx->naddr];
 
-    ctx->peer.sockaddr = ctx->addrs[0].sockaddr;
-    ctx->peer.socklen = ctx->addrs[0].socklen;
-    ctx->peer.name = &ctx->addrs[0].name;
+    ctx->peer.sockaddr = addr->sockaddr;
+    ctx->peer.socklen = addr->socklen;
+    ctx->peer.name = &addr->name;
     ctx->peer.get = ngx_event_get_peer;
     ctx->peer.log = ctx->log;
     ctx->peer.log_error = NGX_ERROR_ERR;
@@ -1041,11 +1518,16 @@ ngx_ssl_ocsp_connect(ngx_ssl_ocsp_ctx_t *ctx)
     ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
                    "ssl ocsp connect peer done");
 
-    if (rc == NGX_ERROR || rc == NGX_BUSY || rc == NGX_DECLINED) {
+    if (rc == NGX_ERROR) {
         ngx_ssl_ocsp_error(ctx);
         return;
     }
 
+    if (rc == NGX_BUSY || rc == NGX_DECLINED) {
+        ngx_ssl_ocsp_next(ctx);
+        return;
+    }
+
     ctx->peer.connection->data = ctx;
     ctx->peer.connection->pool = ctx->pool;
 
@@ -1054,8 +1536,10 @@ ngx_ssl_ocsp_connect(ngx_ssl_ocsp_ctx_t *ctx)
 
     ctx->process = ngx_ssl_ocsp_process_status_line;
 
-    ngx_add_timer(ctx->peer.connection->read, ctx->timeout);
-    ngx_add_timer(ctx->peer.connection->write, ctx->timeout);
+    if (ctx->timeout) {
+        ngx_add_timer(ctx->peer.connection->read, ctx->timeout);
+        ngx_add_timer(ctx->peer.connection->write, ctx->timeout);
+    }
 
     if (rc == NGX_OK) {
         ngx_ssl_ocsp_write_handler(ctx->peer.connection->write);
@@ -1080,7 +1564,7 @@ ngx_ssl_ocsp_write_handler(ngx_event_t *wev)
     if (wev->timedout) {
         ngx_log_error(NGX_LOG_ERR, wev->log, NGX_ETIMEDOUT,
                       "OCSP responder timed out");
-        ngx_ssl_ocsp_error(ctx);
+        ngx_ssl_ocsp_next(ctx);
         return;
     }
 
@@ -1089,7 +1573,7 @@ ngx_ssl_ocsp_write_handler(ngx_event_t *wev)
     n = ngx_send(c, ctx->request->pos, size);
 
     if (n == NGX_ERROR) {
-        ngx_ssl_ocsp_error(ctx);
+        ngx_ssl_ocsp_next(ctx);
         return;
     }
 
@@ -1111,7 +1595,7 @@ ngx_ssl_ocsp_write_handler(ngx_event_t *wev)
         }
     }
 
-    if (!wev->timer_set) {
+    if (!wev->timer_set && ctx->timeout) {
         ngx_add_timer(wev, ctx->timeout);
     }
 }
@@ -1134,7 +1618,7 @@ ngx_ssl_ocsp_read_handler(ngx_event_t *rev)
     if (rev->timedout) {
         ngx_log_error(NGX_LOG_ERR, rev->log, NGX_ETIMEDOUT,
                       "OCSP responder timed out");
-        ngx_ssl_ocsp_error(ctx);
+        ngx_ssl_ocsp_next(ctx);
         return;
     }
 
@@ -1158,7 +1642,7 @@ ngx_ssl_ocsp_read_handler(ngx_event_t *rev)
             rc = ctx->process(ctx);
 
             if (rc == NGX_ERROR) {
-                ngx_ssl_ocsp_error(ctx);
+                ngx_ssl_ocsp_next(ctx);
                 return;
             }
 
@@ -1189,7 +1673,7 @@ ngx_ssl_ocsp_read_handler(ngx_event_t *rev)
     ngx_log_error(NGX_LOG_ERR, ctx->log, 0,
                   "OCSP responder prematurely closed connection");
 
-    ngx_ssl_ocsp_error(ctx);
+    ngx_ssl_ocsp_next(ctx);
 }
 
 
@@ -1831,6 +2315,360 @@ ngx_ssl_ocsp_process_body(ngx_ssl_ocsp_ctx_t *ctx)
 }
 
 
+static ngx_int_t
+ngx_ssl_ocsp_verify(ngx_ssl_ocsp_ctx_t *ctx)
+{
+    int                    n;
+    size_t                 len;
+    X509_STORE            *store;
+    const u_char          *p;
+    OCSP_CERTID           *id;
+    OCSP_RESPONSE         *ocsp;
+    OCSP_BASICRESP        *basic;
+    ASN1_GENERALIZEDTIME  *thisupdate, *nextupdate;
+
+    ocsp = NULL;
+    basic = NULL;
+    id = NULL;
+
+    if (ctx->code != 200) {
+        goto error;
+    }
+
+    /* check the response */
+
+    len = ctx->response->last - ctx->response->pos;
+    p = ctx->response->pos;
+
+    ocsp = d2i_OCSP_RESPONSE(NULL, &p, len);
+    if (ocsp == NULL) {
+        ngx_ssl_error(NGX_LOG_ERR, ctx->log, 0,
+                      "d2i_OCSP_RESPONSE() failed");
+        goto error;
+    }
+
+    n = OCSP_response_status(ocsp);
+
+    if (n != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
+        ngx_log_error(NGX_LOG_ERR, ctx->log, 0,
+                      "OCSP response not successful (%d: %s)",
+                      n, OCSP_response_status_str(n));
+        goto error;
+    }
+
+    basic = OCSP_response_get1_basic(ocsp);
+    if (basic == NULL) {
+        ngx_ssl_error(NGX_LOG_ERR, ctx->log, 0,
+                      "OCSP_response_get1_basic() failed");
+        goto error;
+    }
+
+    store = SSL_CTX_get_cert_store(ctx->ssl_ctx);
+    if (store == NULL) {
+        ngx_ssl_error(NGX_LOG_CRIT, ctx->log, 0,
+                      "SSL_CTX_get_cert_store() failed");
+        goto error;
+    }
+
+    if (OCSP_basic_verify(basic, ctx->chain, store, ctx->flags) != 1) {
+        ngx_ssl_error(NGX_LOG_ERR, ctx->log, 0,
+                      "OCSP_basic_verify() failed");
+        goto error;
+    }
+
+    id = OCSP_cert_to_id(NULL, ctx->cert, ctx->issuer);
+    if (id == NULL) {
+        ngx_ssl_error(NGX_LOG_CRIT, ctx->log, 0,
+                      "OCSP_cert_to_id() failed");
+        goto error;
+    }
+
+    if (OCSP_resp_find_status(basic, id, &ctx->status, NULL, NULL,
+                              &thisupdate, &nextupdate)
+        != 1)
+    {
+        ngx_log_error(NGX_LOG_ERR, ctx->log, 0,
+                      "certificate status not found in the OCSP response");
+        goto error;
+    }
+
+    if (OCSP_check_validity(thisupdate, nextupdate, 300, -1) != 1) {
+        ngx_ssl_error(NGX_LOG_ERR, ctx->log, 0,
+                      "OCSP_check_validity() failed");
+        goto error;
+    }
+
+    if (nextupdate) {
+        ctx->valid = ngx_ssl_stapling_time(nextupdate);
+        if (ctx->valid == (time_t) NGX_ERROR) {
+            ngx_log_error(NGX_LOG_ERR, ctx->log, 0,
+                          "invalid nextUpdate time in certificate status");
+            goto error;
+        }
+
+    } else {
+        ctx->valid = NGX_MAX_TIME_T_VALUE;
+    }
+
+    OCSP_CERTID_free(id);
+    OCSP_BASICRESP_free(basic);
+    OCSP_RESPONSE_free(ocsp);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                   "ssl ocsp response, %s, %uz",
+                   OCSP_cert_status_str(ctx->status), len);
+
+    return NGX_OK;
+
+error:
+
+    if (id) {
+        OCSP_CERTID_free(id);
+    }
+
+    if (basic) {
+        OCSP_BASICRESP_free(basic);
+    }
+
+    if (ocsp) {
+        OCSP_RESPONSE_free(ocsp);
+    }
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_ssl_ocsp_cache_init(ngx_shm_zone_t *shm_zone, void *data)
+{
+    size_t                 len;
+    ngx_slab_pool_t       *shpool;
+    ngx_ssl_ocsp_cache_t  *cache;
+
+    if (data) {
+        shm_zone->data = data;
+        return NGX_OK;
+    }
+
+    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+
+    if (shm_zone->shm.exists) {
+        shm_zone->data = shpool->data;
+        return NGX_OK;
+    }
+
+    cache = ngx_slab_alloc(shpool, sizeof(ngx_ssl_ocsp_cache_t));
+    if (cache == NULL) {
+        return NGX_ERROR;
+    }
+
+    shpool->data = cache;
+    shm_zone->data = cache;
+
+    ngx_rbtree_init(&cache->rbtree, &cache->sentinel,
+                    ngx_str_rbtree_insert_value);
+
+    ngx_queue_init(&cache->expire_queue);
+
+    len = sizeof(" in OCSP cache \"\"") + shm_zone->shm.name.len;
+
+    shpool->log_ctx = ngx_slab_alloc(shpool, len);
+    if (shpool->log_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_sprintf(shpool->log_ctx, " in OCSP cache \"%V\"%Z",
+                &shm_zone->shm.name);
+
+    shpool->log_nomem = 0;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_ssl_ocsp_cache_lookup(ngx_ssl_ocsp_ctx_t *ctx)
+{
+    uint32_t                    hash;
+    ngx_shm_zone_t             *shm_zone;
+    ngx_slab_pool_t            *shpool;
+    ngx_ssl_ocsp_cache_t       *cache;
+    ngx_ssl_ocsp_cache_node_t  *node;
+
+    shm_zone = ctx->shm_zone;
+
+    if (shm_zone == NULL) {
+        return NGX_DECLINED;
+    }
+
+    if (ngx_ssl_ocsp_create_key(ctx) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0, "ssl ocsp cache lookup");
+
+    cache = shm_zone->data;
+    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+    hash = ngx_hash_key(ctx->key.data, ctx->key.len);
+
+    ngx_shmtx_lock(&shpool->mutex);
+
+    node = (ngx_ssl_ocsp_cache_node_t *)
+               ngx_str_rbtree_lookup(&cache->rbtree, &ctx->key, hash);
+
+    if (node) {
+        if (node->valid > ngx_time()) {
+            ctx->status = node->status;
+            ngx_shmtx_unlock(&shpool->mutex);
+
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                           "ssl ocsp cache hit, %s",
+                           OCSP_cert_status_str(ctx->status));
+
+            return NGX_OK;
+        }
+
+        ngx_queue_remove(&node->queue);
+        ngx_rbtree_delete(&cache->rbtree, &node->node.node);
+        ngx_slab_free_locked(shpool, node);
+
+        ngx_shmtx_unlock(&shpool->mutex);
+
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                       "ssl ocsp cache expired");
+
+        return NGX_DECLINED;
+    }
+
+    ngx_shmtx_unlock(&shpool->mutex);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0, "ssl ocsp cache miss");
+
+    return NGX_DECLINED;
+}
+
+
+static ngx_int_t
+ngx_ssl_ocsp_cache_store(ngx_ssl_ocsp_ctx_t *ctx)
+{
+    time_t                      now, valid;
+    uint32_t                    hash;
+    ngx_queue_t                *q;
+    ngx_shm_zone_t             *shm_zone;
+    ngx_slab_pool_t            *shpool;
+    ngx_ssl_ocsp_cache_t       *cache;
+    ngx_ssl_ocsp_cache_node_t  *node;
+
+    shm_zone = ctx->shm_zone;
+
+    if (shm_zone == NULL) {
+        return NGX_OK;
+    }
+
+    valid = ctx->valid;
+
+    now = ngx_time();
+
+    if (valid < now) {
+        return NGX_OK;
+    }
+
+    if (valid == NGX_MAX_TIME_T_VALUE) {
+        valid = now + 3600;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                   "ssl ocsp cache store, valid:%T", valid - now);
+
+    cache = shm_zone->data;
+    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+    hash = ngx_hash_key(ctx->key.data, ctx->key.len);
+
+    ngx_shmtx_lock(&shpool->mutex);
+
+    node = ngx_slab_calloc_locked(shpool,
+                             sizeof(ngx_ssl_ocsp_cache_node_t) + ctx->key.len);
+    if (node == NULL) {
+
+        if (!ngx_queue_empty(&cache->expire_queue)) {
+            q = ngx_queue_last(&cache->expire_queue);
+            node = ngx_queue_data(q, ngx_ssl_ocsp_cache_node_t, queue);
+
+            ngx_rbtree_delete(&cache->rbtree, &node->node.node);
+            ngx_queue_remove(q);
+            ngx_slab_free_locked(shpool, node);
+
+            node = ngx_slab_alloc_locked(shpool,
+                             sizeof(ngx_ssl_ocsp_cache_node_t) + ctx->key.len);
+        }
+
+        if (node == NULL) {
+            ngx_shmtx_unlock(&shpool->mutex);
+            ngx_log_error(NGX_LOG_ALERT, ctx->log, 0,
+                          "could not allocate new entry%s", shpool->log_ctx);
+            return NGX_ERROR;
+        }
+    }
+
+    node->node.str.len = ctx->key.len;
+    node->node.str.data = (u_char *) node + sizeof(ngx_ssl_ocsp_cache_node_t);
+    ngx_memcpy(node->node.str.data, ctx->key.data, ctx->key.len);
+    node->node.node.key = hash;
+    node->status = ctx->status;
+    node->valid = valid;
+
+    ngx_rbtree_insert(&cache->rbtree, &node->node.node);
+    ngx_queue_insert_head(&cache->expire_queue, &node->queue);
+
+    ngx_shmtx_unlock(&shpool->mutex);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_ssl_ocsp_create_key(ngx_ssl_ocsp_ctx_t *ctx)
+{
+    u_char        *p;
+    X509_NAME     *name;
+    ASN1_INTEGER  *serial;
+
+    p = ngx_pnalloc(ctx->pool, 60);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->key.data = p;
+    ctx->key.len = 60;
+
+    name = X509_get_subject_name(ctx->issuer);
+    if (X509_NAME_digest(name, EVP_sha1(), p, NULL) == 0) {
+        return NGX_ERROR;
+    }
+
+    p += 20;
+
+    if (X509_pubkey_digest(ctx->issuer, EVP_sha1(), p, NULL) == 0) {
+        return NGX_ERROR;
+    }
+
+    p += 20;
+
+    serial = X509_get_serialNumber(ctx->cert);
+    if (serial->length > 20) {
+        return NGX_ERROR;
+    }
+
+    p = ngx_cpymem(p, serial->data, serial->length);
+    ngx_memzero(p, 20 - serial->length);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                   "ssl ocsp key %xV", &ctx->key);
+
+    return NGX_OK;
+}
+
+
 static u_char *
 ngx_ssl_ocsp_log_error(ngx_log_t *log, u_char *buf, size_t len)
 {
@@ -1891,4 +2729,50 @@ ngx_ssl_stapling_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
 }
 
 
+ngx_int_t
+ngx_ssl_ocsp(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *responder,
+    ngx_uint_t depth, ngx_shm_zone_t *shm_zone)
+{
+    ngx_log_error(NGX_LOG_EMERG, ssl->log, 0,
+                  "\"ssl_ocsp\" is not supported on this platform");
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_ssl_ocsp_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
+    ngx_resolver_t *resolver, ngx_msec_t resolver_timeout)
+{
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_ocsp_validate(ngx_connection_t *c)
+{
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_ssl_ocsp_get_status(ngx_connection_t *c, const char **s)
+{
+    return NGX_OK;
+}
+
+
+void
+ngx_ssl_ocsp_cleanup(ngx_connection_t *c)
+{
+}
+
+
+ngx_int_t
+ngx_ssl_ocsp_cache_init(ngx_shm_zone_t *shm_zone, void *data)
+{
+    return NGX_OK;
+}
+
+
 #endif
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index 531b13a..54412e1 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -960,6 +960,22 @@ ngx_event_pipe_copy_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
         return NGX_OK;
     }
 
+    if (p->upstream_done) {
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
+                       "input data after close");
+        return NGX_OK;
+    }
+
+    if (p->length == 0) {
+        p->upstream_done = 1;
+
+        ngx_log_error(NGX_LOG_WARN, p->log, 0,
+                      "upstream sent more data than specified in "
+                      "\"Content-Length\" header");
+
+        return NGX_OK;
+    }
+
     cl = ngx_chain_get_free_buf(p->pool, &p->free);
     if (cl == NULL) {
         return NGX_ERROR;
@@ -987,6 +1003,18 @@ ngx_event_pipe_copy_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
         return NGX_OK;
     }
 
+    if (b->last - b->pos > p->length) {
+
+        ngx_log_error(NGX_LOG_WARN, p->log, 0,
+                      "upstream sent more data than specified in "
+                      "\"Content-Length\" header");
+
+        b->last = b->pos + p->length;
+        p->upstream_done = 1;
+
+        return NGX_OK;
+    }
+
     p->length -= b->last - b->pos;
 
     return NGX_OK;
diff --git a/src/event/ngx_event_udp.c b/src/event/ngx_event_udp.c
index 5572830..a524ae0 100644
--- a/src/event/ngx_event_udp.c
+++ b/src/event/ngx_event_udp.c
@@ -363,6 +363,8 @@ ngx_event_recvmsg(ngx_event_t *ev)
 
         c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
 
+        c->start_time = ngx_current_msec;
+
 #if (NGX_STAT_STUB)
         (void) ngx_atomic_fetch_add(ngx_stat_handled, 1);
 #endif
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 2be0672..5191880 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -81,12 +81,15 @@ typedef struct {
     size_t                         length;
     size_t                         padding;
 
+    off_t                          rest;
+
     ngx_chain_t                   *free;
     ngx_chain_t                   *busy;
 
     unsigned                       fastcgi_stdout:1;
     unsigned                       large_stderr:1;
     unsigned                       header_sent:1;
+    unsigned                       closed:1;
 
     ngx_array_t                   *split_parts;
 
@@ -2075,13 +2078,31 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_fastcgi_input_filter_init(void *data)
 {
-    ngx_http_request_t           *r = data;
+    ngx_http_request_t  *r = data;
+
+    ngx_http_upstream_t          *u;
+    ngx_http_fastcgi_ctx_t       *f;
     ngx_http_fastcgi_loc_conf_t  *flcf;
 
+    u = r->upstream;
+
+    f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module);
     flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module);
 
-    r->upstream->pipe->length = flcf->keep_conn ?
-                                (off_t) sizeof(ngx_http_fastcgi_header_t) : -1;
+    u->pipe->length = flcf->keep_conn ?
+                      (off_t) sizeof(ngx_http_fastcgi_header_t) : -1;
+
+    if (u->headers_in.status_n == NGX_HTTP_NO_CONTENT
+        || u->headers_in.status_n == NGX_HTTP_NOT_MODIFIED)
+    {
+        f->rest = 0;
+
+    } else if (r->method == NGX_HTTP_HEAD) {
+        f->rest = -2;
+
+    } else {
+        f->rest = u->headers_in.content_length_n;
+    }
 
     return NGX_OK;
 }
@@ -2106,6 +2127,15 @@ ngx_http_fastcgi_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
     f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module);
     flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module);
 
+    if (p->upstream_done || f->closed) {
+        r->upstream->keepalive = 0;
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0,
+                       "http fastcgi data after close");
+
+        return NGX_OK;
+    }
+
     b = NULL;
     prev = &buf->shadow;
 
@@ -2128,13 +2158,25 @@ ngx_http_fastcgi_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
             if (f->type == NGX_HTTP_FASTCGI_STDOUT && f->length == 0) {
                 f->state = ngx_http_fastcgi_st_padding;
 
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0,
+                               "http fastcgi closed stdout");
+
+                if (f->rest > 0) {
+                    ngx_log_error(NGX_LOG_ERR, p->log, 0,
+                                  "upstream prematurely closed "
+                                  "FastCGI stdout");
+
+                    p->upstream_error = 1;
+                    p->upstream_eof = 0;
+                    f->closed = 1;
+
+                    break;
+                }
+
                 if (!flcf->keep_conn) {
                     p->upstream_done = 1;
                 }
 
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0,
-                               "http fastcgi closed stdout");
-
                 continue;
             }
 
@@ -2143,6 +2185,18 @@ ngx_http_fastcgi_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
                 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0,
                                "http fastcgi sent end request");
 
+                if (f->rest > 0) {
+                    ngx_log_error(NGX_LOG_ERR, p->log, 0,
+                                  "upstream prematurely closed "
+                                  "FastCGI request");
+
+                    p->upstream_error = 1;
+                    p->upstream_eof = 0;
+                    f->closed = 1;
+
+                    break;
+                }
+
                 if (!flcf->keep_conn) {
                     p->upstream_done = 1;
                     break;
@@ -2252,6 +2306,18 @@ ngx_http_fastcgi_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
             break;
         }
 
+        if (f->rest == -2) {
+            f->rest = r->upstream->headers_in.content_length_n;
+        }
+
+        if (f->rest == 0) {
+            ngx_log_error(NGX_LOG_WARN, p->log, 0,
+                          "upstream sent more data than specified in "
+                          "\"Content-Length\" header");
+            p->upstream_done = 1;
+            break;
+        }
+
         cl = ngx_chain_get_free_buf(p->pool, &p->free);
         if (cl == NULL) {
             return NGX_ERROR;
@@ -2289,15 +2355,27 @@ ngx_http_fastcgi_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
             f->pos += f->length;
             b->last = f->pos;
 
-            continue;
+        } else {
+            f->length -= f->last - f->pos;
+            f->pos = f->last;
+            b->last = f->last;
         }
 
-        f->length -= f->last - f->pos;
+        if (f->rest > 0) {
 
-        b->last = f->last;
+            if (b->last - b->pos > f->rest) {
+                ngx_log_error(NGX_LOG_WARN, p->log, 0,
+                              "upstream sent more data than specified in "
+                              "\"Content-Length\" header");
 
-        break;
+                b->last = b->pos + f->rest;
+                p->upstream_done = 1;
 
+                break;
+            }
+
+            f->rest -= b->last - b->pos;
+        }
     }
 
     if (flcf->keep_conn) {
@@ -2391,6 +2469,14 @@ ngx_http_fastcgi_non_buffered_filter(void *data, ssize_t bytes)
 
             if (f->type == NGX_HTTP_FASTCGI_END_REQUEST) {
 
+                if (f->rest > 0) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream prematurely closed "
+                                  "FastCGI request");
+                    u->error = 1;
+                    break;
+                }
+
                 if (f->pos + f->padding < f->last) {
                     u->length = 0;
                     break;
@@ -2486,6 +2572,14 @@ ngx_http_fastcgi_non_buffered_filter(void *data, ssize_t bytes)
             break;
         }
 
+        if (f->rest == 0) {
+            ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                          "upstream sent more data than specified in "
+                          "\"Content-Length\" header");
+            u->length = 0;
+            break;
+        }
+
         cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs);
         if (cl == NULL) {
             return NGX_ERROR;
@@ -2510,13 +2604,27 @@ ngx_http_fastcgi_non_buffered_filter(void *data, ssize_t bytes)
             f->pos += f->length;
             b->last = f->pos;
 
-            continue;
+        } else {
+            f->length -= f->last - f->pos;
+            f->pos = f->last;
+            b->last = f->last;
         }
 
-        f->length -= f->last - f->pos;
-        b->last = f->last;
+        if (f->rest > 0) {
 
-        break;
+            if (b->last - b->pos > f->rest) {
+                ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                              "upstream sent more data than specified in "
+                              "\"Content-Length\" header");
+
+                b->last = b->pos + f->rest;
+                u->length = 0;
+
+                break;
+            }
+
+            f->rest -= b->last - b->pos;
+        }
     }
 
     return NGX_OK;
diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c
index 7b72fae..cc06d53 100644
--- a/src/http/modules/ngx_http_flv_module.c
+++ b/src/http/modules/ngx_http_flv_module.c
@@ -156,12 +156,6 @@ ngx_http_flv_handler(ngx_http_request_t *r)
     }
 
     if (!of.is_file) {
-
-        if (ngx_close_file(of.fd) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                          ngx_close_file_n " \"%s\" failed", path.data);
-        }
-
         return NGX_DECLINED;
     }
 
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
index d4af66d..27a36e8 100644
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -40,6 +40,7 @@ typedef struct {
     ngx_str_t                  ssl_certificate;
     ngx_str_t                  ssl_certificate_key;
     ngx_array_t               *ssl_passwords;
+    ngx_array_t               *ssl_conf_commands;
 #endif
 } ngx_http_grpc_loc_conf_t;
 
@@ -84,6 +85,8 @@ typedef struct {
     ngx_uint_t                 pings;
     ngx_uint_t                 settings;
 
+    off_t                      length;
+
     ssize_t                    send_window;
     size_t                     recv_window;
 
@@ -120,6 +123,8 @@ typedef struct {
     unsigned                   end_stream:1;
     unsigned                   done:1;
     unsigned                   status:1;
+    unsigned                   rst:1;
+    unsigned                   goaway:1;
 
     ngx_http_request_t        *request;
 
@@ -205,6 +210,8 @@ static char *ngx_http_grpc_pass(ngx_conf_t *cf, ngx_command_t *cmd,
 #if (NGX_HTTP_SSL)
 static char *ngx_http_grpc_ssl_password_file(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
+static char *ngx_http_grpc_ssl_conf_command_check(ngx_conf_t *cf, void *post,
+    void *data);
 static ngx_int_t ngx_http_grpc_set_ssl(ngx_conf_t *cf,
     ngx_http_grpc_loc_conf_t *glcf);
 #endif
@@ -239,6 +246,9 @@ static ngx_conf_bitmask_t  ngx_http_grpc_ssl_protocols[] = {
     { ngx_null_string, 0 }
 };
 
+static ngx_conf_post_t  ngx_http_grpc_ssl_conf_command_post =
+    { ngx_http_grpc_ssl_conf_command_check };
+
 #endif
 
 
@@ -435,6 +445,13 @@ static ngx_command_t  ngx_http_grpc_commands[] = {
       0,
       NULL },
 
+    { ngx_string("grpc_ssl_conf_command"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_keyval_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_grpc_loc_conf_t, ssl_conf_commands),
+      &ngx_http_grpc_ssl_conf_command_post },
+
 #endif
 
       ngx_null_command
@@ -1125,20 +1142,11 @@ ngx_http_grpc_create_request(ngx_http_request_t *r)
 
     f->flags |= NGX_HTTP_V2_END_HEADERS_FLAG;
 
-#if (NGX_DEBUG)
-    if (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP) {
-        u_char  buf[512];
-        size_t  n, m;
-
-        n = ngx_min(b->last - b->pos, 256);
-        m = ngx_hex_dump(buf, b->pos, n) - buf;
-
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "grpc header: %*s%s, len: %uz",
-                       m, buf, b->last - b->pos > 256 ? "..." : "",
-                       b->last - b->pos);
-    }
-#endif
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc header: %*xs%s, len: %uz",
+                   (size_t) ngx_min(b->last - b->pos, 256), b->pos,
+                   b->last - b->pos > 256 ? "..." : "",
+                   b->last - b->pos);
 
     if (r->request_body_no_buffering) {
 
@@ -1205,6 +1213,8 @@ ngx_http_grpc_reinit_request(ngx_http_request_t *r)
     ctx->end_stream = 0;
     ctx->done = 0;
     ctx->status = 0;
+    ctx->rst = 0;
+    ctx->goaway = 0;
     ctx->connection = NULL;
 
     return NGX_OK;
@@ -1560,6 +1570,7 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
             && ctx->out == NULL
             && ctx->output_closed
             && !ctx->output_blocked
+            && !ctx->goaway
             && ctx->state == ngx_http_grpc_st_start)
         {
             u->keepalive = 1;
@@ -1587,20 +1598,11 @@ ngx_http_grpc_process_header(ngx_http_request_t *r)
     u = r->upstream;
     b = &u->buffer;
 
-#if (NGX_DEBUG)
-    if (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP) {
-        u_char  buf[512];
-        size_t  n, m;
-
-        n = ngx_min(b->last - b->pos, 256);
-        m = ngx_hex_dump(buf, b->pos, n) - buf;
-
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "grpc response: %*s%s, len: %uz",
-                       m, buf, b->last - b->pos > 256 ? "..." : "",
-                       b->last - b->pos);
-    }
-#endif
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "grpc response: %*xs%s, len: %uz",
+                   (size_t) ngx_min(b->last - b->pos, 256),
+                   b->pos, b->last - b->pos > 256 ? "..." : "",
+                   b->last - b->pos);
 
     ctx = ngx_http_grpc_get_ctx(r);
 
@@ -1718,6 +1720,8 @@ ngx_http_grpc_process_header(ngx_http_request_t *r)
                 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
             }
 
+            ctx->goaway = 1;
+
             continue;
         }
 
@@ -1911,6 +1915,7 @@ ngx_http_grpc_process_header(ngx_http_request_t *r)
                         && ctx->out == NULL
                         && ctx->output_closed
                         && !ctx->output_blocked
+                        && !ctx->goaway
                         && b->last == b->pos)
                     {
                         u->keepalive = 1;
@@ -1951,10 +1956,29 @@ ngx_http_grpc_filter_init(void *data)
     r = ctx->request;
     u = r->upstream;
 
-    u->length = 1;
+    if (u->headers_in.status_n == NGX_HTTP_NO_CONTENT
+        || u->headers_in.status_n == NGX_HTTP_NOT_MODIFIED
+        || r->method == NGX_HTTP_HEAD)
+    {
+        ctx->length = 0;
+
+    } else {
+        ctx->length = u->headers_in.content_length_n;
+    }
 
     if (ctx->end_stream) {
+
+        if (ctx->length > 0) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "upstream prematurely closed stream");
+            return NGX_ERROR;
+        }
+
         u->length = 0;
+        ctx->done = 1;
+
+    } else {
+        u->length = 1;
     }
 
     return NGX_OK;
@@ -1997,6 +2021,12 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
 
                 if (ctx->done) {
 
+                    if (ctx->length > 0) {
+                        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                      "upstream prematurely closed stream");
+                        return NGX_ERROR;
+                    }
+
                     /*
                      * We have finished parsing the response and the
                      * remaining control frames.  If there are unsent
@@ -2014,6 +2044,7 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
                     if (ctx->in == NULL
                         && ctx->output_closed
                         && !ctx->output_blocked
+                        && !ctx->goaway
                         && ctx->state == ngx_http_grpc_st_start)
                     {
                         u->keepalive = 1;
@@ -2088,7 +2119,10 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
                 return NGX_ERROR;
             }
 
-            if (ctx->stream_id && ctx->done) {
+            if (ctx->stream_id && ctx->done
+                && ctx->type != NGX_HTTP_V2_RST_STREAM_FRAME
+                && ctx->type != NGX_HTTP_V2_WINDOW_UPDATE_FRAME)
+            {
                 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                               "upstream sent frame for closed stream %ui",
                               ctx->stream_id);
@@ -2131,11 +2165,21 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
                 return NGX_ERROR;
             }
 
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "upstream rejected request with error %ui",
-                          ctx->error);
+            if (ctx->error || !ctx->done) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream rejected request with error %ui",
+                              ctx->error);
+                return NGX_ERROR;
+            }
 
-            return NGX_ERROR;
+            if (ctx->rst) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent frame for closed stream %ui",
+                              ctx->stream_id);
+                return NGX_ERROR;
+            }
+
+            ctx->rst = 1;
         }
 
         if (ctx->type == NGX_HTTP_V2_GOAWAY_FRAME) {
@@ -2170,6 +2214,8 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
                 return NGX_ERROR;
             }
 
+            ctx->goaway = 1;
+
             continue;
         }
 
@@ -2402,6 +2448,18 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
             b->pos = b->last;
             buf->last = b->pos;
 
+            if (ctx->length != -1) {
+
+                if (buf->last - buf->pos > ctx->length) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "upstream sent response body larger "
+                                  "than indicated content length");
+                    return NGX_ERROR;
+                }
+
+                ctx->length -= buf->last - buf->pos;
+            }
+
             return NGX_AGAIN;
         }
 
@@ -2409,6 +2467,18 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
         buf->last = b->pos;
         ctx->rest = ctx->padding;
 
+        if (ctx->length != -1) {
+
+            if (buf->last - buf->pos > ctx->length) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "upstream sent response body larger "
+                              "than indicated content length");
+                return NGX_ERROR;
+            }
+
+            ctx->length -= buf->last - buf->pos;
+        }
+
     done:
 
         if (ctx->padding) {
@@ -4272,7 +4342,6 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
      *     conf->upstream.hide_headers_hash = { NULL, 0 };
      *     conf->upstream.ssl_name = NULL;
      *
-     *     conf->headers_source = NULL;
      *     conf->headers.lengths = NULL;
      *     conf->headers.values = NULL;
      *     conf->headers.hash = { NULL, 0 };
@@ -4308,6 +4377,7 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.ssl_verify = NGX_CONF_UNSET;
     conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
     conf->ssl_passwords = NGX_CONF_UNSET_PTR;
+    conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
 #endif
 
     /* the hardcoded values */
@@ -4325,6 +4395,8 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.pass_trailers = 1;
     conf->upstream.preserve_output = 1;
 
+    conf->headers_source = NGX_CONF_UNSET_PTR;
+
     ngx_str_set(&conf->upstream.module, "grpc");
 
     return conf;
@@ -4416,6 +4488,9 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->ssl_certificate_key, "");
     ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
 
+    ngx_conf_merge_ptr_value(conf->ssl_conf_commands,
+                              prev->ssl_conf_commands, NULL);
+
     if (conf->ssl && ngx_http_grpc_set_ssl(cf, conf) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
@@ -4455,9 +4530,10 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         clcf->handler = ngx_http_grpc_handler;
     }
 
-    if (conf->headers_source == NULL) {
+    ngx_conf_merge_ptr_value(conf->headers_source, prev->headers_source, NULL);
+
+    if (conf->headers_source == prev->headers_source) {
         conf->headers = prev->headers;
-        conf->headers_source = prev->headers_source;
         conf->host_set = prev->host_set;
     }
 
@@ -4782,6 +4858,17 @@ ngx_http_grpc_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static char *
+ngx_http_grpc_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
+{
+#ifndef SSL_CONF_FLAG_FILE
+    return "is not supported on this platform";
+#else
+    return NGX_CONF_OK;
+#endif
+}
+
+
 static ngx_int_t
 ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
 {
@@ -4872,6 +4959,12 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
 
 #endif
 
+    if (ngx_ssl_conf_commands(cf, glcf->upstream.ssl, glcf->ssl_conf_commands)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     return NGX_OK;
 }
 
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index c75169c..b8c5ccc 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -56,7 +56,7 @@ typedef struct {
     unsigned             done:1;
     unsigned             nomem:1;
     unsigned             buffering:1;
-    unsigned             intel:1;
+    unsigned             zlib_ng:1;
 
     size_t               zin;
     size_t               zout;
@@ -213,7 +213,7 @@ static ngx_str_t  ngx_http_gzip_ratio = ngx_string("gzip_ratio");
 static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
 static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
 
-static ngx_uint_t  ngx_http_gzip_assume_intel;
+static ngx_uint_t  ngx_http_gzip_assume_zlib_ng;
 
 
 static ngx_int_t
@@ -501,18 +501,21 @@ ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
      * 8K is for zlib deflate_state, it takes
      *  *) 5816 bytes on i386 and sparc64 (32-bit mode)
      *  *) 5920 bytes on amd64 and sparc64
+     *
+     * A zlib variant from Intel (https://github.com/jtkukunas/zlib)
+     * uses additional 16-byte padding in one of window-sized buffers.
      */
 
-    if (!ngx_http_gzip_assume_intel) {
-        ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9));
+    if (!ngx_http_gzip_assume_zlib_ng) {
+        ctx->allocated = 8192 + 16 + (1 << (wbits + 2))
+                         + (1 << (memlevel + 9));
 
     } else {
         /*
-         * A zlib variant from Intel, https://github.com/jtkukunas/zlib.
-         * It can force window bits to 13 for fast compression level,
-         * on processors with SSE 4.2 it uses 64K hash instead of scaling
-         * it from the specified memory level, and also introduces
-         * 16-byte padding in one out of the two window-sized buffers.
+         * Another zlib variant, https://github.com/zlib-ng/zlib-ng.
+         * It forces window bits to 13 for fast compression level,
+         * uses 16-byte padding in one of window-sized buffers, and
+         * uses 128K hash.
          */
 
         if (conf->level == 1) {
@@ -520,9 +523,8 @@ ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
         }
 
         ctx->allocated = 8192 + 16 + (1 << (wbits + 2))
-                         + (1 << (ngx_max(memlevel, 8) + 8))
-                         + (1 << (memlevel + 8));
-        ctx->intel = 1;
+                         + 131072 + (1 << (memlevel + 8));
+        ctx->zlib_ng = 1;
     }
 }
 
@@ -945,13 +947,13 @@ ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
         return p;
     }
 
-    if (ctx->intel) {
+    if (ctx->zlib_ng) {
         ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0,
                       "gzip filter failed to use preallocated memory: "
                       "%ud of %ui", items * size, ctx->allocated);
 
     } else {
-        ngx_http_gzip_assume_intel = 1;
+        ngx_http_gzip_assume_zlib_ng = 1;
     }
 
     p = ngx_palloc(ctx->request->pool, items * size);
diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c
index 6bd3e6a..2b062a3 100644
--- a/src/http/modules/ngx_http_limit_req_module.c
+++ b/src/http/modules/ngx_http_limit_req_module.c
@@ -69,6 +69,8 @@ static ngx_int_t ngx_http_limit_req_lookup(ngx_http_limit_req_limit_t *limit,
     ngx_uint_t hash, ngx_str_t *key, ngx_uint_t *ep, ngx_uint_t account);
 static ngx_msec_t ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits,
     ngx_uint_t n, ngx_uint_t *ep, ngx_http_limit_req_limit_t **limit);
+static void ngx_http_limit_req_unlock(ngx_http_limit_req_limit_t *limits,
+    ngx_uint_t n);
 static void ngx_http_limit_req_expire(ngx_http_limit_req_ctx_t *ctx,
     ngx_uint_t n);
 
@@ -223,6 +225,7 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
         ctx = limit->shm_zone->data;
 
         if (ngx_http_complex_value(r, &ctx->key, &key) != NGX_OK) {
+            ngx_http_limit_req_unlock(limits, n);
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
 
@@ -270,21 +273,7 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
                         &limit->shm_zone->shm.name);
         }
 
-        while (n--) {
-            ctx = limits[n].shm_zone->data;
-
-            if (ctx->node == NULL) {
-                continue;
-            }
-
-            ngx_shmtx_lock(&ctx->shpool->mutex);
-
-            ctx->node->count--;
-
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            ctx->node = NULL;
-        }
+        ngx_http_limit_req_unlock(limits, n);
 
         if (lrcf->dry_run) {
             r->main->limit_req_status = NGX_HTTP_LIMIT_REQ_REJECTED_DRY_RUN;
@@ -321,8 +310,13 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
 
     r->main->limit_req_status = NGX_HTTP_LIMIT_REQ_DELAYED;
 
-    if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    if (r->connection->read->ready) {
+        ngx_post_event(r->connection->read, &ngx_posted_events);
+
+    } else {
+        if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
     }
 
     r->read_event_handler = ngx_http_test_reading;
@@ -612,6 +606,29 @@ ngx_http_limit_req_account(ngx_http_limit_req_limit_t *limits, ngx_uint_t n,
 }
 
 
+static void
+ngx_http_limit_req_unlock(ngx_http_limit_req_limit_t *limits, ngx_uint_t n)
+{
+    ngx_http_limit_req_ctx_t  *ctx;
+
+    while (n--) {
+        ctx = limits[n].shm_zone->data;
+
+        if (ctx->node == NULL) {
+            continue;
+        }
+
+        ngx_shmtx_lock(&ctx->shpool->mutex);
+
+        ctx->node->count--;
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+
+        ctx->node = NULL;
+    }
+}
+
+
 static void
 ngx_http_limit_req_expire(ngx_http_limit_req_ctx_t *ctx, ngx_uint_t n)
 {
diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
index 775bd7e..c82df6e 100644
--- a/src/http/modules/ngx_http_memcached_module.c
+++ b/src/http/modules/ngx_http_memcached_module.c
@@ -485,10 +485,11 @@ ngx_http_memcached_filter(void *data, ssize_t bytes)
 
     if (u->length == (ssize_t) ctx->rest) {
 
-        if (ngx_strncmp(b->last,
+        if (bytes > u->length
+            || ngx_strncmp(b->last,
                    ngx_http_memcached_end + NGX_HTTP_MEMCACHED_END - ctx->rest,
                    bytes)
-            != 0)
+               != 0)
         {
             ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0,
                           "memcached sent invalid trailer");
@@ -540,7 +541,9 @@ ngx_http_memcached_filter(void *data, ssize_t bytes)
 
     last += (size_t) (u->length - NGX_HTTP_MEMCACHED_END);
 
-    if (ngx_strncmp(last, ngx_http_memcached_end, b->last - last) != 0) {
+    if (bytes > u->length
+        || ngx_strncmp(last, ngx_http_memcached_end, b->last - last) != 0)
+    {
         ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0,
                       "memcached sent invalid trailer");
 
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index c1006ab..0e93fbd 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -521,12 +521,6 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
     }
 
     if (!of.is_file) {
-
-        if (ngx_close_file(of.fd) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                          ngx_close_file_n " \"%s\" failed", path.data);
-        }
-
         return NGX_DECLINED;
     }
 
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 3aafb99..a63c3ed 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -10,6 +10,19 @@
 #include <ngx_http.h>
 
 
+#define  NGX_HTTP_PROXY_COOKIE_SECURE           0x0001
+#define  NGX_HTTP_PROXY_COOKIE_SECURE_ON        0x0002
+#define  NGX_HTTP_PROXY_COOKIE_SECURE_OFF       0x0004
+#define  NGX_HTTP_PROXY_COOKIE_HTTPONLY         0x0008
+#define  NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON      0x0010
+#define  NGX_HTTP_PROXY_COOKIE_HTTPONLY_OFF     0x0020
+#define  NGX_HTTP_PROXY_COOKIE_SAMESITE         0x0040
+#define  NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT  0x0080
+#define  NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX     0x0100
+#define  NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE    0x0200
+#define  NGX_HTTP_PROXY_COOKIE_SAMESITE_OFF     0x0400
+
+
 typedef struct {
     ngx_array_t                    caches;  /* ngx_http_file_cache_t * */
 } ngx_http_proxy_main_conf_t;
@@ -18,7 +31,7 @@ typedef struct {
 typedef struct ngx_http_proxy_rewrite_s  ngx_http_proxy_rewrite_t;
 
 typedef ngx_int_t (*ngx_http_proxy_rewrite_pt)(ngx_http_request_t *r,
-    ngx_table_elt_t *h, size_t prefix, size_t len,
+    ngx_str_t *value, size_t prefix, size_t len,
     ngx_http_proxy_rewrite_t *pr);
 
 struct ngx_http_proxy_rewrite_s {
@@ -35,6 +48,19 @@ struct ngx_http_proxy_rewrite_s {
 };
 
 
+typedef struct {
+    union {
+        ngx_http_complex_value_t   complex;
+#if (NGX_PCRE)
+        ngx_http_regex_t          *regex;
+#endif
+    } cookie;
+
+    ngx_array_t                    flags_values;
+    ngx_uint_t                     regex;
+} ngx_http_proxy_cookie_flags_t;
+
+
 typedef struct {
     ngx_str_t                      key_start;
     ngx_str_t                      schema;
@@ -72,6 +98,7 @@ typedef struct {
     ngx_array_t                   *redirects;
     ngx_array_t                   *cookie_domains;
     ngx_array_t                   *cookie_paths;
+    ngx_array_t                   *cookie_flags;
 
     ngx_http_complex_value_t      *method;
     ngx_str_t                      location;
@@ -100,6 +127,7 @@ typedef struct {
     ngx_str_t                      ssl_certificate;
     ngx_str_t                      ssl_certificate_key;
     ngx_array_t                   *ssl_passwords;
+    ngx_array_t                   *ssl_conf_commands;
 #endif
 } ngx_http_proxy_loc_conf_t;
 
@@ -158,10 +186,16 @@ static ngx_int_t ngx_http_proxy_rewrite_redirect(ngx_http_request_t *r,
     ngx_table_elt_t *h, size_t prefix);
 static ngx_int_t ngx_http_proxy_rewrite_cookie(ngx_http_request_t *r,
     ngx_table_elt_t *h);
+static ngx_int_t ngx_http_proxy_parse_cookie(ngx_str_t *value,
+    ngx_array_t *attrs);
 static ngx_int_t ngx_http_proxy_rewrite_cookie_value(ngx_http_request_t *r,
-    ngx_table_elt_t *h, u_char *value, ngx_array_t *rewrites);
+    ngx_str_t *value, ngx_array_t *rewrites);
+static ngx_int_t ngx_http_proxy_rewrite_cookie_flags(ngx_http_request_t *r,
+    ngx_array_t *attrs, ngx_array_t *flags);
+static ngx_int_t ngx_http_proxy_edit_cookie_flags(ngx_http_request_t *r,
+    ngx_array_t *attrs, ngx_uint_t flags);
 static ngx_int_t ngx_http_proxy_rewrite(ngx_http_request_t *r,
-    ngx_table_elt_t *h, size_t prefix, size_t len, ngx_str_t *replacement);
+    ngx_str_t *value, size_t prefix, size_t len, ngx_str_t *replacement);
 
 static ngx_int_t ngx_http_proxy_add_variables(ngx_conf_t *cf);
 static void *ngx_http_proxy_create_main_conf(ngx_conf_t *cf);
@@ -180,6 +214,8 @@ static char *ngx_http_proxy_cookie_domain(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_proxy_cookie_path(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static char *ngx_http_proxy_cookie_flags(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 static char *ngx_http_proxy_store(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 #if (NGX_HTTP_CACHE)
@@ -194,6 +230,10 @@ static char *ngx_http_proxy_ssl_password_file(ngx_conf_t *cf,
 #endif
 
 static char *ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data);
+#if (NGX_HTTP_SSL)
+static char *ngx_http_proxy_ssl_conf_command_check(ngx_conf_t *cf, void *post,
+    void *data);
+#endif
 
 static ngx_int_t ngx_http_proxy_rewrite_regex(ngx_conf_t *cf,
     ngx_http_proxy_rewrite_t *pr, ngx_str_t *regex, ngx_uint_t caseless);
@@ -239,6 +279,9 @@ static ngx_conf_bitmask_t  ngx_http_proxy_ssl_protocols[] = {
     { ngx_null_string, 0 }
 };
 
+static ngx_conf_post_t  ngx_http_proxy_ssl_conf_command_post =
+    { ngx_http_proxy_ssl_conf_command_check };
+
 #endif
 
 
@@ -282,6 +325,13 @@ static ngx_command_t  ngx_http_proxy_commands[] = {
       0,
       NULL },
 
+    { ngx_string("proxy_cookie_flags"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234,
+      ngx_http_proxy_cookie_flags,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
     { ngx_string("proxy_store"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_http_proxy_store,
@@ -722,6 +772,13 @@ static ngx_command_t  ngx_http_proxy_commands[] = {
       0,
       NULL },
 
+    { ngx_string("proxy_ssl_conf_command"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_keyval_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_proxy_loc_conf_t, ssl_conf_commands),
+      &ngx_http_proxy_ssl_conf_command_post },
+
 #endif
 
       ngx_null_command
@@ -845,6 +902,36 @@ static ngx_path_init_t  ngx_http_proxy_temp_path = {
 };
 
 
+static ngx_conf_bitmask_t  ngx_http_proxy_cookie_flags_masks[] = {
+
+    { ngx_string("secure"),
+      NGX_HTTP_PROXY_COOKIE_SECURE|NGX_HTTP_PROXY_COOKIE_SECURE_ON },
+
+    { ngx_string("nosecure"),
+      NGX_HTTP_PROXY_COOKIE_SECURE|NGX_HTTP_PROXY_COOKIE_SECURE_OFF },
+
+    { ngx_string("httponly"),
+      NGX_HTTP_PROXY_COOKIE_HTTPONLY|NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON },
+
+    { ngx_string("nohttponly"),
+      NGX_HTTP_PROXY_COOKIE_HTTPONLY|NGX_HTTP_PROXY_COOKIE_HTTPONLY_OFF },
+
+    { ngx_string("samesite=strict"),
+      NGX_HTTP_PROXY_COOKIE_SAMESITE|NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT },
+
+    { ngx_string("samesite=lax"),
+      NGX_HTTP_PROXY_COOKIE_SAMESITE|NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX },
+
+    { ngx_string("samesite=none"),
+      NGX_HTTP_PROXY_COOKIE_SAMESITE|NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE },
+
+    { ngx_string("nosamesite"),
+      NGX_HTTP_PROXY_COOKIE_SAMESITE|NGX_HTTP_PROXY_COOKIE_SAMESITE_OFF },
+
+    { ngx_null_string, 0 }
+};
+
+
 static ngx_int_t
 ngx_http_proxy_handler(ngx_http_request_t *r)
 {
@@ -906,7 +993,7 @@ ngx_http_proxy_handler(ngx_http_request_t *r)
         u->rewrite_redirect = ngx_http_proxy_rewrite_redirect;
     }
 
-    if (plcf->cookie_domains || plcf->cookie_paths) {
+    if (plcf->cookie_domains || plcf->cookie_paths || plcf->cookie_flags) {
         u->rewrite_cookie = ngx_http_proxy_rewrite_cookie;
     }
 
@@ -2015,6 +2102,25 @@ ngx_http_proxy_copy_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
         return NGX_OK;
     }
 
+    if (p->upstream_done) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0,
+                       "http proxy data after close");
+        return NGX_OK;
+    }
+
+    if (p->length == 0) {
+
+        ngx_log_error(NGX_LOG_WARN, p->log, 0,
+                      "upstream sent more data than specified in "
+                      "\"Content-Length\" header");
+
+        r = p->input_ctx;
+        r->upstream->keepalive = 0;
+        p->upstream_done = 1;
+
+        return NGX_OK;
+    }
+
     cl = ngx_chain_get_free_buf(p->pool, &p->free);
     if (cl == NULL) {
         return NGX_ERROR;
@@ -2042,20 +2148,23 @@ ngx_http_proxy_copy_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
         return NGX_OK;
     }
 
+    if (b->last - b->pos > p->length) {
+
+        ngx_log_error(NGX_LOG_WARN, p->log, 0,
+                      "upstream sent more data than specified in "
+                      "\"Content-Length\" header");
+
+        b->last = b->pos + p->length;
+        p->upstream_done = 1;
+
+        return NGX_OK;
+    }
+
     p->length -= b->last - b->pos;
 
     if (p->length == 0) {
         r = p->input_ctx;
-        p->upstream_done = 1;
         r->upstream->keepalive = !r->upstream->headers_in.connection_close;
-
-    } else if (p->length < 0) {
-        r = p->input_ctx;
-        p->upstream_done = 1;
-
-        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                      "upstream sent more data than specified in "
-                      "\"Content-Length\" header");
     }
 
     return NGX_OK;
@@ -2082,6 +2191,23 @@ ngx_http_proxy_chunked_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
         return NGX_ERROR;
     }
 
+    if (p->upstream_done) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0,
+                       "http proxy data after close");
+        return NGX_OK;
+    }
+
+    if (p->length == 0) {
+
+        ngx_log_error(NGX_LOG_WARN, p->log, 0,
+                      "upstream sent data after final chunk");
+
+        r->upstream->keepalive = 0;
+        p->upstream_done = 1;
+
+        return NGX_OK;
+    }
+
     b = NULL;
     prev = &buf->shadow;
 
@@ -2144,9 +2270,15 @@ ngx_http_proxy_chunked_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
 
             /* a whole response has been parsed successfully */
 
-            p->upstream_done = 1;
+            p->length = 0;
             r->upstream->keepalive = !r->upstream->headers_in.connection_close;
 
+            if (buf->pos != buf->last) {
+                ngx_log_error(NGX_LOG_WARN, p->log, 0,
+                              "upstream sent data after final chunk");
+                r->upstream->keepalive = 0;
+            }
+
             break;
         }
 
@@ -2161,13 +2293,13 @@ ngx_http_proxy_chunked_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
 
         /* invalid response */
 
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+        ngx_log_error(NGX_LOG_ERR, p->log, 0,
                       "upstream sent invalid chunked response");
 
         return NGX_ERROR;
     }
 
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, p->log, 0,
                    "http proxy chunked state %ui, length %O",
                    ctx->chunked.state, p->length);
 
@@ -2202,6 +2334,13 @@ ngx_http_proxy_non_buffered_copy_filter(void *data, ssize_t bytes)
 
     u = r->upstream;
 
+    if (u->length == 0) {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "upstream sent more data than specified in "
+                      "\"Content-Length\" header");
+        return NGX_OK;
+    }
+
     for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
         ll = &cl->next;
     }
@@ -2227,6 +2366,18 @@ ngx_http_proxy_non_buffered_copy_filter(void *data, ssize_t bytes)
         return NGX_OK;
     }
 
+    if (bytes > u->length) {
+
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "upstream sent more data than specified in "
+                      "\"Content-Length\" header");
+
+        cl->buf->last = cl->buf->pos + u->length;
+        u->length = 0;
+
+        return NGX_OK;
+    }
+
     u->length -= bytes;
 
     if (u->length == 0) {
@@ -2313,6 +2464,12 @@ ngx_http_proxy_non_buffered_chunked_filter(void *data, ssize_t bytes)
             u->keepalive = !u->headers_in.connection_close;
             u->length = 0;
 
+            if (buf->pos != buf->last) {
+                ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                              "upstream sent data after final chunk");
+                u->keepalive = 0;
+            }
+
             break;
         }
 
@@ -2521,7 +2678,7 @@ ngx_http_proxy_rewrite_redirect(ngx_http_request_t *r, ngx_table_elt_t *h,
     len = h->value.len - prefix;
 
     for (i = 0; i < plcf->redirects->nelts; i++) {
-        rc = pr[i].handler(r, h, prefix, len, &pr[i]);
+        rc = pr[i].handler(r, &h->value, prefix, len, &pr[i]);
 
         if (rc != NGX_DECLINED) {
             return rc;
@@ -2535,27 +2692,43 @@ ngx_http_proxy_rewrite_redirect(ngx_http_request_t *r, ngx_table_elt_t *h,
 static ngx_int_t
 ngx_http_proxy_rewrite_cookie(ngx_http_request_t *r, ngx_table_elt_t *h)
 {
-    size_t                      prefix;
     u_char                     *p;
+    size_t                      len;
     ngx_int_t                   rc, rv;
+    ngx_str_t                  *key, *value;
+    ngx_uint_t                  i;
+    ngx_array_t                 attrs;
+    ngx_keyval_t               *attr;
     ngx_http_proxy_loc_conf_t  *plcf;
 
-    p = (u_char *) ngx_strchr(h->value.data, ';');
-    if (p == NULL) {
-        return NGX_DECLINED;
+    if (ngx_array_init(&attrs, r->pool, 2, sizeof(ngx_keyval_t)) != NGX_OK) {
+        return NGX_ERROR;
     }
 
-    prefix = p + 1 - h->value.data;
+    if (ngx_http_proxy_parse_cookie(&h->value, &attrs) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    attr = attrs.elts;
+
+    if (attr[0].value.data == NULL) {
+        return NGX_DECLINED;
+    }
 
     rv = NGX_DECLINED;
 
     plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
 
-    if (plcf->cookie_domains) {
-        p = ngx_strcasestrn(h->value.data + prefix, "domain=", 7 - 1);
+    for (i = 1; i < attrs.nelts; i++) {
 
-        if (p) {
-            rc = ngx_http_proxy_rewrite_cookie_value(r, h, p + 7,
+        key = &attr[i].key;
+        value = &attr[i].value;
+
+        if (plcf->cookie_domains && key->len == 6
+            && ngx_strncasecmp(key->data, (u_char *) "domain", 6) == 0
+            && value->data)
+        {
+            rc = ngx_http_proxy_rewrite_cookie_value(r, value,
                                                      plcf->cookie_domains);
             if (rc == NGX_ERROR) {
                 return NGX_ERROR;
@@ -2565,13 +2738,12 @@ ngx_http_proxy_rewrite_cookie(ngx_http_request_t *r, ngx_table_elt_t *h)
                 rv = rc;
             }
         }
-    }
 
-    if (plcf->cookie_paths) {
-        p = ngx_strcasestrn(h->value.data + prefix, "path=", 5 - 1);
-
-        if (p) {
-            rc = ngx_http_proxy_rewrite_cookie_value(r, h, p + 5,
+        if (plcf->cookie_paths && key->len == 4
+            && ngx_strncasecmp(key->data, (u_char *) "path", 4) == 0
+            && value->data)
+        {
+            rc = ngx_http_proxy_rewrite_cookie_value(r, value,
                                                      plcf->cookie_paths);
             if (rc == NGX_ERROR) {
                 return NGX_ERROR;
@@ -2583,30 +2755,153 @@ ngx_http_proxy_rewrite_cookie(ngx_http_request_t *r, ngx_table_elt_t *h)
         }
     }
 
-    return rv;
+    if (plcf->cookie_flags) {
+        rc = ngx_http_proxy_rewrite_cookie_flags(r, &attrs,
+                                                 plcf->cookie_flags);
+        if (rc == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        if (rc != NGX_DECLINED) {
+            rv = rc;
+        }
+
+        attr = attrs.elts;
+    }
+
+    if (rv != NGX_OK) {
+        return rv;
+    }
+
+    len = 0;
+
+    for (i = 0; i < attrs.nelts; i++) {
+
+        if (attr[i].key.data == NULL) {
+            continue;
+        }
+
+        if (i > 0) {
+            len += 2;
+        }
+
+        len += attr[i].key.len;
+
+        if (attr[i].value.data) {
+            len += 1 + attr[i].value.len;
+        }
+    }
+
+    p = ngx_pnalloc(r->pool, len + 1);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    h->value.data = p;
+    h->value.len = len;
+
+    for (i = 0; i < attrs.nelts; i++) {
+
+        if (attr[i].key.data == NULL) {
+            continue;
+        }
+
+        if (i > 0) {
+            *p++ = ';';
+            *p++ = ' ';
+        }
+
+        p = ngx_cpymem(p, attr[i].key.data, attr[i].key.len);
+
+        if (attr[i].value.data) {
+            *p++ = '=';
+            p = ngx_cpymem(p, attr[i].value.data, attr[i].value.len);
+        }
+    }
+
+    *p = '\0';
+
+    return NGX_OK;
 }
 
 
 static ngx_int_t
-ngx_http_proxy_rewrite_cookie_value(ngx_http_request_t *r, ngx_table_elt_t *h,
-    u_char *value, ngx_array_t *rewrites)
+ngx_http_proxy_parse_cookie(ngx_str_t *value, ngx_array_t *attrs)
+{
+    u_char        *start, *end, *p, *last;
+    ngx_str_t      name, val;
+    ngx_keyval_t  *attr;
+
+    start = value->data;
+    end = value->data + value->len;
+
+    for ( ;; ) {
+
+        last = (u_char *) ngx_strchr(start, ';');
+
+        if (last == NULL) {
+            last = end;
+        }
+
+        while (start < last && *start == ' ') { start++; }
+
+        for (p = start; p < last && *p != '='; p++) { /* void */ }
+
+        name.data = start;
+        name.len = p - start;
+
+        while (name.len && name.data[name.len - 1] == ' ') {
+            name.len--;
+        }
+
+        if (p < last) {
+
+            p++;
+
+            while (p < last && *p == ' ') { p++; }
+
+            val.data = p;
+            val.len = last - val.data;
+
+            while (val.len && val.data[val.len - 1] == ' ') {
+                val.len--;
+            }
+
+        } else {
+            ngx_str_null(&val);
+        }
+
+        attr = ngx_array_push(attrs);
+        if (attr == NULL) {
+            return NGX_ERROR;
+        }
+
+        attr->key = name;
+        attr->value = val;
+
+        if (last == end) {
+            break;
+        }
+
+        start = last + 1;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_proxy_rewrite_cookie_value(ngx_http_request_t *r, ngx_str_t *value,
+    ngx_array_t *rewrites)
 {
-    size_t                     len, prefix;
-    u_char                    *p;
     ngx_int_t                  rc;
     ngx_uint_t                 i;
     ngx_http_proxy_rewrite_t  *pr;
 
-    prefix = value - h->value.data;
-
-    p = (u_char *) ngx_strchr(value, ';');
-
-    len = p ? (size_t) (p - value) : (h->value.len - prefix);
-
     pr = rewrites->elts;
 
     for (i = 0; i < rewrites->nelts; i++) {
-        rc = pr[i].handler(r, h, prefix, len, &pr[i]);
+        rc = pr[i].handler(r, value, 0, value->len, &pr[i]);
 
         if (rc != NGX_DECLINED) {
             return rc;
@@ -2618,8 +2913,236 @@ ngx_http_proxy_rewrite_cookie_value(ngx_http_request_t *r, ngx_table_elt_t *h,
 
 
 static ngx_int_t
-ngx_http_proxy_rewrite_complex_handler(ngx_http_request_t *r,
-    ngx_table_elt_t *h, size_t prefix, size_t len, ngx_http_proxy_rewrite_t *pr)
+ngx_http_proxy_rewrite_cookie_flags(ngx_http_request_t *r, ngx_array_t *attrs,
+    ngx_array_t *flags)
+{
+    ngx_str_t                       pattern, value;
+#if (NGX_PCRE)
+    ngx_int_t                       rc;
+#endif
+    ngx_uint_t                      i, m, f, nelts;
+    ngx_keyval_t                   *attr;
+    ngx_conf_bitmask_t             *mask;
+    ngx_http_complex_value_t       *flags_values;
+    ngx_http_proxy_cookie_flags_t  *pcf;
+
+    attr = attrs->elts;
+    pcf = flags->elts;
+
+    for (i = 0; i < flags->nelts; i++) {
+
+#if (NGX_PCRE)
+        if (pcf[i].regex) {
+            rc = ngx_http_regex_exec(r, pcf[i].cookie.regex, &attr[0].key);
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (rc == NGX_OK) {
+                break;
+            }
+
+            /* NGX_DECLINED */
+
+            continue;
+        }
+#endif
+
+        if (ngx_http_complex_value(r, &pcf[i].cookie.complex, &pattern)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        if (pattern.len == attr[0].key.len
+            && ngx_strncasecmp(attr[0].key.data, pattern.data, pattern.len)
+               == 0)
+        {
+            break;
+        }
+    }
+
+    if (i == flags->nelts) {
+        return NGX_DECLINED;
+    }
+
+    nelts = pcf[i].flags_values.nelts;
+    flags_values = pcf[i].flags_values.elts;
+
+    mask = ngx_http_proxy_cookie_flags_masks;
+    f = 0;
+
+    for (i = 0; i < nelts; i++) {
+
+        if (ngx_http_complex_value(r, &flags_values[i], &value) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (value.len == 0) {
+            continue;
+        }
+
+        for (m = 0; mask[m].name.len != 0; m++) {
+
+            if (mask[m].name.len != value.len
+                || ngx_strncasecmp(mask[m].name.data, value.data, value.len)
+                   != 0)
+            {
+                continue;
+            }
+
+            f |= mask[m].mask;
+
+            break;
+        }
+
+        if (mask[m].name.len == 0) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "invalid proxy_cookie_flags flag \"%V\"", &value);
+        }
+    }
+
+    if (f == 0) {
+        return NGX_DECLINED;
+    }
+
+    return ngx_http_proxy_edit_cookie_flags(r, attrs, f);
+}
+
+
+static ngx_int_t
+ngx_http_proxy_edit_cookie_flags(ngx_http_request_t *r, ngx_array_t *attrs,
+    ngx_uint_t flags)
+{
+    ngx_str_t     *key, *value;
+    ngx_uint_t     i;
+    ngx_keyval_t  *attr;
+
+    attr = attrs->elts;
+
+    for (i = 1; i < attrs->nelts; i++) {
+        key = &attr[i].key;
+
+        if (key->len == 6
+            && ngx_strncasecmp(key->data, (u_char *) "secure", 6) == 0)
+        {
+            if (flags & NGX_HTTP_PROXY_COOKIE_SECURE_ON) {
+                flags &= ~NGX_HTTP_PROXY_COOKIE_SECURE_ON;
+
+            } else if (flags & NGX_HTTP_PROXY_COOKIE_SECURE_OFF) {
+                key->data = NULL;
+            }
+
+            continue;
+        }
+
+        if (key->len == 8
+            && ngx_strncasecmp(key->data, (u_char *) "httponly", 8) == 0)
+        {
+            if (flags & NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON) {
+                flags &= ~NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON;
+
+            } else if (flags & NGX_HTTP_PROXY_COOKIE_HTTPONLY_OFF) {
+                key->data = NULL;
+            }
+
+            continue;
+        }
+
+        if (key->len == 8
+            && ngx_strncasecmp(key->data, (u_char *) "samesite", 8) == 0)
+        {
+            value = &attr[i].value;
+
+            if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT) {
+                flags &= ~NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT;
+
+                if (value->len != 6
+                    || ngx_strncasecmp(value->data, (u_char *) "strict", 6)
+                       != 0)
+                {
+                    ngx_str_set(key, "SameSite");
+                    ngx_str_set(value, "Strict");
+                }
+
+            } else if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX) {
+                flags &= ~NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX;
+
+                if (value->len != 3
+                    || ngx_strncasecmp(value->data, (u_char *) "lax", 3) != 0)
+                {
+                    ngx_str_set(key, "SameSite");
+                    ngx_str_set(value, "Lax");
+                }
+
+            } else if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE) {
+                flags &= ~NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE;
+
+                if (value->len != 4
+                    || ngx_strncasecmp(value->data, (u_char *) "none", 4) != 0)
+                {
+                    ngx_str_set(key, "SameSite");
+                    ngx_str_set(value, "None");
+                }
+
+            } else if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_OFF) {
+                key->data = NULL;
+            }
+
+            continue;
+        }
+    }
+
+    if (flags & NGX_HTTP_PROXY_COOKIE_SECURE_ON) {
+        attr = ngx_array_push(attrs);
+        if (attr == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_str_set(&attr->key, "Secure");
+        ngx_str_null(&attr->value);
+    }
+
+    if (flags & NGX_HTTP_PROXY_COOKIE_HTTPONLY_ON) {
+        attr = ngx_array_push(attrs);
+        if (attr == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_str_set(&attr->key, "HttpOnly");
+        ngx_str_null(&attr->value);
+    }
+
+    if (flags & (NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT
+                 |NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX
+                 |NGX_HTTP_PROXY_COOKIE_SAMESITE_NONE))
+    {
+        attr = ngx_array_push(attrs);
+        if (attr == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_str_set(&attr->key, "SameSite");
+
+        if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_STRICT) {
+            ngx_str_set(&attr->value, "Strict");
+
+        } else if (flags & NGX_HTTP_PROXY_COOKIE_SAMESITE_LAX) {
+            ngx_str_set(&attr->value, "Lax");
+
+        } else {
+            ngx_str_set(&attr->value, "None");
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_proxy_rewrite_complex_handler(ngx_http_request_t *r, ngx_str_t *value,
+    size_t prefix, size_t len, ngx_http_proxy_rewrite_t *pr)
 {
     ngx_str_t  pattern, replacement;
 
@@ -2628,8 +3151,7 @@ ngx_http_proxy_rewrite_complex_handler(ngx_http_request_t *r,
     }
 
     if (pattern.len > len
-        || ngx_rstrncmp(h->value.data + prefix, pattern.data,
-                        pattern.len) != 0)
+        || ngx_rstrncmp(value->data + prefix, pattern.data, pattern.len) != 0)
     {
         return NGX_DECLINED;
     }
@@ -2638,20 +3160,20 @@ ngx_http_proxy_rewrite_complex_handler(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    return ngx_http_proxy_rewrite(r, h, prefix, pattern.len, &replacement);
+    return ngx_http_proxy_rewrite(r, value, prefix, pattern.len, &replacement);
 }
 
 
 #if (NGX_PCRE)
 
 static ngx_int_t
-ngx_http_proxy_rewrite_regex_handler(ngx_http_request_t *r, ngx_table_elt_t *h,
+ngx_http_proxy_rewrite_regex_handler(ngx_http_request_t *r, ngx_str_t *value,
     size_t prefix, size_t len, ngx_http_proxy_rewrite_t *pr)
 {
     ngx_str_t  pattern, replacement;
 
     pattern.len = len;
-    pattern.data = h->value.data + prefix;
+    pattern.data = value->data + prefix;
 
     if (ngx_http_regex_exec(r, pr->pattern.regex, &pattern) != NGX_OK) {
         return NGX_DECLINED;
@@ -2661,20 +3183,15 @@ ngx_http_proxy_rewrite_regex_handler(ngx_http_request_t *r, ngx_table_elt_t *h,
         return NGX_ERROR;
     }
 
-    if (prefix == 0 && h->value.len == len) {
-        h->value = replacement;
-        return NGX_OK;
-    }
-
-    return ngx_http_proxy_rewrite(r, h, prefix, len, &replacement);
+    return ngx_http_proxy_rewrite(r, value, prefix, len, &replacement);
 }
 
 #endif
 
 
 static ngx_int_t
-ngx_http_proxy_rewrite_domain_handler(ngx_http_request_t *r,
-    ngx_table_elt_t *h, size_t prefix, size_t len, ngx_http_proxy_rewrite_t *pr)
+ngx_http_proxy_rewrite_domain_handler(ngx_http_request_t *r, ngx_str_t *value,
+    size_t prefix, size_t len, ngx_http_proxy_rewrite_t *pr)
 {
     u_char     *p;
     ngx_str_t   pattern, replacement;
@@ -2683,9 +3200,9 @@ ngx_http_proxy_rewrite_domain_handler(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    p = h->value.data + prefix;
+    p = value->data + prefix;
 
-    if (p[0] == '.') {
+    if (len && p[0] == '.') {
         p++;
         prefix++;
         len--;
@@ -2699,18 +3216,23 @@ ngx_http_proxy_rewrite_domain_handler(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    return ngx_http_proxy_rewrite(r, h, prefix, len, &replacement);
+    return ngx_http_proxy_rewrite(r, value, prefix, len, &replacement);
 }
 
 
 static ngx_int_t
-ngx_http_proxy_rewrite(ngx_http_request_t *r, ngx_table_elt_t *h, size_t prefix,
+ngx_http_proxy_rewrite(ngx_http_request_t *r, ngx_str_t *value, size_t prefix,
     size_t len, ngx_str_t *replacement)
 {
     u_char  *p, *data;
     size_t   new_len;
 
-    new_len = replacement->len + h->value.len - len;
+    if (len == value->len) {
+        *value = *replacement;
+        return NGX_OK;
+    }
+
+    new_len = replacement->len + value->len - len;
 
     if (replacement->len > len) {
 
@@ -2719,23 +3241,22 @@ ngx_http_proxy_rewrite(ngx_http_request_t *r, ngx_table_elt_t *h, size_t prefix,
             return NGX_ERROR;
         }
 
-        p = ngx_copy(data, h->value.data, prefix);
+        p = ngx_copy(data, value->data, prefix);
         p = ngx_copy(p, replacement->data, replacement->len);
 
-        ngx_memcpy(p, h->value.data + prefix + len,
-                   h->value.len - len - prefix + 1);
+        ngx_memcpy(p, value->data + prefix + len,
+                   value->len - len - prefix + 1);
 
-        h->value.data = data;
+        value->data = data;
 
     } else {
-        p = ngx_copy(h->value.data + prefix, replacement->data,
-                     replacement->len);
+        p = ngx_copy(value->data + prefix, replacement->data, replacement->len);
 
-        ngx_memmove(p, h->value.data + prefix + len,
-                    h->value.len - len - prefix + 1);
+        ngx_memmove(p, value->data + prefix + len,
+                    value->len - len - prefix + 1);
     }
 
-    h->value.len = new_len;
+    value->len = new_len;
 
     return NGX_OK;
 }
@@ -2811,7 +3332,6 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
      *     conf->method = NULL;
      *     conf->location = NULL;
      *     conf->url = { 0, NULL };
-     *     conf->headers_source = NULL;
      *     conf->headers.lengths = NULL;
      *     conf->headers.values = NULL;
      *     conf->headers.hash = { NULL, 0 };
@@ -2884,16 +3404,20 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.ssl_verify = NGX_CONF_UNSET;
     conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
     conf->ssl_passwords = NGX_CONF_UNSET_PTR;
+    conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
 #endif
 
     /* "proxy_cyclic_temp_file" is disabled */
     conf->upstream.cyclic_temp_file = 0;
 
+    conf->headers_source = NGX_CONF_UNSET_PTR;
+
     conf->redirect = NGX_CONF_UNSET;
     conf->upstream.change_buffering = 1;
 
     conf->cookie_domains = NGX_CONF_UNSET_PTR;
     conf->cookie_paths = NGX_CONF_UNSET_PTR;
+    conf->cookie_flags = NGX_CONF_UNSET_PTR;
 
     conf->http_version = NGX_CONF_UNSET_UINT;
 
@@ -3228,6 +3752,9 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->ssl_certificate_key, "");
     ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
 
+    ngx_conf_merge_ptr_value(conf->ssl_conf_commands,
+                              prev->ssl_conf_commands, NULL);
+
     if (conf->ssl && ngx_http_proxy_set_ssl(cf, conf) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
@@ -3289,6 +3816,8 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_ptr_value(conf->cookie_paths, prev->cookie_paths, NULL);
 
+    ngx_conf_merge_ptr_value(conf->cookie_flags, prev->cookie_flags, NULL);
+
     ngx_conf_merge_uint_value(conf->http_version, prev->http_version,
                               NGX_HTTP_VERSION_10);
 
@@ -3359,12 +3888,13 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
-    if (conf->headers_source == NULL) {
+    ngx_conf_merge_ptr_value(conf->headers_source, prev->headers_source, NULL);
+
+    if (conf->headers_source == prev->headers_source) {
         conf->headers = prev->headers;
 #if (NGX_HTTP_CACHE)
         conf->headers_cache = prev->headers_cache;
 #endif
-        conf->headers_source = prev->headers_source;
     }
 
     rc = ngx_http_proxy_init_headers(cf, conf, &conf->headers,
@@ -3703,7 +4233,7 @@ ngx_http_proxy_redirect(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_compile_complex_value_t   ccv;
 
     if (plcf->redirect == 0) {
-        return NGX_CONF_OK;
+        return "is duplicate";
     }
 
     plcf->redirect = 1;
@@ -3712,16 +4242,12 @@ ngx_http_proxy_redirect(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     if (cf->args->nelts == 2) {
         if (ngx_strcmp(value[1].data, "off") == 0) {
-            plcf->redirect = 0;
-            plcf->redirects = NULL;
-            return NGX_CONF_OK;
-        }
 
-        if (ngx_strcmp(value[1].data, "false") == 0) {
-            ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
-                           "invalid parameter \"false\", use \"off\" instead");
+            if (plcf->redirects) {
+                return "is duplicate";
+            }
+
             plcf->redirect = 0;
-            plcf->redirects = NULL;
             return NGX_CONF_OK;
         }
 
@@ -3745,7 +4271,9 @@ ngx_http_proxy_redirect(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    if (ngx_strcmp(value[1].data, "default") == 0) {
+    if (cf->args->nelts == 2
+        && ngx_strcmp(value[1].data, "default") == 0)
+    {
         if (plcf->proxy_lengths) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "\"proxy_redirect default\" cannot be used "
@@ -3848,7 +4376,7 @@ ngx_http_proxy_cookie_domain(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_compile_complex_value_t   ccv;
 
     if (plcf->cookie_domains == NULL) {
-        return NGX_CONF_OK;
+        return "is duplicate";
     }
 
     value = cf->args->elts;
@@ -3856,6 +4384,11 @@ ngx_http_proxy_cookie_domain(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     if (cf->args->nelts == 2) {
 
         if (ngx_strcmp(value[1].data, "off") == 0) {
+
+            if (plcf->cookie_domains != NGX_CONF_UNSET_PTR) {
+                return "is duplicate";
+            }
+
             plcf->cookie_domains = NULL;
             return NGX_CONF_OK;
         }
@@ -3935,7 +4468,7 @@ ngx_http_proxy_cookie_path(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_compile_complex_value_t   ccv;
 
     if (plcf->cookie_paths == NULL) {
-        return NGX_CONF_OK;
+        return "is duplicate";
     }
 
     value = cf->args->elts;
@@ -3943,6 +4476,11 @@ ngx_http_proxy_cookie_path(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     if (cf->args->nelts == 2) {
 
         if (ngx_strcmp(value[1].data, "off") == 0) {
+
+            if (plcf->cookie_paths != NGX_CONF_UNSET_PTR) {
+                return "is duplicate";
+            }
+
             plcf->cookie_paths = NULL;
             return NGX_CONF_OK;
         }
@@ -4012,6 +4550,126 @@ ngx_http_proxy_cookie_path(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static char *
+ngx_http_proxy_cookie_flags(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_proxy_loc_conf_t *plcf = conf;
+
+    ngx_str_t                         *value;
+    ngx_uint_t                         i;
+    ngx_http_complex_value_t          *cv;
+    ngx_http_proxy_cookie_flags_t     *pcf;
+    ngx_http_compile_complex_value_t   ccv;
+#if (NGX_PCRE)
+    ngx_regex_compile_t                rc;
+    u_char                             errstr[NGX_MAX_CONF_ERRSTR];
+#endif
+
+    if (plcf->cookie_flags == NULL) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    if (cf->args->nelts == 2) {
+
+        if (ngx_strcmp(value[1].data, "off") == 0) {
+
+            if (plcf->cookie_flags != NGX_CONF_UNSET_PTR) {
+                return "is duplicate";
+            }
+
+            plcf->cookie_flags = NULL;
+            return NGX_CONF_OK;
+        }
+
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\"", &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (plcf->cookie_flags == NGX_CONF_UNSET_PTR) {
+        plcf->cookie_flags = ngx_array_create(cf->pool, 1,
+                                        sizeof(ngx_http_proxy_cookie_flags_t));
+        if (plcf->cookie_flags == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    pcf = ngx_array_push(plcf->cookie_flags);
+    if (pcf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    pcf->regex = 0;
+
+    if (value[1].data[0] == '~') {
+        value[1].len--;
+        value[1].data++;
+
+#if (NGX_PCRE)
+        ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
+
+        rc.pattern = value[1];
+        rc.err.len = NGX_MAX_CONF_ERRSTR;
+        rc.err.data = errstr;
+        rc.options = NGX_REGEX_CASELESS;
+
+        pcf->cookie.regex = ngx_http_regex_compile(cf, &rc);
+        if (pcf->cookie.regex == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        pcf->regex = 1;
+#else
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "using regex \"%V\" requires PCRE library",
+                           &value[1]);
+        return NGX_CONF_ERROR;
+#endif
+
+    } else {
+
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+        ccv.cf = cf;
+        ccv.value = &value[1];
+        ccv.complex_value = &pcf->cookie.complex;
+
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (ngx_array_init(&pcf->flags_values, cf->pool, cf->args->nelts - 2,
+                       sizeof(ngx_http_complex_value_t))
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    for (i = 2; i < cf->args->nelts; i++) {
+
+        cv = ngx_array_push(&pcf->flags_values);
+        if (cv == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+        ccv.cf = cf;
+        ccv.value = &value[i];
+        ccv.complex_value = cv;
+
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 static ngx_int_t
 ngx_http_proxy_rewrite_regex(ngx_conf_t *cf, ngx_http_proxy_rewrite_t *pr,
     ngx_str_t *regex, ngx_uint_t caseless)
@@ -4250,6 +4908,17 @@ ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data)
 
 #if (NGX_HTTP_SSL)
 
+static char *
+ngx_http_proxy_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
+{
+#ifndef SSL_CONF_FLAG_FILE
+    return "is not supported on this platform";
+#else
+    return NGX_CONF_OK;
+#endif
+}
+
+
 static ngx_int_t
 ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
 {
@@ -4327,6 +4996,12 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
         return NGX_ERROR;
     }
 
+    if (ngx_ssl_conf_commands(cf, plcf->upstream.ssl, plcf->ssl_conf_commands)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     return NGX_OK;
 }
 
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 7216f78..600999c 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -49,6 +49,7 @@ static ngx_int_t ngx_http_scgi_create_request(ngx_http_request_t *r);
 static ngx_int_t ngx_http_scgi_reinit_request(ngx_http_request_t *r);
 static ngx_int_t ngx_http_scgi_process_status_line(ngx_http_request_t *r);
 static ngx_int_t ngx_http_scgi_process_header(ngx_http_request_t *r);
+static ngx_int_t ngx_http_scgi_input_filter_init(void *data);
 static void ngx_http_scgi_abort_request(ngx_http_request_t *r);
 static void ngx_http_scgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc);
 
@@ -534,6 +535,10 @@ ngx_http_scgi_handler(ngx_http_request_t *r)
     u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
     u->pipe->input_ctx = r;
 
+    u->input_filter_init = ngx_http_scgi_input_filter_init;
+    u->input_filter = ngx_http_upstream_non_buffered_filter;
+    u->input_filter_ctx = r;
+
     if (!scf->upstream.request_buffering
         && scf->upstream.pass_request_body
         && !r->headers_in.chunked)
@@ -1145,6 +1150,37 @@ ngx_http_scgi_process_header(ngx_http_request_t *r)
 }
 
 
+static ngx_int_t
+ngx_http_scgi_input_filter_init(void *data)
+{
+    ngx_http_request_t   *r = data;
+    ngx_http_upstream_t  *u;
+
+    u = r->upstream;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http scgi filter init s:%ui l:%O",
+                   u->headers_in.status_n, u->headers_in.content_length_n);
+
+    if (u->headers_in.status_n == NGX_HTTP_NO_CONTENT
+        || u->headers_in.status_n == NGX_HTTP_NOT_MODIFIED)
+    {
+        u->pipe->length = 0;
+        u->length = 0;
+
+    } else if (r->method == NGX_HTTP_HEAD) {
+        u->pipe->length = -1;
+        u->length = -1;
+
+    } else {
+        u->pipe->length = u->headers_in.content_length_n;
+        u->length = u->headers_in.content_length_n;
+    }
+
+    return NGX_OK;
+}
+
+
 static void
 ngx_http_scgi_abort_request(ngx_http_request_t *r)
 {
diff --git a/src/http/modules/ngx_http_slice_filter_module.c b/src/http/modules/ngx_http_slice_filter_module.c
index c1edbca..186380a 100644
--- a/src/http/modules/ngx_http_slice_filter_module.c
+++ b/src/http/modules/ngx_http_slice_filter_module.c
@@ -180,6 +180,11 @@ ngx_http_slice_header_filter(ngx_http_request_t *r)
     r->headers_out.content_range->hash = 0;
     r->headers_out.content_range = NULL;
 
+    if (r->headers_out.accept_ranges) {
+        r->headers_out.accept_ranges->hash = 0;
+        r->headers_out.accept_ranges = NULL;
+    }
+
     r->allow_ranges = 1;
     r->subrequest_ranges = 1;
     r->single_range = 1;
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 495e628..a47d696 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -50,6 +50,11 @@ static char *ngx_http_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static char *ngx_http_ssl_ocsp_cache(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+static char *ngx_http_ssl_conf_command_check(ngx_conf_t *cf, void *post,
+    void *data);
 
 static ngx_int_t ngx_http_ssl_init(ngx_conf_t *cf);
 
@@ -74,11 +79,23 @@ static ngx_conf_enum_t  ngx_http_ssl_verify[] = {
 };
 
 
+static ngx_conf_enum_t  ngx_http_ssl_ocsp[] = {
+    { ngx_string("off"), 0 },
+    { ngx_string("on"), 1 },
+    { ngx_string("leaf"), 2 },
+    { ngx_null_string, 0 }
+};
+
+
 static ngx_conf_deprecated_t  ngx_http_ssl_deprecated = {
     ngx_conf_deprecated, "ssl", "listen ... ssl"
 };
 
 
+static ngx_conf_post_t  ngx_http_ssl_conf_command_post =
+    { ngx_http_ssl_conf_command_check };
+
+
 static ngx_command_t  ngx_http_ssl_commands[] = {
 
     { ngx_string("ssl"),
@@ -214,6 +231,27 @@ static ngx_command_t  ngx_http_ssl_commands[] = {
       offsetof(ngx_http_ssl_srv_conf_t, crl),
       NULL },
 
+    { ngx_string("ssl_ocsp"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_enum_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, ocsp),
+      &ngx_http_ssl_ocsp },
+
+    { ngx_string("ssl_ocsp_responder"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, ocsp_responder),
+      NULL },
+
+    { ngx_string("ssl_ocsp_cache"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_ssl_ocsp_cache,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
     { ngx_string("ssl_stapling"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -249,6 +287,20 @@ static ngx_command_t  ngx_http_ssl_commands[] = {
       offsetof(ngx_http_ssl_srv_conf_t, early_data),
       NULL },
 
+    { ngx_string("ssl_conf_command"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_keyval_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, conf_commands),
+      &ngx_http_ssl_conf_command_post },
+
+    { ngx_string("ssl_reject_handshake"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, reject_handshake),
+      NULL },
+
       ngx_null_command
 };
 
@@ -561,6 +613,7 @@ ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
      *     sscf->crl = { 0, NULL };
      *     sscf->ciphers = { 0, NULL };
      *     sscf->shm_zone = NULL;
+     *     sscf->ocsp_responder = { 0, NULL };
      *     sscf->stapling_file = { 0, NULL };
      *     sscf->stapling_responder = { 0, NULL };
      */
@@ -568,16 +621,20 @@ ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
     sscf->enable = NGX_CONF_UNSET;
     sscf->prefer_server_ciphers = NGX_CONF_UNSET;
     sscf->early_data = NGX_CONF_UNSET;
+    sscf->reject_handshake = NGX_CONF_UNSET;
     sscf->buffer_size = NGX_CONF_UNSET_SIZE;
     sscf->verify = NGX_CONF_UNSET_UINT;
     sscf->verify_depth = NGX_CONF_UNSET_UINT;
     sscf->certificates = NGX_CONF_UNSET_PTR;
     sscf->certificate_keys = NGX_CONF_UNSET_PTR;
     sscf->passwords = NGX_CONF_UNSET_PTR;
+    sscf->conf_commands = NGX_CONF_UNSET_PTR;
     sscf->builtin_session_cache = NGX_CONF_UNSET;
     sscf->session_timeout = NGX_CONF_UNSET;
     sscf->session_tickets = NGX_CONF_UNSET;
     sscf->session_ticket_keys = NGX_CONF_UNSET_PTR;
+    sscf->ocsp = NGX_CONF_UNSET_UINT;
+    sscf->ocsp_cache_zone = NGX_CONF_UNSET_PTR;
     sscf->stapling = NGX_CONF_UNSET;
     sscf->stapling_verify = NGX_CONF_UNSET;
 
@@ -611,6 +668,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
                          prev->prefer_server_ciphers, 0);
 
     ngx_conf_merge_value(conf->early_data, prev->early_data, 0);
+    ngx_conf_merge_value(conf->reject_handshake, prev->reject_handshake, 0);
 
     ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
                          (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
@@ -641,6 +699,13 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS);
 
+    ngx_conf_merge_ptr_value(conf->conf_commands, prev->conf_commands, NULL);
+
+    ngx_conf_merge_uint_value(conf->ocsp, prev->ocsp, 0);
+    ngx_conf_merge_str_value(conf->ocsp_responder, prev->ocsp_responder, "");
+    ngx_conf_merge_ptr_value(conf->ocsp_cache_zone,
+                         prev->ocsp_cache_zone, NULL);
+
     ngx_conf_merge_value(conf->stapling, prev->stapling, 0);
     ngx_conf_merge_value(conf->stapling_verify, prev->stapling_verify, 0);
     ngx_conf_merge_str_value(conf->stapling_file, prev->stapling_file, "");
@@ -651,7 +716,27 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     if (conf->enable) {
 
-        if (conf->certificates == NULL) {
+        if (conf->certificates) {
+            if (conf->certificate_keys == NULL) {
+                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                              "no \"ssl_certificate_key\" is defined for "
+                              "the \"ssl\" directive in %s:%ui",
+                              conf->file, conf->line);
+                return NGX_CONF_ERROR;
+            }
+
+            if (conf->certificate_keys->nelts < conf->certificates->nelts) {
+                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                              "no \"ssl_certificate_key\" is defined "
+                              "for certificate \"%V\" and "
+                              "the \"ssl\" directive in %s:%ui",
+                              ((ngx_str_t *) conf->certificates->elts)
+                              + conf->certificates->nelts - 1,
+                              conf->file, conf->line);
+                return NGX_CONF_ERROR;
+            }
+
+        } else if (!conf->reject_handshake) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"ssl_certificate\" is defined for "
                           "the \"ssl\" directive in %s:%ui",
@@ -659,30 +744,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
             return NGX_CONF_ERROR;
         }
 
-        if (conf->certificate_keys == NULL) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"ssl_certificate_key\" is defined for "
-                          "the \"ssl\" directive in %s:%ui",
-                          conf->file, conf->line);
-            return NGX_CONF_ERROR;
-        }
-
-        if (conf->certificate_keys->nelts < conf->certificates->nelts) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"ssl_certificate_key\" is defined "
-                          "for certificate \"%V\" and "
-                          "the \"ssl\" directive in %s:%ui",
-                          ((ngx_str_t *) conf->certificates->elts)
-                          + conf->certificates->nelts - 1,
-                          conf->file, conf->line);
-            return NGX_CONF_ERROR;
-        }
-
-    } else {
-
-        if (conf->certificates == NULL) {
-            return NGX_CONF_OK;
-        }
+    } else if (conf->certificates) {
 
         if (conf->certificate_keys == NULL
             || conf->certificate_keys->nelts < conf->certificates->nelts)
@@ -694,6 +756,9 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
                           + conf->certificates->nelts - 1);
             return NGX_CONF_ERROR;
         }
+
+    } else if (!conf->reject_handshake) {
+        return NGX_CONF_OK;
     }
 
     if (ngx_ssl_create(&conf->ssl, conf->protocols, conf) != NGX_OK) {
@@ -752,7 +817,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
 #endif
 
-    } else {
+    } else if (conf->certificates) {
 
         /* configure certificates */
 
@@ -802,6 +867,23 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
+    if (conf->ocsp) {
+
+        if (conf->verify == 3) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "\"ssl_ocsp\" is incompatible with "
+                          "\"ssl_verify_client optional_no_ca\"");
+            return NGX_CONF_ERROR;
+        }
+
+        if (ngx_ssl_ocsp(cf, &conf->ssl, &conf->ocsp_responder, conf->ocsp,
+                         conf->ocsp_cache_zone)
+            != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
+    }
+
     if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
@@ -857,6 +939,10 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
+    if (ngx_ssl_conf_commands(cf, &conf->ssl, conf->conf_commands) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     return NGX_CONF_OK;
 }
 
@@ -870,6 +956,10 @@ ngx_http_ssl_compile_certificates(ngx_conf_t *cf,
     ngx_http_complex_value_t          *cv;
     ngx_http_compile_complex_value_t   ccv;
 
+    if (conf->certificates == NULL) {
+        return NGX_OK;
+    }
+
     cert = conf->certificates->elts;
     key = conf->certificate_keys->elts;
     nelts = conf->certificates->nelts;
@@ -1100,6 +1190,96 @@ invalid:
 }
 
 
+static char *
+ngx_http_ssl_ocsp_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_ssl_srv_conf_t *sscf = conf;
+
+    size_t       len;
+    ngx_int_t    n;
+    ngx_str_t   *value, name, size;
+    ngx_uint_t   j;
+
+    if (sscf->ocsp_cache_zone != NGX_CONF_UNSET_PTR) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    if (ngx_strcmp(value[1].data, "off") == 0) {
+        sscf->ocsp_cache_zone = NULL;
+        return NGX_CONF_OK;
+    }
+
+    if (value[1].len <= sizeof("shared:") - 1
+        || ngx_strncmp(value[1].data, "shared:", sizeof("shared:") - 1) != 0)
+    {
+        goto invalid;
+    }
+
+    len = 0;
+
+    for (j = sizeof("shared:") - 1; j < value[1].len; j++) {
+        if (value[1].data[j] == ':') {
+            break;
+        }
+
+        len++;
+    }
+
+    if (len == 0) {
+        goto invalid;
+    }
+
+    name.len = len;
+    name.data = value[1].data + sizeof("shared:") - 1;
+
+    size.len = value[1].len - j - 1;
+    size.data = name.data + len + 1;
+
+    n = ngx_parse_size(&size);
+
+    if (n == NGX_ERROR) {
+        goto invalid;
+    }
+
+    if (n < (ngx_int_t) (8 * ngx_pagesize)) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "OCSP cache \"%V\" is too small", &value[1]);
+
+        return NGX_CONF_ERROR;
+    }
+
+    sscf->ocsp_cache_zone = ngx_shared_memory_add(cf, &name, n,
+                                                  &ngx_http_ssl_module_ctx);
+    if (sscf->ocsp_cache_zone == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    sscf->ocsp_cache_zone->init = ngx_ssl_ocsp_cache_init;
+
+    return NGX_CONF_OK;
+
+invalid:
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "invalid OCSP cache \"%V\"", &value[1]);
+
+    return NGX_CONF_ERROR;
+}
+
+
+static char *
+ngx_http_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
+{
+#ifndef SSL_CONF_FLAG_FILE
+    return "is not supported on this platform";
+#else
+    return NGX_CONF_OK;
+#endif
+}
+
+
 static ngx_int_t
 ngx_http_ssl_init(ngx_conf_t *cf)
 {
@@ -1118,17 +1298,28 @@ ngx_http_ssl_init(ngx_conf_t *cf)
 
         sscf = cscfp[s]->ctx->srv_conf[ngx_http_ssl_module.ctx_index];
 
-        if (sscf->ssl.ctx == NULL || !sscf->stapling) {
+        if (sscf->ssl.ctx == NULL) {
             continue;
         }
 
         clcf = cscfp[s]->ctx->loc_conf[ngx_http_core_module.ctx_index];
 
-        if (ngx_ssl_stapling_resolver(cf, &sscf->ssl, clcf->resolver,
+        if (sscf->stapling) {
+            if (ngx_ssl_stapling_resolver(cf, &sscf->ssl, clcf->resolver,
+                                          clcf->resolver_timeout)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+        }
+
+        if (sscf->ocsp) {
+            if (ngx_ssl_ocsp_resolver(cf, &sscf->ssl, clcf->resolver,
                                       clcf->resolver_timeout)
-            != NGX_OK)
-        {
-            return NGX_ERROR;
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
         }
     }
 
@@ -1149,7 +1340,33 @@ ngx_http_ssl_init(ngx_conf_t *cf)
             cscf = addr[a].default_server;
             sscf = cscf->ctx->srv_conf[ngx_http_ssl_module.ctx_index];
 
-            if (sscf->certificates == NULL) {
+            if (sscf->certificates) {
+                continue;
+            }
+
+            if (!sscf->reject_handshake) {
+                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                              "no \"ssl_certificate\" is defined for "
+                              "the \"listen ... ssl\" directive in %s:%ui",
+                              cscf->file_name, cscf->line);
+                return NGX_ERROR;
+            }
+
+            /*
+             * if no certificates are defined in the default server,
+             * check all non-default server blocks
+             */
+
+            cscfp = addr[a].servers.elts;
+            for (s = 0; s < addr[a].servers.nelts; s++) {
+
+                cscf = cscfp[s];
+                sscf = cscf->ctx->srv_conf[ngx_http_ssl_module.ctx_index];
+
+                if (sscf->certificates || sscf->reject_handshake) {
+                    continue;
+                }
+
                 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                               "no \"ssl_certificate\" is defined for "
                               "the \"listen ... ssl\" directive in %s:%ui",
diff --git a/src/http/modules/ngx_http_ssl_module.h b/src/http/modules/ngx_http_ssl_module.h
index 26fdccf..7ab0f7e 100644
--- a/src/http/modules/ngx_http_ssl_module.h
+++ b/src/http/modules/ngx_http_ssl_module.h
@@ -21,6 +21,7 @@ typedef struct {
 
     ngx_flag_t                      prefer_server_ciphers;
     ngx_flag_t                      early_data;
+    ngx_flag_t                      reject_handshake;
 
     ngx_uint_t                      protocols;
 
@@ -48,12 +49,17 @@ typedef struct {
     ngx_str_t                       ciphers;
 
     ngx_array_t                    *passwords;
+    ngx_array_t                    *conf_commands;
 
     ngx_shm_zone_t                 *shm_zone;
 
     ngx_flag_t                      session_tickets;
     ngx_array_t                    *session_ticket_keys;
 
+    ngx_uint_t                      ocsp;
+    ngx_str_t                       ocsp_responder;
+    ngx_shm_zone_t                 *ocsp_cache_zone;
+
     ngx_flag_t                      stapling;
     ngx_flag_t                      stapling_verify;
     ngx_str_t                       stapling_file;
diff --git a/src/http/modules/ngx_http_stub_status_module.c b/src/http/modules/ngx_http_stub_status_module.c
index 9bdf881..db68b76 100644
--- a/src/http/modules/ngx_http_stub_status_module.c
+++ b/src/http/modules/ngx_http_stub_status_module.c
@@ -103,16 +103,6 @@ ngx_http_stub_status_handler(ngx_http_request_t *r)
     ngx_str_set(&r->headers_out.content_type, "text/plain");
     r->headers_out.content_type_lowcase = NULL;
 
-    if (r->method == NGX_HTTP_HEAD) {
-        r->headers_out.status = NGX_HTTP_OK;
-
-        rc = ngx_http_send_header(r);
-
-        if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-            return rc;
-        }
-    }
-
     size = sizeof("Active connections:  \n") + NGX_ATOMIC_T_LEN
            + sizeof("server accepts handled requests\n") - 1
            + 6 + 3 * NGX_ATOMIC_T_LEN
diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index 1560807..1a4dfd7 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -13,6 +13,7 @@
 typedef struct {
     ngx_uint_t                         max_cached;
     ngx_uint_t                         requests;
+    ngx_msec_t                         time;
     ngx_msec_t                         timeout;
 
     ngx_queue_t                        cache;
@@ -86,6 +87,13 @@ static ngx_command_t  ngx_http_upstream_keepalive_commands[] = {
       0,
       NULL },
 
+    { ngx_string("keepalive_time"),
+      NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_upstream_keepalive_srv_conf_t, time),
+      NULL },
+
     { ngx_string("keepalive_timeout"),
       NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_msec_slot,
@@ -149,8 +157,9 @@ ngx_http_upstream_init_keepalive(ngx_conf_t *cf,
     kcf = ngx_http_conf_upstream_srv_conf(us,
                                           ngx_http_upstream_keepalive_module);
 
+    ngx_conf_init_msec_value(kcf->time, 3600000);
     ngx_conf_init_msec_value(kcf->timeout, 60000);
-    ngx_conf_init_uint_value(kcf->requests, 100);
+    ngx_conf_init_uint_value(kcf->requests, 1000);
 
     if (kcf->original_init_upstream(cf, us) != NGX_OK) {
         return NGX_ERROR;
@@ -326,6 +335,10 @@ ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data,
         goto invalid;
     }
 
+    if (ngx_current_msec - c->start_time > kp->conf->time) {
+        goto invalid;
+    }
+
     if (!u->keepalive) {
         goto invalid;
     }
@@ -513,6 +526,7 @@ ngx_http_upstream_keepalive_create_conf(ngx_conf_t *cf)
      *     conf->max_cached = 0;
      */
 
+    conf->time = NGX_CONF_UNSET_MSEC;
     conf->timeout = NGX_CONF_UNSET_MSEC;
     conf->requests = NGX_CONF_UNSET_UINT;
 
diff --git a/src/http/modules/ngx_http_userid_filter_module.c b/src/http/modules/ngx_http_userid_filter_module.c
index 31cf402..1e33c5c 100644
--- a/src/http/modules/ngx_http_userid_filter_module.c
+++ b/src/http/modules/ngx_http_userid_filter_module.c
@@ -15,12 +15,21 @@
 #define NGX_HTTP_USERID_V1    2
 #define NGX_HTTP_USERID_ON    3
 
+#define NGX_HTTP_USERID_COOKIE_OFF              0x0002
+#define NGX_HTTP_USERID_COOKIE_SECURE           0x0004
+#define NGX_HTTP_USERID_COOKIE_HTTPONLY         0x0008
+#define NGX_HTTP_USERID_COOKIE_SAMESITE         0x0010
+#define NGX_HTTP_USERID_COOKIE_SAMESITE_STRICT  0x0020
+#define NGX_HTTP_USERID_COOKIE_SAMESITE_LAX     0x0040
+#define NGX_HTTP_USERID_COOKIE_SAMESITE_NONE    0x0080
+
 /* 31 Dec 2037 23:55:55 GMT */
 #define NGX_HTTP_USERID_MAX_EXPIRES  2145916555
 
 
 typedef struct {
     ngx_uint_t  enable;
+    ngx_uint_t  flags;
 
     ngx_int_t   service;
 
@@ -88,6 +97,20 @@ static ngx_conf_enum_t  ngx_http_userid_state[] = {
 };
 
 
+static ngx_conf_bitmask_t  ngx_http_userid_flags[] = {
+    { ngx_string("off"), NGX_HTTP_USERID_COOKIE_OFF },
+    { ngx_string("secure"), NGX_HTTP_USERID_COOKIE_SECURE },
+    { ngx_string("httponly"), NGX_HTTP_USERID_COOKIE_HTTPONLY },
+    { ngx_string("samesite=strict"),
+      NGX_HTTP_USERID_COOKIE_SAMESITE|NGX_HTTP_USERID_COOKIE_SAMESITE_STRICT },
+    { ngx_string("samesite=lax"),
+      NGX_HTTP_USERID_COOKIE_SAMESITE|NGX_HTTP_USERID_COOKIE_SAMESITE_LAX },
+    { ngx_string("samesite=none"),
+      NGX_HTTP_USERID_COOKIE_SAMESITE|NGX_HTTP_USERID_COOKIE_SAMESITE_NONE },
+    { ngx_null_string, 0 }
+};
+
+
 static ngx_conf_post_handler_pt  ngx_http_userid_domain_p =
     ngx_http_userid_domain;
 static ngx_conf_post_handler_pt  ngx_http_userid_path_p = ngx_http_userid_path;
@@ -138,6 +161,13 @@ static ngx_command_t  ngx_http_userid_commands[] = {
       0,
       NULL },
 
+    { ngx_string("userid_flags"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123,
+      ngx_conf_set_bitmask_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_userid_conf_t, flags),
+      &ngx_http_userid_flags },
+
     { ngx_string("userid_p3p"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
@@ -383,6 +413,26 @@ ngx_http_userid_set_uid(ngx_http_request_t *r, ngx_http_userid_ctx_t *ctx,
         len += conf->domain.len;
     }
 
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_SECURE) {
+        len += sizeof("; secure") - 1;
+    }
+
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_HTTPONLY) {
+        len += sizeof("; httponly") - 1;
+    }
+
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_SAMESITE_STRICT) {
+        len += sizeof("; samesite=strict") - 1;
+    }
+
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_SAMESITE_LAX) {
+        len += sizeof("; samesite=lax") - 1;
+    }
+
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_SAMESITE_NONE) {
+        len += sizeof("; samesite=none") - 1;
+    }
+
     cookie = ngx_pnalloc(r->pool, len);
     if (cookie == NULL) {
         return NGX_ERROR;
@@ -422,6 +472,26 @@ ngx_http_userid_set_uid(ngx_http_request_t *r, ngx_http_userid_ctx_t *ctx,
 
     p = ngx_copy(p, conf->path.data, conf->path.len);
 
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_SECURE) {
+        p = ngx_cpymem(p, "; secure", sizeof("; secure") - 1);
+    }
+
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_HTTPONLY) {
+        p = ngx_cpymem(p, "; httponly", sizeof("; httponly") - 1);
+    }
+
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_SAMESITE_STRICT) {
+        p = ngx_cpymem(p, "; samesite=strict", sizeof("; samesite=strict") - 1);
+    }
+
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_SAMESITE_LAX) {
+        p = ngx_cpymem(p, "; samesite=lax", sizeof("; samesite=lax") - 1);
+    }
+
+    if (conf->flags & NGX_HTTP_USERID_COOKIE_SAMESITE_NONE) {
+        p = ngx_cpymem(p, "; samesite=none", sizeof("; samesite=none") - 1);
+    }
+
     set_cookie = ngx_list_push(&r->headers_out.headers);
     if (set_cookie == NULL) {
         return NGX_ERROR;
@@ -658,6 +728,7 @@ ngx_http_userid_create_conf(ngx_conf_t *cf)
     /*
      * set by ngx_pcalloc():
      *
+     *     conf->flags = 0;
      *     conf->name = { 0, NULL };
      *     conf->domain = { 0, NULL };
      *     conf->path = { 0, NULL };
@@ -682,6 +753,9 @@ ngx_http_userid_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_uint_value(conf->enable, prev->enable,
                               NGX_HTTP_USERID_OFF);
 
+    ngx_conf_merge_bitmask_value(conf->flags, prev->flags,
+                            (NGX_CONF_BITMASK_SET|NGX_HTTP_USERID_COOKIE_OFF));
+
     ngx_conf_merge_str_value(conf->name, prev->name, "uid");
     ngx_conf_merge_str_value(conf->domain, prev->domain, "");
     ngx_conf_merge_str_value(conf->path, prev->path, "; path=/");
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 56dc236..1334f44 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -57,6 +57,7 @@ typedef struct {
     ngx_str_t                  ssl_certificate;
     ngx_str_t                  ssl_certificate_key;
     ngx_array_t               *ssl_passwords;
+    ngx_array_t               *ssl_conf_commands;
 #endif
 } ngx_http_uwsgi_loc_conf_t;
 
@@ -67,6 +68,7 @@ static ngx_int_t ngx_http_uwsgi_create_request(ngx_http_request_t *r);
 static ngx_int_t ngx_http_uwsgi_reinit_request(ngx_http_request_t *r);
 static ngx_int_t ngx_http_uwsgi_process_status_line(ngx_http_request_t *r);
 static ngx_int_t ngx_http_uwsgi_process_header(ngx_http_request_t *r);
+static ngx_int_t ngx_http_uwsgi_input_filter_init(void *data);
 static void ngx_http_uwsgi_abort_request(ngx_http_request_t *r);
 static void ngx_http_uwsgi_finalize_request(ngx_http_request_t *r,
     ngx_int_t rc);
@@ -95,6 +97,8 @@ static char *ngx_http_uwsgi_cache_key(ngx_conf_t *cf, ngx_command_t *cmd,
 #if (NGX_HTTP_SSL)
 static char *ngx_http_uwsgi_ssl_password_file(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
+static char *ngx_http_uwsgi_ssl_conf_command_check(ngx_conf_t *cf, void *post,
+    void *data);
 static ngx_int_t ngx_http_uwsgi_set_ssl(ngx_conf_t *cf,
     ngx_http_uwsgi_loc_conf_t *uwcf);
 #endif
@@ -133,6 +137,9 @@ static ngx_conf_bitmask_t  ngx_http_uwsgi_ssl_protocols[] = {
     { ngx_null_string, 0 }
 };
 
+static ngx_conf_post_t  ngx_http_uwsgi_ssl_conf_command_post =
+    { ngx_http_uwsgi_ssl_conf_command_check };
+
 #endif
 
 
@@ -560,6 +567,13 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
       0,
       NULL },
 
+    { ngx_string("uwsgi_ssl_conf_command"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_keyval_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_uwsgi_loc_conf_t, ssl_conf_commands),
+      &ngx_http_uwsgi_ssl_conf_command_post },
+
 #endif
 
       ngx_null_command
@@ -703,6 +717,10 @@ ngx_http_uwsgi_handler(ngx_http_request_t *r)
     u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
     u->pipe->input_ctx = r;
 
+    u->input_filter_init = ngx_http_uwsgi_input_filter_init;
+    u->input_filter = ngx_http_upstream_non_buffered_filter;
+    u->input_filter_ctx = r;
+
     if (!uwcf->upstream.request_buffering
         && uwcf->upstream.pass_request_body
         && !r->headers_in.chunked)
@@ -1141,6 +1159,7 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
         r->upstream->request_bufs = cl;
     }
 
+    b->flush = 1;
     cl->next = NULL;
 
     return NGX_OK;
@@ -1355,6 +1374,37 @@ ngx_http_uwsgi_process_header(ngx_http_request_t *r)
 }
 
 
+static ngx_int_t
+ngx_http_uwsgi_input_filter_init(void *data)
+{
+    ngx_http_request_t   *r = data;
+    ngx_http_upstream_t  *u;
+
+    u = r->upstream;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http uwsgi filter init s:%ui l:%O",
+                   u->headers_in.status_n, u->headers_in.content_length_n);
+
+    if (u->headers_in.status_n == NGX_HTTP_NO_CONTENT
+        || u->headers_in.status_n == NGX_HTTP_NOT_MODIFIED)
+    {
+        u->pipe->length = 0;
+        u->length = 0;
+
+    } else if (r->method == NGX_HTTP_HEAD) {
+        u->pipe->length = -1;
+        u->length = -1;
+
+    } else {
+        u->pipe->length = u->headers_in.content_length_n;
+        u->length = u->headers_in.content_length_n;
+    }
+
+    return NGX_OK;
+}
+
+
 static void
 ngx_http_uwsgi_abort_request(ngx_http_request_t *r)
 {
@@ -1463,6 +1513,7 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
     conf->upstream.ssl_verify = NGX_CONF_UNSET;
     conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
     conf->ssl_passwords = NGX_CONF_UNSET_PTR;
+    conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
 #endif
 
     /* "uwsgi_cyclic_temp_file" is disabled */
@@ -1793,6 +1844,9 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->ssl_certificate_key, "");
     ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
 
+    ngx_conf_merge_ptr_value(conf->ssl_conf_commands,
+                              prev->ssl_conf_commands, NULL);
+
     if (conf->ssl && ngx_http_uwsgi_set_ssl(cf, conf) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
@@ -2339,6 +2393,17 @@ ngx_http_uwsgi_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static char *
+ngx_http_uwsgi_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
+{
+#ifndef SSL_CONF_FLAG_FILE
+    return "is not supported on this platform";
+#else
+    return NGX_CONF_OK;
+#endif
+}
+
+
 static ngx_int_t
 ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
 {
@@ -2416,6 +2481,12 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
         return NGX_ERROR;
     }
 
+    if (ngx_ssl_conf_commands(cf, uwcf->upstream.ssl, uwcf->ssl_conf_commands)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     return NGX_OK;
 }
 
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index b2f107d..8afd656 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -233,6 +233,7 @@ ngx_http_xslt_header_filter(ngx_http_request_t *r)
     ngx_http_set_ctx(r, ctx, ngx_http_xslt_filter_module);
 
     r->main_filter_need_in_memory = 1;
+    r->allow_ranges = 0;
 
     return NGX_OK;
 }
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 79ef9c6..e1d3d00 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1469,14 +1469,14 @@ ngx_http_server_names(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf,
                                   NGX_HASH_WILDCARD_KEY);
 
             if (rc == NGX_ERROR) {
-                return NGX_ERROR;
+                goto failed;
             }
 
             if (rc == NGX_DECLINED) {
                 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                               "invalid server name or wildcard \"%V\" on %V",
                               &name[n].name, &addr->opt.addr_text);
-                return NGX_ERROR;
+                goto failed;
             }
 
             if (rc == NGX_BUSY) {
@@ -1714,7 +1714,6 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
 
     cscf = addr->default_server;
     ls->pool_size = cscf->connection_pool_size;
-    ls->post_accept_timeout = cscf->client_header_timeout;
 
     clcf = cscf->ctx->loc_conf[ngx_http_core_module.ctx_index];
 
diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h
index f9e9664..bb936c5 100644
--- a/src/http/ngx_http_cache.h
+++ b/src/http/ngx_http_cache.h
@@ -80,6 +80,7 @@ struct ngx_http_cache_s {
     ngx_str_t                        vary;
     u_char                           variant[NGX_HTTP_CACHE_KEY_LEN];
 
+    size_t                           buffer_size;
     size_t                           header_start;
     size_t                           body_start;
     off_t                            length;
@@ -116,6 +117,7 @@ struct ngx_http_cache_s {
     unsigned                         purged:1;
     unsigned                         reading:1;
     unsigned                         secondary:1;
+    unsigned                         update_variant:1;
     unsigned                         background:1;
 
     unsigned                         stale_updating:1;
@@ -160,6 +162,7 @@ struct ngx_http_file_cache_s {
 
     ngx_path_t                      *path;
 
+    off_t                            min_free;
     off_t                            max_size;
     size_t                           bsize;
 
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 3671558..6664fa6 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -495,6 +495,13 @@ static ngx_command_t  ngx_http_core_commands[] = {
       offsetof(ngx_http_core_loc_conf_t, limit_rate_after),
       NULL },
 
+    { ngx_string("keepalive_time"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_core_loc_conf_t, keepalive_time),
+      NULL },
+
     { ngx_string("keepalive_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
       ngx_http_core_keepalive,
@@ -1190,8 +1197,13 @@ ngx_http_core_auth_delay(ngx_http_request_t *r)
     ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                   "delaying unauthorized request");
 
-    if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    if (r->connection->read->ready) {
+        ngx_post_event(r->connection->read, &ngx_posted_events);
+
+    } else {
+        if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
     }
 
     r->read_event_handler = ngx_http_test_reading;
@@ -1330,6 +1342,11 @@ ngx_http_update_location_config(ngx_http_request_t *r)
         } else if (r->connection->requests >= clcf->keepalive_requests) {
             r->keepalive = 0;
 
+        } else if (ngx_current_msec - r->connection->start_time
+                   > clcf->keepalive_time)
+        {
+            r->keepalive = 0;
+
         } else if (r->headers_in.msie6
                    && r->method == NGX_HTTP_POST
                    && (clcf->keepalive_disable
@@ -1782,7 +1799,7 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
         }
     }
 
-    if (r->method == NGX_HTTP_HEAD || (r != r->main && val.len == 0)) {
+    if (r != r->main && val.len == 0) {
         return ngx_http_send_header(r);
     }
 
@@ -3495,6 +3512,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
     clcf->send_timeout = NGX_CONF_UNSET_MSEC;
     clcf->send_lowat = NGX_CONF_UNSET_SIZE;
     clcf->postpone_output = NGX_CONF_UNSET_SIZE;
+    clcf->keepalive_time = NGX_CONF_UNSET_MSEC;
     clcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
     clcf->keepalive_header = NGX_CONF_UNSET;
     clcf->keepalive_requests = NGX_CONF_UNSET_UINT;
@@ -3733,12 +3751,14 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->limit_rate_after = prev->limit_rate_after;
     }
 
+    ngx_conf_merge_msec_value(conf->keepalive_time,
+                              prev->keepalive_time, 3600000);
     ngx_conf_merge_msec_value(conf->keepalive_timeout,
                               prev->keepalive_timeout, 75000);
     ngx_conf_merge_sec_value(conf->keepalive_header,
                               prev->keepalive_header, 0);
     ngx_conf_merge_uint_value(conf->keepalive_requests,
-                              prev->keepalive_requests, 100);
+                              prev->keepalive_requests, 1000);
     ngx_conf_merge_uint_value(conf->lingering_close,
                               prev->lingering_close, NGX_HTTP_LINGERING_ON);
     ngx_conf_merge_msec_value(conf->lingering_time,
@@ -4078,14 +4098,6 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
         }
 
-        if (ngx_strcmp(value[n].data, "spdy") == 0) {
-            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                               "invalid parameter \"spdy\": "
-                               "ngx_http_spdy_module was superseded "
-                               "by ngx_http_v2_module");
-            continue;
-        }
-
         if (ngx_strncmp(value[n].data, "so_keepalive=", 13) == 0) {
 
             if (ngx_strcmp(&value[n].data[13], "on") == 0) {
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 2aadae7..2341fd4 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -359,6 +359,7 @@ struct ngx_http_core_loc_conf_s {
 
     ngx_msec_t    client_body_timeout;     /* client_body_timeout */
     ngx_msec_t    send_timeout;            /* send_timeout */
+    ngx_msec_t    keepalive_time;          /* keepalive_time */
     ngx_msec_t    keepalive_timeout;       /* keepalive_timeout */
     ngx_msec_t    lingering_time;          /* lingering_time */
     ngx_msec_t    lingering_timeout;       /* lingering_timeout */
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index ecdf11e..c40093b 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -294,6 +294,8 @@ ngx_http_file_cache_open(ngx_http_request_t *r)
         cln->data = c;
     }
 
+    c->buffer_size = c->body_start;
+
     rc = ngx_http_file_cache_exists(cache, c);
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -852,7 +854,7 @@ ngx_http_file_cache_exists(ngx_http_file_cache_t *cache, ngx_http_cache_t *c)
         if (fcn->exists || fcn->uses >= c->min_uses) {
 
             c->exists = fcn->exists;
-            if (fcn->body_start) {
+            if (fcn->body_start && !c->update_variant) {
                 c->body_start = fcn->body_start;
             }
 
@@ -1230,7 +1232,7 @@ ngx_http_file_cache_reopen(ngx_http_request_t *r, ngx_http_cache_t *c)
 
     c->secondary = 1;
     c->file.name.len = 0;
-    c->body_start = c->buf->end - c->buf->start;
+    c->body_start = c->buffer_size;
 
     ngx_memcpy(c->key, c->variant, NGX_HTTP_CACHE_KEY_LEN);
 
@@ -1337,6 +1339,7 @@ ngx_http_file_cache_update_variant(ngx_http_request_t *r, ngx_http_cache_t *c)
     ngx_shmtx_unlock(&cache->shpool->mutex);
 
     c->file.name.len = 0;
+    c->update_variant = 1;
 
     ngx_memcpy(c->key, c->main, NGX_HTTP_CACHE_KEY_LEN);
 
@@ -1959,7 +1962,7 @@ ngx_http_file_cache_manager(void *data)
 {
     ngx_http_file_cache_t  *cache = data;
 
-    off_t       size;
+    off_t       size, free;
     time_t      wait;
     ngx_msec_t  elapsed, next;
     ngx_uint_t  count, watermark;
@@ -1988,7 +1991,19 @@ ngx_http_file_cache_manager(void *data)
                        size, count, (ngx_int_t) watermark);
 
         if (size < cache->max_size && count < watermark) {
-            break;
+
+            if (!cache->min_free) {
+                break;
+            }
+
+            free = ngx_fs_available(cache->path->name.data);
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "http file cache free: %O", free);
+
+            if (free > cache->min_free) {
+                break;
+            }
         }
 
         wait = ngx_http_file_cache_forced_expire(cache);
@@ -2304,7 +2319,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     char  *confp = conf;
 
-    off_t                   max_size;
+    off_t                   max_size, min_free;
     u_char                 *last, *p;
     time_t                  inactive;
     ssize_t                 size;
@@ -2341,6 +2356,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     name.len = 0;
     size = 0;
     max_size = NGX_MAX_OFF_T_VALUE;
+    min_free = 0;
 
     value = cf->args->elts;
 
@@ -2476,6 +2492,29 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             continue;
         }
 
+        if (ngx_strncmp(value[i].data, "min_free=", 9) == 0) {
+
+#if (NGX_WIN32 || NGX_HAVE_STATFS || NGX_HAVE_STATVFS)
+
+            s.len = value[i].len - 9;
+            s.data = value[i].data + 9;
+
+            min_free = ngx_parse_offset(&s);
+            if (min_free < 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid min_free value \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+#else
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "min_free is not supported "
+                               "on this platform, ignored");
+#endif
+
+            continue;
+        }
+
         if (ngx_strncmp(value[i].data, "loader_files=", 13) == 0) {
 
             loader_files = ngx_atoi(value[i].data + 13, value[i].len - 13);
@@ -2607,6 +2646,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     cache->inactive = inactive;
     cache->max_size = max_size;
+    cache->min_free = min_free;
 
     caches = (ngx_array_t *) (confp + cmd->offset);
 
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index cfc42f9..20ad89a 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -380,6 +380,12 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 r->uri_start = p;
                 state = sw_after_slash_in_uri;
                 break;
+            case '?':
+                r->uri_start = p;
+                r->args_start = p + 1;
+                r->empty_path_in_uri = 1;
+                state = sw_uri;
+                break;
             case ' ':
                 /*
                  * use single "/" from request line to preserve pointers,
@@ -446,6 +452,13 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 r->uri_start = p;
                 state = sw_after_slash_in_uri;
                 break;
+            case '?':
+                r->port_end = p;
+                r->uri_start = p;
+                r->args_start = p + 1;
+                r->empty_path_in_uri = 1;
+                state = sw_uri;
+                break;
             case ' ':
                 r->port_end = p;
                 /*
@@ -1287,6 +1300,10 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
     r->uri_ext = NULL;
     r->args_start = NULL;
 
+    if (r->empty_path_in_uri) {
+        *u++ = '/';
+    }
+
     ch = *p++;
 
     while (p <= r->uri_end) {
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index eb53996..136c461 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -49,7 +49,7 @@ static void ngx_http_request_finalizer(ngx_http_request_t *r);
 
 static void ngx_http_set_keepalive(ngx_http_request_t *r);
 static void ngx_http_keepalive_handler(ngx_event_t *ev);
-static void ngx_http_set_lingering_close(ngx_http_request_t *r);
+static void ngx_http_set_lingering_close(ngx_connection_t *c);
 static void ngx_http_lingering_close_handler(ngx_event_t *ev);
 static ngx_int_t ngx_http_post_action(ngx_http_request_t *r);
 static void ngx_http_close_request(ngx_http_request_t *r, ngx_int_t error);
@@ -206,16 +206,17 @@ ngx_http_header_t  ngx_http_headers_in[] = {
 void
 ngx_http_init_connection(ngx_connection_t *c)
 {
-    ngx_uint_t              i;
-    ngx_event_t            *rev;
-    struct sockaddr_in     *sin;
-    ngx_http_port_t        *port;
-    ngx_http_in_addr_t     *addr;
-    ngx_http_log_ctx_t     *ctx;
-    ngx_http_connection_t  *hc;
+    ngx_uint_t                 i;
+    ngx_event_t               *rev;
+    struct sockaddr_in        *sin;
+    ngx_http_port_t           *port;
+    ngx_http_in_addr_t        *addr;
+    ngx_http_log_ctx_t        *ctx;
+    ngx_http_connection_t     *hc;
+    ngx_http_core_srv_conf_t  *cscf;
 #if (NGX_HAVE_INET6)
-    struct sockaddr_in6    *sin6;
-    ngx_http_in6_addr_t    *addr6;
+    struct sockaddr_in6       *sin6;
+    ngx_http_in6_addr_t       *addr6;
 #endif
 
     hc = ngx_pcalloc(c->pool, sizeof(ngx_http_connection_t));
@@ -361,7 +362,9 @@ ngx_http_init_connection(ngx_connection_t *c)
         return;
     }
 
-    ngx_add_timer(rev, c->listening->post_accept_timeout);
+    cscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_core_module);
+
+    ngx_add_timer(rev, cscf->client_header_timeout);
     ngx_reusable_connection(c, 1);
 
     if (ngx_handle_read_event(rev, 0) != NGX_OK) {
@@ -431,7 +434,7 @@ ngx_http_wait_request_handler(ngx_event_t *rev)
     if (n == NGX_AGAIN) {
 
         if (!rev->timer_set) {
-            ngx_add_timer(rev, c->listening->post_accept_timeout);
+            ngx_add_timer(rev, cscf->client_header_timeout);
             ngx_reusable_connection(c, 1);
         }
 
@@ -649,6 +652,7 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
     ngx_http_connection_t     *hc;
     ngx_http_ssl_srv_conf_t   *sscf;
     ngx_http_core_loc_conf_t  *clcf;
+    ngx_http_core_srv_conf_t  *cscf;
 
     c = rev->data;
     hc = c->data;
@@ -680,7 +684,9 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
             rev->ready = 0;
 
             if (!rev->timer_set) {
-                ngx_add_timer(rev, c->listening->post_accept_timeout);
+                cscf = ngx_http_get_module_srv_conf(hc->conf_ctx,
+                                                    ngx_http_core_module);
+                ngx_add_timer(rev, cscf->client_header_timeout);
                 ngx_reusable_connection(c, 1);
             }
 
@@ -755,7 +761,9 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
             if (rc == NGX_AGAIN) {
 
                 if (!rev->timer_set) {
-                    ngx_add_timer(rev, c->listening->post_accept_timeout);
+                    cscf = ngx_http_get_module_srv_conf(hc->conf_ctx,
+                                                        ngx_http_core_module);
+                    ngx_add_timer(rev, cscf->client_header_timeout);
                 }
 
                 c->ssl->handler = ngx_http_ssl_handshake_handler;
@@ -871,10 +879,14 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
         return SSL_TLSEXT_ERR_ALERT_FATAL;
     }
 
+    hc = c->data;
+
     servername = SSL_get_servername(ssl_conn, TLSEXT_NAMETYPE_host_name);
 
     if (servername == NULL) {
-        return SSL_TLSEXT_ERR_OK;
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "SSL server name: null");
+        goto done;
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
@@ -883,7 +895,7 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
     host.len = ngx_strlen(servername);
 
     if (host.len == 0) {
-        return SSL_TLSEXT_ERR_OK;
+        goto done;
     }
 
     host.data = (u_char *) servername;
@@ -891,32 +903,27 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
     rc = ngx_http_validate_host(&host, c->pool, 1);
 
     if (rc == NGX_ERROR) {
-        *ad = SSL_AD_INTERNAL_ERROR;
-        return SSL_TLSEXT_ERR_ALERT_FATAL;
+        goto error;
     }
 
     if (rc == NGX_DECLINED) {
-        return SSL_TLSEXT_ERR_OK;
+        goto done;
     }
 
-    hc = c->data;
-
     rc = ngx_http_find_virtual_server(c, hc->addr_conf->virtual_names, &host,
                                       NULL, &cscf);
 
     if (rc == NGX_ERROR) {
-        *ad = SSL_AD_INTERNAL_ERROR;
-        return SSL_TLSEXT_ERR_ALERT_FATAL;
+        goto error;
     }
 
     if (rc == NGX_DECLINED) {
-        return SSL_TLSEXT_ERR_OK;
+        goto done;
     }
 
     hc->ssl_servername = ngx_palloc(c->pool, sizeof(ngx_str_t));
     if (hc->ssl_servername == NULL) {
-        *ad = SSL_AD_INTERNAL_ERROR;
-        return SSL_TLSEXT_ERR_ALERT_FATAL;
+        goto error;
     }
 
     *hc->ssl_servername = host;
@@ -932,7 +939,9 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
     c->ssl->buffer_size = sscf->buffer_size;
 
     if (sscf->ssl.ctx) {
-        SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx);
+        if (SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx) == NULL) {
+            goto error;
+        }
 
         /*
          * SSL_set_SSL_CTX() only changes certs as of 1.0.0d
@@ -957,7 +966,22 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 #endif
     }
 
+done:
+
+    sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
+
+    if (sscf->reject_handshake) {
+        c->ssl->handshake_rejected = 1;
+        *ad = SSL_AD_UNRECOGNIZED_NAME;
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
     return SSL_TLSEXT_ERR_OK;
+
+error:
+
+    *ad = SSL_AD_INTERNAL_ERROR;
+    return SSL_TLSEXT_ERR_ALERT_FATAL;
 }
 
 #endif
@@ -1208,9 +1232,13 @@ ngx_http_process_request_uri(ngx_http_request_t *r)
         r->uri.len = r->uri_end - r->uri_start;
     }
 
-    if (r->complex_uri || r->quoted_uri) {
+    if (r->complex_uri || r->quoted_uri || r->empty_path_in_uri) {
 
-        r->uri.data = ngx_pnalloc(r->pool, r->uri.len + 1);
+        if (r->empty_path_in_uri) {
+            r->uri.len++;
+        }
+
+        r->uri.data = ngx_pnalloc(r->pool, r->uri.len);
         if (r->uri.data == NULL) {
             ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
             return NGX_ERROR;
@@ -1234,7 +1262,7 @@ ngx_http_process_request_uri(ngx_http_request_t *r)
     r->unparsed_uri.len = r->uri_end - r->uri_start;
     r->unparsed_uri.data = r->uri_start;
 
-    r->valid_unparsed_uri = r->space_in_uri ? 0 : 1;
+    r->valid_unparsed_uri = (r->space_in_uri || r->empty_path_in_uri) ? 0 : 1;
 
     if (r->uri_ext) {
         if (r->args_start) {
@@ -1647,6 +1675,12 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http large header copy: %uz", r->header_in->pos - old);
 
+    if (r->header_in->pos - old > b->end - b->start) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "too large header to copy");
+        return NGX_ERROR;
+    }
+
     new = b->start;
 
     ngx_memcpy(new, old, r->header_in->pos - old);
@@ -1993,6 +2027,7 @@ ngx_http_process_request(ngx_http_request_t *r)
     if (r->http_connection->ssl) {
         long                      rc;
         X509                     *cert;
+        const char               *s;
         ngx_http_ssl_srv_conf_t  *sscf;
 
         if (c->ssl == NULL) {
@@ -2037,6 +2072,17 @@ ngx_http_process_request(ngx_http_request_t *r)
 
                 X509_free(cert);
             }
+
+            if (ngx_ssl_ocsp_get_status(c, &s) != NGX_OK) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                              "client SSL certificate verify error: %s", s);
+
+                ngx_ssl_remove_cached_session(c->ssl->session_ctx,
+                                       (SSL_get0_session(c->ssl->connection)));
+
+                ngx_http_finalize_request(r, NGX_HTTPS_CERT_ERROR);
+                return;
+            }
         }
     }
 
@@ -2597,11 +2643,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         ngx_del_timer(c->write);
     }
 
-    if (c->read->eof) {
-        ngx_http_close_request(r, 0);
-        return;
-    }
-
     ngx_http_finalize_connection(r);
 }
 
@@ -2700,6 +2741,11 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
 
     r = r->main;
 
+    if (r->connection->read->eof) {
+        ngx_http_close_request(r, 0);
+        return;
+    }
+
     if (r->reading_body) {
         r->keepalive = 0;
         r->lingering_close = 1;
@@ -2720,7 +2766,7 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
                 || r->header_in->pos < r->header_in->last
                 || r->connection->read->ready)))
     {
-        ngx_http_set_lingering_close(r);
+        ngx_http_set_lingering_close(r->connection);
         return;
     }
 
@@ -2974,6 +3020,12 @@ closed:
         rev->error = 1;
     }
 
+#if (NGX_HTTP_SSL)
+    if (c->ssl) {
+        c->ssl->no_send_shutdown = 1;
+    }
+#endif
+
     ngx_log_error(NGX_LOG_INFO, c->log, err,
                   "client prematurely closed connection");
 
@@ -2999,13 +3051,6 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "set http keepalive handler");
 
-    if (r->discard_body) {
-        r->write_event_handler = ngx_http_request_empty_handler;
-        r->lingering_time = ngx_time() + (time_t) (clcf->lingering_time / 1000);
-        ngx_add_timer(rev, clcf->lingering_timeout);
-        return;
-    }
-
     c->log->action = "closing request";
 
     hc = r->http_connection;
@@ -3335,22 +3380,43 @@ ngx_http_keepalive_handler(ngx_event_t *rev)
 
 
 static void
-ngx_http_set_lingering_close(ngx_http_request_t *r)
+ngx_http_set_lingering_close(ngx_connection_t *c)
 {
     ngx_event_t               *rev, *wev;
-    ngx_connection_t          *c;
+    ngx_http_request_t        *r;
     ngx_http_core_loc_conf_t  *clcf;
 
-    c = r->connection;
+    r = c->data;
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
+    if (r->lingering_time == 0) {
+        r->lingering_time = ngx_time() + (time_t) (clcf->lingering_time / 1000);
+    }
+
+#if (NGX_HTTP_SSL)
+    if (c->ssl) {
+        ngx_int_t  rc;
+
+        c->ssl->shutdown_without_free = 1;
+
+        rc = ngx_ssl_shutdown(c);
+
+        if (rc == NGX_ERROR) {
+            ngx_http_close_request(r, 0);
+            return;
+        }
+
+        if (rc == NGX_AGAIN) {
+            c->ssl->handler = ngx_http_set_lingering_close;
+            return;
+        }
+    }
+#endif
+
     rev = c->read;
     rev->handler = ngx_http_lingering_close_handler;
 
-    r->lingering_time = ngx_time() + (time_t) (clcf->lingering_time / 1000);
-    ngx_add_timer(rev, clcf->lingering_timeout);
-
     if (ngx_handle_read_event(rev, 0) != NGX_OK) {
         ngx_http_close_request(r, 0);
         return;
@@ -3373,6 +3439,11 @@ ngx_http_set_lingering_close(ngx_http_request_t *r)
         return;
     }
 
+    c->close = 0;
+    ngx_reusable_connection(c, 1);
+
+    ngx_add_timer(rev, clcf->lingering_timeout);
+
     if (rev->ready) {
         ngx_http_lingering_close_handler(rev);
     }
@@ -3395,7 +3466,7 @@ ngx_http_lingering_close_handler(ngx_event_t *rev)
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http lingering close handler");
 
-    if (rev->timedout) {
+    if (rev->timedout || c->close) {
         ngx_http_close_request(r, 0);
         return;
     }
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 70c2d42..6dfb4a4 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -470,6 +470,9 @@ struct ngx_http_request_s {
     /* URI with " " */
     unsigned                          space_in_uri:1;
 
+    /* URI with empty path */
+    unsigned                          empty_path_in_uri:1;
+
     unsigned                          invalid_header:1;
 
     unsigned                          add_uri_to_alias:1;
diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index c4f092e..0cae88f 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -12,6 +12,8 @@
 
 static void ngx_http_read_client_request_body_handler(ngx_http_request_t *r);
 static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r);
+static ngx_int_t ngx_http_copy_pipelined_header(ngx_http_request_t *r,
+    ngx_buf_t *buf);
 static ngx_int_t ngx_http_write_request_body(ngx_http_request_t *r);
 static ngx_int_t ngx_http_read_discarded_request_body(ngx_http_request_t *r);
 static ngx_int_t ngx_http_discard_request_body_filter(ngx_http_request_t *r,
@@ -135,8 +137,9 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
     } else {
         /* set rb->rest */
 
-        if (ngx_http_request_body_filter(r, NULL) != NGX_OK) {
-            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+        rc = ngx_http_request_body_filter(r, NULL);
+
+        if (rc != NGX_OK) {
             goto done;
         }
     }
@@ -282,28 +285,12 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
         for ( ;; ) {
             if (rb->buf->last == rb->buf->end) {
 
-                if (rb->buf->pos != rb->buf->last) {
+                /* update chains */
 
-                    /* pass buffer to request body filter chain */
+                rc = ngx_http_request_body_filter(r, NULL);
 
-                    out.buf = rb->buf;
-                    out.next = NULL;
-
-                    rc = ngx_http_request_body_filter(r, &out);
-
-                    if (rc != NGX_OK) {
-                        return rc;
-                    }
-
-                } else {
-
-                    /* update chains */
-
-                    rc = ngx_http_request_body_filter(r, NULL);
-
-                    if (rc != NGX_OK) {
-                        return rc;
-                    }
+                if (rc != NGX_OK) {
+                    return rc;
                 }
 
                 if (rb->busy != NULL) {
@@ -319,6 +306,9 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
                         return NGX_AGAIN;
                     }
 
+                    ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                                  "busy buffers after request body flush");
+
                     return NGX_HTTP_INTERNAL_SERVER_ERROR;
                 }
 
@@ -355,17 +345,15 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
             rb->buf->last += n;
             r->request_length += n;
 
-            if (n == rest) {
-                /* pass buffer to request body filter chain */
+            /* pass buffer to request body filter chain */
 
-                out.buf = rb->buf;
-                out.next = NULL;
+            out.buf = rb->buf;
+            out.next = NULL;
 
-                rc = ngx_http_request_body_filter(r, &out);
+            rc = ngx_http_request_body_filter(r, &out);
 
-                if (rc != NGX_OK) {
-                    return rc;
-                }
+            if (rc != NGX_OK) {
+                return rc;
             }
 
             if (rb->rest == 0) {
@@ -386,21 +374,6 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
 
         if (!c->read->ready) {
 
-            if (r->request_body_no_buffering
-                && rb->buf->pos != rb->buf->last)
-            {
-                /* pass buffer to request body filter chain */
-
-                out.buf = rb->buf;
-                out.next = NULL;
-
-                rc = ngx_http_request_body_filter(r, &out);
-
-                if (rc != NGX_OK) {
-                    return rc;
-                }
-            }
-
             clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
             ngx_add_timer(c->read, clcf->client_body_timeout);
 
@@ -412,6 +385,10 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
         }
     }
 
+    if (ngx_http_copy_pipelined_header(r, rb->buf) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
     if (c->read->timer_set) {
         ngx_del_timer(c->read);
     }
@@ -425,6 +402,88 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
 }
 
 
+static ngx_int_t
+ngx_http_copy_pipelined_header(ngx_http_request_t *r, ngx_buf_t *buf)
+{
+    size_t                     n;
+    ngx_buf_t                 *b;
+    ngx_chain_t               *cl;
+    ngx_http_connection_t     *hc;
+    ngx_http_core_srv_conf_t  *cscf;
+
+    b = r->header_in;
+    n = buf->last - buf->pos;
+
+    if (buf == b || n == 0) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http body pipelined header: %uz", n);
+
+    /*
+     * if there is a pipelined request in the client body buffer,
+     * copy it to the r->header_in buffer if there is enough room,
+     * or allocate a large client header buffer
+     */
+
+    if (n > (size_t) (b->end - b->last)) {
+
+        hc = r->http_connection;
+
+        if (hc->free) {
+            cl = hc->free;
+            hc->free = cl->next;
+
+            b = cl->buf;
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "http large header free: %p %uz",
+                           b->pos, b->end - b->last);
+
+        } else {
+            cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+            b = ngx_create_temp_buf(r->connection->pool,
+                                    cscf->large_client_header_buffers.size);
+            if (b == NULL) {
+                return NGX_ERROR;
+            }
+
+            cl = ngx_alloc_chain_link(r->connection->pool);
+            if (cl == NULL) {
+                return NGX_ERROR;
+            }
+
+            cl->buf = b;
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "http large header alloc: %p %uz",
+                           b->pos, b->end - b->last);
+        }
+
+        cl->next = hc->busy;
+        hc->busy = cl;
+        hc->nbusy++;
+
+        r->header_in = b;
+
+        if (n > (size_t) (b->end - b->last)) {
+            ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                          "too large pipelined header after reading body");
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_memcpy(b->last, buf->pos, n);
+
+    b->last += n;
+    r->request_length -= n;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_write_request_body(ngx_http_request_t *r)
 {
@@ -619,6 +678,7 @@ ngx_http_discarded_request_body_handler(ngx_http_request_t *r)
     if (rc == NGX_OK) {
         r->discard_body = 0;
         r->lingering_close = 0;
+        r->lingering_time = 0;
         ngx_http_finalize_request(r, NGX_DONE);
         return;
     }
@@ -670,8 +730,7 @@ ngx_http_read_discarded_request_body(ngx_http_request_t *r)
 
     for ( ;; ) {
         if (r->headers_in.content_length_n == 0) {
-            r->read_event_handler = ngx_http_block_reading;
-            return NGX_OK;
+            break;
         }
 
         if (!r->connection->read->ready) {
@@ -705,15 +764,24 @@ ngx_http_read_discarded_request_body(ngx_http_request_t *r)
             return rc;
         }
     }
+
+    if (ngx_http_copy_pipelined_header(r, &b) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    r->read_event_handler = ngx_http_block_reading;
+
+    return NGX_OK;
 }
 
 
 static ngx_int_t
 ngx_http_discard_request_body_filter(ngx_http_request_t *r, ngx_buf_t *b)
 {
-    size_t                    size;
-    ngx_int_t                 rc;
-    ngx_http_request_body_t  *rb;
+    size_t                     size;
+    ngx_int_t                  rc;
+    ngx_http_request_body_t   *rb;
+    ngx_http_core_srv_conf_t  *cscf;
 
     if (r->headers_in.chunked) {
 
@@ -768,7 +836,10 @@ ngx_http_discard_request_body_filter(ngx_http_request_t *r, ngx_buf_t *b)
 
                 /* set amount of data we want to see next time */
 
-                r->headers_in.content_length_n = rb->chunked->length;
+                cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+                r->headers_in.content_length_n = ngx_max(rb->chunked->length,
+                               (off_t) cscf->large_client_header_buffers.size);
                 break;
             }
 
@@ -936,6 +1007,7 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_chain_t               *cl, *out, *tl, **ll;
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
+    ngx_http_core_srv_conf_t  *cscf;
 
     rb = r->request_body;
 
@@ -949,8 +1021,10 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
 
+        cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
         r->headers_in.content_length_n = 0;
-        rb->rest = 3;
+        rb->rest = cscf->large_client_header_buffers.size;
     }
 
     out = NULL;
@@ -958,6 +1032,8 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     for (cl = in; cl; cl = cl->next) {
 
+        b = NULL;
+
         for ( ;; ) {
 
             ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
@@ -992,6 +1068,29 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
                     return NGX_HTTP_REQUEST_ENTITY_TOO_LARGE;
                 }
 
+                if (b
+                    && rb->chunked->size <= 128
+                    && cl->buf->last - cl->buf->pos >= rb->chunked->size)
+                {
+                    r->headers_in.content_length_n += rb->chunked->size;
+
+                    if (rb->chunked->size < 8) {
+
+                        while (rb->chunked->size) {
+                            *b->last++ = *cl->buf->pos++;
+                            rb->chunked->size--;
+                        }
+
+                    } else {
+                        ngx_memmove(b->last, cl->buf->pos, rb->chunked->size);
+                        b->last += rb->chunked->size;
+                        cl->buf->pos += rb->chunked->size;
+                        rb->chunked->size = 0;
+                    }
+
+                    continue;
+                }
+
                 tl = ngx_chain_get_free_buf(r->pool, &rb->free);
                 if (tl == NULL) {
                     return NGX_HTTP_INTERNAL_SERVER_ERROR;
@@ -1057,7 +1156,10 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
                 /* set rb->rest, amount of data we want to see next time */
 
-                rb->rest = rb->chunked->length;
+                cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+                rb->rest = ngx_max(rb->chunked->length,
+                               (off_t) cscf->large_client_header_buffers.size);
 
                 break;
             }
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 76e6705..72f56fd 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -575,6 +575,10 @@ ngx_http_clean_header(ngx_http_request_t *r)
     r->headers_out.headers.part.next = NULL;
     r->headers_out.headers.last = &r->headers_out.headers.part;
 
+    r->headers_out.trailers.part.nelts = 0;
+    r->headers_out.trailers.part.next = NULL;
+    r->headers_out.trailers.last = &r->headers_out.trailers.part;
+
     r->headers_out.content_length_n = -1;
     r->headers_out.last_modified_time = -1;
 }
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 89e1319..b682af5 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -77,9 +77,6 @@ static void
 static void
     ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
     ngx_uint_t do_write);
-static ngx_int_t ngx_http_upstream_non_buffered_filter_init(void *data);
-static ngx_int_t ngx_http_upstream_non_buffered_filter(void *data,
-    ssize_t bytes);
 #if (NGX_THREADS)
 static ngx_int_t ngx_http_upstream_thread_handler(ngx_thread_task_t *task,
     ngx_file_t *file);
@@ -610,6 +607,17 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
     u->store = u->conf->store;
 
     if (!u->store && !r->post_action && !u->conf->ignore_client_abort) {
+
+        if (r->connection->read->ready) {
+            ngx_post_event(r->connection->read, &ngx_posted_events);
+
+        } else {
+            if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
+                ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+                return;
+            }
+        }
+
         r->read_event_handler = ngx_http_upstream_rd_check_broken_connection;
         r->write_event_handler = ngx_http_upstream_wr_check_broken_connection;
     }
@@ -1919,6 +1927,7 @@ ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     u->keepalive = 0;
     u->upgrade = 0;
+    u->error = 0;
 
     ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t));
     u->headers_in.content_length_n = -1;
@@ -2053,6 +2062,10 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
             c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
         }
 
+        if (c->read->ready) {
+            ngx_post_event(c->read, &ngx_posted_events);
+        }
+
         return;
     }
 
@@ -2475,7 +2488,7 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
 #if (NGX_HTTP_CACHE)
 
         if (u->cache_status == NGX_HTTP_CACHE_EXPIRED
-            && ((u->conf->cache_use_stale & un->mask) || r->cache->stale_error))
+            && (u->conf->cache_use_stale & un->mask))
         {
             ngx_int_t  rc;
 
@@ -2502,6 +2515,8 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
         }
 
 #endif
+
+        break;
     }
 
 #if (NGX_HTTP_CACHE)
@@ -3011,9 +3026,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
                 return;
             }
 
-            if (u->peer.connection->read->ready || u->length == 0) {
-                ngx_http_upstream_process_non_buffered_upstream(r, u);
-            }
+            ngx_http_upstream_process_non_buffered_upstream(r, u);
         }
 
         return;
@@ -3625,7 +3638,7 @@ ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
                     return;
                 }
 
-                if (upstream->read->error) {
+                if (upstream->read->error || u->error) {
                     ngx_http_upstream_finalize_request(r, u,
                                                        NGX_HTTP_BAD_GATEWAY);
                     return;
@@ -3703,14 +3716,14 @@ ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
 }
 
 
-static ngx_int_t
+ngx_int_t
 ngx_http_upstream_non_buffered_filter_init(void *data)
 {
     return NGX_OK;
 }
 
 
-static ngx_int_t
+ngx_int_t
 ngx_http_upstream_non_buffered_filter(void *data, ssize_t bytes)
 {
     ngx_http_request_t  *r = data;
@@ -3721,6 +3734,13 @@ ngx_http_upstream_non_buffered_filter(void *data, ssize_t bytes)
 
     u = r->upstream;
 
+    if (u->length == 0) {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "upstream sent more data than specified in "
+                      "\"Content-Length\" header");
+        return NGX_OK;
+    }
+
     for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
         ll = &cl->next;
     }
@@ -3746,6 +3766,18 @@ ngx_http_upstream_non_buffered_filter(void *data, ssize_t bytes)
         return NGX_OK;
     }
 
+    if (bytes > u->length) {
+
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "upstream sent more data than specified in "
+                      "\"Content-Length\" header");
+
+        cl->buf->last = cl->buf->pos + u->length;
+        u->length = 0;
+
+        return NGX_OK;
+    }
+
     u->length -= bytes;
 
     return NGX_OK;
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 6079d72..fd642c2 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -391,6 +391,7 @@ struct ngx_http_upstream_s {
     unsigned                         buffering:1;
     unsigned                         keepalive:1;
     unsigned                         upgrade:1;
+    unsigned                         error:1;
 
     unsigned                         request_sent:1;
     unsigned                         request_body_sent:1;
@@ -414,6 +415,8 @@ typedef struct {
 
 ngx_int_t ngx_http_upstream_create(ngx_http_request_t *r);
 void ngx_http_upstream_init(ngx_http_request_t *r);
+ngx_int_t ngx_http_upstream_non_buffered_filter_init(void *data);
+ngx_int_t ngx_http_upstream_non_buffered_filter(void *data, ssize_t bytes);
 ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf,
     ngx_url_t *u, ngx_uint_t flags);
 char *ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index 8e7b4ea..1f15fae 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -10,8 +10,8 @@
 #include <ngx_http.h>
 
 
-#define ngx_http_upstream_tries(p) ((p)->number                               \
-                                    + ((p)->next ? (p)->next->number : 0))
+#define ngx_http_upstream_tries(p) ((p)->tries                                \
+                                    + ((p)->next ? (p)->next->tries : 0))
 
 
 static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer(
@@ -32,7 +32,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
     ngx_http_upstream_srv_conf_t *us)
 {
     ngx_url_t                      u;
-    ngx_uint_t                     i, j, n, w;
+    ngx_uint_t                     i, j, n, w, t;
     ngx_http_upstream_server_t    *server;
     ngx_http_upstream_rr_peer_t   *peer, **peerp;
     ngx_http_upstream_rr_peers_t  *peers, *backup;
@@ -44,6 +44,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
 
         n = 0;
         w = 0;
+        t = 0;
 
         for (i = 0; i < us->servers->nelts; i++) {
             if (server[i].backup) {
@@ -52,6 +53,10 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
 
             n += server[i].naddrs;
             w += server[i].naddrs * server[i].weight;
+
+            if (!server[i].down) {
+                t += server[i].naddrs;
+            }
         }
 
         if (n == 0) {
@@ -75,6 +80,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
         peers->number = n;
         peers->weighted = (w != n);
         peers->total_weight = w;
+        peers->tries = t;
         peers->name = &us->host;
 
         n = 0;
@@ -110,6 +116,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
 
         n = 0;
         w = 0;
+        t = 0;
 
         for (i = 0; i < us->servers->nelts; i++) {
             if (!server[i].backup) {
@@ -118,6 +125,10 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
 
             n += server[i].naddrs;
             w += server[i].naddrs * server[i].weight;
+
+            if (!server[i].down) {
+                t += server[i].naddrs;
+            }
         }
 
         if (n == 0) {
@@ -139,6 +150,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
         backup->number = n;
         backup->weighted = (w != n);
         backup->total_weight = w;
+        backup->tries = t;
         backup->name = &us->host;
 
         n = 0;
@@ -214,6 +226,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
     peers->number = n;
     peers->weighted = 0;
     peers->total_weight = n;
+    peers->tries = n;
     peers->name = &us->host;
 
     peerp = &peers->peer;
@@ -332,6 +345,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
 
     peers->single = (ur->naddrs == 1);
     peers->number = ur->naddrs;
+    peers->tries = ur->naddrs;
     peers->name = &ur->host;
 
     if (ur->sockaddr) {
diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h
index 45f258d..922ceaa 100644
--- a/src/http/ngx_http_upstream_round_robin.h
+++ b/src/http/ngx_http_upstream_round_robin.h
@@ -68,6 +68,7 @@ struct ngx_http_upstream_rr_peers_s {
 #endif
 
     ngx_uint_t                      total_weight;
+    ngx_uint_t                      tries;
 
     unsigned                        single:1;
     unsigned                        weighted:1;
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index e067cf0..942dacd 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -129,6 +129,8 @@ static ngx_int_t ngx_http_variable_connection(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_connection_requests(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_variable_connection_time(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 
 static ngx_int_t ngx_http_variable_nginx_version(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
@@ -342,6 +344,9 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("connection_requests"), NULL,
       ngx_http_variable_connection_requests, 0, 0, 0 },
 
+    { ngx_string("connection_time"), NULL, ngx_http_variable_connection_time,
+      0, NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
     { ngx_string("nginx_version"), NULL, ngx_http_variable_nginx_version,
       0, 0, 0 },
 
@@ -1075,7 +1080,7 @@ ngx_http_variable_argument(ngx_http_request_t *r, ngx_http_variable_value_t *v,
     len = name->len - (sizeof("arg_") - 1);
     arg = name->data + sizeof("arg_") - 1;
 
-    if (ngx_http_arg(r, arg, len, &value) != NGX_OK) {
+    if (len == 0 || ngx_http_arg(r, arg, len, &value) != NGX_OK) {
         v->not_found = 1;
         return NGX_OK;
     }
@@ -1174,6 +1179,10 @@ ngx_http_variable_content_length(ngx_http_request_t *r,
         v->no_cacheable = 0;
         v->not_found = 0;
 
+    } else if (r->headers_in.chunked) {
+        v->not_found = 1;
+        v->no_cacheable = 1;
+
     } else {
         v->not_found = 1;
     }
@@ -2252,6 +2261,31 @@ ngx_http_variable_connection_requests(ngx_http_request_t *r,
 }
 
 
+static ngx_int_t
+ngx_http_variable_connection_time(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    u_char          *p;
+    ngx_msec_int_t   ms;
+
+    p = ngx_pnalloc(r->pool, NGX_TIME_T_LEN + 4);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ms = ngx_current_msec - r->connection->start_time;
+    ms = ngx_max(ms, 0);
+
+    v->len = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000) - p;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = p;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_variable_nginx_version(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 8b0fc53..3611a2e 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -60,6 +60,8 @@ typedef struct {
 static void ngx_http_v2_read_handler(ngx_event_t *rev);
 static void ngx_http_v2_write_handler(ngx_event_t *wev);
 static void ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c);
+static void ngx_http_v2_lingering_close(ngx_connection_t *c);
+static void ngx_http_v2_lingering_close_handler(ngx_event_t *rev);
 
 static u_char *ngx_http_v2_state_proxy_protocol(ngx_http_v2_connection_t *h2c,
     u_char *pos, u_char *end);
@@ -236,6 +238,7 @@ ngx_http_v2_init(ngx_event_t *rev)
     ngx_http_v2_srv_conf_t    *h2scf;
     ngx_http_v2_main_conf_t   *h2mcf;
     ngx_http_v2_connection_t  *h2c;
+    ngx_http_core_srv_conf_t  *cscf;
 
     c = rev->data;
     hc = c->data;
@@ -274,7 +277,7 @@ ngx_http_v2_init(ngx_event_t *rev)
     h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
 
     h2c->concurrent_pushes = h2scf->concurrent_pushes;
-    h2c->priority_limit = h2scf->concurrent_streams;
+    h2c->priority_limit = ngx_max(h2scf->concurrent_streams, 100);
 
     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
     if (h2c->pool == NULL) {
@@ -323,7 +326,14 @@ ngx_http_v2_init(ngx_event_t *rev)
     rev->handler = ngx_http_v2_read_handler;
     c->write->handler = ngx_http_v2_write_handler;
 
+    if (!rev->timer_set) {
+        cscf = ngx_http_get_module_srv_conf(hc->conf_ctx,
+                                            ngx_http_core_module);
+        ngx_add_timer(rev, cscf->client_header_timeout);
+    }
+
     c->idle = 1;
+    ngx_reusable_connection(c, 0);
 
     ngx_http_v2_read_handler(rev);
 }
@@ -360,6 +370,11 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
             return;
         }
 
+        if (!h2c->processing && !h2c->pushing) {
+            ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
+            return;
+        }
+
         if (!h2c->goaway) {
             h2c->goaway = 1;
 
@@ -447,14 +462,6 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
 
     h2c->blocked = 0;
 
-    if (h2c->processing || h2c->pushing) {
-        if (rev->timer_set) {
-            ngx_del_timer(rev);
-        }
-
-        return;
-    }
-
     ngx_http_v2_handle_connection(h2c);
 }
 
@@ -473,6 +480,7 @@ ngx_http_v2_write_handler(ngx_event_t *wev)
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
                        "http2 write event timed out");
         c->error = 1;
+        c->timedout = 1;
         ngx_http_v2_finalize_connection(h2c, 0);
         return;
     }
@@ -626,9 +634,9 @@ error:
 static void
 ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
 {
-    ngx_int_t                rc;
-    ngx_connection_t        *c;
-    ngx_http_v2_srv_conf_t  *h2scf;
+    ngx_int_t                  rc;
+    ngx_connection_t          *c;
+    ngx_http_core_loc_conf_t  *clcf;
 
     if (h2c->last_out || h2c->processing || h2c->pushing) {
         return;
@@ -661,14 +669,20 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
     }
 
     if (h2c->goaway) {
-        ngx_http_close_connection(c);
+        ngx_http_v2_lingering_close(c);
         return;
     }
 
-    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
-                                         ngx_http_v2_module);
+    clcf = ngx_http_get_module_loc_conf(h2c->http_connection->conf_ctx,
+                                        ngx_http_core_module);
+
+    if (!c->read->timer_set) {
+        ngx_add_timer(c->read, clcf->keepalive_timeout);
+    }
+
+    ngx_reusable_connection(c, 1);
+
     if (h2c->state.incomplete) {
-        ngx_add_timer(c->read, h2scf->recv_timeout);
         return;
     }
 
@@ -686,7 +700,6 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
 #endif
 
     c->destroyed = 1;
-    ngx_reusable_connection(c, 1);
 
     c->write->handler = ngx_http_empty_handler;
     c->read->handler = ngx_http_v2_idle_handler;
@@ -694,8 +707,142 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
     if (c->write->timer_set) {
         ngx_del_timer(c->write);
     }
+}
 
-    ngx_add_timer(c->read, h2scf->idle_timeout);
+
+static void
+ngx_http_v2_lingering_close(ngx_connection_t *c)
+{
+    ngx_event_t               *rev, *wev;
+    ngx_http_v2_connection_t  *h2c;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    h2c = c->data;
+
+    clcf = ngx_http_get_module_loc_conf(h2c->http_connection->conf_ctx,
+                                        ngx_http_core_module);
+
+    if (clcf->lingering_close == NGX_HTTP_LINGERING_OFF) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    if (h2c->lingering_time == 0) {
+        h2c->lingering_time = ngx_time()
+                              + (time_t) (clcf->lingering_time / 1000);
+    }
+
+#if (NGX_HTTP_SSL)
+    if (c->ssl) {
+        ngx_int_t  rc;
+
+        rc = ngx_ssl_shutdown(c);
+
+        if (rc == NGX_ERROR) {
+            ngx_http_close_connection(c);
+            return;
+        }
+
+        if (rc == NGX_AGAIN) {
+            c->ssl->handler = ngx_http_v2_lingering_close;
+            return;
+        }
+    }
+#endif
+
+    rev = c->read;
+    rev->handler = ngx_http_v2_lingering_close_handler;
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    wev = c->write;
+    wev->handler = ngx_http_empty_handler;
+
+    if (wev->active && (ngx_event_flags & NGX_USE_LEVEL_EVENT)) {
+        if (ngx_del_event(wev, NGX_WRITE_EVENT, 0) != NGX_OK) {
+            ngx_http_close_connection(c);
+            return;
+        }
+    }
+
+    if (ngx_shutdown_socket(c->fd, NGX_WRITE_SHUTDOWN) == -1) {
+        ngx_connection_error(c, ngx_socket_errno,
+                             ngx_shutdown_socket_n " failed");
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    c->close = 0;
+    ngx_reusable_connection(c, 1);
+
+    ngx_add_timer(rev, clcf->lingering_timeout);
+
+    if (rev->ready) {
+        ngx_http_v2_lingering_close_handler(rev);
+    }
+}
+
+
+static void
+ngx_http_v2_lingering_close_handler(ngx_event_t *rev)
+{
+    ssize_t                    n;
+    ngx_msec_t                 timer;
+    ngx_connection_t          *c;
+    ngx_http_core_loc_conf_t  *clcf;
+    ngx_http_v2_connection_t  *h2c;
+    u_char                     buffer[NGX_HTTP_LINGERING_BUFFER_SIZE];
+
+    c = rev->data;
+    h2c = c->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http2 lingering close handler");
+
+    if (rev->timedout || c->close) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    timer = (ngx_msec_t) h2c->lingering_time - (ngx_msec_t) ngx_time();
+    if ((ngx_msec_int_t) timer <= 0) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    do {
+        n = c->recv(c, buffer, NGX_HTTP_LINGERING_BUFFER_SIZE);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "lingering read: %z", n);
+
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
+        if (n == NGX_ERROR || n == 0) {
+            ngx_http_close_connection(c);
+            return;
+        }
+
+    } while (rev->ready);
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    clcf = ngx_http_get_module_loc_conf(h2c->http_connection->conf_ctx,
+                                        ngx_http_core_module);
+    timer *= 1000;
+
+    if (timer > clcf->lingering_timeout) {
+        timer = clcf->lingering_timeout;
+    }
+
+    ngx_add_timer(rev, timer);
 }
 
 
@@ -731,9 +878,8 @@ ngx_http_v2_state_preface(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (ngx_memcmp(pos, preface, sizeof(preface) - 1) != 0) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                       "invalid http2 connection preface \"%*s\"",
-                       sizeof(preface) - 1, pos);
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "invalid connection preface");
 
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
     }
@@ -754,9 +900,8 @@ ngx_http_v2_state_preface_end(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (ngx_memcmp(pos, preface, sizeof(preface) - 1) != 0) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                       "invalid http2 connection preface \"%*s\"",
-                       sizeof(preface) - 1, pos);
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "invalid connection preface");
 
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
     }
@@ -845,6 +990,13 @@ ngx_http_v2_state_data(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
                    "http2 DATA frame");
 
+    if (h2c->state.sid == 0) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent DATA frame with incorrect identifier");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
     if (size > h2c->recv_window) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "client violated connection flow control: "
@@ -943,6 +1095,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     size_t                   size;
     ngx_buf_t               *buf;
     ngx_int_t                rc;
+    ngx_connection_t        *fc;
     ngx_http_request_t      *r;
     ngx_http_v2_stream_t    *stream;
     ngx_http_v2_srv_conf_t  *h2scf;
@@ -961,6 +1114,7 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     r = stream->request;
+    fc = r->connection;
 
     if (r->reading_body && !r->request_body_no_buffering) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
@@ -969,6 +1123,13 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_state_skip_padded(h2c, pos, end);
     }
 
+    if (r->headers_in.content_length_n < 0 && !r->headers_in.chunked) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                       "skipping http2 DATA frame");
+
+        return ngx_http_v2_state_skip_padded(h2c, pos, end);
+    }
+
     size = end - pos;
 
     if (size >= h2c->state.length) {
@@ -986,6 +1147,8 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
             ngx_http_finalize_request(r, rc);
         }
 
+        ngx_http_run_posted_requests(fc);
+
     } else if (size) {
         buf = stream->preread;
 
@@ -1031,12 +1194,15 @@ static u_char *
 ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    size_t                   size;
-    ngx_uint_t               padded, priority, depend, dependency, excl, weight;
-    ngx_uint_t               status;
-    ngx_http_v2_node_t      *node;
-    ngx_http_v2_stream_t    *stream;
-    ngx_http_v2_srv_conf_t  *h2scf;
+    size_t                     size;
+    ngx_uint_t                 padded, priority, depend, dependency, excl,
+                               weight;
+    ngx_uint_t                 status;
+    ngx_http_v2_node_t        *node;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_srv_conf_t    *h2scf;
+    ngx_http_core_srv_conf_t  *cscf;
+    ngx_http_core_loc_conf_t  *clcf;
 
     padded = h2c->state.flags & NGX_HTTP_V2_PADDED_FLAG;
     priority = h2c->state.flags & NGX_HTTP_V2_PRIORITY_FLAG;
@@ -1137,11 +1303,15 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
     }
 
+    cscf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                        ngx_http_core_module);
+
+    h2c->state.header_limit = cscf->large_client_header_buffers.size
+                              * cscf->large_client_header_buffers.num;
+
     h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
                                          ngx_http_v2_module);
 
-    h2c->state.header_limit = h2scf->max_header_size;
-
     if (h2c->processing >= h2scf->concurrent_streams) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "concurrent streams exceeded %ui", h2c->processing);
@@ -1195,7 +1365,14 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         ngx_http_v2_set_dependency(h2c, node, depend, excl);
     }
 
-    if (h2c->connection->requests >= h2scf->max_requests) {
+    clcf = ngx_http_get_module_loc_conf(h2c->http_connection->conf_ctx,
+                                        ngx_http_core_module);
+
+    if (clcf->keepalive_timeout == 0
+        || h2c->connection->requests >= clcf->keepalive_requests
+        || ngx_current_msec - h2c->connection->start_time
+           > clcf->keepalive_time)
+    {
         h2c->goaway = 1;
 
         if (ngx_http_v2_send_goaway(h2c, NGX_HTTP_V2_NO_ERROR) == NGX_ERROR) {
@@ -1320,10 +1497,10 @@ static u_char *
 ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    size_t                   alloc;
-    ngx_int_t                len;
-    ngx_uint_t               huff;
-    ngx_http_v2_srv_conf_t  *h2scf;
+    size_t                     alloc;
+    ngx_int_t                  len;
+    ngx_uint_t                 huff;
+    ngx_http_core_srv_conf_t  *cscf;
 
     if (!(h2c->state.flags & NGX_HTTP_V2_END_HEADERS_FLAG)
         && h2c->state.length < NGX_HTTP_V2_INT_OCTETS)
@@ -1370,12 +1547,12 @@ ngx_http_v2_state_field_len(ngx_http_v2_connection_t *h2c, u_char *pos,
                    "http2 %s string, len:%i",
                    huff ? "encoded" : "raw", len);
 
-    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
-                                         ngx_http_v2_module);
+    cscf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                        ngx_http_core_module);
 
-    if ((size_t) len > h2scf->max_field_size) {
+    if ((size_t) len > cscf->large_client_header_buffers.size) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-                      "client exceeded http2_max_field_size limit");
+                      "client sent too large header field");
 
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
     }
@@ -1590,7 +1767,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
 
     if (len > h2c->state.header_limit) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-                      "client exceeded http2_max_header_size limit");
+                      "client sent too large header");
 
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
     }
@@ -1987,6 +2164,16 @@ static u_char *
 ngx_http_v2_state_settings(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 SETTINGS frame");
+
+    if (h2c->state.sid) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent SETTINGS frame with incorrect identifier");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
     if (h2c->state.flags == NGX_HTTP_V2_ACK_FLAG) {
 
         if (h2c->state.length != 0) {
@@ -2010,9 +2197,6 @@ ngx_http_v2_state_settings(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
     }
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 SETTINGS frame");
-
     return ngx_http_v2_state_settings_params(h2c, pos, end);
 }
 
@@ -2161,6 +2345,13 @@ ngx_http_v2_state_ping(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end)
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
                    "http2 PING frame");
 
+    if (h2c->state.sid) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent PING frame with incorrect identifier");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
     if (h2c->state.flags & NGX_HTTP_V2_ACK_FLAG) {
         return ngx_http_v2_state_skip(h2c, pos, end);
     }
@@ -2202,6 +2393,13 @@ ngx_http_v2_state_goaway(ngx_http_v2_connection_t *h2c, u_char *pos,
         return ngx_http_v2_state_save(h2c, pos, end, ngx_http_v2_state_goaway);
     }
 
+    if (h2c->state.sid) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent GOAWAY frame with incorrect identifier");
+
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
+    }
+
 #if (NGX_DEBUG)
     h2c->state.length -= NGX_HTTP_V2_GOAWAY_SIZE;
 
@@ -3103,6 +3301,10 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
 
     h2c->priority_limit += h2scf->concurrent_streams;
 
+    if (h2c->connection->read->timer_set) {
+        ngx_del_timer(h2c->connection->read);
+    }
+
     return stream;
 }
 
@@ -4469,6 +4671,7 @@ ngx_http_v2_idle_handler(ngx_event_t *rev)
     ngx_connection_t          *c;
     ngx_http_v2_srv_conf_t    *h2scf;
     ngx_http_v2_connection_t  *h2c;
+    ngx_http_core_loc_conf_t  *clcf;
 
     c = rev->data;
     h2c = c->data;
@@ -4500,10 +4703,10 @@ ngx_http_v2_idle_handler(ngx_event_t *rev)
 
 #endif
 
-    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
-                                         ngx_http_v2_module);
+    clcf = ngx_http_get_module_loc_conf(h2c->http_connection->conf_ctx,
+                                        ngx_http_core_module);
 
-    if (h2c->idle++ > 10 * h2scf->max_requests) {
+    if (h2c->idle++ > 10 * clcf->keepalive_requests) {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
                       "http2 flood detected");
         ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
@@ -4513,6 +4716,9 @@ ngx_http_v2_idle_handler(ngx_event_t *rev)
     c->destroyed = 0;
     ngx_reusable_connection(c, 0);
 
+    h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+                                         ngx_http_v2_module);
+
     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
     if (h2c->pool == NULL) {
         ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
@@ -4543,16 +4749,15 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
     h2c->blocked = 1;
 
     if (!c->error && !h2c->goaway) {
+        h2c->goaway = 1;
+
         if (ngx_http_v2_send_goaway(h2c, status) != NGX_ERROR) {
             (void) ngx_http_v2_send_output_queue(h2c);
         }
     }
 
-    c->error = 1;
-
     if (!h2c->processing && !h2c->pushing) {
-        ngx_http_close_connection(c);
-        return;
+        goto done;
     }
 
     c->read->handler = ngx_http_empty_handler;
@@ -4600,10 +4805,18 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
     h2c->blocked = 0;
 
     if (h2c->processing || h2c->pushing) {
+        c->error = 1;
         return;
     }
 
-    ngx_http_close_connection(c);
+done:
+
+    if (c->error) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    ngx_http_v2_lingering_close(c);
 }
 
 
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 59ddf54..3492297 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -157,6 +157,8 @@ struct ngx_http_v2_connection_s {
     ngx_uint_t                       last_sid;
     ngx_uint_t                       last_push;
 
+    time_t                           lingering_time;
+
     unsigned                         closed_nodes:8;
     unsigned                         settings_ack:1;
     unsigned                         table_update:1;
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
index c54dc10..0050886 100644
--- a/src/http/v2/ngx_http_v2_module.c
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -36,10 +36,31 @@ static char *ngx_http_v2_preread_size(ngx_conf_t *cf, void *post, void *data);
 static char *ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post,
     void *data);
 static char *ngx_http_v2_chunk_size(ngx_conf_t *cf, void *post, void *data);
-static char *ngx_http_v2_spdy_deprecated(ngx_conf_t *cf, ngx_command_t *cmd,
+static char *ngx_http_v2_obsolete(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
 
+static ngx_conf_deprecated_t  ngx_http_v2_recv_timeout_deprecated = {
+    ngx_conf_deprecated, "http2_recv_timeout", "client_header_timeout"
+};
+
+static ngx_conf_deprecated_t  ngx_http_v2_idle_timeout_deprecated = {
+    ngx_conf_deprecated, "http2_idle_timeout", "keepalive_timeout"
+};
+
+static ngx_conf_deprecated_t  ngx_http_v2_max_requests_deprecated = {
+    ngx_conf_deprecated, "http2_max_requests", "keepalive_requests"
+};
+
+static ngx_conf_deprecated_t  ngx_http_v2_max_field_size_deprecated = {
+    ngx_conf_deprecated, "http2_max_field_size", "large_client_header_buffers"
+};
+
+static ngx_conf_deprecated_t  ngx_http_v2_max_header_size_deprecated = {
+    ngx_conf_deprecated, "http2_max_header_size", "large_client_header_buffers"
+};
+
+
 static ngx_conf_post_t  ngx_http_v2_recv_buffer_size_post =
     { ngx_http_v2_recv_buffer_size };
 static ngx_conf_post_t  ngx_http_v2_pool_size_post =
@@ -84,24 +105,24 @@ static ngx_command_t  ngx_http_v2_commands[] = {
 
     { ngx_string("http2_max_requests"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v2_srv_conf_t, max_requests),
-      NULL },
+      ngx_http_v2_obsolete,
+      0,
+      0,
+      &ngx_http_v2_max_requests_deprecated },
 
     { ngx_string("http2_max_field_size"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v2_srv_conf_t, max_field_size),
-      NULL },
+      ngx_http_v2_obsolete,
+      0,
+      0,
+      &ngx_http_v2_max_field_size_deprecated },
 
     { ngx_string("http2_max_header_size"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v2_srv_conf_t, max_header_size),
-      NULL },
+      ngx_http_v2_obsolete,
+      0,
+      0,
+      &ngx_http_v2_max_header_size_deprecated },
 
     { ngx_string("http2_body_preread_size"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
@@ -119,17 +140,17 @@ static ngx_command_t  ngx_http_v2_commands[] = {
 
     { ngx_string("http2_recv_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v2_srv_conf_t, recv_timeout),
-      NULL },
+      ngx_http_v2_obsolete,
+      0,
+      0,
+      &ngx_http_v2_recv_timeout_deprecated },
 
     { ngx_string("http2_idle_timeout"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v2_srv_conf_t, idle_timeout),
-      NULL },
+      ngx_http_v2_obsolete,
+      0,
+      0,
+      &ngx_http_v2_idle_timeout_deprecated },
 
     { ngx_string("http2_chunk_size"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -152,62 +173,6 @@ static ngx_command_t  ngx_http_v2_commands[] = {
       0,
       NULL },
 
-    { ngx_string("spdy_recv_buffer_size"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_v2_spdy_deprecated,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("spdy_pool_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_http_v2_spdy_deprecated,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("spdy_max_concurrent_streams"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_http_v2_spdy_deprecated,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("spdy_streams_index_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_http_v2_spdy_deprecated,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("spdy_recv_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_http_v2_spdy_deprecated,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("spdy_keepalive_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_http_v2_spdy_deprecated,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("spdy_headers_comp"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_http_v2_spdy_deprecated,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("spdy_chunk_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_http_v2_spdy_deprecated,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-
       ngx_null_command
 };
 
@@ -353,18 +318,11 @@ ngx_http_v2_create_srv_conf(ngx_conf_t *cf)
 
     h2scf->concurrent_streams = NGX_CONF_UNSET_UINT;
     h2scf->concurrent_pushes = NGX_CONF_UNSET_UINT;
-    h2scf->max_requests = NGX_CONF_UNSET_UINT;
-
-    h2scf->max_field_size = NGX_CONF_UNSET_SIZE;
-    h2scf->max_header_size = NGX_CONF_UNSET_SIZE;
 
     h2scf->preread_size = NGX_CONF_UNSET_SIZE;
 
     h2scf->streams_index_mask = NGX_CONF_UNSET_UINT;
 
-    h2scf->recv_timeout = NGX_CONF_UNSET_MSEC;
-    h2scf->idle_timeout = NGX_CONF_UNSET_MSEC;
-
     return h2scf;
 }
 
@@ -381,23 +339,12 @@ ngx_http_v2_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->concurrent_streams, 128);
     ngx_conf_merge_uint_value(conf->concurrent_pushes,
                               prev->concurrent_pushes, 10);
-    ngx_conf_merge_uint_value(conf->max_requests, prev->max_requests, 1000);
-
-    ngx_conf_merge_size_value(conf->max_field_size, prev->max_field_size,
-                              4096);
-    ngx_conf_merge_size_value(conf->max_header_size, prev->max_header_size,
-                              16384);
 
     ngx_conf_merge_size_value(conf->preread_size, prev->preread_size, 65536);
 
     ngx_conf_merge_uint_value(conf->streams_index_mask,
                               prev->streams_index_mask, 32 - 1);
 
-    ngx_conf_merge_msec_value(conf->recv_timeout,
-                              prev->recv_timeout, 30000);
-    ngx_conf_merge_msec_value(conf->idle_timeout,
-                              prev->idle_timeout, 180000);
-
     return NGX_CONF_OK;
 }
 
@@ -600,11 +547,14 @@ ngx_http_v2_chunk_size(ngx_conf_t *cf, void *post, void *data)
 
 
 static char *
-ngx_http_v2_spdy_deprecated(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+ngx_http_v2_obsolete(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
+    ngx_conf_deprecated_t  *d = cmd->post;
+
     ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                       "invalid directive \"%V\": ngx_http_spdy_module "
-                       "was superseded by ngx_http_v2_module", &cmd->name);
+                       "the \"%s\" directive is obsolete, "
+                       "use the \"%s\" directive instead",
+                       d->old_name, d->new_name);
 
     return NGX_CONF_OK;
 }
diff --git a/src/http/v2/ngx_http_v2_module.h b/src/http/v2/ngx_http_v2_module.h
index cdd2921..ca4a0bf 100644
--- a/src/http/v2/ngx_http_v2_module.h
+++ b/src/http/v2/ngx_http_v2_module.h
@@ -24,13 +24,8 @@ typedef struct {
     size_t                          pool_size;
     ngx_uint_t                      concurrent_streams;
     ngx_uint_t                      concurrent_pushes;
-    ngx_uint_t                      max_requests;
-    size_t                          max_field_size;
-    size_t                          max_header_size;
     size_t                          preread_size;
     ngx_uint_t                      streams_index_mask;
-    ngx_msec_t                      recv_timeout;
-    ngx_msec_t                      idle_timeout;
 } ngx_http_v2_srv_conf_t;
 
 
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c
index f17c2cc..890d815 100644
--- a/src/mail/ngx_mail.c
+++ b/src/mail/ngx_mail.c
@@ -405,6 +405,7 @@ ngx_mail_add_addrs(ngx_conf_t *cf, ngx_mail_port_t *mport,
 #if (NGX_MAIL_SSL)
         addrs[i].conf.ssl = addr[i].opt.ssl;
 #endif
+        addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
         addrs[i].conf.addr_text = addr[i].opt.addr_text;
     }
 
@@ -439,6 +440,7 @@ ngx_mail_add_addrs6(ngx_conf_t *cf, ngx_mail_port_t *mport,
 #if (NGX_MAIL_SSL)
         addrs6[i].conf.ssl = addr[i].opt.ssl;
 #endif
+        addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
         addrs6[i].conf.addr_text = addr[i].opt.addr_text;
     }
 
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index d904f25..b865a3b 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -41,6 +41,7 @@ typedef struct {
     unsigned                ipv6only:1;
 #endif
     unsigned                so_keepalive:2;
+    unsigned                proxy_protocol:1;
 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
     int                     tcp_keepidle;
     int                     tcp_keepintvl;
@@ -55,7 +56,8 @@ typedef struct {
 typedef struct {
     ngx_mail_conf_ctx_t    *ctx;
     ngx_str_t               addr_text;
-    ngx_uint_t              ssl;    /* unsigned   ssl:1; */
+    unsigned                ssl:1;
+    unsigned                proxy_protocol:1;
 } ngx_mail_addr_conf_t;
 
 typedef struct {
@@ -162,10 +164,12 @@ typedef enum {
     ngx_smtp_auth_external,
     ngx_smtp_helo,
     ngx_smtp_helo_xclient,
+    ngx_smtp_helo_auth,
     ngx_smtp_helo_from,
     ngx_smtp_xclient,
     ngx_smtp_xclient_from,
     ngx_smtp_xclient_helo,
+    ngx_smtp_xclient_auth,
     ngx_smtp_from,
     ngx_smtp_to
 } ngx_smtp_state_e;
@@ -174,6 +178,7 @@ typedef enum {
 typedef struct {
     ngx_peer_connection_t   upstream;
     ngx_buf_t              *buffer;
+    ngx_uint_t              proxy_protocol;  /* unsigned  proxy_protocol:1; */
 } ngx_mail_proxy_ctx_t;
 
 
@@ -195,6 +200,7 @@ typedef struct {
 
     ngx_uint_t              mail_state;
 
+    unsigned                ssl:1;
     unsigned                protocol:3;
     unsigned                blocked:1;
     unsigned                quit:1;
@@ -403,6 +409,7 @@ char *ngx_mail_capabilities(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 /* STUB */
 void ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_addr_t *peer);
 void ngx_mail_auth_http_init(ngx_mail_session_t *s);
+ngx_int_t ngx_mail_realip_handler(ngx_mail_session_t *s);
 /**/
 
 
diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c
index 6b57358..2a198f4 100644
--- a/src/mail/ngx_mail_auth_http_module.c
+++ b/src/mail/ngx_mail_auth_http_module.c
@@ -1135,10 +1135,10 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
     size_t                     len;
     ngx_buf_t                 *b;
     ngx_str_t                  login, passwd;
+    ngx_connection_t          *c;
 #if (NGX_MAIL_SSL)
     ngx_str_t                  verify, subject, issuer, serial, fingerprint,
                                raw_cert, cert;
-    ngx_connection_t          *c;
     ngx_mail_ssl_conf_t       *sslcf;
 #endif
     ngx_mail_core_srv_conf_t  *cscf;
@@ -1151,9 +1151,10 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
         return NULL;
     }
 
+    c = s->connection;
+
 #if (NGX_MAIL_SSL)
 
-    c = s->connection;
     sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
 
     if (c->ssl && sslcf->verify) {
@@ -1224,22 +1225,49 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
           + sizeof("Client-IP: ") - 1 + s->connection->addr_text.len
                 + sizeof(CRLF) - 1
           + sizeof("Client-Host: ") - 1 + s->host.len + sizeof(CRLF) - 1
-          + sizeof("Auth-SMTP-Helo: ") - 1 + s->smtp_helo.len + sizeof(CRLF) - 1
-          + sizeof("Auth-SMTP-From: ") - 1 + s->smtp_from.len + sizeof(CRLF) - 1
-          + sizeof("Auth-SMTP-To: ") - 1 + s->smtp_to.len + sizeof(CRLF) - 1
-#if (NGX_MAIL_SSL)
-          + sizeof("Auth-SSL: on" CRLF) - 1
-          + sizeof("Auth-SSL-Verify: ") - 1 + verify.len + sizeof(CRLF) - 1
-          + sizeof("Auth-SSL-Subject: ") - 1 + subject.len + sizeof(CRLF) - 1
-          + sizeof("Auth-SSL-Issuer: ") - 1 + issuer.len + sizeof(CRLF) - 1
-          + sizeof("Auth-SSL-Serial: ") - 1 + serial.len + sizeof(CRLF) - 1
-          + sizeof("Auth-SSL-Fingerprint: ") - 1 + fingerprint.len
-              + sizeof(CRLF) - 1
-          + sizeof("Auth-SSL-Cert: ") - 1 + cert.len + sizeof(CRLF) - 1
-#endif
           + ahcf->header.len
           + sizeof(CRLF) - 1;
 
+    if (c->proxy_protocol) {
+        len += sizeof("Proxy-Protocol-Addr: ") - 1
+                     + c->proxy_protocol->src_addr.len + sizeof(CRLF) - 1
+               + sizeof("Proxy-Protocol-Port: ") - 1
+                     + sizeof("65535") - 1 + sizeof(CRLF) - 1
+               + sizeof("Proxy-Protocol-Server-Addr: ") - 1
+                     + c->proxy_protocol->dst_addr.len + sizeof(CRLF) - 1
+               + sizeof("Proxy-Protocol-Server-Port: ") - 1
+                     + sizeof("65535") - 1 + sizeof(CRLF) - 1;
+    }
+
+    if (s->auth_method == NGX_MAIL_AUTH_NONE) {
+        len += sizeof("Auth-SMTP-Helo: ") - 1 + s->smtp_helo.len
+                     + sizeof(CRLF) - 1
+               + sizeof("Auth-SMTP-From: ") - 1 + s->smtp_from.len
+                     + sizeof(CRLF) - 1
+               + sizeof("Auth-SMTP-To: ") - 1 + s->smtp_to.len
+                     + sizeof(CRLF) - 1;
+    }
+
+#if (NGX_MAIL_SSL)
+
+    if (c->ssl) {
+        len += sizeof("Auth-SSL: on" CRLF) - 1
+               + sizeof("Auth-SSL-Verify: ") - 1 + verify.len
+                     + sizeof(CRLF) - 1
+               + sizeof("Auth-SSL-Subject: ") - 1 + subject.len
+                     + sizeof(CRLF) - 1
+               + sizeof("Auth-SSL-Issuer: ") - 1 + issuer.len
+                     + sizeof(CRLF) - 1
+               + sizeof("Auth-SSL-Serial: ") - 1 + serial.len
+                     + sizeof(CRLF) - 1
+               + sizeof("Auth-SSL-Fingerprint: ") - 1 + fingerprint.len
+                     + sizeof(CRLF) - 1
+               + sizeof("Auth-SSL-Cert: ") - 1 + cert.len
+                     + sizeof(CRLF) - 1;
+    }
+
+#endif
+
     b = ngx_create_temp_buf(pool, len);
     if (b == NULL) {
         return NULL;
@@ -1298,6 +1326,26 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
         *b->last++ = CR; *b->last++ = LF;
     }
 
+    if (c->proxy_protocol) {
+        b->last = ngx_cpymem(b->last, "Proxy-Protocol-Addr: ",
+                             sizeof("Proxy-Protocol-Addr: ") - 1);
+        b->last = ngx_copy(b->last, c->proxy_protocol->src_addr.data,
+                           c->proxy_protocol->src_addr.len);
+        *b->last++ = CR; *b->last++ = LF;
+
+        b->last = ngx_sprintf(b->last, "Proxy-Protocol-Port: %d" CRLF,
+                              c->proxy_protocol->src_port);
+
+        b->last = ngx_cpymem(b->last, "Proxy-Protocol-Server-Addr: ",
+                             sizeof("Proxy-Protocol-Server-Addr: ") - 1);
+        b->last = ngx_copy(b->last, c->proxy_protocol->dst_addr.data,
+                           c->proxy_protocol->dst_addr.len);
+        *b->last++ = CR; *b->last++ = LF;
+
+        b->last = ngx_sprintf(b->last, "Proxy-Protocol-Server-Port: %d" CRLF,
+                              c->proxy_protocol->dst_port);
+    }
+
     if (s->auth_method == NGX_MAIL_AUTH_NONE) {
 
         /* HELO, MAIL FROM, and RCPT TO can't contain CRLF, no need to escape */
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index e16d702..4083124 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -548,6 +548,11 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
         }
 
+        if (ngx_strcmp(value[i].data, "proxy_protocol") == 0) {
+            ls->proxy_protocol = 1;
+            continue;
+        }
+
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "the invalid \"%V\" parameter", &value[i]);
         return NGX_CONF_ERROR;
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 803a247..0aaa0e7 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -11,6 +11,8 @@
 #include <ngx_mail.h>
 
 
+static void ngx_mail_proxy_protocol_handler(ngx_event_t *rev);
+static void ngx_mail_init_session_handler(ngx_event_t *rev);
 static void ngx_mail_init_session(ngx_connection_t *c);
 
 #if (NGX_MAIL_SSL)
@@ -26,6 +28,7 @@ ngx_mail_init_connection(ngx_connection_t *c)
 {
     size_t                     len;
     ngx_uint_t                 i;
+    ngx_event_t               *rev;
     ngx_mail_port_t           *port;
     struct sockaddr           *sa;
     struct sockaddr_in        *sin;
@@ -129,6 +132,10 @@ ngx_mail_init_connection(ngx_connection_t *c)
     s->main_conf = addr_conf->ctx->main_conf;
     s->srv_conf = addr_conf->ctx->srv_conf;
 
+#if (NGX_MAIL_SSL)
+    s->ssl = addr_conf->ssl;
+#endif
+
     s->addr_text = &addr_conf->addr_text;
 
     c->data = s;
@@ -159,13 +166,126 @@ ngx_mail_init_connection(ngx_connection_t *c)
 
     c->log_error = NGX_ERROR_INFO;
 
+    rev = c->read;
+    rev->handler = ngx_mail_init_session_handler;
+
+    if (addr_conf->proxy_protocol) {
+        c->log->action = "reading PROXY protocol";
+
+        rev->handler = ngx_mail_proxy_protocol_handler;
+
+        if (!rev->ready) {
+            ngx_add_timer(rev, cscf->timeout);
+
+            if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+                ngx_mail_close_connection(c);
+            }
+
+            return;
+        }
+    }
+
+    if (ngx_use_accept_mutex) {
+        ngx_post_event(rev, &ngx_posted_events);
+        return;
+    }
+
+    rev->handler(rev);
+}
+
+
+static void
+ngx_mail_proxy_protocol_handler(ngx_event_t *rev)
+{
+    u_char                    *p, buf[NGX_PROXY_PROTOCOL_MAX_HEADER];
+    size_t                     size;
+    ssize_t                    n;
+    ngx_err_t                  err;
+    ngx_connection_t          *c;
+    ngx_mail_session_t        *s;
+    ngx_mail_core_srv_conf_t  *cscf;
+
+    c = rev->data;
+    s = c->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0,
+                   "mail PROXY protocol handler");
+
+    if (rev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
+        c->timedout = 1;
+        ngx_mail_close_connection(c);
+        return;
+    }
+
+    n = recv(c->fd, (char *) buf, sizeof(buf), MSG_PEEK);
+
+    err = ngx_socket_errno;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0, "recv(): %z", n);
+
+    if (n == -1) {
+        if (err == NGX_EAGAIN) {
+            rev->ready = 0;
+
+            if (!rev->timer_set) {
+                cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
+                ngx_add_timer(rev, cscf->timeout);
+            }
+
+            if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+                ngx_mail_close_connection(c);
+            }
+
+            return;
+        }
+
+        ngx_connection_error(c, err, "recv() failed");
+
+        ngx_mail_close_connection(c);
+        return;
+    }
+
+    p = ngx_proxy_protocol_read(c, buf, buf + n);
+
+    if (p == NULL) {
+        ngx_mail_close_connection(c);
+        return;
+    }
+
+    size = p - buf;
+
+    if (c->recv(c, buf, size) != (ssize_t) size) {
+        ngx_mail_close_connection(c);
+        return;
+    }
+
+    if (ngx_mail_realip_handler(s) != NGX_OK) {
+        ngx_mail_close_connection(c);
+        return;
+    }
+
+    ngx_mail_init_session_handler(rev);
+}
+
+
+static void
+ngx_mail_init_session_handler(ngx_event_t *rev)
+{
+    ngx_connection_t  *c;
+
+    c = rev->data;
+
 #if (NGX_MAIL_SSL)
     {
+    ngx_mail_session_t   *s;
     ngx_mail_ssl_conf_t  *sslcf;
 
+    s = c->data;
+
     sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
 
-    if (sslcf->enable || addr_conf->ssl) {
+    if (sslcf->enable || s->ssl) {
         c->log->action = "SSL handshaking";
 
         ngx_mail_ssl_init_connection(&sslcf->ssl, c);
@@ -215,9 +335,10 @@ ngx_mail_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c)
 
         s = c->data;
 
-        cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
-
-        ngx_add_timer(c->read, cscf->timeout);
+        if (!c->read->timer_set) {
+            cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
+            ngx_add_timer(c->read, cscf->timeout);
+        }
 
         c->ssl->handler = ngx_mail_ssl_handshake_handler;
 
@@ -338,6 +459,8 @@ ngx_mail_init_session(ngx_connection_t *c)
 
     s = c->data;
 
+    c->log->action = "sending client greeting line";
+
     cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
 
     s->protocol = cscf->protocol->type;
@@ -722,11 +845,6 @@ ngx_mail_read_command(ngx_mail_session_t *s, ngx_connection_t *c)
     }
 
     if (n == NGX_AGAIN) {
-        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-            ngx_mail_session_internal_server_error(s);
-            return NGX_ERROR;
-        }
-
         if (s->buffer->pos == s->buffer->last) {
             return NGX_AGAIN;
         }
diff --git a/src/mail/ngx_mail_imap_handler.c b/src/mail/ngx_mail_imap_handler.c
index 3bf09ec..5dfdd76 100644
--- a/src/mail/ngx_mail_imap_handler.c
+++ b/src/mail/ngx_mail_imap_handler.c
@@ -123,6 +123,12 @@ ngx_mail_imap_auth_state(ngx_event_t *rev)
     if (s->out.len) {
         ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "imap send handler busy");
         s->blocked = 1;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_close_connection(c);
+            return;
+        }
+
         return;
     }
 
@@ -130,7 +136,16 @@ ngx_mail_imap_auth_state(ngx_event_t *rev)
 
     rc = ngx_mail_read_command(s, c);
 
-    if (rc == NGX_AGAIN || rc == NGX_ERROR) {
+    if (rc == NGX_AGAIN) {
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_session_internal_server_error(s);
+            return;
+        }
+
+        return;
+    }
+
+    if (rc == NGX_ERROR) {
         return;
     }
 
@@ -293,6 +308,11 @@ ngx_mail_imap_auth_state(ngx_event_t *rev)
         }
     }
 
+    if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+        ngx_mail_session_internal_server_error(s);
+        return;
+    }
+
     ngx_mail_send(c->write);
 }
 
diff --git a/src/mail/ngx_mail_pop3_handler.c b/src/mail/ngx_mail_pop3_handler.c
index 9310c27..edfd986 100644
--- a/src/mail/ngx_mail_pop3_handler.c
+++ b/src/mail/ngx_mail_pop3_handler.c
@@ -138,6 +138,12 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev)
     if (s->out.len) {
         ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "pop3 send handler busy");
         s->blocked = 1;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_close_connection(c);
+            return;
+        }
+
         return;
     }
 
@@ -145,7 +151,16 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev)
 
     rc = ngx_mail_read_command(s, c);
 
-    if (rc == NGX_AGAIN || rc == NGX_ERROR) {
+    if (rc == NGX_AGAIN) {
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_session_internal_server_error(s);
+            return;
+        }
+
+        return;
+    }
+
+    if (rc == NGX_ERROR) {
         return;
     }
 
@@ -275,6 +290,11 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev)
             s->arg_start = s->buffer->start;
         }
 
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_session_internal_server_error(s);
+            return;
+        }
+
         ngx_mail_send(c->write);
     }
 }
diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c
index 1c86e54..66aa0ba 100644
--- a/src/mail/ngx_mail_proxy_module.c
+++ b/src/mail/ngx_mail_proxy_module.c
@@ -16,6 +16,8 @@ typedef struct {
     ngx_flag_t  enable;
     ngx_flag_t  pass_error_message;
     ngx_flag_t  xclient;
+    ngx_flag_t  smtp_auth;
+    ngx_flag_t  proxy_protocol;
     size_t      buffer_size;
     ngx_msec_t  timeout;
 } ngx_mail_proxy_conf_t;
@@ -25,7 +27,8 @@ static void ngx_mail_proxy_block_read(ngx_event_t *rev);
 static void ngx_mail_proxy_pop3_handler(ngx_event_t *rev);
 static void ngx_mail_proxy_imap_handler(ngx_event_t *rev);
 static void ngx_mail_proxy_smtp_handler(ngx_event_t *rev);
-static void ngx_mail_proxy_dummy_handler(ngx_event_t *ev);
+static void ngx_mail_proxy_write_handler(ngx_event_t *wev);
+static ngx_int_t ngx_mail_proxy_send_proxy_protocol(ngx_mail_session_t *s);
 static ngx_int_t ngx_mail_proxy_read_response(ngx_mail_session_t *s,
     ngx_uint_t state);
 static void ngx_mail_proxy_handler(ngx_event_t *ev);
@@ -74,6 +77,20 @@ static ngx_command_t  ngx_mail_proxy_commands[] = {
       offsetof(ngx_mail_proxy_conf_t, xclient),
       NULL },
 
+    { ngx_string("proxy_smtp_auth"),
+      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_MAIL_SRV_CONF_OFFSET,
+      offsetof(ngx_mail_proxy_conf_t, smtp_auth),
+      NULL },
+
+    { ngx_string("proxy_protocol"),
+      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_MAIL_SRV_CONF_OFFSET,
+      offsetof(ngx_mail_proxy_conf_t, proxy_protocol),
+      NULL },
+
       ngx_null_command
 };
 
@@ -148,7 +165,7 @@ ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_addr_t *peer)
     p->upstream.connection->pool = s->connection->pool;
 
     s->connection->read->handler = ngx_mail_proxy_block_read;
-    p->upstream.connection->write->handler = ngx_mail_proxy_dummy_handler;
+    p->upstream.connection->write->handler = ngx_mail_proxy_write_handler;
 
     pcf = ngx_mail_get_module_srv_conf(s, ngx_mail_proxy_module);
 
@@ -159,6 +176,8 @@ ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_addr_t *peer)
         return;
     }
 
+    s->proxy->proxy_protocol = pcf->proxy_protocol;
+
     s->out.len = 0;
 
     switch (s->protocol) {
@@ -178,6 +197,12 @@ ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_addr_t *peer)
         s->mail_state = ngx_smtp_start;
         break;
     }
+
+    if (rc == NGX_AGAIN) {
+        return;
+    }
+
+    ngx_mail_proxy_write_handler(p->upstream.connection->write);
 }
 
 
@@ -222,9 +247,25 @@ ngx_mail_proxy_pop3_handler(ngx_event_t *rev)
         return;
     }
 
+    if (s->proxy->proxy_protocol) {
+        ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "mail proxy pop3 busy");
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_proxy_internal_server_error(s);
+            return;
+        }
+
+        return;
+    }
+
     rc = ngx_mail_proxy_read_response(s, 0);
 
     if (rc == NGX_AGAIN) {
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_proxy_internal_server_error(s);
+            return;
+        }
+
         return;
     }
 
@@ -306,6 +347,11 @@ ngx_mail_proxy_pop3_handler(ngx_event_t *rev)
         return;
     }
 
+    if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+        ngx_mail_proxy_internal_server_error(s);
+        return;
+    }
+
     s->proxy->buffer->pos = s->proxy->buffer->start;
     s->proxy->buffer->last = s->proxy->buffer->start;
 }
@@ -335,9 +381,25 @@ ngx_mail_proxy_imap_handler(ngx_event_t *rev)
         return;
     }
 
+    if (s->proxy->proxy_protocol) {
+        ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "mail proxy imap busy");
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_proxy_internal_server_error(s);
+            return;
+        }
+
+        return;
+    }
+
     rc = ngx_mail_proxy_read_response(s, s->mail_state);
 
     if (rc == NGX_AGAIN) {
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_proxy_internal_server_error(s);
+            return;
+        }
+
         return;
     }
 
@@ -440,6 +502,11 @@ ngx_mail_proxy_imap_handler(ngx_event_t *rev)
         return;
     }
 
+    if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+        ngx_mail_proxy_internal_server_error(s);
+        return;
+    }
+
     s->proxy->buffer->pos = s->proxy->buffer->start;
     s->proxy->buffer->last = s->proxy->buffer->start;
 }
@@ -450,7 +517,7 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
 {
     u_char                    *p;
     ngx_int_t                  rc;
-    ngx_str_t                  line;
+    ngx_str_t                  line, auth, encoded;
     ngx_buf_t                 *b;
     ngx_connection_t          *c;
     ngx_mail_session_t        *s;
@@ -471,9 +538,25 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
         return;
     }
 
+    if (s->proxy->proxy_protocol) {
+        ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "mail proxy smtp busy");
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_proxy_internal_server_error(s);
+            return;
+        }
+
+        return;
+    }
+
     rc = ngx_mail_proxy_read_response(s, s->mail_state);
 
     if (rc == NGX_AGAIN) {
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_proxy_internal_server_error(s);
+            return;
+        }
+
         return;
     }
 
@@ -513,6 +596,9 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
         } else if (s->auth_method == NGX_MAIL_AUTH_NONE) {
             s->mail_state = ngx_smtp_helo_from;
 
+        } else if (pcf->smtp_auth) {
+            s->mail_state = ngx_smtp_helo_auth;
+
         } else {
             s->mail_state = ngx_smtp_helo;
         }
@@ -552,7 +638,9 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
         p = ngx_copy(p, s->connection->addr_text.data,
                      s->connection->addr_text.len);
 
-        if (s->login.len) {
+        pcf = ngx_mail_get_module_srv_conf(s, ngx_mail_proxy_module);
+
+        if (s->login.len && !pcf->smtp_auth) {
             p = ngx_cpymem(p, " LOGIN=", sizeof(" LOGIN=") - 1);
             p = ngx_copy(p, s->login.data, s->login.len);
         }
@@ -570,6 +658,9 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
         } else if (s->auth_method == NGX_MAIL_AUTH_NONE) {
             s->mail_state = ngx_smtp_xclient_from;
 
+        } else if (pcf->smtp_auth) {
+            s->mail_state = ngx_smtp_xclient_auth;
+
         } else {
             s->mail_state = ngx_smtp_xclient;
         }
@@ -595,8 +686,62 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
                        &s->smtp_helo)
                    - line.data;
 
-        s->mail_state = (s->auth_method == NGX_MAIL_AUTH_NONE) ?
-                            ngx_smtp_helo_from : ngx_smtp_helo;
+        pcf = ngx_mail_get_module_srv_conf(s, ngx_mail_proxy_module);
+
+        if (s->auth_method == NGX_MAIL_AUTH_NONE) {
+            s->mail_state = ngx_smtp_helo_from;
+
+        } else if (pcf->smtp_auth) {
+            s->mail_state = ngx_smtp_helo_auth;
+
+        } else {
+            s->mail_state = ngx_smtp_helo;
+        }
+
+        break;
+
+    case ngx_smtp_helo_auth:
+    case ngx_smtp_xclient_auth:
+        ngx_log_debug0(NGX_LOG_DEBUG_MAIL, rev->log, 0,
+                       "mail proxy send auth");
+
+        s->connection->log->action = "sending AUTH to upstream";
+
+        if (s->passwd.data == NULL) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "no password available");
+            ngx_mail_proxy_internal_server_error(s);
+            return;
+        }
+
+        auth.len = 1 + s->login.len + 1 + s->passwd.len;
+        auth.data = ngx_pnalloc(c->pool, auth.len);
+        if (auth.data == NULL) {
+            ngx_mail_proxy_internal_server_error(s);
+            return;
+        }
+
+        auth.len = ngx_sprintf(auth.data, "%Z%V%Z%V", &s->login, &s->passwd)
+                   - auth.data;
+
+        line.len = sizeof("AUTH PLAIN " CRLF) - 1
+                   + ngx_base64_encoded_length(auth.len);
+
+        line.data = ngx_pnalloc(c->pool, line.len);
+        if (line.data == NULL) {
+            ngx_mail_proxy_internal_server_error(s);
+            return;
+        }
+
+        encoded.data = ngx_cpymem(line.data, "AUTH PLAIN ",
+                                  sizeof("AUTH PLAIN ") - 1);
+
+        ngx_encode_base64(&encoded, &auth);
+
+        p = encoded.data + encoded.len;
+        *p++ = CR; *p = LF;
+
+        s->mail_state = ngx_smtp_auth_plain;
 
         break;
 
@@ -643,6 +788,7 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
 
     case ngx_smtp_helo:
     case ngx_smtp_xclient:
+    case ngx_smtp_auth_plain:
     case ngx_smtp_to:
 
         b = s->proxy->buffer;
@@ -692,25 +838,103 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
         return;
     }
 
+    if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+        ngx_mail_proxy_internal_server_error(s);
+        return;
+    }
+
     s->proxy->buffer->pos = s->proxy->buffer->start;
     s->proxy->buffer->last = s->proxy->buffer->start;
 }
 
 
 static void
-ngx_mail_proxy_dummy_handler(ngx_event_t *wev)
+ngx_mail_proxy_write_handler(ngx_event_t *wev)
 {
     ngx_connection_t    *c;
     ngx_mail_session_t  *s;
 
-    ngx_log_debug0(NGX_LOG_DEBUG_MAIL, wev->log, 0, "mail proxy dummy handler");
+    ngx_log_debug0(NGX_LOG_DEBUG_MAIL, wev->log, 0, "mail proxy write handler");
+
+    c = wev->data;
+    s = c->data;
+
+    if (s->proxy->proxy_protocol) {
+        if (ngx_mail_proxy_send_proxy_protocol(s) != NGX_OK) {
+            return;
+        }
+
+        s->proxy->proxy_protocol = 0;
+    }
 
     if (ngx_handle_write_event(wev, 0) != NGX_OK) {
-        c = wev->data;
-        s = c->data;
-
-        ngx_mail_proxy_close_session(s);
+        ngx_mail_proxy_internal_server_error(s);
     }
+
+    if (c->read->ready) {
+        ngx_post_event(c->read, &ngx_posted_events);
+    }
+}
+
+
+static ngx_int_t
+ngx_mail_proxy_send_proxy_protocol(ngx_mail_session_t *s)
+{
+    u_char            *p;
+    ssize_t            n, size;
+    ngx_connection_t  *c;
+    u_char             buf[NGX_PROXY_PROTOCOL_MAX_HEADER];
+
+    s->connection->log->action = "sending PROXY protocol header to upstream";
+
+    ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0,
+                   "mail proxy send PROXY protocol header");
+
+    p = ngx_proxy_protocol_write(s->connection, buf,
+                                 buf + NGX_PROXY_PROTOCOL_MAX_HEADER);
+    if (p == NULL) {
+        ngx_mail_proxy_internal_server_error(s);
+        return NGX_ERROR;
+    }
+
+    c = s->proxy->upstream.connection;
+
+    size = p - buf;
+
+    n = c->send(c, buf, size);
+
+    if (n == NGX_AGAIN) {
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            ngx_mail_proxy_internal_server_error(s);
+            return NGX_ERROR;
+        }
+
+        return NGX_AGAIN;
+    }
+
+    if (n == NGX_ERROR) {
+        ngx_mail_proxy_internal_server_error(s);
+        return NGX_ERROR;
+    }
+
+    if (n != size) {
+
+        /*
+         * PROXY protocol specification:
+         * The sender must always ensure that the header
+         * is sent at once, so that the transport layer
+         * maintains atomicity along the path to the receiver.
+         */
+
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "could not send PROXY protocol header at once");
+
+        ngx_mail_proxy_internal_server_error(s);
+
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
 }
 
 
@@ -824,6 +1048,7 @@ ngx_mail_proxy_read_response(ngx_mail_session_t *s, ngx_uint_t state)
         case ngx_smtp_helo:
         case ngx_smtp_helo_xclient:
         case ngx_smtp_helo_from:
+        case ngx_smtp_helo_auth:
         case ngx_smtp_from:
             if (p[0] == '2' && p[1] == '5' && p[2] == '0') {
                 return NGX_OK;
@@ -833,11 +1058,18 @@ ngx_mail_proxy_read_response(ngx_mail_session_t *s, ngx_uint_t state)
         case ngx_smtp_xclient:
         case ngx_smtp_xclient_from:
         case ngx_smtp_xclient_helo:
+        case ngx_smtp_xclient_auth:
             if (p[0] == '2' && (p[1] == '2' || p[1] == '5') && p[2] == '0') {
                 return NGX_OK;
             }
             break;
 
+        case ngx_smtp_auth_plain:
+            if (p[0] == '2' && p[1] == '3' && p[2] == '5') {
+                return NGX_OK;
+            }
+            break;
+
         case ngx_smtp_to:
             return NGX_OK;
         }
@@ -1102,6 +1334,8 @@ ngx_mail_proxy_create_conf(ngx_conf_t *cf)
     pcf->enable = NGX_CONF_UNSET;
     pcf->pass_error_message = NGX_CONF_UNSET;
     pcf->xclient = NGX_CONF_UNSET;
+    pcf->smtp_auth = NGX_CONF_UNSET;
+    pcf->proxy_protocol = NGX_CONF_UNSET;
     pcf->buffer_size = NGX_CONF_UNSET_SIZE;
     pcf->timeout = NGX_CONF_UNSET_MSEC;
 
@@ -1118,6 +1352,8 @@ ngx_mail_proxy_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->enable, prev->enable, 0);
     ngx_conf_merge_value(conf->pass_error_message, prev->pass_error_message, 0);
     ngx_conf_merge_value(conf->xclient, prev->xclient, 1);
+    ngx_conf_merge_value(conf->smtp_auth, prev->smtp_auth, 0);
+    ngx_conf_merge_value(conf->proxy_protocol, prev->proxy_protocol, 0);
     ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size,
                               (size_t) ngx_pagesize);
     ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 24 * 60 * 60000);
diff --git a/src/mail/ngx_mail_realip_module.c b/src/mail/ngx_mail_realip_module.c
new file mode 100644
index 0000000..c93d7d3
--- /dev/null
+++ b/src/mail/ngx_mail_realip_module.c
@@ -0,0 +1,269 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_mail.h>
+
+
+typedef struct {
+    ngx_array_t       *from;     /* array of ngx_cidr_t */
+} ngx_mail_realip_srv_conf_t;
+
+
+static ngx_int_t ngx_mail_realip_set_addr(ngx_mail_session_t *s,
+    ngx_addr_t *addr);
+static char *ngx_mail_realip_from(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static void *ngx_mail_realip_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_mail_realip_merge_srv_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+
+
+static ngx_command_t  ngx_mail_realip_commands[] = {
+
+    { ngx_string("set_real_ip_from"),
+      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_mail_realip_from,
+      NGX_MAIL_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_mail_module_t  ngx_mail_realip_module_ctx = {
+    NULL,                                  /* protocol */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    ngx_mail_realip_create_srv_conf,       /* create server configuration */
+    ngx_mail_realip_merge_srv_conf         /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_mail_realip_module = {
+    NGX_MODULE_V1,
+    &ngx_mail_realip_module_ctx,           /* module context */
+    ngx_mail_realip_commands,              /* module directives */
+    NGX_MAIL_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+ngx_int_t
+ngx_mail_realip_handler(ngx_mail_session_t *s)
+{
+    ngx_addr_t                   addr;
+    ngx_connection_t            *c;
+    ngx_mail_realip_srv_conf_t  *rscf;
+
+    rscf = ngx_mail_get_module_srv_conf(s, ngx_mail_realip_module);
+
+    if (rscf->from == NULL) {
+        return NGX_OK;
+    }
+
+    c = s->connection;
+
+    if (c->proxy_protocol == NULL) {
+        return NGX_OK;
+    }
+
+    if (ngx_cidr_match(c->sockaddr, rscf->from) != NGX_OK) {
+        return NGX_OK;
+    }
+
+    if (ngx_parse_addr(c->pool, &addr, c->proxy_protocol->src_addr.data,
+                       c->proxy_protocol->src_addr.len)
+        != NGX_OK)
+    {
+        return NGX_OK;
+    }
+
+    ngx_inet_set_port(addr.sockaddr, c->proxy_protocol->src_port);
+
+    return ngx_mail_realip_set_addr(s, &addr);
+}
+
+
+static ngx_int_t
+ngx_mail_realip_set_addr(ngx_mail_session_t *s, ngx_addr_t *addr)
+{
+    size_t             len;
+    u_char            *p;
+    u_char             text[NGX_SOCKADDR_STRLEN];
+    ngx_connection_t  *c;
+
+    c = s->connection;
+
+    len = ngx_sock_ntop(addr->sockaddr, addr->socklen, text,
+                        NGX_SOCKADDR_STRLEN, 0);
+    if (len == 0) {
+        return NGX_ERROR;
+    }
+
+    p = ngx_pnalloc(c->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(p, text, len);
+
+    c->sockaddr = addr->sockaddr;
+    c->socklen = addr->socklen;
+    c->addr_text.len = len;
+    c->addr_text.data = p;
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_mail_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_mail_realip_srv_conf_t *rscf = conf;
+
+    ngx_int_t             rc;
+    ngx_str_t            *value;
+    ngx_url_t             u;
+    ngx_cidr_t            c, *cidr;
+    ngx_uint_t            i;
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
+
+    value = cf->args->elts;
+
+    if (rscf->from == NULL) {
+        rscf->from = ngx_array_create(cf->pool, 2,
+                                      sizeof(ngx_cidr_t));
+        if (rscf->from == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+
+    if (ngx_strcmp(value[1].data, "unix:") == 0) {
+        cidr = ngx_array_push(rscf->from);
+        if (cidr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        cidr->family = AF_UNIX;
+        return NGX_CONF_OK;
+    }
+
+#endif
+
+    rc = ngx_ptocidr(&value[1], &c);
+
+    if (rc != NGX_ERROR) {
+        if (rc == NGX_DONE) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "low address bits of %V are meaningless",
+                               &value[1]);
+        }
+
+        cidr = ngx_array_push(rscf->from);
+        if (cidr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *cidr = c;
+
+        return NGX_CONF_OK;
+    }
+
+    ngx_memzero(&u, sizeof(ngx_url_t));
+    u.host = value[1];
+
+    if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
+        if (u.err) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "%s in set_real_ip_from \"%V\"",
+                               u.err, &u.host);
+        }
+
+        return NGX_CONF_ERROR;
+    }
+
+    cidr = ngx_array_push_n(rscf->from, u.naddrs);
+    if (cidr == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(cidr, u.naddrs * sizeof(ngx_cidr_t));
+
+    for (i = 0; i < u.naddrs; i++) {
+        cidr[i].family = u.addrs[i].sockaddr->sa_family;
+
+        switch (cidr[i].family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            sin6 = (struct sockaddr_in6 *) u.addrs[i].sockaddr;
+            cidr[i].u.in6.addr = sin6->sin6_addr;
+            ngx_memset(cidr[i].u.in6.mask.s6_addr, 0xff, 16);
+            break;
+#endif
+
+        default: /* AF_INET */
+            sin = (struct sockaddr_in *) u.addrs[i].sockaddr;
+            cidr[i].u.in.addr = sin->sin_addr.s_addr;
+            cidr[i].u.in.mask = 0xffffffff;
+            break;
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_mail_realip_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_mail_realip_srv_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_realip_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->from = NULL;
+     */
+
+    return conf;
+}
+
+
+static char *
+ngx_mail_realip_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_mail_realip_srv_conf_t *prev = parent;
+    ngx_mail_realip_srv_conf_t *conf = child;
+
+    if (conf->from == NULL) {
+        conf->from = prev->from;
+    }
+
+    return NGX_CONF_OK;
+}
diff --git a/src/mail/ngx_mail_smtp_handler.c b/src/mail/ngx_mail_smtp_handler.c
index f1017e0..e68ceed 100644
--- a/src/mail/ngx_mail_smtp_handler.c
+++ b/src/mail/ngx_mail_smtp_handler.c
@@ -449,6 +449,12 @@ ngx_mail_smtp_auth_state(ngx_event_t *rev)
     if (s->out.len) {
         ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "smtp send handler busy");
         s->blocked = 1;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_close_connection(c);
+            return;
+        }
+
         return;
     }
 
@@ -456,7 +462,16 @@ ngx_mail_smtp_auth_state(ngx_event_t *rev)
 
     rc = ngx_mail_read_command(s, c);
 
-    if (rc == NGX_AGAIN || rc == NGX_ERROR) {
+    if (rc == NGX_AGAIN) {
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_session_internal_server_error(s);
+            return;
+        }
+
+        return;
+    }
+
+    if (rc == NGX_ERROR) {
         return;
     }
 
@@ -568,6 +583,11 @@ ngx_mail_smtp_auth_state(ngx_event_t *rev)
             s->arg_start = s->buffer->pos;
         }
 
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            ngx_mail_session_internal_server_error(s);
+            return;
+        }
+
         ngx_mail_send(c->write);
     }
 }
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index e193b29..7eae83e 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -26,6 +26,9 @@ static char *ngx_mail_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
 static char *ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
+static char *ngx_mail_ssl_conf_command_check(ngx_conf_t *cf, void *post,
+    void *data);
+
 
 static ngx_conf_enum_t  ngx_mail_starttls_state[] = {
     { ngx_string("off"), NGX_MAIL_STARTTLS_OFF },
@@ -61,6 +64,10 @@ static ngx_conf_deprecated_t  ngx_mail_ssl_deprecated = {
 };
 
 
+static ngx_conf_post_t  ngx_mail_ssl_conf_command_post =
+    { ngx_mail_ssl_conf_command_check };
+
+
 static ngx_command_t  ngx_mail_ssl_commands[] = {
 
     { ngx_string("ssl"),
@@ -196,6 +203,13 @@ static ngx_command_t  ngx_mail_ssl_commands[] = {
       offsetof(ngx_mail_ssl_conf_t, crl),
       NULL },
 
+    { ngx_string("ssl_conf_command"),
+      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_keyval_slot,
+      NGX_MAIL_SRV_CONF_OFFSET,
+      offsetof(ngx_mail_ssl_conf_t, conf_commands),
+      &ngx_mail_ssl_conf_command_post },
+
       ngx_null_command
 };
 
@@ -259,6 +273,7 @@ ngx_mail_ssl_create_conf(ngx_conf_t *cf)
     scf->certificates = NGX_CONF_UNSET_PTR;
     scf->certificate_keys = NGX_CONF_UNSET_PTR;
     scf->passwords = NGX_CONF_UNSET_PTR;
+    scf->conf_commands = NGX_CONF_UNSET_PTR;
     scf->prefer_server_ciphers = NGX_CONF_UNSET;
     scf->verify = NGX_CONF_UNSET_UINT;
     scf->verify_depth = NGX_CONF_UNSET_UINT;
@@ -316,6 +331,8 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS);
 
+    ngx_conf_merge_ptr_value(conf->conf_commands, prev->conf_commands, NULL);
+
 
     conf->ssl.log = cf->log;
 
@@ -461,6 +478,10 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
+    if (ngx_ssl_conf_commands(cf, &conf->ssl, conf->conf_commands) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     return NGX_CONF_OK;
 }
 
@@ -654,3 +675,14 @@ invalid:
 
     return NGX_CONF_ERROR;
 }
+
+
+static char *
+ngx_mail_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
+{
+#ifndef SSL_CONF_FLAG_FILE
+    return "is not supported on this platform";
+#else
+    return NGX_CONF_OK;
+#endif
+}
diff --git a/src/mail/ngx_mail_ssl_module.h b/src/mail/ngx_mail_ssl_module.h
index d6b0b8e..a0a6113 100644
--- a/src/mail/ngx_mail_ssl_module.h
+++ b/src/mail/ngx_mail_ssl_module.h
@@ -48,6 +48,7 @@ typedef struct {
     ngx_str_t        ciphers;
 
     ngx_array_t     *passwords;
+    ngx_array_t     *conf_commands;
 
     ngx_shm_zone_t  *shm_zone;
 
diff --git a/src/misc/ngx_cpp_test_module.cpp b/src/misc/ngx_cpp_test_module.cpp
index 5d2f08d..0026409 100644
--- a/src/misc/ngx_cpp_test_module.cpp
+++ b/src/misc/ngx_cpp_test_module.cpp
@@ -14,6 +14,8 @@ extern "C" {
   #include <ngx_mail_pop3_module.h>
   #include <ngx_mail_imap_module.h>
   #include <ngx_mail_smtp_module.h>
+
+  #include <ngx_stream.h>
 }
 
 // nginx header files should go before other, because they define 64-bit off_t
diff --git a/src/os/unix/ngx_errno.c b/src/os/unix/ngx_errno.c
index e787b23..ca23b2d 100644
--- a/src/os/unix/ngx_errno.c
+++ b/src/os/unix/ngx_errno.c
@@ -9,6 +9,49 @@
 #include <ngx_core.h>
 
 
+static ngx_str_t   ngx_unknown_error = ngx_string("Unknown error");
+
+
+#if (NGX_HAVE_STRERRORDESC_NP)
+
+/*
+ * The strerrordesc_np() function, introduced in glibc 2.32, is
+ * async-signal-safe.  This makes it possible to use it directly,
+ * without copying error messages.
+ */
+
+
+u_char *
+ngx_strerror(ngx_err_t err, u_char *errstr, size_t size)
+{
+    size_t       len;
+    const char  *msg;
+
+    msg = strerrordesc_np(err);
+
+    if (msg == NULL) {
+        msg = (char *) ngx_unknown_error.data;
+        len = ngx_unknown_error.len;
+
+    } else {
+        len = ngx_strlen(msg);
+    }
+
+    size = ngx_min(size, len);
+
+    return ngx_cpymem(errstr, msg, size);
+}
+
+
+ngx_int_t
+ngx_strerror_init(void)
+{
+    return NGX_OK;
+}
+
+
+#else
+
 /*
  * The strerror() messages are copied because:
  *
@@ -26,7 +69,8 @@
 
 
 static ngx_str_t  *ngx_sys_errlist;
-static ngx_str_t   ngx_unknown_error = ngx_string("Unknown error");
+static ngx_err_t   ngx_first_error;
+static ngx_err_t   ngx_last_error;
 
 
 u_char *
@@ -34,8 +78,13 @@ ngx_strerror(ngx_err_t err, u_char *errstr, size_t size)
 {
     ngx_str_t  *msg;
 
-    msg = ((ngx_uint_t) err < NGX_SYS_NERR) ? &ngx_sys_errlist[err]:
-                                              &ngx_unknown_error;
+    if (err >= ngx_first_error && err < ngx_last_error) {
+        msg = &ngx_sys_errlist[err - ngx_first_error];
+
+    } else {
+        msg = &ngx_unknown_error;
+    }
+
     size = ngx_min(size, msg->len);
 
     return ngx_cpymem(errstr, msg->data, size);
@@ -50,20 +99,92 @@ ngx_strerror_init(void)
     size_t      len;
     ngx_err_t   err;
 
+#if (NGX_SYS_NERR)
+    ngx_first_error = 0;
+    ngx_last_error = NGX_SYS_NERR;
+
+#elif (EPERM > 1000 && EPERM < 0x7fffffff - 1000)
+
+    /*
+     * If number of errors is not known, and EPERM error code has large
+     * but reasonable value, guess possible error codes based on the error
+     * messages returned by strerror(), starting from EPERM.  Notably,
+     * this covers GNU/Hurd, where errors start at 0x40000001.
+     */
+
+    for (err = EPERM; err > EPERM - 1000; err--) {
+        ngx_set_errno(0);
+        msg = strerror(err);
+
+        if (errno == EINVAL
+            || msg == NULL
+            || strncmp(msg, "Unknown error", 13) == 0)
+        {
+            continue;
+        }
+
+        ngx_first_error = err;
+    }
+
+    for (err = EPERM; err < EPERM + 1000; err++) {
+        ngx_set_errno(0);
+        msg = strerror(err);
+
+        if (errno == EINVAL
+            || msg == NULL
+            || strncmp(msg, "Unknown error", 13) == 0)
+        {
+            continue;
+        }
+
+        ngx_last_error = err + 1;
+    }
+
+#else
+
+    /*
+     * If number of errors is not known, guess it based on the error
+     * messages returned by strerror().
+     */
+
+    ngx_first_error = 0;
+
+    for (err = 0; err < 1000; err++) {
+        ngx_set_errno(0);
+        msg = strerror(err);
+
+        if (errno == EINVAL
+            || msg == NULL
+            || strncmp(msg, "Unknown error", 13) == 0)
+        {
+            continue;
+        }
+
+        ngx_last_error = err + 1;
+    }
+
+#endif
+
     /*
      * ngx_strerror() is not ready to work at this stage, therefore,
      * malloc() is used and possible errors are logged using strerror().
      */
 
-    len = NGX_SYS_NERR * sizeof(ngx_str_t);
+    len = (ngx_last_error - ngx_first_error) * sizeof(ngx_str_t);
 
     ngx_sys_errlist = malloc(len);
     if (ngx_sys_errlist == NULL) {
         goto failed;
     }
 
-    for (err = 0; err < NGX_SYS_NERR; err++) {
+    for (err = ngx_first_error; err < ngx_last_error; err++) {
         msg = strerror(err);
+
+        if (msg == NULL) {
+            ngx_sys_errlist[err - ngx_first_error] = ngx_unknown_error;
+            continue;
+        }
+
         len = ngx_strlen(msg);
 
         p = malloc(len);
@@ -72,8 +193,8 @@ ngx_strerror_init(void)
         }
 
         ngx_memcpy(p, msg, len);
-        ngx_sys_errlist[err].len = len;
-        ngx_sys_errlist[err].data = p;
+        ngx_sys_errlist[err - ngx_first_error].len = len;
+        ngx_sys_errlist[err - ngx_first_error].data = p;
     }
 
     return NGX_OK;
@@ -85,3 +206,5 @@ failed:
 
     return NGX_ERROR;
 }
+
+#endif
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 482d327..1c82a8e 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -875,9 +875,28 @@ ngx_fs_bsize(u_char *name)
         return 512;
     }
 
+#if (NGX_LINUX)
+    if ((size_t) fs.f_bsize > ngx_pagesize) {
+        return 512;
+    }
+#endif
+
     return (size_t) fs.f_bsize;
 }
 
+
+off_t
+ngx_fs_available(u_char *name)
+{
+    struct statfs  fs;
+
+    if (statfs((char *) name, &fs) == -1) {
+        return NGX_MAX_OFF_T_VALUE;
+    }
+
+    return (off_t) fs.f_bavail * fs.f_bsize;
+}
+
 #elif (NGX_HAVE_STATVFS)
 
 size_t
@@ -893,9 +912,28 @@ ngx_fs_bsize(u_char *name)
         return 512;
     }
 
+#if (NGX_LINUX)
+    if ((size_t) fs.f_frsize > ngx_pagesize) {
+        return 512;
+    }
+#endif
+
     return (size_t) fs.f_frsize;
 }
 
+
+off_t
+ngx_fs_available(u_char *name)
+{
+    struct statvfs  fs;
+
+    if (statvfs((char *) name, &fs) == -1) {
+        return NGX_MAX_OFF_T_VALUE;
+    }
+
+    return (off_t) fs.f_bavail * fs.f_frsize;
+}
+
 #else
 
 size_t
@@ -904,4 +942,11 @@ ngx_fs_bsize(u_char *name)
     return 512;
 }
 
+
+off_t
+ngx_fs_available(u_char *name)
+{
+    return NGX_MAX_OFF_T_VALUE;
+}
+
 #endif
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 383e38e..d084713 100644
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -185,7 +185,10 @@ ngx_int_t ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s);
 #define ngx_is_exec(sb)          (((sb)->st_mode & S_IXUSR) == S_IXUSR)
 #define ngx_file_access(sb)      ((sb)->st_mode & 0777)
 #define ngx_file_size(sb)        (sb)->st_size
-#define ngx_file_fs_size(sb)     ngx_max((sb)->st_size, (sb)->st_blocks * 512)
+#define ngx_file_fs_size(sb)                                                 \
+    (((sb)->st_blocks * 512 > (sb)->st_size                                  \
+     && (sb)->st_blocks * 512 < (sb)->st_size + 8 * (sb)->st_blksize)        \
+     ? (sb)->st_blocks * 512 : (sb)->st_size)
 #define ngx_file_mtime(sb)       (sb)->st_mtime
 #define ngx_file_uniq(sb)        (sb)->st_ino
 
@@ -346,6 +349,7 @@ ngx_int_t ngx_directio_off(ngx_fd_t fd);
 #endif
 
 size_t ngx_fs_bsize(u_char *name);
+off_t ngx_fs_available(u_char *name);
 
 
 #if (NGX_HAVE_OPENAT)
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 5817a2c..b31485f 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -15,7 +15,7 @@ static void ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n,
     ngx_int_t type);
 static void ngx_start_cache_manager_processes(ngx_cycle_t *cycle,
     ngx_uint_t respawn);
-static void ngx_pass_open_channel(ngx_cycle_t *cycle, ngx_channel_t *ch);
+static void ngx_pass_open_channel(ngx_cycle_t *cycle);
 static void ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo);
 static ngx_uint_t ngx_reap_children(ngx_cycle_t *cycle);
 static void ngx_master_process_exit(ngx_cycle_t *cycle);
@@ -77,12 +77,11 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
     u_char            *p;
     size_t             size;
     ngx_int_t          i;
-    ngx_uint_t         n, sigio;
+    ngx_uint_t         sigio;
     sigset_t           set;
     struct itimerval   itv;
     ngx_uint_t         live;
     ngx_msec_t         delay;
-    ngx_listening_t   *ls;
     ngx_core_conf_t   *ccf;
 
     sigemptyset(&set);
@@ -204,16 +203,7 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
         if (ngx_quit) {
             ngx_signal_worker_processes(cycle,
                                         ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
-
-            ls = cycle->listening.elts;
-            for (n = 0; n < cycle->listening.nelts; n++) {
-                if (ngx_close_socket(ls[n].fd) == -1) {
-                    ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                                  ngx_close_socket_n " %V failed",
-                                  &ls[n].addr_text);
-                }
-            }
-            cycle->listening.nelts = 0;
+            ngx_close_listening_sockets(cycle);
 
             continue;
         }
@@ -345,25 +335,16 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
 static void
 ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n, ngx_int_t type)
 {
-    ngx_int_t      i;
-    ngx_channel_t  ch;
+    ngx_int_t  i;
 
     ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "start worker processes");
 
-    ngx_memzero(&ch, sizeof(ngx_channel_t));
-
-    ch.command = NGX_CMD_OPEN_CHANNEL;
-
     for (i = 0; i < n; i++) {
 
         ngx_spawn_process(cycle, ngx_worker_process_cycle,
                           (void *) (intptr_t) i, "worker process", type);
 
-        ch.pid = ngx_processes[ngx_process_slot].pid;
-        ch.slot = ngx_process_slot;
-        ch.fd = ngx_processes[ngx_process_slot].channel[0];
-
-        ngx_pass_open_channel(cycle, &ch);
+        ngx_pass_open_channel(cycle);
     }
 }
 
@@ -371,9 +352,8 @@ ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n, ngx_int_t type)
 static void
 ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
 {
-    ngx_uint_t       i, manager, loader;
-    ngx_path_t     **path;
-    ngx_channel_t    ch;
+    ngx_uint_t    i, manager, loader;
+    ngx_path_t  **path;
 
     manager = 0;
     loader = 0;
@@ -398,14 +378,7 @@ ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
                       &ngx_cache_manager_ctx, "cache manager process",
                       respawn ? NGX_PROCESS_JUST_RESPAWN : NGX_PROCESS_RESPAWN);
 
-    ngx_memzero(&ch, sizeof(ngx_channel_t));
-
-    ch.command = NGX_CMD_OPEN_CHANNEL;
-    ch.pid = ngx_processes[ngx_process_slot].pid;
-    ch.slot = ngx_process_slot;
-    ch.fd = ngx_processes[ngx_process_slot].channel[0];
-
-    ngx_pass_open_channel(cycle, &ch);
+    ngx_pass_open_channel(cycle);
 
     if (loader == 0) {
         return;
@@ -415,19 +388,20 @@ ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
                       &ngx_cache_loader_ctx, "cache loader process",
                       respawn ? NGX_PROCESS_JUST_SPAWN : NGX_PROCESS_NORESPAWN);
 
-    ch.command = NGX_CMD_OPEN_CHANNEL;
-    ch.pid = ngx_processes[ngx_process_slot].pid;
-    ch.slot = ngx_process_slot;
-    ch.fd = ngx_processes[ngx_process_slot].channel[0];
-
-    ngx_pass_open_channel(cycle, &ch);
+    ngx_pass_open_channel(cycle);
 }
 
 
 static void
-ngx_pass_open_channel(ngx_cycle_t *cycle, ngx_channel_t *ch)
+ngx_pass_open_channel(ngx_cycle_t *cycle)
 {
-    ngx_int_t  i;
+    ngx_int_t      i;
+    ngx_channel_t  ch;
+
+    ch.command = NGX_CMD_OPEN_CHANNEL;
+    ch.pid = ngx_processes[ngx_process_slot].pid;
+    ch.slot = ngx_process_slot;
+    ch.fd = ngx_processes[ngx_process_slot].channel[0];
 
     for (i = 0; i < ngx_last_process; i++) {
 
@@ -440,14 +414,14 @@ ngx_pass_open_channel(ngx_cycle_t *cycle, ngx_channel_t *ch)
 
         ngx_log_debug6(NGX_LOG_DEBUG_CORE, cycle->log, 0,
                       "pass channel s:%i pid:%P fd:%d to s:%i pid:%P fd:%d",
-                      ch->slot, ch->pid, ch->fd,
+                      ch.slot, ch.pid, ch.fd,
                       i, ngx_processes[i].pid,
                       ngx_processes[i].channel[0]);
 
         /* TODO: NGX_AGAIN */
 
         ngx_write_channel(ngx_processes[i].channel[0],
-                          ch, sizeof(ngx_channel_t), cycle->log);
+                          &ch, sizeof(ngx_channel_t), cycle->log);
     }
 }
 
@@ -631,12 +605,7 @@ ngx_reap_children(ngx_cycle_t *cycle)
                 }
 
 
-                ch.command = NGX_CMD_OPEN_CHANNEL;
-                ch.pid = ngx_processes[ngx_process_slot].pid;
-                ch.slot = ngx_process_slot;
-                ch.fd = ngx_processes[ngx_process_slot].channel[0];
-
-                ngx_pass_open_channel(cycle, &ch);
+                ngx_pass_open_channel(cycle);
 
                 live = 1;
 
diff --git a/src/os/unix/ngx_udp_sendmsg_chain.c b/src/os/unix/ngx_udp_sendmsg_chain.c
index 5399c79..3d1d6dd 100644
--- a/src/os/unix/ngx_udp_sendmsg_chain.c
+++ b/src/os/unix/ngx_udp_sendmsg_chain.c
@@ -189,6 +189,13 @@ ngx_udp_output_chain_to_iovec(ngx_iovec_t *vec, ngx_chain_t *in, ngx_log_t *log)
         return cl;
     }
 
+    /* zero-sized datagram; pretend to have at least 1 iov */
+    if (n == 0) {
+        iov = &vec->iovs[n++];
+        iov->iov_base = NULL;
+        iov->iov_len = 0;
+    }
+
     vec->count = n;
     vec->size = total;
 
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 7484a72..01cda7a 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -49,6 +49,7 @@ typedef struct {
     ngx_str_t                        ssl_certificate;
     ngx_str_t                        ssl_certificate_key;
     ngx_array_t                     *ssl_passwords;
+    ngx_array_t                     *ssl_conf_commands;
 
     ngx_ssl_t                       *ssl;
 #endif
@@ -94,6 +95,8 @@ static char *ngx_stream_proxy_bind(ngx_conf_t *cf, ngx_command_t *cmd,
 static ngx_int_t ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s);
 static char *ngx_stream_proxy_ssl_password_file(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
+static char *ngx_stream_proxy_ssl_conf_command_check(ngx_conf_t *cf, void *post,
+    void *data);
 static void ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s);
 static void ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc);
 static void ngx_stream_proxy_ssl_save_session(ngx_connection_t *c);
@@ -112,6 +115,9 @@ static ngx_conf_bitmask_t  ngx_stream_proxy_ssl_protocols[] = {
     { ngx_null_string, 0 }
 };
 
+static ngx_conf_post_t  ngx_stream_proxy_ssl_conf_command_post =
+    { ngx_stream_proxy_ssl_conf_command_check };
+
 #endif
 
 
@@ -331,6 +337,13 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
       0,
       NULL },
 
+    { ngx_string("proxy_ssl_conf_command"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_keyval_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_proxy_srv_conf_t, ssl_conf_commands),
+      &ngx_stream_proxy_ssl_conf_command_post },
+
 #endif
 
       ngx_null_command
@@ -839,7 +852,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
         u->upstream_buf.last = p;
     }
 
-    if (c->buffer && c->buffer->pos < c->buffer->last) {
+    if (c->buffer && c->buffer->pos <= c->buffer->last) {
         ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
                        "stream proxy add preread buffer: %uz",
                        c->buffer->last - c->buffer->pos);
@@ -853,6 +866,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
         *cl->buf = *c->buffer;
 
         cl->buf->tag = (ngx_buf_tag_t) &ngx_stream_proxy_module;
+        cl->buf->temporary = (cl->buf->pos == cl->buf->last) ? 0 : 1;
         cl->buf->flush = 1;
 
         cl->next = u->upstream_out;
@@ -1007,6 +1021,17 @@ ngx_stream_proxy_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
 }
 
 
+static char *
+ngx_stream_proxy_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
+{
+#ifndef SSL_CONF_FLAG_FILE
+    return "is not supported on this platform";
+#else
+    return NGX_CONF_OK;
+#endif
+}
+
+
 static void
 ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s)
 {
@@ -1984,6 +2009,7 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
     conf->ssl_verify = NGX_CONF_UNSET;
     conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
     conf->ssl_passwords = NGX_CONF_UNSET_PTR;
+    conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
 #endif
 
     return conf;
@@ -2071,6 +2097,9 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
 
+    ngx_conf_merge_ptr_value(conf->ssl_conf_commands,
+                              prev->ssl_conf_commands, NULL);
+
     if (conf->ssl_enable && ngx_stream_proxy_set_ssl(cf, conf) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
@@ -2155,6 +2184,12 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
         return NGX_ERROR;
     }
 
+    if (ngx_ssl_conf_commands(cf, pscf->ssl, pscf->ssl_conf_commands)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
     return NGX_OK;
 }
 
diff --git a/src/stream/ngx_stream_set_module.c b/src/stream/ngx_stream_set_module.c
new file mode 100644
index 0000000..9b34a60
--- /dev/null
+++ b/src/stream/ngx_stream_set_module.c
@@ -0,0 +1,226 @@
+
+/*
+ * Copyright (C) Pavel Pautov
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+typedef struct {
+    ngx_int_t                   index;
+    ngx_stream_set_variable_pt  set_handler;
+    uintptr_t                   data;
+    ngx_stream_complex_value_t  value;
+} ngx_stream_set_cmd_t;
+
+
+typedef struct {
+    ngx_array_t                 commands;
+} ngx_stream_set_srv_conf_t;
+
+
+static ngx_int_t ngx_stream_set_handler(ngx_stream_session_t *s);
+static ngx_int_t ngx_stream_set_var(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_set_init(ngx_conf_t *cf);
+static void *ngx_stream_set_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_stream_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
+
+static ngx_command_t  ngx_stream_set_commands[] = {
+
+    { ngx_string("set"),
+      NGX_STREAM_SRV_CONF|NGX_CONF_TAKE2,
+      ngx_stream_set,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_set_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_stream_set_init,                   /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    ngx_stream_set_create_srv_conf,        /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_set_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_set_module_ctx,            /* module context */
+    ngx_stream_set_commands,               /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_stream_set_handler(ngx_stream_session_t *s)
+{
+    ngx_str_t                     str;
+    ngx_uint_t                    i;
+    ngx_stream_set_cmd_t         *cmds;
+    ngx_stream_set_srv_conf_t    *scf;
+    ngx_stream_variable_value_t   vv;
+
+    scf = ngx_stream_get_module_srv_conf(s, ngx_stream_set_module);
+    cmds = scf->commands.elts;
+    vv = ngx_stream_variable_null_value;
+
+    for (i = 0; i < scf->commands.nelts; i++) {
+        if (ngx_stream_complex_value(s, &cmds[i].value, &str) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (cmds[i].set_handler != NULL) {
+            vv.len = str.len;
+            vv.data = str.data;
+            cmds[i].set_handler(s, &vv, cmds[i].data);
+
+        } else {
+            s->variables[cmds[i].index].len = str.len;
+            s->variables[cmds[i].index].valid = 1;
+            s->variables[cmds[i].index].no_cacheable = 0;
+            s->variables[cmds[i].index].not_found = 0;
+            s->variables[cmds[i].index].data = str.data;
+        }
+    }
+
+    return NGX_DECLINED;
+}
+
+
+static ngx_int_t
+ngx_stream_set_var(ngx_stream_session_t *s, ngx_stream_variable_value_t *v,
+    uintptr_t data)
+{
+    *v = ngx_stream_variable_null_value;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_set_init(ngx_conf_t *cf)
+{
+    ngx_stream_handler_pt        *h;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_STREAM_PREACCESS_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_stream_set_handler;
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_stream_set_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_stream_set_srv_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_set_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->commands = { NULL };
+     */
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_set_srv_conf_t  *scf = conf;
+
+    ngx_str_t                           *args;
+    ngx_int_t                            index;
+    ngx_stream_set_cmd_t                *set_cmd;
+    ngx_stream_variable_t               *v;
+    ngx_stream_compile_complex_value_t   ccv;
+
+    args = cf->args->elts;
+
+    if (args[1].data[0] != '$') {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"%V\"", &args[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    args[1].len--;
+    args[1].data++;
+
+    v = ngx_stream_add_variable(cf, &args[1],
+                                NGX_STREAM_VAR_CHANGEABLE|NGX_STREAM_VAR_WEAK);
+    if (v == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    index = ngx_stream_get_variable_index(cf, &args[1]);
+    if (index == NGX_ERROR) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (v->get_handler == NULL) {
+        v->get_handler = ngx_stream_set_var;
+    }
+
+    if (scf->commands.elts == NULL) {
+        if (ngx_array_init(&scf->commands, cf->pool, 1,
+                           sizeof(ngx_stream_set_cmd_t))
+            != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    set_cmd = ngx_array_push(&scf->commands);
+    if (set_cmd == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    set_cmd->index = index;
+    set_cmd->set_handler = v->set_handler;
+    set_cmd->data = v->data;
+
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &args[2];
+    ccv.complex_value = &set_cmd->value;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 79f30a8..d8c0471 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -45,6 +45,10 @@ static char *ngx_stream_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+
+static char *ngx_stream_ssl_conf_command_check(ngx_conf_t *cf, void *post,
+    void *data);
+
 static ngx_int_t ngx_stream_ssl_init(ngx_conf_t *cf);
 
 
@@ -68,6 +72,10 @@ static ngx_conf_enum_t  ngx_stream_ssl_verify[] = {
 };
 
 
+static ngx_conf_post_t  ngx_stream_ssl_conf_command_post =
+    { ngx_stream_ssl_conf_command_check };
+
+
 static ngx_command_t  ngx_stream_ssl_commands[] = {
 
     { ngx_string("ssl_handshake_timeout"),
@@ -196,6 +204,13 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
       offsetof(ngx_stream_ssl_conf_t, crl),
       NULL },
 
+    { ngx_string("ssl_conf_command"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_keyval_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_ssl_conf_t, conf_commands),
+      &ngx_stream_ssl_conf_command_post },
+
       ngx_null_command
 };
 
@@ -595,6 +610,7 @@ ngx_stream_ssl_create_conf(ngx_conf_t *cf)
     scf->certificates = NGX_CONF_UNSET_PTR;
     scf->certificate_keys = NGX_CONF_UNSET_PTR;
     scf->passwords = NGX_CONF_UNSET_PTR;
+    scf->conf_commands = NGX_CONF_UNSET_PTR;
     scf->prefer_server_ciphers = NGX_CONF_UNSET;
     scf->verify = NGX_CONF_UNSET_UINT;
     scf->verify_depth = NGX_CONF_UNSET_UINT;
@@ -650,6 +666,8 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS);
 
+    ngx_conf_merge_ptr_value(conf->conf_commands, prev->conf_commands, NULL);
+
 
     conf->ssl.log = cf->log;
 
@@ -811,6 +829,10 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
+    if (ngx_ssl_conf_commands(cf, &conf->ssl, conf->conf_commands) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     return NGX_CONF_OK;
 }
 
@@ -1034,6 +1056,17 @@ invalid:
 }
 
 
+static char *
+ngx_stream_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
+{
+#ifndef SSL_CONF_FLAG_FILE
+    return "is not supported on this platform";
+#else
+    return NGX_CONF_OK;
+#endif
+}
+
+
 static ngx_int_t
 ngx_stream_ssl_init(ngx_conf_t *cf)
 {
diff --git a/src/stream/ngx_stream_ssl_module.h b/src/stream/ngx_stream_ssl_module.h
index 6cb4140..c6e24be 100644
--- a/src/stream/ngx_stream_ssl_module.h
+++ b/src/stream/ngx_stream_ssl_module.h
@@ -46,6 +46,7 @@ typedef struct {
     ngx_str_t        ciphers;
 
     ngx_array_t     *passwords;
+    ngx_array_t     *conf_commands;
 
     ngx_shm_zone_t  *shm_zone;
 
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
index c207667..ae3bf37 100644
--- a/src/stream/ngx_stream_upstream_round_robin.c
+++ b/src/stream/ngx_stream_upstream_round_robin.c
@@ -10,8 +10,8 @@
 #include <ngx_stream.h>
 
 
-#define ngx_stream_upstream_tries(p) ((p)->number                             \
-                                      + ((p)->next ? (p)->next->number : 0))
+#define ngx_stream_upstream_tries(p) ((p)->tries                              \
+                                      + ((p)->next ? (p)->next->tries : 0))
 
 
 static ngx_stream_upstream_rr_peer_t *ngx_stream_upstream_get_peer(
@@ -38,7 +38,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
     ngx_stream_upstream_srv_conf_t *us)
 {
     ngx_url_t                        u;
-    ngx_uint_t                       i, j, n, w;
+    ngx_uint_t                       i, j, n, w, t;
     ngx_stream_upstream_server_t    *server;
     ngx_stream_upstream_rr_peer_t   *peer, **peerp;
     ngx_stream_upstream_rr_peers_t  *peers, *backup;
@@ -50,6 +50,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
 
         n = 0;
         w = 0;
+        t = 0;
 
         for (i = 0; i < us->servers->nelts; i++) {
             if (server[i].backup) {
@@ -58,6 +59,10 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
 
             n += server[i].naddrs;
             w += server[i].naddrs * server[i].weight;
+
+            if (!server[i].down) {
+                t += server[i].naddrs;
+            }
         }
 
         if (n == 0) {
@@ -81,6 +86,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
         peers->number = n;
         peers->weighted = (w != n);
         peers->total_weight = w;
+        peers->tries = t;
         peers->name = &us->host;
 
         n = 0;
@@ -116,6 +122,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
 
         n = 0;
         w = 0;
+        t = 0;
 
         for (i = 0; i < us->servers->nelts; i++) {
             if (!server[i].backup) {
@@ -124,6 +131,10 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
 
             n += server[i].naddrs;
             w += server[i].naddrs * server[i].weight;
+
+            if (!server[i].down) {
+                t += server[i].naddrs;
+            }
         }
 
         if (n == 0) {
@@ -145,6 +156,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
         backup->number = n;
         backup->weighted = (w != n);
         backup->total_weight = w;
+        backup->tries = t;
         backup->name = &us->host;
 
         n = 0;
@@ -220,6 +232,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
     peers->number = n;
     peers->weighted = 0;
     peers->total_weight = n;
+    peers->tries = n;
     peers->name = &us->host;
 
     peerp = &peers->peer;
@@ -342,6 +355,7 @@ ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
 
     peers->single = (ur->naddrs == 1);
     peers->number = ur->naddrs;
+    peers->tries = ur->naddrs;
     peers->name = &ur->host;
 
     if (ur->sockaddr) {
diff --git a/src/stream/ngx_stream_upstream_round_robin.h b/src/stream/ngx_stream_upstream_round_robin.h
index 35d9fce..bd96667 100644
--- a/src/stream/ngx_stream_upstream_round_robin.h
+++ b/src/stream/ngx_stream_upstream_round_robin.h
@@ -66,6 +66,7 @@ struct ngx_stream_upstream_rr_peers_s {
 #endif
 
     ngx_uint_t                       total_weight;
+    ngx_uint_t                       tries;
 
     unsigned                         single:1;
     unsigned                         weighted:1;
diff --git a/src/stream/ngx_stream_write_filter_module.c b/src/stream/ngx_stream_write_filter_module.c
index 24326c6..156a61c 100644
--- a/src/stream/ngx_stream_write_filter_module.c
+++ b/src/stream/ngx_stream_write_filter_module.c
@@ -234,7 +234,8 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in,
 
     if (size == 0
         && !(c->buffered & NGX_LOWLEVEL_BUFFERED)
-        && !(last && c->need_last_buf))
+        && !(last && c->need_last_buf)
+        && !(c->type == SOCK_DGRAM && flush))
     {
         if (last || flush || sync) {
             for (cl = *out; cl; /* void */) {

From c85dfc1d2b1e718623b7d5bdda80a32d830b97c7 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 19 Apr 2022 09:58:16 -0400
Subject: [PATCH 364/600] New 1.20.2 version, drop unneeded patch

---
 configure                                     |  4 +++
 debian/changelog                              | 10 ++++++
 ...ff-by-one-write-in-ngx_resolver_copy.patch | 34 -------------------
 debian/patches/series                         |  1 -
 4 files changed, 14 insertions(+), 35 deletions(-)
 delete mode 100644 debian/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch

diff --git a/configure b/configure
index 474d69e..b7c507a 100755
--- a/configure
+++ b/configure
@@ -58,6 +58,10 @@ if [ "$NGX_PLATFORM" != win32 ]; then
     . auto/unix
 fi
 
+# Debian
+# Make sure signature stays the same on all nginx flavors
+have=NGX_HTTP_HEADERS . auto/have
+
 . auto/threads
 . auto/modules
 . auto/lib/conf
diff --git a/debian/changelog b/debian/changelog
index e65ef2c..92a1d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nginx (1.20.2-1) UNRELEASED; urgency=medium
+
+  * This is an NGINX Maintainer Team upload.
+  * Update to latest upstream Stable version (1.20.2) (Closes: #1008855)
+  * d/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver
+    _copy.patch: Drop CVE-2021-23017 patch, as this is fixed in 1.20.1
+    and we are now using 1.20.2 which already contains the patch.
+  
+ -- Thomas Ward <teward@ubuntu.com>  Tue, 19 Apr 2022 09:50:42 -0400
+
 nginx (1.18.0-9) unstable; urgency=medium
 
   [ Jan Mojžíš ]
diff --git a/debian/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch b/debian/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch
deleted file mode 100644
index 449c096..0000000
--- a/debian/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Maxim Dounin <mdounin@mdounin.ru>
-Date: Tue, 25 May 2021 15:17:36 +0300
-Subject: Resolver: fixed off-by-one write in ngx_resolver_copy().
-Origin: https://github.com/nginx/nginx/commit/7199ebc203f74fd9e44595474de6bdc41740c5cf
-Bug-Debian: https://bugs.debian.org/989095
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2021-23017
-
-Reported by Luis Merino, Markus Vervier, Eric Sesterhenn, X41 D-Sec GmbH.
----
- src/core/ngx_resolver.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/src/core/ngx_resolver.c
-+++ b/src/core/ngx_resolver.c
-@@ -3993,15 +3993,15 @@
-             n = *src++;
- 
-         } else {
-+            if (dst != name->data) {
-+                *dst++ = '.';
-+            }
-+
-             ngx_strlow(dst, src, n);
-             dst += n;
-             src += n;
- 
-             n = *src++;
--
--            if (n != 0) {
--                *dst++ = '.';
--            }
-         }
- 
-         if (n == 0) {
diff --git a/debian/patches/series b/debian/patches/series
index 9416267..5b6b799 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
-Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch

From 9cb8bb9efcc7a2830d6be4593d910c58873ede72 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 19 Apr 2022 10:07:47 -0400
Subject: [PATCH 365/600] Fix some branch uncleanliness that happened in local
 branch which made it to Salsa

---
 configure                                                     | 4 ----
 debian/changelog                                              | 4 +++-
 ...Make-sure-signature-stays-the-same-in-all-nginx-buil.patch | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index b7c507a..474d69e 100755
--- a/configure
+++ b/configure
@@ -58,10 +58,6 @@ if [ "$NGX_PLATFORM" != win32 ]; then
     . auto/unix
 fi
 
-# Debian
-# Make sure signature stays the same on all nginx flavors
-have=NGX_HTTP_HEADERS . auto/have
-
 . auto/threads
 . auto/modules
 . auto/lib/conf
diff --git a/debian/changelog b/debian/changelog
index 92a1d6a..b9daae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,9 @@ nginx (1.20.2-1) UNRELEASED; urgency=medium
   * d/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver
     _copy.patch: Drop CVE-2021-23017 patch, as this is fixed in 1.20.1
     and we are now using 1.20.2 which already contains the patch.
-  
+  * Refreshed d/patches/0002-Make-sure-signature-stays-the-same-
+    in-all-nginx-buil.patch (fuzz thanks to 1.20.2)
+
  -- Thomas Ward <teward@ubuntu.com>  Tue, 19 Apr 2022 09:50:42 -0400
 
 nginx (1.18.0-9) unstable; urgency=medium
diff --git a/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch b/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
index 9cc3962..9e27e1a 100644
--- a/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
+++ b/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
@@ -13,11 +13,9 @@ binaries share the same signature.
  configure | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/configure b/configure
-index ceff15e..3816fa1 100755
 --- a/configure
 +++ b/configure
-@@ -58,6 +58,10 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -58,6 +58,10 @@
      . auto/unix
  fi
  

From 528e57d73dcd7a728b0b65f857e3ab4c1ecc8ef3 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 19 Apr 2022 10:26:55 -0400
Subject: [PATCH 366/600] Update d/conf/mime.types

---
 debian/changelog       |  2 ++
 debian/conf/mime.types | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9daae0..19d30df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ nginx (1.20.2-1) UNRELEASED; urgency=medium
     and we are now using 1.20.2 which already contains the patch.
   * Refreshed d/patches/0002-Make-sure-signature-stays-the-same-
     in-all-nginx-buil.patch (fuzz thanks to 1.20.2)
+  * d/conf/mime.types: Update mime.types to more match upstream mime.types
+    and include upstream changes with mime.types from 1.20.2.
 
  -- Thomas Ward <teward@ubuntu.com>  Tue, 19 Apr 2022 09:50:42 -0400
 
diff --git a/debian/conf/mime.types b/debian/conf/mime.types
index 89be9a4..3bd94e5 100644
--- a/debian/conf/mime.types
+++ b/debian/conf/mime.types
@@ -16,15 +16,17 @@ types {
     text/x-component                      htc;
 
     image/png                             png;
+    image/svg+xml                         svg svgz;
     image/tiff                            tif tiff;
     image/vnd.wap.wbmp                    wbmp;
+    image/webp                            webp;
     image/x-icon                          ico;
     image/x-jng                           jng;
     image/x-ms-bmp                        bmp;
-    image/svg+xml                         svg svgz;
-    image/webp                            webp;
 
-    application/font-woff                 woff;
+    font/woff                             woff;
+    font/woff2                            woff;
+
     application/java-archive              jar war ear;
     application/json                      json;
     application/mac-binhex40              hqx;
@@ -33,12 +35,19 @@ types {
     application/postscript                ps eps ai;
     application/rtf                       rtf;
     application/vnd.apple.mpegurl         m3u8;
+    application/vnd.google-earth.kml+xml  kml;
+    application/vnd.google-earth.kmz      kmz;
     application/vnd.ms-excel              xls;
     application/vnd.ms-fontobject         eot;
     application/vnd.ms-powerpoint         ppt;
+    application/vnd.oasis.opendocument.graphics        odg;
+    application/vnd.oasis.opendocument.presentation    odp;
+    application/vnd.oasis.opendocument.spreadsheet     ods;
+    application/vnd.oasis.opendocument.text            odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation    pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet    xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
     application/vnd.wap.wmlc              wmlc;
-    application/vnd.google-earth.kml+xml  kml;
-    application/vnd.google-earth.kmz      kmz;
     application/x-7z-compressed           7z;
     application/x-cocoa                   cco;
     application/x-java-archive-diff       jardiff;
@@ -64,10 +73,6 @@ types {
     application/octet-stream              iso img;
     application/octet-stream              msi msp msm;
 
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;
-
     audio/midi                            mid midi kar;
     audio/mpeg                            mp3;
     audio/ogg                             ogg;

From 9bc813d5a2a6a5707ad356007170d0f422508f54 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 19 Apr 2022 10:37:35 -0400
Subject: [PATCH 367/600] Remove self from uploaders per other DDs

---
 debian/changelog | 3 +++
 debian/control   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 19d30df..d851b0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ nginx (1.20.2-1) UNRELEASED; urgency=medium
     in-all-nginx-buil.patch (fuzz thanks to 1.20.2)
   * d/conf/mime.types: Update mime.types to more match upstream mime.types
     and include upstream changes with mime.types from 1.20.2.
+  * d/control: Remove self from Uploaders per other Debian devs, who want 
+    that commit to be done by someone on the current uploaders/maintainers
+    group instead.
 
  -- Thomas Ward <teward@ubuntu.com>  Tue, 19 Apr 2022 09:50:42 -0400
 
diff --git a/debian/control b/debian/control
index 52b24de..44b741e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>,
            Ondřej Nový <onovy@debian.org>,
-           Thomas Ward <teward@ubuntu.com>,
 Build-Depends: debhelper-compat (= 13),
                dpkg-dev (>= 1.15.5),
                libexpat-dev,

From 8735246ec068c25949a2fbd819060780f3f92fbd Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 19 Apr 2022 12:26:14 -0400
Subject: [PATCH 368/600] Update d/conf/mime.types again using 1.21.x upstream

---
 debian/changelog       | 3 ++-
 debian/conf/mime.types | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d851b0d..497d4b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,8 @@ nginx (1.20.2-1) UNRELEASED; urgency=medium
   * Refreshed d/patches/0002-Make-sure-signature-stays-the-same-
     in-all-nginx-buil.patch (fuzz thanks to 1.20.2)
   * d/conf/mime.types: Update mime.types to more match upstream mime.types
-    and include upstream changes with mime.types from 1.20.2.
+    and include upstream changes with mime.types from 1.21.x via nginx.org
+    mercurial repository versions.
   * d/control: Remove self from Uploaders per other Debian devs, who want 
     that commit to be done by someone on the current uploaders/maintainers
     group instead.
diff --git a/debian/conf/mime.types b/debian/conf/mime.types
index 3bd94e5..cfa1714 100644
--- a/debian/conf/mime.types
+++ b/debian/conf/mime.types
@@ -15,6 +15,7 @@ types {
     text/vnd.wap.wml                      wml;
     text/x-component                      htc;
 
+    image/avif                            avif;
     image/png                             png;
     image/svg+xml                         svg svgz;
     image/tiff                            tif tiff;

From 48b9b6e3ea956358bb8b7497ce6db9569ea144e5 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 19 Apr 2022 12:27:49 -0400
Subject: [PATCH 369/600] Missed part of mime.types updates

---
 debian/conf/mime.types | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/conf/mime.types b/debian/conf/mime.types
index cfa1714..d55df56 100644
--- a/debian/conf/mime.types
+++ b/debian/conf/mime.types
@@ -49,6 +49,7 @@ types {
     application/vnd.openxmlformats-officedocument.spreadsheetml.sheet    xlsx;
     application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
     application/vnd.wap.wmlc              wmlc;
+    application/wasm                      wasm;
     application/x-7z-compressed           7z;
     application/x-cocoa                   cco;
     application/x-java-archive-diff       jardiff;

From 1fcb59adce7213aeba8ff5b42df2134125fd03f9 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Thu, 21 Apr 2022 11:20:04 -0400
Subject: [PATCH 370/600] 1.20.2-1 release

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 497d4b1..0fdcbe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.20.2-1) UNRELEASED; urgency=medium
+nginx (1.20.2-1) unstable; urgency=medium
 
   * This is an NGINX Maintainer Team upload.
   * Update to latest upstream Stable version (1.20.2) (Closes: #1008855)

From 9c7d79dce0f34774b1505b53450c786c0b6e4a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Wed, 4 May 2022 15:45:04 +0200
Subject: [PATCH 371/600] Add Thomas Ward <teward@ubuntu.com> as uploader

---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 44b741e..52b24de 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>,
            Ondřej Nový <onovy@debian.org>,
+           Thomas Ward <teward@ubuntu.com>,
 Build-Depends: debhelper-compat (= 13),
                dpkg-dev (>= 1.15.5),
                libexpat-dev,

From 45005f76d4dfaee9e0ca477eb92bc4453008f712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
Date: Wed, 4 May 2022 15:45:57 +0200
Subject: [PATCH 372/600] =?UTF-8?q?Add=20Jan=20Moj=C5=BE=C3=AD=C5=A1=20<ja?=
 =?UTF-8?q?n.mojzis@gmail.com>=20as=20uploader?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 52b24de..cc32589 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>,
            Ondřej Nový <onovy@debian.org>,
            Thomas Ward <teward@ubuntu.com>,
+           Jan Mojžíš <jan.mojzis@gmail.com>,
 Build-Depends: debhelper-compat (= 13),
                dpkg-dev (>= 1.15.5),
                libexpat-dev,

From 747ca190d0950815163158b7631e3286a5fce7f8 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Wed, 4 May 2022 10:56:19 -0400
Subject: [PATCH 373/600] Update packaging - this was done by Ondrej, let's
 make it live

---
 debian/changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0fdcbe6..a8e366e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 nginx (1.20.2-1) unstable; urgency=medium
 
-  * This is an NGINX Maintainer Team upload.
+  [ Ondřej Nový ]
+  * d/control: Update Uploaders for new maintainers.
+
+  [ Thomas Ward ]
   * Update to latest upstream Stable version (1.20.2) (Closes: #1008855)
   * d/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver
     _copy.patch: Drop CVE-2021-23017 patch, as this is fixed in 1.20.1

From 9c33aafeff59fe7be599fb3ace016d02cd39d47e Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Wed, 4 May 2022 15:35:09 -0400
Subject: [PATCH 374/600] Add CVE-2021-3618 patches and mitigations

---
 configure                       |  4 ++++
 debian/patches/series           |  1 +
 src/mail/ngx_mail.h             |  3 +++
 src/mail/ngx_mail_core_module.c | 10 ++++++++++
 src/mail/ngx_mail_handler.c     | 15 ++++++++++++++-
 src/os/unix/ngx_posix_config.h  |  5 ++++-
 6 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 474d69e..b7c507a 100755
--- a/configure
+++ b/configure
@@ -58,6 +58,10 @@ if [ "$NGX_PLATFORM" != win32 ]; then
     . auto/unix
 fi
 
+# Debian
+# Make sure signature stays the same on all nginx flavors
+have=NGX_HTTP_HEADERS . auto/have
+
 . auto/threads
 . auto/modules
 . auto/lib/conf
diff --git a/debian/patches/series b/debian/patches/series
index 5b6b799..4e43575 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
+CVE-2021-3618.patch
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index b865a3b..76cae37 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -115,6 +115,8 @@ typedef struct {
     ngx_msec_t              timeout;
     ngx_msec_t              resolver_timeout;
 
+    ngx_uint_t              max_errors;
+
     ngx_str_t               server_name;
 
     u_char                 *file_name;
@@ -231,6 +233,7 @@ typedef struct {
     ngx_uint_t              command;
     ngx_array_t             args;
 
+    ngx_uint_t              errors;
     ngx_uint_t              login_attempt;
 
     /* used to parse POP3/IMAP/SMTP command */
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 4083124..115671c 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -85,6 +85,13 @@ static ngx_command_t  ngx_mail_core_commands[] = {
       offsetof(ngx_mail_core_srv_conf_t, resolver_timeout),
       NULL },
 
+    { ngx_string("max_errors"),
+      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_MAIL_SRV_CONF_OFFSET,
+      offsetof(ngx_mail_core_srv_conf_t, max_errors),
+      NULL },
+
       ngx_null_command
 };
 
@@ -163,6 +170,8 @@ ngx_mail_core_create_srv_conf(ngx_conf_t *cf)
     cscf->timeout = NGX_CONF_UNSET_MSEC;
     cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
 
+    cscf->max_errors = NGX_CONF_UNSET_UINT;
+
     cscf->resolver = NGX_CONF_UNSET_PTR;
 
     cscf->file_name = cf->conf_file->file.name.data;
@@ -182,6 +191,7 @@ ngx_mail_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout,
                               30000);
 
+    ngx_conf_merge_uint_value(conf->max_errors, prev->max_errors, 5);
 
     ngx_conf_merge_str_value(conf->server_name, prev->server_name, "");
 
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 0aaa0e7..71b8151 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -871,7 +871,20 @@ ngx_mail_read_command(ngx_mail_session_t *s, ngx_connection_t *c)
         return NGX_MAIL_PARSE_INVALID_COMMAND;
     }
 
-    if (rc == NGX_IMAP_NEXT || rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
+    if (rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
+
+        s->errors++;
+
+        if (s->errors >= cscf->max_errors) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "client sent too many invalid commands");
+            s->quit = 1;
+        }
+
+        return rc;
+    }
+
+    if (rc == NGX_IMAP_NEXT) {
         return rc;
     }
 
diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h
index 2a8c413..03f7e0a 100644
--- a/src/os/unix/ngx_posix_config.h
+++ b/src/os/unix/ngx_posix_config.h
@@ -21,10 +21,13 @@
 #endif
 
 
-#if (NGX_GNU_HURD)
+#if defined(__GLIBC__)
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE             /* accept4() */
 #endif
+#endif
+
+#if (NGX_GNU_HURD)
 #define _FILE_OFFSET_BITS       64
 #endif
 

From ad330f7cb1ff7d791dc8255bf679dc87008e4255 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Wed, 4 May 2022 15:35:34 -0400
Subject: [PATCH 375/600] Unpop all patches to keep tree clean

---
 configure                       |  4 ----
 src/mail/ngx_mail.h             |  3 ---
 src/mail/ngx_mail_core_module.c | 10 ----------
 src/mail/ngx_mail_handler.c     | 15 +--------------
 src/os/unix/ngx_posix_config.h  |  5 +----
 5 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/configure b/configure
index b7c507a..474d69e 100755
--- a/configure
+++ b/configure
@@ -58,10 +58,6 @@ if [ "$NGX_PLATFORM" != win32 ]; then
     . auto/unix
 fi
 
-# Debian
-# Make sure signature stays the same on all nginx flavors
-have=NGX_HTTP_HEADERS . auto/have
-
 . auto/threads
 . auto/modules
 . auto/lib/conf
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index 76cae37..b865a3b 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -115,8 +115,6 @@ typedef struct {
     ngx_msec_t              timeout;
     ngx_msec_t              resolver_timeout;
 
-    ngx_uint_t              max_errors;
-
     ngx_str_t               server_name;
 
     u_char                 *file_name;
@@ -233,7 +231,6 @@ typedef struct {
     ngx_uint_t              command;
     ngx_array_t             args;
 
-    ngx_uint_t              errors;
     ngx_uint_t              login_attempt;
 
     /* used to parse POP3/IMAP/SMTP command */
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 115671c..4083124 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -85,13 +85,6 @@ static ngx_command_t  ngx_mail_core_commands[] = {
       offsetof(ngx_mail_core_srv_conf_t, resolver_timeout),
       NULL },
 
-    { ngx_string("max_errors"),
-      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_MAIL_SRV_CONF_OFFSET,
-      offsetof(ngx_mail_core_srv_conf_t, max_errors),
-      NULL },
-
       ngx_null_command
 };
 
@@ -170,8 +163,6 @@ ngx_mail_core_create_srv_conf(ngx_conf_t *cf)
     cscf->timeout = NGX_CONF_UNSET_MSEC;
     cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
 
-    cscf->max_errors = NGX_CONF_UNSET_UINT;
-
     cscf->resolver = NGX_CONF_UNSET_PTR;
 
     cscf->file_name = cf->conf_file->file.name.data;
@@ -191,7 +182,6 @@ ngx_mail_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout,
                               30000);
 
-    ngx_conf_merge_uint_value(conf->max_errors, prev->max_errors, 5);
 
     ngx_conf_merge_str_value(conf->server_name, prev->server_name, "");
 
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 71b8151..0aaa0e7 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -871,20 +871,7 @@ ngx_mail_read_command(ngx_mail_session_t *s, ngx_connection_t *c)
         return NGX_MAIL_PARSE_INVALID_COMMAND;
     }
 
-    if (rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
-
-        s->errors++;
-
-        if (s->errors >= cscf->max_errors) {
-            ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                          "client sent too many invalid commands");
-            s->quit = 1;
-        }
-
-        return rc;
-    }
-
-    if (rc == NGX_IMAP_NEXT) {
+    if (rc == NGX_IMAP_NEXT || rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
         return rc;
     }
 
diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h
index 03f7e0a..2a8c413 100644
--- a/src/os/unix/ngx_posix_config.h
+++ b/src/os/unix/ngx_posix_config.h
@@ -21,13 +21,10 @@
 #endif
 
 
-#if defined(__GLIBC__)
+#if (NGX_GNU_HURD)
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE             /* accept4() */
 #endif
-#endif
-
-#if (NGX_GNU_HURD)
 #define _FILE_OFFSET_BITS       64
 #endif
 

From 4514c0f658d7ab5170d1ae6765a847d1934b96a2 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Wed, 4 May 2022 16:06:32 -0400
Subject: [PATCH 376/600] Add changelong for CVE patch inclusion

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a8e366e..39bedc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.20.2-2) UNRELEASED; urgency=medium
+
+  * d/patches/CVE-2021-3618.patch: Include upstream changeset from NGINX 
+    that adds mitigations into the Mail module for CVE-2021-3618.patch.
+    (Closes: #991328)
+
+ -- Thomas Ward <teward@ubuntu.com>  Wed, 04 May 2022 16:04:59 -0400
+
 nginx (1.20.2-1) unstable; urgency=medium
 
   [ Ondřej Nový ]

From 2c5ea38623cc2a64907e210794ea1aed0b84d30e Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Wed, 4 May 2022 20:18:41 -0400
Subject: [PATCH 377/600] Oops forgot to add the patch

---
 debian/patches/CVE-2021-3618.patch | 84 ++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 debian/patches/CVE-2021-3618.patch

diff --git a/debian/patches/CVE-2021-3618.patch b/debian/patches/CVE-2021-3618.patch
new file mode 100644
index 0000000..10f37a9
--- /dev/null
+++ b/debian/patches/CVE-2021-3618.patch
@@ -0,0 +1,84 @@
+Subject: Patch mitigation for CVE-2021-3618
+ Mail: max_errors directive.
+ .
+ Similarly to smtpd_hard_error_limit in Postfix and smtp_max_unknown_commands
+ in Exim, specifies the number of errors after which the connection is closed.
+Origin: upstream, http://hg.nginx.org/nginx/rev/ec1071830799
+Bug-Debian: https://bugs.debian.org/991328
+
+--- a/src/mail/ngx_mail.h
++++ b/src/mail/ngx_mail.h
+@@ -115,6 +115,8 @@
+     ngx_msec_t              timeout;
+     ngx_msec_t              resolver_timeout;
+ 
++    ngx_uint_t              max_errors;
++
+     ngx_str_t               server_name;
+ 
+     u_char                 *file_name;
+@@ -231,6 +233,7 @@
+     ngx_uint_t              command;
+     ngx_array_t             args;
+ 
++    ngx_uint_t              errors;
+     ngx_uint_t              login_attempt;
+ 
+     /* used to parse POP3/IMAP/SMTP command */
+--- a/src/mail/ngx_mail_core_module.c
++++ b/src/mail/ngx_mail_core_module.c
+@@ -85,6 +85,13 @@
+       offsetof(ngx_mail_core_srv_conf_t, resolver_timeout),
+       NULL },
+ 
++    { ngx_string("max_errors"),
++      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
++      ngx_conf_set_num_slot,
++      NGX_MAIL_SRV_CONF_OFFSET,
++      offsetof(ngx_mail_core_srv_conf_t, max_errors),
++      NULL },
++
+       ngx_null_command
+ };
+ 
+@@ -163,6 +170,8 @@
+     cscf->timeout = NGX_CONF_UNSET_MSEC;
+     cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
+ 
++    cscf->max_errors = NGX_CONF_UNSET_UINT;
++
+     cscf->resolver = NGX_CONF_UNSET_PTR;
+ 
+     cscf->file_name = cf->conf_file->file.name.data;
+@@ -182,6 +191,7 @@
+     ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout,
+                               30000);
+ 
++    ngx_conf_merge_uint_value(conf->max_errors, prev->max_errors, 5);
+ 
+     ngx_conf_merge_str_value(conf->server_name, prev->server_name, "");
+ 
+--- a/src/mail/ngx_mail_handler.c
++++ b/src/mail/ngx_mail_handler.c
+@@ -871,7 +871,20 @@
+         return NGX_MAIL_PARSE_INVALID_COMMAND;
+     }
+ 
+-    if (rc == NGX_IMAP_NEXT || rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
++    if (rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
++
++        s->errors++;
++
++        if (s->errors >= cscf->max_errors) {
++            ngx_log_error(NGX_LOG_INFO, c->log, 0,
++                          "client sent too many invalid commands");
++            s->quit = 1;
++        }
++
++        return rc;
++    }
++
++    if (rc == NGX_IMAP_NEXT) {
+         return rc;
+     }
+ 

From 78d84c5752e34dce414523e4b5edcf569a0d90ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 5 May 2022 06:49:36 +0200
Subject: [PATCH 378/600] 
 d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch update fixes
 build on hurd-i386

---
 debian/changelog                                       |  5 +++++
 ...ine_gnu_source-on-other-glibc-based-platforms.patch | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39bedc2..3b651cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 nginx (1.20.2-2) UNRELEASED; urgency=medium
 
+  [ Thomas Ward ]
   * d/patches/CVE-2021-3618.patch: Include upstream changeset from NGINX 
     that adds mitigations into the Mail module for CVE-2021-3618.patch.
     (Closes: #991328)
 
+  [ Jan Mojžíš ]
+  * d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch update,
+    fixes build on hurd-i386 platform
+
  -- Thomas Ward <teward@ubuntu.com>  Wed, 04 May 2022 16:04:59 -0400
 
 nginx (1.20.2-1) unstable; urgency=medium
diff --git a/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch b/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch
index bb9b089..d43fd23 100644
--- a/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch
+++ b/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch
@@ -4,14 +4,18 @@ Subject: Use _GNU_SOURCE on GNU/kFreeBSD
 
 Define _GNU_SOURCE not only on GNU/Hurd, but also other glibc-based
 platforms including GNU/kFreeBSD.
---- a/src/os/unix/ngx_posix_config.h
-+++ b/src/os/unix/ngx_posix_config.h
+
+modified by jan.mojzis@gmail.com
+Index: nginx/src/os/unix/ngx_posix_config.h
+===================================================================
+--- nginx.orig/src/os/unix/ngx_posix_config.h
++++ nginx/src/os/unix/ngx_posix_config.h
 @@ -21,10 +21,13 @@
  #endif
  
  
 -#if (NGX_GNU_HURD)
-+#if defined(__GLIBC__)
++#if defined(NGX_GNU_HURD) || defined(__GLIBC__)
  #ifndef _GNU_SOURCE
  #define _GNU_SOURCE             /* accept4() */
  #endif

From 9a6a526958f6e1157347f0af236316317a290a3c Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Mon, 9 May 2022 11:55:56 -0400
Subject: [PATCH 379/600] 1.20.2-2 release

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3b651cd..4240fae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.20.2-2) UNRELEASED; urgency=medium
+nginx (1.20.2-2) unstable; urgency=medium
 
   [ Thomas Ward ]
   * d/patches/CVE-2021-3618.patch: Include upstream changeset from NGINX 

From 9b87224f4f5357e7146e6b56fb6da20f0d260d05 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 10 May 2022 12:08:52 -0400
Subject: [PATCH 380/600] Bug 1010798 - fixes woff2 typo

---
 debian/changelog       | 7 +++++++
 debian/conf/mime.types | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4240fae..3b9b5b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.20.2-3) UNRELEASED; urgency=medium
+
+  * d/conf/mime.types: Fix a typo in font/woff2 extension in 
+    mime.types.  (Closes: #1010798)
+
+ -- Thomas Ward <teward@ubuntu.com>  Tue, 10 May 2022 12:08:02 -0400
+
 nginx (1.20.2-2) unstable; urgency=medium
 
   [ Thomas Ward ]
diff --git a/debian/conf/mime.types b/debian/conf/mime.types
index d55df56..692b16c 100644
--- a/debian/conf/mime.types
+++ b/debian/conf/mime.types
@@ -26,7 +26,7 @@ types {
     image/x-ms-bmp                        bmp;
 
     font/woff                             woff;
-    font/woff2                            woff;
+    font/woff2                            woff2;
 
     application/java-archive              jar war ear;
     application/json                      json;

From 493d6c7b862858fe5ae2acef6b952bb02f782f05 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 24 May 2022 14:18:52 -0400
Subject: [PATCH 381/600] Update signing keys - new upstream signing key(s)
 observed.

---
 debian/upstream/signing-key.asc | 65 +++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 01a2a5f..5e36f56 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -1,3 +1,6 @@
+# Previously used as signing key up through May 24, 2022
+# and may be used in future.  Keep this around intentionally as such.
+# gpg: pub  rsa2048/520A9993A1C052F8 2011-11-27  Maxim Dounin <mdounin@mdounin.ru>
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBE7SKu8BCADQo6x4ZQfAcPlJMLmL8zBEBUS6GyKMMMDtrTh3Yaq481HB54oR
@@ -27,3 +30,65 @@ QE2uIxTCawHr12PsllPkbqPk/PagIttfEJqn9b0CrqPC3HREePb2aMJ/Ctw/76CO
 wn0mtXeIXLCTvBmznXfaMKllsqbsy2nCJ2P2uJjOntw=
 =NeQn
 -----END PGP PUBLIC KEY BLOCK-----
+
+
+# First observed on May 24, 2022
+#
+# pub   rsa3072 2018-05-07 [SC] [expires: 2027-05-17]
+#      13C82A63B603576156E30A4EA0EA981B66B0D967
+#uid           [ unknown] Konstantin Pavlov <thresh@nginx.com>
+#uid           [ unknown] Konstantin Pavlov <k.pavlov@f5.com>
+#sub   rsa3072 2018-05-07 [E] [expires: 2027-05-17]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBFrwMiUBDADo56OlDknN+ReCMP+8CN1biK5izmGd755TxktHLI9nAP8ociIq
+Hjrps22pBtAIQ6eZpwCFBys2mR/441rOgZW+O6uqBYrttbxTMvE43EmKYGuFCmuR
+u0JGMPuqnzF3Y+6uoKzqMzazSrZIBWsBKAkNYTw8+yPlxGgffhBp1ueME7Lskglh
+EV9gmrEM0QlWod7wSQvyruExPm5INx3MG63Xfvc0bPiWUOGKyMb7kXA5VgnWuzmS
+BCMm17+A32vMyxhYcvSEgUayQjGghI1uPDSqBQBMEFTgSK2wWzvAXf/M45nxKBgQ
+IEDmvoC8RM9JTtUr7RE/E1mjsuefF2vYYYsWBstRFGAlUV1/lPNNibu3NqbCug6b
+1IWJuV1DX9T9/f81GZJrsPgYYKC6Ai8C1B0NGWjos7/GzgEFENQgf5duOhFPadQz
+QbRxBoId4Fe/Uwe2HxI8ESCQMwsq8bowcCn6XRA2EYkAt17Kab6LH6tTP54XG9TL
+bV7bAhyrvZAk1lUAEQEAAbQjS29uc3RhbnRpbiBQYXZsb3YgPGsucGF2bG92QGY1
+LmNvbT6JAdcEEwEIAEECGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AWIQQT
+yCpjtgNXYVbjCk6g6pgbZrDZZwUCYoTfvAUJEPqvFwAKCRCg6pgbZrDZZxFYDADK
+R02XgC+AoyrqMwBNXC8Y6aiilEsyppsgj+KwZcGKDYN488gEmff+/KIEdtglw3I3
+tCMbo+FzFjHveeVCb0qrIMerWJg+o4YrxxqlQ9Q1InpduKLrIuGae0J1ybITS8+v
+iYAmwzy1Wb2CDDuCnhCR/QDfOE1CvRILVqIKezC0tRrBTEvRO84m6YMBtJ1DP75Z
+2cTNyjPos9+uxi4JcMKrMUBwZKya+z5i+Uxd66wuPj9KmggNG1x+bqMWmpTrSKUn
+gbLabFUth+uWumpj3/7HBT8Ov7rPgzY/vn3Fn5mKdLQm+kRwSX9/FbtHAE3Qsm+f
+6WW8CZ4XzL9ONfhQYwO2Jrq4HzgYloZkL+1Zs61X+zeEyr4o/mzt5DHbQRsD1UzQ
+gnh7t3YdSAy6gBqevjPWkQlq9e8eoFRydN/htwjS7dleikOsYktSnTIKlRXAWGCm
+jkRpQyZYuuPcWcGRt/0MVewRJmLemH6O+NviqhgGRePO9QR0R+yfdCwewPJEDk60
+JEtvbnN0YW50aW4gUGF2bG92IDx0aHJlc2hAbmdpbnguY29tPokB1AQTAQgAPgIb
+AwULCQgHAwUVCgkICwUWAwIBAAIeAQIXgBYhBBPIKmO2A1dhVuMKTqDqmBtmsNln
+BQJihN+8BQkQ+q8XAAoJEKDqmBtmsNlncQ0L/0Yk1QejO06gWwV1J2eK9LmjbMof
+y2ujZBgW1IGt/goo5R4PzC8lBBcsBtsKyN0Rsh7QdLrtKKLQrE/gpwMTMdKhJTdP
+/c5tUY3EwgIdBMYVaxArZQiWlPgSnoKuKydnn6Rb+Qtrhvb9pjn5XlGd/VSbAXZe
+8YTj6B8qjUa2YY+IreyB6wkPN/ytV5vcocbS7mzXaibGPVT35e0Pl1Be+xbJkbTm
+JTSJCSPwyHm9t2Vuq4e/c3fMwhOUbBjfssspR103vo91XO5sY+v2aQJOctNrv4Zp
+HMrwBH7MeqDISCWg9PICUv0ewHzAEGB+K0v342rVAzVNEctwM3Jic7fEJYsItdw+
+Zk4r8NYqACoRCdSUEHqhP0DbYoWdthpUwD1J5ryWyKTCpTL4wNhKEMcNaiHH3qor
+SssyMHMFRPoXKw9Pcay+Uo8NXc2KKxhEHTbQts0jYUNcq0yuWHoNQ4vhKkf9CHBr
+b/vS22vfEJyd6FX6ZRYK56A3EFAV8hK0BvZAw7kBjQRa8DInAQwA2Rk7UdUgpCWl
++BMz9B9eKj0XtsNEciXHHKnSFYaSNCWNwib/FsiMfcPFh7xwUTof7e7HBFkvv0QE
+MCEp7R1MVNBfMiGtG1ICFIt9nByznPsRk4VvbY/prK4DZy2AmlwhNcT2pQO3Aasc
+gsCWdf6G+wcwnHg9tWCp0Xs9BNXuppmcRrpP4M1PPRIVeG1jeVXvuSHO2HjqPSXP
+5DhGgSGN7uLOhiLTnPINd186vf6tqRdqYw3g0W1ImEjGXHeNQfnieIWdU3X4C8KT
+EPsV3lvtmSAQCoge0CyKfz4cORi4j8Edp8JpDQlbAThe529+R3eKUw7I/3ESxJBd
+qzLE/ItWvAcbGEserLDFrg9J1ojiKhsw3TVcDk+HIDzVakMz6HTd4ExSijMqTehz
+gKSVHDL+l2jc0f4VSecI+xwC3/kNsNTBpiPoUYtXBbJllHgQAakREkSKQBas02eq
+Ru8SlQ3yEn87zTtNW8L7xpe7ZVtxwUgp40PUrsb8uMDJG7ZP5rhLABEBAAGJAbwE
+GAEIACYCGwwWIQQTyCpjtgNXYVbjCk6g6pgbZrDZZwUCYoTfwQUJEPqvGgAKCRCg
+6pgbZrDZZ3oEDAC1J3BVwlkX+eoo8VsXAYxMXm8kIaTqOn/tHMOYepK+cWUdHaeC
+H3N8LigwN4Ve2LtzLBqN3WRAxFNy0DIzdBfA7QdcAoDLnB2FNrWTmwvC9nXkCogF
+fSCq7c+1oFHdn7M/VZNU4o0nhVOnqM8NLGcgzX3K3hr+WLYUgNQ9G6x0N9VU43tq
+VwJhvNv4pyiRpRdLlmhOEf35a/sWE1dttSKdrBhyzTbptw4dXr4lUpvlswWs+dLp
+SPPhWAuifORv/amWh3bxIxYEqE4o5NI/PQLJvJJLsJvMIIjpKlAGBJg5h3WCiIAk
+l7H+BesOUIIg8ava5ZUyjlFdszBMaBosZvRgFAlfnYhSGqzhip6PvXfK1YokNv7k
+qw43c0f1SmtSXZR43SRv/4vpXG7IqtTuqgSwn1qDJgr4yfs8QQykO/jG+cz7X+5O
+KSAulWi9OoqLyDWlsm3WccPIcJfbm71P+I/ha7ESVQfOxC92fQ7HQAboj7NhecJ4
+RLqjzrWSHmPGClI=
+=J2qy
+-----END PGP PUBLIC KEY BLOCK-----

From deedff451f7c54de893254fd39b46ec9efb84e65 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 24 May 2022 14:19:05 -0400
Subject: [PATCH 382/600] New upstream version 1.22.0

---
 CHANGES                                       | 160 +++++-
 CHANGES.ru                                    | 164 +++++-
 LICENSE                                       |   2 +-
 auto/lib/pcre/conf                            | 164 +++---
 auto/lib/pcre/make                            | 152 +++++-
 auto/modules                                  |   7 +-
 auto/options                                  |   3 +
 auto/os/freebsd                               |   8 +-
 auto/sources                                  |   3 +
 auto/summary                                  |   4 +-
 conf/mime.types                               |   2 +
 contrib/vim/syntax/nginx.vim                  |  61 ++-
 html/50x.html                                 |   8 +-
 html/index.html                               |   8 +-
 src/core/nginx.h                              |   4 +-
 src/core/ngx_buf.h                            |   3 -
 src/core/ngx_connection.c                     |  25 +-
 src/core/ngx_connection.h                     |   2 +-
 src/core/ngx_hash.c                           |   4 +
 src/core/ngx_module.h                         |   2 +-
 src/core/ngx_output_chain.c                   |  53 +-
 src/core/ngx_rbtree.h                         |   3 +
 src/core/ngx_regex.c                          | 474 ++++++++++++++++--
 src/core/ngx_regex.h                          |  38 +-
 src/core/ngx_resolver.c                       |   4 +-
 src/core/ngx_rwlock.c                         |  18 +-
 src/core/ngx_string.c                         |  45 +-
 src/core/ngx_times.c                          |   4 -
 src/event/ngx_event.c                         |  32 +-
 src/event/ngx_event.h                         |   5 +-
 src/event/ngx_event_accept.c                  |  58 +++
 src/event/ngx_event_openssl.c                 | 368 ++++++++++++--
 src/event/ngx_event_openssl.h                 |  10 +-
 src/event/ngx_event_timer.c                   |   4 +-
 src/http/modules/ngx_http_auth_basic_module.c |  27 +-
 src/http/modules/ngx_http_dav_module.c        |  25 +-
 src/http/modules/ngx_http_fastcgi_module.c    |   6 +-
 src/http/modules/ngx_http_grpc_module.c       | 112 +++--
 src/http/modules/ngx_http_mp4_module.c        | 261 ++++++++--
 src/http/modules/ngx_http_proxy_module.c      | 113 +++--
 src/http/modules/ngx_http_scgi_module.c       |   6 +-
 .../modules/ngx_http_secure_link_module.c     |  17 +-
 src/http/modules/ngx_http_ssl_module.c        |  80 +--
 src/http/modules/ngx_http_static_module.c     |  17 +-
 src/http/modules/ngx_http_uwsgi_module.c      |  93 ++--
 src/http/ngx_http.c                           |  42 +-
 src/http/ngx_http.h                           |   8 +
 src/http/ngx_http_copy_filter_module.c        |  90 ++--
 src/http/ngx_http_core_module.c               |  36 +-
 src/http/ngx_http_core_module.h               |   5 +-
 src/http/ngx_http_header_filter_module.c      |   4 +
 ...2_huff_decode.c => ngx_http_huff_decode.c} |  18 +-
 ...2_huff_encode.c => ngx_http_huff_encode.c} |  30 +-
 src/http/ngx_http_parse.c                     | 118 ++---
 src/http/ngx_http_request.c                   |  71 +--
 src/http/ngx_http_request.h                   |  39 +-
 src/http/ngx_http_request_body.c              | 130 ++++-
 src/http/ngx_http_script.c                    |  40 +-
 src/http/ngx_http_script.h                    |   2 +
 src/http/ngx_http_upstream.c                  | 104 +++-
 src/http/ngx_http_upstream.h                  |   4 +
 src/http/ngx_http_write_filter_module.c       |   9 +-
 src/http/v2/ngx_http_v2.c                     | 338 +++++++++----
 src/http/v2/ngx_http_v2.h                     |   9 +-
 src/http/v2/ngx_http_v2_encode.c              |   2 +-
 src/http/v2/ngx_http_v2_filter_module.c       |  29 +-
 src/mail/ngx_mail.h                           |   6 +-
 src/mail/ngx_mail_auth_http_module.c          |  41 +-
 src/mail/ngx_mail_core_module.c               |  10 +
 src/mail/ngx_mail_handler.c                   |  40 +-
 src/mail/ngx_mail_imap_handler.c              |  43 +-
 src/mail/ngx_mail_imap_module.c               |   1 +
 src/mail/ngx_mail_parse.c                     | 175 ++++---
 src/mail/ngx_mail_pop3_handler.c              |  15 +-
 src/mail/ngx_mail_pop3_module.c               |   1 +
 src/mail/ngx_mail_proxy_module.c              |  17 +-
 src/mail/ngx_mail_smtp_module.c               |   1 +
 src/mail/ngx_mail_ssl_module.c                |  72 ++-
 src/os/unix/ngx_atomic.h                      |  66 +--
 src/os/unix/ngx_freebsd_sendfile_chain.c      |  93 ++--
 src/os/unix/ngx_linux_sendfile_chain.c        |  13 +-
 src/os/unix/ngx_process_cycle.c               |   2 +
 src/os/unix/ngx_readv_chain.c                 |   2 +-
 src/stream/ngx_stream.c                       |   4 +
 src/stream/ngx_stream.h                       |   3 +
 src/stream/ngx_stream_core_module.c           |  25 +
 src/stream/ngx_stream_proxy_module.c          | 176 +++++--
 src/stream/ngx_stream_script.c                |  40 +-
 src/stream/ngx_stream_script.h                |   2 +
 src/stream/ngx_stream_ssl_module.c            | 144 +++++-
 src/stream/ngx_stream_ssl_module.h            |   1 +
 src/stream/ngx_stream_upstream.h              |   1 +
 92 files changed, 3480 insertions(+), 1301 deletions(-)
 rename src/http/{v2/ngx_http_v2_huff_decode.c => ngx_http_huff_decode.c} (99%)
 rename src/http/{v2/ngx_http_v2_huff_encode.c => ngx_http_huff_encode.c} (93%)

diff --git a/CHANGES b/CHANGES
index 7881653..6b232cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,28 +1,144 @@
 
-Changes with nginx 1.20.2                                        16 Nov 2021
+Changes with nginx 1.22.0                                        24 May 2022
+
+    *) 1.22.x stable branch.
+
+
+Changes with nginx 1.21.6                                        25 Jan 2022
+
+    *) Bugfix: when using EPOLLEXCLUSIVE on Linux client connections were
+       unevenly distributed among worker processes.
+
+    *) Bugfix: nginx returned the "Connection: keep-alive" header line in
+       responses during graceful shutdown of old worker processes.
+
+    *) Bugfix: in the "ssl_session_ticket_key" when using TLSv1.3.
+
+
+Changes with nginx 1.21.5                                        28 Dec 2021
+
+    *) Change: now nginx is built with the PCRE2 library by default.
+
+    *) Change: now nginx always uses sendfile(SF_NODISKIO) on FreeBSD.
+
+    *) Feature: support for sendfile(SF_NOCACHE) on FreeBSD.
+
+    *) Feature: the $ssl_curve variable.
+
+    *) Bugfix: connections might hang when using HTTP/2 without SSL with the
+       "sendfile" and "aio" directives.
+
+
+Changes with nginx 1.21.4                                        02 Nov 2021
+
+    *) Change: support for NPN instead of ALPN to establish HTTP/2
+       connections has been removed.
+
+    *) Change: now nginx rejects SSL connections if ALPN is used by the
+       client, but no supported protocols can be negotiated.
+
+    *) Change: the default value of the "sendfile_max_chunk" directive was
+       changed to 2 megabytes.
+
+    *) Feature: the "proxy_half_close" directive in the stream module.
+
+    *) Feature: the "ssl_alpn" directive in the stream module.
+
+    *) Feature: the $ssl_alpn_protocol variable.
+
+    *) Feature: support for SSL_sendfile() when using OpenSSL 3.0.
+
+    *) Feature: the "mp4_start_key_frame" directive in the
+       ngx_http_mp4_module.
+       Thanks to Tracey Jaquith.
+
+    *) Bugfix: in the $content_length variable when using chunked transfer
+       encoding.
+
+    *) Bugfix: after receiving a response with incorrect length from a
+       proxied backend nginx might nevertheless cache the connection.
+       Thanks to Awdhesh Mathpal.
+
+    *) Bugfix: invalid headers from backends were logged at the "info" level
+       instead of "error"; the bug had appeared in 1.21.1.
+
+    *) Bugfix: requests might hang when using HTTP/2 and the "aio_write"
+       directive.
+
+
+Changes with nginx 1.21.3                                        07 Sep 2021
+
+    *) Change: optimization of client request body reading when using
+       HTTP/2.
+
+    *) Bugfix: in request body filters internal API when using HTTP/2 and
+       buffering of the data being processed.
+
+
+Changes with nginx 1.21.2                                        31 Aug 2021
+
+    *) Change: now nginx rejects HTTP/1.0 requests with the
+       "Transfer-Encoding" header line.
+
+    *) Change: export ciphers are no longer supported.
 
     *) Feature: OpenSSL 3.0 compatibility.
 
+    *) Feature: the "Auth-SSL-Protocol" and "Auth-SSL-Cipher" header lines
+       are now passed to the mail proxy authentication server.
+       Thanks to Rob Mueller.
+
+    *) Feature: request body filters API now permits buffering of the data
+       being processed.
+
+    *) Bugfix: backend SSL connections in the stream module might hang after
+       an SSL handshake.
+
+    *) Bugfix: the security level, which is available in OpenSSL 1.1.0 or
+       newer, did not affect loading of the server certificates when set
+       with "@SECLEVEL=N" in the "ssl_ciphers" directive.
+
+    *) Bugfix: SSL connections with gRPC backends might hang if select,
+       poll, or /dev/poll methods were used.
+
+    *) Bugfix: when using HTTP/2 client request body was always written to
+       disk if the "Content-Length" header line was not present in the
+       request.
+
+
+Changes with nginx 1.21.1                                        06 Jul 2021
+
+    *) Change: now nginx always returns an error for the CONNECT method.
+
+    *) Change: now nginx always returns an error if both "Content-Length"
+       and "Transfer-Encoding" header lines are present in the request.
+
+    *) Change: now nginx always returns an error if spaces or control
+       characters are used in the request line.
+
+    *) Change: now nginx always returns an error if spaces or control
+       characters are used in a header name.
+
+    *) Change: now nginx always returns an error if spaces or control
+       characters are used in the "Host" request header line.
+
+    *) Change: optimization of configuration testing when using many
+       listening sockets.
+
+    *) Bugfix: nginx did not escape """, "<", ">", "\", "^", "`", "{", "|",
+       and "}" characters when proxying with changed URI.
+
     *) Bugfix: SSL variables might be empty when used in logs; the bug had
        appeared in 1.19.5.
 
     *) Bugfix: keepalive connections with gRPC backends might not be closed
        after receiving a GOAWAY frame.
 
-    *) Bugfix: backend SSL connections in the stream module might hang after
-       an SSL handshake.
-
-    *) Bugfix: SSL connections with gRPC backends might hang if select,
-       poll, or /dev/poll methods were used.
-
-    *) Bugfix: in the $content_length variable when using chunked transfer
-       encoding.
-
-    *) Bugfix: requests might hang when using HTTP/2 and the "aio_write"
-       directive.
+    *) Bugfix: reduced memory consumption for long-lived requests when
+       proxying with more than 64 buffers.
 
 
-Changes with nginx 1.20.1                                        25 May 2021
+Changes with nginx 1.21.0                                        25 May 2021
 
     *) Security: 1-byte memory overwrite might occur during DNS server
        response processing if the "resolver" directive was used, allowing an
@@ -30,10 +146,24 @@ Changes with nginx 1.20.1                                        25 May 2021
        cause worker process crash or, potentially, arbitrary code execution
        (CVE-2021-23017).
 
+    *) Feature: variables support in the "proxy_ssl_certificate",
+       "proxy_ssl_certificate_key" "grpc_ssl_certificate",
+       "grpc_ssl_certificate_key", "uwsgi_ssl_certificate", and
+       "uwsgi_ssl_certificate_key" directives.
 
-Changes with nginx 1.20.0                                        20 Apr 2021
+    *) Feature: the "max_errors" directive in the mail proxy module.
 
-    *) 1.20.x stable branch.
+    *) Feature: the mail proxy module supports POP3 and IMAP pipelining.
+
+    *) Feature: the "fastopen" parameter of the "listen" directive in the
+       stream module.
+       Thanks to Anbang Wen.
+
+    *) Bugfix: special characters were not escaped during automatic redirect
+       with appended trailing slash.
+
+    *) Bugfix: connections with clients in the mail proxy module might be
+       closed unexpectedly when using SMTP pipelining.
 
 
 Changes with nginx 1.19.10                                       13 Apr 2021
diff --git a/CHANGES.ru b/CHANGES.ru
index a766cc5..bd49853 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,28 +1,148 @@
 
-Изменения в nginx 1.20.2                                          16.11.2021
+Изменения в nginx 1.22.0                                          24.05.2022
+
+    *) Стабильная ветка 1.22.x.
+
+
+Изменения в nginx 1.21.6                                          25.01.2022
+
+    *) Исправление: при использование EPOLLEXCLUSIVE на Linux распределение
+       клиентских соединений между рабочими процессами было неравномерным.
+
+    *) Исправление: во время плавного завершения старых рабочих процессов
+       nginx возвращал в ответах строку заголовка "Connection: keep-alive".
+
+    *) Исправление: в директиве ssl_session_ticket_key при использовании
+       TLSv1.3.
+
+
+Изменения в nginx 1.21.5                                          28.12.2021
+
+    *) Изменение: теперь nginx по умолчанию собирается с библиотекой PCRE2.
+
+    *) Изменение: теперь nginx всегда использует sendfile(SF_NODISKIO) на
+       FreeBSD.
+
+    *) Добавление: поддержка sendfile(SF_NOCACHE) на FreeBSD.
+
+    *) Добавление: переменная $ssl_curve.
+
+    *) Исправление: при использовании HTTP/2 без SSL вместе с директивами
+       sendfile и aio соединения могли зависать.
+
+
+Изменения в nginx 1.21.4                                          02.11.2021
+
+    *) Изменение: поддержка NPN вместо ALPN для установления
+       HTTP/2-соединений упразднена.
+
+    *) Изменение: теперь nginx закрывает SSL соединение, если клиент
+       использует ALPN, но nginx не поддерживает ни один из присланных
+       клиентом протоколов.
+
+    *) Изменение: в директиве sendfile_max_chunk значение по умолчанию
+       изменено на 2 мегабайта.
+
+    *) Добавление: директива proxy_half_close в модуле stream.
+
+    *) Добавление: директива ssl_alpn в модуле stream.
+
+    *) Добавление: переменная $ssl_alpn_protocol.
+
+    *) Добавление: поддержка SSL_sendfile() при использовании OpenSSL 3.0.
+
+    *) Добавление: директива mp4_start_key_frame в модуле
+       ngx_http_mp4_module.
+       Спасибо Tracey Jaquith.
+
+    *) Исправление: в переменной $content_length при использовании chunked
+       transfer encoding.
+
+    *) Исправление: при получении ответа некорректной длины от проксируемого
+       бэкенда nginx мог тем не менее закэшировать соединение.
+       Спасибо Awdhesh Mathpal.
+
+    *) Исправление: некорректные заголовки от бэкендов логгировались на
+       уровне info вместо error; ошибка появилась в 1.21.1.
+
+    *) Исправление: при использовании HTTP/2 и директивы aio_write запросы
+       могли зависать.
+
+
+Изменения в nginx 1.21.3                                          07.09.2021
+
+    *) Изменение: оптимизация чтения тела запроса при использовании HTTP/2.
+
+    *) Исправление: во внутреннем API для обработки тела запроса при
+       использовании HTTP/2 и буферизации обрабатываемых данных.
+
+
+Изменения в nginx 1.21.2                                          31.08.2021
+
+    *) Изменение: теперь nginx возвращает ошибку, если в запросе по
+       протоколу HTTP/1.0 присутствует строка заголовка "Transfer-Encoding".
+
+    *) Изменение: экспортные шифры больше не поддерживаются.
 
     *) Добавление: совместимость с OpenSSL 3.0.
 
+    *) Добавление: теперь серверу аутентификации почтового прокси-сервера
+       передаются строки заголовка "Auth-SSL-Protocol" и "Auth-SSL-Cipher".
+       Спасибо Rob Mueller.
+
+    *) Добавление: API для обработки тела запроса теперь позволяет
+       буферизировать обрабатываемые данные.
+
+    *) Исправление: SSL-соединения к бэкендам в модуле stream могли зависать
+       после SSL handshake.
+
+    *) Исправление: уровень безопасности, доступный в OpenSSL 1.1.0 и новее,
+       не учитывался при загрузке сертификатов сервера, если был задан через
+       "@SECLEVEL=N" в директиве ssl_ciphers.
+
+    *) Исправление: SSL-соединения с gRPC-бэкендами могли зависать, если
+       использовались методы select, poll или /dev/poll.
+
+    *) Исправление: при использовании HTTP/2 тело запроса всегда
+       записывалось на диск, если в запросе не было строки заголовка
+       "Content-Length".
+
+
+Изменения в nginx 1.21.1                                          06.07.2021
+
+    *) Изменение: теперь nginx для метода CONNECT всегда возвращает ошибку.
+
+    *) Изменение: теперь nginx всегда возвращает ошибку, если в запросе
+       одновременно присутствуют строки заголовка "Content-Length" и
+       "Transfer-Encoding".
+
+    *) Изменение: теперь nginx всегда возвращает ошибку, если в строке
+       запроса используются пробелы или управляющие символы.
+
+    *) Изменение: теперь nginx всегда возвращает ошибку, если в имени
+       заголовка используются пробелы или управляющие символы.
+
+    *) Изменение: теперь nginx всегда возвращает ошибку, если в строке
+       "Host" заголовка запроса используются пробелы или управляющие
+       символы.
+
+    *) Изменение: оптимизация тестирования конфигурации при использовании
+       большого количества listen-сокетов.
+
+    *) Исправление: nginx не экранировал символы """, "<", ">", "\", "^",
+       "`", "{", "|", и "}" при проксировании с изменением URI запроса.
+
     *) Исправление: SSL-переменные могли быть пустыми при записи в лог;
        ошибка появилась в 1.19.5.
 
     *) Исправление: keepalive-соединения с gRPC-бэкендами могли не
        закрываться после получения GOAWAY-фрейма.
 
-    *) Исправление: SSL-соединения к бэкендам в модуле stream могли зависать
-       после SSL handshake.
-
-    *) Исправление: SSL-соединения с gRPC-бэкендами могли зависать, если
-       использовались методы select, poll или /dev/poll.
-
-    *) Исправление: в переменной $content_length при использовании chunked
-       transfer encoding.
-
-    *) Исправление: при использовании HTTP/2 и директивы aio_write запросы
-       могли зависать.
+    *) Исправление: уменьшено потребление памяти для долгоживущих запросов
+       при проксировании с использованием более 64 буферов.
 
 
-Изменения в nginx 1.20.1                                          25.05.2021
+Изменения в nginx 1.21.0                                          25.05.2021
 
     *) Безопасность: при использовании директивы resolver во время обработки
        ответа DNS-сервера могла происходить перезапись одного байта памяти,
@@ -30,10 +150,24 @@
        от DNS-сервера, вызвать падение рабочего процесса или, потенциально,
        выполнение произвольного кода (CVE-2021-23017).
 
+    *) Добавление: директивы proxy_ssl_certificate,
+       proxy_ssl_certificate_key, grpc_ssl_certificate,
+       grpc_ssl_certificate_key, uwsgi_ssl_certificate и
+       uwsgi_ssl_certificate_key поддерживают переменные.
 
-Изменения в nginx 1.20.0                                          20.04.2021
+    *) Добавление: директива max_errors в почтовом прокси-сервере.
 
-    *) Стабильная ветка 1.20.x.
+    *) Добавление: почтовый прокси-сервер поддерживает POP3 и IMAP
+       pipelining.
+
+    *) Добавление: параметр fastopen директивы listen в модуле stream.
+       Спасибо Anbang Wen.
+
+    *) Исправление: специальные символы не экранировались при автоматическом
+       перенаправлении с добавлением завершающего слэша.
+
+    *) Исправление: при использовании SMTP pipelining соединения с клиентами
+       в почтовом прокси-сервере могли неожиданно закрываться.
 
 
 Изменения в nginx 1.19.10                                         13.04.2021
diff --git a/LICENSE b/LICENSE
index fd0c72d..fdedcb7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 /* 
  * Copyright (C) 2002-2021 Igor Sysoev
- * Copyright (C) 2011-2021 Nginx, Inc.
+ * Copyright (C) 2011-2022 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 5e3960f..20c1caf 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -4,87 +4,62 @@
 
 
 if [ $PCRE != NONE ]; then
-    CORE_INCS="$CORE_INCS $PCRE"
 
-    case "$NGX_CC_NAME" in
+    if [ -f $PCRE/src/pcre2.h.generic ]; then
 
-        msvc | owc | bcc)
-            have=NGX_PCRE . auto/have
+        PCRE_LIBRARY=PCRE2
+
+        have=NGX_PCRE . auto/have
+        have=NGX_PCRE2 . auto/have
+
+        if [ "$NGX_PLATFORM" = win32 ]; then
+            have=PCRE2_STATIC . auto/have
+        fi
+
+        CORE_INCS="$CORE_INCS $PCRE/src/"
+        CORE_DEPS="$CORE_DEPS $PCRE/src/pcre2.h"
+
+        case "$NGX_CC_NAME" in
+
+            msvc)
+                LINK_DEPS="$LINK_DEPS $PCRE/src/pcre2-8.lib"
+                CORE_LIBS="$CORE_LIBS $PCRE/src/pcre2-8.lib"
+            ;;
+
+            *)
+                LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre2-8.a"
+                CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre2-8.a"
+            ;;
+
+        esac
+
+    else
+
+        PCRE_LIBRARY=PCRE
+
+        have=NGX_PCRE . auto/have
+
+        if [ "$NGX_PLATFORM" = win32 ]; then
             have=PCRE_STATIC . auto/have
-            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
-            LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
-            CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib"
-        ;;
+        fi
 
-        icc)
-            have=NGX_PCRE . auto/have
-            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+        CORE_INCS="$CORE_INCS $PCRE"
+        CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
 
-            LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
+        case "$NGX_CC_NAME" in
 
-            echo $ngx_n "checking for PCRE library ...$ngx_c"
+            msvc | owc | bcc)
+                LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
+                CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib"
+            ;;
 
-            if [ -f $PCRE/pcre.h ]; then
-                ngx_pcre_ver=`grep PCRE_MAJOR $PCRE/pcre.h \
-                              | sed -e 's/^.*PCRE_MAJOR.* \(.*\)$/\1/'`
-
-            else if [ -f $PCRE/configure.in ]; then
-                ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \
-                              | sed -e 's/^.*=\(.*\)$/\1/'`
-
-            else
-                ngx_pcre_ver=`grep pcre_major, $PCRE/configure.ac \
-                              | sed -e 's/^.*pcre_major,.*\[\(.*\)\].*$/\1/'`
-            fi
-            fi
-
-            echo " $ngx_pcre_ver major version found"
-
-            # to allow -ipo optimization we link with the *.o but not library
-
-            case "$ngx_pcre_ver" in
-                4|5)
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre.o"
-                ;;
-
-                6)
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o"
-                ;;
-
-                *)
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o"
-                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_newline.o"
-                ;;
-
-            esac
-        ;;
-
-        *)
-            have=NGX_PCRE . auto/have
-
-            if [ "$NGX_PLATFORM" = win32 ]; then
-                have=PCRE_STATIC . auto/have
-            fi
-
-            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
-            LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
-            CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a"
-        ;;
-
-    esac
+            *)
+                LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
+                CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a"
+            ;;
 
+        esac
+    fi
 
     if [ $PCRE_JIT = YES ]; then
         have=NGX_HAVE_PCRE_JIT . auto/have
@@ -94,8 +69,48 @@ if [ $PCRE != NONE ]; then
 else
 
     if [ "$NGX_PLATFORM" != win32 ]; then
-
         PCRE=NO
+    fi
+
+    if [ $PCRE = NO -a $PCRE2 != DISABLED ]; then
+
+        ngx_feature="PCRE2 library"
+        ngx_feature_name="NGX_PCRE2"
+        ngx_feature_run=no
+        ngx_feature_incs="#define PCRE2_CODE_UNIT_WIDTH 8
+                          #include <pcre2.h>"
+        ngx_feature_path=
+        ngx_feature_libs="-lpcre2-8"
+        ngx_feature_test="pcre2_code *re;
+                          re = pcre2_compile(NULL, 0, 0, NULL, NULL, NULL);
+                          if (re == NULL) return 1"
+        . auto/feature
+
+        if [ $ngx_found = no ]; then
+
+            # pcre2-config
+
+            ngx_pcre2_prefix=`pcre2-config --prefix 2>/dev/null`
+
+            if [ -n "$ngx_pcre2_prefix" ]; then
+                ngx_feature="PCRE2 library in $ngx_pcre2_prefix"
+                ngx_feature_path=`pcre2-config --cflags \
+                                  | sed -n -e 's/.*-I *\([^ ][^ ]*\).*/\1/p'`
+                ngx_feature_libs=`pcre2-config --libs8`
+                . auto/feature
+            fi
+        fi
+
+        if [ $ngx_found = yes ]; then
+            have=NGX_PCRE . auto/have
+            CORE_INCS="$CORE_INCS $ngx_feature_path"
+            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+            PCRE=YES
+            PCRE_LIBRARY=PCRE2
+        fi
+    fi
+
+    if [ $PCRE = NO ]; then
 
         ngx_feature="PCRE library"
         ngx_feature_name="NGX_PCRE"
@@ -171,6 +186,7 @@ else
             CORE_INCS="$CORE_INCS $ngx_feature_path"
             CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
             PCRE=YES
+            PCRE_LIBRARY=PCRE
         fi
 
         if [ $PCRE = YES ]; then
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 97c9f3b..839ef29 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -3,36 +3,138 @@
 # Copyright (C) Nginx, Inc.
 
 
-case "$NGX_CC_NAME" in
+if [ $PCRE_LIBRARY = PCRE2 ]; then
 
-    msvc)
-        ngx_makefile=makefile.msvc
-        ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
-        ngx_pcre="PCRE=\"$PCRE\""
-    ;;
+    # PCRE2
 
-    owc)
-        ngx_makefile=makefile.owc
-        ngx_opt="CPU_OPT=\"$CPU_OPT\""
-        ngx_pcre=`echo PCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
-    ;;
+    if [ $NGX_CC_NAME = msvc ]; then
 
-    bcc)
-        ngx_makefile=makefile.bcc
-        ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
-        ngx_pcre=`echo \-DPCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
-    ;;
+        # With PCRE2, it is not possible to compile all sources.
+        # Since list of source files changes between versions, we
+        # test files which might not be present.
 
-    *)
-        ngx_makefile=
-    ;;
+        ngx_pcre_srcs="pcre2_auto_possess.c \
+                       pcre2_chartables.c \
+                       pcre2_compile.c \
+                       pcre2_config.c \
+                       pcre2_context.c \
+                       pcre2_dfa_match.c \
+                       pcre2_error.c \
+                       pcre2_jit_compile.c \
+                       pcre2_maketables.c \
+                       pcre2_match.c \
+                       pcre2_match_data.c \
+                       pcre2_newline.c \
+                       pcre2_ord2utf.c \
+                       pcre2_pattern_info.c \
+                       pcre2_string_utils.c \
+                       pcre2_study.c \
+                       pcre2_substitute.c \
+                       pcre2_substring.c \
+                       pcre2_tables.c \
+                       pcre2_ucd.c \
+                       pcre2_valid_utf.c \
+                       pcre2_xclass.c"
 
-esac
+        ngx_pcre_test="pcre2_convert.c \
+                       pcre2_extuni.c \
+                       pcre2_find_bracket.c \
+                       pcre2_script_run.c \
+                       pcre2_serialize.c"
+
+        for ngx_src in $ngx_pcre_test
+        do
+            if [ -f $PCRE/src/$ngx_src ]; then
+                ngx_pcre_srcs="$ngx_pcre_srcs $ngx_src"
+            fi
+        done
+
+        ngx_pcre_objs=`echo $ngx_pcre_srcs \
+            | sed -e "s#\([^ ]*\.\)c#\1$ngx_objext#g"`
+
+        ngx_pcre_srcs=`echo $ngx_pcre_srcs \
+            | sed -e "s/  *\([^ ][^ ]*\)/$ngx_regex_cont\1/g"`
+        ngx_pcre_objs=`echo $ngx_pcre_objs \
+            | sed -e "s/  *\([^ ][^ ]*\)/$ngx_regex_cont\1/g"`
+
+        cat << END                                            >> $NGX_MAKEFILE
+
+PCRE_CFLAGS =	-O2 -Ob1 -Oi -Gs $LIBC $CPU_OPT
+PCRE_FLAGS =	-DHAVE_CONFIG_H -DPCRE2_STATIC -DPCRE2_CODE_UNIT_WIDTH=8 \\
+		-DHAVE_MEMMOVE
+
+PCRE_SRCS =	 $ngx_pcre_srcs
+PCRE_OBJS =	 $ngx_pcre_objs
+
+$PCRE/src/pcre2.h:
+	cd $PCRE/src \\
+	&& copy /y config.h.generic config.h \\
+	&& copy /y pcre2.h.generic pcre2.h \\
+	&& copy /y pcre2_chartables.c.dist pcre2_chartables.c
+
+$PCRE/src/pcre2-8.lib:	$PCRE/src/pcre2.h $NGX_MAKEFILE
+	cd $PCRE/src \\
+	&& cl -nologo -c \$(PCRE_CFLAGS) -I . \$(PCRE_FLAGS) \$(PCRE_SRCS) \\
+	&& link -lib -out:pcre2-8.lib -verbose:lib \$(PCRE_OBJS)
+
+END
+
+    else
+
+        cat << END                                            >> $NGX_MAKEFILE
+
+$PCRE/src/pcre2.h:	$PCRE/Makefile
+
+$PCRE/Makefile:	$NGX_MAKEFILE
+	cd $PCRE \\
+	&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
+	&& CC="\$(CC)" CFLAGS="$PCRE_OPT" \\
+	./configure --disable-shared $PCRE_CONF_OPT
+
+$PCRE/.libs/libpcre2-8.a:	$PCRE/Makefile
+	cd $PCRE \\
+	&& \$(MAKE) libpcre2-8.la
+
+END
+
+    fi
 
 
-if [ -n "$ngx_makefile" ]; then
+else
 
-    cat << END                                                >> $NGX_MAKEFILE
+    # PCRE
+
+    case "$NGX_CC_NAME" in
+
+        msvc)
+            ngx_makefile=makefile.msvc
+            ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
+            ngx_pcre="PCRE=\"$PCRE\""
+        ;;
+
+        owc)
+            ngx_makefile=makefile.owc
+            ngx_opt="CPU_OPT=\"$CPU_OPT\""
+            ngx_pcre=`echo PCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
+        ;;
+
+        bcc)
+            ngx_makefile=makefile.bcc
+            ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
+            ngx_pcre=`echo \-DPCRE=\"$PCRE\" \
+                | sed -e "s/\//$ngx_regex_dirsep/g"`
+        ;;
+
+        *)
+            ngx_makefile=
+        ;;
+
+    esac
+
+
+    if [ -n "$ngx_makefile" ]; then
+
+        cat << END                                            >> $NGX_MAKEFILE
 
 `echo "$PCRE/pcre.lib:	$PCRE/pcre.h $NGX_MAKEFILE"			\
 	| sed -e "s/\//$ngx_regex_dirsep/g"`
@@ -43,9 +145,9 @@ if [ -n "$ngx_makefile" ]; then
 
 END
 
-else
+    else
 
-    cat << END                                                >> $NGX_MAKEFILE
+        cat << END                                            >> $NGX_MAKEFILE
 
 $PCRE/pcre.h:	$PCRE/Makefile
 
@@ -61,4 +163,6 @@ $PCRE/.libs/libpcre.a:	$PCRE/Makefile
 
 END
 
+    fi
+
 fi
diff --git a/auto/modules b/auto/modules
index f5a4597..94867bf 100644
--- a/auto/modules
+++ b/auto/modules
@@ -102,6 +102,11 @@ if [ $HTTP = YES ]; then
     fi
 
 
+    if [ $HTTP_V2 = YES ]; then
+        HTTP_SRCS="$HTTP_SRCS $HTTP_HUFF_SRCS"
+    fi
+
+
     # the module order is important
     #     ngx_http_static_module
     #     ngx_http_gzip_static_module
@@ -414,8 +419,6 @@ if [ $HTTP = YES ]; then
         ngx_module_srcs="src/http/v2/ngx_http_v2.c \
                          src/http/v2/ngx_http_v2_table.c \
                          src/http/v2/ngx_http_v2_encode.c \
-                         src/http/v2/ngx_http_v2_huff_decode.c \
-                         src/http/v2/ngx_http_v2_huff_encode.c \
                          src/http/v2/ngx_http_v2_module.c"
         ngx_module_libs=
         ngx_module_link=$HTTP_V2
diff --git a/auto/options b/auto/options
index 80be906..48f3a1a 100644
--- a/auto/options
+++ b/auto/options
@@ -146,6 +146,7 @@ PCRE=NONE
 PCRE_OPT=
 PCRE_CONF_OPT=
 PCRE_JIT=NO
+PCRE2=YES
 
 USE_OPENSSL=NO
 OPENSSL=NONE
@@ -357,6 +358,7 @@ use the \"--with-mail_ssl_module\" option instead"
         --with-pcre=*)                   PCRE="$value"              ;;
         --with-pcre-opt=*)               PCRE_OPT="$value"          ;;
         --with-pcre-jit)                 PCRE_JIT=YES               ;;
+        --without-pcre2)                 PCRE2=DISABLED             ;;
 
         --with-openssl=*)                OPENSSL="$value"           ;;
         --with-openssl-opt=*)            OPENSSL_OPT="$value"       ;;
@@ -573,6 +575,7 @@ cat << END
   --with-pcre=DIR                    set path to PCRE library sources
   --with-pcre-opt=OPTIONS            set additional build options for PCRE
   --with-pcre-jit                    build PCRE with JIT compilation support
+  --without-pcre2                    do not use PCRE2 library
 
   --with-zlib=DIR                    set path to zlib library sources
   --with-zlib-opt=OPTIONS            set additional build options for zlib
diff --git a/auto/os/freebsd b/auto/os/freebsd
index 937ca20..870bac4 100644
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -44,12 +44,10 @@ if [ $osreldate -gt 300007 ]; then
     CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS"
 fi
 
-if [ $NGX_FILE_AIO = YES ]; then
-    if [ $osreldate -gt 502103 ]; then
-        echo " + sendfile()'s SF_NODISKIO found"
+if [ $osreldate -gt 1100093 ]; then
+    echo " + sendfile()'s SF_NODISKIO found"
 
-        have=NGX_HAVE_AIO_SENDFILE . auto/have
-    fi
+    have=NGX_HAVE_SENDFILE_NODISKIO . auto/have
 fi
 
 # POSIX semaphores
diff --git a/auto/sources b/auto/sources
index 3dad111..156f797 100644
--- a/auto/sources
+++ b/auto/sources
@@ -255,3 +255,6 @@ NGX_WIN32_RC="src/os/win32/nginx.rc"
 
 
 HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
+
+HTTP_HUFF_SRCS="src/http/ngx_http_huff_decode.c
+                src/http/ngx_http_huff_encode.c"
diff --git a/auto/summary b/auto/summary
index 9aa776e..b3c07ee 100644
--- a/auto/summary
+++ b/auto/summary
@@ -16,9 +16,9 @@ if [ $USE_PCRE = DISABLED ]; then
 
 else
     case $PCRE in
-        YES)   echo "  + using system PCRE library" ;;
+        YES)   echo "  + using system $PCRE_LIBRARY library" ;;
         NONE)  echo "  + PCRE library is not used" ;;
-        *)     echo "  + using PCRE library: $PCRE" ;;
+        *)     echo "  + using $PCRE_LIBRARY library: $PCRE" ;;
     esac
 fi
 
diff --git a/conf/mime.types b/conf/mime.types
index 2961256..1c00d70 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -15,6 +15,7 @@ types {
     text/vnd.wap.wml                                 wml;
     text/x-component                                 htc;
 
+    image/avif                                       avif;
     image/png                                        png;
     image/svg+xml                                    svg svgz;
     image/tiff                                       tif tiff;
@@ -51,6 +52,7 @@ types {
     application/vnd.openxmlformats-officedocument.wordprocessingml.document
                                                      docx;
     application/vnd.wap.wmlc                         wmlc;
+    application/wasm                                 wasm;
     application/x-7z-compressed                      7z;
     application/x-cocoa                              cco;
     application/x-java-archive-diff                  jardiff;
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 88ec847..6828cd3 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -5,6 +5,9 @@ if exists("b:current_syntax")
   finish
 end
 
+let s:save_cpo = &cpo
+set cpo&vim
+
 " general syntax
 
 if has("patch-7.4.1142")
@@ -152,6 +155,8 @@ syn keyword ngxDirective contained auth_jwt_header_set
 syn keyword ngxDirective contained auth_jwt_key_file
 syn keyword ngxDirective contained auth_jwt_key_request
 syn keyword ngxDirective contained auth_jwt_leeway
+syn keyword ngxDirective contained auth_jwt_require
+syn keyword ngxDirective contained auth_jwt_type
 syn keyword ngxDirective contained auth_request
 syn keyword ngxDirective contained auth_request_set
 syn keyword ngxDirective contained autoindex
@@ -332,16 +337,24 @@ syn keyword ngxDirective contained index
 syn keyword ngxDirective contained iocp_threads
 syn keyword ngxDirective contained ip_hash
 syn keyword ngxDirective contained js_access
+syn keyword ngxDirective contained js_body_filter
 syn keyword ngxDirective contained js_content
+syn keyword ngxDirective contained js_fetch_ciphers
+syn keyword ngxDirective contained js_fetch_protocols
+syn keyword ngxDirective contained js_fetch_trusted_certificate
+syn keyword ngxDirective contained js_fetch_verify_depth
 syn keyword ngxDirective contained js_filter
+syn keyword ngxDirective contained js_header_filter
 syn keyword ngxDirective contained js_import
 syn keyword ngxDirective contained js_include
 syn keyword ngxDirective contained js_path
 syn keyword ngxDirective contained js_preread
 syn keyword ngxDirective contained js_set
+syn keyword ngxDirective contained js_var
 syn keyword ngxDirective contained keepalive
 syn keyword ngxDirective contained keepalive_disable
 syn keyword ngxDirective contained keepalive_requests
+syn keyword ngxDirective contained keepalive_time
 syn keyword ngxDirective contained keepalive_timeout
 syn keyword ngxDirective contained keyval
 syn keyword ngxDirective contained keyval_zone
@@ -373,6 +386,7 @@ syn keyword ngxDirective contained log_subrequest
 syn keyword ngxDirective contained map_hash_bucket_size
 syn keyword ngxDirective contained map_hash_max_size
 syn keyword ngxDirective contained master_process
+syn keyword ngxDirective contained max_errors
 syn keyword ngxDirective contained max_ranges
 syn keyword ngxDirective contained memcached_bind
 syn keyword ngxDirective contained memcached_buffer_size
@@ -396,6 +410,7 @@ syn keyword ngxDirective contained mp4_buffer_size
 syn keyword ngxDirective contained mp4_limit_rate
 syn keyword ngxDirective contained mp4_limit_rate_after
 syn keyword ngxDirective contained mp4_max_buffer_size
+syn keyword ngxDirective contained mp4_start_key_frame
 syn keyword ngxDirective contained msie_padding
 syn keyword ngxDirective contained msie_refresh
 syn keyword ngxDirective contained multi_accept
@@ -452,6 +467,7 @@ syn keyword ngxDirective contained proxy_cookie_flags
 syn keyword ngxDirective contained proxy_cookie_path
 syn keyword ngxDirective contained proxy_download_rate
 syn keyword ngxDirective contained proxy_force_ranges
+syn keyword ngxDirective contained proxy_half_close
 syn keyword ngxDirective contained proxy_headers_hash_bucket_size
 syn keyword ngxDirective contained proxy_headers_hash_max_size
 syn keyword ngxDirective contained proxy_hide_header
@@ -591,6 +607,7 @@ syn keyword ngxDirective contained ssi_min_file_chunk
 syn keyword ngxDirective contained ssi_silent_errors
 syn keyword ngxDirective contained ssi_types
 syn keyword ngxDirective contained ssi_value_length
+syn keyword ngxDirective contained ssl_alpn
 syn keyword ngxDirective contained ssl_buffer_size
 syn keyword ngxDirective contained ssl_certificate
 syn keyword ngxDirective contained ssl_certificate_key
@@ -782,11 +799,15 @@ syn keyword ngxDirectiveThirdParty contained auth_digest_user_file
 syn keyword ngxDirectiveThirdParty contained auth_gss
 syn keyword ngxDirectiveThirdParty contained auth_gss_allow_basic_fallback
 syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal
+syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal_regex
+syn keyword ngxDirectiveThirdParty contained auth_gss_constrained_delegation
+syn keyword ngxDirectiveThirdParty contained auth_gss_delegate_credentials
 syn keyword ngxDirectiveThirdParty contained auth_gss_force_realm
 syn keyword ngxDirectiveThirdParty contained auth_gss_format_full
 syn keyword ngxDirectiveThirdParty contained auth_gss_keytab
 syn keyword ngxDirectiveThirdParty contained auth_gss_map_to_local
 syn keyword ngxDirectiveThirdParty contained auth_gss_realm
+syn keyword ngxDirectiveThirdParty contained auth_gss_service_ccache
 syn keyword ngxDirectiveThirdParty contained auth_gss_service_name
 
 " LDAP Authentication
@@ -963,7 +984,6 @@ syn keyword ngxDirectiveThirdParty contained fancyindex_hide_parent_dir
 syn keyword ngxDirectiveThirdParty contained fancyindex_hide_symlinks
 syn keyword ngxDirectiveThirdParty contained fancyindex_ignore
 syn keyword ngxDirectiveThirdParty contained fancyindex_localtime
-syn keyword ngxDirectiveThirdParty contained fancyindex_name_length
 syn keyword ngxDirectiveThirdParty contained fancyindex_show_dotfiles
 syn keyword ngxDirectiveThirdParty contained fancyindex_show_path
 syn keyword ngxDirectiveThirdParty contained fancyindex_time_format
@@ -1053,7 +1073,9 @@ syn keyword ngxDirectiveThirdParty contained nchan_publisher_upstream_request
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_location
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_connect_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_redis_discovered_ip_range_blacklist
 syn keyword ngxDirectiveThirdParty contained nchan_redis_fakesub_timer_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_cache_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_redis_namespace
@@ -1061,12 +1083,29 @@ syn keyword ngxDirectiveThirdParty contained nchan_redis_nostore_fastpublish
 syn keyword ngxDirectiveThirdParty contained nchan_redis_optimize_target
 syn keyword ngxDirectiveThirdParty contained nchan_redis_pass
 syn keyword ngxDirectiveThirdParty contained nchan_redis_pass_inheritable
+syn keyword ngxDirectiveThirdParty contained nchan_redis_password
 syn keyword ngxDirectiveThirdParty contained nchan_redis_ping_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_publish_msgpacked_max_size
 syn keyword ngxDirectiveThirdParty contained nchan_redis_server
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_ciphers
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_client_certificate
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_client_certificate_key
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_server_name
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_trusted_certificate
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_trusted_certificate_path
+syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_verify_certificate
 syn keyword ngxDirectiveThirdParty contained nchan_redis_storage_mode
 syn keyword ngxDirectiveThirdParty contained nchan_redis_subscribe_weights
+syn keyword ngxDirectiveThirdParty contained nchan_redis_tls
+syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_ciphers
+syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_client_certificate
+syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_server_name
+syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_trusted_certificate
+syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_trusted_certificate_path
+syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_verify_certificate
 syn keyword ngxDirectiveThirdParty contained nchan_redis_url
+syn keyword ngxDirectiveThirdParty contained nchan_redis_username
 syn keyword ngxDirectiveThirdParty contained nchan_redis_wait_after_connecting
 syn keyword ngxDirectiveThirdParty contained nchan_shared_memory_size
 syn keyword ngxDirectiveThirdParty contained nchan_storage_engine
@@ -1080,6 +1119,8 @@ syn keyword ngxDirectiveThirdParty contained nchan_subscriber_compound_etag_mess
 syn keyword ngxDirectiveThirdParty contained nchan_subscribe_request
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_first_message
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_http_raw_stream_separator
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_info
+syn keyword ngxDirectiveThirdParty contained nchan_subscriber_info_string
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_last_message_id
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_location
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_message_id_custom_etag_header
@@ -1377,6 +1418,7 @@ syn keyword ngxDirectiveThirdParty contained lua_socket_read_timeout
 syn keyword ngxDirectiveThirdParty contained lua_socket_send_lowat
 syn keyword ngxDirectiveThirdParty contained lua_socket_send_timeout
 syn keyword ngxDirectiveThirdParty contained lua_ssl_ciphers
+syn keyword ngxDirectiveThirdParty contained lua_ssl_conf_command
 syn keyword ngxDirectiveThirdParty contained lua_ssl_crl
 syn keyword ngxDirectiveThirdParty contained lua_ssl_protocols
 syn keyword ngxDirectiveThirdParty contained lua_ssl_trusted_certificate
@@ -1384,6 +1426,7 @@ syn keyword ngxDirectiveThirdParty contained lua_ssl_verify_depth
 syn keyword ngxDirectiveThirdParty contained lua_thread_cache_max_entries
 syn keyword ngxDirectiveThirdParty contained lua_transform_underscores_in_response_headers
 syn keyword ngxDirectiveThirdParty contained lua_use_default_type
+syn keyword ngxDirectiveThirdParty contained lua_worker_thread_vm_pool_size
 syn keyword ngxDirectiveThirdParty contained rewrite_by_lua
 syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_block
 syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_file
@@ -1393,6 +1436,8 @@ syn keyword ngxDirectiveThirdParty contained set_by_lua_block
 syn keyword ngxDirectiveThirdParty contained set_by_lua_file
 syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_block
 syn keyword ngxDirectiveThirdParty contained ssl_certificate_by_lua_file
+syn keyword ngxDirectiveThirdParty contained ssl_client_hello_by_lua_block
+syn keyword ngxDirectiveThirdParty contained ssl_client_hello_by_lua_file
 syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_block
 syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_file
 syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_block
@@ -1711,15 +1756,18 @@ syn keyword ngxDirectiveThirdParty contained set_base32_alphabet
 syn keyword ngxDirectiveThirdParty contained set_base32_padding
 syn keyword ngxDirectiveThirdParty contained set_decode_base32
 syn keyword ngxDirectiveThirdParty contained set_decode_base64
+syn keyword ngxDirectiveThirdParty contained set_decode_base64url
 syn keyword ngxDirectiveThirdParty contained set_decode_hex
 syn keyword ngxDirectiveThirdParty contained set_encode_base32
 syn keyword ngxDirectiveThirdParty contained set_encode_base64
+syn keyword ngxDirectiveThirdParty contained set_encode_base64url
 syn keyword ngxDirectiveThirdParty contained set_encode_hex
 syn keyword ngxDirectiveThirdParty contained set_escape_uri
 syn keyword ngxDirectiveThirdParty contained set_formatted_gmt_time
 syn keyword ngxDirectiveThirdParty contained set_formatted_local_time
 syn keyword ngxDirectiveThirdParty contained set_hashed_upstream
 syn keyword ngxDirectiveThirdParty contained set_hmac_sha1
+syn keyword ngxDirectiveThirdParty contained set_hmac_sha256
 syn keyword ngxDirectiveThirdParty contained set_if_empty
 syn keyword ngxDirectiveThirdParty contained set_local_today
 syn keyword ngxDirectiveThirdParty contained set_misc_base32_padding
@@ -1841,6 +1889,7 @@ syn keyword ngxDirectiveThirdParty contained vod_notification_uri
 syn keyword ngxDirectiveThirdParty contained vod_open_file_thread_pool
 syn keyword ngxDirectiveThirdParty contained vod_output_buffer_pool
 syn keyword ngxDirectiveThirdParty contained vod_parse_hdlr_name
+syn keyword ngxDirectiveThirdParty contained vod_parse_udta_name
 syn keyword ngxDirectiveThirdParty contained vod_path_response_postfix
 syn keyword ngxDirectiveThirdParty contained vod_path_response_prefix
 syn keyword ngxDirectiveThirdParty contained vod_performance_counters
@@ -2368,9 +2417,9 @@ syn keyword ngxDirectiveThirdParty contained websockify_send_timeout
 
 " IP2Location Nginx
 " https://github.com/ip2location/ip2location-nginx
-syn keyword ngxDirectiveThirdParty contained ip2location_proxy
-syn keyword ngxDirectiveThirdParty contained ip2location_proxy_recursive
+syn keyword ngxDirectiveThirdParty contained ip2location_addresstype
 syn keyword ngxDirectiveThirdParty contained ip2location_areacode
+syn keyword ngxDirectiveThirdParty contained ip2location_category
 syn keyword ngxDirectiveThirdParty contained ip2location_city
 syn keyword ngxDirectiveThirdParty contained ip2location_country_long
 syn keyword ngxDirectiveThirdParty contained ip2location_country_short
@@ -2384,6 +2433,8 @@ syn keyword ngxDirectiveThirdParty contained ip2location_mcc
 syn keyword ngxDirectiveThirdParty contained ip2location_mnc
 syn keyword ngxDirectiveThirdParty contained ip2location_mobilebrand
 syn keyword ngxDirectiveThirdParty contained ip2location_netspeed
+syn keyword ngxDirectiveThirdParty contained ip2location_proxy
+syn keyword ngxDirectiveThirdParty contained ip2location_proxy_recursive
 syn keyword ngxDirectiveThirdParty contained ip2location_region
 syn keyword ngxDirectiveThirdParty contained ip2location_timezone
 syn keyword ngxDirectiveThirdParty contained ip2location_usagetype
@@ -2403,6 +2454,7 @@ syn keyword ngxDirectiveThirdParty contained ip2proxy_domain
 syn keyword ngxDirectiveThirdParty contained ip2proxy_isp
 syn keyword ngxDirectiveThirdParty contained ip2proxy_is_proxy
 syn keyword ngxDirectiveThirdParty contained ip2proxy_last_seen
+syn keyword ngxDirectiveThirdParty contained ip2proxy_provider
 syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy
 syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy_recursive
 syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy_type
@@ -2436,4 +2488,7 @@ hi def link ngxDirectiveThirdPartyDeprecated Error
 hi def link ngxListenOptions Keyword
 hi def link ngxListenOptionsDeprecated Error
 
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
 let b:current_syntax = "nginx"
diff --git a/html/50x.html b/html/50x.html
index 9071e0a..a57c2f9 100644
--- a/html/50x.html
+++ b/html/50x.html
@@ -3,11 +3,9 @@
 <head>
 <title>Error</title>
 <style>
-    body {
-        width: 35em;
-        margin: 0 auto;
-        font-family: Tahoma, Verdana, Arial, sans-serif;
-    }
+html { color-scheme: light dark; }
+body { width: 35em; margin: 0 auto;
+font-family: Tahoma, Verdana, Arial, sans-serif; }
 </style>
 </head>
 <body>
diff --git a/html/index.html b/html/index.html
index 2ca3b95..e8f5622 100644
--- a/html/index.html
+++ b/html/index.html
@@ -3,11 +3,9 @@
 <head>
 <title>Welcome to nginx!</title>
 <style>
-    body {
-        width: 35em;
-        margin: 0 auto;
-        font-family: Tahoma, Verdana, Arial, sans-serif;
-    }
+html { color-scheme: light dark; }
+body { width: 35em; margin: 0 auto;
+font-family: Tahoma, Verdana, Arial, sans-serif; }
 </style>
 </head>
 <body>
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 7b873a1..329b603 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1020002
-#define NGINX_VERSION      "1.20.2"
+#define nginx_version      1022000
+#define NGINX_VERSION      "1.22.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h
index 4b66562..fdcd0cd 100644
--- a/src/core/ngx_buf.h
+++ b/src/core/ngx_buf.h
@@ -90,9 +90,6 @@ struct ngx_output_chain_ctx_s {
 
 #if (NGX_HAVE_FILE_AIO || NGX_COMPAT)
     ngx_output_chain_aio_pt      aio_handler;
-#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
-    ssize_t                    (*aio_preload)(ngx_buf_t *file);
-#endif
 #endif
 
 #if (NGX_THREADS || NGX_COMPAT)
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 8339e2b..fe729a7 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -495,21 +495,24 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
                 return NGX_ERROR;
             }
 
-            if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
-                           (const void *) &reuseaddr, sizeof(int))
-                == -1)
-            {
-                ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
-                              "setsockopt(SO_REUSEADDR) %V failed",
-                              &ls[i].addr_text);
+            if (ls[i].type != SOCK_DGRAM || !ngx_test_config) {
 
-                if (ngx_close_socket(s) == -1) {
+                if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+                               (const void *) &reuseaddr, sizeof(int))
+                    == -1)
+                {
                     ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
-                                  ngx_close_socket_n " %V failed",
+                                  "setsockopt(SO_REUSEADDR) %V failed",
                                   &ls[i].addr_text);
-                }
 
-                return NGX_ERROR;
+                    if (ngx_close_socket(s) == -1) {
+                        ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
+                                      ngx_close_socket_n " %V failed",
+                                      &ls[i].addr_text);
+                    }
+
+                    return NGX_ERROR;
+                }
             }
 
 #if (NGX_HAVE_REUSEPORT)
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 4716da4..8cc1475 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -185,7 +185,7 @@ struct ngx_connection_s {
 
     unsigned            need_last_buf:1;
 
-#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
+#if (NGX_HAVE_SENDFILE_NODISKIO || NGX_COMPAT)
     unsigned            busy_count:2;
 #endif
 
diff --git a/src/core/ngx_hash.c b/src/core/ngx_hash.c
index d9c157c..8215c27 100644
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -274,6 +274,10 @@ ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, ngx_uint_t nelts)
     }
 
     for (n = 0; n < nelts; n++) {
+        if (names[n].key.data == NULL) {
+            continue;
+        }
+
         if (hinit->bucket_size < NGX_HASH_ELT_SIZE(&names[n]) + sizeof(void *))
         {
             ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0,
diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h
index 8cf3210..6fb4554 100644
--- a/src/core/ngx_module.h
+++ b/src/core/ngx_module.h
@@ -41,7 +41,7 @@
 #define NGX_MODULE_SIGNATURE_3   "0"
 #endif
 
-#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
+#if (NGX_HAVE_SENDFILE_NODISKIO || NGX_COMPAT)
 #define NGX_MODULE_SIGNATURE_4   "1"
 #else
 #define NGX_MODULE_SIGNATURE_4   "0"
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index 5c3dbe8..8570742 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -29,10 +29,6 @@
 
 static ngx_inline ngx_int_t
     ngx_output_chain_as_is(ngx_output_chain_ctx_t *ctx, ngx_buf_t *buf);
-#if (NGX_HAVE_AIO_SENDFILE)
-static ngx_int_t ngx_output_chain_aio_setup(ngx_output_chain_ctx_t *ctx,
-    ngx_file_t *file);
-#endif
 static ngx_int_t ngx_output_chain_add_copy(ngx_pool_t *pool,
     ngx_chain_t **chain, ngx_chain_t *in);
 static ngx_int_t ngx_output_chain_align_file_buf(ngx_output_chain_ctx_t *ctx,
@@ -260,10 +256,6 @@ ngx_output_chain_as_is(ngx_output_chain_ctx_t *ctx, ngx_buf_t *buf)
     }
 #endif
 
-    if (buf->in_file && buf->file->directio) {
-        return 0;
-    }
-
     sendfile = ctx->sendfile;
 
 #if (NGX_SENDFILE_LIMIT)
@@ -272,6 +264,19 @@ ngx_output_chain_as_is(ngx_output_chain_ctx_t *ctx, ngx_buf_t *buf)
         sendfile = 0;
     }
 
+#endif
+
+#if !(NGX_HAVE_SENDFILE_NODISKIO)
+
+    /*
+     * With DIRECTIO, disable sendfile() unless sendfile(SF_NOCACHE)
+     * is available.
+     */
+
+    if (buf->in_file && buf->file->directio) {
+        sendfile = 0;
+    }
+
 #endif
 
     if (!sendfile) {
@@ -283,12 +288,6 @@ ngx_output_chain_as_is(ngx_output_chain_ctx_t *ctx, ngx_buf_t *buf)
         buf->in_file = 0;
     }
 
-#if (NGX_HAVE_AIO_SENDFILE)
-    if (ctx->aio_preload && buf->in_file) {
-        (void) ngx_output_chain_aio_setup(ctx, buf->file);
-    }
-#endif
-
     if (ctx->need_in_memory && !ngx_buf_in_memory(buf)) {
         return 0;
     }
@@ -301,28 +300,6 @@ ngx_output_chain_as_is(ngx_output_chain_ctx_t *ctx, ngx_buf_t *buf)
 }
 
 
-#if (NGX_HAVE_AIO_SENDFILE)
-
-static ngx_int_t
-ngx_output_chain_aio_setup(ngx_output_chain_ctx_t *ctx, ngx_file_t *file)
-{
-    ngx_event_aio_t  *aio;
-
-    if (file->aio == NULL && ngx_file_aio_init(file, ctx->pool) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    aio = file->aio;
-
-    aio->data = ctx->filter_ctx;
-    aio->preload_handler = ctx->aio_preload;
-
-    return NGX_OK;
-}
-
-#endif
-
-
 static ngx_int_t
 ngx_output_chain_add_copy(ngx_pool_t *pool, ngx_chain_t **chain,
     ngx_chain_t *in)
@@ -803,6 +780,10 @@ ngx_chain_writer(void *data, ngx_chain_t *in)
         return NGX_ERROR;
     }
 
+    if (chain && c->write->ready) {
+        ngx_post_event(c->write, &ngx_posted_next_events);
+    }
+
     for (cl = ctx->out; cl && cl != chain; /* void */) {
         ln = cl;
         cl = cl->next;
diff --git a/src/core/ngx_rbtree.h b/src/core/ngx_rbtree.h
index 97f0e3e..e8c3582 100644
--- a/src/core/ngx_rbtree.h
+++ b/src/core/ngx_rbtree.h
@@ -47,6 +47,9 @@ struct ngx_rbtree_s {
     (tree)->sentinel = s;                                                     \
     (tree)->insert = i
 
+#define ngx_rbtree_data(node, type, link)                                     \
+    (type *) ((u_char *) (node) - offsetof(type, link))
+
 
 void ngx_rbtree_insert(ngx_rbtree_t *tree, ngx_rbtree_node_t *node);
 void ngx_rbtree_delete(ngx_rbtree_t *tree, ngx_rbtree_node_t *node);
diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c
index 52169f6..bebf3b6 100644
--- a/src/core/ngx_regex.c
+++ b/src/core/ngx_regex.c
@@ -10,15 +10,22 @@
 
 
 typedef struct {
-    ngx_flag_t  pcre_jit;
+    ngx_flag_t   pcre_jit;
+    ngx_list_t  *studies;
 } ngx_regex_conf_t;
 
 
+static ngx_inline void ngx_regex_malloc_init(ngx_pool_t *pool);
+static ngx_inline void ngx_regex_malloc_done(void);
+
+#if (NGX_PCRE2)
+static void * ngx_libc_cdecl ngx_regex_malloc(size_t size, void *data);
+static void ngx_libc_cdecl ngx_regex_free(void *p, void *data);
+#else
 static void * ngx_libc_cdecl ngx_regex_malloc(size_t size);
 static void ngx_libc_cdecl ngx_regex_free(void *p);
-#if (NGX_HAVE_PCRE_JIT)
-static void ngx_pcre_free_studies(void *data);
 #endif
+static void ngx_regex_cleanup(void *data);
 
 static ngx_int_t ngx_regex_module_init(ngx_cycle_t *cycle);
 
@@ -65,32 +72,197 @@ ngx_module_t  ngx_regex_module = {
 };
 
 
-static ngx_pool_t  *ngx_pcre_pool;
-static ngx_list_t  *ngx_pcre_studies;
+static ngx_pool_t             *ngx_regex_pool;
+static ngx_list_t             *ngx_regex_studies;
+static ngx_uint_t              ngx_regex_direct_alloc;
+
+#if (NGX_PCRE2)
+static pcre2_compile_context  *ngx_regex_compile_context;
+static pcre2_match_data       *ngx_regex_match_data;
+static ngx_uint_t              ngx_regex_match_data_size;
+#endif
 
 
 void
 ngx_regex_init(void)
 {
+#if !(NGX_PCRE2)
     pcre_malloc = ngx_regex_malloc;
     pcre_free = ngx_regex_free;
+#endif
 }
 
 
 static ngx_inline void
 ngx_regex_malloc_init(ngx_pool_t *pool)
 {
-    ngx_pcre_pool = pool;
+    ngx_regex_pool = pool;
+    ngx_regex_direct_alloc = (pool == NULL) ? 1 : 0;
 }
 
 
 static ngx_inline void
 ngx_regex_malloc_done(void)
 {
-    ngx_pcre_pool = NULL;
+    ngx_regex_pool = NULL;
+    ngx_regex_direct_alloc = 0;
 }
 
 
+#if (NGX_PCRE2)
+
+ngx_int_t
+ngx_regex_compile(ngx_regex_compile_t *rc)
+{
+    int                     n, errcode;
+    char                   *p;
+    u_char                  errstr[128];
+    size_t                  erroff;
+    uint32_t                options;
+    pcre2_code             *re;
+    ngx_regex_elt_t        *elt;
+    pcre2_general_context  *gctx;
+    pcre2_compile_context  *cctx;
+
+    if (ngx_regex_compile_context == NULL) {
+        /*
+         * Allocate a compile context if not yet allocated.  This uses
+         * direct allocations from heap, so the result can be cached
+         * even at runtime.
+         */
+
+        ngx_regex_malloc_init(NULL);
+
+        gctx = pcre2_general_context_create(ngx_regex_malloc, ngx_regex_free,
+                                            NULL);
+        if (gctx == NULL) {
+            ngx_regex_malloc_done();
+            goto nomem;
+        }
+
+        cctx = pcre2_compile_context_create(gctx);
+        if (cctx == NULL) {
+            pcre2_general_context_free(gctx);
+            ngx_regex_malloc_done();
+            goto nomem;
+        }
+
+        ngx_regex_compile_context = cctx;
+
+        pcre2_general_context_free(gctx);
+        ngx_regex_malloc_done();
+    }
+
+    options = 0;
+
+    if (rc->options & NGX_REGEX_CASELESS) {
+        options |= PCRE2_CASELESS;
+    }
+
+    if (rc->options & NGX_REGEX_MULTILINE) {
+        options |= PCRE2_MULTILINE;
+    }
+
+    if (rc->options & ~(NGX_REGEX_CASELESS|NGX_REGEX_MULTILINE)) {
+        rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
+                            "regex \"%V\" compilation failed: invalid options",
+                            &rc->pattern)
+                      - rc->err.data;
+        return NGX_ERROR;
+    }
+
+    ngx_regex_malloc_init(rc->pool);
+
+    re = pcre2_compile(rc->pattern.data, rc->pattern.len, options,
+                       &errcode, &erroff, ngx_regex_compile_context);
+
+    /* ensure that there is no current pool */
+    ngx_regex_malloc_done();
+
+    if (re == NULL) {
+        pcre2_get_error_message(errcode, errstr, 128);
+
+        if ((size_t) erroff == rc->pattern.len) {
+            rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
+                              "pcre2_compile() failed: %s in \"%V\"",
+                               errstr, &rc->pattern)
+                          - rc->err.data;
+
+        } else {
+            rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
+                              "pcre2_compile() failed: %s in \"%V\" at \"%s\"",
+                               errstr, &rc->pattern, rc->pattern.data + erroff)
+                          - rc->err.data;
+        }
+
+        return NGX_ERROR;
+    }
+
+    rc->regex = re;
+
+    /* do not study at runtime */
+
+    if (ngx_regex_studies != NULL) {
+        elt = ngx_list_push(ngx_regex_studies);
+        if (elt == NULL) {
+            goto nomem;
+        }
+
+        elt->regex = rc->regex;
+        elt->name = rc->pattern.data;
+    }
+
+    n = pcre2_pattern_info(re, PCRE2_INFO_CAPTURECOUNT, &rc->captures);
+    if (n < 0) {
+        p = "pcre2_pattern_info(\"%V\", PCRE2_INFO_CAPTURECOUNT) failed: %d";
+        goto failed;
+    }
+
+    if (rc->captures == 0) {
+        return NGX_OK;
+    }
+
+    n = pcre2_pattern_info(re, PCRE2_INFO_NAMECOUNT, &rc->named_captures);
+    if (n < 0) {
+        p = "pcre2_pattern_info(\"%V\", PCRE2_INFO_NAMECOUNT) failed: %d";
+        goto failed;
+    }
+
+    if (rc->named_captures == 0) {
+        return NGX_OK;
+    }
+
+    n = pcre2_pattern_info(re, PCRE2_INFO_NAMEENTRYSIZE, &rc->name_size);
+    if (n < 0) {
+        p = "pcre2_pattern_info(\"%V\", PCRE2_INFO_NAMEENTRYSIZE) failed: %d";
+        goto failed;
+    }
+
+    n = pcre2_pattern_info(re, PCRE2_INFO_NAMETABLE, &rc->names);
+    if (n < 0) {
+        p = "pcre2_pattern_info(\"%V\", PCRE2_INFO_NAMETABLE) failed: %d";
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    rc->err.len = ngx_snprintf(rc->err.data, rc->err.len, p, &rc->pattern, n)
+                  - rc->err.data;
+    return NGX_ERROR;
+
+nomem:
+
+    rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
+                               "regex \"%V\" compilation failed: no memory",
+                               &rc->pattern)
+                  - rc->err.data;
+    return NGX_ERROR;
+}
+
+#else
+
 ngx_int_t
 ngx_regex_compile(ngx_regex_compile_t *rc)
 {
@@ -98,11 +270,30 @@ ngx_regex_compile(ngx_regex_compile_t *rc)
     char             *p;
     pcre             *re;
     const char       *errstr;
+    ngx_uint_t        options;
     ngx_regex_elt_t  *elt;
 
+    options = 0;
+
+    if (rc->options & NGX_REGEX_CASELESS) {
+        options |= PCRE_CASELESS;
+    }
+
+    if (rc->options & NGX_REGEX_MULTILINE) {
+        options |= PCRE_MULTILINE;
+    }
+
+    if (rc->options & ~(NGX_REGEX_CASELESS|NGX_REGEX_MULTILINE)) {
+        rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
+                            "regex \"%V\" compilation failed: invalid options",
+                            &rc->pattern)
+                      - rc->err.data;
+        return NGX_ERROR;
+    }
+
     ngx_regex_malloc_init(rc->pool);
 
-    re = pcre_compile((const char *) rc->pattern.data, (int) rc->options,
+    re = pcre_compile((const char *) rc->pattern.data, (int) options,
                       &errstr, &erroff, NULL);
 
     /* ensure that there is no current pool */
@@ -113,13 +304,13 @@ ngx_regex_compile(ngx_regex_compile_t *rc)
            rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
                               "pcre_compile() failed: %s in \"%V\"",
                                errstr, &rc->pattern)
-                      - rc->err.data;
+                         - rc->err.data;
 
         } else {
            rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
                               "pcre_compile() failed: %s in \"%V\" at \"%s\"",
                                errstr, &rc->pattern, rc->pattern.data + erroff)
-                      - rc->err.data;
+                         - rc->err.data;
         }
 
         return NGX_ERROR;
@@ -134,8 +325,8 @@ ngx_regex_compile(ngx_regex_compile_t *rc)
 
     /* do not study at runtime */
 
-    if (ngx_pcre_studies != NULL) {
-        elt = ngx_list_push(ngx_pcre_studies);
+    if (ngx_regex_studies != NULL) {
+        elt = ngx_list_push(ngx_regex_studies);
         if (elt == NULL) {
             goto nomem;
         }
@@ -193,6 +384,83 @@ nomem:
     return NGX_ERROR;
 }
 
+#endif
+
+
+#if (NGX_PCRE2)
+
+ngx_int_t
+ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, int *captures, ngx_uint_t size)
+{
+    size_t      *ov;
+    ngx_int_t    rc;
+    ngx_uint_t   n, i;
+
+    /*
+     * The pcre2_match() function might allocate memory for backtracking
+     * frames, typical allocations are from 40k and above.  So the allocator
+     * is configured to do direct allocations from heap during matching.
+     */
+
+    ngx_regex_malloc_init(NULL);
+
+    if (ngx_regex_match_data == NULL
+        || size > ngx_regex_match_data_size)
+    {
+        /*
+         * Allocate a match data if not yet allocated or smaller than
+         * needed.
+         */
+
+        if (ngx_regex_match_data) {
+            pcre2_match_data_free(ngx_regex_match_data);
+        }
+
+        ngx_regex_match_data_size = size;
+        ngx_regex_match_data = pcre2_match_data_create(size / 3, NULL);
+
+        if (ngx_regex_match_data == NULL) {
+            rc = PCRE2_ERROR_NOMEMORY;
+            goto failed;
+        }
+    }
+
+    rc = pcre2_match(re, s->data, s->len, 0, 0, ngx_regex_match_data, NULL);
+
+    if (rc < 0) {
+        goto failed;
+    }
+
+    n = pcre2_get_ovector_count(ngx_regex_match_data);
+    ov = pcre2_get_ovector_pointer(ngx_regex_match_data);
+
+    if (n > size / 3) {
+        n = size / 3;
+    }
+
+    for (i = 0; i < n; i++) {
+        captures[i * 2] = ov[i * 2];
+        captures[i * 2 + 1] = ov[i * 2 + 1];
+    }
+
+failed:
+
+    ngx_regex_malloc_done();
+
+    return rc;
+}
+
+#else
+
+ngx_int_t
+ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, int *captures, ngx_uint_t size)
+{
+    return pcre_exec(re->code, re->extra, (const char *) s->data, s->len,
+                     0, 0, captures, size);
+}
+
+#endif
+
 
 ngx_int_t
 ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log)
@@ -227,14 +495,40 @@ ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log)
 }
 
 
+#if (NGX_PCRE2)
+
+static void * ngx_libc_cdecl
+ngx_regex_malloc(size_t size, void *data)
+{
+    if (ngx_regex_pool) {
+        return ngx_palloc(ngx_regex_pool, size);
+    }
+
+    if (ngx_regex_direct_alloc) {
+        return ngx_alloc(size, ngx_cycle->log);
+    }
+
+    return NULL;
+}
+
+
+static void ngx_libc_cdecl
+ngx_regex_free(void *p, void *data)
+{
+    if (ngx_regex_direct_alloc) {
+        ngx_free(p);
+    }
+
+    return;
+}
+
+#else
+
 static void * ngx_libc_cdecl
 ngx_regex_malloc(size_t size)
 {
-    ngx_pool_t      *pool;
-    pool = ngx_pcre_pool;
-
-    if (pool) {
-        return ngx_palloc(pool, size);
+    if (ngx_regex_pool) {
+        return ngx_palloc(ngx_regex_pool, size);
     }
 
     return NULL;
@@ -247,19 +541,20 @@ ngx_regex_free(void *p)
     return;
 }
 
+#endif
 
-#if (NGX_HAVE_PCRE_JIT)
 
 static void
-ngx_pcre_free_studies(void *data)
+ngx_regex_cleanup(void *data)
 {
-    ngx_list_t *studies = data;
+#if (NGX_PCRE2 || NGX_HAVE_PCRE_JIT)
+    ngx_regex_conf_t *rcf = data;
 
     ngx_uint_t        i;
     ngx_list_part_t  *part;
     ngx_regex_elt_t  *elts;
 
-    part = &studies->part;
+    part = &rcf->studies->part;
     elts = part->elts;
 
     for (i = 0; /* void */ ; i++) {
@@ -274,56 +569,83 @@ ngx_pcre_free_studies(void *data)
             i = 0;
         }
 
+        /*
+         * The PCRE JIT compiler uses mmap for its executable codes, so we
+         * have to explicitly call the pcre_free_study() function to free
+         * this memory.  In PCRE2, we call the pcre2_code_free() function
+         * for the same reason.
+         */
+
+#if (NGX_PCRE2)
+        pcre2_code_free(elts[i].regex);
+#else
         if (elts[i].regex->extra != NULL) {
             pcre_free_study(elts[i].regex->extra);
         }
+#endif
+    }
+#endif
+
+    /*
+     * On configuration parsing errors ngx_regex_module_init() will not
+     * be called.  Make sure ngx_regex_studies is properly cleared anyway.
+     */
+
+    ngx_regex_studies = NULL;
+
+#if (NGX_PCRE2)
+
+    /*
+     * Free compile context and match data.  If needed at runtime by
+     * the new cycle, these will be re-allocated.
+     */
+
+    if (ngx_regex_compile_context) {
+        pcre2_compile_context_free(ngx_regex_compile_context);
+        ngx_regex_compile_context = NULL;
+    }
+
+    if (ngx_regex_match_data) {
+        pcre2_match_data_free(ngx_regex_match_data);
+        ngx_regex_match_data = NULL;
+        ngx_regex_match_data_size = 0;
     }
-}
 
 #endif
+}
 
 
 static ngx_int_t
 ngx_regex_module_init(ngx_cycle_t *cycle)
 {
-    int               opt;
-    const char       *errstr;
-    ngx_uint_t        i;
-    ngx_list_part_t  *part;
-    ngx_regex_elt_t  *elts;
+    int                opt;
+#if !(NGX_PCRE2)
+    const char        *errstr;
+#endif
+    ngx_uint_t         i;
+    ngx_list_part_t   *part;
+    ngx_regex_elt_t   *elts;
+    ngx_regex_conf_t  *rcf;
 
     opt = 0;
 
-#if (NGX_HAVE_PCRE_JIT)
-    {
-    ngx_regex_conf_t    *rcf;
-    ngx_pool_cleanup_t  *cln;
-
     rcf = (ngx_regex_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_regex_module);
 
+#if (NGX_PCRE2 || NGX_HAVE_PCRE_JIT)
+
     if (rcf->pcre_jit) {
+#if (NGX_PCRE2)
+        opt = 1;
+#else
         opt = PCRE_STUDY_JIT_COMPILE;
-
-        /*
-         * The PCRE JIT compiler uses mmap for its executable codes, so we
-         * have to explicitly call the pcre_free_study() function to free
-         * this memory.
-         */
-
-        cln = ngx_pool_cleanup_add(cycle->pool, 0);
-        if (cln == NULL) {
-            return NGX_ERROR;
-        }
-
-        cln->handler = ngx_pcre_free_studies;
-        cln->data = ngx_pcre_studies;
-    }
+#endif
     }
+
 #endif
 
     ngx_regex_malloc_init(cycle->pool);
 
-    part = &ngx_pcre_studies->part;
+    part = &rcf->studies->part;
     elts = part->elts;
 
     for (i = 0; /* void */ ; i++) {
@@ -338,6 +660,23 @@ ngx_regex_module_init(ngx_cycle_t *cycle)
             i = 0;
         }
 
+#if (NGX_PCRE2)
+
+        if (opt) {
+            int  n;
+
+            n = pcre2_jit_compile(elts[i].regex, PCRE2_JIT_COMPLETE);
+
+            if (n != 0) {
+                ngx_log_error(NGX_LOG_INFO, cycle->log, 0,
+                              "pcre2_jit_compile() failed: %d in \"%s\", "
+                              "ignored",
+                              n, elts[i].name);
+            }
+        }
+
+#else
+
         elts[i].regex->extra = pcre_study(elts[i].regex->code, opt, &errstr);
 
         if (errstr != NULL) {
@@ -360,12 +699,16 @@ ngx_regex_module_init(ngx_cycle_t *cycle)
                               elts[i].name);
             }
         }
+#endif
 #endif
     }
 
     ngx_regex_malloc_done();
 
-    ngx_pcre_studies = NULL;
+    ngx_regex_studies = NULL;
+#if (NGX_PCRE2)
+    ngx_regex_compile_context = NULL;
+#endif
 
     return NGX_OK;
 }
@@ -374,7 +717,8 @@ ngx_regex_module_init(ngx_cycle_t *cycle)
 static void *
 ngx_regex_create_conf(ngx_cycle_t *cycle)
 {
-    ngx_regex_conf_t  *rcf;
+    ngx_regex_conf_t    *rcf;
+    ngx_pool_cleanup_t  *cln;
 
     rcf = ngx_pcalloc(cycle->pool, sizeof(ngx_regex_conf_t));
     if (rcf == NULL) {
@@ -383,11 +727,21 @@ ngx_regex_create_conf(ngx_cycle_t *cycle)
 
     rcf->pcre_jit = NGX_CONF_UNSET;
 
-    ngx_pcre_studies = ngx_list_create(cycle->pool, 8, sizeof(ngx_regex_elt_t));
-    if (ngx_pcre_studies == NULL) {
+    cln = ngx_pool_cleanup_add(cycle->pool, 0);
+    if (cln == NULL) {
         return NULL;
     }
 
+    cln->handler = ngx_regex_cleanup;
+    cln->data = rcf;
+
+    rcf->studies = ngx_list_create(cycle->pool, 8, sizeof(ngx_regex_elt_t));
+    if (rcf->studies == NULL) {
+        return NULL;
+    }
+
+    ngx_regex_studies = rcf->studies;
+
     return rcf;
 }
 
@@ -412,7 +766,21 @@ ngx_regex_pcre_jit(ngx_conf_t *cf, void *post, void *data)
         return NGX_CONF_OK;
     }
 
-#if (NGX_HAVE_PCRE_JIT)
+#if (NGX_PCRE2)
+    {
+    int       r;
+    uint32_t  jit;
+
+    jit = 0;
+    r = pcre2_config(PCRE2_CONFIG_JIT, &jit);
+
+    if (r != 0 || jit != 1) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "PCRE2 library does not support JIT");
+        *fp = 0;
+    }
+    }
+#elif (NGX_HAVE_PCRE_JIT)
     {
     int  jit, r;
 
diff --git a/src/core/ngx_regex.h b/src/core/ngx_regex.h
index 680486c..182373a 100644
--- a/src/core/ngx_regex.h
+++ b/src/core/ngx_regex.h
@@ -12,24 +12,38 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 
+
+#if (NGX_PCRE2)
+
+#define PCRE2_CODE_UNIT_WIDTH  8
+#include <pcre2.h>
+
+#define NGX_REGEX_NO_MATCHED   PCRE2_ERROR_NOMATCH   /* -1 */
+
+typedef pcre2_code  ngx_regex_t;
+
+#else
+
 #include <pcre.h>
 
-
-#define NGX_REGEX_NO_MATCHED  PCRE_ERROR_NOMATCH   /* -1 */
-
-#define NGX_REGEX_CASELESS    PCRE_CASELESS
-
+#define NGX_REGEX_NO_MATCHED   PCRE_ERROR_NOMATCH    /* -1 */
 
 typedef struct {
     pcre        *code;
     pcre_extra  *extra;
 } ngx_regex_t;
 
+#endif
+
+
+#define NGX_REGEX_CASELESS     0x00000001
+#define NGX_REGEX_MULTILINE    0x00000002
+
 
 typedef struct {
     ngx_str_t     pattern;
     ngx_pool_t   *pool;
-    ngx_int_t     options;
+    ngx_uint_t    options;
 
     ngx_regex_t  *regex;
     int           captures;
@@ -49,10 +63,14 @@ typedef struct {
 void ngx_regex_init(void);
 ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc);
 
-#define ngx_regex_exec(re, s, captures, size)                                \
-    pcre_exec(re->code, re->extra, (const char *) (s)->data, (s)->len, 0, 0, \
-              captures, size)
-#define ngx_regex_exec_n      "pcre_exec()"
+ngx_int_t ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, int *captures,
+    ngx_uint_t size);
+
+#if (NGX_PCRE2)
+#define ngx_regex_exec_n       "pcre2_match()"
+#else
+#define ngx_regex_exec_n       "pcre_exec()"
+#endif
 
 ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log);
 
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 58d5f3e..6d129e5 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -51,9 +51,7 @@ typedef struct {
 } ngx_resolver_an_t;
 
 
-#define ngx_resolver_node(n)                                                 \
-    (ngx_resolver_node_t *)                                                  \
-        ((u_char *) (n) - offsetof(ngx_resolver_node_t, node))
+#define ngx_resolver_node(n)  ngx_rbtree_data(n, ngx_resolver_node_t, node)
 
 
 static ngx_int_t ngx_udp_connect(ngx_resolver_connection_t *rec);
diff --git a/src/core/ngx_rwlock.c b/src/core/ngx_rwlock.c
index ed2b0f8..e7da8a8 100644
--- a/src/core/ngx_rwlock.c
+++ b/src/core/ngx_rwlock.c
@@ -89,22 +89,10 @@ ngx_rwlock_rlock(ngx_atomic_t *lock)
 void
 ngx_rwlock_unlock(ngx_atomic_t *lock)
 {
-    ngx_atomic_uint_t  readers;
-
-    readers = *lock;
-
-    if (readers == NGX_RWLOCK_WLOCK) {
+    if (*lock == NGX_RWLOCK_WLOCK) {
         (void) ngx_atomic_cmp_set(lock, NGX_RWLOCK_WLOCK, 0);
-        return;
-    }
-
-    for ( ;; ) {
-
-        if (ngx_atomic_cmp_set(lock, readers, readers - 1)) {
-            return;
-        }
-
-        readers = *lock;
+    } else {
+        (void) ngx_atomic_fetch_add(lock, -1);
     }
 }
 
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 93f32ea..98f270a 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -1493,19 +1493,32 @@ ngx_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
     uint32_t       *escape;
     static u_char   hex[] = "0123456789ABCDEF";
 
-                    /* " ", "#", "%", "?", %00-%1F, %7F-%FF */
+    /*
+     * Per RFC 3986 only the following chars are allowed in URIs unescaped:
+     *
+     * unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+     * gen-delims    = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+     * sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+     *               / "*" / "+" / "," / ";" / "="
+     *
+     * And "%" can appear as a part of escaping itself.  The following
+     * characters are not allowed and need to be escaped: %00-%1F, %7F-%FF,
+     * " ", """, "<", ">", "\", "^", "`", "{", "|", "}".
+     */
+
+                    /* " ", "#", "%", "?", not allowed */
 
     static uint32_t   uri[] = {
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
 
                     /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0x80000029, /* 1000 0000 0000 0000  0000 0000 0010 1001 */
+        0xd000002d, /* 1101 0000 0000 0000  0000 0000 0010 1101 */
 
                     /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+        0x50000000, /* 0101 0000 0000 0000  0000 0000 0000 0000 */
 
                     /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
+        0xb8000001, /* 1011 1000 0000 0000  0000 0000 0000 0001 */
 
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
@@ -1513,19 +1526,19 @@ ngx_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
         0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
     };
 
-                    /* " ", "#", "%", "&", "+", "?", %00-%1F, %7F-%FF */
+                    /* " ", "#", "%", "&", "+", ";", "?", not allowed */
 
     static uint32_t   args[] = {
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
 
                     /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0x88000869, /* 1000 1000 0000 0000  0000 1000 0110 1001 */
+        0xd800086d, /* 1101 1000 0000 0000  0000 1000 0110 1101 */
 
                     /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+        0x50000000, /* 0101 0000 0000 0000  0000 0000 0000 0000 */
 
                     /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
+        0xb8000001, /* 1011 1000 0000 0000  0000 0000 0000 0001 */
 
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
@@ -1553,19 +1566,19 @@ ngx_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
         0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
     };
 
-                    /* " ", "#", """, "%", "'", %00-%1F, %7F-%FF */
+                    /* " ", "#", """, "%", "'", not allowed */
 
     static uint32_t   html[] = {
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
 
                     /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0x000000ad, /* 0000 0000 0000 0000  0000 0000 1010 1101 */
+        0x500000ad, /* 0101 0000 0000 0000  0000 0000 1010 1101 */
 
                     /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+        0x50000000, /* 0101 0000 0000 0000  0000 0000 0000 0000 */
 
                     /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
+        0xb8000001, /* 1011 1000 0000 0000  0000 0000 0000 0001 */
 
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
@@ -1573,19 +1586,19 @@ ngx_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
         0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
     };
 
-                    /* " ", """, "%", "'", %00-%1F, %7F-%FF */
+                    /* " ", """, "'", not allowed */
 
     static uint32_t   refresh[] = {
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
 
                     /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0x00000085, /* 0000 0000 0000 0000  0000 0000 1000 0101 */
+        0x50000085, /* 0101 0000 0000 0000  0000 0000 1000 0101 */
 
                     /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+        0x50000000, /* 0101 0000 0000 0000  0000 0000 0000 0000 */
 
                     /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
+        0xd8000001, /* 1011 1000 0000 0000  0000 0000 0000 0001 */
 
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
         0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c
index 7964b00..16788c9 100644
--- a/src/core/ngx_times.c
+++ b/src/core/ngx_times.c
@@ -200,10 +200,6 @@ ngx_monotonic_time(time_t sec, ngx_uint_t msec)
 
 #if defined(CLOCK_MONOTONIC_FAST)
     clock_gettime(CLOCK_MONOTONIC_FAST, &ts);
-
-#elif defined(CLOCK_MONOTONIC_COARSE)
-    clock_gettime(CLOCK_MONOTONIC_COARSE, &ts);
-
 #else
     clock_gettime(CLOCK_MONOTONIC, &ts);
 #endif
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 7777d04..47229b5 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -55,6 +55,7 @@ ngx_uint_t            ngx_accept_events;
 ngx_uint_t            ngx_accept_mutex_held;
 ngx_msec_t            ngx_accept_mutex_delay;
 ngx_int_t             ngx_accept_disabled;
+ngx_uint_t            ngx_use_exclusive_accept;
 
 
 #if (NGX_STAT_STUB)
@@ -441,20 +442,23 @@ ngx_event_init_conf(ngx_cycle_t *cycle, void *conf)
 
 #if (NGX_HAVE_REUSEPORT)
 
-    ls = cycle->listening.elts;
-    for (i = 0; i < cycle->listening.nelts; i++) {
-
-        if (!ls[i].reuseport || ls[i].worker != 0) {
-            continue;
-        }
-
-        if (ngx_clone_listening(cycle, &ls[i]) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-
-        /* cloning may change cycle->listening.elts */
+    if (!ngx_test_config) {
 
         ls = cycle->listening.elts;
+        for (i = 0; i < cycle->listening.nelts; i++) {
+
+            if (!ls[i].reuseport || ls[i].worker != 0) {
+                continue;
+            }
+
+            if (ngx_clone_listening(cycle, &ls[i]) != NGX_OK) {
+                return NGX_CONF_ERROR;
+            }
+
+            /* cloning may change cycle->listening.elts */
+
+            ls = cycle->listening.elts;
+        }
     }
 
 #endif
@@ -641,6 +645,8 @@ ngx_event_process_init(ngx_cycle_t *cycle)
 
 #endif
 
+    ngx_use_exclusive_accept = 0;
+
     ngx_queue_init(&ngx_posted_accept_events);
     ngx_queue_init(&ngx_posted_next_events);
     ngx_queue_init(&ngx_posted_events);
@@ -886,6 +892,8 @@ ngx_event_process_init(ngx_cycle_t *cycle)
         if ((ngx_event_flags & NGX_USE_EPOLL_EVENT)
             && ccf->worker_processes > 1)
         {
+            ngx_use_exclusive_accept = 1;
+
             if (ngx_add_event(rev, NGX_READ_EVENT, NGX_EXCLUSIVE_EVENT)
                 == NGX_ERROR)
             {
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 97f9673..548c906 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -147,10 +147,6 @@ struct ngx_event_aio_s {
 
     ngx_fd_t                   fd;
 
-#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
-    ssize_t                  (*preload_handler)(ngx_buf_t *file);
-#endif
-
 #if (NGX_HAVE_EVENTFD)
     int64_t                    res;
 #endif
@@ -466,6 +462,7 @@ extern ngx_uint_t             ngx_accept_events;
 extern ngx_uint_t             ngx_accept_mutex_held;
 extern ngx_msec_t             ngx_accept_mutex_delay;
 extern ngx_int_t              ngx_accept_disabled;
+extern ngx_uint_t             ngx_use_exclusive_accept;
 
 
 #if (NGX_STAT_STUB)
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index b05666c..2703879 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -11,6 +11,9 @@
 
 
 static ngx_int_t ngx_disable_accept_events(ngx_cycle_t *cycle, ngx_uint_t all);
+#if (NGX_HAVE_EPOLLEXCLUSIVE)
+static void ngx_reorder_accept_events(ngx_listening_t *ls);
+#endif
 static void ngx_close_accepted_connection(ngx_connection_t *c);
 
 
@@ -314,6 +317,10 @@ ngx_event_accept(ngx_event_t *ev)
         }
 
     } while (ev->available);
+
+#if (NGX_HAVE_EPOLLEXCLUSIVE)
+    ngx_reorder_accept_events(ls);
+#endif
 }
 
 
@@ -420,6 +427,57 @@ ngx_disable_accept_events(ngx_cycle_t *cycle, ngx_uint_t all)
 }
 
 
+#if (NGX_HAVE_EPOLLEXCLUSIVE)
+
+static void
+ngx_reorder_accept_events(ngx_listening_t *ls)
+{
+    ngx_connection_t  *c;
+
+    /*
+     * Linux with EPOLLEXCLUSIVE usually notifies only the process which
+     * was first to add the listening socket to the epoll instance.  As
+     * a result most of the connections are handled by the first worker
+     * process.  To fix this, we re-add the socket periodically, so other
+     * workers will get a chance to accept connections.
+     */
+
+    if (!ngx_use_exclusive_accept) {
+        return;
+    }
+
+#if (NGX_HAVE_REUSEPORT)
+
+    if (ls->reuseport) {
+        return;
+    }
+
+#endif
+
+    c = ls->connection;
+
+    if (c->requests++ % 16 != 0
+        && ngx_accept_disabled <= 0)
+    {
+        return;
+    }
+
+    if (ngx_del_event(c->read, NGX_READ_EVENT, NGX_DISABLE_EVENT)
+        == NGX_ERROR)
+    {
+        return;
+    }
+
+    if (ngx_add_event(c->read, NGX_READ_EVENT, NGX_EXCLUSIVE_EVENT)
+        == NGX_ERROR)
+    {
+        return;
+    }
+}
+
+#endif
+
+
 static void
 ngx_close_accepted_connection(ngx_connection_t *c)
 {
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index ce2a566..1e6fc96 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -47,6 +47,8 @@ static void ngx_ssl_write_handler(ngx_event_t *wev);
 static ssize_t ngx_ssl_write_early(ngx_connection_t *c, u_char *data,
     size_t size);
 #endif
+static ssize_t ngx_ssl_sendfile(ngx_connection_t *c, ngx_buf_t *file,
+    size_t size);
 static void ngx_ssl_read_handler(ngx_event_t *rev);
 static void ngx_ssl_shutdown_handler(ngx_event_t *ev);
 static void ngx_ssl_connection_error(ngx_connection_t *c, int sslerr,
@@ -299,11 +301,6 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
     SSL_CTX_set_options(ssl->ctx, SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER);
 #endif
 
-#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING
-    /* this option allow a potential SSL 2.0 rollback (CAN-2005-2969) */
-    SSL_CTX_set_options(ssl->ctx, SSL_OP_MSIE_SSLV2_RSA_PADDING);
-#endif
-
 #ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG
     SSL_CTX_set_options(ssl->ctx, SSL_OP_SSLEAY_080_CLIENT_DH_BUG);
 #endif
@@ -863,11 +860,6 @@ ngx_ssl_ciphers(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *ciphers,
         SSL_CTX_set_options(ssl->ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
     }
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
-    /* a temporary 512-bit RSA key is required for export versions of MSIE */
-    SSL_CTX_set_tmp_rsa_callback(ssl->ctx, ngx_ssl_rsa512_key_callback);
-#endif
-
     return NGX_OK;
 }
 
@@ -1120,32 +1112,6 @@ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
 }
 
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
-
-RSA *
-ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export,
-    int key_length)
-{
-    static RSA  *key;
-
-    if (key_length != 512) {
-        return NULL;
-    }
-
-#ifndef OPENSSL_NO_DEPRECATED
-
-    if (key == NULL) {
-        key = RSA_generate_key(512, RSA_F4, NULL, NULL);
-    }
-
-#endif
-
-    return key;
-}
-
-#endif
-
-
 ngx_array_t *
 ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file)
 {
@@ -1417,6 +1383,9 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
     if (SSL_CTX_set0_tmp_dh_pkey(ssl->ctx, dh) != 1) {
         ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
                       "SSL_CTX_set0_tmp_dh_pkey(\%s\") failed", file->data);
+#if (OPENSSL_VERSION_NUMBER >= 0x3000001fL)
+        EVP_PKEY_free(dh);
+#endif
         BIO_free(bio);
         return NGX_ERROR;
     }
@@ -1798,6 +1767,16 @@ ngx_ssl_handshake(ngx_connection_t *c)
 
 #endif
 #endif
+#endif
+
+#ifdef BIO_get_ktls_send
+
+        if (BIO_get_ktls_send(SSL_get_wbio(c->ssl->connection)) == 1) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "BIO_get_ktls_send(): 1");
+            c->ssl->sendfile = 1;
+        }
+
 #endif
 
         rc = ngx_ssl_ocsp_validate(c);
@@ -1935,6 +1914,16 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
         c->read->ready = 1;
         c->write->ready = 1;
 
+#ifdef BIO_get_ktls_send
+
+        if (BIO_get_ktls_send(SSL_get_wbio(c->ssl->connection)) == 1) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "BIO_get_ktls_send(): 1");
+            c->ssl->sendfile = 1;
+        }
+
+#endif
+
         rc = ngx_ssl_ocsp_validate(c);
 
         if (rc == NGX_ERROR) {
@@ -2538,10 +2527,11 @@ ngx_ssl_write_handler(ngx_event_t *wev)
 ngx_chain_t *
 ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 {
-    int          n;
-    ngx_uint_t   flush;
-    ssize_t      send, size;
-    ngx_buf_t   *buf;
+    int           n;
+    ngx_uint_t    flush;
+    ssize_t       send, size, file_size;
+    ngx_buf_t    *buf;
+    ngx_chain_t  *cl;
 
     if (!c->ssl->buffer) {
 
@@ -2615,6 +2605,11 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
                 continue;
             }
 
+            if (in->buf->in_file && c->ssl->sendfile) {
+                flush = 1;
+                break;
+            }
+
             size = in->buf->last - in->buf->pos;
 
             if (size > buf->end - buf->last) {
@@ -2646,8 +2641,35 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
         size = buf->last - buf->pos;
 
         if (size == 0) {
+
+            if (in && in->buf->in_file && send < limit) {
+
+                /* coalesce the neighbouring file bufs */
+
+                cl = in;
+                file_size = (size_t) ngx_chain_coalesce_file(&cl, limit - send);
+
+                n = ngx_ssl_sendfile(c, in->buf, file_size);
+
+                if (n == NGX_ERROR) {
+                    return NGX_CHAIN_ERROR;
+                }
+
+                if (n == NGX_AGAIN) {
+                    break;
+                }
+
+                in = ngx_chain_update_sent(in, n);
+
+                send += n;
+                flush = 0;
+
+                continue;
+            }
+
             buf->flush = 0;
             c->buffered &= ~NGX_SSL_BUFFERED;
+
             return in;
         }
 
@@ -2672,7 +2694,7 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
         buf->pos = buf->start;
         buf->last = buf->start;
 
-        if (in == NULL || send == limit) {
+        if (in == NULL || send >= limit) {
             break;
         }
     }
@@ -2803,7 +2825,7 @@ ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size)
 
 #ifdef SSL_READ_EARLY_DATA_SUCCESS
 
-ssize_t
+static ssize_t
 ngx_ssl_write_early(ngx_connection_t *c, u_char *data, size_t size)
 {
     int        n, sslerr;
@@ -2918,6 +2940,183 @@ ngx_ssl_write_early(ngx_connection_t *c, u_char *data, size_t size)
 #endif
 
 
+static ssize_t
+ngx_ssl_sendfile(ngx_connection_t *c, ngx_buf_t *file, size_t size)
+{
+#ifdef BIO_get_ktls_send
+
+    int        sslerr, flags;
+    ssize_t    n;
+    ngx_err_t  err;
+
+    ngx_ssl_clear_error(c->log);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "SSL to sendfile: @%O %uz",
+                   file->file_pos, size);
+
+    ngx_set_errno(0);
+
+#if (NGX_HAVE_SENDFILE_NODISKIO)
+
+    flags = (c->busy_count <= 2) ? SF_NODISKIO : 0;
+
+    if (file->file->directio) {
+        flags |= SF_NOCACHE;
+    }
+
+#else
+    flags = 0;
+#endif
+
+    n = SSL_sendfile(c->ssl->connection, file->file->fd, file->file_pos,
+                     size, flags);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_sendfile: %d", n);
+
+    if (n > 0) {
+
+        if (c->ssl->saved_read_handler) {
+
+            c->read->handler = c->ssl->saved_read_handler;
+            c->ssl->saved_read_handler = NULL;
+            c->read->ready = 1;
+
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            ngx_post_event(c->read, &ngx_posted_events);
+        }
+
+#if (NGX_HAVE_SENDFILE_NODISKIO)
+        c->busy_count = 0;
+#endif
+
+        c->sent += n;
+
+        return n;
+    }
+
+    if (n == 0) {
+
+        /*
+         * if sendfile returns zero, then someone has truncated the file,
+         * so the offset became beyond the end of the file
+         */
+
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "SSL_sendfile() reported that \"%s\" was truncated at %O",
+                      file->file->name.data, file->file_pos);
+
+        return NGX_ERROR;
+    }
+
+    sslerr = SSL_get_error(c->ssl->connection, n);
+
+    if (sslerr == SSL_ERROR_ZERO_RETURN) {
+
+        /*
+         * OpenSSL fails to return SSL_ERROR_SYSCALL if an error
+         * happens during writing after close_notify alert from the
+         * peer, and returns SSL_ERROR_ZERO_RETURN instead
+         */
+
+        sslerr = SSL_ERROR_SYSCALL;
+    }
+
+    if (sslerr == SSL_ERROR_SSL
+        && ERR_GET_REASON(ERR_peek_error()) == SSL_R_UNINITIALIZED
+        && ngx_errno != 0)
+    {
+        /*
+         * OpenSSL fails to return SSL_ERROR_SYSCALL if an error
+         * happens in sendfile(), and returns SSL_ERROR_SSL with
+         * SSL_R_UNINITIALIZED reason instead
+         */
+
+        sslerr = SSL_ERROR_SYSCALL;
+    }
+
+    err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d", sslerr);
+
+    if (sslerr == SSL_ERROR_WANT_WRITE) {
+
+        if (c->ssl->saved_read_handler) {
+
+            c->read->handler = c->ssl->saved_read_handler;
+            c->ssl->saved_read_handler = NULL;
+            c->read->ready = 1;
+
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            ngx_post_event(c->read, &ngx_posted_events);
+        }
+
+#if (NGX_HAVE_SENDFILE_NODISKIO)
+
+        if (ngx_errno == EBUSY) {
+            c->busy_count++;
+
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "SSL_sendfile() busy, count:%d", c->busy_count);
+
+            if (c->write->posted) {
+                ngx_delete_posted_event(c->write);
+            }
+
+            ngx_post_event(c->write, &ngx_posted_next_events);
+        }
+
+#endif
+
+        c->write->ready = 0;
+        return NGX_AGAIN;
+    }
+
+    if (sslerr == SSL_ERROR_WANT_READ) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "SSL_sendfile: want read");
+
+        c->read->ready = 0;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        /*
+         * we do not set the timer because there is already
+         * the write event timer
+         */
+
+        if (c->ssl->saved_read_handler == NULL) {
+            c->ssl->saved_read_handler = c->read->handler;
+            c->read->handler = ngx_ssl_read_handler;
+        }
+
+        return NGX_AGAIN;
+    }
+
+    c->ssl->no_wait_shutdown = 1;
+    c->ssl->no_send_shutdown = 1;
+    c->write->error = 1;
+
+    ngx_ssl_connection_error(c, sslerr, err, "SSL_sendfile() failed");
+
+#else
+    ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                  "SSL_sendfile() not available");
+#endif
+
+    return NGX_ERROR;
+}
+
+
 static void
 ngx_ssl_read_handler(ngx_event_t *rev)
 {
@@ -3169,6 +3368,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
 #endif
 #ifdef SSL_R_CALLBACK_FAILED
             || n == SSL_R_CALLBACK_FAILED                            /*  234 */
+#endif
+#ifdef SSL_R_NO_APPLICATION_PROTOCOL
+            || n == SSL_R_NO_APPLICATION_PROTOCOL                    /*  235 */
 #endif
             || n == SSL_R_UNEXPECTED_MESSAGE                         /*  244 */
             || n == SSL_R_UNEXPECTED_RECORD                          /*  245 */
@@ -4249,7 +4451,21 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
             return -1;
         }
 
-        return (i == 0) ? 1 : 2 /* renew */;
+        /* renew if TLSv1.3 */
+
+#ifdef TLS1_3_VERSION
+        if (SSL_version(ssl_conn) == TLS1_3_VERSION) {
+            return 2;
+        }
+#endif
+
+        /* renew if non-default key */
+
+        if (i != 0) {
+            return 2;
+        }
+
+        return 1;
     }
 }
 
@@ -4567,6 +4783,42 @@ ngx_ssl_get_ciphers(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 }
 
 
+ngx_int_t
+ngx_ssl_get_curve(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+#ifdef SSL_get_negotiated_group
+
+    int  nid;
+
+    nid = SSL_get_negotiated_group(c->ssl->connection);
+
+    if (nid != NID_undef) {
+
+        if ((nid & TLSEXT_nid_unknown) == 0) {
+            s->len = ngx_strlen(OBJ_nid2sn(nid));
+            s->data = (u_char *) OBJ_nid2sn(nid);
+            return NGX_OK;
+        }
+
+        s->len = sizeof("0x0000") - 1;
+
+        s->data = ngx_pnalloc(pool, s->len);
+        if (s->data == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_sprintf(s->data, "0x%04xd", nid & 0xffff);
+
+        return NGX_OK;
+    }
+
+#endif
+
+    s->len = 0;
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_ssl_get_curves(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 {
@@ -4734,6 +4986,36 @@ ngx_ssl_get_server_name(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 }
 
 
+ngx_int_t
+ngx_ssl_get_alpn_protocol(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+
+    unsigned int          len;
+    const unsigned char  *data;
+
+    SSL_get0_alpn_selected(c->ssl->connection, &data, &len);
+
+    if (len > 0) {
+
+        s->data = ngx_pnalloc(pool, len);
+        if (s->data == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(s->data, data, len);
+        s->len = len;
+
+        return NGX_OK;
+    }
+
+#endif
+
+    s->len = 0;
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_ssl_get_raw_certificate(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 {
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 81b87d7..c9e86d9 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -29,7 +29,6 @@
 #include <openssl/ocsp.h>
 #endif
 #include <openssl/rand.h>
-#include <openssl/rsa.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
@@ -110,6 +109,7 @@ struct ngx_ssl_connection_s {
     unsigned                    handshake_rejected:1;
     unsigned                    renegotiation:1;
     unsigned                    buffer:1;
+    unsigned                    sendfile:1;
     unsigned                    no_wait_shutdown:1;
     unsigned                    no_send_shutdown:1;
     unsigned                    shutdown_without_free:1;
@@ -208,10 +208,6 @@ ngx_int_t ngx_ssl_ocsp_validate(ngx_connection_t *c);
 ngx_int_t ngx_ssl_ocsp_get_status(ngx_connection_t *c, const char **s);
 void ngx_ssl_ocsp_cleanup(ngx_connection_t *c);
 ngx_int_t ngx_ssl_ocsp_cache_init(ngx_shm_zone_t *shm_zone, void *data);
-#if (OPENSSL_VERSION_NUMBER < 0x10100001L && !defined LIBRESSL_VERSION_NUMBER)
-RSA *ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export,
-    int key_length);
-#endif
 ngx_array_t *ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file);
 ngx_array_t *ngx_ssl_preserve_passwords(ngx_conf_t *cf,
     ngx_array_t *passwords);
@@ -260,6 +256,8 @@ ngx_int_t ngx_ssl_get_cipher_name(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_ciphers(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
+ngx_int_t ngx_ssl_get_curve(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
 ngx_int_t ngx_ssl_get_curves(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool,
@@ -270,6 +268,8 @@ ngx_int_t ngx_ssl_get_early_data(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_server_name(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
+ngx_int_t ngx_ssl_get_alpn_protocol(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
 ngx_int_t ngx_ssl_get_raw_certificate(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_certificate(ngx_connection_t *c, ngx_pool_t *pool,
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
index 698b88f..35052bc 100644
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -73,7 +73,7 @@ ngx_event_expire_timers(void)
             return;
         }
 
-        ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer));
+        ev = ngx_rbtree_data(node, ngx_event_t, timer);
 
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
                        "event timer del: %d: %M",
@@ -113,7 +113,7 @@ ngx_event_no_timers_left(void)
          node;
          node = ngx_rbtree_next(&ngx_event_timer_rbtree, node))
     {
-        ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer));
+        ev = ngx_rbtree_data(node, ngx_event_t, timer);
 
         if (!ev->cancelable) {
             return NGX_AGAIN;
diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c
index ed9df34..0693319 100644
--- a/src/http/modules/ngx_http_auth_basic_module.c
+++ b/src/http/modules/ngx_http_auth_basic_module.c
@@ -16,7 +16,7 @@
 
 typedef struct {
     ngx_http_complex_value_t  *realm;
-    ngx_http_complex_value_t   user_file;
+    ngx_http_complex_value_t  *user_file;
 } ngx_http_auth_basic_loc_conf_t;
 
 
@@ -107,7 +107,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
 
     alcf = ngx_http_get_module_loc_conf(r, ngx_http_auth_basic_module);
 
-    if (alcf->realm == NULL || alcf->user_file.value.data == NULL) {
+    if (alcf->realm == NULL || alcf->user_file == NULL) {
         return NGX_DECLINED;
     }
 
@@ -133,7 +133,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    if (ngx_http_complex_value(r, &alcf->user_file, &user_file) != NGX_OK) {
+    if (ngx_http_complex_value(r, alcf->user_file, &user_file) != NGX_OK) {
         return NGX_ERROR;
     }
 
@@ -357,6 +357,9 @@ ngx_http_auth_basic_create_loc_conf(ngx_conf_t *cf)
         return NULL;
     }
 
+    conf->realm = NGX_CONF_UNSET_PTR;
+    conf->user_file = NGX_CONF_UNSET_PTR;
+
     return conf;
 }
 
@@ -367,13 +370,8 @@ ngx_http_auth_basic_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_http_auth_basic_loc_conf_t  *prev = parent;
     ngx_http_auth_basic_loc_conf_t  *conf = child;
 
-    if (conf->realm == NULL) {
-        conf->realm = prev->realm;
-    }
-
-    if (conf->user_file.value.data == NULL) {
-        conf->user_file = prev->user_file;
-    }
+    ngx_conf_merge_ptr_value(conf->realm, prev->realm, NULL);
+    ngx_conf_merge_ptr_value(conf->user_file, prev->user_file, NULL);
 
     return NGX_CONF_OK;
 }
@@ -406,17 +404,22 @@ ngx_http_auth_basic_user_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_str_t                         *value;
     ngx_http_compile_complex_value_t   ccv;
 
-    if (alcf->user_file.value.data) {
+    if (alcf->user_file != NGX_CONF_UNSET_PTR) {
         return "is duplicate";
     }
 
+    alcf->user_file = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+    if (alcf->user_file == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
     value = cf->args->elts;
 
     ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
 
     ccv.cf = cf;
     ccv.value = &value[1];
-    ccv.complex_value = &alcf->user_file;
+    ccv.complex_value = alcf->user_file;
     ccv.zero = 1;
     ccv.conf_prefix = 1;
 
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 8b69e6f..0cc9ae1 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -1072,6 +1072,10 @@ ngx_http_dav_error(ngx_log_t *log, ngx_err_t err, ngx_int_t not_found,
 static ngx_int_t
 ngx_http_dav_location(ngx_http_request_t *r)
 {
+    u_char     *p;
+    size_t      len;
+    uintptr_t   escape;
+
     r->headers_out.location = ngx_list_push(&r->headers_out.headers);
     if (r->headers_out.location == NULL) {
         return NGX_ERROR;
@@ -1079,7 +1083,26 @@ ngx_http_dav_location(ngx_http_request_t *r)
 
     r->headers_out.location->hash = 1;
     ngx_str_set(&r->headers_out.location->key, "Location");
-    r->headers_out.location->value = r->uri;
+
+    escape = 2 * ngx_escape_uri(NULL, r->uri.data, r->uri.len, NGX_ESCAPE_URI);
+
+    if (escape) {
+        len = r->uri.len + escape;
+
+        p = ngx_pnalloc(r->pool, len);
+        if (p == NULL) {
+            ngx_http_clear_location(r);
+            return NGX_ERROR;
+        }
+
+        r->headers_out.location->value.len = len;
+        r->headers_out.location->value.data = p;
+
+        ngx_escape_uri(p, r->uri.data, r->uri.len, NGX_ESCAPE_URI);
+
+    } else {
+        r->headers_out.location->value = r->uri;
+    }
 
     return NGX_OK;
 }
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 5191880..4a8dc33 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -2019,10 +2019,12 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
                 break;
             }
 
-            /* there was error while a header line parsing */
+            /* rc == NGX_HTTP_PARSE_INVALID_HEADER */
 
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "upstream sent invalid header");
+                          "upstream sent invalid header: \"%*s\\x%02xd...\"",
+                          r->header_end - r->header_name_start,
+                          r->header_name_start, *r->header_end);
 
             return NGX_HTTP_UPSTREAM_INVALID_HEADER;
         }
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
index 27a36e8..864fc4f 100644
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -37,9 +37,6 @@ typedef struct {
     ngx_uint_t                 ssl_verify_depth;
     ngx_str_t                  ssl_trusted_certificate;
     ngx_str_t                  ssl_crl;
-    ngx_str_t                  ssl_certificate;
-    ngx_str_t                  ssl_certificate_key;
-    ngx_array_t               *ssl_passwords;
     ngx_array_t               *ssl_conf_commands;
 #endif
 } ngx_http_grpc_loc_conf_t;
@@ -426,16 +423,16 @@ static ngx_command_t  ngx_http_grpc_commands[] = {
 
     { ngx_string("grpc_ssl_certificate"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_http_set_complex_value_zero_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_grpc_loc_conf_t, ssl_certificate),
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.ssl_certificate),
       NULL },
 
     { ngx_string("grpc_ssl_certificate_key"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_http_set_complex_value_zero_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_grpc_loc_conf_t, ssl_certificate_key),
+      offsetof(ngx_http_grpc_loc_conf_t, upstream.ssl_certificate_key),
       NULL },
 
     { ngx_string("grpc_ssl_password_file"),
@@ -2180,6 +2177,8 @@ ngx_http_grpc_filter(void *data, ssize_t bytes)
             }
 
             ctx->rst = 1;
+
+            continue;
         }
 
         if (ctx->type == NGX_HTTP_V2_GOAWAY_FRAME) {
@@ -3181,10 +3180,10 @@ ngx_http_grpc_parse_fragment(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
             ctx->field_rest -= size;
 
             if (ctx->field_huffman) {
-                if (ngx_http_v2_huff_decode(&ctx->field_state, p, size,
-                                            &ctx->field_end,
-                                            ctx->field_rest == 0,
-                                            r->connection->log)
+                if (ngx_http_huff_decode(&ctx->field_state, p, size,
+                                         &ctx->field_end,
+                                         ctx->field_rest == 0,
+                                         r->connection->log)
                     != NGX_OK)
                 {
                     ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
@@ -3290,10 +3289,10 @@ ngx_http_grpc_parse_fragment(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
             ctx->field_rest -= size;
 
             if (ctx->field_huffman) {
-                if (ngx_http_v2_huff_decode(&ctx->field_state, p, size,
-                                            &ctx->field_end,
-                                            ctx->field_rest == 0,
-                                            r->connection->log)
+                if (ngx_http_huff_decode(&ctx->field_state, p, size,
+                                         &ctx->field_end,
+                                         ctx->field_rest == 0,
+                                         r->connection->log)
                     != NGX_OK)
                 {
                     ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
@@ -3385,7 +3384,7 @@ ngx_http_grpc_validate_header_name(ngx_http_request_t *r, ngx_str_t *s)
             return NGX_ERROR;
         }
 
-        if (ch == '\0' || ch == CR || ch == LF) {
+        if (ch <= 0x20 || ch == 0x7f) {
             return NGX_ERROR;
         }
     }
@@ -3487,6 +3486,8 @@ ngx_http_grpc_parse_rst_stream(ngx_http_request_t *r, ngx_http_grpc_ctx_t *ctx,
         return NGX_AGAIN;
     }
 
+    ctx->state = ngx_http_grpc_st_start;
+
     return NGX_OK;
 }
 
@@ -4340,7 +4341,6 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
      *     conf->upstream.ignore_headers = 0;
      *     conf->upstream.next_upstream = 0;
      *     conf->upstream.hide_headers_hash = { NULL, 0 };
-     *     conf->upstream.ssl_name = NULL;
      *
      *     conf->headers.lengths = NULL;
      *     conf->headers.values = NULL;
@@ -4352,8 +4352,6 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
      *     conf->ssl_ciphers = { 0, NULL };
      *     conf->ssl_trusted_certificate = { 0, NULL };
      *     conf->ssl_crl = { 0, NULL };
-     *     conf->ssl_certificate = { 0, NULL };
-     *     conf->ssl_certificate_key = { 0, NULL };
      */
 
     conf->upstream.local = NGX_CONF_UNSET_PTR;
@@ -4373,10 +4371,13 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
 
 #if (NGX_HTTP_SSL)
     conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
+    conf->upstream.ssl_name = NGX_CONF_UNSET_PTR;
     conf->upstream.ssl_server_name = NGX_CONF_UNSET;
     conf->upstream.ssl_verify = NGX_CONF_UNSET;
     conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
-    conf->ssl_passwords = NGX_CONF_UNSET_PTR;
+    conf->upstream.ssl_certificate = NGX_CONF_UNSET_PTR;
+    conf->upstream.ssl_certificate_key = NGX_CONF_UNSET_PTR;
+    conf->upstream.ssl_passwords = NGX_CONF_UNSET_PTR;
     conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
 #endif
 
@@ -4468,10 +4469,8 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
                              "DEFAULT");
 
-    if (conf->upstream.ssl_name == NULL) {
-        conf->upstream.ssl_name = prev->upstream.ssl_name;
-    }
-
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_name,
+                              prev->upstream.ssl_name, NULL);
     ngx_conf_merge_value(conf->upstream.ssl_server_name,
                               prev->upstream.ssl_server_name, 0);
     ngx_conf_merge_value(conf->upstream.ssl_verify,
@@ -4482,11 +4481,12 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->ssl_trusted_certificate, "");
     ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");
 
-    ngx_conf_merge_str_value(conf->ssl_certificate,
-                              prev->ssl_certificate, "");
-    ngx_conf_merge_str_value(conf->ssl_certificate_key,
-                              prev->ssl_certificate_key, "");
-    ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_certificate,
+                              prev->upstream.ssl_certificate, NULL);
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_certificate_key,
+                              prev->upstream.ssl_certificate_key, NULL);
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_passwords,
+                              prev->upstream.ssl_passwords, NULL);
 
     ngx_conf_merge_ptr_value(conf->ssl_conf_commands,
                               prev->ssl_conf_commands, NULL);
@@ -4842,15 +4842,15 @@ ngx_http_grpc_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_str_t  *value;
 
-    if (glcf->ssl_passwords != NGX_CONF_UNSET_PTR) {
+    if (glcf->upstream.ssl_passwords != NGX_CONF_UNSET_PTR) {
         return "is duplicate";
     }
 
     value = cf->args->elts;
 
-    glcf->ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
+    glcf->upstream.ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
 
-    if (glcf->ssl_passwords == NULL) {
+    if (glcf->upstream.ssl_passwords == NULL) {
         return NGX_CONF_ERROR;
     }
 
@@ -4896,29 +4896,43 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = glcf->upstream.ssl;
 
-    if (glcf->ssl_certificate.len) {
-
-        if (glcf->ssl_certificate_key.len == 0) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"grpc_ssl_certificate_key\" is defined "
-                          "for certificate \"%V\"", &glcf->ssl_certificate);
-            return NGX_ERROR;
-        }
-
-        if (ngx_ssl_certificate(cf, glcf->upstream.ssl, &glcf->ssl_certificate,
-                                &glcf->ssl_certificate_key, glcf->ssl_passwords)
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
     if (ngx_ssl_ciphers(cf, glcf->upstream.ssl, &glcf->ssl_ciphers, 0)
         != NGX_OK)
     {
         return NGX_ERROR;
     }
 
+    if (glcf->upstream.ssl_certificate) {
+
+        if (glcf->upstream.ssl_certificate_key == NULL) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no \"grpc_ssl_certificate_key\" is defined "
+                          "for certificate \"%V\"",
+                          &glcf->upstream.ssl_certificate->value);
+            return NGX_ERROR;
+        }
+
+        if (glcf->upstream.ssl_certificate->lengths
+            || glcf->upstream.ssl_certificate_key->lengths)
+        {
+            glcf->upstream.ssl_passwords =
+                  ngx_ssl_preserve_passwords(cf, glcf->upstream.ssl_passwords);
+            if (glcf->upstream.ssl_passwords == NULL) {
+                return NGX_ERROR;
+            }
+
+        } else {
+            if (ngx_ssl_certificate(cf, glcf->upstream.ssl,
+                                    &glcf->upstream.ssl_certificate->value,
+                                    &glcf->upstream.ssl_certificate_key->value,
+                                    glcf->upstream.ssl_passwords)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+        }
+    }
+
     if (glcf->upstream.ssl_verify) {
         if (glcf->ssl_trusted_certificate.len == 0) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 0e93fbd..9c3f627 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -11,31 +11,33 @@
 
 #define NGX_HTTP_MP4_TRAK_ATOM     0
 #define NGX_HTTP_MP4_TKHD_ATOM     1
-#define NGX_HTTP_MP4_MDIA_ATOM     2
-#define NGX_HTTP_MP4_MDHD_ATOM     3
-#define NGX_HTTP_MP4_HDLR_ATOM     4
-#define NGX_HTTP_MP4_MINF_ATOM     5
-#define NGX_HTTP_MP4_VMHD_ATOM     6
-#define NGX_HTTP_MP4_SMHD_ATOM     7
-#define NGX_HTTP_MP4_DINF_ATOM     8
-#define NGX_HTTP_MP4_STBL_ATOM     9
-#define NGX_HTTP_MP4_STSD_ATOM    10
-#define NGX_HTTP_MP4_STTS_ATOM    11
-#define NGX_HTTP_MP4_STTS_DATA    12
-#define NGX_HTTP_MP4_STSS_ATOM    13
-#define NGX_HTTP_MP4_STSS_DATA    14
-#define NGX_HTTP_MP4_CTTS_ATOM    15
-#define NGX_HTTP_MP4_CTTS_DATA    16
-#define NGX_HTTP_MP4_STSC_ATOM    17
-#define NGX_HTTP_MP4_STSC_START   18
-#define NGX_HTTP_MP4_STSC_DATA    19
-#define NGX_HTTP_MP4_STSC_END     20
-#define NGX_HTTP_MP4_STSZ_ATOM    21
-#define NGX_HTTP_MP4_STSZ_DATA    22
-#define NGX_HTTP_MP4_STCO_ATOM    23
-#define NGX_HTTP_MP4_STCO_DATA    24
-#define NGX_HTTP_MP4_CO64_ATOM    25
-#define NGX_HTTP_MP4_CO64_DATA    26
+#define NGX_HTTP_MP4_EDTS_ATOM     2
+#define NGX_HTTP_MP4_ELST_ATOM     3
+#define NGX_HTTP_MP4_MDIA_ATOM     4
+#define NGX_HTTP_MP4_MDHD_ATOM     5
+#define NGX_HTTP_MP4_HDLR_ATOM     6
+#define NGX_HTTP_MP4_MINF_ATOM     7
+#define NGX_HTTP_MP4_VMHD_ATOM     8
+#define NGX_HTTP_MP4_SMHD_ATOM     9
+#define NGX_HTTP_MP4_DINF_ATOM    10
+#define NGX_HTTP_MP4_STBL_ATOM    11
+#define NGX_HTTP_MP4_STSD_ATOM    12
+#define NGX_HTTP_MP4_STTS_ATOM    13
+#define NGX_HTTP_MP4_STTS_DATA    14
+#define NGX_HTTP_MP4_STSS_ATOM    15
+#define NGX_HTTP_MP4_STSS_DATA    16
+#define NGX_HTTP_MP4_CTTS_ATOM    17
+#define NGX_HTTP_MP4_CTTS_DATA    18
+#define NGX_HTTP_MP4_STSC_ATOM    19
+#define NGX_HTTP_MP4_STSC_START   20
+#define NGX_HTTP_MP4_STSC_DATA    21
+#define NGX_HTTP_MP4_STSC_END     22
+#define NGX_HTTP_MP4_STSZ_ATOM    23
+#define NGX_HTTP_MP4_STSZ_DATA    24
+#define NGX_HTTP_MP4_STCO_ATOM    25
+#define NGX_HTTP_MP4_STCO_DATA    26
+#define NGX_HTTP_MP4_CO64_ATOM    27
+#define NGX_HTTP_MP4_CO64_DATA    28
 
 #define NGX_HTTP_MP4_LAST_ATOM    NGX_HTTP_MP4_CO64_DATA
 
@@ -43,6 +45,7 @@
 typedef struct {
     size_t                buffer_size;
     size_t                max_buffer_size;
+    ngx_flag_t            start_key_frame;
 } ngx_http_mp4_conf_t;
 
 
@@ -53,6 +56,25 @@ typedef struct {
 } ngx_mp4_stsc_entry_t;
 
 
+typedef struct {
+    u_char                size[4];
+    u_char                name[4];
+} ngx_mp4_edts_atom_t;
+
+
+typedef struct {
+    u_char                size[4];
+    u_char                name[4];
+    u_char                version[1];
+    u_char                flags[3];
+    u_char                entries[4];
+    u_char                duration[8];
+    u_char                media_time[8];
+    u_char                media_rate[2];
+    u_char                reserved[2];
+} ngx_mp4_elst_atom_t;
+
+
 typedef struct {
     uint32_t              timescale;
     uint32_t              time_to_sample_entries;
@@ -70,6 +92,9 @@ typedef struct {
     ngx_uint_t            end_chunk_samples;
     uint64_t              start_chunk_samples_size;
     uint64_t              end_chunk_samples_size;
+    uint64_t              duration;
+    uint64_t              prefix;
+    uint64_t              movie_duration;
     off_t                 start_offset;
     off_t                 end_offset;
 
@@ -85,6 +110,8 @@ typedef struct {
 
     ngx_buf_t             trak_atom_buf;
     ngx_buf_t             tkhd_atom_buf;
+    ngx_buf_t             edts_atom_buf;
+    ngx_buf_t             elst_atom_buf;
     ngx_buf_t             mdia_atom_buf;
     ngx_buf_t             mdhd_atom_buf;
     ngx_buf_t             hdlr_atom_buf;
@@ -111,6 +138,8 @@ typedef struct {
     ngx_buf_t             co64_atom_buf;
     ngx_buf_t             co64_data_buf;
 
+    ngx_mp4_edts_atom_t   edts_atom;
+    ngx_mp4_elst_atom_t   elst_atom;
     ngx_mp4_stsc_entry_t  stsc_start_chunk_entry;
     ngx_mp4_stsc_entry_t  stsc_end_chunk_entry;
 } ngx_http_mp4_trak_t;
@@ -186,6 +215,14 @@ typedef struct {
     ((u_char *) (p))[6] = n3;                                                 \
     ((u_char *) (p))[7] = n4
 
+#define ngx_mp4_get_16value(p)                                                \
+    ( ((uint16_t) ((u_char *) (p))[0] << 8)                                   \
+    + (           ((u_char *) (p))[1]) )
+
+#define ngx_mp4_set_16value(p, n)                                             \
+    ((u_char *) (p))[0] = (u_char) ((n) >> 8);                                \
+    ((u_char *) (p))[1] = (u_char)  (n)
+
 #define ngx_mp4_get_32value(p)                                                \
     ( ((uint32_t) ((u_char *) (p))[0] << 24)                                  \
     + (           ((u_char *) (p))[1] << 16)                                  \
@@ -253,6 +290,8 @@ static void ngx_http_mp4_update_mdia_atom(ngx_http_mp4_file_t *mp4,
     ngx_http_mp4_trak_t *trak);
 static ngx_int_t ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4,
     uint64_t atom_data_size);
+static void ngx_http_mp4_update_mdhd_atom(ngx_http_mp4_file_t *mp4,
+    ngx_http_mp4_trak_t *trak);
 static ngx_int_t ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4,
     uint64_t atom_data_size);
 static ngx_int_t ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4,
@@ -267,6 +306,8 @@ static ngx_int_t ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4,
     uint64_t atom_data_size);
 static ngx_int_t ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4,
     uint64_t atom_data_size);
+static void ngx_http_mp4_update_edts_atom(ngx_http_mp4_file_t *mp4,
+    ngx_http_mp4_trak_t *trak);
 static void ngx_http_mp4_update_stbl_atom(ngx_http_mp4_file_t *mp4,
     ngx_http_mp4_trak_t *trak);
 static ngx_int_t ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4,
@@ -277,6 +318,8 @@ static ngx_int_t ngx_http_mp4_update_stts_atom(ngx_http_mp4_file_t *mp4,
     ngx_http_mp4_trak_t *trak);
 static ngx_int_t ngx_http_mp4_crop_stts_data(ngx_http_mp4_file_t *mp4,
     ngx_http_mp4_trak_t *trak, ngx_uint_t start);
+static uint32_t ngx_http_mp4_seek_key_frame(ngx_http_mp4_file_t *mp4,
+    ngx_http_mp4_trak_t *trak, uint32_t start_sample);
 static ngx_int_t ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4,
     uint64_t atom_data_size);
 static ngx_int_t ngx_http_mp4_update_stss_atom(ngx_http_mp4_file_t *mp4,
@@ -340,6 +383,13 @@ static ngx_command_t  ngx_http_mp4_commands[] = {
       offsetof(ngx_http_mp4_conf_t, max_buffer_size),
       NULL },
 
+    { ngx_string("mp4_start_key_frame"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_mp4_conf_t, start_key_frame),
+      NULL },
+
       ngx_null_command
 };
 
@@ -822,10 +872,11 @@ ngx_http_mp4_process(ngx_http_mp4_file_t *mp4)
 
         ngx_http_mp4_update_stbl_atom(mp4, &trak[i]);
         ngx_http_mp4_update_minf_atom(mp4, &trak[i]);
-        trak[i].size += trak[i].mdhd_size;
+        ngx_http_mp4_update_mdhd_atom(mp4, &trak[i]);
         trak[i].size += trak[i].hdlr_size;
         ngx_http_mp4_update_mdia_atom(mp4, &trak[i]);
         trak[i].size += trak[i].tkhd_size;
+        ngx_http_mp4_update_edts_atom(mp4, &trak[i]);
         ngx_http_mp4_update_trak_atom(mp4, &trak[i]);
 
         mp4->moov_size += trak[i].size;
@@ -1587,6 +1638,7 @@ ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     trak = ngx_mp4_last_trak(mp4);
     trak->tkhd_size = atom_size;
+    trak->movie_duration = duration;
 
     ngx_mp4_set_32value(tkhd_atom->size, atom_size);
 
@@ -1749,16 +1801,10 @@ ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
     trak = ngx_mp4_last_trak(mp4);
     trak->mdhd_size = atom_size;
     trak->timescale = timescale;
+    trak->duration = duration;
 
     ngx_mp4_set_32value(mdhd_atom->size, atom_size);
 
-    if (mdhd_atom->version[0] == 0) {
-        ngx_mp4_set_32value(mdhd_atom->duration, duration);
-
-    } else {
-        ngx_mp4_set_64value(mdhd64_atom->duration, duration);
-    }
-
     atom = &trak->mdhd_atom_buf;
     atom->temporary = 1;
     atom->pos = atom_header;
@@ -1772,6 +1818,33 @@ ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 }
 
 
+static void
+ngx_http_mp4_update_mdhd_atom(ngx_http_mp4_file_t *mp4,
+            ngx_http_mp4_trak_t *trak)
+{
+    ngx_buf_t              *atom;
+    ngx_mp4_mdhd_atom_t    *mdhd_atom;
+    ngx_mp4_mdhd64_atom_t  *mdhd64_atom;
+
+    atom = trak->out[NGX_HTTP_MP4_MDHD_ATOM].buf;
+    if (atom == NULL) {
+        return;
+    }
+
+    mdhd_atom = (ngx_mp4_mdhd_atom_t *) atom->pos;
+    mdhd64_atom = (ngx_mp4_mdhd64_atom_t *) atom->pos;
+
+    if (mdhd_atom->version[0] == 0) {
+        ngx_mp4_set_32value(mdhd_atom->duration, trak->duration);
+
+    } else {
+        ngx_mp4_set_64value(mdhd64_atom->duration, trak->duration);
+    }
+
+    trak->size += trak->mdhd_size;
+}
+
+
 static ngx_int_t
 ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 {
@@ -1961,6 +2034,59 @@ ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 }
 
 
+static void
+ngx_http_mp4_update_edts_atom(ngx_http_mp4_file_t *mp4,
+    ngx_http_mp4_trak_t *trak)
+{
+    ngx_buf_t            *atom;
+    ngx_mp4_elst_atom_t  *elst_atom;
+    ngx_mp4_edts_atom_t  *edts_atom;
+
+    if (trak->prefix == 0) {
+        return;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
+                   "mp4 edts atom update prefix:%uL", trak->prefix);
+
+    edts_atom = &trak->edts_atom;
+    ngx_mp4_set_32value(edts_atom->size, sizeof(ngx_mp4_edts_atom_t)
+                                         + sizeof(ngx_mp4_elst_atom_t));
+    ngx_mp4_set_atom_name(edts_atom, 'e', 'd', 't', 's');
+
+    atom = &trak->edts_atom_buf;
+    atom->temporary = 1;
+    atom->pos = (u_char *) edts_atom;
+    atom->last = (u_char *) edts_atom + sizeof(ngx_mp4_edts_atom_t);
+
+    trak->out[NGX_HTTP_MP4_EDTS_ATOM].buf = atom;
+
+    elst_atom = &trak->elst_atom;
+    ngx_mp4_set_32value(elst_atom->size, sizeof(ngx_mp4_elst_atom_t));
+    ngx_mp4_set_atom_name(elst_atom, 'e', 'l', 's', 't');
+
+    elst_atom->version[0] = 1;
+    elst_atom->flags[0] = 0;
+    elst_atom->flags[1] = 0;
+    elst_atom->flags[2] = 0;
+
+    ngx_mp4_set_32value(elst_atom->entries, 1);
+    ngx_mp4_set_64value(elst_atom->duration, trak->movie_duration);
+    ngx_mp4_set_64value(elst_atom->media_time, trak->prefix);
+    ngx_mp4_set_16value(elst_atom->media_rate, 1);
+    ngx_mp4_set_16value(elst_atom->reserved, 0);
+
+    atom = &trak->elst_atom_buf;
+    atom->temporary = 1;
+    atom->pos = (u_char *) elst_atom;
+    atom->last = (u_char *) elst_atom + sizeof(ngx_mp4_elst_atom_t);
+
+    trak->out[NGX_HTTP_MP4_ELST_ATOM].buf = atom;
+
+    trak->size += sizeof(ngx_mp4_edts_atom_t) + sizeof(ngx_mp4_elst_atom_t);
+}
+
+
 static void
 ngx_http_mp4_update_stbl_atom(ngx_http_mp4_file_t *mp4,
     ngx_http_mp4_trak_t *trak)
@@ -2159,7 +2285,7 @@ static ngx_int_t
 ngx_http_mp4_crop_stts_data(ngx_http_mp4_file_t *mp4,
     ngx_http_mp4_trak_t *trak, ngx_uint_t start)
 {
-    uint32_t               count, duration, rest;
+    uint32_t               count, duration, rest, key_prefix;
     uint64_t               start_time;
     ngx_buf_t             *data;
     ngx_uint_t             start_sample, entries, start_sec;
@@ -2183,7 +2309,7 @@ ngx_http_mp4_crop_stts_data(ngx_http_mp4_file_t *mp4,
 
     data = trak->out[NGX_HTTP_MP4_STTS_DATA].buf;
 
-    start_time = (uint64_t) start_sec * trak->timescale / 1000;
+    start_time = (uint64_t) start_sec * trak->timescale / 1000 + trak->prefix;
 
     entries = trak->time_to_sample_entries;
     start_sample = 0;
@@ -2229,6 +2355,26 @@ ngx_http_mp4_crop_stts_data(ngx_http_mp4_file_t *mp4,
 found:
 
     if (start) {
+        key_prefix = ngx_http_mp4_seek_key_frame(mp4, trak, start_sample);
+
+        start_sample -= key_prefix;
+
+        while (rest < key_prefix) {
+            trak->prefix += rest * duration;
+            key_prefix -= rest;
+
+            entry--;
+            entries++;
+
+            count = ngx_mp4_get_32value(entry->count);
+            duration = ngx_mp4_get_32value(entry->duration);
+            rest = count;
+        }
+
+        trak->prefix += key_prefix * duration;
+        trak->duration += trak->prefix;
+        rest -= key_prefix;
+
         ngx_mp4_set_32value(entry->count, count - rest);
         data->pos = (u_char *) entry;
         trak->time_to_sample_entries = entries;
@@ -2253,6 +2399,49 @@ found:
 }
 
 
+static uint32_t
+ngx_http_mp4_seek_key_frame(ngx_http_mp4_file_t *mp4, ngx_http_mp4_trak_t *trak,
+    uint32_t start_sample)
+{
+    uint32_t              key_prefix, sample, *entry, *end;
+    ngx_buf_t            *data;
+    ngx_http_mp4_conf_t  *conf;
+
+    conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module);
+    if (!conf->start_key_frame) {
+        return 0;
+    }
+
+    data = trak->out[NGX_HTTP_MP4_STSS_DATA].buf;
+    if (data == NULL) {
+        return 0;
+    }
+
+    entry = (uint32_t *) data->pos;
+    end = (uint32_t *) data->last;
+
+    /* sync samples starts from 1 */
+    start_sample++;
+
+    key_prefix = 0;
+
+    while (entry < end) {
+        sample = ngx_mp4_get_32value(entry);
+        if (sample > start_sample) {
+            break;
+        }
+
+        key_prefix = start_sample - sample;
+        entry++;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
+                   "mp4 key frame prefix:%uD", key_prefix);
+
+    return key_prefix;
+}
+
+
 typedef struct {
     u_char    size[4];
     u_char    name[4];
@@ -3590,6 +3779,7 @@ ngx_http_mp4_create_conf(ngx_conf_t *cf)
 
     conf->buffer_size = NGX_CONF_UNSET_SIZE;
     conf->max_buffer_size = NGX_CONF_UNSET_SIZE;
+    conf->start_key_frame = NGX_CONF_UNSET;
 
     return conf;
 }
@@ -3604,6 +3794,7 @@ ngx_http_mp4_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size, 512 * 1024);
     ngx_conf_merge_size_value(conf->max_buffer_size, prev->max_buffer_size,
                               10 * 1024 * 1024);
+    ngx_conf_merge_value(conf->start_key_frame, prev->start_key_frame, 0);
 
     return NGX_CONF_OK;
 }
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index a63c3ed..7c4061c 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -124,9 +124,6 @@ typedef struct {
     ngx_uint_t                     ssl_verify_depth;
     ngx_str_t                      ssl_trusted_certificate;
     ngx_str_t                      ssl_crl;
-    ngx_str_t                      ssl_certificate;
-    ngx_str_t                      ssl_certificate_key;
-    ngx_array_t                   *ssl_passwords;
     ngx_array_t                   *ssl_conf_commands;
 #endif
 } ngx_http_proxy_loc_conf_t;
@@ -753,16 +750,16 @@ static ngx_command_t  ngx_http_proxy_commands[] = {
 
     { ngx_string("proxy_ssl_certificate"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_http_set_complex_value_zero_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_proxy_loc_conf_t, ssl_certificate),
+      offsetof(ngx_http_proxy_loc_conf_t, upstream.ssl_certificate),
       NULL },
 
     { ngx_string("proxy_ssl_certificate_key"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_http_set_complex_value_zero_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_proxy_loc_conf_t, ssl_certificate_key),
+      offsetof(ngx_http_proxy_loc_conf_t, upstream.ssl_certificate_key),
       NULL },
 
     { ngx_string("proxy_ssl_password_file"),
@@ -1189,7 +1186,7 @@ ngx_http_proxy_create_key(ngx_http_request_t *r)
 
     loc_len = (r->valid_location && ctx->vars.uri.len) ? plcf->location.len : 0;
 
-    if (r->quoted_uri || r->space_in_uri || r->internal) {
+    if (r->quoted_uri || r->internal) {
         escape = 2 * ngx_escape_uri(NULL, r->uri.data + loc_len,
                                     r->uri.len - loc_len, NGX_ESCAPE_URI);
     } else {
@@ -1302,7 +1299,7 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
         loc_len = (r->valid_location && ctx->vars.uri.len) ?
                       plcf->location.len : 0;
 
-        if (r->quoted_uri || r->space_in_uri || r->internal) {
+        if (r->quoted_uri || r->internal) {
             escape = 2 * ngx_escape_uri(NULL, r->uri.data + loc_len,
                                         r->uri.len - loc_len, NGX_ESCAPE_URI);
         }
@@ -2022,10 +2019,12 @@ ngx_http_proxy_process_header(ngx_http_request_t *r)
             return NGX_AGAIN;
         }
 
-        /* there was error while a header line parsing */
+        /* rc == NGX_HTTP_PARSE_INVALID_HEADER */
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "upstream sent invalid header");
+                      "upstream sent invalid header: \"%*s\\x%02xd...\"",
+                      r->header_end - r->header_name_start,
+                      r->header_name_start, *r->header_end);
 
         return NGX_HTTP_UPSTREAM_INVALID_HEADER;
     }
@@ -2338,6 +2337,7 @@ ngx_http_proxy_non_buffered_copy_filter(void *data, ssize_t bytes)
         ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
                       "upstream sent more data than specified in "
                       "\"Content-Length\" header");
+        u->keepalive = 0;
         return NGX_OK;
     }
 
@@ -3327,9 +3327,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
      *     conf->upstream.hide_headers_hash = { NULL, 0 };
      *     conf->upstream.store_lengths = NULL;
      *     conf->upstream.store_values = NULL;
-     *     conf->upstream.ssl_name = NULL;
      *
-     *     conf->method = NULL;
      *     conf->location = NULL;
      *     conf->url = { 0, NULL };
      *     conf->headers.lengths = NULL;
@@ -3347,8 +3345,6 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
      *     conf->ssl_ciphers = { 0, NULL };
      *     conf->ssl_trusted_certificate = { 0, NULL };
      *     conf->ssl_crl = { 0, NULL };
-     *     conf->ssl_certificate = { 0, NULL };
-     *     conf->ssl_certificate_key = { 0, NULL };
      */
 
     conf->upstream.store = NGX_CONF_UNSET;
@@ -3400,20 +3396,26 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
 
 #if (NGX_HTTP_SSL)
     conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
+    conf->upstream.ssl_name = NGX_CONF_UNSET_PTR;
     conf->upstream.ssl_server_name = NGX_CONF_UNSET;
     conf->upstream.ssl_verify = NGX_CONF_UNSET;
+    conf->upstream.ssl_certificate = NGX_CONF_UNSET_PTR;
+    conf->upstream.ssl_certificate_key = NGX_CONF_UNSET_PTR;
+    conf->upstream.ssl_passwords = NGX_CONF_UNSET_PTR;
     conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
-    conf->ssl_passwords = NGX_CONF_UNSET_PTR;
     conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
 #endif
 
     /* "proxy_cyclic_temp_file" is disabled */
     conf->upstream.cyclic_temp_file = 0;
 
+    conf->upstream.change_buffering = 1;
+
     conf->headers_source = NGX_CONF_UNSET_PTR;
 
+    conf->method = NGX_CONF_UNSET_PTR;
+
     conf->redirect = NGX_CONF_UNSET;
-    conf->upstream.change_buffering = 1;
 
     conf->cookie_domains = NGX_CONF_UNSET_PTR;
     conf->cookie_paths = NGX_CONF_UNSET_PTR;
@@ -3708,10 +3710,6 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #endif
 
-    if (conf->method == NULL) {
-        conf->method = prev->method;
-    }
-
     ngx_conf_merge_value(conf->upstream.pass_request_headers,
                               prev->upstream.pass_request_headers, 1);
     ngx_conf_merge_value(conf->upstream.pass_request_body,
@@ -3732,10 +3730,8 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
                              "DEFAULT");
 
-    if (conf->upstream.ssl_name == NULL) {
-        conf->upstream.ssl_name = prev->upstream.ssl_name;
-    }
-
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_name,
+                              prev->upstream.ssl_name, NULL);
     ngx_conf_merge_value(conf->upstream.ssl_server_name,
                               prev->upstream.ssl_server_name, 0);
     ngx_conf_merge_value(conf->upstream.ssl_verify,
@@ -3746,11 +3742,12 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->ssl_trusted_certificate, "");
     ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");
 
-    ngx_conf_merge_str_value(conf->ssl_certificate,
-                              prev->ssl_certificate, "");
-    ngx_conf_merge_str_value(conf->ssl_certificate_key,
-                              prev->ssl_certificate_key, "");
-    ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_certificate,
+                              prev->upstream.ssl_certificate, NULL);
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_certificate_key,
+                              prev->upstream.ssl_certificate_key, NULL);
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_passwords,
+                              prev->upstream.ssl_passwords, NULL);
 
     ngx_conf_merge_ptr_value(conf->ssl_conf_commands,
                               prev->ssl_conf_commands, NULL);
@@ -3761,6 +3758,8 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #endif
 
+    ngx_conf_merge_ptr_value(conf->method, prev->method, NULL);
+
     ngx_conf_merge_value(conf->redirect, prev->redirect, 1);
 
     if (conf->redirect) {
@@ -4859,15 +4858,15 @@ ngx_http_proxy_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_str_t  *value;
 
-    if (plcf->ssl_passwords != NGX_CONF_UNSET_PTR) {
+    if (plcf->upstream.ssl_passwords != NGX_CONF_UNSET_PTR) {
         return "is duplicate";
     }
 
     value = cf->args->elts;
 
-    plcf->ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
+    plcf->upstream.ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
 
-    if (plcf->ssl_passwords == NULL) {
+    if (plcf->upstream.ssl_passwords == NULL) {
         return NGX_CONF_ERROR;
     }
 
@@ -4946,29 +4945,43 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = plcf->upstream.ssl;
 
-    if (plcf->ssl_certificate.len) {
-
-        if (plcf->ssl_certificate_key.len == 0) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"proxy_ssl_certificate_key\" is defined "
-                          "for certificate \"%V\"", &plcf->ssl_certificate);
-            return NGX_ERROR;
-        }
-
-        if (ngx_ssl_certificate(cf, plcf->upstream.ssl, &plcf->ssl_certificate,
-                                &plcf->ssl_certificate_key, plcf->ssl_passwords)
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
     if (ngx_ssl_ciphers(cf, plcf->upstream.ssl, &plcf->ssl_ciphers, 0)
         != NGX_OK)
     {
         return NGX_ERROR;
     }
 
+    if (plcf->upstream.ssl_certificate) {
+
+        if (plcf->upstream.ssl_certificate_key == NULL) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no \"proxy_ssl_certificate_key\" is defined "
+                          "for certificate \"%V\"",
+                          &plcf->upstream.ssl_certificate->value);
+            return NGX_ERROR;
+        }
+
+        if (plcf->upstream.ssl_certificate->lengths
+            || plcf->upstream.ssl_certificate_key->lengths)
+        {
+            plcf->upstream.ssl_passwords =
+                  ngx_ssl_preserve_passwords(cf, plcf->upstream.ssl_passwords);
+            if (plcf->upstream.ssl_passwords == NULL) {
+                return NGX_ERROR;
+            }
+
+        } else {
+            if (ngx_ssl_certificate(cf, plcf->upstream.ssl,
+                                    &plcf->upstream.ssl_certificate->value,
+                                    &plcf->upstream.ssl_certificate_key->value,
+                                    plcf->upstream.ssl_passwords)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+        }
+    }
+
     if (plcf->upstream.ssl_verify) {
         if (plcf->ssl_trusted_certificate.len == 0) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 600999c..e5d31ae 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -1140,10 +1140,12 @@ ngx_http_scgi_process_header(ngx_http_request_t *r)
             return NGX_AGAIN;
         }
 
-        /* there was error while a header line parsing */
+        /* rc == NGX_HTTP_PARSE_INVALID_HEADER */
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "upstream sent invalid header");
+                      "upstream sent invalid header: \"%*s\\x%02xd...\"",
+                      r->header_end - r->header_name_start,
+                      r->header_name_start, *r->header_end);
 
         return NGX_HTTP_UPSTREAM_INVALID_HEADER;
     }
diff --git a/src/http/modules/ngx_http_secure_link_module.c b/src/http/modules/ngx_http_secure_link_module.c
index 536e09a..4d4ce6a 100644
--- a/src/http/modules/ngx_http_secure_link_module.c
+++ b/src/http/modules/ngx_http_secure_link_module.c
@@ -302,11 +302,12 @@ ngx_http_secure_link_create_conf(ngx_conf_t *cf)
     /*
      * set by ngx_pcalloc():
      *
-     *     conf->variable = NULL;
-     *     conf->md5 = NULL;
      *     conf->secret = { 0, NULL };
      */
 
+    conf->variable = NGX_CONF_UNSET_PTR;
+    conf->md5 = NGX_CONF_UNSET_PTR;
+
     return conf;
 }
 
@@ -318,6 +319,9 @@ ngx_http_secure_link_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_http_secure_link_conf_t *conf = child;
 
     if (conf->secret.data) {
+        ngx_conf_init_ptr_value(conf->variable, NULL);
+        ngx_conf_init_ptr_value(conf->md5, NULL);
+
         if (conf->variable || conf->md5) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "\"secure_link_secret\" cannot be mixed with "
@@ -328,13 +332,8 @@ ngx_http_secure_link_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_OK;
     }
 
-    if (conf->variable == NULL) {
-        conf->variable = prev->variable;
-    }
-
-    if (conf->md5 == NULL) {
-        conf->md5 = prev->md5;
-    }
+    ngx_conf_merge_ptr_value(conf->variable, prev->variable, NULL);
+    ngx_conf_merge_ptr_value(conf->md5, prev->md5, NULL);
 
     if (conf->variable == NULL && conf->md5 == NULL) {
         conf->secret = prev->secret;
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index a47d696..d74d460 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -17,7 +17,7 @@ typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
 #define NGX_DEFAULT_CIPHERS     "HIGH:!aNULL:!MD5"
 #define NGX_DEFAULT_ECDH_CURVE  "auto"
 
-#define NGX_HTTP_NPN_ADVERTISE  "\x08http/1.1"
+#define NGX_HTTP_ALPN_PROTOS    "\x08http/1.1\x08http/1.0\x08http/0.9"
 
 
 #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
@@ -26,11 +26,6 @@ static int ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn,
     const unsigned char *in, unsigned int inlen, void *arg);
 #endif
 
-#ifdef TLSEXT_TYPE_next_proto_neg
-static int ngx_http_ssl_npn_advertised(ngx_ssl_conn_t *ssl_conn,
-    const unsigned char **out, unsigned int *outlen, void *arg);
-#endif
-
 static ngx_int_t ngx_http_ssl_static_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_ssl_variable(ngx_http_request_t *r,
@@ -347,6 +342,9 @@ static ngx_http_variable_t  ngx_http_ssl_vars[] = {
     { ngx_string("ssl_ciphers"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_ciphers, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_curve"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_curve, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_curves"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_curves, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
@@ -363,6 +361,9 @@ static ngx_http_variable_t  ngx_http_ssl_vars[] = {
     { ngx_string("ssl_server_name"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_server_name, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_alpn_protocol"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_alpn_protocol, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_client_cert"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_certificate, NGX_HTTP_VAR_CHANGEABLE, 0 },
 
@@ -444,22 +445,20 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
     hc = c->data;
 
     if (hc->addr_conf->http2) {
-        srv =
-           (unsigned char *) NGX_HTTP_V2_ALPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
-        srvlen = sizeof(NGX_HTTP_V2_ALPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE) - 1;
-
+        srv = (unsigned char *) NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS;
+        srvlen = sizeof(NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS) - 1;
     } else
 #endif
     {
-        srv = (unsigned char *) NGX_HTTP_NPN_ADVERTISE;
-        srvlen = sizeof(NGX_HTTP_NPN_ADVERTISE) - 1;
+        srv = (unsigned char *) NGX_HTTP_ALPN_PROTOS;
+        srvlen = sizeof(NGX_HTTP_ALPN_PROTOS) - 1;
     }
 
     if (SSL_select_next_proto((unsigned char **) out, outlen, srv, srvlen,
                               in, inlen)
         != OPENSSL_NPN_NEGOTIATED)
     {
-        return SSL_TLSEXT_ERR_NOACK;
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
@@ -471,44 +470,6 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
 #endif
 
 
-#ifdef TLSEXT_TYPE_next_proto_neg
-
-static int
-ngx_http_ssl_npn_advertised(ngx_ssl_conn_t *ssl_conn,
-    const unsigned char **out, unsigned int *outlen, void *arg)
-{
-#if (NGX_HTTP_V2 || NGX_DEBUG)
-    ngx_connection_t  *c;
-
-    c = ngx_ssl_get_connection(ssl_conn);
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "SSL NPN advertised");
-#endif
-
-#if (NGX_HTTP_V2)
-    {
-    ngx_http_connection_t  *hc;
-
-    hc = c->data;
-
-    if (hc->addr_conf->http2) {
-        *out =
-            (unsigned char *) NGX_HTTP_V2_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
-        *outlen = sizeof(NGX_HTTP_V2_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE) - 1;
-
-        return SSL_TLSEXT_ERR_OK;
-    }
-    }
-#endif
-
-    *out = (unsigned char *) NGX_HTTP_NPN_ADVERTISE;
-    *outlen = sizeof(NGX_HTTP_NPN_ADVERTISE) - 1;
-
-    return SSL_TLSEXT_ERR_OK;
-}
-
-#endif
-
-
 static ngx_int_t
 ngx_http_ssl_static_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
@@ -792,10 +753,12 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     SSL_CTX_set_alpn_select_cb(conf->ssl.ctx, ngx_http_ssl_alpn_select, NULL);
 #endif
 
-#ifdef TLSEXT_TYPE_next_proto_neg
-    SSL_CTX_set_next_protos_advertised_cb(conf->ssl.ctx,
-                                          ngx_http_ssl_npn_advertised, NULL);
-#endif
+    if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
+                        conf->prefer_server_ciphers)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
 
     if (ngx_http_ssl_compile_certificates(cf, conf) != NGX_OK) {
         return NGX_CONF_ERROR;
@@ -829,13 +792,6 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
-    if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
-                        conf->prefer_server_ciphers)
-        != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
     conf->ssl.buffer_size = conf->buffer_size;
 
     if (conf->verify) {
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index 282d6ee..cf29d5a 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -50,6 +50,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
 {
     u_char                    *last, *location;
     size_t                     root, len;
+    uintptr_t                  escape;
     ngx_str_t                  path;
     ngx_int_t                  rc;
     ngx_uint_t                 level;
@@ -155,14 +156,18 @@ ngx_http_static_handler(ngx_http_request_t *r)
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
 
-        len = r->uri.len + 1;
+        escape = 2 * ngx_escape_uri(NULL, r->uri.data, r->uri.len,
+                                    NGX_ESCAPE_URI);
 
-        if (!clcf->alias && r->args.len == 0) {
+        if (!clcf->alias && r->args.len == 0 && escape == 0) {
+            len = r->uri.len + 1;
             location = path.data + root;
 
             *last = '/';
 
         } else {
+            len = r->uri.len + escape + 1;
+
             if (r->args.len) {
                 len += r->args.len + 1;
             }
@@ -173,7 +178,13 @@ ngx_http_static_handler(ngx_http_request_t *r)
                 return NGX_HTTP_INTERNAL_SERVER_ERROR;
             }
 
-            last = ngx_copy(location, r->uri.data, r->uri.len);
+            if (escape) {
+                last = (u_char *) ngx_escape_uri(location, r->uri.data,
+                                                 r->uri.len, NGX_ESCAPE_URI);
+
+            } else {
+                last = ngx_copy(location, r->uri.data, r->uri.len);
+            }
 
             *last = '/';
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 1334f44..d46741a 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -54,9 +54,6 @@ typedef struct {
     ngx_uint_t                 ssl_verify_depth;
     ngx_str_t                  ssl_trusted_certificate;
     ngx_str_t                  ssl_crl;
-    ngx_str_t                  ssl_certificate;
-    ngx_str_t                  ssl_certificate_key;
-    ngx_array_t               *ssl_passwords;
     ngx_array_t               *ssl_conf_commands;
 #endif
 } ngx_http_uwsgi_loc_conf_t;
@@ -548,16 +545,16 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
 
     { ngx_string("uwsgi_ssl_certificate"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_http_set_complex_value_zero_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_uwsgi_loc_conf_t, ssl_certificate),
+      offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ssl_certificate),
       NULL },
 
     { ngx_string("uwsgi_ssl_certificate_key"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_http_set_complex_value_zero_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_uwsgi_loc_conf_t, ssl_certificate_key),
+      offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ssl_certificate_key),
       NULL },
 
     { ngx_string("uwsgi_ssl_password_file"),
@@ -1364,10 +1361,12 @@ ngx_http_uwsgi_process_header(ngx_http_request_t *r)
             return NGX_AGAIN;
         }
 
-        /* there was error while a header line parsing */
+        /* rc == NGX_HTTP_PARSE_INVALID_HEADER */
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "upstream sent invalid header");
+                      "upstream sent invalid header: \"%*s\\x%02xd...\"",
+                      r->header_end - r->header_name_start,
+                      r->header_name_start, *r->header_end);
 
         return NGX_HTTP_UPSTREAM_INVALID_HEADER;
     }
@@ -1509,10 +1508,13 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
 
 #if (NGX_HTTP_SSL)
     conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
+    conf->upstream.ssl_name = NGX_CONF_UNSET_PTR;
     conf->upstream.ssl_server_name = NGX_CONF_UNSET;
     conf->upstream.ssl_verify = NGX_CONF_UNSET;
     conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
-    conf->ssl_passwords = NGX_CONF_UNSET_PTR;
+    conf->upstream.ssl_certificate = NGX_CONF_UNSET_PTR;
+    conf->upstream.ssl_certificate_key = NGX_CONF_UNSET_PTR;
+    conf->upstream.ssl_passwords = NGX_CONF_UNSET_PTR;
     conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
 #endif
 
@@ -1824,10 +1826,8 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
                              "DEFAULT");
 
-    if (conf->upstream.ssl_name == NULL) {
-        conf->upstream.ssl_name = prev->upstream.ssl_name;
-    }
-
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_name,
+                              prev->upstream.ssl_name, NULL);
     ngx_conf_merge_value(conf->upstream.ssl_server_name,
                               prev->upstream.ssl_server_name, 0);
     ngx_conf_merge_value(conf->upstream.ssl_verify,
@@ -1838,11 +1838,12 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->ssl_trusted_certificate, "");
     ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");
 
-    ngx_conf_merge_str_value(conf->ssl_certificate,
-                              prev->ssl_certificate, "");
-    ngx_conf_merge_str_value(conf->ssl_certificate_key,
-                              prev->ssl_certificate_key, "");
-    ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_certificate,
+                              prev->upstream.ssl_certificate, NULL);
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_certificate_key,
+                              prev->upstream.ssl_certificate_key, NULL);
+    ngx_conf_merge_ptr_value(conf->upstream.ssl_passwords,
+                              prev->upstream.ssl_passwords, NULL);
 
     ngx_conf_merge_ptr_value(conf->ssl_conf_commands,
                               prev->ssl_conf_commands, NULL);
@@ -2377,15 +2378,15 @@ ngx_http_uwsgi_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_str_t  *value;
 
-    if (uwcf->ssl_passwords != NGX_CONF_UNSET_PTR) {
+    if (uwcf->upstream.ssl_passwords != NGX_CONF_UNSET_PTR) {
         return "is duplicate";
     }
 
     value = cf->args->elts;
 
-    uwcf->ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
+    uwcf->upstream.ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
 
-    if (uwcf->ssl_passwords == NULL) {
+    if (uwcf->upstream.ssl_passwords == NULL) {
         return NGX_CONF_ERROR;
     }
 
@@ -2431,29 +2432,43 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = uwcf->upstream.ssl;
 
-    if (uwcf->ssl_certificate.len) {
-
-        if (uwcf->ssl_certificate_key.len == 0) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"uwsgi_ssl_certificate_key\" is defined "
-                          "for certificate \"%V\"", &uwcf->ssl_certificate);
-            return NGX_ERROR;
-        }
-
-        if (ngx_ssl_certificate(cf, uwcf->upstream.ssl, &uwcf->ssl_certificate,
-                                &uwcf->ssl_certificate_key, uwcf->ssl_passwords)
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
     if (ngx_ssl_ciphers(cf, uwcf->upstream.ssl, &uwcf->ssl_ciphers, 0)
         != NGX_OK)
     {
         return NGX_ERROR;
     }
 
+    if (uwcf->upstream.ssl_certificate) {
+
+        if (uwcf->upstream.ssl_certificate_key == NULL) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no \"uwsgi_ssl_certificate_key\" is defined "
+                          "for certificate \"%V\"",
+                          &uwcf->upstream.ssl_certificate->value);
+            return NGX_ERROR;
+        }
+
+        if (uwcf->upstream.ssl_certificate->lengths
+            || uwcf->upstream.ssl_certificate_key->lengths)
+        {
+            uwcf->upstream.ssl_passwords =
+                  ngx_ssl_preserve_passwords(cf, uwcf->upstream.ssl_passwords);
+            if (uwcf->upstream.ssl_passwords == NULL) {
+                return NGX_ERROR;
+            }
+
+        } else {
+            if (ngx_ssl_certificate(cf, uwcf->upstream.ssl,
+                                    &uwcf->upstream.ssl_certificate->value,
+                                    &uwcf->upstream.ssl_certificate_key->value,
+                                    uwcf->upstream.ssl_passwords)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+        }
+    }
+
     if (uwcf->upstream.ssl_verify) {
         if (uwcf->ssl_trusted_certificate.len == 0) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index e1d3d00..73c08d5 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -37,6 +37,8 @@ static ngx_int_t ngx_http_init_locations(ngx_conf_t *cf,
     ngx_http_core_srv_conf_t *cscf, ngx_http_core_loc_conf_t *pclcf);
 static ngx_int_t ngx_http_init_static_location_trees(ngx_conf_t *cf,
     ngx_http_core_loc_conf_t *pclcf);
+static ngx_int_t ngx_http_escape_location_name(ngx_conf_t *cf,
+    ngx_http_core_loc_conf_t *clcf);
 static ngx_int_t ngx_http_cmp_locations(const ngx_queue_t *one,
     const ngx_queue_t *two);
 static ngx_int_t ngx_http_join_exact_locations(ngx_conf_t *cf,
@@ -882,6 +884,41 @@ ngx_http_add_location(ngx_conf_t *cf, ngx_queue_t **locations,
 
     ngx_queue_insert_tail(*locations, &lq->queue);
 
+    if (ngx_http_escape_location_name(cf, clcf) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_escape_location_name(ngx_conf_t *cf, ngx_http_core_loc_conf_t *clcf)
+{
+    u_char     *p;
+    size_t      len;
+    uintptr_t   escape;
+
+    escape = 2 * ngx_escape_uri(NULL, clcf->name.data, clcf->name.len,
+                                NGX_ESCAPE_URI);
+
+    if (escape) {
+        len = clcf->name.len + escape;
+
+        p = ngx_pnalloc(cf->pool, len);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        clcf->escaped_name.len = len;
+        clcf->escaped_name.data = p;
+
+        ngx_escape_uri(p, clcf->name.data, clcf->name.len, NGX_ESCAPE_URI);
+
+    } else {
+        clcf->escaped_name = clcf->name;
+    }
+
     return NGX_OK;
 }
 
@@ -1301,13 +1338,12 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
     }
 
 #if (NGX_HTTP_V2 && NGX_HTTP_SSL                                              \
-     && !defined TLSEXT_TYPE_application_layer_protocol_negotiation           \
-     && !defined TLSEXT_TYPE_next_proto_neg)
+     && !defined TLSEXT_TYPE_application_layer_protocol_negotiation)
 
     if (lsopt->http2 && lsopt->ssl) {
         ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
                            "nginx was built with OpenSSL that lacks ALPN "
-                           "and NPN support, HTTP/2 is not enabled for %V",
+                           "support, HTTP/2 is not enabled for %V",
                            &lsopt->addr_text);
     }
 
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index 8b43857..be8b7cd 100644
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -167,6 +167,14 @@ ngx_uint_t  ngx_http_degraded(ngx_http_request_t *);
 #endif
 
 
+#if (NGX_HTTP_V2)
+ngx_int_t ngx_http_huff_decode(u_char *state, u_char *src, size_t len,
+    u_char **dst, ngx_uint_t last, ngx_log_t *log);
+size_t ngx_http_huff_encode(u_char *src, size_t len, u_char *dst,
+    ngx_uint_t lower);
+#endif
+
+
 extern ngx_module_t  ngx_http_module;
 
 extern ngx_str_t  ngx_http_html_default_types[];
diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c
index c8ad5da..bd3028b 100644
--- a/src/http/ngx_http_copy_filter_module.c
+++ b/src/http/ngx_http_copy_filter_module.c
@@ -19,10 +19,6 @@ typedef struct {
 static void ngx_http_copy_aio_handler(ngx_output_chain_ctx_t *ctx,
     ngx_file_t *file);
 static void ngx_http_copy_aio_event_handler(ngx_event_t *ev);
-#if (NGX_HAVE_AIO_SENDFILE)
-static ssize_t ngx_http_copy_aio_sendfile_preload(ngx_buf_t *file);
-static void ngx_http_copy_aio_sendfile_event_handler(ngx_event_t *ev);
-#endif
 #endif
 #if (NGX_THREADS)
 static ngx_int_t ngx_http_copy_thread_handler(ngx_thread_task_t *task,
@@ -128,9 +124,6 @@ ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in)
 #if (NGX_HAVE_FILE_AIO)
         if (ngx_file_aio && clcf->aio == NGX_HTTP_AIO_ON) {
             ctx->aio_handler = ngx_http_copy_aio_handler;
-#if (NGX_HAVE_AIO_SENDFILE)
-            ctx->aio_preload = ngx_http_copy_aio_sendfile_preload;
-#endif
         }
 #endif
 
@@ -207,53 +200,6 @@ ngx_http_copy_aio_event_handler(ngx_event_t *ev)
     ngx_http_run_posted_requests(c);
 }
 
-
-#if (NGX_HAVE_AIO_SENDFILE)
-
-static ssize_t
-ngx_http_copy_aio_sendfile_preload(ngx_buf_t *file)
-{
-    ssize_t                  n;
-    static u_char            buf[1];
-    ngx_event_aio_t         *aio;
-    ngx_http_request_t      *r;
-    ngx_output_chain_ctx_t  *ctx;
-
-    n = ngx_file_aio_read(file->file, buf, 1, file->file_pos, NULL);
-
-    if (n == NGX_AGAIN) {
-        aio = file->file->aio;
-        aio->handler = ngx_http_copy_aio_sendfile_event_handler;
-
-        r = aio->data;
-        r->main->blocked++;
-        r->aio = 1;
-
-        ctx = ngx_http_get_module_ctx(r, ngx_http_copy_filter_module);
-        ctx->aio = 1;
-    }
-
-    return n;
-}
-
-
-static void
-ngx_http_copy_aio_sendfile_event_handler(ngx_event_t *ev)
-{
-    ngx_event_aio_t     *aio;
-    ngx_http_request_t  *r;
-
-    aio = ev->data;
-    r = aio->data;
-
-    r->main->blocked--;
-    r->aio = 0;
-    ev->complete = 0;
-
-    r->connection->write->handler(r->connection->write);
-}
-
-#endif
 #endif
 
 
@@ -263,6 +209,7 @@ static ngx_int_t
 ngx_http_copy_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
 {
     ngx_str_t                  name;
+    ngx_connection_t          *c;
     ngx_thread_pool_t         *tp;
     ngx_http_request_t        *r;
     ngx_output_chain_ctx_t    *ctx;
@@ -270,6 +217,27 @@ ngx_http_copy_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
 
     r = file->thread_ctx;
 
+    if (r->aio) {
+        /*
+         * tolerate sendfile() calls if another operation is already
+         * running; this can happen due to subrequests, multiple calls
+         * of the next body filter from a filter, or in HTTP/2 due to
+         * a write event on the main connection
+         */
+
+        c = r->connection;
+
+#if (NGX_HTTP_V2)
+        if (r->stream) {
+            c = r->stream->connection->connection;
+        }
+#endif
+
+        if (task == c->sendfile_task) {
+            return NGX_OK;
+        }
+    }
+
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
     tp = clcf->thread_pool;
 
@@ -323,6 +291,20 @@ ngx_http_copy_thread_event_handler(ngx_event_t *ev)
     r->main->blocked--;
     r->aio = 0;
 
+#if (NGX_HTTP_V2)
+
+    if (r->stream) {
+        /*
+         * for HTTP/2, update write event to make sure processing will
+         * reach the main connection to handle sendfile() in threads
+         */
+
+        c->write->ready = 1;
+        c->write->active = 0;
+    }
+
+#endif
+
     if (r->done) {
         /*
          * trigger connection event handler if the subrequest was
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 6664fa6..c7463dc 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1010,10 +1010,10 @@ ngx_http_core_find_config_phase(ngx_http_request_t *r,
         ngx_str_set(&r->headers_out.location->key, "Location");
 
         if (r->args.len == 0) {
-            r->headers_out.location->value = clcf->name;
+            r->headers_out.location->value = clcf->escaped_name;
 
         } else {
-            len = clcf->name.len + 1 + r->args.len;
+            len = clcf->escaped_name.len + 1 + r->args.len;
             p = ngx_pnalloc(r->pool, len);
 
             if (p == NULL) {
@@ -1025,7 +1025,7 @@ ngx_http_core_find_config_phase(ngx_http_request_t *r,
             r->headers_out.location->value.len = len;
             r->headers_out.location->value.data = p;
 
-            p = ngx_cpymem(p, clcf->name.data, clcf->name.len);
+            p = ngx_cpymem(p, clcf->escaped_name.data, clcf->escaped_name.len);
             *p++ = '?';
             ngx_memcpy(p, r->args.data, r->args.len);
         }
@@ -3467,6 +3467,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
     /*
      * set by ngx_pcalloc():
      *
+     *     clcf->escaped_name = { 0, NULL };
      *     clcf->root = { 0, NULL };
      *     clcf->limit_except = 0;
      *     clcf->post_action = { 0, NULL };
@@ -3479,8 +3480,6 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
      *     clcf->exact_match = 0;
      *     clcf->auto_redirect = 0;
      *     clcf->alias = 0;
-     *     clcf->limit_rate = NULL;
-     *     clcf->limit_rate_after = NULL;
      *     clcf->gzip_proxied = 0;
      *     clcf->keepalive_disable = 0;
      */
@@ -3512,6 +3511,8 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
     clcf->send_timeout = NGX_CONF_UNSET_MSEC;
     clcf->send_lowat = NGX_CONF_UNSET_SIZE;
     clcf->postpone_output = NGX_CONF_UNSET_SIZE;
+    clcf->limit_rate = NGX_CONF_UNSET_PTR;
+    clcf->limit_rate_after = NGX_CONF_UNSET_PTR;
     clcf->keepalive_time = NGX_CONF_UNSET_MSEC;
     clcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
     clcf->keepalive_header = NGX_CONF_UNSET;
@@ -3719,7 +3720,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->internal, prev->internal, 0);
     ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
     ngx_conf_merge_size_value(conf->sendfile_max_chunk,
-                              prev->sendfile_max_chunk, 0);
+                              prev->sendfile_max_chunk, 2 * 1024 * 1024);
     ngx_conf_merge_size_value(conf->subrequest_output_buffer_size,
                               prev->subrequest_output_buffer_size,
                               (size_t) ngx_pagesize);
@@ -3743,13 +3744,9 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output,
                               1460);
 
-    if (conf->limit_rate == NULL) {
-        conf->limit_rate = prev->limit_rate;
-    }
-
-    if (conf->limit_rate_after == NULL) {
-        conf->limit_rate_after = prev->limit_rate_after;
-    }
+    ngx_conf_merge_ptr_value(conf->limit_rate, prev->limit_rate, NULL);
+    ngx_conf_merge_ptr_value(conf->limit_rate_after,
+                              prev->limit_rate_after, NULL);
 
     ngx_conf_merge_msec_value(conf->keepalive_time,
                               prev->keepalive_time, 3600000);
@@ -4571,19 +4568,6 @@ ngx_http_core_set_aio(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
     }
 
-#if (NGX_HAVE_AIO_SENDFILE)
-
-    if (ngx_strcmp(value[1].data, "sendfile") == 0) {
-        clcf->aio = NGX_HTTP_AIO_ON;
-
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                           "the \"sendfile\" parameter of "
-                           "the \"aio\" directive is deprecated");
-        return NGX_CONF_OK;
-    }
-
-#endif
-
     if (ngx_strncmp(value[1].data, "threads", 7) == 0
         && (value[1].len == 7 || value[1].data[7] == '='))
     {
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 2341fd4..004a98e 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -299,6 +299,7 @@ typedef struct {
 
 struct ngx_http_core_loc_conf_s {
     ngx_str_t     name;          /* location name */
+    ngx_str_t     escaped_name;
 
 #if (NGX_PCRE)
     ngx_http_regex_t  *regex;
@@ -501,8 +502,8 @@ ngx_int_t ngx_http_gzip_ok(ngx_http_request_t *r);
 
 
 ngx_int_t ngx_http_subrequest(ngx_http_request_t *r,
-    ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **sr,
-    ngx_http_post_subrequest_t *psr, ngx_uint_t flags);
+    ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **psr,
+    ngx_http_post_subrequest_t *ps, ngx_uint_t flags);
 ngx_int_t ngx_http_internal_redirect(ngx_http_request_t *r,
     ngx_str_t *uri, ngx_str_t *args);
 ngx_int_t ngx_http_named_location(ngx_http_request_t *r, ngx_str_t *name);
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index 9b89405..76f6e96 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -197,6 +197,10 @@ ngx_http_header_filter(ngx_http_request_t *r)
         }
     }
 
+    if (r->keepalive && (ngx_terminate || ngx_exiting)) {
+        r->keepalive = 0;
+    }
+
     len = sizeof("HTTP/1.x ") - 1 + sizeof(CRLF) - 1
           /* the end of the header */
           + sizeof(CRLF) - 1;
diff --git a/src/http/v2/ngx_http_v2_huff_decode.c b/src/http/ngx_http_huff_decode.c
similarity index 99%
rename from src/http/v2/ngx_http_v2_huff_decode.c
rename to src/http/ngx_http_huff_decode.c
index 49ca576..14b7b78 100644
--- a/src/http/v2/ngx_http_v2_huff_decode.c
+++ b/src/http/ngx_http_huff_decode.c
@@ -15,14 +15,14 @@ typedef struct {
     u_char  emit;
     u_char  sym;
     u_char  ending;
-} ngx_http_v2_huff_decode_code_t;
+} ngx_http_huff_decode_code_t;
 
 
-static ngx_inline ngx_int_t ngx_http_v2_huff_decode_bits(u_char *state,
+static ngx_inline ngx_int_t ngx_http_huff_decode_bits(u_char *state,
     u_char *ending, ngx_uint_t bits, u_char **dst);
 
 
-static ngx_http_v2_huff_decode_code_t  ngx_http_v2_huff_decode_codes[256][16] =
+static ngx_http_huff_decode_code_t  ngx_http_huff_decode_codes[256][16] =
 {
     /* 0 */
     {
@@ -2640,7 +2640,7 @@ static ngx_http_v2_huff_decode_code_t  ngx_http_v2_huff_decode_codes[256][16] =
 
 
 ngx_int_t
-ngx_http_v2_huff_decode(u_char *state, u_char *src, size_t len, u_char **dst,
+ngx_http_huff_decode(u_char *state, u_char *src, size_t len, u_char **dst,
     ngx_uint_t last, ngx_log_t *log)
 {
     u_char  *end, ch, ending;
@@ -2653,7 +2653,7 @@ ngx_http_v2_huff_decode(u_char *state, u_char *src, size_t len, u_char **dst,
     while (src != end) {
         ch = *src++;
 
-        if (ngx_http_v2_huff_decode_bits(state, &ending, ch >> 4, dst)
+        if (ngx_http_huff_decode_bits(state, &ending, ch >> 4, dst)
             != NGX_OK)
         {
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
@@ -2663,7 +2663,7 @@ ngx_http_v2_huff_decode(u_char *state, u_char *src, size_t len, u_char **dst,
             return NGX_ERROR;
         }
 
-        if (ngx_http_v2_huff_decode_bits(state, &ending, ch & 0xf, dst)
+        if (ngx_http_huff_decode_bits(state, &ending, ch & 0xf, dst)
             != NGX_OK)
         {
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
@@ -2692,12 +2692,12 @@ ngx_http_v2_huff_decode(u_char *state, u_char *src, size_t len, u_char **dst,
 
 
 static ngx_inline ngx_int_t
-ngx_http_v2_huff_decode_bits(u_char *state, u_char *ending, ngx_uint_t bits,
+ngx_http_huff_decode_bits(u_char *state, u_char *ending, ngx_uint_t bits,
     u_char **dst)
 {
-    ngx_http_v2_huff_decode_code_t  code;
+    ngx_http_huff_decode_code_t  code;
 
-    code = ngx_http_v2_huff_decode_codes[*state][bits];
+    code = ngx_http_huff_decode_codes[*state][bits];
 
     if (code.next == *state) {
         return NGX_ERROR;
diff --git a/src/http/v2/ngx_http_v2_huff_encode.c b/src/http/ngx_http_huff_encode.c
similarity index 93%
rename from src/http/v2/ngx_http_v2_huff_encode.c
rename to src/http/ngx_http_huff_encode.c
index 3f822cd..c03b153 100644
--- a/src/http/v2/ngx_http_v2_huff_encode.c
+++ b/src/http/ngx_http_huff_encode.c
@@ -14,10 +14,10 @@
 typedef struct {
     uint32_t  code;
     uint32_t  len;
-} ngx_http_v2_huff_encode_code_t;
+} ngx_http_huff_encode_code_t;
 
 
-static ngx_http_v2_huff_encode_code_t  ngx_http_v2_huff_encode_table[256] =
+static ngx_http_huff_encode_code_t  ngx_http_huff_encode_table[256] =
 {
     {0x00001ff8, 13}, {0x007fffd8, 23}, {0x0fffffe2, 28}, {0x0fffffe3, 28},
     {0x0fffffe4, 28}, {0x0fffffe5, 28}, {0x0fffffe6, 28}, {0x0fffffe7, 28},
@@ -87,7 +87,7 @@ static ngx_http_v2_huff_encode_code_t  ngx_http_v2_huff_encode_table[256] =
 
 
 /* same as above, but embeds lowercase transformation */
-static ngx_http_v2_huff_encode_code_t  ngx_http_v2_huff_encode_table_lc[256] =
+static ngx_http_huff_encode_code_t  ngx_http_huff_encode_table_lc[256] =
 {
     {0x00001ff8, 13}, {0x007fffd8, 23}, {0x0fffffe2, 28}, {0x0fffffe3, 28},
     {0x0fffffe4, 28}, {0x0fffffe5, 28}, {0x0fffffe6, 28}, {0x0fffffe7, 28},
@@ -161,10 +161,10 @@ static ngx_http_v2_huff_encode_code_t  ngx_http_v2_huff_encode_table_lc[256] =
 #if (NGX_HAVE_LITTLE_ENDIAN)
 
 #if (NGX_HAVE_GCC_BSWAP64)
-#define ngx_http_v2_huff_encode_buf(dst, buf)                                 \
+#define ngx_http_huff_encode_buf(dst, buf)                                    \
     (*(uint64_t *) (dst) = __builtin_bswap64(buf))
 #else
-#define ngx_http_v2_huff_encode_buf(dst, buf)                                 \
+#define ngx_http_huff_encode_buf(dst, buf)                                    \
     ((dst)[0] = (u_char) ((buf) >> 56),                                       \
      (dst)[1] = (u_char) ((buf) >> 48),                                       \
      (dst)[2] = (u_char) ((buf) >> 40),                                       \
@@ -176,28 +176,28 @@ static ngx_http_v2_huff_encode_code_t  ngx_http_v2_huff_encode_table_lc[256] =
 #endif
 
 #else /* !NGX_HAVE_LITTLE_ENDIAN */
-#define ngx_http_v2_huff_encode_buf(dst, buf)                                 \
+#define ngx_http_huff_encode_buf(dst, buf)                                    \
     (*(uint64_t *) (dst) = (buf))
 #endif
 
 #else /* NGX_PTR_SIZE == 4 */
 
-#define ngx_http_v2_huff_encode_buf(dst, buf)                                 \
+#define ngx_http_huff_encode_buf(dst, buf)                                    \
     (*(uint32_t *) (dst) = htonl(buf))
 
 #endif
 
 
 size_t
-ngx_http_v2_huff_encode(u_char *src, size_t len, u_char *dst, ngx_uint_t lower)
+ngx_http_huff_encode(u_char *src, size_t len, u_char *dst, ngx_uint_t lower)
 {
-    u_char                          *end;
-    size_t                           hlen;
-    ngx_uint_t                       buf, pending, code;
-    ngx_http_v2_huff_encode_code_t  *table, *next;
+    u_char                       *end;
+    size_t                        hlen;
+    ngx_uint_t                    buf, pending, code;
+    ngx_http_huff_encode_code_t  *table, *next;
 
-    table = lower ? ngx_http_v2_huff_encode_table_lc
-                  : ngx_http_v2_huff_encode_table;
+    table = lower ? ngx_http_huff_encode_table_lc
+                  : ngx_http_huff_encode_table;
     hlen = 0;
     buf = 0;
     pending = 0;
@@ -224,7 +224,7 @@ ngx_http_v2_huff_encode(u_char *src, size_t len, u_char *dst, ngx_uint_t lower)
 
         buf |= code >> pending;
 
-        ngx_http_v2_huff_encode_buf(&dst[hlen], buf);
+        ngx_http_huff_encode_buf(&dst[hlen], buf);
 
         hlen += sizeof(buf);
 
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index 20ad89a..6460da2 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -11,7 +11,7 @@
 
 
 static uint32_t  usual[] = {
-    0xffffdbfe, /* 1111 1111 1111 1111  1101 1011 1111 1110 */
+    0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
 
                 /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
     0x7fff37d6, /* 0111 1111 1111 1111  0011 0111 1101 0110 */
@@ -24,7 +24,7 @@ static uint32_t  usual[] = {
 #endif
 
                 /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-    0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+    0x7fffffff, /* 0111 1111 1111 1111  1111 1111 1111 1111 */
 
     0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
     0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
@@ -116,10 +116,8 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
         sw_host_end,
         sw_host_ip_literal,
         sw_port,
-        sw_host_http_09,
         sw_after_slash_in_uri,
         sw_check_uri,
-        sw_check_uri_http_09,
         sw_uri,
         sw_http_09,
         sw_http_H,
@@ -246,6 +244,11 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                         r->method = NGX_HTTP_OPTIONS;
                     }
 
+                    if (ngx_str7_cmp(m, 'C', 'O', 'N', 'N', 'E', 'C', 'T', ' '))
+                    {
+                        r->method = NGX_HTTP_CONNECT;
+                    }
+
                     break;
 
                 case 8:
@@ -393,7 +396,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                  */
                 r->uri_start = r->schema_end + 1;
                 r->uri_end = r->schema_end + 2;
-                state = sw_host_http_09;
+                state = sw_http_09;
                 break;
             default:
                 return NGX_HTTP_PARSE_INVALID_REQUEST;
@@ -467,35 +470,13 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                  */
                 r->uri_start = r->schema_end + 1;
                 r->uri_end = r->schema_end + 2;
-                state = sw_host_http_09;
+                state = sw_http_09;
                 break;
             default:
                 return NGX_HTTP_PARSE_INVALID_REQUEST;
             }
             break;
 
-        /* space+ after "http://host[:port] " */
-        case sw_host_http_09:
-            switch (ch) {
-            case ' ':
-                break;
-            case CR:
-                r->http_minor = 9;
-                state = sw_almost_done;
-                break;
-            case LF:
-                r->http_minor = 9;
-                goto done;
-            case 'H':
-                r->http_protocol.data = p;
-                state = sw_http_H;
-                break;
-            default:
-                return NGX_HTTP_PARSE_INVALID_REQUEST;
-            }
-            break;
-
-
         /* check "/.", "//", "%", and "\" (Win32) in URI */
         case sw_after_slash_in_uri:
 
@@ -507,7 +488,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
             switch (ch) {
             case ' ':
                 r->uri_end = p;
-                state = sw_check_uri_http_09;
+                state = sw_http_09;
                 break;
             case CR:
                 r->uri_end = p;
@@ -547,9 +528,10 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
             case '+':
                 r->plus_in_uri = 1;
                 break;
-            case '\0':
-                return NGX_HTTP_PARSE_INVALID_REQUEST;
             default:
+                if (ch < 0x20 || ch == 0x7f) {
+                    return NGX_HTTP_PARSE_INVALID_REQUEST;
+                }
                 state = sw_check_uri;
                 break;
             }
@@ -579,7 +561,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 break;
             case ' ':
                 r->uri_end = p;
-                state = sw_check_uri_http_09;
+                state = sw_http_09;
                 break;
             case CR:
                 r->uri_end = p;
@@ -611,36 +593,14 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
             case '+':
                 r->plus_in_uri = 1;
                 break;
-            case '\0':
-                return NGX_HTTP_PARSE_INVALID_REQUEST;
-            }
-            break;
-
-        /* space+ after URI */
-        case sw_check_uri_http_09:
-            switch (ch) {
-            case ' ':
-                break;
-            case CR:
-                r->http_minor = 9;
-                state = sw_almost_done;
-                break;
-            case LF:
-                r->http_minor = 9;
-                goto done;
-            case 'H':
-                r->http_protocol.data = p;
-                state = sw_http_H;
-                break;
             default:
-                r->space_in_uri = 1;
-                state = sw_check_uri;
-                p--;
+                if (ch < 0x20 || ch == 0x7f) {
+                    return NGX_HTTP_PARSE_INVALID_REQUEST;
+                }
                 break;
             }
             break;
 
-
         /* URI */
         case sw_uri:
 
@@ -665,8 +625,11 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
             case '#':
                 r->complex_uri = 1;
                 break;
-            case '\0':
-                return NGX_HTTP_PARSE_INVALID_REQUEST;
+            default:
+                if (ch < 0x20 || ch == 0x7f) {
+                    return NGX_HTTP_PARSE_INVALID_REQUEST;
+                }
+                break;
             }
             break;
 
@@ -687,10 +650,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
                 state = sw_http_H;
                 break;
             default:
-                r->space_in_uri = 1;
-                state = sw_uri;
-                p--;
-                break;
+                return NGX_HTTP_PARSE_INVALID_REQUEST;
             }
             break;
 
@@ -933,7 +893,8 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
                     break;
                 }
 
-                if (ch == '\0') {
+                if (ch <= 0x20 || ch == 0x7f || ch == ':') {
+                    r->header_end = p;
                     return NGX_HTTP_PARSE_INVALID_HEADER;
                 }
 
@@ -1001,7 +962,8 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
                 break;
             }
 
-            if (ch == '\0') {
+            if (ch <= 0x20 || ch == 0x7f) {
+                r->header_end = p;
                 return NGX_HTTP_PARSE_INVALID_HEADER;
             }
 
@@ -1024,6 +986,7 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
                 r->header_end = p;
                 goto done;
             case '\0':
+                r->header_end = p;
                 return NGX_HTTP_PARSE_INVALID_HEADER;
             default:
                 r->header_start = p;
@@ -1047,6 +1010,7 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
                 r->header_end = p;
                 goto done;
             case '\0':
+                r->header_end = p;
                 return NGX_HTTP_PARSE_INVALID_HEADER;
             }
             break;
@@ -1062,6 +1026,7 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
             case LF:
                 goto done;
             case '\0':
+                r->header_end = p;
                 return NGX_HTTP_PARSE_INVALID_HEADER;
             default:
                 state = sw_value;
@@ -1165,10 +1130,6 @@ ngx_http_parse_uri(ngx_http_request_t *r)
             }
 
             switch (ch) {
-            case ' ':
-                r->space_in_uri = 1;
-                state = sw_check_uri;
-                break;
             case '.':
                 r->complex_uri = 1;
                 state = sw_uri;
@@ -1199,6 +1160,9 @@ ngx_http_parse_uri(ngx_http_request_t *r)
                 r->plus_in_uri = 1;
                 break;
             default:
+                if (ch <= 0x20 || ch == 0x7f) {
+                    return NGX_ERROR;
+                }
                 state = sw_check_uri;
                 break;
             }
@@ -1226,9 +1190,6 @@ ngx_http_parse_uri(ngx_http_request_t *r)
             case '.':
                 r->uri_ext = p + 1;
                 break;
-            case ' ':
-                r->space_in_uri = 1;
-                break;
 #if (NGX_WIN32)
             case '\\':
                 r->complex_uri = 1;
@@ -1250,6 +1211,11 @@ ngx_http_parse_uri(ngx_http_request_t *r)
             case '+':
                 r->plus_in_uri = 1;
                 break;
+            default:
+                if (ch <= 0x20 || ch == 0x7f) {
+                    return NGX_ERROR;
+                }
+                break;
             }
             break;
 
@@ -1261,12 +1227,14 @@ ngx_http_parse_uri(ngx_http_request_t *r)
             }
 
             switch (ch) {
-            case ' ':
-                r->space_in_uri = 1;
-                break;
             case '#':
                 r->complex_uri = 1;
                 break;
+            default:
+                if (ch <= 0x20 || ch == 0x7f) {
+                    return NGX_ERROR;
+                }
+                break;
             }
             break;
         }
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 136c461..013b715 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -607,7 +607,7 @@ ngx_http_alloc_request(ngx_connection_t *c)
     }
 
 #if (NGX_HTTP_SSL)
-    if (c->ssl) {
+    if (c->ssl && !c->ssl->sendfile) {
         r->main_filter_need_in_memory = 1;
     }
 #endif
@@ -806,8 +806,7 @@ ngx_http_ssl_handshake_handler(ngx_connection_t *c)
         c->ssl->no_wait_shutdown = 1;
 
 #if (NGX_HTTP_V2                                                              \
-     && (defined TLSEXT_TYPE_application_layer_protocol_negotiation           \
-         || defined TLSEXT_TYPE_next_proto_neg))
+     && defined TLSEXT_TYPE_application_layer_protocol_negotiation)
         {
         unsigned int            len;
         const unsigned char    *data;
@@ -817,19 +816,8 @@ ngx_http_ssl_handshake_handler(ngx_connection_t *c)
 
         if (hc->addr_conf->http2) {
 
-#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
             SSL_get0_alpn_selected(c->ssl->connection, &data, &len);
 
-#ifdef TLSEXT_TYPE_next_proto_neg
-            if (len == 0) {
-                SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
-            }
-#endif
-
-#else /* TLSEXT_TYPE_next_proto_neg */
-            SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len);
-#endif
-
             if (len == 2 && data[0] == 'h' && data[1] == '2') {
                 ngx_http_v2_init(c->read);
                 return;
@@ -1043,12 +1031,14 @@ ngx_http_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg)
     }
 
     ngx_http_free_request(r, 0);
+    c->log->action = "SSL handshaking";
     c->destroyed = 0;
     return 1;
 
 failed:
 
     ngx_http_free_request(r, 0);
+    c->log->action = "SSL handshaking";
     c->destroyed = 0;
     return 0;
 }
@@ -1262,7 +1252,7 @@ ngx_http_process_request_uri(ngx_http_request_t *r)
     r->unparsed_uri.len = r->uri_end - r->uri_start;
     r->unparsed_uri.data = r->uri_start;
 
-    r->valid_unparsed_uri = (r->space_in_uri || r->empty_path_in_uri) ? 0 : 1;
+    r->valid_unparsed_uri = r->empty_path_in_uri ? 0 : 1;
 
     if (r->uri_ext) {
         if (r->args_start) {
@@ -1520,7 +1510,9 @@ ngx_http_process_request_headers(ngx_event_t *rev)
         /* rc == NGX_HTTP_PARSE_INVALID_HEADER */
 
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "client sent invalid header line");
+                      "client sent invalid header line: \"%*s\\x%02xd...\"",
+                      r->header_end - r->header_name_start,
+                      r->header_name_start, *r->header_end);
 
         ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
         break;
@@ -1978,20 +1970,28 @@ ngx_http_process_request_header(ngx_http_request_t *r)
         }
     }
 
-    if (r->method == NGX_HTTP_TRACE) {
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "client sent TRACE method");
-        ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
-        return NGX_ERROR;
-    }
-
     if (r->headers_in.transfer_encoding) {
+        if (r->http_version < NGX_HTTP_VERSION_11) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent HTTP/1.0 request with "
+                          "\"Transfer-Encoding\" header");
+            ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+            return NGX_ERROR;
+        }
+
         if (r->headers_in.transfer_encoding->value.len == 7
             && ngx_strncasecmp(r->headers_in.transfer_encoding->value.data,
                                (u_char *) "chunked", 7) == 0)
         {
-            r->headers_in.content_length = NULL;
-            r->headers_in.content_length_n = -1;
+            if (r->headers_in.content_length) {
+                ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                              "client sent \"Content-Length\" and "
+                              "\"Transfer-Encoding\" headers "
+                              "at the same time");
+                ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+                return NGX_ERROR;
+            }
+
             r->headers_in.chunked = 1;
 
         } else {
@@ -2011,6 +2011,20 @@ ngx_http_process_request_header(ngx_http_request_t *r)
         }
     }
 
+    if (r->method == NGX_HTTP_CONNECT) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent CONNECT method");
+        ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
+        return NGX_ERROR;
+    }
+
+    if (r->method == NGX_HTTP_TRACE) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent TRACE method");
+        ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
+        return NGX_ERROR;
+    }
+
     return NGX_OK;
 }
 
@@ -2158,15 +2172,16 @@ ngx_http_validate_host(ngx_str_t *host, ngx_pool_t *pool, ngx_uint_t alloc)
             }
             break;
 
-        case '\0':
-            return NGX_DECLINED;
-
         default:
 
             if (ngx_path_separator(ch)) {
                 return NGX_DECLINED;
             }
 
+            if (ch <= 0x20 || ch == 0x7f) {
+                return NGX_DECLINED;
+            }
+
             if (ch >= 'A' && ch <= 'Z') {
                 alloc = 1;
             }
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 6dfb4a4..b1269d2 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -25,22 +25,23 @@
 #define NGX_HTTP_VERSION_11                1001
 #define NGX_HTTP_VERSION_20                2000
 
-#define NGX_HTTP_UNKNOWN                   0x0001
-#define NGX_HTTP_GET                       0x0002
-#define NGX_HTTP_HEAD                      0x0004
-#define NGX_HTTP_POST                      0x0008
-#define NGX_HTTP_PUT                       0x0010
-#define NGX_HTTP_DELETE                    0x0020
-#define NGX_HTTP_MKCOL                     0x0040
-#define NGX_HTTP_COPY                      0x0080
-#define NGX_HTTP_MOVE                      0x0100
-#define NGX_HTTP_OPTIONS                   0x0200
-#define NGX_HTTP_PROPFIND                  0x0400
-#define NGX_HTTP_PROPPATCH                 0x0800
-#define NGX_HTTP_LOCK                      0x1000
-#define NGX_HTTP_UNLOCK                    0x2000
-#define NGX_HTTP_PATCH                     0x4000
-#define NGX_HTTP_TRACE                     0x8000
+#define NGX_HTTP_UNKNOWN                   0x00000001
+#define NGX_HTTP_GET                       0x00000002
+#define NGX_HTTP_HEAD                      0x00000004
+#define NGX_HTTP_POST                      0x00000008
+#define NGX_HTTP_PUT                       0x00000010
+#define NGX_HTTP_DELETE                    0x00000020
+#define NGX_HTTP_MKCOL                     0x00000040
+#define NGX_HTTP_COPY                      0x00000080
+#define NGX_HTTP_MOVE                      0x00000100
+#define NGX_HTTP_OPTIONS                   0x00000200
+#define NGX_HTTP_PROPFIND                  0x00000400
+#define NGX_HTTP_PROPPATCH                 0x00000800
+#define NGX_HTTP_LOCK                      0x00001000
+#define NGX_HTTP_UNLOCK                    0x00002000
+#define NGX_HTTP_PATCH                     0x00004000
+#define NGX_HTTP_TRACE                     0x00008000
+#define NGX_HTTP_CONNECT                   0x00010000
 
 #define NGX_HTTP_CONNECTION_CLOSE          1
 #define NGX_HTTP_CONNECTION_KEEP_ALIVE     2
@@ -301,6 +302,9 @@ typedef struct {
     ngx_chain_t                      *busy;
     ngx_http_chunked_t               *chunked;
     ngx_http_client_body_handler_pt   post_handler;
+    unsigned                          filter_need_buffering:1;
+    unsigned                          last_sent:1;
+    unsigned                          last_saved:1;
 } ngx_http_request_body_t;
 
 
@@ -467,9 +471,6 @@ struct ngx_http_request_s {
     /* URI with "+" */
     unsigned                          plus_in_uri:1;
 
-    /* URI with " " */
-    unsigned                          space_in_uri:1;
-
     /* URI with empty path */
     unsigned                          empty_path_in_uri:1;
 
diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index 0cae88f..ad3549f 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -62,11 +62,16 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
     /*
      * set by ngx_pcalloc():
      *
+     *     rb->temp_file = NULL;
      *     rb->bufs = NULL;
      *     rb->buf = NULL;
      *     rb->free = NULL;
      *     rb->busy = NULL;
      *     rb->chunked = NULL;
+     *     rb->received = 0;
+     *     rb->filter_need_buffering = 0;
+     *     rb->last_sent = 0;
+     *     rb->last_saved = 0;
      */
 
     rb->rest = -1;
@@ -144,7 +149,7 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
         }
     }
 
-    if (rb->rest == 0) {
+    if (rb->rest == 0 && rb->last_saved) {
         /* the whole request body was pre-read */
         r->request_body_no_buffering = 0;
         post_handler(r);
@@ -172,6 +177,10 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
             size += preread;
         }
 
+        if (size == 0) {
+            size++;
+        }
+
     } else {
         size = clcf->client_body_buffer_size;
     }
@@ -270,6 +279,7 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
     size_t                     size;
     ssize_t                    n;
     ngx_int_t                  rc;
+    ngx_uint_t                 flush;
     ngx_chain_t                out;
     ngx_connection_t          *c;
     ngx_http_request_body_t   *rb;
@@ -277,12 +287,17 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
 
     c = r->connection;
     rb = r->request_body;
+    flush = 1;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http read client request body");
 
     for ( ;; ) {
         for ( ;; ) {
+            if (rb->rest == 0) {
+                break;
+            }
+
             if (rb->buf->last == rb->buf->end) {
 
                 /* update chains */
@@ -306,12 +321,25 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
                         return NGX_AGAIN;
                     }
 
+                    if (rb->filter_need_buffering) {
+                        clcf = ngx_http_get_module_loc_conf(r,
+                                                         ngx_http_core_module);
+                        ngx_add_timer(c->read, clcf->client_body_timeout);
+
+                        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                        }
+
+                        return NGX_AGAIN;
+                    }
+
                     ngx_log_error(NGX_LOG_ALERT, c->log, 0,
                                   "busy buffers after request body flush");
 
                     return NGX_HTTP_INTERNAL_SERVER_ERROR;
                 }
 
+                flush = 0;
                 rb->buf->pos = rb->buf->start;
                 rb->buf->last = rb->buf->start;
             }
@@ -323,6 +351,10 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
                 size = (size_t) rest;
             }
 
+            if (size == 0) {
+                break;
+            }
+
             n = c->recv(c, rb->buf->last, size);
 
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
@@ -347,6 +379,7 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
 
             /* pass buffer to request body filter chain */
 
+            flush = 0;
             out.buf = rb->buf;
             out.next = NULL;
 
@@ -368,11 +401,19 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
                        "http client request body rest %O", rb->rest);
 
-        if (rb->rest == 0) {
+        if (flush) {
+            rc = ngx_http_request_body_filter(r, NULL);
+
+            if (rc != NGX_OK) {
+                return rc;
+            }
+        }
+
+        if (rb->rest == 0 && rb->last_saved) {
             break;
         }
 
-        if (!c->read->ready) {
+        if (!c->read->ready || rb->rest == 0) {
 
             clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
             ngx_add_timer(c->read, clcf->client_body_timeout);
@@ -939,15 +980,32 @@ ngx_http_request_body_length_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     rb = r->request_body;
 
+    out = NULL;
+    ll = &out;
+
     if (rb->rest == -1) {
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "http request body content length filter");
 
         rb->rest = r->headers_in.content_length_n;
-    }
 
-    out = NULL;
-    ll = &out;
+        if (rb->rest == 0) {
+
+            tl = ngx_chain_get_free_buf(r->pool, &rb->free);
+            if (tl == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            b = tl->buf;
+
+            ngx_memzero(b, sizeof(ngx_buf_t));
+
+            b->last_buf = 1;
+
+            *ll = tl;
+            ll = &tl->next;
+        }
+    }
 
     for (cl = in; cl; cl = cl->next) {
 
@@ -1011,6 +1069,9 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     rb = r->request_body;
 
+    out = NULL;
+    ll = &out;
+
     if (rb->rest == -1) {
 
         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -1027,9 +1088,6 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
         rb->rest = cscf->large_client_header_buffers.size;
     }
 
-    out = NULL;
-    ll = &out;
-
     for (cl = in; cl; cl = cl->next) {
 
         b = NULL;
@@ -1186,15 +1244,16 @@ ngx_int_t
 ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
 {
     ngx_buf_t                 *b;
-    ngx_chain_t               *cl;
+    ngx_chain_t               *cl, *tl, **ll;
     ngx_http_request_body_t   *rb;
 
     rb = r->request_body;
 
-#if (NGX_DEBUG)
+    ll = &rb->bufs;
+
+    for (cl = rb->bufs; cl; cl = cl->next) {
 
 #if 0
-    for (cl = rb->bufs; cl; cl = cl->next) {
         ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
                        "http body old buf t:%d f:%d %p, pos %p, size: %z "
                        "file: %O, size: %O",
@@ -1203,10 +1262,13 @@ ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
                        cl->buf->last - cl->buf->pos,
                        cl->buf->file_pos,
                        cl->buf->file_last - cl->buf->file_pos);
-    }
 #endif
 
+        ll = &cl->next;
+    }
+
     for (cl = in; cl; cl = cl->next) {
+
         ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
                        "http body new buf t:%d f:%d %p, pos %p, size: %z "
                        "file: %O, size: %O",
@@ -1215,15 +1277,31 @@ ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
                        cl->buf->last - cl->buf->pos,
                        cl->buf->file_pos,
                        cl->buf->file_last - cl->buf->file_pos);
+
+        if (cl->buf->last_buf) {
+
+            if (rb->last_saved) {
+                ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                              "duplicate last buf in save filter");
+                *ll = NULL;
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            rb->last_saved = 1;
+        }
+
+        tl = ngx_alloc_chain_link(r->pool);
+        if (tl == NULL) {
+            *ll = NULL;
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        tl->buf = cl->buf;
+        *ll = tl;
+        ll = &tl->next;
     }
 
-#endif
-
-    /* TODO: coalesce neighbouring buffers */
-
-    if (ngx_chain_add_copy(r->pool, &rb->bufs, in) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
+    *ll = NULL;
 
     if (r->request_body_no_buffering) {
         return NGX_OK;
@@ -1231,7 +1309,7 @@ ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     if (rb->rest > 0) {
 
-        if (rb->buf && rb->buf->last == rb->buf->end
+        if (rb->bufs && rb->buf && rb->buf->last == rb->buf->end
             && ngx_http_write_request_body(r) != NGX_OK)
         {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
@@ -1240,10 +1318,18 @@ ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return NGX_OK;
     }
 
-    /* rb->rest == 0 */
+    if (!rb->last_saved) {
+        return NGX_OK;
+    }
 
     if (rb->temp_file || r->request_body_in_file_only) {
 
+        if (rb->bufs && rb->bufs->buf->in_file) {
+            ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                          "body already in file");
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
         if (ngx_http_write_request_body(r) != NGX_OK) {
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 13c57d6..bebdbd9 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -250,7 +250,7 @@ ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     cv = (ngx_http_complex_value_t **) (p + cmd->offset);
 
-    if (*cv != NULL) {
+    if (*cv != NGX_CONF_UNSET_PTR && *cv != NULL) {
         return "is duplicate";
     }
 
@@ -275,6 +275,44 @@ ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+char *
+ngx_http_set_complex_value_zero_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t                          *value;
+    ngx_http_complex_value_t          **cv;
+    ngx_http_compile_complex_value_t    ccv;
+
+    cv = (ngx_http_complex_value_t **) (p + cmd->offset);
+
+    if (*cv != NGX_CONF_UNSET_PTR) {
+        return "is duplicate";
+    }
+
+    *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+    if (*cv == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = *cv;
+    ccv.zero = 1;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 char *
 ngx_http_set_complex_value_size_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
diff --git a/src/http/ngx_http_script.h b/src/http/ngx_http_script.h
index a6b345e..4360038 100644
--- a/src/http/ngx_http_script.h
+++ b/src/http/ngx_http_script.h
@@ -216,6 +216,8 @@ size_t ngx_http_complex_value_size(ngx_http_request_t *r,
 ngx_int_t ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv);
 char *ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+char *ngx_http_set_complex_value_zero_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 char *ngx_http_set_complex_value_size_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index b682af5..ded833c 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -187,6 +187,8 @@ static void ngx_http_upstream_ssl_handshake(ngx_http_request_t *,
 static void ngx_http_upstream_ssl_save_session(ngx_connection_t *c);
 static ngx_int_t ngx_http_upstream_ssl_name(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_connection_t *c);
+static ngx_int_t ngx_http_upstream_ssl_certificate(ngx_http_request_t *r,
+    ngx_http_upstream_t *u, ngx_connection_t *c);
 #endif
 
 
@@ -1509,8 +1511,9 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
 static void
 ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
 {
-    ngx_int_t          rc;
-    ngx_connection_t  *c;
+    ngx_int_t                  rc;
+    ngx_connection_t          *c;
+    ngx_http_core_loc_conf_t  *clcf;
 
     r->connection->log->action = "connecting to upstream";
 
@@ -1597,10 +1600,12 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */
 
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
     u->writer.out = NULL;
     u->writer.last = &u->writer.out;
     u->writer.connection = c;
-    u->writer.limit = 0;
+    u->writer.limit = clcf->sendfile_max_chunk;
 
     if (u->request_sent) {
         if (ngx_http_upstream_reinit(r, u) != NGX_OK) {
@@ -1681,9 +1686,6 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
         return;
     }
 
-    c->sendfile = 0;
-    u->output.sendfile = 0;
-
     if (u->conf->ssl_server_name || u->conf->ssl_verify) {
         if (ngx_http_upstream_ssl_name(r, u, c) != NGX_OK) {
             ngx_http_upstream_finalize_request(r, u,
@@ -1692,6 +1694,16 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
         }
     }
 
+    if (u->conf->ssl_certificate && (u->conf->ssl_certificate->lengths
+                                     || u->conf->ssl_certificate_key->lengths))
+    {
+        if (ngx_http_upstream_ssl_certificate(r, u, c) != NGX_OK) {
+            ngx_http_upstream_finalize_request(r, u,
+                                               NGX_HTTP_INTERNAL_SERVER_ERROR);
+            return;
+        }
+    }
+
     if (u->conf->ssl_session_reuse) {
         c->ssl->save_session = ngx_http_upstream_ssl_save_session;
 
@@ -1779,6 +1791,11 @@ ngx_http_upstream_ssl_handshake(ngx_http_request_t *r, ngx_http_upstream_t *u,
             }
         }
 
+        if (!c->ssl->sendfile) {
+            c->sendfile = 0;
+            u->output.sendfile = 0;
+        }
+
         c->write->handler = ngx_http_upstream_handler;
         c->read->handler = ngx_http_upstream_handler;
 
@@ -1912,6 +1929,45 @@ done:
     return NGX_OK;
 }
 
+
+static ngx_int_t
+ngx_http_upstream_ssl_certificate(ngx_http_request_t *r,
+    ngx_http_upstream_t *u, ngx_connection_t *c)
+{
+    ngx_str_t  cert, key;
+
+    if (ngx_http_complex_value(r, u->conf->ssl_certificate, &cert)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http upstream ssl cert: \"%s\"", cert.data);
+
+    if (*cert.data == '\0') {
+        return NGX_OK;
+    }
+
+    if (ngx_http_complex_value(r, u->conf->ssl_certificate_key, &key)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http upstream ssl key: \"%s\"", key.data);
+
+    if (ngx_ssl_connection_certificate(c, r->pool, &cert, &key,
+                                       u->conf->ssl_passwords)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
 #endif
 
 
@@ -3791,6 +3847,7 @@ ngx_http_upstream_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
 {
     ngx_str_t                  name;
     ngx_event_pipe_t          *p;
+    ngx_connection_t          *c;
     ngx_thread_pool_t         *tp;
     ngx_http_request_t        *r;
     ngx_http_core_loc_conf_t  *clcf;
@@ -3798,6 +3855,27 @@ ngx_http_upstream_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
     r = file->thread_ctx;
     p = r->upstream->pipe;
 
+    if (r->aio) {
+        /*
+         * tolerate sendfile() calls if another operation is already
+         * running; this can happen due to subrequests, multiple calls
+         * of the next body filter from a filter, or in HTTP/2 due to
+         * a write event on the main connection
+         */
+
+        c = r->connection;
+
+#if (NGX_HTTP_V2)
+        if (r->stream) {
+            c = r->stream->connection->connection;
+        }
+#endif
+
+        if (task == c->sendfile_task) {
+            return NGX_OK;
+        }
+    }
+
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
     tp = clcf->thread_pool;
 
@@ -3849,6 +3927,20 @@ ngx_http_upstream_thread_event_handler(ngx_event_t *ev)
     r->main->blocked--;
     r->aio = 0;
 
+#if (NGX_HTTP_V2)
+
+    if (r->stream) {
+        /*
+         * for HTTP/2, update write event to make sure processing will
+         * reach the main connection to handle sendfile() in threads
+         */
+
+        c->write->ready = 1;
+        c->write->active = 0;
+    }
+
+#endif
+
     if (r->done) {
         /*
          * trigger connection event handler if the subrequest was
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index fd642c2..3db7b06 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -234,6 +234,10 @@ typedef struct {
     ngx_http_complex_value_t        *ssl_name;
     ngx_flag_t                       ssl_server_name;
     ngx_flag_t                       ssl_verify;
+
+    ngx_http_complex_value_t        *ssl_certificate;
+    ngx_http_complex_value_t        *ssl_certificate_key;
+    ngx_array_t                     *ssl_passwords;
 #endif
 
     ngx_str_t                        module;
diff --git a/src/http/ngx_http_write_filter_module.c b/src/http/ngx_http_write_filter_module.c
index 6a5d957..932f26d 100644
--- a/src/http/ngx_http_write_filter_module.c
+++ b/src/http/ngx_http_write_filter_module.c
@@ -321,18 +321,13 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
         delay = (ngx_msec_t) ((nsent - sent) * 1000 / r->limit_rate);
 
         if (delay > 0) {
-            limit = 0;
             c->write->delayed = 1;
             ngx_add_timer(c->write, delay);
         }
     }
 
-    if (limit
-        && c->write->ready
-        && c->sent - sent >= limit - (off_t) (2 * ngx_pagesize))
-    {
-        c->write->delayed = 1;
-        ngx_add_timer(c->write, 1);
+    if (chain && c->write->ready && !c->write->delayed) {
+        ngx_post_event(c->write, &ngx_posted_next_events);
     }
 
     for (cl = r->out; cl && cl != chain; /* void */) {
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 3611a2e..0e45a7b 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -173,7 +173,7 @@ static ngx_int_t ngx_http_v2_construct_cookie_header(ngx_http_request_t *r);
 static void ngx_http_v2_run_request(ngx_http_request_t *r);
 static void ngx_http_v2_run_request_handler(ngx_event_t *ev);
 static ngx_int_t ngx_http_v2_process_request_body(ngx_http_request_t *r,
-    u_char *pos, size_t size, ngx_uint_t last);
+    u_char *pos, size_t size, ngx_uint_t last, ngx_uint_t flush);
 static ngx_int_t ngx_http_v2_filter_request_body(ngx_http_request_t *r);
 static void ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r);
 
@@ -1140,9 +1140,10 @@ ngx_http_v2_state_read_data(ngx_http_v2_connection_t *h2c, u_char *pos,
     h2c->payload_bytes += size;
 
     if (r->request_body) {
-        rc = ngx_http_v2_process_request_body(r, pos, size, stream->in_closed);
+        rc = ngx_http_v2_process_request_body(r, pos, size,
+                                              stream->in_closed, 0);
 
-        if (rc != NGX_OK) {
+        if (rc != NGX_OK && rc != NGX_AGAIN) {
             stream->skip_data = 1;
             ngx_http_finalize_request(r, rc);
         }
@@ -1599,10 +1600,10 @@ ngx_http_v2_state_field_huff(ngx_http_v2_connection_t *h2c, u_char *pos,
     h2c->state.length -= size;
     h2c->state.field_rest -= size;
 
-    if (ngx_http_v2_huff_decode(&h2c->state.field_state, pos, size,
-                                &h2c->state.field_end,
-                                h2c->state.field_rest == 0,
-                                h2c->connection->log)
+    if (ngx_http_huff_decode(&h2c->state.field_state, pos, size,
+                             &h2c->state.field_end,
+                             h2c->state.field_rest == 0,
+                             h2c->connection->log)
         != NGX_OK)
     {
         ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
@@ -3457,7 +3458,7 @@ ngx_http_v2_validate_header(ngx_http_request_t *r, ngx_http_v2_header_t *header)
             continue;
         }
 
-        if (ch == '\0' || ch == LF || ch == CR || ch == ':'
+        if (ch <= 0x20 || ch == 0x7f || ch == ':'
             || (ch >= 'A' && ch <= 'Z'))
         {
             ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
@@ -3606,7 +3607,8 @@ ngx_http_v2_parse_method(ngx_http_request_t *r, ngx_str_t *value)
         { 4, "LOCK",      NGX_HTTP_LOCK },
         { 6, "UNLOCK",    NGX_HTTP_UNLOCK },
         { 5, "PATCH",     NGX_HTTP_PATCH },
-        { 5, "TRACE",     NGX_HTTP_TRACE }
+        { 5, "TRACE",     NGX_HTTP_TRACE },
+        { 7, "CONNECT",   NGX_HTTP_CONNECT }
     }, *test;
 
     if (r->method_name.len) {
@@ -4026,16 +4028,30 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r)
         return NGX_OK;
     }
 
+    rb->rest = 1;
+
+    /* set rb->filter_need_buffering */
+
+    rc = ngx_http_top_request_body_filter(r, NULL);
+
+    if (rc != NGX_OK) {
+        stream->skip_data = 1;
+        return rc;
+    }
+
     h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     len = r->headers_in.content_length_n;
 
-    if (r->request_body_no_buffering && !stream->in_closed) {
+    if (len < 0 || len > (off_t) clcf->client_body_buffer_size) {
+        len = clcf->client_body_buffer_size;
 
-        if (len < 0 || len > (off_t) clcf->client_body_buffer_size) {
-            len = clcf->client_body_buffer_size;
-        }
+    } else {
+        len++;
+    }
+
+    if (r->request_body_no_buffering || rb->filter_need_buffering) {
 
         /*
          * We need a room to store data up to the stream's initial window size,
@@ -4049,57 +4065,54 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r)
         if (len > NGX_HTTP_V2_MAX_WINDOW) {
             len = NGX_HTTP_V2_MAX_WINDOW;
         }
-
-        rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
-
-    } else if (len >= 0 && len <= (off_t) clcf->client_body_buffer_size
-               && !r->request_body_in_file_only)
-    {
-        rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
-
-    } else {
-        rb->buf = ngx_calloc_buf(r->pool);
-
-        if (rb->buf != NULL) {
-            rb->buf->sync = 1;
-        }
     }
 
+    rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
+
     if (rb->buf == NULL) {
         stream->skip_data = 1;
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    rb->rest = 1;
-
     buf = stream->preread;
 
     if (stream->in_closed) {
-        r->request_body_no_buffering = 0;
+        if (!rb->filter_need_buffering) {
+            r->request_body_no_buffering = 0;
+        }
 
         if (buf) {
             rc = ngx_http_v2_process_request_body(r, buf->pos,
-                                                  buf->last - buf->pos, 1);
+                                                  buf->last - buf->pos, 1, 0);
             ngx_pfree(r->pool, buf->start);
+
+        } else {
+            rc = ngx_http_v2_process_request_body(r, NULL, 0, 1, 0);
+        }
+
+        if (rc != NGX_AGAIN) {
             return rc;
         }
 
-        return ngx_http_v2_process_request_body(r, NULL, 0, 1);
+        r->read_event_handler = ngx_http_v2_read_client_request_body_handler;
+        r->write_event_handler = ngx_http_request_empty_handler;
+
+        return NGX_AGAIN;
     }
 
     if (buf) {
         rc = ngx_http_v2_process_request_body(r, buf->pos,
-                                              buf->last - buf->pos, 0);
+                                              buf->last - buf->pos, 0, 0);
 
         ngx_pfree(r->pool, buf->start);
 
-        if (rc != NGX_OK) {
+        if (rc != NGX_OK && rc != NGX_AGAIN) {
             stream->skip_data = 1;
             return rc;
         }
     }
 
-    if (r->request_body_no_buffering) {
+    if (r->request_body_no_buffering || rb->filter_need_buffering) {
         size = (size_t) len - h2scf->preread_size;
 
     } else {
@@ -4141,9 +4154,9 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r)
 
 static ngx_int_t
 ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
-    size_t size, ngx_uint_t last)
+    size_t size, ngx_uint_t last, ngx_uint_t flush)
 {
-    ngx_buf_t                 *buf;
+    size_t                     n;
     ngx_int_t                  rc;
     ngx_connection_t          *fc;
     ngx_http_request_body_t   *rb;
@@ -4151,77 +4164,122 @@ ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
 
     fc = r->connection;
     rb = r->request_body;
-    buf = rb->buf;
 
-    if (size) {
-        if (buf->sync) {
-            buf->pos = buf->start = pos;
-            buf->last = buf->end = pos + size;
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 process request body");
 
-            r->request_body_in_file_only = 1;
+    if (size == 0 && !last && !flush) {
+        return NGX_AGAIN;
+    }
 
-        } else {
-            if (size > (size_t) (buf->end - buf->last)) {
-                ngx_log_error(NGX_LOG_INFO, fc->log, 0,
-                              "client intended to send body data "
-                              "larger than declared");
+    for ( ;; ) {
+        for ( ;; ) {
+            if (rb->buf->last == rb->buf->end && size) {
 
-                return NGX_HTTP_BAD_REQUEST;
+                if (r->request_body_no_buffering) {
+
+                    /* should never happen due to flow control */
+
+                    ngx_log_error(NGX_LOG_ALERT, fc->log, 0,
+                                  "no space in http2 body buffer");
+
+                    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                }
+
+                /* update chains */
+
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                               "http2 body update chains");
+
+                rc = ngx_http_v2_filter_request_body(r);
+
+                if (rc != NGX_OK) {
+                    return rc;
+                }
+
+                if (rb->busy != NULL) {
+                    ngx_log_error(NGX_LOG_ALERT, fc->log, 0,
+                                  "busy buffers after request body flush");
+                    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                }
+
+                rb->buf->pos = rb->buf->start;
+                rb->buf->last = rb->buf->start;
             }
 
-            buf->last = ngx_cpymem(buf->last, pos, size);
+            /* copy body data to the buffer */
+
+            n = rb->buf->end - rb->buf->last;
+
+            if (n > size) {
+                n = size;
+            }
+
+            if (n > 0) {
+                rb->buf->last = ngx_cpymem(rb->buf->last, pos, n);
+            }
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                           "http2 request body recv %uz", n);
+
+            pos += n;
+            size -= n;
+
+            if (size == 0 && last) {
+                rb->rest = 0;
+            }
+
+            if (size == 0) {
+                break;
+            }
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                       "http2 request body rest %O", rb->rest);
+
+        if (flush) {
+            rc = ngx_http_v2_filter_request_body(r);
+
+            if (rc != NGX_OK) {
+                return rc;
+            }
+        }
+
+        if (rb->rest == 0 && rb->last_saved) {
+            break;
+        }
+
+        if (size == 0) {
+            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+            ngx_add_timer(fc->read, clcf->client_body_timeout);
+
+            if (!flush) {
+                ngx_post_event(fc->read, &ngx_posted_events);
+            }
+
+            return NGX_AGAIN;
         }
     }
 
-    if (last) {
-        rb->rest = 0;
-
-        if (fc->read->timer_set) {
-            ngx_del_timer(fc->read);
-        }
-
-        if (r->request_body_no_buffering) {
-            ngx_post_event(fc->read, &ngx_posted_events);
-            return NGX_OK;
-        }
-
-        rc = ngx_http_v2_filter_request_body(r);
-
-        if (rc != NGX_OK) {
-            return rc;
-        }
-
-        if (buf->sync) {
-            /* prevent reusing this buffer in the upstream module */
-            rb->buf = NULL;
-        }
-
-        if (r->headers_in.chunked) {
-            r->headers_in.content_length_n = rb->received;
-        }
-
-        r->read_event_handler = ngx_http_block_reading;
-        rb->post_handler(r);
-
-        return NGX_OK;
+    if (fc->read->timer_set) {
+        ngx_del_timer(fc->read);
     }
 
-    if (size == 0) {
-        return NGX_OK;
-    }
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-    ngx_add_timer(fc->read, clcf->client_body_timeout);
-
     if (r->request_body_no_buffering) {
-        ngx_post_event(fc->read, &ngx_posted_events);
+        if (!flush) {
+            ngx_post_event(fc->read, &ngx_posted_events);
+        }
+
         return NGX_OK;
     }
 
-    if (buf->sync) {
-        return ngx_http_v2_filter_request_body(r);
+    if (r->headers_in.chunked) {
+        r->headers_in.content_length_n = rb->received;
     }
 
+    r->read_event_handler = ngx_http_block_reading;
+    rb->post_handler(r);
+
     return NGX_OK;
 }
 
@@ -4238,7 +4296,7 @@ ngx_http_v2_filter_request_body(ngx_http_request_t *r)
     rb = r->request_body;
     buf = rb->buf;
 
-    if (buf->pos == buf->last && rb->rest) {
+    if (buf->pos == buf->last && (rb->rest || rb->last_sent)) {
         cl = NULL;
         goto update;
     }
@@ -4301,6 +4359,7 @@ ngx_http_v2_filter_request_body(ngx_http_request_t *r)
         }
 
         b->last_buf = 1;
+        rb->last_sent = 1;
     }
 
     b->tag = (ngx_buf_tag_t) &ngx_http_v2_filter_request_body;
@@ -4320,7 +4379,12 @@ update:
 static void
 ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r)
 {
-    ngx_connection_t  *fc;
+    size_t                     window;
+    ngx_buf_t                 *buf;
+    ngx_int_t                  rc;
+    ngx_connection_t          *fc;
+    ngx_http_v2_stream_t      *stream;
+    ngx_http_v2_connection_t  *h2c;
 
     fc = r->connection;
 
@@ -4346,6 +4410,75 @@ ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r)
         ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
         return;
     }
+
+    rc = ngx_http_v2_process_request_body(r, NULL, 0, r->stream->in_closed, 1);
+
+    if (rc != NGX_OK && rc != NGX_AGAIN) {
+        r->stream->skip_data = 1;
+        ngx_http_finalize_request(r, rc);
+        return;
+    }
+
+    if (rc == NGX_OK) {
+        return;
+    }
+
+    if (r->stream->no_flow_control) {
+        return;
+    }
+
+    if (r->request_body->rest == 0) {
+        return;
+    }
+
+    if (r->request_body->busy != NULL) {
+        return;
+    }
+
+    stream = r->stream;
+    h2c = stream->connection;
+
+    buf = r->request_body->buf;
+
+    buf->pos = buf->start;
+    buf->last = buf->start;
+
+    window = buf->end - buf->start;
+
+    if (h2c->state.stream == stream) {
+        window -= h2c->state.length;
+    }
+
+    if (window <= stream->recv_window) {
+        if (window < stream->recv_window) {
+            ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                          "http2 negative window update");
+
+            stream->skip_data = 1;
+
+            ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+            return;
+        }
+
+        return;
+    }
+
+    if (ngx_http_v2_send_window_update(h2c, stream->node->id,
+                                       window - stream->recv_window)
+        == NGX_ERROR)
+    {
+        stream->skip_data = 1;
+        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    stream->recv_window = window;
+
+    if (ngx_http_v2_send_output_queue(h2c) == NGX_ERROR) {
+        stream->skip_data = 1;
+        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return;
+    }
 }
 
 
@@ -4358,11 +4491,13 @@ ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r)
     ngx_connection_t          *fc;
     ngx_http_v2_stream_t      *stream;
     ngx_http_v2_connection_t  *h2c;
-    ngx_http_core_loc_conf_t  *clcf;
 
     stream = r->stream;
     fc = r->connection;
 
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 read unbuffered request body");
+
     if (fc->read->timedout) {
         if (stream->recv_window) {
             stream->skip_data = 1;
@@ -4379,17 +4514,21 @@ ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r)
         return NGX_HTTP_BAD_REQUEST;
     }
 
-    rc = ngx_http_v2_filter_request_body(r);
+    rc = ngx_http_v2_process_request_body(r, NULL, 0, r->stream->in_closed, 1);
 
-    if (rc != NGX_OK) {
+    if (rc != NGX_OK && rc != NGX_AGAIN) {
         stream->skip_data = 1;
         return rc;
     }
 
-    if (!r->request_body->rest) {
+    if (rc == NGX_OK) {
         return NGX_OK;
     }
 
+    if (r->request_body->rest == 0) {
+        return NGX_AGAIN;
+    }
+
     if (r->request_body->busy != NULL) {
         return NGX_AGAIN;
     }
@@ -4430,11 +4569,6 @@ ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    if (stream->recv_window == 0) {
-        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-        ngx_add_timer(fc->read, clcf->client_body_timeout);
-    }
-
     stream->recv_window = window;
 
     return NGX_AGAIN;
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 3492297..70ee287 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -13,8 +13,7 @@
 #include <ngx_http.h>
 
 
-#define NGX_HTTP_V2_ALPN_ADVERTISE       "\x02h2"
-#define NGX_HTTP_V2_NPN_ADVERTISE        NGX_HTTP_V2_ALPN_ADVERTISE
+#define NGX_HTTP_V2_ALPN_PROTO           "\x02h2"
 
 #define NGX_HTTP_V2_STATE_BUFFER_SIZE    16
 
@@ -312,12 +311,6 @@ ngx_int_t ngx_http_v2_add_header(ngx_http_v2_connection_t *h2c,
 ngx_int_t ngx_http_v2_table_size(ngx_http_v2_connection_t *h2c, size_t size);
 
 
-ngx_int_t ngx_http_v2_huff_decode(u_char *state, u_char *src, size_t len,
-    u_char **dst, ngx_uint_t last, ngx_log_t *log);
-size_t ngx_http_v2_huff_encode(u_char *src, size_t len, u_char *dst,
-    ngx_uint_t lower);
-
-
 #define ngx_http_v2_prefix(bits)  ((1 << (bits)) - 1)
 
 
diff --git a/src/http/v2/ngx_http_v2_encode.c b/src/http/v2/ngx_http_v2_encode.c
index ac79208..8798aa9 100644
--- a/src/http/v2/ngx_http_v2_encode.c
+++ b/src/http/v2/ngx_http_v2_encode.c
@@ -20,7 +20,7 @@ ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len, u_char *tmp,
 {
     size_t  hlen;
 
-    hlen = ngx_http_v2_huff_encode(src, len, tmp, lower);
+    hlen = ngx_http_huff_encode(src, len, tmp, lower);
 
     if (hlen > 0) {
         *dst = NGX_HTTP_V2_ENCODE_HUFF;
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index a6e5e7d..9ffb155 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -1432,6 +1432,9 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
     size = 0;
 #endif
 
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+                   "http2 send chain: %p", in);
+
     while (in) {
         size = ngx_buf_size(in->buf);
 
@@ -1450,12 +1453,8 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
             return NGX_CHAIN_ERROR;
         }
 
-        if (stream->queued) {
-            fc->write->active = 1;
-            fc->write->ready = 0;
-
-        } else {
-            fc->buffered &= ~NGX_HTTP_V2_BUFFERED;
+        if (ngx_http_v2_filter_send(fc, stream) == NGX_ERROR) {
+            return NGX_CHAIN_ERROR;
         }
 
         return NULL;
@@ -1464,9 +1463,16 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
     h2c = stream->connection;
 
     if (size && ngx_http_v2_flow_control(h2c, stream) == NGX_DECLINED) {
-        fc->write->active = 1;
-        fc->write->ready = 0;
-        return in;
+
+        if (ngx_http_v2_filter_send(fc, stream) == NGX_ERROR) {
+            return NGX_CHAIN_ERROR;
+        }
+
+        if (ngx_http_v2_flow_control(h2c, stream) == NGX_DECLINED) {
+            fc->write->active = 1;
+            fc->write->ready = 0;
+            return in;
+        }
     }
 
     if (in->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_filter_get_shadow) {
@@ -1809,6 +1815,11 @@ ngx_http_v2_waiting_queue(ngx_http_v2_connection_t *h2c,
 static ngx_inline ngx_int_t
 ngx_http_v2_filter_send(ngx_connection_t *fc, ngx_http_v2_stream_t *stream)
 {
+    if (stream->queued == 0) {
+        fc->buffered &= ~NGX_HTTP_V2_BUFFERED;
+        return NGX_OK;
+    }
+
     stream->blocked = 1;
 
     if (ngx_http_v2_send_output_queue(stream->connection) == NGX_ERROR) {
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index b865a3b..e0c62b7 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -115,6 +115,8 @@ typedef struct {
     ngx_msec_t              timeout;
     ngx_msec_t              resolver_timeout;
 
+    ngx_uint_t              max_errors;
+
     ngx_str_t               server_name;
 
     u_char                 *file_name;
@@ -231,14 +233,15 @@ typedef struct {
     ngx_uint_t              command;
     ngx_array_t             args;
 
+    ngx_uint_t              errors;
     ngx_uint_t              login_attempt;
 
     /* used to parse POP3/IMAP/SMTP command */
 
     ngx_uint_t              state;
+    u_char                 *tag_start;
     u_char                 *cmd_start;
     u_char                 *arg_start;
-    u_char                 *arg_end;
     ngx_uint_t              literal_len;
 } ngx_mail_session_t;
 
@@ -321,6 +324,7 @@ typedef ngx_int_t (*ngx_mail_parse_command_pt)(ngx_mail_session_t *s);
 
 struct ngx_mail_protocol_s {
     ngx_str_t                   name;
+    ngx_str_t                   alpn;
     in_port_t                   port[4];
     ngx_uint_t                  type;
 
diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c
index 2a198f4..27f64b9 100644
--- a/src/mail/ngx_mail_auth_http_module.c
+++ b/src/mail/ngx_mail_auth_http_module.c
@@ -1137,8 +1137,8 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
     ngx_str_t                  login, passwd;
     ngx_connection_t          *c;
 #if (NGX_MAIL_SSL)
-    ngx_str_t                  verify, subject, issuer, serial, fingerprint,
-                               raw_cert, cert;
+    ngx_str_t                  protocol, cipher, verify, subject, issuer,
+                               serial, fingerprint, raw_cert, cert;
     ngx_mail_ssl_conf_t       *sslcf;
 #endif
     ngx_mail_core_srv_conf_t  *cscf;
@@ -1155,6 +1155,25 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
 
 #if (NGX_MAIL_SSL)
 
+    if (c->ssl) {
+
+        if (ngx_ssl_get_protocol(c, pool, &protocol) != NGX_OK) {
+            return NULL;
+        }
+
+        protocol.len = ngx_strlen(protocol.data);
+
+        if (ngx_ssl_get_cipher_name(c, pool, &cipher) != NGX_OK) {
+            return NULL;
+        }
+
+        cipher.len = ngx_strlen(cipher.data);
+
+    } else {
+        ngx_str_null(&protocol);
+        ngx_str_null(&cipher);
+    }
+
     sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
 
     if (c->ssl && sslcf->verify) {
@@ -1252,6 +1271,10 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
 
     if (c->ssl) {
         len += sizeof("Auth-SSL: on" CRLF) - 1
+               + sizeof("Auth-SSL-Protocol: ") - 1 + protocol.len
+                     + sizeof(CRLF) - 1
+               + sizeof("Auth-SSL-Cipher: ") - 1 + cipher.len
+                     + sizeof(CRLF) - 1
                + sizeof("Auth-SSL-Verify: ") - 1 + verify.len
                      + sizeof(CRLF) - 1
                + sizeof("Auth-SSL-Subject: ") - 1 + subject.len
@@ -1373,6 +1396,20 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
         b->last = ngx_cpymem(b->last, "Auth-SSL: on" CRLF,
                              sizeof("Auth-SSL: on" CRLF) - 1);
 
+        if (protocol.len) {
+            b->last = ngx_cpymem(b->last, "Auth-SSL-Protocol: ",
+                                 sizeof("Auth-SSL-Protocol: ") - 1);
+            b->last = ngx_copy(b->last, protocol.data, protocol.len);
+            *b->last++ = CR; *b->last++ = LF;
+        }
+
+        if (cipher.len) {
+            b->last = ngx_cpymem(b->last, "Auth-SSL-Cipher: ",
+                                 sizeof("Auth-SSL-Cipher: ") - 1);
+            b->last = ngx_copy(b->last, cipher.data, cipher.len);
+            *b->last++ = CR; *b->last++ = LF;
+        }
+
         if (verify.len) {
             b->last = ngx_cpymem(b->last, "Auth-SSL-Verify: ",
                                  sizeof("Auth-SSL-Verify: ") - 1);
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 4083124..115671c 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -85,6 +85,13 @@ static ngx_command_t  ngx_mail_core_commands[] = {
       offsetof(ngx_mail_core_srv_conf_t, resolver_timeout),
       NULL },
 
+    { ngx_string("max_errors"),
+      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_MAIL_SRV_CONF_OFFSET,
+      offsetof(ngx_mail_core_srv_conf_t, max_errors),
+      NULL },
+
       ngx_null_command
 };
 
@@ -163,6 +170,8 @@ ngx_mail_core_create_srv_conf(ngx_conf_t *cf)
     cscf->timeout = NGX_CONF_UNSET_MSEC;
     cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
 
+    cscf->max_errors = NGX_CONF_UNSET_UINT;
+
     cscf->resolver = NGX_CONF_UNSET_PTR;
 
     cscf->file_name = cf->conf_file->file.name.data;
@@ -182,6 +191,7 @@ ngx_mail_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout,
                               30000);
 
+    ngx_conf_merge_uint_value(conf->max_errors, prev->max_errors, 5);
 
     ngx_conf_merge_str_value(conf->server_name, prev->server_name, "");
 
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 0aaa0e7..246ba97 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -833,20 +833,23 @@ ngx_mail_read_command(ngx_mail_session_t *s, ngx_connection_t *c)
     ngx_str_t                  l;
     ngx_mail_core_srv_conf_t  *cscf;
 
-    n = c->recv(c, s->buffer->last, s->buffer->end - s->buffer->last);
+    if (s->buffer->last < s->buffer->end) {
 
-    if (n == NGX_ERROR || n == 0) {
-        ngx_mail_close_connection(c);
-        return NGX_ERROR;
-    }
+        n = c->recv(c, s->buffer->last, s->buffer->end - s->buffer->last);
 
-    if (n > 0) {
-        s->buffer->last += n;
-    }
+        if (n == NGX_ERROR || n == 0) {
+            ngx_mail_close_connection(c);
+            return NGX_ERROR;
+        }
 
-    if (n == NGX_AGAIN) {
-        if (s->buffer->pos == s->buffer->last) {
-            return NGX_AGAIN;
+        if (n > 0) {
+            s->buffer->last += n;
+        }
+
+        if (n == NGX_AGAIN) {
+            if (s->buffer->pos == s->buffer->last) {
+                return NGX_AGAIN;
+            }
         }
     }
 
@@ -871,7 +874,20 @@ ngx_mail_read_command(ngx_mail_session_t *s, ngx_connection_t *c)
         return NGX_MAIL_PARSE_INVALID_COMMAND;
     }
 
-    if (rc == NGX_IMAP_NEXT || rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
+    if (rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
+
+        s->errors++;
+
+        if (s->errors >= cscf->max_errors) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "client sent too many invalid commands");
+            s->quit = 1;
+        }
+
+        return rc;
+    }
+
+    if (rc == NGX_IMAP_NEXT) {
         return rc;
     }
 
diff --git a/src/mail/ngx_mail_imap_handler.c b/src/mail/ngx_mail_imap_handler.c
index 5dfdd76..291e87a 100644
--- a/src/mail/ngx_mail_imap_handler.c
+++ b/src/mail/ngx_mail_imap_handler.c
@@ -101,10 +101,9 @@ ngx_mail_imap_init_protocol(ngx_event_t *rev)
 void
 ngx_mail_imap_auth_state(ngx_event_t *rev)
 {
-    u_char              *p, *dst, *src, *end;
-    ngx_str_t           *arg;
+    u_char              *p;
     ngx_int_t            rc;
-    ngx_uint_t           tag, i;
+    ngx_uint_t           tag;
     ngx_connection_t    *c;
     ngx_mail_session_t  *s;
 
@@ -158,27 +157,6 @@ ngx_mail_imap_auth_state(ngx_event_t *rev)
         ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0, "imap auth command: %i",
                        s->command);
 
-        if (s->backslash) {
-
-            arg = s->args.elts;
-
-            for (i = 0; i < s->args.nelts; i++) {
-                dst = arg[i].data;
-                end = dst + arg[i].len;
-
-                for (src = dst; src < end; dst++) {
-                    *dst = *src;
-                    if (*src++ == '\\') {
-                        *dst = *src++;
-                    }
-                }
-
-                arg[i].len = dst - arg[i].data;
-            }
-
-            s->backslash = 0;
-        }
-
         switch (s->mail_state) {
 
         case ngx_imap_start:
@@ -248,6 +226,10 @@ ngx_mail_imap_auth_state(ngx_event_t *rev)
         ngx_str_set(&s->out, imap_next);
     }
 
+    if (s->buffer->pos < s->buffer->last) {
+        s->blocked = 1;
+    }
+
     switch (rc) {
 
     case NGX_DONE:
@@ -297,13 +279,14 @@ ngx_mail_imap_auth_state(ngx_event_t *rev)
 
         if (s->state) {
             /* preserve tag */
-            s->arg_start = s->buffer->start + s->tag.len;
-            s->buffer->pos = s->arg_start;
-            s->buffer->last = s->arg_start;
+            s->arg_start = s->buffer->pos;
 
         } else {
-            s->buffer->pos = s->buffer->start;
-            s->buffer->last = s->buffer->start;
+            if (s->buffer->pos == s->buffer->last) {
+                s->buffer->pos = s->buffer->start;
+                s->buffer->last = s->buffer->start;
+            }
+
             s->tag.len = 0;
         }
     }
@@ -481,6 +464,8 @@ ngx_mail_imap_starttls(ngx_mail_session_t *s, ngx_connection_t *c)
     if (c->ssl == NULL) {
         sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
         if (sslcf->starttls) {
+            s->buffer->pos = s->buffer->start;
+            s->buffer->last = s->buffer->start;
             c->read->handler = ngx_mail_starttls_handler;
             return NGX_OK;
         }
diff --git a/src/mail/ngx_mail_imap_module.c b/src/mail/ngx_mail_imap_module.c
index 1f187fd..02c684c 100644
--- a/src/mail/ngx_mail_imap_module.c
+++ b/src/mail/ngx_mail_imap_module.c
@@ -46,6 +46,7 @@ static ngx_str_t  ngx_mail_imap_auth_methods_names[] = {
 
 static ngx_mail_protocol_t  ngx_mail_imap_protocol = {
     ngx_string("imap"),
+    ngx_string("\x04imap"),
     { 143, 993, 0, 0 },
     NGX_MAIL_IMAP_PROTOCOL,
 
diff --git a/src/mail/ngx_mail_parse.c b/src/mail/ngx_mail_parse.c
index 2c2cdff..4db1f18 100644
--- a/src/mail/ngx_mail_parse.c
+++ b/src/mail/ngx_mail_parse.c
@@ -21,6 +21,8 @@ ngx_mail_pop3_parse_command(ngx_mail_session_t *s)
     ngx_str_t  *arg;
     enum {
         sw_start = 0,
+        sw_command,
+        sw_invalid,
         sw_spaces_before_argument,
         sw_argument,
         sw_almost_done
@@ -35,8 +37,14 @@ ngx_mail_pop3_parse_command(ngx_mail_session_t *s)
 
         /* POP3 command */
         case sw_start:
+            s->cmd_start = p;
+            state = sw_command;
+
+            /* fall through */
+
+        case sw_command:
             if (ch == ' ' || ch == CR || ch == LF) {
-                c = s->buffer->start;
+                c = s->cmd_start;
 
                 if (p - c == 4) {
 
@@ -85,6 +93,9 @@ ngx_mail_pop3_parse_command(ngx_mail_session_t *s)
                     goto invalid;
                 }
 
+                s->cmd.data = s->cmd_start;
+                s->cmd.len = p - s->cmd_start;
+
                 switch (ch) {
                 case ' ':
                     state = sw_spaces_before_argument;
@@ -104,16 +115,17 @@ ngx_mail_pop3_parse_command(ngx_mail_session_t *s)
 
             break;
 
+        case sw_invalid:
+            goto invalid;
+
         case sw_spaces_before_argument:
             switch (ch) {
             case ' ':
                 break;
             case CR:
                 state = sw_almost_done;
-                s->arg_end = p;
                 break;
             case LF:
-                s->arg_end = p;
                 goto done;
             default:
                 if (s->args.nelts <= 2) {
@@ -188,37 +200,39 @@ ngx_mail_pop3_parse_command(ngx_mail_session_t *s)
 done:
 
     s->buffer->pos = p + 1;
-
-    if (s->arg_start) {
-        arg = ngx_array_push(&s->args);
-        if (arg == NULL) {
-            return NGX_ERROR;
-        }
-        arg->len = s->arg_end - s->arg_start;
-        arg->data = s->arg_start;
-        s->arg_start = NULL;
-    }
-
     s->state = (s->command != NGX_POP3_AUTH) ? sw_start : sw_argument;
 
     return NGX_OK;
 
 invalid:
 
-    s->state = sw_start;
-    s->arg_start = NULL;
+    s->state = sw_invalid;
 
-    return NGX_MAIL_PARSE_INVALID_COMMAND;
+    /* skip invalid command till LF */
+
+    for ( /* void */ ; p < s->buffer->last; p++) {
+        if (*p == LF) {
+            s->state = sw_start;
+            s->buffer->pos = p + 1;
+            return NGX_MAIL_PARSE_INVALID_COMMAND;
+        }
+    }
+
+    s->buffer->pos = p;
+
+    return NGX_AGAIN;
 }
 
 
 ngx_int_t
 ngx_mail_imap_parse_command(ngx_mail_session_t *s)
 {
-    u_char      ch, *p, *c;
+    u_char      ch, *p, *c, *dst, *src, *end;
     ngx_str_t  *arg;
     enum {
         sw_start = 0,
+        sw_tag,
+        sw_invalid,
         sw_spaces_before_command,
         sw_command,
         sw_spaces_before_argument,
@@ -241,31 +255,45 @@ ngx_mail_imap_parse_command(ngx_mail_session_t *s)
 
         /* IMAP tag */
         case sw_start:
+            s->tag_start = p;
+            state = sw_tag;
+
+            /* fall through */
+
+        case sw_tag:
             switch (ch) {
             case ' ':
-                s->tag.len = p - s->buffer->start + 1;
-                s->tag.data = s->buffer->start;
+                s->tag.len = p - s->tag_start + 1;
+                s->tag.data = s->tag_start;
                 state = sw_spaces_before_command;
                 break;
             case CR:
-                s->state = sw_start;
-                return NGX_MAIL_PARSE_INVALID_COMMAND;
             case LF:
-                s->state = sw_start;
-                return NGX_MAIL_PARSE_INVALID_COMMAND;
+                goto invalid;
+            default:
+                if ((ch < 'A' || ch > 'Z') && (ch < 'a' || ch > 'z')
+                    && (ch < '0' || ch > '9') && ch != '-' && ch != '.'
+                    && ch != '_')
+                {
+                    goto invalid;
+                }
+                if (p - s->tag_start > 31) {
+                    goto invalid;
+                }
+                break;
             }
             break;
 
+        case sw_invalid:
+            goto invalid;
+
         case sw_spaces_before_command:
             switch (ch) {
             case ' ':
                 break;
             case CR:
-                s->state = sw_start;
-                return NGX_MAIL_PARSE_INVALID_COMMAND;
             case LF:
-                s->state = sw_start;
-                return NGX_MAIL_PARSE_INVALID_COMMAND;
+                goto invalid;
             default:
                 s->cmd_start = p;
                 state = sw_command;
@@ -385,6 +413,9 @@ ngx_mail_imap_parse_command(ngx_mail_session_t *s)
                     goto invalid;
                 }
 
+                s->cmd.data = s->cmd_start;
+                s->cmd.len = p - s->cmd_start;
+
                 switch (ch) {
                 case ' ':
                     state = sw_spaces_before_argument;
@@ -410,10 +441,8 @@ ngx_mail_imap_parse_command(ngx_mail_session_t *s)
                 break;
             case CR:
                 state = sw_almost_done;
-                s->arg_end = p;
                 break;
             case LF:
-                s->arg_end = p;
                 goto done;
             case '"':
                 if (s->args.nelts <= 2) {
@@ -460,6 +489,22 @@ ngx_mail_imap_parse_command(ngx_mail_session_t *s)
                 }
                 arg->len = p - s->arg_start;
                 arg->data = s->arg_start;
+
+                if (s->backslash) {
+                    dst = s->arg_start;
+                    end = p;
+
+                    for (src = dst; src < end; dst++) {
+                        *dst = *src;
+                        if (*src++ == '\\') {
+                            *dst = *src++;
+                        }
+                    }
+
+                    arg->len = dst - s->arg_start;
+                    s->backslash = 0;
+                }
+
                 s->arg_start = NULL;
 
                 switch (ch) {
@@ -588,34 +633,46 @@ ngx_mail_imap_parse_command(ngx_mail_session_t *s)
 done:
 
     s->buffer->pos = p + 1;
-
-    if (s->arg_start) {
-        arg = ngx_array_push(&s->args);
-        if (arg == NULL) {
-            return NGX_ERROR;
-        }
-        arg->len = s->arg_end - s->arg_start;
-        arg->data = s->arg_start;
-
-        s->arg_start = NULL;
-        s->cmd_start = NULL;
-        s->quoted = 0;
-        s->no_sync_literal = 0;
-        s->literal_len = 0;
-    }
-
     s->state = (s->command != NGX_IMAP_AUTHENTICATE) ? sw_start : sw_argument;
 
     return NGX_OK;
 
 invalid:
 
-    s->state = sw_start;
+    s->state = sw_invalid;
     s->quoted = 0;
+    s->backslash = 0;
     s->no_sync_literal = 0;
     s->literal_len = 0;
 
-    return NGX_MAIL_PARSE_INVALID_COMMAND;
+    /* skip invalid command till LF */
+
+    for ( /* void */ ; p < s->buffer->last; p++) {
+        if (*p == LF) {
+            s->state = sw_start;
+            s->buffer->pos = p + 1;
+
+            /* detect non-synchronizing literals */
+
+            if ((size_t) (p - s->buffer->start) > sizeof("{1+}") - 1) {
+                p--;
+
+                if (*p == CR) {
+                    p--;
+                }
+
+                if (*p == '}' && *(p - 1) == '+') {
+                    s->quit = 1;
+                }
+            }
+
+            return NGX_MAIL_PARSE_INVALID_COMMAND;
+        }
+    }
+
+    s->buffer->pos = p;
+
+    return NGX_AGAIN;
 }
 
 
@@ -758,10 +815,8 @@ ngx_mail_smtp_parse_command(ngx_mail_session_t *s)
                 break;
             case CR:
                 state = sw_almost_done;
-                s->arg_end = p;
                 break;
             case LF:
-                s->arg_end = p;
                 goto done;
             default:
                 if (s->args.nelts <= 10) {
@@ -821,17 +876,6 @@ ngx_mail_smtp_parse_command(ngx_mail_session_t *s)
 done:
 
     s->buffer->pos = p + 1;
-
-    if (s->arg_start) {
-        arg = ngx_array_push(&s->args);
-        if (arg == NULL) {
-            return NGX_ERROR;
-        }
-        arg->len = s->arg_end - s->arg_start;
-        arg->data = s->arg_start;
-        s->arg_start = NULL;
-    }
-
     s->state = (s->command != NGX_SMTP_AUTH) ? sw_start : sw_argument;
 
     return NGX_OK;
@@ -839,21 +883,20 @@ done:
 invalid:
 
     s->state = sw_invalid;
-    s->arg_start = NULL;
 
     /* skip invalid command till LF */
 
-    for (p = s->buffer->pos; p < s->buffer->last; p++) {
+    for ( /* void */ ; p < s->buffer->last; p++) {
         if (*p == LF) {
             s->state = sw_start;
-            p++;
-            break;
+            s->buffer->pos = p + 1;
+            return NGX_MAIL_PARSE_INVALID_COMMAND;
         }
     }
 
     s->buffer->pos = p;
 
-    return NGX_MAIL_PARSE_INVALID_COMMAND;
+    return NGX_AGAIN;
 }
 
 
diff --git a/src/mail/ngx_mail_pop3_handler.c b/src/mail/ngx_mail_pop3_handler.c
index edfd986..226e741 100644
--- a/src/mail/ngx_mail_pop3_handler.c
+++ b/src/mail/ngx_mail_pop3_handler.c
@@ -262,6 +262,10 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev)
         }
     }
 
+    if (s->buffer->pos < s->buffer->last) {
+        s->blocked = 1;
+    }
+
     switch (rc) {
 
     case NGX_DONE:
@@ -283,11 +287,14 @@ ngx_mail_pop3_auth_state(ngx_event_t *rev)
     case NGX_OK:
 
         s->args.nelts = 0;
-        s->buffer->pos = s->buffer->start;
-        s->buffer->last = s->buffer->start;
+
+        if (s->buffer->pos == s->buffer->last) {
+            s->buffer->pos = s->buffer->start;
+            s->buffer->last = s->buffer->start;
+        }
 
         if (s->state) {
-            s->arg_start = s->buffer->start;
+            s->arg_start = s->buffer->pos;
         }
 
         if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
@@ -400,6 +407,8 @@ ngx_mail_pop3_stls(ngx_mail_session_t *s, ngx_connection_t *c)
     if (c->ssl == NULL) {
         sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
         if (sslcf->starttls) {
+            s->buffer->pos = s->buffer->start;
+            s->buffer->last = s->buffer->start;
             c->read->handler = ngx_mail_starttls_handler;
             return NGX_OK;
         }
diff --git a/src/mail/ngx_mail_pop3_module.c b/src/mail/ngx_mail_pop3_module.c
index a673070..a257b5a 100644
--- a/src/mail/ngx_mail_pop3_module.c
+++ b/src/mail/ngx_mail_pop3_module.c
@@ -46,6 +46,7 @@ static ngx_str_t  ngx_mail_pop3_auth_methods_names[] = {
 
 static ngx_mail_protocol_t  ngx_mail_pop3_protocol = {
     ngx_string("pop3"),
+    ngx_string("\x04pop3"),
     { 110, 995, 0, 0 },
     NGX_MAIL_POP3_PROTOCOL,
 
diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c
index 66aa0ba..a7ab077 100644
--- a/src/mail/ngx_mail_proxy_module.c
+++ b/src/mail/ngx_mail_proxy_module.c
@@ -327,6 +327,10 @@ ngx_mail_proxy_pop3_handler(ngx_event_t *rev)
         c->log->action = NULL;
         ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in");
 
+        if (s->buffer->pos < s->buffer->last) {
+            ngx_post_event(c->write, &ngx_posted_events);
+        }
+
         ngx_mail_proxy_handler(s->connection->write);
 
         return;
@@ -482,6 +486,10 @@ ngx_mail_proxy_imap_handler(ngx_event_t *rev)
         c->log->action = NULL;
         ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in");
 
+        if (s->buffer->pos < s->buffer->last) {
+            ngx_post_event(c->write, &ngx_posted_events);
+        }
+
         ngx_mail_proxy_handler(s->connection->write);
 
         return;
@@ -813,13 +821,12 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
         c->log->action = NULL;
         ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in");
 
-        if (s->buffer->pos == s->buffer->last) {
-            ngx_mail_proxy_handler(s->connection->write);
-
-        } else {
-            ngx_mail_proxy_handler(c->write);
+        if (s->buffer->pos < s->buffer->last) {
+            ngx_post_event(c->write, &ngx_posted_events);
         }
 
+        ngx_mail_proxy_handler(s->connection->write);
+
         return;
 
     default:
diff --git a/src/mail/ngx_mail_smtp_module.c b/src/mail/ngx_mail_smtp_module.c
index 3b5a2d8..0e05fdc 100644
--- a/src/mail/ngx_mail_smtp_module.c
+++ b/src/mail/ngx_mail_smtp_module.c
@@ -39,6 +39,7 @@ static ngx_str_t  ngx_mail_smtp_auth_methods_names[] = {
 
 static ngx_mail_protocol_t  ngx_mail_smtp_protocol = {
     ngx_string("smtp"),
+    ngx_string("\x04smtp"),
     { 25, 465, 587, 0 },
     NGX_MAIL_SMTP_PROTOCOL,
 
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index 7eae83e..2a1043e 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -14,6 +14,12 @@
 #define NGX_DEFAULT_ECDH_CURVE  "auto"
 
 
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+static int ngx_mail_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn,
+    const unsigned char **out, unsigned char *outlen,
+    const unsigned char *in, unsigned int inlen, void *arg);
+#endif
+
 static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf);
 static char *ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child);
 
@@ -244,6 +250,54 @@ ngx_module_t  ngx_mail_ssl_module = {
 static ngx_str_t ngx_mail_ssl_sess_id_ctx = ngx_string("MAIL");
 
 
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+
+static int
+ngx_mail_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
+    unsigned char *outlen, const unsigned char *in, unsigned int inlen,
+    void *arg)
+{
+    unsigned int               srvlen;
+    unsigned char             *srv;
+    ngx_connection_t          *c;
+    ngx_mail_session_t        *s;
+    ngx_mail_core_srv_conf_t  *cscf;
+#if (NGX_DEBUG)
+    unsigned int               i;
+#endif
+
+    c = ngx_ssl_get_connection(ssl_conn);
+    s = c->data;
+
+#if (NGX_DEBUG)
+    for (i = 0; i < inlen; i += in[i] + 1) {
+        ngx_log_debug2(NGX_LOG_DEBUG_MAIL, c->log, 0,
+                       "SSL ALPN supported by client: %*s",
+                       (size_t) in[i], &in[i + 1]);
+    }
+#endif
+
+    cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
+
+    srv = cscf->protocol->alpn.data;
+    srvlen = cscf->protocol->alpn.len;
+
+    if (SSL_select_next_proto((unsigned char **) out, outlen, srv, srvlen,
+                              in, inlen)
+        != OPENSSL_NPN_NEGOTIATED)
+    {
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_MAIL, c->log, 0,
+                   "SSL ALPN selected: %*s", (size_t) *outlen, *out);
+
+    return SSL_TLSEXT_ERR_OK;
+}
+
+#endif
+
+
 static void *
 ngx_mail_ssl_create_conf(ngx_conf_t *cf)
 {
@@ -394,6 +448,17 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = &conf->ssl;
 
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+    SSL_CTX_set_alpn_select_cb(conf->ssl.ctx, ngx_mail_ssl_alpn_select, NULL);
+#endif
+
+    if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
+                        conf->prefer_server_ciphers)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
     if (ngx_ssl_certificates(cf, &conf->ssl, conf->certificates,
                              conf->certificate_keys, conf->passwords)
         != NGX_OK)
@@ -430,13 +495,6 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
-    if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
-                        conf->prefer_server_ciphers)
-        != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
     if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
diff --git a/src/os/unix/ngx_atomic.h b/src/os/unix/ngx_atomic.h
index 74b8b7f..fcab2d6 100644
--- a/src/os/unix/ngx_atomic.h
+++ b/src/os/unix/ngx_atomic.h
@@ -38,6 +38,39 @@ typedef volatile ngx_atomic_uint_t  ngx_atomic_t;
 #define ngx_cpu_pause()
 
 
+#elif (NGX_HAVE_GCC_ATOMIC)
+
+/* GCC 4.1 builtin atomic operations */
+
+#define NGX_HAVE_ATOMIC_OPS  1
+
+typedef long                        ngx_atomic_int_t;
+typedef unsigned long               ngx_atomic_uint_t;
+
+#if (NGX_PTR_SIZE == 8)
+#define NGX_ATOMIC_T_LEN            (sizeof("-9223372036854775808") - 1)
+#else
+#define NGX_ATOMIC_T_LEN            (sizeof("-2147483648") - 1)
+#endif
+
+typedef volatile ngx_atomic_uint_t  ngx_atomic_t;
+
+
+#define ngx_atomic_cmp_set(lock, old, set)                                    \
+    __sync_bool_compare_and_swap(lock, old, set)
+
+#define ngx_atomic_fetch_add(value, add)                                      \
+    __sync_fetch_and_add(value, add)
+
+#define ngx_memory_barrier()        __sync_synchronize()
+
+#if ( __i386__ || __i386 || __amd64__ || __amd64 )
+#define ngx_cpu_pause()             __asm__ ("pause")
+#else
+#define ngx_cpu_pause()
+#endif
+
+
 #elif (NGX_DARWIN_ATOMIC)
 
 /*
@@ -88,39 +121,6 @@ typedef uint32_t                    ngx_atomic_uint_t;
 typedef volatile ngx_atomic_uint_t  ngx_atomic_t;
 
 
-#elif (NGX_HAVE_GCC_ATOMIC)
-
-/* GCC 4.1 builtin atomic operations */
-
-#define NGX_HAVE_ATOMIC_OPS  1
-
-typedef long                        ngx_atomic_int_t;
-typedef unsigned long               ngx_atomic_uint_t;
-
-#if (NGX_PTR_SIZE == 8)
-#define NGX_ATOMIC_T_LEN            (sizeof("-9223372036854775808") - 1)
-#else
-#define NGX_ATOMIC_T_LEN            (sizeof("-2147483648") - 1)
-#endif
-
-typedef volatile ngx_atomic_uint_t  ngx_atomic_t;
-
-
-#define ngx_atomic_cmp_set(lock, old, set)                                    \
-    __sync_bool_compare_and_swap(lock, old, set)
-
-#define ngx_atomic_fetch_add(value, add)                                      \
-    __sync_fetch_and_add(value, add)
-
-#define ngx_memory_barrier()        __sync_synchronize()
-
-#if ( __i386__ || __i386 || __amd64__ || __amd64 )
-#define ngx_cpu_pause()             __asm__ ("pause")
-#else
-#define ngx_cpu_pause()
-#endif
-
-
 #elif ( __i386__ || __i386 )
 
 typedef int32_t                     ngx_atomic_int_t;
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index 3d415bd..5c6a830 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -32,23 +32,22 @@
 ngx_chain_t *
 ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 {
-    int               rc, flags;
-    off_t             send, prev_send, sent;
-    size_t            file_size;
-    ssize_t           n;
-    ngx_uint_t        eintr, eagain;
-    ngx_err_t         err;
-    ngx_buf_t        *file;
-    ngx_event_t      *wev;
-    ngx_chain_t      *cl;
-    ngx_iovec_t       header, trailer;
-    struct sf_hdtr    hdtr;
-    struct iovec      headers[NGX_IOVS_PREALLOCATE];
-    struct iovec      trailers[NGX_IOVS_PREALLOCATE];
-#if (NGX_HAVE_AIO_SENDFILE)
-    ngx_uint_t        ebusy;
-    ngx_event_aio_t  *aio;
+    int              rc, flags;
+    off_t            send, prev_send, sent;
+    size_t           file_size;
+    ssize_t          n;
+    ngx_err_t        err;
+    ngx_buf_t       *file;
+    ngx_uint_t       eintr, eagain;
+#if (NGX_HAVE_SENDFILE_NODISKIO)
+    ngx_uint_t       ebusy;
 #endif
+    ngx_event_t     *wev;
+    ngx_chain_t     *cl;
+    ngx_iovec_t      header, trailer;
+    struct sf_hdtr   hdtr;
+    struct iovec     headers[NGX_IOVS_PREALLOCATE];
+    struct iovec     trailers[NGX_IOVS_PREALLOCATE];
 
     wev = c->write;
 
@@ -77,11 +76,6 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
     eagain = 0;
     flags = 0;
 
-#if (NGX_HAVE_AIO_SENDFILE && NGX_SUPPRESS_WARN)
-    aio = NULL;
-    file = NULL;
-#endif
-
     header.iovs = headers;
     header.nalloc = NGX_IOVS_PREALLOCATE;
 
@@ -90,7 +84,7 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
     for ( ;; ) {
         eintr = 0;
-#if (NGX_HAVE_AIO_SENDFILE)
+#if (NGX_HAVE_SENDFILE_NODISKIO)
         ebusy = 0;
 #endif
         prev_send = send;
@@ -179,9 +173,14 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
             sent = 0;
 
-#if (NGX_HAVE_AIO_SENDFILE)
-            aio = file->file->aio;
-            flags = (aio && aio->preload_handler) ? SF_NODISKIO : 0;
+#if (NGX_HAVE_SENDFILE_NODISKIO)
+
+            flags = (c->busy_count <= 2) ? SF_NODISKIO : 0;
+
+            if (file->file->directio) {
+                flags |= SF_NOCACHE;
+            }
+
 #endif
 
             rc = sendfile(file->file->fd, c->fd, file->file_pos,
@@ -199,7 +198,7 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
                     eintr = 1;
                     break;
 
-#if (NGX_HAVE_AIO_SENDFILE)
+#if (NGX_HAVE_SENDFILE_NODISKIO)
                 case NGX_EBUSY:
                     ebusy = 1;
                     break;
@@ -252,54 +251,30 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
         in = ngx_chain_update_sent(in, sent);
 
-#if (NGX_HAVE_AIO_SENDFILE)
+#if (NGX_HAVE_SENDFILE_NODISKIO)
 
         if (ebusy) {
-            if (aio->event.active) {
-                /*
-                 * tolerate duplicate calls; they can happen due to subrequests
-                 * or multiple calls of the next body filter from a filter
-                 */
-
-                if (sent) {
-                    c->busy_count = 0;
-                }
-
-                return in;
-            }
-
             if (sent == 0) {
                 c->busy_count++;
 
-                if (c->busy_count > 2) {
-                    ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                                  "sendfile(%V) returned busy again",
-                                  &file->file->name);
-
-                    c->busy_count = 0;
-                    aio->preload_handler = NULL;
-
-                    send = prev_send;
-                    continue;
-                }
+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                               "sendfile() busy, count:%d", c->busy_count);
 
             } else {
                 c->busy_count = 0;
             }
 
-            n = aio->preload_handler(file);
-
-            if (n > 0) {
-                send = prev_send + sent;
-                continue;
+            if (wev->posted) {
+                ngx_delete_posted_event(wev);
             }
 
+            ngx_post_event(wev, &ngx_posted_next_events);
+
+            wev->ready = 0;
             return in;
         }
 
-        if (flags == SF_NODISKIO) {
-            c->busy_count = 0;
-        }
+        c->busy_count = 0;
 
 #endif
 
diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c
index 5695839..101d91a 100644
--- a/src/os/unix/ngx_linux_sendfile_chain.c
+++ b/src/os/unix/ngx_linux_sendfile_chain.c
@@ -38,6 +38,9 @@ static void ngx_linux_sendfile_thread_handler(void *data, ngx_log_t *log);
  * On Linux up to 2.6.16 sendfile() does not allow to pass the count parameter
  * more than 2G-1 bytes even on 64-bit platforms: it returns EINVAL,
  * so we limit it to 2G-1 bytes.
+ *
+ * On Linux 2.6.16 and later, sendfile() silently limits the count parameter
+ * to 2G minus the page size, even on 64-bit platforms.
  */
 
 #define NGX_SENDFILE_MAXSIZE  2147483647L
@@ -216,7 +219,6 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
              */
 
             send = prev_send + sent;
-            continue;
         }
 
         if (send >= limit || in == NULL) {
@@ -377,15 +379,6 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size)
         return ctx->sent;
     }
 
-    if (task->event.active && ctx->file == file) {
-        /*
-         * tolerate duplicate calls; they can happen due to subrequests
-         * or multiple calls of the next body filter from a filter
-         */
-
-        return NGX_DONE;
-    }
-
     ctx->file = file;
     ctx->socket = c->fd;
     ctx->size = size;
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index b31485f..07cd05e 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -398,6 +398,8 @@ ngx_pass_open_channel(ngx_cycle_t *cycle)
     ngx_int_t      i;
     ngx_channel_t  ch;
 
+    ngx_memzero(&ch, sizeof(ngx_channel_t));
+
     ch.command = NGX_CMD_OPEN_CHANNEL;
     ch.pid = ngx_processes[ngx_process_slot].pid;
     ch.slot = ngx_process_slot;
diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c
index a3577ce..b1ae4b5 100644
--- a/src/os/unix/ngx_readv_chain.c
+++ b/src/os/unix/ngx_readv_chain.c
@@ -96,7 +96,7 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
             iov->iov_len += n;
 
         } else {
-            if (vec.nelts >= IOV_MAX) {
+            if (vec.nelts == vec.nalloc) {
                 break;
             }
 
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index 7835675..3304c84 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -510,6 +510,10 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
             ls->ipv6only = addr[i].opt.ipv6only;
 #endif
 
+#if (NGX_HAVE_TCP_FASTOPEN)
+            ls->fastopen = addr[i].opt.fastopen;
+#endif
+
 #if (NGX_HAVE_REUSEPORT)
             ls->reuseport = addr[i].opt.reuseport;
 #endif
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 9e35832..46c3622 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -65,6 +65,9 @@ typedef struct {
     int                            backlog;
     int                            rcvbuf;
     int                            sndbuf;
+#if (NGX_HAVE_TCP_FASTOPEN)
+    int                            fastopen;
+#endif
     int                            type;
 } ngx_stream_listen_t;
 
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index 9b6afe9..d96d27a 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -615,6 +615,10 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ls->type = SOCK_STREAM;
     ls->ctx = cf->ctx;
 
+#if (NGX_HAVE_TCP_FASTOPEN)
+    ls->fastopen = -1;
+#endif
+
 #if (NGX_HAVE_INET6)
     ls->ipv6only = 1;
 #endif
@@ -635,6 +639,21 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             continue;
         }
 
+#if (NGX_HAVE_TCP_FASTOPEN)
+        if (ngx_strncmp(value[i].data, "fastopen=", 9) == 0) {
+            ls->fastopen = ngx_atoi(value[i].data + 9, value[i].len - 9);
+            ls->bind = 1;
+
+            if (ls->fastopen == NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid fastopen \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+#endif
+
         if (ngx_strncmp(value[i].data, "backlog=", 8) == 0) {
             ls->backlog = ngx_atoi(value[i].data + 8, value[i].len - 8);
             ls->bind = 1;
@@ -859,6 +878,12 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         if (ls->proxy_protocol) {
             return "\"proxy_protocol\" parameter is incompatible with \"udp\"";
         }
+
+#if (NGX_HAVE_TCP_FASTOPEN)
+        if (ls->fastopen != -1) {
+            return "\"fastopen\" parameter is incompatible with \"udp\"";
+        }
+#endif
     }
 
     als = cmcf->listen.elts;
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 01cda7a..934e7d8 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -31,6 +31,7 @@ typedef struct {
     ngx_uint_t                       next_upstream_tries;
     ngx_flag_t                       next_upstream;
     ngx_flag_t                       proxy_protocol;
+    ngx_flag_t                       half_close;
     ngx_stream_upstream_local_t     *local;
     ngx_flag_t                       socket_keepalive;
 
@@ -46,8 +47,8 @@ typedef struct {
     ngx_uint_t                       ssl_verify_depth;
     ngx_str_t                        ssl_trusted_certificate;
     ngx_str_t                        ssl_crl;
-    ngx_str_t                        ssl_certificate;
-    ngx_str_t                        ssl_certificate_key;
+    ngx_stream_complex_value_t      *ssl_certificate;
+    ngx_stream_complex_value_t      *ssl_certificate_key;
     ngx_array_t                     *ssl_passwords;
     ngx_array_t                     *ssl_conf_commands;
 
@@ -101,6 +102,7 @@ static void ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s);
 static void ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc);
 static void ngx_stream_proxy_ssl_save_session(ngx_connection_t *c);
 static ngx_int_t ngx_stream_proxy_ssl_name(ngx_stream_session_t *s);
+static ngx_int_t ngx_stream_proxy_ssl_certificate(ngx_stream_session_t *s);
 static ngx_int_t ngx_stream_proxy_set_ssl(ngx_conf_t *cf,
     ngx_stream_proxy_srv_conf_t *pscf);
 
@@ -244,6 +246,13 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
       offsetof(ngx_stream_proxy_srv_conf_t, proxy_protocol),
       NULL },
 
+    { ngx_string("proxy_half_close"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_proxy_srv_conf_t, half_close),
+      NULL },
+
 #if (NGX_STREAM_SSL)
 
     { ngx_string("proxy_ssl"),
@@ -318,14 +327,14 @@ static ngx_command_t  ngx_stream_proxy_commands[] = {
 
     { ngx_string("proxy_ssl_certificate"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_stream_set_complex_value_zero_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
       offsetof(ngx_stream_proxy_srv_conf_t, ssl_certificate),
       NULL },
 
     { ngx_string("proxy_ssl_certificate_key"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
+      ngx_stream_set_complex_value_zero_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
       offsetof(ngx_stream_proxy_srv_conf_t, ssl_certificate_key),
       NULL },
@@ -1060,6 +1069,15 @@ ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s)
         }
     }
 
+    if (pscf->ssl_certificate && (pscf->ssl_certificate->lengths
+                                  || pscf->ssl_certificate_key->lengths))
+    {
+        if (ngx_stream_proxy_ssl_certificate(s) != NGX_OK) {
+            ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+            return;
+        }
+    }
+
     if (pscf->ssl_session_reuse) {
         pc->ssl->save_session = ngx_stream_proxy_ssl_save_session;
 
@@ -1247,6 +1265,50 @@ done:
     return NGX_OK;
 }
 
+
+static ngx_int_t
+ngx_stream_proxy_ssl_certificate(ngx_stream_session_t *s)
+{
+    ngx_str_t                     cert, key;
+    ngx_connection_t             *c;
+    ngx_stream_proxy_srv_conf_t  *pscf;
+
+    c = s->upstream->peer.connection;
+
+    pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
+
+    if (ngx_stream_complex_value(s, pscf->ssl_certificate, &cert)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "stream upstream ssl cert: \"%s\"", cert.data);
+
+    if (*cert.data == '\0') {
+        return NGX_OK;
+    }
+
+    if (ngx_stream_complex_value(s, pscf->ssl_certificate_key, &key)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "stream upstream ssl key: \"%s\"", key.data);
+
+    if (ngx_ssl_connection_certificate(c, c->pool, &cert, &key,
+                                       pscf->ssl_passwords)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
 #endif
 
 
@@ -1701,6 +1763,24 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
     }
 
     if (dst) {
+
+        if (dst->type == SOCK_STREAM && pscf->half_close
+            && src->read->eof && !u->half_closed && !dst->buffered)
+        {
+            if (ngx_shutdown_socket(dst->fd, NGX_WRITE_SHUTDOWN) == -1) {
+                ngx_connection_error(c, ngx_socket_errno,
+                                     ngx_shutdown_socket_n " failed");
+
+                ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+                return;
+            }
+
+            u->half_closed = 1;
+            ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                           "stream proxy %s socket shutdown",
+                           from_upstream ? "client" : "upstream");
+        }
+
         if (ngx_handle_write_event(dst->write, 0) != NGX_OK) {
             ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
@@ -1779,6 +1859,13 @@ ngx_stream_proxy_test_finalize(ngx_stream_session_t *s,
         return NGX_DECLINED;
     }
 
+    if (pscf->half_close) {
+        /* avoid closing live connections until both read ends get EOF */
+        if (!(c->read->eof && pc->read->eof && !c->buffered && !pc->buffered)) {
+             return NGX_DECLINED;
+        }
+    }
+
     handler = c->log->handler;
     c->log->handler = NULL;
 
@@ -1977,14 +2064,9 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
      *
      *     conf->ssl_protocols = 0;
      *     conf->ssl_ciphers = { 0, NULL };
-     *     conf->ssl_name = NULL;
      *     conf->ssl_trusted_certificate = { 0, NULL };
      *     conf->ssl_crl = { 0, NULL };
-     *     conf->ssl_certificate = { 0, NULL };
-     *     conf->ssl_certificate_key = { 0, NULL };
      *
-     *     conf->upload_rate = NULL;
-     *     conf->download_rate = NULL;
      *     conf->ssl = NULL;
      *     conf->upstream = NULL;
      *     conf->upstream_value = NULL;
@@ -1994,6 +2076,8 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
     conf->timeout = NGX_CONF_UNSET_MSEC;
     conf->next_upstream_timeout = NGX_CONF_UNSET_MSEC;
     conf->buffer_size = NGX_CONF_UNSET_SIZE;
+    conf->upload_rate = NGX_CONF_UNSET_PTR;
+    conf->download_rate = NGX_CONF_UNSET_PTR;
     conf->requests = NGX_CONF_UNSET_UINT;
     conf->responses = NGX_CONF_UNSET_UINT;
     conf->next_upstream_tries = NGX_CONF_UNSET_UINT;
@@ -2001,13 +2085,17 @@ ngx_stream_proxy_create_srv_conf(ngx_conf_t *cf)
     conf->proxy_protocol = NGX_CONF_UNSET;
     conf->local = NGX_CONF_UNSET_PTR;
     conf->socket_keepalive = NGX_CONF_UNSET;
+    conf->half_close = NGX_CONF_UNSET;
 
 #if (NGX_STREAM_SSL)
     conf->ssl_enable = NGX_CONF_UNSET;
     conf->ssl_session_reuse = NGX_CONF_UNSET;
+    conf->ssl_name = NGX_CONF_UNSET_PTR;
     conf->ssl_server_name = NGX_CONF_UNSET;
     conf->ssl_verify = NGX_CONF_UNSET;
     conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
+    conf->ssl_certificate = NGX_CONF_UNSET_PTR;
+    conf->ssl_certificate_key = NGX_CONF_UNSET_PTR;
     conf->ssl_passwords = NGX_CONF_UNSET_PTR;
     conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
 #endif
@@ -2034,13 +2122,9 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_size_value(conf->buffer_size,
                               prev->buffer_size, 16384);
 
-    if (conf->upload_rate == NULL) {
-        conf->upload_rate = prev->upload_rate;
-    }
+    ngx_conf_merge_ptr_value(conf->upload_rate, prev->upload_rate, NULL);
 
-    if (conf->download_rate == NULL) {
-        conf->download_rate = prev->download_rate;
-    }
+    ngx_conf_merge_ptr_value(conf->download_rate, prev->download_rate, NULL);
 
     ngx_conf_merge_uint_value(conf->requests,
                               prev->requests, 0);
@@ -2060,6 +2144,8 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->socket_keepalive,
                               prev->socket_keepalive, 0);
 
+    ngx_conf_merge_value(conf->half_close, prev->half_close, 0);
+
 #if (NGX_STREAM_SSL)
 
     ngx_conf_merge_value(conf->ssl_enable, prev->ssl_enable, 0);
@@ -2073,9 +2159,7 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT");
 
-    if (conf->ssl_name == NULL) {
-        conf->ssl_name = prev->ssl_name;
-    }
+    ngx_conf_merge_ptr_value(conf->ssl_name, prev->ssl_name, NULL);
 
     ngx_conf_merge_value(conf->ssl_server_name, prev->ssl_server_name, 0);
 
@@ -2089,11 +2173,11 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");
 
-    ngx_conf_merge_str_value(conf->ssl_certificate,
-                              prev->ssl_certificate, "");
+    ngx_conf_merge_ptr_value(conf->ssl_certificate,
+                              prev->ssl_certificate, NULL);
 
-    ngx_conf_merge_str_value(conf->ssl_certificate_key,
-                              prev->ssl_certificate_key, "");
+    ngx_conf_merge_ptr_value(conf->ssl_certificate_key,
+                              prev->ssl_certificate_key, NULL);
 
     ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
 
@@ -2137,27 +2221,41 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = pscf->ssl;
 
-    if (pscf->ssl_certificate.len) {
-
-        if (pscf->ssl_certificate_key.len == 0) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"proxy_ssl_certificate_key\" is defined "
-                          "for certificate \"%V\"", &pscf->ssl_certificate);
-            return NGX_ERROR;
-        }
-
-        if (ngx_ssl_certificate(cf, pscf->ssl, &pscf->ssl_certificate,
-                                &pscf->ssl_certificate_key, pscf->ssl_passwords)
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
     if (ngx_ssl_ciphers(cf, pscf->ssl, &pscf->ssl_ciphers, 0) != NGX_OK) {
         return NGX_ERROR;
     }
 
+    if (pscf->ssl_certificate) {
+
+        if (pscf->ssl_certificate_key == NULL) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no \"proxy_ssl_certificate_key\" is defined "
+                          "for certificate \"%V\"",
+                          &pscf->ssl_certificate->value);
+            return NGX_ERROR;
+        }
+
+        if (pscf->ssl_certificate->lengths
+            || pscf->ssl_certificate_key->lengths)
+        {
+            pscf->ssl_passwords =
+                           ngx_ssl_preserve_passwords(cf, pscf->ssl_passwords);
+            if (pscf->ssl_passwords == NULL) {
+                return NGX_ERROR;
+            }
+
+        } else {
+            if (ngx_ssl_certificate(cf, pscf->ssl,
+                                    &pscf->ssl_certificate->value,
+                                    &pscf->ssl_certificate_key->value,
+                                    pscf->ssl_passwords)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+        }
+    }
+
     if (pscf->ssl_verify) {
         if (pscf->ssl_trusted_certificate.len == 0) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c
index a15f772..c447e15 100644
--- a/src/stream/ngx_stream_script.c
+++ b/src/stream/ngx_stream_script.c
@@ -252,7 +252,7 @@ ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 
     cv = (ngx_stream_complex_value_t **) (p + cmd->offset);
 
-    if (*cv != NULL) {
+    if (*cv != NGX_CONF_UNSET_PTR && *cv != NULL) {
         return "is duplicate";
     }
 
@@ -277,6 +277,44 @@ ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
 }
 
 
+char *
+ngx_stream_set_complex_value_zero_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t                            *value;
+    ngx_stream_complex_value_t          **cv;
+    ngx_stream_compile_complex_value_t    ccv;
+
+    cv = (ngx_stream_complex_value_t **) (p + cmd->offset);
+
+    if (*cv != NGX_CONF_UNSET_PTR) {
+        return "is duplicate";
+    }
+
+    *cv = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));
+    if (*cv == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = *cv;
+    ccv.zero = 1;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 char *
 ngx_stream_set_complex_value_size_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf)
diff --git a/src/stream/ngx_stream_script.h b/src/stream/ngx_stream_script.h
index a481ca3..d8f3740 100644
--- a/src/stream/ngx_stream_script.h
+++ b/src/stream/ngx_stream_script.h
@@ -112,6 +112,8 @@ ngx_int_t ngx_stream_compile_complex_value(
     ngx_stream_compile_complex_value_t *ccv);
 char *ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+char *ngx_stream_set_complex_value_zero_slot(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 char *ngx_stream_set_complex_value_size_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index d8c0471..c530832 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -23,7 +23,13 @@ static ngx_int_t ngx_stream_ssl_init_connection(ngx_ssl_t *ssl,
     ngx_connection_t *c);
 static void ngx_stream_ssl_handshake_handler(ngx_connection_t *c);
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-int ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg);
+static int ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad,
+    void *arg);
+#endif
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+static int ngx_stream_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn,
+    const unsigned char **out, unsigned char *outlen,
+    const unsigned char *in, unsigned int inlen, void *arg);
 #endif
 #ifdef SSL_R_CERT_CB_ERROR
 static int ngx_stream_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg);
@@ -45,6 +51,8 @@ static char *ngx_stream_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static char *ngx_stream_ssl_alpn(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 
 static char *ngx_stream_ssl_conf_command_check(ngx_conf_t *cf, void *post,
     void *data);
@@ -211,6 +219,13 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
       offsetof(ngx_stream_ssl_conf_t, conf_commands),
       &ngx_stream_ssl_conf_command_post },
 
+    { ngx_string("ssl_alpn"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE,
+      ngx_stream_ssl_alpn,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
       ngx_null_command
 };
 
@@ -254,6 +269,9 @@ static ngx_stream_variable_t  ngx_stream_ssl_vars[] = {
     { ngx_string("ssl_ciphers"), NULL, ngx_stream_ssl_variable,
       (uintptr_t) ngx_ssl_get_ciphers, NGX_STREAM_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_curve"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_curve, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_curves"), NULL, ngx_stream_ssl_variable,
       (uintptr_t) ngx_ssl_get_curves, NGX_STREAM_VAR_CHANGEABLE, 0 },
 
@@ -266,6 +284,9 @@ static ngx_stream_variable_t  ngx_stream_ssl_vars[] = {
     { ngx_string("ssl_server_name"), NULL, ngx_stream_ssl_variable,
       (uintptr_t) ngx_ssl_get_server_name, NGX_STREAM_VAR_CHANGEABLE, 0 },
 
+    { ngx_string("ssl_alpn_protocol"), NULL, ngx_stream_ssl_variable,
+      (uintptr_t) ngx_ssl_get_alpn_protocol, NGX_STREAM_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_client_cert"), NULL, ngx_stream_ssl_variable,
       (uintptr_t) ngx_ssl_get_certificate, NGX_STREAM_VAR_CHANGEABLE, 0 },
 
@@ -434,7 +455,7 @@ ngx_stream_ssl_handshake_handler(ngx_connection_t *c)
 
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
 
-int
+static int
 ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 {
     return SSL_TLSEXT_ERR_OK;
@@ -443,9 +464,49 @@ ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 #endif
 
 
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+
+static int
+ngx_stream_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
+    unsigned char *outlen, const unsigned char *in, unsigned int inlen,
+    void *arg)
+{
+    ngx_str_t         *alpn;
+#if (NGX_DEBUG)
+    unsigned int       i;
+    ngx_connection_t  *c;
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    for (i = 0; i < inlen; i += in[i] + 1) {
+        ngx_log_debug2(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                       "SSL ALPN supported by client: %*s",
+                       (size_t) in[i], &in[i + 1]);
+    }
+
+#endif
+
+    alpn = arg;
+
+    if (SSL_select_next_proto((unsigned char **) out, outlen, alpn->data,
+                              alpn->len, in, inlen)
+        != OPENSSL_NPN_NEGOTIATED)
+    {
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "SSL ALPN selected: %*s", (size_t) *outlen, *out);
+
+    return SSL_TLSEXT_ERR_OK;
+}
+
+#endif
+
+
 #ifdef SSL_R_CERT_CB_ERROR
 
-int
+static int
 ngx_stream_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg)
 {
     ngx_str_t                    cert, key;
@@ -602,6 +663,7 @@ ngx_stream_ssl_create_conf(ngx_conf_t *cf)
      *     scf->client_certificate = { 0, NULL };
      *     scf->trusted_certificate = { 0, NULL };
      *     scf->crl = { 0, NULL };
+     *     scf->alpn = { 0, NULL };
      *     scf->ciphers = { 0, NULL };
      *     scf->shm_zone = NULL;
      */
@@ -660,6 +722,7 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_str_value(conf->trusted_certificate,
                          prev->trusted_certificate, "");
     ngx_conf_merge_str_value(conf->crl, prev->crl, "");
+    ngx_conf_merge_str_value(conf->alpn, prev->alpn, "");
 
     ngx_conf_merge_str_value(conf->ecdh_curve, prev->ecdh_curve,
                          NGX_DEFAULT_ECDH_CURVE);
@@ -720,6 +783,20 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
                                            ngx_stream_ssl_servername);
 #endif
 
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+    if (conf->alpn.len) {
+        SSL_CTX_set_alpn_select_cb(conf->ssl.ctx, ngx_stream_ssl_alpn_select,
+                                   &conf->alpn);
+    }
+#endif
+
+    if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
+                        conf->prefer_server_ciphers)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
     if (ngx_stream_ssl_compile_certificates(cf, conf) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
@@ -752,13 +829,6 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
-    if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers,
-                        conf->prefer_server_ciphers)
-        != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
     if (conf->verify) {
 
         if (conf->client_certificate.len == 0 && conf->verify != 3) {
@@ -1056,6 +1126,60 @@ invalid:
 }
 
 
+static char *
+ngx_stream_ssl_alpn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+
+    ngx_stream_ssl_conf_t  *scf = conf;
+
+    u_char      *p;
+    size_t       len;
+    ngx_str_t   *value;
+    ngx_uint_t   i;
+
+    if (scf->alpn.len) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    len = 0;
+
+    for (i = 1; i < cf->args->nelts; i++) {
+
+        if (value[i].len > 255) {
+            return "protocol too long";
+        }
+
+        len += value[i].len + 1;
+    }
+
+    scf->alpn.data = ngx_pnalloc(cf->pool, len);
+    if (scf->alpn.data == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    p = scf->alpn.data;
+
+    for (i = 1; i < cf->args->nelts; i++) {
+        *p++ = value[i].len;
+        p = ngx_cpymem(p, value[i].data, value[i].len);
+    }
+
+    scf->alpn.len = len;
+
+    return NGX_CONF_OK;
+
+#else
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "the \"ssl_alpn\" directive requires OpenSSL "
+                       "with ALPN support");
+    return NGX_CONF_ERROR;
+#endif
+}
+
+
 static char *
 ngx_stream_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
 {
diff --git a/src/stream/ngx_stream_ssl_module.h b/src/stream/ngx_stream_ssl_module.h
index c6e24be..e7c825e 100644
--- a/src/stream/ngx_stream_ssl_module.h
+++ b/src/stream/ngx_stream_ssl_module.h
@@ -42,6 +42,7 @@ typedef struct {
     ngx_str_t        client_certificate;
     ngx_str_t        trusted_certificate;
     ngx_str_t        crl;
+    ngx_str_t        alpn;
 
     ngx_str_t        ciphers;
 
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index 9857e0b..f561779 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -142,6 +142,7 @@ typedef struct {
     ngx_stream_upstream_state_t       *state;
     unsigned                           connected:1;
     unsigned                           proxy_protocol:1;
+    unsigned                           half_closed:1;
 } ngx_stream_upstream_t;
 
 

From 24d9bd02907266424ef4a74ad7de298be7723631 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 24 May 2022 14:20:28 -0400
Subject: [PATCH 383/600] Update changelog

---
 debian/changelog | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b9b5b7..98db79b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-nginx (1.20.2-3) UNRELEASED; urgency=medium
+nginx (1.22.0-1) UNRELEASED; urgency=medium
 
-  * d/conf/mime.types: Fix a typo in font/woff2 extension in 
-    mime.types.  (Closes: #1010798)
+  * New upstream release (1.22.0)
+  * Additional changes:
+    * d/conf/mime.types: Fix a typo in font/woff2 extension in 
+      mime.types.  (Closes: #1010798)
 
  -- Thomas Ward <teward@ubuntu.com>  Tue, 10 May 2022 12:08:02 -0400
 

From 5900bc832a071308bdd1b10ae01796389fbf4e7b Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 24 May 2022 14:24:29 -0400
Subject: [PATCH 384/600] Changelog update

---
 debian/changelog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 98db79b..04b3aa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   * Additional changes:
     * d/conf/mime.types: Fix a typo in font/woff2 extension in 
       mime.types.  (Closes: #1010798)
+    * d/upstream/signing-key.asc: Additional signing keys observed
+      in upstream (Konstantin Pavlov <k.pavlov@f5.com>) during
+      upstream merge/import by Thomas Ward, additional signing key
+      was added to the keyring while keeping Maxim's key in signing
+      keys as wel.
 
  -- Thomas Ward <teward@ubuntu.com>  Tue, 10 May 2022 12:08:02 -0400
 

From c394d8d99931a56d9a37543e2673caf7b321e8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 25 May 2022 07:01:01 +0200
Subject: [PATCH 385/600] d/p/CVE-2021-3618.patch removed, fix is included in
 new upstream release

---
 debian/changelog                   |  5 ++
 debian/patches/CVE-2021-3618.patch | 84 ------------------------------
 debian/patches/series              |  1 -
 3 files changed, 5 insertions(+), 85 deletions(-)
 delete mode 100644 debian/patches/CVE-2021-3618.patch

diff --git a/debian/changelog b/debian/changelog
index 04b3aa1..16e6b2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 nginx (1.22.0-1) UNRELEASED; urgency=medium
 
+  [ Thomas Ward ]
   * New upstream release (1.22.0)
   * Additional changes:
     * d/conf/mime.types: Fix a typo in font/woff2 extension in 
@@ -10,6 +11,10 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
       was added to the keyring while keeping Maxim's key in signing
       keys as wel.
 
+  [ Jan Mojžíš ]
+  * d/patches/CVE-2021-3618.patch removed, fix is included in new upstream
+  release
+
  -- Thomas Ward <teward@ubuntu.com>  Tue, 10 May 2022 12:08:02 -0400
 
 nginx (1.20.2-2) unstable; urgency=medium
diff --git a/debian/patches/CVE-2021-3618.patch b/debian/patches/CVE-2021-3618.patch
deleted file mode 100644
index 10f37a9..0000000
--- a/debian/patches/CVE-2021-3618.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Subject: Patch mitigation for CVE-2021-3618
- Mail: max_errors directive.
- .
- Similarly to smtpd_hard_error_limit in Postfix and smtp_max_unknown_commands
- in Exim, specifies the number of errors after which the connection is closed.
-Origin: upstream, http://hg.nginx.org/nginx/rev/ec1071830799
-Bug-Debian: https://bugs.debian.org/991328
-
---- a/src/mail/ngx_mail.h
-+++ b/src/mail/ngx_mail.h
-@@ -115,6 +115,8 @@
-     ngx_msec_t              timeout;
-     ngx_msec_t              resolver_timeout;
- 
-+    ngx_uint_t              max_errors;
-+
-     ngx_str_t               server_name;
- 
-     u_char                 *file_name;
-@@ -231,6 +233,7 @@
-     ngx_uint_t              command;
-     ngx_array_t             args;
- 
-+    ngx_uint_t              errors;
-     ngx_uint_t              login_attempt;
- 
-     /* used to parse POP3/IMAP/SMTP command */
---- a/src/mail/ngx_mail_core_module.c
-+++ b/src/mail/ngx_mail_core_module.c
-@@ -85,6 +85,13 @@
-       offsetof(ngx_mail_core_srv_conf_t, resolver_timeout),
-       NULL },
- 
-+    { ngx_string("max_errors"),
-+      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
-+      ngx_conf_set_num_slot,
-+      NGX_MAIL_SRV_CONF_OFFSET,
-+      offsetof(ngx_mail_core_srv_conf_t, max_errors),
-+      NULL },
-+
-       ngx_null_command
- };
- 
-@@ -163,6 +170,8 @@
-     cscf->timeout = NGX_CONF_UNSET_MSEC;
-     cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
- 
-+    cscf->max_errors = NGX_CONF_UNSET_UINT;
-+
-     cscf->resolver = NGX_CONF_UNSET_PTR;
- 
-     cscf->file_name = cf->conf_file->file.name.data;
-@@ -182,6 +191,7 @@
-     ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout,
-                               30000);
- 
-+    ngx_conf_merge_uint_value(conf->max_errors, prev->max_errors, 5);
- 
-     ngx_conf_merge_str_value(conf->server_name, prev->server_name, "");
- 
---- a/src/mail/ngx_mail_handler.c
-+++ b/src/mail/ngx_mail_handler.c
-@@ -871,7 +871,20 @@
-         return NGX_MAIL_PARSE_INVALID_COMMAND;
-     }
- 
--    if (rc == NGX_IMAP_NEXT || rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
-+    if (rc == NGX_MAIL_PARSE_INVALID_COMMAND) {
-+
-+        s->errors++;
-+
-+        if (s->errors >= cscf->max_errors) {
-+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
-+                          "client sent too many invalid commands");
-+            s->quit = 1;
-+        }
-+
-+        return rc;
-+    }
-+
-+    if (rc == NGX_IMAP_NEXT) {
-         return rc;
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4e43575..5b6b799 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
-CVE-2021-3618.patch

From 7224e5e7ca7a1a8bd6f692082b176830ae3657bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 25 May 2022 11:04:30 +0200
Subject: [PATCH 386/600] d/control: removed ppc64el from list of luajit
 platforms.

---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16e6b2d..eb42d36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   [ Jan Mojžíš ]
   * d/patches/CVE-2021-3618.patch removed, fix is included in new upstream
   release
+  * d/control: removed ppc64el from list of luajit platforms. (Closes: #1011303)
 
  -- Thomas Ward <teward@ubuntu.com>  Tue, 10 May 2022 12:08:02 -0400
 
diff --git a/debian/control b/debian/control
index cc32589..3a2b586 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: debhelper-compat (= 13),
                libgd-dev,
                libgeoip-dev,
                libhiredis-dev,
-               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64 !ppc64el],
-               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64 ppc64el],
+               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64],
+               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64],
                libmaxminddb-dev,
                libmhash-dev,
                libpam0g-dev,

From a013b18ff66b9ac1d899827ed5725589f9900701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 25 May 2022 11:19:06 +0200
Subject: [PATCH 387/600] d/changelog fix whitespaces

---
 debian/changelog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb42d36..713a937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   [ Thomas Ward ]
   * New upstream release (1.22.0)
   * Additional changes:
-    * d/conf/mime.types: Fix a typo in font/woff2 extension in 
+    * d/conf/mime.types: Fix a typo in font/woff2 extension in
       mime.types.  (Closes: #1010798)
     * d/upstream/signing-key.asc: Additional signing keys observed
       in upstream (Konstantin Pavlov <k.pavlov@f5.com>) during
@@ -21,7 +21,7 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
 nginx (1.20.2-2) unstable; urgency=medium
 
   [ Thomas Ward ]
-  * d/patches/CVE-2021-3618.patch: Include upstream changeset from NGINX 
+  * d/patches/CVE-2021-3618.patch: Include upstream changeset from NGINX
     that adds mitigations into the Mail module for CVE-2021-3618.patch.
     (Closes: #991328)
 
@@ -46,7 +46,7 @@ nginx (1.20.2-1) unstable; urgency=medium
   * d/conf/mime.types: Update mime.types to more match upstream mime.types
     and include upstream changes with mime.types from 1.21.x via nginx.org
     mercurial repository versions.
-  * d/control: Remove self from Uploaders per other Debian devs, who want 
+  * d/control: Remove self from Uploaders per other Debian devs, who want
     that commit to be done by someone on the current uploaders/maintainers
     group instead.
 
@@ -65,7 +65,7 @@ nginx (1.18.0-9) unstable; urgency=medium
   * d/watch: Update watch syntax to match all even versions of NGINX releases
     rather than use a watch syntax that is static to one specific version.
     This will fix the untracked "New upstream stable versions" problem.
-  * d/control: Update 'uploaders' as Thomas Ward is now a maintainer in 
+  * d/control: Update 'uploaders' as Thomas Ward is now a maintainer in
     the Salsa repository.
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 05 Apr 2022 19:11:47 +0200

From 5eec971e2717232ed1d8a88ce193edccb495e582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 25 May 2022 17:13:14 +0200
Subject: [PATCH 388/600] d/copyright: - bump nginx copyright years - added
 copyright for src/stream/ngx_stream_set_module.c

---
 debian/changelog | 2 ++
 debian/copyright | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 713a937..53399e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   * d/patches/CVE-2021-3618.patch removed, fix is included in new upstream
   release
   * d/control: removed ppc64el from list of luajit platforms. (Closes: #1011303)
+  * d/copyright: bump nginx copyright years
+  * d/copyright: added copyright for src/stream/ngx_stream_set_module.c
 
  -- Thomas Ward <teward@ubuntu.com>  Tue, 10 May 2022 12:08:02 -0400
 
diff --git a/debian/copyright b/debian/copyright
index f82fc2d..a3f59eb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: nginx
 Source: https://nginx.org/en/download.html
 
 Files: *
-Copyright: 2002-2019, Igor Sysoev
-           2011-2019, Nginx, Inc.
+Copyright: 2002-2021, Igor Sysoev
+           2011-2022, Nginx, Inc.
                       Maxim Dounin
                       Valentin V. Bartenev
                       Roman Arutyunyan
@@ -15,6 +15,11 @@ Files: src/core/ngx_murmurhash.c
 Copyright: Copyright (C) Austin Appleby
 License: BSD-2-clause
 
+Files: src/stream/ngx_stream_set_module.c
+Copyright: Copyright (C) Pavel Pautov
+           Copyright (C) Nginx, Inc.
+License: BSD-2-clause
+
 Files: src/http/modules/ngx_http_scgi_module.c
        src/http/modules/ngx_http_uwsgi_module.c
 Copyright: 2009-2010, Unbit S.a.s.

From c3f9fc730b23255d7b2fce09b34a98583f9dcfc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 25 May 2022 17:45:49 +0200
Subject: [PATCH 389/600] d/copyright: removed copyright for
 src/http/v2/ngx_http_v2_huff_encode.c

---
 debian/changelog | 1 +
 debian/copyright | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 53399e7..1c01d3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   * d/control: removed ppc64el from list of luajit platforms. (Closes: #1011303)
   * d/copyright: bump nginx copyright years
   * d/copyright: added copyright for src/stream/ngx_stream_set_module.c
+  * d/copyright: removed copyright for src/http/v2/ngx_http_v2_huff_encode.c
 
  -- Thomas Ward <teward@ubuntu.com>  Tue, 10 May 2022 12:08:02 -0400
 
diff --git a/debian/copyright b/debian/copyright
index a3f59eb..d5c191a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,12 +28,6 @@ Copyright: 2009-2010, Unbit S.a.s.
                       Nginx, Inc.
 License: BSD-2-clause
 
-Files: src/http/v2/ngx_http_v2_huff_encode.c
-Copyright: 2015, Vlad Krasnov
-                 Nginx, Inc.
-                 Valentin V. Bartenev
-License: BSD-2-clause
-
 Files: contrib/geo2nginx.pl
 Copyright: 2005, Andrei Nigmatulin
 License: BSD-2-clause

From a8ebc4ba0c136b1df2c7bd2effffa467dc821f0d Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Thu, 26 May 2022 23:15:02 -0400
Subject: [PATCH 390/600] Update d/copyright for murmurhash license being
 public-domain

---
 debian/changelog | 5 ++++-
 debian/copyright | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c01d3f..4874df2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
       in upstream (Konstantin Pavlov <k.pavlov@f5.com>) during
       upstream merge/import by Thomas Ward, additional signing key
       was added to the keyring while keeping Maxim's key in signing
-      keys as wel.
+      keys as well.
+    * d/copyright: Updated copyright for src/core/ngx_murmurhash.c
+      and debian/modules/http-ndk/src/hash/murmurhash2.c to be 
+      public-domain (Closes: #1011936)
 
   [ Jan Mojžíš ]
   * d/patches/CVE-2021-3618.patch removed, fix is included in new upstream
diff --git a/debian/copyright b/debian/copyright
index d5c191a..59dfc09 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,10 @@ License: BSD-2-clause
 
 Files: src/core/ngx_murmurhash.c
 Copyright: Copyright (C) Austin Appleby
-License: BSD-2-clause
+License: public-domain
+ All MurmurHash versions are public domain software, and the author 
+ disclaims all copyright to their code.
+ 
 
 Files: src/stream/ngx_stream_set_module.c
 Copyright: Copyright (C) Pavel Pautov
@@ -65,7 +68,9 @@ License: BSD-4-clause
 
 Files: debian/modules/http-ndk/src/hash/murmurhash2.c
 Copyright: Austin Appleby
-License: BSD-3-clause
+License: public-domain
+ All MurmurHash versions are public domain software, and the author
+ disclaims all copyright to their code.
 
 Files: debian/modules/http-auth-pam/*
 Copyright: 2008-2020, Sergio Talens Oliag

From 20eb8ab414656c56632795454156ce014532972d Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Wed, 8 Jun 2022 15:22:49 -0400
Subject: [PATCH 391/600] ppc64el FTBFS fixed in luajit, nginx: no action
 needed

---
 debian/changelog | 1 -
 debian/control   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4874df2..3b92437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,6 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   [ Jan Mojžíš ]
   * d/patches/CVE-2021-3618.patch removed, fix is included in new upstream
   release
-  * d/control: removed ppc64el from list of luajit platforms. (Closes: #1011303)
   * d/copyright: bump nginx copyright years
   * d/copyright: added copyright for src/stream/ngx_stream_set_module.c
   * d/copyright: removed copyright for src/http/v2/ngx_http_v2_huff_encode.c
diff --git a/debian/control b/debian/control
index 3a2b586..cc32589 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: debhelper-compat (= 13),
                libgd-dev,
                libgeoip-dev,
                libhiredis-dev,
-               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64],
-               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64],
+               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64 !ppc64el],
+               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64 ppc64el],
                libmaxminddb-dev,
                libmhash-dev,
                libpam0g-dev,

From 4b7212e74500151248dab2f0baf45837e39a266d Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Wed, 8 Jun 2022 16:15:40 -0400
Subject: [PATCH 392/600] Enable luajit for s390x

---
 debian/changelog | 5 +++++
 debian/control   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b92437..48897b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,11 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
     * d/copyright: Updated copyright for src/core/ngx_murmurhash.c
       and debian/modules/http-ndk/src/hash/murmurhash2.c to be 
       public-domain (Closes: #1011936)
+  * d/control: Use libluajit-5.1-dev for s390x.
+    Due to src:luajit2 landing in Unstable, superseding src:luajit,
+    and due to luajit2 having s390x support, we can use s390x now
+    with luajit instead of standard Lua.
+    Thanks to Paul Gevers for the heads up on luajit2 supporting s390x.
 
   [ Jan Mojžíš ]
   * d/patches/CVE-2021-3618.patch removed, fix is included in new upstream
diff --git a/debian/control b/debian/control
index cc32589..bbec75a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: debhelper-compat (= 13),
                libgd-dev,
                libgeoip-dev,
                libhiredis-dev,
-               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64 !ppc64el],
-               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64 ppc64el],
+               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64 !ppc64el !s390x],
+               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64 ppc64el s390x],
                libmaxminddb-dev,
                libmhash-dev,
                libpam0g-dev,

From 333875401c6fa18c4f37d39f6ea6411ef1e1b60a Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Sat, 25 Jun 2022 17:31:16 -0400
Subject: [PATCH 393/600] Return ppc64el to liblua, luajit2 still broken on
 ppc64el.

---
 debian/changelog | 2 ++
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48897b5..fec8e1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
     and due to luajit2 having s390x support, we can use s390x now
     with luajit instead of standard Lua.
     Thanks to Paul Gevers for the heads up on luajit2 supporting s390x.
+  * d/control: Use liblua for ppc64el - src:luajit2 is still not ppc64el
+    stable and there seems to be nobody willing to support it.
 
   [ Jan Mojžíš ]
   * d/patches/CVE-2021-3618.patch removed, fix is included in new upstream
diff --git a/debian/control b/debian/control
index bbec75a..5ae14c8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: debhelper-compat (= 13),
                libgd-dev,
                libgeoip-dev,
                libhiredis-dev,
-               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64 !ppc64el !s390x],
-               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64 ppc64el s390x],
+               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64 !s390x],
+               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64 s390x],
                libmaxminddb-dev,
                libmhash-dev,
                libpam0g-dev,

From d4b9d6a1daf9e64816e6d69d4d10083a032e251c Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Fri, 4 Feb 2022 00:00:41 +0800
Subject: [PATCH 394/600] Adding nginx-dev package for tools for building
 out-of-tree modules

Nginx does not officially provide a mechanism to build out-of-tree modules,
however, this can be achieved by using all the headers and the configure
scripts in the auto/ directory. As a result, a nginx-dev package can thus be
developed for build out-of-tree modules.

The detailed steps to build an out-of-tree module in the headers-only nginx
source tree is:

1. Execute the configure script of nginx, with the same configure arguments
(excluding the reference to other dynamic modules, but including the reference
to depending modules as a built-in module). To prevent the configure scripts
modifying the nginx ource tree, we can 1. point the build dir to a directory
elsewhere, to generate all the build time files outside; 2. slightly patch the
configure scripts to prevent generating a makefile directly in the source tree,
which simply includes the generated makefile at the build dir.

2. Execute make at the source tree, but providing the generated makefile in the
build dir. The command is `make -C /path/to/nginx/source -f
/path/to/build_dir/Makefile modules`

To make sure the compiled module is compatible with the nginx binary and the
nginx binaries with the same upstream version, the key points are:

- Module signature: A module signature containing the (upstream) version number
and encoding the necessary configuration flags is put in each module as well as
the nginx binary itself. When loading a module, nginx will compare the signature
on the module with its own. As long as the configure flags, especially those
encoded in the signature, and the version of the nginx source used to build the
module are the same as thoes used to build the nginx binary, the moudle can pass
the signature check. As a result, the module can depend on the exact nginx
upstream version, ignoring the debian revison.
- ABI compatibility: We should maintain nginx precisely, to prevent making any
ABI changes between different debian revisions.
- Build check: When building the module, we can perform a simple module loading
check via `nginx -t`. This test serves as a "smoking test", to ensure we are
actually building loadable modules.

Summing all the above up and adding the necessary automation scripts for module
packaging, the nginx-dev package can be composed, including the following parts:

- The headers and configure scripts: generated and filtered out from the source
tree. The scripts are slightly patched to prevent generating a makefile directly
in the source tree, as stated above;
- The recorded configure options: all the modules built should include these
options when configured;
- dh_nginx script and its man page: modified from the original dh_nginx script,
adding a "--in-nginx-tree" option. When specified, the behavior remains the same
as the original version (so the option is added in the rule building the
in-package modules). When not specified, the dependency added into misc:Depends
will be the exact upstream nginx version, ignoring the debian revision. E.g.
nginx-common >= 1.20.2, << 1.20.2.1~
- a debhelper sequence plugin which can be enabled by module packages with `dh
--with=nginx`, inserting `dh_nginx` after `dh_install`
- a build system plugin which can bu enabled by module packages with `dh
--buildsystem=nginx_mod`, automating the module building process using the steps
mentioned before.
- autoscript templates used by dh_nginx are also installed without modification.

Currently. the architecture of nginx-dev is any because nginx has arch related
dependencies, which is brought in by http-lua module. After it is
removed from the nginx source tree, the architecture can be changed to
all since no binary is included in this package.
---
 debian/control                | 13 +++++
 debian/debhelper/nginx.pm     |  8 +++
 debian/debhelper/nginx_mod.pm | 96 +++++++++++++++++++++++++++++++++++
 debian/dh_nginx               | 18 ++++++-
 debian/nginx-dev.install      |  8 +++
 debian/nginx-dev.manpages     |  1 +
 debian/rules                  | 31 ++++++++---
 7 files changed, 165 insertions(+), 10 deletions(-)
 create mode 100644 debian/debhelper/nginx.pm
 create mode 100644 debian/debhelper/nginx_mod.pm
 create mode 100644 debian/nginx-dev.install
 create mode 100644 debian/nginx-dev.manpages

diff --git a/debian/control b/debian/control
index 5ae14c8..9f31ba4 100644
--- a/debian/control
+++ b/debian/control
@@ -68,6 +68,19 @@ Description: small, powerful, scalable web/proxy server - common files
  This package contains base configuration files used by all versions of
  nginx.
 
+Package: nginx-dev
+Architecture: any
+Depends: ${misc:Depends}, ${S:Build-Depends},
+         nginx-core (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version})
+Description: nginx web/proxy server - development headers
+ Nginx ("engine X") is a high-performance web and reverse proxy server
+ created by Igor Sysoev. It can be used both as a standalone web server
+ and as a proxy to reduce the load on back-end HTTP or mail servers.
+ .
+ This package provides development headers and necessary config scripts
+ for the nginx web/proxy server, useful to develop and link third party
+ additions to the Debian nginx web/proxy server packages.
+
 Package: nginx-core
 Architecture: any
 Depends: libnginx-mod-http-geoip (= ${binary:Version}),
diff --git a/debian/debhelper/nginx.pm b/debian/debhelper/nginx.pm
new file mode 100644
index 0000000..0473815
--- /dev/null
+++ b/debian/debhelper/nginx.pm
@@ -0,0 +1,8 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+insert_after("dh_install", "dh_nginx");
+
+1;
diff --git a/debian/debhelper/nginx_mod.pm b/debian/debhelper/nginx_mod.pm
new file mode 100644
index 0000000..af37fda
--- /dev/null
+++ b/debian/debhelper/nginx_mod.pm
@@ -0,0 +1,96 @@
+# A build system class for handling nginx modules.
+#
+# Copyright: © 2022 Miao Wang
+# License: MIT
+
+package Debian::Debhelper::Buildsystem::nginx_mod;
+
+use strict;
+use warnings;
+use Debian::Debhelper::Dh_Lib qw(error doit);
+use File::Spec;
+use parent qw(Debian::Debhelper::Buildsystem::makefile);
+use Config;
+
+sub DESCRIPTION {
+	"Nginx Module (config)"
+}
+
+sub check_auto_buildable {
+	my ($this, $step) = @_;
+
+	return 1 if -e $this->get_sourcepath("config");
+}
+
+sub _NGINX_SRC_DIR {
+    "/usr/share/nginx/src"
+}
+
+sub new {
+	my $class=shift;
+	my $this= $class->SUPER::new(@_);
+	$this->prefer_out_of_source_building(@_);
+	return $this;
+}
+
+sub configure {
+	my $this=shift;
+
+    doit({
+        "chdir" => $this->_NGINX_SRC_DIR,
+        "update_env" => {
+            "src_dir" => $this->get_sourcedir,
+            "bld_dir" => $this->get_builddir,
+            "pwd_dir" => $this->{cwd},
+        },
+    }, "bash", "-c", '. ./conf_flags
+    ./configure \\
+        --with-cc-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CFLAGS) -fPIC $(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CPPFLAGS)" \\
+        --with-ld-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get LDFLAGS) -fPIC" \\
+        "${NGX_CONF_FLAGS[@]}" \\
+        --add-dynamic-module="$pwd_dir/$src_dir" \\
+        --builddir="$pwd_dir/$bld_dir" \\
+        "$@"', "dummy", @_);
+}
+
+sub build {
+	my $this=shift;
+    
+    $this->do_make("-f", File::Spec->catfile($this->{cwd}, $this->get_buildpath("Makefile")), "-C", $this->_NGINX_SRC_DIR, "modules");
+}
+
+sub test {
+    my $this=shift;
+    $this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
+        tmp_conf=$(mktemp -p .)
+        for pre_dep in "$@"; do
+          echo "load_module modules/$pre_dep;" >> "$tmp_conf"
+        done
+        for i in *.so; do
+          echo "load_module $PWD/$i;" >> "$tmp_conf"
+        done
+        echo "events{}" >> "$tmp_conf"
+        nginx -g "error_log /dev/null; pid /dev/null;"  -t -q -c "$PWD/$tmp_conf"
+        rm -f "$tmp_conf"
+    ', "dummy", @_);
+}
+
+sub install {
+	my $this=shift;
+	my $destdir=shift;
+
+    $this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
+        destdir=$1
+        mkdir -p "$destdir/usr/lib/nginx/modules"
+        for i in *.so; do
+          cp "$i" "$destdir/usr/lib/nginx/modules/"
+        done
+    ', "dummy", $destdir);
+}
+
+sub clean {
+    my $this=shift;
+    $this->rmdir_builddir();
+}
+
+1
diff --git a/debian/dh_nginx b/debian/dh_nginx
index 8e6ce3b..4853568 100755
--- a/debian/dh_nginx
+++ b/debian/dh_nginx
@@ -48,7 +48,7 @@ sub nginx_modules_conf_installdir
 
 =head1 SYNOPSIS
 
-B<dh_nginx> [S<I<debhelper options>>] [B<-n>|B<--noscripts>]
+B<dh_nginx> [S<I<debhelper options>>] [B<-n>|B<--noscripts>] [B<--in-nginx-tree>]
 
 =head1 DESCRIPTION
 
@@ -63,6 +63,8 @@ It supports the following configuration types
 =item *
 Nginx modules
 
+=back
+
 =head1 INVOCATION
 
   %:
@@ -128,6 +130,10 @@ configuration by default.
 
 Do not modify F<postinst>/F<postrm>/F<prerm> maintainer scripts.
 
+=item B<--in-nginx-tree>
+
+Specify this option when building in-tree modules along with nginx. When
+specified, nginx abi version is not required in package name.
 
 =back
 
@@ -150,8 +156,11 @@ dh_nginx is heavily influnced by dh_apache2 written by Arno Toell
 ## main code starts here
 ##
 
+my $nginx_in_tree;
+
 init(options => {
 	"e|noenable" => \$dh{NOENABLE},
+	"in-nginx-tree" => \$nginx_in_tree,
 });
 
 foreach my $package ((@{$dh{DOPACKAGES}}))
@@ -231,7 +240,12 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
                 {
                         warning("Package $package appears to be an Nginx module. It should comply to the package naming scheme libnginx-mod-<modulename>\n");
                 }
-                addsubstvar($package, "misc:Depends", nginx_depends());
+                if ($nginx_in_tree){
+                            addsubstvar($package, "misc:Depends", nginx_depends());
+                } else {
+                            my $ngx_ver = `grep 'define NGINX_VERSION' /usr/share/nginx/src/src/core/nginx.h | sed -e 's/^.*"\\(.*\\)".*/\\1/'`;
+                            addsubstvar($package, "misc:Depends", "nginx-common (>= $ngx_ver), nginx-common (<< $ngx_ver.1~)");
+                }
 
                 my $modules = "";
                 foreach my $module (@{$PACKAGE_TYPE{'has_a_module'}})
diff --git a/debian/nginx-dev.install b/debian/nginx-dev.install
new file mode 100644
index 0000000..6a2ad43
--- /dev/null
+++ b/debian/nginx-dev.install
@@ -0,0 +1,8 @@
+debian/build-src/auto usr/share/nginx/src/
+debian/build-src/src usr/share/nginx/src/
+debian/build-src/conf_flags usr/share/nginx/src/
+debian/build-src/configure usr/share/nginx/src/
+debian/debhelper/nginx.pm usr/share/perl5/Debian/Debhelper/Sequence/
+debian/dh_nginx usr/bin/
+debian/debhelper/nginx_mod.pm usr/share/perl5/Debian/Debhelper/Buildsystem/
+debian/autoscripts/* usr/share/debhelper/autoscripts/
diff --git a/debian/nginx-dev.manpages b/debian/nginx-dev.manpages
new file mode 100644
index 0000000..0ece920
--- /dev/null
+++ b/debian/nginx-dev.manpages
@@ -0,0 +1 @@
+debian/build-src/dh_nginx.1
diff --git a/debian/rules b/debian/rules
index f777843..68ed613 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ DYN_MODS := \
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
-$(foreach flavour,$(FLAVOURS),$(eval BUILDDIR_$(flavour) = $(CURDIR)/debian/build-$(flavour)))
+$(foreach flavour,$(FLAVOURS) src,$(eval BUILDDIR_$(flavour) = $(CURDIR)/debian/build-$(flavour)))
 
 DEB_BUILD_ARCH ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifeq ($(DEB_BUILD_ARCH),sparc)
@@ -48,9 +48,7 @@ MODULESPATCHDIR = $(CURDIR)/debian/modules/patches
 modules_with_patches := $(notdir $(wildcard $(CURDIR)/debian/modules/patches/*))
 
 # configure flags
-common_configure_flags := \
-			--with-cc-opt="$(debian_cflags)" \
-			--with-ld-opt="$(debian_ldflags)" \
+basic_configure_flags := \
 			--prefix=/usr/share/nginx \
 			--conf-path=/etc/nginx/nginx.conf \
 			--http-log-path=/var/log/nginx/access.log \
@@ -75,6 +73,11 @@ common_configure_flags := \
 			--with-http_slice_module \
 			--with-threads
 
+common_configure_flags := \
+			--with-cc-opt="$(debian_cflags)" \
+			--with-ld-opt="$(debian_ldflags)" \
+			$(basic_configure_flags)
+
 light_configure_flags := \
 			$(common_configure_flags) \
 			--with-http_gzip_static_module \
@@ -132,15 +135,15 @@ extras_configure_flags := \
 %:
 	dh $@ --without autoreconf
 
-override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour))
-override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour))
+override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour)) config.src
+override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour)) build.src
 override_dh_strip:          $(foreach flavour,$(FLAVOURS),strip.arch.$(flavour)) $(foreach mod,$(DYN_MODS),strip.mods.$(mod))
-override_dh_clean:          clean_patch_modules $(foreach flavour,$(FLAVOURS),clean.$(flavour))
+override_dh_clean:          clean_patch_modules $(foreach flavour,$(FLAVOURS),clean.$(flavour)) clean.src
 	dh_clean
 
 override_dh_install:
 	dh_install
-	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/autoscripts debian/dh_nginx
+	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/autoscripts debian/dh_nginx --in-nginx-tree
 
 override_dh_installinit:
 	dh_installinit --no-stop-on-upgrade --no-start --name=nginx
@@ -154,6 +157,14 @@ override_dh_installlogrotate:
 build.arch.%:
 	$(MAKE) -C $(BUILDDIR_$*) build
 
+build.src:
+	cp -Pa $(CURDIR)/auto $(BUILDDIR_src)/
+	sed -i '/^# create Makefile/,/^END$$/d' $(BUILDDIR_src)/auto/make $(BUILDDIR_src)/auto/init $(BUILDDIR_src)/auto/install
+	find $(CURDIR)/src -type f -name '*.h' -printf 'src/%P\0' | tar -C $(CURDIR) --null --files-from - -c | tar -C $(BUILDDIR_src)/ -x
+	if [ -e $(CURDIR)/configure ]; then cp $(CURDIR)/configure $(BUILDDIR_src)/; fi
+	echo "NGX_CONF_FLAGS=(" $(basic_configure_flags) ")" > $(BUILDDIR_src)/conf_flags
+	pod2man debian/dh_nginx > $(BUILDDIR_src)/dh_nginx.1
+
 strip.arch.%:
 	dh_strip --package=nginx-$(*) -O--dbgsym-migration='nginx-$(*)-dbg (<< 1.10.1-3~)'
 
@@ -182,6 +193,10 @@ config.arch.%:
 	cp -Pa $(CURDIR)/man $(BUILDDIR_$*)/
 	cd $(BUILDDIR_$*) && ./configure $($*_configure_flags)
 
+config.src:
+	dh_testdir
+	mkdir -p $(BUILDDIR_src)
+
 clean.%:
 	rm -rf $(BUILDDIR_$*)
 

From 87b5e38f6d10b13e7fd567c9e430153c48d7bafc Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Thu, 26 May 2022 15:48:54 +0800
Subject: [PATCH 395/600] nginx-dev: simplify dependencies

nginx-dev depends on ${S:Build-Depends} before this commit, to include
all the build-depdencies of nginx source packages. However, this also
includes build dependency for those in-tree 3rd party modules, which are
unnecessary. This commit removes them and explicitly list those packages
needed to build a general module. The architecture of nginx-dev can thus
be changed to all instead of any.

When all 3rd party modules are removed, the dependency can be changed
back to ${S:Build-Depends} to make the config less redundant.
---
 debian/control | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 9f31ba4..f6b11ba 100644
--- a/debian/control
+++ b/debian/control
@@ -69,9 +69,21 @@ Description: small, powerful, scalable web/proxy server - common files
  nginx.
 
 Package: nginx-dev
-Architecture: any
-Depends: ${misc:Depends}, ${S:Build-Depends},
-         nginx-core (= ${binary:Version}) | nginx-light (= ${binary:Version}) | nginx-extras (= ${binary:Version})
+Architecture: all
+Depends: ${misc:Depends},
+         debhelper-compat (= 13),
+         dpkg-dev (>= 1.15.5),
+         libgd-dev,
+         libgeoip-dev,
+         libpcre3-dev,
+         libperl-dev,
+         libssl-dev,
+         libxslt1-dev,
+         po-debconf,
+         quilt,
+         zlib1g-dev,
+         nginx-core (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
+         nginx-core (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version})
 Description: nginx web/proxy server - development headers
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server

From 2784d3f935d26fab5d485caa6843221f2691686b Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Fri, 27 May 2022 00:09:29 +0800
Subject: [PATCH 396/600] nginx-dev: fix nginx version subtracting in dh_nginx

---
 debian/dh_nginx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/dh_nginx b/debian/dh_nginx
index 4853568..e07ffe1 100755
--- a/debian/dh_nginx
+++ b/debian/dh_nginx
@@ -244,6 +244,7 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
                             addsubstvar($package, "misc:Depends", nginx_depends());
                 } else {
                             my $ngx_ver = `grep 'define NGINX_VERSION' /usr/share/nginx/src/src/core/nginx.h | sed -e 's/^.*"\\(.*\\)".*/\\1/'`;
+                            chomp($ngx_ver);
                             addsubstvar($package, "misc:Depends", "nginx-common (>= $ngx_ver), nginx-common (<< $ngx_ver.1~)");
                 }
 

From 15c55ec59b0f542e9cecf7205e5e54a0d6beba2e Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Fri, 6 May 2022 18:59:25 +0800
Subject: [PATCH 397/600] dh_nginx: move to debian/debhelper

Move dh_nginx script to debian/debhelper so that all debhelper scripts
are located together.
---
 debian/{ => debhelper}/dh_nginx | 0
 debian/nginx-dev.install        | 2 +-
 debian/rules                    | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename debian/{ => debhelper}/dh_nginx (100%)

diff --git a/debian/dh_nginx b/debian/debhelper/dh_nginx
similarity index 100%
rename from debian/dh_nginx
rename to debian/debhelper/dh_nginx
diff --git a/debian/nginx-dev.install b/debian/nginx-dev.install
index 6a2ad43..efc1578 100644
--- a/debian/nginx-dev.install
+++ b/debian/nginx-dev.install
@@ -3,6 +3,6 @@ debian/build-src/src usr/share/nginx/src/
 debian/build-src/conf_flags usr/share/nginx/src/
 debian/build-src/configure usr/share/nginx/src/
 debian/debhelper/nginx.pm usr/share/perl5/Debian/Debhelper/Sequence/
-debian/dh_nginx usr/bin/
+debian/debhelper/dh_nginx usr/bin/
 debian/debhelper/nginx_mod.pm usr/share/perl5/Debian/Debhelper/Buildsystem/
 debian/autoscripts/* usr/share/debhelper/autoscripts/
diff --git a/debian/rules b/debian/rules
index 68ed613..d4ddc7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,7 +143,7 @@ override_dh_clean:          clean_patch_modules $(foreach flavour,$(FLAVOURS),cl
 
 override_dh_install:
 	dh_install
-	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/autoscripts debian/dh_nginx --in-nginx-tree
+	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/autoscripts debian/debhelper/dh_nginx --in-nginx-tree
 
 override_dh_installinit:
 	dh_installinit --no-stop-on-upgrade --no-start --name=nginx
@@ -163,7 +163,7 @@ build.src:
 	find $(CURDIR)/src -type f -name '*.h' -printf 'src/%P\0' | tar -C $(CURDIR) --null --files-from - -c | tar -C $(BUILDDIR_src)/ -x
 	if [ -e $(CURDIR)/configure ]; then cp $(CURDIR)/configure $(BUILDDIR_src)/; fi
 	echo "NGX_CONF_FLAGS=(" $(basic_configure_flags) ")" > $(BUILDDIR_src)/conf_flags
-	pod2man debian/dh_nginx > $(BUILDDIR_src)/dh_nginx.1
+	pod2man debian/debhelper/dh_nginx > $(BUILDDIR_src)/dh_nginx.1
 
 strip.arch.%:
 	dh_strip --package=nginx-$(*) -O--dbgsym-migration='nginx-$(*)-dbg (<< 1.10.1-3~)'

From 509adba304b06ff3fcb99b0baa8ef689e4bed40d Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Fri, 6 May 2022 19:09:50 +0800
Subject: [PATCH 398/600] dh_nginx: support auto generating module config files

This patch adds support of auto generating module config files for
modules in the naming pattern of libnginx-mod-* but with missing
<module_name>.nginx file. The module load file and its loading priority
is inferred from the package name in this case.

Using this feature, the repeated files d/libnginx-mod-*.nginx and
d/libnginx-mod.conf/ can be removed, and the packaging for out-of-tree
modules can be simplified.
---
 debian/debhelper/dh_nginx | 122 ++++++++++++++++++++++++--------------
 1 file changed, 79 insertions(+), 43 deletions(-)

diff --git a/debian/debhelper/dh_nginx b/debian/debhelper/dh_nginx
index e07ffe1..f2b9bb5 100755
--- a/debian/debhelper/dh_nginx
+++ b/debian/debhelper/dh_nginx
@@ -84,6 +84,11 @@ Lists files to be registered with the Nginx HTTP server. The file is
 interpreted as line separated list of installation stanzas, where each entry
 consists of whitespace separated values conforming to the file semantics below.
 
+When this file is missing but the name of the package looks like a nginx module,
+the module load file and its loading priority is automatically generated inferring
+from the package name. In this case, I<package-name>B<.install> or other mechanisms
+should be used for copying the B<.so> library into the correct place.
+
 =head2 FILE SEMANTICS
 
 Each line consists of a triple
@@ -171,65 +176,96 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 
 	my $file = pkgfile($package, "nginx");
 	my $tmp  = tmpdir($package);
+	my $installdir = $tmp . "/" . nginx_modules_conf_installdir();
+	my $modinstalldir = $tmp . "/" . nginx_api_installdir();
 
-	my @files_to_register = filedoublearray($file, ".") if $file;
-	foreach my $line (@files_to_register)
-	{
-		my $type = lc(shift @{$line}) if $line->[0];
-		my $source = shift @{$line} if $line->[0];
-		my @arguments = @{$line};
-		my $destination;
-
-		$type = "modules" if $type eq "mod";
-		my $installdir = $tmp . "/" . nginx_modules_conf_installdir();
-
-		verbose_print("$type -- $source -- @arguments\n\n");
-
-		if ($type eq "modules")
+	if ($file){
+		my @files_to_register = filedoublearray($file, ".") if $file;
+		foreach my $line (@files_to_register)
 		{
-			my $basesource = basename($source);
+			my $type = lc(shift @{$line}) if $line->[0];
+			my $source = shift @{$line} if $line->[0];
+			my @arguments = @{$line};
+			my $destination;
+
+			$type = "modules" if $type eq "mod";
+
+			verbose_print("$type -- $source -- @arguments\n\n");
 
 			if ($type eq "modules")
 			{
-				if ($basesource =~ m/\.conf$/)
+				my $basesource = basename($source);
+
+				if ($type eq "modules")
 				{
-					my $enablename = $basesource;
-					my $prio = $#arguments >= 0 ? $arguments[0] : 50;
-					$destination = "$prio-$basesource";
-					push @{$PACKAGE_TYPE{'has_a_module'}}, "$enablename:$destination";
-					verbose_print("Installing module configuration $enablename into $installdir prio:$prio\n");
-				}
-				elsif ($basesource =~ m/\.so$/)
-			{
-					my $modinstalldir = $tmp . "/" . nginx_api_installdir();
-					verbose_print("Installing module binary $source into $modinstalldir\n");
-					if (! -d $modinstalldir)
+					if ($basesource =~ m/\.conf$/)
 					{
-						complex_doit("mkdir","-p", $modinstalldir);
-						complex_doit("chmod","755","$modinstalldir");
+						my $enablename = $basesource;
+						my $prio = $#arguments >= 0 ? $arguments[0] : 50;
+						$destination = "$prio-$basesource";
+						push @{$PACKAGE_TYPE{'has_a_module'}}, "$enablename:$destination";
+						verbose_print("Installing module configuration $enablename into $installdir prio:$prio\n");
 					}
-					complex_doit("cp", $source, $modinstalldir);
-					next;
+					elsif ($basesource =~ m/\.so$/)
+					{
+						verbose_print("Installing module binary $source into $modinstalldir\n");
+						if (! -d $modinstalldir)
+						{
+							complex_doit("mkdir","-p", $modinstalldir);
+							complex_doit("chmod","755","$modinstalldir");
+						}
+						complex_doit("cp", $source, $modinstalldir);
+						next;
+					}
+
+					# TODO
+					error("module: \"$basesource\" needs .conf, .so or suffix") if $basesource !~ m/\.(conf|so)/;
 				}
 
-				# TODO
-				error("module: \"$basesource\" needs .conf, .so or suffix") if $basesource !~ m/\.(conf|so)/;
-			}
+				if (! -d $installdir)
+				{
+					complex_doit("mkdir","-p",$installdir);
+					complex_doit("chmod","755","$installdir");
+				}
+				complex_doit("cp",$source,$installdir);
+				complex_doit("chmod","644","$installdir/$basesource");
 
-			if (! -d $installdir)
+			}
+			else
 			{
-				complex_doit("mkdir","-p",$installdir);
-				complex_doit("chmod","755","$installdir");
+				error("Unknown parameter: $type\n");
 			}
-			complex_doit("cp",$source,$installdir);
-			complex_doit("chmod","644","$installdir/$basesource");
 
 		}
-		else
-		{
-			error("Unknown parameter: $type\n");
-		}
+	} elsif ($package =~ /^libnginx-mod-/){
+		verbose_print("$package might be a nginx module\n");
 
+		my $module = $package;
+		$module =~ s/^libnginx-mod-//;
+		verbose_print("Guessed module name: $module\n");
+
+		my $modulepath = $module;
+		$modulepath =~ s/-/_/g;
+
+		if (-e "$modinstalldir/ngx_${modulepath}_module.so"){
+			my $prio = 50;
+			if ($module =~ /^\w+-/ && !($module =~ /^http-/) ){
+				$prio = 70;
+			}
+			verbose_print("Guessed load priority: $prio\n");
+
+			my $conf_name = "mod-$module.conf";
+			install_dir($installdir);
+			verbose_print("Installing module configuration $conf_name into $installdir prio:$prio\n");
+			open(MOD_CONF, $dh{NO_ACT} ? ">&STDERR" : ">$installdir/$conf_name") or error("open($installdir/$conf_name): $!");
+			print(MOD_CONF "load_module modules/ngx_${modulepath}_module.so;\n");
+			close(MOD_CONF);
+			chmod(0644, "$installdir/$conf_name") or error("chmod(0644, $installdir/$conf_name): $!");
+			push @{$PACKAGE_TYPE{'has_a_module'}}, "$conf_name:$prio-$conf_name";
+		} else {
+			verbose_print("$package is not a nginx module because $modinstalldir/ngx_${modulepath}_module.so not found");
+			verbose_print("If it is not correct, check if the module is installed before invoking this script");
+		}
 	}
 
         my @postinst_autoscripts;

From ed5bc15213993766af66189792d5a7ed496681e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 15 May 2022 09:12:16 +0200
Subject: [PATCH 399/600] Remove
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch

---
 ...ure-stays-the-same-in-all-nginx-buil.patch | 28 -------------------
 debian/patches/series                         |  1 -
 2 files changed, 29 deletions(-)
 delete mode 100644 debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch

diff --git a/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch b/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
deleted file mode 100644
index 9e27e1a..0000000
--- a/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Christos Trochalakis <ctrochalakis@debian.org>
-Date: Wed, 30 Mar 2016 09:47:11 +0300
-Subject: Make sure signature stays the same in all nginx builds
-
-NGX_HTTP_HEADERS is part of nginx signature. When a dyn
-modules is loaded the signature of the module is compared
-to the one of the nginx binary.
-
-dyn modules are build from nginx-full, so in order to make
-them loadable in other flavors we need to make sure all the
-binaries share the same signature.
----
- configure | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/configure
-+++ b/configure
-@@ -58,6 +58,10 @@
-     . auto/unix
- fi
- 
-+# Debian
-+# Make sure signature stays the same on all nginx flavors
-+have=NGX_HTTP_HEADERS . auto/have
-+
- . auto/threads
- . auto/modules
- . auto/lib/conf
diff --git a/debian/patches/series b/debian/patches/series
index 5b6b799..04030f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch

From 9f1044b9401f8b40ebefa306761ecd9a951750ba Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Sun, 26 Jun 2022 15:26:40 +0800
Subject: [PATCH 400/600] changelog: update changelog

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fec8e1d..581bd2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,14 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   * d/copyright: added copyright for src/stream/ngx_stream_set_module.c
   * d/copyright: removed copyright for src/http/v2/ngx_http_v2_huff_encode.c
 
+  [ Miao Wang ]
+  * dh_nginx: support auto generating module config files
+  * adding a new nginx-dev package including necessary headers and debhelper
+    scripts to build and package a 3rd party module.
+  * d/p/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
+    removed, because feature already implemented with --with-compat configure
+    option since 1.11.5
+
  -- Thomas Ward <teward@ubuntu.com>  Tue, 10 May 2022 12:08:02 -0400
 
 nginx (1.20.2-2) unstable; urgency=medium

From 83ca2994f8be7c48e6cfe82236d5268bc3e29f93 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Tue, 17 May 2022 15:42:18 -0400
Subject: [PATCH 401/600] Copyright file needed updated (caught by Bage, who
 emailed a patch to teward)

---
 debian/changelog | 3 +++
 debian/copyright | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 581bd2e..542e5a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   * d/copyright: added copyright for src/stream/ngx_stream_set_module.c
   * d/copyright: removed copyright for src/http/v2/ngx_http_v2_huff_encode.c
 
+  [ Bastian Germann ]
+  * d/copyright: Update copyright for d/debhelper/*
+
   [ Miao Wang ]
   * dh_nginx: support auto generating module config files
   * adding a new nginx-dev package including necessary headers and debhelper
diff --git a/debian/copyright b/debian/copyright
index 59dfc09..6449e69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -47,6 +47,10 @@ Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
            2020-2022, Ondřej Nový <onovy@debian.org>
 License: BSD-2-clause
 
+Files: debian/debhelper/*
+Copyright: 2022 Miao Wang
+License: Expat
+
 Files: debian/modules/http-headers-more-filter/*
 Copyright: 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
            2010-2013, Bernd Dorn

From bf9c433dbbb5d6accb5546a805dacf59e04f5d99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 26 Jun 2022 14:35:33 +0200
Subject: [PATCH 402/600] d/control: bump Standards-Version to 4.6.1, no
 changes

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 542e5a6..fe5fc20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   * d/copyright: bump nginx copyright years
   * d/copyright: added copyright for src/stream/ngx_stream_set_module.c
   * d/copyright: removed copyright for src/http/v2/ngx_http_v2_huff_encode.c
+  * d/control: bump Standards-Version to 4.6.1, no changes
 
   [ Bastian Germann ]
   * d/copyright: Update copyright for d/debhelper/*
diff --git a/debian/control b/debian/control
index f6b11ba..21eb530 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper-compat (= 13),
                po-debconf,
                quilt,
                zlib1g-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Homepage: https://nginx.org
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx

From 7df2636a9d22b2fb385f06af25a61f929b9b4bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 26 Jun 2022 16:16:08 +0200
Subject: [PATCH 403/600] d/changelog fix whitespace

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fe5fc20..68a4ac4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
       was added to the keyring while keeping Maxim's key in signing
       keys as well.
     * d/copyright: Updated copyright for src/core/ngx_murmurhash.c
-      and debian/modules/http-ndk/src/hash/murmurhash2.c to be 
+      and debian/modules/http-ndk/src/hash/murmurhash2.c to be
       public-domain (Closes: #1011936)
   * d/control: Use libluajit-5.1-dev for s390x.
     Due to src:luajit2 landing in Unstable, superseding src:luajit,

From 172eb7b12a8ba0bf4667e54835b5d2024adadc23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 26 Jun 2022 16:16:58 +0200
Subject: [PATCH 404/600] d/changelog close #1013807 bug

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 68a4ac4..a12536e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
     with luajit instead of standard Lua.
     Thanks to Paul Gevers for the heads up on luajit2 supporting s390x.
   * d/control: Use liblua for ppc64el - src:luajit2 is still not ppc64el
-    stable and there seems to be nobody willing to support it.
+    stable and there seems to be nobody willing to support it. (Closes: 1013807)
 
   [ Jan Mojžíš ]
   * d/patches/CVE-2021-3618.patch removed, fix is included in new upstream

From 42508c8556723f6e499bba2850f13a97665374fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 26 Jun 2022 16:20:26 +0200
Subject: [PATCH 405/600] create var/www/html in nginx-common.postinst

---
 debian/nginx-common.dirs              | 1 -
 debian/nginx-common.lintian-overrides | 2 --
 debian/nginx-common.postinst          | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 debian/nginx-common.lintian-overrides

diff --git a/debian/nginx-common.dirs b/debian/nginx-common.dirs
index 65bb651..8e5d7bf 100644
--- a/debian/nginx-common.dirs
+++ b/debian/nginx-common.dirs
@@ -10,4 +10,3 @@ usr/share/vim/addons
 usr/share/vim/registry
 var/lib/nginx
 var/log/nginx
-var/www/html
diff --git a/debian/nginx-common.lintian-overrides b/debian/nginx-common.lintian-overrides
deleted file mode 100644
index 35cc9bc..0000000
--- a/debian/nginx-common.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# /var/www/html is the default document root
-nginx-common: dir-or-file-in-var-www var/www/html/
diff --git a/debian/nginx-common.postinst b/debian/nginx-common.postinst
index 9e0610e..0d44608 100644
--- a/debian/nginx-common.postinst
+++ b/debian/nginx-common.postinst
@@ -39,6 +39,7 @@ case "$1" in
 
     # Create a default index page when not already present.
     if [ ! -e /var/www/html/index.nginx-debian.html ]; then
+      mkdir -p /var/www/html
       cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
     fi
 

From 1a3b0014140ee9b085732cf31457435d70f9a713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 26 Jun 2022 16:41:06 +0200
Subject: [PATCH 406/600] d/changelog close #985133 bug

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a12536e..1409f33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,7 +35,7 @@ nginx (1.22.0-1) UNRELEASED; urgency=medium
   [ Miao Wang ]
   * dh_nginx: support auto generating module config files
   * adding a new nginx-dev package including necessary headers and debhelper
-    scripts to build and package a 3rd party module.
+    scripts to build and package a 3rd party module. (Closes: 985133)
   * d/p/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
     removed, because feature already implemented with --with-compat configure
     option since 1.11.5

From 035ed7f34a7c35aee9e008eb26f5a5c99f15ca82 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Sat, 9 Jul 2022 20:14:24 -0400
Subject: [PATCH 407/600] Unstable upload

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1409f33..46c9e92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.22.0-1) UNRELEASED; urgency=medium
+nginx (1.22.0-1) unstable; urgency=medium
 
   [ Thomas Ward ]
   * New upstream release (1.22.0)

From ccd67189200544340c52c67bebd8eeea797a5b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 10 Jul 2022 08:21:23 +0200
Subject: [PATCH 408/600] d/nginx-common.nginx.service update

---
 debian/changelog                  | 12 ++++++++++++
 debian/nginx-common.nginx.service |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 46c9e92..609ac41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nginx (1.22.0-2) UNRELEASED; urgency=medium
+
+  * d/nginx-common.nginx.service: added Systemd dependency
+    Wants=network-online.target and updated Systemd "After" dependency to
+    recommended NGINX values, namely:
+    - syslog.target
+    - network-online.target (Closes: 61261) (Closes: 1000406)
+    - remote-fs.target (Closes: 898896)
+    - nss-lookup.target
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 10 Jul 2022 07:58:44 +0200
+
 nginx (1.22.0-1) unstable; urgency=medium
 
   [ Thomas Ward ]
diff --git a/debian/nginx-common.nginx.service b/debian/nginx-common.nginx.service
index 78bf0ce..a46a725 100644
--- a/debian/nginx-common.nginx.service
+++ b/debian/nginx-common.nginx.service
@@ -13,7 +13,8 @@
 [Unit]
 Description=A high performance web server and a reverse proxy server
 Documentation=man:nginx(8)
-After=network.target nss-lookup.target
+After=syslog.target network-online.target remote-fs.target nss-lookup.target
+Wants=network-online.target
 
 [Service]
 Type=forking

From 88d4d1577a0387abc4cf2d6b039711bfd7c142af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 10 Jul 2022 08:29:08 +0200
Subject: [PATCH 409/600] 
 d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch forwarded to
 upstream

---
 debian/changelog                                                | 2 ++
 .../0003-define_gnu_source-on-other-glibc-based-platforms.patch | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 609ac41..749ec29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ nginx (1.22.0-2) UNRELEASED; urgency=medium
     - network-online.target (Closes: 61261) (Closes: 1000406)
     - remote-fs.target (Closes: 898896)
     - nss-lookup.target
+  * d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch: forwarded
+    to upstream (Closes: 859082)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 10 Jul 2022 07:58:44 +0200
 
diff --git a/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch b/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch
index d43fd23..caf155f 100644
--- a/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch
+++ b/debian/patches/0003-define_gnu_source-on-other-glibc-based-platforms.patch
@@ -1,6 +1,7 @@
 Date: Sat, 16 Jul 2016 23:52:50 +0100
 From: Steven Chamberlain <stevenc@debian.org>
 Subject: Use _GNU_SOURCE on GNU/kFreeBSD
+Forwarded: https://trac.nginx.org/nginx/ticket/2366
 
 Define _GNU_SOURCE not only on GNU/Hurd, but also other glibc-based
 platforms including GNU/kFreeBSD.

From ff7cd7012d526745b8b5bc514877e2be0a487da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 10 Jul 2022 18:32:08 +0200
Subject: [PATCH 410/600] d/t/reboot: added, tests if nginx works after reboot

---
 debian/changelog     |  1 +
 debian/tests/control |  4 ++++
 debian/tests/reboot  | 15 +++++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 debian/tests/reboot

diff --git a/debian/changelog b/debian/changelog
index 749ec29..adf2e41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ nginx (1.22.0-2) UNRELEASED; urgency=medium
     - nss-lookup.target
   * d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch: forwarded
     to upstream (Closes: 859082)
+  * d/t/reboot: added, tests if nginx works after reboot
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 10 Jul 2022 07:58:44 +0200
 
diff --git a/debian/tests/control b/debian/tests/control
index 52690ae..4a24735 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -125,3 +125,7 @@ Depends: nginx-extras,
          libnginx-mod-stream-geoip,
          libnginx-mod-stream-geoip2,
          libnginx-mod-stream,
+
+Tests: reboot
+Restrictions: isolation-container, needs-root, needs-reboot
+Depends: nginx-light, curl
diff --git a/debian/tests/reboot b/debian/tests/reboot
new file mode 100644
index 0000000..a90a6c9
--- /dev/null
+++ b/debian/tests/reboot
@@ -0,0 +1,15 @@
+#!/bin/sh
+# 20220710
+# Jan Mojzis
+# Public domain
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+# do simple curl
+curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+
+# test if nginx runs after reboot
+if [ x"${AUTOPKGTEST_REBOOT_MARK}" = x ]; then
+  /tmp/autopkgtest-reboot rebootmark
+fi

From 461acc4f5141c73b01531283c035580608073e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 10 Jul 2022 20:12:32 +0200
Subject: [PATCH 411/600] d/nginx-common.nginx.service: remove systemd 'After'
 dependency syslog.target, is obsolete

---
 debian/changelog                  | 1 -
 debian/nginx-common.nginx.service | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index adf2e41..d9adaf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ nginx (1.22.0-2) UNRELEASED; urgency=medium
   * d/nginx-common.nginx.service: added Systemd dependency
     Wants=network-online.target and updated Systemd "After" dependency to
     recommended NGINX values, namely:
-    - syslog.target
     - network-online.target (Closes: 61261) (Closes: 1000406)
     - remote-fs.target (Closes: 898896)
     - nss-lookup.target
diff --git a/debian/nginx-common.nginx.service b/debian/nginx-common.nginx.service
index a46a725..a63fa0f 100644
--- a/debian/nginx-common.nginx.service
+++ b/debian/nginx-common.nginx.service
@@ -13,7 +13,7 @@
 [Unit]
 Description=A high performance web server and a reverse proxy server
 Documentation=man:nginx(8)
-After=syslog.target network-online.target remote-fs.target nss-lookup.target
+After=network-online.target remote-fs.target nss-lookup.target
 Wants=network-online.target
 
 [Service]

From 0d813834ef16b455986c8aea98f9f0a1158eff02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 11 Jul 2022 20:33:33 +0200
Subject: [PATCH 412/600] http-subs-filter add PCRE2 support

---
 debian/changelog                              |  1 +
 .../patches/http-subs-filter/pcre2.patch      | 24 +++++++++++++++++++
 .../modules/patches/http-subs-filter/series   |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 debian/modules/patches/http-subs-filter/pcre2.patch

diff --git a/debian/changelog b/debian/changelog
index d9adaf3..9fb216f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ nginx (1.22.0-2) UNRELEASED; urgency=medium
   * d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch: forwarded
     to upstream (Closes: 859082)
   * d/t/reboot: added, tests if nginx works after reboot
+  * d/m/p/http-subs-filter/pcre2.patch: added PCRE2 support
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 10 Jul 2022 07:58:44 +0200
 
diff --git a/debian/modules/patches/http-subs-filter/pcre2.patch b/debian/modules/patches/http-subs-filter/pcre2.patch
new file mode 100644
index 0000000..692257c
--- /dev/null
+++ b/debian/modules/patches/http-subs-filter/pcre2.patch
@@ -0,0 +1,24 @@
+Author: shmux8 <75251845+shmux8@users.noreply.github.com>
+Date:   Tue Dec 28 11:15:00 2021 +0300
+Subject: [PATCH] pcre2 support
+Origin: https://github.com/yaoweibin/ngx_http_substitutions_filter_module/commit/cc494d7f5c5273a7a8ae503faebf1101689d75c0
+
+    PCRE2 support added
+
+    Use pcre2_pattern_info call if nginx built with PCRE2.
+
+diff --git a/debian/modules/http-subs-filter/ngx_http_subs_filter_module.c b/debian/modules/http-subs-filter/ngx_http_subs_filter_module.c
+index 483c9c3..11a5b79 100644
+--- a/ngx_http_subs_filter_module.c
++++ b/ngx_http_subs_filter_module.c
+@@ -1203,7 +1203,9 @@ ngx_http_subs_regex_capture_count(ngx_regex_t *re)
+ 
+     n = 0;
+ 
+-#if defined(nginx_version) && nginx_version >= 1002002
++#if (NGX_PCRE2)
++     rc = pcre2_pattern_info(re, PCRE2_INFO_CAPTURECOUNT, &n);
++#elif defined(nginx_version) && nginx_version >= 1002002
+     rc = pcre_fullinfo(re->code, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+ #elif defined(nginx_version) && nginx_version >= 1001012
+     rc = pcre_fullinfo(re->pcre, NULL, PCRE_INFO_CAPTURECOUNT, &n);
diff --git a/debian/modules/patches/http-subs-filter/series b/debian/modules/patches/http-subs-filter/series
index f9b9360..4344c0b 100644
--- a/debian/modules/patches/http-subs-filter/series
+++ b/debian/modules/patches/http-subs-filter/series
@@ -1 +1,2 @@
 dynamic-module.patch
+pcre2.patch

From 0e2eaec4b255c46654b049f593a03368083d7b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 23 Jul 2022 10:40:40 +0200
Subject: [PATCH 413/600] d/gitlab-ci.yml removed in GL switched to salsa-ci
 team recipes/debian.yml@salsa-ci-team/pipeline

---
 debian/gitlab-ci.yml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 debian/gitlab-ci.yml

diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
deleted file mode 100644
index 557434c..0000000
--- a/debian/gitlab-ci.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-
-# Disable reprotest which is failing now
-variables:
-  SALSA_CI_DISABLE_REPROTEST: 1

From 142c95ade023fd91eed22a5c1b7c2525b79b13d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 23 Jul 2022 10:46:55 +0200
Subject: [PATCH 414/600] add libnginx-mod-http-ndk-dev to nginx to build
 ngx-lua

---
 debian/changelog                         |  5 +++++
 debian/control                           | 16 +++++++++++++++
 debian/libnginx-mod-http-ndk-dev.install |  5 +++++
 debian/rules                             | 26 ++++++++++++++++++++----
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 debian/libnginx-mod-http-ndk-dev.install

diff --git a/debian/changelog b/debian/changelog
index 9fb216f..194e492 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 nginx (1.22.0-2) UNRELEASED; urgency=medium
 
+  [ Miao Wang ]
+  * adding a new libnginx-mod-http-ndk-dev package including necessary
+    headers to build a 3rd party module depending on ndk.
+
+  [ Jan Mojžíš ]
   * d/nginx-common.nginx.service: added Systemd dependency
     Wants=network-online.target and updated Systemd "After" dependency to
     recommended NGINX values, namely:
diff --git a/debian/control b/debian/control
index 21eb530..4736a9f 100644
--- a/debian/control
+++ b/debian/control
@@ -398,6 +398,22 @@ Description: Nginx Development Kit module
  features that are seen from a user's point of view - it's just designed to help
  reduce the code that Nginx module developers need to write.
 
+Package: libnginx-mod-http-ndk-dev
+Architecture: all
+Depends: libnginx-mod-http-ndk (<< ${source:Version}.1~), libnginx-mod-http-ndk (>= ${source:Version}),
+         nginx-dev (>= ${source:Version}), nginx-dev (<< ${source:Version}.1~), ${misc:Depends}
+Description: Nginx Development Kit module - development files
+ The NDK is an Nginx module that is designed to extend the core functionality of
+ the excellent Nginx webserver in a way that can be used as a basis of other
+ Nginx modules.
+ .
+ This package provides development headers and necessary config scripts
+ for the Nginx development kit module, useful to develop and link third party
+ additions to the Debian nginx web/proxy server packages using Nginx
+ development kit module.
+ .
+ Development files.
+
 Package: libnginx-mod-nchan
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
diff --git a/debian/libnginx-mod-http-ndk-dev.install b/debian/libnginx-mod-http-ndk-dev.install
new file mode 100644
index 0000000..980066f
--- /dev/null
+++ b/debian/libnginx-mod-http-ndk-dev.install
@@ -0,0 +1,5 @@
+debian/build-ndksrc/auto usr/share/nginx-ndk/src/
+debian/build-ndksrc/src usr/share/nginx-ndk/src/
+debian/build-ndksrc/objs usr/share/nginx-ndk/src/
+debian/build-ndksrc/config usr/share/nginx-ndk/src/
+debian/build-ndksrc/ngx_auto_lib_core usr/share/nginx-ndk/src/
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index d4ddc7e..4471089 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ DYN_MODS := \
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
-$(foreach flavour,$(FLAVOURS) src,$(eval BUILDDIR_$(flavour) = $(CURDIR)/debian/build-$(flavour)))
+$(foreach flavour,$(FLAVOURS) src ndksrc,$(eval BUILDDIR_$(flavour) = $(CURDIR)/debian/build-$(flavour)))
 
 DEB_BUILD_ARCH ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifeq ($(DEB_BUILD_ARCH),sparc)
@@ -135,10 +135,10 @@ extras_configure_flags := \
 %:
 	dh $@ --without autoreconf
 
-override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour)) config.src
-override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour)) build.src
+override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour)) config.src config.ndksrc
+override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour)) build.src build.ndksrc
 override_dh_strip:          $(foreach flavour,$(FLAVOURS),strip.arch.$(flavour)) $(foreach mod,$(DYN_MODS),strip.mods.$(mod))
-override_dh_clean:          clean_patch_modules $(foreach flavour,$(FLAVOURS),clean.$(flavour)) clean.src
+override_dh_clean:          clean_patch_modules $(foreach flavour,$(FLAVOURS),clean.$(flavour)) clean.src clean.ndksrc
 	dh_clean
 
 override_dh_install:
@@ -165,6 +165,16 @@ build.src:
 	echo "NGX_CONF_FLAGS=(" $(basic_configure_flags) ")" > $(BUILDDIR_src)/conf_flags
 	pod2man debian/debhelper/dh_nginx > $(BUILDDIR_src)/dh_nginx.1
 
+build.ndksrc:
+	cp -Pa $(CURDIR)/debian/modules/http-ndk/auto \
+	       $(CURDIR)/debian/modules/http-ndk/config \
+		   $(CURDIR)/debian/modules/http-ndk/ngx_auto_lib_core $(BUILDDIR_ndksrc)/
+	for i in src objs; do \
+	  find $(CURDIR)/debian/modules/http-ndk/$$i -type f -name '*.h' -printf "$$i/%P\0" | \
+	    tar -C $(CURDIR)/debian/modules/http-ndk --null --files-from - -c | tar -C $(BUILDDIR_ndksrc)/ -x; \
+	done
+	chmod +x $(CURDIR)/debian/build-ndksrc/auto/build
+
 strip.arch.%:
 	dh_strip --package=nginx-$(*) -O--dbgsym-migration='nginx-$(*)-dbg (<< 1.10.1-3~)'
 
@@ -192,11 +202,19 @@ config.arch.%:
 	cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/man $(BUILDDIR_$*)/
 	cd $(BUILDDIR_$*) && ./configure $($*_configure_flags)
+	if [ "$(BUILDDIR_$*)" = "$(BUILDDIR_extras)" ]; then \
+	  have="NDK_SET_VAR"; \
+	  /bin/echo -e "#ifndef $$have\n#define $$have  1\n#endif" >> $(BUILDDIR_$*)/objs/ngx_auto_config.h; \
+	fi
 
 config.src:
 	dh_testdir
 	mkdir -p $(BUILDDIR_src)
 
+config.ndksrc:
+	dh_testdir
+	mkdir -p $(BUILDDIR_ndksrc)
+
 clean.%:
 	rm -rf $(BUILDDIR_$*)
 

From 43b9a879c9a5b7573336e339a0b43113e45a56ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 23 Jul 2022 10:48:06 +0200
Subject: [PATCH 415/600] Remove constraints unnecessary since buster *
 Build-Depends: Drop versioned constraint on dpkg-dev. * nginx-common: Drop
 versioned constraint on lsb-base in Depends. * nginx-core: Drop versioned
 constraint on nginx in Breaks. * nginx-full: Drop versioned constraint on
 nginx in Breaks. * nginx-light: Drop versioned constraint on nginx in Breaks.
 * nginx-extras: Drop versioned constraint on nginx in Breaks. *
 libnginx-mod-http-perl: Drop versioned constraint on nginx-extras in
 Replaces. * Remove 5 maintscript entries from 1 files.

---
 debian/changelog                | 12 ++++++++++++
 debian/control                  | 10 ++--------
 debian/nginx-common.maintscript |  8 --------
 3 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 100644 debian/nginx-common.maintscript

diff --git a/debian/changelog b/debian/changelog
index 194e492..c0cbcdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,18 @@ nginx (1.22.0-2) UNRELEASED; urgency=medium
   * d/t/reboot: added, tests if nginx works after reboot
   * d/m/p/http-subs-filter/pcre2.patch: added PCRE2 support
 
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since buster:
+    + Build-Depends: Drop versioned constraint on dpkg-dev.
+    + nginx-common: Drop versioned constraint on lsb-base in Depends.
+    + nginx-core: Drop versioned constraint on nginx in Breaks.
+    + nginx-full: Drop versioned constraint on nginx in Breaks.
+    + nginx-light: Drop versioned constraint on nginx in Breaks.
+    + nginx-extras: Drop versioned constraint on nginx in Breaks.
+    + libnginx-mod-http-perl: Drop versioned constraint on nginx-extras in
+      Replaces.
+    + Remove 5 maintscript entries from 1 files.
+
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 10 Jul 2022 07:58:44 +0200
 
 nginx (1.22.0-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 4736a9f..c8aa03c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Christos Trochalakis <ctrochalakis@debian.org>,
            Thomas Ward <teward@ubuntu.com>,
            Jan Mojžíš <jan.mojzis@gmail.com>,
 Build-Depends: debhelper-compat (= 13),
-               dpkg-dev (>= 1.15.5),
                libexpat-dev,
                libgd-dev,
                libgeoip-dev,
@@ -58,7 +57,7 @@ Description: small, powerful, scalable web/proxy server - documentation
 Package: nginx-common
 Architecture: all
 Multi-Arch: foreign
-Depends: lsb-base (>= 3.0-6), ${misc:Depends}
+Depends: lsb-base, ${misc:Depends}
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -105,8 +104,7 @@ Depends: libnginx-mod-http-geoip (= ${binary:Version}),
          iproute2,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: nginx (<< 1.4.5-1),
-        nginx-full (<< 1.18.0-1),
+Breaks: nginx-full (<< 1.18.0-1),
 Replaces: nginx-full (<< 1.18.0-1),
 Provides: httpd, httpd-cgi, nginx
 Conflicts: nginx-extras, nginx-light
@@ -146,7 +144,6 @@ Depends: libnginx-mod-http-auth-pam,
          nginx-core (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: nginx (<< 1.4.5-1)
 Provides: httpd, httpd-cgi, nginx
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (standard version with 3rd parties)
@@ -181,7 +178,6 @@ Depends: libnginx-mod-http-echo (= ${binary:Version}),
          iproute2,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: nginx (<< 1.4.5-1)
 Provides: httpd, httpd-cgi, nginx
 Conflicts: nginx-extras, nginx-core
 Suggests: nginx-doc (= ${source:Version})
@@ -228,7 +224,6 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          iproute2,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: nginx (<< 1.4.5-1)
 Provides: httpd, httpd-cgi, nginx
 Conflicts: nginx-core, nginx-light
 Suggests: nginx-doc (= ${source:Version})
@@ -351,7 +346,6 @@ Package: libnginx-mod-http-perl
 Architecture: any
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
 Recommends: nginx,
-Replaces: nginx-extras (<< 1.9.14-1)
 Description: Perl module for Nginx
  Embed Perl runtime into nginx.
  .
diff --git a/debian/nginx-common.maintscript b/debian/nginx-common.maintscript
deleted file mode 100644
index e1e7f53..0000000
--- a/debian/nginx-common.maintscript
+++ /dev/null
@@ -1,8 +0,0 @@
-# Handle naxsi removal
-rm_conffile /etc/nginx/naxsi.rules         1.6.2-2~
-rm_conffile /etc/nginx/naxsi_core.rules    1.6.2-2~
-rm_conffile /etc/nginx/naxsi-ui.conf.1.4.1 1.6.2-2~
-rm_conffile /etc/nginx/naxsi-ui.conf       1.6.2-2~
-
-# Handle upstart removal
-rm_conffile /etc/init/nginx.conf           1.13.5-1~

From 861f1be8692fccce5996e26ee7f210c927ea6ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 23 Jul 2022 10:49:48 +0200
Subject: [PATCH 416/600] d/p/nginx-fix-pidfile.patch backport from Ubuntu

---
 debian/changelog                       |  2 +
 debian/patches/nginx-fix-pidfile.patch | 89 ++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 92 insertions(+)
 create mode 100644 debian/patches/nginx-fix-pidfile.patch

diff --git a/debian/changelog b/debian/changelog
index c0cbcdb..7d70e35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ nginx (1.22.0-2) UNRELEASED; urgency=medium
     to upstream (Closes: 859082)
   * d/t/reboot: added, tests if nginx works after reboot
   * d/m/p/http-subs-filter/pcre2.patch: added PCRE2 support
+  * d/p/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid
+    SystemD race condition, this fix is backported from Ubuntu (Closes: 876365)
 
   [ Debian Janitor ]
   * Remove constraints unnecessary since buster:
diff --git a/debian/patches/nginx-fix-pidfile.patch b/debian/patches/nginx-fix-pidfile.patch
new file mode 100644
index 0000000..47a16ff
--- /dev/null
+++ b/debian/patches/nginx-fix-pidfile.patch
@@ -0,0 +1,89 @@
+Description: Fix NGINX pidfile handling
+Author: Tj <ubuntu@iam.tj>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876365
+Last-Update: 2020-06-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/src/core/nginx.c b/src/core/nginx.c
+index 9fcb0eb2..083eba1d 100644
+--- a/src/core/nginx.c
++++ b/src/core/nginx.c
+@@ -338,14 +338,21 @@ main(int argc, char *const *argv)
+         ngx_process = NGX_PROCESS_MASTER;
+     }
+ 
++    /* tell-tale to detect if this is parent or child process */
++    ngx_int_t child_pid = NGX_BUSY;
++
+ #if !(NGX_WIN32)
+ 
+     if (ngx_init_signals(cycle->log) != NGX_OK) {
+         return 1;
+     }
+ 
++    /* tell-tale that this code has been executed */
++    child_pid--;
++
+     if (!ngx_inherited && ccf->daemon) {
+-        if (ngx_daemon(cycle->log) != NGX_OK) {
++        child_pid = ngx_daemon(cycle->log);
++        if (child_pid == NGX_ERROR) {
+             return 1;
+         }
+ 
+@@ -358,8 +365,19 @@ main(int argc, char *const *argv)
+ 
+ #endif
+ 
+-    if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
+-        return 1;
++    /* If ngx_daemon() returned the child's PID in the parent process
++     * after the fork() set ngx_pid to the child_pid, which gets
++     * written to the PID file, then exit.
++     * For NGX_WIN32 always write the PID file
++     * For others, only write it from the parent process */
++    if (child_pid < NGX_OK || child_pid > NGX_OK) {
++	ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid;
++        if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
++            return 1;
++	}
++    }
++    if (child_pid > NGX_OK) {
++        exit(0);
+     }
+ 
+     if (ngx_log_redirect_stderr(cycle) != NGX_OK) {
+diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
+index 385c49b6..3719854c 100644
+--- a/src/os/unix/ngx_daemon.c
++++ b/src/os/unix/ngx_daemon.c
+@@ -7,14 +7,17 @@
+ 
+ #include <ngx_config.h>
+ #include <ngx_core.h>
++#include <unistd.h>
+ 
+ 
+ ngx_int_t
+ ngx_daemon(ngx_log_t *log)
+ {
+     int  fd;
++    /* retain the return value for passing back to caller */
++    pid_t pid_child = fork();
+ 
+-    switch (fork()) {
++    switch (pid_child) {
+     case -1:
+         ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed");
+         return NGX_ERROR;
+@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log)
+         break;
+ 
+     default:
+-        exit(0);
++        /* let caller do the exit() */
++        return pid_child;
+     }
+ 
+     ngx_parent = ngx_pid;
diff --git a/debian/patches/series b/debian/patches/series
index 04030f9..5e15dcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
+nginx-fix-pidfile.patch

From c9a408aa6f2309b43efaa2b04c5cf788aa546fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 23 Jul 2022 10:50:45 +0200
Subject: [PATCH 417/600] d/apport/source_nginx.py: Add apport hooks for
 additional bug information gathering, the script is backported from Ubuntu

---
 debian/apport/source_nginx.py | 19 +++++++++++++++++++
 debian/changelog              |  3 +++
 debian/nginx-common.install   |  1 +
 3 files changed, 23 insertions(+)
 create mode 100644 debian/apport/source_nginx.py

diff --git a/debian/apport/source_nginx.py b/debian/apport/source_nginx.py
new file mode 100644
index 0000000..aec6e8e
--- /dev/null
+++ b/debian/apport/source_nginx.py
@@ -0,0 +1,19 @@
+'''
+apport package hook for nginx packages
+
+Copyright (c) 2015, Thomas Ward <teward@ubuntu.com>
+'''
+
+import apport.hookutils
+import os
+import subprocess
+
+def add_info(report, ui):
+    if (report['Package'].split()[0] != 'nginx-common'
+        and report['ProblemType'] == 'Package'
+        and os.path.isdir('/run/systemd/system')):
+        report['Journalctl_Nginx.txt'] = apport.hookutils.command_output(
+            ['journalctl', '-xe', '--unit=nginx.service'])
+        report['SystemctlStatusFull_Nginx.txt'] = subprocess.Popen(
+            ['systemctl', '-l', 'status', 'nginx.service'],
+            stdout=subprocess.PIPE).communicate()[0]
diff --git a/debian/changelog b/debian/changelog
index 7d70e35..0124d12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ nginx (1.22.0-2) UNRELEASED; urgency=medium
   * d/m/p/http-subs-filter/pcre2.patch: added PCRE2 support
   * d/p/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid
     SystemD race condition, this fix is backported from Ubuntu (Closes: 876365)
+  * d/apport/source_nginx.py: Add apport hooks for additional bug
+    information gathering, the script is backported from Ubuntu (Closes: 963668)
+  * d/nginx-common.install: Add install rule for apport hooks.
 
   [ Debian Janitor ]
   * Remove constraints unnecessary since buster:
diff --git a/debian/nginx-common.install b/debian/nginx-common.install
index 90f173b..20109fa 100644
--- a/debian/nginx-common.install
+++ b/debian/nginx-common.install
@@ -1,5 +1,6 @@
 contrib/vim/* usr/share/vim/addons
 debian/conf/* etc/nginx
+debian/apport/source_nginx.py usr/share/apport/package-hooks
 debian/ufw/nginx etc/ufw/applications.d
 debian/vim/nginx.yaml usr/share/vim/registry
 html/index.html usr/share/nginx/html/

From 13a5fc3501349113ac90636d8f47d007ffafd033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 23 Jul 2022 10:40:40 +0200
Subject: [PATCH 418/600] d/gitlab-ci.yml removed in GL switched to salsa-ci
 team recipes/debian.yml@salsa-ci-team/pipeline

---
 debian/gitlab-ci.yml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 debian/gitlab-ci.yml

diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
deleted file mode 100644
index 557434c..0000000
--- a/debian/gitlab-ci.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-
-# Disable reprotest which is failing now
-variables:
-  SALSA_CI_DISABLE_REPROTEST: 1

From 08de4d4bc7e6ba11051ab1f6ef5460989b161513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 7 Aug 2022 16:15:09 +0200
Subject: [PATCH 419/600] Release to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0124d12..6bb8afa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.22.0-2) UNRELEASED; urgency=medium
+nginx (1.22.0-2) unstable; urgency=medium
 
   [ Miao Wang ]
   * adding a new libnginx-mod-http-ndk-dev package including necessary
@@ -33,7 +33,7 @@ nginx (1.22.0-2) UNRELEASED; urgency=medium
       Replaces.
     + Remove 5 maintscript entries from 1 files.
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 10 Jul 2022 07:58:44 +0200
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 07 Aug 2022 16:14:59 +0200
 
 nginx (1.22.0-1) unstable; urgency=medium
 

From a316cb99e4dcc4ba7306b4741f474500784c270f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 8 Aug 2022 12:30:21 +0200
Subject: [PATCH 420/600] d/changelog: fix typo in bug number 61261 -> 861261

---
 debian/changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6bb8afa..9ac858c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.22.0-3) UNRELEASED; urgency=medium
+
+  * d/changelog: fixed typo in bug number 61261 -> 861261 (Closes: 861261) 
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 08 Aug 2022 12:29:34 +0200
+
 nginx (1.22.0-2) unstable; urgency=medium
 
   [ Miao Wang ]
@@ -8,7 +14,7 @@ nginx (1.22.0-2) unstable; urgency=medium
   * d/nginx-common.nginx.service: added Systemd dependency
     Wants=network-online.target and updated Systemd "After" dependency to
     recommended NGINX values, namely:
-    - network-online.target (Closes: 61261) (Closes: 1000406)
+    - network-online.target (Closes: 861261) (Closes: 1000406)
     - remote-fs.target (Closes: 898896)
     - nss-lookup.target
   * d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch: forwarded

From caf389149afa0b5923116bc4425978a179829c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 8 Aug 2022 12:32:23 +0200
Subject: [PATCH 421/600] d/p/nginx-ssl_cert_cb_yield.patch add

---
 debian/changelog                             |  1 +
 debian/patches/nginx-ssl_cert_cb_yield.patch | 40 ++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 42 insertions(+)
 create mode 100644 debian/patches/nginx-ssl_cert_cb_yield.patch

diff --git a/debian/changelog b/debian/changelog
index 9ac858c..a41d64e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nginx (1.22.0-3) UNRELEASED; urgency=medium
 
   * d/changelog: fixed typo in bug number 61261 -> 861261 (Closes: 861261) 
+  * d/p/nginx-ssl_cert_cb_yield.patch added (Closes: 884434)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 08 Aug 2022 12:29:34 +0200
 
diff --git a/debian/patches/nginx-ssl_cert_cb_yield.patch b/debian/patches/nginx-ssl_cert_cb_yield.patch
new file mode 100644
index 0000000..96e06e1
--- /dev/null
+++ b/debian/patches/nginx-ssl_cert_cb_yield.patch
@@ -0,0 +1,40 @@
+Description: SSL: handled SSL_CTX_set_cert_cb() callback yielding.
+Author: Yichun Zhang <agentzh@openresty.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884434
+Origin: https://raw.githubusercontent.com/openresty/openresty/v1.11.2.2/patches/nginx-1.11.2-ssl_cert_cb_yield.patch
+Last-Update: 2016-01-02
+
+OpenSSL 1.0.2+ introduces SSL_CTX_set_cert_cb() to allow custom
+callbacks to serve the SSL certificiates and private keys dynamically
+and lazily. The callbacks may yield for nonblocking I/O or sleeping.
+Here we added support for such usage in NGINX 3rd-party modules
+(like ngx_lua) in NGINX's event handlers for downstream SSL
+connections.
+
+diff -r 78b4e10b4367 -r 449f0461859c src/event/ngx_event_openssl.c
+--- a/src/event/ngx_event_openssl.c	Thu Dec 17 16:39:15 2015 +0300
++++ b/src/event/ngx_event_openssl.c	Sat Jan 02 11:14:44 2016 -0800
+@@ -1210,6 +1210,23 @@
+         return NGX_AGAIN;
+     }
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++    if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
++        c->read->handler = ngx_ssl_handshake_handler;
++        c->write->handler = ngx_ssl_handshake_handler;
++
++        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
++            return NGX_ERROR;
++        }
++
++        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
++            return NGX_ERROR;
++        }
++
++        return NGX_AGAIN;
++    }
++#endif
++
+     err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
+ 
+     c->ssl->no_wait_shutdown = 1;
diff --git a/debian/patches/series b/debian/patches/series
index 5e15dcc..52e1dc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 nginx-fix-pidfile.patch
+nginx-ssl_cert_cb_yield.patch

From 212327ed576d26fc3b35feb30a43079d10fc5cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 8 Aug 2022 12:34:00 +0200
Subject: [PATCH 422/600] http-lua: remove

---
 debian/changelog                              |    1 +
 debian/control                                |   18 +-
 debian/copyright                              |    9 -
 debian/libnginx-mod-http-lua.nginx            |   13 -
 debian/modules/http-lua/README.markdown       | 8332 -----------------
 debian/modules/http-lua/config                |  532 --
 .../modules/http-lua/doc/HttpLuaModule.wiki   | 7073 --------------
 .../http-lua/dtrace/ngx_lua_provider.d        |   61 -
 .../http-lua/misc/recv-until-pm/Makefile      |    3 -
 .../misc/recv-until-pm/lib/RecvUntil.pm       |  138 -
 .../http-lua/misc/recv-until-pm/t/sanity.t    |  140 -
 .../http-lua/src/api/ngx_http_lua_api.h       |   62 -
 debian/modules/http-lua/src/ddebug.h          |   85 -
 .../http-lua/src/ngx_http_lua_accessby.c      |  398 -
 .../http-lua/src/ngx_http_lua_accessby.h      |   22 -
 .../modules/http-lua/src/ngx_http_lua_api.c   |  216 -
 .../modules/http-lua/src/ngx_http_lua_args.c  |  555 --
 .../modules/http-lua/src/ngx_http_lua_args.h  |   20 -
 .../http-lua/src/ngx_http_lua_balancer.c      |  763 --
 .../http-lua/src/ngx_http_lua_balancer.h      |   27 -
 .../http-lua/src/ngx_http_lua_bodyfilterby.c  |  633 --
 .../http-lua/src/ngx_http_lua_bodyfilterby.h  |   31 -
 .../modules/http-lua/src/ngx_http_lua_cache.c |  296 -
 .../modules/http-lua/src/ngx_http_lua_cache.h |   24 -
 .../http-lua/src/ngx_http_lua_capturefilter.c |  176 -
 .../http-lua/src/ngx_http_lua_capturefilter.h |   20 -
 .../http-lua/src/ngx_http_lua_clfactory.c     |  887 --
 .../http-lua/src/ngx_http_lua_clfactory.h     |   22 -
 .../http-lua/src/ngx_http_lua_common.h        |  593 --
 .../http-lua/src/ngx_http_lua_config.c        |   70 -
 .../http-lua/src/ngx_http_lua_config.h        |   19 -
 .../http-lua/src/ngx_http_lua_consts.c        |  202 -
 .../http-lua/src/ngx_http_lua_consts.h        |   20 -
 .../http-lua/src/ngx_http_lua_contentby.c     |  387 -
 .../http-lua/src/ngx_http_lua_contentby.h     |   26 -
 .../http-lua/src/ngx_http_lua_control.c       |  555 --
 .../http-lua/src/ngx_http_lua_control.h       |   20 -
 .../http-lua/src/ngx_http_lua_coroutine.c     |  387 -
 .../http-lua/src/ngx_http_lua_coroutine.h     |   23 -
 .../modules/http-lua/src/ngx_http_lua_ctx.c   |  216 -
 .../modules/http-lua/src/ngx_http_lua_ctx.h   |   23 -
 .../http-lua/src/ngx_http_lua_directive.c     | 1831 ----
 .../http-lua/src/ngx_http_lua_directive.h     |   78 -
 .../http-lua/src/ngx_http_lua_exception.c     |   58 -
 .../http-lua/src/ngx_http_lua_exception.h     |   33 -
 .../src/ngx_http_lua_headerfilterby.c         |  302 -
 .../src/ngx_http_lua_headerfilterby.h         |   29 -
 .../http-lua/src/ngx_http_lua_headers.c       | 1529 ---
 .../http-lua/src/ngx_http_lua_headers.h       |   25 -
 .../http-lua/src/ngx_http_lua_headers_in.c    |  835 --
 .../http-lua/src/ngx_http_lua_headers_in.h    |   22 -
 .../http-lua/src/ngx_http_lua_headers_out.c   |  637 --
 .../http-lua/src/ngx_http_lua_headers_out.h   |   23 -
 .../http-lua/src/ngx_http_lua_initby.c        |   42 -
 .../http-lua/src/ngx_http_lua_initby.h        |   23 -
 .../http-lua/src/ngx_http_lua_initworkerby.c  |  357 -
 .../http-lua/src/ngx_http_lua_initworkerby.h  |   25 -
 .../modules/http-lua/src/ngx_http_lua_lex.c   | 8251 ----------------
 .../modules/http-lua/src/ngx_http_lua_lex.h   |   17 -
 .../modules/http-lua/src/ngx_http_lua_log.c   |  456 -
 .../modules/http-lua/src/ngx_http_lua_log.h   |   24 -
 .../http-lua/src/ngx_http_lua_log_ringbuf.c   |  225 -
 .../http-lua/src/ngx_http_lua_log_ringbuf.h   |   31 -
 .../modules/http-lua/src/ngx_http_lua_logby.c |  266 -
 .../modules/http-lua/src/ngx_http_lua_logby.h |   22 -
 .../modules/http-lua/src/ngx_http_lua_misc.c  |  292 -
 .../modules/http-lua/src/ngx_http_lua_misc.h  |   22 -
 .../http-lua/src/ngx_http_lua_module.c        | 1312 ---
 .../modules/http-lua/src/ngx_http_lua_ndk.c   |  191 -
 .../modules/http-lua/src/ngx_http_lua_ndk.h   |   21 -
 .../http-lua/src/ngx_http_lua_output.c        |  808 --
 .../http-lua/src/ngx_http_lua_output.h        |   28 -
 .../http-lua/src/ngx_http_lua_pcrefix.c       |  106 -
 .../http-lua/src/ngx_http_lua_pcrefix.h       |   23 -
 .../modules/http-lua/src/ngx_http_lua_phase.c |  128 -
 .../modules/http-lua/src/ngx_http_lua_phase.h |   13 -
 .../modules/http-lua/src/ngx_http_lua_probe.h |   86 -
 .../modules/http-lua/src/ngx_http_lua_regex.c | 2548 -----
 .../modules/http-lua/src/ngx_http_lua_regex.h |   24 -
 .../http-lua/src/ngx_http_lua_req_body.c      | 1188 ---
 .../http-lua/src/ngx_http_lua_req_body.h      |   20 -
 .../http-lua/src/ngx_http_lua_req_method.c    |  253 -
 .../http-lua/src/ngx_http_lua_req_method.h    |   19 -
 .../http-lua/src/ngx_http_lua_rewriteby.c     |  380 -
 .../http-lua/src/ngx_http_lua_rewriteby.h     |   22 -
 .../http-lua/src/ngx_http_lua_script.c        |  538 --
 .../http-lua/src/ngx_http_lua_script.h        |   86 -
 .../http-lua/src/ngx_http_lua_semaphore.c     |  578 --
 .../http-lua/src/ngx_http_lua_semaphore.h     |   53 -
 .../modules/http-lua/src/ngx_http_lua_setby.c |  216 -
 .../modules/http-lua/src/ngx_http_lua_setby.h |   15 -
 .../http-lua/src/ngx_http_lua_shdict.c        | 3027 ------
 .../http-lua/src/ngx_http_lua_shdict.h        |   67 -
 .../modules/http-lua/src/ngx_http_lua_sleep.c |  219 -
 .../modules/http-lua/src/ngx_http_lua_sleep.h |   20 -
 .../http-lua/src/ngx_http_lua_socket_tcp.c    | 5521 -----------
 .../http-lua/src/ngx_http_lua_socket_tcp.h    |  156 -
 .../http-lua/src/ngx_http_lua_socket_udp.c    | 1657 ----
 .../http-lua/src/ngx_http_lua_socket_udp.h    |   65 -
 .../modules/http-lua/src/ngx_http_lua_ssl.c   |   37 -
 .../modules/http-lua/src/ngx_http_lua_ssl.h   |   47 -
 .../http-lua/src/ngx_http_lua_ssl_certby.c    | 1325 ---
 .../http-lua/src/ngx_http_lua_ssl_certby.h    |   37 -
 .../http-lua/src/ngx_http_lua_ssl_ocsp.c      |  506 -
 .../src/ngx_http_lua_ssl_session_fetchby.c    |  614 --
 .../src/ngx_http_lua_ssl_session_fetchby.h    |   38 -
 .../src/ngx_http_lua_ssl_session_storeby.c    |  618 --
 .../src/ngx_http_lua_ssl_session_storeby.h    |   34 -
 .../http-lua/src/ngx_http_lua_string.c        |  767 --
 .../http-lua/src/ngx_http_lua_string.h        |   20 -
 .../http-lua/src/ngx_http_lua_subrequest.c    | 1782 ----
 .../http-lua/src/ngx_http_lua_subrequest.h    |   46 -
 .../modules/http-lua/src/ngx_http_lua_time.c  |  349 -
 .../modules/http-lua/src/ngx_http_lua_time.h  |   21 -
 .../modules/http-lua/src/ngx_http_lua_timer.c |  909 --
 .../modules/http-lua/src/ngx_http_lua_timer.h |   20 -
 .../modules/http-lua/src/ngx_http_lua_uri.c   |  110 -
 .../modules/http-lua/src/ngx_http_lua_uri.h   |   20 -
 .../http-lua/src/ngx_http_lua_uthread.c       |  285 -
 .../http-lua/src/ngx_http_lua_uthread.h       |   36 -
 .../modules/http-lua/src/ngx_http_lua_util.c  | 4132 --------
 .../modules/http-lua/src/ngx_http_lua_util.h  |  468 -
 .../http-lua/src/ngx_http_lua_variable.c      |  509 -
 .../http-lua/src/ngx_http_lua_variable.h      |   20 -
 .../http-lua/src/ngx_http_lua_worker.c        |  193 -
 .../http-lua/src/ngx_http_lua_worker.h        |   17 -
 debian/modules/http-lua/t/000--init.t         |   85 -
 debian/modules/http-lua/t/000-sanity.t        |   33 -
 debian/modules/http-lua/t/001-set.t           |  797 --
 debian/modules/http-lua/t/002-content.t       |  844 --
 debian/modules/http-lua/t/003-errors.t        |  128 -
 debian/modules/http-lua/t/004-require.t       |  211 -
 debian/modules/http-lua/t/005-exit.t          |  725 --
 debian/modules/http-lua/t/006-escape.t        |  199 -
 debian/modules/http-lua/t/007-md5.t           |  102 -
 debian/modules/http-lua/t/008-today.t         |   38 -
 debian/modules/http-lua/t/009-log.t           |  544 --
 debian/modules/http-lua/t/010-request_body.t  |  272 -
 debian/modules/http-lua/t/011-md5_bin.t       |  170 -
 debian/modules/http-lua/t/012-now.t           |  118 -
 debian/modules/http-lua/t/013-base64.t        |  245 -
 debian/modules/http-lua/t/014-bugs.t          | 1020 --
 debian/modules/http-lua/t/015-status.t        |  293 -
 debian/modules/http-lua/t/016-resp-header.t   | 1701 ----
 debian/modules/http-lua/t/017-exec.t          |  596 --
 debian/modules/http-lua/t/018-ndk.t           |  173 -
 debian/modules/http-lua/t/019-const.t         |   46 -
 debian/modules/http-lua/t/020-subrequest.t    | 2879 ------
 debian/modules/http-lua/t/021-cookie-time.t   |   45 -
 debian/modules/http-lua/t/022-redirect.t      |  322 -
 .../http-lua/t/023-rewrite/client-abort.t     |  850 --
 debian/modules/http-lua/t/023-rewrite/exec.t  |  400 -
 debian/modules/http-lua/t/023-rewrite/exit.t  |  597 --
 debian/modules/http-lua/t/023-rewrite/mixed.t |  169 -
 .../http-lua/t/023-rewrite/multi-capture.t    |  394 -
 .../modules/http-lua/t/023-rewrite/on-abort.t |  656 --
 .../modules/http-lua/t/023-rewrite/redirect.t |  164 -
 .../modules/http-lua/t/023-rewrite/req-body.t |  223 -
 .../http-lua/t/023-rewrite/req-socket.t       |  534 --
 .../http-lua/t/023-rewrite/request_body.t     |  172 -
 .../modules/http-lua/t/023-rewrite/sanity.t   |  801 --
 debian/modules/http-lua/t/023-rewrite/sleep.t |  221 -
 .../http-lua/t/023-rewrite/socket-keepalive.t | 1009 --
 .../http-lua/t/023-rewrite/subrequest.t       |  641 --
 .../t/023-rewrite/tcp-socket-timeout.t        |  606 --
 .../http-lua/t/023-rewrite/tcp-socket.t       | 2392 -----
 .../http-lua/t/023-rewrite/unix-socket.t      |  152 -
 .../http-lua/t/023-rewrite/uthread-exec.t     |  345 -
 .../http-lua/t/023-rewrite/uthread-exit.t     | 1331 ---
 .../http-lua/t/023-rewrite/uthread-redirect.t |  188 -
 .../http-lua/t/023-rewrite/uthread-spawn.t    | 1451 ---
 debian/modules/http-lua/t/024-access/auth.t   |  109 -
 .../http-lua/t/024-access/client-abort.t      |  852 --
 debian/modules/http-lua/t/024-access/exec.t   |  393 -
 debian/modules/http-lua/t/024-access/exit.t   |  547 --
 debian/modules/http-lua/t/024-access/mixed.t  |  261 -
 .../http-lua/t/024-access/multi-capture.t     |  394 -
 .../modules/http-lua/t/024-access/on-abort.t  |  651 --
 .../modules/http-lua/t/024-access/redirect.t  |  124 -
 .../modules/http-lua/t/024-access/req-body.t  |  220 -
 .../http-lua/t/024-access/request_body.t      |  172 -
 debian/modules/http-lua/t/024-access/sanity.t |  743 --
 .../modules/http-lua/t/024-access/satisfy.t   |  211 -
 debian/modules/http-lua/t/024-access/sleep.t  |  221 -
 .../http-lua/t/024-access/subrequest.t        |  601 --
 .../http-lua/t/024-access/uthread-exec.t      |  346 -
 .../http-lua/t/024-access/uthread-exit.t      | 1313 ---
 .../http-lua/t/024-access/uthread-redirect.t  |  189 -
 .../http-lua/t/024-access/uthread-spawn.t     | 1118 ---
 debian/modules/http-lua/t/025-codecache.t     | 1246 ---
 debian/modules/http-lua/t/026-mysql.t         |  130 -
 debian/modules/http-lua/t/027-multi-capture.t |  754 --
 debian/modules/http-lua/t/028-req-header.t    | 2010 ----
 debian/modules/http-lua/t/029-http-time.t     |   87 -
 debian/modules/http-lua/t/030-uri-args.t      | 1549 ---
 debian/modules/http-lua/t/031-post-args.t     |  406 -
 debian/modules/http-lua/t/032-iolist.t        |   78 -
 debian/modules/http-lua/t/033-ctx.t           |  442 -
 debian/modules/http-lua/t/034-match.t         | 1192 ---
 debian/modules/http-lua/t/035-gmatch.t        |  904 --
 debian/modules/http-lua/t/036-sub.t           |  757 --
 debian/modules/http-lua/t/037-gsub.t          |  699 --
 debian/modules/http-lua/t/038-match-o.t       |  742 --
 debian/modules/http-lua/t/039-sub-o.t         |  580 --
 debian/modules/http-lua/t/040-gsub-o.t        |  200 -
 debian/modules/http-lua/t/041-header-filter.t |  796 --
 debian/modules/http-lua/t/042-crc32.t         |   56 -
 debian/modules/http-lua/t/043-shdict.t        | 2473 -----
 debian/modules/http-lua/t/044-req-body.t      | 1746 ----
 debian/modules/http-lua/t/045-ngx-var.t       |  230 -
 debian/modules/http-lua/t/046-hmac.t          |   31 -
 debian/modules/http-lua/t/047-match-jit.t     |  214 -
 debian/modules/http-lua/t/048-match-dfa.t     |  209 -
 debian/modules/http-lua/t/049-gmatch-jit.t    |  228 -
 debian/modules/http-lua/t/050-gmatch-dfa.t    |  338 -
 debian/modules/http-lua/t/051-sub-jit.t       |  149 -
 debian/modules/http-lua/t/052-sub-dfa.t       |  235 -
 debian/modules/http-lua/t/053-gsub-jit.t      |  149 -
 debian/modules/http-lua/t/054-gsub-dfa.t      |  236 -
 debian/modules/http-lua/t/055-subreq-vars.t   |  338 -
 debian/modules/http-lua/t/056-flush.t         |  522 --
 debian/modules/http-lua/t/057-flush-timeout.t |  320 -
 debian/modules/http-lua/t/058-tcp-socket.t    | 3810 --------
 debian/modules/http-lua/t/059-unix-socket.t   |  203 -
 debian/modules/http-lua/t/060-lua-memcached.t |  168 -
 debian/modules/http-lua/t/061-lua-redis.t     |  184 -
 debian/modules/http-lua/t/062-count.t         |  570 --
 debian/modules/http-lua/t/063-abort.t         | 1019 --
 debian/modules/http-lua/t/064-pcall.t         |  106 -
 .../http-lua/t/065-tcp-socket-timeout.t       | 1018 --
 .../http-lua/t/066-socket-receiveuntil.t      | 1331 ---
 debian/modules/http-lua/t/067-req-socket.t    | 1098 ---
 .../modules/http-lua/t/068-socket-keepalive.t | 1553 ---
 debian/modules/http-lua/t/069-null.t          |   95 -
 debian/modules/http-lua/t/070-sha1.t          |   70 -
 debian/modules/http-lua/t/071-idle-socket.t   |  433 -
 .../modules/http-lua/t/072-conditional-get.t  |   90 -
 debian/modules/http-lua/t/073-backtrace.t     |  189 -
 debian/modules/http-lua/t/074-prefix-var.t    |   66 -
 debian/modules/http-lua/t/075-logby.t         |  583 --
 debian/modules/http-lua/t/076-no-postpone.t   |  146 -
 debian/modules/http-lua/t/077-sleep.t         |  502 -
 debian/modules/http-lua/t/078-hup-vars.t      |   64 -
 .../http-lua/t/079-unused-directives.t        |  342 -
 debian/modules/http-lua/t/080-hup-shdict.t    |   84 -
 debian/modules/http-lua/t/081-bytecode.t      |  373 -
 debian/modules/http-lua/t/082-body-filter.t   |  839 --
 debian/modules/http-lua/t/083-bad-sock-self.t |  138 -
 .../http-lua/t/084-inclusive-receiveuntil.t   |  745 --
 debian/modules/http-lua/t/085-if.t            |  200 -
 debian/modules/http-lua/t/086-init-by.t       |  323 -
 debian/modules/http-lua/t/087-udp-socket.t    | 1176 ---
 debian/modules/http-lua/t/088-req-method.t    |  264 -
 debian/modules/http-lua/t/089-phase.t         |  178 -
 .../http-lua/t/090-log-socket-errors.t        |  108 -
 debian/modules/http-lua/t/091-coroutine.t     | 1317 ---
 debian/modules/http-lua/t/092-eof.t           |   82 -
 debian/modules/http-lua/t/093-uthread-spawn.t | 1674 ----
 debian/modules/http-lua/t/094-uthread-exit.t  | 1650 ----
 debian/modules/http-lua/t/095-uthread-exec.t  |  425 -
 .../modules/http-lua/t/096-uthread-redirect.t |  279 -
 .../modules/http-lua/t/097-uthread-rewrite.t  |  347 -
 debian/modules/http-lua/t/098-uthread-wait.t  | 1323 ---
 debian/modules/http-lua/t/099-c-api.t         |  397 -
 debian/modules/http-lua/t/100-client-abort.t  | 1066 ---
 debian/modules/http-lua/t/101-on-abort.t      |  848 --
 .../modules/http-lua/t/102-req-start-time.t   |  115 -
 debian/modules/http-lua/t/103-req-http-ver.t  |   48 -
 .../modules/http-lua/t/104-req-raw-header.t   |  990 --
 debian/modules/http-lua/t/105-pressure.t      |   53 -
 debian/modules/http-lua/t/106-timer.t         | 2195 -----
 debian/modules/http-lua/t/107-timer-errors.t  | 1422 ---
 debian/modules/http-lua/t/108-timer-safe.t    | 1397 ---
 debian/modules/http-lua/t/109-timer-hup.t     |  502 -
 debian/modules/http-lua/t/110-etag.t          |   83 -
 debian/modules/http-lua/t/111-req-header-ua.t |  675 --
 .../modules/http-lua/t/112-req-header-conn.t  |  148 -
 .../http-lua/t/113-req-header-cookie.t        |  249 -
 debian/modules/http-lua/t/114-config.t        |   48 -
 debian/modules/http-lua/t/115-quote-sql-str.t |   76 -
 .../modules/http-lua/t/116-raw-req-socket.t   |  878 --
 .../http-lua/t/117-raw-req-socket-timeout.t   |  116 -
 .../modules/http-lua/t/118-use-default-type.t |  140 -
 debian/modules/http-lua/t/119-config-prefix.t |   32 -
 debian/modules/http-lua/t/120-re-find.t       |  919 --
 debian/modules/http-lua/t/121-version.t       |   48 -
 debian/modules/http-lua/t/122-worker.t        |   81 -
 debian/modules/http-lua/t/123-lua-path.t      |   70 -
 debian/modules/http-lua/t/124-init-worker.t   |  955 --
 .../modules/http-lua/t/125-configure-args.t   |   31 -
 debian/modules/http-lua/t/126-shdict-frag.t   | 1266 ---
 debian/modules/http-lua/t/127-uthread-kill.t  |  507 -
 .../http-lua/t/128-duplex-tcp-socket.t        |  631 --
 debian/modules/http-lua/t/129-ssl-socket.t    | 2532 -----
 debian/modules/http-lua/t/130-internal-api.t  |   49 -
 .../http-lua/t/131-duplex-req-socket.t        |  141 -
 debian/modules/http-lua/t/132-lua-blocks.t    |  729 --
 debian/modules/http-lua/t/133-worker-count.t  |   72 -
 .../modules/http-lua/t/134-worker-count-5.t   |   78 -
 debian/modules/http-lua/t/135-worker-id.t     |   33 -
 debian/modules/http-lua/t/136-timer-counts.t  |  111 -
 debian/modules/http-lua/t/137-req-misc.t      |   61 -
 debian/modules/http-lua/t/138-balancer.t      |  528 --
 debian/modules/http-lua/t/139-ssl-cert-by.t   | 2077 ----
 debian/modules/http-lua/t/140-ssl-c-api.t     |  813 --
 debian/modules/http-lua/t/141-luajit.t        |   48 -
 .../http-lua/t/142-ssl-session-store.t        |  903 --
 .../http-lua/t/143-ssl-session-fetch.t        | 1116 ---
 .../modules/http-lua/t/144-shdict-incr-init.t |  226 -
 debian/modules/http-lua/t/145-shdict-list.t   |  745 --
 debian/modules/http-lua/t/146-malloc-trim.t   |  342 -
 .../http-lua/t/147-tcp-socket-timeouts.t      |  627 --
 debian/modules/http-lua/t/148-fake-shm-zone.t |  170 -
 .../http-lua/t/149-hup-fake-shm-zone.t        |   91 -
 .../http-lua/t/150-fake-delayed-load.t        |   56 -
 debian/modules/http-lua/t/151-initby-hup.t    |  168 -
 debian/modules/http-lua/t/152-timer-every.t   |  385 -
 debian/modules/http-lua/t/153-semaphore-hup.t |  154 -
 debian/modules/http-lua/t/154-semaphore.t     |  120 -
 debian/modules/http-lua/t/155-tls13.t         |  106 -
 debian/modules/http-lua/t/StapThread.pm       |  282 -
 debian/modules/http-lua/t/cert/dst-ca.crt     |   63 -
 debian/modules/http-lua/t/cert/equifax.crt    |   19 -
 debian/modules/http-lua/t/cert/test.crl       |   11 -
 debian/modules/http-lua/t/cert/test.crt       |   17 -
 debian/modules/http-lua/t/cert/test.key       |   15 -
 debian/modules/http-lua/t/cert/test2.crt      |   16 -
 debian/modules/http-lua/t/cert/test2.key      |   15 -
 debian/modules/http-lua/t/cert/test_ecdsa.crt |   12 -
 debian/modules/http-lua/t/cert/test_ecdsa.key |    5 -
 .../t/data/fake-delayed-load-module/config    |    3 -
 .../ngx_http_lua_fake_delayed_load_module.c   |   77 -
 .../http-lua/t/data/fake-module/config        |    3 -
 .../t/data/fake-module/ngx_http_fake_module.c |  118 -
 .../http-lua/t/data/fake-shm-module/config    |    3 -
 .../ngx_http_lua_fake_shm_module.c            |  294 -
 debian/modules/http-lua/t/lib/CRC32.lua       |  173 -
 debian/modules/http-lua/t/lib/Memcached.lua   |  567 --
 debian/modules/http-lua/t/lib/Redis.lua       | 1120 ---
 debian/modules/http-lua/t/lib/ljson.lua       |   89 -
 debian/modules/http-lua/tapset/ngx_lua.stp    |    5 -
 debian/modules/http-lua/util/build.sh         |   66 -
 debian/modules/http-lua/util/fix-comments     |   27 -
 debian/modules/http-lua/util/gen-lexer-c      |   18 -
 debian/modules/http-lua/util/ngx-links        |   62 -
 debian/modules/http-lua/util/releng           |    8 -
 debian/modules/http-lua/util/retab            |    8 -
 debian/modules/http-lua/util/revim            |  102 -
 debian/modules/http-lua/util/run_test.sh      |   10 -
 debian/modules/http-lua/util/update-readme.sh |    4 -
 debian/modules/http-lua/valgrind.suppress     |  209 -
 .../patches/http-lua/CVE-2020-11724.patch     |  856 --
 .../http-lua/bug-994178-segfault.patch        |   31 -
 .../http-lua/discover-luajit-2.1.patch        |   47 -
 debian/modules/patches/http-lua/series        |    3 -
 debian/rules                                  |    2 -
 debian/tests/control                          |   12 +-
 debian/tests/lua                              |   18 -
 358 files changed, 6 insertions(+), 182310 deletions(-)
 delete mode 100755 debian/libnginx-mod-http-lua.nginx
 delete mode 100644 debian/modules/http-lua/README.markdown
 delete mode 100644 debian/modules/http-lua/config
 delete mode 100644 debian/modules/http-lua/doc/HttpLuaModule.wiki
 delete mode 100644 debian/modules/http-lua/dtrace/ngx_lua_provider.d
 delete mode 100644 debian/modules/http-lua/misc/recv-until-pm/Makefile
 delete mode 100755 debian/modules/http-lua/misc/recv-until-pm/lib/RecvUntil.pm
 delete mode 100644 debian/modules/http-lua/misc/recv-until-pm/t/sanity.t
 delete mode 100644 debian/modules/http-lua/src/api/ngx_http_lua_api.h
 delete mode 100644 debian/modules/http-lua/src/ddebug.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_accessby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_accessby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_api.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_args.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_args.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_balancer.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_balancer.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_cache.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_cache.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_capturefilter.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_capturefilter.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_clfactory.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_clfactory.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_common.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_config.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_config.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_consts.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_consts.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_contentby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_contentby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_control.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_control.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_coroutine.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_coroutine.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ctx.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ctx.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_directive.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_directive.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_exception.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_exception.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_headerfilterby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_headers.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_headers.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_headers_in.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_headers_in.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_headers_out.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_headers_out.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_initby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_initby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_initworkerby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_lex.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_lex.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_log.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_log.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_logby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_logby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_misc.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_misc.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_module.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ndk.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ndk.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_output.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_output.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_pcrefix.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_pcrefix.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_phase.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_phase.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_probe.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_regex.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_regex.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_req_body.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_req_body.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_req_method.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_req_method.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_rewriteby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_script.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_script.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_semaphore.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_semaphore.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_setby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_setby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_shdict.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_shdict.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_sleep.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_sleep.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_socket_udp.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ssl.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ssl.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ssl_certby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_string.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_string.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_subrequest.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_subrequest.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_time.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_time.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_timer.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_timer.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_uri.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_uri.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_uthread.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_uthread.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_util.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_util.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_variable.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_variable.h
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_worker.c
 delete mode 100644 debian/modules/http-lua/src/ngx_http_lua_worker.h
 delete mode 100644 debian/modules/http-lua/t/000--init.t
 delete mode 100644 debian/modules/http-lua/t/000-sanity.t
 delete mode 100644 debian/modules/http-lua/t/001-set.t
 delete mode 100644 debian/modules/http-lua/t/002-content.t
 delete mode 100644 debian/modules/http-lua/t/003-errors.t
 delete mode 100644 debian/modules/http-lua/t/004-require.t
 delete mode 100644 debian/modules/http-lua/t/005-exit.t
 delete mode 100644 debian/modules/http-lua/t/006-escape.t
 delete mode 100644 debian/modules/http-lua/t/007-md5.t
 delete mode 100644 debian/modules/http-lua/t/008-today.t
 delete mode 100644 debian/modules/http-lua/t/009-log.t
 delete mode 100644 debian/modules/http-lua/t/010-request_body.t
 delete mode 100644 debian/modules/http-lua/t/011-md5_bin.t
 delete mode 100644 debian/modules/http-lua/t/012-now.t
 delete mode 100644 debian/modules/http-lua/t/013-base64.t
 delete mode 100644 debian/modules/http-lua/t/014-bugs.t
 delete mode 100644 debian/modules/http-lua/t/015-status.t
 delete mode 100644 debian/modules/http-lua/t/016-resp-header.t
 delete mode 100644 debian/modules/http-lua/t/017-exec.t
 delete mode 100644 debian/modules/http-lua/t/018-ndk.t
 delete mode 100644 debian/modules/http-lua/t/019-const.t
 delete mode 100644 debian/modules/http-lua/t/020-subrequest.t
 delete mode 100644 debian/modules/http-lua/t/021-cookie-time.t
 delete mode 100644 debian/modules/http-lua/t/022-redirect.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/client-abort.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/exec.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/exit.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/mixed.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/multi-capture.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/on-abort.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/redirect.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/req-body.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/req-socket.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/request_body.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/sanity.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/sleep.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/subrequest.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/tcp-socket.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/unix-socket.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/uthread-exec.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/uthread-exit.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
 delete mode 100644 debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
 delete mode 100644 debian/modules/http-lua/t/024-access/auth.t
 delete mode 100644 debian/modules/http-lua/t/024-access/client-abort.t
 delete mode 100644 debian/modules/http-lua/t/024-access/exec.t
 delete mode 100644 debian/modules/http-lua/t/024-access/exit.t
 delete mode 100644 debian/modules/http-lua/t/024-access/mixed.t
 delete mode 100644 debian/modules/http-lua/t/024-access/multi-capture.t
 delete mode 100644 debian/modules/http-lua/t/024-access/on-abort.t
 delete mode 100644 debian/modules/http-lua/t/024-access/redirect.t
 delete mode 100644 debian/modules/http-lua/t/024-access/req-body.t
 delete mode 100644 debian/modules/http-lua/t/024-access/request_body.t
 delete mode 100644 debian/modules/http-lua/t/024-access/sanity.t
 delete mode 100644 debian/modules/http-lua/t/024-access/satisfy.t
 delete mode 100644 debian/modules/http-lua/t/024-access/sleep.t
 delete mode 100644 debian/modules/http-lua/t/024-access/subrequest.t
 delete mode 100644 debian/modules/http-lua/t/024-access/uthread-exec.t
 delete mode 100644 debian/modules/http-lua/t/024-access/uthread-exit.t
 delete mode 100644 debian/modules/http-lua/t/024-access/uthread-redirect.t
 delete mode 100644 debian/modules/http-lua/t/024-access/uthread-spawn.t
 delete mode 100644 debian/modules/http-lua/t/025-codecache.t
 delete mode 100644 debian/modules/http-lua/t/026-mysql.t
 delete mode 100644 debian/modules/http-lua/t/027-multi-capture.t
 delete mode 100644 debian/modules/http-lua/t/028-req-header.t
 delete mode 100644 debian/modules/http-lua/t/029-http-time.t
 delete mode 100644 debian/modules/http-lua/t/030-uri-args.t
 delete mode 100644 debian/modules/http-lua/t/031-post-args.t
 delete mode 100644 debian/modules/http-lua/t/032-iolist.t
 delete mode 100644 debian/modules/http-lua/t/033-ctx.t
 delete mode 100644 debian/modules/http-lua/t/034-match.t
 delete mode 100644 debian/modules/http-lua/t/035-gmatch.t
 delete mode 100644 debian/modules/http-lua/t/036-sub.t
 delete mode 100644 debian/modules/http-lua/t/037-gsub.t
 delete mode 100644 debian/modules/http-lua/t/038-match-o.t
 delete mode 100644 debian/modules/http-lua/t/039-sub-o.t
 delete mode 100644 debian/modules/http-lua/t/040-gsub-o.t
 delete mode 100644 debian/modules/http-lua/t/041-header-filter.t
 delete mode 100644 debian/modules/http-lua/t/042-crc32.t
 delete mode 100644 debian/modules/http-lua/t/043-shdict.t
 delete mode 100644 debian/modules/http-lua/t/044-req-body.t
 delete mode 100644 debian/modules/http-lua/t/045-ngx-var.t
 delete mode 100644 debian/modules/http-lua/t/046-hmac.t
 delete mode 100644 debian/modules/http-lua/t/047-match-jit.t
 delete mode 100644 debian/modules/http-lua/t/048-match-dfa.t
 delete mode 100644 debian/modules/http-lua/t/049-gmatch-jit.t
 delete mode 100644 debian/modules/http-lua/t/050-gmatch-dfa.t
 delete mode 100644 debian/modules/http-lua/t/051-sub-jit.t
 delete mode 100644 debian/modules/http-lua/t/052-sub-dfa.t
 delete mode 100644 debian/modules/http-lua/t/053-gsub-jit.t
 delete mode 100644 debian/modules/http-lua/t/054-gsub-dfa.t
 delete mode 100644 debian/modules/http-lua/t/055-subreq-vars.t
 delete mode 100644 debian/modules/http-lua/t/056-flush.t
 delete mode 100644 debian/modules/http-lua/t/057-flush-timeout.t
 delete mode 100644 debian/modules/http-lua/t/058-tcp-socket.t
 delete mode 100644 debian/modules/http-lua/t/059-unix-socket.t
 delete mode 100644 debian/modules/http-lua/t/060-lua-memcached.t
 delete mode 100644 debian/modules/http-lua/t/061-lua-redis.t
 delete mode 100644 debian/modules/http-lua/t/062-count.t
 delete mode 100644 debian/modules/http-lua/t/063-abort.t
 delete mode 100644 debian/modules/http-lua/t/064-pcall.t
 delete mode 100644 debian/modules/http-lua/t/065-tcp-socket-timeout.t
 delete mode 100644 debian/modules/http-lua/t/066-socket-receiveuntil.t
 delete mode 100644 debian/modules/http-lua/t/067-req-socket.t
 delete mode 100644 debian/modules/http-lua/t/068-socket-keepalive.t
 delete mode 100644 debian/modules/http-lua/t/069-null.t
 delete mode 100644 debian/modules/http-lua/t/070-sha1.t
 delete mode 100644 debian/modules/http-lua/t/071-idle-socket.t
 delete mode 100644 debian/modules/http-lua/t/072-conditional-get.t
 delete mode 100644 debian/modules/http-lua/t/073-backtrace.t
 delete mode 100644 debian/modules/http-lua/t/074-prefix-var.t
 delete mode 100644 debian/modules/http-lua/t/075-logby.t
 delete mode 100644 debian/modules/http-lua/t/076-no-postpone.t
 delete mode 100644 debian/modules/http-lua/t/077-sleep.t
 delete mode 100644 debian/modules/http-lua/t/078-hup-vars.t
 delete mode 100644 debian/modules/http-lua/t/079-unused-directives.t
 delete mode 100644 debian/modules/http-lua/t/080-hup-shdict.t
 delete mode 100644 debian/modules/http-lua/t/081-bytecode.t
 delete mode 100644 debian/modules/http-lua/t/082-body-filter.t
 delete mode 100644 debian/modules/http-lua/t/083-bad-sock-self.t
 delete mode 100644 debian/modules/http-lua/t/084-inclusive-receiveuntil.t
 delete mode 100644 debian/modules/http-lua/t/085-if.t
 delete mode 100644 debian/modules/http-lua/t/086-init-by.t
 delete mode 100644 debian/modules/http-lua/t/087-udp-socket.t
 delete mode 100644 debian/modules/http-lua/t/088-req-method.t
 delete mode 100644 debian/modules/http-lua/t/089-phase.t
 delete mode 100644 debian/modules/http-lua/t/090-log-socket-errors.t
 delete mode 100644 debian/modules/http-lua/t/091-coroutine.t
 delete mode 100644 debian/modules/http-lua/t/092-eof.t
 delete mode 100644 debian/modules/http-lua/t/093-uthread-spawn.t
 delete mode 100644 debian/modules/http-lua/t/094-uthread-exit.t
 delete mode 100644 debian/modules/http-lua/t/095-uthread-exec.t
 delete mode 100644 debian/modules/http-lua/t/096-uthread-redirect.t
 delete mode 100644 debian/modules/http-lua/t/097-uthread-rewrite.t
 delete mode 100644 debian/modules/http-lua/t/098-uthread-wait.t
 delete mode 100644 debian/modules/http-lua/t/099-c-api.t
 delete mode 100644 debian/modules/http-lua/t/100-client-abort.t
 delete mode 100644 debian/modules/http-lua/t/101-on-abort.t
 delete mode 100644 debian/modules/http-lua/t/102-req-start-time.t
 delete mode 100644 debian/modules/http-lua/t/103-req-http-ver.t
 delete mode 100644 debian/modules/http-lua/t/104-req-raw-header.t
 delete mode 100644 debian/modules/http-lua/t/105-pressure.t
 delete mode 100644 debian/modules/http-lua/t/106-timer.t
 delete mode 100644 debian/modules/http-lua/t/107-timer-errors.t
 delete mode 100644 debian/modules/http-lua/t/108-timer-safe.t
 delete mode 100644 debian/modules/http-lua/t/109-timer-hup.t
 delete mode 100644 debian/modules/http-lua/t/110-etag.t
 delete mode 100644 debian/modules/http-lua/t/111-req-header-ua.t
 delete mode 100644 debian/modules/http-lua/t/112-req-header-conn.t
 delete mode 100644 debian/modules/http-lua/t/113-req-header-cookie.t
 delete mode 100644 debian/modules/http-lua/t/114-config.t
 delete mode 100644 debian/modules/http-lua/t/115-quote-sql-str.t
 delete mode 100644 debian/modules/http-lua/t/116-raw-req-socket.t
 delete mode 100644 debian/modules/http-lua/t/117-raw-req-socket-timeout.t
 delete mode 100644 debian/modules/http-lua/t/118-use-default-type.t
 delete mode 100644 debian/modules/http-lua/t/119-config-prefix.t
 delete mode 100644 debian/modules/http-lua/t/120-re-find.t
 delete mode 100644 debian/modules/http-lua/t/121-version.t
 delete mode 100644 debian/modules/http-lua/t/122-worker.t
 delete mode 100644 debian/modules/http-lua/t/123-lua-path.t
 delete mode 100644 debian/modules/http-lua/t/124-init-worker.t
 delete mode 100644 debian/modules/http-lua/t/125-configure-args.t
 delete mode 100644 debian/modules/http-lua/t/126-shdict-frag.t
 delete mode 100644 debian/modules/http-lua/t/127-uthread-kill.t
 delete mode 100644 debian/modules/http-lua/t/128-duplex-tcp-socket.t
 delete mode 100644 debian/modules/http-lua/t/129-ssl-socket.t
 delete mode 100644 debian/modules/http-lua/t/130-internal-api.t
 delete mode 100644 debian/modules/http-lua/t/131-duplex-req-socket.t
 delete mode 100644 debian/modules/http-lua/t/132-lua-blocks.t
 delete mode 100644 debian/modules/http-lua/t/133-worker-count.t
 delete mode 100644 debian/modules/http-lua/t/134-worker-count-5.t
 delete mode 100644 debian/modules/http-lua/t/135-worker-id.t
 delete mode 100644 debian/modules/http-lua/t/136-timer-counts.t
 delete mode 100644 debian/modules/http-lua/t/137-req-misc.t
 delete mode 100644 debian/modules/http-lua/t/138-balancer.t
 delete mode 100644 debian/modules/http-lua/t/139-ssl-cert-by.t
 delete mode 100644 debian/modules/http-lua/t/140-ssl-c-api.t
 delete mode 100644 debian/modules/http-lua/t/141-luajit.t
 delete mode 100644 debian/modules/http-lua/t/142-ssl-session-store.t
 delete mode 100644 debian/modules/http-lua/t/143-ssl-session-fetch.t
 delete mode 100644 debian/modules/http-lua/t/144-shdict-incr-init.t
 delete mode 100644 debian/modules/http-lua/t/145-shdict-list.t
 delete mode 100644 debian/modules/http-lua/t/146-malloc-trim.t
 delete mode 100644 debian/modules/http-lua/t/147-tcp-socket-timeouts.t
 delete mode 100644 debian/modules/http-lua/t/148-fake-shm-zone.t
 delete mode 100644 debian/modules/http-lua/t/149-hup-fake-shm-zone.t
 delete mode 100644 debian/modules/http-lua/t/150-fake-delayed-load.t
 delete mode 100644 debian/modules/http-lua/t/151-initby-hup.t
 delete mode 100644 debian/modules/http-lua/t/152-timer-every.t
 delete mode 100644 debian/modules/http-lua/t/153-semaphore-hup.t
 delete mode 100644 debian/modules/http-lua/t/154-semaphore.t
 delete mode 100644 debian/modules/http-lua/t/155-tls13.t
 delete mode 100644 debian/modules/http-lua/t/StapThread.pm
 delete mode 100644 debian/modules/http-lua/t/cert/dst-ca.crt
 delete mode 100644 debian/modules/http-lua/t/cert/equifax.crt
 delete mode 100644 debian/modules/http-lua/t/cert/test.crl
 delete mode 100644 debian/modules/http-lua/t/cert/test.crt
 delete mode 100644 debian/modules/http-lua/t/cert/test.key
 delete mode 100644 debian/modules/http-lua/t/cert/test2.crt
 delete mode 100644 debian/modules/http-lua/t/cert/test2.key
 delete mode 100644 debian/modules/http-lua/t/cert/test_ecdsa.crt
 delete mode 100644 debian/modules/http-lua/t/cert/test_ecdsa.key
 delete mode 100644 debian/modules/http-lua/t/data/fake-delayed-load-module/config
 delete mode 100644 debian/modules/http-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c
 delete mode 100644 debian/modules/http-lua/t/data/fake-module/config
 delete mode 100644 debian/modules/http-lua/t/data/fake-module/ngx_http_fake_module.c
 delete mode 100644 debian/modules/http-lua/t/data/fake-shm-module/config
 delete mode 100644 debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
 delete mode 100755 debian/modules/http-lua/t/lib/CRC32.lua
 delete mode 100755 debian/modules/http-lua/t/lib/Memcached.lua
 delete mode 100644 debian/modules/http-lua/t/lib/Redis.lua
 delete mode 100644 debian/modules/http-lua/t/lib/ljson.lua
 delete mode 100644 debian/modules/http-lua/tapset/ngx_lua.stp
 delete mode 100755 debian/modules/http-lua/util/build.sh
 delete mode 100644 debian/modules/http-lua/util/fix-comments
 delete mode 100755 debian/modules/http-lua/util/gen-lexer-c
 delete mode 100755 debian/modules/http-lua/util/ngx-links
 delete mode 100755 debian/modules/http-lua/util/releng
 delete mode 100755 debian/modules/http-lua/util/retab
 delete mode 100755 debian/modules/http-lua/util/revim
 delete mode 100755 debian/modules/http-lua/util/run_test.sh
 delete mode 100755 debian/modules/http-lua/util/update-readme.sh
 delete mode 100644 debian/modules/http-lua/valgrind.suppress
 delete mode 100644 debian/modules/patches/http-lua/CVE-2020-11724.patch
 delete mode 100644 debian/modules/patches/http-lua/bug-994178-segfault.patch
 delete mode 100644 debian/modules/patches/http-lua/discover-luajit-2.1.patch
 delete mode 100644 debian/modules/patches/http-lua/series
 delete mode 100644 debian/tests/lua

diff --git a/debian/changelog b/debian/changelog
index a41d64e..fff7b8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nginx (1.22.0-3) UNRELEASED; urgency=medium
 
   * d/changelog: fixed typo in bug number 61261 -> 861261 (Closes: 861261) 
   * d/p/nginx-ssl_cert_cb_yield.patch added (Closes: 884434)
+  * http-lua: removed the http-lua module and moved it to a separate package
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 08 Aug 2022 12:29:34 +0200
 
diff --git a/debian/control b/debian/control
index c8aa03c..206523f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,6 @@ Build-Depends: debhelper-compat (= 13),
                libgd-dev,
                libgeoip-dev,
                libhiredis-dev,
-               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64 !armel !armhf !powerpc !powerpcspe !mips !mipsel !mips64el !arm64 !ppc64 !s390x],
-               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf powerpc powerpcspe mips mipsel mips64el arm64 ppc64 s390x],
                libmaxminddb-dev,
                libmhash-dev,
                libpam0g-dev,
@@ -209,7 +207,7 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-geoip2 (= ${binary:Version}),
          libnginx-mod-http-headers-more-filter (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
-         libnginx-mod-http-lua (= ${binary:Version}),
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
          libnginx-mod-http-perl (= ${binary:Version}),
          libnginx-mod-http-subs-filter (= ${binary:Version}),
          libnginx-mod-http-uploadprogress (= ${binary:Version}),
@@ -364,20 +362,6 @@ Description: PAM authentication module for Nginx
  The module uses PAM as a backend for simple http authentication. It
  also allows setting the pam service name to allow more fine grained control.
 
-Package: libnginx-mod-http-lua
-Architecture: any
-Depends: libnginx-mod-http-ndk (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Recommends: nginx,
-Description: Lua module for Nginx
- Embed Lua runtime into nginx.
- .
- This module embeds Lua, via the standard Lua 5.1 interpreter or LuaJIT
- 2.0/2.1, into Nginx and by leveraging Nginx's subrequests, allows the
- integration of the powerful Lua threads (Lua coroutines) into the Nginx event
- model.
-
 Package: libnginx-mod-http-ndk
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
diff --git a/debian/copyright b/debian/copyright
index 6449e69..2aabc8d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -84,15 +84,6 @@ Files: debian/modules/http-echo/*
 Copyright: 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>
 License: BSD-2-clause
 
-Files: debian/modules/http-lua/*
-Copyright: 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
-           2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
-License: BSD-2-clause
-
-Files: debian/modules/http-lua/t/lib/CRC32.lua
-Copyright: 2007-2008, Neil Richardson (nrich@iinet.net.au)
-License: Expat
-
 Files: debian/modules/http-upstream-fair/*
 Copyright: 2007, Grzegorz Nosek
                  Igor Sysoev
diff --git a/debian/libnginx-mod-http-lua.nginx b/debian/libnginx-mod-http-lua.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-lua.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/modules/http-lua/README.markdown b/debian/modules/http-lua/README.markdown
deleted file mode 100644
index 15ad00e..0000000
--- a/debian/modules/http-lua/README.markdown
+++ /dev/null
@@ -1,8332 +0,0 @@
-<!---
-Don't edit this file manually! Instead you should generate it by using:
-    wiki2markdown.pl doc/HttpLuaModule.wiki
--->
-
-Name
-====
-
-ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
-
-*This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
-
-Table of Contents
-=================
-
-* [Name](#name)
-* [Status](#status)
-* [Version](#version)
-* [Synopsis](#synopsis)
-* [Description](#description)
-* [Typical Uses](#typical-uses)
-* [Nginx Compatibility](#nginx-compatibility)
-* [Installation](#installation)
-    * [Building as a dynamic module](#building-as-a-dynamic-module)
-    * [C Macro Configurations](#c-macro-configurations)
-    * [Installation on Ubuntu 11.10](#installation-on-ubuntu-1110)
-* [Community](#community)
-    * [English Mailing List](#english-mailing-list)
-    * [Chinese Mailing List](#chinese-mailing-list)
-* [Code Repository](#code-repository)
-* [Bugs and Patches](#bugs-and-patches)
-* [Lua/LuaJIT bytecode support](#lualuajit-bytecode-support)
-* [System Environment Variable Support](#system-environment-variable-support)
-* [HTTP 1.0 support](#http-10-support)
-* [Statically Linking Pure Lua Modules](#statically-linking-pure-lua-modules)
-* [Data Sharing within an Nginx Worker](#data-sharing-within-an-nginx-worker)
-* [Known Issues](#known-issues)
-    * [TCP socket connect operation issues](#tcp-socket-connect-operation-issues)
-    * [Lua Coroutine Yielding/Resuming](#lua-coroutine-yieldingresuming)
-    * [Lua Variable Scope](#lua-variable-scope)
-    * [Locations Configured by Subrequest Directives of Other Modules](#locations-configured-by-subrequest-directives-of-other-modules)
-    * [Cosockets Not Available Everywhere](#cosockets-not-available-everywhere)
-    * [Special Escaping Sequences](#special-escaping-sequences)
-    * [Mixing with SSI Not Supported](#mixing-with-ssi-not-supported)
-    * [SPDY Mode Not Fully Supported](#spdy-mode-not-fully-supported)
-    * [Missing data on short circuited requests](#missing-data-on-short-circuited-requests)
-* [TODO](#todo)
-* [Changes](#changes)
-* [Test Suite](#test-suite)
-* [Copyright and License](#copyright-and-license)
-* [See Also](#see-also)
-* [Directives](#directives)
-* [Nginx API for Lua](#nginx-api-for-lua)
-* [Obsolete Sections](#obsolete-sections)
-    * [Special PCRE Sequences](#special-pcre-sequences)
-
-Status
-======
-
-Production ready.
-
-Version
-=======
-
-This document describes ngx_lua [v0.10.13](https://github.com/openresty/lua-nginx-module/tags) released on 22 April 2018.
-
-Synopsis
-========
-```nginx
-
- # set search paths for pure Lua external libraries (';;' is the default path):
- lua_package_path '/foo/bar/?.lua;/blah/?.lua;;';
-
- # set search paths for Lua external libraries written in C (can also use ';;'):
- lua_package_cpath '/bar/baz/?.so;/blah/blah/?.so;;';
-
- server {
-     location /lua_content {
-         # MIME type determined by default_type:
-         default_type 'text/plain';
-
-         content_by_lua_block {
-             ngx.say('Hello,world!')
-         }
-     }
-
-     location /nginx_var {
-         # MIME type determined by default_type:
-         default_type 'text/plain';
-
-         # try access /nginx_var?a=hello,world
-         content_by_lua_block {
-             ngx.say(ngx.var.arg_a)
-         }
-     }
-
-     location = /request_body {
-         client_max_body_size 50k;
-         client_body_buffer_size 50k;
-
-         content_by_lua_block {
-             ngx.req.read_body()  -- explicitly read the req body
-             local data = ngx.req.get_body_data()
-             if data then
-                 ngx.say("body data:")
-                 ngx.print(data)
-                 return
-             end
-
-             -- body may get buffered in a temp file:
-             local file = ngx.req.get_body_file()
-             if file then
-                 ngx.say("body is in file ", file)
-             else
-                 ngx.say("no body found")
-             end
-         }
-     }
-
-     # transparent non-blocking I/O in Lua via subrequests
-     # (well, a better way is to use cosockets)
-     location = /lua {
-         # MIME type determined by default_type:
-         default_type 'text/plain';
-
-         content_by_lua_block {
-             local res = ngx.location.capture("/some_other_location")
-             if res then
-                 ngx.say("status: ", res.status)
-                 ngx.say("body:")
-                 ngx.print(res.body)
-             end
-         }
-     }
-
-     location = /foo {
-         rewrite_by_lua_block {
-             res = ngx.location.capture("/memc",
-                 { args = { cmd = "incr", key = ngx.var.uri } }
-             )
-         }
-
-         proxy_pass http://blah.blah.com;
-     }
-
-     location = /mixed {
-         rewrite_by_lua_file /path/to/rewrite.lua;
-         access_by_lua_file /path/to/access.lua;
-         content_by_lua_file /path/to/content.lua;
-     }
-
-     # use nginx var in code path
-     # CAUTION: contents in nginx var must be carefully filtered,
-     # otherwise there'll be great security risk!
-     location ~ ^/app/([-_a-zA-Z0-9/]+) {
-         set $path $1;
-         content_by_lua_file /path/to/lua/app/root/$path.lua;
-     }
-
-     location / {
-        client_max_body_size 100k;
-        client_body_buffer_size 100k;
-
-        access_by_lua_block {
-            -- 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
-
-            -- check if the URI contains bad words
-            if ngx.var.uri and
-                   string.match(ngx.var.request_body, "evil")
-            then
-                return ngx.redirect("/terms_of_use.html")
-            end
-
-            -- tests passed
-        }
-
-        # proxy_pass/fastcgi_pass/etc settings
-     }
- }
-```
-
-[Back to TOC](#table-of-contents)
-
-Description
-===========
-
-This module embeds Lua, via the standard Lua 5.1 interpreter or [LuaJIT 2.0/2.1](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](https://httpd.apache.org/docs/trunk/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](#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.
-
-At least the following Lua libraries and Nginx modules can be used with this ngx_lua module:
-
-* [lua-resty-memcached](https://github.com/openresty/lua-resty-memcached)
-* [lua-resty-mysql](https://github.com/openresty/lua-resty-mysql)
-* [lua-resty-redis](https://github.com/openresty/lua-resty-redis)
-* [lua-resty-dns](https://github.com/openresty/lua-resty-dns)
-* [lua-resty-upload](https://github.com/openresty/lua-resty-upload)
-* [lua-resty-websocket](https://github.com/openresty/lua-resty-websocket)
-* [lua-resty-lock](https://github.com/openresty/lua-resty-lock)
-* [lua-resty-logger-socket](https://github.com/cloudflare/lua-resty-logger-socket)
-* [lua-resty-lrucache](https://github.com/openresty/lua-resty-lrucache)
-* [lua-resty-string](https://github.com/openresty/lua-resty-string)
-* [ngx_memc](http://github.com/openresty/memc-nginx-module)
-* [ngx_postgres](https://github.com/FRiCKLE/ngx_postgres)
-* [ngx_redis2](http://github.com/openresty/redis2-nginx-module)
-* [ngx_redis](http://wiki.nginx.org/HttpRedisModule)
-* [ngx_proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html)
-* [ngx_fastcgi](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html)
-
-Almost all the Nginx modules can be used with this ngx_lua module by means of [ngx.location.capture](#ngxlocationcapture) or [ngx.location.capture_multi](#ngxlocationcapture_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.
-
-This module is plugged into NGINX's "http" subsystem so it can only speaks downstream communication protocols in the HTTP family (HTTP 0.9/1.0/1.1/2.0, WebSockets, and etc).
-If you want to do generic TCP communications with the downstream clients, then you should use the [ngx_stream_lua](https://github.com/openresty/stream-lua-nginx-module#readme) module instead
-which has a compatible Lua API.
-
-[Back to TOC](#table-of-contents)
-
-Typical Uses
-============
-
-Just to name a few:
-
-* Mashup'ing and processing outputs of various nginx upstream outputs (proxy, drizzle, postgres, redis, memcached, and etc) in Lua,
-* doing arbitrarily complex access control and security checks in Lua before requests actually reach the upstream backends,
-* manipulating response headers in an arbitrary way (by Lua)
-* fetching backend information from external storage backends (like redis, memcached, mysql, postgresql) and use that information to choose which upstream backend to access on-the-fly,
-* coding up arbitrarily complex web applications in a content handler using synchronous but still non-blocking access to the database backends and other storage,
-* doing very complex URL dispatch in Lua at rewrite phase,
-* using Lua to implement advanced caching mechanism for Nginx's subrequests and arbitrary locations.
-
-The possibilities are unlimited as the module allows bringing together various elements within Nginx as well as exposing the power of the Lua language to the user. The module provides the full flexibility of scripting while offering performance levels comparable with native C language programs both in terms of CPU time as well as memory footprint. This is particularly the case when LuaJIT 2.x is enabled.
-
-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 minimize memory use.
-
-[Back to TOC](#table-of-contents)
-
-Nginx Compatibility
-===================
-
-The latest version of this module is compatible with the following versions of Nginx:
-
-* 1.13.x  (last tested: 1.13.6)
-* 1.12.x
-* 1.11.x  (last tested: 1.11.2)
-* 1.10.x
-* 1.9.x (last tested: 1.9.15)
-* 1.8.x
-* 1.7.x (last tested: 1.7.10)
-* 1.6.x
-
-Nginx cores older than 1.6.0 (exclusive) are *not* supported.
-
-[Back to TOC](#table-of-contents)
-
-Installation
-============
-
-It is *highly* recommended to use [OpenResty releases](http://openresty.org) which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
-
-Alternatively, ngx_lua can be manually compiled into Nginx:
-
-1. Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is *not* supported yet). LuaJIT can be downloaded from 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](https://github.com/simplresty/ngx_devel_kit/tags).
-1. Download the latest version of ngx_lua [HERE](https://github.com/openresty/lua-nginx-module/tags).
-1. Download the latest version of Nginx [HERE](http://nginx.org/) (See [Nginx Compatibility](#nginx-compatibility))
-
-Build the source with this module:
-
-```bash
-
- wget 'http://nginx.org/download/nginx-1.13.6.tar.gz'
- tar -xzvf nginx-1.13.6.tar.gz
- cd nginx-1.13.6/
-
- # tell nginx's build system where to find LuaJIT 2.0:
- 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 LuaJIT 2.1:
- export LUAJIT_LIB=/path/to/luajit/lib
- export LUAJIT_INC=/path/to/luajit/include/luajit-2.1
-
- # 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 \
-         --with-ld-opt="-Wl,-rpath,/path/to/luajit-or-lua/lib" \
-         --add-module=/path/to/ngx_devel_kit \
-         --add-module=/path/to/lua-nginx-module
-
- # Note that you may also want to add `./configure` options which are used in your
- # current nginx build.
- # You can get usually those options using command nginx -V
-
- # you can change the parallism number 2 below to fit the number of spare CPU cores in your
- # machine.
- make -j2
- make install
-```
-
-[Back to TOC](#table-of-contents)
-
-Building as a dynamic module
-----------------------------
-
-Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
-`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
-directive, for example,
-
-```nginx
-
- load_module /path/to/modules/ndk_http_module.so;  # assuming NDK is built as a dynamic module too
- load_module /path/to/modules/ngx_http_lua_module.so;
-```
-
-[Back to TOC](#table-of-contents)
-
-C Macro Configurations
-----------------------
-
-While building this module either via OpenResty or with the NGINX core, you can define the following C macros via the C compiler options:
-
-* `NGX_LUA_USE_ASSERT`
-	When defined, will enable assertions in the ngx_lua C code base. Recommended for debugging or testing builds. It can introduce some (small) runtime overhead when enabled. This macro was first introduced in the `v0.9.10` release.
-* `NGX_LUA_ABORT_AT_PANIC`
-	When the Lua/LuaJIT VM panics, ngx_lua will instruct the current nginx worker process to quit gracefully by default. By specifying this C macro, ngx_lua will abort the current nginx worker process (which usually result in a core dump file) immediately. This option is useful for debugging VM panics. This option was first introduced in the `v0.9.8` release.
-* `NGX_LUA_NO_FFI_API`
-	Excludes pure C API functions for FFI-based Lua API for NGINX (as required by [lua-resty-core](https://github.com/openresty/lua-resty-core#readme), for example). Enabling this macro can make the resulting binary code size smaller.
-
-To enable one or more of these macros, just pass extra C compiler options to the `./configure` script of either NGINX or OpenResty. For instance,
-
-
-    ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
-
-
-[Back to TOC](#table-of-contents)
-
-Installation on Ubuntu 11.10
-----------------------------
-
-Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever possible.
-
-If the standard Lua 5.1 interpreter is required however, run the following command to install it from the Ubuntu repository:
-
-```bash
-
- 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.
-
-```bash
-
- ln -s /usr/lib/x86_64-linux-gnu/liblua5.1.so /usr/lib/liblua.so
-```
-
-[Back to TOC](#table-of-contents)
-
-Community
-=========
-
-[Back to TOC](#table-of-contents)
-
-English Mailing List
---------------------
-
-The [openresty-en](https://groups.google.com/group/openresty-en) mailing list is for English speakers.
-
-[Back to TOC](#table-of-contents)
-
-Chinese Mailing List
---------------------
-
-The [openresty](https://groups.google.com/group/openresty) mailing list is for Chinese speakers.
-
-[Back to TOC](#table-of-contents)
-
-Code Repository
-===============
-
-The code repository of this project is hosted on github at [openresty/lua-nginx-module](https://github.com/openresty/lua-nginx-module).
-
-[Back to TOC](#table-of-contents)
-
-Bugs and Patches
-================
-
-Please submit bug reports, wishlists, or patches by
-
-1. creating a ticket on the [GitHub Issue Tracker](https://github.com/openresty/lua-nginx-module/issues),
-1. or posting to the [OpenResty community](#community).
-
-[Back to TOC](#table-of-contents)
-
-Lua/LuaJIT bytecode support
-===========================
-
-As from the `v0.5.0rc32` release, all `*_by_lua_file` configure directives (such as [content_by_lua_file](#content_by_lua_file)) support loading Lua 5.1 and LuaJIT 2.0/2.1 raw bytecode files directly.
-
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 with ngx_lua, LuaJIT compatible bytecode files must be generated as shown:
-
-```bash
-
- /path/to/luajit/bin/luajit -b /path/to/input_file.lua /path/to/output_file.ljbc
-```
-
-The `-bg` option can be used to include debug information in the LuaJIT bytecode file:
-
-```bash
-
- /path/to/luajit/bin/luajit -bg /path/to/input_file.lua /path/to/output_file.ljbc
-```
-
-Please refer to the official LuaJIT documentation on the `-b` option for more details:
-
-<http://luajit.org/running.html#opt_b>
-
-Also, the bytecode files generated by LuaJIT 2.1 is *not* compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
-
-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:
-
-```bash
-
- 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:
-
-```bash
-
- 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/2.1 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.
-
-[Back to TOC](#table-of-contents)
-
-System Environment Variable Support
-===================================
-
-If you want to access the system environment variable, say, `foo`, in Lua via the standard Lua API [os.getenv](http://www.lua.org/manual/5.1/manual.html#pdf-os.getenv), then you should also list this environment variable name in your `nginx.conf` file via the [env directive](http://nginx.org/en/docs/ngx_core_module.html#env). For example,
-
-```nginx
-
- env foo;
-```
-
-[Back to TOC](#table-of-contents)
-
-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](#lua_http10_buffering) directive is turned `on`, ngx_lua will buffer the
-output of [ngx.say](#ngxsay) and [ngx.print](#ngxprint) 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](#lua_http10_buffering) directive is turned `on`.
-
-For large streaming output responses, it is important to disable the [lua_http10_buffering](#lua_http10_buffering) directive to minimise memory usage.
-
-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.
-
-[Back to TOC](#table-of-contents)
-
-Statically Linking Pure Lua Modules
-===================================
-
-When LuaJIT 2.x is used, it is possible to statically link the bytecode of pure Lua modules into the Nginx executable.
-
-Basically you use the `luajit` executable to compile `.lua` Lua module files to `.o` object files containing the exported bytecode data, and then link the `.o` files directly in your Nginx build.
-
-Below is a trivial example to demonstrate this. Consider that we have the following `.lua` file named `foo.lua`:
-
-```lua
-
- -- foo.lua
- local _M = {}
-
- function _M.go()
-     print("Hello from foo")
- end
-
- return _M
-```
-
-And then we compile this `.lua` file to `foo.o` file:
-
-    /path/to/luajit/bin/luajit -bg foo.lua foo.o
-
-What matters here is the name of the `.lua` file, which determines how you use this module later on the Lua land. The file name `foo.o` does not matter at all except the `.o` file extension (which tells `luajit` what output format is used). If you want to strip the Lua debug information from the resulting bytecode, you can just specify the `-b` option above instead of `-bg`.
-
-Then when building Nginx or OpenResty, pass the `--with-ld-opt="foo.o"` option to the `./configure` script:
-
-```bash
-
- ./configure --with-ld-opt="/path/to/foo.o" ...
-```
-
-Finally, you can just do the following in any Lua code run by ngx_lua:
-
-```lua
-
- local foo = require "foo"
- foo.go()
-```
-
-And this piece of code no longer depends on the external `foo.lua` file any more because it has already been compiled into the `nginx` executable.
-
-If you want to use dot in the Lua module name when calling `require`, as in
-
-```lua
-
- local foo = require "resty.foo"
-```
-
-then you need to rename the `foo.lua` file to `resty_foo.lua` before compiling it down to a `.o` file with the `luajit` command-line utility.
-
-It is important to use exactly the same version of LuaJIT when compiling `.lua` files to `.o` files as building nginx + ngx_lua. This is because the LuaJIT bytecode format may be incompatible between different LuaJIT versions. When the bytecode format is incompatible, you will see a Lua runtime error saying that the Lua module is not found.
-
-When you have multiple `.lua` files to compile and link, then just specify their `.o` files at the same time in the value of the `--with-ld-opt` option. For instance,
-
-```bash
-
- ./configure --with-ld-opt="/path/to/foo.o /path/to/bar.o" ...
-```
-
-If you have just too many `.o` files, then it might not be feasible to name them all in a single command. In this case, you can build a static library (or archive) for your `.o` files, as in
-
-```bash
-
- ar rcus libmyluafiles.a *.o
-```
-
-then you can link the `myluafiles` archive as a whole to your nginx executable:
-
-```bash
-
- ./configure \
-     --with-ld-opt="-L/path/to/lib -Wl,--whole-archive -lmyluafiles -Wl,--no-whole-archive"
-```
-
-where `/path/to/lib` is the path of the directory containing the `libmyluafiles.a` file. It should be noted that the linker option `--whole-archive` is required here because otherwise our archive will be skipped because no symbols in our archive are mentioned in the main parts of the nginx executable.
-
-[Back to TOC](#table-of-contents)
-
-Data Sharing within an Nginx Worker
-===================================
-
-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 (both its code and data). Note however that Lua global variables (note, not module-level variables) WILL NOT persist between requests because of the one-coroutine-per-request isolation design.
-
-Here is a complete small example:
-
-```lua
-
- -- mydata.lua
- local _M = {}
-
- local data = {
-     dog = 3,
-     cat = 4,
-     pig = 5,
- }
-
- function _M.get_age(name)
-     return data[name]
- end
-
- return _M
-```
-
-and then accessing it from `nginx.conf`:
-
-```nginx
-
- location /lua {
-     content_by_lua_block {
-         local mydata = require "mydata"
-         ngx.say(mydata.get_age("dog"))
-     }
- }
-```
-
-The `mydata` module in this example will only be loaded and run on the first request to the location `/lua`,
-and all subsequent requests to the same nginx worker process will use the reloaded instance of the
-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.
-
-It is usually recommended to share read-only data this way. You can also share changeable data among all the concurrent requests of each nginx worker process as
-long as there is *no* nonblocking I/O operations (including [ngx.sleep](#ngxsleep))
-in the middle of your calculations. As long as you do not give the
-control back to the nginx event loop and ngx_lua's light thread
-scheduler (even implicitly), there can never be any race conditions in
-between. For this reason, always be very careful when you want to share changeable data on the
-worker level. Buggy optimizations can easily lead to hard-to-debug
-race conditions under load.
-
-If server-wide data sharing is required, then use one or more of the following approaches:
-
-1. Use the [ngx.shared.DICT](#ngxshareddict) 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 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.
-
-[Back to TOC](#table-of-contents)
-
-Known Issues
-============
-
-[Back to TOC](#table-of-contents)
-
-TCP socket connect operation issues
------------------------------------
-The [tcpsock:connect](#tcpsockconnect) 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.
-
-[Back to TOC](#table-of-contents)
-
-Lua Coroutine Yielding/Resuming
--------------------------------
-* Because Lua's `dofile` and `require` builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by `dofile` or `require` invokes [ngx.location.capture*](#ngxlocationcapture), [ngx.exec](#ngxexec), [ngx.exit](#ngxexit), or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
-* As the standard Lua 5.1 interpreter's VM is not fully resumable, the methods [ngx.location.capture](#ngxlocationcapture), [ngx.location.capture_multi](#ngxlocationcapture_multi), [ngx.redirect](#ngxredirect), [ngx.exec](#ngxexec), and [ngx.exit](#ngxexit) 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) or even the first line of the `for ... in ...` statement 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.x, which supports a fully resumable VM, to avoid this.
-
-[Back to TOC](#table-of-contents)
-
-Lua Variable Scope
-------------------
-Care must be taken when importing modules and this form should be used:
-
-```lua
-
- local xxx = require('xxx')
-```
-
-instead of the old deprecated form:
-
-```lua
-
- require('xxx')
-```
-
-Here is the reason: by design, the global environment has exactly the same lifetime as the Nginx request handler associated with it. Each request handler has its own set of Lua global variables and that is the idea of request isolation. The Lua module is actually loaded by the first Nginx request handler and is cached by the `require()` built-in in the `package.loaded` table for later reference, and the `module()` builtin used by some Lua modules has the side effect of setting a global variable to the loaded module table. But this global variable will be cleared at the end of the request handler,  and every subsequent request handler all has its own (clean) global environment. So one will get Lua exception for accessing the `nil` value.
-
-The use of Lua global variables is a generally inadvisable in the ngx_lua context as:
-
-1. the misuse of Lua globals has detrimental side effects on concurrent requests when such variables should instead be local in scope,
-1. Lua global variables require Lua table look-ups in the global environment which is computationally expensive, and
-1. some Lua global variable references may include typing errors which make such difficult to debug.
-
-It is therefore *highly* recommended to always declare such within an appropriate local scope instead.
-
-```lua
-
- -- Avoid
- foo = 123
- -- Recommended
- local foo = 123
-
- -- Avoid
- function foo() return 123 end
- -- Recommended
- local function foo() return 123 end
-```
-
-
-To find all instances of Lua global variables in your Lua code, run the [lua-releng tool](https://github.com/openresty/nginx-devel-utils/blob/master/lua-releng) across all `.lua` source files:
-
-    $ lua-releng
-    Checking use of Lua global variables in file lib/foo/bar.lua ...
-            1       [1489]  SETGLOBAL       7 -1    ; contains
-            55      [1506]  GETGLOBAL       7 -3    ; setvar
-            3       [1545]  GETGLOBAL       3 -4    ; varexpand
-
-The output says that the line 1489 of file `lib/foo/bar.lua` writes to a global variable named `contains`, the line 1506 reads from the global variable `setvar`, and line 1545 reads the global `varexpand`.
-
-This tool 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](#data-sharing-within-an-nginx-worker) for the reasons behind this.
-
-[Back to TOC](#table-of-contents)
-
-Locations Configured by Subrequest Directives of Other Modules
---------------------------------------------------------------
-The [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi) directives cannot capture locations that include the [add_before_body](http://nginx.org/en/docs/http/ngx_http_addition_module.html#add_before_body), [add_after_body](http://nginx.org/en/docs/http/ngx_http_addition_module.html#add_after_body), [auth_request](http://nginx.org/en/docs/http/ngx_http_auth_request_module.html#auth_request), [echo_location](http://github.com/openresty/echo-nginx-module#echo_location), [echo_location_async](http://github.com/openresty/echo-nginx-module#echo_location_async), [echo_subrequest](http://github.com/openresty/echo-nginx-module#echo_subrequest), or [echo_subrequest_async](http://github.com/openresty/echo-nginx-module#echo_subrequest_async) directives.
-
-```nginx
-
- location /foo {
-     content_by_lua_block {
-         res = ngx.location.capture("/bar")
-     }
- }
- location /bar {
-     echo_location /blah;
- }
- location /blah {
-     echo "Success!";
- }
-```
-
-```nginx
-
- $ curl -i http://example.com/foo
-```
-
-will not work as expected.
-
-[Back to TOC](#table-of-contents)
-
-Cosockets Not Available Everywhere
-----------------------------------
-
-Due to internal limitations in the nginx core, the cosocket API is disabled in the following contexts: [set_by_lua*](#set_by_lua), [log_by_lua*](#log_by_lua), [header_filter_by_lua*](#header_filter_by_lua), and [body_filter_by_lua](#body_filter_by_lua).
-
-The cosockets are currently also disabled in the [init_by_lua*](#init_by_lua) and [init_worker_by_lua*](#init_worker_by_lua) directive contexts but we may add support for these contexts in the future because there is no limitation in the nginx core (or the limitation might be worked around).
-
-There exists a work-around, however, when the original context does *not* need to wait for the cosocket results. That is, creating a zero-delay timer via the [ngx.timer.at](#ngxtimerat) API and do the cosocket results in the timer handler, which runs asynchronously as to the original context creating the timer.
-
-[Back to TOC](#table-of-contents)
-
-Special Escaping Sequences
---------------------------
-
-**NOTE** Following the `v0.9.17` release, this pitfall can be avoided by using the `*_by_lua_block {}` configuration directives.
-
-PCRE sequences such as `\d`, `\s`, or `\w`, require special attention because in string literals, the backslash character, `\`, is stripped out by both the Lua language parser and by the nginx config file parser before processing if not within a `*_by_lua_block {}` directive. So the following snippet will not work as expected:
-
-```nginx
-
- # nginx.conf
- ? location /test {
- ?     content_by_lua '
- ?         local regex = "\d+"  -- THIS IS WRONG OUTSIDE OF A *_by_lua_block DIRECTIVE
- ?         local m = ngx.re.match("hello, 1234", regex)
- ?         if m then ngx.say(m[0]) else ngx.say("not matched!") end
- ?     ';
- ? }
- # evaluates to "not matched!"
-```
-
-To avoid this, *double* escape the backslash:
-
-```nginx
-
- # nginx.conf
- location /test {
-     content_by_lua '
-         local regex = "\\\\d+"
-         local m = ngx.re.match("hello, 1234", regex)
-         if m then ngx.say(m[0]) else ngx.say("not matched!") end
-     ';
- }
- # evaluates to "1234"
-```
-
-Here, `\\\\d+` is stripped down to `\\d+` by the Nginx config file parser and this is further stripped down to `\d+` by the Lua language parser before running.
-
-Alternatively, the regex pattern can be presented as a long-bracketed Lua string literal by encasing it in "long brackets", `[[...]]`, in which case backslashes have to only be escaped once for the Nginx config file parser.
-
-```nginx
-
- # nginx.conf
- location /test {
-     content_by_lua '
-         local regex = [[\\d+]]
-         local m = ngx.re.match("hello, 1234", regex)
-         if m then ngx.say(m[0]) else ngx.say("not matched!") end
-     ';
- }
- # evaluates to "1234"
-```
-
-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.
-
-```nginx
-
- # nginx.conf
- location /test {
-     content_by_lua '
-         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
-     ';
- }
- # evaluates to "1234"
-```
-
-An alternative approach to escaping PCRE sequences is to ensure that Lua code is placed in external script files and executed using the various `*_by_lua_file` directives.
-With this approach, the backslashes are only stripped by the Lua language parser and therefore only need to be escaped once each.
-
-```lua
-
- -- test.lua
- local regex = "\\d+"
- local m = ngx.re.match("hello, 1234", regex)
- if m then ngx.say(m[0]) else ngx.say("not matched!") end
- -- evaluates to "1234"
-```
-
-Within external script files, PCRE sequences presented as long-bracketed Lua string literals do not require modification.
-
-```lua
-
- -- test.lua
- local regex = [[\d+]]
- local m = ngx.re.match("hello, 1234", regex)
- if m then ngx.say(m[0]) else ngx.say("not matched!") end
- -- evaluates to "1234"
-```
-
-As noted earlier, PCRE sequences presented within `*_by_lua_block {}` directives (available following the `v0.9.17` release) do not require modification.
-
-```nginx
-
- # nginx.conf
- location /test {
-     content_by_lua_block {
-         local regex = [[\d+]]
-         local m = ngx.re.match("hello, 1234", regex)
-         if m then ngx.say(m[0]) else ngx.say("not matched!") end
-     }
- }
- # evaluates to "1234"
-```
-
-
-[Back to TOC](#table-of-contents)
-
-Mixing with SSI Not Supported
------------------------------
-
-Mixing SSI with ngx_lua in the same Nginx request is not supported at all. Just use ngx_lua exclusively. Everything you can do with SSI can be done atop ngx_lua anyway and it can be more efficient when using ngx_lua.
-
-[Back to TOC](#table-of-contents)
-
-SPDY Mode Not Fully Supported
------------------------------
-
-Certain Lua APIs provided by ngx_lua do not work in Nginx's SPDY mode yet: [ngx.location.capture](#ngxlocationcapture), [ngx.location.capture_multi](#ngxlocationcapture_multi), and [ngx.req.socket](#ngxreqsocket).
-
-[Back to TOC](#table-of-contents)
-
-Missing data on short circuited requests
-----------------------------------------
-
-Nginx may terminate a request early with (at least):
-
-* 400 (Bad Request)
-* 405 (Not Allowed)
-* 408 (Request Timeout)
-* 413 (Request Entity Too Large)
-* 414 (Request URI Too Large)
-* 494 (Request Headers Too Large)
-* 499 (Client Closed Request)
-* 500 (Internal Server Error)
-* 501 (Not Implemented)
-
-This means that phases that normally run are skipped, such as the rewrite or
-access phase. This also means that later phases that are run regardless, e.g.
-[log_by_lua](#log_by_lua), will not have access to information that is normally set in those
-phases.
-
-[Back to TOC](#table-of-contents)
-
-TODO
-====
-
-* cosocket: implement LuaSocket's unconnected UDP API.
-* port this module to the "datagram" subsystem of NGINX for implementing general UDP servers instead of HTTP
-servers in Lua. For example,
-```lua
-
- datagram {
-     server {
-         listen 1953;
-         handler_by_lua_block {
-             -- custom Lua code implementing the special UDP server...
-         }
-     }
- }
-```
-* shm: implement a "shared queue API" to complement the existing [shared dict](#lua_shared_dict) API.
-* cosocket: add support in the context of [init_by_lua*](#init_by_lua).
-* cosocket: implement the `bind()` method for stream-typed cosockets.
-* cosocket: pool-based backend concurrency level control: implement automatic `connect` queueing when the backend concurrency exceeds its connection pool limit.
-* cosocket: review and merge aviramc's [patch](https://github.com/openresty/lua-nginx-module/pull/290) for adding the `bsdrecv` method.
-* add new API function `ngx.resp.add_header` to emulate the standard `add_header` config directive.
-* review and apply vadim-pavlov's patch for [ngx.location.capture](#ngxlocationcapture)'s `extra_headers` option
-* use `ngx_hash_t` to optimize the built-in header look-up process for [ngx.req.set_header](#ngxreqset_header), [ngx.header.HEADER](#ngxheaderheader), 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.
-* add `ignore_resp_headers`, `ignore_resp_body`, and `ignore_resp` options to [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi) methods, to allow micro performance tuning on the user side.
-* 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](https://httpd.apache.org/docs/trunk/mod/mod_lua.html).
-* cosocket: add client SSL certificate support.
-
-[Back to TOC](#table-of-contents)
-
-Changes
-=======
-
-The changes made in every release of this module are listed in the change logs of the OpenResty bundle:
-
-<http://openresty.org/#Changes>
-
-[Back to TOC](#table-of-contents)
-
-Test Suite
-==========
-
-The following dependencies are required to run the test suite:
-
-* Nginx version >= 1.4.2
-
-* Perl modules:
-	* Test::Nginx: <https://github.com/openresty/test-nginx>
-
-* Nginx modules:
-	* [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit)
-	* [ngx_set_misc](https://github.com/openresty/set-misc-nginx-module)
-	* [ngx_auth_request](http://mdounin.ru/files/ngx_http_auth_request_module-0.2.tar.gz) (this is not needed if you're using Nginx 1.5.4+.
-	* [ngx_echo](https://github.com/openresty/echo-nginx-module)
-	* [ngx_memc](https://github.com/openresty/memc-nginx-module)
-	* [ngx_srcache](https://github.com/openresty/srcache-nginx-module)
-	* ngx_lua (i.e., this module)
-	* [ngx_lua_upstream](https://github.com/openresty/lua-upstream-nginx-module)
-	* [ngx_headers_more](https://github.com/openresty/headers-more-nginx-module)
-	* [ngx_drizzle](https://github.com/openresty/drizzle-nginx-module)
-	* [ngx_rds_json](https://github.com/openresty/rds-json-nginx-module)
-	* [ngx_coolkit](https://github.com/FRiCKLE/ngx_coolkit)
-	* [ngx_redis2](https://github.com/openresty/redis2-nginx-module)
-
-The order in which these modules are added during configuration is important because the position of any filter module in the
-filtering chain determines the final output, for example. The correct adding order is shown above.
-
-* 3rd-party Lua libraries:
-	* [lua-cjson](http://www.kyne.com.au/~mark/software/lua-cjson.php)
-
-* Applications:
-	* mysql: create database 'ngx_test', grant all privileges to user 'ngx_test', password is 'ngx_test'
-	* memcached: listening on the default port, 11211.
-	* redis: listening on the default port, 6379.
-
-See also the [developer build script](https://github.com/openresty/lua-nginx-module/blob/master/util/build.sh) for more details on setting up the testing environment.
-
-To run the whole test suite in the default testing mode:
-
-    cd /path/to/lua-nginx-module
-    export PATH=/path/to/your/nginx/sbin:$PATH
-    prove -I/path/to/test-nginx/lib -r t
-
-
-To run specific test files:
-
-    cd /path/to/lua-nginx-module
-    export PATH=/path/to/your/nginx/sbin:$PATH
-    prove -I/path/to/test-nginx/lib t/002-content.t t/003-errors.t
-
-
-To run a specific test block in a particular test file, add the line `--- ONLY` to the test block you want to run, and then use the `prove` utility to run that `.t` file.
-
-There are also various testing modes based on mockeagain, valgrind, and etc. Refer to the [Test::Nginx documentation](http://search.cpan.org/perldoc?Test::Nginx) for more details for various advanced testing modes. See also the test reports for the Nginx test cluster running on Amazon EC2: <http://qa.openresty.org>.
-
-[Back to TOC](#table-of-contents)
-
-Copyright and License
-=====================
-
-This module is licensed under the BSD license.
-
-Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
-
-Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-[Back to TOC](#table-of-contents)
-
-See Also
-========
-
-* [ngx_stream_lua_module](https://github.com/openresty/stream-lua-nginx-module#readme) for an official port of this module for the NGINX "stream" subsystem (doing generic downstream TCP communications).
-* [lua-resty-memcached](https://github.com/openresty/lua-resty-memcached) library based on ngx_lua cosocket.
-* [lua-resty-redis](https://github.com/openresty/lua-resty-redis) library based on ngx_lua cosocket.
-* [lua-resty-mysql](https://github.com/openresty/lua-resty-mysql) library based on ngx_lua cosocket.
-* [lua-resty-upload](https://github.com/openresty/lua-resty-upload) library based on ngx_lua cosocket.
-* [lua-resty-dns](https://github.com/openresty/lua-resty-dns) library based on ngx_lua cosocket.
-* [lua-resty-websocket](https://github.com/openresty/lua-resty-websocket) library for both WebSocket server and client, based on ngx_lua cosocket.
-* [lua-resty-string](https://github.com/openresty/lua-resty-string) library based on [LuaJIT FFI](http://luajit.org/ext_ffi.html).
-* [lua-resty-lock](https://github.com/openresty/lua-resty-lock) library for a nonblocking simple lock API.
-* [lua-resty-cookie](https://github.com/cloudflare/lua-resty-cookie) library for HTTP cookie manipulation.
-* [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)
-* [Using LuaRocks with ngx_lua](http://openresty.org/#UsingLuaRocks)
-* [Introduction to ngx_lua](https://github.com/openresty/lua-nginx-module/wiki/Introduction)
-* [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit)
-* [echo-nginx-module](http://github.com/openresty/echo-nginx-module)
-* [drizzle-nginx-module](http://github.com/openresty/drizzle-nginx-module)
-* [postgres-nginx-module](https://github.com/FRiCKLE/ngx_postgres)
-* [memc-nginx-module](http://github.com/openresty/memc-nginx-module)
-* [The OpenResty bundle](http://openresty.org)
-* [Nginx Systemtap Toolkit](https://github.com/openresty/nginx-systemtap-toolkit)
-
-[Back to TOC](#table-of-contents)
-
-Directives
-==========
-
-* [lua_capture_error_log](#lua_capture_error_log)
-* [lua_use_default_type](#lua_use_default_type)
-* [lua_malloc_trim](#lua_malloc_trim)
-* [lua_code_cache](#lua_code_cache)
-* [lua_regex_cache_max_entries](#lua_regex_cache_max_entries)
-* [lua_regex_match_limit](#lua_regex_match_limit)
-* [lua_package_path](#lua_package_path)
-* [lua_package_cpath](#lua_package_cpath)
-* [init_by_lua](#init_by_lua)
-* [init_by_lua_block](#init_by_lua_block)
-* [init_by_lua_file](#init_by_lua_file)
-* [init_worker_by_lua](#init_worker_by_lua)
-* [init_worker_by_lua_block](#init_worker_by_lua_block)
-* [init_worker_by_lua_file](#init_worker_by_lua_file)
-* [set_by_lua](#set_by_lua)
-* [set_by_lua_block](#set_by_lua_block)
-* [set_by_lua_file](#set_by_lua_file)
-* [content_by_lua](#content_by_lua)
-* [content_by_lua_block](#content_by_lua_block)
-* [content_by_lua_file](#content_by_lua_file)
-* [rewrite_by_lua](#rewrite_by_lua)
-* [rewrite_by_lua_block](#rewrite_by_lua_block)
-* [rewrite_by_lua_file](#rewrite_by_lua_file)
-* [access_by_lua](#access_by_lua)
-* [access_by_lua_block](#access_by_lua_block)
-* [access_by_lua_file](#access_by_lua_file)
-* [header_filter_by_lua](#header_filter_by_lua)
-* [header_filter_by_lua_block](#header_filter_by_lua_block)
-* [header_filter_by_lua_file](#header_filter_by_lua_file)
-* [body_filter_by_lua](#body_filter_by_lua)
-* [body_filter_by_lua_block](#body_filter_by_lua_block)
-* [body_filter_by_lua_file](#body_filter_by_lua_file)
-* [log_by_lua](#log_by_lua)
-* [log_by_lua_block](#log_by_lua_block)
-* [log_by_lua_file](#log_by_lua_file)
-* [balancer_by_lua_block](#balancer_by_lua_block)
-* [balancer_by_lua_file](#balancer_by_lua_file)
-* [lua_need_request_body](#lua_need_request_body)
-* [ssl_certificate_by_lua_block](#ssl_certificate_by_lua_block)
-* [ssl_certificate_by_lua_file](#ssl_certificate_by_lua_file)
-* [ssl_session_fetch_by_lua_block](#ssl_session_fetch_by_lua_block)
-* [ssl_session_fetch_by_lua_file](#ssl_session_fetch_by_lua_file)
-* [ssl_session_store_by_lua_block](#ssl_session_store_by_lua_block)
-* [ssl_session_store_by_lua_file](#ssl_session_store_by_lua_file)
-* [lua_shared_dict](#lua_shared_dict)
-* [lua_socket_connect_timeout](#lua_socket_connect_timeout)
-* [lua_socket_send_timeout](#lua_socket_send_timeout)
-* [lua_socket_send_lowat](#lua_socket_send_lowat)
-* [lua_socket_read_timeout](#lua_socket_read_timeout)
-* [lua_socket_buffer_size](#lua_socket_buffer_size)
-* [lua_socket_pool_size](#lua_socket_pool_size)
-* [lua_socket_keepalive_timeout](#lua_socket_keepalive_timeout)
-* [lua_socket_log_errors](#lua_socket_log_errors)
-* [lua_ssl_ciphers](#lua_ssl_ciphers)
-* [lua_ssl_crl](#lua_ssl_crl)
-* [lua_ssl_protocols](#lua_ssl_protocols)
-* [lua_ssl_trusted_certificate](#lua_ssl_trusted_certificate)
-* [lua_ssl_verify_depth](#lua_ssl_verify_depth)
-* [lua_http10_buffering](#lua_http10_buffering)
-* [rewrite_by_lua_no_postpone](#rewrite_by_lua_no_postpone)
-* [access_by_lua_no_postpone](#access_by_lua_no_postpone)
-* [lua_transform_underscores_in_response_headers](#lua_transform_underscores_in_response_headers)
-* [lua_check_client_abort](#lua_check_client_abort)
-* [lua_max_pending_timers](#lua_max_pending_timers)
-* [lua_max_running_timers](#lua_max_running_timers)
-
-
-The basic building blocks of scripting Nginx with Lua are directives. Directives are used to specify when the user Lua code is run and
-how the result will be used. Below is a diagram showing the order in which directives are executed.
-
-![Lua Nginx Modules Directives](https://cloud.githubusercontent.com/assets/2137369/15272097/77d1c09e-1a37-11e6-97ef-d9767035fc3e.png)
-
-[Back to TOC](#table-of-contents)
-
-lua_capture_error_log
----------------------
-**syntax:** *lua_capture_error_log size*
-
-**default:** *none*
-
-**context:** *http*
-
-Enables a buffer of the specified `size` for capturing all the nginx error log message data (not just those produced
-by this module or the nginx http subsystem, but everything) without touching files or disks.
-
-You can use units like `k` and `m` in the `size` value, as in
-
-```nginx
-
- lua_capture_error_log 100k;
-```
-
-As a rule of thumb, a 4KB buffer can usually hold about 20 typical error log messages. So do the maths!
-
-This buffer never grows. If it is full, new error log messages will replace the oldest ones in the buffer.
-
-The size of the buffer must be bigger than the maximum length of a single error log message (which is 4K in OpenResty and 2K in stock NGINX).
-
-You can read the messages in the buffer on the Lua land via the
-[get_logs()](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#get_logs)
-function of the
-[ngx.errlog](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#readme)
-module of the [lua-resty-core](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#readme)
-library. This Lua API function will return the captured error log messages and
-also remove these already read from the global capturing buffer, making room
-for any new error log data. For this reason, the user should not configure this
-buffer to be too big if the user read the buffered error log data fast enough.
-
-Note that the log level specified in the standard [error_log](http://nginx.org/r/error_log) directive
-*does* have effect on this capturing facility. It only captures log
-messages of a level no lower than the specified log level in the [error_log](http://nginx.org/r/error_log) directive.
-The user can still choose to set an even higher filtering log level on the fly via the Lua API function
-[errlog.set_filter_level](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#set_filter_level).
-So it is more flexible than the static [error_log](http://nginx.org/r/error_log) directive.
-
-It is worth noting that there is no way to capture the debugging logs
-without building OpenResty or NGINX with the `./configure`
-option `--with-debug`. And enabling debugging logs is
-strongly discouraged in production builds due to high overhead.
-
-This directive was first introduced in the `v0.10.9` release.
-
-[Back to TOC](#directives)
-
-lua_use_default_type
---------------------
-**syntax:** *lua_use_default_type on | off*
-
-**default:** *lua_use_default_type on*
-
-**context:** *http, server, location, location if*
-
-Specifies whether to use the MIME type specified by the [default_type](http://nginx.org/en/docs/http/ngx_http_core_module.html#default_type) directive for the default value of the `Content-Type` response header. Deactivate this directive if a default `Content-Type` response header for Lua request handlers is not desired.
-
-This directive is turned on by default.
-
-This directive was first introduced in the `v0.9.1` release.
-
-[Back to TOC](#directives)
-
-lua_malloc_trim
----------------
-**syntax:** *lua_malloc_trim &lt;request-count&gt;*
-
-**default:** *lua_malloc_trim 1000*
-
-**context:** *http*
-
-Asks the underlying `libc` runtime library to release its cached free memory back to the operating system every
-`N` requests processed by the NGINX core. By default, `N` is 1000. You can configure the request count
-by using your own numbers. Smaller numbers mean more frequent releases, which may introduce higher CPU time consumption and
-smaller memory footprint while larger numbers usually lead to less CPU time overhead and relatively larger memory footprint.
-Just tune the number for your own use cases.
-
-Configuring the argument to `0` essentially turns off the periodical memory trimming altogether.
-
-```nginx
-
- lua_malloc_trim 0;  # turn off trimming completely
-```
-
-The current implementation uses an NGINX log phase handler to do the request counting. So the appearance of the
-[log_subrequest on](http://nginx.org/en/docs/http/ngx_http_core_module.html#log_subrequest) directives in `nginx.conf`
-may make the counting faster when subrequests are involved. By default, only "main requests" count.
-
-Note that this directive does *not* affect the memory allocated by LuaJIT's own allocator based on the `mmap`
-system call.
-
-This directive was first introduced in the `v0.10.7` release.
-
-[Back to TOC](#directives)
-
-lua_code_cache
---------------
-**syntax:** *lua_code_cache on | off*
-
-**default:** *lua_code_cache on*
-
-**context:** *http, server, location, location if*
-
-Enables or disables the Lua code cache for Lua code in `*_by_lua_file` directives (like [set_by_lua_file](#set_by_lua_file) and
-[content_by_lua_file](#content_by_lua_file)) and Lua modules.
-
-When turning off, every request served by ngx_lua will run in a separate Lua VM instance, starting from the `0.9.3` release. So the Lua files referenced in [set_by_lua_file](#set_by_lua_file),
-[content_by_lua_file](#content_by_lua_file), [access_by_lua_file](#access_by_lua_file),
-and etc will not be cached
-and all Lua modules used will be loaded from scratch. With this in place, developers can adopt an edit-and-refresh approach.
-
-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 not be updated when you edit the inlined Lua code in your `nginx.conf` file because only the Nginx config file parser can correctly parse the `nginx.conf`
-file and the only way is to reload the config file
-by sending a `HUP` signal or just to restart Nginx.
-
-Even when the code cache is enabled, Lua files which are loaded by `dofile` or `loadfile`
-in *_by_lua_file cannot be cached (unless you cache the results yourself). Usually you can either use the [init_by_lua](#init_by_lua)
-or [init_by_lua_file](#init-by_lua_file) directives to load all such files or just make these Lua files true Lua modules
-and load them via `require`.
-
-The ngx_lua module does not support the `stat` mode available with the
-Apache `mod_lua` module (yet).
-
-Disabling the Lua code cache is strongly
-discouraged for production use and should only be used during
-development as it has a significant negative impact on overall performance. For example, the performance of a "hello world" Lua example can drop by an order of magnitude after disabling the Lua code cache.
-
-[Back to TOC](#directives)
-
-lua_regex_cache_max_entries
----------------------------
-**syntax:** *lua_regex_cache_max_entries &lt;num&gt;*
-
-**default:** *lua_regex_cache_max_entries 1024*
-
-**context:** *http*
-
-Specifies the maximum number of entries allowed in the worker process level compiled regex cache.
-
-The regular expressions used in [ngx.re.match](#ngxrematch), [ngx.re.gmatch](#ngxregmatch), [ngx.re.sub](#ngxresub), and [ngx.re.gsub](#ngxregsub) will be cached within this cache if the regex option `o` (i.e., compile-once flag) is specified.
-
-The default number of entries allowed is 1024 and when this limit is reached, new regular expressions will not be cached (as if the `o` option was not specified) and there will be one, and only one, warning in the `error.log` file:
-
-
-    2011/08/27 23:18:26 [warn] 31997#0: *1 lua exceeding regex cache max entries (1024), ...
-
-
-If you are using the `ngx.re.*` implementation of [lua-resty-core](https://github.com/openresty/lua-resty-core) by loading the `resty.core.regex` module (or just the `resty.core` module), then an LRU cache is used for the regex cache being used here.
-
-Do not activate the `o` option for regular expressions (and/or `replace` string arguments for [ngx.re.sub](#ngxresub) and [ngx.re.gsub](#ngxregsub)) that are generated *on the fly* and give rise to infinite variations to avoid hitting the specified limit.
-
-[Back to TOC](#directives)
-
-lua_regex_match_limit
----------------------
-**syntax:** *lua_regex_match_limit &lt;num&gt;*
-
-**default:** *lua_regex_match_limit 0*
-
-**context:** *http*
-
-Specifies the "match limit" used by the PCRE library when executing the [ngx.re API](#ngxrematch). To quote the PCRE manpage, "the limit ... has the effect of limiting the amount of backtracking that can take place."
-
-When the limit is hit, the error string "pcre_exec() failed: -8" will be returned by the [ngx.re API](#ngxrematch) functions on the Lua land.
-
-When setting the limit to 0, the default "match limit" when compiling the PCRE library is used. And this is the default value of this directive.
-
-This directive was first introduced in the `v0.8.5` release.
-
-[Back to TOC](#directives)
-
-lua_package_path
-----------------
-
-**syntax:** *lua_package_path &lt;lua-style-path-str&gt;*
-
-**default:** *The content of LUA_PATH environment variable or Lua's compiled-in defaults.*
-
-**context:** *http*
-
-Sets the Lua module search path used by scripts specified by [set_by_lua](#set_by_lua),
-[content_by_lua](#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.
-
-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.
-
-[Back to TOC](#directives)
-
-lua_package_cpath
------------------
-
-**syntax:** *lua_package_cpath &lt;lua-style-cpath-str&gt;*
-
-**default:** *The content of LUA_CPATH environment variable or Lua's compiled-in defaults.*
-
-**context:** *http*
-
-Sets the Lua C-module search path used by scripts specified by [set_by_lua](#set_by_lua),
-[content_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.
-
-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.
-
-[Back to TOC](#directives)
-
-init_by_lua
------------
-
-**syntax:** *init_by_lua &lt;lua-script-str&gt;*
-
-**context:** *http*
-
-**phase:** *loading-config*
-
-**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [init_by_lua_block](#init_by_lua_block) directive instead.
-
-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. In case that the [lua_code_cache](#lua_code_cache) directive is turned off (default on), the `init_by_lua` handler will run upon every request because in this special mode a standalone Lua VM is always created for each request.
-
-Usually you can pre-load Lua modules at server start-up by means of this hook and take advantage of modern operating systems' copy-on-write (COW) optimization. Here is an example for pre-loading Lua modules:
-
-```nginx
-
- # this runs before forking out nginx worker processes:
- init_by_lua_block { require "cjson" }
-
- server {
-     location = /api {
-         content_by_lua_block {
-             -- the following require() will just  return
-             -- the alrady loaded module from package.loaded:
-             ngx.say(require "cjson".encode{dog = 5, cat = 6})
-         }
-     }
- }
-```
-
-You can also initialize the [lua_shared_dict](#lua_shared_dict) shm storage at this phase. Here is an example for this:
-
-```nginx
-
- lua_shared_dict dogs 1m;
-
- init_by_lua_block {
-     local dogs = ngx.shared.dogs;
-     dogs:set("Tom", 56)
- }
-
- server {
-     location = /api {
-         content_by_lua_block {
-             local dogs = ngx.shared.dogs;
-             ngx.say(dogs:get("Tom"))
-         }
-     }
- }
-```
-
-But note that, the [lua_shared_dict](#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.
-
-Do *not* initialize your own Lua global variables in this context because use of Lua global variables have performance penalties and can lead to global namespace pollution (see the [Lua Variable Scope](#lua-variable-scope) section for more details). The recommended way is to use proper [Lua module](http://www.lua.org/manual/5.1/manual.html#5.3) files (but do not use the standard Lua function [module()](http://www.lua.org/manual/5.1/manual.html#pdf-module) to define Lua modules because it pollutes the global namespace as well) and call [require()](http://www.lua.org/manual/5.1/manual.html#pdf-require) to load your own module files in `init_by_lua` or other contexts ([require()](http://www.lua.org/manual/5.1/manual.html#pdf-require) does cache the loaded Lua modules in the global `package.loaded` table in the Lua registry so your modules will only loaded once for the whole Lua VM instance).
-
-Only a small set of the [Nginx API for Lua](#nginx-api-for-lua) is supported in this context:
-
-* Logging APIs: [ngx.log](#ngxlog) and [print](#print),
-* Shared Dictionary API: [ngx.shared.DICT](#ngxshareddict).
-
-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.
-
-[Back to TOC](#directives)
-
-init_by_lua_block
------------------
-
-**syntax:** *init_by_lua_block { lua-script }*
-
-**context:** *http*
-
-**phase:** *loading-config*
-
-Similar to the [init_by_lua](#init_by_lua) directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-```nginx
-
- init_by_lua_block {
-     print("I need no extra escaping here, for example: \r\nblah")
- }
-```
-
-This directive was first introduced in the `v0.9.17` release.
-
-[Back to TOC](#directives)
-
-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](#init_by_lua), except that the file specified by `<path-to-lua-script-file>` contains the Lua code or [Lua/LuaJIT bytecode](#lualuajit-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.
-
-[Back to TOC](#directives)
-
-init_worker_by_lua
-------------------
-
-**syntax:** *init_worker_by_lua &lt;lua-script-str&gt;*
-
-**context:** *http*
-
-**phase:** *starting-worker*
-
-**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [init_worker_by_lua_block](#init_worker_by_lua_block) directive instead.
-
-Runs the specified Lua code upon every Nginx worker process's startup when the master process is enabled. When the master process is disabled, this hook will just run after [init_by_lua*](#init_by_lua).
-
-This hook is often used to create per-worker reoccurring timers (via the [ngx.timer.at](#ngxtimerat) Lua API), either for backend health-check or other timed routine work. Below is an example,
-
-```nginx
-
- init_worker_by_lua '
-     local delay = 3  -- in seconds
-     local new_timer = ngx.timer.at
-     local log = ngx.log
-     local ERR = ngx.ERR
-     local check
-
-     check = function(premature)
-         if not premature then
-             -- do the health check or other routine work
-             local ok, err = new_timer(delay, check)
-             if not ok then
-                 log(ERR, "failed to create timer: ", err)
-                 return
-             end
-         end
-     end
-
-     local hdl, err = new_timer(delay, check)
-     if not hdl then
-         log(ERR, "failed to create timer: ", err)
-         return
-     end
- ';
-```
-
-This directive was first introduced in the `v0.9.5` release.
-
-This hook no longer runs in the cache manager and cache loader processes since the `v0.10.12` release.
-
-[Back to TOC](#directives)
-
-init_worker_by_lua_block
-------------------------
-
-**syntax:** *init_worker_by_lua_block { lua-script }*
-
-**context:** *http*
-
-**phase:** *starting-worker*
-
-Similar to the [init_worker_by_lua](#init_worker_by_lua) directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-```nginx
-
- init_worker_by_lua_block {
-     print("I need no extra escaping here, for example: \r\nblah")
- }
-```
-
-This directive was first introduced in the `v0.9.17` release.
-
-This hook no longer runs in the cache manager and cache loader processes since the `v0.10.12` release.
-
-[Back to TOC](#directives)
-
-init_worker_by_lua_file
------------------------
-
-**syntax:** *init_worker_by_lua_file &lt;lua-file-path&gt;*
-
-**context:** *http*
-
-**phase:** *starting-worker*
-
-Similar to [init_worker_by_lua](#init_worker_by_lua), but accepts the file path to a Lua source file or Lua bytecode file.
-
-This directive was first introduced in the `v0.9.5` release.
-
-This hook no longer runs in the cache manager and cache loader processes since the `v0.10.12` release.
-
-[Back to TOC](#directives)
-
-set_by_lua
-----------
-
-**syntax:** *set_by_lua $res &lt;lua-script-str&gt; [$arg1 $arg2 ...]*
-
-**context:** *server, server if, location, location if*
-
-**phase:** *rewrite*
-
-**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [set_by_lua_block](#set_by_lua_block) directive instead.
-
-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](#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.
-
-This directive is implemented by injecting custom commands into the standard [ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)'s command list. Because [ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html) does not support nonblocking I/O in its commands, Lua APIs requiring yielding the current Lua "light thread" cannot work in this directive.
-
-At least the following API functions are currently disabled within the context of `set_by_lua`:
-
-* Output API functions (e.g., [ngx.say](#ngxsay) and [ngx.send_headers](#ngxsend_headers))
-* Control API functions (e.g., [ngx.exit](#ngxexit))
-* Subrequest API functions (e.g., [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi))
-* Cosocket API functions (e.g., [ngx.socket.tcp](#ngxsockettcp) and [ngx.req.socket](#ngxreqsocket)).
-* Sleeping API function [ngx.sleep](#ngxsleep).
-
-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](#ngxvarvariable) interface.
-
-```nginx
-
- location /foo {
-     set $diff ''; # we have to predefine the $diff variable here
-
-     set_by_lua $sum '
-         local a = 32
-         local b = 56
-
-         ngx.var.diff = a - b;  -- write to $diff directly
-         return a + b;          -- return the $sum value normally
-     ';
-
-     echo "sum = $sum, diff = $diff";
- }
-```
-
-This directive can be freely mixed with all directives of the [ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html), [set-misc-nginx-module](http://github.com/openresty/set-misc-nginx-module), and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module) modules. All of these directives will run in the same order as they appear in the config file.
-
-```nginx
-
- set $foo 32;
- set_by_lua $bar 'return tonumber(ngx.var.foo) + 1';
- set $baz "bar: $bar";  # $baz == "bar: 33"
-```
-
-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/simplresty/ngx_devel_kit) module.
-
-[Back to TOC](#directives)
-
-set_by_lua_block
-----------------
-
-**syntax:** *set_by_lua_block $res { lua-script }*
-
-**context:** *server, server if, location, location if*
-
-**phase:** *rewrite*
-
-Similar to the [set_by_lua](#set_by_lua) directive except that
-
-1. this directive inlines the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
-special character escaping), and
-1. this directive does not support extra arguments after the Lua script as in [set_by_lua](#set_by_lua).
-
-For example,
-
-```nginx
-
- set_by_lua_block $res { return 32 + math.cos(32) }
- # $res now has the value "32.834223360507" or alike.
-```
-
-No special escaping is required in the Lua code block.
-
-This directive was first introduced in the `v0.9.17` release.
-
-[Back to TOC](#directives)
-
-set_by_lua_file
----------------
-**syntax:** *set_by_lua_file $res &lt;path-to-lua-script-file&gt; [$arg1 $arg2 ...]*
-
-**context:** *server, server if, location, location if*
-
-**phase:** *rewrite*
-
-Equivalent to [set_by_lua](#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](#lualuajit-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 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](#lua_code_cache) `off` in `nginx.conf` to avoid reloading Nginx.
-
-This directive requires the [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit) module.
-
-[Back to TOC](#directives)
-
-content_by_lua
---------------
-
-**syntax:** *content_by_lua &lt;lua-script-str&gt;*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [content_by_lua_block](#content_by_lua_block) directive instead.
-
-Acts as a "content handler" and executes Lua code string specified in `<lua-script-str>` for every request.
-The Lua code may make [API calls](#nginx-api-for-lua) and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
-
-Do not use this directive and other content handler directives in the same location. For example, this directive and the [proxy_pass](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass) directive should not be used in the same location.
-
-[Back to TOC](#directives)
-
-content_by_lua_block
---------------------
-
-**syntax:** *content_by_lua_block { lua-script }*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Similar to the [content_by_lua](#content_by_lua) directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-```nginx
-
- content_by_lua_block {
-     ngx.say("I need no extra escaping here, for example: \r\nblah")
- }
-```
-
-This directive was first introduced in the `v0.9.17` release.
-
-[Back to TOC](#directives)
-
-content_by_lua_file
--------------------
-
-**syntax:** *content_by_lua_file &lt;path-to-lua-script-file&gt;*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Equivalent to [content_by_lua](#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](#lualuajit-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 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](#lua_code_cache) `off` in `nginx.conf` to avoid reloading Nginx.
-
-Nginx variables are supported in the file path for dynamic dispatch, for example:
-
-```nginx
-
- # CAUTION: contents in nginx var must be carefully filtered,
- # otherwise there'll be great security risk!
- location ~ ^/app/([-_a-zA-Z0-9/]+) {
-     set $path $1;
-     content_by_lua_file /path/to/lua/app/root/$path.lua;
- }
-```
-
-But be very careful about malicious user inputs and always carefully validate or filter out the user-supplied path components.
-
-[Back to TOC](#directives)
-
-rewrite_by_lua
---------------
-
-**syntax:** *rewrite_by_lua &lt;lua-script-str&gt;*
-
-**context:** *http, server, location, location if*
-
-**phase:** *rewrite tail*
-
-**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [rewrite_by_lua_block](#rewrite_by_lua_block) directive instead.
-
-Acts as a rewrite phase handler and executes Lua code string specified in `<lua-script-str>` for every request.
-The Lua code may make [API calls](#nginx-api-for-lua) and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
-
-Note that this handler always runs *after* the standard [ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html). So the following will work as expected:
-
-```nginx
-
- location /foo {
-     set $a 12; # create and initialize $a
-     set $b ""; # create and initialize $b
-     rewrite_by_lua 'ngx.var.b = tonumber(ngx.var.a) + 1';
-     echo "res = $b";
- }
-```
-
-because `set $a 12` and `set $b ""` run *before* [rewrite_by_lua](#rewrite_by_lua).
-
-On the other hand, the following will not work as expected:
-
-```nginx
-
- ?  location /foo {
- ?      set $a 12; # create and initialize $a
- ?      set $b ''; # create and initialize $b
- ?      rewrite_by_lua 'ngx.var.b = tonumber(ngx.var.a) + 1';
- ?      if ($b = '13') {
- ?         rewrite ^ /bar redirect;
- ?         break;
- ?      }
- ?
- ?      echo "res = $b";
- ?  }
-```
-
-because `if` runs *before* [rewrite_by_lua](#rewrite_by_lua) even if it is placed after [rewrite_by_lua](#rewrite_by_lua) in the config.
-
-The right way of doing this is as follows:
-
-```nginx
-
- location /foo {
-     set $a 12; # create and initialize $a
-     set $b ''; # create and initialize $b
-     rewrite_by_lua '
-         ngx.var.b = tonumber(ngx.var.a) + 1
-         if tonumber(ngx.var.b) == 13 then
-             return ngx.redirect("/bar");
-         end
-     ';
-
-     echo "res = $b";
- }
-```
-
-Note that the [ngx_eval](http://www.grid.net.ru/nginx/eval.en.html) module can be approximated by using [rewrite_by_lua](#rewrite_by_lua). For example,
-
-```nginx
-
- location / {
-     eval $res {
-         proxy_pass http://foo.com/check-spam;
-     }
-
-     if ($res = 'spam') {
-         rewrite ^ /terms-of-use.html redirect;
-     }
-
-     fastcgi_pass ...;
- }
-```
-
-can be implemented in ngx_lua as:
-
-```nginx
-
- location = /check-spam {
-     internal;
-     proxy_pass http://foo.com/check-spam;
- }
-
- location / {
-     rewrite_by_lua '
-         local res = ngx.location.capture("/check-spam")
-         if res.body == "spam" then
-             return ngx.redirect("/terms-of-use.html")
-         end
-     ';
-
-     fastcgi_pass ...;
- }
-```
-
-Just as any other rewrite phase handlers, [rewrite_by_lua](#rewrite_by_lua) also runs in subrequests.
-
-Note that when calling `ngx.exit(ngx.OK)` within a [rewrite_by_lua](#rewrite_by_lua) handler, the nginx request processing control flow will still continue to the content handler. To terminate the current request from within a [rewrite_by_lua](#rewrite_by_lua) handler, calling [ngx.exit](#ngxexit) with status >= 200 (`ngx.HTTP_OK`) and status < 300 (`ngx.HTTP_SPECIAL_RESPONSE`) for successful quits and `ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)` (or its friends) for failures.
-
-If the [ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)'s [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#rewrite) directive is used to change the URI and initiate location re-lookups (internal redirections), then any [rewrite_by_lua](#rewrite_by_lua) or [rewrite_by_lua_file](#rewrite_by_lua_file) code sequences within the current location will not be executed. For example,
-
-```nginx
-
- location /foo {
-     rewrite ^ /bar;
-     rewrite_by_lua 'ngx.exit(503)';
- }
- location /bar {
-     ...
- }
-```
-
-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](#rewrite_by_lua_no_postpone) is turned on.
-
-[Back to TOC](#directives)
-
-rewrite_by_lua_block
---------------------
-
-**syntax:** *rewrite_by_lua_block { lua-script }*
-
-**context:** *http, server, location, location if*
-
-**phase:** *rewrite tail*
-
-Similar to the [rewrite_by_lua](#rewrite_by_lua) directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-```nginx
-
- rewrite_by_lua_block {
-     do_something("hello, world!\nhiya\n")
- }
-```
-
-This directive was first introduced in the `v0.9.17` release.
-
-[Back to TOC](#directives)
-
-rewrite_by_lua_file
--------------------
-
-**syntax:** *rewrite_by_lua_file &lt;path-to-lua-script-file&gt;*
-
-**context:** *http, server, location, location if*
-
-**phase:** *rewrite tail*
-
-Equivalent to [rewrite_by_lua](#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](#lualuajit-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 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](#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](#rewrite_by_lua_no_postpone) is turned on.
-
-Nginx variables are supported in the file path for dynamic dispatch just as in [content_by_lua_file](#content_by_lua_file).
-
-[Back to TOC](#directives)
-
-access_by_lua
--------------
-
-**syntax:** *access_by_lua &lt;lua-script-str&gt;*
-
-**context:** *http, server, location, location if*
-
-**phase:** *access tail*
-
-**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [access_by_lua_block](#access_by_lua_block) directive instead.
-
-Acts as an access phase handler and executes Lua code string specified in `<lua-script-str>` for every request.
-The Lua code may make [API calls](#nginx-api-for-lua) and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
-
-Note that this handler always runs *after* the standard [ngx_http_access_module](http://nginx.org/en/docs/http/ngx_http_access_module.html). So the following will work as expected:
-
-```nginx
-
- location / {
-     deny    192.168.1.1;
-     allow   192.168.1.0/24;
-     allow   10.1.1.0/16;
-     deny    all;
-
-     access_by_lua '
-         local res = ngx.location.capture("/mysql", { ... })
-         ...
-     ';
-
-     # proxy_pass/fastcgi_pass/...
- }
-```
-
-That is, if a client IP address is in the blacklist, it will be denied before the MySQL query for more complex authentication is executed by [access_by_lua](#access_by_lua).
-
-Note that the [ngx_auth_request](http://mdounin.ru/hg/ngx_http_auth_request_module/) module can be approximated by using [access_by_lua](#access_by_lua):
-
-```nginx
-
- location / {
-     auth_request /auth;
-
-     # proxy_pass/fastcgi_pass/postgres_pass/...
- }
-```
-
-can be implemented in ngx_lua as:
-
-```nginx
-
- location / {
-     access_by_lua '
-         local res = ngx.location.capture("/auth")
-
-         if res.status == ngx.HTTP_OK then
-             return
-         end
-
-         if res.status == ngx.HTTP_FORBIDDEN then
-             ngx.exit(res.status)
-         end
-
-         ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-     ';
-
-     # proxy_pass/fastcgi_pass/postgres_pass/...
- }
-```
-
-As with other access phase handlers, [access_by_lua](#access_by_lua) will *not* run in subrequests.
-
-Note that when calling `ngx.exit(ngx.OK)` within a [access_by_lua](#access_by_lua) handler, the nginx request processing control flow will still continue to the content handler. To terminate the current request from within a [access_by_lua](#access_by_lua) handler, calling [ngx.exit](#ngxexit) with status >= 200 (`ngx.HTTP_OK`) and status < 300 (`ngx.HTTP_SPECIAL_RESPONSE`) for successful quits and `ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)` (or its friends) for failures.
-
-Starting from the `v0.9.20` release, you can use the [access_by_lua_no_postpone](#access_by_lua_no_postpone)
-directive to control when to run this handler inside the "access" request-processing phase
-of NGINX.
-
-[Back to TOC](#directives)
-
-access_by_lua_block
--------------------
-
-**syntax:** *access_by_lua_block { lua-script }*
-
-**context:** *http, server, location, location if*
-
-**phase:** *access tail*
-
-Similar to the [access_by_lua](#access_by_lua) directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-```nginx
-
- access_by_lua_block {
-     do_something("hello, world!\nhiya\n")
- }
-```
-
-This directive was first introduced in the `v0.9.17` release.
-
-[Back to TOC](#directives)
-
-access_by_lua_file
-------------------
-
-**syntax:** *access_by_lua_file &lt;path-to-lua-script-file&gt;*
-
-**context:** *http, server, location, location if*
-
-**phase:** *access tail*
-
-Equivalent to [access_by_lua](#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](#lualuajit-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 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](#lua_code_cache) `off` in `nginx.conf` to avoid repeatedly reloading Nginx.
-
-Nginx variables are supported in the file path for dynamic dispatch just as in [content_by_lua_file](#content_by_lua_file).
-
-[Back to TOC](#directives)
-
-header_filter_by_lua
---------------------
-
-**syntax:** *header_filter_by_lua &lt;lua-script-str&gt;*
-
-**context:** *http, server, location, location if*
-
-**phase:** *output-header-filter*
-
-**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [header_filter_by_lua_block](#header_filter_by_lua_block) directive instead.
-
-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](#ngxsay) and [ngx.send_headers](#ngxsend_headers))
-* Control API functions (e.g., [ngx.redirect](#ngxredirect) and [ngx.exec](#ngxexec))
-* Subrequest API functions (e.g., [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi))
-* Cosocket API functions (e.g., [ngx.socket.tcp](#ngxsockettcp) and [ngx.req.socket](#ngxreqsocket)).
-
-Here is an example of overriding a response header (or adding one if absent) in our Lua header filter:
-
-```nginx
-
- location / {
-     proxy_pass http://mybackend;
-     header_filter_by_lua 'ngx.header.Foo = "blah"';
- }
-```
-
-This directive was first introduced in the `v0.2.1rc20` release.
-
-[Back to TOC](#directives)
-
-header_filter_by_lua_block
---------------------------
-
-**syntax:** *header_filter_by_lua_block { lua-script }*
-
-**context:** *http, server, location, location if*
-
-**phase:** *output-header-filter*
-
-Similar to the [header_filter_by_lua](#header_filter_by_lua) directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-```nginx
-
- header_filter_by_lua_block {
-     ngx.header["content-length"] = nil
- }
-```
-
-This directive was first introduced in the `v0.9.17` release.
-
-[Back to TOC](#directives)
-
-header_filter_by_lua_file
--------------------------
-
-**syntax:** *header_filter_by_lua_file &lt;path-to-lua-script-file&gt;*
-
-**context:** *http, server, location, location if*
-
-**phase:** *output-header-filter*
-
-Equivalent to [header_filter_by_lua](#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](#lualuajit-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.2.1rc20` release.
-
-[Back to TOC](#directives)
-
-body_filter_by_lua
-------------------
-
-**syntax:** *body_filter_by_lua &lt;lua-script-str&gt;*
-
-**context:** *http, server, location, location if*
-
-**phase:** *output-body-filter*
-
-**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [body_filter_by_lua_block](#body_filter_by_lua_block) directive instead.
-
-Uses Lua code specified in `<lua-script-str>` to define an output body filter.
-
-The input data chunk is passed via [ngx.arg](#ngxarg)\[1\] (as a Lua string value) and the "eof" flag indicating the end of the response body data stream is passed via [ngx.arg](#ngxarg)\[2\] (as a Lua boolean value).
-
-Behind the scene, the "eof" flag is just the `last_buf` (for main requests) or `last_in_chain` (for subrequests) flag of the Nginx chain link buffers. (Before the `v0.7.14` release, the "eof" flag does not work at all in subrequests.)
-
-The output data stream can be aborted immediately by running the following Lua statement:
-
-```lua
-
- 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](#ngxarg)\[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:
-
-```nginx
-
- 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](#ngxarg)\[2\]. For example,
-
-```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
-     ';
- }
-```
-
-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
-
-```nginx
-
- location /foo {
-     # fastcgi_pass/proxy_pass/...
-
-     header_filter_by_lua_block { ngx.header.content_length = nil }
-     body_filter_by_lua 'ngx.arg[1] = string.len(ngx.arg[1]) .. "\\n"';
- }
-```
-
-Note that the following API functions are currently disabled within this context due to the limitations in NGINX output filter's current implementation:
-
-* Output API functions (e.g., [ngx.say](#ngxsay) and [ngx.send_headers](#ngxsend_headers))
-* Control API functions (e.g., [ngx.exit](#ngxexit) and [ngx.exec](#ngxexec))
-* Subrequest API functions (e.g., [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi))
-* Cosocket API functions (e.g., [ngx.socket.tcp](#ngxsockettcp) and [ngx.req.socket](#ngxreqsocket)).
-
-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.
-
-[Back to TOC](#directives)
-
-body_filter_by_lua_block
-------------------------
-
-**syntax:** *body_filter_by_lua_block { lua-script-str }*
-
-**context:** *http, server, location, location if*
-
-**phase:** *output-body-filter*
-
-Similar to the [body_filter_by_lua](#body_filter_by_lua) directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-```nginx
-
- body_filter_by_lua_block {
-     local data, eof = ngx.arg[1], ngx.arg[2]
- }
-```
-
-This directive was first introduced in the `v0.9.17` release.
-
-[Back to TOC](#directives)
-
-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](#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](#lualuajit-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.
-
-[Back to TOC](#directives)
-
-log_by_lua
-----------
-
-**syntax:** *log_by_lua &lt;lua-script-str&gt;*
-
-**context:** *http, server, location, location if*
-
-**phase:** *log*
-
-**NOTE** Use of this directive is *discouraged* following the `v0.9.17` release. Use the [log_by_lua_block](#log_by_lua_block) directive instead.
-
-Runs 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 before.
-
-Note that the following API functions are currently disabled within this context:
-
-* Output API functions (e.g., [ngx.say](#ngxsay) and [ngx.send_headers](#ngxsend_headers))
-* Control API functions (e.g., [ngx.exit](#ngxexit))
-* Subrequest API functions (e.g., [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi))
-* Cosocket API functions (e.g., [ngx.socket.tcp](#ngxsockettcp) and [ngx.req.socket](#ngxreqsocket)).
-
-Here is an example of gathering average data for [$upstream_response_time](http://nginx.org/en/docs/http/ngx_http_upstream_module.html#var_upstream_response_time):
-
-```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_block {
-             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.
-
-[Back to TOC](#directives)
-
-log_by_lua_block
-----------------
-
-**syntax:** *log_by_lua_block { lua-script }*
-
-**context:** *http, server, location, location if*
-
-**phase:** *log*
-
-Similar to the [log_by_lua](#log_by_lua) directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (`{}`) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-```nginx
-
- log_by_lua_block {
-     print("I need no extra escaping here, for example: \r\nblah")
- }
-```
-
-This directive was first introduced in the `v0.9.17` release.
-
-[Back to TOC](#directives)
-
-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](#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](#lualuajit-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.
-
-[Back to TOC](#directives)
-
-balancer_by_lua_block
----------------------
-
-**syntax:** *balancer_by_lua_block { lua-script }*
-
-**context:** *upstream*
-
-**phase:** *content*
-
-This directive runs Lua code as an upstream balancer for any upstream entities defined
-by the `upstream {}` configuration block.
-
-For instance,
-
-```nginx
-
- upstream foo {
-     server 127.0.0.1;
-     balancer_by_lua_block {
-         -- use Lua to do something interesting here
-         -- as a dynamic balancer
-     }
- }
-
- server {
-     location / {
-         proxy_pass http://foo;
-     }
- }
-```
-
-The resulting Lua load balancer can work with any existing nginx upstream modules
-like [ngx_proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and
-[ngx_fastcgi](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
-
-Also, the Lua load balancer can work with the standard upstream connection pool mechanism,
-i.e., the standard [keepalive](http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive) directive.
-Just ensure that the [keepalive](http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive) directive
-is used *after* this `balancer_by_lua_block` directive in a single `upstream {}` configuration block.
-
-The Lua load balancer can totally ignore the list of servers defined in the `upstream {}` block
-and select peer from a completely dynamic server list (even changing per request) via the
-[ngx.balancer](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/balancer.md) module
-from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
-
-The Lua code handler registered by this directive might get called more than once in a single
-downstream request when the nginx upstream mechanism retries the request on conditions
-specified by directives like the [proxy_next_upstream](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_next_upstream)
-directive.
-
-This Lua code execution context does not support yielding, so Lua APIs that may yield
-(like cosockets and "light threads") are disabled in this context. One can usually work
-around this limitation by doing such operations in an earlier phase handler (like
-[access_by_lua*](#access_by_lua)) and passing along the result into this context
-via the [ngx.ctx](#ngxctx) table.
-
-This directive was first introduced in the `v0.10.0` release.
-
-[Back to TOC](#directives)
-
-balancer_by_lua_file
---------------------
-
-**syntax:** *balancer_by_lua_file &lt;path-to-lua-script-file&gt;*
-
-**context:** *upstream*
-
-**phase:** *content*
-
-Equivalent to [balancer_by_lua_block](#balancer_by_lua_block), 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](#lualuajit-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.10.0` release.
-
-[Back to TOC](#directives)
-
-lua_need_request_body
----------------------
-
-**syntax:** *lua_need_request_body &lt;on|off&gt;*
-
-**default:** *off*
-
-**context:** *http, server, location, location if*
-
-**phase:** *depends on usage*
-
-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](#ngxreqread_body) function should be called within the Lua code.
-
-To read the request body data within the [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) variable,
-[client_body_buffer_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_buffer_size) must have the same value as [client_max_body_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size). Because when the content length exceeds [client_body_buffer_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_buffer_size) but less than [client_max_body_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#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://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) variable.
-
-If the current location includes [rewrite_by_lua*](#rewrite_by_lua) directives,
-then the request body will be read just before the [rewrite_by_lua*](#rewrite_by_lua) code is run (and also at the
-`rewrite` phase). Similarly, if only [content_by_lua](#content_by_lua) is specified,
-the request body will not be read until the content handler's Lua code is
-about to run (i.e., the request body will be read during the content phase).
-
-It is recommended however, to use the [ngx.req.read_body](#ngxreqread_body) and [ngx.req.discard_body](#ngxreqdiscard_body) functions for finer control over the request body reading process instead.
-
-This also applies to [access_by_lua*](#access_by_lua).
-
-[Back to TOC](#directives)
-
-ssl_certificate_by_lua_block
-----------------------------
-
-**syntax:** *ssl_certificate_by_lua_block { lua-script }*
-
-**context:** *server*
-
-**phase:** *right-before-SSL-handshake*
-
-This directive runs user Lua code when NGINX is about to start the SSL handshake for the downstream
-SSL (https) connections.
-
-It is particularly useful for setting the SSL certificate chain and the corresponding private key on a per-request
-basis. It is also useful to load such handshake configurations nonblockingly from the remote (for example,
-with the [cosocket](#ngxsockettcp) API). And one can also do per-request OCSP stapling handling in pure
-Lua here as well.
-
-Another typical use case is to do SSL handshake traffic control nonblockingly in this context,
-with the help of the [lua-resty-limit-traffic#readme](https://github.com/openresty/lua-resty-limit-traffic)
-library, for example.
-
-One can also do interesting things with the SSL handshake requests from the client side, like
-rejecting old SSL clients using the SSLv3 protocol or even below selectively.
-
-The [ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
-and [ngx.ocsp](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md) Lua modules
-provided by the [lua-resty-core](https://github.com/openresty/lua-resty-core/#readme)
-library are particularly useful in this context. You can use the Lua API offered by these two Lua modules
-to manipulate the SSL certificate chain and private key for the current SSL connection
-being initiated.
-
-This Lua handler does not run at all, however, when NGINX/OpenSSL successfully resumes
-the SSL session via SSL session IDs or TLS session tickets for the current SSL connection. In
-other words, this Lua handler only runs when NGINX has to initiate a full SSL handshake.
-
-Below is a trivial example using the
-[ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md) module
-at the same time:
-
-```nginx
-
- server {
-     listen 443 ssl;
-     server_name   test.com;
-
-     ssl_certificate_by_lua_block {
-         print("About to initiate a new SSL handshake!")
-     }
-
-     location / {
-         root html;
-     }
- }
-```
-
-See more complicated examples in the [ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
-and [ngx.ocsp](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md)
-Lua modules' official documentation.
-
-Uncaught Lua exceptions in the user Lua code immediately abort the current SSL session, so does the
-[ngx.exit](#ngxexit) call with an error code like `ngx.ERROR`.
-
-This Lua code execution context *does* support yielding, so Lua APIs that may yield
-(like cosockets, sleeping, and "light threads")
-are enabled in this context.
-
-Note, however, you still need to configure the [ssl_certificate](http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_certificate) and
-[ssl_certificate_key](http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_certificate_key)
-directives even though you will not use this static certificate and private key at all. This is
-because the NGINX core requires their appearance otherwise you are seeing the following error
-while starting NGINX:
-
-
-    nginx: [emerg] no ssl configured for the server
-
-
-This directive currently requires the following NGINX core patch to work correctly:
-
-<http://mailman.nginx.org/pipermail/nginx-devel/2016-January/007748.html>
-
-The bundled version of the NGINX core in OpenResty 1.9.7.2 (or above) already has this
-patch applied.
-
-Furthermore, one needs at least OpenSSL 1.0.2e for this directive to work.
-
-This directive was first introduced in the `v0.10.0` release.
-
-[Back to TOC](#directives)
-
-ssl_certificate_by_lua_file
----------------------------
-
-**syntax:** *ssl_certificate_by_lua_file &lt;path-to-lua-script-file&gt;*
-
-**context:** *server*
-
-**phase:** *right-before-SSL-handshake*
-
-Equivalent to [ssl_certificate_by_lua_block](#ssl_certificate_by_lua_block), 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](#lualuajit-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.10.0` release.
-
-[Back to TOC](#directives)
-
-ssl_session_fetch_by_lua_block
-------------------------------
-
-**syntax:** *ssl_session_fetch_by_lua_block { lua-script }*
-
-**context:** *http*
-
-**phase:** *right-before-SSL-handshake*
-
-This directive runs Lua code to look up and load the SSL session (if any) according to the session ID
-provided by the current SSL handshake request for the downstream.
-
-The Lua API for obtaining the current session ID and loading a cached SSL session data
-is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl/session.md)
-Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
-library.
-
-Lua APIs that may yield, like [ngx.sleep](#ngxsleep) and [cosockets](#ngxsockettcp),
-are enabled in this context.
-
-This hook, together with the [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block) hook,
-can be used to implement distributed caching mechanisms in pure Lua (based
-on the [cosocket](#ngxsockettcp) API, for example). If a cached SSL session is found
-and loaded into the current SSL connection context,
-SSL session resumption can then get immediately initiated and bypass the full SSL handshake process which is very expensive in terms of CPU time.
-
-Please note that TLS session tickets are very different and it is the clients' responsibility
-to cache the SSL session state when session tickets are used. SSL session resumptions based on
-TLS session tickets would happen automatically without going through this hook (nor the
-[ssl_session_store_by_lua_block](#ssl_session_store_by_lua) hook). This hook is mainly
-for older or less capable SSL clients that can only do SSL sessions by session IDs.
-
-When [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block) is specified at the same time,
-this hook usually runs before [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
-When the SSL session is found and successfully loaded for the current SSL connection,
-SSL session resumption will happen and thus bypass the [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block)
-hook completely. In this case, NGINX also bypasses the [ssl_session_store_by_lua_block](#ssl_session_store_by_lua)
-hook, for obvious reasons.
-
-To easily test this hook locally with a modern web browser, you can temporarily put the following line
-in your https server block to disable the TLS session ticket support:
-
-    ssl_session_tickets off;
-
-But do not forget to comment this line out before publishing your site to the world.
-
-If you are using the [official pre-built packages](http://openresty.org/en/linux-packages.html) for [OpenResty](https://openresty.org/)
-1.11.2.1 or later, then everything should work out of the box.
-
-If you are using OpenSSL libraries not provided by [OpenResty](https://openresty.org),
-then you need to apply the following patch for OpenSSL 1.0.2h or later:
-
-<https://github.com/openresty/openresty/blob/master/patches/openssl-1.0.2h-sess_set_get_cb_yield.patch>
-
-If you are not using the NGINX core shipped with [OpenResty](https://openresty.org) 1.11.2.1 or later, then you need to
-apply the following patch to the standard NGINX core 1.11.2 or later:
-
-<http://openresty.org/download/nginx-1.11.2-nonblocking_ssl_handshake_hooks.patch>
-
-This directive was first introduced in the `v0.10.6` release.
-
-Note that: this directive is only allowed to used in **http context** from the `v0.10.7` release
-(because SSL session resumption happens before server name dispatch).
-
-[Back to TOC](#directives)
-
-ssl_session_fetch_by_lua_file
------------------------------
-
-**syntax:** *ssl_session_fetch_by_lua_file &lt;path-to-lua-script-file&gt;*
-
-**context:** *http*
-
-**phase:** *right-before-SSL-handshake*
-
-Equivalent to [ssl_session_fetch_by_lua_block](#ssl_session_fetch_by_lua_block), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or rather, the [Lua/LuaJIT bytecode](#lualuajit-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.10.6` release.
-
-Note that: this directive is only allowed to used in **http context** from the `v0.10.7` release
-(because SSL session resumption happens before server name dispatch).
-
-[Back to TOC](#directives)
-
-ssl_session_store_by_lua_block
-------------------------------
-
-**syntax:** *ssl_session_store_by_lua_block { lua-script }*
-
-**context:** *http*
-
-**phase:** *right-after-SSL-handshake*
-
-This directive runs Lua code to fetch and save the SSL session (if any) according to the session ID
-provided by the current SSL handshake request for the downstream. The saved or cached SSL
-session data can be used for future SSL connections to resume SSL sessions without going
-through the full SSL handshake process (which is very expensive in terms of CPU time).
-
-Lua APIs that may yield, like [ngx.sleep](#ngxsleep) and [cosockets](#ngxsockettcp),
-are *disabled* in this context. You can still, however, use the [ngx.timer.at](#ngxtimerat) API
-to create 0-delay timers to save the SSL session data asynchronously to external services (like `redis` or `memcached`).
-
-The Lua API for obtaining the current session ID and the associated session state data
-is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl/session.md#readme)
-Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
-library.
-
-To easily test this hook locally with a modern web browser, you can temporarily put the following line
-in your https server block to disable the TLS session ticket support:
-
-    ssl_session_tickets off;
-
-But do not forget to comment this line out before publishing your site to the world.
-
-This directive was first introduced in the `v0.10.6` release.
-
-Note that: this directive is only allowed to used in **http context** from the `v0.10.7` release
-(because SSL session resumption happens before server name dispatch).
-
-[Back to TOC](#directives)
-
-ssl_session_store_by_lua_file
------------------------------
-
-**syntax:** *ssl_session_store_by_lua_file &lt;path-to-lua-script-file&gt;*
-
-**context:** *http*
-
-**phase:** *right-after-SSL-handshake*
-
-Equivalent to [ssl_session_store_by_lua_block](#ssl_session_store_by_lua_block), except that the file specified by `<path-to-lua-script-file>` contains the Lua code, or rather, the [Lua/LuaJIT bytecode](#lualuajit-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.10.6` release.
-
-Note that: this directive is only allowed to used in **http context** from the `v0.10.7` release
-(because SSL session resumption happens before server name dispatch).
-
-[Back to TOC](#directives)
-
-lua_shared_dict
----------------
-
-**syntax:** *lua_shared_dict &lt;name&gt; &lt;size&gt;*
-
-**default:** *no*
-
-**context:** *http*
-
-**phase:** *depends on usage*
-
-Declares a shared memory zone, `<name>`, to serve as storage for the shm based Lua dictionary `ngx.shared.<name>`.
-
-Shared memory zones are always shared by all the nginx worker processes in the current nginx server instance.
-
-The `<size>` argument accepts size units such as `k` and `m`:
-
-```nginx
-
- http {
-     lua_shared_dict dogs 10m;
-     ...
- }
-```
-
-The hard-coded minimum size is 8KB while the practical minimum size depends
-on actual user data set (some people start with 12KB).
-
-See [ngx.shared.DICT](#ngxshareddict) for details.
-
-This directive was first introduced in the `v0.3.1rc22` release.
-
-[Back to TOC](#directives)
-
-lua_socket_connect_timeout
---------------------------
-
-**syntax:** *lua_socket_connect_timeout &lt;time&gt;*
-
-**default:** *lua_socket_connect_timeout 60s*
-
-**context:** *http, server, location*
-
-This directive controls the default timeout value used in TCP/unix-domain socket object's [connect](#tcpsockconnect) method and can be overridden by the [settimeout](#tcpsocksettimeout) or [settimeouts](#tcpsocksettimeouts) methods.
-
-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.
-
-[Back to TOC](#directives)
-
-lua_socket_send_timeout
------------------------
-
-**syntax:** *lua_socket_send_timeout &lt;time&gt;*
-
-**default:** *lua_socket_send_timeout 60s*
-
-**context:** *http, server, location*
-
-Controls the default timeout value used in TCP/unix-domain socket object's [send](#tcpsocksend) method and can be overridden by the [settimeout](#tcpsocksettimeout) or [settimeouts](#tcpsocksettimeouts) methods.
-
-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.
-
-[Back to TOC](#directives)
-
-lua_socket_send_lowat
----------------------
-
-**syntax:** *lua_socket_send_lowat &lt;size&gt;*
-
-**default:** *lua_socket_send_lowat 0*
-
-**context:** *http, server, location*
-
-Controls the `lowat` (low water) value for the cosocket send buffer.
-
-[Back to TOC](#directives)
-
-lua_socket_read_timeout
------------------------
-
-**syntax:** *lua_socket_read_timeout &lt;time&gt;*
-
-**default:** *lua_socket_read_timeout 60s*
-
-**context:** *http, server, location*
-
-**phase:** *depends on usage*
-
-This directive controls the default timeout value used in TCP/unix-domain socket object's [receive](#tcpsockreceive) method and iterator functions returned by the [receiveuntil](#tcpsockreceiveuntil) method. This setting can be overridden by the [settimeout](#tcpsocksettimeout) or [settimeouts](#tcpsocksettimeouts) methods.
-
-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.
-
-[Back to TOC](#directives)
-
-lua_socket_buffer_size
-----------------------
-
-**syntax:** *lua_socket_buffer_size &lt;size&gt;*
-
-**default:** *lua_socket_buffer_size 4k/8k*
-
-**context:** *http, server, location*
-
-Specifies the buffer size used by cosocket reading operations.
-
-This buffer does not have to be that big to hold everything at the same time because cosocket supports 100% non-buffered reading and parsing. So even `1` byte buffer size should still work everywhere but the performance could be terrible.
-
-This directive was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#directives)
-
-lua_socket_pool_size
---------------------
-
-**syntax:** *lua_socket_pool_size &lt;size&gt;*
-
-**default:** *lua_socket_pool_size 30*
-
-**context:** *http, server, location*
-
-Specifies the size limit (in terms of connection count) for every cosocket connection pool associated with every remote server (i.e., identified by either the host-port pair or the unix domain socket file path).
-
-Default to 30 connections for every pool.
-
-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 size limit specified here also applies to every single nginx worker process.
-
-This directive was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#directives)
-
-lua_socket_keepalive_timeout
-----------------------------
-
-**syntax:** *lua_socket_keepalive_timeout &lt;time&gt;*
-
-**default:** *lua_socket_keepalive_timeout 60s*
-
-**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 and removed from the pool. This setting can be overridden by cosocket objects' [setkeepalive](#tcpsocksetkeepalive) 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`, i.e., "second". The default setting is `60s`.
-
-This directive was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#directives)
-
-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.
-
-[Back to TOC](#directives)
-
-lua_ssl_ciphers
----------------
-
-**syntax:** *lua_ssl_ciphers &lt;ciphers&gt;*
-
-**default:** *lua_ssl_ciphers DEFAULT*
-
-**context:** *http, server, location*
-
-Specifies the enabled ciphers for requests to a SSL/TLS server in the [tcpsock:sslhandshake](#tcpsocksslhandshake) method. The ciphers are specified in the format understood by the OpenSSL library.
-
-The full list can be viewed using the “openssl ciphers” command.
-
-This directive was first introduced in the `v0.9.11` release.
-
-[Back to TOC](#directives)
-
-lua_ssl_crl
------------
-
-**syntax:** *lua_ssl_crl &lt;file&gt;*
-
-**default:** *no*
-
-**context:** *http, server, location*
-
-Specifies a file with revoked certificates (CRL) in the PEM format used to verify the certificate of the SSL/TLS server in the [tcpsock:sslhandshake](#tcpsocksslhandshake) method.
-
-This directive was first introduced in the `v0.9.11` release.
-
-[Back to TOC](#directives)
-
-lua_ssl_protocols
------------------
-
-**syntax:** *lua_ssl_protocols \[SSLv2\] \[SSLv3\] \[TLSv1\] [TLSv1.1] [TLSv1.2] [TLSv1.3]*
-
-**default:** *lua_ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2*
-
-**context:** *http, server, location*
-
-Enables the specified protocols for requests to a SSL/TLS server in the [tcpsock:sslhandshake](#tcpsocksslhandshake) method.
-
-The support for the `TLSv1.3` parameter requires version `v0.10.12` *and* OpenSSL 1.1.1.
-
-This directive was first introduced in the `v0.9.11` release.
-
-[Back to TOC](#directives)
-
-lua_ssl_trusted_certificate
----------------------------
-
-**syntax:** *lua_ssl_trusted_certificate &lt;file&gt;*
-
-**default:** *no*
-
-**context:** *http, server, location*
-
-Specifies a file path with trusted CA certificates in the PEM format used to verify the certificate of the SSL/TLS server in the [tcpsock:sslhandshake](#tcpsocksslhandshake) method.
-
-This directive was first introduced in the `v0.9.11` release.
-
-See also [lua_ssl_verify_depth](#lua_ssl_verify_depth).
-
-[Back to TOC](#directives)
-
-lua_ssl_verify_depth
---------------------
-
-**syntax:** *lua_ssl_verify_depth &lt;number&gt;*
-
-**default:** *lua_ssl_verify_depth 1*
-
-**context:** *http, server, location*
-
-Sets the verification depth in the server certificates chain.
-
-This directive was first introduced in the `v0.9.11` release.
-
-See also [lua_ssl_trusted_certificate](#lua_ssl_trusted_certificate).
-
-[Back to TOC](#directives)
-
-lua_http10_buffering
---------------------
-
-**syntax:** *lua_http10_buffering on|off*
-
-**default:** *lua_http10_buffering on*
-
-**context:** *http, server, location, location-if*
-
-Enables or disables automatic response buffering for HTTP 1.0 (or older) requests. This buffering mechanism is mainly used for HTTP 1.0 keep-alive which relies on a proper `Content-Length` response header.
-
-If the Lua code explicitly sets a `Content-Length` response header before sending the headers (either explicitly via [ngx.send_headers](#ngxsend_headers) or implicitly via the first [ngx.say](#ngxsay) or [ngx.print](#ngxprint) call), then the HTTP 1.0 response buffering will be disabled even when this directive is turned on.
-
-To output very large response data in a streaming fashion (via the [ngx.flush](#ngxflush) call, for example), this directive MUST be turned off to minimize memory usage.
-
-This directive is turned `on` by default.
-
-This directive was first introduced in the `v0.5.0rc19` release.
-
-[Back to TOC](#directives)
-
-rewrite_by_lua_no_postpone
---------------------------
-
-**syntax:** *rewrite_by_lua_no_postpone on|off*
-
-**default:** *rewrite_by_lua_no_postpone off*
-
-**context:** *http*
-
-Controls whether or not to disable postponing [rewrite_by_lua*](#rewrite_by_lua) directives to run at the end of the `rewrite` request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the `rewrite` phase.
-
-This directive was first introduced in the `v0.5.0rc29` release.
-
-[Back to TOC](#directives)
-
-access_by_lua_no_postpone
--------------------------
-
-**syntax:** *access_by_lua_no_postpone on|off*
-
-**default:** *access_by_lua_no_postpone off*
-
-**context:** *http*
-
-Controls whether or not to disable postponing [access_by_lua*](#access_by_lua) directives to run at the end of the `access` request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the `access` phase.
-
-This directive was first introduced in the `v0.9.20` release.
-
-[Back to TOC](#directives)
-
-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](#ngxheaderheader) API to hypens (`-`).
-
-This directive was first introduced in the `v0.5.0rc32` release.
-
-[Back to TOC](#directives)
-
-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 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](#ngxon_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](#ngxreqsocket), then ngx_lua will neither stop all the running "light threads" nor call the user callback (if [ngx.on_abort](#ngxon_abort) has been called). Instead, the reading operation on [ngx.req.socket](#ngxreqsocket) 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://nginx.org/en/docs/http/ngx_http_core_module.html#listen) directive in your `nginx.conf` file like this:
-
-```nginx
-
- 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](#ngxon_abort).
-
-[Back to TOC](#directives)
-
-lua_max_pending_timers
-----------------------
-
-**syntax:** *lua_max_pending_timers &lt;count&gt;*
-
-**default:** *lua_max_pending_timers 1024*
-
-**context:** *http*
-
-Controls the maximum number of pending timers allowed.
-
-Pending timers are those timers that have not expired yet.
-
-When exceeding this limit, the [ngx.timer.at](#ngxtimerat) call will immediately return `nil` and the error string "too many pending timers".
-
-This directive was first introduced in the `v0.8.0` release.
-
-[Back to TOC](#directives)
-
-lua_max_running_timers
-----------------------
-
-**syntax:** *lua_max_running_timers &lt;count&gt;*
-
-**default:** *lua_max_running_timers 256*
-
-**context:** *http*
-
-Controls the maximum number of "running timers" allowed.
-
-Running timers are those timers whose user callback functions are still running.
-
-When exceeding this limit, Nginx will stop running the callbacks of newly expired timers and log an error message "N lua_max_running_timers are not enough" where "N" is the current value of this directive.
-
-This directive was first introduced in the `v0.8.0` release.
-
-[Back to TOC](#directives)
-
-Nginx API for Lua
-=================
-
-* [Introduction](#introduction)
-* [ngx.arg](#ngxarg)
-* [ngx.var.VARIABLE](#ngxvarvariable)
-* [Core constants](#core-constants)
-* [HTTP method constants](#http-method-constants)
-* [HTTP status constants](#http-status-constants)
-* [Nginx log level constants](#nginx-log-level-constants)
-* [print](#print)
-* [ngx.ctx](#ngxctx)
-* [ngx.location.capture](#ngxlocationcapture)
-* [ngx.location.capture_multi](#ngxlocationcapture_multi)
-* [ngx.status](#ngxstatus)
-* [ngx.header.HEADER](#ngxheaderheader)
-* [ngx.resp.get_headers](#ngxrespget_headers)
-* [ngx.req.is_internal](#ngxreqis_internal)
-* [ngx.req.start_time](#ngxreqstart_time)
-* [ngx.req.http_version](#ngxreqhttp_version)
-* [ngx.req.raw_header](#ngxreqraw_header)
-* [ngx.req.get_method](#ngxreqget_method)
-* [ngx.req.set_method](#ngxreqset_method)
-* [ngx.req.set_uri](#ngxreqset_uri)
-* [ngx.req.set_uri_args](#ngxreqset_uri_args)
-* [ngx.req.get_uri_args](#ngxreqget_uri_args)
-* [ngx.req.get_post_args](#ngxreqget_post_args)
-* [ngx.req.get_headers](#ngxreqget_headers)
-* [ngx.req.set_header](#ngxreqset_header)
-* [ngx.req.clear_header](#ngxreqclear_header)
-* [ngx.req.read_body](#ngxreqread_body)
-* [ngx.req.discard_body](#ngxreqdiscard_body)
-* [ngx.req.get_body_data](#ngxreqget_body_data)
-* [ngx.req.get_body_file](#ngxreqget_body_file)
-* [ngx.req.set_body_data](#ngxreqset_body_data)
-* [ngx.req.set_body_file](#ngxreqset_body_file)
-* [ngx.req.init_body](#ngxreqinit_body)
-* [ngx.req.append_body](#ngxreqappend_body)
-* [ngx.req.finish_body](#ngxreqfinish_body)
-* [ngx.req.socket](#ngxreqsocket)
-* [ngx.exec](#ngxexec)
-* [ngx.redirect](#ngxredirect)
-* [ngx.send_headers](#ngxsend_headers)
-* [ngx.headers_sent](#ngxheaders_sent)
-* [ngx.print](#ngxprint)
-* [ngx.say](#ngxsay)
-* [ngx.log](#ngxlog)
-* [ngx.flush](#ngxflush)
-* [ngx.exit](#ngxexit)
-* [ngx.eof](#ngxeof)
-* [ngx.sleep](#ngxsleep)
-* [ngx.escape_uri](#ngxescape_uri)
-* [ngx.unescape_uri](#ngxunescape_uri)
-* [ngx.encode_args](#ngxencode_args)
-* [ngx.decode_args](#ngxdecode_args)
-* [ngx.encode_base64](#ngxencode_base64)
-* [ngx.decode_base64](#ngxdecode_base64)
-* [ngx.crc32_short](#ngxcrc32_short)
-* [ngx.crc32_long](#ngxcrc32_long)
-* [ngx.hmac_sha1](#ngxhmac_sha1)
-* [ngx.md5](#ngxmd5)
-* [ngx.md5_bin](#ngxmd5_bin)
-* [ngx.sha1_bin](#ngxsha1_bin)
-* [ngx.quote_sql_str](#ngxquote_sql_str)
-* [ngx.today](#ngxtoday)
-* [ngx.time](#ngxtime)
-* [ngx.now](#ngxnow)
-* [ngx.update_time](#ngxupdate_time)
-* [ngx.localtime](#ngxlocaltime)
-* [ngx.utctime](#ngxutctime)
-* [ngx.cookie_time](#ngxcookie_time)
-* [ngx.http_time](#ngxhttp_time)
-* [ngx.parse_http_time](#ngxparse_http_time)
-* [ngx.is_subrequest](#ngxis_subrequest)
-* [ngx.re.match](#ngxrematch)
-* [ngx.re.find](#ngxrefind)
-* [ngx.re.gmatch](#ngxregmatch)
-* [ngx.re.sub](#ngxresub)
-* [ngx.re.gsub](#ngxregsub)
-* [ngx.shared.DICT](#ngxshareddict)
-* [ngx.shared.DICT.get](#ngxshareddictget)
-* [ngx.shared.DICT.get_stale](#ngxshareddictget_stale)
-* [ngx.shared.DICT.set](#ngxshareddictset)
-* [ngx.shared.DICT.safe_set](#ngxshareddictsafe_set)
-* [ngx.shared.DICT.add](#ngxshareddictadd)
-* [ngx.shared.DICT.safe_add](#ngxshareddictsafe_add)
-* [ngx.shared.DICT.replace](#ngxshareddictreplace)
-* [ngx.shared.DICT.delete](#ngxshareddictdelete)
-* [ngx.shared.DICT.incr](#ngxshareddictincr)
-* [ngx.shared.DICT.lpush](#ngxshareddictlpush)
-* [ngx.shared.DICT.rpush](#ngxshareddictrpush)
-* [ngx.shared.DICT.lpop](#ngxshareddictlpop)
-* [ngx.shared.DICT.rpop](#ngxshareddictrpop)
-* [ngx.shared.DICT.llen](#ngxshareddictllen)
-* [ngx.shared.DICT.ttl](#ngxshareddictttl)
-* [ngx.shared.DICT.expire](#ngxshareddictexpire)
-* [ngx.shared.DICT.flush_all](#ngxshareddictflush_all)
-* [ngx.shared.DICT.flush_expired](#ngxshareddictflush_expired)
-* [ngx.shared.DICT.get_keys](#ngxshareddictget_keys)
-* [ngx.shared.DICT.capacity](#ngxshareddictcapacity)
-* [ngx.shared.DICT.free_space](#ngxshareddictfree_space)
-* [ngx.socket.udp](#ngxsocketudp)
-* [udpsock:setpeername](#udpsocksetpeername)
-* [udpsock:send](#udpsocksend)
-* [udpsock:receive](#udpsockreceive)
-* [udpsock:close](#udpsockclose)
-* [udpsock:settimeout](#udpsocksettimeout)
-* [ngx.socket.stream](#ngxsocketstream)
-* [ngx.socket.tcp](#ngxsockettcp)
-* [tcpsock:connect](#tcpsockconnect)
-* [tcpsock:sslhandshake](#tcpsocksslhandshake)
-* [tcpsock:send](#tcpsocksend)
-* [tcpsock:receive](#tcpsockreceive)
-* [tcpsock:receiveuntil](#tcpsockreceiveuntil)
-* [tcpsock:close](#tcpsockclose)
-* [tcpsock:settimeout](#tcpsocksettimeout)
-* [tcpsock:settimeouts](#tcpsocksettimeouts)
-* [tcpsock:setoption](#tcpsocksetoption)
-* [tcpsock:setkeepalive](#tcpsocksetkeepalive)
-* [tcpsock:getreusedtimes](#tcpsockgetreusedtimes)
-* [ngx.socket.connect](#ngxsocketconnect)
-* [ngx.get_phase](#ngxget_phase)
-* [ngx.thread.spawn](#ngxthreadspawn)
-* [ngx.thread.wait](#ngxthreadwait)
-* [ngx.thread.kill](#ngxthreadkill)
-* [ngx.on_abort](#ngxon_abort)
-* [ngx.timer.at](#ngxtimerat)
-* [ngx.timer.every](#ngxtimerevery)
-* [ngx.timer.running_count](#ngxtimerrunning_count)
-* [ngx.timer.pending_count](#ngxtimerpending_count)
-* [ngx.config.subsystem](#ngxconfigsubsystem)
-* [ngx.config.debug](#ngxconfigdebug)
-* [ngx.config.prefix](#ngxconfigprefix)
-* [ngx.config.nginx_version](#ngxconfignginx_version)
-* [ngx.config.nginx_configure](#ngxconfignginx_configure)
-* [ngx.config.ngx_lua_version](#ngxconfigngx_lua_version)
-* [ngx.worker.exiting](#ngxworkerexiting)
-* [ngx.worker.pid](#ngxworkerpid)
-* [ngx.worker.count](#ngxworkercount)
-* [ngx.worker.id](#ngxworkerid)
-* [ngx.semaphore](#ngxsemaphore)
-* [ngx.balancer](#ngxbalancer)
-* [ngx.ssl](#ngxssl)
-* [ngx.ocsp](#ngxocsp)
-* [ndk.set_var.DIRECTIVE](#ndkset_vardirective)
-* [coroutine.create](#coroutinecreate)
-* [coroutine.resume](#coroutineresume)
-* [coroutine.yield](#coroutineyield)
-* [coroutine.wrap](#coroutinewrap)
-* [coroutine.running](#coroutinerunning)
-* [coroutine.status](#coroutinestatus)
-
-
-[Back to TOC](#table-of-contents)
-
-Introduction
-------------
-The various `*_by_lua`, `*_by_lua_block` 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 packages can be introduced into external Lua modules like this:
-
-```lua
-
- local say = ngx.say
-
- local _M = {}
-
- function _M.foo(a)
-     say(a)
- end
-
- return _M
-```
-
-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:
-
-```lua
-
- local ngx = require "ngx"
- local ndk = require "ndk"
-```
-
-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](#ngxlocationcapture) method and similar) is strongly recommended for maximum performance.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.arg
--------
-**syntax:** *val = ngx.arg\[index\]*
-
-**context:** *set_by_lua&#42;, body_filter_by_lua&#42;*
-
-When this is used in the context of the [set_by_lua*](#set_by_lua) directives, this table is read-only and holds the input arguments to the config directives:
-
-```lua
-
- value = ngx.arg[n]
-```
-
-Here is an example
-
-```nginx
-
- location /foo {
-     set $a 32;
-     set $b 56;
-
-     set_by_lua $sum
-         'return tonumber(ngx.arg[1]) + tonumber(ngx.arg[2])'
-         $a $b;
-
-     echo $sum;
- }
-```
-
-that writes out `88`, the sum of `32` and `56`.
-
-When this table is used in the context of [body_filter_by_lua*](#body_filter_by_lua), 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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.var.VARIABLE
-----------------
-**syntax:** *ngx.var.VAR_NAME*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
-
-Read and write Nginx variable values.
-
-```nginx
-
- value = ngx.var.some_nginx_variable_name
- ngx.var.some_nginx_variable_name = value
-```
-
-Note that only already defined nginx variables can be written to.
-For example:
-
-```nginx
-
- location /foo {
-     set $my_var ''; # this line is required to create $my_var at config time
-     content_by_lua_block {
-         ngx.var.my_var = 123;
-         ...
-     }
- }
-```
-
-That is, nginx variables cannot be created on-the-fly.
-
-Some special nginx variables like `$args` and `$limit_rate` can be assigned a value,
-many others are not, like `$query_string`, `$arg_PARAMETER`, and `$http_NAME`.
-
-Nginx regex group capturing variables `$1`, `$2`, `$3`, and etc, can be read by this
-interface as well, by writing `ngx.var[1]`, `ngx.var[2]`, `ngx.var[3]`, and etc.
-
-Setting `ngx.var.Foo` to a `nil` value will unset the `$Foo` Nginx variable.
-
-```lua
-
- ngx.var.args = nil
-```
-
-**CAUTION** 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,
-
-```lua
-
- local val = ngx.var.some_var
- --- use the val repeatedly later
-```
-
-to prevent (temporary) memory leaking within the current request's lifetime. Another way of caching the result is to use the [ngx.ctx](#ngxctx) table.
-
-Undefined NGINX variables are evaluated to `nil` while uninitialized (but defined) NGINX variables are evaluated to an empty Lua string.
-
-This API requires a relatively expensive metamethod call and it is recommended to avoid using it on hot code paths.
-
-[Back to TOC](#nginx-api-for-lua)
-
-Core constants
---------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, &#42;log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-```lua
-
-   ngx.OK (0)
-   ngx.ERROR (-1)
-   ngx.AGAIN (-2)
-   ngx.DONE (-4)
-   ngx.DECLINED (-5)
-```
-
-Note that only three of these constants are utilized by the [Nginx API for Lua](#nginx-api-for-lua) (i.e., [ngx.exit](#ngxexit) accepts `ngx.OK`, `ngx.ERROR`, and `ngx.DECLINED` as input).
-
-```lua
-
-   ngx.null
-```
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-HTTP method constants
----------------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-
-      ngx.HTTP_GET
-      ngx.HTTP_HEAD
-      ngx.HTTP_PUT
-      ngx.HTTP_POST
-      ngx.HTTP_DELETE
-      ngx.HTTP_OPTIONS   (added in the v0.5.0rc24 release)
-      ngx.HTTP_MKCOL     (added in the v0.8.2 release)
-      ngx.HTTP_COPY      (added in the v0.8.2 release)
-      ngx.HTTP_MOVE      (added in the v0.8.2 release)
-      ngx.HTTP_PROPFIND  (added in the v0.8.2 release)
-      ngx.HTTP_PROPPATCH (added in the v0.8.2 release)
-      ngx.HTTP_LOCK      (added in the v0.8.2 release)
-      ngx.HTTP_UNLOCK    (added in the v0.8.2 release)
-      ngx.HTTP_PATCH     (added in the v0.8.2 release)
-      ngx.HTTP_TRACE     (added in the v0.8.2 release)
-
-
-These constants are usually used in [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi) method calls.
-
-[Back to TOC](#nginx-api-for-lua)
-
-HTTP status constants
----------------------
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-```nginx
-
-   value = ngx.HTTP_CONTINUE (100) (first added in the v0.9.20 release)
-   value = ngx.HTTP_SWITCHING_PROTOCOLS (101) (first added in the v0.9.20 release)
-   value = ngx.HTTP_OK (200)
-   value = ngx.HTTP_CREATED (201)
-   value = ngx.HTTP_ACCEPTED (202) (first added in the v0.9.20 release)
-   value = ngx.HTTP_NO_CONTENT (204) (first added in the v0.9.20 release)
-   value = ngx.HTTP_PARTIAL_CONTENT (206) (first added in the v0.9.20 release)
-   value = ngx.HTTP_SPECIAL_RESPONSE (300)
-   value = ngx.HTTP_MOVED_PERMANENTLY (301)
-   value = ngx.HTTP_MOVED_TEMPORARILY (302)
-   value = ngx.HTTP_SEE_OTHER (303)
-   value = ngx.HTTP_NOT_MODIFIED (304)
-   value = ngx.HTTP_TEMPORARY_REDIRECT (307) (first added in the v0.9.20 release)
-   value = ngx.HTTP_PERMANENT_REDIRECT (308)
-   value = ngx.HTTP_BAD_REQUEST (400)
-   value = ngx.HTTP_UNAUTHORIZED (401)
-   value = ngx.HTTP_PAYMENT_REQUIRED (402) (first added in the v0.9.20 release)
-   value = ngx.HTTP_FORBIDDEN (403)
-   value = ngx.HTTP_NOT_FOUND (404)
-   value = ngx.HTTP_NOT_ALLOWED (405)
-   value = ngx.HTTP_NOT_ACCEPTABLE (406) (first added in the v0.9.20 release)
-   value = ngx.HTTP_REQUEST_TIMEOUT (408) (first added in the v0.9.20 release)
-   value = ngx.HTTP_CONFLICT (409) (first added in the v0.9.20 release)
-   value = ngx.HTTP_GONE (410)
-   value = ngx.HTTP_UPGRADE_REQUIRED (426) (first added in the v0.9.20 release)
-   value = ngx.HTTP_TOO_MANY_REQUESTS (429) (first added in the v0.9.20 release)
-   value = ngx.HTTP_CLOSE (444) (first added in the v0.9.20 release)
-   value = ngx.HTTP_ILLEGAL (451) (first added in the v0.9.20 release)
-   value = ngx.HTTP_INTERNAL_SERVER_ERROR (500)
-   value = ngx.HTTP_METHOD_NOT_IMPLEMENTED (501)
-   value = ngx.HTTP_BAD_GATEWAY (502) (first added in the v0.9.20 release)
-   value = ngx.HTTP_SERVICE_UNAVAILABLE (503)
-   value = ngx.HTTP_GATEWAY_TIMEOUT (504) (first added in the v0.3.1rc38 release)
-   value = ngx.HTTP_VERSION_NOT_SUPPORTED (505) (first added in the v0.9.20 release)
-   value = ngx.HTTP_INSUFFICIENT_STORAGE (507) (first added in the v0.9.20 release)
-```
-
-[Back to TOC](#nginx-api-for-lua)
-
-Nginx log level constants
--------------------------
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-```lua
-
-   ngx.STDERR
-   ngx.EMERG
-   ngx.ALERT
-   ngx.CRIT
-   ngx.ERR
-   ngx.WARN
-   ngx.NOTICE
-   ngx.INFO
-   ngx.DEBUG
-```
-
-These constants are usually used by the [ngx.log](#ngxlog) method.
-
-[Back to TOC](#nginx-api-for-lua)
-
-print
------
-**syntax:** *print(...)*
-
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Writes argument values into the nginx `error.log` file with the `ngx.NOTICE` log level.
-
-It is equivalent to
-
-```lua
-
- ngx.log(ngx.NOTICE, ...)
-```
-
-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 `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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.ctx
--------
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;*
-
-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).
-
-Consider the following example,
-
-```nginx
-
- location /test {
-     rewrite_by_lua_block {
-         ngx.ctx.foo = 76
-     }
-     access_by_lua_block {
-         ngx.ctx.foo = ngx.ctx.foo + 3
-     }
-     content_by_lua_block {
-         ngx.say(ngx.ctx.foo)
-     }
- }
-```
-
-Then `GET /test` will yield the output
-
-```bash
-
- 79
-```
-
-That is, the `ngx.ctx.foo` entry persists across the rewrite, access, and content phases of a request.
-
-Every request, including subrequests, has its own copy of the table. For example:
-
-```nginx
-
- location /sub {
-     content_by_lua_block {
-         ngx.say("sub pre: ", ngx.ctx.blah)
-         ngx.ctx.blah = 32
-         ngx.say("sub post: ", ngx.ctx.blah)
-     }
- }
-
- location /main {
-     content_by_lua_block {
-         ngx.ctx.blah = 73
-         ngx.say("main pre: ", ngx.ctx.blah)
-         local res = ngx.location.capture("/sub")
-         ngx.print(res.body)
-         ngx.say("main post: ", ngx.ctx.blah)
-     }
- }
-```
-
-Then `GET /main` will give the output
-
-```bash
-
- main pre: 73
- sub pre: nil
- sub post: 32
- main post: 73
-```
-
-Here, modification of the `ngx.ctx.blah` entry in the subrequest does not affect the one in the parent request. This is because they have two separate versions of `ngx.ctx.blah`.
-
-Internal redirection will destroy the original request `ngx.ctx` data (if any) and the new request will have an empty `ngx.ctx` table. For instance,
-
-```nginx
-
- location /new {
-     content_by_lua_block {
-         ngx.say(ngx.ctx.foo)
-     }
- }
-
- location /orig {
-     content_by_lua_block {
-         ngx.ctx.foo = "hello"
-         ngx.exec("/new")
-     }
- }
-```
-
-Then `GET /orig` will give
-
-```bash
-
- nil
-```
-
-rather than the original `"hello"` value.
-
-Arbitrary data values, including Lua closures and nested tables, can be inserted into this "magic" table. It also allows the registration of custom meta methods.
-
-Overriding `ngx.ctx` with a new Lua table is also supported, for example,
-
-```lua
-
- ngx.ctx = { foo = 32, bar = 54 }
-```
-
-When being used in the context of [init_worker_by_lua*](#init_worker_by_lua), this table just has the same lifetime of the current Lua handler.
-
-The `ngx.ctx` lookup requires relatively expensive metamethod calls and it is much slower than explicitly passing per-request data along by your own function arguments. So do not abuse this API for saving your own function arguments because it usually has quite some performance impact.
-
-Because of the metamethod magic, never "local" the `ngx.ctx` table outside your Lua function scope on the Lua module level due to [worker-level data sharing](#data-sharing-within-an-nginx-worker). For example, the following is bad:
-
-```lua
-
- -- mymodule.lua
- local _M = {}
-
- -- the following line is bad since ngx.ctx is a per-request
- -- data while this <code>ctx</code> variable is on the Lua module level
- -- and thus is per-nginx-worker.
- local ctx = ngx.ctx
-
- function _M.main()
-     ctx.foo = "bar"
- end
-
- return _M
-```
-
-Use the following instead:
-
-```lua
-
- -- mymodule.lua
- local _M = {}
-
- function _M.main(ctx)
-     ctx.foo = "bar"
- end
-
- return _M
-```
-
-That is, let the caller pass the `ctx` table explicitly via a function argument.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.location.capture
---------------------
-**syntax:** *res = ngx.location.capture(uri, options?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Issues 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.
-
-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.
-
-Subrequests are completely different from HTTP 301/302 redirection (via [ngx.redirect](#ngxredirect)) and internal redirection (via [ngx.exec](#ngxexec)).
-
-You should always read the request body (by either calling [ngx.req.read_body](#ngxreqread_body) or configuring [lua_need_request_body](#lua_need_request_body) on) before initiating a subrequest.
-
-This API function (as well as [ngx.location.capture_multi](#ngxlocationcapture_multi)) always buffers the whole response body of the subrequest in memory. Thus, you should use [cosockets](#ngxsockettcp)
-and streaming processing instead if you have to handle large subrequest responses.
-
-Here is a basic example:
-
-```lua
-
- res = ngx.location.capture(uri)
-```
-
-Returns a Lua table with 4 slots: `res.status`, `res.header`, `res.body`, and `res.truncated`.
-
-`res.status` holds the response status code for the subrequest response.
-
-`res.header` holds all the response headers of the
-subrequest and it is a normal Lua table. For multi-value response headers,
-the value is a Lua (array) table that holds all the values in the order that
-they appear. For instance, if the subrequest response headers contain the following
-lines:
-
-```bash
-
- Set-Cookie: a=3
- Set-Cookie: foo=bar
- Set-Cookie: baz=blah
-```
-
-Then `res.header["Set-Cookie"]` will be evaluated to the table value
-`{"a=3", "foo=bar", "baz=blah"}`.
-
-`res.body` holds the subrequest's response body data, which might be truncated. You always need to check the `res.truncated` boolean flag to see if `res.body` contains truncated data. The data truncation here can only be caused by those unrecoverable errors in your subrequests like the cases that the remote end aborts the connection prematurely in the middle of the response body data stream or a read timeout happens when your subrequest is receiving the response body data from the remote.
-
-URI query strings can be concatenated to URI itself, for instance,
-
-```lua
-
- res = ngx.location.capture('/foo/bar?a=3&b=4')
-```
-
-Named locations like `@foo` are not allowed due to a limitation in
-the nginx core. Use normal locations combined with the `internal` directive to
-prepare internal-only locations.
-
-An optional option table can be fed as the second
-argument, which supports the options:
-
-* `method`
-	specify the subrequest's request method, which only accepts constants like `ngx.HTTP_POST`.
-* `body`
-	specify the subrequest's request body (string value only).
-* `args`
-	specify the subrequest's URI query arguments (both string value and Lua tables are accepted)
-* `ctx`
-	specify a Lua table to be the [ngx.ctx](#ngxctx) table for the subrequest. It can be the current request's [ngx.ctx](#ngxctx) table, which effectively makes the parent and its subrequest to share exactly the same context table. This option was first introduced in the `v0.3.1rc25` release.
-* `vars`
-	take a Lua table which holds the values to set the specified Nginx variables in the subrequest as this option's value. This option was first introduced in the `v0.3.1rc31` release.
-* `copy_all_vars`
-	specify whether to copy over all the Nginx variable values of the current request to the subrequest in question. modifications of the nginx variables in the subrequest will not affect the current (parent) request. This option was first introduced in the `v0.3.1rc31` release.
-* `share_all_vars`
-	specify whether to share all the Nginx variables of the subrequest with the current (parent) request. modifications of the Nginx variables in the subrequest will affect the current (parent) request. Enabling this option may lead to hard-to-debug issues due to bad side-effects and is considered bad and harmful. Only enable this option when you completely know what you are doing.
-* `always_forward_body`
-	when set to true, the current (parent) request's request body will always be forwarded to the subrequest being created if the `body` option is not specified. The request body read by either [ngx.req.read_body()](#ngxreqread_body) or [lua_need_request_body on](#lua_need_request_body) will be directly forwarded to the subrequest without copying the whole request body data when creating the subrequest (no matter the request body data is buffered in memory buffers or temporary files). By default, this option is `false` and when the `body` option is not specified, the request body of the current (parent) request is only forwarded when the subrequest takes the `PUT` or `POST` request method.
-
-Issuing a POST subrequest, for example, can be done as follows
-
-```lua
-
- res = ngx.location.capture(
-     '/foo/bar',
-     { method = ngx.HTTP_POST, body = 'hello, world' }
- )
-```
-
-See HTTP method constants methods other than POST.
-The `method` option is `ngx.HTTP_GET` by default.
-
-The `args` option can specify extra URI arguments, for instance,
-
-```lua
-
- ngx.location.capture('/foo?a=1',
-     { args = { b = 3, c = ':' } }
- )
-```
-
-is equivalent to
-
-```lua
-
- ngx.location.capture('/foo?a=1&b=3&c=%3a')
-```
-
-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](#ngxencode_args) method.
-
-The `args` option can also take plain query strings:
-
-```lua
-
- ngx.location.capture('/foo?a=1',
-     { args = 'b=3&c=%3a' } }
- )
-```
-
-This is functionally identical to the previous examples.
-
-The `share_all_vars` option controls whether to share nginx variables among the current request and its subrequests.
-If this option is set to `true`, then the current request and associated subrequests will share the same Nginx variable scope. Hence, changes to Nginx variables made by a subrequest will affect the current request.
-
-Care should be taken in using this option as variable scope sharing can have unexpected side effects. The `args`, `vars`, or `copy_all_vars` options are generally preferable instead.
-
-This option is set to `false` by default
-
-```nginx
-
- location /other {
-     set $dog "$dog world";
-     echo "$uri dog: $dog";
- }
-
- location /lua {
-     set $dog 'hello';
-     content_by_lua_block {
-         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
-
-
-    /other dog: hello world
-    /lua: hello world
-
-
-The `copy_all_vars` option provides a copy of the parent request's Nginx variables to subrequests when such subrequests are issued. Changes made to these variables by such subrequests will not affect the parent request or any other subrequests sharing the parent request's variables.
-
-```nginx
-
- location /other {
-     set $dog "$dog world";
-     echo "$uri dog: $dog";
- }
-
- location /lua {
-     set $dog 'hello';
-     content_by_lua_block {
-         res = ngx.location.capture("/other",
-             { copy_all_vars = true });
-
-         ngx.print(res.body)
-         ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-     }
- }
-```
-
-Request `GET /lua` will give the output
-
-
-    /other dog: hello world
-    /lua: hello
-
-
-Note that if both `share_all_vars` and `copy_all_vars` are set to true, then `share_all_vars` takes precedence.
-
-In addition to the two settings above, it is possible to specify
-values for variables in the subrequest using the `vars` option. These
-variables are set after the sharing or copying of variables has been
-evaluated, and provides a more efficient method of passing specific
-values to a subrequest over encoding them as URL arguments and
-unescaping them in the Nginx config file.
-
-```nginx
-
- location /other {
-     content_by_lua_block {
-         ngx.say("dog = ", ngx.var.dog)
-         ngx.say("cat = ", ngx.var.cat)
-     }
- }
-
- location /lua {
-     set $dog '';
-     set $cat '';
-     content_by_lua_block {
-         res = ngx.location.capture("/other",
-             { vars = { dog = "hello", cat = 32 }});
-
-         ngx.print(res.body)
-     }
- }
-```
-
-Accessing `/lua` will yield the output
-
-
-    dog = hello
-    cat = 32
-
-
-The `ctx` option can be used to specify a custom Lua table to serve as the [ngx.ctx](#ngxctx) table for the subrequest.
-
-```nginx
-
- location /sub {
-     content_by_lua_block {
-         ngx.ctx.foo = "bar";
-     }
- }
- location /lua {
-     content_by_lua_block {
-         local ctx = {}
-         res = ngx.location.capture("/sub", { ctx = ctx })
-
-         ngx.say(ctx.foo);
-         ngx.say(ngx.ctx.foo);
-     }
- }
-```
-
-Then request `GET /lua` gives
-
-
-    bar
-    nil
-
-
-It is also possible to use this `ctx` option to share the same [ngx.ctx](#ngxctx) table between the current (parent) request and the subrequest:
-
-```nginx
-
- location /sub {
-     content_by_lua_block {
-         ngx.ctx.foo = "bar";
-     }
- }
- location /lua {
-     content_by_lua_block {
-         res = ngx.location.capture("/sub", { ctx = ngx.ctx })
-         ngx.say(ngx.ctx.foo);
-     }
- }
-```
-
-Request `GET /lua` yields the output
-
-
-    bar
-
-
-Note that subrequests issued by [ngx.location.capture](#ngxlocationcapture) inherit all the
-request headers of the current request by default and that this may have unexpected side effects on the
-subrequest responses. For example, when using the standard `ngx_proxy` module to serve
-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://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass_request_headers) to `off` in subrequest locations.
-
-When the `body` option is not specified and the `always_forward_body` option is false (the default value), the `POST` and `PUT` subrequests will inherit the request bodies of the parent request (if any).
-
-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"
-
-
-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](#locations-configured-by-subrequest-directives-of-other-modules).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.location.capture_multi
---------------------------
-**syntax:** *res1, res2, ... = ngx.location.capture_multi({ {uri, options?}, {uri, options?}, ... })*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Just like [ngx.location.capture](#ngxlocationcapture), but supports multiple subrequests running in parallel.
-
-This function issues several parallel subrequests specified by the input table and returns their results in the same order. For example,
-
-```lua
-
- res1, res2, res3 = ngx.location.capture_multi{
-     { "/foo", { args = "a=3&b=4" } },
-     { "/bar" },
-     { "/baz", { method = ngx.HTTP_POST, body = "hello" } },
- }
-
- if res1.status == ngx.HTTP_OK then
-     ...
- end
-
- if res2.body == "BLAH" then
-     ...
- end
-```
-
-This function will not return until all the subrequests terminate.
-The total latency is the longest latency of the individual subrequests rather than the sum.
-
-Lua tables can be used for both requests and responses when the number of subrequests to be issued is not known in advance:
-
-```lua
-
- -- construct the requests table
- local reqs = {}
- table.insert(reqs, { "/mysql" })
- table.insert(reqs, { "/postgres" })
- table.insert(reqs, { "/redis" })
- table.insert(reqs, { "/memcached" })
-
- -- issue all the requests at once and wait until they all return
- local resps = { ngx.location.capture_multi(reqs) }
-
- -- loop over the responses table
- for i, resp in ipairs(resps) do
-     -- process the response table "resp"
- end
-```
-
-The [ngx.location.capture](#ngxlocationcapture) function is just a special form
-of this function. Logically speaking, the [ngx.location.capture](#ngxlocationcapture) can be implemented like this
-
-```lua
-
- ngx.location.capture =
-     function (uri, args)
-         return ngx.location.capture_multi({ {uri, args} })
-     end
-```
-
-Please also refer to restrictions on capturing locations configured by [subrequest directives of other modules](#locations-configured-by-subrequest-directives-of-other-modules).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.status
-----------
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
-
-Read and write the current request's response status. This should be called
-before sending out the response headers.
-
-```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
-
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.header.HEADER
------------------
-**syntax:** *ngx.header.HEADER = VALUE*
-
-**syntax:** *value = ngx.header.HEADER*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
-
-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](#lua_transform_underscores_in_response_headers) directive.
-
-The header names are matched case-insensitively.
-
-```lua
-
- -- equivalent to ngx.header["Content-Type"] = 'text/plain'
- ngx.header.content_type = 'text/plain';
-
- ngx.header["X-My-Header"] = 'blah blah';
-```
-
-Multi-value headers can be set this way:
-
-```lua
-
- ngx.header['Set-Cookie'] = {'a=32; path=/', 'b=4; path=/'}
-```
-
-will yield
-
-```bash
-
- Set-Cookie: a=32; path=/
- Set-Cookie: b=4; path=/
-```
-
-in the response headers.
-
-Only Lua tables are accepted (Only the last element in the table will take effect for standard headers such as `Content-Type` that only accept a single value).
-
-```lua
-
- ngx.header.content_type = {'a', 'b'}
-```
-
-is equivalent to
-
-```lua
-
- ngx.header.content_type = 'b'
-```
-
-Setting a slot to `nil` effectively removes it from the response headers:
-
-```lua
-
- ngx.header["X-My-Header"] = nil;
-```
-
-The same applies to assigning an empty table:
-
-```lua
-
- ngx.header["X-My-Header"] = {};
-```
-
-Setting `ngx.header.HEADER` after sending out response headers (either explicitly with [ngx.send_headers](#ngxsend_headers) or implicitly with [ngx.print](#ngxprint) and similar) will log an error message.
-
-Reading `ngx.header.HEADER` will return the value of the response header named `HEADER`.
-
-Underscores (`_`) in the header names will also be replaced by dashes (`-`) and the header names will be matched case-insensitively. If the response header is not present at all, `nil` will be returned.
-
-This is particularly useful in the context of [header_filter_by_lua*](#header_filter_by_lua), for example,
-
-```nginx
-
- location /test {
-     set $footer '';
-
-     proxy_pass http://some-backend;
-
-     header_filter_by_lua_block {
-         if ngx.header["X-My-Header"] == "blah" then
-             ngx.var.footer = "some value"
-         end
-     }
-
-     echo_after_body $footer;
- }
-```
-
-For multi-value headers, all of the values of header will be collected in order and returned as a Lua table. For example, response headers
-
-
-    Foo: bar
-    Foo: baz
-
-
-will result in
-
-```lua
-
- {"bar", "baz"}
-```
-
-to be returned when reading `ngx.header.Foo`.
-
-Note that `ngx.header` is not a normal Lua table and as such, it is not possible to iterate through it using the Lua `ipairs` function.
-
-For reading *request* headers, use the [ngx.req.get_headers](#ngxreqget_headers) function instead.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.resp.get_headers
---------------------
-**syntax:** *headers, err = ngx.resp.get_headers(max_headers?, raw?)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, balancer_by_lua&#42;*
-
-Returns a Lua table holding all the current response headers for the current request.
-
-```lua
-
- local h, err = ngx.resp.get_headers()
-
- if err == "truncated" then
-     -- one can choose to ignore or reject the current response here
- end
-
- for k, v in pairs(h) do
-     ...
- end
-```
-
-This function has the same signature as [ngx.req.get_headers](#ngxreqget_headers) except getting response headers instead of request headers.
-
-Note that a maximum of 100 response headers are parsed by default (including those with the same name) and that additional response headers are silently discarded to guard against potential denial of service attacks. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-This API was first introduced in the `v0.9.5` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.is_internal
--------------------
-**syntax:** *is_internal = ngx.req.is_internal()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
-
-Returns a boolean indicating whether the current request is an "internal request", i.e.,
-a request initiated from inside the current nginx server instead of from the client side.
-
-Subrequests are all internal requests and so are requests after internal redirects.
-
-This API was first introduced in the `v0.9.20` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.start_time
-------------------
-**syntax:** *secs = ngx.req.start_time()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
-
-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 [ngx_http_log_module](http://nginx.org/en/docs/http/ngx_http_log_module.html)) in pure Lua:
-
-```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](#ngxnow) and [ngx.update_time](#ngxupdate_time).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.http_version
---------------------
-**syntax:** *num = ngx.req.http_version()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;*
-
-Returns the HTTP version number for the current request as a Lua number.
-
-Current possible values are 2.0, 1.0, 1.1, and 0.9. Returns `nil` for unrecognized values.
-
-This method was first introduced in the `v0.7.17` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.raw_header
-------------------
-**syntax:** *str = ngx.req.raw_header(no_request_line?)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;*
-
-Returns the original raw HTTP protocol header received by the Nginx server.
-
-By default, the request line and trailing `CR LF` terminator will also be included. For example,
-
-```lua
-
- ngx.print(ngx.req.raw_header())
-```
-
-gives something like this:
-
-
-    GET /t HTTP/1.1
-    Host: localhost
-    Connection: close
-    Foo: bar
-
-
-
-You can specify the optional
-`no_request_line` argument as a `true` value to exclude the request line from the result. For example,
-
-```lua
-
- ngx.print(ngx.req.raw_header(true))
-```
-
-outputs something like this:
-
-
-    Host: localhost
-    Connection: close
-    Foo: bar
-
-
-
-This method was first introduced in the `v0.7.17` release.
-
-This method does not work in HTTP/2 requests yet.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.get_method
-------------------
-**syntax:** *method_name = ngx.req.get_method()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, balancer_by_lua&#42;*
-
-Retrieves the current request's request method name. Strings like `"GET"` and `"POST"` are returned instead of numerical [method constants](#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](#ngxreqset_method).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.set_method
-------------------
-**syntax:** *ngx.req.set_method(method_id)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;*
-
-Overrides the current request's request method with the `method_id` argument. Currently only numerical [method constants](#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](#ngxreqget_method).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.set_uri
----------------
-**syntax:** *ngx.req.set_uri(uri, jump?)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;*
-
-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.
-
-The optional boolean `jump` argument can trigger location rematch (or location jump) as [ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)'s [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#rewrite) directive, that is, when `jump` is `true` (default to `false`), this function will never return and it will tell Nginx to try re-searching locations with the new URI value at the later `post-rewrite` phase and jumping to the new location.
-
-Location jump will not be triggered otherwise, and only the current request's URI will be modified, which is also the default behavior. This function will return but with no returned values when the `jump` argument is `false` or absent altogether.
-
-For example, the following nginx config snippet
-
-```nginx
-
- rewrite ^ /foo last;
-```
-
-can be coded in Lua like this:
-
-```lua
-
- ngx.req.set_uri("/foo", true)
-```
-
-Similarly, Nginx config
-
-```nginx
-
- rewrite ^ /foo break;
-```
-
-can be coded in Lua as
-
-```lua
-
- ngx.req.set_uri("/foo", false)
-```
-
-or equivalently,
-
-```lua
-
- ngx.req.set_uri("/foo")
-```
-
-The `jump` argument can only be set to `true` in [rewrite_by_lua*](#rewrite_by_lua). Use of jump in other contexts is prohibited and will throw out a Lua exception.
-
-A more sophisticated example involving regex substitutions is as follows
-
-```nginx
-
- location /test {
-     rewrite_by_lua_block {
-         local uri = ngx.re.sub(ngx.var.uri, "^/test/(.*)", "/$1", "o")
-         ngx.req.set_uri(uri)
-     }
-     proxy_pass http://my_backend;
- }
-```
-
-which is functionally equivalent to
-
-```nginx
-
- location /test {
-     rewrite ^/test/(.*) /$1 break;
-     proxy_pass http://my_backend;
- }
-```
-
-Note that it is not possible to use this interface to rewrite URI arguments and that [ngx.req.set_uri_args](#ngxreqset_uri_args) should be used for this instead. For instance, Nginx config
-
-```nginx
-
- rewrite ^ /foo?a=3? last;
-```
-
-can be coded as
-
-```nginx
-
- ngx.req.set_uri_args("a=3")
- ngx.req.set_uri("/foo", true)
-```
-
-or
-
-```nginx
-
- ngx.req.set_uri_args({a = 3})
- ngx.req.set_uri("/foo", true)
-```
-
-This interface was first introduced in the `v0.3.1rc14` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.set_uri_args
---------------------
-**syntax:** *ngx.req.set_uri_args(args)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;*
-
-Rewrite the current request's URI query arguments by the `args` argument. The `args` argument can be either a Lua string, as in
-
-```lua
-
- ngx.req.set_uri_args("a=3&b=hello%20world")
-```
-
-or a Lua table holding the query arguments' key-value pairs, as in
-
-```lua
-
- ngx.req.set_uri_args({ a = 3, b = "hello world" })
-```
-
-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:
-
-```lua
-
- ngx.req.set_uri_args({ a = 3, b = {5, 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.
-
-See also [ngx.req.set_uri](#ngxreqset_uri).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.get_uri_args
---------------------
-**syntax:** *args, err = ngx.req.get_uri_args(max_args?)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, balancer_by_lua&#42;*
-
-Returns a Lua table holding all the current request URL query arguments.
-
-```nginx
-
- location = /test {
-     content_by_lua_block {
-         local args, err = ngx.req.get_uri_args()
-
-         if err == "truncated" then
-             -- one can choose to ignore or reject the current request here
-         end
-
-         for key, val in pairs(args) do
-             if type(val) == "table" then
-                 ngx.say(key, ": ", table.concat(val, ", "))
-             else
-                 ngx.say(key, ": ", val)
-             end
-         end
-     }
- }
-```
-
-Then `GET /test?foo=bar&bar=baz&bar=blah` will yield the response body
-
-```bash
-
- foo: bar
- bar: baz, blah
-```
-
-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 unescaped according to URI escaping rules. In the settings above, `GET /test?a%20b=1%61+2` will yield:
-
-```bash
-
- a b: 1a 2
-```
-
-Arguments without the `=<value>` parts are treated as boolean arguments. `GET /test?foo&bar` will yield:
-
-```bash
-
- foo: true
- bar: true
-```
-
-That is, they will take Lua boolean values `true`. However, they are different from arguments taking empty string values. `GET /test?foo=&bar=` will give something like
-
-```bash
-
- foo:
- bar:
-```
-
-Empty key arguments are discarded. `GET /test?=hello&=world` will yield an empty output for instance.
-
-Updating query arguments via the nginx variable `$args` (or `ngx.var.args` in Lua) at runtime is also supported:
-
-```lua
-
- ngx.var.args = "a=3&b=42"
- local args, err = ngx.req.get_uri_args()
-```
-
-Here the `args` table will always look like
-
-```lua
-
- {a = 3, b = 42}
-```
-
-regardless of the actual request query string.
-
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-However, the optional `max_args` function argument can be used to override this limit:
-
-```lua
-
- local args, err = ngx.req.get_uri_args(10)
- if err == "truncated" then
-     -- one can choose to ignore or reject the current request here
- end
-```
-
-This argument can be set to zero to remove the limit and to process all request arguments received:
-
-```lua
-
- local args, err = ngx.req.get_uri_args(0)
-```
-
-Removing the `max_args` cap is strongly discouraged.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.get_post_args
----------------------
-**syntax:** *args, err = ngx.req.get_post_args(max_args?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
-
-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](#ngxreqread_body) to read the request body first or turn on the [lua_need_request_body](#lua_need_request_body) directive to avoid errors.
-
-```nginx
-
- location = /test {
-     content_by_lua_block {
-         ngx.req.read_body()
-         local args, err = ngx.req.get_post_args()
-
-         if err == "truncated" then
-             -- one can choose to ignore or reject the current request here
-         end
-
-         if not args then
-             ngx.say("failed to get post args: ", err)
-             return
-         end
-         for key, val in pairs(args) do
-             if type(val) == "table" then
-                 ngx.say(key, ": ", table.concat(val, ", "))
-             else
-                 ngx.say(key, ": ", val)
-             end
-         end
-     }
- }
-```
-
-Then
-
-```bash
-
- # Post request with the body 'foo=bar&bar=baz&bar=blah'
- $ curl --data 'foo=bar&bar=baz&bar=blah' localhost/test
-```
-
-will yield the response body like
-
-```bash
-
- foo: bar
- bar: baz, blah
-```
-
-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 unescaped according to URI escaping rules.
-
-With the settings above,
-
-```bash
-
- # POST request with body 'a%20b=1%61+2'
- $ curl -d 'a%20b=1%61+2' localhost/test
-```
-
-will yield:
-
-```bash
-
- a b: 1a 2
-```
-
-Arguments without the `=<value>` parts are treated as boolean arguments. `POST /test` with the request body `foo&bar` will yield:
-
-```bash
-
- foo: true
- bar: true
-```
-
-That is, they will take Lua boolean values `true`. However, they are different from arguments taking empty string values. `POST /test` with request body `foo=&bar=` will return something like
-
-```bash
-
- foo:
- bar:
-```
-
-Empty key arguments are discarded. `POST /test` with body `=hello&=world` will yield empty outputs for instance.
-
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-However, the optional `max_args` function argument can be used to override this limit:
-
-```lua
-
- local args, err = ngx.req.get_post_args(10)
- if err == "truncated" then
-     -- one can choose to ignore or reject the current request here
- end
-```
-
-This argument can be set to zero to remove the limit and to process all request arguments received:
-
-```lua
-
- local args, err = ngx.req.get_post_args(0)
-```
-
-Removing the `max_args` cap is strongly discouraged.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.get_headers
--------------------
-**syntax:** *headers, err = ngx.req.get_headers(max_headers?, raw?)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
-
-Returns a Lua table holding all the current request headers.
-
-```lua
-
- local h, err = ngx.req.get_headers()
-
- if err == "truncated" then
-     -- one can choose to ignore or reject the current request here
- end
-
- for k, v in pairs(h) do
-     ...
- end
-```
-
-To read an individual header:
-
-```lua
-
- ngx.say("Host: ", ngx.req.get_headers()["Host"])
-```
-
-Note that the [ngx.var.HEADER](#ngxvarvariable) API call, which uses core [$http_HEADER](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_http_) variables, may be more preferable for reading individual request headers.
-
-For multiple instances of request headers such as:
-
-```bash
-
- Foo: foo
- Foo: bar
- Foo: baz
-```
-
-the value of `ngx.req.get_headers()["Foo"]` will be a Lua (array) table such as:
-
-```lua
-
- {"foo", "bar", "baz"}
-```
-
-Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-However, the optional `max_headers` function argument can be used to override this limit:
-
-```lua
-
- local headers, err = ngx.req.get_headers(10)
-
- if err == "truncated" then
-     -- one can choose to ignore or reject the current request here
- end
-```
-
-This argument can be set to zero to remove the limit and to process all request headers received:
-
-```lua
-
- local headers, err = ngx.req.get_headers(0)
-```
-
-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:
-
-```lua
-
- 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`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.set_header
-------------------
-**syntax:** *ngx.req.set_header(header_name, header_value)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;*
-
-Set the current request's request header named `header_name` to value `header_value`, overriding any existing ones.
-
-By default, all the subrequests subsequently initiated by [ngx.location.capture](#ngxlocationcapture) and [ngx.location.capture_multi](#ngxlocationcapture_multi) will inherit the new header.
-
-Here is an example of setting the `Content-Type` header:
-
-```lua
-
- ngx.req.set_header("Content-Type", "text/css")
-```
-
-The `header_value` can take an array list of values,
-for example,
-
-```lua
-
- ngx.req.set_header("Foo", {"a", "abc"})
-```
-
-will produce two new request headers:
-
-```bash
-
- Foo: a
- Foo: abc
-```
-
-and old `Foo` headers will be overridden if there is any.
-
-When the `header_value` argument is `nil`, the request header will be removed. So
-
-```lua
-
- ngx.req.set_header("X-Foo", nil)
-```
-
-is equivalent to
-
-```lua
-
- ngx.req.clear_header("X-Foo")
-```
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.clear_header
---------------------
-**syntax:** *ngx.req.clear_header(header_name)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;*
-
-Clears the current request's request header named `header_name`. None of the current request's existing subrequests will be affected but subsequently initiated subrequests will inherit the change by default.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.read_body
------------------
-**syntax:** *ngx.req.read_body()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Reads the client request body synchronously without blocking the Nginx event loop.
-
-```lua
-
- ngx.req.read_body()
- local args = ngx.req.get_post_args()
-```
-
-If the request body is already read previously by turning on [lua_need_request_body](#lua_need_request_body) or by using other modules, then this function does not run and returns immediately.
-
-If the request body has already been explicitly discarded, either by the [ngx.req.discard_body](#ngxreqdiscard_body) function or other modules, this function does not run and returns immediately.
-
-In case of errors, such as connection errors while reading the data, this method will throw out a Lua exception *or* terminate the current request with a 500 status code immediately.
-
-The request body data read using this function can be retrieved later via [ngx.req.get_body_data](#ngxreqget_body_data) or, alternatively, the temporary file name for the body data cached to disk using [ngx.req.get_body_file](#ngxreqget_body_file). This depends on
-
-1. whether the current request body is already larger than the [client_body_buffer_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_buffer_size),
-1. and whether [client_body_in_file_only](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_in_file_only) has been switched on.
-
-In cases where current request may have a request body and the request body data is not required, The [ngx.req.discard_body](#ngxreqdiscard_body) function must be used to explicitly discard the request body to avoid breaking things under HTTP 1.1 keepalive or HTTP 1.1 pipelining.
-
-This function was first introduced in the `v0.3.1rc17` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.discard_body
---------------------
-**syntax:** *ngx.req.discard_body()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Explicitly discard the request body, i.e., read the data on the connection and throw it away immediately (without using the request body by any means).
-
-This function is an asynchronous call and returns immediately.
-
-If the request body has already been read, this function does nothing and returns immediately.
-
-This function was first introduced in the `v0.3.1rc17` release.
-
-See also [ngx.req.read_body](#ngxreqread_body).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.get_body_data
----------------------
-**syntax:** *data = ngx.req.get_body_data()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, log_by_lua&#42;*
-
-Retrieves in-memory request body data. It returns a Lua string rather than a Lua table holding all the parsed query arguments. Use the [ngx.req.get_post_args](#ngxreqget_post_args) function instead if a Lua table is required.
-
-This function returns `nil` if
-
-1. the request body has not been read,
-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](#ngxreqread_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](#ngxreqget_body_file) function instead.
-
-To force in-memory request bodies, try setting [client_body_buffer_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_buffer_size) to the same size value in [client_max_body_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size).
-
-Note that calling this function instead of using `ngx.var.request_body` or `ngx.var.echo_request_body` is more efficient because it can save one dynamic memory allocation and one data copy.
-
-This function was first introduced in the `v0.3.1rc17` release.
-
-See also [ngx.req.get_body_file](#ngxreqget_body_file).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.get_body_file
----------------------
-**syntax:** *file_name = ngx.req.get_body_file()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-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 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](#ngxreqread_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](#ngxreqget_body_data) function instead.
-
-To force in-file request bodies, try turning on [client_body_in_file_only](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_in_file_only).
-
-This function was first introduced in the `v0.3.1rc17` release.
-
-See also [ngx.req.get_body_data](#ngxreqget_body_data).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.set_body_data
----------------------
-**syntax:** *ngx.req.set_body_data(data)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Set the current request's request body using the in-memory data specified by the `data` argument.
-
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
-
-This function was first introduced in the `v0.3.1rc18` release.
-
-See also [ngx.req.set_body_file](#ngxreqset_body_file).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.set_body_file
----------------------
-**syntax:** *ngx.req.set_body_file(file_name, auto_clean?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-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 removed at request completion or the next time this function or [ngx.req.set_body_data](#ngxreqset_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.
-
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
-
-This function was first introduced in the `v0.3.1rc18` release.
-
-See also [ngx.req.set_body_data](#ngxreqset_body_data).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.init_body
------------------
-**syntax:** *ngx.req.init_body(buffer_size?)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-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](#ngxreqappend_body) and [ngx.req.finish_body](#ngxreqfinish_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](#ngxreqappend_body). If the argument is omitted, then the value specified by the standard [client_body_buffer_size](http://nginx.org/en/docs/http/ngx_http_core_module.html#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](#ngxreqfinish_body) after all the data has been appended onto the current request body. Also, when this function is used together with [ngx.req.socket](#ngxreqsocket), it is required to call [ngx.req.socket](#ngxreqsocket) *before* this function, or you will get the "request body already exists" error message.
-
-The usage of this function is often like this:
-
-```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()
-```
-
-This function can be used with [ngx.req.append_body](#ngxreqappend_body), [ngx.req.finish_body](#ngxreqfinish_body), and [ngx.req.socket](#ngxreqsocket) 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
-
-This function was first introduced in the `v0.5.11` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.append_body
--------------------
-**syntax:** *ngx.req.append_body(data_chunk)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Append new data chunk specified by the `data_chunk` argument onto the existing request body created by the [ngx.req.init_body](#ngxreqinit_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](#ngxreqfinish_body) after all the data has been appended onto the current request body.
-
-This function can be used with [ngx.req.init_body](#ngxreqinit_body), [ngx.req.finish_body](#ngxreqfinish_body), and [ngx.req.socket](#ngxreqsocket) 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
-
-This function was first introduced in the `v0.5.11` release.
-
-See also [ngx.req.init_body](#ngxreqinit_body).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.finish_body
--------------------
-**syntax:** *ngx.req.finish_body()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Completes the construction process of the new request body created by the [ngx.req.init_body](#ngxreqinit_body) and [ngx.req.append_body](#ngxreqappend_body) calls.
-
-This function can be used with [ngx.req.init_body](#ngxreqinit_body), [ngx.req.append_body](#ngxreqappend_body), and [ngx.req.socket](#ngxreqsocket) 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
-
-This function was first introduced in the `v0.5.11` release.
-
-See also [ngx.req.init_body](#ngxreqinit_body).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.req.socket
---------------
-**syntax:** *tcpsock, err = ngx.req.socket()*
-
-**syntax:** *tcpsock, err = ngx.req.socket(raw)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Returns a read-only cosocket object that wraps the downstream connection. Only [receive](#tcpsockreceive) and [receiveuntil](#tcpsockreceiveuntil) methods are supported on this object.
-
-In case of error, `nil` will be returned as well as a string describing the error.
-
-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](#ngxreqread_body) and [ngx.req.discard_body](#ngxreqdiscard_body).
-
-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.
-Chunked request bodies are not yet supported in this API.
-
-Since the `v0.9.0` release, this function accepts an optional boolean `raw` argument. When this argument is `true`, this function returns a full-duplex cosocket object wrapping around the raw downstream connection socket, upon which you can call the [receive](#tcpsockreceive), [receiveuntil](#tcpsockreceiveuntil), and [send](#tcpsocksend) methods.
-
-When the `raw` argument is `true`, it is required that no pending data from any previous [ngx.say](#ngxsay), [ngx.print](#ngxprint), or [ngx.send_headers](#ngxsend_headers) calls exists. So if you have these downstream output calls previously, you should call [ngx.flush(true)](#ngxflush) before calling `ngx.req.socket(true)` to ensure that there is no pending output data. If the request body has not been read yet, then this "raw socket" can also be used to read the request body.
-
-You can use the "raw request socket" returned by `ngx.req.socket(true)` to implement fancy protocols like [WebSocket](http://en.wikipedia.org/wiki/WebSocket), or just emit your own raw HTTP response header or body data. You can refer to the [lua-resty-websocket library](https://github.com/openresty/lua-resty-websocket) for a real world example.
-
-This function was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.exec
---------
-**syntax:** *ngx.exec(uri, args?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Does an internal redirect to `uri` with `args` and is similar to the [echo_exec](http://github.com/openresty/echo-nginx-module#echo_exec) directive of the [echo-nginx-module](http://github.com/openresty/echo-nginx-module).
-
-```lua
-
- ngx.exec('/some-location');
- ngx.exec('/some-location', 'a=3&b=5&c=6');
- ngx.exec('/some-location?a=3&b=5', 'c=6');
-```
-
-The optional second `args` can be used to specify extra URI query arguments, for example:
-
-```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.
-
-```lua
-
- ngx.exec("/foo", { a = 3, b = "hello world" })
-```
-
-The result is exactly the same as the previous example.
-
-The format for the Lua table passed as the `args` argument is identical to the format used in the [ngx.encode_args](#ngxencode_args) method.
-
-Named locations are also supported but the second `args` argument will be ignored if present and the querystring for the new target is inherited from the referring location (if any).
-
-`GET /foo/file.php?a=hello` will return "hello" and not "goodbye" in the example below
-
-```nginx
-
- location /foo {
-     content_by_lua_block {
-         ngx.exec("@bar", "a=goodbye");
-     }
- }
-
- location @bar {
-     content_by_lua_block {
-         local args = ngx.req.get_uri_args()
-         for key, val in pairs(args) do
-             if key == "a" then
-                 ngx.say(val)
-             end
-         end
-     }
- }
-```
-
-Note that the `ngx.exec` method is different from [ngx.redirect](#ngxredirect) in that
-it is purely an internal redirect and that no new external HTTP traffic is involved.
-
-Also note that this method call terminates the processing of the current request and that it *must* be called before [ngx.send_headers](#ngxsend_headers) or explicit response body
-outputs by either [ngx.print](#ngxprint) or [ngx.say](#ngxsay).
-
-It is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.exec(...)` be adopted when this method call is used in contexts other than [header_filter_by_lua*](#header_filter_by_lua) to reinforce the fact that the request processing is being terminated.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.redirect
-------------
-**syntax:** *ngx.redirect(uri, status?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Issue an `HTTP 301` or `302` redirection to `uri`.
-
-The optional `status` parameter specifies the HTTP status code to be used. The following status codes are supported right now:
-
-* `301`
-* `302` (default)
-* `303`
-* `307`
-* `308`
-
-It is `302` (`ngx.HTTP_MOVED_TEMPORARILY`) by default.
-
-Here is an example assuming the current server name is `localhost` and that it is listening on port 1984:
-
-```lua
-
- return ngx.redirect("/foo")
-```
-
-which is equivalent to
-
-```lua
-
- return ngx.redirect("/foo", ngx.HTTP_MOVED_TEMPORARILY)
-```
-
-Redirecting arbitrary external URLs is also supported, for example:
-
-```lua
-
- return ngx.redirect("http://www.google.com")
-```
-
-We can also use the numerical code directly as the second `status` argument:
-
-```lua
-
- return ngx.redirect("/foo", 301)
-```
-
-This method is similar to the [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#rewrite) directive with the `redirect` modifier in the standard
-[ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html), for example, this `nginx.conf` snippet
-
-```nginx
-
- rewrite ^ /foo? redirect;  # nginx config
-```
-
-is equivalent to the following Lua code
-
-```lua
-
- return ngx.redirect('/foo');  -- Lua code
-```
-
-while
-
-```nginx
-
- rewrite ^ /foo? permanent;  # nginx config
-```
-
-is equivalent to
-
-```lua
-
- return ngx.redirect('/foo', ngx.HTTP_MOVED_PERMANENTLY)  -- Lua code
-```
-
-URI arguments can be specified as well, for example:
-
-```lua
-
- return ngx.redirect('/foo?a=3&b=4')
-```
-
-Note that this method call terminates the processing of the current request and that it *must* be called before [ngx.send_headers](#ngxsend_headers) or explicit response body
-outputs by either [ngx.print](#ngxprint) or [ngx.say](#ngxsay).
-
-It is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.redirect(...)` be adopted when this method call is used in contexts other than [header_filter_by_lua*](#header_filter_by_lua) to reinforce the fact that the request processing is being terminated.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.send_headers
-----------------
-**syntax:** *ok, err = ngx.send_headers()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Explicitly send out the response headers.
-
-Since `v0.8.3` this function returns `1` on success, or returns `nil` and a string describing the error otherwise.
-
-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](#ngxsay) or [ngx.print](#ngxprint) or when [content_by_lua*](#content_by_lua) exits normally.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.headers_sent
-----------------
-**syntax:** *value = ngx.headers_sent*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Returns `true` if the response headers have been sent (by ngx_lua), and `false` otherwise.
-
-This API was first introduced in ngx_lua v0.3.1rc6.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.print
----------
-**syntax:** *ok, err = ngx.print(...)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Emits arguments concatenated to the HTTP client (as response body). If response headers have not been sent, this function will send headers out first and then output body data.
-
-Since `v0.8.3` this function returns `1` on success, or returns `nil` and a string describing the error otherwise.
-
-Lua `nil` values will output `"nil"` strings and Lua boolean values will output `"true"` and `"false"` literal strings respectively.
-
-Nested arrays of strings are permitted and the elements in the arrays will be sent one by one:
-
-```lua
-
- local table = {
-     "hello, ",
-     {"world: ", true, " or ", false,
-         {": ", nil}}
- }
- ngx.print(table)
-```
-
-will yield the output
-
-```bash
-
- hello, world: true or false: nil
-```
-
-Non-array table arguments will cause a Lua exception to be thrown.
-
-The `ngx.null` constant will yield the `"null"` string output.
-
-This is an asynchronous call and will return immediately without waiting for all the data to be written into the system send buffer. To run in synchronous mode, call `ngx.flush(true)` after calling `ngx.print`. This can be particularly useful for streaming output. See [ngx.flush](#ngxflush) for more details.
-
-Please note that both `ngx.print` and [ngx.say](#ngxsay) will always invoke the whole Nginx output body filter chain, which is an expensive operation. So be careful when calling either of these two in a tight loop; buffer the data yourself in Lua and save the calls.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.say
--------
-**syntax:** *ok, err = ngx.say(...)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Just as [ngx.print](#ngxprint) but also emit a trailing newline.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.log
--------
-**syntax:** *ngx.log(log_level, ...)*
-
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Log arguments concatenated to error.log with the given logging level.
-
-Lua `nil` arguments are accepted and result in literal `"nil"` string while Lua booleans result in literal `"true"` or `"false"` string outputs. And the `ngx.null` constant will yield the `"null"` string output.
-
-The `log_level` argument can take constants like `ngx.ERR` and `ngx.WARN`. Check out [Nginx log level constants](#nginx-log-level-constants) for details.
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.flush
----------
-**syntax:** *ok, err = ngx.flush(wait?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-Flushes response output to the client.
-
-`ngx.flush` accepts an optional boolean `wait` argument (Default: `false`) first introduced in the `v0.3.1rc34` release. When called with the default argument, it issues an asynchronous call (Returns immediately without waiting for output data to be written into the system send buffer). Calling the function with the `wait` argument set to `true` switches to synchronous mode.
-
-In synchronous mode, the function will not return until all output data has been written into the system send buffer or until the [send_timeout](http://nginx.org/en/docs/http/ngx_http_core_module.html#send_timeout) setting has expired. Note that using the Lua coroutine mechanism means that this function does not block the Nginx event loop even in the synchronous mode.
-
-When `ngx.flush(true)` is called immediately after [ngx.print](#ngxprint) or [ngx.say](#ngxsay), it causes the latter functions to run in synchronous mode. This can be particularly useful for streaming output.
-
-Note that `ngx.flush` is not functional when in the HTTP 1.0 output buffering mode. See [HTTP 1.0 support](#http-10-support).
-
-Since `v0.8.3` this function returns `1` on success, or returns `nil` and a string describing the error otherwise.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.exit
---------
-**syntax:** *ngx.exit(status)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-When `status >= 200` (i.e., `ngx.HTTP_OK` and above), it will interrupt the execution of the current request and return status code to nginx.
-
-When `status == 0` (i.e., `ngx.OK`), it will only quit the current phase handler (or the content handler if the [content_by_lua*](#content_by_lua) directive is used) and continue to run later phases (if any) for the current request.
-
-The `status` argument can be `ngx.OK`, `ngx.ERROR`, `ngx.HTTP_NOT_FOUND`,
-`ngx.HTTP_MOVED_TEMPORARILY`, or other [HTTP status constants](#http-status-constants).
-
-To return an error page with custom contents, use code snippets like this:
-
-```lua
-
- ngx.status = ngx.HTTP_GONE
- ngx.say("This is our own content")
- -- to cause quit the whole request rather than the current phase handler
- ngx.exit(ngx.HTTP_OK)
-```
-
-The effect in action:
-
-```bash
-
- $ curl -i http://localhost/test
- HTTP/1.1 410 Gone
- Server: nginx/1.0.6
- Date: Thu, 15 Sep 2011 00:51:48 GMT
- Content-Type: text/plain
- Transfer-Encoding: chunked
- Connection: keep-alive
-
- This is our own content
-```
-
-Number literals can be used directly as the argument, for instance,
-
-```lua
-
- ngx.exit(501)
-```
-
-Note that while this method accepts all [HTTP status constants](#http-status-constants) as input, it only accepts `ngx.OK` and `ngx.ERROR` of the [core constants](#core-constants).
-
-Also note that this method call terminates the processing of the current request and that it is recommended that a coding style that combines this method call with the `return` statement, i.e., `return ngx.exit(...)` be used to reinforce the fact that the request processing is being terminated.
-
-When being used in the contexts of [header_filter_by_lua*](#header_filter_by_lua), [balancer_by_lua*](#balancer_by_lua_block), and
-[ssl_session_store_by_lua*](#ssl_session_store_by_lua_block), `ngx.exit()` is
-an asynchronous operation and will return immediately. This behavior may change in future and it is recommended that users always use `return` in combination as suggested above.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.eof
--------
-**syntax:** *ok, err = ngx.eof()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-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 well written 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:
-
-```nginx
-
- location = /async {
-     keepalive_timeout 0;
-     content_by_lua_block {
-         ngx.say("got the task!")
-         ngx.eof()  -- well written HTTP clients 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 [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) 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://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_ignore_client_abort) directive in your location block configured by [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html):
-
-```nginx
-
- proxy_ignore_client_abort on;
-```
-
-A better way to do background jobs is to use the [ngx.timer.at](#ngxtimerat) API.
-
-Since `v0.8.3` this function returns `1` on success, or returns `nil` and a string describing the error otherwise.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.sleep
----------
-**syntax:** *ngx.sleep(seconds)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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.
-
-Since the `0.7.20` release, The `0` time argument can also be specified.
-
-This method was introduced in the `0.5.0rc30` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.escape_uri
---------------
-**syntax:** *newstr = ngx.escape_uri(str)*
-
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Escape `str` as a URI component.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.unescape_uri
-----------------
-**syntax:** *newstr = ngx.unescape_uri(str)*
-
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
-
-Unescape `str` as an escaped URI component.
-
-For example,
-
-```lua
-
- ngx.say(ngx.unescape_uri("b%20r56+7"))
-```
-
-gives the output
-
-
-    b r56 7
-
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.encode_args
----------------
-**syntax:** *str = ngx.encode_args(table)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;*
-
-Encode the Lua table to a query args string according to the URI encoded rules.
-
-For example,
-
-```lua
-
- ngx.encode_args({foo = 3, ["b r"] = "hello world"})
-```
-
-yields
-
-
-    foo=3&b%20r=hello%20world
-
-
-The table keys must be Lua strings.
-
-Multi-value query args are also supported. Just use a Lua table for the argument's value, for example:
-
-```lua
-
- ngx.encode_args({baz = {32, "hello"}})
-```
-
-gives
-
-
-    baz=32&baz=hello
-
-
-If the value table is empty and the effect is equivalent to the `nil` value.
-
-Boolean argument values are also supported, for instance,
-
-```lua
-
- ngx.encode_args({a = true, b = 1})
-```
-
-yields
-
-
-    a&b=1
-
-
-If the argument value is `false`, then the effect is equivalent to the `nil` value.
-
-This method was first introduced in the `v0.3.1rc27` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.decode_args
----------------
-**syntax:** *table, err = ngx.decode_args(str, max_args?)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Decodes a URI encoded query-string into a Lua table. This is the inverse function of [ngx.encode_args](#ngxencode_args).
-
-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. Since `v0.10.13`, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-This argument can be set to zero to remove the limit and to process all request arguments received:
-
-```lua
-
- local args = ngx.decode_args(str, 0)
-```
-
-Removing the `max_args` cap is strongly discouraged.
-
-This method was introduced in the `v0.5.0rc29`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.encode_base64
------------------
-**syntax:** *newstr = ngx.encode_base64(str, no_padding?)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Encodes `str` to a base64 digest.
-
-Since the `0.9.16` release, an optional boolean-typed `no_padding` argument can be specified to control whether the base64 padding should be appended to the resulting digest (default to `false`, i.e., with padding enabled).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.decode_base64
------------------
-**syntax:** *newstr = ngx.decode_base64(str)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Decodes the `str` argument as a base64 digest to the raw form. Returns `nil` if `str` is not well formed.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.crc32_short
----------------
-**syntax:** *intval = ngx.crc32_short(str)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
-
-This method performs better on relatively short `str` inputs (i.e., less than 30 ~ 60 bytes), as compared to [ngx.crc32_long](#ngxcrc32_long). The result is exactly the same as [ngx.crc32_long](#ngxcrc32_long).
-
-Behind the scene, it is just a thin wrapper around the `ngx_crc32_short` function defined in the Nginx core.
-
-This API was first introduced in the `v0.3.1rc8` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.crc32_long
---------------
-**syntax:** *intval = ngx.crc32_long(str)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Calculates the CRC-32 (Cyclic Redundancy Code) digest for the `str` argument.
-
-This method performs better on relatively long `str` inputs (i.e., longer than 30 ~ 60 bytes), as compared to [ngx.crc32_short](#ngxcrc32_short).  The result is exactly the same as [ngx.crc32_short](#ngxcrc32_short).
-
-Behind the scene, it is just a thin wrapper around the `ngx_crc32_long` function defined in the Nginx core.
-
-This API was first introduced in the `v0.3.1rc8` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.hmac_sha1
--------------
-**syntax:** *digest = ngx.hmac_sha1(secret_key, str)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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>`.
-
-The raw binary form of the `HMAC-SHA1` digest will be generated, use [ngx.encode_base64](#ngxencode_base64), for example, to encode the result to a textual representation if desired.
-
-For example,
-
-```lua
-
- local key = "thisisverysecretstuff"
- local src = "some string we want to sign"
- local digest = ngx.hmac_sha1(key, src)
- ngx.say(ngx.encode_base64(digest))
-```
-
-yields the output
-
-
-    R/pvxzHC4NLtj7S+kXFg/NePTmk=
-
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.md5
--------
-**syntax:** *digest = ngx.md5(str)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Returns the hexadecimal representation of the MD5 digest of the `str` argument.
-
-For example,
-
-```nginx
-
- location = /md5 {
-     content_by_lua_block { ngx.say(ngx.md5("hello")) }
- }
-```
-
-yields the output
-
-
-    5d41402abc4b2a76b9719d911017c592
-
-
-See [ngx.md5_bin](#ngxmd5_bin) if the raw binary MD5 digest is required.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.md5_bin
------------
-**syntax:** *digest = ngx.md5_bin(str)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Returns the binary form of the MD5 digest of the `str` argument.
-
-See [ngx.md5](#ngxmd5) if the hexadecimal form of the MD5 digest is required.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.sha1_bin
-------------
-**syntax:** *digest = ngx.sha1_bin(str)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Returns the binary form of the SHA-1 digest of the `str` argument.
-
-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`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.quote_sql_str
------------------
-**syntax:** *quoted_value = ngx.quote_sql_str(raw_value)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Returns a quoted SQL string literal according to the MySQL quoting rules.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.today
----------
-**syntax:** *str = ngx.today()*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Returns current date (in the format `yyyy-mm-dd`) from the nginx cached time (no syscall involved unlike Lua's date library).
-
-This is the local time.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.time
---------
-**syntax:** *secs = ngx.time()*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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 can be forced by calling [ngx.update_time](#ngxupdate_time) first.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.now
--------
-**syntax:** *secs = ngx.now()*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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).
-
-You can forcibly update the Nginx time cache by calling [ngx.update_time](#ngxupdate_time) first.
-
-This API was first introduced in `v0.3.1rc32`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.update_time
----------------
-**syntax:** *ngx.update_time()*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Forcibly updates the Nginx current time cache. This call involves a syscall and thus has some overhead, so do not abuse it.
-
-This API was first introduced in `v0.3.1rc32`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.localtime
--------------
-**syntax:** *str = ngx.localtime()*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.utctime
------------
-**syntax:** *str = ngx.utctime()*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.cookie_time
----------------
-**syntax:** *str = ngx.cookie_time(sec)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Returns a formatted string can be used as the cookie expiration time. The parameter `sec` is the time stamp in seconds (like those returned from [ngx.time](#ngxtime)).
-
-```nginx
-
- ngx.say(ngx.cookie_time(1290079655))
-     -- yields "Thu, 18-Nov-10 11:27:35 GMT"
-```
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.http_time
--------------
-**syntax:** *str = ngx.http_time(sec)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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](#ngxtime)).
-
-```nginx
-
- ngx.say(ngx.http_time(1290079655))
-     -- yields "Thu, 18 Nov 2010 11:27:35 GMT"
-```
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.parse_http_time
--------------------
-**syntax:** *sec = ngx.parse_http_time(str)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Parse the http time string (as returned by [ngx.http_time](#ngxhttp_time)) into seconds. Returns the seconds or `nil` if the input string is in bad forms.
-
-```nginx
-
- local time = ngx.parse_http_time("Thu, 18 Nov 2010 11:27:35 GMT")
- if time == nil then
-     ...
- end
-```
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.is_subrequest
------------------
-**syntax:** *value = ngx.is_subrequest*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;*
-
-Returns `true` if the current request is an nginx subrequest, or `false` otherwise.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.re.match
-------------
-**syntax:** *captures, err = ngx.re.match(subject, regex, options?, ctx?, res_table?)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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 errors, like seeing a bad regular expression or exceeding the PCRE stack limit, `nil` and a string describing the error will be returned.
-
-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.
-
-```lua
-
- local m, err = ngx.re.match("hello, 1234", "[0-9]+")
- if m then
-     -- m[0] == "1234"
-
- else
-     if err then
-         ngx.log(ngx.ERR, "error: ", err)
-         return
-     end
-
-     ngx.say("match not found")
- end
-```
-
-```lua
-
- local m, err = ngx.re.match("hello, 1234", "([0-9])[0-9]+")
- -- m[0] == "1234"
- -- m[1] == "1"
-```
-
-Named captures are also supported since the `v0.7.14` release
-and are returned in the same Lua table as key-value pairs as the numbered captures.
-
-```lua
-
- local m, err = ngx.re.match("hello, 1234", "([0-9])(?<remaining>[0-9]+)")
- -- m[0] == "1234"
- -- m[1] == "1"
- -- m[2] == "234"
- -- m["remaining"] == "234"
-```
-
-Unmatched subpatterns will have `false` values in their `captures` table fields.
-
-```lua
-
- local m, err = ngx.re.match("hello, world", "(world)|(hello)|(?<named>howdy)")
- -- m[0] == "hello"
- -- m[1] == false
- -- m[2] == "hello"
- -- m[3] == false
- -- m["named"] == false
-```
-
-Specify `options` to control how the match operation will be performed. The following option characters are supported:
-
-
-    a             anchored mode (only match from the beginning)
-
-    d             enable the DFA mode (or the longest token match semantics).
-                  this requires PCRE 6.0+ or else a Lua exception will be thrown.
-                  first introduced in ngx_lua v0.3.1rc30.
-
-    D             enable duplicate named pattern support. This allows named
-                  subpattern names to be repeated, returning the captures in
-                  an array-like Lua table. for example,
-                    local m = ngx.re.match("hello, world",
-                                           "(?<named>\w+), (?<named>\w+)",
-                                           "D")
-                    -- m["named"] == {"hello", "world"}
-                  this option was first introduced in the v0.7.14 release.
-                  this option requires at least PCRE 8.12.
-
-    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.
-                  first introduced in ngx_lua v0.3.1rc30.
-
-    J             enable the PCRE Javascript compatible mode. this option was
-                  first introduced in the v0.7.14 release. this option requires
-                  at least PCRE 8.12.
-
-    m             multi-line mode (similar to Perl's /m modifier)
-
-    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)
-
-    u             UTF-8 mode. this requires PCRE to be built with
-                  the --enable-utf8 option or else a Lua exception will be thrown.
-
-    U             similar to "u" but disables PCRE's UTF-8 validity check on
-                  the subject string. first introduced in ngx_lua v0.8.1.
-
-    x             extended mode (similar to Perl's /x modifier)
-
-
-These options can be combined:
-
-```nginx
-
- local m, err = ngx.re.match("hello, world", "HEL LO", "ix")
- -- m[0] == "hello"
-```
-
-```nginx
-
- local m, err = ngx.re.match("hello, 美好生活", "HELLO, (.{2})", "iu")
- -- m[0] == "hello, 美好"
- -- m[1] == "美好"
-```
-
-The `o` option is useful for performance tuning, because the regex pattern in question will only be compiled once, cached in the worker-process level, and shared among all requests in the current Nginx worker process. The upper limit of the regex cache can be tuned via the [lua_regex_cache_max_entries](#lua_regex_cache_max_entries) directive.
-
-The optional fourth argument, `ctx`, can be a Lua table holding an optional `pos` field. When the `pos` field in the `ctx` table argument is specified, `ngx.re.match` will start matching from that offset (starting from 1). Regardless of the presence of the `pos` field in the `ctx` table, `ngx.re.match` will always set this `pos` field to the position *after* the substring matched by the whole pattern in case of a successful match. When match fails, the `ctx` table will be left intact.
-
-```lua
-
- local ctx = {}
- local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
-      -- m[0] = "1234"
-      -- ctx.pos == 5
-```
-
-```lua
-
- local ctx = { pos = 2 }
- local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
-      -- m[0] = "234"
-      -- ctx.pos == 5
-```
-
-The `ctx` table argument combined with the `a` regex modifier can be used to construct a lexer atop `ngx.re.match`.
-
-Note that, the `options` argument is not optional when the `ctx` argument is specified and that the empty Lua string (`""`) must be used as placeholder for `options` if no meaningful regex options are required.
-
-This method requires the PCRE library enabled in Nginx.  ([Known Issue With Special Escaping Sequences](#special-escaping-sequences)).
-
-To confirm that PCRE JIT is enabled, activate the Nginx debug log by adding the `--with-debug` option to Nginx or 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
-
-
-Starting from the `0.9.4` release, this function also accepts a 5th argument, `res_table`, for letting the caller supply the Lua table used to hold all the capturing results. Starting from `0.9.6`, it is the caller's responsibility to ensure this table is empty. This is very useful for recycling Lua tables and saving GC and table allocation overhead.
-
-This feature was introduced in the `v0.2.1rc11` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.re.find
------------
-**syntax:** *from, to, err = ngx.re.find(subject, regex, options?, ctx?, nth?)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Similar to [ngx.re.match](#ngxrematch) but only returns the beginning index (`from`) and end index (`to`) of the matched substring. The returned indexes are 1-based and can be fed directly into the [string.sub](http://www.lua.org/manual/5.1/manual.html#pdf-string.sub) API function to obtain the matched substring.
-
-In case of errors (like bad regexes or any PCRE runtime errors), this API function returns two `nil` values followed by a string describing the error.
-
-If no match is found, this function just returns a `nil` value.
-
-Below is an example:
-
-```lua
-
- local s = "hello, 1234"
- local from, to, err = ngx.re.find(s, "([0-9]+)", "jo")
- if from then
-     ngx.say("from: ", from)
-     ngx.say("to: ", to)
-     ngx.say("matched: ", string.sub(s, from, to))
- else
-     if err then
-         ngx.say("error: ", err)
-         return
-     end
-     ngx.say("not matched!")
- end
-```
-
-This example produces the output
-
-    from: 8
-    to: 11
-    matched: 1234
-
-Because this API function does not create new Lua strings nor new Lua tables, it is much faster than [ngx.re.match](#ngxrematch). It should be used wherever possible.
-
-Since the `0.9.3` release, an optional 5th argument, `nth`, is supported to specify which (submatch) capture's indexes to return. When `nth` is 0 (which is the default), the indexes for the whole matched substring is returned; when `nth` is 1, then the 1st submatch capture's indexes are returned; when `nth` is 2, then the 2nd submatch capture is returned, and so on. When the specified submatch does not have a match, then two `nil` values will be returned. Below is an example for this:
-
-```lua
-
- local str = "hello, 1234"
- local from, to = ngx.re.find(str, "([0-9])([0-9]+)", "jo", nil, 2)
- if from then
-     ngx.say("matched 2nd submatch: ", string.sub(str, from, to))  -- yields "234"
- end
-```
-
-This API function was first introduced in the `v0.9.2` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.re.gmatch
--------------
-**syntax:** *iterator, err = ngx.re.gmatch(subject, regex, options?)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Similar to [ngx.re.match](#ngxrematch), 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`.
-
-In case of errors, like seeing an ill-formed regular expression, `nil` and a string describing the error will be returned.
-
-Here is a small example to demonstrate its basic usage:
-
-```lua
-
- local iterator, err = ngx.re.gmatch("hello, world!", "([a-z]+)", "i")
- if not iterator then
-     ngx.log(ngx.ERR, "error: ", err)
-     return
- end
-
- local m
- m, err = iterator()    -- m[0] == m[1] == "hello"
- if err then
-     ngx.log(ngx.ERR, "error: ", err)
-     return
- end
-
- m, err = iterator()    -- m[0] == m[1] == "world"
- if err then
-     ngx.log(ngx.ERR, "error: ", err)
-     return
- end
-
- m, err = iterator()    -- m == nil
- if err then
-     ngx.log(ngx.ERR, "error: ", err)
-     return
- end
-```
-
-More often we just put it into a Lua loop:
-
-```lua
-
- local it, err = ngx.re.gmatch("hello, world!", "([a-z]+)", "i")
- if not it then
-     ngx.log(ngx.ERR, "error: ", err)
-     return
- end
-
- while true do
-     local m, err = it()
-     if err then
-         ngx.log(ngx.ERR, "error: ", err)
-         return
-     end
-
-     if not m then
-         -- no match found (any more)
-         break
-     end
-
-     -- found a match
-     ngx.say(m[0])
-     ngx.say(m[1])
- end
-```
-
-The optional `options` argument takes exactly the same semantics as the [ngx.re.match](#ngxrematch) method.
-
-The current implementation requires that the iterator returned should only be used in a single request. That is, one should *not* assign it to a variable belonging to persistent namespace like a Lua package.
-
-This method requires the PCRE library enabled in Nginx.  ([Known Issue With Special Escaping Sequences](#special-escaping-sequences)).
-
-This feature was first introduced in the `v0.2.1rc12` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.re.sub
-----------
-**syntax:** *newstr, n, err = ngx.re.sub(subject, regex, replace, options?)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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](#ngxrematch).
-
-This method returns the resulting new string as well as the number of successful substitutions. In case of failures, like syntax errors in the regular expressions or the `<replace>` string argument, it will return `nil` and a string describing the error.
-
-When the `replace` is a string, then it is treated as a special template for string replacement. For example,
-
-```lua
-
- local newstr, n, err = ngx.re.sub("hello, 1234", "([0-9])[0-9]", "[$0][$1]")
- if newstr then
-     -- newstr == "hello, [12][1]34"
-     -- n == 1
- else
-     ngx.log(ngx.ERR, "error: ", err)
-     return
- end
-```
-
-where `$0` referring to the whole substring matched by the pattern and `$1` referring to the first parenthesized capturing substring.
-
-Curly braces can also be used to disambiguate variable names from the background string literals:
-
-```lua
-
- local newstr, n, err = ngx.re.sub("hello, 1234", "[0-9]", "${0}00")
-     -- newstr == "hello, 100234"
-     -- n == 1
-```
-
-Literal dollar sign characters (`$`) in the `replace` string argument can be escaped by another dollar sign, for instance,
-
-```lua
-
- local newstr, n, err = ngx.re.sub("hello, 1234", "[0-9]", "$$")
-     -- newstr == "hello, $234"
-     -- n == 1
-```
-
-Do not use backlashes to escape dollar signs; it will not work as expected.
-
-When the `replace` argument is of type "function", then it will be invoked with the "match table" as the argument to generate the replace string literal for substitution. The "match table" fed into the `replace` function is exactly the same as the return value of [ngx.re.match](#ngxrematch). Here is an example:
-
-```lua
-
- local func = function (m)
-     return "[" .. m[0] .. "][" .. m[1] .. "]"
- end
- local newstr, n, err = ngx.re.sub("hello, 1234", "( [0-9] ) [0-9]", func, "x")
-     -- newstr == "hello, [12][1]34"
-     -- n == 1
-```
-
-The dollar sign characters in the return value of the `replace` function argument are not special at all.
-
-This method requires the PCRE library enabled in Nginx.  ([Known Issue With Special Escaping Sequences](#special-escaping-sequences)).
-
-This feature was first introduced in the `v0.2.1rc13` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.re.gsub
------------
-**syntax:** *newstr, n, err = ngx.re.gsub(subject, regex, replace, options?)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Just like [ngx.re.sub](#ngxresub), but does global substitution.
-
-Here is some examples:
-
-```lua
-
- local newstr, n, err = ngx.re.gsub("hello, world", "([a-z])[a-z]+", "[$0,$1]", "i")
- if newstr then
-     -- newstr == "[hello,h], [world,w]"
-     -- n == 2
- else
-     ngx.log(ngx.ERR, "error: ", err)
-     return
- end
-```
-
-```lua
-
- local func = function (m)
-     return "[" .. m[0] .. "," .. m[1] .. "]"
- end
- local newstr, n, err = ngx.re.gsub("hello, world", "([a-z])[a-z]+", func, "i")
-     -- newstr == "[hello,h], [world,w]"
-     -- n == 2
-```
-
-This method requires the PCRE library enabled in Nginx.  ([Known Issue With Special Escaping Sequences](#special-escaping-sequences)).
-
-This feature was first introduced in the `v0.2.1rc15` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT
----------------
-**syntax:** *dict = ngx.shared.DICT*
-
-**syntax:** *dict = ngx.shared\[name_var\]*
-
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Fetching the shm-based Lua dictionary object for the shared memory zone named `DICT` defined by the [lua_shared_dict](#lua_shared_dict) directive.
-
-Shared memory zones are always shared by all the nginx worker processes in the current nginx server instance.
-
-The resulting object `dict` has the following methods:
-
-* [get](#ngxshareddictget)
-* [get_stale](#ngxshareddictget_stale)
-* [set](#ngxshareddictset)
-* [safe_set](#ngxshareddictsafe_set)
-* [add](#ngxshareddictadd)
-* [safe_add](#ngxshareddictsafe_add)
-* [replace](#ngxshareddictreplace)
-* [delete](#ngxshareddictdelete)
-* [incr](#ngxshareddictincr)
-* [lpush](#ngxshareddictlpush)
-* [rpush](#ngxshareddictrpush)
-* [lpop](#ngxshareddictlpop)
-* [rpop](#ngxshareddictrpop)
-* [llen](#ngxshareddictllen)
-* [ttl](#ngxshareddictttl)
-* [expire](#ngxshareddictexpire)
-* [flush_all](#ngxshareddictflush_all)
-* [flush_expired](#ngxshareddictflush_expired)
-* [get_keys](#ngxshareddictget_keys)
-* [capacity](#ngxshareddictcapacity)
-* [free_space](#ngxshareddictfree_space)
-
-All these methods are *atomic* operations, that is, safe from concurrent accesses from multiple nginx worker processes for the same `lua_shared_dict` zone.
-
-Here is an example:
-
-```nginx
-
- http {
-     lua_shared_dict dogs 10m;
-     server {
-         location /set {
-             content_by_lua_block {
-                 local dogs = ngx.shared.dogs
-                 dogs:set("Jim", 8)
-                 ngx.say("STORED")
-             }
-         }
-         location /get {
-             content_by_lua_block {
-                 local dogs = ngx.shared.dogs
-                 ngx.say(dogs:get("Jim"))
-             }
-         }
-     }
- }
-```
-
-Let us test it:
-
-```bash
-
- $ curl localhost/set
- STORED
-
- $ curl localhost/get
- 8
-
- $ curl localhost/get
- 8
-```
-
-The number `8` will be consistently output when accessing `/get` regardless of how many Nginx workers there are because the `dogs` dictionary resides in the shared memory and visible to *all* of the worker processes.
-
-The shared dictionary will retain its contents through a server config reload (either by sending the `HUP` signal to the Nginx process or by using the `-s reload` command-line option).
-
-The contents in the dictionary storage will be lost, however, when the Nginx server quits.
-
-This feature was first introduced in the `v0.3.1rc22` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.get
--------------------
-**syntax:** *value, flags = ngx.shared.DICT:get(key)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Retrieving the value in the dictionary [ngx.shared.DICT](#ngxshareddict) for the key `key`. If the key does not exist or has expired, then `nil` will be returned.
-
-In case of errors, `nil` and a string describing the error will be returned.
-
-The value returned will have the original data type when they were inserted into the dictionary, for example, Lua booleans, numbers, or strings.
-
-The first argument to this method must be the dictionary object itself, for example,
-
-```lua
-
- local cats = ngx.shared.cats
- local value, flags = cats.get(cats, "Marry")
-```
-
-or use Lua's syntactic sugar for method calls:
-
-```lua
-
- local cats = ngx.shared.cats
- local value, flags = cats:get("Marry")
-```
-
-These two forms are fundamentally equivalent.
-
-If the user flags is `0` (the default), then no flags value will be returned.
-
-This feature was first introduced in the `v0.3.1rc22` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.get_stale
--------------------------
-**syntax:** *value, flags, stale = ngx.shared.DICT:get_stale(key)*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Similar to the [get](#ngxshareddictget) method but returns the value even if the key has already expired.
-
-Returns a 3rd value, `stale`, indicating whether the key has expired or not.
-
-Note that the value of an expired key is not guaranteed to be available so one should never rely on the availability of expired items.
-
-This method was first introduced in the `0.8.6` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.set
--------------------
-**syntax:** *success, err, forcible = ngx.shared.DICT:set(key, value, exptime?, flags?)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Unconditionally sets a key-value pair into the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns three values:
-
-* `success`: boolean value to indicate whether the key-value pair is stored or not.
-* `err`: textual error message, can be `"no memory"`.
-* `forcible`: a boolean value to indicate whether other valid items have been removed forcibly when out of storage in the shared memory zone.
-
-The `value` argument inserted can be Lua booleans, numbers, strings, or `nil`. Their value type will also be stored into the dictionary and the same data type can be retrieved later via the [get](#ngxshareddictget) method.
-
-The optional `exptime` argument specifies expiration time (in seconds) for the inserted key-value pair. The time resolution is `0.001` seconds. If the `exptime` takes the value `0` (which is the default), then the item will never expire.
-
-The optional `flags` argument specifies a user flags value associated with the entry to be stored. It can also be retrieved later with the value. The user flags is stored as an unsigned 32-bit integer internally. Defaults to `0`. The user flags argument was first introduced in the `v0.5.0rc2` release.
-
-When it fails to allocate memory for the current key-value item, then `set` will try removing existing items in the storage according to the Least-Recently Used (LRU) algorithm. Note that, LRU takes priority over expiration time here. If up to tens of existing items have been removed and the storage left is still insufficient (either due to the total capacity limit specified by [lua_shared_dict](#lua_shared_dict) or memory segmentation), then the `err` return value will be `no memory` and `success` will be `false`.
-
-If this method succeeds in storing the current item by forcibly removing other not-yet-expired items in the dictionary via LRU, the `forcible` return value will be `true`. If it stores the item without forcibly removing other valid items, then the return value `forcible` will be `false`.
-
-The first argument to this method must be the dictionary object itself, for example,
-
-```lua
-
- local cats = ngx.shared.cats
- local succ, err, forcible = cats.set(cats, "Marry", "it is a nice cat!")
-```
-
-or use Lua's syntactic sugar for method calls:
-
-```lua
-
- local cats = ngx.shared.cats
- local succ, err, forcible = cats:set("Marry", "it is a nice cat!")
-```
-
-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](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.safe_set
-------------------------
-**syntax:** *ok, err = ngx.shared.DICT:safe_set(key, value, exptime?, flags?)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Similar to the [set](#ngxshareddictset) method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
-
-This feature was first introduced in the `v0.7.18` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.add
--------------------
-**syntax:** *success, err, forcible = ngx.shared.DICT:add(key, value, exptime?, flags?)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Just like the [set](#ngxshareddictset) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](#ngxshareddict) if the key does *not* exist.
-
-If the `key` argument already exists in the dictionary (and not expired for sure), the `success` return value will be `false` and the `err` return value will be `"exists"`.
-
-This feature was first introduced in the `v0.3.1rc22` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.safe_add
-------------------------
-**syntax:** *ok, err = ngx.shared.DICT:safe_add(key, value, exptime?, flags?)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Similar to the [add](#ngxshareddictadd) method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
-
-This feature was first introduced in the `v0.7.18` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.replace
------------------------
-**syntax:** *success, err, forcible = ngx.shared.DICT:replace(key, value, exptime?, flags?)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Just like the [set](#ngxshareddictset) method, but only stores the key-value pair into the dictionary [ngx.shared.DICT](#ngxshareddict) if the key *does* exist.
-
-If the `key` argument does *not* exist in the dictionary (or expired already), the `success` return value will be `false` and the `err` return value will be `"not found"`.
-
-This feature was first introduced in the `v0.3.1rc22` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.delete
-----------------------
-**syntax:** *ngx.shared.DICT:delete(key)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Unconditionally removes the key-value pair from the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
-
-It is equivalent to `ngx.shared.DICT:set(key, nil)`.
-
-This feature was first introduced in the `v0.3.1rc22` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.incr
---------------------
-**syntax:** *newval, err, forcible? = ngx.shared.DICT:incr(key, value, init?, init_ttl?)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-**optional requirement:** `resty.core.shdict` or `resty.core`
-
-Increments the (numerical) value for `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict) by the step value `value`. Returns the new resulting number if the operation is successfully completed or `nil` and an error message otherwise.
-
-When the key does not exist or has already expired in the shared dictionary,
-
-1. if the `init` argument is not specified or takes the value `nil`, this method will return `nil` and the error string `"not found"`, or
-1. if the `init` argument takes a number value, this method will create a new `key` with the value `init + value`.
-
-Like the [add](#ngxshareddictadd) method, it also overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone.
-
-The optional `init_ttl` argument specifies expiration time (in seconds) of the value when it is initialized via the `init` argument. The time resolution is `0.001` seconds. If `init_ttl` takes the value `0` (which is the default), then the item will never expire. This argument cannot be provided without providing the `init` argument as well, and has no effect if the value already exists (e.g., if it was previously inserted via [set](#ngxshareddictset) or the likes).
-
-**Note:** Usage of the `init_ttl` argument requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library. Example:
-
-```lua
-
- require "resty.core"
-
- local cats = ngx.shared.cats
- local newval, err = cats:incr("black_cats", 1, 0, 0.1)
-
- print(newval) -- 1
-
- ngx.sleep(0.2)
-
- local val, err = cats:get("black_cats")
- print(val) -- nil
-```
-
-The `forcible` return value will always be `nil` when the `init` argument is not specified.
-
-If this method succeeds in storing the current item by forcibly removing other not-yet-expired items in the dictionary via LRU, the `forcible` return value will be `true`. If it stores the item without forcibly removing other valid items, then the return value `forcible` will be `false`.
-
-If the original value is not a valid Lua number in the dictionary, it will return `nil` and `"not a number"`.
-
-The `value` argument and `init` argument can be any valid Lua numbers, like negative numbers or floating-point numbers.
-
-This method was first introduced in the `v0.3.1rc22` release.
-
-The optional `init` parameter was first added in the `v0.10.6` release.
-
-The optional `init_ttl` parameter was introduced in the `v0.10.12rc2` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.lpush
----------------------
-**syntax:** *length, err = ngx.shared.DICT:lpush(key, value)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Inserts the specified (numerical or string) `value` at the head of the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns the number of elements in the list after the push operation.
-
-If `key` does not exist, it is created as an empty list before performing the push operation. When the `key` already takes a value that is not a list, it will return `nil` and `"value not a list"`.
-
-It never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return `nil` and the string "no memory".
-
-This feature was first introduced in the `v0.10.6` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.rpush
----------------------
-**syntax:** *length, err = ngx.shared.DICT:rpush(key, value)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Similar to the [lpush](#ngxshareddictlpush) method, but inserts the specified (numerical or string) `value` at the tail of the list named `key`.
-
-This feature was first introduced in the `v0.10.6` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.lpop
---------------------
-**syntax:** *val, err = ngx.shared.DICT:lpop(key)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Removes and returns the first element of the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
-
-If `key` does not exist, it will return `nil`. When the `key` already takes a value that is not a list, it will return `nil` and `"value not a list"`.
-
-This feature was first introduced in the `v0.10.6` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.rpop
---------------------
-**syntax:** *val, err = ngx.shared.DICT:rpop(key)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Removes and returns the last element of the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
-
-If `key` does not exist, it will return `nil`. When the `key` already takes a value that is not a list, it will return `nil` and `"value not a list"`.
-
-This feature was first introduced in the `v0.10.6` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.llen
---------------------
-**syntax:** *len, err = ngx.shared.DICT:llen(key)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Returns the number of elements in the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
-
-If key does not exist, it is interpreted as an empty list and 0 is returned. When the `key` already takes a value that is not a list, it will return `nil` and `"value not a list"`.
-
-This feature was first introduced in the `v0.10.6` release.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.ttl
--------------------
-**syntax:** *ttl, err = ngx.shared.DICT:ttl(key)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-**requires:** `resty.core.shdict` or `resty.core`
-
-Retrieves the remaining TTL (time-to-live in seconds) of a key-value pair in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns the TTL as a number if the operation is successfully completed or `nil` and an error message otherwise.
-
-If the key does not exist (or has already expired), this method will return `nil` and the error string `"not found"`.
-
-The TTL is originally determined by the `exptime` argument of the [set](#ngxshareddictset), [add](#ngxshareddictadd), [replace](#ngxshareddictreplace) (and the likes) methods. It has a time resolution of `0.001` seconds. A value of `0` means that the item will never expire.
-
-Example:
-
-```lua
-
- require "resty.core"
-
- local cats = ngx.shared.cats
- local succ, err = cats:set("Marry", "a nice cat", 0.5)
-
- ngx.sleep(0.2)
-
- local ttl, err = cats:ttl("Marry")
- ngx.say(ttl) -- 0.3
-```
-
-This feature was first introduced in the `v0.10.11` release.
-
-**Note:** This method requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.expire
-----------------------
-**syntax:** *success, err = ngx.shared.DICT:expire(key, exptime)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-**requires:** `resty.core.shdict` or `resty.core`
-
-Updates the `exptime` (in second) of a key-value pair in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns a boolean indicating success if the operation completes or `nil` and an error message otherwise.
-
-If the key does not exist, this method will return `nil` and the error string `"not found"`.
-
-The `exptime` argument has a resolution of `0.001` seconds. If `exptime` is `0`, then the item will never expire.
-
-Example:
-
-```lua
-
- require "resty.core"
-
- local cats = ngx.shared.cats
- local succ, err = cats:set("Marry", "a nice cat", 0.1)
-
- succ, err = cats:expire("Marry", 0.5)
-
- ngx.sleep(0.2)
-
- local val, err = cats:get("Marry")
- ngx.say(val) -- "a nice cat"
-```
-
-This feature was first introduced in the `v0.10.11` release.
-
-**Note:** This method requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.flush_all
--------------------------
-**syntax:** *ngx.shared.DICT:flush_all()*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Flushes out all the items in the dictionary. This method does not actuall free up all the memory blocks in the dictionary but just marks all the existing items as expired.
-
-This feature was first introduced in the `v0.5.0rc17` release.
-
-See also [ngx.shared.DICT.flush_expired](#ngxshareddictflush_expired) and [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.flush_expired
------------------------------
-**syntax:** *flushed = ngx.shared.DICT:flush_expired(max_count?)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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.
-
-Unlike the [flush_all](#ngxshareddictflush_all) method, this method actually free up the memory used by the expired items.
-
-This feature was first introduced in the `v0.6.3` release.
-
-See also [ngx.shared.DICT.flush_all](#ngxshareddictflush_all) and [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.get_keys
-------------------------
-**syntax:** *keys = ngx.shared.DICT:get_keys(max_count?)*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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.
-
-**CAUTION** Avoid calling this method on dictionaries with a very large number of keys as it may lock the dictionary for significant amount of time and block Nginx worker processes trying to access the dictionary.
-
-This feature was first introduced in the `v0.7.3` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.capacity
-------------------------
-**syntax:** *capacity_bytes = ngx.shared.DICT:capacity()*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-**requires:** `resty.core.shdict` or `resty.core`
-
-Retrieves the capacity in bytes for the shm-based dictionary [ngx.shared.DICT](#ngxshareddict) declared with
-the [lua_shared_dict](#lua_shared_dict) directive.
-
-Example:
-
-```lua
-
- require "resty.core.shdict"
-
- local cats = ngx.shared.cats
- local capacity_bytes = cats:capacity()
-```
-
-This feature was first introduced in the `v0.10.11` release.
-
-**Note:** This method requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
-
-This feature requires at least nginx core version `0.7.3`.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.shared.DICT.free_space
---------------------------
-**syntax:** *free_page_bytes = ngx.shared.DICT:free_space()*
-
-**context:** *init_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-**requires:** `resty.core.shdict` or `resty.core`
-
-Retrieves the free page size in bytes for the shm-based dictionary [ngx.shared.DICT](#ngxshareddict).
-
-**Note:** The memory for ngx.shared.DICT is allocated via the nginx slab allocator which has each slot for
-data size ranges like \~8, 9\~16, 17\~32, ..., 1025\~2048, 2048\~ bytes. And pages are assigned to a slot if there
-is no room in already assigned pages for the slot.
-
-So even if the return value of the `free_space` method is zero, there may be room in already assigned pages, so
-you may successfully set a new key value pair to the shared dict without getting `true` for `forcible` or
-non nil `err` from the `ngx.shared.DICT.set`.
-
-On the other hand, if already assigned pages for a slot are full and a new key value pair is added to the
-slot and there is no free page, you may get `true` for `forcible` or non nil `err` from the
-`ngx.shared.DICT.set` method.
-
-Example:
-
-```lua
-
- require "resty.core.shdict"
-
- local cats = ngx.shared.cats
- local free_page_bytes = cats:free_space()
-```
-
-This feature was first introduced in the `v0.10.11` release.
-
-**Note:** This method requires the `resty.core.shdict` or `resty.core` modules from the [lua-resty-core](https://github.com/openresty/lua-resty-core) library.
-
-This feature requires at least nginx core version `1.11.7`.
-
-See also [ngx.shared.DICT](#ngxshareddict).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.socket.udp
---------------
-**syntax:** *udpsock = ngx.socket.udp()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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](#udpsocksetpeername)
-* [send](#udpsocksend)
-* [receive](#udpsockreceive)
-* [close](#udpsockclose)
-* [settimeout](#udpsocksettimeout)
-
-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](#ngxsockettcp).
-
-[Back to TOC](#nginx-api-for-lua)
-
-udpsock:setpeername
--------------------
-**syntax:** *ok, err = udpsock:setpeername(host, port)*
-
-**syntax:** *ok, err = udpsock:setpeername("unix:/path/to/unix-domain.socket")*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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://nginx.org/en/docs/http/ngx_http_core_module.html#resolver) directive in the `nginx.conf` file like this:
-
-```nginx
-
- 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:
-
-```nginx
-
- location /test {
-     resolver 8.8.8.8;
-
-     content_by_lua_block {
-         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()
-     }
- }
-```
-
-Since the `v0.7.18` release, connecting to a datagram unix domain socket file is also possible on Linux:
-
-```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
-```
-
-assuming the datagram service is listening on the unix domain socket file `/tmp/some-datagram-service.sock` and the client socket will use the "autobind" feature on Linux.
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-udpsock:send
-------------
-**syntax:** *ok, err = udpsock:send(data)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-udpsock:receive
----------------
-**syntax:** *data, err = udpsock:receive(size?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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](#lua_socket_read_timeout) config directive and the [settimeout](#udpsocksettimeout) method. And the latter takes priority. For example:
-
-```lua
-
- sock:settimeout(1000)  -- one second timeout
- local data, err = sock:receive()
- if not data then
-     ngx.say("failed to read a packet: ", err)
-     return
- end
- ngx.say("successfully read a packet: ", data)
-```
-
-It is important here to call the [settimeout](#udpsocksettimeout) method *before* calling this method.
-
-This feature was first introduced in the `v0.5.7` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-udpsock:close
--------------
-**syntax:** *ok, err = udpsock:close()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-udpsock:settimeout
-------------------
-**syntax:** *udpsock:settimeout(time)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-Set the timeout value in milliseconds for subsequent socket operations (like [receive](#udpsockreceive)).
-
-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 `v0.5.7` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.socket.stream
------------------
-
-Just an alias to [ngx.socket.tcp](#ngxsockettcp). If the stream-typed cosocket may also connect to a unix domain
-socket, then this API name is preferred.
-
-This API function was first added to the `v0.10.1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.socket.tcp
---------------
-**syntax:** *tcpsock = ngx.socket.tcp()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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](#tcpsockconnect)
-* [sslhandshake](#tcpsocksslhandshake)
-* [send](#tcpsocksend)
-* [receive](#tcpsockreceive)
-* [close](#tcpsockclose)
-* [settimeout](#tcpsocksettimeout)
-* [settimeouts](#tcpsocksettimeouts)
-* [setoption](#tcpsocksetoption)
-* [receiveuntil](#tcpsockreceiveuntil)
-* [setkeepalive](#tcpsocksetkeepalive)
-* [getreusedtimes](#tcpsockgetreusedtimes)
-
-It is intended to be compatible with the TCP API of the [LuaSocket](http://w3.impa.br/~diego/software/luasocket/tcp.html) library but is 100% nonblocking out of the box. Also, we introduce some new APIs to provide more functionalities.
-
-The cosocket object created by this API function has exactly the same lifetime as the Lua handler creating it. So never pass the cosocket object to any other Lua handler (including ngx.timer callback functions) and never share the cosocket object between different NGINX requests.
-
-For every cosocket object's underlying connection, if you do not
-explicitly close it (via [close](#tcpsockclose)) or put it back to the connection
-pool (via [setkeepalive](#tcpsocksetkeepalive)), then it is automatically closed when one of
-the following two events happens:
-
-* the current request handler completes, or
-* the Lua cosocket object value gets collected by the Lua GC.
-
-Fatal errors in cosocket operations always automatically close the current
-connection (note that, read timeout error is the only error that is
-not fatal), and if you call [close](#tcpsockclose) on a closed connection, you will get
-the "closed" error.
-
-Starting from the `0.9.9` release, the cosocket object here is full-duplex, that is, a reader "light thread" and a writer "light thread" can operate on a single cosocket object simultaneously (both "light threads" must belong to the same Lua handler though, see reasons above). But you cannot have two "light threads" both reading (or writing or connecting) the same cosocket, otherwise you might get an error like "socket busy reading" when calling the methods of the cosocket object.
-
-This feature was first introduced in the `v0.5.0rc1` release.
-
-See also [ngx.socket.udp](#ngxsocketudp).
-
-[Back to TOC](#nginx-api-for-lua)
-
-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&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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](#ngxsocketconnect) 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 without blocking and it is required to configure the [resolver](http://nginx.org/en/docs/http/ngx_http_core_module.html#resolver) directive in the `nginx.conf` file like this:
-
-```nginx
-
- 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 TCP server:
-
-```nginx
-
- location /test {
-     resolver 8.8.8.8;
-
-     content_by_lua_block {
-         local sock = ngx.socket.tcp()
-         local ok, err = sock:connect("www.google.com", 80)
-         if not ok then
-             ngx.say("failed to connect to google: ", err)
-             return
-         end
-         ngx.say("successfully connected to google!")
-         sock:close()
-     }
- }
-```
-
-Connecting to a Unix Domain Socket file is also possible:
-
-```lua
-
- local sock = ngx.socket.tcp()
- local ok, err = sock:connect("unix:/tmp/memcached.sock")
- if not ok then
-     ngx.say("failed to connect to the memcached unix domain socket: ", err)
-     return
- end
-```
-
-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](#lua_socket_connect_timeout) config directive and the [settimeout](#tcpsocksettimeout) method. And the latter takes priority. For example:
-
-```lua
-
- local sock = ngx.socket.tcp()
- sock:settimeout(1000)  -- one second timeout
- local ok, err = sock:connect(host, port)
-```
-
-It is important here to call the [settimeout](#tcpsocksettimeout) method *before* calling this method.
-
-Calling this method on an already connected socket object will cause the original connection to be closed first.
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:sslhandshake
---------------------
-**syntax:** *session, err = tcpsock:sslhandshake(reused_session?, server_name?, ssl_verify?, send_status_req?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-Does SSL/TLS handshake on the currently established connection.
-
-The optional `reused_session` argument can take a former SSL
-session userdata returned by a previous `sslhandshake`
-call for exactly the same target. For short-lived connections, reusing SSL
-sessions can usually speed up the handshake by one order by magnitude but it
-is not so useful if the connection pool is enabled. This argument defaults to
-`nil`. If this argument takes the boolean `false` value, no SSL session
-userdata would return by this call and only a Lua boolean will be returned as
-the first return value; otherwise the current SSL session will
-always be returned as the first argument in case of successes.
-
-The optional `server_name` argument is used to specify the server
-name for the new TLS extension Server Name Indication (SNI). Use of SNI can
-make different servers share the same IP address on the server side. Also,
-when SSL verification is enabled, this `server_name` argument is
-also used to validate the server name specified in the server certificate sent from
-the remote.
-
-The optional `ssl_verify` argument takes a Lua boolean value to
-control whether to perform SSL verification. When set to `true`, the server
-certificate will be verified according to the CA certificates specified by
-the [lua_ssl_trusted_certificate](#lua_ssl_trusted_certificate) directive.
-You may also need to adjust the [lua_ssl_verify_depth](#lua_ssl_verify_depth)
-directive to control how deep we should follow along the certificate chain.
-Also, when the `ssl_verify` argument is true and the
-`server_name` argument is also specified, the latter will be used
-to validate the server name in the server certificate.
-
-The optional `send_status_req` argument takes a boolean that controls whether to send
-the OCSP status request in the SSL handshake request (which is for requesting OCSP stapling).
-
-For connections that have already done SSL/TLS handshake, this method returns
-immediately.
-
-This method was first introduced in the `v0.9.11` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:send
-------------
-**syntax:** *bytes, err = tcpsock:send(data)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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 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 [settimeout](#tcpsocksettimeout) method. And the latter takes priority. For example:
-
-```lua
-
- sock:settimeout(1000)  -- one second timeout
- local bytes, err = sock:send(request)
-```
-
-It is important here to call the [settimeout](#tcpsocksettimeout) method *before* calling this method.
-
-In case of any connection errors, this method always automatically closes the current connection.
-
-This feature was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:receive
----------------
-**syntax:** *data, err, partial = tcpsock:receive(size)*
-
-**syntax:** *data, err, partial = tcpsock:receive(pattern?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-Receives data from the connected socket according to the reading pattern or size.
-
-This method is a synchronous operation just like the [send](#tcpsocksend) method 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 and the partial data received so far.
-
-If a number-like argument is specified (including strings that look like numbers), then it is interpreted as a size. This method will not return until it reads exactly this size of data or an error occurs.
-
-If a non-number-like string argument is specified, then it is interpreted as a "pattern". The following patterns are supported:
-
-* `'*a'`: reads from the socket until the connection is closed. No end-of-line translation is performed;
-* `'*l'`: reads a line of text from the socket. The line is terminated by a `Line Feed` (LF) character (ASCII 10), optionally preceded by a `Carriage Return` (CR) character (ASCII 13). The CR and LF characters are not included in the returned line. In fact, all CR characters are ignored by the pattern.
-
-If no argument is specified, then it is assumed to be the pattern `'*l'`, that is, the line reading pattern.
-
-Timeout for the reading operation is controlled by the [lua_socket_read_timeout](#lua_socket_read_timeout) config directive and the [settimeout](#tcpsocksettimeout) method. And the latter takes priority. For example:
-
-```lua
-
- sock:settimeout(1000)  -- one second timeout
- local line, err, partial = sock:receive()
- if not line then
-     ngx.say("failed to read a line: ", err)
-     return
- end
- ngx.say("successfully read a line: ", line)
-```
-
-It is important here to call the [settimeout](#tcpsocksettimeout) method *before* calling this method.
-
-Since the `v0.8.8` release, this method no longer automatically closes the current connection when the read timeout error happens. For other connection errors, this method always automatically closes the connection.
-
-This feature was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:receiveuntil
---------------------
-**syntax:** *iterator = tcpsock:receiveuntil(pattern, options?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-This method returns an iterator Lua function that can be called to read the data stream until it sees the specified pattern or an error occurs.
-
-Here is an example for using this method to read a data stream with the boundary sequence `--abcedhb`:
-
-```lua
-
- local reader = sock:receiveuntil("\r\n--abcedhb")
- local data, err, partial = reader()
- if not data then
-     ngx.say("failed to read the data stream: ", err)
- end
- ngx.say("read the data stream: ", data)
-```
-
-When called without any argument, the iterator function returns the received data right *before* the specified pattern string in the incoming data stream. So for the example above, if the incoming data stream is `'hello, world! -agentzh\r\n--abcedhb blah blah'`, then the string `'hello, world! -agentzh'` will be returned.
-
-In case of error, the iterator function will return `nil` along with a string describing the error and the partial data bytes that have been read so far.
-
-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 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:
-
-```lua
-
- local reader = sock:receiveuntil("\r\n--abcedhb")
-
- while true do
-     local data, err, partial = reader(4)
-     if not data then
-         if err then
-             ngx.say("failed to read the data stream: ", err)
-             break
-         end
-
-         ngx.say("read done")
-         break
-     end
-     ngx.say("read chunk: [", data, "]")
- end
-```
-
-Then for the incoming data stream `'hello, world! -agentzh\r\n--abcedhb blah blah'`, we shall get the following output from the sample code above:
-
-
-    read chunk: [hell]
-    read chunk: [o, w]
-    read chunk: [orld]
-    read chunk: [! -a]
-    read chunk: [gent]
-    read chunk: [zh]
-    read done
-
-
-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](#lua_socket_read_timeout) config directive and the [settimeout](#tcpsocksettimeout) method. And the latter takes priority. For example:
-
-```lua
-
- local readline = sock:receiveuntil("\r\n")
-
- sock:settimeout(1000)  -- one second timeout
- line, err, partial = readline()
- if not line then
-     ngx.say("failed to read a line: ", err)
-     return
- end
- ngx.say("successfully read a line: ", line)
-```
-
-It is important here to call the [settimeout](#tcpsocksettimeout) method *before* calling the iterator function (note that the `receiveuntil` call is irrelevant here).
-
-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,
-
-```lua
-
- 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.
-
-Since the `v0.8.8` release, this method no longer automatically closes the current connection when the read timeout error happens. For other connection errors, this method always automatically closes the connection.
-
-This method was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:close
--------------
-**syntax:** *ok, err = tcpsock:close()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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.
-
-Note that there is no need to call this method on socket objects that have invoked the [setkeepalive](#tcpsocksetkeepalive) method because the socket object is already closed (and the current connection is saved into the built-in connection pool).
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:settimeout
-------------------
-**syntax:** *tcpsock:settimeout(time)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-Set the timeout value in milliseconds for subsequent socket operations ([connect](#tcpsockconnect), [receive](#tcpsockreceive), and iterators returned from [receiveuntil](#tcpsockreceiveuntil)).
-
-Settings done by this method takes priority over those config directives, i.e., [lua_socket_connect_timeout](#lua_socket_connect_timeout), [lua_socket_send_timeout](#lua_socket_send_timeout), and [lua_socket_read_timeout](#lua_socket_read_timeout).
-
-Note that this method does *not* affect the [lua_socket_keepalive_timeout](#lua_socket_keepalive_timeout) setting; the `timeout` argument to the [setkeepalive](#tcpsocksetkeepalive) method should be used for this purpose instead.
-
-This feature was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:settimeouts
--------------------
-**syntax:** *tcpsock:settimeouts(connect_timeout, send_timeout, read_timeout)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-Sets the connect timeout thresold, send timeout threshold, and read timeout threshold, respetively, in milliseconds, for subsequent socket
-operations ([connect](#tcpsockconnect), [send](#tcpsocksend), [receive](#tcpsockreceive), and iterators returned from [receiveuntil](#tcpsockreceiveuntil)).
-
-Settings done by this method takes priority over those config directives, i.e., [lua_socket_connect_timeout](#lua_socket_connect_timeout), [lua_socket_send_timeout](#lua_socket_send_timeout), and [lua_socket_read_timeout](#lua_socket_read_timeout).
-
-You are recommended to use [settimeouts](#tcpsocksettimeouts) instead of [settimeout](#tcpsocksettimeout).
-
-Note that this method does *not* affect the [lua_socket_keepalive_timeout](#lua_socket_keepalive_timeout) setting; the `timeout` argument to the [setkeepalive](#tcpsocksetkeepalive) method should be used for this purpose instead.
-
-This feature was first introduced in the `v0.10.7` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:setoption
------------------
-**syntax:** *tcpsock:setoption(option, value?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-This function is added for [LuaSocket](http://w3.impa.br/~diego/software/luasocket/tcp.html) API compatibility and does nothing for now. Its functionality will be implemented in future.
-
-This feature was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:setkeepalive
---------------------
-**syntax:** *ok, err = tcpsock:setkeepalive(timeout?, size?)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-Puts the current socket's connection immediately into the cosocket built-in connection pool and keep it alive until other [connect](#tcpsockconnect) 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](#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](#lua_socket_pool_size) config directive will be used.
-
-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.
-
-Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
-
-In case of success, this method returns `1`; otherwise, it returns `nil` and a string describing the error.
-
-When the system receive buffer for the current connection has unread data, then this method will return the "connection in dubious state" error message (as the second return value) because the previous session has unread data left behind for the next session and the connection is not safe to be reused.
-
-This method also makes the current cosocket object enter the "closed" state, so there is no need to manually call the [close](#tcpsockclose) method on it afterwards.
-
-This feature was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-tcpsock:getreusedtimes
-----------------------
-**syntax:** *count, err = tcpsock:getreusedtimes()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-This method returns the (successfully) reused times for the current connection. In case of error, it returns `nil` and a string describing the error.
-
-If the current connection does not come from the built-in connection pool, then this method always returns `0`, that is, the connection has never been reused (yet). If the connection comes from the connection pool, then the return value is always non-zero. So this method can also be used to determine if the current connection comes from the pool.
-
-This feature was first introduced in the `v0.5.0rc1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.socket.connect
-------------------
-**syntax:** *tcpsock, err = ngx.socket.connect(host, port)*
-
-**syntax:** *tcpsock, err = ngx.socket.connect("unix:/path/to/unix-domain.socket")*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;*
-
-This function is a shortcut for combining [ngx.socket.tcp()](#ngxsockettcp) and the [connect()](#tcpsockconnect) method call in a single operation. It is actually implemented like this:
-
-```lua
-
- local sock = ngx.socket.tcp()
- local ok, err = sock:connect(...)
- if not ok then
-     return nil, err
- end
- return sock
-```
-
-There is no way to use the [settimeout](#tcpsocksettimeout) 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 `v0.5.0rc1` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.get_phase
--------------
-**syntax:** *str = ngx.get_phase()*
-
-**context:** *init_by_lua&#42;, init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Retrieves the current running phase name. Possible return values are
-
-* `init`
-	for the context of [init_by_lua*](#init_by_lua).
-* `init_worker`
-	for the context of [init_worker_by_lua*](#init_worker_by_lua).
-* `ssl_cert`
-	for the context of [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
-* `ssl_session_fetch`
-	for the context of [ssl_session_fetch_by_lua*](#ssl_session_fetch_by_lua_block).
-* `ssl_session_store`
-	for the context of [ssl_session_store_by_lua*](#ssl_session_store_by_lua_block).
-* `set`
-	for the context of [set_by_lua*](#set_by_lua).
-* `rewrite`
-	for the context of [rewrite_by_lua*](#rewrite_by_lua).
-* `balancer`
-	for the context of [balancer_by_lua*](#balancer_by_lua_block).
-* `access`
-	for the context of [access_by_lua*](#access_by_lua).
-* `content`
-	for the context of [content_by_lua*](#content_by_lua).
-* `header_filter`
-	for the context of [header_filter_by_lua*](#header_filter_by_lua).
-* `body_filter`
-	for the context of [body_filter_by_lua*](#body_filter_by_lua).
-* `log`
-	for the context of [log_by_lua*](#log_by_lua).
-* `timer`
-	for the context of user callback functions for [ngx.timer.*](#ngxtimerat).
-
-This API was first introduced in the `v0.5.10` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.thread.spawn
-----------------
-**syntax:** *co = ngx.thread.spawn(func, arg1, arg2, ...)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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](#nginx-api-for-lua) (like [tcpsock:receive](#tcpsockreceive)).
-
-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](#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
-
-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](#ngxexit), [ngx.exec](#ngxexec), [ngx.redirect](#ngxredirect), or [ngx.req.set_uri(uri, true)](#ngxreqset_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](#ngxthreadwait) 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](#ngxexit) 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](#coroutineyield) to actively give up execution, or
-1. it is aborted by a Lua error or an invocation of [ngx.exit](#ngxexit), [ngx.exec](#ngxexec), [ngx.redirect](#ngxredirect), or [ngx.req.set_uri(uri, true)](#ngxreqset_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 coroutines created by [coroutine.create](#coroutinecreate) 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](#ngxthreadwait) 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](#ngxthreadwait).
-
-The following example demonstrates the use of coroutine.yield() in the "light thread" coroutines
-to do manual time-slicing:
-
-```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")
-```
-
-Then it will generate the output
-
-
-    0
-    1
-    f 1
-    2
-    f 2
-    3
-    f 3
-    4
-
-
-"Light threads" are mostly useful for making concurrent upstream requests in a single Nginx request handler, much like a generalized version of [ngx.location.capture_multi](#ngxlocationcapture_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 (similar to Facebook's BigPipe model):
-
-```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
-```
-
-This API was first enabled in the `v0.7.0` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.thread.wait
----------------
-**syntax:** *ok, res1, res2, ... = ngx.thread.wait(thread1, thread2, ...)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;*
-
-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](#ngxthreadspawn).
-
-The return values have exactly the same meaning as [coroutine.resume](#coroutineresume), 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](#ngxlocationcapture) to emulate [ngx.location.capture_multi](#ngxlocationcapture_multi):
-
-```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
-```
-
-Here it essentially implements the "wait all" model.
-
-And below is an example demonstrating the "wait any" model:
-
-```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)
-```
-
-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.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.thread.kill
----------------
-**syntax:** *ok, err = ngx.thread.kill(thread)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, ngx.timer.&#42;*
-
-Kills a running "light thread" created by [ngx.thread.spawn](#ngxthreadspawn). Returns a true value when successful or `nil` and a string describing the error otherwise.
-
-According to the current implementation, only the parent coroutine (or "light thread") can kill a thread. Also, a running "light thread" with pending NGINX subrequests (initiated by [ngx.location.capture](#ngxlocationcapture) for example) cannot be killed due to a limitation in the NGINX core.
-
-This API was first enabled in the `v0.9.9` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.on_abort
-------------
-**syntax:** *ok, err = ngx.on_abort(callback)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;*
-
-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](#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](#ngxthreadspawn).
-
-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](#ngxexit), for example,
-
-```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
-```
-
-When [lua_check_client_abort](#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](#lua_check_client_abort).
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.timer.at
-------------
-**syntax:** *hdl, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Creates an Nginx timer with a user callback function as well as optional user arguments.
-
-The first argument, `delay`, specifies the delay for the timer,
-in seconds. One can specify fractional seconds like `0.001` to mean 1
-millisecond here. `0` delay can also be specified, in which case the
-timer will immediately expire when the current handler yields
-execution.
-
-The second argument, `callback`, can
-be any Lua function, which will be invoked later in a background
-"light thread" after the delay specified. The user callback will be
-called automatically by the Nginx core with the arguments `premature`,
-`user_arg1`, `user_arg2`, and etc, where the `premature`
-argument takes a boolean value indicating whether it is a premature timer
-expiration or not, and `user_arg1`, `user_arg2`, and etc, are
-those (extra) user arguments specified when calling `ngx.timer.at`
-as the remaining arguments.
-
-Premature timer expiration happens when the Nginx worker process is
-trying to shut down, as in an Nginx configuration reload triggered by
-the `HUP` signal or in an Nginx server shutdown. When the Nginx worker
-is trying to shut down, one can no longer call `ngx.timer.at` to
-create new timers with nonzero delays and in that case `ngx.timer.at` will return a "conditional false" value and
-a string describing the error, that is, "process exiting".
-
-Starting from the `v0.9.3` release, it is allowed to create zero-delay timers even when the Nginx worker process starts shutting down.
-
-When a timer expires, the user Lua code in the timer callback is
-running in a "light thread" detached completely from the original
-request creating the timer. So objects with the same lifetime as the
-request creating them, like [cosockets](#ngxsockettcp), cannot be shared between the
-original request and the timer user callback function.
-
-Here is a simple example:
-
-```nginx
-
- location / {
-     ...
-     log_by_lua_block {
-         local function push_data(premature, uri, args, status)
-             -- push the data uri, args, and status to the remote
-             -- via ngx.socket.tcp or ngx.socket.udp
-             -- (one may want to buffer the data in Lua a bit to
-             -- save I/O operations)
-         end
-         local ok, err = ngx.timer.at(0, push_data,
-                                      ngx.var.uri, ngx.var.args, ngx.header.status)
-         if not ok then
-             ngx.log(ngx.ERR, "failed to create timer: ", err)
-             return
-         end
-     }
- }
-```
-
-One can also create infinite re-occurring timers, for instance, a timer getting triggered every `5` seconds, by calling `ngx.timer.at` recursively in the timer callback function. Here is such an example,
-
-```lua
-
- local delay = 5
- local handler
- handler = function (premature)
-     -- do some routine job in Lua just like a cron job
-     if premature then
-         return
-     end
-     local ok, err = ngx.timer.at(delay, handler)
-     if not ok then
-         ngx.log(ngx.ERR, "failed to create the timer: ", err)
-         return
-     end
- end
-
- local ok, err = ngx.timer.at(delay, handler)
- if not ok then
-     ngx.log(ngx.ERR, "failed to create the timer: ", err)
-     return
- end
-```
-
-It is recommended, however, to use the [ngx.timer.every](#ngxtimerevery) API function
-instead for creating recurring timers since it is more robust.
-
-Because timer callbacks run in the background and their running time
-will not add to any client request's response time, they can easily
-accumulate in the server and exhaust system resources due to either
-Lua programming mistakes or just too much client traffic. To prevent
-extreme consequences like crashing the Nginx server, there are
-built-in limitations on both the number of "pending timers" and the
-number of "running timers" in an Nginx worker process. The "pending
-timers" here mean timers that have not yet been expired and "running
-timers" are those whose user callbacks are currently running.
-
-The maximal number of pending timers allowed in an Nginx
-worker is controlled by the [lua_max_pending_timers](#lua_max_pending_timers)
-directive. The maximal number of running timers is controlled by the
-[lua_max_running_timers](#lua_max_running_timers) directive.
-
-According to the current implementation, each "running timer" will
-take one (fake) connection record from the global connection record
-list configured by the standard [worker_connections](http://nginx.org/en/docs/ngx_core_module.html#worker_connections) directive in
-`nginx.conf`. So ensure that the
-[worker_connections](http://nginx.org/en/docs/ngx_core_module.html#worker_connections) directive is set to
-a large enough value that takes into account both the real connections
-and fake connections required by timer callbacks (as limited by the
-[lua_max_running_timers](#lua_max_running_timers) directive).
-
-A lot of the Lua APIs for Nginx are enabled in the context of the timer
-callbacks, like stream/datagram cosockets ([ngx.socket.tcp](#ngxsockettcp) and [ngx.socket.udp](#ngxsocketudp)), shared
-memory dictionaries ([ngx.shared.DICT](#ngxshareddict)), user coroutines ([coroutine.*](#coroutinecreate)),
-user "light threads" ([ngx.thread.*](#ngxthreadspawn)), [ngx.exit](#ngxexit), [ngx.now](#ngxnow)/[ngx.time](#ngxtime),
-[ngx.md5](#ngxmd5)/[ngx.sha1_bin](#ngxsha1_bin), are all allowed. But the subrequest API (like
-[ngx.location.capture](#ngxlocationcapture)), the [ngx.req.*](#ngxreqstart_time) API, the downstream output API
-(like [ngx.say](#ngxsay), [ngx.print](#ngxprint), and [ngx.flush](#ngxflush)) are explicitly disabled in
-this context.
-
-You can pass most of the standard Lua values (nils, booleans, numbers, strings, tables, closures, file handles, and etc) into the timer callback, either explicitly as user arguments or implicitly as upvalues for the callback closure. There are several exceptions, however: you *cannot* pass any thread objects returned by [coroutine.create](#coroutinecreate) and [ngx.thread.spawn](#ngxthreadspawn) or any cosocket objects returned by [ngx.socket.tcp](#ngxsockettcp), [ngx.socket.udp](#ngxsocketudp), and [ngx.req.socket](#ngxreqsocket) because these objects' lifetime is bound to the request context creating them while the timer callback is detached from the creating request's context (by design) and runs in its own (fake) request context. If you try to share the thread or cosocket objects across the boundary of the creating request, then you will get the "no co ctx found" error (for threads) or "bad request" (for cosockets). It is fine, however, to create all these objects inside your timer callback.
-
-This API was first introduced in the `v0.8.0` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.timer.every
----------------
-**syntax:** *hdl, err = ngx.timer.every(delay, callback, user_arg1, user_arg2, ...)*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Similar to the [ngx.timer.at](#ngxtimerat) API function, but
-
-1. `delay` *cannot* be zero,
-1. timer will be created every `delay` seconds until the current Nginx worker process starts exiting.
-
-When success, returns a "conditional true" value (but not a `true`). Otherwise, returns a "conditional false" value and a string describing the error.
-
-This API also respect the [lua_max_pending_timers](#lua_max_pending_timers) and [lua_max_running_timers](#lua_max_running_timers).
-
-This API was first introduced in the `v0.10.9` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.timer.running_count
------------------------
-**syntax:** *count = ngx.timer.running_count()*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Returns the number of timers currently running.
-
-This directive was first introduced in the `v0.9.20` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.timer.pending_count
------------------------
-**syntax:** *count = ngx.timer.pending_count()*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Returns the number of pending timers.
-
-This directive was first introduced in the `v0.9.20` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.config.subsystem
---------------------
-**syntax:** *subsystem = ngx.config.subsystem*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
-
-This string field indicates the current NGINX subsystem the current Lua environment is based on. For this module, this field always takes the string value `"http"`. For
-[ngx_stream_lua_module](https://github.com/openresty/stream-lua-nginx-module#readme), however, this field takes the value `"stream"`.
-
-This field was first introduced in the `0.10.1`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.config.debug
-----------------
-**syntax:** *debug = ngx.config.debug*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
-
-This boolean field indicates whether the current Nginx is a debug build, i.e., being built by the `./configure` option `--with-debug`.
-
-This field was first introduced in the `0.8.7`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.config.prefix
------------------
-
-**syntax:** *prefix = ngx.config.prefix()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
-
-Returns the Nginx server "prefix" path, as determined by the `-p` command-line option when running the nginx executable, or the path specified by the `--prefix` command-line option when building Nginx with the `./configure` script.
-
-This function was first introduced in the `0.9.2`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.config.nginx_version
-------------------------
-
-**syntax:** *ver = ngx.config.nginx_version*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
-
-This field take an integral value indicating the version number of the current Nginx core being used. For example, the version number `1.4.3` results in the Lua number 1004003.
-
-This API was first introduced in the `0.9.3` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.config.nginx_configure
---------------------------
-
-**syntax:** *str = ngx.config.nginx_configure()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;*
-
-This function returns a string for the NGINX `./configure` command's arguments string.
-
-This API was first introduced in the `0.9.5` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.config.ngx_lua_version
---------------------------
-
-**syntax:** *ver = ngx.config.ngx_lua_version*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;*
-
-This field take an integral value indicating the version number of the current `ngx_lua` module being used. For example, the version number `0.9.3` results in the Lua number 9003.
-
-This API was first introduced in the `0.9.3` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.worker.exiting
-------------------
-
-**syntax:** *exiting = ngx.worker.exiting()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
-
-This function returns a boolean value indicating whether the current Nginx worker process already starts exiting. Nginx worker process exiting happens on Nginx server quit or configuration reload (aka HUP reload).
-
-This API was first introduced in the `0.9.3` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.worker.pid
---------------
-
-**syntax:** *pid = ngx.worker.pid()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
-
-This function returns a Lua number for the process ID (PID) of the current Nginx worker process. This API is more efficient than `ngx.var.pid` and can be used in contexts where the [ngx.var.VARIABLE](#ngxvarvariable) API cannot be used (like [init_worker_by_lua](#init_worker_by_lua)).
-
-This API was first introduced in the `0.9.5` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.worker.count
-----------------
-
-**syntax:** *count = ngx.worker.count()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_by_lua&#42;, init_worker_by_lua&#42;*
-
-Returns the total number of the Nginx worker processes (i.e., the value configured
-by the [worker_processes](http://nginx.org/en/docs/ngx_core_module.html#worker_processes)
-directive in `nginx.conf`).
-
-This API was first introduced in the `0.9.20` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.worker.id
--------------
-
-**syntax:** *count = ngx.worker.id()*
-
-**context:** *set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, init_worker_by_lua&#42;*
-
-Returns the ordinal number of the current Nginx worker processes (starting from number 0).
-
-So if the total number of workers is `N`, then this method may return a number between 0
-and `N - 1` (inclusive).
-
-This function returns meaningful values only for NGINX 1.9.1+. With earlier versions of NGINX, it
-always returns `nil`.
-
-See also [ngx.worker.count](#ngxworkercount).
-
-This API was first introduced in the `0.9.20` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.semaphore
--------------
-**syntax:** *local semaphore = require "ngx.semaphore"*
-
-This is a Lua module that implements a classic-style semaphore API for efficient synchronizations among
-different "light threads". Sharing the same semaphore among different "light threads" created in different (request)
-contexts are also supported as long as the "light threads" reside in the same NGINX worker process
-and the [lua_code_cache](#lua_code_cache) directive is turned on (which is the default).
-
-This Lua module does not ship with this ngx_lua module itself rather it is shipped with
-the
-[lua-resty-core](https://github.com/openresty/lua-resty-core) library.
-
-Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/semaphore.md)
-for this `ngx.semaphore` Lua module in [lua-resty-core](https://github.com/openresty/lua-resty-core)
-for more details.
-
-This feature requires at least ngx_lua `v0.10.0`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.balancer
-------------
-**syntax:** *local balancer = require "ngx.balancer"*
-
-This is a Lua module that provides a Lua API to allow defining completely dynamic load balancers
-in pure Lua.
-
-This Lua module does not ship with this ngx_lua module itself rather it is shipped with
-the
-[lua-resty-core](https://github.com/openresty/lua-resty-core) library.
-
-Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/balancer.md)
-for this `ngx.balancer` Lua module in [lua-resty-core](https://github.com/openresty/lua-resty-core)
-for more details.
-
-This feature requires at least ngx_lua `v0.10.0`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.ssl
--------
-**syntax:** *local ssl = require "ngx.ssl"*
-
-This Lua module provides API functions to control the SSL handshake process in contexts like
-[ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
-
-This Lua module does not ship with this ngx_lua module itself rather it is shipped with
-the
-[lua-resty-core](https://github.com/openresty/lua-resty-core) library.
-
-Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
-for this `ngx.ssl` Lua module for more details.
-
-This feature requires at least ngx_lua `v0.10.0`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ngx.ocsp
---------
-**syntax:** *local ocsp = require "ngx.ocsp"*
-
-This Lua module provides API to perform OCSP queries, OCSP response validations, and
-OCSP stapling planting.
-
-Usually, this module is used together with the [ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
-module in the
-context of [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
-
-This Lua module does not ship with this ngx_lua module itself rather it is shipped with
-the
-[lua-resty-core](https://github.com/openresty/lua-resty-core) library.
-
-Please refer to the [documentation](https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md)
-for this `ngx.ocsp` Lua module for more details.
-
-This feature requires at least ngx_lua `v0.10.0`.
-
-[Back to TOC](#nginx-api-for-lua)
-
-ndk.set_var.DIRECTIVE
----------------------
-**syntax:** *res = ndk.set_var.DIRECTIVE_NAME*
-
-**context:** *init_worker_by_lua&#42;, set_by_lua&#42;, rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, log_by_lua&#42;, ngx.timer.&#42;, balancer_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-This mechanism allows calling other nginx C modules' directives that are implemented by [Nginx Devel Kit](https://github.com/simplresty/ngx_devel_kit) (NDK)'s set_var submodule's `ndk_set_var_value`.
-
-For example, the following [set-misc-nginx-module](http://github.com/openresty/set-misc-nginx-module) directives can be invoked this way:
-
-* [set_quote_sql_str](http://github.com/openresty/set-misc-nginx-module#set_quote_sql_str)
-* [set_quote_pgsql_str](http://github.com/openresty/set-misc-nginx-module#set_quote_pgsql_str)
-* [set_quote_json_str](http://github.com/openresty/set-misc-nginx-module#set_quote_json_str)
-* [set_unescape_uri](http://github.com/openresty/set-misc-nginx-module#set_unescape_uri)
-* [set_escape_uri](http://github.com/openresty/set-misc-nginx-module#set_escape_uri)
-* [set_encode_base32](http://github.com/openresty/set-misc-nginx-module#set_encode_base32)
-* [set_decode_base32](http://github.com/openresty/set-misc-nginx-module#set_decode_base32)
-* [set_encode_base64](http://github.com/openresty/set-misc-nginx-module#set_encode_base64)
-* [set_decode_base64](http://github.com/openresty/set-misc-nginx-module#set_decode_base64)
-* [set_encode_hex](http://github.com/openresty/set-misc-nginx-module#set_encode_base64)
-* [set_decode_hex](http://github.com/openresty/set-misc-nginx-module#set_decode_base64)
-* [set_sha1](http://github.com/openresty/set-misc-nginx-module#set_encode_base64)
-* [set_md5](http://github.com/openresty/set-misc-nginx-module#set_decode_base64)
-
-For instance,
-
-```lua
-
- local res = ndk.set_var.set_escape_uri('a/b');
- -- now res == 'a%2fb'
-```
-
-Similarly, the following directives provided by [encrypted-session-nginx-module](http://github.com/openresty/encrypted-session-nginx-module) can be invoked from within Lua too:
-
-* [set_encrypt_session](http://github.com/openresty/encrypted-session-nginx-module#set_encrypt_session)
-* [set_decrypt_session](http://github.com/openresty/encrypted-session-nginx-module#set_decrypt_session)
-
-This feature requires the [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit) module.
-
-[Back to TOC](#nginx-api-for-lua)
-
-coroutine.create
-----------------
-**syntax:** *co = coroutine.create(f)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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 usable in the context of [init_by_lua*](#init_by_lua) since the `0.9.2`.
-
-This API was first introduced in the `v0.6.0` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-coroutine.resume
-----------------
-**syntax:** *ok, ... = coroutine.resume(co, ...)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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 usable in the context of [init_by_lua*](#init_by_lua) since the `0.9.2`.
-
-This API was first introduced in the `v0.6.0` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-coroutine.yield
----------------
-**syntax:** *... = coroutine.yield(...)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Yields the execution 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 usable in the context of [init_by_lua*](#init_by_lua) since the `0.9.2`.
-
-This API was first introduced in the `v0.6.0` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-coroutine.wrap
---------------
-**syntax:** *co = coroutine.wrap(f)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-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 usable in the context of [init_by_lua*](#init_by_lua) since the `0.9.2`.
-
-This API was first introduced in the `v0.6.0` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-coroutine.running
------------------
-**syntax:** *co = coroutine.running()*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Identical to the standard Lua [coroutine.running](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.running) API.
-
-This API was first usable in the context of [init_by_lua*](#init_by_lua) since the `0.9.2`.
-
-This API was first enabled in the `v0.6.0` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-coroutine.status
-----------------
-**syntax:** *status = coroutine.status(co)*
-
-**context:** *rewrite_by_lua&#42;, access_by_lua&#42;, content_by_lua&#42;, init_by_lua&#42;, ngx.timer.&#42;, header_filter_by_lua&#42;, body_filter_by_lua&#42;, ssl_certificate_by_lua&#42;, ssl_session_fetch_by_lua&#42;, ssl_session_store_by_lua&#42;*
-
-Identical to the standard Lua [coroutine.status](http://www.lua.org/manual/5.1/manual.html#pdf-coroutine.status) API.
-
-This API was first usable in the context of [init_by_lua*](#init_by_lua) since the `0.9.2`.
-
-This API was first enabled in the `v0.6.0` release.
-
-[Back to TOC](#nginx-api-for-lua)
-
-Obsolete Sections
-=================
-
-This section is just holding obsolete documentation sections that have been either renamed or removed so that existing links over the web are still valid.
-
-[Back to TOC](#table-of-contents)
-
-Special PCRE Sequences
-----------------------
-
-This section has been renamed to [Special Escaping Sequences](#special-escaping-sequences).
diff --git a/debian/modules/http-lua/config b/debian/modules/http-lua/config
deleted file mode 100644
index 044deb9..0000000
--- a/debian/modules/http-lua/config
+++ /dev/null
@@ -1,532 +0,0 @@
-ngx_feature="Lua library"
-ngx_feature_libs="-llua -lm"
-ngx_feature_name=
-ngx_feature_run=no
-ngx_feature_incs="#include <lauxlib.h>"
-ngx_feature_path=
-ngx_feature_test="#if LUA_VERSION_NUM != 501
-#   error unsupported Lua language version
-#endif
-(void) luaL_newstate();"
-ngx_lua_opt_I=
-ngx_lua_opt_L=
-
-if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
-    # explicitly set LuaJIT paths
-
-    if [ "$NGX_PLATFORM" = win32 ]; then
-        ngx_feature="LuaJIT library in $LUAJIT_LIB and $LUAJIT_INC (win32)"
-        ngx_feature_path="$LUAJIT_INC"
-        ngx_lua_opt_I="-I$LUAJIT_INC"
-        ngx_lua_opt_L="-L$LUAJIT_LIB"
-
-        # ensure that our -I$LUAJIT_INC and -L$LUAJIT_LIB is at the first.
-        SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-        CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
-        SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
-        NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
-
-        # LuaJIT's win32 build uses the library file name lua51.dll.
-        ngx_feature_libs="$ngx_lua_opt_L -llua51"
-
-        . auto/feature
-
-        # clean up
-        CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-        NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
-    else
-
-        # attempt to link with -ldl, static linking on Linux requires it.
-        ngx_feature="LuaJIT library in $LUAJIT_LIB and $LUAJIT_INC (specified by the LUAJIT_LIB and LUAJIT_INC env, with -ldl)"
-        ngx_feature_path="$LUAJIT_INC"
-        ngx_lua_opt_I="-I$LUAJIT_INC"
-        ngx_lua_opt_L="-L$LUAJIT_LIB"
-
-        # ensure that our -I$LUAJIT_INC and -L$LUAJIT_LIB is at the first.
-        SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-        CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
-        SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
-        NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
-
-        if [ $NGX_RPATH = YES ]; then
-            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lm -ldl"
-        else
-            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lm -ldl"
-        fi
-
-        . auto/feature
-
-        # clean up
-        CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-        NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
-
-        if [ $ngx_found = no ]; then
-            # retry without -ldl
-            ngx_feature="LuaJIT library in $LUAJIT_LIB and $LUAJIT_INC (specified by the LUAJIT_LIB and LUAJIT_INC env)"
-            ngx_feature_path="$LUAJIT_INC"
-            ngx_lua_opt_I="-I$LUAJIT_INC"
-            ngx_lua_opt_L="-L$LUAJIT_LIB"
-
-            # ensure that our -I$LUAJIT_INC and -L$LUAJIT_LIB is at the first.
-            SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-            CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
-            SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
-            NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
-
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lm"
-            else
-                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lm"
-            fi
-
-            . auto/feature
-
-            # clean up
-            CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-            NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
-        fi
-    fi
-
-    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 (path for lua.h) $LUAJIT_INC, but we cannot find LuaJIT there.
-END
-        exit 1
-    fi
-
-    case "$NGX_PLATFORM" in
-        Darwin:*)
-            case "$NGX_MACHINE" in
-                amd64 | x86_64 | i386)
-                    echo "adding extra linking options needed by LuaJIT"
-                    ngx_feature_libs="$ngx_feature_libs -pagezero_size 10000 -image_base 100000000"
-                ;;
-
-                *)
-                ;;
-            esac
-        ;;
-
-        *)
-        ;;
-    esac
-else
-    if [ -n "$LUA_INC" -o -n "$LUA_LIB" ]; then
-        # explicitly set Lua paths
-        ngx_feature="Lua library in $LUA_LIB and $LUA_INC (specified by the LUA_LIB and LUA_INC env)"
-        ngx_feature_path="$LUA_INC"
-        ngx_lua_opt_I="-I$LUA_INC"
-        ngx_lua_opt_L="-L$LUA_LIB"
-
-        # ensure that our -I$LUA_INC and -L$LUA_LIB is at the first.
-        SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-        CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
-        SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
-        NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
-
-        if [ $NGX_RPATH = YES ]; then
-            ngx_feature_libs="-R$LUA_LIB $ngx_lua_opt_L -llua -lm -ldl"
-        else
-            ngx_feature_libs="$ngx_lua_opt_L -llua -lm -ldl"
-        fi
-
-        . auto/feature
-
-        # clean up
-        CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-        NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
-
-        if [ $ngx_found = no ]; then
-            # retry without -ldl
-
-            ngx_feature_path="$LUA_INC"
-            ngx_lua_opt_I="-I$LUA_INC"
-            ngx_lua_opt_L="-L$LUA_LIB"
-
-            # ensure that our -I$LUA_INC and -L$LUA_LIB is at the first.
-            SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-            CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
-            SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
-            NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
-
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R$LUA_LIB $ngx_lua_opt_L -llua -lm"
-            else
-                ngx_feature_libs="$ngx_lua_opt_L -llua -lm"
-            fi
-
-            . auto/feature
-
-            # clean up
-            CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-            NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
-        fi
-
-        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 (path for lua.h) is $LUA_INC, but we cannot find standard Lua there.
-END
-            exit 1
-        fi
-    else
-        # auto-discovery
-        ngx_feature="Lua library"
-        ngx_feature_libs="-llua -lm"
-        . auto/feature
-
-        if [ $ngx_found = no ]; then
-            # OpenBSD-5.2
-            ngx_feature="Lua library in /usr/local/"
-            ngx_feature_path="/usr/local/include/lua-5.1"
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -llua -lm"
-            else
-                ngx_feature_libs="-L/usr/local/lib -llua5.1 -lm"
-            fi
-            . auto/feature
-        fi
-
-        if [ $ngx_found = no ]; then
-            # OpenBSD < 5.2
-            ngx_feature="Lua library in /usr/local/"
-            ngx_feature_path="/usr/local/include"
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -llua -lm"
-            else
-                ngx_feature_libs="-L/usr/local/lib -llua -lm"
-            fi
-            . auto/feature
-        fi
-
-        if [ $ngx_found = no ]; then
-            # NetBSD
-            ngx_feature="Lua library in /usr/pkg/"
-            ngx_feature_path="/usr/pkg/include/"
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lm -llua"
-            else
-                ngx_feature_libs="-L/usr/pkg/lib -lm -llua"
-            fi
-            . auto/feature
-        fi
-
-        if [ $ngx_found = no ]; then
-            # MacPorts
-            ngx_feature="Lua library in /opt/local/"
-            ngx_feature_path="/opt/local/include"
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lm -llua"
-            else
-                ngx_feature_libs="-L/opt/local/lib -lm -llua"
-            fi
-            . auto/feature
-        fi
-
-        if [ $ngx_found = no ]; then
-            # FreeBSD
-            ngx_feature="Lua library in /usr/local/*/lua51/"
-            ngx_feature_path="/usr/local/include/lua51"
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/local/lib/lua51 -L/usr/local/lib/lua51 -llua -lm"
-            else
-                ngx_feature_libs="-L/usr/local/lib/lua51 -llua -lm"
-            fi
-            . auto/feature
-        fi
-
-        if [ $ngx_found = no ]; then
-            # Debian
-            ngx_feature="Lua library in /usr/"
-            ngx_feature_path="/usr/include/lua5.1"
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/lib -L/usr/lib -lm -llua5.1"
-            else
-                ngx_feature_libs="-L/usr/lib -lm -llua5.1"
-            fi
-            . auto/feature
-        fi
-
-        if [ $ngx_found = no ]; then
-            # FreeBSD with luajit-2.0 from ports collection
-            ngx_feature="LuaJIT library in /usr/local/"
-            ngx_feature_path="/usr/local/include/luajit-2.0"
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lluajit-5.1 -lm"
-            else
-                ngx_feature_libs="-L/usr/local/lib -lluajit-5.1 -lm"
-            fi
-            . auto/feature
-        fi
-
-        if [ $ngx_found = no ]; then
-            # Gentoo with LuaJIT-2.0, try with -ldl
-            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 -ldl"
-            else
-                ngx_feature_libs="-L/usr/lib -lm -lluajit-5.1 -ldl"
-            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
-
-ngx_module_incs=
-ngx_module_libs=
-
-if [ $ngx_found = yes ]; then
-    # this is a hack to persuade nginx's build system to favor
-    # the paths set by our user environments:
-    CFLAGS="$ngx_lua_opt_I $CFLAGS"
-    NGX_LD_OPT="$ngx_lua_opt_L $NGX_LD_OPT"
-
-    ngx_module_incs="$ngx_module_incs $ngx_feature_path"
-    ngx_module_libs="$ngx_module_libs $ngx_feature_libs"
-else
- cat << END
- $0: error: ngx_http_lua_module requires the Lua library.
-END
- exit 1
-fi
-
-ngx_addon_name=ngx_http_lua_module
-HTTP_LUA_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_semaphore.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_initworkerby.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_dir/src/ngx_http_lua_timer.c \
-            $ngx_addon_dir/src/ngx_http_lua_config.c \
-            $ngx_addon_dir/src/ngx_http_lua_worker.c \
-            $ngx_addon_dir/src/ngx_http_lua_ssl_certby.c \
-            $ngx_addon_dir/src/ngx_http_lua_ssl_ocsp.c \
-            $ngx_addon_dir/src/ngx_http_lua_lex.c \
-            $ngx_addon_dir/src/ngx_http_lua_balancer.c \
-            $ngx_addon_dir/src/ngx_http_lua_ssl_session_storeby.c \
-            $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.c \
-            $ngx_addon_dir/src/ngx_http_lua_ssl.c \
-            $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.c \
-            "
-
-HTTP_LUA_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_semaphore.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_initworkerby.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 \
-            $ngx_addon_dir/src/ngx_http_lua_timer.h \
-            $ngx_addon_dir/src/ngx_http_lua_config.h \
-            $ngx_addon_dir/src/ngx_http_lua_worker.h \
-            $ngx_addon_dir/src/ngx_http_lua_ssl_certby.h \
-            $ngx_addon_dir/src/ngx_http_lua_lex.h \
-            $ngx_addon_dir/src/ngx_http_lua_balancer.h \
-            $ngx_addon_dir/src/ngx_http_lua_ssl_session_storeby.h \
-            $ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.h \
-            $ngx_addon_dir/src/ngx_http_lua_ssl.h \
-            $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.h \
-            "
-
-CFLAGS="$CFLAGS -DNDK_SET_VAR"
-
-ngx_feature="export symbols by default (-E)"
-ngx_feature_libs="-Wl,-E"
-ngx_feature_name=
-ngx_feature_run=no
-ngx_feature_incs="#include <stdio.h>"
-ngx_feature_path=
-ngx_feature_test='printf("hello");'
-
-. auto/feature
-
-if [ $ngx_found = yes ]; then
-    CORE_LIBS="-Wl,-E $CORE_LIBS"
-fi
-
-# for Cygwin
-ngx_feature="export symbols by default (--export-all-symbols)"
-ngx_feature_libs="-Wl,--export-all-symbols"
-ngx_feature_name=
-ngx_feature_run=no
-ngx_feature_incs="#include <stdio.h>"
-ngx_feature_path=
-ngx_feature_test='printf("hello");'
-
-. auto/feature
-
-if [ $ngx_found = yes ]; then
-    CORE_LIBS="-Wl,--export-all-symbols $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
-
-CORE_INCS="$CORE_INCS $ngx_addon_dir/src/api"
-
-ngx_feature="SO_PASSCRED"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_SO_PASSCRED"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/types.h>
-#include <sys/socket.h>"
-ngx_feature_path=
-ngx_feature_test='setsockopt(1, SOL_SOCKET, SO_PASSCRED, NULL, 0);'
-
-. auto/feature
-
-ngx_feature="__attribute__(constructor)"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_CONSTRUCTOR"
-ngx_feature_run=yes
-ngx_feature_incs="#include <stdlib.h>
-int a = 2;
-__attribute__((constructor))
-static void foo(void)
-{
-    a = 0;
-}
-"
-ngx_feature_test="exit(a);"
-SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
-
-. auto/feature
-
-CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-
-# ----------------------------------------
-
-ngx_feature="malloc_trim"
-ngx_feature_libs=
-ngx_feature_name="NGX_HTTP_LUA_HAVE_MALLOC_TRIM"
-ngx_feature_run=yes
-ngx_feature_incs="#include <malloc.h>
-#include <stdio.h>"
-ngx_feature_test="int rc = malloc_trim((size_t) 0); printf(\"%d\", rc);"
-SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
-CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
-
-. auto/feature
-
-CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
-
-# ----------------------------------------
-
-if test -n "$ngx_module_link"; then
-    ngx_module_type=HTTP_AUX_FILTER
-    ngx_module_name=$ngx_addon_name
-    ngx_module_deps="$HTTP_LUA_DEPS"
-    ngx_module_srcs="$HTTP_LUA_SRCS"
-
-    . auto/module
-else
-    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $HTTP_LUA_SRCS"
-    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $HTTP_LUA_DEPS"
-
-    CORE_INCS="$CORE_INCS $ngx_module_incs"
-    CORE_LIBS="$CORE_LIBS $ngx_module_libs"
-fi
-
-#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_PATH='\"/usr/local/openresty/lualib/?.lua\"'"
-#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_CPATH='\"/usr/local/openresty/lualib/?.so\"'"
diff --git a/debian/modules/http-lua/doc/HttpLuaModule.wiki b/debian/modules/http-lua/doc/HttpLuaModule.wiki
deleted file mode 100644
index e3c61e2..0000000
--- a/debian/modules/http-lua/doc/HttpLuaModule.wiki
+++ /dev/null
@@ -1,7073 +0,0 @@
-= Name =
-
-ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers.
-
-''This module is not distributed with the Nginx source.'' See [[#Installation|the installation instructions]].
-
-= Status =
-
-Production ready.
-
-= Version =
-
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.13] released on 22 April 2018.
-
-= Synopsis =
-<geshi lang="nginx">
-    # set search paths for pure Lua external libraries (';;' is the default path):
-    lua_package_path '/foo/bar/?.lua;/blah/?.lua;;';
-
-    # set search paths for Lua external libraries written in C (can also use ';;'):
-    lua_package_cpath '/bar/baz/?.so;/blah/blah/?.so;;';
-
-    server {
-        location /lua_content {
-            # MIME type determined by default_type:
-            default_type 'text/plain';
-
-            content_by_lua_block {
-                ngx.say('Hello,world!')
-            }
-        }
-
-        location /nginx_var {
-            # MIME type determined by default_type:
-            default_type 'text/plain';
-
-            # try access /nginx_var?a=hello,world
-            content_by_lua_block {
-                ngx.say(ngx.var.arg_a)
-            }
-        }
-
-        location = /request_body {
-            client_max_body_size 50k;
-            client_body_buffer_size 50k;
-
-            content_by_lua_block {
-                ngx.req.read_body()  -- explicitly read the req body
-                local data = ngx.req.get_body_data()
-                if data then
-                    ngx.say("body data:")
-                    ngx.print(data)
-                    return
-                end
-
-                -- body may get buffered in a temp file:
-                local file = ngx.req.get_body_file()
-                if file then
-                    ngx.say("body is in file ", file)
-                else
-                    ngx.say("no body found")
-                end
-            }
-        }
-
-        # transparent non-blocking I/O in Lua via subrequests
-        # (well, a better way is to use cosockets)
-        location = /lua {
-            # MIME type determined by default_type:
-            default_type 'text/plain';
-
-            content_by_lua_block {
-                local res = ngx.location.capture("/some_other_location")
-                if res then
-                    ngx.say("status: ", res.status)
-                    ngx.say("body:")
-                    ngx.print(res.body)
-                end
-            }
-        }
-
-        location = /foo {
-            rewrite_by_lua_block {
-                res = ngx.location.capture("/memc",
-                    { args = { cmd = "incr", key = ngx.var.uri } }
-                )
-            }
-
-            proxy_pass http://blah.blah.com;
-        }
-
-        location = /mixed {
-            rewrite_by_lua_file /path/to/rewrite.lua;
-            access_by_lua_file /path/to/access.lua;
-            content_by_lua_file /path/to/content.lua;
-        }
-
-        # use nginx var in code path
-        # CAUTION: contents in nginx var must be carefully filtered,
-        # otherwise there'll be great security risk!
-        location ~ ^/app/([-_a-zA-Z0-9/]+) {
-            set $path $1;
-            content_by_lua_file /path/to/lua/app/root/$path.lua;
-        }
-
-        location / {
-           client_max_body_size 100k;
-           client_body_buffer_size 100k;
-
-           access_by_lua_block {
-               -- 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
-
-               -- check if the URI contains bad words
-               if ngx.var.uri and
-                      string.match(ngx.var.request_body, "evil")
-               then
-                   return ngx.redirect("/terms_of_use.html")
-               end
-
-               -- tests passed
-           }
-
-           # proxy_pass/fastcgi_pass/etc settings
-        }
-    }
-</geshi>
-
-= Description =
-
-This module embeds Lua, via the standard Lua 5.1 interpreter or [http://luajit.org/luajit.html LuaJIT 2.0/2.1], into Nginx and by leveraging Nginx's subrequests, allows the integration of the powerful Lua threads (Lua coroutines) into the Nginx event model.
-
-Unlike [https://httpd.apache.org/docs/trunk/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.
-
-At least the following Lua libraries and Nginx modules can be used with this ngx_lua module:
-
-* [https://github.com/openresty/lua-resty-memcached lua-resty-memcached]
-* [https://github.com/openresty/lua-resty-mysql lua-resty-mysql]
-* [https://github.com/openresty/lua-resty-redis lua-resty-redis]
-* [https://github.com/openresty/lua-resty-dns lua-resty-dns]
-* [https://github.com/openresty/lua-resty-upload lua-resty-upload]
-* [https://github.com/openresty/lua-resty-websocket lua-resty-websocket]
-* [https://github.com/openresty/lua-resty-lock lua-resty-lock]
-* [https://github.com/cloudflare/lua-resty-logger-socket lua-resty-logger-socket]
-* [https://github.com/openresty/lua-resty-lrucache lua-resty-lrucache]
-* [https://github.com/openresty/lua-resty-string lua-resty-string]
-* [[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.
-
-This module is plugged into NGINX's "http" subsystem so it can only speaks downstream communication protocols in the HTTP family (HTTP 0.9/1.0/1.1/2.0, WebSockets, and etc).
-If you want to do generic TCP communications with the downstream clients, then you should use the [https://github.com/openresty/stream-lua-nginx-module#readme ngx_stream_lua] module instead
-which has a compatible Lua API.
-
-= Typical Uses =
-
-Just to name a few:
-
-* Mashup'ing and processing outputs of various nginx upstream outputs (proxy, drizzle, postgres, redis, memcached, and etc) in Lua,
-* doing arbitrarily complex access control and security checks in Lua before requests actually reach the upstream backends,
-* manipulating response headers in an arbitrary way (by Lua)
-* fetching backend information from external storage backends (like redis, memcached, mysql, postgresql) and use that information to choose which upstream backend to access on-the-fly,
-* coding up arbitrarily complex web applications in a content handler using synchronous but still non-blocking access to the database backends and other storage,
-* doing very complex URL dispatch in Lua at rewrite phase,
-* using Lua to implement advanced caching mechanism for Nginx's subrequests and arbitrary locations.
-
-The possibilities are unlimited as the module allows bringing together various elements within Nginx as well as exposing the power of the Lua language to the user. The module provides the full flexibility of scripting while offering performance levels comparable with native C language programs both in terms of CPU time as well as memory footprint. This is particularly the case when LuaJIT 2.x is enabled.
-
-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 minimize memory use.
-
-= Nginx Compatibility =
-
-The latest version of this module is compatible with the following versions of Nginx:
-
-* 1.13.x  (last tested: 1.13.6)
-* 1.12.x
-* 1.11.x  (last tested: 1.11.2)
-* 1.10.x
-* 1.9.x (last tested: 1.9.15)
-* 1.8.x
-* 1.7.x (last tested: 1.7.10)
-* 1.6.x
-
-Nginx cores older than 1.6.0 (exclusive) are *not* supported.
-
-= Installation =
-
-It is *highly* recommended to use [http://openresty.org OpenResty releases] which integrate Nginx, ngx_lua, LuaJIT 2.1, as well as other powerful companion Nginx modules and Lua libraries. It is discouraged to build this module with nginx yourself since it is tricky to set up exactly right. Also, the stock nginx cores have various limitations and long standing bugs that can make some of this modules' features become disabled, not work properly, or run slower. The same applies to LuaJIT as well. OpenResty includes its own version of LuaJIT which gets specifically optimized and enhanced for the OpenResty environment.
-
-Alternatively, ngx_lua can be manually compiled into Nginx:
-
-# Install LuaJIT 2.0 or 2.1 (recommended) or Lua 5.1 (Lua 5.2 is ''not'' supported yet). LuaJIT can be downloaded from the [http://luajit.org/download.html 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 [https://github.com/simplresty/ngx_devel_kit/tags HERE].
-# Download the latest version of ngx_lua [https://github.com/openresty/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.13.6.tar.gz'
-    tar -xzvf nginx-1.13.6.tar.gz
-    cd nginx-1.13.6/
-
-    # tell nginx's build system where to find LuaJIT 2.0:
-    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 LuaJIT 2.1:
-    export LUAJIT_LIB=/path/to/luajit/lib
-    export LUAJIT_INC=/path/to/luajit/include/luajit-2.1
-
-    # 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 \
-            --with-ld-opt="-Wl,-rpath,/path/to/luajit-or-lua/lib" \
-            --add-module=/path/to/ngx_devel_kit \
-            --add-module=/path/to/lua-nginx-module
-
-    # Note that you may also want to add `./configure` options which are used in your
-    # current nginx build.
-    # You can get usually those options using command nginx -V
-
-    # you can change the parallism number 2 below to fit the number of spare CPU cores in your
-    # machine.
-    make -j2
-    make install
-</geshi>
-
-== Building as a dynamic module ==
-
-Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the <code>--add-dynamic-module=PATH</code> option instead of <code>--add-module=PATH</code> on the
-<code>./configure</code> command line above. And then you can explicitly load the module in your <code>nginx.conf</code> via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
-directive, for example,
-
-<geshi lang="nginx">
-load_module /path/to/modules/ndk_http_module.so;  # assuming NDK is built as a dynamic module too
-load_module /path/to/modules/ngx_http_lua_module.so;
-</geshi>
-
-== C Macro Configurations ==
-
-While building this module either via OpenResty or with the NGINX core, you can define the following C macros via the C compiler options:
-
-* <code>NGX_LUA_USE_ASSERT</code>
-: When defined, will enable assertions in the ngx_lua C code base. Recommended for debugging or testing builds. It can introduce some (small) runtime overhead when enabled. This macro was first introduced in the <code>v0.9.10</code> release.
-* <code>NGX_LUA_ABORT_AT_PANIC</code>
-: When the Lua/LuaJIT VM panics, ngx_lua will instruct the current nginx worker process to quit gracefully by default. By specifying this C macro, ngx_lua will abort the current nginx worker process (which usually result in a core dump file) immediately. This option is useful for debugging VM panics. This option was first introduced in the <code>v0.9.8</code> release.
-* <code>NGX_LUA_NO_FFI_API</code>
-: Excludes pure C API functions for FFI-based Lua API for NGINX (as required by [https://github.com/openresty/lua-resty-core#readme lua-resty-core], for example). Enabling this macro can make the resulting binary code size smaller.
-
-To enable one or more of these macros, just pass extra C compiler options to the <code>./configure</code> script of either NGINX or OpenResty. For instance,
-
-<geshi>
-    ./configure --with-cc-opt="-DNGX_LUA_USE_ASSERT -DNGX_LUA_ABORT_AT_PANIC"
-</geshi>
-
-== Installation on Ubuntu 11.10 ==
-
-Note that it is recommended to use LuaJIT 2.0 or LuaJIT 2.1 instead of the standard Lua 5.1 interpreter wherever 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.
-
-= Code Repository =
-
-The code repository of this project is hosted on github at [https://github.com/openresty/lua-nginx-module openresty/lua-nginx-module].
-
-= Bugs and Patches =
-
-Please submit bug reports, wishlists, or patches by
-
-# creating a ticket on the [https://github.com/openresty/lua-nginx-module/issues GitHub Issue Tracker],
-# or posting to the [[#Community|OpenResty community]].
-
-= 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/2.1 raw bytecode files directly.
-
-Please note that the bytecode format used by LuaJIT 2.0/2.1 is not compatible with that used by the standard Lua 5.1 interpreter. So if using LuaJIT 2.0/2.1 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.ljbc
-</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.ljbc
-</geshi>
-
-Please refer to the official LuaJIT documentation on the <code>-b</code> option for more details:
-
-http://luajit.org/running.html#opt_b
-
-Also, the bytecode files generated by LuaJIT 2.1 is ''not'' compatible with LuaJIT 2.0, and vice versa. The support for LuaJIT 2.1 bytecode was first added in ngx_lua v0.9.3.
-
-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/2.1 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.
-
-= System Environment Variable Support =
-
-If you want to access the system environment variable, say, <code>foo</code>, in Lua via the standard Lua API [http://www.lua.org/manual/5.1/manual.html#pdf-os.getenv os.getenv], then you should also list this environment variable name in your <code>nginx.conf</code> file via the [http://nginx.org/en/docs/ngx_core_module.html#env env directive]. For example,
-
-<geshi lang="nginx">
-    env foo;
-</geshi>
-
-= HTTP 1.0 support =
-
-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>.
-
-For large streaming output responses, it is important to disable the [[#lua_http10_buffering|lua_http10_buffering]] directive to minimise memory usage.
-
-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.
-
-= Statically Linking Pure Lua Modules =
-
-When LuaJIT 2.x is used, it is possible to statically link the bytecode of pure Lua modules into the Nginx executable.
-
-Basically you use the <code>luajit</code> executable to compile <code>.lua</code> Lua module files to <code>.o</code> object files containing the exported bytecode data, and then link the <code>.o</code> files directly in your Nginx build.
-
-Below is a trivial example to demonstrate this. Consider that we have the following <code>.lua</code> file named <code>foo.lua</code>:
-
-<geshi lang="lua">
-    -- foo.lua
-    local _M = {}
-
-    function _M.go()
-        print("Hello from foo")
-    end
-
-    return _M
-</geshi>
-
-And then we compile this <code>.lua</code> file to <code>foo.o</code> file:
-
-    /path/to/luajit/bin/luajit -bg foo.lua foo.o
-
-What matters here is the name of the <code>.lua</code> file, which determines how you use this module later on the Lua land. The file name <code>foo.o</code> does not matter at all except the <code>.o</code> file extension (which tells <code>luajit</code> what output format is used). If you want to strip the Lua debug information from the resulting bytecode, you can just specify the <code>-b</code> option above instead of <code>-bg</code>.
-
-Then when building Nginx or OpenResty, pass the <code>--with-ld-opt="foo.o"</code> option to the <code>./configure</code> script:
-
-<geshi lang="bash">
-    ./configure --with-ld-opt="/path/to/foo.o" ...
-</geshi>
-
-Finally, you can just do the following in any Lua code run by ngx_lua:
-
-<geshi lang="lua">
-    local foo = require "foo"
-    foo.go()
-</geshi>
-
-And this piece of code no longer depends on the external <code>foo.lua</code> file any more because it has already been compiled into the <code>nginx</code> executable.
-
-If you want to use dot in the Lua module name when calling <code>require</code>, as in
-
-<geshi lang="lua">
-    local foo = require "resty.foo"
-</geshi>
-
-then you need to rename the <code>foo.lua</code> file to <code>resty_foo.lua</code> before compiling it down to a <code>.o</code> file with the <code>luajit</code> command-line utility.
-
-It is important to use exactly the same version of LuaJIT when compiling <code>.lua</code> files to <code>.o</code> files as building nginx + ngx_lua. This is because the LuaJIT bytecode format may be incompatible between different LuaJIT versions. When the bytecode format is incompatible, you will see a Lua runtime error saying that the Lua module is not found.
-
-When you have multiple <code>.lua</code> files to compile and link, then just specify their <code>.o</code> files at the same time in the value of the <code>--with-ld-opt</code> option. For instance,
-
-<geshi lang="bash">
-    ./configure --with-ld-opt="/path/to/foo.o /path/to/bar.o" ...
-</geshi>
-
-If you have just too many <code>.o</code> files, then it might not be feasible to name them all in a single command. In this case, you can build a static library (or archive) for your <code>.o</code> files, as in
-
-<geshi lang="bash">
-    ar rcus libmyluafiles.a *.o
-</geshi>
-
-then you can link the <code>myluafiles</code> archive as a whole to your nginx executable:
-
-<geshi lang="bash">
-    ./configure \
-        --with-ld-opt="-L/path/to/lib -Wl,--whole-archive -lmyluafiles -Wl,--no-whole-archive"
-</geshi>
-
-where <code>/path/to/lib</code> is the path of the directory containing the <code>libmyluafiles.a</code> file. It should be noted that the linker option <code>--whole-archive</code> is required here because otherwise our archive will be skipped because no symbols in our archive are mentioned in the main parts of the nginx executable.
-
-= Data Sharing within an Nginx Worker =
-
-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 (both its code and data). Note however that Lua global variables (note, not module-level 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
-    local _M = {}
-
-    local data = {
-        dog = 3,
-        cat = 4,
-        pig = 5,
-    }
-
-    function _M.get_age(name)
-        return data[name]
-    end
-
-    return _M
-</geshi>
-
-and then accessing it from <code>nginx.conf</code>:
-
-<geshi lang="nginx">
-    location /lua {
-        content_by_lua_block {
-            local mydata = require "mydata"
-            ngx.say(mydata.get_age("dog"))
-        }
-    }
-</geshi>
-
-The <code>mydata</code> module in this example will only be loaded and run on the first request to the location <code>/lua</code>,
-and all subsequent requests to the same nginx worker process will use the reloaded instance of the
-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.
-
-It is usually recommended to share read-only data this way. You can also share changeable data among all the concurrent requests of each nginx worker process as
-long as there is ''no'' nonblocking I/O operations (including [[#ngx.sleep|ngx.sleep]])
-in the middle of your calculations. As long as you do not give the
-control back to the nginx event loop and ngx_lua's light thread
-scheduler (even implicitly), there can never be any race conditions in
-between. For this reason, always be very careful when you want to share changeable data on the
-worker level. Buggy optimizations can easily lead to hard-to-debug
-race conditions under load.
-
-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 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 ==
-* Because Lua's <code>dofile</code> and <code>require</code> builtins are currently implemented as C functions in both Lua 5.1 and LuaJIT 2.0/2.1, if the Lua file being loaded by <code>dofile</code> or <code>require</code> invokes [[#ngx.location.capture|ngx.location.capture*]], [[#ngx.exec|ngx.exec]], [[#ngx.exit|ngx.exit]], or other API functions requiring yielding in the *top-level* scope of the Lua file, then the Lua error "attempt to yield across C-call boundary" will be raised. To avoid this, put these calls requiring yielding into your own Lua functions in the Lua file instead of the top-level scope of the file.
-* 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()] or even the first line of the <code>for ... in ...</code> statement 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.x, which supports a fully resumable VM, to avoid this.
-
-== Lua Variable Scope ==
-Care must be taken when importing modules and this form should be used:
-
-<geshi lang="lua">
-    local xxx = require('xxx')
-</geshi>
-
-instead of the old deprecated form:
-
-<geshi lang="lua">
-    require('xxx')
-</geshi>
-
-Here is the reason: by design, the global environment has exactly the same lifetime as the Nginx request handler associated with it. Each request handler has its own set of Lua global variables and that is the idea of request isolation. The Lua module is actually loaded by the first Nginx request handler and is cached by the <code>require()</code> built-in in the <code>package.loaded</code> table for later reference, and the <code>module()</code> builtin used by some Lua modules has the side effect of setting a global variable to the loaded module table. But this global variable will be cleared at the end of the request handler,  and every subsequent request handler all has its own (clean) global environment. So one will get Lua exception for accessing the <code>nil</code> value.
-
-The use of Lua global variables is a generally inadvisable in the ngx_lua context as:
-
-# the misuse of Lua globals has detrimental side effects on concurrent requests when such variables should instead be local in scope,
-# Lua global variables require Lua table look-ups in the global environment which is computationally expensive, and
-# some Lua global variable references may include typing errors which make such difficult to debug.
-
-It is therefore *highly* recommended to always declare such within an appropriate local scope instead.
-
-<geshi lang="lua">
-    -- Avoid
-    foo = 123
-    -- Recommended
-    local foo = 123
-
-    -- Avoid
-    function foo() return 123 end
-    -- Recommended
-    local function foo() return 123 end
-</geshi>
-
-
-To find all instances of Lua global variables in your Lua code, run the [https://github.com/openresty/nginx-devel-utils/blob/master/lua-releng lua-releng tool] across all <code>.lua</code> source files:
-<geshi lang="text">
-$ lua-releng
-Checking use of Lua global variables in file lib/foo/bar.lua ...
-        1       [1489]  SETGLOBAL       7 -1    ; contains
-        55      [1506]  GETGLOBAL       7 -3    ; setvar
-        3       [1545]  GETGLOBAL       3 -4    ; varexpand
-</geshi>
-The output says that the line 1489 of file <code>lib/foo/bar.lua</code> writes to a global variable named <code>contains</code>, the line 1506 reads from the global variable <code>setvar</code>, and line 1545 reads the global <code>varexpand</code>.
-
-This tool 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 [[HttpAdditionModule#add_before_body|add_before_body]], [[HttpAdditionModule#add_after_body|add_after_body]], [http://nginx.org/en/docs/http/ngx_http_auth_request_module.html#auth_request auth_request], [[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.
-
-<geshi lang="nginx">
-    location /foo {
-        content_by_lua_block {
-            res = ngx.location.capture("/bar")
-        }
-    }
-    location /bar {
-        echo_location /blah;
-    }
-    location /blah {
-        echo "Success!";
-    }
-</geshi>
-
-<geshi lang="nginx">
-    $ curl -i http://example.com/foo
-</geshi>
-
-will not work as expected.
-
-== Cosockets Not Available Everywhere ==
-
-Due to internal limitations in the nginx core, the cosocket API is disabled in the following contexts: [[#set_by_lua|set_by_lua*]], [[#log_by_lua|log_by_lua*]], [[#header_filter_by_lua|header_filter_by_lua*]], and [[#body_filter_by_lua|body_filter_by_lua]].
-
-The cosockets are currently also disabled in the [[#init_by_lua|init_by_lua*]] and [[#init_worker_by_lua|init_worker_by_lua*]] directive contexts but we may add support for these contexts in the future because there is no limitation in the nginx core (or the limitation might be worked around).
-
-There exists a work-around, however, when the original context does *not* need to wait for the cosocket results. That is, creating a zero-delay timer via the [[#ngx.timer.at|ngx.timer.at]] API and do the cosocket results in the timer handler, which runs asynchronously as to the original context creating the timer.
-
-== Special Escaping Sequences ==
-
-'''NOTE''' Following the <code>v0.9.17</code> release, this pitfall can be avoided by using the <code>*_by_lua_block {}</code> configuration directives.
-
-PCRE sequences such as <code>\d</code>, <code>\s</code>, or <code>\w</code>, require special attention because in string literals, the backslash character, <code>\</code>, is stripped out by both the Lua language parser and by the nginx config file parser before processing if not within a <code>*_by_lua_block {}</code> directive. So the following snippet will not work as expected:
-
-<geshi lang="nginx">
-    # nginx.conf
-    ? location /test {
-    ?     content_by_lua '
-    ?         local regex = "\d+"  -- THIS IS WRONG OUTSIDE OF A *_by_lua_block DIRECTIVE
-    ?         local m = ngx.re.match("hello, 1234", regex)
-    ?         if m then ngx.say(m[0]) else ngx.say("not matched!") end
-    ?     ';
-    ? }
-    # evaluates to "not matched!"
-</geshi>
-
-To avoid this, ''double'' escape the backslash:
-
-<geshi lang="nginx">
-    # nginx.conf
-    location /test {
-        content_by_lua '
-            local regex = "\\\\d+"
-            local m = ngx.re.match("hello, 1234", regex)
-            if m then ngx.say(m[0]) else ngx.say("not matched!") end
-        ';
-    }
-    # evaluates to "1234"
-</geshi>
-
-Here, <code>\\\\d+</code> is stripped down to <code>\\d+</code> by the Nginx config file parser and this is further stripped down to <code>\d+</code> by the Lua language parser before running.
-
-Alternatively, the regex pattern can be presented as a long-bracketed Lua string literal by encasing it in "long brackets", <code>&#91;[...]]</code>, in which case backslashes have to only be escaped once for the Nginx config file parser.
-
-<geshi lang="nginx">
-    # nginx.conf
-    location /test {
-        content_by_lua '
-            local regex = [[\\d+]]
-            local m = ngx.re.match("hello, 1234", regex)
-            if m then ngx.say(m[0]) else ngx.say("not matched!") end
-        ';
-    }
-    # evaluates to "1234"
-</geshi>
-
-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.
-
-<geshi lang="nginx">
-    # nginx.conf
-    location /test {
-        content_by_lua '
-            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
-        ';
-    }
-    # evaluates to "1234"
-</geshi>
-
-An alternative approach to escaping PCRE sequences is to ensure that Lua code is placed in external script files and executed using the various <code>*_by_lua_file</code> directives.
-With this approach, the backslashes are only stripped by the Lua language parser and therefore only need to be escaped once each.
-
-<geshi lang="lua">
-    -- test.lua
-    local regex = "\\d+"
-    local m = ngx.re.match("hello, 1234", regex)
-    if m then ngx.say(m[0]) else ngx.say("not matched!") end
-    -- evaluates to "1234"
-</geshi>
-
-Within external script files, PCRE sequences presented as long-bracketed Lua string literals do not require modification.
-
-<geshi lang="lua">
-    -- test.lua
-    local regex = [[\d+]]
-    local m = ngx.re.match("hello, 1234", regex)
-    if m then ngx.say(m[0]) else ngx.say("not matched!") end
-    -- evaluates to "1234"
-</geshi>
-
-As noted earlier, PCRE sequences presented within <code>*_by_lua_block {}</code> directives (available following the <code>v0.9.17</code> release) do not require modification.
-
-<geshi lang="nginx">
-    # nginx.conf
-    location /test {
-        content_by_lua_block {
-            local regex = [[\d+]]
-            local m = ngx.re.match("hello, 1234", regex)
-            if m then ngx.say(m[0]) else ngx.say("not matched!") end
-        }
-    }
-    # evaluates to "1234"
-</geshi>
-
-
-== Mixing with SSI Not Supported ==
-
-Mixing SSI with ngx_lua in the same Nginx request is not supported at all. Just use ngx_lua exclusively. Everything you can do with SSI can be done atop ngx_lua anyway and it can be more efficient when using ngx_lua.
-
-== SPDY Mode Not Fully Supported ==
-
-Certain Lua APIs provided by ngx_lua do not work in Nginx's SPDY mode yet: [[#ngx.location.capture|ngx.location.capture]], [[#ngx.location.capture_multi|ngx.location.capture_multi]], and [[#ngx.req.socket|ngx.req.socket]].
-
-== Missing data on short circuited requests ==
-
-Nginx may terminate a request early with (at least):
-
-* 400 (Bad Request)
-* 405 (Not Allowed)
-* 408 (Request Timeout)
-* 413 (Request Entity Too Large)
-* 414 (Request URI Too Large)
-* 494 (Request Headers Too Large)
-* 499 (Client Closed Request)
-* 500 (Internal Server Error)
-* 501 (Not Implemented)
-
-This means that phases that normally run are skipped, such as the rewrite or
-access phase. This also means that later phases that are run regardless, e.g.
-[[#log_by_lua|log_by_lua]], will not have access to information that is normally set in those
-phases.
-
-= TODO =
-
-* cosocket: implement LuaSocket's unconnected UDP API.
-* port this module to the "datagram" subsystem of NGINX for implementing general UDP servers instead of HTTP
-servers in Lua. For example,
-<geshi lang="lua">
-    datagram {
-        server {
-            listen 1953;
-            handler_by_lua_block {
-                -- custom Lua code implementing the special UDP server...
-            }
-        }
-    }
-</geshi>
-* shm: implement a "shared queue API" to complement the existing [[#lua_shared_dict|shared dict]] API.
-* cosocket: add support in the context of [[#init_by_lua|init_by_lua*]].
-* cosocket: implement the <code>bind()</code> method for stream-typed cosockets.
-* cosocket: pool-based backend concurrency level control: implement automatic <code>connect</code> queueing when the backend concurrency exceeds its connection pool limit.
-* cosocket: review and merge aviramc's [https://github.com/openresty/lua-nginx-module/pull/290 patch] for adding the <code>bsdrecv</code> method.
-* add new API function <code>ngx.resp.add_header</code> to emulate the standard <code>add_header</code> config directive.
-* 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.
-* 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.
-* 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 [https://httpd.apache.org/docs/trunk/mod/mod_lua.html mod_lua].
-* cosocket: add client SSL certificate support.
-
-= Changes =
-
-The changes made in every release of this module are listed in the change logs of the OpenResty bundle:
-
-http://openresty.org/#Changes
-
-= Test Suite =
-
-The following dependencies are required to run the test suite:
-
-* Nginx version >= 1.4.2
-
-* Perl modules:
-** Test::Nginx: https://github.com/openresty/test-nginx
-
-* Nginx modules:
-** [https://github.com/simplresty/ngx_devel_kit ngx_devel_kit]
-** [https://github.com/openresty/set-misc-nginx-module ngx_set_misc]
-** [http://mdounin.ru/files/ngx_http_auth_request_module-0.2.tar.gz ngx_auth_request] (this is not needed if you're using Nginx 1.5.4+.
-** [https://github.com/openresty/echo-nginx-module ngx_echo]
-** [https://github.com/openresty/memc-nginx-module ngx_memc]
-** [https://github.com/openresty/srcache-nginx-module ngx_srcache]
-** ngx_lua (i.e., this module)
-** [https://github.com/openresty/lua-upstream-nginx-module ngx_lua_upstream]
-** [https://github.com/openresty/headers-more-nginx-module ngx_headers_more]
-** [https://github.com/openresty/drizzle-nginx-module ngx_drizzle]
-** [https://github.com/openresty/rds-json-nginx-module ngx_rds_json]
-** [https://github.com/FRiCKLE/ngx_coolkit ngx_coolkit]
-** [https://github.com/openresty/redis2-nginx-module ngx_redis2]
-
-The order in which these modules are added during configuration is important because the position of any filter module in the
-filtering chain determines the final output, for example. The correct adding order is shown above.
-
-* 3rd-party Lua libraries:
-** [http://www.kyne.com.au/~mark/software/lua-cjson.php lua-cjson]
-
-* Applications:
-** mysql: create database 'ngx_test', grant all privileges to user 'ngx_test', password is 'ngx_test'
-** memcached: listening on the default port, 11211.
-** redis: listening on the default port, 6379.
-
-See also the [https://github.com/openresty/lua-nginx-module/blob/master/util/build.sh developer build script] for more details on setting up the testing environment.
-
-To run the whole test suite in the default testing mode:
-<geshi lang="text">
-    cd /path/to/lua-nginx-module
-    export PATH=/path/to/your/nginx/sbin:$PATH
-    prove -I/path/to/test-nginx/lib -r t
-</geshi>
-
-To run specific test files:
-<geshi lang="text">
-    cd /path/to/lua-nginx-module
-    export PATH=/path/to/your/nginx/sbin:$PATH
-    prove -I/path/to/test-nginx/lib t/002-content.t t/003-errors.t
-</geshi>
-
-To run a specific test block in a particular test file, add the line <code>--- ONLY</code> to the test block you want to run, and then use the <code>prove</code> utility to run that <code>.t</code> file.
-
-There are also various testing modes based on mockeagain, valgrind, and etc. Refer to the [http://search.cpan.org/perldoc?Test::Nginx Test::Nginx documentation] for more details for various advanced testing modes. See also the test reports for the Nginx test cluster running on Amazon EC2: http://qa.openresty.org.
-
-= Copyright and License =
-
-This module is licensed under the BSD license.
-
-Copyright (C) 2009-2017, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
-
-Copyright (C) 2009-2018, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-= See Also =
-
-* [https://github.com/openresty/stream-lua-nginx-module#readme ngx_stream_lua_module] for an official port of this module for the NGINX "stream" subsystem (doing generic downstream TCP communications).
-* [https://github.com/openresty/lua-resty-memcached lua-resty-memcached] library based on ngx_lua cosocket.
-* [https://github.com/openresty/lua-resty-redis lua-resty-redis] library based on ngx_lua cosocket.
-* [https://github.com/openresty/lua-resty-mysql lua-resty-mysql] library based on ngx_lua cosocket.
-* [https://github.com/openresty/lua-resty-upload lua-resty-upload] library based on ngx_lua cosocket.
-* [https://github.com/openresty/lua-resty-dns lua-resty-dns] library based on ngx_lua cosocket.
-* [https://github.com/openresty/lua-resty-websocket lua-resty-websocket] library for both WebSocket server and client, based on ngx_lua cosocket.
-* [https://github.com/openresty/lua-resty-string lua-resty-string] library based on [http://luajit.org/ext_ffi.html LuaJIT FFI].
-* [https://github.com/openresty/lua-resty-lock lua-resty-lock] library for a nonblocking simple lock API.
-* [https://github.com/cloudflare/lua-resty-cookie lua-resty-cookie] library for HTTP cookie manipulation.
-* [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]
-* [http://openresty.org/#UsingLuaRocks Using LuaRocks with ngx_lua]
-* [https://github.com/openresty/lua-nginx-module/wiki/Introduction Introduction to ngx_lua]
-* [https://github.com/simplresty/ngx_devel_kit ngx_devel_kit]
-* [[HttpEchoModule]]
-* [[HttpDrizzleModule]]
-* [https://github.com/FRiCKLE/ngx_postgres postgres-nginx-module]
-* [[HttpMemcModule]]
-* [http://openresty.org The OpenResty bundle]
-* [https://github.com/openresty/nginx-systemtap-toolkit Nginx Systemtap Toolkit]
-
-= Directives =
-
-<!-- inline-toc -->
-
-The basic building blocks of scripting Nginx with Lua are directives. Directives are used to specify when the user Lua code is run and
-how the result will be used. Below is a diagram showing the order in which directives are executed.
-
-![Lua Nginx Modules Directives](https://cloud.githubusercontent.com/assets/2137369/15272097/77d1c09e-1a37-11e6-97ef-d9767035fc3e.png)
-
-== lua_capture_error_log ==
-'''syntax:''' ''lua_capture_error_log size''
-
-'''default:''' ''none''
-
-'''context:''' ''http''
-
-Enables a buffer of the specified <code>size</code> for capturing all the nginx error log message data (not just those produced
-by this module or the nginx http subsystem, but everything) without touching files or disks.
-
-You can use units like `k` and `m` in the <code>size</code> value, as in
-
-<geshi lang="nginx">
-    lua_capture_error_log 100k;
-</geshi>
-
-As a rule of thumb, a 4KB buffer can usually hold about 20 typical error log messages. So do the maths!
-
-This buffer never grows. If it is full, new error log messages will replace the oldest ones in the buffer.
-
-The size of the buffer must be bigger than the maximum length of a single error log message (which is 4K in OpenResty and 2K in stock NGINX).
-
-You can read the messages in the buffer on the Lua land via the
-[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#get_logs get_logs()]
-function of the
-[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#readme ngx.errlog]
-module of the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#readme lua-resty-core]
-library. This Lua API function will return the captured error log messages and
-also remove these already read from the global capturing buffer, making room
-for any new error log data. For this reason, the user should not configure this
-buffer to be too big if the user read the buffered error log data fast enough.
-
-Note that the log level specified in the standard [http://nginx.org/r/error_log error_log] directive
-''does'' have effect on this capturing facility. It only captures log
-messages of a level no lower than the specified log level in the [http://nginx.org/r/error_log error_log] directive.
-The user can still choose to set an even higher filtering log level on the fly via the Lua API function
-[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/errlog.md#set_filter_level errlog.set_filter_level].
-So it is more flexible than the static [http://nginx.org/r/error_log error_log] directive.
-
-It is worth noting that there is no way to capture the debugging logs
-without building OpenResty or NGINX with the <code>./configure</code>
-option <code>--with-debug</code>. And enabling debugging logs is
-strongly discouraged in production builds due to high overhead.
-
-This directive was first introduced in the <code>v0.10.9</code> release.
-
-== lua_use_default_type ==
-'''syntax:''' ''lua_use_default_type on | off''
-
-'''default:''' ''lua_use_default_type on''
-
-'''context:''' ''http, server, location, location if''
-
-Specifies whether to use the MIME type specified by the [http://nginx.org/en/docs/http/ngx_http_core_module.html#default_type default_type] directive for the default value of the <code>Content-Type</code> response header. Deactivate this directive if a default <code>Content-Type</code> response header for Lua request handlers is not desired.
-
-This directive is turned on by default.
-
-This directive was first introduced in the <code>v0.9.1</code> release.
-
-== lua_malloc_trim ==
-'''syntax:''' ''lua_malloc_trim <request-count>''
-
-'''default:''' ''lua_malloc_trim 1000''
-
-'''context:''' ''http''
-
-Asks the underlying <code>libc</code> runtime library to release its cached free memory back to the operating system every
-<code>N</code> requests processed by the NGINX core. By default, <code>N</code> is 1000. You can configure the request count
-by using your own numbers. Smaller numbers mean more frequent releases, which may introduce higher CPU time consumption and
-smaller memory footprint while larger numbers usually lead to less CPU time overhead and relatively larger memory footprint.
-Just tune the number for your own use cases.
-
-Configuring the argument to <code>0</code> essentially turns off the periodical memory trimming altogether.
-
-<geshi lang="nginx">
-    lua_malloc_trim 0;  # turn off trimming completely
-</geshi>
-
-The current implementation uses an NGINX log phase handler to do the request counting. So the appearance of the
-[http://nginx.org/en/docs/http/ngx_http_core_module.html#log_subrequest log_subrequest on] directives in <code>nginx.conf</code>
-may make the counting faster when subrequests are involved. By default, only "main requests" count.
-
-Note that this directive does *not* affect the memory allocated by LuaJIT's own allocator based on the <code>mmap</code>
-system call.
-
-This directive was first introduced in the <code>v0.10.7</code> release.
-
-== lua_code_cache ==
-'''syntax:''' ''lua_code_cache on | off''
-
-'''default:''' ''lua_code_cache on''
-
-'''context:''' ''http, server, location, location if''
-
-Enables or disables the Lua code cache for Lua code in <code>*_by_lua_file</code> directives (like [[#set_by_lua_file|set_by_lua_file]] and
-[[#content_by_lua_file|content_by_lua_file]]) and Lua modules.
-
-When turning off, every request served by ngx_lua will run in a separate Lua VM instance, starting from the <code>0.9.3</code> release. So the Lua files referenced in [[#set_by_lua_file|set_by_lua_file]],
-[[#content_by_lua_file|content_by_lua_file]], [[#access_by_lua_file|access_by_lua_file]],
-and etc will not be cached
-and all Lua modules used will be loaded from scratch. With this in place, developers can adopt an edit-and-refresh approach.
-
-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 not be updated when you edit the inlined Lua code in your <code>nginx.conf</code> file because only the Nginx config file parser can correctly parse the <code>nginx.conf</code>
-file and the only way is to reload the config file
-by sending a <code>HUP</code> signal or just to restart Nginx.
-
-Even when the code cache is enabled, Lua files which are loaded by <code>dofile</code> or <code>loadfile</code>
-in *_by_lua_file cannot be cached (unless you cache the results yourself). Usually you can either use the [[#init_by_lua|init_by_lua]]
-or [[#init-by_lua_file|init_by_lua_file]] directives to load all such files or just make these Lua files true Lua modules
-and load them via <code>require</code>.
-
-The ngx_lua module does not support the <code>stat</code> mode available with the
-Apache <code>mod_lua</code> module (yet).
-
-Disabling the Lua code cache is strongly
-discouraged for production use and should only be used during
-development as it has a significant negative impact on overall performance. For example, the performance of a "hello world" Lua example can drop by an order of magnitude after disabling the Lua code cache.
-
-== lua_regex_cache_max_entries ==
-'''syntax:''' ''lua_regex_cache_max_entries <num>''
-
-'''default:''' ''lua_regex_cache_max_entries 1024''
-
-'''context:''' ''http''
-
-Specifies the maximum number of entries allowed in the worker process level compiled regex cache.
-
-The regular expressions used in [[#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]] will be cached within this cache if the regex option <code>o</code> (i.e., compile-once flag) is specified.
-
-The default number of entries allowed is 1024 and when this limit is reached, new regular expressions will not be cached (as if the <code>o</code> option was not specified) and there will be one, and only one, warning in the <code>error.log</code> file:
-
-<geshi lang="text">
-    2011/08/27 23:18:26 [warn] 31997#0: *1 lua exceeding regex cache max entries (1024), ...
-</geshi>
-
-If you are using the <code>ngx.re.*</code> implementation of [lua-resty-core](https://github.com/openresty/lua-resty-core) by loading the <code>resty.core.regex</code> module (or just the <code>resty.core</code> module), then an LRU cache is used for the regex cache being used here.
-
-Do not activate the <code>o</code> option for regular expressions (and/or <code>replace</code> string arguments for [[#ngx.re.sub|ngx.re.sub]] and [[#ngx.re.gsub|ngx.re.gsub]]) that are generated ''on the fly'' and give rise to infinite variations to avoid hitting the specified limit.
-
-== lua_regex_match_limit ==
-'''syntax:''' ''lua_regex_match_limit <num>''
-
-'''default:''' ''lua_regex_match_limit 0''
-
-'''context:''' ''http''
-
-Specifies the "match limit" used by the PCRE library when executing the [[#ngx.re.match|ngx.re API]]. To quote the PCRE manpage, "the limit ... has the effect of limiting the amount of backtracking that can take place."
-
-When the limit is hit, the error string "pcre_exec() failed: -8" will be returned by the [[#ngx.re.match|ngx.re API]] functions on the Lua land.
-
-When setting the limit to 0, the default "match limit" when compiling the PCRE library is used. And this is the default value of this directive.
-
-This directive was first introduced in the <code>v0.8.5</code> release.
-
-== lua_package_path ==
-
-'''syntax:''' ''lua_package_path <lua-style-path-str>''
-
-'''default:''' ''The content of LUA_PATH environment variable or Lua's compiled-in defaults.''
-
-'''context:''' ''http''
-
-Sets the Lua module search path used by scripts specified by [[#set_by_lua|set_by_lua]],
-[[#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.
-
-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 ==
-
-'''syntax:''' ''lua_package_cpath <lua-style-cpath-str>''
-
-'''default:''' ''The content of LUA_CPATH environment variable or Lua's compiled-in defaults.''
-
-'''context:''' ''http''
-
-Sets the Lua C-module search path used by scripts specified by [[#set_by_lua|set_by_lua]],
-[[#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.
-
-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''
-
-'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#init_by_lua_block|init_by_lua_block]] directive instead.
-
-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. In case that the [[#lua_code_cache|lua_code_cache]] directive is turned off (default on), the <code>init_by_lua</code> handler will run upon every request because in this special mode a standalone Lua VM is always created for each request.
-
-Usually you can pre-load Lua modules at server start-up by means of this hook and take advantage of modern operating systems' copy-on-write (COW) optimization. Here is an example for pre-loading Lua modules:
-
-<geshi lang="nginx">
-    # this runs before forking out nginx worker processes:
-    init_by_lua_block { require "cjson" }
-
-    server {
-        location = /api {
-            content_by_lua_block {
-                -- the following require() will just  return
-                -- the alrady loaded module from package.loaded:
-                ngx.say(require "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_block {
-        local dogs = ngx.shared.dogs;
-        dogs:set("Tom", 56)
-    }
-
-    server {
-        location = /api {
-            content_by_lua_block {
-                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.
-
-Do *not* initialize your own Lua global variables in this context because use of Lua global variables have performance penalties and can lead to global namespace pollution (see the [[#Lua_Variable_Scope|Lua Variable Scope]] section for more details). The recommended way is to use proper [http://www.lua.org/manual/5.1/manual.html#5.3 Lua module] files (but do not use the standard Lua function [http://www.lua.org/manual/5.1/manual.html#pdf-module module()] to define Lua modules because it pollutes the global namespace as well) and call [http://www.lua.org/manual/5.1/manual.html#pdf-require require()] to load your own module files in <code>init_by_lua</code> or other contexts ([http://www.lua.org/manual/5.1/manual.html#pdf-require require()] does cache the loaded Lua modules in the global <code>package.loaded</code> table in the Lua registry so your modules will only loaded once for the whole Lua VM instance).
-
-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_block ==
-
-'''syntax:''' ''init_by_lua_block { lua-script }''
-
-'''context:''' ''http''
-
-'''phase:''' ''loading-config''
-
-Similar to the [[#init_by_lua|init_by_lua]] directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-<geshi lang="nginx">
-    init_by_lua_block {
-        print("I need no extra escaping here, for example: \r\nblah")
-    }
-</geshi>
-
-This directive was first introduced in the <code>v0.9.17</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.
-
-== init_worker_by_lua ==
-
-'''syntax:''' ''init_worker_by_lua <lua-script-str>''
-
-'''context:''' ''http''
-
-'''phase:''' ''starting-worker''
-
-'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#init_worker_by_lua_block|init_worker_by_lua_block]] directive instead.
-
-Runs the specified Lua code upon every Nginx worker process's startup when the master process is enabled. When the master process is disabled, this hook will just run after [[#init_by_lua|init_by_lua*]].
-
-This hook is often used to create per-worker reoccurring timers (via the [[#ngx.timer.at|ngx.timer.at]] Lua API), either for backend health-check or other timed routine work. Below is an example,
-
-<geshi lang="nginx">
-    init_worker_by_lua '
-        local delay = 3  -- in seconds
-        local new_timer = ngx.timer.at
-        local log = ngx.log
-        local ERR = ngx.ERR
-        local check
-
-        check = function(premature)
-            if not premature then
-                -- do the health check or other routine work
-                local ok, err = new_timer(delay, check)
-                if not ok then
-                    log(ERR, "failed to create timer: ", err)
-                    return
-                end
-            end
-        end
-
-        local hdl, err = new_timer(delay, check)
-        if not hdl then
-            log(ERR, "failed to create timer: ", err)
-            return
-        end
-    ';
-</geshi>
-
-This directive was first introduced in the <code>v0.9.5</code> release.
-
-This hook no longer runs in the cache manager and cache loader processes since the <code>v0.10.12</code> release.
-
-== init_worker_by_lua_block ==
-
-'''syntax:''' ''init_worker_by_lua_block { lua-script }''
-
-'''context:''' ''http''
-
-'''phase:''' ''starting-worker''
-
-Similar to the [[#init_worker_by_lua|init_worker_by_lua]] directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-<geshi lang="nginx">
-    init_worker_by_lua_block {
-        print("I need no extra escaping here, for example: \r\nblah")
-    }
-</geshi>
-
-This directive was first introduced in the <code>v0.9.17</code> release.
-
-This hook no longer runs in the cache manager and cache loader processes since the <code>v0.10.12</code> release.
-
-== init_worker_by_lua_file ==
-
-'''syntax:''' ''init_worker_by_lua_file <lua-file-path>''
-
-'''context:''' ''http''
-
-'''phase:''' ''starting-worker''
-
-Similar to [[#init_worker_by_lua|init_worker_by_lua]], but accepts the file path to a Lua source file or Lua bytecode file.
-
-This directive was first introduced in the <code>v0.9.5</code> release.
-
-This hook no longer runs in the cache manager and cache loader processes since the <code>v0.10.12</code> release.
-
-== set_by_lua ==
-
-'''syntax:''' ''set_by_lua $res <lua-script-str> [$arg1 $arg2 ...]''
-
-'''context:''' ''server, server if, location, location if''
-
-'''phase:''' ''rewrite''
-
-'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#set_by_lua_block|set_by_lua_block]] directive instead.
-
-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.
-
-This directive is implemented by injecting custom commands into the standard [[HttpRewriteModule]]'s command list. Because [[HttpRewriteModule]] does not support nonblocking I/O in its commands, Lua APIs requiring yielding the current Lua "light thread" cannot work in this directive.
-
-At least the following API functions are currently disabled within the context of <code>set_by_lua</code>:
-
-* 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]]).
-* Sleeping API function [[#ngx.sleep|ngx.sleep]].
-
-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.
-
-<geshi lang="nginx">
-    location /foo {
-        set $diff ''; # we have to predefine the $diff variable here
-
-        set_by_lua $sum '
-            local a = 32
-            local b = 56
-
-            ngx.var.diff = a - b;  -- write to $diff directly
-            return a + b;          -- return the $sum value normally
-        ';
-
-        echo "sum = $sum, diff = $diff";
-    }
-</geshi>
-
-This directive can be freely mixed with all directives of the [[HttpRewriteModule]], [[HttpSetMiscModule]], and [[HttpArrayVarModule]] modules. All of these directives will run in the same order as they appear in the config file.
-
-<geshi lang="nginx">
-    set $foo 32;
-    set_by_lua $bar 'return tonumber(ngx.var.foo) + 1';
-    set $baz "bar: $bar";  # $baz == "bar: 33"
-</geshi>
-
-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/simplresty/ngx_devel_kit ngx_devel_kit] module.
-
-== set_by_lua_block ==
-
-'''syntax:''' ''set_by_lua_block $res { lua-script }''
-
-'''context:''' ''server, server if, location, location if''
-
-'''phase:''' ''rewrite''
-
-Similar to the [[#set_by_lua|set_by_lua]] directive except that
-
-# this directive inlines the Lua source directly
-inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
-special character escaping), and
-# this directive does not support extra arguments after the Lua script as in [[#set_by_lua|set_by_lua]].
-
-For example,
-
-<geshi lang="nginx">
-    set_by_lua_block $res { return 32 + math.cos(32) }
-    # $res now has the value "32.834223360507" or alike.
-</geshi>
-
-No special escaping is required in the Lua code block.
-
-This directive was first introduced in the <code>v0.9.17</code> release.
-
-== set_by_lua_file ==
-'''syntax:''' ''set_by_lua_file $res <path-to-lua-script-file> [$arg1 $arg2 ...]''
-
-'''context:''' ''server, server if, location, location if''
-
-'''phase:''' ''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, 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 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.
-
-This directive requires the [https://github.com/simplresty/ngx_devel_kit ngx_devel_kit] module.
-
-== content_by_lua ==
-
-'''syntax:''' ''content_by_lua <lua-script-str>''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#content_by_lua_block|content_by_lua_block]] directive instead.
-
-Acts as a "content handler" and executes Lua code string specified in <code><lua-script-str></code> for every request.
-The Lua code may make [[#Nginx API for Lua|API calls]] and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
-
-Do not use this directive and other content handler directives in the same location. For example, this directive and the [[HttpProxyModule#proxy_pass|proxy_pass]] directive should not be used in the same location.
-
-== content_by_lua_block ==
-
-'''syntax:''' ''content_by_lua_block { lua-script }''
-
-'''context:''' ''location, location if''
-
-'''phase:''' ''content''
-
-Similar to the [[#content_by_lua|content_by_lua]] directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-<geshi lang="nginx">
-    content_by_lua_block {
-        ngx.say("I need no extra escaping here, for example: \r\nblah")
-    }
-</geshi>
-
-This directive was first introduced in the <code>v0.9.17</code> release.
-
-== content_by_lua_file ==
-
-'''syntax:''' ''content_by_lua_file <path-to-lua-script-file>''
-
-'''context:''' ''location, location if''
-
-'''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, 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 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.
-
-Nginx variables are supported in the file path for dynamic dispatch, for example:
-
-<geshi lang="nginx">
-    # CAUTION: contents in nginx var must be carefully filtered,
-    # otherwise there'll be great security risk!
-    location ~ ^/app/([-_a-zA-Z0-9/]+) {
-        set $path $1;
-        content_by_lua_file /path/to/lua/app/root/$path.lua;
-    }
-</geshi>
-
-But be very careful about malicious user inputs and always carefully validate or filter out the user-supplied path components.
-
-== rewrite_by_lua ==
-
-'''syntax:''' ''rewrite_by_lua <lua-script-str>''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''rewrite tail''
-
-'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#rewrite_by_lua_block|rewrite_by_lua_block]] directive instead.
-
-Acts as a rewrite phase handler and executes Lua code string specified in <code><lua-script-str></code> for every request.
-The Lua code may make [[#Nginx API for Lua|API calls]] and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
-
-Note that this handler always runs ''after'' the standard [[HttpRewriteModule]]. So the following will work as expected:
-
-<geshi lang="nginx">
-    location /foo {
-        set $a 12; # create and initialize $a
-        set $b ""; # create and initialize $b
-        rewrite_by_lua 'ngx.var.b = tonumber(ngx.var.a) + 1';
-        echo "res = $b";
-    }
-</geshi>
-
-because <code>set $a 12</code> and <code>set $b ""</code> run ''before'' [[#rewrite_by_lua|rewrite_by_lua]].
-
-On the other hand, the following will not work as expected:
-
-<geshi lang="nginx">
-    ?  location /foo {
-    ?      set $a 12; # create and initialize $a
-    ?      set $b ''; # create and initialize $b
-    ?      rewrite_by_lua 'ngx.var.b = tonumber(ngx.var.a) + 1';
-    ?      if ($b = '13') {
-    ?         rewrite ^ /bar redirect;
-    ?         break;
-    ?      }
-    ?
-    ?      echo "res = $b";
-    ?  }
-</geshi>
-
-because <code>if</code> runs ''before'' [[#rewrite_by_lua|rewrite_by_lua]] even if it is placed after [[#rewrite_by_lua|rewrite_by_lua]] in the config.
-
-The right way of doing this is as follows:
-
-<geshi lang="nginx">
-    location /foo {
-        set $a 12; # create and initialize $a
-        set $b ''; # create and initialize $b
-        rewrite_by_lua '
-            ngx.var.b = tonumber(ngx.var.a) + 1
-            if tonumber(ngx.var.b) == 13 then
-                return ngx.redirect("/bar");
-            end
-        ';
-
-        echo "res = $b";
-    }
-</geshi>
-
-Note that the [http://www.grid.net.ru/nginx/eval.en.html ngx_eval] module can be approximated by using [[#rewrite_by_lua|rewrite_by_lua]]. For example,
-
-<geshi lang="nginx">
-    location / {
-        eval $res {
-            proxy_pass http://foo.com/check-spam;
-        }
-
-        if ($res = 'spam') {
-            rewrite ^ /terms-of-use.html redirect;
-        }
-
-        fastcgi_pass ...;
-    }
-</geshi>
-
-can be implemented in ngx_lua as:
-
-<geshi lang="nginx">
-    location = /check-spam {
-        internal;
-        proxy_pass http://foo.com/check-spam;
-    }
-
-    location / {
-        rewrite_by_lua '
-            local res = ngx.location.capture("/check-spam")
-            if res.body == "spam" then
-                return ngx.redirect("/terms-of-use.html")
-            end
-        ';
-
-        fastcgi_pass ...;
-    }
-</geshi>
-
-Just as any other rewrite phase handlers, [[#rewrite_by_lua|rewrite_by_lua]] also runs in subrequests.
-
-Note that when calling <code>ngx.exit(ngx.OK)</code> within a [[#rewrite_by_lua|rewrite_by_lua]] handler, the nginx request processing control flow will still continue to the content handler. To terminate the current request from within a [[#rewrite_by_lua|rewrite_by_lua]] handler, calling [[#ngx.exit|ngx.exit]] with status >= 200 (<code>ngx.HTTP_OK</code>) and status < 300 (<code>ngx.HTTP_SPECIAL_RESPONSE</code>) for successful quits and <code>ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)</code> (or its friends) for failures.
-
-If the [[HttpRewriteModule]]'s [[HttpRewriteModule#rewrite|rewrite]] directive is used to change the URI and initiate location re-lookups (internal redirections), then any [[#rewrite_by_lua|rewrite_by_lua]] or [[#rewrite_by_lua_file|rewrite_by_lua_file]] code sequences within the current location will not be executed. For example,
-
-<geshi lang="nginx">
-    location /foo {
-        rewrite ^ /bar;
-        rewrite_by_lua 'ngx.exit(503)';
-    }
-    location /bar {
-        ...
-    }
-</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 <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_block ==
-
-'''syntax:''' ''rewrite_by_lua_block { lua-script }''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''rewrite tail''
-
-Similar to the [[#rewrite_by_lua|rewrite_by_lua]] directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-<geshi lang="nginx">
-    rewrite_by_lua_block {
-        do_something("hello, world!\nhiya\n")
-    }
-</geshi>
-
-This directive was first introduced in the <code>v0.9.17</code> release.
-
-== rewrite_by_lua_file ==
-
-'''syntax:''' ''rewrite_by_lua_file <path-to-lua-script-file>''
-
-'''context:''' ''http, server, location, location if''
-
-'''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, 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 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.
-
-Nginx variables are supported in the file path for dynamic dispatch just as in [[#content_by_lua_file|content_by_lua_file]].
-
-== access_by_lua ==
-
-'''syntax:''' ''access_by_lua <lua-script-str>''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''access tail''
-
-'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#access_by_lua_block|access_by_lua_block]] directive instead.
-
-Acts as an access phase handler and executes Lua code string specified in <code><lua-script-str></code> for every request.
-The Lua code may make [[#Nginx API for Lua|API calls]] and is executed as a new spawned coroutine in an independent global environment (i.e. a sandbox).
-
-Note that this handler always runs ''after'' the standard [[HttpAccessModule]]. So the following will work as expected:
-
-<geshi lang="nginx">
-    location / {
-        deny    192.168.1.1;
-        allow   192.168.1.0/24;
-        allow   10.1.1.0/16;
-        deny    all;
-
-        access_by_lua '
-            local res = ngx.location.capture("/mysql", { ... })
-            ...
-        ';
-
-        # proxy_pass/fastcgi_pass/...
-    }
-</geshi>
-
-That is, if a client IP address is in the blacklist, it will be denied before the MySQL query for more complex authentication is executed by [[#access_by_lua|access_by_lua]].
-
-Note that the [http://mdounin.ru/hg/ngx_http_auth_request_module/ ngx_auth_request] module can be approximated by using [[#access_by_lua|access_by_lua]]:
-
-<geshi lang="nginx">
-    location / {
-        auth_request /auth;
-
-        # proxy_pass/fastcgi_pass/postgres_pass/...
-    }
-</geshi>
-
-can be implemented in ngx_lua as:
-
-<geshi lang="nginx">
-    location / {
-        access_by_lua '
-            local res = ngx.location.capture("/auth")
-
-            if res.status == ngx.HTTP_OK then
-                return
-            end
-
-            if res.status == ngx.HTTP_FORBIDDEN then
-                ngx.exit(res.status)
-            end
-
-            ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-        ';
-
-        # proxy_pass/fastcgi_pass/postgres_pass/...
-    }
-</geshi>
-
-As with other access phase handlers, [[#access_by_lua|access_by_lua]] will ''not'' run in subrequests.
-
-Note that when calling <code>ngx.exit(ngx.OK)</code> within a [[#access_by_lua|access_by_lua]] handler, the nginx request processing control flow will still continue to the content handler. To terminate the current request from within a [[#access_by_lua|access_by_lua]] handler, calling [[#ngx.exit|ngx.exit]] with status >= 200 (<code>ngx.HTTP_OK</code>) and status < 300 (<code>ngx.HTTP_SPECIAL_RESPONSE</code>) for successful quits and <code>ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)</code> (or its friends) for failures.
-
-Starting from the <code>v0.9.20</code> release, you can use the [[#access_by_lua_no_postpone|access_by_lua_no_postpone]]
-directive to control when to run this handler inside the "access" request-processing phase
-of NGINX.
-
-== access_by_lua_block ==
-
-'''syntax:''' ''access_by_lua_block { lua-script }''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''access tail''
-
-Similar to the [[#access_by_lua|access_by_lua]] directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-<geshi lang="nginx">
-    access_by_lua_block {
-        do_something("hello, world!\nhiya\n")
-    }
-</geshi>
-
-This directive was first introduced in the <code>v0.9.17</code> release.
-
-== access_by_lua_file ==
-
-'''syntax:''' ''access_by_lua_file <path-to-lua-script-file>''
-
-'''context:''' ''http, server, location, location if''
-
-'''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, 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 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 repeatedly reloading Nginx.
-
-Nginx variables are supported in the file path for dynamic dispatch just as in [[#content_by_lua_file|content_by_lua_file]].
-
-== header_filter_by_lua ==
-
-'''syntax:''' ''header_filter_by_lua <lua-script-str>''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''output-header-filter''
-
-'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#header_filter_by_lua_block|header_filter_by_lua_block]] directive instead.
-
-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.redirect|ngx.redirect]] 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:
-
-<geshi lang="nginx">
-    location / {
-        proxy_pass http://mybackend;
-        header_filter_by_lua 'ngx.header.Foo = "blah"';
-    }
-</geshi>
-
-This directive was first introduced in the <code>v0.2.1rc20</code> release.
-
-== header_filter_by_lua_block ==
-
-'''syntax:''' ''header_filter_by_lua_block { lua-script }''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''output-header-filter''
-
-Similar to the [[#header_filter_by_lua|header_filter_by_lua]] directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-<geshi lang="nginx">
-    header_filter_by_lua_block {
-        ngx.header["content-length"] = nil
-    }
-</geshi>
-
-This directive was first introduced in the <code>v0.9.17</code> release.
-
-== header_filter_by_lua_file ==
-
-'''syntax:''' ''header_filter_by_lua_file <path-to-lua-script-file>''
-
-'''context:''' ''http, server, location, location if''
-
-'''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, 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.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''
-
-'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#body_filter_by_lua_block|body_filter_by_lua_block]] directive instead.
-
-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> (for main requests) or <code>last_in_chain</code> (for subrequests) flag of the Nginx chain link buffers. (Before the <code>v0.7.14</code> release, the "eof" flag does not work at all in subrequests.)
-
-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_block { ngx.header.content_length = nil }
-        body_filter_by_lua 'ngx.arg[1] = string.len(ngx.arg[1]) .. "\\n"';
-    }
-</geshi>
-
-Note that the following API functions are currently disabled within this context due to the limitations in NGINX output filter's current implementation:
-
-* 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_block ==
-
-'''syntax:''' ''body_filter_by_lua_block { lua-script-str }''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''output-body-filter''
-
-Similar to the [[#body_filter_by_lua|body_filter_by_lua]] directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-<geshi lang="nginx">
-    body_filter_by_lua_block {
-        local data, eof = ngx.arg[1], ngx.arg[2]
-    }
-</geshi>
-
-This directive was first introduced in the <code>v0.9.17</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''
-
-'''NOTE''' Use of this directive is ''discouraged'' following the <code>v0.9.17</code> release. Use the [[#log_by_lua_block|log_by_lua_block]] directive instead.
-
-Runs 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 before.
-
-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_block {
-                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_block ==
-
-'''syntax:''' ''log_by_lua_block { lua-script }''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''log''
-
-Similar to the [[#log_by_lua|log_by_lua]] directive except that this directive inlines
-the Lua source directly
-inside a pair of curly braces (<code>{}</code>) instead of in an NGINX string literal (which requires
-special character escaping).
-
-For instance,
-
-<geshi lang="nginx">
-    log_by_lua_block {
-        print("I need no extra escaping here, for example: \r\nblah")
-    }
-</geshi>
-
-This directive was first introduced in the <code>v0.9.17</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.
-
-== balancer_by_lua_block ==
-
-'''syntax:''' ''balancer_by_lua_block { lua-script }''
-
-'''context:''' ''upstream''
-
-'''phase:''' ''content''
-
-This directive runs Lua code as an upstream balancer for any upstream entities defined
-by the <code>upstream {}</code> configuration block.
-
-For instance,
-
-<geshi lang="nginx">
-    upstream foo {
-        server 127.0.0.1;
-        balancer_by_lua_block {
-            -- use Lua to do something interesting here
-            -- as a dynamic balancer
-        }
-    }
-
-    server {
-        location / {
-            proxy_pass http://foo;
-        }
-    }
-</geshi>
-
-The resulting Lua load balancer can work with any existing nginx upstream modules
-like [http://nginx.org/en/docs/http/ngx_http_proxy_module.html ngx_proxy] and
-[http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html ngx_fastcgi].
-
-Also, the Lua load balancer can work with the standard upstream connection pool mechanism,
-i.e., the standard [http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive keepalive] directive.
-Just ensure that the [http://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive keepalive] directive
-is used *after* this <code>balancer_by_lua_block</code> directive in a single <code>upstream {}</code> configuration block.
-
-The Lua load balancer can totally ignore the list of servers defined in the <code>upstream {}</code> block
-and select peer from a completely dynamic server list (even changing per request) via the
-[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/balancer.md ngx.balancer] module
-from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
-
-The Lua code handler registered by this directive might get called more than once in a single
-downstream request when the nginx upstream mechanism retries the request on conditions
-specified by directives like the [http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_next_upstream proxy_next_upstream]
-directive.
-
-This Lua code execution context does not support yielding, so Lua APIs that may yield
-(like cosockets and "light threads") are disabled in this context. One can usually work
-around this limitation by doing such operations in an earlier phase handler (like
-[[#access_by_lua|access_by_lua*]]) and passing along the result into this context
-via the [[#ngx.ctx|ngx.ctx]] table.
-
-This directive was first introduced in the <code>v0.10.0</code> release.
-
-== balancer_by_lua_file ==
-
-'''syntax:''' ''balancer_by_lua_file <path-to-lua-script-file>''
-
-'''context:''' ''upstream''
-
-'''phase:''' ''content''
-
-Equivalent to [[#balancer_by_lua_block|balancer_by_lua_block]], 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.10.0</code> release.
-
-== lua_need_request_body ==
-
-'''syntax:''' ''lua_need_request_body <on|off>''
-
-'''default:''' ''off''
-
-'''context:''' ''http, server, location, location if''
-
-'''phase:''' ''depends on usage''
-
-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 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*]] directives,
-then the request body will be read just before the [[#rewrite_by_lua|rewrite_by_lua*]] code is run (and also at the
-<code>rewrite</code> phase). Similarly, if only [[#content_by_lua|content_by_lua]] is specified,
-the request body will not be read until the content handler's Lua code is
-about to run (i.e., the request body will be read during the content phase).
-
-It is recommended however, to use the [[#ngx.req.read_body|ngx.req.read_body]] and [[#ngx.req.discard_body|ngx.req.discard_body]] functions for finer control over the request body reading process instead.
-
-This also applies to [[#access_by_lua|access_by_lua*]].
-
-== ssl_certificate_by_lua_block ==
-
-'''syntax:''' ''ssl_certificate_by_lua_block { lua-script }''
-
-'''context:''' ''server''
-
-'''phase:''' ''right-before-SSL-handshake''
-
-This directive runs user Lua code when NGINX is about to start the SSL handshake for the downstream
-SSL (https) connections.
-
-It is particularly useful for setting the SSL certificate chain and the corresponding private key on a per-request
-basis. It is also useful to load such handshake configurations nonblockingly from the remote (for example,
-with the [[#ngx.socket.tcp|cosocket]] API). And one can also do per-request OCSP stapling handling in pure
-Lua here as well.
-
-Another typical use case is to do SSL handshake traffic control nonblockingly in this context,
-with the help of the [https://github.com/openresty/lua-resty-limit-traffic lua-resty-limit-traffic#readme]
-library, for example.
-
-One can also do interesting things with the SSL handshake requests from the client side, like
-rejecting old SSL clients using the SSLv3 protocol or even below selectively.
-
-The [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md ngx.ssl]
-and [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md ngx.ocsp] Lua modules
-provided by the [https://github.com/openresty/lua-resty-core/#readme lua-resty-core]
-library are particularly useful in this context. You can use the Lua API offered by these two Lua modules
-to manipulate the SSL certificate chain and private key for the current SSL connection
-being initiated.
-
-This Lua handler does not run at all, however, when NGINX/OpenSSL successfully resumes
-the SSL session via SSL session IDs or TLS session tickets for the current SSL connection. In
-other words, this Lua handler only runs when NGINX has to initiate a full SSL handshake.
-
-Below is a trivial example using the
-[https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md ngx.ssl] module
-at the same time:
-
-<geshi lang="nginx">
-    server {
-        listen 443 ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block {
-            print("About to initiate a new SSL handshake!")
-        }
-
-        location / {
-            root html;
-        }
-    }
-</geshi>
-
-See more complicated examples in the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md ngx.ssl]
-and [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ocsp.md ngx.ocsp]
-Lua modules' official documentation.
-
-Uncaught Lua exceptions in the user Lua code immediately abort the current SSL session, so does the
-[[#ngx.exit|ngx.exit]] call with an error code like <code>ngx.ERROR</code>.
-
-This Lua code execution context *does* support yielding, so Lua APIs that may yield
-(like cosockets, sleeping, and "light threads")
-are enabled in this context.
-
-Note, however, you still need to configure the [http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_certificate ssl_certificate] and
-[http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_certificate_key ssl_certificate_key]
-directives even though you will not use this static certificate and private key at all. This is
-because the NGINX core requires their appearance otherwise you are seeing the following error
-while starting NGINX:
-
-<geshi>
-    nginx: [emerg] no ssl configured for the server
-</geshi>
-
-This directive currently requires the following NGINX core patch to work correctly:
-
-http://mailman.nginx.org/pipermail/nginx-devel/2016-January/007748.html
-
-The bundled version of the NGINX core in OpenResty 1.9.7.2 (or above) already has this
-patch applied.
-
-Furthermore, one needs at least OpenSSL 1.0.2e for this directive to work.
-
-This directive was first introduced in the <code>v0.10.0</code> release.
-
-== ssl_certificate_by_lua_file ==
-
-'''syntax:''' ''ssl_certificate_by_lua_file <path-to-lua-script-file>''
-
-'''context:''' ''server''
-
-'''phase:''' ''right-before-SSL-handshake''
-
-Equivalent to [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua_block]], 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.10.0</code> release.
-
-== ssl_session_fetch_by_lua_block ==
-
-'''syntax:''' ''ssl_session_fetch_by_lua_block { lua-script }''
-
-'''context:''' ''http''
-
-'''phase:''' ''right-before-SSL-handshake''
-
-This directive runs Lua code to look up and load the SSL session (if any) according to the session ID
-provided by the current SSL handshake request for the downstream.
-
-The Lua API for obtaining the current session ID and loading a cached SSL session data
-is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl/session.md)
-Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
-library.
-
-Lua APIs that may yield, like [[#ngx.sleep|ngx.sleep]] and [[#ngx.socket.tcp|cosockets]],
-are enabled in this context.
-
-This hook, together with the [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]] hook,
-can be used to implement distributed caching mechanisms in pure Lua (based
-on the [[#ngx.socket.tcp|cosocket]] API, for example). If a cached SSL session is found
-and loaded into the current SSL connection context,
-SSL session resumption can then get immediately initiated and bypass the full SSL handshake process which is very expensive in terms of CPU time.
-
-Please note that TLS session tickets are very different and it is the clients' responsibility
-to cache the SSL session state when session tickets are used. SSL session resumptions based on
-TLS session tickets would happen automatically without going through this hook (nor the
-[[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]] hook). This hook is mainly
-for older or less capable SSL clients that can only do SSL sessions by session IDs.
-
-When [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]] is specified at the same time,
-this hook usually runs before [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]].
-When the SSL session is found and successfully loaded for the current SSL connection,
-SSL session resumption will happen and thus bypass the [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]]
-hook completely. In this case, NGINX also bypasses the [[#ssl_session_store_by_lua*|ssl_session_store_by_lua_block]]
-hook, for obvious reasons.
-
-To easily test this hook locally with a modern web browser, you can temporarily put the following line
-in your https server block to disable the TLS session ticket support:
-
-    ssl_session_tickets off;
-
-But do not forget to comment this line out before publishing your site to the world.
-
-If you are using the [official pre-built packages](http://openresty.org/en/linux-packages.html) for [OpenResty](https://openresty.org/)
-1.11.2.1 or later, then everything should work out of the box.
-
-If you are using OpenSSL libraries not provided by [OpenResty](https://openresty.org),
-then you need to apply the following patch for OpenSSL 1.0.2h or later:
-
-https://github.com/openresty/openresty/blob/master/patches/openssl-1.0.2h-sess_set_get_cb_yield.patch
-
-If you are not using the NGINX core shipped with [OpenResty](https://openresty.org) 1.11.2.1 or later, then you need to
-apply the following patch to the standard NGINX core 1.11.2 or later:
-
-http://openresty.org/download/nginx-1.11.2-nonblocking_ssl_handshake_hooks.patch
-
-This directive was first introduced in the <code>v0.10.6</code> release.
-
-Note that: this directive is only allowed to used in '''http context''' from the <code>v0.10.7</code> release
-(because SSL session resumption happens before server name dispatch).
-
-== ssl_session_fetch_by_lua_file ==
-
-'''syntax:''' ''ssl_session_fetch_by_lua_file <path-to-lua-script-file>''
-
-'''context:''' ''http''
-
-'''phase:''' ''right-before-SSL-handshake''
-
-Equivalent to [[#ssl_session_fetch_by_lua_block|ssl_session_fetch_by_lua_block]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or rather, 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.10.6</code> release.
-
-Note that: this directive is only allowed to used in '''http context''' from the <code>v0.10.7</code> release
-(because SSL session resumption happens before server name dispatch).
-
-== ssl_session_store_by_lua_block ==
-
-'''syntax:''' ''ssl_session_store_by_lua_block { lua-script }''
-
-'''context:''' ''http''
-
-'''phase:''' ''right-after-SSL-handshake''
-
-This directive runs Lua code to fetch and save the SSL session (if any) according to the session ID
-provided by the current SSL handshake request for the downstream. The saved or cached SSL
-session data can be used for future SSL connections to resume SSL sessions without going
-through the full SSL handshake process (which is very expensive in terms of CPU time).
-
-Lua APIs that may yield, like [[#ngx.sleep|ngx.sleep]] and [[#ngx.socket.tcp|cosockets]],
-are *disabled* in this context. You can still, however, use the [[#ngx.timer.at|ngx.timer.at]] API
-to create 0-delay timers to save the SSL session data asynchronously to external services (like <code>redis</code> or <code>memcached</code>).
-
-The Lua API for obtaining the current session ID and the associated session state data
-is provided in the [ngx.ssl.session](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl/session.md#readme)
-Lua module shipped with the [lua-resty-core](https://github.com/openresty/lua-resty-core#readme)
-library.
-
-To easily test this hook locally with a modern web browser, you can temporarily put the following line
-in your https server block to disable the TLS session ticket support:
-
-    ssl_session_tickets off;
-
-But do not forget to comment this line out before publishing your site to the world.
-
-This directive was first introduced in the <code>v0.10.6</code> release.
-
-Note that: this directive is only allowed to used in '''http context''' from the <code>v0.10.7</code> release
-(because SSL session resumption happens before server name dispatch).
-
-== ssl_session_store_by_lua_file ==
-
-'''syntax:''' ''ssl_session_store_by_lua_file <path-to-lua-script-file>''
-
-'''context:''' ''http''
-
-'''phase:''' ''right-after-SSL-handshake''
-
-Equivalent to [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua_block]], except that the file specified by <code><path-to-lua-script-file></code> contains the Lua code, or rather, 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.10.6</code> release.
-
-Note that: this directive is only allowed to used in '''http context''' from the <code>v0.10.7</code> release
-(because SSL session resumption happens before server name dispatch).
-
-== lua_shared_dict ==
-
-'''syntax:''' ''lua_shared_dict <name> <size>''
-
-'''default:''' ''no''
-
-'''context:''' ''http''
-
-'''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>.
-
-Shared memory zones are always shared by all the nginx worker processes in the current nginx server instance.
-
-The <code><size></code> argument accepts size units such as <code>k</code> and <code>m</code>:
-
-<geshi lang="nginx">
-    http {
-        lua_shared_dict dogs 10m;
-        ...
-    }
-</geshi>
-
-The hard-coded minimum size is 8KB while the practical minimum size depends
-on actual user data set (some people start with 12KB).
-
-See [[#ngx.shared.DICT|ngx.shared.DICT]] for details.
-
-This directive was first introduced in the <code>v0.3.1rc22</code> release.
-
-== lua_socket_connect_timeout ==
-
-'''syntax:''' ''lua_socket_connect_timeout <time>''
-
-'''default:''' ''lua_socket_connect_timeout 60s''
-
-'''context:''' ''http, server, location''
-
-This directive controls the default timeout value used in TCP/unix-domain socket object's [[#tcpsock:connect|connect]] method and can be overridden by the [[#tcpsock:settimeout|settimeout]] or [[#tcpsock:settimeouts|settimeouts]] methods.
-
-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_send_timeout ==
-
-'''syntax:''' ''lua_socket_send_timeout <time>''
-
-'''default:''' ''lua_socket_send_timeout 60s''
-
-'''context:''' ''http, server, location''
-
-Controls the default timeout value used in TCP/unix-domain socket object's [[#tcpsock:send|send]] method and can be overridden by the [[#tcpsock:settimeout|settimeout]] or [[#tcpsock:settimeouts|settimeouts]] methods.
-
-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_send_lowat ==
-
-'''syntax:''' ''lua_socket_send_lowat <size>''
-
-'''default:''' ''lua_socket_send_lowat 0''
-
-'''context:''' ''http, server, location''
-
-Controls the <code>lowat</code> (low water) value for the cosocket send buffer.
-
-== lua_socket_read_timeout ==
-
-'''syntax:''' ''lua_socket_read_timeout <time>''
-
-'''default:''' ''lua_socket_read_timeout 60s''
-
-'''context:''' ''http, server, location''
-
-'''phase:''' ''depends on usage''
-
-This directive controls the default timeout value used in TCP/unix-domain socket object's [[#tcpsock:receive|receive]] method and iterator functions returned by the [[#tcpsock:receiveuntil|receiveuntil]] method. This setting can be overridden by the [[#tcpsock:settimeout|settimeout]] or [[#tcpsock:settimeouts|settimeouts]] methods.
-
-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_buffer_size ==
-
-'''syntax:''' ''lua_socket_buffer_size <size>''
-
-'''default:''' ''lua_socket_buffer_size 4k/8k''
-
-'''context:''' ''http, server, location''
-
-Specifies the buffer size used by cosocket reading operations.
-
-This buffer does not have to be that big to hold everything at the same time because cosocket supports 100% non-buffered reading and parsing. So even <code>1</code> byte buffer size should still work everywhere but the performance could be terrible.
-
-This directive was first introduced in the <code>v0.5.0rc1</code> release.
-
-== lua_socket_pool_size ==
-
-'''syntax:''' ''lua_socket_pool_size <size>''
-
-'''default:''' ''lua_socket_pool_size 30''
-
-'''context:''' ''http, server, location''
-
-Specifies the size limit (in terms of connection count) for every cosocket connection pool associated with every remote server (i.e., identified by either the host-port pair or the unix domain socket file path).
-
-Default to 30 connections for every pool.
-
-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 size limit specified here also applies to every single nginx worker process.
-
-This directive was first introduced in the <code>v0.5.0rc1</code> release.
-
-== lua_socket_keepalive_timeout ==
-
-'''syntax:''' ''lua_socket_keepalive_timeout <time>''
-
-'''default:''' ''lua_socket_keepalive_timeout 60s''
-
-'''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 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>, 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_ssl_ciphers ==
-
-'''syntax:''' ''lua_ssl_ciphers <ciphers>''
-
-'''default:''' ''lua_ssl_ciphers DEFAULT''
-
-'''context:''' ''http, server, location''
-
-Specifies the enabled ciphers for requests to a SSL/TLS server in the [[#tcpsock:sslhandshake|tcpsock:sslhandshake]] method. The ciphers are specified in the format understood by the OpenSSL library.
-
-The full list can be viewed using the “openssl ciphers” command.
-
-This directive was first introduced in the <code>v0.9.11</code> release.
-
-== lua_ssl_crl ==
-
-'''syntax:''' ''lua_ssl_crl <file>''
-
-'''default:''' ''no''
-
-'''context:''' ''http, server, location''
-
-Specifies a file with revoked certificates (CRL) in the PEM format used to verify the certificate of the SSL/TLS server in the [[#tcpsock:sslhandshake|tcpsock:sslhandshake]] method.
-
-This directive was first introduced in the <code>v0.9.11</code> release.
-
-== lua_ssl_protocols ==
-
-'''syntax:''' ''lua_ssl_protocols [SSLv2] [SSLv3] [TLSv1] [TLSv1.1] [TLSv1.2] [TLSv1.3]''
-
-'''default:''' ''lua_ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2''
-
-'''context:''' ''http, server, location''
-
-Enables the specified protocols for requests to a SSL/TLS server in the [[#tcpsock:sslhandshake|tcpsock:sslhandshake]] method.
-
-The support for the <code>TLSv1.3</code> parameter requires version <code>v0.10.12</code> *and* OpenSSL 1.1.1.
-
-This directive was first introduced in the <code>v0.9.11</code> release.
-
-== lua_ssl_trusted_certificate ==
-
-'''syntax:''' ''lua_ssl_trusted_certificate <file>''
-
-'''default:''' ''no''
-
-'''context:''' ''http, server, location''
-
-Specifies a file path with trusted CA certificates in the PEM format used to verify the certificate of the SSL/TLS server in the [[#tcpsock:sslhandshake|tcpsock:sslhandshake]] method.
-
-This directive was first introduced in the <code>v0.9.11</code> release.
-
-See also [[#lua_ssl_verify_depth|lua_ssl_verify_depth]].
-
-== lua_ssl_verify_depth ==
-
-'''syntax:''' ''lua_ssl_verify_depth <number>''
-
-'''default:''' ''lua_ssl_verify_depth 1''
-
-'''context:''' ''http, server, location''
-
-Sets the verification depth in the server certificates chain.
-
-This directive was first introduced in the <code>v0.9.11</code> release.
-
-See also [[#lua_ssl_trusted_certificate|lua_ssl_trusted_certificate]].
-
-== lua_http10_buffering ==
-
-'''syntax:''' ''lua_http10_buffering on|off''
-
-'''default:''' ''lua_http10_buffering on''
-
-'''context:''' ''http, server, location, location-if''
-
-Enables or disables automatic response buffering for HTTP 1.0 (or older) requests. This buffering mechanism is mainly used for HTTP 1.0 keep-alive which relies 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 explicitly via [[#ngx.send_headers|ngx.send_headers]] or implicitly via the first [[#ngx.say|ngx.say]] or [[#ngx.print|ngx.print]] call), then the HTTP 1.0 response buffering will be disabled even when this directive is turned on.
-
-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.
-
-This directive was first introduced in the <code>v0.5.0rc19</code> release.
-
-== rewrite_by_lua_no_postpone ==
-
-'''syntax:''' ''rewrite_by_lua_no_postpone on|off''
-
-'''default:''' ''rewrite_by_lua_no_postpone off''
-
-'''context:''' ''http''
-
-Controls whether or not to disable postponing [[#rewrite_by_lua|rewrite_by_lua*]] directives to run at the end of the <code>rewrite</code> request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the <code>rewrite</code> phase.
-
-This directive was first introduced in the <code>v0.5.0rc29</code> release.
-
-== access_by_lua_no_postpone ==
-
-'''syntax:''' ''access_by_lua_no_postpone on|off''
-
-'''default:''' ''access_by_lua_no_postpone off''
-
-'''context:''' ''http''
-
-Controls whether or not to disable postponing [[#access_by_lua|access_by_lua*]] directives to run at the end of the <code>access</code> request-processing phase. By default, this directive is turned off and the Lua code is postponed to run at the end of the <code>access</code> phase.
-
-This directive was first introduced in the <code>v0.9.20</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 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]].
-
-== lua_max_pending_timers ==
-
-'''syntax:''' ''lua_max_pending_timers <count>''
-
-'''default:''' ''lua_max_pending_timers 1024''
-
-'''context:''' ''http''
-
-Controls the maximum number of pending timers allowed.
-
-Pending timers are those timers that have not expired yet.
-
-When exceeding this limit, the [[#ngx.timer.at|ngx.timer.at]] call will immediately return <code>nil</code> and the error string "too many pending timers".
-
-This directive was first introduced in the <code>v0.8.0</code> release.
-
-== lua_max_running_timers ==
-
-'''syntax:''' ''lua_max_running_timers <count>''
-
-'''default:''' ''lua_max_running_timers 256''
-
-'''context:''' ''http''
-
-Controls the maximum number of "running timers" allowed.
-
-Running timers are those timers whose user callback functions are still running.
-
-When exceeding this limit, Nginx will stop running the callbacks of newly expired timers and log an error message "N lua_max_running_timers are not enough" where "N" is the current value of this directive.
-
-This directive was first introduced in the <code>v0.8.0</code> release.
-
-= Nginx API for Lua =
-
-<!-- inline-toc -->
-
-== Introduction ==
-The various <code>*_by_lua</code>, <code>*_by_lua_block</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 ngx_lua and are always available within ngx_lua directives.
-
-The packages can be introduced into external Lua modules like this:
-
-<geshi lang="lua">
-    local say = ngx.say
-
-    local _M = {}
-
-    function _M.foo(a)
-        say(a)
-    end
-
-    return _M
-</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:
-
-<geshi lang="lua">
-    local ngx = require "ngx"
-    local ndk = require "ndk"
-</geshi>
-
-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.capture|ngx.location.capture]] method and similar) is strongly recommended for maximum performance.
-
-== ngx.arg ==
-'''syntax:''' ''val = ngx.arg[index]''
-
-'''context:''' ''set_by_lua*, body_filter_by_lua*''
-
-When this is used in the context of the [[#set_by_lua|set_by_lua*]] directives, this table is read-only and holds the input arguments to the config directives:
-
-<geshi lang="lua">
-    value = ngx.arg[n]
-</geshi>
-
-Here is an example
-
-<geshi lang="nginx">
-    location /foo {
-        set $a 32;
-        set $b 56;
-
-        set_by_lua $sum
-            'return tonumber(ngx.arg[1]) + tonumber(ngx.arg[2])'
-            $a $b;
-
-        echo $sum;
-    }
-</geshi>
-
-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*]], 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*, body_filter_by_lua*, log_by_lua*''
-
-Read and write Nginx variable values.
-
-<geshi lang="nginx">
-    value = ngx.var.some_nginx_variable_name
-    ngx.var.some_nginx_variable_name = value
-</geshi>
-
-Note that only already defined nginx variables can be written to.
-For example:
-
-<geshi lang="nginx">
-    location /foo {
-        set $my_var ''; # this line is required to create $my_var at config time
-        content_by_lua_block {
-            ngx.var.my_var = 123;
-            ...
-        }
-    }
-</geshi>
-
-That is, nginx variables cannot be created on-the-fly.
-
-Some special nginx variables like <code>$args</code> and <code>$limit_rate</code> can be assigned a value,
-many others are not, like <code>$query_string</code>, <code>$arg_PARAMETER</code>, and <code>$http_NAME</code>.
-
-Nginx regex group capturing variables <code>$1</code>, <code>$2</code>, <code>$3</code>, and etc, can be read by this
-interface as well, by writing <code>ngx.var[1]</code>, <code>ngx.var[2]</code>, <code>ngx.var[3]</code>, and etc.
-
-Setting <code>ngx.var.Foo</code> to a <code>nil</code> value will unset the <code>$Foo</code> Nginx variable.
-
-<geshi lang="lua">
-    ngx.var.args = nil
-</geshi>
-
-'''CAUTION''' 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. Another way of caching the result is to use the [[#ngx.ctx|ngx.ctx]] table.
-
-Undefined NGINX variables are evaluated to <code>nil</code> while uninitialized (but defined) NGINX variables are evaluated to an empty Lua string.
-
-This API requires a relatively expensive metamethod call and it is recommended to avoid using it on hot code paths.
-
-== Core constants ==
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-<geshi lang="lua">
-  ngx.OK (0)
-  ngx.ERROR (-1)
-  ngx.AGAIN (-2)
-  ngx.DONE (-4)
-  ngx.DECLINED (-5)
-</geshi>
-
-Note that only three of these constants are utilized by the [[#Nginx API for Lua|Nginx API for Lua]] (i.e., [[#ngx.exit|ngx.exit]] accepts <code>ngx.OK</code>, <code>ngx.ERROR</code>, and <code>ngx.DECLINED</code> as input).
-
-<geshi lang="lua">
-  ngx.null
-</geshi>
-
-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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-<geshi lang="text">
-  ngx.HTTP_GET
-  ngx.HTTP_HEAD
-  ngx.HTTP_PUT
-  ngx.HTTP_POST
-  ngx.HTTP_DELETE
-  ngx.HTTP_OPTIONS   (added in the v0.5.0rc24 release)
-  ngx.HTTP_MKCOL     (added in the v0.8.2 release)
-  ngx.HTTP_COPY      (added in the v0.8.2 release)
-  ngx.HTTP_MOVE      (added in the v0.8.2 release)
-  ngx.HTTP_PROPFIND  (added in the v0.8.2 release)
-  ngx.HTTP_PROPPATCH (added in the v0.8.2 release)
-  ngx.HTTP_LOCK      (added in the v0.8.2 release)
-  ngx.HTTP_UNLOCK    (added in the v0.8.2 release)
-  ngx.HTTP_PATCH     (added in the v0.8.2 release)
-  ngx.HTTP_TRACE     (added in the v0.8.2 release)
-</geshi>
-
-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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-<geshi lang="nginx">
-  value = ngx.HTTP_CONTINUE (100) (first added in the v0.9.20 release)
-  value = ngx.HTTP_SWITCHING_PROTOCOLS (101) (first added in the v0.9.20 release)
-  value = ngx.HTTP_OK (200)
-  value = ngx.HTTP_CREATED (201)
-  value = ngx.HTTP_ACCEPTED (202) (first added in the v0.9.20 release)
-  value = ngx.HTTP_NO_CONTENT (204) (first added in the v0.9.20 release)
-  value = ngx.HTTP_PARTIAL_CONTENT (206) (first added in the v0.9.20 release)
-  value = ngx.HTTP_SPECIAL_RESPONSE (300)
-  value = ngx.HTTP_MOVED_PERMANENTLY (301)
-  value = ngx.HTTP_MOVED_TEMPORARILY (302)
-  value = ngx.HTTP_SEE_OTHER (303)
-  value = ngx.HTTP_NOT_MODIFIED (304)
-  value = ngx.HTTP_TEMPORARY_REDIRECT (307) (first added in the v0.9.20 release)
-  value = ngx.HTTP_PERMANENT_REDIRECT (308)
-  value = ngx.HTTP_BAD_REQUEST (400)
-  value = ngx.HTTP_UNAUTHORIZED (401)
-  value = ngx.HTTP_PAYMENT_REQUIRED (402) (first added in the v0.9.20 release)
-  value = ngx.HTTP_FORBIDDEN (403)
-  value = ngx.HTTP_NOT_FOUND (404)
-  value = ngx.HTTP_NOT_ALLOWED (405)
-  value = ngx.HTTP_NOT_ACCEPTABLE (406) (first added in the v0.9.20 release)
-  value = ngx.HTTP_REQUEST_TIMEOUT (408) (first added in the v0.9.20 release)
-  value = ngx.HTTP_CONFLICT (409) (first added in the v0.9.20 release)
-  value = ngx.HTTP_GONE (410)
-  value = ngx.HTTP_UPGRADE_REQUIRED (426) (first added in the v0.9.20 release)
-  value = ngx.HTTP_TOO_MANY_REQUESTS (429) (first added in the v0.9.20 release)
-  value = ngx.HTTP_CLOSE (444) (first added in the v0.9.20 release)
-  value = ngx.HTTP_ILLEGAL (451) (first added in the v0.9.20 release)
-  value = ngx.HTTP_INTERNAL_SERVER_ERROR (500)
-  value = ngx.HTTP_METHOD_NOT_IMPLEMENTED (501)
-  value = ngx.HTTP_BAD_GATEWAY (502) (first added in the v0.9.20 release)
-  value = ngx.HTTP_SERVICE_UNAVAILABLE (503)
-  value = ngx.HTTP_GATEWAY_TIMEOUT (504) (first added in the v0.3.1rc38 release)
-  value = ngx.HTTP_VERSION_NOT_SUPPORTED (505) (first added in the v0.9.20 release)
-  value = ngx.HTTP_INSUFFICIENT_STORAGE (507) (first added in the v0.9.20 release)
-</geshi>
-
-== Nginx log level constants ==
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-<geshi lang="lua">
-  ngx.STDERR
-  ngx.EMERG
-  ngx.ALERT
-  ngx.CRIT
-  ngx.ERR
-  ngx.WARN
-  ngx.NOTICE
-  ngx.INFO
-  ngx.DEBUG
-</geshi>
-
-These constants are usually used by the [[#ngx.log|ngx.log]] method.
-
-== print ==
-'''syntax:''' ''print(...)''
-
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Writes argument values into the nginx <code>error.log</code> file with the <code>ngx.NOTICE</code> log level.
-
-It is equivalent to
-
-<geshi lang="lua">
-    ngx.log(ngx.NOTICE, ...)
-</geshi>
-
-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 <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:''' ''init_worker_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.timer.*, balancer_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).
-
-Consider the following example,
-
-<geshi lang="nginx">
-    location /test {
-        rewrite_by_lua_block {
-            ngx.ctx.foo = 76
-        }
-        access_by_lua_block {
-            ngx.ctx.foo = ngx.ctx.foo + 3
-        }
-        content_by_lua_block {
-            ngx.say(ngx.ctx.foo)
-        }
-    }
-</geshi>
-
-Then <code>GET /test</code> will yield the output
-
-<geshi lang="bash">
-    79
-</geshi>
-
-That is, the <code>ngx.ctx.foo</code> entry persists across the rewrite, access, and content phases of a request.
-
-Every request, including subrequests, has its own copy of the table. For example:
-
-<geshi lang="nginx">
-    location /sub {
-        content_by_lua_block {
-            ngx.say("sub pre: ", ngx.ctx.blah)
-            ngx.ctx.blah = 32
-            ngx.say("sub post: ", ngx.ctx.blah)
-        }
-    }
-
-    location /main {
-        content_by_lua_block {
-            ngx.ctx.blah = 73
-            ngx.say("main pre: ", ngx.ctx.blah)
-            local res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-            ngx.say("main post: ", ngx.ctx.blah)
-        }
-    }
-</geshi>
-
-Then <code>GET /main</code> will give the output
-
-<geshi lang="bash">
-    main pre: 73
-    sub pre: nil
-    sub post: 32
-    main post: 73
-</geshi>
-
-Here, modification of the <code>ngx.ctx.blah</code> entry in the subrequest does not affect the one in the parent request. This is because they have two separate versions of <code>ngx.ctx.blah</code>.
-
-Internal redirection will destroy the original request <code>ngx.ctx</code> data (if any) and the new request will have an empty <code>ngx.ctx</code> table. For instance,
-
-<geshi lang="nginx">
-    location /new {
-        content_by_lua_block {
-            ngx.say(ngx.ctx.foo)
-        }
-    }
-
-    location /orig {
-        content_by_lua_block {
-            ngx.ctx.foo = "hello"
-            ngx.exec("/new")
-        }
-    }
-</geshi>
-
-Then <code>GET /orig</code> will give
-
-<geshi lang="bash">
-    nil
-</geshi>
-
-rather than the original <code>"hello"</code> value.
-
-Arbitrary data values, including Lua closures and nested tables, can be inserted into this "magic" table. It also allows the registration of custom meta methods.
-
-Overriding <code>ngx.ctx</code> with a new Lua table is also supported, for example,
-
-<geshi lang="lua">
-    ngx.ctx = { foo = 32, bar = 54 }
-</geshi>
-
-When being used in the context of [[#init_worker_by_lua|init_worker_by_lua*]], this table just has the same lifetime of the current Lua handler.
-
-The <code>ngx.ctx</code> lookup requires relatively expensive metamethod calls and it is much slower than explicitly passing per-request data along by your own function arguments. So do not abuse this API for saving your own function arguments because it usually has quite some performance impact.
-
-Because of the metamethod magic, never "local" the <code>ngx.ctx</code> table outside your Lua function scope on the Lua module level due to [[#Data_Sharing_within_an_Nginx_Worker|worker-level data sharing]]. For example, the following is bad:
-
-<geshi lang="lua">
--- mymodule.lua
-local _M = {}
-
--- the following line is bad since ngx.ctx is a per-request
--- data while this <code>ctx</code> variable is on the Lua module level
--- and thus is per-nginx-worker.
-local ctx = ngx.ctx
-
-function _M.main()
-    ctx.foo = "bar"
-end
-
-return _M
-</geshi>
-
-Use the following instead:
-
-<geshi lang="lua">
--- mymodule.lua
-local _M = {}
-
-function _M.main(ctx)
-    ctx.foo = "bar"
-end
-
-return _M
-</geshi>
-
-That is, let the caller pass the <code>ctx</code> table explicitly via a function argument.
-
-== ngx.location.capture ==
-'''syntax:''' ''res = ngx.location.capture(uri, options?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Issues 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 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.
-
-Subrequests are completely different from HTTP 301/302 redirection (via [[#ngx.redirect|ngx.redirect]]) and internal redirection (via [[#ngx.exec|ngx.exec]]).
-
-You should always read the request body (by either calling [[#ngx.req.read_body|ngx.req.read_body]] or configuring [[#lua_need_request_body|lua_need_request_body]] on) before initiating a subrequest.
-
-This API function (as well as [[#ngx.location.capture_multi|ngx.location.capture_multi]]) always buffers the whole response body of the subrequest in memory. Thus, you should use [[#ngx.socket.tcp|cosockets]]
-and streaming processing instead if you have to handle large subrequest responses.
-
-Here is a basic example:
-
-<geshi lang="lua">
-    res = ngx.location.capture(uri)
-</geshi>
-
-Returns a Lua table with 4 slots: <code>res.status</code>, <code>res.header</code>, <code>res.body</code>, and <code>res.truncated</code>.
-
-<code>res.status</code> holds the response status code for the subrequest response.
-
-<code>res.header</code> holds all the response headers of the
-subrequest and it is a normal Lua table. For multi-value response headers,
-the value is a Lua (array) table that holds all the values in the order that
-they appear. For instance, if the subrequest response headers contain the following
-lines:
-
-<geshi lang="bash">
-    Set-Cookie: a=3
-    Set-Cookie: foo=bar
-    Set-Cookie: baz=blah
-</geshi>
-
-Then <code>res.header["Set-Cookie"]</code> will be evaluated to the table value
-<code>{"a=3", "foo=bar", "baz=blah"}</code>.
-
-<code>res.body</code> holds the subrequest's response body data, which might be truncated. You always need to check the <code>res.truncated</code> boolean flag to see if <code>res.body</code> contains truncated data. The data truncation here can only be caused by those unrecoverable errors in your subrequests like the cases that the remote end aborts the connection prematurely in the middle of the response body data stream or a read timeout happens when your subrequest is receiving the response body data from the remote.
-
-URI query strings can be concatenated to URI itself, for instance,
-
-<geshi lang="lua">
-    res = ngx.location.capture('/foo/bar?a=3&b=4')
-</geshi>
-
-Named locations like <code>@foo</code> are not allowed due to a limitation in
-the nginx core. Use normal locations combined with the <code>internal</code> directive to
-prepare internal-only locations.
-
-An optional option table can be fed as the second
-argument, which supports the options:
-
-* <code>method</code>
-: specify the subrequest's request method, which only accepts constants like <code>ngx.HTTP_POST</code>.
-* <code>body</code>
-: specify the subrequest's request body (string value only).
-* <code>args</code>
-: specify the subrequest's URI query arguments (both string value and Lua tables are accepted)
-* <code>ctx</code>
-: specify a Lua table to be the [[#ngx.ctx|ngx.ctx]] table for the subrequest. It can be the current request's [[#ngx.ctx|ngx.ctx]] table, which effectively makes the parent and its subrequest to share exactly the same context table. This option was first introduced in the <code>v0.3.1rc25</code> release.
-* <code>vars</code>
-: take a Lua table which holds the values to set the specified Nginx variables in the subrequest as this option's value. This option was first introduced in the <code>v0.3.1rc31</code> release.
-* <code>copy_all_vars</code>
-: specify whether to copy over all the Nginx variable values of the current request to the subrequest in question. modifications of the nginx variables in the subrequest will not affect the current (parent) request. This option was first introduced in the <code>v0.3.1rc31</code> release.
-* <code>share_all_vars</code>
-: specify whether to share all the Nginx variables of the subrequest with the current (parent) request. modifications of the Nginx variables in the subrequest will affect the current (parent) request. Enabling this option may lead to hard-to-debug issues due to bad side-effects and is considered bad and harmful. Only enable this option when you completely know what you are doing.
-* <code>always_forward_body</code>
-: when set to true, the current (parent) request's request body will always be forwarded to the subrequest being created if the <code>body</code> option is not specified. The request body read by either [[#ngx.req.read_body|ngx.req.read_body()]] or [[#lua_need_request_body|lua_need_request_body on]] will be directly forwarded to the subrequest without copying the whole request body data when creating the subrequest (no matter the request body data is buffered in memory buffers or temporary files). By default, this option is <code>false</code> and when the <code>body</code> option is not specified, the request body of the current (parent) request is only forwarded when the subrequest takes the <code>PUT</code> or <code>POST</code> request method.
-
-Issuing a POST subrequest, for example, can be done as follows
-
-<geshi lang="lua">
-    res = ngx.location.capture(
-        '/foo/bar',
-        { method = ngx.HTTP_POST, body = 'hello, world' }
-    )
-</geshi>
-
-See HTTP method constants methods other than POST.
-The <code>method</code> option is <code>ngx.HTTP_GET</code> by default.
-
-The <code>args</code> option can specify extra URI arguments, for instance,
-
-<geshi lang="lua">
-    ngx.location.capture('/foo?a=1',
-        { args = { b = 3, c = ':' } }
-    )
-</geshi>
-
-is equivalent to
-
-<geshi lang="lua">
-    ngx.location.capture('/foo?a=1&b=3&c=%3a')
-</geshi>
-
-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:
-
-<geshi lang="lua">
-    ngx.location.capture('/foo?a=1',
-        { args = 'b=3&c=%3a' } }
-    )
-</geshi>
-
-This is functionally identical to the previous examples.
-
-The <code>share_all_vars</code> option controls whether to share nginx variables among the current request and its subrequests.
-If this option is set to <code>true</code>, then the current request and associated subrequests will share the same Nginx variable scope. Hence, changes to Nginx variables made by a subrequest will affect the current request.
-
-Care should be taken in using this option as variable scope sharing can have unexpected side effects. The <code>args</code>, <code>vars</code>, or <code>copy_all_vars</code> options are generally preferable instead.
-
-This option is set to <code>false</code> by default
-
-<geshi lang="nginx">
-    location /other {
-        set $dog "$dog world";
-        echo "$uri dog: $dog";
-    }
-
-    location /lua {
-        set $dog 'hello';
-        content_by_lua_block {
-            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
-
-<geshi lang="text">
-    /other dog: hello world
-    /lua: hello world
-</geshi>
-
-The <code>copy_all_vars</code> option provides a copy of the parent request's Nginx variables to subrequests when such subrequests are issued. Changes made to these variables by such subrequests will not affect the parent request or any other subrequests sharing the parent request's variables.
-
-<geshi lang="nginx">
-    location /other {
-        set $dog "$dog world";
-        echo "$uri dog: $dog";
-    }
-
-    location /lua {
-        set $dog 'hello';
-        content_by_lua_block {
-            res = ngx.location.capture("/other",
-                { copy_all_vars = true });
-
-            ngx.print(res.body)
-            ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-        }
-    }
-</geshi>
-
-Request <code>GET /lua</code> will give the output
-
-<geshi lang="text">
-    /other dog: hello world
-    /lua: hello
-</geshi>
-
-Note that if both <code>share_all_vars</code> and <code>copy_all_vars</code> are set to true, then <code>share_all_vars</code> takes precedence.
-
-In addition to the two settings above, it is possible to specify
-values for variables in the subrequest using the <code>vars</code> option. These
-variables are set after the sharing or copying of variables has been
-evaluated, and provides a more efficient method of passing specific
-values to a subrequest over encoding them as URL arguments and
-unescaping them in the Nginx config file.
-
-<geshi lang="nginx">
-    location /other {
-        content_by_lua_block {
-            ngx.say("dog = ", ngx.var.dog)
-            ngx.say("cat = ", ngx.var.cat)
-        }
-    }
-
-    location /lua {
-        set $dog '';
-        set $cat '';
-        content_by_lua_block {
-            res = ngx.location.capture("/other",
-                { vars = { dog = "hello", cat = 32 }});
-
-            ngx.print(res.body)
-        }
-    }
-</geshi>
-
-Accessing <code>/lua</code> will yield the output
-
-<geshi lang="text">
-    dog = hello
-    cat = 32
-</geshi>
-
-The <code>ctx</code> option can be used to specify a custom Lua table to serve as the [[#ngx.ctx|ngx.ctx]] table for the subrequest.
-
-<geshi lang="nginx">
-    location /sub {
-        content_by_lua_block {
-            ngx.ctx.foo = "bar";
-        }
-    }
-    location /lua {
-        content_by_lua_block {
-            local ctx = {}
-            res = ngx.location.capture("/sub", { ctx = ctx })
-
-            ngx.say(ctx.foo);
-            ngx.say(ngx.ctx.foo);
-        }
-    }
-</geshi>
-
-Then request <code>GET /lua</code> gives
-
-<geshi lang="text">
-    bar
-    nil
-</geshi>
-
-It is also possible to use this <code>ctx</code> option to share the same [[#ngx.ctx|ngx.ctx]] table between the current (parent) request and the subrequest:
-
-<geshi lang="nginx">
-    location /sub {
-        content_by_lua_block {
-            ngx.ctx.foo = "bar";
-        }
-    }
-    location /lua {
-        content_by_lua_block {
-            res = ngx.location.capture("/sub", { ctx = ngx.ctx })
-            ngx.say(ngx.ctx.foo);
-        }
-    }
-</geshi>
-
-Request <code>GET /lua</code> yields the output
-
-<geshi lang="text">
-    bar
-</geshi>
-
-Note that subrequests issued by [[#ngx.location.capture|ngx.location.capture]] inherit all the
-request headers of the current request by default and that this may have unexpected side effects on the
-subrequest responses. For example, when using the standard <code>ngx_proxy</code> module to serve
-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.
-
-When the <code>body</code> option is not specified and the <code>always_forward_body</code> option is false (the default value), the <code>POST</code> and <code>PUT</code> subrequests will inherit the request bodies of the parent request (if any).
-
-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>
-
-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?}, ... })''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Just like [[#ngx.location.capture|ngx.location.capture]], but supports multiple subrequests running in parallel.
-
-This function issues several parallel subrequests specified by the input table and returns their results in the same order. For example,
-
-<geshi lang="lua">
-    res1, res2, res3 = ngx.location.capture_multi{
-        { "/foo", { args = "a=3&b=4" } },
-        { "/bar" },
-        { "/baz", { method = ngx.HTTP_POST, body = "hello" } },
-    }
-
-    if res1.status == ngx.HTTP_OK then
-        ...
-    end
-
-    if res2.body == "BLAH" then
-        ...
-    end
-</geshi>
-
-This function will not return until all the subrequests terminate.
-The total latency is the longest latency of the individual subrequests rather than the sum.
-
-Lua tables can be used for both requests and responses when the number of subrequests to be issued is not known in advance:
-
-<geshi lang="lua">
-    -- construct the requests table
-    local reqs = {}
-    table.insert(reqs, { "/mysql" })
-    table.insert(reqs, { "/postgres" })
-    table.insert(reqs, { "/redis" })
-    table.insert(reqs, { "/memcached" })
-
-    -- issue all the requests at once and wait until they all return
-    local resps = { ngx.location.capture_multi(reqs) }
-
-    -- loop over the responses table
-    for i, resp in ipairs(resps) do
-        -- process the response table "resp"
-    end
-</geshi>
-
-The [[#ngx.location.capture|ngx.location.capture]] function is just a special form
-of this function. Logically speaking, the [[#ngx.location.capture|ngx.location.capture]] can be implemented like this
-
-<geshi lang="lua">
-    ngx.location.capture =
-        function (uri, args)
-            return ngx.location.capture_multi({ {uri, args} })
-        end
-</geshi>
-
-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*, 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.
-
-<geshi lang="lua">
-    ngx.status = ngx.HTTP_CREATED
-    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*, body_filter_by_lua*, log_by_lua*''
-
-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'
-    ngx.header.content_type = 'text/plain';
-
-    ngx.header["X-My-Header"] = 'blah blah';
-</geshi>
-
-Multi-value headers can be set this way:
-
-<geshi lang="lua">
-    ngx.header['Set-Cookie'] = {'a=32; path=/', 'b=4; path=/'}
-</geshi>
-
-will yield
-
-<geshi lang="bash">
-    Set-Cookie: a=32; path=/
-    Set-Cookie: b=4; path=/
-</geshi>
-
-in the response headers.
-
-Only Lua tables are accepted (Only the last element in the table will take effect for standard headers such as <code>Content-Type</code> that only accept a single value).
-
-<geshi lang="lua">
-    ngx.header.content_type = {'a', 'b'}
-</geshi>
-
-is equivalent to
-
-<geshi lang="lua">
-    ngx.header.content_type = 'b'
-</geshi>
-
-Setting a slot to <code>nil</code> effectively removes it from the response headers:
-
-<geshi lang="lua">
-    ngx.header["X-My-Header"] = nil;
-</geshi>
-
-The same applies to assigning an empty table:
-
-<geshi lang="lua">
-    ngx.header["X-My-Header"] = {};
-</geshi>
-
-Setting <code>ngx.header.HEADER</code> after sending out response headers (either explicitly with [[#ngx.send_headers|ngx.send_headers]] or implicitly with [[#ngx.print|ngx.print]] and similar) will log an error message.
-
-Reading <code>ngx.header.HEADER</code> will return the value of the response header named <code>HEADER</code>.
-
-Underscores (<code>_</code>) in the header names will also be replaced by dashes (<code>-</code>) and the header names will be matched case-insensitively. If the response header is not present at all, <code>nil</code> will be returned.
-
-This is particularly useful in the context of [[#header_filter_by_lua|header_filter_by_lua*]], for example,
-
-<geshi lang="nginx">
-    location /test {
-        set $footer '';
-
-        proxy_pass http://some-backend;
-
-        header_filter_by_lua_block {
-            if ngx.header["X-My-Header"] == "blah" then
-                ngx.var.footer = "some value"
-            end
-        }
-
-        echo_after_body $footer;
-    }
-</geshi>
-
-For multi-value headers, all of the values of header will be collected in order and returned as a Lua table. For example, response headers
-
-<geshi lang="text">
-    Foo: bar
-    Foo: baz
-</geshi>
-
-will result in
-
-<geshi lang="lua">
-    {"bar", "baz"}
-</geshi>
-
-to be returned when reading <code>ngx.header.Foo</code>.
-
-Note that <code>ngx.header</code> is not a normal Lua table and as such, it is not possible to iterate through it using the Lua <code>ipairs</code> function.
-
-For reading ''request'' headers, use the [[#ngx.req.get_headers|ngx.req.get_headers]] function instead.
-
-== ngx.resp.get_headers ==
-'''syntax:''' ''headers, err = ngx.resp.get_headers(max_headers?, raw?)''
-
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, balancer_by_lua*''
-
-Returns a Lua table holding all the current response headers for the current request.
-
-<geshi lang="lua">
-local h, err = ngx.resp.get_headers()
-
-if err == "truncated" then
-    -- one can choose to ignore or reject the current response here
-end
-
-for k, v in pairs(h) do
-    ...
-end
-</geshi>
-
-This function has the same signature as [[#ngx.req.get_headers|ngx.req.get_headers]] except getting response headers instead of request headers.
-
-Note that a maximum of 100 response headers are parsed by default (including those with the same name) and that additional response headers are silently discarded to guard against potential denial of service attacks. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-This API was first introduced in the <code>v0.9.5</code> release.
-
-== ngx.req.is_internal ==
-'''syntax:''' ''is_internal = ngx.req.is_internal()''
-
-'''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 boolean indicating whether the current request is an "internal request", i.e.,
-a request initiated from inside the current nginx server instead of from the client side.
-
-Subrequests are all internal requests and so are requests after internal redirects.
-
-This API was first introduced in the <code>v0.9.20</code> release.
-
-== 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.http_version ==
-'''syntax:''' ''num = ngx.req.http_version()''
-
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
-
-Returns the HTTP version number for the current request as a Lua number.
-
-Current possible values are 2.0, 1.0, 1.1, and 0.9. Returns <code>nil</code> for unrecognized values.
-
-This method was first introduced in the <code>v0.7.17</code> release.
-
-== ngx.req.raw_header ==
-'''syntax:''' ''str = ngx.req.raw_header(no_request_line?)''
-
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*''
-
-Returns the original raw HTTP protocol header received by the Nginx server.
-
-By default, the request line and trailing <code>CR LF</code> terminator will also be included. For example,
-
-<geshi lang="lua">
-    ngx.print(ngx.req.raw_header())
-</geshi>
-
-gives something like this:
-
-<geshi lang="text">
-    GET /t HTTP/1.1
-    Host: localhost
-    Connection: close
-    Foo: bar
-
-</geshi>
-
-You can specify the optional
-<code>no_request_line</code> argument as a <code>true</code> value to exclude the request line from the result. For example,
-
-<geshi lang="lua">
-    ngx.print(ngx.req.raw_header(true))
-</geshi>
-
-outputs something like this:
-
-<geshi lang="text">
-    Host: localhost
-    Connection: close
-    Foo: bar
-
-</geshi>
-
-This method was first introduced in the <code>v0.7.17</code> release.
-
-This method does not work in HTTP/2 requests yet.
-
-== 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*, balancer_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>method_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*, 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.
-
-The optional boolean <code>jump</code> argument can trigger location rematch (or location jump) as [[HttpRewriteModule]]'s [[HttpRewriteModule#rewrite|rewrite]] directive, that is, when <code>jump</code> is <code>true</code> (default to <code>false</code>), this function will never return and it will tell Nginx to try re-searching locations with the new URI value at the later <code>post-rewrite</code> phase and jumping to the new location.
-
-Location jump will not be triggered otherwise, and only the current request's URI will be modified, which is also the default behavior. This function will return but with no returned values when the <code>jump</code> argument is <code>false</code> or absent altogether.
-
-For example, the following nginx config snippet
-
-<geshi lang="nginx">
-    rewrite ^ /foo last;
-</geshi>
-
-can be coded in Lua like this:
-
-<geshi lang="lua">
-    ngx.req.set_uri("/foo", true)
-</geshi>
-
-Similarly, Nginx config
-
-<geshi lang="nginx">
-    rewrite ^ /foo break;
-</geshi>
-
-can be coded in Lua as
-
-<geshi lang="lua">
-    ngx.req.set_uri("/foo", false)
-</geshi>
-
-or equivalently,
-
-<geshi lang="lua">
-    ngx.req.set_uri("/foo")
-</geshi>
-
-The <code>jump</code> argument can only be set to <code>true</code> in [[#rewrite_by_lua|rewrite_by_lua*]]. Use of jump in other contexts is prohibited and will throw out a Lua exception.
-
-A more sophisticated example involving regex substitutions is as follows
-
-<geshi lang="nginx">
-    location /test {
-        rewrite_by_lua_block {
-            local uri = ngx.re.sub(ngx.var.uri, "^/test/(.*)", "/$1", "o")
-            ngx.req.set_uri(uri)
-        }
-        proxy_pass http://my_backend;
-    }
-</geshi>
-
-which is functionally equivalent to
-
-<geshi lang="nginx">
-    location /test {
-        rewrite ^/test/(.*) /$1 break;
-        proxy_pass http://my_backend;
-    }
-</geshi>
-
-Note that it is not possible to use this interface to rewrite URI arguments and that [[#ngx.req.set_uri_args|ngx.req.set_uri_args]] should be used for this instead. For instance, Nginx config
-
-<geshi lang="nginx">
-    rewrite ^ /foo?a=3? last;
-</geshi>
-
-can be coded as
-
-<geshi lang="nginx">
-    ngx.req.set_uri_args("a=3")
-    ngx.req.set_uri("/foo", true)
-</geshi>
-
-or
-
-<geshi lang="nginx">
-    ngx.req.set_uri_args({a = 3})
-    ngx.req.set_uri("/foo", true)
-</geshi>
-
-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*, 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
-
-<geshi lang="lua">
-    ngx.req.set_uri_args("a=3&b=hello%20world")
-</geshi>
-
-or a Lua table holding the query arguments' key-value pairs, as in
-
-<geshi lang="lua">
-    ngx.req.set_uri_args({ a = 3, b = "hello world" })
-</geshi>
-
-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:
-
-<geshi lang="lua">
-    ngx.req.set_uri_args({ a = 3, b = {5, 6} })
-</geshi>
-
-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.
-
-See also [[#ngx.req.set_uri|ngx.req.set_uri]].
-
-== ngx.req.get_uri_args ==
-'''syntax:''' ''args, err = ngx.req.get_uri_args(max_args?)''
-
-'''context:''' ''set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, balancer_by_lua*''
-
-Returns a Lua table holding all the current request URL query arguments.
-
-<geshi lang="nginx">
-    location = /test {
-        content_by_lua_block {
-            local args, err = ngx.req.get_uri_args()
-
-            if err == "truncated" then
-                -- one can choose to ignore or reject the current request here
-            end
-
-            for key, val in pairs(args) do
-                if type(val) == "table" then
-                    ngx.say(key, ": ", table.concat(val, ", "))
-                else
-                    ngx.say(key, ": ", val)
-                end
-            end
-        }
-    }
-</geshi>
-
-Then <code>GET /test?foo=bar&bar=baz&bar=blah</code> will yield the response body
-
-<geshi lang="bash">
-    foo: bar
-    bar: baz, blah
-</geshi>
-
-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 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
-</geshi>
-
-Arguments without the <code>=<value></code> parts are treated as boolean arguments. <code>GET /test?foo&bar</code> will yield:
-
-<geshi lang="bash">
-    foo: true
-    bar: true
-</geshi>
-
-That is, they will take Lua boolean values <code>true</code>. However, they are different from arguments taking empty string values. <code>GET /test?foo=&bar=</code> will give something like
-
-<geshi lang="bash">
-    foo:
-    bar:
-</geshi>
-
-Empty key arguments are discarded. <code>GET /test?=hello&=world</code> will yield an empty output for instance.
-
-Updating query arguments via the nginx variable <code>$args</code> (or <code>ngx.var.args</code> in Lua) at runtime is also supported:
-
-<geshi lang="lua">
-    ngx.var.args = "a=3&b=42"
-    local args, err = ngx.req.get_uri_args()
-</geshi>
-
-Here the <code>args</code> table will always look like
-
-<geshi lang="lua">
-    {a = 3, b = 42}
-</geshi>
-
-regardless of the actual request query string.
-
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-However, the optional <code>max_args</code> function argument can be used to override this limit:
-
-<geshi lang="lua">
-    local args, err = ngx.req.get_uri_args(10)
-    if err == "truncated" then
-        -- one can choose to ignore or reject the current request here
-    end
-</geshi>
-
-This argument can be set to zero to remove the limit and to process all request arguments received:
-
-<geshi lang="lua">
-    local args, err = ngx.req.get_uri_args(0)
-</geshi>
-
-Removing the <code>max_args</code> cap is strongly discouraged.
-
-== ngx.req.get_post_args ==
-'''syntax:''' ''args, err = ngx.req.get_post_args(max_args?)''
-
-'''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 errors.
-
-<geshi lang="nginx">
-    location = /test {
-        content_by_lua_block {
-            ngx.req.read_body()
-            local args, err = ngx.req.get_post_args()
-
-            if err == "truncated" then
-                -- one can choose to ignore or reject the current request here
-            end
-
-            if not args then
-                ngx.say("failed to get post args: ", err)
-                return
-            end
-            for key, val in pairs(args) do
-                if type(val) == "table" then
-                    ngx.say(key, ": ", table.concat(val, ", "))
-                else
-                    ngx.say(key, ": ", val)
-                end
-            end
-        }
-    }
-</geshi>
-
-Then
-
-<geshi lang="bash">
-    # Post request with the body 'foo=bar&bar=baz&bar=blah'
-    $ curl --data 'foo=bar&bar=baz&bar=blah' localhost/test
-</geshi>
-
-will yield the response body like
-
-<geshi lang="bash">
-    foo: bar
-    bar: baz, blah
-</geshi>
-
-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 unescaped according to URI escaping rules.
-
-With the settings above,
-
-<geshi lang="bash">
-    # POST request with body 'a%20b=1%61+2'
-    $ curl -d 'a%20b=1%61+2' localhost/test
-</geshi>
-
-will yield:
-
-<geshi lang="bash">
-    a b: 1a 2
-</geshi>
-
-Arguments without the <code>=<value></code> parts are treated as boolean arguments. <code>POST /test</code> with the request body <code>foo&bar</code> will yield:
-
-<geshi lang="bash">
-    foo: true
-    bar: true
-</geshi>
-
-That is, they will take Lua boolean values <code>true</code>. However, they are different from arguments taking empty string values. <code>POST /test</code> with request body <code>foo=&bar=</code> will return something like
-
-<geshi lang="bash">
-    foo:
-    bar:
-</geshi>
-
-Empty key arguments are discarded. <code>POST /test</code> with body <code>=hello&=world</code> will yield empty outputs for instance.
-
-Note that a maximum of 100 request arguments are parsed by default (including those with the same name) and that additional request arguments are silently discarded to guard against potential denial of service attacks. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-However, the optional <code>max_args</code> function argument can be used to override this limit:
-
-<geshi lang="lua">
-    local args, err = ngx.req.get_post_args(10)
-    if err == "truncated" then
-        -- one can choose to ignore or reject the current request here
-    end
-</geshi>
-
-This argument can be set to zero to remove the limit and to process all request arguments received:
-
-<geshi lang="lua">
-    local args, err = ngx.req.get_post_args(0)
-</geshi>
-
-Removing the <code>max_args</code> cap is strongly discouraged.
-
-== ngx.req.get_headers ==
-'''syntax:''' ''headers, err = ngx.req.get_headers(max_headers?, raw?)''
-
-'''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.
-
-<geshi lang="lua">
-    local h, err = ngx.req.get_headers()
-
-    if err == "truncated" then
-        -- one can choose to ignore or reject the current request here
-    end
-
-    for k, v in pairs(h) do
-        ...
-    end
-</geshi>
-
-To read an individual header:
-
-<geshi lang="lua">
-    ngx.say("Host: ", ngx.req.get_headers()["Host"])
-</geshi>
-
-Note that the [[#ngx.var.VARIABLE|ngx.var.HEADER]] API call, which uses core [[HttpCoreModule#$http_HEADER|$http_HEADER]] variables, may be more preferable for reading individual request headers.
-
-For multiple instances of request headers such as:
-
-<geshi lang="bash">
-    Foo: foo
-    Foo: bar
-    Foo: baz
-</geshi>
-
-the value of <code>ngx.req.get_headers()["Foo"]</code> will be a Lua (array) table such as:
-
-<geshi lang="lua">
-    {"foo", "bar", "baz"}
-</geshi>
-
-Note that a maximum of 100 request headers are parsed by default (including those with the same name) and that additional request headers are silently discarded to guard against potential denial of service attacks. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-However, the optional <code>max_headers</code> function argument can be used to override this limit:
-
-<geshi lang="lua">
-    local headers, err = ngx.req.get_headers(10)
-
-    if err == "truncated" then
-        -- one can choose to ignore or reject the current request here
-    end
-</geshi>
-
-This argument can be set to zero to remove the limit and to process all request headers received:
-
-<geshi lang="lua">
-    local headers, err = ngx.req.get_headers(0)
-</geshi>
-
-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*, 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.
-
-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-Type</code> header:
-
-<geshi lang="lua">
-    ngx.req.set_header("Content-Type", "text/css")
-</geshi>
-
-The <code>header_value</code> can take an array list of values,
-for example,
-
-<geshi lang="lua">
-    ngx.req.set_header("Foo", {"a", "abc"})
-</geshi>
-
-will produce two new request headers:
-
-<geshi lang="bash">
-    Foo: a
-    Foo: abc
-</geshi>
-
-and old <code>Foo</code> headers will be overridden if there is any.
-
-When the <code>header_value</code> argument is <code>nil</code>, the request header will be removed. So
-
-<geshi lang="lua">
-    ngx.req.set_header("X-Foo", nil)
-</geshi>
-
-is equivalent to
-
-<geshi lang="lua">
-    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*''
-
-Clears the current request's request header named <code>header_name</code>. None of the current request's existing subrequests will be affected but subsequently initiated subrequests will inherit the change by default.
-
-== ngx.req.read_body ==
-'''syntax:''' ''ngx.req.read_body()''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Reads the client request body synchronously without blocking the Nginx event loop.
-
-<geshi lang="lua">
-    ngx.req.read_body()
-    local args = ngx.req.get_post_args()
-</geshi>
-
-If the request body is already read previously by turning on [[#lua_need_request_body|lua_need_request_body]] or by using other modules, then this function does not run and returns immediately.
-
-If the request body has already been explicitly discarded, either by the [[#ngx.req.discard_body|ngx.req.discard_body]] function or other modules, this function does not run and returns immediately.
-
-In case of errors, such as connection errors while reading the data, this method will throw out a Lua exception ''or'' terminate the current request with a 500 status code immediately.
-
-The request body data read using this function can be retrieved later via [[#ngx.req.get_body_data|ngx.req.get_body_data]] or, alternatively, the temporary file name for the body data cached to disk using [[#ngx.req.get_body_file|ngx.req.get_body_file]]. This depends on
-
-# whether the current request body is already larger than the [[HttpCoreModule#client_body_buffer_size|client_body_buffer_size]],
-# and whether [[HttpCoreModule#client_body_in_file_only|client_body_in_file_only]] has been switched on.
-
-In cases where current request may have a request body and the request body data is not required, The [[#ngx.req.discard_body|ngx.req.discard_body]] function must be used to explicitly discard the request body to avoid breaking things under HTTP 1.1 keepalive or HTTP 1.1 pipelining.
-
-This function was first introduced in the <code>v0.3.1rc17</code> release.
-
-== ngx.req.discard_body ==
-'''syntax:''' ''ngx.req.discard_body()''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Explicitly discard the request body, i.e., read the data on the connection and throw it away immediately (without using the request body by any means).
-
-This function is an asynchronous call and returns immediately.
-
-If the request body has already been read, this function does nothing and returns immediately.
-
-This function was first introduced in the <code>v0.3.1rc17</code> release.
-
-See also [[#ngx.req.read_body|ngx.req.read_body]].
-
-== ngx.req.get_body_data ==
-'''syntax:''' ''data = ngx.req.get_body_data()''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, log_by_lua*''
-
-Retrieves in-memory request body data. It returns a Lua string rather than a Lua table holding all the parsed query arguments. Use the [[#ngx.req.get_post_args|ngx.req.get_post_args]] function instead if a Lua table is required.
-
-This function returns <code>nil</code> if
-
-# the request body has not been read,
-# 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. 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.
-
-To force in-memory request bodies, try setting [[HttpCoreModule#client_body_buffer_size|client_body_buffer_size]] to the same size value in [[HttpCoreModule#client_max_body_size|client_max_body_size]].
-
-Note that calling this function instead of using <code>ngx.var.request_body</code> or <code>ngx.var.echo_request_body</code> is more efficient because it can save one dynamic memory allocation and one data copy.
-
-This function was first introduced in the <code>v0.3.1rc17</code> release.
-
-See also [[#ngx.req.get_body_file|ngx.req.get_body_file]].
-
-== ngx.req.get_body_file ==
-'''syntax:''' ''file_name = ngx.req.get_body_file()''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-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 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. 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.
-
-To force in-file request bodies, try turning on [[HttpCoreModule#client_body_in_file_only|client_body_in_file_only]].
-
-This function was first introduced in the <code>v0.3.1rc17</code> release.
-
-See also [[#ngx.req.get_body_data|ngx.req.get_body_data]].
-
-== ngx.req.set_body_data ==
-'''syntax:''' ''ngx.req.set_body_data(data)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Set the current request's request body using the in-memory data specified by the <code>data</code> argument.
-
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
-
-This function was first introduced in the <code>v0.3.1rc18</code> release.
-
-See also [[#ngx.req.set_body_file|ngx.req.set_body_file]].
-
-== ngx.req.set_body_file ==
-'''syntax:''' ''ngx.req.set_body_file(file_name, auto_clean?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-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 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.
-
-If the current request's request body has not been read, then it will be properly discarded. When the current request's request body has been read into memory or buffered into a disk file, then the old request body's memory will be freed or the disk file will be cleaned up immediately, respectively.
-
-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()''
-
-'''syntax:''' ''tcpsock, err = ngx.req.socket(raw)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Returns a read-only cosocket object that wraps the downstream connection. Only [[#tcpsock:receive|receive]] and [[#tcpsock:receiveuntil|receiveuntil]] methods are supported on this object.
-
-In case of error, <code>nil</code> will be returned as well as a string describing the error.
-
-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 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.
-Chunked request bodies are not yet supported in this API.
-
-Since the <code>v0.9.0</code> release, this function accepts an optional boolean <code>raw</code> argument. When this argument is <code>true</code>, this function returns a full-duplex cosocket object wrapping around the raw downstream connection socket, upon which you can call the [[#tcpsock:receive|receive]], [[#tcpsock:receiveuntil|receiveuntil]], and [[#tcpsock:send|send]] methods.
-
-When the <code>raw</code> argument is <code>true</code>, it is required that no pending data from any previous [[#ngx.say|ngx.say]], [[#ngx.print|ngx.print]], or [[#ngx.send_headers|ngx.send_headers]] calls exists. So if you have these downstream output calls previously, you should call [[#ngx.flush|ngx.flush(true)]] before calling <code>ngx.req.socket(true)</code> to ensure that there is no pending output data. If the request body has not been read yet, then this "raw socket" can also be used to read the request body.
-
-You can use the "raw request socket" returned by <code>ngx.req.socket(true)</code> to implement fancy protocols like [http://en.wikipedia.org/wiki/WebSocket WebSocket], or just emit your own raw HTTP response header or body data. You can refer to the [https://github.com/openresty/lua-resty-websocket lua-resty-websocket library] for a real world example.
-
-This function was first introduced in the <code>v0.5.0rc1</code> release.
-
-== ngx.exec ==
-'''syntax:''' ''ngx.exec(uri, args?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Does an internal redirect to <code>uri</code> with <code>args</code> and is similar to the [[HttpEchoModule#echo_exec|echo_exec]] directive of the [[HttpEchoModule]].
-
-<geshi lang="lua">
-    ngx.exec('/some-location');
-    ngx.exec('/some-location', 'a=3&b=5&c=6');
-    ngx.exec('/some-location?a=3&b=5', 'c=6');
-</geshi>
-
-The optional second <code>args</code> can be used to specify extra URI query arguments, for example:
-
-<geshi lang="lua">
-    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.
-
-<geshi lang="lua">
-    ngx.exec("/foo", { a = 3, b = "hello world" })
-</geshi>
-
-The result is exactly the same as the previous example.
-
-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.
-
-Named locations are also supported but the second <code>args</code> argument will be ignored if present and the querystring for the new target is inherited from the referring location (if any).
-
-<code>GET /foo/file.php?a=hello</code> will return "hello" and not "goodbye" in the example below
-
-<geshi lang="nginx">
-    location /foo {
-        content_by_lua_block {
-            ngx.exec("@bar", "a=goodbye");
-        }
-    }
-
-    location @bar {
-        content_by_lua_block {
-            local args = ngx.req.get_uri_args()
-            for key, val in pairs(args) do
-                if key == "a" then
-                    ngx.say(val)
-                end
-            end
-        }
-    }
-</geshi>
-
-Note that the <code>ngx.exec</code> method is different from [[#ngx.redirect|ngx.redirect]] in that
-it is purely an internal redirect and that no new external HTTP traffic is involved.
-
-Also note that this method call terminates the processing of the current request and that it ''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 is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.exec(...)</code> be adopted when this method call is used in contexts other than [[#header_filter_by_lua|header_filter_by_lua*]] to reinforce the fact that the request processing is being terminated.
-
-== ngx.redirect ==
-'''syntax:''' ''ngx.redirect(uri, status?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Issue an <code>HTTP 301</code> or <code>302</code> redirection to <code>uri</code>.
-
-The optional <code>status</code> parameter specifies the HTTP status code to be used. The following status codes are supported right now:
-
-* <code>301</code>
-* <code>302</code> (default)
-* <code>303</code>
-* <code>307</code>
-* <code>308</code>
-
-It is <code>302</code> (<code>ngx.HTTP_MOVED_TEMPORARILY</code>) by default.
-
-Here is an example assuming the current server name is <code>localhost</code> and that it is listening on port 1984:
-
-<geshi lang="lua">
-    return ngx.redirect("/foo")
-</geshi>
-
-which is equivalent to
-
-<geshi lang="lua">
-    return ngx.redirect("/foo", ngx.HTTP_MOVED_TEMPORARILY)
-</geshi>
-
-Redirecting arbitrary external URLs is also supported, for example:
-
-<geshi lang="lua">
-    return ngx.redirect("http://www.google.com")
-</geshi>
-
-We can also use the numerical code directly as the second <code>status</code> argument:
-
-<geshi lang="lua">
-    return ngx.redirect("/foo", 301)
-</geshi>
-
-This method is similar to the [[HttpRewriteModule#rewrite|rewrite]] directive with the <code>redirect</code> modifier in the standard
-[[HttpRewriteModule]], for example, this <code>nginx.conf</code> snippet
-
-<geshi lang="nginx">
-    rewrite ^ /foo? redirect;  # nginx config
-</geshi>
-
-is equivalent to the following Lua code
-
-<geshi lang="lua">
-    return ngx.redirect('/foo');  -- Lua code
-</geshi>
-
-while
-
-<geshi lang="nginx">
-    rewrite ^ /foo? permanent;  # nginx config
-</geshi>
-
-is equivalent to
-
-<geshi lang="lua">
-    return ngx.redirect('/foo', ngx.HTTP_MOVED_PERMANENTLY)  -- Lua code
-</geshi>
-
-URI arguments can be specified as well, for example:
-
-<geshi lang="lua">
-    return ngx.redirect('/foo?a=3&b=4')
-</geshi>
-
-Note that this method call terminates the processing of the current request and that it ''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 is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.redirect(...)</code> be adopted when this method call is used in contexts other than [[#header_filter_by_lua|header_filter_by_lua*]] to reinforce the fact that the request processing is being terminated.
-
-== ngx.send_headers ==
-'''syntax:''' ''ok, err = ngx.send_headers()''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Explicitly send out the response headers.
-
-Since <code>v0.8.3</code> this function returns <code>1</code> on success, or returns <code>nil</code> and a string describing the error otherwise.
-
-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*''
-
-Returns <code>true</code> if the response headers have been sent (by ngx_lua), and <code>false</code> otherwise.
-
-This API was first introduced in ngx_lua v0.3.1rc6.
-
-== ngx.print ==
-'''syntax:''' ''ok, err = ngx.print(...)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Emits arguments concatenated to the HTTP client (as response body). If response headers have not been sent, this function will send headers out first and then output body data.
-
-Since <code>v0.8.3</code> this function returns <code>1</code> on success, or returns <code>nil</code> and a string describing the error otherwise.
-
-Lua <code>nil</code> values will output <code>"nil"</code> strings and Lua boolean values will output <code>"true"</code> and <code>"false"</code> literal strings respectively.
-
-Nested arrays of strings are permitted and the elements in the arrays will be sent one by one:
-
-<geshi lang="lua">
-    local table = {
-        "hello, ",
-        {"world: ", true, " or ", false,
-            {": ", nil}}
-    }
-    ngx.print(table)
-</geshi>
-
-will yield the output
-
-<geshi lang="bash">
-    hello, world: true or false: nil
-</geshi>
-
-Non-array table arguments will cause a Lua exception to be thrown.
-
-The <code>ngx.null</code> constant will yield the <code>"null"</code> string output.
-
-This is an asynchronous call and will return immediately without waiting for all the data to be written into the system send buffer. To run in synchronous mode, call <code>ngx.flush(true)</code> after calling <code>ngx.print</code>. This can be particularly useful for streaming output. See [[#ngx.flush|ngx.flush]] for more details.
-
-Please note that both <code>ngx.print</code> and [[#ngx.say|ngx.say]] will always invoke the whole Nginx output body filter chain, which is an expensive operation. So be careful when calling either of these two in a tight loop; buffer the data yourself in Lua and save the calls.
-
-== ngx.say ==
-'''syntax:''' ''ok, err = ngx.say(...)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Just as [[#ngx.print|ngx.print]] but also emit a trailing newline.
-
-== ngx.log ==
-'''syntax:''' ''ngx.log(log_level, ...)''
-
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Log arguments concatenated to error.log with the given logging level.
-
-Lua <code>nil</code> arguments are accepted and result in literal <code>"nil"</code> string while Lua booleans result in literal <code>"true"</code> or <code>"false"</code> string outputs. And the <code>ngx.null</code> constant will yield the <code>"null"</code> string output.
-
-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 <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:''' ''ok, err = ngx.flush(wait?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-Flushes response output to the client.
-
-<code>ngx.flush</code> accepts an optional boolean <code>wait</code> argument (Default: <code>false</code>) first introduced in the <code>v0.3.1rc34</code> release. When called with the default argument, it issues an asynchronous call (Returns immediately without waiting for output data to be written into the system send buffer). Calling the function with the <code>wait</code> argument set to <code>true</code> switches to synchronous mode.
-
-In synchronous mode, the function will not return until all output data has been written into the system send buffer or until the [[HttpCoreModule#send_timeout|send_timeout]] setting has expired. Note that using the Lua coroutine mechanism means that this function does not block the Nginx event loop even in the synchronous mode.
-
-When <code>ngx.flush(true)</code> is called immediately after [[#ngx.print|ngx.print]] or [[#ngx.say|ngx.say]], it causes the latter functions to run in synchronous mode. This can be particularly useful for streaming output.
-
-Note that <code>ngx.flush</code> is not functional when in the HTTP 1.0 output buffering mode. See [[#HTTP 1.0 support|HTTP 1.0 support]].
-
-Since <code>v0.8.3</code> this function returns <code>1</code> on success, or returns <code>nil</code> and a string describing the error otherwise.
-
-== ngx.exit ==
-'''syntax:''' ''ngx.exit(status)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-When <code>status >= 200</code> (i.e., <code>ngx.HTTP_OK</code> and above), it will interrupt the execution of the current request and return status code to nginx.
-
-When <code>status == 0</code> (i.e., <code>ngx.OK</code>), it will only quit the current phase handler (or the content handler if the [[#content_by_lua|content_by_lua*]] directive is used) and continue to run later phases (if any) for the current request.
-
-The <code>status</code> argument can be <code>ngx.OK</code>, <code>ngx.ERROR</code>, <code>ngx.HTTP_NOT_FOUND</code>,
-<code>ngx.HTTP_MOVED_TEMPORARILY</code>, or other [[#HTTP status constants|HTTP status constants]].
-
-To return an error page with custom contents, use code snippets like this:
-
-<geshi lang="lua">
-    ngx.status = ngx.HTTP_GONE
-    ngx.say("This is our own content")
-    -- to cause quit the whole request rather than the current phase handler
-    ngx.exit(ngx.HTTP_OK)
-</geshi>
-
-The effect in action:
-
-<geshi lang="bash">
-    $ curl -i http://localhost/test
-    HTTP/1.1 410 Gone
-    Server: nginx/1.0.6
-    Date: Thu, 15 Sep 2011 00:51:48 GMT
-    Content-Type: text/plain
-    Transfer-Encoding: chunked
-    Connection: keep-alive
-
-    This is our own content
-</geshi>
-
-Number literals can be used directly as the argument, for instance,
-
-<geshi lang="lua">
-    ngx.exit(501)
-</geshi>
-
-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]].
-
-Also note that this method call terminates the processing of the current request and that it is recommended that a coding style that combines this method call with the <code>return</code> statement, i.e., <code>return ngx.exit(...)</code> be used to reinforce the fact that the request processing is being terminated.
-
-When being used in the contexts of [[#header_filter_by_lua|header_filter_by_lua*]], [[#balancer_by_lua_block|balancer_by_lua*]], and
-[[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]], <code>ngx.exit()</code> is
-an asynchronous operation and will return immediately. This behavior may change in future and it is recommended that users always use <code>return</code> in combination as suggested above.
-
-== ngx.eof ==
-'''syntax:''' ''ok, err = ngx.eof()''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*''
-
-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 well written 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_block {
-            ngx.say("got the task!")
-            ngx.eof()  -- well written HTTP clients 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>
-
-A better way to do background jobs is to use the [[#ngx.timer.at|ngx.timer.at]] API.
-
-Since <code>v0.8.3</code> this function returns <code>1</code> on success, or returns <code>nil</code> and a string describing the error otherwise.
-
-== ngx.sleep ==
-'''syntax:''' ''ngx.sleep(seconds)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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.
-
-Since the <code>0.7.20</code> release, The <code>0</code> time argument can also be specified.
-
-This method was introduced in the <code>0.5.0rc30</code> release.
-
-== ngx.escape_uri ==
-'''syntax:''' ''newstr = ngx.escape_uri(str)''
-
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Escape <code>str</code> as a URI component.
-
-== ngx.unescape_uri ==
-'''syntax:''' ''newstr = ngx.unescape_uri(str)''
-
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
-
-Unescape <code>str</code> as an escaped URI component.
-
-For example,
-
-<geshi lang="lua">
-    ngx.say(ngx.unescape_uri("b%20r56+7"))
-</geshi>
-
-gives the output
-
-<geshi lang="text">
-    b r56 7
-</geshi>
-
-== 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*''
-
-Encode the Lua table to a query args string according to the URI encoded rules.
-
-For example,
-
-<geshi lang="lua">
-    ngx.encode_args({foo = 3, ["b r"] = "hello world"})
-</geshi>
-
-yields
-
-<geshi lang="text">
-    foo=3&b%20r=hello%20world
-</geshi>
-
-The table keys must be Lua strings.
-
-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"}})
-</geshi>
-
-gives
-
-<geshi lang="text">
-    baz=32&baz=hello
-</geshi>
-
-If the value table is empty and the effect is equivalent to the <code>nil</code> value.
-
-Boolean argument values are also supported, for instance,
-
-<geshi lang="lua">
-    ngx.encode_args({a = true, b = 1})
-</geshi>
-
-yields
-
-<geshi lang="text">
-    a&b=1
-</geshi>
-
-If the argument value is <code>false</code>, then the effect is equivalent to the <code>nil</code> value.
-
-This method was first introduced in the <code>v0.3.1rc27</code> release.
-
-== ngx.decode_args ==
-'''syntax:''' ''table, err = ngx.decode_args(str, max_args?)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 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. Since <code>v0.10.13</code>, when the limit is exceeded, it will return a second value which is the string `"truncated"`.
-
-This argument can be set to zero to remove the limit and to process all request arguments received:
-
-<geshi lang="lua">
-    local args = ngx.decode_args(str, 0)
-</geshi>
-
-Removing the <code>max_args</code> cap is strongly discouraged.
-
-This method was introduced in the <code>v0.5.0rc29</code>.
-
-== ngx.encode_base64 ==
-'''syntax:''' ''newstr = ngx.encode_base64(str, no_padding?)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Encodes <code>str</code> to a base64 digest.
-
-Since the <code>0.9.16</code> release, an optional boolean-typed <code>no_padding</code> argument can be specified to control whether the base64 padding should be appended to the resulting digest (default to <code>false</code>, i.e., with padding enabled).
-
-== 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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Calculates the CRC-32 (Cyclic Redundancy Code) digest for the <code>str</code> argument.
-
-This method performs better on relatively short <code>str</code> inputs (i.e., less than 30 ~ 60 bytes), as compared to [[#ngx.crc32_long|ngx.crc32_long]]. The result is exactly the same as [[#ngx.crc32_long|ngx.crc32_long]].
-
-Behind the scene, it is just a thin wrapper around the <code>ngx_crc32_short</code> function defined in the Nginx core.
-
-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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Calculates the CRC-32 (Cyclic Redundancy Code) digest for the <code>str</code> argument.
-
-This method performs better on relatively long <code>str</code> inputs (i.e., longer than 30 ~ 60 bytes), as compared to [[#ngx.crc32_short|ngx.crc32_short]].  The result is exactly the same as [[#ngx.crc32_short|ngx.crc32_short]].
-
-Behind the scene, it is just a thin wrapper around the <code>ngx_crc32_long</code> function defined in the Nginx core.
-
-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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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>.
-
-The raw binary form of the <code>HMAC-SHA1</code> digest will be generated, use [[#ngx.encode_base64|ngx.encode_base64]], for example, to encode the result to a textual representation if desired.
-
-For example,
-
-<geshi lang="lua">
-    local key = "thisisverysecretstuff"
-    local src = "some string we want to sign"
-    local digest = ngx.hmac_sha1(key, src)
-    ngx.say(ngx.encode_base64(digest))
-</geshi>
-
-yields the output
-
-<geshi lang="text">
-    R/pvxzHC4NLtj7S+kXFg/NePTmk=
-</geshi>
-
-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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Returns the hexadecimal representation of the MD5 digest of the <code>str</code> argument.
-
-For example,
-
-<geshi lang="nginx">
-    location = /md5 {
-        content_by_lua_block { ngx.say(ngx.md5("hello")) }
-    }
-</geshi>
-
-yields the output
-
-<geshi lang="text">
-    5d41402abc4b2a76b9719d911017c592
-</geshi>
-
-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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Returns the binary form of the MD5 digest of the <code>str</code> argument.
-
-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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Returns the binary form of the SHA-1 digest of the <code>str</code> argument.
-
-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.quote_sql_str ==
-'''syntax:''' ''quoted_value = ngx.quote_sql_str(raw_value)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Returns a quoted SQL string literal according to the MySQL quoting rules.
-
-== ngx.today ==
-'''syntax:''' ''str = ngx.today()''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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).
-
-This is the local time.
-
-== ngx.time ==
-'''syntax:''' ''secs = ngx.time()''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-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 can be forced by calling [[#ngx.update_time|ngx.update_time]] first.
-
-== ngx.now ==
-'''syntax:''' ''secs = ngx.now()''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-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).
-
-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:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Forcibly updates the Nginx current time cache. This call involves a syscall and thus has some overhead, so do not abuse it.
-
-This API was first introduced in <code>v0.3.1rc32</code>.
-
-== ngx.localtime ==
-'''syntax:''' ''str = ngx.localtime()''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-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:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-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:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Returns a formatted 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))
-        -- yields "Thu, 18-Nov-10 11:27:35 GMT"
-</geshi>
-
-== ngx.http_time ==
-'''syntax:''' ''str = ngx.http_time(sec)''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 time stamp in seconds (like those returned from [[#ngx.time|ngx.time]]).
-
-<geshi lang="nginx">
-    ngx.say(ngx.http_time(1290079655))
-        -- yields "Thu, 18 Nov 2010 11:27:35 GMT"
-</geshi>
-
-== ngx.parse_http_time ==
-'''syntax:''' ''sec = ngx.parse_http_time(str)''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
-
-<geshi lang="nginx">
-    local time = ngx.parse_http_time("Thu, 18 Nov 2010 11:27:35 GMT")
-    if time == nil then
-        ...
-    end
-</geshi>
-
-== 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*, 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, err = ngx.re.match(subject, regex, options?, ctx?, res_table?)''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-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 errors, like seeing a bad regular expression or exceeding the PCRE stack limit, <code>nil</code> and a string describing the error will be returned.
-
-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, err = ngx.re.match("hello, 1234", "[0-9]+")
-    if m then
-        -- m[0] == "1234"
-
-    else
-        if err then
-            ngx.log(ngx.ERR, "error: ", err)
-            return
-        end
-
-        ngx.say("match not found")
-    end
-</geshi>
-
-<geshi lang="lua">
-    local m, err = ngx.re.match("hello, 1234", "([0-9])[0-9]+")
-    -- m[0] == "1234"
-    -- m[1] == "1"
-</geshi>
-
-Named captures are also supported since the <code>v0.7.14</code> release
-and are returned in the same Lua table as key-value pairs as the numbered captures.
-
-<geshi lang="lua">
-    local m, err = ngx.re.match("hello, 1234", "([0-9])(?<remaining>[0-9]+)")
-    -- m[0] == "1234"
-    -- m[1] == "1"
-    -- m[2] == "234"
-    -- m["remaining"] == "234"
-</geshi>
-
-Unmatched subpatterns will have <code>false</code> values in their <code>captures</code> table fields.
-
-<geshi lang="lua">
-    local m, err = ngx.re.match("hello, world", "(world)|(hello)|(?<named>howdy)")
-    -- m[0] == "hello"
-    -- m[1] == false
-    -- m[2] == "hello"
-    -- m[3] == false
-    -- m["named"] == false
-</geshi>
-
-Specify <code>options</code> to control how the match operation will be performed. The following option characters are supported:
-
-<geshi lang="text">
-    a             anchored mode (only match from the beginning)
-
-    d             enable the DFA mode (or the longest token match semantics).
-                  this requires PCRE 6.0+ or else a Lua exception will be thrown.
-                  first introduced in ngx_lua v0.3.1rc30.
-
-    D             enable duplicate named pattern support. This allows named
-                  subpattern names to be repeated, returning the captures in
-                  an array-like Lua table. for example,
-                    local m = ngx.re.match("hello, world",
-                                           "(?<named>\w+), (?<named>\w+)",
-                                           "D")
-                    -- m["named"] == {"hello", "world"}
-                  this option was first introduced in the v0.7.14 release.
-                  this option requires at least PCRE 8.12.
-
-    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.
-                  first introduced in ngx_lua v0.3.1rc30.
-
-    J             enable the PCRE Javascript compatible mode. this option was
-                  first introduced in the v0.7.14 release. this option requires
-                  at least PCRE 8.12.
-
-    m             multi-line mode (similar to Perl's /m modifier)
-
-    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)
-
-    u             UTF-8 mode. this requires PCRE to be built with
-                  the --enable-utf8 option or else a Lua exception will be thrown.
-
-    U             similar to "u" but disables PCRE's UTF-8 validity check on
-                  the subject string. first introduced in ngx_lua v0.8.1.
-
-    x             extended mode (similar to Perl's /x modifier)
-</geshi>
-
-These options can be combined:
-
-<geshi lang="nginx">
-    local m, err = ngx.re.match("hello, world", "HEL LO", "ix")
-    -- m[0] == "hello"
-</geshi>
-
-<geshi lang="nginx">
-    local m, err = ngx.re.match("hello, 美好生活", "HELLO, (.{2})", "iu")
-    -- m[0] == "hello, 美好"
-    -- m[1] == "美好"
-</geshi>
-
-The <code>o</code> option is useful for performance tuning, because the regex pattern in question will only be compiled once, cached in the worker-process level, and shared among all requests in the current Nginx worker process. The upper limit of the regex cache can be tuned via the [[#lua_regex_cache_max_entries|lua_regex_cache_max_entries]] directive.
-
-The optional fourth argument, <code>ctx</code>, can be a Lua table holding an optional <code>pos</code> field. When the <code>pos</code> field in the <code>ctx</code> table argument is specified, <code>ngx.re.match</code> will start matching from that offset (starting from 1). Regardless of the presence of the <code>pos</code> field in the <code>ctx</code> table, <code>ngx.re.match</code> will always set this <code>pos</code> field to the position ''after'' the substring matched by the whole pattern in case of a successful match. When match fails, the <code>ctx</code> table will be left intact.
-
-<geshi lang="lua">
-    local ctx = {}
-    local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
-         -- m[0] = "1234"
-         -- ctx.pos == 5
-</geshi>
-
-<geshi lang="lua">
-    local ctx = { pos = 2 }
-    local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
-         -- m[0] = "234"
-         -- ctx.pos == 5
-</geshi>
-
-The <code>ctx</code> table argument combined with the <code>a</code> regex modifier can be used to construct a lexer atop <code>ngx.re.match</code>.
-
-Note that, the <code>options</code> argument is not optional when the <code>ctx</code> argument is specified and that the empty Lua string (<code>""</code>) must be used as placeholder for <code>options</code> if no meaningful regex options are required.
-
-This method requires the PCRE library enabled in Nginx.  ([[#Special Escaping Sequences|Known Issue With Special Escaping Sequences]]).
-
-To confirm that PCRE JIT is enabled, activate the Nginx debug log by adding the <code>--with-debug</code> option to Nginx or 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
-</geshi>
-
-Starting from the <code>0.9.4</code> release, this function also accepts a 5th argument, <code>res_table</code>, for letting the caller supply the Lua table used to hold all the capturing results. Starting from <code>0.9.6</code>, it is the caller's responsibility to ensure this table is empty. This is very useful for recycling Lua tables and saving GC and table allocation overhead.
-
-This feature was introduced in the <code>v0.2.1rc11</code> release.
-
-== ngx.re.find ==
-'''syntax:''' ''from, to, err = ngx.re.find(subject, regex, options?, ctx?, nth?)''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Similar to [[#ngx.re.match|ngx.re.match]] but only returns the beginning index (<code>from</code>) and end index (<code>to</code>) of the matched substring. The returned indexes are 1-based and can be fed directly into the [http://www.lua.org/manual/5.1/manual.html#pdf-string.sub string.sub] API function to obtain the matched substring.
-
-In case of errors (like bad regexes or any PCRE runtime errors), this API function returns two <code>nil</code> values followed by a string describing the error.
-
-If no match is found, this function just returns a <code>nil</code> value.
-
-Below is an example:
-
-<geshi lang="lua">
-    local s = "hello, 1234"
-    local from, to, err = ngx.re.find(s, "([0-9]+)", "jo")
-    if from then
-        ngx.say("from: ", from)
-        ngx.say("to: ", to)
-        ngx.say("matched: ", string.sub(s, from, to))
-    else
-        if err then
-            ngx.say("error: ", err)
-            return
-        end
-        ngx.say("not matched!")
-    end
-</geshi>
-
-This example produces the output
-
-    from: 8
-    to: 11
-    matched: 1234
-
-Because this API function does not create new Lua strings nor new Lua tables, it is much faster than [[#ngx.re.match|ngx.re.match]]. It should be used wherever possible.
-
-Since the <code>0.9.3</code> release, an optional 5th argument, <code>nth</code>, is supported to specify which (submatch) capture's indexes to return. When <code>nth</code> is 0 (which is the default), the indexes for the whole matched substring is returned; when <code>nth</code> is 1, then the 1st submatch capture's indexes are returned; when <code>nth</code> is 2, then the 2nd submatch capture is returned, and so on. When the specified submatch does not have a match, then two <code>nil</code> values will be returned. Below is an example for this:
-
-<geshi lang="lua">
-    local str = "hello, 1234"
-    local from, to = ngx.re.find(str, "([0-9])([0-9]+)", "jo", nil, 2)
-    if from then
-        ngx.say("matched 2nd submatch: ", string.sub(str, from, to))  -- yields "234"
-    end
-</geshi>
-
-This API function was first introduced in the <code>v0.9.2</code> release.
-
-== ngx.re.gmatch ==
-'''syntax:''' ''iterator, err = ngx.re.gmatch(subject, regex, options?)''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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>.
-
-In case of errors, like seeing an ill-formed regular expression, <code>nil</code> and a string describing the error will be returned.
-
-Here is a small example to demonstrate its basic usage:
-
-<geshi lang="lua">
-    local iterator, err = ngx.re.gmatch("hello, world!", "([a-z]+)", "i")
-    if not iterator then
-        ngx.log(ngx.ERR, "error: ", err)
-        return
-    end
-
-    local m
-    m, err = iterator()    -- m[0] == m[1] == "hello"
-    if err then
-        ngx.log(ngx.ERR, "error: ", err)
-        return
-    end
-
-    m, err = iterator()    -- m[0] == m[1] == "world"
-    if err then
-        ngx.log(ngx.ERR, "error: ", err)
-        return
-    end
-
-    m, err = iterator()    -- m == nil
-    if err then
-        ngx.log(ngx.ERR, "error: ", err)
-        return
-    end
-</geshi>
-
-More often we just put it into a Lua loop:
-
-<geshi lang="lua">
-    local it, err = ngx.re.gmatch("hello, world!", "([a-z]+)", "i")
-    if not it then
-        ngx.log(ngx.ERR, "error: ", err)
-        return
-    end
-
-    while true do
-        local m, err = it()
-        if err then
-            ngx.log(ngx.ERR, "error: ", err)
-            return
-        end
-
-        if not m then
-            -- no match found (any more)
-            break
-        end
-
-        -- found a match
-        ngx.say(m[0])
-        ngx.say(m[1])
-    end
-</geshi>
-
-The optional <code>options</code> argument takes exactly the same semantics as the [[#ngx.re.match|ngx.re.match]] method.
-
-The current implementation requires that the iterator returned should only be used in a single request. That is, one should ''not'' assign it to a variable belonging to persistent namespace like a Lua package.
-
-This method requires the PCRE library enabled in Nginx.  ([[#Special Escaping Sequences|Known Issue With Special Escaping Sequences]]).
-
-This feature was first introduced in the <code>v0.2.1rc12</code> release.
-
-== ngx.re.sub ==
-'''syntax:''' ''newstr, n, err = ngx.re.sub(subject, regex, replace, options?)''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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]].
-
-This method returns the resulting new string as well as the number of successful substitutions. In case of failures, like syntax errors in the regular expressions or the <code><replace></code> string argument, it will return <code>nil</code> and a string describing the error.
-
-When the <code>replace</code> is a string, then it is treated as a special template for string replacement. For example,
-
-<geshi lang="lua">
-    local newstr, n, err = ngx.re.sub("hello, 1234", "([0-9])[0-9]", "[$0][$1]")
-    if newstr then
-        -- newstr == "hello, [12][1]34"
-        -- n == 1
-    else
-        ngx.log(ngx.ERR, "error: ", err)
-        return
-    end
-</geshi>
-
-where <code>$0</code> referring to the whole substring matched by the pattern and <code>$1</code> referring to the first parenthesized capturing substring.
-
-Curly braces can also be used to disambiguate variable names from the background string literals:
-
-<geshi lang="lua">
-    local newstr, n, err = ngx.re.sub("hello, 1234", "[0-9]", "${0}00")
-        -- newstr == "hello, 100234"
-        -- n == 1
-</geshi>
-
-Literal dollar sign characters (<code>$</code>) in the <code>replace</code> string argument can be escaped by another dollar sign, for instance,
-
-<geshi lang="lua">
-    local newstr, n, err = ngx.re.sub("hello, 1234", "[0-9]", "$$")
-        -- newstr == "hello, $234"
-        -- n == 1
-</geshi>
-
-Do not use backlashes to escape dollar signs; it will not work as expected.
-
-When the <code>replace</code> argument is of type "function", then it will be invoked with the "match table" as the argument to generate the replace string literal for substitution. The "match table" fed into the <code>replace</code> function is exactly the same as the return value of [[#ngx.re.match|ngx.re.match]]. Here is an example:
-
-<geshi lang="lua">
-    local func = function (m)
-        return "[" .. m[0] .. "][" .. m[1] .. "]"
-    end
-    local newstr, n, err = ngx.re.sub("hello, 1234", "( [0-9] ) [0-9]", func, "x")
-        -- newstr == "hello, [12][1]34"
-        -- n == 1
-</geshi>
-
-The dollar sign characters in the return value of the <code>replace</code> function argument are not special at all.
-
-This method requires the PCRE library enabled in Nginx.  ([[#Special Escaping Sequences|Known Issue With Special Escaping Sequences]]).
-
-This feature was first introduced in the <code>v0.2.1rc13</code> release.
-
-== ngx.re.gsub ==
-'''syntax:''' ''newstr, n, err = ngx.re.gsub(subject, regex, replace, options?)''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Just like [[#ngx.re.sub|ngx.re.sub]], but does global substitution.
-
-Here is some examples:
-
-<geshi lang="lua">
-    local newstr, n, err = ngx.re.gsub("hello, world", "([a-z])[a-z]+", "[$0,$1]", "i")
-    if newstr then
-        -- newstr == "[hello,h], [world,w]"
-        -- n == 2
-    else
-        ngx.log(ngx.ERR, "error: ", err)
-        return
-    end
-</geshi>
-
-<geshi lang="lua">
-    local func = function (m)
-        return "[" .. m[0] .. "," .. m[1] .. "]"
-    end
-    local newstr, n, err = ngx.re.gsub("hello, world", "([a-z])[a-z]+", func, "i")
-        -- newstr == "[hello,h], [world,w]"
-        -- n == 2
-</geshi>
-
-This method requires the PCRE library enabled in Nginx.  ([[#Special Escaping Sequences|Known Issue With Special Escaping Sequences]]).
-
-This feature was first introduced in the <code>v0.2.1rc15</code> release.
-
-== ngx.shared.DICT ==
-'''syntax:''' ''dict = ngx.shared.DICT''
-
-'''syntax:''' ''dict = ngx.shared[name_var]''
-
-'''context:''' ''init_by_lua*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
-
-Shared memory zones are always shared by all the nginx worker processes in the current nginx server instance.
-
-The resulting object <code>dict</code> has the following methods:
-
-* [[#ngx.shared.DICT.get|get]]
-* [[#ngx.shared.DICT.get_stale|get_stale]]
-* [[#ngx.shared.DICT.set|set]]
-* [[#ngx.shared.DICT.safe_set|safe_set]]
-* [[#ngx.shared.DICT.add|add]]
-* [[#ngx.shared.DICT.safe_add|safe_add]]
-* [[#ngx.shared.DICT.replace|replace]]
-* [[#ngx.shared.DICT.delete|delete]]
-* [[#ngx.shared.DICT.incr|incr]]
-* [[#ngx.shared.DICT.lpush|lpush]]
-* [[#ngx.shared.DICT.rpush|rpush]]
-* [[#ngx.shared.DICT.lpop|lpop]]
-* [[#ngx.shared.DICT.rpop|rpop]]
-* [[#ngx.shared.DICT.llen|llen]]
-* [[#ngx.shared.DICT.ttl|ttl]]
-* [[#ngx.shared.DICT.expire|expire]]
-* [[#ngx.shared.DICT.flush_all|flush_all]]
-* [[#ngx.shared.DICT.flush_expired|flush_expired]]
-* [[#ngx.shared.DICT.get_keys|get_keys]]
-* [[#ngx.shared.DICT.capacity|capacity]]
-* [[#ngx.shared.DICT.free_space|free_space]]
-
-All these methods are ''atomic'' operations, that is, safe from concurrent accesses from multiple nginx worker processes for the same <code>lua_shared_dict</code> zone.
-
-Here is an example:
-
-<geshi lang="nginx">
-    http {
-        lua_shared_dict dogs 10m;
-        server {
-            location /set {
-                content_by_lua_block {
-                    local dogs = ngx.shared.dogs
-                    dogs:set("Jim", 8)
-                    ngx.say("STORED")
-                }
-            }
-            location /get {
-                content_by_lua_block {
-                    local dogs = ngx.shared.dogs
-                    ngx.say(dogs:get("Jim"))
-                }
-            }
-        }
-    }
-</geshi>
-
-Let us test it:
-
-<geshi lang="bash">
-    $ curl localhost/set
-    STORED
-
-    $ curl localhost/get
-    8
-
-    $ curl localhost/get
-    8
-</geshi>
-
-The number <code>8</code> will be consistently output when accessing <code>/get</code> regardless of how many Nginx workers there are because the <code>dogs</code> dictionary resides in the shared memory and visible to ''all'' of the worker processes.
-
-The shared dictionary will retain its contents through a server config reload (either by sending the <code>HUP</code> signal to the Nginx process or by using the <code>-s reload</code> command-line option).
-
-The contents in the dictionary storage will be lost, however, when the Nginx server quits.
-
-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*, body_filter_by_lua*, log_by_lua*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 expired, then <code>nil</code> will be returned.
-
-In case of errors, <code>nil</code> and a string describing the error will be returned.
-
-The value returned will have the original data type when they were inserted into the dictionary, for example, Lua booleans, numbers, or strings.
-
-The first argument to this method must be the dictionary object itself, for example,
-
-<geshi lang="lua">
-    local cats = ngx.shared.cats
-    local value, flags = cats.get(cats, "Marry")
-</geshi>
-
-or use Lua's syntactic sugar for method calls:
-
-<geshi lang="lua">
-    local cats = ngx.shared.cats
-    local value, flags = cats:get("Marry")
-</geshi>
-
-These two forms are fundamentally equivalent.
-
-If the user flags is <code>0</code> (the default), then no flags value will be returned.
-
-This feature was first introduced in the <code>v0.3.1rc22</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.get_stale ==
-'''syntax:''' ''value, flags, stale = ngx.shared.DICT:get_stale(key)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Similar to the [[#ngx.shared.DICT.get|get]] method but returns the value even if the key has already expired.
-
-Returns a 3rd value, <code>stale</code>, indicating whether the key has expired or not.
-
-Note that the value of an expired key is not guaranteed to be available so one should never rely on the availability of expired items.
-
-This method was first introduced in the <code>0.8.6</code> release.
-
-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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Unconditionally sets a key-value pair into the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns three values:
-
-* <code>success</code>: boolean value to indicate whether the key-value pair is stored or not.
-* <code>err</code>: textual error message, can be <code>"no memory"</code>.
-* <code>forcible</code>: a boolean value to indicate whether other valid items have been removed forcibly when out of storage in the shared memory zone.
-
-The <code>value</code> argument inserted can be Lua booleans, numbers, strings, or <code>nil</code>. Their value type will also be stored into the dictionary and the same data type can be retrieved later via the [[#ngx.shared.DICT.get|get]] method.
-
-The optional <code>exptime</code> argument specifies expiration time (in seconds) for the inserted key-value pair. The time resolution is <code>0.001</code> seconds. If the <code>exptime</code> takes the value <code>0</code> (which is the default), then the item will never expire.
-
-The optional <code>flags</code> argument specifies a user flags value associated with the entry to be stored. It can also be retrieved later with the value. The user flags is stored as an unsigned 32-bit integer internally. Defaults to <code>0</code>. The user flags argument was first introduced in the <code>v0.5.0rc2</code> release.
-
-When it fails to allocate memory for the current key-value item, then <code>set</code> will try removing existing items in the storage according to the Least-Recently Used (LRU) algorithm. Note that, LRU takes priority over expiration time here. If up to tens of existing items have been removed and the storage left is still insufficient (either due to the total capacity limit specified by [[#lua_shared_dict|lua_shared_dict]] or memory segmentation), then the <code>err</code> return value will be <code>no memory</code> and <code>success</code> will be <code>false</code>.
-
-If this method succeeds in storing the current item by forcibly removing other not-yet-expired items in the dictionary via LRU, the <code>forcible</code> return value will be <code>true</code>. If it stores the item without forcibly removing other valid items, then the return value <code>forcible</code> will be <code>false</code>.
-
-The first argument to this method must be the dictionary object itself, for example,
-
-<geshi lang="lua">
-    local cats = ngx.shared.cats
-    local succ, err, forcible = cats.set(cats, "Marry", "it is a nice cat!")
-</geshi>
-
-or use Lua's syntactic sugar for method calls:
-
-<geshi lang="lua">
-    local cats = ngx.shared.cats
-    local succ, err, forcible = cats:set("Marry", "it is a nice cat!")
-</geshi>
-
-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.safe_set ==
-'''syntax:''' ''ok, err = ngx.shared.DICT:safe_set(key, value, exptime?, flags?)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Similar to the [[#ngx.shared.DICT.set|set]] method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return <code>nil</code> and the string "no memory".
-
-This feature was first introduced in the <code>v0.7.18</code> release.
-
-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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
-
-If the <code>key</code> argument already exists in the dictionary (and not expired for sure), the <code>success</code> return value will be <code>false</code> and the <code>err</code> return value will be <code>"exists"</code>.
-
-This feature was first introduced in the <code>v0.3.1rc22</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.safe_add ==
-'''syntax:''' ''ok, err = ngx.shared.DICT:safe_add(key, value, exptime?, flags?)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Similar to the [[#ngx.shared.DICT.add|add]] method, but never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return <code>nil</code> and the string "no memory".
-
-This feature was first introduced in the <code>v0.7.18</code> release.
-
-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:''' ''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
-
-If the <code>key</code> argument does ''not'' exist in the dictionary (or expired already), the <code>success</code> return value will be <code>false</code> and the <code>err</code> return value will be <code>"not found"</code>.
-
-This feature was first introduced in the <code>v0.3.1rc22</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.delete ==
-'''syntax:''' ''ngx.shared.DICT:delete(key)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Unconditionally removes the key-value pair from the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-It is equivalent to <code>ngx.shared.DICT:set(key, nil)</code>.
-
-This feature was first introduced in the <code>v0.3.1rc22</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.incr ==
-'''syntax:''' ''newval, err, forcible? = ngx.shared.DICT:incr(key, value, init?, init_ttl?)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-'''optional requirement:''' <code>resty.core.shdict</code> or <code>resty.core</code>
-
-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.
-
-When the key does not exist or has already expired in the shared dictionary,
-
-# if the <code>init</code> argument is not specified or takes the value <code>nil</code>, this method will return <code>nil</code> and the error string <code>"not found"</code>, or
-# if the <code>init</code> argument takes a number value, this method will create a new <code>key</code> with the value <code>init + value</code>.
-
-Like the [[#ngx.shared.DICT.add|add]] method, it also overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone.
-
-The optional <code>init_ttl</code> argument specifies expiration time (in seconds) of the value when it is initialized via the <code>init</code> argument. The time resolution is <code>0.001</code> seconds. If <code>init_ttl</code> takes the value <code>0</code> (which is the default), then the item will never expire. This argument cannot be provided without providing the <code>init</code> argument as well, and has no effect if the value already exists (e.g., if it was previously inserted via [[#ngx.shared.DICT.set|set]] or the likes).
-
-'''Note:''' Usage of the <code>init_ttl</code> argument requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library. Example:
-
-<geshi lang="lua">
-    require "resty.core"
-
-    local cats = ngx.shared.cats
-    local newval, err = cats:incr("black_cats", 1, 0, 0.1)
-
-    print(newval) -- 1
-
-    ngx.sleep(0.2)
-
-    local val, err = cats:get("black_cats")
-    print(val) -- nil
-</geshi>
-
-The <code>forcible</code> return value will always be <code>nil</code> when the <code>init</code> argument is not specified.
-
-If this method succeeds in storing the current item by forcibly removing other not-yet-expired items in the dictionary via LRU, the <code>forcible</code> return value will be <code>true</code>. If it stores the item without forcibly removing other valid items, then the return value <code>forcible</code> will be <code>false</code>.
-
-If the original value is not a valid Lua number in the dictionary, it will return <code>nil</code> and <code>"not a number"</code>.
-
-The <code>value</code> argument and <code>init</code> argument can be any valid Lua numbers, like negative numbers or floating-point numbers.
-
-This method was first introduced in the <code>v0.3.1rc22</code> release.
-
-The optional <code>init</code> parameter was first added in the <code>v0.10.6</code> release.
-
-The optional <code>init_ttl</code> parameter was introduced in the <code>v0.10.12rc2</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.lpush ==
-'''syntax:''' ''length, err = ngx.shared.DICT:lpush(key, value)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Inserts the specified (numerical or string) <code>value</code> at the head of the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns the number of elements in the list after the push operation.
-
-If <code>key</code> does not exist, it is created as an empty list before performing the push operation. When the <code>key</code> already takes a value that is not a list, it will return <code>nil</code> and <code>"value not a list"</code>.
-
-It never overrides the (least recently used) unexpired items in the store when running out of storage in the shared memory zone. In this case, it will immediately return <code>nil</code> and the string "no memory".
-
-This feature was first introduced in the <code>v0.10.6</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.rpush ==
-'''syntax:''' ''length, err = ngx.shared.DICT:rpush(key, value)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Similar to the [[#ngx.shared.DICT.lpush|lpush]] method, but inserts the specified (numerical or string) <code>value</code> at the tail of the list named <code>key</code>.
-
-This feature was first introduced in the <code>v0.10.6</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.lpop ==
-'''syntax:''' ''val, err = ngx.shared.DICT:lpop(key)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Removes and returns the first element of the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-If <code>key</code> does not exist, it will return <code>nil</code>. When the <code>key</code> already takes a value that is not a list, it will return <code>nil</code> and <code>"value not a list"</code>.
-
-This feature was first introduced in the <code>v0.10.6</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.rpop ==
-'''syntax:''' ''val, err = ngx.shared.DICT:rpop(key)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Removes and returns the last element of the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-If <code>key</code> does not exist, it will return <code>nil</code>. When the <code>key</code> already takes a value that is not a list, it will return <code>nil</code> and <code>"value not a list"</code>.
-
-This feature was first introduced in the <code>v0.10.6</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.llen ==
-'''syntax:''' ''len, err = ngx.shared.DICT:llen(key)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Returns the number of elements in the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-If key does not exist, it is interpreted as an empty list and 0 is returned. When the <code>key</code> already takes a value that is not a list, it will return <code>nil</code> and <code>"value not a list"</code>.
-
-This feature was first introduced in the <code>v0.10.6</code> release.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.ttl ==
-'''syntax:''' ''ttl, err = ngx.shared.DICT:ttl(key)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-'''requires:''' <code>resty.core.shdict</code> or <code>resty.core</code>
-
-Retrieves the remaining TTL (time-to-live in seconds) of a key-value pair in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns the TTL as a number if the operation is successfully completed or <code>nil</code> and an error message otherwise.
-
-If the key does not exist (or has already expired), this method will return <code>nil</code> and the error string <code>"not found"</code>.
-
-The TTL is originally determined by the <code>exptime</code> argument of the [[#ngx.shared.DICT.set|set]], [[#ngx.shared.DICT.add|add]], [[#ngx.shared.DICT.replace|replace]] (and the likes) methods. It has a time resolution of <code>0.001</code> seconds. A value of <code>0</code> means that the item will never expire.
-
-Example:
-
-<geshi lang="lua">
-    require "resty.core"
-
-    local cats = ngx.shared.cats
-    local succ, err = cats:set("Marry", "a nice cat", 0.5)
-
-    ngx.sleep(0.2)
-
-    local ttl, err = cats:ttl("Marry")
-    ngx.say(ttl) -- 0.3
-</geshi>
-
-This feature was first introduced in the <code>v0.10.11</code> release.
-
-'''Note:''' This method requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.expire ==
-'''syntax:''' ''success, err = ngx.shared.DICT:expire(key, exptime)''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-'''requires:''' <code>resty.core.shdict</code> or <code>resty.core</code>
-
-Updates the <code>exptime</code> (in second) of a key-value pair in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns a boolean indicating success if the operation completes or <code>nil</code> and an error message otherwise.
-
-If the key does not exist, this method will return <code>nil</code> and the error string <code>"not found"</code>.
-
-The <code>exptime</code> argument has a resolution of <code>0.001</code> seconds. If <code>exptime</code> is <code>0</code>, then the item will never expire.
-
-Example:
-
-<geshi lang="lua">
-    require "resty.core"
-
-    local cats = ngx.shared.cats
-    local succ, err = cats:set("Marry", "a nice cat", 0.1)
-
-    succ, err = cats:expire("Marry", 0.5)
-
-    ngx.sleep(0.2)
-
-    local val, err = cats:get("Marry")
-    ngx.say(val) -- "a nice cat"
-</geshi>
-
-This feature was first introduced in the <code>v0.10.11</code> release.
-
-'''Note:''' This method requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.flush_all ==
-'''syntax:''' ''ngx.shared.DICT:flush_all()''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Flushes out all the items in the dictionary. This method does not actuall free up all the memory blocks in the dictionary but just marks all the existing items as expired.
-
-This feature was first introduced in the <code>v0.5.0rc17</code> release.
-
-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*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
-
-Unlike the [[#ngx.shared.DICT.flush_all|flush_all]] method, this method actually free up the memory used by the expired items.
-
-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*, ngx.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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.
-
-'''CAUTION''' Avoid calling this method on dictionaries with a very large number of keys as it may lock the dictionary for significant amount of time and block Nginx worker processes trying to access the dictionary.
-
-This feature was first introduced in the <code>v0.7.3</code> release.
-
-== ngx.shared.DICT.capacity ==
-'''syntax:''' ''capacity_bytes = ngx.shared.DICT:capacity()''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-'''requires:''' <code>resty.core.shdict</code> or <code>resty.core</code>
-
-Retrieves the capacity in bytes for the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]] declared with
-the [[#lua_shared_dict|lua_shared_dict]] directive.
-
-Example:
-
-<geshi lang="lua">
-    require "resty.core.shdict"
-
-    local cats = ngx.shared.cats
-    local capacity_bytes = cats:capacity()
-</geshi>
-
-This feature was first introduced in the <code>v0.10.11</code> release.
-
-'''Note:''' This method requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
-
-This feature requires at least nginx core version <code>0.7.3</code>.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.shared.DICT.free_space ==
-'''syntax:''' ''free_page_bytes = ngx.shared.DICT:free_space()''
-
-'''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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-'''requires:''' <code>resty.core.shdict</code> or <code>resty.core</code>
-
-Retrieves the free page size in bytes for the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-'''Note:''' The memory for ngx.shared.DICT is allocated via the nginx slab allocator which has each slot for
-data size ranges like \~8, 9\~16, 17\~32, ..., 1025\~2048, 2048\~ bytes. And pages are assigned to a slot if there
-is no room in already assigned pages for the slot.
-
-So even if the return value of the <code>free_space</code> method is zero, there may be room in already assigned pages, so
-you may successfully set a new key value pair to the shared dict without getting <code>true</code> for <code>forcible</code> or
-non nil <code>err</code> from the <code>ngx.shared.DICT.set</code>.
-
-On the other hand, if already assigned pages for a slot are full and a new key value pair is added to the
-slot and there is no free page, you may get <code>true</code> for <code>forcible</code> or non nil <code>err</code> from the
-<code>ngx.shared.DICT.set</code> method.
-
-Example:
-
-<geshi lang="lua">
-    require "resty.core.shdict"
-
-    local cats = ngx.shared.cats
-    local free_page_bytes = cats:free_space()
-</geshi>
-
-This feature was first introduced in the <code>v0.10.11</code> release.
-
-'''Note:''' This method requires the <code>resty.core.shdict</code> or <code>resty.core</code> modules from the [https://github.com/openresty/lua-resty-core lua-resty-core] library.
-
-This feature requires at least nginx core version <code>1.11.7</code>.
-
-See also [[#ngx.shared.DICT|ngx.shared.DICT]].
-
-== ngx.socket.udp ==
-'''syntax:''' ''udpsock = ngx.socket.udp()''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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_block {
-            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>
-
-Since the <code>v0.7.18</code> release, connecting to a datagram unix domain socket file is also possible on Linux:
-
-<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> and the client socket will use the "autobind" feature on Linux.
-
-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*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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: ", err)
-        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*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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.stream ==
-
-Just an alias to [[#ngx.socket.tcp|ngx.socket.tcp]]. If the stream-typed cosocket may also connect to a unix domain
-socket, then this API name is preferred.
-
-This API function was first added to the <code>v0.10.1</code> release.
-
-== ngx.socket.tcp ==
-'''syntax:''' ''tcpsock = ngx.socket.tcp()''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-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:sslhandshake|sslhandshake]]
-* [[#tcpsock:send|send]]
-* [[#tcpsock:receive|receive]]
-* [[#tcpsock:close|close]]
-* [[#tcpsock:settimeout|settimeout]]
-* [[#tcpsock:settimeouts|settimeouts]]
-* [[#tcpsock:setoption|setoption]]
-* [[#tcpsock:receiveuntil|receiveuntil]]
-* [[#tcpsock:setkeepalive|setkeepalive]]
-* [[#tcpsock:getreusedtimes|getreusedtimes]]
-
-It is intended to be compatible with the TCP API of the [http://w3.impa.br/~diego/software/luasocket/tcp.html LuaSocket] library but is 100% nonblocking out of the box. Also, we introduce some new APIs to provide more functionalities.
-
-The cosocket object created by this API function has exactly the same lifetime as the Lua handler creating it. So never pass the cosocket object to any other Lua handler (including ngx.timer callback functions) and never share the cosocket object between different NGINX requests.
-
-For every cosocket object's underlying connection, if you do not
-explicitly close it (via [[#tcpsock:close|close]]) or put it back to the connection
-pool (via [[#tcpsock:setkeepalive|setkeepalive]]), then it is automatically closed when one of
-the following two events happens:
-
-* the current request handler completes, or
-* the Lua cosocket object value gets collected by the Lua GC.
-
-Fatal errors in cosocket operations always automatically close the current
-connection (note that, read timeout error is the only error that is
-not fatal), and if you call [[#tcpsock:close|close]] on a closed connection, you will get
-the "closed" error.
-
-Starting from the <code>0.9.9</code> release, the cosocket object here is full-duplex, that is, a reader "light thread" and a writer "light thread" can operate on a single cosocket object simultaneously (both "light threads" must belong to the same Lua handler though, see reasons above). But you cannot have two "light threads" both reading (or writing or connecting) the same cosocket, otherwise you might get an error like "socket busy reading" when calling the methods of the cosocket object.
-
-This feature was first introduced in the <code>v0.5.0rc1</code> release.
-
-See also [[#ngx.socket.udp|ngx.socket.udp]].
-
-== 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*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-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 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 TCP server:
-
-<geshi lang="nginx">
-    location /test {
-        resolver 8.8.8.8;
-
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("www.google.com", 80)
-            if not ok then
-                ngx.say("failed to connect to google: ", err)
-                return
-            end
-            ngx.say("successfully connected to google!")
-            sock:close()
-        }
-    }
-</geshi>
-
-Connecting to a Unix Domain Socket file is also possible:
-
-<geshi lang="lua">
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("unix:/tmp/memcached.sock")
-    if not ok then
-        ngx.say("failed to connect to the memcached unix domain socket: ", err)
-        return
-    end
-</geshi>
-
-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:
-
-<geshi lang="lua">
-    local sock = ngx.socket.tcp()
-    sock:settimeout(1000)  -- one second timeout
-    local ok, err = sock:connect(host, port)
-</geshi>
-
-It is important here to call the [[#tcpsock:settimeout|settimeout]] method ''before'' calling this method.
-
-Calling this method on an already connected socket object will cause the original connection to be closed first.
-
-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:sslhandshake ==
-'''syntax:''' ''session, err = tcpsock:sslhandshake(reused_session?, server_name?, ssl_verify?, send_status_req?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-Does SSL/TLS handshake on the currently established connection.
-
-The optional <code>reused_session</code> argument can take a former SSL
-session userdata returned by a previous <code>sslhandshake</code>
-call for exactly the same target. For short-lived connections, reusing SSL
-sessions can usually speed up the handshake by one order by magnitude but it
-is not so useful if the connection pool is enabled. This argument defaults to
-<code>nil</code>. If this argument takes the boolean <code>false</code> value, no SSL session
-userdata would return by this call and only a Lua boolean will be returned as
-the first return value; otherwise the current SSL session will
-always be returned as the first argument in case of successes.
-
-The optional <code>server_name</code> argument is used to specify the server
-name for the new TLS extension Server Name Indication (SNI). Use of SNI can
-make different servers share the same IP address on the server side. Also,
-when SSL verification is enabled, this <code>server_name</code> argument is
-also used to validate the server name specified in the server certificate sent from
-the remote.
-
-The optional <code>ssl_verify</code> argument takes a Lua boolean value to
-control whether to perform SSL verification. When set to <code>true</code>, the server
-certificate will be verified according to the CA certificates specified by
-the [[#lua_ssl_trusted_certificate|lua_ssl_trusted_certificate]] directive.
-You may also need to adjust the [[#lua_ssl_verify_depth|lua_ssl_verify_depth]]
-directive to control how deep we should follow along the certificate chain.
-Also, when the <code>ssl_verify</code> argument is true and the
-<code>server_name</code> argument is also specified, the latter will be used
-to validate the server name in the server certificate.
-
-The optional <code>send_status_req</code> argument takes a boolean that controls whether to send
-the OCSP status request in the SSL handshake request (which is for requesting OCSP stapling).
-
-For connections that have already done SSL/TLS handshake, this method returns
-immediately.
-
-This method was first introduced in the <code>v0.9.11</code> release.
-
-== tcpsock:send ==
-'''syntax:''' ''bytes, err = tcpsock:send(data)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-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 <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:
-
-<geshi lang="lua">
-    sock:settimeout(1000)  -- one second timeout
-    local bytes, err = sock:send(request)
-</geshi>
-
-It is important here to call the [[#tcpsock:settimeout|settimeout]] method ''before'' calling this method.
-
-In case of any connection errors, this method always automatically closes the current connection.
-
-This feature was first introduced in the <code>v0.5.0rc1</code> release.
-
-== tcpsock:receive ==
-'''syntax:''' ''data, err, partial = tcpsock:receive(size)''
-
-'''syntax:''' ''data, err, partial = tcpsock:receive(pattern?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-Receives data from the connected socket according to the reading pattern or size.
-
-This method is a synchronous operation just like the [[#tcpsock:send|send]] method 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 and the partial data received so far.
-
-If a number-like argument is specified (including strings that look like numbers), then it is interpreted as a size. This method will not return until it reads exactly this size of data or an error occurs.
-
-If a non-number-like string argument is specified, then it is interpreted as a "pattern". The following patterns are supported:
-
-* <code>'*a'</code>: reads from the socket until the connection is closed. No end-of-line translation is performed;
-* <code>'*l'</code>: reads a line of text from the socket. The line is terminated by a <code>Line Feed</code> (LF) character (ASCII 10), optionally preceded by a <code>Carriage Return</code> (CR) character (ASCII 13). The CR and LF characters are not included in the returned line. In fact, all CR characters are ignored by the pattern.
-
-If no argument is specified, then it is assumed to be the pattern <code>'*l'</code>, that is, the line reading pattern.
-
-Timeout for the 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:
-
-<geshi lang="lua">
-    sock:settimeout(1000)  -- one second timeout
-    local line, err, partial = sock:receive()
-    if not line then
-        ngx.say("failed to read a line: ", err)
-        return
-    end
-    ngx.say("successfully read a line: ", line)
-</geshi>
-
-It is important here to call the [[#tcpsock:settimeout|settimeout]] method ''before'' calling this method.
-
-Since the <code>v0.8.8</code> release, this method no longer automatically closes the current connection when the read timeout error happens. For other connection errors, this method always automatically closes the connection.
-
-This feature was first introduced in the <code>v0.5.0rc1</code> release.
-
-== tcpsock:receiveuntil ==
-'''syntax:''' ''iterator = tcpsock:receiveuntil(pattern, options?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-This method returns an iterator Lua function that can be called to read the data stream until it sees the specified pattern or an error occurs.
-
-Here is an example for using this method to read a data stream with the boundary sequence <code>--abcedhb</code>:
-
-<geshi lang="lua">
-    local reader = sock:receiveuntil("\r\n--abcedhb")
-    local data, err, partial = reader()
-    if not data then
-        ngx.say("failed to read the data stream: ", err)
-    end
-    ngx.say("read the data stream: ", data)
-</geshi>
-
-When called without any argument, the iterator function returns the received data right ''before'' the specified pattern string in the incoming data stream. So for the example above, if the incoming data stream is <code>'hello, world! -agentzh\r\n--abcedhb blah blah'</code>, then the string <code>'hello, world! -agentzh'</code> will be returned.
-
-In case of error, the iterator function will return <code>nil</code> along with a string describing the error and the partial data bytes that have been read so far.
-
-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 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")
-
-    while true do
-        local data, err, partial = reader(4)
-        if not data then
-            if err then
-                ngx.say("failed to read the data stream: ", err)
-                break
-            end
-
-            ngx.say("read done")
-            break
-        end
-        ngx.say("read chunk: [", data, "]")
-    end
-</geshi>
-
-Then for the incoming data stream <code>'hello, world! -agentzh\r\n--abcedhb blah blah'</code>, we shall get the following output from the sample code above:
-
-<geshi lang="text">
-    read chunk: [hell]
-    read chunk: [o, w]
-    read chunk: [orld]
-    read chunk: [! -a]
-    read chunk: [gent]
-    read chunk: [zh]
-    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 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:
-
-<geshi lang="lua">
-    local readline = sock:receiveuntil("\r\n")
-
-    sock:settimeout(1000)  -- one second timeout
-    line, err, partial = readline()
-    if not line then
-        ngx.say("failed to read a line: ", err)
-        return
-    end
-    ngx.say("successfully read a line: ", line)
-</geshi>
-
-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).
-
-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.
-
-Since the <code>v0.8.8</code> release, this method no longer automatically closes the current connection when the read timeout error happens. For other connection errors, this method always automatically closes the connection.
-
-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*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-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.
-
-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).
-
-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.
-
-== tcpsock:settimeout ==
-'''syntax:''' ''tcpsock:settimeout(time)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-Set the timeout value in milliseconds for subsequent socket operations ([[#tcpsock:connect|connect]], [[#tcpsock:receive|receive]], and iterators returned from [[#tcpsock:receiveuntil|receiveuntil]]).
-
-Settings done by this method takes priority over those config directives, i.e., [[#lua_socket_connect_timeout|lua_socket_connect_timeout]], [[#lua_socket_send_timeout|lua_socket_send_timeout]], and [[#lua_socket_read_timeout|lua_socket_read_timeout]].
-
-Note that this method does ''not'' affect the [[#lua_socket_keepalive_timeout|lua_socket_keepalive_timeout]] setting; the <code>timeout</code> argument to the [[#tcpsock:setkeepalive|setkeepalive]] method should be used for this purpose instead.
-
-This feature was first introduced in the <code>v0.5.0rc1</code> release.
-
-== tcpsock:settimeouts ==
-'''syntax:''' ''tcpsock:settimeouts(connect_timeout, send_timeout, read_timeout)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-Sets the connect timeout thresold, send timeout threshold, and read timeout threshold, respetively, in milliseconds, for subsequent socket
-operations ([[#tcpsock:connect|connect]], [[#tcpsock:send|send]], [[#tcpsock:receive|receive]], and iterators returned from [[#tcpsock:receiveuntil|receiveuntil]]).
-
-Settings done by this method takes priority over those config directives, i.e., [[#lua_socket_connect_timeout|lua_socket_connect_timeout]], [[#lua_socket_send_timeout|lua_socket_send_timeout]], and [[#lua_socket_read_timeout|lua_socket_read_timeout]].
-
-You are recommended to use [[#tcpsock:settimeouts|settimeouts]] instead of [[#tcpsock:settimeout|settimeout]].
-
-Note that this method does ''not'' affect the [[#lua_socket_keepalive_timeout|lua_socket_keepalive_timeout]] setting; the <code>timeout</code> argument to the [[#tcpsock:setkeepalive|setkeepalive]] method should be used for this purpose instead.
-
-This feature was first introduced in the <code>v0.10.7</code> release.
-
-== tcpsock:setoption ==
-'''syntax:''' ''tcpsock:setoption(option, value?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-This function is added for [http://w3.impa.br/~diego/software/luasocket/tcp.html LuaSocket] API compatibility and does nothing for now. Its functionality will be implemented in future.
-
-This feature was first introduced in the <code>v0.5.0rc1</code> release.
-
-== tcpsock:setkeepalive ==
-'''syntax:''' ''ok, err = tcpsock:setkeepalive(timeout?, size?)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-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 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.
-
-Idle connections in the pool will be monitored for any exceptional events like connection abortion or unexpected incoming data on the line, in which cases the connection in question will be closed and removed from the pool.
-
-In case of success, this method returns <code>1</code>; otherwise, it returns <code>nil</code> and a string describing the error.
-
-When the system receive buffer for the current connection has unread data, then this method will return the "connection in dubious state" error message (as the second return value) because the previous session has unread data left behind for the next session and the connection is not safe to be reused.
-
-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.
-
-== tcpsock:getreusedtimes ==
-'''syntax:''' ''count, err = tcpsock:getreusedtimes()''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*''
-
-This method returns the (successfully) reused times for the current connection. In case of error, it returns <code>nil</code> and a string describing the error.
-
-If the current connection does not come from the built-in connection pool, then this method always returns <code>0</code>, that is, the connection has never been reused (yet). If the connection comes from the connection pool, then the return value is always non-zero. So this method can also be used to determine if the current connection comes from the pool.
-
-This feature was first introduced in the <code>v0.5.0rc1</code> release.
-
-== ngx.socket.connect ==
-'''syntax:''' ''tcpsock, err = ngx.socket.connect(host, port)''
-
-'''syntax:''' ''tcpsock, err = ngx.socket.connect("unix:/path/to/unix-domain.socket")''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
-
-This function is a shortcut for combining [[#ngx.socket.tcp|ngx.socket.tcp()]] and the [[#tcpsock:connect|connect()]] method call in a single operation. It is actually implemented like this:
-
-<geshi lang="lua">
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect(...)
-    if not ok then
-        return nil, err
-    end
-    return sock
-</geshi>
-
-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*, init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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*]].
-* <code>init_worker</code>
-: for the context of [[#init_worker_by_lua|init_worker_by_lua*]].
-* <code>ssl_cert</code>
-: for the context of [[#ssl_certificate_by_lua_block|ssl_certificate_by_lua*]].
-* <code>ssl_session_fetch</code>
-: for the context of [[#ssl_session_fetch_by_lua_block|ssl_session_fetch_by_lua*]].
-* <code>ssl_session_store</code>
-: for the context of [[#ssl_session_store_by_lua_block|ssl_session_store_by_lua*]].
-* <code>set</code>
-: for the context of [[#set_by_lua|set_by_lua*]].
-* <code>rewrite</code>
-: for the context of [[#rewrite_by_lua|rewrite_by_lua*]].
-* <code>balancer</code>
-: for the context of [[#balancer_by_lua_block|balancer_by_lua*]].
-* <code>access</code>
-: for the context of [[#access_by_lua|access_by_lua*]].
-* <code>content</code>
-: for the context of [[#content_by_lua|content_by_lua*]].
-* <code>header_filter</code>
-: for the context of [[#header_filter_by_lua|header_filter_by_lua*]].
-* <code>body_filter</code>
-: for the context of [[#body_filter_by_lua|body_filter_by_lua*]].
-* <code>log</code>
-: for the context of [[#log_by_lua|log_by_lua*]].
-* <code>timer</code>
-: for the context of user callback functions for [[#ngx.timer.at|ngx.timer.*]].
-
-This API was first introduced in the <code>v0.5.10</code> release.
-
-== ngx.thread.spawn ==
-'''syntax:''' ''co = ngx.thread.spawn(func, arg1, arg2, ...)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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 coroutines 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 making concurrent upstream requests in a single Nginx request handler, much 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 (similar to Facebook's 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*, ngx.timer.*, ssl_certificate_by_lua*, ssl_session_fetch_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.thread.kill ==
-'''syntax:''' ''ok, err = ngx.thread.kill(thread)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, ngx.timer.*''
-
-Kills a running "light thread" created by [[#ngx.thread.spawn|ngx.thread.spawn]]. Returns a true value when successful or <code>nil</code> and a string describing the error otherwise.
-
-According to the current implementation, only the parent coroutine (or "light thread") can kill a thread. Also, a running "light thread" with pending NGINX subrequests (initiated by [[#ngx.location.capture|ngx.location.capture]] for example) cannot be killed due to a limitation in the NGINX core.
-
-This API was first enabled in the <code>v0.9.9</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]].
-
-== ngx.timer.at ==
-'''syntax:''' ''hdl, err = ngx.timer.at(delay, callback, user_arg1, user_arg2, ...)''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Creates an Nginx timer with a user callback function as well as optional user arguments.
-
-The first argument, <code>delay</code>, specifies the delay for the timer,
-in seconds. One can specify fractional seconds like <code>0.001</code> to mean 1
-millisecond here. <code>0</code> delay can also be specified, in which case the
-timer will immediately expire when the current handler yields
-execution.
-
-The second argument, <code>callback</code>, can
-be any Lua function, which will be invoked later in a background
-"light thread" after the delay specified. The user callback will be
-called automatically by the Nginx core with the arguments <code>premature</code>,
-<code>user_arg1</code>, <code>user_arg2</code>, and etc, where the <code>premature</code>
-argument takes a boolean value indicating whether it is a premature timer
-expiration or not, and <code>user_arg1</code>, <code>user_arg2</code>, and etc, are
-those (extra) user arguments specified when calling <code>ngx.timer.at</code>
-as the remaining arguments.
-
-Premature timer expiration happens when the Nginx worker process is
-trying to shut down, as in an Nginx configuration reload triggered by
-the <code>HUP</code> signal or in an Nginx server shutdown. When the Nginx worker
-is trying to shut down, one can no longer call <code>ngx.timer.at</code> to
-create new timers with nonzero delays and in that case <code>ngx.timer.at</code> will return a "conditional false" value and
-a string describing the error, that is, "process exiting".
-
-Starting from the <code>v0.9.3</code> release, it is allowed to create zero-delay timers even when the Nginx worker process starts shutting down.
-
-When a timer expires, the user Lua code in the timer callback is
-running in a "light thread" detached completely from the original
-request creating the timer. So objects with the same lifetime as the
-request creating them, like [[#ngx.socket.tcp|cosockets]], cannot be shared between the
-original request and the timer user callback function.
-
-Here is a simple example:
-
-<geshi lang="nginx">
-    location / {
-        ...
-        log_by_lua_block {
-            local function push_data(premature, uri, args, status)
-                -- push the data uri, args, and status to the remote
-                -- via ngx.socket.tcp or ngx.socket.udp
-                -- (one may want to buffer the data in Lua a bit to
-                -- save I/O operations)
-            end
-            local ok, err = ngx.timer.at(0, push_data,
-                                         ngx.var.uri, ngx.var.args, ngx.header.status)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to create timer: ", err)
-                return
-            end
-        }
-    }
-</geshi>
-
-One can also create infinite re-occurring timers, for instance, a timer getting triggered every <code>5</code> seconds, by calling <code>ngx.timer.at</code> recursively in the timer callback function. Here is such an example,
-
-<geshi lang="lua">
-    local delay = 5
-    local handler
-    handler = function (premature)
-        -- do some routine job in Lua just like a cron job
-        if premature then
-            return
-        end
-        local ok, err = ngx.timer.at(delay, handler)
-        if not ok then
-            ngx.log(ngx.ERR, "failed to create the timer: ", err)
-            return
-        end
-    end
-
-    local ok, err = ngx.timer.at(delay, handler)
-    if not ok then
-        ngx.log(ngx.ERR, "failed to create the timer: ", err)
-        return
-    end
-</geshi>
-
-It is recommended, however, to use the [[#ngx.timer.every|ngx.timer.every]] API function
-instead for creating recurring timers since it is more robust.
-
-Because timer callbacks run in the background and their running time
-will not add to any client request's response time, they can easily
-accumulate in the server and exhaust system resources due to either
-Lua programming mistakes or just too much client traffic. To prevent
-extreme consequences like crashing the Nginx server, there are
-built-in limitations on both the number of "pending timers" and the
-number of "running timers" in an Nginx worker process. The "pending
-timers" here mean timers that have not yet been expired and "running
-timers" are those whose user callbacks are currently running.
-
-The maximal number of pending timers allowed in an Nginx
-worker is controlled by the [[#lua_max_pending_timers|lua_max_pending_timers]]
-directive. The maximal number of running timers is controlled by the
-[[#lua_max_running_timers|lua_max_running_timers]] directive.
-
-According to the current implementation, each "running timer" will
-take one (fake) connection record from the global connection record
-list configured by the standard [[EventsModule#worker_connections|worker_connections]] directive in
-<code>nginx.conf</code>. So ensure that the
-[[EventsModule#worker_connections|worker_connections]] directive is set to
-a large enough value that takes into account both the real connections
-and fake connections required by timer callbacks (as limited by the
-[[#lua_max_running_timers|lua_max_running_timers]] directive).
-
-A lot of the Lua APIs for Nginx are enabled in the context of the timer
-callbacks, like stream/datagram cosockets ([[#ngx.socket.tcp|ngx.socket.tcp]] and [[#ngx.socket.udp|ngx.socket.udp]]), shared
-memory dictionaries ([[#ngx.shared.DICT|ngx.shared.DICT]]), user coroutines ([[#coroutine.create|coroutine.*]]),
-user "light threads" ([[#ngx.thread.spawn|ngx.thread.*]]), [[#ngx.exit|ngx.exit]], [[#ngx.now|ngx.now]]/[[#ngx.time|ngx.time]],
-[[#ngx.md5|ngx.md5]]/[[#ngx.sha1_bin|ngx.sha1_bin]], are all allowed. But the subrequest API (like
-[[#ngx.location.capture|ngx.location.capture]]), the [[#ngx.req.start_time|ngx.req.*]] API, the downstream output API
-(like [[#ngx.say|ngx.say]], [[#ngx.print|ngx.print]], and [[#ngx.flush|ngx.flush]]) are explicitly disabled in
-this context.
-
-You can pass most of the standard Lua values (nils, booleans, numbers, strings, tables, closures, file handles, and etc) into the timer callback, either explicitly as user arguments or implicitly as upvalues for the callback closure. There are several exceptions, however: you ''cannot'' pass any thread objects returned by [[#coroutine.create|coroutine.create]] and [[#ngx.thread.spawn|ngx.thread.spawn]] or any cosocket objects returned by [[#ngx.socket.tcp|ngx.socket.tcp]], [[#ngx.socket.udp|ngx.socket.udp]], and [[#ngx.req.socket|ngx.req.socket]] because these objects' lifetime is bound to the request context creating them while the timer callback is detached from the creating request's context (by design) and runs in its own (fake) request context. If you try to share the thread or cosocket objects across the boundary of the creating request, then you will get the "no co ctx found" error (for threads) or "bad request" (for cosockets). It is fine, however, to create all these objects inside your timer callback.
-
-This API was first introduced in the <code>v0.8.0</code> release.
-
-== ngx.timer.every ==
-'''syntax:''' ''hdl, err = ngx.timer.every(delay, callback, user_arg1, user_arg2, ...)''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Similar to the [[#ngx.timer.at|ngx.timer.at]] API function, but
-
-# <code>delay</code> ''cannot'' be zero,
-# timer will be created every <code>delay</code> seconds until the current Nginx worker process starts exiting.
-
-When success, returns a "conditional true" value (but not a <code>true</code>). Otherwise, returns a "conditional false" value and a string describing the error.
-
-This API also respect the [[#lua_max_pending_timers|lua_max_pending_timers]] and [[#lua_max_running_timers|lua_max_running_timers]].
-
-This API was first introduced in the <code>v0.10.9</code> release.
-
-== ngx.timer.running_count ==
-'''syntax:''' ''count = ngx.timer.running_count()''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Returns the number of timers currently running.
-
-This directive was first introduced in the <code>v0.9.20</code> release.
-
-== ngx.timer.pending_count ==
-'''syntax:''' ''count = ngx.timer.pending_count()''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Returns the number of pending timers.
-
-This directive was first introduced in the <code>v0.9.20</code> release.
-
-== ngx.config.subsystem ==
-'''syntax:''' ''subsystem = ngx.config.subsystem''
-
-'''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.timer.*, init_by_lua*, init_worker_by_lua*''
-
-This string field indicates the current NGINX subsystem the current Lua environment is based on. For this module, this field always takes the string value <code>"http"</code>. For
-[https://github.com/openresty/stream-lua-nginx-module#readme ngx_stream_lua_module], however, this field takes the value <code>"stream"</code>.
-
-This field was first introduced in the <code>0.10.1</code>.
-
-== ngx.config.debug ==
-'''syntax:''' ''debug = ngx.config.debug''
-
-'''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.timer.*, init_by_lua*, init_worker_by_lua*''
-
-This boolean field indicates whether the current Nginx is a debug build, i.e., being built by the <code>./configure</code> option <code>--with-debug</code>.
-
-This field was first introduced in the <code>0.8.7</code>.
-
-== ngx.config.prefix ==
-
-'''syntax:''' ''prefix = ngx.config.prefix()''
-
-'''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.timer.*, init_by_lua*, init_worker_by_lua*''
-
-Returns the Nginx server "prefix" path, as determined by the <code>-p</code> command-line option when running the nginx executable, or the path specified by the <code>--prefix</code> command-line option when building Nginx with the <code>./configure</code> script.
-
-This function was first introduced in the <code>0.9.2</code>.
-
-== ngx.config.nginx_version ==
-
-'''syntax:''' ''ver = ngx.config.nginx_version''
-
-'''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.timer.*, init_by_lua*, init_worker_by_lua*''
-
-This field take an integral value indicating the version number of the current Nginx core being used. For example, the version number <code>1.4.3</code> results in the Lua number 1004003.
-
-This API was first introduced in the <code>0.9.3</code> release.
-
-== ngx.config.nginx_configure ==
-
-'''syntax:''' ''str = ngx.config.nginx_configure()''
-
-'''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.timer.*, init_by_lua*''
-
-This function returns a string for the NGINX <code>./configure</code> command's arguments string.
-
-This API was first introduced in the <code>0.9.5</code> release.
-
-== ngx.config.ngx_lua_version ==
-
-'''syntax:''' ''ver = ngx.config.ngx_lua_version''
-
-'''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.timer.*, init_by_lua*''
-
-This field take an integral value indicating the version number of the current <code>ngx_lua</code> module being used. For example, the version number <code>0.9.3</code> results in the Lua number 9003.
-
-This API was first introduced in the <code>0.9.3</code> release.
-
-== ngx.worker.exiting ==
-
-'''syntax:''' ''exiting = ngx.worker.exiting()''
-
-'''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.timer.*, init_by_lua*, init_worker_by_lua*''
-
-This function returns a boolean value indicating whether the current Nginx worker process already starts exiting. Nginx worker process exiting happens on Nginx server quit or configuration reload (aka HUP reload).
-
-This API was first introduced in the <code>0.9.3</code> release.
-
-== ngx.worker.pid ==
-
-'''syntax:''' ''pid = ngx.worker.pid()''
-
-'''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.timer.*, init_by_lua*, init_worker_by_lua*''
-
-This function returns a Lua number for the process ID (PID) of the current Nginx worker process. This API is more efficient than <code>ngx.var.pid</code> and can be used in contexts where the [[#ngx.var.VARIABLE|ngx.var.VARIABLE]] API cannot be used (like [[#init_worker_by_lua|init_worker_by_lua]]).
-
-This API was first introduced in the <code>0.9.5</code> release.
-
-== ngx.worker.count ==
-
-'''syntax:''' ''count = ngx.worker.count()''
-
-'''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.timer.*, init_by_lua*, init_worker_by_lua*''
-
-Returns the total number of the Nginx worker processes (i.e., the value configured
-by the [http://nginx.org/en/docs/ngx_core_module.html#worker_processes worker_processes]
-directive in <code>nginx.conf</code>).
-
-This API was first introduced in the <code>0.9.20</code> release.
-
-== ngx.worker.id ==
-
-'''syntax:''' ''count = ngx.worker.id()''
-
-'''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.timer.*, init_worker_by_lua*''
-
-Returns the ordinal number of the current Nginx worker processes (starting from number 0).
-
-So if the total number of workers is <code>N</code>, then this method may return a number between 0
-and <code>N - 1</code> (inclusive).
-
-This function returns meaningful values only for NGINX 1.9.1+. With earlier versions of NGINX, it
-always returns <code>nil</code>.
-
-See also [[#ngx.worker.count|ngx.worker.count]].
-
-This API was first introduced in the <code>0.9.20</code> release.
-
-== ngx.semaphore ==
-'''syntax:''' ''local semaphore = require "ngx.semaphore"''
-
-This is a Lua module that implements a classic-style semaphore API for efficient synchronizations among
-different "light threads". Sharing the same semaphore among different "light threads" created in different (request)
-contexts are also supported as long as the "light threads" reside in the same NGINX worker process
-and the [[#lua_code_cache|lua_code_cache]] directive is turned on (which is the default).
-
-This Lua module does not ship with this ngx_lua module itself rather it is shipped with
-the
-[https://github.com/openresty/lua-resty-core lua-resty-core] library.
-
-Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/semaphore.md documentation]
-for this <code>ngx.semaphore</code> Lua module in [https://github.com/openresty/lua-resty-core lua-resty-core]
-for more details.
-
-This feature requires at least ngx_lua <code>v0.10.0</code>.
-
-== ngx.balancer ==
-'''syntax:''' ''local balancer = require "ngx.balancer"''
-
-This is a Lua module that provides a Lua API to allow defining completely dynamic load balancers
-in pure Lua.
-
-This Lua module does not ship with this ngx_lua module itself rather it is shipped with
-the
-[https://github.com/openresty/lua-resty-core lua-resty-core] library.
-
-Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/balancer.md documentation]
-for this <code>ngx.balancer</code> Lua module in [https://github.com/openresty/lua-resty-core lua-resty-core]
-for more details.
-
-This feature requires at least ngx_lua <code>v0.10.0</code>.
-
-== ngx.ssl ==
-'''syntax:''' ''local ssl = require "ngx.ssl"''
-
-This Lua module provides API functions to control the SSL handshake process in contexts like
-[ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
-
-This Lua module does not ship with this ngx_lua module itself rather it is shipped with
-the
-[https://github.com/openresty/lua-resty-core lua-resty-core] library.
-
-Please refer to the [https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md documentation]
-for this <code>ngx.ssl</code> Lua module for more details.
-
-This feature requires at least ngx_lua <code>v0.10.0</code>.
-
-== ngx.ocsp ==
-'''syntax:''' ''local ocsp = require "ngx.ocsp"''
-
-This Lua module provides API to perform OCSP queries, OCSP response validations, and
-OCSP stapling planting.
-
-Usually, this module is used together with the [ngx.ssl](https://github.com/openresty/lua-resty-core/blob/master/lib/ngx/ssl.md)
-module in the
-context of [ssl_certificate_by_lua*](#ssl_certificate_by_lua_block).
-
-This Lua module does not ship with this ngx_lua module itself rather it is shipped with
-the
-[https://github.com/openresty/lua-resty-core lua-resty-core] library.
-
-Please refer to the [https://github.com/openresty/lua-resty-core/blob/ocsp-cert-by-lua-2/lib/ngx/ocsp.md documentation]
-for this <code>ngx.ocsp</code> Lua module for more details.
-
-This feature requires at least ngx_lua <code>v0.10.0</code>.
-
-== ndk.set_var.DIRECTIVE ==
-'''syntax:''' ''res = ndk.set_var.DIRECTIVE_NAME''
-
-'''context:''' ''init_worker_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.timer.*, balancer_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-This mechanism allows calling other nginx C modules' directives that are implemented by [https://github.com/simplresty/ngx_devel_kit Nginx Devel Kit] (NDK)'s set_var submodule's <code>ndk_set_var_value</code>.
-
-For example, the following [[HttpSetMiscModule]] directives can be invoked this way:
-
-* [[HttpSetMiscModule#set_quote_sql_str|set_quote_sql_str]]
-* [[HttpSetMiscModule#set_quote_pgsql_str|set_quote_pgsql_str]]
-* [[HttpSetMiscModule#set_quote_json_str|set_quote_json_str]]
-* [[HttpSetMiscModule#set_unescape_uri|set_unescape_uri]]
-* [[HttpSetMiscModule#set_escape_uri|set_escape_uri]]
-* [[HttpSetMiscModule#set_encode_base32|set_encode_base32]]
-* [[HttpSetMiscModule#set_decode_base32|set_decode_base32]]
-* [[HttpSetMiscModule#set_encode_base64|set_encode_base64]]
-* [[HttpSetMiscModule#set_decode_base64|set_decode_base64]]
-* [[HttpSetMiscModule#set_encode_base64|set_encode_hex]]
-* [[HttpSetMiscModule#set_decode_base64|set_decode_hex]]
-* [[HttpSetMiscModule#set_encode_base64|set_sha1]]
-* [[HttpSetMiscModule#set_decode_base64|set_md5]]
-
-For instance,
-
-<geshi lang="lua">
-    local res = ndk.set_var.set_escape_uri('a/b');
-    -- now res == 'a%2fb'
-</geshi>
-
-Similarly, the following directives provided by [[HttpEncryptedSessionModule]] can be invoked from within Lua too:
-
-* [[HttpEncryptedSessionModule#set_encrypt_session|set_encrypt_session]]
-* [[HttpEncryptedSessionModule#set_decrypt_session|set_decrypt_session]]
-
-This feature requires the [https://github.com/simplresty/ngx_devel_kit ngx_devel_kit] module.
-
-== coroutine.create ==
-'''syntax:''' ''co = coroutine.create(f)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 usable in the context of [[#init_by_lua|init_by_lua*]] since the <code>0.9.2</code>.
-
-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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 usable in the context of [[#init_by_lua|init_by_lua*]] since the <code>0.9.2</code>.
-
-This API was first introduced in the <code>v0.6.0</code> release.
-
-== coroutine.yield ==
-'''syntax:''' ''... = coroutine.yield(...)''
-
-'''context:''' ''rewrite_by_lua*, access_by_lua*, content_by_lua*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_by_lua*''
-
-Yields the execution 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 usable in the context of [[#init_by_lua|init_by_lua*]] since the <code>0.9.2</code>.
-
-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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 usable in the context of [[#init_by_lua|init_by_lua*]] since the <code>0.9.2</code>.
-
-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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 usable in the context of [[#init_by_lua|init_by_lua*]] since the <code>0.9.2</code>.
-
-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*, init_by_lua*, ngx.timer.*, header_filter_by_lua*, body_filter_by_lua*, ssl_certificate_by_lua*, ssl_session_fetch_by_lua*, ssl_session_store_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 usable in the context of [[#init_by_lua|init_by_lua*]] since the <code>0.9.2</code>.
-
-This API was first enabled in the <code>v0.6.0</code> release.
-
-= Obsolete Sections =
-
-This section is just holding obsolete documentation sections that have been either renamed or removed so that existing links over the web are still valid.
-
-== Special PCRE Sequences ==
-
-This section has been renamed to [[#Special Escaping Sequences|Special Escaping Sequences]].
diff --git a/debian/modules/http-lua/dtrace/ngx_lua_provider.d b/debian/modules/http-lua/dtrace/ngx_lua_provider.d
deleted file mode 100644
index 394484c..0000000
--- a/debian/modules/http-lua/dtrace/ngx_lua_provider.d
+++ /dev/null
@@ -1,61 +0,0 @@
-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(void *r,
-            u_char *data, size_t len);
-
-    /* lua_State *parent, lua_State *child */
-    probe http__lua__user__coroutine__create(void *r,
-            void *parent, void *child);
-
-    /* lua_State *parent, lua_State *child */
-    probe http__lua__user__coroutine__resume(void *r,
-                                             void *parent, void *child);
-
-    /* lua_State *parent, lua_State *child */
-    probe http__lua__user__coroutine__yield(void *r,
-                                            void *parent, void *child);
-
-    /* lua_State *L */
-    probe http__lua__thread__yield(void *r, void *L);
-
-    /* ngx_http_lua_socket_tcp_upstream_t *u */
-    probe http__lua__socket__tcp__send__start(void *r,
-            void *u, u_char *data, size_t len);
-
-    /* ngx_http_lua_socket_tcp_upstream_t *u */
-    probe http__lua__socket__tcp__receive__done(void *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(
-            void *r, void *u, u_char *data, size_t len);
-
-    /* lua_State *creator, lua_State *newthread */
-    probe http__lua__user__thread__spawn(void *r,
-            void *creator, void *newthread);
-
-    /* lua_State *thread, ngx_http_lua_ctx_t *ctx */
-    probe http__lua__thread__delete(void *r, void *thread, void *ctx);
-
-    /* lua_State *thread */
-    probe http__lua__run__posted__thread(void *r, void *thread,
-            int status);
-
-    probe http__lua__coroutine__done(void *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/http-lua/misc/recv-until-pm/Makefile b/debian/modules/http-lua/misc/recv-until-pm/Makefile
deleted file mode 100644
index eb4d937..0000000
--- a/debian/modules/http-lua/misc/recv-until-pm/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-test:
-	prove -Ilib -r t
-
diff --git a/debian/modules/http-lua/misc/recv-until-pm/lib/RecvUntil.pm b/debian/modules/http-lua/misc/recv-until-pm/lib/RecvUntil.pm
deleted file mode 100755
index 54fdc54..0000000
--- a/debian/modules/http-lua/misc/recv-until-pm/lib/RecvUntil.pm
+++ /dev/null
@@ -1,138 +0,0 @@
-package RecvUntil;
-
-use strict;
-use warnings;
-
-sub recv_until {
-    my ($pat) = @_;
-
-    my $len = length $pat;
-    my @backtracks;
-
-    for (my $i = 1; $i <= $len - 1; $i++) {
-        my $matched_prefix_len = 1;
-        while ($matched_prefix_len <= $len - $i - 1) {
-            #while (1) {
-            #my $left = $len - $i;
-            #warn "left: $i: $len: ", $len - 1 - $i, "\n";
-            #warn "matched_prefix_len: $matched_prefix_len\n";
-
-            #while (1) {
-            my $prefix = substr($pat, 0, $matched_prefix_len);
-            my $next = substr($pat, $matched_prefix_len, 1);
-
-            my $prefix2 = substr($pat, $i, $matched_prefix_len);
-            my $next2 = substr($pat, $i + $matched_prefix_len, 1);
-
-            #warn "$i: global prefix $prefix $next\n";
-            #warn "$i: local prefix $prefix2 $next2\n";
-
-            if ($prefix2 eq $prefix) {
-                if ($next2 eq $next) {
-                    $matched_prefix_len++;
-                    next;
-                }
-
-                #warn "$matched_prefix_len: $prefix: found match at $i (next $next, next2 $next2)\n";
-                my $cur_state = $i + $matched_prefix_len;
-                my $new_state = $matched_prefix_len + 1;
-
-                my $matched = substr($pat, 0, $cur_state);
-
-                my $chain = $backtracks[$cur_state - 2];
-                if (!$chain) {
-                    $chain = [];
-                    $backtracks[$cur_state - 2] = $chain;
-                }
-
-                my $found = 0;
-                for my $rec (@$chain) {
-                    if ($rec->{char} eq $next) {
-                        $found = 1;
-
-                        if ($rec->{new_state} < $new_state) {
-                            warn "overriding...\n";
-                            $rec->{new_state} = $new_state;
-                        }
-                    }
-                }
-
-                if (!$found) {
-                    warn "on state $cur_state ($matched), if next is '$next', ",
-                        "then backtrack to state $new_state ($prefix$next)\n";
-
-                    push @$chain, { char => $next, new_state => $new_state };
-                }
-
-                #if ($matched_prefix_len > 1) {
-                #$i += $matched_prefix_len - 1;
-                #}
-
-                last;
-            }
-
-            last;
-        }
-    }
-
-    return sub {
-        my ($txt) = @_;
-
-        my $max_state = length $pat;
-        my $len = length $txt;
-        my $state = 0;
-        my $ret = '';
-
-        for (my $i = 0; $i < $len; $i++) {
-            # read the char
-            my $c = substr($txt, $i, 1);
-
-            #warn "$state: read char at $i: $c\n";
-            #warn "matched: $ret\n";
-
-            my $expected = substr($pat, $state, 1);
-            if ($expected eq $c) {
-                #warn "matched the char in pattern.\n";
-                $state++;
-
-                if ($state == $max_state) {
-                    last;
-                }
-
-                next;
-            }
-
-            if ($state == 0) {
-                #warn "did not match the first char in pattern\n";
-                $ret .= $c;
-                next;
-            }
-
-            my $old_state;
-            my $matched;
-            my $chain = $backtracks[$state - 2];
-            for my $rec (@$chain) {
-                if ($rec->{char} eq $c) {
-                    $old_state = $state;
-                    $state = $rec->{new_state};
-                    #warn "matched the char for backtracking to state $state\n";
-                    $matched = 1;
-                    last;
-                }
-            }
-
-            if (!$matched) {
-                $ret .= substr($pat, 0, $state);
-                $state = 0;
-                redo;
-            }
-
-            $ret .= substr($pat, 0, $old_state + 1 - $state);
-            next;
-        }
-
-        return $ret;
-    };
-}
-
-1;
diff --git a/debian/modules/http-lua/misc/recv-until-pm/t/sanity.t b/debian/modules/http-lua/misc/recv-until-pm/t/sanity.t
deleted file mode 100644
index 5783ee6..0000000
--- a/debian/modules/http-lua/misc/recv-until-pm/t/sanity.t
+++ /dev/null
@@ -1,140 +0,0 @@
-# vi:ft=
-
-use 5.10.1;
-use Test::Base;
-use RecvUntil;
-
-plan tests => 1 * blocks();
-
-run {
-    my $block = shift;
-    my $name = $block->name;
-    my $pat = $block->pat // die "$name: No --- pat found";
-    my $txt = $block->txt // die "$name: No --- txt found";
-
-    my $expected = $block->out // die "$name: No --- out found";
-
-    my $it = RecvUntil::recv_until($pat);
-    is $it->($txt), $expected, "$name: output ok";
-};
-
-__DATA__
-
-=== TEST 1:
---- pat: abcabd
---- txt: abcabcabd
---- out: abc
-
-
-
-=== TEST 2:
---- pat: aa
---- txt: abcabcaad
---- out: abcabc
-
-
-
-=== TEST 3:
---- pat: ab
---- txt: bbcabcaad
---- out: bbc
-
-
-
-=== TEST 4:
---- pat: aaa
---- txt: abaabcaaaef
---- out: abaabc
-
-
-
-=== TEST 5:
---- pat: aaaaad
---- txt: baaaaaaaaeaaaaaaadf
---- out: baaaaaaaaeaa
-
-
-
-=== TEST 6:
---- pat: abacadae
---- txt: a
---- out:
-
-
-
-=== TEST 7:
---- pat: abacadae
---- txt: ababacadae
---- out: ab
-
-
-
-=== TEST 8:
---- pat: abacadae
---- txt: abacabacadae
---- out: abac
-
-
-
-=== TEST 9:
---- pat: abacadae
---- txt: abaabacadae
---- out: aba
-
-
-
-=== TEST 10:
---- pat: abacadae
---- txt: abacadabacadae
---- out: abacad
-
-
-
-=== TEST 11:
---- pat: abcabdabcabe
---- txt: abcabdabcabdabcabe
---- out: abcabd
-
-
-
-=== TEST 12:
---- pat: abcabdabcabe
---- txt: abcabdabcabcabdabcabe
---- out: abcabdabc
-
-
-
-=== TEST 13:
---- pat: abcabdabcabe
---- txt: abcabcabdabcabe
---- out: abc
-
-
-
-=== TEST 14:
---- pat: abcabdabcabe
---- txt: ababcabdabcabe
---- out: ab
-
-
-
-=== TEST 15:
---- pat: abcdef
---- txt: abcabcdef
---- out: abc
-
-
-
-=== TEST 16:
---- pat: -- abc
---- txt: ---- abc
---- out: --
-
-
-
-=== TEST 17:
---- pat: yz--ababyz
---- txt: 
---- out: --
---- SKIP
-
diff --git a/debian/modules/http-lua/src/api/ngx_http_lua_api.h b/debian/modules/http-lua/src/api/ngx_http_lua_api.h
deleted file mode 100644
index c7c0e6b..0000000
--- a/debian/modules/http-lua/src/api/ngx_http_lua_api.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_API_H_INCLUDED_
-#define _NGX_HTTP_LUA_API_H_INCLUDED_
-
-
-#include <nginx.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-
-#include <lua.h>
-#include <stdint.h>
-
-
-/* Public API for other Nginx modules */
-
-
-#define ngx_http_lua_version  10013
-
-
-typedef struct {
-    uint8_t         type;
-
-    union {
-        int         b; /* boolean */
-        lua_Number  n; /* number */
-        ngx_str_t   s; /* string */
-    } value;
-
-} ngx_http_lua_value_t;
-
-
-typedef struct {
-    int          len;
-    /* this padding hole on 64-bit systems is expected */
-    u_char      *data;
-} ngx_http_lua_ffi_str_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_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);
-
-ngx_shm_zone_t *ngx_http_lua_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name,
-    size_t size, void *tag);
-
-
-#endif /* _NGX_HTTP_LUA_API_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ddebug.h b/debian/modules/http-lua/src/ddebug.h
deleted file mode 100644
index f2d4b73..0000000
--- a/debian/modules/http-lua/src/ddebug.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _DDEBUG_H_INCLUDED_
-#define _DDEBUG_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <nginx.h>
-#include <ngx_core.h>
-
-
-#if defined(DDEBUG) && (DDEBUG)
-
-#   if (NGX_HAVE_VARIADIC_MACROS)
-
-#       define dd(...) fprintf(stderr, "lua *** %s: ", __func__); \
-            fprintf(stderr, __VA_ARGS__); \
-            fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
-
-#   else
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include <stdarg.h>
-
-static ngx_inline void
-dd(const char *fmt, ...) {
-}
-
-#    endif
-
-#else
-
-#   if (NGX_HAVE_VARIADIC_MACROS)
-
-#       define dd(...)
-
-#   else
-
-#include <stdarg.h>
-
-static ngx_inline void
-dd(const char *fmt, ...) {
-}
-
-#   endif
-
-#endif
-
-#if defined(DDEBUG) && (DDEBUG)
-
-#define dd_check_read_event_handler(r)   \
-    dd("r->read_event_handler = %s", \
-        r->read_event_handler == ngx_http_block_reading ? \
-            "ngx_http_block_reading" : \
-        r->read_event_handler == ngx_http_test_reading ? \
-            "ngx_http_test_reading" : \
-        r->read_event_handler == ngx_http_request_empty_handler ? \
-            "ngx_http_request_empty_handler" : "UNKNOWN")
-
-#define dd_check_write_event_handler(r)   \
-    dd("r->write_event_handler = %s", \
-        r->write_event_handler == ngx_http_handler ? \
-            "ngx_http_handler" : \
-        r->write_event_handler == ngx_http_core_run_phases ? \
-            "ngx_http_core_run_phases" : \
-        r->write_event_handler == ngx_http_request_empty_handler ? \
-            "ngx_http_request_empty_handler" : "UNKNOWN")
-
-#else
-
-#define dd_check_read_event_handler(r)
-#define dd_check_write_event_handler(r)
-
-#endif
-
-
-#endif /* _DDEBUG_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_accessby.c b/debian/modules/http-lua/src/ngx_http_lua_accessby.c
deleted file mode 100644
index 56bf0fa..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_accessby.c
+++ /dev/null
@@ -1,398 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include <nginx.h>
-#include "ngx_http_lua_accessby.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_exception.h"
-#include "ngx_http_lua_cache.h"
-
-
-static ngx_int_t ngx_http_lua_access_by_chunk(lua_State *L,
-    ngx_http_request_t *r);
-
-
-ngx_int_t
-ngx_http_lua_access_handler(ngx_http_request_t *r)
-{
-    ngx_int_t                   rc;
-    ngx_http_lua_ctx_t         *ctx;
-    ngx_http_lua_loc_conf_t    *llcf;
-    ngx_http_lua_main_conf_t   *lmcf;
-    ngx_http_phase_handler_t    tmp, *ph, *cur_ph, *last_ph;
-    ngx_http_core_main_conf_t  *cmcf;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua access handler, uri:\"%V\" c:%ud", &r->uri,
-                   r->main->count);
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    if (!lmcf->postponed_to_access_phase_end) {
-
-        lmcf->postponed_to_access_phase_end = 1;
-
-        cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-        ph = cmcf->phase_engine.handlers;
-        cur_ph = &ph[r->phase_handler];
-
-        /* we should skip the post_access phase handler here too */
-        last_ph = &ph[cur_ph->next - 2];
-
-        dd("ph cur: %d, ph next: %d", (int) r->phase_handler,
-           (int) (cur_ph->next - 2));
-
-#if 0
-        if (cur_ph == last_ph) {
-            dd("XXX our handler is already the last access phase handler");
-        }
-#endif
-
-        if (cur_ph < last_ph) {
-            dd("swaping the contents of cur_ph and last_ph...");
-
-            tmp = *cur_ph;
-
-            memmove(cur_ph, cur_ph + 1,
-                    (last_ph - cur_ph) * sizeof (ngx_http_phase_handler_t));
-
-            *last_ph = tmp;
-
-            r->phase_handler--; /* redo the current ph */
-
-            return NGX_DECLINED;
-        }
-    }
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    if (llcf->access_handler == NULL) {
-        dd("no access 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_HTTP_INTERNAL_SERVER_ERROR;
-        }
-    }
-
-    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;
-        }
-
-        if (rc == NGX_OK) {
-            if (r->header_sent) {
-                dd("header already sent");
-
-                /* response header was already generated in access_by_lua*,
-                 * so it is no longer safe to proceed to later phases
-                 * which may generate responses again */
-
-                if (!ctx->eof) {
-                    dd("eof not yet sent");
-
-                    rc = ngx_http_lua_send_chain_link(r, ctx, NULL
-                                                     /* indicate last_buf */);
-                    if (rc == NGX_ERROR || rc > NGX_OK) {
-                        return rc;
-                    }
-                }
-
-                return NGX_HTTP_OK;
-            }
-
-            return NGX_OK;
-        }
-
-        return NGX_DECLINED;
-    }
-
-    if (ctx->waiting_more_body) {
-        dd("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,
-                                       ngx_http_lua_generic_phase_post_read);
-
-        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-#if (nginx_version < 1002006) ||                                             \
-        (nginx_version >= 1003000 && nginx_version < 1003009)
-            r->main->count--;
-#endif
-
-            return rc;
-        }
-
-        if (rc == NGX_AGAIN) {
-            ctx->waiting_more_body = 1;
-            return NGX_DONE;
-        }
-    }
-
-    dd("calling access handler");
-    return llcf->access_handler(r);
-}
-
-
-ngx_int_t
-ngx_http_lua_access_handler_inline(ngx_http_request_t *r)
-{
-    ngx_int_t                  rc;
-    lua_State                 *L;
-    ngx_http_lua_loc_conf_t   *llcf;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       llcf->access_src.value.data,
-                                       llcf->access_src.value.len,
-                                       llcf->access_src_key,
-                                       (const char *) llcf->access_chunkname);
-
-    if (rc != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    return ngx_http_lua_access_by_chunk(L, r);
-}
-
-
-ngx_int_t
-ngx_http_lua_access_handler_file(ngx_http_request_t *r)
-{
-    u_char                    *script_path;
-    ngx_int_t                  rc;
-    ngx_str_t                  eval_src;
-    lua_State                 *L;
-    ngx_http_lua_loc_conf_t   *llcf;
-
-    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->access_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;
-    }
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
-                                     llcf->access_src_key);
-    if (rc != NGX_OK) {
-        if (rc < NGX_HTTP_SPECIAL_RESPONSE) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_access_by_chunk(L, r);
-}
-
-
-static ngx_int_t
-ngx_http_lua_access_by_chunk(lua_State *L, ngx_http_request_t *r)
-{
-    int                  co_ref;
-    ngx_int_t            rc;
-    ngx_uint_t           nreqs;
-    lua_State           *co;
-    ngx_event_t         *rev;
-    ngx_connection_t    *c;
-    ngx_http_lua_ctx_t  *ctx;
-    ngx_http_cleanup_t  *cln;
-
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    /*  {{{ 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");
-
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    /*  move code closure to new coroutine */
-    lua_xmove(L, co, 1);
-
-    /*  set closure's env table to new coroutine's globals table */
-    ngx_http_lua_get_globals_table(co);
-    lua_setfenv(co, -2);
-
-    /*  save nginx request in coroutine globals table */
-    ngx_http_lua_set_req(co, r);
-
-    /*  {{{ initialize request context */
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    dd("ctx = %p", ctx);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_http_lua_reset_ctx(r, L, ctx);
-
-    ctx->entered_access_phase = 1;
-
-    ctx->cur_co_ctx = &ctx->entry_co_ctx;
-    ctx->cur_co_ctx->co = co;
-    ctx->cur_co_ctx->co_ref = co_ref;
-#ifdef NGX_LUA_USE_ASSERT
-    ctx->cur_co_ctx->co_top = 1;
-#endif
-
-    /*  }}} */
-
-    /*  {{{ register request cleanup hooks */
-    if (ctx->cleanup == NULL) {
-        cln = ngx_http_cleanup_add(r, 0);
-        if (cln == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        cln->handler = ngx_http_lua_request_cleanup_handler;
-        cln->data = ctx;
-        ctx->cleanup = &cln->handler;
-    }
-    /*  }}} */
-
-    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;
-
-#if (NGX_HTTP_V2)
-        if (!r->stream) {
-#endif
-
-        rev = r->connection->read;
-
-        if (!rev->active) {
-            if (ngx_add_event(rev, NGX_READ_EVENT, 0) != NGX_OK) {
-                return NGX_ERROR;
-            }
-        }
-
-#if (NGX_HTTP_V2)
-        }
-#endif
-
-    } else {
-        r->read_event_handler = ngx_http_block_reading;
-    }
-
-    c = r->connection;
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(L, r, ctx, 0);
-
-    dd("returned %d", (int) rc);
-
-    if (rc == NGX_ERROR || rc > NGX_OK) {
-        return rc;
-    }
-
-    if (rc == NGX_AGAIN) {
-        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx, nreqs);
-
-        if (rc == NGX_ERROR || rc == NGX_DONE || rc > NGX_OK) {
-            return rc;
-        }
-
-        if (rc != NGX_OK) {
-            return NGX_DECLINED;
-        }
-
-    } else if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-
-        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx, nreqs);
-
-        if (rc == NGX_ERROR || rc == NGX_DONE || rc > NGX_OK) {
-            return rc;
-        }
-
-        if (rc != NGX_OK) {
-            return NGX_DECLINED;
-        }
-    }
-
-#if 1
-    if (rc == NGX_OK) {
-        if (r->header_sent) {
-            dd("header already sent");
-
-            /* response header was already generated in access_by_lua*,
-             * so it is no longer safe to proceed to later phases
-             * which may generate responses again */
-
-            if (!ctx->eof) {
-                dd("eof not yet sent");
-
-                rc = ngx_http_lua_send_chain_link(r, ctx, NULL
-                                                  /* indicate last_buf */);
-                if (rc == NGX_ERROR || rc > NGX_OK) {
-                    return rc;
-                }
-            }
-
-            return NGX_HTTP_OK;
-        }
-
-        return NGX_OK;
-    }
-#endif
-
-    return NGX_DECLINED;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_accessby.h b/debian/modules/http-lua/src/ngx_http_lua_accessby.h
deleted file mode 100644
index 28c9eb2..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_accessby.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_ACCESSBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_ACCESSBY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_access_handler(ngx_http_request_t *r);
-ngx_int_t ngx_http_lua_access_handler_inline(ngx_http_request_t *r);
-ngx_int_t ngx_http_lua_access_handler_file(ngx_http_request_t *r);
-
-
-#endif /* _NGX_HTTP_LUA_ACCESSBY_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_api.c b/debian/modules/http-lua/src/ngx_http_lua_api.c
deleted file mode 100644
index 7b590e7..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_api.c
+++ /dev/null
@@ -1,216 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_common.h"
-#include "api/ngx_http_lua_api.h"
-#include "ngx_http_lua_shdict.h"
-#include "ngx_http_lua_util.h"
-
-
-lua_State *
-ngx_http_lua_get_global_state(ngx_conf_t *cf)
-{
-    ngx_http_lua_main_conf_t *lmcf;
-
-    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
-
-    return lmcf->lua;
-}
-
-
-ngx_http_request_t *
-ngx_http_lua_get_request(lua_State *L)
-{
-    return ngx_http_lua_get_req(L);
-}
-
-
-static ngx_int_t ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone,
-    void *data);
-
-
-ngx_int_t
-ngx_http_lua_add_package_preload(ngx_conf_t *cf, const char *package,
-    lua_CFunction func)
-{
-    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;
-
-    if (L) {
-        lua_getglobal(L, "package");
-        lua_getfield(L, -1, "preload");
-        lua_pushcfunction(L, func);
-        lua_setfield(L, -2, package);
-        lua_pop(L, 2);
-    }
-
-    /* we always register preload_hooks since we always create new Lua VMs
-     * when lua code cache is off. */
-
-    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;
-}
-
-
-ngx_shm_zone_t *
-ngx_http_lua_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name, size_t size,
-    void *tag)
-{
-    ngx_http_lua_main_conf_t     *lmcf;
-    ngx_shm_zone_t              **zp;
-    ngx_shm_zone_t               *zone;
-    ngx_http_lua_shm_zone_ctx_t  *ctx;
-    ngx_int_t                     n;
-
-    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
-    if (lmcf == NULL) {
-        return NULL;
-    }
-
-    if (lmcf->shm_zones == NULL) {
-        lmcf->shm_zones = ngx_palloc(cf->pool, sizeof(ngx_array_t));
-        if (lmcf->shm_zones == NULL) {
-            return NULL;
-        }
-
-        if (ngx_array_init(lmcf->shm_zones, cf->pool, 2,
-                           sizeof(ngx_shm_zone_t *))
-            != NGX_OK)
-        {
-            return NULL;
-        }
-    }
-
-    zone = ngx_shared_memory_add(cf, name, (size_t) size, tag);
-    if (zone == NULL) {
-        return NULL;
-    }
-
-    if (zone->data) {
-        ctx = (ngx_http_lua_shm_zone_ctx_t *) zone->data;
-        return &ctx->zone;
-    }
-
-    n = sizeof(ngx_http_lua_shm_zone_ctx_t);
-
-    ctx = ngx_pcalloc(cf->pool, n);
-    if (ctx == NULL) {
-        return NULL;
-    }
-
-    ctx->lmcf = lmcf;
-    ctx->log = &cf->cycle->new_log;
-    ctx->cycle = cf->cycle;
-
-    ngx_memcpy(&ctx->zone, zone, sizeof(ngx_shm_zone_t));
-
-    zp = ngx_array_push(lmcf->shm_zones);
-    if (zp == NULL) {
-        return NULL;
-    }
-
-    *zp = zone;
-
-    /* set zone init */
-    zone->init = ngx_http_lua_shared_memory_init;
-    zone->data = ctx;
-
-    lmcf->requires_shm = 1;
-
-    return &ctx->zone;
-}
-
-
-static ngx_int_t
-ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
-{
-    ngx_http_lua_shm_zone_ctx_t *octx = data;
-    ngx_shm_zone_t              *ozone;
-    void                        *odata;
-
-    ngx_int_t                    rc;
-    volatile ngx_cycle_t        *saved_cycle;
-    ngx_http_lua_main_conf_t    *lmcf;
-    ngx_http_lua_shm_zone_ctx_t *ctx;
-    ngx_shm_zone_t              *zone;
-
-    ctx = (ngx_http_lua_shm_zone_ctx_t *) shm_zone->data;
-    zone = &ctx->zone;
-
-    odata = NULL;
-    if (octx) {
-        ozone = &octx->zone;
-        odata = ozone->data;
-    }
-
-    zone->shm = shm_zone->shm;
-#if defined(nginx_version) && nginx_version >= 1009000
-    zone->noreuse = shm_zone->noreuse;
-#endif
-
-    if (zone->init(zone, odata) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    dd("get lmcf");
-
-    lmcf = ctx->lmcf;
-    if (lmcf == NULL) {
-        return NGX_ERROR;
-    }
-
-    dd("lmcf->lua: %p", lmcf->lua);
-
-    lmcf->shm_zones_inited++;
-
-    if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
-        && lmcf->init_handler)
-    {
-        saved_cycle = ngx_cycle;
-        ngx_cycle = ctx->cycle;
-
-        rc = lmcf->init_handler(ctx->log, lmcf, lmcf->lua);
-
-        ngx_cycle = saved_cycle;
-
-        if (rc != NGX_OK) {
-            /* an error happened */
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_args.c b/debian/modules/http-lua/src/ngx_http_lua_args.c
deleted file mode 100644
index 2712bcd..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_args.c
+++ /dev/null
@@ -1,555 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_args.h"
-#include "ngx_http_lua_util.h"
-
-
-static int ngx_http_lua_ngx_req_set_uri_args(lua_State *L);
-static int ngx_http_lua_ngx_req_get_uri_args(lua_State *L);
-static int ngx_http_lua_ngx_req_get_post_args(lua_State *L);
-
-
-static int
-ngx_http_lua_ngx_req_set_uri_args(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    ngx_str_t                    args;
-    const char                  *msg;
-    size_t                       len;
-    u_char                      *p;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting 1 argument but seen %d",
-                          lua_gettop(L));
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    switch (lua_type(L, 1)) {
-    case LUA_TNUMBER:
-    case LUA_TSTRING:
-        p = (u_char *) lua_tolstring(L, 1, &len);
-
-        args.data = ngx_palloc(r->pool, len);
-        if (args.data == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        ngx_memcpy(args.data, p, len);
-
-        args.len = len;
-        break;
-
-    case LUA_TTABLE:
-        ngx_http_lua_process_args_option(r, L, 1, &args);
-
-        dd("args: %.*s", (int) args.len, args.data);
-
-        break;
-
-    default:
-        msg = lua_pushfstring(L, "string, number, or table expected, "
-                              "but got %s", luaL_typename(L, 2));
-        return luaL_argerror(L, 1, msg);
-    }
-
-    dd("args: %.*s", (int) args.len, args.data);
-
-    r->args.data = args.data;
-    r->args.len = args.len;
-
-    r->valid_unparsed_uri = 0;
-
-    return 0;
-}
-
-
-static int
-ngx_http_lua_ngx_req_get_uri_args(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    u_char                      *buf;
-    u_char                      *last;
-    int                          retval;
-    int                          n;
-    int                          max;
-
-    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) {
-        max = luaL_checkinteger(L, 1);
-        lua_pop(L, 1);
-
-    } else {
-        max = NGX_HTTP_LUA_MAX_ARGS;
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->args.len == 0) {
-        lua_createtable(L, 0, 0);
-        return 1;
-    }
-
-    /* we copy r->args over to buf to simplify
-     * unescaping query arg keys and values */
-
-    buf = ngx_palloc(r->pool, r->args.len);
-    if (buf == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    lua_createtable(L, 0, 4);
-
-    ngx_memcpy(buf, r->args.data, r->args.len);
-
-    last = buf + r->args.len;
-
-    retval = ngx_http_lua_parse_args(L, buf, last, max);
-
-    ngx_pfree(r->pool, buf);
-
-    return retval;
-}
-
-
-static int
-ngx_http_lua_ngx_req_get_post_args(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    u_char                      *buf;
-    int                          retval;
-    size_t                       len;
-    ngx_chain_t                 *cl;
-    u_char                      *p;
-    u_char                      *last;
-    int                          n;
-    int                          max;
-
-    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) {
-        max = luaL_checkinteger(L, 1);
-        lua_pop(L, 1);
-
-    } else {
-        max = NGX_HTTP_LUA_MAX_ARGS;
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->discard_body) {
-        lua_createtable(L, 0, 0);
-        return 1;
-    }
-
-    if (r->request_body == NULL) {
-        return luaL_error(L, "no request body found; "
-                          "maybe you should turn on lua_need_request_body?");
-    }
-
-    if (r->request_body->temp_file) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "request body in temp file not supported");
-        return 2;
-    }
-
-    if (r->request_body->bufs == NULL) {
-        lua_createtable(L, 0, 0);
-        return 1;
-    }
-
-    /* we copy r->request_body->bufs over to buf to simplify
-     * unescaping query arg keys and values */
-
-    len = 0;
-    for (cl = r->request_body->bufs; cl; cl = cl->next) {
-        len += cl->buf->last - cl->buf->pos;
-    }
-
-    dd("post body length: %d", (int) len);
-
-    if (len == 0) {
-        lua_createtable(L, 0, 0);
-        return 1;
-    }
-
-    buf = ngx_palloc(r->pool, len);
-    if (buf == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    lua_createtable(L, 0, 4);
-
-    p = buf;
-    for (cl = r->request_body->bufs; cl; cl = cl->next) {
-        p = ngx_copy(p, cl->buf->pos, cl->buf->last - cl->buf->pos);
-    }
-
-    dd("post body: %.*s", (int) len, buf);
-
-    last = buf + len;
-
-    retval = ngx_http_lua_parse_args(L, buf, last, max);
-
-    ngx_pfree(r->pool, buf);
-
-    return retval;
-}
-
-
-int
-ngx_http_lua_parse_args(lua_State *L, u_char *buf, u_char *last, int max)
-{
-    u_char                      *p, *q;
-    u_char                      *src, *dst;
-    unsigned                     parsing_value;
-    size_t                       len;
-    int                          count = 0;
-    int                          top;
-
-    top = lua_gettop(L);
-
-    p = buf;
-
-    parsing_value = 0;
-    q = p;
-
-    while (p != last) {
-        if (*p == '=' && ! parsing_value) {
-            /* key data is between p and q */
-
-            src = q; dst = q;
-
-            ngx_http_lua_unescape_uri(&dst, &src, p - q,
-                                      NGX_UNESCAPE_URI_COMPONENT);
-
-            dd("pushing key %.*s", (int) (dst - q), q);
-
-            /* push the key */
-            lua_pushlstring(L, (char *) q, dst - q);
-
-            /* skip the current '=' char */
-            p++;
-
-            q = p;
-            parsing_value = 1;
-
-        } else if (*p == '&') {
-            /* reached the end of a key or a value, just save it */
-            src = q; dst = q;
-
-            ngx_http_lua_unescape_uri(&dst, &src, p - q,
-                                      NGX_UNESCAPE_URI_COMPONENT);
-
-            dd("pushing key or value %.*s", (int) (dst - q), q);
-
-            /* push the value or key */
-            lua_pushlstring(L, (char *) q, dst - q);
-
-            /* skip the current '&' char */
-            p++;
-
-            q = p;
-
-            if (parsing_value) {
-                /* end of the current pair's value */
-                parsing_value = 0;
-
-            } else {
-                /* the current parsing pair takes no value,
-                 * just push the value "true" */
-                dd("pushing boolean true");
-
-                lua_pushboolean(L, 1);
-            }
-
-            (void) lua_tolstring(L, -2, &len);
-
-            if (len == 0) {
-                /* ignore empty string key pairs */
-                dd("popping key and value...");
-                lua_pop(L, 2);
-
-            } else {
-                dd("setting table...");
-                ngx_http_lua_set_multi_value_table(L, top);
-            }
-
-            if (max > 0 && ++count == max) {
-                lua_pushliteral(L, "truncated");
-
-                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                               "lua hit query args limit %d", max);
-                return 2;
-            }
-
-        } else {
-            p++;
-        }
-    }
-
-    if (p != q || parsing_value) {
-        src = q; dst = q;
-
-        ngx_http_lua_unescape_uri(&dst, &src, p - q,
-                                  NGX_UNESCAPE_URI_COMPONENT);
-
-        dd("pushing key or value %.*s", (int) (dst - q), q);
-
-        lua_pushlstring(L, (char *) q, dst - q);
-
-        if (!parsing_value) {
-            dd("pushing boolean true...");
-            lua_pushboolean(L, 1);
-        }
-
-        (void) lua_tolstring(L, -2, &len);
-
-        if (len == 0) {
-            /* ignore empty string key pairs */
-            dd("popping key and value...");
-            lua_pop(L, 2);
-
-        } else {
-            dd("setting table...");
-            ngx_http_lua_set_multi_value_table(L, top);
-        }
-    }
-
-    dd("gettop: %d", lua_gettop(L));
-    dd("type: %s", lua_typename(L, lua_type(L, 1)));
-
-    if (lua_gettop(L) != top) {
-        return luaL_error(L, "internal error: stack in bad state");
-    }
-
-    return 1;
-}
-
-
-void
-ngx_http_lua_inject_req_args_api(lua_State *L)
-{
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_set_uri_args);
-    lua_setfield(L, -2, "set_uri_args");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_get_uri_args);
-    lua_setfield(L, -2, "get_uri_args");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_get_uri_args);
-    lua_setfield(L, -2, "get_query_args"); /* deprecated */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_get_post_args);
-    lua_setfield(L, -2, "get_post_args");
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-size_t
-ngx_http_lua_ffi_req_get_querystring_len(ngx_http_request_t *r)
-{
-    return r->args.len;
-}
-
-
-int
-ngx_http_lua_ffi_req_get_uri_args_count(ngx_http_request_t *r, int max,
-    int *truncated)
-{
-    int                      count;
-    u_char                  *p, *last;
-
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    *truncated = 0;
-
-    if (max < 0) {
-        max = NGX_HTTP_LUA_MAX_ARGS;
-    }
-
-    last = r->args.data + r->args.len;
-    count = 0;
-
-    for (p = r->args.data; p != last; p++) {
-        if (*p == '&') {
-            if (count == 0) {
-                count += 2;
-
-            } else {
-                count++;
-            }
-        }
-    }
-
-    if (count) {
-        if (max > 0 && count > max) {
-            count = max;
-            *truncated = 1;
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua hit query args limit %d", max);
-        }
-
-        return count;
-    }
-
-    if (r->args.len) {
-        return 1;
-    }
-
-    return 0;
-}
-
-
-int
-ngx_http_lua_ffi_req_get_uri_args(ngx_http_request_t *r, u_char *buf,
-    ngx_http_lua_ffi_table_elt_t *out, int count)
-{
-    int                          i, parsing_value = 0;
-    u_char                      *last, *p, *q;
-    u_char                      *src, *dst;
-
-    if (count <= 0) {
-        return NGX_OK;
-    }
-
-    ngx_memcpy(buf, r->args.data, r->args.len);
-
-    i = 0;
-    last = buf + r->args.len;
-    p = buf;
-    q = p;
-
-    while (p != last) {
-        if (*p == '=' && !parsing_value) {
-            /* key data is between p and q */
-
-            src = q; dst = q;
-
-            ngx_http_lua_unescape_uri(&dst, &src, p - q,
-                                      NGX_UNESCAPE_URI_COMPONENT);
-
-            dd("saving key %.*s", (int) (dst - q), q);
-
-            out[i].key.data = q;
-            out[i].key.len = (int) (dst - q);
-
-            /* skip the current '=' char */
-            p++;
-
-            q = p;
-            parsing_value = 1;
-
-        } else if (*p == '&') {
-            /* reached the end of a key or a value, just save it */
-            src = q; dst = q;
-
-            ngx_http_lua_unescape_uri(&dst, &src, p - q,
-                                      NGX_UNESCAPE_URI_COMPONENT);
-
-            dd("pushing key or value %.*s", (int) (dst - q), q);
-
-            if (parsing_value) {
-                /* end of the current pair's value */
-                parsing_value = 0;
-
-                if (out[i].key.len) {
-                    out[i].value.data = q;
-                    out[i].value.len = (int) (dst - q);
-                    i++;
-                }
-
-            } else {
-                /* the current parsing pair takes no value,
-                 * just push the value "true" */
-                dd("pushing boolean true");
-
-                if (dst - q) {
-                    out[i].key.data = q;
-                    out[i].key.len = (int) (dst - q);
-                    out[i].value.len = -1;
-                    i++;
-                }
-            }
-
-            if (i == count) {
-                return i;
-            }
-
-            /* skip the current '&' char */
-            p++;
-
-            q = p;
-
-        } else {
-            p++;
-        }
-    }
-
-    if (p != q || parsing_value) {
-        src = q; dst = q;
-
-        ngx_http_lua_unescape_uri(&dst, &src, p - q,
-                                  NGX_UNESCAPE_URI_COMPONENT);
-
-        dd("pushing key or value %.*s", (int) (dst - q), q);
-
-        if (parsing_value) {
-            if (out[i].key.len) {
-                out[i].value.data = q;
-                out[i].value.len = (int) (dst - q);
-                i++;
-            }
-
-        } else {
-            if (dst - q) {
-                out[i].key.data = q;
-                out[i].key.len = (int) (dst - q);
-                out[i].value.len = (int) -1;
-                i++;
-            }
-        }
-    }
-
-    return i;
-}
-#endif /* NGX_LUA_NO_FFI_API */
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_args.h b/debian/modules/http-lua/src/ngx_http_lua_args.h
deleted file mode 100644
index d89889f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_args.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_ARGS_H_INCLUDED_
-#define _NGX_HTTP_LUA_ARGS_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_req_args_api(lua_State *L);
-int ngx_http_lua_parse_args(lua_State *L, u_char *buf, u_char *last, int max);
-
-
-#endif /* _NGX_HTTP_LUA_ARGS_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_balancer.c b/debian/modules/http-lua/src/ngx_http_lua_balancer.c
deleted file mode 100644
index fdf2af3..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_balancer.c
+++ /dev/null
@@ -1,763 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_cache.h"
-#include "ngx_http_lua_balancer.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_directive.h"
-
-
-struct ngx_http_lua_balancer_peer_data_s {
-    /* the round robin data must be first */
-    ngx_http_upstream_rr_peer_data_t    rrp;
-
-    ngx_http_lua_srv_conf_t            *conf;
-    ngx_http_request_t                 *request;
-
-    ngx_uint_t                          more_tries;
-    ngx_uint_t                          total_tries;
-
-    struct sockaddr                    *sockaddr;
-    socklen_t                           socklen;
-
-    ngx_str_t                          *host;
-    in_port_t                           port;
-
-    int                                 last_peer_state;
-
-#if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
-    unsigned                            cloned_upstream_conf;  /* :1 */
-#endif
-};
-
-
-#if (NGX_HTTP_SSL)
-static ngx_int_t ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc,
-    void *data);
-static void ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc,
-    void *data);
-#endif
-static ngx_int_t ngx_http_lua_balancer_init(ngx_conf_t *cf,
-    ngx_http_upstream_srv_conf_t *us);
-static ngx_int_t ngx_http_lua_balancer_init_peer(ngx_http_request_t *r,
-    ngx_http_upstream_srv_conf_t *us);
-static ngx_int_t ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc,
-    void *data);
-static ngx_int_t ngx_http_lua_balancer_by_chunk(lua_State *L,
-    ngx_http_request_t *r);
-void ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
-    ngx_uint_t state);
-
-
-ngx_int_t
-ngx_http_lua_balancer_handler_file(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
-{
-    ngx_int_t           rc;
-
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
-                                     lscf->balancer.src.data,
-                                     lscf->balancer.src_key);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_balancer_by_chunk(L, r);
-}
-
-
-ngx_int_t
-ngx_http_lua_balancer_handler_inline(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
-{
-    ngx_int_t           rc;
-
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       lscf->balancer.src.data,
-                                       lscf->balancer.src.len,
-                                       lscf->balancer.src_key,
-                                       "=balancer_by_lua");
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_balancer_by_chunk(L, r);
-}
-
-
-char *
-ngx_http_lua_balancer_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_balancer_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-char *
-ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    u_char                      *p;
-    u_char                      *name;
-    ngx_str_t                   *value;
-    ngx_http_lua_srv_conf_t     *lscf = conf;
-
-    ngx_http_upstream_srv_conf_t      *uscf;
-
-    dd("enter");
-
-    /*  must specify a content handler */
-    if (cmd->post == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (lscf->balancer.handler) {
-        return "is duplicate";
-    }
-
-    value = cf->args->elts;
-
-    lscf->balancer.handler = (ngx_http_lua_srv_conf_handler_pt) cmd->post;
-
-    if (cmd->post == ngx_http_lua_balancer_handler_file) {
-        /* Lua code in an external file */
-
-        name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
-                                        value[1].len);
-        if (name == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->balancer.src.data = name;
-        lscf->balancer.src.len = ngx_strlen(name);
-
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->balancer.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';
-
-    } else {
-        /* inlined Lua code */
-
-        lscf->balancer.src = value[1];
-
-        p = ngx_palloc(cf->pool,
-                       sizeof("balancer_by_lua") + NGX_HTTP_LUA_INLINE_KEY_LEN);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->balancer.src_key = p;
-
-        p = ngx_copy(p, "balancer_by_lua", sizeof("balancer_by_lua") - 1);
-        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';
-    }
-
-    uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);
-
-    if (uscf->peer.init_upstream) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                           "load balancing method redefined");
-    }
-
-    uscf->peer.init_upstream = ngx_http_lua_balancer_init;
-
-    uscf->flags = NGX_HTTP_UPSTREAM_CREATE
-                  |NGX_HTTP_UPSTREAM_WEIGHT
-                  |NGX_HTTP_UPSTREAM_MAX_FAILS
-                  |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
-                  |NGX_HTTP_UPSTREAM_DOWN;
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_balancer_init(ngx_conf_t *cf,
-    ngx_http_upstream_srv_conf_t *us)
-{
-    if (ngx_http_upstream_init_round_robin(cf, us) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    /* this callback is called upon individual requests */
-    us->peer.init = ngx_http_lua_balancer_init_peer;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_balancer_init_peer(ngx_http_request_t *r,
-    ngx_http_upstream_srv_conf_t *us)
-{
-    ngx_http_lua_srv_conf_t            *bcf;
-    ngx_http_lua_balancer_peer_data_t  *bp;
-
-    bp = ngx_pcalloc(r->pool, sizeof(ngx_http_lua_balancer_peer_data_t));
-    if (bp == NULL) {
-        return NGX_ERROR;
-    }
-
-    r->upstream->peer.data = &bp->rrp;
-
-    if (ngx_http_upstream_init_round_robin_peer(r, us) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    r->upstream->peer.get = ngx_http_lua_balancer_get_peer;
-    r->upstream->peer.free = ngx_http_lua_balancer_free_peer;
-
-#if (NGX_HTTP_SSL)
-    r->upstream->peer.set_session = ngx_http_lua_balancer_set_session;
-    r->upstream->peer.save_session = ngx_http_lua_balancer_save_session;
-#endif
-
-    bcf = ngx_http_conf_upstream_srv_conf(us, ngx_http_lua_module);
-
-    bp->conf = bcf;
-    bp->request = r;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
-{
-    lua_State                          *L;
-    ngx_int_t                           rc;
-    ngx_http_request_t                 *r;
-    ngx_http_lua_ctx_t                 *ctx;
-    ngx_http_lua_srv_conf_t            *lscf;
-    ngx_http_lua_main_conf_t           *lmcf;
-    ngx_http_lua_balancer_peer_data_t  *bp = data;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "lua balancer peer, tries: %ui", pc->tries);
-
-    lscf = bp->conf;
-
-    r = bp->request;
-
-    ngx_http_lua_assert(lscf->balancer.handler && r);
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (ctx == NULL) {
-        ctx = ngx_http_lua_create_ctx(r);
-        if (ctx == NULL) {
-            return NGX_ERROR;
-        }
-
-        L = ngx_http_lua_get_lua_vm(r, ctx);
-
-    } else {
-        L = ngx_http_lua_get_lua_vm(r, ctx);
-
-        dd("reset ctx");
-        ngx_http_lua_reset_ctx(r, L, ctx);
-    }
-
-    ctx->context = NGX_HTTP_LUA_CONTEXT_BALANCER;
-
-    bp->sockaddr = NULL;
-    bp->socklen = 0;
-    bp->more_tries = 0;
-    bp->total_tries++;
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    /* balancer_by_lua does not support yielding and
-     * there cannot be any conflicts among concurrent requests,
-     * thus it is safe to store the peer data in the main conf.
-     */
-    lmcf->balancer_peer_data = bp;
-
-    rc = lscf->balancer.handler(r, lscf, L);
-
-    if (rc == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    if (ctx->exited && ctx->exit_code != NGX_OK) {
-        rc = ctx->exit_code;
-        if (rc == NGX_ERROR
-            || rc == NGX_BUSY
-            || rc == NGX_DECLINED
-#ifdef HAVE_BALANCER_STATUS_CODE_PATCH
-            || rc >= NGX_HTTP_SPECIAL_RESPONSE
-#endif
-        ) {
-            return rc;
-        }
-
-        if (rc > NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-    if (bp->sockaddr && bp->socklen) {
-        pc->sockaddr = bp->sockaddr;
-        pc->socklen = bp->socklen;
-        pc->cached = 0;
-        pc->connection = NULL;
-        pc->name = bp->host;
-
-        bp->rrp.peers->single = 0;
-
-        if (bp->more_tries) {
-            r->upstream->peer.tries += bp->more_tries;
-        }
-
-        dd("tries: %d", (int) r->upstream->peer.tries);
-
-        return NGX_OK;
-    }
-
-    return ngx_http_upstream_get_round_robin_peer(pc, &bp->rrp);
-}
-
-
-static ngx_int_t
-ngx_http_lua_balancer_by_chunk(lua_State *L, ngx_http_request_t *r)
-{
-    u_char                  *err_msg;
-    size_t                   len;
-    ngx_int_t                rc;
-
-    /* init nginx context in Lua VM */
-    ngx_http_lua_set_req(L, r);
-    ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
-
-    /*  {{{ make new env inheriting main thread's globals table */
-    lua_createtable(L, 0, 1 /* nrec */);   /* the metatable for the new env */
-    ngx_http_lua_get_globals_table(L);
-    lua_setfield(L, -2, "__index");
-    lua_setmetatable(L, -2);    /*  setmetatable({}, {__index = _G}) */
-    /*  }}} */
-
-    lua_setfenv(L, -2);    /*  set new running env for the code closure */
-
-    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 */
-
-    dd("rc == %d", (int) rc);
-
-    if (rc != 0) {
-        /*  error occurred 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 balancer_by_lua*: %*s", len, err_msg);
-
-        lua_settop(L, 0); /*  clear remaining elems on stack */
-
-        return NGX_ERROR;
-    }
-
-    lua_settop(L, 0); /*  clear remaining elems on stack */
-    return rc;
-}
-
-
-void
-ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
-    ngx_uint_t state)
-{
-    ngx_http_lua_balancer_peer_data_t  *bp = data;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "lua balancer free peer, tries: %ui", pc->tries);
-
-    if (bp->sockaddr && bp->socklen) {
-        bp->last_peer_state = (int) state;
-
-        if (pc->tries) {
-            pc->tries--;
-        }
-
-        return;
-    }
-
-    /* fallback */
-
-    ngx_http_upstream_free_round_robin_peer(pc, data, state);
-}
-
-
-#if (NGX_HTTP_SSL)
-
-static ngx_int_t
-ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc, void *data)
-{
-    ngx_http_lua_balancer_peer_data_t  *bp = data;
-
-    if (bp->sockaddr && bp->socklen) {
-        /* TODO */
-        return NGX_OK;
-    }
-
-    return ngx_http_upstream_set_round_robin_peer_session(pc, &bp->rrp);
-}
-
-
-static void
-ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
-{
-    ngx_http_lua_balancer_peer_data_t  *bp = data;
-
-    if (bp->sockaddr && bp->socklen) {
-        /* TODO */
-        return;
-    }
-
-    ngx_http_upstream_save_round_robin_peer_session(pc, &bp->rrp);
-    return;
-}
-
-#endif
-
-
-#ifndef NGX_LUA_NO_FFI_API
-
-int
-ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
-    const u_char *addr, size_t addr_len, int port, char **err)
-{
-    ngx_url_t              url;
-    ngx_http_lua_ctx_t    *ctx;
-    ngx_http_upstream_t   *u;
-
-    ngx_http_lua_main_conf_t           *lmcf;
-    ngx_http_lua_balancer_peer_data_t  *bp;
-
-    if (r == NULL) {
-        *err = "no request found";
-        return NGX_ERROR;
-    }
-
-    u = r->upstream;
-
-    if (u == NULL) {
-        *err = "no upstream found";
-        return NGX_ERROR;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        *err = "no ctx found";
-        return NGX_ERROR;
-    }
-
-    if ((ctx->context & NGX_HTTP_LUA_CONTEXT_BALANCER) == 0) {
-        *err = "API disabled in the current context";
-        return NGX_ERROR;
-    }
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    /* we cannot read r->upstream->peer.data here directly because
-     * it could be overridden by other modules like
-     * ngx_http_upstream_keepalive_module.
-     */
-    bp = lmcf->balancer_peer_data;
-    if (bp == NULL) {
-        *err = "no upstream peer data found";
-        return NGX_ERROR;
-    }
-
-    ngx_memzero(&url, sizeof(ngx_url_t));
-
-    url.url.data = ngx_palloc(r->pool, addr_len);
-    if (url.url.data == NULL) {
-        *err = "no memory";
-        return NGX_ERROR;
-    }
-
-    ngx_memcpy(url.url.data, addr, addr_len);
-
-    url.url.len = addr_len;
-    url.default_port = (in_port_t) port;
-    url.uri_part = 0;
-    url.no_resolve = 1;
-
-    if (ngx_parse_url(r->pool, &url) != NGX_OK) {
-        if (url.err) {
-            *err = url.err;
-        }
-
-        return NGX_ERROR;
-    }
-
-    if (url.addrs && url.addrs[0].sockaddr) {
-        bp->sockaddr = url.addrs[0].sockaddr;
-        bp->socklen = url.addrs[0].socklen;
-        bp->host = &url.addrs[0].name;
-
-    } else {
-        *err = "no host allowed";
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_balancer_set_timeouts(ngx_http_request_t *r,
-    long connect_timeout, long send_timeout, long read_timeout,
-    char **err)
-{
-    ngx_http_lua_ctx_t    *ctx;
-    ngx_http_upstream_t   *u;
-
-#if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
-    ngx_http_upstream_conf_t           *ucf;
-#endif
-    ngx_http_lua_main_conf_t           *lmcf;
-    ngx_http_lua_balancer_peer_data_t  *bp;
-
-    if (r == NULL) {
-        *err = "no request found";
-        return NGX_ERROR;
-    }
-
-    u = r->upstream;
-
-    if (u == NULL) {
-        *err = "no upstream found";
-        return NGX_ERROR;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        *err = "no ctx found";
-        return NGX_ERROR;
-    }
-
-    if ((ctx->context & NGX_HTTP_LUA_CONTEXT_BALANCER) == 0) {
-        *err = "API disabled in the current context";
-        return NGX_ERROR;
-    }
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    bp = lmcf->balancer_peer_data;
-    if (bp == NULL) {
-        *err = "no upstream peer data found";
-        return NGX_ERROR;
-    }
-
-#if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
-    if (!bp->cloned_upstream_conf) {
-        /* we clone the upstream conf for the current request so that
-         * we do not affect other requests at all. */
-
-        ucf = ngx_palloc(r->pool, sizeof(ngx_http_upstream_conf_t));
-
-        if (ucf == NULL) {
-            *err = "no memory";
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(ucf, u->conf, sizeof(ngx_http_upstream_conf_t));
-
-        u->conf = ucf;
-        bp->cloned_upstream_conf = 1;
-
-    } else {
-        ucf = u->conf;
-    }
-#endif
-
-    if (connect_timeout > 0) {
-#if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
-        u->connect_timeout = (ngx_msec_t) connect_timeout;
-#else
-        ucf->connect_timeout = (ngx_msec_t) connect_timeout;
-#endif
-    }
-
-    if (send_timeout > 0) {
-#if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
-        u->send_timeout = (ngx_msec_t) send_timeout;
-#else
-        ucf->send_timeout = (ngx_msec_t) send_timeout;
-#endif
-    }
-
-    if (read_timeout > 0) {
-#if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
-        u->read_timeout = (ngx_msec_t) read_timeout;
-#else
-        ucf->read_timeout = (ngx_msec_t) read_timeout;
-#endif
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_balancer_set_more_tries(ngx_http_request_t *r,
-    int count, char **err)
-{
-#if (nginx_version >= 1007005)
-    ngx_uint_t             max_tries, total;
-#endif
-    ngx_http_lua_ctx_t    *ctx;
-    ngx_http_upstream_t   *u;
-
-    ngx_http_lua_main_conf_t           *lmcf;
-    ngx_http_lua_balancer_peer_data_t  *bp;
-
-    if (r == NULL) {
-        *err = "no request found";
-        return NGX_ERROR;
-    }
-
-    u = r->upstream;
-
-    if (u == NULL) {
-        *err = "no upstream found";
-        return NGX_ERROR;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        *err = "no ctx found";
-        return NGX_ERROR;
-    }
-
-    if ((ctx->context & NGX_HTTP_LUA_CONTEXT_BALANCER) == 0) {
-        *err = "API disabled in the current context";
-        return NGX_ERROR;
-    }
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    bp = lmcf->balancer_peer_data;
-    if (bp == NULL) {
-        *err = "no upstream peer data found";
-        return NGX_ERROR;
-    }
-
-#if (nginx_version >= 1007005)
-    max_tries = r->upstream->conf->next_upstream_tries;
-    total = bp->total_tries + r->upstream->peer.tries - 1;
-
-    if (max_tries && total + count > max_tries) {
-        count = max_tries - total;
-        *err = "reduced tries due to limit";
-
-    } else {
-        *err = NULL;
-    }
-#else
-    *err = NULL;
-#endif
-
-    bp->more_tries = count;
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_balancer_get_last_failure(ngx_http_request_t *r,
-    int *status, char **err)
-{
-    ngx_http_lua_ctx_t         *ctx;
-    ngx_http_upstream_t        *u;
-    ngx_http_upstream_state_t  *state;
-
-    ngx_http_lua_balancer_peer_data_t  *bp;
-    ngx_http_lua_main_conf_t           *lmcf;
-
-    if (r == NULL) {
-        *err = "no request found";
-        return NGX_ERROR;
-    }
-
-    u = r->upstream;
-
-    if (u == NULL) {
-        *err = "no upstream found";
-        return NGX_ERROR;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        *err = "no ctx found";
-        return NGX_ERROR;
-    }
-
-    if ((ctx->context & NGX_HTTP_LUA_CONTEXT_BALANCER) == 0) {
-        *err = "API disabled in the current context";
-        return NGX_ERROR;
-    }
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    bp = lmcf->balancer_peer_data;
-    if (bp == NULL) {
-        *err = "no upstream peer data found";
-        return NGX_ERROR;
-    }
-
-    if (r->upstream_states && r->upstream_states->nelts > 1) {
-        state = r->upstream_states->elts;
-        *status = (int) state[r->upstream_states->nelts - 2].status;
-
-    } else {
-        *status = 0;
-    }
-
-    return bp->last_peer_state;
-}
-
-#endif  /* NGX_LUA_NO_FFI_API */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_balancer.h b/debian/modules/http-lua/src/ngx_http_lua_balancer.h
deleted file mode 100644
index bb49dc0..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_balancer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_BALANCER_H_INCLUDED_
-#define _NGX_HTTP_LUA_BALANCER_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_balancer_handler_inline(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
-
-ngx_int_t ngx_http_lua_balancer_handler_file(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
-
-char *ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-
-char *ngx_http_lua_balancer_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-
-
-#endif /* _NGX_HTTP_LUA_BALANCER_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
deleted file mode 100644
index 2b3c38f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.c
+++ /dev/null
@@ -1,633 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#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;
-
-
-/* key for the ngx_chain_t *in pointer in the Lua thread */
-#define ngx_http_lua_chain_key  "__ngx_cl"
-
-
-/**
- * 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 */
-    ngx_http_lua_set_req(L, r);
-
-    lua_pushlightuserdata(L, in);
-    lua_setglobal(L, ngx_http_lua_chain_key);
-
-    /**
-     * 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_globals_table(L, 0 /* narr */, 1 /* nrec */);
-
-    /*  {{{ make new env inheriting main thread's globals table */
-    lua_createtable(L, 0, 1 /* nrec */);    /*  the metatable for the new
-                                                env */
-    ngx_http_lua_get_globals_table(L);
-    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 occurred */
-        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_loc_conf_t     *llcf;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       llcf->body_filter_src.value.data,
-                                       llcf->body_filter_src.value.len,
-                                       llcf->body_filter_src_key,
-                                       "=body_filter_by_lua");
-    if (rc != NGX_OK) {
-        return NGX_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_loc_conf_t         *llcf;
-    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;
-    }
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
-                                     llcf->body_filter_src_key);
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_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;
-    uint16_t                     old_context;
-    ngx_http_cleanup_t          *cln;
-    lua_State                   *L;
-    ngx_chain_t                 *out;
-
-    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->seen_last_in_filter) {
-        for (/* void */; in; in = in->next) {
-            dd("mark the buf as consumed: %d", (int) ngx_buf_size(in->buf));
-            in->buf->pos = in->buf->last;
-            in->buf->file_pos = in->buf->file_last;
-        }
-
-        return NGX_OK;
-    }
-
-    if (ctx->cleanup == NULL) {
-        cln = ngx_http_cleanup_add(r, 0);
-        if (cln == NULL) {
-            return NGX_ERROR;
-        }
-
-        cln->handler = ngx_http_lua_request_cleanup_handler;
-        cln->data = ctx;
-        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;
-    }
-
-    L = ngx_http_lua_get_lua_vm(r, ctx);
-
-    lua_getglobal(L, ngx_http_lua_chain_key);
-    out = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    if (in == out) {
-        return ngx_http_next_body_filter(r, in);
-    }
-
-    if (out == NULL) {
-        /* do not forward NULL to the next filters because the input is
-         * not NULL */
-        return NGX_OK;
-    }
-
-    /* in != out */
-    rc = ngx_http_next_body_filter(r, out);
-    if (rc == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-#if nginx_version >= 1001004
-    ngx_chain_update_chains(r->pool,
-#else
-    ngx_chain_update_chains(
-#endif
-                            &ctx->free_bufs, &ctx->busy_bufs, &out,
-                            (ngx_buf_tag_t) &ngx_http_lua_module);
-
-    return rc;
-}
-
-
-ngx_int_t
-ngx_http_lua_body_filter_init(void)
-{
-    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_getglobal(L, ngx_http_lua_chain_key);
-    in = lua_touserdata(L, -1);
-
-    if (idx == 2) {
-        /* asking for the eof argument */
-
-        for (cl = in; cl; cl = cl->next) {
-            if (cl->buf->last_buf || cl->buf->last_in_chain) {
-                lua_pushboolean(L, 1);
-                return 1;
-            }
-        }
-
-        lua_pushboolean(L, 0);
-        return 1;
-    }
-
-    /* idx == 1 */
-
-    size = 0;
-
-    if (in == NULL) {
-        /* being a cleared chain on the Lua land */
-        lua_pushliteral(L, "");
-        return 1;
-    }
-
-    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 || b->last_in_chain) {
-            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 || b->last_in_chain) {
-            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;
-    int                      found;
-    u_char                  *data;
-    size_t                   size;
-    unsigned                 last;
-    unsigned                 flush = 0;
-    ngx_buf_t               *b;
-    ngx_chain_t             *cl;
-    ngx_chain_t             *in;
-
-    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_getglobal(L, ngx_http_lua_chain_key);
-        in = lua_touserdata(L, -1);
-        lua_pop(L, 1);
-
-        if (last) {
-            ctx->seen_last_in_filter = 1;
-
-            /* the "in" chain cannot be NULL and we set the "last_buf" or
-             * "last_in_chain" flag in the last buf of "in" */
-
-            for (cl = in; cl; cl = cl->next) {
-                if (cl->next == NULL) {
-                    if (r == r->main) {
-                        cl->buf->last_buf = 1;
-
-                    } else {
-                        cl->buf->last_in_chain = 1;
-                    }
-
-                    break;
-                }
-            }
-
-        } else {
-            /* last == 0 */
-
-            found = 0;
-
-            for (cl = in; cl; cl = cl->next) {
-                b = cl->buf;
-
-                if (b->last_buf) {
-                    b->last_buf = 0;
-                    found = 1;
-                }
-
-                if (b->last_in_chain) {
-                    b->last_in_chain = 0;
-                    found = 1;
-                }
-
-                if (found && b->last == b->pos && !ngx_buf_in_memory(b)) {
-                    /* make it a special sync buf to make
-                     * ngx_http_write_filter_module happy. */
-                    b->sync = 1;
-                }
-            }
-
-            ctx->seen_last_in_filter = 0;
-        }
-
-        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_getglobal(L, ngx_http_lua_chain_key); /* key val */
-        in = lua_touserdata(L, -1);
-        lua_pop(L, 1);
-
-        last = 0;
-
-        for (cl = in; cl; cl = cl->next) {
-            b = cl->buf;
-
-            if (b->flush) {
-                flush = 1;
-            }
-
-            if (b->last_in_chain || b->last_buf) {
-                last = 1;
-            }
-
-            dd("mark the buf as consumed: %d", (int) ngx_buf_size(b));
-            b->pos = b->last;
-        }
-
-        /* cl == NULL */
-
-        goto done;
-
-    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_getglobal(L, ngx_http_lua_chain_key);
-    in = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    last = 0;
-
-    for (cl = in; cl; cl = cl->next) {
-        b = cl->buf;
-
-        if (b->flush) {
-            flush = 1;
-        }
-
-        if (b->last_buf || b->last_in_chain) {
-            last = 1;
-        }
-
-        dd("mark the buf as consumed: %d", (int) ngx_buf_size(cl->buf));
-        cl->buf->pos = cl->buf->last;
-    }
-
-    /* cl == NULL */
-
-    if (size == 0) {
-        goto done;
-    }
-
-    cl = ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                         &ctx->free_bufs, size);
-    if (cl == NULL) {
-        return luaL_error(L, "no 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);
-    }
-
-done:
-
-    if (last || flush) {
-        if (cl == NULL) {
-            cl = ngx_http_lua_chain_get_free_buf(r->connection->log,
-                                                 r->pool,
-                                                 &ctx->free_bufs, 0);
-            if (cl == NULL) {
-                return luaL_error(L, "no memory");
-            }
-        }
-
-        if (last) {
-            ctx->seen_last_in_filter = 1;
-
-            if (r == r->main) {
-                cl->buf->last_buf = 1;
-
-            } else {
-                cl->buf->last_in_chain = 1;
-            }
-        }
-
-        if (flush) {
-            cl->buf->flush = 1;
-        }
-    }
-
-    lua_pushlightuserdata(L, cl);
-    lua_setglobal(L, ngx_http_lua_chain_key);
-    return 0;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h b/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
deleted file mode 100644
index 6a4b306..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_bodyfilterby.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_BODYFILTERBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_BODYFILTERBY_H_INCLUDED_
-
-
-#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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_cache.c b/debian/modules/http-lua/src/ngx_http_lua_cache.c
deleted file mode 100644
index 5ea3069..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_cache.c
+++ /dev/null
@@ -1,296 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include <nginx.h>
-#include <ngx_md5.h>
-#include "ngx_http_lua_common.h"
-#include "ngx_http_lua_cache.h"
-#include "ngx_http_lua_clfactory.h"
-#include "ngx_http_lua_util.h"
-
-
-/**
- * Find code chunk associated with the given key in code cache,
- * and push it to the top of Lua stack if found.
- *
- * Stack layout before call:
- *         |     ...    | <- top
- *
- * Stack layout after call:
- *         | code chunk | <- top
- *         |     ...    |
- *
- * */
-static ngx_int_t
-ngx_http_lua_cache_load_code(ngx_log_t *log, lua_State *L,
-    const char *key)
-{
-    int          rc;
-    u_char      *err;
-
-    /*  get code cache table */
-    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));
-
-    if (!lua_istable(L, -1)) {
-        dd("Error: code cache table to load did not exist!!");
-        return NGX_ERROR;
-    }
-
-    lua_getfield(L, -1, key);    /*  sp++ */
-
-    if (lua_isfunction(L, -1)) {
-        /*  call closure factory to gen new closure */
-        rc = lua_pcall(L, 0, 1, 0);
-        if (rc == 0) {
-            /*  remove cache table from stack, leave code chunk at
-             *  top of stack */
-            lua_remove(L, -2);   /*  sp-- */
-            return NGX_OK;
-        }
-
-        if (lua_isstring(L, -1)) {
-            err = (u_char *) lua_tostring(L, -1);
-
-        } else {
-            err = (u_char *) "unknown error";
-        }
-
-        ngx_log_error(NGX_LOG_ERR, log, 0,
-                      "lua: failed to run factory at key \"%s\": %s",
-                      key, err);
-        lua_pop(L, 2);
-        return NGX_ERROR;
-    }
-
-    dd("Value associated with given key in code cache table is not code "
-       "chunk: stack top=%d, top value type=%s\n",
-       lua_gettop(L), lua_typename(L, -1));
-
-    /*  remove cache table and value from stack */
-    lua_pop(L, 2);                                /*  sp-=2 */
-
-    return NGX_DECLINED;
-}
-
-
-/**
- * Store the closure factory at the top of Lua stack to code cache, and
- * associate it with the given key. Then generate new closure.
- *
- * Stack layout before call:
- *         | code factory | <- top
- *         |     ...      |
- *
- * Stack layout after call:
- *         | code chunk | <- top
- *         |     ...    |
- *
- * */
-static ngx_int_t
-ngx_http_lua_cache_store_code(lua_State *L, const char *key)
-{
-    int rc;
-
-    /*  get code cache table */
-    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));
-
-    if (!lua_istable(L, -1)) {
-        dd("Error: code cache table to load did not exist!!");
-        return NGX_ERROR;
-    }
-
-    lua_pushvalue(L, -2); /* closure cache closure */
-    lua_setfield(L, -2, key); /* closure cache */
-
-    /*  remove cache table, leave closure factory at top of stack */
-    lua_pop(L, 1); /* closure */
-
-    /*  call closure factory to generate new closure */
-    rc = lua_pcall(L, 0, 1, 0);
-    if (rc != 0) {
-        dd("Error: failed to call closure factory!!");
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
-    const u_char *src, size_t src_len, const u_char *cache_key,
-    const char *name)
-{
-    int          n;
-    ngx_int_t    rc;
-    const char  *err = NULL;
-
-    n = lua_gettop(L);
-
-    dd("XXX cache key: [%s]", cache_key);
-
-    rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
-    if (rc == NGX_OK) {
-        /*  code chunk loaded from cache, sp++ */
-        dd("Code cache hit! cache key='%s', stack top=%d, script='%.*s'",
-           cache_key, lua_gettop(L), (int) src_len, src);
-        return NGX_OK;
-    }
-
-    if (rc == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    /* rc == NGX_DECLINED */
-
-    dd("Code cache missed! cache key='%s', stack top=%d, script='%.*s'",
-       cache_key, lua_gettop(L), (int) src_len, src);
-
-    /* load closure factory of inline script to the top of lua stack, sp++ */
-    rc = ngx_http_lua_clfactory_loadbuffer(L, (char *) src, src_len, name);
-
-    if (rc != 0) {
-        /*  Oops! error occurred when loading Lua script */
-        if (rc == LUA_ERRMEM) {
-            err = "memory allocation error";
-
-        } else {
-            if (lua_isstring(L, -1)) {
-                err = lua_tostring(L, -1);
-
-            } else {
-                err = "unknown error";
-            }
-        }
-
-        goto error;
-    }
-
-    /*  store closure factory and gen new closure at the top of lua stack to
-     *  code cache */
-    rc = ngx_http_lua_cache_store_code(L, (char *) cache_key);
-    if (rc != NGX_OK) {
-        err = "fail to generate new closure from the closure factory";
-        goto error;
-    }
-
-    return NGX_OK;
-
-error:
-
-    ngx_log_error(NGX_LOG_ERR, log, 0,
-                  "failed to load inlined Lua code: %s", err);
-    lua_settop(L, n);
-    return NGX_ERROR;
-}
-
-
-ngx_int_t
-ngx_http_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
-    const u_char *script, const u_char *cache_key)
-{
-    int              n;
-    ngx_int_t        rc, errcode = NGX_ERROR;
-    u_char          *p;
-    u_char           buf[NGX_HTTP_LUA_FILE_KEY_LEN + 1];
-    const char      *err = NULL;
-
-    n = lua_gettop(L);
-
-    /*  calculate digest of script file path */
-    if (cache_key == NULL) {
-        dd("CACHE file key not pre-calculated...calculating");
-        p = ngx_copy(buf, NGX_HTTP_LUA_FILE_TAG, NGX_HTTP_LUA_FILE_TAG_LEN);
-
-        p = ngx_http_lua_digest_hex(p, script, ngx_strlen(script));
-
-        *p = '\0';
-        cache_key = buf;
-
-    } else {
-        dd("CACHE file key already pre-calculated");
-    }
-
-    dd("XXX cache key for file: [%s]", cache_key);
-
-    rc = ngx_http_lua_cache_load_code(log, L, (char *) cache_key);
-    if (rc == NGX_OK) {
-        /*  code chunk loaded from cache, sp++ */
-        dd("Code cache hit! cache key='%s', stack top=%d, file path='%s'",
-           cache_key, lua_gettop(L), script);
-        return NGX_OK;
-    }
-
-    if (rc == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    /* rc == NGX_DECLINED */
-
-    dd("Code cache missed! cache key='%s', stack top=%d, file path='%s'",
-       cache_key, lua_gettop(L), script);
-
-    /*  load closure factory of script file to the top of lua stack, sp++ */
-    rc = ngx_http_lua_clfactory_loadfile(L, (char *) script);
-
-    dd("loadfile returns %d (%d)", (int) rc, LUA_ERRFILE);
-
-    if (rc != 0) {
-        /*  Oops! error occurred when loading Lua script */
-        switch (rc) {
-        case LUA_ERRMEM:
-            err = "memory allocation error";
-            break;
-
-        case LUA_ERRFILE:
-            errcode = NGX_HTTP_NOT_FOUND;
-            /* fall through */
-
-        default:
-            if (lua_isstring(L, -1)) {
-                err = lua_tostring(L, -1);
-
-            } else {
-                err = "unknown error";
-            }
-        }
-
-        goto error;
-    }
-
-    /*  store closure factory and gen new closure at the top of lua stack
-     *  to code cache */
-    rc = ngx_http_lua_cache_store_code(L, (char *) cache_key);
-    if (rc != NGX_OK) {
-        err = "fail to generate new closure from the closure factory";
-        goto error;
-    }
-
-    return NGX_OK;
-
-error:
-
-    ngx_log_error(NGX_LOG_ERR, log, 0,
-                  "failed to load external Lua file \"%s\": %s", script, err);
-
-    lua_settop(L, n);
-    return errcode;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_cache.h b/debian/modules/http-lua/src/ngx_http_lua_cache.h
deleted file mode 100644
index 52e6d2c..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_cache.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_CACHE_H_INCLUDED_
-#define _NGX_HTTP_LUA_CACHE_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
-    const u_char *src, size_t src_len, const u_char *cache_key,
-    const char *name);
-ngx_int_t ngx_http_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
-    const u_char *script, const u_char *cache_key);
-
-
-#endif /* _NGX_HTTP_LUA_CACHE_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_capturefilter.c b/debian/modules/http-lua/src/ngx_http_lua_capturefilter.c
deleted file mode 100644
index 5fe5f60..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_capturefilter.c
+++ /dev/null
@@ -1,176 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include <nginx.h>
-#include "ngx_http_lua_capturefilter.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_exception.h"
-#include "ngx_http_lua_subrequest.h"
-
-
-ngx_http_output_header_filter_pt ngx_http_lua_next_header_filter;
-ngx_http_output_body_filter_pt ngx_http_lua_next_body_filter;
-
-
-static ngx_int_t ngx_http_lua_capture_header_filter(ngx_http_request_t *r);
-static ngx_int_t ngx_http_lua_capture_body_filter(ngx_http_request_t *r,
-    ngx_chain_t *in);
-
-
-ngx_int_t
-ngx_http_lua_capture_filter_init(ngx_conf_t *cf)
-{
-    /* setting up output filters to intercept subrequest responses */
-    ngx_http_lua_next_header_filter = ngx_http_top_header_filter;
-    ngx_http_top_header_filter = ngx_http_lua_capture_header_filter;
-
-    ngx_http_lua_next_body_filter = ngx_http_top_body_filter;
-    ngx_http_top_body_filter = ngx_http_lua_capture_body_filter;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_capture_header_filter(ngx_http_request_t *r)
-{
-    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) {
-
-        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
-             */
-            psr_data = psr->data;
-
-            old_ctx = psr_data->ctx;
-
-            if (ctx == NULL) {
-                ctx = old_ctx;
-                ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
-
-            } 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);
-
-                ctx->capture = old_ctx->capture;
-                ctx->index = old_ctx->index;
-                ctx->body = NULL;
-                ctx->last_body = &ctx->body;
-                psr_data->ctx = ctx;
-            }
-        }
-    }
-
-    if (ctx && ctx->capture) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua capturing response body");
-
-        /* force subrequest response body buffer in memory */
-        r->filter_need_in_memory = 1;
-        r->header_sent = 1;
-        ctx->header_sent = 1;
-
-        if (r->method == NGX_HTTP_HEAD) {
-            r->header_only = 1;
-        }
-
-        return NGX_OK;
-    }
-
-    return ngx_http_lua_next_header_filter(r);
-}
-
-
-static ngx_int_t
-ngx_http_lua_capture_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
-{
-    int                              rc;
-    ngx_int_t                        eof;
-    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);
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (!ctx || !ctx->capture) {
-        dd("no ctx or no capture %.*s", (int) r->uri.len, r->uri.data);
-
-        return ngx_http_lua_next_body_filter(r, 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");
-        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");
-
-        return NGX_ERROR;
-    }
-
-    pr_ctx = ngx_http_get_module_ctx(r->parent, ngx_http_lua_module);
-    if (pr_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua capture body filter capturing response body, uri "
-                   "\"%V\"", &r->uri);
-
-    rc = ngx_http_lua_add_copy_chain(r, pr_ctx, &ctx->last_body, in, &eof);
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    dd("add copy chain eof: %d, sr: %d", (int) eof, r != r->main);
-
-    if (eof) {
-        ctx->seen_last_for_subreq = 1;
-    }
-
-    ngx_http_lua_discard_bufs(r->pool, in);
-
-    return NGX_OK;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_capturefilter.h b/debian/modules/http-lua/src/ngx_http_lua_capturefilter.h
deleted file mode 100644
index 1e9d529..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_capturefilter.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_CAPTUREFILTER_H_INCLUDED_
-#define _NGX_HTTP_LUA_CAPTUREFILTER_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_capture_filter_init(ngx_conf_t *cf);
-
-
-#endif /* NGX_HTTP_LUA_CAPTUREFILTER_H */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c b/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
deleted file mode 100644
index 041f046..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_clfactory.c
+++ /dev/null
@@ -1,887 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include <nginx.h>
-#include "ngx_http_lua_clfactory.h"
-
-
-#define CLFACTORY_BEGIN_CODE "return function() "
-#define CLFACTORY_BEGIN_SIZE (sizeof(CLFACTORY_BEGIN_CODE) - 1)
-
-#define CLFACTORY_END_CODE "\nend"
-#define CLFACTORY_END_SIZE (sizeof(CLFACTORY_END_CODE) - 1)
-
-
-/*
- * 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 parameters 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]    | Initially 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 parameters 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 2.0 */
-
-#define    LJ20_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    LJ20_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    LJ20_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    LJ20_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"
-
-/* bytecode for luajit 2.1 */
-
-#define    LJ21_LITTLE_ENDIAN_CODE_STRIPPED                                  \
-    "\x14\x03\x00\x01\x00\x01\x00\x03"                                       \
-    "\x33\x00\x00\x00\x32\x00\x00\x80\x4c\x00\x02\x00"                       \
-    "\x00\x00"
-
-#define    LJ21_BIG_ENDIAN_CODE_STRIPPED                                     \
-    "\x14\x03\x00\x01\x00\x01\x00\x03"                                       \
-    "\x00\x00\x00\x33\x80\x00\x00\x32\x00\x02\x00\x4c"                       \
-    "\x00\x00"
-
-#define    LJ21_LITTLE_ENDIAN_CODE                                           \
-    "\x15\x03\x00\x01\x00\x01\x00\x03\x00"                                   \
-    "\x33\x00\x00\x00\x32\x00\x00\x80\x4c\x00\x02\x00"                       \
-    "\x00\x00"
-
-#define    LJ21_BIG_ENDIAN_CODE                                              \
-    "\x15\x03\x00\x01\x00\x01\x00\x03\x00"                                   \
-    "\x00\x00\x00\x33\x80\x00\x00\x32\x00\x02\x00\x4c"                       \
-    "\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    LJ21_BCDUMP_VERSION        2
-#define    LJ20_BCDUMP_VERSION        1
-#define    LJ_SIGNATURE             "\x1b\x4c\x4a"
-
-
-typedef enum {
-    NGX_LUA_TEXT_FILE,
-    NGX_LUA_BT_LUA,
-    NGX_LUA_BT_LJ
-} ngx_http_lua_clfactory_file_type_e;
-
-
-enum {
-    NGX_LUA_READER_BUFSIZE = 4096
-};
-
-
-typedef struct {
-    ngx_http_lua_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[NGX_LUA_READER_BUFSIZE];
-} ngx_http_lua_clfactory_file_ctx_t;
-
-
-typedef struct {
-    int         sent_begin;
-    int         sent_end;
-    const char *s;
-    size_t      size;
-} ngx_http_lua_clfactory_buffer_ctx_t;
-
-
-static const char *ngx_http_lua_clfactory_getF(lua_State *L, void *ud,
-    size_t *size);
-static int ngx_http_lua_clfactory_errfile(lua_State *L, const char *what,
-    int fname_index);
-static const char *ngx_http_lua_clfactory_getS(lua_State *L, void *ud,
-    size_t *size);
-static long ngx_http_lua_clfactory_file_size(FILE *f);
-
-
-int
-ngx_http_lua_clfactory_bytecode_prepare(lua_State *L,
-    ngx_http_lua_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         *emsg, *serr, *bytecode;
-    size_t              size, bytecode_len;
-    long                fsize;
-
-    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);
-
-        dd("version: %d", (int) version);
-
-        if (ngx_memcmp(lf->begin_code.str, LJ_SIGNATURE,
-                       sizeof(LJ_SIGNATURE) - 1))
-        {
-            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;
-
-        dd("stripped: %d", (int) stripped);
-
-        if (version == LJ21_BCDUMP_VERSION) {
-            if (stripped) {
-                if (little_endian) {
-                    lf->end_code.ptr = LJ21_LITTLE_ENDIAN_CODE_STRIPPED;
-
-                } else {
-                    lf->end_code.ptr = LJ21_BIG_ENDIAN_CODE_STRIPPED;
-                }
-
-                lf->end_code_len = LJ_CODE_LEN_STRIPPED;
-
-            } else {
-                if (little_endian) {
-                    lf->end_code.ptr = LJ21_LITTLE_ENDIAN_CODE;
-
-                } else {
-                    lf->end_code.ptr = LJ21_BIG_ENDIAN_CODE;
-                }
-
-                lf->end_code_len = LJ_CODE_LEN;
-            }
-
-        } else if (version == LJ20_BCDUMP_VERSION) {
-            if (stripped) {
-                if (little_endian) {
-                    lf->end_code.ptr = LJ20_LITTLE_ENDIAN_CODE_STRIPPED;
-
-                } else {
-                    lf->end_code.ptr = LJ20_BIG_ENDIAN_CODE_STRIPPED;
-                }
-
-                lf->end_code_len = LJ_CODE_LEN_STRIPPED;
-
-            } else {
-                if (little_endian) {
-                    lf->end_code.ptr = LJ20_LITTLE_ENDIAN_CODE;
-
-                } else {
-                    lf->end_code.ptr = LJ20_BIG_ENDIAN_CODE;
-                }
-
-                lf->end_code_len = LJ_CODE_LEN;
-            }
-
-        } else {
-            emsg = "bytecode format version unsupported";
-            goto error;
-        }
-
-        fsize = ngx_http_lua_clfactory_file_size(lf->f);
-        if (fsize < 0) {
-            serr = strerror(errno);
-            emsg = "cannot fseek/ftell";
-            goto error;
-        }
-
-        lf->rest_len = fsize - 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 parameters */
-        *(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:
-
-    fclose(lf->f);  /* close file (even in case of errors) */
-
-    if (serr) {
-        lua_pushfstring(L, "%s: %s", emsg, serr);
-
-    } else {
-        lua_pushstring(L, emsg);
-    }
-
-    lua_remove(L, fname_index);
-
-    return LUA_ERRFILE;
-}
-
-
-ngx_int_t
-ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename)
-{
-    int                         c, status, readstatus;
-    ngx_flag_t                  sharp;
-
-    ngx_http_lua_clfactory_file_ctx_t        lf;
-
-    /* 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;
-
-    lua_pushfstring(L, "@%s", filename);
-
-    lf.f = fopen(filename, "r");
-    if (lf.f == NULL) {
-        return ngx_http_lua_clfactory_errfile(L, "open", fname_index);
-    }
-
-    c = getc(lf.f);
-
-    if (c == '#') {  /* Unix exec. file? */
-        lf.extraline = 1;
-
-        while ((c = getc(lf.f)) != EOF && c != '\n') {
-            /* skip first line */
-        }
-
-        if (c == '\n') {
-            c = getc(lf.f);
-        }
-
-        sharp = 1;
-    }
-
-    if (c == LUA_SIGNATURE[0] && filename) {  /* binary file? */
-        lf.f = freopen(filename, "rb", lf.f);  /* reopen in binary mode */
-
-        if (lf.f == NULL) {
-            return ngx_http_lua_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;
-    }
-
-    if (lf.file_type == NGX_LUA_TEXT_FILE) {
-        ungetc(c, lf.f);
-    }
-
-    lf.sent_begin = lf.sent_end = 0;
-    status = lua_load(L, ngx_http_lua_clfactory_getF, &lf,
-                      lua_tostring(L, -1));
-
-    readstatus = ferror(lf.f);
-
-    if (filename) {
-        fclose(lf.f);  /* close file (even in case of errors) */
-    }
-
-    if (readstatus) {
-        lua_settop(L, fname_index);  /* ignore results from `lua_load' */
-        return ngx_http_lua_clfactory_errfile(L, "read", fname_index);
-    }
-
-    lua_remove(L, fname_index);
-
-    return status;
-}
-
-
-ngx_int_t
-ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
-    size_t size, const char *name)
-{
-    ngx_http_lua_clfactory_buffer_ctx_t     ls;
-
-    ls.s = buff;
-    ls.size = size;
-    ls.sent_begin = 0;
-    ls.sent_end = 0;
-
-    return lua_load(L, ngx_http_lua_clfactory_getS, &ls, name);
-}
-
-
-static const char *
-ngx_http_lua_clfactory_getF(lua_State *L, void *ud, size_t *size)
-{
-    char                        *buf;
-    size_t                       num;
-
-    ngx_http_lua_clfactory_file_ctx_t        *lf;
-
-    lf = (ngx_http_lua_clfactory_file_ctx_t *) ud;
-
-    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;
-    }
-
-    num = fread(lf->buff, 1, sizeof(lf->buff), lf->f);
-
-    dd("fread returned %d", (int) num);
-
-    if (num == 0) {
-        if (lf->sent_end == 0) {
-            lf->sent_end = 1;
-            *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;
-        }
-
-        *size = 0;
-        return NULL;
-    }
-
-    if (lf->file_type == NGX_LUA_BT_LJ) {
-        /* skip the footer(\x00) in luajit */
-
-        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 lf->buff;
-}
-
-
-static int
-ngx_http_lua_clfactory_errfile(lua_State *L, const char *what, int fname_index)
-{
-    const char      *serr;
-    const char      *filename;
-
-    filename = lua_tostring(L, fname_index) + 1;
-
-    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;
-}
-
-
-static const char *
-ngx_http_lua_clfactory_getS(lua_State *L, void *ud, size_t *size)
-{
-    ngx_http_lua_clfactory_buffer_ctx_t      *ls = ud;
-
-    if (ls->sent_begin == 0) {
-        ls->sent_begin = 1;
-        *size = CLFACTORY_BEGIN_SIZE;
-
-        return CLFACTORY_BEGIN_CODE;
-    }
-
-    if (ls->size == 0) {
-        if (ls->sent_end == 0) {
-            ls->sent_end = 1;
-            *size = CLFACTORY_END_SIZE;
-            return CLFACTORY_END_CODE;
-        }
-
-        return NULL;
-    }
-
-    *size = ls->size;
-    ls->size = 0;
-
-    return ls->s;
-}
-
-
-static long
-ngx_http_lua_clfactory_file_size(FILE *f)
-{
-    long              cur_pos, len;
-
-    cur_pos = ftell(f);
-    if (cur_pos == -1) {
-        return -1;
-    }
-
-    if (fseek(f, 0, SEEK_END) != 0) {
-        return -1;
-    }
-
-    len = ftell(f);
-    if (len == -1) {
-        return -1;
-    }
-
-    if (fseek(f, cur_pos, SEEK_SET) != 0) {
-        return -1;
-    }
-
-    return len;
-}
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_clfactory.h b/debian/modules/http-lua/src/ngx_http_lua_clfactory.h
deleted file mode 100644
index 806d8af..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_clfactory.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_CLFACTORY_H_INCLUDED_
-#define _NGX_HTTP_LUA_CLFACTORY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_clfactory_loadfile(lua_State *L, const char *filename);
-ngx_int_t ngx_http_lua_clfactory_loadbuffer(lua_State *L, const char *buff,
-    size_t size, const char *name);
-
-
-#endif /* _NGX_HTTP_LUA_CLFACTORY_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_common.h b/debian/modules/http-lua/src/ngx_http_lua_common.h
deleted file mode 100644
index 01ef2be..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_common.h
+++ /dev/null
@@ -1,593 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_COMMON_H_INCLUDED_
-#define _NGX_HTTP_LUA_COMMON_H_INCLUDED_
-
-
-#include <nginx.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <ngx_md5.h>
-
-#include <setjmp.h>
-#include <stdint.h>
-
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-
-
-#if (NGX_PCRE)
-
-#include <pcre.h>
-
-#if (PCRE_MAJOR > 8) || (PCRE_MAJOR == 8 && PCRE_MINOR >= 21)
-#   define LUA_HAVE_PCRE_JIT 1
-#else
-#   define LUA_HAVE_PCRE_JIT 0
-#endif
-
-#endif
-
-
-#if !defined(nginx_version) || (nginx_version < 1006000)
-#error at least nginx 1.6.0 is required but found an older version
-#endif
-
-
-#if defined(NDK) && NDK
-#include <ndk.h>
-#endif
-
-
-#if LUA_VERSION_NUM != 501
-#   error unsupported Lua language version
-#endif
-
-
-#if (!defined OPENSSL_NO_OCSP && defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB)
-#   define NGX_HTTP_LUA_USE_OCSP 1
-#endif
-
-#ifndef NGX_HTTP_PERMANENT_REDIRECT
-#   define NGX_HTTP_PERMANENT_REDIRECT  308
-#endif
-
-#ifndef NGX_HAVE_SHA1
-#   if (nginx_version >= 1011002)
-#       define NGX_HAVE_SHA1  1
-#   endif
-#endif
-
-
-#ifndef MD5_DIGEST_LENGTH
-#define MD5_DIGEST_LENGTH 16
-#endif
-
-
-#ifdef NGX_LUA_USE_ASSERT
-#   include <assert.h>
-#   define ngx_http_lua_assert(a)  assert(a)
-#else
-#   define ngx_http_lua_assert(a)
-#endif
-
-
-/* Nginx HTTP Lua Inline tag prefix */
-
-#define NGX_HTTP_LUA_INLINE_TAG "nhli_"
-
-#define NGX_HTTP_LUA_INLINE_TAG_LEN                                          \
-    (sizeof(NGX_HTTP_LUA_INLINE_TAG) - 1)
-
-#define NGX_HTTP_LUA_INLINE_KEY_LEN                                          \
-    (NGX_HTTP_LUA_INLINE_TAG_LEN + 2 * MD5_DIGEST_LENGTH)
-
-/* Nginx HTTP Lua File tag prefix */
-
-#define NGX_HTTP_LUA_FILE_TAG "nhlf_"
-
-#define NGX_HTTP_LUA_FILE_TAG_LEN                                            \
-    (sizeof(NGX_HTTP_LUA_FILE_TAG) - 1)
-
-#define NGX_HTTP_LUA_FILE_KEY_LEN                                            \
-    (NGX_HTTP_LUA_FILE_TAG_LEN + 2 * MD5_DIGEST_LENGTH)
-
-
-#if defined(NDK) && NDK
-typedef struct {
-    size_t       size;
-    u_char      *key;
-    ngx_str_t    script;
-} ngx_http_lua_set_var_data_t;
-#endif
-
-
-#ifndef NGX_HTTP_LUA_MAX_ARGS
-#define NGX_HTTP_LUA_MAX_ARGS 100
-#endif
-
-
-#ifndef NGX_HTTP_LUA_MAX_HEADERS
-#define NGX_HTTP_LUA_MAX_HEADERS 100
-#endif
-
-
-/* must be within 16 bit */
-#define NGX_HTTP_LUA_CONTEXT_SET            0x0001
-#define NGX_HTTP_LUA_CONTEXT_REWRITE        0x0002
-#define NGX_HTTP_LUA_CONTEXT_ACCESS         0x0004
-#define NGX_HTTP_LUA_CONTEXT_CONTENT        0x0008
-#define NGX_HTTP_LUA_CONTEXT_LOG            0x0010
-#define NGX_HTTP_LUA_CONTEXT_HEADER_FILTER  0x0020
-#define NGX_HTTP_LUA_CONTEXT_BODY_FILTER    0x0040
-#define NGX_HTTP_LUA_CONTEXT_TIMER          0x0080
-#define NGX_HTTP_LUA_CONTEXT_INIT_WORKER    0x0100
-#define NGX_HTTP_LUA_CONTEXT_BALANCER       0x0200
-#define NGX_HTTP_LUA_CONTEXT_SSL_CERT       0x0400
-#define NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE 0x0800
-#define NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH 0x1000
-
-
-#ifndef NGX_LUA_NO_FFI_API
-#define NGX_HTTP_LUA_FFI_NO_REQ_CTX         -100
-#define NGX_HTTP_LUA_FFI_BAD_CONTEXT        -101
-#endif
-
-
-typedef struct ngx_http_lua_main_conf_s  ngx_http_lua_main_conf_t;
-typedef union ngx_http_lua_srv_conf_u  ngx_http_lua_srv_conf_t;
-
-
-typedef struct ngx_http_lua_balancer_peer_data_s
-    ngx_http_lua_balancer_peer_data_t;
-
-
-typedef struct ngx_http_lua_sema_mm_s  ngx_http_lua_sema_mm_t;
-
-
-typedef ngx_int_t (*ngx_http_lua_main_conf_handler_pt)(ngx_log_t *log,
-    ngx_http_lua_main_conf_t *lmcf, lua_State *L);
-typedef ngx_int_t (*ngx_http_lua_srv_conf_handler_pt)(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, 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_pool_cleanup_t  *vm_cleanup;
-
-    ngx_str_t            lua_path;
-    ngx_str_t            lua_cpath;
-
-    ngx_cycle_t         *cycle;
-    ngx_pool_t          *pool;
-
-    ngx_int_t            max_pending_timers;
-    ngx_int_t            pending_timers;
-
-    ngx_int_t            max_running_timers;
-    ngx_int_t            running_timers;
-
-    ngx_connection_t    *watcher;  /* for watching the process exit event */
-
-#if (NGX_PCRE)
-    ngx_int_t            regex_cache_entries;
-    ngx_int_t            regex_cache_max_entries;
-    ngx_int_t            regex_match_limit;
-
-#if (LUA_HAVE_PCRE_JIT)
-    pcre_jit_stack      *jit_stack;
-#endif
-
-#endif
-
-    ngx_array_t         *shm_zones;  /* of ngx_shm_zone_t* */
-
-    ngx_array_t         *shdict_zones; /* shm zones of "shdict" */
-
-    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_handler_pt    init_handler;
-    ngx_str_t                            init_src;
-
-    ngx_http_lua_main_conf_handler_pt    init_worker_handler;
-    ngx_str_t                            init_worker_src;
-
-    ngx_http_lua_balancer_peer_data_t      *balancer_peer_data;
-                    /* balancer_by_lua does not support yielding and
-                     * there cannot be any conflicts among concurrent requests,
-                     * thus it is safe to store the peer data in the main conf.
-                     */
-
-    ngx_uint_t                      shm_zones_inited;
-
-    ngx_http_lua_sema_mm_t         *sema_mm;
-
-    ngx_uint_t           malloc_trim_cycle;  /* a cycle is defined as the number
-                                                of reqeusts */
-    ngx_uint_t           malloc_trim_req_count;
-
-#if nginx_version >= 1011011
-    /* the following 2 fields are only used by ngx.req.raw_headers() for now */
-    ngx_buf_t          **busy_buf_ptrs;
-    ngx_int_t            busy_buf_ptr_count;
-#endif
-
-    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;
-    unsigned             requires_capture_log:1;
-};
-
-
-union ngx_http_lua_srv_conf_u {
-#if (NGX_HTTP_SSL)
-    struct {
-        ngx_http_lua_srv_conf_handler_pt     ssl_cert_handler;
-        ngx_str_t                            ssl_cert_src;
-        u_char                              *ssl_cert_src_key;
-
-        ngx_http_lua_srv_conf_handler_pt     ssl_sess_store_handler;
-        ngx_str_t                            ssl_sess_store_src;
-        u_char                              *ssl_sess_store_src_key;
-
-        ngx_http_lua_srv_conf_handler_pt     ssl_sess_fetch_handler;
-        ngx_str_t                            ssl_sess_fetch_src;
-        u_char                              *ssl_sess_fetch_src_key;
-    } srv;
-#endif
-
-    struct {
-        ngx_str_t           src;
-        u_char             *src_key;
-
-        ngx_http_lua_srv_conf_handler_pt  handler;
-    } balancer;
-};
-
-
-typedef struct {
-#if (NGX_HTTP_SSL)
-    ngx_ssl_t              *ssl;  /* shared by SSL cosockets */
-    ngx_uint_t              ssl_protocols;
-    ngx_str_t               ssl_ciphers;
-    ngx_uint_t              ssl_verify_depth;
-    ngx_str_t               ssl_trusted_certificate;
-    ngx_str_t               ssl_crl;
-#endif
-
-    ngx_flag_t              force_read_body; /* whether force request body to
-                                                be read */
-
-    ngx_flag_t              enable_code_cache; /* whether to enable
-                                                  code cache */
-
-    ngx_flag_t              http10_buffering;
-
-    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;
-
-    u_char                  *rewrite_chunkname;
-    ngx_http_complex_value_t rewrite_src;    /*  rewrite_by_lua
-                                                inline script/script
-                                                file path */
-
-    u_char                  *rewrite_src_key; /* cached key for rewrite_src */
-
-    u_char                  *access_chunkname;
-    ngx_http_complex_value_t access_src;     /*  access_by_lua
-                                                inline script/script
-                                                file path */
-
-    u_char                  *access_src_key; /* cached key for access_src */
-
-    u_char                  *content_chunkname;
-    ngx_http_complex_value_t content_src;    /*  content_by_lua
-                                                inline script/script
-                                                file path */
-
-    u_char                 *content_src_key; /* cached key for content_src */
-
-
-    u_char                      *log_chunkname;
-    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;
-    ngx_msec_t                       read_timeout;
-
-    size_t                           send_lowat;
-    size_t                           buffer_size;
-
-    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_flag_t                       use_default_type;
-} ngx_http_lua_loc_conf_t;
-
-
-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;
-
-
-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;
-
-
-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;
-};
-
-
-enum {
-    NGX_HTTP_LUA_SUBREQ_TRUNCATED = 1
-};
-
-
-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;
-
-    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 */
-
-    uint8_t                 *sr_flags;
-
-    unsigned                 nsubreqs;  /* number of subrequests of the
-                                         * current request */
-
-    unsigned                 pending_subreqs; /* number of subrequests being
-                                                 waited */
-
-    ngx_event_t              sleep;  /* used for ngx.sleep */
-
-    ngx_queue_t              sem_wait_queue;
-
-#ifdef NGX_LUA_USE_ASSERT
-    int                      co_top; /* stack top after yielding/creation,
-                                        only for sanity checks */
-#endif
-
-    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 */
-
-    unsigned                 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 */
-    unsigned                 sem_resume_status:1;
-};
-
-
-typedef struct {
-    lua_State       *vm;
-    ngx_int_t        count;
-} ngx_http_lua_vm_state_t;
-
-
-typedef struct ngx_http_lua_ctx_s {
-    /* for lua_coce_cache off: */
-    ngx_http_lua_vm_state_t  *vm_state;
-
-    ngx_http_request_t      *request;
-    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) */
-
-    ngx_chain_t             *out;  /* buffered output chain for HTTP 1.0 */
-    ngx_chain_t             *free_bufs;
-    ngx_chain_t             *busy_bufs;
-    ngx_chain_t             *free_recv_bufs;
-
-    ngx_http_cleanup_pt     *cleanup;
-
-    ngx_http_cleanup_t      *free_cleanup; /* free list of cleanup records */
-
-    ngx_chain_t             *body; /* buffered subrequest response body
-                                      chains */
-
-    ngx_chain_t            **last_body; /* for the "body" field */
-
-    ngx_str_t                exec_uri;
-    ngx_str_t                exec_args;
-
-    ngx_int_t                exit_code;
-
-    void                    *downstream;  /* can be either
-                                             ngx_http_lua_socket_tcp_upstream_t
-                                             or ngx_http_lua_co_ctx_t */
-
-    ngx_uint_t               index;              /* index of the current
-                                                    subrequest in its parent
-                                                    request */
-
-    ngx_http_lua_posted_thread_t   *posted_threads;
-
-    int                      uthreads; /* number of active user threads */
-
-    uint16_t                 context;   /* the current running directive context
-                                           (or running phase) for the current
-                                           Lua chunk */
-
-    unsigned                 run_post_subrequest:1; /* whether it has run
-                                                       post_subrequest
-                                                       (for subrequests only) */
-
-    unsigned                 waiting_more_body:1;   /* 1: waiting for more
-                                                       request body data;
-                                                       0: no need to wait */
-
-    unsigned         co_op:2; /*  coroutine API operation */
-
-    unsigned         exited:1;
-
-    unsigned         eof:1;             /*  1: last_buf has been sent;
-                                            0: last_buf not sent yet */
-
-    unsigned         capture:1;  /*  1: response body of current request
-                                        is to be captured by the lua
-                                        capture filter,
-                                     0: not to be captured */
-
-
-    unsigned         read_body_done:1;      /* 1: request body has been all
-                                               read; 0: body has not been
-                                               all read */
-
-    unsigned         headers_set:1; /* whether the user has set custom
-                                       response headers */
-
-    unsigned         entered_rewrite_phase:1;
-    unsigned         entered_access_phase:1;
-    unsigned         entered_content_phase:1;
-
-    unsigned         buffering:1; /* HTTP 1.0 response body buffering flag */
-
-    unsigned         no_abort:1; /* prohibit "world abortion" via ngx.exit()
-                                    and etc */
-
-    unsigned         header_sent:1; /* r->header_sent is not sufficient for
-                                     * this because special header filters
-                                     * like ngx_image_filter may intercept
-                                     * the header. so we should always test
-                                     * both flags. see the test case in
-                                     * t/020-subrequest.t */
-
-    unsigned         seen_last_in_filter:1;  /* used by body_filter_by_lua* */
-    unsigned         seen_last_for_subreq:1; /* used by body capture filter */
-    unsigned         writing_raw_req_socket:1; /* used by raw downstream
-                                                  socket */
-    unsigned         acquired_raw_req_socket:1;  /* whether a raw req socket
-                                                    is acquired */
-    unsigned         seen_body_data:1;
-} 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;
-    ngx_str_t                               key;
-    ngx_http_lua_set_header_pt              handler;
-    ngx_uint_t                              offset;
-    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_t;
-
-
-extern ngx_module_t ngx_http_lua_module;
-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;
-
-
-#endif /* _NGX_HTTP_LUA_COMMON_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_config.c b/debian/modules/http-lua/src/ngx_http_lua_config.c
deleted file mode 100644
index 3323175..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_config.c
+++ /dev/null
@@ -1,70 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_config.h"
-#include "api/ngx_http_lua_api.h"
-
-
-static int ngx_http_lua_config_prefix(lua_State *L);
-static int ngx_http_lua_config_configure(lua_State *L);
-
-
-void
-ngx_http_lua_inject_config_api(lua_State *L)
-{
-    /* ngx.config */
-
-    lua_createtable(L, 0, 6 /* nrec */);    /* .config */
-
-#if (NGX_DEBUG)
-    lua_pushboolean(L, 1);
-#else
-    lua_pushboolean(L, 0);
-#endif
-    lua_setfield(L, -2, "debug");
-
-    lua_pushcfunction(L, ngx_http_lua_config_prefix);
-    lua_setfield(L, -2, "prefix");
-
-    lua_pushinteger(L, nginx_version);
-    lua_setfield(L, -2, "nginx_version");
-
-    lua_pushinteger(L, ngx_http_lua_version);
-    lua_setfield(L, -2, "ngx_lua_version");
-
-    lua_pushcfunction(L, ngx_http_lua_config_configure);
-    lua_setfield(L, -2, "nginx_configure");
-
-    lua_pushliteral(L, "http");
-    lua_setfield(L, -2, "subsystem");
-
-    lua_setfield(L, -2, "config");
-}
-
-
-static int
-ngx_http_lua_config_prefix(lua_State *L)
-{
-    lua_pushlstring(L, (char *) ngx_cycle->prefix.data,
-                    ngx_cycle->prefix.len);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_config_configure(lua_State *L)
-{
-    lua_pushliteral(L, NGX_CONFIGURE);
-    return 1;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_config.h b/debian/modules/http-lua/src/ngx_http_lua_config.h
deleted file mode 100644
index 9f85f31..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_CONFIG_H_INCLUDED_
-#define _NGX_HTTP_LUA_CONFIG_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_config_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_CONFIG_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_consts.c b/debian/modules/http-lua/src/ngx_http_lua_consts.c
deleted file mode 100644
index 809e712..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_consts.c
+++ /dev/null
@@ -1,202 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_consts.h"
-
-
-void
-ngx_http_lua_inject_core_consts(lua_State *L)
-{
-    /* {{{ core constants */
-    lua_pushinteger(L, NGX_OK);
-    lua_setfield(L, -2, "OK");
-
-    lua_pushinteger(L, NGX_AGAIN);
-    lua_setfield(L, -2, "AGAIN");
-
-    lua_pushinteger(L, NGX_DONE);
-    lua_setfield(L, -2, "DONE");
-
-    lua_pushinteger(L, NGX_DECLINED);
-    lua_setfield(L, -2, "DECLINED");
-
-    lua_pushinteger(L, NGX_ERROR);
-    lua_setfield(L, -2, "ERROR");
-
-    lua_pushlightuserdata(L, NULL);
-    lua_setfield(L, -2, "null");
-    /* }}} */
-}
-
-
-void
-ngx_http_lua_inject_http_consts(lua_State *L)
-{
-    /* {{{ HTTP status constants */
-    lua_pushinteger(L, NGX_HTTP_GET);
-    lua_setfield(L, -2, "HTTP_GET");
-
-    lua_pushinteger(L, NGX_HTTP_POST);
-    lua_setfield(L, -2, "HTTP_POST");
-
-    lua_pushinteger(L, NGX_HTTP_PUT);
-    lua_setfield(L, -2, "HTTP_PUT");
-
-    lua_pushinteger(L, NGX_HTTP_HEAD);
-    lua_setfield(L, -2, "HTTP_HEAD");
-
-    lua_pushinteger(L, NGX_HTTP_DELETE);
-    lua_setfield(L, -2, "HTTP_DELETE");
-
-    lua_pushinteger(L, NGX_HTTP_OPTIONS);
-    lua_setfield(L, -2, "HTTP_OPTIONS");
-
-    lua_pushinteger(L, NGX_HTTP_MKCOL);
-    lua_setfield(L, -2, "HTTP_MKCOL");
-
-    lua_pushinteger(L, NGX_HTTP_COPY);
-    lua_setfield(L, -2, "HTTP_COPY");
-
-    lua_pushinteger(L, NGX_HTTP_MOVE);
-    lua_setfield(L, -2, "HTTP_MOVE");
-
-    lua_pushinteger(L, NGX_HTTP_PROPFIND);
-    lua_setfield(L, -2, "HTTP_PROPFIND");
-
-    lua_pushinteger(L, NGX_HTTP_PROPPATCH);
-    lua_setfield(L, -2, "HTTP_PROPPATCH");
-
-    lua_pushinteger(L, NGX_HTTP_LOCK);
-    lua_setfield(L, -2, "HTTP_LOCK");
-
-    lua_pushinteger(L, NGX_HTTP_UNLOCK);
-    lua_setfield(L, -2, "HTTP_UNLOCK");
-
-    lua_pushinteger(L, NGX_HTTP_PATCH);
-    lua_setfield(L, -2, "HTTP_PATCH");
-
-    lua_pushinteger(L, NGX_HTTP_TRACE);
-    lua_setfield(L, -2, "HTTP_TRACE");
-    /* }}} */
-
-    lua_pushinteger(L, NGX_HTTP_CONTINUE);
-    lua_setfield(L, -2, "HTTP_CONTINUE");
-
-    lua_pushinteger(L, NGX_HTTP_SWITCHING_PROTOCOLS);
-    lua_setfield(L, -2, "HTTP_SWITCHING_PROTOCOLS");
-
-    lua_pushinteger(L, NGX_HTTP_OK);
-    lua_setfield(L, -2, "HTTP_OK");
-
-    lua_pushinteger(L, NGX_HTTP_CREATED);
-    lua_setfield(L, -2, "HTTP_CREATED");
-
-    lua_pushinteger(L, NGX_HTTP_ACCEPTED);
-    lua_setfield(L, -2, "HTTP_ACCEPTED");
-
-    lua_pushinteger(L, NGX_HTTP_NO_CONTENT);
-    lua_setfield(L, -2, "HTTP_NO_CONTENT");
-
-    lua_pushinteger(L, NGX_HTTP_PARTIAL_CONTENT);
-    lua_setfield(L, -2, "HTTP_PARTIAL_CONTENT");
-
-    lua_pushinteger(L, NGX_HTTP_SPECIAL_RESPONSE);
-    lua_setfield(L, -2, "HTTP_SPECIAL_RESPONSE");
-
-    lua_pushinteger(L, NGX_HTTP_MOVED_PERMANENTLY);
-    lua_setfield(L, -2, "HTTP_MOVED_PERMANENTLY");
-
-    lua_pushinteger(L, NGX_HTTP_MOVED_TEMPORARILY);
-    lua_setfield(L, -2, "HTTP_MOVED_TEMPORARILY");
-
-#if defined(nginx_version) && nginx_version >= 8042
-    lua_pushinteger(L, NGX_HTTP_SEE_OTHER);
-    lua_setfield(L, -2, "HTTP_SEE_OTHER");
-#endif
-
-    lua_pushinteger(L, NGX_HTTP_PERMANENT_REDIRECT);
-    lua_setfield(L, -2, "HTTP_PERMANENT_REDIRECT");
-
-    lua_pushinteger(L, NGX_HTTP_NOT_MODIFIED);
-    lua_setfield(L, -2, "HTTP_NOT_MODIFIED");
-
-    lua_pushinteger(L, NGX_HTTP_TEMPORARY_REDIRECT);
-    lua_setfield(L, -2, "HTTP_TEMPORARY_REDIRECT");
-
-    lua_pushinteger(L, NGX_HTTP_BAD_REQUEST);
-    lua_setfield(L, -2, "HTTP_BAD_REQUEST");
-
-    lua_pushinteger(L, NGX_HTTP_UNAUTHORIZED);
-    lua_setfield(L, -2, "HTTP_UNAUTHORIZED");
-
-    lua_pushinteger(L, 402);
-    lua_setfield(L, -2, "HTTP_PAYMENT_REQUIRED");
-
-    lua_pushinteger(L, NGX_HTTP_FORBIDDEN);
-    lua_setfield(L, -2, "HTTP_FORBIDDEN");
-
-    lua_pushinteger(L, NGX_HTTP_NOT_FOUND);
-    lua_setfield(L, -2, "HTTP_NOT_FOUND");
-
-    lua_pushinteger(L, NGX_HTTP_NOT_ALLOWED);
-    lua_setfield(L, -2, "HTTP_NOT_ALLOWED");
-
-    lua_pushinteger(L, 406);
-    lua_setfield(L, -2, "HTTP_NOT_ACCEPTABLE");
-
-    lua_pushinteger(L, NGX_HTTP_REQUEST_TIME_OUT);
-    lua_setfield(L, -2, "HTTP_REQUEST_TIMEOUT");
-
-    lua_pushinteger(L, NGX_HTTP_CONFLICT);
-    lua_setfield(L, -2, "HTTP_CONFLICT");
-
-    lua_pushinteger(L, 410);
-    lua_setfield(L, -2, "HTTP_GONE");
-
-    lua_pushinteger(L, 426);
-    lua_setfield(L, -2, "HTTP_UPGRADE_REQUIRED");
-
-    lua_pushinteger(L, 429);
-    lua_setfield(L, -2, "HTTP_TOO_MANY_REQUESTS");
-
-    lua_pushinteger(L, 451);
-    lua_setfield(L, -2, "HTTP_ILLEGAL");
-
-    lua_pushinteger(L, NGX_HTTP_CLOSE);
-    lua_setfield(L, -2, "HTTP_CLOSE");
-
-    lua_pushinteger(L, NGX_HTTP_INTERNAL_SERVER_ERROR);
-    lua_setfield(L, -2, "HTTP_INTERNAL_SERVER_ERROR");
-
-    lua_pushinteger(L, NGX_HTTP_NOT_IMPLEMENTED);
-    lua_setfield(L, -2, "HTTP_METHOD_NOT_IMPLEMENTED");
-
-    lua_pushinteger(L, NGX_HTTP_BAD_GATEWAY);
-    lua_setfield(L, -2, "HTTP_BAD_GATEWAY");
-
-    lua_pushinteger(L, NGX_HTTP_SERVICE_UNAVAILABLE);
-    lua_setfield(L, -2, "HTTP_SERVICE_UNAVAILABLE");
-
-    lua_pushinteger(L, NGX_HTTP_GATEWAY_TIME_OUT);
-    lua_setfield(L, -2, "HTTP_GATEWAY_TIMEOUT");
-
-    lua_pushinteger(L, 505);
-    lua_setfield(L, -2, "HTTP_VERSION_NOT_SUPPORTED");
-
-    lua_pushinteger(L, NGX_HTTP_INSUFFICIENT_STORAGE);
-    lua_setfield(L, -2, "HTTP_INSUFFICIENT_STORAGE");
-
-    /* }}} */
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_consts.h b/debian/modules/http-lua/src/ngx_http_lua_consts.h
deleted file mode 100644
index c403f81..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_consts.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_CONSTS_H_INCLUDED_
-#define _NGX_HTTP_LUA_CONSTS_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_http_consts(lua_State *L);
-void ngx_http_lua_inject_core_consts(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_CONSTS_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_contentby.c b/debian/modules/http-lua/src/ngx_http_lua_contentby.c
deleted file mode 100644
index ecd6c0e..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_contentby.c
+++ /dev/null
@@ -1,387 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.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);
-
-
-ngx_int_t
-ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
-{
-    int                      co_ref;
-    ngx_int_t                rc;
-    lua_State               *co;
-    ngx_event_t             *rev;
-    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_http_lua_create_ctx(r);
-        if (ctx == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-    } else {
-        dd("reset ctx");
-        ngx_http_lua_reset_ctx(r, L, ctx);
-    }
-
-    ctx->entered_content_phase = 1;
-
-    /*  {{{ 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");
-
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    /*  move code closure to new coroutine */
-    lua_xmove(L, co, 1);
-
-    /*  set closure's env table to new coroutine's globals table */
-    ngx_http_lua_get_globals_table(co);
-    lua_setfenv(co, -2);
-
-    /*  save nginx request in coroutine globals table */
-    ngx_http_lua_set_req(co, r);
-
-    ctx->cur_co_ctx = &ctx->entry_co_ctx;
-    ctx->cur_co_ctx->co = co;
-    ctx->cur_co_ctx->co_ref = co_ref;
-#ifdef NGX_LUA_USE_ASSERT
-    ctx->cur_co_ctx->co_top = 1;
-#endif
-
-    /*  {{{ register request cleanup hooks */
-    if (ctx->cleanup == NULL) {
-        cln = ngx_http_cleanup_add(r, 0);
-        if (cln == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        cln->handler = ngx_http_lua_request_cleanup_handler;
-        cln->data = ctx;
-        ctx->cleanup = &cln->handler;
-    }
-    /*  }}} */
-
-    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;
-
-#if (NGX_HTTP_V2)
-        if (!r->stream) {
-#endif
-
-        rev = r->connection->read;
-
-        if (!rev->active) {
-            if (ngx_add_event(rev, NGX_READ_EVENT, 0) != NGX_OK) {
-                return NGX_ERROR;
-            }
-        }
-
-#if (NGX_HTTP_V2)
-        }
-#endif
-
-    } 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)
-{
-    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);
-}
-
-
-ngx_int_t
-ngx_http_lua_content_handler(ngx_http_request_t *r)
-{
-    ngx_http_lua_loc_conf_t     *llcf;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_int_t                    rc;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua content handler, uri:\"%V\" c:%ud", &r->uri,
-                   r->main->count);
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    if (llcf->content_handler == NULL) {
-        dd("no content 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_HTTP_INTERNAL_SERVER_ERROR;
-        }
-    }
-
-    dd("entered? %d", (int) ctx->entered_content_phase);
-
-    if (ctx->waiting_more_body) {
-        return NGX_DONE;
-    }
-
-    if (ctx->entered_content_phase) {
-        dd("calling wev handler");
-        rc = ctx->resume_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;
-        r->request_body_in_clean_file = 1;
-
-        rc = ngx_http_read_client_request_body(r,
-                                        ngx_http_lua_content_phase_post_read);
-
-        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-#if (nginx_version < 1002006) ||                                             \
-        (nginx_version >= 1003000 && nginx_version < 1003009)
-            r->main->count--;
-#endif
-            return rc;
-        }
-
-        if (rc == NGX_AGAIN) {
-            ctx->waiting_more_body = 1;
-
-            return NGX_DONE;
-        }
-    }
-
-    dd("setting entered");
-
-    ctx->entered_content_phase = 1;
-
-    dd("calling content handler");
-    return llcf->content_handler(r);
-}
-
-
-/* post read callback for the content phase */
-static void
-ngx_http_lua_content_phase_post_read(ngx_http_request_t *r)
-{
-    ngx_http_lua_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    ctx->read_body_done = 1;
-
-    if (ctx->waiting_more_body) {
-        ctx->waiting_more_body = 0;
-        ngx_http_lua_finalize_request(r, ngx_http_lua_content_handler(r));
-
-    } else {
-        r->main->count--;
-    }
-}
-
-
-ngx_int_t
-ngx_http_lua_content_handler_file(ngx_http_request_t *r)
-{
-    lua_State                       *L;
-    ngx_int_t                        rc;
-    u_char                          *script_path;
-    ngx_http_lua_loc_conf_t         *llcf;
-    ngx_str_t                        eval_src;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    if (ngx_http_complex_value(r, &llcf->content_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;
-    }
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
-                                     llcf->content_src_key);
-    if (rc != NGX_OK) {
-        if (rc < NGX_HTTP_SPECIAL_RESPONSE) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_content_by_chunk(L, r);
-}
-
-
-ngx_int_t
-ngx_http_lua_content_handler_inline(ngx_http_request_t *r)
-{
-    lua_State                   *L;
-    ngx_int_t                    rc;
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       llcf->content_src.value.data,
-                                       llcf->content_src.value.len,
-                                       llcf->content_src_key,
-                                       (const char *)
-                                       llcf->content_chunkname);
-    if (rc != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    return ngx_http_lua_content_by_chunk(L, r);
-}
-
-
-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;
-
-    dd("run posted threads: %p", ctx->posted_threads);
-
-    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);
-
-        dd("posted thread status: %d", 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_lua_finalize_request(r, NGX_DONE);
-                n--;
-            }
-
-            return NGX_OK;
-        }
-
-        /* rc == NGX_ERROR || rc > NGX_OK */
-
-        return rc;
-    }
-
-done:
-
-    if (n == 1) {
-        return NGX_DONE;
-    }
-
-    if (n == 0) {
-        r->main->count++;
-        return NGX_DONE;
-    }
-
-    /* n > 1 */
-
-    do {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-    } while (--n > 1);
-
-    return NGX_DONE;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_contentby.h b/debian/modules/http-lua/src/ngx_http_lua_contentby.h
deleted file mode 100644
index 58ba8e1..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_contentby.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_CONTENT_BY_H_INCLUDED_
-#define _NGX_HTTP_LUA_CONTENT_BY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r);
-void ngx_http_lua_content_wev_handler(ngx_http_request_t *r);
-ngx_int_t ngx_http_lua_content_handler_file(ngx_http_request_t *r);
-ngx_int_t ngx_http_lua_content_handler_inline(ngx_http_request_t *r);
-ngx_int_t ngx_http_lua_content_handler(ngx_http_request_t *r);
-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);
-
-
-#endif /* _NGX_HTTP_LUA_CONTENT_BY_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_control.c b/debian/modules/http-lua/src/ngx_http_lua_control.c
deleted file mode 100644
index 6ac2cbf..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_control.c
+++ /dev/null
@@ -1,555 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#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.redirect */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_redirect);
-    lua_setfield(L, -2, "redirect");
-
-    /* ngx.exec */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_exec);
-    lua_setfield(L, -2, "exec");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_exit);
-    lua_setfield(L, -2, "throw_error"); /* deprecated */
-
-    /* ngx.exit */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_exit);
-    lua_setfield(L, -2, "exit");
-
-    /* ngx.on_abort */
-
-    lua_pushcfunction(L, ngx_http_lua_on_abort);
-    lua_setfield(L, -2, "on_abort");
-}
-
-
-static int
-ngx_http_lua_ngx_exec(lua_State *L)
-{
-    int                          n;
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_str_t                    uri;
-    ngx_str_t                    args, user_args;
-    ngx_uint_t                   flags;
-    u_char                      *p;
-    u_char                      *q;
-    size_t                       len;
-    const char                  *msg;
-
-    n = lua_gettop(L);
-    if (n != 1 && n != 2) {
-        return luaL_error(L, "expecting one or two arguments, but got %d",
-                          n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_str_null(&args);
-
-    /* read the 1st argument (uri) */
-
-    p = (u_char *) luaL_checklstring(L, 1, &len);
-
-    if (len == 0) {
-        return luaL_error(L, "The uri argument is empty");
-    }
-
-    uri.data = ngx_palloc(r->pool, len);
-    if (uri.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    ngx_memcpy(uri.data, p, len);
-
-    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);
-
-    flags = NGX_HTTP_LOG_UNSAFE;
-
-    if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags) != NGX_OK) {
-        return luaL_error(L, "unsafe uri");
-    }
-
-    if (n == 2) {
-        /* read the 2nd argument (args) */
-        dd("args type: %s", luaL_typename(L, 2));
-
-        switch (lua_type(L, 2)) {
-        case LUA_TNUMBER:
-        case LUA_TSTRING:
-            p = (u_char *) lua_tolstring(L, 2, &len);
-
-            user_args.data = ngx_palloc(r->pool, len);
-            if (user_args.data == NULL) {
-                return luaL_error(L, "no memory");
-            }
-
-            ngx_memcpy(user_args.data, p, len);
-
-            user_args.len = len;
-            break;
-
-        case LUA_TTABLE:
-            ngx_http_lua_process_args_option(r, L, 2, &user_args);
-
-            dd("user_args: %.*s", (int) user_args.len, user_args.data);
-
-            break;
-
-        case LUA_TNIL:
-            ngx_str_null(&user_args);
-            break;
-
-        default:
-            msg = lua_pushfstring(L, "string, number, or table expected, "
-                                  "but got %s", luaL_typename(L, 2));
-            return luaL_argerror(L, 2, msg);
-        }
-
-    } else {
-        user_args.data = NULL;
-        user_args.len = 0;
-    }
-
-    if (user_args.len) {
-        if (args.len == 0) {
-            args = user_args;
-
-        } else {
-            p = ngx_palloc(r->pool, args.len + user_args.len + 1);
-            if (p == NULL) {
-                return luaL_error(L, "no memory");
-            }
-
-            q = ngx_copy(p, args.data, args.len);
-            *q++ = '&';
-            ngx_memcpy(q, user_args.data, user_args.len);
-
-            args.data = p;
-            args.len += user_args.len + 1;
-        }
-    }
-
-    if (r->header_sent || ctx->header_sent) {
-        return luaL_error(L, "attempt to call ngx.exec after "
-                          "sending out response headers");
-    }
-
-    ctx->exec_uri = uri;
-    ctx->exec_args = args;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua exec \"%V?%V\"",
-                   &ctx->exec_uri, &ctx->exec_args);
-
-    return lua_yield(L, 0);
-}
-
-
-static int
-ngx_http_lua_ngx_redirect(lua_State *L)
-{
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_int_t                    rc;
-    int                          n;
-    u_char                      *p;
-    u_char                      *uri;
-    size_t                       len;
-    ngx_table_elt_t             *h;
-    ngx_http_request_t          *r;
-
-    n = lua_gettop(L);
-
-    if (n != 1 && n != 2) {
-        return luaL_error(L, "expecting one or two arguments");
-    }
-
-    p = (u_char *) luaL_checklstring(L, 1, &len);
-
-    if (n == 2) {
-        rc = (ngx_int_t) luaL_checknumber(L, 2);
-
-        if (rc != NGX_HTTP_MOVED_TEMPORARILY
-            && rc != NGX_HTTP_MOVED_PERMANENTLY
-            && rc != NGX_HTTP_SEE_OTHER
-            && rc != NGX_HTTP_PERMANENT_REDIRECT
-            && rc != NGX_HTTP_TEMPORARY_REDIRECT)
-        {
-            return luaL_error(L, "only ngx.HTTP_MOVED_TEMPORARILY, "
-                              "ngx.HTTP_MOVED_PERMANENTLY, "
-                              "ngx.HTTP_PERMANENT_REDIRECT, "
-                              "ngx.HTTP_SEE_OTHER, and "
-                              "ngx.HTTP_TEMPORARY_REDIRECT are allowed");
-        }
-
-    } else {
-        rc = NGX_HTTP_MOVED_TEMPORARILY;
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object 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);
-
-    ngx_http_lua_check_if_abortable(L, ctx);
-
-    if (r->header_sent || ctx->header_sent) {
-        return luaL_error(L, "attempt to call ngx.redirect after sending out "
-                          "the headers");
-    }
-
-    uri = ngx_palloc(r->pool, len);
-    if (uri == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    ngx_memcpy(uri, p, len);
-
-    h = ngx_list_push(&r->headers_out.headers);
-    if (h == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    h->hash = ngx_http_lua_location_hash;
-
-#if 0
-    dd("location hash: %lu == %lu",
-       (unsigned long) h->hash,
-       (unsigned long) ngx_hash_key_lc((u_char *) "Location",
-                                       sizeof("Location") - 1));
-#endif
-
-    h->value.len = len;
-    h->value.data = uri;
-    ngx_str_set(&h->key, "Location");
-
-    r->headers_out.status = rc;
-
-    ctx->exit_code = rc;
-    ctx->exited = 1;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua redirect to \"%V\" with code %i",
-                   &h->value, ctx->exit_code);
-
-    if (len && uri[0] != '/') {
-        r->headers_out.location = h;
-    }
-
-    /*
-     * we do not set r->headers_out.location here to avoid the handling
-     * the local redirects without a host name by ngx_http_header_filter()
-     */
-
-    return lua_yield(L, 0);
-}
-
-
-static int
-ngx_http_lua_ngx_exit(lua_State *L)
-{
-    ngx_int_t                    rc;
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object 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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
-                               | NGX_HTTP_LUA_CONTEXT_BALANCER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
-
-    rc = (ngx_int_t) luaL_checkinteger(L, 1);
-
-    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
-                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH))
-    {
-
-#if (NGX_HTTP_SSL)
-
-        ctx->exit_code = rc;
-        ctx->exited = 1;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua exit with code %i", rc);
-
-        if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE) {
-            return 0;
-        }
-
-        return lua_yield(L, 0);
-
-#else
-
-        return luaL_error(L, "no SSL support");
-
-#endif
-    }
-
-    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 ((r->header_sent || ctx->header_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;
-    }
-
-    dd("setting exit code: %d", (int) rc);
-
-    ctx->exit_code = rc;
-    ctx->exited = 1;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua exit with code %i", ctx->exit_code);
-
-    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
-                        | NGX_HTTP_LUA_CONTEXT_BALANCER))
-    {
-        return 0;
-    }
-
-    dd("calling yield");
-    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;
-
-    r = ngx_http_lua_get_req(L);
-    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_fake_request2(L, r, ctx);
-
-    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;
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
-    size_t *errlen)
-{
-    ngx_http_lua_ctx_t       *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        *errlen = ngx_snprintf(err, *errlen, "no request ctx found") - err;
-        return NGX_ERROR;
-    }
-
-    if (ngx_http_lua_ffi_check_context(ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
-                                       | NGX_HTTP_LUA_CONTEXT_ACCESS
-                                       | NGX_HTTP_LUA_CONTEXT_CONTENT
-                                       | NGX_HTTP_LUA_CONTEXT_TIMER
-                                       | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
-                                       | NGX_HTTP_LUA_CONTEXT_BALANCER
-                                       | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                                       | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
-                                       | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH,
-                                       err, errlen)
-        != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
-                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH))
-    {
-
-#if (NGX_HTTP_SSL)
-
-        ctx->exit_code = status;
-        ctx->exited = 1;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua exit with code %d", status);
-
-        if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE) {
-            return NGX_DONE;
-        }
-
-        return NGX_OK;
-
-#else
-
-        return NGX_ERROR;
-
-#endif
-    }
-
-    if (ctx->no_abort
-        && status != NGX_ERROR
-        && status != NGX_HTTP_CLOSE
-        && status != NGX_HTTP_REQUEST_TIME_OUT
-        && status != NGX_HTTP_CLIENT_CLOSED_REQUEST)
-    {
-        *errlen = ngx_snprintf(err, *errlen,
-                               "attempt to abort with pending subrequests")
-                  - err;
-        return NGX_ERROR;
-    }
-
-    if ((r->header_sent || ctx->header_sent)
-        && status >= NGX_HTTP_SPECIAL_RESPONSE
-        && status != NGX_HTTP_REQUEST_TIME_OUT
-        && status != NGX_HTTP_CLIENT_CLOSED_REQUEST
-        && status != NGX_HTTP_CLOSE)
-    {
-        if (status != (ngx_int_t) r->headers_out.status) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "attempt to "
-                          "set status %d via ngx.exit after sending out the "
-                          "response status %ui", status,
-                          r->headers_out.status);
-        }
-
-        status = NGX_HTTP_OK;
-    }
-
-    ctx->exit_code = status;
-    ctx->exited = 1;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua exit with code %i", ctx->exit_code);
-
-    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
-                        | NGX_HTTP_LUA_CONTEXT_BALANCER))
-    {
-        return NGX_DONE;
-    }
-
-    return NGX_OK;
-}
-#endif  /* NGX_LUA_NO_FFI_API */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_control.h b/debian/modules/http-lua/src/ngx_http_lua_control.h
deleted file mode 100644
index 2c13615..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_control.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_CONTROL_H_INCLUDED_
-#define _NGX_HTTP_LUA_CONTROL_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_control_api(ngx_log_t *log, lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_CONTROL_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c b/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
deleted file mode 100644
index b790814..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_coroutine.c
+++ /dev/null
@@ -1,387 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#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 ngx_str_t
-    ngx_http_lua_co_status_names[] =
-    {
-        ngx_string("running"),
-        ngx_string("suspended"),
-        ngx_string("normal"),
-        ngx_string("dead"),
-        ngx_string("zombie")
-    };
-
-
-
-static int
-ngx_http_lua_coroutine_create(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-
-    r = ngx_http_lua_get_req(L);
-    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                     *vm;  /* the Lua VM */
-    lua_State                     *co;  /* new coroutine to be created */
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
-
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-
-    /* create new coroutine on root Lua state, so it always yields
-     * to main Lua thread
-     */
-    co = lua_newthread(vm);
-
-    ngx_http_lua_probe_user_coroutine_create(r, L, co);
-
-    coctx = ngx_http_lua_get_co_ctx(co, ctx);
-    if (coctx == NULL) {
-        coctx = ngx_http_lua_create_co_ctx(r, ctx);
-        if (coctx == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-    } else {
-        ngx_memzero(coctx, sizeof(ngx_http_lua_co_ctx_t));
-        coctx->co_ref = LUA_NOREF;
-    }
-
-    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! */
-    ngx_http_lua_get_globals_table(L);
-    lua_xmove(L, co, 1);
-    ngx_http_lua_set_globals_table(co);
-
-    lua_xmove(vm, 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;
-    }
-
-#ifdef NGX_LUA_USE_ASSERT
-    coctx->co_top = 1;
-#endif
-
-    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");
-
-    r = ngx_http_lua_get_req(L);
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
-
-    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].data);
-        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;
-
-    r = ngx_http_lua_get_req(L);
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
-
-    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_createtable(L, 0 /* narr */, 14 /* nrec */);
-
-    /* get old coroutine table */
-    lua_getglobal(L, "coroutine");
-
-    /* set running to the old one */
-    lua_getfield(L, -1, "running");
-    lua_setfield(L, -3, "running");
-
-    lua_getfield(L, -1, "create");
-    lua_setfield(L, -3, "_create");
-
-    lua_getfield(L, -1, "resume");
-    lua_setfield(L, -3, "_resume");
-
-    lua_getfield(L, -1, "yield");
-    lua_setfield(L, -3, "_yield");
-
-    lua_getfield(L, -1, "status");
-    lua_setfield(L, -3, "_status");
-
-    /* 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 coroutine APIs */
-    {
-        const char buf[] =
-            "local keys = {'create', 'yield', 'resume', 'status'}\n"
-            "local getfenv = getfenv\n"
-            "for _, key in ipairs(keys) do\n"
-               "local std = coroutine['_' .. key]\n"
-               "local ours = coroutine['__' .. key]\n"
-               "local raw_ctx = ngx._phase_ctx\n"
-               "coroutine[key] = function (...)\n"
-                    "local r = getfenv(0).__ngx_req\n"
-                    "if r then\n"
-                        "local ctx = raw_ctx(r)\n"
-                        /* ignore header and body filters */
-                        "if ctx ~= 0x020 and ctx ~= 0x040 then\n"
-                            "return ours(...)\n"
-                        "end\n"
-                    "end\n"
-                    "return std(...)\n"
-                "end\n"
-            "end\n"
-            "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"
-            "package.loaded.coroutine = coroutine";
-
-#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");
-
-    r = ngx_http_lua_get_req(L);
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
-
-    coctx = ngx_http_lua_get_co_ctx(co, ctx);
-    if (coctx == NULL) {
-        lua_pushlstring(L, (const char *)
-                        ngx_http_lua_co_status_names[NGX_HTTP_LUA_CO_DEAD].data,
-                        ngx_http_lua_co_status_names[NGX_HTTP_LUA_CO_DEAD].len);
-        return 1;
-    }
-
-    dd("co status: %d", coctx->co_status);
-
-    lua_pushlstring(L, (const char *)
-                    ngx_http_lua_co_status_names[coctx->co_status].data,
-                    ngx_http_lua_co_status_names[coctx->co_status].len);
-    return 1;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_coroutine.h b/debian/modules/http-lua/src/ngx_http_lua_coroutine.h
deleted file mode 100644
index 8b7bc90..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_coroutine.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_COROUTINE_H_INCLUDED_
-#define _NGX_HTTP_LUA_COROUTINE_H_INCLUDED_
-
-
-#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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ctx.c b/debian/modules/http-lua/src/ngx_http_lua_ctx.c
deleted file mode 100644
index a14bb4d..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ctx.c
+++ /dev/null
@@ -1,216 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_ctx.h"
-
-
-typedef struct {
-    int              ref;
-    lua_State       *vm;
-} ngx_http_lua_ngx_ctx_cleanup_data_t;
-
-
-static ngx_int_t ngx_http_lua_ngx_ctx_add_cleanup(ngx_http_request_t *r,
-    int ref);
-static void ngx_http_lua_ngx_ctx_cleanup(void *data);
-
-
-int
-ngx_http_lua_ngx_get_ctx(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-
-    r = ngx_http_lua_get_req(L);
-    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->ctx_ref == LUA_NOREF) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua create ngx.ctx table for the current request");
-
-        lua_pushliteral(L, ngx_http_lua_ctx_tables_key);
-        lua_rawget(L, LUA_REGISTRYINDEX);
-        lua_createtable(L, 0 /* narr */, 4 /* nrec */);
-        lua_pushvalue(L, -1);
-        ctx->ctx_ref = luaL_ref(L, -3);
-
-        if (ngx_http_lua_ngx_ctx_add_cleanup(r, ctx->ctx_ref) != NGX_OK) {
-            return luaL_error(L, "no memory");
-        }
-
-        return 1;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua fetching existing ngx.ctx table for the current "
-                   "request");
-
-    lua_pushliteral(L, ngx_http_lua_ctx_tables_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    lua_rawgeti(L, -1, ctx->ctx_ref);
-
-    return 1;
-}
-
-
-int
-ngx_http_lua_ngx_set_ctx(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-
-    r = ngx_http_lua_get_req(L);
-    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_ngx_set_ctx_helper(L, r, ctx, 3);
-}
-
-
-int
-ngx_http_lua_ngx_set_ctx_helper(lua_State *L, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, int index)
-{
-    if (index < 0) {
-        index = lua_gettop(L) + index + 1;
-    }
-
-    if (ctx->ctx_ref == LUA_NOREF) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua create ngx.ctx table for the current request");
-
-        lua_pushliteral(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);
-
-        if (ngx_http_lua_ngx_ctx_add_cleanup(r, ctx->ctx_ref) != NGX_OK) {
-            return luaL_error(L, "no memory");
-        }
-
-        return 0;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua fetching existing ngx.ctx table for the current "
-                   "request");
-
-    lua_pushliteral(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);
-    lua_pop(L, 1);
-
-    return 0;
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_get_ctx_ref(ngx_http_request_t *r)
-{
-    ngx_http_lua_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
-    }
-
-    return ctx->ctx_ref;
-}
-
-
-int
-ngx_http_lua_ffi_set_ctx_ref(ngx_http_request_t *r, int ref)
-{
-    ngx_http_lua_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
-    }
-
-    ctx->ctx_ref = ref;
-
-    if (ngx_http_lua_ngx_ctx_add_cleanup(r, ref) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-#endif /* NGX_LUA_NO_FFI_API */
-
-
-static ngx_int_t
-ngx_http_lua_ngx_ctx_add_cleanup(ngx_http_request_t *r, int ref)
-{
-    lua_State                   *L;
-    ngx_pool_cleanup_t          *cln;
-    ngx_http_lua_ctx_t          *ctx;
-
-    ngx_http_lua_ngx_ctx_cleanup_data_t    *data;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    L = ngx_http_lua_get_lua_vm(r, ctx);
-
-    cln = ngx_pool_cleanup_add(r->pool,
-                               sizeof(ngx_http_lua_ngx_ctx_cleanup_data_t));
-    if (cln == NULL) {
-        return NGX_ERROR;
-    }
-
-    cln->handler = ngx_http_lua_ngx_ctx_cleanup;
-
-    data = cln->data;
-    data->vm = L;
-    data->ref = ref;
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_lua_ngx_ctx_cleanup(void *data)
-{
-    lua_State       *L;
-
-    ngx_http_lua_ngx_ctx_cleanup_data_t    *clndata = data;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua release ngx.ctx at ref %d", clndata->ref);
-
-    L = clndata->vm;
-
-    lua_pushliteral(L, ngx_http_lua_ctx_tables_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    luaL_unref(L, -1, clndata->ref);
-    lua_pop(L, 1);
-}
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ctx.h b/debian/modules/http-lua/src/ngx_http_lua_ctx.h
deleted file mode 100644
index f73f73e..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ctx.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_CTX_H_INCLUDED_
-#define _NGX_HTTP_LUA_CTX_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-int ngx_http_lua_ngx_get_ctx(lua_State *L);
-int ngx_http_lua_ngx_set_ctx(lua_State *L);
-int ngx_http_lua_ngx_set_ctx_helper(lua_State *L, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, int index);
-
-
-#endif /* _NGX_HTTP_LUA_CTX_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_directive.c b/debian/modules/http-lua/src/ngx_http_lua_directive.c
deleted file mode 100644
index fb8c6dc..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_directive.c
+++ /dev/null
@@ -1,1831 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_common.h"
-#include "ngx_http_lua_directive.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_cache.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_initworkerby.h"
-#include "ngx_http_lua_shdict.h"
-#include "ngx_http_lua_ssl_certby.h"
-#include "ngx_http_lua_lex.h"
-#include "api/ngx_http_lua_api.h"
-#include "ngx_http_lua_log_ringbuf.h"
-#include "ngx_http_lua_log.h"
-
-
-typedef struct ngx_http_lua_block_parser_ctx_s
-    ngx_http_lua_block_parser_ctx_t;
-
-
-#if defined(NDK) && NDK
-#include "ngx_http_lua_setby.h"
-
-
-static ngx_int_t ngx_http_lua_set_by_lua_init(ngx_http_request_t *r);
-#endif
-
-static u_char *ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag,
-    size_t tag_len, size_t *chunkname_len);
-static ngx_int_t ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
-    ngx_http_lua_block_parser_ctx_t *ctx);
-static u_char *ngx_http_lua_strlstrn(u_char *s1, u_char *last, u_char *s2,
-    size_t n);
-
-
-struct ngx_http_lua_block_parser_ctx_s {
-    ngx_uint_t  start_line;
-    int         token_len;
-};
-
-
-enum {
-    FOUND_LEFT_CURLY = 0,
-    FOUND_RIGHT_CURLY,
-    FOUND_LEFT_LBRACKET_STR,
-    FOUND_LBRACKET_STR = FOUND_LEFT_LBRACKET_STR,
-    FOUND_LEFT_LBRACKET_CMT,
-    FOUND_LBRACKET_CMT = FOUND_LEFT_LBRACKET_CMT,
-    FOUND_RIGHT_LBRACKET,
-    FOUND_COMMENT_LINE,
-    FOUND_DOUBLE_QUOTED,
-    FOUND_SINGLE_QUOTED
-};
-
-
-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_str_t                  *value, name;
-    ngx_shm_zone_t             *zone;
-    ngx_shm_zone_t            **zp;
-    ngx_http_lua_shdict_ctx_t  *ctx;
-    ssize_t                     size;
-
-    if (lmcf->shdict_zones == NULL) {
-        lmcf->shdict_zones = ngx_palloc(cf->pool, sizeof(ngx_array_t));
-        if (lmcf->shdict_zones == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        if (ngx_array_init(lmcf->shdict_zones, cf->pool, 2,
-                           sizeof(ngx_shm_zone_t *))
-            != NGX_OK)
-        {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    value = cf->args->elts;
-
-    ctx = NULL;
-
-    if (value[1].len == 0) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid lua shared dict name \"%V\"", &value[1]);
-        return NGX_CONF_ERROR;
-    }
-
-    name = value[1];
-
-    size = ngx_parse_size(&value[2]);
-
-    if (size <= 8191) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid lua shared dict size \"%V\"", &value[2]);
-        return NGX_CONF_ERROR;
-    }
-
-    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_shdict_ctx_t));
-    if (ctx == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ctx->name = name;
-    ctx->main_conf = lmcf;
-    ctx->log = &cf->cycle->new_log;
-
-    zone = ngx_http_lua_shared_memory_add(cf, &name, (size_t) size,
-                                          &ngx_http_lua_module);
-    if (zone == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (zone->data) {
-        ctx = zone->data;
-
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "lua_shared_dict \"%V\" is already defined as "
-                           "\"%V\"", &name, &ctx->name);
-        return NGX_CONF_ERROR;
-    }
-
-    zone->init = ngx_http_lua_shdict_init_zone;
-    zone->data = ctx;
-
-    zp = ngx_array_push(lmcf->shdict_zones);
-    if (zp == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    *zp = zone;
-
-    lmcf->requires_shm = 1;
-
-    return NGX_CONF_OK;
-}
-
-
-char *
-ngx_http_lua_code_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char             *p = conf;
-    ngx_flag_t       *fp;
-    char             *ret;
-
-    ret = ngx_conf_set_flag_slot(cf, cmd, conf);
-    if (ret != NGX_CONF_OK) {
-        return ret;
-    }
-
-    fp = (ngx_flag_t *) (p + cmd->offset);
-
-    if (!*fp) {
-        ngx_conf_log_error(NGX_LOG_ALERT, cf, 0,
-                           "lua_code_cache is off; this will hurt "
-                           "performance");
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-char *
-ngx_http_lua_package_cpath(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_lua_main_conf_t *lmcf = conf;
-    ngx_str_t                *value;
-
-    if (lmcf->lua_cpath.len != 0) {
-        return "is duplicate";
-    }
-
-    dd("enter");
-
-    value = cf->args->elts;
-
-    lmcf->lua_cpath.len = value[1].len;
-    lmcf->lua_cpath.data = value[1].data;
-
-    return NGX_CONF_OK;
-}
-
-
-char *
-ngx_http_lua_package_path(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_lua_main_conf_t *lmcf = conf;
-    ngx_str_t                *value;
-
-    if (lmcf->lua_path.len != 0) {
-        return "is duplicate";
-    }
-
-    dd("enter");
-
-    value = cf->args->elts;
-
-    lmcf->lua_path.len = value[1].len;
-    lmcf->lua_path.data = value[1].data;
-
-    return NGX_CONF_OK;
-}
-
-
-#if defined(NDK) && NDK
-char *
-ngx_http_lua_set_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_set_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-char *
-ngx_http_lua_set_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    u_char              *p;
-    ngx_str_t           *value;
-    ngx_str_t            target;
-    ndk_set_var_t        filter;
-
-    ngx_http_lua_set_var_data_t     *filter_data;
-
-    /*
-     * value[0] = "set_by_lua"
-     * value[1] = target variable name
-     * value[2] = lua script source to be executed
-     * value[3..] = real params
-     * */
-    value = cf->args->elts;
-    target = value[1];
-
-    filter.type = NDK_SET_VAR_MULTI_VALUE_DATA;
-    filter.func = cmd->post;
-    filter.size = cf->args->nelts - 3;    /*  get number of real params */
-
-    filter_data = ngx_palloc(cf->pool, sizeof(ngx_http_lua_set_var_data_t));
-    if (filter_data == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    filter_data->size = filter.size;
-
-    p = ngx_palloc(cf->pool,
-                   sizeof("set_by_lua") + NGX_HTTP_LUA_INLINE_KEY_LEN);
-    if (p == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    filter_data->key = p;
-
-    p = ngx_copy(p, "set_by_lua", sizeof("set_by_lua") - 1);
-    p = ngx_copy(p, NGX_HTTP_LUA_INLINE_TAG, NGX_HTTP_LUA_INLINE_TAG_LEN);
-    p = ngx_http_lua_digest_hex(p, value[2].data, value[2].len);
-    *p = '\0';
-
-    filter_data->script = value[2];
-
-    filter.data = filter_data;
-
-    return ndk_set_var_multi_value_core(cf, &target, &value[3], &filter);
-}
-
-
-char *
-ngx_http_lua_set_by_lua_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    u_char              *p;
-    ngx_str_t           *value;
-    ngx_str_t            target;
-    ndk_set_var_t        filter;
-
-    ngx_http_lua_set_var_data_t     *filter_data;
-
-    /*
-     * value[0] = "set_by_lua_file"
-     * value[1] = target variable name
-     * value[2] = lua script file path to be executed
-     * value[3..] = real params
-     * */
-    value = cf->args->elts;
-    target = value[1];
-
-    filter.type = NDK_SET_VAR_MULTI_VALUE_DATA;
-    filter.func = cmd->post;
-    filter.size = cf->args->nelts - 2;    /*  get number of real params and
-                                              lua script */
-
-    filter_data = ngx_palloc(cf->pool, sizeof(ngx_http_lua_set_var_data_t));
-    if (filter_data == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    filter_data->size = filter.size;
-
-    p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
-    if (p == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    filter_data->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[2].data, value[2].len);
-    *p = '\0';
-
-    ngx_str_null(&filter_data->script);
-
-    filter.data = filter_data;
-
-    return ndk_set_var_multi_value_core(cf, &target, &value[2], &filter);
-}
-
-
-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)
-{
-    lua_State                   *L;
-    ngx_int_t                    rc;
-
-    ngx_http_lua_set_var_data_t     *filter_data = data;
-
-    if (ngx_http_lua_set_by_lua_init(r) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua inline script (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       filter_data->script.data,
-                                       filter_data->script.len,
-                                       filter_data->key, "=set_by_lua");
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_lua_set_by_chunk(L, r, val, v, filter_data->size,
-                                   &filter_data->script);
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-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)
-{
-    lua_State                   *L;
-    ngx_int_t                    rc;
-    u_char                      *script_path;
-    size_t                       nargs;
-
-    ngx_http_lua_set_var_data_t     *filter_data = data;
-
-    dd("set by lua file");
-
-    if (ngx_http_lua_set_by_lua_init(r) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    filter_data->script.data = v[0].data;
-    filter_data->script.len = v[0].len;
-
-    /* skip the lua file path argument */
-    v++;
-    nargs = filter_data->size - 1;
-
-    dd("script: %.*s", (int) filter_data->script.len, filter_data->script.data);
-    dd("nargs: %d", (int) nargs);
-
-    script_path = ngx_http_lua_rebase_path(r->pool, filter_data->script.data,
-                                           filter_data->script.len);
-    if (script_path == NULL) {
-        return NGX_ERROR;
-    }
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
-                                     filter_data->key);
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_lua_set_by_chunk(L, r, val, v, nargs, &filter_data->script);
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-#endif /* defined(NDK) && NDK */
-
-
-char *
-ngx_http_lua_rewrite_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_rewrite_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-char *
-ngx_http_lua_rewrite_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    size_t                       chunkname_len;
-    u_char                      *p, *chunkname;
-    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");
-
-#if defined(nginx_version) && nginx_version >= 8042 && nginx_version <= 8053
-    return "does not work with " NGINX_VER;
-#endif
-
-    /*  must specify a content handler */
-    if (cmd->post == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (llcf->rewrite_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_rewrite_handler_inline) {
-        chunkname = ngx_http_lua_gen_chunk_name(cf, "rewrite_by_lua",
-                                                sizeof("rewrite_by_lua") - 1,
-                                                &chunkname_len);
-        if (chunkname == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->rewrite_chunkname = chunkname;
-
-        /* Don't eval nginx variables for inline lua code */
-
-        llcf->rewrite_src.value = value[1];
-
-        p = ngx_palloc(cf->pool,
-                       chunkname_len + NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->rewrite_src_key = p;
-
-        p = ngx_copy(p, chunkname, chunkname_len);
-        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->rewrite_src;
-
-        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-
-        if (llcf->rewrite_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->rewrite_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->rewrite_handler = (ngx_http_handler_pt) cmd->post;
-
-    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;
-}
-
-
-char *
-ngx_http_lua_access_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_access_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-char *
-ngx_http_lua_access_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    size_t                       chunkname_len;
-    u_char                      *p, *chunkname;
-    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 specify a content handler */
-    if (cmd->post == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (llcf->access_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_access_handler_inline) {
-        chunkname = ngx_http_lua_gen_chunk_name(cf, "access_by_lua",
-                                                sizeof("access_by_lua") - 1,
-                                                &chunkname_len);
-        if (chunkname == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->access_chunkname = chunkname;
-
-        /* Don't eval nginx variables for inline lua code */
-
-        llcf->access_src.value = value[1];
-
-        p = ngx_palloc(cf->pool,
-                       chunkname_len + NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->access_src_key = p;
-
-        p = ngx_copy(p, chunkname, chunkname_len);
-        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->access_src;
-
-        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-
-        if (llcf->access_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->access_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->access_handler = (ngx_http_handler_pt) cmd->post;
-
-    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;
-}
-
-
-char *
-ngx_http_lua_content_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_content_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-char *
-ngx_http_lua_content_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    size_t                       chunkname_len;
-    u_char                      *p;
-    u_char                      *chunkname;
-    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;
-
-    ngx_http_compile_complex_value_t         ccv;
-
-    dd("enter");
-
-    /*  must specify a content handler */
-    if (cmd->post == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (llcf->content_handler) {
-        return "is duplicate";
-    }
-
-    value = cf->args->elts;
-
-    dd("value[0]: %.*s", (int) value[0].len, value[0].data);
-    dd("value[1]: %.*s", (int) value[1].len, value[1].data);
-
-    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_content_handler_inline) {
-        chunkname = ngx_http_lua_gen_chunk_name(cf, "content_by_lua",
-                                                sizeof("content_by_lua") - 1,
-                                                &chunkname_len);
-        if (chunkname == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->content_chunkname = chunkname;
-
-        dd("chunkname: %s", chunkname);
-
-        /* Don't eval nginx variables for inline lua code */
-
-        llcf->content_src.value = value[1];
-
-        p = ngx_palloc(cf->pool,
-                       chunkname_len + NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->content_src_key = p;
-
-        p = ngx_copy(p, chunkname, chunkname_len);
-        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->content_src;
-
-        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-
-        if (llcf->content_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->content_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->content_handler = (ngx_http_handler_pt) cmd->post;
-
-    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);
-    if (clcf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    clcf->handler = ngx_http_lua_content_handler;
-
-    return NGX_CONF_OK;
-}
-
-
-char *
-ngx_http_lua_log_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_log_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-char *
-ngx_http_lua_log_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    size_t                       chunkname_len;
-    u_char                      *p, *chunkname;
-    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 specify 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) {
-        chunkname = ngx_http_lua_gen_chunk_name(cf, "log_by_lua",
-                                                sizeof("log_by_lua") - 1,
-                                                &chunkname_len);
-        if (chunkname == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->log_chunkname = chunkname;
-
-        /* Don't eval nginx variables for inline lua code */
-
-        llcf->log_src.value = value[1];
-
-        p = ngx_palloc(cf->pool,
-                       chunkname_len + NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->log_src_key = p;
-
-        p = ngx_copy(p, chunkname, chunkname_len);
-        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 = (ngx_http_handler_pt) 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_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_header_filter_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-char *
-ngx_http_lua_header_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 specify a content handler */
-    if (cmd->post == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (llcf->header_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_header_filter_inline) {
-        /* Don't eval nginx variables for inline lua code */
-        llcf->header_filter_src.value = value[1];
-
-        p = ngx_palloc(cf->pool,
-                       sizeof("header_filter_by_lua") +
-                       NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->header_filter_src_key = p;
-
-        p = ngx_copy(p, "header_filter_by_lua",
-                     sizeof("header_filter_by_lua") - 1);
-        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->header_filter_src;
-
-        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-
-        if (llcf->header_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->header_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->header_filter_handler = (ngx_http_handler_pt) cmd->post;
-
-    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_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_body_filter_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-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 specify 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,
-                       sizeof("body_filter_by_lua") +
-                       NGX_HTTP_LUA_INLINE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        llcf->body_filter_src_key = p;
-
-        p = ngx_copy(p, "body_filter_by_lua", sizeof("body_filter_by_lua") - 1);
-        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 = (ngx_http_output_body_filter_pt) 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_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_init_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-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 specify 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 = (ngx_http_lua_main_conf_handler_pt) 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;
-}
-
-
-char *
-ngx_http_lua_init_worker_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_init_worker_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-char *
-ngx_http_lua_init_worker_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 specify a content handler */
-    if (cmd->post == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (lmcf->init_worker_handler) {
-        return "is duplicate";
-    }
-
-    value = cf->args->elts;
-
-    lmcf->init_worker_handler = (ngx_http_lua_main_conf_handler_pt) cmd->post;
-
-    if (cmd->post == ngx_http_lua_init_worker_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_worker_src.data = name;
-        lmcf->init_worker_src.len = ngx_strlen(name);
-
-    } else {
-        lmcf->init_worker_src = value[1];
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-#if defined(NDK) && NDK
-static ngx_int_t
-ngx_http_lua_set_by_lua_init(ngx_http_request_t *r)
-{
-    lua_State                   *L;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_cleanup_t          *cln;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        ctx = ngx_http_lua_create_ctx(r);
-        if (ctx == NULL) {
-            return NGX_ERROR;
-        }
-
-    } else {
-        L = ngx_http_lua_get_lua_vm(r, ctx);
-        ngx_http_lua_reset_ctx(r, L, ctx);
-    }
-
-    if (ctx->cleanup == NULL) {
-        cln = ngx_http_cleanup_add(r, 0);
-        if (cln == NULL) {
-            return NGX_ERROR;
-        }
-
-        cln->handler = ngx_http_lua_request_cleanup_handler;
-        cln->data = ctx;
-        ctx->cleanup = &cln->handler;
-    }
-
-    ctx->context = NGX_HTTP_LUA_CONTEXT_SET;
-    return NGX_OK;
-}
-#endif
-
-
-static u_char *
-ngx_http_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_len,
-    size_t *chunkname_len)
-{
-    u_char      *p, *out;
-    size_t       len;
-
-    len = sizeof("=(:)") - 1 + tag_len + cf->conf_file->file.name.len
-          + NGX_INT64_LEN + 1;
-
-    out = ngx_palloc(cf->pool, len);
-    if (out == NULL) {
-        return NULL;
-    }
-
-    if (cf->conf_file->file.name.len) {
-        p = cf->conf_file->file.name.data + cf->conf_file->file.name.len;
-        while (--p >= cf->conf_file->file.name.data) {
-            if (*p == '/' || *p == '\\') {
-                p++;
-                goto found;
-            }
-        }
-
-        p++;
-
-    } else {
-        p = cf->conf_file->file.name.data;
-    }
-
-found:
-
-    ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
-                 tag_len, tag, cf->conf_file->file.name.data
-                               + cf->conf_file->file.name.len - p,
-                 p, cf->conf_file->line);
-    *chunkname_len = len;
-
-    return out;
-}
-
-
-/* a specialized version of the standard ngx_conf_parse() function */
-char *
-ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf, ngx_command_t *cmd)
-{
-    ngx_http_lua_block_parser_ctx_t     ctx;
-
-    int               level = 1;
-    char             *rv;
-    u_char           *p;
-    size_t            len;
-    ngx_str_t        *src, *dst;
-    ngx_int_t         rc;
-    ngx_uint_t        i, start_line;
-    ngx_array_t      *saved;
-    enum {
-        parse_block = 0,
-        parse_param
-    } type;
-
-    if (cf->conf_file->file.fd != NGX_INVALID_FILE) {
-
-        type = parse_block;
-
-    } else {
-        type = parse_param;
-    }
-
-    saved = cf->args;
-
-    cf->args = ngx_array_create(cf->temp_pool, 4, sizeof(ngx_str_t));
-    if (cf->args == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ctx.token_len = 0;
-    start_line = cf->conf_file->line;
-
-    dd("init start line: %d", (int) start_line);
-
-    ctx.start_line = start_line;
-
-    for ( ;; ) {
-        rc = ngx_http_lua_conf_read_lua_token(cf, &ctx);
-
-        dd("parser start line: %d", (int) start_line);
-
-        switch (rc) {
-
-        case NGX_ERROR:
-            goto done;
-
-        case FOUND_LEFT_CURLY:
-
-            ctx.start_line = cf->conf_file->line;
-
-            if (type == parse_param) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "block directives are not supported "
-                                   "in -g option");
-                goto failed;
-            }
-
-            level++;
-            dd("seen block start: level=%d", (int) level);
-            break;
-
-        case FOUND_RIGHT_CURLY:
-
-            level--;
-            dd("seen block done: level=%d", (int) level);
-
-            if (type != parse_block || level < 0) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "unexpected \"}\": level %d, "
-                                   "starting at line %ui", level,
-                                   start_line);
-                goto failed;
-            }
-
-            if (level == 0) {
-                ngx_http_lua_assert(cf->handler);
-
-                src = cf->args->elts;
-
-                for (len = 0, i = 0; i < cf->args->nelts; i++) {
-                    len += src[i].len;
-                }
-
-                dd("saved nelts: %d", (int) saved->nelts);
-                dd("temp nelts: %d", (int) cf->args->nelts);
-#if 0
-                ngx_http_lua_assert(saved->nelts == 1);
-#endif
-
-                dst = ngx_array_push(saved);
-                if (dst == NULL) {
-                    return NGX_CONF_ERROR;
-                }
-                dst->len = len;
-                dst->len--;  /* skip the trailing '}' block terminator */
-
-                p = ngx_palloc(cf->pool, len);
-                if (p == NULL) {
-                    return NGX_CONF_ERROR;
-                }
-                dst->data = p;
-
-                for (i = 0; i < cf->args->nelts; i++) {
-                    p = ngx_copy(p, src[i].data, src[i].len);
-                }
-
-                p[-1] = '\0';  /* override the last '}' char to null */
-
-                cf->args = saved;
-
-                rv = (*cf->handler)(cf, cmd, cf->handler_conf);
-                if (rv == NGX_CONF_OK) {
-                    goto done;
-                }
-
-                if (rv == NGX_CONF_ERROR) {
-                    goto failed;
-                }
-
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, rv);
-
-                goto failed;
-            }
-
-            break;
-
-        case FOUND_LBRACKET_STR:
-        case FOUND_LBRACKET_CMT:
-        case FOUND_RIGHT_LBRACKET:
-        case FOUND_COMMENT_LINE:
-        case FOUND_DOUBLE_QUOTED:
-        case FOUND_SINGLE_QUOTED:
-            break;
-
-        default:
-
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "unknown return value from the lexer: %i", rc);
-            goto failed;
-        }
-    }
-
-failed:
-
-    rc = NGX_ERROR;
-
-done:
-
-    if (rc == NGX_ERROR) {
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
-    ngx_http_lua_block_parser_ctx_t *ctx)
-{
-    enum {
-        OVEC_SIZE = 2
-    };
-    int          i, rc;
-    int          ovec[OVEC_SIZE];
-    u_char      *start, *p, *q, ch;
-    off_t        file_size;
-    size_t       len, buf_size;
-    ssize_t      n, size;
-    ngx_uint_t   start_line;
-    ngx_str_t   *word;
-    ngx_buf_t   *b;
-#if nginx_version >= 1009002
-    ngx_buf_t   *dump;
-#endif
-
-    b = cf->conf_file->buffer;
-#if nginx_version >= 1009002
-    dump = cf->conf_file->dump;
-#endif
-    start = b->pos;
-    start_line = cf->conf_file->line;
-    buf_size = b->end - b->start;
-
-    dd("lexer start line: %d", (int) start_line);
-
-    file_size = ngx_file_size(&cf->conf_file->file.info);
-
-    for ( ;; ) {
-
-        if (b->pos >= b->last
-            || (b->last - b->pos < (b->end - b->start) / 3
-                && cf->conf_file->file.offset < file_size))
-        {
-
-            if (cf->conf_file->file.offset >= file_size) {
-
-                cf->conf_file->line = ctx->start_line;
-
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "unexpected end of file, expecting "
-                                   "terminating characters for lua code "
-                                   "block");
-                return NGX_ERROR;
-            }
-
-            len = b->last - start;
-
-            if (len == buf_size) {
-
-                cf->conf_file->line = start_line;
-
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "too long lua code block, probably "
-                                   "missing terminating characters");
-
-                return NGX_ERROR;
-            }
-
-            if (len) {
-                ngx_memmove(b->start, start, len);
-            }
-
-            size = (ssize_t) (file_size - cf->conf_file->file.offset);
-
-            if (size > b->end - (b->start + len)) {
-                size = b->end - (b->start + len);
-            }
-
-            n = ngx_read_file(&cf->conf_file->file, b->start + len, size,
-                              cf->conf_file->file.offset);
-
-            if (n == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            if (n != size) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   ngx_read_file_n " returned "
-                                   "only %z bytes instead of %z",
-                                   n, size);
-                return NGX_ERROR;
-            }
-
-            b->pos = b->start + (b->pos - start);
-            b->last = b->start + len + n;
-            start = b->start;
-
-#if nginx_version >= 1009002
-            if (dump) {
-                dump->last = ngx_cpymem(dump->last, b->start + len, size);
-            }
-#endif
-        }
-
-        rc = ngx_http_lua_lex(b->pos, b->last - b->pos, ovec);
-
-        if (rc < 0) {  /* no match */
-            /* alas. the lexer does not yet support streaming processing. need
-             * more work below */
-
-            if (cf->conf_file->file.offset >= file_size) {
-
-                cf->conf_file->line = ctx->start_line;
-
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "unexpected end of file, expecting "
-                                   "terminating characters for lua code "
-                                   "block");
-                return NGX_ERROR;
-            }
-
-            len = b->last - b->pos;
-
-            if (len == buf_size) {
-
-                cf->conf_file->line = start_line;
-
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "too long lua code block, probably "
-                                   "missing terminating characters");
-
-                return NGX_ERROR;
-            }
-
-            if (len) {
-                ngx_memcpy(b->start, b->pos, len);
-            }
-
-            size = (ssize_t) (file_size - cf->conf_file->file.offset);
-
-            if (size > b->end - (b->start + len)) {
-                size = b->end - (b->start + len);
-            }
-
-            n = ngx_read_file(&cf->conf_file->file, b->start + len, size,
-                              cf->conf_file->file.offset);
-
-            if (n == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            if (n != size) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   ngx_read_file_n " returned "
-                                   "only %z bytes instead of %z",
-                                   n, size);
-                return NGX_ERROR;
-            }
-
-            b->pos = b->start + len;
-            b->last = b->pos + n;
-            start = b->start;
-
-            continue;
-        }
-
-        if (rc == FOUND_LEFT_LBRACKET_STR || rc == FOUND_LEFT_LBRACKET_CMT) {
-
-            /* we update the line numbers for best error messages when the
-             * closing long bracket is missing */
-
-            for (i = 0; i < ovec[0]; i++) {
-                ch = b->pos[i];
-                if (ch == LF) {
-                    cf->conf_file->line++;
-                }
-            }
-
-            b->pos += ovec[0];
-            ovec[1] -= ovec[0];
-            ovec[0] = 0;
-
-            if (rc == FOUND_LEFT_LBRACKET_CMT) {
-                p = &b->pos[2];     /* we skip the leading "--" prefix */
-                rc = FOUND_LBRACKET_CMT;
-
-            } else {
-                p = b->pos;
-                rc = FOUND_LBRACKET_STR;
-            }
-
-            /* we temporarily rewrite [=*[ in the input buffer to ]=*] to
-             * construct the pattern for the corresponding closing long
-             * bracket without additional buffers. */
-
-            ngx_http_lua_assert(p[0] == '[');
-            p[0] = ']';
-
-            ngx_http_lua_assert(b->pos[ovec[1] - 1] == '[');
-            b->pos[ovec[1] - 1] = ']';
-
-            /* search for the corresponding closing bracket */
-
-            dd("search pattern for the closing long bracket: \"%.*s\" (len=%d)",
-               (int) (b->pos + ovec[1] - p), p, (int) (b->pos + ovec[1] - p));
-
-            q = ngx_http_lua_strlstrn(b->pos + ovec[1], b->last, p,
-                                      b->pos + ovec[1] - p - 1);
-
-            if (q == NULL) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "Lua code block missing the closing "
-                                   "long bracket \"%*s\"",
-                                   b->pos + ovec[1] - p, p);
-                return NGX_ERROR;
-            }
-
-            /* restore the original opening long bracket */
-
-            p[0] = '[';
-            b->pos[ovec[1] - 1] = '[';
-
-            ovec[1] = q - b->pos + b->pos + ovec[1] - p;
-
-            dd("found long bracket token: \"%.*s\"",
-               (int) (ovec[1] - ovec[0]), b->pos + ovec[0]);
-        }
-
-        for (i = 0; i < ovec[1]; i++) {
-            ch = b->pos[i];
-            if (ch == LF) {
-                cf->conf_file->line++;
-            }
-        }
-
-        b->pos += ovec[1];
-        ctx->token_len = ovec[1] - ovec[0];
-
-        break;
-    }
-
-    word = ngx_array_push(cf->args);
-    if (word == NULL) {
-        return NGX_ERROR;
-    }
-
-    word->data = ngx_pnalloc(cf->temp_pool, b->pos - start);
-    if (word->data == NULL) {
-        return NGX_ERROR;
-    }
-
-    len = b->pos - start;
-    ngx_memcpy(word->data, start, len);
-    word->len = len;
-
-    return rc;
-}
-
-
-char *
-ngx_http_lua_capture_error_log(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-#ifndef HAVE_INTERCEPT_ERROR_LOG_PATCH
-    return "not found: missing the capture error log patch for nginx";
-#else
-    ngx_str_t                     *value;
-    ssize_t                        size;
-    u_char                        *data;
-    ngx_cycle_t                   *cycle;
-    ngx_http_lua_main_conf_t      *lmcf = conf;
-    ngx_http_lua_log_ringbuf_t    *ringbuf;
-
-    value = cf->args->elts;
-    cycle = cf->cycle;
-
-    if (lmcf->requires_capture_log) {
-        return "is duplicate";
-    }
-
-    if (value[1].len == 0) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid capture error log size \"%V\"",
-                           &value[1]);
-        return NGX_CONF_ERROR;
-    }
-
-    size = ngx_parse_size(&value[1]);
-
-    if (size < NGX_MAX_ERROR_STR) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid capture error log size \"%V\", "
-                           "minimum size is %d", &value[1],
-                           NGX_MAX_ERROR_STR);
-        return NGX_CONF_ERROR;
-    }
-
-    if (cycle->intercept_error_log_handler) {
-        return "capture error log handler has been hooked";
-    }
-
-    ringbuf = (ngx_http_lua_log_ringbuf_t *)
-              ngx_palloc(cf->pool, sizeof(ngx_http_lua_log_ringbuf_t));
-    if (ringbuf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    data = ngx_palloc(cf->pool, size);
-    if (data == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_http_lua_log_ringbuf_init(ringbuf, data, size);
-
-    lmcf->requires_capture_log = 1;
-    cycle->intercept_error_log_handler = (ngx_log_intercept_pt)
-                                         ngx_http_lua_capture_log_handler;
-    cycle->intercept_error_log_data = ringbuf;
-
-    return NGX_CONF_OK;
-#endif
-}
-
-
-/*
- * ngx_http_lua_strlstrn() is intended to search for static substring
- * with known length in string until the argument last. The argument n
- * must be length of the second substring - 1.
- */
-
-static u_char *
-ngx_http_lua_strlstrn(u_char *s1, u_char *last, u_char *s2, size_t n)
-{
-    ngx_uint_t  c1, c2;
-
-    c2 = (ngx_uint_t) *s2++;
-    last -= n;
-
-    do {
-        do {
-            if (s1 >= last) {
-                return NULL;
-            }
-
-            c1 = (ngx_uint_t) *s1++;
-
-            dd("testing char '%c' vs '%c'", (int) c1, (int) c2);
-
-        } while (c1 != c2);
-
-        dd("testing against pattern \"%.*s\"", (int) n, s2);
-
-    } while (ngx_strncmp(s1, s2, n) != 0);
-
-    return --s1;
-}
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_directive.h b/debian/modules/http-lua/src/ngx_http_lua_directive.h
deleted file mode 100644
index 5abfe4d..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_directive.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_DIRECTIVE_H_INCLUDED_
-#define _NGX_HTTP_LUA_DIRECTIVE_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-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_block(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_block(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_block(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_block(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_block(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_block(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_block(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_init_worker_by_lua_block(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-char *ngx_http_lua_init_worker_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_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-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,
-    void *conf);
-char *ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf,
-    ngx_command_t *cmd);
-char *ngx_http_lua_capture_error_log(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-
-
-#endif /* _NGX_HTTP_LUA_DIRECTIVE_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_exception.c b/debian/modules/http-lua/src/ngx_http_lua_exception.c
deleted file mode 100644
index 752cbc9..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_exception.c
+++ /dev/null
@@ -1,58 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#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 */
-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
- * in order to make logging working.
- * */
-int
-ngx_http_lua_atpanic(lua_State *L)
-{
-#ifdef NGX_LUA_ABORT_AT_PANIC
-    abort();
-#else
-    u_char                  *s = NULL;
-    size_t                   len = 0;
-
-    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);
-    ngx_quit = 1;
-
-    /*  restore nginx execution */
-    NGX_LUA_EXCEPTION_THROW(1);
-
-    /* impossible to reach here */
-#endif
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_exception.h b/debian/modules/http-lua/src/ngx_http_lua_exception.h
deleted file mode 100644
index 93dfb8f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_exception.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_EXCEPTION_H_INCLUDED_
-#define _NGX_HTTP_LUA_EXCEPTION_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-#define NGX_LUA_EXCEPTION_TRY                                                \
-    if (setjmp(ngx_http_lua_exception) == 0)
-
-#define NGX_LUA_EXCEPTION_CATCH                                              \
-    else
-
-#define NGX_LUA_EXCEPTION_THROW(x)                                           \
-    longjmp(ngx_http_lua_exception, (x))
-
-
-extern jmp_buf ngx_http_lua_exception;
-
-
-int ngx_http_lua_atpanic(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_EXCEPTION_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
deleted file mode 100644
index b504530..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.c
+++ /dev/null
@@ -1,302 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include "ngx_http_lua_headerfilterby.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"
-
-
-static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
-
-
-/**
- * Set environment table for the given code closure.
- *
- * Before:
- *         | code closure | <- top
- *         |      ...     |
- *
- * After:
- *         | code closure | <- top
- *         |      ...     |
- * */
-static void
-ngx_http_lua_header_filter_by_lua_env(lua_State *L, ngx_http_request_t *r)
-{
-    /*  set nginx request pointer to current lua thread's globals table */
-    ngx_http_lua_set_req(L, r);
-
-    /**
-     * 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_globals_table(L, 0 /* narr */, 1 /* nrec */);
-
-    /*  {{{ make new env inheriting main thread's globals table */
-    lua_createtable(L, 0, 1 /* nrec */);   /* the metatable for the new env */
-    ngx_http_lua_get_globals_table(L);
-    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_header_filter_by_chunk(lua_State *L, ngx_http_request_t *r)
-{
-    int              old_exit_code = 0;
-    ngx_int_t        rc;
-    u_char          *err_msg;
-    size_t           len;
-#if (NGX_PCRE)
-    ngx_pool_t      *old_pool;
-#endif
-    ngx_http_lua_ctx_t          *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx->exited) {
-        old_exit_code = ctx->exit_code;
-    }
-
-    /*  initialize nginx context in Lua VM, code chunk at stack top    sp = 1 */
-    ngx_http_lua_header_filter_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
-
-    dd("rc == %d", (int) rc);
-
-    if (rc != 0) {
-        /*  error occurred 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 header_filter_by_lua*: %*s", len, err_msg);
-
-        lua_settop(L, 0); /*  clear remaining elems on stack */
-
-        return NGX_ERROR;
-    }
-
-    dd("exited: %d, exit code: %d, old exit code: %d",
-       (int) ctx->exited, (int) ctx->exit_code, (int) old_exit_code);
-
-#if 1
-    /*  clear Lua stack */
-    lua_settop(L, 0);
-#endif
-
-    if (ctx->exited && ctx->exit_code != old_exit_code) {
-        if (ctx->exit_code == NGX_ERROR) {
-            return NGX_ERROR;
-        }
-
-        dd("finalize request with %d", (int) ctx->exit_code);
-
-        rc = ngx_http_filter_finalize_request(r, &ngx_http_lua_module,
-                                              ctx->exit_code);
-        if (rc == NGX_ERROR || rc == NGX_AGAIN) {
-            return rc;
-        }
-
-        return NGX_DECLINED;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_lua_header_filter_inline(ngx_http_request_t *r)
-{
-    lua_State                   *L;
-    ngx_int_t                    rc;
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       llcf->header_filter_src.value.data,
-                                       llcf->header_filter_src.value.len,
-                                       llcf->header_filter_src_key,
-                                       "=header_filter_by_lua");
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    dd("calling header filter by chunk");
-
-    return ngx_http_lua_header_filter_by_chunk(L, r);
-}
-
-
-ngx_int_t
-ngx_http_lua_header_filter_file(ngx_http_request_t *r)
-{
-    lua_State                       *L;
-    ngx_int_t                        rc;
-    u_char                          *script_path;
-    ngx_http_lua_loc_conf_t         *llcf;
-    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->header_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;
-    }
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
-                                     llcf->header_filter_src_key);
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_header_filter_by_chunk(L, r);
-}
-
-
-static ngx_int_t
-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;
-    uint16_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);
-    }
-
-    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_handler;
-        cln->data = ctx;
-        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_DECLINED) {
-        return NGX_OK;
-    }
-
-    if (rc == NGX_AGAIN || rc == NGX_ERROR) {
-        return rc;
-    }
-
-    return ngx_http_next_header_filter(r);
-}
-
-
-ngx_int_t
-ngx_http_lua_header_filter_init(void)
-{
-    dd("calling header filter init");
-    ngx_http_next_header_filter = ngx_http_top_header_filter;
-    ngx_http_top_header_filter = ngx_http_lua_header_filter;
-
-    return NGX_OK;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.h b/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.h
deleted file mode 100644
index 822baf7..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_headerfilterby.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_HEADERFILTERBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_HEADERFILTERBY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-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);
-
-
-#endif /* _NGX_HTTP_LUA_HEADERFILTERBY_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers.c b/debian/modules/http-lua/src/ngx_http_lua_headers.c
deleted file mode 100644
index b833577..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_headers.c
+++ /dev/null
@@ -1,1529 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_headers.h"
-#include "ngx_http_lua_headers_out.h"
-#include "ngx_http_lua_headers_in.h"
-#include "ngx_http_lua_util.h"
-
-
-static int ngx_http_lua_ngx_req_http_version(lua_State *L);
-static int ngx_http_lua_ngx_req_raw_header(lua_State *L);
-static int ngx_http_lua_ngx_req_header_set_helper(lua_State *L);
-static int ngx_http_lua_ngx_header_get(lua_State *L);
-static int ngx_http_lua_ngx_header_set(lua_State *L);
-static int ngx_http_lua_ngx_req_get_headers(lua_State *L);
-static int ngx_http_lua_ngx_req_header_clear(lua_State *L);
-static int ngx_http_lua_ngx_req_header_set(lua_State *L);
-static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
-#if nginx_version >= 1011011
-void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-#endif
-
-
-static int
-ngx_http_lua_ngx_req_http_version(lua_State *L)
-{
-    ngx_http_request_t          *r;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    switch (r->http_version) {
-    case NGX_HTTP_VERSION_9:
-        lua_pushnumber(L, 0.9);
-        break;
-
-    case NGX_HTTP_VERSION_10:
-        lua_pushnumber(L, 1.0);
-        break;
-
-    case NGX_HTTP_VERSION_11:
-        lua_pushnumber(L, 1.1);
-        break;
-
-#ifdef NGX_HTTP_VERSION_20
-    case NGX_HTTP_VERSION_20:
-        lua_pushnumber(L, 2.0);
-        break;
-#endif
-
-    default:
-        lua_pushnil(L);
-        break;
-    }
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_req_raw_header(lua_State *L)
-{
-    int                          n, line_break_len;
-    u_char                      *data, *p, *last, *pos;
-    unsigned                     no_req_line = 0, found;
-    size_t                       size;
-    ngx_buf_t                   *b, *first = NULL;
-    ngx_int_t                    i, j;
-#if nginx_version >= 1011011
-    ngx_buf_t                  **bb;
-    ngx_chain_t                 *cl;
-    ngx_http_lua_main_conf_t    *lmcf;
-#endif
-    ngx_connection_t            *c;
-    ngx_http_request_t          *r, *mr;
-    ngx_http_connection_t       *hc;
-
-    n = lua_gettop(L);
-    if (n > 0) {
-        no_req_line = lua_toboolean(L, 1);
-    }
-
-    dd("no req line: %d", (int) no_req_line);
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-#if nginx_version >= 1011011
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-#endif
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    mr = r->main;
-    hc = mr->http_connection;
-    c = mr->connection;
-
-#if (NGX_HTTP_V2)
-    if (mr->stream) {
-        return luaL_error(L, "http2 requests not supported yet");
-    }
-#endif
-
-#if 1
-    dd("hc->nbusy: %d", (int) hc->nbusy);
-
-    if (hc->nbusy) {
-#if nginx_version >= 1011011
-        dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
-           hc->busy->buf->last, hc->busy->buf->end);
-#else
-        dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos,
-           hc->busy[0]->last, hc->busy[0]->end);
-#endif
-    }
-
-    dd("request line: %p %p", mr->request_line.data,
-       mr->request_line.data + mr->request_line.len);
-
-    dd("header in: %p %p %p %p", mr->header_in->start,
-       mr->header_in->pos, mr->header_in->last,
-       mr->header_in->end);
-
-    dd("c->buffer: %p %p %p %p", c->buffer->start,
-       c->buffer->pos, c->buffer->last,
-       c->buffer->end);
-#endif
-
-    size = 0;
-    b = c->buffer;
-
-    if (mr->request_line.data[mr->request_line.len] == CR) {
-        line_break_len = 2;
-
-    } else {
-        line_break_len = 1;
-    }
-
-    if (mr->request_line.data >= b->start
-        && mr->request_line.data + mr->request_line.len
-           + line_break_len <= b->pos)
-    {
-        first = b;
-        size += b->pos - mr->request_line.data;
-    }
-
-    dd("size: %d", (int) size);
-
-    if (hc->nbusy) {
-#if nginx_version >= 1011011
-        if (hc->nbusy > lmcf->busy_buf_ptr_count) {
-            if (lmcf->busy_buf_ptrs) {
-                ngx_free(lmcf->busy_buf_ptrs);
-            }
-
-            lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
-                                            r->connection->log);
-
-            if (lmcf->busy_buf_ptrs == NULL) {
-                return luaL_error(L, "no memory");
-            }
-
-            lmcf->busy_buf_ptr_count = hc->nbusy;
-        }
-
-        bb = lmcf->busy_buf_ptrs;
-        for (cl = hc->busy; cl; cl = cl->next) {
-            *bb++ = cl->buf;
-        }
-#endif
-        b = NULL;
-
-#if nginx_version >= 1011011
-        bb = lmcf->busy_buf_ptrs;
-        for (i = hc->nbusy; i > 0; i--) {
-            b = bb[i - 1];
-#else
-        for (i = 0; i < hc->nbusy; i++) {
-            b = hc->busy[i];
-#endif
-
-            dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
-               b->start);
-
-            if (first == NULL) {
-                if (mr->request_line.data >= b->pos
-                    || mr->request_line.data
-                       + mr->request_line.len + line_break_len
-                       <= b->start)
-                {
-                    continue;
-                }
-
-                dd("found first at %d", (int) i);
-                first = b;
-            }
-
-            dd("adding size %d", (int) (b->pos - b->start));
-            size += b->pos - b->start;
-        }
-    }
-
-    size++;  /* plus the null terminator, as required by the later
-                ngx_strstr() call */
-
-    dd("header size: %d", (int) size);
-
-    data = lua_newuserdata(L, size);
-    last = data;
-
-    b = c->buffer;
-    found = 0;
-
-    if (first == b) {
-        found = 1;
-        pos = b->pos;
-
-        if (no_req_line) {
-            last = ngx_copy(data,
-                            mr->request_line.data
-                            + mr->request_line.len + line_break_len,
-                            pos - mr->request_line.data
-                            - mr->request_line.len - line_break_len);
-
-        } else {
-            last = ngx_copy(data, mr->request_line.data,
-                            pos - mr->request_line.data);
-        }
-
-        if (b != mr->header_in) {
-            /* skip truncated header entries (if any) */
-            while (last > data && last[-1] != LF && last[-1] != '\0') {
-                last--;
-            }
-        }
-
-        i = 0;
-        for (p = data; p != last; p++) {
-            if (*p == '\0') {
-                i++;
-                if (p + 1 != last && *(p + 1) == LF) {
-                    *p = CR;
-
-                } else if (i % 2 == 1) {
-                    *p = ':';
-
-                } else {
-                    *p = LF;
-                }
-            }
-        }
-    }
-
-    if (hc->nbusy) {
-
-#if nginx_version >= 1011011
-        bb = lmcf->busy_buf_ptrs;
-        for (i = hc->nbusy - 1; i >= 0; i--) {
-            b = bb[i];
-#else
-        for (i = 0; i < hc->nbusy; i++) {
-            b = hc->busy[i];
-#endif
-
-            if (!found) {
-                if (b != first) {
-                    continue;
-                }
-
-                dd("found first");
-                found = 1;
-            }
-
-            p = last;
-
-            pos = b->pos;
-
-            if (b == first) {
-                dd("request line: %.*s", (int) mr->request_line.len,
-                   mr->request_line.data);
-
-                if (no_req_line) {
-                    last = ngx_copy(last,
-                                    mr->request_line.data
-                                    + mr->request_line.len + line_break_len,
-                                    pos - mr->request_line.data
-                                    - mr->request_line.len - line_break_len);
-
-                } else {
-                    last = ngx_copy(last,
-                                    mr->request_line.data,
-                                    pos - mr->request_line.data);
-
-                }
-
-            } else {
-                last = ngx_copy(last, b->start, pos - b->start);
-            }
-
-#if 1
-            /* skip truncated header entries (if any) */
-            while (last > p && last[-1] != LF && last[-1] != '\0') {
-                last--;
-            }
-#endif
-
-            j = 0;
-            for (; p != last; p++) {
-                if (*p == '\0') {
-                    j++;
-                    if (p + 1 == last) {
-                        *p = LF;
-
-                    } else if (*(p + 1) == LF) {
-                        *p = CR;
-
-                    } else if (j % 2 == 1) {
-                        *p = ':';
-
-                    } else {
-                        *p = LF;
-                    }
-                }
-            }
-
-            if (b == mr->header_in) {
-                break;
-            }
-        }
-    }
-
-    *last++ = '\0';
-
-    if (last - data > (ssize_t) size) {
-        return luaL_error(L, "buffer error: %d", (int) (last - data - size));
-    }
-
-    /* strip the leading part (if any) of the request body in our header.
-     * the first part of the request body could slip in because nginx core's
-     * ngx_http_request_body_length_filter and etc can move r->header_in->pos
-     * in case that some of the body data has been preread into r->header_in.
-     */
-
-    if ((p = (u_char *) ngx_strstr(data, CRLF CRLF)) != NULL) {
-        last = p + sizeof(CRLF CRLF) - 1;
-
-    } else if ((p = (u_char *) ngx_strstr(data, CRLF "\n")) != NULL) {
-        last = p + sizeof(CRLF "\n") - 1;
-
-    } else if ((p = (u_char *) ngx_strstr(data, "\n" CRLF)) != NULL) {
-        last = p + sizeof("\n" CRLF) - 1;
-
-    } else {
-        for (p = last - 1; p - data >= 2; p--) {
-            if (p[0] == LF && p[-1] == CR) {
-                p[-1] = LF;
-                last = p + 1;
-                break;
-            }
-
-            if (p[0] == LF && p[-1] == LF) {
-                last = p + 1;
-                break;
-            }
-        }
-    }
-
-    lua_pushlstring(L, (char *) data, last - data);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_req_get_headers(lua_State *L)
-{
-    ngx_list_part_t              *part;
-    ngx_table_elt_t              *header;
-    ngx_http_request_t           *r;
-    ngx_uint_t                    i;
-    int                           n;
-    int                           max;
-    int                           raw = 0;
-    int                           count = 0;
-    int                           truncated = 0;
-
-    n = lua_gettop(L);
-
-    if (n >= 1) {
-        if (lua_isnil(L, 1)) {
-            max = NGX_HTTP_LUA_MAX_HEADERS;
-
-        } else {
-            max = luaL_checkinteger(L, 1);
-        }
-
-        if (n >= 2) {
-            raw = lua_toboolean(L, 2);
-        }
-
-    } else {
-        max = NGX_HTTP_LUA_MAX_HEADERS;
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    part = &r->headers_in.headers.part;
-    count = part->nelts;
-    while (part->next != NULL) {
-        part = part->next;
-        count += part->nelts;
-    }
-
-    if (max > 0 && count > max) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua exceeding request header limit %d > %d", count,
-                       max);
-        count = max;
-        truncated = 1;
-    }
-
-    lua_createtable(L, 0, count);
-
-    if (!raw) {
-        lua_pushlightuserdata(L, &ngx_http_lua_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;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        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 */
-
-        ngx_http_lua_set_multi_value_table(L, -3);
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua request header: \"%V: %V\"",
-                       &header[i].key, &header[i].value);
-
-        if (--count <= 0) {
-            break;
-        }
-    }  /* for */
-
-    if (truncated) {
-        lua_pushliteral(L, "truncated");
-        return 2;
-    }
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_resp_get_headers(lua_State *L)
-{
-    ngx_list_part_t    *part;
-    ngx_table_elt_t    *header;
-    ngx_http_request_t *r;
-    ngx_http_lua_ctx_t *ctx;
-    ngx_int_t           rc;
-    u_char             *lowcase_key = NULL;
-    size_t              lowcase_key_sz = 0;
-    ngx_uint_t          i;
-    int                 n;
-    int                 max;
-    int                 raw = 0;
-    int                 count = 0;
-    int                 truncated = 0;
-    int                 extra = 0;
-
-    n = lua_gettop(L);
-
-    if (n >= 1) {
-        if (lua_isnil(L, 1)) {
-            max = NGX_HTTP_LUA_MAX_HEADERS;
-
-        } else {
-            max = luaL_checkinteger(L, 1);
-        }
-
-        if (n >= 2) {
-            raw = lua_toboolean(L, 2);
-        }
-
-    } else {
-        max = NGX_HTTP_LUA_MAX_HEADERS;
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return luaL_error(L, "no ctx found");
-    }
-
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            return luaL_error(L,
-                              "failed to set default content type: %d",
-                              (int) rc);
-        }
-
-        ctx->headers_set = 1;
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    part = &r->headers_out.headers.part;
-    count = part->nelts;
-    while (part->next != NULL) {
-        part = part->next;
-        count += part->nelts;
-    }
-
-    lua_createtable(L, 0, count + 2);
-
-    if (!raw) {
-        lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
-        lua_rawget(L, LUA_REGISTRYINDEX);
-        lua_setmetatable(L, -2);
-    }
-
-#if 1
-    if (r->headers_out.content_type.len) {
-        extra++;
-        lua_pushliteral(L, "content-type");
-        lua_pushlstring(L, (char *) r->headers_out.content_type.data,
-                        r->headers_out.content_type.len);
-        lua_rawset(L, -3);
-    }
-
-    if (r->headers_out.content_length == NULL
-        && r->headers_out.content_length_n >= 0)
-    {
-        extra++;
-        lua_pushliteral(L, "content-length");
-        lua_pushfstring(L, "%d", (int) r->headers_out.content_length_n);
-        lua_rawset(L, -3);
-    }
-
-    extra++;
-    lua_pushliteral(L, "connection");
-    if (r->headers_out.status == NGX_HTTP_SWITCHING_PROTOCOLS) {
-        lua_pushliteral(L, "upgrade");
-
-    } else if (r->keepalive) {
-        lua_pushliteral(L, "keep-alive");
-
-    } else {
-        lua_pushliteral(L, "close");
-    }
-    lua_rawset(L, -3);
-
-    if (r->chunked) {
-        extra++;
-        lua_pushliteral(L, "transfer-encoding");
-        lua_pushliteral(L, "chunked");
-        lua_rawset(L, -3);
-    }
-#endif
-
-    if (max > 0 && count + extra > max) {
-        truncated = 1;
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua exceeding response header limit %d > %d",
-                       count + extra, max);
-        count = max - extra;
-    }
-
-    part = &r->headers_out.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;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        if (header[i].hash == 0) {
-            continue;
-        }
-
-        if (raw) {
-            lua_pushlstring(L, (char *) header[i].key.data, header[i].key.len);
-
-        } else {
-            /* nginx does not even bother initializing output header entry's
-             * "lowcase_key" field. so we cannot count on that at all. */
-            if (header[i].key.len > lowcase_key_sz) {
-                lowcase_key_sz = header[i].key.len * 2;
-
-                /* we allocate via Lua's GC to prevent in-request
-                 * leaks in the nginx request memory pools */
-                lowcase_key = lua_newuserdata(L, lowcase_key_sz);
-                lua_insert(L, 1);
-            }
-
-            ngx_strlow(lowcase_key, header[i].key.data, header[i].key.len);
-            lua_pushlstring(L, (char *) lowcase_key, header[i].key.len);
-        }
-
-        /* stack: [udata] table key */
-
-        lua_pushlstring(L, (char *) header[i].value.data,
-                        header[i].value.len); /* stack: [udata] table key
-                                                 value */
-
-        ngx_http_lua_set_multi_value_table(L, -3);
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua response header: \"%V: %V\"",
-                       &header[i].key, &header[i].value);
-
-        if (--count <= 0) {
-            break;
-        }
-    }  /* for */
-
-    if (truncated) {
-        lua_pushliteral(L, "truncated");
-        return 2;
-    }
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_header_get(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    u_char                      *p, c;
-    ngx_str_t                    key;
-    ngx_uint_t                   i;
-    size_t                       len;
-    ngx_http_lua_loc_conf_t     *llcf;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_int_t                    rc;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object 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_fake_request(L, r);
-
-    /* we skip the first argument that is the table */
-    p = (u_char *) luaL_checklstring(L, 2, &len);
-
-    dd("key: %.*s, len %d", (int) len, p, (int) len);
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-    if (llcf->transform_underscores_in_resp_headers
-        && memchr(p, '_', len) != NULL)
-    {
-        key.data = (u_char *) lua_newuserdata(L, len);
-        if (key.data == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        /* replace "_" with "-" */
-        for (i = 0; i < len; i++) {
-            c = p[i];
-            if (c == '_') {
-                c = '-';
-            }
-            key.data[i] = c;
-        }
-
-    } else {
-        key.data = p;
-    }
-
-    key.len = len;
-
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            return luaL_error(L,
-                              "failed to set default content type: %d",
-                              (int) rc);
-        }
-
-        ctx->headers_set = 1;
-    }
-
-    return ngx_http_lua_get_output_header(L, r, &key);
-}
-
-
-static int
-ngx_http_lua_ngx_header_set(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    u_char                      *p;
-    ngx_str_t                    key;
-    ngx_str_t                    value;
-    ngx_uint_t                   i;
-    size_t                       len;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_int_t                    rc;
-    ngx_uint_t                   n;
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return luaL_error(L, "no ctx");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->header_sent || ctx->header_sent) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "attempt to "
-                      "set ngx.header.HEADER after sending out "
-                      "response headers");
-        return 0;
-    }
-
-    /* we skip the first argument that is the table */
-    p = (u_char *) luaL_checklstring(L, 2, &len);
-
-    dd("key: %.*s, len %d", (int) len, p, (int) len);
-
-    key.data = ngx_palloc(r->pool, len + 1);
-    if (key.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    ngx_memcpy(key.data, p, len);
-    key.data[len] = '\0';
-    key.len = len;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    if (llcf->transform_underscores_in_resp_headers) {
-        /* replace "_" with "-" */
-        p = key.data;
-        for (i = 0; i < len; i++) {
-            if (p[i] == '_') {
-                p[i] = '-';
-            }
-        }
-    }
-
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            return luaL_error(L,
-                              "failed to set default content type: %d",
-                              (int) rc);
-        }
-
-        ctx->headers_set = 1;
-    }
-
-    if (lua_type(L, 3) == LUA_TNIL) {
-        ngx_str_null(&value);
-
-    } else if (lua_type(L, 3) == LUA_TTABLE) {
-        n = lua_objlen(L, 3);
-        if (n == 0) {
-            ngx_str_null(&value);
-
-        } else {
-            for (i = 1; i <= n; i++) {
-                dd("header value table index %d", (int) i);
-
-                lua_rawgeti(L, 3, i);
-                p = (u_char *) luaL_checklstring(L, -1, &len);
-
-                value.data = ngx_palloc(r->pool, len);
-                if (value.data == NULL) {
-                    return luaL_error(L, "no memory");
-                }
-
-                ngx_memcpy(value.data, p, len);
-                value.len = len;
-
-                rc = ngx_http_lua_set_output_header(r, key, value,
-                                                    i == 1 /* override */);
-
-                if (rc == NGX_ERROR) {
-                    return luaL_error(L,
-                                      "failed to set header %s (error: %d)",
-                                      key.data, (int) rc);
-                }
-            }
-
-            return 0;
-        }
-
-    } else {
-        p = (u_char *) luaL_checklstring(L, 3, &len);
-        value.data = ngx_palloc(r->pool, len);
-        if (value.data == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        ngx_memcpy(value.data, p, len);
-        value.len = len;
-    }
-
-    dd("key: %.*s, value: %.*s",
-       (int) key.len, key.data, (int) value.len, value.data);
-
-    rc = ngx_http_lua_set_output_header(r, key, value, 1 /* override */);
-
-    if (rc == NGX_ERROR) {
-        return luaL_error(L, "failed to set header %s (error: %d)",
-                          key.data, (int) rc);
-    }
-
-    return 0;
-}
-
-
-static int
-ngx_http_lua_ngx_req_header_clear(lua_State *L)
-{
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one arguments, but seen %d",
-                          lua_gettop(L));
-    }
-
-    lua_pushnil(L);
-
-    return ngx_http_lua_ngx_req_header_set_helper(L);
-}
-
-
-static int
-ngx_http_lua_ngx_req_header_set(lua_State *L)
-{
-    if (lua_gettop(L) != 2) {
-        return luaL_error(L, "expecting two arguments, but seen %d",
-                          lua_gettop(L));
-    }
-
-    return ngx_http_lua_ngx_req_header_set_helper(L);
-}
-
-
-static int
-ngx_http_lua_ngx_req_header_set_helper(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    u_char                      *p;
-    ngx_str_t                    key;
-    ngx_str_t                    value;
-    ngx_uint_t                   i;
-    size_t                       len;
-    ngx_int_t                    rc;
-    ngx_uint_t                   n;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->http_version < NGX_HTTP_VERSION_10) {
-        return 0;
-    }
-
-    p = (u_char *) luaL_checklstring(L, 1, &len);
-
-    dd("key: %.*s, len %d", (int) len, p, (int) len);
-
-#if 0
-    /* replace "_" with "-" */
-    for (i = 0; i < len; i++) {
-        if (p[i] == '_') {
-            p[i] = '-';
-        }
-    }
-#endif
-
-    key.data = ngx_palloc(r->pool, len + 1);
-    if (key.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    ngx_memcpy(key.data, p, len);
-
-    key.data[len] = '\0';
-
-    key.len = len;
-
-    if (lua_type(L, 2) == LUA_TNIL) {
-        ngx_str_null(&value);
-
-    } else if (lua_type(L, 2) == LUA_TTABLE) {
-        n = lua_objlen(L, 2);
-        if (n == 0) {
-            ngx_str_null(&value);
-
-        } else {
-            for (i = 1; i <= n; 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);
-
-                /*
-                 * we also copy the trailling '\0' char here because nginx
-                 * header values must be null-terminated
-                 * */
-
-                value.data = ngx_palloc(r->pool, len + 1);
-                if (value.data == NULL) {
-                    return luaL_error(L, "no memory");
-                }
-
-                ngx_memcpy(value.data, p, len + 1);
-                value.len = len;
-
-                rc = ngx_http_lua_set_input_header(r, key, value,
-                                                   i == 1 /* override */);
-
-                if (rc == NGX_ERROR) {
-                    return luaL_error(L,
-                                      "failed to set header %s (error: %d)",
-                                      key.data, (int) rc);
-                }
-            }
-
-            return 0;
-        }
-
-    } else {
-
-        /*
-         * we also copy the trailling '\0' char here because nginx
-         * header values must be null-terminated
-         * */
-
-        p = (u_char *) luaL_checklstring(L, 2, &len);
-        value.data = ngx_palloc(r->pool, len + 1);
-        if (value.data == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        ngx_memcpy(value.data, p, len + 1);
-        value.len = len;
-    }
-
-    dd("key: %.*s, value: %.*s",
-       (int) key.len, key.data, (int) value.len, value.data);
-
-    rc = ngx_http_lua_set_input_header(r, key, value, 1 /* override */);
-
-    if (rc == NGX_ERROR) {
-        return luaL_error(L, "failed to set header %s (error: %d)",
-                          key.data, (int) rc);
-    }
-
-    return 0;
-}
-
-
-void
-ngx_http_lua_inject_resp_header_api(lua_State *L)
-{
-    lua_newtable(L);    /* .header */
-
-    lua_createtable(L, 0, 2); /* metatable for .header */
-    lua_pushcfunction(L, ngx_http_lua_ngx_header_get);
-    lua_setfield(L, -2, "__index");
-    lua_pushcfunction(L, ngx_http_lua_ngx_header_set);
-    lua_setfield(L, -2, "__newindex");
-    lua_setmetatable(L, -2);
-
-    lua_setfield(L, -2, "header");
-
-    lua_createtable(L, 0, 1); /* .resp */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_resp_get_headers);
-    lua_setfield(L, -2, "get_headers");
-
-    lua_setfield(L, -2, "resp");
-}
-
-
-void
-ngx_http_lua_inject_req_header_api(lua_State *L)
-{
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_http_version);
-    lua_setfield(L, -2, "http_version");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_raw_header);
-    lua_setfield(L, -2, "raw_header");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_header_clear);
-    lua_setfield(L, -2, "clear_header");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_header_set);
-    lua_setfield(L, -2, "set_header");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_get_headers);
-    lua_setfield(L, -2, "get_headers");
-}
-
-
-void
-ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L)
-{
-    int rc;
-    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";
-
-    lua_pushlightuserdata(L, &ngx_http_lua_headers_metatable_key);
-
-    /* metatable for ngx.req.get_headers(_, true) and
-     * ngx.resp.get_headers(_, true) */
-    lua_createtable(L, 0, 1);
-
-    rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "=headers metatable");
-    if (rc != 0) {
-        ngx_log_error(NGX_LOG_ERR, log, 0,
-                      "failed to load Lua code for the metamethod for "
-                      "headers: %i: %s", rc, lua_tostring(L, -1));
-
-        lua_pop(L, 3);
-        return;
-    }
-
-    lua_setfield(L, -2, "__index");
-    lua_rawset(L, LUA_REGISTRYINDEX);
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_req_get_headers_count(ngx_http_request_t *r, int max,
-    int *truncated)
-{
-    int                           count;
-    ngx_list_part_t              *part;
-
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    *truncated = 0;
-
-    if (max < 0) {
-        max = NGX_HTTP_LUA_MAX_HEADERS;
-    }
-
-    part = &r->headers_in.headers.part;
-    count = part->nelts;
-    while (part->next != NULL) {
-        part = part->next;
-        count += part->nelts;
-    }
-
-    if (max > 0 && count > max) {
-        *truncated = 1;
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua exceeding request header limit %d > %d", count,
-                       max);
-        count = max;
-    }
-
-    return count;
-}
-
-
-int
-ngx_http_lua_ffi_req_get_headers(ngx_http_request_t *r,
-    ngx_http_lua_ffi_table_elt_t *out, int count, int raw)
-{
-    int                           n;
-    ngx_uint_t                    i;
-    ngx_list_part_t              *part;
-    ngx_table_elt_t              *header;
-
-    if (count <= 0) {
-        return NGX_OK;
-    }
-
-    n = 0;
-    part = &r->headers_in.headers.part;
-    header = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        if (raw) {
-            out[n].key.data = header[i].key.data;
-            out[n].key.len = (int) header[i].key.len;
-
-        } else {
-            out[n].key.data = header[i].lowcase_key;
-            out[n].key.len = (int) header[i].key.len;
-        }
-
-        out[n].value.data = header[i].value.data;
-        out[n].value.len = (int) header[i].value.len;
-
-        if (++n == count) {
-            return NGX_OK;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
-    size_t key_len, int is_nil, const u_char *sval, size_t sval_len,
-    ngx_http_lua_ffi_str_t *mvals, size_t mvals_len, int override,
-    char **errmsg)
-{
-    u_char                      *p;
-    ngx_str_t                    value, key;
-    ngx_uint_t                   i;
-    size_t                       len;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_int_t                    rc;
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
-    }
-
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    if (r->header_sent || ctx->header_sent) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "attempt to "
-                      "set ngx.header.HEADER after sending out "
-                      "response headers");
-        return NGX_DECLINED;
-    }
-
-    key.data = ngx_palloc(r->pool, key_len + 1);
-    if (key.data == NULL) {
-        goto nomem;
-    }
-
-    ngx_memcpy(key.data, key_data, key_len);
-    key.data[key_len] = '\0';
-    key.len = key_len;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    if (llcf->transform_underscores_in_resp_headers) {
-        /* replace "_" with "-" */
-        p = key.data;
-        for (i = 0; i < key_len; i++) {
-            if (p[i] == '_') {
-                p[i] = '-';
-            }
-        }
-    }
-
-    if (!ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
-        if (rc != NGX_OK) {
-            *errmsg = "failed to set default content type";
-            return NGX_ERROR;
-        }
-
-        ctx->headers_set = 1;
-    }
-
-    if (is_nil) {
-        value.data = NULL;
-        value.len = 0;
-
-    } else if (mvals) {
-
-        if (mvals_len == 0) {
-            value.data = NULL;
-            value.len = 0;
-
-        } else {
-            for (i = 0; i < mvals_len; i++) {
-                dd("header value table index %d", (int) i);
-
-                p = mvals[i].data;
-                len = mvals[i].len;
-
-                value.data = ngx_palloc(r->pool, len);
-                if (value.data == NULL) {
-                    goto nomem;
-                }
-
-                ngx_memcpy(value.data, p, len);
-                value.len = len;
-
-                rc = ngx_http_lua_set_output_header(r, key, value,
-                                                    override && i == 0);
-
-                if (rc == NGX_ERROR) {
-                    *errmsg = "failed to set header";
-                    return NGX_ERROR;
-                }
-            }
-
-            return NGX_OK;
-        }
-
-    } else {
-        p = (u_char *) sval;
-        value.data = ngx_palloc(r->pool, sval_len);
-        if (value.data == NULL) {
-            goto nomem;
-        }
-
-        ngx_memcpy(value.data, p, sval_len);
-        value.len = sval_len;
-    }
-
-    dd("key: %.*s, value: %.*s",
-       (int) key.len, key.data, (int) value.len, value.data);
-
-    rc = ngx_http_lua_set_output_header(r, key, value, override);
-
-    if (rc == NGX_ERROR) {
-        *errmsg = "failed to set header";
-        return NGX_ERROR;
-    }
-
-    return 0;
-
-nomem:
-
-    *errmsg = "no memory";
-    return NGX_ERROR;
-}
-
-
-int
-ngx_http_lua_ffi_req_header_set_single_value(ngx_http_request_t *r,
-    const u_char *key, size_t key_len, const u_char *value, size_t value_len)
-{
-    ngx_str_t                    k;
-    ngx_str_t                    v;
-
-    if (r->connection->fd == (ngx_socket_t) -1) {  /* fake request */
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    if (r->http_version < NGX_HTTP_VERSION_10) {
-        return NGX_DECLINED;
-    }
-
-    k.data = ngx_palloc(r->pool, key_len + 1);
-    if (k.data == NULL) {
-        return NGX_ERROR;
-    }
-    ngx_memcpy(k.data, key, key_len);
-    k.data[key_len] = '\0';
-
-    k.len = key_len;
-
-    if (value_len == 0) {
-        v.data = NULL;
-        v.len = 0;
-
-    } else {
-        v.data = ngx_palloc(r->pool, value_len + 1);
-        if (v.data == NULL) {
-            return NGX_ERROR;
-        }
-        ngx_memcpy(v.data, value, value_len);
-        v.data[value_len] = '\0';
-    }
-
-    v.len = value_len;
-
-    if (ngx_http_lua_set_input_header(r, k, v, 1 /* override */)
-        != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
-    const u_char *key, size_t key_len,
-    u_char *key_buf, ngx_http_lua_ffi_str_t *values, int max_nvalues)
-{
-    int                  found;
-    u_char               c, *p;
-    ngx_uint_t           i;
-    ngx_table_elt_t     *h;
-    ngx_list_part_t     *part;
-    ngx_http_lua_ctx_t  *ctx;
-
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        /* *errmsg = "no ctx found"; */
-        return NGX_ERROR;
-    }
-
-    if (!ctx->headers_set) {
-        if (ngx_http_lua_set_content_type(r) != NGX_OK) {
-            /* *errmsg = "failed to set default content type"; */
-            return NGX_ERROR;
-        }
-
-        ctx->headers_set = 1;
-    }
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-    if (llcf->transform_underscores_in_resp_headers
-        && memchr(key, '_', key_len) != NULL)
-    {
-        for (i = 0; i < key_len; i++) {
-            c = key[i];
-            if (c == '_') {
-                c = '-';
-            }
-
-            key_buf[i] = c;
-        }
-
-    } else {
-        key_buf = (u_char *) key;
-    }
-
-    switch (key_len) {
-    case 14:
-        if (r->headers_out.content_length == NULL
-            && r->headers_out.content_length_n >= 0
-            && ngx_strncasecmp(key_buf, (u_char *) "Content-Length", 14) == 0)
-        {
-            p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
-            if (p == NULL) {
-                return NGX_ERROR;
-            }
-
-            values[0].data = p;
-            values[0].len = (int) (ngx_snprintf(p, NGX_OFF_T_LEN, "%O",
-                                              r->headers_out.content_length_n)
-                            - p);
-            return 1;
-        }
-
-        break;
-
-    case 12:
-        if (r->headers_out.content_type.len
-            && ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0)
-        {
-            values[0].data = r->headers_out.content_type.data;
-            values[0].len = r->headers_out.content_type.len;
-            return 1;
-        }
-
-        break;
-
-    default:
-        break;
-    }
-
-    dd("not a built-in output header");
-
-#if 1
-    if (r->headers_out.location
-        && r->headers_out.location->value.len
-        && r->headers_out.location->value.data[0] == '/')
-    {
-        /* XXX ngx_http_core_find_config_phase, for example,
-         * may not initialize the "key" and "hash" fields
-         * for a nasty optimization purpose, and
-         * we have to work-around it here */
-
-        r->headers_out.location->hash = ngx_http_lua_location_hash;
-        ngx_str_set(&r->headers_out.location->key, "Location");
-    }
-#endif
-
-    found = 0;
-
-    part = &r->headers_out.headers.part;
-    h = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            h = part->elts;
-            i = 0;
-        }
-
-        if (h[i].hash == 0) {
-            continue;
-        }
-
-        dd("checking (%d) \"%.*s\"", (int) h[i].key.len, (int) h[i].key.len,
-           h[i].key.data);
-
-        if (h[i].key.len == key_len
-            && ngx_strncasecmp(key_buf, h[i].key.data, key_len) == 0)
-        {
-            values[found].data = h[i].value.data;
-            values[found].len = (int) h[i].value.len;
-
-            if (++found >= max_nvalues) {
-                break;
-            }
-        }
-    }
-
-    return found;
-}
-#endif /* NGX_LUA_NO_FFI_API */
-
-
-#if nginx_version >= 1011011
-void
-ngx_http_lua_ngx_raw_header_cleanup(void *data)
-{
-    ngx_http_lua_main_conf_t  *lmcf;
-
-    lmcf = (ngx_http_lua_main_conf_t *) data;
-
-    if (lmcf->busy_buf_ptrs) {
-        ngx_free(lmcf->busy_buf_ptrs);
-        lmcf->busy_buf_ptrs = NULL;
-    }
-}
-#endif
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers.h b/debian/modules/http-lua/src/ngx_http_lua_headers.h
deleted file mode 100644
index ee4d21c..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_headers.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_HEADERS_H_INCLUDED_
-#define _NGX_HTTP_LUA_HEADERS_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-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_create_headers_metatable(ngx_log_t *log, lua_State *L);
-#if nginx_version >= 1011011
-void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c b/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
deleted file mode 100644
index 4852b2f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_in.c
+++ /dev/null
@@ -1,835 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include <nginx.h>
-#include "ngx_http_lua_headers_in.h"
-#include "ngx_http_lua_util.h"
-#include <ctype.h>
-
-
-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);
-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_user_agent_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_connection_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_set_builtin_multi_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_lua_validate_host(ngx_str_t *host, ngx_pool_t *pool,
-    ngx_uint_t alloc);
-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_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
-    { ngx_string("Host"),
-                 offsetof(ngx_http_headers_in_t, host),
-                 ngx_http_set_host_header },
-
-    { ngx_string("Connection"),
-                 offsetof(ngx_http_headers_in_t, connection),
-                 ngx_http_set_connection_header },
-
-    { ngx_string("If-Modified-Since"),
-                 offsetof(ngx_http_headers_in_t, if_modified_since),
-                 ngx_http_set_builtin_header },
-
-#if defined(nginx_version) && nginx_version >= 9002
-    { ngx_string("If-Unmodified-Since"),
-                 offsetof(ngx_http_headers_in_t, if_unmodified_since),
-                 ngx_http_set_builtin_header },
-#endif
-
-#if defined(nginx_version) && nginx_version >= 1003003
-    { ngx_string("If-Match"),
-                 offsetof(ngx_http_headers_in_t, if_match),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("If-None-Match"),
-                 offsetof(ngx_http_headers_in_t, if_none_match),
-                 ngx_http_set_builtin_header },
-#endif
-
-    { ngx_string("User-Agent"),
-                 offsetof(ngx_http_headers_in_t, user_agent),
-                 ngx_http_set_user_agent_header },
-
-    { ngx_string("Referer"),
-                 offsetof(ngx_http_headers_in_t, referer),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Content-Length"),
-                 offsetof(ngx_http_headers_in_t, content_length),
-                 ngx_http_set_content_length_header },
-
-    { ngx_string("Content-Type"),
-                 offsetof(ngx_http_headers_in_t, content_type),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Range"),
-                 offsetof(ngx_http_headers_in_t, range),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("If-Range"),
-                 offsetof(ngx_http_headers_in_t, if_range),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Transfer-Encoding"),
-                 offsetof(ngx_http_headers_in_t, transfer_encoding),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Expect"),
-                 offsetof(ngx_http_headers_in_t, expect),
-                 ngx_http_set_builtin_header },
-
-#if defined(nginx_version) && nginx_version >= 1003013
-    { ngx_string("Upgrade"),
-                 offsetof(ngx_http_headers_in_t, upgrade),
-                 ngx_http_set_builtin_header },
-#endif
-
-#if (NGX_HTTP_GZIP)
-    { ngx_string("Accept-Encoding"),
-                 offsetof(ngx_http_headers_in_t, accept_encoding),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Via"),
-                 offsetof(ngx_http_headers_in_t, via),
-                 ngx_http_set_builtin_header },
-#endif
-
-    { ngx_string("Authorization"),
-                 offsetof(ngx_http_headers_in_t, authorization),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Keep-Alive"),
-                 offsetof(ngx_http_headers_in_t, keep_alive),
-                 ngx_http_set_builtin_header },
-
-#if (NGX_HTTP_X_FORWARDED_FOR)
-    { ngx_string("X-Forwarded-For"),
-                 offsetof(ngx_http_headers_in_t, x_forwarded_for),
-                 ngx_http_set_builtin_multi_header },
-
-#endif
-
-#if (NGX_HTTP_REALIP)
-    { ngx_string("X-Real-IP"),
-                 offsetof(ngx_http_headers_in_t, x_real_ip),
-                 ngx_http_set_builtin_header },
-#endif
-
-#if (NGX_HTTP_DAV)
-    { ngx_string("Depth"),
-                 offsetof(ngx_http_headers_in_t, depth),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Destination"),
-                 offsetof(ngx_http_headers_in_t, destination),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Overwrite"),
-                 offsetof(ngx_http_headers_in_t, overwrite),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Date"), offsetof(ngx_http_headers_in_t, date),
-                 ngx_http_set_builtin_header },
-#endif
-
-    { ngx_string("Cookie"),
-                 offsetof(ngx_http_headers_in_t, cookies),
-                 ngx_http_set_builtin_multi_header },
-
-    { ngx_null_string, 0, ngx_http_set_header }
-};
-
-
-/* request time implementation */
-
-static ngx_int_t
-ngx_http_set_header(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
-    ngx_str_t *value)
-{
-    return ngx_http_set_header_helper(r, hv, value, NULL);
-}
-
-
-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)
-{
-    ngx_table_elt_t             *h, *matched;
-    ngx_list_part_t             *part;
-    ngx_uint_t                   i;
-    ngx_uint_t                   rc;
-
-    if (hv->no_override) {
-        goto new_header;
-    }
-
-    matched = NULL;
-
-retry:
-
-    part = &r->headers_in.headers.part;
-    h = part->elts;
-
-    for (i = 0; /* void */; i++) {
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            h = part->elts;
-            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, h[i].key.len)
-               == 0)
-        {
-            if (value->len == 0 || (matched && matched != &h[i])) {
-                h[i].hash = 0;
-
-                dd("rm header %.*s: %.*s", (int) h[i].key.len, h[i].key.data,
-                   (int) h[i].value.len, h[i].value.data);
-
-                rc = ngx_http_lua_rm_header_helper(&r->headers_in.headers,
-                                                   part, i);
-
-                ngx_http_lua_assert(!(r->headers_in.headers.part.next == NULL
-                                      && r->headers_in.headers.last
-                                         != &r->headers_in.headers.part));
-
-                dd("rm header: rc=%d", (int) rc);
-
-                if (rc == NGX_OK) {
-
-                    if (output_header) {
-                        *output_header = NULL;
-                    }
-
-                    goto retry;
-                }
-
-                return NGX_ERROR;
-            }
-
-            h[i].value = *value;
-
-            if (output_header) {
-                *output_header = &h[i];
-                dd("setting existing builtin input header");
-            }
-
-            if (matched == NULL) {
-                matched = &h[i];
-            }
-        }
-    }
-
-    if (matched){
-        return NGX_OK;
-    }
-
-    if (value->len == 0) {
-        return NGX_OK;
-    }
-
-new_header:
-
-    h = ngx_list_push(&r->headers_in.headers);
-
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    dd("created new header for %.*s", (int) hv->key.len, hv->key.data);
-
-    if (value->len == 0) {
-        h->hash = 0;
-
-    } else {
-        h->hash = hv->hash;
-    }
-
-    h->key = hv->key;
-    h->value = *value;
-
-    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
-    if (h->lowcase_key == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
-
-    if (output_header) {
-        *output_header = h;
-    }
-
-    return NGX_OK;
-}
-
-
-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)
-{
-    ngx_table_elt_t             *h, **old;
-
-    dd("entered set_builtin_header (input)");
-
-    if (hv->offset) {
-        old = (ngx_table_elt_t **) ((char *) &r->headers_in + hv->offset);
-
-    } else {
-        old = NULL;
-    }
-
-    dd("old builtin ptr ptr: %p", old);
-    if (old) {
-        dd("old builtin ptr: %p", *old);
-    }
-
-    if (old == NULL || *old == NULL) {
-        dd("set normal header");
-        return ngx_http_set_header_helper(r, hv, value, old);
-    }
-
-    h = *old;
-
-    if (value->len == 0) {
-        h->hash = 0;
-        h->value = *value;
-
-        return ngx_http_set_header_helper(r, hv, value, old);
-    }
-
-    h->hash = hv->hash;
-    h->value = *value;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_validate_host(ngx_str_t *host, ngx_pool_t *pool, ngx_uint_t alloc)
-{
-    u_char  *h, ch;
-    size_t   i, dot_pos, host_len;
-
-    enum {
-        sw_usual = 0,
-        sw_literal,
-        sw_rest
-    } state;
-
-    dot_pos = host->len;
-    host_len = host->len;
-
-    h = host->data;
-
-    state = sw_usual;
-
-    for (i = 0; i < host->len; i++) {
-        ch = h[i];
-
-        switch (ch) {
-
-        case '.':
-            if (dot_pos == i - 1) {
-                return NGX_DECLINED;
-            }
-            dot_pos = i;
-            break;
-
-        case ':':
-            if (state == sw_usual) {
-                host_len = i;
-                state = sw_rest;
-            }
-            break;
-
-        case '[':
-            if (i == 0) {
-                state = sw_literal;
-            }
-            break;
-
-        case ']':
-            if (state == sw_literal) {
-                host_len = i + 1;
-                state = sw_rest;
-            }
-            break;
-
-        case '\0':
-            return NGX_DECLINED;
-
-        default:
-
-            if (ngx_path_separator(ch)) {
-                return NGX_DECLINED;
-            }
-
-            if (ch >= 'A' && ch <= 'Z') {
-                alloc = 1;
-            }
-
-            break;
-        }
-    }
-
-    if (dot_pos == host_len - 1) {
-        host_len--;
-    }
-
-    if (host_len == 0) {
-        return NGX_DECLINED;
-    }
-
-    if (alloc) {
-        host->data = ngx_pnalloc(pool, host_len);
-        if (host->data == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_strlow(host->data, h, host_len);
-    }
-
-    host->len = host_len;
-
-    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)
-{
-    ngx_str_t host;
-
-    dd("server new value len: %d", (int) value->len);
-
-    if (value->len) {
-        host= *value;
-
-        if (ngx_http_lua_validate_host(&host, r->pool, 0) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        r->headers_in.server = host;
-
-    } else {
-        r->headers_in.server = *value;
-    }
-
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-static ngx_int_t
-ngx_http_set_connection_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value)
-{
-    r->headers_in.connection_type = 0;
-
-    if (value->len == 0) {
-        return ngx_http_set_builtin_header(r, hv, value);
-    }
-
-    if (ngx_strcasestrn(value->data, "close", 5 - 1)) {
-        r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE;
-        r->headers_in.keep_alive_n = -1;
-
-    } else if (ngx_strcasestrn(value->data, "keep-alive", 10 - 1)) {
-        r->headers_in.connection_type = NGX_HTTP_CONNECTION_KEEP_ALIVE;
-    }
-
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-/* borrowed the code from ngx_http_request.c:ngx_http_process_user_agent */
-static ngx_int_t
-ngx_http_set_user_agent_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value)
-{
-    u_char  *user_agent, *msie;
-
-    /* clear existing settings */
-
-    r->headers_in.msie = 0;
-    r->headers_in.msie6 = 0;
-    r->headers_in.opera = 0;
-    r->headers_in.gecko = 0;
-    r->headers_in.chrome = 0;
-    r->headers_in.safari = 0;
-    r->headers_in.konqueror = 0;
-
-    if (value->len == 0) {
-        return ngx_http_set_builtin_header(r, hv, value);
-    }
-
-    /* check some widespread browsers */
-
-    user_agent = value->data;
-
-    msie = ngx_strstrn(user_agent, "MSIE ", 5 - 1);
-
-    if (msie && msie + 7 < user_agent + value->len) {
-
-        r->headers_in.msie = 1;
-
-        if (msie[6] == '.') {
-
-            switch (msie[5]) {
-            case '4':
-            case '5':
-                r->headers_in.msie6 = 1;
-                break;
-            case '6':
-                if (ngx_strstrn(msie + 8, "SV1", 3 - 1) == NULL) {
-                    r->headers_in.msie6 = 1;
-                }
-                break;
-            }
-        }
-    }
-
-    if (ngx_strstrn(user_agent, "Opera", 5 - 1)) {
-        r->headers_in.opera = 1;
-        r->headers_in.msie = 0;
-        r->headers_in.msie6 = 0;
-    }
-
-    if (!r->headers_in.msie && !r->headers_in.opera) {
-
-        if (ngx_strstrn(user_agent, "Gecko/", 6 - 1)) {
-            r->headers_in.gecko = 1;
-
-        } else if (ngx_strstrn(user_agent, "Chrome/", 7 - 1)) {
-            r->headers_in.chrome = 1;
-
-        } else if (ngx_strstrn(user_agent, "Safari/", 7 - 1)
-                   && ngx_strstrn(user_agent, "Mac OS X", 8 - 1))
-        {
-            r->headers_in.safari = 1;
-
-        } else if (ngx_strstrn(user_agent, "Konqueror", 9 - 1)) {
-            r->headers_in.konqueror = 1;
-        }
-    }
-
-    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)
-{
-    off_t           len;
-
-    if (value->len == 0) {
-        return ngx_http_clear_content_length_header(r, hv, value);
-    }
-
-    len = ngx_atosz(value->data, value->len);
-    if (len == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    dd("reset headers_in.content_length_n to %d", (int) len);
-
-    r->headers_in.content_length_n = len;
-
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-static ngx_int_t
-ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value)
-{
-    ngx_array_t       *headers;
-    ngx_table_elt_t  **v, *h;
-
-    headers = (ngx_array_t *) ((char *) &r->headers_in + hv->offset);
-
-    if (!hv->no_override && headers->nelts > 0) {
-        ngx_array_destroy(headers);
-
-        if (ngx_array_init(headers, r->pool, 2,
-                           sizeof(ngx_table_elt_t *))
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        dd("clear multi-value headers: %d", (int) headers->nelts);
-    }
-
-#if 1
-    if (headers->nalloc == 0) {
-        if (ngx_array_init(headers, r->pool, 2,
-                           sizeof(ngx_table_elt_t *))
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-#endif
-
-    if (ngx_http_set_header_helper(r, hv, value, &h) == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    if (value->len == 0) {
-        return NGX_OK;
-    }
-
-    dd("new multi-value header: %p", h);
-
-    v = ngx_array_push(headers);
-    if (v == NULL) {
-        return NGX_ERROR;
-    }
-
-    *v = h;
-    return NGX_OK;
-}
-
-
-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)
-{
-    r->headers_in.content_length_n = -1;
-
-    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)
-{
-    value->len = 0;
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-ngx_int_t
-ngx_http_lua_set_input_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override)
-{
-    ngx_http_lua_header_val_t         hv;
-    ngx_http_lua_set_header_t        *handlers = ngx_http_lua_set_handlers;
-
-    ngx_uint_t                        i;
-
-    dd("set header value: %.*s", (int) value.len, value.data);
-
-    hv.hash = ngx_hash_key_lc(key.data, key.len);
-    hv.key = key;
-
-    hv.offset = 0;
-    hv.no_override = !override;
-    hv.handler = NULL;
-
-    for (i = 0; handlers[i].name.len; i++) {
-        if (hv.key.len != handlers[i].name.len
-            || ngx_strncasecmp(hv.key.data, handlers[i].name.data,
-                               handlers[i].name.len) != 0)
-        {
-            dd("hv key comparison: %s <> %s", handlers[i].name.data,
-               hv.key.data);
-
-            continue;
-        }
-
-        dd("Matched handler: %s %s", handlers[i].name.data, hv.key.data);
-
-        hv.offset = handlers[i].offset;
-        hv.handler = handlers[i].handler;
-
-        break;
-    }
-
-    if (handlers[i].name.len == 0 && handlers[i].handler) {
-        hv.offset = handlers[i].offset;
-        hv.handler = handlers[i].handler;
-    }
-
-#if 1
-    if (hv.handler == NULL) {
-        return NGX_ERROR;
-    }
-#endif
-
-    if (r->headers_out.status == 400 || r->headers_in.headers.last == NULL) {
-        /* must be a 400 Bad Request */
-        return NGX_OK;
-    }
-
-    return hv.handler(r, &hv, &value);
-}
-
-
-static ngx_int_t
-ngx_http_lua_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
-    ngx_uint_t i)
-{
-    ngx_table_elt_t             *data;
-    ngx_list_part_t             *new, *part;
-
-    dd("list rm item: part %p, i %d, nalloc %d", cur, (int) i,
-       (int) l->nalloc);
-
-    data = cur->elts;
-
-    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) {
-        dd("first entry in the part");
-        cur->elts = (char *) cur->elts + l->size;
-        cur->nelts--;
-
-        if (cur == l->last) {
-            dd("being the last part");
-            if (cur->nelts == 0) {
-#if 1
-                part = &l->part;
-                dd("cur=%p, part=%p, part next=%p, last=%p",
-                   cur, part, part->next, l->last);
-
-                if (part == cur) {
-                    cur->elts = (char *) cur->elts - l->size;
-                    /* do nothing */
-
-                } else {
-                    while (part->next != cur) {
-                        if (part->next == NULL) {
-                            return NGX_ERROR;
-                        }
-                        part = part->next;
-                    }
-
-                    l->last = part;
-                    part->next = NULL;
-                    dd("part nelts: %d", (int) part->nelts);
-                    l->nalloc = part->nelts;
-                }
-#endif
-
-            } else {
-                l->nalloc--;
-                dd("nalloc decreased: %d", (int) l->nalloc);
-            }
-
-            return NGX_OK;
-        }
-
-        if (cur->nelts == 0) {
-            dd("current part is empty");
-            part = &l->part;
-            if (part == cur) {
-                ngx_http_lua_assert(cur->next != NULL);
-
-                dd("remove 'cur' from the list by rewriting 'cur': "
-                   "l->last: %p, cur: %p, cur->next: %p, part: %p",
-                   l->last, cur, cur->next, part);
-
-                if (l->last == cur->next) {
-                    dd("last is cur->next");
-                    l->part = *(cur->next);
-                    l->last = part;
-                    l->nalloc = part->nelts;
-
-                } else {
-                    l->part = *(cur->next);
-                }
-
-            } else {
-                dd("remove 'cur' from the list");
-                while (part->next != cur) {
-                    if (part->next == NULL) {
-                        return NGX_ERROR;
-                    }
-                    part = part->next;
-                }
-
-                part->next = cur->next;
-            }
-
-            return NGX_OK;
-        }
-
-        return NGX_OK;
-    }
-
-    if (i == cur->nelts - 1) {
-        dd("last entry in the part");
-
-        cur->nelts--;
-
-        if (cur == l->last) {
-            l->nalloc--;
-        }
-
-        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;
-    }
-
-    new->elts = &data[i + 1];
-    new->nelts = cur->nelts - i - 1;
-    new->next = cur->next;
-
-    cur->nelts = i;
-    cur->next = new;
-
-    if (cur == l->last) {
-        l->last = new;
-        l->nalloc = new->nelts;
-    }
-
-    return NGX_OK;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_in.h b/debian/modules/http-lua/src/ngx_http_lua_headers_in.h
deleted file mode 100644
index 5397471..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_in.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_HEADERS_IN_H_INCLUDED_
-#define _NGX_HTTP_LUA_HEADERS_IN_H_INCLUDED_
-
-
-#include <nginx.h>
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_set_input_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override);
-
-
-#endif /* _NGX_HTTP_LUA_HEADERS_IN_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c b/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
deleted file mode 100644
index b908eae..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.c
+++ /dev/null
@@ -1,637 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include <nginx.h>
-#include "ngx_http_lua_headers_out.h"
-#include "ngx_http_lua_util.h"
-#include <ctype.h>
-
-
-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_builtin_multi_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_last_modified_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_set_content_type_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_last_modified_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_location_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value);
-
-
-static ngx_http_lua_set_header_t  ngx_http_lua_set_handlers[] = {
-
-    { ngx_string("Server"),
-                 offsetof(ngx_http_headers_out_t, server),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Date"),
-                 offsetof(ngx_http_headers_out_t, date),
-                 ngx_http_set_builtin_header },
-
-#if 1
-    { ngx_string("Content-Encoding"),
-                 offsetof(ngx_http_headers_out_t, content_encoding),
-                 ngx_http_set_builtin_header },
-#endif
-
-    { ngx_string("Location"),
-                 offsetof(ngx_http_headers_out_t, location),
-                 ngx_http_set_location_header },
-
-    { ngx_string("Refresh"),
-                 offsetof(ngx_http_headers_out_t, refresh),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Last-Modified"),
-                 offsetof(ngx_http_headers_out_t, last_modified),
-                 ngx_http_set_last_modified_header },
-
-    { ngx_string("Content-Range"),
-                 offsetof(ngx_http_headers_out_t, content_range),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Accept-Ranges"),
-                 offsetof(ngx_http_headers_out_t, accept_ranges),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("WWW-Authenticate"),
-                 offsetof(ngx_http_headers_out_t, www_authenticate),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Expires"),
-                 offsetof(ngx_http_headers_out_t, expires),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("E-Tag"),
-                 offsetof(ngx_http_headers_out_t, etag),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("ETag"),
-                 offsetof(ngx_http_headers_out_t, etag),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Content-Length"),
-                 offsetof(ngx_http_headers_out_t, content_length),
-                 ngx_http_set_content_length_header },
-
-    { ngx_string("Content-Type"),
-                 offsetof(ngx_http_headers_out_t, content_type),
-                 ngx_http_set_content_type_header },
-
-    { ngx_string("Cache-Control"),
-                 offsetof(ngx_http_headers_out_t, cache_control),
-                 ngx_http_set_builtin_multi_header },
-
-    { ngx_null_string, 0, ngx_http_set_header }
-};
-
-
-/* request time implementation */
-
-static ngx_int_t
-ngx_http_set_header(ngx_http_request_t *r, ngx_http_lua_header_val_t *hv,
-    ngx_str_t *value)
-{
-    return ngx_http_set_header_helper(r, hv, value, NULL, 0);
-}
-
-
-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)
-{
-    ngx_table_elt_t             *h;
-    ngx_list_part_t             *part;
-    ngx_uint_t                   i;
-    unsigned                     matched = 0;
-
-    if (hv->no_override) {
-        goto new_header;
-    }
-
-#if 1
-    if (r->headers_out.location
-        && r->headers_out.location->value.len
-        && r->headers_out.location->value.data[0] == '/')
-    {
-        /* XXX ngx_http_core_find_config_phase, for example,
-         * may not initialize the "key" and "hash" fields
-         * for a nasty optimization purpose, and
-         * we have to work-around it here */
-
-        r->headers_out.location->hash = ngx_http_lua_location_hash;
-        ngx_str_set(&r->headers_out.location->key, "Location");
-    }
-#endif
-
-    part = &r->headers_out.headers.part;
-    h = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            h = part->elts;
-            i = 0;
-        }
-
-        if (h[i].hash != 0
-            && h[i].key.len == hv->key.len
-            && ngx_strncasecmp(hv->key.data, h[i].key.data, h[i].key.len) == 0)
-        {
-            dd("found out header %.*s", (int) h[i].key.len, h[i].key.data);
-
-            if (value->len == 0 || matched) {
-                dd("clearing normal header for %.*s", (int) hv->key.len,
-                   hv->key.data);
-
-                h[i].value.len = 0;
-                h[i].hash = 0;
-
-            } else {
-                dd("setting header to value %.*s", (int) value->len,
-                   value->data);
-
-                h[i].value = *value;
-                h[i].hash = hv->hash;
-            }
-
-            if (output_header) {
-                *output_header = &h[i];
-            }
-
-            /* return NGX_OK; */
-            matched = 1;
-        }
-    }
-
-    if (matched){
-        return NGX_OK;
-    }
-
-    if (no_create && value->len == 0) {
-        return NGX_OK;
-    }
-
-new_header:
-
-    /* XXX we still need to create header slot even if the value
-     * is empty because some builtin headers like Last-Modified
-     * relies on this to get cleared */
-
-    h = ngx_list_push(&r->headers_out.headers);
-
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (value->len == 0) {
-        h->hash = 0;
-
-    } else {
-        h->hash = hv->hash;
-    }
-
-    h->key = hv->key;
-    h->value = *value;
-
-    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
-    if (h->lowcase_key == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
-
-    if (output_header) {
-        *output_header = h;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_location_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value)
-{
-    ngx_int_t         rc;
-    ngx_table_elt_t  *h;
-
-    rc = ngx_http_set_builtin_header(r, hv, value);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /*
-     * we do not set r->headers_out.location here to avoid the handling
-     * the local redirects without a host name by ngx_http_header_filter()
-     */
-
-    h = r->headers_out.location;
-    if (h && h->value.len && h->value.data[0] == '/') {
-        r->headers_out.location = NULL;
-    }
-
-    return NGX_OK;
-}
-
-
-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)
-{
-    ngx_table_elt_t  *h, **old;
-
-    if (hv->offset) {
-        old = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
-
-    } else {
-        old = NULL;
-    }
-
-    if (old == NULL || *old == NULL) {
-        return ngx_http_set_header_helper(r, hv, value, old, 0);
-    }
-
-    h = *old;
-
-    if (value->len == 0) {
-        dd("clearing the builtin header");
-
-        h->hash = 0;
-        h->value = *value;
-
-        return NGX_OK;
-    }
-
-    h->hash = hv->hash;
-    h->key = hv->key;
-    h->value = *value;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value)
-{
-    ngx_array_t      *pa;
-    ngx_table_elt_t  *ho, **ph;
-    ngx_uint_t        i;
-
-    pa = (ngx_array_t *) ((char *) &r->headers_out + hv->offset);
-
-    if (pa->elts == NULL) {
-        if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *))
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    if (hv->no_override) {
-        ph = pa->elts;
-        for (i = 0; i < pa->nelts; i++) {
-            if (!ph[i]->hash) {
-                ph[i]->value = *value;
-                ph[i]->hash = hv->hash;
-                return NGX_OK;
-            }
-        }
-
-        goto create;
-    }
-
-    /* override old values (if any) */
-
-    if (pa->nelts > 0) {
-        ph = pa->elts;
-        for (i = 1; i < pa->nelts; i++) {
-            ph[i]->hash = 0;
-            ph[i]->value.len = 0;
-        }
-
-        ph[0]->value = *value;
-
-        if (value->len == 0) {
-            ph[0]->hash = 0;
-
-        } else {
-            ph[0]->hash = hv->hash;
-        }
-
-        return NGX_OK;
-    }
-
-create:
-
-    ph = ngx_array_push(pa);
-    if (ph == NULL) {
-        return NGX_ERROR;
-    }
-
-    ho = ngx_list_push(&r->headers_out.headers);
-    if (ho == NULL) {
-        return NGX_ERROR;
-    }
-
-    ho->value = *value;
-
-    if (value->len == 0) {
-        ho->hash = 0;
-
-    } else {
-        ho->hash = hv->hash;
-    }
-
-    ho->key = hv->key;
-    *ph = ho;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_content_type_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value)
-{
-    ngx_uint_t          i;
-
-    r->headers_out.content_type_len = value->len;
-
-#if 1
-    for (i = 0; i < value->len; i++) {
-        if (value->data[i] == ';') {
-            r->headers_out.content_type_len = i;
-            break;
-        }
-    }
-#endif
-
-    r->headers_out.content_type = *value;
-    r->headers_out.content_type_hash = hv->hash;
-    r->headers_out.content_type_lowcase = NULL;
-
-    value->len = 0;
-
-    return ngx_http_set_header_helper(r, hv, value, NULL, 1);
-}
-
-
-static ngx_int_t ngx_http_set_last_modified_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value)
-{
-    if (value->len == 0) {
-        return ngx_http_clear_last_modified_header(r, hv, value);
-    }
-
-    r->headers_out.last_modified_time = ngx_http_parse_time(value->data,
-                                                            value->len);
-
-    dd("last modified time: %d", (int) r->headers_out.last_modified_time);
-
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-static ngx_int_t
-ngx_http_clear_last_modified_header(ngx_http_request_t *r,
-    ngx_http_lua_header_val_t *hv, ngx_str_t *value)
-{
-    r->headers_out.last_modified_time = -1;
-
-    return ngx_http_clear_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)
-{
-    off_t           len;
-
-    if (value->len == 0) {
-        return ngx_http_clear_content_length_header(r, hv, value);
-    }
-
-    len = ngx_atosz(value->data, value->len);
-    if (len == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    r->headers_out.content_length_n = len;
-
-    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)
-{
-    r->headers_out.content_length_n = -1;
-
-    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)
-{
-    value->len = 0;
-
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-ngx_int_t
-ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override)
-{
-    ngx_http_lua_header_val_t         hv;
-    ngx_http_lua_set_header_t        *handlers = ngx_http_lua_set_handlers;
-    ngx_uint_t                        i;
-
-    dd("set header value: %.*s", (int) value.len, value.data);
-
-    hv.hash = ngx_hash_key_lc(key.data, key.len);
-    hv.key = key;
-
-    hv.offset = 0;
-    hv.no_override = !override;
-    hv.handler = NULL;
-
-    for (i = 0; handlers[i].name.len; i++) {
-        if (hv.key.len != handlers[i].name.len
-            || ngx_strncasecmp(hv.key.data, handlers[i].name.data,
-                               handlers[i].name.len) != 0)
-        {
-            dd("hv key comparison: %s <> %s", handlers[i].name.data,
-               hv.key.data);
-
-            continue;
-        }
-
-        dd("Matched handler: %s %s", handlers[i].name.data, hv.key.data);
-
-        hv.offset = handlers[i].offset;
-        hv.handler = handlers[i].handler;
-
-        break;
-    }
-
-    if (handlers[i].name.len == 0 && handlers[i].handler) {
-        hv.offset = handlers[i].offset;
-        hv.handler = handlers[i].handler;
-    }
-
-#if 1
-    if (hv.handler == NULL) {
-        return NGX_ERROR;
-    }
-#endif
-
-    return hv.handler(r, &hv, &value);
-}
-
-
-int
-ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_str_t *key)
-{
-    ngx_table_elt_t            *h;
-    ngx_list_part_t            *part;
-    ngx_uint_t                  i;
-    unsigned                    found;
-
-    dd("looking for response header \"%.*s\"", (int) key->len, key->data);
-
-    switch (key->len) {
-    case 14:
-        if (r->headers_out.content_length == NULL
-            && r->headers_out.content_length_n >= 0
-            && ngx_strncasecmp(key->data, (u_char *) "Content-Length", 14) == 0)
-        {
-            lua_pushinteger(L, (lua_Integer) r->headers_out.content_length_n);
-            return 1;
-        }
-
-        break;
-
-    case 12:
-        if (r->headers_out.content_type.len
-            && ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0)
-        {
-            lua_pushlstring(L, (char *) r->headers_out.content_type.data,
-                            r->headers_out.content_type.len);
-            return 1;
-        }
-
-        break;
-
-    default:
-        break;
-    }
-
-    dd("not a built-in output header");
-
-    found = 0;
-
-#if 1
-    if (r->headers_out.location
-        && r->headers_out.location->value.len
-        && r->headers_out.location->value.data[0] == '/')
-    {
-        /* XXX ngx_http_core_find_config_phase, for example,
-         * may not initialize the "key" and "hash" fields
-         * for a nasty optimization purpose, and
-         * we have to work-around it here */
-
-        r->headers_out.location->hash = ngx_http_lua_location_hash;
-        ngx_str_set(&r->headers_out.location->key, "Location");
-    }
-#endif
-
-    part = &r->headers_out.headers.part;
-    h = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            h = part->elts;
-            i = 0;
-        }
-
-        if (h[i].hash == 0) {
-            continue;
-        }
-
-        if (h[i].hash != 0
-            && h[i].key.len == key->len
-            && ngx_strncasecmp(key->data, h[i].key.data, h[i].key.len) == 0)
-         {
-             if (!found) {
-                 found = 1;
-
-                 lua_pushlstring(L, (char *) h[i].value.data, h[i].value.len);
-                 continue;
-             }
-
-             if (found == 1) {
-                 lua_createtable(L, 4 /* narr */, 0);
-                 lua_insert(L, -2);
-                 lua_rawseti(L, -2, found);
-             }
-
-             found++;
-
-             lua_pushlstring(L, (char *) h[i].value.data, h[i].value.len);
-             lua_rawseti(L, -2, found);
-         }
-    }
-
-    if (found) {
-        return 1;
-    }
-
-    lua_pushnil(L);
-    return 1;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h b/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
deleted file mode 100644
index ef5e6d4..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_headers_out.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_HEADERS_OUT_H_INCLUDED_
-#define _NGX_HTTP_LUA_HEADERS_OUT_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override);
-int ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
-    ngx_str_t *key);
-
-
-#endif /* _NGX_HTTP_LUA_HEADERS_OUT_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_initby.c b/debian/modules/http-lua/src/ngx_http_lua_initby.c
deleted file mode 100644
index e8941da..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_initby.c
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-
-#include "ddebug.h"
-#include "ngx_http_lua_initby.h"
-#include "ngx_http_lua_util.h"
-
-
-ngx_int_t
-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, "init_by_lua");
-}
-
-
-ngx_int_t
-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, "init_by_lua_file");
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_initby.h b/debian/modules/http-lua/src/ngx_http_lua_initby.h
deleted file mode 100644
index 67ac0b6..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_initby.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_INITBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_INITBY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_init_by_inline(ngx_log_t *log,
-    ngx_http_lua_main_conf_t *lmcf, lua_State *L);
-
-ngx_int_t 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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
deleted file mode 100644
index 4a722a0..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.c
+++ /dev/null
@@ -1,357 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_initworkerby.h"
-#include "ngx_http_lua_util.h"
-
-
-static u_char *ngx_http_lua_log_init_worker_error(ngx_log_t *log,
-    u_char *buf, size_t len);
-
-
-ngx_int_t
-ngx_http_lua_init_worker(ngx_cycle_t *cycle)
-{
-    char                        *rv;
-    void                        *cur, *prev;
-    ngx_uint_t                   i;
-    ngx_conf_t                   conf;
-    ngx_cycle_t                 *fake_cycle;
-    ngx_module_t               **modules;
-    ngx_open_file_t             *file, *ofile;
-    ngx_list_part_t             *part;
-    ngx_connection_t            *c = NULL;
-    ngx_http_module_t           *module;
-    ngx_http_request_t          *r = NULL;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_conf_ctx_t         *conf_ctx, http_ctx;
-    ngx_http_lua_loc_conf_t     *top_llcf;
-    ngx_http_lua_main_conf_t    *lmcf;
-    ngx_http_core_loc_conf_t    *clcf, *top_clcf;
-
-    lmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_lua_module);
-
-    if (lmcf == NULL || lmcf->lua == NULL) {
-        return NGX_OK;
-    }
-
-    /* lmcf != NULL && lmcf->lua != NULL */
-
-#if !(NGX_WIN32)
-    if (ngx_process == NGX_PROCESS_HELPER
-#   ifdef HAVE_PRIVILEGED_PROCESS_PATCH
-        && !ngx_is_privileged_agent
-#   endif
-       )
-    {
-        /* disable init_worker_by_lua* and destroy lua VM in cache processes */
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua close the global Lua VM %p in the "
-                       "cache helper process %P", lmcf->lua, ngx_pid);
-
-        lmcf->vm_cleanup->handler(lmcf->vm_cleanup->data);
-        lmcf->vm_cleanup->handler = NULL;
-
-        return NGX_OK;
-    }
-#endif  /* NGX_WIN32 */
-
-    if (lmcf->init_worker_handler == NULL) {
-        return NGX_OK;
-    }
-
-    conf_ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index];
-    http_ctx.main_conf = conf_ctx->main_conf;
-
-    top_clcf = conf_ctx->loc_conf[ngx_http_core_module.ctx_index];
-    top_llcf = conf_ctx->loc_conf[ngx_http_lua_module.ctx_index];
-
-    ngx_memzero(&conf, sizeof(ngx_conf_t));
-
-    conf.temp_pool = ngx_create_pool(NGX_CYCLE_POOL_SIZE, cycle->log);
-    if (conf.temp_pool == NULL) {
-        return NGX_ERROR;
-    }
-
-    conf.temp_pool->log = cycle->log;
-
-    /* we fake a temporary ngx_cycle_t here because some
-     * modules' merge conf handler may produce side effects in
-     * cf->cycle (like ngx_proxy vs cf->cycle->paths).
-     * also, we cannot allocate our temp cycle on the stack
-     * because some modules like ngx_http_core_module reference
-     * addresses within cf->cycle (i.e., via "&cf->cycle->new_log")
-     */
-
-    fake_cycle = ngx_palloc(cycle->pool, sizeof(ngx_cycle_t));
-    if (fake_cycle == NULL) {
-        goto failed;
-    }
-
-    ngx_memcpy(fake_cycle, cycle, sizeof(ngx_cycle_t));
-
-#if defined(nginx_version) && nginx_version >= 9007
-
-    ngx_queue_init(&fake_cycle->reusable_connections_queue);
-
-#endif
-
-    if (ngx_array_init(&fake_cycle->listening, cycle->pool,
-                       cycle->listening.nelts || 1,
-                       sizeof(ngx_listening_t))
-        != NGX_OK)
-    {
-        goto failed;
-    }
-
-#if defined(nginx_version) && nginx_version >= 1003007
-
-    if (ngx_array_init(&fake_cycle->paths, cycle->pool, cycle->paths.nelts || 1,
-                       sizeof(ngx_path_t *))
-        != NGX_OK)
-    {
-        goto failed;
-    }
-
-#endif
-
-    part = &cycle->open_files.part;
-    ofile = part->elts;
-
-    if (ngx_list_init(&fake_cycle->open_files, cycle->pool, part->nelts || 1,
-                      sizeof(ngx_open_file_t))
-        != NGX_OK)
-    {
-        goto failed;
-    }
-
-    for (i = 0; /* void */ ; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-            part = part->next;
-            ofile = part->elts;
-            i = 0;
-        }
-
-        file = ngx_list_push(&fake_cycle->open_files);
-        if (file == NULL) {
-            goto failed;
-        }
-
-        ngx_memcpy(file, ofile, sizeof(ngx_open_file_t));
-    }
-
-    if (ngx_list_init(&fake_cycle->shared_memory, cycle->pool, 1,
-                      sizeof(ngx_shm_zone_t))
-        != NGX_OK)
-    {
-        goto failed;
-    }
-
-    conf.ctx = &http_ctx;
-    conf.cycle = fake_cycle;
-    conf.pool = fake_cycle->pool;
-    conf.log = cycle->log;
-
-    http_ctx.loc_conf = ngx_pcalloc(conf.pool,
-                                    sizeof(void *) * ngx_http_max_module);
-    if (http_ctx.loc_conf == NULL) {
-        return NGX_ERROR;
-    }
-
-    http_ctx.srv_conf = ngx_pcalloc(conf.pool,
-                                    sizeof(void *) * ngx_http_max_module);
-    if (http_ctx.srv_conf == NULL) {
-        return NGX_ERROR;
-    }
-
-#if defined(nginx_version) && nginx_version >= 1009011
-    modules = cycle->modules;
-#else
-    modules = ngx_modules;
-#endif
-
-    for (i = 0; modules[i]; i++) {
-        if (modules[i]->type != NGX_HTTP_MODULE) {
-            continue;
-        }
-
-        module = modules[i]->ctx;
-
-        if (module->create_srv_conf) {
-            cur = module->create_srv_conf(&conf);
-            if (cur == NULL) {
-                return NGX_ERROR;
-            }
-
-            http_ctx.srv_conf[modules[i]->ctx_index] = cur;
-
-            if (module->merge_srv_conf) {
-                prev = module->create_srv_conf(&conf);
-                if (prev == NULL) {
-                    return NGX_ERROR;
-                }
-
-                rv = module->merge_srv_conf(&conf, prev, cur);
-                if (rv != NGX_CONF_OK) {
-                    goto failed;
-                }
-            }
-        }
-
-        if (module->create_loc_conf) {
-            cur = module->create_loc_conf(&conf);
-            if (cur == NULL) {
-                return NGX_ERROR;
-            }
-
-            http_ctx.loc_conf[modules[i]->ctx_index] = cur;
-
-            if (module->merge_loc_conf) {
-                if (modules[i] == &ngx_http_lua_module) {
-                    prev = top_llcf;
-
-                } else if (modules[i] == &ngx_http_core_module) {
-                    prev = top_clcf;
-
-                } else {
-                    prev = module->create_loc_conf(&conf);
-                    if (prev == NULL) {
-                        return NGX_ERROR;
-                    }
-                }
-
-                rv = module->merge_loc_conf(&conf, prev, cur);
-                if (rv != NGX_CONF_OK) {
-                    goto failed;
-                }
-            }
-        }
-    }
-
-    ngx_destroy_pool(conf.temp_pool);
-    conf.temp_pool = NULL;
-
-    c = ngx_http_lua_create_fake_connection(NULL);
-    if (c == NULL) {
-        goto failed;
-    }
-
-    c->log->handler = ngx_http_lua_log_init_worker_error;
-
-    r = ngx_http_lua_create_fake_request(c);
-    if (r == NULL) {
-        goto failed;
-    }
-
-    r->main_conf = http_ctx.main_conf;
-    r->srv_conf = http_ctx.srv_conf;
-    r->loc_conf = http_ctx.loc_conf;
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-#if defined(nginx_version) && nginx_version >= 1003014
-
-#   if nginx_version >= 1009000
-
-    ngx_set_connection_log(r->connection, clcf->error_log);
-
-#   else
-
-    ngx_http_set_connection_log(r->connection, clcf->error_log);
-
-#   endif
-
-#else
-
-    c->log->file = clcf->error_log->file;
-
-    if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
-        c->log->log_level = clcf->error_log->log_level;
-    }
-
-#endif
-
-    ctx = ngx_http_lua_create_ctx(r);
-    if (ctx == NULL) {
-        goto failed;
-    }
-
-    ctx->context = NGX_HTTP_LUA_CONTEXT_INIT_WORKER;
-    ctx->cur_co_ctx = NULL;
-    r->read_event_handler = ngx_http_block_reading;
-
-    ngx_http_lua_set_req(lmcf->lua, r);
-
-    (void) lmcf->init_worker_handler(cycle->log, lmcf, lmcf->lua);
-
-    ngx_destroy_pool(c->pool);
-    return NGX_OK;
-
-failed:
-
-    if (conf.temp_pool) {
-        ngx_destroy_pool(conf.temp_pool);
-    }
-
-    if (c) {
-        ngx_http_lua_close_fake_connection(c);
-    }
-
-    return NGX_ERROR;
-}
-
-
-ngx_int_t
-ngx_http_lua_init_worker_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_worker_src.data,
-                             lmcf->init_worker_src.len, "=init_worker_by_lua")
-             || ngx_http_lua_do_call(log, L);
-
-    return ngx_http_lua_report(log, L, status, "init_worker_by_lua");
-}
-
-
-ngx_int_t
-ngx_http_lua_init_worker_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_worker_src.data)
-             || ngx_http_lua_do_call(log, L);
-
-    return ngx_http_lua_report(log, L, status, "init_worker_by_lua_file");
-}
-
-
-static u_char *
-ngx_http_lua_log_init_worker_error(ngx_log_t *log, u_char *buf, size_t len)
-{
-    u_char              *p;
-
-    if (log->action) {
-        p = ngx_snprintf(buf, len, " while %s", log->action);
-        len -= p - buf;
-        buf = p;
-    }
-
-    return ngx_snprintf(buf, len, ", context: init_worker_by_lua*");
-}
diff --git a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.h b/debian/modules/http-lua/src/ngx_http_lua_initworkerby.h
deleted file mode 100644
index 40b2db0..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_initworkerby.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_INITWORKERBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_INITWORKERBY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_init_worker_by_inline(ngx_log_t *log,
-    ngx_http_lua_main_conf_t *lmcf, lua_State *L);
-
-ngx_int_t ngx_http_lua_init_worker_by_file(ngx_log_t *log,
-    ngx_http_lua_main_conf_t *lmcf, lua_State *L);
-
-ngx_int_t ngx_http_lua_init_worker(ngx_cycle_t *cycle);
-
-
-#endif /* _NGX_HTTP_LUA_INITWORKERBY_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_lex.c b/debian/modules/http-lua/src/ngx_http_lua_lex.c
deleted file mode 100644
index 45cf754..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_lex.c
+++ /dev/null
@@ -1,8251 +0,0 @@
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- *
- * WARNING: DO NOT EVER EDIT THIS FILE!!
- *
- * This file was automatically generated by the re.pl script of sregex's
- * "dfa-multi-re" git branch.
- */
-
-
-#include "ngx_http_lua_lex.h"
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-
-
-#if __GNUC__ > 3
-#    define likely(x)       __builtin_expect((x),1)
-#    define unlikely(x)     __builtin_expect((x),0)
-#else
-#    define likely(x)      (x)
-#    define unlikely(x)    (x)
-#endif
-
-
-#ifndef u_char
-#define u_char          unsigned char
-#endif
-
-
-enum {
-    NO_MATCH = -1,
-};
-
-
-/*
- * ngx_http_lua_lex: the "ovec" array should be allocated by the caller with at
- * least 2 elements.
- */
-int
-ngx_http_lua_lex(const u_char *const s, size_t len, int *const ovec)
-{
-    unsigned i = 0;
-    int matched_0 = -1;
-    int matched_1 = -1;
-    int matched_id = NO_MATCH;  /* (pending) matched regex ID */
-    int c;
-    int caps0_0 = -1;
-    int caps0_10 = -1;
-    int caps0_12 = -1;
-    int caps0_14 = -1;
-    int caps0_2 = -1;
-    int caps0_4 = -1;
-    int caps0_6 = -1;
-    int caps0_8 = -1;
-    int caps1_0 = -1;
-    int caps1_10 = -1;
-    int caps1_12 = -1;
-    int caps1_14 = -1;
-    int caps1_2 = -1;
-    int caps1_4 = -1;
-    int caps1_6 = -1;
-    int caps1_8 = -1;
-    int caps2_0 = -1;
-    int caps2_10 = -1;
-    int caps2_2 = -1;
-    int caps2_4 = -1;
-    int caps2_6 = -1;
-    int caps2_8 = -1;
-    int caps3_10 = -1;
-
-    {  /* DFA node {0} 0 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st0_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_12 = i - 1;
-        goto st2;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_14 = i - 1;
-        goto st3;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 0 to row 1 */
-        /* transfer caps from row 0 to row 2 */
-        /* capture stores */
-        caps0_6 = i - 1;
-        caps1_10 = i - 1;
-        goto st4;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_4 = i - 1;
-        goto st5;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_8 = i - 1;
-        goto st6;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_0 = i - 1;
-        goto st7;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_2 = i - 1;
-        goto st8;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st1;
-    }  /* end state */
-
-    goto st0_error;
-
-st1: {  /* DFA node {1} 1 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st1_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_12 = i - 1;
-        goto st2;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_14 = i - 1;
-        goto st3;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 0 to row 1 */
-        /* transfer caps from row 0 to row 2 */
-        /* capture stores */
-        caps0_6 = i - 1;
-        caps1_10 = i - 1;
-        goto st4;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_4 = i - 1;
-        goto st5;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_8 = i - 1;
-        goto st6;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_0 = i - 1;
-        goto st7;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 0 to row 1 */
-        /* capture stores */
-        caps0_2 = i - 1;
-        goto st8;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st1;
-    }  /* end state */
-
-    goto st1_error;
-
-st2: {  /* DFA node {59,1} 2 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st2_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 1 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 2 */
-        /* transfer caps from row 1 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st13;
-        break;
-        }
-    case 92: {
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st15;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st9;
-    }  /* end state */
-
-    goto st2_error;
-
-st3: {  /* DFA node {72,1} 3 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st3_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 1 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 2 */
-        /* transfer caps from row 1 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st22;
-        break;
-        }
-    case 92: {
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st24;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st18;
-    }  /* end state */
-
-    goto st3_error;
-
-st4: {  /* DFA node {30,50,1} 4 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st4_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        /* transfer caps from row 2 to row 0 */
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps0_12 = i - 1;
-        goto st2;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 0 */
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps0_14 = i - 1;
-        goto st3;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st27;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 0 */
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps0_4 = i - 1;
-        goto st5;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 0 */
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps0_8 = i - 1;
-        goto st6;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 0 */
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps0_0 = i - 1;
-        goto st7;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 0 */
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps0_2 = i - 1;
-        goto st8;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 0 */
-    goto st1;
-    }  /* end state */
-
-    goto st4_error;
-
-st5: {  /* DFA node {21,1} 5 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st5_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_12 = i - 1;
-        goto st2;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_14 = i - 1;
-        goto st3;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 0 */
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps0_6 = i - 1;
-        caps1_10 = i - 1;
-        goto st4;
-        break;
-        }
-    case 61: {
-        goto st28;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st29;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_8 = i - 1;
-        goto st6;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_0 = i - 1;
-        goto st7;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_2 = i - 1;
-        goto st8;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 1 to row 0 */
-    goto st1;
-    }  /* end state */
-
-    goto st5_error;
-
-st6: {  /* DFA node {41,1} 6 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st6_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_12 = i - 1;
-        goto st2;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_14 = i - 1;
-        goto st3;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 0 */
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps0_6 = i - 1;
-        caps1_10 = i - 1;
-        goto st4;
-        break;
-        }
-    case 61: {
-        goto st30;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_4 = i - 1;
-        goto st5;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st31;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_0 = i - 1;
-        goto st7;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_2 = i - 1;
-        goto st8;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 1 to row 0 */
-    goto st1;
-    }  /* end state */
-
-    goto st6_error;
-
-st7: {  /* DFA node {11,1} 7 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_0;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 0;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st8: {  /* DFA node {16,1} 8 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_2;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 1;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st9: {  /* DFA node {65,1} 9 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st9_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 1 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 2 */
-        /* transfer caps from row 1 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st13;
-        break;
-        }
-    case 92: {
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st15;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st9;
-    }  /* end state */
-
-    goto st9_error;
-
-st10: {  /* DFA node {67,59,1} 10 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_12;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 6;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st11: {  /* DFA node {65,72,1} 11 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st11_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st35;
-    }  /* end state */
-
-    goto st11_error;
-
-st12: {  /* DFA node {65,30,50,1} 12 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st12_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 4 */
-        /* transfer caps from row 3 to row 5 */
-        /* capture stores */
-        goto st44;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st13;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 1 */
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st15;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 1 */
-    goto st9;
-    }  /* end state */
-
-    goto st12_error;
-
-st13: {  /* DFA node {65,21,1} 13 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st13_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 61: {
-        goto st45;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st46;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st15;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st9;
-    }  /* end state */
-
-    goto st13_error;
-
-st14: {  /* DFA node {62,1} 14 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st14_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 1 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st48;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st49;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 2 */
-        /* transfer caps from row 1 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st50;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st51;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st52;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st53;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st54;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st47;
-    }  /* end state */
-
-    goto st14_error;
-
-st15: {  /* DFA node {65,41,1} 15 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st15_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 61: {
-        goto st55;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st13;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st56;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st9;
-    }  /* end state */
-
-    goto st15_error;
-
-st16: {  /* DFA node {65,11,1} 16 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_0;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 0;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st17: {  /* DFA node {65,16,1} 17 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_2;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 1;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st18: {  /* DFA node {78,1} 18 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st18_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 1 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 2 */
-        /* transfer caps from row 1 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st22;
-        break;
-        }
-    case 92: {
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st24;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st18;
-    }  /* end state */
-
-    goto st18_error;
-
-st19: {  /* DFA node {78,59,1} 19 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st19_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st60;
-    }  /* end state */
-
-    goto st19_error;
-
-st20: {  /* DFA node {80,72,1} 20 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_14;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 7;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st21: {  /* DFA node {78,30,50,1} 21 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st21_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 4 */
-        /* transfer caps from row 3 to row 5 */
-        /* capture stores */
-        goto st70;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st22;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 1 */
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st24;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 1 */
-    goto st18;
-    }  /* end state */
-
-    goto st21_error;
-
-st22: {  /* DFA node {78,21,1} 22 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st22_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 61: {
-        goto st71;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st72;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st24;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st18;
-    }  /* end state */
-
-    goto st22_error;
-
-st23: {  /* DFA node {75,1} 23 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st23_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 1 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st74;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st75;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 2 */
-        /* transfer caps from row 1 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st76;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st77;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st78;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st79;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st80;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st73;
-    }  /* end state */
-
-    goto st23_error;
-
-st24: {  /* DFA node {78,41,1} 24 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st24_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 61: {
-        goto st81;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st22;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st82;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st18;
-    }  /* end state */
-
-    goto st24_error;
-
-st25: {  /* DFA node {78,11,1} 25 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_0;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 0;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st26: {  /* DFA node {78,16,1} 26 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_2;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 1;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st27: {  /* DFA node {31,51,30,50,1} 27 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 91) {
-            goto st88;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 90)
-            || (c >= 92 && c <= 255))
-        {
-            /* transfer caps from row 1 to row 0 */
-            caps0_10 = caps1_10;
-            goto st87;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st28: {  /* DFA node {23,1} 28 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st28_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_12 = i - 1;
-        goto st2;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_14 = i - 1;
-        goto st3;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 0 */
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps0_6 = i - 1;
-        caps1_10 = i - 1;
-        goto st4;
-        break;
-        }
-    case 61: {
-        goto st28;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st29;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_8 = i - 1;
-        goto st6;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_0 = i - 1;
-        goto st7;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_2 = i - 1;
-        goto st8;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 1 to row 0 */
-    goto st1;
-    }  /* end state */
-
-    goto st28_error;
-
-st29: {  /* DFA node {25,21,1} 29 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_4;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 2;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st30: {  /* DFA node {43,1} 30 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st30_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_12 = i - 1;
-        goto st2;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_14 = i - 1;
-        goto st3;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 0 */
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps0_6 = i - 1;
-        caps1_10 = i - 1;
-        goto st4;
-        break;
-        }
-    case 61: {
-        goto st30;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_4 = i - 1;
-        goto st5;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st31;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_0 = i - 1;
-        goto st7;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 0 */
-        /* capture stores */
-        caps0_2 = i - 1;
-        goto st8;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 1 to row 0 */
-    goto st1;
-    }  /* end state */
-
-    goto st30_error;
-
-st31: {  /* DFA node {45,41,1} 31 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_8;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 4;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st35: {  /* DFA node {65,78,1} 35 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st35_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st35;
-    }  /* end state */
-
-    goto st35_error;
-
-st36: {  /* DFA node {67,78,59,1} 36 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_12;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 6;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st37: {  /* DFA node {65,80,72,1} 37 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_14;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 7;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st38: {  /* DFA node {65,78,30,50,1} 38 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st38_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 4 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 4 to row 5 */
-        /* transfer caps from row 4 to row 6 */
-        /* capture stores */
-        goto st91;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 4 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 4 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st38_error;
-
-st39: {  /* DFA node {65,78,21,1} 39 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st39_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 61: {
-        goto st92;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st93;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st39_error;
-
-st40: {  /* DFA node {62,75,1} 40 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st40_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st95;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st96;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st97;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st98;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st99;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st100;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st101;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st94;
-    }  /* end state */
-
-    goto st40_error;
-
-st41: {  /* DFA node {65,78,41,1} 41 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st41_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 61: {
-        goto st102;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st103;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st41_error;
-
-st42: {  /* DFA node {65,78,11,1} 42 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_0;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 0;
-    if (c != -1) {
-        if (c == 34) {
-            goto st105;
-        }
-        if (c == 39) {
-            goto st106;
-        }
-        if (c == 92) {
-            goto st107;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st104;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st43: {  /* DFA node {65,78,16,1} 43 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_2;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 1;
-    if (c != -1) {
-        if (c == 34) {
-            goto st105;
-        }
-        if (c == 39) {
-            goto st106;
-        }
-        if (c == 92) {
-            goto st107;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st104;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st44: {  /* DFA node {65,31,51,30,50,1} 44 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st109;
-        }
-        if (c == 91) {
-            goto st110;
-        }
-        if (c == 92) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st111;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st108;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st45: {  /* DFA node {65,23,1} 45 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st45_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 61: {
-        goto st45;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st46;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st15;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st9;
-    }  /* end state */
-
-    goto st45_error;
-
-st46: {  /* DFA node {65,25,21,1} 46 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_4;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 2;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st47: {  /* DFA node {63,1} 47 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st47_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 1 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 2 */
-        /* transfer caps from row 1 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st13;
-        break;
-        }
-    case 92: {
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st15;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st9;
-    }  /* end state */
-
-    goto st47_error;
-
-st48: {  /* DFA node {63,59,1} 48 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st48_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st13;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st15;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st9;
-    }  /* end state */
-
-    goto st48_error;
-
-st49: {  /* DFA node {63,72,1} 49 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st49_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st35;
-    }  /* end state */
-
-    goto st49_error;
-
-st50: {  /* DFA node {63,30,50,1} 50 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st50_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 4 */
-        /* transfer caps from row 3 to row 5 */
-        /* capture stores */
-        goto st44;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st13;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 1 */
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st15;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 1 */
-    goto st9;
-    }  /* end state */
-
-    goto st50_error;
-
-st51: {  /* DFA node {63,21,1} 51 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st51_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 61: {
-        goto st45;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st46;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st15;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st9;
-    }  /* end state */
-
-    goto st51_error;
-
-st52: {  /* DFA node {63,41,1} 52 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st52_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 61: {
-        goto st55;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st13;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st56;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st9;
-    }  /* end state */
-
-    goto st52_error;
-
-st53: {  /* DFA node {63,11,1} 53 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_0;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 0;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st54: {  /* DFA node {63,16,1} 54 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_2;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 1;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st55: {  /* DFA node {65,43,1} 55 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st55_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st10;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st11;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st12;
-        break;
-        }
-    case 61: {
-        goto st55;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st13;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st14;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st56;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st16;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st17;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st9;
-    }  /* end state */
-
-    goto st55_error;
-
-st56: {  /* DFA node {65,45,41,1} 56 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_8;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 4;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st57: {  /* DFA node {65} 57 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st57_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        goto st58;
-        break;
-        }
-    case 92: {
-        goto st59;
-        break;
-        }
-    default:
-        break;
-    }
-    if ((c >= 0 && c <= 9)
-        || (c >= 11 && c <= 33)
-        || (c >= 35 && c <= 91)
-        || (c >= 93 && c <= 255))
-    {
-        goto st57;
-    }
-    }  /* end state */
-
-    goto st57_error;
-
-st58: {  /* DFA node {67} 58 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_12;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 6;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st59: {  /* DFA node {62} 59 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st59_error;
-    }
-
-    c = s[i];
-    i++;
-    if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
-        goto st112;
-    }
-    }  /* end state */
-
-    goto st59_error;
-
-st60: {  /* DFA node {78,65,1} 60 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st60_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st60;
-    }  /* end state */
-
-    goto st60_error;
-
-st61: {  /* DFA node {78,67,59,1} 61 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_12;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 6;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st62: {  /* DFA node {80,65,72,1} 62 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_14;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 7;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st63: {  /* DFA node {78,65,30,50,1} 63 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st63_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 4 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 4 to row 5 */
-        /* transfer caps from row 4 to row 6 */
-        /* capture stores */
-        goto st113;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 4 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 4 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st63_error;
-
-st64: {  /* DFA node {78,65,21,1} 64 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st64_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 61: {
-        goto st114;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st115;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st64_error;
-
-st65: {  /* DFA node {75,62,1} 65 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st65_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st117;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st118;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st119;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st120;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st121;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st122;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st123;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c == 92)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st116;
-    }  /* end state */
-
-    goto st65_error;
-
-st66: {  /* DFA node {78,65,41,1} 66 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st66_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 61: {
-        goto st124;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st125;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st66_error;
-
-st67: {  /* DFA node {78,65,11,1} 67 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_0;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 0;
-    if (c != -1) {
-        if (c == 34) {
-            goto st127;
-        }
-        if (c == 39) {
-            goto st128;
-        }
-        if (c == 92) {
-            goto st129;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st126;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st68: {  /* DFA node {78,65,16,1} 68 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_2;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 1;
-    if (c != -1) {
-        if (c == 34) {
-            goto st127;
-        }
-        if (c == 39) {
-            goto st128;
-        }
-        if (c == 92) {
-            goto st129;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st126;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st70: {  /* DFA node {78,31,51,30,50,1} 70 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 39) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st131;
-        }
-        if (c == 91) {
-            goto st132;
-        }
-        if (c == 92) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st133;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st130;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st71: {  /* DFA node {78,23,1} 71 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st71_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 61: {
-        goto st71;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st72;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st24;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st18;
-    }  /* end state */
-
-    goto st71_error;
-
-st72: {  /* DFA node {78,25,21,1} 72 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_4;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 2;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st73: {  /* DFA node {76,1} 73 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st73_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 1 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 1 to row 2 */
-        /* transfer caps from row 1 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st22;
-        break;
-        }
-    case 92: {
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st24;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 1 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st18;
-    }  /* end state */
-
-    goto st73_error;
-
-st74: {  /* DFA node {76,59,1} 74 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st74_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st60;
-    }  /* end state */
-
-    goto st74_error;
-
-st75: {  /* DFA node {76,72,1} 75 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st75_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st22;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st24;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st18;
-    }  /* end state */
-
-    goto st75_error;
-
-st76: {  /* DFA node {76,30,50,1} 76 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st76_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 4 */
-        /* transfer caps from row 3 to row 5 */
-        /* capture stores */
-        goto st70;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st22;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 1 */
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st24;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 1 */
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 1 */
-    goto st18;
-    }  /* end state */
-
-    goto st76_error;
-
-st77: {  /* DFA node {76,21,1} 77 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st77_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 61: {
-        goto st71;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st72;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_8 = i - 1;
-        goto st24;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st18;
-    }  /* end state */
-
-    goto st77_error;
-
-st78: {  /* DFA node {76,41,1} 78 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st78_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 61: {
-        goto st81;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st22;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st82;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st18;
-    }  /* end state */
-
-    goto st78_error;
-
-st79: {  /* DFA node {76,11,1} 79 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_0;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 0;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st80: {  /* DFA node {76,16,1} 80 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_2;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 1;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st81: {  /* DFA node {78,43,1} 81 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st81_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_12 = i - 1;
-        goto st19;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_14 = i - 1;
-        goto st20;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 1 */
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps1_6 = i - 1;
-        caps2_10 = i - 1;
-        goto st21;
-        break;
-        }
-    case 61: {
-        goto st81;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_4 = i - 1;
-        goto st22;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 2 to row 1 */
-        goto st23;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st82;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_0 = i - 1;
-        goto st25;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 1 */
-        /* capture stores */
-        caps1_2 = i - 1;
-        goto st26;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 2 to row 1 */
-    goto st18;
-    }  /* end state */
-
-    goto st81_error;
-
-st82: {  /* DFA node {78,45,41,1} 82 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_8;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 4;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st83: {  /* DFA node {78} 83 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st83_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 39: {
-        goto st84;
-        break;
-        }
-    case 92: {
-        goto st85;
-        break;
-        }
-    default:
-        break;
-    }
-    if ((c >= 0 && c <= 9)
-        || (c >= 11 && c <= 38)
-        || (c >= 40 && c <= 91)
-        || (c >= 93 && c <= 255))
-    {
-        goto st83;
-    }
-    }  /* end state */
-
-    goto st83_error;
-
-st84: {  /* DFA node {80} 84 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_14;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 7;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st85: {  /* DFA node {75} 85 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st85_error;
-    }
-
-    c = s[i];
-    i++;
-    if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
-        goto st134;
-    }
-    }  /* end state */
-
-    goto st85_error;
-
-st87: {  /* DFA node {53} 87 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
-            goto st87;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st88: {  /* DFA node {32,53} 88 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 61) {
-            goto st135;
-        }
-        if (c == 91) {
-            goto st136;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 92 && c <= 255))
-        {
-            /* transfer caps from row 1 to row 0 */
-            caps0_10 = caps1_10;
-            goto st87;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st91: {  /* DFA node {65,78,31,51,30,50,1} 91 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 3 to matched */
-    matched_0 = caps3_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st138;
-        }
-        if (c == 39) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st139;
-        }
-        if (c == 91) {
-            goto st140;
-        }
-        if (c == 92) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st141;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st137;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st92: {  /* DFA node {65,78,23,1} 92 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st92_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 61: {
-        goto st92;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st93;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st92_error;
-
-st93: {  /* DFA node {65,78,25,21,1} 93 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_4;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 2;
-    if (c != -1) {
-        if (c == 34) {
-            goto st105;
-        }
-        if (c == 39) {
-            goto st106;
-        }
-        if (c == 92) {
-            goto st107;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st104;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st94: {  /* DFA node {63,76,1} 94 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st94_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st35;
-    }  /* end state */
-
-    goto st94_error;
-
-st95: {  /* DFA node {63,76,59,1} 95 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st95_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st95_error;
-
-st96: {  /* DFA node {63,76,72,1} 96 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st96_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st96_error;
-
-st97: {  /* DFA node {63,76,30,50,1} 97 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st97_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 4 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 4 to row 5 */
-        /* transfer caps from row 4 to row 6 */
-        /* capture stores */
-        goto st91;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 4 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 4 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st97_error;
-
-st98: {  /* DFA node {63,76,21,1} 98 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st98_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 61: {
-        goto st92;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st93;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st41;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st98_error;
-
-st99: {  /* DFA node {63,76,41,1} 99 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st99_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 61: {
-        goto st102;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st103;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st99_error;
-
-st100: {  /* DFA node {63,76,11,1} 100 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_0;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 0;
-    if (c != -1) {
-        if (c == 34) {
-            goto st105;
-        }
-        if (c == 39) {
-            goto st106;
-        }
-        if (c == 92) {
-            goto st107;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st104;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st101: {  /* DFA node {63,76,16,1} 101 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_2;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 1;
-    if (c != -1) {
-        if (c == 34) {
-            goto st105;
-        }
-        if (c == 39) {
-            goto st106;
-        }
-        if (c == 92) {
-            goto st107;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st104;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st102: {  /* DFA node {65,78,43,1} 102 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st102_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st36;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st37;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st38;
-        break;
-        }
-    case 61: {
-        goto st102;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st39;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st40;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st103;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st42;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st43;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st35;
-    }  /* end state */
-
-    goto st102_error;
-
-st103: {  /* DFA node {65,78,45,41,1} 103 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_8;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 4;
-    if (c != -1) {
-        if (c == 34) {
-            goto st105;
-        }
-        if (c == 39) {
-            goto st106;
-        }
-        if (c == 92) {
-            goto st107;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st104;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st104: {  /* DFA node {65,78} 104 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st104_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        goto st105;
-        break;
-        }
-    case 39: {
-        goto st106;
-        break;
-        }
-    case 92: {
-        goto st107;
-        break;
-        }
-    default:
-        break;
-    }
-    if ((c >= 0 && c <= 9)
-        || (c >= 11 && c <= 33)
-        || (c >= 35 && c <= 38)
-        || (c >= 40 && c <= 91)
-        || (c >= 93 && c <= 255))
-    {
-        goto st104;
-    }
-    }  /* end state */
-
-    goto st104_error;
-
-st105: {  /* DFA node {67,78} 105 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_12;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 6;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st106: {  /* DFA node {65,80} 106 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_14;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 7;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st107: {  /* DFA node {62,75} 107 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st107_error;
-    }
-
-    c = s[i];
-    i++;
-    if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
-        goto st142;
-    }
-    }  /* end state */
-
-    goto st107_error;
-
-st108: {  /* DFA node {65,53} 108 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            goto st109;
-        }
-        if (c == 92) {
-            goto st111;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st108;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st109: {  /* DFA node {67,53} 109 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_12;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 6;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st110: {  /* DFA node {65,32,53} 110 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st109;
-        }
-        if (c == 61) {
-            goto st143;
-        }
-        if (c == 91) {
-            goto st144;
-        }
-        if (c == 92) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st111;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st108;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st111: {  /* DFA node {62,53} 111 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
-            goto st145;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st112: {  /* DFA node {63} 112 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st112_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        goto st58;
-        break;
-        }
-    case 92: {
-        goto st59;
-        break;
-        }
-    default:
-        break;
-    }
-    if ((c >= 0 && c <= 9)
-        || (c >= 11 && c <= 33)
-        || (c >= 35 && c <= 91)
-        || (c >= 93 && c <= 255))
-    {
-        goto st57;
-    }
-    }  /* end state */
-
-    goto st112_error;
-
-st113: {  /* DFA node {78,65,31,51,30,50,1} 113 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 3 to matched */
-    matched_0 = caps3_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st147;
-        }
-        if (c == 39) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st148;
-        }
-        if (c == 91) {
-            goto st149;
-        }
-        if (c == 92) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st150;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st146;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st114: {  /* DFA node {78,65,23,1} 114 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st114_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 61: {
-        goto st114;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st115;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st114_error;
-
-st115: {  /* DFA node {78,65,25,21,1} 115 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_4;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 2;
-    if (c != -1) {
-        if (c == 34) {
-            goto st127;
-        }
-        if (c == 39) {
-            goto st128;
-        }
-        if (c == 92) {
-            goto st129;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st126;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st116: {  /* DFA node {76,63,1} 116 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st116_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 2 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 2 to row 3 */
-        /* transfer caps from row 2 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 2 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    goto st60;
-    }  /* end state */
-
-    goto st116_error;
-
-st117: {  /* DFA node {76,63,59,1} 117 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st117_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st117_error;
-
-st118: {  /* DFA node {76,63,72,1} 118 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st118_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st118_error;
-
-st119: {  /* DFA node {76,63,30,50,1} 119 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st119_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 4 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 4 to row 5 */
-        /* transfer caps from row 4 to row 6 */
-        /* capture stores */
-        goto st113;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 4 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 4 to row 2 */
-        /* transfer caps from row 4 to row 3 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 4 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st119_error;
-
-st120: {  /* DFA node {76,63,21,1} 120 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st120_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 61: {
-        goto st114;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st115;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_8 = i - 1;
-        goto st66;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st120_error;
-
-st121: {  /* DFA node {76,63,41,1} 121 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st121_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 61: {
-        goto st124;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st125;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st121_error;
-
-st122: {  /* DFA node {76,63,11,1} 122 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_0;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 0;
-    if (c != -1) {
-        if (c == 34) {
-            goto st127;
-        }
-        if (c == 39) {
-            goto st128;
-        }
-        if (c == 92) {
-            goto st129;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st126;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st123: {  /* DFA node {76,63,16,1} 123 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_2;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 1;
-    if (c != -1) {
-        if (c == 34) {
-            goto st127;
-        }
-        if (c == 39) {
-            goto st128;
-        }
-        if (c == 92) {
-            goto st129;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st126;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st124: {  /* DFA node {78,65,43,1} 124 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st124_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 10: {
-        /* transfer caps from row 3 to row 0 */
-        goto st1;
-        break;
-        }
-    case 34: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st61;
-        break;
-        }
-    case 39: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        goto st62;
-        break;
-        }
-    case 45: {
-        /* transfer caps from row 3 to row 2 */
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        caps2_6 = i - 1;
-        caps3_10 = i - 1;
-        goto st63;
-        break;
-        }
-    case 61: {
-        goto st124;
-        break;
-        }
-    case 91: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_4 = i - 1;
-        goto st64;
-        break;
-        }
-    case 92: {
-        /* transfer caps from row 3 to row 2 */
-        goto st65;
-        break;
-        }
-    case 93: {
-        /* transfer caps from row 3 to row 4 */
-        /* capture stores */
-        goto st125;
-        break;
-        }
-    case 123: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_0 = i - 1;
-        goto st67;
-        break;
-        }
-    case 125: {
-        /* transfer caps from row 3 to row 2 */
-        /* capture stores */
-        caps2_2 = i - 1;
-        goto st68;
-        break;
-        }
-    default:
-        break;
-    }
-    /* (c >= 0 && c <= 9)
-     * || (c >= 11 && c <= 33)
-     * || (c >= 35 && c <= 38)
-     * || (c >= 40 && c <= 44)
-     * || (c >= 46 && c <= 60)
-     * || (c >= 62 && c <= 90)
-     * || (c >= 94 && c <= 122)
-     * || (c == 124)
-     * || (c >= 126 && c <= 255)
-     */
-    /* transfer caps from row 3 to row 2 */
-    goto st60;
-    }  /* end state */
-
-    goto st124_error;
-
-st125: {  /* DFA node {78,65,45,41,1} 125 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_8;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 4;
-    if (c != -1) {
-        if (c == 34) {
-            goto st127;
-        }
-        if (c == 39) {
-            goto st128;
-        }
-        if (c == 92) {
-            goto st129;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st126;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st126: {  /* DFA node {78,65} 126 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st126_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        goto st127;
-        break;
-        }
-    case 39: {
-        goto st128;
-        break;
-        }
-    case 92: {
-        goto st129;
-        break;
-        }
-    default:
-        break;
-    }
-    if ((c >= 0 && c <= 9)
-        || (c >= 11 && c <= 33)
-        || (c >= 35 && c <= 38)
-        || (c >= 40 && c <= 91)
-        || (c >= 93 && c <= 255))
-    {
-        goto st126;
-    }
-    }  /* end state */
-
-    goto st126_error;
-
-st127: {  /* DFA node {78,67} 127 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_12;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 6;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st128: {  /* DFA node {80,65} 128 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_14;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 7;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st129: {  /* DFA node {75,62} 129 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st129_error;
-    }
-
-    c = s[i];
-    i++;
-    if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
-        goto st151;
-    }
-    }  /* end state */
-
-    goto st129_error;
-
-st130: {  /* DFA node {78,53} 130 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 39) {
-            goto st131;
-        }
-        if (c == 92) {
-            goto st133;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st130;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st131: {  /* DFA node {80,53} 131 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_14;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 7;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st132: {  /* DFA node {78,32,53} 132 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 39) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st131;
-        }
-        if (c == 61) {
-            goto st152;
-        }
-        if (c == 91) {
-            goto st153;
-        }
-        if (c == 92) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st133;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st130;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st133: {  /* DFA node {75,53} 133 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
-            goto st154;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st134: {  /* DFA node {76} 134 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st134_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 39: {
-        goto st84;
-        break;
-        }
-    case 92: {
-        goto st85;
-        break;
-        }
-    default:
-        break;
-    }
-    if ((c >= 0 && c <= 9)
-        || (c >= 11 && c <= 38)
-        || (c >= 40 && c <= 91)
-        || (c >= 93 && c <= 255))
-    {
-        goto st83;
-    }
-    }  /* end state */
-
-    goto st134_error;
-
-st135: {  /* DFA node {34,53} 135 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 61) {
-            goto st135;
-        }
-        if (c == 91) {
-            goto st136;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 92 && c <= 255))
-        {
-            /* transfer caps from row 1 to row 0 */
-            caps0_10 = caps1_10;
-            goto st87;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st136: {  /* DFA node {36,53} 136 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_6;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 3;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st137: {  /* DFA node {65,78,53} 137 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            goto st138;
-        }
-        if (c == 39) {
-            goto st139;
-        }
-        if (c == 92) {
-            goto st141;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st137;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st138: {  /* DFA node {67,78,53} 138 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_12;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 6;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st139: {  /* DFA node {65,80,53} 139 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_14;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 7;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st140: {  /* DFA node {65,78,32,53} 140 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 3 to matched */
-    matched_0 = caps3_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st138;
-        }
-        if (c == 39) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st139;
-        }
-        if (c == 61) {
-            goto st156;
-        }
-        if (c == 91) {
-            goto st157;
-        }
-        if (c == 92) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st141;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st137;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st141: {  /* DFA node {62,75,53} 141 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
-            goto st158;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st142: {  /* DFA node {63,76} 142 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st142_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        goto st105;
-        break;
-        }
-    case 39: {
-        goto st106;
-        break;
-        }
-    case 92: {
-        goto st107;
-        break;
-        }
-    default:
-        break;
-    }
-    if ((c >= 0 && c <= 9)
-        || (c >= 11 && c <= 33)
-        || (c >= 35 && c <= 38)
-        || (c >= 40 && c <= 91)
-        || (c >= 93 && c <= 255))
-    {
-        goto st104;
-    }
-    }  /* end state */
-
-    goto st142_error;
-
-st143: {  /* DFA node {65,34,53} 143 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st109;
-        }
-        if (c == 61) {
-            goto st143;
-        }
-        if (c == 91) {
-            goto st144;
-        }
-        if (c == 92) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st111;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st108;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st144: {  /* DFA node {65,36,53} 144 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_6;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 3;
-    if (c != -1) {
-        if (c == 34) {
-            goto st58;
-        }
-        if (c == 92) {
-            goto st59;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st57;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st145: {  /* DFA node {63,53} 145 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            goto st109;
-        }
-        if (c == 92) {
-            goto st111;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st108;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st146: {  /* DFA node {78,65,53} 146 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            goto st147;
-        }
-        if (c == 39) {
-            goto st148;
-        }
-        if (c == 92) {
-            goto st150;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st146;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st147: {  /* DFA node {78,67,53} 147 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_12;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 6;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st148: {  /* DFA node {80,65,53} 148 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 0 to matched */
-    matched_0 = caps0_14;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 7;
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st149: {  /* DFA node {78,65,32,53} 149 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 3 to matched */
-    matched_0 = caps3_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st147;
-        }
-        if (c == 39) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st148;
-        }
-        if (c == 61) {
-            goto st159;
-        }
-        if (c == 91) {
-            goto st160;
-        }
-        if (c == 92) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st150;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st146;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st150: {  /* DFA node {75,62,53} 150 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if ((c >= 0 && c <= 9) || (c >= 11 && c <= 255)) {
-            goto st161;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st151: {  /* DFA node {76,63} 151 */
-    if (unlikely(i >= len)) {
-        i++;
-        goto st151_error;
-    }
-
-    c = s[i];
-    i++;
-    switch (c) {
-    case 34: {
-        goto st127;
-        break;
-        }
-    case 39: {
-        goto st128;
-        break;
-        }
-    case 92: {
-        goto st129;
-        break;
-        }
-    default:
-        break;
-    }
-    if ((c >= 0 && c <= 9)
-        || (c >= 11 && c <= 33)
-        || (c >= 35 && c <= 38)
-        || (c >= 40 && c <= 91)
-        || (c >= 93 && c <= 255))
-    {
-        goto st126;
-    }
-    }  /* end state */
-
-    goto st151_error;
-
-st152: {  /* DFA node {78,34,53} 152 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 39) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st131;
-        }
-        if (c == 61) {
-            goto st152;
-        }
-        if (c == 91) {
-            goto st153;
-        }
-        if (c == 92) {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st133;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 2 to row 1 */
-            caps1_10 = caps2_10;
-            goto st130;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st153: {  /* DFA node {78,36,53} 153 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_6;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 3;
-    if (c != -1) {
-        if (c == 39) {
-            goto st84;
-        }
-        if (c == 92) {
-            goto st85;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st83;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st154: {  /* DFA node {76,53} 154 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 1 to matched */
-    matched_0 = caps1_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 39) {
-            goto st131;
-        }
-        if (c == 92) {
-            goto st133;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st130;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st156: {  /* DFA node {65,78,34,53} 156 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 3 to matched */
-    matched_0 = caps3_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st138;
-        }
-        if (c == 39) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st139;
-        }
-        if (c == 61) {
-            goto st156;
-        }
-        if (c == 91) {
-            goto st157;
-        }
-        if (c == 92) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st141;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st137;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st157: {  /* DFA node {65,78,36,53} 157 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_6;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 3;
-    if (c != -1) {
-        if (c == 34) {
-            goto st105;
-        }
-        if (c == 39) {
-            goto st106;
-        }
-        if (c == 92) {
-            goto st107;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st104;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st158: {  /* DFA node {63,76,53} 158 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            goto st138;
-        }
-        if (c == 39) {
-            goto st139;
-        }
-        if (c == 92) {
-            goto st141;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st137;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st159: {  /* DFA node {78,65,34,53} 159 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 3 to matched */
-    matched_0 = caps3_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st147;
-        }
-        if (c == 39) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st148;
-        }
-        if (c == 61) {
-            goto st159;
-        }
-        if (c == 91) {
-            goto st160;
-        }
-        if (c == 92) {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st150;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 60)
-            || (c >= 62 && c <= 90)
-            || (c >= 93 && c <= 255))
-        {
-            /* transfer caps from row 3 to row 2 */
-            caps2_10 = caps3_10;
-            goto st146;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st160: {  /* DFA node {78,65,36,53} 160 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_6;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 3;
-    if (c != -1) {
-        if (c == 34) {
-            goto st127;
-        }
-        if (c == 39) {
-            goto st128;
-        }
-        if (c == 92) {
-            goto st129;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st126;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st161: {  /* DFA node {76,63,53} 161 */
-    c = i < len ? s[i] : -1;
-    i++;
-    /* transfer caps from row 2 to matched */
-    matched_0 = caps2_10;
-    /* capture stores */
-    matched_1 = i - 1;
-    matched_id = 5;
-    if (c != -1) {
-        if (c == 34) {
-            goto st147;
-        }
-        if (c == 39) {
-            goto st148;
-        }
-        if (c == 92) {
-            goto st150;
-        }
-        if ((c >= 0 && c <= 9)
-            || (c >= 11 && c <= 33)
-            || (c >= 35 && c <= 38)
-            || (c >= 40 && c <= 91)
-            || (c >= 93 && c <= 255))
-        {
-            goto st146;
-        }
-    }
-    }  /* end state */
-
-    ovec[0] = matched_0;
-    ovec[1] = matched_1;
-    return matched_id;  /* fallback */
-
-st0_error:
-st1_error:
-st2_error:
-st3_error:
-st4_error:
-st5_error:
-st6_error:
-st9_error:
-st11_error:
-st12_error:
-st13_error:
-st14_error:
-st15_error:
-st18_error:
-st19_error:
-st21_error:
-st22_error:
-st23_error:
-st24_error:
-st28_error:
-st30_error:
-st35_error:
-st38_error:
-st39_error:
-st40_error:
-st41_error:
-st45_error:
-st47_error:
-st48_error:
-st49_error:
-st50_error:
-st51_error:
-st52_error:
-st55_error:
-st57_error:
-st59_error:
-st60_error:
-st63_error:
-st64_error:
-st65_error:
-st66_error:
-st71_error:
-st73_error:
-st74_error:
-st75_error:
-st76_error:
-st77_error:
-st78_error:
-st81_error:
-st83_error:
-st85_error:
-st92_error:
-st94_error:
-st95_error:
-st96_error:
-st97_error:
-st98_error:
-st99_error:
-st102_error:
-st104_error:
-st107_error:
-st112_error:
-st114_error:
-st116_error:
-st117_error:
-st118_error:
-st119_error:
-st120_error:
-st121_error:
-st124_error:
-st126_error:
-st129_error:
-st134_error:
-st142_error:
-st151_error:
-
-    if (matched_0 != -1) {
-        ovec[0] = matched_0;
-        ovec[1] = matched_1;
-        return matched_id;  /* fallback */
-    }
-    return NO_MATCH;
-}
diff --git a/debian/modules/http-lua/src/ngx_http_lua_lex.h b/debian/modules/http-lua/src/ngx_http_lua_lex.h
deleted file mode 100644
index 11f102c..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_lex.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_LEX_H_INCLUDED_
-#define _NGX_HTTP_LUA_LEX_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-int ngx_http_lua_lex(const u_char *const s, size_t len, int *const ovec);
-
-
-#endif
diff --git a/debian/modules/http-lua/src/ngx_http_lua_log.c b/debian/modules/http-lua/src/ngx_http_lua_log.c
deleted file mode 100644
index 0042a5e..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_log.c
+++ /dev/null
@@ -1,456 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_log.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_log_ringbuf.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_log_t *log, const char *ident,
-    ngx_uint_t level, lua_State *L);
-static void ngx_http_lua_inject_log_consts(lua_State *L);
-
-
-/**
- * Wrapper of nginx log functionality. Take a log level param and varargs of
- * log message params.
- *
- * @param L Lua state pointer
- * @retval always 0 (don't return values to Lua)
- * */
-int
-ngx_http_lua_ngx_log(lua_State *L)
-{
-    ngx_log_t                   *log;
-    ngx_http_request_t          *r;
-    const char                  *msg;
-    int                          level;
-
-    r = ngx_http_lua_get_req(L);
-
-    if (r && r->connection && r->connection->log) {
-        log = r->connection->log;
-
-    } else {
-        log = ngx_cycle->log;
-    }
-
-    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);
-    }
-
-    /* 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.NOTICE, ...).
- *
- * @param L Lua state pointer
- * @retval always 0 (don't return values to Lua)
- * */
-int
-ngx_http_lua_print(lua_State *L)
-{
-    ngx_log_t                   *log;
-    ngx_http_request_t          *r;
-
-    r = ngx_http_lua_get_req(L);
-
-    if (r && r->connection && r->connection->log) {
-        log = r->connection->log;
-
-    } else {
-        log = ngx_cycle->log;
-    }
-
-    return log_wrapper(log, "[lua] ", NGX_LOG_NOTICE, L);
-}
-
-
-static int
-log_wrapper(ngx_log_t *log, const char *ident, ngx_uint_t level,
-    lua_State *L)
-{
-    u_char              *buf;
-    u_char              *p, *q;
-    ngx_str_t            name;
-    int                  nargs, i;
-    size_t               size, len;
-    size_t               src_len = 0;
-    int                  type;
-    const char          *msg;
-    lua_Debug            ar;
-
-    if (level > log->log_level) {
-        return 0;
-    }
-
-#if 1
-    /* add debug info */
-
-    lua_getstack(L, 1, &ar);
-    lua_getinfo(L, "Snl", &ar);
-
-    /* get the basename of the Lua source file path, stored in q */
-    name.data = (u_char *) ar.short_src;
-    if (name.data == NULL) {
-        name.len = 0;
-
-    } else {
-        p = name.data;
-        while (*p != '\0') {
-            if (*p == '/' || *p == '\\') {
-                name.data = p + 1;
-            }
-            p++;
-        }
-
-        name.len = p - name.data;
-    }
-
-#endif
-
-    nargs = lua_gettop(L);
-
-    size = name.len + NGX_INT_T_LEN + sizeof(":: ") - 1;
-
-    if (*ar.namewhat != '\0' && *ar.what == 'L') {
-        src_len = ngx_strlen(ar.name);
-        size += src_len + sizeof("(): ") - 1;
-    }
-
-    for (i = 1; i <= nargs; i++) {
-        type = lua_type(L, i);
-        switch (type) {
-            case LUA_TNUMBER:
-            case LUA_TSTRING:
-                lua_tolstring(L, i, &len);
-                size += len;
-                break;
-
-            case LUA_TNIL:
-                size += sizeof("nil") - 1;
-                break;
-
-            case LUA_TBOOLEAN:
-                if (lua_toboolean(L, i)) {
-                    size += sizeof("true") - 1;
-
-                } else {
-                    size += sizeof("false") - 1;
-                }
-
-                break;
-
-            case LUA_TTABLE:
-                if (!luaL_callmeta(L, i, "__tostring")) {
-                    return luaL_argerror(L, i, "expected table to have "
-                                         "__tostring metamethod");
-                }
-
-                lua_tolstring(L, -1, &len);
-                size += len;
-                break;
-
-            case LUA_TLIGHTUSERDATA:
-                if (lua_touserdata(L, i) == NULL) {
-                    size += sizeof("null") - 1;
-                    break;
-                }
-
-                continue;
-
-            default:
-                msg = lua_pushfstring(L, "string, number, boolean, or nil "
-                                      "expected, got %s",
-                                      lua_typename(L, type));
-                return luaL_argerror(L, i, msg);
-        }
-    }
-
-    buf = lua_newuserdata(L, size);
-
-    p = ngx_copy(buf, name.data, name.len);
-
-    *p++ = ':';
-
-    p = ngx_snprintf(p, NGX_INT_T_LEN, "%d",
-                     ar.currentline ? ar.currentline : ar.linedefined);
-
-    *p++ = ':'; *p++ = ' ';
-
-    if (*ar.namewhat != '\0' && *ar.what == 'L') {
-        p = ngx_copy(p, ar.name, src_len);
-        *p++ = '(';
-        *p++ = ')';
-        *p++ = ':';
-        *p++ = ' ';
-    }
-
-    for (i = 1; i <= nargs; i++) {
-        type = lua_type(L, i);
-        switch (type) {
-            case LUA_TNUMBER:
-            case LUA_TSTRING:
-                q = (u_char *) lua_tolstring(L, i, &len);
-                p = ngx_copy(p, q, len);
-                break;
-
-            case LUA_TNIL:
-                *p++ = 'n';
-                *p++ = 'i';
-                *p++ = 'l';
-                break;
-
-            case LUA_TBOOLEAN:
-                if (lua_toboolean(L, i)) {
-                    *p++ = 't';
-                    *p++ = 'r';
-                    *p++ = 'u';
-                    *p++ = 'e';
-
-                } else {
-                    *p++ = 'f';
-                    *p++ = 'a';
-                    *p++ = 'l';
-                    *p++ = 's';
-                    *p++ = 'e';
-                }
-
-                break;
-
-            case LUA_TTABLE:
-                luaL_callmeta(L, i, "__tostring");
-                q = (u_char *) lua_tolstring(L, -1, &len);
-                p = ngx_copy(p, q, len);
-                break;
-
-            case LUA_TLIGHTUSERDATA:
-                *p++ = 'n';
-                *p++ = 'u';
-                *p++ = 'l';
-                *p++ = 'l';
-
-                break;
-
-            default:
-                return luaL_error(L, "impossible to reach here");
-        }
-    }
-
-    if (p - buf > (off_t) size) {
-        return luaL_error(L, "buffer error: %d > %d", (int) (p - buf),
-                          (int) size);
-    }
-
-    ngx_log_error(level, log, 0, "%s%*s", ident, (size_t) (p - buf), buf);
-
-    return 0;
-}
-
-
-void
-ngx_http_lua_inject_log_api(lua_State *L)
-{
-    ngx_http_lua_inject_log_consts(L);
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_log);
-    lua_setfield(L, -2, "log");
-
-    lua_pushcfunction(L, ngx_http_lua_print);
-    lua_setglobal(L, "print");
-}
-
-
-static void
-ngx_http_lua_inject_log_consts(lua_State *L)
-{
-    /* {{{ nginx log level constants */
-    lua_pushinteger(L, NGX_LOG_STDERR);
-    lua_setfield(L, -2, "STDERR");
-
-    lua_pushinteger(L, NGX_LOG_EMERG);
-    lua_setfield(L, -2, "EMERG");
-
-    lua_pushinteger(L, NGX_LOG_ALERT);
-    lua_setfield(L, -2, "ALERT");
-
-    lua_pushinteger(L, NGX_LOG_CRIT);
-    lua_setfield(L, -2, "CRIT");
-
-    lua_pushinteger(L, NGX_LOG_ERR);
-    lua_setfield(L, -2, "ERR");
-
-    lua_pushinteger(L, NGX_LOG_WARN);
-    lua_setfield(L, -2, "WARN");
-
-    lua_pushinteger(L, NGX_LOG_NOTICE);
-    lua_setfield(L, -2, "NOTICE");
-
-    lua_pushinteger(L, NGX_LOG_INFO);
-    lua_setfield(L, -2, "INFO");
-
-    lua_pushinteger(L, NGX_LOG_DEBUG);
-    lua_setfield(L, -2, "DEBUG");
-    /* }}} */
-}
-
-
-#ifdef HAVE_INTERCEPT_ERROR_LOG_PATCH
-ngx_int_t
-ngx_http_lua_capture_log_handler(ngx_log_t *log,
-    ngx_uint_t level, u_char *buf, size_t n)
-{
-    ngx_http_lua_log_ringbuf_t  *ringbuf;
-
-    dd("enter");
-
-    ringbuf = (ngx_http_lua_log_ringbuf_t  *)
-                    ngx_cycle->intercept_error_log_data;
-
-    if (level > ringbuf->filter_level) {
-        return NGX_OK;
-    }
-
-    ngx_http_lua_log_ringbuf_write(ringbuf, level, buf, n);
-
-    dd("capture log: %s\n", buf);
-
-    return NGX_OK;
-}
-#endif
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_errlog_set_filter_level(int level, u_char *err, size_t *errlen)
-{
-#ifdef HAVE_INTERCEPT_ERROR_LOG_PATCH
-    ngx_http_lua_log_ringbuf_t     *ringbuf;
-
-    ringbuf = ngx_cycle->intercept_error_log_data;
-
-    if (ringbuf == NULL) {
-        *errlen = ngx_snprintf(err, *errlen,
-                               "directive \"lua_capture_error_log\" is not set")
-                  - err;
-        return NGX_ERROR;
-    }
-
-    if (level > NGX_LOG_DEBUG || level < NGX_LOG_STDERR) {
-        *errlen = ngx_snprintf(err, *errlen, "bad log level: %d", level)
-                  - err;
-        return NGX_ERROR;
-    }
-
-    ringbuf->filter_level = level;
-    return NGX_OK;
-#else
-    *errlen = ngx_snprintf(err, *errlen,
-                           "missing the capture error log patch for nginx")
-              - err;
-    return NGX_ERROR;
-#endif
-}
-
-
-int
-ngx_http_lua_ffi_errlog_get_msg(char **log, int *loglevel, u_char *err,
-    size_t *errlen, double *log_time)
-{
-#ifdef HAVE_INTERCEPT_ERROR_LOG_PATCH
-    ngx_uint_t           loglen;
-
-    ngx_http_lua_log_ringbuf_t     *ringbuf;
-
-    ringbuf = ngx_cycle->intercept_error_log_data;
-
-    if (ringbuf == NULL) {
-        *errlen = ngx_snprintf(err, *errlen,
-                               "directive \"lua_capture_error_log\" is not set")
-                  - err;
-        return NGX_ERROR;
-    }
-
-    if (ringbuf->count == 0) {
-        return NGX_DONE;
-    }
-
-    ngx_http_lua_log_ringbuf_read(ringbuf, loglevel, (void **) log, &loglen,
-                                  log_time);
-    return loglen;
-#else
-    *errlen = ngx_snprintf(err, *errlen,
-                           "missing the capture error log patch for nginx")
-              - err;
-    return NGX_ERROR;
-#endif
-}
-
-
-int
-ngx_http_lua_ffi_errlog_get_sys_filter_level(ngx_http_request_t *r)
-{
-    ngx_log_t                   *log;
-    int                          log_level;
-
-    if (r && r->connection && r->connection->log) {
-        log = r->connection->log;
-
-    } else {
-        log = ngx_cycle->log;
-    }
-
-    log_level = log->log_level;
-    if (log_level == NGX_LOG_DEBUG_ALL) {
-        log_level = NGX_LOG_DEBUG;
-    }
-
-    return log_level;
-}
-
-
-int
-ngx_http_lua_ffi_raw_log(ngx_http_request_t *r, int level, u_char *s,
-    size_t s_len)
-{
-    ngx_log_t           *log;
-
-    if (level > NGX_LOG_DEBUG || level < NGX_LOG_STDERR) {
-        return NGX_ERROR;
-    }
-
-    if (r && r->connection && r->connection->log) {
-        log = r->connection->log;
-
-    } else {
-        log = ngx_cycle->log;
-    }
-
-    ngx_log_error((unsigned) level, log, 0, "%*s", s_len, s);
-
-    return NGX_OK;
-}
-
-#endif
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_log.h b/debian/modules/http-lua/src/ngx_http_lua_log.h
deleted file mode 100644
index 56cd771..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_log.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_LOG_H_INCLUDED_
-#define _NGX_HTTP_LUA_LOG_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_log_api(lua_State *L);
-#ifdef HAVE_INTERCEPT_ERROR_LOG_PATCH
-ngx_int_t ngx_http_lua_capture_log_handler(ngx_log_t *log,
-    ngx_uint_t level, u_char *buf, size_t n);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_LOG_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.c b/debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.c
deleted file mode 100644
index 0464069..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.c
+++ /dev/null
@@ -1,225 +0,0 @@
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_common.h"
-#include "ngx_http_lua_log_ringbuf.h"
-
-
-typedef struct {
-    double      time;
-    unsigned    len;
-    unsigned    log_level;
-} ngx_http_lua_log_ringbuf_header_t;
-
-
-enum {
-    HEADER_LEN = sizeof(ngx_http_lua_log_ringbuf_header_t)
-};
-
-
-static void *ngx_http_lua_log_ringbuf_next_header(
-    ngx_http_lua_log_ringbuf_t *rb);
-static void ngx_http_lua_log_ringbuf_append(
-    ngx_http_lua_log_ringbuf_t *rb, int log_level, void *buf, int n);
-static size_t ngx_http_lua_log_ringbuf_free_spaces(
-    ngx_http_lua_log_ringbuf_t *rb);
-
-
-void
-ngx_http_lua_log_ringbuf_init(ngx_http_lua_log_ringbuf_t *rb, void *buf,
-    size_t len)
-{
-    rb->data = buf;
-    rb->size = len;
-
-    rb->tail = rb->data;
-    rb->head = rb->data;
-    rb->sentinel = rb->data + rb->size;
-    rb->count = 0;
-    rb->filter_level = NGX_LOG_DEBUG;
-
-    return;
-}
-
-
-void
-ngx_http_lua_log_ringbuf_reset(ngx_http_lua_log_ringbuf_t *rb)
-{
-    rb->tail = rb->data;
-    rb->head = rb->data;
-    rb->sentinel = rb->data + rb->size;
-    rb->count = 0;
-
-    return;
-}
-
-
-/*
- * get the next data header, it'll skip the useless data space or
- * placehold data
- */
-static void *
-ngx_http_lua_log_ringbuf_next_header(ngx_http_lua_log_ringbuf_t *rb)
-{
-    /* useless data */
-    if (rb->size - (rb->head - rb->data) < HEADER_LEN)
-    {
-        return rb->data;
-    }
-
-    /* placehold data */
-    if (rb->head >= rb->sentinel) {
-        return rb->data;
-    }
-
-    return rb->head;
-}
-
-
-/* append data to ring buffer directly */
-static void
-ngx_http_lua_log_ringbuf_append(ngx_http_lua_log_ringbuf_t *rb,
-    int log_level, void *buf, int n)
-{
-    ngx_http_lua_log_ringbuf_header_t        *head;
-    ngx_time_t                               *tp;
-
-    head = (ngx_http_lua_log_ringbuf_header_t *) rb->tail;
-    head->len = n;
-    head->log_level = log_level;
-
-    tp = ngx_timeofday();
-    head->time = tp->sec + tp->msec / 1000.0L;
-
-    rb->tail += HEADER_LEN;
-    ngx_memcpy(rb->tail, buf, n);
-    rb->tail += n;
-    rb->count++;
-
-    if (rb->tail > rb->sentinel) {
-        rb->sentinel = rb->tail;
-    }
-
-    return;
-}
-
-
-/* throw away data at head */
-static void
-ngx_http_lua_log_ringbuf_throw_away(ngx_http_lua_log_ringbuf_t *rb)
-{
-    ngx_http_lua_log_ringbuf_header_t       *head;
-
-    if (rb->count == 0) {
-        return;
-    }
-
-    head = (ngx_http_lua_log_ringbuf_header_t *) rb->head;
-
-    rb->head += HEADER_LEN + head->len;
-    rb->count--;
-
-    if (rb->count == 0) {
-        ngx_http_lua_log_ringbuf_reset(rb);
-    }
-
-    rb->head = ngx_http_lua_log_ringbuf_next_header(rb);
-
-    return;
-}
-
-
-/* size of free spaces */
-static size_t
-ngx_http_lua_log_ringbuf_free_spaces(ngx_http_lua_log_ringbuf_t *rb)
-{
-    if (rb->count == 0) {
-        return rb->size;
-    }
-
-    if (rb->tail > rb->head) {
-        return rb->data + rb->size - rb->tail;
-    }
-
-    return rb->head - rb->tail;
-}
-
-
-/*
- * try to write log data to ring buffer, throw away old data
- * if there was not enough free spaces.
- */
-ngx_int_t
-ngx_http_lua_log_ringbuf_write(ngx_http_lua_log_ringbuf_t *rb, int log_level,
-    void *buf, size_t n)
-{
-    if (n + HEADER_LEN > rb->size) {
-        return NGX_ERROR;
-    }
-
-    if (ngx_http_lua_log_ringbuf_free_spaces(rb) < n + HEADER_LEN) {
-        /* if the right space is not enough, mark it as placehold data */
-        if ((size_t)(rb->data + rb->size - rb->tail) < n + HEADER_LEN) {
-
-            while (rb->head >= rb->tail && rb->count) {
-                /* head is after tail, so we will throw away all data between
-                 * head and sentinel */
-                ngx_http_lua_log_ringbuf_throw_away(rb);
-            }
-
-            rb->sentinel = rb->tail;
-            rb->tail = rb->data;
-        }
-
-        while (ngx_http_lua_log_ringbuf_free_spaces(rb) < n + HEADER_LEN) {
-            ngx_http_lua_log_ringbuf_throw_away(rb);
-        }
-    }
-
-    ngx_http_lua_log_ringbuf_append(rb, log_level, buf, n);
-
-    return NGX_OK;
-}
-
-
-/* read log from ring buffer, do reset if all of the logs were readed. */
-ngx_int_t
-ngx_http_lua_log_ringbuf_read(ngx_http_lua_log_ringbuf_t *rb, int *log_level,
-    void **buf, size_t *n, double *log_time)
-{
-    ngx_http_lua_log_ringbuf_header_t       *head;
-
-    if (rb->count == 0) {
-        return NGX_ERROR;
-    }
-
-    head = (ngx_http_lua_log_ringbuf_header_t *) rb->head;
-
-    if (rb->head >= rb->sentinel) {
-        return NGX_ERROR;
-    }
-
-    *log_level = head->log_level;
-    *n = head->len;
-    rb->head += HEADER_LEN;
-    *buf = rb->head;
-    rb->head += head->len;
-
-    if (log_time) {
-        *log_time = head->time;
-    }
-
-    rb->count--;
-
-    if (rb->count == 0) {
-        ngx_http_lua_log_ringbuf_reset(rb);
-    }
-
-    rb->head = ngx_http_lua_log_ringbuf_next_header(rb);
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.h b/debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.h
deleted file mode 100644
index c9c2c2d..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_log_ringbuf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#ifndef _NGX_HTTP_LUA_RINGBUF_H_INCLUDED_
-#define _NGX_HTTP_LUA_RINGBUF_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-typedef struct {
-    ngx_uint_t   filter_level;
-    char        *tail;              /* writed point */
-    char        *head;              /* readed point */
-    char        *data;              /* buffer */
-    char        *sentinel;
-    size_t       size;              /* buffer total size */
-    size_t       count;             /* count of logs */
-} ngx_http_lua_log_ringbuf_t;
-
-
-void ngx_http_lua_log_ringbuf_init(ngx_http_lua_log_ringbuf_t *rb,
-    void *buf, size_t len);
-void ngx_http_lua_log_ringbuf_reset(ngx_http_lua_log_ringbuf_t *rb);
-ngx_int_t ngx_http_lua_log_ringbuf_read(ngx_http_lua_log_ringbuf_t *rb,
-    int *log_level, void **buf, size_t *n, double *log_time);
-ngx_int_t ngx_http_lua_log_ringbuf_write(ngx_http_lua_log_ringbuf_t *rb,
-    int log_level, void *buf, size_t n);
-
-
-#endif /* _NGX_HTTP_LUA_RINGBUF_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_logby.c b/debian/modules/http-lua/src/ngx_http_lua_logby.c
deleted file mode 100644
index 0f1d2f3..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_logby.c
+++ /dev/null
@@ -1,266 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#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"
-#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
-#include <malloc.h>
-#endif
-
-
-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 */
-    ngx_http_lua_set_req(L, r);
-
-    /**
-     * 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_globals_table(L, 0 /* narr */, 1 /* nrec */);
-
-    /*  {{{ make new env inheriting main thread's globals table */
-    lua_createtable(L, 0, 1);    /*  the metatable for the new env */
-    ngx_http_lua_get_globals_table(L);
-    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)
-{
-#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
-    ngx_uint_t                   trim_cycle, trim_nreq;
-    ngx_http_lua_main_conf_t    *lmcf;
-#endif
-    ngx_http_lua_loc_conf_t     *llcf;
-    ngx_http_lua_ctx_t          *ctx;
-
-#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    trim_cycle = lmcf->malloc_trim_cycle;
-
-    if (trim_cycle > 0) {
-
-        dd("cycle: %d", (int) trim_cycle);
-
-        trim_nreq = ++lmcf->malloc_trim_req_count;
-
-        if (trim_nreq >= trim_cycle) {
-            lmcf->malloc_trim_req_count = 0;
-
-#if (NGX_DEBUG)
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "malloc_trim(1) returned %d", malloc_trim(1));
-#else
-            (void) malloc_trim(1);
-#endif
-        }
-    }
-#   if (NGX_DEBUG)
-    else {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "malloc_trim() disabled");
-    }
-#   endif
-#endif
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua log handler, uri:\"%V\" c:%ud", &r->uri,
-                   r->main->count);
-
-    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");
-    return llcf->log_handler(r);
-}
-
-
-ngx_int_t
-ngx_http_lua_log_handler_inline(ngx_http_request_t *r)
-{
-    lua_State                   *L;
-    ngx_int_t                    rc;
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    dd("log by lua inline");
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       llcf->log_src.value.data,
-                                       llcf->log_src.value.len,
-                                       llcf->log_src_key,
-                                       (const char *) llcf->log_chunkname);
-    if (rc != NGX_OK) {
-        return NGX_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_loc_conf_t         *llcf;
-    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;
-    }
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
-                                     llcf->log_src_key);
-    if (rc != NGX_OK) {
-        return NGX_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 occurred 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;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_logby.h b/debian/modules/http-lua/src/ngx_http_lua_logby.h
deleted file mode 100644
index af8aaaa..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_logby.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_LOGBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_LOGBY_H_INCLUDED_
-
-
-#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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_misc.c b/debian/modules/http-lua/src/ngx_http_lua_misc.c
deleted file mode 100644
index f96e2f2..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_misc.c
+++ /dev/null
@@ -1,292 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#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);
-static int ngx_http_lua_ngx_set(lua_State *L);
-static int ngx_http_lua_ngx_req_is_internal(lua_State *L);
-
-
-void
-ngx_http_lua_inject_misc_api(lua_State *L)
-{
-    /* ngx. getter and setter */
-    lua_createtable(L, 0, 2); /* metatable for .ngx */
-    lua_pushcfunction(L, ngx_http_lua_ngx_get);
-    lua_setfield(L, -2, "__index");
-    lua_pushcfunction(L, ngx_http_lua_ngx_set);
-    lua_setfield(L, -2, "__newindex");
-    lua_setmetatable(L, -2);
-}
-
-
-void
-ngx_http_lua_inject_req_misc_api(lua_State *L)
-{
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_is_internal);
-    lua_setfield(L, -2, "is_internal");
-}
-
-
-static int
-ngx_http_lua_ngx_req_is_internal(lua_State *L)
-{
-    ngx_http_request_t  *r;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    lua_pushboolean(L, r->internal == 1);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_get(lua_State *L)
-{
-    int                          status;
-    ngx_http_request_t          *r;
-    u_char                      *p;
-    size_t                       len;
-    ngx_http_lua_ctx_t          *ctx;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    p = (u_char *) luaL_checklstring(L, -1, &len);
-
-    dd("ngx get %s", p);
-
-    if (len == sizeof("status") - 1
-        && ngx_strncmp(p, "status", sizeof("status") - 1) == 0)
-    {
-        ngx_http_lua_check_fake_request(L, r);
-
-        if (r->err_status) {
-            status = r->err_status;
-
-        } else if (r->headers_out.status) {
-            status = r->headers_out.status;
-
-        } else if (r->http_version == NGX_HTTP_VERSION_9) {
-            status = 9;
-
-        } else {
-            status = 0;
-        }
-
-        lua_pushinteger(L, status);
-        return 1;
-    }
-
-    if (len == sizeof("ctx") - 1
-        && ngx_strncmp(p, "ctx", sizeof("ctx") - 1) == 0)
-    {
-        return ngx_http_lua_ngx_get_ctx(L);
-    }
-
-    if (len == sizeof("is_subrequest") - 1
-        && ngx_strncmp(p, "is_subrequest", sizeof("is_subrequest") - 1) == 0)
-    {
-        lua_pushboolean(L, r != r->main);
-        return 1;
-    }
-
-    if (len == sizeof("headers_sent") - 1
-        && ngx_strncmp(p, "headers_sent", sizeof("headers_sent") - 1) == 0)
-    {
-        ngx_http_lua_check_fake_request(L, r);
-
-        dd("headers sent: %d", r->header_sent || ctx->header_sent);
-
-        lua_pushboolean(L, r->header_sent || ctx->header_sent);
-        return 1;
-    }
-
-    dd("key %s not matched", p);
-
-    lua_pushnil(L);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_set(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    u_char                      *p;
-    size_t                       len;
-
-    /* we skip the first argument that is the table */
-    p = (u_char *) luaL_checklstring(L, 2, &len);
-
-    if (len == sizeof("status") - 1
-        && ngx_strncmp(p, "status", sizeof("status") - 1) == 0)
-    {
-        r = ngx_http_lua_get_req(L);
-        if (r == NULL) {
-            return luaL_error(L, "no request object found");
-        }
-
-        if (r->header_sent) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "attempt to set ngx.status after sending out "
-                          "response headers");
-            return 0;
-        }
-
-        if (r->err_status) {
-            r->err_status = 0;
-        }
-
-        ngx_http_lua_check_fake_request(L, r);
-
-        /* get the value */
-        r->headers_out.status = (ngx_uint_t) luaL_checknumber(L, 3);
-
-        if (r->headers_out.status == 101) {
-            /*
-             * XXX work-around a bug in the Nginx core that 101 does
-             * not have a default status line
-             */
-
-            ngx_str_set(&r->headers_out.status_line, "101 Switching Protocols");
-
-        } else {
-            r->headers_out.status_line.len = 0;
-        }
-
-        return 0;
-    }
-
-    if (len == sizeof("ctx") - 1
-        && ngx_strncmp(p, "ctx", sizeof("ctx") - 1) == 0)
-    {
-        r = ngx_http_lua_get_req(L);
-        if (r == NULL) {
-            return luaL_error(L, "no request object found");
-        }
-
-        return ngx_http_lua_ngx_set_ctx(L);
-    }
-
-    lua_rawset(L, -3);
-    return 0;
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_get_resp_status(ngx_http_request_t *r)
-{
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    if (r->err_status) {
-        return r->err_status;
-
-    } else if (r->headers_out.status) {
-        return r->headers_out.status;
-
-    } else if (r->http_version == NGX_HTTP_VERSION_9) {
-        return 9;
-
-    } else {
-        return 0;
-    }
-}
-
-
-int
-ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int status)
-{
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    if (r->header_sent) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "attempt to set ngx.status after sending out "
-                      "response headers");
-        return NGX_DECLINED;
-    }
-
-    r->headers_out.status = status;
-
-    if (r->err_status) {
-        r->err_status = 0;
-    }
-
-    if (status == 101) {
-        /*
-         * XXX work-around a bug in the Nginx core older than 1.5.5
-         * that 101 does not have a default status line
-         */
-
-        ngx_str_set(&r->headers_out.status_line, "101 Switching Protocols");
-
-    } else {
-        r->headers_out.status_line.len = 0;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_is_subrequest(ngx_http_request_t *r)
-{
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    return r != r->main;
-}
-
-
-int
-ngx_http_lua_ffi_headers_sent(ngx_http_request_t *r)
-{
-    ngx_http_lua_ctx_t          *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
-    }
-
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    return r->header_sent ? 1 : 0;
-}
-#endif /* NGX_LUA_NO_FFI_API */
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_misc.h b/debian/modules/http-lua/src/ngx_http_lua_misc.h
deleted file mode 100644
index c26d869..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_misc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_MISC_H_INCLUDED_
-#define _NGX_HTTP_LUA_MISC_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_misc_api(lua_State *L);
-
-void ngx_http_lua_inject_req_misc_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_MISC_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_module.c b/debian/modules/http-lua/src/ngx_http_lua_module.c
deleted file mode 100644
index ae8bc0e..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_module.c
+++ /dev/null
@@ -1,1312 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_directive.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_initworkerby.h"
-#include "ngx_http_lua_probe.h"
-#include "ngx_http_lua_semaphore.h"
-#include "ngx_http_lua_balancer.h"
-#include "ngx_http_lua_ssl_certby.h"
-#include "ngx_http_lua_ssl_session_storeby.h"
-#include "ngx_http_lua_ssl_session_fetchby.h"
-#include "ngx_http_lua_headers.h"
-
-
-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_srv_conf(ngx_conf_t *cf);
-static char *ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent,
-    void *child);
-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 ngx_int_t ngx_http_lua_init(ngx_conf_t *cf);
-static char *ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data);
-#if (NGX_HTTP_SSL)
-static ngx_int_t ngx_http_lua_set_ssl(ngx_conf_t *cf,
-    ngx_http_lua_loc_conf_t *llcf);
-#endif
-static char *ngx_http_lua_malloc_trim(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-
-
-static ngx_conf_post_t  ngx_http_lua_lowat_post =
-    { ngx_http_lua_lowat_check };
-
-
-static volatile ngx_cycle_t  *ngx_http_lua_prev_cycle = NULL;
-
-
-#if (NGX_HTTP_SSL) && defined(nginx_version) && nginx_version >= 1001013
-
-static ngx_conf_bitmask_t  ngx_http_lua_ssl_protocols[] = {
-    { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
-    { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
-    { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
-    { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
-    { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
-#ifdef NGX_SSL_TLSv1_3
-    { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
-#endif
-    { ngx_null_string, 0 }
-};
-
-#endif
-
-
-static ngx_command_t ngx_http_lua_cmds[] = {
-
-    { ngx_string("lua_max_running_timers"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, max_running_timers),
-      NULL },
-
-    { ngx_string("lua_max_pending_timers"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, max_pending_timers),
-      NULL },
-
-    { ngx_string("lua_shared_dict"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE2,
-      ngx_http_lua_shared_dict,
-      0,
-      0,
-      NULL },
-
-    { ngx_string("lua_capture_error_log"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_capture_error_log,
-      0,
-      0,
-      NULL },
-
-#if (NGX_PCRE)
-    { ngx_string("lua_regex_cache_max_entries"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, regex_cache_max_entries),
-      NULL },
-
-    { ngx_string("lua_regex_match_limit"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, regex_match_limit),
-      NULL },
-#endif
-
-    { ngx_string("lua_package_cpath"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_package_cpath,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("lua_package_path"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_package_path,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("lua_code_cache"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_FLAG,
-      ngx_http_lua_code_cache,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, enable_code_cache),
-      NULL },
-
-    { ngx_string("lua_need_request_body"),
-      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, 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_block"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_init_by_lua_block,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_init_by_inline },
-
-    { ngx_string("init_by_lua"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_init_by_lua,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      0,
-      (void *) 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,
-      (void *) ngx_http_lua_init_by_file },
-
-    { ngx_string("init_worker_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_init_worker_by_lua_block,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_init_worker_by_inline },
-
-    { ngx_string("init_worker_by_lua"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_init_worker_by_lua,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_init_worker_by_inline },
-
-    { ngx_string("init_worker_by_lua_file"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_init_worker_by_lua,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_init_worker_by_file },
-
-#if defined(NDK) && NDK
-    /* set_by_lua $res { inline Lua code } [$arg1 [$arg2 [...]]] */
-    { ngx_string("set_by_lua_block"),
-      NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                       |NGX_CONF_1MORE|NGX_CONF_BLOCK,
-      ngx_http_lua_set_by_lua_block,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_filter_set_by_lua_inline },
-
-    /* set_by_lua $res <inline script> [$arg1 [$arg2 [...]]] */
-    { ngx_string("set_by_lua"),
-      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,
-      (void *) ngx_http_lua_filter_set_by_lua_inline },
-
-    /* set_by_lua_file $res rel/or/abs/path/to/script [$arg1 [$arg2 [..]]] */
-    { ngx_string("set_by_lua_file"),
-      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,
-      (void *) ngx_http_lua_filter_set_by_lua_file },
-#endif
-
-    /* rewrite_by_lua "<inline script>" */
-    { ngx_string("rewrite_by_lua"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_TAKE1,
-      ngx_http_lua_rewrite_by_lua,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_rewrite_handler_inline },
-
-    /* rewrite_by_lua_block { <inline script> } */
-    { ngx_string("rewrite_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_rewrite_by_lua_block,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_rewrite_handler_inline },
-
-    /* access_by_lua "<inline script>" */
-    { ngx_string("access_by_lua"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_TAKE1,
-      ngx_http_lua_access_by_lua,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_access_handler_inline },
-
-    /* access_by_lua_block { <inline script> } */
-    { ngx_string("access_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_access_by_lua_block,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_access_handler_inline },
-
-    /* content_by_lua "<inline script>" */
-    { ngx_string("content_by_lua"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_content_by_lua,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_content_handler_inline },
-
-    /* content_by_lua_block { <inline script> } */
-    { ngx_string("content_by_lua_block"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_content_by_lua_block,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_content_handler_inline },
-
-    /* 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_log_by_lua,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_log_handler_inline },
-
-    /* log_by_lua_block { <inline script> } */
-    { ngx_string("log_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_log_by_lua_block,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) 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
-                        |NGX_CONF_TAKE1,
-      ngx_http_lua_rewrite_by_lua,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_rewrite_handler_file },
-
-    { ngx_string("rewrite_by_lua_no_postpone"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, postponed_to_rewrite_phase_end),
-      NULL },
-
-    { ngx_string("access_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_access_by_lua,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_access_handler_file },
-
-    { ngx_string("access_by_lua_no_postpone"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(ngx_http_lua_main_conf_t, postponed_to_access_phase_end),
-      NULL },
-
-    /* content_by_lua_file rel/or/abs/path/to/script */
-    { ngx_string("content_by_lua_file"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_content_by_lua,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) 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,
-      (void *) 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,
-      (void *) ngx_http_lua_header_filter_inline },
-
-    /* header_filter_by_lua_block { <inline script> } */
-    { ngx_string("header_filter_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_header_filter_by_lua_block,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) 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,
-      ngx_http_lua_header_filter_by_lua,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) 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,
-      (void *) ngx_http_lua_body_filter_inline },
-
-    /* body_filter_by_lua_block { <inline script> } */
-    { ngx_string("body_filter_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_body_filter_by_lua_block,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      (void *) 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,
-      (void *) ngx_http_lua_body_filter_file },
-
-    { ngx_string("balancer_by_lua_block"),
-      NGX_HTTP_UPS_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_balancer_by_lua_block,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_balancer_handler_inline },
-
-    { ngx_string("balancer_by_lua_file"),
-      NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_balancer_by_lua,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_balancer_handler_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,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, keepalive_timeout),
-      NULL },
-
-    { ngx_string("lua_socket_connect_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
-          |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, connect_timeout),
-      NULL },
-
-    { ngx_string("lua_socket_send_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
-          |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, send_timeout),
-      NULL },
-
-    { ngx_string("lua_socket_send_lowat"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
-          |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, send_lowat),
-      &ngx_http_lua_lowat_post },
-
-    { ngx_string("lua_socket_buffer_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
-          |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, buffer_size),
-      NULL },
-
-    { ngx_string("lua_socket_pool_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
-                        |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, pool_size),
-      NULL },
-
-    { ngx_string("lua_socket_read_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
-          |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, read_timeout),
-      NULL },
-
-    { ngx_string("lua_http10_buffering"),
-      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, 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_string("lua_use_default_type"),
-      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, use_default_type),
-      NULL },
-
-#if (NGX_HTTP_SSL)
-
-#   if defined(nginx_version) && nginx_version >= 1001013
-
-    { ngx_string("lua_ssl_protocols"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_conf_set_bitmask_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, ssl_protocols),
-      &ngx_http_lua_ssl_protocols },
-
-#   endif
-
-    { ngx_string("lua_ssl_ciphers"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, ssl_ciphers),
-      NULL },
-
-    { ngx_string("ssl_certificate_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_ssl_cert_by_lua_block,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_ssl_cert_handler_inline },
-
-    { ngx_string("ssl_certificate_by_lua_file"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_ssl_cert_by_lua,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_ssl_cert_handler_file },
-
-    { ngx_string("ssl_session_store_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_ssl_sess_store_by_lua_block,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_ssl_sess_store_handler_inline },
-
-    { ngx_string("ssl_session_store_by_lua_file"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_ssl_sess_store_by_lua,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_ssl_sess_store_handler_file },
-
-    { ngx_string("ssl_session_fetch_by_lua_block"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_http_lua_ssl_sess_fetch_by_lua_block,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_ssl_sess_fetch_handler_inline },
-
-    { ngx_string("ssl_session_fetch_by_lua_file"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_ssl_sess_fetch_by_lua,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      0,
-      (void *) ngx_http_lua_ssl_sess_fetch_handler_file },
-
-    { ngx_string("lua_ssl_verify_depth"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, ssl_verify_depth),
-      NULL },
-
-    { ngx_string("lua_ssl_trusted_certificate"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, ssl_trusted_certificate),
-      NULL },
-
-    { ngx_string("lua_ssl_crl"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_lua_loc_conf_t, ssl_crl),
-      NULL },
-
-#endif  /* NGX_HTTP_SSL */
-
-     { ngx_string("lua_malloc_trim"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_lua_malloc_trim,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      0,
-      NULL },
-
-    ngx_null_command
-};
-
-
-ngx_http_module_t ngx_http_lua_module_ctx = {
-    NULL,                             /*  preconfiguration */
-    ngx_http_lua_init,                /*  postconfiguration */
-
-    ngx_http_lua_create_main_conf,    /*  create main configuration */
-    ngx_http_lua_init_main_conf,      /*  init main configuration */
-
-    ngx_http_lua_create_srv_conf,     /*  create server configuration */
-    ngx_http_lua_merge_srv_conf,      /*  merge server configuration */
-
-    ngx_http_lua_create_loc_conf,     /*  create location configuration */
-    ngx_http_lua_merge_loc_conf       /*  merge location configuration */
-};
-
-
-ngx_module_t ngx_http_lua_module = {
-    NGX_MODULE_V1,
-    &ngx_http_lua_module_ctx,   /*  module context */
-    ngx_http_lua_cmds,          /*  module directives */
-    NGX_HTTP_MODULE,            /*  module type */
-    NULL,                       /*  init master */
-    NULL,                       /*  init module */
-    ngx_http_lua_init_worker,   /*  init process */
-    NULL,                       /*  init thread */
-    NULL,                       /*  exit thread */
-    NULL,                       /*  exit process */
-    NULL,                       /*  exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_int_t
-ngx_http_lua_init(ngx_conf_t *cf)
-{
-    int                         multi_http_blocks;
-    ngx_int_t                   rc;
-    ngx_array_t                *arr;
-    ngx_http_handler_pt        *h;
-    volatile ngx_cycle_t       *saved_cycle;
-    ngx_http_core_main_conf_t  *cmcf;
-    ngx_http_lua_main_conf_t   *lmcf;
-#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
-    ngx_pool_cleanup_t         *cln;
-#endif
-
-    lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_lua_module);
-
-    if (ngx_http_lua_prev_cycle != ngx_cycle) {
-        ngx_http_lua_prev_cycle = ngx_cycle;
-        multi_http_blocks = 0;
-
-    } else {
-        multi_http_blocks = 1;
-    }
-
-    if (multi_http_blocks || 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;
-    }
-
-    if (lmcf->postponed_to_access_phase_end == NGX_CONF_UNSET) {
-        lmcf->postponed_to_access_phase_end = 0;
-    }
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    if (lmcf->requires_rewrite) {
-        h = ngx_array_push(&cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers);
-        if (h == NULL) {
-            return NGX_ERROR;
-        }
-
-        *h = ngx_http_lua_rewrite_handler;
-    }
-
-    if (lmcf->requires_access) {
-        h = ngx_array_push(&cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers);
-        if (h == NULL) {
-            return NGX_ERROR;
-        }
-
-        *h = ngx_http_lua_access_handler;
-    }
-
-    dd("requires log: %d", (int) lmcf->requires_log);
-
-    if (lmcf->requires_log) {
-        arr = &cmcf->phases[NGX_HTTP_LOG_PHASE].handlers;
-        h = ngx_array_push(arr);
-        if (h == NULL) {
-            return NGX_ERROR;
-        }
-
-        if (arr->nelts > 1) {
-            h = arr->elts;
-            ngx_memmove(&h[1], h,
-                        (arr->nelts - 1) * sizeof(ngx_http_handler_pt));
-        }
-
-        *h = ngx_http_lua_log_handler;
-    }
-
-    if (multi_http_blocks || lmcf->requires_header_filter) {
-        rc = ngx_http_lua_header_filter_init();
-        if (rc != NGX_OK) {
-            return rc;
-        }
-    }
-
-    if (multi_http_blocks || lmcf->requires_body_filter) {
-        rc = ngx_http_lua_body_filter_init();
-        if (rc != NGX_OK) {
-            return rc;
-        }
-    }
-
-#ifndef NGX_LUA_NO_FFI_API
-    /* add the cleanup of semaphores after the lua_close */
-    cln = ngx_pool_cleanup_add(cf->pool, 0);
-    if (cln == NULL) {
-        return NGX_ERROR;
-    }
-
-    cln->data = lmcf;
-    cln->handler = ngx_http_lua_sema_mm_cleanup;
-#endif
-
-#if nginx_version >= 1011011
-    cln = ngx_pool_cleanup_add(cf->pool, 0);
-    if (cln == NULL) {
-        return NGX_ERROR;
-    }
-
-    cln->data = lmcf;
-    cln->handler = ngx_http_lua_ngx_raw_header_cleanup;
-#endif
-
-    if (lmcf->lua == NULL) {
-        dd("initializing lua vm");
-
-        ngx_http_lua_content_length_hash =
-                                  ngx_http_lua_hash_literal("content-length");
-        ngx_http_lua_location_hash = ngx_http_lua_hash_literal("location");
-
-        lmcf->lua = ngx_http_lua_init_vm(NULL, cf->cycle, cf->pool, lmcf,
-                                         cf->log, NULL);
-        if (lmcf->lua == NULL) {
-            ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
-                               "failed to initialize Lua VM");
-            return NGX_ERROR;
-        }
-
-        if (!lmcf->requires_shm && lmcf->init_handler) {
-            saved_cycle = ngx_cycle;
-            ngx_cycle = cf->cycle;
-
-            rc = lmcf->init_handler(cf->log, lmcf, lmcf->lua);
-
-            ngx_cycle = saved_cycle;
-
-            if (rc != NGX_OK) {
-                /* an error happened */
-                return NGX_ERROR;
-            }
-        }
-
-        dd("Lua VM initialized!");
-    }
-
-    return NGX_OK;
-}
-
-
-static char *
-ngx_http_lua_lowat_check(ngx_conf_t *cf, void *post, void *data)
-{
-#if (NGX_FREEBSD)
-    ssize_t *np = data;
-
-    if ((u_long) *np >= ngx_freebsd_net_inet_tcp_sendspace) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"lua_send_lowat\" must be less than %d "
-                           "(sysctl net.inet.tcp.sendspace)",
-                           ngx_freebsd_net_inet_tcp_sendspace);
-
-        return NGX_CONF_ERROR;
-    }
-
-#elif !(NGX_HAVE_SO_SNDLOWAT)
-    ssize_t *np = data;
-
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                       "\"lua_send_lowat\" is not supported, ignored");
-
-    *np = 0;
-
-#endif
-
-    return NGX_CONF_OK;
-}
-
-
-static void *
-ngx_http_lua_create_main_conf(ngx_conf_t *cf)
-{
-#ifndef NGX_LUA_NO_FFI_API
-    ngx_int_t       rc;
-#endif
-
-    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->pending_timers = 0;
-     *      lmcf->running_timers = 0;
-     *      lmcf->watcher = NULL;
-     *      lmcf->regex_cache_entries = 0;
-     *      lmcf->jit_stack = NULL;
-     *      lmcf->shm_zones = NULL;
-     *      lmcf->init_handler = NULL;
-     *      lmcf->init_src = { 0, NULL };
-     *      lmcf->shm_zones_inited = 0;
-     *      lmcf->shdict_zones = NULL;
-     *      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;
-    lmcf->max_pending_timers = NGX_CONF_UNSET;
-    lmcf->max_running_timers = NGX_CONF_UNSET;
-#if (NGX_PCRE)
-    lmcf->regex_cache_max_entries = NGX_CONF_UNSET;
-    lmcf->regex_match_limit = NGX_CONF_UNSET;
-#endif
-    lmcf->postponed_to_rewrite_phase_end = NGX_CONF_UNSET;
-    lmcf->postponed_to_access_phase_end = NGX_CONF_UNSET;
-
-#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
-    lmcf->malloc_trim_cycle = NGX_CONF_UNSET_UINT;
-#endif
-
-#ifndef NGX_LUA_NO_FFI_API
-    rc = ngx_http_lua_sema_mm_init(cf, lmcf);
-    if (rc != NGX_OK) {
-        return NULL;
-    }
-
-    dd("nginx Lua module main config structure initialized!");
-#endif
-
-    return lmcf;
-}
-
-
-static 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;
-    }
-
-    if (lmcf->regex_match_limit == NGX_CONF_UNSET) {
-        lmcf->regex_match_limit = 0;
-    }
-#endif
-
-    if (lmcf->max_pending_timers == NGX_CONF_UNSET) {
-        lmcf->max_pending_timers = 1024;
-    }
-
-    if (lmcf->max_running_timers == NGX_CONF_UNSET) {
-        lmcf->max_running_timers = 256;
-    }
-
-#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
-    if (lmcf->malloc_trim_cycle == NGX_CONF_UNSET_UINT) {
-        lmcf->malloc_trim_cycle = 1000;  /* number of reqs */
-    }
-#endif
-
-    lmcf->cycle = cf->cycle;
-
-    return NGX_CONF_OK;
-}
-
-
-static void *
-ngx_http_lua_create_srv_conf(ngx_conf_t *cf)
-{
-    ngx_http_lua_srv_conf_t     *lscf;
-
-    lscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_srv_conf_t));
-    if (lscf == NULL) {
-        return NULL;
-    }
-
-    /* set by ngx_pcalloc:
-     *      lscf->srv.ssl_cert_handler = NULL;
-     *      lscf->srv.ssl_cert_src = { 0, NULL };
-     *      lscf->srv.ssl_cert_src_key = NULL;
-     *
-     *      lscf->srv.ssl_session_store_handler = NULL;
-     *      lscf->srv.ssl_session_store_src = { 0, NULL };
-     *      lscf->srv.ssl_session_store_src_key = NULL;
-     *
-     *      lscf->srv.ssl_session_fetch_handler = NULL;
-     *      lscf->srv.ssl_session_fetch_src = { 0, NULL };
-     *      lscf->srv.ssl_session_fetch_src_key = NULL;
-     *
-     *      lscf->balancer.handler = NULL;
-     *      lscf->balancer.src = { 0, NULL };
-     *      lscf->balancer.src_key = NULL;
-     */
-
-    return lscf;
-}
-
-
-static char *
-ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-#if (NGX_HTTP_SSL)
-
-    ngx_http_lua_srv_conf_t *prev = parent;
-    ngx_http_lua_srv_conf_t *conf = child;
-    ngx_http_ssl_srv_conf_t *sscf;
-
-    dd("merge srv conf");
-
-    if (conf->srv.ssl_cert_src.len == 0) {
-        conf->srv.ssl_cert_src = prev->srv.ssl_cert_src;
-        conf->srv.ssl_cert_src_key = prev->srv.ssl_cert_src_key;
-        conf->srv.ssl_cert_handler = prev->srv.ssl_cert_handler;
-    }
-
-    if (conf->srv.ssl_cert_src.len) {
-        sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
-        if (sscf == NULL || sscf->ssl.ctx == NULL) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no ssl configured for the server");
-
-            return NGX_CONF_ERROR;
-        }
-
-#ifdef LIBRESSL_VERSION_NUMBER
-
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "LibreSSL does not support ssl_certificate_by_lua*");
-        return NGX_CONF_ERROR;
-
-#else
-
-#   if OPENSSL_VERSION_NUMBER >= 0x1000205fL
-
-        SSL_CTX_set_cert_cb(sscf->ssl.ctx, ngx_http_lua_ssl_cert_handler, NULL);
-
-#   else
-
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "OpenSSL too old to support ssl_certificate_by_lua*");
-        return NGX_CONF_ERROR;
-
-#   endif
-
-#endif
-    }
-
-    if (conf->srv.ssl_sess_store_src.len == 0) {
-        conf->srv.ssl_sess_store_src = prev->srv.ssl_sess_store_src;
-        conf->srv.ssl_sess_store_src_key = prev->srv.ssl_sess_store_src_key;
-        conf->srv.ssl_sess_store_handler = prev->srv.ssl_sess_store_handler;
-    }
-
-    if (conf->srv.ssl_sess_store_src.len) {
-        sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
-        if (sscf && sscf->ssl.ctx) {
-#ifdef LIBRESSL_VERSION_NUMBER
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "LibreSSL does not support "
-                          "ssl_session_store_by_lua*");
-
-            return NGX_CONF_ERROR;
-#else
-            SSL_CTX_sess_set_new_cb(sscf->ssl.ctx,
-                                    ngx_http_lua_ssl_sess_store_handler);
-#endif
-        }
-    }
-
-    if (conf->srv.ssl_sess_fetch_src.len == 0) {
-        conf->srv.ssl_sess_fetch_src = prev->srv.ssl_sess_fetch_src;
-        conf->srv.ssl_sess_fetch_src_key = prev->srv.ssl_sess_fetch_src_key;
-        conf->srv.ssl_sess_fetch_handler = prev->srv.ssl_sess_fetch_handler;
-    }
-
-    if (conf->srv.ssl_sess_fetch_src.len) {
-        sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
-        if (sscf && sscf->ssl.ctx) {
-#ifdef LIBRESSL_VERSION_NUMBER
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "LibreSSL does not support "
-                          "ssl_session_fetch_by_lua*");
-
-            return NGX_CONF_ERROR;
-#else
-            SSL_CTX_sess_set_get_cb(sscf->ssl.ctx,
-                                    ngx_http_lua_ssl_sess_fetch_handler);
-#endif
-        }
-    }
-
-#endif  /* NGX_HTTP_SSL */
-    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 NULL;
-    }
-
-    /* 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->ssl = 0;
-     *      conf->ssl_protocols = 0;
-     *      conf->ssl_ciphers = { 0, NULL };
-     *      conf->ssl_trusted_certificate = { 0, NULL };
-     *      conf->ssl_crl = { 0, 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->use_default_type   = 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;
-
-#if (NGX_HTTP_SSL)
-    conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
-#endif
-
-    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;
-        conf->rewrite_chunkname = prev->rewrite_chunkname;
-    }
-
-    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;
-        conf->access_chunkname = prev->access_chunkname;
-    }
-
-    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;
-        conf->content_chunkname = prev->content_chunkname;
-    }
-
-    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;
-        conf->log_chunkname = prev->log_chunkname;
-    }
-
-    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;
-    }
-
-#if (NGX_HTTP_SSL)
-
-#   if defined(nginx_version) && nginx_version >= 1001013
-
-    ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
-                                 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3
-                                  |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
-                                  |NGX_SSL_TLSv1_2));
-
-#   endif
-
-    ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
-                             "DEFAULT");
-
-    ngx_conf_merge_uint_value(conf->ssl_verify_depth,
-                              prev->ssl_verify_depth, 1);
-    ngx_conf_merge_str_value(conf->ssl_trusted_certificate,
-                             prev->ssl_trusted_certificate, "");
-    ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");
-
-    if (ngx_http_lua_set_ssl(cf, conf) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-#endif
-
-    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_value(conf->use_default_type, prev->use_default_type, 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);
-
-    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;
-}
-
-
-#if (NGX_HTTP_SSL)
-
-static ngx_int_t
-ngx_http_lua_set_ssl(ngx_conf_t *cf, ngx_http_lua_loc_conf_t *llcf)
-{
-    ngx_pool_cleanup_t  *cln;
-
-    llcf->ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
-    if (llcf->ssl == NULL) {
-        return NGX_ERROR;
-    }
-
-    llcf->ssl->log = cf->log;
-
-    if (ngx_ssl_create(llcf->ssl, llcf->ssl_protocols, NULL) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    cln = ngx_pool_cleanup_add(cf->pool, 0);
-    if (cln == NULL) {
-        return NGX_ERROR;
-    }
-
-    cln->handler = ngx_ssl_cleanup_ctx;
-    cln->data = llcf->ssl;
-
-    if (SSL_CTX_set_cipher_list(llcf->ssl->ctx,
-                                (const char *) llcf->ssl_ciphers.data)
-        == 0)
-    {
-        ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
-                      "SSL_CTX_set_cipher_list(\"%V\") failed",
-                      &llcf->ssl_ciphers);
-        return NGX_ERROR;
-    }
-
-    if (llcf->ssl_trusted_certificate.len) {
-
-#if defined(nginx_version) && nginx_version >= 1003007
-
-        if (ngx_ssl_trusted_certificate(cf, llcf->ssl,
-                                        &llcf->ssl_trusted_certificate,
-                                        llcf->ssl_verify_depth)
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-#else
-
-        ngx_log_error(NGX_LOG_CRIT, cf->log, 0, "at least nginx 1.3.7 is "
-                      "required for the \"lua_ssl_trusted_certificate\" "
-                      "directive");
-        return NGX_ERROR;
-
-#endif
-    }
-
-    dd("ssl crl: %.*s", (int) llcf->ssl_crl.len, llcf->ssl_crl.data);
-
-    if (ngx_ssl_crl(cf, llcf->ssl, &llcf->ssl_crl) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-#endif  /* NGX_HTTP_SSL */
-
-
-static char *
-ngx_http_lua_malloc_trim(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-#if (NGX_HTTP_LUA_HAVE_MALLOC_TRIM)
-
-    ngx_int_t       nreqs;
-    ngx_str_t      *value;
-
-    ngx_http_lua_main_conf_t    *lmcf = conf;
-
-    value = cf->args->elts;
-
-    nreqs = ngx_atoi(value[1].data, value[1].len);
-    if (nreqs == NGX_ERROR) {
-        return "invalid number in the 1st argument";
-    }
-
-    lmcf->malloc_trim_cycle = (ngx_uint_t) nreqs;
-
-    if (nreqs == 0) {
-        return NGX_CONF_OK;
-    }
-
-    lmcf->requires_log = 1;
-
-#else
-
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "lua_malloc_trim is not supported "
-                       "on this platform, ignored");
-
-#endif
-    return NGX_CONF_OK;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ndk.c b/debian/modules/http-lua/src/ngx_http_lua_ndk.c
deleted file mode 100644
index 24b80b4..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ndk.c
+++ /dev/null
@@ -1,191 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_ndk.h"
-#include "ngx_http_lua_util.h"
-
-
-#if defined(NDK) && NDK
-
-
-static ndk_set_var_value_pt ngx_http_lookup_ndk_set_var_directive(u_char *name,
-    size_t name_len);
-static int ngx_http_lua_ndk_set_var_get(lua_State *L);
-static int ngx_http_lua_ndk_set_var_set(lua_State *L);
-static int ngx_http_lua_run_set_var_directive(lua_State *L);
-
-
-int
-ngx_http_lua_ndk_set_var_get(lua_State *L)
-{
-    ndk_set_var_value_pt                 func;
-    size_t                               len;
-    u_char                              *p;
-
-    p = (u_char *) luaL_checklstring(L, 2, &len);
-
-    dd("ndk.set_var metatable __index: %s", p);
-
-    func = ngx_http_lookup_ndk_set_var_directive(p, len);
-
-    if (func == NULL) {
-        return luaL_error(L, "ndk.set_var: directive \"%s\" not found "
-                          "or does not use ndk_set_var_value", p);
-    }
-
-    lua_pushvalue(L, -1); /* table key key */
-    lua_pushvalue(L, -1); /* table key key key */
-    lua_pushlightuserdata(L, (void *) func); /* table key key key func */
-    lua_pushcclosure(L, ngx_http_lua_run_set_var_directive, 2);
-        /* table key key closure */
-    lua_rawset(L, 1); /* table key */
-    lua_rawget(L, 1); /* table closure */
-
-    return 1;
-}
-
-
-int
-ngx_http_lua_ndk_set_var_set(lua_State *L)
-{
-    return luaL_error(L, "Not allowed");
-}
-
-
-int
-ngx_http_lua_run_set_var_directive(lua_State *L)
-{
-    ngx_int_t                            rc;
-    ndk_set_var_value_pt                 func;
-    ngx_str_t                            res;
-    ngx_http_variable_value_t            arg;
-    u_char                              *p;
-    size_t                               len;
-    ngx_http_request_t                  *r;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-#if 1
-    ngx_memzero(&arg, sizeof(ngx_http_variable_value_t));
-
-    arg.valid = 1;
-#endif
-
-    arg.data = (u_char *) luaL_checklstring(L, 1, &len);
-    arg.len = len;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    p = (u_char *) luaL_checklstring(L, lua_upvalueindex(1), &len);
-
-    dd("calling set_var func for %s", p);
-
-    func = (ndk_set_var_value_pt) lua_touserdata(L, lua_upvalueindex(2));
-
-    rc = func(r, &res, &arg);
-
-    if (rc != NGX_OK) {
-        return luaL_error(L, "calling directive %s failed with code %d",
-                          p, (int) rc);
-    }
-
-    lua_pushlstring(L, (char *) res.data, res.len);
-
-    return 1;
-}
-
-
-static ndk_set_var_value_pt
-ngx_http_lookup_ndk_set_var_directive(u_char *name,
-    size_t name_len)
-{
-    ndk_set_var_t           *filter;
-    ngx_uint_t               i;
-    ngx_module_t            *module;
-    ngx_module_t           **modules;
-    ngx_command_t           *cmd;
-
-#if defined(nginx_version) && nginx_version >= 1009011
-    modules = ngx_cycle->modules;
-#else
-    modules = ngx_modules;
-#endif
-
-    for (i = 0; modules[i]; i++) {
-        module = modules[i];
-        if (module->type != NGX_HTTP_MODULE) {
-            continue;
-        }
-
-        cmd = modules[i]->commands;
-        if (cmd == NULL) {
-            continue;
-        }
-
-        for ( /* void */ ; cmd->name.len; cmd++) {
-            if (cmd->set != ndk_set_var_value) {
-                continue;
-            }
-
-            filter = cmd->post;
-            if (filter == NULL) {
-                continue;
-            }
-
-            if (cmd->name.len != name_len
-                || ngx_strncmp(cmd->name.data, name, name_len) != 0)
-            {
-                continue;
-            }
-
-            return (ndk_set_var_value_pt)(filter->func);
-        }
-    }
-
-    return NULL;
-}
-
-
-void
-ngx_http_lua_inject_ndk_api(lua_State *L)
-{
-    lua_createtable(L, 0, 1 /* nrec */);    /* ndk.* */
-
-    lua_newtable(L);    /* .set_var */
-
-    lua_createtable(L, 0, 2 /* nrec */); /* metatable for .set_var */
-    lua_pushcfunction(L, ngx_http_lua_ndk_set_var_get);
-    lua_setfield(L, -2, "__index");
-    lua_pushcfunction(L, ngx_http_lua_ndk_set_var_set);
-    lua_setfield(L, -2, "__newindex");
-    lua_setmetatable(L, -2);
-
-    lua_setfield(L, -2, "set_var");
-
-    lua_getglobal(L, "package"); /* ndk package */
-    lua_getfield(L, -1, "loaded"); /* ndk package loaded */
-    lua_pushvalue(L, -3); /* ndk package loaded ndk */
-    lua_setfield(L, -2, "ndk"); /* ndk package loaded */
-    lua_pop(L, 2);
-
-    lua_setglobal(L, "ndk");
-}
-
-
-#endif /* defined(NDK) && NDK */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ndk.h b/debian/modules/http-lua/src/ngx_http_lua_ndk.h
deleted file mode 100644
index 8015b5f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ndk.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_NDK_H_INCLUDED_
-#define _NGX_HTTP_LUA_NDK_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-#if defined(NDK) && NDK
-void ngx_http_lua_inject_ndk_api(lua_State *L);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_NDK_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_output.c b/debian/modules/http-lua/src/ngx_http_lua_output.c
deleted file mode 100644
index 0fe8840..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_output.c
+++ /dev/null
@@ -1,808 +0,0 @@
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_output.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_contentby.h"
-#include <math.h>
-
-
-static int ngx_http_lua_ngx_say(lua_State *L);
-static int ngx_http_lua_ngx_print(lua_State *L);
-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
-ngx_http_lua_ngx_print(lua_State *L)
-{
-    dd("calling lua print");
-    return ngx_http_lua_ngx_echo(L, 0);
-}
-
-
-static int
-ngx_http_lua_ngx_say(lua_State *L)
-{
-    dd("calling");
-    return ngx_http_lua_ngx_echo(L, 1);
-}
-
-
-static int
-ngx_http_lua_ngx_echo(lua_State *L, unsigned newline)
-{
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-    const char                  *p;
-    size_t                       len;
-    size_t                       size;
-    ngx_buf_t                   *b;
-    ngx_chain_t                 *cl;
-    ngx_int_t                    rc;
-    int                          i;
-    int                          nargs;
-    int                          type;
-    const char                  *msg;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object 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);
-
-    if (ctx->acquired_raw_req_socket) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "raw request socket acquired");
-        return 2;
-    }
-
-    if (r->header_only) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "header only");
-        return 2;
-    }
-
-    if (ctx->eof) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "seen eof");
-        return 2;
-    }
-
-    nargs = lua_gettop(L);
-    size = 0;
-
-    for (i = 1; i <= nargs; i++) {
-
-        type = lua_type(L, i);
-
-        switch (type) {
-            case LUA_TNUMBER:
-            case LUA_TSTRING:
-
-                lua_tolstring(L, i, &len);
-                size += len;
-                break;
-
-            case LUA_TNIL:
-
-                size += sizeof("nil") - 1;
-                break;
-
-            case LUA_TBOOLEAN:
-
-                if (lua_toboolean(L, i)) {
-                    size += sizeof("true") - 1;
-
-                } else {
-                    size += sizeof("false") - 1;
-                }
-
-                break;
-
-            case LUA_TTABLE:
-
-                size += ngx_http_lua_calc_strlen_in_table(L, i, i,
-                                                          0 /* strict */);
-                break;
-
-            case LUA_TLIGHTUSERDATA:
-
-                dd("userdata: %p", lua_touserdata(L, i));
-
-                if (lua_touserdata(L, i) == NULL) {
-                    size += sizeof("null") - 1;
-                    break;
-                }
-
-                continue;
-
-            default:
-
-                msg = lua_pushfstring(L, "string, number, boolean, nil, "
-                                      "ngx.null, or array table expected, "
-                                      "but got %s", lua_typename(L, type));
-
-                return luaL_argerror(L, i, msg);
-        }
-    }
-
-    if (newline) {
-        size += sizeof("\n") - 1;
-    }
-
-    if (size == 0) {
-        rc = ngx_http_lua_send_header_if_needed(r, ctx);
-        if (rc == NGX_ERROR || rc > NGX_OK) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "nginx output filter error");
-            return 2;
-        }
-
-        lua_pushinteger(L, 1);
-        return 1;
-    }
-
-    ctx->seen_body_data = 1;
-
-    cl = ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                         &ctx->free_bufs, size);
-
-    if (cl == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    b = cl->buf;
-
-    for (i = 1; i <= nargs; i++) {
-        type = lua_type(L, i);
-        switch (type) {
-            case LUA_TNUMBER:
-            case LUA_TSTRING:
-                p = lua_tolstring(L, i, &len);
-                b->last = ngx_copy(b->last, (u_char *) p, len);
-                break;
-
-            case LUA_TNIL:
-                *b->last++ = 'n';
-                *b->last++ = 'i';
-                *b->last++ = 'l';
-                break;
-
-            case LUA_TBOOLEAN:
-                if (lua_toboolean(L, i)) {
-                    *b->last++ = 't';
-                    *b->last++ = 'r';
-                    *b->last++ = 'u';
-                    *b->last++ = 'e';
-
-                } else {
-                    *b->last++ = 'f';
-                    *b->last++ = 'a';
-                    *b->last++ = 'l';
-                    *b->last++ = 's';
-                    *b->last++ = 'e';
-                }
-
-                break;
-
-            case LUA_TTABLE:
-                b->last = ngx_http_lua_copy_str_in_table(L, i, b->last);
-                break;
-
-            case LUA_TLIGHTUSERDATA:
-                *b->last++ = 'n';
-                *b->last++ = 'u';
-                *b->last++ = 'l';
-                *b->last++ = 'l';
-                break;
-
-            default:
-                return luaL_error(L, "impossible to reach here");
-        }
-    }
-
-    if (newline) {
-        *b->last++ = '\n';
-    }
-
-#if 0
-    if (b->last != b->end) {
-        return luaL_error(L, "buffer error: %p != %p", b->last, b->end);
-    }
-#endif
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   newline ? "lua say response" : "lua print response");
-
-    rc = ngx_http_lua_send_chain_link(r, ctx, cl);
-
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nginx output filter error");
-        return 2;
-    }
-
-    dd("downstream write: %d, buf len: %d", (int) rc,
-       (int) (b->last - b->pos));
-
-    lua_pushinteger(L, 1);
-    return 1;
-}
-
-
-size_t
-ngx_http_lua_calc_strlen_in_table(lua_State *L, int index, int arg_i,
-    unsigned strict)
-{
-    double              key;
-    int                 max;
-    int                 i;
-    int                 type;
-    size_t              size;
-    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, 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 = (int) key;
-                }
-
-                lua_pop(L, 1); /* stack: table key */
-                continue;
-            }
-        }
-
-        /* not an array (non positive integer key) */
-        lua_pop(L, 2); /* stack: table */
-
-        luaL_argerror(L, arg_i, "non-array table found");
-        return 0;
-    }
-
-    size = 0;
-
-    for (i = 1; i <= max; i++) {
-        lua_rawgeti(L, index, i); /* stack: table value */
-        type = lua_type(L, -1);
-
-        switch (type) {
-            case LUA_TNUMBER:
-            case LUA_TSTRING:
-
-                lua_tolstring(L, -1, &len);
-                size += len;
-                break;
-
-            case LUA_TNIL:
-
-                if (strict) {
-                    goto bad_type;
-                }
-
-                size += sizeof("nil") - 1;
-                break;
-
-            case LUA_TBOOLEAN:
-
-                if (strict) {
-                    goto bad_type;
-                }
-
-                if (lua_toboolean(L, -1)) {
-                    size += sizeof("true") - 1;
-
-                } else {
-                    size += sizeof("false") - 1;
-                }
-
-                break;
-
-            case LUA_TTABLE:
-
-                size += ngx_http_lua_calc_strlen_in_table(L, -1, arg_i, strict);
-                break;
-
-            case LUA_TLIGHTUSERDATA:
-
-                if (strict) {
-                    goto bad_type;
-                }
-
-                if (lua_touserdata(L, -1) == NULL) {
-                    size += sizeof("null") - 1;
-                    break;
-                }
-
-                continue;
-
-            default:
-
-bad_type:
-
-                msg = lua_pushfstring(L, "bad data type %s found",
-                                      lua_typename(L, type));
-                return luaL_argerror(L, arg_i, msg);
-        }
-
-        lua_pop(L, 1); /* stack: table */
-    }
-
-    return size;
-}
-
-
-u_char *
-ngx_http_lua_copy_str_in_table(lua_State *L, int index, u_char *dst)
-{
-    double               key;
-    int                  max;
-    int                  i;
-    int                  type;
-    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, index) != 0) { /* stack: table key value */
-        key = lua_tonumber(L, -2);
-        if (key > max) {
-            max = (int) key;
-        }
-
-        lua_pop(L, 1); /* stack: table key */
-    }
-
-    for (i = 1; i <= max; i++) {
-        lua_rawgeti(L, index, i); /* stack: table value */
-        type = lua_type(L, -1);
-        switch (type) {
-            case LUA_TNUMBER:
-            case LUA_TSTRING:
-                p = (u_char *) lua_tolstring(L, -1, &len);
-                dst = ngx_copy(dst, p, len);
-                break;
-
-            case LUA_TNIL:
-                *dst++ = 'n';
-                *dst++ = 'i';
-                *dst++ = 'l';
-                break;
-
-            case LUA_TBOOLEAN:
-                if (lua_toboolean(L, -1)) {
-                    *dst++ = 't';
-                    *dst++ = 'r';
-                    *dst++ = 'u';
-                    *dst++ = 'e';
-
-                } else {
-                    *dst++ = 'f';
-                    *dst++ = 'a';
-                    *dst++ = 'l';
-                    *dst++ = 's';
-                    *dst++ = 'e';
-                }
-
-                break;
-
-            case LUA_TTABLE:
-                dst = ngx_http_lua_copy_str_in_table(L, -1, dst);
-                break;
-
-            case LUA_TLIGHTUSERDATA:
-
-                *dst++ = 'n';
-                *dst++ = 'u';
-                *dst++ = 'l';
-                *dst++ = 'l';
-                break;
-
-            default:
-                luaL_error(L, "impossible to reach here");
-                return NULL;
-        }
-
-        lua_pop(L, 1); /* stack: table */
-    }
-
-    return dst;
-}
-
-
-/**
- * Force flush out response content
- * */
-static int
-ngx_http_lua_ngx_flush(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_chain_t                 *cl;
-    ngx_int_t                    rc;
-    int                          n;
-    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) {
-        return luaL_error(L, "attempt to pass %d arguments, but accepted 0 "
-                          "or 1", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-
-    if (n == 1 && r == r->main) {
-        luaL_checktype(L, 1, LUA_TBOOLEAN);
-        wait = lua_toboolean(L, 1);
-    }
-
-    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);
-
-    if (ctx->acquired_raw_req_socket) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "raw request socket acquired");
-        return 2;
-    }
-
-    coctx = ctx->cur_co_ctx;
-    if (coctx == NULL) {
-        return luaL_error(L, "no co ctx found");
-    }
-
-    if (r->header_only) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "header only");
-        return 2;
-    }
-
-    if (ctx->eof) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "seen eof");
-        return 2;
-    }
-
-    if (ctx->buffering) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua http 1.0 buffering makes ngx.flush() a no-op");
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "buffering");
-        return 2;
-    }
-
-#if 1
-    if ((!r->header_sent && !ctx->header_sent)
-        || (!ctx->seen_body_data && !wait))
-    {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nothing to flush");
-        return 2;
-    }
-#endif
-
-    cl = ngx_http_lua_get_flush_chain(r, ctx);
-    if (cl == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    rc = ngx_http_lua_send_chain_link(r, ctx, cl);
-
-    dd("send chain: %d", (int) rc);
-
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nginx output filter error");
-        return 2;
-    }
-
-    dd("wait:%d, rc:%d, buffered:0x%x", wait, (int) rc,
-       r->connection->buffered);
-
-    wev = r->connection->write;
-
-    if (wait && (r->connection->buffered & NGX_HTTP_LOWLEVEL_BUFFERED
-                 || wev->delayed))
-    {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua flush requires waiting: buffered 0x%uxd, "
-                       "delayed:%d", (unsigned) r->connection->buffered,
-                       wev->delayed);
-
-        coctx->flushing = 1;
-        ctx->flushing_coros++;
-
-        if (ctx->entered_content_phase) {
-            /* mimic ngx_http_set_write_handler */
-            r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-        } else {
-            r->write_event_handler = ngx_http_core_run_phases;
-        }
-
-        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-        if (!wev->delayed) {
-            ngx_add_timer(wev, clcf->send_timeout);
-        }
-
-        if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-            if (wev->timer_set) {
-                wev->delayed = 0;
-                ngx_del_timer(wev);
-            }
-
-            lua_pushnil(L);
-            lua_pushliteral(L, "connection broken");
-            return 2;
-        }
-
-        ngx_http_lua_cleanup_pending_operation(ctx->cur_co_ctx);
-        coctx->cleanup = ngx_http_lua_flush_cleanup;
-        coctx->data = r;
-
-        return lua_yield(L, 0);
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua flush asynchronously");
-
-    lua_pushinteger(L, 1);
-    return 1;
-}
-
-
-/**
- * Send last_buf, terminate output stream
- * */
-static int
-ngx_http_lua_ngx_eof(lua_State *L)
-{
-    ngx_http_request_t      *r;
-    ngx_http_lua_ctx_t      *ctx;
-    ngx_int_t                rc;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    if (lua_gettop(L) != 0) {
-        return luaL_error(L, "no argument is expected");
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return luaL_error(L, "no ctx found");
-    }
-
-    if (ctx->acquired_raw_req_socket) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "raw request socket acquired");
-        return 2;
-    }
-
-    if (ctx->eof) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "seen eof");
-        return 2;
-    }
-
-    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");
-
-    rc = ngx_http_lua_send_chain_link(r, ctx, NULL /* indicate last_buf */);
-
-    dd("send chain: %d", (int) rc);
-
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nginx output filter error");
-        return 2;
-    }
-
-    lua_pushinteger(L, 1);
-    return 1;
-}
-
-
-void
-ngx_http_lua_inject_output_api(lua_State *L)
-{
-    lua_pushcfunction(L, ngx_http_lua_ngx_send_headers);
-    lua_setfield(L, -2, "send_headers");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_print);
-    lua_setfield(L, -2, "print");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_say);
-    lua_setfield(L, -2, "say");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_flush);
-    lua_setfield(L, -2, "flush");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_eof);
-    lua_setfield(L, -2, "eof");
-}
-
-
-/**
- * Send out headers
- * */
-static int
-ngx_http_lua_ngx_send_headers(lua_State *L)
-{
-    ngx_int_t                rc;
-    ngx_http_request_t      *r;
-    ngx_http_lua_ctx_t      *ctx;
-
-    r = ngx_http_lua_get_req(L);
-    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);
-
-    if (!r->header_sent && !ctx->header_sent) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua send headers");
-
-        rc = ngx_http_lua_send_header_if_needed(r, ctx);
-        if (rc == NGX_ERROR || rc > NGX_OK) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "nginx output filter error");
-            return 2;
-        }
-    }
-
-    lua_pushinteger(L, 1);
-    return 1;
-}
-
-
-ngx_int_t
-ngx_http_lua_flush_resume_helper(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
-{
-    int                          n;
-    lua_State                   *vm;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_connection_t            *c;
-
-    c = r->connection;
-
-    ctx->cur_co_ctx->cleanup = NULL;
-
-    /* push the return values */
-
-    if (c->timedout) {
-        lua_pushnil(ctx->cur_co_ctx->co);
-        lua_pushliteral(ctx->cur_co_ctx->co, "timeout");
-        n = 2;
-
-    } else if (c->error) {
-        lua_pushnil(ctx->cur_co_ctx->co);
-        lua_pushliteral(ctx->cur_co_ctx->co, "client aborted");
-        n = 2;
-
-    } else {
-        lua_pushinteger(ctx->cur_co_ctx->co, 1);
-        n = 1;
-    }
-
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(vm, r, ctx, n);
-
-    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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    /* rc == NGX_ERROR || rc >= NGX_OK */
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_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--;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_output.h b/debian/modules/http-lua/src/ngx_http_lua_output.h
deleted file mode 100644
index 109a4b4..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_output.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_OUTPUT_H_INCLUDED_
-#define _NGX_HTTP_LUA_OUTPUT_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_output_api(lua_State *L);
-
-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, 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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pcrefix.c b/debian/modules/http-lua/src/ngx_http_lua_pcrefix.c
deleted file mode 100644
index 562847a..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_pcrefix.c
+++ /dev/null
@@ -1,106 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_pcrefix.h"
-#include "stdio.h"
-
-#if (NGX_PCRE)
-
-static ngx_pool_t *ngx_http_lua_pcre_pool = NULL;
-
-static void *(*old_pcre_malloc)(size_t);
-static void (*old_pcre_free)(void *ptr);
-
-
-/* XXX: work-around to nginx regex subsystem, must init a memory pool
- * to use PCRE functions. As PCRE still has memory-leaking problems,
- * and nginx overwrote pcre_malloc/free hooks with its own static
- * functions, so nobody else can reuse nginx regex subsystem... */
-static void *
-ngx_http_lua_pcre_malloc(size_t size)
-{
-    dd("lua pcre pool is %p", ngx_http_lua_pcre_pool);
-
-    if (ngx_http_lua_pcre_pool) {
-        return ngx_palloc(ngx_http_lua_pcre_pool, size);
-    }
-
-    fprintf(stderr, "error: lua pcre malloc failed due to empty pcre pool");
-
-    return NULL;
-}
-
-
-static void
-ngx_http_lua_pcre_free(void *ptr)
-{
-    dd("lua pcre pool is %p", ngx_http_lua_pcre_pool);
-
-    if (ngx_http_lua_pcre_pool) {
-        ngx_pfree(ngx_http_lua_pcre_pool, ptr);
-        return;
-    }
-
-    fprintf(stderr, "error: lua pcre free failed due to empty pcre pool");
-}
-
-
-ngx_pool_t *
-ngx_http_lua_pcre_malloc_init(ngx_pool_t *pool)
-{
-    ngx_pool_t          *old_pool;
-
-    if (pcre_malloc != ngx_http_lua_pcre_malloc) {
-
-        dd("overriding nginx pcre malloc and free");
-
-        ngx_http_lua_pcre_pool = pool;
-
-        old_pcre_malloc = pcre_malloc;
-        old_pcre_free = pcre_free;
-
-        pcre_malloc = ngx_http_lua_pcre_malloc;
-        pcre_free = ngx_http_lua_pcre_free;
-
-        return NULL;
-    }
-
-    dd("lua pcre pool was %p", ngx_http_lua_pcre_pool);
-
-    old_pool = ngx_http_lua_pcre_pool;
-    ngx_http_lua_pcre_pool = pool;
-
-    dd("lua pcre pool is %p", ngx_http_lua_pcre_pool);
-
-    return old_pool;
-}
-
-
-void
-ngx_http_lua_pcre_malloc_done(ngx_pool_t *old_pool)
-{
-    dd("lua pcre pool was %p", ngx_http_lua_pcre_pool);
-
-    ngx_http_lua_pcre_pool = old_pool;
-
-    dd("lua pcre pool is %p", ngx_http_lua_pcre_pool);
-
-    if (old_pool == NULL) {
-        pcre_malloc = old_pcre_malloc;
-        pcre_free = old_pcre_free;
-    }
-}
-
-#endif /* NGX_PCRE */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_pcrefix.h b/debian/modules/http-lua/src/ngx_http_lua_pcrefix.h
deleted file mode 100644
index 80f29f9..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_pcrefix.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_PCREFIX_H_INCLUDED_
-#define _NGX_HTTP_LUA_PCREFIX_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-#if (NGX_PCRE)
-ngx_pool_t *ngx_http_lua_pcre_malloc_init(ngx_pool_t *pool);
-void ngx_http_lua_pcre_malloc_done(ngx_pool_t *old_pool);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_PCREFIX_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_phase.c b/debian/modules/http-lua/src/ngx_http_lua_phase.c
deleted file mode 100644
index 304c88a..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_phase.c
+++ /dev/null
@@ -1,128 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#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;
-
-    r = ngx_http_lua_get_req(L);
-
-    /* If we have no request object, assume we are called from the "init"
-     * phase. */
-
-    if (r == NULL) {
-        lua_pushliteral(L, "init");
-        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_INIT_WORKER:
-        lua_pushliteral(L, "init_worker");
-        break;
-
-    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;
-
-    case NGX_HTTP_LUA_CONTEXT_TIMER:
-        lua_pushliteral(L, "timer");
-        break;
-
-    case NGX_HTTP_LUA_CONTEXT_BALANCER:
-        lua_pushliteral(L, "balancer");
-        break;
-
-    case NGX_HTTP_LUA_CONTEXT_SSL_CERT:
-        lua_pushliteral(L, "ssl_cert");
-        break;
-
-    case NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE:
-        lua_pushliteral(L, "ssl_session_store");
-        break;
-
-    case NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH:
-        lua_pushliteral(L, "ssl_session_fetch");
-        break;
-
-    default:
-        return luaL_error(L, "unknown phase: %#x", (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");
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_get_phase(ngx_http_request_t *r, char **err)
-{
-    ngx_http_lua_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        *err = "no request context";
-        return NGX_ERROR;
-    }
-
-    return ctx->context;
-}
-#endif
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_phase.h b/debian/modules/http-lua/src/ngx_http_lua_phase.h
deleted file mode 100644
index dcb670f..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_phase.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _NGX_HTTP_LUA_PHASE_H_INCLUDED_
-#define _NGX_HTTP_LUA_PHASE_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_phase_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_PHASE_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_probe.h b/debian/modules/http-lua/src/ngx_http_lua_probe.h
deleted file mode 100644
index 749fa95..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_probe.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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_INCLUDED_
-#define _NGX_HTTP_LUA_PROBE_H_INCLUDED_
-
-
-#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_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_regex.c b/debian/modules/http-lua/src/ngx_http_lua_regex.c
deleted file mode 100644
index 843d1e4..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_regex.c
+++ /dev/null
@@ -1,2548 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#if (NGX_PCRE)
-
-#include "ngx_http_lua_regex.h"
-#include "ngx_http_lua_pcrefix.h"
-#include "ngx_http_lua_script.h"
-#include "ngx_http_lua_pcrefix.h"
-#include "ngx_http_lua_util.h"
-
-
-#if (PCRE_MAJOR >= 6)
-#   define LUA_HAVE_PCRE_DFA 1
-#else
-#   define LUA_HAVE_PCRE_DFA 0
-#endif
-
-
-#define NGX_LUA_RE_COMPILE_ONCE      (1<<0)
-#define NGX_LUA_RE_MODE_DFA          (1<<1)
-#define NGX_LUA_RE_MODE_JIT          (1<<2)
-#define NGX_LUA_RE_MODE_DUPNAMES     (1<<3)
-#define NGX_LUA_RE_NO_UTF8_CHECK     (1<<4)
-
-#define NGX_LUA_RE_DFA_MODE_WORKSPACE_COUNT (100)
-
-#define NGX_LUA_RE_MIN_JIT_STACK_SIZE 32 * 1024
-
-
-typedef struct {
-#ifndef NGX_LUA_NO_FFI_API
-    ngx_pool_t                   *pool;
-    u_char                       *name_table;
-    int                           name_count;
-    int                           name_entry_size;
-#endif
-
-    int                           ncaptures;
-    int                          *captures;
-
-    pcre                         *regex;
-    pcre_extra                   *regex_sd;
-
-    ngx_http_lua_complex_value_t    *replace;
-
-#ifndef NGX_LUA_NO_FFI_API
-    /* only for (stap) debugging, and may be an invalid pointer */
-    const u_char                 *pattern;
-#endif
-} ngx_http_lua_regex_t;
-
-
-typedef struct {
-    ngx_str_t     pattern;
-    ngx_pool_t   *pool;
-    ngx_int_t     options;
-
-    pcre         *regex;
-    int           captures;
-    ngx_str_t     err;
-} ngx_http_lua_regex_compile_t;
-
-
-typedef struct {
-    ngx_http_cleanup_pt     *cleanup;
-    ngx_http_request_t      *request;
-    pcre                    *regex;
-    pcre_extra              *regex_sd;
-    int                      ncaptures;
-    int                     *captures;
-    int                      captures_len;
-    uint8_t                  flags;
-} ngx_http_lua_regex_ctx_t;
-
-
-static int ngx_http_lua_ngx_re_gmatch_iterator(lua_State *L);
-static ngx_uint_t ngx_http_lua_ngx_re_parse_opts(lua_State *L,
-    ngx_http_lua_regex_compile_t *re, ngx_str_t *opts, int narg);
-static int ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global);
-static int ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps);
-static int ngx_http_lua_ngx_re_find(lua_State *L);
-static int ngx_http_lua_ngx_re_match(lua_State *L);
-static int ngx_http_lua_ngx_re_gmatch(lua_State *L);
-static int ngx_http_lua_ngx_re_sub(lua_State *L);
-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_http_lua_regex_compile(ngx_http_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);
-static void ngx_http_lua_re_collect_named_captures(lua_State *L,
-    int res_tb_idx, u_char *name_table, int name_count, int name_entry_size,
-    unsigned flags, ngx_str_t *subj);
-
-
-#define ngx_http_lua_regex_exec(re, e, s, start, captures, size, opts)       \
-    pcre_exec(re, e, (const char *) (s)->data, (s)->len, start, opts,        \
-              captures, size)
-
-
-#define ngx_http_lua_regex_dfa_exec(re, e, s, start, captures, size, ws,     \
-                                    wscount, opts)                           \
-    pcre_dfa_exec(re, e, (const char *) (s)->data, (s)->len, start, opts,    \
-                  captures, size, ws, wscount)
-
-
-static int
-ngx_http_lua_ngx_re_match(lua_State *L)
-{
-    return ngx_http_lua_ngx_re_match_helper(L, 1 /* want captures */);
-}
-
-
-static int
-ngx_http_lua_ngx_re_find(lua_State *L)
-{
-    return ngx_http_lua_ngx_re_match_helper(L, 0 /* want captures */);
-}
-
-
-static int
-ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
-{
-    /* u_char                      *p; */
-    int                          res_tb_idx = 0;
-    ngx_http_request_t          *r;
-    ngx_str_t                    subj;
-    ngx_str_t                    pat;
-    ngx_str_t                    opts;
-    ngx_http_lua_regex_t        *re;
-    const char                  *msg;
-    ngx_int_t                    rc;
-    ngx_uint_t                   n;
-    int                          i;
-    ngx_int_t                    pos = 0;
-    int                          nargs;
-    int                         *cap = NULL;
-    int                          ovecsize;
-    int                          has_ctx = 0;
-    ngx_uint_t                   flags;
-    ngx_pool_t                  *pool, *old_pool;
-    ngx_http_lua_main_conf_t    *lmcf;
-    u_char                       errstr[NGX_MAX_CONF_ERRSTR + 1];
-    pcre_extra                  *sd = NULL;
-    int                          name_entry_size = 0, name_count;
-    u_char                      *name_table = NULL;
-    int                          exec_opts;
-    int                          group_id = 0;
-
-    ngx_http_lua_regex_compile_t      re_comp;
-
-    nargs = lua_gettop(L);
-
-    if (nargs != 2 && nargs != 3 && nargs != 4 && nargs != 5) {
-        return luaL_error(L, "expecting 2, 3, 4 or 5 arguments, "
-                          "but got %d", nargs);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    subj.data = (u_char *) luaL_checklstring(L, 1, &subj.len);
-    pat.data = (u_char *) luaL_checklstring(L, 2, &pat.len);
-
-    ngx_memzero(&re_comp, sizeof(ngx_http_lua_regex_compile_t));
-
-    if (nargs >= 3) {
-        opts.data = (u_char *) luaL_checklstring(L, 3, &opts.len);
-
-        if (nargs >= 4) {
-            if (!lua_isnil(L, 4)) {
-                luaL_checktype(L, 4, LUA_TTABLE);
-                has_ctx = 1;
-
-                lua_getfield(L, 4, "pos");
-                if (lua_isnumber(L, -1)) {
-                    pos = (ngx_int_t) lua_tointeger(L, -1);
-                    if (pos <= 0) {
-                        pos = 0;
-
-                    } else {
-                        pos--;  /* 1-based on the Lua land */
-                    }
-
-                } else if (lua_isnil(L, -1)) {
-                    pos = 0;
-
-                } else {
-                    msg = lua_pushfstring(L, "bad pos field type in the ctx "
-                                          "table argument: %s",
-                                          luaL_typename(L, -1));
-
-                    return luaL_argerror(L, 4, msg);
-                }
-
-                lua_pop(L, 1);
-            }
-        }
-
-    } else {
-        opts.data = (u_char *) "";
-        opts.len = 0;
-    }
-
-    if (nargs == 5) {
-        if (wantcaps) {
-            luaL_checktype(L, 5, LUA_TTABLE);
-            res_tb_idx = 5;
-
-#if 0
-            /* clear the Lua table */
-            lua_pushnil(L);
-            while (lua_next(L, res_tb_idx) != 0) {
-                lua_pop(L, 1);
-                lua_pushvalue(L, -1);
-                lua_pushnil(L);
-                lua_rawset(L, res_tb_idx);
-            }
-#endif
-
-        } else {
-            group_id =  luaL_checkint(L, 5);
-            if (group_id < 0) {
-                group_id = 0;
-            }
-        }
-    }
-
-    re_comp.options = 0;
-
-    flags = ngx_http_lua_ngx_re_parse_opts(L, &re_comp, &opts, 3);
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    if (flags & NGX_LUA_RE_COMPILE_ONCE) {
-        pool = lmcf->pool;
-
-        dd("server pool %p", lmcf->pool);
-
-        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 */
-
-        dd("options size: %d", (int) sizeof(re_comp.options));
-
-        lua_pushlstring(L, (char *) &re_comp.options, sizeof(re_comp.options));
-                /* table regex opts */
-
-        lua_concat(L, 3); /* table key */
-        lua_pushvalue(L, -1); /* table key key */
-
-        dd("regex cache key: %.*s", (int) (pat.len + sizeof(re_comp.options)),
-           lua_tostring(L, -1));
-
-        lua_rawget(L, -3); /* table key re */
-        re = lua_touserdata(L, -1);
-
-        lua_pop(L, 1); /* table key */
-
-        if (re) {
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua regex cache hit for match regex \"%s\" with "
-                           "options \"%s\"", pat.data, opts.data);
-
-            lua_pop(L, 2);
-
-            dd("restoring regex %p, ncaptures %d,  captures %p", re->regex,
-               re->ncaptures, re->captures);
-
-            re_comp.regex = re->regex;
-            sd = re->regex_sd;
-            re_comp.captures = re->ncaptures;
-            cap = re->captures;
-
-            if (flags & NGX_LUA_RE_MODE_DFA) {
-                ovecsize = 2;
-
-            } else {
-                ovecsize = (re->ncaptures + 1) * 3;
-            }
-
-            goto exec;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua regex cache miss for match regex \"%s\" "
-                       "with options \"%s\"", pat.data, opts.data);
-
-        if (lmcf->regex_cache_entries >= lmcf->regex_cache_max_entries) {
-
-            if (lmcf->regex_cache_entries == lmcf->regex_cache_max_entries) {
-                ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                              "lua exceeding regex cache max entries (%i)",
-                              lmcf->regex_cache_max_entries);
-
-                lmcf->regex_cache_entries++;
-            }
-
-            pool = r->pool;
-            flags &= ~NGX_LUA_RE_COMPILE_ONCE;
-        }
-
-    } else {
-        pool = r->pool;
-    }
-
-    dd("pool %p, r pool %p", pool, r->pool);
-
-    re_comp.pattern = pat;
-    re_comp.err.len = NGX_MAX_CONF_ERRSTR;
-    re_comp.err.data = errstr;
-    re_comp.pool = pool;
-
-    ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua compiling match regex \"%s\" with options \"%s\" "
-                   "(compile once: %d) (dfa mode: %d) (jit mode: %d)",
-                   pat.data, opts.data,
-                   (flags & NGX_LUA_RE_COMPILE_ONCE) != 0,
-                   (flags & NGX_LUA_RE_MODE_DFA) != 0,
-                   (flags & NGX_LUA_RE_MODE_JIT) != 0);
-
-    old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-    rc = ngx_http_lua_regex_compile(&re_comp);
-
-    ngx_http_lua_pcre_malloc_done(old_pool);
-
-    if (rc != NGX_OK) {
-        dd("compile failed");
-
-        lua_pushnil(L);
-        if (!wantcaps) {
-            lua_pushnil(L);
-        }
-        lua_pushlstring(L, (char *) re_comp.err.data, re_comp.err.len);
-        return wantcaps ? 2 : 3;
-    }
-
-#if (LUA_HAVE_PCRE_JIT)
-
-    if (flags & NGX_LUA_RE_MODE_JIT) {
-
-        old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-        sd = pcre_study(re_comp.regex, PCRE_STUDY_JIT_COMPILE, &msg);
-
-        if (sd && lmcf->jit_stack) {
-            pcre_assign_jit_stack(sd, NULL, lmcf->jit_stack);
-        }
-
-        ngx_http_lua_pcre_malloc_done(old_pool);
-
-#   if (NGX_DEBUG)
-        dd("sd = %p", sd);
-
-        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);
-        }
-
-        if (sd != NULL) {
-            int         jitted;
-
-            old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-            pcre_fullinfo(re_comp.regex, sd, PCRE_INFO_JIT, &jitted);
-
-            ngx_http_lua_pcre_malloc_done(old_pool);
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "pcre JIT compiling result: %d", jitted);
-        }
-#   endif /* !(NGX_DEBUG) */
-
-    } else {
-        old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-        sd = pcre_study(re_comp.regex, 0, &msg);
-
-        ngx_http_lua_pcre_malloc_done(old_pool);
-
-#   if (NGX_DEBUG)
-        dd("sd = %p", sd);
-
-        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);
-        }
-#   endif /* NGX_DEBUG */
-    }
-
-#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");
-    }
-
-#endif /* LUA_HAVE_PCRE_JIT */
-
-    if (sd && lmcf->regex_match_limit > 0) {
-        sd->flags |= PCRE_EXTRA_MATCH_LIMIT;
-        sd->match_limit = lmcf->regex_match_limit;
-    }
-
-    dd("compile done, captures %d", (int) re_comp.captures);
-
-    if (flags & NGX_LUA_RE_MODE_DFA) {
-        ovecsize = 2;
-        re_comp.captures = 0;
-
-    } else {
-        ovecsize = (re_comp.captures + 1) * 3;
-    }
-
-    dd("allocating cap with size: %d", (int) ovecsize);
-
-    cap = ngx_palloc(pool, ovecsize * sizeof(int));
-
-    if (cap == NULL) {
-        flags &= ~NGX_LUA_RE_COMPILE_ONCE;
-        msg = "no memory";
-        goto error;
-    }
-
-    if (flags & NGX_LUA_RE_COMPILE_ONCE) {
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua saving compiled regex (%d captures) into the cache "
-                       "(entries %i)", re_comp.captures,
-                       lmcf->regex_cache_entries);
-
-        re = ngx_palloc(pool, sizeof(ngx_http_lua_regex_t));
-        if (re == NULL) {
-            msg = "no memory";
-            goto error;
-        }
-
-        dd("saving regex %p, ncaptures %d,  captures %p", re_comp.regex,
-           re_comp.captures, cap);
-
-        re->regex = re_comp.regex;
-        re->regex_sd = sd;
-        re->ncaptures = re_comp.captures;
-        re->captures = cap;
-        re->replace = NULL;
-
-        lua_pushlightuserdata(L, re); /* table key value */
-        lua_rawset(L, -3); /* table */
-        lua_pop(L, 1);
-
-        if (lmcf) {
-            lmcf->regex_cache_entries++;
-        }
-    }
-
-exec:
-
-    if (pcre_fullinfo(re_comp.regex, NULL, PCRE_INFO_NAMECOUNT,
-                      &name_count) != 0)
-    {
-        msg = "cannot acquire named subpattern count";
-        goto error;
-    }
-
-    if (name_count > 0) {
-        if (pcre_fullinfo(re_comp.regex, NULL, PCRE_INFO_NAMEENTRYSIZE,
-                          &name_entry_size) != 0)
-        {
-            msg = "cannot acquire named subpattern entry size";
-            goto error;
-        }
-
-        if (pcre_fullinfo(re_comp.regex, NULL, PCRE_INFO_NAMETABLE,
-                          &name_table) != 0)
-        {
-            msg = "cannot acquire named subpattern table";
-            goto error;
-        }
-    }
-
-    if (flags & NGX_LUA_RE_NO_UTF8_CHECK) {
-        exec_opts = PCRE_NO_UTF8_CHECK;
-
-    } else {
-        exec_opts = 0;
-    }
-
-    if (flags & NGX_LUA_RE_MODE_DFA) {
-
-#if LUA_HAVE_PCRE_DFA
-
-        int ws[NGX_LUA_RE_DFA_MODE_WORKSPACE_COUNT];
-        rc = ngx_http_lua_regex_dfa_exec(re_comp.regex, sd, &subj,
-                                         (int) pos, cap, ovecsize, ws,
-                                         sizeof(ws)/sizeof(ws[0]), exec_opts);
-
-#else /* LUA_HAVE_PCRE_DFA */
-
-        msg = "at least pcre 6.0 is required for the DFA mode";
-        goto error;
-
-#endif /* LUA_HAVE_PCRE_DFA */
-
-    } else {
-        rc = ngx_http_lua_regex_exec(re_comp.regex, sd, &subj, (int) pos, cap,
-                                     ovecsize, exec_opts);
-    }
-
-    if (rc == NGX_REGEX_NO_MATCHED) {
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "regex \"%V\" not matched on string \"%V\" starting "
-                       "from %i", &pat, &subj, pos);
-
-        if (!(flags & NGX_LUA_RE_COMPILE_ONCE)) {
-            if (sd) {
-                ngx_http_lua_regex_free_study_data(pool, sd);
-            }
-
-            ngx_pfree(pool, re_comp.regex);
-            ngx_pfree(pool, cap);
-        }
-
-        lua_pushnil(L);
-        return 1;
-    }
-
-    if (rc < 0) {
-        msg = lua_pushfstring(L, ngx_regex_exec_n " failed: %d", (int) rc);
-        goto error;
-    }
-
-    if (rc == 0) {
-        if (flags & NGX_LUA_RE_MODE_DFA) {
-            rc = 1;
-
-        } else {
-            msg = "capture size too small";
-            goto error;
-        }
-    }
-
-    dd("rc = %d", (int) rc);
-
-    if (has_ctx) { /* having ctx table */
-        pos = cap[1];
-        lua_pushinteger(L, (lua_Integer) (pos + 1));
-        lua_setfield(L, 4, "pos");
-    }
-
-    if (!wantcaps) {
-        if (group_id > re_comp.captures) {
-            lua_pushnil(L);
-            lua_pushnil(L);
-            lua_pushliteral(L, "nth out of bound");
-            return 3;
-        }
-
-        if (group_id >= rc) {
-            lua_pushnil(L);
-            lua_pushnil(L);
-            return 2;
-        }
-
-        {
-            int     from, to;
-
-            from = cap[group_id * 2] + 1;
-            to = cap[group_id * 2 + 1];
-            if (from < 0 || to < 0) {
-                lua_pushnil(L);
-                lua_pushnil(L);
-                return 2;
-            }
-
-            lua_pushinteger(L, from);
-            lua_pushinteger(L, to);
-            return 2;
-        }
-    }
-
-    if (res_tb_idx == 0) {
-        lua_createtable(L, re_comp.captures || 1 /* narr */,
-                        name_count /* nrec */);
-        res_tb_idx = lua_gettop(L);
-    }
-
-    for (i = 0, n = 0; i <= re_comp.captures; i++, n += 2) {
-        dd("capture %d: %d %d", i, cap[n], cap[n + 1]);
-        if (i >= rc || cap[n] < 0) {
-            lua_pushboolean(L, 0);
-
-        } else {
-            lua_pushlstring(L, (char *) &subj.data[cap[n]],
-                            cap[n + 1] - cap[n]);
-
-            dd("pushing capture %s at %d", lua_tostring(L, -1), (int) i);
-        }
-
-        lua_rawseti(L, res_tb_idx, (int) i);
-    }
-
-    if (name_count > 0) {
-        ngx_http_lua_re_collect_named_captures(L, res_tb_idx, name_table,
-                                               name_count, name_entry_size,
-                                               flags, &subj);
-    }
-
-    if (!(flags & NGX_LUA_RE_COMPILE_ONCE)) {
-
-        if (sd) {
-            ngx_http_lua_regex_free_study_data(pool, sd);
-        }
-
-        ngx_pfree(pool, re_comp.regex);
-        ngx_pfree(pool, cap);
-    }
-
-    return 1;
-
-error:
-
-    if (!(flags & NGX_LUA_RE_COMPILE_ONCE)) {
-        if (sd) {
-            ngx_http_lua_regex_free_study_data(pool, sd);
-        }
-
-        if (re_comp.regex) {
-            ngx_pfree(pool, re_comp.regex);
-        }
-
-        if (cap) {
-            ngx_pfree(pool, cap);
-        }
-    }
-
-    lua_pushnil(L);
-    if (!wantcaps) {
-        lua_pushnil(L);
-    }
-    lua_pushstring(L, msg);
-    return wantcaps ? 2 : 3;
-}
-
-
-static int
-ngx_http_lua_ngx_re_gmatch(lua_State *L)
-{
-    ngx_http_lua_main_conf_t    *lmcf;
-    ngx_http_request_t          *r;
-    ngx_str_t                    subj;
-    ngx_str_t                    pat;
-    ngx_str_t                    opts;
-    int                          ovecsize;
-    ngx_http_lua_regex_t        *re;
-    ngx_http_lua_regex_ctx_t    *ctx;
-    const char                  *msg;
-    int                          nargs;
-    ngx_int_t                    flags;
-    int                         *cap = NULL;
-    ngx_int_t                    rc;
-    ngx_pool_t                  *pool, *old_pool;
-    u_char                       errstr[NGX_MAX_CONF_ERRSTR + 1];
-    pcre_extra                  *sd = NULL;
-    ngx_http_cleanup_t          *cln;
-
-    ngx_http_lua_regex_compile_t      re_comp;
-
-    nargs = lua_gettop(L);
-
-    if (nargs != 2 && nargs != 3) {
-        return luaL_error(L, "expecting two or three arguments, but got %d",
-                          nargs);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    subj.data = (u_char *) luaL_checklstring(L, 1, &subj.len);
-    pat.data = (u_char *) luaL_checklstring(L, 2, &pat.len);
-
-    if (nargs == 3) {
-        opts.data = (u_char *) luaL_checklstring(L, 3, &opts.len);
-        lua_pop(L, 1);
-
-    } else {
-        opts.data = (u_char *) "";
-        opts.len = 0;
-    }
-
-    /* stack: subj regex */
-
-    re_comp.options = 0;
-
-    flags = ngx_http_lua_ngx_re_parse_opts(L, &re_comp, &opts, 3);
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    if (flags & NGX_LUA_RE_COMPILE_ONCE) {
-        pool = lmcf->pool;
-
-        dd("server pool %p", lmcf->pool);
-
-        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 */
-
-        dd("options size: %d", (int) sizeof(re_comp.options));
-
-        lua_pushlstring(L, (char *) &re_comp.options,
-                        sizeof(re_comp.options)); /* table regex opts */
-
-        lua_concat(L, 3); /* table key */
-        lua_pushvalue(L, -1); /* table key key */
-
-        dd("regex cache key: %.*s", (int) (pat.len + sizeof(re_comp.options)),
-           lua_tostring(L, -1));
-
-        lua_rawget(L, -3); /* table key re */
-        re = lua_touserdata(L, -1);
-
-        lua_pop(L, 1); /* table key */
-
-        if (re) {
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua regex cache hit for match regex \"%s\" "
-                           "with options \"%s\"", pat.data, opts.data);
-
-            lua_pop(L, 2);
-
-            dd("restoring regex %p, ncaptures %d,  captures %p", re->regex,
-               re->ncaptures, re->captures);
-
-            re_comp.regex = re->regex;
-            sd = re->regex_sd;
-            re_comp.captures = re->ncaptures;
-            cap = re->captures;
-
-            if (flags & NGX_LUA_RE_MODE_DFA) {
-                ovecsize = 2;
-
-            } else {
-                ovecsize = (re->ncaptures + 1) * 3;
-            }
-
-            goto compiled;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua regex cache miss for match regex \"%s\" "
-                       "with options \"%s\"", pat.data, opts.data);
-
-        if (lmcf->regex_cache_entries >= lmcf->regex_cache_max_entries) {
-
-            if (lmcf->regex_cache_entries == lmcf->regex_cache_max_entries) {
-                ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                              "lua exceeding regex cache max entries (%i)",
-                              lmcf->regex_cache_max_entries);
-
-                lmcf->regex_cache_entries++;
-            }
-
-            pool = r->pool;
-            flags &= ~NGX_LUA_RE_COMPILE_ONCE;
-        }
-
-    } else {
-        pool = r->pool;
-    }
-
-    re_comp.pattern = pat;
-    re_comp.err.len = NGX_MAX_CONF_ERRSTR;
-    re_comp.err.data = errstr;
-    re_comp.pool = pool;
-
-    ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua compiling gmatch regex \"%s\" with options \"%s\" "
-                   "(compile once: %d) (dfa mode: %d) (jit mode: %d)",
-                   pat.data, opts.data,
-                   (flags & NGX_LUA_RE_COMPILE_ONCE) != 0,
-                   (flags & NGX_LUA_RE_MODE_DFA) != 0,
-                   (flags & NGX_LUA_RE_MODE_JIT) != 0);
-
-    old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-    rc = ngx_http_lua_regex_compile(&re_comp);
-
-    ngx_http_lua_pcre_malloc_done(old_pool);
-
-    if (rc != NGX_OK) {
-        dd("compile failed");
-
-        lua_pushnil(L);
-        lua_pushlstring(L, (char *) re_comp.err.data, re_comp.err.len);
-        return 2;
-    }
-
-#if LUA_HAVE_PCRE_JIT
-
-    if (flags & NGX_LUA_RE_MODE_JIT) {
-
-        old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-        sd = pcre_study(re_comp.regex, PCRE_STUDY_JIT_COMPILE, &msg);
-
-        if (sd && lmcf->jit_stack) {
-            pcre_assign_jit_stack(sd, NULL, lmcf->jit_stack);
-        }
-
-        ngx_http_lua_pcre_malloc_done(old_pool);
-
-#   if (NGX_DEBUG)
-        dd("sd = %p", sd);
-
-        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);
-        }
-
-        if (sd != NULL) {
-            int         jitted;
-
-            old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-            pcre_fullinfo(re_comp.regex, sd, PCRE_INFO_JIT, &jitted);
-
-            ngx_http_lua_pcre_malloc_done(old_pool);
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "pcre JIT compiling result: %d", jitted);
-        }
-#   endif /* NGX_DEBUG */
-
-    } else {
-
-        old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-        sd = pcre_study(re_comp.regex, 0, &msg);
-
-        ngx_http_lua_pcre_malloc_done(old_pool);
-
-#   if (NGX_DEBUG)
-        dd("sd = %p", sd);
-
-        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);
-        }
-#   endif /* NGX_DEBUG */
-    }
-
-#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");
-    }
-
-#endif /* LUA_HAVE_PCRE_JIT */
-
-    if (sd && lmcf->regex_match_limit > 0) {
-        sd->flags |= PCRE_EXTRA_MATCH_LIMIT;
-        sd->match_limit = lmcf->regex_match_limit;
-    }
-
-    dd("compile done, captures %d", re_comp.captures);
-
-    if (flags & NGX_LUA_RE_MODE_DFA) {
-        ovecsize = 2;
-        re_comp.captures = 0;
-
-    } else {
-        ovecsize = (re_comp.captures + 1) * 3;
-    }
-
-    cap = ngx_palloc(pool, ovecsize * sizeof(int));
-    if (cap == NULL) {
-        flags &= ~NGX_LUA_RE_COMPILE_ONCE;
-        msg = "no memory";
-        goto error;
-    }
-
-    if (flags & NGX_LUA_RE_COMPILE_ONCE) {
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua saving compiled regex (%d captures) into the cache "
-                       "(entries %i)", re_comp.captures,
-                       lmcf->regex_cache_entries);
-
-        re = ngx_palloc(pool, sizeof(ngx_http_lua_regex_t));
-        if (re == NULL) {
-            msg = "no memory";
-            goto error;
-        }
-
-        dd("saving regex %p, ncaptures %d,  captures %p", re_comp.regex,
-           re_comp.captures, cap);
-
-        re->regex = re_comp.regex;
-        re->regex_sd = sd;
-        re->ncaptures = re_comp.captures;
-        re->captures = cap;
-        re->replace = NULL;
-
-        lua_pushlightuserdata(L, re); /* table key value */
-        lua_rawset(L, -3); /* table */
-        lua_pop(L, 1);
-
-        if (lmcf) {
-            lmcf->regex_cache_entries++;
-        }
-    }
-
-compiled:
-
-    lua_settop(L, 1);
-
-    ctx = lua_newuserdata(L, sizeof(ngx_http_lua_regex_ctx_t));
-
-    ctx->request = r;
-    ctx->regex = re_comp.regex;
-    ctx->regex_sd = sd;
-    ctx->ncaptures = re_comp.captures;
-    ctx->captures = cap;
-    ctx->captures_len = ovecsize;
-    ctx->flags = (uint8_t) flags;
-
-    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) {
-            msg = "no memory";
-            goto error;
-        }
-
-        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_pushcclosure(L, ngx_http_lua_ngx_re_gmatch_iterator, 3);
-
-    return 1;
-
-error:
-
-    if (!(flags & NGX_LUA_RE_COMPILE_ONCE)) {
-        if (sd) {
-            ngx_http_lua_regex_free_study_data(pool, sd);
-        }
-
-        if (re_comp.regex) {
-            ngx_pfree(pool, re_comp.regex);
-        }
-
-        if (cap) {
-            ngx_pfree(pool, cap);
-        }
-    }
-
-    lua_pushnil(L);
-    lua_pushstring(L, msg);
-    return 2;
-}
-
-
-static int
-ngx_http_lua_ngx_re_gmatch_iterator(lua_State *L)
-{
-    ngx_http_lua_regex_ctx_t    *ctx;
-    ngx_http_request_t          *r;
-    int                         *cap;
-    ngx_int_t                    rc;
-    ngx_uint_t                   n;
-    int                          i;
-    ngx_str_t                    subj;
-    int                          offset;
-    const char                  *msg = NULL;
-    int                          name_entry_size = 0, name_count;
-    u_char                      *name_table = NULL;
-    int                          exec_opts;
-
-    /* upvalues in order: subj ctx offset */
-
-    subj.data = (u_char *) lua_tolstring(L, lua_upvalueindex(1), &subj.len);
-    ctx = (ngx_http_lua_regex_ctx_t *) lua_touserdata(L, lua_upvalueindex(2));
-    offset = (int) lua_tointeger(L, lua_upvalueindex(3));
-
-    if (offset < 0) {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    cap = ctx->captures;
-
-    dd("offset %d, r %p, subj %s", (int) offset, ctx->request, subj.data);
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    if (r != ctx->request || r->pool != ctx->request->pool) {
-        return luaL_error(L, "attempt to use ngx.re.gmatch iterator in a "
-                          "request that did not create it");
-    }
-
-    dd("regex exec...");
-
-    if (pcre_fullinfo(ctx->regex, NULL, PCRE_INFO_NAMECOUNT,
-                      &name_count) != 0)
-    {
-        msg = "cannot acquire named subpattern count";
-        goto error;
-    }
-
-    if (name_count > 0) {
-        if (pcre_fullinfo(ctx->regex, NULL, PCRE_INFO_NAMEENTRYSIZE,
-                          &name_entry_size) != 0)
-        {
-            msg = "cannot acquire named subpattern entry size";
-            goto error;
-        }
-
-        if (pcre_fullinfo(ctx->regex, NULL, PCRE_INFO_NAMETABLE,
-                          &name_table) != 0)
-        {
-            msg = "cannot acquire named subpattern table";
-            goto error;
-        }
-    }
-
-    if (ctx->flags & NGX_LUA_RE_NO_UTF8_CHECK) {
-        exec_opts = PCRE_NO_UTF8_CHECK;
-
-    } else {
-        exec_opts = 0;
-    }
-
-    if (ctx->flags & NGX_LUA_RE_MODE_DFA) {
-
-#if LUA_HAVE_PCRE_DFA
-
-        int ws[NGX_LUA_RE_DFA_MODE_WORKSPACE_COUNT];
-
-        rc = ngx_http_lua_regex_dfa_exec(ctx->regex, ctx->regex_sd, &subj,
-                                         offset, cap, ctx->captures_len, ws,
-                                         sizeof(ws)/sizeof(ws[0]), exec_opts);
-
-#else /* LUA_HAVE_PCRE_DFA */
-        msg = "at least pcre 6.0 is required for the DFA mode";
-        goto error;
-
-#endif /* LUA_HAVE_PCRE_DFA */
-
-    } else {
-        rc = ngx_http_lua_regex_exec(ctx->regex, ctx->regex_sd, &subj,
-                                     offset, cap, ctx->captures_len,
-                                     exec_opts);
-    }
-
-    if (rc == NGX_REGEX_NO_MATCHED) {
-        /* set upvalue "offset" to -1 */
-        lua_pushinteger(L, -1);
-        lua_replace(L, lua_upvalueindex(3));
-
-        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);
-        }
-
-        lua_pushnil(L);
-        return 1;
-    }
-
-    if (rc < 0) {
-        msg = lua_pushfstring(L, ngx_regex_exec_n " failed: %d", (int) rc);
-        goto error;
-    }
-
-    if (rc == 0) {
-        if (ctx->flags & NGX_LUA_RE_MODE_DFA) {
-            rc = 1;
-
-        } else {
-            goto error;
-        }
-    }
-
-    dd("rc = %d", (int) rc);
-
-    lua_createtable(L, ctx->ncaptures || 1 /* narr */, name_count /* nrec */);
-
-    for (i = 0, n = 0; i <= ctx->ncaptures; i++, n += 2) {
-        dd("capture %d: %d %d", i, cap[n], cap[n + 1]);
-        if (i >= rc || cap[n] < 0) {
-            lua_pushboolean(L, 0);
-
-        } else {
-            lua_pushlstring(L, (char *) &subj.data[cap[n]],
-                            cap[n + 1] - cap[n]);
-
-            dd("pushing capture %s at %d", lua_tostring(L, -1), (int) i);
-        }
-
-        lua_rawseti(L, -2, (int) i);
-    }
-
-    if (name_count > 0) {
-        ngx_http_lua_re_collect_named_captures(L, lua_gettop(L), name_table,
-                                               name_count, name_entry_size,
-                                               ctx->flags, &subj);
-    }
-
-    offset = cap[1];
-    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);
-        }
-    }
-
-    lua_pushinteger(L, offset);
-    lua_replace(L, lua_upvalueindex(3));
-
-    return 1;
-
-error:
-
-    lua_pushinteger(L, -1);
-    lua_replace(L, lua_upvalueindex(3));
-
-    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);
-    }
-
-    lua_pushnil(L);
-    lua_pushstring(L, msg);
-    return 2;
-}
-
-
-static ngx_uint_t
-ngx_http_lua_ngx_re_parse_opts(lua_State *L, ngx_http_lua_regex_compile_t *re,
-    ngx_str_t *opts, int narg)
-{
-    u_char          *p;
-    const char      *msg;
-    ngx_uint_t       flags;
-
-    flags = 0;
-    p = opts->data;
-
-    while (*p != '\0') {
-        switch (*p) {
-            case 'i':
-                re->options |= NGX_REGEX_CASELESS;
-                break;
-
-            case 's':
-                re->options |= PCRE_DOTALL;
-                break;
-
-            case 'm':
-                re->options |= PCRE_MULTILINE;
-                break;
-
-            case 'u':
-                re->options |= PCRE_UTF8;
-                break;
-
-            case 'U':
-                re->options |= PCRE_UTF8;
-                flags |= NGX_LUA_RE_NO_UTF8_CHECK;
-                break;
-
-            case 'x':
-                re->options |= PCRE_EXTENDED;
-                break;
-
-            case 'o':
-                flags |= NGX_LUA_RE_COMPILE_ONCE;
-                break;
-
-            case 'j':
-                flags |= NGX_LUA_RE_MODE_JIT;
-                break;
-
-            case 'd':
-                flags |= NGX_LUA_RE_MODE_DFA;
-                break;
-
-            case 'a':
-                re->options |= PCRE_ANCHORED;
-                break;
-
-#if (PCRE_MAJOR > 8) || (PCRE_MAJOR == 8 && PCRE_MINOR >= 12)
-            case 'D':
-                re->options |= PCRE_DUPNAMES;
-                flags |= NGX_LUA_RE_MODE_DUPNAMES;
-                break;
-
-            case 'J':
-                re->options |= PCRE_JAVASCRIPT_COMPAT;
-                break;
-#endif
-
-            default:
-                msg = lua_pushfstring(L, "unknown flag \"%c\" (flags \"%s\")",
-                                      *p, opts->data);
-                return luaL_argerror(L, narg, msg);
-        }
-
-        p++;
-    }
-
-    /* pcre does not support JIT for DFA mode yet,
-     * so if DFA mode is specified, we turn off JIT automatically
-     * */
-    if ((flags & NGX_LUA_RE_MODE_JIT) && (flags & NGX_LUA_RE_MODE_DFA)) {
-        flags &= ~NGX_LUA_RE_MODE_JIT;
-    }
-
-    return flags;
-}
-
-
-static int
-ngx_http_lua_ngx_re_sub(lua_State *L)
-{
-    return ngx_http_lua_ngx_re_sub_helper(L, 0 /* global */);
-}
-
-
-static int
-ngx_http_lua_ngx_re_gsub(lua_State *L)
-{
-    return ngx_http_lua_ngx_re_sub_helper(L, 1 /* global */);
-}
-
-
-static int
-ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global)
-{
-    ngx_http_lua_regex_t        *re;
-    ngx_http_request_t          *r;
-    ngx_str_t                    subj;
-    ngx_str_t                    pat;
-    ngx_str_t                    opts;
-    ngx_str_t                    tpl;
-    ngx_http_lua_main_conf_t    *lmcf;
-    ngx_pool_t                  *pool, *old_pool;
-    const char                  *msg;
-    ngx_int_t                    rc;
-    ngx_uint_t                   n;
-    ngx_int_t                    i;
-    int                          nargs;
-    int                         *cap = NULL;
-    int                          ovecsize;
-    int                          type;
-    unsigned                     func;
-    int                          offset;
-    int                          cp_offset;
-    size_t                       count;
-    luaL_Buffer                  luabuf;
-    ngx_int_t                    flags;
-    u_char                      *p;
-    u_char                       errstr[NGX_MAX_CONF_ERRSTR + 1];
-    pcre_extra                  *sd = NULL;
-    int                          name_entry_size = 0, name_count;
-    u_char                      *name_table = NULL;
-    int                          exec_opts;
-
-    ngx_http_lua_regex_compile_t               re_comp;
-    ngx_http_lua_complex_value_t              *ctpl = NULL;
-    ngx_http_lua_compile_complex_value_t       ccv;
-
-    nargs = lua_gettop(L);
-
-    if (nargs != 3 && nargs != 4) {
-        return luaL_error(L, "expecting three or four arguments, but got %d",
-                          nargs);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    subj.data = (u_char *) luaL_checklstring(L, 1, &subj.len);
-    pat.data = (u_char *) luaL_checklstring(L, 2, &pat.len);
-
-    func = 0;
-
-    type = lua_type(L, 3);
-    switch (type) {
-        case LUA_TFUNCTION:
-            func = 1;
-            tpl.len = 0;
-            tpl.data = (u_char *) "";
-            break;
-
-        case LUA_TNUMBER:
-        case LUA_TSTRING:
-            tpl.data = (u_char *) lua_tolstring(L, 3, &tpl.len);
-            break;
-
-        default:
-            msg = lua_pushfstring(L, "string, number, or function expected, "
-                                  "got %s", lua_typename(L, type));
-            return luaL_argerror(L, 3, msg);
-    }
-
-    ngx_memzero(&re_comp, sizeof(ngx_http_lua_regex_compile_t));
-
-    if (nargs == 4) {
-        opts.data = (u_char *) luaL_checklstring(L, 4, &opts.len);
-        lua_pop(L, 1);
-
-    } else { /* nargs == 3 */
-        opts.data = (u_char *) "";
-        opts.len = 0;
-    }
-
-    /* stack: subj regex repl */
-
-    re_comp.options = 0;
-
-    flags = ngx_http_lua_ngx_re_parse_opts(L, &re_comp, &opts, 4);
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    if (flags & NGX_LUA_RE_COMPILE_ONCE) {
-        pool = lmcf->pool;
-
-        dd("server pool %p", lmcf->pool);
-
-        lua_pushlightuserdata(L, &ngx_http_lua_regex_cache_key);
-        lua_rawget(L, LUA_REGISTRYINDEX); /* table */
-
-        lua_pushliteral(L, "s");
-        lua_pushinteger(L, tpl.len);
-        lua_pushliteral(L, ":");
-        lua_pushvalue(L, 2);
-
-        if (tpl.len != 0) {
-            lua_pushvalue(L, 3);
-        }
-
-        dd("options size: %d", (int) sizeof(re_comp.options));
-
-        lua_pushlstring(L, (char *) &re_comp.options, sizeof(re_comp.options));
-                /* table regex opts */
-
-        if (tpl.len == 0) {
-            lua_concat(L, 5); /* table key */
-
-        } else {
-            lua_concat(L, 6); /* table key */
-        }
-
-        lua_pushvalue(L, -1); /* table key key */
-
-        dd("regex cache key: %.*s", (int) (pat.len + sizeof(re_comp.options)),
-           lua_tostring(L, -1));
-
-        lua_rawget(L, -3); /* table key re */
-        re = lua_touserdata(L, -1);
-
-        lua_pop(L, 1); /* table key */
-
-        if (re) {
-            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua regex cache hit for sub regex \"%s\" with "
-                           "options \"%s\" and replace \"%s\"",
-                           pat.data, opts.data,
-                           func ? (u_char *) "<func>" : tpl.data);
-
-            lua_pop(L, 2);
-
-            dd("restoring regex %p, ncaptures %d,  captures %p", re->regex,
-               re->ncaptures, re->captures);
-
-            re_comp.regex = re->regex;
-            sd = re->regex_sd;
-            re_comp.captures = re->ncaptures;
-            cap = re->captures;
-            ctpl = re->replace;
-
-            if (flags & NGX_LUA_RE_MODE_DFA) {
-                ovecsize = 2;
-
-            } else {
-                ovecsize = (re->ncaptures + 1) * 3;
-            }
-
-            goto exec;
-        }
-
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua regex cache miss for %ssub regex \"%s\" with "
-                       "options \"%s\" and replace \"%s\"",
-                       global ? "g" : "", pat.data, opts.data,
-                       func ? (u_char *) "<func>" : tpl.data);
-
-        if (lmcf->regex_cache_entries >= lmcf->regex_cache_max_entries) {
-
-            if (lmcf->regex_cache_entries == lmcf->regex_cache_max_entries) {
-                ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                              "lua exceeding regex cache max entries (%i)",
-                              lmcf->regex_cache_max_entries);
-
-                lmcf->regex_cache_entries++;
-            }
-
-            pool = r->pool;
-            flags &= ~NGX_LUA_RE_COMPILE_ONCE;
-        }
-
-    } else {
-        pool = r->pool;
-    }
-
-    re_comp.pattern = pat;
-    re_comp.err.len = NGX_MAX_CONF_ERRSTR;
-    re_comp.err.data = errstr;
-    re_comp.pool = pool;
-
-    dd("compiling regex");
-
-    ngx_log_debug6(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua compiling %ssub regex \"%s\" with options \"%s\" "
-                   "(compile once: %d) (dfa mode: %d) (jit mode: %d)",
-                   global ? "g" : "", pat.data, opts.data,
-                   (flags & NGX_LUA_RE_COMPILE_ONCE) != 0,
-                   (flags & NGX_LUA_RE_MODE_DFA) != 0,
-                   (flags & NGX_LUA_RE_MODE_JIT) != 0);
-
-    old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-    rc = ngx_http_lua_regex_compile(&re_comp);
-
-    ngx_http_lua_pcre_malloc_done(old_pool);
-
-    if (rc != NGX_OK) {
-        dd("compile failed");
-
-        lua_pushnil(L);
-        lua_pushnil(L);
-        lua_pushlstring(L, (char *) re_comp.err.data, re_comp.err.len);
-        return 3;
-    }
-
-#if LUA_HAVE_PCRE_JIT
-
-    if (flags & NGX_LUA_RE_MODE_JIT) {
-
-        old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-        sd = pcre_study(re_comp.regex, PCRE_STUDY_JIT_COMPILE, &msg);
-
-        ngx_http_lua_pcre_malloc_done(old_pool);
-
-#   if (NGX_DEBUG)
-        dd("sd = %p", sd);
-
-        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);
-        }
-
-        if (sd != NULL) {
-            int         jitted;
-
-            old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-            pcre_fullinfo(re_comp.regex, sd, PCRE_INFO_JIT, &jitted);
-
-            ngx_http_lua_pcre_malloc_done(old_pool);
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "pcre JIT compiling result: %d", jitted);
-        }
-#   endif /* NGX_DEBUG */
-
-    } else {
-
-        old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-        sd = pcre_study(re_comp.regex, 0, &msg);
-
-        ngx_http_lua_pcre_malloc_done(old_pool);
-
-#   if (NGX_DEBUG)
-        dd("sd = %p", sd);
-
-        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);
-        }
-#   endif /* NGX_DEBUG */
-    }
-
-#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");
-    }
-
-#endif /* LUA_HAVE_PCRE_JIT */
-
-    if (sd && lmcf->regex_match_limit > 0) {
-        sd->flags |= PCRE_EXTRA_MATCH_LIMIT;
-        sd->match_limit = lmcf->regex_match_limit;
-    }
-
-    dd("compile done, captures %d", re_comp.captures);
-
-    if (flags & NGX_LUA_RE_MODE_DFA) {
-        ovecsize = 2;
-        re_comp.captures = 0;
-
-    } else {
-        ovecsize = (re_comp.captures + 1) * 3;
-    }
-
-    cap = ngx_palloc(pool, ovecsize * sizeof(int));
-    if (cap == NULL) {
-        flags &= ~NGX_LUA_RE_COMPILE_ONCE;
-        msg = "no memory";
-        goto error;
-    }
-
-    if (func) {
-        ctpl = NULL;
-
-    } else {
-        ctpl = ngx_palloc(pool, sizeof(ngx_http_lua_complex_value_t));
-        if (ctpl == NULL) {
-            flags &= ~NGX_LUA_RE_COMPILE_ONCE;
-            msg = "no memory";
-            goto error;
-        }
-
-        if ((flags & NGX_LUA_RE_COMPILE_ONCE) && tpl.len != 0) {
-            /* copy the string buffer pointed to by tpl.data from Lua VM */
-            p = ngx_palloc(pool, tpl.len + 1);
-            if (p == NULL) {
-                flags &= ~NGX_LUA_RE_COMPILE_ONCE;
-                msg = "no memory";
-                goto error;
-            }
-
-            ngx_memcpy(p, tpl.data, tpl.len);
-            p[tpl.len] = '\0';
-
-            tpl.data = p;
-        }
-
-        ngx_memzero(&ccv, sizeof(ngx_http_lua_compile_complex_value_t));
-        ccv.pool = pool;
-        ccv.log = r->connection->log;
-        ccv.value = &tpl;
-        ccv.complex_value = ctpl;
-
-        if (ngx_http_lua_compile_complex_value(&ccv) != NGX_OK) {
-            ngx_pfree(pool, cap);
-            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);
-
-            lua_pushnil(L);
-            lua_pushnil(L);
-            lua_pushliteral(L, "failed to compile the replacement template");
-            return 3;
-        }
-    }
-
-    if (flags & NGX_LUA_RE_COMPILE_ONCE) {
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua saving compiled sub regex (%d captures) into "
-                       "the cache (entries %i)", re_comp.captures,
-                       lmcf->regex_cache_entries);
-
-        re = ngx_palloc(pool, sizeof(ngx_http_lua_regex_t));
-        if (re == NULL) {
-            msg = "no memory";
-            goto error;
-        }
-
-        dd("saving regex %p, ncaptures %d,  captures %p", re_comp.regex,
-           re_comp.captures, cap);
-
-        re->regex = re_comp.regex;
-        re->regex_sd = sd;
-        re->ncaptures = re_comp.captures;
-        re->captures = cap;
-        re->replace = ctpl;
-
-        lua_pushlightuserdata(L, re); /* table key value */
-        lua_rawset(L, -3); /* table */
-        lua_pop(L, 1);
-
-        if (lmcf) {
-            lmcf->regex_cache_entries++;
-        }
-    }
-
-exec:
-
-    count = 0;
-    offset = 0;
-    cp_offset = 0;
-
-    if (pcre_fullinfo(re_comp.regex, NULL, PCRE_INFO_NAMECOUNT,
-                      &name_count) != 0)
-    {
-        msg = "cannot acquire named subpattern count";
-        goto error;
-    }
-
-    if (name_count > 0) {
-        if (pcre_fullinfo(re_comp.regex, NULL, PCRE_INFO_NAMEENTRYSIZE,
-                          &name_entry_size) != 0)
-        {
-            msg = "cannot acquire named subpattern entry size";
-            goto error;
-        }
-
-        if (pcre_fullinfo(re_comp.regex, NULL, PCRE_INFO_NAMETABLE,
-                          &name_table) != 0)
-        {
-            msg = "cannot acquire named subpattern table";
-            goto error;
-        }
-    }
-
-    if (flags & NGX_LUA_RE_NO_UTF8_CHECK) {
-        exec_opts = PCRE_NO_UTF8_CHECK;
-
-    } else {
-        exec_opts = 0;
-    }
-
-    for (;;) {
-        if (flags & NGX_LUA_RE_MODE_DFA) {
-
-#if LUA_HAVE_PCRE_DFA
-
-            int ws[NGX_LUA_RE_DFA_MODE_WORKSPACE_COUNT];
-            rc = ngx_http_lua_regex_dfa_exec(re_comp.regex, sd, &subj,
-                                             offset, cap, ovecsize, ws,
-                                             sizeof(ws)/sizeof(ws[0]),
-                                             exec_opts);
-
-#else /* LUA_HAVE_PCRE_DFA */
-
-            msg = "at least pcre 6.0 is required for the DFA mode";
-            goto error;
-
-#endif /* LUA_HAVE_PCRE_DFA */
-
-        } else {
-            rc = ngx_http_lua_regex_exec(re_comp.regex, sd, &subj, offset, cap,
-                                         ovecsize, exec_opts);
-        }
-
-        if (rc == NGX_REGEX_NO_MATCHED) {
-            break;
-        }
-
-        if (rc < 0) {
-            msg = lua_pushfstring(L, ngx_regex_exec_n " failed: %d",
-                                  (int) rc);
-            goto error;
-        }
-
-        if (rc == 0) {
-            if (flags & NGX_LUA_RE_MODE_DFA) {
-                rc = 1;
-
-            } else {
-                msg = "capture size too small";
-                goto error;
-            }
-        }
-
-        dd("rc = %d", (int) rc);
-
-        count++;
-
-        if (count == 1) {
-            luaL_buffinit(L, &luabuf);
-        }
-
-        if (func) {
-            lua_pushvalue(L, 3);
-
-            lua_createtable(L, re_comp.captures || 1 /* narr */,
-                            name_count /* nrec */);
-
-            for (i = 0, n = 0; i <= re_comp.captures; i++, n += 2) {
-                dd("capture %d: %d %d", (int) i, cap[n], cap[n + 1]);
-                if (i >= rc || cap[n] < 0) {
-                    lua_pushboolean(L, 0);
-
-                } else {
-                    lua_pushlstring(L, (char *) &subj.data[cap[n]],
-                                    cap[n + 1] - cap[n]);
-
-                    dd("pushing capture %s at %d", lua_tostring(L, -1),
-                       (int) i);
-                }
-
-                lua_rawseti(L, -2, (int) i);
-            }
-
-            if (name_count > 0) {
-                ngx_http_lua_re_collect_named_captures(L, lua_gettop(L),
-                                                       name_table,
-                                                       name_count,
-                                                       name_entry_size,
-                                                       flags, &subj);
-            }
-
-            dd("stack size at call: %d", lua_gettop(L));
-
-            lua_call(L, 1 /* nargs */, 1 /* nresults */);
-            type = lua_type(L, -1);
-            switch (type) {
-                case LUA_TNUMBER:
-                case LUA_TSTRING:
-                    tpl.data = (u_char *) lua_tolstring(L, -1, &tpl.len);
-                    break;
-
-                default:
-                    msg = lua_pushfstring(L, "string or number expected to be "
-                                          "returned by the replace "
-                                          "function, got %s",
-                                          lua_typename(L, type));
-                    return luaL_argerror(L, 3, msg);
-            }
-
-            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_remove(L, 1);
-
-            cp_offset = cap[1];
-            offset = cp_offset;
-            if (offset == cap[0]) {
-                offset++;
-                if (offset > (ssize_t) subj.len) {
-                    break;
-                }
-            }
-
-            if (global) {
-                continue;
-            }
-
-            break;
-        }
-
-        rc = ngx_http_lua_complex_value(r, &subj, cp_offset, rc, cap, ctpl,
-                                        &luabuf);
-
-        if (rc != NGX_OK) {
-            msg = lua_pushfstring(L, "failed to eval the template for "
-                                  "replacement: \"%s\"", tpl.data);
-            goto error;
-        }
-
-        cp_offset = cap[1];
-        offset = cp_offset;
-        if (offset == cap[0]) {
-            offset++;
-            if (offset > (ssize_t) subj.len) {
-                break;
-            }
-        }
-
-        if (global) {
-            continue;
-        }
-
-        break;
-    }
-
-    if (count == 0) {
-        dd("no match, just the original subject");
-        lua_settop(L, 1);
-
-    } else {
-        if (offset < (int) subj.len) {
-            dd("adding trailer: %s (len %d)", &subj.data[cp_offset],
-               (int) (subj.len - cp_offset));
-
-
-            luaL_addlstring(&luabuf, (char *) &subj.data[cp_offset],
-                            subj.len - cp_offset);
-        }
-
-        luaL_pushresult(&luabuf);
-
-        dd("the dst string: %s", lua_tostring(L, -1));
-    }
-
-    if (!(flags & NGX_LUA_RE_COMPILE_ONCE)) {
-        if (sd) {
-            ngx_http_lua_regex_free_study_data(pool, sd);
-        }
-
-        if (re_comp.regex) {
-            ngx_pfree(pool, re_comp.regex);
-        }
-
-        if (ctpl) {
-            ngx_pfree(pool, ctpl);
-        }
-
-        if (cap) {
-            ngx_pfree(pool, cap);
-        }
-    }
-
-    lua_pushinteger(L, count);
-    return 2;
-
-error:
-
-    if (!(flags & NGX_LUA_RE_COMPILE_ONCE)) {
-        if (sd) {
-            ngx_http_lua_regex_free_study_data(pool, sd);
-        }
-
-        if (re_comp.regex) {
-            ngx_pfree(pool, re_comp.regex);
-        }
-
-        if (ctpl) {
-            ngx_pfree(pool, ctpl);
-        }
-
-        if (cap) {
-            ngx_pfree(pool, cap);
-        }
-    }
-
-    lua_pushnil(L);
-    lua_pushnil(L);
-    lua_pushstring(L, msg);
-    return 3;
-}
-
-
-ngx_int_t
-ngx_http_lua_ffi_set_jit_stack_size(int size, u_char *errstr,
-    size_t *errstr_size)
-{
-#if LUA_HAVE_PCRE_JIT
-
-    ngx_http_lua_main_conf_t    *lmcf;
-    ngx_pool_t                  *pool, *old_pool;
-
-    lmcf = ngx_http_cycle_get_module_main_conf(ngx_cycle,
-                                               ngx_http_lua_module);
-
-    if (size < NGX_LUA_RE_MIN_JIT_STACK_SIZE) {
-        size = NGX_LUA_RE_MIN_JIT_STACK_SIZE;
-    }
-
-    pool = lmcf->pool;
-
-    dd("server pool %p", lmcf->pool);
-
-    if (lmcf->jit_stack) {
-        old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-        pcre_jit_stack_free(lmcf->jit_stack);
-
-        ngx_http_lua_pcre_malloc_done(old_pool);
-    }
-
-    old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-    lmcf->jit_stack = pcre_jit_stack_alloc(NGX_LUA_RE_MIN_JIT_STACK_SIZE,
-                                           size);
-
-    ngx_http_lua_pcre_malloc_done(old_pool);
-
-    if (lmcf->jit_stack == NULL) {
-        *errstr_size = ngx_snprintf(errstr, *errstr_size,
-                                    "pcre jit stack allocation failed")
-                       - errstr;
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-
-#else  /* LUA_HAVE_PCRE_JIT */
-
-    *errstr_size = ngx_snprintf(errstr, *errstr_size,
-                                "no pcre jit support found") - errstr;
-    return NGX_ERROR;
-
-#endif /* LUA_HAVE_PCRE_JIT */
-}
-
-
-void
-ngx_http_lua_inject_regex_api(lua_State *L)
-{
-    /* ngx.re */
-
-    lua_createtable(L, 0, 5 /* nrec */);    /* .re */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_re_find);
-    lua_setfield(L, -2, "find");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_re_match);
-    lua_setfield(L, -2, "match");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_re_gmatch);
-    lua_setfield(L, -2, "gmatch");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_re_sub);
-    lua_setfield(L, -2, "sub");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_re_gsub);
-    lua_setfield(L, -2, "gsub");
-
-    lua_setfield(L, -2, "re");
-}
-
-
-static void
-ngx_http_lua_regex_free_study_data(ngx_pool_t *pool, pcre_extra *sd)
-{
-    ngx_pool_t              *old_pool;
-
-    old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-#if LUA_HAVE_PCRE_JIT
-    pcre_free_study(sd);
-#else
-    pcre_free(sd);
-#endif
-
-    ngx_http_lua_pcre_malloc_done(old_pool);
-}
-
-
-static ngx_int_t
-ngx_http_lua_regex_compile(ngx_http_lua_regex_compile_t *rc)
-{
-    int           n, erroff;
-    char         *p;
-    const char   *errstr;
-    pcre         *re;
-    ngx_pool_t   *old_pool;
-
-    old_pool = ngx_http_lua_pcre_malloc_init(rc->pool);
-
-    re = pcre_compile((const char *) rc->pattern.data, (int) rc->options,
-                      &errstr, &erroff, NULL);
-
-    ngx_http_lua_pcre_malloc_done(old_pool);
-
-    if (re == NULL) {
-        if ((size_t) erroff == rc->pattern.len) {
-            rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
-                                       "pcre_compile() failed: %s in \"%V\"",
-                                      errstr, &rc->pattern)
-                         - rc->err.data;
-
-        } else {
-            rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
-                                       "pcre_compile() failed: %s in \"%V\" "
-                                       "at \"%s\"", errstr, &rc->pattern,
-                                       rc->pattern.data + erroff)
-                         - rc->err.data;
-        }
-
-        return NGX_ERROR;
-    }
-
-    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;
-
-failed:
-
-    rc->err.len = ngx_snprintf(rc->err.data, rc->err.len, p, &rc->pattern, n)
-                  - rc->err.data;
-    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;
-}
-
-
-static void
-ngx_http_lua_re_collect_named_captures(lua_State *L, int res_tb_idx,
-    u_char *name_table, int name_count, int name_entry_size, unsigned flags,
-    ngx_str_t *subj)
-{
-    int              i, n;
-    size_t           len;
-    u_char          *name_entry;
-    char            *name;
-
-    for (i = 0; i < name_count; i++) {
-        dd("top: %d", lua_gettop(L));
-
-        name_entry = &name_table[i * name_entry_size];
-        n = (name_entry[0] << 8) | name_entry[1];
-        name = (char *) &name_entry[2];
-
-        lua_rawgeti(L, -1, n);
-        if (lua_isnil(L, -1)) {
-            lua_pop(L, 1);
-            continue;
-        }
-
-        if (flags & NGX_LUA_RE_MODE_DUPNAMES) {
-            /* unmatched groups are not stored in tables in DUPNAMES mode */
-            if (!lua_toboolean(L, -1)) {
-                lua_pop(L, 1);
-                continue;
-            }
-
-            lua_getfield(L, -2, name); /* big_tb cap small_tb */
-
-            if (lua_isnil(L, -1)) {
-                lua_pop(L, 1);
-
-                /* assuming named submatches are usually unique */
-                lua_createtable(L, 1 /* narr */, 0 /* nrec */);
-                lua_pushstring(L, name);
-                lua_pushvalue(L, -2); /* big_tb cap small_tb key small_tb */
-                lua_rawset(L, res_tb_idx); /* big_tb cap small_tb */
-                len = 0;
-
-            } else {
-                len = lua_objlen(L, -1);
-            }
-
-            lua_pushvalue(L, -2); /* big_tb cap small_tb cap */
-            lua_rawseti(L, -2, (int) len + 1); /* big_tb cap small_tb */
-            lua_pop(L, 2);
-
-        } else {
-            lua_pushstring(L, name); /* big_tb cap key */
-            lua_pushvalue(L, -2); /* big_tb cap key cap */
-            lua_rawset(L, res_tb_idx); /* big_tb cap */
-            lua_pop(L, 1);
-        }
-
-        dd("top 2: %d", lua_gettop(L));
-    }
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-ngx_http_lua_regex_t *
-ngx_http_lua_ffi_compile_regex(const unsigned char *pat, size_t pat_len,
-    int flags, int pcre_opts, u_char *errstr,
-    size_t errstr_size)
-{
-    int                     *cap = NULL, ovecsize;
-    u_char                  *p;
-    ngx_int_t                rc;
-    const char              *msg;
-    ngx_pool_t              *pool, *old_pool;
-    pcre_extra              *sd = NULL;
-    ngx_http_lua_regex_t    *re;
-
-    ngx_http_lua_main_conf_t         *lmcf;
-    ngx_http_lua_regex_compile_t      re_comp;
-
-    pool = ngx_create_pool(512, ngx_cycle->log);
-    if (pool == NULL) {
-        msg = "no memory";
-        goto error;
-    }
-
-    pool->log = (ngx_log_t *) &ngx_cycle->new_log;
-
-    re = ngx_palloc(pool, sizeof(ngx_http_lua_regex_t));
-    if (re == NULL) {
-        ngx_destroy_pool(pool);
-        pool = NULL;
-        msg = "no memory";
-        goto error;
-    }
-
-    re->pool = pool;
-
-    re_comp.options      = pcre_opts;
-    re_comp.pattern.data = (u_char *) pat;
-    re_comp.pattern.len  = pat_len;
-    re_comp.err.len      = errstr_size - 1;
-    re_comp.err.data     = errstr;
-    re_comp.pool         = pool;
-
-    old_pool = ngx_http_lua_pcre_malloc_init(pool);
-    rc = ngx_http_lua_regex_compile(&re_comp);
-    ngx_http_lua_pcre_malloc_done(old_pool);
-
-    if (rc != NGX_OK) {
-        re_comp.err.data[re_comp.err.len] = '\0';
-        msg = (char *) re_comp.err.data;
-        goto error;
-    }
-
-    lmcf = ngx_http_cycle_get_module_main_conf(ngx_cycle,
-                                               ngx_http_lua_module);
-
-#if (LUA_HAVE_PCRE_JIT)
-
-    if (flags & NGX_LUA_RE_MODE_JIT) {
-
-        old_pool = ngx_http_lua_pcre_malloc_init(pool);
-        sd = pcre_study(re_comp.regex, PCRE_STUDY_JIT_COMPILE, &msg);
-        ngx_http_lua_pcre_malloc_done(old_pool);
-
-#   if (NGX_DEBUG)
-        if (msg != NULL) {
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "pcre study failed with PCRE_STUDY_JIT_COMPILE: "
-                           "%s (%p)", msg, sd);
-        }
-
-        if (sd != NULL) {
-            int         jitted;
-
-            old_pool = ngx_http_lua_pcre_malloc_init(pool);
-
-            pcre_fullinfo(re_comp.regex, sd, PCRE_INFO_JIT, &jitted);
-
-            ngx_http_lua_pcre_malloc_done(old_pool);
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "pcre JIT compiling result: %d", jitted);
-        }
-#   endif /* !(NGX_DEBUG) */
-
-    } else {
-        old_pool = ngx_http_lua_pcre_malloc_init(pool);
-        sd = pcre_study(re_comp.regex, 0, &msg);
-        ngx_http_lua_pcre_malloc_done(old_pool);
-    }
-
-    if (sd && lmcf->jit_stack) {
-        pcre_assign_jit_stack(sd, NULL, lmcf->jit_stack);
-    }
-
-#endif /* LUA_HAVE_PCRE_JIT */
-
-    if (sd && lmcf && lmcf->regex_match_limit > 0) {
-        sd->flags |= PCRE_EXTRA_MATCH_LIMIT;
-        sd->match_limit = lmcf->regex_match_limit;
-    }
-
-    if (flags & NGX_LUA_RE_MODE_DFA) {
-        ovecsize = 2;
-        re_comp.captures = 0;
-
-    } else {
-        ovecsize = (re_comp.captures + 1) * 3;
-    }
-
-    dd("allocating cap with size: %d", (int) ovecsize);
-
-    cap = ngx_palloc(pool, ovecsize * sizeof(int));
-    if (cap == NULL) {
-        msg = "no memory";
-        goto error;
-    }
-
-    if (pcre_fullinfo(re_comp.regex, NULL, PCRE_INFO_NAMECOUNT,
-                      &re->name_count) != 0)
-    {
-        msg = "cannot acquire named subpattern count";
-        goto error;
-    }
-
-    if (re->name_count > 0) {
-        if (pcre_fullinfo(re_comp.regex, NULL, PCRE_INFO_NAMEENTRYSIZE,
-                          &re->name_entry_size) != 0)
-        {
-            msg = "cannot acquire named subpattern entry size";
-            goto error;
-        }
-
-        if (pcre_fullinfo(re_comp.regex, NULL, PCRE_INFO_NAMETABLE,
-                          &re->name_table) != 0)
-        {
-            msg = "cannot acquire named subpattern table";
-            goto error;
-        }
-    }
-
-    re->regex = re_comp.regex;
-    re->regex_sd = sd;
-    re->ncaptures = re_comp.captures;
-    re->captures = cap;
-    re->replace = NULL;
-
-    /* only for (stap) debugging, the pointer might be invalid when the
-     * string is collected later on.... */
-    re->pattern = pat;
-
-    return re;
-
-error:
-
-    p = ngx_snprintf(errstr, errstr_size - 1, "%s", msg);
-    *p = '\0';
-
-    if (sd) {
-        ngx_http_lua_regex_free_study_data(pool, sd);
-    }
-
-    if (pool) {
-        ngx_destroy_pool(pool);
-    }
-
-    return NULL;
-}
-
-
-int
-ngx_http_lua_ffi_exec_regex(ngx_http_lua_regex_t *re, int flags,
-    const u_char *s, size_t len, int pos)
-{
-    int             rc, ovecsize, exec_opts, *cap;
-    ngx_str_t       subj;
-    pcre_extra     *sd;
-
-    cap = re->captures;
-    sd = re->regex_sd;
-
-    if (flags & NGX_LUA_RE_MODE_DFA) {
-        ovecsize = 2;
-        re->ncaptures = 0;
-
-    } else {
-        ovecsize = (re->ncaptures + 1) * 3;
-    }
-
-    if (flags & NGX_LUA_RE_NO_UTF8_CHECK) {
-        exec_opts = PCRE_NO_UTF8_CHECK;
-
-    } else {
-        exec_opts = 0;
-    }
-
-    subj.data = (u_char *) s;
-    subj.len = len;
-
-    if (flags & NGX_LUA_RE_MODE_DFA) {
-
-#if LUA_HAVE_PCRE_DFA
-
-        int ws[NGX_LUA_RE_DFA_MODE_WORKSPACE_COUNT];
-        rc = ngx_http_lua_regex_dfa_exec(re->regex, sd, &subj,
-                                         (int) pos, cap, ovecsize, ws,
-                                         sizeof(ws)/sizeof(ws[0]), exec_opts);
-
-#else
-
-        return PCRE_ERROR_BADOPTION;
-
-#endif /* LUA_HAVE_PCRE_DFA */
-
-    } else {
-        rc = ngx_http_lua_regex_exec(re->regex, sd, &subj, (int) pos, cap,
-                                     ovecsize, exec_opts);
-    }
-
-    return rc;
-}
-
-
-void
-ngx_http_lua_ffi_destroy_regex(ngx_http_lua_regex_t *re)
-{
-    ngx_pool_t                  *old_pool;
-
-    dd("destroy regex called");
-
-    if (re == NULL || re->pool == NULL) {
-        return;
-    }
-
-    if (re->regex_sd) {
-        old_pool = ngx_http_lua_pcre_malloc_init(re->pool);
-#if LUA_HAVE_PCRE_JIT
-        pcre_free_study(re->regex_sd);
-#else
-        pcre_free(re->regex_sd);
-#endif
-        ngx_http_lua_pcre_malloc_done(old_pool);
-        re->regex_sd = NULL;
-    }
-
-    ngx_destroy_pool(re->pool);
-}
-
-
-int
-ngx_http_lua_ffi_compile_replace_template(ngx_http_lua_regex_t *re,
-    const u_char *replace_data, size_t replace_len)
-{
-    ngx_int_t                                rc;
-    ngx_str_t                                tpl;
-    ngx_http_lua_complex_value_t            *ctpl;
-    ngx_http_lua_compile_complex_value_t     ccv;
-
-    ctpl = ngx_palloc(re->pool, sizeof(ngx_http_lua_complex_value_t));
-    if (ctpl == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (replace_len != 0) {
-        /* copy the string buffer pointed to by tpl.data from Lua VM */
-        tpl.data = ngx_palloc(re->pool, replace_len + 1);
-        if (tpl.data == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(tpl.data, replace_data, replace_len);
-        tpl.data[replace_len] = '\0';
-
-    } else {
-        tpl.data = (u_char *) replace_data;
-    }
-
-    tpl.len = replace_len;
-
-    ngx_memzero(&ccv, sizeof(ngx_http_lua_compile_complex_value_t));
-    ccv.pool = re->pool;
-    ccv.log = ngx_cycle->log;
-    ccv.value = &tpl;
-    ccv.complex_value = ctpl;
-
-    rc = ngx_http_lua_compile_complex_value(&ccv);
-
-    re->replace = ctpl;
-
-    return rc;
-}
-
-
-ngx_http_lua_script_engine_t *
-ngx_http_lua_ffi_create_script_engine(void)
-{
-    return ngx_calloc(sizeof(ngx_http_lua_script_engine_t), ngx_cycle->log);
-}
-
-
-void
-ngx_http_lua_ffi_init_script_engine(ngx_http_lua_script_engine_t *e,
-    const unsigned char *subj, ngx_http_lua_regex_t *compiled, int count)
-{
-    e->log = ngx_cycle->log;
-    e->ncaptures = count * 2;
-    e->captures = compiled->captures;
-    e->captures_data = (u_char *) subj;
-}
-
-
-void
-ngx_http_lua_ffi_destroy_script_engine(ngx_http_lua_script_engine_t *e)
-{
-    ngx_free(e);
-}
-
-
-size_t
-ngx_http_lua_ffi_script_eval_len(ngx_http_lua_script_engine_t *e,
-    ngx_http_lua_complex_value_t *val)
-{
-    size_t          len;
-
-    ngx_http_lua_script_len_code_pt   lcode;
-
-    e->ip = val->lengths;
-    len = 0;
-
-    while (*(uintptr_t *) e->ip) {
-        lcode = *(ngx_http_lua_script_len_code_pt *) e->ip;
-        len += lcode(e);
-    }
-
-    return len;
-}
-
-
-void
-ngx_http_lua_ffi_script_eval_data(ngx_http_lua_script_engine_t *e,
-    ngx_http_lua_complex_value_t *val, u_char *dst)
-{
-    ngx_http_lua_script_code_pt       code;
-
-    e->ip = val->values;
-    e->pos = dst;
-
-    while (*(uintptr_t *) e->ip) {
-        code = *(ngx_http_lua_script_code_pt *) e->ip;
-        code(e);
-    }
-}
-
-
-uint32_t
-ngx_http_lua_ffi_max_regex_cache_size(void)
-{
-    ngx_http_lua_main_conf_t    *lmcf;
-    lmcf = ngx_http_cycle_get_module_main_conf(ngx_cycle,
-                                               ngx_http_lua_module);
-    if (lmcf == NULL) {
-        return 0;
-    }
-    return (uint32_t) lmcf->regex_cache_max_entries;
-}
-#endif /* NGX_LUA_NO_FFI_API */
-
-
-#endif /* NGX_PCRE */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_regex.h b/debian/modules/http-lua/src/ngx_http_lua_regex.h
deleted file mode 100644
index 03dffb8..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_regex.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_REGEX_H_INCLUDED_
-#define _NGX_HTTP_LUA_REGEX_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-#include "ngx_http_lua_script.h"
-
-
-#if (NGX_PCRE)
-void ngx_http_lua_inject_regex_api(lua_State *L);
-ngx_int_t ngx_http_lua_ffi_set_jit_stack_size(int size, u_char *errstr,
-    size_t *errstr_size);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_REGEX_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_req_body.c b/debian/modules/http-lua/src/ngx_http_lua_req_body.c
deleted file mode 100644
index e6bf3c1..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_req_body.c
+++ /dev/null
@@ -1,1188 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include "ngx_http_lua_req_body.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_headers_in.h"
-
-
-static int ngx_http_lua_ngx_req_read_body(lua_State *L);
-static void ngx_http_lua_req_body_post_read(ngx_http_request_t *r);
-static int ngx_http_lua_ngx_req_discard_body(lua_State *L);
-static int ngx_http_lua_ngx_req_get_body_data(lua_State *L);
-static int ngx_http_lua_ngx_req_get_body_file(lua_State *L);
-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)
-{
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_read_body);
-    lua_setfield(L, -2, "read_body");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_discard_body);
-    lua_setfield(L, -2, "discard_body");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_get_body_data);
-    lua_setfield(L, -2, "get_body_data");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_get_body_file);
-    lua_setfield(L, -2, "get_body_file");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_set_body_data);
-    lua_setfield(L, -2, "set_body_data");
-
-    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");
-}
-
-
-static int
-ngx_http_lua_ngx_req_read_body(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    int                          n;
-    ngx_int_t                    rc;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    n = lua_gettop(L);
-
-    if (n != 0) {
-        return luaL_error(L, "expecting 0 arguments but seen %d", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    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;
-
-#if 1
-    if (r->request_body_in_file_only) {
-        r->request_body_file_log_level = 0;
-    }
-#endif
-
-    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);
-
-    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,
-                   "lua start to read buffered request body");
-
-    rc = ngx_http_read_client_request_body(r, ngx_http_lua_req_body_post_read);
-
-#if (nginx_version < 1002006) ||                                             \
-        (nginx_version >= 1003000 && nginx_version < 1003009)
-    r->main->count--;
-#endif
-
-    if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-        ctx->exit_code = rc;
-        ctx->exited = 1;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http read client request body returned error code %i, "
-                       "exitting now", rc);
-
-        return lua_yield(L, 0);
-    }
-
-#if (nginx_version >= 1002006 && nginx_version < 1003000) ||                 \
-        nginx_version >= 1003009
-    r->main->count--;
-    dd("decrement r->main->count: %d", (int) r->main->count);
-#endif
-
-    if (rc == NGX_AGAIN) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua read buffered request body requires I/O "
-                       "interruptions");
-
-        ctx->waiting_more_body = 1;
-        ctx->downstream = coctx;
-
-        ngx_http_lua_cleanup_pending_operation(coctx);
-        coctx->cleanup = ngx_http_lua_req_body_cleanup;
-        coctx->data = r;
-
-        return lua_yield(L, 0);
-    }
-
-    /* rc == NGX_OK */
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua has read buffered request body in a single run");
-
-    return 0;
-}
-
-
-static void
-ngx_http_lua_req_body_post_read(ngx_http_request_t *r)
-{
-    ngx_http_lua_ctx_t      *ctx;
-    ngx_http_lua_co_ctx_t   *coctx;
-
-    ngx_http_lua_loc_conf_t             *llcf;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua req body post read, c:%ud", r->main->count);
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (ctx->waiting_more_body) {
-        ctx->waiting_more_body = 0;
-
-        coctx = ctx->downstream;
-        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);
-        }
-    }
-}
-
-
-static int
-ngx_http_lua_ngx_req_discard_body(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    ngx_int_t                    rc;
-    int                          n;
-
-    n = lua_gettop(L);
-
-    if (n != 0) {
-        return luaL_error(L, "expecting 0 arguments but seen %d", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "request object not found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    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");
-    }
-
-    return 0;
-}
-
-
-static int
-ngx_http_lua_ngx_req_get_body_data(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    int                          n;
-    size_t                       len;
-    ngx_chain_t                 *cl;
-    u_char                      *p;
-    u_char                      *buf;
-
-    n = lua_gettop(L);
-
-    if (n != 0) {
-        return luaL_error(L, "expecting 0 arguments but seen %d", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "request object not found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->request_body == NULL
-        || r->request_body->temp_file
-        || r->request_body->bufs == NULL)
-    {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    cl = r->request_body->bufs;
-
-    if (cl->next == NULL) {
-        len = cl->buf->last - cl->buf->pos;
-
-        if (len == 0) {
-            lua_pushnil(L);
-            return 1;
-        }
-
-        lua_pushlstring(L, (char *) cl->buf->pos, len);
-        return 1;
-    }
-
-    /* found multi-buffer body */
-
-    len = 0;
-
-    for (; cl; cl = cl->next) {
-        dd("body chunk len: %d", (int) ngx_buf_size(cl->buf));
-        len += cl->buf->last - cl->buf->pos;
-    }
-
-    if (len == 0) {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    buf = (u_char *) lua_newuserdata(L, len);
-
-    p = buf;
-    for (cl = r->request_body->bufs; cl; cl = cl->next) {
-        p = ngx_copy(p, cl->buf->pos, cl->buf->last - cl->buf->pos);
-    }
-
-    lua_pushlstring(L, (char *) buf, len);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_req_get_body_file(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    int                          n;
-
-    n = lua_gettop(L);
-
-    if (n != 0) {
-        return luaL_error(L, "expecting 0 arguments but seen %d", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "request object not found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->request_body == NULL || r->request_body->temp_file == NULL) {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    dd("XXX file directio: %u, f:%u, m:%u, t:%u, end - pos %d, size %d",
-       r->request_body->temp_file->file.directio,
-       r->request_body->bufs->buf->in_file,
-       r->request_body->bufs->buf->memory,
-       r->request_body->bufs->buf->temporary,
-       (int) (r->request_body->bufs->buf->end -
-              r->request_body->bufs->buf->pos),
-       (int) ngx_buf_size(r->request_body->bufs->buf));
-
-    lua_pushlstring(L, (char *) r->request_body->temp_file->file.name.data,
-                    r->request_body->temp_file->file.name.len);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_req_set_body_data(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    int                          n;
-    ngx_http_request_body_t     *rb;
-    ngx_temp_file_t             *tf;
-    ngx_buf_t                   *b;
-    ngx_str_t                    body, key, value;
-#if 1
-    ngx_int_t                    rc;
-#endif
-    ngx_chain_t                 *cl;
-    ngx_buf_tag_t                tag;
-
-    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);
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "request object not found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->discard_body) {
-        return luaL_error(L, "request body already discarded asynchronously");
-    }
-
-    if (r->request_body == NULL) {
-        return luaL_error(L, "request body not read yet");
-    }
-
-    rb = r->request_body;
-
-    tag = (ngx_buf_tag_t) &ngx_http_lua_module;
-
-    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);
-            tf->file.fd = NGX_INVALID_FILE;
-
-            dd("temp file cleaned: %.*s", (int) tf->file.name.len,
-               tf->file.name.data);
-        }
-
-        rb->temp_file = NULL;
-    }
-
-    if (body.len == 0) {
-
-        if (rb->bufs) {
-
-            for (cl = rb->bufs; cl; cl = cl->next) {
-                if (cl->buf->tag == tag && cl->buf->temporary) {
-
-                    dd("free old request body buffer: size:%d",
-                       (int) ngx_buf_size(cl->buf));
-
-                    ngx_pfree(r->pool, cl->buf->start);
-                    cl->buf->tag = (ngx_buf_tag_t) NULL;
-                    cl->buf->temporary = 0;
-                }
-            }
-        }
-
-        rb->bufs = NULL;
-        rb->buf = NULL;
-
-        dd("request body is set to empty string");
-        goto set_header;
-    }
-
-    if (rb->bufs) {
-
-        for (cl = rb->bufs; cl; cl = cl->next) {
-            if (cl->buf->tag == tag && cl->buf->temporary) {
-                dd("free old request body buffer: size:%d",
-                   (int) ngx_buf_size(cl->buf));
-
-                ngx_pfree(r->pool, cl->buf->start);
-                cl->buf->tag = (ngx_buf_tag_t) NULL;
-                cl->buf->temporary = 0;
-            }
-        }
-
-        rb->bufs->next = NULL;
-
-        b = rb->bufs->buf;
-
-        ngx_memzero(b, sizeof(ngx_buf_t));
-
-        b->temporary = 1;
-        b->tag = tag;
-
-        b->start = ngx_palloc(r->pool, body.len);
-        if (b->start == NULL) {
-            return luaL_error(L, "no memory");
-        }
-        b->end = b->start + body.len;
-
-        b->pos = b->start;
-        b->last = ngx_copy(b->pos, body.data, body.len);
-
-    } else {
-
-        rb->bufs = ngx_alloc_chain_link(r->pool);
-        if (rb->bufs == NULL) {
-            return luaL_error(L, "no memory");
-        }
-        rb->bufs->next = NULL;
-
-        b = ngx_create_temp_buf(r->pool, body.len);
-        if (b == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        b->tag = tag;
-        b->last = ngx_copy(b->pos, body.data, body.len);
-
-        rb->bufs->buf = b;
-        rb->buf = b;
-    }
-
-set_header:
-
-    /* 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, "no memory");
-    }
-
-    value.len = ngx_sprintf(value.data, "%uz", body.len) - value.data;
-    value.data[value.len] = '\0';
-
-    dd("setting request Content-Length to %.*s (%d)",
-       (int) value.len, value.data, (int) body.len);
-
-    r->headers_in.content_length_n = body.len;
-
-    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 int
-ngx_http_lua_ngx_req_init_body(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    int                          n;
-    ngx_http_request_body_t     *rb;
-    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);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->discard_body) {
-        return luaL_error(L, "request body already discarded asynchronously");
-    }
-
-    if (r->request_body == NULL) {
-        return luaL_error(L, "request body not read yet");
-    }
-
-    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;
-    }
-
-    if (size == 0) {
-        r->request_body_in_file_only = 1;
-    }
-
-    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, "no memory");
-    }
-
-    rb->bufs = ngx_alloc_chain_link(r->pool);
-    if (rb->bufs == NULL) {
-        return luaL_error(L, "no 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;
-    ngx_chain_t                  chain;
-    ngx_buf_t                    buf;
-
-    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);
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->request_body == NULL
-        || r->request_body->buf == NULL
-        || r->request_body->bufs == NULL)
-    {
-        return luaL_error(L, "request_body not initialized");
-    }
-
-    if (r->request_body_in_file_only) {
-        buf.start = body.data;
-        buf.pos = buf.start;
-        buf.last = buf.start + body.len;
-        buf.end = buf.last;
-        buf.temporary = 1;
-
-        chain.buf = &buf;
-        chain.next = NULL;
-
-        if (ngx_http_lua_write_request_body(r, &chain) != NGX_OK) {
-            return luaL_error(L, "fail to write file");
-        }
-
-        r->headers_in.content_length_n += body.len;
-        return 0;
-    }
-
-    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);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->request_body == NULL
-        || r->request_body->buf == NULL
-        || r->request_body->bufs == NULL)
-    {
-        return luaL_error(L, "request_body not initialized");
-    }
-
-    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, "no 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, "no memory");
-    }
-
-    size = (size_t) 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)
-{
-    ngx_pool_cleanup_t       *c;
-    ngx_pool_cleanup_file_t  *cf;
-
-    for (c = p->cleanup; c; c = c->next) {
-        if (c->handler == ngx_pool_cleanup_file
-            || c->handler == ngx_pool_delete_file)
-        {
-            cf = c->data;
-
-            if (cf->fd == fd) {
-                c->handler(cf);
-                c->handler = NULL;
-                return;
-            }
-        }
-    }
-}
-
-
-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;
-    ngx_temp_file_t             *tf;
-    ngx_buf_t                   *b;
-    ngx_str_t                    name;
-    ngx_int_t                    rc;
-    int                          clean;
-    ngx_open_file_info_t         of;
-    ngx_str_t                    key, value;
-    ngx_pool_cleanup_t          *cln;
-    ngx_pool_cleanup_file_t     *clnf;
-    ngx_err_t                    err;
-    ngx_chain_t                 *cl;
-    ngx_buf_tag_t                tag;
-
-    n = lua_gettop(L);
-
-    if (n != 1 && n != 2) {
-        return luaL_error(L, "expecting 1 or 2 arguments but seen %d", n);
-    }
-
-    p = (u_char *) luaL_checklstring(L, 1, &name.len);
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->discard_body) {
-        return luaL_error(L, "request body already discarded asynchronously");
-    }
-
-    if (r->request_body == NULL) {
-        return luaL_error(L, "request body not read yet");
-    }
-
-    name.data = ngx_palloc(r->pool, name.len + 1);
-    if (name.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    ngx_memcpy(name.data, p, name.len);
-    name.data[name.len] = '\0';
-
-    if (n == 2) {
-        luaL_checktype(L, 2, LUA_TBOOLEAN);
-        clean = lua_toboolean(L, 2);
-
-    } else {
-        clean = 0;
-    }
-
-    dd("clean: %d", (int) clean);
-
-    rb = r->request_body;
-
-    /* clean up existing r->request_body->bufs (if any) */
-
-    tag = (ngx_buf_tag_t) &ngx_http_lua_module;
-
-    if (rb->bufs) {
-        dd("XXX reusing buf");
-
-        for (cl = rb->bufs; cl; cl = cl->next) {
-            if (cl->buf->tag == tag && cl->buf->temporary) {
-                dd("free old request body buffer: size:%d",
-                   (int) ngx_buf_size(cl->buf));
-
-                ngx_pfree(r->pool, cl->buf->start);
-                cl->buf->tag = (ngx_buf_tag_t) NULL;
-                cl->buf->temporary = 0;
-            }
-        }
-
-        rb->bufs->next = NULL;
-        b = rb->bufs->buf;
-
-        ngx_memzero(b, sizeof(ngx_buf_t));
-
-        b->tag = tag;
-        rb->buf = NULL;
-
-    } else {
-
-        dd("XXX creating new buf");
-
-        rb->bufs = ngx_alloc_chain_link(r->pool);
-        if (rb->bufs == NULL) {
-            return luaL_error(L, "no memory");
-        }
-        rb->bufs->next = NULL;
-
-        b = ngx_calloc_buf(r->pool);
-        if (b == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        b->tag = tag;
-
-        rb->bufs->buf = b;
-        rb->buf = NULL;
-    }
-
-    b->last_in_chain = 1;
-
-    /* just make r->request_body->temp_file a bare stub */
-
-    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);
-        }
-
-    } else {
-
-        tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
-        if (tf == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        tf->file.fd = NGX_INVALID_FILE;
-        rb->temp_file = tf;
-    }
-
-    /* read the file info and construct an in-file buf */
-
-    ngx_memzero(&of, sizeof(ngx_open_file_info_t));
-
-    of.directio = NGX_OPEN_FILE_DIRECTIO_OFF;
-
-    if (ngx_http_lua_open_and_stat_file(name.data, &of, r->connection->log)
-        != NGX_OK)
-    {
-        return luaL_error(L, "%s \"%s\" failed", of.failed, name.data);
-    }
-
-    dd("XXX new body file fd: %d", of.fd);
-
-    tf->file.fd = of.fd;
-    tf->file.name = name;
-    tf->file.log = r->connection->log;
-    tf->file.directio = 0;
-
-    if (of.size == 0) {
-        if (clean) {
-            if (ngx_delete_file(name.data) == NGX_FILE_ERROR) {
-                err = ngx_errno;
-
-                if (err != NGX_ENOENT) {
-                    ngx_log_error(NGX_LOG_CRIT, r->connection->log, err,
-                                  ngx_delete_file_n " \"%s\" failed",
-                                  name.data);
-                }
-            }
-        }
-
-        if (ngx_close_file(of.fd) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
-                          ngx_close_file_n " \"%s\" failed", name.data);
-        }
-
-        r->request_body->bufs = NULL;
-        r->request_body->buf = NULL;
-
-        goto set_header;
-    }
-
-    /* register file cleanup hook */
-
-    cln = ngx_pool_cleanup_add(r->pool,
-                               sizeof(ngx_pool_cleanup_file_t));
-
-    if (cln == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    cln->handler = clean ? ngx_pool_delete_file : ngx_pool_cleanup_file;
-    clnf = cln->data;
-
-    clnf->fd = of.fd;
-    clnf->name = name.data;
-    clnf->log = r->pool->log;
-
-    b->file = &tf->file;
-    if (b->file == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    dd("XXX file size: %d", (int) of.size);
-
-    b->file_pos = 0;
-    b->file_last = of.size;
-
-    b->in_file = 1;
-
-    dd("buf file: %p, f:%u", b->file, b->in_file);
-
-set_header:
-
-    /* override input header Content-Length (value must be null terminated) */
-
-    value.data = ngx_palloc(r->pool, NGX_OFF_T_LEN + 1);
-    if (value.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    value.len = ngx_sprintf(value.data, "%O", of.size) - value.data;
-    value.data[value.len] = '\0';
-
-    r->headers_in.content_length_n = of.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 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;
-
-        if (body == NULL) {
-            /* empty body with r->request_body_in_file_only */
-
-            if (ngx_create_temp_file(&tf->file, tf->path, tf->pool,
-                                     tf->persistent, tf->clean, tf->access)
-                != NGX_OK)
-            {
-                return NGX_ERROR;
-            }
-
-            return NGX_OK;
-        }
-    }
-
-    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)
-{
-    lua_State                   *vm;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_connection_t            *c;
-    ngx_http_lua_ctx_t          *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    ctx->resume_handler = ngx_http_lua_wev_handler;
-
-    c = r->connection;
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_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;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_req_body.h b/debian/modules/http-lua/src/ngx_http_lua_req_body.h
deleted file mode 100644
index 38b0e72..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_req_body.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_REQ_BODY_H_INCLUDED_
-#define _NGX_HTTP_LUA_REQ_BODY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_req_body_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_REQ_BODY_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_req_method.c b/debian/modules/http-lua/src/ngx_http_lua_req_method.c
deleted file mode 100644
index a4969b9..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_req_method.c
+++ /dev/null
@@ -1,253 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#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);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "request object not found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    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);
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "request object not found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    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;
-
-        case NGX_HTTP_MKCOL:
-            r->method_name = ngx_http_lua_mkcol_method;
-            break;
-
-        case NGX_HTTP_COPY:
-            r->method_name = ngx_http_lua_copy_method;
-            break;
-
-        case NGX_HTTP_MOVE:
-            r->method_name = ngx_http_lua_move_method;
-            break;
-
-        case NGX_HTTP_PROPFIND:
-            r->method_name = ngx_http_lua_propfind_method;
-            break;
-
-        case NGX_HTTP_PROPPATCH:
-            r->method_name = ngx_http_lua_proppatch_method;
-            break;
-
-        case NGX_HTTP_LOCK:
-            r->method_name = ngx_http_lua_lock_method;
-            break;
-
-        case NGX_HTTP_UNLOCK:
-            r->method_name = ngx_http_lua_unlock_method;
-            break;
-
-        case NGX_HTTP_PATCH:
-            r->method_name = ngx_http_lua_patch_method;
-            break;
-
-        case NGX_HTTP_TRACE:
-            r->method_name = ngx_http_lua_trace_method;
-            break;
-
-        default:
-            return luaL_error(L, "unsupported HTTP method: %d", method);
-    }
-
-    r->method = method;
-
-    return 0;
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_req_get_method(ngx_http_request_t *r)
-{
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    return r->method;
-}
-
-
-int
-ngx_http_lua_ffi_req_get_method_name(ngx_http_request_t *r, u_char **name,
-    size_t *len)
-{
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    *name = r->method_name.data;
-    *len = r->method_name.len;
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_req_set_method(ngx_http_request_t *r, int method)
-{
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
-    }
-
-    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;
-
-        case NGX_HTTP_MKCOL:
-            r->method_name = ngx_http_lua_mkcol_method;
-            break;
-
-        case NGX_HTTP_COPY:
-            r->method_name = ngx_http_lua_copy_method;
-            break;
-
-        case NGX_HTTP_MOVE:
-            r->method_name = ngx_http_lua_move_method;
-            break;
-
-        case NGX_HTTP_PROPFIND:
-            r->method_name = ngx_http_lua_propfind_method;
-            break;
-
-        case NGX_HTTP_PROPPATCH:
-            r->method_name = ngx_http_lua_proppatch_method;
-            break;
-
-        case NGX_HTTP_LOCK:
-            r->method_name = ngx_http_lua_lock_method;
-            break;
-
-        case NGX_HTTP_UNLOCK:
-            r->method_name = ngx_http_lua_unlock_method;
-            break;
-
-        case NGX_HTTP_PATCH:
-            r->method_name = ngx_http_lua_patch_method;
-            break;
-
-        case NGX_HTTP_TRACE:
-            r->method_name = ngx_http_lua_trace_method;
-            break;
-
-        default:
-            return NGX_DECLINED;
-    }
-
-    r->method = method;
-    return NGX_OK;
-}
-#endif
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_req_method.h b/debian/modules/http-lua/src/ngx_http_lua_req_method.h
deleted file mode 100644
index f8aa1af..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_req_method.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_METHOD_H_INCLUDED_
-#define _NGX_HTTP_LUA_METHOD_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_req_method_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_METHOD_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
deleted file mode 100644
index 1bbe87c..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.c
+++ /dev/null
@@ -1,380 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include <nginx.h>
-#include "ngx_http_lua_rewriteby.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_exception.h"
-#include "ngx_http_lua_cache.h"
-
-
-static ngx_int_t ngx_http_lua_rewrite_by_chunk(lua_State *L,
-    ngx_http_request_t *r);
-
-
-ngx_int_t
-ngx_http_lua_rewrite_handler(ngx_http_request_t *r)
-{
-    ngx_http_lua_loc_conf_t     *llcf;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_int_t                    rc;
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    /* XXX we need to take into account ngx_rewrite's location dump */
-    if (r->uri_changed) {
-        return NGX_DECLINED;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua rewrite handler, uri:\"%V\" c:%ud", &r->uri,
-                   r->main->count);
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    if (!lmcf->postponed_to_rewrite_phase_end) {
-        ngx_http_core_main_conf_t       *cmcf;
-        ngx_http_phase_handler_t        tmp;
-        ngx_http_phase_handler_t        *ph;
-        ngx_http_phase_handler_t        *cur_ph;
-        ngx_http_phase_handler_t        *last_ph;
-
-        lmcf->postponed_to_rewrite_phase_end = 1;
-
-        cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-        ph = cmcf->phase_engine.handlers;
-        cur_ph = &ph[r->phase_handler];
-        last_ph = &ph[cur_ph->next - 1];
-
-#if 0
-        if (cur_ph == last_ph) {
-            dd("XXX our handler is already the last rewrite phase handler");
-        }
-#endif
-
-        if (cur_ph < last_ph) {
-            dd("swaping the contents of cur_ph and last_ph...");
-
-            tmp      = *cur_ph;
-
-            memmove(cur_ph, cur_ph + 1,
-                    (last_ph - cur_ph) * sizeof (ngx_http_phase_handler_t));
-
-            *last_ph = tmp;
-
-            r->phase_handler--; /* redo the current ph */
-
-            return NGX_DECLINED;
-        }
-    }
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    if (llcf->rewrite_handler == NULL) {
-        dd("no rewrite 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_HTTP_INTERNAL_SERVER_ERROR;
-        }
-    }
-
-    dd("entered? %d", (int) ctx->entered_rewrite_phase);
-
-    if (ctx->entered_rewrite_phase) {
-        dd("rewriteby: calling wev handler");
-        rc = ctx->resume_handler(r);
-        dd("rewriteby: wev handler returns %d", (int) rc);
-
-        if (rc == NGX_OK) {
-            rc = NGX_DECLINED;
-        }
-
-        if (rc == NGX_DECLINED) {
-            if (r->header_sent) {
-                dd("header already sent");
-
-                /* response header was already generated in rewrite_by_lua*,
-                 * so it is no longer safe to proceed to later phases
-                 * which may generate responses again */
-
-                if (!ctx->eof) {
-                    dd("eof not yet sent");
-
-                    rc = ngx_http_lua_send_chain_link(r, ctx, NULL
-                                                     /* indicate last_buf */);
-                    if (rc == NGX_ERROR || rc > NGX_OK) {
-                        return rc;
-                    }
-                }
-
-                return NGX_HTTP_OK;
-            }
-
-            r->write_event_handler = ngx_http_core_run_phases;
-            ctx->entered_rewrite_phase = 0;
-
-            return NGX_DECLINED;
-        }
-
-        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,
-                                       ngx_http_lua_generic_phase_post_read);
-
-        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-#if (nginx_version < 1002006) ||                                             \
-        (nginx_version >= 1003000 && nginx_version < 1003009)
-            r->main->count--;
-#endif
-
-            return rc;
-        }
-
-        if (rc == NGX_AGAIN) {
-            ctx->waiting_more_body = 1;
-            return NGX_DONE;
-        }
-    }
-
-    dd("calling rewrite handler");
-    return llcf->rewrite_handler(r);
-}
-
-
-ngx_int_t
-ngx_http_lua_rewrite_handler_inline(ngx_http_request_t *r)
-{
-    lua_State                   *L;
-    ngx_int_t                    rc;
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    dd("rewrite by lua inline");
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua inline script (w/ cache) sp = 1 */
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       llcf->rewrite_src.value.data,
-                                       llcf->rewrite_src.value.len,
-                                       llcf->rewrite_src_key,
-                                       (const char *)
-                                       llcf->rewrite_chunkname);
-    if (rc != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    return ngx_http_lua_rewrite_by_chunk(L, r);
-}
-
-
-ngx_int_t
-ngx_http_lua_rewrite_handler_file(ngx_http_request_t *r)
-{
-    lua_State                       *L;
-    ngx_int_t                        rc;
-    u_char                          *script_path;
-    ngx_http_lua_loc_conf_t         *llcf;
-    ngx_str_t                        eval_src;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    if (ngx_http_complex_value(r, &llcf->rewrite_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;
-    }
-
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    /*  load Lua script file (w/ cache)        sp = 1 */
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L, script_path,
-                                     llcf->rewrite_src_key);
-    if (rc != NGX_OK) {
-        if (rc < NGX_HTTP_SPECIAL_RESPONSE) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        return rc;
-    }
-
-    return ngx_http_lua_rewrite_by_chunk(L, r);
-}
-
-
-static ngx_int_t
-ngx_http_lua_rewrite_by_chunk(lua_State *L, ngx_http_request_t *r)
-{
-    int                      co_ref;
-    lua_State               *co;
-    ngx_int_t                rc;
-    ngx_uint_t               nreqs;
-    ngx_event_t             *rev;
-    ngx_connection_t        *c;
-    ngx_http_lua_ctx_t      *ctx;
-    ngx_http_cleanup_t      *cln;
-
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    /*  {{{ 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");
-
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    /*  move code closure to new coroutine */
-    lua_xmove(L, co, 1);
-
-    /*  set closure's env table to new coroutine's globals table */
-    ngx_http_lua_get_globals_table(co);
-    lua_setfenv(co, -2);
-
-    /*  save nginx request in coroutine globals table */
-    ngx_http_lua_set_req(co, r);
-
-    /*  {{{ initialize request context */
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    dd("ctx = %p", ctx);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_http_lua_reset_ctx(r, L, ctx);
-
-    ctx->entered_rewrite_phase = 1;
-
-    ctx->cur_co_ctx = &ctx->entry_co_ctx;
-    ctx->cur_co_ctx->co = co;
-    ctx->cur_co_ctx->co_ref = co_ref;
-#ifdef NGX_LUA_USE_ASSERT
-    ctx->cur_co_ctx->co_top = 1;
-#endif
-
-    /*  }}} */
-
-    /*  {{{ register request cleanup hooks */
-    if (ctx->cleanup == NULL) {
-        cln = ngx_http_cleanup_add(r, 0);
-        if (cln == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        cln->handler = ngx_http_lua_request_cleanup_handler;
-        cln->data = ctx;
-        ctx->cleanup = &cln->handler;
-    }
-    /*  }}} */
-
-    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;
-
-#if (NGX_HTTP_V2)
-        if (!r->stream) {
-#endif
-
-        rev = r->connection->read;
-
-        if (!rev->active) {
-            if (ngx_add_event(rev, NGX_READ_EVENT, 0) != NGX_OK) {
-                return NGX_ERROR;
-            }
-        }
-
-#if (NGX_HTTP_V2)
-        }
-#endif
-
-    } else {
-        r->read_event_handler = ngx_http_block_reading;
-    }
-
-    c = r->connection;
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(L, r, ctx, 0);
-
-    if (rc == NGX_ERROR || rc > NGX_OK) {
-        return rc;
-    }
-
-    if (rc == NGX_AGAIN) {
-        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx, nreqs);
-
-    } else if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        rc = ngx_http_lua_run_posted_threads(c, L, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_OK || rc == NGX_DECLINED) {
-        if (r->header_sent) {
-            dd("header already sent");
-
-            /* response header was already generated in rewrite_by_lua*,
-             * so it is no longer safe to proceed to later phases
-             * which may generate responses again */
-
-            if (!ctx->eof) {
-                dd("eof not yet sent");
-
-                rc = ngx_http_lua_send_chain_link(r, ctx, NULL
-                                                  /* indicate last_buf */);
-                if (rc == NGX_ERROR || rc > NGX_OK) {
-                    return rc;
-                }
-            }
-
-            return NGX_HTTP_OK;
-        }
-
-        r->write_event_handler = ngx_http_core_run_phases;
-        ctx->entered_rewrite_phase = 0;
-
-        return NGX_DECLINED;
-    }
-
-    return rc;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.h b/debian/modules/http-lua/src/ngx_http_lua_rewriteby.h
deleted file mode 100644
index 172c295..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_rewriteby.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_REWRITEBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_REWRITEBY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-ngx_int_t ngx_http_lua_rewrite_handler(ngx_http_request_t *r);
-ngx_int_t ngx_http_lua_rewrite_handler_inline(ngx_http_request_t *r);
-ngx_int_t ngx_http_lua_rewrite_handler_file(ngx_http_request_t *r);
-
-
-#endif /* _NGX_HTTP_LUA_REWRITEBY_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_script.c b/debian/modules/http-lua/src/ngx_http_lua_script.c
deleted file mode 100644
index 95ebadf..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_script.c
+++ /dev/null
@@ -1,538 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_script.h"
-
-
-static void *ngx_http_lua_script_add_code(ngx_array_t *codes, size_t size);
-static size_t ngx_http_lua_script_copy_len_code(
-    ngx_http_lua_script_engine_t *e);
-static void ngx_http_lua_script_copy_code(ngx_http_lua_script_engine_t *e);
-static ngx_int_t ngx_http_lua_script_add_copy_code(
-    ngx_http_lua_script_compile_t *sc, ngx_str_t *value, ngx_uint_t last);
-static ngx_int_t ngx_http_lua_script_compile(ngx_http_lua_script_compile_t *sc);
-static ngx_int_t ngx_http_lua_script_add_capture_code(
-    ngx_http_lua_script_compile_t *sc, ngx_uint_t n);
-static size_t ngx_http_lua_script_copy_capture_len_code(
-    ngx_http_lua_script_engine_t *e);
-static void ngx_http_lua_script_copy_capture_code(
-    ngx_http_lua_script_engine_t *e);
-static ngx_int_t ngx_http_lua_script_done(ngx_http_lua_script_compile_t *sc);
-static ngx_int_t ngx_http_lua_script_init_arrays(
-    ngx_http_lua_script_compile_t *sc);
-
-
-ngx_int_t
-ngx_http_lua_compile_complex_value(ngx_http_lua_compile_complex_value_t *ccv)
-{
-    ngx_str_t                  *v;
-    ngx_uint_t                  i, n, nv;
-    ngx_array_t                 lengths, values, *pl, *pv;
-
-    ngx_http_lua_script_compile_t   sc;
-
-    v = ccv->value;
-
-    nv = 0;
-
-    for (i = 0; i < v->len; i++) {
-        if (v->data[i] == '$') {
-            nv++;
-        }
-    }
-
-    ccv->complex_value->value = *v;
-    ccv->complex_value->lengths = NULL;
-    ccv->complex_value->values = NULL;
-
-    if (nv == 0) {
-        return NGX_OK;
-    }
-
-    n = nv * (2 * sizeof(ngx_http_lua_script_copy_code_t)
-              + sizeof(ngx_http_lua_script_capture_code_t))
-        + sizeof(uintptr_t);
-
-    if (ngx_array_init(&lengths, ccv->pool, n, 1) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    n = (nv * (2 * sizeof(ngx_http_lua_script_copy_code_t)
-                   + sizeof(ngx_http_lua_script_capture_code_t))
-                + sizeof(uintptr_t)
-                + sizeof(uintptr_t) - 1)
-            & ~(sizeof(uintptr_t) - 1);
-
-    if (ngx_array_init(&values, ccv->pool, n, 1) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    pl = &lengths;
-    pv = &values;
-
-    ngx_memzero(&sc, sizeof(ngx_http_lua_script_compile_t));
-
-    sc.pool = ccv->pool;
-    sc.log = ccv->log;
-    sc.source = v;
-    sc.lengths = &pl;
-    sc.values = &pv;
-    sc.complete_lengths = 1;
-    sc.complete_values = 1;
-
-    if (ngx_http_lua_script_compile(&sc) != NGX_OK) {
-        ngx_array_destroy(&lengths);
-        ngx_array_destroy(&values);
-        return NGX_ERROR;
-    }
-
-    ccv->complex_value->lengths = lengths.elts;
-    ccv->complex_value->values = values.elts;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_lua_complex_value(ngx_http_request_t *r, ngx_str_t *subj,
-    size_t offset, ngx_int_t count, int *cap,
-    ngx_http_lua_complex_value_t *val, luaL_Buffer *luabuf)
-{
-    size_t                            len;
-    u_char                           *p;
-    ngx_http_lua_script_code_pt       code;
-    ngx_http_lua_script_len_code_pt   lcode;
-    ngx_http_lua_script_engine_t      e;
-
-    if (val->lengths == NULL) {
-        luaL_addlstring(luabuf, (char *) &subj->data[offset], cap[0] - offset);
-        luaL_addlstring(luabuf, (char *) val->value.data, val->value.len);
-
-        return NGX_OK;
-    }
-
-    ngx_memzero(&e, sizeof(ngx_http_lua_script_engine_t));
-
-    e.log = r->connection->log;
-    e.ncaptures = count * 2;
-    e.captures = cap;
-    e.captures_data = subj->data;
-
-    e.ip = val->lengths;
-
-    len = 0;
-
-    while (*(uintptr_t *) e.ip) {
-        lcode = *(ngx_http_lua_script_len_code_pt *) e.ip;
-        len += lcode(&e);
-    }
-
-    p = ngx_pnalloc(r->pool, len);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    e.ip = val->values;
-    e.pos = p;
-
-    while (*(uintptr_t *) e.ip) {
-        code = *(ngx_http_lua_script_code_pt *) e.ip;
-        code((ngx_http_lua_script_engine_t *) &e);
-    }
-
-    luaL_addlstring(luabuf, (char *) &subj->data[offset], cap[0] - offset);
-    luaL_addlstring(luabuf, (char *) p, len);
-
-    ngx_pfree(r->pool, p);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_script_compile(ngx_http_lua_script_compile_t *sc)
-{
-    u_char       ch;
-    ngx_str_t    name;
-    ngx_uint_t   i, bracket;
-    unsigned     num_var;
-    ngx_uint_t   n = 0;
-
-    if (ngx_http_lua_script_init_arrays(sc) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    for (i = 0; i < sc->source->len; /* void */ ) {
-
-        name.len = 0;
-
-        if (sc->source->data[i] == '$') {
-
-            if (++i == sc->source->len) {
-                goto invalid_variable;
-            }
-
-            if (sc->source->data[i] == '$') {
-                name.data = &sc->source->data[i];
-                i++;
-                name.len++;
-
-                if (ngx_http_lua_script_add_copy_code(sc, &name,
-                                                      (i == sc->source->len))
-                    != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-
-                continue;
-            }
-
-            if (sc->source->data[i] >= '0' && sc->source->data[i] <= '9') {
-                num_var = 1;
-                n = 0;
-
-            } else {
-                num_var = 0;
-            }
-
-            if (sc->source->data[i] == '{') {
-                bracket = 1;
-
-                if (++i == sc->source->len) {
-                    goto invalid_variable;
-                }
-
-                if (sc->source->data[i] >= '0' && sc->source->data[i] <= '9') {
-                    num_var = 1;
-                    n = 0;
-                }
-
-                name.data = &sc->source->data[i];
-
-            } else {
-                bracket = 0;
-                name.data = &sc->source->data[i];
-            }
-
-            for ( /* void */ ; i < sc->source->len; i++, name.len++) {
-                ch = sc->source->data[i];
-
-                if (ch == '}' && bracket) {
-                    i++;
-                    bracket = 0;
-                    break;
-                }
-
-                if (num_var) {
-                    if (ch >= '0' && ch <= '9') {
-                        n = n * 10 + (ch - '0');
-                        continue;
-                    }
-
-                    break;
-                }
-
-                /* not a number variable like $1, $2, etc */
-
-                if ((ch >= 'A' && ch <= 'Z')
-                    || (ch >= 'a' && ch <= 'z')
-                    || (ch >= '0' && ch <= '9')
-                    || ch == '_')
-                {
-                    continue;
-                }
-
-                break;
-            }
-
-            if (bracket) {
-                ngx_log_error(NGX_LOG_ERR, sc->log, 0,
-                              "the closing bracket in \"%V\" "
-                              "variable is missing", &name);
-                return NGX_ERROR;
-            }
-
-            if (name.len == 0) {
-                goto invalid_variable;
-            }
-
-            if (!num_var) {
-                ngx_log_error(NGX_LOG_ERR, sc->log, 0,
-                              "attempt to use named capturing variable "
-                              "\"%V\" (named captures not supported yet)",
-                              &name);
-
-                return NGX_ERROR;
-            }
-
-            sc->variables++;
-
-            if (ngx_http_lua_script_add_capture_code(sc, n) != NGX_OK) {
-                return NGX_ERROR;
-            }
-
-            continue;
-        }
-
-        name.data = &sc->source->data[i];
-
-        while (i < sc->source->len) {
-
-            if (sc->source->data[i] == '$') {
-                break;
-            }
-
-            i++;
-            name.len++;
-        }
-
-        if (ngx_http_lua_script_add_copy_code(sc, &name, (i == sc->source->len))
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    return ngx_http_lua_script_done(sc);
-
-invalid_variable:
-
-    ngx_log_error(NGX_LOG_ERR, sc->log, 0,
-                  "lua script: invalid capturing variable name found in \"%V\"",
-                  sc->source);
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_http_lua_script_add_copy_code(ngx_http_lua_script_compile_t *sc,
-    ngx_str_t *value, ngx_uint_t last)
-{
-    size_t                            size, len;
-    ngx_http_lua_script_copy_code_t  *code;
-
-    len = value->len;
-
-    code = ngx_http_lua_script_add_code(*sc->lengths,
-                                    sizeof(ngx_http_lua_script_copy_code_t));
-    if (code == NULL) {
-        return NGX_ERROR;
-    }
-
-    code->code = (ngx_http_lua_script_code_pt)
-                 ngx_http_lua_script_copy_len_code;
-    code->len = len;
-
-    size = (sizeof(ngx_http_lua_script_copy_code_t) + len +
-            sizeof(uintptr_t) - 1) & ~(sizeof(uintptr_t) - 1);
-
-    code = ngx_http_lua_script_add_code(*sc->values, size);
-    if (code == NULL) {
-        return NGX_ERROR;
-    }
-
-    code->code = ngx_http_lua_script_copy_code;
-    code->len = len;
-
-    ngx_memcpy((u_char *) code + sizeof(ngx_http_lua_script_copy_code_t),
-               value->data, value->len);
-
-    return NGX_OK;
-}
-
-
-static size_t
-ngx_http_lua_script_copy_len_code(ngx_http_lua_script_engine_t *e)
-{
-    ngx_http_lua_script_copy_code_t  *code;
-
-    code = (ngx_http_lua_script_copy_code_t *) e->ip;
-
-    e->ip += sizeof(ngx_http_lua_script_copy_code_t);
-
-    return code->len;
-}
-
-
-static void
-ngx_http_lua_script_copy_code(ngx_http_lua_script_engine_t *e)
-{
-    u_char                           *p;
-    ngx_http_lua_script_copy_code_t  *code;
-
-    code = (ngx_http_lua_script_copy_code_t *) e->ip;
-
-    p = e->pos;
-
-    if (!e->skip) {
-        e->pos = ngx_copy(p, e->ip + sizeof(ngx_http_lua_script_copy_code_t),
-                          code->len);
-    }
-
-    e->ip += sizeof(ngx_http_lua_script_copy_code_t)
-          + ((code->len + sizeof(uintptr_t) - 1) & ~(sizeof(uintptr_t) - 1));
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, e->log, 0,
-                   "lua script copy: \"%*s\"", e->pos - p, p);
-}
-
-
-static ngx_int_t
-ngx_http_lua_script_add_capture_code(ngx_http_lua_script_compile_t *sc,
-    ngx_uint_t n)
-{
-    ngx_http_lua_script_capture_code_t  *code;
-
-    code = ngx_http_lua_script_add_code(*sc->lengths,
-                                  sizeof(ngx_http_lua_script_capture_code_t));
-    if (code == NULL) {
-        return NGX_ERROR;
-    }
-
-    code->code = (ngx_http_lua_script_code_pt)
-                 ngx_http_lua_script_copy_capture_len_code;
-    code->n = 2 * n;
-
-    code = ngx_http_lua_script_add_code(*sc->values,
-                                  sizeof(ngx_http_lua_script_capture_code_t));
-    if (code == NULL) {
-        return NGX_ERROR;
-    }
-
-    code->code = ngx_http_lua_script_copy_capture_code;
-    code->n = 2 * n;
-
-    return NGX_OK;
-}
-
-
-static size_t
-ngx_http_lua_script_copy_capture_len_code(ngx_http_lua_script_engine_t *e)
-{
-    int                                  *cap;
-    ngx_uint_t                            n;
-    ngx_http_lua_script_capture_code_t   *code;
-
-    code = (ngx_http_lua_script_capture_code_t *) e->ip;
-
-    e->ip += sizeof(ngx_http_lua_script_capture_code_t);
-
-    n = code->n;
-
-    if (n < e->ncaptures) {
-        cap = e->captures;
-        return cap[n + 1] - cap[n];
-    }
-
-    return 0;
-}
-
-
-static void
-ngx_http_lua_script_copy_capture_code(ngx_http_lua_script_engine_t *e)
-{
-    int                                  *cap;
-    u_char                               *p, *pos;
-    ngx_uint_t                            n;
-    ngx_http_lua_script_capture_code_t   *code;
-
-    code = (ngx_http_lua_script_capture_code_t *) e->ip;
-
-    e->ip += sizeof(ngx_http_lua_script_capture_code_t);
-
-    n = code->n;
-
-    pos = e->pos;
-
-    if (n < e->ncaptures) {
-
-        cap = e->captures;
-        p = e->captures_data;
-
-        e->pos = ngx_copy(pos, &p[cap[n]], cap[n + 1] - cap[n]);
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, e->log, 0,
-                   "lua script capture: \"%*s\"", e->pos - pos, pos);
-}
-
-
-static ngx_int_t
-ngx_http_lua_script_init_arrays(ngx_http_lua_script_compile_t *sc)
-{
-    ngx_uint_t   n;
-
-    if (*sc->lengths == NULL) {
-        n = sc->variables * (2 * sizeof(ngx_http_lua_script_copy_code_t)
-                             + sizeof(ngx_http_lua_script_capture_code_t))
-            + sizeof(uintptr_t);
-
-        *sc->lengths = ngx_array_create(sc->pool, n, 1);
-        if (*sc->lengths == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    if (*sc->values == NULL) {
-        n = (sc->variables * (2 * sizeof(ngx_http_lua_script_copy_code_t)
-                              + sizeof(ngx_http_lua_script_capture_code_t))
-                + sizeof(uintptr_t)
-                + sizeof(uintptr_t) - 1)
-            & ~(sizeof(uintptr_t) - 1);
-
-        *sc->values = ngx_array_create(sc->pool, n, 1);
-        if (*sc->values == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    sc->variables = 0;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_script_done(ngx_http_lua_script_compile_t *sc)
-{
-    uintptr_t   *code;
-
-    if (sc->complete_lengths) {
-        code = ngx_http_lua_script_add_code(*sc->lengths, sizeof(uintptr_t));
-        if (code == NULL) {
-            return NGX_ERROR;
-        }
-
-        *code = (uintptr_t) NULL;
-    }
-
-    if (sc->complete_values) {
-        code = ngx_http_lua_script_add_code(*sc->values, sizeof(uintptr_t));
-        if (code == NULL) {
-            return NGX_ERROR;
-        }
-
-        *code = (uintptr_t) NULL;
-    }
-
-    return NGX_OK;
-}
-
-
-static void *
-ngx_http_lua_script_add_code(ngx_array_t *codes, size_t size)
-{
-    return ngx_array_push_n(codes, size);
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_script.h b/debian/modules/http-lua/src/ngx_http_lua_script.h
deleted file mode 100644
index 9fdca96..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_script.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SCRIPT_H_INCLUDED_
-#define _NGX_HTTP_LUA_SCRIPT_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-typedef struct {
-    ngx_log_t                  *log;
-    ngx_pool_t                 *pool;
-    ngx_str_t                  *source;
-
-    ngx_array_t               **lengths;
-    ngx_array_t               **values;
-
-    ngx_uint_t                  variables;
-
-    unsigned                    complete_lengths:1;
-    unsigned                    complete_values:1;
-} ngx_http_lua_script_compile_t;
-
-
-typedef struct {
-    ngx_str_t                   value;
-    void                       *lengths;
-    void                       *values;
-} ngx_http_lua_complex_value_t;
-
-
-typedef struct {
-    ngx_log_t                       *log;
-    ngx_pool_t                      *pool;
-    ngx_str_t                       *value;
-    ngx_http_lua_complex_value_t    *complex_value;
-} ngx_http_lua_compile_complex_value_t;
-
-
-typedef struct {
-    u_char                     *ip;
-    u_char                     *pos;
-
-    ngx_str_t                   buf;
-
-    int                        *captures;
-    ngx_uint_t                  ncaptures;
-    u_char                     *captures_data;
-
-    unsigned                    skip:1;
-
-    ngx_log_t                  *log;
-} ngx_http_lua_script_engine_t;
-
-
-typedef void (*ngx_http_lua_script_code_pt) (ngx_http_lua_script_engine_t *e);
-typedef size_t (*ngx_http_lua_script_len_code_pt)
-    (ngx_http_lua_script_engine_t *e);
-
-
-typedef struct {
-    ngx_http_lua_script_code_pt     code;
-    uintptr_t                       len;
-} ngx_http_lua_script_copy_code_t;
-
-
-typedef struct {
-    ngx_http_lua_script_code_pt     code;
-    uintptr_t                       n;
-} ngx_http_lua_script_capture_code_t;
-
-
-ngx_int_t ngx_http_lua_compile_complex_value(
-    ngx_http_lua_compile_complex_value_t *ccv);
-ngx_int_t ngx_http_lua_complex_value(ngx_http_request_t *r, ngx_str_t *subj,
-    size_t offset, ngx_int_t count, int *cap,
-    ngx_http_lua_complex_value_t *val, luaL_Buffer *luabuf);
-
-
-#endif /* _NGX_HTTP_LUA_SCRIPT_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_semaphore.c b/debian/modules/http-lua/src/ngx_http_lua_semaphore.c
deleted file mode 100644
index 0b70aea..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_semaphore.c
+++ /dev/null
@@ -1,578 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- * Copyright (C) cuiweixie
- * I hereby assign copyright in this code to the lua-nginx-module project,
- * to be licensed under the same terms as the rest of the code.
- */
-
-
-#ifndef NGX_LUA_NO_FFI_API
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_semaphore.h"
-#include "ngx_http_lua_contentby.h"
-
-
-ngx_int_t ngx_http_lua_sema_mm_init(ngx_conf_t *cf,
-    ngx_http_lua_main_conf_t *lmcf);
-void ngx_http_lua_sema_mm_cleanup(void *data);
-static ngx_http_lua_sema_t *ngx_http_lua_alloc_sema(void);
-static void ngx_http_lua_free_sema(ngx_http_lua_sema_t *sem);
-static ngx_int_t ngx_http_lua_sema_resume(ngx_http_request_t *r);
-int ngx_http_lua_ffi_sema_new(ngx_http_lua_sema_t **psem,
-    int n, char **errmsg);
-int ngx_http_lua_ffi_sema_post(ngx_http_lua_sema_t *sem, int n);
-int ngx_http_lua_ffi_sema_wait(ngx_http_request_t *r,
-    ngx_http_lua_sema_t *sem, int wait_ms, u_char *err, size_t *errlen);
-static void ngx_http_lua_sema_cleanup(void *data);
-static void ngx_http_lua_sema_handler(ngx_event_t *ev);
-static void ngx_http_lua_sema_timeout_handler(ngx_event_t *ev);
-void ngx_http_lua_ffi_sema_gc(ngx_http_lua_sema_t *sem);
-
-
-enum {
-    SEMAPHORE_WAIT_SUCC = 0,
-    SEMAPHORE_WAIT_TIMEOUT = 1
-};
-
-
-ngx_int_t
-ngx_http_lua_sema_mm_init(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
-{
-    ngx_http_lua_sema_mm_t *mm;
-
-    mm = ngx_palloc(cf->pool, sizeof(ngx_http_lua_sema_mm_t));
-    if (mm == NULL) {
-        return NGX_ERROR;
-    }
-
-    lmcf->sema_mm = mm;
-    mm->lmcf = lmcf;
-
-    ngx_queue_init(&mm->free_queue);
-    mm->cur_epoch = 0;
-    mm->total = 0;
-    mm->used = 0;
-
-    /* it's better to be 4096, but it needs some space for
-     * ngx_http_lua_sema_mm_block_t, one is enough, so it is 4095
-     */
-    mm->num_per_block = 4095;
-
-    return NGX_OK;
-}
-
-
-static ngx_http_lua_sema_t *
-ngx_http_lua_alloc_sema(void)
-{
-    ngx_uint_t                           i, n;
-    ngx_queue_t                         *q;
-    ngx_http_lua_sema_t                 *sem, *iter;
-    ngx_http_lua_sema_mm_t              *mm;
-    ngx_http_lua_main_conf_t            *lmcf;
-    ngx_http_lua_sema_mm_block_t        *block;
-
-    ngx_http_lua_assert(ngx_cycle && ngx_cycle->conf_ctx);
-
-    lmcf = ngx_http_cycle_get_module_main_conf(ngx_cycle,
-                                               ngx_http_lua_module);
-
-    mm = lmcf->sema_mm;
-
-    if (!ngx_queue_empty(&mm->free_queue)) {
-        q = ngx_queue_head(&mm->free_queue);
-        ngx_queue_remove(q);
-
-        sem = ngx_queue_data(q, ngx_http_lua_sema_t, chain);
-
-        sem->block->used++;
-
-        ngx_memzero(&sem->sem_event, sizeof(ngx_event_t));
-
-        sem->sem_event.handler = ngx_http_lua_sema_handler;
-        sem->sem_event.data = sem;
-        sem->sem_event.log = ngx_cycle->log;
-
-        mm->used++;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "from head of free queue, alloc semaphore: %p", sem);
-
-        return sem;
-    }
-
-    /* free_queue is empty */
-
-    n = sizeof(ngx_http_lua_sema_mm_block_t)
-        + mm->num_per_block * sizeof(ngx_http_lua_sema_t);
-
-    dd("block size: %d, item size: %d",
-       (int) sizeof(ngx_http_lua_sema_mm_block_t),
-       (int) sizeof(ngx_http_lua_sema_t));
-
-    block = ngx_alloc(n, ngx_cycle->log);
-    if (block == NULL) {
-        return NULL;
-    }
-
-    mm->cur_epoch++;
-    mm->total += mm->num_per_block;
-    mm->used++;
-
-    block->mm = mm;
-    block->epoch = mm->cur_epoch;
-
-    sem = (ngx_http_lua_sema_t *) (block + 1);
-    sem->block = block;
-    sem->block->used = 1;
-
-    ngx_memzero(&sem->sem_event, sizeof(ngx_event_t));
-
-    sem->sem_event.handler = ngx_http_lua_sema_handler;
-    sem->sem_event.data = sem;
-    sem->sem_event.log = ngx_cycle->log;
-
-    for (iter = sem + 1, i = 1; i < mm->num_per_block; i++, iter++) {
-        iter->block = block;
-        ngx_queue_insert_tail(&mm->free_queue, &iter->chain);
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "new block, alloc semaphore: %p block: %p", sem, block);
-
-    return sem;
-}
-
-
-void
-ngx_http_lua_sema_mm_cleanup(void *data)
-{
-    ngx_uint_t                           i;
-    ngx_queue_t                         *q;
-    ngx_http_lua_sema_t                 *sem, *iter;
-    ngx_http_lua_sema_mm_t              *mm;
-    ngx_http_lua_main_conf_t            *lmcf;
-    ngx_http_lua_sema_mm_block_t        *block;
-
-    lmcf = (ngx_http_lua_main_conf_t *) data;
-    mm = lmcf->sema_mm;
-
-    while (!ngx_queue_empty(&mm->free_queue)) {
-        q = ngx_queue_head(&mm->free_queue);
-
-        sem = ngx_queue_data(q, ngx_http_lua_sema_t, chain);
-        block = sem->block;
-
-        if (block->used == 0) {
-            iter = (ngx_http_lua_sema_t *) (block + 1);
-
-            for (i = 0; i < block->mm->num_per_block; i++, iter++) {
-                ngx_queue_remove(&iter->chain);
-            }
-
-            dd("free sema block: %p at final", block);
-
-            ngx_free(block);
-
-        } else {
-            /* just return directly when some thing goes wrong */
-
-            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                          "lua sema mm: freeing a block %p that is still "
-                          " used by someone", block);
-
-            return;
-        }
-    }
-
-    dd("lua sema mm cleanup done");
-}
-
-
-static void
-ngx_http_lua_free_sema(ngx_http_lua_sema_t *sem)
-{
-    ngx_http_lua_sema_t            *iter;
-    ngx_uint_t                      i, mid_epoch;
-    ngx_http_lua_sema_mm_block_t   *block;
-    ngx_http_lua_sema_mm_t         *mm;
-
-    block = sem->block;
-    block->used--;
-
-    mm = block->mm;
-    mm->used--;
-
-    mid_epoch = mm->cur_epoch - ((mm->total / mm->num_per_block) >> 1);
-
-    if (block->epoch < mid_epoch) {
-        ngx_queue_insert_tail(&mm->free_queue, &sem->chain);
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "add to free queue tail semaphore: %p epoch: %d"
-                       "mid_epoch: %d cur_epoch: %d", sem, (int) block->epoch,
-                       (int) mid_epoch, (int) mm->cur_epoch);
-
-    } else {
-        ngx_queue_insert_head(&mm->free_queue, &sem->chain);
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "add to free queue head semaphore: %p epoch: %d"
-                       "mid_epoch: %d cur_epoch: %d", sem, (int) block->epoch,
-                       (int) mid_epoch, (int) mm->cur_epoch);
-    }
-
-    dd("used: %d", (int) block->used);
-
-    if (block->used == 0
-        && mm->used <= (mm->total >> 1)
-        && block->epoch < mid_epoch)
-    {
-        /* load <= 50% and it's on the older side */
-        iter = (ngx_http_lua_sema_t *) (block + 1);
-
-        for (i = 0; i < mm->num_per_block; i++, iter++) {
-            ngx_queue_remove(&iter->chain);
-        }
-
-        mm->total -= mm->num_per_block;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "free semaphore block: %p", block);
-
-        ngx_free(block);
-    }
-}
-
-
-static ngx_int_t
-ngx_http_lua_sema_resume(ngx_http_request_t *r)
-{
-    lua_State                   *vm;
-    ngx_connection_t            *c;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_http_lua_ctx_t          *ctx;
-
-    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;
-
-    c = r->connection;
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    if (ctx->cur_co_ctx->sem_resume_status == SEMAPHORE_WAIT_SUCC) {
-        lua_pushboolean(ctx->cur_co_ctx->co, 1);
-        lua_pushnil(ctx->cur_co_ctx->co);
-
-    } else {
-        lua_pushboolean(ctx->cur_co_ctx->co, 0);
-        lua_pushliteral(ctx->cur_co_ctx->co, "timeout");
-    }
-
-    rc = ngx_http_lua_run_thread(vm, r, ctx, 2);
-
-    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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    /* rc == NGX_ERROR || rc >= NGX_OK */
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_finalize_request(r, rc);
-        return NGX_DONE;
-    }
-
-    return rc;
-}
-
-
-int
-ngx_http_lua_ffi_sema_new(ngx_http_lua_sema_t **psem,
-    int n, char **errmsg)
-{
-    ngx_http_lua_sema_t    *sem;
-
-    sem = ngx_http_lua_alloc_sema();
-    if (sem == NULL) {
-        *errmsg = "no memory";
-        return NGX_ERROR;
-    }
-
-    ngx_queue_init(&sem->wait_queue);
-
-    sem->resource_count = n;
-    sem->wait_count = 0;
-    *psem = sem;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "http lua semaphore new: %p, resources: %d",
-                   sem, sem->resource_count);
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_sema_post(ngx_http_lua_sema_t *sem, int n)
-{
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "http lua semaphore post: %p, n: %d, resources: %d",
-                   sem, n, sem->resource_count);
-
-    sem->resource_count += n;
-
-    if (!ngx_queue_empty(&sem->wait_queue)) {
-        /* we need the extra paranthese around the first argument of
-         * ngx_post_event() just to work around macro issues in nginx
-         * cores older than nginx 1.7.12 (exclusive).
-         */
-        ngx_post_event((&sem->sem_event), &ngx_posted_events);
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_sema_wait(ngx_http_request_t *r,
-    ngx_http_lua_sema_t *sem, int wait_ms, u_char *err, size_t *errlen)
-{
-    ngx_http_lua_ctx_t           *ctx;
-    ngx_http_lua_co_ctx_t        *wait_co_ctx;
-    ngx_int_t                     rc;
-
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "http lua semaphore wait: %p, timeout: %d, "
-                   "resources: %d, event posted: %d",
-                   sem, wait_ms, sem->resource_count,
-#if (nginx_version >= 1007005)
-                   (int) sem->sem_event.posted
-#else
-                   sem->sem_event.prev ? 1 : 0
-#endif
-                   );
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        *errlen = ngx_snprintf(err, *errlen, "no request ctx found") - err;
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_lua_ffi_check_context(ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
-                                        | NGX_HTTP_LUA_CONTEXT_ACCESS
-                                        | NGX_HTTP_LUA_CONTEXT_CONTENT
-                                        | NGX_HTTP_LUA_CONTEXT_TIMER
-                                        | NGX_HTTP_LUA_CONTEXT_SSL_CERT,
-                                        err, errlen);
-
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    /* we keep the order, will first resume the thread waiting for the
-     * longest time in ngx_http_lua_sema_handler
-     */
-
-    if (ngx_queue_empty(&sem->wait_queue) && sem->resource_count > 0) {
-        sem->resource_count--;
-        return NGX_OK;
-    }
-
-    if (wait_ms == 0) {
-        return NGX_DECLINED;
-    }
-
-    sem->wait_count++;
-    wait_co_ctx = ctx->cur_co_ctx;
-
-    wait_co_ctx->sleep.handler = ngx_http_lua_sema_timeout_handler;
-    wait_co_ctx->sleep.data = ctx->cur_co_ctx;
-    wait_co_ctx->sleep.log = r->connection->log;
-
-    ngx_add_timer(&wait_co_ctx->sleep, (ngx_msec_t) wait_ms);
-
-    dd("ngx_http_lua_ffi_sema_wait add timer coctx:%p wait: %d(ms)",
-       wait_co_ctx, wait_ms);
-
-    ngx_queue_insert_tail(&sem->wait_queue, &wait_co_ctx->sem_wait_queue);
-
-    wait_co_ctx->data = sem;
-    wait_co_ctx->cleanup = ngx_http_lua_sema_cleanup;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "http lua semaphore wait yielding");
-
-    return NGX_AGAIN;
-}
-
-
-int
-ngx_http_lua_ffi_sema_count(ngx_http_lua_sema_t *sem)
-{
-    return sem->resource_count - sem->wait_count;
-}
-
-
-static void
-ngx_http_lua_sema_cleanup(void *data)
-{
-    ngx_http_lua_co_ctx_t          *coctx = data;
-    ngx_queue_t                    *q;
-    ngx_http_lua_sema_t            *sem;
-
-    sem = coctx->data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "http lua semaphore cleanup");
-
-    if (coctx->sleep.timer_set) {
-        ngx_del_timer(&coctx->sleep);
-    }
-
-    q = &coctx->sem_wait_queue;
-
-    ngx_queue_remove(q);
-    sem->wait_count--;
-    coctx->cleanup = NULL;
-}
-
-
-static void
-ngx_http_lua_sema_handler(ngx_event_t *ev)
-{
-    ngx_http_lua_sema_t         *sem;
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *wait_co_ctx;
-    ngx_connection_t            *c;
-    ngx_queue_t                 *q;
-
-    sem = ev->data;
-
-    while (!ngx_queue_empty(&sem->wait_queue) && sem->resource_count > 0) {
-
-        q = ngx_queue_head(&sem->wait_queue);
-        ngx_queue_remove(q);
-
-        sem->wait_count--;
-
-        wait_co_ctx = ngx_queue_data(q, ngx_http_lua_co_ctx_t, sem_wait_queue);
-        wait_co_ctx->cleanup = NULL;
-
-        if (wait_co_ctx->sleep.timer_set) {
-            ngx_del_timer(&wait_co_ctx->sleep);
-        }
-
-        r = ngx_http_lua_get_req(wait_co_ctx->co);
-        c = r->connection;
-
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-        ngx_http_lua_assert(ctx != NULL);
-
-        sem->resource_count--;
-
-        ctx->cur_co_ctx = wait_co_ctx;
-
-        wait_co_ctx->sem_resume_status = SEMAPHORE_WAIT_SUCC;
-
-        if (ctx->entered_content_phase) {
-            (void) ngx_http_lua_sema_resume(r);
-
-        } else {
-            ctx->resume_handler = ngx_http_lua_sema_resume;
-            ngx_http_core_run_phases(r);
-        }
-
-        ngx_http_run_posted_requests(c);
-    }
-}
-
-
-static void
-ngx_http_lua_sema_timeout_handler(ngx_event_t *ev)
-{
-    ngx_http_lua_co_ctx_t       *wait_co_ctx;
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_connection_t            *c;
-    ngx_http_lua_sema_t         *sem;
-
-    wait_co_ctx = ev->data;
-    wait_co_ctx->cleanup = NULL;
-
-    dd("ngx_http_lua_sema_timeout_handler timeout coctx:%p", wait_co_ctx);
-
-    sem = wait_co_ctx->data;
-
-    ngx_queue_remove(&wait_co_ctx->sem_wait_queue);
-    sem->wait_count--;
-
-    r = ngx_http_lua_get_req(wait_co_ctx->co);
-    c = r->connection;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    ngx_http_lua_assert(ctx != NULL);
-
-    ctx->cur_co_ctx = wait_co_ctx;
-
-    wait_co_ctx->sem_resume_status = SEMAPHORE_WAIT_TIMEOUT;
-
-    if (ctx->entered_content_phase) {
-        (void) ngx_http_lua_sema_resume(r);
-
-    } else {
-        ctx->resume_handler = ngx_http_lua_sema_resume;
-        ngx_http_core_run_phases(r);
-    }
-
-    ngx_http_run_posted_requests(c);
-}
-
-
-void
-ngx_http_lua_ffi_sema_gc(ngx_http_lua_sema_t *sem)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "in lua gc, semaphore %p", sem);
-
-    if (sem == NULL) {
-        return;
-    }
-
-    if (!ngx_terminate
-        && !ngx_quit
-        && !ngx_queue_empty(&sem->wait_queue))
-    {
-        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                      "in lua semaphore gc wait queue is"
-                      " not empty while the semaphore %p is being "
-                      "destroyed", sem);
-    }
-
-    ngx_http_lua_free_sema(sem);
-}
-
-
-#endif /* NGX_LUA_NO_FFI_API */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_semaphore.h b/debian/modules/http-lua/src/ngx_http_lua_semaphore.h
deleted file mode 100644
index 65ba8ff..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_semaphore.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- * Copyright (C) cuiweixie
- * I hereby assign copyright in this code to the lua-nginx-module project,
- * to be licensed under the same terms as the rest of the code.
- */
-
-
-#ifndef _NGX_HTTP_LUA_SEMAPHORE_H_INCLUDED_
-#define _NGX_HTTP_LUA_SEMAPHORE_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-typedef struct ngx_http_lua_sema_mm_block_s {
-    ngx_uint_t                       used;
-    ngx_http_lua_sema_mm_t          *mm;
-    ngx_uint_t                       epoch;
-} ngx_http_lua_sema_mm_block_t;
-
-
-struct ngx_http_lua_sema_mm_s {
-    ngx_queue_t                  free_queue;
-    ngx_uint_t                   total;
-    ngx_uint_t                   used;
-    ngx_uint_t                   num_per_block;
-    ngx_uint_t                   cur_epoch;
-    ngx_http_lua_main_conf_t    *lmcf;
-};
-
-
-typedef struct ngx_http_lua_sema_s {
-    ngx_queue_t                          wait_queue;
-    ngx_queue_t                          chain;
-    ngx_event_t                          sem_event;
-    ngx_http_lua_sema_mm_block_t        *block;
-    int                                  resource_count;
-    unsigned                             wait_count;
-} ngx_http_lua_sema_t;
-
-
-#ifndef NGX_LUA_NO_FFI_API
-void ngx_http_lua_sema_mm_cleanup(void *data);
-ngx_int_t ngx_http_lua_sema_mm_init(ngx_conf_t *cf,
-    ngx_http_lua_main_conf_t *lmcf);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_SEMAPHORE_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.c b/debian/modules/http-lua/src/ngx_http_lua_setby.c
deleted file mode 100644
index 2e8762a..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.c
+++ /dev/null
@@ -1,216 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_setby.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_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_set_by_lua_env(lua_State *L, ngx_http_request_t *r,
-    size_t nargs, ngx_http_variable_value_t *args);
-
-
-/* keys in Lua thread for fetching args and nargs in set_by_lua* */
-
-#define ngx_http_lua_nargs_key  "__ngx_nargs"
-
-#define ngx_http_lua_args_key  "__ngx_args"
-
-
-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)
-{
-    size_t           i;
-    ngx_int_t        rc;
-    u_char          *err_msg;
-    size_t           len;
-    u_char          *data;
-#if (NGX_PCRE)
-    ngx_pool_t      *old_pool;
-#endif
-
-    dd("nargs: %d", (int) nargs);
-
-    dd("set Lua VM panic handler");
-
-    lua_atpanic(L, ngx_http_lua_atpanic);
-
-    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
-
-        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, 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 occurred 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, data, len);
-            val->len = len;
-
-        } else {
-            val->data = NULL;
-            val->len = 0;
-        }
-
-    } NGX_LUA_EXCEPTION_CATCH {
-
-        dd("nginx execution restored");
-        return NGX_ERROR;
-    }
-
-    /*  clear Lua stack */
-    lua_settop(L, 0);
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_setby_param_get(lua_State *L)
-{
-    int         idx;
-    int         n;
-
-    ngx_http_variable_value_t       *v;
-
-    idx = luaL_checkint(L, 2);
-    idx--;
-
-    /*  get number of args from globals */
-    lua_getglobal(L, ngx_http_lua_nargs_key);
-    n = (int) lua_tointeger(L, -1);
-
-    /*  get args from globals */
-    lua_getglobal(L, ngx_http_lua_args_key);
-    v = lua_touserdata(L, -1);
-
-    if (idx < 0 || idx > n - 1) {
-        lua_pushnil(L);
-
-    } else {
-        lua_pushlstring(L, (const char *) (v[idx].data), v[idx].len);
-    }
-
-    return 1;
-}
-
-
-/**
- * Set environment table for the given code closure.
- *
- * Before:
- *         | code closure | <- top
- *         |      ...     |
- *
- * After:
- *         | code closure | <- top
- *         |      ...     |
- * */
-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)
-{
-    /*  set nginx request pointer to current lua thread's globals table */
-    ngx_http_lua_set_req(L, r);
-
-    lua_pushinteger(L, nargs);
-    lua_setglobal(L, ngx_http_lua_nargs_key);
-
-    lua_pushlightuserdata(L, args);
-    lua_setglobal(L, ngx_http_lua_args_key);
-
-    /**
-     * 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_globals_table(L, 0 /* narr */, 1 /* nrec */);
-
-    /*  {{{ make new env inheriting main thread's globals table */
-    /* the metatable for the new env */
-    lua_createtable(L, 0 /* narr */, 1 /* nrec */);
-    ngx_http_lua_get_globals_table(L);
-    lua_setfield(L, -2, "__index");
-    lua_setmetatable(L, -2);    /*  setmetatable(newt, {__index = _G}) */
-    /*  }}} */
-
-    lua_setfenv(L, -2);    /*  set new running env for the code closure */
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_setby.h b/debian/modules/http-lua/src/ngx_http_lua_setby.h
deleted file mode 100644
index da71753..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_setby.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _NGX_HTTP_LUA_SET_BY_H_INCLUDED_
-#define _NGX_HTTP_LUA_SET_BY_H_INCLUDED_
-
-#include "ngx_http_lua_common.h"
-
-
-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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_shdict.c b/debian/modules/http-lua/src/ngx_http_lua_shdict.c
deleted file mode 100644
index 5fb7930..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_shdict.c
+++ /dev/null
@@ -1,3027 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#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);
-static int ngx_http_lua_shdict_safe_set(lua_State *L);
-static int ngx_http_lua_shdict_get(lua_State *L);
-static int ngx_http_lua_shdict_get_stale(lua_State *L);
-static int ngx_http_lua_shdict_get_helper(lua_State *L, int get_stale);
-static int ngx_http_lua_shdict_expire(ngx_http_lua_shdict_ctx_t *ctx,
-    ngx_uint_t n);
-static ngx_int_t ngx_http_lua_shdict_lookup(ngx_shm_zone_t *shm_zone,
-    ngx_uint_t hash, u_char *kdata, size_t klen,
-    ngx_http_lua_shdict_node_t **sdp);
-static int ngx_http_lua_shdict_set_helper(lua_State *L, int flags);
-static int ngx_http_lua_shdict_add(lua_State *L);
-static int ngx_http_lua_shdict_safe_add(lua_State *L);
-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);
-static int ngx_http_lua_shdict_lpush(lua_State *L);
-static int ngx_http_lua_shdict_rpush(lua_State *L);
-static int ngx_http_lua_shdict_push_helper(lua_State *L, int flags);
-static int ngx_http_lua_shdict_lpop(lua_State *L);
-static int ngx_http_lua_shdict_rpop(lua_State *L);
-static int ngx_http_lua_shdict_pop_helper(lua_State *L, int flags);
-static int ngx_http_lua_shdict_llen(lua_State *L);
-
-
-static ngx_inline ngx_shm_zone_t *ngx_http_lua_shdict_get_zone(lua_State *L,
-                                                               int index);
-
-
-#define NGX_HTTP_LUA_SHDICT_ADD         0x0001
-#define NGX_HTTP_LUA_SHDICT_REPLACE     0x0002
-#define NGX_HTTP_LUA_SHDICT_SAFE_STORE  0x0004
-
-
-#define NGX_HTTP_LUA_SHDICT_LEFT        0x0001
-#define NGX_HTTP_LUA_SHDICT_RIGHT       0x0002
-
-
-enum {
-    SHDICT_USERDATA_INDEX = 1,
-};
-
-
-enum {
-    SHDICT_TNIL = 0,        /* same as LUA_TNIL */
-    SHDICT_TBOOLEAN = 1,    /* same as LUA_TBOOLEAN */
-    SHDICT_TNUMBER = 3,     /* same as LUA_TNUMBER */
-    SHDICT_TSTRING = 4,     /* same as LUA_TSTRING */
-    SHDICT_TLIST = 5,
-};
-
-
-static ngx_inline ngx_queue_t *
-ngx_http_lua_shdict_get_list_head(ngx_http_lua_shdict_node_t *sd, size_t len)
-{
-    return (ngx_queue_t *) ngx_align_ptr(((u_char *) &sd->data + len),
-                                         NGX_ALIGNMENT);
-}
-
-
-ngx_int_t
-ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
-{
-    ngx_http_lua_shdict_ctx_t  *octx = data;
-
-    size_t                      len;
-    ngx_http_lua_shdict_ctx_t  *ctx;
-
-    dd("init zone");
-
-    ctx = shm_zone->data;
-
-    if (octx) {
-        ctx->sh = octx->sh;
-        ctx->shpool = octx->shpool;
-
-        return NGX_OK;
-    }
-
-    ctx->shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-
-    if (shm_zone->shm.exists) {
-        ctx->sh = ctx->shpool->data;
-
-        return NGX_OK;
-    }
-
-    ctx->sh = ngx_slab_alloc(ctx->shpool, sizeof(ngx_http_lua_shdict_shctx_t));
-    if (ctx->sh == NULL) {
-        return NGX_ERROR;
-    }
-
-    ctx->shpool->data = ctx->sh;
-
-    ngx_rbtree_init(&ctx->sh->rbtree, &ctx->sh->sentinel,
-                    ngx_http_lua_shdict_rbtree_insert_value);
-
-    ngx_queue_init(&ctx->sh->lru_queue);
-
-    len = sizeof(" in lua_shared_dict zone \"\"") + shm_zone->shm.name.len;
-
-    ctx->shpool->log_ctx = ngx_slab_alloc(ctx->shpool, len);
-    if (ctx->shpool->log_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_sprintf(ctx->shpool->log_ctx, " in lua_shared_dict zone \"%V\"%Z",
-                &shm_zone->shm.name);
-
-#if defined(nginx_version) && nginx_version >= 1005013
-    ctx->shpool->log_nomem = 0;
-#endif
-
-    return NGX_OK;
-}
-
-
-void
-ngx_http_lua_shdict_rbtree_insert_value(ngx_rbtree_node_t *temp,
-    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel)
-{
-    ngx_rbtree_node_t           **p;
-    ngx_http_lua_shdict_node_t   *sdn, *sdnt;
-
-    for ( ;; ) {
-
-        if (node->key < temp->key) {
-
-            p = &temp->left;
-
-        } else if (node->key > temp->key) {
-
-            p = &temp->right;
-
-        } else { /* node->key == temp->key */
-
-            sdn = (ngx_http_lua_shdict_node_t *) &node->color;
-            sdnt = (ngx_http_lua_shdict_node_t *) &temp->color;
-
-            p = ngx_memn2cmp(sdn->data, sdnt->data, sdn->key_len,
-                             sdnt->key_len) < 0 ? &temp->left : &temp->right;
-        }
-
-        if (*p == sentinel) {
-            break;
-        }
-
-        temp = *p;
-    }
-
-    *p = node;
-    node->parent = temp;
-    node->left = sentinel;
-    node->right = sentinel;
-    ngx_rbt_red(node);
-}
-
-
-static ngx_int_t
-ngx_http_lua_shdict_lookup(ngx_shm_zone_t *shm_zone, ngx_uint_t hash,
-    u_char *kdata, size_t klen, ngx_http_lua_shdict_node_t **sdp)
-{
-    ngx_int_t                    rc;
-    ngx_time_t                  *tp;
-    uint64_t                     now;
-    int64_t                      ms;
-    ngx_rbtree_node_t           *node, *sentinel;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-
-    ctx = shm_zone->data;
-
-    node = ctx->sh->rbtree.root;
-    sentinel = ctx->sh->rbtree.sentinel;
-
-    while (node != sentinel) {
-
-        if (hash < node->key) {
-            node = node->left;
-            continue;
-        }
-
-        if (hash > node->key) {
-            node = node->right;
-            continue;
-        }
-
-        /* hash == node->key */
-
-        sd = (ngx_http_lua_shdict_node_t *) &node->color;
-
-        rc = ngx_memn2cmp(kdata, sd->data, klen, (size_t) sd->key_len);
-
-        if (rc == 0) {
-            ngx_queue_remove(&sd->queue);
-            ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-            *sdp = sd;
-
-            dd("node expires: %lld", (long long) sd->expires);
-
-            if (sd->expires != 0) {
-                tp = ngx_timeofday();
-
-                now = (uint64_t) tp->sec * 1000 + tp->msec;
-                ms = sd->expires - now;
-
-                dd("time to live: %lld", (long long) ms);
-
-                if (ms < 0) {
-                    dd("node already expired");
-                    return NGX_DONE;
-                }
-            }
-
-            return NGX_OK;
-        }
-
-        node = (rc < 0) ? node->left : node->right;
-    }
-
-    *sdp = NULL;
-
-    return NGX_DECLINED;
-}
-
-
-static int
-ngx_http_lua_shdict_expire(ngx_http_lua_shdict_ctx_t *ctx, ngx_uint_t n)
-{
-    ngx_time_t                      *tp;
-    uint64_t                         now;
-    ngx_queue_t                     *q, *list_queue, *lq;
-    int64_t                          ms;
-    ngx_rbtree_node_t               *node;
-    ngx_http_lua_shdict_node_t      *sd;
-    int                              freed = 0;
-    ngx_http_lua_shdict_list_node_t *lnode;
-
-    tp = ngx_timeofday();
-
-    now = (uint64_t) tp->sec * 1000 + tp->msec;
-
-    /*
-     * n == 1 deletes one or two expired entries
-     * n == 0 deletes oldest entry by force
-     *        and one or two zero rate entries
-     */
-
-    while (n < 3) {
-
-        if (ngx_queue_empty(&ctx->sh->lru_queue)) {
-            return freed;
-        }
-
-        q = ngx_queue_last(&ctx->sh->lru_queue);
-
-        sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
-
-        if (n++ != 0) {
-
-            if (sd->expires == 0) {
-                return freed;
-            }
-
-            ms = sd->expires - now;
-            if (ms > 0) {
-                return freed;
-            }
-        }
-
-        if (sd->value_type == SHDICT_TLIST) {
-            list_queue = ngx_http_lua_shdict_get_list_head(sd, sd->key_len);
-
-            for (lq = ngx_queue_head(list_queue);
-                 lq != ngx_queue_sentinel(list_queue);
-                 lq = ngx_queue_next(lq))
-            {
-                lnode = ngx_queue_data(lq, ngx_http_lua_shdict_list_node_t,
-                                       queue);
-
-                ngx_slab_free_locked(ctx->shpool, lnode);
-            }
-        }
-
-        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++;
-    }
-
-    return freed;
-}
-
-
-void
-ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf, lua_State *L)
-{
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_uint_t                   i;
-    ngx_shm_zone_t             **zone;
-
-    if (lmcf->shdict_zones != NULL) {
-        lua_createtable(L, 0, lmcf->shdict_zones->nelts /* nrec */);
-                /* ngx.shared */
-
-        lua_createtable(L, 0 /* narr */, 18 /* nrec */); /* shared mt */
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_get);
-        lua_setfield(L, -2, "get");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_get_stale);
-        lua_setfield(L, -2, "get_stale");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_set);
-        lua_setfield(L, -2, "set");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_safe_set);
-        lua_setfield(L, -2, "safe_set");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_add);
-        lua_setfield(L, -2, "add");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_safe_add);
-        lua_setfield(L, -2, "safe_add");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_replace);
-        lua_setfield(L, -2, "replace");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_incr);
-        lua_setfield(L, -2, "incr");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_delete);
-        lua_setfield(L, -2, "delete");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_lpush);
-        lua_setfield(L, -2, "lpush");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_rpush);
-        lua_setfield(L, -2, "rpush");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_lpop);
-        lua_setfield(L, -2, "lpop");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_rpop);
-        lua_setfield(L, -2, "rpop");
-
-        lua_pushcfunction(L, ngx_http_lua_shdict_llen);
-        lua_setfield(L, -2, "llen");
-
-        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 */
-
-        zone = lmcf->shdict_zones->elts;
-
-        for (i = 0; i < lmcf->shdict_zones->nelts; i++) {
-            ctx = zone[i]->data;
-
-            lua_pushlstring(L, (char *) ctx->name.data, ctx->name.len);
-                /* shared mt key */
-
-            lua_createtable(L, 1 /* narr */, 0 /* nrec */);
-                /* table of zone[i] */
-            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
-            lua_rawseti(L, -2, SHDICT_USERDATA_INDEX); /* {zone[i]} */
-            lua_pushvalue(L, -3); /* shared mt key ud mt */
-            lua_setmetatable(L, -2); /* shared mt key ud */
-            lua_rawset(L, -4); /* shared mt */
-        }
-
-        lua_pop(L, 1); /* shared */
-
-    } else {
-        lua_newtable(L);    /* ngx.shared */
-    }
-
-    lua_setfield(L, -2, "shared");
-}
-
-
-static int
-ngx_http_lua_shdict_get(lua_State *L)
-{
-    return ngx_http_lua_shdict_get_helper(L, 0 /* stale */);
-}
-
-
-static int
-ngx_http_lua_shdict_get_stale(lua_State *L)
-{
-    return ngx_http_lua_shdict_get_helper(L, 1 /* stale */);
-}
-
-
-static ngx_inline ngx_shm_zone_t *
-ngx_http_lua_shdict_get_zone(lua_State *L, int index)
-{
-    ngx_shm_zone_t      *zone;
-
-    lua_rawgeti(L, index, SHDICT_USERDATA_INDEX);
-    zone = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    return zone;
-}
-
-
-static int
-ngx_http_lua_shdict_get_helper(lua_State *L, int get_stale)
-{
-    int                          n;
-    ngx_str_t                    name;
-    ngx_str_t                    key;
-    uint32_t                     hash;
-    ngx_int_t                    rc;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-    ngx_str_t                    value;
-    int                          value_type;
-    double                       num;
-    u_char                       c;
-    ngx_shm_zone_t              *zone;
-    uint32_t                     user_flags = 0;
-
-    n = lua_gettop(L);
-
-    if (n != 2) {
-        return luaL_error(L, "expecting exactly two arguments, "
-                          "but only seen %d", n);
-    }
-
-    if (lua_type(L, 1) != LUA_TTABLE) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    zone = ngx_http_lua_shdict_get_zone(L, 1);
-    if (zone == NULL) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    ctx = zone->data;
-    name = ctx->name;
-
-    if (lua_isnil(L, 2)) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nil key");
-        return 2;
-    }
-
-    key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
-
-    if (key.len == 0) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "empty key");
-        return 2;
-    }
-
-    if (key.len > 65535) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key too long");
-        return 2;
-    }
-
-    hash = ngx_crc32_short(key.data, key.len);
-
-#if (NGX_DEBUG)
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                   "fetching key \"%V\" in shared dict \"%V\"", &key, &name);
-#endif /* NGX_DEBUG */
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-#if 1
-    if (!get_stale) {
-        ngx_http_lua_shdict_expire(ctx, 1);
-    }
-#endif
-
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len, &sd);
-
-    dd("shdict lookup returns %d", (int) rc);
-
-    if (rc == NGX_DECLINED || (rc == NGX_DONE && !get_stale)) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-        lua_pushnil(L);
-        return 1;
-    }
-
-    /* rc == NGX_OK || (rc == NGX_DONE && get_stale) */
-
-    value_type = sd->value_type;
-
-    dd("data: %p", sd->data);
-    dd("key len: %d", (int) sd->key_len);
-
-    value.data = sd->data + sd->key_len;
-    value.len = (size_t) sd->value_len;
-
-    switch (value_type) {
-
-    case SHDICT_TSTRING:
-
-        lua_pushlstring(L, (char *) value.data, value.len);
-        break;
-
-    case SHDICT_TNUMBER:
-
-        if (value.len != sizeof(double)) {
-
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            return luaL_error(L, "bad lua number value size found for key %s "
-                              "in shared_dict %s: %lu", key.data, name.data,
-                              (unsigned long) value.len);
-        }
-
-        ngx_memcpy(&num, value.data, sizeof(double));
-
-        lua_pushnumber(L, num);
-        break;
-
-    case SHDICT_TBOOLEAN:
-
-        if (value.len != sizeof(u_char)) {
-
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            return luaL_error(L, "bad lua boolean value size found for key %s "
-                              "in shared_dict %s: %lu", key.data, name.data,
-                              (unsigned long) value.len);
-        }
-
-        c = *value.data;
-
-        lua_pushboolean(L, c ? 1 : 0);
-        break;
-
-    case SHDICT_TLIST:
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "value is a list");
-        return 2;
-
-    default:
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        return luaL_error(L, "bad value type found for key %s in "
-                          "shared_dict %s: %d", key.data, name.data,
-                          value_type);
-    }
-
-    user_flags = sd->user_flags;
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    if (get_stale) {
-
-        /* always return value, flags, stale */
-
-        if (user_flags) {
-            lua_pushinteger(L, (lua_Integer) user_flags);
-
-        } else {
-            lua_pushnil(L);
-        }
-
-        lua_pushboolean(L, rc == NGX_DONE);
-        return 3;
-    }
-
-    if (user_flags) {
-        lua_pushinteger(L, (lua_Integer) user_flags);
-        return 2;
-    }
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_shdict_delete(lua_State *L)
-{
-    int             n;
-
-    n = lua_gettop(L);
-
-    if (n != 2) {
-        return luaL_error(L, "expecting 2 arguments, "
-                          "but only seen %d", n);
-    }
-
-    lua_pushnil(L);
-
-    return ngx_http_lua_shdict_set_helper(L, 0);
-}
-
-
-static int
-ngx_http_lua_shdict_flush_all(lua_State *L)
-{
-    ngx_queue_t                 *q;
-    ngx_http_lua_shdict_node_t  *sd;
-    int                          n;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_shm_zone_t              *zone;
-
-    n = lua_gettop(L);
-
-    if (n != 1) {
-        return luaL_error(L, "expecting 1 argument, but seen %d", n);
-    }
-
-    luaL_checktype(L, 1, LUA_TTABLE);
-
-    zone = ngx_http_lua_shdict_get_zone(L, 1);
-    if (zone == NULL) {
-        return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
-    }
-
-    ctx = zone->data;
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-    for (q = ngx_queue_head(&ctx->sh->lru_queue);
-         q != ngx_queue_sentinel(&ctx->sh->lru_queue);
-         q = ngx_queue_next(q))
-    {
-        sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
-        sd->expires = 1;
-    }
-
-    ngx_http_lua_shdict_expire(ctx, 0);
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    return 0;
-}
-
-
-static int
-ngx_http_lua_shdict_flush_expired(lua_State *L)
-{
-    ngx_queue_t                     *q, *prev, *list_queue, *lq;
-    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;
-    ngx_http_lua_shdict_list_node_t *lnode;
-
-    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_TTABLE);
-
-    zone = ngx_http_lua_shdict_get_zone(L, 1);
-    if (zone == NULL) {
-        return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
-    }
-
-    if (n == 2) {
-        attempts = luaL_checkint(L, 2);
-    }
-
-    ctx = zone->data;
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-    if (ngx_queue_empty(&ctx->sh->lru_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->lru_queue);
-
-    while (q != ngx_queue_sentinel(&ctx->sh->lru_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) {
-
-            if (sd->value_type == SHDICT_TLIST) {
-                list_queue = ngx_http_lua_shdict_get_list_head(sd, sd->key_len);
-
-                for (lq = ngx_queue_head(list_queue);
-                     lq != ngx_queue_sentinel(list_queue);
-                     lq = ngx_queue_next(lq))
-                {
-                    lnode = ngx_queue_data(lq, ngx_http_lua_shdict_list_node_t,
-                                           queue);
-
-                    ngx_slab_free_locked(ctx->shpool, lnode);
-                }
-            }
-
-            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_TTABLE);
-
-    zone = ngx_http_lua_shdict_get_zone(L, 1);
-    if (zone == NULL) {
-        return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
-    }
-
-    if (n == 2) {
-        attempts = luaL_checkint(L, 2);
-    }
-
-    ctx = zone->data;
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-    if (ngx_queue_empty(&ctx->sh->lru_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->lru_queue);
-
-    while (q != ngx_queue_sentinel(&ctx->sh->lru_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->lru_queue);
-
-    while (q != ngx_queue_sentinel(&ctx->sh->lru_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)
-{
-    return ngx_http_lua_shdict_set_helper(L, NGX_HTTP_LUA_SHDICT_ADD);
-}
-
-
-static int
-ngx_http_lua_shdict_safe_add(lua_State *L)
-{
-    return ngx_http_lua_shdict_set_helper(L, NGX_HTTP_LUA_SHDICT_ADD
-                                          |NGX_HTTP_LUA_SHDICT_SAFE_STORE);
-}
-
-
-static int
-ngx_http_lua_shdict_replace(lua_State *L)
-{
-    return ngx_http_lua_shdict_set_helper(L, NGX_HTTP_LUA_SHDICT_REPLACE);
-}
-
-
-static int
-ngx_http_lua_shdict_set(lua_State *L)
-{
-    return ngx_http_lua_shdict_set_helper(L, 0);
-}
-
-
-static int
-ngx_http_lua_shdict_safe_set(lua_State *L)
-{
-    return ngx_http_lua_shdict_set_helper(L, NGX_HTTP_LUA_SHDICT_SAFE_STORE);
-}
-
-
-static int
-ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
-{
-    int                          i, n;
-    ngx_str_t                    key;
-    uint32_t                     hash;
-    ngx_int_t                    rc;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-    ngx_str_t                    value;
-    int                          value_type;
-    double                       num;
-    u_char                       c;
-    lua_Number                   exptime = 0;
-    u_char                      *p;
-    ngx_rbtree_node_t           *node;
-    ngx_time_t                  *tp;
-    ngx_shm_zone_t              *zone;
-    int                          forcible = 0;
-                         /* indicates whether to foricibly override other
-                          * valid entries */
-    int32_t                      user_flags = 0;
-    ngx_queue_t                 *queue, *q;
-
-    n = lua_gettop(L);
-
-    if (n != 3 && n != 4 && n != 5) {
-        return luaL_error(L, "expecting 3, 4 or 5 arguments, "
-                          "but only seen %d", n);
-    }
-
-    if (lua_type(L, 1) != LUA_TTABLE) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    zone = ngx_http_lua_shdict_get_zone(L, 1);
-    if (zone == NULL) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    ctx = zone->data;
-
-    if (lua_isnil(L, 2)) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nil key");
-        return 2;
-    }
-
-    key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
-
-    if (key.len == 0) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "empty key");
-        return 2;
-    }
-
-    if (key.len > 65535) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key too long");
-        return 2;
-    }
-
-    hash = ngx_crc32_short(key.data, key.len);
-
-    value_type = lua_type(L, 3);
-
-    switch (value_type) {
-
-    case SHDICT_TSTRING:
-        value.data = (u_char *) lua_tolstring(L, 3, &value.len);
-        break;
-
-    case SHDICT_TNUMBER:
-        value.len = sizeof(double);
-        num = lua_tonumber(L, 3);
-        value.data = (u_char *) &num;
-        break;
-
-    case SHDICT_TBOOLEAN:
-        value.len = sizeof(u_char);
-        c = lua_toboolean(L, 3) ? 1 : 0;
-        value.data = &c;
-        break;
-
-    case LUA_TNIL:
-        if (flags & (NGX_HTTP_LUA_SHDICT_ADD|NGX_HTTP_LUA_SHDICT_REPLACE)) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "attempt to add or replace nil values");
-            return 2;
-        }
-
-        ngx_str_null(&value);
-        break;
-
-    default:
-        lua_pushnil(L);
-        lua_pushliteral(L, "bad value type");
-        return 2;
-    }
-
-    if (n >= 4) {
-        exptime = luaL_checknumber(L, 4);
-        if (exptime < 0) {
-            return luaL_error(L, "bad \"exptime\" argument");
-        }
-    }
-
-    if (n == 5) {
-        user_flags = (uint32_t) luaL_checkinteger(L, 5);
-    }
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-#if 1
-    ngx_http_lua_shdict_expire(ctx, 1);
-#endif
-
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len, &sd);
-
-    dd("shdict lookup returned %d", (int) rc);
-
-    if (flags & NGX_HTTP_LUA_SHDICT_REPLACE) {
-
-        if (rc == NGX_DECLINED || rc == NGX_DONE) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            lua_pushboolean(L, 0);
-            lua_pushliteral(L, "not found");
-            lua_pushboolean(L, forcible);
-            return 3;
-        }
-
-        /* rc == NGX_OK */
-
-        goto replace;
-    }
-
-    if (flags & NGX_HTTP_LUA_SHDICT_ADD) {
-
-        if (rc == NGX_OK) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            lua_pushboolean(L, 0);
-            lua_pushliteral(L, "exists");
-            lua_pushboolean(L, forcible);
-            return 3;
-        }
-
-        if (rc == NGX_DONE) {
-            /* exists but expired */
-
-            dd("go to replace");
-            goto replace;
-        }
-
-        /* rc == NGX_DECLINED */
-
-        dd("go to insert");
-        goto insert;
-    }
-
-    if (rc == NGX_OK || rc == NGX_DONE) {
-
-        if (value_type == LUA_TNIL) {
-            goto remove;
-        }
-
-replace:
-
-        if (value.data
-            && value.len == (size_t) sd->value_len
-            && sd->value_type != SHDICT_TLIST)
-        {
-
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                           "lua shared dict set: found old entry and value "
-                           "size matched, reusing it");
-
-            ngx_queue_remove(&sd->queue);
-            ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-            sd->key_len = (u_short) key.len;
-
-            if (exptime > 0) {
-                tp = ngx_timeofday();
-                sd->expires = (uint64_t) tp->sec * 1000 + tp->msec
-                              + (uint64_t) (exptime * 1000);
-
-            } else {
-                sd->expires = 0;
-            }
-
-            sd->user_flags = user_flags;
-
-            sd->value_len = (uint32_t) value.len;
-
-            dd("setting value type to %d", value_type);
-
-            sd->value_type = (uint8_t) value_type;
-
-            p = ngx_copy(sd->data, key.data, key.len);
-            ngx_memcpy(p, value.data, value.len);
-
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            lua_pushboolean(L, 1);
-            lua_pushnil(L);
-            lua_pushboolean(L, forcible);
-            return 3;
-        }
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict set: found old entry but value size "
-                       "NOT matched, removing it first");
-
-remove:
-
-        if (sd->value_type == SHDICT_TLIST) {
-            queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
-
-            for (q = ngx_queue_head(queue);
-                 q != ngx_queue_sentinel(queue);
-                 q = ngx_queue_next(q))
-            {
-                p = (u_char *) ngx_queue_data(q,
-                                              ngx_http_lua_shdict_list_node_t,
-                                              queue);
-
-                ngx_slab_free_locked(ctx->shpool, p);
-            }
-        }
-
-        ngx_queue_remove(&sd->queue);
-
-        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);
-
-    }
-
-insert:
-
-    /* rc == NGX_DECLINED or value size unmatch */
-
-    if (value.data == NULL) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        lua_pushboolean(L, 1);
-        lua_pushnil(L);
-        lua_pushboolean(L, 0);
-        return 3;
-    }
-
-    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)
-        + offsetof(ngx_http_lua_shdict_node_t, data)
-        + key.len
-        + value.len;
-
-    dd("overhead = %d", (int) (offsetof(ngx_rbtree_node_t, color)
-       + offsetof(ngx_http_lua_shdict_node_t, data)));
-
-    node = ngx_slab_alloc_locked(ctx->shpool, n);
-
-    if (node == NULL) {
-
-        if (flags & NGX_HTTP_LUA_SHDICT_SAFE_STORE) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            lua_pushboolean(L, 0);
-            lua_pushliteral(L, "no memory");
-            return 2;
-        }
-
-        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\"", &key);
-
-        for (i = 0; i < 30; i++) {
-            if (ngx_http_lua_shdict_expire(ctx, 0) == 0) {
-                break;
-            }
-
-            forcible = 1;
-
-            node = ngx_slab_alloc_locked(ctx->shpool, n);
-            if (node != NULL) {
-                goto allocated;
-            }
-        }
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        lua_pushboolean(L, 0);
-        lua_pushliteral(L, "no memory");
-        lua_pushboolean(L, forcible);
-        return 3;
-    }
-
-allocated:
-
-    sd = (ngx_http_lua_shdict_node_t *) &node->color;
-
-    node->key = hash;
-    sd->key_len = (u_short) key.len;
-
-    if (exptime > 0) {
-        tp = ngx_timeofday();
-        sd->expires = (uint64_t) tp->sec * 1000 + tp->msec
-                      + (uint64_t) (exptime * 1000);
-
-    } else {
-        sd->expires = 0;
-    }
-
-    sd->user_flags = user_flags;
-
-    sd->value_len = (uint32_t) value.len;
-
-    dd("setting value type to %d", value_type);
-
-    sd->value_type = (uint8_t) value_type;
-
-    p = ngx_copy(sd->data, key.data, key.len);
-    ngx_memcpy(p, value.data, value.len);
-
-    ngx_rbtree_insert(&ctx->sh->rbtree, node);
-
-    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    lua_pushboolean(L, 1);
-    lua_pushnil(L);
-    lua_pushboolean(L, forcible);
-    return 3;
-}
-
-
-static int
-ngx_http_lua_shdict_incr(lua_State *L)
-{
-    int                          i, n;
-    ngx_str_t                    key;
-    uint32_t                     hash;
-    ngx_int_t                    rc;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-    double                       num;
-    double                       init = 0;
-    u_char                      *p;
-    ngx_shm_zone_t              *zone;
-    double                       value;
-    ngx_rbtree_node_t           *node;
-                         /* indicates whether to foricibly override other
-                          * valid entries */
-    int                          forcible = 0;
-    ngx_queue_t                 *queue, *q;
-
-    n = lua_gettop(L);
-
-    if (n != 3 && n != 4) {
-        return luaL_error(L, "expecting 3 or 4 arguments, but only seen %d", n);
-    }
-
-    if (lua_type(L, 1) != LUA_TTABLE) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    zone = ngx_http_lua_shdict_get_zone(L, 1);
-    if (zone == NULL) {
-        return luaL_error(L, "bad user data for the ngx_shm_zone_t pointer");
-    }
-
-    ctx = zone->data;
-
-    if (lua_isnil(L, 2)) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nil key");
-        return 2;
-    }
-
-    key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
-
-    if (key.len == 0) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "empty key");
-        return 2;
-    }
-
-    if (key.len > 65535) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key too long");
-        return 2;
-    }
-
-    hash = ngx_crc32_short(key.data, key.len);
-
-    value = luaL_checknumber(L, 3);
-
-    if (n == 4) {
-        init = luaL_checknumber(L, 4);
-    }
-
-    dd("looking up key %.*s in shared dict %.*s", (int) key.len, key.data,
-       (int) ctx->name.len, ctx->name.data);
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-#if 1
-    ngx_http_lua_shdict_expire(ctx, 1);
-#endif
-
-    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) {
-
-        if (n == 3) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            lua_pushnil(L);
-            lua_pushliteral(L, "not found");
-            return 2;
-        }
-
-        /* add value */
-        num = value + init;
-
-        if (rc == NGX_DONE) {
-
-            /* found an expired item */
-
-            if ((size_t) sd->value_len == sizeof(double)
-                && sd->value_type != SHDICT_TLIST)
-            {
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                               "lua shared dict incr: found old entry and "
-                               "value size matched, reusing it");
-
-                ngx_queue_remove(&sd->queue);
-                ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-                dd("go to setvalue");
-                goto setvalue;
-            }
-
-            dd("go to remove");
-            goto remove;
-        }
-
-        dd("go to insert");
-        goto insert;
-    }
-
-    /* rc == NGX_OK */
-
-    if (sd->value_type != SHDICT_TNUMBER || sd->value_len != sizeof(double)) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "not a number");
-        return 2;
-    }
-
-    ngx_queue_remove(&sd->queue);
-    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-    dd("setting value type to %d", (int) sd->value_type);
-
-    p = sd->data + key.len;
-
-    ngx_memcpy(&num, p, sizeof(double));
-    num += value;
-
-    ngx_memcpy(p, (double *) &num, sizeof(double));
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    lua_pushnumber(L, num);
-    lua_pushnil(L);
-    return 2;
-
-remove:
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                   "lua shared dict incr: found old entry but value size "
-                   "NOT matched, removing it first");
-
-    if (sd->value_type == SHDICT_TLIST) {
-        queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
-
-        for (q = ngx_queue_head(queue);
-             q != ngx_queue_sentinel(queue);
-             q = ngx_queue_next(q))
-        {
-            p = (u_char *) ngx_queue_data(q,
-                                          ngx_http_lua_shdict_list_node_t,
-                                          queue);
-
-            ngx_slab_free_locked(ctx->shpool, p);
-        }
-    }
-
-    ngx_queue_remove(&sd->queue);
-
-    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);
-
-insert:
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                   "lua shared dict incr: creating a new entry");
-
-    n = offsetof(ngx_rbtree_node_t, color)
-        + offsetof(ngx_http_lua_shdict_node_t, data)
-        + key.len
-        + sizeof(double);
-
-    node = ngx_slab_alloc_locked(ctx->shpool, n);
-
-    if (node == NULL) {
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict incr: overriding non-expired items "
-                       "due to memory shortage for entry \"%V\"", &key);
-
-        for (i = 0; i < 30; i++) {
-            if (ngx_http_lua_shdict_expire(ctx, 0) == 0) {
-                break;
-            }
-
-            forcible = 1;
-
-            node = ngx_slab_alloc_locked(ctx->shpool, n);
-            if (node != NULL) {
-                goto allocated;
-            }
-        }
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        lua_pushboolean(L, 0);
-        lua_pushliteral(L, "no memory");
-        lua_pushboolean(L, forcible);
-        return 3;
-    }
-
-allocated:
-
-    sd = (ngx_http_lua_shdict_node_t *) &node->color;
-
-    node->key = hash;
-
-    sd->key_len = (u_short) key.len;
-
-    sd->value_len = (uint32_t) sizeof(double);
-
-    ngx_rbtree_insert(&ctx->sh->rbtree, node);
-
-    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-setvalue:
-
-    sd->user_flags = 0;
-
-    sd->expires = 0;
-
-    dd("setting value type to %d", LUA_TNUMBER);
-
-    sd->value_type = (uint8_t) LUA_TNUMBER;
-
-    p = ngx_copy(sd->data, key.data, key.len);
-    ngx_memcpy(p, (double *) &num, sizeof(double));
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    lua_pushnumber(L, num);
-    lua_pushnil(L);
-    lua_pushboolean(L, forcible);
-    return 3;
-}
-
-
-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 SHDICT_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");
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-            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 SHDICT_TNUMBER:
-
-        if (len != sizeof(double)) {
-            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 SHDICT_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;
-}
-
-
-static int
-ngx_http_lua_shdict_lpush(lua_State *L)
-{
-    return ngx_http_lua_shdict_push_helper(L, NGX_HTTP_LUA_SHDICT_LEFT);
-}
-
-
-static int
-ngx_http_lua_shdict_rpush(lua_State *L)
-{
-    return ngx_http_lua_shdict_push_helper(L, NGX_HTTP_LUA_SHDICT_RIGHT);
-}
-
-
-static int
-ngx_http_lua_shdict_push_helper(lua_State *L, int flags)
-{
-    int                              n;
-    ngx_str_t                        key;
-    uint32_t                         hash;
-    ngx_int_t                        rc;
-    ngx_http_lua_shdict_ctx_t       *ctx;
-    ngx_http_lua_shdict_node_t      *sd;
-    ngx_str_t                        value;
-    int                              value_type;
-    double                           num;
-    ngx_rbtree_node_t               *node;
-    ngx_shm_zone_t                  *zone;
-    ngx_queue_t                     *queue, *q;
-    ngx_http_lua_shdict_list_node_t *lnode;
-
-    n = lua_gettop(L);
-
-    if (n != 3) {
-        return luaL_error(L, "expecting 3 arguments, "
-                          "but only seen %d", n);
-    }
-
-    if (lua_type(L, 1) != LUA_TTABLE) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    zone = ngx_http_lua_shdict_get_zone(L, 1);
-    if (zone == NULL) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    ctx = zone->data;
-
-    if (lua_isnil(L, 2)) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nil key");
-        return 2;
-    }
-
-    key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
-
-    if (key.len == 0) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "empty key");
-        return 2;
-    }
-
-    if (key.len > 65535) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key too long");
-        return 2;
-    }
-
-    hash = ngx_crc32_short(key.data, key.len);
-
-    value_type = lua_type(L, 3);
-
-    switch (value_type) {
-
-    case SHDICT_TSTRING:
-        value.data = (u_char *) lua_tolstring(L, 3, &value.len);
-        break;
-
-    case SHDICT_TNUMBER:
-        value.len = sizeof(double);
-        num = lua_tonumber(L, 3);
-        value.data = (u_char *) &num;
-        break;
-
-    default:
-        lua_pushnil(L);
-        lua_pushliteral(L, "bad value type");
-        return 2;
-    }
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-#if 1
-    ngx_http_lua_shdict_expire(ctx, 1);
-#endif
-
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len, &sd);
-
-    dd("shdict lookup returned %d", (int) rc);
-
-    /* exists but expired */
-
-    if (rc == NGX_DONE) {
-
-        if (sd->value_type != SHDICT_TLIST) {
-            /* TODO: reuse when length matched */
-
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                           "lua shared dict push: found old entry and value "
-                           "type not matched, remove it first");
-
-            ngx_queue_remove(&sd->queue);
-
-            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);
-
-            dd("go to init_list");
-            goto init_list;
-        }
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict push: found old entry and value "
-                       "type matched, reusing it");
-
-        sd->expires = 0;
-
-        /* free list nodes */
-
-        queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
-
-        for (q = ngx_queue_head(queue);
-             q != ngx_queue_sentinel(queue);
-             q = ngx_queue_next(q))
-        {
-            /* TODO: reuse matched size list node */
-            lnode = ngx_queue_data(q, ngx_http_lua_shdict_list_node_t, queue);
-            ngx_slab_free_locked(ctx->shpool, lnode);
-        }
-
-        ngx_queue_init(queue);
-
-        ngx_queue_remove(&sd->queue);
-        ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-        dd("go to push_node");
-        goto push_node;
-    }
-
-    /* exists and not expired */
-
-    if (rc == NGX_OK) {
-
-        if (sd->value_type != SHDICT_TLIST) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            lua_pushnil(L);
-            lua_pushliteral(L, "value not a list");
-            return 2;
-        }
-
-        queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
-
-        ngx_queue_remove(&sd->queue);
-        ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-        dd("go to push_node");
-        goto push_node;
-    }
-
-    /* rc == NGX_DECLINED, not found */
-
-init_list:
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                   "lua shared dict list: creating a new entry");
-
-    /* NOTICE: we assume the begin point aligned in slab, be careful */
-    n = offsetof(ngx_rbtree_node_t, color)
-        + offsetof(ngx_http_lua_shdict_node_t, data)
-        + key.len
-        + sizeof(ngx_queue_t);
-
-    dd("length before aligned: %d", n);
-
-    n = (int) (uintptr_t) ngx_align_ptr(n, NGX_ALIGNMENT);
-
-    dd("length after aligned: %d", n);
-
-    node = ngx_slab_alloc_locked(ctx->shpool, n);
-
-    if (node == NULL) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        lua_pushboolean(L, 0);
-        lua_pushliteral(L, "no memory");
-        return 2;
-    }
-
-    sd = (ngx_http_lua_shdict_node_t *) &node->color;
-
-    queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
-
-    node->key = hash;
-    sd->key_len = (u_short) key.len;
-
-    sd->expires = 0;
-
-    sd->value_len = 0;
-
-    dd("setting value type to %d", (int) SHDICT_TLIST);
-
-    sd->value_type = (uint8_t) SHDICT_TLIST;
-
-    ngx_memcpy(sd->data, key.data, key.len);
-
-    ngx_queue_init(queue);
-
-    ngx_rbtree_insert(&ctx->sh->rbtree, node);
-
-    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-push_node:
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                   "lua shared dict list: creating a new list node");
-
-    n = offsetof(ngx_http_lua_shdict_list_node_t, data)
-        + value.len;
-
-    dd("list node length: %d", n);
-
-    lnode = ngx_slab_alloc_locked(ctx->shpool, n);
-
-    if (lnode == NULL) {
-
-        if (sd->value_len == 0) {
-
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                           "lua shared dict list: no memory for create"
-                           " list node and list empty, remove it");
-
-            ngx_queue_remove(&sd->queue);
-
-            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);
-        }
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        lua_pushboolean(L, 0);
-        lua_pushliteral(L, "no memory");
-        return 2;
-    }
-
-    dd("setting list length to %d", sd->value_len + 1);
-
-    sd->value_len = sd->value_len + 1;
-
-    dd("setting list node value length to %d", (int) value.len);
-
-    lnode->value_len = (uint32_t) value.len;
-
-    dd("setting list node value type to %d", value_type);
-
-    lnode->value_type = (uint8_t) value_type;
-
-    ngx_memcpy(lnode->data, value.data, value.len);
-
-    if (flags == NGX_HTTP_LUA_SHDICT_LEFT) {
-        ngx_queue_insert_head(queue, &lnode->queue);
-
-    } else {
-        ngx_queue_insert_tail(queue, &lnode->queue);
-    }
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    lua_pushnumber(L, sd->value_len);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_shdict_lpop(lua_State *L)
-{
-    return ngx_http_lua_shdict_pop_helper(L, NGX_HTTP_LUA_SHDICT_LEFT);
-}
-
-
-static int
-ngx_http_lua_shdict_rpop(lua_State *L)
-{
-    return ngx_http_lua_shdict_pop_helper(L, NGX_HTTP_LUA_SHDICT_RIGHT);
-}
-
-
-static int
-ngx_http_lua_shdict_pop_helper(lua_State *L, int flags)
-{
-    int                              n;
-    ngx_str_t                        name;
-    ngx_str_t                        key;
-    uint32_t                         hash;
-    ngx_int_t                        rc;
-    ngx_http_lua_shdict_ctx_t       *ctx;
-    ngx_http_lua_shdict_node_t      *sd;
-    ngx_str_t                        value;
-    int                              value_type;
-    double                           num;
-    ngx_rbtree_node_t               *node;
-    ngx_shm_zone_t                  *zone;
-    ngx_queue_t                     *queue;
-    ngx_http_lua_shdict_list_node_t *lnode;
-
-    n = lua_gettop(L);
-
-    if (n != 2) {
-        return luaL_error(L, "expecting 2 arguments, "
-                          "but only seen %d", n);
-    }
-
-    if (lua_type(L, 1) != LUA_TTABLE) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    zone = ngx_http_lua_shdict_get_zone(L, 1);
-    if (zone == NULL) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    ctx = zone->data;
-    name = ctx->name;
-
-    if (lua_isnil(L, 2)) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nil key");
-        return 2;
-    }
-
-    key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
-
-    if (key.len == 0) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "empty key");
-        return 2;
-    }
-
-    if (key.len > 65535) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key too long");
-        return 2;
-    }
-
-    hash = ngx_crc32_short(key.data, key.len);
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-#if 1
-    ngx_http_lua_shdict_expire(ctx, 1);
-#endif
-
-    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);
-        lua_pushnil(L);
-        return 1;
-    }
-
-    /* rc == NGX_OK */
-
-    if (sd->value_type != SHDICT_TLIST) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "value not a list");
-        return 2;
-    }
-
-    if (sd->value_len <= 0) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        return luaL_error(L, "bad lua list length found for key %s "
-                          "in shared_dict %s: %lu", key.data, name.data,
-                          (unsigned long) sd->value_len);
-    }
-
-    queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
-
-    if (flags == NGX_HTTP_LUA_SHDICT_LEFT) {
-        queue = ngx_queue_head(queue);
-
-    } else {
-        queue = ngx_queue_last(queue);
-    }
-
-    lnode = ngx_queue_data(queue, ngx_http_lua_shdict_list_node_t, queue);
-
-    value_type = lnode->value_type;
-
-    dd("data: %p", lnode->data);
-    dd("value len: %d", (int) sd->value_len);
-
-    value.data = lnode->data;
-    value.len = (size_t) lnode->value_len;
-
-    switch (value_type) {
-
-    case SHDICT_TSTRING:
-
-        lua_pushlstring(L, (char *) value.data, value.len);
-        break;
-
-    case SHDICT_TNUMBER:
-
-        if (value.len != sizeof(double)) {
-
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            return luaL_error(L, "bad lua list node number value size found "
-                              "for key %s in shared_dict %s: %lu", key.data,
-                              name.data, (unsigned long) value.len);
-        }
-
-        ngx_memcpy(&num, value.data, sizeof(double));
-
-        lua_pushnumber(L, num);
-        break;
-
-    default:
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        return luaL_error(L, "bad list node value type found for key %s in "
-                          "shared_dict %s: %d", key.data, name.data,
-                          value_type);
-    }
-
-    ngx_queue_remove(queue);
-
-    ngx_slab_free_locked(ctx->shpool, lnode);
-
-    if (sd->value_len == 1) {
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict list: empty node after pop, "
-                       "remove it");
-
-        ngx_queue_remove(&sd->queue);
-
-        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);
-
-    } else {
-        sd->value_len = sd->value_len - 1;
-
-        ngx_queue_remove(&sd->queue);
-        ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-    }
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_shdict_llen(lua_State *L)
-{
-    int                          n;
-    ngx_str_t                    key;
-    uint32_t                     hash;
-    ngx_int_t                    rc;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-    ngx_shm_zone_t              *zone;
-
-    n = lua_gettop(L);
-
-    if (n != 2) {
-        return luaL_error(L, "expecting 2 arguments, "
-                          "but only seen %d", n);
-    }
-
-    if (lua_type(L, 1) != LUA_TTABLE) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    zone = ngx_http_lua_shdict_get_zone(L, 1);
-    if (zone == NULL) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    ctx = zone->data;
-
-    if (lua_isnil(L, 2)) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "nil key");
-        return 2;
-    }
-
-    key.data = (u_char *) luaL_checklstring(L, 2, &key.len);
-
-    if (key.len == 0) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "empty key");
-        return 2;
-    }
-
-    if (key.len > 65535) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key too long");
-        return 2;
-    }
-
-    hash = ngx_crc32_short(key.data, key.len);
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-#if 1
-    ngx_http_lua_shdict_expire(ctx, 1);
-#endif
-
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key.data, key.len, &sd);
-
-    dd("shdict lookup returned %d", (int) rc);
-
-    if (rc == NGX_OK) {
-
-        if (sd->value_type != SHDICT_TLIST) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            lua_pushnil(L);
-            lua_pushliteral(L, "value not a list");
-            return 2;
-        }
-
-        ngx_queue_remove(&sd->queue);
-        ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        lua_pushnumber(L, (lua_Number) sd->value_len);
-        return 1;
-    }
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    lua_pushnumber(L, 0);
-    return 1;
-}
-
-
-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;
-    ngx_http_lua_shm_zone_ctx_t     *ctx;
-    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)
-        {
-            ctx = (ngx_http_lua_shm_zone_ctx_t *) zone[i].data;
-            return &ctx->zone;
-        }
-    }
-
-    return NULL;
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
-    size_t key_len, int value_type, u_char *str_value_buf,
-    size_t str_value_len, double num_value, long exptime, int user_flags,
-    char **errmsg, int *forcible)
-{
-    int                          i, n;
-    u_char                       c, *p;
-    uint32_t                     hash;
-    ngx_int_t                    rc;
-    ngx_time_t                  *tp;
-    ngx_queue_t                 *queue, *q;
-    ngx_rbtree_node_t           *node;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
-    dd("exptime: %ld", exptime);
-
-    ctx = zone->data;
-
-    *forcible = 0;
-
-    hash = ngx_crc32_short(key, key_len);
-
-    switch (value_type) {
-
-    case SHDICT_TSTRING:
-        /* do nothing */
-        break;
-
-    case SHDICT_TNUMBER:
-        dd("num value: %lf", num_value);
-        str_value_buf = (u_char *) &num_value;
-        str_value_len = sizeof(double);
-        break;
-
-    case SHDICT_TBOOLEAN:
-        c = num_value ? 1 : 0;
-        str_value_buf = &c;
-        str_value_len = sizeof(u_char);
-        break;
-
-    case LUA_TNIL:
-        if (op & (NGX_HTTP_LUA_SHDICT_ADD|NGX_HTTP_LUA_SHDICT_REPLACE)) {
-            *errmsg = "attempt to add or replace nil values";
-            return NGX_ERROR;
-        }
-
-        str_value_buf = NULL;
-        str_value_len = 0;
-        break;
-
-    default:
-        *errmsg = "unsupported value type";
-        return NGX_ERROR;
-    }
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-#if 1
-    ngx_http_lua_shdict_expire(ctx, 1);
-#endif
-
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key, key_len, &sd);
-
-    dd("lookup returns %d", (int) rc);
-
-    if (op & NGX_HTTP_LUA_SHDICT_REPLACE) {
-
-        if (rc == NGX_DECLINED || rc == NGX_DONE) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-            *errmsg = "not found";
-            return NGX_DECLINED;
-        }
-
-        /* rc == NGX_OK */
-
-        goto replace;
-    }
-
-    if (op & NGX_HTTP_LUA_SHDICT_ADD) {
-
-        if (rc == NGX_OK) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-            *errmsg = "exists";
-            return NGX_DECLINED;
-        }
-
-        if (rc == NGX_DONE) {
-            /* exists but expired */
-
-            dd("go to replace");
-            goto replace;
-        }
-
-        /* rc == NGX_DECLINED */
-
-        dd("go to insert");
-        goto insert;
-    }
-
-    if (rc == NGX_OK || rc == NGX_DONE) {
-
-        if (value_type == LUA_TNIL) {
-            goto remove;
-        }
-
-replace:
-
-        if (str_value_buf
-            && str_value_len == (size_t) sd->value_len
-            && sd->value_type != SHDICT_TLIST)
-        {
-
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                           "lua shared dict set: found old entry and value "
-                           "size matched, reusing it");
-
-            ngx_queue_remove(&sd->queue);
-            ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-            sd->key_len = (u_short) key_len;
-
-            if (exptime > 0) {
-                tp = ngx_timeofday();
-                sd->expires = (uint64_t) tp->sec * 1000 + tp->msec
-                              + (uint64_t) exptime;
-
-            } else {
-                sd->expires = 0;
-            }
-
-            sd->user_flags = user_flags;
-
-            sd->value_len = (uint32_t) str_value_len;
-
-            dd("setting value type to %d", value_type);
-
-            sd->value_type = (uint8_t) value_type;
-
-            p = ngx_copy(sd->data, key, key_len);
-            ngx_memcpy(p, str_value_buf, str_value_len);
-
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            return NGX_OK;
-        }
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict set: found old entry but value size "
-                       "NOT matched, removing it first");
-
-remove:
-
-        if (sd->value_type == SHDICT_TLIST) {
-            queue = ngx_http_lua_shdict_get_list_head(sd, key_len);
-
-            for (q = ngx_queue_head(queue);
-                 q != ngx_queue_sentinel(queue);
-                 q = ngx_queue_next(q))
-            {
-                p = (u_char *) ngx_queue_data(q,
-                                              ngx_http_lua_shdict_list_node_t,
-                                              queue);
-
-                ngx_slab_free_locked(ctx->shpool, p);
-            }
-        }
-
-        ngx_queue_remove(&sd->queue);
-
-        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);
-
-    }
-
-insert:
-
-    /* rc == NGX_DECLINED or value size unmatch */
-
-    if (str_value_buf == NULL) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-        return NGX_OK;
-    }
-
-    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)
-        + offsetof(ngx_http_lua_shdict_node_t, data)
-        + key_len
-        + str_value_len;
-
-    node = ngx_slab_alloc_locked(ctx->shpool, n);
-
-    if (node == NULL) {
-
-        if (op & NGX_HTTP_LUA_SHDICT_SAFE_STORE) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-            *errmsg = "no memory";
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict set: overriding non-expired items "
-                       "due to memory shortage for entry \"%*s\"", key_len,
-                       key);
-
-        for (i = 0; i < 30; i++) {
-            if (ngx_http_lua_shdict_expire(ctx, 0) == 0) {
-                break;
-            }
-
-            *forcible = 1;
-
-            node = ngx_slab_alloc_locked(ctx->shpool, n);
-            if (node != NULL) {
-                goto allocated;
-            }
-        }
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        *errmsg = "no memory";
-        return NGX_ERROR;
-    }
-
-allocated:
-
-    sd = (ngx_http_lua_shdict_node_t *) &node->color;
-
-    node->key = hash;
-    sd->key_len = (u_short) key_len;
-
-    if (exptime > 0) {
-        tp = ngx_timeofday();
-        sd->expires = (uint64_t) tp->sec * 1000 + tp->msec
-                      + (uint64_t) exptime;
-
-    } else {
-        sd->expires = 0;
-    }
-
-    sd->user_flags = user_flags;
-    sd->value_len = (uint32_t) str_value_len;
-    dd("setting value type to %d", value_type);
-    sd->value_type = (uint8_t) value_type;
-
-    p = ngx_copy(sd->data, key, key_len);
-    ngx_memcpy(p, str_value_buf, str_value_len);
-
-    ngx_rbtree_insert(&ctx->sh->rbtree, node);
-    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
-    size_t key_len, int *value_type, u_char **str_value_buf,
-    size_t *str_value_len, double *num_value, int *user_flags,
-    int get_stale, int *is_stale, char **err)
-{
-    ngx_str_t                    name;
-    uint32_t                     hash;
-    ngx_int_t                    rc;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-    ngx_str_t                    value;
-
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
-    *err = NULL;
-
-    ctx = zone->data;
-    name = ctx->name;
-
-    hash = ngx_crc32_short(key, key_len);
-
-#if (NGX_DEBUG)
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                   "fetching key \"%*s\" in shared dict \"%V\"", key_len,
-                   key, &name);
-#endif /* NGX_DEBUG */
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-#if 1
-    if (!get_stale) {
-        ngx_http_lua_shdict_expire(ctx, 1);
-    }
-#endif
-
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key, key_len, &sd);
-
-    dd("shdict lookup returns %d", (int) rc);
-
-    if (rc == NGX_DECLINED || (rc == NGX_DONE && !get_stale)) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-        *value_type = LUA_TNIL;
-        return NGX_OK;
-    }
-
-    /* rc == NGX_OK || (rc == NGX_DONE && get_stale) */
-
-    *value_type = sd->value_type;
-
-    dd("data: %p", sd->data);
-    dd("key len: %d", (int) sd->key_len);
-
-    value.data = sd->data + sd->key_len;
-    value.len = (size_t) sd->value_len;
-
-    if (*str_value_len < (size_t) value.len) {
-        if (*value_type == SHDICT_TBOOLEAN) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-            return NGX_ERROR;
-        }
-
-        if (*value_type == SHDICT_TSTRING) {
-            *str_value_buf = malloc(value.len);
-            if (*str_value_buf == NULL) {
-                ngx_shmtx_unlock(&ctx->shpool->mutex);
-                return NGX_ERROR;
-            }
-        }
-    }
-
-    switch (*value_type) {
-
-    case SHDICT_TSTRING:
-        *str_value_len = value.len;
-        ngx_memcpy(*str_value_buf, value.data, value.len);
-        break;
-
-    case SHDICT_TNUMBER:
-
-        if (value.len != sizeof(double)) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                          "bad lua number value size found for key %*s "
-                          "in shared_dict %V: %z", key_len, key,
-                          &name, value.len);
-            return NGX_ERROR;
-        }
-
-        *str_value_len = value.len;
-        ngx_memcpy(num_value, value.data, sizeof(double));
-        break;
-
-    case SHDICT_TBOOLEAN:
-
-        if (value.len != sizeof(u_char)) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                          "bad lua boolean value size found for key %*s "
-                          "in shared_dict %V: %z", key_len, key, &name,
-                          value.len);
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(*str_value_buf, value.data, value.len);
-        break;
-
-    case SHDICT_TLIST:
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        *err = "value is a list";
-        return NGX_ERROR;
-
-    default:
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
-                      "bad value type found for key %*s in "
-                      "shared_dict %V: %d", key_len, key, &name,
-                      *value_type);
-        return NGX_ERROR;
-    }
-
-    *user_flags = sd->user_flags;
-    dd("user flags: %d", *user_flags);
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    if (get_stale) {
-
-        /* always return value, flags, stale */
-
-        *is_stale = (rc == NGX_DONE);
-        return NGX_OK;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_shdict_incr(ngx_shm_zone_t *zone, u_char *key,
-    size_t key_len, double *value, char **err, int has_init, double init,
-    long init_ttl, int *forcible)
-{
-    int                          i, n;
-    uint32_t                     hash;
-    ngx_int_t                    rc;
-    ngx_time_t                  *tp = NULL;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-    double                       num;
-    ngx_rbtree_node_t           *node;
-    u_char                      *p;
-    ngx_queue_t                 *queue, *q;
-
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (init_ttl > 0) {
-        tp = ngx_timeofday();
-    }
-
-    ctx = zone->data;
-
-    *forcible = 0;
-
-    hash = ngx_crc32_short(key, key_len);
-
-    dd("looking up key %.*s in shared dict %.*s", (int) key_len, key,
-       (int) ctx->name.len, ctx->name.data);
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-#if 1
-    ngx_http_lua_shdict_expire(ctx, 1);
-#endif
-    rc = ngx_http_lua_shdict_lookup(zone, hash, key, key_len, &sd);
-
-    dd("shdict lookup returned %d", (int) rc);
-
-    if (rc == NGX_DECLINED || rc == NGX_DONE) {
-        if (!has_init) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
-            *err = "not found";
-            return NGX_ERROR;
-        }
-
-        /* add value */
-        num = *value + init;
-
-        if (rc == NGX_DONE) {
-
-            /* found an expired item */
-
-            if ((size_t) sd->value_len == sizeof(double)
-                && sd->value_type != SHDICT_TLIST)
-            {
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                               "lua shared dict incr: found old entry and "
-                               "value size matched, reusing it");
-
-                ngx_queue_remove(&sd->queue);
-                ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-                dd("go to setvalue");
-                goto setvalue;
-            }
-
-            dd("go to remove");
-            goto remove;
-        }
-
-        dd("go to insert");
-        goto insert;
-    }
-
-    /* rc == NGX_OK */
-
-    if (sd->value_type != SHDICT_TNUMBER || sd->value_len != sizeof(double)) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-        *err = "not a number";
-        return NGX_ERROR;
-    }
-
-    ngx_queue_remove(&sd->queue);
-    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-    dd("setting value type to %d", (int) sd->value_type);
-
-    p = sd->data + key_len;
-
-    ngx_memcpy(&num, p, sizeof(double));
-    num += *value;
-
-    ngx_memcpy(p, (double *) &num, sizeof(double));
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    *value = num;
-    return NGX_OK;
-
-remove:
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                   "lua shared dict incr: found old entry but value size "
-                   "NOT matched, removing it first");
-
-    if (sd->value_type == SHDICT_TLIST) {
-        queue = ngx_http_lua_shdict_get_list_head(sd, key_len);
-
-        for (q = ngx_queue_head(queue);
-             q != ngx_queue_sentinel(queue);
-             q = ngx_queue_next(q))
-        {
-            p = (u_char *) ngx_queue_data(q, ngx_http_lua_shdict_list_node_t,
-                                          queue);
-
-            ngx_slab_free_locked(ctx->shpool, p);
-        }
-    }
-
-    ngx_queue_remove(&sd->queue);
-
-    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);
-
-insert:
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                   "lua shared dict incr: creating a new entry");
-
-    n = offsetof(ngx_rbtree_node_t, color)
-        + offsetof(ngx_http_lua_shdict_node_t, data)
-        + key_len
-        + sizeof(double);
-
-    node = ngx_slab_alloc_locked(ctx->shpool, n);
-
-    if (node == NULL) {
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict incr: overriding non-expired items "
-                       "due to memory shortage for entry \"%*s\"", key_len,
-                       key);
-
-        for (i = 0; i < 30; i++) {
-            if (ngx_http_lua_shdict_expire(ctx, 0) == 0) {
-                break;
-            }
-
-            *forcible = 1;
-
-            node = ngx_slab_alloc_locked(ctx->shpool, n);
-            if (node != NULL) {
-                goto allocated;
-            }
-        }
-
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        *err = "no memory";
-        return NGX_ERROR;
-    }
-
-allocated:
-
-    sd = (ngx_http_lua_shdict_node_t *) &node->color;
-
-    node->key = hash;
-
-    sd->key_len = (u_short) key_len;
-
-    sd->value_len = (uint32_t) sizeof(double);
-
-    ngx_rbtree_insert(&ctx->sh->rbtree, node);
-
-    ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
-
-setvalue:
-
-    sd->user_flags = 0;
-
-    if (init_ttl > 0) {
-        sd->expires = (uint64_t) tp->sec * 1000 + tp->msec
-                      + (uint64_t) init_ttl;
-
-    } else {
-        sd->expires = 0;
-    }
-
-    dd("setting value type to %d", LUA_TNUMBER);
-
-    sd->value_type = (uint8_t) LUA_TNUMBER;
-
-    p = ngx_copy(sd->data, key, key_len);
-    ngx_memcpy(p, (double *) &num, sizeof(double));
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    *value = num;
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_shdict_flush_all(ngx_shm_zone_t *zone)
-{
-    ngx_queue_t                 *q;
-    ngx_http_lua_shdict_node_t  *sd;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-
-    ctx = zone->data;
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-    for (q = ngx_queue_head(&ctx->sh->lru_queue);
-         q != ngx_queue_sentinel(&ctx->sh->lru_queue);
-         q = ngx_queue_next(q))
-    {
-        sd = ngx_queue_data(q, ngx_http_lua_shdict_node_t, queue);
-        sd->expires = 1;
-    }
-
-    ngx_http_lua_shdict_expire(ctx, 0);
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_shdict_peek(ngx_shm_zone_t *shm_zone, ngx_uint_t hash,
-    u_char *kdata, size_t klen, ngx_http_lua_shdict_node_t **sdp)
-{
-    ngx_int_t                    rc;
-    ngx_rbtree_node_t           *node, *sentinel;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-
-    ctx = shm_zone->data;
-
-    node = ctx->sh->rbtree.root;
-    sentinel = ctx->sh->rbtree.sentinel;
-
-    while (node != sentinel) {
-
-        if (hash < node->key) {
-            node = node->left;
-            continue;
-        }
-
-        if (hash > node->key) {
-            node = node->right;
-            continue;
-        }
-
-        /* hash == node->key */
-
-        sd = (ngx_http_lua_shdict_node_t *) &node->color;
-
-        rc = ngx_memn2cmp(kdata, sd->data, klen, (size_t) sd->key_len);
-
-        if (rc == 0) {
-            *sdp = sd;
-
-            return NGX_OK;
-        }
-
-        node = (rc < 0) ? node->left : node->right;
-    }
-
-    *sdp = NULL;
-
-    return NGX_DECLINED;
-}
-
-
-long
-ngx_http_lua_ffi_shdict_get_ttl(ngx_shm_zone_t *zone, u_char *key,
-    size_t key_len)
-{
-    uint32_t                     hash;
-    uint64_t                     now;
-    uint64_t                     expires;
-    ngx_int_t                    rc;
-    ngx_time_t                  *tp;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
-    ctx = zone->data;
-    hash = ngx_crc32_short(key, key_len);
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-    rc = ngx_http_lua_shdict_peek(zone, hash, key, key_len, &sd);
-
-    if (rc == NGX_DECLINED) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        return NGX_DECLINED;
-    }
-
-    /* rc == NGX_OK */
-
-    expires = sd->expires;
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    if (expires == 0) {
-        return 0;
-    }
-
-    tp = ngx_timeofday();
-    now = (uint64_t) tp->sec * 1000 + tp->msec;
-
-    return expires - now;
-}
-
-
-int
-ngx_http_lua_ffi_shdict_set_expire(ngx_shm_zone_t *zone, u_char *key,
-    size_t key_len, long exptime)
-{
-    uint32_t                     hash;
-    ngx_int_t                    rc;
-    ngx_time_t                  *tp = NULL;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-    ngx_http_lua_shdict_node_t  *sd;
-
-    if (zone == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (exptime > 0) {
-        tp = ngx_timeofday();
-    }
-
-    ctx = zone->data;
-    hash = ngx_crc32_short(key, key_len);
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-
-    rc = ngx_http_lua_shdict_peek(zone, hash, key, key_len, &sd);
-
-    if (rc == NGX_DECLINED) {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-        return NGX_DECLINED;
-    }
-
-    /* rc == NGX_OK */
-
-    if (exptime > 0) {
-        sd->expires = (uint64_t) tp->sec * 1000 + tp->msec
-                      + (uint64_t) exptime;
-
-    } else {
-        sd->expires = 0;
-    }
-
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    return NGX_OK;
-}
-
-
-size_t
-ngx_http_lua_ffi_shdict_capacity(ngx_shm_zone_t *zone)
-{
-    return zone->shm.size;
-}
-
-
-#    if nginx_version >= 1011007
-size_t
-ngx_http_lua_ffi_shdict_free_space(ngx_shm_zone_t *zone)
-{
-    size_t                       bytes;
-    ngx_http_lua_shdict_ctx_t   *ctx;
-
-    ctx = zone->data;
-
-    ngx_shmtx_lock(&ctx->shpool->mutex);
-    bytes = ctx->shpool->pfree * ngx_pagesize;
-    ngx_shmtx_unlock(&ctx->shpool->mutex);
-
-    return bytes;
-}
-#    endif /* nginx_version >= 1011007 */
-
-
-#endif /* NGX_LUA_NO_FFI_API */
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_shdict.h b/debian/modules/http-lua/src/ngx_http_lua_shdict.h
deleted file mode 100644
index 90a0099..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_shdict.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SHDICT_H_INCLUDED_
-#define _NGX_HTTP_LUA_SHDICT_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-typedef struct {
-    u_char                       color;
-    uint8_t                      value_type;
-    u_short                      key_len;
-    uint32_t                     value_len;
-    uint64_t                     expires;
-    ngx_queue_t                  queue;
-    uint32_t                     user_flags;
-    u_char                       data[1];
-} ngx_http_lua_shdict_node_t;
-
-
-typedef struct {
-    ngx_queue_t                  queue;
-    uint32_t                     value_len;
-    uint8_t                      value_type;
-    u_char                       data[1];
-} ngx_http_lua_shdict_list_node_t;
-
-
-typedef struct {
-    ngx_rbtree_t                  rbtree;
-    ngx_rbtree_node_t             sentinel;
-    ngx_queue_t                   lru_queue;
-} ngx_http_lua_shdict_shctx_t;
-
-
-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;
-
-
-typedef struct {
-    ngx_log_t                   *log;
-    ngx_http_lua_main_conf_t    *lmcf;
-    ngx_cycle_t                 *cycle;
-    ngx_shm_zone_t               zone;
-} ngx_http_lua_shm_zone_ctx_t;
-
-
-ngx_int_t ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data);
-void ngx_http_lua_shdict_rbtree_insert_value(ngx_rbtree_node_t *temp,
-    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
-void ngx_http_lua_inject_shdict_api(ngx_http_lua_main_conf_t *lmcf,
-    lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_SHDICT_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_sleep.c b/debian/modules/http-lua/src/ngx_http_lua_sleep.c
deleted file mode 100644
index 09ea0f6..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_sleep.c
+++ /dev/null
@@ -1,219 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#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);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    delay = (ngx_int_t) (luaL_checknumber(L, 1) * 1000);
-
-    if (delay < 0) {
-        return luaL_error(L, "invalid sleep duration \"%d\"", delay);
-    }
-
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
-
-    coctx = ctx->cur_co_ctx;
-    if (coctx == NULL) {
-        return luaL_error(L, "no co ctx found");
-    }
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_sleep_cleanup;
-    coctx->data = r;
-
-    coctx->sleep.handler = ngx_http_lua_sleep_handler;
-    coctx->sleep.data = coctx;
-    coctx->sleep.log = r->connection->log;
-
-    if (delay == 0) {
-#ifdef HAVE_POSTED_DELAYED_EVENTS_PATCH
-        dd("posting 0 sec sleep event to head of delayed queue");
-
-        coctx->sleep.delayed = 1;
-        ngx_post_event(&coctx->sleep, &ngx_posted_delayed_events);
-#else
-        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, "ngx.sleep(0)"
-                      " called without delayed events patch, this will"
-                      " hurt performance");
-        ngx_add_timer(&coctx->sleep, (ngx_msec_t) delay);
-#endif
-
-    } else {
-        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);
-    }
-
-    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;
-    }
-
-    if (c->fd != (ngx_socket_t) -1) {  /* not a fake connection */
-        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) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua clean up the timer for pending ngx.sleep");
-
-        ngx_del_timer(&coctx->sleep);
-    }
-
-#ifdef HAVE_POSTED_DELAYED_EVENTS_PATCH
-    if (coctx->sleep.posted) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua clean up the posted event for pending ngx.sleep");
-
-        ngx_delete_posted_event(&coctx->sleep);
-    }
-#endif
-}
-
-
-static ngx_int_t
-ngx_http_lua_sleep_resume(ngx_http_request_t *r)
-{
-    lua_State                   *vm;
-    ngx_connection_t            *c;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_http_lua_ctx_t          *ctx;
-
-    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;
-
-    c = r->connection;
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_finalize_request(r, rc);
-        return NGX_DONE;
-    }
-
-    return rc;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_sleep.h b/debian/modules/http-lua/src/ngx_http_lua_sleep.h
deleted file mode 100644
index 80c79b4..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_sleep.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SLEEP_H_INCLUDED_
-#define _NGX_HTTP_LUA_SLEEP_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_sleep_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_SLEEP_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
deleted file mode 100644
index efdf427..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.c
+++ /dev/null
@@ -1,5521 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_socket_tcp.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_uthread.h"
-#include "ngx_http_lua_output.h"
-#include "ngx_http_lua_contentby.h"
-#include "ngx_http_lua_probe.h"
-
-
-static int ngx_http_lua_socket_tcp(lua_State *L);
-static int ngx_http_lua_socket_tcp_connect(lua_State *L);
-#if (NGX_HTTP_SSL)
-static int ngx_http_lua_socket_tcp_sslhandshake(lua_State *L);
-#endif
-static int ngx_http_lua_socket_tcp_receive(lua_State *L);
-static int ngx_http_lua_socket_tcp_send(lua_State *L);
-static int ngx_http_lua_socket_tcp_close(lua_State *L);
-static int ngx_http_lua_socket_tcp_setoption(lua_State *L);
-static int ngx_http_lua_socket_tcp_settimeout(lua_State *L);
-static int ngx_http_lua_socket_tcp_settimeouts(lua_State *L);
-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_init_peer_connection_addr_text(
-    ngx_peer_connection_t *pc);
-static void ngx_http_lua_socket_read_handler(ngx_http_request_t *r,
-    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_tcp_upstream_t *u);
-static void ngx_http_lua_socket_connected_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u);
-static void ngx_http_lua_socket_tcp_cleanup(void *data);
-static void ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u);
-static void ngx_http_lua_socket_tcp_finalize_read_part(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u);
-static void ngx_http_lua_socket_tcp_finalize_write_part(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_tcp_upstream_t *u);
-static ngx_int_t ngx_http_lua_socket_test_connect(ngx_http_request_t *r,
-    ngx_connection_t *c);
-static void ngx_http_lua_socket_handle_conn_error(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_uint_t ft_type);
-static void ngx_http_lua_socket_handle_read_error(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_uint_t ft_type);
-static void ngx_http_lua_socket_handle_write_error(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_uint_t ft_type);
-static void ngx_http_lua_socket_handle_conn_success(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u);
-static void ngx_http_lua_socket_handle_read_success(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u);
-static void ngx_http_lua_socket_handle_write_success(ngx_http_request_t *r,
-    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_tcp_upstream_t *u, lua_State *L);
-static int ngx_http_lua_socket_tcp_conn_retval_handler(ngx_http_request_t *r,
-    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_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 int ngx_http_lua_socket_tcp_receive_retval_handler(ngx_http_request_t *r,
-    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_tcp_upstream_t *u, lua_State *L);
-static int ngx_http_lua_socket_conn_error_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
-static int ngx_http_lua_socket_read_error_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
-static int ngx_http_lua_socket_write_error_retval_handler(ngx_http_request_t *r,
-    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);
-static int ngx_http_lua_socket_tcp_receiveuntil(lua_State *L);
-static int ngx_http_lua_socket_receiveuntil_iterator(lua_State *L);
-static ngx_int_t ngx_http_lua_socket_compile_pattern(u_char *data, size_t len,
-    ngx_http_lua_socket_compiled_pattern_t *cp, ngx_log_t *log);
-static int ngx_http_lua_socket_cleanup_compiled_pattern(lua_State *L);
-static int ngx_http_lua_req_socket(lua_State *L);
-static void ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r);
-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_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 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_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_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_tcp_upstream_t *u);
-static ngx_int_t ngx_http_lua_socket_insert_buffer(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_conn_resume(ngx_http_request_t *r);
-static ngx_int_t ngx_http_lua_socket_tcp_read_resume(ngx_http_request_t *r);
-static ngx_int_t ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r);
-static ngx_int_t ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r,
-    int socket_op);
-static void ngx_http_lua_tcp_resolve_cleanup(void *data);
-static void ngx_http_lua_coctx_cleanup(void *data);
-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_shutdown_pool(lua_State *L);
-static void ngx_http_lua_socket_shutdown_pool_helper(
-    ngx_http_lua_socket_pool_t *spool);
-static void
-    ngx_http_lua_socket_empty_resolve_handler(ngx_resolver_ctx_t *ctx);
-static int ngx_http_lua_socket_prepare_error_retvals(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L, ngx_uint_t ft_type);
-#if (NGX_HTTP_SSL)
-static int ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L);
-static void ngx_http_lua_ssl_handshake_handler(ngx_connection_t *c);
-static int ngx_http_lua_ssl_free_session(lua_State *L);
-#endif
-static void ngx_http_lua_socket_tcp_close_connection(ngx_connection_t *c);
-
-
-enum {
-    SOCKET_CTX_INDEX = 1,
-    SOCKET_KEY_INDEX = 3,
-    SOCKET_CONNECT_TIMEOUT_INDEX = 2,
-    SOCKET_SEND_TIMEOUT_INDEX = 4,
-    SOCKET_READ_TIMEOUT_INDEX = 5,
-};
-
-
-enum {
-    SOCKET_OP_CONNECT,
-    SOCKET_OP_READ,
-    SOCKET_OP_WRITE
-};
-
-
-#define ngx_http_lua_socket_check_busy_connecting(r, u, L)                   \
-    if ((u)->conn_waiting) {                                                 \
-        lua_pushnil(L);                                                      \
-        lua_pushliteral(L, "socket busy connecting");                        \
-        return 2;                                                            \
-    }
-
-
-#define ngx_http_lua_socket_check_busy_reading(r, u, L)                      \
-    if ((u)->read_waiting) {                                                 \
-        lua_pushnil(L);                                                      \
-        lua_pushliteral(L, "socket busy reading");                           \
-        return 2;                                                            \
-    }
-
-
-#define ngx_http_lua_socket_check_busy_writing(r, u, L)                      \
-    if ((u)->write_waiting) {                                                \
-        lua_pushnil(L);                                                      \
-        lua_pushliteral(L, "socket busy writing");                           \
-        return 2;                                                            \
-    }                                                                        \
-    if ((u)->raw_downstream                                                  \
-        && ((r)->connection->buffered & NGX_HTTP_LOWLEVEL_BUFFERED))         \
-    {                                                                        \
-        lua_pushnil(L);                                                      \
-        lua_pushliteral(L, "socket busy writing");                           \
-        return 2;                                                            \
-    }
-
-
-static char ngx_http_lua_req_socket_metatable_key;
-static char ngx_http_lua_raw_req_socket_metatable_key;
-static char ngx_http_lua_tcp_socket_metatable_key;
-static char ngx_http_lua_upstream_udata_metatable_key;
-static char ngx_http_lua_downstream_udata_metatable_key;
-static char ngx_http_lua_pool_udata_metatable_key;
-static char ngx_http_lua_pattern_udata_metatable_key;
-#if (NGX_HTTP_SSL)
-static char ngx_http_lua_ssl_session_metatable_key;
-#endif
-
-
-void
-ngx_http_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
-{
-    ngx_int_t         rc;
-
-    lua_createtable(L, 0, 4 /* nrec */);    /* ngx.socket */
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp);
-    lua_pushvalue(L, -1);
-    lua_setfield(L, -3, "tcp");
-    lua_setfield(L, -2, "stream");
-
-    {
-        const char  buf[] = "local sock = ngx.socket.tcp()"
-                            " local ok, err = sock:connect(...)"
-                            " if ok then return sock else return nil, err end";
-
-        rc = luaL_loadbuffer(L, buf, sizeof(buf) - 1, "=ngx.socket.connect");
-    }
-
-    if (rc != NGX_OK) {
-        ngx_log_error(NGX_LOG_CRIT, log, 0,
-                      "failed to load Lua code for ngx.socket.connect(): %i",
-                      rc);
-
-    } else {
-        lua_setfield(L, -2, "connect");
-    }
-
-    lua_setfield(L, -2, "socket");
-
-    /* {{{req socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
-    lua_createtable(L, 0 /* narr */, 5 /* nrec */);
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
-    lua_setfield(L, -2, "receive");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveuntil);
-    lua_setfield(L, -2, "receiveuntil");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeout);
-    lua_setfield(L, -2, "settimeout"); /* ngx socket mt */
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeouts);
-    lua_setfield(L, -2, "settimeouts"); /* ngx socket mt */
-
-    lua_pushvalue(L, -1);
-    lua_setfield(L, -2, "__index");
-
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-
-    /* {{{raw req socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
-    lua_createtable(L, 0 /* narr */, 6 /* nrec */);
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
-    lua_setfield(L, -2, "receive");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveuntil);
-    lua_setfield(L, -2, "receiveuntil");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_send);
-    lua_setfield(L, -2, "send");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeout);
-    lua_setfield(L, -2, "settimeout"); /* ngx socket mt */
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeouts);
-    lua_setfield(L, -2, "settimeouts"); /* ngx socket mt */
-
-    lua_pushvalue(L, -1);
-    lua_setfield(L, -2, "__index");
-
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-
-    /* {{{tcp object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_tcp_socket_metatable_key);
-    lua_createtable(L, 0 /* narr */, 12 /* nrec */);
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_connect);
-    lua_setfield(L, -2, "connect");
-
-#if (NGX_HTTP_SSL)
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_sslhandshake);
-    lua_setfield(L, -2, "sslhandshake");
-
-#endif
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receive);
-    lua_setfield(L, -2, "receive");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_receiveuntil);
-    lua_setfield(L, -2, "receiveuntil");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_send);
-    lua_setfield(L, -2, "send");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_close);
-    lua_setfield(L, -2, "close");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_setoption);
-    lua_setfield(L, -2, "setoption");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeout);
-    lua_setfield(L, -2, "settimeout"); /* ngx socket mt */
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_settimeouts);
-    lua_setfield(L, -2, "settimeouts"); /* ngx socket mt */
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_getreusedtimes);
-    lua_setfield(L, -2, "getreusedtimes");
-
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_setkeepalive);
-    lua_setfield(L, -2, "setkeepalive");
-
-    lua_pushvalue(L, -1);
-    lua_setfield(L, -2, "__index");
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-
-    /* {{{upstream userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
-    lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
-    lua_pushcfunction(L, ngx_http_lua_socket_tcp_upstream_destroy);
-    lua_setfield(L, -2, "__gc");
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-
-    /* {{{downstream userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
-    lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
-    lua_pushcfunction(L, ngx_http_lua_socket_downstream_destroy);
-    lua_setfield(L, -2, "__gc");
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-
-    /* {{{socket pool userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
-    lua_createtable(L, 0, 1); /* metatable */
-    lua_pushcfunction(L, ngx_http_lua_socket_shutdown_pool);
-    lua_setfield(L, -2, "__gc");
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-
-    /* {{{socket compiled pattern userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
-    lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
-    lua_pushcfunction(L, ngx_http_lua_socket_cleanup_compiled_pattern);
-    lua_setfield(L, -2, "__gc");
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-
-#if (NGX_HTTP_SSL)
-
-    /* {{{ssl session userdata metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
-    lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
-    lua_pushcfunction(L, ngx_http_lua_ssl_free_session);
-    lua_setfield(L, -2, "__gc");
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-
-#endif
-}
-
-
-void
-ngx_http_lua_inject_req_socket_api(lua_State *L)
-{
-    lua_pushcfunction(L, ngx_http_lua_req_socket);
-    lua_setfield(L, -2, "socket");
-}
-
-
-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));
-    }
-
-    r = ngx_http_lua_get_req(L);
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
-
-    lua_createtable(L, 5 /* narr */, 1 /* nrec */);
-    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));
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_connect(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_peer_connection_t       *pc;
-    int                          connect_timeout, send_timeout, read_timeout;
-    unsigned                     custom_pool;
-    int                          key_index;
-    const char                  *msg;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    ngx_http_lua_socket_tcp_upstream_t      *u;
-
-    n = lua_gettop(L);
-    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);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
-
-    luaL_checktype(L, 1, LUA_TTABLE);
-
-    p = (u_char *) luaL_checklstring(L, 2, &len);
-
-    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);
-            /* FALLTHROUGH */
-
-        case LUA_TSTRING:
-            custom_pool = 1;
-
-            lua_pushvalue(L, -1);
-            lua_rawseti(L, 1, SOCKET_KEY_INDEX);
-
-            key_index = n + 1;
-
-            break;
-
-        case LUA_TNIL:
-            lua_pop(L, 2);
-            break;
-
-        default:
-            msg = lua_pushfstring(L, "bad \"pool\" option type: %s",
-                                  luaL_typename(L, -1));
-            luaL_argerror(L, n, msg);
-            break;
-        }
-
-        n--;
-    }
-
-    /* the fourth argument is not a table */
-    if (n == 4) {
-        lua_pop(L, 1);
-        n--;
-    }
-
-    if (n == 3) {
-        port = luaL_checkinteger(L, 3);
-
-        if (port < 0 || port > 65535) {
-            lua_pushnil(L);
-            lua_pushfstring(L, "bad port number: %d", port);
-            return 2;
-        }
-
-        if (!custom_pool) {
-            lua_pushliteral(L, ":");
-            lua_insert(L, 3);
-            lua_concat(L, 3);
-        }
-
-        dd("socket key: %s", lua_tostring(L, -1));
-
-    } else { /* n == 2 */
-        port = 0;
-    }
-
-    if (!custom_pool) {
-        /* the key's index is 2 */
-
-        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->request && u->request != r) {
-            return luaL_error(L, "bad request");
-        }
-
-        ngx_http_lua_socket_check_busy_connecting(r, u, L);
-        ngx_http_lua_socket_check_busy_reading(r, u, L);
-        ngx_http_lua_socket_check_busy_writing(r, u, L);
-
-        if (u->body_downstream || u->raw_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 tcp socket reconnect without shutting down");
-
-            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_tcp_upstream_t));
-        if (u == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-#if 1
-        lua_pushlightuserdata(L, &ngx_http_lua_upstream_udata_metatable_key);
-        lua_rawget(L, LUA_REGISTRYINDEX);
-        lua_setmetatable(L, -2);
-#endif
-
-        lua_rawseti(L, 1, SOCKET_CTX_INDEX);
-    }
-
-    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;
-
-    pc = &u->peer;
-
-    pc->log = r->connection->log;
-    pc->log_error = NGX_ERROR_ERR;
-
-    dd("lua peer connection log: %p", pc->log);
-
-    lua_rawgeti(L, 1, SOCKET_CONNECT_TIMEOUT_INDEX);
-    lua_rawgeti(L, 1, SOCKET_SEND_TIMEOUT_INDEX);
-    lua_rawgeti(L, 1, SOCKET_READ_TIMEOUT_INDEX);
-
-    read_timeout = (ngx_int_t) lua_tointeger(L, -1);
-    send_timeout = (ngx_int_t) lua_tointeger(L, -2);
-    connect_timeout = (ngx_int_t) lua_tointeger(L, -3);
-
-    lua_pop(L, 3);
-
-    if (connect_timeout > 0) {
-        u->connect_timeout = (ngx_msec_t) connect_timeout;
-
-    } else {
-        u->connect_timeout = u->conf->connect_timeout;
-    }
-
-    if (send_timeout > 0) {
-        u->send_timeout = (ngx_msec_t) send_timeout;
-
-    } else {
-        u->send_timeout = u->conf->send_timeout;
-    }
-
-    if (read_timeout > 0) {
-        u->read_timeout = (ngx_msec_t) read_timeout;
-
-    } else {
-        u->read_timeout = u->conf->read_timeout;
-    }
-
-    rc = ngx_http_lua_get_keepalive_peer(r, L, key_index, u);
-
-    if (rc == NGX_OK) {
-        lua_pushinteger(L, 1);
-        return 1;
-    }
-
-    if (rc == NGX_ERROR) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "error in get keepalive peer");
-        return 2;
-    }
-
-    /* rc == NGX_DECLINED */
-
-    /* TODO: we should avoid this in-pool allocation */
-
-    host.data = ngx_palloc(r->pool, len + 1);
-    if (host.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    host.len = len;
-
-    ngx_memcpy(host.data, p, len);
-    host.data[len] = '\0';
-
-    ngx_memzero(&url, sizeof(ngx_url_t));
-
-    url.url.len = host.len;
-    url.url.data = host.data;
-    url.default_port = (in_port_t) 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;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "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) {
-        return luaL_error(L, "no memory");
-    }
-
-    if (url.addrs && url.addrs[0].sockaddr) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp 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;
-#if !defined(nginx_version) || nginx_version < 1005008
-    rctx->type = NGX_RESOLVE_A;
-#endif
-    rctx->handler = ngx_http_lua_socket_resolve_handler;
-    rctx->data = u;
-    rctx->timeout = clcf->resolver_timeout;
-
-    u->resolved->ctx = rctx;
-    u->write_co_ctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_tcp_resolve_cleanup;
-    coctx->data = u;
-
-    saved_top = lua_gettop(L);
-
-    if (ngx_resolve_name(rctx) != NGX_OK) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket fail to run resolver immediately");
-
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
-
-        coctx->cleanup = NULL;
-        coctx->data = NULL;
-
-        u->resolved->ctx = NULL;
-        lua_pushnil(L);
-        lua_pushfstring(L, "%s could not be resolved", host.data);
-
-        return 2;
-    }
-
-    if (u->conn_waiting) {
-        dd("resolved and already connecting");
-        return lua_yield(L, 0);
-    }
-
-    n = lua_gettop(L) - saved_top;
-    if (n) {
-        dd("errors occurred during resolving or connecting"
-           "or already connected");
-        return n;
-    }
-
-    /* still resolving */
-
-    u->conn_waiting = 1;
-    u->write_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;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    return lua_yield(L, 0);
-}
-
-
-static void
-ngx_http_lua_socket_empty_resolve_handler(ngx_resolver_ctx_t *ctx)
-{
-    /* do nothing */
-}
-
-
-static void
-ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
-{
-    ngx_http_request_t                  *r;
-    ngx_connection_t                    *c;
-    ngx_http_upstream_resolved_t        *ur;
-    ngx_http_lua_ctx_t                  *lctx;
-    lua_State                           *L;
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-    u_char                              *p;
-    size_t                               len;
-#if defined(nginx_version) && nginx_version >= 1005008
-    socklen_t                            socklen;
-    struct sockaddr                     *sockaddr;
-#else
-    struct sockaddr_in                  *sin;
-#endif
-    ngx_uint_t                           i;
-    unsigned                             waiting;
-
-    u = ctx->data;
-    r = u->request;
-    c = r->connection;
-    ur = u->resolved;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "lua tcp socket resolve handler");
-
-    lctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (lctx == NULL) {
-        return;
-    }
-
-    lctx->cur_co_ctx = u->write_co_ctx;
-
-    u->write_co_ctx->cleanup = NULL;
-
-    L = lctx->cur_co_ctx->co;
-
-    waiting = u->conn_waiting;
-
-    if (ctx->state) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "lua tcp socket resolver error: %s "
-                       "(connect waiting: %d)",
-                       ngx_resolver_strerror(ctx->state), (int) 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->write_prepare_retvals =
-                                ngx_http_lua_socket_conn_error_retval_handler;
-        ngx_http_lua_socket_handle_conn_error(r, u,
-                                              NGX_HTTP_LUA_SOCKET_FT_RESOLVER);
-
-        if (waiting) {
-            ngx_http_run_posted_requests(c);
-        }
-
-        return;
-    }
-
-    ur->naddrs = ctx->naddrs;
-    ur->addrs = ctx->addrs;
-
-#if (NGX_DEBUG)
-    {
-#   if defined(nginx_version) && nginx_version >= 1005008
-    u_char      text[NGX_SOCKADDR_STRLEN];
-    ngx_str_t   addr;
-#   else
-    in_addr_t   addr;
-#   endif
-    ngx_uint_t  i;
-
-#   if defined(nginx_version) && nginx_version >= 1005008
-    addr.data = text;
-
-    for (i = 0; i < ctx->naddrs; i++) {
-        addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen,
-                                 text, NGX_SOCKADDR_STRLEN, 0);
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "name was resolved to %V", &addr);
-    }
-#   else
-    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, c->log, 0,
-                       "name was resolved to %ud.%ud.%ud.%ud",
-                       (addr >> 24) & 0xff, (addr >> 16) & 0xff,
-                       (addr >> 8) & 0xff, addr & 0xff);
-    }
-#   endif
-    }
-#endif
-
-    ngx_http_lua_assert(ur->naddrs > 0);
-
-    if (ur->naddrs == 1) {
-        i = 0;
-
-    } else {
-        i = ngx_random() % ur->naddrs;
-    }
-
-    dd("selected addr index: %d", (int) i);
-
-#if defined(nginx_version) && nginx_version >= 1005008
-    socklen = ur->addrs[i].socklen;
-
-    sockaddr = ngx_palloc(r->pool, socklen);
-    if (sockaddr == NULL) {
-        goto nomem;
-    }
-
-    ngx_memcpy(sockaddr, ur->addrs[i].sockaddr, socklen);
-
-    switch (sockaddr->sa_family) {
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        ((struct sockaddr_in6 *) sockaddr)->sin6_port = htons(ur->port);
-        break;
-#endif
-    default: /* AF_INET */
-        ((struct sockaddr_in *) sockaddr)->sin_port = htons(ur->port);
-    }
-
-    p = ngx_pnalloc(r->pool, NGX_SOCKADDR_STRLEN);
-    if (p == NULL) {
-        goto nomem;
-    }
-
-    len = ngx_sock_ntop(sockaddr, socklen, p, NGX_SOCKADDR_STRLEN, 1);
-    ur->sockaddr = sockaddr;
-    ur->socklen = socklen;
-
-#else
-    /* for nginx older than 1.5.8 */
-
-    len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
-
-    p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
-    if (p == NULL) {
-        goto nomem;
-    }
-
-    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);
-#endif
-
-    ur->host.data = p;
-    ur->host.len = len;
-    ur->naddrs = 1;
-
-    ngx_resolve_name_done(ctx);
-    ur->ctx = NULL;
-
-    u->conn_waiting = 0;
-    u->write_co_ctx = NULL;
-
-    if (waiting) {
-        lctx->resume_handler = ngx_http_lua_socket_tcp_conn_resume;
-        r->write_event_handler(r);
-        ngx_http_run_posted_requests(c);
-
-    } else {
-        (void) ngx_http_lua_socket_resolve_retval_handler(r, u, L);
-    }
-
-    return;
-
-nomem:
-
-    if (ur->ctx) {
-        ngx_resolve_name_done(ctx);
-        ur->ctx = NULL;
-    }
-
-    u->write_prepare_retvals = ngx_http_lua_socket_conn_error_retval_handler;
-    ngx_http_lua_socket_handle_conn_error(r, u,
-                                          NGX_HTTP_LUA_SOCKET_FT_NOMEM);
-
-    if (waiting) {
-        dd("run posted requests");
-        ngx_http_run_posted_requests(c);
-
-    } else {
-        lua_pushnil(L);
-        lua_pushliteral(L, "no memory");
-    }
-}
-
-
-static void
-ngx_http_lua_socket_init_peer_connection_addr_text(ngx_peer_connection_t *pc)
-{
-    ngx_connection_t            *c;
-    size_t                       addr_text_max_len;
-
-    c = pc->connection;
-
-    switch (pc->sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        addr_text_max_len = NGX_INET6_ADDRSTRLEN;
-        break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
-        break;
-#endif
-
-    case AF_INET:
-        addr_text_max_len = NGX_INET_ADDRSTRLEN;
-        break;
-
-    default:
-        addr_text_max_len = NGX_SOCKADDR_STRLEN;
-        break;
-    }
-
-    c->addr_text.data = ngx_pnalloc(c->pool, addr_text_max_len);
-    if (c->addr_text.data == NULL) {
-        ngx_log_error(NGX_LOG_ERR, pc->log, 0,
-                      "init peer connection addr_text failed: no memory");
-        return;
-    }
-
-    c->addr_text.len = ngx_sock_ntop(pc->sockaddr, pc->socklen,
-                                     c->addr_text.data,
-                                     addr_text_max_len, 0);
-}
-
-
-static int
-ngx_http_lua_socket_resolve_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    ngx_http_lua_ctx_t              *ctx;
-    ngx_peer_connection_t           *pc;
-    ngx_connection_t                *c;
-    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 tcp socket resolve retval handler");
-
-    if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_RESOLVER) {
-        return 2;
-    }
-
-    pc = &u->peer;
-
-    ur = u->resolved;
-
-    if (ur->sockaddr) {
-        pc->sockaddr = ur->sockaddr;
-        pc->socklen = ur->socklen;
-        pc->name = &ur->host;
-
-    } else {
-        lua_pushnil(L);
-        lua_pushliteral(L, "resolver not working");
-        return 2;
-    }
-
-    pc->get = ngx_http_lua_socket_tcp_get_peer;
-
-    rc = ngx_event_connect_peer(pc);
-
-    if (rc == NGX_ERROR) {
-        u->socket_errno = ngx_socket_errno;
-    }
-
-    if (u->cleanup == NULL) {
-        cln = ngx_http_lua_cleanup_add(r, 0);
-        if (cln == NULL) {
-            u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-            lua_pushnil(L);
-            lua_pushliteral(L, "no memory");
-            return 2;
-        }
-
-        cln->handler = ngx_http_lua_socket_tcp_cleanup;
-        cln->data = u;
-        u->cleanup = &cln->handler;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket connect: %i", rc);
-
-    if (rc == NGX_ERROR) {
-        return ngx_http_lua_socket_conn_error_retval_handler(r, u, L);
-    }
-
-    if (rc == NGX_BUSY) {
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-        lua_pushnil(L);
-        lua_pushliteral(L, "no live connection");
-        return 2;
-    }
-
-    if (rc == NGX_DECLINED) {
-        dd("socket errno: %d", (int) ngx_socket_errno);
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-        u->socket_errno = ngx_socket_errno;
-        return ngx_http_lua_socket_conn_error_retval_handler(r, u, L);
-    }
-
-    /* rc == NGX_OK || rc == NGX_AGAIN */
-
-    c = pc->connection;
-
-    c->data = u;
-
-    c->write->handler = ngx_http_lua_socket_tcp_handler;
-    c->read->handler = ngx_http_lua_socket_tcp_handler;
-
-    u->write_event_handler = ngx_http_lua_socket_connected_handler;
-    u->read_event_handler = ngx_http_lua_socket_connected_handler;
-
-    c->sendfile &= r->connection->sendfile;
-
-    if (c->pool == NULL) {
-
-        /* we need separate pool here to be able to cache SSL connections */
-
-        c->pool = ngx_create_pool(128, r->connection->log);
-        if (c->pool == NULL) {
-            return ngx_http_lua_socket_prepare_error_retvals(r, u, L,
-                                                NGX_HTTP_LUA_SOCKET_FT_NOMEM);
-        }
-    }
-
-    c->log = r->connection->log;
-    c->pool->log = c->log;
-    c->read->log = c->log;
-    c->write->log = c->log;
-
-    /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */
-
-#if 0
-    u->writer.out = NULL;
-    u->writer.last = &u->writer.out;
-#endif
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    coctx = ctx->cur_co_ctx;
-
-    dd("setting data to %p", u);
-
-    if (rc == NGX_OK) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "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
-         * on the Lua land, thus causing hot spin around level triggered
-         * event poll and wasting CPU cycles. */
-
-        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
-            ngx_http_lua_socket_handle_conn_error(r, u,
-                                                  NGX_HTTP_LUA_SOCKET_FT_ERROR);
-            lua_pushnil(L);
-            lua_pushliteral(L, "failed to handle write event");
-            return 2;
-        }
-
-        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-            ngx_http_lua_socket_handle_conn_error(r, u,
-                                                  NGX_HTTP_LUA_SOCKET_FT_ERROR);
-            lua_pushnil(L);
-            lua_pushliteral(L, "failed to handle read event");
-            return 2;
-        }
-
-        u->read_event_handler = ngx_http_lua_socket_dummy_handler;
-        u->write_event_handler = ngx_http_lua_socket_dummy_handler;
-
-        lua_pushinteger(L, 1);
-        return 1;
-    }
-
-    /* rc == NGX_AGAIN */
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_coctx_cleanup;
-    coctx->data = u;
-
-    ngx_add_timer(c->write, u->connect_timeout);
-
-    u->write_co_ctx = ctx->cur_co_ctx;
-    u->conn_waiting = 1;
-    u->write_prepare_retvals = ngx_http_lua_socket_tcp_conn_retval_handler;
-
-    dd("setting data to %p", u);
-
-    if (ctx->entered_content_phase) {
-        r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    return NGX_AGAIN;
-}
-
-
-static int
-ngx_http_lua_socket_conn_error_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    ngx_uint_t      ft_type;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket error retval handler");
-
-    if (u->write_co_ctx) {
-        u->write_co_ctx->cleanup = NULL;
-    }
-
-    ngx_http_lua_socket_tcp_finalize(r, u);
-
-    ft_type = u->ft_type;
-    u->ft_type = 0;
-    return ngx_http_lua_socket_prepare_error_retvals(r, u, L, ft_type);
-}
-
-
-#if (NGX_HTTP_SSL)
-
-static int
-ngx_http_lua_socket_tcp_sslhandshake(lua_State *L)
-{
-    int                      n, top;
-    ngx_int_t                rc;
-    ngx_str_t                name = ngx_null_string;
-    ngx_connection_t        *c;
-    ngx_ssl_session_t      **psession;
-    ngx_http_request_t      *r;
-    ngx_http_lua_ctx_t      *ctx;
-    ngx_http_lua_co_ctx_t   *coctx;
-
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-
-    /* Lua function arguments: self [,session] [,host] [,verify]
-       [,send_status_req] */
-
-    n = lua_gettop(L);
-    if (n < 1 || n > 5) {
-        return luaL_error(L, "ngx.socket sslhandshake: expecting 1 ~ 5 "
-                          "arguments (including the object), but seen %d", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket ssl handshake");
-
-    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->read_closed
-        || u->write_closed)
-    {
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    if (u->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    ngx_http_lua_socket_check_busy_connecting(r, u, L);
-    ngx_http_lua_socket_check_busy_reading(r, u, L);
-    ngx_http_lua_socket_check_busy_writing(r, u, L);
-
-    if (u->raw_downstream || u->body_downstream) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "not supported for downstream");
-        return 2;
-    }
-
-    c = u->peer.connection;
-
-    u->ssl_session_reuse = 1;
-
-    if (c->ssl && c->ssl->handshaked) {
-        switch (lua_type(L, 2)) {
-        case LUA_TUSERDATA:
-            lua_pushvalue(L, 2);
-            break;
-
-        case LUA_TBOOLEAN:
-            if (!lua_toboolean(L, 2)) {
-                /* avoid generating the ssl session */
-                lua_pushboolean(L, 1);
-                break;
-            }
-            /* fall through */
-
-        default:
-            ngx_http_lua_ssl_handshake_retval_handler(r, u, L);
-            break;
-        }
-
-        return 1;
-    }
-
-    if (ngx_ssl_create_connection(u->conf->ssl, c,
-                                  NGX_SSL_BUFFER|NGX_SSL_CLIENT)
-        != NGX_OK)
-    {
-        lua_pushnil(L);
-        lua_pushliteral(L, "failed to create ssl connection");
-        return 2;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return luaL_error(L, "no ctx found");
-    }
-
-    coctx = ctx->cur_co_ctx;
-
-    c->sendfile = 0;
-
-    if (n >= 2) {
-        if (lua_type(L, 2) == LUA_TBOOLEAN) {
-            u->ssl_session_reuse = lua_toboolean(L, 2);
-
-        } else {
-            psession = lua_touserdata(L, 2);
-
-            if (psession != NULL && *psession != NULL) {
-                if (ngx_ssl_set_session(c, *psession) != NGX_OK) {
-                    lua_pushnil(L);
-                    lua_pushliteral(L, "lua ssl set session failed");
-                    return 2;
-                }
-
-                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                               "lua ssl set session: %p", *psession);
-            }
-        }
-
-        if (n >= 3) {
-            name.data = (u_char *) lua_tolstring(L, 3, &name.len);
-
-            if (name.data) {
-                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "lua ssl server name: \"%*s\"", name.len,
-                               name.data);
-
-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-
-                if (SSL_set_tlsext_host_name(c->ssl->connection,
-                                             (char *) name.data)
-                    == 0)
-                {
-                    lua_pushnil(L);
-                    lua_pushliteral(L, "SSL_set_tlsext_host_name failed");
-                    return 2;
-                }
-
-#else
-
-               ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                              "lua socket SNI disabled because the current "
-                              "version of OpenSSL lacks the support");
-
-#endif
-            }
-
-            if (n >= 4) {
-                u->ssl_verify = lua_toboolean(L, 4);
-
-                if (n >= 5) {
-                    if (lua_toboolean(L, 5)) {
-#ifdef NGX_HTTP_LUA_USE_OCSP
-                        SSL_set_tlsext_status_type(c->ssl->connection,
-                                                   TLSEXT_STATUSTYPE_ocsp);
-#else
-                        return luaL_error(L, "no OCSP support");
-#endif
-                    }
-                }
-            }
-        }
-    }
-
-    dd("found sni name: %.*s %p", (int) name.len, name.data, name.data);
-
-    if (name.len == 0) {
-        u->ssl_name.len = 0;
-
-    } else {
-        if (u->ssl_name.data) {
-            /* buffer already allocated */
-
-            if (u->ssl_name.len >= name.len) {
-                /* reuse it */
-                ngx_memcpy(u->ssl_name.data, name.data, name.len);
-                u->ssl_name.len = name.len;
-
-            } else {
-                ngx_free(u->ssl_name.data);
-                goto new_ssl_name;
-            }
-
-        } else {
-
-new_ssl_name:
-
-            u->ssl_name.data = ngx_alloc(name.len, ngx_cycle->log);
-            if (u->ssl_name.data == NULL) {
-                u->ssl_name.len = 0;
-
-                lua_pushnil(L);
-                lua_pushliteral(L, "no memory");
-                return 2;
-            }
-
-            ngx_memcpy(u->ssl_name.data, name.data, name.len);
-            u->ssl_name.len = name.len;
-        }
-    }
-
-    u->write_co_ctx = coctx;
-
-#if 0
-#ifdef NGX_HTTP_LUA_USE_OCSP
-    SSL_set_tlsext_status_type(c->ssl->connection, TLSEXT_STATUSTYPE_ocsp);
-#endif
-#endif
-
-    rc = ngx_ssl_handshake(c);
-
-    dd("ngx_ssl_handshake returned %d", (int) rc);
-
-    if (rc == NGX_AGAIN) {
-        if (c->write->timer_set) {
-            ngx_del_timer(c->write);
-        }
-
-        ngx_add_timer(c->read, u->connect_timeout);
-
-        u->conn_waiting = 1;
-        u->write_prepare_retvals = ngx_http_lua_ssl_handshake_retval_handler;
-
-        ngx_http_lua_cleanup_pending_operation(coctx);
-        coctx->cleanup = ngx_http_lua_coctx_cleanup;
-        coctx->data = u;
-
-        c->ssl->handler = ngx_http_lua_ssl_handshake_handler;
-
-        if (ctx->entered_content_phase) {
-            r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-        } else {
-            r->write_event_handler = ngx_http_core_run_phases;
-        }
-
-        return lua_yield(L, 0);
-    }
-
-    top = lua_gettop(L);
-    ngx_http_lua_ssl_handshake_handler(c);
-    return lua_gettop(L) - top;
-}
-
-
-static void
-ngx_http_lua_ssl_handshake_handler(ngx_connection_t *c)
-{
-    const char                  *err;
-    int                          waiting;
-    lua_State                   *L;
-    ngx_int_t                    rc;
-    ngx_connection_t            *dc;  /* downstream connection */
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-
-    u = c->data;
-    r = u->request;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    c->write->handler = ngx_http_lua_socket_tcp_handler;
-    c->read->handler = ngx_http_lua_socket_tcp_handler;
-
-    waiting = u->conn_waiting;
-
-    dc = r->connection;
-    L = u->write_co_ctx->co;
-
-    if (c->read->timedout) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "timeout");
-        goto failed;
-    }
-
-    if (c->read->timer_set) {
-        ngx_del_timer(c->read);
-    }
-
-    if (c->ssl->handshaked) {
-
-        if (u->ssl_verify) {
-            rc = SSL_get_verify_result(c->ssl->connection);
-
-            if (rc != X509_V_OK) {
-                lua_pushnil(L);
-                err = lua_pushfstring(L, "%d: %s", (int) rc,
-                                      X509_verify_cert_error_string(rc));
-
-                llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-                if (llcf->log_socket_errors) {
-                    ngx_log_error(NGX_LOG_ERR, dc->log, 0, "lua ssl "
-                                  "certificate verify error: (%s)", err);
-                }
-
-                goto failed;
-            }
-
-#if defined(nginx_version) && nginx_version >= 1007000
-
-            if (u->ssl_name.len
-                && ngx_ssl_check_host(c, &u->ssl_name) != NGX_OK)
-            {
-                lua_pushnil(L);
-                lua_pushliteral(L, "certificate host mismatch");
-
-                llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-                if (llcf->log_socket_errors) {
-                    ngx_log_error(NGX_LOG_ERR, dc->log, 0, "lua ssl "
-                                  "certificate does not match host \"%V\"",
-                                  &u->ssl_name);
-                }
-
-                goto failed;
-            }
-
-#endif
-        }
-
-        if (waiting) {
-            ngx_http_lua_socket_handle_conn_success(r, u);
-
-        } else {
-            (void) ngx_http_lua_ssl_handshake_retval_handler(r, u, L);
-        }
-
-        if (waiting) {
-            ngx_http_run_posted_requests(dc);
-        }
-
-        return;
-    }
-
-    lua_pushnil(L);
-    lua_pushliteral(L, "handshake failed");
-
-failed:
-
-    if (waiting) {
-        u->write_prepare_retvals =
-                                ngx_http_lua_socket_conn_error_retval_handler;
-        ngx_http_lua_socket_handle_conn_error(r, u,
-                                              NGX_HTTP_LUA_SOCKET_FT_SSL);
-        ngx_http_run_posted_requests(dc);
-
-    } else {
-        (void) ngx_http_lua_socket_conn_error_retval_handler(r, u, L);
-    }
-}
-
-
-static int
-ngx_http_lua_ssl_handshake_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    ngx_connection_t            *c;
-    ngx_ssl_session_t           *ssl_session, **ud;
-
-    if (!u->ssl_session_reuse) {
-        lua_pushboolean(L, 1);
-        return 1;
-    }
-
-    ud = lua_newuserdata(L, sizeof(ngx_ssl_session_t *));
-
-    c = u->peer.connection;
-
-    ssl_session = ngx_ssl_get_session(c);
-    if (ssl_session == NULL) {
-        *ud = NULL;
-
-    } else {
-        *ud = ssl_session;
-
-       ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                      "lua ssl save session: %p", ssl_session);
-
-        /* set up the __gc metamethod */
-        lua_pushlightuserdata(L, &ngx_http_lua_ssl_session_metatable_key);
-        lua_rawget(L, LUA_REGISTRYINDEX);
-        lua_setmetatable(L, -2);
-    }
-
-    return 1;
-}
-
-#endif  /* NGX_HTTP_SSL */
-
-
-static int
-ngx_http_lua_socket_read_error_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    ngx_uint_t          ft_type;
-
-    if (u->read_co_ctx) {
-        u->read_co_ctx->cleanup = NULL;
-    }
-
-    ft_type = u->ft_type;
-    u->ft_type = 0;
-
-    if (u->no_close) {
-        u->no_close = 0;
-
-    } else {
-        ngx_http_lua_socket_tcp_finalize_read_part(r, u);
-    }
-
-    return ngx_http_lua_socket_prepare_error_retvals(r, u, L, ft_type);
-}
-
-
-static int
-ngx_http_lua_socket_write_error_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    ngx_uint_t          ft_type;
-
-    if (u->write_co_ctx) {
-        u->write_co_ctx->cleanup = NULL;
-    }
-
-    ngx_http_lua_socket_tcp_finalize_write_part(r, u);
-
-    ft_type = u->ft_type;
-    u->ft_type = 0;
-    return ngx_http_lua_socket_prepare_error_retvals(r, u, L, ft_type);
-}
-
-
-static int
-ngx_http_lua_socket_prepare_error_retvals(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L, ngx_uint_t ft_type)
-{
-    u_char           errstr[NGX_MAX_ERROR_STR];
-    u_char          *p;
-
-    if (ft_type & (NGX_HTTP_LUA_SOCKET_FT_RESOLVER
-                   | NGX_HTTP_LUA_SOCKET_FT_SSL))
-    {
-        return 2;
-    }
-
-    lua_pushnil(L);
-
-    if (ft_type & NGX_HTTP_LUA_SOCKET_FT_TIMEOUT) {
-        lua_pushliteral(L, "timeout");
-
-    } else if (ft_type & NGX_HTTP_LUA_SOCKET_FT_CLOSED) {
-        lua_pushliteral(L, "closed");
-
-    } else if (ft_type & NGX_HTTP_LUA_SOCKET_FT_BUFTOOSMALL) {
-        lua_pushliteral(L, "buffer too small");
-
-    } else if (ft_type & NGX_HTTP_LUA_SOCKET_FT_NOMEM) {
-        lua_pushliteral(L, "no memory");
-
-    } else if (ft_type & NGX_HTTP_LUA_SOCKET_FT_CLIENTABORT) {
-        lua_pushliteral(L, "client aborted");
-
-    } else {
-
-        if (u->socket_errno) {
-#if defined(nginx_version) && nginx_version >= 9000
-            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_tcp_conn_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    if (u->ft_type) {
-        return ngx_http_lua_socket_conn_error_retval_handler(r, u, L);
-    }
-
-    lua_pushinteger(L, 1);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_receive(lua_State *L)
-{
-    ngx_http_request_t                  *r;
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-    ngx_int_t                            rc;
-    ngx_http_lua_ctx_t                  *ctx;
-    int                                  n;
-    ngx_str_t                            pat;
-    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) {
-        return luaL_error(L, "expecting 1 or 2 arguments "
-                          "(including the object), but got %d", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket calling receive() method");
-
-    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->read_closed) {
-
-        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:%d eof:%d",
-                          u, u ? u->peer.connection : NULL,
-                          u ? (int) u->ft_type : 0, u ? (int) u->eof : 0);
-        }
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    if (u->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    ngx_http_lua_socket_check_busy_connecting(r, u, L);
-    ngx_http_lua_socket_check_busy_reading(r, u, L);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket read timeout: %M", u->read_timeout);
-
-    if (n > 1) {
-        if (lua_isnumber(L, 2)) {
-            typ = LUA_TNUMBER;
-
-        } else {
-            typ = lua_type(L, 2);
-        }
-
-        switch (typ) {
-        case LUA_TSTRING:
-            pat.data = (u_char *) luaL_checklstring(L, 2, &pat.len);
-            if (pat.len != 2 || pat.data[0] != '*') {
-                p = (char *) lua_pushfstring(L, "bad pattern argument: %s",
-                                             (char *) pat.data);
-
-                return luaL_argerror(L, 2, p);
-            }
-
-            switch (pat.data[1]) {
-            case 'l':
-                u->input_filter = ngx_http_lua_socket_read_line;
-                break;
-
-            case 'a':
-                u->input_filter = ngx_http_lua_socket_read_all;
-                break;
-
-            default:
-                return luaL_argerror(L, 2, "bad pattern argument");
-                break;
-            }
-
-            u->length = 0;
-            u->rest = 0;
-
-            break;
-
-        case LUA_TNUMBER:
-            bytes = lua_tointeger(L, 2);
-            if (bytes < 0) {
-                return luaL_argerror(L, 2, "bad pattern argument");
-            }
-
-#if 1
-            if (bytes == 0) {
-                lua_pushliteral(L, "");
-                return 1;
-            }
-#endif
-
-            u->input_filter = ngx_http_lua_socket_read_chunk;
-            u->length = (size_t) bytes;
-            u->rest = u->length;
-
-            break;
-
-        default:
-            return luaL_argerror(L, 2, "bad pattern argument");
-            break;
-        }
-
-    } else {
-        u->input_filter = ngx_http_lua_socket_read_line;
-        u->length = 0;
-        u->rest = 0;
-    }
-
-    u->input_filter_ctx = u;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (u->bufs_in == NULL) {
-        u->bufs_in =
-            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                            &ctx->free_recv_bufs,
-                                            u->conf->buffer_size);
-
-        if (u->bufs_in == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        u->buf_in = u->bufs_in;
-        u->buffer = *u->buf_in->buf;
-    }
-
-    dd("tcp receive: buf_in: %p, bufs_in: %p", u->buf_in, u->bufs_in);
-
-    if (u->raw_downstream || u->body_downstream) {
-        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
-    }
-
-    u->read_waiting = 0;
-    u->read_co_ctx = NULL;
-
-    rc = ngx_http_lua_socket_tcp_read(r, u);
-
-    if (rc == NGX_ERROR) {
-        dd("read failed: %d", (int) u->ft_type);
-        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-        dd("tcp receive retval returned: %d", (int) rc);
-        return rc;
-    }
-
-    if (rc == NGX_OK) {
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket receive done in a single run");
-
-        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-    }
-
-    /* rc == NGX_AGAIN */
-
-    u->read_event_handler = ngx_http_lua_socket_read_handler;
-
-    coctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_coctx_cleanup;
-    coctx->data = u;
-
-    if (ctx->entered_content_phase) {
-        r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    u->read_co_ctx = coctx;
-    u->read_waiting = 1;
-    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
-
-    dd("setting data to %p, coctx:%p", u, coctx);
-
-    if (u->raw_downstream || u->body_downstream) {
-        ctx->downstream = u;
-    }
-
-    return lua_yield(L, 0);
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_read_chunk(void *data, ssize_t bytes)
-{
-    ngx_http_lua_socket_tcp_upstream_t      *u = data;
-
-    ngx_buf_t                   *b;
-#if (NGX_DEBUG)
-    ngx_http_request_t          *r;
-
-    r = u->request;
-#endif
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket read chunk %z", bytes);
-
-    if (bytes == 0) {
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
-        return NGX_ERROR;
-    }
-
-    b = &u->buffer;
-
-    if (bytes >= (ssize_t) u->rest) {
-
-        u->buf_in->buf->last += u->rest;
-        b->pos += u->rest;
-        u->rest = 0;
-
-        return NGX_OK;
-    }
-
-    /* bytes < u->rest */
-
-    u->buf_in->buf->last += bytes;
-    b->pos += bytes;
-    u->rest -= bytes;
-
-    return NGX_AGAIN;
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_read_all(void *data, ssize_t bytes)
-{
-    ngx_http_lua_socket_tcp_upstream_t      *u = data;
-
-    ngx_buf_t                   *b;
-#if (NGX_DEBUG)
-    ngx_http_request_t          *r;
-
-    r = u->request;
-#endif
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket read all");
-
-    if (bytes == 0) {
-        return NGX_OK;
-    }
-
-    b = &u->buffer;
-
-    u->buf_in->buf->last += bytes;
-    b->pos += bytes;
-
-    return NGX_AGAIN;
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_read_line(void *data, ssize_t bytes)
-{
-    ngx_http_lua_socket_tcp_upstream_t      *u = data;
-
-    ngx_buf_t                   *b;
-    u_char                      *dst;
-    u_char                       c;
-#if (NGX_DEBUG)
-    u_char                      *begin;
-#endif
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "lua tcp socket read line");
-
-    if (bytes == 0) {
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
-        return NGX_ERROR;
-    }
-
-    b = &u->buffer;
-
-#if (NGX_DEBUG)
-    begin = b->pos;
-#endif
-
-    dd("already read: %p: %.*s", u->buf_in,
-       (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
-       u->buf_in->buf->pos);
-
-    dd("data read: %.*s", (int) bytes, b->pos);
-
-    dst = u->buf_in->buf->last;
-
-    while (bytes--) {
-
-        c = *b->pos++;
-
-        switch (c) {
-        case '\n':
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                           "lua tcp socket read the final line part: \"%*s\"",
-                           b->pos - 1 - begin, begin);
-
-            u->buf_in->buf->last = dst;
-
-            dd("read a line: %p: %.*s", u->buf_in,
-               (int) (u->buf_in->buf->last - u->buf_in->buf->pos),
-               u->buf_in->buf->pos);
-
-            return NGX_OK;
-
-        case '\r':
-            /* ignore it */
-            break;
-
-        default:
-            *dst++ = c;
-            break;
-        }
-    }
-
-#if (NGX_DEBUG)
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, u->request->connection->log, 0,
-                   "lua tcp socket read partial line data: %*s",
-                   dst - begin, begin);
-#endif
-
-    u->buf_in->buf->last = dst;
-
-    return NGX_AGAIN;
-}
-
-
-static ngx_int_t
-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;
-    ngx_buf_t                   *b;
-    ngx_event_t                 *rev;
-    size_t                       size;
-    ssize_t                      n;
-    unsigned                     read;
-    off_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 tcp socket read data: wait:%d",
-                   (int) u->read_waiting);
-
-    b = &u->buffer;
-    read = 0;
-
-    for ( ;; ) {
-
-        size = b->last - b->pos;
-
-        if (size || u->eof) {
-
-            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 tcp socket receive done: wait:%d, eof:%d, "
-                               "uri:\"%V?%V\"", (int) u->read_waiting,
-                               (int) u->eof, &r->uri, &r->args);
-
-                if (u->body_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_read_error(r, u,
-                                          NGX_HTTP_LUA_SOCKET_FT_CLIENTABORT);
-
-                        } else {
-                            ngx_http_lua_socket_handle_read_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_read_error(r, u,
-                                     NGX_HTTP_LUA_SOCKET_FT_ERROR);
-                    return NGX_ERROR;
-                }
-#endif
-
-success:
-
-                ngx_http_lua_socket_handle_read_success(r, u);
-                return NGX_OK;
-            }
-
-            if (rc == NGX_ERROR) {
-                dd("input filter error: ft_type:%d wait:%d",
-                   (int) u->ft_type, (int) u->read_waiting);
-
-                ngx_http_lua_socket_handle_read_error(r, u,
-                                                NGX_HTTP_LUA_SOCKET_FT_ERROR);
-                return NGX_ERROR;
-            }
-
-            /* rc == NGX_AGAIN */
-
-            if (u->body_downstream && r->request_body->rest == 0) {
-                u->eof = 1;
-            }
-
-            continue;
-        }
-
-        if (read && !rev->ready) {
-            rc = NGX_AGAIN;
-            break;
-        }
-
-        size = b->end - b->last;
-
-        if (size == 0) {
-            rc = ngx_http_lua_socket_add_input_buffer(r, u);
-            if (rc == NGX_ERROR) {
-                ngx_http_lua_socket_handle_read_error(r, u,
-                                                NGX_HTTP_LUA_SOCKET_FT_NOMEM);
-
-                return NGX_ERROR;
-            }
-
-            b = &u->buffer;
-            size = (size_t) (b->end - b->last);
-        }
-
-        if (u->raw_downstream) {
-            preread = r->header_in->last - r->header_in->pos;
-
-            if (preread) {
-
-                if ((off_t) size > preread) {
-                    size = (size_t) 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;
-                continue;
-            }
-
-        } else if (u->body_downstream) {
-
-            if (r->request_body->rest == 0) {
-
-                dd("request body rest is zero");
-
-                u->eof = 1;
-
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "lua request body exhausted");
-
-                continue;
-            }
-
-            /* try to process the preread body */
-
-            preread = r->header_in->last - r->header_in->pos;
-
-            if (preread) {
-
-                /* there is the pre-read part of the request body */
-
-                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "http client request body preread %O", preread);
-
-                if (preread >= r->request_body->rest) {
-                    preread = r->request_body->rest;
-                }
-
-                if ((off_t) size > preread) {
-                    size = (size_t) 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;
-                r->request_length += size;
-
-                if (r->request_body->rest) {
-                    r->request_body->rest -= size;
-                }
-
-                continue;
-            }
-
-            if (size > (size_t) r->request_body->rest) {
-                size = (size_t) r->request_body->rest;
-            }
-        }
-
-#if 1
-        if (rev->active && !rev->ready) {
-            rc = NGX_AGAIN;
-            break;
-        }
-#endif
-
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket try to recv data %uz: \"%V?%V\"",
-                       size, &r->uri, &r->args);
-
-        n = c->recv(c, b->last, size);
-
-        dd("read event ready: %d", (int) c->read->ready);
-
-        read = 1;
-
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket recv returned %d: \"%V?%V\"",
-                       (int) n, &r->uri, &r->args);
-
-        if (n == NGX_AGAIN) {
-            rc = NGX_AGAIN;
-            dd("socket recv busy");
-            break;
-        }
-
-        if (n == 0) {
-
-            if (u->raw_downstream || u->body_downstream) {
-
-                llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-                if (llcf->check_client_abort) {
-
-                    ngx_http_lua_socket_handle_read_error(r, u,
-                                          NGX_HTTP_LUA_SOCKET_FT_CLIENTABORT);
-                    return NGX_ERROR;
-                }
-
-                /* llcf->check_client_abort == 0 */
-
-                if (u->body_downstream && r->request_body->rest) {
-                    ngx_http_lua_socket_handle_read_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 tcp socket closed");
-
-            continue;
-        }
-
-        if (n == NGX_ERROR) {
-            u->socket_errno = ngx_socket_errno;
-            ngx_http_lua_socket_handle_read_error(r, u,
-                                                  NGX_HTTP_LUA_SOCKET_FT_ERROR);
-            return NGX_ERROR;
-        }
-
-        b->last += n;
-
-        if (u->body_downstream) {
-            r->request_length += n;
-            r->request_body->rest -= n;
-        }
-    }
-
-#if 1
-    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
-        ngx_http_lua_socket_handle_read_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 rc;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_send(lua_State *L)
-{
-    ngx_int_t                            rc;
-    ngx_http_request_t                  *r;
-    u_char                              *p;
-    size_t                               len;
-    ngx_chain_t                         *cl;
-    ngx_http_lua_ctx_t                  *ctx;
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-    int                                  type;
-    int                                  tcp_nodelay;
-    const char                          *msg;
-    ngx_buf_t                           *b;
-    ngx_connection_t                    *c;
-    ngx_http_lua_loc_conf_t             *llcf;
-    ngx_http_core_loc_conf_t            *clcf;
-    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 2 arguments (including the object), "
-                          "but got %d", lua_gettop(L));
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    luaL_checktype(L, 1, LUA_TTABLE);
-
-    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
-    u = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    dd("tcp send: u=%p, u->write_closed=%d", u, (unsigned) u->write_closed);
-
-    if (u == NULL || u->peer.connection == NULL || u->write_closed) {
-        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:%d eof:%d",
-                          u, u ? u->peer.connection : NULL,
-                          u ? (int) u->ft_type : 0, u ? (int) u->eof : 0);
-        }
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    if (u->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    ngx_http_lua_socket_check_busy_connecting(r, u, L);
-    ngx_http_lua_socket_check_busy_writing(r, u, L);
-
-    if (u->body_downstream) {
-        return luaL_error(L, "attempt to write to request sockets");
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket send timeout: %M", u->send_timeout);
-
-    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;
-
-        case LUA_TNIL:
-            len = sizeof("nil") - 1;
-            break;
-
-        case LUA_TBOOLEAN:
-            if (lua_toboolean(L, 2)) {
-                len = sizeof("true") - 1;
-
-            } else {
-                len = sizeof("false") - 1;
-            }
-
-            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);
-    }
-
-    if (len == 0) {
-        lua_pushinteger(L, 0);
-        return 1;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    cl = ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                         &ctx->free_bufs, len);
-
-    if (cl == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    b = cl->buf;
-
-    switch (type) {
-        case LUA_TNUMBER:
-        case LUA_TSTRING:
-            p = (u_char *) lua_tolstring(L, -1, &len);
-            b->last = ngx_copy(b->last, (u_char *) p, len);
-            break;
-
-        case LUA_TTABLE:
-            b->last = ngx_http_lua_copy_str_in_table(L, -1, b->last);
-            break;
-
-        case LUA_TNIL:
-            *b->last++ = 'n';
-            *b->last++ = 'i';
-            *b->last++ = 'l';
-            break;
-
-        case LUA_TBOOLEAN:
-            if (lua_toboolean(L, 2)) {
-                *b->last++ = 't';
-                *b->last++ = 'r';
-                *b->last++ = 'u';
-                *b->last++ = 'e';
-
-            } else {
-                *b->last++ = 'f';
-                *b->last++ = 'a';
-                *b->last++ = 'l';
-                *b->last++ = 's';
-                *b->last++ = 'e';
-            }
-
-            break;
-
-        default:
-            return luaL_error(L, "impossible to reach here");
-    }
-
-    u->request_bufs = cl;
-
-    u->request_len = len;
-
-    /* mimic ngx_http_upstream_init_request here */
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-    c = u->peer.connection;
-
-    if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "lua socket tcp_nodelay");
-
-        tcp_nodelay = 1;
-
-        if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
-                       (const void *) &tcp_nodelay, sizeof(int))
-            == -1)
-        {
-            llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-            if (llcf->log_socket_errors) {
-                ngx_connection_error(c, ngx_socket_errno,
-                                     "setsockopt(TCP_NODELAY) "
-                                     "failed");
-            }
-
-            lua_pushnil(L);
-            lua_pushliteral(L, "setsocketopt tcp_nodelay failed");
-            return 2;
-        }
-
-        c->tcp_nodelay = NGX_TCP_NODELAY_SET;
-    }
-
-#if 1
-    u->write_waiting = 0;
-    u->write_co_ctx = NULL;
-#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);
-
-    if (rc == NGX_ERROR) {
-        return ngx_http_lua_socket_write_error_retval_handler(r, u, L);
-    }
-
-    if (rc == NGX_OK) {
-        lua_pushinteger(L, len);
-        return 1;
-    }
-
-    /* rc == NGX_AGAIN */
-
-    coctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_coctx_cleanup;
-    coctx->data = u;
-
-    if (u->raw_downstream) {
-        ctx->writing_raw_req_socket = 1;
-    }
-
-    if (ctx->entered_content_phase) {
-        r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    u->write_co_ctx = coctx;
-    u->write_waiting = 1;
-    u->write_prepare_retvals = ngx_http_lua_socket_tcp_send_retval_handler;
-
-    dd("setting data to %p", u);
-
-    return lua_yield(L, 0);
-}
-
-
-static int
-ngx_http_lua_socket_tcp_send_retval_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, lua_State *L)
-{
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket send return value handler");
-
-    if (u->ft_type) {
-        return ngx_http_lua_socket_write_error_retval_handler(r, u, L);
-    }
-
-    lua_pushinteger(L, u->request_len);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_receive_retval_handler(ngx_http_request_t *r,
-    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 tcp socket receive return value handler");
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-#if 1
-    if (u->raw_downstream || u->body_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) {
-
-        if (u->ft_type & NGX_HTTP_LUA_SOCKET_FT_TIMEOUT) {
-            u->no_close = 1;
-        }
-
-        dd("u->bufs_in: %p", u->bufs_in);
-
-        if (u->bufs_in) {
-            rc = ngx_http_lua_socket_push_input_data(r, ctx, u, L);
-            if (rc == NGX_ERROR) {
-                lua_pushnil(L);
-                lua_pushliteral(L, "no memory");
-                return 2;
-            }
-
-            (void) ngx_http_lua_socket_read_error_retval_handler(r, u, L);
-
-            lua_pushvalue(L, -3);
-            lua_remove(L, -4);
-            return 3;
-        }
-
-        n = ngx_http_lua_socket_read_error_retval_handler(r, u, L);
-        lua_pushliteral(L, "");
-        return n + 1;
-    }
-
-    rc = ngx_http_lua_socket_push_input_data(r, ctx, u, L);
-    if (rc == NGX_ERROR) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "no memory");
-        return 2;
-    }
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_close(lua_State *L)
-{
-    ngx_http_request_t                  *r;
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting 1 argument "
-                          "(including the object) but seen %d", lua_gettop(L));
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request 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->peer.connection == NULL
-        || (u->read_closed && u->write_closed))
-    {
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    if (u->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    ngx_http_lua_socket_check_busy_connecting(r, u, L);
-    ngx_http_lua_socket_check_busy_reading(r, u, L);
-    ngx_http_lua_socket_check_busy_writing(r, u, L);
-
-    if (u->raw_downstream || u->body_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;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_setoption(lua_State *L)
-{
-    /* TODO */
-    return 0;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_settimeout(lua_State *L)
-{
-    int                     n;
-    ngx_int_t               timeout;
-
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-
-    n = lua_gettop(L);
-
-    if (n != 2) {
-        return luaL_error(L, "ngx.socket settimout: expecting 2 arguments "
-                          "(including the object) but seen %d", lua_gettop(L));
-    }
-
-    timeout = (ngx_int_t) lua_tonumber(L, 2);
-    if (timeout >> 31) {
-        return luaL_error(L, "bad timeout value");
-    }
-
-    lua_pushinteger(L, timeout);
-    lua_pushinteger(L, timeout);
-
-    lua_rawseti(L, 1, SOCKET_CONNECT_TIMEOUT_INDEX);
-    lua_rawseti(L, 1, SOCKET_SEND_TIMEOUT_INDEX);
-    lua_rawseti(L, 1, SOCKET_READ_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;
-            u->send_timeout = (ngx_msec_t) timeout;
-            u->connect_timeout = (ngx_msec_t) timeout;
-
-        } else {
-            u->read_timeout = u->conf->read_timeout;
-            u->send_timeout = u->conf->send_timeout;
-            u->connect_timeout = u->conf->connect_timeout;
-        }
-    }
-
-    return 0;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_settimeouts(lua_State *L)
-{
-    int                     n;
-    ngx_int_t               connect_timeout, send_timeout, read_timeout;
-
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-
-    n = lua_gettop(L);
-
-    if (n != 4) {
-        return luaL_error(L, "ngx.socket settimout: expecting 4 arguments "
-                          "(including the object) but seen %d", lua_gettop(L));
-    }
-
-    connect_timeout = (ngx_int_t) lua_tonumber(L, 2);
-    if (connect_timeout >> 31) {
-        return luaL_error(L, "bad timeout value");
-    }
-
-    send_timeout = (ngx_int_t) lua_tonumber(L, 3);
-    if (send_timeout >> 31) {
-        return luaL_error(L, "bad timeout value");
-    }
-
-    read_timeout = (ngx_int_t) lua_tonumber(L, 4);
-    if (read_timeout >> 31) {
-        return luaL_error(L, "bad timeout value");
-    }
-
-    lua_rawseti(L, 1, SOCKET_READ_TIMEOUT_INDEX);
-    lua_rawseti(L, 1, SOCKET_SEND_TIMEOUT_INDEX);
-    lua_rawseti(L, 1, SOCKET_CONNECT_TIMEOUT_INDEX);
-
-    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
-    u = lua_touserdata(L, -1);
-
-    if (u) {
-        if (connect_timeout > 0) {
-            u->connect_timeout = (ngx_msec_t) connect_timeout;
-
-        } else {
-            u->connect_timeout = u->conf->connect_timeout;
-        }
-
-        if (send_timeout > 0) {
-            u->send_timeout = (ngx_msec_t) send_timeout;
-
-        } else {
-            u->send_timeout = u->conf->send_timeout;
-        }
-
-        if (read_timeout > 0) {
-            u->read_timeout = (ngx_msec_t) read_timeout;
-
-        } else {
-            u->read_timeout = u->conf->read_timeout;
-        }
-    }
-
-    return 0;
-}
-
-
-static void
-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_tcp_upstream_t  *u;
-
-    c = ev->data;
-    u = c->data;
-    r = u->request;
-    c = r->connection;
-
-    if (c->fd != (ngx_socket_t) -1) {  /* not a fake connection */
-        ctx = c->log->data;
-        ctx->current_request = r;
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "lua tcp socket handler for \"%V?%V\", wev %d", &r->uri,
-                   &r->args, (int) ev->write);
-
-    if (ev->write) {
-        u->write_event_handler(r, u);
-
-    } else {
-        u->read_event_handler(r, u);
-    }
-
-    ngx_http_run_posted_requests(c);
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_tcp_get_peer(ngx_peer_connection_t *pc, void *data)
-{
-    /* empty */
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_lua_socket_read_handler(ngx_http_request_t *r,
-    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 tcp 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 tcp socket read timed out");
-        }
-
-        ngx_http_lua_socket_handle_read_error(r, u,
-                                              NGX_HTTP_LUA_SOCKET_FT_TIMEOUT);
-        return;
-    }
-
-#if 1
-    if (c->read->timer_set) {
-        ngx_del_timer(c->read);
-    }
-#endif
-
-    if (u->buffer.start != NULL) {
-        (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_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 tcp socket send handler");
-
-    if (c->write->timedout) {
-        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_write_error(r, u,
-                                               NGX_HTTP_LUA_SOCKET_FT_TIMEOUT);
-        return;
-    }
-
-    if (u->request_bufs) {
-        (void) ngx_http_lua_socket_send(r, u);
-    }
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_send(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    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 tcp socket send data");
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        ngx_http_lua_socket_handle_write_error(r, u,
-                                               NGX_HTTP_LUA_SOCKET_FT_ERROR);
-        return NGX_ERROR;
-    }
-
-    b = u->request_bufs->buf;
-
-    for (;;) {
-        n = c->send(c, b->pos, b->last - b->pos);
-
-        if (n >= 0) {
-            b->pos += n;
-
-            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 defined(nginx_version) && nginx_version >= 1001004
-                ngx_chain_update_chains(r->pool,
-#else
-                ngx_chain_update_chains(
-#endif
-                                        &ctx->free_bufs, &ctx->busy_bufs,
-                                        &u->request_bufs,
-                                        (ngx_buf_tag_t) &ngx_http_lua_module);
-
-                u->write_event_handler = ngx_http_lua_socket_dummy_handler;
-
-                if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
-                    ngx_http_lua_socket_handle_write_error(r, u,
-                                                NGX_HTTP_LUA_SOCKET_FT_ERROR);
-                    return NGX_ERROR;
-                }
-
-                ngx_http_lua_socket_handle_write_success(r, u);
-                return NGX_OK;
-            }
-
-            /* keep sending more data */
-            continue;
-        }
-
-        /* NGX_ERROR || NGX_AGAIN */
-        break;
-    }
-
-    if (n == NGX_ERROR) {
-        c->error = 1;
-        u->socket_errno = ngx_socket_errno;
-        ngx_http_lua_socket_handle_write_error(r, u,
-                                               NGX_HTTP_LUA_SOCKET_FT_ERROR);
-        return NGX_ERROR;
-    }
-
-    /* n == NGX_AGAIN */
-
-    if (u->raw_downstream) {
-        ctx->writing_raw_req_socket = 1;
-    }
-
-    u->write_event_handler = ngx_http_lua_socket_send_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_write_error(r, u,
-                                               NGX_HTTP_LUA_SOCKET_FT_ERROR);
-        return NGX_ERROR;
-    }
-
-    return NGX_AGAIN;
-}
-
-
-static void
-ngx_http_lua_socket_handle_conn_success(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-#if 1
-    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
-    u->write_event_handler = ngx_http_lua_socket_dummy_handler;
-#endif
-
-    if (u->conn_waiting) {
-        u->conn_waiting = 0;
-
-        coctx = u->write_co_ctx;
-        coctx->cleanup = NULL;
-        u->write_co_ctx = NULL;
-
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-        if (ctx == NULL) {
-            return;
-        }
-
-        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_resume;
-        ctx->cur_co_ctx = coctx;
-
-        ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                            || coctx->co_ref >= 0));
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket waking up the current request (conn)");
-
-        r->write_event_handler(r);
-    }
-}
-
-
-static void
-ngx_http_lua_socket_handle_read_success(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-#if 1
-    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
-#endif
-
-    if (u->read_waiting) {
-        u->read_waiting = 0;
-
-        coctx = u->read_co_ctx;
-        coctx->cleanup = NULL;
-        u->read_co_ctx = NULL;
-
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-        if (ctx == NULL) {
-            return;
-        }
-
-        ctx->resume_handler = ngx_http_lua_socket_tcp_read_resume;
-        ctx->cur_co_ctx = coctx;
-
-        ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                            || coctx->co_ref >= 0));
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket waking up the current request (read)");
-
-        r->write_event_handler(r);
-    }
-}
-
-
-static void
-ngx_http_lua_socket_handle_write_success(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-#if 1
-    u->write_event_handler = ngx_http_lua_socket_dummy_handler;
-#endif
-
-    if (u->write_waiting) {
-        u->write_waiting = 0;
-
-        coctx = u->write_co_ctx;
-        coctx->cleanup = NULL;
-        u->write_co_ctx = NULL;
-
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-        if (ctx == NULL) {
-            return;
-        }
-
-        ctx->resume_handler = ngx_http_lua_socket_tcp_write_resume;
-        ctx->cur_co_ctx = coctx;
-
-        ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                            || coctx->co_ref >= 0));
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket waking up the current request (read)");
-
-        r->write_event_handler(r);
-    }
-}
-
-
-static void
-ngx_http_lua_socket_handle_conn_error(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_uint_t ft_type)
-{
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket handle connect error");
-
-    u->ft_type |= ft_type;
-
-#if 1
-    ngx_http_lua_socket_tcp_finalize(r, u);
-#endif
-
-    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
-    u->write_event_handler = ngx_http_lua_socket_dummy_handler;
-
-    dd("connection waiting: %d", (int) u->conn_waiting);
-
-    coctx = u->write_co_ctx;
-
-    if (u->conn_waiting) {
-        u->conn_waiting = 0;
-
-        coctx->cleanup = NULL;
-        u->write_co_ctx = NULL;
-
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-        ctx->resume_handler = ngx_http_lua_socket_tcp_conn_resume;
-        ctx->cur_co_ctx = coctx;
-
-        ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                            || coctx->co_ref >= 0));
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket waking up the current request");
-
-        r->write_event_handler(r);
-    }
-}
-
-
-static void
-ngx_http_lua_socket_handle_read_error(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_uint_t ft_type)
-{
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket handle read error");
-
-    u->ft_type |= ft_type;
-
-#if 0
-    ngx_http_lua_socket_tcp_finalize(r, u);
-#endif
-
-    u->read_event_handler = ngx_http_lua_socket_dummy_handler;
-
-    if (u->read_waiting) {
-        u->read_waiting = 0;
-
-        coctx = u->read_co_ctx;
-        coctx->cleanup = NULL;
-        u->read_co_ctx = NULL;
-
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-        ctx->resume_handler = ngx_http_lua_socket_tcp_read_resume;
-        ctx->cur_co_ctx = coctx;
-
-        ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                            || coctx->co_ref >= 0));
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket waking up the current request");
-
-        r->write_event_handler(r);
-    }
-}
-
-
-static void
-ngx_http_lua_socket_handle_write_error(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u, ngx_uint_t ft_type)
-{
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket handle write error");
-
-    u->ft_type |= ft_type;
-
-#if 0
-    ngx_http_lua_socket_tcp_finalize(r, u);
-#endif
-
-    u->write_event_handler = ngx_http_lua_socket_dummy_handler;
-
-    if (u->write_waiting) {
-        u->write_waiting = 0;
-
-        coctx = u->write_co_ctx;
-        coctx->cleanup = NULL;
-        u->write_co_ctx = NULL;
-
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-        ctx->resume_handler = ngx_http_lua_socket_tcp_write_resume;
-        ctx->cur_co_ctx = coctx;
-
-        ngx_http_lua_assert(coctx && (!ngx_http_lua_is_thread(ctx)
-                            || coctx->co_ref >= 0));
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket waking up the current request");
-
-        r->write_event_handler(r);
-    }
-}
-
-
-static void
-ngx_http_lua_socket_connected_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    ngx_int_t                    rc;
-    ngx_connection_t            *c;
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    c = u->peer.connection;
-
-    if (c->write->timedout) {
-
-        llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-        if (llcf->log_socket_errors) {
-            ngx_http_lua_socket_init_peer_connection_addr_text(&u->peer);
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "lua tcp socket connect timed out,"
-                          " when connecting to %V:%ud",
-                          &c->addr_text, ngx_inet_get_port(u->peer.sockaddr));
-        }
-
-        ngx_http_lua_socket_handle_conn_error(r, u,
-                                              NGX_HTTP_LUA_SOCKET_FT_TIMEOUT);
-        return;
-    }
-
-    if (c->write->timer_set) {
-        ngx_del_timer(c->write);
-    }
-
-    rc = ngx_http_lua_socket_test_connect(r, c);
-    if (rc != NGX_OK) {
-        if (rc > 0) {
-            u->socket_errno = (ngx_err_t) rc;
-        }
-
-        ngx_http_lua_socket_handle_conn_error(r, u,
-                                              NGX_HTTP_LUA_SOCKET_FT_ERROR);
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket connected");
-
-    /* We should delete the current write/read event
-     * here because the socket object may not be used immediately
-     * on the Lua land, thus causing hot spin around level triggered
-     * event poll and wasting CPU cycles. */
-
-    if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
-        ngx_http_lua_socket_handle_conn_error(r, u,
-                                              NGX_HTTP_LUA_SOCKET_FT_ERROR);
-        return;
-    }
-
-    if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-        ngx_http_lua_socket_handle_conn_error(r, u,
-                                              NGX_HTTP_LUA_SOCKET_FT_ERROR);
-        return;
-    }
-
-    ngx_http_lua_socket_handle_conn_success(r, u);
-}
-
-
-static void
-ngx_http_lua_socket_tcp_cleanup(void *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 tcp socket request: \"%V\"", &r->uri);
-
-    ngx_http_lua_socket_tcp_finalize(r, u);
-}
-
-
-static void
-ngx_http_lua_socket_tcp_finalize_read_part(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    ngx_chain_t                         *cl;
-    ngx_chain_t                        **ll;
-    ngx_connection_t                    *c;
-    ngx_http_lua_ctx_t                  *ctx;
-
-    if (u->read_closed) {
-        return;
-    }
-
-    u->read_closed = 1;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (ctx && u->bufs_in) {
-
-        ll = &u->bufs_in;
-        for (cl = u->bufs_in; cl; cl = cl->next) {
-            dd("bufs_in chain: %p, next %p", cl, cl->next);
-            cl->buf->pos = cl->buf->last;
-            ll = &cl->next;
-        }
-
-        dd("ctx: %p", ctx);
-        dd("free recv bufs: %p", ctx->free_recv_bufs);
-        *ll = ctx->free_recv_bufs;
-        ctx->free_recv_bufs = u->bufs_in;
-        u->bufs_in = NULL;
-        u->buf_in = NULL;
-        ngx_memzero(&u->buffer, sizeof(ngx_buf_t));
-    }
-
-    if (u->raw_downstream || u->body_downstream) {
-        if (r->connection->read->timer_set) {
-            ngx_del_timer(r->connection->read);
-        }
-        return;
-    }
-
-    c = u->peer.connection;
-
-    if (c) {
-        if (c->read->timer_set) {
-            ngx_del_timer(c->read);
-        }
-
-        if (c->read->active || c->read->disabled) {
-            ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
-        }
-
-#if defined(nginx_version) && nginx_version >= 1007005
-        if (c->read->posted) {
-#else
-        if (c->read->prev) {
-#endif
-            ngx_delete_posted_event(c->read);
-        }
-
-        c->read->closed = 1;
-
-        /* TODO: shutdown the reading part of the connection */
-    }
-}
-
-
-static void
-ngx_http_lua_socket_tcp_finalize_write_part(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    ngx_connection_t                    *c;
-    ngx_http_lua_ctx_t                  *ctx;
-
-    if (u->write_closed) {
-        return;
-    }
-
-    u->write_closed = 1;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (u->raw_downstream || u->body_downstream) {
-        if (ctx && ctx->writing_raw_req_socket) {
-            ctx->writing_raw_req_socket = 0;
-            if (r->connection->write->timer_set) {
-                ngx_del_timer(r->connection->write);
-            }
-
-            r->connection->write->error = 1;
-        }
-        return;
-    }
-
-    c = u->peer.connection;
-
-    if (c) {
-        if (c->write->timer_set) {
-            ngx_del_timer(c->write);
-        }
-
-        if (c->write->active || c->write->disabled) {
-            ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
-        }
-
-#if defined(nginx_version) && nginx_version >= 1007005
-        if (c->write->posted) {
-#else
-        if (c->write->prev) {
-#endif
-            ngx_delete_posted_event(c->write);
-        }
-
-        c->write->closed = 1;
-
-        /* TODO: shutdown the writing part of the connection */
-    }
-}
-
-
-static void
-ngx_http_lua_socket_tcp_finalize(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    ngx_connection_t               *c;
-    ngx_http_lua_socket_pool_t     *spool;
-
-    dd("request: %p, u: %p, u->cleanup: %p", r, u, u->cleanup);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua finalize socket");
-
-    if (u->cleanup) {
-        *u->cleanup = NULL;
-        ngx_http_lua_cleanup_free(r, u->cleanup);
-        u->cleanup = NULL;
-    }
-
-    ngx_http_lua_socket_tcp_finalize_read_part(r, u);
-    ngx_http_lua_socket_tcp_finalize_write_part(r, u);
-
-    if (u->raw_downstream || u->body_downstream) {
-        u->peer.connection = NULL;
-        return;
-    }
-
-    if (u->resolved && u->resolved->ctx) {
-        ngx_resolve_name_done(u->resolved->ctx);
-        u->resolved->ctx = NULL;
-    }
-
-    if (u->peer.free) {
-        u->peer.free(&u->peer, u->peer.data, 0);
-    }
-
-#if (NGX_HTTP_SSL)
-    if (u->ssl_name.data) {
-        ngx_free(u->ssl_name.data);
-        u->ssl_name.data = NULL;
-        u->ssl_name.len = 0;
-    }
-#endif
-
-    c = u->peer.connection;
-    if (c) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua close socket connection");
-
-        ngx_http_lua_socket_tcp_close_connection(c);
-        u->peer.connection = NULL;
-
-        if (!u->reused) {
-            return;
-        }
-
-        spool = u->socket_pool;
-        if (spool == NULL) {
-            return;
-        }
-
-        spool->active_connections--;
-
-        if (spool->active_connections == 0) {
-            ngx_http_lua_socket_free_pool(r->connection->log, spool);
-        }
-    }
-}
-
-
-static void
-ngx_http_lua_socket_tcp_close_connection(ngx_connection_t *c)
-{
-#if (NGX_HTTP_SSL)
-
-    if (c->ssl) {
-        c->ssl->no_wait_shutdown = 1;
-        c->ssl->no_send_shutdown = 1;
-
-        (void) ngx_ssl_shutdown(c);
-    }
-
-#endif
-
-    if (c->pool) {
-        ngx_destroy_pool(c->pool);
-        c->pool = NULL;
-    }
-
-    ngx_close_connection(c);
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_test_connect(ngx_http_request_t *r, ngx_connection_t *c)
-{
-    int              err;
-    socklen_t        len;
-
-    ngx_http_lua_loc_conf_t     *llcf;
-
-#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) {
-            ev = c->write;
-
-        } else if (c->read->pending_eof) {
-            ev = c->read;
-
-        } else {
-            ev = NULL;
-        }
-
-        if (ev) {
-            llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-            if (llcf->log_socket_errors) {
-                (void) ngx_connection_error(c, ev->kq_errno,
-                                            "kevent() reported that "
-                                            "connect() failed");
-            }
-            return ev->kq_errno;
-        }
-
-    } else
-#endif
-    {
-        err = 0;
-        len = sizeof(int);
-
-        /*
-         * BSDs and Linux return 0 and set a pending error in err
-         * Solaris returns -1 and sets errno
-         */
-
-        if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len)
-            == -1)
-        {
-            err = ngx_errno;
-        }
-
-        if (err) {
-            llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-            if (llcf->log_socket_errors) {
-                (void) ngx_connection_error(c, err, "connect() failed");
-            }
-            return err;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_lua_socket_dummy_handler(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket dummy handler");
-}
-
-
-static int
-ngx_http_lua_socket_tcp_receiveuntil(lua_State *L)
-{
-    ngx_http_request_t                  *r;
-    int                                  n;
-    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 && n != 3) {
-        return luaL_error(L, "expecting 2 or 3 arguments "
-                          "(including the object), but got %d", n);
-    }
-
-    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);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket calling receiveuntil() method");
-
-    luaL_checktype(L, 1, LUA_TTABLE);
-
-    pat.data = (u_char *) luaL_checklstring(L, 2, &pat.len);
-    if (pat.len == 0) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "pattern is empty");
-        return 2;
-    }
-
-    size = sizeof(ngx_http_lua_socket_compiled_pattern_t);
-
-    cp = lua_newuserdata(L, size);
-    if (cp == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    lua_pushlightuserdata(L, &ngx_http_lua_pattern_udata_metatable_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    lua_setmetatable(L, -2);
-
-    ngx_memzero(cp, size);
-
-    cp->inclusive = inclusive;
-
-    rc = ngx_http_lua_socket_compile_pattern(pat.data, pat.len, cp,
-                                             r->connection->log);
-
-    if (rc != NGX_OK) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "failed to compile pattern");
-        return 2;
-    }
-
-    lua_pushcclosure(L, ngx_http_lua_socket_receiveuntil_iterator, 3);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_socket_receiveuntil_iterator(lua_State *L)
-{
-    ngx_http_request_t                  *r;
-    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;
-
-    n = lua_gettop(L);
-    if (n > 1) {
-        return luaL_error(L, "expecting 0 or 1 arguments, "
-                          "but seen %d", n);
-    }
-
-    if (n >= 1) {
-        bytes = luaL_checkinteger(L, 1);
-        if (bytes < 0) {
-            bytes = 0;
-        }
-
-    } else {
-        bytes = 0;
-    }
-
-    lua_rawgeti(L, lua_upvalueindex(1), SOCKET_CTX_INDEX);
-    u = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    if (u == NULL || u->peer.connection == NULL || u->read_closed) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    if (u->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    ngx_http_lua_socket_check_busy_connecting(r, u, L);
-    ngx_http_lua_socket_check_busy_reading(r, u, L);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket receiveuntil iterator");
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket read timeout: %M", u->read_timeout);
-
-    u->input_filter = ngx_http_lua_socket_read_until;
-
-    cp = lua_touserdata(L, lua_upvalueindex(3));
-
-    dd("checking existing state: %d", cp->state);
-
-    if (cp->state == -1) {
-        cp->state = 0;
-
-        lua_pushnil(L);
-        lua_pushnil(L);
-        lua_pushnil(L);
-        return 3;
-    }
-
-    cp->upstream = u;
-
-    cp->pattern.data =
-        (u_char *) lua_tolstring(L, lua_upvalueindex(2),
-                                 &cp->pattern.len);
-
-    u->input_filter_ctx = cp;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (u->bufs_in == NULL) {
-        u->bufs_in =
-            ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                            &ctx->free_recv_bufs,
-                                            u->conf->buffer_size);
-
-        if (u->bufs_in == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        u->buf_in = u->bufs_in;
-        u->buffer = *u->buf_in->buf;
-    }
-
-    u->length = (size_t) bytes;
-    u->rest = u->length;
-
-    if (u->raw_downstream || u->body_downstream) {
-        r->read_event_handler = ngx_http_lua_req_socket_rev_handler;
-    }
-
-    u->read_waiting = 0;
-    u->read_co_ctx = NULL;
-
-    rc = ngx_http_lua_socket_tcp_read(r, u);
-
-    if (rc == NGX_ERROR) {
-        dd("read failed: %d", (int) u->ft_type);
-        rc = ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-        dd("tcp receive retval returned: %d", (int) rc);
-        return rc;
-    }
-
-    if (rc == NGX_OK) {
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket receive done in a single run");
-
-        return ngx_http_lua_socket_tcp_receive_retval_handler(r, u, L);
-    }
-
-    /* rc == NGX_AGAIN */
-
-    coctx = ctx->cur_co_ctx;
-
-    u->read_event_handler = ngx_http_lua_socket_read_handler;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_coctx_cleanup;
-    coctx->data = u;
-
-    if (ctx->entered_content_phase) {
-        r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    u->read_co_ctx = coctx;
-    u->read_waiting = 1;
-    u->read_prepare_retvals = ngx_http_lua_socket_tcp_receive_retval_handler;
-
-    dd("setting data to %p", u);
-
-    if (u->raw_downstream || u->body_downstream) {
-        ctx->downstream = u;
-    }
-
-    return lua_yield(L, 0);
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_compile_pattern(u_char *data, size_t len,
-    ngx_http_lua_socket_compiled_pattern_t *cp, ngx_log_t *log)
-{
-    size_t              i;
-    size_t              prefix_len;
-    size_t              size;
-    unsigned            found;
-    int                 cur_state, new_state;
-
-    ngx_http_lua_dfa_edge_t         *edge;
-    ngx_http_lua_dfa_edge_t        **last = NULL;
-
-    cp->pattern.len = len;
-
-    if (len <= 2) {
-        return NGX_OK;
-    }
-
-    for (i = 1; i < len; i++) {
-        prefix_len = 1;
-
-        while (prefix_len <= len - i - 1) {
-
-            if (ngx_memcmp(data, &data[i], prefix_len) == 0) {
-                if (data[prefix_len] == data[i + prefix_len]) {
-                    prefix_len++;
-                    continue;
-                }
-
-                cur_state = i + prefix_len;
-                new_state = prefix_len + 1;
-
-                if (cp->recovering == NULL) {
-                    size = sizeof(void *) * (len - 2);
-                    cp->recovering = ngx_alloc(size, log);
-                    if (cp->recovering == NULL) {
-                        return NGX_ERROR;
-                    }
-
-                    ngx_memzero(cp->recovering, size);
-                }
-
-                edge = cp->recovering[cur_state - 2];
-
-                found = 0;
-
-                if (edge == NULL) {
-                    last = &cp->recovering[cur_state - 2];
-
-                } else {
-
-                    for (; edge; edge = edge->next) {
-                        last = &edge->next;
-
-                        if (edge->chr == data[prefix_len]) {
-                            found = 1;
-
-                            if (edge->new_state < new_state) {
-                                edge->new_state = new_state;
-                            }
-
-                            break;
-                        }
-                    }
-                }
-
-                if (!found) {
-                    ngx_log_debug7(NGX_LOG_DEBUG_HTTP, log, 0,
-                                   "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);
-
-                    edge = ngx_alloc(sizeof(ngx_http_lua_dfa_edge_t), log);
-                    if (edge == NULL) {
-                        return NGX_ERROR;
-                    }
-
-                    edge->chr = data[prefix_len];
-                    edge->new_state = new_state;
-                    edge->next = NULL;
-
-                    *last = edge;
-                }
-
-                break;
-            }
-
-            break;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_read_until(void *data, ssize_t bytes)
-{
-    ngx_http_lua_socket_compiled_pattern_t     *cp = data;
-
-    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;
-    int                                      old_state = 0; /* just to make old
-                                                               gcc happy */
-    ngx_http_lua_dfa_edge_t                 *edge;
-    unsigned                                 matched;
-    ngx_int_t                                rc;
-
-    u = cp->upstream;
-    r = u->request;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket read until");
-
-    if (bytes == 0) {
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_CLOSED;
-        return NGX_ERROR;
-    }
-
-    b = &u->buffer;
-
-    pat = cp->pattern.data;
-    pat_len = cp->pattern.len;
-    state = cp->state;
-
-    i = 0;
-    while (i < bytes) {
-        c = b->pos[i];
-
-        dd("%d: read char %d, state: %d", i, c, state);
-
-        if (c == pat[state]) {
-            i++;
-            state++;
-
-            if (state == (int) pat_len) {
-                /* already matched the whole pattern */
-                dd("pat len: %d", (int) pat_len);
-
-                b->pos += i;
-
-                if (u->length) {
-                    cp->state = -1;
-
-                } else {
-                    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;
-            }
-
-            continue;
-        }
-
-        if (state == 0) {
-            u->buf_in->buf->last++;
-
-            i++;
-
-            if (u->length && --u->rest == 0) {
-                cp->state = state;
-                b->pos += i;
-                return NGX_OK;
-            }
-
-            continue;
-        }
-
-        matched = 0;
-
-        if (cp->recovering && state >= 2) {
-            dd("accessing state: %d, index: %d", state, state - 2);
-            for (edge = cp->recovering[state - 2]; edge; edge = edge->next) {
-
-                if (edge->chr == c) {
-                    dd("matched '%c' and jumping to state %d", c,
-                       edge->new_state);
-
-                    old_state = state;
-                    state = edge->new_state;
-                    matched = 1;
-                    break;
-                }
-            }
-        }
-
-        if (!matched) {
-#if 1
-            dd("adding pending data: %.*s", state, pat);
-            rc = ngx_http_lua_socket_add_pending_data(r, u, b->pos, i, pat,
-                                                      state, state);
-
-            if (rc != NGX_OK) {
-                u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-                return NGX_ERROR;
-            }
-
-#endif
-
-            if (u->length) {
-                if (u->rest <= (size_t) state) {
-                    u->rest = 0;
-                    cp->state = 0;
-                    b->pos += i;
-                    return NGX_OK;
-
-                } else {
-                    u->rest -= state;
-                }
-            }
-
-            state = 0;
-            continue;
-        }
-
-        /* matched */
-
-        dd("adding pending data: %.*s", (int) (old_state + 1 - state),
-           (char *) pat);
-
-        rc = ngx_http_lua_socket_add_pending_data(r, u, b->pos, i, pat,
-                                                  old_state + 1 - state,
-                                                  old_state);
-
-        if (rc != NGX_OK) {
-            u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-            return NGX_ERROR;
-        }
-
-        i++;
-
-        if (u->length) {
-            if (u->rest <= (size_t) state) {
-                u->rest = 0;
-                cp->state = state;
-                b->pos += i;
-                return NGX_OK;
-
-            } else {
-                u->rest -= state;
-            }
-        }
-
-        continue;
-    }
-
-    b->pos += i;
-    cp->state = state;
-
-    return NGX_AGAIN;
-}
-
-
-static int
-ngx_http_lua_socket_cleanup_compiled_pattern(lua_State *L)
-{
-    ngx_http_lua_socket_compiled_pattern_t      *cp;
-
-    ngx_http_lua_dfa_edge_t         *edge, *p;
-    unsigned                         i;
-
-    dd("cleanup compiled pattern");
-
-    cp = lua_touserdata(L, 1);
-    if (cp == NULL || cp->recovering == NULL) {
-        return 0;
-    }
-
-    dd("pattern len: %d", (int) cp->pattern.len);
-
-    for (i = 0; i < cp->pattern.len - 2; i++) {
-        edge = cp->recovering[i];
-
-        while (edge) {
-            p = edge;
-            edge = edge->next;
-
-            dd("freeing edge %p", p);
-
-            ngx_free(p);
-
-            dd("edge: %p", edge);
-        }
-    }
-
-#if 1
-    ngx_free(cp->recovering);
-    cp->recovering = NULL;
-#endif
-
-    return 0;
-}
-
-
-static int
-ngx_http_lua_req_socket(lua_State *L)
-{
-    int                              n, raw;
-    ngx_peer_connection_t           *pc;
-    ngx_http_lua_loc_conf_t         *llcf;
-    ngx_connection_t                *c;
-    ngx_http_request_t              *r;
-    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;
-
-    n = lua_gettop(L);
-    if (n == 0) {
-        raw = 0;
-
-    } else if (n == 1) {
-        raw = lua_toboolean(L, 1);
-        lua_pop(L, 1);
-
-    } else {
-        return luaL_error(L, "expecting zero arguments, but got %d",
-                          lua_gettop(L));
-    }
-
-    r = ngx_http_lua_get_req(L);
-
-    if (r != r->main) {
-        return luaL_error(L, "attempt to read the request body in a "
-                          "subrequest");
-    }
-
-#if (NGX_HTTP_SPDY)
-    if (r->spdy_stream) {
-        return luaL_error(L, "spdy not supported yet");
-    }
-#endif
-
-#if (NGX_HTTP_V2)
-    if (r->stream) {
-        return luaL_error(L, "http v2 not supported yet");
-    }
-#endif
-
-#if nginx_version >= 1003009
-    if (!raw && r->headers_in.chunked) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "chunked request bodies not supported yet");
-        return 2;
-    }
-#endif
-
-    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);
-
-    c = r->connection;
-
-    if (raw) {
-#if !defined(nginx_version) || nginx_version < 1003013
-        lua_pushnil(L);
-        lua_pushliteral(L, "nginx version too old");
-        return 2;
-#else
-        if (r->request_body) {
-            if (r->request_body->rest > 0) {
-                lua_pushnil(L);
-                lua_pushliteral(L, "pending request body reading in some "
-                                "other thread");
-                return 2;
-            }
-
-        } else {
-            rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
-            if (rb == NULL) {
-                return luaL_error(L, "no memory");
-            }
-            r->request_body = rb;
-        }
-
-        if (c->buffered & NGX_HTTP_LOWLEVEL_BUFFERED) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "pending data to write");
-            return 2;
-        }
-
-        if (ctx->buffering) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "http 1.0 buffering");
-            return 2;
-        }
-
-        if (!r->header_sent) {
-            /* prevent other parts of nginx from sending out
-             * the response header */
-            r->header_sent = 1;
-        }
-
-        ctx->header_sent = 1;
-
-        dd("ctx acquired raw req socket: %d", ctx->acquired_raw_req_socket);
-
-        if (ctx->acquired_raw_req_socket) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "duplicate call");
-            return 2;
-        }
-
-        ctx->acquired_raw_req_socket = 1;
-        r->keepalive = 0;
-        r->lingering_close = 1;
-#endif
-
-    } else {
-        /* request body reader */
-
-        if (r->request_body) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "request body already exists");
-            return 2;
-        }
-
-        if (r->discard_body) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "request body discarded");
-            return 2;
-        }
-
-        dd("req content length: %d", (int) r->headers_in.content_length_n);
-
-        if (r->headers_in.content_length_n <= 0) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "no body");
-            return 2;
-        }
-
-        if (ngx_http_lua_test_expect(r) != NGX_OK) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "test expect failed");
-            return 2;
-        }
-
-        /* prevent other request body reader from running */
-
-        rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
-        if (rb == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        rb->rest = r->headers_in.content_length_n;
-
-        r->request_body = rb;
-    }
-
-    lua_createtable(L, 2 /* narr */, 3 /* nrec */); /* the object */
-
-    if (raw) {
-        lua_pushlightuserdata(L, &ngx_http_lua_raw_req_socket_metatable_key);
-
-    } else {
-        lua_pushlightuserdata(L, &ngx_http_lua_req_socket_metatable_key);
-    }
-
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    lua_setmetatable(L, -2);
-
-    u = lua_newuserdata(L, sizeof(ngx_http_lua_socket_tcp_upstream_t));
-    if (u == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-#if 1
-    lua_pushlightuserdata(L, &ngx_http_lua_downstream_udata_metatable_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    lua_setmetatable(L, -2);
-#endif
-
-    lua_rawseti(L, 1, SOCKET_CTX_INDEX);
-
-    ngx_memzero(u, sizeof(ngx_http_lua_socket_tcp_upstream_t));
-
-    if (raw) {
-        u->raw_downstream = 1;
-
-    } else {
-        u->body_downstream = 1;
-    }
-
-    coctx = ctx->cur_co_ctx;
-
-    u->request = r;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    u->conf = llcf;
-
-    u->read_timeout = u->conf->read_timeout;
-    u->connect_timeout = u->conf->connect_timeout;
-    u->send_timeout = u->conf->send_timeout;
-
-    cln = ngx_http_lua_cleanup_add(r, 0);
-    if (cln == NULL) {
-        u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-        lua_pushnil(L);
-        lua_pushliteral(L, "no memory");
-        return 2;
-    }
-
-    cln->handler = ngx_http_lua_socket_tcp_cleanup;
-    cln->data = u;
-    u->cleanup = &cln->handler;
-
-    pc = &u->peer;
-
-    pc->log = c->log;
-    pc->log_error = NGX_ERROR_ERR;
-
-    pc->connection = c;
-
-    dd("setting data to %p", u);
-
-    coctx->data = u;
-    ctx->downstream = u;
-
-    if (c->read->timer_set) {
-        ngx_del_timer(c->read);
-    }
-
-    if (raw) {
-        if (c->write->timer_set) {
-            ngx_del_timer(c->write);
-        }
-    }
-
-    lua_settop(L, 1);
-    return 1;
-}
-
-
-static void
-ngx_http_lua_req_socket_rev_handler(ngx_http_request_t *r)
-{
-    ngx_http_lua_ctx_t                  *ctx;
-    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");
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        r->read_event_handler = ngx_http_block_reading;
-        return;
-    }
-
-    u = ctx->downstream;
-    if (u == NULL || u->peer.connection == NULL) {
-        r->read_event_handler = ngx_http_block_reading;
-        return;
-    }
-
-    u->read_event_handler(r, u);
-}
-
-static int
-ngx_http_lua_socket_tcp_getreusedtimes(lua_State *L)
-{
-    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);
-
-    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
-    u = lua_touserdata(L, -1);
-
-    if (u == NULL
-        || u->peer.connection == NULL
-        || (u->read_closed && u->write_closed))
-    {
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    lua_pushinteger(L, u->reused);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
-{
-    ngx_http_lua_loc_conf_t             *llcf;
-    ngx_http_lua_socket_tcp_upstream_t  *u;
-    ngx_connection_t                    *c;
-    ngx_http_lua_socket_pool_t          *spool;
-    size_t                               size, key_len;
-    ngx_str_t                            key;
-    ngx_uint_t                           i;
-    ngx_queue_t                         *q;
-    ngx_peer_connection_t               *pc;
-    u_char                              *p;
-    ngx_http_request_t                  *r;
-    ngx_msec_t                           timeout;
-    ngx_uint_t                           pool_size;
-    int                                  n;
-    ngx_int_t                            rc;
-    ngx_buf_t                           *b;
-
-    ngx_http_lua_socket_pool_item_t     *items, *item;
-
-    n = lua_gettop(L);
-
-    if (n < 1 || n > 3) {
-        return luaL_error(L, "expecting 1 to 3 arguments "
-                          "(including the object), but got %d", n);
-    }
-
-    luaL_checktype(L, 1, LUA_TTABLE);
-
-    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);
-    if (key.data == NULL) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "key not found");
-        return 2;
-    }
-
-    lua_rawgeti(L, 1, SOCKET_CTX_INDEX);
-    u = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    if (u == NULL) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    /* stack: obj cache key */
-
-    pc = &u->peer;
-    c = pc->connection;
-
-    if (c == NULL || u->read_closed || u->write_closed) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    if (u->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    ngx_http_lua_socket_check_busy_connecting(r, u, L);
-    ngx_http_lua_socket_check_busy_reading(r, u, L);
-    ngx_http_lua_socket_check_busy_writing(r, u, L);
-
-    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;
-    }
-
-    if (c->read->eof
-        || c->read->error
-        || c->read->timedout
-        || c->write->error
-        || c->write->timedout)
-    {
-        lua_pushnil(L);
-        lua_pushliteral(L, "invalid connection");
-        return 2;
-    }
-
-    if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "failed to handle read event");
-        return 2;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "lua tcp socket set keepalive: saving connection %p", c);
-
-    dd("saving connection to key %s", lua_tostring(L, -1));
-
-    lua_pushvalue(L, -1);
-    lua_rawget(L, -3);
-    spool = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    /* stack: obj timeout? size? cache key */
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    if (spool == NULL) {
-        /* create a new socket pool for the current peer key */
-
-        if (n >= 3 && !lua_isnil(L, 3)) {
-            pool_size = luaL_checkinteger(L, 3);
-
-        } else {
-            pool_size = llcf->pool_size;
-        }
-
-        if (pool_size == 0) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "zero pool size");
-            return 2;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket connection pool size: %ui", pool_size);
-
-        key_len = ngx_align(key.len + 1, sizeof(void *));
-
-        size = sizeof(ngx_http_lua_socket_pool_t) + key_len - 1
-               + sizeof(ngx_http_lua_socket_pool_item_t)
-               * pool_size;
-
-        spool = lua_newuserdata(L, size);
-        if (spool == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        lua_pushlightuserdata(L, &ngx_http_lua_pool_udata_metatable_key);
-        lua_rawget(L, LUA_REGISTRYINDEX);
-        lua_setmetatable(L, -2);
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "lua tcp socket keepalive create connection pool for key"
-                       " \"%s\"", lua_tostring(L, -2));
-
-        lua_rawset(L, -3);
-
-        spool->active_connections = 0;
-        spool->lua_vm = ngx_http_lua_get_lua_vm(r, NULL);
-
-        ngx_queue_init(&spool->cache);
-        ngx_queue_init(&spool->free);
-
-        p = ngx_copy(spool->key, key.data, key.len);
-        *p++ = '\0';
-
-        items = (ngx_http_lua_socket_pool_item_t *) (spool->key + key_len);
-
-        dd("items: %p", items);
-
-        ngx_http_lua_assert((void *) items == ngx_align_ptr(items,
-                                                            sizeof(void *)));
-
-        for (i = 0; i < pool_size; i++) {
-            ngx_queue_insert_head(&spool->free, &items[i].queue);
-            items[i].socket_pool = spool;
-        }
-    }
-
-    if (ngx_queue_empty(&spool->free)) {
-
-        q = ngx_queue_last(&spool->cache);
-        ngx_queue_remove(q);
-        spool->active_connections--;
-
-        item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
-
-        ngx_http_lua_socket_tcp_close_connection(item->connection);
-
-    } else {
-        q = ngx_queue_head(&spool->free);
-        ngx_queue_remove(q);
-
-        item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
-    }
-
-    item->connection = c;
-    ngx_queue_insert_head(&spool->cache, q);
-
-    if (!u->reused) {
-        spool->active_connections++;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "lua tcp socket clear current socket connection");
-
-    pc->connection = NULL;
-
-#if 0
-    if (u->cleanup) {
-        *u->cleanup = NULL;
-        u->cleanup = NULL;
-    }
-#endif
-
-    if (c->read->timer_set) {
-        ngx_del_timer(c->read);
-    }
-
-    if (c->write->timer_set) {
-        ngx_del_timer(c->write);
-    }
-
-    if (n >= 2 && !lua_isnil(L, 2)) {
-        timeout = (ngx_msec_t) luaL_checkinteger(L, 2);
-
-    } else {
-        timeout = llcf->keepalive_timeout;
-    }
-
-#if (NGX_DEBUG)
-    if (timeout == 0) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket keepalive timeout: unlimited");
-    }
-#endif
-
-    if (timeout) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua tcp socket keepalive timeout: %M ms", timeout);
-
-        ngx_add_timer(c->read, timeout);
-    }
-
-    c->write->handler = ngx_http_lua_socket_keepalive_dummy_handler;
-    c->read->handler = ngx_http_lua_socket_keepalive_rev_handler;
-
-    c->data = item;
-    c->idle = 1;
-    c->log = ngx_cycle->log;
-    c->pool->log = ngx_cycle->log;
-    c->read->log = ngx_cycle->log;
-    c->write->log = ngx_cycle->log;
-
-    item->socklen = pc->socklen;
-    ngx_memcpy(&item->sockaddr, pc->sockaddr, pc->socklen);
-    item->reused = u->reused;
-
-    if (c->read->ready) {
-        rc = ngx_http_lua_socket_keepalive_close_handler(c->read);
-        if (rc != NGX_OK) {
-            lua_pushnil(L);
-            lua_pushliteral(L, "connection in dubious state");
-            return 2;
-        }
-    }
-
-#if 1
-    ngx_http_lua_socket_tcp_finalize(r, u);
-#endif
-
-    lua_pushinteger(L, 1);
-    return 1;
-}
-
-
-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_tcp_upstream_t *u)
-{
-    ngx_http_lua_socket_pool_item_t     *item;
-    ngx_http_lua_socket_pool_t          *spool;
-    ngx_http_cleanup_t                  *cln;
-    ngx_queue_t                         *q;
-    int                                  top;
-    ngx_peer_connection_t               *pc;
-    ngx_connection_t                    *c;
-
-    top = lua_gettop(L);
-
-    if (key_index < 0) {
-        key_index = top + key_index + 1;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket pool get keepalive peer");
-
-    pc = &u->peer;
-
-    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 tcp socket keepalive connection pool not found");
-        lua_settop(L, top);
-        return NGX_DECLINED;
-    }
-
-    u->socket_pool = spool;
-
-    if (!ngx_queue_empty(&spool->cache)) {
-        q = ngx_queue_head(&spool->cache);
-
-        item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
-        c = item->connection;
-
-        ngx_queue_remove(q);
-        ngx_queue_insert_head(&spool->free, q);
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "lua tcp socket get keepalive peer: using connection %p,"
-                       " fd:%d", c, c->fd);
-
-        c->idle = 0;
-        c->log = pc->log;
-        c->pool->log = pc->log;
-        c->read->log = pc->log;
-        c->write->log = pc->log;
-        c->data = u;
-
-#if 1
-        c->write->handler = ngx_http_lua_socket_tcp_handler;
-        c->read->handler = ngx_http_lua_socket_tcp_handler;
-#endif
-
-        if (c->read->timer_set) {
-            ngx_del_timer(c->read);
-        }
-
-        pc->connection = c;
-        pc->cached = 1;
-
-        u->reused = item->reused + 1;
-
-#if 1
-        u->write_event_handler = ngx_http_lua_socket_dummy_handler;
-        u->read_event_handler = ngx_http_lua_socket_dummy_handler;
-#endif
-
-        if (u->cleanup == NULL) {
-            cln = ngx_http_lua_cleanup_add(r, 0);
-            if (cln == NULL) {
-                u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_ERROR;
-                lua_settop(L, top);
-                return NGX_ERROR;
-            }
-
-            cln->handler = ngx_http_lua_socket_tcp_cleanup;
-            cln->data = u;
-            u->cleanup = &cln->handler;
-        }
-
-        lua_settop(L, top);
-
-        return NGX_OK;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "lua tcp socket keepalive: connection pool empty");
-
-    lua_settop(L, top);
-
-    return NGX_DECLINED;
-}
-
-
-static void
-ngx_http_lua_socket_keepalive_dummy_handler(ngx_event_t *ev)
-{
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                   "keepalive dummy handler");
-}
-
-
-static void
-ngx_http_lua_socket_keepalive_rev_handler(ngx_event_t *ev)
-{
-    (void) ngx_http_lua_socket_keepalive_close_handler(ev);
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_keepalive_close_handler(ngx_event_t *ev)
-{
-    ngx_http_lua_socket_pool_item_t     *item;
-    ngx_http_lua_socket_pool_t          *spool;
-
-    int                n;
-    char               buf[1];
-    ngx_connection_t  *c;
-
-    c = ev->data;
-
-    if (c->close) {
-        goto close;
-    }
-
-    if (c->read->timedout) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                       "lua tcp socket keepalive max idle timeout");
-
-        goto close;
-    }
-
-    dd("read event ready: %d", (int) c->read->ready);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                   "lua tcp socket keepalive close handler check stale events");
-
-    n = recv(c->fd, buf, 1, MSG_PEEK);
-
-    if (n == -1 && ngx_socket_errno == NGX_EAGAIN) {
-        /* stale event */
-
-        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-            goto close;
-        }
-
-        return NGX_OK;
-    }
-
-close:
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
-                   "lua tcp socket keepalive close handler: fd:%d", c->fd);
-
-    item = c->data;
-    spool = item->socket_pool;
-
-    ngx_http_lua_socket_tcp_close_connection(c);
-
-    ngx_queue_remove(&item->queue);
-    ngx_queue_insert_head(&spool->free, &item->queue);
-    spool->active_connections--;
-
-    dd("keepalive: active connections: %u",
-       (unsigned) spool->active_connections);
-
-    if (spool->active_connections == 0) {
-        ngx_http_lua_socket_free_pool(ev->log, spool);
-    }
-
-    return NGX_DECLINED;
-}
-
-
-static void
-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 tcp socket keepalive: free connection pool for \"%s\"",
-                   spool->key);
-
-    L = spool->lua_vm;
-
-    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);
-    lua_pop(L, 1);
-}
-
-
-static void
-ngx_http_lua_socket_shutdown_pool_helper(ngx_http_lua_socket_pool_t *spool)
-{
-    ngx_queue_t                         *q;
-    ngx_connection_t                    *c;
-    ngx_http_lua_socket_pool_item_t     *item;
-
-    while (!ngx_queue_empty(&spool->cache)) {
-        q = ngx_queue_head(&spool->cache);
-
-        item = ngx_queue_data(q, ngx_http_lua_socket_pool_item_t, queue);
-        c = item->connection;
-
-        ngx_http_lua_socket_tcp_close_connection(c);
-
-        ngx_queue_remove(q);
-        ngx_queue_insert_head(&spool->free, q);
-    }
-
-    spool->active_connections = 0;
-}
-
-
-static int
-ngx_http_lua_socket_shutdown_pool(lua_State *L)
-{
-    ngx_http_lua_socket_pool_t          *spool;
-
-    spool = lua_touserdata(L, 1);
-
-    if (spool != NULL) {
-        ngx_http_lua_socket_shutdown_pool_helper(spool);
-    }
-
-    return 0;
-}
-
-
-static int
-ngx_http_lua_socket_tcp_upstream_destroy(lua_State *L)
-{
-    ngx_http_lua_socket_tcp_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_tcp_cleanup(u); /* it will clear u->cleanup */
-    }
-
-    return 0;
-}
-
-
-static int
-ngx_http_lua_socket_downstream_destroy(lua_State *L)
-{
-    ngx_http_lua_socket_tcp_upstream_t     *u;
-
-    dd("downstream destroy");
-
-    u = lua_touserdata(L, 1);
-    if (u == NULL) {
-        dd("u is NULL");
-        return 0;
-    }
-
-    if (u->cleanup) {
-        ngx_http_lua_socket_tcp_cleanup(u); /* it will clear u->cleanup */
-    }
-
-    return 0;
-}
-
-
-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_tcp_upstream_t *u,
-    lua_State *L)
-{
-    ngx_chain_t             *cl;
-    ngx_chain_t            **ll;
-#if (DDEBUG) || (NGX_DTRACE)
-    size_t                   size = 0;
-#endif
-    size_t                   chunk_size;
-    ngx_buf_t               *b;
-    size_t                   nbufs;
-    luaL_Buffer              luabuf;
-
-    dd("bufs_in: %p, buf_in: %p", u->bufs_in, u->buf_in);
-
-    nbufs = 0;
-    ll = NULL;
-
-    luaL_buffinit(L, &luabuf);
-
-    for (cl = u->bufs_in; cl; cl = cl->next) {
-        b = cl->buf;
-        chunk_size = b->last - b->pos;
-
-        dd("copying input data chunk from %p: \"%.*s\"", cl,
-           (int) chunk_size, b->pos);
-
-        luaL_addlstring(&luabuf, (char *) b->pos, chunk_size);
-
-        if (cl->next) {
-            ll = &cl->next;
-        }
-
-#if (DDEBUG) || (NGX_DTRACE)
-        size += chunk_size;
-#endif
-
-        nbufs++;
-    }
-
-    luaL_pushresult(&luabuf);
-
-#if (DDEBUG)
-    dd("size: %d, nbufs: %d", (int) size, (int) nbufs);
-#endif
-
-#if (NGX_DTRACE)
-    ngx_http_lua_probe_socket_tcp_receive_done(r, u,
-                                               (u_char *) lua_tostring(L, -1),
-                                               size);
-#endif
-
-    if (nbufs > 1 && ll) {
-        dd("recycle buffers: %d", (int) (nbufs - 1));
-
-        *ll = ctx->free_recv_bufs;
-        ctx->free_recv_bufs = u->bufs_in;
-        u->bufs_in = u->buf_in;
-    }
-
-    if (u->buffer.pos == u->buffer.last) {
-        dd("resetting u->buffer pos & last");
-        u->buffer.pos = u->buffer.start;
-        u->buffer.last = u->buffer.start;
-    }
-
-    if (u->bufs_in) {
-        u->buf_in->buf->last = u->buffer.pos;
-        u->buf_in->buf->pos = u->buffer.pos;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_add_input_buffer(ngx_http_request_t *r,
-    ngx_http_lua_socket_tcp_upstream_t *u)
-{
-    ngx_chain_t             *cl;
-    ngx_http_lua_ctx_t      *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    cl = ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                         &ctx->free_recv_bufs,
-                                         u->conf->buffer_size);
-
-    if (cl == NULL) {
-        return NGX_ERROR;
-    }
-
-    u->buf_in->next = cl;
-    u->buf_in = cl;
-    u->buffer = *cl->buf;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_add_pending_data(ngx_http_request_t *r,
-    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;
-
-    if (last - b->last == old_state) {
-        b->last += prefix;
-        return NGX_OK;
-    }
-
-    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;
-    }
-
-    b->pos = last;
-    b->last = last;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t ngx_http_lua_socket_insert_buffer(ngx_http_request_t *r,
-    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;
-    size_t                   size;
-    ngx_buf_t               *b;
-
-    if (prefix <= u->conf->buffer_size) {
-        size = u->conf->buffer_size;
-
-    } else {
-        size = prefix;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    new_cl = ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                             &ctx->free_recv_bufs,
-                                             size);
-
-    if (new_cl == NULL) {
-        return NGX_ERROR;
-    }
-
-    b = new_cl->buf;
-
-    b->last = ngx_copy(b->last, pat, prefix);
-
-    dd("copy resumed data to %p: %d: \"%.*s\"",
-       new_cl, (int) (b->last - b->pos), (int) (b->last - b->pos), b->pos);
-
-    dd("before resuming data: bufs_in %p, buf_in %p, buf_in next %p",
-       u->bufs_in, u->buf_in, u->buf_in->next);
-
-    ll = &u->bufs_in;
-    for (cl = u->bufs_in; cl->next; cl = cl->next) {
-        ll = &cl->next;
-    }
-
-    *ll = new_cl;
-    new_cl->next = u->buf_in;
-
-    dd("after resuming data: bufs_in %p, buf_in %p, buf_in next %p",
-       u->bufs_in, u->buf_in, u->buf_in->next);
-
-#if (DDEBUG)
-    for (cl = u->bufs_in; cl; cl = cl->next) {
-        b = cl->buf;
-
-        dd("result buf after resuming data: %p: %.*s", cl,
-           (int) ngx_buf_size(b), b->pos);
-    }
-#endif
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_tcp_conn_resume(ngx_http_request_t *r)
-{
-    return ngx_http_lua_socket_tcp_resume_helper(r, SOCKET_OP_CONNECT);
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_tcp_read_resume(ngx_http_request_t *r)
-{
-    return ngx_http_lua_socket_tcp_resume_helper(r, SOCKET_OP_READ);
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_tcp_write_resume(ngx_http_request_t *r)
-{
-    return ngx_http_lua_socket_tcp_resume_helper(r, SOCKET_OP_WRITE);
-}
-
-
-static ngx_int_t
-ngx_http_lua_socket_tcp_resume_helper(ngx_http_request_t *r, int socket_op)
-{
-    int                          nret;
-    lua_State                   *vm;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_connection_t            *c;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    ngx_http_lua_socket_tcp_retval_handler  prepare_retvals;
-
-    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;
-    }
-
-    ctx->resume_handler = ngx_http_lua_wev_handler;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp operation done, resuming lua thread");
-
-    coctx = ctx->cur_co_ctx;
-
-    dd("coctx: %p", coctx);
-
-    u = coctx->data;
-
-    switch (socket_op) {
-    case SOCKET_OP_CONNECT:
-    case SOCKET_OP_WRITE:
-        prepare_retvals = u->write_prepare_retvals;
-        break;
-
-    case SOCKET_OP_READ:
-        prepare_retvals = u->read_prepare_retvals;
-        break;
-
-    default:
-        /* impossible to reach here */
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua tcp socket calling prepare retvals handler %p, "
-                   "u:%p", prepare_retvals, u);
-
-    nret = prepare_retvals(r, u, ctx->cur_co_ctx->co);
-    if (nret == NGX_AGAIN) {
-        return NGX_DONE;
-    }
-
-    c = r->connection;
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_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;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua tcp socket abort resolver");
-
-    u = coctx->data;
-    if (u == NULL) {
-        return;
-    }
-
-    rctx = u->resolved->ctx;
-    if (rctx == NULL) {
-        return;
-    }
-
-    /* just to be safer */
-    rctx->handler = ngx_http_lua_socket_empty_resolve_handler;
-
-    ngx_resolve_name_done(rctx);
-}
-
-
-static void
-ngx_http_lua_coctx_cleanup(void *data)
-{
-    ngx_http_lua_socket_tcp_upstream_t      *u;
-    ngx_http_lua_co_ctx_t                   *coctx = data;
-
-    dd("running coctx cleanup");
-
-    u = coctx->data;
-    if (u == NULL) {
-        return;
-    }
-
-    if (u->request == NULL) {
-        return;
-    }
-
-    ngx_http_lua_socket_tcp_finalize(u->request, u);
-}
-
-
-#if (NGX_HTTP_SSL)
-
-static int
-ngx_http_lua_ssl_free_session(lua_State *L)
-{
-    ngx_ssl_session_t      **psession;
-
-    psession = lua_touserdata(L, 1);
-    if (psession && *psession != NULL) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua ssl free session: %p", *psession);
-
-        ngx_ssl_free_session(*psession);
-    }
-
-    return 0;
-}
-
-#endif  /* NGX_HTTP_SSL */
-
-
-void
-ngx_http_lua_cleanup_conn_pools(lua_State *L)
-{
-    ngx_http_lua_socket_pool_t          *spool;
-
-    lua_pushlightuserdata(L, &ngx_http_lua_socket_pool_key);
-    lua_rawget(L, LUA_REGISTRYINDEX); /* table */
-
-    lua_pushnil(L);  /* first key */
-    while (lua_next(L, -2) != 0) {
-        /* tb key val */
-        spool = lua_touserdata(L, -1);
-
-        if (spool != NULL) {
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "lua tcp socket keepalive: free connection pool %p "
-                           "for \"%s\"", spool, spool->key);
-
-            ngx_http_lua_socket_shutdown_pool_helper(spool);
-        }
-
-        lua_pop(L, 1);
-    }
-
-    lua_pop(L, 1);
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h b/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
deleted file mode 100644
index dbdee41..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_tcp.h
+++ /dev/null
@@ -1,156 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SOCKET_TCP_H_INCLUDED_
-#define _NGX_HTTP_LUA_SOCKET_TCP_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.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
-#define NGX_HTTP_LUA_SOCKET_FT_PARTIALWRITE  0x0040
-#define NGX_HTTP_LUA_SOCKET_FT_CLIENTABORT   0x0080
-#define NGX_HTTP_LUA_SOCKET_FT_SSL           0x0100
-
-
-typedef struct ngx_http_lua_socket_tcp_upstream_s
-        ngx_http_lua_socket_tcp_upstream_t;
-
-
-typedef
-    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_tcp_upstream_handler_pt)
-    (ngx_http_request_t *r, ngx_http_lua_socket_tcp_upstream_t *u);
-
-
-typedef struct {
-    lua_State                         *lua_vm;
-
-    /* active connections == out-of-pool reused connections
-     *                       + in-pool connections */
-    ngx_uint_t                         active_connections;
-
-    /* queues of ngx_http_lua_socket_pool_item_t: */
-    ngx_queue_t                        cache;
-    ngx_queue_t                        free;
-
-    u_char                             key[1];
-
-} ngx_http_lua_socket_pool_t;
-
-
-struct ngx_http_lua_socket_tcp_upstream_s {
-    ngx_http_lua_socket_tcp_retval_handler          read_prepare_retvals;
-    ngx_http_lua_socket_tcp_retval_handler          write_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;
-
-    ngx_http_lua_loc_conf_t         *conf;
-    ngx_http_cleanup_pt             *cleanup;
-    ngx_http_request_t              *request;
-    ngx_peer_connection_t            peer;
-
-    ngx_msec_t                       read_timeout;
-    ngx_msec_t                       send_timeout;
-    ngx_msec_t                       connect_timeout;
-
-    ngx_http_upstream_resolved_t    *resolved;
-
-    ngx_chain_t                     *bufs_in; /* input data buffers */
-    ngx_chain_t                     *buf_in; /* last input data buffer */
-    ngx_buf_t                        buffer; /* receive buffer */
-
-    size_t                           length;
-    size_t                           rest;
-
-    ngx_err_t                        socket_errno;
-
-    ngx_int_t                      (*input_filter)(void *data, ssize_t bytes);
-    void                            *input_filter_ctx;
-
-    size_t                           request_len;
-    ngx_chain_t                     *request_bufs;
-
-    ngx_http_lua_co_ctx_t           *read_co_ctx;
-    ngx_http_lua_co_ctx_t           *write_co_ctx;
-
-    ngx_uint_t                       reused;
-
-#if (NGX_HTTP_SSL)
-    ngx_str_t                        ssl_name;
-#endif
-
-    unsigned                         ft_type:16;
-    unsigned                         no_close:1;
-    unsigned                         conn_waiting:1;
-    unsigned                         read_waiting:1;
-    unsigned                         write_waiting:1;
-    unsigned                         eof:1;
-    unsigned                         body_downstream:1;
-    unsigned                         raw_downstream:1;
-    unsigned                         read_closed:1;
-    unsigned                         write_closed:1;
-#if (NGX_HTTP_SSL)
-    unsigned                         ssl_verify:1;
-    unsigned                         ssl_session_reuse:1;
-#endif
-};
-
-
-typedef struct ngx_http_lua_dfa_edge_s  ngx_http_lua_dfa_edge_t;
-
-
-struct ngx_http_lua_dfa_edge_s {
-    u_char                           chr;
-    int                              new_state;
-    ngx_http_lua_dfa_edge_t         *next;
-};
-
-
-typedef struct {
-    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;
-
-
-typedef struct {
-    ngx_http_lua_socket_pool_t      *socket_pool;
-
-    ngx_queue_t                      queue;
-    ngx_connection_t                *connection;
-
-    socklen_t                        socklen;
-    struct sockaddr_storage          sockaddr;
-
-    ngx_uint_t                       reused;
-
-} ngx_http_lua_socket_pool_item_t;
-
-
-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);
-void ngx_http_lua_cleanup_conn_pools(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_SOCKET_TCP_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
deleted file mode 100644
index 8927f41..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.c
+++ /dev/null
@@ -1,1657 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#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_http_lua_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 char ngx_http_lua_udp_udata_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 */, 6 /* 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);
-    /* }}} */
-
-    /* udp socket object metatable */
-    lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
-    lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* metatable */
-    lua_pushcfunction(L, ngx_http_lua_socket_udp_upstream_destroy);
-    lua_setfield(L, -2, "__gc");
-    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));
-    }
-
-    r = ngx_http_lua_get_req(L);
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
-
-    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;
-    int                          timeout;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    ngx_http_lua_udp_connection_t           *uc;
-    ngx_http_lua_socket_udp_upstream_t      *u;
-
-    /*
-     * TODO: we should probably accept an extra argument to setpeername()
-     * to allow the user bind the datagram unix domain socket himself,
-     * which is necessary for systems without autobind support.
-     */
-
-    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);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
-
-    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, "no 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 > 65535) {
-            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->request && u->request != r) {
-            return luaL_error(L, "bad request");
-        }
-
-        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, "no memory");
-        }
-
-#if 1
-        lua_pushlightuserdata(L, &ngx_http_lua_udp_udata_metatable_key);
-        lua_rawget(L, LUA_REGISTRYINDEX);
-        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 = (in_port_t) 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, "no 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;
-#if !defined(nginx_version) || nginx_version < 1005008
-    rctx->type = NGX_RESOLVE_A;
-#endif
-    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;
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    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;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    return lua_yield(L, 0);
-}
-
-
-static void
-ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
-{
-    ngx_http_request_t                  *r;
-    ngx_connection_t                    *c;
-    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;
-#if defined(nginx_version) && nginx_version >= 1005008
-    socklen_t                            socklen;
-    struct sockaddr                     *sockaddr;
-#else
-    struct sockaddr_in                  *sin;
-#endif
-    ngx_uint_t                           i;
-    unsigned                             waiting;
-
-    u = ctx->data;
-    r = u->request;
-    c = r->connection;
-    ur = u->resolved;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->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, c->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);
-
-#if 1
-        ngx_resolve_name_done(ctx);
-        ur->ctx = NULL;
-#endif
-
-        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);
-
-        if (waiting) {
-            ngx_http_run_posted_requests(c);
-        }
-
-        return;
-    }
-
-    ur->naddrs = ctx->naddrs;
-    ur->addrs = ctx->addrs;
-
-#if (NGX_DEBUG)
-    {
-#   if defined(nginx_version) && nginx_version >= 1005008
-    u_char      text[NGX_SOCKADDR_STRLEN];
-    ngx_str_t   addr;
-#   else
-    in_addr_t   addr;
-#   endif
-    ngx_uint_t  i;
-
-#   if defined(nginx_version) && nginx_version >= 1005008
-    addr.data = text;
-
-    for (i = 0; i < ctx->naddrs; i++) {
-        addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen,
-                                 text, NGX_SOCKADDR_STRLEN, 0);
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "name was resolved to %V", &addr);
-    }
-#   else
-    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, c->log, 0,
-                       "name was resolved to %ud.%ud.%ud.%ud",
-                       (addr >> 24) & 0xff, (addr >> 16) & 0xff,
-                       (addr >> 8) & 0xff, addr & 0xff);
-    }
-#   endif
-    }
-#endif
-
-    ngx_http_lua_assert(ur->naddrs > 0);
-
-    if (ur->naddrs == 1) {
-        i = 0;
-
-    } else {
-        i = ngx_random() % ur->naddrs;
-    }
-
-    dd("selected addr index: %d", (int) i);
-
-#if defined(nginx_version) && nginx_version >= 1005008
-    socklen = ur->addrs[i].socklen;
-
-    sockaddr = ngx_palloc(r->pool, socklen);
-    if (sockaddr == NULL) {
-        goto nomem;
-    }
-
-    ngx_memcpy(sockaddr, ur->addrs[i].sockaddr, socklen);
-
-    switch (sockaddr->sa_family) {
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        ((struct sockaddr_in6 *) sockaddr)->sin6_port = htons(ur->port);
-        break;
-#endif
-    default: /* AF_INET */
-        ((struct sockaddr_in *) sockaddr)->sin_port = htons(ur->port);
-    }
-
-    p = ngx_pnalloc(r->pool, NGX_SOCKADDR_STRLEN);
-    if (p == NULL) {
-        goto nomem;
-    }
-
-    len = ngx_sock_ntop(sockaddr, socklen, p, NGX_SOCKADDR_STRLEN, 1);
-    ur->sockaddr = sockaddr;
-    ur->socklen = socklen;
-
-#else
-    /* for nginx older than 1.5.8 */
-
-    len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
-
-    p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
-    if (p == NULL) {
-        goto nomem;
-    }
-
-    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);
-#endif
-
-    ur->host.data = p;
-    ur->host.len = len;
-    ur->naddrs = 1;
-
-    ngx_resolve_name_done(ctx);
-    ur->ctx = NULL;
-
-    u->waiting = 0;
-
-    if (waiting) {
-        lctx->resume_handler = ngx_http_lua_socket_udp_resume;
-        r->write_event_handler(r);
-        ngx_http_run_posted_requests(c);
-
-    } else {
-        (void) ngx_http_lua_socket_resolve_retval_handler(r, u, L);
-    }
-
-    return;
-
-nomem:
-
-    if (ur->ctx) {
-        ngx_resolve_name_done(ctx);
-        ur->ctx = NULL;
-    }
-
-    u->prepare_retvals = ngx_http_lua_socket_error_retval_handler;
-    ngx_http_lua_socket_udp_handle_error(r, u,
-                                         NGX_HTTP_LUA_SOCKET_FT_NOMEM);
-
-    if (waiting) {
-        ngx_http_run_posted_requests(c);
-
-    } else {
-        lua_pushnil(L);
-        lua_pushliteral(L, "no memory");
-    }
-}
-
-
-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_connection_t                *c;
-    ngx_http_cleanup_t              *cln;
-    ngx_http_upstream_resolved_t    *ur;
-    ngx_int_t                        rc;
-    ngx_http_lua_udp_connection_t   *uc;
-
-    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, "no 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, "no memory");
-
-    } else {
-
-        if (u->socket_errno) {
-#if defined(nginx_version) && nginx_version >= 9000
-            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));
-    }
-
-    r = ngx_http_lua_get_req(L);
-    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->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    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;
-
-        case LUA_TNIL:
-            len = sizeof("nil") - 1;
-            break;
-
-        case LUA_TBOOLEAN:
-            if (lua_toboolean(L, 2)) {
-                len = sizeof("true") - 1;
-
-            } else {
-                len = sizeof("false") - 1;
-            }
-
-            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;
-
-        case LUA_TNIL:
-            p = query.data;
-            *p++ = 'n';
-            *p++ = 'i';
-            *p++ = 'l';
-            break;
-
-        case LUA_TBOOLEAN:
-            p = query.data;
-
-            if (lua_toboolean(L, 2)) {
-                *p++ = 't';
-                *p++ = 'r';
-                *p++ = 'u';
-                *p++ = 'e';
-
-            } else {
-                *p++ = 'f';
-                *p++ = 'a';
-                *p++ = 'l';
-                *p++ = 's';
-                *p++ = 'e';
-            }
-
-            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);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    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->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    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");
-    }
-
-    coctx = ctx->cur_co_ctx;
-
-    ngx_http_lua_cleanup_pending_operation(coctx);
-    coctx->cleanup = ngx_http_lua_udp_socket_cleanup;
-    coctx->data = u;
-
-    if (ctx->entered_content_phase) {
-        r->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    u->co_ctx = coctx;
-    u->waiting = 1;
-    u->prepare_retvals = ngx_http_lua_socket_udp_receive_retval_handler;
-
-    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_http_lua_co_ctx_t       *coctx;
-
-    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;
-
-    coctx = u->co_ctx;
-
-    if (coctx) {
-        coctx->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 = coctx;
-
-        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;
-
-    if (c->fd != (ngx_socket_t) -1) {  /* not a fake connection */
-        ctx = c->log->data;
-        ctx->current_request = r;
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->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_http_lua_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 == (ngx_socket_t) -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_HTTP_LUA_HAVE_SO_PASSCRED)
-    if (uc->sockaddr->sa_family == AF_UNIX) {
-        struct sockaddr         addr;
-
-        addr.sa_family = AF_UNIX;
-
-        /* just to make valgrind happy */
-        ngx_memzero(addr.sa_data, sizeof(addr.sa_data));
-
-        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, &uc->log, 0, "datagram unix "
-                       "domain socket autobind");
-
-        if (bind(uc->connection->fd, &addr, sizeof(sa_family_t)) != 0) {
-            ngx_log_error(NGX_LOG_CRIT, &uc->log, ngx_socket_errno,
-                          "bind() failed");
-
-            return NGX_ERROR;
-        }
-    }
-#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));
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request 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) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "closed");
-        return 2;
-    }
-
-    if (u->request != r) {
-        return luaL_error(L, "bad request");
-    }
-
-    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;
-    lua_State                   *vm;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_connection_t            *c;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    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;
-
-    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;
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_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);
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.h b/debian/modules/http-lua/src/ngx_http_lua_socket_udp.h
deleted file mode 100644
index 8333346..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_socket_udp.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SOCKET_UDP_H_INCLUDED_
-#define _NGX_HTTP_LUA_SOCKET_UDP_H_INCLUDED_
-
-
-#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);
-
-
-typedef struct {
-    ngx_connection_t         *connection;
-    struct sockaddr          *sockaddr;
-    socklen_t                 socklen;
-    ngx_str_t                 server;
-    ngx_log_t                 log;
-} ngx_http_lua_udp_connection_t;
-
-
-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_http_lua_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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl.c b/debian/modules/http-lua/src/ngx_http_lua_ssl.c
deleted file mode 100644
index 8ed7b95..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl.c
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#if (NGX_HTTP_SSL)
-
-
-int ngx_http_lua_ssl_ctx_index = -1;
-
-
-ngx_int_t
-ngx_http_lua_ssl_init(ngx_log_t *log)
-{
-    if (ngx_http_lua_ssl_ctx_index == -1) {
-        ngx_http_lua_ssl_ctx_index = SSL_get_ex_new_index(0, NULL, NULL,
-                                                          NULL, NULL);
-
-        if (ngx_http_lua_ssl_ctx_index == -1) {
-            ngx_ssl_error(NGX_LOG_ALERT, log, 0,
-                          "lua: SSL_get_ex_new_index() for ctx failed");
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-#endif /* NGX_HTTP_SSL */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl.h b/debian/modules/http-lua/src/ngx_http_lua_ssl.h
deleted file mode 100644
index acb8c4b..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SSL_H_INCLUDED_
-#define _NGX_HTTP_LUA_SSL_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-#if (NGX_HTTP_SSL)
-
-
-typedef struct {
-    ngx_connection_t        *connection; /* original true connection */
-    ngx_http_request_t      *request;    /* fake request */
-    ngx_pool_cleanup_pt     *cleanup;
-
-    ngx_ssl_session_t       *session;    /* retrurn value for openssl's
-                                          * session_get_cb */
-
-    ngx_str_t                session_id;
-
-    int                      exit_code;  /* exit code for openssl's
-                                            set_cert_cb callback */
-
-    unsigned                 done:1;
-    unsigned                 aborted:1;
-
-    unsigned                 entered_cert_handler:1;
-    unsigned                 entered_sess_fetch_handler:1;
-} ngx_http_lua_ssl_ctx_t;
-
-
-ngx_int_t ngx_http_lua_ssl_init(ngx_log_t *log);
-
-
-extern int ngx_http_lua_ssl_ctx_index;
-
-
-#endif
-
-
-#endif  /* _NGX_HTTP_LUA_SSL_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
deleted file mode 100644
index 453a5c7..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.c
+++ /dev/null
@@ -1,1325 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#if (NGX_HTTP_SSL)
-
-
-#include "ngx_http_lua_cache.h"
-#include "ngx_http_lua_initworkerby.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_ssl_module.h"
-#include "ngx_http_lua_contentby.h"
-#include "ngx_http_lua_ssl_certby.h"
-#include "ngx_http_lua_directive.h"
-#include "ngx_http_lua_ssl.h"
-
-
-enum {
-    NGX_HTTP_LUA_ADDR_TYPE_UNIX  = 0,
-    NGX_HTTP_LUA_ADDR_TYPE_INET  = 1,
-    NGX_HTTP_LUA_ADDR_TYPE_INET6 = 2
-};
-
-
-static void ngx_http_lua_ssl_cert_done(void *data);
-static void ngx_http_lua_ssl_cert_aborted(void *data);
-static u_char *ngx_http_lua_log_ssl_cert_error(ngx_log_t *log, u_char *buf,
-    size_t len);
-static ngx_int_t ngx_http_lua_ssl_cert_by_chunk(lua_State *L,
-    ngx_http_request_t *r);
-
-
-ngx_int_t
-ngx_http_lua_ssl_cert_handler_file(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
-{
-    ngx_int_t           rc;
-
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
-                                     lscf->srv.ssl_cert_src.data,
-                                     lscf->srv.ssl_cert_src_key);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_ssl_cert_by_chunk(L, r);
-}
-
-
-ngx_int_t
-ngx_http_lua_ssl_cert_handler_inline(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
-{
-    ngx_int_t           rc;
-
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       lscf->srv.ssl_cert_src.data,
-                                       lscf->srv.ssl_cert_src.len,
-                                       lscf->srv.ssl_cert_src_key,
-                                       "=ssl_certificate_by_lua");
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_ssl_cert_by_chunk(L, r);
-}
-
-
-char *
-ngx_http_lua_ssl_cert_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_ssl_cert_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-char *
-ngx_http_lua_ssl_cert_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-#if OPENSSL_VERSION_NUMBER < 0x1000205fL
-
-    ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                  "at least OpenSSL 1.0.2e required but found "
-                  OPENSSL_VERSION_TEXT);
-
-    return NGX_CONF_ERROR;
-
-#else
-
-    u_char                      *p;
-    u_char                      *name;
-    ngx_str_t                   *value;
-    ngx_http_lua_srv_conf_t    *lscf = conf;
-
-    /*  must specify a concrete handler */
-    if (cmd->post == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (lscf->srv.ssl_cert_handler) {
-        return "is duplicate";
-    }
-
-    if (ngx_http_lua_ssl_init(cf->log) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    value = cf->args->elts;
-
-    lscf->srv.ssl_cert_handler = (ngx_http_lua_srv_conf_handler_pt) cmd->post;
-
-    if (cmd->post == ngx_http_lua_ssl_cert_handler_file) {
-        /* Lua code in an external file */
-
-        name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
-                                        value[1].len);
-        if (name == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->srv.ssl_cert_src.data = name;
-        lscf->srv.ssl_cert_src.len = ngx_strlen(name);
-
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->srv.ssl_cert_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';
-
-    } else {
-        /* inlined Lua code */
-
-        lscf->srv.ssl_cert_src = value[1];
-
-        p = ngx_palloc(cf->pool,
-                       sizeof("ssl_certificate_by_lua") +
-                       NGX_HTTP_LUA_INLINE_KEY_LEN);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->srv.ssl_cert_src_key = p;
-
-        p = ngx_copy(p, "ssl_certificate_by_lua",
-                     sizeof("ssl_certificate_by_lua") - 1);
-        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';
-    }
-
-    return NGX_CONF_OK;
-
-#endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
-}
-
-
-int
-ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
-{
-    lua_State                       *L;
-    ngx_int_t                        rc;
-    ngx_connection_t                *c, *fc;
-    ngx_http_request_t              *r = NULL;
-    ngx_pool_cleanup_t              *cln;
-    ngx_http_connection_t           *hc;
-    ngx_http_lua_srv_conf_t         *lscf;
-    ngx_http_core_loc_conf_t        *clcf;
-    ngx_http_lua_ssl_ctx_t          *cctx;
-    ngx_http_core_srv_conf_t        *cscf;
-
-    c = ngx_ssl_get_connection(ssl_conn);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "ssl cert: connection reusable: %ud", c->reusable);
-
-    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
-
-    dd("ssl cert handler, cert-ctx=%p", cctx);
-
-    if (cctx && cctx->entered_cert_handler) {
-        /* not the first time */
-
-        if (cctx->done) {
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                           "lua_certificate_by_lua: cert cb exit code: %d",
-                           cctx->exit_code);
-
-            dd("lua ssl cert done, finally");
-            return cctx->exit_code;
-        }
-
-        return -1;
-    }
-
-    dd("first time");
-
-    ngx_reusable_connection(c, 0);
-
-    hc = c->data;
-
-    fc = ngx_http_lua_create_fake_connection(NULL);
-    if (fc == NULL) {
-        goto failed;
-    }
-
-    fc->log->handler = ngx_http_lua_log_ssl_cert_error;
-    fc->log->data = fc;
-
-    fc->addr_text = c->addr_text;
-    fc->listening = c->listening;
-
-    r = ngx_http_lua_create_fake_request(fc);
-    if (r == NULL) {
-        goto failed;
-    }
-
-    r->main_conf = hc->conf_ctx->main_conf;
-    r->srv_conf = hc->conf_ctx->srv_conf;
-    r->loc_conf = hc->conf_ctx->loc_conf;
-
-    fc->log->file = c->log->file;
-    fc->log->log_level = c->log->log_level;
-    fc->ssl = c->ssl;
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-#if defined(nginx_version) && nginx_version >= 1003014
-
-#   if nginx_version >= 1009000
-
-    ngx_set_connection_log(fc, clcf->error_log);
-
-#   else
-
-    ngx_http_set_connection_log(fc, clcf->error_log);
-
-#   endif
-
-#else
-
-    fc->log->file = clcf->error_log->file;
-
-    if (!(fc->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
-        fc->log->log_level = clcf->error_log->log_level;
-    }
-
-#endif
-
-    if (cctx == NULL) {
-        cctx = ngx_pcalloc(c->pool, sizeof(ngx_http_lua_ssl_ctx_t));
-        if (cctx == NULL) {
-            goto failed;  /* error */
-        }
-    }
-
-    cctx->exit_code = 1;  /* successful by default */
-    cctx->connection = c;
-    cctx->request = r;
-    cctx->entered_cert_handler = 1;
-    cctx->done = 0;
-
-    dd("setting cctx");
-
-    if (SSL_set_ex_data(c->ssl->connection, ngx_http_lua_ssl_ctx_index, cctx)
-        == 0)
-    {
-        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "SSL_set_ex_data() failed");
-        goto failed;
-    }
-
-    lscf = ngx_http_get_module_srv_conf(r, ngx_http_lua_module);
-
-    /* TODO honor lua_code_cache off */
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    c->log->action = "loading SSL certificate by lua";
-
-    if (lscf->srv.ssl_cert_handler == NULL) {
-        cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
-
-        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                      "no ssl_certificate_by_lua* defined in "
-                      "server %V", &cscf->server_name);
-
-        goto failed;
-    }
-
-    rc = lscf->srv.ssl_cert_handler(r, lscf, L);
-
-    if (rc >= NGX_OK || rc == NGX_ERROR) {
-        cctx->done = 1;
-
-        if (cctx->cleanup) {
-            *cctx->cleanup = NULL;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "lua_certificate_by_lua: handler return value: %i, "
-                       "cert cb exit code: %d", rc, cctx->exit_code);
-
-        c->log->action = "SSL handshaking";
-        return cctx->exit_code;
-    }
-
-    /* rc == NGX_DONE */
-
-    cln = ngx_pool_cleanup_add(fc->pool, 0);
-    if (cln == NULL) {
-        goto failed;
-    }
-
-    cln->handler = ngx_http_lua_ssl_cert_done;
-    cln->data = cctx;
-
-    if (cctx->cleanup == NULL) {
-        cln = ngx_pool_cleanup_add(c->pool, 0);
-        if (cln == NULL) {
-            goto failed;
-        }
-
-        cln->data = cctx;
-        cctx->cleanup = &cln->handler;
-    }
-
-    *cctx->cleanup = ngx_http_lua_ssl_cert_aborted;
-
-    return -1;
-
-#if 1
-failed:
-
-    if (r && r->pool) {
-        ngx_http_lua_free_fake_request(r);
-    }
-
-    if (fc) {
-        ngx_http_lua_close_fake_connection(fc);
-    }
-
-    return 0;
-#endif
-}
-
-
-static void
-ngx_http_lua_ssl_cert_done(void *data)
-{
-    ngx_connection_t                *c;
-    ngx_http_lua_ssl_ctx_t          *cctx = data;
-
-    dd("lua ssl cert done");
-
-    if (cctx->aborted) {
-        return;
-    }
-
-    ngx_http_lua_assert(cctx->done == 0);
-
-    cctx->done = 1;
-
-    if (cctx->cleanup) {
-        *cctx->cleanup = NULL;
-    }
-
-    c = cctx->connection;
-
-    c->log->action = "SSL handshaking";
-
-    ngx_post_event(c->write, &ngx_posted_events);
-}
-
-
-static void
-ngx_http_lua_ssl_cert_aborted(void *data)
-{
-    ngx_http_lua_ssl_ctx_t      *cctx = data;
-
-    dd("lua ssl cert done");
-
-    if (cctx->done) {
-        /* completed successfully already */
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cctx->connection->log, 0,
-                   "lua_certificate_by_lua: cert cb aborted");
-
-    cctx->aborted = 1;
-    cctx->request->connection->ssl = NULL;
-
-    ngx_http_lua_finalize_fake_request(cctx->request, NGX_ERROR);
-}
-
-
-static u_char *
-ngx_http_lua_log_ssl_cert_error(ngx_log_t *log, u_char *buf, size_t len)
-{
-    u_char              *p;
-    ngx_connection_t    *c;
-
-    if (log->action) {
-        p = ngx_snprintf(buf, len, " while %s", log->action);
-        len -= p - buf;
-        buf = p;
-    }
-
-    p = ngx_snprintf(buf, len, ", context: ssl_certificate_by_lua*");
-    len -= p - buf;
-    buf = p;
-
-    c = log->data;
-
-    if (c->addr_text.len) {
-        p = ngx_snprintf(buf, len, ", client: %V", &c->addr_text);
-        len -= p - buf;
-        buf = p;
-    }
-
-    if (c && c->listening && c->listening->addr_text.len) {
-        p = ngx_snprintf(buf, len, ", server: %V", &c->listening->addr_text);
-        /* len -= p - buf; */
-        buf = p;
-    }
-
-    return buf;
-}
-
-
-static ngx_int_t
-ngx_http_lua_ssl_cert_by_chunk(lua_State *L, ngx_http_request_t *r)
-{
-    int                      co_ref;
-    ngx_int_t                rc;
-    lua_State               *co;
-    ngx_http_lua_ctx_t      *ctx;
-    ngx_http_cleanup_t      *cln;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (ctx == NULL) {
-        ctx = ngx_http_lua_create_ctx(r);
-        if (ctx == NULL) {
-            rc = NGX_ERROR;
-            ngx_http_lua_finalize_request(r, rc);
-            return rc;
-        }
-
-    } else {
-        dd("reset ctx");
-        ngx_http_lua_reset_ctx(r, L, ctx);
-    }
-
-    ctx->entered_content_phase = 1;
-
-    /*  {{{ 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");
-
-        rc = NGX_ERROR;
-        ngx_http_lua_finalize_request(r, rc);
-        return rc;
-    }
-
-    /*  move code closure to new coroutine */
-    lua_xmove(L, co, 1);
-
-    /*  set closure's env table to new coroutine's globals table */
-    ngx_http_lua_get_globals_table(co);
-    lua_setfenv(co, -2);
-
-    /* save nginx request in coroutine globals table */
-    ngx_http_lua_set_req(co, r);
-
-    ctx->cur_co_ctx = &ctx->entry_co_ctx;
-    ctx->cur_co_ctx->co = co;
-    ctx->cur_co_ctx->co_ref = co_ref;
-#ifdef NGX_LUA_USE_ASSERT
-    ctx->cur_co_ctx->co_top = 1;
-#endif
-
-    /* register request cleanup hooks */
-    if (ctx->cleanup == NULL) {
-        cln = ngx_http_cleanup_add(r, 0);
-        if (cln == NULL) {
-            rc = NGX_ERROR;
-            ngx_http_lua_finalize_request(r, rc);
-            return rc;
-        }
-
-        cln->handler = ngx_http_lua_request_cleanup_handler;
-        cln->data = ctx;
-        ctx->cleanup = &cln->handler;
-    }
-
-    ctx->context = NGX_HTTP_LUA_CONTEXT_SSL_CERT;
-
-    rc = ngx_http_lua_run_thread(L, r, ctx, 0);
-
-    if (rc == NGX_ERROR || rc >= NGX_OK) {
-        /* do nothing */
-
-    } else if (rc == NGX_AGAIN) {
-        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 0);
-
-    } else if (rc == NGX_DONE) {
-        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 1);
-
-    } else {
-        rc = NGX_OK;
-    }
-
-    ngx_http_lua_finalize_request(r, rc);
-    return rc;
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-
-int
-ngx_http_lua_ffi_ssl_get_tls1_version(ngx_http_request_t *r, char **err)
-{
-    ngx_ssl_conn_t    *ssl_conn;
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    dd("tls1 ver: %d", SSL_version(ssl_conn));
-
-    return SSL_version(ssl_conn);
-}
-
-
-int
-ngx_http_lua_ffi_ssl_clear_certs(ngx_http_request_t *r, char **err)
-{
-#ifdef LIBRESSL_VERSION_NUMBER
-
-    *err = "LibreSSL not supported";
-    return NGX_ERROR;
-
-#else
-
-#   if OPENSSL_VERSION_NUMBER < 0x1000205fL
-
-    *err = "at least OpenSSL 1.0.2e required but found " OPENSSL_VERSION_TEXT;
-    return NGX_ERROR;
-
-#   else
-
-    ngx_ssl_conn_t    *ssl_conn;
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    SSL_certs_clear(ssl_conn);
-    return NGX_OK;
-
-#   endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
-#endif
-}
-
-
-int
-ngx_http_lua_ffi_ssl_set_der_certificate(ngx_http_request_t *r,
-    const char *data, size_t len, char **err)
-{
-#ifdef LIBRESSL_VERSION_NUMBER
-
-    *err = "LibreSSL not supported";
-    return NGX_ERROR;
-
-#else
-
-#   if OPENSSL_VERSION_NUMBER < 0x1000205fL
-
-    *err = "at least OpenSSL 1.0.2e required but found " OPENSSL_VERSION_TEXT;
-    return NGX_ERROR;
-
-#   else
-
-    BIO               *bio = NULL;
-    X509              *x509 = NULL;
-    ngx_ssl_conn_t    *ssl_conn;
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    bio = BIO_new_mem_buf((char *) data, len);
-    if (bio == NULL) {
-        *err = "BIO_new_mem_buf() failed";
-        goto failed;
-    }
-
-    x509 = d2i_X509_bio(bio, NULL);
-    if (x509 == NULL) {
-        *err = "d2i_X509_bio() failed";
-        goto failed;
-    }
-
-    if (SSL_use_certificate(ssl_conn, x509) == 0) {
-        *err = "SSL_use_certificate() failed";
-        goto failed;
-    }
-
-#if 0
-    if (SSL_set_ex_data(ssl_conn, ngx_ssl_certificate_index, x509) == 0) {
-        *err = "SSL_set_ex_data() failed";
-        goto failed;
-    }
-#endif
-
-    X509_free(x509);
-    x509 = NULL;
-
-    /* read rest of the chain */
-
-    while (!BIO_eof(bio)) {
-
-        x509 = d2i_X509_bio(bio, NULL);
-        if (x509 == NULL) {
-            *err = "d2i_X509_bio() failed";
-            goto failed;
-        }
-
-        if (SSL_add0_chain_cert(ssl_conn, x509) == 0) {
-            *err = "SSL_add0_chain_cert() failed";
-            goto failed;
-        }
-    }
-
-    BIO_free(bio);
-
-    *err = NULL;
-    return NGX_OK;
-
-failed:
-
-    if (bio) {
-        BIO_free(bio);
-    }
-
-    if (x509) {
-        X509_free(x509);
-    }
-
-    ERR_clear_error();
-
-    return NGX_ERROR;
-
-#   endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
-#endif
-}
-
-
-int
-ngx_http_lua_ffi_ssl_set_der_private_key(ngx_http_request_t *r,
-    const char *data, size_t len, char **err)
-{
-    BIO               *bio = NULL;
-    EVP_PKEY          *pkey = NULL;
-    ngx_ssl_conn_t    *ssl_conn;
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    bio = BIO_new_mem_buf((char *) data, len);
-    if (bio == NULL) {
-        *err = "BIO_new_mem_buf() failed";
-        goto failed;
-    }
-
-    pkey = d2i_PrivateKey_bio(bio, NULL);
-    if (pkey == NULL) {
-        *err = "d2i_PrivateKey_bio() failed";
-        goto failed;
-    }
-
-    if (SSL_use_PrivateKey(ssl_conn, pkey) == 0) {
-        *err = "SSL_use_PrivateKey() failed";
-        goto failed;
-    }
-
-    EVP_PKEY_free(pkey);
-    BIO_free(bio);
-
-    return NGX_OK;
-
-failed:
-
-    if (pkey) {
-        EVP_PKEY_free(pkey);
-    }
-
-    if (bio) {
-        BIO_free(bio);
-    }
-
-    ERR_clear_error();
-
-    return NGX_ERROR;
-}
-
-
-int
-ngx_http_lua_ffi_ssl_raw_server_addr(ngx_http_request_t *r, char **addr,
-    size_t *addrlen, int *addrtype, char **err)
-{
-#if (NGX_HAVE_UNIX_DOMAIN)
-    struct sockaddr_un   *saun;
-#endif
-    ngx_ssl_conn_t       *ssl_conn;
-    ngx_connection_t     *c;
-    struct sockaddr_in   *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6  *sin6;
-#endif
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    c = ngx_ssl_get_connection(ssl_conn);
-
-    if (ngx_connection_local_sockaddr(c, NULL, 0) != NGX_OK) {
-        return 0;
-    }
-
-    switch (c->local_sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) c->local_sockaddr;
-        *addrlen = 16;
-        *addr = (char *) &sin6->sin6_addr.s6_addr;
-        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_INET6;
-
-        break;
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        saun = (struct sockaddr_un *) c->local_sockaddr;
-
-        /* on Linux sockaddr might not include sun_path at all */
-        if (c->local_socklen <= (socklen_t)
-            offsetof(struct sockaddr_un, sun_path))
-        {
-            *addr = "";
-            *addrlen = 0;
-
-        } else {
-            *addr = saun->sun_path;
-            *addrlen = ngx_strlen(saun->sun_path);
-        }
-
-        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_UNIX;
-        break;
-#endif
-
-    default: /* AF_INET */
-        sin = (struct sockaddr_in *) c->local_sockaddr;
-        *addr = (char *) &sin->sin_addr.s_addr;
-        *addrlen = 4;
-        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_INET;
-        break;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_ssl_server_name(ngx_http_request_t *r, char **name,
-    size_t *namelen, char **err)
-{
-    ngx_ssl_conn_t          *ssl_conn;
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-
-    *name = (char *) SSL_get_servername(ssl_conn, TLSEXT_NAMETYPE_host_name);
-
-    if (*name) {
-        *namelen = ngx_strlen(*name);
-        return NGX_OK;
-    }
-
-    return NGX_DECLINED;
-
-#else
-
-    *err = "no TLS extension support";
-    return NGX_ERROR;
-
-#endif
-}
-
-
-int
-ngx_http_lua_ffi_ssl_raw_client_addr(ngx_http_request_t *r, char **addr,
-    size_t *addrlen, int *addrtype, char **err)
-{
-#if (NGX_HAVE_UNIX_DOMAIN)
-    struct sockaddr_un  *saun;
-#endif
-    ngx_ssl_conn_t      *ssl_conn;
-    ngx_connection_t    *c;
-    struct sockaddr_in  *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6 *sin6;
-#endif
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    c = ngx_ssl_get_connection(ssl_conn);
-
-    switch (c->sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) c->sockaddr;
-        *addrlen = 16;
-        *addr = (char *) &sin6->sin6_addr.s6_addr;
-        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_INET6;
-
-        break;
-#endif
-
-# if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        saun = (struct sockaddr_un *)c->sockaddr;
-        /* on Linux sockaddr might not include sun_path at all */
-        if (c->socklen <= (socklen_t) offsetof(struct sockaddr_un, sun_path)) {
-            *addr = "";
-            *addrlen = 0;
-
-        } else {
-            *addr = saun->sun_path;
-            *addrlen = ngx_strlen(saun->sun_path);
-        }
-
-        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_UNIX;
-        break;
-#endif
-
-    default: /* AF_INET */
-        sin = (struct sockaddr_in *) c->sockaddr;
-        *addr = (char *) &sin->sin_addr.s_addr;
-        *addrlen = 4;
-        *addrtype = NGX_HTTP_LUA_ADDR_TYPE_INET;
-        break;
-    }
-
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_cert_pem_to_der(const u_char *pem, size_t pem_len, u_char *der,
-    char **err)
-{
-    int       total, len;
-    BIO      *bio;
-    X509     *x509;
-    u_long    n;
-
-    bio = BIO_new_mem_buf((char *) pem, (int) pem_len);
-    if (bio == NULL) {
-        *err = "BIO_new_mem_buf() failed";
-        ERR_clear_error();
-        return NGX_ERROR;
-    }
-
-    x509 = PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL);
-    if (x509 == NULL) {
-        *err = "PEM_read_bio_X509_AUX() failed";
-        BIO_free(bio);
-        ERR_clear_error();
-        return NGX_ERROR;
-    }
-
-    total = i2d_X509(x509, &der);
-    if (total < 0) {
-        *err = "i2d_X509() failed";
-        X509_free(x509);
-        BIO_free(bio);
-        ERR_clear_error();
-        return NGX_ERROR;
-    }
-
-    X509_free(x509);
-
-    /* read rest of the chain */
-
-    for ( ;; ) {
-
-        x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
-        if (x509 == NULL) {
-            n = ERR_peek_last_error();
-
-            if (ERR_GET_LIB(n) == ERR_LIB_PEM
-                && ERR_GET_REASON(n) == PEM_R_NO_START_LINE)
-            {
-                /* end of file */
-                ERR_clear_error();
-                break;
-            }
-
-            /* some real error */
-
-            *err = "PEM_read_bio_X509() failed";
-            BIO_free(bio);
-            ERR_clear_error();
-            return NGX_ERROR;
-        }
-
-        len = i2d_X509(x509, &der);
-        if (len < 0) {
-            *err = "i2d_X509() failed";
-            X509_free(x509);
-            BIO_free(bio);
-            ERR_clear_error();
-            return NGX_ERROR;
-        }
-
-        total += len;
-
-        X509_free(x509);
-    }
-
-    BIO_free(bio);
-
-    return total;
-}
-
-
-int
-ngx_http_lua_ffi_priv_key_pem_to_der(const u_char *pem, size_t pem_len,
-    u_char *der, char **err)
-{
-    int          len;
-    BIO         *in;
-    EVP_PKEY    *pkey;
-
-    in = BIO_new_mem_buf((char *) pem, (int) pem_len);
-    if (in == NULL) {
-        *err = "BIO_new_mem_buf() failed";
-        ERR_clear_error();
-        return NGX_ERROR;
-    }
-
-    pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, NULL);
-    if (pkey == NULL) {
-        BIO_free(in);
-        *err = "PEM_read_bio_PrivateKey() failed";
-        ERR_clear_error();
-        return NGX_ERROR;
-    }
-
-    BIO_free(in);
-
-    len = i2d_PrivateKey(pkey, &der);
-    if (len < 0) {
-        EVP_PKEY_free(pkey);
-        *err = "i2d_PrivateKey() failed";
-        ERR_clear_error();
-        return NGX_ERROR;
-    }
-
-    EVP_PKEY_free(pkey);
-
-    return len;
-}
-
-
-void *
-ngx_http_lua_ffi_parse_pem_cert(const u_char *pem, size_t pem_len,
-    char **err)
-{
-    BIO             *bio;
-    X509            *x509;
-    u_long           n;
-    STACK_OF(X509)  *chain;
-
-    bio = BIO_new_mem_buf((char *) pem, (int) pem_len);
-    if (bio == NULL) {
-        *err = "BIO_new_mem_buf() failed";
-        ERR_clear_error();
-        return NULL;
-    }
-
-    x509 = PEM_read_bio_X509_AUX(bio, NULL, NULL, NULL);
-    if (x509 == NULL) {
-        *err = "PEM_read_bio_X509_AUX() failed";
-        BIO_free(bio);
-        ERR_clear_error();
-        return NULL;
-    }
-
-    chain = sk_X509_new_null();
-    if (chain == NULL) {
-        *err = "sk_X509_new_null() failed";
-        X509_free(x509);
-        BIO_free(bio);
-        ERR_clear_error();
-        return NULL;
-    }
-
-    if (sk_X509_push(chain, x509) == 0) {
-        *err = "sk_X509_push() failed";
-        sk_X509_free(chain);
-        X509_free(x509);
-        BIO_free(bio);
-        ERR_clear_error();
-        return NULL;
-    }
-
-    /* read rest of the chain */
-
-    for ( ;; ) {
-
-        x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
-        if (x509 == NULL) {
-            n = ERR_peek_last_error();
-
-            if (ERR_GET_LIB(n) == ERR_LIB_PEM
-                && ERR_GET_REASON(n) == PEM_R_NO_START_LINE)
-            {
-                /* end of file */
-                ERR_clear_error();
-                break;
-            }
-
-            /* some real error */
-
-            *err = "PEM_read_bio_X509() failed";
-            sk_X509_pop_free(chain, X509_free);
-            BIO_free(bio);
-            ERR_clear_error();
-            return NULL;
-        }
-
-        if (sk_X509_push(chain, x509) == 0) {
-            *err = "sk_X509_push() failed";
-            sk_X509_pop_free(chain, X509_free);
-            X509_free(x509);
-            BIO_free(bio);
-            ERR_clear_error();
-            return NULL;
-        }
-    }
-
-    BIO_free(bio);
-
-    return chain;
-}
-
-
-void
-ngx_http_lua_ffi_free_cert(void *cdata)
-{
-    STACK_OF(X509)  *chain = cdata;
-
-    sk_X509_pop_free(chain, X509_free);
-}
-
-
-void *
-ngx_http_lua_ffi_parse_pem_priv_key(const u_char *pem, size_t pem_len,
-    char **err)
-{
-    BIO         *in;
-    EVP_PKEY    *pkey;
-
-    in = BIO_new_mem_buf((char *) pem, (int) pem_len);
-    if (in == NULL) {
-        *err = "BIO_new_mem_buf() failed";
-        ERR_clear_error();
-        return NULL;
-    }
-
-    pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, NULL);
-    if (pkey == NULL) {
-        *err = "PEM_read_bio_PrivateKey() failed";
-        BIO_free(in);
-        ERR_clear_error();
-        return NULL;
-    }
-
-    BIO_free(in);
-
-    return pkey;
-}
-
-
-void
-ngx_http_lua_ffi_free_priv_key(void *cdata)
-{
-    EVP_PKEY *pkey = cdata;
-
-    EVP_PKEY_free(pkey);
-}
-
-
-int
-ngx_http_lua_ffi_set_cert(ngx_http_request_t *r,
-    void *cdata, char **err)
-{
-#ifdef LIBRESSL_VERSION_NUMBER
-
-    *err = "LibreSSL not supported";
-    return NGX_ERROR;
-
-#else
-
-#   if OPENSSL_VERSION_NUMBER < 0x1000205fL
-
-    *err = "at least OpenSSL 1.0.2e required but found " OPENSSL_VERSION_TEXT;
-    return NGX_ERROR;
-
-#   else
-
-#ifdef OPENSSL_IS_BORINGSSL
-    size_t             i;
-#else
-    int                i;
-#endif
-    X509              *x509 = NULL;
-    ngx_ssl_conn_t    *ssl_conn;
-    STACK_OF(X509)    *chain = cdata;
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    if (sk_X509_num(chain) < 1) {
-        *err = "invalid certificate chain";
-        goto failed;
-    }
-
-    x509 = sk_X509_value(chain, 0);
-    if (x509 == NULL) {
-        *err = "sk_X509_value() failed";
-        goto failed;
-    }
-
-    if (SSL_use_certificate(ssl_conn, x509) == 0) {
-        *err = "SSL_use_certificate() failed";
-        goto failed;
-    }
-
-    x509 = NULL;
-
-    /* read rest of the chain */
-
-    for (i = 1; i < sk_X509_num(chain); i++) {
-
-        x509 = sk_X509_value(chain, i);
-        if (x509 == NULL) {
-            *err = "sk_X509_value() failed";
-            goto failed;
-        }
-
-        if (SSL_add1_chain_cert(ssl_conn, x509) == 0) {
-            *err = "SSL_add1_chain_cert() failed";
-            goto failed;
-        }
-    }
-
-    *err = NULL;
-    return NGX_OK;
-
-failed:
-
-    ERR_clear_error();
-
-    return NGX_ERROR;
-
-#   endif  /* OPENSSL_VERSION_NUMBER < 0x1000205fL */
-#endif
-}
-
-
-int
-ngx_http_lua_ffi_set_priv_key(ngx_http_request_t *r,
-    void *cdata, char **err)
-{
-    EVP_PKEY          *pkey = NULL;
-    ngx_ssl_conn_t    *ssl_conn;
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    pkey = cdata;
-    if (pkey == NULL) {
-        *err = "invalid private key failed";
-        goto failed;
-    }
-
-    if (SSL_use_PrivateKey(ssl_conn, pkey) == 0) {
-        *err = "SSL_use_PrivateKey() failed";
-        goto failed;
-    }
-
-    return NGX_OK;
-
-failed:
-
-    ERR_clear_error();
-
-    return NGX_ERROR;
-}
-
-
-#endif  /* NGX_LUA_NO_FFI_API */
-
-
-#endif /* NGX_HTTP_SSL */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.h b/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.h
deleted file mode 100644
index fb07e01..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_certby.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SSL_CERTBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_SSL_CERTBY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-#if (NGX_HTTP_SSL)
-
-
-ngx_int_t ngx_http_lua_ssl_cert_handler_inline(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
-
-ngx_int_t ngx_http_lua_ssl_cert_handler_file(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
-
-char *ngx_http_lua_ssl_cert_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-
-char *ngx_http_lua_ssl_cert_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-
-int ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data);
-
-
-#endif  /* NGX_HTTP_SSL */
-
-
-#endif /* _NGX_HTTP_LUA_SSL_CERTBY_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c
deleted file mode 100644
index 9ec8b50..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_ocsp.c
+++ /dev/null
@@ -1,506 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#if (NGX_HTTP_SSL)
-
-
-#include "ngx_http_lua_common.h"
-
-
-#ifndef NGX_LUA_NO_FFI_API
-
-#ifdef NGX_HTTP_LUA_USE_OCSP
-static int ngx_http_lua_ssl_empty_status_callback(ngx_ssl_conn_t *ssl_conn,
-    void *data);
-#endif
-
-
-int
-ngx_http_lua_ffi_ssl_get_ocsp_responder_from_der_chain(
-    const char *chain_data, size_t chain_len, unsigned char *out,
-    size_t *out_size, char **err)
-{
-#ifndef NGX_HTTP_LUA_USE_OCSP
-
-    *err = "no OCSP support";
-    return NGX_ERROR;
-
-#else
-
-    int                        rc = NGX_OK;
-    BIO                       *bio = NULL;
-    char                      *s;
-    X509                      *cert = NULL, *issuer = NULL;
-    size_t                     len;
-    STACK_OF(OPENSSL_STRING)  *aia = NULL;
-
-    /* certificate */
-
-    bio = BIO_new_mem_buf((char *) chain_data, chain_len);
-    if (bio == NULL) {
-        *err = "BIO_new_mem_buf() failed";
-        rc = NGX_ERROR;
-        goto done;
-    }
-
-    cert = d2i_X509_bio(bio, NULL);
-    if (cert == NULL) {
-        *err = "d2i_X509_bio() failed";
-        rc = NGX_ERROR;
-        goto done;
-    }
-
-    /* responder */
-
-    aia = X509_get1_ocsp(cert);
-    if (aia == NULL) {
-        rc = NGX_DECLINED;
-        goto done;
-    }
-
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-    s = sk_OPENSSL_STRING_value(aia, 0);
-#else
-    s = sk_value(aia, 0);
-#endif
-    if (s == NULL) {
-        rc = NGX_DECLINED;
-        goto done;
-    }
-
-    len = ngx_strlen(s);
-    if (len > *out_size) {
-        len = *out_size;
-        rc = NGX_BUSY;
-
-    } else {
-        rc = NGX_OK;
-        *out_size = len;
-    }
-
-    ngx_memcpy(out, s, len);
-
-    X509_email_free(aia);
-    aia = NULL;
-
-    /* issuer */
-
-    if (BIO_eof(bio)) {
-        *err = "no issuer certificate in chain";
-        rc = NGX_ERROR;
-        goto done;
-    }
-
-    issuer = d2i_X509_bio(bio, NULL);
-    if (issuer == NULL) {
-        *err = "d2i_X509_bio() failed";
-        rc = NGX_ERROR;
-        goto done;
-    }
-
-    if (X509_check_issued(issuer, cert) != X509_V_OK) {
-        *err = "issuer certificate not next to leaf";
-        rc = NGX_ERROR;
-        goto done;
-    }
-
-    X509_free(issuer);
-    X509_free(cert);
-    BIO_free(bio);
-
-    return rc;
-
-done:
-
-    if (aia) {
-        X509_email_free(aia);
-    }
-
-    if (issuer) {
-        X509_free(issuer);
-    }
-
-    if (cert) {
-        X509_free(cert);
-    }
-
-    if (bio) {
-        BIO_free(bio);
-    }
-
-    if (rc == NGX_ERROR) {
-        ERR_clear_error();
-    }
-
-    return rc;
-
-#endif  /* NGX_HTTP_LUA_USE_OCSP */
-}
-
-
-int
-ngx_http_lua_ffi_ssl_create_ocsp_request(const char *chain_data,
-    size_t chain_len, unsigned char *out, size_t *out_size, char **err)
-{
-#ifndef NGX_HTTP_LUA_USE_OCSP
-
-    *err = "no OCSP support";
-    return NGX_ERROR;
-
-#else
-
-    int                        rc = NGX_ERROR;
-    BIO                       *bio = NULL;
-    X509                      *cert = NULL, *issuer = NULL;
-    size_t                     len;
-    OCSP_CERTID               *id;
-    OCSP_REQUEST              *ocsp = NULL;
-
-    /* certificate */
-
-    bio = BIO_new_mem_buf((char *) chain_data, chain_len);
-    if (bio == NULL) {
-        *err = "BIO_new_mem_buf() failed";
-        goto failed;
-    }
-
-    cert = d2i_X509_bio(bio, NULL);
-    if (cert == NULL) {
-        *err = "d2i_X509_bio() failed";
-        goto failed;
-    }
-
-    if (BIO_eof(bio)) {
-        *err = "no issuer certificate in chain";
-        goto failed;
-    }
-
-    issuer = d2i_X509_bio(bio, NULL);
-    if (issuer == NULL) {
-        *err = "d2i_X509_bio() failed";
-        goto failed;
-    }
-
-    ocsp = OCSP_REQUEST_new();
-    if (ocsp == NULL) {
-        *err = "OCSP_REQUEST_new() failed";
-        goto failed;
-    }
-
-    id = OCSP_cert_to_id(NULL, cert, issuer);
-    if (id == NULL) {
-        *err = "OCSP_cert_to_id() failed";
-        goto failed;
-    }
-
-    if (OCSP_request_add0_id(ocsp, id) == NULL) {
-        *err = "OCSP_request_add0_id() failed";
-        goto failed;
-    }
-
-    len = i2d_OCSP_REQUEST(ocsp, NULL);
-    if (len <= 0) {
-        *err = "i2d_OCSP_REQUEST() failed";
-        goto failed;
-    }
-
-    if (len > *out_size) {
-        *err = "output buffer too small";
-        *out_size = len;
-        rc = NGX_BUSY;
-        goto failed;
-    }
-
-    len = i2d_OCSP_REQUEST(ocsp, &out);
-    if (len <=  0) {
-        *err = "i2d_OCSP_REQUEST() failed";
-        goto failed;
-    }
-
-    *out_size = len;
-
-    OCSP_REQUEST_free(ocsp);
-    X509_free(issuer);
-    X509_free(cert);
-    BIO_free(bio);
-
-    return NGX_OK;
-
-failed:
-
-    if (ocsp) {
-        OCSP_REQUEST_free(ocsp);
-    }
-
-    if (issuer) {
-        X509_free(issuer);
-    }
-
-    if (cert) {
-        X509_free(cert);
-    }
-
-    if (bio) {
-        BIO_free(bio);
-    }
-
-    ERR_clear_error();
-
-    return rc;
-
-#endif  /* NGX_HTTP_LUA_USE_OCSP */
-}
-
-
-int
-ngx_http_lua_ffi_ssl_validate_ocsp_response(const u_char *resp,
-    size_t resp_len, const char *chain_data, size_t chain_len,
-    u_char *errbuf, size_t *errbuf_size)
-{
-#ifndef NGX_HTTP_LUA_USE_OCSP
-
-    *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                "no OCSP support") - errbuf;
-    return NGX_ERROR;
-
-#else
-
-    int                    n;
-    BIO                   *bio = NULL;
-    X509                  *cert = NULL, *issuer = NULL;
-    OCSP_CERTID           *id = NULL;
-    OCSP_RESPONSE         *ocsp = NULL;
-    OCSP_BASICRESP        *basic = NULL;
-    STACK_OF(X509)        *chain = NULL;
-    ASN1_GENERALIZEDTIME  *thisupdate, *nextupdate;
-
-    ocsp = d2i_OCSP_RESPONSE(NULL, &resp, resp_len);
-    if (ocsp == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "d2i_OCSP_RESPONSE() failed") - errbuf;
-        goto error;
-    }
-
-    n = OCSP_response_status(ocsp);
-
-    if (n != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "OCSP response not successful (%d: %s)",
-                                    n, OCSP_response_status_str(n)) - errbuf;
-        goto error;
-    }
-
-    basic = OCSP_response_get1_basic(ocsp);
-    if (basic == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "OCSP_response_get1_basic() failed")
-                       - errbuf;
-        goto error;
-    }
-
-    /* get issuer certificate from chain */
-
-    bio = BIO_new_mem_buf((char *) chain_data, chain_len);
-    if (bio == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "BIO_new_mem_buf() failed")
-                       - errbuf;
-        goto error;
-    }
-
-    cert = d2i_X509_bio(bio, NULL);
-    if (cert == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "d2i_X509_bio() failed")
-                       - errbuf;
-        goto error;
-    }
-
-    if (BIO_eof(bio)) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "no issuer certificate in chain")
-                       - errbuf;
-        goto error;
-    }
-
-    issuer = d2i_X509_bio(bio, NULL);
-    if (issuer == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "d2i_X509_bio() failed") - errbuf;
-        goto error;
-    }
-
-    chain = sk_X509_new_null();
-    if (chain == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "sk_X509_new_null() failed") - errbuf;
-        goto error;
-    }
-
-    (void) sk_X509_push(chain, issuer);
-
-    if (OCSP_basic_verify(basic, chain, NULL, OCSP_NOVERIFY) != 1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "OCSP_basic_verify() failed") - errbuf;
-        goto error;
-    }
-
-    id = OCSP_cert_to_id(NULL, cert, issuer);
-    if (id == NULL) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "OCSP_cert_to_id() failed") - errbuf;
-        goto error;
-    }
-
-    if (OCSP_resp_find_status(basic, id, &n, NULL, NULL,
-                              &thisupdate, &nextupdate)
-        != 1)
-    {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "certificate status not found in the "
-                                    "OCSP response") - errbuf;
-        goto error;
-    }
-
-    if (n != V_OCSP_CERTSTATUS_GOOD) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "certificate status \"%s\" in the OCSP "
-                                    "response", OCSP_cert_status_str(n))
-                       - errbuf;
-        goto error;
-    }
-
-    if (OCSP_check_validity(thisupdate, nextupdate, 300, -1) != 1) {
-        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
-                                    "OCSP_check_validity() failed") - errbuf;
-        goto error;
-    }
-
-    sk_X509_free(chain);
-    X509_free(cert);
-    X509_free(issuer);
-    BIO_free(bio);
-    OCSP_CERTID_free(id);
-    OCSP_BASICRESP_free(basic);
-    OCSP_RESPONSE_free(ocsp);
-
-    return NGX_OK;
-
-error:
-
-    if (chain) {
-        sk_X509_free(chain);
-    }
-
-    if (id) {
-        OCSP_CERTID_free(id);
-    }
-
-    if (basic) {
-        OCSP_BASICRESP_free(basic);
-    }
-
-    if (ocsp) {
-        OCSP_RESPONSE_free(ocsp);
-    }
-
-    if (cert) {
-        X509_free(cert);
-    }
-
-    if (issuer) {
-        X509_free(issuer);
-    }
-
-    if (bio) {
-        BIO_free(bio);
-    }
-
-    ERR_clear_error();
-
-    return NGX_ERROR;
-
-#endif  /* NGX_HTTP_LUA_USE_OCSP */
-}
-
-
-#ifdef NGX_HTTP_LUA_USE_OCSP
-static int
-ngx_http_lua_ssl_empty_status_callback(ngx_ssl_conn_t *ssl_conn, void *data)
-{
-    return SSL_TLSEXT_ERR_OK;
-}
-#endif
-
-
-int
-ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
-    const u_char *resp, size_t resp_len, char **err)
-{
-#ifndef NGX_HTTP_LUA_USE_OCSP
-
-    *err = "no OCSP support";
-    return NGX_ERROR;
-
-#else
-
-    u_char                  *p;
-    SSL_CTX                 *ctx;
-    ngx_ssl_conn_t          *ssl_conn;
-
-    if (r->connection == NULL || r->connection->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = r->connection->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-#ifdef SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE
-    if (SSL_get_tlsext_status_type(ssl_conn) == -1) {
-#else
-    if (ssl_conn->tlsext_status_type == -1) {
-#endif
-        dd("no ocsp status req from client");
-        return NGX_DECLINED;
-    }
-
-    /* we have to register an empty status callback here otherwise
-     * OpenSSL won't send the response staple. */
-
-    ctx = SSL_get_SSL_CTX(ssl_conn);
-    SSL_CTX_set_tlsext_status_cb(ctx,
-                                 ngx_http_lua_ssl_empty_status_callback);
-
-    p = OPENSSL_malloc(resp_len);
-    if (p == NULL) {
-        *err = "OPENSSL_malloc() failed";
-        return NGX_ERROR;
-    }
-
-    ngx_memcpy(p, resp, resp_len);
-
-    dd("set ocsp resp: resp_len=%d", (int) resp_len);
-    (void) SSL_set_tlsext_status_ocsp_resp(ssl_conn, p, resp_len);
-
-    return NGX_OK;
-
-#endif  /* NGX_HTTP_LUA_USE_OCSP */
-}
-
-#endif  /* NGX_LUA_NO_FFI_API */
-
-
-#endif  /* NGX_HTTP_SSL */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
deleted file mode 100644
index 0b88a87..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.c
+++ /dev/null
@@ -1,614 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#if (NGX_HTTP_SSL)
-
-
-#include "ngx_http_lua_cache.h"
-#include "ngx_http_lua_initworkerby.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_ssl_module.h"
-#include "ngx_http_lua_contentby.h"
-#include "ngx_http_lua_ssl_session_fetchby.h"
-#include "ngx_http_lua_ssl.h"
-#include "ngx_http_lua_directive.h"
-
-
-/* Lua SSL cached session loading routines */
-static void ngx_http_lua_ssl_sess_fetch_done(void *data);
-static void ngx_http_lua_ssl_sess_fetch_aborted(void *data);
-static u_char *ngx_http_lua_log_ssl_sess_fetch_error(ngx_log_t *log,
-    u_char *buf, size_t len);
-static ngx_int_t ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L,
-    ngx_http_request_t *r);
-
-
-/* load Lua code from a file for fetching cached SSL session */
-ngx_int_t
-ngx_http_lua_ssl_sess_fetch_handler_file(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
-{
-    ngx_int_t           rc;
-
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
-                                     lscf->srv.ssl_sess_fetch_src.data,
-                                     lscf->srv.ssl_sess_fetch_src_key);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_ssl_sess_fetch_by_chunk(L, r);
-}
-
-
-/* load lua code from an inline snippet for fetching cached SSL session */
-ngx_int_t
-ngx_http_lua_ssl_sess_fetch_handler_inline(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
-{
-    ngx_int_t           rc;
-
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       lscf->srv.ssl_sess_fetch_src.data,
-                                       lscf->srv.ssl_sess_fetch_src.len,
-                                       lscf->srv.ssl_sess_fetch_src_key,
-                                       "=ssl_session_fetch_by_lua_block");
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_ssl_sess_fetch_by_chunk(L, r);
-}
-
-
-char *
-ngx_http_lua_ssl_sess_fetch_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_ssl_sess_fetch_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-/* conf parser for directive ssl_session_fetch_by_lua */
-char *
-ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    u_char                      *p;
-    u_char                      *name;
-    ngx_str_t                   *value;
-    ngx_http_lua_srv_conf_t     *lscf = conf;
-
-    dd("enter");
-
-    /*  must specify a content handler */
-    if (cmd->post == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (lscf->srv.ssl_sess_fetch_handler) {
-        return "is duplicate";
-    }
-
-    if (ngx_http_lua_ssl_init(cf->log) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    value = cf->args->elts;
-
-    lscf->srv.ssl_sess_fetch_handler =
-        (ngx_http_lua_srv_conf_handler_pt) cmd->post;
-
-    if (cmd->post == ngx_http_lua_ssl_sess_fetch_handler_file) {
-        /* Lua code in an external file */
-
-        name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
-                                        value[1].len);
-        if (name == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->srv.ssl_sess_fetch_src.data = name;
-        lscf->srv.ssl_sess_fetch_src.len = ngx_strlen(name);
-
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->srv.ssl_sess_fetch_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';
-
-    } else {
-        /* inlined Lua code */
-
-        lscf->srv.ssl_sess_fetch_src = value[1];
-
-        p = ngx_palloc(cf->pool,
-                       sizeof("ssl_session_fetch_by_lua") +
-                       NGX_HTTP_LUA_INLINE_KEY_LEN);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->srv.ssl_sess_fetch_src_key = p;
-
-        p = ngx_copy(p, "ssl_session_fetch_by_lua",
-                     sizeof("ssl_session_fetch_by_lua") - 1);
-        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';
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-/* cached session fetching callback to be set with SSL_CTX_sess_set_get_cb */
-ngx_ssl_session_t *
-ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn,
-#if OPENSSL_VERSION_NUMBER >= 0x10100003L
-    const
-#endif
-    u_char *id, int len, int *copy)
-{
-    lua_State                       *L;
-    ngx_int_t                        rc;
-    ngx_connection_t                *c, *fc = NULL;
-    ngx_http_request_t              *r = NULL;
-    ngx_pool_cleanup_t              *cln;
-    ngx_http_connection_t           *hc;
-    ngx_http_lua_ssl_ctx_t          *cctx;
-    ngx_http_lua_srv_conf_t         *lscf;
-    ngx_http_core_loc_conf_t        *clcf;
-
-    /* set copy to 0 as we expect OpenSSL to handle
-     * the memory of returned session */
-
-    *copy = 0;
-
-    c = ngx_ssl_get_connection(ssl_conn);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "ssl session fetch: connection reusable: %ud", c->reusable);
-
-    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
-
-    dd("ssl sess_fetch handler, sess_fetch-ctx=%p", cctx);
-
-    if (cctx && cctx->entered_sess_fetch_handler) {
-        /* not the first time */
-
-        dd("here: %d", (int) cctx->entered_sess_fetch_handler);
-
-        if (cctx->done) {
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                           "ssl_session_fetch_by_lua*: "
-                           "sess get cb exit code: %d",
-                           cctx->exit_code);
-
-            dd("lua ssl sess_fetch done, finally");
-            return cctx->session;
-        }
-
-#ifdef SSL_ERROR_PENDING_SESSION
-        return SSL_magic_pending_session_ptr();
-#else
-        ngx_log_error(NGX_LOG_CRIT, c->log, 0,
-                      "lua: cannot yield in sess get cb: "
-                      "missing async sess get cb support in OpenSSL");
-        return NULL;
-#endif
-    }
-
-    dd("first time");
-
-    ngx_reusable_connection(c, 0);
-
-    hc = c->data;
-
-    fc = ngx_http_lua_create_fake_connection(NULL);
-    if (fc == NULL) {
-        goto failed;
-    }
-
-    fc->log->handler = ngx_http_lua_log_ssl_sess_fetch_error;
-    fc->log->data = fc;
-
-    fc->addr_text = c->addr_text;
-    fc->listening = c->listening;
-
-    r = ngx_http_lua_create_fake_request(fc);
-    if (r == NULL) {
-        goto failed;
-    }
-
-    r->main_conf = hc->conf_ctx->main_conf;
-    r->srv_conf = hc->conf_ctx->srv_conf;
-    r->loc_conf = hc->conf_ctx->loc_conf;
-
-    fc->log->file = c->log->file;
-    fc->log->log_level = c->log->log_level;
-    fc->ssl = c->ssl;
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-#if defined(nginx_version) && nginx_version >= 1003014
-
-#   if nginx_version >= 1009000
-
-    ngx_set_connection_log(fc, clcf->error_log);
-
-#   else
-
-    ngx_http_set_connection_log(fc, clcf->error_log);
-
-#   endif
-
-#else
-
-    fc->log->file = clcf->error_log->file;
-
-    if (!(fc->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
-        fc->log->log_level = clcf->error_log->log_level;
-    }
-
-#endif
-
-    if (cctx == NULL) {
-        cctx = ngx_pcalloc(c->pool, sizeof(ngx_http_lua_ssl_ctx_t));
-        if (cctx == NULL) {
-            goto failed;  /* error */
-        }
-    }
-
-    cctx->exit_code = 1;  /* successful by default */
-    cctx->connection = c;
-    cctx->request = r;
-    cctx->session_id.data = (u_char *) id;
-    cctx->session_id.len = len;
-    cctx->entered_sess_fetch_handler = 1;
-    cctx->done = 0;
-
-    dd("setting cctx = %p", cctx);
-
-    if (SSL_set_ex_data(c->ssl->connection, ngx_http_lua_ssl_ctx_index, cctx)
-        == 0)
-    {
-        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "SSL_set_ex_data() failed");
-        goto failed;
-    }
-
-    lscf = ngx_http_get_module_srv_conf(r, ngx_http_lua_module);
-
-    /* TODO honor lua_code_cache off */
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    c->log->action = "fetching SSL session by lua";
-
-    rc = lscf->srv.ssl_sess_fetch_handler(r, lscf, L);
-
-    if (rc >= NGX_OK || rc == NGX_ERROR) {
-        cctx->done = 1;
-
-        if (cctx->cleanup) {
-            *cctx->cleanup = NULL;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "ssl_session_fetch_by_lua*: handler return value: %i, "
-                       "sess get cb exit code: %d", rc, cctx->exit_code);
-
-        c->log->action = "SSL handshaking";
-        return cctx->session;
-    }
-
-    /* rc == NGX_DONE */
-
-    cln = ngx_pool_cleanup_add(fc->pool, 0);
-    if (cln == NULL) {
-        goto failed;
-    }
-
-    cln->handler = ngx_http_lua_ssl_sess_fetch_done;
-    cln->data = cctx;
-
-    if (cctx->cleanup == NULL)  {
-        /* we only want exactly one cleanup handler to be registered with the
-         * connection to clean up cctx when connection is aborted */
-        cln = ngx_pool_cleanup_add(c->pool, 0);
-        if (cln == NULL) {
-            goto failed;
-        }
-
-        cln->data = cctx;
-        cctx->cleanup = &cln->handler;
-    }
-
-    *cctx->cleanup = ngx_http_lua_ssl_sess_fetch_aborted;
-
-#ifdef SSL_ERROR_PENDING_SESSION
-    return SSL_magic_pending_session_ptr();
-#else
-    ngx_log_error(NGX_LOG_CRIT, c->log, 0,
-                  "lua: cannot yield in sess get cb: "
-                  "missing async sess get cb support in OpenSSL");
-
-    /* fall through to the "failed" label below */
-#endif
-
-failed:
-
-    if (r && r->pool) {
-        ngx_http_lua_free_fake_request(r);
-    }
-
-    if (fc) {
-        ngx_http_lua_close_fake_connection(fc);
-    }
-
-    return NULL;
-}
-
-
-static void
-ngx_http_lua_ssl_sess_fetch_done(void *data)
-{
-    ngx_connection_t                *c;
-    ngx_http_lua_ssl_ctx_t          *cctx = data;
-
-    dd("lua ssl sess_fetch done");
-
-    if (cctx->aborted) {
-        return;
-    }
-
-    ngx_http_lua_assert(cctx->done == 0);
-
-    cctx->done = 1;
-
-    if (cctx->cleanup) {
-        *cctx->cleanup = NULL;
-    }
-
-    c = cctx->connection;
-
-    c->log->action = "SSL handshaking";
-
-    ngx_post_event(c->write, &ngx_posted_events);
-}
-
-
-static void
-ngx_http_lua_ssl_sess_fetch_aborted(void *data)
-{
-    ngx_http_lua_ssl_ctx_t          *cctx = data;
-
-    dd("lua ssl sess_fetch done");
-
-    if (cctx->done) {
-        /* completed successfully already */
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cctx->connection->log, 0,
-                   "ssl_session_fetch_by_lua*: sess_fetch cb aborted");
-
-    cctx->aborted = 1;
-    cctx->request->connection->ssl = NULL;
-
-    ngx_http_lua_finalize_fake_request(cctx->request, NGX_ERROR);
-}
-
-
-static u_char *
-ngx_http_lua_log_ssl_sess_fetch_error(ngx_log_t *log, u_char *buf, size_t len)
-{
-    u_char              *p;
-    ngx_connection_t    *c;
-
-    if (log->action) {
-        p = ngx_snprintf(buf, len, " while %s", log->action);
-        len -= p - buf;
-        buf = p;
-    }
-
-    p = ngx_snprintf(buf, len, ", context: ssl_session_fetch_by_lua*");
-    len -= p - buf;
-    buf = p;
-
-    c = log->data;
-
-    if (c->addr_text.len) {
-        p = ngx_snprintf(buf, len, ", client: %V", &c->addr_text);
-        len -= p - buf;
-        buf = p;
-    }
-
-    if (c && c->listening && c->listening->addr_text.len) {
-        p = ngx_snprintf(buf, len, ", server: %V", &c->listening->addr_text);
-        buf = p;
-    }
-
-    return buf;
-}
-
-
-/* initialize lua coroutine for fetching cached session */
-static ngx_int_t
-ngx_http_lua_ssl_sess_fetch_by_chunk(lua_State *L, ngx_http_request_t *r)
-{
-    int                      co_ref;
-    ngx_int_t                rc;
-    lua_State               *co;
-    ngx_http_lua_ctx_t      *ctx;
-    ngx_http_cleanup_t      *cln;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (ctx == NULL) {
-        ctx = ngx_http_lua_create_ctx(r);
-        if (ctx == NULL) {
-            rc = NGX_ERROR;
-            ngx_http_lua_finalize_request(r, rc);
-            return rc;
-        }
-
-    } else {
-        dd("reset ctx");
-        ngx_http_lua_reset_ctx(r, L, ctx);
-    }
-
-    ctx->entered_content_phase = 1;
-
-    /*  {{{ 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");
-
-        rc = NGX_ERROR;
-        ngx_http_lua_finalize_request(r, rc);
-        return rc;
-    }
-
-    /*  move code closure to new coroutine */
-    lua_xmove(L, co, 1);
-
-    /*  set closure's env table to new coroutine's globals table */
-    ngx_http_lua_get_globals_table(co);
-    lua_setfenv(co, -2);
-
-    /* save nginx request in coroutine globals table */
-    ngx_http_lua_set_req(co, r);
-
-    ctx->cur_co_ctx = &ctx->entry_co_ctx;
-    ctx->cur_co_ctx->co = co;
-    ctx->cur_co_ctx->co_ref = co_ref;
-#ifdef NGX_LUA_USE_ASSERT
-    ctx->cur_co_ctx->co_top = 1;
-#endif
-
-    /* register request cleanup hooks */
-    if (ctx->cleanup == NULL) {
-        cln = ngx_http_cleanup_add(r, 0);
-        if (cln == NULL) {
-            rc = NGX_ERROR;
-            ngx_http_lua_finalize_request(r, rc);
-            return rc;
-        }
-
-        cln->handler = ngx_http_lua_request_cleanup_handler;
-        cln->data = ctx;
-        ctx->cleanup = &cln->handler;
-    }
-
-    ctx->context = NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH;
-
-    rc = ngx_http_lua_run_thread(L, r, ctx, 0);
-
-    if (rc == NGX_ERROR || rc >= NGX_OK) {
-        /* do nothing */
-
-    } else if (rc == NGX_AGAIN) {
-        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 0);
-
-    } else if (rc == NGX_DONE) {
-        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 1);
-
-    } else {
-        rc = NGX_OK;
-    }
-
-    ngx_http_lua_finalize_request(r, rc);
-    return rc;
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-
-/* de-serialized a SSL session and set it back to the request at lua context */
-int
-ngx_http_lua_ffi_ssl_set_serialized_session(ngx_http_request_t *r,
-    const unsigned char *data, int len, char **err)
-{
-    u_char                          *p;
-    u_char                           buf[NGX_SSL_MAX_SESSION_SIZE];
-    ngx_ssl_conn_t                  *ssl_conn;
-    ngx_connection_t                *c;
-    ngx_ssl_session_t               *session = NULL;
-    ngx_ssl_session_t               *old_session;
-    ngx_http_lua_ssl_ctx_t          *cctx;
-
-    c = r->connection;
-
-    if (c == NULL || c->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = c->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    ngx_memcpy(buf, data, len);
-    p = buf;
-    session = d2i_SSL_SESSION(NULL, (const unsigned char **)&p,  len);
-    if (session == NULL) {
-        ERR_clear_error();
-        *err = "failed to de-serialize session";
-        return NGX_ERROR;
-    }
-
-    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
-    if (cctx == NULL) {
-        *err = "bad lua context";
-        return NGX_ERROR;
-    }
-
-    old_session = cctx->session;
-    cctx->session = session;
-
-    if (old_session != NULL) {
-        ngx_ssl_free_session(old_session);
-    }
-
-    return NGX_OK;
-}
-
-#endif  /* NGX_LUA_NO_FFI_API */
-
-
-#endif /* NGX_HTTP_SSL */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h
deleted file mode 100644
index 50c6616..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_fetchby.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SSL_SESSION_FETCHBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_SSL_SESSION_FETCHBY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-#if (NGX_HTTP_SSL)
-ngx_int_t ngx_http_lua_ssl_sess_fetch_handler_inline(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
-
-ngx_int_t ngx_http_lua_ssl_sess_fetch_handler_file(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
-
-char *ngx_http_lua_ssl_sess_fetch_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-
-char *ngx_http_lua_ssl_sess_fetch_by_lua_block(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-
-ngx_ssl_session_t *ngx_http_lua_ssl_sess_fetch_handler(
-    ngx_ssl_conn_t *ssl_conn,
-#if OPENSSL_VERSION_NUMBER >= 0x10100003L
-    const
-#endif
-    u_char *id, int len, int *copy);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_SSL_SESSION_FETCHBY_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
deleted file mode 100644
index 7609c39..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.c
+++ /dev/null
@@ -1,618 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#if (NGX_HTTP_SSL)
-
-
-#include "ngx_http_lua_cache.h"
-#include "ngx_http_lua_initworkerby.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_ssl_module.h"
-#include "ngx_http_lua_contentby.h"
-#include "ngx_http_lua_ssl_session_storeby.h"
-#include "ngx_http_lua_ssl.h"
-#include "ngx_http_lua_directive.h"
-
-
-/* Lua SSL new session store routines */
-static u_char *ngx_http_lua_log_ssl_sess_store_error(ngx_log_t *log,
-    u_char *buf, size_t len);
-static ngx_int_t ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L,
-    ngx_http_request_t *r);
-
-
-/* load Lua code from a file for caching new SSL session. */
-ngx_int_t
-ngx_http_lua_ssl_sess_store_handler_file(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
-{
-    ngx_int_t           rc;
-
-    rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
-                                     lscf->srv.ssl_sess_store_src.data,
-                                     lscf->srv.ssl_sess_store_src_key);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_ssl_sess_store_by_chunk(L, r);
-}
-
-
-/* load lua code from an inline snippet for caching new SSL session */
-ngx_int_t
-ngx_http_lua_ssl_sess_store_handler_inline(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L)
-{
-    ngx_int_t           rc;
-
-    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
-                                       lscf->srv.ssl_sess_store_src.data,
-                                       lscf->srv.ssl_sess_store_src.len,
-                                       lscf->srv.ssl_sess_store_src_key,
-                                       "=ssl_session_store_by_lua_block");
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /*  make sure we have a valid code chunk */
-    ngx_http_lua_assert(lua_isfunction(L, -1));
-
-    return ngx_http_lua_ssl_sess_store_by_chunk(L, r);
-}
-
-
-char *
-ngx_http_lua_ssl_sess_store_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char        *rv;
-    ngx_conf_t   save;
-
-    save = *cf;
-    cf->handler = ngx_http_lua_ssl_sess_store_by_lua;
-    cf->handler_conf = conf;
-
-    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
-
-    *cf = save;
-
-    return rv;
-}
-
-
-/* conf parser for directive ssl_session_store_by_lua */
-char *
-ngx_http_lua_ssl_sess_store_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    u_char                      *p;
-    u_char                      *name;
-    ngx_str_t                   *value;
-    ngx_http_lua_srv_conf_t     *lscf = conf;
-
-    dd("enter");
-
-    /*  must specify a content handler */
-    if (cmd->post == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (lscf->srv.ssl_sess_store_handler) {
-        return "is duplicate";
-    }
-
-    if (ngx_http_lua_ssl_init(cf->log) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    value = cf->args->elts;
-
-    lscf->srv.ssl_sess_store_handler =
-        (ngx_http_lua_srv_conf_handler_pt) cmd->post;
-
-    if (cmd->post == ngx_http_lua_ssl_sess_store_handler_file) {
-        /* Lua code in an external file */
-
-        name = ngx_http_lua_rebase_path(cf->pool, value[1].data,
-                                        value[1].len);
-        if (name == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->srv.ssl_sess_store_src.data = name;
-        lscf->srv.ssl_sess_store_src.len = ngx_strlen(name);
-
-        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->srv.ssl_sess_store_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';
-
-    } else {
-        /* inlined Lua code */
-
-        lscf->srv.ssl_sess_store_src = value[1];
-
-        p = ngx_palloc(cf->pool,
-                       sizeof("ssl_session_store_by_lua") +
-                       NGX_HTTP_LUA_INLINE_KEY_LEN);
-        if (p == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        lscf->srv.ssl_sess_store_src_key = p;
-
-        p = ngx_copy(p, "ssl_session_store_by_lua",
-                     sizeof("ssl_session_store_by_lua") - 1);
-        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';
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-/* callback for new session caching, to be set with SSL_CTX_sess_set_new_cb */
-int
-ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
-    ngx_ssl_session_t *sess)
-{
-    const u_char                    *sess_id;
-    unsigned int                     sess_id_len;
-    lua_State                       *L;
-    ngx_int_t                        rc;
-    ngx_connection_t                *c, *fc = NULL;
-    ngx_http_request_t              *r = NULL;
-    ngx_http_connection_t           *hc;
-    ngx_http_lua_ssl_ctx_t          *cctx;
-    ngx_http_lua_srv_conf_t         *lscf;
-    ngx_http_core_loc_conf_t        *clcf;
-
-    c = ngx_ssl_get_connection(ssl_conn);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "ssl session store: connection reusable: %ud", c->reusable);
-
-    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
-
-    dd("ssl sess_store handler, sess_store-ctx=%p", cctx);
-
-    hc = c->data;
-
-    fc = ngx_http_lua_create_fake_connection(NULL);
-    if (fc == NULL) {
-        goto failed;
-    }
-
-    fc->log->handler = ngx_http_lua_log_ssl_sess_store_error;
-    fc->log->data = fc;
-
-    fc->addr_text = c->addr_text;
-    fc->listening = c->listening;
-
-    r = ngx_http_lua_create_fake_request(fc);
-    if (r == NULL) {
-        goto failed;
-    }
-
-    r->main_conf = hc->conf_ctx->main_conf;
-    r->srv_conf = hc->conf_ctx->srv_conf;
-    r->loc_conf = hc->conf_ctx->loc_conf;
-
-    fc->log->file = c->log->file;
-    fc->log->log_level = c->log->log_level;
-    fc->ssl = c->ssl;
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-#if defined(nginx_version) && nginx_version >= 1003014
-
-#   if nginx_version >= 1009000
-
-    ngx_set_connection_log(fc, clcf->error_log);
-
-#   else
-
-    ngx_http_set_connection_log(fc, clcf->error_log);
-
-#   endif
-
-#else
-
-    fc->log->file = clcf->error_log->file;
-
-    if (!(fc->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
-        fc->log->log_level = clcf->error_log->log_level;
-    }
-
-#endif
-
-    if (cctx == NULL) {
-        cctx = ngx_pcalloc(c->pool, sizeof(ngx_http_lua_ssl_ctx_t));
-        if (cctx == NULL) {
-            goto failed;  /* error */
-        }
-    }
-
-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
-    sess_id = SSL_SESSION_get_id(sess, &sess_id_len);
-#else
-    sess_id = sess->session_id;
-    sess_id_len = sess->session_id_length;
-#endif
-
-    cctx->connection = c;
-    cctx->request = r;
-    cctx->session = sess;
-    cctx->session_id.data = (u_char *) sess_id;
-    cctx->session_id.len = sess_id_len;
-    cctx->done = 0;
-
-    dd("setting cctx");
-
-    if (SSL_set_ex_data(c->ssl->connection, ngx_http_lua_ssl_ctx_index, cctx)
-        == 0)
-    {
-        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "SSL_set_ex_data() failed");
-        goto failed;
-    }
-
-    lscf = ngx_http_get_module_srv_conf(r, ngx_http_lua_module);
-
-    /* TODO honor lua_code_cache off */
-    L = ngx_http_lua_get_lua_vm(r, NULL);
-
-    c->log->action = "storing SSL session by lua";
-
-    rc = lscf->srv.ssl_sess_store_handler(r, lscf, L);
-
-    if (rc >= NGX_OK || rc == NGX_ERROR) {
-        cctx->done = 1;
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "ssl_session_store_by_lua*: handler return value: %i, "
-                       "sess new cb exit code: %d", rc, cctx->exit_code);
-
-        c->log->action = "SSL handshaking";
-
-        /* Return value is a flag indicating whether the passed-in session
-         * has been freed by this callback; always return 0 so OpenSSL will
-         * free the session. Nginx's own session caching logic has the same
-         * practice. */
-        return 0;
-    }
-
-    /* impossible to reach here */
-    ngx_http_lua_assert(0);
-
-failed:
-
-    if (r && r->pool) {
-        ngx_http_lua_free_fake_request(r);
-    }
-
-    if (fc) {
-        ngx_http_lua_close_fake_connection(fc);
-    }
-
-    return 0;
-}
-
-
-static u_char *
-ngx_http_lua_log_ssl_sess_store_error(ngx_log_t *log, u_char *buf, size_t len)
-{
-    u_char              *p;
-    ngx_connection_t    *c;
-
-    if (log->action) {
-        p = ngx_snprintf(buf, len, " while %s", log->action);
-        len -= p - buf;
-        buf = p;
-    }
-
-    p = ngx_snprintf(buf, len, ", context: ssl_session_store_by_lua*");
-    len -= p - buf;
-    buf = p;
-
-    c = log->data;
-
-    if (c->addr_text.len) {
-        p = ngx_snprintf(buf, len, ", client: %V", &c->addr_text);
-        len -= p - buf;
-        buf = p;
-    }
-
-    if (c && c->listening && c->listening->addr_text.len) {
-        p = ngx_snprintf(buf, len, ", server: %V", &c->listening->addr_text);
-        buf = p;
-    }
-
-    return buf;
-}
-
-
-/* initialize lua coroutine for caching new SSL session */
-static ngx_int_t
-ngx_http_lua_ssl_sess_store_by_chunk(lua_State *L, ngx_http_request_t *r)
-{
-    size_t                   len;
-    u_char                  *err_msg;
-    ngx_int_t                rc;
-    ngx_http_lua_ctx_t      *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (ctx == NULL) {
-        ctx = ngx_http_lua_create_ctx(r);
-        if (ctx == NULL) {
-            rc = NGX_ERROR;
-            ngx_http_lua_finalize_request(r, rc);
-            return rc;
-        }
-
-    } else {
-        dd("reset ctx");
-        ngx_http_lua_reset_ctx(r, L, ctx);
-    }
-
-    ctx->entered_content_phase = 1;
-    ctx->context = NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE;
-
-    /* init nginx context in Lua VM */
-    ngx_http_lua_set_req(L, r);
-    ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
-
-    /*  {{{ make new env inheriting main thread's globals table */
-    lua_createtable(L, 0, 1 /* nrec */);   /* the metatable for the new env */
-    ngx_http_lua_get_globals_table(L);
-    lua_setfield(L, -2, "__index");
-    lua_setmetatable(L, -2);    /*  setmetatable({}, {__index = _G}) */
-    /*  }}} */
-
-    lua_setfenv(L, -2);    /*  set new running env for the code closure */
-
-    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 */
-
-    dd("rc == %d", (int) rc);
-
-    if (rc != 0) {
-        /*  error occurred 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 session_store_by_lua*: %*s", len, err_msg);
-
-        lua_settop(L, 0); /*  clear remaining elems on stack */
-        ngx_http_lua_finalize_request(r, rc);
-
-        return NGX_ERROR;
-    }
-
-    lua_settop(L, 0); /*  clear remaining elems on stack */
-    ngx_http_lua_finalize_request(r, rc);
-    return rc;
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-
-/* serialize a session from lua context into buf.
- * the memory allocation of buf should be handled externally. */
-int
-ngx_http_lua_ffi_ssl_get_serialized_session(ngx_http_request_t *r,
-    u_char *buf, char **err)
-{
-    ngx_ssl_conn_t                  *ssl_conn;
-    ngx_connection_t                *c;
-    ngx_ssl_session_t               *session;
-    ngx_http_lua_ssl_ctx_t          *cctx;
-
-    c = r->connection;
-
-    if (c == NULL || c->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = c->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    dd("get cctx session");
-
-    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
-    if (cctx == NULL) {
-        *err = "bad lua context";
-        return NGX_ERROR;
-    }
-
-    session = cctx->session;
-    if (session == NULL) {
-        *err = "bad session in lua context";
-        return NGX_ERROR;
-    }
-
-    if (i2d_SSL_SESSION(session, &buf) == 0) {
-        *err = "i2d_SSL_SESSION() failed";
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-/* return the size of serialized session. */
-int
-ngx_http_lua_ffi_ssl_get_serialized_session_size(ngx_http_request_t *r,
-    char **err)
-{
-    int                              len;
-    ngx_ssl_conn_t                  *ssl_conn;
-    ngx_connection_t                *c;
-    ngx_ssl_session_t               *session;
-    ngx_http_lua_ssl_ctx_t          *cctx;
-
-    c = r->connection;
-
-    if (c == NULL || c->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = c->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    dd("get cctx session size");
-    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
-    if (cctx == NULL) {
-        *err = "bad lua context";
-        return NGX_ERROR;
-    }
-
-    session = cctx->session;
-    if (session == NULL) {
-        *err = "bad session in lua context";
-        return NGX_ERROR;
-    }
-
-    len = i2d_SSL_SESSION(session, NULL);
-    if (len == 0) {
-        *err = "i2d_SSL_SESSION() failed";
-        return NGX_ERROR;
-    }
-
-    return len;
-}
-
-
-/* serialize the session id from lua context into buf.
- * the memory allocation of buf should be handled externally. */
-int
-ngx_http_lua_ffi_ssl_get_session_id(ngx_http_request_t *r,
-    u_char *buf, char **err)
-{
-    int                              id_len;
-    u_char                          *id;
-    ngx_ssl_conn_t                  *ssl_conn;
-    ngx_connection_t                *c;
-    ngx_http_lua_ssl_ctx_t          *cctx;
-
-    c = r->connection;
-
-    if (c == NULL || c->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = c->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    dd("get cctx session");
-    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
-    if (cctx == NULL) {
-        *err = "bad lua context";
-        return NGX_ERROR;
-    }
-
-    id = cctx->session_id.data;
-    if (id == NULL) {
-        *err = "uninitialized session id in lua context";
-        return NGX_ERROR;
-    }
-
-    id_len = cctx->session_id.len;
-    if (id_len == 0) {
-        *err = "uninitialized session id len in lua context";
-        return NGX_ERROR;
-    }
-
-    ngx_hex_dump(buf, id, id_len);
-
-    return NGX_OK;
-}
-
-
-/* return the size of serialized session id. */
-int
-ngx_http_lua_ffi_ssl_get_session_id_size(ngx_http_request_t *r,
-    char **err)
-{
-    ngx_ssl_conn_t                  *ssl_conn;
-    ngx_connection_t                *c;
-    ngx_http_lua_ssl_ctx_t          *cctx;
-
-    c = r->connection;
-
-    if (c == NULL || c->ssl == NULL) {
-        *err = "bad request";
-        return NGX_ERROR;
-    }
-
-    ssl_conn = c->ssl->connection;
-    if (ssl_conn == NULL) {
-        *err = "bad ssl conn";
-        return NGX_ERROR;
-    }
-
-    dd("get cctx session");
-    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
-    if (cctx == NULL) {
-        *err = "bad lua context";
-        return NGX_ERROR;
-    }
-
-    if (cctx->session_id.len == 0) {
-        *err = "uninitialized session id len in lua context";
-        return NGX_ERROR;
-    }
-
-    /* since the session id will be hex dumped to serialize, the serialized
-     * session will be twice the size of the session id: each byte will be a
-     * 2-digit hex value. */
-
-    return 2 * cctx->session_id.len;
-}
-
-#endif  /* NGX_LUA_NO_FFI_API */
-
-
-#endif /* NGX_HTTP_SSL */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.h b/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.h
deleted file mode 100644
index 9bf25ad..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_ssl_session_storeby.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SSL_SESSION_STOREBY_H_INCLUDED_
-#define _NGX_HTTP_LUA_SSL_SESSION_STOREBY_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-#if (NGX_HTTP_SSL)
-ngx_int_t ngx_http_lua_ssl_sess_store_handler_inline(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
-
-ngx_int_t ngx_http_lua_ssl_sess_store_handler_file(ngx_http_request_t *r,
-    ngx_http_lua_srv_conf_t *lscf, lua_State *L);
-
-char *ngx_http_lua_ssl_sess_store_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-
-char *ngx_http_lua_ssl_sess_store_by_lua_block(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-
-int ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
-    ngx_ssl_session_t *sess);
-#endif
-
-
-#endif /* _NGX_HTTP_LUA_SSL_SESSION_STOREBY_H_INCLUDED_  */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_string.c b/debian/modules/http-lua/src/ngx_http_lua_string.c
deleted file mode 100644
index 239b232..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_string.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_string.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_args.h"
-#include "ngx_crc32.h"
-
-#if (NGX_HAVE_SHA1)
-#include "ngx_sha1.h"
-#endif
-
-#include "ngx_md5.h"
-
-#if (NGX_OPENSSL)
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#endif
-
-
-#ifndef SHA_DIGEST_LENGTH
-#define SHA_DIGEST_LENGTH 20
-#endif
-
-
-static uintptr_t ngx_http_lua_ngx_escape_sql_str(u_char *dst, u_char *src,
-        size_t size);
-static int ngx_http_lua_ngx_escape_uri(lua_State *L);
-static int ngx_http_lua_ngx_unescape_uri(lua_State *L);
-static int ngx_http_lua_ngx_quote_sql_str(lua_State *L);
-static int ngx_http_lua_ngx_md5(lua_State *L);
-static int ngx_http_lua_ngx_md5_bin(lua_State *L);
-
-#if (NGX_HAVE_SHA1)
-static int ngx_http_lua_ngx_sha1_bin(lua_State *L);
-#endif
-
-static int ngx_http_lua_ngx_decode_base64(lua_State *L);
-static int ngx_http_lua_ngx_encode_base64(lua_State *L);
-static int ngx_http_lua_ngx_crc32_short(lua_State *L);
-static int ngx_http_lua_ngx_crc32_long(lua_State *L);
-static int ngx_http_lua_ngx_encode_args(lua_State *L);
-static int ngx_http_lua_ngx_decode_args(lua_State *L);
-#if (NGX_OPENSSL)
-static int ngx_http_lua_ngx_hmac_sha1(lua_State *L);
-#endif
-
-
-void
-ngx_http_lua_inject_string_api(lua_State *L)
-{
-    lua_pushcfunction(L, ngx_http_lua_ngx_escape_uri);
-    lua_setfield(L, -2, "escape_uri");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_unescape_uri);
-    lua_setfield(L, -2, "unescape_uri");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_encode_args);
-    lua_setfield(L, -2, "encode_args");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_decode_args);
-    lua_setfield(L, -2, "decode_args");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_quote_sql_str);
-    lua_setfield(L, -2, "quote_sql_str");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_decode_base64);
-    lua_setfield(L, -2, "decode_base64");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_encode_base64);
-    lua_setfield(L, -2, "encode_base64");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_md5_bin);
-    lua_setfield(L, -2, "md5_bin");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_md5);
-    lua_setfield(L, -2, "md5");
-
-#if (NGX_HAVE_SHA1)
-    lua_pushcfunction(L, ngx_http_lua_ngx_sha1_bin);
-    lua_setfield(L, -2, "sha1_bin");
-#endif
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_crc32_short);
-    lua_setfield(L, -2, "crc32_short");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_crc32_long);
-    lua_setfield(L, -2, "crc32_long");
-
-#if (NGX_OPENSSL)
-    lua_pushcfunction(L, ngx_http_lua_ngx_hmac_sha1);
-    lua_setfield(L, -2, "hmac_sha1");
-#endif
-}
-
-
-static int
-ngx_http_lua_ngx_escape_uri(lua_State *L)
-{
-    size_t                   len, dlen;
-    uintptr_t                escape;
-    u_char                  *src, *dst;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    if (lua_isnil(L, 1)) {
-        lua_pushliteral(L, "");
-        return 1;
-    }
-
-    src = (u_char *) luaL_checklstring(L, 1, &len);
-
-    if (len == 0) {
-        return 1;
-    }
-
-    escape = 2 * ngx_http_lua_escape_uri(NULL, src, len,
-                                         NGX_ESCAPE_URI_COMPONENT);
-
-    if (escape) {
-        dlen = escape + len;
-        dst = lua_newuserdata(L, dlen);
-        ngx_http_lua_escape_uri(dst, src, len, NGX_ESCAPE_URI_COMPONENT);
-        lua_pushlstring(L, (char *) dst, dlen);
-    }
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_unescape_uri(lua_State *L)
-{
-    size_t                   len, dlen;
-    u_char                  *p;
-    u_char                  *src, *dst;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    if (lua_isnil(L, 1)) {
-        lua_pushliteral(L, "");
-        return 1;
-    }
-
-    src = (u_char *) luaL_checklstring(L, 1, &len);
-
-    /* the unescaped string can only be smaller */
-    dlen = len;
-
-    p = lua_newuserdata(L, dlen);
-
-    dst = p;
-
-    ngx_http_lua_unescape_uri(&dst, &src, len, NGX_UNESCAPE_URI_COMPONENT);
-
-    lua_pushlstring(L, (char *) p, dst - p);
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_quote_sql_str(lua_State *L)
-{
-    size_t                   len, dlen, escape;
-    u_char                  *p;
-    u_char                  *src, *dst;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    src = (u_char *) luaL_checklstring(L, 1, &len);
-
-    if (len == 0) {
-        dst = (u_char *) "''";
-        dlen = sizeof("''") - 1;
-        lua_pushlstring(L, (char *) dst, dlen);
-        return 1;
-    }
-
-    escape = ngx_http_lua_ngx_escape_sql_str(NULL, src, len);
-
-    dlen = sizeof("''") - 1 + len + escape;
-
-    p = lua_newuserdata(L, dlen);
-
-    dst = p;
-
-    *p++ = '\'';
-
-    if (escape == 0) {
-        p = ngx_copy(p, src, len);
-
-    } else {
-        p = (u_char *) ngx_http_lua_ngx_escape_sql_str(p, src, len);
-    }
-
-    *p++ = '\'';
-
-    if (p != dst + dlen) {
-        return NGX_ERROR;
-    }
-
-    lua_pushlstring(L, (char *) dst, p - dst);
-
-    return 1;
-}
-
-
-static uintptr_t
-ngx_http_lua_ngx_escape_sql_str(u_char *dst, u_char *src, size_t size)
-{
-    ngx_uint_t               n;
-
-    if (dst == NULL) {
-        /* find the number of chars to be escaped */
-        n = 0;
-        while (size) {
-            /* the highest bit of all the UTF-8 chars
-             * is always 1 */
-            if ((*src & 0x80) == 0) {
-                switch (*src) {
-                    case '\0':
-                    case '\b':
-                    case '\n':
-                    case '\r':
-                    case '\t':
-                    case 26:  /* \Z */
-                    case '\\':
-                    case '\'':
-                    case '"':
-                        n++;
-                        break;
-                    default:
-                        break;
-                }
-            }
-            src++;
-            size--;
-        }
-
-        return (uintptr_t) n;
-    }
-
-    while (size) {
-        if ((*src & 0x80) == 0) {
-            switch (*src) {
-                case '\0':
-                    *dst++ = '\\';
-                    *dst++ = '0';
-                    break;
-
-                case '\b':
-                    *dst++ = '\\';
-                    *dst++ = 'b';
-                    break;
-
-                case '\n':
-                    *dst++ = '\\';
-                    *dst++ = 'n';
-                    break;
-
-                case '\r':
-                    *dst++ = '\\';
-                    *dst++ = 'r';
-                    break;
-
-                case '\t':
-                    *dst++ = '\\';
-                    *dst++ = 't';
-                    break;
-
-                case 26:
-                    *dst++ = '\\';
-                    *dst++ = 'Z';
-                    break;
-
-                case '\\':
-                    *dst++ = '\\';
-                    *dst++ = '\\';
-                    break;
-
-                case '\'':
-                    *dst++ = '\\';
-                    *dst++ = '\'';
-                    break;
-
-                case '"':
-                    *dst++ = '\\';
-                    *dst++ = '"';
-                    break;
-
-                default:
-                    *dst++ = *src;
-                    break;
-            }
-        } else {
-            *dst++ = *src;
-        }
-        src++;
-        size--;
-    } /* while (size) */
-
-    return (uintptr_t) dst;
-}
-
-
-static int
-ngx_http_lua_ngx_md5(lua_State *L)
-{
-    u_char                  *src;
-    size_t                   slen;
-
-    ngx_md5_t                md5;
-    u_char                   md5_buf[MD5_DIGEST_LENGTH];
-    u_char                   hex_buf[2 * sizeof(md5_buf)];
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    if (lua_isnil(L, 1)) {
-        src = (u_char *) "";
-        slen = 0;
-
-    } else {
-        src = (u_char *) luaL_checklstring(L, 1, &slen);
-    }
-
-    ngx_md5_init(&md5);
-    ngx_md5_update(&md5, src, slen);
-    ngx_md5_final(md5_buf, &md5);
-
-    ngx_hex_dump(hex_buf, md5_buf, sizeof(md5_buf));
-
-    lua_pushlstring(L, (char *) hex_buf, sizeof(hex_buf));
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_md5_bin(lua_State *L)
-{
-    u_char                  *src;
-    size_t                   slen;
-
-    ngx_md5_t                md5;
-    u_char                   md5_buf[MD5_DIGEST_LENGTH];
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    if (lua_isnil(L, 1)) {
-        src     = (u_char *) "";
-        slen    = 0;
-
-    } else {
-        src = (u_char *) luaL_checklstring(L, 1, &slen);
-    }
-
-    dd("slen: %d", (int) slen);
-
-    ngx_md5_init(&md5);
-    ngx_md5_update(&md5, src, slen);
-    ngx_md5_final(md5_buf, &md5);
-
-    lua_pushlstring(L, (char *) md5_buf, sizeof(md5_buf));
-
-    return 1;
-}
-
-
-#if (NGX_HAVE_SHA1)
-static int
-ngx_http_lua_ngx_sha1_bin(lua_State *L)
-{
-    u_char                  *src;
-    size_t                   slen;
-
-    ngx_sha1_t               sha;
-    u_char                   sha_buf[SHA_DIGEST_LENGTH];
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    if (lua_isnil(L, 1)) {
-        src     = (u_char *) "";
-        slen    = 0;
-
-    } else {
-        src = (u_char *) luaL_checklstring(L, 1, &slen);
-    }
-
-    dd("slen: %d", (int) slen);
-
-    ngx_sha1_init(&sha);
-    ngx_sha1_update(&sha, src, slen);
-    ngx_sha1_final(sha_buf, &sha);
-
-    lua_pushlstring(L, (char *) sha_buf, sizeof(sha_buf));
-
-    return 1;
-}
-#endif
-
-
-static int
-ngx_http_lua_ngx_decode_base64(lua_State *L)
-{
-    ngx_str_t                p, src;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    if (lua_type(L, 1) != LUA_TSTRING) {
-        return luaL_error(L, "string argument only");
-    }
-
-    src.data = (u_char *) luaL_checklstring(L, 1, &src.len);
-
-    p.len = ngx_base64_decoded_length(src.len);
-
-    p.data = lua_newuserdata(L, p.len);
-
-    if (ngx_decode_base64(&p, &src) == NGX_OK) {
-        lua_pushlstring(L, (char *) p.data, p.len);
-
-    } else {
-        lua_pushnil(L);
-    }
-
-    return 1;
-}
-
-
-static void
-ngx_http_lua_encode_base64(ngx_str_t *dst, ngx_str_t *src, int no_padding)
-{
-    u_char         *d, *s;
-    size_t          len;
-    static u_char   basis[] =
-            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-    len = src->len;
-    s = src->data;
-    d = dst->data;
-
-    while (len > 2) {
-        *d++ = basis[(s[0] >> 2) & 0x3f];
-        *d++ = basis[((s[0] & 3) << 4) | (s[1] >> 4)];
-        *d++ = basis[((s[1] & 0x0f) << 2) | (s[2] >> 6)];
-        *d++ = basis[s[2] & 0x3f];
-
-        s += 3;
-        len -= 3;
-    }
-
-    if (len) {
-        *d++ = basis[(s[0] >> 2) & 0x3f];
-
-        if (len == 1) {
-            *d++ = basis[(s[0] & 3) << 4];
-            if (!no_padding) {
-                *d++ = '=';
-            }
-
-        } else {
-            *d++ = basis[((s[0] & 3) << 4) | (s[1] >> 4)];
-            *d++ = basis[(s[1] & 0x0f) << 2];
-        }
-
-        if (!no_padding) {
-            *d++ = '=';
-        }
-    }
-
-    dst->len = d - dst->data;
-}
-
-
-static size_t
-ngx_http_lua_base64_encoded_length(size_t n, int no_padding)
-{
-    return no_padding ? (n * 8 + 5) / 6 : ngx_base64_encoded_length(n);
-}
-
-
-static int
-ngx_http_lua_ngx_encode_base64(lua_State *L)
-{
-    int                      n;
-    int                      no_padding = 0;
-    ngx_str_t                p, src;
-
-    n = lua_gettop(L);
-    if (n != 1 && n != 2) {
-        return luaL_error(L, "expecting one or two arguments");
-    }
-
-    if (lua_isnil(L, 1)) {
-        src.data = (u_char *) "";
-        src.len = 0;
-
-    } else {
-        src.data = (u_char *) luaL_checklstring(L, 1, &src.len);
-    }
-
-    if (n == 2) {
-        /* get the 2nd optional argument */
-        luaL_checktype(L, 2, LUA_TBOOLEAN);
-        no_padding = lua_toboolean(L, 2);
-    }
-
-    p.len = ngx_http_lua_base64_encoded_length(src.len, no_padding);
-
-    p.data = lua_newuserdata(L, p.len);
-
-    ngx_http_lua_encode_base64(&p, &src, no_padding);
-
-    lua_pushlstring(L, (char *) p.data, p.len);
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_crc32_short(lua_State *L)
-{
-    u_char                  *p;
-    size_t                   len;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument, but got %d",
-                          lua_gettop(L));
-    }
-
-    p = (u_char *) luaL_checklstring(L, 1, &len);
-
-    lua_pushnumber(L, (lua_Number) ngx_crc32_short(p, len));
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_crc32_long(lua_State *L)
-{
-    u_char                  *p;
-    size_t                   len;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument, but got %d",
-                          lua_gettop(L));
-    }
-
-    p = (u_char *) luaL_checklstring(L, 1, &len);
-
-    lua_pushnumber(L, (lua_Number) ngx_crc32_long(p, len));
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_encode_args(lua_State *L)
-{
-    ngx_str_t                    args;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting 1 argument but seen %d",
-                          lua_gettop(L));
-    }
-
-    luaL_checktype(L, 1, LUA_TTABLE);
-    ngx_http_lua_process_args_option(NULL, L, 1, &args);
-    lua_pushlstring(L, (char *) args.data, args.len);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_decode_args(lua_State *L)
-{
-    u_char                      *buf;
-    u_char                      *tmp;
-    size_t                       len = 0;
-    int                          n;
-    int                          max;
-
-    n = lua_gettop(L);
-
-    if (n != 1 && n != 2) {
-        return luaL_error(L, "expecting 1 or 2 arguments but seen %d", n);
-    }
-
-    buf = (u_char *) luaL_checklstring(L, 1, &len);
-
-    if (n == 2) {
-        max = luaL_checkint(L, 2);
-        lua_pop(L, 1);
-
-    } else {
-        max = NGX_HTTP_LUA_MAX_ARGS;
-    }
-
-    tmp = lua_newuserdata(L, len);
-    ngx_memcpy(tmp, buf, len);
-
-    lua_createtable(L, 0, 4);
-
-    return ngx_http_lua_parse_args(L, tmp, tmp + len, max);
-}
-
-
-#if (NGX_OPENSSL)
-static int
-ngx_http_lua_ngx_hmac_sha1(lua_State *L)
-{
-    u_char                  *sec, *sts;
-    size_t                   lsec, lsts;
-    unsigned int             md_len;
-    unsigned char            md[EVP_MAX_MD_SIZE];
-    const EVP_MD            *evp_md;
-
-    if (lua_gettop(L) != 2) {
-        return luaL_error(L, "expecting 2 arguments, but got %d",
-                          lua_gettop(L));
-    }
-
-    sec = (u_char *) luaL_checklstring(L, 1, &lsec);
-    sts = (u_char *) luaL_checklstring(L, 2, &lsts);
-
-    evp_md = EVP_sha1();
-
-    HMAC(evp_md, sec, lsec, sts, lsts, md, &md_len);
-
-    lua_pushlstring(L, (char *) md, md_len);
-
-    return 1;
-}
-#endif
-
-
-#ifndef NGX_LUA_NO_FFI_API
-void
-ngx_http_lua_ffi_md5_bin(const u_char *src, size_t len, u_char *dst)
-{
-    ngx_md5_t     md5;
-
-    ngx_md5_init(&md5);
-    ngx_md5_update(&md5, src, len);
-    ngx_md5_final(dst, &md5);
-}
-
-
-void
-ngx_http_lua_ffi_md5(const u_char *src, size_t len, u_char *dst)
-{
-    ngx_md5_t           md5;
-    u_char              md5_buf[MD5_DIGEST_LENGTH];
-
-    ngx_md5_init(&md5);
-    ngx_md5_update(&md5, src, len);
-    ngx_md5_final(md5_buf, &md5);
-
-    ngx_hex_dump(dst, md5_buf, sizeof(md5_buf));
-}
-
-
-int
-ngx_http_lua_ffi_sha1_bin(const u_char *src, size_t len, u_char *dst)
-{
-#if (NGX_HAVE_SHA1)
-    ngx_sha1_t               sha;
-
-    ngx_sha1_init(&sha);
-    ngx_sha1_update(&sha, src, len);
-    ngx_sha1_final(dst, &sha);
-
-    return 1;
-#else
-    return 0;
-#endif
-}
-
-
-size_t
-ngx_http_lua_ffi_encode_base64(const u_char *src, size_t slen, u_char *dst,
-    int no_padding)
-{
-    ngx_str_t      in, out;
-
-    in.data = (u_char *) src;
-    in.len = slen;
-
-    out.data = dst;
-
-    ngx_http_lua_encode_base64(&out, &in, no_padding);
-
-    return out.len;
-}
-
-
-int
-ngx_http_lua_ffi_decode_base64(const u_char *src, size_t slen, u_char *dst,
-    size_t *dlen)
-{
-    ngx_int_t      rc;
-    ngx_str_t      in, out;
-
-    in.data = (u_char *) src;
-    in.len = slen;
-
-    out.data = dst;
-
-    rc = ngx_decode_base64(&out, &in);
-
-    *dlen = out.len;
-
-    return rc == NGX_OK;
-}
-
-
-size_t
-ngx_http_lua_ffi_unescape_uri(const u_char *src, size_t len, u_char *dst)
-{
-    u_char      *p = dst;
-
-    ngx_http_lua_unescape_uri(&p, (u_char **) &src, len,
-                              NGX_UNESCAPE_URI_COMPONENT);
-    return p - dst;
-}
-
-
-size_t
-ngx_http_lua_ffi_uri_escaped_length(const u_char *src, size_t len)
-{
-    return len + 2 * ngx_http_lua_escape_uri(NULL, (u_char *) src, len,
-                                             NGX_ESCAPE_URI_COMPONENT);
-}
-
-
-void
-ngx_http_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst)
-{
-    ngx_http_lua_escape_uri(dst, (u_char *) src, len, NGX_ESCAPE_URI_COMPONENT);
-}
-
-#endif
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_string.h b/debian/modules/http-lua/src/ngx_http_lua_string.h
deleted file mode 100644
index b54cbdf..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_string.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_STRING_H_INCLUDED_
-#define _NGX_HTTP_LUA_STRING_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_string_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_STRING_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c b/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
deleted file mode 100644
index 826a43c..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_subrequest.c
+++ /dev/null
@@ -1,1782 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_subrequest.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_ctx.h"
-#include "ngx_http_lua_contentby.h"
-#include "ngx_http_lua_headers_in.h"
-#if defined(NGX_DTRACE) && NGX_DTRACE
-#include "ngx_http_probe.h"
-#endif
-
-
-#define NGX_HTTP_LUA_SHARE_ALL_VARS     0x01
-#define NGX_HTTP_LUA_COPY_ALL_VARS      0x02
-
-
-#define ngx_http_lua_method_name(m) { sizeof(m) - 1, (u_char *) m " " }
-
-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");
-ngx_str_t  ngx_http_lua_options_method =
-        ngx_http_lua_method_name("OPTIONS");
-ngx_str_t  ngx_http_lua_copy_method = ngx_http_lua_method_name("COPY");
-ngx_str_t  ngx_http_lua_move_method = ngx_http_lua_method_name("MOVE");
-ngx_str_t  ngx_http_lua_lock_method = ngx_http_lua_method_name("LOCK");
-ngx_str_t  ngx_http_lua_mkcol_method =
-        ngx_http_lua_method_name("MKCOL");
-ngx_str_t  ngx_http_lua_propfind_method =
-        ngx_http_lua_method_name("PROPFIND");
-ngx_str_t  ngx_http_lua_proppatch_method =
-        ngx_http_lua_method_name("PROPPATCH");
-ngx_str_t  ngx_http_lua_unlock_method =
-        ngx_http_lua_method_name("UNLOCK");
-ngx_str_t  ngx_http_lua_patch_method =
-        ngx_http_lua_method_name("PATCH");
-ngx_str_t  ngx_http_lua_trace_method =
-        ngx_http_lua_method_name("TRACE");
-
-
-static ngx_str_t  ngx_http_lua_content_length_header_key =
-    ngx_string("Content-Length");
-
-
-static ngx_int_t ngx_http_lua_set_content_length_header(ngx_http_request_t *r,
-    off_t len);
-static ngx_int_t ngx_http_lua_adjust_subrequest(ngx_http_request_t *sr,
-    ngx_uint_t method, int forward_body,
-    ngx_http_request_body_t *body, unsigned vars_action,
-    ngx_array_t *extra_vars);
-static int ngx_http_lua_ngx_location_capture(lua_State *L);
-static int ngx_http_lua_ngx_location_capture_multi(lua_State *L);
-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);
-static ngx_int_t ngx_http_lua_copy_in_file_request_body(ngx_http_request_t *r);
-static ngx_int_t ngx_http_lua_copy_request_headers(ngx_http_request_t *sr,
-    ngx_http_request_t *r);
-
-
-/* ngx.location.capture is just a thin wrapper around
- * ngx.location.capture_multi */
-static int
-ngx_http_lua_ngx_location_capture(lua_State *L)
-{
-    int                 n;
-
-    n = lua_gettop(L);
-
-    if (n != 1 && n != 2) {
-        return luaL_error(L, "expecting one or two arguments");
-    }
-
-    lua_createtable(L, n, 0); /* uri opts? table  */
-    lua_insert(L, 1); /* table uri opts? */
-    if (n == 1) { /* table uri */
-        lua_rawseti(L, 1, 1); /* table */
-
-    } else { /* table uri opts */
-        lua_rawseti(L, 1, 2); /* table uri */
-        lua_rawseti(L, 1, 1); /* table */
-    }
-
-    lua_createtable(L, 1, 0); /* table table' */
-    lua_insert(L, 1);   /* table' table */
-    lua_rawseti(L, 1, 1); /* table' */
-
-    return ngx_http_lua_ngx_location_capture_multi(L);
-}
-
-
-static int
-ngx_http_lua_ngx_location_capture_multi(lua_State *L)
-{
-    ngx_http_request_t              *r;
-    ngx_http_request_t              *sr = NULL; /* subrequest object */
-    ngx_http_post_subrequest_t      *psr;
-    ngx_http_lua_ctx_t              *sr_ctx;
-    ngx_http_lua_ctx_t              *ctx;
-    ngx_array_t                     *extra_vars;
-    ngx_str_t                        uri;
-    ngx_str_t                        args;
-    ngx_str_t                        extra_args;
-    ngx_uint_t                       flags;
-    u_char                          *p;
-    u_char                          *q;
-    size_t                           len;
-    size_t                           nargs;
-    int                              rc;
-    int                              n;
-    int                              always_forward_body = 0;
-    ngx_uint_t                       method;
-    ngx_http_request_body_t         *body;
-    int                              type;
-    ngx_buf_t                       *b;
-    unsigned                         vars_action;
-    ngx_uint_t                       nsubreqs;
-    ngx_uint_t                       index;
-    size_t                           sr_statuses_len;
-    size_t                           sr_headers_len;
-    size_t                           sr_bodies_len;
-    size_t                           sr_flags_len;
-    size_t                           ofs1, ofs2;
-    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) {
-        return luaL_error(L, "only one argument is expected, but got %d", n);
-    }
-
-    luaL_checktype(L, 1, LUA_TTABLE);
-
-    nsubreqs = lua_objlen(L, 1);
-    if (nsubreqs == 0) {
-        return luaL_error(L, "at least one subrequest should be specified");
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-#if (NGX_HTTP_V2)
-    if (r->main->stream) {
-        return luaL_error(L, "http2 requests not supported yet");
-    }
-#endif
-
-    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);
-
-    coctx = ctx->cur_co_ctx;
-    if (coctx == NULL) {
-        return luaL_error(L, "no co ctx found");
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua location capture, uri:\"%V\" c:%ud", &r->uri,
-                   r->main->count);
-
-    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);
-    sr_flags_len    = nsubreqs * sizeof(uint8_t);
-
-    p = ngx_pcalloc(r->pool, sr_statuses_len + sr_headers_len +
-                    sr_bodies_len + sr_flags_len);
-
-    if (p == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    coctx->sr_statuses = (void *) p;
-    p += sr_statuses_len;
-
-    coctx->sr_headers = (void *) p;
-    p += sr_headers_len;
-
-    coctx->sr_bodies = (void *) p;
-    p += sr_bodies_len;
-
-    coctx->sr_flags = (void *) p;
-
-    coctx->nsubreqs = nsubreqs;
-
-    coctx->pending_subreqs = 0;
-
-    extra_vars = NULL;
-
-    for (index = 0; index < nsubreqs; index++) {
-        coctx->pending_subreqs++;
-
-        lua_rawgeti(L, 1, index + 1);
-        if (lua_isnil(L, -1)) {
-            return luaL_error(L, "only array-like tables are allowed");
-        }
-
-        dd("queries query: top %d", lua_gettop(L));
-
-        if (lua_type(L, -1) != LUA_TTABLE) {
-            return luaL_error(L, "the query argument %d is not a table, "
-                              "but a %s",
-                              index, lua_typename(L, lua_type(L, -1)));
-        }
-
-        nargs = lua_objlen(L, -1);
-
-        if (nargs != 1 && nargs != 2) {
-            return luaL_error(L, "query argument %d expecting one or "
-                              "two arguments", index);
-        }
-
-        lua_rawgeti(L, 2, 1); /* queries query uri */
-
-        dd("queries query uri: %d", lua_gettop(L));
-
-        dd("first arg in first query: %s", lua_typename(L, lua_type(L, -1)));
-
-        body = NULL;
-
-        ngx_str_null(&extra_args);
-
-        if (extra_vars != NULL) {
-            /* flush out existing elements in the array */
-            extra_vars->nelts = 0;
-        }
-
-        vars_action = 0;
-
-        custom_ctx = 0;
-
-        if (nargs == 2) {
-            /* check out the options table */
-
-            lua_rawgeti(L, 2, 2); /* queries query uri opts */
-
-            dd("queries query uri opts: %d", lua_gettop(L));
-
-            if (lua_type(L, 4) != LUA_TTABLE) {
-                return luaL_error(L, "expecting table as the 2nd argument for "
-                                  "subrequest %d, but got %s", index,
-                                  luaL_typename(L, 4));
-            }
-
-            dd("queries query uri opts: %d", lua_gettop(L));
-
-            /* check the args option */
-
-            lua_getfield(L, 4, "args");
-
-            type = lua_type(L, -1);
-
-            switch (type) {
-            case LUA_TTABLE:
-                ngx_http_lua_process_args_option(r, L, -1, &extra_args);
-                break;
-
-            case LUA_TNIL:
-                /* do nothing */
-                break;
-
-            case LUA_TNUMBER:
-            case LUA_TSTRING:
-                extra_args.data = (u_char *) lua_tolstring(L, -1, &len);
-                extra_args.len = len;
-
-                break;
-
-            default:
-                return luaL_error(L, "Bad args option value");
-            }
-
-            lua_pop(L, 1);
-
-            dd("queries query uri opts: %d", lua_gettop(L));
-
-            /* check the vars option */
-
-            lua_getfield(L, 4, "vars");
-
-            switch (lua_type(L, -1)) {
-            case LUA_TTABLE:
-                ngx_http_lua_process_vars_option(r, L, -1, &extra_vars);
-
-                dd("post process vars top: %d", lua_gettop(L));
-                break;
-
-            case LUA_TNIL:
-                /* do nothing */
-                break;
-
-            default:
-                return luaL_error(L, "Bad vars option value");
-            }
-
-            lua_pop(L, 1);
-
-            dd("queries query uri opts: %d", lua_gettop(L));
-
-            /* check the share_all_vars option */
-
-            lua_getfield(L, 4, "share_all_vars");
-
-            switch (lua_type(L, -1)) {
-            case LUA_TNIL:
-                /* do nothing */
-                break;
-
-            case LUA_TBOOLEAN:
-                if (lua_toboolean(L, -1)) {
-                    vars_action |= NGX_HTTP_LUA_SHARE_ALL_VARS;
-                }
-                break;
-
-            default:
-                return luaL_error(L, "Bad share_all_vars option value");
-            }
-
-            lua_pop(L, 1);
-
-            dd("queries query uri opts: %d", lua_gettop(L));
-
-            /* check the copy_all_vars option */
-
-            lua_getfield(L, 4, "copy_all_vars");
-
-            switch (lua_type(L, -1)) {
-            case LUA_TNIL:
-                /* do nothing */
-                break;
-
-            case LUA_TBOOLEAN:
-                if (lua_toboolean(L, -1)) {
-                    vars_action |= NGX_HTTP_LUA_COPY_ALL_VARS;
-                }
-                break;
-
-            default:
-                return luaL_error(L, "Bad copy_all_vars option value");
-            }
-
-            lua_pop(L, 1);
-
-            dd("queries query uri opts: %d", lua_gettop(L));
-
-            /* check the "forward_body" option */
-
-            lua_getfield(L, 4, "always_forward_body");
-            always_forward_body = lua_toboolean(L, -1);
-            lua_pop(L, 1);
-
-            dd("always forward body: %d", always_forward_body);
-
-            /* check the "method" option */
-
-            lua_getfield(L, 4, "method");
-
-            type = lua_type(L, -1);
-
-            if (type == LUA_TNIL) {
-                method = NGX_HTTP_GET;
-
-            } else {
-                if (type != LUA_TNUMBER) {
-                    return luaL_error(L, "Bad http request method");
-                }
-
-                method = (ngx_uint_t) lua_tonumber(L, -1);
-            }
-
-            lua_pop(L, 1);
-
-            dd("queries query uri opts: %d", lua_gettop(L));
-
-            /* check the "ctx" option */
-
-            lua_getfield(L, 4, "ctx");
-
-            type = lua_type(L, -1);
-
-            if (type != LUA_TNIL) {
-                if (type != LUA_TTABLE) {
-                    return luaL_error(L, "Bad ctx option value type %s, "
-                                      "expected a Lua table",
-                                      lua_typename(L, type));
-                }
-
-                custom_ctx = 1;
-
-            } else {
-                lua_pop(L, 1);
-            }
-
-            dd("queries query uri opts ctx?: %d", lua_gettop(L));
-
-            /* check the "body" option */
-
-            lua_getfield(L, 4, "body");
-
-            type = lua_type(L, -1);
-
-            if (type != LUA_TNIL) {
-                if (type != LUA_TSTRING && type != LUA_TNUMBER) {
-                    return luaL_error(L, "Bad http request body");
-                }
-
-                body = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
-
-                if (body == NULL) {
-                    return luaL_error(L, "no memory");
-                }
-
-                q = (u_char *) lua_tolstring(L, -1, &len);
-
-                dd("request body: [%.*s]", (int) len, q);
-
-                if (len) {
-                    b = ngx_create_temp_buf(r->pool, len);
-                    if (b == NULL) {
-                        return luaL_error(L, "no memory");
-                    }
-
-                    b->last = ngx_copy(b->last, q, len);
-
-                    body->bufs = ngx_alloc_chain_link(r->pool);
-                    if (body->bufs == NULL) {
-                        return luaL_error(L, "no memory");
-                    }
-
-                    body->bufs->buf = b;
-                    body->bufs->next = NULL;
-
-                    body->buf = b;
-                }
-            }
-
-            lua_pop(L, 1); /* pop the body */
-
-            /* stack: queries query uri opts ctx? */
-
-            lua_remove(L, 4);
-
-            /* stack: queries query uri ctx? */
-
-            dd("queries query uri ctx?: %d", lua_gettop(L));
-
-        } else {
-            method = NGX_HTTP_GET;
-        }
-
-        /* stack: queries query uri ctx? */
-
-        p = (u_char *) luaL_checklstring(L, 3, &len);
-
-        uri.data = ngx_palloc(r->pool, len);
-        if (uri.data == NULL) {
-            return luaL_error(L, "memory allocation error");
-        }
-
-        ngx_memcpy(uri.data, p, len);
-
-        uri.len = len;
-
-        ngx_str_null(&args);
-
-        flags = 0;
-
-        rc = ngx_http_parse_unsafe_uri(r, &uri, &args, &flags);
-        if (rc != NGX_OK) {
-            dd("rc = %d", (int) rc);
-
-            return luaL_error(L, "unsafe uri in argument #1: %s", p);
-        }
-
-        if (args.len == 0) {
-            if (extra_args.len) {
-                p = ngx_palloc(r->pool, extra_args.len);
-                if (p == NULL) {
-                    return luaL_error(L, "no memory");
-                }
-
-                ngx_memcpy(p, extra_args.data, extra_args.len);
-
-                args.data = p;
-                args.len = extra_args.len;
-            }
-
-        } else if (extra_args.len) {
-            /* concatenate the two parts of args together */
-            len = args.len + (sizeof("&") - 1) + extra_args.len;
-
-            p = ngx_palloc(r->pool, len);
-            if (p == NULL) {
-                return luaL_error(L, "no memory");
-            }
-
-            q = ngx_copy(p, args.data, args.len);
-            *q++ = '&';
-            ngx_memcpy(q, extra_args.data, extra_args.len);
-
-            args.data = p;
-            args.len = len;
-        }
-
-        ofs1 = ngx_align(sizeof(ngx_http_post_subrequest_t), sizeof(void *));
-        ofs2 = ngx_align(sizeof(ngx_http_lua_ctx_t), sizeof(void *));
-
-        p = ngx_palloc(r->pool, ofs1 + ofs2
-                       + sizeof(ngx_http_lua_post_subrequest_data_t));
-        if (p == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        psr = (ngx_http_post_subrequest_t *) p;
-
-        p += ofs1;
-
-        sr_ctx = (ngx_http_lua_ctx_t *) p;
-
-        ngx_http_lua_assert((void *) sr_ctx == ngx_align_ptr(sr_ctx,
-                                                             sizeof(void *)));
-
-        p += ofs2;
-
-        psr_data = (ngx_http_lua_post_subrequest_data_t *) p;
-
-        ngx_http_lua_assert((void *) psr_data == ngx_align_ptr(psr_data,
-                                                               sizeof(void *)));
-
-        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->body = NULL
-         */
-
-        psr_data->ctx = sr_ctx;
-        psr_data->pr_co_ctx = coctx;
-
-        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);
-        }
-
-        ngx_http_lua_init_ctx(sr, sr_ctx);
-
-        sr_ctx->capture = 1;
-        sr_ctx->index = index;
-        sr_ctx->last_body = &sr_ctx->body;
-        sr_ctx->vm_state = ctx->vm_state;
-
-        ngx_http_set_ctx(sr, sr_ctx, ngx_http_lua_module);
-
-        rc = ngx_http_lua_adjust_subrequest(sr, method, always_forward_body,
-                                            body, vars_action, extra_vars);
-
-        if (rc != NGX_OK) {
-            ngx_http_lua_cancel_subreq(sr);
-            return luaL_error(L, "failed to adjust the subrequest: %d",
-                              (int) rc);
-        }
-
-        dd("queries query uri opts ctx? %d", lua_gettop(L));
-
-        /* stack: queries query uri ctx? */
-
-        if (custom_ctx) {
-            ngx_http_lua_ngx_set_ctx_helper(L, sr, sr_ctx, -1);
-            lua_pop(L, 3);
-
-        } else {
-            lua_pop(L, 2);
-        }
-
-        /* stack: queries */
-    }
-
-    if (extra_vars) {
-        ngx_array_destroy(extra_vars);
-    }
-
-    ctx->no_abort = 1;
-
-    return lua_yield(L, 0);
-}
-
-
-static ngx_int_t
-ngx_http_lua_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method,
-    int always_forward_body, ngx_http_request_body_t *body,
-    unsigned vars_action, ngx_array_t *extra_vars)
-{
-    ngx_http_request_t          *r;
-    ngx_int_t                    rc;
-    ngx_http_core_main_conf_t   *cmcf;
-    size_t                       size;
-
-    r = sr->parent;
-
-    sr->header_in = r->header_in;
-
-    if (body) {
-        sr->request_body = body;
-
-        rc = ngx_http_lua_set_content_length_header(sr,
-                                                    body->buf
-                                                    ? ngx_buf_size(body->buf)
-                                                    : 0);
-
-        if (rc != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-    } else if (!always_forward_body
-               && method != NGX_HTTP_PUT
-               && method != NGX_HTTP_POST
-               && r->headers_in.content_length_n > 0)
-    {
-        rc = ngx_http_lua_set_content_length_header(sr, 0);
-        if (rc != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-#if 1
-        sr->request_body = NULL;
-#endif
-
-    } else {
-        if (ngx_http_lua_copy_request_headers(sr, r) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        if (sr->request_body) {
-
-            /* deep-copy the request body */
-
-            if (sr->request_body->temp_file) {
-                if (ngx_http_lua_copy_in_file_request_body(sr) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-            }
-        }
-    }
-
-    sr->method = method;
-
-    switch (method) {
-        case NGX_HTTP_GET:
-            sr->method_name = ngx_http_lua_get_method;
-            break;
-
-        case NGX_HTTP_POST:
-            sr->method_name = ngx_http_lua_post_method;
-            break;
-
-        case NGX_HTTP_PUT:
-            sr->method_name = ngx_http_lua_put_method;
-            break;
-
-        case NGX_HTTP_HEAD:
-            sr->method_name = ngx_http_lua_head_method;
-            break;
-
-        case NGX_HTTP_DELETE:
-            sr->method_name = ngx_http_lua_delete_method;
-            break;
-
-        case NGX_HTTP_OPTIONS:
-            sr->method_name = ngx_http_lua_options_method;
-            break;
-
-        case NGX_HTTP_MKCOL:
-            sr->method_name = ngx_http_lua_mkcol_method;
-            break;
-
-        case NGX_HTTP_COPY:
-            sr->method_name = ngx_http_lua_copy_method;
-            break;
-
-        case NGX_HTTP_MOVE:
-            sr->method_name = ngx_http_lua_move_method;
-            break;
-
-        case NGX_HTTP_PROPFIND:
-            sr->method_name = ngx_http_lua_propfind_method;
-            break;
-
-        case NGX_HTTP_PROPPATCH:
-            sr->method_name = ngx_http_lua_proppatch_method;
-            break;
-
-        case NGX_HTTP_LOCK:
-            sr->method_name = ngx_http_lua_lock_method;
-            break;
-
-        case NGX_HTTP_UNLOCK:
-            sr->method_name = ngx_http_lua_unlock_method;
-            break;
-
-        case NGX_HTTP_PATCH:
-            sr->method_name = ngx_http_lua_patch_method;
-            break;
-
-        case NGX_HTTP_TRACE:
-            sr->method_name = ngx_http_lua_trace_method;
-            break;
-
-        default:
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "unsupported HTTP method: %u", (unsigned) method);
-
-            return NGX_ERROR;
-    }
-
-    if (!(vars_action & NGX_HTTP_LUA_SHARE_ALL_VARS)) {
-        /* we do not inherit the parent request's variables */
-        cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
-
-        size = cmcf->variables.nelts * sizeof(ngx_http_variable_value_t);
-
-        if (vars_action & NGX_HTTP_LUA_COPY_ALL_VARS) {
-
-            sr->variables = ngx_palloc(sr->pool, size);
-            if (sr->variables == NULL) {
-                return NGX_ERROR;
-            }
-
-            ngx_memcpy(sr->variables, r->variables, size);
-
-        } else {
-
-            /* we do not inherit the parent request's variables */
-
-            sr->variables = ngx_pcalloc(sr->pool, size);
-            if (sr->variables == NULL) {
-                return NGX_ERROR;
-            }
-        }
-    }
-
-    return ngx_http_lua_subrequest_add_extra_vars(sr, extra_vars);
-}
-
-
-static ngx_int_t
-ngx_http_lua_subrequest_add_extra_vars(ngx_http_request_t *sr,
-    ngx_array_t *extra_vars)
-{
-    ngx_http_core_main_conf_t   *cmcf;
-    ngx_http_variable_t         *v;
-    ngx_http_variable_value_t   *vv;
-    u_char                      *val;
-    u_char                      *p;
-    ngx_uint_t                   i, hash;
-    ngx_str_t                    name;
-    size_t                       len;
-    ngx_hash_t                  *variables_hash;
-    ngx_keyval_t                *var;
-
-    /* set any extra variables that were passed to the subrequest */
-
-    if (extra_vars == NULL || extra_vars->nelts == 0) {
-        return NGX_OK;
-    }
-
-    cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
-
-    variables_hash = &cmcf->variables_hash;
-
-    var = extra_vars->elts;
-
-    for (i = 0; i < extra_vars->nelts; i++, var++) {
-        /* copy the variable's name and value because they are allocated
-         * by the lua VM */
-
-        len = var->key.len + var->value.len;
-
-        p = ngx_pnalloc(sr->pool, len);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        name.data = p;
-        name.len = var->key.len;
-
-        p = ngx_copy(p, var->key.data, var->key.len);
-
-        hash = ngx_hash_strlow(name.data, name.data, name.len);
-
-        val = p;
-        len = var->value.len;
-
-        ngx_memcpy(p, var->value.data, len);
-
-        v = ngx_hash_find(variables_hash, hash, name.data, name.len);
-
-        if (v) {
-            if (!(v->flags & NGX_HTTP_VAR_CHANGEABLE)) {
-                ngx_log_error(NGX_LOG_ERR, sr->connection->log, 0,
-                              "variable \"%V\" not changeable", &name);
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-
-            if (v->set_handler) {
-                vv = ngx_palloc(sr->pool, sizeof(ngx_http_variable_value_t));
-                if (vv == NULL) {
-                    return NGX_ERROR;
-                }
-
-                vv->valid = 1;
-                vv->not_found = 0;
-                vv->no_cacheable = 0;
-
-                vv->data = val;
-                vv->len = len;
-
-                v->set_handler(sr, vv, v->data);
-
-                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sr->connection->log, 0,
-                               "variable \"%V\" set to value \"%v\"", &name,
-                               vv);
-
-                continue;
-            }
-
-            if (v->flags & NGX_HTTP_VAR_INDEXED) {
-                vv = &sr->variables[v->index];
-
-                vv->valid = 1;
-                vv->not_found = 0;
-                vv->no_cacheable = 0;
-
-                vv->data = val;
-                vv->len = len;
-
-                ngx_log_debug2(NGX_LOG_DEBUG_HTTP, sr->connection->log, 0,
-                               "variable \"%V\" set to value \"%v\"",
-                               &name, vv);
-
-                continue;
-            }
-        }
-
-        ngx_log_error(NGX_LOG_ERR, sr->connection->log, 0,
-                      "variable \"%V\" cannot be assigned a value (maybe you "
-                      "forgot to define it first?) ", &name);
-
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_lua_process_vars_option(ngx_http_request_t *r, lua_State *L,
-    int table, ngx_array_t **varsp)
-{
-    ngx_array_t         *vars;
-    ngx_keyval_t        *var;
-
-    if (table < 0) {
-        table = lua_gettop(L) + table + 1;
-    }
-
-    vars = *varsp;
-
-    if (vars == NULL) {
-
-        vars = ngx_array_create(r->pool, 4, sizeof(ngx_keyval_t));
-        if (vars == NULL) {
-            dd("here");
-            luaL_error(L, "no memory");
-            return;
-        }
-
-        *varsp = vars;
-    }
-
-    lua_pushnil(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 "
-                       "\"vars\" option table");
-            return;
-        }
-
-        if (!lua_isstring(L, -1)) {
-            luaL_error(L, "attempt to use bad variable value type %s",
-                       luaL_typename(L, -1));
-            return;
-        }
-
-        var = ngx_array_push(vars);
-        if (var == NULL) {
-            dd("here");
-            luaL_error(L, "no memory");
-            return;
-        }
-
-        var->key.data = (u_char *) lua_tolstring(L, -2, &var->key.len);
-        var->value.data = (u_char *) lua_tolstring(L, -1, &var->value.len);
-
-        lua_pop(L, 1);
-    }
-}
-
-
-ngx_int_t
-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; /* 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) {
-        if (r != r->connection->data) {
-            r->connection->data = r;
-        }
-
-        return NGX_OK;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua run post subrequest handler, rc:%i c:%ud", rc,
-                   r->main->count);
-
-    ctx->run_post_subrequest = 1;
-
-    pr = r->parent;
-
-    pr_ctx = ngx_http_get_module_ctx(pr, ngx_http_lua_module);
-    if (pr_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    pr_coctx = psr_data->pr_co_ctx;
-    pr_coctx->pending_subreqs--;
-
-    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");
-
-        pr->write_event_handler = ngx_http_lua_content_wev_handler;
-
-    } else {
-        pr->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    dd("status rc = %d", (int) rc);
-    dd("status headers_out.status = %d", (int) r->headers_out.status);
-    dd("uri: %.*s", (int) r->uri.len, r->uri.data);
-
-    /*  capture subrequest response status */
-
-    pr_coctx->sr_statuses[ctx->index] = r->headers_out.status;
-
-    if (pr_coctx->sr_statuses[ctx->index] == 0) {
-        if (rc == NGX_OK) {
-            rc = NGX_HTTP_OK;
-        }
-
-        if (rc == NGX_ERROR) {
-            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        if (rc >= 100) {
-            pr_coctx->sr_statuses[ctx->index] = rc;
-        }
-    }
-
-    if (!ctx->seen_last_for_subreq) {
-        pr_coctx->sr_flags[ctx->index] |= NGX_HTTP_LUA_SUBREQ_TRUNCATED;
-    }
-
-    dd("pr_coctx status: %d", (int) pr_coctx->sr_statuses[ctx->index]);
-
-    /* copy subrequest response headers */
-
-    pr_coctx->sr_headers[ctx->index] = &r->headers_out;
-
-    /* copy subrequest response body */
-
-    body_str = &pr_coctx->sr_bodies[ctx->index];
-
-    len = 0;
-    for (cl = ctx->body; cl; cl = cl->next) {
-        /*  ignore all non-memory buffers */
-        len += cl->buf->last - cl->buf->pos;
-    }
-
-    body_str->len = len;
-
-    if (len == 0) {
-        body_str->data = NULL;
-
-    } else {
-        p = ngx_palloc(r->pool, len);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        body_str->data = p;
-
-        /* 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);
-
-            cl->buf->last = cl->buf->pos;
-
-#if 0
-            dd("free body chain link buf ASAP");
-            ngx_pfree(r->pool, cl->buf->start);
-#endif
-        }
-    }
-
-    if (ctx->body) {
-
-#if defined(nginx_version) && nginx_version >= 1001004
-        ngx_chain_update_chains(r->pool,
-#else
-        ngx_chain_update_chains(
-#endif
-                                &pr_ctx->free_bufs, &pr_ctx->busy_bufs,
-                                &ctx->body,
-                                (ngx_buf_tag_t) &ngx_http_lua_module);
-
-        dd("free bufs: %p", pr_ctx->free_bufs);
-    }
-
-    ngx_http_post_request_to_head(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))
-    {
-        /* 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_lua_send_header_if_needed(r, ctx);
-            if (rc == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-        }
-
-        return NGX_OK;
-    }
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_http_lua_set_content_length_header(ngx_http_request_t *r, off_t len)
-{
-    ngx_table_elt_t                 *h, *header;
-    u_char                          *p;
-    ngx_list_part_t                 *part;
-    ngx_http_request_t              *pr;
-    ngx_uint_t                       i;
-
-    r->headers_in.content_length_n = len;
-
-    if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
-                      sizeof(ngx_table_elt_t)) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    h = ngx_list_push(&r->headers_in.headers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    h->key = ngx_http_lua_content_length_header_key;
-    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
-    if (h->lowcase_key == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
-
-    r->headers_in.content_length = h;
-
-    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    h->value.data = p;
-
-    h->value.len = ngx_sprintf(h->value.data, "%O", len) - h->value.data;
-
-    h->hash = ngx_http_lua_content_length_hash;
-
-#if 0
-    dd("content length hash: %lu == %lu", (unsigned long) h->hash,
-       ngx_hash_key_lc((u_char *) "Content-Length",
-                       sizeof("Content-Length") - 1));
-#endif
-
-    dd("r content length: %.*s",
-       (int) r->headers_in.content_length->value.len,
-       r->headers_in.content_length->value.data);
-
-    pr = r->parent;
-
-    if (pr == NULL) {
-        return NGX_OK;
-    }
-
-    /* forward the parent request's all other request headers */
-
-    part = &pr->headers_in.headers.part;
-    header = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        if (header[i].key.len == sizeof("Content-Length") - 1
-            && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length",
-                               sizeof("Content-Length") - 1) == 0)
-        {
-            continue;
-        }
-
-        if (ngx_http_lua_set_input_header(r, header[i].key,
-                                          header[i].value, 0) == NGX_ERROR)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx)
-{
-    ngx_uint_t                   i, count;
-    ngx_uint_t                   index;
-    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_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");
-
-    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) coctx->pending_subreqs,
-           (int) r->uri.len, r->uri.data);
-
-        /*  {{{ construct ret value */
-        lua_createtable(co, 0 /* narr */, 4 /* nrec */);
-
-        /*  copy captured status */
-        lua_pushinteger(co, coctx->sr_statuses[index]);
-        lua_setfield(co, -2, "status");
-
-        dd("captured subrequest flags: %d", (int) coctx->sr_flags[index]);
-
-        /* set truncated flag if truncation happens */
-        if (coctx->sr_flags[index] & NGX_HTTP_LUA_SUBREQ_TRUNCATED) {
-            lua_pushboolean(co, 1);
-            lua_setfield(co, -2, "truncated");
-
-        } else {
-            lua_pushboolean(co, 0);
-            lua_setfield(co, -2, "truncated");
-        }
-
-        /*  copy captured body */
-
-        body_str = &coctx->sr_bodies[index];
-
-        lua_pushlstring(co, (char *) body_str->data, body_str->len);
-        lua_setfield(co, -2, "body");
-
-        if (body_str->data) {
-            dd("free body buffer ASAP");
-            ngx_pfree(r->pool, body_str->data);
-        }
-
-        /* copy captured headers */
-
-        sr_headers = coctx->sr_headers[index];
-
-        part = &sr_headers->headers.part;
-        count = part->nelts;
-        while (part->next) {
-            part = part->next;
-            count += part->nelts;
-        }
-
-        lua_createtable(co, 0, count + 5); /* res.header */
-
-        dd("saving subrequest response headers");
-
-        part = &sr_headers->headers.part;
-        header = part->elts;
-
-        for (i = 0; /* void */; i++) {
-
-            if (i >= part->nelts) {
-                if (part->next == NULL) {
-                    break;
-                }
-
-                part = part->next;
-                header = part->elts;
-                i = 0;
-            }
-
-            dd("checking sr header %.*s", (int) header[i].key.len,
-               header[i].key.data);
-
-#if 1
-            if (header[i].hash == 0) {
-                continue;
-            }
-#endif
-
-            header[i].hash = 0;
-
-            dd("pushing sr header %.*s", (int) header[i].key.len,
-               header[i].key.data);
-
-            lua_pushlstring(co, (char *) header[i].key.data,
-                            header[i].key.len); /* header key */
-            lua_pushvalue(co, -1); /* stack: table key key */
-
-            /* check if header already exists */
-            lua_rawget(co, -3); /* stack: table key value */
-
-            if (lua_isnil(co, -1)) {
-                lua_pop(co, 1); /* stack: table key */
-
-                lua_pushlstring(co, (char *) header[i].value.data,
-                                header[i].value.len);
-                    /* stack: table key value */
-
-                lua_rawset(co, -3); /* stack: table */
-
-            } else {
-
-                if (!lua_istable(co, -1)) { /* already inserted one value */
-                    lua_createtable(co, 4, 0);
-                        /* stack: table key value table */
-
-                    lua_insert(co, -2); /* stack: table key table value */
-                    lua_rawseti(co, -2, 1); /* stack: table key table */
-
-                    lua_pushlstring(co, (char *) header[i].value.data,
-                                    header[i].value.len);
-                        /* stack: table key table value */
-
-                    lua_rawseti(co, -2, lua_objlen(co, -2) + 1);
-                        /* stack: table key table */
-
-                    lua_rawset(co, -3); /* stack: table */
-
-                } else {
-                    lua_pushlstring(co, (char *) header[i].value.data,
-                                    header[i].value.len);
-                        /* stack: table key table value */
-
-                    lua_rawseti(co, -2, lua_objlen(co, -2) + 1);
-                        /* stack: table key table */
-
-                    lua_pop(co, 2); /* stack: table */
-                }
-            }
-        }
-
-        if (sr_headers->content_type.len) {
-            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(co, -3); /* head */
-        }
-
-        if (sr_headers->content_length == NULL
-            && sr_headers->content_length_n >= 0)
-        {
-            lua_pushliteral(co, "Content-Length"); /* header key */
-
-            lua_pushnumber(co, (lua_Number) sr_headers->content_length_n);
-                /* head key value */
-
-            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(co, "Location"); /* header key */
-            lua_pushlstring(co, (char *) sr_headers->location->value.data,
-                            sr_headers->location->value.len);
-            /* head key value */
-            lua_rawset(co, -3); /* head */
-        }
-
-        if (sr_headers->last_modified_time != -1) {
-            if (sr_headers->status != NGX_HTTP_OK
-                && sr_headers->status != NGX_HTTP_PARTIAL_CONTENT
-                && sr_headers->status != NGX_HTTP_NOT_MODIFIED
-                && sr_headers->status != NGX_HTTP_NO_CONTENT)
-            {
-                sr_headers->last_modified_time = -1;
-                sr_headers->last_modified = NULL;
-            }
-        }
-
-        if (sr_headers->last_modified == NULL
-            && sr_headers->last_modified_time != -1)
-        {
-            (void) ngx_http_time(buf, sr_headers->last_modified_time);
-
-            lua_pushliteral(co, "Last-Modified"); /* header key */
-            lua_pushlstring(co, (char *) buf, sizeof(buf)); /* head key value */
-            lua_rawset(co, -3); /* head */
-        }
-
-        lua_setfield(co, -2, "header");
-
-        /*  }}} */
-    }
-}
-
-
-void
-ngx_http_lua_inject_subrequest_api(lua_State *L)
-{
-    lua_createtable(L, 0 /* narr */, 2 /* nrec */); /* .location */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_location_capture);
-    lua_setfield(L, -2, "capture");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_location_capture_multi);
-    lua_setfield(L, -2, "capture_multi");
-
-    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;
-
-#if nginx_version >= 1009005
-
-    if (r->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,
-                      "lua subrequests cycle while processing \"%V\"", uri);
-        return NGX_ERROR;
-    }
-
-#else  /* nginx_version <= 1009004 */
-
-    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,
-                      "lua subrequests cycle while processing \"%V\"", uri);
-        r->main->subrequests = 1;
-        return NGX_ERROR;
-    }
-
-#endif
-
-    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.content_length_n = -1;
-    sr->headers_in.keep_alive_n = -1;
-
-    ngx_http_clear_content_length(sr);
-    ngx_http_clear_accept_ranges(sr);
-    ngx_http_clear_last_modified(sr);
-
-    sr->request_body = r->request_body;
-
-#if (NGX_HTTP_SPDY)
-    sr->spdy_stream = r->spdy_stream;
-#endif
-
-#if (NGX_HTTP_V2)
-    sr->stream = r->stream;
-#endif
-
-#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,
-                   "lua 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;
-
-#if nginx_version >= 1009005
-    sr->subrequests = r->subrequests - 1;
-#endif
-
-    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)
-{
-    lua_State                   *vm;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_connection_t            *c;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    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;
-
-    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;
-    coctx->sr_flags = NULL;
-#endif
-
-    c = r->connection;
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    /* rc == NGX_ERROR || rc >= NGX_OK */
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_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;
-}
-
-
-static ngx_int_t
-ngx_http_lua_copy_in_file_request_body(ngx_http_request_t *r)
-{
-    ngx_temp_file_t     *tf;
-
-    ngx_http_request_body_t   *body;
-
-    tf = r->request_body->temp_file;
-
-    if (!tf->persistent || !tf->clean) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "the request body was not read by ngx_lua");
-
-        return NGX_ERROR;
-    }
-
-    body = ngx_palloc(r->pool, sizeof(ngx_http_request_body_t));
-    if (body == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_memcpy(body, r->request_body, sizeof(ngx_http_request_body_t));
-
-    body->temp_file = ngx_palloc(r->pool, sizeof(ngx_temp_file_t));
-    if (body->temp_file == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_memcpy(body->temp_file, tf, sizeof(ngx_temp_file_t));
-    dd("file fd: %d", body->temp_file->file.fd);
-
-    r->request_body = body;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_copy_request_headers(ngx_http_request_t *sr, ngx_http_request_t *r)
-{
-    ngx_table_elt_t                 *header;
-    ngx_list_part_t                 *part;
-    ngx_uint_t                       i;
-
-    if (ngx_list_init(&sr->headers_in.headers, sr->pool, 20,
-                      sizeof(ngx_table_elt_t)) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    dd("before: parent req headers count: %d",
-       (int) r->headers_in.headers.part.nelts);
-
-    part = &r->headers_in.headers.part;
-    header = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        dd("setting request header %.*s: %.*s", (int) header[i].key.len,
-           header[i].key.data, (int) header[i].value.len,
-           header[i].value.data);
-
-        if (ngx_http_lua_set_input_header(sr, header[i].key,
-                                          header[i].value, 0) == NGX_ERROR)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    dd("after: parent req headers count: %d",
-       (int) r->headers_in.headers.part.nelts);
-
-    return NGX_OK;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_subrequest.h b/debian/modules/http-lua/src/ngx_http_lua_subrequest.h
deleted file mode 100644
index aad4236..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_subrequest.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_SUBREQUEST_H_INCLUDED_
-#define _NGX_HTTP_LUA_SUBREQUEST_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_subrequest_api(lua_State *L);
-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;
-extern ngx_str_t  ngx_http_lua_copy_method;
-extern ngx_str_t  ngx_http_lua_move_method;
-extern ngx_str_t  ngx_http_lua_lock_method;
-extern ngx_str_t  ngx_http_lua_mkcol_method;
-extern ngx_str_t  ngx_http_lua_propfind_method;
-extern ngx_str_t  ngx_http_lua_proppatch_method;
-extern ngx_str_t  ngx_http_lua_unlock_method;
-extern ngx_str_t  ngx_http_lua_patch_method;
-extern ngx_str_t  ngx_http_lua_trace_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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_time.c b/debian/modules/http-lua/src/ngx_http_lua_time.c
deleted file mode 100644
index bbb6f2b..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_time.c
+++ /dev/null
@@ -1,349 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#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);
-static int ngx_http_lua_ngx_time(lua_State *L);
-static int ngx_http_lua_ngx_now(lua_State *L);
-static int ngx_http_lua_ngx_localtime(lua_State *L);
-static int ngx_http_lua_ngx_utctime(lua_State *L);
-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
-ngx_http_lua_ngx_today(lua_State *L)
-{
-    time_t                   now;
-    ngx_tm_t                 tm;
-    u_char                   buf[sizeof("2010-11-19") - 1];
-
-    now = ngx_time();
-    ngx_gmtime(now + ngx_cached_time->gmtoff * 60, &tm);
-
-    ngx_sprintf(buf, "%04d-%02d-%02d", tm.ngx_tm_year, tm.ngx_tm_mon,
-                tm.ngx_tm_mday);
-
-    lua_pushlstring(L, (char *) buf, sizeof(buf));
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_localtime(lua_State *L)
-{
-    ngx_tm_t                 tm;
-
-    u_char buf[sizeof("2010-11-19 20:56:31") - 1];
-
-    ngx_gmtime(ngx_time() + ngx_cached_time->gmtoff * 60, &tm);
-
-    ngx_sprintf(buf, "%04d-%02d-%02d %02d:%02d:%02d", tm.ngx_tm_year,
-                tm.ngx_tm_mon, tm.ngx_tm_mday, tm.ngx_tm_hour, tm.ngx_tm_min,
-                tm.ngx_tm_sec);
-
-    lua_pushlstring(L, (char *) buf, sizeof(buf));
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_time(lua_State *L)
-{
-    lua_pushnumber(L, (lua_Number) ngx_time());
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_now(lua_State *L)
-{
-    ngx_time_t              *tp;
-
-    tp = ngx_timeofday();
-
-    lua_pushnumber(L, (lua_Number) (tp->sec + tp->msec / 1000.0L));
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_update_time(lua_State *L)
-{
-    ngx_time_update();
-    return 0;
-}
-
-
-static int
-ngx_http_lua_ngx_utctime(lua_State *L)
-{
-    ngx_tm_t       tm;
-    u_char         buf[sizeof("2010-11-19 20:56:31") - 1];
-
-    ngx_gmtime(ngx_time(), &tm);
-
-    ngx_sprintf(buf, "%04d-%02d-%02d %02d:%02d:%02d", tm.ngx_tm_year,
-                tm.ngx_tm_mon, tm.ngx_tm_mday, tm.ngx_tm_hour, tm.ngx_tm_min,
-                tm.ngx_tm_sec);
-
-    lua_pushlstring(L, (char *) buf, sizeof(buf));
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_cookie_time(lua_State *L)
-{
-    time_t                               t;
-    u_char                              *p;
-
-    u_char   buf[sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1];
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    t = (time_t) luaL_checknumber(L, 1);
-
-    p = buf;
-    p = ngx_http_cookie_time(p, t);
-
-    lua_pushlstring(L, (char *) buf, p - buf);
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_http_time(lua_State *L)
-{
-    time_t                               t;
-    u_char                              *p;
-
-    u_char   buf[sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1];
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    t = (time_t) luaL_checknumber(L, 1);
-
-    p = buf;
-    p = ngx_http_time(p, t);
-
-    lua_pushlstring(L, (char *) buf, p - buf);
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_parse_http_time(lua_State *L)
-{
-    u_char                              *p;
-    size_t                               len;
-    time_t                               time;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    p = (u_char *) luaL_checklstring(L, 1, &len);
-
-    time = ngx_http_parse_time(p, len);
-    if (time == NGX_ERROR) {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    lua_pushnumber(L, (lua_Number) time);
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_req_start_time(lua_State *L)
-{
-    ngx_http_request_t  *r;
-
-    r = ngx_http_lua_get_req(L);
-    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)
-{
-    lua_pushcfunction(L, ngx_http_lua_ngx_utctime);
-    lua_setfield(L, -2, "utctime");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_time);
-    lua_setfield(L, -2, "get_now_ts"); /* deprecated */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_localtime);
-    lua_setfield(L, -2, "get_now"); /* deprecated */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_localtime);
-    lua_setfield(L, -2, "localtime");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_time);
-    lua_setfield(L, -2, "time");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_now);
-    lua_setfield(L, -2, "now");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_update_time);
-    lua_setfield(L, -2, "update_time");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_today);
-    lua_setfield(L, -2, "get_today"); /* deprecated */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_today);
-    lua_setfield(L, -2, "today");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_cookie_time);
-    lua_setfield(L, -2, "cookie_time");
-
-    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_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");
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-double
-ngx_http_lua_ffi_now(void)
-{
-    ngx_time_t              *tp;
-
-    tp = ngx_timeofday();
-
-    return tp->sec + tp->msec / 1000.0;
-}
-
-
-double
-ngx_http_lua_ffi_req_start_time(ngx_http_request_t *r)
-{
-    return r->start_sec + r->start_msec / 1000.0;
-}
-
-
-long
-ngx_http_lua_ffi_time(void)
-{
-    return (long) ngx_time();
-}
-
-
-void
-ngx_http_lua_ffi_update_time(void)
-{
-    ngx_time_update();
-}
-
-
-void
-ngx_http_lua_ffi_today(u_char *buf)
-{
-    ngx_tm_t                 tm;
-
-    ngx_gmtime(ngx_time() + ngx_cached_time->gmtoff * 60, &tm);
-
-    ngx_sprintf(buf, "%04d-%02d-%02d", tm.ngx_tm_year, tm.ngx_tm_mon,
-                tm.ngx_tm_mday);
-}
-
-
-void
-ngx_http_lua_ffi_localtime(u_char *buf)
-{
-    ngx_tm_t                 tm;
-
-    ngx_gmtime(ngx_time() + ngx_cached_time->gmtoff * 60, &tm);
-
-    ngx_sprintf(buf, "%04d-%02d-%02d %02d:%02d:%02d", tm.ngx_tm_year,
-                tm.ngx_tm_mon, tm.ngx_tm_mday, tm.ngx_tm_hour, tm.ngx_tm_min,
-                tm.ngx_tm_sec);
-}
-
-
-void
-ngx_http_lua_ffi_utctime(u_char *buf)
-{
-    ngx_tm_t       tm;
-
-    ngx_gmtime(ngx_time(), &tm);
-
-    ngx_sprintf(buf, "%04d-%02d-%02d %02d:%02d:%02d", tm.ngx_tm_year,
-                tm.ngx_tm_mon, tm.ngx_tm_mday, tm.ngx_tm_hour, tm.ngx_tm_min,
-                tm.ngx_tm_sec);
-}
-
-
-int
-ngx_http_lua_ffi_cookie_time(u_char *buf, long t)
-{
-    u_char                              *p;
-
-    p = ngx_http_cookie_time(buf, t);
-    return p - buf;
-}
-
-
-void
-ngx_http_lua_ffi_http_time(u_char *buf, long t)
-{
-    ngx_http_time(buf, t);
-}
-
-
-void
-ngx_http_lua_ffi_parse_http_time(const u_char *str, size_t len,
-    long *time)
-{
-    /* ngx_http_parse_time doesn't modify 'str' actually */
-    *time = ngx_http_parse_time((u_char *) str, len);
-}
-#endif /* NGX_LUA_NO_FFI_API */
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_time.h b/debian/modules/http-lua/src/ngx_http_lua_time.h
deleted file mode 100644
index 291f784..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_time.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_TIME_H_INCLUDED_
-#define _NGX_HTTP_LUA_TIME_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_timer.c b/debian/modules/http-lua/src/ngx_http_lua_timer.c
deleted file mode 100644
index 596b2f7..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_timer.c
+++ /dev/null
@@ -1,909 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_timer.h"
-#include "ngx_http_lua_util.h"
-#include "ngx_http_lua_contentby.h"
-#include "ngx_http_lua_probe.h"
-
-
-typedef struct {
-    void        **main_conf;
-    void        **srv_conf;
-    void        **loc_conf;
-
-    lua_State    *co;
-
-    ngx_pool_t   *pool;
-
-    ngx_listening_t                   *listening;
-    ngx_str_t                          client_addr_text;
-
-    ngx_http_lua_main_conf_t          *lmcf;
-    ngx_http_lua_vm_state_t           *vm_state;
-
-    int           co_ref;
-    unsigned      delay:31;
-    unsigned      premature:1;
-} ngx_http_lua_timer_ctx_t;
-
-
-static int ngx_http_lua_ngx_timer_at(lua_State *L);
-static int ngx_http_lua_ngx_timer_every(lua_State *L);
-static int ngx_http_lua_ngx_timer_helper(lua_State *L, int every);
-static int ngx_http_lua_ngx_timer_running_count(lua_State *L);
-static int ngx_http_lua_ngx_timer_pending_count(lua_State *L);
-static ngx_int_t ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx);
-static void ngx_http_lua_timer_handler(ngx_event_t *ev);
-static u_char *ngx_http_lua_log_timer_error(ngx_log_t *log, u_char *buf,
-    size_t len);
-static void ngx_http_lua_abort_pending_timers(ngx_event_t *ev);
-
-
-void
-ngx_http_lua_inject_timer_api(lua_State *L)
-{
-    lua_createtable(L, 0 /* narr */, 4 /* nrec */);    /* ngx.timer. */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_timer_at);
-    lua_setfield(L, -2, "at");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_timer_every);
-    lua_setfield(L, -2, "every");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_timer_running_count);
-    lua_setfield(L, -2, "running_count");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_timer_pending_count);
-    lua_setfield(L, -2, "pending_count");
-
-    lua_setfield(L, -2, "timer");
-}
-
-
-static int
-ngx_http_lua_ngx_timer_running_count(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request");
-    }
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    lua_pushnumber(L, lmcf->running_timers);
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_timer_pending_count(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request");
-    }
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    lua_pushnumber(L, lmcf->pending_timers);
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_timer_at(lua_State *L)
-{
-    return ngx_http_lua_ngx_timer_helper(L, 0);
-}
-
-
-/*
- * TODO: return a timer handler instead which can be passed to
- * the ngx.timer.cancel method to cancel the timer.
- */
-static int
-ngx_http_lua_ngx_timer_every(lua_State *L)
-{
-    return ngx_http_lua_ngx_timer_helper(L, 1);
-}
-
-
-static int
-ngx_http_lua_ngx_timer_helper(lua_State *L, int every)
-{
-    int                      nargs, co_ref;
-    u_char                  *p;
-    lua_State               *vm;  /* the main thread */
-    lua_State               *co;
-    ngx_msec_t               delay;
-    ngx_event_t             *ev = NULL;
-    ngx_http_request_t      *r;
-    ngx_connection_t        *saved_c = NULL;
-    ngx_http_lua_ctx_t      *ctx;
-#if 0
-    ngx_http_connection_t   *hc;
-#endif
-
-    ngx_http_lua_timer_ctx_t      *tctx = NULL;
-    ngx_http_lua_main_conf_t      *lmcf;
-#if 0
-    ngx_http_core_main_conf_t     *cmcf;
-#endif
-
-    nargs = lua_gettop(L);
-    if (nargs < 2) {
-        return luaL_error(L, "expecting at least 2 arguments but got %d",
-                          nargs);
-    }
-
-    delay = (ngx_msec_t) (luaL_checknumber(L, 1) * 1000);
-
-    if (every && delay == 0) {
-        return luaL_error(L, "delay cannot be zero");
-    }
-
-    luaL_argcheck(L, lua_isfunction(L, 2) && !lua_iscfunction(L, 2), 2,
-                  "Lua function expected");
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request");
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    if (ngx_exiting && delay > 0) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "process exiting");
-        return 2;
-    }
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-    if (lmcf->pending_timers >= lmcf->max_pending_timers) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "too many pending timers");
-        return 2;
-    }
-
-    if (lmcf->watcher == NULL) {
-        /* create the watcher fake connection */
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua creating fake watcher connection");
-
-        if (ngx_cycle->files) {
-            saved_c = ngx_cycle->files[0];
-        }
-
-        lmcf->watcher = ngx_get_connection(0, ngx_cycle->log);
-
-        if (ngx_cycle->files) {
-            ngx_cycle->files[0] = saved_c;
-        }
-
-        if (lmcf->watcher == NULL) {
-            return luaL_error(L, "no memory");
-        }
-
-        /* to work around the -1 check in ngx_worker_process_cycle: */
-        lmcf->watcher->fd = (ngx_socket_t) -2;
-
-        lmcf->watcher->idle = 1;
-        lmcf->watcher->read->handler = ngx_http_lua_abort_pending_timers;
-        lmcf->watcher->data = lmcf;
-    }
-
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-
-    co = lua_newthread(vm);
-
-    /* L stack: time func [args] */
-
-    ngx_http_lua_probe_user_coroutine_create(r, L, co);
-
-    lua_createtable(co, 0, 0);  /* the new globals table */
-
-    /* co stack: global_tb */
-
-    lua_createtable(co, 0, 1);  /* the metatable */
-    ngx_http_lua_get_globals_table(co);
-    lua_setfield(co, -2, "__index");
-    lua_setmetatable(co, -2);
-
-    /* co stack: global_tb */
-
-    ngx_http_lua_set_globals_table(co);
-
-    /* co stack: <empty> */
-
-    dd("stack top: %d", lua_gettop(L));
-
-    lua_xmove(vm, L, 1);    /* move coroutine from main thread to L */
-
-    /* L stack: time func [args] thread */
-    /* vm stack: empty */
-
-    lua_pushvalue(L, 2);    /* copy entry function to top of L*/
-
-    /* L stack: time func [args] thread func */
-
-    lua_xmove(L, co, 1);    /* move entry function from L to co */
-
-    /* L stack: time func [args] thread */
-    /* co stack: func */
-
-    ngx_http_lua_get_globals_table(co);
-    lua_setfenv(co, -2);
-
-    /* co stack: func */
-
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-
-    /* L stack: time func [args] thread coroutines */
-
-    lua_pushvalue(L, -2);
-
-    /* L stack: time func [args] thread coroutines thread */
-
-    co_ref = luaL_ref(L, -2);
-    lua_pop(L, 1);
-
-    /* L stack: time func [args] thread */
-
-    if (nargs > 2) {
-        lua_pop(L, 1);  /* L stack: time func [args] */
-        lua_xmove(L, co, nargs - 2);  /* L stack: time func */
-
-        /* co stack: func [args] */
-    }
-
-    p = ngx_alloc(sizeof(ngx_event_t) + sizeof(ngx_http_lua_timer_ctx_t),
-                  r->connection->log);
-    if (p == NULL) {
-        goto nomem;
-    }
-
-    ev = (ngx_event_t *) p;
-
-    ngx_memzero(ev, sizeof(ngx_event_t));
-
-    p += sizeof(ngx_event_t);
-
-    tctx = (ngx_http_lua_timer_ctx_t *) p;
-
-    tctx->delay = every ? delay : 0;
-
-    tctx->premature = 0;
-    tctx->co_ref = co_ref;
-    tctx->co = co;
-    tctx->main_conf = r->main_conf;
-    tctx->srv_conf = r->srv_conf;
-    tctx->loc_conf = r->loc_conf;
-    tctx->lmcf = lmcf;
-
-    tctx->pool = ngx_create_pool(128, ngx_cycle->log);
-    if (tctx->pool == NULL) {
-        goto nomem;
-    }
-
-    if (r->connection) {
-        tctx->listening = r->connection->listening;
-
-    } else {
-        tctx->listening = NULL;
-    }
-
-    if (r->connection->addr_text.len) {
-        tctx->client_addr_text.data = ngx_palloc(tctx->pool,
-                                                 r->connection->addr_text.len);
-        if (tctx->client_addr_text.data == NULL) {
-            goto nomem;
-        }
-
-        ngx_memcpy(tctx->client_addr_text.data, r->connection->addr_text.data,
-                   r->connection->addr_text.len);
-        tctx->client_addr_text.len = r->connection->addr_text.len;
-
-    } else {
-        tctx->client_addr_text.len = 0;
-        tctx->client_addr_text.data = NULL;
-    }
-
-    if (ctx && ctx->vm_state) {
-        tctx->vm_state = ctx->vm_state;
-        tctx->vm_state->count++;
-
-    } else {
-        tctx->vm_state = NULL;
-    }
-
-    ev->handler = ngx_http_lua_timer_handler;
-    ev->data = tctx;
-    ev->log = ngx_cycle->log;
-
-    lmcf->pending_timers++;
-
-    ngx_add_timer(ev, delay);
-
-    lua_pushinteger(L, 1);
-    return 1;
-
-nomem:
-
-    if (tctx && tctx->pool) {
-        ngx_destroy_pool(tctx->pool);
-    }
-
-    if (ev) {
-        ngx_free(ev);
-    }
-
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    luaL_unref(L, -1, co_ref);
-
-    return luaL_error(L, "no memory");
-}
-
-
-static ngx_int_t
-ngx_http_lua_timer_copy(ngx_http_lua_timer_ctx_t *old_tctx)
-{
-    int                          nargs, co_ref, i;
-    u_char                      *p;
-    lua_State                   *vm;  /* the main thread */
-    lua_State                   *co;
-    lua_State                   *L;
-    ngx_event_t                 *ev = NULL;
-    ngx_http_lua_timer_ctx_t    *tctx = NULL;
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    /* L stack: func [args] */
-    L = old_tctx->co;
-
-    lmcf = old_tctx->lmcf;
-
-    vm = old_tctx->vm_state ? old_tctx->vm_state->vm : lmcf->lua;
-
-    co = lua_newthread(vm);
-
-    lua_createtable(co, 0, 0);  /* the new globals table */
-
-    /* co stack: global_tb */
-
-    lua_createtable(co, 0, 1);  /* the metatable */
-    ngx_http_lua_get_globals_table(co);
-    lua_setfield(co, -2, "__index");
-    lua_setmetatable(co, -2);
-
-    /* co stack: global_tb */
-
-    ngx_http_lua_set_globals_table(co);
-
-    /* co stack: <empty> */
-
-    dd("stack top: %d", lua_gettop(L));
-
-    lua_xmove(vm, L, 1);    /* move coroutine from main thread to L */
-
-    /* L stack: func [args] thread */
-    /* vm stack: empty */
-
-    lua_pushvalue(L, 1);    /* copy entry function to top of L*/
-
-    /* L stack: func [args] thread func */
-
-    lua_xmove(L, co, 1);    /* move entry function from L to co */
-
-    /* L stack: func [args] thread */
-    /* co stack: func */
-
-    ngx_http_lua_get_globals_table(co);
-    lua_setfenv(co, -2);
-
-    /* co stack: func */
-
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-
-    /* L stack: func [args] thread coroutines */
-
-    lua_pushvalue(L, -2);
-
-    /* L stack: func [args] thread coroutines thread */
-
-    co_ref = luaL_ref(L, -2);
-    lua_pop(L, 2);
-
-    /* L stack: func [args] */
-
-    nargs = lua_gettop(L);
-    if (nargs > 1) {
-        for (i = 2; i <= nargs; i++) {
-            lua_pushvalue(L, i);
-        }
-
-        /* L stack: func [args] [args] */
-
-        lua_xmove(L, co, nargs - 1);
-
-        /* L stack: func [args] */
-        /* co stack: func [args] */
-    }
-
-    p = ngx_alloc(sizeof(ngx_event_t) + sizeof(ngx_http_lua_timer_ctx_t),
-                  ngx_cycle->log);
-    if (p == NULL) {
-        goto nomem;
-    }
-
-    ev = (ngx_event_t *) p;
-
-    ngx_memzero(ev, sizeof(ngx_event_t));
-
-    p += sizeof(ngx_event_t);
-
-    tctx = (ngx_http_lua_timer_ctx_t *) p;
-
-    ngx_memcpy(tctx, old_tctx, sizeof(ngx_http_lua_timer_ctx_t));
-
-    tctx->co_ref = co_ref;
-    tctx->co = co;
-
-    tctx->pool = ngx_create_pool(128, ngx_cycle->log);
-    if (tctx->pool == NULL) {
-        goto nomem;
-    }
-
-    if (tctx->client_addr_text.len) {
-        tctx->client_addr_text.data = ngx_palloc(tctx->pool,
-                                                 tctx->client_addr_text.len);
-        if (tctx->client_addr_text.data == NULL) {
-            goto nomem;
-        }
-
-        ngx_memcpy(tctx->client_addr_text.data, old_tctx->client_addr_text.data,
-                   tctx->client_addr_text.len);
-    }
-
-    if (tctx->vm_state) {
-        tctx->vm_state->count++;
-    }
-
-    ev->handler = ngx_http_lua_timer_handler;
-    ev->data = tctx;
-    ev->log = ngx_cycle->log;
-
-    lmcf->pending_timers++;
-
-    ngx_add_timer(ev, tctx->delay);
-
-    return NGX_OK;
-
-nomem:
-
-    if (tctx && tctx->pool) {
-        ngx_destroy_pool(tctx->pool);
-    }
-
-    if (ev) {
-        ngx_free(ev);
-    }
-
-    /* L stack: func [args] */
-
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    luaL_unref(L, -1, co_ref);
-
-    /* L stack: func [args] coroutines */
-
-    lua_pop(L, 1);
-
-    return NGX_ERROR;
-}
-
-
-static void
-ngx_http_lua_timer_handler(ngx_event_t *ev)
-{
-    int                      n;
-    lua_State               *L;
-    ngx_int_t                rc;
-    ngx_connection_t        *c = NULL;
-    ngx_http_request_t      *r = NULL;
-    ngx_http_lua_ctx_t      *ctx;
-    ngx_http_cleanup_t      *cln;
-    ngx_pool_cleanup_t      *pcln;
-
-    ngx_http_lua_timer_ctx_t         tctx;
-    ngx_http_lua_main_conf_t        *lmcf;
-    ngx_http_core_loc_conf_t        *clcf;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua ngx.timer expired");
-
-    ngx_memcpy(&tctx, ev->data, sizeof(ngx_http_lua_timer_ctx_t));
-    ngx_free(ev);
-
-    lmcf = tctx.lmcf;
-
-    lmcf->pending_timers--;
-
-    if (!ngx_exiting && tctx.delay > 0) {
-        rc = ngx_http_lua_timer_copy(&tctx);
-        if (rc != NGX_OK) {
-            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                          "failed to create the next timer of delay %ud ms",
-                          (unsigned) tctx.delay);
-        }
-    }
-
-    if (lmcf->running_timers >= lmcf->max_running_timers) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "%i lua_max_running_timers are not enough",
-                      lmcf->max_running_timers);
-        goto failed;
-    }
-
-    c = ngx_http_lua_create_fake_connection(tctx.pool);
-    if (c == NULL) {
-        goto failed;
-    }
-
-    c->log->handler = ngx_http_lua_log_timer_error;
-    c->log->data = c;
-
-    c->listening = tctx.listening;
-    c->addr_text = tctx.client_addr_text;
-
-    r = ngx_http_lua_create_fake_request(c);
-    if (r == NULL) {
-        goto failed;
-    }
-
-    r->main_conf = tctx.main_conf;
-    r->srv_conf = tctx.srv_conf;
-    r->loc_conf = tctx.loc_conf;
-
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-#if defined(nginx_version) && nginx_version >= 1003014
-
-#   if nginx_version >= 1009000
-
-    ngx_set_connection_log(r->connection, clcf->error_log);
-
-#   else
-
-    ngx_http_set_connection_log(r->connection, clcf->error_log);
-
-#   endif
-
-#else
-
-    c->log->file = clcf->error_log->file;
-
-    if (!(c->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
-        c->log->log_level = clcf->error_log->log_level;
-    }
-
-#endif
-
-    dd("lmcf: %p", lmcf);
-
-    ctx = ngx_http_lua_create_ctx(r);
-    if (ctx == NULL) {
-        goto failed;
-    }
-
-    if (tctx.vm_state) {
-        ctx->vm_state = tctx.vm_state;
-
-        pcln = ngx_pool_cleanup_add(r->pool, 0);
-        if (pcln == NULL) {
-            goto failed;
-        }
-
-        pcln->handler = ngx_http_lua_cleanup_vm;
-        pcln->data = tctx.vm_state;
-    }
-
-    ctx->cur_co_ctx = &ctx->entry_co_ctx;
-
-    L = ngx_http_lua_get_lua_vm(r, ctx);
-
-    cln = ngx_http_cleanup_add(r, 0);
-    if (cln == NULL) {
-        goto failed;
-    }
-
-    cln->handler = ngx_http_lua_request_cleanup_handler;
-    cln->data = ctx;
-    ctx->cleanup = &cln->handler;
-
-    ctx->entered_content_phase = 1;
-    ctx->context = NGX_HTTP_LUA_CONTEXT_TIMER;
-
-    r->read_event_handler = ngx_http_block_reading;
-
-    ctx->cur_co_ctx->co_ref = tctx.co_ref;
-    ctx->cur_co_ctx->co = tctx.co;
-    ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_RUNNING;
-
-    dd("r connection: %p, log %p", r->connection, r->connection->log);
-
-    /*  save the request in coroutine globals table */
-    ngx_http_lua_set_req(tctx.co, r);
-
-    lmcf->running_timers++;
-
-    lua_pushboolean(tctx.co, tctx.premature);
-
-    n = lua_gettop(tctx.co);
-    if (n > 2) {
-        lua_insert(tctx.co, 2);
-    }
-
-#ifdef NGX_LUA_USE_ASSERT
-    ctx->cur_co_ctx->co_top = 1;
-#endif
-
-    rc = ngx_http_lua_run_thread(L, r, ctx, n - 1);
-
-    dd("timer lua run thread: %d", (int) rc);
-
-    if (rc == NGX_ERROR || rc >= NGX_OK) {
-        /* do nothing */
-
-    } else if (rc == NGX_AGAIN) {
-        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 0);
-
-    } else if (rc == NGX_DONE) {
-        rc = ngx_http_lua_content_run_posted_threads(L, r, ctx, 1);
-
-    } else {
-        rc = NGX_OK;
-    }
-
-    ngx_http_lua_finalize_request(r, rc);
-    return;
-
-failed:
-
-    if (tctx.co_ref && tctx.co) {
-        lua_pushlightuserdata(tctx.co, &ngx_http_lua_coroutines_key);
-        lua_rawget(tctx.co, LUA_REGISTRYINDEX);
-        luaL_unref(tctx.co, -1, tctx.co_ref);
-        lua_settop(tctx.co, 0);
-    }
-
-    if (tctx.vm_state) {
-        ngx_http_lua_cleanup_vm(tctx.vm_state);
-    }
-
-    if (c) {
-        ngx_http_lua_close_fake_connection(c);
-
-    } else if (tctx.pool) {
-        ngx_destroy_pool(tctx.pool);
-    }
-}
-
-
-static u_char *
-ngx_http_lua_log_timer_error(ngx_log_t *log, u_char *buf, size_t len)
-{
-    u_char              *p;
-    ngx_connection_t    *c;
-
-    if (log->action) {
-        p = ngx_snprintf(buf, len, " while %s", log->action);
-        len -= p - buf;
-        buf = p;
-    }
-
-    c = log->data;
-
-    dd("ctx = %p", c);
-
-    p = ngx_snprintf(buf, len, ", context: ngx.timer");
-    len -= p - buf;
-    buf = p;
-
-    if (c->addr_text.len) {
-        p = ngx_snprintf(buf, len, ", client: %V", &c->addr_text);
-        len -= p - buf;
-        buf = p;
-    }
-
-    if (c && c->listening && c->listening->addr_text.len) {
-        p = ngx_snprintf(buf, len, ", server: %V", &c->listening->addr_text);
-        /* len -= p - buf; */
-        buf = p;
-    }
-
-    return buf;
-}
-
-
-static void
-ngx_http_lua_abort_pending_timers(ngx_event_t *ev)
-{
-    ngx_int_t                    i, n;
-    ngx_event_t                **events;
-    ngx_connection_t            *c, *saved_c = NULL;
-    ngx_rbtree_node_t           *cur, *prev, *next, *sentinel, *temp;
-    ngx_http_lua_timer_ctx_t    *tctx;
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua abort pending timers");
-
-    c = ev->data;
-    lmcf = c->data;
-
-    dd("lua connection fd: %d", (int) c->fd);
-
-    if (!c->close) {
-        return;
-    }
-
-    c->read->closed = 1;
-    c->write->closed = 1;
-
-    /* we temporarily use a valid fd (0) to make ngx_free_connection happy */
-
-    c->fd = 0;
-
-    if (ngx_cycle->files) {
-        saved_c = ngx_cycle->files[0];
-    }
-
-    ngx_free_connection(c);
-
-    c->fd = (ngx_socket_t) -1;
-
-    if (ngx_cycle->files) {
-        ngx_cycle->files[0] = saved_c;
-    }
-
-    if (lmcf->pending_timers == 0) {
-        return;
-    }
-
-    /* expire pending timers immediately */
-
-    sentinel = ngx_event_timer_rbtree.sentinel;
-
-    cur = ngx_event_timer_rbtree.root;
-
-    /* XXX nginx does not guarantee the parent of root is meaningful,
-     * so we temporarily override it to simplify tree traversal. */
-    temp = cur->parent;
-    cur->parent = NULL;
-
-    prev = NULL;
-
-    events = ngx_pcalloc(ngx_cycle->pool,
-                         lmcf->pending_timers * sizeof(ngx_event_t));
-    if (events == NULL) {
-        return;
-    }
-
-    n = 0;
-
-    dd("root: %p, root parent: %p, sentinel: %p", cur, cur->parent, sentinel);
-
-    while (n < lmcf->pending_timers) {
-        if  (cur == sentinel || cur == NULL) {
-            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                          "lua pending timer counter got out of sync: %i",
-                          lmcf->pending_timers);
-            break;
-        }
-
-        dd("prev: %p, cur: %p, cur parent: %p, cur left: %p, cur right: %p",
-           prev, cur, cur->parent, cur->left, cur->right);
-
-        if (prev == cur->parent) {
-            /* neither of the children has been accessed yet */
-
-            next = cur->left;
-            if (next == sentinel) {
-                ev = (ngx_event_t *)
-                    ((char *) cur - offsetof(ngx_event_t, timer));
-
-                if (ev->handler == ngx_http_lua_timer_handler) {
-                    dd("found node: %p", cur);
-                    events[n++] = ev;
-                }
-
-                next = (cur->right != sentinel) ? cur->right : cur->parent;
-            }
-
-        } else if (prev == cur->left) {
-            /* just accessed the left child */
-
-            ev = (ngx_event_t *)
-                ((char *) cur - offsetof(ngx_event_t, timer));
-
-            if (ev->handler == ngx_http_lua_timer_handler) {
-                dd("found node 2: %p", cur);
-                events[n++] = ev;
-            }
-
-            next = (cur->right != sentinel) ? cur->right : cur->parent;
-
-        } else if (prev == cur->right) {
-            /* already accessed both children */
-            next = cur->parent;
-
-        } else {
-            /* not reacheable */
-            next = NULL;
-        }
-
-        prev = cur;
-        cur = next;
-    }
-
-    /* restore the old tree root's parent */
-    ngx_event_timer_rbtree.root->parent = temp;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                   "lua found %i pending timers to be aborted prematurely",
-                   n);
-
-    for (i = 0; i < n; i++) {
-        ev = events[i];
-
-        ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer);
-
-#if (NGX_DEBUG)
-        ev->timer.left = NULL;
-        ev->timer.right = NULL;
-        ev->timer.parent = NULL;
-#endif
-
-        ev->timer_set = 0;
-
-        ev->timedout = 1;
-
-        tctx = ev->data;
-        tctx->premature = 1;
-
-        dd("calling timer handler prematurely");
-        ev->handler(ev);
-    }
-
-#if 0
-    if (pending_timers) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
-                      "lua pending timer counter got out of sync: %i",
-                      pending_timers);
-    }
-#endif
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_timer.h b/debian/modules/http-lua/src/ngx_http_lua_timer.h
deleted file mode 100644
index 0addb18..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_timer.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_TIMER_H_INCLUDED_
-#define _NGX_HTTP_LUA_TIMER_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_timer_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_TIMER_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_uri.c b/debian/modules/http-lua/src/ngx_http_lua_uri.c
deleted file mode 100644
index 3559b5c..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_uri.c
+++ /dev/null
@@ -1,110 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_uri.h"
-#include "ngx_http_lua_util.h"
-
-
-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)
-{
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_set_uri);
-    lua_setfield(L, -2, "set_uri");
-}
-
-
-static int
-ngx_http_lua_ngx_req_set_uri(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    size_t                       len;
-    u_char                      *p;
-    int                          n;
-    int                          jump = 0;
-    ngx_http_lua_ctx_t          *ctx;
-
-    n = lua_gettop(L);
-
-    if (n != 1 && n != 2) {
-        return luaL_error(L, "expecting 1 or 2 arguments but seen %d", n);
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    p = (u_char *) luaL_checklstring(L, 1, &len);
-
-    if (len == 0) {
-        return luaL_error(L, "attempt to use zero-length uri");
-    }
-
-    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_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua set uri jump to \"%*s\"", len, p);
-
-            ngx_http_lua_check_if_abortable(L, ctx);
-        }
-    }
-
-    r->uri.data = ngx_palloc(r->pool, len);
-    if (r->uri.data == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    ngx_memcpy(r->uri.data, p, len);
-
-    r->uri.len = len;
-
-    r->internal = 1;
-    r->valid_unparsed_uri = 0;
-
-    ngx_http_set_exten(r);
-
-    if (jump) {
-        r->uri_changed = 1;
-
-        return lua_yield(L, 0);
-    }
-
-    r->valid_location = 0;
-    r->uri_changed = 0;
-
-    return 0;
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_uri.h b/debian/modules/http-lua/src/ngx_http_lua_uri.h
deleted file mode 100644
index 9c6e066..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_uri.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_URI_H_INCLUDED_
-#define _NGX_HTTP_LUA_URI_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_req_uri_api(ngx_log_t *log, lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_URI_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_uthread.c b/debian/modules/http-lua/src/ngx_http_lua_uthread.c
deleted file mode 100644
index 8195ec0..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_uthread.c
+++ /dev/null
@@ -1,285 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#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);
-static int ngx_http_lua_uthread_kill(lua_State *L);
-
-
-void
-ngx_http_lua_inject_uthread_api(ngx_log_t *log, lua_State *L)
-{
-    /* new thread table */
-    lua_createtable(L, 0 /* narr */, 3 /* nrec */);
-
-    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_pushcfunction(L, ngx_http_lua_uthread_kill);
-    lua_setfield(L, -2, "kill");
-
-    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);
-
-    r = ngx_http_lua_get_req(L);
-    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, "no 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);
-
-    dd("yielding with arg %s, top=%d, index-1:%s", luaL_typename(L, -1),
-       (int) lua_gettop(L), luaL_typename(L, 1));
-    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;
-
-    r = ngx_http_lua_get_req(L);
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
-
-    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");
-        }
-
-        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", (int) nrets,
-               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;
-
-        case NGX_HTTP_LUA_CO_DEAD:
-            dd("uthread already waited: %p (parent %p)", sub_coctx,
-               coctx);
-
-            if (i < nargs) {
-                /* just ignore it if it is not the last one */
-                continue;
-            }
-
-            /* being the last one */
-            lua_pushnil(L);
-            lua_pushliteral(L, "already waited or killed");
-            return 2;
-
-        default:
-            dd("uthread %p still alive, status: %d, parent %p", sub_coctx,
-               sub_coctx->co_status, coctx);
-            break;
-        }
-
-        ngx_http_lua_probe_user_thread_wait(L, sub_coctx->co);
-        sub_coctx->waited_by_parent = 1;
-    }
-
-    return lua_yield(L, 0);
-}
-
-
-static int
-ngx_http_lua_uthread_kill(lua_State *L)
-{
-    lua_State                   *sub_co;
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_lua_co_ctx_t       *coctx, *sub_coctx;
-
-    r = ngx_http_lua_get_req(L);
-    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
-                               | NGX_HTTP_LUA_CONTEXT_TIMER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT);
-
-    coctx = ctx->cur_co_ctx;
-
-    sub_co = lua_tothread(L, 1);
-    luaL_argcheck(L, sub_co, 1, "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");
-    }
-
-    if (!sub_coctx->is_uthread) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "not user thread");
-        return 2;
-    }
-
-    if (sub_coctx->parent_co_ctx != coctx) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "killer not parent");
-        return 2;
-    }
-
-    if (sub_coctx->pending_subreqs > 0) {
-        lua_pushnil(L);
-        lua_pushliteral(L, "pending subrequests");
-        return 2;
-    }
-
-    switch (sub_coctx->co_status) {
-    case NGX_HTTP_LUA_CO_ZOMBIE:
-        ngx_http_lua_del_thread(r, L, ctx, sub_coctx);
-        ctx->uthreads--;
-
-        lua_pushnil(L);
-        lua_pushliteral(L, "already terminated");
-        return 2;
-
-    case NGX_HTTP_LUA_CO_DEAD:
-        lua_pushnil(L);
-        lua_pushliteral(L, "already waited or killed");
-        return 2;
-
-    default:
-        ngx_http_lua_cleanup_pending_operation(sub_coctx);
-        ngx_http_lua_del_thread(r, L, ctx, sub_coctx);
-        ctx->uthreads--;
-
-        lua_pushinteger(L, 1);
-        return 1;
-    }
-
-    /* not reacheable */
-}
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_uthread.h b/debian/modules/http-lua/src/ngx_http_lua_uthread.h
deleted file mode 100644
index 9c3e2d4..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_uthread.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_UTHREAD_H_INCLUDED_
-#define _NGX_HTTP_LUA_UTHREAD_H_INCLUDED_
-
-
-#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_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.c b/debian/modules/http-lua/src/ngx_http_lua_util.c
deleted file mode 100644
index f7a537e..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_util.c
+++ /dev/null
@@ -1,4132 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#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"
-#include "ngx_http_lua_regex.h"
-#include "ngx_http_lua_args.h"
-#include "ngx_http_lua_uri.h"
-#include "ngx_http_lua_req_body.h"
-#include "ngx_http_lua_headers.h"
-#include "ngx_http_lua_output.h"
-#include "ngx_http_lua_time.h"
-#include "ngx_http_lua_control.h"
-#include "ngx_http_lua_ndk.h"
-#include "ngx_http_lua_subrequest.h"
-#include "ngx_http_lua_log.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_req_method.h"
-#include "ngx_http_lua_shdict.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"
-#include "ngx_http_lua_timer.h"
-#include "ngx_http_lua_config.h"
-#include "ngx_http_lua_worker.h"
-#include "ngx_http_lua_socket_tcp.h"
-#include "ngx_http_lua_ssl_certby.h"
-#include "ngx_http_lua_ssl.h"
-#include "ngx_http_lua_log_ringbuf.h"
-
-
-#if 1
-#undef ngx_http_lua_probe_info
-#define ngx_http_lua_probe_info(msg)
-#endif
-
-
-#ifndef NGX_HTTP_LUA_BT_DEPTH
-#define NGX_HTTP_LUA_BT_DEPTH  22
-#endif
-
-
-#ifndef NGX_HTTP_LUA_BT_MAX_COROS
-#define NGX_HTTP_LUA_BT_MAX_COROS  5
-#endif
-
-
-char ngx_http_lua_code_cache_key;
-char ngx_http_lua_regex_cache_key;
-char ngx_http_lua_socket_pool_key;
-char ngx_http_lua_coroutines_key;
-char ngx_http_lua_headers_metatable_key;
-
-
-ngx_uint_t  ngx_http_lua_location_hash = 0;
-ngx_uint_t  ngx_http_lua_content_length_hash = 0;
-
-
-static ngx_int_t ngx_http_lua_send_http10_headers(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx);
-static void ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log);
-static void ngx_http_lua_init_globals(lua_State *L, ngx_cycle_t *cycle,
-    ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log);
-static void ngx_http_lua_set_path(ngx_cycle_t *cycle, lua_State *L, int tab_idx,
-    const char *fieldname, const char *path, const char *default_path,
-    ngx_log_t *log);
-static ngx_int_t ngx_http_lua_handle_exec(lua_State *L, ngx_http_request_t *r,
-    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);
-static ngx_int_t ngx_http_lua_handle_rewrite_jump(lua_State *L,
-    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(lua_State *L,
-    ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log);
-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 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_threads(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, lua_State *L);
-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);
-static void ngx_http_lua_close_fake_request(ngx_http_request_t *r);
-static ngx_int_t ngx_http_lua_flush_pending_output(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx);
-static ngx_int_t
-    ngx_http_lua_process_flushing_coroutines(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx);
-static lua_State *ngx_http_lua_new_state(lua_State *parent_vm,
-    ngx_cycle_t *cycle, ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log);
-static int ngx_http_lua_get_raw_phase_context(lua_State *L);
-
-
-#ifndef LUA_PATH_SEP
-#define LUA_PATH_SEP ";"
-#endif
-
-#define AUX_MARK "\1"
-
-
-static void
-ngx_http_lua_set_path(ngx_cycle_t *cycle, lua_State *L, int tab_idx,
-    const char *fieldname, const char *path, const char *default_path,
-    ngx_log_t *log)
-{
-    const char          *tmp_path;
-    const char          *prefix;
-
-    /* XXX here we use some hack to simplify string manipulation */
-    tmp_path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP,
-                         LUA_PATH_SEP AUX_MARK LUA_PATH_SEP);
-
-    lua_pushlstring(L, (char *) cycle->prefix.data, cycle->prefix.len);
-    prefix = lua_tostring(L, -1);
-    tmp_path = luaL_gsub(L, tmp_path, "$prefix", prefix);
-    tmp_path = luaL_gsub(L, tmp_path, "${prefix}", prefix);
-    lua_pop(L, 3);
-
-    dd("tmp_path path: %s", tmp_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, log, 0,
-                   "lua setting lua package.%s to \"%s\"", fieldname, tmp_path);
-#endif
-
-    lua_remove(L, -2);
-
-    /* fix negative index as there's new data on stack */
-    tab_idx = (tab_idx < 0) ? (tab_idx - 1) : tab_idx;
-    lua_setfield(L, tab_idx, fieldname);
-}
-
-
-/**
- * Create new table and set _G field to itself.
- *
- * After:
- *         | new table | <- top
- *         |    ...    |
- * */
-void
-ngx_http_lua_create_new_globals_table(lua_State *L, int narr, int nrec)
-{
-    lua_createtable(L, narr, nrec + 1);
-    lua_pushvalue(L, -1);
-    lua_setfield(L, -2, "_G");
-}
-
-
-static lua_State *
-ngx_http_lua_new_state(lua_State *parent_vm, ngx_cycle_t *cycle,
-    ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log)
-{
-    lua_State       *L;
-    const char      *old_path;
-    const char      *new_path;
-    size_t           old_path_len;
-    const char      *old_cpath;
-    const char      *new_cpath;
-    size_t           old_cpath_len;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "lua creating new vm state");
-
-    L = luaL_newstate();
-    if (L == NULL) {
-        return NULL;
-    }
-
-    luaL_openlibs(L);
-
-    lua_getglobal(L, "package");
-
-    if (!lua_istable(L, -1)) {
-        ngx_log_error(NGX_LOG_EMERG, log, 0,
-                      "the \"package\" table does not exist");
-        return NULL;
-    }
-
-    if (parent_vm) {
-        lua_getglobal(parent_vm, "package");
-        lua_getfield(parent_vm, -1, "path");
-        old_path = lua_tolstring(parent_vm, -1, &old_path_len);
-        lua_pop(parent_vm, 1);
-
-        lua_pushlstring(L, old_path, old_path_len);
-        lua_setfield(L, -2, "path");
-
-        lua_getfield(parent_vm, -1, "cpath");
-        old_path = lua_tolstring(parent_vm, -1, &old_path_len);
-        lua_pop(parent_vm, 2);
-
-        lua_pushlstring(L, old_path, old_path_len);
-        lua_setfield(L, -2, "cpath");
-
-    } else {
-#ifdef LUA_DEFAULT_PATH
-#   define LUA_DEFAULT_PATH_LEN (sizeof(LUA_DEFAULT_PATH) - 1)
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                       "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 */
-        old_path = lua_tolstring(L, -1, &old_path_len);
-        lua_concat(L, 2); /* package new */
-        lua_setfield(L, -2, "path"); /* package */
-#endif
-
-#ifdef LUA_DEFAULT_CPATH
-#   define LUA_DEFAULT_CPATH_LEN (sizeof(LUA_DEFAULT_CPATH) - 1)
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                       "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 */
-        old_cpath = lua_tolstring(L, -1, &old_cpath_len);
-        lua_concat(L, 2); /* package new */
-        lua_setfield(L, -2, "cpath"); /* package */
-#endif
-
-        if (lmcf->lua_path.len != 0) {
-            lua_getfield(L, -1, "path"); /* get original package.path */
-            old_path = lua_tolstring(L, -1, &old_path_len);
-
-            dd("old path: %s", old_path);
-
-            lua_pushlstring(L, (char *) lmcf->lua_path.data,
-                            lmcf->lua_path.len);
-            new_path = lua_tostring(L, -1);
-
-            ngx_http_lua_set_path(cycle, L, -3, "path", new_path, old_path,
-                                  log);
-
-            lua_pop(L, 2);
-        }
-
-        if (lmcf->lua_cpath.len != 0) {
-            lua_getfield(L, -1, "cpath"); /* get original package.cpath */
-            old_cpath = lua_tolstring(L, -1, &old_cpath_len);
-
-            dd("old cpath: %s", old_cpath);
-
-            lua_pushlstring(L, (char *) lmcf->lua_cpath.data,
-                            lmcf->lua_cpath.len);
-            new_cpath = lua_tostring(L, -1);
-
-            ngx_http_lua_set_path(cycle, L, -3, "cpath", new_cpath, old_cpath,
-                                  log);
-
-
-            lua_pop(L, 2);
-        }
-    }
-
-    lua_pop(L, 1); /* remove the "package" table */
-
-    ngx_http_lua_init_registry(L, log);
-    ngx_http_lua_init_globals(L, cycle, lmcf, log);
-
-    return L;
-}
-
-
-lua_State *
-ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *L, int *ref)
-{
-    int              base;
-    lua_State       *co;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua creating new thread");
-
-    base = lua_gettop(L);
-
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-
-    co = lua_newthread(L);
-
-    /*  {{{ 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_globals_table(co, 0, 0);
-
-    lua_createtable(co, 0, 1);
-    ngx_http_lua_get_globals_table(co);
-    lua_setfield(co, -2, "__index");
-    lua_setmetatable(co, -2);
-
-    ngx_http_lua_set_globals_table(co);
-    /*  }}} */
-
-    *ref = luaL_ref(L, -2);
-
-    if (*ref == LUA_NOREF) {
-        lua_settop(L, base);  /* restore main thread stack */
-        return NULL;
-    }
-
-    lua_settop(L, base);
-    return co;
-}
-
-
-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)
-{
-    if (coctx->co_ref == LUA_NOREF) {
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua deleting light thread");
-
-    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;
-
-    lua_pop(L, 1);
-}
-
-
-u_char *
-ngx_http_lua_rebase_path(ngx_pool_t *pool, u_char *src, size_t len)
-{
-    u_char     *p;
-    ngx_str_t   dst;
-
-    dst.data = ngx_palloc(pool, len + 1);
-    if (dst.data == NULL) {
-        return NULL;
-    }
-
-    dst.len = len;
-
-    p = ngx_copy(dst.data, src, len);
-    *p = '\0';
-
-    if (ngx_get_full_name(pool, (ngx_str_t *) &ngx_cycle->prefix, &dst)
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-    return dst.data;
-}
-
-
-ngx_int_t
-ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx)
-{
-    ngx_int_t            rc;
-
-    dd("send header if needed: %d", r->header_sent || ctx->header_sent);
-
-    if (!r->header_sent && !ctx->header_sent) {
-        if (r->headers_out.status == 0) {
-            r->headers_out.status = NGX_HTTP_OK;
-        }
-
-        if (!ctx->headers_set && ngx_http_lua_set_content_type(r) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        if (!ctx->headers_set) {
-            ngx_http_clear_content_length(r);
-            ngx_http_clear_accept_ranges(r);
-        }
-
-        if (!ctx->buffering) {
-            dd("sending headers");
-            rc = ngx_http_send_header(r);
-            ctx->header_sent = 1;
-            return rc;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-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_int_t                     rc;
-    ngx_chain_t                  *cl;
-    ngx_chain_t                 **ll;
-    ngx_http_lua_loc_conf_t      *llcf;
-
-#if 1
-    if (ctx->acquired_raw_req_socket || ctx->eof) {
-        dd("ctx->eof already set or raw req socket already acquired");
-        return NGX_OK;
-    }
-#endif
-
-    if ((r->method & NGX_HTTP_HEAD) && !r->header_only) {
-        r->header_only = 1;
-    }
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-
-    if (llcf->http10_buffering
-        && !ctx->buffering
-        && !r->header_sent
-        && !ctx->header_sent
-        && r->http_version < NGX_HTTP_VERSION_11
-        && r->headers_out.content_length_n < 0)
-    {
-        ctx->buffering = 1;
-    }
-
-    rc = ngx_http_lua_send_header_if_needed(r, ctx);
-
-    if (rc == NGX_ERROR || rc > NGX_OK) {
-        return rc;
-    }
-
-    if (r->header_only) {
-        ctx->eof = 1;
-
-        if (ctx->buffering) {
-            return ngx_http_lua_send_http10_headers(r, ctx);
-        }
-
-        return rc;
-    }
-
-    if (in == NULL) {
-        dd("last buf to be sent");
-
-#if 1
-        if (!r->request_body && r == r->main) {
-            if (ngx_http_discard_request_body(r) != NGX_OK) {
-                return NGX_ERROR;
-            }
-        }
-#endif
-
-        if (ctx->buffering) {
-            rc = ngx_http_lua_send_http10_headers(r, ctx);
-            if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-                return rc;
-            }
-
-            if (ctx->out) {
-
-                rc = ngx_http_lua_output_filter(r, ctx->out);
-
-                if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-                    return rc;
-                }
-
-                ctx->out = NULL;
-            }
-        }
-
-#if defined(nginx_version) && nginx_version <= 8004
-
-        /* earlier versions of nginx does not allow subrequests
-           to send last_buf themselves */
-        if (r != r->main) {
-            return NGX_OK;
-        }
-
-#endif
-
-        ctx->eof = 1;
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua sending last buf of the response body");
-
-        rc = ngx_http_lua_send_special(r, NGX_HTTP_LAST);
-
-        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-            return rc;
-        }
-
-        return NGX_OK;
-    }
-
-    /* in != NULL */
-
-    if (ctx->buffering) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua buffering output bufs for the HTTP 1.0 request");
-
-        for (cl = ctx->out, ll = &ctx->out; cl; cl = cl->next) {
-            ll = &cl->next;
-        }
-
-        *ll = in;
-
-        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_lua_ctx_t  *ctx;
-    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;
-    }
-
-    rc = ngx_http_output_filter(r, in);
-
-    if (rc == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, 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, &in,
-                            (ngx_buf_tag_t) &ngx_http_lua_module);
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_http_lua_send_http10_headers(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx)
-{
-    off_t                size;
-    ngx_chain_t         *cl;
-    ngx_int_t            rc;
-
-    if (r->header_sent || ctx->header_sent) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua sending HTTP 1.0 response headers");
-
-    if (r->header_only) {
-        goto send;
-    }
-
-    if (r->headers_out.content_length == NULL) {
-        for (size = 0, cl = ctx->out; cl; cl = cl->next) {
-            size += ngx_buf_size(cl->buf);
-        }
-
-        r->headers_out.content_length_n = size;
-
-        if (r->headers_out.content_length) {
-            r->headers_out.content_length->hash = 0;
-        }
-    }
-
-send:
-
-    rc = ngx_http_send_header(r);
-    ctx->header_sent = 1;
-    return rc;
-}
-
-
-static void
-ngx_http_lua_init_registry(lua_State *L, ngx_log_t *log)
-{
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "lua initializing lua registry");
-
-    /* {{{ register a table to anchor lua coroutines reliably:
-     * {([int]ref) = [cort]} */
-    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
-    lua_createtable(L, 0, 32 /* nrec */);
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-
-    /* create the registry entry for the Lua request ctx data table */
-    lua_pushliteral(L, ngx_http_lua_ctx_tables_key);
-    lua_createtable(L, 0, 32 /* nrec */);
-    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_createtable(L, 0, 8 /* nrec */);
-    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_createtable(L, 0, 16 /* nrec */);
-    lua_rawset(L, LUA_REGISTRYINDEX);
-#endif
-
-    /* {{{ register table to cache user code:
-     * { [(string)cache_key] = <code closure> } */
-    lua_pushlightuserdata(L, &ngx_http_lua_code_cache_key);
-    lua_createtable(L, 0, 8 /* nrec */);
-    lua_rawset(L, LUA_REGISTRYINDEX);
-    /* }}} */
-}
-
-
-static void
-ngx_http_lua_init_globals(lua_State *L, ngx_cycle_t *cycle,
-    ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log)
-{
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "lua initializing lua globals");
-
-    lua_pushlightuserdata(L, cycle);
-    lua_setglobal(L, "__ngx_cycle");
-
-#if defined(NDK) && NDK
-    ngx_http_lua_inject_ndk_api(L);
-#endif /* defined(NDK) && NDK */
-
-    ngx_http_lua_inject_ngx_api(L, lmcf, log);
-}
-
-
-static void
-ngx_http_lua_inject_ngx_api(lua_State *L, ngx_http_lua_main_conf_t *lmcf,
-    ngx_log_t *log)
-{
-    lua_createtable(L, 0 /* narr */, 117 /* nrec */);    /* ngx.* */
-
-    lua_pushcfunction(L, ngx_http_lua_get_raw_phase_context);
-    lua_setfield(L, -2, "_phase_ctx");
-
-    ngx_http_lua_inject_arg_api(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_output_api(L);
-    ngx_http_lua_inject_time_api(L);
-    ngx_http_lua_inject_string_api(L);
-    ngx_http_lua_inject_control_api(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(log, L);
-    ngx_http_lua_inject_resp_header_api(L);
-    ngx_http_lua_create_headers_metatable(log, L);
-    ngx_http_lua_inject_variable_api(L);
-    ngx_http_lua_inject_shdict_api(lmcf, L);
-    ngx_http_lua_inject_socket_tcp_api(log, L);
-    ngx_http_lua_inject_socket_udp_api(log, L);
-    ngx_http_lua_inject_uthread_api(log, L);
-    ngx_http_lua_inject_timer_api(L);
-    ngx_http_lua_inject_config_api(L);
-    ngx_http_lua_inject_worker_api(L);
-
-    ngx_http_lua_inject_misc_api(L);
-
-    lua_getglobal(L, "package"); /* ngx package */
-    lua_getfield(L, -1, "loaded"); /* ngx package loaded */
-    lua_pushvalue(L, -3); /* ngx package loaded ngx */
-    lua_setfield(L, -2, "ngx"); /* ngx package loaded */
-    lua_pop(L, 2);
-
-    lua_setglobal(L, "ngx");
-
-    ngx_http_lua_inject_coroutine_api(log, L);
-}
-
-
-void
-ngx_http_lua_discard_bufs(ngx_pool_t *pool, ngx_chain_t *in)
-{
-    ngx_chain_t         *cl;
-
-    for (cl = in; cl; cl = cl->next) {
-        cl->buf->pos = cl->buf->last;
-        cl->buf->file_pos = cl->buf->file_last;
-    }
-}
-
-
-ngx_int_t
-ngx_http_lua_add_copy_chain(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
-    ngx_chain_t ***plast, ngx_chain_t *in, ngx_int_t *eof)
-{
-    ngx_chain_t     *cl;
-    size_t           len;
-    ngx_buf_t       *b;
-
-    len = 0;
-    *eof = 0;
-
-    for (cl = in; cl; cl = cl->next) {
-        if (ngx_buf_in_memory(cl->buf)) {
-            len += cl->buf->last - cl->buf->pos;
-        }
-
-        if (cl->buf->last_in_chain || cl->buf->last_buf) {
-            *eof = 1;
-        }
-    }
-
-    if (len == 0) {
-        return NGX_OK;
-    }
-
-    cl = ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                         &ctx->free_bufs, len);
-    if (cl == NULL) {
-        return NGX_ERROR;
-    }
-
-    dd("chains get free buf: %d == %d", (int) (cl->buf->end - cl->buf->start),
-       (int) len);
-
-    b = cl->buf;
-
-    while (in) {
-        if (ngx_buf_in_memory(in->buf)) {
-            b->last = ngx_copy(b->last, in->buf->pos,
-                               in->buf->last - in->buf->pos);
-        }
-
-        in = in->next;
-    }
-
-    **plast = cl;
-    *plast = &cl->next;
-
-    return NGX_OK;
-}
-
-
-void
-ngx_http_lua_reset_ctx(ngx_http_request_t *r, lua_State *L,
-    ngx_http_lua_ctx_t *ctx)
-{
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua reset ctx");
-
-    ngx_http_lua_finalize_threads(r, ctx, L);
-
-#if 0
-    if (ctx->user_co_ctx) {
-        /* no way to destroy a list but clean up the whole pool */
-        ctx->user_co_ctx = NULL;
-    }
-#endif
-
-    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;
-    ctx->entered_content_phase = 0;
-
-    ctx->exit_code = 0;
-    ctx->exited = 0;
-    ctx->resume_handler = ngx_http_lua_wev_handler;
-
-    ngx_str_null(&ctx->exec_uri);
-    ngx_str_null(&ctx->exec_args);
-
-    ctx->co_op = 0;
-}
-
-
-/* post read callback for rewrite and access phases */
-void
-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");
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-    ctx->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;
-        ngx_http_core_run_phases(r);
-    }
-}
-
-
-void
-ngx_http_lua_request_cleanup_handler(void *data)
-{
-    ngx_http_lua_ctx_t          *ctx = data;
-
-    ngx_http_lua_request_cleanup(ctx, 0 /* forcible */);
-}
-
-
-void
-ngx_http_lua_request_cleanup(ngx_http_lua_ctx_t *ctx, int forcible)
-{
-    lua_State                   *L;
-    ngx_http_request_t          *r;
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    /*  force coroutine handling the request quit */
-    if (ctx == NULL) {
-        dd("ctx is NULL");
-        return;
-    }
-
-    r = ctx->request;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua request cleanup: forcible=%d", forcible);
-
-    if (ctx->cleanup) {
-        *ctx->cleanup = NULL;
-        ctx->cleanup = NULL;
-    }
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-#if 1
-    if (r->connection->fd == (ngx_socket_t) -1) {
-        /* being a fake request */
-
-        if (ctx->context == NGX_HTTP_LUA_CONTEXT_TIMER) {
-            /* being a timer handler */
-            lmcf->running_timers--;
-        }
-    }
-#endif
-
-    L = ngx_http_lua_get_lua_vm(r, ctx);
-
-    ngx_http_lua_finalize_threads(r, ctx, L);
-}
-
-
-/*
- * 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, volatile int nrets)
-{
-    ngx_http_lua_co_ctx_t   *next_coctx, *parent_coctx, *orig_coctx;
-    int                      rv, 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 = NULL;
-#endif
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua run thread, top:%d c:%ud", lua_gettop(L),
-                   r->main->count);
-
-    /* set Lua VM panic handler */
-    lua_atpanic(L, ngx_http_lua_atpanic);
-
-    dd("ctx = %p", ctx);
-
-    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;
-        }
-
-        for ( ;; ) {
-
-            dd("calling lua_resume: vm %p, nret %d", ctx->cur_co_ctx->co,
-               (int) nrets);
-
-#if (NGX_PCRE)
-            /* XXX: work-around to nginx regex subsystem */
-            old_pool = ngx_http_lua_pcre_malloc_init(r->pool);
-#endif
-
-            /*  run code */
-            dd("ctx: %p", ctx);
-            dd("cur co: %p", ctx->cur_co_ctx->co);
-            dd("cur co status: %d", ctx->cur_co_ctx->co_status);
-
-            orig_coctx = ctx->cur_co_ctx;
-
-#ifdef NGX_LUA_USE_ASSERT
-            dd("%p: saved co top: %d, nrets: %d, true top: %d",
-               orig_coctx->co,
-               (int) orig_coctx->co_top, (int) nrets,
-               (int) lua_gettop(orig_coctx->co));
-#endif
-
-#if DDEBUG
-            if (lua_gettop(orig_coctx->co) > 0) {
-                dd("top elem: %s", luaL_typename(orig_coctx->co, -1));
-            }
-#endif
-
-            ngx_http_lua_assert(orig_coctx->co_top + nrets
-                                == lua_gettop(orig_coctx->co));
-
-            rv = lua_resume(orig_coctx->co, nrets);
-
-#if (NGX_PCRE)
-            /* 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);
-            }
-#endif
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua resume returned %d", 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");
-
-#ifdef NGX_LUA_USE_ASSERT
-                dd("%p: saving curr top after yield: %d (co-op: %d)",
-                   orig_coctx->co,
-                   (int) lua_gettop(orig_coctx->co), (int) ctx->co_op);
-                orig_coctx->co_top = lua_gettop(orig_coctx->co);
-#endif
-
-                if (r->uri_changed) {
-                    return ngx_http_lua_handle_rewrite_jump(L, r, ctx);
-                }
-
-                if (ctx->exited) {
-                    return ngx_http_lua_handle_exit(L, r, ctx);
-                }
-
-                if (ctx->exec_uri.len) {
-                    return ngx_http_lua_handle_exec(L, r, ctx);
-                }
-
-                /*
-                 * 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");
-
-                    ngx_http_lua_assert(lua_gettop(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);
-
-#ifdef NGX_LUA_USE_ASSERT
-                    /* ignore the return value (the thread) already pushed */
-                    orig_coctx->co_top--;
-#endif
-
-                    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) {
-                        dd("moving %d return values to parent", nrets);
-                        lua_xmove(old_co, ctx->cur_co_ctx->co, nrets);
-
-#ifdef NGX_LUA_USE_ASSERT
-                        ctx->cur_co_ctx->parent_co_ctx->co_top -= nrets;
-#endif
-                    }
-
-                    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);
-
-                        /* discard any return values from user
-                         * coroutine.yield()'s arguments */
-                        lua_settop(ctx->cur_co_ctx->co, 0);
-
-#ifdef NGX_LUA_USE_ASSERT
-                        ctx->cur_co_ctx->co_top = 0;
-#endif
-
-                        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) {
-                        dd("moving %d return values to next co", nrets);
-                        lua_xmove(ctx->cur_co_ctx->co, next_co, nrets);
-#ifdef NGX_LUA_USE_ASSERT
-                        ctx->cur_co_ctx->co_top -= nrets;
-#endif
-                    }
-
-                    nrets++;  /* add the true boolean value */
-
-                    ctx->cur_co_ctx = next_coctx;
-
-                    break;
-                }
-
-                /* try resuming on the new coroutine again */
-                continue;
-
-            case 0:
-
-                ngx_http_lua_cleanup_pending_operation(ctx->cur_co_ctx);
-
-                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 (ctx->cur_co_ctx->zombie_child_threads) {
-                    ngx_http_lua_cleanup_zombie_child_uthreads(r, L, ctx,
-                                                               ctx->cur_co_ctx);
-                }
-
-                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";
-                break;
-
-            case LUA_ERRSYNTAX:
-                err = "syntax error";
-                break;
-
-            case LUA_ERRMEM:
-                err = "memory allocation error";
-                ngx_quit = 1;
-                break;
-
-            case LUA_ERRERR:
-                err = "error handler error";
-                break;
-
-            default:
-                err = "unknown error";
-                break;
-            }
-
-            if (ctx->cur_co_ctx != orig_coctx) {
-                ctx->cur_co_ctx = orig_coctx;
-            }
-
-            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_cleanup_pending_operation(ctx->cur_co_ctx);
-
-            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(ctx, 0);
-
-                dd("headers sent? %d", r->header_sent || ctx->header_sent);
-
-                if (ctx->no_abort) {
-                    ctx->no_abort = 0;
-                    return NGX_ERROR;
-                }
-
-                return (r->header_sent || ctx->header_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;
-        }
-
-    } NGX_LUA_EXCEPTION_CATCH {
-        dd("nginx execution restored");
-    }
-
-    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(ctx, 0);
-
-    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "lua handler aborted: "
-                  "user coroutine has no parent");
-
-    return (r->header_sent || ctx->header_sent) ?
-                NGX_ERROR : NGX_HTTP_INTERNAL_SERVER_ERROR;
-
-done:
-
-    if (ctx->entered_content_phase
-        && r->connection->fd != (ngx_socket_t) -1)
-    {
-        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;
-}
-
-
-ngx_int_t
-ngx_http_lua_wev_handler(ngx_http_request_t *r)
-{
-    ngx_int_t                    rc;
-    ngx_event_t                 *wev;
-    ngx_connection_t            *c;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_core_loc_conf_t    *clcf;
-
-    ngx_http_lua_socket_tcp_upstream_t *u;
-
-    c = r->connection;
-    wev = c->write;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "lua run write event handler: timedout:%ud, ready:%ud, "
-                   "writing_raw_req_socket:%ud",
-                   wev->timedout, wev->ready, ctx->writing_raw_req_socket);
-
-    clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
-
-    if (wev->timedout && !ctx->writing_raw_req_socket) {
-        if (!wev->delayed) {
-            ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
-                          "client timed out");
-            c->timedout = 1;
-
-            goto flush_coros;
-        }
-
-        wev->timedout = 0;
-        wev->delayed = 0;
-
-        if (!wev->ready) {
-            ngx_add_timer(wev, clcf->send_timeout);
-
-            if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-                if (ctx->entered_content_phase) {
-                    ngx_http_lua_finalize_request(r, NGX_ERROR);
-                }
-                return NGX_ERROR;
-            }
-        }
-    }
-
-    if (!wev->ready && !wev->timedout) {
-        goto useless;
-    }
-
-    if (ctx->writing_raw_req_socket) {
-        ctx->writing_raw_req_socket = 0;
-
-        u = ctx->downstream;
-        if (u == NULL) {
-            return NGX_ERROR;
-        }
-
-        u->write_event_handler(r, u);
-        return NGX_DONE;
-    }
-
-    if (c->buffered & NGX_HTTP_LOWLEVEL_BUFFERED) {
-        rc = ngx_http_lua_flush_pending_output(r, ctx);
-
-        dd("flush pending output returned %d, c->error: %d", (int) rc,
-           c->error);
-
-        if (rc != NGX_ERROR && rc != NGX_OK) {
-            goto useless;
-        }
-
-        /* when rc == NGX_ERROR, c->error must be set */
-    }
-
-flush_coros:
-
-    dd("ctx->flushing_coros: %d", (int) ctx->flushing_coros);
-
-    if (ctx->flushing_coros) {
-        return ngx_http_lua_process_flushing_coroutines(r, ctx);
-    }
-
-    /* ctx->flushing_coros == 0 */
-
-useless:
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "useless lua write event handler");
-
-    if (ctx->entered_content_phase) {
-        return NGX_OK;
-    }
-
-    return NGX_DONE;
-}
-
-
-static ngx_int_t
-ngx_http_lua_process_flushing_coroutines(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx)
-{
-    ngx_int_t                    rc, n;
-    ngx_uint_t                   i;
-    ngx_list_part_t             *part;
-    ngx_http_lua_co_ctx_t       *coctx;
-
-    dd("processing flushing coroutines");
-
-    coctx = &ctx->entry_co_ctx;
-    n = ctx->flushing_coros;
-
-    if (coctx->flushing) {
-        coctx->flushing = 0;
-
-        ctx->flushing_coros--;
-        n--;
-        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 (n) {
-
-        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->flushing_coros--;
-                n--;
-                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 (n == 0) {
-                    return NGX_DONE;
-                }
-            }
-        }
-    }
-
-    if (n) {
-        return NGX_ERROR;
-    }
-
-    return NGX_DONE;
-}
-
-
-static ngx_int_t
-ngx_http_lua_flush_pending_output(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx)
-{
-    ngx_int_t           rc;
-    ngx_chain_t        *cl;
-    ngx_event_t        *wev;
-    ngx_connection_t   *c;
-
-    ngx_http_core_loc_conf_t    *clcf;
-
-    c = r->connection;
-    wev = c->write;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "lua flushing output: buffered 0x%uxd",
-                   c->buffered);
-
-    if (ctx->busy_bufs) {
-        /* FIXME since cosockets also share this busy_bufs chain, this condition
-         * might not be strong enough. better use separate busy_bufs chains. */
-        rc = ngx_http_lua_output_filter(r, NULL);
-
-    } else {
-        cl = ngx_http_lua_get_flush_chain(r, ctx);
-        if (cl == NULL) {
-            return NGX_ERROR;
-        }
-
-        rc = ngx_http_lua_output_filter(r, cl);
-    }
-
-    dd("output filter returned %d", (int) rc);
-
-    if (rc == NGX_ERROR || rc > NGX_OK) {
-        return rc;
-    }
-
-    if (c->buffered & NGX_HTTP_LOWLEVEL_BUFFERED) {
-
-        clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
-
-        if (!wev->delayed) {
-            ngx_add_timer(wev, clcf->send_timeout);
-        }
-
-        if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-            if (ctx->entered_content_phase) {
-                ngx_http_lua_finalize_request(r, NGX_ERROR);
-            }
-
-            return NGX_ERROR;
-        }
-
-        if (ctx->flushing_coros) {
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                           "lua flush still waiting: buffered 0x%uxd",
-                           c->buffered);
-
-            return NGX_DONE;
-        }
-
-    } else {
-#if 1
-        if (wev->timer_set && !wev->delayed) {
-            ngx_del_timer(wev);
-        }
-#endif
-    }
-
-    return NGX_OK;
-}
-
-
-u_char *
-ngx_http_lua_digest_hex(u_char *dest, const u_char *buf, int buf_len)
-{
-    ngx_md5_t                     md5;
-    u_char                        md5_buf[MD5_DIGEST_LENGTH];
-
-    ngx_md5_init(&md5);
-    ngx_md5_update(&md5, buf, buf_len);
-    ngx_md5_final(md5_buf, &md5);
-
-    return ngx_hex_dump(dest, md5_buf, sizeof(md5_buf));
-}
-
-
-void
-ngx_http_lua_set_multi_value_table(lua_State *L, int index)
-{
-    if (index < 0) {
-        index = lua_gettop(L) + index + 1;
-    }
-
-    lua_pushvalue(L, -2); /* stack: table key value key */
-    lua_rawget(L, index);
-    if (lua_isnil(L, -1)) {
-        lua_pop(L, 1); /* stack: table key value */
-        lua_rawset(L, index); /* stack: table */
-
-    } else {
-        if (!lua_istable(L, -1)) {
-            /* just inserted one value */
-            lua_createtable(L, 4, 0);
-                /* stack: table key value value table */
-            lua_insert(L, -2);
-                /* stack: table key value table value */
-            lua_rawseti(L, -2, 1);
-                /* stack: table key value table */
-            lua_insert(L, -2);
-                /* stack: table key table value */
-
-            lua_rawseti(L, -2, 2); /* stack: table key table */
-
-            lua_rawset(L, index); /* stack: table */
-
-        } else {
-            /* stack: table key value table */
-            lua_insert(L, -2); /* stack: table key table value */
-
-            lua_rawseti(L, -2, lua_objlen(L, -2) + 1);
-                /* stack: table key table  */
-            lua_pop(L, 2); /* stack: table */
-        }
-    }
-}
-
-
-uintptr_t
-ngx_http_lua_escape_uri(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
-{
-    ngx_uint_t      n;
-    uint32_t       *escape;
-    static u_char   hex[] = "0123456789ABCDEF";
-
-                    /* " ", "#", "%", "?", %00-%1F, %7F-%FF */
-
-    static uint32_t   uri[] = {
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-
-                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0xfc00886d, /* 1111 1100 0000 0000  1000 1000 0110 1101 */
-
-                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x78000000, /* 0111 1000 0000 0000  0000 0000 0000 0000 */
-
-                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0xa8000000, /* 1010 1000 0000 0000  0000 0000 0000 0000 */
-
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-    };
-
-                    /* " ", "#", "%", "+", "?", %00-%1F, %7F-%FF */
-
-    static uint32_t   args[] = {
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-
-                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0x80000829, /* 1000 0000 0000 0000  0000 1000 0010 1001 */
-
-                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
-
-                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
-
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-    };
-
-                    /* not ALPHA, DIGIT, "-", ".", "_", "~" */
-
-    static uint32_t   uri_component[] = {
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-
-                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0xfc00987d, /* 1111 1100 0000 0000  1001 1000 0111 1101 */
-
-                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x78000001, /* 0111 1000 0000 0000  0000 0000 0000 0001 */
-
-                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0xb8000001, /* 1011 1000 0000 0000  0000 0000 0000 0001 */
-
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-    };
-
-                    /* " ", "#", """, "%", "'", %00-%1F, %7F-%FF */
-
-    static uint32_t   html[] = {
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-
-                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0x000000ad, /* 0000 0000 0000 0000  0000 0000 1010 1101 */
-
-                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
-
-                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
-
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-    };
-
-                    /* " ", """, "%", "'", %00-%1F, %7F-%FF */
-
-    static uint32_t   refresh[] = {
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-
-                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0x00000085, /* 0000 0000 0000 0000  0000 0000 1000 0101 */
-
-                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
-
-                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
-
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-    };
-
-                    /* " ", "%", %00-%1F */
-
-    static uint32_t   memcached[] = {
-        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
-
-                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
-        0x00000021, /* 0000 0000 0000 0000  0000 0000 0010 0001 */
-
-                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
-
-                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
-
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
-        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
-    };
-
-                    /* mail_auth is the same as memcached */
-
-    static uint32_t  *map[] =
-        { uri, args, uri_component, html, refresh, memcached, memcached };
-
-    escape = map[type];
-
-    if (dst == NULL) {
-
-        /* find the number of the characters to be escaped */
-
-        n = 0;
-
-        while (size) {
-            if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
-                n++;
-            }
-            src++;
-            size--;
-        }
-
-        return (uintptr_t) n;
-    }
-
-    while (size) {
-        if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
-            *dst++ = '%';
-            *dst++ = hex[*src >> 4];
-            *dst++ = hex[*src & 0xf];
-            src++;
-
-        } else {
-            *dst++ = *src++;
-        }
-        size--;
-    }
-
-    return (uintptr_t) dst;
-}
-
-
-/* XXX we also decode '+' to ' ' */
-void
-ngx_http_lua_unescape_uri(u_char **dst, u_char **src, size_t size,
-    ngx_uint_t type)
-{
-    u_char  *d, *s, ch, c, decoded;
-    enum {
-        sw_usual = 0,
-        sw_quoted,
-        sw_quoted_second
-    } state;
-
-    d = *dst;
-    s = *src;
-
-    state = 0;
-    decoded = 0;
-
-    while (size--) {
-
-        ch = *s++;
-
-        switch (state) {
-        case sw_usual:
-            if (ch == '?'
-                && (type & (NGX_UNESCAPE_URI|NGX_UNESCAPE_REDIRECT)))
-            {
-                *d++ = ch;
-                goto done;
-            }
-
-            if (ch == '%') {
-                state = sw_quoted;
-                break;
-            }
-
-            if (ch == '+') {
-                *d++ = ' ';
-                break;
-            }
-
-            *d++ = ch;
-            break;
-
-        case sw_quoted:
-
-            if (ch >= '0' && ch <= '9') {
-                decoded = (u_char) (ch - '0');
-                state = sw_quoted_second;
-                break;
-            }
-
-            c = (u_char) (ch | 0x20);
-            if (c >= 'a' && c <= 'f') {
-                decoded = (u_char) (c - 'a' + 10);
-                state = sw_quoted_second;
-                break;
-            }
-
-            /* the invalid quoted character */
-
-            state = sw_usual;
-
-            *d++ = ch;
-
-            break;
-
-        case sw_quoted_second:
-
-            state = sw_usual;
-
-            if (ch >= '0' && ch <= '9') {
-                ch = (u_char) ((decoded << 4) + ch - '0');
-
-                if (type & NGX_UNESCAPE_REDIRECT) {
-                    if (ch > '%' && ch < 0x7f) {
-                        *d++ = ch;
-                        break;
-                    }
-
-                    *d++ = '%'; *d++ = *(s - 2); *d++ = *(s - 1);
-                    break;
-                }
-
-                *d++ = ch;
-
-                break;
-            }
-
-            c = (u_char) (ch | 0x20);
-            if (c >= 'a' && c <= 'f') {
-                ch = (u_char) ((decoded << 4) + c - 'a' + 10);
-
-                if (type & NGX_UNESCAPE_URI) {
-                    if (ch == '?') {
-                        *d++ = ch;
-                        goto done;
-                    }
-
-                    *d++ = ch;
-                    break;
-                }
-
-                if (type & NGX_UNESCAPE_REDIRECT) {
-                    if (ch == '?') {
-                        *d++ = ch;
-                        goto done;
-                    }
-
-                    if (ch > '%' && ch < 0x7f) {
-                        *d++ = ch;
-                        break;
-                    }
-
-                    *d++ = '%'; *d++ = *(s - 2); *d++ = *(s - 1);
-                    break;
-                }
-
-                *d++ = ch;
-
-                break;
-            }
-
-            /* the invalid quoted character */
-
-            break;
-        }
-    }
-
-done:
-
-    *dst = d;
-    *src = s;
-}
-
-
-void
-ngx_http_lua_inject_req_api(ngx_log_t *log, lua_State *L)
-{
-    /* ngx.req table */
-
-    lua_createtable(L, 0 /* narr */, 24 /* 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);
-    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);
-    ngx_http_lua_inject_req_misc_api(L);
-
-    lua_setfield(L, -2, "req");
-}
-
-
-static ngx_int_t
-ngx_http_lua_handle_exec(lua_State *L, 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 thread initiated internal redirect to %V",
-                   &ctx->exec_uri);
-
-    ngx_http_lua_cleanup_pending_operation(ctx->cur_co_ctx);
-
-    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(ctx, 1 /* forcible */);
-
-    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);
-        }
-
-        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);
-#endif
-
-        rc = ngx_http_named_location(r, &ctx->exec_uri);
-        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-            return rc;
-        }
-
-#if 0
-        if (!ctx->entered_content_phase) {
-            /* XXX ensure the main request ref count
-             * is decreased because the current
-             * request will be quit */
-            r->main->count--;
-            dd("XXX decrement main count: c:%d", (int) r->main->count);
-        }
-#endif
-
-        return NGX_DONE;
-    }
-
-    dd("internal redirect to %.*s", (int) ctx->exec_uri.len,
-       ctx->exec_uri.data);
-
-    r->write_event_handler = ngx_http_request_empty_handler;
-
-    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);
-
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-        return rc;
-    }
-
-#if 0
-    if (!ctx->entered_content_phase) {
-        /* XXX ensure the main request ref count
-         * is decreased because the current
-         * request will be quit */
-        dd("XXX decrement main count");
-        r->main->count--;
-    }
-#endif
-
-    return NGX_DONE;
-}
-
-
-static ngx_int_t
-ngx_http_lua_handle_exit(lua_State *L, 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 thread aborting request with status %d",
-                   ctx->exit_code);
-
-    ngx_http_lua_cleanup_pending_operation(ctx->cur_co_ctx);
-
-    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(ctx, 0);
-
-    if (r->connection->fd == (ngx_socket_t) -1) {  /* fake request */
-        return ctx->exit_code;
-    }
-
-#if 1
-    if (!r->header_sent
-        && !ctx->header_sent
-        && r->headers_out.status == 0
-        && ctx->exit_code >= NGX_HTTP_OK)
-    {
-        r->headers_out.status = ctx->exit_code;
-    }
-#endif
-
-    if (ctx->buffering
-        && r->headers_out.status
-        && ctx->exit_code != NGX_ERROR
-        && ctx->exit_code != NGX_HTTP_REQUEST_TIME_OUT
-        && ctx->exit_code != NGX_HTTP_CLIENT_CLOSED_REQUEST
-        && ctx->exit_code != NGX_HTTP_CLOSE)
-    {
-        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->exit_code >= NGX_HTTP_OK) {
-            return NGX_HTTP_OK;
-        }
-
-        return ctx->exit_code;
-    }
-
-    if ((ctx->exit_code == NGX_OK
-         && ctx->entered_content_phase)
-        || (ctx->exit_code >= NGX_HTTP_OK
-            && ctx->exit_code < NGX_HTTP_SPECIAL_RESPONSE
-            && ctx->exit_code != NGX_HTTP_NO_CONTENT))
-    {
-        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 1
-    if ((r->header_sent || ctx->header_sent)
-        && ctx->exit_code > NGX_OK
-        && ctx->exit_code != NGX_HTTP_REQUEST_TIME_OUT
-        && ctx->exit_code != NGX_HTTP_CLIENT_CLOSED_REQUEST
-        && ctx->exit_code != NGX_HTTP_CLOSE)
-    {
-        if (ctx->entered_content_phase) {
-            return NGX_OK;
-        }
-
-        return NGX_HTTP_OK;
-    }
-#endif
-
-    return ctx->exit_code;
-}
-
-
-void
-ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
-    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;
-    u_char              *p;
-
-    if (table < 0) {
-        table = lua_gettop(L) + table + 1;
-    }
-
-    n = 0;
-    lua_pushnil(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");
-            return;
-        }
-
-        key = (u_char *) lua_tolstring(L, -2, &key_len);
-
-        key_escape = 2 * ngx_http_lua_escape_uri(NULL, key, key_len,
-                                                 NGX_ESCAPE_URI_COMPONENT);
-        total_escape += key_escape;
-
-        switch (lua_type(L, -1)) {
-        case LUA_TNUMBER:
-        case LUA_TSTRING:
-            value = (u_char *) lua_tolstring(L, -1, &value_len);
-
-            total_escape += 2 * ngx_http_lua_escape_uri(NULL, value, value_len,
-                                                      NGX_ESCAPE_URI_COMPONENT);
-
-            len += key_len + value_len + (sizeof("=") - 1);
-            n++;
-
-            break;
-
-        case LUA_TBOOLEAN:
-            if (lua_toboolean(L, -1)) {
-                len += key_len;
-                n++;
-            }
-
-            break;
-
-        case LUA_TTABLE:
-
-            i = 0;
-            lua_pushnil(L);
-            while (lua_next(L, -2) != 0) {
-                if (lua_isboolean(L, -1)) {
-                    if (lua_toboolean(L, -1)) {
-                        len += key_len;
-
-                    } else {
-                        lua_pop(L, 1);
-                        continue;
-                    }
-
-                } else {
-                    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));
-                        return;
-                    }
-
-                    total_escape +=
-                        2 * ngx_http_lua_escape_uri(NULL, value,
-                                                    value_len,
-                                                    NGX_ESCAPE_URI_COMPONENT);
-
-                    len += key_len + value_len + (sizeof("=") - 1);
-                }
-
-                if (i++ > 0) {
-                    total_escape += key_escape;
-                }
-
-                n++;
-                lua_pop(L, 1);
-            }
-
-            break;
-
-        default:
-            luaL_error(L, "attempt to use %s as query arg value",
-                       luaL_typename(L, -1));
-            return;
-        }
-
-        lua_pop(L, 1);
-    }
-
-    len += (size_t) total_escape;
-
-    if (n > 1) {
-        len += (n - 1) * (sizeof("&") - 1);
-    }
-
-    dd("len 1: %d", (int) len);
-
-    if (r) {
-        p = ngx_palloc(r->pool, len);
-        if (p == NULL) {
-            luaL_error(L, "no memory");
-            return;
-        }
-
-    } else {
-        p = lua_newuserdata(L, len);
-    }
-
-    args->data = p;
-    args->len = len;
-
-    i = 0;
-    lua_pushnil(L);
-    while (lua_next(L, table) != 0) {
-        key = (u_char *) lua_tolstring(L, -2, &key_len);
-
-        switch (lua_type(L, -1)) {
-        case LUA_TNUMBER:
-        case LUA_TSTRING:
-
-            if (total_escape) {
-                p = (u_char *) ngx_http_lua_escape_uri(p, key, key_len,
-                                                       NGX_ESCAPE_URI_COMPONENT
-                                                       );
-
-            } else {
-                dd("shortcut: no escape required");
-
-                p = ngx_copy(p, key, key_len);
-            }
-
-            *p++ = '=';
-
-            value = (u_char *) lua_tolstring(L, -1, &value_len);
-
-            if (total_escape) {
-                p = (u_char *) ngx_http_lua_escape_uri(p, value, value_len,
-                                                       NGX_ESCAPE_URI_COMPONENT
-                                                       );
-
-            } else {
-                p = ngx_copy(p, value, value_len);
-            }
-
-            if (i != n - 1) {
-                /* not the last pair */
-                *p++ = '&';
-            }
-
-            i++;
-
-            break;
-
-        case LUA_TBOOLEAN:
-            if (lua_toboolean(L, -1)) {
-                if (total_escape) {
-                    p = (u_char *) ngx_http_lua_escape_uri(p, key, key_len,
-                                                NGX_ESCAPE_URI_COMPONENT);
-
-                } else {
-                    dd("shortcut: no escape required");
-
-                    p = ngx_copy(p, key, key_len);
-                }
-
-                if (i != n - 1) {
-                    /* not the last pair */
-                    *p++ = '&';
-                }
-
-                i++;
-            }
-
-            break;
-
-        case LUA_TTABLE:
-
-            lua_pushnil(L);
-            while (lua_next(L, -2) != 0) {
-
-                if (lua_isboolean(L, -1)) {
-                    if (lua_toboolean(L, -1)) {
-                        if (total_escape) {
-                            p = (u_char *) ngx_http_lua_escape_uri(p, key,
-    key_len,
-    NGX_ESCAPE_URI_COMPONENT);
-
-                        } else {
-                            dd("shortcut: no escape required");
-
-                            p = ngx_copy(p, key, key_len);
-                        }
-
-                    } else {
-                        lua_pop(L, 1);
-                        continue;
-                    }
-
-                } else {
-
-                    if (total_escape) {
-                        p = (u_char *)
-                                ngx_http_lua_escape_uri(p, key,
-                                                        key_len,
-                                                        NGX_ESCAPE_URI_COMPONENT
-                                                        );
-
-                    } else {
-                        dd("shortcut: no escape required");
-
-                        p = ngx_copy(p, key, key_len);
-                    }
-
-                    *p++ = '=';
-
-                    value = (u_char *) lua_tolstring(L, -1, &value_len);
-
-                    if (total_escape) {
-                        p = (u_char *)
-                                ngx_http_lua_escape_uri(p, value,
-                                                        value_len,
-                                                        NGX_ESCAPE_URI_COMPONENT
-                                                        );
-
-                    } else {
-                        p = ngx_copy(p, value, value_len);
-                    }
-                }
-
-                if (i != n - 1) {
-                    /* not the last pair */
-                    *p++ = '&';
-                }
-
-                i++;
-                lua_pop(L, 1);
-            }
-
-            break;
-
-        default:
-            luaL_error(L, "should not reach here");
-            return;
-        }
-
-        lua_pop(L, 1);
-    }
-
-    if (p - args->data != (ssize_t) len) {
-        luaL_error(L, "buffer error: %d != %d",
-                   (int) (p - args->data), (int) len);
-        return;
-    }
-}
-
-
-static ngx_int_t
-ngx_http_lua_handle_rewrite_jump(lua_State *L, ngx_http_request_t *r,
-    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);
-
-    ngx_http_lua_cleanup_pending_operation(ctx->cur_co_ctx);
-
-    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(ctx, 1 /* forcible */);
-    ngx_http_lua_init_ctx(r, ctx);
-
-    return NGX_OK;
-}
-
-
-/* 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_fd_t         fd;
-    ngx_file_info_t  fi;
-
-    if (of->fd != NGX_INVALID_FILE) {
-
-        if (ngx_file_info(name, &fi) == NGX_FILE_ERROR) {
-            of->failed = ngx_file_info_n;
-            goto failed;
-        }
-
-        if (of->uniq == ngx_file_uniq(&fi)) {
-            goto done;
-        }
-
-    } else if (of->test_dir) {
-
-        if (ngx_file_info(name, &fi) == NGX_FILE_ERROR) {
-            of->failed = ngx_file_info_n;
-            goto failed;
-        }
-
-        if (ngx_is_dir(&fi)) {
-            goto done;
-        }
-    }
-
-    if (!of->log) {
-
-        /*
-         * Use non-blocking open() not to hang on FIFO files, etc.
-         * This flag has no effect on a regular files.
-         */
-
-        fd = ngx_open_file(name, NGX_FILE_RDONLY|NGX_FILE_NONBLOCK,
-                           NGX_FILE_OPEN, 0);
-
-    } else {
-        fd = ngx_open_file(name, NGX_FILE_APPEND, NGX_FILE_CREATE_OR_OPEN,
-                           NGX_FILE_DEFAULT_ACCESS);
-    }
-
-    if (fd == NGX_INVALID_FILE) {
-        of->failed = ngx_open_file_n;
-        goto failed;
-    }
-
-    if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) {
-        ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,
-                      ngx_fd_info_n " \"%s\" failed", name);
-
-        if (ngx_close_file(fd) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                          ngx_close_file_n " \"%s\" failed", name);
-        }
-
-        of->fd = NGX_INVALID_FILE;
-
-        return NGX_ERROR;
-    }
-
-    if (ngx_is_dir(&fi)) {
-        if (ngx_close_file(fd) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                          ngx_close_file_n " \"%s\" failed", name);
-        }
-
-        of->fd = NGX_INVALID_FILE;
-
-    } else {
-        of->fd = fd;
-
-        if (of->directio <= ngx_file_size(&fi)) {
-            if (ngx_directio_on(fd) == NGX_FILE_ERROR) {
-                ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                              ngx_directio_on_n " \"%s\" failed", name);
-
-            } else {
-                of->is_directio = 1;
-            }
-        }
-    }
-
-done:
-
-    of->uniq = ngx_file_uniq(&fi);
-    of->mtime = ngx_file_mtime(&fi);
-    of->size = ngx_file_size(&fi);
-#if defined(nginx_version) && nginx_version >= 1000001
-    of->fs_size = ngx_file_fs_size(&fi);
-#endif
-    of->is_dir = ngx_is_dir(&fi);
-    of->is_file = ngx_is_file(&fi);
-    of->is_link = ngx_is_link(&fi);
-    of->is_exec = ngx_is_exec(&fi);
-
-    return NGX_OK;
-
-failed:
-
-    of->fd = NGX_INVALID_FILE;
-    of->err = ngx_errno;
-
-    return NGX_ERROR;
-}
-
-
-ngx_chain_t *
-ngx_http_lua_chain_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
-    ngx_chain_t **free, size_t len)
-{
-    ngx_buf_t    *b;
-    ngx_chain_t  *cl;
-    u_char       *start, *end;
-
-    const ngx_buf_tag_t  tag = (ngx_buf_tag_t) &ngx_http_lua_module;
-
-    if (*free) {
-        cl = *free;
-        *free = cl->next;
-        cl->next = NULL;
-
-        b = cl->buf;
-        start = b->start;
-        end = b->end;
-        if (start && (size_t) (end - start) >= len) {
-            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, log, 0,
-                           "lua reuse free buf memory %O >= %uz, cl:%p, p:%p",
-                           (off_t) (end - start), len, cl, start);
-
-            ngx_memzero(b, sizeof(ngx_buf_t));
-
-            b->start = start;
-            b->pos = start;
-            b->last = start;
-            b->end = end;
-            b->tag = tag;
-
-            if (len) {
-                b->temporary = 1;
-            }
-
-            return cl;
-        }
-
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, log, 0,
-                       "lua reuse free buf chain, but reallocate memory "
-                       "because %uz >= %O, cl:%p, p:%p", len,
-                       (off_t) (b->end - b->start), cl, b->start);
-
-        if (ngx_buf_in_memory(b) && b->start) {
-            ngx_pfree(p, b->start);
-        }
-
-        ngx_memzero(b, sizeof(ngx_buf_t));
-
-        if (len == 0) {
-            return cl;
-        }
-
-        b->start = ngx_palloc(p, len);
-        if (b->start == NULL) {
-            return NULL;
-        }
-
-        b->end = b->start + len;
-
-        dd("buf start: %p", cl->buf->start);
-
-        b->pos = b->start;
-        b->last = b->start;
-        b->tag = tag;
-        b->temporary = 1;
-
-        return cl;
-    }
-
-    cl = ngx_alloc_chain_link(p);
-    if (cl == NULL) {
-        return NULL;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "lua allocate new chainlink and new buf of size %uz, cl:%p",
-                   len, cl);
-
-    cl->buf = len ? ngx_create_temp_buf(p, len) : ngx_calloc_buf(p);
-    if (cl->buf == NULL) {
-        return NULL;
-    }
-
-    dd("buf start: %p", cl->buf->start);
-
-    cl->buf->tag = tag;
-    cl->next = NULL;
-
-    return cl;
-}
-
-
-static int
-ngx_http_lua_thread_traceback(lua_State *L, lua_State *co,
-    ngx_http_lua_co_ctx_t *coctx)
-{
-    int         base;
-    int         level, coid;
-    lua_Debug   ar;
-
-    base = lua_gettop(L);
-    lua_checkstack(L, 3);
-    lua_pushliteral(L, "stack traceback:");
-    coid = 0;
-
-    while (co) {
-
-        if (coid >= NGX_HTTP_LUA_BT_MAX_COROS) {
-            break;
-        }
-
-        lua_checkstack(L, 2);
-        lua_pushfstring(L, "\ncoroutine %d:", coid++);
-
-        level = 0;
-
-        while (lua_getstack(co, level++, &ar)) {
-
-            lua_checkstack(L, 5);
-
-            if (level > NGX_HTTP_LUA_BT_DEPTH) {
-                lua_pushliteral(L, "\n\t...");
-                break;
-            }
-
-            lua_pushliteral(L, "\n\t");
-            lua_getinfo(co, "Snl", &ar);
-            lua_pushfstring(L, "%s:", ar.short_src);
-
-            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_pushliteral(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);
-                }
-            }
-        }
-
-        if (lua_gettop(L) - base >= 15) {
-            lua_concat(L, lua_gettop(L) - base);
-        }
-
-        /* 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) - base);
-    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_getglobal(L, "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;
-
-    r = ngx_http_lua_get_req(L);
-    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;
-
-    r = ngx_http_lua_get_req(L);
-    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_uint_t nreqs)
-{
-    ngx_int_t                        rc;
-    ngx_http_lua_posted_thread_t    *pt;
-
-    for ( ;; ) {
-        if (c->destroyed || c->requests != nreqs) {
-            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_lua_finalize_request(r, NGX_DONE);
-            continue;
-        }
-
-        /* rc == NGX_ERROR || rc >= NGX_OK */
-
-        if (ctx->entered_content_phase) {
-            ngx_http_lua_finalize_request(r, rc);
-        }
-
-        return rc;
-    }
-
-    /* impossible to reach here */
-}
-
-
-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_threads(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, lua_State *L)
-{
-#ifdef NGX_LUA_USE_ASSERT
-    int                              top;
-#endif
-    int                              inited = 0, ref;
-    ngx_uint_t                       i;
-    ngx_list_part_t                 *part;
-    ngx_http_lua_co_ctx_t           *cc, *coctx;
-
-#ifdef NGX_LUA_USE_ASSERT
-    top = lua_gettop(L);
-#endif
-
-#if 1
-    coctx = ctx->on_abort_co_ctx;
-    if (coctx && coctx->co_ref != LUA_NOREF) {
-        if (coctx->co_status != NGX_HTTP_LUA_CO_SUSPENDED) {
-            /* the on_abort thread contributes to the coctx->uthreads
-             * counter only when it actually starts running */
-            ngx_http_lua_cleanup_pending_operation(coctx);
-            ctx->uthreads--;
-        }
-
-        ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
-
-        lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
-        lua_rawget(L, LUA_REGISTRYINDEX);
-        inited = 1;
-
-        luaL_unref(L, -1, coctx->co_ref);
-        coctx->co_ref = LUA_NOREF;
-
-        coctx->co_status = NGX_HTTP_LUA_CO_DEAD;
-        ctx->on_abort_co_ctx = NULL;
-    }
-#endif
-
-    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];
-
-            ref = coctx->co_ref;
-
-            if (ref != LUA_NOREF) {
-                ngx_http_lua_cleanup_pending_operation(coctx);
-
-                ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
-
-                if (!inited) {
-                    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
-                    lua_rawget(L, LUA_REGISTRYINDEX);
-                    inited = 1;
-                }
-
-                ngx_http_lua_assert(lua_gettop(L) - top == 1);
-
-                luaL_unref(L, -1, ref);
-                coctx->co_ref = LUA_NOREF;
-
-                coctx->co_status = NGX_HTTP_LUA_CO_DEAD;
-                ctx->uthreads--;
-            }
-        }
-
-        ctx->user_co_ctx = NULL;
-    }
-
-    ngx_http_lua_assert(ctx->uthreads == 0);
-
-    coctx = &ctx->entry_co_ctx;
-
-    ref = coctx->co_ref;
-    if (ref != LUA_NOREF) {
-        ngx_http_lua_cleanup_pending_operation(coctx);
-
-        ngx_http_lua_probe_thread_delete(r, coctx->co, ctx);
-
-        if (!inited) {
-            lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
-            lua_rawget(L, LUA_REGISTRYINDEX);
-            inited = 1;
-        }
-
-        ngx_http_lua_assert(lua_gettop(L) - top == 1);
-
-        luaL_unref(L, -1, coctx->co_ref);
-        coctx->co_ref = LUA_NOREF;
-        coctx->co_status = NGX_HTTP_LUA_CO_DEAD;
-    }
-
-    if (inited) {
-        lua_pop(L, 1);
-    }
-}
-
-
-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_HTTP_V2)
-    if (r->stream) {
-        return NGX_OK;
-    }
-#endif
-
-#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(ctx, 0);
-        ngx_http_lua_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(ctx, 0);
-                ngx_http_lua_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;
-
-    } else {
-        r->write_event_handler = ngx_http_core_run_phases;
-    }
-
-    r->write_event_handler(r);
-}
-
-
-static ngx_int_t
-ngx_http_lua_on_abort_resume(ngx_http_request_t *r)
-{
-    lua_State                   *vm;
-    ngx_int_t                    rc;
-    ngx_uint_t                   nreqs;
-    ngx_connection_t            *c;
-    ngx_http_lua_ctx_t          *ctx;
-
-    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;
-
-    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;
-    vm = ngx_http_lua_get_lua_vm(r, ctx);
-    nreqs = c->requests;
-
-    rc = ngx_http_lua_run_thread(vm, 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, vm, r, ctx, nreqs);
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_finalize_request(r, NGX_DONE);
-        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
-    }
-
-    if (ctx->entered_content_phase) {
-        ngx_http_lua_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;
-}
-
-
-void
-ngx_http_lua_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
-{
-    ngx_http_lua_ctx_t              *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx && ctx->cur_co_ctx) {
-        ngx_http_lua_cleanup_pending_operation(ctx->cur_co_ctx);
-    }
-
-    if (r->connection->fd != (ngx_socket_t) -1) {
-        ngx_http_finalize_request(r, rc);
-        return;
-    }
-
-    ngx_http_lua_finalize_fake_request(r, rc);
-}
-
-
-void
-ngx_http_lua_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc)
-{
-    ngx_connection_t          *c;
-#if (NGX_HTTP_SSL)
-    ngx_ssl_conn_t            *ssl_conn;
-    ngx_http_lua_ssl_ctx_t    *cctx;
-#endif
-
-    c = r->connection;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http lua finalize fake request: %d, a:%d, c:%d",
-                   rc, r == c->data, r->main->count);
-
-    if (rc == NGX_DONE) {
-        ngx_http_lua_close_fake_request(r);
-        return;
-    }
-
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-
-#if (NGX_HTTP_SSL)
-
-        if (r->connection->ssl) {
-            ssl_conn = r->connection->ssl->connection;
-            if (ssl_conn) {
-                c = ngx_ssl_get_connection(ssl_conn);
-
-                if (c && c->ssl) {
-                    cctx = ngx_http_lua_ssl_get_ctx(c->ssl->connection);
-                    if (cctx != NULL) {
-                        cctx->exit_code = 0;
-                    }
-                }
-            }
-        }
-
-#endif
-
-        ngx_http_lua_close_fake_request(r);
-        return;
-    }
-
-    if (c->read->timer_set) {
-        ngx_del_timer(c->read);
-    }
-
-    if (c->write->timer_set) {
-        c->write->delayed = 0;
-        ngx_del_timer(c->write);
-    }
-
-    ngx_http_lua_close_fake_request(r);
-}
-
-
-static void
-ngx_http_lua_close_fake_request(ngx_http_request_t *r)
-{
-    ngx_connection_t  *c;
-
-    r = r->main;
-    c = r->connection;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http lua fake request count:%d", r->count);
-
-    if (r->count == 0) {
-        ngx_log_error(NGX_LOG_ALERT, c->log, 0, "http lua fake request "
-                      "count is zero");
-    }
-
-    r->count--;
-
-    if (r->count) {
-        return;
-    }
-
-    ngx_http_lua_free_fake_request(r);
-    ngx_http_lua_close_fake_connection(c);
-}
-
-
-void
-ngx_http_lua_free_fake_request(ngx_http_request_t *r)
-{
-    ngx_log_t                 *log;
-    ngx_http_cleanup_t        *cln;
-
-    log = r->connection->log;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "http lua close fake "
-                   "request");
-
-    if (r->pool == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, log, 0, "http lua fake request "
-                      "already closed");
-        return;
-    }
-
-    cln = r->cleanup;
-    r->cleanup = NULL;
-
-    while (cln) {
-        if (cln->handler) {
-            cln->handler(cln->data);
-        }
-
-        cln = cln->next;
-    }
-
-    r->request_line.len = 0;
-
-    r->connection->destroyed = 1;
-}
-
-
-void
-ngx_http_lua_close_fake_connection(ngx_connection_t *c)
-{
-    ngx_pool_t          *pool;
-    ngx_connection_t    *saved_c = NULL;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http lua close fake http connection %p", c);
-
-    c->destroyed = 1;
-
-    pool = c->pool;
-
-    if (c->read->timer_set) {
-        ngx_del_timer(c->read);
-    }
-
-    if (c->write->timer_set) {
-        ngx_del_timer(c->write);
-    }
-
-    c->read->closed = 1;
-    c->write->closed = 1;
-
-    /* we temporarily use a valid fd (0) to make ngx_free_connection happy */
-
-    c->fd = 0;
-
-    if (ngx_cycle->files) {
-        saved_c = ngx_cycle->files[0];
-    }
-
-    ngx_free_connection(c);
-
-    c->fd = (ngx_socket_t) -1;
-
-    if (ngx_cycle->files) {
-        ngx_cycle->files[0] = saved_c;
-    }
-
-    if (pool) {
-        ngx_destroy_pool(pool);
-    }
-}
-
-
-lua_State *
-ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
-    ngx_pool_t *pool, ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log,
-    ngx_pool_cleanup_t **pcln)
-{
-    lua_State                       *L;
-    ngx_uint_t                       i;
-    ngx_pool_cleanup_t              *cln;
-    ngx_http_lua_preload_hook_t     *hook;
-    ngx_http_lua_vm_state_t         *state;
-
-    cln = ngx_pool_cleanup_add(pool, 0);
-    if (cln == NULL) {
-        return NULL;
-    }
-
-    /* create new Lua VM instance */
-    L = ngx_http_lua_new_state(parent_vm, cycle, lmcf, log);
-    if (L == NULL) {
-        return NULL;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "lua initialize the "
-                   "global Lua VM %p", L);
-
-    /* register cleanup handler for Lua VM */
-    cln->handler = ngx_http_lua_cleanup_vm;
-
-    state = ngx_alloc(sizeof(ngx_http_lua_vm_state_t), log);
-    if (state == NULL) {
-        return NULL;
-    }
-    state->vm = L;
-    state->count = 1;
-
-    cln->data = state;
-
-    if (lmcf->vm_cleanup == NULL) {
-        /* this assignment will happen only once,
-         * and also only for the main Lua VM */
-        lmcf->vm_cleanup = cln;
-    }
-
-    if (pcln) {
-        *pcln = cln;
-    }
-
-    if (lmcf->preload_hooks) {
-
-        /* register the 3rd-party module's preload hooks */
-
-        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 L;
-}
-
-
-void
-ngx_http_lua_cleanup_vm(void *data)
-{
-    lua_State                       *L;
-    ngx_http_lua_vm_state_t         *state = data;
-
-#if (DDEBUG)
-    if (state) {
-        dd("cleanup VM: c:%d, s:%p", (int) state->count, state->vm);
-    }
-#endif
-
-    if (state) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "lua decrementing the reference count for Lua VM: %i",
-                       state->count);
-
-        if (--state->count == 0) {
-            L = state->vm;
-            ngx_http_lua_cleanup_conn_pools(L);
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                           "lua close the global Lua VM %p", L);
-            lua_close(L);
-            ngx_free(state);
-        }
-    }
-}
-
-
-ngx_connection_t *
-ngx_http_lua_create_fake_connection(ngx_pool_t *pool)
-{
-    ngx_log_t               *log;
-    ngx_connection_t        *c;
-    ngx_connection_t        *saved_c = NULL;
-
-    /* (we temporarily use a valid fd (0) to make ngx_get_connection happy) */
-    if (ngx_cycle->files) {
-        saved_c = ngx_cycle->files[0];
-    }
-
-    c = ngx_get_connection(0, ngx_cycle->log);
-
-    if (ngx_cycle->files) {
-        ngx_cycle->files[0] = saved_c;
-    }
-
-    if (c == NULL) {
-        return NULL;
-    }
-
-    c->fd = (ngx_socket_t) -1;
-    c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
-
-    if (pool) {
-        c->pool = pool;
-
-    } else {
-        c->pool = ngx_create_pool(128, c->log);
-        if (c->pool == NULL) {
-            goto failed;
-        }
-    }
-
-    log = ngx_pcalloc(c->pool, sizeof(ngx_log_t));
-    if (log == NULL) {
-        goto failed;
-    }
-
-    c->log = log;
-    c->log->connection = c->number;
-    c->log->action = NULL;
-    c->log->data = NULL;
-
-    c->log_error = NGX_ERROR_INFO;
-
-#if 0
-    c->buffer = ngx_create_temp_buf(c->pool, 2);
-    if (c->buffer == NULL) {
-        goto failed;
-    }
-
-    c->buffer->start[0] = CR;
-    c->buffer->start[1] = LF;
-#endif
-
-    c->error = 1;
-
-    dd("created fake connection: %p", c);
-
-    return c;
-
-failed:
-
-    ngx_http_lua_close_fake_connection(c);
-    return NULL;
-}
-
-
-ngx_http_request_t *
-ngx_http_lua_create_fake_request(ngx_connection_t *c)
-{
-    ngx_http_request_t      *r;
-
-    r = ngx_pcalloc(c->pool, sizeof(ngx_http_request_t));
-    if (r == NULL) {
-        return NULL;
-    }
-
-    c->requests++;
-
-    r->pool = c->pool;
-
-    dd("r pool allocated: %d", (int) (sizeof(ngx_http_lua_ctx_t)
-       + sizeof(void *) * ngx_http_max_module + sizeof(ngx_http_cleanup_t)));
-
-#if 0
-    hc = ngx_pcalloc(c->pool, sizeof(ngx_http_connection_t));
-    if (hc == NULL) {
-        goto failed;
-    }
-
-    r->header_in = c->buffer;
-    r->header_end = c->buffer->start;
-
-    if (ngx_list_init(&r->headers_out.headers, r->pool, 0,
-                      sizeof(ngx_table_elt_t))
-        != NGX_OK)
-    {
-        goto failed;
-    }
-
-    if (ngx_list_init(&r->headers_in.headers, r->pool, 0,
-                      sizeof(ngx_table_elt_t))
-        != NGX_OK)
-    {
-        goto failed;
-    }
-#endif
-
-    r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
-    if (r->ctx == NULL) {
-        return NULL;
-    }
-
-#if 0
-    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-    r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts
-                               * sizeof(ngx_http_variable_value_t));
-    if (r->variables == NULL) {
-        goto failed;
-    }
-#endif
-
-    r->connection = c;
-
-    r->headers_in.content_length_n = 0;
-    c->data = r;
-#if 0
-    hc->request = r;
-    r->http_connection = hc;
-#endif
-    r->signature = NGX_HTTP_MODULE;
-    r->main = r;
-    r->count = 1;
-
-    r->method = NGX_HTTP_UNKNOWN;
-
-    r->headers_in.keep_alive_n = -1;
-    r->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
-    r->subrequests = NGX_HTTP_MAX_SUBREQUESTS + 1;
-
-    r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
-    r->discard_body = 1;
-
-    dd("created fake request %p", r);
-
-    return r;
-}
-
-
-ngx_int_t
-ngx_http_lua_report(ngx_log_t *log, lua_State *L, int status,
-    const char *prefix)
-{
-    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, "%s error: %s", prefix, msg);
-        lua_pop(L, 1);
-    }
-
-    /* force a full garbage-collection cycle */
-    lua_gc(L, LUA_GCCOLLECT, 0);
-
-    return status == 0 ? NGX_OK : NGX_ERROR;
-}
-
-
-int
-ngx_http_lua_do_call(ngx_log_t *log, lua_State *L)
-{
-    int                 status, base;
-#if (NGX_PCRE)
-    ngx_pool_t         *old_pool;
-#endif
-
-    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 */
-
-#if (NGX_PCRE)
-    old_pool = ngx_http_lua_pcre_malloc_init(ngx_cycle->pool);
-#endif
-
-    status = lua_pcall(L, 0, 0, base);
-
-#if (NGX_PCRE)
-    ngx_http_lua_pcre_malloc_done(old_pool);
-#endif
-
-    lua_remove(L, base);
-
-    return status;
-}
-
-
-static int
-ngx_http_lua_get_raw_phase_context(lua_State *L)
-{
-    ngx_http_request_t      *r;
-    ngx_http_lua_ctx_t      *ctx;
-
-    r = lua_touserdata(L, 1);
-    if (r == NULL) {
-        return 0;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return 0;
-    }
-
-    lua_pushinteger(L, (int) ctx->context);
-    return 1;
-}
-
-
-ngx_http_cleanup_t *
-ngx_http_lua_cleanup_add(ngx_http_request_t *r, size_t size)
-{
-    ngx_http_cleanup_t  *cln;
-    ngx_http_lua_ctx_t  *ctx;
-
-    if (size == 0) {
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
-        r = r->main;
-
-        if (ctx != NULL && ctx->free_cleanup) {
-            cln = ctx->free_cleanup;
-            ctx->free_cleanup = cln->next;
-
-            dd("reuse cleanup: %p", cln);
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua http cleanup reuse: %p", cln);
-
-            cln->handler = NULL;
-            cln->next = r->cleanup;
-
-            r->cleanup = cln;
-
-            return cln;
-        }
-    }
-
-    return ngx_http_cleanup_add(r, size);
-}
-
-
-void
-ngx_http_lua_cleanup_free(ngx_http_request_t *r, ngx_http_cleanup_pt *cleanup)
-{
-    ngx_http_cleanup_t  **last;
-    ngx_http_cleanup_t   *cln;
-    ngx_http_lua_ctx_t   *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    r = r->main;
-
-    cln = (ngx_http_cleanup_t *)
-              ((u_char *) cleanup - offsetof(ngx_http_cleanup_t, handler));
-
-    dd("cln: %p, cln->handler: %p, &cln->handler: %p",
-       cln, cln->handler, &cln->handler);
-
-    last = &r->cleanup;
-
-    while (*last) {
-        if (*last == cln) {
-            *last = cln->next;
-
-            cln->next = ctx->free_cleanup;
-            ctx->free_cleanup = cln;
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "lua http cleanup free: %p", cln);
-
-            return;
-        }
-
-        last = &(*last)->next;
-    }
-}
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_util.h b/debian/modules/http-lua/src/ngx_http_lua_util.h
deleted file mode 100644
index 7dcc6f7..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_util.h
+++ /dev/null
@@ -1,468 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_UTIL_H_INCLUDED_
-#define _NGX_HTTP_LUA_UTIL_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-#include "ngx_http_lua_api.h"
-
-
-#ifndef NGX_UNESCAPE_URI_COMPONENT
-#define NGX_UNESCAPE_URI_COMPONENT  0
-#endif
-
-
-#ifndef NGX_LUA_NO_FFI_API
-typedef struct {
-    ngx_http_lua_ffi_str_t   key;
-    ngx_http_lua_ffi_str_t   value;
-} ngx_http_lua_ffi_table_elt_t;
-#endif /* NGX_LUA_NO_FFI_API */
-
-
-/* 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;
-
-
-/* key in Lua vm registry for all the "ngx.ctx" tables */
-#define ngx_http_lua_ctx_tables_key  "ngx_lua_ctx_tables"
-
-
-/* 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 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() and ngx.resp.get_headers() */
-extern char ngx_http_lua_headers_metatable_key;
-
-
-#ifndef ngx_str_set
-#define ngx_str_set(str, text)                                               \
-    (str)->len = sizeof(text) - 1; (str)->data = (u_char *) text
-#endif
-
-
-#ifndef NGX_HTTP_SWITCHING_PROTOCOLS
-#define NGX_HTTP_SWITCHING_PROTOCOLS 101
-#endif
-
-
-#if defined(nginx_version) && nginx_version < 1000000
-#define ngx_memmove(dst, src, n)   (void) memmove(dst, src, n)
-#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*"   \
-     : (c) == NGX_HTTP_LUA_CONTEXT_BODY_FILTER ? "body_filter_by_lua*"       \
-     : (c) == NGX_HTTP_LUA_CONTEXT_TIMER ? "ngx.timer"                       \
-     : (c) == NGX_HTTP_LUA_CONTEXT_INIT_WORKER ? "init_worker_by_lua*"       \
-     : (c) == NGX_HTTP_LUA_CONTEXT_BALANCER ? "balancer_by_lua*"             \
-     : (c) == NGX_HTTP_LUA_CONTEXT_SSL_CERT ? "ssl_certificate_by_lua*"      \
-     : (c) == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE ?                          \
-                                                 "ssl_session_store_by_lua*" \
-     : (c) == NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH ?                          \
-                                                 "ssl_session_fetch_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));        \
-    }
-
-
-#ifndef NGX_LUA_NO_FFI_API
-static ngx_inline ngx_int_t
-ngx_http_lua_ffi_check_context(ngx_http_lua_ctx_t *ctx, unsigned flags,
-    u_char *err, size_t *errlen)
-{
-    if (!(ctx->context & flags)) {
-        *errlen = ngx_snprintf(err, *errlen,
-                               "API disabled in the context of %s",
-                               ngx_http_lua_context_name((ctx)->context))
-                  - err;
-
-        return NGX_DECLINED;
-    }
-
-    return NGX_OK;
-}
-#endif
-
-
-#define ngx_http_lua_check_fake_request(L, r)                                \
-    if ((r)->connection->fd == (ngx_socket_t) -1) {                          \
-        return luaL_error(L, "API disabled in the current context");         \
-    }
-
-
-#define ngx_http_lua_check_fake_request2(L, r, ctx)                          \
-    if ((r)->connection->fd == (ngx_socket_t) -1) {                          \
-        return luaL_error(L, "API disabled in the context of %s",            \
-                          ngx_http_lua_context_name((ctx)->context));        \
-    }
-
-
-#define ngx_http_lua_ssl_get_ctx(ssl_conn)                                   \
-    SSL_get_ex_data(ssl_conn, ngx_http_lua_ssl_ctx_index)
-
-
-lua_State *ngx_http_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
-    ngx_pool_t *pool, ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log,
-    ngx_pool_cleanup_t **pcln);
-
-lua_State *ngx_http_lua_new_thread(ngx_http_request_t *r, lua_State *l,
-    int *ref);
-
-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,
-    ngx_http_lua_ctx_t *ctx);
-
-ngx_int_t ngx_http_lua_send_chain_link(ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, ngx_chain_t *cl);
-
-void 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 ***plast, ngx_chain_t *in,
-    ngx_int_t *eof);
-
-void ngx_http_lua_reset_ctx(ngx_http_request_t *r, lua_State *L,
-    ngx_http_lua_ctx_t *ctx);
-
-void ngx_http_lua_generic_phase_post_read(ngx_http_request_t *r);
-
-void ngx_http_lua_request_cleanup(ngx_http_lua_ctx_t *ctx, int foricible);
-
-void ngx_http_lua_request_cleanup_handler(void *data);
-
-ngx_int_t ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
-    ngx_http_lua_ctx_t *ctx, volatile int nret);
-
-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_set_multi_value_table(lua_State *L, int index);
-
-void ngx_http_lua_unescape_uri(u_char **dst, u_char **src, size_t size,
-    ngx_uint_t type);
-
-uintptr_t ngx_http_lua_escape_uri(u_char *dst, u_char *src,
-    size_t size, ngx_uint_t type);
-
-void ngx_http_lua_inject_req_api(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);
-
-ngx_chain_t *ngx_http_lua_chain_get_free_buf(ngx_log_t *log, ngx_pool_t *p,
-    ngx_chain_t **free, size_t len);
-
-void ngx_http_lua_create_new_globals_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_uint_t nreqs);
-
-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);
-
-void ngx_http_lua_finalize_request(ngx_http_request_t *r, ngx_int_t rc);
-
-void ngx_http_lua_finalize_fake_request(ngx_http_request_t *r,
-    ngx_int_t rc);
-
-void ngx_http_lua_close_fake_connection(ngx_connection_t *c);
-
-void ngx_http_lua_free_fake_request(ngx_http_request_t *r);
-
-void ngx_http_lua_release_ngx_ctx_table(ngx_log_t *log, lua_State *L,
-    ngx_http_lua_ctx_t *ctx);
-
-void ngx_http_lua_cleanup_vm(void *data);
-
-ngx_connection_t *ngx_http_lua_create_fake_connection(ngx_pool_t *pool);
-
-ngx_http_request_t *ngx_http_lua_create_fake_request(ngx_connection_t *c);
-
-ngx_int_t ngx_http_lua_report(ngx_log_t *log, lua_State *L, int status,
-    const char *prefix);
-
-int ngx_http_lua_do_call(ngx_log_t *log, lua_State *L);
-
-ngx_http_cleanup_t *ngx_http_lua_cleanup_add(ngx_http_request_t *r,
-    size_t size);
-
-void ngx_http_lua_cleanup_free(ngx_http_request_t *r,
-    ngx_http_cleanup_pt *cleanup);
-
-
-#define ngx_http_lua_check_if_abortable(L, ctx)                              \
-    if ((ctx)->no_abort) {                                                   \
-        return luaL_error(L, "attempt to abort with pending subrequests");   \
-    }
-
-
-static ngx_inline void
-ngx_http_lua_init_ctx(ngx_http_request_t *r, ngx_http_lua_ctx_t *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;
-    ctx->request = r;
-}
-
-
-static ngx_inline ngx_http_lua_ctx_t *
-ngx_http_lua_create_ctx(ngx_http_request_t *r)
-{
-    lua_State                   *L;
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_pool_cleanup_t          *cln;
-    ngx_http_lua_loc_conf_t     *llcf;
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    ctx = ngx_palloc(r->pool, sizeof(ngx_http_lua_ctx_t));
-    if (ctx == NULL) {
-        return NULL;
-    }
-
-    ngx_http_lua_init_ctx(r, ctx);
-    ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-    if (!llcf->enable_code_cache && r->connection->fd != (ngx_socket_t) -1) {
-        lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-
-        dd("lmcf: %p", lmcf);
-
-        L = ngx_http_lua_init_vm(lmcf->lua, lmcf->cycle, r->pool, lmcf,
-                                 r->connection->log, &cln);
-        if (L == NULL) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "failed to initialize Lua VM");
-            return NULL;
-        }
-
-        if (lmcf->init_handler) {
-            if (lmcf->init_handler(r->connection->log, lmcf, L) != NGX_OK) {
-                /* an error happened */
-                return NULL;
-            }
-        }
-
-        ctx->vm_state = cln->data;
-
-    } else {
-        ctx->vm_state = NULL;
-    }
-
-    return ctx;
-}
-
-
-static ngx_inline lua_State *
-ngx_http_lua_get_lua_vm(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
-{
-    ngx_http_lua_main_conf_t    *lmcf;
-
-    if (ctx == NULL) {
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    }
-
-    if (ctx && ctx->vm_state) {
-        return ctx->vm_state->vm;
-    }
-
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-    dd("lmcf->lua: %p", lmcf->lua);
-    return lmcf->lua;
-}
-
-
-#define ngx_http_lua_req_key  "__ngx_req"
-
-
-static ngx_inline ngx_http_request_t *
-ngx_http_lua_get_req(lua_State *L)
-{
-    ngx_http_request_t    *r;
-
-    lua_getglobal(L, ngx_http_lua_req_key);
-    r = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    return r;
-}
-
-
-static ngx_inline void
-ngx_http_lua_set_req(lua_State *L, ngx_http_request_t *r)
-{
-    lua_pushlightuserdata(L, r);
-    lua_setglobal(L, ngx_http_lua_req_key);
-}
-
-
-static ngx_inline void
-ngx_http_lua_get_globals_table(lua_State *L)
-{
-    lua_pushvalue(L, LUA_GLOBALSINDEX);
-}
-
-
-static ngx_inline void
-ngx_http_lua_set_globals_table(lua_State *L)
-{
-    lua_replace(L, LUA_GLOBALSINDEX);
-}
-
-
-#define ngx_http_lua_hash_literal(s)                                         \
-    ngx_http_lua_hash_str((u_char *) s, sizeof(s) - 1)
-
-
-static ngx_inline ngx_uint_t
-ngx_http_lua_hash_str(u_char *src, size_t n)
-{
-    ngx_uint_t  key;
-
-    key = 0;
-
-    while (n--) {
-        key = ngx_hash(key, *src);
-        src++;
-    }
-
-    return key;
-}
-
-
-static ngx_inline ngx_int_t
-ngx_http_lua_set_content_type(ngx_http_request_t *r)
-{
-    ngx_http_lua_loc_conf_t     *llcf;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-    if (llcf->use_default_type
-        && r->headers_out.status != NGX_HTTP_NOT_MODIFIED)
-    {
-        return ngx_http_set_content_type(r);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_inline void
-ngx_http_lua_cleanup_pending_operation(ngx_http_lua_co_ctx_t *coctx)
-{
-    if (coctx->cleanup) {
-        coctx->cleanup(coctx);
-        coctx->cleanup = NULL;
-    }
-}
-
-
-static ngx_inline ngx_chain_t *
-ngx_http_lua_get_flush_chain(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
-{
-    ngx_chain_t  *cl;
-
-    cl = ngx_http_lua_chain_get_free_buf(r->connection->log, r->pool,
-                                         &ctx->free_bufs, 0);
-    if (cl == NULL) {
-        return NULL;
-    }
-
-    cl->buf->flush = 1;
-
-    return cl;
-}
-
-
-#if (nginx_version < 1011002)
-static ngx_inline in_port_t
-ngx_inet_get_port(struct sockaddr *sa)
-{
-    struct sockaddr_in   *sin;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6  *sin6;
-#endif
-
-    switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) sa;
-        return ntohs(sin6->sin6_port);
-#endif
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-    case AF_UNIX:
-        return 0;
-#endif
-
-    default: /* AF_INET */
-        sin = (struct sockaddr_in *) sa;
-        return ntohs(sin->sin_port);
-    }
-}
-#endif
-
-
-extern ngx_uint_t  ngx_http_lua_location_hash;
-extern ngx_uint_t  ngx_http_lua_content_length_hash;
-
-
-#endif /* _NGX_HTTP_LUA_UTIL_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_variable.c b/debian/modules/http-lua/src/ngx_http_lua_variable.c
deleted file mode 100644
index e489d9e..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_variable.c
+++ /dev/null
@@ -1,509 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#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);
-static int ngx_http_lua_var_set(lua_State *L);
-
-
-void
-ngx_http_lua_inject_variable_api(lua_State *L)
-{
-    /* {{{ register reference maps */
-    lua_newtable(L);    /* ngx.var */
-
-    lua_createtable(L, 0, 2 /* nrec */); /* metatable for .var */
-    lua_pushcfunction(L, ngx_http_lua_var_get);
-    lua_setfield(L, -2, "__index");
-    lua_pushcfunction(L, ngx_http_lua_var_set);
-    lua_setfield(L, -2, "__newindex");
-    lua_setmetatable(L, -2);
-
-    lua_setfield(L, -2, "var");
-}
-
-
-/**
- * Get nginx internal variables content
- *
- * @retval Always return a string or nil on Lua stack. Return nil when failed
- * to get content, and actual content string when found the specified variable.
- * @seealso ngx_http_lua_var_set
- * */
-static int
-ngx_http_lua_var_get(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    u_char                      *p, *lowcase;
-    size_t                       len;
-    ngx_uint_t                   hash;
-    ngx_str_t                    name;
-    ngx_http_variable_value_t   *vv;
-
-#if (NGX_PCRE)
-    u_char                      *val;
-    ngx_uint_t                   n;
-    LUA_NUMBER                   index;
-    int                         *cap;
-#endif
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-#if (NGX_PCRE)
-    if (lua_type(L, -1) == LUA_TNUMBER) {
-        /* it is a regex capturing variable */
-
-        index = lua_tonumber(L, -1);
-
-        if (index <= 0) {
-            lua_pushnil(L);
-            return 1;
-        }
-
-        n = (ngx_uint_t) index * 2;
-
-        dd("n = %d, ncaptures = %d", (int) n, (int) r->ncaptures);
-
-        if (r->captures == NULL
-            || r->captures_data == NULL
-            || n >= r->ncaptures)
-        {
-            lua_pushnil(L);
-            return 1;
-        }
-
-        /* n >= 0 && n < r->ncaptures */
-
-        cap = r->captures;
-
-        p = r->captures_data;
-
-        val = &p[cap[n]];
-
-        lua_pushlstring(L, (const char *) val, (size_t) (cap[n + 1] - cap[n]));
-
-        return 1;
-    }
-#endif
-
-    if (lua_type(L, -1) != LUA_TSTRING) {
-        return luaL_error(L, "bad variable name");
-    }
-
-    p = (u_char *) lua_tolstring(L, -1, &len);
-
-    lowcase = lua_newuserdata(L, len);
-
-    hash = ngx_hash_strlow(lowcase, p, len);
-
-    name.len = len;
-    name.data = lowcase;
-
-    vv = ngx_http_get_variable(r, &name, hash);
-
-    if (vv == NULL || vv->not_found) {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    lua_pushlstring(L, (const char *) vv->data, (size_t) vv->len);
-    return 1;
-}
-
-
-/**
- * Set nginx internal variable content
- *
- * @retval Always return a boolean on Lua stack. Return true when variable
- * content was modified successfully, false otherwise.
- * @seealso ngx_http_lua_var_get
- * */
-static int
-ngx_http_lua_var_set(lua_State *L)
-{
-    ngx_http_variable_t         *v;
-    ngx_http_variable_value_t   *vv;
-    ngx_http_core_main_conf_t   *cmcf;
-    u_char                      *p, *lowcase, *val;
-    size_t                       len;
-    ngx_str_t                    name;
-    ngx_uint_t                   hash;
-    ngx_http_request_t          *r;
-    int                          value_type;
-    const char                  *msg;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    /* we skip the first argument that is the table */
-
-    /* we read the variable name */
-
-    if (lua_type(L, 2) != LUA_TSTRING) {
-        return luaL_error(L, "bad variable name");
-    }
-
-    p = (u_char *) lua_tolstring(L, 2, &len);
-
-    lowcase = lua_newuserdata(L, len + 1);
-
-    hash = ngx_hash_strlow(lowcase, p, len);
-    lowcase[len] = '\0';
-
-    name.len = len;
-    name.data = lowcase;
-
-    /* we read the variable new value */
-
-    value_type = lua_type(L, 3);
-    switch (value_type) {
-    case LUA_TNUMBER:
-    case LUA_TSTRING:
-        p = (u_char *) luaL_checklstring(L, 3, &len);
-
-        val = ngx_palloc(r->pool, len);
-        if (val == NULL) {
-            return luaL_error(L, "memory allocation error");
-        }
-
-        ngx_memcpy(val, p, len);
-
-        break;
-
-    case LUA_TNIL:
-        /* undef the variable */
-
-        val = NULL;
-        len = 0;
-
-        break;
-
-    default:
-        msg = lua_pushfstring(L, "string, number, or nil expected, "
-                              "but got %s", lua_typename(L, value_type));
-        return luaL_argerror(L, 1, msg);
-    }
-
-    /* we fetch the variable itself */
-
-    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-    v = ngx_hash_find(&cmcf->variables_hash, hash, name.data, name.len);
-
-    if (v) {
-        if (!(v->flags & NGX_HTTP_VAR_CHANGEABLE)) {
-            return luaL_error(L, "variable \"%s\" not changeable", lowcase);
-        }
-
-        if (v->set_handler) {
-
-            dd("set variables with set_handler");
-
-            vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t));
-            if (vv == NULL) {
-                return luaL_error(L, "no memory");
-            }
-
-            if (value_type == LUA_TNIL) {
-                vv->valid = 0;
-                vv->not_found = 1;
-                vv->no_cacheable = 0;
-                vv->data = NULL;
-                vv->len = 0;
-
-            } else {
-                vv->valid = 1;
-                vv->not_found = 0;
-                vv->no_cacheable = 0;
-
-                vv->data = val;
-                vv->len = len;
-            }
-
-            v->set_handler(r, vv, v->data);
-
-            return 0;
-        }
-
-        if (v->flags & NGX_HTTP_VAR_INDEXED) {
-            vv = &r->variables[v->index];
-
-            dd("set indexed variable");
-
-            if (value_type == LUA_TNIL) {
-                vv->valid = 0;
-                vv->not_found = 1;
-                vv->no_cacheable = 0;
-
-                vv->data = NULL;
-                vv->len = 0;
-
-            } else {
-                vv->valid = 1;
-                vv->not_found = 0;
-                vv->no_cacheable = 0;
-
-                vv->data = val;
-                vv->len = len;
-            }
-
-            return 0;
-        }
-
-        return luaL_error(L, "variable \"%s\" cannot be assigned a value",
-                          lowcase);
-    }
-
-    /* variable not found */
-
-    return luaL_error(L, "variable \"%s\" not found for writing; "
-                      "maybe it is a built-in variable that is not changeable "
-                      "or you forgot to use \"set $%s '';\" "
-                      "in the config file to define it first",
-                      lowcase, lowcase);
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_var_get(ngx_http_request_t *r, u_char *name_data,
-    size_t name_len, u_char *lowcase_buf, int capture_id, u_char **value,
-    size_t *value_len, char **err)
-{
-    ngx_uint_t                   hash;
-    ngx_str_t                    name;
-    ngx_http_variable_value_t   *vv;
-
-#if (NGX_PCRE)
-    u_char                      *p;
-    ngx_uint_t                   n;
-    int                         *cap;
-#endif
-
-    if (r == NULL) {
-        *err = "no request object found";
-        return NGX_ERROR;
-    }
-
-    if ((r)->connection->fd == (ngx_socket_t) -1) {
-        *err = "API disabled in the current context";
-        return NGX_ERROR;
-    }
-
-#if (NGX_PCRE)
-    if (name_data == 0) {
-        if (capture_id <= 0) {
-            return NGX_DECLINED;
-        }
-
-        /* it is a regex capturing variable */
-
-        n = (ngx_uint_t) capture_id * 2;
-
-        dd("n = %d, ncaptures = %d", (int) n, (int) r->ncaptures);
-
-        if (r->captures == NULL
-            || r->captures_data == NULL
-            || n >= r->ncaptures)
-        {
-            return NGX_DECLINED;
-        }
-
-        /* n >= 0 && n < r->ncaptures */
-
-        cap = r->captures;
-        p = r->captures_data;
-
-        *value = &p[cap[n]];
-        *value_len = (size_t) (cap[n + 1] - cap[n]);
-
-        return NGX_OK;
-    }
-#endif
-
-    hash = ngx_hash_strlow(lowcase_buf, name_data, name_len);
-
-    name.data = lowcase_buf;
-    name.len = name_len;
-
-    dd("variable name: %.*s", (int) name_len, lowcase_buf);
-
-    vv = ngx_http_get_variable(r, &name, hash);
-    if (vv == NULL || vv->not_found) {
-        return NGX_DECLINED;
-    }
-
-    *value = vv->data;
-    *value_len = vv->len;
-    return NGX_OK;
-}
-
-
-int
-ngx_http_lua_ffi_var_set(ngx_http_request_t *r, u_char *name_data,
-    size_t name_len, u_char *lowcase_buf, u_char *value, size_t value_len,
-    u_char *errbuf, size_t *errlen)
-{
-    u_char                      *p;
-    ngx_uint_t                   hash;
-    ngx_http_variable_t         *v;
-    ngx_http_variable_value_t   *vv;
-    ngx_http_core_main_conf_t   *cmcf;
-
-    if (r == NULL) {
-        *errlen = ngx_snprintf(errbuf, *errlen, "no request object found")
-                  - errbuf;
-        return NGX_ERROR;
-    }
-
-    if ((r)->connection->fd == (ngx_socket_t) -1) {
-        *errlen = ngx_snprintf(errbuf, *errlen,
-                               "API disabled in the current context")
-                  - errbuf;
-        return NGX_ERROR;
-    }
-
-    hash = ngx_hash_strlow(lowcase_buf, name_data, name_len);
-
-    dd("variable name: %.*s", (int) name_len, lowcase_buf);
-
-    /* we fetch the variable itself */
-
-    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-    v = ngx_hash_find(&cmcf->variables_hash, hash, lowcase_buf, name_len);
-
-    if (v) {
-        if (!(v->flags & NGX_HTTP_VAR_CHANGEABLE)) {
-            dd("variable not changeable");
-            *errlen = ngx_snprintf(errbuf, *errlen,
-                                   "variable \"%*s\" not changeable",
-                                   name_len, lowcase_buf)
-                      - errbuf;
-            return NGX_ERROR;
-        }
-
-        if (v->set_handler) {
-
-            dd("set variables with set_handler");
-
-            if (value != NULL && value_len) {
-                vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t)
-                                + value_len);
-                if (vv == NULL) {
-                    goto nomem;
-                }
-
-                p = (u_char *) vv + sizeof(ngx_http_variable_value_t);
-                ngx_memcpy(p, value, value_len);
-                value = p;
-
-            } else {
-                vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t));
-                if (vv == NULL) {
-                    goto nomem;
-                }
-            }
-
-            if (value == NULL) {
-                vv->valid = 0;
-                vv->not_found = 1;
-                vv->no_cacheable = 0;
-                vv->data = NULL;
-                vv->len = 0;
-
-            } else {
-                vv->valid = 1;
-                vv->not_found = 0;
-                vv->no_cacheable = 0;
-
-                vv->data = value;
-                vv->len = value_len;
-            }
-
-            v->set_handler(r, vv, v->data);
-            return NGX_OK;
-        }
-
-        if (v->flags & NGX_HTTP_VAR_INDEXED) {
-            vv = &r->variables[v->index];
-
-            dd("set indexed variable");
-
-            if (value == NULL) {
-                vv->valid = 0;
-                vv->not_found = 1;
-                vv->no_cacheable = 0;
-
-                vv->data = NULL;
-                vv->len = 0;
-
-            } else {
-                p = ngx_palloc(r->pool, value_len);
-                if (p == NULL) {
-                    goto nomem;
-                }
-
-                ngx_memcpy(p, value, value_len);
-                value = p;
-
-                vv->valid = 1;
-                vv->not_found = 0;
-                vv->no_cacheable = 0;
-
-                vv->data = value;
-                vv->len = value_len;
-            }
-
-            return NGX_OK;
-        }
-
-        *errlen = ngx_snprintf(errbuf, *errlen,
-                               "variable \"%*s\" cannot be assigned "
-                               "a value", name_len, lowcase_buf)
-                  - errbuf;
-        return NGX_ERROR;
-    }
-
-    /* variable not found */
-
-    *errlen = ngx_snprintf(errbuf, *errlen,
-                           "variable \"%*s\" not found for writing; "
-                           "maybe it is a built-in variable that is not "
-                           "changeable or you forgot to use \"set $%*s '';\" "
-                           "in the config file to define it first",
-                           name_len, lowcase_buf, name_len, lowcase_buf)
-              - errbuf;
-    return NGX_ERROR;
-
-nomem:
-
-    *errlen = ngx_snprintf(errbuf, *errlen, "no memory") - errbuf;
-    return NGX_ERROR;
-}
-#endif /* NGX_LUA_NO_FFI_API */
-
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_variable.h b/debian/modules/http-lua/src/ngx_http_lua_variable.h
deleted file mode 100644
index 550e4d3..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_variable.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * Copyright (C) Xiaozhe Wang (chaoslawful)
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_VARIABLE_H_INCLUDED_
-#define _NGX_HTTP_LUA_VARIABLE_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_variable_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_VARIABLE_H_INCLUDED_ */
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-lua/src/ngx_http_lua_worker.c b/debian/modules/http-lua/src/ngx_http_lua_worker.c
deleted file mode 100644
index 461509b..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_worker.c
+++ /dev/null
@@ -1,193 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_lua_worker.h"
-
-
-#define NGX_PROCESS_PRIVILEGED_AGENT    99
-
-
-static int ngx_http_lua_ngx_worker_exiting(lua_State *L);
-static int ngx_http_lua_ngx_worker_pid(lua_State *L);
-static int ngx_http_lua_ngx_worker_id(lua_State *L);
-static int ngx_http_lua_ngx_worker_count(lua_State *L);
-
-
-void
-ngx_http_lua_inject_worker_api(lua_State *L)
-{
-    lua_createtable(L, 0 /* narr */, 4 /* nrec */);    /* ngx.worker. */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_worker_exiting);
-    lua_setfield(L, -2, "exiting");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_worker_pid);
-    lua_setfield(L, -2, "pid");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_worker_id);
-    lua_setfield(L, -2, "id");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_worker_count);
-    lua_setfield(L, -2, "count");
-
-    lua_setfield(L, -2, "worker");
-}
-
-
-static int
-ngx_http_lua_ngx_worker_exiting(lua_State *L)
-{
-    lua_pushboolean(L, ngx_exiting);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_worker_pid(lua_State *L)
-{
-    lua_pushinteger(L, (lua_Integer) ngx_pid);
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_worker_id(lua_State *L)
-{
-#if (nginx_version >= 1009001)
-    if (ngx_process != NGX_PROCESS_WORKER
-        && ngx_process != NGX_PROCESS_SINGLE)
-    {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    lua_pushinteger(L, (lua_Integer) ngx_worker);
-#else
-    lua_pushnil(L);
-#endif
-    return 1;
-}
-
-
-static int
-ngx_http_lua_ngx_worker_count(lua_State *L)
-{
-    ngx_core_conf_t   *ccf;
-
-    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                           ngx_core_module);
-
-    lua_pushinteger(L, (lua_Integer) ccf->worker_processes);
-    return 1;
-}
-
-
-#ifndef NGX_LUA_NO_FFI_API
-int
-ngx_http_lua_ffi_worker_pid(void)
-{
-    return (int) ngx_pid;
-}
-
-
-int
-ngx_http_lua_ffi_worker_id(void)
-{
-#if (nginx_version >= 1009001)
-    if (ngx_process != NGX_PROCESS_WORKER
-        && ngx_process != NGX_PROCESS_SINGLE)
-    {
-        return -1;
-    }
-
-    return (int) ngx_worker;
-#else
-    return -1;
-#endif
-}
-
-
-int
-ngx_http_lua_ffi_worker_exiting(void)
-{
-    return (int) ngx_exiting;
-}
-
-
-int
-ngx_http_lua_ffi_worker_count(void)
-{
-    ngx_core_conf_t   *ccf;
-
-    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                           ngx_core_module);
-
-    return (int) ccf->worker_processes;
-}
-
-
-int
-ngx_http_lua_ffi_master_pid(void)
-{
-#if (nginx_version >= 1013008)
-    if (ngx_process == NGX_PROCESS_SINGLE) {
-        return (int) ngx_pid;
-    }
-
-    return (int) ngx_parent;
-#else
-    return NGX_ERROR;
-#endif
-}
-
-
-int
-ngx_http_lua_ffi_get_process_type(void)
-{
-#if defined(HAVE_PRIVILEGED_PROCESS_PATCH) && !NGX_WIN32
-    if (ngx_process == NGX_PROCESS_HELPER) {
-        if (ngx_is_privileged_agent) {
-            return NGX_PROCESS_PRIVILEGED_AGENT;
-        }
-    }
-#endif
-
-    return ngx_process;
-}
-
-
-int
-ngx_http_lua_ffi_enable_privileged_agent(char **err)
-{
-#ifdef HAVE_PRIVILEGED_PROCESS_PATCH
-    ngx_core_conf_t   *ccf;
-
-    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                           ngx_core_module);
-
-    ccf->privileged_agent = 1;
-
-    return NGX_OK;
-
-#else
-    *err = "missing privileged agent process patch in the nginx core";
-    return NGX_ERROR;
-#endif
-}
-
-
-void
-ngx_http_lua_ffi_process_signal_graceful_exit(void)
-{
-    ngx_quit = 1;
-}
-#endif
diff --git a/debian/modules/http-lua/src/ngx_http_lua_worker.h b/debian/modules/http-lua/src/ngx_http_lua_worker.h
deleted file mode 100644
index 3080394..0000000
--- a/debian/modules/http-lua/src/ngx_http_lua_worker.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef _NGX_HTTP_LUA_WORKER_H_INCLUDED_
-#define _NGX_HTTP_LUA_WORKER_H_INCLUDED_
-
-
-#include "ngx_http_lua_common.h"
-
-
-void ngx_http_lua_inject_worker_api(lua_State *L);
-
-
-#endif /* _NGX_HTTP_LUA_WORKER_H_INCLUDED_ */
diff --git a/debian/modules/http-lua/t/000--init.t b/debian/modules/http-lua/t/000--init.t
deleted file mode 100644
index dbe2c33..0000000
--- a/debian/modules/http-lua/t/000--init.t
+++ /dev/null
@@ -1,85 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
-
-our $http_config = <<'_EOC_';
-    upstream database {
-        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
-                       dbname=ngx_test user=ngx_test password=ngx_test;
-    }
-
-    lua_package_path "../lua-resty-mysql/lib/?.lua;;";
-_EOC_
-
-no_shuffle();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: conv_uid - drop table
---- http_config eval: $::http_config
---- config
-    location = /init {
-        content_by_lua_block {
-            local mysql = require "resty.mysql"
-            local db = assert(mysql:new())
-            local ok, err, errcode, sqlstate = db:connect{
-                host = "127.0.0.1",
-                port = $TEST_NGINX_MYSQL_PORT,
-                database = "ngx_test",
-                user = "ngx_test",
-                password = "ngx_test",
-                charset = "utf8",
-            }
-
-            local queries = {
-                "DROP TABLE IF EXISTS conv_uid",
-                "CREATE TABLE conv_uid(id serial primary key, new_uid integer, old_uid integer)",
-                "INSERT INTO conv_uid(old_uid,new_uid) VALUES(32,56),(35,78)",
-            }
-
-            for _, query in ipairs(queries) do
-                local ok, err = db:query(query)
-                if not ok then
-                    ngx.say("failed to run mysql query \"", query, "\": ", err)
-                    return
-                end
-            end
-
-            ngx.say("done!")
-        }
-    }
---- request
-GET /init
---- response_body
-done!
---- timeout: 10
---- no_error_log
-[error]
-
-
-
-=== TEST 2: flush data from memcached
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-GET /flush
---- error_code: 200
---- response_body eval
-"OK\r
-"
---- timeout: 10
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/000-sanity.t b/debian/modules/http-lua/t/000-sanity.t
deleted file mode 100644
index 87854ef..0000000
--- a/debian/modules/http-lua/t/000-sanity.t
+++ /dev/null
@@ -1,33 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => blocks() * repeat_each() * 2;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity (integer)
---- config
-    location /lua {
-        echo 2;
-    }
---- request
-GET /lua
---- response_body
-2
-
-
-
-=== TEST 2: sanity (string)
---- config
-    location /lua {
-        echo "helloworld";
-    }
---- request
-GET /lua
---- response_body
-helloworld
diff --git a/debian/modules/http-lua/t/001-set.t b/debian/modules/http-lua/t/001-set.t
deleted file mode 100644
index ba8f22c..0000000
--- a/debian/modules/http-lua/t/001-set.t
+++ /dev/null
@@ -1,797 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 4);
-
-#log_level("warn");
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple set (integer)
---- config
-    location /lua {
-        set_by_lua $res "return 1+1";
-        echo $res;
-    }
---- request
-GET /lua
---- response_body
-2
---- no_error_log
-[error]
-
-
-
-=== TEST 2: simple set (string)
---- config
-    location /lua {
-        set_by_lua $res "return 'hello' .. 'world'";
-        echo $res;
-    }
---- request
-GET /lua
---- response_body
-helloworld
---- no_error_log
-[error]
-
-
-
-=== TEST 3: internal only
---- config
-    location /lua {
-        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(10)";
-        echo $res;
-    }
---- request
-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;
-        echo $res;
-    }
---- request
-GET /lua?a=1&b=2
---- response_body
-3
---- no_error_log
-[error]
-
-
-
-=== TEST 5: fib by arg
---- config
-    location /fib {
-        set_by_lua $res "function fib(n) if n > 2 then return fib(n-1)+fib(n-2) else return 1 end end return fib(tonumber(ngx.arg[1]))" $arg_n;
-        echo $res;
-    }
---- request
-GET /fib?n=10
---- response_body
-55
---- no_error_log
-[error]
-
-
-
-=== TEST 6: adder
---- config
-    location = /adder {
-        set_by_lua $res
-            "local a = tonumber(ngx.arg[1])
-             local b = tonumber(ngx.arg[2])
-             return a + b" $arg_a $arg_b;
-
-        echo $res;
-    }
---- request
-GET /adder?a=25&b=75
---- response_body
-100
---- no_error_log
-[error]
-
-
-
-=== TEST 7: read nginx variables directly from within Lua
---- config
-    location = /set-both {
-        set $b 32;
-        set_by_lua $a "return tonumber(ngx.var.b) + 1";
-
-        echo "a = $a";
-    }
---- request
-GET /set-both
---- response_body
-a = 33
---- no_error_log
-[error]
-
-
-
-=== TEST 8: set nginx variables directly from within Lua
---- config
-    location = /set-both {
-        set $b "";
-        set_by_lua $a "ngx.var.b = 32; return 7";
-
-        echo "a = $a";
-        echo "b = $b";
-    }
---- request
-GET /set-both
---- response_body
-a = 7
-b = 32
---- no_error_log
-[error]
-
-
-
-=== TEST 9: set non-existent nginx variables
---- config
-    location = /set-both {
-        #set $b "";
-        set_by_lua $a "ngx.var.b = 32; return 7";
-
-        echo "a = $a";
-    }
---- request
-GET /set-both
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-variable "b" not found for writing; maybe it is a built-in variable that is not changeable or you forgot to use "set $b '';" in the config file to define it first
-
-
-
-=== TEST 10: set quote sql str
---- config
-    location = /set {
-        set $a "";
-        set_by_lua $a "return ngx.quote_sql_str(ngx.var.a)";
-        echo $a;
-    }
---- request
-GET /set
---- response_body
-''
---- no_error_log
-[error]
-
-
-
-=== TEST 11: set md5
---- config
-    location = /md5 {
-        set_by_lua $a 'return ngx.md5("hello")';
-        echo $a;
-    }
---- request
-GET /md5
---- response_body
-5d41402abc4b2a76b9719d911017c592
---- no_error_log
-[error]
-
-
-
-=== TEST 12: no ngx.print
---- config
-    location /lua {
-        set_by_lua $res "ngx.print(32) return 1";
-        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 13: no ngx.say
---- config
-    location /lua {
-        set_by_lua $res "ngx.say(32) return 1";
-        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 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;
-        rewrite_by_lua '
-            ngx.var.limit_rate = 180;
-        ';
-        echo "limit rate = $limit_rate";
-    }
---- request
-    GET /lua
---- response_body
-limit rate = 180
---- no_error_log
-[error]
-
-
-
-=== TEST 29: set $args and read $query_string
---- config
-    location /lua {
-        set $args 'hello';
-        rewrite_by_lua '
-            ngx.var.args = "world";
-        ';
-        echo $query_string;
-    }
---- request
-    GET /lua
---- response_body
-world
---- no_error_log
-[error]
-
-
-
-=== TEST 30: set $arg_xxx
---- config
-    location /lua {
-        rewrite_by_lua '
-            ngx.var.arg_foo = "world";
-        ';
-        echo $arg_foo;
-    }
---- request
-    GET /lua?foo=3
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-variable "arg_foo" not found for writing; maybe it is a built-in variable that is not changeable or you forgot to use "set $arg_foo '';" in the config file to define it first
-
-
-
-=== TEST 31: symbol $ in lua code of set_by_lua
---- config
-    location /lua {
-        set_by_lua $res 'return "$unknown"';
-        echo $res;
-    }
---- request
-    GET /lua
---- response_body
-$unknown
---- no_error_log
-[error]
-
-
-
-=== TEST 32: symbol $ in lua code of set_by_lua_file
---- config
-    location /lua {
-        set_by_lua_file $res html/a.lua;
-        echo $res;
-    }
---- user_files
->>> a.lua
-return "$unknown"
---- request
-    GET /lua
---- response_body
-$unknown
---- no_error_log
-[error]
-
-
-
-=== TEST 33: external script files with arguments
---- config
-    location /lua {
-        set_by_lua_file $res html/a.lua $arg_a $arg_b;
-        echo $res;
-    }
---- user_files
->>> a.lua
-return ngx.arg[1] + ngx.arg[2]
---- request
-GET /lua?a=5&b=2
---- response_body
-7
---- no_error_log
-[error]
-
-
-
-=== TEST 34: variables in set_by_lua_file's file path
---- config
-    location /lua {
-        set $path "html/a.lua";
-        set_by_lua_file $res $path $arg_a $arg_b;
-        echo $res;
-    }
---- user_files
->>> a.lua
-return ngx.arg[1] + ngx.arg[2]
---- request
-GET /lua?a=5&b=2
---- response_body
-7
---- 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*: 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'
-
-
-
-=== TEST 46: Lua file does not exist
---- config
-    location /lua {
-        set_by_lua_file $a html/test2.lua;
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-qr/failed to load external Lua file ".*?test2\.lua": cannot open .*? No such file or directory/
diff --git a/debian/modules/http-lua/t/002-content.t b/debian/modules/http-lua/t/002-content.t
deleted file mode 100644
index cc92d6f..0000000
--- a/debian/modules/http-lua/t/002-content.t
+++ /dev/null
@@ -1,844 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2 + 23);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: basic print
---- config
-    location /lua {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        content_by_lua '
-            local ok, err = ngx.print("Hello, Lua!\\n")
-            if not ok then
-                ngx.log(ngx.ERR, "print failed: ", err)
-            end
-        ';
-    }
---- request
-GET /lua
---- response_body
-Hello, Lua!
---- no_error_log
-[error]
-
-
-
-=== TEST 2: basic say
---- config
-    location /say {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        content_by_lua '
-            local ok, err = ngx.say("Hello, Lua!")
-            if not ok then
-                ngx.log(ngx.ERR, "say failed: ", err)
-                return
-            end
-            local ok, err = ngx.say("Yay! ", 123)
-            if not ok then
-                ngx.log(ngx.ERR, "say failed: ", err)
-                return
-            end
-        ';
-    }
---- request
-GET /say
---- response_body
-Hello, Lua!
-Yay! 123
---- no_error_log
-[error]
-
-
-
-=== TEST 3: no ngx.echo
---- config
-    location /lua {
-        content_by_lua 'ngx.echo("Hello, Lua!\\n")';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-qr/content_by_lua\(nginx\.conf:\d+\):1: attempt to call field 'echo' \(a nil value\)/
-
-
-
-=== TEST 4: variable
---- config
-    location /lua {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        content_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
-    }
---- request
-GET /lua?a=1&b=2
---- response_body
-request_uri: /lua?a=1&b=2
-
-
-
-=== TEST 5: variable (file)
---- config
-    location /lua {
-        content_by_lua_file html/test.lua;
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- response_body
-request_uri: /lua?a=1&b=2
-
-
-
-=== TEST 6: calc expression
---- config
-    location /lua {
-        content_by_lua_file html/calc.lua;
-    }
---- user_files
->>> calc.lua
-local function uri_unescape(uri)
-    local function convert(hex)
-        return string.char(tonumber("0x"..hex))
-    end
-    local s = string.gsub(uri, "%%([0-9a-fA-F][0-9a-fA-F])", convert)
-    return s
-end
-
-local function eval_exp(str)
-    return loadstring("return "..str)()
-end
-
-local exp_str = ngx.var["arg_exp"]
--- print("exp: '", exp_str, "'\n")
-local status, res
-status, res = pcall(uri_unescape, exp_str)
-if not status then
-    ngx.print("error: ", res, "\n")
-    return
-end
-status, res = pcall(eval_exp, res)
-if status then
-    ngx.print("result: ", res, "\n")
-else
-    ngx.print("error: ", res, "\n")
-end
---- request
-GET /lua?exp=1%2B2*math.sin(3)%2Fmath.exp(4)-math.sqrt(2)
---- response_body
-result: -0.4090441561579
-
-
-
-=== TEST 7: read $arg_xxx
---- config
-    location = /lua {
-        content_by_lua 'who = ngx.var.arg_who
-            ngx.print("Hello, ", who, "!")';
-    }
---- request
-GET /lua?who=agentzh
---- response_body chomp
-Hello, agentzh!
-
-
-
-=== TEST 8: capture location
---- config
-    location /other {
-        echo "hello, world";
-    }
-
-    location /lua {
-        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status, " "); ngx.print("body=", res.body)';
-    }
---- request
-GET /lua
---- response_body
-status=200 body=hello, world
-
-
-
-ei= TEST 9: capture non-existed location
---- config
-    location /lua {
-        content_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
-    }
---- request
-GET /lua
---- response_body: status=404
-
-
-
-=== TEST 9: invalid capture location (not as expected...)
---- config
-    location /lua {
-        content_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
-    }
---- request
-GET /lua
---- response_body
-res=404
-
-
-
-=== TEST 10: nil is "nil"
---- config
-    location /lua {
-        content_by_lua 'ngx.say(nil)';
-    }
---- request
-GET /lua
---- response_body
-nil
-
-
-
-=== TEST 11: write boolean
---- config
-    location /lua {
-        content_by_lua 'ngx.say(true, " ", false)';
-    }
---- request
-GET /lua
---- response_body
-true false
-
-
-
-=== TEST 12: bad argument type to ngx.location.capture
---- config
-    location /lua {
-        content_by_lua 'ngx.location.capture(nil)';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 13: capture location (default 0);
---- config
- location /recur {
-       content_by_lua '
-           local num = tonumber(ngx.var.arg_num) or 0;
-           ngx.print("num is: ", num, "\\n");
-
-           if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
-               ngx.print("status=", res.status, " ");
-               ngx.print("body=", res.body, "\\n");
-           else
-               ngx.print("end\\n");
-           end
-           ';
-   }
---- request
-GET /recur
---- response_body
-num is: 0
-end
-
-
-
-=== TEST 14: capture location
---- config
- location /recur {
-       content_by_lua '
-           local num = tonumber(ngx.var.arg_num) or 0;
-           ngx.print("num is: ", num, "\\n");
-
-           if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
-               ngx.print("status=", res.status, " ");
-               ngx.print("body=", res.body);
-           else
-               ngx.print("end\\n");
-           end
-           ';
-   }
---- request
-GET /recur?num=3
---- response_body
-num is: 3
-status=200 body=num is: 2
-status=200 body=num is: 1
-status=200 body=num is: 0
-end
-
-
-
-=== TEST 15: setting nginx variables from within Lua
---- config
- location /set {
-       set $a "";
-       content_by_lua 'ngx.var.a = 32; ngx.say(ngx.var.a)';
-       add_header Foo $a;
-   }
---- request
-GET /set
---- response_headers
-Foo: 32
---- response_body
-32
-
-
-
-=== TEST 16: nginx quote sql string 1
---- config
- location /set {
-       set $a 'hello\n\r\'"\\';
-       content_by_lua 'ngx.say(ngx.quote_sql_str(ngx.var.a))';
-   }
---- request
-GET /set
---- response_body
-'hello\n\r\'\"\\'
-
-
-
-=== TEST 17: nginx quote sql string 2
---- config
-location /set {
-    set $a "hello\n\r'\"\\";
-    content_by_lua 'ngx.say(ngx.quote_sql_str(ngx.var.a))';
-}
---- request
-GET /set
---- response_body
-'hello\n\r\'\"\\'
-
-
-
-=== TEST 18: use dollar
---- config
-location /set {
-    content_by_lua '
-        local s = "hello 112";
-        ngx.say(string.find(s, "%d+$"))';
-}
---- request
-GET /set
---- response_body
-79
-
-
-
-=== TEST 19: subrequests do not share variables of main requests by default
---- config
-location /sub {
-    echo $a;
-}
-location /parent {
-    set $a 12;
-    content_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
-}
---- request
-GET /parent
---- response_body eval: "\n"
-
-
-
-=== TEST 20: subrequests can share variables of main requests
---- config
-location /sub {
-    echo $a;
-}
-location /parent {
-    set $a 12;
-    content_by_lua '
-        res = ngx.location.capture(
-            "/sub",
-            { share_all_vars = true }
-        );
-        ngx.print(res.body)
-    ';
-}
---- request
-GET /parent
---- response_body
-12
-
-
-
-=== TEST 21: main requests use subrequests' variables
---- config
-location /sub {
-    set $a 12;
-}
-location /parent {
-    content_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = true });
-        ngx.say(ngx.var.a)
-    ';
-}
---- request
-GET /parent
---- response_body
-12
-
-
-
-=== TEST 22: main requests do NOT use subrequests' variables
---- config
-location /sub {
-    set $a 12;
-}
-location /parent {
-    content_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = false });
-        ngx.say(ngx.var.a)
-    ';
-}
---- request
-GET /parent
---- response_body_like eval: "\n"
-
-
-
-=== TEST 23: capture location headers
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo "hello, world";
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", res.header["Content-Type"]);
-        ';
-    }
---- request
-GET /lua
---- response_body
-type: foo/bar
-
-
-
-=== TEST 24: capture location multi-value headers
---- config
-    location /other {
-        #echo "hello, world";
-        content_by_lua '
-            ngx.header["Set-Cookie"] = {"a", "hello, world", "foo"}
-            local ok, err = ngx.eof()
-            if not ok then
-                ngx.log(ngx.ERR, "eof failed: ", err)
-                return
-            end
-        ';
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", type(res.header["Set-Cookie"]));
-            ngx.say("len: ", #res.header["Set-Cookie"]);
-            ngx.say("value: ", table.concat(res.header["Set-Cookie"], "|"))
-        ';
-    }
---- request
-GET /lua
---- response_body
-type: table
-len: 3
-value: a|hello, world|foo
---- no_error_log
-[error]
-
-
-
-=== TEST 25: capture location headers
---- config
-    location /other {
-        default_type 'foo/bar';
-        content_by_lua '
-            ngx.header.Bar = "Bah";
-        ';
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", res.header["Content-Type"]);
-            ngx.say("Bar: ", res.header["Bar"]);
-        ';
-    }
---- request
-GET /lua
---- response_body
-type: foo/bar
-Bar: Bah
-
-
-
-=== TEST 26: capture location headers
---- config
-    location /other {
-        default_type 'foo/bar';
-        content_by_lua '
-            ngx.header.Bar = "Bah";
-            ngx.header.Bar = nil;
-        ';
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", res.header["Content-Type"]);
-            ngx.say("Bar: ", res.header["Bar"] or "nil");
-        ';
-    }
---- request
-GET /lua
---- response_body
-type: foo/bar
-Bar: nil
-
-
-
-=== TEST 27: HTTP 1.0 response
---- config
-    location /lua {
-        content_by_lua '
-            data = "hello, world"
-            -- ngx.header["Content-Length"] = #data
-            -- ngx.header.content_length = #data
-            ngx.print(data)
-        ';
-    }
-    location /main {
-        proxy_pass http://127.0.0.1:$server_port/lua;
-    }
---- request
-GET /main
---- response_headers
-Content-Length: 12
---- response_body chop
-hello, world
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 28: multiple eof
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("Hi")
-
-            local ok, err = ngx.eof()
-            if not ok then
-                ngx.log(ngx.WARN, "eof failed: ", err)
-                return
-            end
-
-            ok, err = ngx.eof()
-            if not ok then
-                ngx.log(ngx.WARN, "eof failed: ", err)
-                return
-            end
-
-        ';
-    }
---- request
-GET /lua
---- response_body
-Hi
---- no_error_log
-[error]
---- error_log
-eof failed: seen eof
-
-
-
-=== TEST 29: nginx vars in script path
---- config
-    location ~ ^/lua/(.+)$ {
-        content_by_lua_file html/$1.lua;
-    }
---- user_files
->>> calc.lua
-local a,b = ngx.var.arg_a, ngx.var.arg_b
-ngx.say(a+b)
---- request
-GET /lua/calc?a=19&b=81
---- response_body
-100
-
-
-
-=== TEST 30: nginx vars in script path
---- config
-    location ~ ^/lua/(.+)$ {
-        content_by_lua_file html/$1.lua;
-    }
-    location /main {
-        echo_location /lua/sum a=3&b=2;
-        echo_location /lua/diff a=3&b=2;
-    }
---- user_files
->>> sum.lua
-local a,b = ngx.var.arg_a, ngx.var.arg_b
-ngx.say(a+b)
->>> diff.lua
-local a,b = ngx.var.arg_a, ngx.var.arg_b
-ngx.say(a-b)
---- request
-GET /main
---- response_body
-5
-1
-
-
-
-=== TEST 31: basic print (HEAD + HTTP 1.1)
---- config
-    location /lua {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        content_by_lua 'ngx.print("Hello, Lua!\\n")';
-    }
---- request
-HEAD /lua
---- response_body
-
-
-
-=== TEST 32: basic print (HEAD + HTTP 1.0)
---- config
-    location /lua {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        content_by_lua '
-            ngx.print("Hello, Lua!\\n")
-        ';
-    }
---- request
-HEAD /lua HTTP/1.0
---- response_headers
-!Content-Length
---- response_body
-
-
-
-=== TEST 33: headers_sent & HEAD
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say(ngx.headers_sent)
-            local ok, err = ngx.flush()
-            if not ok then
-                ngx.log(ngx.WARN, "failed to flush: ", err)
-                return
-            end
-            ngx.say(ngx.headers_sent)
-        ';
-    }
---- request
-HEAD /lua
---- response_body
---- no_error_log
-[error]
---- error_log
-failed to flush: header only
-
-
-
-=== TEST 34: HEAD & ngx.say
---- config
-    location /lua {
-        content_by_lua '
-            ngx.send_headers()
-            local ok, err = ngx.say(ngx.headers_sent)
-            if not ok then
-                ngx.log(ngx.WARN, "failed to say: ", err)
-                return
-            end
-        ';
-    }
---- request
-HEAD /lua
---- response_body
---- no_error_log
-[error]
---- error_log
-failed to say: header only
-
-
-
-=== TEST 35: ngx.eof before ngx.say
---- config
-    location /lua {
-        content_by_lua '
-            local ok, err = ngx.eof()
-            if not ok then
-                ngx.log(ngx.ERR, "eof failed: ", err)
-                return
-            end
-
-            ok, err = ngx.say(ngx.headers_sent)
-            if not ok then
-                ngx.log(ngx.WARN, "failed to say: ", err)
-                return
-            end
-        ';
-    }
---- request
-GET /lua
---- response_body
---- no_error_log
-[error]
---- error_log
-failed to say: seen eof
-
-
-
-=== TEST 36: headers_sent + GET
---- config
-    location /lua {
-        content_by_lua '
-            -- print("headers sent: ", ngx.headers_sent)
-            ngx.say(ngx.headers_sent)
-            ngx.say(ngx.headers_sent)
-            -- ngx.flush()
-            ngx.say(ngx.headers_sent)
-        ';
-    }
---- request
-GET /lua
---- response_body
-false
-true
-true
-
-
-
-=== TEST 37: HTTP 1.0 response with Content-Length
---- config
-    location /lua {
-        content_by_lua '
-            data = "hello,\\nworld\\n"
-            ngx.header["Content-Length"] = #data
-            ngx.say("hello,")
-            ngx.flush()
-            -- ngx.location.capture("/sleep")
-            ngx.say("world")
-        ';
-    }
-    location /sleep {
-        echo_sleep 2;
-    }
-    location /main {
-        proxy_pass http://127.0.0.1:$server_port/lua;
-    }
---- request
-GET /main
---- response_headers
-Content-Length: 13
---- response_body
-hello,
-world
---- timeout: 5
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 38: 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 39: 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
-
-
-
-=== TEST 40: Lua file does not exist
---- config
-    location /lua {
-        content_by_lua_file html/test2.lua;
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- response_body_like: 404 Not Found
---- error_code: 404
---- error_log eval
-qr/failed to load external Lua file ".*?test2\.lua": cannot open .*? No such file or directory/
-
-
-
-=== TEST 41: .lua file with shebang
---- config
-    location /lua {
-        content_by_lua_file html/test.lua;
-    }
---- user_files
->>> test.lua
-#!/bin/lua
-
-ngx.say("line ", debug.getinfo(1).currentline)
---- request
-GET /lua?a=1&b=2
---- response_body
-line 3
---- no_error_log
-[error]
-
-
-
-=== TEST 42: syntax error in inlined Lua code
---- config
-    location /lua {
-        content_by_lua 'for end';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-qr/failed to load inlined Lua code: /
diff --git a/debian/modules/http-lua/t/003-errors.t b/debian/modules/http-lua/t/003-errors.t
deleted file mode 100644
index ad3a506..0000000
--- a/debian/modules/http-lua/t/003-errors.t
+++ /dev/null
@@ -1,128 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(1);
-
-plan tests => blocks() * repeat_each() * 2;
-
-#$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
-
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: syntax error in lua code chunk
---- config
-    location /lua {
-        set_by_lua $res "local a
-            a = a+;
-            return a";
-        echo $res;
-    }
---- request
-GET /lua
---- error_code: 500
---- response_body_like: 500 Internal Server Error
-
-
-
-=== TEST 2: syntax error in lua file
---- config
-    location /lua {
-        set_by_lua_file $res 'html/test.lua';
-        echo $res;
-    }
---- user_files
->>> test.lua
-local a
-a = 3 +;
-return a
---- request
-GET /lua
---- error_code: 500
---- response_body_like: 500 Internal Server Error
-
-
-
-=== TEST 3: syntax error in lua file (from Guang Feng)
---- config
-    location /lua {
-        set $res '[{"a":32},{"b":64}]';
-        #set $res '[{"friend_userid":1750146},{"friend_userid":1750150},{"friend_userid":1750153},{"friend_userid":1750166},{"friend_userid":1750181},{"friend_userid":1750186},{"friend_userid":1750195},{"friend_userid":1750232}]';
-        set_by_lua_file $list 'html/test.lua' $res;
-        #set_by_lua_file $list 'html/feed.lua' $res;
-        echo $list;
-    }
---- user_files
->>> test.lua
--- local j = require('json')
-local p = ngx.arg[1]
-return p
->>> feed.lua
-local s = require("json")
-local function explode(d,p)
-   local t, ll
-   t={}
-   ll=0
-   if(#p == 1) then return p end
-       while true do
-       l=string.find(p,d,ll+1,true) 
-           if l~=nil then 
-         table.insert(t, string.sub(p,ll,l-1)) 
-         ll=l+1 
-           else
-         table.insert(t, string.sub(p,ll)) 
-         break 
-         end
-     end
-return t
- end
-
-local a = explode(',', string.sub(ngx.arg[1], 2, -1))
-local x = {}
-for i,v in ipairs(a) do table.insert(x,s.decode(v).friend_userid) end
-return table.concat(x,',')
---- request
-GET /lua
---- response_body
-[{"a":32},{"b":64}]
-
-
-
-=== TEST 4: 500 in subrequest
---- config
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/err")
-            ngx.say(res.status);
-        ';
-    }
-    location /err {
-        return 500;
-    }
---- request
-GET /main
---- response_body
-500
-
-
-
-=== TEST 5: drizzle_pass 500 in subrequest
---- config
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/err")
-            ngx.say(res.status);
-        ';
-    }
-    location /err {
-        set $back 'blah-blah';
-        drizzle_pass $back;
-    }
---- request
-GET /main
---- response_body
-500
diff --git a/debian/modules/http-lua/t/004-require.t b/debian/modules/http-lua/t/004-require.t
deleted file mode 100644
index 35e04db..0000000
--- a/debian/modules/http-lua/t/004-require.t
+++ /dev/null
@@ -1,211 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#log_level('warn');
-
-#master_on();
-#repeat_each(120);
-repeat_each(2);
-
-plan tests => blocks() * repeat_each() * 2;
-
-our $HtmlDir = html_dir;
-#warn $html_dir;
-
-#$ENV{LUA_PATH} = "$html_dir/?.lua";
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    location /main {
-        echo_location /load;
-        echo_location /check;
-        echo_location /check;
-    }
-
-    location /load {
-        content_by_lua '
-            package.loaded.foo = nil;
-            collectgarbage()
-            local foo = require "foo";
-            foo.hi()
-        ';
-    }
-
-    location /check {
-        content_by_lua '
-            local foo = package.loaded.foo
-            if foo then
-                ngx.say("found")
-                foo.hi()
-            else
-                ngx.say("not found")
-            end
-        ';
-    }
---- request
-GET /main
---- user_files
->>> foo.lua
-module(..., package.seeall);
-
-ngx.say("loading");
-
-function hi ()
-    ngx.say("hello, foo")
-end;
---- response_body
-loading
-hello, foo
-found
-hello, foo
-found
-hello, foo
-
-
-
-=== TEST 2: sanity
---- http_config eval
-    "lua_package_cpath '$::HtmlDir/?.so';"
---- config
-    location /main {
-        content_by_lua '
-            ngx.print(package.cpath);
-        ';
-    }
---- request
-GET /main
---- user_files
---- response_body_like: ^[^;]+/servroot/html/\?.so$
-
-
-
-=== TEST 3: expand default path (after)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;;';"
---- config
-    location /main {
-        content_by_lua '
-            ngx.print(package.path);
-        ';
-    }
---- request
-GET /main
---- response_body_like: ^[^;]+/servroot/html/\?.lua;.+\.lua;$
-
-
-
-=== TEST 4: expand default cpath (after)
---- http_config eval
-    "lua_package_cpath '$::HtmlDir/?.so;;';"
---- config
-    location /main {
-        content_by_lua '
-            ngx.print(package.cpath);
-        ';
-    }
---- request
-GET /main
---- response_body_like: ^[^;]+/servroot/html/\?.so;.+\.so;$
-
-
-
-=== TEST 5: expand default path (before)
---- http_config eval
-    "lua_package_path ';;$::HtmlDir/?.lua';"
---- config
-    location /main {
-        content_by_lua '
-            ngx.print(package.path);
-        ';
-    }
---- request
-GET /main
---- response_body_like: ^.+\.lua;[^;]+/servroot/html/\?.lua$
-
-
-
-=== TEST 6: expand default cpath (before)
---- http_config eval
-    "lua_package_cpath ';;$::HtmlDir/?.so';"
---- config
-    location /main {
-        content_by_lua '
-            ngx.print(package.cpath);
-        ';
-    }
---- request
-GET /main
---- response_body_like: ^.+\.so;[^;]+/servroot/html/\?.so$
-
-
-
-=== TEST 7: require "ngx" (content_by_lua)
---- config
-    location /ngx {
-        content_by_lua '
-            local ngx = require "ngx"
-            ngx.say("hello, world")
-        ';
-    }
---- request
-GET /ngx
---- response_body
-hello, world
-
-
-
-=== TEST 8: require "ngx" (set_by_lua)
---- config
-    location /ngx {
-        set_by_lua $res '
-            local ngx = require "ngx"
-            return ngx.escape_uri(" ")
-        ';
-        echo $res;
-    }
---- request
-GET /ngx
---- response_body
-%20
-
-
-
-=== TEST 9: require "ndk" (content_by_lua)
---- config
-    location /ndk {
-        content_by_lua '
-            local ndk = require "ndk"
-            local res = ndk.set_var.set_escape_uri(" ")
-            ngx.say(res)
-        ';
-    }
---- request
-GET /ndk
---- response_body
-%20
-
-
-
-=== TEST 10: require "ndk" (set_by_lua)
---- config
-    location /ndk {
-        set_by_lua $res '
-            local ndk = require "ndk"
-            return ndk.set_var.set_escape_uri(" ")
-        ';
-        echo $res;
-    }
---- request
-GET /ndk
---- response_body
-%20
diff --git a/debian/modules/http-lua/t/005-exit.t b/debian/modules/http-lua/t/005-exit.t
deleted file mode 100644
index a5a28b3..0000000
--- a/debian/modules/http-lua/t/005-exit.t
+++ /dev/null
@@ -1,725 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#repeat_each(20000);
-repeat_each(2);
-#master_on();
-#workers(1);
-#log_level('debug');
-#log_level('warn');
-#worker_connections(1024);
-
-plan tests => repeat_each() * (blocks() * 3 + 2);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
-
-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();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: throw 403
---- config
-    location /lua {
-        content_by_lua "ngx.exit(403);ngx.say('hi')";
-    }
---- request
-GET /lua
---- error_code: 403
---- response_body_like: 403 Forbidden
---- no_error_log
-[error]
-
-
-
-=== TEST 2: throw 404
---- config
-    location /lua {
-        content_by_lua "ngx.exit(404);ngx.say('hi');";
-    }
---- request
-GET /lua
---- error_code: 404
---- response_body_like: 404 Not Found
---- no_error_log
-[error]
-
-
-
-=== TEST 3: throw 404 after sending the header and partial body
---- config
-    location /lua {
-        content_by_lua "ngx.say('hi');ngx.exit(404);ngx.say(', you')";
-    }
---- request
-GET /lua
---- error_log
-attempt to set status 404 via ngx.exit after sending out the response status 200
---- no_error_log
-alert
---- response_body
-hi
-
-
-
-=== TEST 4: working with ngx_auth_request (succeeded)
---- config
-    location /auth {
-        content_by_lua "
-            if ngx.var.user == 'agentzh' then
-                ngx.eof();
-            else
-                ngx.exit(403)
-            end";
-    }
-    location /api {
-        set $user $arg_user;
-        auth_request /auth;
-
-        echo "Logged in";
-    }
---- request
-GET /api?user=agentzh
---- error_code: 200
---- response_body
-Logged in
---- no_error_log
-[error]
-
-
-
-=== TEST 5: working with ngx_auth_request (failed)
---- config
-    location /auth {
-        content_by_lua "
-            if ngx.var.user == 'agentzh' then
-                ngx.eof();
-            else
-                ngx.exit(403)
-            end";
-    }
-    location /api {
-        set $user $arg_user;
-        auth_request /auth;
-
-        echo "Logged in";
-    }
---- request
-GET /api?user=agentz
---- error_code: 403
---- response_body_like: 403 Forbidden
---- no_error_log
-[error]
-
-
-
-=== TEST 6: working with ngx_auth_request (simplest form, w/o ngx_memc)
---- http_config eval
-"
-    lua_package_cpath '$::LuaCpath';
-    upstream backend {
-        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;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /conv-uid-mysql {
-        internal;
-
-        set $key "conv-uid-$arg_uid";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        drizzle_query "select new_uid as uid from conv_uid where old_uid=$arg_uid";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /conv-uid {
-        internal;
-        content_by_lua_file 'html/foo.lua';
-    }
-    location /api {
-        set $uid $arg_uid;
-        auth_request /conv-uid;
-
-        echo "Logged in $uid";
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local old_uid = ngx.var.uid
--- print('about to run sr')
-local res = ngx.location.capture('/conv-uid-mysql?uid=' .. old_uid)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
--- print('just have run sr: ' .. res.body)
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].uid or
-        not string.match(res[1].uid, '^%d+$')) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.uid = res[1].uid;
--- print('done')
---- request
-GET /api?uid=32
---- response_body
-Logged in 56
---- no_error_log
-[error]
-
-
-
-=== TEST 7: working with ngx_auth_request (simplest form)
---- http_config eval
-"
-    lua_package_cpath '$::LuaCpath';
-    upstream backend {
-        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;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /conv-uid-mysql {
-        internal;
-
-        set $key "conv-uid-$arg_uid";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        drizzle_query "select new_uid as uid from conv_uid where old_uid=$arg_uid";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /conv-uid {
-        internal;
-        content_by_lua_file 'html/foo.lua';
-    }
-    location /api {
-        set $uid $arg_uid;
-        auth_request /conv-uid;
-
-        echo "Logged in $uid";
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local old_uid = ngx.var.uid
--- print('about to run sr')
-local res = ngx.location.capture('/conv-uid-mysql?uid=' .. old_uid)
--- print('just have run sr' .. res.body)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].uid or
-        not string.match(res[1].uid, '^%d+$')) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.uid = res[1].uid;
--- print('done')
---- request
-GET /api?uid=32
---- response_body
-Logged in 56
---- no_error_log
-[error]
-
-
-
-=== TEST 8: working with ngx_auth_request
---- http_config eval
-"
-    lua_package_cpath '$::LuaCpath';
-    upstream backend {
-        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;
-    }
-
-    upstream memc_b {
-        server 127.0.0.1:\$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    upstream_list memc_cluster memc_a memc_b;
-"
---- config
-    location /memc {
-        internal;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        set_hashed_upstream $backend memc_cluster $arg_key;
-        memc_pass $backend;
-    }
-
-    location /conv-uid-mysql {
-        internal;
-
-        set $key "conv-uid-$arg_uid";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        drizzle_query "select new_uid as uid from conv_uid where old_uid=$arg_uid";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /conv-uid {
-        internal;
-        content_by_lua_file 'html/foo.lua';
-    }
-    location /api {
-        set $uid $arg_uid;
-        auth_request /conv-uid;
-
-        echo "Logged in $uid";
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local old_uid = ngx.var.uid
--- print('about to run sr')
-local res = ngx.location.capture('/conv-uid-mysql?uid=' .. old_uid)
--- print('just have run sr' .. res.body)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].uid or
-        not string.match(res[1].uid, '^%d+$')) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.uid = res[1].uid;
--- print('done')
---- request
-GET /api?uid=32
---- response_body
-Logged in 56
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 9: working with ngx_auth_request
---- http_config
-    upstream backend {
-        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;
-        keepalive 300;
-    }
-
-    #upstream_list memc_cluster memc_a memc_b;
-
---- config
-    location /memc {
-        internal;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        #set_hashed_upstream $backend memc_cluster $arg_key;
-        memc_pass memc_a;
-    }
-
-    location /conv-mysql {
-        internal;
-
-        set $key "conv-uri-$query_string";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        set_quote_sql_str $seo_uri $query_string;
-        drizzle_query "select url from my_url_map where seo_url=$seo_uri";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /conv-uid {
-        internal;
-        content_by_lua_file 'html/foo.lua';
-    }
-
-    location /baz {
-        set $my_uri $uri;
-        auth_request /conv-uid;
-
-        echo_exec /jump $my_uri;
-    }
-
-    location /jump {
-        internal;
-        rewrite ^ $query_string? redirect;
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local seo_uri = ngx.var.my_uri
--- print('about to run sr')
-local res = ngx.location.capture('/conv-mysql?' .. seo_uri)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].url) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.my_uri = res[1].url;
--- print('done')
---- request
-GET /baz
---- response_body_like: 302
---- error_code: 302
---- response_headers
-Location: http://localhost:$ServerPort/foo/bar
---- SKIP
-
-
-
-=== TEST 10: throw 0
---- config
-    location /lua {
-        content_by_lua "ngx.say('Hi'); ngx.eof(); ngx.exit(0);ngx.say('world')";
-    }
---- request
-GET /lua
---- error_code: 200
---- response_body
-Hi
---- no_error_log
-[error]
-
-
-
-=== TEST 11: pcall safe
---- config
-    location /lua {
-        content_by_lua '
-            function f ()
-                ngx.say("hello")
-                ngx.exit(200)
-            end
-
-            pcall(f)
-            ngx.say("world")
-        ';
-    }
---- request
-GET /lua
---- error_code: 200
---- response_body
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 12: 501 Method Not Implemented
---- config
-    location /lua {
-        content_by_lua '
-            ngx.exit(501)
-        ';
-    }
---- request
-GET /lua
---- error_code: 501
---- response_body_like: 501 (?:Method )?Not Implemented
---- no_error_log
-[error]
-
-
-
-=== TEST 13: 501 Method Not Implemented
---- config
-    location /lua {
-        content_by_lua '
-            ngx.exit(ngx.HTTP_METHOD_NOT_IMPLEMENTED)
-        ';
-    }
---- request
-GET /lua
---- error_code: 501
---- response_body_like: 501 (?:Method )?Not Implemented
---- 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]
-
-
-
-=== TEST 16: throw 403 after sending out headers with 403 (HTTP 1.0 buffering)
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.status = 403
-            ngx.say("Hello World")
-            ngx.exit(403)
-        ';
-    }
---- request
-GET /t HTTP/1.0
---- response_body
-Hello World
---- error_code: 403
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 17: throw 444 after sending out responses (HTTP 1.0)
---- config
-    location /lua {
-        content_by_lua "
-            ngx.say('ok');
-            return ngx.exit(444)
-        ";
-    }
---- request
-GET /lua HTTP/1.0
---- ignore_response
---- log_level: debug
---- no_error_log
-lua sending HTTP 1.0 response headers
-[error]
-
-
-
-=== TEST 18: throw 499 after sending out responses (HTTP 1.0)
---- config
-    location /lua {
-        content_by_lua "
-            ngx.say('ok');
-            return ngx.exit(499)
-        ";
-    }
---- request
-GET /lua HTTP/1.0
---- ignore_response
---- log_level: debug
---- no_error_log
-lua sending HTTP 1.0 response headers
-[error]
-
-
-
-=== TEST 19: throw 408 after sending out responses (HTTP 1.0)
---- config
-    location /lua {
-        content_by_lua "
-            ngx.say('ok');
-            return ngx.exit(408)
-        ";
-    }
---- request
-GET /lua HTTP/1.0
---- ignore_response
---- log_level: debug
---- no_error_log
-lua sending HTTP 1.0 response headers
-[error]
-
-
-
-=== TEST 20: exit(201) with custom response body
---- config
-    location = /t {
-        content_by_lua "
-            ngx.status = 201
-            ngx.say('ok');
-            return ngx.exit(201)
-        ";
-    }
---- request
-    GET /t
---- ignore_response
---- log_level: debug
---- no_error_log
-lua sending HTTP 1.0 response headers
-[error]
-[alert]
-
-
-
-=== TEST 21: exit 403 in header filter
---- config
-    location = /t {
-        content_by_lua "ngx.say('hi');";
-        header_filter_by_lua '
-            return ngx.exit(403)
-        ';
-    }
---- request
-GET /t
---- error_code: 403
---- response_body_like: 403 Forbidden
---- no_error_log
-[error]
-
-
-
-=== TEST 22: exit 201 in header filter
---- config
-    lingering_close always;
-    location = /t {
-        content_by_lua "ngx.say('hi');";
-        header_filter_by_lua '
-            return ngx.exit(201)
-        ';
-    }
---- request
-GET /t
---- error_code: 201
---- response_body
---- no_error_log
-[error]
-
-
-
-=== TEST 23: exit both in header filter and content handler
---- config
-    location = /t {
-        content_by_lua "ngx.status = 201 ngx.say('hi') ngx.exit(201)";
-        header_filter_by_lua '
-            return ngx.exit(201)
-        ';
-    }
---- request
-GET /t
---- error_code: 201
---- stap2
-/*
-F(ngx_http_send_header) {
-    printf("=== %d\n", $r->headers_out->status)
-    print_ubacktrace()
-}
-*/
-F(ngx_http_lua_header_filter_inline) {
-    printf("=== %d\n", $r->headers_out->status)
-    print_ubacktrace()
-}
-F(ngx_http_lua_header_filter_by_chunk).return {
-    if ($return == -1) {
-        printf("====== header filter by chunk\n")
-        print_ubacktrace()
-    }
-}
---- stap_out
---- response_body
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 24: exit 444 in header filter
---- config
-    location = /t {
-        content_by_lua "ngx.say('hello world');";
-        header_filter_by_lua '
-            return ngx.exit(444)
-        ';
-    }
---- request
-GET /t
---- error_code: 444
---- response_body
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/006-escape.t b/debian/modules/http-lua/t/006-escape.t
deleted file mode 100644
index a21d3cb..0000000
--- a/debian/modules/http-lua/t/006-escape.t
+++ /dev/null
@@ -1,199 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 2);
-
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: escape uri in set_by_lua
---- config
-    location /escape {
-        set_by_lua $res "return ngx.escape_uri('a 你')";
-        echo $res;
-    }
---- request
-GET /escape
---- response_body
-a%20%E4%BD%A0
-
-
-
-=== TEST 2: unescape uri in set_by_lua
---- config
-    location /unescape {
-        set_by_lua $res "return ngx.unescape_uri('a%20%e4%bd%a0')";
-        echo $res;
-    }
---- request
-GET /unescape
---- response_body
-a 你
-
-
-
-=== TEST 3: escape uri in content_by_lua
---- config
-    location /escape {
-        content_by_lua "ngx.say(ngx.escape_uri('a 你'))";
-    }
---- request
-GET /escape
---- response_body
-a%20%E4%BD%A0
-
-
-
-=== TEST 4: unescape uri in content_by_lua
---- config
-    location /unescape {
-        content_by_lua "ngx.say(ngx.unescape_uri('a%20%e4%bd%a0'))";
-    }
---- request
-GET /unescape
---- response_body
-a 你
-
-
-
-=== TEST 5: escape uri in set_by_lua
---- config
-    location /escape {
-        set_by_lua $res "return ngx.escape_uri('a+b')";
-        echo $res;
-    }
---- request
-GET /escape
---- response_body
-a%2Bb
-
-
-
-=== TEST 6: escape uri in set_by_lua
---- config
-    location /escape {
-        set_by_lua $res "return ngx.escape_uri('\"a/b={}:<>;&[]\\\\^')";
-        echo $res;
-    }
---- request
-GET /escape
---- response_body
-%22a%2Fb%3D%7B%7D%3A%3C%3E%3B%26%5B%5D%5C%5E
-
-
-
-=== TEST 7: escape uri in set_by_lua
---- config
-    location /escape {
-        echo hello;
-        header_filter_by_lua '
-            ngx.header.baz = ngx.escape_uri(" ")
-        ';
-    }
---- request
-GET /escape
---- response_headers
-baz: %20
---- response_body
-hello
-
-
-
-=== TEST 8: escape a string that cannot be escaped
---- config
-    location /escape {
-        set_by_lua $res "return ngx.escape_uri('abc')";
-        echo $res;
-    }
---- request
-GET /escape
---- response_body
-abc
-
-
-
-=== TEST 9: escape an empty string that cannot be escaped
---- config
-    location /escape {
-        set_by_lua $res "return ngx.escape_uri('')";
-        echo $res;
-    }
---- request
-GET /escape
---- response_body eval: "\n"
-
-
-
-=== TEST 10: escape nil
---- config
-    location /escape {
-        set_by_lua $res "return ngx.escape_uri(nil)";
-        echo "[$res]";
-    }
---- request
-GET /escape
---- response_body
-[]
-
-
-
-=== TEST 11: escape numbers
---- config
-    location /escape {
-        set_by_lua $res "return ngx.escape_uri(32)";
-        echo "[$res]";
-    }
---- request
-GET /escape
---- response_body
-[32]
-
-
-
-=== TEST 12: unescape nil
---- config
-    location = /t {
-        set_by_lua $res "return ngx.unescape_uri(nil)";
-        echo "[$res]";
-    }
---- request
-GET /t
---- response_body
-[]
-
-
-
-=== TEST 13: unescape numbers
---- config
-    location = /t {
-        set_by_lua $res "return ngx.unescape_uri(32)";
-        echo "[$res]";
-    }
---- request
-GET /t
---- response_body
-[32]
-
-
-
-=== TEST 14: reserved chars
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say(ngx.escape_uri("-_.!~*'()"))
-            ngx.say(ngx.escape_uri(",$@|`"))
-        }
-    }
---- request
-GET /lua
---- response_body
--_.!~*'()
-%2C%24%40%7C%60
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/007-md5.t b/debian/modules/http-lua/t/007-md5.t
deleted file mode 100644
index 2ae9efb..0000000
--- a/debian/modules/http-lua/t/007-md5.t
+++ /dev/null
@@ -1,102 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: set md5 hello
---- config
-    location = /md5 {
-        content_by_lua 'ngx.say(ngx.md5("hello"))';
-    }
---- request
-GET /md5
---- response_body
-5d41402abc4b2a76b9719d911017c592
-
-
-
-=== TEST 2: nil string to ngx.md5
---- config
-    location = /md5 {
-        content_by_lua 'ngx.say(ngx.md5(nil))';
-    }
---- request
-GET /md5
---- response_body
-d41d8cd98f00b204e9800998ecf8427e
-
-
-
-=== TEST 3: null string to ngx.md5
---- config
-    location /md5 {
-        content_by_lua 'ngx.say(ngx.md5(""))';
-    }
---- request
-GET /md5
---- response_body
-d41d8cd98f00b204e9800998ecf8427e
-
-
-
-=== TEST 4: use ngx.md5 in set_by_lua
---- config
-    location = /md5 {
-        set_by_lua $a 'return ngx.md5("hello")';
-        echo $a;
-    }
---- request
-GET /md5
---- response_body
-5d41402abc4b2a76b9719d911017c592
-
-
-
-=== TEST 5: use ngx.md5 in set_by_lua (nil)
---- config
-    location = /md5 {
-        set_by_lua $a 'return ngx.md5(nil)';
-        echo $a;
-    }
---- request
-GET /md5
---- response_body
-d41d8cd98f00b204e9800998ecf8427e
-
-
-
-=== TEST 6: use ngx.md5 in set_by_lua (null string)
---- config
-    location /md5 {
-        set_by_lua $a 'return ngx.md5("")';
-        echo $a;
-    }
---- request
-GET /md5
---- response_body
-d41d8cd98f00b204e9800998ecf8427e
-
-
-
-=== TEST 7: md5(number)
---- config
-    location = /md5 {
-        content_by_lua 'ngx.say(ngx.md5(45))';
-    }
---- request
-GET /md5
---- response_body
-6c8349cc7260ae62e3b1396831a8398f
diff --git a/debian/modules/http-lua/t/008-today.t b/debian/modules/http-lua/t/008-today.t
deleted file mode 100644
index ec2f433..0000000
--- a/debian/modules/http-lua/t/008-today.t
+++ /dev/null
@@ -1,38 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: use ngx.today in content_by_lua
---- config
-    location = /today {
-        content_by_lua 'ngx.say(ngx.today())';
-    }
---- request
-GET /today
---- response_body_like: ^\d{4}-\d{2}-\d{2}$
-
-
-
-=== TEST 2: use ngx.today in set_by_lua
---- config
-    location = /today {
-        set_by_lua $a 'return ngx.today()';
-        echo $a;
-    }
---- request
-GET /today
---- response_body_like: ^\d{4}-\d{2}-\d{2}$
diff --git a/debian/modules/http-lua/t/009-log.t b/debian/modules/http-lua/t/009-log.t
deleted file mode 100644
index 68c057f..0000000
--- a/debian/modules/http-lua/t/009-log.t
+++ /dev/null
@@ -1,544 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('debug'); # to ensure any log-level can be outputted
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 4);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: test log-level STDERR
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            ngx.log(ngx.STDERR, "hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 2: test log-level EMERG
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            ngx.log(ngx.EMERG, "hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[emerg\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 3: test log-level ALERT
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            ngx.log(ngx.ALERT, "hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[alert\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 4: test log-level CRIT
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            ngx.log(ngx.CRIT, "hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[crit\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 5: test log-level ERR
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            ngx.log(ngx.ERR, "hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 6: test log-level WARN
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            ngx.log(ngx.WARN, "hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[warn\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 7: test log-level NOTICE
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            ngx.log(ngx.NOTICE, "hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[notice\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 8: test log-level INFO
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            ngx.log(ngx.INFO, "hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[info\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 9: test log-level DEBUG
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            ngx.log(ngx.DEBUG, "hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[debug\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 10: regression test print()
---- config
-    location /log {
-        content_by_lua '
-            ngx.say("before log")
-            print("hello, log", 1234, 3.14159)
-            ngx.say("after log")
-        ';
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[notice\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):3: hello, log12343.14159/
-
-
-
-=== TEST 11: print(nil)
---- config
-    location /log {
-        content_by_lua '
-            print()
-            print(nil)
-            print("nil: ", nil)
-            ngx.say("hi");
-        ';
-    }
---- request
-GET /log
---- response_body
-hi
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):2: ,/,
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):3: nil,/,
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):4: nil: nil,/,
-]
-
-
-
-=== TEST 12: ngx.log in set_by_lua
---- config
-    location /log {
-        set_by_lua $a '
-            ngx.log(ngx.ERR, "HELLO")
-            return 32;
-        ';
-        echo $a;
-    }
---- request
-GET /log
---- response_body
-32
---- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] set_by_lua:2: HELLO,/
-
-
-
-=== TEST 13: test booleans and nil
---- config
-    location /log {
-        set_by_lua $a '
-            ngx.log(ngx.ERR, true, false, nil)
-            return 32;
-        ';
-        echo $a;
-    }
---- request
-GET /log
---- response_body
-32
---- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] set_by_lua:2: truefalsenil,/
-
-
-
-=== TEST 14: test table with metamethod
---- config
-    location /log {
-        content_by_lua_block {
-            ngx.say("before log")
-            local t = setmetatable({v = "value"}, {
-                __tostring = function(self)
-                    return "tostring "..self.v
-                end
-            })
-            ngx.log(ngx.ERR, t)
-            ngx.say("after log")
-        }
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8: tostring value,/
-
-
-
-=== TEST 15: test table without metamethod
---- config
-    location /log {
-        content_by_lua_block {
-            ngx.log(ngx.ERR, {})
-            ngx.say("done")
-        }
-    }
---- request
-GET /log
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-bad argument #1 to 'log' (expected table to have __tostring metamethod)
-
-
-
-=== TEST 16: test tables mixed with other types
---- config
-    location /log {
-        content_by_lua_block {
-            ngx.say("before log")
-            local t = setmetatable({v = "value"}, {
-                __tostring = function(self)
-                    return "tostring: "..self.v
-                end
-            })
-            ngx.log(ngx.ERR, t, " hello ", t)
-            ngx.say("after log")
-        }
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8: tostring: value hello tostring: value,/
-
-
-
-=== TEST 17: test print with tables
---- config
-    location /log {
-        content_by_lua_block {
-            ngx.say("before log")
-            local t = setmetatable({v = "value"}, {
-                __tostring = function(self)
-                    return "tostring: "..self.v
-                end
-            })
-            print(t, " hello ", t)
-            ngx.say("after log")
-        }
-    }
---- request
-GET /log
---- response_body
-before log
-after log
---- error_log eval
-qr/\[notice\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8: tostring: value hello tostring: value,/
-
-
-
-=== TEST 18: print() in header filter
---- config
-    location /log {
-        header_filter_by_lua '
-            print("hello world")
-            ngx.header.foo = 32
-        ';
-        echo hi;
-    }
---- request
-GET /log
---- response_headers
-foo: 32
---- error_log eval
-qr/\[notice\] .*? \[lua\] header_filter_by_lua:2: hello world/
---- response_body
-hi
-
-
-
-=== TEST 19: ngx.log in header filter
---- config
-    location /log {
-        header_filter_by_lua '
-            ngx.log(ngx.ERR, "howdy, lua!")
-            ngx.header.foo = 32
-        ';
-        echo hi;
-    }
---- request
-GET /log
---- response_headers
-foo: 32
---- response_body
-hi
---- error_log eval
-qr/\[error\] .*? \[lua\] header_filter_by_lua:2: howdy, lua!/
-
-
-
-=== TEST 20: ngx.log big data
---- config
-    location /log {
-        content_by_lua '
-            ngx.log(ngx.ERR, "a" .. string.rep("h", 1970) .. "b")
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /log
---- response_headers
---- error_log eval
-[qr/ah{1970}b/]
-
-
-
-=== TEST 21: ngx.log in Lua function calls & inlined lua
---- config
-    location /log {
-        content_by_lua '
-            function foo()
-                bar()
-            end
-
-            function bar()
-                ngx.log(ngx.ERR, "hello, log", 1234, 3.14159)
-            end
-
-            foo()
-            ngx.say("done")
-        ';
-    }
---- request
-GET /log
---- response_body
-done
---- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):7: bar\(\): hello, log12343.14159/
-
-
-
-=== TEST 22: ngx.log in Lua function tail-calls & inlined lua
---- config
-    location /log {
-        content_by_lua '
-            function foo()
-                return bar(5)
-            end
-
-            function bar(n)
-                if n < 1 then
-                    ngx.log(ngx.ERR, "hello, log", 1234, 3.14159)
-                    return n
-                end
-
-                return bar(n - 1)
-            end
-
-            foo()
-            ngx.say("done")
-        ';
-    }
---- request
-GET /log
---- response_body
-done
---- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] content_by_lua\(nginx\.conf:\d+\):8:(?: foo\(\):)? hello, log12343.14159/
-
-
-
-=== TEST 23: ngx.log in Lua files
---- config
-    location /log {
-        content_by_lua_file 'html/test.lua';
-    }
---- user_files
->>> test.lua
-function foo()
-    bar()
-end
-
-function bar()
-    ngx.log(ngx.ERR, "hello, log", 1234, 3.14159)
-end
-
-foo()
-ngx.say("done")
-
---- request
-GET /log
---- response_body
-done
---- error_log eval
-qr/\[error\] \S+: \S+ \[lua\] test.lua:6: bar\(\): hello, log12343.14159/
-
-
-
-=== TEST 24: 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 25: 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 26: \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/http-lua/t/010-request_body.t b/debian/modules/http-lua/t/010-request_body.t
deleted file mode 100644
index e669d94..0000000
--- a/debian/modules/http-lua/t/010-request_body.t
+++ /dev/null
@@ -1,272 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('debug'); # to ensure any log-level can be outputted
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: test reading request body
---- config
-    location /echo_body {
-        lua_need_request_body on;
-        content_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff"
-
-
-
-=== TEST 2: test not reading request body
---- config
-    location /echo_body {
-        lua_need_request_body off;
-        content_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 3: test default setting (not reading request body)
---- config
-    location /echo_body {
-        content_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 4: test main conf
---- http_config
-    lua_need_request_body on;
---- config
-    location /echo_body {
-        content_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff"
-
-
-
-=== TEST 5: test server conf
---- config
-    lua_need_request_body on;
-
-    location /echo_body {
-        content_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff"
-
-
-
-=== TEST 6: test override main conf
---- http_config
-    lua_need_request_body on;
---- config
-    location /echo_body {
-        lua_need_request_body off;
-        content_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 7: test override server conf
---- config
-    lua_need_request_body on;
-
-    location /echo_body {
-        lua_need_request_body off;
-        content_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 8: test override server conf
---- config
-    location /proxy {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-    }
-    location /hi {
-        echo_request_body;
-    }
-    location /echo_body {
-        lua_need_request_body off;
-        content_by_lua '
-            ngx.say(ngx.var.request_body or "nil")
-            local res = ngx.location.capture(
-                "/proxy",
-                { method = ngx.HTTP_POST,
-                  body = ngx.var.request_body })
-
-            ngx.say(res.status)
-        ';
-    }
---- request eval
-"POST /echo_body
-"
---- response_body
-nil
-200
-
-
-
-=== TEST 9: empty POST body
---- config
-    location /proxy {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-    }
-    location /hi {
-        echo_request_body;
-    }
-    location /echo_body {
-        lua_need_request_body on;
-        content_by_lua '
-            ngx.say(ngx.var.request_body or "nil")
-            local res = ngx.location.capture(
-                "/proxy",
-                { method = ngx.HTTP_POST,
-                  body = ngx.var.request_body })
-
-            ngx.say(res.status)
-        ';
-    }
---- request eval
-"POST /echo_body
-"
---- response_body
-nil
-200
-
-
-
-=== TEST 10: on disk request body
---- config
-    location /proxy {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-    }
-    location /hi {
-        echo_request_body;
-    }
-    location /echo_body {
-        lua_need_request_body on;
-
-        client_max_body_size 100k;
-        client_body_buffer_size 1;
-        sendfile on;
-
-        content_by_lua '
-            local res = ngx.location.capture(
-                "/proxy",
-                { method = ngx.HTTP_POST,
-                  body = ngx.var.request_body })
-            ngx.print(res.body)
-        ';
-    }
---- request eval
-"POST /echo_body
-" . ('a' x 1024)
---- response_body chomp
-
-
-
-=== TEST 11: no modify main request content-length
---- config
-    location /foo {
-        content_by_lua '
-            ngx.location.capture("/other", {body = "hello"})
-            ngx.say(ngx.req.get_headers()["Content-Length"] or "nil")
-        ';
-    }
-    location /other {
-        echo hi;
-    }
---- request
-POST /foo
-hi
---- response_body
-2
-
-
-
-=== TEST 12: Expect: 100-Continue
---- config
-    location /echo_body {
-        lua_need_request_body on;
-        content_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-    }
---- request
-POST /echo_body
-hello world
---- more_headers
-Expect: 100-Continue
---- ignore_response
---- no_error_log
-[error]
-[alert]
-http finalize request: 500, "/echo_body?" a:1, c:2
-http finalize request: 500, "/echo_body?" a:1, c:0
---- log_level: debug
diff --git a/debian/modules/http-lua/t/011-md5_bin.t b/debian/modules/http-lua/t/011-md5_bin.t
deleted file mode 100644
index ae7c974..0000000
--- a/debian/modules/http-lua/t/011-md5_bin.t
+++ /dev/null
@@ -1,170 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-
-#md5_bin_bin is hard to test, so convert it to hex mode
-
-__DATA__
-
-=== TEST 1: set md5_bin hello ????xxoo
---- config
-    location = /md5_bin {
-        content_by_lua 'local a = string.gsub(ngx.md5_bin("hello"), ".", function (c)
-                    return string.format("%02x", string.byte(c))
-                end); ngx.say(a)';
-    }
---- request
-GET /md5_bin
---- response_body
-5d41402abc4b2a76b9719d911017c592
-
-
-
-=== TEST 2: set md5_bin hello ????xxoo
---- config
-    location = /md5_bin {
-        content_by_lua 'ngx.say(string.len(ngx.md5_bin("hello")))';
-    }
---- request
-GET /md5_bin
---- response_body
-16
-
-
-
-=== TEST 3: set md5_bin hello
---- config
-    location = /md5_bin {
-        content_by_lua '
-            local s = ngx.md5_bin("hello")
-            s = string.gsub(s, ".", function (c)
-                    return string.format("%02x", string.byte(c))
-                end)
-            ngx.say(s)
-        ';
-    }
---- request
-GET /md5_bin
---- response_body
-5d41402abc4b2a76b9719d911017c592
-
-
-
-=== TEST 4: nil string to ngx.md5_bin
---- config
-    location = /md5_bin {
-        content_by_lua '
-            local s = ngx.md5_bin(nil)
-            s = string.gsub(s, ".", function (c)
-                    return string.format("%02x", string.byte(c))
-                end)
-            ngx.say(s)
-        ';
-    }
---- request
-GET /md5_bin
---- response_body
-d41d8cd98f00b204e9800998ecf8427e
-
-
-
-=== TEST 5: null string to ngx.md5_bin
---- config
-    location /md5_bin {
-        content_by_lua '
-            local s = ngx.md5_bin("")
-            s = string.gsub(s, ".", function (c)
-                    return string.format("%02x", string.byte(c))
-                end)
-            ngx.say(s)
-        ';
-    }
---- request
-GET /md5_bin
---- response_body
-d41d8cd98f00b204e9800998ecf8427e
-
-
-
-=== TEST 6: use ngx.md5_bin in set_by_lua
---- config
-    location = /md5_bin {
-        set_by_lua $a 'return string.gsub(ngx.md5_bin("hello"), ".", function (c)
-                    return string.format("%02x", string.byte(c))
-                end)';
-        echo $a;
-    }
---- request
-GET /md5_bin
---- response_body
-5d41402abc4b2a76b9719d911017c592
-
-
-
-=== TEST 7: use ngx.md5_bin in set_by_lua (nil)
---- config
-    location = /md5_bin {
-        set_by_lua $a '
-            local s = ngx.md5_bin(nil)
-            s = string.gsub(s, ".", function (c)
-                    return string.format("%02x", string.byte(c))
-                end)
-            return s
-        ';
-        echo $a;
-    }
---- request
-GET /md5_bin
---- response_body
-d41d8cd98f00b204e9800998ecf8427e
-
-
-
-=== TEST 8: use ngx.md5_bin in set_by_lua (null string)
---- config
-    location /md5_bin {
-        set_by_lua $a '
-            local s = ngx.md5_bin("")
-            s = string.gsub(s, ".", function (c)
-                    return string.format("%02x", string.byte(c))
-                end)
-            return s
-        ';
-        echo $a;
-    }
---- request
-GET /md5_bin
---- response_body
-d41d8cd98f00b204e9800998ecf8427e
-
-
-
-=== TEST 9: md5_bin(number)
---- config
-    location = /t {
-        content_by_lua '
-            s = ngx.md5_bin(45)
-            s = string.gsub(s, ".", function (c)
-                    return string.format("%02x", string.byte(c))
-                end)
-            ngx.say(s)
-
-        ';
-    }
---- request
-GET /t
---- response_body
-6c8349cc7260ae62e3b1396831a8398f
diff --git a/debian/modules/http-lua/t/012-now.t b/debian/modules/http-lua/t/012-now.t
deleted file mode 100644
index 5885187..0000000
--- a/debian/modules/http-lua/t/012-now.t
+++ /dev/null
@@ -1,118 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: use ngx.localtime in content_by_lua
---- config
-    location = /now {
-        content_by_lua 'ngx.say(ngx.localtime())';
-    }
---- request
-GET /now
---- response_body_like: ^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$
-
-
-
-=== TEST 2: use ngx.localtime in set_by_lua
---- config
-    location = /now {
-        set_by_lua $a 'return ngx.localtime()';
-        echo $a;
-    }
---- request
-GET /now
---- response_body_like: ^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$
-
-
-
-=== TEST 3: use ngx.time in set_by_lua
---- config
-    location = /time {
-        set_by_lua $a 'return ngx.time()';
-        echo $a;
-    }
---- request
-GET /time
---- response_body_like: ^\d{10,}$
-
-
-
-=== TEST 4: use ngx.time in content_by_lua
---- config
-    location = /time {
-        content_by_lua 'ngx.say(ngx.time())';
-    }
---- request
-GET /time
---- response_body_like: ^\d{10,}$
-
-
-
-=== TEST 5: use ngx.time in content_by_lua
---- config
-    location = /time {
-        content_by_lua '
-            ngx.say(ngx.time())
-            ngx.say(ngx.localtime())
-            ngx.say(ngx.utctime())
-            ngx.say(ngx.cookie_time(ngx.time()))
-        ';
-    }
---- request
-GET /time
---- response_body_like chomp
-^\d{10,}
-\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}
-\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}
-\w+, .*? GMT$
-
-
-
-=== TEST 6: use ngx.now in set_by_lua
---- config
-    location = /time {
-        set_by_lua $a 'return ngx.now()';
-        echo $a;
-    }
---- request
-GET /time
---- response_body_like: ^\d{10,}(\.\d{1,3})?$
-
-
-
-=== TEST 7: use ngx.now in content_by_lua
---- config
-    location = /time {
-        content_by_lua 'ngx.say(ngx.now())';
-    }
---- request
-GET /time
---- response_body_like: ^\d{10,}(\.\d{1,3})?$
-
-
-
-=== TEST 8: use ngx.update_time & ngx.now in content_by_lua
---- config
-    location = /time {
-        content_by_lua '
-            ngx.update_time()
-            ngx.say(ngx.now())
-        ';
-    }
---- request
-GET /time
---- response_body_like: ^\d{10,}(\.\d{1,3})?$
diff --git a/debian/modules/http-lua/t/013-base64.t b/debian/modules/http-lua/t/013-base64.t
deleted file mode 100644
index 1cc27de..0000000
--- a/debian/modules/http-lua/t/013-base64.t
+++ /dev/null
@@ -1,245 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 4);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: base64 encode hello
---- config
-    location = /encode_base64 {
-        content_by_lua 'ngx.say(ngx.encode_base64("hello"))';
-    }
---- request
-GET /encode_base64
---- response_body
-aGVsbG8=
-
-
-
-=== TEST 2: nil string to ngx.encode_base64
---- config
-    location = /encode_base64 {
-        content_by_lua 'ngx.say("left" .. ngx.encode_base64(nil) .. "right")';
-    }
---- request
-GET /encode_base64
---- response_body
-leftright
-
-
-
-=== TEST 3: null string to ngx.encode_base64
---- config
-    location = /encode_base64 {
-        content_by_lua 'ngx.say("left" .. ngx.encode_base64("") .. "right")';
-    }
---- request
-GET /encode_base64
---- response_body
-leftright
-
-
-
-=== TEST 4: use ngx.encode_base64 in set_by_lua
---- config
-    location = /encode_base64 {
-        set_by_lua $a 'return ngx.encode_base64("hello")';
-        echo $a;
-    }
---- request
-GET /encode_base64
---- response_body
-aGVsbG8=
-
-
-
-=== TEST 5: use ngx.encode_base64 in set_by_lua (nil)
---- config
-    location = /encode_base64 {
-        set_by_lua $a 'return "left" .. ngx.encode_base64(nil) .. "right"';
-        echo $a;
-    }
---- request
-GET /encode_base64
---- response_body
-leftright
-
-
-
-=== TEST 6: use ngx.encode_base64 in set_by_lua (null string)
---- config
-    location /encode_base64 {
-        set_by_lua $a 'return "left" .. ngx.encode_base64("") .. "right"';
-        echo $a;
-    }
---- request
-GET /encode_base64
---- response_body
-leftright
-
-
-
-=== TEST 7: base64 encode hello
---- config
-    location = /decode_base64 {
-        content_by_lua 'ngx.say(ngx.decode_base64("aGVsbG8="))';
-    }
---- request
-GET /decode_base64
---- response_body
-hello
-
-
-
-=== TEST 8: null string to ngx.decode_base64
---- config
-    location = /decode_base64 {
-        content_by_lua 'ngx.say("left" .. ngx.decode_base64("") .. "right")';
-    }
---- request
-GET /decode_base64
---- response_body
-leftright
-
-
-
-=== TEST 9: use ngx.decode_base64 in set_by_lua
---- config
-    location = /decode_base64 {
-        set_by_lua $a 'return ngx.decode_base64("aGVsbG8=")';
-        echo $a;
-    }
---- request
-GET /decode_base64
---- response_body
-hello
-
-
-
-=== TEST 10: use ngx.decode_base64 in set_by_lua (nil)
---- config
-    location = /decode_base64 {
-        set_by_lua $a 'return "left" .. ngx.decode_base64(nil) .. "right"';
-        echo $a;
-    }
---- request
-GET /decode_base64
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-string argument only
-
-
-
-=== TEST 11: use ngx.decode_base64 in set_by_lua (null string)
---- config
-    location /decode_base64 {
-        set_by_lua $a 'return "left" .. ngx.decode_base64("") .. "right"';
-        echo $a;
-    }
---- request
-GET /decode_base64
---- response_body
-leftright
-
-
-
-=== TEST 12: base64 encode number
---- config
-    location = /t {
-        content_by_lua 'ngx.say(ngx.encode_base64(32))';
-    }
---- request
-GET /t
---- response_body
-MzI=
-
-
-
-=== TEST 13: base64 decode number
---- config
-    location = /t {
-        content_by_lua 'ngx.say(ngx.decode_base64(32))';
-    }
---- request
-GET /t
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-string argument only
-
-
-
-=== TEST 14: base64 decode error
---- config
-    location = /t {
-        content_by_lua 'ngx.say(ngx.decode_base64("^*~"))';
-    }
---- request
-GET /t
---- response_body
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 15: base64 encode without padding (explicit true to no_padding)
---- config
-    location = /t {
-        content_by_lua 'ngx.say(ngx.encode_base64("hello", true))';
-    }
---- request
-GET /t
---- response_body
-aGVsbG8
-
-
-
-=== TEST 16: base64 encode short string
---- config
-    location = /t {
-        content_by_lua 'ngx.say(ngx.encode_base64("w"))';
-    }
---- request
-GET /t
---- response_body
-dw==
-
-
-
-=== TEST 17: base64 encode short string with padding (explicit false to no_padding)
---- config
-    location = /t {
-        content_by_lua 'ngx.say(ngx.encode_base64("w", false))';
-    }
---- request
-GET /t
---- response_body
-dw==
-
-
-
-=== TEST 18: base64 encode with wrong 2nd parameter
---- config
-    location = /t {
-        content_by_lua 'ngx.say(ngx.encode_base64("w", 0))';
-    }
---- request
-GET /t
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-qr/bad argument \#2 to 'encode_base64' \(boolean expected, got number\)|\[error\] .*? boolean argument only/
diff --git a/debian/modules/http-lua/t/014-bugs.t b/debian/modules/http-lua/t/014-bugs.t
deleted file mode 100644
index 9aadff0..0000000
--- a/debian/modules/http-lua/t/014-bugs.t
+++ /dev/null
@@ -1,1020 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-log_level('debug');
-
-repeat_each(3);
-
-plan tests => repeat_each() * (blocks() * 2 + 30);
-
-our $HtmlDir = html_dir;
-#warn $html_dir;
-
-$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
-$ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
-
-#no_diff();
-#no_long_string();
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
-
-#no_shuffle();
-no_long_string();
-
-sub read_file {
-    my $infile = shift;
-    open my $in, $infile
-        or die "cannot open $infile for reading: $!";
-    my $cert = do { local $/; <$in> };
-    close $in;
-    $cert;
-}
-
-our $TestCertificate = read_file("t/cert/test.crt");
-our $TestCertificateKey = read_file("t/cert/test.key");
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    location /load {
-        content_by_lua '
-            package.loaded.foo = nil;
-            local foo = require "foo";
-            foo.hi()
-        ';
-    }
---- request
-GET /load
---- user_files
->>> foo.lua
-module(..., package.seeall);
-
-function foo ()
-    return 1
-    return 2
-end
---- error_code: 500
---- response_body_like: 500 Internal Server Error
-
-
-
-=== TEST 2: sanity
---- http_config
-lua_package_path '/home/agentz/rpm/BUILD/lua-yajl-1.1/build/?.so;/home/lz/luax/?.so;./?.so';
---- config
-    location = '/report/listBidwordPrices4lzExtra.htm' {
-        content_by_lua '
-            local yajl = require "yajl"
-            local w = ngx.var.arg_words
-            w = ngx.unescape_uri(w)
-            local r = {}
-            print("start for")
-            for id in string.gmatch(w, "%d+") do
-                 r[id] = -1
-            end
-            print("end for, start yajl")
-            ngx.print(yajl.to_string(r))
-            print("end yajl")
-        ';
-    }
---- request
-GET /report/listBidwordPrices4lzExtra.htm?words=123,156,2532
---- response_body
---- SKIP
-
-
-
-=== TEST 3: sanity
---- config
-    location = /memc {
-        #set $memc_value 'hello';
-        set $memc_value $arg_v;
-        set $memc_cmd $arg_c;
-        set $memc_key $arg_k;
-        #set $memc_value hello;
-
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-        #echo $memc_value;
-    }
-    location = /echo {
-        echo_location '/memc?c=get&k=foo';
-        echo_location '/memc?c=set&k=foo&v=hello';
-        echo_location '/memc?c=get&k=foo';
-    }
-    location = /main {
-        content_by_lua '
-            res = ngx.location.capture("/memc?c=get&k=foo&v=")
-            ngx.say("1: ", res.body)
-
-            res = ngx.location.capture("/memc?c=set&k=foo&v=bar");
-            ngx.say("2: ", res.body);
-
-            res = ngx.location.capture("/memc?c=get&k=foo")
-            ngx.say("3: ", res.body);
-        ';
-    }
---- request
-GET /main
---- response_body_like: 3: bar$
-
-
-
-=== TEST 4: capture works for subrequests with internal redirects
---- config
-    location /lua {
-        content_by_lua '
-            local res = ngx.location.capture("/")
-            ngx.say(res.status)
-            ngx.print(res.body)
-        ';
-    }
---- request
-    GET /lua
---- response_body_like chop
-200
-.*It works
---- SKIP
-
-
-
-=== TEST 5: disk file bufs not working
---- config
-    location /lua {
-        content_by_lua '
-            local res = ngx.location.capture("/test.lua")
-            ngx.say(res.status)
-            ngx.print(res.body)
-        ';
-    }
---- user_files
->>> test.lua
-print("Hello, world")
---- request
-    GET /lua
---- response_body
-200
-print("Hello, world")
-
-
-
-=== TEST 6: print lua empty strings
---- config
-    location /lua {
-        content_by_lua 'ngx.print("") ngx.flush() ngx.print("Hi")';
-    }
---- request
-GET /lua
---- response_body chop
-Hi
-
-
-
-=== TEST 7: say lua empty strings
---- config
-    location /lua {
-        content_by_lua 'ngx.say("") ngx.flush() ngx.print("Hi")';
-    }
---- request
-GET /lua
---- response_body eval
-"
-Hi"
-
-
-
-=== TEST 8: github issue 37: header bug
-https://github.com/chaoslawful/lua-nginx-module/issues/37
---- config
-    location /sub {
-        content_by_lua '
-            ngx.header["Set-Cookie"] = {"TestCookie1=foo", "TestCookie2=bar"};
-            ngx.say("Hello")
-        ';
-    }
-    location /lua {
-        content_by_lua '
-            -- local yajl = require "yajl"
-            ngx.header["Set-Cookie"] = {}
-            res = ngx.location.capture("/sub")
-
-            for i,j in pairs(res.header) do
-                ngx.header[i] = j
-            end
-
-            -- ngx.say("set-cookie: ", yajl.to_string(res.header["Set-Cookie"]))
-
-            ngx.send_headers()
-            ngx.print("body: ", res.body)
-        ';
-    }
---- request
-GET /lua
---- raw_response_headers_like eval
-".*Set-Cookie: TestCookie1=foo\r
-Set-Cookie: TestCookie2=bar.*"
-
-
-
-=== TEST 9: memory leak
---- config
-    location /foo {
-        content_by_lua_file 'html/foo.lua';
-    }
---- user_files
->>> foo.lua
-res = {}
-res = {'good 1', 'good 2', 'good 3'}
-return ngx.redirect("/somedir/" .. ngx.escape_uri(res[math.random(1,#res)]))
---- request
-    GET /foo
---- response_body
---- SKIP
-
-
-
-=== TEST 10: capturing locations with internal redirects (no lua redirect)
---- config
-    location /bar {
-        echo Bar;
-    }
-    location /foo {
-        #content_by_lua '
-        #ngx.exec("/bar")
-        #';
-        echo_exec /bar;
-    }
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/foo")
-            ngx.print(res.body)
-        ';
-    }
---- request
-    GET /main
---- response_body
-Bar
-
-
-
-=== TEST 11: capturing locations with internal redirects (lua redirect)
---- config
-    location /bar {
-        content_by_lua 'ngx.say("Bar")';
-    }
-    location /foo {
-        content_by_lua '
-            ngx.exec("/bar")
-        ';
-    }
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/foo")
-            ngx.print(res.body)
-        ';
-    }
---- request
-    GET /main
---- response_body
-Bar
-
-
-
-=== TEST 12: capturing locations with internal redirects (simple index)
---- config
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/")
-            ngx.print(res.body)
-        ';
-    }
---- request
-    GET /main
---- response_body chop
-<html><head><title>It works!</title></head><body>It works!</body></html>
-
-
-
-=== TEST 13: capturing locations with internal redirects (more lua statements)
---- config
-    location /bar {
-        content_by_lua '
-            ngx.say("hello")
-            ngx.say("world")
-        ';
-    }
-    location /foo {
-        #content_by_lua '
-        #ngx.exec("/bar")
-        #';
-        echo_exec /bar;
-    }
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/foo")
-            ngx.print(res.body)
-        ';
-    }
---- request
-    GET /main
---- response_body
-hello
-world
-
-
-
-=== TEST 14: capturing locations with internal redirects (post subrequest with internal redirect)
---- config
-    location /bar {
-        lua_need_request_body on;
-        client_body_in_single_buffer on;
-
-        content_by_lua '
-            ngx.say(ngx.var.request_body)
-        ';
-    }
-    location /foo {
-        #content_by_lua '
-        #ngx.exec("/bar")
-        #';
-        echo_exec /bar;
-    }
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/foo", { method = ngx.HTTP_POST, body = "hello" })
-            ngx.print(res.body)
-        ';
-    }
---- request
-    GET /main
---- response_body
-hello
-
-
-
-=== TEST 15: nginx rewrite works in subrequests
---- config
-    rewrite /foo /foo/ permanent;
-    location = /foo/ {
-        echo hello;
-    }
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/foo")
-            ngx.say("status = ", res.status)
-            ngx.say("Location: ", res.header["Location"] or "nil")
-        ';
-    }
---- request
-    GET /main
---- response_body
-status = 301
-Location: /foo/
-
-
-
-=== TEST 16: nginx rewrite works in subrequests
---- config
-    access_by_lua '
-        local res = ngx.location.capture(ngx.var.uri)
-        ngx.say("status = ", res.status)
-        ngx.say("Location: ", res.header["Location"] or "nil")
-        ngx.exit(200)
-    ';
---- request
-    GET /foo
---- user_files
->>> foo/index.html
-It works!
---- response_body
-status = 301
-Location: /foo/
---- no_check_leak
-
-
-
-=== TEST 17: set content-type header with charset
---- config
-    location /lua {
-        charset GBK;
-        content_by_lua '
-            ngx.header.content_type = "text/xml; charset=UTF-8"
-            ngx.say("hi")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hi
---- response_headers
-Content-Type: text/xml; charset=UTF-8
-
-
-
-=== TEST 18: set response header content-type with charset
---- config
-    location /lua {
-        charset GBK;
-        content_by_lua '
-            ngx.header.content_type = "text/xml"
-            ngx.say("hi")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hi
---- response_headers
-Content-Type: text/xml; charset=GBK
-
-
-
-=== TEST 19: get by-position capturing variables
---- config
-    location ~ '^/lua/(.*)' {
-        content_by_lua '
-            ngx.say(ngx.var[1] or "nil")
-        ';
-    }
---- request
-    GET /lua/hello
---- response_body
-hello
-
-
-
-=== TEST 20: get by-position capturing variables ($0)
---- config
-    location ~ '^/lua/(.*)' {
-        content_by_lua '
-            ngx.say(ngx.var[0] or "nil")
-        ';
-    }
---- request
-    GET /lua/hello
---- response_body
-nil
-
-
-
-=== TEST 21: get by-position capturing variables (exceeding captures)
---- config
-    location ~ '^/lua/(.*)' {
-        content_by_lua '
-            ngx.say(ngx.var[2] or "nil")
-        ';
-    }
---- request
-    GET /lua/hello
---- response_body
-nil
-
-
-
-=== TEST 22: get by-position capturing variables ($1, $2)
---- config
-    location ~ '^/lua/(.*)/(.*)' {
-        content_by_lua '
-            ngx.say(ngx.var[-1] or "nil")
-            ngx.say(ngx.var[0] or "nil")
-            ngx.say(ngx.var[1] or "nil")
-            ngx.say(ngx.var[2] or "nil")
-            ngx.say(ngx.var[3] or "nil")
-            ngx.say(ngx.var[4] or "nil")
-        ';
-    }
---- request
-    GET /lua/hello/world
---- response_body
-nil
-nil
-hello
-world
-nil
-nil
-
-
-
-=== TEST 23: set special variables
---- config
-    location /main {
-        #set_unescape_uri $cookie_a "hello";
-        set $http_a "hello";
-        content_by_lua '
-            ngx.say(ngx.var.http_a)
-        ';
-    }
---- request
-    GET /main
---- response_body
-hello
---- SKIP
-
-
-
-=== TEST 24: set special variables
---- config
-    location /main {
-        content_by_lua '
-            dofile(ngx.var.realpath_root .. "/a.lua")
-        ';
-    }
-    location /echo {
-        echo hi;
-    }
---- request
-    GET /main
---- user_files
->>> a.lua
-ngx.location.capture("/echo")
---- response_body
---- SKIP
-
-
-
-=== TEST 25: set 20+ headers
---- config
-    location /test {
-        rewrite_by_lua '
-            ngx.req.clear_header("Authorization")
-        ';
-        echo $http_a1;
-        echo $http_authorization;
-        echo $http_a2;
-        echo $http_a3;
-        echo $http_a23;
-        echo $http_a24;
-        echo $http_a25;
-    }
---- request
-    GET /test
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 25) {
-    $s .= "A$i: $i\n";
-    if ($i == 22) {
-        $s .= "Authorization: blah\n";
-    }
-    $i++;
-}
-#warn $s;
-$s
---- response_body
-1
-
-2
-3
-23
-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)
---- no_check_leak
---- http_config
-    upstream xx {
-        server 127.0.0.1:$TEST_NGINX_SERVER_PORT max_fails=5;
-        server 127.0.0.1:$TEST_NGINX_SERVER_PORT max_fails=5;
-    }
-
-    server {
-        server_name "xx";
-        listen $TEST_NGINX_SERVER_PORT;
-
-        return 444;
-    }
---- config
-    location = /t {
-        proxy_next_upstream off;
-        proxy_pass http://xx;
-    }
---- 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
-
-
-
-=== TEST 33: last_in_chain is set properly in subrequests
---- config
-    location = /sub {
-        echo hello;
-        body_filter_by_lua '
-            local eof = ngx.arg[2]
-            if eof then
-                print("eof found in body stream")
-            end
-        ';
-    }
-
-    location = /main {
-        echo_location /sub;
-    }
-
---- request
-    GET /main
---- response_body
-hello
---- log_level: notice
---- error_log
-eof found in body stream
-
-
-
-=== TEST 34: testing a segfault when using ngx_poll_module + ngx_resolver
-See more details here: http://mailman.nginx.org/pipermail/nginx-devel/2013-January/003275.html
---- config
-    location /t {
-        set $myserver nginx.org;
-        proxy_pass http://$myserver/;
-        resolver 127.0.0.1:6789;
-    }
---- request
-    GET /t
---- ignore_response
---- abort
---- timeout: 0.3
---- log_level: notice
---- no_error_log
-[alert]
---- error_log eval
-qr/(?:send|recv)\(\) failed \(\d+: Connection refused\) while resolving/
-
-
-
-=== TEST 35: github issue #218: ngx.location.capture hangs when querying a remote host that does not exist or is really slow to respond
---- config
-    set $myurl "https://not-exist.agentzh.org";
-    location /toto {
-        content_by_lua '
-                local proxyUrl = "/myproxy/entity"
-                local res = ngx.location.capture( proxyUrl,  { method = ngx.HTTP_GET })
-                ngx.say("Hello, ", res.status)
-            ';
-    }
-    location ~ /myproxy {
-
-        rewrite    ^/myproxy/(.*)  /$1  break;
-        resolver_timeout 3s;
-        #resolver 172.16.0.23; #  AWS DNS resolver address is the same in all regions - 172.16.0.23
-        resolver 8.8.8.8;
-        proxy_read_timeout 1s;
-        proxy_send_timeout 1s;
-        proxy_connect_timeout 1s;
-        proxy_pass $myurl:443;
-        proxy_pass_request_body off;
-        proxy_set_header Content-Length 0;
-        proxy_set_header  Accept-Encoding  "";
-    }
-
---- request
-GET /toto
-
---- stap2
-F(ngx_http_lua_post_subrequest) {
-    println("lua post subrequest")
-    print_ubacktrace()
-}
-
---- response_body
-Hello, 502
-
---- error_log
-not-exist.agentzh.org could not be resolved
---- timeout: 10
-
-
-
-=== TEST 36: line comments in the last line of the inlined Lua code
---- config
-    location /lua {
-        content_by_lua 'ngx.say("ok") -- blah';
-    }
---- request
-GET /lua
---- response_body
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 37: resolving names with a trailing dot
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    location /t {
-        resolver $TEST_NGINX_RESOLVER ipv6=off;
-        set $myhost 'agentzh.org.';
-        proxy_pass http://$myhost/misc/.vimrc;
-    }
---- request
-GET /t
---- response_body_like: An example for a vimrc file
---- no_error_log
-[error]
---- timeout: 10
-
-
-
-=== TEST 38: resolving names with a trailing dot
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
-    server {
-        listen 12354;
-
-        location = /t {
-            echo 'args: \$args';
-        }
-    }
-"
---- config
-    location = /t {
-        set $args "foo=1&bar=2";
-        proxy_pass http://127.0.0.1:12354;
-    }
-
---- request
-GET /t
---- response_body
-args: foo=1&bar=2
---- no_error_log
-[error]
---- no_check_leak
-
-
-
-=== TEST 39: lua_code_cache off + setkeepalive
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    lua_code_cache off;
-    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 sock2 = ngx.socket.tcp()
-
-    sock:settimeout(1000)
-    sock2:settimeout(6000000)
-
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        ngx.say("failed to connect: ", err)
-        return
-    end
-
-    local ok, err = sock2:connect("127.0.0.1", port)
-    if not ok then
-        ngx.say("failed to connect: ", err)
-        return
-    end
-
-    local ok, err = sock:setkeepalive(100, 100)
-    if not ok then
-        ngx.say("failed to set reusable: ", err)
-    end
-
-    local ok, err = sock2:setkeepalive(200, 100)
-    if not ok then
-        ngx.say("failed to set reusable: ", err)
-    end
-
-    ngx.say("done")
-end
---- request
-GET /t
---- stap2
-F(ngx_close_connection) {
-    println("=== close connection")
-    print_ubacktrace()
-}
---- stap_out2
---- response_body
-done
---- wait: 0.5
---- no_error_log
-[error]
-
-
-
-=== TEST 40: .lua file of exactly N*1024 bytes (github issue #385)
---- config
-    location = /t {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files eval
-my $s = "ngx.say('ok')\n";
-">>> a.lua\n" . (" " x (8192 - length($s))) . $s;
-
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 41: https proxy has no timeout protection for ssl handshake
---- http_config
-    # to suppress a valgrind false positive in the nginx core:
-    proxy_ssl_session_reuse off;
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        location /foo {
-            echo foo;
-        }
-    }
-
-    upstream local {
-        server unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-    }
-
---- config
-    location = /t {
-        proxy_pass https://local/foo;
-    }
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
-
---- request
-GET /t
-
---- stap
-probe process("nginx").function("ngx_http_upstream_ssl_handshake") {
-    printf("read timer set: %d\n", $c->read->timer_set)
-    printf("write timer set: %d\n", $c->write->timer_set)
-}
---- stap_out
-read timer set: 0
-write timer set: 1
-
---- response_body eval
---- no_error_log
-[error]
-[alert]
diff --git a/debian/modules/http-lua/t/015-status.t b/debian/modules/http-lua/t/015-status.t
deleted file mode 100644
index 666dae7..0000000
--- a/debian/modules/http-lua/t/015-status.t
+++ /dev/null
@@ -1,293 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-#repeat_each(120);
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 9);
-
-#no_diff();
-#no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: no key found
---- config
-    location /nil {
-        content_by_lua '
-            ngx.say(ngx.blah_blah == nil and "nil" or "not nil")
-        ';
-    }
---- request
-GET /nil
---- response_body
-nil
-
-
-
-=== TEST 2: .status found
---- config
-    location /nil {
-        content_by_lua '
-            ngx.say(ngx.status == nil and "nil" or "not nil")
-        ';
-    }
---- request
-GET /nil
---- response_body
-not nil
-
-
-
-=== TEST 3: default to 0
---- config
-    location /nil {
-        content_by_lua '
-            ngx.say(ngx.status);
-        ';
-    }
---- request
-GET /nil
---- response_body
-0
-
-
-
-=== TEST 4: default to 0
---- config
-    location /nil {
-        content_by_lua '
-            ngx.say("blah");
-            ngx.say(ngx.status);
-        ';
-    }
---- request
-GET /nil
---- response_body
-blah
-200
-
-
-
-=== TEST 5: set 201
---- config
-    location /201 {
-        content_by_lua '
-            ngx.status = 201;
-            ngx.say("created");
-        ';
-    }
---- request
-GET /201
---- response_body
-created
---- error_code: 201
-
-
-
-=== TEST 6: set "201"
---- config
-    location /201 {
-        content_by_lua '
-            ngx.status = "201";
-            ngx.say("created");
-        ';
-    }
---- request
-GET /201
---- response_body
-created
---- error_code: 201
-
-
-
-=== TEST 7: set "201.7"
---- config
-    location /201 {
-        content_by_lua '
-            ngx.status = "201.7";
-            ngx.say("created");
-        ';
-    }
---- request
-GET /201
---- response_body
-created
---- error_code: 201
-
-
-
-=== TEST 8: set "abc"
---- config
-    location /201 {
-        content_by_lua '
-            ngx.status = "abc";
-            ngx.say("created");
-        ';
-    }
---- request
-GET /201
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 9: set blah
---- config
-    location /201 {
-        content_by_lua '
-            ngx.blah = 201;
-            ngx.say("created");
-        ';
-    }
---- request
-GET /201
---- response_body
-created
---- no_error_log
-[error]
-
-
-
-=== 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/
-
-
-
-=== TEST 11: http 1.0 and ngx.status
---- config
-    location /nil {
-        content_by_lua '
-            ngx.status = ngx.HTTP_UNAUTHORIZED
-            ngx.say("invalid request")
-            ngx.exit(ngx.HTTP_OK)
-        ';
-    }
---- request
-GET /nil HTTP/1.0
---- response_body
-invalid request
---- error_code: 401
---- no_error_log
-[error]
-
-
-
-=== TEST 12: github issue #221: cannot modify ngx.status for responses from ngx_proxy
---- config
-    location = /t {
-        proxy_pass http://127.0.0.1:$server_port/;
-        header_filter_by_lua '
-            if ngx.status == 206 then
-                ngx.status = ngx.HTTP_OK
-            end
-        ';
-    }
-
---- request
-GET /t
-
---- more_headers
-Range: bytes=0-4
-
---- response_body chop
-<html
-
---- error_code: 200
---- no_error_log
-[error]
-
-
-
-=== TEST 13: 101 response has a complete status line
---- config
-    location /t {
-        content_by_lua '
-            ngx.status = 101
-            ngx.send_headers()
-        ';
-    }
---- request
-GET /t
---- raw_response_headers_like: ^HTTP/1.1 101 Switching Protocols\r\n
---- error_code: 101
---- no_error_log
-[error]
-
-
-
-=== TEST 14: reading error status code
---- config
-    location = /t {
-        content_by_lua 'ngx.say("status = ", ngx.status)';
-    }
---- raw_request eval
-"GET /t\r\n"
---- http09
---- response_body
-status = 9
-
-
-
-=== TEST 15: err status
---- config
-    location /nil {
-        content_by_lua '
-            ngx.exit(502)
-        ';
-        body_filter_by_lua '
-            if ngx.arg[2] then
-                ngx.log(ngx.WARN, "ngx.status = ", ngx.status)
-            end
-        ';
-    }
---- request
-GET /nil
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log
-ngx.status = 502
---- no_error_log
-[error]
-
-
-
-=== TEST 16: ngx.status assignmnt should clear r->err_status
---- config
-location = /t {
-    return 502;
-    header_filter_by_lua_block {
-        if ngx.status == 502 then
-            ngx.status = 654
-            ngx.log(ngx.WARN, "ngx.status: ", ngx.status)
-        end
-    }
-}
---- request
-GET /t
---- response_body_like: Bad Gateway
---- error_log
-ngx.status: 654
---- no_error_log
-[error]
---- error_code: 654
diff --git a/debian/modules/http-lua/t/016-resp-header.t b/debian/modules/http-lua/t/016-resp-header.t
deleted file mode 100644
index 72c1e05..0000000
--- a/debian/modules/http-lua/t/016-resp-header.t
+++ /dev/null
@@ -1,1701 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 46);
-
-#no_diff();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set response content-type header
---- config
-    location /read {
-        content_by_lua '
-            ngx.header.content_type = "text/my-plain";
-            ngx.say("Hi");
-        ';
-    }
---- request
-GET /read
---- response_headers
-Content-Type: text/my-plain
---- response_body
-Hi
-
-
-
-=== TEST 2: set response content-type header
---- config
-    location /read {
-        content_by_lua '
-            ngx.header.content_length = "text/my-plain";
-            ngx.say("Hi");
-        ';
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- response_headers
-Content-Type: text/html
---- error_code: 500
-
-
-
-=== TEST 3: set response content-type header
---- config
-    location /read {
-        content_by_lua '
-            ngx.header.content_length = 3
-            ngx.say("Hello")
-        ';
-    }
---- request
-GET /read
---- response_headers
-Content-Length: 3
---- response_body chop
-Hel
-
-
-
-=== TEST 4: set response content-type header
---- config
-    location /read {
-        content_by_lua '
-            ngx.status = 302;
-            ngx.header["Location"] = "http://agentzh.org/foo";
-        ';
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo
---- response_body
---- error_code: 302
-
-
-
-=== TEST 5: set response content-type header
---- config
-    location /read {
-        content_by_lua '
-            ngx.header.content_length = 3
-            ngx.header.content_length = nil
-            ngx.say("Hello")
-        ';
-    }
---- request
-GET /read
---- response_headers
-!Content-Length
---- response_body
-Hello
-
-
-
-=== TEST 6: set multi response content-type header
---- config
-    location /read {
-        content_by_lua '
-            ngx.header["X-Foo"] = {"a", "bc"}
-            ngx.say("Hello")
-        ';
-    }
---- request
-GET /read
---- raw_response_headers_like chomp
-X-Foo: a\r\n.*?X-Foo: bc\r\n
---- response_body
-Hello
-
-
-
-=== TEST 7: set response content-type header
---- config
-    location /read {
-        content_by_lua '
-            ngx.header.content_type = {"a", "bc"}
-            ngx.say("Hello")
-        ';
-    }
---- request
-GET /read
---- response_headers
-Content-Type: bc
---- response_body
-Hello
-
-
-
-=== TEST 8: set multi response content-type header and clears it
---- config
-    location /read {
-        content_by_lua '
-            ngx.header["X-Foo"] = {"a", "bc"}
-            ngx.header["X-Foo"] = {}
-            ngx.say("Hello")
-        ';
-    }
---- request
-GET /read
---- response_headers
-!X-Foo
---- response_body
-Hello
-
-
-
-=== TEST 9: set multi response content-type header and clears it
---- config
-    location /read {
-        content_by_lua '
-            ngx.header["X-Foo"] = {"a", "bc"}
-            ngx.header["X-Foo"] = nil
-            ngx.say("Hello")
-        ';
-    }
---- request
-GET /read
---- response_headers
-!X-Foo
---- response_body
-Hello
-
-
-
-=== TEST 10: set multi response content-type header (multiple times)
---- config
-    location /read {
-        content_by_lua '
-            ngx.header["X-Foo"] = {"a", "bc"}
-            ngx.header["X-Foo"] = {"a", "abc"}
-            ngx.say("Hello")
-        ';
-    }
---- request
-GET /read
---- raw_response_headers_like chomp
-X-Foo: a\r\n.*?X-Foo: abc\r\n
---- response_body
-Hello
-
-
-
-=== TEST 11: clear first, then add
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header["Foo"] = {}
-            ngx.header["Foo"] = {"a", "b"}
-            ngx.send_headers()
-        ';
-    }
---- request
-    GET /lua
---- raw_response_headers_like eval
-".*Foo: a\r
-Foo: b.*"
---- response_body
-
-
-
-=== TEST 12: first add, then clear, then add again
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header["Foo"] = {"c", "d"}
-            ngx.header["Foo"] = {}
-            ngx.header["Foo"] = {"a", "b"}
-            ngx.send_headers()
-        ';
-    }
---- request
-    GET /lua
---- raw_response_headers_like eval
-".*Foo: a\r
-Foo: b.*"
---- response_body
-
-
-
-=== TEST 13: names are the same in the beginning (one value per key)
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header["Foox"] = "barx"
-            ngx.header["Fooy"] = "bary"
-            ngx.send_headers()
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-Foox: barx
-Fooy: bary
-
-
-
-=== TEST 14: names are the same in the beginning (multiple values per key)
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header["Foox"] = {"conx1", "conx2" }
-            ngx.header["Fooy"] = {"cony1", "cony2" }
-            ngx.send_headers()
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-Foox: conx1, conx2
-Fooy: cony1, cony2
-
-
-
-=== TEST 15: set header after ngx.print
---- config
-    location /lua {
-        default_type "text/plain";
-        content_by_lua '
-            ngx.print("hello")
-            ngx.header.content_type = "text/foo"
-        ';
-    }
---- request
-    GET /lua
---- response_body chop
-hello
---- error_log
-attempt to set ngx.header.HEADER after sending out response headers
---- no_error_log eval
-["alert", "warn"]
-
-
-
-=== TEST 16: get content-type header after ngx.print
---- config
-    location /lua {
-        default_type "text/my-plain";
-        content_by_lua '
-            ngx.print("hello, ")
-            ngx.say(ngx.header.content_type)
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-Content-Type: text/my-plain
---- response_body
-hello, text/my-plain
-
-
-
-=== TEST 17: get content-length header
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.content_length = 2;
-            ngx.say(ngx.header.content_length);
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-Content-Length: 2
---- response_body
-2
-
-
-
-=== TEST 18: get content-length header
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.foo = "bar";
-            ngx.say(ngx.header.foo);
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-foo: bar
---- response_body
-bar
-
-
-
-=== TEST 19: get content-length header (proxy)
---- config
-    location /main {
-        set $footer '';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        header_filter_by_lua '
-            ngx.var.footer = ngx.header.content_length
-        ';
-        echo_after_body $footer;
-    }
-    location /echo {
-        content_by_lua 'ngx.print("Hello")';
-    }
---- request
-    GET /main
---- response_headers
-!Content-Length
---- response_body
-Hello5
-
-
-
-=== TEST 20: set and get content-length header (proxy)
---- config
-    location /main {
-        set $footer '';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        header_filter_by_lua '
-            ngx.header.content_length = 27
-            ngx.var.footer = ngx.header.content_length
-        ';
-        echo_after_body $footer;
-    }
-    location /echo {
-        content_by_lua 'ngx.print("Hello")';
-    }
---- request
-    GET /main
---- response_headers
-!Content-Length
---- response_body
-Hello27
-
-
-
-=== TEST 21: get content-type header (proxy)
---- config
-    location /main {
-        set $footer '';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        header_filter_by_lua '
-            ngx.var.footer = ngx.header.content_type
-        ';
-        echo_after_body $footer;
-    }
-    location /echo {
-        default_type 'abc/foo';
-        content_by_lua 'ngx.print("Hello")';
-    }
---- request
-    GET /main
---- response_headers
-Content-Type: abc/foo
---- response_body
-Helloabc/foo
-
-
-
-=== TEST 22: set and get content-type header (proxy)
---- config
-    location /main {
-        set $footer '';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        header_filter_by_lua '
-            ngx.header.content_type = "text/blah"
-            ngx.var.footer = ngx.header.content_type
-        ';
-        echo_after_body $footer;
-    }
-    location /echo {
-        default_type 'abc/foo';
-        content_by_lua 'ngx.print("Hello")';
-    }
---- request
-    GET /main
---- response_headers
-Content-Type: text/blah
---- response_body
-Hellotext/blah
-
-
-
-=== TEST 23: get user header (proxy)
---- config
-    location /main {
-        set $footer '';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        header_filter_by_lua '
-            ngx.var.footer = ngx.header.baz
-        ';
-        echo_after_body $footer;
-    }
-    location /echo {
-        content_by_lua '
-            ngx.header.baz = "bah"
-            ngx.print("Hello")
-        ';
-    }
---- request
-    GET /main
---- response_headers
-baz: bah
---- response_body
-Hellobah
-
-
-
-=== TEST 24: set and get user header (proxy)
---- config
-    location /main {
-        set $footer '';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        header_filter_by_lua '
-            ngx.header.baz = "foo"
-            ngx.var.footer = ngx.header.baz
-        ';
-        echo_after_body $footer;
-    }
-    location /echo {
-        content_by_lua '
-            ngx.header.baz = "bah"
-            ngx.print("Hello")
-        ';
-    }
---- request
-    GET /main
---- response_headers
-baz: foo
---- response_body
-Hellofoo
-
-
-
-=== TEST 25: get multiple user header (proxy)
---- config
-    location /main {
-        set $footer '';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        header_filter_by_lua '
-            ngx.var.footer = table.concat(ngx.header.baz, ", ")
-        ';
-        echo_after_body $footer;
-    }
-    location /echo {
-        content_by_lua '
-            ngx.header.baz = {"bah", "blah"}
-            ngx.print("Hello")
-        ';
-    }
---- request
-    GET /main
---- raw_response_headers_like eval
-"baz: bah\r
-.*?baz: blah"
---- response_body
-Hellobah, blah
-
-
-
-=== TEST 26: set and get multiple user header (proxy)
---- config
-    location /main {
-        set $footer '';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        header_filter_by_lua '
-            ngx.header.baz = {"foo", "baz"}
-            ngx.var.footer = table.concat(ngx.header.baz, ", ")
-        ';
-        echo_after_body $footer;
-    }
-    location /echo {
-        content_by_lua '
-            ngx.header.baz = {"bah", "hah"}
-            ngx.print("Hello")
-        ';
-    }
---- request
-    GET /main
---- raw_response_headers_like eval
-"baz: foo\r
-.*?baz: baz"
---- response_body
-Hellofoo, baz
-
-
-
-=== TEST 27: get non-existent header
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say(ngx.header.foo);
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-!foo
---- response_body
-nil
-
-
-
-=== TEST 28: get non-existent header
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.foo = {"bah", "baz", "blah"}
-            ngx.header.foo = nil
-            ngx.say(ngx.header.foo);
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-!foo
---- response_body
-nil
-
-
-
-=== TEST 29: override domains in the cookie
---- config
-    location /foo {
-        echo hello;
-        add_header Set-Cookie 'foo=bar; Domain=backend.int';
-        add_header Set-Cookie 'baz=bah; Domain=backend.int';
-    }
-
-    location /main {
-        proxy_pass http://127.0.0.1:$server_port/foo;
-        header_filter_by_lua '
-            local cookies = ngx.header.set_cookie
-            if not cookies then return end
-            if type(cookies) ~= "table" then cookies = {cookies} end
-            local newcookies = {}
-            for i, val in ipairs(cookies) do
-                local newval = string.gsub(val, "([dD]omain)=[%w_-\\\\.]+",
-                          "%1=external.domain.com")
-                table.insert(newcookies, newval)
-            end
-            ngx.header.set_cookie = newcookies
-        ';
-    }
---- request
-    GET /main
---- response_headers
-Set-Cookie: foo=bar; Domain=external.domain.com, baz=bah; Domain=external.domain.com
---- response_body
-hello
-
-
-
-=== TEST 30: set single value to cache-control
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.cache_control = "private"
-            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-Cache-Control: private
---- response_body
-Cache-Control: private
-
-
-
-=== TEST 31: set multi values to cache-control
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.cache_control = { "private", "no-store" }
-            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-Cache-Control: private, no-store
---- response_body_like chop
-^Cache-Control: private[;,] no-store$
-
-
-
-=== TEST 32: set multi values to cache-control and override it with a single value
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.cache_control = { "private", "no-store" }
-            ngx.header.cache_control = { "no-cache" }
-            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
-            ngx.say("Cache-Control: ", ngx.header.cache_control)
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-Cache-Control: no-cache
---- response_body
-Cache-Control: no-cache
-Cache-Control: no-cache
-
-
-
-=== TEST 33: set multi values to cache-control and override it with multiple values
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.cache_control = { "private", "no-store" }
-            ngx.header.cache_control = { "no-cache", "blah", "foo" }
-            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
-            ngx.say("Cache-Control: ", table.concat(ngx.header.cache_control, ", "))
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-Cache-Control: no-cache, blah, foo
---- response_body_like chop
-^Cache-Control: no-cache[;,] blah[;,] foo
-Cache-Control: no-cache[;,] blah[;,] foo$
---- no_error_log
-[error]
-
-
-
-=== TEST 34: set the www-authenticate response header
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.www_authenticate = "blah"
-            ngx.say("WWW-Authenticate: ", ngx.var.sent_http_www_authenticate)
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-WWW-Authenticate: blah
---- response_body
-WWW-Authenticate: blah
-
-
-
-=== TEST 35: set and clear the www-authenticate response header
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.foo = "blah"
-            ngx.header.foo = nil
-            ngx.say("Foo: ", ngx.var.sent_http_foo)
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-!Foo
---- response_body
-Foo: nil
-
-
-
-=== TEST 36: set multi values to cache-control and override it with multiple values (to reproduce a bug)
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.cache_control = { "private", "no-store", "foo", "bar", "baz" }
-            ngx.header.cache_control = {}
-            ngx.send_headers()
-            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
-        ';
-        add_header Cache-Control "blah";
-    }
---- request
-    GET /lua
---- response_headers
-Cache-Control: blah
---- response_body
-Cache-Control: blah
-
-
-
-=== TEST 37: set last-modified and return 304
---- config
-  location /lua {
-        content_by_lua '
-            ngx.header["Last-Modified"] = ngx.http_time(1290079655)
-            ngx.say(ngx.header["Last-Modified"])
-        ';
-    }
---- request
-    GET /lua
---- more_headers
-If-Modified-Since: Thu, 18 Nov 2010 11:27:35 GMT
---- response_headers
-Last-Modified: Thu, 18 Nov 2010 11:27:35 GMT
---- error_code: 304
-
-
-
-=== TEST 38: set last-modified and return 200
---- config
-  location /lua {
-        content_by_lua '
-            ngx.header["Last-Modified"] = ngx.http_time(1290079655)
-            ngx.say(ngx.header["Last-Modified"])
-        ';
-    }
---- request
-    GET /lua
---- more_headers
-If-Modified-Since: Thu, 18 Nov 2010 11:27:34 GMTT
---- response_headers
-Last-Modified: Thu, 18 Nov 2010 11:27:35 GMT
---- response_body
-Thu, 18 Nov 2010 11:27:35 GMT
-
-
-
-=== TEST 39: set response content-encoding header should bypass ngx_http_gzip_filter_module
---- config
-    default_type text/plain;
-    gzip             on;
-    gzip_min_length  1;
-    gzip_types       text/plain;
-    location /read {
-        content_by_lua '
-            ngx.header.content_encoding = "gzip";
-            ngx.say("Hello, world, my dear friend!");
-        ';
-    }
---- request
-GET /read
---- more_headers
-Accept-Encoding: gzip
---- response_headers
-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
-
-
-
-=== TEST 42: github issue #199: underscores in lua variables
---- config
-    location /read {
-        content_by_lua '
-          ngx.header.content_type = "text/my-plain"
-
-          local results = {}
-          results.something = "hello"
-          results.content_type = "anything"
-          results.somehing_else = "hi"
-
-          local arr = {}
-          for k in pairs(results) do table.insert(arr, k) end
-          table.sort(arr)
-          for i, k in ipairs(arr) do
-            ngx.say(k .. ": " .. results[k])
-          end
-        ';
-    }
---- request
-GET /read
---- response_headers
-Content-Type: text/my-plain
-
---- response_body
-content_type: anything
-somehing_else: hi
-something: hello
---- no_error_log
-[error]
-
-
-
-=== TEST 43: set multiple response header
---- config
-    location /read {
-        content_by_lua '
-            for i = 1, 50 do
-                ngx.header["X-Direct-" .. i] = "text/my-plain-" .. i;
-            end
-
-            ngx.say(ngx.header["X-Direct-50"]);
-        ';
-    }
---- request
-GET /read
---- response_body
-text/my-plain-50
---- no_error_log
-[error]
-
-
-
-=== TEST 44: set multiple response header and then reset and then clear
---- config
-    location /read {
-        content_by_lua '
-            for i = 1, 50 do
-                ngx.header["X-Direct-" .. i] = "text/my-plain-" .. i;
-            end
-
-            for i = 1, 50 do
-                ngx.header["X-Direct-" .. i] = "text/my-plain"
-            end
-
-            for i = 1, 50 do
-                ngx.header["X-Direct-" .. i] = nil
-            end
-
-            ngx.say("ok");
-        ';
-    }
---- request
-GET /read
---- response_body
-ok
---- no_error_log
-[error]
---- timeout: 10
-
-
-
-=== TEST 45: set response content-type header for multiple times
---- config
-    location /read {
-        content_by_lua '
-            ngx.header.content_type = "text/my-plain";
-            ngx.header.content_type = "text/my-plain-2";
-            ngx.say("Hi");
-        ';
-    }
---- request
-GET /read
---- response_headers
-Content-Type: text/my-plain-2
---- response_body
-Hi
-
-
-
-=== TEST 46: set Last-Modified response header for multiple times
---- config
-    location /read {
-        content_by_lua '
-            ngx.header.last_modified = ngx.http_time(1290079655)
-            ngx.header.last_modified = ngx.http_time(1290079654)
-            ngx.say("ok");
-        ';
-    }
---- request
-GET /read
---- response_headers
-Last-Modified: Thu, 18 Nov 2010 11:27:34 GMT
---- response_body
-ok
-
-
-
-=== TEST 47: set Last-Modified response header and then clear
---- config
-    location /read {
-        content_by_lua '
-            ngx.header.last_modified = ngx.http_time(1290079655)
-            ngx.header.last_modified = nil
-            ngx.say("ok");
-        ';
-    }
---- request
-GET /read
---- response_headers
-!Last-Modified
---- response_body
-ok
-
-
-
-=== TEST 48: github #20: segfault caused by the nasty optimization in the nginx core (write)
---- config
-    location = /t/ {
-        header_filter_by_lua '
-            ngx.header.foo = 1
-        ';
-        proxy_pass http://127.0.0.1:$server_port;
-    }
---- request
-GET /t
---- more_headers
-Foo: bar
-Bah: baz
---- response_headers
-Location: http://localhost:$ServerPort/t/
---- response_body_like: 301 Moved Permanently
---- error_code: 301
---- no_error_log
-[error]
-
-
-
-=== TEST 49: github #20: segfault caused by the nasty optimization in the nginx core (read)
---- config
-    location = /t/ {
-        header_filter_by_lua '
-            local v = ngx.header.foo
-        ';
-        proxy_pass http://127.0.0.1:$server_port;
-    }
---- request
-GET /t
---- more_headers
-Foo: bar
-Bah: baz
---- response_body_like: 301 Moved Permanently
---- response_headers
-Location: http://localhost:$ServerPort/t/
---- error_code: 301
---- no_error_log
-[error]
-
-
-
-=== TEST 50: github #20: segfault caused by the nasty optimization in the nginx core (read Location)
---- config
-    location = /t/ {
-        header_filter_by_lua '
-            ngx.header.Foo = ngx.header.location
-        ';
-        proxy_pass http://127.0.0.1:$server_port;
-    }
---- request
-GET /t
---- more_headers
-Foo: bar
-Bah: baz
---- response_headers
-Location: http://localhost:$ServerPort/t/
-Foo: /t/
---- response_body_like: 301 Moved Permanently
---- error_code: 301
---- no_error_log
-[error]
-
-
-
-=== TEST 51: github #20: segfault caused by the nasty optimization in the nginx core (set Foo and read Location)
---- config
-    location = /t/ {
-        header_filter_by_lua '
-            ngx.header.Foo = 3
-            ngx.header.Foo = ngx.header.location
-        ';
-        proxy_pass http://127.0.0.1:$server_port;
-    }
---- request
-GET /t
---- more_headers
-Foo: bar
-Bah: baz
---- response_headers
-Location: http://localhost:$ServerPort/t/
-Foo: /t/
---- response_body_like: 301 Moved Permanently
---- error_code: 301
---- no_error_log
-[error]
-
-
-
-=== TEST 52: case sensitive cache-control header
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header["cache-Control"] = "private"
-            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
-        ';
-    }
---- request
-    GET /lua
---- raw_response_headers_like chop
-cache-Control: private
---- response_body
-Cache-Control: private
-
-
-
-=== TEST 53: clear Cache-Control when there was no Cache-Control
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header["Cache-Control"] = nil
-            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
-        ';
-    }
---- request
-    GET /lua
---- raw_response_headers_unlike eval
-qr/Cache-Control/i
---- response_body
-Cache-Control: nil
-
-
-
-=== TEST 54: set response content-type header
---- config
-    location /read {
-        content_by_lua '
-            local s = "content_type"
-            local v = ngx.header[s]
-            ngx.say("s = ", s)
-        ';
-    }
---- request
-GET /read
---- response_body
-s = content_type
-
---- no_error_log
-[error]
-
-
-
-=== TEST 55: set a number header name
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header[32] = "private"
-            ngx.say("32: ", ngx.var.sent_http_32)
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-32: private
---- response_body
-32: private
---- no_error_log
-[error]
-
-
-
-=== TEST 56: set a number header name (in a table value)
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.foo = {32}
-            ngx.say("foo: ", ngx.var.sent_http_foo)
-        ';
-    }
---- request
-    GET /lua
---- response_headers
-foo: 32
---- response_body
-foo: 32
---- no_error_log
-[error]
-
-
-
-=== TEST 57: random access resp headers
---- config
-    location /resp-header {
-        content_by_lua '
-            ngx.header["Foo"] = "bar"
-            ngx.header["Bar"] = "baz"
-            local headers, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("Foo: ", headers["Foo"] or "nil")
-            ngx.say("foo: ", headers["foo"] or "nil")
-            ngx.say("Bar: ", headers["Bar"] or "nil")
-
-            headers, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("bar: ", headers["bar"] or "nil")
-        ';
-    }
---- request
-GET /resp-header
---- response_headers
-Foo: bar
-Bar: baz
---- response_body
-Foo: bar
-foo: bar
-Bar: baz
-bar: baz
---- no_error_log
-[error]
-
-
-
-=== TEST 58: iterating through raw resp headers
---- config
-    location /resp-header {
-        content_by_lua '
-            ngx.header["Foo"] = "bar"
-            ngx.header["Bar"] = "baz"
-
-            local headers, err = ngx.resp.get_headers(nil, true)
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            local h = {}
-            for k, v in pairs(headers) do
-                h[k] = v
-            end
-            ngx.say("Foo: ", h["Foo"] or "nil")
-            ngx.say("foo: ", h["foo"] or "nil")
-            ngx.say("Bar: ", h["Bar"] or "nil")
-            ngx.say("bar: ", h["bar"] or "nil")
-        ';
-    }
---- request
-GET /resp-header
---- response_headers
-Foo: bar
-Bar: baz
---- response_body
-Foo: bar
-foo: nil
-Bar: baz
-bar: nil
-
-
-
-=== TEST 59: removed response headers
---- config
-    location /resp-header {
-        content_by_lua '
-            ngx.header["Foo"] = "bar"
-            ngx.header["Foo"] = nil
-            ngx.header["Bar"] = "baz"
-
-            local headers, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("Foo: ", headers["Foo"] or "nil")
-            ngx.say("foo: ", headers["foo"] or "nil")
-            ngx.say("Bar: ", headers["Bar"] or "nil")
-            ngx.say("bar: ", headers["bar"] or "nil")
-        ';
-    }
---- request
-GET /resp-header
---- response_headers
-!Foo
-Bar: baz
---- response_body
-Foo: nil
-foo: nil
-Bar: baz
-bar: baz
-
-
-
-=== TEST 60: built-in Content-Type header
---- config
-    location = /t {
-        content_by_lua '
-            ngx.say("hi")
-        ';
-
-        header_filter_by_lua '
-            local hs, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            print("my Content-Type: ", hs["Content-Type"])
-            print("my content-type: ", hs["content-type"])
-            print("my content_type: ", hs["content_type"])
-        ';
-    }
---- request
-    GET /t
---- response_body
-hi
---- no_error_log
-[error]
-[alert]
---- error_log
-my Content-Type: text/plain
-my content-type: text/plain
-my content_type: text/plain
-
-
-
-=== TEST 61: built-in Content-Length header
---- config
-    location = /t {
-        content_by_lua '
-            ngx.say("hi")
-        ';
-
-        header_filter_by_lua '
-            local hs, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            print("my Content-Length: ", hs["Content-Length"])
-            print("my content-length: ", hs["content-length"])
-            print("my content_length: ", hs.content_length)
-        ';
-    }
---- request
-    GET /t HTTP/1.0
---- response_body
-hi
---- no_error_log
-[error]
-[alert]
---- error_log
-my Content-Length: 3
-my content-length: 3
-my content_length: 3
-
-
-
-=== TEST 62: built-in Connection header
---- config
-    location = /t {
-        content_by_lua '
-            ngx.say("hi")
-        ';
-
-        header_filter_by_lua '
-            local hs, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            print("my Connection: ", hs["Connection"])
-            print("my connection: ", hs["connection"])
-        ';
-    }
---- request
-    GET /t HTTP/1.0
---- response_body
-hi
---- no_error_log
-[error]
-[alert]
---- error_log
-my Connection: close
-my connection: close
-
-
-
-=== TEST 63: built-in Transfer-Encoding header (chunked)
---- config
-    location = /t {
-        content_by_lua '
-            ngx.say("hi")
-        ';
-
-        body_filter_by_lua '
-            local hs, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            print("my Transfer-Encoding: ", hs["Transfer-Encoding"])
-            print("my transfer-encoding: ", hs["transfer-encoding"])
-            print("my transfer_encoding: ", hs.transfer_encoding)
-        ';
-    }
---- request
-    GET /t
---- response_body
-hi
---- no_error_log
-[error]
-[alert]
---- error_log
-my Transfer-Encoding: chunked
-my transfer-encoding: chunked
-
-
-
-=== TEST 64: built-in Transfer-Encoding header (none)
---- config
-    location = /t {
-        content_by_lua '
-            ngx.say("hi")
-        ';
-
-        body_filter_by_lua '
-            local hs, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            print("my Transfer-Encoding: ", hs["Transfer-Encoding"])
-            print("my transfer-encoding: ", hs["transfer-encoding"])
-            print("my transfer_encoding: ", hs.transfer_encoding)
-        ';
-    }
---- request
-    GET /t HTTP/1.0
---- response_body
-hi
---- no_error_log
-[error]
-[alert]
---- error_log
-my Transfer-Encoding: nil
-my transfer-encoding: nil
-my transfer_encoding: nil
-
-
-
-=== TEST 65: set Location (no host)
---- config
-    location = /t {
-        content_by_lua '
-            ngx.header.location = "/foo/bar"
-            return ngx.exit(301)
-        ';
-    }
---- request
-GET /t
---- response_headers
-Location: /foo/bar
---- response_body_like: 301 Moved Permanently
---- error_code: 301
---- no_error_log
-[error]
-
-
-
-=== TEST 66: set Location (with host)
---- config
-    location = /t {
-        content_by_lua '
-            ngx.header.location = "http://test.com/foo/bar"
-            return ngx.exit(301)
-        ';
-    }
---- request
-GET /t
---- response_headers
-Location: http://test.com/foo/bar
---- response_body_like: 301 Moved Permanently
---- error_code: 301
---- no_error_log
-[error]
-
-
-
-=== TEST 67: ngx.header["Content-Type"] with ngx_gzip
---- config
-    gzip             on;
-    gzip_min_length  1;
-    location = /test2 {
-        content_by_lua '
-            ngx.header["Content-Type"] = "text/html; charset=utf-8"
-            ngx.say("test")
-        ';
-    }
---- request
-GET /test2
---- more_headers
-Accept-Encoding: gzip
---- response_headers
-Content-Encoding: gzip
-Content-Type: text/html; charset=utf-8
---- response_body_like chomp
-[^[:ascii:]]+
---- no_error_log
-[error]
-
-
-
-=== TEST 68: ngx.header["Content-Type"] with "; blah"
---- config
-    location = /test2 {
-        content_by_lua '
-            ngx.header["Content-Type"] = "; blah"
-            ngx.say("test")
-        ';
-    }
---- request
-GET /test2
---- response_headers
-!Content-Encoding
-Content-Type: ; blah
---- response_body
-test
---- no_error_log
-[error]
-
-
-
-=== TEST 69: return the matched content-type instead of default_type
---- http_config
-types {
-    image/png png;
-}
---- config
-location /set/ {
-     default_type text/html;
-     content_by_lua_block {
-       ngx.say(ngx.header["content-type"])
-   }
-}
---- request
-GET /set/hello.png
---- response_headers
-Content-Type: image/png
---- response_body
-image/png
---- no_error_log
-[error]
-
-
-
-=== TEST 70: always return the matched content-type
---- config
-    location /set/ {
-        default_type "image/png";
-        content_by_lua_block {
-            ngx.say(ngx.header["content-type"])
-            ngx.say(ngx.header["content-type"])
-        }
-    }
---- request
-GET /set/hello.png
---- response_headers
-Content-Type: image/png
---- response_body
-image/png
-image/png
---- no_error_log
-[error]
-
-
-
-=== TEST 71: return the matched content-type after ngx.resp.get_headers()
---- http_config
-types {
-    image/png png;
-}
---- config
-    location /set/ {
-        default_type text/html;
-        content_by_lua_block {
-            local h, err = ngx.resp.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say(h["content-type"])
-        }
-    }
---- request
-GET /set/hello.png
---- response_headers
-Content-Type: image/png
---- response_body
-image/png
---- no_error_log
-[error]
-
-
-
-=== TEST 72: exceeding max header limit (default 100)
---- config
-    location /resp-header {
-        content_by_lua_block {
-            for i = 1, 99 do
-                ngx.header["Foo" .. i] = "Foo"
-            end
-
-            local headers, err = ngx.resp.get_headers()
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local cnt = 0
-            for k, v in pairs(headers) do
-                cnt = cnt + 1
-            end
-
-            ngx.say("found ", cnt, " resp headers");
-        }
-    }
---- request
-GET /resp-header
---- response_body
-err: truncated
-found 100 resp headers
---- no_error_log
-[error]
---- log_level: debug
---- error_log
-lua exceeding response header limit 101 > 100
-
-
-
-=== TEST 73: NOT exceeding max header limit (default 100)
---- config
-    location /resp-header {
-        content_by_lua_block {
-            for i = 1, 98 do
-                ngx.header["Foo" .. i] = "Foo"
-            end
-
-            local headers, err = ngx.resp.get_headers()
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local cnt = 0
-            for k, v in pairs(headers) do
-                cnt = cnt + 1
-            end
-
-            ngx.say("found ", cnt, " resp headers");
-        }
-    }
---- request
-GET /resp-header
---- response_body
-found 100 resp headers
---- no_error_log
-[error]
-lua exceeding response header limit
---- log_level: debug
-
-
-
-=== TEST 74: exceeding max header limit (custom limit, 3)
---- config
-    location /resp-header {
-        content_by_lua_block {
-            for i = 1, 2 do
-                ngx.header["Foo" .. i] = "Foo"
-            end
-
-            local headers, err = ngx.resp.get_headers(3)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local cnt = 0
-            for k, v in pairs(headers) do
-                cnt = cnt + 1
-            end
-
-            ngx.say("found ", cnt, " resp headers");
-        }
-    }
---- request
-GET /resp-header
---- response_body
-err: truncated
-found 3 resp headers
---- no_error_log
-[error]
---- error_log
-lua exceeding response header limit 4 > 3
---- log_level: debug
-
-
-
-=== TEST 75: NOT exceeding max header limit (custom limit, 3)
---- config
-    location /resp-header {
-        content_by_lua_block {
-            for i = 1, 1 do
-                ngx.header["Foo" .. i] = "Foo"
-            end
-
-            local headers, err = ngx.resp.get_headers(3)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local cnt = 0
-            for k, v in pairs(headers) do
-                cnt = cnt + 1
-            end
-
-            ngx.say("found ", cnt, " resp headers");
-        }
-    }
---- request
-GET /resp-header
---- response_body
-found 3 resp headers
---- no_error_log
-[error]
-lua exceeding response header limit
diff --git a/debian/modules/http-lua/t/017-exec.t b/debian/modules/http-lua/t/017-exec.t
deleted file mode 100644
index 544b8bb..0000000
--- a/debian/modules/http-lua/t/017-exec.t
+++ /dev/null
@@ -1,596 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 8);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#no_diff();
-#no_shuffle();
-#no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /read {
-        content_by_lua '
-            ngx.exec("/hi");
-            ngx.say("Hi");
-        ';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body
-Hello
-
-
-
-=== TEST 2: empty uri arg
---- config
-    location /read {
-        content_by_lua '
-            ngx.exec("");
-            ngx.say("Hi");
-        ';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 3: no arg
---- config
-    location /read {
-        content_by_lua '
-            ngx.exec();
-            ngx.say("Hi");
-        ';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 4: too many args
---- config
-    location /read {
-        content_by_lua '
-            ngx.exec(1, 2, 3, 4);
-            ngx.say("Hi");
-        ';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 5: null uri
---- config
-    location /read {
-        content_by_lua '
-            ngx.exec(nil)
-            ngx.say("Hi")
-        ';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 6: user args
---- config
-    location /read {
-        content_by_lua '
-            ngx.exec("/hi", "Yichun Zhang")
-            ngx.say("Hi")
-        ';
-    }
-    location /hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello Yichun Zhang
-
-
-
-=== TEST 7: args in uri
---- config
-    location /read {
-        content_by_lua '
-            ngx.exec("/hi?agentzh")
-            ngx.say("Hi")
-        ';
-    }
-    location /hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello agentzh
-
-
-
-=== TEST 8: args in uri and user args
---- config
-    location /read {
-        content_by_lua '
-            ngx.exec("/hi?a=Yichun", "b=Zhang")
-            ngx.say("Hi")
-        ';
-    }
-    location /hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello a=Yichun&b=Zhang
-
-
-
-=== TEST 9: args in uri and user args
---- config
-    location /read {
-        content_by_lua '
-            ngx.exec("@hi?a=Yichun", "b=Zhang")
-            ngx.say("Hi")
-        ';
-    }
-    location @hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello 
-
-
-
-=== TEST 10: exec after location capture (simple echo)
---- config
-    location /test {
-        content_by_lua_file 'html/test.lua';
-    }
-
-    location /a {
-        echo "hello";
-    }
-
-    location /b {
-        echo "hello";
-    }
-
---- user_files
->>> test.lua
-ngx.location.capture('/a')
-
-ngx.exec('/b')
---- request
-    GET /test
---- response_body
-hello
-
-
-
-=== TEST 11: exec after location capture (memc)
---- config
-    location /test {
-        content_by_lua_file 'html/test.lua';
-    }
-
-    location /a {
-        set $memc_key 'hello world';
-        set $memc_value 'hello hello hello world world world';
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /b {
-        set $memc_key 'hello world';
-        set $memc_cmd get;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
---- user_files
->>> test.lua
-ngx.location.capture('/a')
-
-ngx.exec('/b')
---- request
-    GET /test
---- response_body: hello hello hello world world world
-
-
-
-=== TEST 12: exec after named location capture (simple echo)
---- config
-    location /test {
-        content_by_lua_file 'html/test.lua';
-    }
-
-    location /a {
-        echo "hello";
-    }
-
-    location @b {
-        echo "hello";
-    }
-
---- user_files
->>> test.lua
-ngx.location.capture('/a')
-
-ngx.exec('@b')
---- request
-    GET /test
---- response_body
-hello
-
-
-
-=== TEST 13: exec after named location capture (memc)
---- config
-    location /test {
-        content_by_lua_file 'html/test.lua';
-    }
-
-    location /a {
-        set $memc_key 'hello world';
-        set $memc_value 'hello hello hello world world world';
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location @b {
-        set $memc_key 'hello world';
-        set $memc_cmd get;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
---- user_files
->>> test.lua
-ngx.location.capture('/a')
-
-ngx.exec('@b')
---- request
-    GET /test
---- response_body: hello hello hello world world world
-
-
-
-=== TEST 14: github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location (content)
---- config
-    location = /hi {
-        echo hello;
-    }
-    location /sub {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-        #echo hello;
-    }
-    location /p{
-        #content_by_lua '
-            #local res = ngx.location.capture("/sub")
-            #ngx.print(res.body)
-        #';
-        echo_location /sub;
-    }
-    location /lua {
-        content_by_lua '
-            ngx.exec("/p")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hello
-
-
-
-=== TEST 15: github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location (content + named location)
---- config
-    location = /hi {
-        echo hello;
-    }
-    location /sub {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-        #echo hello;
-    }
-    location @p {
-        #content_by_lua '
-            #local res = ngx.location.capture("/sub")
-            #ngx.print(res.body)
-        #';
-        echo_location /sub;
-    }
-    location /lua {
-        content_by_lua '
-            ngx.exec("@p")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hello
-
-
-
-=== TEST 16: github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location (content + post subrequest)
---- config
-    location = /hi {
-        echo hello;
-    }
-    location /sub {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-        #echo hello;
-    }
-    location /p{
-        #content_by_lua '
-            #local res = ngx.location.capture("/sub")
-            #ngx.print(res.body)
-        #';
-        echo_location /sub;
-    }
-    location blah {
-        echo blah;
-    }
-    location /lua {
-        content_by_lua '
-            ngx.location.capture("/blah")
-            ngx.exec("/p")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hello
-
-
-
-=== TEST 17: pcall safe
---- config
-    location /lua {
-        content_by_lua '
-            function f ()
-                ngx.exec("/hi")
-            end
-
-            pcall(f)
-            ngx.say("hello")
-        ';
-    }
-    location /hi {
-        echo hi;
-    }
---- request
-GET /lua
---- error_code: 200
---- response_body
-hi
-
-
-
-=== TEST 18: lua table as "args" parameter
---- config
-    location /lua {
-        content_by_lua '
-            local args = { foo = 3, bar = 4 }
-            ngx.exec("/hi", args)
-        ';
-    }
-    location /hi {
-        echo "foo = $arg_foo";
-        echo "bar = $arg_bar";
-    }
---- request
-GET /lua
---- error_code: 200
---- response_body
-foo = 3
-bar = 4
-
-
-
-=== TEST 19: jump to internal locations requires ctx cleared
---- config
-    location @proxy {
-        rewrite_by_lua return;
-        echo hello;
-    }
-    location /main {
-        content_by_lua '
-            ngx.exec("@proxy")
-        ';
-    }
---- request
-    GET /main
---- response_body
-hello
-
-
-
-=== TEST 20: exec + rewrite + named locations
---- config
-    location @proxy {
-        rewrite_by_lua return;
-        echo hello;
-    }
-    location /main {
-        rewrite_by_lua '
-            ngx.exec("@proxy")
-        ';
-    }
---- request
-    GET /main
---- response_body
-hello
-
-
-
-=== TEST 21: exec(named location) in subrequests
---- config
-    location /entry {
-        echo_location /foo;
-        echo_location /foo2;
-    }
-  location /foo {
-      content_by_lua '
-          ngx.exec("@bar")
-      ';
-  }
-  location /foo2 {
-      content_by_lua '
-          ngx.exec("@bar")
-      ';
-  }
-
-  location @bar {
-      proxy_pass http://127.0.0.1:$server_port/bar;
-  }
-  location /bar {
-      echo hello;
-  }
---- request
-    GET /entry
---- response_body
-hello
-hello
-
-
-
-=== TEST 22: exec(normal location) in subrequests
---- config
-    location /entry {
-        echo_location /foo;
-        echo_location /foo2;
-    }
-  location /foo {
-      content_by_lua '
-          ngx.exec("/baz")
-      ';
-  }
-  location /foo2 {
-      content_by_lua '
-          ngx.exec("/baz")
-      ';
-  }
-
-  location /baz {
-      proxy_pass http://127.0.0.1:$server_port/bar;
-  }
-  location /bar {
-      echo hello;
-  }
---- request
-    GET /entry
---- response_body
-hello
-hello
-
-
-
-=== TEST 23: content_by_lua + ngx.exec + subrequest capture
---- config
-    location /main {
-        rewrite_by_lua '
-            res = ngx.location.capture("/test_loc");
-            ngx.print("hello, ", res.body)
-        ';
-        content_by_lua return;
-    }
-    location /test_loc {
-        content_by_lua '
-            ngx.exec("@proxy")
-        ';
-    }
-    location @proxy {
-        #echo proxy;
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-    location /foo {
-        #echo_status 201;
-        echo bah;
-    }
---- request
-    GET /main
---- 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]
-
-
-
-=== TEST 25: pipelined requests
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.exec("@foo")
-        }
-    }
-
-    location @foo {
-        return 200;
-    }
---- pipelined_requests eval
-["GET /t", "GET /t"]
---- error_code eval
-[200, 200]
---- response_body eval
-["", ""]
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/018-ndk.t b/debian/modules/http-lua/t/018-ndk.t
deleted file mode 100644
index 1429377..0000000
--- a/debian/modules/http-lua/t/018-ndk.t
+++ /dev/null
@@ -1,173 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 4);
-
-#no_diff();
-#no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /read {
-        content_by_lua '
-            local s = ndk.set_var.set_escape_uri(" :")
-            local r = ndk.set_var.set_unescape_uri("a%20b")
-            ngx.say(s)
-            ngx.say(r)
-        ';
-    }
---- request
-GET /read
---- response_body
-%20%3A
-a b
-
-
-
-=== TEST 2: directive not found
---- config
-    location /read {
-        content_by_lua '
-            local s = ndk.set_var.set_escape_uri_blah_blah(" :")
-            ngx.say(s)
-        ';
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 3: directive not found
---- config
-    location /read {
-        content_by_lua '
-            local s = ndk.set_var.content_by_lua(" :")
-            ngx.say(s)
-        ';
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 4: directive not found
---- config
-    location /read {
-        header_filter_by_lua '
-            ngx.header.Foo = ndk.set_var.set_escape_uri(" %")
-        ';
-        echo hi;
-    }
---- request
-GET /read
---- response_headers
-Foo: %20%25
---- response_body
-hi
-
-
-
-=== TEST 5: bug: ndk.set_var not initialize ngx_http_variable_value_t variable properly
---- config
-   location /luaset {
-     content_by_lua "
-
-       local version = '2011.10.13+0000'
-       local e_version = ndk.set_var.set_encode_base32(version)
-       local s_version= ndk.set_var.set_quote_sql_str(version)
-       ngx.say(e_version)
-       ngx.say(s_version)
-     ";
-   }
---- request
-GET /luaset
---- response_body
-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
---- wait: 0.1
---- error_log
-foo = a b
-
-
-
-=== TEST 9: ngx.timer.*
---- config
-    location /read {
-        echo ok;
-        log_by_lua '
-            ngx.timer.at(0, function ()
-                local foo = ndk.set_var.set_unescape_uri("a%20b")
-                ngx.log(ngx.WARN, "foo = ", foo)
-            end)
-        ';
-    }
---- request
-GET /read
---- response_body
-ok
---- wait: 0.1
---- error_log
-foo = a b
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/019-const.t b/debian/modules/http-lua/t/019-const.t
deleted file mode 100644
index 4f9c764..0000000
--- a/debian/modules/http-lua/t/019-const.t
+++ /dev/null
@@ -1,46 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => blocks() * repeat_each() * 2;
-
-#no_diff();
-#no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /read {
-        content_by_lua '
-            ngx.say(ngx.OK)
-            ngx.say(ngx.AGAIN)
-            ngx.say(ngx.DONE)
-            ngx.say(ngx.ERROR)
-        ';
-    }
---- request
-GET /read
---- response_body
-0
--2
--4
--1
-
-
-
-=== TEST 2: http constants
---- config
-    location /read {
-        content_by_lua '
-            ngx.say(ngx.HTTP_GATEWAY_TIMEOUT)
-        ';
-    }
---- request
-GET /read
---- response_body
-504
diff --git a/debian/modules/http-lua/t/020-subrequest.t b/debian/modules/http-lua/t/020-subrequest.t
deleted file mode 100644
index 658a1d2..0000000
--- a/debian/modules/http-lua/t/020-subrequest.t
+++ /dev/null
@@ -1,2879 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#master_on();
-#workers(1);
-#worker_connections(1014);
-#log_level('warn');
-#master_process_enabled(1);
-
-no_root_location;
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 23);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#no_diff();
-no_long_string();
-#no_shuffle();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: DELETE
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_DELETE });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-DELETE
---- error_log
-lua http subrequest "/other?"
---- no_error_log
-[error]
-
-
-
-=== TEST 2: DELETE (proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_DELETE });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-DELETE
---- no_error_log
-[error]
-
-
-
-=== TEST 3: POST (nobody, proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /t {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_POST });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /t
---- response_body
-POST
---- no_error_log
-[error]
-
-
-
-=== TEST 4: HEAD
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_HEAD });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
---- no_error_log
-[error]
-
-
-
-=== TEST 5: explicit GET
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_GET });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-GET
---- no_error_log
-[error]
-
-
-
-=== TEST 6: implicit GET
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo")
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-GET
---- no_error_log
-[error]
-
-
-
-=== TEST 7: implicit GET (empty option table)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo", {})
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-GET
---- no_error_log
-[error]
-
-
-
-=== TEST 8: PUT (nobody, proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo_read_request_body;
-
-        echo $echo_request_method;
-        echo_request_body;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_PUT, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body chomp
-PUT
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 9: PUT (nobody, no proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        #echo_read_request_body;
-
-        echo $echo_request_method;
-        #echo $echo_request_body;
-        echo_request_body;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_PUT, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body chomp
-PUT
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 10: PUT (nobody, no proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        #echo_read_request_body;
-
-        echo $echo_request_method;
-        #echo $echo_request_body;
-        echo_request_body;
-        #echo "[$http_content_length]";
-        echo;
-    }
-
-    location /foo {
-        echo $echo_request_method;
-        echo -n "[$http_content_length]";
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_PUT, body = "hello" });
-
-            ngx.print(res.body)
-
-            res = ngx.location.capture("/foo")
-            ngx.say(res.body)
-
-        ';
-    }
---- request
-GET /lua
---- response_body
-PUT
-hello
-GET
-[]
---- no_error_log
-[error]
-
-
-
-=== TEST 11: POST (with body, proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo_read_request_body;
-
-        echo $echo_request_method;
-        echo_request_body;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_POST, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body chomp
-POST
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 12: POST (with body, memc method)
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc {
-        set $memc_key $echo_request_uri;
-        set $memc_exptime 600;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /lua {
-        content_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            ngx.say("GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            ngx.say("PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            ngx.say("cached: " .. res.body);
-
-        ';
-    }
---- request
-GET /lua
---- response_body
-GET: 404
-PUT: 201
-cached: hello
---- no_error_log
-[error]
-
-
-
-=== TEST 13: POST (with body, memc method)
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc {
-        set $memc_cmd "";
-        set $memc_key $echo_request_uri;
-        set $memc_exptime 600;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /lua {
-        content_by_lua '
-            ngx.location.capture("/flush",
-                { share_all_vars = true });
-
-            res = ngx.location.capture("/memc",
-                { share_all_vars = true });
-            ngx.say("GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello", share_all_vars = true });
-            ngx.say("PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc", { share_all_vars = true });
-            ngx.say("cached: " .. res.body);
-        ';
-    }
---- request
-GET /lua
---- response_body
-GET: 404
-PUT: 201
-cached: hello
---- no_error_log
-[error]
-
-
-
-=== TEST 14: empty args option table
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = {} })
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body eval: "\n"
---- no_error_log
-[error]
-
-
-
-=== TEST 15: non-empty args option table (1 pair)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { ["fo="] = "=>" } })
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-fo%3D=%3D%3E
---- no_error_log
-[error]
-
-
-
-=== TEST 16: non-empty args option table (2 pairs)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { ["fo="] = "=>",
-                    ["="] = ":" } })
-            ngx.print(res.body)
-        ';
-    }
---- request
-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]
-
-
-
-=== TEST 17: non-empty args option table (2 pairs, no special chars)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { foo = 3,
-                    bar = "hello" } })
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body_like chop
-^(?:bar=hello\&foo=3|foo=3\&bar=hello)$
---- no_error_log
-[error]
-
-
-
-=== TEST 18: non-empty args option table (number key)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { [57] = "hi" } })
-            ngx.print(res.body)
-        ';
-    }
---- request
-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
-
-
-
-=== TEST 19: non-empty args option table (plain arrays)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { "hi" } })
-            ngx.print(res.body)
-        ';
-    }
---- request
-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
-
-
-
-=== TEST 20: more args
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo?a=3",
-                { args = { b = 4 } })
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-a=3&b=4
---- no_error_log
-[error]
-
-
-
-=== TEST 21: more args
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo?a=3",
-                { args = "b=4" })
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-a=3&b=4
---- no_error_log
-[error]
-
-
-
-=== TEST 22: is_subrequest in main request
---- config
-    location /lua {
-        content_by_lua '
-            if ngx.is_subrequest then
-                ngx.say("sub req")
-            else
-                ngx.say("main req")
-            end
-        ';
-    }
---- request
-    GET /lua
---- response_body
-main req
---- no_error_log
-[error]
-
-
-
-=== TEST 23: is_subrequest in sub request
---- config
-    location /main {
-        echo_location /lua;
-    }
-
-    location /lua {
-        content_by_lua '
-            if ngx.is_subrequest then
-                ngx.say("sub req")
-            else
-                ngx.say("main req")
-            end
-        ';
-    }
---- request
-    GET /main
---- response_body
-sub req
---- no_error_log
-[error]
-
-
-
-=== TEST 24: is_subrequest in sub request in set_by_lua
---- config
-    location /main {
-        echo_location /lua;
-    }
-
-    location /lua {
-        set_by_lua $a '
-            if ngx.is_subrequest then
-                return "sub req"
-            else
-                return "main req"
-            end
-        ';
-        echo $a;
-    }
---- request
-    GET /main
---- response_body
-sub req
---- no_error_log
-[error]
-
-
-
-=== TEST 25: header inheritance bug (without body) (github issue 38)
-https://github.com/chaoslawful/lua-nginx-module/issues/38
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo -n $http_foo;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_GET });
-            ngx.say("header foo: [", res.body, "]")
-        ';
-    }
---- request
-GET /lua
---- more_headers
-Foo: bar
---- response_body
-header foo: [bar]
---- no_error_log
-[error]
-
-
-
-=== TEST 26: header inheritance bug (with body) (github issue 38)
-https://github.com/chaoslawful/lua-nginx-module/issues/38
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo -n $http_foo;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { body = "abc" });
-            ngx.say("header foo: [", res.body, "]")
-        ';
-    }
---- request
-GET /lua
---- more_headers
-Foo: bar
---- response_body
-header foo: [bar]
---- no_error_log
-[error]
-
-
-
-=== TEST 27: lua calls lua via subrequests
---- config
-    location /a {
-        content_by_lua '
-            ngx.say("hello, a");
-        ';
-    }
-    location /b {
-        content_by_lua '
-            ngx.say("hello, b");
-        ';
-    }
-    location /c {
-        content_by_lua '
-            ngx.say("hello, c");
-        ';
-    }
-    location /main {
-        content_by_lua '
-            res1, res2 = ngx.location.capture_multi({{"/a"}, {"/b"}})
-            res3 = ngx.location.capture("/c")
-            ngx.print(res1.body, res2.body, res3.body)
-        ';
-    }
---- request
-    GET /main
---- response_body
-hello, a
-hello, b
-hello, c
---- error_log
-lua reuse free buf memory
---- no_error_log
-[error]
-
-
-
-=== TEST 28: POST (with body, proxy method, main request is a POST too)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo_read_request_body;
-
-        echo $echo_request_method;
-        echo_request_body;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_POST, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-POST /lua
-hi
---- response_body chomp
-POST
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 29: Last-Modified response header for static file subrequest
---- config
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo.html")
-
-            ngx.say(res.status)
-            ngx.say(res.header["Last-Modified"])
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- user_files
->>> foo.html
-hello, static file
---- response_body_like chomp
-^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]
-
-
-
-=== TEST 30: custom ctx table for subrequest
---- config
-    location /sub {
-        content_by_lua '
-            ngx.ctx.foo = "bar";
-        ';
-    }
-    location /lua {
-        content_by_lua '
-            local ctx = {}
-            res = ngx.location.capture("/sub", { ctx = ctx })
-
-            ngx.say(ctx.foo);
-            ngx.say(ngx.ctx.foo);
-        ';
-    }
---- request
-GET /lua
---- response_body
-bar
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 31: share the ctx with the parent
---- config
-    location /sub {
-        content_by_lua '
-            ngx.ctx.foo = "bar";
-        ';
-    }
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/sub", { ctx = ngx.ctx })
-            ngx.say(ngx.ctx.foo);
-        ';
-    }
---- request
-GET /lua
---- response_body
-bar
---- no_error_log
-[error]
-
-
-
-=== TEST 32: test memcached with subrequests
---- http_config
-    upstream memc {
-        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-        keepalive 100;
-    }
---- config
-    location /memc {
-        set $memc_key some_key;
-        set $memc_exptime 600;
-        memc_pass memc;
-    }
-
-    location /t {
-        content_by_lua '
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello 1234" });
-            -- ngx.say("PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            ngx.say("some_key: " .. res.body);
-        ';
-    }
---- request
-GET /t
---- response_body
-some_key: hello 1234
---- error_log
-lua reuse free buf chain, but reallocate memory because
---- no_error_log
-[error]
-
-
-
-=== TEST 33: main POST, sub GET (main does not read the body)
---- config
-    location /other {
-        default_type 'foo/bar';
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_method)
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-        #proxy_pass http://127.0.0.1:8892/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_GET });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-POST /lua
-hello, world
---- response_body
-GET
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 34: main POST, sub GET (main has read the body)
---- config
-    location /other {
-        default_type 'foo/bar';
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_method)
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-        #proxy_pass http://127.0.0.1:8892/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body()
-
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_GET });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-POST /lua
-hello, world
---- response_body
-GET
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 35: main POST, sub POST (inherit bodies directly)
---- config
-    location /other {
-        default_type 'foo/bar';
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_method)
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-        #proxy_pass http://127.0.0.1:8892/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body()
-
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_POST });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-POST /lua
-hello, world
---- response_body
-POST
-hello, world
---- no_error_log
-[error]
-
-
-
-=== TEST 36: main POST, sub PUT (inherit bodies directly)
---- config
-    location /other {
-        default_type 'foo/bar';
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_method)
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-        #proxy_pass http://127.0.0.1:8892/other;
-    }
-
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body()
-
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_PUT });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-POST /lua
-hello, world
---- response_body
-PUT
-hello, world
---- no_error_log
-[error]
-
-
-
-=== TEST 37: recursive calls
---- config
-    location /t {
-        content_by_lua '
-            ngx.location.capture("/t")
-        ';
-    }
---- request
-    GET /t
---- ignore_response
---- error_log
-lua subrequests cycle while processing "/t"
-
-
-
-=== TEST 38: OPTIONS
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_OPTIONS });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-OPTIONS
---- no_error_log
-[error]
-
-
-
-=== TEST 39: OPTIONS with a body
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-        echo_request_body;
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_OPTIONS, body = "hello world" });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body chop
-OPTIONS
-hello world
---- no_error_log
-[error]
-
-
-
-=== TEST 40: encode args table with a multi-value arg.
---- config
-    location /t {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- request
-GET /main
---- tcp_listen: 19112
---- tcp_query_len: 9
---- tcp_reply eval
-"VALUE foo 0 1024\r\nhello world"
-
---- stap2
-F(ngx_http_lua_capture_body_filter) {
-    if (pid() == target() && $r != $r->main) {
-        printf("lua capture body output: %s\n", ngx_chain_dump($in))
-        if ($in->buf->last_in_chain) {
-            print_ubacktrace()
-        }
-    }
-}
-
---- 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=200
-
---- response_body
-status: 200
-body: hello world
-truncated: true
---- error_log
-upstream prematurely closed connection
-
-
-
-=== 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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- request
-GET /main
---- tcp_listen: 19112
---- tcp_no_close
---- tcp_reply eval
-"VALUE foo 0 1024\r\nhello world"
-
---- stap2
-F(ngx_http_lua_capture_body_filter) {
-    if (pid() == target() && $r != $r->main) {
-        printf("lua capture body output: %s\n", ngx_chain_dump($in))
-        //if ($in->buf->last_in_chain) {
-            print_ubacktrace()
-        //}
-    }
-}
-
---- 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=200
-
---- response_body_like chop
-^status: 200
-body: [^\n]*
-truncated: true
-
---- 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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- 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=200
-
---- response_body
-status: 200
-body: hello world
-truncated: true
-
---- error_log
-upstream prematurely closed connection
-
-
-
-=== 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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- 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=200
-
---- response_body
-status: 200
-body: 
-truncated: true
-
---- 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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- 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
-truncated: false
-
---- 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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- 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=200
-
---- response_body
-status: 200
-body: 
-truncated: true
-
---- 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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- 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
-truncated: false
-
---- 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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- 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=200
-
---- response_body
-status: 200
-body: hello world
-truncated: true
-
---- error_log
-upstream timed out
-
-
-
-=== TEST 52: forwarding in-memory request bodies to multiple subrequests
---- config
-    location /other {
-        default_type 'foo/bar';
-        proxy_pass http://127.0.0.1:$server_port/back;
-    }
-
-    location /back {
-        echo_read_request_body;
-        echo_request_body;
-    }
-
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body()
-
-            for i = 1, 2 do
-                res = ngx.location.capture("/other",
-                    { method = ngx.HTTP_POST });
-
-                ngx.say(res.body)
-            end
-        ';
-    }
-
---- request eval
-"POST /lua
-" . "hello world"
-
---- response_body
-hello world
-hello world
-
---- no_error_log
-[error]
-
-
-
-=== TEST 53: forwarding in-file request bodies to multiple subrequests (client_body_in_file_only)
---- config
-    location /other {
-        default_type 'foo/bar';
-        proxy_pass http://127.0.0.1:$server_port/back;
-    }
-
-    location /back {
-        echo_read_request_body;
-        echo_request_body;
-    }
-
-    client_body_in_file_only on;
-
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body()
-
-            for i = 1, 2 do
-                res = ngx.location.capture("/other",
-                    { method = ngx.HTTP_POST });
-
-                ngx.say(res.body)
-            end
-        ';
-    }
-
---- request eval
-"POST /lua
-" . "hello world"
-
---- response_body
-hello world
-hello world
-
---- no_error_log
-[error]
-
-
-
-=== TEST 54: forwarding in-file request bodies to multiple subrequests (exceeding client_body_buffer_size)
---- config
-    location /other {
-        default_type 'foo/bar';
-        proxy_pass http://127.0.0.1:$server_port/back;
-    }
-
-    location /back {
-        echo_read_request_body;
-        echo_request_body;
-    }
-
-    location /lua {
-        #client_body_in_file_only on;
-        client_body_buffer_size 1;
-        content_by_lua '
-            ngx.req.read_body()
-
-            for i = 1, 2 do
-                res = ngx.location.capture("/other",
-                    { method = ngx.HTTP_POST });
-
-                ngx.say(res.body)
-            end
-        ';
-    }
---- request eval
-"POST /lua
-" . ("hello world" x 100)
-
---- stap2
-global valid = 0
-global fds
-
-F(ngx_http_handler) { valid = 1  }
-
-probe syscall.open {
-    if (valid && pid() == target()) {
-        print(name, "(", argstr, ")")
-    }
-}
-
-probe syscall.close {
-    if (valid && pid() == target() && fds[sprintf("%d", $fd)]) {
-        println(name, "(", argstr, ")")
-    }
-}
-
-probe syscall.unlink {
-    if (valid && pid() == target()) {
-        println(name, "(", argstr, ")")
-    }
-}
-
-probe syscall.open.return {
-    if (valid && pid() == target()) {
-        println(" = ", retstr)
-        fds[retstr] = 1
-    }
-}
-
-F(ngx_http_lua_subrequest) {
-    println("lua subrequest")
-}
-
-F(ngx_output_chain) {
-    printf("output chain: %s\n", ngx_chain_dump($in))
-}
-
-F(ngx_pool_run_cleanup_file) {
-    println("clean up file: ", $fd)
-}
-
---- response_body eval
-("hello world" x 100) . "\n"
-. ("hello world" x 100) . "\n"
-
---- no_error_log
-[error]
---- error_log
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 55: subrequests truncated in its response body due to premature connection close (buffered + chunked)
---- config
-    server_tokens off;
-
-    location /proxy {
-        internal;
-
-        #proxy_read_timeout 100ms;
-        proxy_http_version 1.1;
-        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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- request
-GET /main
---- tcp_listen: 19113
---- tcp_query_len: 65
---- tcp_reply eval
-"HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\nb\r\nhello world\r"
-
---- 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=200
-
---- response_body
-status: 200
-body: hello world
-truncated: true
-
---- error_log
-upstream prematurely closed connection
-
-
-
-=== TEST 56: subrequests truncated in its response body due to premature connection close (nonbuffered + chunked)
---- config
-    server_tokens off;
-
-    location /proxy {
-        internal;
-
-        #proxy_read_timeout 100ms;
-        proxy_http_version 1.1;
-        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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- request
-GET /main
---- tcp_listen: 19113
---- tcp_query_len: 65
---- tcp_reply eval
-"HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\nb\r\nhello world\r"
-
---- 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=200
-
---- response_body
-status: 200
-body: hello world
-truncated: true
-
---- error_log
-upstream prematurely closed connection
-
-
-
-=== TEST 57: subrequests truncated in its response body due to read timeout (buffered + chunked)
---- config
-    location /proxy {
-        internal;
-
-        proxy_read_timeout 100ms;
-        proxy_buffering on;
-        proxy_http_version 1.1;
-        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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- request
-GET /main
---- tcp_listen: 19113
---- tcp_no_close
---- tcp_reply eval
-"HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\nb\r\nhello world\r"
-
---- 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=200
-
---- response_body
-status: 200
-body: 
-truncated: true
-
---- error_log
-upstream timed out
-
-
-
-=== TEST 58: good chunked response (buffered)
---- config
-    location /proxy {
-        internal;
-
-        #proxy_read_timeout 100ms;
-        proxy_buffering on;
-        proxy_http_version 1.1;
-        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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- request
-GET /main
---- tcp_listen: 19113
---- tcp_no_close
---- tcp_reply eval
-"HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n5\r\nhello\r\n0\r\n\r\n"
-
---- 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=0 rc=0
-post subreq: rc=0, status=200
-
---- response_body
-status: 200
-body: hello
-truncated: false
-
-
-
-=== TEST 59: good chunked response (nonbuffered)
---- config
-    location /proxy {
-        internal;
-
-        #proxy_read_timeout 100ms;
-        proxy_buffering off;
-        proxy_http_version 1.1;
-        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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- request
-GET /main
---- tcp_listen: 19113
---- tcp_no_close
---- tcp_reply eval
-"HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n5\r\nhello\r\n0\r\n\r\n"
-
---- 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=0 rc=0
-post subreq: rc=0, status=200
-
---- response_body
-status: 200
-body: hello
-truncated: false
-
-
-
-=== TEST 60: subrequests truncated in its response body due to premature connection close (nonbuffered + proxy)
---- 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)
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- 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=200
-
---- response_body
-status: 200
-body: hello world
-truncated: true
-
---- error_log
-upstream prematurely closed connection
-
-
-
-=== TEST 61: WebDAV methods
---- config
-    location /other {
-        echo "method: $echo_request_method";
-    }
-
-    location /lua {
-        content_by_lua '
-            local methods = {
-                ngx.HTTP_MKCOL,
-                ngx.HTTP_COPY,
-                ngx.HTTP_MOVE,
-                ngx.HTTP_PROPFIND,
-                ngx.HTTP_PROPPATCH,
-                ngx.HTTP_LOCK,
-                ngx.HTTP_UNLOCK,
-                ngx.HTTP_PATCH,
-                ngx.HTTP_TRACE,
-            }
-
-            for i, method in ipairs(methods) do
-                res = ngx.location.capture("/other",
-                    { method = method })
-                ngx.print(res.body)
-            end
-        ';
-    }
---- request
-GET /lua
---- response_body
-method: MKCOL
-method: COPY
-method: MOVE
-method: PROPFIND
-method: PROPPATCH
-method: LOCK
-method: UNLOCK
-method: PATCH
-method: TRACE
-
---- no_error_log
-[error]
-
-
-
-=== TEST 62: by default DELETE subrequests don't forward request bodies
---- config
-    location /other {
-        default_type 'foo/bar';
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_DELETE });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-DELETE /lua
-hello world
---- response_body
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 63: DELETE subrequests do forward request bodies when always_forward_body == true
---- config
-    location = /other {
-        default_type 'foo/bar';
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
-
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body()
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_DELETE, always_forward_body = true });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-DELETE /lua
-hello world
---- response_body
-hello world
---- no_error_log
-[error]
-
-
-
-=== TEST 64: DELETE subrequests do forward request bodies when always_forward_body == true (on disk)
---- config
-    location = /other {
-        default_type 'foo/bar';
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
-
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body()
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_DELETE, always_forward_body = true });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-DELETE /lua
-hello world
---- stap2
-global c
-probe process("$LIBLUA_PATH").function("rehashtab") {
-    c++
-    //print_ubacktrace()
-    printf("rehash: %d\n", c)
-}
---- stap_out2
---- response_body
-hello world
---- no_error_log
-[error]
-
-
-
-=== TEST 65: DELETE
---- config
-    location = /t {
-        content_by_lua '
-            res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-        ';
-    }
-    location = /sub {
-        echo hello;
-        echo world;
-    }
---- request
-GET /t
---- response_body
-hello
-world
---- stap
-F(ngx_http_lua_capture_header_filter) {
-    println("capture header filter")
-}
-
-F(ngx_http_lua_capture_body_filter) {
-    println("capture body filter")
-}
-
---- stap_out
-capture header filter
-capture body filter
-capture body filter
-capture body filter
-capture header filter
-capture body filter
-capture body filter
---- no_error_log
-[error]
-
-
-
-=== TEST 66: leafo test case 1 for assertion failures
---- config
-    location = /t {
-        echo hello;
-    }
-
-    location /proxy {
-        internal;
-        rewrite_by_lua "
-          local req = ngx.req
-          print(ngx.var._url)
-
-          for k,v in pairs(req.get_headers()) do
-            if k ~= 'content-length' then
-              req.clear_header(k)
-            end
-          end
-
-          if ngx.ctx.headers then
-            for k,v in pairs(ngx.ctx.headers) do
-              req.set_header(k, v)
-            end
-          end
-        ";
-
-        proxy_http_version 1.1;
-        proxy_pass $_url;
-    }
-
-    location /first {
-      set $_url "";
-      content_by_lua '
-        local res = ngx.location.capture("/proxy", {
-          ctx = {
-            headers = {
-              ["Content-type"] = "application/x-www-form-urlencoded"
-            }
-          },
-          vars = { _url = "http://127.0.0.1:" .. ngx.var.server_port .. "/t" }
-        })
-
-        ngx.print(res.body)
-
-        local res = ngx.location.capture("/proxy", {
-          ctx = {
-            headers = {
-              ["x-some-date"] = "Sun, 01 Dec 2013 11:47:41 GMT",
-              ["x-hello-world-header"] = "123412341234",
-              ["Authorization"] = "Hello"
-            }
-          },
-          vars = { _url = "http://127.0.0.1:" .. ngx.var.server_port .. "/t" }
-        })
-
-        ngx.print(res.body)
-      ';
-    }
---- request
-GET /first
---- response_body
-hello
-hello
---- no_error_log eval
-[
-"[error]",
-qr/Assertion .*? failed/
-]
-
-
-
-=== TEST 67: leafo test case 2 for assertion failures
---- config
-    location = /t {
-        echo hello;
-    }
-
-    location /proxy {
-        internal;
-        rewrite_by_lua "
-          local req = ngx.req
-          print(ngx.var._url)
-
-          for k,v in pairs(req.get_headers()) do
-            if k ~= 'content-length' then
-              req.clear_header(k)
-            end
-          end
-
-          if ngx.ctx.headers then
-            for k,v in pairs(ngx.ctx.headers) do
-              req.set_header(k, v)
-            end
-          end
-        ";
-
-        proxy_http_version 1.1;
-        proxy_pass $_url;
-    }
-
-    location /second {
-      set $_url "";
-      content_by_lua '
-        local res = ngx.location.capture("/proxy", {
-          method = ngx.HTTP_POST,
-          body = ("x"):rep(600),
-          ctx = {
-            headers = {
-              ["Content-type"] = "application/x-www-form-urlencoded"
-            }
-          },
-          vars = { _url = "http://127.0.0.1:" .. ngx.var.server_port .. "/t" }
-        })
-
-        ngx.print(res.body)
-
-        local res = ngx.location.capture("/proxy", {
-          ctx = {
-            headers = {
-              ["x-some-date"] = "Sun, 01 Dec 2013 11:47:41 GMT",
-              ["x-hello-world-header"] = "123412341234",
-              ["Authorization"] = "Hello"
-            }
-          },
-          vars = { _url = "http://127.0.0.1:" .. ngx.var.server_port .. "/t" }
-        })
-
-        ngx.print(res.body)
-
-        local res = ngx.location.capture("/proxy", {
-          vars = { _url = "http://127.0.0.1:" .. ngx.var.server_port .. "/t" }
-        })
-
-        ngx.print(res.body)
-      ';
-    }
---- request
-GET /second
---- response_body
-hello
-hello
-hello
---- no_error_log eval
-[
-"[error]",
-qr/Assertion .*? failed/
-]
-
-
-
-=== TEST 68: fetch subrequest's builtin request headers
---- config
-    location = /sub {
-        echo "sr: User-Agent: $http_user_agent";
-        echo "sr: Host: $http_host";
-    }
-
-    location = /t {
-        content_by_lua '
-            res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-            ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
-            ngx.say("pr: Host: ", ngx.var.http_host)
-        ';
-    }
---- request
-    GET /t
---- more_headers
-User-Agent: foo
---- response_body
-sr: User-Agent: foo
-sr: Host: localhost
-pr: User-Agent: foo
-pr: Host: localhost
-
---- no_error_log
-[error]
-
-
-
-=== TEST 69: modify subrequest's builtin request headers
---- config
-    location = /sub {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "bar")
-        ';
-        echo "sr: User-Agent: $http_user_agent";
-        echo "sr: Host: $http_host";
-    }
-
-    location = /t {
-        content_by_lua '
-            res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-            ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
-            ngx.say("pr: Host: ", ngx.var.http_host)
-        ';
-    }
---- request
-    GET /t
---- more_headers
-User-Agent: foo
---- response_body
-sr: User-Agent: bar
-sr: Host: localhost
-pr: User-Agent: foo
-pr: Host: localhost
-
---- no_error_log
-[error]
-
-
-
-=== TEST 70: modify subrequest's builtin request headers (main req is POST)
---- config
-    location = /sub {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "bar")
-        ';
-        echo "sr: User-Agent: $http_user_agent";
-        echo "sr: Host: $http_host";
-    }
-
-    location = /t {
-        content_by_lua '
-            res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-            ngx.say("pr: User-Agent: ", ngx.var.http_user_agent)
-            ngx.say("pr: Host: ", ngx.var.http_host)
-        ';
-    }
---- request
-POST /t
-hello world
---- more_headers
-User-Agent: foo
---- response_body
-sr: User-Agent: bar
-sr: Host: localhost
-pr: User-Agent: foo
-pr: Host: localhost
-
---- no_error_log
-[error]
-
-
-
-=== TEST 71: duplicate request headers (main req is POST)
---- config
-    location = /sub {
-        echo "sr: Cookie: $http_cookie";
-    }
-
-    location = /t {
-        content_by_lua '
-            res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-            ngx.say("pr: Cookie: ", ngx.var.http_cookie)
-        ';
-    }
---- request
-POST /t
-hello world
---- more_headers
-Cookie: foo
-Cookie: bar
---- response_body
-sr: Cookie: foo; bar
-pr: Cookie: foo; bar
-
---- no_error_log
-[error]
-
-
-
-=== TEST 72: duplicate request headers (main req is GET)
---- config
-    location = /sub {
-        echo "sr: Cookie: $http_cookie";
-    }
-
-    location = /t {
-        content_by_lua '
-            res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-            ngx.say("pr: Cookie: ", ngx.var.http_cookie)
-        ';
-    }
---- request
-GET /t
---- more_headers
-Cookie: foo
-Cookie: bar
---- response_body
-sr: Cookie: foo; bar
-pr: Cookie: foo; bar
-
---- no_error_log
-[error]
-
-
-
-=== TEST 73: HEAD subrequest (github #347)
---- config
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/index.html",
-                { method = ngx.HTTP_HEAD });
-            ngx.say("content-length: ", res.header["Content-Length"])
-            ngx.say("body: [", res.body, "]")
-        ';
-    }
---- request
-GET /lua
---- response_body_like chop
-^content-length: \d+
-body: \[\]
-$
---- no_error_log
-[error]
-
-
-
-=== TEST 74: image_filter + ngx.location.capture
-ngx_http_image_filter_module's header filter intercepts
-the header filter chain so the r->header_sent flag won't
-get set right after the header filter chain is first invoked.
-
---- config
-
-location = /back {
-    empty_gif;
-}
-
-location = /t {
-    image_filter rotate 90;
-
-    content_by_lua '
-        local res = ngx.location.capture("/back")
-        for k, v in pairs(res.header) do
-            ngx.header[k] = v
-        end
-        ngx.status = res.status
-        ngx.print(res.body)
-    ';
-}
-
---- request
-GET /t
---- response_body_like: .
---- stap
-F(ngx_http_image_header_filter) {
-    println("image header filter")
-}
---- stap_out
-image header filter
-
---- no_error_log
-[error]
-
-
-
-=== TEST 75: WebDAV + MOVE
---- config
-    location = /t {
-        content_by_lua_block {
-            local file1 = "/file1.txt"
-            local file2 = "/file2.txt"
-            ngx.req.set_header( "Destination", file2 )
-            local res = ngx.location.capture(
-                file1, { method = ngx.HTTP_MOVE }
-            )
-
-            ngx.say(
-                "MOVE ", file1, " -> ", file2,
-                ", response status: ", res.status
-            )
-        }
-    }
-
-    location / {
-        dav_methods MOVE;
-    }
-
---- user_files
->>> file1.txt
-hello, world!
-
---- request
-GET /t
-
---- response_body
-MOVE /file1.txt -> /file2.txt, response status: 204
-
---- no_error_log
-[error]
---- error_code: 200
-
-
-
-=== TEST 76: WebDAV + DELETE
---- config
-    location = /t {
-        content_by_lua_block {
-            local file = "/file.txt"
-            local res = ngx.location.capture(
-                file, { method = ngx.HTTP_DELETE }
-            )
-
-            ngx.say(
-                "DELETE ", file,
-                ", response status: ", res.status
-            )
-        }
-    }
-
-    location / {
-        dav_methods DELETE;
-    }
-
---- user_files
->>> file.txt
-hello, world!
-
---- request
-GET /t
-
---- response_body
-DELETE /file.txt, response status: 204
-
---- no_error_log
-[error]
---- error_code: 200
diff --git a/debian/modules/http-lua/t/021-cookie-time.t b/debian/modules/http-lua/t/021-cookie-time.t
deleted file mode 100644
index b05e401..0000000
--- a/debian/modules/http-lua/t/021-cookie-time.t
+++ /dev/null
@@ -1,45 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: cookie_time
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say(ngx.cookie_time(1290079655))
-        ';
-    }
---- request
-GET /lua
---- response_body
-Thu, 18-Nov-10 11:27:35 GMT
-
-
-
-=== TEST 2: cookie_time in set_by_lua
---- config
-    location /lua {
-        set_by_lua $a '
-            return ngx.cookie_time(1290079655)
-        ';
-        echo $a;
-    }
---- request
-GET /lua
---- response_body
-Thu, 18-Nov-10 11:27:35 GMT
diff --git a/debian/modules/http-lua/t/022-redirect.t b/debian/modules/http-lua/t/022-redirect.t
deleted file mode 100644
index 09374d3..0000000
--- a/debian/modules/http-lua/t/022-redirect.t
+++ /dev/null
@@ -1,322 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#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: default 302
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo");
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo
---- response_body_like: 302 Found
---- error_code: 302
-
-
-
-=== TEST 2: explicit 302
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo", ngx.HTTP_MOVED_TEMPORARILY);
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo
---- response_body_like: 302 Found
---- error_code: 302
-
-
-
-=== TEST 3: explicit 301
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo", ngx.HTTP_MOVED_PERMANENTLY);
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo
---- response_body_like: 301 Moved Permanently
---- error_code: 301
-
-
-
-=== TEST 4: bad rc
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo", 404);
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_headers
-!Location
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-only ngx.HTTP_MOVED_TEMPORARILY, ngx.HTTP_MOVED_PERMANENTLY, ngx.HTTP_PERMANENT_REDIRECT, ngx.HTTP_SEE_OTHER, and ngx.HTTP_TEMPORARY_REDIRECT are allowed
-
-
-
-=== TEST 5: no args
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect()
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_headers
-!Location
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 6: relative uri
---- config
-    location /echo {
-        echo hello, world;
-    }
-    location /proxy {
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/echo;
-    }
-    location /read {
-        content_by_lua '
-            ngx.location.capture("/proxy")
-            ngx.redirect("/echo")
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- raw_response_headers_like: Location: /echo\r\n
---- response_body_like: 302 Found
---- error_code: 302
-
-
-
-=== TEST 7: default 302 (with uri args)
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo?bar=3");
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo?bar=3
---- response_body_like: 302 Found
---- error_code: 302
-
-
-
-=== TEST 8: location.capture + ngx.redirect
---- config
-    location /echo {
-        echo hello, world;
-    }
-    location /proxy {
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/echo;
-    }
-    location /read {
-        content_by_lua '
-            ngx.location.capture("/proxy")
-            ngx.location.capture("/proxy")
-            ngx.redirect("/echo")
-            ngx.exit(403)
-        ';
-    }
---- pipelined_requests eval
-["GET /read/1", "GET /read/2"]
---- error_code eval
-[302, 302]
---- response_body eval
-[qr/302 Found/, qr/302 Found/]
-
-
-
-=== TEST 9: explicit 307
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo", ngx.HTTP_TEMPORARY_REDIRECT);
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo
---- response_body_like: 307 Temporary Redirect
---- error_code: 307
-
-
-
-=== TEST 10: explicit 307 with args
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo?a=b&c=d", ngx.HTTP_TEMPORARY_REDIRECT);
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo?a=b&c=d
---- response_body_like: 307 Temporary Redirect
---- error_code: 307
-
-
-
-=== TEST 11: explicit 307
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo?a=b&c=d", 307);
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo?a=b&c=d
---- response_body_like: 307 Temporary Redirect
---- error_code: 307
-
-
-
-=== TEST 12: explicit 303
---- config
-    location /read {
-        content_by_lua_block {
-            ngx.redirect("http://agentzh.org/foo", ngx.HTTP_SEE_OTHER);
-            ngx.say("hi")
-        }
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo
---- response_body_like: 303 See Other
---- error_code: 303
-
-
-
-=== TEST 13: explicit 303 with args
---- config
-    location /read {
-        content_by_lua_block {
-            ngx.redirect("http://agentzh.org/foo?a=b&c=d", ngx.HTTP_SEE_OTHER);
-            ngx.say("hi")
-        }
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo?a=b&c=d
---- response_body_like: 303 See Other
---- error_code: 303
-
-
-
-=== TEST 14: explicit 303
---- config
-    location /read {
-        content_by_lua_block {
-            ngx.redirect("http://agentzh.org/foo?a=b&c=d", 303);
-            ngx.say("hi")
-        }
-    }
---- request
-GET /read
---- response_headers
-Location: http://agentzh.org/foo?a=b&c=d
---- response_body_like: 303 See Other
---- error_code: 303
-
-
-
-=== TEST 15: explicit 308 with args
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo?a=b&c=d", ngx.HTTP_PERMANENT_REDIRECT);
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_body_like: 308 Permanent Redirect
---- response_headers
-Location: http://agentzh.org/foo?a=b&c=d
---- error_code: 308
-
-
-
-=== TEST 16: explicit 308
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo?a=b&c=d", 308);
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_body_like: 308 Permanent Redirect
---- response_headers
-Location: http://agentzh.org/foo?a=b&c=d
---- error_code: 308
-
-
-
-=== TEST 17: explicit 308 with args
---- config
-    location /read {
-        content_by_lua '
-            ngx.redirect("http://agentzh.org/foo?a=b&c=d", 308);
-            ngx.say("hi")
-        ';
-    }
---- request
-GET /read
---- response_body_like: 308 Permanent Redirect
---- response_headers
-Location: http://agentzh.org/foo?a=b&c=d
---- error_code: 308
diff --git a/debian/modules/http-lua/t/023-rewrite/client-abort.t b/debian/modules/http-lua/t/023-rewrite/client-abort.t
deleted file mode 100644
index 117d17e..0000000
--- a/debian/modules/http-lua/t/023-rewrite/client-abort.t
+++ /dev/null
@@ -1,850 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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://agentzh.org:12345/;
-    }
-
-    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://agentzh.org:12345/;
-    }
---- 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
-
---- wait: 0.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
---- wait: 0.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/http-lua/t/023-rewrite/exec.t b/debian/modules/http-lua/t/023-rewrite/exec.t
deleted file mode 100644
index edd4607..0000000
--- a/debian/modules/http-lua/t/023-rewrite/exec.t
+++ /dev/null
@@ -1,400 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2 + 4);
-
-#no_diff();
-#no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.exec("/hi");
-            ngx.say("Hi");
-        ';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body
-Hello
-
-
-
-=== TEST 2: empty uri arg
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.exec("");
-            ngx.say("Hi");
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 3: no arg
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.exec();
-            ngx.say("Hi");
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 4: too many args
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.exec(1, 2, 3, 4);
-            ngx.say("Hi");
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 5: null uri
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.exec(nil)
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 6: user args
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.exec("/hi", "Yichun Zhang")
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello Yichun Zhang
-
-
-
-=== TEST 7: args in uri
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.exec("/hi?agentzh")
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello agentzh
-
-
-
-=== TEST 8: args in uri and user args
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.exec("/hi?a=Yichun", "b=Zhang")
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello a=Yichun&b=Zhang
-
-
-
-=== TEST 9: args in uri and user args
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.exec("@hi?a=Yichun", "b=Zhang")
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location @hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello 
-
-
-
-=== TEST 10: exec after location capture
---- config
-    location /test {
-        rewrite_by_lua_file 'html/test.lua';
-        echo world;
-    }
-
-    location /a {
-        echo "hello";
-    }
-
-    location /b {
-        echo "hello";
-    }
-
---- user_files
->>> test.lua
-ngx.location.capture('/a')
-
-ngx.exec('/b')
---- request
-    GET /test
---- response_body
-hello
-
-
-
-=== TEST 11: exec after (named) location capture
---- config
-    location /test {
-        rewrite_by_lua_file 'html/test.lua';
-    }
-
-    location /a {
-        echo "hello";
-    }
-
-    location @b {
-        echo "hello";
-    }
-
---- user_files
->>> test.lua
-ngx.location.capture('/a')
-
-ngx.exec('@b')
---- request
-    GET /test
---- response_body
-hello
-
-
-
-=== TEST 12: github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location (rewrite)
---- config
-    location = /hi {
-        echo hello;
-    }
-    location /sub {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-    }
-    location /p{
-        #content_by_lua '
-        #local res = ngx.location.capture("/sub")
-        #ngx.print(res.body)
-        #';
-        echo_location /sub;
-    }
-    location /lua {
-        rewrite_by_lua '
-            ngx.exec("/p")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hello
-
-
-
-=== TEST 13: github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location (rewrite + named location)
---- config
-    location = /hi {
-        echo hello;
-    }
-    location /sub {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-    }
-    location @p{
-        #content_by_lua '
-            #local res = ngx.location.capture("/sub")
-            #ngx.print(res.body)
-        #';
-        echo_location /sub;
-    }
-    location /lua {
-        rewrite_by_lua '
-            ngx.exec("@p")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hello
-
-
-
-=== TEST 14: github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location (rewrite + post subrequest)
---- config
-    location = /hi {
-        echo hello;
-    }
-    location /sub {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-    }
-    location /p{
-        #content_by_lua '
-            #local res = ngx.location.capture("/sub")
-            #ngx.print(res.body)
-        #';
-        echo_location /sub;
-    }
-    location /blah {
-        echo blah;
-    }
-    location /lua {
-        rewrite_by_lua '
-            ngx.location.capture("/blah")
-            ngx.exec("/p")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hello
-
-
-
-=== TEST 15: rewrite_by_lua + ngx.exec + subrequest capture
---- config
-    location /main {
-        rewrite_by_lua '
-            res = ngx.location.capture("/test_loc");
-            ngx.print("hello, ", res.body)
-        ';
-        content_by_lua return;
-    }
-    location /test_loc {
-        rewrite_by_lua '
-            ngx.exec("@proxy")
-        ';
-    }
-    location @proxy {
-        #echo proxy;
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-    location /foo {
-        echo bah;
-    }
---- request
-    GET /main
---- response_body
-hello, bah
-
-
-
-=== TEST 16: rewrite_by_lua_file + ngx.exec + subrequest capture
---- config
-    location /main {
-        rewrite_by_lua '
-            res = ngx.location.capture("/test_loc");
-            ngx.print("hello, ", res.body)
-        ';
-        content_by_lua return;
-    }
-    location /test_loc {
-        rewrite_by_lua_file html/jump.lua;
-    }
-    location @proxy {
-        #echo proxy;
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-    location /foo {
-        echo bah;
-    }
---- user_files
->>> jump.lua
-ngx.exec("@proxy")
---- request
-    GET /main
---- response_body
-hello, bah
-
-
-
-=== TEST 17: pipelined requests
---- config
-    location /t {
-        rewrite_by_lua_block {
-            ngx.exec("@foo")
-        }
-    }
-
-    location @foo {
-        return 200;
-    }
---- pipelined_requests eval
-["GET /t", "GET /t"]
---- error_code eval
-[200, 200]
---- response_body eval
-["", ""]
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/023-rewrite/exit.t b/debian/modules/http-lua/t/023-rewrite/exit.t
deleted file mode 100644
index 39ea5cb..0000000
--- a/debian/modules/http-lua/t/023-rewrite/exit.t
+++ /dev/null
@@ -1,597 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#repeat_each(20000);
-
-repeat_each(2);
-
-#master_on();
-#workers(1);
-#log_level('debug');
-#log_level('warn');
-#worker_connections(1024);
-
-plan tests => repeat_each() * (blocks() * 2 + 4);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
-
-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();
-
-__DATA__
-
-=== TEST 1: throw 403
---- config
-    location /lua {
-        rewrite_by_lua "ngx.exit(403);ngx.say('hi')";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- error_code: 403
---- response_body_like: 403 Forbidden
-
-
-
-=== TEST 2: throw 404
---- config
-    location /lua {
-        rewrite_by_lua "ngx.exit(404);ngx.say('hi');";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- error_code: 404
---- response_body_like: 404 Not Found
-
-
-
-=== TEST 3: throw 404 after sending the header and partial body
---- config
-    location /lua {
-        rewrite_by_lua "ngx.say('hi');ngx.exit(404);ngx.say(', you')";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- error_log
-attempt to set status 404 via ngx.exit after sending out the response status 200
---- response_body
-hi
-
-
-
-=== TEST 4: working with ngx_auth_request (succeeded)
---- config
-    location /auth {
-        rewrite_by_lua "
-            if ngx.var.user == 'agentzh' then
-                ngx.eof();
-            else
-                ngx.exit(403)
-            end";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /api {
-        set $user $arg_user;
-        auth_request /auth;
-
-        echo "Logged in";
-    }
---- request
-GET /api?user=agentzh
---- error_code: 200
---- response_body
-Logged in
-
-
-
-=== TEST 5: working with ngx_auth_request (failed)
---- config
-    location /auth {
-        rewrite_by_lua "
-            if ngx.var.user == 'agentzh' then
-                ngx.eof();
-            else
-                ngx.exit(403)
-            end";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /api {
-        set $user $arg_user;
-        auth_request /auth;
-
-        echo "Logged in";
-    }
---- request
-GET /api?user=agentz
---- error_code: 403
---- response_body_like: 403 Forbidden
-
-
-
-=== TEST 6: working with ngx_auth_request (simplest form, w/o ngx_memc)
---- http_config eval
-"
-    lua_package_cpath '$::LuaCpath';
-    upstream backend {
-        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;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /conv-uid-mysql {
-        internal;
-
-        set $key "conv-uid-$arg_uid";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        drizzle_query "select new_uid as uid from conv_uid where old_uid=$arg_uid";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /conv-uid {
-        internal;
-        rewrite_by_lua_file 'html/foo.lua';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /api {
-        set $uid $arg_uid;
-        auth_request /conv-uid;
-
-        echo "Logged in $uid";
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local old_uid = ngx.var.uid
-print('about to run sr')
-local res = ngx.location.capture('/conv-uid-mysql?uid=' .. old_uid)
-print('just have run sr' .. res.body)
-if (res.status ~= ngx.HTTP_OK) then
-    -- ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].uid or
-        not string.match(res[1].uid, '^%d+$')) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.uid = res[1].uid;
--- print('done')
---- request
-GET /api?uid=32
---- response_body
-Logged in 56
-
-
-
-=== TEST 7: working with ngx_auth_request (simplest form)
---- http_config eval
-"
-    lua_package_cpath '$::LuaCpath';
-    upstream backend {
-        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;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /conv-uid-mysql {
-        internal;
-
-        set $key "conv-uid-$arg_uid";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        drizzle_query "select new_uid as uid from conv_uid where old_uid=$arg_uid";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /conv-uid {
-        internal;
-        rewrite_by_lua_file 'html/foo.lua';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /api {
-        set $uid $arg_uid;
-        auth_request /conv-uid;
-
-        echo "Logged in $uid";
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local old_uid = ngx.var.uid
--- print('about to run sr')
-local res = ngx.location.capture('/conv-uid-mysql?uid=' .. old_uid)
--- print('just have run sr' .. res.body)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].uid or
-        not string.match(res[1].uid, '^%d+$')) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.uid = res[1].uid;
--- print('done')
---- request
-GET /api?uid=32
---- response_body
-Logged in 56
-
-
-
-=== TEST 8: working with ngx_auth_request
---- http_config eval
-"
-    lua_package_cpath '$::LuaCpath';
-    upstream backend {
-        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;
-    }
-
-    upstream memc_b {
-        server 127.0.0.1:\$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    upstream_list memc_cluster memc_a memc_b;
-"
---- config
-    location /memc {
-        internal;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        set_hashed_upstream $backend memc_cluster $arg_key;
-        memc_pass $backend;
-    }
-
-    location /conv-uid-mysql {
-        internal;
-
-        set $key "conv-uid-$arg_uid";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        drizzle_query "select new_uid as uid from conv_uid where old_uid=$arg_uid";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /conv-uid {
-        internal;
-        rewrite_by_lua_file 'html/foo.lua';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /api {
-        set $uid $arg_uid;
-        auth_request /conv-uid;
-
-        echo "Logged in $uid";
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local old_uid = ngx.var.uid
--- print('about to run sr')
-local res = ngx.location.capture('/conv-uid-mysql?uid=' .. old_uid)
--- print('just have run sr' .. res.body)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].uid or
-        not string.match(res[1].uid, '^%d+$')) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.uid = res[1].uid;
--- print('done')
---- request
-GET /api?uid=32
---- response_body
-Logged in 56
---- no_error_log
-[error]
-
-
-
-=== TEST 9: working with ngx_auth_request
---- http_config
-    upstream backend {
-        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;
-        keepalive 300;
-    }
-
-    #upstream_list memc_cluster memc_a memc_b;
-
---- config
-    location /memc {
-        internal;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        #set_hashed_upstream $backend memc_cluster $arg_key;
-        memc_pass memc_a;
-    }
-
-    location /conv-mysql {
-        internal;
-
-        set $key "conv-uri-$query_string";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        set_quote_sql_str $seo_uri $query_string;
-        drizzle_query "select url from my_url_map where seo_url=$seo_uri";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /conv-uid {
-        internal;
-        rewrite_by_lua_file 'html/foo.lua';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-
-    location /baz {
-        set $my_uri $uri;
-        auth_request /conv-uid;
-
-        echo_exec /jump $my_uri;
-    }
-
-    location /jump {
-        internal;
-        rewrite ^ $query_string? redirect;
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local seo_uri = ngx.var.my_uri
--- print('about to run sr')
-local res = ngx.location.capture('/conv-mysql?' .. seo_uri)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].url) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.my_uri = res[1].url;
--- print('done')
---- request
-GET /baz
---- response_body_like: 302
---- error_code: 302
---- response_headers
-Location: http://localhost:$ServerPort/foo/bar
---- SKIP
-
-
-
-=== TEST 10: throw 0
---- config
-    location /lua {
-        rewrite_by_lua "ngx.say('Hi'); ngx.eof(); ngx.exit(0);ngx.say('world')";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- error_code: 200
---- response_body
-Hi
-
-
-
-=== TEST 11: throw ngx.OK does *not* skip other rewrite phase handlers
---- config
-    location /lua {
-        rewrite_by_lua "ngx.exit(ngx.OK)";
-        set $foo hello;
-        echo $foo;
-    }
---- request
-GET /lua
---- response_body
-hello
-
-
-
-=== TEST 12: throw ngx.HTTP_OK *does* skip other rewrite phase handlers (by inlined code)
---- config
-    location /lua {
-        rewrite_by_lua "ngx.exit(ngx.HTTP_OK)";
-        set $foo hello;
-        echo $foo;
-    }
---- request
-GET /lua
---- response_body
-
-
-
-=== TEST 13: throw ngx.HTTP_OK *does* skip other rewrite phase handlers (by inlined code + partial output)
---- config
-    location /lua {
-        rewrite_by_lua "ngx.say('hiya') ngx.exit(ngx.HTTP_OK)";
-        set $foo hello;
-        echo $foo;
-    }
---- request
-GET /lua
---- response_body
-hiya
-
-
-
-=== TEST 14: throw ngx.HTTP_OK *does* skip other rewrite phase handlers (by file)
---- config
-    location /lua {
-        rewrite_by_lua_file html/foo.lua;
-        set $foo hello;
-        echo $foo;
-    }
---- user_files
->>> foo.lua
-ngx.exit(ngx.HTTP_OK)
---- request
-GET /lua
---- response_body
-
-
-
-=== TEST 15: throw ngx.HTTP_OK *does* skip other rewrite phase handlers (by file + partial output)
---- config
-    location /lua {
-        rewrite_by_lua_file html/foo.lua;
-        set $foo hello;
-        echo $foo;
-    }
---- user_files
->>> foo.lua
-ngx.say("morning")
-ngx.exit(ngx.HTTP_OK)
---- request
-GET /lua
---- response_body
-morning
-
-
-
-=== TEST 16: error page with custom body
---- config
-    error_page 410 @err;
-    location @err {
-        echo blah blah;
-    }
-    location /foo {
-        rewrite_by_lua '
-            ngx.status = ngx.HTTP_GONE
-            ngx.say("This is our own content")
-            -- to cause quit the whole request rather than the current phase handler
-            ngx.exit(ngx.HTTP_OK)
-        ';
-        echo Hello;
-    }
---- request
-    GET /foo
---- response_body
-This is our own content
---- error_code: 410
-
-
-
-=== TEST 17: exit with 204 (HTTP 1.1)
---- 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
---- stap2
-F(ngx_http_send_header) {
-    printf("send header\n")
-    print_ubacktrace()
-}
---- response_body
---- error_code: 204
---- no_error_log
-[error]
-
-
-
-=== TEST 18: exit with 204 (HTTP 1.0)
---- 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 HTTP/1.0
---- more_headers2
---- stap2
-F(ngx_http_send_header) {
-    printf("send header\n")
-    print_ubacktrace()
-}
---- response_body
---- error_code: 204
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/023-rewrite/mixed.t b/debian/modules/http-lua/t/023-rewrite/mixed.t
deleted file mode 100644
index 0f742b2..0000000
--- a/debian/modules/http-lua/t/023-rewrite/mixed.t
+++ /dev/null
@@ -1,169 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2 + 3);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: rewrite I/O with content I/O
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc {
-        set $memc_key $echo_request_uri;
-        set $memc_exptime 600;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            print("rewrite GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            print("rewrite PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            print("rewrite cached: " .. res.body);
-        ';
-
-        content_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            ngx.say("content GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            ngx.say("content PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            ngx.say("content cached: " .. res.body);
-        ';
-    }
---- request
-GET /lua
---- response_body
-content GET: 404
-content PUT: 201
-content cached: hello
---- grep_error_log eval: qr/rewrite .+?(?= while )/
---- grep_error_log_out
-rewrite GET: 404
-rewrite PUT: 201
-rewrite cached: hello
-
---- log_level: info
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 2: share data via nginx variables
---- config
-    location /foo {
-        set $foo '';
-        rewrite_by_lua '
-            ngx.var.foo = 32
-        ';
-
-        content_by_lua '
-            ngx.say(tonumber(ngx.var.foo) * 2)
-        ';
-    }
---- request
-    GET /foo
---- response_body
-64
-
-
-
-=== TEST 3: share the request body (need request body explicitly off)
---- config
-    location /echo_body {
-        lua_need_request_body off;
-        set $res '';
-        rewrite_by_lua '
-            ngx.var.res = ngx.var.request_body or "nil"
-        ';
-        content_by_lua '
-            ngx.say(ngx.var.res or "nil")
-            ngx.say(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body
-nil
-nil
-
-
-
-=== TEST 4: share the request body (need request body off by default)
---- config
-    location /echo_body {
-        #lua_need_request_body off;
-        set $res '';
-        rewrite_by_lua '
-            ngx.var.res = ngx.var.request_body or "nil"
-        ';
-        content_by_lua '
-            ngx.say(ngx.var.res or "nil")
-            ngx.say(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body
-nil
-nil
-
-
-
-=== TEST 5: share the request body (need request body on)
---- config
-    location /echo_body {
-        lua_need_request_body on;
-        set $res '';
-        rewrite_by_lua '
-            ngx.var.res = ngx.var.request_body or "nil"
-        ';
-        content_by_lua '
-            ngx.say(ngx.var.res or "nil")
-            ngx.say(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff
-hello\x00\x01\x02
-world\x03\x04\xff
-"
diff --git a/debian/modules/http-lua/t/023-rewrite/multi-capture.t b/debian/modules/http-lua/t/023-rewrite/multi-capture.t
deleted file mode 100644
index 083ec78..0000000
--- a/debian/modules/http-lua/t/023-rewrite/multi-capture.t
+++ /dev/null
@@ -1,394 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(10);
-
-plan tests => blocks() * repeat_each() * 2;
-
-#$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
-$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /foo {
-        rewrite_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-    location /a {
-        echo -n a;
-    }
-    location /b {
-        echo -n b;
-    }
---- request
-    GET /foo
---- response_body
-res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-
-
-
-=== TEST 2: 4 concurrent requests
---- config
-    location /foo {
-        rewrite_by_lua '
-            local res1, res2, res3, res4 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-                { "/c" },
-                { "/d" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-
-            ngx.say("res3.status = " .. res3.status)
-            ngx.say("res3.body = " .. res3.body)
-
-            ngx.say("res4.status = " .. res4.status)
-            ngx.say("res4.body = " .. res4.body)
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/([a-d])$' {
-        echo -n $1;
-    }
---- request
-    GET /foo
---- response_body
-res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-res3.status = 200
-res3.body = c
-res4.status = 200
-res4.body = d
-
-
-
-=== TEST 3: capture multi in series
---- config
-    location /foo {
-        rewrite_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-
-            res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("2 res1.status = " .. res1.status)
-            ngx.say("2 res1.body = " .. res1.body)
-            ngx.say("2 res2.status = " .. res2.status)
-            ngx.say("2 res2.body = " .. res2.body)
-
-        ';
-        content_by_lua return;
-    }
-    location /a {
-        echo -n a;
-    }
-    location /b {
-        echo -n b;
-    }
---- request
-    GET /foo
---- response_body
-res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-2 res1.status = 200
-2 res1.body = a
-2 res2.status = 200
-2 res2.body = b
-
-
-
-=== TEST 4: capture multi in subrequest
---- config
-    location /foo {
-        rewrite_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-
-            local n = ngx.var.arg_n
-
-            ngx.say(n .. " res1.status = " .. res1.status)
-            ngx.say(n .. " res1.body = " .. res1.body)
-            ngx.say(n .. " res2.status = " .. res2.status)
-            ngx.say(n .. " res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-
-    location /main {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo?n=1")
-            ngx.say("top res.status = " .. res.status)
-            ngx.say("top res.body = [" .. res.body .. "]")
-        ';
-        content_by_lua return;
-    }
-
-    location /a {
-        echo -n a;
-    }
-
-    location /b {
-        echo -n b;
-    }
---- request
-    GET /main
---- response_body
-top res.status = 200
-top res.body = [1 res1.status = 200
-1 res1.body = a
-1 res2.status = 200
-1 res2.body = b
-]
-
-
-
-=== TEST 5: capture multi in parallel
---- config
-    location ~ '^/(foo|bar)$' {
-        set $tag $1;
-        rewrite_by_lua '
-            local res1, res2
-            if ngx.var.tag == "foo" then
-                res1, res2 = ngx.location.capture_multi{
-                    { "/a" },
-                    { "/b" },
-                }
-            else
-                res1, res2 = ngx.location.capture_multi{
-                    { "/c" },
-                    { "/d" },
-                }
-            end
-
-            local n = ngx.var.arg_n
-
-            ngx.say(n .. " res1.status = " .. res1.status)
-            ngx.say(n .. " res1.body = " .. res1.body)
-            ngx.say(n .. " res2.status = " .. res2.status)
-            ngx.say(n .. " res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-
-    location /main {
-        rewrite_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/foo?n=1" },
-                { "/bar?n=2" },
-            }
-
-            ngx.say("top res1.status = " .. res1.status)
-            ngx.say("top res1.body = [" .. res1.body .. "]")
-            ngx.say("top res2.status = " .. res2.status)
-            ngx.say("top res2.body = [" .. res2.body .. "]")
-        ';
-        content_by_lua return;
-    }
-
-    location ~ '^/([abcd])$' {
-        echo -n $1;
-    }
---- request
-    GET /main
---- response_body
-top res1.status = 200
-top res1.body = [1 res1.status = 200
-1 res1.body = a
-1 res2.status = 200
-1 res2.body = b
-]
-top res2.status = 200
-top res2.body = [2 res1.status = 200
-2 res1.body = c
-2 res2.status = 200
-2 res2.body = d
-]
-
-
-
-=== TEST 6: memc sanity
---- config
-    location /foo {
-        rewrite_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/[ab]$' {
-        set $memc_key $uri;
-        set $memc_value hello;
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-    GET /foo
---- response_body eval
-"res1.status = 201
-res1.body = STORED\r
-
-res2.status = 201
-res2.body = STORED\r
-
-"
-
-
-
-=== TEST 7: memc muti + multi
---- config
-    location /main {
-        rewrite_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/foo?n=1" },
-                { "/bar?n=2" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = [" .. res1.body .. "]")
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = [" .. res2.body .. "]")
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/(foo|bar)$' {
-        set $tag $1;
-        rewrite_by_lua '
-            local res1, res2
-            if ngx.var.tag == "foo" then
-                res1, res2 = ngx.location.capture_multi{
-                    { "/a" },
-                    { "/b" },
-                }
-            else
-                res1, res2 = ngx.location.capture_multi{
-                    { "/c" },
-                    { "/d" },
-                }
-            end
-            print("args: " .. ngx.var.args)
-            local n = ngx.var.arg_n
-            ngx.say(n .. " res1.status = " .. res1.status)
-            ngx.say(n .. " res1.body = " .. res1.body)
-            ngx.say(n .. " res2.status = " .. res2.status)
-            ngx.say(n .. " res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/[abcd]$' {
-        set $memc_key $uri;
-        set $memc_value hello;
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-    GET /main
---- response_body eval
-"res1.status = 200
-res1.body = [1 res1.status = 201
-1 res1.body = STORED\r
-
-1 res2.status = 201
-1 res2.body = STORED\r
-
-]
-res2.status = 200
-res2.body = [2 res1.status = 201
-2 res1.body = STORED\r
-
-2 res2.status = 201
-2 res2.body = STORED\r
-
-]
-"
-
-
-
-=== TEST 8: memc 4 concurrent requests
---- config
-    location /foo {
-        rewrite_by_lua '
-            local res1, res2, res3, res4 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-                { "/c" },
-                { "/d" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-
-            ngx.say("res3.status = " .. res3.status)
-            ngx.say("res3.body = " .. res3.body)
-
-            ngx.say("res4.status = " .. res4.status)
-            ngx.say("res4.body = " .. res4.body)
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/[a-d]$' {
-        set $memc_key $uri;
-        set $memc_value hello;
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-    GET /foo
---- response_body eval
-"res1.status = 201
-res1.body = STORED\r
-
-res2.status = 201
-res2.body = STORED\r
-
-res3.status = 201
-res3.body = STORED\r
-
-res4.status = 201
-res4.body = STORED\r
-
-"
diff --git a/debian/modules/http-lua/t/023-rewrite/on-abort.t b/debian/modules/http-lua/t/023-rewrite/on-abort.t
deleted file mode 100644
index 336b7ce..0000000
--- a/debian/modules/http-lua/t/023-rewrite/on-abort.t
+++ /dev/null
@@ -1,656 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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
-
---- wait: 0.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_like eval
-qr/^create 2 in 1
-lua check broken conn
-terminate 2: fail
-(?:lua check broken conn
-)?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 eval
-[
-'client prematurely closed connection',
-'on abort called',
-qr/lua user thread aborted: runtime error: rewrite_by_lua\(nginx\.conf:\d+\):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.5
---- 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")
-        ';
-    }
---- 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;
-        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")
-        ';
-    }
---- 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;
-        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
-lua req cleanup
-delete thread 2
-
---- wait: 0.5
---- 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
-lua req cleanup
-delete thread 2
-
---- response_body
-2: cannot set on_abort: duplicate call
-
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/023-rewrite/redirect.t b/debian/modules/http-lua/t/023-rewrite/redirect.t
deleted file mode 100644
index 8fa9aa2..0000000
--- a/debian/modules/http-lua/t/023-rewrite/redirect.t
+++ /dev/null
@@ -1,164 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => blocks() * repeat_each() * 3;
-
-#no_diff();
-#no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: default 302
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.redirect("http://www.taobao.com/foo");
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-Location: http://www.taobao.com/foo
---- response_body_like: 302 Found
---- error_code: 302
-
-
-
-=== TEST 2: explicit 302
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.redirect("http://www.taobao.com/foo", ngx.HTTP_MOVED_TEMPORARILY);
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-Location: http://www.taobao.com/foo
---- response_body_like: 302 Found
---- error_code: 302
-
-
-
-=== TEST 3: explicit 301
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.redirect("http://www.taobao.com/foo", ngx.HTTP_MOVED_PERMANENTLY);
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-Location: http://www.taobao.com/foo
---- response_body_like: 301 Moved Permanently
---- error_code: 301
-
-
-
-=== TEST 4: bad rc
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.redirect("http://www.taobao.com/foo", 404);
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-!Location
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 5: no args
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.redirect()
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-!Location
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 6: relative uri
---- config
-    location /read {
-        rewrite_by_lua '
-            ngx.redirect("/foo")
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- raw_response_headers_like: Location: /foo\r\n
---- response_body_like: 302 Found
---- error_code: 302
-
-
-
-=== TEST 7: internal redirects that do not clear module ctx
---- http_config
-    rewrite_by_lua_no_postpone on;
---- config
-	rewrite_by_lua_block {
-        -- this is empty by intention
-	}
-
-	location /url1 {
-		rewrite ^ /url2;
-	}
---- request
-GET /url1
---- response_body_like: 404 Not Found
---- error_log eval
-qr{\[error\] .*?/html/url2".*?No such file or directory}
---- error_code: 404
-
-
-
-=== TEST 8: internal redirects that do not clear module ctx (yield in rewrite handler)
---- http_config
-    rewrite_by_lua_no_postpone on;
---- config
-	rewrite_by_lua_block {
-        ngx.sleep(0.001)
-	}
-
-	location /url1 {
-		rewrite ^ /url2;
-	}
---- request
-GET /url1
---- response_body_like: 404 Not Found
---- error_log eval
-qr{\[error\] .*?/html/url2".*?No such file or directory}
---- error_code: 404
diff --git a/debian/modules/http-lua/t/023-rewrite/req-body.t b/debian/modules/http-lua/t/023-rewrite/req-body.t
deleted file mode 100644
index 13bdcb2..0000000
--- a/debian/modules/http-lua/t/023-rewrite/req-body.t
+++ /dev/null
@@ -1,223 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4 + 5);
-
-#no_diff();
-#no_long_string();
-#master_on();
-#workers(2);
-run_tests();
-
-__DATA__
-
-=== TEST 1: read buffered body
---- config
-    location = /test {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-        ';
-        content_by_lua return;
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
-
-
-
-=== TEST 2: read buffered body (timed out)
---- config
-    client_body_timeout 1ms;
-    location = /test {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-        ';
-        content_by_lua return;
-    }
---- raw_request eval
-"POST /test HTTP/1.1\r
-Host: localhost\r
-Content-Length: 100\r
-Connection: close\r
-\r
-hello, world"
---- response_body:
---- error_code_like: ^(?:500)?$
-
-
-
-=== TEST 3: read buffered body and then subrequest
---- config
-    location /foo {
-        echo -n foo;
-    }
-    location = /test {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            local res = ngx.location.capture("/foo");
-            ngx.say(ngx.var.request_body)
-            ngx.say("sub: ", res.body)
-        ';
-        content_by_lua return;
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
-sub: foo
-
-
-
-=== TEST 4: first subrequest and then read buffered body
---- config
-    location /foo {
-        echo -n foo;
-    }
-    location = /test {
-        rewrite_by_lua '
-            local res = ngx.location.capture("/foo");
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-            ngx.say("sub: ", res.body)
-        ';
-        content_by_lua return;
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
-sub: foo
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 5: failed to write 100 continue
---- config
-    location = /test {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-            ngx.exit(200)
-        ';
-    }
---- request
-POST /test
-hello, world
---- more_headers
-Expect: 100-Continue
---- ignore_response
---- no_error_log
-[alert]
-[error]
-http finalize request: 500, "/test?" a:1, c:0
-
-
-
-=== TEST 6: not discard body (exit 200)
---- config
-    location = /foo {
-        rewrite_by_lua '
-            -- ngx.req.discard_body()
-            ngx.say("body: ", ngx.var.request_body)
-            ngx.exit(200)
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-["body: nil\n",
-"body: hiya, world\n",
-]
---- error_code eval
-[200, 200]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 7: not discard body (exit 201)
---- config
-    location = /foo {
-        rewrite_by_lua '
-            -- ngx.req.discard_body()
-            ngx.say("body: ", ngx.var.request_body)
-            ngx.exit(201)
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-["body: nil\n",
-"body: hiya, world\n",
-]
---- error_code eval
-[200, 200]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 8: not discard body (exit 302)
---- config
-    location = /foo {
-        rewrite_by_lua '
-            -- ngx.req.discard_body()
-            -- ngx.say("body: ", ngx.var.request_body)
-            ngx.redirect("/blah")
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-[qr/302 Found/,
-"body: hiya, world\n",
-]
---- error_code eval
-[302, 200]
---- no_error_log
-[error]
-[alert]
diff --git a/debian/modules/http-lua/t/023-rewrite/req-socket.t b/debian/modules/http-lua/t/023-rewrite/req-socket.t
deleted file mode 100644
index 87cbbbe..0000000
--- a/debian/modules/http-lua/t/023-rewrite/req-socket.t
+++ /dev/null
@@ -1,534 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-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/http-lua/t/023-rewrite/request_body.t b/debian/modules/http-lua/t/023-rewrite/request_body.t
deleted file mode 100644
index b867d3a..0000000
--- a/debian/modules/http-lua/t/023-rewrite/request_body.t
+++ /dev/null
@@ -1,172 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('debug'); # to ensure any log-level can be outputted
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: test reading request body
---- config
-    location /echo_body {
-        lua_need_request_body on;
-        rewrite_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff"
-
-
-
-=== TEST 2: test not reading request body
---- config
-    location /echo_body {
-        lua_need_request_body off;
-        rewrite_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 3: test default setting (not reading request body)
---- config
-    location /echo_body {
-        rewrite_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 4: test main conf
---- http_config
-    lua_need_request_body on;
---- config
-    location /echo_body {
-        rewrite_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff"
-
-
-
-=== TEST 5: test server conf
---- config
-    lua_need_request_body on;
-
-    location /echo_body {
-        rewrite_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff"
-
-
-
-=== TEST 6: test override main conf
---- http_config
-    lua_need_request_body on;
---- config
-    location /echo_body {
-        lua_need_request_body off;
-        rewrite_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 7: test override server conf
---- config
-    lua_need_request_body on;
-
-    location /echo_body {
-        lua_need_request_body off;
-        rewrite_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 8: Expect: 100-Continue
---- config
-    location /echo_body {
-        lua_need_request_body on;
-        rewrite_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-            ngx.exit(200)
-        ';
-    }
---- request
-POST /echo_body
-hello world
---- more_headers
-Expect: 100-Continue
---- ignore_response
---- no_error_log
-[error]
-[alert]
-http finalize request: 500, "/echo_body?" a:1, c:2
-http finalize request: 500, "/echo_body?" a:1, c:0
---- log_level: debug
diff --git a/debian/modules/http-lua/t/023-rewrite/sanity.t b/debian/modules/http-lua/t/023-rewrite/sanity.t
deleted file mode 100644
index b90aa0e..0000000
--- a/debian/modules/http-lua/t/023-rewrite/sanity.t
+++ /dev/null
@@ -1,801 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#no_nginx_manager();
-#log_level('warn');
-#master_on();
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 12);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: basic print
---- config
-    location /lua {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        rewrite_by_lua 'ngx.print("Hello, Lua!\\n")';
-        content_by_lua return;
-        #content_by_lua 'ngx.say("Hi")';
-    }
---- request
-GET /lua
---- response_body
-Hello, Lua!
-
-
-
-=== TEST 2: basic say
---- config
-    location /say {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        rewrite_by_lua '
-            ngx.say("Hello, Lua!")
-            ngx.say("Yay! ", 123)';
-
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /say
---- response_body
-Hello, Lua!
-Yay! 123
-
-
-
-=== TEST 3: no ngx.echo
---- config
-    location /lua {
-        rewrite_by_lua 'ngx.echo("Hello, Lua!\\n")';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 4: variable
---- config
-    location /lua {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        rewrite_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua?a=1&b=2
---- response_body
-request_uri: /lua?a=1&b=2
-
-
-
-=== TEST 5: variable (file)
---- config
-    location /lua {
-        rewrite_by_lua_file html/test.lua;
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- response_body
-request_uri: /lua?a=1&b=2
-
-
-
-=== TEST 6: calc expression
---- config
-    location /lua {
-        rewrite_by_lua_file html/calc.lua;
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- user_files
->>> calc.lua
-local function uri_unescape(uri)
-    local function convert(hex)
-        return string.char(tonumber("0x"..hex))
-    end
-    local s = string.gsub(uri, "%%([0-9a-fA-F][0-9a-fA-F])", convert)
-    return s
-end
-
-local function eval_exp(str)
-    return loadstring("return "..str)()
-end
-
-local exp_str = ngx.var["arg_exp"]
--- print("exp: '", exp_str, "'\n")
-local status, res
-status, res = pcall(uri_unescape, exp_str)
-if not status then
-    ngx.print("error: ", res, "\n")
-    return
-end
-status, res = pcall(eval_exp, res)
-if status then
-    ngx.print("result: ", res, "\n")
-else
-    ngx.print("error: ", res, "\n")
-end
---- request
-GET /lua?exp=1%2B2*math.sin(3)%2Fmath.exp(4)-math.sqrt(2)
---- response_body
-result: -0.4090441561579
-
-
-
-=== TEST 7: read $arg_xxx
---- config
-    location = /lua {
-        rewrite_by_lua 'who = ngx.var.arg_who
-            ngx.print("Hello, ", who, "!")';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua?who=agentzh
---- response_body chomp
-Hello, agentzh!
-
-
-
-=== TEST 8: capture location
---- config
-    location /other {
-        echo "hello, world";
-    }
-
-    location /lua {
-        rewrite_by_lua '
-res = ngx.location.capture("/other")
-ngx.print("status=", res.status, " ")
-ngx.print("body=", res.body)
-';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-status=200 body=hello, world
-
-
-
-=== TEST 9: capture non-existed location
---- config
-    location /lua {
-        rewrite_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body: status=404
-
-
-
-=== TEST 10: invalid capture location (not as expected...)
---- config
-    location /lua {
-        rewrite_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-res=404
-
-
-
-=== TEST 11: nil is "nil"
---- config
-    location /lua {
-        rewrite_by_lua 'ngx.say(nil)';
-        content_by_lua return;
-    }
---- request
-GET /lua
---- response_body
-nil
-
-
-
-=== TEST 12: write boolean
---- config
-    location /lua {
-        rewrite_by_lua 'ngx.say(true, " ", false)';
-        content_by_lua return;
-    }
---- request
-GET /lua
---- response_body
-true false
-
-
-
-=== TEST 13: bad argument type to ngx.location.capture
---- config
-    location /lua {
-        rewrite_by_lua 'ngx.location.capture(nil)';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 14: capture location (default 0);
---- config
- location /recur {
-       rewrite_by_lua '
-           local num = tonumber(ngx.var.arg_num) or 0;
-           ngx.print("num is: ", num, "\\n");
-
-           if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
-               ngx.print("status=", res.status, " ");
-               ngx.print("body=", res.body, "\\n");
-           else
-               ngx.print("end\\n");
-           end
-           ';
-
-           content_by_lua 'ngx.exit(ngx.OK)';
-   }
---- request
-GET /recur
---- response_body
-num is: 0
-end
-
-
-
-=== TEST 15: capture location
---- config
- location /recur {
-       rewrite_by_lua '
-           local num = tonumber(ngx.var.arg_num) or 0;
-           ngx.print("num is: ", num, "\\n");
-
-           if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
-               ngx.print("status=", res.status, " ");
-               ngx.print("body=", res.body);
-           else
-               ngx.print("end\\n");
-           end
-           ';
-
-           content_by_lua 'ngx.exit(ngx.OK)';
-   }
---- request
-GET /recur?num=3
---- response_body
-num is: 3
-status=200 body=num is: 2
-status=200 body=num is: 1
-status=200 body=num is: 0
-end
-
-
-
-=== TEST 16: setting nginx variables from within Lua
---- config
- location /set {
-       set $a "";
-       rewrite_by_lua 'ngx.var.a = 32; ngx.say(ngx.var.a)';
-       content_by_lua 'ngx.exit(ngx.OK)';
-       add_header Foo $a;
-   }
---- request
-GET /set
---- response_headers
-Foo: 32
---- response_body
-32
-
-
-
-=== TEST 17: nginx quote sql string 1
---- config
- location /set {
-       set $a 'hello\n\r\'"\\'; # this runs after rewrite_by_lua
-       rewrite_by_lua 'ngx.say(ngx.quote_sql_str(ngx.var.a))';
-       content_by_lua 'ngx.exit(ngx.OK)';
-   }
---- request
-GET /set
---- response_body
-'hello\n\r\'\"\\'
-
-
-
-=== TEST 18: nginx quote sql string 2
---- config
-location /set {
-    #set $a "hello\n\r'\"\\";
-    rewrite_by_lua 'ngx.say(ngx.quote_sql_str("hello\\n\\r\'\\"\\\\"))';
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /set
---- response_body
-'hello\n\r\'\"\\'
-
-
-
-=== TEST 19: use dollar
---- config
-location /set {
-    rewrite_by_lua '
-        local s = "hello 112";
-        ngx.say(string.find(s, "%d+$"))';
-
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /set
---- response_body
-79
-
-
-
-=== TEST 20: subrequests do not share variables of main requests by default
---- config
-location /sub {
-    echo $a;
-}
-location /parent {
-    set $a 12;
-    rewrite_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /parent
---- response_body eval: "\n"
-
-
-
-=== TEST 21: subrequests can share variables of main requests
---- config
-location /sub {
-    echo $a;
-}
-location /parent {
-    set $a '';
-    rewrite_by_lua '
-        ngx.var.a = 12;
-        res = ngx.location.capture(
-            "/sub",
-            { share_all_vars = true }
-        );
-        ngx.print(res.body)
-    ';
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /parent
---- response_body
-12
-
-
-
-=== TEST 22: main requests use subrequests' variables
---- config
-location /sub {
-    set $a 12;
-}
-location /parent {
-    rewrite_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = true });
-        ngx.say(ngx.var.a)
-    ';
-
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /parent
---- response_body
-12
-
-
-
-=== TEST 23: main requests do NOT use subrequests' variables
---- config
-location /sub {
-    set $a 12;
-    content_by_lua return;
-}
-
-location /parent {
-    rewrite_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = false });
-        ngx.say(ngx.var.a)
-    ';
-    content_by_lua return;
-}
---- request
-GET /parent
---- response_body_like eval: "\n"
-
-
-
-=== TEST 24: capture location headers
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo "hello, world";
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", res.header["Content-Type"]);
-        ';
-
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-type: foo/bar
-
-
-
-=== TEST 25: capture location headers
---- config
-    location /other {
-        default_type 'foo/bar';
-        rewrite_by_lua '
-            ngx.header.Bar = "Bah";
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", res.header["Content-Type"]);
-            ngx.say("Bar: ", res.header["Bar"]);
-        ';
-
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-type: foo/bar
-Bar: Bah
-
-
-
-=== TEST 26: capture location headers
---- config
-    location /other {
-        default_type 'foo/bar';
-        rewrite_by_lua '
-            ngx.header.Bar = "Bah";
-            ngx.header.Bar = nil;
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", res.header["Content-Type"]);
-            ngx.say("Bar: ", res.header["Bar"] or "nil");
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-type: foo/bar
-Bar: nil
-
-
-
-=== TEST 27: rewrite_by_lua runs before ngx_access
---- config
-    location /lua {
-        deny all;
-
-        rewrite_by_lua '
-            ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-        ';
-
-        content_by_lua return;
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 28: rewrite_by_lua shouldn't send headers automatically (on simple return)
---- config
-    location /lua {
-        rewrite_by_lua 'return';
-
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-
-    location = /foo {
-        default_type 'text/css';
-        add_header Bar Baz;
-        echo foo;
-    }
---- request
-GET /lua
---- response_headers
-Bar: Baz
-Content-Type: text/css
---- response_body
-foo
-
-
-
-=== TEST 29: rewrite_by_lua shouldn't send headers automatically (on simple exit)
---- config
-    location /lua {
-        rewrite_by_lua 'ngx.exit(ngx.OK)';
-
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-
-    location = /foo {
-        default_type 'text/css';
-        add_header Bar Baz;
-        echo foo;
-    }
---- request
-GET /lua
---- response_headers
-Bar: Baz
-Content-Type: text/css
---- response_body
-foo
-
-
-
-=== TEST 30: short circuit
---- config
-    location /lua {
-        rewrite_by_lua '
-            ngx.say("Hi")
-            ngx.eof()
-            ngx.exit(ngx.HTTP_OK)
-        ';
-
-        content_by_lua '
-            print("HERE")
-            ngx.print("BAD")
-        ';
-    }
---- request
-GET /lua
---- response_body
-Hi
-
-
-
-=== TEST 31: nginx vars in script path
---- config
-    location ~ /lua/(.+)$ {
-        rewrite_by_lua_file html/$1.lua;
-
-        content_by_lua '
-            print("HERE")
-            ngx.print("BAD")
-        ';
-    }
---- user_files
->>> hi.lua
-ngx.say("Hi")
-ngx.eof()
-ngx.exit(ngx.HTTP_OK)
---- request
-GET /lua/hi
---- response_body
-Hi
-
-
-
-=== TEST 32: phase postponing works for various locations
---- config
-    location ~ '^/lua/(.+)' {
-        set $path $1;
-        rewrite_by_lua 'ngx.say(ngx.var.path)';
-        content_by_lua return;
-    }
-    location ~ '^/lua2/(.+)' {
-        set $path $1;
-        rewrite_by_lua 'ngx.say(ngx.var.path)';
-        content_by_lua return;
-    }
-    location /main {
-        echo_location /lua/foo;
-        echo_location /lua/bar;
-        echo_location /lua2/baz;
-        echo_location /lua2/bah;
-    }
---- request
-GET /main
---- response_body
-foo
-bar
-baz
-bah
-
-
-
-=== TEST 33: server rewrite_by_lua
---- config
-    rewrite_by_lua 'ngx.header["X-Foo"] = "bar" -- ngx.send_headers()';
---- request
-GET /
---- response_body chop
-<html><head><title>It works!</title></head><body>It works!</body></html>
---- response_headers
-X-Foo: bar
---- no_error_log
-[error]
-
-
-
-=== TEST 34: server rewrite_by_lua_file
---- config
-    rewrite_by_lua_file html/foo.lua;
---- user_files
->>> foo.lua
-ngx.header["X-Foo"] = "bar" -- ngx.send_headers()
---- request
-GET /
---- response_body chop
-<html><head><title>It works!</title></head><body>It works!</body></html>
---- response_headers
-X-Foo: bar
-
-
-
-=== TEST 35: rewrite last before rewrite_by_lua
---- config
-    location /main {
-        rewrite ^/main/xyz\.html$ /abc.html last;
-        rewrite_by_lua 'ngx.exit(503)';
-    }
-    location ~ /abc.html {
-        echo abc;
-    }
---- request
-    GET /main/xyz.html
---- response_body
-abc
-
-
-
-=== TEST 36: rewrite last before rewrite_by_lua_file
---- config
-    location /main {
-        rewrite ^/main/xyz\.html$ /abc.html last;
-        rewrite_by_lua_file html/exit.lua;
-    }
-    location ~ /abc.html {
-        echo abc;
-    }
---- user_files
->>> exit.lua
-ngx.exit(503)
---- request
-    GET /main/xyz.html
---- response_body
-abc
-
-
-
-=== TEST 37: rewrite before rewrite_by_lua
---- config
-    location /main {
-        rewrite ^/main/xyz\.html$ /abc.html;
-        rewrite_by_lua 'ngx.exit(503)';
-    }
-    location ~ /abc.html {
-        echo abc;
-    }
---- request
-    GET /main/xyz.html
---- response_body
-abc
-
-
-
-=== TEST 38: rewrite break before rewrite_by_lua
---- config
-    location /main {
-        rewrite ^/main/xyz\.html$ /abc.html break;
-        rewrite_by_lua 'ngx.exit(503)';
-    }
-    location ~ /abc.html {
-        echo abc;
-    }
---- request
-    GET /main/xyz.html
---- response_body_like: 503 Service Temporarily Unavailable
---- error_code: 503
-
-
-
-=== TEST 39: Lua file does not exist
---- config
-    location /lua {
-        rewrite_by_lua_file html/test2.lua;
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- response_body_like: 404 Not Found
---- error_code: 404
---- error_log eval
-qr/failed to load external Lua file ".*?\btest2\.lua": cannot open .*? No such file or directory/
-
-
-
-=== TEST 40: use of ngx.say() in rewrite_by_lua without exiting with 200+.
---- config
-    location /t {
-        rewrite_by_lua "ngx.say('test')";
-        echo_exec /t2;
-    }
---- request
-    GET /t
---- response_body
-test
---- no_error_log
-[alert]
-
-
-
-=== TEST 41: use of ngx.say() in rewrite_by_lua without exiting with 200+. (with explicit ngx.eof())
---- config
-    location /t {
-        rewrite_by_lua "ngx.say('test') ngx.eof()";
-        echo_exec /t2;
-    }
---- request
-    GET /t
---- response_body
-test
---- no_error_log
-[alert]
-
-
-
-=== TEST 42: use of ngx.say() in rewrite_by_lua without exiting with 200+. (with IO)
---- config
-    location /t {
-        rewrite_by_lua "ngx.say('test') ngx.sleep(0.001)";
-        echo_exec /t2;
-    }
---- request
-    GET /t
---- response_body
-test
---- no_error_log
-[alert]
diff --git a/debian/modules/http-lua/t/023-rewrite/sleep.t b/debian/modules/http-lua/t/023-rewrite/sleep.t
deleted file mode 100644
index 8d4c2da..0000000
--- a/debian/modules/http-lua/t/023-rewrite/sleep.t
+++ /dev/null
@@ -1,221 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#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/http-lua/t/023-rewrite/socket-keepalive.t b/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
deleted file mode 100644
index 489a70f..0000000
--- a/debian/modules/http-lua/t/023-rewrite/socket-keepalive.t
+++ /dev/null
@@ -1,1009 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 5 + 4);
-
-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 "]
---- grep_error_log eval
-qr/lua tcp socket get keepalive peer: using connection|lua tcp socket keepalive create connection pool for key "[^"]+"/
-
---- grep_error_log_out eval
-[
-qq{lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"
-lua tcp socket get keepalive peer: using connection
-},
-"lua tcp socket get keepalive peer: using connection
-lua tcp socket get keepalive peer: using connection
-"]
-
-
-
-=== 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]
---- grep_error_log eval
-qr/lua tcp socket keepalive timeout: unlimited|lua tcp socket connection pool size: \d+/
---- grep_error_log_out eval
-["lua tcp socket connection pool size: 30
-lua tcp socket keepalive timeout: unlimited
-",
-"lua tcp socket keepalive timeout: unlimited
-"]
---- 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]
---- grep_error_log eval
-qr/lua tcp socket keepalive timeout: unlimited|lua tcp socket connection pool size: \d+/
---- grep_error_log_out eval
-["lua tcp socket connection pool size: 30
-lua tcp socket keepalive timeout: unlimited
-",
-"lua tcp socket keepalive timeout: unlimited
-"
-]
---- 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 "]
---- grep_error_log eval
-qr/lua tcp socket get keepalive peer: using connection|lua tcp socket keepalive create connection pool for key "unix:/
---- grep_error_log_out eval
-[qq{lua tcp socket keepalive create connection pool for key "unix:
-lua tcp socket get keepalive peer: using connection
-},
-"lua tcp socket get keepalive peer: using connection
-lua tcp socket get keepalive peer: using connection
-"
-]
-
-
-
-=== 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/http-lua/t/023-rewrite/subrequest.t b/debian/modules/http-lua/t/023-rewrite/subrequest.t
deleted file mode 100644
index 5d1e8f0..0000000
--- a/debian/modules/http-lua/t/023-rewrite/subrequest.t
+++ /dev/null
@@ -1,641 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: DELETE
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_DELETE });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-DELETE
-
-
-
-=== TEST 2: DELETE (proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_DELETE });
-
-            ngx.print(res.body)
-        ';
-
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-DELETE
-
-
-
-=== TEST 3: POST (nobody, proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_POST });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-POST
-
-
-
-=== TEST 4: HEAD
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_HEAD });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-
-
-
-=== TEST 5: explicit GET
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_GET });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET
-
-
-
-=== TEST 6: implicit GET
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo")
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET
-
-
-
-=== TEST 7: implicit GET (empty option table)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo", {})
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET
-
-
-
-=== TEST 8: PUT (nobody, proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo_read_request_body;
-
-        echo $echo_request_method;
-        echo_request_body;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_PUT, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body chomp
-PUT
-hello
-
-
-
-=== TEST 9: PUT (nobody, no proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        #echo_read_request_body;
-
-        echo $echo_request_method;
-        #echo $echo_request_body;
-        echo_request_body;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_PUT, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body chomp
-PUT
-hello
-
-
-
-=== TEST 10: PUT (nobody, no proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        #echo_read_request_body;
-
-        echo $echo_request_method;
-        #echo $echo_request_body;
-        echo_request_body;
-        #echo "[$http_content_length]";
-        echo;
-    }
-
-    location /foo {
-        echo $echo_request_method;
-        echo -n "[$http_content_length]";
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_PUT, body = "hello" });
-
-            ngx.print(res.body)
-
-            res = ngx.location.capture("/foo")
-            ngx.say(res.body)
-
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-PUT
-hello
-GET
-[]
-
-
-
-=== TEST 11: POST (with body, proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo_read_request_body;
-
-        echo $echo_request_method;
-        echo_request_body;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_POST, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body chomp
-POST
-hello
-
-
-
-=== TEST 12: POST (with body, memc method)
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc {
-        set $memc_key $echo_request_uri;
-        set $memc_exptime 600;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            ngx.say("GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            ngx.say("PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            ngx.say("cached: " .. res.body);
-
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET: 404
-PUT: 201
-cached: hello
-
-
-
-=== TEST 13: POST (with body, memc method)
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc {
-        set $memc_cmd "";
-        set $memc_key $echo_request_uri;
-        set $memc_exptime 600;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            ngx.location.capture("/flush",
-                { share_all_vars = true });
-
-            res = ngx.location.capture("/memc",
-                { share_all_vars = true });
-            ngx.say("GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello", share_all_vars = true });
-            ngx.say("PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc", { share_all_vars = true });
-            ngx.say("cached: " .. res.body);
-
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET: 404
-PUT: 201
-cached: hello
-
-
-
-=== TEST 14: empty args option table
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = {} })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body eval: "\n"
-
-
-
-=== TEST 15: non-empty args option table (1 pair)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { ["fo="] = "=>" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-fo%3D=%3D%3E
-
-
-
-=== TEST 16: non-empty args option table (2 pairs)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { ["fo="] = "=>",
-                    ["="] = ":" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like chop
-^(?:fo%3D=%3D%3E\&%3D=%3A|%3D=%3A\&fo%3D=%3D%3E)$
-
-
-
-=== TEST 17: non-empty args option table (2 pairs, no special chars)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { foo = 3,
-                    bar = "hello" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like chop
-^(?:bar=hello\&foo=3|foo=3\&bar=hello)$
-
-
-
-=== TEST 18: non-empty args option table (number key)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { [57] = "hi" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 19: non-empty args option table (plain arrays)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { "hi" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 20: more args
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo?a=3",
-                { args = { b = 4 } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-a=3&b=4
-
-
-
-=== TEST 21: more args
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            res = ngx.location.capture("/foo?a=3",
-                { args = "b=4" })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-a=3&b=4
-
-
-
-=== TEST 22: more args
---- config
-    location /memc {
-        set $memc_cmd get;
-        set $memc_key $arg_key;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc_set {
-        #set $memc_cmd set;
-        #set $memc_key $arg_key;
-        #memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-        echo OK;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            print("HELLO")
-            local memc_key = "hello"
-            local res = ngx.location.capture("/memc?key=" .. memc_key )
-            ngx.say("copass: res " .. res.status)
-
-            if res.status == 404 then
-                   ngx.say("copas: capture /memc_set")
-                   res = ngx.location.capture("/memc_set?key=" .. memc_key)
-                   ngx.say("copss: status " .. res.status);
-            end
-        ';
-        content_by_lua 'return';
-        #echo Hi;
-    }
---- request
-    GET /lua
---- response_body
-copass: res 404
-copas: capture /memc_set
-copss: status 200
-
-
-
-=== TEST 23: I/O in named location
-the nginx core requires the patch https://github.com/agentzh/ngx_openresty/blob/master/patches/nginx-1.0.15-reset_wev_handler_in_named_locations.patch
---- config
-    location /t {
-        echo_exec @named;
-    }
-
-    location @named {
-        rewrite_by_lua '
-            ngx.location.capture("/hello")
-        ';
-        echo done;
-    }
-
-    location /hello {
-        echo hello;
-    }
---- request
-    GET /t
---- response_body
-done
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
deleted file mode 100644
index 329c045..0000000
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket-timeout.t
+++ /dev/null
@@ -1,606 +0,0 @@
-# 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}";
-    }
-
-    if ($ENV{MOCKEAGAIN} eq 'r') {
-        $ENV{MOCKEAGAIN} = 'rw';
-
-    } else {
-        $ENV{MOCKEAGAIN} = 'w';
-    }
-
-    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
-    $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'get helloworld';
-}
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4 + 8);
-
-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 ipv6=off;
-    resolver_timeout 3s;
-    location /t1 {
-        rewrite_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 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, when connecting to 172.105.207.225:12345
---- timeout: 10
-
-
-
-=== 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 ipv6=off;
-    resolver_timeout 3s;
-    location /t2 {
-        rewrite_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(150)
-            local ok, err = sock:connect("agentzh.org", 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: 10
-
-
-
-=== 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 ipv6=off;
-    #resolver_timeout 3s;
-    location /t3 {
-        rewrite_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(nil)
-            local ok, err = sock:connect("agentzh.org", 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 ipv6=off;
-    resolver_timeout 3s;
-    location /t4 {
-        rewrite_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(0)
-            local ok, err = sock:connect("agentzh.org", 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: 10
-
-
-
-=== TEST 5: -1 is bad timeout value
---- config
-    server_tokens off;
-    lua_socket_connect_timeout 102ms;
-    lua_socket_log_errors off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /t5 {
-        rewrite_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(-1)
-            local ok, err = sock:connect("agentzh.org", 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_like chomp
-500 Internal Server Error
---- error_log
-bad timeout value
---- timeout: 10
---- error_code: 500
-
-
-
-=== 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 ipv6=off;
-    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 ipv6=off;
-    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 ipv6=off;
-    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: -1 is bad timeout value
---- config
-    server_tokens off;
-    lua_socket_read_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER ipv6=off;
-    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
-
-            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_like chomp
-500 Internal Server Error
---- error_log
-bad timeout value
---- timeout: 10
---- error_code: 500
-
-
-
-=== TEST 11: lua_socket_send_timeout only
---- config
-    server_tokens off;
-    lua_socket_send_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    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 ipv6=off;
-    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 ipv6=off;
-    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 ipv6=off;
-    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: -1 is bad timeout value
---- config
-    server_tokens off;
-    lua_socket_send_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER ipv6=off;
-    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
-
-            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_like chomp
-500 Internal Server Error
---- error_log
-bad timeout value
---- timeout: 10
---- error_code: 500
diff --git a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t b/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
deleted file mode 100644
index 41aeab7..0000000
--- a/debian/modules/http-lua/t/023-rewrite/tcp-socket.t
+++ /dev/null
@@ -1,2392 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * 107;
-
-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: 1 nil
---- 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 ipv6=off;
-    resolver_timeout 3s;
-    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: 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 ipv6=off;
-    lua_socket_connect_timeout 100ms;
-    lua_socket_send_timeout 100ms;
-    lua_socket_read_timeout 100ms;
-    resolver_timeout 3s;
-    location /test {
-        rewrite_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
-            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, when connecting to 172.105.207.225:12345
---- timeout: 10
-
-
-
-=== 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 ipv6=off;
-    resolver_timeout 3s;
-    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: 10
-
-
-
-=== TEST 9: resolver error (timeout)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    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|Host not found)\))?
-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: 1 nil
---- 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: 1 nil
-"
---- 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: 1 nil
-"
---- 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: 1 nil
-"
---- 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: 1 nil
-"
---- 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: 1 nil
---- 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: 1 nil
---- 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: 1 nil
-"
---- 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]
---- SKIP
-
-
-
-=== 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: 1 nil
---- 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: 1 nil
---- 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]
-
-
-
-=== TEST 33: bad request tries to connect
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        rewrite_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                test.new_sock()
-            end
-            local sock = test.get_sock()
-            local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-            else
-                ngx.say("connected")
-            end
-        ';
-
-        content_by_lua return;
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):7: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 34: bad request tries to receive
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        rewrite_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:receive()
-        ';
-
-        content_by_lua return;
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 35: bad request tries to send
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        rewrite_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:send("a")
-        ';
-
-        content_by_lua return;
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 36: bad request tries to close
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        rewrite_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:close()
-        ';
-
-        content_by_lua return;
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 37: bad request tries to set keepalive
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        rewrite_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:setkeepalive()
-        ';
-
-        content_by_lua return;
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 38: bad request tries to receiveuntil
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        rewrite_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            local it, err = sock:receiveuntil("abc")
-            if it then
-                it()
-            end
-        ';
-
-        content_by_lua return;
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: rewrite_by_lua\(nginx\.conf:\d+\):16: bad request/
-
---- no_error_log
-[alert]
diff --git a/debian/modules/http-lua/t/023-rewrite/unix-socket.t b/debian/modules/http-lua/t/023-rewrite/unix-socket.t
deleted file mode 100644
index 8a5f000..0000000
--- a/debian/modules/http-lua/t/023-rewrite/unix-socket.t
+++ /dev/null
@@ -1,152 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (2 * blocks() + 1);
-
-$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
---- error_log eval
-qr{\[crit\] .*? connect\(\) to unix:/tmp/nosuchfile\.sock failed}
-
-
-
-=== 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: 1 nil
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t b/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
deleted file mode 100644
index 2bea7e7..0000000
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exec.t
+++ /dev/null
@@ -1,345 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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")
-        ';
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
-
-    location = /foo {
-        echo hello world;
-    }
---- 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 == 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
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t b/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
deleted file mode 100644
index 6ebbb67..0000000
--- a/debian/modules/http-lua/t/023-rewrite/uthread-exit.t
+++ /dev/null
@@ -1,1331 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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';
-$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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-delete thread 1
-free request
-
---- response_body
-before
-hello in thread
-after
---- no_error_log
-[error]
-[alert]
-
-
-
-=== 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")
-        ';
-    }
---- 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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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 {
-        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")
-        ';
-    }
---- 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
-
---- wait: 0.1
---- 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 agentzh.org;
-        resolver_timeout 12s;
-        rewrite_by_lua '
-            function f()
-                ngx.say("hello in thread")
-                ngx.sleep(0.001)
-                ngx.exit(0)
-            end
-
-            ngx.say("before")
-            ngx.thread.spawn(f)
-            ngx.say("after")
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 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_resolve_start) {
-    println("resolver started")
-}
-
-F(ngx_http_lua_socket_resolve_handler) {
-    println("resolver done")
-}
-
-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 == 1) {
-        timers[$arg1] = $arg2
-        printf("add timer %d\n", $arg2)
-    }
-}
-
-M(timer-del) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        printf("delete timer %d\n", tm)
-        delete timers[$arg1]
-    }
-    /*
-    if (tm == 12000) {
-        print_ubacktrace()
-    }
-    */
-}
-
-M(timer-expire) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        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 1
-resolver started
-resolving agentzh.org
-add timer 12000
-expire timer 1
-terminate 2: ok
-delete thread 2
-lua tcp resolve cleanup
-delete timer 12000
-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 agentzh.org;
-        #resolver 127.0.0.1;
-        resolver_timeout 12s;
-        rewrite_by_lua '
-            function f()
-                ngx.say("hello in thread")
-                ngx.sleep(0.001)
-                ngx.exit(0)
-            end
-
-            ngx.say("before")
-            ngx.thread.spawn(f)
-            ngx.say("after")
-            local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("agentzh.org", 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_resolve_start) {
-    println("resolver started")
-}
-
-F(ngx_http_lua_socket_resolve_handler) {
-    println("resolver done")
-}
-
-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 == 1) {
-        timers[$arg1] = $arg2
-        printf("add timer %d\n", $arg2)
-    }
-}
-
-M(timer-del) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        printf("delete timer %d\n", tm)
-        delete timers[$arg1]
-    }
-    /*
-    if (tm == 12000) {
-        print_ubacktrace()
-    }
-    */
-}
-
-M(timer-expire) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        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 1
-resolver started
-resolving agentzh.org
-add timer 12000
-expire timer 1
-terminate 2: ok
-delete thread 2
-lua udp resolve cleanup
-delete timer 12000
-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 {
-        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("172.105.207.225", 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-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 {
-        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")
-        ';
-    }
---- 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-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 {
-        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")
-        ';
-    }
---- 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-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 {
-        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")
-        ';
-    }
---- 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
-delete thread 2
-lua udp socket cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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")
-        ';
-    }
---- 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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")
-        ';
-    }
---- 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
-delete thread 2
-lua req body cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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")
-        ';
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
---- 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 == 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
-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")
-        ';
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
---- 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 == 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
-
---- wait: 0.1
---- 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")
-        ';
-    }
-
-    location = /echo {
-        echo hello;
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
---- 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 == 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
-
---- wait: 0.1
---- response_body
-end
---- error_log
-attempt to abort with pending subrequests
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t b/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
deleted file mode 100644
index 83de1a3..0000000
--- a/debian/modules/http-lua/t/023-rewrite/uthread-redirect.t
+++ /dev/null
@@ -1,188 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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")
-        ';
-    }
-
-    location = /echo {
-        echo hello;
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
---- 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 == 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 {
-        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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-delete thread 1
-free request
-
---- response_body_like: 302 Found
---- error_code: 302
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t b/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
deleted file mode 100644
index 5552107..0000000
--- a/debian/modules/http-lua/t/023-rewrite/uthread-spawn.t
+++ /dev/null
@@ -1,1451 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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")
-        ';
-    }
---- 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
-
---- 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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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
-
---- wait: 0.1
---- 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")
-        ';
-    }
---- 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 eval
-qr/lua user thread aborted: runtime error: rewrite_by_lua\(nginx\.conf:\d+\):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")
-        ';
-    }
-
-    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 {
-        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)
-        ';
-    }
-
-    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 {
-        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)
-        ';
-    }
-
-    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 {
-        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)
-        ';
-    }
-
-    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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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))
-        ';
-    }
---- 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 {
-        rewrite_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 {
-        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))
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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)
-        ';
-    }
---- 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 {
-        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)
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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)$
-
---- 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")
-        ';
-    }
---- 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: 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")
-        ';
-    }
-
-    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
-finalize request /t: rc:200 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")
-        ';
-    }
-
-    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 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")
-        ';
-    }
-
-    location ~ ^/proxy/(\d+) {
-        content_by_lua 'ngx.exit(201)';
-    }
---- request
-    GET /t
---- stap2 eval: $::StapScript
---- stap3
-F(ngx_http_send_header) {
-    printf("send header main_req=%d, r=%p\n", $r == $r->main, $r)
-    print_ubacktrace()
-    printf("========================================")
-}
---- stap_out3
---- 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:0 c:3 a:0
-post subreq: /proxy/1 rc=0, 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:0 c:2 a:0
-post subreq: /proxy/2 rc=0, status=201 a=0
-subrequest /proxy/2 done
-terminate 3: ok
-delete thread 3
-finalize request /t: rc:200 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")
-        ';
-    }
-
-    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
-finalize request /t: rc:200 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/http-lua/t/024-access/auth.t b/debian/modules/http-lua/t/024-access/auth.t
deleted file mode 100644
index 56e9862..0000000
--- a/debian/modules/http-lua/t/024-access/auth.t
+++ /dev/null
@@ -1,109 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-#no_nginx_manager();
-
-#repeat_each(1);
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 1);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: basic test passing
---- config
-    location /lua {
-        lua_need_request_body on;
-        client_max_body_size 100k;
-        client_body_buffer_size 100k;
-
-        access_by_lua '
-            -- check the client IP addr is in our black list
-            if ngx.var.remote_addr == "132.5.72.3" then
-                ngx.exit(ngx.HTTP_FORBIDDEN)
-            end
-
-            -- check if the request body contains bad words
-            if ngx.var.request_body and string.match(ngx.var.request_body, "fuck") then
-                return ngx.redirect("/terms_of_use.html")
-            end
-
-            -- tests passed
-        ';
-
-        echo Logged in;
-    }
---- request
-GET /lua
---- response_body
-Logged in
-
-
-
-=== TEST 2: bad words in request body
---- config
-    location /lua {
-        lua_need_request_body on;
-        client_max_body_size 100k;
-        client_body_buffer_size 100k;
-
-        access_by_lua '
-            -- check the client IP addr is in our black list
-            if ngx.var.remote_addr == "132.5.72.3" then
-                ngx.exit(ngx.HTTP_FORBIDDEN)
-            end
-
-            -- check if the request body contains bad words
-            if ngx.var.request_body and string.match(ngx.var.request_body, "fuck") then
-                return ngx.redirect("/terms_of_use.html")
-            end
-
-            -- tests passed
-        ';
-
-        echo Logged in;
-    }
---- request
-POST /lua
-He fucks himself!
---- response_body_like: 302 Found
---- response_headers_like
-Location: /terms_of_use\.html
---- error_code: 302
-
-
-
-=== TEST 3: client IP
---- config
-    location /lua {
-        lua_need_request_body on;
-        client_max_body_size 100k;
-        client_body_buffer_size 100k;
-
-        access_by_lua '
-            -- check the client IP addr is in our black list
-            if ngx.var.remote_addr == "127.0.0.1" then
-                ngx.exit(ngx.HTTP_FORBIDDEN)
-            end
-
-            -- check if the request body contains bad words
-            if ngx.var.request_body and string.match(ngx.var.request_body, "fuck") then
-                return ngx.redirect("/terms_of_use.html")
-            end
-
-            -- tests passed
-        ';
-
-        echo Logged in;
-    }
---- request
-GET /lua
---- response_body_like: 403 Forbidden
---- error_code: 403
diff --git a/debian/modules/http-lua/t/024-access/client-abort.t b/debian/modules/http-lua/t/024-access/client-abort.t
deleted file mode 100644
index c16f4ea..0000000
--- a/debian/modules/http-lua/t/024-access/client-abort.t
+++ /dev/null
@@ -1,852 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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
---- wait: 0.1
---- 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://agentzh.org:12345/;
-    }
-
-    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://agentzh.org:12345/;
-    }
---- 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
-
---- wait: 0.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
---- wait: 0.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/http-lua/t/024-access/exec.t b/debian/modules/http-lua/t/024-access/exec.t
deleted file mode 100644
index 43c1a77..0000000
--- a/debian/modules/http-lua/t/024-access/exec.t
+++ /dev/null
@@ -1,393 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 6);
-
-#no_diff();
-#no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /read {
-        access_by_lua '
-            ngx.exec("/hi");
-            ngx.say("Hi");
-        ';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body
-Hello
-
-
-
-=== TEST 2: empty uri arg
---- config
-    location /read {
-        access_by_lua '
-            ngx.exec("");
-            ngx.say("Hi");
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 3: no arg
---- config
-    location /read {
-        access_by_lua '
-            ngx.exec();
-            ngx.say("Hi");
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 4: too many args
---- config
-    location /read {
-        access_by_lua '
-            ngx.exec(1, 2, 3, 4);
-            ngx.say("Hi");
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 5: null uri
---- config
-    location /read {
-        access_by_lua '
-            ngx.exec(nil)
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 6: user args
---- config
-    location /read {
-        access_by_lua '
-            ngx.exec("/hi", "Yichun Zhang")
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello Yichun Zhang
-
-
-
-=== TEST 7: args in uri
---- config
-    location /read {
-        access_by_lua '
-            ngx.exec("/hi?agentzh")
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello agentzh
-
-
-
-=== TEST 8: args in uri and user args
---- config
-    location /read {
-        access_by_lua '
-            ngx.exec("/hi?a=Yichun", "b=Zhang")
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello a=Yichun&b=Zhang
-
-
-
-=== TEST 9: args in uri and user args
---- config
-    location /read {
-        access_by_lua '
-            ngx.exec("@hi?a=Yichun", "b=Zhang")
-            ngx.say("Hi")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location @hi {
-        echo Hello $query_string;
-    }
---- request
-GET /read
---- response_body
-Hello 
-
-
-
-=== TEST 10: exec after location capture
---- config
-    location /test {
-        access_by_lua_file 'html/test.lua';
-        echo world;
-    }
-
-    location /a {
-        echo "hello";
-    }
-
-    location /b {
-        echo "hello";
-    }
-
---- user_files
->>> test.lua
-ngx.location.capture('/a')
-
-ngx.exec('/b')
---- request
-    GET /test
---- response_body
-hello
-
-
-
-=== TEST 11: exec after (named) location capture
---- config
-    location /test {
-        access_by_lua_file 'html/test.lua';
-    }
-
-    location /a {
-        echo "hello";
-    }
-
-    location @b {
-        echo "hello";
-    }
-
---- user_files
->>> test.lua
-ngx.location.capture('/a')
-
-ngx.exec('@b')
---- request
-    GET /test
---- response_body
-hello
-
-
-
-=== TEST 12: github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location
---- config
-    location = /hi {
-        echo hello;
-    }
-    location /sub {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-    }
-    location /p{
-        #content_by_lua '
-            #local res = ngx.location.capture("/sub")
-            #ngx.print(res.body)
-        #';
-        echo_location /sub;
-    }
-    location /lua {
-        access_by_lua '
-            ngx.exec("/p")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hello
---- timeout: 3
-
-
-
-=== TEST 13: github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location (named location)
---- config
-    location = /hi {
-        echo hello;
-    }
-    location /sub {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-    }
-    location @p {
-        #content_by_lua '
-            #local res = ngx.location.capture("/sub")
-            #ngx.print(res.body)
-        #';
-        echo_location /sub;
-    }
-    location /lua {
-        access_by_lua '
-            ngx.exec("@p")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hello
-
-
-
-=== TEST 14: github issue #40: 2 Subrequest calls when using access_by_lua, ngx.exec and echo_location (post subrequest)
---- config
-    location = /hi {
-        echo hello;
-    }
-    location /sub {
-        proxy_pass http://127.0.0.1:$server_port/hi;
-    }
-    location /p{
-        #content_by_lua '
-            #local res = ngx.location.capture("/sub")
-            #ngx.print(res.body)
-        #';
-        echo_location /sub;
-    }
-    location /blah {
-        echo blah;
-    }
-    location /lua {
-        access_by_lua '
-            ngx.location.capture("/blah")
-            ngx.exec("/p")
-        ';
-    }
---- request
-    GET /lua
---- response_body
-hello
-
-
-
-=== TEST 15: access_by_lua + ngx.exec + subrequest capture
---- config
-    location /main {
-        access_by_lua '
-            res = ngx.location.capture("/test_loc");
-            ngx.print("hello, ", res.body)
-        ';
-        content_by_lua return;
-    }
-    location /test_loc {
-        rewrite_by_lua '
-            ngx.exec("@proxy")
-        ';
-    }
-    location @proxy {
-        #echo proxy;
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-    location /foo {
-        echo bah;
-    }
---- request
-    GET /main
---- response_body
-hello, bah
-
-
-
-=== TEST 16: github issue #905: unsafe uri
---- config
-    location /read {
-        access_by_lua_block {
-            ngx.exec("/hi/../");
-        }
-    }
-    location /hi {
-        echo "Hello";
-    }
---- request
-GET /read
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-[
-'unsafe URI "/hi/../" was detected',
-qr/runtime error: access_by_lua\(nginx.conf:\d+\):2: unsafe uri/,
-]
-
-
-
-=== TEST 17: pipelined requests
---- config
-    location /t {
-        access_by_lua_block {
-            ngx.exec("@foo")
-        }
-    }
-
-    location @foo {
-        return 200;
-    }
---- pipelined_requests eval
-["GET /t", "GET /t"]
---- error_code eval
-[200, 200]
---- response_body eval
-["", ""]
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/024-access/exit.t b/debian/modules/http-lua/t/024-access/exit.t
deleted file mode 100644
index d6d66b8..0000000
--- a/debian/modules/http-lua/t/024-access/exit.t
+++ /dev/null
@@ -1,547 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#repeat_each(20000);
-repeat_each(2);
-
-#master_on();
-#workers(1);
-#log_level('debug');
-#log_level('warn');
-#worker_connections(1024);
-
-plan tests => repeat_each() * (blocks() * 2 + 2);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
-
-our $LuaCpath = $ENV{LUA_CPATH} ||
-    '/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;';
-
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: throw 403
---- config
-    location /lua {
-        access_by_lua "ngx.exit(403);ngx.say('hi')";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- error_code: 403
---- response_body_like: 403 Forbidden
-
-
-
-=== TEST 2: throw 404
---- config
-    location /lua {
-        access_by_lua "ngx.exit(404);ngx.say('hi');";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- error_code: 404
---- response_body_like: 404 Not Found
-
-
-
-=== TEST 3: throw 404 after sending the header and partial body
---- config
-    location /lua {
-        access_by_lua "ngx.say('hi');ngx.exit(404);ngx.say(', you')";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-hi
---- no_error_log
-[alert]
---- error_log
-attempt to set status 404 via ngx.exit after sending out the response status 200
-
-
-
-=== TEST 4: working with ngx_auth_request (succeeded)
---- config
-    location /auth {
-        access_by_lua "
-            if ngx.var.user == 'agentzh' then
-                ngx.eof();
-            else
-                ngx.exit(403)
-            end";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-    location /api {
-        set $user $arg_user;
-        auth_request /auth;
-
-        echo "Logged in";
-    }
---- request
-GET /api?user=agentzh
---- error_code: 200
---- response_body
-Logged in
-
-
-
-=== TEST 5: working with ngx_auth_request (failed)
---- config
-    location /api {
-        set $user $arg_user;
-        access_by_lua "
-            if ngx.var.user == 'agentzh' then
-                ngx.eof();
-            else
-                ngx.exit(403)
-            end";
-
-        echo "Logged in";
-    }
---- request
-GET /api?user=agentz
---- error_code: 403
---- response_body_like: 403 Forbidden
-
-
-
-=== TEST 6: working with ngx_auth_request (simplest form, w/o ngx_memc)
---- http_config eval
-"
-    lua_package_cpath '$::LuaCpath';
-    upstream backend {
-        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;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /conv-uid-mysql {
-        internal;
-
-        set $key "conv-uid-$arg_uid";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        drizzle_query "select new_uid as uid from conv_uid where old_uid=$arg_uid";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /api {
-        set $uid $arg_uid;
-        access_by_lua_file 'html/foo.lua';
-
-        echo "Logged in $uid";
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local old_uid = ngx.var.uid
-print('about to run sr')
-local res = ngx.location.capture('/conv-uid-mysql?uid=' .. old_uid)
-print('just have run sr' .. res.body)
-if (res.status ~= ngx.HTTP_OK) then
-    -- ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].uid or
-        not string.match(res[1].uid, '^%d+$')) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.uid = res[1].uid;
--- print('done')
---- request
-GET /api?uid=32
---- response_body
-Logged in 56
---- timeout: 3
-
-
-
-=== TEST 7: working with ngx_auth_request (simplest form)
---- http_config eval
-"
-    lua_package_cpath '$::LuaCpath';
-    upstream backend {
-        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;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /conv-uid-mysql {
-        internal;
-
-        set $key "conv-uid-$arg_uid";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        drizzle_query "select new_uid as uid from conv_uid where old_uid=$arg_uid";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /api {
-        set $uid $arg_uid;
-        access_by_lua_file html/foo.lua;
-
-        echo "Logged in $uid";
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local old_uid = ngx.var.uid
--- print('about to run sr')
-local res = ngx.location.capture('/conv-uid-mysql?uid=' .. old_uid)
--- print('just have run sr' .. res.body)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].uid or
-        not string.match(res[1].uid, '^%d+$')) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.uid = res[1].uid;
--- print('done')
---- request
-GET /api?uid=32
---- response_body
-Logged in 56
-
-
-
-=== TEST 8: working with ngx_auth_request
---- http_config eval
-"
-    lua_package_cpath '$::LuaCpath';
-    upstream backend {
-        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;
-    }
-
-    upstream memc_b {
-        server 127.0.0.1:\$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    upstream_list memc_cluster memc_a memc_b;
-"
---- config
-    location /memc {
-        internal;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        set_hashed_upstream $backend memc_cluster $arg_key;
-        memc_pass $backend;
-    }
-
-    location /conv-uid-mysql {
-        internal;
-
-        set $key "conv-uid-$arg_uid";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        drizzle_query "select new_uid as uid from conv_uid where old_uid=$arg_uid";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /api {
-        set $uid $arg_uid;
-        access_by_lua_file html/foo.lua;
-
-        echo "Logged in $uid";
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local old_uid = ngx.var.uid
--- print('about to run sr')
-local res = ngx.location.capture('/conv-uid-mysql?uid=' .. old_uid)
--- print('just have run sr' .. res.body)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].uid or
-        not string.match(res[1].uid, '^%d+$')) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.uid = res[1].uid;
--- print('done')
---- request
-GET /api?uid=32
---- response_body
-Logged in 56
-
-
-
-=== TEST 9: working with ngx_auth_request
---- http_config
-    upstream backend {
-        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;
-        keepalive 300;
-    }
-
-    #upstream_list memc_cluster memc_a memc_b;
-
---- config
-    location /memc {
-        internal;
-
-        set $memc_key $arg_key;
-        set $memc_exptime $arg_exptime;
-
-        #set_hashed_upstream $backend memc_cluster $arg_key;
-        memc_pass memc_a;
-    }
-
-    location /conv-mysql {
-        internal;
-
-        set $key "conv-uri-$query_string";
-
-        #srcache_fetch GET /memc key=$key;
-        #srcache_store PUT /memc key=$key;
-
-        default_type 'application/json';
-
-        set_quote_sql_str $seo_uri $query_string;
-        drizzle_query "select url from my_url_map where seo_url=$seo_uri";
-        drizzle_pass backend;
-
-        rds_json on;
-    }
-
-    location /conv-uid {
-        internal;
-        access_by_lua_file 'html/foo.lua';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-
-    location /baz {
-        set $my_uri $uri;
-        auth_request /conv-uid;
-
-        echo_exec /jump $my_uri;
-    }
-
-    location /jump {
-        internal;
-        rewrite ^ $query_string? redirect;
-    }
---- user_files
->>> foo.lua
-local cjson = require('cjson');
-local seo_uri = ngx.var.my_uri
--- print('about to run sr')
-local res = ngx.location.capture('/conv-mysql?' .. seo_uri)
-if (res.status ~= ngx.HTTP_OK) then
-    ngx.exit(res.status)
-end
-res = cjson.decode(res.body)
-if (not res or not res[1] or not res[1].url) then
-    ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-end
-ngx.var.my_uri = res[1].url;
--- print('done')
---- request
-GET /baz
---- response_body_like: 302
---- error_code: 302
---- response_headers
-Location: http://localhost:$ServerPort/foo/bar
---- SKIP
-
-
-
-=== TEST 10: throw 0
---- config
-    location /lua {
-        access_by_lua "ngx.say('Hi'); ngx.eof(); ngx.exit(0);ngx.say('world')";
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- error_code: 200
---- response_body
-Hi
-
-
-
-=== TEST 11: throw ngx.OK does *not* skip other later phase handlers
---- config
-    location /lua {
-        access_by_lua "ngx.exit(ngx.OK)";
-        set $foo hello;
-        echo $foo;
-    }
---- request
-GET /lua
---- response_body
-hello
-
-
-
-=== TEST 12: throw ngx.HTTP_OK *does* skip other later phase handlers (by inlined code)
---- config
-    location /lua {
-        access_by_lua "ngx.exit(ngx.HTTP_OK)";
-        set $foo hello;
-        echo $foo;
-    }
---- request
-GET /lua
---- response_body
-
-
-
-=== TEST 13: throw ngx.HTTP_OK *does* skip other rewrite phase handlers (by inlined code + partial output)
---- config
-    location /lua {
-        rewrite_by_lua "ngx.say('hiya') ngx.exit(ngx.HTTP_OK)";
-        set $foo hello;
-        echo $foo;
-    }
---- request
-GET /lua
---- response_body
-hiya
-
-
-
-=== TEST 14: throw ngx.HTTP_OK *does* skip other later phase handlers (by file)
---- config
-    location /lua {
-        access_by_lua_file html/foo.lua;
-        set $foo hello;
-        echo $foo;
-    }
---- user_files
->>> foo.lua
-ngx.exit(ngx.HTTP_OK)
---- request
-GET /lua
---- response_body
-
-
-
-=== TEST 15: throw ngx.HTTP_OK *does* skip other rewrite phase handlers (by file + partial output)
---- config
-    location /lua {
-        rewrite_by_lua_file html/foo.lua;
-        set $foo hello;
-        echo $foo;
-    }
---- user_files
->>> foo.lua
-ngx.say("morning")
-ngx.exit(ngx.HTTP_OK)
---- request
-GET /lua
---- response_body
-morning
-
-
-
-=== TEST 16: error page with custom body
---- config
-    error_page 410 @err;
-    location @err {
-        echo blah blah;
-    }
-    location /foo {
-        access_by_lua '
-            ngx.status = ngx.HTTP_GONE
-            ngx.say("This is our own content")
-            -- to cause quit the whole request rather than the current phase handler
-            ngx.exit(ngx.HTTP_OK)
-        ';
-        echo Hello;
-    }
---- request
-    GET /foo
---- response_body
-This is our own content
---- error_code: 410
-
-
-
-=== TEST 17: exit(404) after I/O
---- config
-    error_page 400 /400.html;
-    error_page 404 /404.html;
-    location /foo {
-        access_by_lua '
-            ngx.location.capture("/sleep")
-            ngx.exit(ngx.HTTP_NOT_FOUND)
-        ';
-        echo Hello;
-    }
-
-    location /sleep {
-        echo_sleep 0.002;
-    }
---- user_files
->>> 400.html
-Bad request, dear...
->>> 404.html
-Not found, dear...
---- request
-    GET /bah
---- response_body
-Not found, dear...
---- error_code: 404
diff --git a/debian/modules/http-lua/t/024-access/mixed.t b/debian/modules/http-lua/t/024-access/mixed.t
deleted file mode 100644
index a9f8039..0000000
--- a/debian/modules/http-lua/t/024-access/mixed.t
+++ /dev/null
@@ -1,261 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2 + 4);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: access I/O with content I/O
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc {
-        set $memc_key $echo_request_uri;
-        set $memc_exptime 600;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /lua {
-        access_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            print("access GET: ", res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            print("access PUT: ", res.status);
-
-            res = ngx.location.capture("/memc");
-            print("access cached: ", res.body);
-        ';
-
-        content_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            ngx.say("content GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            ngx.say("content PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            ngx.say("content cached: " .. res.body);
-        ';
-    }
---- request
-GET /lua
---- response_body
-content GET: 404
-content PUT: 201
-content cached: hello
---- grep_error_log eval: qr/access .+?(?= while )/
---- grep_error_log_out
-access GET: 404
-access PUT: 201
-access cached: hello
-
---- log_level: info
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 2: share data via nginx variables
---- config
-    location /foo {
-        set $foo '';
-        access_by_lua '
-            ngx.var.foo = 32
-        ';
-
-        content_by_lua '
-            ngx.say(tonumber(ngx.var.foo) * 2)
-        ';
-    }
---- request
-    GET /foo
---- response_body
-64
-
-
-
-=== TEST 3: share the request body (need request body explicitly off)
---- config
-    location /echo_body {
-        lua_need_request_body off;
-        set $res '';
-        access_by_lua '
-            ngx.var.res = ngx.var.request_body or "nil"
-        ';
-        content_by_lua '
-            ngx.say(ngx.var.res or "nil")
-            ngx.say(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body
-nil
-nil
-
-
-
-=== TEST 4: share the request body (need request body off by default)
---- config
-    location /echo_body {
-        #lua_need_request_body off;
-        set $res '';
-        access_by_lua '
-            ngx.var.res = ngx.var.request_body or "nil"
-        ';
-        content_by_lua '
-            ngx.say(ngx.var.res or "nil")
-            ngx.say(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body
-nil
-nil
-
-
-
-=== TEST 5: share the request body (need request body on)
---- config
-    location /echo_body {
-        lua_need_request_body on;
-        set $res '';
-        access_by_lua '
-            ngx.var.res = ngx.var.request_body or "nil"
-        ';
-        content_by_lua '
-            ngx.say(ngx.var.res or "nil")
-            ngx.say(ngx.var.request_body or "nil")
-        ';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff
-hello\x00\x01\x02
-world\x03\x04\xff
-"
-
-
-
-=== TEST 6: rewrite I/O with access I/O with content I/O
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc {
-        set $memc_key $echo_request_uri;
-        set $memc_exptime 600;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /lua {
-        rewrite_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            print("rewrite GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            print("rewrite PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            print("rewrite cached: " .. res.body);
-        ';
-
-        access_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            print("access GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            print("access PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            print("access cached: " .. res.body);
-        ';
-
-        content_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            ngx.say("content GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            ngx.say("content PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            ngx.say("content cached: " .. res.body);
-
-        ';
-    }
---- request
-GET /lua
---- response_body
-content GET: 404
-content PUT: 201
-content cached: hello
-
---- grep_error_log eval: qr/(?:rewrite|access) .+?(?= while )/
---- grep_error_log_out
-rewrite GET: 404
-rewrite PUT: 201
-rewrite cached: hello
-access GET: 404
-access PUT: 201
-access cached: hello
-
---- log_level: info
-
-
-
-=== TEST 7: I/O in access shortcuts content automatically
---- config
-    location = /t {
-        access_by_lua_block {
-            ngx.print("")
-        }
-
-        echo ok;
-    }
---- request
-    GET /t
---- response_body
diff --git a/debian/modules/http-lua/t/024-access/multi-capture.t b/debian/modules/http-lua/t/024-access/multi-capture.t
deleted file mode 100644
index 930b74d..0000000
--- a/debian/modules/http-lua/t/024-access/multi-capture.t
+++ /dev/null
@@ -1,394 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(10);
-
-plan tests => blocks() * repeat_each() * 2;
-
-#$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
-$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /foo {
-        access_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-    location /a {
-        echo -n a;
-    }
-    location /b {
-        echo -n b;
-    }
---- request
-    GET /foo
---- response_body
-res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-
-
-
-=== TEST 2: 4 concurrent requests
---- config
-    location /foo {
-        access_by_lua '
-            local res1, res2, res3, res4 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-                { "/c" },
-                { "/d" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-
-            ngx.say("res3.status = " .. res3.status)
-            ngx.say("res3.body = " .. res3.body)
-
-            ngx.say("res4.status = " .. res4.status)
-            ngx.say("res4.body = " .. res4.body)
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/([a-d])$' {
-        echo -n $1;
-    }
---- request
-    GET /foo
---- response_body
-res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-res3.status = 200
-res3.body = c
-res4.status = 200
-res4.body = d
-
-
-
-=== TEST 3: capture multi in series
---- config
-    location /foo {
-        access_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-
-            res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("2 res1.status = " .. res1.status)
-            ngx.say("2 res1.body = " .. res1.body)
-            ngx.say("2 res2.status = " .. res2.status)
-            ngx.say("2 res2.body = " .. res2.body)
-
-        ';
-        content_by_lua return;
-    }
-    location /a {
-        echo -n a;
-    }
-    location /b {
-        echo -n b;
-    }
---- request
-    GET /foo
---- response_body
-res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-2 res1.status = 200
-2 res1.body = a
-2 res2.status = 200
-2 res2.body = b
-
-
-
-=== TEST 4: capture multi in subrequest
---- config
-    location /foo {
-        rewrite_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-
-            local n = ngx.var.arg_n
-
-            ngx.say(n .. " res1.status = " .. res1.status)
-            ngx.say(n .. " res1.body = " .. res1.body)
-            ngx.say(n .. " res2.status = " .. res2.status)
-            ngx.say(n .. " res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-
-    location /main {
-        access_by_lua '
-            res = ngx.location.capture("/foo?n=1")
-            ngx.say("top res.status = " .. res.status)
-            ngx.say("top res.body = [" .. res.body .. "]")
-        ';
-        content_by_lua return;
-    }
-
-    location /a {
-        echo -n a;
-    }
-
-    location /b {
-        echo -n b;
-    }
---- request
-    GET /main
---- response_body
-top res.status = 200
-top res.body = [1 res1.status = 200
-1 res1.body = a
-1 res2.status = 200
-1 res2.body = b
-]
-
-
-
-=== TEST 5: capture multi in parallel
---- config
-    location ~ '^/(foo|bar)$' {
-        set $tag $1;
-        rewrite_by_lua '
-            local res1, res2
-            if ngx.var.tag == "foo" then
-                res1, res2 = ngx.location.capture_multi{
-                    { "/a" },
-                    { "/b" },
-                }
-            else
-                res1, res2 = ngx.location.capture_multi{
-                    { "/c" },
-                    { "/d" },
-                }
-            end
-
-            local n = ngx.var.arg_n
-
-            ngx.say(n .. " res1.status = " .. res1.status)
-            ngx.say(n .. " res1.body = " .. res1.body)
-            ngx.say(n .. " res2.status = " .. res2.status)
-            ngx.say(n .. " res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-
-    location /main {
-        access_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/foo?n=1" },
-                { "/bar?n=2" },
-            }
-
-            ngx.say("top res1.status = " .. res1.status)
-            ngx.say("top res1.body = [" .. res1.body .. "]")
-            ngx.say("top res2.status = " .. res2.status)
-            ngx.say("top res2.body = [" .. res2.body .. "]")
-        ';
-        content_by_lua return;
-    }
-
-    location ~ '^/([abcd])$' {
-        echo -n $1;
-    }
---- request
-    GET /main
---- response_body
-top res1.status = 200
-top res1.body = [1 res1.status = 200
-1 res1.body = a
-1 res2.status = 200
-1 res2.body = b
-]
-top res2.status = 200
-top res2.body = [2 res1.status = 200
-2 res1.body = c
-2 res2.status = 200
-2 res2.body = d
-]
-
-
-
-=== TEST 6: memc sanity
---- config
-    location /foo {
-        access_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/[ab]$' {
-        set $memc_key $uri;
-        set $memc_value hello;
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-    GET /foo
---- response_body eval
-"res1.status = 201
-res1.body = STORED\r
-
-res2.status = 201
-res2.body = STORED\r
-
-"
-
-
-
-=== TEST 7: memc muti + multi
---- config
-    location /main {
-        access_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/foo?n=1" },
-                { "/bar?n=2" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = [" .. res1.body .. "]")
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = [" .. res2.body .. "]")
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/(foo|bar)$' {
-        set $tag $1;
-        rewrite_by_lua '
-            local res1, res2
-            if ngx.var.tag == "foo" then
-                res1, res2 = ngx.location.capture_multi{
-                    { "/a" },
-                    { "/b" },
-                }
-            else
-                res1, res2 = ngx.location.capture_multi{
-                    { "/c" },
-                    { "/d" },
-                }
-            end
-            print("args: " .. ngx.var.args)
-            local n = ngx.var.arg_n
-            ngx.say(n .. " res1.status = " .. res1.status)
-            ngx.say(n .. " res1.body = " .. res1.body)
-            ngx.say(n .. " res2.status = " .. res2.status)
-            ngx.say(n .. " res2.body = " .. res2.body)
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/[abcd]$' {
-        set $memc_key $uri;
-        set $memc_value hello;
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-    GET /main
---- response_body eval
-"res1.status = 200
-res1.body = [1 res1.status = 201
-1 res1.body = STORED\r
-
-1 res2.status = 201
-1 res2.body = STORED\r
-
-]
-res2.status = 200
-res2.body = [2 res1.status = 201
-2 res1.body = STORED\r
-
-2 res2.status = 201
-2 res2.body = STORED\r
-
-]
-"
-
-
-
-=== TEST 8: memc 4 concurrent requests
---- config
-    location /foo {
-        access_by_lua '
-            local res1, res2, res3, res4 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-                { "/c" },
-                { "/d" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-
-            ngx.say("res3.status = " .. res3.status)
-            ngx.say("res3.body = " .. res3.body)
-
-            ngx.say("res4.status = " .. res4.status)
-            ngx.say("res4.body = " .. res4.body)
-        ';
-        content_by_lua return;
-    }
-    location ~ '^/[a-d]$' {
-        set $memc_key $uri;
-        set $memc_value hello;
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-    GET /foo
---- response_body eval
-"res1.status = 201
-res1.body = STORED\r
-
-res2.status = 201
-res2.body = STORED\r
-
-res3.status = 201
-res3.body = STORED\r
-
-res4.status = 201
-res4.body = STORED\r
-
-"
diff --git a/debian/modules/http-lua/t/024-access/on-abort.t b/debian/modules/http-lua/t/024-access/on-abort.t
deleted file mode 100644
index 5bb948b..0000000
--- a/debian/modules/http-lua/t/024-access/on-abort.t
+++ /dev/null
@@ -1,651 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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")
-        ';
-    }
-
-    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.6
---- ignore_response
---- error_log eval
-[
-'client prematurely closed connection',
-'on abort called',
-qr/lua user thread aborted: runtime error: access_by_lua\(nginx\.conf:\d+\):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_like chop
-^create 2 in 1
-lua check broken conn
-(?: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")
-        ';
-    }
---- 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;
-        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")
-        ';
-    }
---- 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;
-        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)
-        ';
-    }
---- 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;
-        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)
-        ';
-    }
---- 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]
diff --git a/debian/modules/http-lua/t/024-access/redirect.t b/debian/modules/http-lua/t/024-access/redirect.t
deleted file mode 100644
index b45fac7..0000000
--- a/debian/modules/http-lua/t/024-access/redirect.t
+++ /dev/null
@@ -1,124 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => blocks() * repeat_each() * 3;
-
-#no_diff();
-#no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: default 302
---- config
-    location /read {
-        access_by_lua '
-            ngx.redirect("http://www.taobao.com/foo");
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-Location: http://www.taobao.com/foo
---- response_body_like: 302 Found
---- error_code: 302
-
-
-
-=== TEST 2: explicit 302
---- config
-    location /read {
-        access_by_lua '
-            ngx.redirect("http://www.taobao.com/foo", ngx.HTTP_MOVED_TEMPORARILY);
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-Location: http://www.taobao.com/foo
---- response_body_like: 302 Found
---- error_code: 302
-
-
-
-=== TEST 3: explicit 301
---- config
-    location /read {
-        access_by_lua '
-            ngx.redirect("http://www.taobao.com/foo", ngx.HTTP_MOVED_PERMANENTLY);
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-Location: http://www.taobao.com/foo
---- response_body_like: 301 Moved Permanently
---- error_code: 301
-
-
-
-=== TEST 4: bad rc
---- config
-    location /read {
-        access_by_lua '
-            ngx.redirect("http://www.taobao.com/foo", 404);
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-!Location
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 5: no args
---- config
-    location /read {
-        access_by_lua '
-            ngx.redirect()
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- response_headers
-!Location
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 6: relative uri
---- config
-    location /read {
-        access_by_lua '
-            ngx.redirect("/foo")
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-    }
---- request
-GET /read
---- raw_response_headers_like: Location: /foo\r\n
---- response_body_like: 302 Found
---- error_code: 302
diff --git a/debian/modules/http-lua/t/024-access/req-body.t b/debian/modules/http-lua/t/024-access/req-body.t
deleted file mode 100644
index 70db85c..0000000
--- a/debian/modules/http-lua/t/024-access/req-body.t
+++ /dev/null
@@ -1,220 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 19);
-
-#no_diff();
-#no_long_string();
-#master_on();
-#workers(2);
-run_tests();
-
-__DATA__
-
-=== TEST 1: read buffered body
---- config
-    location = /test {
-        access_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-        ';
-        content_by_lua return;
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
-
-
-
-=== TEST 2: read buffered body (timed out)
---- config
-    client_body_timeout 1ms;
-    location = /test {
-        access_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-        ';
-        content_by_lua return;
-    }
---- raw_request eval
-"POST /test HTTP/1.1\r
-Host: localhost\r
-Content-Length: 100\r
-Connection: close\r
-\r
-hello, world"
---- response_body:
---- error_code_like: ^(?:500)?$
-
-
-
-=== TEST 3: read buffered body and then subrequest
---- config
-    location /foo {
-        echo -n foo;
-    }
-    location = /test {
-        access_by_lua '
-            ngx.req.read_body()
-            local res = ngx.location.capture("/foo");
-            ngx.say(ngx.var.request_body)
-            ngx.say("sub: ", res.body)
-        ';
-        content_by_lua return;
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
-sub: foo
-
-
-
-=== TEST 4: first subrequest and then read buffered body
---- config
-    location /foo {
-        echo -n foo;
-    }
-    location = /test {
-        access_by_lua '
-            local res = ngx.location.capture("/foo");
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-            ngx.say("sub: ", res.body)
-        ';
-        content_by_lua return;
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
-sub: foo
-
-
-
-=== TEST 5: failed to write 100 continue
---- config
-    location = /test {
-        access_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-            ngx.exit(200)
-        ';
-    }
---- request
-POST /test
-hello, world
---- more_headers
-Expect: 100-Continue
---- ignore_response
---- no_error_log
-[alert]
-[error]
-http finalize request: 500, "/test?" a:1, c:0
-
-
-
-=== TEST 6: not discard body (exit 200)
---- config
-    location = /foo {
-        access_by_lua '
-            -- ngx.req.discard_body()
-            ngx.say("body: ", ngx.var.request_body)
-            ngx.exit(200)
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-["body: nil\n",
-"body: hiya, world\n",
-]
---- error_code eval
-[200, 200]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 7: not discard body (exit 201)
---- config
-    location = /foo {
-        access_by_lua '
-            -- ngx.req.discard_body()
-            ngx.say("body: ", ngx.var.request_body)
-            ngx.exit(201)
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-["body: nil\n",
-"body: hiya, world\n",
-]
---- error_code eval
-[200, 200]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 8: not discard body (exit 302)
---- config
-    location = /foo {
-        access_by_lua '
-            -- ngx.req.discard_body()
-            -- ngx.say("body: ", ngx.var.request_body)
-            ngx.redirect("/blah")
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-[qr/302 Found/,
-"body: hiya, world\n",
-]
---- error_code eval
-[302, 200]
---- no_error_log
-[error]
-[alert]
diff --git a/debian/modules/http-lua/t/024-access/request_body.t b/debian/modules/http-lua/t/024-access/request_body.t
deleted file mode 100644
index fa03195..0000000
--- a/debian/modules/http-lua/t/024-access/request_body.t
+++ /dev/null
@@ -1,172 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('debug'); # to ensure any log-level can be outputted
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: test reading request body
---- config
-    location /echo_body {
-        lua_need_request_body on;
-        access_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff"
-
-
-
-=== TEST 2: test not reading request body
---- config
-    location /echo_body {
-        lua_need_request_body off;
-        access_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 3: test default setting (not reading request body)
---- config
-    location /echo_body {
-        access_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 4: test main conf
---- http_config
-    lua_need_request_body on;
---- config
-    location /echo_body {
-        access_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff"
-
-
-
-=== TEST 5: test server conf
---- config
-    lua_need_request_body on;
-
-    location /echo_body {
-        access_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"hello\x00\x01\x02
-world\x03\x04\xff"
-
-
-
-=== TEST 6: test override main conf
---- http_config
-    lua_need_request_body on;
---- config
-    location /echo_body {
-        lua_need_request_body off;
-        access_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 7: test override server conf
---- config
-    lua_need_request_body on;
-
-    location /echo_body {
-        lua_need_request_body off;
-        access_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request eval
-"POST /echo_body
-hello\x00\x01\x02
-world\x03\x04\xff"
---- response_body eval
-"nil"
-
-
-
-=== TEST 8: Expect: 100-Continue
---- config
-    location /echo_body {
-        lua_need_request_body on;
-        access_by_lua '
-            ngx.print(ngx.var.request_body or "nil")
-            ngx.exit(200)
-        ';
-    }
---- request
-POST /echo_body
-hello world
---- more_headers
-Expect: 100-Continue
---- ignore_response
---- no_error_log
-[error]
-[alert]
-http finalize request: 500, "/echo_body?" a:1, c:2
-http finalize request: 500, "/echo_body?" a:1, c:0
---- log_level: debug
diff --git a/debian/modules/http-lua/t/024-access/sanity.t b/debian/modules/http-lua/t/024-access/sanity.t
deleted file mode 100644
index 7ff177f..0000000
--- a/debian/modules/http-lua/t/024-access/sanity.t
+++ /dev/null
@@ -1,743 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#log_level('warn');
-#no_nginx_manager();
-#master_on();
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 11);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: basic print
---- config
-    location /lua {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        access_by_lua 'ngx.print("Hello, Lua!\\n")';
-        content_by_lua return;
-        #content_by_lua 'ngx.say("Hi")';
-    }
---- request
-GET /lua
---- response_body
-Hello, Lua!
-
-
-
-=== TEST 2: basic say
---- config
-    location /say {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        access_by_lua '
-            ngx.say("Hello, Lua!")
-            ngx.say("Yay! ", 123)';
-
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /say
---- response_body
-Hello, Lua!
-Yay! 123
-
-
-
-=== TEST 3: no ngx.echo
---- config
-    location /lua {
-        access_by_lua 'ngx.echo("Hello, Lua!\\n")';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 4: variable
---- config
-    location /lua {
-        # NOTE: the newline escape sequence must be double-escaped, as nginx config
-        # parser will unescape first!
-        access_by_lua 'v = ngx.var["request_uri"] ngx.print("request_uri: ", v, "\\n")';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua?a=1&b=2
---- response_body
-request_uri: /lua?a=1&b=2
-
-
-
-=== TEST 5: variable (file)
---- config
-    location /lua {
-        access_by_lua_file html/test.lua;
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- response_body
-request_uri: /lua?a=1&b=2
-
-
-
-=== TEST 6: calc expression
---- config
-    location /lua {
-        access_by_lua_file html/calc.lua;
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- user_files
->>> calc.lua
-local function uri_unescape(uri)
-    local function convert(hex)
-        return string.char(tonumber("0x"..hex))
-    end
-    local s = string.gsub(uri, "%%([0-9a-fA-F][0-9a-fA-F])", convert)
-    return s
-end
-
-local function eval_exp(str)
-    return loadstring("return "..str)()
-end
-
-local exp_str = ngx.var["arg_exp"]
--- print("exp: '", exp_str, "'\n")
-local status, res
-status, res = pcall(uri_unescape, exp_str)
-if not status then
-    ngx.print("error: ", res, "\n")
-    return
-end
-status, res = pcall(eval_exp, res)
-if status then
-    ngx.print("result: ", res, "\n")
-else
-    ngx.print("error: ", res, "\n")
-end
---- request
-GET /lua?exp=1%2B2*math.sin(3)%2Fmath.exp(4)-math.sqrt(2)
---- response_body
-result: -0.4090441561579
-
-
-
-=== TEST 7: read $arg_xxx
---- config
-    location = /lua {
-        access_by_lua 'who = ngx.var.arg_who
-            ngx.print("Hello, ", who, "!")';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua?who=agentzh
---- response_body chomp
-Hello, agentzh!
-
-
-
-=== TEST 8: capture location
---- config
-    location /other {
-        echo "hello, world";
-    }
-
-    location /lua {
-        access_by_lua '
-res = ngx.location.capture("/other")
-ngx.print("status=", res.status, " ")
-ngx.print("body=", res.body)
-';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-status=200 body=hello, world
-
-
-
-=== TEST 9: capture non-existed location
---- config
-    location /lua {
-        access_by_lua 'res = ngx.location.capture("/other"); ngx.print("status=", res.status)';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body: status=404
-
-
-
-=== TEST 10: invalid capture location (not as expected...)
---- config
-    location /lua {
-        access_by_lua 'res = ngx.location.capture("*(#*"); ngx.say("res=", res.status)';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-res=404
-
-
-
-=== TEST 11: nil is "nil"
---- config
-    location /lua {
-        access_by_lua 'ngx.say(nil)';
-        content_by_lua return;
-    }
---- request
-GET /lua
---- response_body
-nil
-
-
-
-=== TEST 12: write boolean
---- config
-    location /lua {
-        access_by_lua 'ngx.say(true, " ", false)';
-        content_by_lua return;
-    }
---- request
-GET /lua
---- response_body
-true false
-
-
-
-=== TEST 13: bad argument type to ngx.location.capture
---- config
-    location /lua {
-        access_by_lua 'ngx.location.capture(nil)';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 14: capture location (default 0);
---- config
- location /recur {
-       access_by_lua '
-           local num = tonumber(ngx.var.arg_num) or 0;
-           ngx.print("num is: ", num, "\\n");
-
-           if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
-               ngx.print("status=", res.status, " ");
-               ngx.print("body=", res.body, "\\n");
-           else
-               ngx.print("end\\n");
-           end
-           ';
-
-           content_by_lua 'ngx.exit(ngx.OK)';
-   }
---- request
-GET /recur
---- response_body
-num is: 0
-end
-
-
-
-=== TEST 15: capture location
-access phase not running in subrequests
---- config
- location /recur {
-       access_by_lua '
-           local num = tonumber(ngx.var.arg_num) or 0;
-           ngx.print("num is: ", num, "\\n");
-
-           if (num > 0) then
-               res = ngx.location.capture("/recur?num="..tostring(num - 1));
-               ngx.print("status=", res.status, " ");
-               ngx.print("body=", res.body);
-           else
-               ngx.print("end\\n");
-           end
-           ';
-
-           content_by_lua 'ngx.exit(ngx.OK)';
-   }
---- request
-GET /recur?num=3
---- response_body chomp
-num is: 3
-status=200 body=
-
-
-
-=== TEST 16: setting nginx variables from within Lua
---- config
- location /set {
-       set $a "";
-       access_by_lua 'ngx.var.a = 32; ngx.say(ngx.var.a)';
-       content_by_lua 'ngx.exit(ngx.OK)';
-       add_header Foo $a;
-   }
---- request
-GET /set
---- response_headers
-Foo: 32
---- response_body
-32
-
-
-
-=== TEST 17: nginx quote sql string 1
---- config
- location /set {
-       set $a 'hello\n\r\'"\\'; # this runs after access_by_lua
-       access_by_lua 'ngx.say(ngx.quote_sql_str(ngx.var.a))';
-       content_by_lua 'ngx.exit(ngx.OK)';
-   }
---- request
-GET /set
---- response_body
-'hello\n\r\'\"\\'
-
-
-
-=== TEST 18: nginx quote sql string 2
---- config
-location /set {
-    #set $a "hello\n\r'\"\\";
-    access_by_lua 'ngx.say(ngx.quote_sql_str("hello\\n\\r\'\\"\\\\"))';
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /set
---- response_body
-'hello\n\r\'\"\\'
-
-
-
-=== TEST 19: use dollar
---- config
-location /set {
-    access_by_lua '
-        local s = "hello 112";
-        ngx.say(string.find(s, "%d+$"))';
-
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /set
---- response_body
-79
-
-
-
-=== TEST 20: subrequests do not share variables of main requests by default
---- config
-location /sub {
-    echo $a;
-}
-location /parent {
-    set $a 12;
-    access_by_lua 'res = ngx.location.capture("/sub"); ngx.print(res.body)';
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /parent
---- response_body eval: "\n"
-
-
-
-=== TEST 21: subrequests can share variables of main requests
---- config
-location /sub {
-    echo $a;
-}
-location /parent {
-    set $a '';
-    access_by_lua '
-        ngx.var.a = 12;
-        res = ngx.location.capture(
-            "/sub",
-            { share_all_vars = true }
-        );
-        ngx.print(res.body)
-    ';
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /parent
---- response_body
-12
-
-
-
-=== TEST 22: main requests use subrequests' variables
---- config
-location /sub {
-    set $a 12;
-}
-location /parent {
-    access_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = true });
-        ngx.say(ngx.var.a)
-    ';
-
-    content_by_lua 'ngx.exit(ngx.OK)';
-}
---- request
-GET /parent
---- response_body
-12
-
-
-
-=== TEST 23: main requests do NOT use subrequests' variables
---- config
-location /sub {
-    set $a 12;
-    content_by_lua return;
-}
-
-location /parent {
-    access_by_lua '
-        res = ngx.location.capture("/sub", { share_all_vars = false });
-        ngx.say(ngx.var.a)
-    ';
-    content_by_lua return;
-}
---- request
-GET /parent
---- response_body_like eval: "\n"
-
-
-
-=== TEST 24: capture location headers
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo "hello, world";
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", res.header["Content-Type"]);
-        ';
-
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-type: foo/bar
-
-
-
-=== TEST 25: capture location headers
---- config
-    location /other {
-        default_type 'foo/bar';
-        rewrite_by_lua '
-            ngx.header.Bar = "Bah";
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", res.header["Content-Type"]);
-            ngx.say("Bar: ", res.header["Bar"]);
-        ';
-
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-type: foo/bar
-Bar: Bah
-
-
-
-=== TEST 26: capture location headers
---- config
-    location /other {
-        default_type 'foo/bar';
-        access_by_lua '
-            ngx.header.Bar = "Bah";
-            ngx.header.Bar = nil;
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/other");
-            ngx.say("type: ", res.header["Content-Type"]);
-            ngx.say("Bar: ", res.header["Bar"] or "nil");
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-type: foo/bar
-Bar: nil
-
-
-
-=== TEST 27: access_by_lua runs after ngx_access
---- config
-    location /lua {
-        deny all;
-
-        access_by_lua '
-            ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
-        ';
-
-        content_by_lua return;
-    }
---- request
-GET /lua
---- response_body_like: 403 Forbidden
---- error_code: 403
-
-
-
-=== TEST 28: auth_request runs before ngx_access
---- config
-    location /lua {
-        deny all;
-
-        auth_request /auth;
-
-        content_by_lua return;
-    }
---- request
-GET /lua
---- response_body_like: 403 Forbidden
---- error_code: 403
---- SKIP
-
-
-
-=== TEST 29: access_by_lua shouldn't send headers automatically (on simple return)
---- config
-    location /lua {
-        access_by_lua 'return';
-
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-
-    location = /foo {
-        default_type 'text/css';
-        add_header Bar Baz;
-        echo foo;
-    }
---- request
-GET /lua
---- response_headers
-Bar: Baz
-Content-Type: text/css
---- response_body
-foo
-
-
-
-=== TEST 30: access_by_lua shouldn't send headers automatically (on simple exit)
---- config
-    location /lua {
-        access_by_lua 'ngx.exit(ngx.OK)';
-
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-
-    location = /foo {
-        default_type 'text/css';
-        add_header Bar Baz;
-        echo foo;
-    }
---- request
-GET /lua
---- response_headers
-Bar: Baz
-Content-Type: text/css
---- response_body
-foo
-
-
-
-=== TEST 31: short circuit
---- config
-    location /lua {
-        access_by_lua '
-            ngx.say("Hi")
-            ngx.eof()
-            ngx.exit(ngx.HTTP_OK)
-        ';
-
-        content_by_lua '
-            print("HERE")
-            ngx.print("BAD")
-        ';
-    }
---- request
-GET /lua
---- response_body
-Hi
-
-
-
-=== TEST 32: nginx vars in script path
---- config
-    location ~ ^/lua/(.+)$ {
-        access_by_lua_file html/$1.lua;
-
-        content_by_lua '
-            print("HERE")
-            ngx.print("BAD")
-        ';
-    }
---- user_files
->>> hi.lua
-ngx.say("Hi")
-ngx.eof()
-ngx.exit(ngx.HTTP_OK)
---- request
-GET /lua/hi
---- response_body
-Hi
-
-
-
-=== TEST 33: phase postponing works for various locations (access phase not running in subrequest)
---- config
-    location ~ '^/lua/(.+)' {
-        set $path $1;
-        access_by_lua 'ngx.say(ngx.var.path)';
-        content_by_lua return;
-    }
-    location ~ '^/lua2/(.+)' {
-        set $path $1;
-        access_by_lua 'ngx.say(ngx.var.path)';
-        content_by_lua return;
-    }
-    location /main {
-        echo_location /lua/foo;
-        echo_location /lua/bar;
-        echo_location /lua2/baz;
-        echo_location /lua2/bah;
-    }
---- request
-GET /main
---- response_body
-
-
-
-=== TEST 34: server access_by_lua
---- config
-    access_by_lua 'ngx.header["X-Foo"] = "bar" -- ngx.send_headers()';
---- request
-GET /
---- response_body chop
-<html><head><title>It works!</title></head><body>It works!</body></html>
---- response_headers
-X-Foo: bar
-
-
-
-=== TEST 35: server access_by_lua_file
---- config
-    access_by_lua_file html/foo.lua;
---- user_files
->>> foo.lua
-ngx.header["X-Foo"] = "bar" -- ngx.send_headers()
---- request
-GET /
---- response_body chop
-<html><head><title>It works!</title></head><body>It works!</body></html>
---- response_headers
-X-Foo: bar
-
-
-
-=== TEST 36: Lua file does not exist
---- config
-    location /lua {
-        access_by_lua_file html/test2.lua;
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- response_body_like: 404 Not Found
---- error_code: 404
---- error_log eval
-qr/failed to load external Lua file ".*?test2\.lua": cannot open .*? No such file or directory/
-
-
-
-=== TEST 37: use of ngx.say() in access_by_lua without exiting with 200+.
---- config
-    location /t {
-        access_by_lua "ngx.say('test')";
-        echo_exec /t2;
-    }
---- request
-    GET /t
---- response_body
-test
---- no_error_log
-[alert]
-
-
-
-=== TEST 38: use of ngx.say() in access_by_lua without exiting with 200+. (with explicit ngx.eof())
---- config
-    location /t {
-        access_by_lua "ngx.say('test') ngx.eof()";
-        echo_exec /t2;
-    }
---- request
-    GET /t
---- response_body
-test
---- no_error_log
-[alert]
-
-
-
-=== TEST 39: use of ngx.say() in access_by_lua without exiting with 200+. (with IO)
---- config
-    location /t {
-        access_by_lua "ngx.say('test') ngx.sleep(0.001)";
-        echo_exec /t2;
-    }
---- request
-    GET /t
---- response_body
-test
---- no_error_log
-[alert]
diff --git a/debian/modules/http-lua/t/024-access/satisfy.t b/debian/modules/http-lua/t/024-access/satisfy.t
deleted file mode 100644
index 7902f49..0000000
--- a/debian/modules/http-lua/t/024-access/satisfy.t
+++ /dev/null
@@ -1,211 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-worker_connections(1014);
-#master_on();
-#workers(4);
-#log_level('warn');
-no_root_location();
-
-#repeat_each(2);
-#repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-our $HtmlDir = html_dir;
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: satisfy any
---- config
-    location /test {
-        satisfy any;
-        allow all;
-        access_by_lua 'ngx.exit(403)';
-
-        echo something important;
-    }
---- request
-    GET /test
---- more_headers
---- response_body
-something important
---- no_error_log
-[error]
-
-
-
-=== TEST 2: satisfy any
---- config
-    location /test {
-        satisfy any;
-        deny all;
-        access_by_lua 'ngx.exit(403)';
-
-        echo something important;
-    }
---- request
-    GET /test
---- more_headers
---- response_body_like: 403 Forbidden
---- error_code: 403
---- error_log
-access forbidden by rule
-
-
-
-=== TEST 3: satisfy any (explicit ngx.exit(0))
---- config
-    location /test {
-        satisfy any;
-        deny all;
-        access_by_lua 'ngx.exit(0)';
-
-        echo something important;
-    }
---- request
-    GET /test
---- more_headers
---- response_body
-something important
---- error_code: 200
---- no_error_log
-[error]
-
-
-
-=== TEST 4: satisfy any (simple return)
---- config
-    location /test {
-        satisfy any;
-        deny all;
-        access_by_lua return;
-
-        echo something important;
-    }
---- request
-    GET /test
---- more_headers
---- response_body
-something important
---- error_code: 200
---- no_error_log
-[error]
-
-
-
-=== TEST 5: satisfy any (declined)
---- config
-    location /test {
-        satisfy any;
-        deny all;
-        access_by_lua 'ngx.exit(ngx.DECLINED)';
-
-        echo something important;
-    }
---- request
-    GET /test
---- more_headers
---- response_body_like: 403 Forbidden
---- error_code: 403
---- error_log
-access forbidden by rule
-
-
-
-=== TEST 6: satisfy any (declined, with I/O)
---- config
-    location /test {
-        satisfy any;
-        deny all;
-        access_by_lua 'ngx.location.capture("/echo") ngx.exit(ngx.DECLINED)';
-
-        echo something important;
-    }
-
-    location /echo {
-        echo hi;
-        #echo_sleep 0.01;
-    }
---- request
-    GET /test
---- more_headers
---- response_body_like: 403 Forbidden
---- error_code: 403
---- error_log
-access forbidden by rule
-
-
-
-=== TEST 7: satisfy any (simple return, with I/O)
---- config
-    location /test {
-        satisfy any;
-        deny all;
-        access_by_lua 'ngx.location.capture("/echo") return';
-
-        echo something important;
-    }
-
-    location /echo {
-        echo hi;
-    }
---- request
-    GET /test
---- more_headers
---- response_body
-something important
---- error_code: 200
---- no_error_log
-[error]
-
-
-
-=== TEST 8: satisfy any - with I/O
---- config
-    location /test {
-        satisfy any;
-        deny all;
-        access_by_lua 'ngx.location.capture("/echo") ngx.exit(403)';
-
-        echo something important;
-    }
-
-    location /echo {
-        echo hi;
-    }
---- request
-    GET /test
---- more_headers
---- response_body_like: 403 Forbidden
---- error_code: 403
---- error_log
-access forbidden by rule
-
-
-
-=== TEST 9: satisfy any (explicit ngx.exit(0), with I/O)
---- config
-    location /test {
-        satisfy any;
-        deny all;
-        access_by_lua 'ngx.location.capture("/echo") ngx.exit(0)';
-
-        echo something important;
-    }
-
-    location /echo {
-        echo hi;
-    }
---- request
-    GET /test
---- more_headers
---- response_body
-something important
---- error_code: 200
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/024-access/sleep.t b/debian/modules/http-lua/t/024-access/sleep.t
deleted file mode 100644
index fc1fc02..0000000
--- a/debian/modules/http-lua/t/024-access/sleep.t
+++ /dev/null
@@ -1,221 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#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/http-lua/t/024-access/subrequest.t b/debian/modules/http-lua/t/024-access/subrequest.t
deleted file mode 100644
index b6ccf11..0000000
--- a/debian/modules/http-lua/t/024-access/subrequest.t
+++ /dev/null
@@ -1,601 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: DELETE
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_DELETE });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-DELETE
-
-
-
-=== TEST 2: DELETE (proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_DELETE });
-
-            ngx.print(res.body)
-        ';
-
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-DELETE
-
-
-
-=== TEST 3: POST (nobody, proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_POST });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-POST
-
-
-
-=== TEST 4: HEAD
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_HEAD });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-
-
-
-=== TEST 5: explicit GET
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_GET });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET
-
-
-
-=== TEST 6: implicit GET
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo")
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET
-
-
-
-=== TEST 7: implicit GET (empty option table)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo $echo_request_method;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo", {})
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET
-
-
-
-=== TEST 8: PUT (nobody, proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo_read_request_body;
-
-        echo $echo_request_method;
-        echo_request_body;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_PUT, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body chomp
-PUT
-hello
-
-
-
-=== TEST 9: PUT (nobody, no proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        #echo_read_request_body;
-
-        echo $echo_request_method;
-        #echo $echo_request_body;
-        echo_request_body;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_PUT, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body chomp
-PUT
-hello
-
-
-
-=== TEST 10: PUT (nobody, no proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        #echo_read_request_body;
-
-        echo $echo_request_method;
-        #echo $echo_request_body;
-        echo_request_body;
-        #echo "[$http_content_length]";
-        echo;
-    }
-
-    location /foo {
-        echo $echo_request_method;
-        echo -n "[$http_content_length]";
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/other",
-                { method = ngx.HTTP_PUT, body = "hello" });
-
-            ngx.print(res.body)
-
-            res = ngx.location.capture("/foo")
-            ngx.say(res.body)
-
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-PUT
-hello
-GET
-[]
-
-
-
-=== TEST 11: POST (with body, proxy method)
---- config
-    location /other {
-        default_type 'foo/bar';
-        echo_read_request_body;
-
-        echo $echo_request_method;
-        echo_request_body;
-    }
-
-    location /foo {
-        proxy_pass http://127.0.0.1:$server_port/other;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { method = ngx.HTTP_POST, body = "hello" });
-
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body chomp
-POST
-hello
-
-
-
-=== TEST 12: POST (with body, memc method)
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc {
-        set $memc_key $echo_request_uri;
-        set $memc_exptime 600;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /lua {
-        access_by_lua '
-            ngx.location.capture("/flush");
-
-            res = ngx.location.capture("/memc");
-            ngx.say("GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello" });
-            ngx.say("PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc");
-            ngx.say("cached: " .. res.body);
-
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET: 404
-PUT: 201
-cached: hello
-
-
-
-=== TEST 13: POST (with body, memc method)
---- config
-    location /flush {
-        set $memc_cmd flush_all;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /memc {
-        set $memc_cmd "";
-        set $memc_key $echo_request_uri;
-        set $memc_exptime 600;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location /lua {
-        access_by_lua '
-            ngx.location.capture("/flush",
-                { share_all_vars = true });
-
-            res = ngx.location.capture("/memc",
-                { share_all_vars = true });
-            ngx.say("GET: " .. res.status);
-
-            res = ngx.location.capture("/memc",
-                { method = ngx.HTTP_PUT, body = "hello", share_all_vars = true });
-            ngx.say("PUT: " .. res.status);
-
-            res = ngx.location.capture("/memc", { share_all_vars = true });
-            ngx.say("cached: " .. res.body);
-
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-GET: 404
-PUT: 201
-cached: hello
-
-
-
-=== TEST 14: empty args option table
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = {} })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body eval: "\n"
-
-
-
-=== TEST 15: non-empty args option table (1 pair)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { ["fo="] = "=>" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-fo%3D=%3D%3E
-
-
-
-=== TEST 16: non-empty args option table (2 pairs)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { ["fo="] = "=>",
-                    ["="] = ":" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like chop
-^(?:fo%3D=%3D%3E\&%3D=%3A|%3D=%3A\&fo%3D=%3D%3E)$
-
-
-
-=== TEST 17: non-empty args option table (2 pairs, no special chars)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { foo = 3,
-                    bar = "hello" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like chop
-^(?:bar=hello\&foo=3|foo=3\&bar=hello)$
-
-
-
-=== TEST 18: non-empty args option table (number key)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { [57] = "hi" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 19: non-empty args option table (plain arrays)
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo",
-                { args = { "hi" } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 20: more args
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo?a=3",
-                { args = { b = 4 } })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-a=3&b=4
-
-
-
-=== TEST 21: more args
---- config
-    location /foo {
-        echo $query_string;
-    }
-
-    location /lua {
-        access_by_lua '
-            res = ngx.location.capture("/foo?a=3",
-                { args = "b=4" })
-            ngx.print(res.body)
-        ';
-        content_by_lua 'ngx.exit(ngx.OK)';
-    }
---- request
-GET /lua
---- response_body
-a=3&b=4
-
-
-
-=== TEST 22: I/O in named location
-the nginx core requires the patch https://github.com/agentzh/ngx_openresty/blob/master/patches/nginx-1.0.15-reset_wev_handler_in_named_locations.patch
---- config
-    location /t {
-        echo_exec @named;
-    }
-
-    location @named {
-        access_by_lua '
-            ngx.location.capture("/hello")
-        ';
-        echo done;
-    }
-
-    location /hello {
-        echo hello;
-    }
---- request
-    GET /t
---- response_body
-done
diff --git a/debian/modules/http-lua/t/024-access/uthread-exec.t b/debian/modules/http-lua/t/024-access/uthread-exec.t
deleted file mode 100644
index 7add3d4..0000000
--- a/debian/modules/http-lua/t/024-access/uthread-exec.t
+++ /dev/null
@@ -1,346 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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")
-        ';
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
-
-    location = /foo {
-        echo hello world;
-    }
---- 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 == 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
diff --git a/debian/modules/http-lua/t/024-access/uthread-exit.t b/debian/modules/http-lua/t/024-access/uthread-exit.t
deleted file mode 100644
index 02c2a1f..0000000
--- a/debian/modules/http-lua/t/024-access/uthread-exit.t
+++ /dev/null
@@ -1,1313 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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")
-        ';
-    }
---- 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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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 {
-        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")
-        ';
-    }
---- 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
-
---- wait: 0.1
---- 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 agentzh.org;
-        resolver_timeout 12s;
-        access_by_lua '
-            function f()
-                ngx.say("hello in thread")
-                ngx.sleep(0.001)
-                ngx.exit(0)
-            end
-
-            ngx.say("before")
-            ngx.thread.spawn(f)
-            ngx.say("after")
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 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 == 1) {
-        timers[$arg1] = $arg2
-        printf("add timer %d\n", $arg2)
-    }
-}
-
-M(timer-del) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        printf("delete timer %d\n", tm)
-        delete timers[$arg1]
-    }
-    /*
-    if (tm == 12000) {
-        print_ubacktrace()
-    }
-    */
-}
-
-M(timer-expire) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        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 1
-resolving agentzh.org
-add timer 12000
-expire timer 1
-terminate 2: ok
-delete thread 2
-lua tcp resolve cleanup
-delete timer 12000
-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 agentzh.org;
-        resolver_timeout 12s;
-        access_by_lua '
-            function f()
-                ngx.say("hello in thread")
-                ngx.sleep(0.001)
-                ngx.exit(0)
-            end
-
-            ngx.say("before")
-            ngx.thread.spawn(f)
-            ngx.say("after")
-            local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("agentzh.org", 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 == 1) {
-        timers[$arg1] = $arg2
-        printf("add timer %d\n", $arg2)
-    }
-}
-
-M(timer-del) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        printf("delete timer %d\n", tm)
-        delete timers[$arg1]
-    }
-    /*
-    if (tm == 12000) {
-        print_ubacktrace()
-    }
-    */
-}
-
-M(timer-expire) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        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 1
-resolving agentzh.org
-add timer 12000
-expire timer 1
-terminate 2: ok
-delete thread 2
-lua udp resolve cleanup
-delete timer 12000
-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 {
-        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("172.105.207.225", 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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")
-        ';
-    }
---- 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-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 {
-        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")
-        ';
-    }
---- 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-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 {
-        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")
-        ';
-    }
---- 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
-delete thread 2
-lua udp socket cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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")
-        ';
-    }
---- 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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")
-        ';
-    }
---- 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
-delete thread 2
-lua req body cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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")
-        ';
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
---- 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 == 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
-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")
-        ';
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
---- 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 == 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
-
---- wait: 0.1
---- 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")
-        ';
-    }
-
-    location = /echo {
-        echo hello;
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
---- 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 == 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
-
---- wait: 0.1
---- response_body
-end
---- error_log
-attempt to abort with pending subrequests
diff --git a/debian/modules/http-lua/t/024-access/uthread-redirect.t b/debian/modules/http-lua/t/024-access/uthread-redirect.t
deleted file mode 100644
index 4eb4759..0000000
--- a/debian/modules/http-lua/t/024-access/uthread-redirect.t
+++ /dev/null
@@ -1,189 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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")
-        ';
-    }
-
-    location = /echo {
-        echo hello;
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
---- 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 == 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 {
-        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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-delete thread 1
-free request
-
---- wait: 0.1
---- response_body_like: 302 Found
---- error_code: 302
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/024-access/uthread-spawn.t b/debian/modules/http-lua/t/024-access/uthread-spawn.t
deleted file mode 100644
index 7c7ba3b..0000000
--- a/debian/modules/http-lua/t/024-access/uthread-spawn.t
+++ /dev/null
@@ -1,1118 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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")
-        ';
-    }
---- 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
-
---- 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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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
-
---- wait: 0.1
---- 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")
-        ';
-    }
---- 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 eval
-qr/lua user thread aborted: runtime error: access_by_lua\(nginx\.conf:\d+\):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")
-        ';
-    }
-
-    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 {
-        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)
-        ';
-    }
-
-    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 {
-        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
-
---- 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)
-        ';
-    }
-
-    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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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))
-        ';
-    }
---- 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 {
-        access_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 {
-        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))
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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)
-        ';
-    }
---- 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 {
-        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)
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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 {
-        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")
-        ';
-    }
---- 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]
diff --git a/debian/modules/http-lua/t/025-codecache.t b/debian/modules/http-lua/t/025-codecache.t
deleted file mode 100644
index 20791d7..0000000
--- a/debian/modules/http-lua/t/025-codecache.t
+++ /dev/null
@@ -1,1246 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * 155;
-
-#$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
-
-no_long_string();
-
-our $HtmlDir = html_dir;
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-check_accum_error_log();
-run_tests();
-
-__DATA__
-
-=== TEST 1: code cache on by default
---- config
-    location /lua {
-        content_by_lua_file html/test.lua;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
-            f:write("ngx.say(101)")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-ngx.say(32)
---- request
-GET /main
---- response_body
-32
-updated
-32
---- no_error_log
-[alert]
-
-
-
-=== TEST 2: code cache explicitly on
---- config
-    location /lua {
-        lua_code_cache on;
-        content_by_lua_file html/test.lua;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
-            f:write("ngx.say(101)")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-ngx.say(32)
---- request
-GET /main
---- response_body
-32
-updated
-32
---- no_error_log
-[alert]
-
-
-
-=== TEST 3: code cache explicitly off
---- config
-    location /lua {
-        lua_code_cache off;
-        content_by_lua_file html/test.lua;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
-            f:write("ngx.say(101)")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-ngx.say(32)
---- request
-GET /main
---- response_body
-32
-updated
-101
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 4: code cache explicitly off (server level)
---- config
-    lua_code_cache off;
-
-    location /lua {
-        content_by_lua_file html/test.lua;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
-            f:write("ngx.say(101)")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-ngx.say(32)
---- request
-GET /main
---- response_body
-32
-updated
-101
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 5: code cache explicitly off (server level) but be overridden in the location
---- config
-    lua_code_cache off;
-
-    location /lua {
-        lua_code_cache on;
-        content_by_lua_file html/test.lua;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
-            f:write("ngx.say(101)")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-ngx.say(32)
---- request
-GET /main
---- response_body
-32
-updated
-32
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 6: code cache explicitly off (affects require) + content_by_lua
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    location /lua {
-        lua_code_cache off;
-        content_by_lua '
-            local foo = require "foo";
-        ';
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
-            f:write("module(..., package.seeall); ngx.say(102);")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> foo.lua
-module(..., package.seeall); ngx.say(32);
---- request
-GET /main
---- response_body
-32
-updated
-102
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 7: code cache explicitly off (affects require) + content_by_lua_file
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    location /lua {
-        lua_code_cache off;
-        content_by_lua_file html/test.lua;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
-            f:write("module(..., package.seeall); ngx.say(102);")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-local foo = require "foo";
->>> foo.lua
-module(..., package.seeall); ngx.say(32);
---- request
-GET /main
---- response_body
-32
-updated
-102
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 8: code cache explicitly off (affects require) + set_by_lua_file
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    location /lua {
-        lua_code_cache off;
-        set_by_lua_file $a html/test.lua;
-        echo $a;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
-            f:write("module(..., package.seeall); return 102;")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-return require "foo"
->>> foo.lua
-module(..., package.seeall); return 32;
---- request
-GET /main
---- response_body
-32
-updated
-102
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 9: code cache explicitly on (affects require) + set_by_lua_file
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    location /lua {
-        lua_code_cache on;
-        set_by_lua_file $a html/test.lua;
-        echo $a;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/foo.lua", "w"))
-            f:write("module(..., package.seeall); return 102;")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-return require "foo"
->>> foo.lua
-module(..., package.seeall); return 32;
---- request
-GET /main
---- response_body
-32
-updated
-32
---- no_error_log
-[alert]
-
-
-
-=== TEST 10: code cache explicitly off + set_by_lua_file
---- config
-    location /lua {
-        lua_code_cache off;
-        set_by_lua_file $a html/test.lua;
-        echo $a;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
-            f:write("return 101")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-return 32
---- request
-GET /main
---- response_body
-32
-updated
-101
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 11: code cache explicitly on + set_by_lua_file
---- config
-    location /lua {
-        lua_code_cache on;
-        set_by_lua_file $a html/test.lua;
-        echo $a;
-    }
-    location /update {
-        content_by_lua '
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("t/servroot/html/test.lua", "w"))
-            f:write("return 101")
-            f:close()
-            ngx.say("updated")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /update;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-return 32
---- request
-GET /main
---- response_body
-32
-updated
-32
---- no_error_log
-[alert]
-
-
-
-=== TEST 12: no clear builtin lib "string"
---- config
-    location /lua {
-        lua_code_cache off;
-        content_by_lua_file html/test.lua;
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /lua;
-    }
---- user_files
->>> test.lua
-ngx.say(string.len("hello"))
-ngx.say(table.concat({1,2,3}, ", "))
---- request
-    GET /main
---- response_body
-5
-1, 2, 3
-5
-1, 2, 3
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 13: no clear builtin lib "string"
---- config
-    location /lua {
-        lua_code_cache off;
-        content_by_lua '
-            ngx.say(string.len("hello"))
-            ngx.say(table.concat({1,2,3}, ", "))
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /lua;
-    }
---- request
-    GET /main
---- response_body
-5
-1, 2, 3
-5
-1, 2, 3
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 14: no clear builtin lib "string"
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    lua_code_cache off;
-    location /lua {
-        content_by_lua '
-            local test = require("test")
-        ';
-    }
-    location /main {
-        echo_location /lua;
-        echo_location /lua;
-    }
---- request
-    GET /main
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-string = require("string")
-math = require("math")
-io = require("io")
-os = require("os")
-table = require("table")
-coroutine = require("coroutine")
-package = require("package")
-ngx.say("OK")
---- response_body
-OK
-OK
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 15: do not skip luarocks
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
-     lua_code_cache off;"
---- config
-    location /main {
-        echo_location /load;
-        echo_location /check;
-        echo_location /check;
-    }
-
-    location /load {
-        content_by_lua '
-            package.loaded.luarocks = nil;
-            local foo = require "luarocks";
-            foo.hi()
-        ';
-    }
-
-    location /check {
-        content_by_lua '
-            local foo = package.loaded.luarocks
-            if foo then
-                ngx.say("found")
-            else
-                ngx.say("not found")
-            end
-        ';
-    }
---- request
-GET /main
---- user_files
->>> luarocks.lua
-module(..., package.seeall);
-
-ngx.say("loading");
-
-function hi ()
-    ngx.say("hello, foo")
-end;
---- response_body
-loading
-hello, foo
-not found
-not found
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 16: do not skip luarocks*
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';
-     lua_code_cache off;"
---- config
-    location /main {
-        echo_location /load;
-        echo_location /check;
-        echo_location /check;
-    }
-
-    location /load {
-        content_by_lua '
-            package.loaded.luarocks2 = nil;
-            local foo = require "luarocks2";
-            foo.hi()
-        ';
-    }
-
-    location /check {
-        content_by_lua '
-            local foo = package.loaded.luarocks2
-            if foo then
-                ngx.say("found")
-            else
-                ngx.say("not found")
-            end
-        ';
-    }
---- request
-GET /main
---- user_files
->>> luarocks2.lua
-module(..., package.seeall);
-
-ngx.say("loading");
-
-function hi ()
-    ngx.say("hello, foo")
-end;
---- response_body
-loading
-hello, foo
-not found
-not found
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== 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
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 18: github #257: globals cleared when code cache off
---- http_config
-    lua_code_cache off;
-    init_by_lua '
-      test = setfenv(
-        function()
-          ngx.say(tostring(table))
-        end,
-        setmetatable({},
-        {
-          __index = function(self, key)
-          return rawget(self, key) or _G[key]
-        end
-      }))';
---- config
-    location = /t {
-        content_by_lua 'test()';
-    }
---- request
-GET /t
---- response_body_like chop
-^table: 0x\d*?[1-9a-fA-F]
---- no_error_log
-[error]
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 19: lua_code_cache off + FFI-based Lua modules
---- http_config
-    lua_code_cache off;
-    lua_package_path "$prefix/html/?.lua;;";
-
---- config
-    location = /t {
-        content_by_lua '
-            if not jit then
-                ngx.say("skipped for non-LuaJIT")
-            else
-                local test = require("test")
-                ngx.say("test module loaded: ", test and true or false)
-                collectgarbage()
-            end
-        ';
-    }
---- user_files
->>> test.lua
-local ffi = require "ffi"
-
-ffi.cdef[[
-    int my_test_function_here(void *p);
-    int my_test_function_here2(void *p);
-    int my_test_function_here3(void *p);
-]]
-
-return {
-}
---- request
-GET /t
---- response_body_like chop
-^(?:skipped for non-LuaJIT|test module loaded: true)$
---- no_error_log
-[error]
---- error_log eval
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-
-
-
-=== TEST 20: ngx.timer.* + ndk
---- config
-    lua_code_cache off;
-    location /read {
-        echo ok;
-        log_by_lua '
-            ngx.timer.at(0, function ()
-                local foo = ndk.set_var.set_unescape_uri("a%20b")
-                ngx.log(ngx.WARN, "foo = ", foo)
-            end)
-        ';
-    }
---- request
-GET /read
---- response_body
-ok
---- wait: 0.1
---- no_error_log
-[error]
---- error_log eval
-["foo = a b",
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/
-]
-
-
-
-=== TEST 21: set ngx.ctx before internal redirects performed by other nginx modules (with log_by_lua)
---- config
-    lua_code_cache off;
-    location = /t {
-        rewrite_by_lua '
-            ngx.ctx.foo = "hello world";
-        ';
-        echo_exec /foo;
-    }
-
-    location = /foo {
-        echo hello;
-        log_by_lua return;
-    }
---- request
-GET /t
---- response_body
-hello
---- no_error_log
-[error]
---- log_level: debug
---- error_log eval
-["lua release ngx.ctx at ref",
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"lua close the global Lua VM",
-]
-
-
-
-=== TEST 22: set by lua file
---- config
-    lua_code_cache off;
-    location /lua {
-        set_by_lua_file $res html/a.lua $arg_a $arg_b;
-        echo $res;
-    }
---- user_files
->>> a.lua
-return ngx.arg[1] + ngx.arg[2]
---- request
-GET /lua?a=5&b=2
---- response_body
-7
---- no_error_log
-[error]
---- error_log eval
-[qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"lua close the global Lua VM",
-]
-
-
-
-=== TEST 23: simple set by lua
---- config
-    lua_code_cache off;
-    location /lua {
-        set_by_lua $res "return 1+1";
-        echo $res;
-    }
---- request
-GET /lua
---- response_body
-2
---- no_error_log
-[error]
---- error_log eval
-[
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"lua close the global Lua VM",
-]
-
-
-
-=== TEST 24: lua_max_pending_timers - chained timers (non-zero delay) - not exceeding
---- http_config
-    lua_max_pending_timers 1;
-    lua_code_cache off;
-
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                local ok, err = ngx.timer.at(0.01, g)
-                if not ok then
-                    fail("failed to set timer: ", err)
-                    return
-                end
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-decrementing the reference count for Lua VM: 3
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"trace: [m][f][g]",
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"lua close the global Lua VM",
-"decrementing the reference count for Lua VM: 2",
-"decrementing the reference count for Lua VM: 1",
-]
-
-
-
-=== TEST 25: lua variable sharing via upvalue
---- http_config
-    lua_code_cache off;
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local foo
-            local function f()
-                foo = 3
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.06)
-            ngx.say("foo = ", foo)
-        ';
-    }
---- request
-GET /t
---- response_body
-registered timer
-foo = 3
-
---- wait: 0.1
---- no_error_log
-[error]
-decrementing the reference count for Lua VM: 3
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"lua close the global Lua VM",
-"decrementing the reference count for Lua VM: 2",
-"decrementing the reference count for Lua VM: 1",
-]
-
-
-
-=== TEST 26: lua_max_running_timers (just not enough)
---- http_config
-    lua_max_running_timers 1;
---- config
-    lua_code_cache off;
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local f, g
-
-            g = function ()
-                ngx.sleep(0.01)
-                collectgarbage()
-            end
-
-            f = function ()
-                ngx.sleep(0.01)
-                collectgarbage()
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer f: ", err)
-                return
-            end
-            local ok, err = ngx.timer.at(0, g)
-            if not ok then
-                ngx.say("failed to set timer g: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-
---- error_log eval
-[
-"1 lua_max_running_timers are not enough",
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"decrementing the reference count for Lua VM: 3",
-"decrementing the reference count for Lua VM: 2",
-"decrementing the reference count for Lua VM: 1",
-"lua close the global Lua VM",
-]
-
-
-
-=== TEST 27: GC issue with the on_abort thread object
---- config
-    lua_code_cache off;
-    location = /t {
-        lua_check_client_abort on;
-        content_by_lua '
-            ngx.on_abort(function () end)
-            collectgarbage()
-            ngx.sleep(1)
-        ';
-    }
---- request
-    GET /t
---- abort
---- timeout: 0.2
---- wait: 1
---- ignore_response
---- no_error_log
-[error]
-decrementing the reference count for Lua VM: 2
-decrementing the reference count for Lua VM: 3
---- error_log eval
-["decrementing the reference count for Lua VM: 1",
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"lua close the global Lua VM",
-]
-
-
-
-=== TEST 28: multiple parallel timers
---- config
-    lua_code_cache off;
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                fail("failed to set timer: ", err)
-                return
-            end
-            local ok, err = ngx.timer.at(0.01, g)
-            if not ok then
-                fail("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-decrementing the reference count for Lua VM: 4
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"trace: [m][f][g]",
-"decrementing the reference count for Lua VM: 3",
-"decrementing the reference count for Lua VM: 2",
-"decrementing the reference count for Lua VM: 1",
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"lua close the global Lua VM",
-]
-
-
-
-=== TEST 29: cosocket connection pool timeout (after Lua VM destroys)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    lua_code_cache off;
-    location = /t {
-        set $port $TEST_NGINX_MEMCACHED_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
-
-    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(1)
-    if not ok then
-        ngx.say("failed to set reusable: ", err)
-    end
-end
---- request
-GET /t
---- response_body
-connected: 1, reused: 0
-request sent: 11
-received: OK
---- no_error_log
-[error]
-lua tcp socket keepalive max idle timeout
-
---- error_log eval
-[
-qq{lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"},
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-qr/\blua tcp socket keepalive: free connection pool [0-9A-F]+ for "127.0.0.1:/,
-]
-
-
-
-=== TEST 30: cosocket connection pool timeout (before Lua VM destroys)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    lua_code_cache off;
-    location = /t {
-        set $port $TEST_NGINX_MEMCACHED_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
-
-    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(1)
-    if not ok then
-        ngx.say("failed to set reusable: ", err)
-    end
-    ngx.sleep(0.01)
-end
---- request
-GET /t
---- response_body
-connected: 1, reused: 0
-request sent: 11
-received: OK
---- no_error_log
-[error]
---- error_log eval
-[
-qq{lua tcp socket keepalive create connection pool for key "127.0.0.1:$ENV{TEST_NGINX_MEMCACHED_PORT}"},
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"lua tcp socket keepalive: free connection pool for ",
-"lua tcp socket keepalive max idle timeout",
-]
-
-
-
-=== TEST 31: lua_max_running_timers (just not enough, also low lua_max_pending_timers)
---- http_config
-    lua_max_running_timers 1;
-    lua_max_pending_timers 10;
---- config
-    lua_code_cache off;
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local f, g
-
-            g = function ()
-                ngx.sleep(0.01)
-                collectgarbage()
-            end
-
-            f = function ()
-                ngx.sleep(0.01)
-                collectgarbage()
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer f: ", err)
-                return
-            end
-            local ok, err = ngx.timer.at(0, g)
-            if not ok then
-                ngx.say("failed to set timer g: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-
---- error_log eval
-[
-"1 lua_max_running_timers are not enough",
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/\[alert\] \S+ lua_code_cache is off; this will hurt performance/,
-"decrementing the reference count for Lua VM: 3",
-"decrementing the reference count for Lua VM: 2",
-"decrementing the reference count for Lua VM: 1",
-"lua close the global Lua VM",
-]
diff --git a/debian/modules/http-lua/t/026-mysql.t b/debian/modules/http-lua/t/026-mysql.t
deleted file mode 100644
index 569f96f..0000000
--- a/debian/modules/http-lua/t/026-mysql.t
+++ /dev/null
@@ -1,130 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-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;
-
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: when mysql query timed out, kill that query by Lua
---- http_config
-    upstream backend {
-        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 = /mysql {
-        #internal;
-        drizzle_send_query_timeout 100ms;
-        #drizzle_send_query_timeout 1s;
-        drizzle_query $echo_request_body;
-        drizzle_pass backend;
-
-        #error_page 504 /ret/504;
-        rds_json on;
-        more_set_headers -s 504 "X-Mysql-Tid: $drizzle_thread_id";
-    }
-
-    location /lua {
-        content_by_lua '
-            local sql = "select sleep(5)"
-            local res = ngx.location.capture("/mysql",
-                { method = ngx.HTTP_POST, body = sql })
-
-            ngx.say("status = " .. res.status)
-
-            local tid = res.header["X-Mysql-Tid"]
-            if tid == nil then
-                ngx.say("thread id = nil")
-                return
-            end
-
-            tid = tonumber(tid)
-            ngx.say("thread id = " .. tid)
-
-            res = ngx.location.capture("/mysql",
-                { method = ngx.HTTP_POST,
-                  body = "kill query " .. tid })
-
-            ngx.say("kill status = " .. res.status)
-            ngx.say("kill body = " .. res.body)
-        ';
-    }
---- request
-    GET /lua
---- response_body_like
-^status = 504
-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}
-
-
-
-=== TEST 2: no error pages
---- http_config
-    upstream backend {
-        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 @err { echo Hi; }
-    error_page 504 = @err;
-    location = /mysql {
-        #internal;
-        drizzle_send_query_timeout 100ms;
-        #drizzle_send_query_timeout 1s;
-        drizzle_query $echo_request_body;
-        drizzle_pass backend;
-
-        no_error_pages;
-
-        rds_json on;
-        more_set_headers -s 504 "X-Mysql-Tid: $drizzle_thread_id";
-    }
-
-    location /lua {
-        content_by_lua '
-            local sql = "select sleep(3)"
-            local res = ngx.location.capture("/mysql",
-                { method = ngx.HTTP_POST, body = sql })
-
-            ngx.say("status = " .. res.status)
-
-            local tid = res.header["X-Mysql-Tid"]
-            if tid == nil then
-                ngx.say("thread id = nil")
-                return
-            end
-
-            tid = tonumber(tid)
-            ngx.say("thread id = " .. tid)
-
-            res = ngx.location.capture("/mysql",
-                { method = ngx.HTTP_POST,
-                  body = "kill query " .. tid })
-
-            ngx.say("kill status = " .. res.status)
-            ngx.say("kill body = " .. res.body)
-        ';
-    }
---- request
-    GET /lua
---- response_body_like
-^status = 504
-thread id = \d+
-kill status = 200
-kill body = \{"errcode":0\}$
---- SKIP
diff --git a/debian/modules/http-lua/t/027-multi-capture.t b/debian/modules/http-lua/t/027-multi-capture.t
deleted file mode 100644
index 9227fe5..0000000
--- a/debian/modules/http-lua/t/027-multi-capture.t
+++ /dev/null
@@ -1,754 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(10);
-
-plan tests => repeat_each() * (blocks() * 2 + 4);
-
-#$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
-$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#log_level 'warn';
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /foo {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-        ';
-    }
-    location /a {
-        echo -n a;
-    }
-    location /b {
-        echo -n b;
-    }
---- request
-    GET /foo
---- response_body
-res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-
-
-
-=== TEST 2: 4 concurrent requests
---- config
-    location /foo {
-        content_by_lua '
-            local res1, res2, res3, res4 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-                { "/c" },
-                { "/d" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-
-            ngx.say("res3.status = " .. res3.status)
-            ngx.say("res3.body = " .. res3.body)
-
-            ngx.say("res4.status = " .. res4.status)
-            ngx.say("res4.body = " .. res4.body)
-        ';
-    }
-    location ~ '^/([a-d])$' {
-        echo -n $1;
-    }
---- request
-    GET /foo
---- response_body
-res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-res3.status = 200
-res3.body = c
-res4.status = 200
-res4.body = d
-
-
-
-=== TEST 3: capture multi in series
---- config
-    location /foo {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-
-            res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("2 res1.status = " .. res1.status)
-            ngx.say("2 res1.body = " .. res1.body)
-            ngx.say("2 res2.status = " .. res2.status)
-            ngx.say("2 res2.body = " .. res2.body)
-
-        ';
-    }
-    location /a {
-        echo -n a;
-    }
-    location /b {
-        echo -n b;
-    }
---- request
-    GET /foo
---- response_body
-res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-2 res1.status = 200
-2 res1.body = a
-2 res2.status = 200
-2 res2.body = b
-
-
-
-=== TEST 4: capture multi in subrequest
---- config
-    location /foo {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-
-            local n = ngx.var.arg_n
-
-            ngx.say(n .. " res1.status = " .. res1.status)
-            ngx.say(n .. " res1.body = " .. res1.body)
-            ngx.say(n .. " res2.status = " .. res2.status)
-            ngx.say(n .. " res2.body = " .. res2.body)
-        ';
-    }
-
-    location /main {
-        content_by_lua '
-            res = ngx.location.capture("/foo?n=1")
-            ngx.say("top res.status = " .. res.status)
-            ngx.say("top res.body = [" .. res.body .. "]")
-        ';
-    }
-
-    location /a {
-        echo -n a;
-    }
-
-    location /b {
-        echo -n b;
-    }
---- request
-    GET /main
---- response_body
-top res.status = 200
-top res.body = [1 res1.status = 200
-1 res1.body = a
-1 res2.status = 200
-1 res2.body = b
-]
-
-
-
-=== TEST 5: capture multi in parallel
---- config
-    location ~ '^/(foo|bar)$' {
-        set $tag $1;
-        content_by_lua '
-            local res1, res2
-            if ngx.var.tag == "foo" then
-                res1, res2 = ngx.location.capture_multi{
-                    { "/a" },
-                    { "/b" },
-                }
-            else
-                res1, res2 = ngx.location.capture_multi{
-                    { "/c" },
-                    { "/d" },
-                }
-            end
-
-            local n = ngx.var.arg_n
-
-            ngx.say(n .. " res1.status = " .. res1.status)
-            ngx.say(n .. " res1.body = " .. res1.body)
-            ngx.say(n .. " res2.status = " .. res2.status)
-            ngx.say(n .. " res2.body = " .. res2.body)
-        ';
-    }
-
-    location /main {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/foo?n=1" },
-                { "/bar?n=2" },
-            }
-
-            ngx.say("top res1.status = " .. res1.status)
-            ngx.say("top res1.body = [" .. res1.body .. "]")
-            ngx.say("top res2.status = " .. res2.status)
-            ngx.say("top res2.body = [" .. res2.body .. "]")
-        ';
-    }
-
-    location ~ '^/([abcd])$' {
-        echo -n $1;
-    }
---- request
-    GET /main
---- response_body
-top res1.status = 200
-top res1.body = [1 res1.status = 200
-1 res1.body = a
-1 res2.status = 200
-1 res2.body = b
-]
-top res2.status = 200
-top res2.body = [2 res1.status = 200
-2 res1.body = c
-2 res2.status = 200
-2 res2.body = d
-]
-
-
-
-=== TEST 6: memc sanity
---- config
-    location /foo {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-        ';
-    }
-    location ~ '^/[ab]$' {
-        set $memc_key $uri;
-        set $memc_value hello;
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-    GET /foo
---- response_body eval
-"res1.status = 201
-res1.body = STORED\r
-
-res2.status = 201
-res2.body = STORED\r
-
-"
-
-
-
-=== TEST 7: memc muti + multi
---- config
-    location /main {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/foo?n=1" },
-                { "/bar?n=2" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = [" .. res1.body .. "]")
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = [" .. res2.body .. "]")
-        ';
-    }
-    location ~ '^/(foo|bar)$' {
-        set $tag $1;
-        content_by_lua '
-            local res1, res2
-            if ngx.var.tag == "foo" then
-                res1, res2 = ngx.location.capture_multi{
-                    { "/a" },
-                    { "/b" },
-                }
-            else
-                res1, res2 = ngx.location.capture_multi{
-                    { "/c" },
-                    { "/d" },
-                }
-            end
-            print("args: " .. ngx.var.args)
-            local n = ngx.var.arg_n
-            ngx.say(n .. " res1.status = " .. res1.status)
-            ngx.say(n .. " res1.body = " .. res1.body)
-            ngx.say(n .. " res2.status = " .. res2.status)
-            ngx.say(n .. " res2.body = " .. res2.body)
-        ';
-    }
-    location ~ '^/[abcd]$' {
-        set $memc_key $uri;
-        set $memc_value hello;
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-    GET /main
---- response_body eval
-"res1.status = 200
-res1.body = [1 res1.status = 201
-1 res1.body = STORED\r
-
-1 res2.status = 201
-1 res2.body = STORED\r
-
-]
-res2.status = 200
-res2.body = [2 res1.status = 201
-2 res1.body = STORED\r
-
-2 res2.status = 201
-2 res2.body = STORED\r
-
-]
-"
-
-
-
-=== TEST 8: memc 4 concurrent requests
---- config
-    location /foo {
-        content_by_lua '
-            local res1, res2, res3, res4 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-                { "/c" },
-                { "/d" },
-            }
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-
-            ngx.say("res3.status = " .. res3.status)
-            ngx.say("res3.body = " .. res3.body)
-
-            ngx.say("res4.status = " .. res4.status)
-            ngx.say("res4.body = " .. res4.body)
-        ';
-    }
-    location ~ '^/[a-d]$' {
-        set $memc_key $uri;
-        set $memc_value hello;
-        set $memc_cmd set;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
---- request
-    GET /foo
---- response_body eval
-"res1.status = 201
-res1.body = STORED\r
-
-res2.status = 201
-res2.body = STORED\r
-
-res3.status = 201
-res3.body = STORED\r
-
-res4.status = 201
-res4.body = STORED\r
-
-"
-
-
-
-=== TEST 9: capture multi in series (more complex)
---- config
-    location /foo {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            local res3, res4 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            res3, res4 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-            ngx.say("res3.status = " .. res3.status)
-            ngx.say("res3.body = " .. res3.body)
-            ngx.say("res4.status = " .. res4.status)
-            ngx.say("res4.body = " .. res4.body)
-
-        ';
-    }
-    location /a {
-        echo -n a;
-    }
-    location /b {
-        echo -n b;
-    }
-    location /main {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/foo" },
-                { "/foo" },
-            }
-            local res3, res4 = ngx.location.capture_multi{
-                { "/foo" },
-                { "/foo" },
-            }
-            ngx.print(res1.body)
-            ngx.print(res2.body)
-            ngx.print(res3.body)
-            ngx.print(res4.body)
-        ';
-    }
---- request
-    GET /main
---- response_body eval
-"res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-res3.status = 200
-res3.body = a
-res4.status = 200
-res4.body = b
-" x 4
-
-
-
-=== TEST 10: capture multi in series (more complex, using memc)
---- config
-    location /foo {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            res1, res2 = ngx.location.capture_multi{
-                { "/a" },
-                { "/b" },
-            }
-            local res3, res4 = ngx.location.capture_multi{
-                { "/c" },
-                { "/d" },
-            }
-            res3, res4 = ngx.location.capture_multi{
-                { "/e" },
-                { "/f" },
-            }
-
-            ngx.say("res1.status = " .. res1.status)
-            ngx.say("res1.body = " .. res1.body)
-            ngx.say("res2.status = " .. res2.status)
-            ngx.say("res2.body = " .. res2.body)
-            ngx.say("res3.status = " .. res3.status)
-            ngx.say("res3.body = " .. res3.body)
-            ngx.say("res4.status = " .. res4.status)
-            ngx.say("res4.body = " .. res4.body)
-        ';
-    }
-
-    location /memc {
-        set $memc_key $arg_val;
-        set $memc_value $arg_val;
-        set $memc_cmd $arg_cmd;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location ~ '^/([a-f])$' {
-        set $tag $1;
-        content_by_lua '
-            ngx.location.capture("/memc?cmd=set&val=" .. ngx.var.tag)
-            local res = ngx.location.capture("/memc?cmd=get&val=" .. ngx.var.tag)
-            ngx.print(res.body)
-        ';
-    }
-
-    location /main {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/foo" },
-                { "/foo" },
-            }
-            local res3, res4 = ngx.location.capture_multi{
-                { "/foo" },
-                { "/foo" },
-            }
-            ngx.print(res1.body)
-            ngx.print(res2.body)
-            ngx.print(res3.body)
-            ngx.print(res4.body)
-        ';
-    }
---- request
-    GET /main
---- response_body2
---- response_body eval
-"res1.status = 200
-res1.body = a
-res2.status = 200
-res2.body = b
-res3.status = 200
-res3.body = e
-res4.status = 200
-res4.body = f
-" x 4
---- no_error_log eval
-["[error]", "[alert]"]
---- timeout: 10
-
-
-
-=== TEST 11: a mixture of rewrite, access, content phases
---- config
-    location /main {
-        rewrite_by_lua '
-            local res = ngx.location.capture("/a")
-            print("rewrite a: " .. res.body)
-
-            res = ngx.location.capture("/b")
-            print("rewrite b: " .. res.body)
-
-            res = ngx.location.capture("/c")
-            print("rewrite c: " .. res.body)
-        ';
-
-        access_by_lua '
-            local res = ngx.location.capture("/A")
-            print("access A: " .. res.body)
-
-            res = ngx.location.capture("/B")
-            print("access B: " .. res.body)
-        ';
-
-        content_by_lua '
-            local res = ngx.location.capture("/d")
-            ngx.say("content d: " .. res.body)
-
-            res = ngx.location.capture("/e")
-            ngx.say("content e: " .. res.body)
-
-            res = ngx.location.capture("/f")
-            ngx.say("content f: " .. res.body)
-        ';
-    }
-
-    location /memc {
-        set $memc_key $arg_val;
-        set $memc_value $arg_val;
-        set $memc_cmd $arg_cmd;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location ~ '^/([A-F])$' {
-        echo -n $1;
-    }
-
-    location ~ '^/([a-f])$' {
-        set $tag $1;
-        content_by_lua '
-            ngx.location.capture("/memc?cmd=set&val=" .. ngx.var.tag)
-            local res = ngx.location.capture("/memc?cmd=get&val=" .. ngx.var.tag)
-            ngx.print(res.body)
-        ';
-    }
---- request
-    GET /main
---- response_body
-content d: d
-content e: e
-content f: f
-
---- log_level: info
---- grep_error_log eval: qr/rewrite .+?(?= while )|access .+?(?=,)/
---- grep_error_log_out
-rewrite a: a
-rewrite b: b
-rewrite c: c
-access A: A
-access B: B
-
-
-
-=== TEST 12: a mixture of rewrite, access, content phases
---- config
-    location /main {
-        rewrite_by_lua '
-            local a, b, c = ngx.location.capture_multi{
-                {"/a"}, {"/b"}, {"/c"},
-            }
-            print("rewrite a: " .. a.body)
-            print("rewrite b: " .. b.body)
-            print("rewrite c: " .. c.body)
-        ';
-
-        access_by_lua '
-            local A, B = ngx.location.capture_multi{
-                {"/A"}, {"/B"},
-            }
-            print("access A: " .. A.body)
-            print("access B: " .. B.body)
-        ';
-
-        content_by_lua '
-            local d, e, f = ngx.location.capture_multi{
-                {"/d"}, {"/e"}, {"/f"},
-            }
-            ngx.say("content d: " .. d.body)
-            ngx.say("content e: " .. e.body)
-            ngx.say("content f: " .. f.body)
-        ';
-    }
-
-    location /memc {
-        set $memc_key $arg_val;
-        set $memc_value $arg_val;
-        set $memc_cmd $arg_cmd;
-        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-    }
-
-    location ~ '^/([A-F])$' {
-        echo -n $1;
-    }
-
-    location ~ '^/([a-f])$' {
-        set $tag $1;
-        content_by_lua '
-            ngx.location.capture("/memc?cmd=set&val=" .. ngx.var.tag)
-            local res = ngx.location.capture("/memc?cmd=get&val=" .. ngx.var.tag)
-            ngx.print(res.body)
-        ';
-    }
---- 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
-content d: d
-content e: e
-content f: f
---- log_level: info
---- grep_error_log eval: qr/rewrite .+?(?= while )|access .+?(?=,)/
---- grep_error_log_out
-rewrite a: a
-rewrite b: b
-rewrite c: c
-access A: A
-access B: B
-
-
-
-=== TEST 13: proxy_cache_lock in subrequests
---- http_config
-proxy_cache_lock on;
-proxy_cache_lock_timeout 100ms;
-proxy_connect_timeout 300ms;
-
-proxy_cache_path conf/cache levels=1:2 keys_zone=STATIC:10m inactive=10m max_size=1m;
-
---- config
-    location /foo {
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                { "/proxy" },
-                { "/proxy" },
-                { "/proxy" },
-                { "/proxy" },
-            }
-            ngx.say("ok")
-        ';
-    }
-
-    location = /proxy {
-            proxy_cache STATIC;
-            proxy_pass http://agentzh.org:12345;
-            proxy_cache_key $proxy_host$uri$args;
-            proxy_cache_valid any 1s;
-            #proxy_http_version 1.1;
-    }
---- request
-    GET /foo
---- response_body
-ok
diff --git a/debian/modules/http-lua/t/028-req-header.t b/debian/modules/http-lua/t/028-req-header.t
deleted file mode 100644
index ca92daa..0000000
--- a/debian/modules/http-lua/t/028-req-header.t
+++ /dev/null
@@ -1,2010 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (2 * blocks() + 43);
-
-#no_diff();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: random access req headers
---- config
-    location /req-header {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("Foo: ", headers["Foo"] or "nil")
-            ngx.say("Bar: ", headers["Bar"] or "nil")
-        ';
-    }
---- request
-GET /req-header
---- more_headers
-Foo: bar
-Bar: baz
---- response_body
-Foo: bar
-Bar: baz
---- log_level: debug
---- no_error_log
-lua exceeding request header limit
-
-
-
-=== TEST 2: iterating through headers
---- config
-    location /req-header {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(nil, true)
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            local h = {}
-            for k, v in pairs(headers) do
-                h[k] = v
-            end
-            ngx.say("Foo: ", h["Foo"] or "nil")
-            ngx.say("Bar: ", h["Bar"] or "nil")
-        ';
-    }
---- request
-GET /req-header
---- more_headers
-Foo: bar
-Bar: baz
---- response_body
-Foo: bar
-Bar: baz
-
-
-
-=== TEST 3: set input header
---- config
-    location /req-header {
-        rewrite_by_lua '
-            ngx.req.set_header("Foo", "new value");
-        ';
-
-        echo "Foo: $http_foo";
-    }
---- request
-GET /req-header
---- more_headers
-Foo: bar
-Bar: baz
---- response_body
-Foo: new value
-
-
-
-=== TEST 4: clear input header
---- config
-    location /req-header {
-        rewrite_by_lua '
-            ngx.req.set_header("Foo", nil);
-        ';
-
-        echo "Foo: $http_foo";
-    }
---- request
-GET /req-header
---- more_headers
-Foo: bar
-Bar: baz
---- response_body
-Foo: 
-
-
-
-=== TEST 5: rewrite content length
---- config
-    location /bar {
-        rewrite_by_lua '
-            ngx.req.set_header("Content-Length", 2048)
-        ';
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request eval
-"POST /bar\n" .
-"a" x 4096
---- response_body eval
-"a" x 2048
---- timeout: 15
-
-
-
-=== TEST 6: rewrite content length (normalized form)
---- config
-    location /bar {
-        rewrite_by_lua '
-            ngx.req.set_header("content-length", 2048)
-        ';
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request eval
-"POST /bar\n" .
-"a" x 4096
---- response_body eval
-"a" x 2048
---- timeout: 15
-
-
-
-=== TEST 7: rewrite host and user-agent
---- config
-    location /bar {
-        rewrite_by_lua '
-            ngx.req.set_header("Host", "foo")
-            ngx.req.set_header("User-Agent", "blah")
-        ';
-        echo "Host: $host";
-        echo "User-Agent: $http_user_agent";
-    }
---- request
-GET /bar
---- response_body
-Host: foo
-User-Agent: blah
-
-
-
-=== TEST 8: clear host and user-agent
-$host always has a default value and cannot be really cleared.
---- config
-    location /bar {
-        rewrite_by_lua '
-            ngx.req.set_header("Host", nil)
-            ngx.req.set_header("User-Agent", nil)
-        ';
-        echo "Host: $host";
-        echo "Host (2): $http_host";
-        echo "User-Agent: $http_user_agent";
-    }
---- request
-GET /bar
---- response_body
-Host: localhost
-Host (2): 
-User-Agent: 
-
-
-
-=== TEST 9: clear host and user-agent (the other way)
---- config
-    location /bar {
-        rewrite_by_lua '
-            ngx.req.clear_header("Host")
-            ngx.req.clear_header("User-Agent")
-            ngx.req.clear_header("X-Foo")
-        ';
-        echo "Host: $host";
-        echo "User-Agent: $http_user_agent";
-        echo "X-Foo: $http_x_foo";
-    }
---- request
-GET /bar
---- more_headers
-X-Foo: bar
---- response_body
-Host: localhost
-User-Agent: 
-X-Foo: 
-
-
-
-=== TEST 10: clear content-length
---- config
-    location /bar {
-        access_by_lua '
-            ngx.req.clear_header("Content-Length")
-        ';
-        echo "Content-Length: $http_content_length";
-    }
---- request
-POST /bar
-hello
---- more_headers
---- response_body
-Content-Length: 
-
-
-
-=== TEST 11: rewrite type
---- config
-    location /bar {
-        access_by_lua '
-            ngx.req.set_header("Content-Type", "text/css")
-        ';
-        echo "Content-Type: $content_type";
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/plain
---- response_body
-Content-Type: text/css
-
-
-
-=== TEST 12: clear type
---- config
-    location /bar {
-        access_by_lua '
-            ngx.req.clear_header("Content-Type")
-        ';
-        echo "Content-Type: $content_type";
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/plain
---- response_body
-Content-Type: 
-
-
-
-=== TEST 13: add multiple request headers
---- config
-    location /bar {
-        access_by_lua '
-            ngx.req.set_header("Foo", {"a", "b"})
-        ';
-        echo "Foo: $http_foo";
-    }
---- request
-GET /bar
---- response_body
-Foo: a
-
-
-
-=== TEST 14: add multiple request headers
---- config
-    location /bar {
-        access_by_lua '
-            ngx.req.set_header("Foo", {"a", "abc"})
-        ';
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-
-    location = /foo {
-        echo $echo_client_request_headers;
-    }
---- request
-GET /bar
---- response_body_like chomp
-\bFoo: a\r\n.*?\bFoo: abc\b
-
-
-
-=== TEST 15: set_header and clear_header should refresh ngx.req.get_headers() automatically
---- config
-    location /foo {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("Foo: ", headers["Foo"] or "nil")
-
-            ngx.req.set_header("Foo", 32)
-
-            headers, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("Foo 1: ", headers["Foo"] or "nil")
-
-            ngx.req.set_header("Foo", "abc")
-
-            headers, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("Foo 2: ", headers["Foo"] or "nil")
-
-            ngx.req.clear_header("Foo")
-
-            headers, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("Foo 3: ", headers["Foo"] or "nil")
-        ';
-    }
---- more_headers
-Foo: foo
-
---- request
-    GET /foo
---- response_body
-Foo: foo
-Foo 1: 32
-Foo 2: abc
-Foo 3: nil
-
-
-
-=== TEST 16: duplicate req headers
---- config
-    location /foo {
-        content_by_lua '
-            collectgarbage()
-            local headers, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            local vals = headers["Foo"]
-            ngx.say("value is of type ", type(vals), ".")
-            if type(vals) == "table" then
-                ngx.say("Foo takes ", #vals or "nil", " values.")
-                ngx.say("They are ", table.concat(vals, ", "), ".")
-            end
-        ';
-    }
---- more_headers
-Foo: foo
-Foo: bar
-Foo: baz
---- request
-    GET /foo
---- response_body
-value is of type table.
-Foo takes 3 values.
-They are foo, bar, baz.
-
-
-
-=== TEST 17: Accept-Encoding (scalar)
---- config
-    location /bar {
-        default_type 'text/plain';
-        rewrite_by_lua '
-            ngx.req.set_header("Accept-Encoding", "gzip")
-        ';
-        gzip on;
-        gzip_min_length  1;
-        gzip_buffers     4 8k;
-        gzip_types       text/plain;
-    }
---- user_files
-">>> bar
-" . ("hello" x 512)
---- request
-GET /bar
---- response_headers
-Content-Encoding: gzip
---- response_body_like: .{20}
-
-
-
-=== TEST 18: Accept-Encoding (table)
---- config
-    location /bar {
-        default_type 'text/plain';
-        rewrite_by_lua '
-            ngx.req.set_header("Accept-Encoding", {"gzip"})
-        ';
-        gzip on;
-        gzip_min_length  1;
-        gzip_buffers     4 8k;
-        gzip_types       text/plain;
-    }
---- user_files
-">>> bar
-" . ("hello" x 512)
---- request
-GET /bar
---- response_headers
-Content-Encoding: gzip
---- response_body_like: .{20}
-
-
-
-=== TEST 19: exceeding default max 100 header limit
---- config
-    location /lua {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers()
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(headers) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, ": ", headers[key])
-            end
-        ';
-    }
---- request
-GET /lua
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 99) {
-    $s .= "X-$i:$i\n";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 98) {
-    push @k, "x-$i";
-    $i++;
-}
-push @k, "connection: close\n";
-push @k, "host: localhost\n";
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= ": $&\n";
-    }
-}
-"err: truncated\n" . CORE::join("", @k);
---- timeout: 4
---- error_log
-lua exceeding request header limit 101 > 100
-
-
-
-=== TEST 20: NOT exceeding default max 100 header limit
---- config
-    location /lua {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers()
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(headers) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            local cnt = 0
-            for i, key in ipairs(keys) do
-                ngx.say(key, ": ", headers[key])
-                cnt = cnt + 1
-            end
-            ngx.say("found ", cnt, " headers")
-        ';
-    }
---- request
-GET /lua
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 98) {
-    $s .= "X-$i:$i\n";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 98) {
-    push @k, "x-$i";
-    $i++;
-}
-push @k, "connection: close\n";
-push @k, "host: localhost\n";
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= ": $&\n";
-    }
-}
-CORE::join("", @k) . "found 100 headers\n";
---- timeout: 4
---- no_error_log
-[error]
-lua exceeding request header limit
-
-
-
-=== TEST 21: execeeding custom max 102 header limit
---- config
-    location /lua {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(102)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(headers) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, ": ", headers[key])
-            end
-        ';
-    }
---- request
-GET /lua
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 101) {
-    $s .= "X-$i:$i\n";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 100) {
-    push @k, "x-$i";
-    $i++;
-}
-push @k, "connection: close\n";
-push @k, "host: localhost\n";
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= ": $&\n";
-    }
-}
-"err: truncated\n" . CORE::join("", @k);
---- timeout: 4
---- error_log
-lua exceeding request header limit 103 > 102
-
-
-
-=== TEST 22: NOT execeeding custom max 102 header limit
---- config
-    location /lua {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(102)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(headers) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, ": ", headers[key])
-            end
-        ';
-    }
---- request
-GET /lua
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 100) {
-    $s .= "X-$i:$i\n";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 100) {
-    push @k, "x-$i";
-    $i++;
-}
-push @k, "connection: close\n";
-push @k, "host: localhost\n";
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= ": $&\n";
-    }
-}
-CORE::join("", @k);
---- timeout: 4
---- no_error_log
-[error]
-lua exceeding request header limit
-
-
-
-=== TEST 23: custom unlimited headers
---- config
-    location /lua {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(0)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(headers) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, ": ", headers[key])
-            end
-        ';
-    }
---- request
-GET /lua
---- more_headers eval
-my $s;
-my $i = 1;
-while ($i <= 105) {
-    $s .= "X-$i:$i\n";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 105) {
-    push @k, "x-$i";
-    $i++;
-}
-push @k, "connection: close\n";
-push @k, "host: localhost\n";
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= ": $&\n";
-    }
-}
-CORE::join("", @k);
---- timeout: 4
-
-
-
-=== TEST 24: 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 25: 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 26: 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 27: 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 -n $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
-\r
-$/
---- no_error_log
-[error]
-
-
-
-=== TEST 28: 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 29: iterating through headers (raw form)
---- config
-    location /t {
-        content_by_lua '
-            local h = {}
-            local arr = {}
-            local headers, err = ngx.req.get_headers(nil, true)
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            for k, v in pairs(headers) do
-                h[k] = v
-                table.insert(arr, k)
-            end
-            table.sort(arr)
-            for i, k in ipairs(arr) do
-                ngx.say(k, ": ", h[k])
-            end
-        ';
-    }
---- request
-GET /t
---- more_headers
-My-Foo: bar
-Bar: baz
---- response_body
-Bar: baz
-Connection: close
-Host: localhost
-My-Foo: bar
-
-
-
-=== TEST 30: __index metamethod not working for "raw" mode
---- config
-    location /t {
-        content_by_lua '
-            local h, err = ngx.req.get_headers(nil, true)
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            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 31: __index metamethod not working for the default mode
---- config
-    location /t {
-        content_by_lua '
-            local h, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            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 32: 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 -n $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
-\r
-"
-
-
-
-=== TEST 33: 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 -n $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
-\r
-"
-
-
-
-=== TEST 34: 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 -n $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
-\r
-"
-
-
-
-=== TEST 35: 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 -n $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
-\r
-"
-
-
-
-=== TEST 36: raw form
---- config
-    location /t {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(0, true)
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            -- get ALL the raw headers (0 == no limit, not recommended)
-            local h = {}
-            local arr = {}
-            for k, v in pairs(headers) do
-                h[k] = v
-                table.insert(arr, k)
-            end
-            table.sort(arr)
-            for i, k in ipairs(arr) do
-                ngx.say(k, ": ", h[k])
-            end
-        ';
-    }
---- request
-GET /t
---- more_headers
-My-Foo: bar
-Bar: baz
---- response_body
-Bar: baz
-Connection: close
-Host: localhost
-My-Foo: bar
---- no_error_log
-[error]
-
-
-
-=== TEST 37: clear X-Real-IP
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("X-Real-IP", nil)
-        ';
-        echo "X-Real-IP: $http_x_real_ip";
-    }
---- request
-GET /t
---- more_headers
-X-Real-IP: 8.8.8.8
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
-        printf("rewrite: x-real-ip: %s\n",
-               user_string_n($r->headers_in->x_real_ip->value->data,
-                             $r->headers_in->x_real_ip->value->len))
-    } else {
-        println("rewrite: no x-real-ip")
-    }
-}
-
-F(ngx_http_core_content_phase) {
-    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
-        printf("content: x-real-ip: %s\n",
-               user_string_n($r->headers_in->x_real_ip->value->data,
-                             $r->headers_in->x_real_ip->value->len))
-    } else {
-        println("content: no x-real-ip")
-    }
-}
-
---- stap_out
-rewrite: x-real-ip: 8.8.8.8
-content: no x-real-ip
-
---- response_body
-X-Real-IP: 
-
---- no_error_log
-[error]
-
-
-
-=== TEST 38: set custom X-Real-IP
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("X-Real-IP", "8.8.4.4")
-        ';
-        echo "X-Real-IP: $http_x_real_ip";
-    }
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
-        printf("rewrite: x-real-ip: %s\n",
-               user_string_n($r->headers_in->x_real_ip->value->data,
-                             $r->headers_in->x_real_ip->value->len))
-    } else {
-        println("rewrite: no x-real-ip")
-    }
-
-}
-
-F(ngx_http_core_content_phase) {
-    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
-        printf("content: x-real-ip: %s\n",
-               user_string_n($r->headers_in->x_real_ip->value->data,
-                             $r->headers_in->x_real_ip->value->len))
-    } else {
-        println("content: no x-real-ip")
-    }
-}
-
---- stap_out
-rewrite: no x-real-ip
-content: x-real-ip: 8.8.4.4
-
---- response_body
-X-Real-IP: 8.8.4.4
-
---- no_error_log
-[error]
-
-
-
-=== TEST 39: clear Via
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("Via", nil)
-        ';
-        echo "Via: $http_via";
-    }
---- request
-GET /t
---- more_headers
-Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    if (@defined($r->headers_in->via) && $r->headers_in->via) {
-        printf("rewrite: via: %s\n",
-               user_string_n($r->headers_in->via->value->data,
-                             $r->headers_in->via->value->len))
-    } else {
-        println("rewrite: no via")
-    }
-}
-
-F(ngx_http_core_content_phase) {
-    if (@defined($r->headers_in->via) && $r->headers_in->via) {
-        printf("content: via: %s\n",
-               user_string_n($r->headers_in->via->value->data,
-                             $r->headers_in->via->value->len))
-    } else {
-        println("content: no via")
-    }
-}
-
---- stap_out
-rewrite: via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
-content: no via
-
---- response_body
-Via: 
-
---- no_error_log
-[error]
-
-
-
-=== TEST 40: set custom Via
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("Via", "1.0 fred, 1.1 nowhere.com (Apache/1.1)")
-        ';
-        echo "Via: $http_via";
-    }
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    if (@defined($r->headers_in->via) && $r->headers_in->via) {
-        printf("rewrite: via: %s\n",
-               user_string_n($r->headers_in->via->value->data,
-                             $r->headers_in->via->value->len))
-    } else {
-        println("rewrite: no via")
-    }
-
-}
-
-F(ngx_http_core_content_phase) {
-    if (@defined($r->headers_in->via) && $r->headers_in->via) {
-        printf("content: via: %s\n",
-               user_string_n($r->headers_in->via->value->data,
-                             $r->headers_in->via->value->len))
-    } else {
-        println("content: no via")
-    }
-}
-
---- stap_out
-rewrite: no via
-content: via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
-
---- response_body
-Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
-
---- no_error_log
-[error]
-
-
-
-=== TEST 41: set input header (with underscores in the header name)
---- config
-    location /req-header {
-        rewrite_by_lua '
-            ngx.req.set_header("foo_bar", "some value");
-        ';
-        proxy_pass http://127.0.0.1:$server_port/back;
-    }
-    location = /back {
-        echo -n $echo_client_request_headers;
-    }
---- request
-GET /req-header
---- response_body_like eval
-qr{^GET /back HTTP/1.0\r
-Host: 127.0.0.1:\d+\r
-Connection: close\r
-foo_bar: some value\r
-\r
-$}
-
-
-
-=== TEST 42: HTTP 0.9 (set & get)
---- config
-    location /foo {
-        content_by_lua '
-            ngx.req.set_header("X-Foo", "howdy");
-            local headers, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("X-Foo: ", headers["X-Foo"])
-        ';
-    }
---- raw_request eval
-"GET /foo\r\n"
---- response_headers
-! X-Foo
---- response_body
-X-Foo: nil
---- http09
---- no_error_log
-[error]
-
-
-
-=== TEST 43: HTTP 0.9 (clear)
---- config
-    location /foo {
-        content_by_lua '
-            ngx.req.set_header("X-Foo", "howdy");
-            local headers, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say("X-Foo: ", headers["X-Foo"])
-        ';
-    }
---- raw_request eval
-"GET /foo\r\n"
---- response_headers
-! X-Foo
---- response_body
-X-Foo: nil
---- http09
---- no_error_log
-[error]
-
-
-
-=== TEST 44: Host header with port and $host (github issue #292)
---- config
-    location /bar {
-        rewrite_by_lua '
-            ngx.req.set_header("Host", "agentzh.org:1984")
-        ';
-        echo "host var: $host";
-        echo "http_host var: $http_host";
-    }
---- request
-GET /bar
---- response_body
-host var: agentzh.org
-http_host var: agentzh.org:1984
-
-
-
-=== TEST 45: Host header with upper case letters and $host (github issue #292)
---- config
-    location /bar {
-        rewrite_by_lua '
-            ngx.req.set_header("Host", "agentZH.org:1984")
-        ';
-        echo "host var: $host";
-        echo "http_host var: $http_host";
-    }
---- request
-GET /bar
---- response_body
-host var: agentzh.org
-http_host var: agentZH.org:1984
-
-
-
-=== TEST 46: clear all and re-insert
---- config
-    location = /t {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(100, true)
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            local n = 0
-            for header, _ in pairs(headers) do
-                n = n + 1
-                ngx.req.clear_header(header)
-            end
-            ngx.say("got ", n, " headers")
-            local i = 0
-            for header, value in pairs(headers) do
-                i = i + 1
-                print("1: reinsert header ", header, ": ", i)
-                ngx.req.set_header(header, value)
-            end
-
-            headers, err = ngx.req.get_headers(100, true)
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            n = 0
-            for header, _ in pairs(headers) do
-                n = n + 1
-                ngx.req.clear_header(header)
-            end
-            ngx.say("got ", n, " headers")
-            -- do return end
-            local i = 0
-            for header, value in pairs(headers) do
-                i = i + 1
-                if i > 8 then
-                    break
-                end
-                print("2: reinsert header ", header, ": ", i)
-                ngx.req.set_header(header, value)
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Cache-Control: max-age=0\r
-Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36\r
-Accept-Encoding: gzip,deflate,sdch\r
-Accept-Language: en-US,en;q=0.8\r
-Cookie: test=cookie;\r
-\r
-"
---- response_body
-got 8 headers
-got 8 headers
---- no_error_log
-[error]
-
-
-
-=== TEST 47: github issue #314: ngx.req.set_header does not override request headers with multiple values
---- config
-    #lua_code_cache off;
-    location = /t {
-        content_by_lua '
-            ngx.req.set_header("AAA", "111")
-            local headers, err = ngx.req.get_headers()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-
-            ngx.say(headers["AAA"])
-        ';
-    }
---- request
-GET /t
---- more_headers
-AAA: 123
-AAA: 456
-AAA: 678
-
---- response_body
-111
---- no_error_log
-[error]
-
-
-
-=== TEST 48: clear If-Match req header
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.clear_header("if-match")
-            if not ngx.send_headers() then
-                return
-            end
-            ngx.say("test")
-        ';
-    }
---- request
-GET /t
---- more_headers
-If-Match: abc
---- response_body
-test
---- no_error_log
-[error]
-
-
-
-=== TEST 49: clear If-Unmodified-Since req header
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.clear_header("if-unmodified-since")
-            ngx.header["Last-Modified"] = "Tue, 30 Jun 2011 12:16:36 GMT"
-            if not ngx.send_headers() then
-                return
-            end
-            ngx.say("test")
-        ';
-    }
---- request
-GET /t
---- more_headers
-If-Unmodified-Since: Tue, 28 Jun 2011 12:16:36 GMT
---- response_body
-test
---- no_error_log
-[error]
-
-
-
-=== TEST 50: clear If-None-Match req header
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.clear_header("if-none-match")
-            -- ngx.header["etags"] = "abc"
-            if not ngx.send_headers() then
-                return
-            end
-            ngx.say("test")
-        ';
-    }
---- request
-GET /t
---- more_headers
-If-None-Match: *
---- response_body
-test
---- no_error_log
-[error]
-
-
-
-=== TEST 51: set the Destination request header for WebDav
---- config
-    location = /a.txt {
-        rewrite_by_lua_block {
-            ngx.req.set_header("Destination", "/b.txt")
-        }
-        dav_methods MOVE;
-        dav_access            all:rw;
-        root                  html;
-    }
-
---- user_files
->>> a.txt
-hello, world!
-
---- request
-MOVE /a.txt
-
---- response_body
---- no_error_log
-client sent no "Destination" header
-[error]
---- error_code: 204
-
-
-
-=== TEST 52: X-Forwarded-For
---- config
-    location = /t {
-        access_by_lua_block {
-            ngx.req.set_header("X-Forwarded-For", "8.8.8.8")
-        }
-        proxy_pass http://127.0.0.1:$server_port/back;
-        proxy_set_header Foo $proxy_add_x_forwarded_for;
-    }
-
-    location = /back {
-        echo "Foo: $http_foo";
-    }
-
---- request
-GET /t
-
---- response_body
-Foo: 8.8.8.8, 127.0.0.1
---- no_error_log
-[error]
-
-
-
-=== TEST 53: X-Forwarded-For
---- config
-    location = /t {
-        access_by_lua_block {
-            ngx.req.clear_header("X-Forwarded-For")
-        }
-        proxy_pass http://127.0.0.1:$server_port/back;
-        proxy_set_header Foo $proxy_add_x_forwarded_for;
-    }
-
-    location = /back {
-        echo "Foo: $http_foo";
-    }
-
---- request
-GET /t
-
---- more_headers
-X-Forwarded-For: 8.8.8.8
---- response_body
-Foo: 127.0.0.1
---- no_error_log
-[error]
-
-
-
-=== TEST 54: for bad requests (bad request method letter case)
---- config
-    error_page 400 = /err;
-
-    location = /err {
-        content_by_lua_block {
-            ngx.req.set_header("Foo", "bar")
-            ngx.say("ok")
-        }
-    }
---- raw_request
-GeT / HTTP/1.1
---- response_body
-ok
---- no_error_log
-[error]
---- no_check_leak
-
-
-
-=== TEST 55: for bad requests (bad request method names)
---- config
-    error_page 400 = /err;
-
-    location = /err {
-        content_by_lua_block {
-            ngx.req.set_header("Foo", "bar")
-            ngx.say("ok")
-        }
-    }
---- raw_request
-GET x HTTP/1.1
---- response_body
-ok
---- no_error_log
-[error]
---- no_check_leak
-
-
-
-=== TEST 56: for bad requests causing segfaults when setting & getting multi-value headers
---- config
-    error_page 400 = /err;
-
-    location = /err {
-        content_by_lua_block {
-            ngx.req.set_header("Cookie", "foo=bar")
-            local test = ngx.var.cookie_bar
-
-            ngx.say("ok")
-        }
-    }
---- raw_request
-GeT / HTTP/1.1
---- response_body
-ok
---- no_error_log
-[error]
---- no_check_leak
-
-
-
-=== TEST 57: execeeding custom 3 header limit
---- config
-    location /lua {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(3)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local cnt = 0
-            for key, val in pairs(headers) do
-                cnt = cnt + 1
-            end
-
-            ngx.say("found ", cnt, " headers.");
-        ';
-    }
---- request
-GET /lua
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 2) {
-    $s .= "X-$i:$i\n";
-    $i++;
-}
-$s
---- response_body
-err: truncated
-found 3 headers.
---- timeout: 4
---- error_log
-lua exceeding request header limit 4 > 3
---- no_error_log
-[error]
-
-
-
-=== TEST 58: NOT execeeding custom 3 header limit
---- config
-    location /lua {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(3)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local cnt = 0
-            for key, val in pairs(headers) do
-                cnt = cnt + 1
-            end
-
-            ngx.say("found ", cnt, " headers.");
-        ';
-    }
---- request
-GET /lua
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 1) {
-    $s .= "X-$i:$i\n";
-    $i++;
-}
-$s
---- response_body
-found 3 headers.
---- timeout: 4
---- no_error_log
-lua exceeding request header limit
-[error]
-
-
-
-=== TEST 59: execeeding custom 3 header limit (raw)
---- config
-    location /lua {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(3, true)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local cnt = 0
-            for key, val in pairs(headers) do
-                cnt = cnt + 1
-            end
-
-            ngx.say("found ", cnt, " headers.");
-        ';
-    }
---- request
-GET /lua
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 2) {
-    $s .= "X-$i:$i\n";
-    $i++;
-}
-$s
---- response_body
-err: truncated
-found 3 headers.
---- timeout: 4
---- error_log
-lua exceeding request header limit 4 > 3
---- no_error_log
-[error]
-
-
-
-=== TEST 60: NOT execeeding custom 3 header limit (raw)
---- config
-    location /lua {
-        content_by_lua '
-            local headers, err = ngx.req.get_headers(3, true)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local cnt = 0
-            for key, val in pairs(headers) do
-                cnt = cnt + 1
-            end
-
-            ngx.say("found ", cnt, " headers.");
-        ';
-    }
---- request
-GET /lua
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 1) {
-    $s .= "X-$i:$i\n";
-    $i++;
-}
-$s
---- response_body
-found 3 headers.
---- timeout: 4
---- no_error_log
-lua exceeding request header limit
-[error]
diff --git a/debian/modules/http-lua/t/029-http-time.t b/debian/modules/http-lua/t/029-http-time.t
deleted file mode 100644
index ecef492..0000000
--- a/debian/modules/http-lua/t/029-http-time.t
+++ /dev/null
@@ -1,87 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: http_time in content_by_lua
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say(ngx.http_time(1290079655))
-        ';
-    }
---- request
-GET /lua
---- response_body
-Thu, 18 Nov 2010 11:27:35 GMT
-
-
-
-=== TEST 2: http_time in set_by_lua
---- config
-    location /lua {
-        set_by_lua $a '
-            return ngx.http_time(1290079655)
-        ';
-        echo $a;
-    }
---- request
-GET /lua
---- response_body
-Thu, 18 Nov 2010 11:27:35 GMT
-
-
-
-=== TEST 3: parse_http_time in set_by_lua
---- config
-    location /lua {
-        set_by_lua $a '
-            return ngx.parse_http_time("Thu, 18 Nov 2010 11:27:35 GMT")
-        ';
-        echo $a;
-    }
---- request
-GET /lua
---- response_body
-1290079655
-
-
-
-=== TEST 4: parse_http_time in content_by_lua
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say(ngx.parse_http_time("Thu, 18 Nov 2010 11:27:35 GMT"))
-        ';
-    }
---- request
-GET /lua
---- response_body
-1290079655
-
-
-
-=== TEST 5: bad arg for parse_http_time in content_by_lua
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say(ngx.parse_http_time("abc") or "nil")
-        ';
-    }
---- request
-GET /lua
---- response_body
-nil
diff --git a/debian/modules/http-lua/t/030-uri-args.t b/debian/modules/http-lua/t/030-uri-args.t
deleted file mode 100644
index a9d46ff..0000000
--- a/debian/modules/http-lua/t/030-uri-args.t
+++ /dev/null
@@ -1,1549 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2 + 18);
-
-no_root_location();
-
-#no_shuffle();
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request
-GET /lua?a=3&b=4&c
---- response_body
-a = 3
-b = 4
-c = true
-
-
-
-=== TEST 2: args take no value
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request
-GET /lua?foo&baz=&bar=42
---- response_body
-bar = 42
-baz = 
-foo = true
-
-
-
-=== TEST 3: arg key and value escaped
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("again...")
-
-            args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request
-GET /lua?%3d&b%20r=4%61+2
---- response_body
-= = true
-b r = 4a 2
-again...
-= = true
-b r = 4a 2
-
-
-
-=== TEST 4: empty
---- config
-    location /t {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-GET /t
---- response_body
-done
-
-
-
-=== TEST 5: empty arg, but with = and &
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-GET /lua?=&&
---- response_body
-done
-
-
-
-=== TEST 6: multi-value keys
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                local val = args[key]
-                if type(val) == "table" then
-                    ngx.say(key, " = [", table.concat(val, ", "), "]")
-                else
-                    ngx.say(key, " = ", val)
-                end
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-GET /lua?foo=32&foo==&foo=baz
---- response_body
-foo = [32, =, baz]
-done
-
-
-
-=== TEST 7: multi-value keys
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                local val = args[key]
-                if type(val) == "table" then
-                    ngx.say(key, " = [", table.concat(val, ", "), "]")
-                else
-                    ngx.say(key, " = ", val)
-                end
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-GET /lua?foo=32&foo==&bar=baz
---- response_body
-bar = baz
-foo = [32, =]
-done
-
-
-
-=== TEST 8: empty arg
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            -- ngx.say(args)
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-GET /lua?&=
---- response_body
-done
-
-
-
-=== TEST 9: = in value
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            -- ngx.say(args)
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-GET /lua?foo===
---- response_body
-foo = ==
-done
-
-
-
-=== TEST 10: empty key, but non-empty values
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-GET /lua?=hello&=world
---- response_body
-done
-
-
-
-=== TEST 11: updating args with $args
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("updating args...")
-
-            ngx.var.args = "a=3&b=4"
-
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-GET /lua?foo=bar
---- response_body
-foo = bar
-updating args...
-a = 3
-b = 4
-done
-
-
-
-=== TEST 12: rewrite uri and args
---- config
-    location /bar {
-        echo $query_string;
-    }
-    location /foo {
-        #set $args 'hello';
-        rewrite_by_lua '
-            ngx.req.set_uri_args("hello")
-            ngx.req.set_uri("/bar", true);
-        ';
-        proxy_pass http://agentzh.org:12345;
-    }
---- request
-    GET /foo?world
---- response_body
-hello
---- error_log
-lua set uri jump to "/bar"
---- log_level: debug
-
-
-
-=== TEST 13: rewrite args (not break cycle by default)
---- config
-    location /bar {
-        echo "bar: $uri?$args";
-    }
-    location /foo {
-        #set $args 'hello';
-        rewrite_by_lua '
-            ngx.req.set_uri_args("hello")
-            ngx.req.set_uri("/bar", true)
-        ';
-        echo "foo: $uri?$args";
-    }
---- request
-    GET /foo?world
---- response_body
-bar: /bar?hello
-
-
-
-=== TEST 14: rewrite (not break cycle explicitly)
---- config
-    location /bar {
-        echo "bar: $uri?$args";
-    }
-    location /foo {
-        #set $args 'hello';
-        rewrite_by_lua '
-            ngx.req.set_uri_args("hello")
-            ngx.req.set_uri("/bar", true)
-        ';
-        echo "foo: $uri?$args";
-    }
---- request
-    GET /foo?world
---- response_body
-bar: /bar?hello
-
-
-
-=== TEST 15: rewrite (break cycle explicitly)
---- config
-    location /bar {
-        echo "bar: $uri?$args";
-    }
-    location /foo {
-        #set $args 'hello';
-        rewrite_by_lua '
-            ngx.req.set_uri("/bar")
-            ngx.req.set_uri_args("hello")
-        ';
-        echo "foo: $uri?$args";
-    }
---- request
-    GET /foo?world
---- response_body
-foo: /bar?hello
-
-
-
-=== TEST 16: rewrite uri (zero-length)
---- config
-    location /foo {
-        #set $args 'hello';
-        rewrite_by_lua '
-            local res, err = pcall(ngx.req.set_uri, "")
-            print("rewrite: err: ", err)
-        ';
-        content_by_lua '
-            ngx.say("foo: ", ngx.var.uri, "?", ngx.var.args)
-        ';
-    }
---- request
-    GET /foo?world
---- response_body
-foo: /foo?world
---- log_level: info
---- grep_error_log eval: qr/rewrite: .+?(?=,)/
---- grep_error_log_out
-rewrite: err: attempt to use zero-length uri
-
-
-
-=== TEST 17: rewrite uri and args
---- config
-    location /bar {
-        echo $server_protocol $query_string;
-    }
-    location /foo {
-        #rewrite ^ /bar?hello? break;
-        rewrite_by_lua '
-            ngx.req.set_uri_args("hello")
-            ngx.req.set_uri("/bar")
-        ';
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT;
-    }
---- request
-    GET /foo?world
---- response_body
-HTTP/1.0 hello
-
-
-
-=== TEST 18: rewrite uri and args (table args)
---- config
-    location /bar {
-        echo $server_protocol $query_string;
-    }
-    location /foo {
-        #rewrite ^ /bar?hello? break;
-        rewrite_by_lua '
-            ngx.req.set_uri("/bar")
-            ngx.req.set_uri_args({["ca t"] = "%"})
-        ';
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT;
-    }
---- request
-    GET /foo?world
---- response_body
-HTTP/1.0 ca%20t=%25
-
-
-
-=== TEST 19: rewrite uri and args (never returns)
---- config
-    location /bar {
-        echo $query_string;
-    }
-    location /foo {
-        #set $args 'hello';
-        rewrite_by_lua '
-            ngx.req.set_uri_args("hello")
-            ngx.req.set_uri("/bar", true);
-            ngx.exit(503)
-        ';
-        proxy_pass http://agentzh.org:12345;
-    }
---- request
-    GET /foo?world
---- response_body
-hello
-
-
-
-=== TEST 20: ngx.req.set_uri with jump not allowed in access phase
---- config
-    location /bar {
-        echo $query_string;
-    }
-    location /foo {
-        #set $args 'hello';
-        set $err '';
-        access_by_lua '
-            res, err = pcall(ngx.req.set_uri, "/bar", true);
-            ngx.var.err = err
-        ';
-        echo "err: $err";
-    }
---- request
-    GET /foo?world
---- response_body
-err: API disabled in the context of access_by_lua*
-
-
-
-=== TEST 21: ngx.req.set_uri without jump allowed in access phase
---- config
-    location /bar {
-        echo $query_string;
-    }
-    location /foo {
-        #set $args 'hello';
-        set $err '';
-        access_by_lua '
-            ngx.req.set_uri("/bar")
-        ';
-        echo "uri: $uri";
-    }
---- request
-    GET /foo?world
---- response_body
-uri: /bar
-
-
-
-=== TEST 22: ngx.req.set_uri with jump not allowed in content phase
---- config
-    location /bar {
-        echo $query_string;
-    }
-    location /foo {
-        #set $args 'hello';
-        content_by_lua '
-            res, err = pcall(ngx.req.set_uri, "/bar", true);
-            ngx.say("err: ", err)
-        ';
-    }
---- request
-    GET /foo?world
---- response_body
-err: API disabled in the context of content_by_lua*
-
-
-
-=== TEST 23: ngx.req.set_uri without jump allowed in content phase
---- config
-    location /bar {
-        echo $query_string;
-    }
-    location /foo {
-        #set $args 'hello';
-        set $err '';
-        content_by_lua '
-            ngx.req.set_uri("/bar")
-            ngx.say("uri: ", ngx.var.uri)
-        ';
-    }
---- request
-    GET /foo?world
---- response_body
-uri: /bar
-
-
-
-=== TEST 24: ngx.req.set_uri with jump not allowed in set_by_lua
---- config
-    location /bar {
-        echo $query_string;
-    }
-    location /foo {
-        #set $args 'hello';
-        set_by_lua $err '
-            res, err = pcall(ngx.req.set_uri, "/bar", true);
-            return err
-        ';
-        echo "err: $err";
-    }
---- request
-    GET /foo?world
---- response_body
-err: API disabled in the context of set_by_lua*
-
-
-
-=== TEST 25: ngx.encode_args (sanity)
---- config
-    location /lua {
-        set_by_lua $args_str '
-            local t = {a = "bar", b = "foo"}
-            return ngx.encode_args(t)
-        ';
-        echo $args_str;
-    }
---- request
-GET /lua
---- response_body
-a=bar&b=foo
-
-
-
-=== TEST 26: ngx.encode_args (empty table)
---- config
-    location /lua {
-        content_by_lua '
-            local t = {a = nil}
-            ngx.say("args:" .. ngx.encode_args(t))
-        ';
-    }
---- request
-GET /lua
---- response_body
-args:
-
-
-
-=== TEST 27: ngx.encode_args (value is table)
---- config
-    location /lua {
-        content_by_lua '
-            local t = {a = {9, 2}, b = 3}
-            ngx.say("args:" .. ngx.encode_args(t))
-        ';
-    }
---- request
-GET /lua
---- response_body_like
-(?x) ^args:
-    (?= .*? \b a=9 \b )  # 3 chars
-    (?= .*? \b a=2 \b )  # 3 chars
-    (?= .*? \b b=3 \b )  # 3 chars
-    (?= (?: [^&]+ & ){2} [^&]+ $ )  # requires exactly 2 &'s
-    (?= .{11} $ )  # requires for total 11 chars (exactly) in the string
-
-
-
-=== TEST 28: ngx.encode_args (boolean values)
---- config
-    location /lua {
-        content_by_lua '
-            local t = {a = true, foo = 3}
-            ngx.say("args: " .. ngx.encode_args(t))
-        ';
-    }
---- request
-GET /lua
---- response_body_like
-^args: (?:a&foo=3|foo=3&a)$
-
-
-
-=== TEST 29: ngx.encode_args (boolean values, false)
---- config
-    location /lua {
-        content_by_lua '
-            local t = {a = false, foo = 3}
-            ngx.say("args: " .. ngx.encode_args(t))
-        ';
-    }
---- request
-GET /lua
---- response_body
-args: foo=3
-
-
-
-=== TEST 30: boolean values in ngx.encode_args
---- config
-    location /lua {
-        set_by_lua $args_str '
-            local t = {bar = {32, true}, foo = 3}
-            return ngx.encode_args(t)
-        ';
-        echo $args_str;
-    }
---- request
-GET /lua
---- response_body_like
-(?x) ^
-    (?= .*? \b bar=32 \b )     # 6 chars
-    (?= .*? \b bar (?!=) \b )  # 3 chars
-    (?= .*? \b foo=3 \b )      # 5 chars
-    (?= (?: [^&]+ & ){2} [^&]+ $ )  # requires exactly 2 &'s
-    (?= .{16} $ )  # requires for total 16 chars (exactly) in the string
---- no_error_log
-[error]
-
-
-
-=== TEST 31: ngx.encode_args (bad user data value)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location /lua {
-        content_by_lua '
-            local t = {bar = ngx.shared.dogs, foo = 3}
-            rc, err = pcall(ngx.encode_args, t)
-            ngx.say("rc: ", rc, ", err: ", err)
-        ';
-    }
---- request
-GET /lua
---- response_body
-rc: false, err: attempt to use userdata as query arg value
-
-
-
-=== TEST 32: ngx.encode_args (empty table)
---- config
-    location /lua {
-        content_by_lua '
-            local t = {}
-            ngx.say("args: ", ngx.encode_args(t))
-        ';
-    }
---- request
-GET /lua
---- response_body
-args: 
-
-
-
-=== TEST 33: ngx.encode_args (bad arg)
---- config
-    location /lua {
-        content_by_lua '
-            local rc, err = pcall(ngx.encode_args, true)
-            ngx.say("rc: ", rc, ", err: ", err)
-        ';
-    }
---- request
-GET /lua
---- response_body
-rc: false, err: bad argument #1 to '?' (table expected, got boolean)
-
-
-
-=== TEST 34: max args (limited after normal key=value)
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args(2)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request
-GET /lua?foo=3&bar=4&baz=2
---- response_body
-err: truncated
-bar = 4
-foo = 3
---- error_log
-lua hit query args limit 2
---- log_level: debug
-
-
-
-=== TEST 35: max args (limited after an orphan key)
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args(2)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request
-GET /lua?foo=3&bar&baz=2
---- response_body
-err: truncated
-bar = true
-foo = 3
---- error_log
-lua hit query args limit 2
---- log_level: debug
-
-
-
-=== TEST 36: max args (limited after an empty key, but non-empty values)
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args(2)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-GET /lua?foo=3&=hello&=world
---- response_body
-err: truncated
-foo = 3
-done
---- error_log
-lua hit query args limit 2
---- log_level: debug
-
-
-
-=== TEST 37: default max 100 args
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request eval
-my $s = "GET /lua?";
-my $i = 1;
-while ($i <= 102) {
-    if ($i != 1) {
-        $s .= '&';
-    }
-    $s .= "a$i=$i";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 100) {
-    push @k, "a$i";
-    $i++;
-}
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= " = $&\n";
-    }
-}
-
-"err: truncated\n" . CORE::join("", @k);
---- timeout: 4
---- error_log
-lua hit query args limit 100
---- log_level: debug
-
-
-
-=== TEST 38: custom max 102 args
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args(102)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request eval
-my $s = "GET /lua?";
-my $i = 1;
-while ($i <= 103) {
-    if ($i != 1) {
-        $s .= '&';
-    }
-    $s .= "a$i=$i";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 102) {
-    push @k, "a$i";
-    $i++;
-}
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= " = $&\n";
-    }
-}
-
-"err: truncated\n" . CORE::join("", @k);
---- timeout: 4
---- error_log
-lua hit query args limit 102
---- log_level: debug
-
-
-
-=== TEST 39: custom unlimited args
---- config
-    location /lua {
-        content_by_lua '
-            local args, err = ngx.req.get_uri_args(0)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request eval
-my $s = "GET /lua?";
-my $i = 1;
-while ($i <= 105) {
-    if ($i != 1) {
-        $s .= '&';
-    }
-    $s .= "a$i=$i";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 105) {
-    push @k, "a$i";
-    $i++;
-}
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= " = $&\n";
-    }
-}
-CORE::join("", @k);
---- timeout: 4
-
-
-
-=== TEST 40: rewrite uri and args (multi-value args)
---- config
-    location /bar {
-        echo $server_protocol $query_string;
-    }
-    location /foo {
-        #rewrite ^ /bar?hello? break;
-        rewrite_by_lua '
-            ngx.req.set_uri_args({a = 3, b = {5, 6}})
-            ngx.req.set_uri("/bar")
-        ';
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT;
-    }
---- request
-    GET /foo?world
---- response_body
-HTTP/1.0 a=3&b=5&b=6
-
-
-
-=== TEST 41: ngx.decode_args (sanity)
---- config
-    location /lua {
-        content_by_lua '
-            local args = "a=bar&b=foo"
-            args, err = ngx.decode_args(args)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            ngx.say("a = ", args.a)
-            ngx.say("b = ", args.b)
-        ';
-    }
---- request
-GET /lua
---- response_body
-a = bar
-b = foo
-
-
-
-=== TEST 42: ngx.decode_args (multi-value)
---- config
-    location /lua {
-        content_by_lua '
-            local args = "a=bar&b=foo&a=baz"
-            args, err = ngx.decode_args(args)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            ngx.say("a = ", table.concat(args.a, ", "))
-            ngx.say("b = ", args.b)
-        ';
-    }
---- request
-GET /lua
---- response_body
-a = bar, baz
-b = foo
-
-
-
-=== TEST 43: ngx.decode_args (empty string)
---- config
-    location /lua {
-        content_by_lua '
-            local args = ""
-            args, err = ngx.decode_args(args)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            ngx.say("n = ", #args)
-        ';
-    }
---- request
-GET /lua
---- response_body
-n = 0
-
-
-
-=== TEST 44: ngx.decode_args (boolean args)
---- config
-    location /lua {
-        content_by_lua '
-            local args = "a&b"
-            args, err = ngx.decode_args(args)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            ngx.say("a = ", args.a)
-            ngx.say("b = ", args.b)
-        ';
-    }
---- request
-GET /lua
---- response_body
-a = true
-b = true
-
-
-
-=== TEST 45: ngx.decode_args (empty value args)
---- config
-    location /lua {
-        content_by_lua '
-            local args = "a=&b="
-            args, err = ngx.decode_args(args)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            ngx.say("a = ", args.a)
-            ngx.say("b = ", args.b)
-        ';
-    }
---- request
-GET /lua
---- response_body
-a = 
-b = 
-
-
-
-=== TEST 46: ngx.decode_args (max_args = 1)
---- config
-    location /lua {
-        content_by_lua '
-            local args = "a=bar&b=foo"
-            args, err = ngx.decode_args(args, 1)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            ngx.say("a = ", args.a)
-            ngx.say("b = ", args.b)
-        ';
-    }
---- request
-GET /lua
---- response_body
-err: truncated
-a = bar
-b = nil
-
-
-
-=== TEST 47: ngx.decode_args (max_args = -1)
---- config
-    location /lua {
-        content_by_lua '
-            local args = "a=bar&b=foo"
-            args, err = ngx.decode_args(args, -1)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            ngx.say("a = ", args.a)
-            ngx.say("b = ", args.b)
-        ';
-    }
---- request
-GET /lua
---- response_body
-a = bar
-b = foo
-
-
-
-=== TEST 48: ngx.decode_args should not modify lua strings in place
---- config
-    location /lua {
-        content_by_lua '
-            local s = "f+f=bar&B=foo"
-            args, err = ngx.decode_args(s)
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local arr = {}
-            for k, v in pairs(args) do
-                table.insert(arr, k)
-            end
-            table.sort(arr)
-            for i, k in ipairs(arr) do
-                ngx.say("key: ", k)
-            end
-            ngx.say("s = ", s)
-        ';
-    }
---- request
-GET /lua
---- response_body
-key: B
-key: f f
-s = f+f=bar&B=foo
---- no_error_log
-[error]
-
-
-
-=== TEST 49: ngx.decode_args should not modify lua strings in place (sample from Xu Jian)
---- config
-    lua_need_request_body on;
-    location /t {
-        content_by_lua '
-            function split(s, delimiter)
-                local result = {}
-                local from = 1
-                local delim_from, delim_to = string.find(s, delimiter, from)
-                while delim_from do
-                    table.insert(result, string.sub(s, from, delim_from - 1))
-                    from = delim_to + 1
-                    delim_from, delim_to = string.find(s, delimiter, from)
-                end
-                table.insert(result, string.sub(s, from))
-                return result
-            end
-
-            local post_data = ngx.req.get_body_data()
-
-            local commands = split(post_data, "||")
-            for _, command in pairs(commands) do
-                --command = ngx.unescape_uri(command)
-                local request_args, err = ngx.decode_args(command, 0)
-                if err then
-                    ngx.say("err: ", err)
-                end
-
-                local arr = {}
-                for k, v in pairs(request_args) do
-                    table.insert(arr, k)
-                end
-                table.sort(arr)
-                for i, k in ipairs(arr) do
-                    ngx.say(k, ": ", request_args[k])
-                end
-                ngx.say(" ===============")
-            end
-        ';
-    }
---- request
-POST /t
-method=zadd&key=User%3A1227713%3Alikes%3Atwitters&arg1=1356514698&arg2=780984852||method=zadd&key=User%3A1227713%3Alikes%3Atwitters&arg1=1356514698&arg2=780984852||method=zadd&key=User%3A1227713%3Alikes%3Atwitters&arg1=1356514698&arg2=780984852
---- response_body
-arg1: 1356514698
-arg2: 780984852
-key: User:1227713:likes:twitters
-method: zadd
- ===============
-arg1: 1356514698
-arg2: 780984852
-key: User:1227713:likes:twitters
-method: zadd
- ===============
-arg1: 1356514698
-arg2: 780984852
-key: User:1227713:likes:twitters
-method: zadd
- ===============
---- no_error_log
-[error]
-
-
-
-=== TEST 50: recursive rewrite
---- config
-    rewrite_by_lua '
-        local args = ngx.var.args
-        if args == "jump" then
-            ngx.req.set_uri("/jump",true)
-        end
-    ';
-
-    location /jump {
-        echo "Jump around!";
-    }
-
-    location / {
-        echo "$scheme://$http_host$request_uri";
-    }
---- request
-GET /?jump
-
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
---- no_error_log
-[alert]
-[crit]
---- error_log
-rewrite or internal redirection cycle while processing "/jump"
---- timeout: 10
---- log_level: debug
-
-
-
-=== TEST 51: boolean values in ngx.encode_args (trailing arg)
---- config
-    location /lua {
-        set_by_lua $args_str '
-            local t = {a = {32, true}, foo = 3, bar = 5}
-            return ngx.encode_args(t)
-        ';
-        echo $args_str;
-    }
---- request
-GET /lua
---- response_body_like
-(?x) ^
-    (?= .*? \b a=32 \b )       # 4 chars
-    (?= .*? \b a (?=&|$) \b )  # 1 chars
-    (?= .*? \b foo=3 \b )      # 5 chars
-    (?= .*? \b bar=5 \b )      # 5 chars
-    (?= (?: [^&]+ & ){3} [^&]+ $ )  # requires exactly 3 &'s
-    (?= .{18} $ )  # requires for total 18 chars (exactly) in the string
---- no_error_log
-[error]
-
-
-
-=== TEST 52: false boolean values in ngx.encode_args
---- config
-    location /lua {
-        set_by_lua $args_str '
-            local t = {a = {32, false}, foo = 3, bar = 5}
-            return ngx.encode_args(t)
-        ';
-        echo $args_str;
-    }
---- request
-GET /lua
---- response_body_like
-(?x) ^
-    (?= .*? \b a=32 \b )   # 4 chars
-    (?= .*? \b foo=3 \b )  # 5 chars
-    (?= .*? \b bar=5 \b )  # 5 chars
-    (?= (?: [^&]+ & ){2} [^&]+ $ )  # requires exactly 2 &'s
-    (?= .{16} $ )  # requires for total 16 chars (exactly) in the string
---- no_error_log
-[error]
-
-
-
-=== TEST 53: false boolean values in ngx.encode_args (escaping)
---- config
-    location /lua {
-        set_by_lua $args_str '
-            local t = {["a b"] = {32, false}, foo = 3, bar = 5}
-            return ngx.encode_args(t)
-        ';
-        echo $args_str;
-    }
---- request
-GET /lua
---- response_body_like
-(?x) ^
-    (?= .*? \b a%20b=32 \b )  # 8 chars
-    (?= .*? \b foo=3 \b )     # 5 chars
-    (?= .*? \b bar=5 \b )     # 5 chars
-    (?= (?: [^&]+ & ){2} [^&]+ $ )  # requires exactly 2 &'s
-    (?= .{20} $ )  # requires for total 20 chars (exactly) in the string
---- no_error_log
-[error]
-
-
-
-=== TEST 54: true boolean values in ngx.encode_args (escaping)
---- config
-    location /lua {
-        set_by_lua $args_str '
-            local t = {["a b"] = {32, true}, foo = 3, bar = 5}
-            return ngx.encode_args(t)
-        ';
-        echo $args_str;
-    }
---- request
-GET /lua
---- response_body_like
-(?x) ^
-    (?= .*? \b a%20b=32 \b )     # 8 chars
-    (?= .*? \b a%20b (?!=) \b )  # 5 chars
-    (?= .*? \b foo=3 \b )        # 5 chars
-    (?= .*? \b bar=5 \b )        # 5 chars
-    (?= (?: [^&]+ & ){3} [^&]+ $ )  # requires exactly 3 &'s
-    (?= .{26} $ )  # requires for total 26 chars (exactly) in the string
---- no_error_log
-[error]
-
-
-
-=== TEST 55: rewrite uri and args (boolean in multi-value args)
---- config
-    location /bar {
-        echo $server_protocol $query_string;
-    }
-    location /foo {
-        #rewrite ^ /bar?hello? break;
-        rewrite_by_lua '
-            ngx.req.set_uri_args({a = 3, b = {5, true, 6}})
-            ngx.req.set_uri("/bar")
-        ';
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT;
-    }
---- request
-    GET /foo?world
---- response_body_like
-(?x) ^HTTP/1.0 \s
-    (?= .*? \b a=3 \b )      # 3 chars
-    (?= .*? \b b=5 \b )      # 3 chars
-    (?= .*? \b b (?!=) \b )  # 1 chars
-    (?= .*? \b b=6 \b )      # 3 chars
-    (?= (?: [^&]+ & ){3} [^&]+ $ )  # requires exactly 3 &'s
-    (?= .{13} $ )  # requires for total 13 chars (exactly) in the string
-
-
-
-=== TEST 56: rewrite uri and args (boolean value)
---- config
-    location /bar {
-        echo $server_protocol $query_string;
-    }
-    location /foo {
-        #rewrite ^ /bar?hello? break;
-        rewrite_by_lua '
-            ngx.req.set_uri_args({a = 3, b = true})
-            ngx.req.set_uri("/bar")
-        ';
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT;
-    }
---- request
-    GET /foo?world
---- response_body_like
-^HTTP/1.0 (a=3&b|b&a=3)$
-
-
-
-=== TEST 57: ngx.encode_args (escaping)
---- config
-    location /lua {
-        content_by_lua_block {
-            local t = {bar = "-_.!~*'()", foo = ",$@|`"}
-            ngx.say("args: ", ngx.encode_args(t))
-        }
-    }
---- request
-GET /lua
---- response_body
-args: foo=%2C%24%40%7C%60&bar=-_.!~*'()
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/031-post-args.t b/debian/modules/http-lua/t/031-post-args.t
deleted file mode 100644
index 4659f05..0000000
--- a/debian/modules/http-lua/t/031-post-args.t
+++ /dev/null
@@ -1,406 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 6);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /lua {
-        lua_need_request_body on;
-        content_by_lua '
-            local args, err = ngx.req.get_post_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request
-POST /lua
-a=3&b=4&c
---- response_body
-a = 3
-b = 4
-c = true
-
-
-
-=== TEST 2: lua_need_request_body off
---- config
-    location /lua {
-        lua_need_request_body off;
-        content_by_lua '
-            local args, err = ngx.req.get_post_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request
-POST /lua
-a=3&b=4&c
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 3: empty request body
---- config
-    location /lua {
-        lua_need_request_body on;
-        content_by_lua '
-            local args, err = ngx.req.get_post_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                local val = args[key]
-                if type(val) == "table" then
-                    ngx.say(key, ": ", table.concat(val, ", "))
-                else
-                    ngx.say(key, ": ", val)
-                end
-            end
-        ';
-    }
---- request
-POST /lua
---- response_body
-
-
-
-=== TEST 4: max args (limited after normal key=value)
---- config
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body();
-            local args, err = ngx.req.get_post_args(2)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request
-POST /lua
-foo=3&bar=4&baz=2
---- response_body
-err: truncated
-bar = 4
-foo = 3
---- error_log
-lua hit query args limit 2
-
-
-
-=== TEST 5: max args (limited after an orphan key)
---- config
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body();
-            local args, err = ngx.req.get_post_args(2)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request
-POST /lua
-foo=3&bar&baz=2
---- response_body
-err: truncated
-bar = true
-foo = 3
---- error_log
-lua hit query args limit 2
-
-
-
-=== TEST 6: max args (limited after an empty key, but non-empty values)
---- config
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body();
-            local args, err = ngx.req.get_post_args(2)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-
-            ngx.say("done")
-        ';
-    }
---- request
-POST /lua
-foo=3&=hello&=world
---- response_body
-err: truncated
-foo = 3
-done
---- error_log
-lua hit query args limit 2
-
-
-
-=== TEST 7: default max 100 args
---- config
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body();
-            local args, err = ngx.req.get_post_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request eval
-my $s = "POST /lua\n";
-my $i = 1;
-while ($i <= 102) {
-    if ($i != 1) {
-        $s .= '&';
-    }
-    $s .= "a$i=$i";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 100) {
-    push @k, "a$i";
-    $i++;
-}
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= " = $&\n";
-    }
-}
-"err: truncated\n" . CORE::join("", @k);
---- timeout: 4
---- error_log
-lua hit query args limit 100
-
-
-
-=== TEST 8: custom max 102 args
---- config
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body()
-            local args, err = ngx.req.get_post_args(102)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request eval
-my $s = "POST /lua\n";
-my $i = 1;
-while ($i <= 103) {
-    if ($i != 1) {
-        $s .= '&';
-    }
-    $s .= "a$i=$i";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 102) {
-    push @k, "a$i";
-    $i++;
-}
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= " = $&\n";
-    }
-}
-"err: truncated\n" . CORE::join("", @k);
---- timeout: 4
---- error_log
-lua hit query args limit 102
-
-
-
-=== TEST 9: custom unlimited args
---- config
-    location /lua {
-        content_by_lua '
-            ngx.req.read_body()
-            local args, err = ngx.req.get_post_args(0)
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                ngx.say(key, " = ", args[key])
-            end
-        ';
-    }
---- request eval
-my $s = "POST /lua\n";
-my $i = 1;
-while ($i <= 105) {
-    if ($i != 1) {
-        $s .= '&';
-    }
-    $s .= "a$i=$i";
-    $i++;
-}
-$s
---- response_body eval
-my @k;
-my $i = 1;
-while ($i <= 105) {
-    push @k, "a$i";
-    $i++;
-}
-@k = sort @k;
-for my $k (@k) {
-    if ($k =~ /\d+/) {
-        $k .= " = $&\n";
-    }
-}
-CORE::join("", @k);
---- timeout: 4
-
-
-
-=== TEST 10: request body in temp file
---- config
-    location /lua {
-        lua_need_request_body on;
-        client_body_in_file_only clean;
-        content_by_lua_block {
-            local args, err = ngx.req.get_post_args()
-
-            if err then
-                ngx.say("err: ", err)
-            end
-
-            if args then
-                local keys = {}
-                for key, val in pairs(args) do
-                    table.insert(keys, key)
-                end
-
-                table.sort(keys)
-                for i, key in ipairs(keys) do
-                    ngx.say(key, " = ", args[key])
-                end
-            end
-        }
-    }
---- request
-POST /lua
-a=3&b=4&c
---- response_body
-err: request body in temp file not supported
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/032-iolist.t b/debian/modules/http-lua/t/032-iolist.t
deleted file mode 100644
index 3c56032..0000000
--- a/debian/modules/http-lua/t/032-iolist.t
+++ /dev/null
@@ -1,78 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /lua {
-        content_by_lua '
-            local table = {"hello", nil, true, false, 32.5, 56}
-            ngx.say(table)
-        ';
-    }
---- request
-GET /lua
---- response_body
-helloniltruefalse32.556
-
-
-
-=== TEST 2: nested table
---- config
-    location /lua {
-        content_by_lua '
-            local table = {"hello", nil, true, false, 32.5, 56}
-            local table2 = {table, "--", table}
-            ngx.say(table2)
-        ';
-    }
---- request
-GET /lua
---- response_body
-helloniltruefalse32.556--helloniltruefalse32.556
-
-
-
-=== TEST 3: non-array table
---- config
-    location /lua {
-        content_by_lua '
-            local table = {foo = 3}
-            ngx.say(table)
-        ';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 4: bad data type in table
---- config
-    location /lua {
-        content_by_lua '
-            local f = function () return end
-            local table = {1, 3, f}
-            ngx.say(table)
-        ';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
diff --git a/debian/modules/http-lua/t/033-ctx.t b/debian/modules/http-lua/t/033-ctx.t
deleted file mode 100644
index 8fc50aa..0000000
--- a/debian/modules/http-lua/t/033-ctx.t
+++ /dev/null
@@ -1,442 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 3 + 8);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /lua {
-        content_by_lua '
-            ngx.ctx.foo = 32;
-            ngx.say(ngx.ctx.foo)
-        ';
-    }
---- request
-GET /lua
---- response_body
-32
---- no_error_log
-[error]
-
-
-
-=== TEST 2: rewrite, access, and content
---- config
-    location /lua {
-        rewrite_by_lua '
-            print("foo = ", ngx.ctx.foo)
-            ngx.ctx.foo = 76
-        ';
-        access_by_lua '
-            ngx.ctx.foo = ngx.ctx.foo + 3
-        ';
-        content_by_lua '
-            ngx.say(ngx.ctx.foo)
-        ';
-    }
---- request
-GET /lua
---- response_body
-79
---- no_error_log
-[error]
---- grep_error_log eval: qr/foo = [^,]+/
---- log_level: info
---- grep_error_log_out
-foo = nil
-
-
-
-=== TEST 3: interal redirect clears ngx.ctx
---- config
-    location /echo {
-        content_by_lua '
-            ngx.say(ngx.ctx.foo)
-        ';
-    }
-    location /lua {
-        content_by_lua '
-            ngx.ctx.foo = ngx.var.arg_data
-            -- ngx.say(ngx.ctx.foo)
-            ngx.exec("/echo")
-        ';
-    }
---- request
-GET /lua?data=hello
---- response_body
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 4: subrequest has its own ctx
---- config
-    location /sub {
-        content_by_lua '
-            ngx.say("sub pre: ", ngx.ctx.blah)
-            ngx.ctx.blah = 32
-            ngx.say("sub post: ", ngx.ctx.blah)
-        ';
-    }
-    location /main {
-        content_by_lua '
-            ngx.ctx.blah = 73
-            ngx.say("main pre: ", ngx.ctx.blah)
-            local res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-            ngx.say("main post: ", ngx.ctx.blah)
-        ';
-    }
---- request
-    GET /main
---- response_body
-main pre: 73
-sub pre: nil
-sub post: 32
-main post: 73
---- no_error_log
-[error]
-
-
-
-=== TEST 5: overriding ctx
---- config
-    location /lua {
-        content_by_lua '
-            ngx.ctx = { foo = 32, bar = 54 };
-            ngx.say(ngx.ctx.foo)
-            ngx.say(ngx.ctx.bar)
-
-            ngx.ctx = { baz = 56  };
-            ngx.say(ngx.ctx.foo)
-            ngx.say(ngx.ctx.baz)
-        ';
-    }
---- request
-GET /lua
---- response_body
-32
-54
-nil
-56
---- no_error_log
-[error]
-
-
-
-=== TEST 6: header filter
---- config
-    location /lua {
-        content_by_lua '
-            ngx.ctx.foo = 32;
-            ngx.say(ngx.ctx.foo)
-        ';
-        header_filter_by_lua '
-            ngx.header.blah = ngx.ctx.foo + 1
-        ';
-    }
---- request
-GET /lua
---- response_headers
-blah: 33
---- response_body
-32
---- no_error_log
-[error]
-
-
-
-=== TEST 7: capture_multi
---- config
-    location /other {
-        content_by_lua '
-            ngx.say("dog = ", ngx.ctx.dog)
-        ';
-    }
-
-    location /lua {
-        set $dog 'blah';
-        set $cat 'foo';
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                {"/other/1",
-                    { ctx = { dog = "hello" }}
-                },
-                {"/other/2",
-                    { ctx = { dog = "hiya" }}
-                }
-            };
-
-            ngx.print(res1.body)
-            ngx.print(res2.body)
-            ngx.say("parent: ", ngx.ctx.dog)
-        ';
-    }
---- request
-GET /lua
---- response_body
-dog = hello
-dog = hiya
-parent: nil
---- no_error_log
-[error]
-
-
-
-=== TEST 8: set_by_lua
---- config
-    location /lua {
-        set_by_lua $bar 'ngx.ctx.foo = 3 return 4';
-        set_by_lua $foo 'return ngx.ctx.foo';
-        echo "foo = $foo, bar = $bar";
-    }
---- request
-GET /lua
---- response_body
-foo = 3, bar = 4
---- no_error_log
-[error]
-
-
-
-=== TEST 9: ngx.ctx leaks with ngx.exec + log_by_lua
---- config
-    location = /t {
-        content_by_lua '
-            ngx.ctx.foo = 32;
-            ngx.exec("/f")
-        ';
-        log_by_lua 'ngx.log(ngx.WARN, "ctx.foo = ", ngx.ctx.foo)';
-    }
-    location = /f {
-        content_by_lua '
-            ngx.say(ngx.ctx.foo)
-        ';
-    }
---- request
-GET /t
---- response_body
-nil
---- no_error_log
-[error]
-ctx.foo = 
-
-
-
-=== TEST 10: memory leaks with ngx.ctx + ngx.req.set_uri + log_by_lua
---- config
-    location = /t {
-        rewrite_by_lua '
-            ngx.ctx.foo = 32;
-            ngx.req.set_uri("/f", true)
-        ';
-        log_by_lua 'ngx.log(ngx.WARN, "ctx.foo = ", ngx.ctx.foo)';
-    }
-    location = /f {
-        content_by_lua '
-            ngx.say(ngx.ctx.foo)
-        ';
-    }
---- request
-GET /t
---- response_body
-nil
---- no_error_log
-[error]
-ctx.foo = 
-
-
-
-=== TEST 11: ngx.ctx + ngx.exit(ngx.ERROR) + log_by_lua
---- config
-    location = /t {
-        rewrite_by_lua '
-            ngx.ctx.foo = 32;
-            ngx.exit(ngx.ERROR)
-        ';
-        log_by_lua 'ngx.log(ngx.WARN, "ngx.ctx = ", ngx.ctx.foo)';
-    }
---- request
-GET /t
---- ignore_response
---- no_error_log
-[error]
---- error_log
-ngx.ctx = 32
-
-
-
-=== TEST 12: ngx.ctx + ngx.exit(200) + log_by_lua
---- config
-    location = /t {
-        rewrite_by_lua '
-            ngx.ctx.foo = 32;
-            ngx.say(ngx.ctx.foo)
-            ngx.exit(200)
-        ';
-        log_by_lua 'ngx.log(ngx.WARN, "ctx.foo = ", ngx.ctx.foo)';
-    }
---- request
-GET /t
---- response_body
-32
---- no_error_log
-[error]
---- error_log
-ctx.foo = 32
-
-
-
-=== TEST 13: ngx.ctx + ngx.redirect + log_by_lua
---- config
-    location = /t {
-        rewrite_by_lua '
-            ngx.ctx.foo = 32;
-            ngx.redirect("/f")
-        ';
-        log_by_lua 'ngx.log(ngx.WARN, "ngx.ctx.foo = ", 32)';
-    }
---- request
-GET /t
---- response_body_like: 302 Found
---- error_code: 302
---- error_log
-ctx.foo = 32
---- no_error_log
-[error]
-
-
-
-=== TEST 14: set ngx.ctx before internal redirects performed by other nginx modules
---- config
-    location = /t {
-        rewrite_by_lua '
-            ngx.ctx.foo = "hello world";
-        ';
-        echo_exec /foo;
-    }
-
-    location = /foo {
-        echo hello;
-    }
---- request
-GET /t
---- response_body
-hello
---- no_error_log
-[error]
---- log_level: debug
---- error_log
-lua release ngx.ctx at ref
-
-
-
-=== TEST 15: set ngx.ctx before internal redirects performed by other nginx modules (with log_by_lua)
---- config
-    location = /t {
-        rewrite_by_lua '
-            ngx.ctx.foo = "hello world";
-        ';
-        echo_exec /foo;
-    }
-
-    location = /foo {
-        echo hello;
-        log_by_lua return;
-    }
---- request
-GET /t
---- response_body
-hello
---- no_error_log
-[error]
---- log_level: debug
---- error_log
-lua release ngx.ctx at ref
-
-
-
-=== TEST 16: set ngx.ctx before simple uri rewrite performed by other nginx modules
---- config
-    location = /t {
-        set_by_lua $a 'ngx.ctx.foo = "hello world"; return 1';
-        rewrite ^ /foo last;
-        echo blah;
-    }
-
-    location = /foo {
-        echo foo;
-    }
---- request
-GET /t
---- response_body
-foo
---- no_error_log
-[error]
---- log_level: debug
---- error_log
-lua release ngx.ctx at ref
-
-
-
-=== TEST 17: ngx.ctx gets prematurely released ngx.exit()
---- config
-    location = /t {
-        rewrite_by_lua '
-            ngx.ctx.foo = 3
-        ';
-        content_by_lua '
-            -- if ngx.headers_sent ~= true then ngx.send_headers() end
-            return ngx.exit(200)
-        ';
-        header_filter_by_lua '
-            if ngx.ctx.foo ~= 3 then
-                ngx.log(ngx.ERR, "bad ngx.ctx.foo: ", ngx.ctx.foo)
-            end
-        ';
-        }
---- request
-    GET /t
---- response_body
---- no_error_log
-[error]
-
-
-
-=== TEST 18: ngx.ctx gets prematurely released ngx.exit() (lua_code_cache off)
---- config
-    location = /t {
-        lua_code_cache off;
-        rewrite_by_lua '
-            ngx.ctx.foo = 3
-        ';
-        content_by_lua '
-            -- if ngx.headers_sent ~= true then ngx.send_headers() end
-            return ngx.exit(200)
-        ';
-        header_filter_by_lua '
-            if ngx.ctx.foo ~= 3 then
-                ngx.log(ngx.ERR, "bad ngx.ctx.foo: ", ngx.ctx.foo)
-            end
-        ';
-        }
---- request
-    GET /t
---- response_body
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/034-match.t b/debian/modules/http-lua/t/034-match.t
deleted file mode 100644
index ebe5762..0000000
--- a/debian/modules/http-lua/t/034-match.t
+++ /dev/null
@@ -1,1192 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 15);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 2: escaping sequences
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\\\d+)")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 3: escaping sequences (bad)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\d+)")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body_like: 500 Internal Server Error
---- error_log eval
-[qr/invalid escape sequence near '"\('/]
---- error_code: 500
-
-
-
-=== TEST 4: escaping sequences in [[ ... ]]
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "[[\\d+]]")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body_like: 500 Internal Server Error
---- error_log eval
-[qr/invalid escape sequence near '"\[\['/]
---- error_code: 500
-
-
-
-=== TEST 5: single capture
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-12
-
-
-
-=== TEST 6: multiple captures
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-hello
-12
-
-
-
-=== TEST 7: multiple captures (with o)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-hello
-12
-
-
-
-=== TEST 8: not matched
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "foo")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched: nil
-
-
-
-=== TEST 9: case sensitive by default
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched: nil
-
-
-
-=== TEST 10: case insensitive
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO", "i")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-
-
-
-=== TEST 11: UTF-8 mode
---- config
-    location /re {
-        content_by_lua '
-            rc, err = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iu")
-            if not rc then
-                ngx.say("FAIL: ", err)
-                return
-            end
-            local m = err
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body_like chop
-^(?:FAIL: bad argument \#2 to '\?' \(pcre_compile\(\) failed: this version of PCRE is not compiled with PCRE_UTF8 support in "HELLO\.\{2\}" at "HELLO\.\{2\}"\)|hello章亦)$
-
-
-
-=== TEST 12: multi-line mode (^ at line head)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "m")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-world
-
-
-
-=== TEST 13: multi-line mode (. does not match \n)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "m")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-
-
-
-=== TEST 14: single-line mode (^ as normal)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "s")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched: nil
-
-
-
-=== TEST 15: single-line mode (dot all)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "s")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-world
-
-
-
-=== TEST 16: extended mode (ignore whitespaces)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "x")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-he
-
-
-
-=== TEST 17: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local m, err = ngx.re.match("hello\\nworld", "(abc")
-            if m then
-                ngx.say(m[0])
-
-            else
-                if err then
-                    ngx.say("error: ", err)
-
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 18: bad option
---- config
-    location /re {
-        content_by_lua '
-            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Hm")
-            if rc then
-                if m then
-                    ngx.say(m[0])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            else
-                ngx.say("error: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body_like chop
-error: .*?unknown flag "H" \(flags "Hm"\)
-
-
-
-=== TEST 19: extended mode (ignore whitespaces)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, world", "(world)|(hello)", "x")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-false
-hello
-
-
-
-=== TEST 20: optional trailing captures
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body eval
-"1234
-1234
-
-"
-
-
-
-=== TEST 21: anchored match (failed)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "a")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched!
-
-
-
-=== TEST 22: anchored match (succeeded)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("1234, hello", "([0-9]+)", "a")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 23: match with ctx but no pos
---- config
-    location /re {
-        content_by_lua '
-            local ctx = {}
-            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
-            if m then
-                ngx.say(m[0])
-                ngx.say(ctx.pos)
-            else
-                ngx.say("not matched!")
-                ngx.say(ctx.pos)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-5
-
-
-
-=== TEST 24: match with ctx and a pos
---- config
-    location /re {
-        content_by_lua '
-            local ctx = { pos = 3 }
-            m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
-            if m then
-                ngx.say(m[0])
-                ngx.say(ctx.pos)
-            else
-                ngx.say("not matched!")
-                ngx.say(ctx.pos)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-34
-5
-
-
-
-=== TEST 25: sanity (set_by_lua)
---- config
-    location /re {
-        set_by_lua $res '
-            m = ngx.re.match("hello, 1234", "([0-9]+)")
-            if m then
-                return m[0]
-            else
-                return "not matched!"
-            end
-        ';
-        echo $res;
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 26: match (look-behind assertion)
---- config
-    location /re {
-        content_by_lua '
-            local ctx = {}
-            local m = ngx.re.match("{foobarbaz}", "(?<=foo)bar|(?<=bar)baz", "", ctx)
-            ngx.say(m and m[0])
-
-            m = ngx.re.match("{foobarbaz}", "(?<=foo)bar|(?<=bar)baz", "", ctx)
-            ngx.say(m and m[0])
-        ';
-    }
---- request
-    GET /re
---- response_body
-bar
-baz
-
-
-
-=== TEST 27: escaping sequences
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
---- user_files
->>> a.lua
-m = ngx.re.match("hello, 1234", "(\\\s+)")
-if m then
-    ngx.say("[", m[0], "]")
-else
-    ngx.say("not matched!")
-end
---- request
-    GET /re
---- response_body_like: 500 Internal Server Error
---- error_log eval
-[qr/invalid escape sequence near '"\(\\'/]
---- error_code: 500
-
-
-
-=== TEST 28: escaping sequences
---- config
-    location /re {
-        access_by_lua_file html/a.lua;
-        content_by_lua return;
-    }
---- user_files
->>> a.lua
-local uri = "<impact>2</impact>"
-local regex = '(?:>[\\w\\s]*</?\\w{2,}>)';
-ngx.say("regex: ", regex)
-m = ngx.re.match(uri, regex, "oi")
-if m then
-    ngx.say("[", m[0], "]")
-else
-    ngx.say("not matched!")
-end
---- request
-    GET /re
---- response_body
-regex: (?:>[\w\s]*</?\w{2,}>)
-[>2</impact>]
-
-
-
-=== TEST 29: long brackets
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", [[\\d+]])
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 30: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local m, err = ngx.re.match("hello, 1234", "([0-9]+")
-            if m then
-                ngx.say(m[0])
-
-            else
-                if err then
-                    ngx.say("error: ", err)
-
-                else
-                    ngx.say("not matched!")
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "([0-9]+"
-
---- no_error_log
-[error]
-
-
-
-=== TEST 31: long brackets containing [...]
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", [[([0-9]+)]])
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 32: bug report (github issue #72)
---- config
-    location /re {
-        content_by_lua '
-            ngx.re.match("hello", "hello", "j")
-            ngx.say("done")
-        ';
-        header_filter_by_lua '
-            ngx.re.match("hello", "world", "j")
-        ';
-    }
---- request
-    GET /re
---- response_body
-done
-
-
-
-=== TEST 33: bug report (github issue #72)
---- config
-    location /re {
-        content_by_lua '
-            ngx.re.match("hello", "hello", "j")
-            ngx.exec("/foo")
-        ';
-    }
-
-    location /foo {
-        content_by_lua '
-            ngx.re.match("hello", "world", "j")
-            ngx.say("done")
-        ';
-    }
---- request
-    GET /re
---- 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: 1
-m: 
---- no_error_log
-[error]
-
-
-
-=== TEST 35: named subpatterns w/ extraction
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(?<first>[a-z]+), [0-9]+")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m.first)
-                ngx.say(m.second)
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-hello
-hello
-nil
-
-
-
-=== TEST 36: duplicate named subpatterns w/ extraction
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(?<first>[a-z]+), (?<first>[0-9]+)", "D")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-                ngx.say(table.concat(m.first,"-"))
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-hello
-1234
-hello-1234
-
-
-
-=== TEST 37: named captures are empty strings
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("1234", "(?<first>[a-z]*)([0-9]+)")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m.first)
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-1234
-
-
-
-=== TEST 38: named captures are false
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, world", "(world)|(hello)|(?<named>howdy)")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-                ngx.say(m[3])
-                ngx.say(m["named"])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-false
-hello
-false
-false
-
-
-
-=== TEST 39: duplicate named subpatterns
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, world",
-                                   "(?<named>\\\\w+), (?<named>\\\\w+)",
-                                   "D")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-                ngx.say(table.concat(m.named,"-"))
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world
-hello
-world
-hello-world
---- no_error_log
-[error]
-
-
-
-=== TEST 40: Javascript compatible mode
---- config
-    location /t {
-        content_by_lua '
-            local m = ngx.re.match("章", [[\\u7AE0]], "uJ")
-            if m then
-                ngx.say("matched: ", m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-GET /t
---- response_body
-matched: 章
---- no_error_log
-[error]
-
-
-
-=== TEST 41: empty duplicate captures
---- config
-    location = /t {
-        content_by_lua "
-            local target = 'test'
-            local regex = '^(?:(?<group1>(?:foo))|(?<group2>(?:bar))|(?<group3>(?:test)))$'
-
-            -- Note the D here
-            local m = ngx.re.match(target, regex, 'D')
-
-            ngx.say(type(m.group1))
-            ngx.say(type(m.group2))
-        ";
-    }
---- request
-GET /t
---- response_body
-nil
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 42: bad UTF-8
---- config
-    location = /t {
-        content_by_lua '
-            local target = "你好"
-            local regex = "你好"
-
-            -- Note the D here
-            local m, err = ngx.re.match(string.sub(target, 1, 4), regex, "u")
-
-            if err then
-                ngx.say("error: ", err)
-                return
-            end
-
-            if m then
-                ngx.say("matched: ", m[0])
-            else
-                ngx.say("not matched")
-            end
-        ';
-    }
---- request
-GET /t
---- response_body_like chop
-^error: pcre_exec\(\) failed: -10$
-
---- no_error_log
-[error]
-
-
-
-=== TEST 43: UTF-8 mode without UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("你好", ".", "U")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 2000
-
---- request
-    GET /re
---- response_body
-你
---- no_error_log
-[error]
-
-
-
-=== TEST 44: UTF-8 mode with UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("你好", ".", "u")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 0
-
---- request
-    GET /re
---- response_body
-你
---- no_error_log
-[error]
-
-
-
-=== TEST 45: just hit match limit
---- http_config
-    lua_regex_match_limit 5000;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local res, err = ngx.re.match(s, re, "o")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if not res then
-    if err then
-        ngx.say("error: ", err)
-        return
-    end
-    ngx.say("failed to match")
-    return
-end
-
---- request
-    GET /re
---- response_body
-error: pcre_exec() failed: -8
-
-
-
-=== TEST 46: just not hit match limit
---- http_config
-    lua_regex_match_limit 5100;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local res, err = ngx.re.match(s, re, "o")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if not res then
-    if err then
-        ngx.say("error: ", err)
-        return
-    end
-    ngx.say("failed to match")
-    return
-end
-
---- request
-    GET /re
---- response_body
-failed to match
-
-
-
-=== TEST 47: extra table argument
---- config
-    location /re {
-        content_by_lua '
-            local res = {}
-            local s = "hello, 1234"
-            m = ngx.re.match(s, [[(\\d)(\\d)]], "o", nil, res)
-            if m then
-                ngx.say("1: m size: ", #m)
-                ngx.say("1: res size: ", #res)
-            else
-                ngx.say("1: not matched!")
-            end
-            m = ngx.re.match(s, [[(\\d)]], "o", nil, res)
-            if m then
-                ngx.say("2: m size: ", #m)
-                ngx.say("2: res size: ", #res)
-            else
-                ngx.say("2: not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1: m size: 2
-1: res size: 2
-2: m size: 2
-2: res size: 2
---- no_error_log
-[error]
-
-
-
-=== TEST 48: init_by_lua
---- http_config
-    init_by_lua '
-        m = ngx.re.match("hello, 1234", "(\\\\d+)")
-    ';
---- config
-    location /re {
-        content_by_lua '
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
---- SKIP
-
-
-
-=== TEST 49: trailing captures are false
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello", "(hello)(.+)?")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-hello
-false
-
-
-
-=== TEST 50: the 5th argument hides the 4th (GitHub #719)
---- config
-    location /re {
-        content_by_lua '
-            local ctx, m = { pos = 5 }, {};
-            local _, err = ngx.re.match("20172016-11-3 03:07:09", [=[(\d\d\d\d)]=], "", ctx, m);
-            if m then
-                ngx.say(m[0], " ", _[0], " ", ctx.pos)
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-2016 2016 9
diff --git a/debian/modules/http-lua/t/035-gmatch.t b/debian/modules/http-lua/t/035-gmatch.t
deleted file mode 100644
index 0426997..0000000
--- a/debian/modules/http-lua/t/035-gmatch.t
+++ /dev/null
@@ -1,904 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(5);
-
-plan tests => repeat_each() * (blocks() * 2 + 7);
-
-our $HtmlDir = html_dir;
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: gmatch
---- config
-    location /re {
-        content_by_lua '
-            for m in ngx.re.gmatch("hello, world", "[a-z]+") do
-                if m then
-                    ngx.say(m[0])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-world
-
-
-
-=== TEST 2: fail to match
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[0-9]")
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-        ';
-    }
---- request
-    GET /re
---- response_body
-nil
-nil
-nil
-
-
-
-=== TEST 3: match but iterate more times (not just match at the end)
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world!", "[a-z]+")
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-world
-nil
-nil
-
-
-
-=== TEST 4: match but iterate more times (just matched at the end)
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+")
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-world
-nil
-nil
-
-
-
-=== TEST 5: anchored match (failed)
---- config
-    location /re {
-        content_by_lua '
-            it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "a")
-            ngx.say(it())
-        ';
-    }
---- request
-    GET /re
---- response_body
-nil
-
-
-
-=== TEST 6: anchored match (succeeded)
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("12 hello 34", "[0-9]", "a")
-            local m = it()
-            ngx.say(m[0])
-            m = it()
-            ngx.say(m[0])
-            ngx.say(it())
-        ';
-    }
---- request
-    GET /re
---- response_body
-1
-2
-nil
-
-
-
-=== TEST 7: non-anchored gmatch (without regex cache)
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("12 hello 34", "[0-9]")
-            local m = it()
-            ngx.say(m and m[0])
-            m = it()
-            ngx.say(m and m[0])
-            m = it()
-            ngx.say(m and m[0])
-            m = it()
-            ngx.say(m and m[0])
-            m = it()
-            ngx.say(m and m[0])
-        ';
-    }
---- request
-    GET /re
---- response_body
-1
-2
-3
-4
-nil
-
-
-
-=== TEST 8: non-anchored gmatch (with regex cache)
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("12 hello 34", "[0-9]", "o")
-            local m = it()
-            ngx.say(m and m[0])
-            m = it()
-            ngx.say(m and m[0])
-            m = it()
-            ngx.say(m and m[0])
-            m = it()
-            ngx.say(m and m[0])
-            m = it()
-            ngx.say(m and m[0])
-        ';
-    }
---- request
-    GET /re
---- response_body
-1
-2
-3
-4
-nil
-
-
-
-=== TEST 9: anchored match (succeeded)
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("12 hello 34", "[0-9]", "a")
-            local m = it()
-            ngx.say(m[0])
-            m = it()
-            ngx.say(m[0])
-            ngx.say(it())
-        ';
-    }
---- request
-    GET /re
---- response_body
-1
-2
-nil
-
-
-
-=== TEST 10: anchored match (succeeded, set_by_lua)
---- config
-    location /re {
-        set_by_lua $res '
-            local it = ngx.re.gmatch("12 hello 34", "[0-9]", "a")
-            local m = it()
-            return m[0]
-        ';
-        echo $res;
-    }
---- request
-    GET /re
---- response_body
-1
-
-
-
-=== TEST 11: gmatch (look-behind assertion)
---- config
-    location /re {
-        content_by_lua '
-            for m in ngx.re.gmatch("{foobar}, {foobaz}", "(?<=foo)ba[rz]") do
-                if m then
-                    ngx.say(m[0])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-bar
-baz
-
-
-
-=== TEST 12: gmatch (look-behind assertion 2)
---- config
-    location /re {
-        content_by_lua '
-            for m in ngx.re.gmatch("{foobarbaz}", "(?<=foo)bar|(?<=bar)baz") do
-                if m then
-                    ngx.say(m[0])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-bar
-baz
-
-
-
-=== TEST 13: with regex cache
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, 1234", "([A-Z]+)", "io")
-            local m = it()
-            ngx.say(m and m[0])
-
-            it = ngx.re.gmatch("1234, okay", "([A-Z]+)", "io")
-            m = it()
-            ngx.say(m and m[0])
-
-            it = ngx.re.gmatch("hi, 1234", "([A-Z]+)", "o")
-            m = it()
-            ngx.say(m and m[0])
-        ';
-    }
---- 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
-nil
-
-
-
-=== TEST 14: exceeding regex cache max entries
---- http_config
-    lua_regex_cache_max_entries 2;
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "o")
-            local m = it()
-            ngx.say(m and m[0])
-
-            it = ngx.re.gmatch("howdy, 567", "([0-9]+)", "oi")
-            m = it()
-            ngx.say(m and m[0])
-
-            it = ngx.re.gmatch("hiya, 98", "([0-9]+)", "ox")
-            m = it()
-            ngx.say(m and m[0])
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-567
-98
-
-
-
-=== TEST 15: disable regex cache completely
---- http_config
-    lua_regex_cache_max_entries 0;
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, 1234", "([0-9]+)", "o")
-            local m = it()
-            ngx.say(m and m[0])
-
-            it = ngx.re.gmatch("howdy, 567", "([0-9]+)", "oi")
-            local m = it()
-            ngx.say(m and m[0])
-
-            it = ngx.re.gmatch("hiya, 98", "([0-9]+)", "ox")
-            local m = it()
-            ngx.say(m and m[0])
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-567
-98
-
-
-
-=== TEST 16: gmatch matched but no iterate
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+")
-            ngx.say("done")
-        ';
-    }
---- request
-    GET /re
---- response_body
-done
-
-
-
-=== TEST 17: gmatch matched but only iterate once and still matches remain
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched")
-            end
-        ';
-    }
---- request
-    GET /re
---- 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
-            collectgarbage()
-
-            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: []
-
-
-
-=== TEST 21: gmatch with named pattern
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("1234, 1234", "(?<first>[0-9]+)")
-            m = it()
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m["first"])
-            else
-                ngx.say("not matched!")
-            end
-
-            m = it()
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m["first"])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-1234
-1234
-1234
-1234
-1234
-
-
-
-=== TEST 22: gmatch with multiple named pattern
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("1234, abcd, 1234", "(?<first>[0-9]+)|(?<second>[a-z]+)")
-
-            m = it()
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-                ngx.say(m["first"])
-                ngx.say(m["second"])
-            else
-                ngx.say("not matched!")
-            end
-
-            m = it()
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-                ngx.say(m["first"])
-                ngx.say(m["second"])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-1234
-false
-1234
-false
-abcd
-false
-abcd
-false
-abcd
-
-
-
-=== TEST 23: gmatch with duplicate named pattern w/ extraction
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, 1234", "(?<first>[a-z]+), (?<first>[0-9]+)", "D")
-            m = it()
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-                ngx.say(table.concat(m.first,"-"))
-            else
-                ngx.say("not matched!")
-            end
-
-            m = it()
-            if m then
-             ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-                ngx.say(table.concat(m.first,"-"))
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-hello
-1234
-hello-1234
-not matched!
-
-
-
-=== TEST 24: named captures are empty
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("1234", "(?<first>[a-z]*)([0-9]+)", "")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-                ngx.say(m.first)
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-1234
-
-
-
-=== TEST 25: named captures are empty (with regex cache)
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("1234", "(?<first>[a-z]*)([0-9]+)", "o")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-                ngx.say(m.first)
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-1234
-
-
-
-=== TEST 26: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local it, err = ngx.re.gmatch("hello\\nworld", "(abc")
-            if not err then
-                ngx.say("good")
-
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 27: bad UTF-8
---- config
-    location = /t {
-        content_by_lua '
-            local target = "你好"
-            local regex = "你好"
-
-            -- Note the D here
-            local it, err = ngx.re.gmatch(string.sub(target, 1, 4), regex, "u")
-
-            if err then
-                ngx.say("error: ", err)
-                return
-            end
-
-            local m, err = it()
-            if err then
-                ngx.say("error: ", err)
-                return
-            end
-
-            if m then
-                ngx.say("matched: ", m[0])
-            else
-                ngx.say("not matched")
-            end
-        ';
-    }
---- request
-GET /t
---- response_body_like chop
-error: pcre_exec\(\) failed: -10
-
---- no_error_log
-[error]
-
-
-
-=== TEST 28: UTF-8 mode without UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("你好", ".", "U")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 2000
-
---- request
-    GET /re
---- response_body
-你
---- no_error_log
-[error]
-
-
-
-=== TEST 29: UTF-8 mode with UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("你好", ".", "u")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 0
-
---- request
-    GET /re
---- response_body
-你
---- no_error_log
-[error]
-
-
-
-=== TEST 30: just hit match limit
---- http_config
-    lua_regex_match_limit 5000;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local it, err = ngx.re.gmatch(s, re, "o")
-if not it then
-    ngx.say("failed to gen iterator: ", err)
-    return
-end
-
-local res, err = it()
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if not res then
-    if err then
-        ngx.say("error: ", err)
-        return
-    end
-    ngx.say("failed to match")
-    return
-end
-
---- request
-    GET /re
---- response_body
-error: pcre_exec() failed: -8
-
-
-
-=== TEST 31: just not hit match limit
---- http_config
-    lua_regex_match_limit 5100;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local it, err = ngx.re.gmatch(s, re, "o")
-if not it then
-    ngx.say("failed to gen iterator: ", err)
-    return
-end
-
-res, err = it()
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if not res then
-    if err then
-        ngx.say("error: ", err)
-        return
-    end
-    ngx.say("failed to match")
-    return
-end
-
---- request
-    GET /re
---- response_body
-failed to match
diff --git a/debian/modules/http-lua/t/036-sub.t b/debian/modules/http-lua/t/036-sub.t
deleted file mode 100644
index 2b4b075..0000000
--- a/debian/modules/http-lua/t/036-sub.t
+++ /dev/null
@@ -1,757 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 19);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: matched but w/o variables
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[a-z]+", "howdy")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-howdy, world
-1
-
-
-
-=== TEST 2: not matched
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[A-Z]+", "howdy")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world
-0
-
-
-
-=== TEST 3: matched and with variables
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("a b c d", "(b) (c)", "[$0] [$1] [$2] [$3] [$134]")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-a [b c] [b] [c] [] [] d
-1
-
-
-
-=== TEST 4: matched and with named variables
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("a b c d",
-                "(b) (c)", "[$0] [$1] [$2] [$3] [$hello]")
-            if s then
-                ngx.say(s, ": ", n)
-
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-attempt to use named capturing variable "hello" (named captures not supported yet)
-
-
-
-=== TEST 5: matched and with named variables (bracketed)
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("a b c d",
-                "(b) (c)", "[$0] [$1] [$2] [$3] [${hello}]")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-attempt to use named capturing variable "hello" (named captures not supported yet)
-
-
-
-=== TEST 6: matched and with bracketed variables
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [${134}]")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[b c] [b] [c] [] [] d
-1
-
-
-
-=== TEST 7: matched and with bracketed variables (unmatched brackets)
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [${134]")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-the closing bracket in "134" variable is missing
-
-
-
-=== TEST 8: matched and with bracketed variables (unmatched brackets)
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [${134")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-the closing bracket in "134" variable is missing
-
-
-
-=== TEST 9: matched and with bracketed variables (unmatched brackets)
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [${")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-lua script: invalid capturing variable name found in "[$0] [$1] [${2}] [$3] [${"
-
-
-
-=== TEST 10: trailing $
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [$")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-lua script: invalid capturing variable name found in "[$0] [$1] [${2}] [$3] [$"
-
-
-
-=== TEST 11: matched but w/o variables and with literal $
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[a-z]+", "ho$$wdy")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-ho$wdy, world
-1
-
-
-
-=== TEST 12: non-anchored match
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234", "[0-9]", "x")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, x234
-1
-
-
-
-=== TEST 13: anchored match
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234", "[0-9]", "x", "a")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-0
-
-
-
-=== TEST 14: function replace
---- config
-    location /re {
-        content_by_lua '
-            local repl = function (m)
-                return "[" .. m[0] .. "] [" .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.sub("hello, 34", "([0-9])", repl)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, [3] [3]4
-1
-
-
-
-=== TEST 15: function replace (failed)
---- config
-    location /re {
-        content_by_lua '
-            local repl = function (m)
-                return "[" .. m[0] .. "] [" .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.sub("hello, 34", "([A-Z])", repl)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 34
-0
-
-
-
-=== TEST 16: bad repl arg type
---- config
-    location /re {
-        content_by_lua '
-            local rc, s, n = pcall(ngx.re.sub, "hello, 34", "([A-Z])", true)
-            ngx.say(rc)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-false
-bad argument #3 to '?' (string, number, or function expected, got boolean)
-nil
---- SKIP
-
-
-
-=== TEST 17: use number to replace
---- config
-    location /re {
-        content_by_lua '
-            local rc, s, n = pcall(ngx.re.sub, "hello, 34", "([0-9])", 72)
-            ngx.say(rc)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-true
-hello, 724
-1
-
-
-
-=== TEST 18: bad function return value type
---- SKIP
---- config
-    location /re {
-        content_by_lua '
-            local f = function (m) end
-            local rc, s, n = pcall(ngx.re.sub, "hello, 34", "([0-9])", f)
-            ngx.say(rc)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-false
-bad argument #3 to '?' (string or number expected to be returned by the replace function, got nil)
-nil
-
-
-
-=== TEST 19: matched but w/o variables (set_by_lua)
---- config
-    location /re {
-        set_by_lua $res '
-            local s, n = ngx.re.sub("hello, world", "[a-z]+", "howdy")
-            return s
-        ';
-        echo $res;
-    }
---- request
-    GET /re
---- response_body
-howdy, world
-
-
-
-=== TEST 20: matched and with variables w/o using named patterns in sub
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("a b c d", "(?<first>b) (?<second>c)", "[$0] [$1] [$2] [$3] [$134]")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-a [b c] [b] [c] [] [] d
-1
-
-
-
-=== TEST 21: matched and with variables using named patterns in func
---- config
-    error_log /tmp/nginx_error debug;
-    location /re {
-        content_by_lua '
-            local repl = function (m)
-                return "[" .. m[0] .. "] [" .. m["first"] .. "] [" .. m[2] .. "]"
-            end
-
-            local s, n = ngx.re.sub("a b c d", "(?<first>b) (?<second>c)", repl)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-a [b c] [b] [c] d
-1
---- no_error_log
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 22: matched and with variables w/ using named patterns in sub
-This is still a TODO
---- SKIP
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("a b c d", "(?<first>b) (?<second>c)", "[$0] [${first}] [${second}] [$3] [$134]")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-a [b c] [b] [c] [] [] d
-1
---- no_error_log
-[error]
-
-
-
-=== TEST 23: $0 without parens
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("a b c d", [[\w]], "[$0]")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[a] b c d
-1
---- no_error_log
-[error]
-
-
-
-=== TEST 24: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("hello\\nworld", "(abc", "")
-            if s then
-                ngx.say("subs: ", n)
-
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 25: bad UTF-8
---- config
-    location = /t {
-        content_by_lua '
-            local target = "你好"
-            local regex = "你好"
-
-            -- Note the D here
-            local s, n, err = ngx.re.sub(string.sub(target, 1, 4), regex, "", "u")
-
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-GET /t
---- response_body_like chop
-error: pcre_exec\(\) failed: -10
-
---- no_error_log
-[error]
-
-
-
-=== TEST 26: UTF-8 mode without UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("你好", ".", "a", "U")
-            if s then
-                ngx.say("s: ", s)
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 2000
-
---- request
-    GET /re
---- response_body
-s: a好
---- no_error_log
-[error]
-
-
-
-=== TEST 27: UTF-8 mode with UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("你好", ".", "a", "u")
-            if s then
-                ngx.say("s: ", s)
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 0
-
---- request
-    GET /re
---- response_body
-s: a好
---- no_error_log
-[error]
-
-
-
-=== TEST 28: just hit match limit
---- http_config
-    lua_regex_match_limit 5000;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local res, cnt, err = ngx.re.sub(s, re, "", "o")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if err then
-    ngx.say("error: ", err)
-    return
-end
-ngx.say("sub: ", cnt)
-
---- request
-    GET /re
---- response_body
-error: pcre_exec() failed: -8
-
-
-
-=== TEST 29: just not hit match limit
---- http_config
-    lua_regex_match_limit 5100;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-local s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local res, cnt, err = ngx.re.sub(s, re, "", "o")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if err then
-    ngx.say("error: ", err)
-    return
-end
-ngx.say("sub: ", cnt)
-
---- request
-    GET /re
---- response_body
-sub: 0
-
-
-
-=== TEST 30: bug: sub incorrectly swallowed a character is the first character
-Original bad result: estCase
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("TestCase", "^ *", "", "o")
-            if s then
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-TestCase
-
-
-
-=== TEST 31: bug: sub incorrectly swallowed a character is not the first character
-Original bad result: .b.d
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("abcd", "(?=c)", ".")
-            if s then
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-ab.cd
-
-
-
-=== TEST 32: ngx.re.gsub: recursive calling (github #445)
---- config
-
-location = /t {
-    content_by_lua '
-        function test()
-            local data = [[
-                OUTER {FIRST}
-]]
-
-            local p1 = "(OUTER)(.+)"
-            local p2 = "{([A-Z]+)}"
-
-            ngx.print(data)
-
-            local res =  ngx.re.gsub(data, p1, function(m)
-                -- ngx.say("pre: m[1]: [", m[1], "]")
-                -- ngx.say("pre: m[2]: [", m[2], "]")
-
-                local res = ngx.re.gsub(m[2], p2, function(_)
-                    return "REPLACED"
-                end, "")
-
-                -- ngx.say("post: m[1]: [", m[1], "]")
-                -- ngx.say("post m[2]: [", m[2], "]")
-                return m[1] .. res
-            end, "")
-
-            ngx.print(res)
-        end
-
-        test()
-    ';
-}
---- request
-GET /t
---- response_body
-                OUTER {FIRST}
-                OUTER REPLACED
---- no_error_log
-[error]
-bad argument type
-NYI
-
-
-
-=== TEST 33: function replace (false for groups)
---- config
-    location /re {
-        content_by_lua '
-            local repl = function (m)
-                print("group 1: ", m[2])
-                return "[" .. m[0] .. "] [" .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.sub("hello, 34", "([0-9])|(world)", repl)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, [3] [3]4
-1
---- error_log
-group 1: false
diff --git a/debian/modules/http-lua/t/037-gsub.t b/debian/modules/http-lua/t/037-gsub.t
deleted file mode 100644
index 4c5810d..0000000
--- a/debian/modules/http-lua/t/037-gsub.t
+++ /dev/null
@@ -1,699 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 17);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("[hello, world]", "[a-z]+", "howdy")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[howdy, howdy]
-2
-
-
-
-=== TEST 2: trimmed
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "[a-z]+", "howdy")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-howdy, howdy
-2
-
-
-
-=== TEST 3: not matched
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "[A-Z]+", "howdy")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world
-0
-
-
-
-=== TEST 4: replace by function (trimmed)
---- config
-    location /re {
-        content_by_lua '
-            local f = function (m)
-                return "[" .. m[0] .. "," .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.gsub("hello, world", "([a-z])[a-z]+", f)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[hello,h], [world,w]
-2
-
-
-
-=== TEST 5: replace by function (not trimmed)
---- config
-    location /re {
-        content_by_lua '
-            local f = function (m)
-                return "[" .. m[0] .. "," .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.gsub("{hello, world}", "([a-z])[a-z]+", f)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-{[hello,h], [world,w]}
-2
-
-
-
-=== TEST 6: replace by script (trimmed)
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "([a-z])[a-z]+", "[$0,$1]")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[hello,h], [world,w]
-2
-
-
-
-=== TEST 7: replace by script (not trimmed)
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("{hello, world}", "([a-z])[a-z]+", "[$0,$1]")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-{[hello,h], [world,w]}
-2
-
-
-
-=== TEST 8: set_by_lua
---- config
-    location /re {
-        set_by_lua $res '
-            local f = function (m)
-                return "[" .. m[0] .. "," .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.gsub("{hello, world}", "([a-z])[a-z]+", f)
-            return s
-        ';
-        echo $res;
-    }
---- request
-    GET /re
---- response_body
-{[hello,h], [world,w]}
-
-
-
-=== TEST 9: look-behind assertion
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("{foobarbaz}", "(?<=foo)bar|(?<=bar)baz", "h$0")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-{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]
-
-
-
-=== TEST 18: named pattern repl w/ callback
---- config
-    location /re {
-       content_by_lua '
-            local repl = function (m)
-                return "[" .. m[0] .. "," .. m["first"] .. "]"
-            end
-
-            local s, n = ngx.re.gsub("hello, world", "(?<first>[a-z])[a-z]+", repl)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[hello,h], [world,w]
-2
-
-
-
-=== TEST 19: $0 without parens
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("a b c d", [[\w]], "[$0]")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[a] [b] [c] [d]
-4
---- no_error_log
-[error]
-
-
-
-=== TEST 20: bad UTF-8
---- config
-    location = /t {
-        content_by_lua '
-            local target = "你好"
-            local regex = "你好"
-
-            -- Note the D here
-            local s, n, err = ngx.re.gsub(string.sub(target, 1, 4), regex, "", "u")
-
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-       ';
-    }
---- request
-GET /t
---- response_body_like chop
-error: pcre_exec\(\) failed: -10
-
---- no_error_log
-[error]
-
-
-
-=== TEST 21: UTF-8 mode without UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.gsub("你好", ".", "a", "U")
-            if s then
-                ngx.say("s: ", s)
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 2000
-exec opts: 2000
-exec opts: 2000
-
---- request
-    GET /re
---- response_body
-s: aa
---- no_error_log
-[error]
-
-
-
-=== TEST 22: UTF-8 mode with UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.gsub("你好", ".", "a", "u")
-            if s then
-                ngx.say("s: ", s)
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 0
-exec opts: 0
-exec opts: 0
-
---- request
-    GET /re
---- response_body
-s: aa
---- no_error_log
-[error]
-
-
-
-=== TEST 23: just hit match limit
---- http_config
-    lua_regex_match_limit 5000;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local res, cnt, err = ngx.re.gsub(s, re, "", "o")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if err then
-    ngx.say("error: ", err)
-    return
-end
-ngx.say("gsub: ", cnt)
-
---- request
-    GET /re
---- response_body
-error: pcre_exec() failed: -8
-
-
-
-=== TEST 24: just not hit match limit
---- http_config
-    lua_regex_match_limit 5100;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-local s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local res, cnt, err = ngx.re.gsub(s, re, "", "o")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if err then
-    ngx.say("error: ", err)
-    return
-end
-ngx.say("gsub: ", cnt)
-
---- request
-    GET /re
---- response_body
-gsub: 0
---- timeout: 10
-
-
-
-=== TEST 25: bug: gsub incorrectly swallowed a character is the first character
-Original bad result: estCase
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("TestCase", "^ *", "", "o")
-            if s then
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-TestCase
-
-
-
-=== TEST 26: bug: gsub incorrectly swallowed a character is not the first character
-Original bad result: .b.d
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("abcd", "a|(?=c)", ".")
-            if s then
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-.b.cd
-
-
-
-=== TEST 27: use of ngx.req.get_headers in the user callback
---- config
-
-location = /t {
-    content_by_lua '
-        local data = [[
-            INNER
-            INNER
-]]
-
-        -- ngx.say(data)
-
-        local res =  ngx.re.gsub(data, "INNER", function(inner_matches)
-            local header = ngx.req.get_headers()["Host"]
-            -- local header = ngx.var["http_HEADER"]
-            return "INNER_REPLACED"
-        end, "s")
-
-        ngx.print(res)
-    ';
-}
-
---- request
-GET /t
---- response_body
-            INNER_REPLACED
-            INNER_REPLACED
-
---- no_error_log
-[error]
-
-
-
-=== TEST 28: use of ngx.var in the user callback
---- config
-
-location = /t {
-    content_by_lua '
-        local data = [[
-            INNER
-            INNER
-]]
-
-        -- ngx.say(data)
-
-        local res =  ngx.re.gsub(data, "INNER", function(inner_matches)
-            -- local header = ngx.req.get_headers()["Host"]
-            local header = ngx.var["http_HEADER"]
-            return "INNER_REPLACED"
-        end, "s")
-
-        ngx.print(res)
-    ';
-}
-
---- request
-GET /t
---- response_body
-            INNER_REPLACED
-            INNER_REPLACED
-
---- no_error_log
-[error]
-
-
-
-=== TEST 29: function replace (false for groups)
---- config
-    location /re {
-        content_by_lua '
-            local repl = function (m)
-                print("group 1: ", m[2])
-                return "[" .. m[0] .. "] [" .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.gsub("hello, 34", "([0-9])|(world)", repl)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, [3] [3][4] [4]
-2
---- error_log
-group 1: false
diff --git a/debian/modules/http-lua/t/038-match-o.t b/debian/modules/http-lua/t/038-match-o.t
deleted file mode 100644
index d61ff1f..0000000
--- a/debian/modules/http-lua/t/038-match-o.t
+++ /dev/null
@@ -1,742 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 3);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 2: escaping sequences
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\\\d+)", "o")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 3: escaping sequences (bad)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "(\\d+)", "o")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-[qr/invalid escape sequence near '"\('/]
-
-
-
-=== TEST 4: escaping sequences in [[ ... ]]
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "[[\\d+]]", "o")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-[qr/invalid escape sequence near '"\[\['/]
-
-
-
-=== TEST 5: single capture
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]{2})[0-9]+", "o")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-12
-
-
-
-=== TEST 6: multiple captures
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([a-z]+).*?([0-9]{2})[0-9]+", "o")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-hello
-12
-
-
-
-=== TEST 7: not matched
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "foo", "o")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched: nil
-
-
-
-=== TEST 8: case sensitive by default
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO", "o")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched: nil
-
-
-
-=== TEST 9: case sensitive by default
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "HELLO", "oi")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-
-
-
-=== TEST 10: UTF-8 mode
---- config
-    location /re {
-        content_by_lua '
-            local rc, m = pcall(ngx.re.match, "hello章亦春", "HELLO.{2}", "iou")
-            if not rc then
-                ngx.say("error: ", m)
-                return
-            end
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body_like chop
-this version of PCRE is not compiled with PCRE_UTF8 support|^hello章亦$
-
-
-
-=== TEST 11: multi-line mode (^ at line head)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "mo")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-world
-
-
-
-=== TEST 12: multi-line mode (. does not match \n)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "om")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-
-
-
-=== TEST 13: single-line mode (^ as normal)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", "^world", "so")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched: nil
-
-
-
-=== TEST 14: single-line mode (dot all)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", ".*", "os")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-world
-
-
-
-=== TEST 15: extended mode (ignore whitespaces)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello\\nworld", "\\\\w     \\\\w", "xo")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-he
-
-
-
-=== TEST 16: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local m, err = ngx.re.match("hello\\nworld", "(abc", "o")
-            if m then
-                ngx.say(m[0])
-
-            else
-                if err then
-                    ngx.say("error: ", err)
-
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 17: bad option
---- config
-    location /re {
-        content_by_lua '
-            rc, m = pcall(ngx.re.match, "hello\\nworld", ".*", "Ho")
-            if rc then
-                if m then
-                    ngx.say(m[0])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            else
-                ngx.say("error: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body_like chop
-^error: .*?unknown flag "H"
-
-
-
-=== TEST 18: extended mode (ignore whitespaces)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, world", "(world)|(hello)", "xo")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched: ", m)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-false
-hello
-
-
-
-=== TEST 19: optional trailing captures
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)(h?)", "o")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body eval
-"1234
-1234
-
-"
-
-
-
-=== TEST 20: anchored match (failed)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "oa")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched!
-
-
-
-=== TEST 21: anchored match (succeeded)
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("1234, hello", "([0-9]+)", "ao")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 22: match with ctx but no pos
---- config
-    location /re {
-        content_by_lua '
-            local ctx = {}
-            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
-            if m then
-                ngx.say(m[0])
-                ngx.say(ctx.pos)
-            else
-                ngx.say("not matched!")
-                ngx.say(ctx.pos)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-5
-
-
-
-=== TEST 23: match with ctx and a pos
---- config
-    location /re {
-        content_by_lua '
-            local ctx = { pos = 3 }
-            m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
-            if m then
-                ngx.say(m[0])
-                ngx.say(ctx.pos)
-            else
-                ngx.say("not matched!")
-                ngx.say(ctx.pos)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-34
-5
-
-
-
-=== TEST 24: sanity (set_by_lua)
---- config
-    location /re {
-        set_by_lua $res '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
-            if m then
-                return m[0]
-            else
-                return "not matched!"
-            end
-        ';
-        echo $res;
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-
-=== TEST 25: match (look-behind assertion)
---- config
-    location /re {
-        content_by_lua '
-            local ctx = {}
-            local m = ngx.re.match("{foobarbaz}", "(?<=foo)bar|(?<=bar)baz", "o", ctx)
-            ngx.say(m and m[0])
-
-            m = ngx.re.match("{foobarbaz}", "(?<=foo)bar|(?<=bar)baz", "o", ctx)
-            ngx.say(m and m[0])
-        ';
-    }
---- request
-    GET /re
---- response_body
-bar
-baz
-
-
-
-=== TEST 26: match (with regex cache)
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([A-Z]+)", "io")
-            ngx.say(m and m[0])
-
-            m = ngx.re.match("1234, okay", "([A-Z]+)", "io")
-            ngx.say(m and m[0])
-
-            m = ngx.re.match("hello, 1234", "([A-Z]+)", "o")
-            ngx.say(m and m[0])
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-okay
-nil
-
-
-
-=== TEST 27: match (with regex cache and ctx)
---- config
-    location /re {
-        content_by_lua '
-            local ctx = {}
-            local m = ngx.re.match("hello, 1234", "([A-Z]+)", "io", ctx)
-            ngx.say(m and m[0])
-            ngx.say(ctx.pos)
-
-            m = ngx.re.match("1234, okay", "([A-Z]+)", "io", ctx)
-            ngx.say(m and m[0])
-            ngx.say(ctx.pos)
-
-            ctx.pos = 1
-            m = ngx.re.match("hi, 1234", "([A-Z]+)", "o", ctx)
-            ngx.say(m and m[0])
-            ngx.say(ctx.pos)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-6
-okay
-11
-nil
-1
-
-
-
-=== TEST 28: exceeding regex cache max entries
---- http_config
-    lua_regex_cache_max_entries 2;
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
-            ngx.say(m and m[0])
-
-            m = ngx.re.match("howdy, 567", "([0-9]+)", "oi")
-            ngx.say(m and m[0])
-
-            m = ngx.re.match("hiya, 98", "([0-9]+)", "ox")
-            ngx.say(m and m[0])
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-567
-98
-
-
-
-=== TEST 29: disable regex cache completely
---- http_config
-    lua_regex_cache_max_entries 0;
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, 1234", "([0-9]+)", "o")
-            ngx.say(m and m[0])
-
-            m = ngx.re.match("howdy, 567", "([0-9]+)", "oi")
-            ngx.say(m and m[0])
-
-            m = ngx.re.match("hiya, 98", "([0-9]+)", "ox")
-            ngx.say(m and m[0])
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-567
-98
-
-
-
-=== TEST 30: named subpatterns w/ extraction
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(?<first>[a-z]+), [0-9]+", "o")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m.first)
-                ngx.say(m.second)
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-hello
-hello
-nil
-
-
-
-=== TEST 31: duplicate named subpatterns w/ extraction
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, 1234", "(?<first>[a-z]+), (?<first>[0-9]+)", "Do")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-                ngx.say(table.concat(m.first,"-"))
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-hello
-1234
-hello-1234
-
-
-
-=== TEST 32: named captures are empty strings
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("1234", "(?<first>[a-z]*)([0-9]+)", "o")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m.first)
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
-
-1234
-
-
-
-=== TEST 33: named captures are false
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("hello, world", "(world)|(hello)|(?<named>howdy)", "o")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-                ngx.say(m[3])
-                ngx.say(m["named"])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-false
-hello
-false
-false
diff --git a/debian/modules/http-lua/t/039-sub-o.t b/debian/modules/http-lua/t/039-sub-o.t
deleted file mode 100644
index 580a671..0000000
--- a/debian/modules/http-lua/t/039-sub-o.t
+++ /dev/null
@@ -1,580 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 6);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: matched but w/o variables
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[a-z]+", "howdy", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-howdy, world
-1
-
-
-
-=== TEST 2: not matched
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[A-Z]+", "howdy", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world
-0
-
-
-
-=== TEST 3: matched and with variables
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("a b c d", "(b) (c)", "[$0] [$1] [$2] [$3] [$134]", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-a [b c] [b] [c] [] [] d
-1
-
-
-
-=== TEST 4: matched and with named variables (bad template)
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("a b c d",
-                                         "(b) (c)",
-                                         "[$0] [$1] [$2] [$3] [$hello]",
-                                         "o")
-            if s then
-                ngx.say(s, ": ", n)
-
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-attempt to use named capturing variable "hello" (named captures not supported yet)
-
-
-
-=== TEST 5: matched and with named variables (bracketed)
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("a b c d",
-                                         "(b) (c)",
-                                         "[$0] [$1] [$2] [$3] [${hello}]",
-                                         "o")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-attempt to use named capturing variable "hello" (named captures not supported yet)
-
-
-
-=== TEST 6: matched and with bracketed variables
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [${134}]", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[b c] [b] [c] [] [] d
-1
-
-
-
-=== TEST 7: matched and with bracketed variables (unmatched brackets)
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [${134]", "o")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-the closing bracket in "134" variable is missing
-
-
-
-=== TEST 8: matched and with bracketed variables (unmatched brackets)
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [${134", "o")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-the closing bracket in "134" variable is missing
-
-
-
-=== TEST 9: matched and with bracketed variables (unmatched brackets)
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [${", "o")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-lua script: invalid capturing variable name found in "[$0] [$1] [${2}] [$3] [${"
-
-
-
-=== TEST 10: trailing $
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("b c d", "(b) (c)", "[$0] [$1] [${2}] [$3] [$", "o")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: failed to compile the replacement template
---- error_log
-lua script: invalid capturing variable name found in "[$0] [$1] [${2}] [$3] [$"
-
-
-
-=== TEST 11: matched but w/o variables and with literal $
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[a-z]+", "ho$$wdy", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-ho$wdy, world
-1
-
-
-
-=== TEST 12: non-anchored match
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234", " [0-9] ", "x", "xo")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, x234
-1
-
-
-
-=== TEST 13: anchored match
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234", "[0-9]", "x", "ao")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 1234
-0
-
-
-
-=== TEST 14: function replace
---- config
-    location /re {
-        content_by_lua '
-            local repl = function (m)
-                return "[" .. m[0] .. "] [" .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.sub("hello, 34", "([0-9])", repl, "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, [3] [3]4
-1
-
-
-
-=== TEST 15: function replace (failed)
---- config
-    location /re {
-        content_by_lua '
-            local repl = function (m)
-                return "[" .. m[0] .. "] [" .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.sub("hello, 34", "([A-Z])", repl, "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 34
-0
-
-
-
-=== TEST 16: bad repl arg type
---- SKIP
---- config
-    location /re {
-        content_by_lua '
-            local rc, s, n = pcall(ngx.re.sub, "hello, 34", "([A-Z])", true, "o")
-            ngx.say(rc)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-false
-bad argument #3 to '?' (string, number, or function expected, got boolean)
-nil
-
-
-
-=== TEST 17: use number to replace
---- config
-    location /re {
-        content_by_lua '
-            local rc, s, n = pcall(ngx.re.sub, "hello, 34", "([0-9])", 72, "o")
-            ngx.say(rc)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-true
-hello, 724
-1
-
-
-
-=== TEST 18: bad function return value type
---- SKIP
---- config
-    location /re {
-        content_by_lua '
-            local f = function (m) end
-            local rc, s, n = pcall(ngx.re.sub, "hello, 34", "([0-9])", f, "o")
-            ngx.say(rc)
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-false
-bad argument #3 to '?' (string or number expected to be returned by the replace function, got nil)
-nil
-
-
-
-=== TEST 19: matched but w/o variables (set_by_lua)
---- config
-    location /re {
-        set_by_lua $res '
-            local s, n = ngx.re.sub("hello, world", "[a-z]+", "howdy", "o")
-            return s
-        ';
-        echo $res;
-    }
---- request
-    GET /re
---- response_body
-howdy, world
-
-
-
-=== TEST 20: with regex cache (with text replace)
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234", "([A-Z]+)", "baz", "io")
-            ngx.say(s)
-            ngx.say(n)
-
-            local s, n = ngx.re.sub("howdy, 1234", "([A-Z]+)", "baz", "io")
-            ngx.say(s)
-            ngx.say(n)
-
-
-            s, n = ngx.re.sub("1234, okay", "([A-Z]+)", "blah", "io")
-            ngx.say(s)
-            ngx.say(n)
-
-            s, n = ngx.re.sub("hi, 1234", "([A-Z]+)", "hello", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-baz, 1234
-1
-baz, 1234
-1
-1234, blah
-1
-hi, 1234
-0
-
-
-
-=== TEST 21: with regex cache (with func replace)
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234", "([A-Z]+)", "baz", "io")
-            ngx.say(s)
-            ngx.say(n)
-
-            local s, n = ngx.re.sub("howdy, 1234", "([A-Z]+)", function () return "bah" end, "io")
-            ngx.say(s)
-            ngx.say(n)
-
-            s, n = ngx.re.sub("1234, okay", "([A-Z]+)", function () return "blah" end, "io")
-            ngx.say(s)
-            ngx.say(n)
-
-            s, n = ngx.re.sub("hi, 1234", "([A-Z]+)", "hello", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-baz, 1234
-1
-bah, 1234
-1
-1234, blah
-1
-hi, 1234
-0
-
-
-
-=== TEST 22: exceeding regex cache max entries
---- http_config
-    lua_regex_cache_max_entries 2;
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234", "([0-9]+)", "hello", "o")
-            ngx.say(s)
-            ngx.say(n)
-
-            s, n = ngx.re.sub("howdy, 567", "([0-9]+)", "hello", "oi")
-            ngx.say(s)
-            ngx.say(n)
-
-            s, n = ngx.re.sub("hiya, 98", "([0-9]+)", "hello", "ox")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, hello
-1
-howdy, hello
-1
-hiya, hello
-1
-
-
-
-=== TEST 23: disable regex cache completely
---- http_config
-    lua_regex_cache_max_entries 0;
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234", "([0-9]+)", "hello", "o")
-            ngx.say(s)
-            ngx.say(n)
-
-            s, n = ngx.re.sub("howdy, 567", "([0-9]+)", "hello", "oi")
-            ngx.say(s)
-            ngx.say(n)
-
-            s, n = ngx.re.sub("hiya, 98", "([0-9]+)", "hello", "ox")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, hello
-1
-howdy, hello
-1
-hiya, hello
-1
-
-
-
-=== TEST 24: empty replace
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234", "([0-9]+)", "", "o")
-            ngx.say(s)
-            ngx.say(n)
-
-            local s, n = ngx.re.sub("hi, 5432", "([0-9]+)", "", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, 
-1
-hi, 
-1
-
-
-
-=== TEST 25: matched and with variables w/o using named patterns in sub
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("a b c d", "(?<first>b) (?<second>c)", "[$0] [$1] [$2] [$3] [$134]", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-a [b c] [b] [c] [] [] d
-1
-
-
-
-=== TEST 26: matched and with variables using named patterns in func
---- config
-    error_log /tmp/nginx_error debug;
-    location /re {
-        content_by_lua '
-            local repl = function (m)
-                return "[" .. m[0] .. "] [" .. m["first"] .. "] [" .. m[2] .. "]"
-            end
-
-            local s, n = ngx.re.sub("a b c d", "(?<first>b) (?<second>c)", repl, "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-a [b c] [b] [c] d
-1
diff --git a/debian/modules/http-lua/t/040-gsub-o.t b/debian/modules/http-lua/t/040-gsub-o.t
deleted file mode 100644
index 5347266..0000000
--- a/debian/modules/http-lua/t/040-gsub-o.t
+++ /dev/null
@@ -1,200 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("[hello, world]", "[a-z]+", "howdy", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[howdy, howdy]
-2
-
-
-
-=== TEST 2: trimmed
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "[a-z]+", "howdy", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-howdy, howdy
-2
-
-
-
-=== TEST 3: not matched
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "[A-Z]+", "howdy", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world
-0
-
-
-
-=== TEST 4: replace by function (trimmed)
---- config
-    location /re {
-        content_by_lua '
-            local f = function (m)
-                return "[" .. m[0] .. "," .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.gsub("hello, world", "([a-z])[a-z]+", f, "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[hello,h], [world,w]
-2
-
-
-
-=== TEST 5: replace by function (not trimmed)
---- config
-    location /re {
-        content_by_lua '
-            local f = function (m)
-                return "[" .. m[0] .. "," .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.gsub("{hello, world}", "([a-z])[a-z]+", f, "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-{[hello,h], [world,w]}
-2
-
-
-
-=== TEST 6: replace by script (trimmed)
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "([a-z])[a-z]+", "[$0,$1]", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[hello,h], [world,w]
-2
-
-
-
-=== TEST 7: replace by script (not trimmed)
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("{hello, world}", "([a-z])[a-z]+", "[$0,$1]", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-{[hello,h], [world,w]}
-2
-
-
-
-=== TEST 8: set_by_lua
---- config
-    location /re {
-        set_by_lua $res '
-            local f = function (m)
-                return "[" .. m[0] .. "," .. m[1] .. "]"
-            end
-
-            local s, n = ngx.re.gsub("{hello, world}", "([a-z])[a-z]+", f, "o")
-            return s
-        ';
-        echo $res;
-    }
---- request
-    GET /re
---- response_body
-{[hello,h], [world,w]}
-
-
-
-=== TEST 9: look-behind assertion
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("{foobarbaz}", "(?<=foo)bar|(?<=bar)baz", "h$0", "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-{foohbarhbaz}
-2
-
-
-
-=== TEST 10: named pattern repl w/ callback
---- config
-    location /re {
-       content_by_lua '
-            local repl = function (m)
-                return "[" .. m[0] .. "," .. m["first"] .. "]"
-            end
-
-            local s, n = ngx.re.gsub("hello, world", "(?<first>[a-z])[a-z]+", repl, "o")
-            ngx.say(s)
-            ngx.say(n)
-        ';
-    }
---- request
-    GET /re
---- response_body
-[hello,h], [world,w]
-2
diff --git a/debian/modules/http-lua/t/041-header-filter.t b/debian/modules/http-lua/t/041-header-filter.t
deleted file mode 100644
index 7d8ee74..0000000
--- a/debian/modules/http-lua/t/041-header-filter.t
+++ /dev/null
@@ -1,796 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-log_level('debug');
-
-repeat_each(2);
-
-plan tests => repeat_each() * 94;
-
-#no_diff();
-#no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set response content-type header
---- config
-    location /read {
-        echo "Hi";
-        header_filter_by_lua '
-            ngx.header.content_type = "text/my-plain";
-        ';
-
-    }
---- request
-GET /read
---- response_headers
-Content-Type: text/my-plain
---- response_body
-Hi
-
-
-
-=== TEST 2: server config
---- config
-    header_filter_by_lua '
-        ngx.header.content_type = "text/my-plain";
-    ';
-
-    location /read {
-        echo "Hi";
-
-    }
---- request
-GET /read
---- response_headers
-Content-Type: text/my-plain
---- response_body
-Hi
-
-
-
-=== TEST 3: set in http
---- http_config
-    header_filter_by_lua '
-        ngx.header.content_type = "text/my-plain";
-    ';
---- config
-    location /read {
-        echo "Hi";
-    }
---- request
-GET /read
---- response_headers
-Content-Type: text/my-plain
---- response_body
-Hi
-
-
-
-=== TEST 4: overriding config
---- config
-    header_filter_by_lua '
-        ngx.header.content_type = "text/my-plain";
-    ';
-    location /read {
-        echo "Hi";
-        header_filter_by_lua '
-            ngx.header.content_type = "text/read-plain";
-        ';
-    }
---- request
-GET /read
---- response_headers
-Content-Type: text/read-plain
---- response_body
-Hi
-
-
-
-=== TEST 5: set response content-type header
---- config
-    location /read {
-        echo "Hi";
-        header_filter_by_lua '
-            ngx.header.content_type = "text/my-plain";
-        ';
-
-    }
---- request
-GET /read
---- response_headers
-Content-Type: text/my-plain
---- response_body
-Hi
-
-
-
-=== TEST 6: lua code run failed
---- config
-    location /read {
-        echo "Hi";
-        header_filter_by_lua '
-            ngx.header.content_length = "text/my-plain";
-        ';
-    }
---- request
-GET /read
---- error_code
---- response_body
-
-
-
-=== TEST 7: use variable generated by content phrase
---- config
-   location /read {
-        set $strvar '1';
-        content_by_lua '
-            ngx.var.strvar = "127.0.0.1:8080";
-            ngx.say("Hi");
-        ';
-        header_filter_by_lua '
-            ngx.header.uid = ngx.var.strvar;
-        ';
-    }
---- request
-GET /read
---- response_headers
-uid: 127.0.0.1:8080
---- response_body
-Hi
-
-
-
-=== TEST 8: use variable generated by content phrase for HEAD
---- config
-   location /read {
-        set $strvar '1';
-        content_by_lua '
-            ngx.var.strvar = "127.0.0.1:8080";
-            ngx.say("Hi");
-        ';
-        header_filter_by_lua '
-            ngx.header.uid = ngx.var.strvar;
-        ';
-    }
---- request
-HEAD /read
---- response_headers
-uid: 127.0.0.1:8080
---- response_body
-
-
-
-=== TEST 9: use variable generated by content phrase for HTTP 1.0
---- config
-   location /read {
-        set $strvar '1';
-        content_by_lua '
-            ngx.var.strvar = "127.0.0.1:8080";
-            ngx.say("Hi");
-        ';
-        header_filter_by_lua '
-            ngx.header.uid = ngx.var.strvar;
-        ';
-
-    }
---- request
-GET /read HTTP/1.0
---- response_headers
-uid: 127.0.0.1:8080
---- response_body
-Hi
-
-
-
-=== TEST 10: use capture and header_filter_by
---- config
-   location /sub {
-        content_by_lua '
-            ngx.say("Hi");
-        ';
-        header_filter_by_lua '
-            ngx.header.uid = "sub";
-        ';
-    }
-
-    location /parent {
-        content_by_lua '
-            local res = ngx.location.capture("/sub")
-            if res.status == 200 then
-                ngx.say(res.header.uid)
-            else
-                ngx.say("parent")
-            end
-        ';
-        header_filter_by_lua '
-            ngx.header.uid = "parent";
-        ';
-    }
-
---- request
-GET /parent
---- response_headers
-uid: parent
---- response_body
-sub
-
-
-
-=== TEST 11: overriding ctx
---- config
-    location /lua {
-        content_by_lua '
-            ngx.ctx.foo = 32;
-            ngx.say(ngx.ctx.foo)
-        ';
-        header_filter_by_lua '
-            ngx.ctx.foo = ngx.ctx.foo + 1;
-            ngx.header.uid = ngx.ctx.foo;
-        ';
-    }
---- request
-GET /lua
---- response_headers
-uid: 33
---- response_body
-32
-
-
-
-=== TEST 12: use req
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("Hi");
-        ';
-
-        header_filter_by_lua '
-            local str = "";
-            local args, err = ngx.req.get_uri_args()
-            if err then
-                ngx.log(ngx.ERR, "err: ", err)
-                return ngx.exit(500)
-            end
-            local keys = {}
-            for key, val in pairs(args) do
-                table.insert(keys, key)
-            end
-            table.sort(keys)
-            for i, key in ipairs(keys) do
-                local val = args[key]
-                if type(val) == "table" then
-                    str = str .. table.concat(val, ", ")
-                else
-                    str = str .. ":" .. val
-                end
-            end
-
-            ngx.header.uid = str;
-        ';
-    }
---- request
-GET /lua?a=1&b=2
---- response_headers
-uid: :1:2
---- response_body
-Hi
-
-
-
-=== TEST 13: use ngx md5 function
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("Hi");
-        ';
-        header_filter_by_lua '
-            ngx.header.uid = ngx.md5("Hi");
-        ';
-    }
---- request
-GET /lua
---- response_headers
-uid: c1a5298f939e87e8f962a5edfc206918
---- response_body
-Hi
-
-
-
-=== TEST 14: set response content-type header (by file)
---- config
-    location /read {
-        echo "Hi";
-        header_filter_by_lua_file 'html/foo.lua';
-    }
---- request
-GET /read
---- user_files
->>> foo.lua
-ngx.header.content_type = "text/my-plain";
---- response_headers
-Content-Type: text/my-plain
---- response_body
-Hi
-
-
-
-=== TEST 15: by_lua_file server config
---- config
-    header_filter_by_lua_file 'html/foo.lua';
-
-    location /read {
-        echo "Hi";
-    }
---- request
-GET /read
---- user_files
->>> foo.lua
-ngx.header.content_type = "text/my-plain";
---- response_headers
-Content-Type: text/my-plain
---- response_body
-Hi
-
-
-
-=== TEST 16: by_lua_file set in http
---- http_config
-    header_filter_by_lua_file 'html/foo.lua';
---- config
-    location /read {
-        echo "Hi";
-    }
---- request
-GET /read
---- user_files
->>> foo.lua
-ngx.header.content_type = "text/my-plain";
---- response_headers
-Content-Type: text/my-plain
---- response_body
-Hi
-
-
-
-=== TEST 17: by_lua_file overriding config
---- config
-    header_filter_by_lua 'html/foo.lua';
-    location /read {
-        echo "Hi";
-        header_filter_by_lua_file 'html/bar.lua';
-    }
---- request
-GET /read
---- user_files
->>> foo.lua
-ngx.header.content_type = "text/my-plain";
->>> bar.lua
-ngx.header.content_type = "text/read-plain";
---- response_headers
-Content-Type: text/read-plain
---- response_body
-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*: 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.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 31: 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 32: 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 33: 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 34: 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 35: 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 36: 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 37: 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 38: 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 39: 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'
-
-
-
-=== TEST 40: Lua file does not exist
---- config
-    location /lua {
-        echo ok;
-        header_filter_by_lua_file html/test2.lua;
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- ignore_response
---- error_log eval
-qr/failed to load external Lua file ".*?test2\.lua": cannot open .*? No such file or directory/
-
-
-
-=== TEST 41: filter finalize
---- config
-    error_page 582 = /bar;
-    location = /t {
-        echo ok;
-        header_filter_by_lua '
-            return ngx.exit(582)
-        ';
-    }
-
-    location = /bar {
-        echo hi;
-        header_filter_by_lua '
-            return ngx.exit(302)
-        ';
-    }
---- request
-GET /t
---- response_body_like: 302 Found
---- error_code: 302
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/042-crc32.t b/debian/modules/http-lua/t/042-crc32.t
deleted file mode 100644
index 73aa1f4..0000000
--- a/debian/modules/http-lua/t/042-crc32.t
+++ /dev/null
@@ -1,56 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: short sanity
---- config
-    location = /test {
-        content_by_lua '
-            ngx.say(ngx.crc32_short("hello, world"))
-        ';
-    }
---- request
-GET /test
---- response_body
-4289425978
-
-
-
-=== TEST 2: long sanity
---- config
-    location = /test {
-        content_by_lua '
-            ngx.say(ngx.crc32_long("hello, world"))
-        ';
-    }
---- request
-GET /test
---- response_body
-4289425978
-
-
-
-=== TEST 3: long sanity (empty)
---- config
-    location = /test {
-        content_by_lua '
-            ngx.say(ngx.crc32_long(""))
-        ';
-    }
---- request
-GET /test
---- response_body
-0
diff --git a/debian/modules/http-lua/t/043-shdict.t b/debian/modules/http-lua/t/043-shdict.t
deleted file mode 100644
index 9183bf5..0000000
--- a/debian/modules/http-lua/t/043-shdict.t
+++ /dev/null
@@ -1,2473 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-#repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 17);
-
-#no_diff();
-no_long_string();
-#master_on();
-#workers(2);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: string key, int value
---- 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: string key, floating-point value
---- http_config
-    lua_shared_dict cats 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local cats = ngx.shared.cats
-            cats:set("foo", 3.14159)
-            cats:set("baz", 1.28)
-            cats:set("baz", 3.96)
-            local val = cats:get("foo")
-            ngx.say(val, " ", type(val))
-            val = cats:get("baz")
-            ngx.say(val, " ", type(val))
-        ';
-    }
---- request
-GET /test
---- response_body
-3.14159 number
-3.96 number
---- no_error_log
-[error]
-
-
-
-=== TEST 3: string key, boolean value
---- http_config
-    lua_shared_dict cats 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local cats = ngx.shared.cats
-            cats:set("foo", true)
-            cats:set("bar", false)
-            local val = cats:get("foo")
-            ngx.say(val, " ", type(val))
-            val = cats:get("bar")
-            ngx.say(val, " ", type(val))
-        ';
-    }
---- request
-GET /test
---- response_body
-true boolean
-false boolean
---- no_error_log
-[error]
-
-
-
-=== TEST 4: number keys, string values
---- http_config
-    lua_shared_dict cats 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local cats = ngx.shared.cats
-            ngx.say(cats:set(1234, "cat"))
-            ngx.say(cats:set("1234", "dog"))
-            ngx.say(cats:set(256, "bird"))
-            ngx.say(cats:get(1234))
-            ngx.say(cats:get("1234"))
-            local val = cats:get("256")
-            ngx.say(val, " ", type(val))
-        ';
-    }
---- request
-GET /test
---- response_body
-truenilfalse
-truenilfalse
-truenilfalse
-dog
-dog
-bird string
---- no_error_log
-[error]
-
-
-
-=== TEST 5: different-size values set to the same key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", "hello")
-            ngx.say(dogs:get("foo"))
-            dogs:set("foo", "hello, world")
-            ngx.say(dogs:get("foo"))
-            dogs:set("foo", "hello")
-            ngx.say(dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-hello
-hello, world
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 6: expired entries (can be auto-removed by get)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32, 0.01)
-            ngx.location.capture("/sleep/0.01")
-            ngx.say(dogs:get("foo"))
-        ';
-    }
-    location ~ '^/sleep/(.+)' {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 7: expired entries (can NOT be auto-removed by get)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("bar", 56, 0.001)
-            dogs:set("baz", 78, 0.001)
-            dogs:set("foo", 32, 0.01)
-            ngx.location.capture("/sleep/0.012")
-            ngx.say(dogs:get("foo"))
-        ';
-    }
-    location ~ '^/sleep/(.+)' {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 8: not yet expired entries
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32, 0.5)
-            ngx.location.capture("/sleep/0.01")
-            ngx.say(dogs:get("foo"))
-        ';
-    }
-    location ~ '^/sleep/(.+)' {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-32
---- no_error_log
-[error]
-
-
-
-=== TEST 9: forcibly override other valid entries
---- http_config
-    lua_shared_dict dogs 100k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local i = 0
-            while i < 1000 do
-                i = i + 1
-                local val = string.rep(" hello", 10) .. i
-                local res, err, forcible = dogs:set("key_" .. i, val)
-                if not res or forcible then
-                    ngx.say(res, " ", err, " ", forcible)
-                    break
-                end
-            end
-            ngx.say("abort at ", i)
-            ngx.say("cur value: ", dogs:get("key_" .. i))
-            if i > 1 then
-                ngx.say("1st value: ", dogs:get("key_1"))
-            end
-            if i > 2 then
-                ngx.say("2nd value: ", dogs:get("key_2"))
-            end
-        ';
-    }
---- pipelined_requests eval
-["GET /test", "GET /test"]
---- response_body eval
-my $a = "true nil true\nabort at (353|705)\ncur value: " . (" hello" x 10) . "\\1\n1st value: nil\n2nd value: " . (" hello" x 10) . "2\n";
-[qr/$a/,
-"true nil true\nabort at 1\ncur value: " . (" hello" x 10) . "1\n"
-]
---- no_error_log
-[error]
-
-
-
-=== TEST 10: forcibly override other valid entries and test LRU
---- http_config
-    lua_shared_dict dogs 100k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local i = 0
-            while i < 1000 do
-                i = i + 1
-                local val = string.rep(" hello", 10) .. i
-                if i == 10 then
-                    dogs:get("key_1")
-                end
-                local res, err, forcible = dogs:set("key_" .. i, val)
-                if not res or forcible then
-                    ngx.say(res, " ", err, " ", forcible)
-                    break
-                end
-            end
-            ngx.say("abort at ", i)
-            ngx.say("cur value: ", dogs:get("key_" .. i))
-            if i > 1 then
-                ngx.say("1st value: ", dogs:get("key_1"))
-            end
-            if i > 2 then
-                ngx.say("2nd value: ", dogs:get("key_2"))
-            end
-        ';
-    }
---- pipelined_requests eval
-["GET /test", "GET /test"]
---- response_body eval
-my $a = "true nil true\nabort at (353|705)\ncur value: " . (" hello" x 10) . "\\1\n1st value: " . (" hello" x 10) . "1\n2nd value: nil\n";
-[qr/$a/,
-"true nil true\nabort at 2\ncur value: " . (" hello" x 10) . "2\n1st value: " . (" hello" x 10) . "1\n"
-]
---- no_error_log
-[error]
-
-
-
-=== TEST 11: dogs and cats dicts
---- http_config
-    lua_shared_dict dogs 1m;
-    lua_shared_dict cats 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local cats = ngx.shared.cats
-            dogs:set("foo", 32)
-            cats:set("foo", "hello, world")
-            ngx.say(dogs:get("foo"))
-            ngx.say(cats:get("foo"))
-            dogs:set("foo", 56)
-            ngx.say(dogs:get("foo"))
-            ngx.say(cats:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-32
-hello, world
-56
-hello, world
---- no_error_log
-[error]
-
-
-
-=== TEST 12: get non-existent keys
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            ngx.say(dogs:get("foo"))
-            ngx.say(dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-nil
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 13: not feed the object into the call
---- SKIP
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local rc, err = pcall(dogs.set, "foo", 3, 0.01)
-            ngx.say(rc, " ", err)
-            rc, err = pcall(dogs.set, "foo", 3)
-            ngx.say(rc, " ", err)
-            rc, err = pcall(dogs.get, "foo")
-            ngx.say(rc, " ", err)
-        ';
-    }
---- request
-GET /test
---- response_body
-false bad argument #1 to '?' (userdata expected, got string)
-false expecting 3, 4 or 5 arguments, but only seen 2
-false expecting exactly two arguments, but only seen 1
---- no_error_log
-[error]
-
-
-
-=== TEST 14: too big value
---- http_config
-    lua_shared_dict dogs 50k;
---- 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)
-        ';
-    }
---- request
-GET /test
---- response_body
-false no memory false
---- log_level: info
---- no_error_log
-[error]
-[crit]
-ngx_slab_alloc() failed: no memory in lua_shared_dict zone
-
-
-
-=== TEST 15: set too large key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local key = string.rep("a", 65535)
-            local rc, err = dogs:set(key, "hello")
-            ngx.say(rc, " ", err)
-            ngx.say(dogs:get(key))
-
-            key = string.rep("a", 65536)
-            ok, err = dogs:set(key, "world")
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-
-        ';
-    }
---- request
-GET /test
---- response_body
-true nil
-hello
-not ok: key too long
---- no_error_log
-[error]
-
-
-
-=== TEST 16: bad value type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:set("foo", dogs)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: bad value type
---- no_error_log
-[error]
-
-
-
-=== TEST 17: delete after setting values
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            ngx.say(dogs:get("foo"))
-            dogs:delete("foo")
-            ngx.say(dogs:get("foo"))
-            dogs:set("foo", "hello, world")
-            ngx.say(dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-32
-nil
-hello, world
---- no_error_log
-[error]
-
-
-
-=== TEST 18: delete at first
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:delete("foo")
-            ngx.say(dogs:get("foo"))
-            dogs:set("foo", "hello, world")
-            ngx.say(dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-nil
-hello, world
---- no_error_log
-[error]
-
-
-
-=== TEST 19: set nil after setting values
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            ngx.say(dogs:get("foo"))
-            dogs:set("foo", nil)
-            ngx.say(dogs:get("foo"))
-            dogs:set("foo", "hello, world")
-            ngx.say(dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-32
-nil
-hello, world
---- no_error_log
-[error]
-
-
-
-=== TEST 20: set nil at first
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", nil)
-            ngx.say(dogs:get("foo"))
-            dogs:set("foo", "hello, world")
-            ngx.say(dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-nil
-hello, world
---- no_error_log
-[error]
-
-
-
-=== TEST 21: fail to allocate memory
---- http_config
-    lua_shared_dict dogs 100k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local i = 0
-            while i < 1000 do
-                i = i + 1
-                local val = string.rep("hello", i )
-                local res, err, forcible = dogs:set("key_" .. i, val)
-                if not res or forcible then
-                    ngx.say(res, " ", err, " ", forcible)
-                    break
-                end
-            end
-            ngx.say("abort at ", i)
-        ';
-    }
---- request
-GET /test
---- response_body_like
-^true nil true\nabort at (?:141|140)$
---- no_error_log
-[error]
-
-
-
-=== TEST 22: string key, int value (write_by_lua)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        rewrite_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))
-        ';
-        content_by_lua return;
-    }
---- request
-GET /test
---- response_body
-32 number
-10502 number
---- no_error_log
-[error]
-
-
-
-=== TEST 23: string key, int value (access_by_lua)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        access_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))
-        ';
-        content_by_lua return;
-    }
---- request
-GET /test
---- response_body
-32 number
-10502 number
---- no_error_log
-[error]
-
-
-
-=== TEST 24: string key, int value (set_by_lua)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        set_by_lua $res '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            return dogs:get("foo")
-        ';
-        echo $res;
-    }
---- request
-GET /test
---- response_body
-32
---- no_error_log
-[error]
-
-
-
-=== TEST 25: string key, int value (header_by_lua)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        echo hello;
-        header_filter_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            ngx.header["X-Foo"] = dogs:get("foo")
-        ';
-    }
---- request
-GET /test
---- response_headers
-X-Foo: 32
---- response_body
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 26: too big value (forcible)
---- http_config
-    lua_shared_dict dogs 50k;
---- 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))
-            ngx.say(res, " ", err, " ", forcible)
-        ';
-    }
---- request
-GET /test
---- response_body
-false no memory true
---- log_level: info
---- no_error_log
-[error]
-[crit]
-ngx_slab_alloc() failed: no memory in lua_shared_dict zone
-
-
-
-=== TEST 27: add key (key exists)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            local res, err, forcible = dogs:add("foo", 10502)
-            ngx.say("add: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-add: false exists false
-foo = 32
---- no_error_log
-[error]
-
-
-
-=== TEST 28: add key (key not exists)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("bah", 32)
-            local res, err, forcible = dogs:add("foo", 10502)
-            ngx.say("add: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-add: true nil false
-foo = 10502
---- no_error_log
-[error]
-
-
-
-=== TEST 29: add key (key expired)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("bar", 32, 0.001)
-            dogs:set("baz", 32, 0.001)
-            dogs:set("foo", 32, 0.001)
-            ngx.location.capture("/sleep/0.002")
-            local res, err, forcible = dogs:add("foo", 10502)
-            ngx.say("add: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
-    location ~ ^/sleep/(.+) {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-add: true nil false
-foo = 10502
---- no_error_log
-[error]
-
-
-
-=== TEST 30: add key (key expired and value size unmatched)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("bar", 32, 0.001)
-            dogs:set("baz", 32, 0.001)
-            dogs:set("foo", "hi", 0.001)
-            ngx.location.capture("/sleep/0.002")
-            local res, err, forcible = dogs:add("foo", "hello")
-            ngx.say("add: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
-    location ~ ^/sleep/(.+) {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-add: true nil false
-foo = hello
---- no_error_log
-[error]
-
-
-
-=== TEST 31: replace key (key exists)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            local res, err, forcible = dogs:replace("foo", 10502)
-            ngx.say("replace: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-
-            local res, err, forcible = dogs:replace("foo", "hello")
-            ngx.say("replace: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-
-        ';
-    }
---- request
-GET /test
---- response_body
-replace: true nil false
-foo = 10502
-replace: true nil false
-foo = hello
---- no_error_log
-[error]
-
-
-
-=== TEST 32: replace key (key not exists)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("bah", 32)
-            local res, err, forcible = dogs:replace("foo", 10502)
-            ngx.say("replace: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-replace: false not found false
-foo = nil
---- no_error_log
-[error]
-
-
-
-=== TEST 33: replace key (key expired)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("bar", 3, 0.001)
-            dogs:set("baz", 2, 0.001)
-            dogs:set("foo", 32, 0.001)
-            ngx.location.capture("/sleep/0.002")
-            local res, err, forcible = dogs:replace("foo", 10502)
-            ngx.say("replace: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
-    location ~ ^/sleep/(.+) {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-replace: false not found false
-foo = nil
---- no_error_log
-[error]
-
-
-
-=== TEST 34: replace key (key expired and value size unmatched)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("bar", 32, 0.001)
-            dogs:set("baz", 32, 0.001)
-            dogs:set("foo", "hi", 0.001)
-            ngx.location.capture("/sleep/0.002")
-            local rc, err, forcible = dogs:replace("foo", "hello")
-            ngx.say("replace: ", rc, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
-    location ~ ^/sleep/(.+) {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-replace: false not found false
-foo = nil
---- no_error_log
-[error]
-
-
-
-=== TEST 35: incr key (key exists)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            local res, err = dogs:incr("foo", 10502)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-incr: 10534 nil
-foo = 10534
---- no_error_log
-[error]
-
-
-
-=== TEST 36: incr key (key not exists)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("bah", 32)
-            local res, err = dogs:incr("foo", 2)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-incr: nil not found
-foo = nil
---- no_error_log
-[error]
-
-
-
-=== TEST 37: incr key (key expired)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("bar", 3, 0.001)
-            dogs:set("baz", 2, 0.001)
-            dogs:set("foo", 32, 0.001)
-            ngx.location.capture("/sleep/0.002")
-            local res, err = dogs:incr("foo", 10502)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
-    location ~ ^/sleep/(.+) {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-incr: nil not found
-foo = nil
---- no_error_log
-[error]
-
-
-
-=== TEST 38: incr key (incr by 0)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            local res, err = dogs:incr("foo", 0)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-incr: 32 nil
-foo = 32
---- no_error_log
-[error]
-
-
-
-=== TEST 39: incr key (incr by floating point number)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            local res, err = dogs:incr("foo", 0.14)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-incr: 32.14 nil
-foo = 32.14
---- no_error_log
-[error]
-
-
-
-=== TEST 40: incr key (incr by negative numbers)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            local res, err = dogs:incr("foo", -0.14)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-incr: 31.86 nil
-foo = 31.86
---- no_error_log
-[error]
-
-
-
-=== TEST 41: incr key (original value is not number)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", true)
-            local res, err = dogs:incr("foo", -0.14)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
---- request
-GET /test
---- response_body
-incr: nil not a number
-foo = true
---- no_error_log
-[error]
-
-
-
-=== TEST 42: get and set with flags
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32, 0, 199)
-            dogs:set("bah", 10502, 202)
-            local val, flags = dogs:get("foo")
-            ngx.say(val, " ", type(val))
-            ngx.say(flags, " ", type(flags))
-            val, flags = dogs:get("bah")
-            ngx.say(val, " ", type(val))
-            ngx.say(flags, " ", type(flags))
-        ';
-    }
---- request
-GET /test
---- response_body
-32 number
-199 number
-10502 number
-nil nil
---- no_error_log
-[error]
-
-
-
-=== TEST 43: expired entries (can be auto-removed by get), with flags set
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32, 0.01, 255)
-            ngx.location.capture("/sleep/0.01")
-            local res, flags = dogs:get("foo")
-            ngx.say("res = ", res, ", flags = ", flags)
-        ';
-    }
-    location ~ '^/sleep/(.+)' {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-res = nil, flags = nil
---- no_error_log
-[error]
-
-
-
-=== TEST 44: flush_all
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /t {
-        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))
-
-            dogs:flush_all()
-
-            val = dogs:get("foo")
-            ngx.say(val, " ", type(val))
-            val = dogs:get("bah")
-            ngx.say(val, " ", type(val))
-        ';
-    }
---- request
-GET /t
---- response_body
-32 number
-10502 number
-nil nil
-nil nil
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[error]
-
-
-
-=== TEST 58: safe_set
---- http_config
-    lua_shared_dict dogs 100k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local i = 0
-            while i < 1000 do
-                i = i + 1
-                local val = string.rep(" hello", 10) .. i
-                local res, err = dogs:safe_set("key_" .. i, val)
-                if not res then
-                    ngx.say(res, " ", err)
-                    break
-                end
-            end
-            ngx.say("abort at ", i)
-            ngx.say("cur value: ", dogs:get("key_" .. i))
-            if i > 1 then
-                ngx.say("1st value: ", dogs:get("key_1"))
-            end
-            if i > 2 then
-                ngx.say("2nd value: ", dogs:get("key_2"))
-            end
-        ';
-    }
---- pipelined_requests eval
-["GET /test", "GET /test"]
---- response_body eval
-my $a = "false no memory\nabort at (353|705)\ncur value: nil\n1st value: " . (" hello" x 10) . "1\n2nd value: " . (" hello" x 10) . "2\n";
-[qr/$a/, qr/$a/]
---- no_error_log
-[error]
-
-
-
-=== TEST 59: safe_add
---- http_config
-    lua_shared_dict dogs 100k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local i = 0
-            while i < 1000 do
-                i = i + 1
-                local val = string.rep(" hello", 10) .. i
-                local res, err = dogs:safe_add("key_" .. i, val)
-                if not res then
-                    ngx.say(res, " ", err)
-                    break
-                end
-            end
-            ngx.say("abort at ", i)
-            ngx.say("cur value: ", dogs:get("key_" .. i))
-            if i > 1 then
-                ngx.say("1st value: ", dogs:get("key_1"))
-            end
-            if i > 2 then
-                ngx.say("2nd value: ", dogs:get("key_2"))
-            end
-        ';
-    }
---- pipelined_requests eval
-["GET /test", "GET /test"]
---- response_body eval
-my $a = "false no memory\nabort at (353|705)\ncur value: nil\n1st value: " . (" hello" x 10) . "1\n2nd value: " . (" hello" x 10) . "2\n";
-[qr/$a/,
-q{false exists
-abort at 1
-cur value:  hello hello hello hello hello hello hello hello hello hello1
-}
-]
---- no_error_log
-[error]
-
-
-
-=== TEST 60: get_stale: expired entries can still be fetched
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32, 0.01)
-            dogs:set("blah", 33, 0.3)
-            ngx.sleep(0.02)
-            local val, flags, stale = dogs:get_stale("foo")
-            ngx.say(val, ", ", flags, ", ", stale)
-            local val, flags, stale = dogs:get_stale("blah")
-            ngx.say(val, ", ", flags, ", ", stale)
-        ';
-    }
---- request
-GET /test
---- response_body
-32, nil, true
-33, nil, false
---- no_error_log
-[error]
-
-
-
-=== TEST 61: set nil key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:set(nil, 32)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: nil key
---- no_error_log
-[error]
-
-
-
-=== TEST 62: set bad zone argument
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs.set(nil, "foo", 32)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-bad "zone" argument
-
-
-
-=== TEST 63: set empty string keys
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:set("", 32)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: empty key
---- no_error_log
-[error]
-
-
-
-=== TEST 64: get bad zone argument
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs.get(nil, "foo")
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-bad "zone" argument
-
-
-
-=== TEST 65: get nil key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:get(nil)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: nil key
---- no_error_log
-[error]
-
-
-
-=== TEST 66: get empty key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:get("")
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: empty key
---- no_error_log
-[error]
-
-
-
-=== TEST 67: get a too-long key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:get(string.rep("a", 65536))
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: key too long
---- no_error_log
-[error]
-
-
-
-=== TEST 68: set & get large values
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:set("foo", string.rep("helloworld", 1024))
-            if not ok then
-                ngx.say("set not ok: ", err)
-                return
-            end
-            ngx.say("set ok")
-
-            local data, err = dogs:get("foo")
-            if data == nil and err then
-                ngx.say("get not ok: ", err)
-                return
-            end
-            ngx.say("get ok: ", #data)
-
-        ';
-    }
---- request
-GET /test
---- response_body
-set ok
-get ok: 10240
---- no_error_log
-[error]
-
-
-
-=== TEST 69: get_stale nil key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:get_stale(nil)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: nil key
---- no_error_log
-[error]
-
-
-
-=== TEST 70: get_stale empty key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:get_stale("")
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: empty key
---- no_error_log
-[error]
-
-
-
-=== TEST 71: get_stale number key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:set(1024, "hello")
-            if not ok then
-                ngx.say("set not ok: ", err)
-                return
-            end
-            ngx.say("set ok")
-            local data, err = dogs:get_stale(1024)
-            if not ok then
-                ngx.say("get_stale not ok: ", err)
-                return
-            end
-            ngx.say("get_stale: ", data)
-        ';
-    }
---- request
-GET /test
---- response_body
-set ok
-get_stale: hello
---- no_error_log
-[error]
-
-
-
-=== TEST 72: get_stale a too-long key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:get_stale(string.rep("a", 65536))
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: key too long
---- no_error_log
-[error]
-
-
-
-=== TEST 73: get_stale a non-existent key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local data, err = dogs:get_stale("not_found")
-            if data == nil and err then
-                ngx.say("get not ok: ", err)
-                return
-            end
-            ngx.say("get ok: ", data)
-        ';
-    }
---- request
-GET /test
---- response_body
-get ok: nil
---- no_error_log
-[error]
-
-
-
-=== TEST 74: set & get_stale large values
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:set("foo", string.rep("helloworld", 1024))
-            if not ok then
-                ngx.say("set not ok: ", err)
-                return
-            end
-            ngx.say("set ok")
-
-            local data, err, stale = dogs:get_stale("foo")
-            if data == nil and err then
-                ngx.say("get not ok: ", err)
-                return
-            end
-            ngx.say("get_stale ok: ", #data, ", stale: ", stale)
-
-        ';
-    }
---- request
-GET /test
---- response_body
-set ok
-get_stale ok: 10240, stale: false
---- no_error_log
-[error]
-
-
-
-=== TEST 75: set & get_stale boolean values (true)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:set("foo", true)
-            if not ok then
-                ngx.say("set not ok: ", err)
-                return
-            end
-            ngx.say("set ok")
-
-            local data, err, stale = dogs:get_stale("foo")
-            if data == nil and err then
-                ngx.say("get not ok: ", err)
-                return
-            end
-            ngx.say("get_stale ok: ", data, ", stale: ", stale)
-
-        ';
-    }
---- request
-GET /test
---- response_body
-set ok
-get_stale ok: true, stale: false
---- no_error_log
-[error]
-
-
-
-=== TEST 76: set & get_stale boolean values (false)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:set("foo", false)
-            if not ok then
-                ngx.say("set not ok: ", err)
-                return
-            end
-            ngx.say("set ok")
-
-            local data, err, stale = dogs:get_stale("foo")
-            if data == nil and err then
-                ngx.say("get not ok: ", err)
-                return
-            end
-            ngx.say("get_stale ok: ", data, ", stale: ", stale)
-
-        ';
-    }
---- request
-GET /test
---- response_body
-set ok
-get_stale ok: false, stale: false
---- no_error_log
-[error]
-
-
-
-=== TEST 77: set & get_stale with a flag
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:set("foo", false, 0, 325)
-            if not ok then
-                ngx.say("set not ok: ", err)
-                return
-            end
-            ngx.say("set ok")
-
-            local data, err, stale = dogs:get_stale("foo")
-            if data == nil and err then
-                ngx.say("get not ok: ", err)
-                return
-            end
-            flags = err
-            ngx.say("get_stale ok: ", data, ", flags: ", flags,
-                    ", stale: ", stale)
-
-        ';
-    }
---- request
-GET /test
---- response_body
-set ok
-get_stale ok: false, flags: 325, stale: false
---- no_error_log
-[error]
-
-
-
-=== TEST 78: incr nil key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:incr(nil, 32)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: nil key
---- no_error_log
-[error]
-
-
-
-=== TEST 79: incr bad zone argument
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs.incr(nil, "foo", 32)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-bad "zone" argument
-
-
-
-=== TEST 80: incr empty string keys
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:incr("", 32)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: empty key
---- no_error_log
-[error]
-
-
-
-=== TEST 81: incr too long key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local key = string.rep("a", 65536)
-            local ok, err = dogs:incr(key, 32)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: key too long
---- no_error_log
-[error]
-
-
-
-=== TEST 82: incr number key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local key = 56
-            local ok, err = dogs:set(key, 1)
-            if not ok then
-                ngx.say("set not ok: ", err)
-                return
-            end
-            ngx.say("set ok")
-            ok, err = dogs:incr(key, 32)
-            if not ok then
-                ngx.say("incr not ok: ", err)
-                return
-            end
-            ngx.say("incr ok")
-            local data, err = dogs:get(key)
-            if data == nil and err then
-                ngx.say("get not ok: ", err)
-                return
-            end
-            local flags = err
-            ngx.say("get ok: ", data, ", flags: ", flags)
-
-        ';
-    }
---- request
-GET /test
---- response_body
-set ok
-incr ok
-get ok: 33, flags: nil
---- no_error_log
-[error]
-
-
-
-=== TEST 83: incr a number-like string key
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local key = 56
-            local ok, err = dogs:set(key, 1)
-            if not ok then
-                ngx.say("set not ok: ", err)
-                return
-            end
-            ngx.say("set ok")
-            ok, err = dogs:incr(key, "32")
-            if not ok then
-                ngx.say("incr not ok: ", err)
-                return
-            end
-            ngx.say("incr ok")
-            local data, err = dogs:get(key)
-            if data == nil and err then
-                ngx.say("get not ok: ", err)
-                return
-            end
-            local flags = err
-            ngx.say("get ok: ", data, ", flags: ", flags)
-
-        ';
-    }
---- request
-GET /test
---- response_body
-set ok
-incr ok
-get ok: 33, flags: nil
---- no_error_log
-[error]
-
-
-
-=== TEST 84: add nil values
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local ok, err = dogs:add("foo", nil)
-            if not ok then
-                ngx.say("not ok: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /test
---- response_body
-not ok: attempt to add or replace nil values
---- no_error_log
-[error]
-
-
-
-=== TEST 85: replace key with exptime
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 2, 0)
-            dogs:replace("foo", 32, 0.01)
-            local data = dogs:get("foo")
-            ngx.say("get foo: ", data)
-            ngx.location.capture("/sleep/0.02")
-            local res, err, forcible = dogs:replace("foo", 10502)
-            ngx.say("replace: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        ';
-    }
-    location ~ ^/sleep/(.+) {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-get foo: 32
-replace: false not found false
-foo = nil
---- no_error_log
-[error]
-
-
-
-=== TEST 86: the lightuserdata ngx.null has no methods of shared dicts.
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local lightuserdata = ngx.null
-            lightuserdata:set("foo", 1)
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- grep_error_log chop
-attempt to index local 'lightuserdata' (a userdata value)
---- grep_error_log_out
-attempt to index local 'lightuserdata' (a userdata value)
---- error_log
-[error]
---- no_error_log
-bad "zone" argument
-
-
-
-=== TEST 87: set bad zone table
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs.set({1}, "foo", 1)
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-bad "zone" argument
-
-
-
-=== TEST 88: get bad zone table
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs.get({1}, "foo")
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-bad "zone" argument
-
-
-
-=== TEST 89: incr bad zone table
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs.incr({1}, "foo", 32)
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-
-
-
-=== TEST 90: check the type of the shdict object
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            ngx.say("type: ", type(ngx.shared.dogs))
-        ';
-    }
---- request
-GET /test
---- response_body
-type: table
---- no_error_log
-[error]
-
-
-
-=== TEST 91: dogs, cat mixing
---- http_config
-    lua_shared_dict dogs 1m;
-    lua_shared_dict cats 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))
-
-            local cats = ngx.shared.cats
-            val = cats:get("foo")
-            ngx.say(val or "nil")
-            val = cats:get("bah")
-            ngx.say(val or "nil")
-        ';
-    }
---- request
-GET /test
---- response_body
-32 number
-10502 number
-nil
-nil
---- no_error_log
-[error]
-
-
-
-=== TEST 92: invalid expire time
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32, -1)
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-bad "exptime" argument
-
-
-
-=== TEST 93: duplicate zones
---- http_config
-    lua_shared_dict dogs 1m;
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            ngx.say("error")
-        ';
-    }
---- request
-    GET /test
---- request_body_unlike
-error
---- must_die
---- error_log
-lua_shared_dict "dogs" is already defined as "dogs"
---- error_log
-[emerg]
diff --git a/debian/modules/http-lua/t/044-req-body.t b/debian/modules/http-lua/t/044-req-body.t
deleted file mode 100644
index e645eee..0000000
--- a/debian/modules/http-lua/t/044-req-body.t
+++ /dev/null
@@ -1,1746 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4 + 52 );
-
-#no_diff();
-no_long_string();
-#master_on();
-#workers(2);
-run_tests();
-
-__DATA__
-
-=== TEST 1: read buffered body
---- config
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-        ';
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 2: read buffered body (timed out)
---- config
-    client_body_timeout 1ms;
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-        ';
-    }
---- raw_request eval
-"POST /test HTTP/1.1\r
-Host: localhost\r
-Content-Length: 100\r
-Connection: close\r
-\r
-hello, world"
---- response_body:
---- error_code_like: ^(?:500)?$
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 3: read buffered body and then subrequest
---- config
-    location /foo {
-        echo -n foo;
-    }
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            local res = ngx.location.capture("/foo");
-            ngx.say(ngx.var.request_body)
-            ngx.say("sub: ", res.body)
-        ';
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
-sub: foo
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 4: first subrequest and then read buffered body
---- config
-    location /foo {
-        echo -n foo;
-    }
-    location = /test {
-        content_by_lua '
-            local res = ngx.location.capture("/foo");
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-            ngx.say("sub: ", res.body)
-        ';
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
-sub: foo
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 5: discard body
---- config
-    location = /foo {
-        content_by_lua '
-            ngx.req.discard_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-["body: nil\n",
-"body: hiya, world\n"]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 6: not discard body (content_by_lua falls through)
---- config
-    location = /foo {
-        content_by_lua '
-            -- ngx.req.discard_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-["body: nil\n",
-"body: hiya, world\n",
-]
---- error_code eval
-[200, 200]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 7: read buffered body and retrieve the data
---- config
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 8: read buffered body to file and call get_body_data
---- config
-    client_body_in_file_only on;
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
---- request
-POST /test
-hello, world
---- response_body
-nil
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 9: read buffered body to file and call get_body_file
---- config
-    client_body_in_file_only on;
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_file())
-        ';
-    }
---- request
-POST /test
-hello, world
---- response_body_like: client_body_temp/
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 10: read buffered body to memory and retrieve the file
---- config
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_file())
-        ';
-    }
---- request
-POST /test
-hello, world
---- response_body
-nil
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 11: read buffered body to memory and reset it with data in memory
---- config
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.req.set_body_data("hiya, dear")
-            ngx.say(ngx.req.get_body_data())
-            ngx.say(ngx.var.request_body)
-            ngx.say(ngx.var.echo_request_body)
-        ';
-    }
---- request
-POST /test
-hello, world
---- response_body
-hiya, dear
-hiya, dear
-hiya, dear
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 12: read body to file and then override it with data in memory
---- config
-    client_body_in_file_only on;
-
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.req.set_body_data("hello, baby")
-            ngx.say(ngx.req.get_body_data())
-            ngx.say(ngx.var.request_body)
-        ';
-    }
---- request
-POST /test
-yeah
---- response_body
-hello, baby
-hello, baby
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 13: do not read the current request body but replace it with our own in memory
---- config
-    client_body_in_file_only on;
-
-    location = /test {
-        content_by_lua '
-            ngx.req.set_body_data("hello, baby")
-            ngx.say(ngx.req.get_body_data())
-            ngx.say(ngx.var.request_body)
-            -- ngx.location.capture("/sleep")
-        ';
-    }
-    location = /sleep {
-        echo_sleep 0.5;
-    }
---- request
-POST /test
-yeah
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-qr/lua entry thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):2: request body not read yet/
---- no_error_log
-[alert]
-
-
-
-=== TEST 14: read buffered body to file and reset it to a new file
---- config
-
-    location = /test {
-        client_body_in_file_only on;
-        set $old '';
-        set $new '';
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.var.old = ngx.req.get_body_file()
-            ngx.req.set_body_file(ngx.var.realpath_root .. "/a.txt")
-            ngx.var.new = ngx.req.get_body_file()
-        ';
-        #echo_request_body;
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        #proxy_pass http://127.0.0.1:7890/echo;
-        add_header X-Old $old;
-        add_header X-New $new;
-    }
-    location /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
-hello, world
---- user_files
->>> a.txt
-Will you change this world?
---- raw_response_headers_like
-X-Old: \S+/client_body_temp/\d+\r
-.*?X-New: \S+/html/a\.txt\r
---- response_body
-Will you change this world?
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 15: read buffered body to file and reset it to a new file
---- config
-    location = /test {
-        client_body_in_file_only on;
-        set $old '';
-        set $new '';
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.var.old = ngx.req.get_body_file() or ""
-            ngx.req.set_body_file(ngx.var.realpath_root .. "/a.txt")
-            ngx.var.new = ngx.req.get_body_file()
-        ';
-        #echo_request_body;
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        #proxy_pass http://127.0.0.1:7890/echo;
-        add_header X-Old $old;
-        add_header X-New $new;
-    }
-    location /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
-hello, world!
---- user_files
->>> a.txt
-Will you change this world?
---- raw_response_headers_like
-X-Old: \S+/client_body_temp/\d+\r
-.*?X-New: \S+/html/a\.txt\r
---- response_body
-Will you change this world?
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 16: read buffered body to file and reset it to a new file (auto-clean)
---- config
-    client_body_in_file_only on;
-
-    location = /test {
-        set $old '';
-        set $new '';
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.var.old = ngx.req.get_body_file()
-            local a_file = ngx.var.realpath_root .. "/a.txt"
-            ngx.req.set_body_file(a_file, true)
-            local b_file = ngx.var.realpath_root .. "/b.txt"
-            ngx.req.set_body_file(b_file, true)
-            ngx.say("a.txt exists: ", io.open(a_file) and "yes" or "no")
-            ngx.say("b.txt exists: ", io.open(b_file) and "yes" or "no")
-        ';
-    }
-    location /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
-hello, world
---- user_files
->>> a.txt
-Will you change this world?
->>> b.txt
-Sure I will!
---- response_body
-a.txt exists: no
-b.txt exists: yes
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 17: read buffered body to memoary and reset it to a new file (auto-clean)
---- config
-    client_body_in_file_only off;
-
-    location = /test {
-        set $old '';
-        set $new '';
-        rewrite_by_lua '
-            ngx.req.read_body()
-            local a_file = ngx.var.realpath_root .. "/a.txt"
-            ngx.req.set_body_file(a_file, true)
-        ';
-        echo_request_body;
-    }
-    location /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- pipelined_requests eval
-["POST /test
-hello, world",
-"POST /test
-hey, you"]
---- user_files
->>> a.txt
-Will you change this world?
---- response_body eval
-["Will you change this world?\n",
-qr/500 Internal Server Error/]
---- error_code eval
-[200, 500]
---- no_error_log
-[alert]
-
-
-
-=== TEST 18: read buffered body to memoary and reset it to a new file (no auto-clean)
---- config
-    client_body_in_file_only off;
-
-    location = /test {
-        set $old '';
-        set $new '';
-        rewrite_by_lua '
-            ngx.req.read_body()
-            local a_file = ngx.var.realpath_root .. "/a.txt"
-            ngx.req.set_body_file(a_file, false)
-        ';
-        echo_request_body;
-    }
-    location /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- pipelined_requests eval
-["POST /test
-hello, world",
-"POST /test
-hey, you"]
---- user_files
->>> a.txt
-Will you change this world?
---- response_body eval
-["Will you change this world?\n",
-"Will you change this world?\n"]
---- error_code eval
-[200, 200]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 19: request body discarded and reset it to a new file (auto-clean)
---- config
-    client_body_in_file_only off;
-    client_header_buffer_size 80;
-
-    location = /test {
-        set $old '';
-        set $new '';
-        rewrite_by_lua '
-            ngx.req.discard_body()
-            local a_file = ngx.var.realpath_root .. "/a.txt"
-            ngx.req.set_body_file(a_file, false)
-        ';
-        echo_request_body;
-    }
-    location /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
-hello, world
-
---- user_files
->>> a.txt
-Will you change this world?
-
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- no_error_log
-[alert]
-
-
-
-=== TEST 20: no request body and reset it to a new file (no auto-clean)
---- config
-    client_body_in_file_only off;
-
-    location = /test {
-        set $old '';
-        set $new '';
-        rewrite_by_lua '
-            local a_file = ngx.var.realpath_root .. "/a.txt"
-            ngx.req.set_body_file(a_file, true)
-        ';
-        echo_request_body;
-    }
-    location /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
-hello, world
-
---- user_files
->>> a.txt
-Will you change this world?
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-qr/lua entry thread aborted: runtime error: rewrite_by_lua\(nginx\.conf:\d+\):3: request body not read yet/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 21: read buffered body to memory and reset it with data in memory + proxy
---- config
-    location = /test {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.req.set_body_data("hiya, dear dear friend!")
-        ';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-    }
-    location = /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
-hello, world
---- response_body chomp
-hiya, dear dear friend!
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 22: discard request body and reset it to a new file (no auto-clean)
---- config
-    client_body_in_file_only off;
-
-    location = /test {
-        set $old '';
-        set $new '';
-        rewrite_by_lua '
-            ngx.req.discard_body()
-            local a_file = ngx.var.realpath_root .. "/a.txt"
-            ngx.req.set_body_file(a_file, true)
-        ';
-        echo_request_body;
-    }
-    location /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
-hello, world
-
---- user_files
->>> a.txt
-Will you change this world?
-
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- no_error_log
-[alert]
-
-
-
-=== TEST 23: discard body and then read
---- config
-    location = /test {
-        content_by_lua '
-            ngx.req.discard_body()
-            ngx.req.read_body()
-            ngx.print(ngx.req.get_body_data())
-        ';
-    }
---- pipelined_requests eval
-["POST /test
-hello, world",
-"POST /test
-hello, world"]
---- response_body eval
-["nil","nil"]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 24: set empty request body in memory
---- config
-    location = /test {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.req.set_body_data("")
-        ';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-    }
-    location = /echo {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: [", ngx.req.get_body_data(), "]")
-        ';
-    }
---- pipelined_requests eval
-["POST /test
-hello, world",
-"POST /test
-hello, world"]
---- response_body eval
-["body: [nil]\n","body: [nil]\n"]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 25: set empty request body in file
---- config
-    location = /test {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.req.set_body_file(ngx.var.realpath_root .. "/a.txt")
-        ';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-    }
-    location = /echo {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: [", ngx.req.get_body_data(), "]")
-        ';
-    }
---- user_files
->>> a.txt
---- pipelined_requests eval
-["POST /test
-hello, world",
-"POST /test
-hello, world"]
---- response_body eval
-["body: [nil]\n","body: [nil]\n"]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 26: read and set body
---- config
-    location /test {
-        lua_need_request_body on;
-        access_by_lua_file html/myscript.lua;
-        echo_request_body;
-    }
---- user_files
->>> myscript.lua
-    local data, err = ngx.req.get_post_args()
-    if err then
-        ngx.log(ngx.ERR, "err: ", err)
-        return ngx.exit(500)
-    end
-
-    local data2 = {}
-    for k, v in pairs(data) do
-        if type(v) == "table" then
-            for i, val in ipairs(v) do
-                local s = ngx.escape_uri(string.upper(k)) .. '='
-                        .. ngx.escape_uri(string.upper(val))
-                table.insert(data2, s)
-            end
-        else
-            local s = ngx.escape_uri(string.upper(k)) .. '='
-                    .. ngx.escape_uri(string.upper(v))
-            table.insert(data2, s)
-        end
-    end
-    ngx.req.set_body_data(table.concat(data2, "&"))
---- request
-POST /test
-a=1&a=2&b=hello&c=world
---- response_body
-B=HELLO&A=1&A=2&C=WORLD
---- no_error_log
-[error]
---- SKIP
-
-
-
-=== TEST 27: read buffered body to memory and reset it with data in memory + proxy twice
---- config
-    location = /test {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.req.set_body_data("hiya, dear dear friend!")
-            ngx.req.set_body_data("howdy, my dear little sister!")
-        ';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-    }
-    location = /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
-hello, world
---- response_body chomp
-howdy, my dear little sister!
---- no_error_log
-[error]
-[alert]
-
-
-
-=== 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 '
-            ngx.req.read_body()
-            ngx.req.set_body_data("hiya, dear dear friend!")
-            ngx.req.set_body_file(ngx.var.realpath_root .. "/a.txt")
-        ';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-    }
-    location = /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- user_files
->>> a.txt
-howdy, my dear little sister!
---- request
-POST /test
-hello, world
---- response_body
-howdy, my dear little sister!
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 29: read buffered body to memory and reset it with empty string + proxy twice
---- config
-    location = /test {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.req.set_body_data("hiya, dear dear friend!")
-            ngx.req.set_body_data("")
-        ';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-    }
-    location = /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
-hello, world
---- response_body chomp
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 30: multi-buffer request body
---- config
-    location /foo {
-        default_type text/css;
-        srcache_store POST /store;
-
-        echo hello;
-        echo world;
-    }
-
-    location /store {
-        content_by_lua '
-            local body = ngx.req.get_body_data()
-            ngx.log(ngx.WARN, "srcache_store: request body len: ", #body)
-        ';
-    }
---- request
-GET /foo
---- response_body
-hello
-world
---- error_log
-srcache_store: request body len: 55
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 31: init & append & finish (just in buffer)
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.read_body()
-            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]
-[alert]
-
-
-
-=== TEST 32: init & append & finish (exceeding the buffer size)
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.read_body()
-            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]
-[alert]
---- error_log
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 33: init & append & finish (use default buffer size) - body not read yet
---- 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_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-qr/lua entry thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):2: request body not read yet/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 34: init & append & finish (use default buffer size)
---- config
-    location /t {
-        client_body_buffer_size 4;
-        content_by_lua '
-            ngx.req.read_body()
-            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]
-[alert]
---- no_error_log
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 35: init & append & finish (exceeding the buffer size, proxy)
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            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]
-[alert]
---- error_log
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 36: init & append & finish (just in buffer, proxy)
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.read_body()
-            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]
-[alert]
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 37: 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]
-[alert]
---- error_log
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 38: 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]
-[alert]
---- no_error_log
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 39: 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]
-[alert]
---- no_error_log
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 40: 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]
-[alert]
---- no_error_log
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 41: calling ngx.req.socket after ngx.req.read_body
---- config
-    location = /t {
-        client_body_buffer_size 100;
-        lua_socket_buffer_size 100;
-        content_by_lua '
-            ngx.req.read_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]
-[alert]
---- no_error_log
-a client request body is buffered to a temporary file
-
-
-
-=== TEST 42: failed to write 100 continue
---- config
-    location = /test {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.var.request_body)
-        ';
-    }
---- request
-POST /test
-hello, world
---- more_headers
-Expect: 100-Continue
---- ignore_response
---- no_error_log
-[alert]
-[error]
-http finalize request: 500, "/test?" a:1, c:0
-
-
-
-=== TEST 43: chunked support in ngx.req.read_body
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
---- raw_request eval
-"POST /t HTTP/1.1\r
-Host: localhost\r
-Transfer-Encoding: chunked\r
-Connection: close\r
-\r
-5\r
-hello\r
-1\r
-,\r
-1\r
- \r
-5\r
-world\r
-0\r
-\r
-"
-
---- response_body
-hello, world
---- no_error_log
-[error]
-[alert]
---- skip_nginx: 4: <1.3.9
-
-
-
-=== TEST 44: zero size request body and reset it to a new file
---- config
-    location = /test {
-        client_body_in_file_only on;
-        set $old '';
-        set $new '';
-        rewrite_by_lua '
-            ngx.req.read_body()
-            ngx.req.set_body_file(ngx.var.realpath_root .. "/a.txt")
-            ngx.var.new = ngx.req.get_body_file()
-        ';
-        #echo_request_body;
-        proxy_pass http://127.0.0.1:$server_port/echo;
-        #proxy_pass http://127.0.0.1:7890/echo;
-        add_header X-Old $old;
-        add_header X-New $new;
-    }
-    location /echo {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /test
---- user_files
->>> a.txt
-Will you change this world?
-
---- stap
-probe syscall.fcntl {
-    O_DIRECT = 0x4000
-    if (pid() == target() && ($arg & O_DIRECT)) {
-        println("fcntl(O_DIRECT)")
-    }
-}
---- stap_out_unlike
-fcntl\(O_DIRECT\)
-
---- raw_response_headers_like
-.*?X-New: \S+/html/a\.txt\r
---- response_body
-Will you change this world?
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 45: not discard body (content_by_lua exit 200)
---- config
-    location = /foo {
-        content_by_lua '
-            -- ngx.req.discard_body()
-            ngx.say("body: ", ngx.var.request_body)
-            ngx.exit(200)
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-["body: nil\n",
-"body: hiya, world\n",
-]
---- error_code eval
-[200, 200]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 46: not discard body (content_by_lua exit 201)
---- config
-    location = /foo {
-        content_by_lua '
-            -- ngx.req.discard_body()
-            ngx.say("body: ", ngx.var.request_body)
-            ngx.exit(201)
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-["body: nil\n",
-"body: hiya, world\n",
-]
---- error_code eval
-[200, 200]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 47: not discard body (content_by_lua exit 302)
---- config
-    location = /foo {
-        content_by_lua '
-            -- ngx.req.discard_body()
-            -- ngx.say("body: ", ngx.var.request_body)
-            ngx.redirect("/blah")
-        ';
-    }
-    location = /bar {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say("body: ", ngx.var.request_body)
-        ';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /bar
-hiya, world"]
---- response_body eval
-[qr/302 Found/,
-"body: hiya, world\n",
-]
---- error_code eval
-[302, 200]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 48: not discard body (custom error page)
---- config
-    error_page 404 = /err;
-
-    location = /foo {
-        content_by_lua '
-            ngx.exit(404)
-        ';
-    }
-    location = /err {
-        content_by_lua 'ngx.say("error")';
-    }
---- pipelined_requests eval
-["POST /foo
-hello, world",
-"POST /foo
-hiya, world"]
---- response_body eval
-["error\n",
-"error\n",
-]
---- error_code eval
-[404, 404]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 49: get body data at log phase
---- config
-    location = /test {
-        content_by_lua_block {
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_data())
-        }
-        log_by_lua_block {
-            ngx.log(ngx.WARN, "request body:", ngx.req.get_body_data())
-        }
-    }
---- request
-POST /test
-hello, world
---- response_body
-hello, world
---- error_log
-request body:hello, world
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 50: init & append & finish (content_length = 0)
---- config
-    location /t {
-        content_by_lua '
-            local old_http_content_length = ngx.var.http_content_length
-
-            ngx.req.read_body()
-            ngx.req.init_body()
-            ngx.req.append_body("he")
-            ngx.req.append_body("llo")
-            ngx.req.finish_body()
-
-            ngx.say("old content length: ", old_http_content_length)
-
-            local data = ngx.req.get_body_data()
-            local data_file = ngx.req.get_body_file()
-
-            if not data and data_file then
-                ngx.say("no data in buf, go to data file")
-            end
-
-            ngx.say("content length: ", ngx.var.http_content_length)
-        ';
-    }
---- request
-    GET /t
---- more_headers
-Content-Length: 0
---- response_body
-old content length: 0
-content length: 5
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 51: init & append & finish (init_body(0))
---- config
-    location /t {
-        content_by_lua '
-            local old_http_content_length = ngx.var.http_content_length
-
-            ngx.req.read_body()
-            ngx.req.init_body(0)
-            ngx.req.append_body("he")
-            ngx.req.append_body("llo")
-            ngx.req.finish_body()
-
-            ngx.say("old content length: ", old_http_content_length)
-
-            local data = ngx.req.get_body_data()
-            local data_file = ngx.req.get_body_file()
-
-            if not data and data_file then
-                ngx.say("no data in buf, go to data file")
-            end
-
-            ngx.say("content length: ", ngx.var.http_content_length)
-        ';
-    }
---- request
-    GET /t
---- more_headers
-Content-Length: 0
---- response_body
-old content length: 0
-no data in buf, go to data file
-content length: 5
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 52: init & append & finish (client_body_buffer_size = 0)
---- http_config
-    client_body_buffer_size 0;
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.req.init_body()
-            ngx.req.append_body("he")
-            ngx.req.append_body("llo")
-            ngx.req.finish_body()
-
-            local data = ngx.req.get_body_data()
-            local data_file = ngx.req.get_body_file()
-
-            if not data and data_file then
-                ngx.say("no data in buf, go to data file")
-            end
-
-            ngx.say("content length: ", ngx.var.http_content_length)
-        ';
-    }
---- request
-    GET /t
---- response_body
-no data in buf, go to data file
-content length: 5
---- no_error_log
-[error]
-[alert]
diff --git a/debian/modules/http-lua/t/045-ngx-var.t b/debian/modules/http-lua/t/045-ngx-var.t
deleted file mode 100644
index 6475f1e..0000000
--- a/debian/modules/http-lua/t/045-ngx-var.t
+++ /dev/null
@@ -1,230 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 7);
-
-#no_diff();
-#no_long_string();
-#master_on();
-#workers(2);
-run_tests();
-
-__DATA__
-
-=== TEST 1: set indexed variables to nil
---- config
-    location = /test {
-        set $var 32;
-        content_by_lua '
-            ngx.say("old: ", ngx.var.var)
-            ngx.var.var = nil
-            ngx.say("new: ", ngx.var.var)
-        ';
-    }
---- request
-GET /test
---- response_body
-old: 32
-new: nil
-
-
-
-=== TEST 2: set variables with set_handler to nil
---- config
-    location = /test {
-        content_by_lua '
-            ngx.say("old: ", ngx.var.args)
-            ngx.var.args = nil
-            ngx.say("new: ", ngx.var.args)
-        ';
-    }
---- request
-GET /test?hello=world
---- response_body
-old: hello=world
-new: nil
-
-
-
-=== TEST 3: reference nonexistent variable
---- config
-    location = /test {
-        set $var 32;
-        content_by_lua '
-            ngx.say("value: ", ngx.var.notfound)
-        ';
-    }
---- request
-GET /test
---- response_body
-value: nil
-
-
-
-=== TEST 4: no-hash variables
---- config
-    location = /test {
-        proxy_pass http://127.0.0.1:$server_port/foo;
-        header_filter_by_lua '
-            ngx.header["X-My-Host"] = ngx.var.proxy_host
-        ';
-    }
-
-    location = /foo {
-        echo foo;
-    }
---- request
-GET /test
---- response_headers
-X-My-Host: foo
---- response_body
-foo
---- SKIP
-
-
-
-=== TEST 5: variable name is caseless
---- config
-    location = /test {
-        set $Var 32;
-        content_by_lua '
-            ngx.say("value: ", ngx.var.VAR)
-        ';
-    }
---- request
-GET /test
---- response_body
-value: 32
-
-
-
-=== TEST 6: true $invalid_referer variable value in Lua
-github issue #239
---- config
-    location = /t {
-        valid_referers www.foo.com;
-        content_by_lua '
-            ngx.say("invalid referer: ", ngx.var.invalid_referer)
-            ngx.exit(200)
-        ';
-        #echo $invalid_referer;
-    }
-
---- request
-GET /t
---- more_headers
-Referer: http://www.foo.com/
-
---- response_body
-invalid referer: 
-
---- no_error_log
-[error]
-
-
-
-=== TEST 7: false $invalid_referer variable value in Lua
-github issue #239
---- config
-    location = /t {
-        valid_referers www.foo.com;
-        content_by_lua '
-            ngx.say("invalid referer: ", ngx.var.invalid_referer)
-            ngx.exit(200)
-        ';
-        #echo $invalid_referer;
-    }
-
---- request
-GET /t
---- more_headers
-Referer: http://www.bar.com
-
---- response_body
-invalid referer: 1
-
---- no_error_log
-[error]
-
-
-
-=== TEST 8: $proxy_host & $proxy_port & $proxy_add_x_forwarded_for
---- config
-    location = /t {
-        proxy_pass http://127.0.0.1:$server_port/back;
-        header_filter_by_lua_block {
-            ngx.header["Proxy-Host"] = ngx.var.proxy_host
-            ngx.header["Proxy-Port"] = ngx.var.proxy_port
-            ngx.header["Proxy-Add-X-Forwarded-For"] = ngx.var.proxy_add_x_forwarded_for
-        }
-    }
-
-    location = /back {
-        echo hello;
-    }
---- request
-GET /t
---- raw_response_headers_like
-Proxy-Host: 127.0.0.1\:\d+\r
-Proxy-Port: \d+\r
-Proxy-Add-X-Forwarded-For: 127.0.0.1\r
---- response_body
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 9: get a bad variable name
---- config
-    location = /test {
-        set $true 32;
-        content_by_lua '
-            ngx.say("value: ", ngx.var[true])
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_log
-bad variable name
---- error_code: 500
-
-
-
-=== TEST 10: set a bad variable name
---- config
-    location = /test {
-        set $true 32;
-        content_by_lua '
-            ngx.var[true] = 56
-        ';
-    }
---- request
-GET /test
---- response_body_like: 500 Internal Server Error
---- error_log
-bad variable name
---- error_code: 500
-
-
-
-=== TEST 11: set a variable that is not changeable
---- config
-    location = /test {
-        content_by_lua '
-            ngx.var.query_string = 56
-        ';
-    }
---- request
-GET /test?hello
---- response_body_like: 500 Internal Server Error
---- error_log
-variable "query_string" not changeable
---- error_code: 500
diff --git a/debian/modules/http-lua/t/046-hmac.t b/debian/modules/http-lua/t/046-hmac.t
deleted file mode 100644
index 32e222b..0000000
--- a/debian/modules/http-lua/t/046-hmac.t
+++ /dev/null
@@ -1,31 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /lua {
-        content_by_lua '
-            local digest = ngx.hmac_sha1("thisisverysecretstuff", "some string we want to sign")
-            ngx.say(ngx.encode_base64(digest))
-        ';
-    }
---- request
-GET /lua
---- response_body
-R/pvxzHC4NLtj7S+kXFg/NePTmk=
diff --git a/debian/modules/http-lua/t/047-match-jit.t b/debian/modules/http-lua/t/047-match-jit.t
deleted file mode 100644
index 2417a63..0000000
--- a/debian/modules/http-lua/t/047-match-jit.t
+++ /dev/null
@@ -1,214 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 5);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: matched with j
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "j")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 2: not matched with j
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, world", "([0-9]+)", "j")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched!
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 3: matched with jo
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, 1234", "([0-9]+)", "jo")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-1234
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 4: not matched with jo
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello, world", "([0-9]+)", "jo")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched!
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 5: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local m, err = ngx.re.match("hello\\nworld", "(abc", "j")
-            if m then
-                ngx.say(m[0])
-
-            else
-                if err then
-                    ngx.say("error: ", err)
-
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 6: just hit match limit
---- http_config
-    lua_regex_match_limit 2940;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 21)
-
-local start = ngx.now()
-
-local res, err = ngx.re.match(s, re, "jo")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if not res then
-    if err then
-        ngx.say("error: ", err)
-        return
-    end
-    ngx.say("failed to match")
-    return
-end
-
---- request
-    GET /re
---- response_body
-error: pcre_exec() failed: -8
-
-
-
-=== TEST 7: just not hit match limit
---- http_config
-    lua_regex_match_limit 2950;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 21)
-
-local start = ngx.now()
-
-local res, err = ngx.re.match(s, re, "jo")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if not res then
-    if err then
-        ngx.say("error: ", err)
-        return
-    end
-    ngx.say("failed to match")
-    return
-end
-
---- request
-    GET /re
---- response_body
-failed to match
diff --git a/debian/modules/http-lua/t/048-match-dfa.t b/debian/modules/http-lua/t/048-match-dfa.t
deleted file mode 100644
index 28b5a60..0000000
--- a/debian/modules/http-lua/t/048-match-dfa.t
+++ /dev/null
@@ -1,209 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 4);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: matched with d
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello", "(he|hell)", "d")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-nil
-nil
-
-
-
-=== TEST 2: matched with d + o
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello", "(he|hell)", "do")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-nil
-nil
-
-
-
-=== TEST 3: matched with d + j
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello", "(he|hell)", "jd")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-
-
-
-=== TEST 4: not matched with j
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("world", "(he|hell)", "d")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched!
-
-
-
-=== TEST 5: matched with do
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("hello", "he|hell", "do")
-            if m then
-                ngx.say(m[0])
-                ngx.say(m[1])
-                ngx.say(m[2])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-nil
-nil
-
-
-
-=== TEST 6: not matched with do
---- config
-    location /re {
-        content_by_lua '
-            m = ngx.re.match("world", "([0-9]+)", "do")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched!
-
-
-
-=== TEST 7: UTF-8 mode without UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("你好", ".", "Ud")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_dfa_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 2000
-
---- request
-    GET /re
---- response_body
-你
---- no_error_log
-[error]
-
-
-
-=== TEST 8: UTF-8 mode with UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local m = ngx.re.match("你好", ".", "ud")
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_dfa_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 0
-
---- request
-    GET /re
---- response_body
-你
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/049-gmatch-jit.t b/debian/modules/http-lua/t/049-gmatch-jit.t
deleted file mode 100644
index 5134d52..0000000
--- a/debian/modules/http-lua/t/049-gmatch-jit.t
+++ /dev/null
@@ -1,228 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 9);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: gmatch matched
---- config
-    location /re {
-        content_by_lua '
-            for m in ngx.re.gmatch("hello, world", "[a-z]+", "j") do
-                if m then
-                    ngx.say(m[0])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-world
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 2: fail to match
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[0-9]", "j")
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-        ';
-    }
---- request
-    GET /re
---- response_body
-nil
-nil
-nil
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 3: gmatch matched but no iterate
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+", "j")
-            ngx.say("done")
-        ';
-    }
---- request
-    GET /re
---- response_body
-done
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 4: gmatch matched but only iterate once and still matches remain
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+", "j")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 5: gmatch matched + o
---- config
-    location /re {
-        content_by_lua '
-            for m in ngx.re.gmatch("hello, world", "[a-z]+", "jo") do
-                if m then
-                    ngx.say(m[0])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-world
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 6: fail to match + o
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[0-9]", "jo")
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-        ';
-    }
---- request
-    GET /re
---- response_body
-nil
-nil
-nil
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 7: gmatch matched but no iterate + o
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+", "jo")
-            ngx.say("done")
-        ';
-    }
---- request
-    GET /re
---- response_body
-done
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 8: gmatch matched but only iterate once and still matches remain + o
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+", "jo")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 9: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local m, err = ngx.re.gmatch("hello\\nworld", "(abc", "j")
-            if not m then
-                ngx.say("error: ", err)
-                return
-            end
-            ngx.say("success")
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/050-gmatch-dfa.t b/debian/modules/http-lua/t/050-gmatch-dfa.t
deleted file mode 100644
index d2ac2bc..0000000
--- a/debian/modules/http-lua/t/050-gmatch-dfa.t
+++ /dev/null
@@ -1,338 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 5);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: gmatch matched
---- config
-    location /re {
-        content_by_lua '
-            for m in ngx.re.gmatch("hello, halo", "h[a-z]|h[a-z][a-z]", "d") do
-                if m then
-                    ngx.say(m[0])
-                    ngx.say(m[1])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hel
-nil
-hal
-nil
-
-
-
-=== TEST 2: d + j
---- config
-    location /re {
-        content_by_lua '
-            for m in ngx.re.gmatch("hello, halo", "h[a-z]|h[a-z][a-z]", "dj") do
-                if m then
-                    ngx.say(m[0])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hel
-hal
-
-
-
-=== TEST 3: fail to match
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[0-9]", "d")
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-        ';
-    }
---- request
-    GET /re
---- response_body
-nil
-nil
-nil
-
-
-
-=== TEST 4: gmatch matched but no iterate
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+", "d")
-            ngx.say("done")
-        ';
-    }
---- request
-    GET /re
---- response_body
-done
-
-
-
-=== TEST 5: gmatch matched but only iterate once and still matches remain
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+", "d")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-
-
-
-=== TEST 6: gmatch matched + o
---- config
-    location /re {
-        content_by_lua '
-            for m in ngx.re.gmatch("hello, world", "[a-z]+", "do") do
-                if m then
-                    ngx.say(m[0])
-                else
-                    ngx.say("not matched: ", m)
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-world
-
-
-
-=== TEST 7: fail to match + o
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[0-9]", "do")
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-
-            local m = it()
-            if m then ngx.say(m[0]) else ngx.say(m) end
-        ';
-    }
---- request
-    GET /re
---- response_body
-nil
-nil
-nil
-
-
-
-=== TEST 8: gmatch matched but no iterate + o
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+", "do")
-            ngx.say("done")
-        ';
-    }
---- request
-    GET /re
---- response_body
-done
-
-
-
-=== TEST 9: gmatch matched but only iterate once and still matches remain + o
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("hello, world", "[a-z]+", "do")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello
-
-
-
-=== TEST 10: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local it, err = ngx.re.gmatch("hello\\nworld", "(abc", "d")
-            if not it then
-                ngx.say("error: ", err)
-                return
-            end
-            ngx.say("success")
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 11: UTF-8 mode without UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("你好", ".", "Ud")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_dfa_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 2000
-
---- request
-    GET /re
---- response_body
-你
---- no_error_log
-[error]
-
-
-
-=== TEST 12: UTF-8 mode with UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local it = ngx.re.gmatch("你好", ".", "ud")
-            local m = it()
-            if m then
-                ngx.say(m[0])
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_dfa_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 0
-
---- request
-    GET /re
---- response_body
-你
---- no_error_log
-[error]
-
-
-
-=== TEST 13: gmatched with submatch captures
---- config
-    location /re {
-        content_by_lua '
-            for m in  ngx.re.gmatch("hello", "(he|hell)", "d") do
-                if m then
-                    ngx.say(m[0])
-                    ngx.say(m[1])
-                    ngx.say(m[2])
-                else
-                    ngx.say("not matched!")
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-nil
-nil
-
-
-
-=== TEST 14: gmatched with submatch captures (compile once)
---- config
-    location /re {
-        content_by_lua '
-            for m in  ngx.re.gmatch("hello", "(he|hell)", "od") do
-                if m then
-                    ngx.say(m[0])
-                    ngx.say(m[1])
-                    ngx.say(m[2])
-                else
-                    ngx.say("not matched!")
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-nil
-nil
diff --git a/debian/modules/http-lua/t/051-sub-jit.t b/debian/modules/http-lua/t/051-sub-jit.t
deleted file mode 100644
index c8a49c0..0000000
--- a/debian/modules/http-lua/t/051-sub-jit.t
+++ /dev/null
@@ -1,149 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 6);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: matched with j
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234 5678", "([0-9]+)", "world", "j")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world 5678: 1
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 2: not matched with j
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[0-9]+", "hiya", "j")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world: 0
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 3: matched with jo
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234 5678", "([0-9]+)", "world", "jo")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world 5678: 1
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 4: not matched with jo
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[0-9]+", "hiya", "jo")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world: 0
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 5: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("hello\\nworld", "(abc", "world", "j")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 6: bad pattern + o
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub( "hello\\nworld", "(abc", "world", "jo")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/052-sub-dfa.t b/debian/modules/http-lua/t/052-sub-dfa.t
deleted file mode 100644
index 254913b..0000000
--- a/debian/modules/http-lua/t/052-sub-dfa.t
+++ /dev/null
@@ -1,235 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 8);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: matched with d
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234 5678", "[0-9]|[0-9][0-9]", "world", "d")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world34 5678: 1
-
-
-
-=== TEST 2: not matched with d
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[0-9]+", "hiya", "d")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world: 0
-
-
-
-=== TEST 3: matched with do
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, 1234 5678", "[0-9]|[0-9][0-9]", "world", "do")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world34 5678: 1
-
-
-
-=== TEST 4: not matched with do
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.sub("hello, world", "[0-9]+", "hiya", "do")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world: 0
-
-
-
-=== TEST 5: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("hello\\nworld", "(abc", "world", "j")
-            if s then
-                ngx.say(s, ": ", n)
-
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 6: bad pattern + o
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("hello\\nworld", "(abc", "world", "jo")
-            if s then
-                ngx.say(s, ": ", n)
-
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 7: UTF-8 mode without UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("你好", ".", "a", "Ud")
-            if s then
-                ngx.say("s: ", s)
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_dfa_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 2000
-
---- request
-    GET /re
---- response_body
-s: a好
---- no_error_log
-[error]
-
-
-
-=== TEST 8: UTF-8 mode with UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.sub("你好", ".", "a", "ud")
-            if s then
-                ngx.say("s: ", s)
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_dfa_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 0
-
---- request
-    GET /re
---- response_body
-s: a好
---- no_error_log
-[error]
-
-
-
-=== TEST 9: sub with d
---- config
-    location /re {
-        content_by_lua '
-            ngx.say(ngx.re.sub("hello", "(he|hell)", function (m) ngx.say(m[0]) ngx.say(m[1]) return "x" end, "d"))
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-nil
-xo1
---- no_error_log
-[error]
-
-
-
-=== TEST 10: sub with d + o
---- config
-    location /re {
-        content_by_lua '
-            ngx.say(ngx.re.sub("hello", "(he|hell)", function (m) ngx.say(m[0]) ngx.say(m[1]) return "x" end, "do"))
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-nil
-xo1
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/053-gsub-jit.t b/debian/modules/http-lua/t/053-gsub-jit.t
deleted file mode 100644
index 3efc0a2..0000000
--- a/debian/modules/http-lua/t/053-gsub-jit.t
+++ /dev/null
@@ -1,149 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 6);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: matched with j
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, 1234 5678", "([0-9]+)", "world", "j")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world world: 2
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 2: not matched with j
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "[0-9]+", "hiya", "j")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world: 0
---- error_log
-pcre JIT compiling result: 1
-
-
-
-=== TEST 3: matched with jo
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, 1234 5678", "([0-9]+)", "world", "jo")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world world: 2
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 4: not matched with jo
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "[0-9]+", "hiya", "jo")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world: 0
-
---- grep_error_log eval
-qr/pcre JIT compiling result: \d+/
-
---- grep_error_log_out eval
-["pcre JIT compiling result: 1\n", ""]
-
-
-
-=== TEST 5: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.gsub("hello\\nworld", "(abc", "world", "j")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 6: bad pattern + o
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.gsub("hello\\nworld", "(abc", "world", "jo")
-            if s then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/054-gsub-dfa.t b/debian/modules/http-lua/t/054-gsub-dfa.t
deleted file mode 100644
index 937aa1c..0000000
--- a/debian/modules/http-lua/t/054-gsub-dfa.t
+++ /dev/null
@@ -1,236 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 7);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: matched with d
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, 1234 5678", "[0-9]|[0-9][0-9]", "world", "d")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, worldworld worldworld: 4
-
-
-
-=== TEST 2: not matched with d
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "[0-9]+", "hiya", "d")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world: 0
-
-
-
-=== TEST 3: matched with do
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, 1234 5678", "[0-9]|[0-9][0-9]", "world", "do")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, worldworld worldworld: 4
-
-
-
-=== TEST 4: not matched with do
---- config
-    location /re {
-        content_by_lua '
-            local s, n = ngx.re.gsub("hello, world", "[0-9]+", "hiya", "do")
-            if n then
-                ngx.say(s, ": ", n)
-            else
-                ngx.say(s)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-hello, world: 0
-
-
-
-=== TEST 5: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.gsub("hello\\nworld", "(abc", "world", "j")
-            if s then
-                ngx.say("gsub: ", n)
-
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
-
-
-
-=== TEST 6: bad pattern + o
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.gsub("hello\\nworld", "(abc", "world", "jo")
-            if s then
-                ngx.say("gsub: ", n)
-            else
-                ngx.say("error: ", err)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 7: UTF-8 mode without UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.gsub("你好", ".", "a", "Ud")
-            if s then
-                ngx.say("s: ", s)
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_dfa_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 2000
-exec opts: 2000
-exec opts: 2000
-
---- request
-    GET /re
---- response_body
-s: aa
---- no_error_log
-[error]
-
-
-
-=== TEST 8: UTF-8 mode with UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local s, n, err = ngx.re.gsub("你好", ".", "a", "ud")
-            if s then
-                ngx.say("s: ", s)
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_dfa_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 0
-exec opts: 0
-exec opts: 0
-
---- request
-    GET /re
---- response_body
-s: aa
---- no_error_log
-[error]
-
-
-
-=== TEST 9: gsub with d
---- config
-    location /re {
-        content_by_lua '
-            ngx.say(ngx.re.gsub("hello", "(he|hell)", function (m) ngx.say(m[0]) ngx.say(m[1]) return "x" end, "d"))
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-nil
-xo1
---- no_error_log
-[error]
-
-
-
-=== TEST 10: gsub with d + o
---- config
-    location /re {
-        content_by_lua '
-            ngx.say(ngx.re.gsub("hello", "(he|hell)", function (m) ngx.say(m[0]) ngx.say(m[1]) return "x" end, "do"))
-        ';
-    }
---- request
-    GET /re
---- response_body
-hell
-nil
-xo1
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/055-subreq-vars.t b/debian/modules/http-lua/t/055-subreq-vars.t
deleted file mode 100644
index eb5e24d..0000000
--- a/debian/modules/http-lua/t/055-subreq-vars.t
+++ /dev/null
@@ -1,338 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 5);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: set non-existent variables via "vars" option
---- config
-    location /other {
-        content_by_lua '
-            ngx.say("dog = ", ngx.var.dog)
-            ngx.say("cat = ", ngx.var.cat)
-        ';
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { vars = { dog = "hello", cat = 32 }});
-
-            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
---- error_log eval
-qr/variable "(dog|cat)" cannot be assigned a value \(maybe you forgot to define it first\?\)/
---- error_code: 500
-
-
-
-=== TEST 2: set non-existent variables via "vars" option
---- config
-    location /other {
-        content_by_lua '
-            ngx.say("dog = ", ngx.var.dog)
-            ngx.say("cat = ", ngx.var.cat)
-        ';
-    }
-
-    location /lua {
-        set $dog '';
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { vars = { dog = "hello", cat = 32 }});
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_log chop
-variable "cat" cannot be assigned a value (maybe you forgot to define it first?)
---- error_code: 500
-
-
-
-=== TEST 3: good "vars" option: user variables
---- config
-    location /other {
-        content_by_lua '
-            ngx.say("dog = ", ngx.var.dog)
-            ngx.say("cat = ", ngx.var.cat)
-        ';
-    }
-
-    location /lua {
-        set $dog '';
-        set $cat '';
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { vars = { dog = "hello", cat = 32 }});
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-dog = hello
-cat = 32
-
-
-
-=== TEST 4: bad "vars" option value
---- config
-    location /other {
-        content_by_lua '
-            ngx.say("dog = ", ngx.var.dog)
-            ngx.say("cat = ", ngx.var.cat)
-        ';
-    }
-
-    location /lua {
-        set $dog '';
-        set $cat '';
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { vars = "hello" });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log chop
-Bad vars option value
-
-
-
-=== TEST 5: bad "vars" option value value
---- config
-    location /other {
-        content_by_lua '
-            ngx.say("dog = ", ngx.var.dog)
-            ngx.say("cat = ", ngx.var.cat)
-        ';
-    }
-
-    location /lua {
-        set $dog '';
-        set $cat '';
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { vars = { cat = true } });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log chop
-attempt to use bad variable value type boolean
-
-
-
-=== TEST 6: good "vars" option: builtin variables
---- config
-    location /other {
-        echo "args: $args";
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { vars = { args = "a=hello&b=32" }});
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-args: a=hello&b=32
-
-
-
-=== TEST 7: setting non-changeable vars
---- config
-    location /other {
-        echo "query string: $query_string";
-    }
-
-    location /lua {
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { vars = { query_string = "hello" } });
-
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log chop
-variable "query_string" not changeable
-
-
-
-=== TEST 8: copy all vars
---- config
-    location /other {
-        set $dog "$dog world";
-        echo "$uri dog: $dog";
-    }
-
-    location /lua {
-        set $dog 'hello';
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { copy_all_vars = true });
-
-            ngx.print(res.body)
-            ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-        ';
-    }
---- request
-GET /lua
---- response_body
-/other dog: hello world
-/lua: hello
-
-
-
-=== TEST 9: share all vars
---- config
-    location /other {
-        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)
-        ';
-    }
---- request
-GET /lua
---- response_body
-/other dog: hello world
-/lua: hello world
-
-
-
-=== TEST 10: vars takes priority over copy_all_vars
---- config
-    location /other {
-        set $dog "$dog world";
-        echo "$uri dog: $dog";
-    }
-
-    location /lua {
-        set $dog 'hello';
-        content_by_lua '
-            res = ngx.location.capture("/other",
-                { vars = { dog = "hiya" }, copy_all_vars = true });
-
-            ngx.print(res.body)
-            ngx.say(ngx.var.uri, ": ", ngx.var.dog)
-        ';
-    }
---- request
-GET /lua
---- response_body
-/other dog: hiya world
-/lua: hello
-
-
-
-=== TEST 11: capture_multi: good "vars" option: user variables
---- config
-    location /other {
-        content_by_lua '
-            ngx.say("dog = ", ngx.var.dog)
-            ngx.say("cat = ", ngx.var.cat)
-        ';
-    }
-
-    location /lua {
-        set $dog 'blah';
-        set $cat 'foo';
-        content_by_lua '
-            local res1, res2 = ngx.location.capture_multi{
-                {"/other/1",
-                    { vars = { dog = "hello", cat = 32 }}
-                },
-                {"/other/2",
-                    { vars = { dog = "hiya", cat = 56 }}
-                }
-            };
-
-            ngx.print(res1.body)
-            ngx.print(res2.body)
-            ngx.say("parent dog: ", ngx.var.dog)
-            ngx.say("parent cat: ", ngx.var.cat)
-        ';
-    }
---- request
-GET /lua
---- response_body
-dog = hello
-cat = 32
-dog = hiya
-cat = 56
-parent dog: blah
-parent cat: foo
diff --git a/debian/modules/http-lua/t/056-flush.t b/debian/modules/http-lua/t/056-flush.t
deleted file mode 100644
index 6b697a4..0000000
--- a/debian/modules/http-lua/t/056-flush.t
+++ /dev/null
@@ -1,522 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-BEGIN {
-    $ENV{TEST_NGINX_POSTPONE_OUTPUT} = 1;
-}
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * 60;
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: flush wait - content
---- config
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-            local ok, err = ngx.flush(true)
-            if not ok then
-                ngx.log(ngx.ERR, "flush failed: ", err)
-                return
-            end
-            ngx.say("hiya")
-        ';
-    }
---- request
-GET /test
---- response_body
-hello, world
-hiya
---- no_error_log
-[error]
---- error_log
-lua reuse free buf chain, but reallocate memory because 5 >= 0
-
-
-
-=== TEST 2: flush no wait - content
---- config
-    send_timeout 500ms;
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-            local ok, err = ngx.flush(false)
-            if not ok then
-                ngx.log(ngx.ERR, "flush failed: ", err)
-                return
-            end
-            ngx.say("hiya")
-        ';
-    }
---- request
-GET /test
---- response_body
-hello, world
-hiya
-
-
-
-=== TEST 3: flush wait - rewrite
---- config
-    location /test {
-        rewrite_by_lua '
-            ngx.say("hello, world")
-            ngx.flush(true)
-            ngx.say("hiya")
-        ';
-        content_by_lua return;
-    }
---- request
-GET /test
---- response_body
-hello, world
-hiya
-
-
-
-=== TEST 4: flush no wait - rewrite
---- config
-    location /test {
-        rewrite_by_lua '
-            ngx.say("hello, world")
-            ngx.flush(false)
-            ngx.say("hiya")
-        ';
-        content_by_lua return;
-    }
---- request
-GET /test
---- response_body
-hello, world
-hiya
-
-
-
-=== TEST 5: http 1.0 (sync)
---- config
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-            ngx.flush(true)
-            ngx.say("hiya")
-            ngx.flush(true)
-            ngx.say("blah")
-        ';
-    }
---- request
-GET /test HTTP/1.0
---- response_body
-hello, world
-hiya
-blah
---- response_headers
-Content-Length: 23
---- timeout: 5
---- error_log
-lua buffering output bufs for the HTTP 1.0 request
-lua http 1.0 buffering makes ngx.flush() a no-op
-
-
-
-=== TEST 6: http 1.0 (async)
---- config
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-            local ok, err = ngx.flush(false)
-            if not ok then
-                ngx.log(ngx.WARN, "1: failed to flush: ", err)
-            end
-            ngx.say("hiya")
-            local ok, err = ngx.flush(false)
-            if not ok then
-                ngx.log(ngx.WARN, "2: failed to flush: ", err)
-            end
-            ngx.say("blah")
-        ';
-    }
---- request
-GET /test HTTP/1.0
---- response_body
-hello, world
-hiya
-blah
---- response_headers
-Content-Length: 23
---- error_log
-lua buffering output bufs for the HTTP 1.0 request
-lua http 1.0 buffering makes ngx.flush() a no-op
-1: failed to flush: buffering
-2: failed to flush: buffering
---- timeout: 5
-
-
-
-=== TEST 7: flush wait - big data
---- config
-    location /test {
-        content_by_lua '
-            ngx.say(string.rep("a", 1024 * 64))
-            ngx.flush(true)
-            ngx.say("hiya")
-        ';
-    }
---- request
-GET /test
---- response_body
-hello, world
-hiya
---- SKIP
-
-
-
-=== TEST 8: flush wait - content
---- config
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-            ngx.flush(true)
-            local res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-            ngx.flush(true)
-        ';
-    }
-    location /sub {
-        echo sub;
-    }
---- request
-GET /test
---- response_body
-hello, world
-sub
-
-
-
-=== TEST 9: http 1.0 (sync + buffering off)
---- config
-    lua_http10_buffering off;
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-            ngx.flush(true)
-            ngx.say("hiya")
-            ngx.flush(true)
-            ngx.say("blah")
-        ';
-    }
---- request
-GET /test HTTP/1.0
---- response_body
-hello, world
-hiya
-blah
---- response_headers
-!Content-Length
---- timeout: 5
---- no_error_log
-lua buffering output bufs for the HTTP 1.0 request
-lua http 1.0 buffering makes ngx.flush() a no-op
-
-
-
-=== TEST 10: http 1.0 (async)
---- config
-    lua_http10_buffering on;
-    location /test {
-        lua_http10_buffering off;
-        content_by_lua '
-            ngx.say("hello, world")
-            ngx.flush(false)
-            ngx.say("hiya")
-            ngx.flush(false)
-            ngx.say("blah")
-        ';
-    }
---- request
-GET /test HTTP/1.0
---- response_body
-hello, world
-hiya
-blah
---- response_headers
-!Content-Length
---- no_error_log
-lua buffering output bufs for the HTTP 1.0 request
-lua http 1.0 buffering makes ngx.flush() a no-op
---- timeout: 5
-
-
-
-=== TEST 11: http 1.0 (sync) - buffering explicitly off
---- config
-    location /test {
-        lua_http10_buffering on;
-        content_by_lua '
-            ngx.say("hello, world")
-            ngx.flush(true)
-            ngx.say("hiya")
-            ngx.flush(true)
-            ngx.say("blah")
-        ';
-    }
---- request
-GET /test HTTP/1.0
---- response_body
-hello, world
-hiya
-blah
---- response_headers
-Content-Length: 23
---- timeout: 5
---- error_log
-lua buffering output bufs for the HTTP 1.0 request
-lua http 1.0 buffering makes ngx.flush() a no-op
-
-
-
-=== TEST 12: http 1.0 (async) - buffering explicitly off
---- config
-    location /test {
-        lua_http10_buffering on;
-        content_by_lua '
-            ngx.say("hello, world")
-            ngx.flush(false)
-            ngx.say("hiya")
-            ngx.flush(false)
-            ngx.say("blah")
-        ';
-    }
---- request
-GET /test HTTP/1.0
---- response_body
-hello, world
-hiya
-blah
---- response_headers
-Content-Length: 23
---- error_log
-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
-
-
-
-=== TEST 14: flush before sending out the header
---- config
-    location /test {
-        content_by_lua '
-            ngx.flush()
-            ngx.status = 404
-            ngx.say("not found")
-        ';
-    }
---- request
-GET /test
---- response_body
-not found
---- error_code: 404
---- no_error_log
-[error]
-
-
-
-=== TEST 15: flush wait - gzip
---- config
-    gzip             on;
-    gzip_min_length  1;
-    gzip_types       text/plain;
-
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-            local ok, err = ngx.flush(true)
-            if not ok then
-                ngx.log(ngx.ERR, "flush failed: ", err)
-                return
-            end
-            ngx.say("hiya")
-        ';
-    }
---- request
-GET /test
---- more_headers
-Accept-Encoding: gzip
---- response_body_like: .{15}
---- response_headers
-Content-Encoding: gzip
---- no_error_log
-[error]
-
-
-
-=== TEST 16: flush wait - gunzip
---- config
-    location /test {
-        gunzip on;
-        content_by_lua '
-            local f, err = io.open(ngx.var.document_root .. "/gzip.bin", "r")
-            if not f then
-                ngx.say("failed to open file: ", err)
-                return
-            end
-            local data = f:read(100)
-            ngx.header.content_encoding = "gzip"
-            ngx.print(data)
-            local ok, err = ngx.flush(true)
-            if not ok then
-                ngx.log(ngx.ERR, "flush failed: ", err)
-                return
-            end
-            data = f:read("*a")
-            ngx.print(data)
-        ';
-    }
---- user_files eval
-">>> gzip.bin
-\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x03\x62\x64\x62\x62\x61\x62\x64\x63\x61\xe4\xe0\xe2\xe6\xe4\x61\xe4\xe4\xe7\x63\x12\xe4\xe1\xe0\x60\x14\x12\xe3\x91\xe4\xe4\xe4\x13\x60\xe3\x95\x12\x90\x15\xe0\x11\x50\x92\xd1\x16\x17\xe2\xd3\x17\x14\x11\x95\x95\x57\x96\x63\x37\xd2\x36\xd6\x51\x34\xb1\xe6\x62\x17\x95\xb0\x77\x60\xe3\x96\x33\x95\xb6\x91\x75\x97\x30\xe4\x66\x0c\xd0\xe3\xe0\xb5\xd3\x33\xf6\x90\x16\xb2\x90\x77\x56\x31\xe7\x55\x32\x11\x74\xe0\x02\x00\x00\x00\xff\xff\xcb\xc8\xac\x4c\xe4\x02\x00\x19\x15\xa9\x77\x6a\x00\x00\x00"
---- request
-GET /test
---- ignore_response
---- no_error_log
-[error]
-
-
-
-=== TEST 17: limit_rate
---- config
-    location /test {
-        limit_rate 150;
-        content_by_lua '
-            local begin = ngx.now()
-            for i = 1, 2 do
-                ngx.print(string.rep("a", 100))
-                local ok, err = ngx.flush(true)
-                if not ok then
-                    ngx.log(ngx.ERR, "failed to flush: ", err)
-                end
-            end
-            local elapsed = ngx.now() - begin
-            ngx.log(ngx.WARN, "lua writes elapsed ", elapsed, " sec")
-        ';
-    }
---- request
-GET /test
---- response_body eval
-"a" x 200
---- error_log eval
-[
-qr/lua writes elapsed [12](?:\.\d+)? sec/,
-qr/lua flush requires waiting: buffered 0x[0-9a-f]+, delayed:1/,
-]
-
---- no_error_log
-[error]
---- timeout: 4
diff --git a/debian/modules/http-lua/t/057-flush-timeout.t b/debian/modules/http-lua/t/057-flush-timeout.t
deleted file mode 100644
index a046539..0000000
--- a/debian/modules/http-lua/t/057-flush-timeout.t
+++ /dev/null
@@ -1,320 +0,0 @@
-# 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}";
-    }
-
-    if ($ENV{MOCKEAGAIN} eq 'r') {
-        $ENV{MOCKEAGAIN} = 'rw';
-
-    } else {
-        $ENV{MOCKEAGAIN} = 'w';
-    }
-
-    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
-    $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'hello, world';
-    $ENV{TEST_NGINX_POSTPONE_OUTPUT} = 1;
-}
-
-use Test::Nginx::Socket::Lua;
-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);
-
-plan tests => repeat_each() * 17;
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: flush wait - timeout
---- config
-    send_timeout 100ms;
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-            ngx.flush(true)
-            ngx.say("hiya")
-        ';
-    }
---- request
-GET /test
---- ignore_response
---- error_log eval
-qr/client timed out \(\d+: .*?timed out\)/
---- no_error_log
-[error]
-
-
-
-=== 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_coctx_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
-delete thread 2
-lua flush cleanup
-delete timer 200
-delete thread 1
-add timer 200
-expire timer 200
-free request
-
---- ignore_response
---- no_error_log
-[error]
-
-
-
-=== TEST 4: flush wait - return "timeout" error
---- config
-    send_timeout 100ms;
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-            local ok, err = ngx.flush(true)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to flush: ", err)
-                return
-            end
-            ngx.say("hiya")
-        ';
-    }
---- request
-GET /test
---- ignore_response
---- error_log eval
-[
-qr/client timed out \(\d+: .*?timed out\)/,
-'failed to flush: timeout',
-]
---- no_error_log
-[alert]
-
-
-
-=== TEST 5: flush wait in multiple user threads - return "timeout" error
---- config
-    send_timeout 100ms;
-    location /test {
-        content_by_lua '
-            ngx.say("hello, world")
-
-            local function run(tag)
-                local ok, err = ngx.flush(true)
-                if not ok then
-                    ngx.log(ngx.ERR, "thread ", tag, ": failed to flush: ", err)
-                    return
-                end
-                ngx.say("hiya")
-            end
-
-            local function new_thread(tag)
-                local ok, err = ngx.thread.spawn(run, tag)
-                if not ok then
-                    return error("failed to spawn thread: ", err)
-                end
-            end
-
-            new_thread("A")
-            new_thread("B")
-            run("main")
-        ';
-    }
---- request
-GET /test
---- ignore_response
---- error_log eval
-[
-qr/client timed out \(\d+: .*?timed out\)/,
-'thread main: failed to flush: timeout',
-'thread A: failed to flush: timeout',
-'thread B: failed to flush: timeout',
-]
---- no_error_log
-[alert]
-
-
-
-=== TEST 6: flush wait - client abort connection prematurely
---- config
-    #send_timeout 100ms;
-    location /test {
-        limit_rate 2;
-        content_by_lua '
-            ngx.say("hello, lua")
-            local ok, err = ngx.flush(true)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to flush: ", err)
-                return
-            end
-            ngx.say("hiya")
-        ';
-    }
---- request
-GET /test
---- ignore_response
---- error_log eval
-[
-qr/writev\(\) failed .*? Broken pipe/i,
-qr/failed to flush: client aborted/,
-]
---- no_error_log
-[alert]
-
---- timeout: 0.2
---- abort
---- wait: 1
diff --git a/debian/modules/http-lua/t/058-tcp-socket.t b/debian/modules/http-lua/t/058-tcp-socket.t
deleted file mode 100644
index 354a876..0000000
--- a/debian/modules/http-lua/t/058-tcp-socket.t
+++ /dev/null
@@ -1,3810 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * 199;
-
-our $HtmlDir = html_dir;
-
-$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();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 2: no trailing newline
---- config
-    server_tokens off;
-    location /t {
-        #set $port 1234;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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")
-        ';
-    }
-
-    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;
-
-        content_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)
-        ';
-    }
---- 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 ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        content_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
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-request sent: 56
-first line received: HTTP/1.1 200 OK
-second line received: Server: openresty
---- no_error_log
-[error]
---- timeout: 10
-
-
-
-=== TEST 5: connection refused (tcp)
---- config
-    location /test {
-        content_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)
-        ';
-    }
---- 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 ipv6=off;
-    lua_socket_connect_timeout 100ms;
-    lua_socket_send_timeout 100ms;
-    lua_socket_read_timeout 100ms;
-    resolver_timeout 3s;
-    location /test {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
-            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)
-        ';
-    }
---- 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, when connecting to 172.105.207.225:12345
---- timeout: 10
-
-
-
-=== TEST 7: not closed manually
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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)
-        ';
-    }
-
-    location /foo {
-        echo 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 ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        content_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)
-        ';
-    }
---- 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: 10
-
-
-
-=== TEST 9: resolver error (timeout)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 1ms;
-    location /t {
-        content_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)
-        ';
-    }
---- request
-GET /t
---- response_body_like
-^failed to connect: blah-blah-not-found\.agentzh\.org could not be resolved(?: \(\d+: (?:Operation timed out|Host not found)\))?
-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;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
---- 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;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
-"
---- 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;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
-"
---- 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;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
-"
---- 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;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
-"
---- 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;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
---- 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;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 17: ngx.socket.connect() shortcut (connection refused)
---- config
-    location /test {
-        content_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)
-        ';
-    }
---- 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 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;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
-"
---- 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;
-
-        content_by_lua '
-            local test = require "test"
-            test.go(ngx.var.port)
-        ';
-    }
---- 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;
-
-        content_by_lua '
-            local test = require "test"
-            test.go(ngx.var.port)
-        ';
-    }
---- 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
-
---- stap2
-M(http-lua-info) {
-    printf("tcp resume\n")
-    print_ubacktrace()
-}
---- 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;
-
-        content_by_lua '
-            local test = require "test"
-            test.go(ngx.var.port)
-        ';
-    }
---- 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;
-
-        content_by_lua '
-            local test = require "test"
-            test.go(ngx.var.port)
-            test.go(ngx.var.port)
-        ';
-    }
---- 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]
---- SKIP
-
-
-
-=== TEST 23: 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.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)
-        ';
-    }
-
-    location /foo {
-        echo 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;
-
-        content_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)
-        ';
-    }
-
-    location /foo {
-        echo 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;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
---- 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;
-
-        content_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)
-        ';
-    }
-
-    location /foo {
-        echo 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;
-
-        content_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)
-        ';
-    }
-
-    location /foo {
-        echo 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;
-
-        content_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)
-        ';
-    }
-
-    location /foo {
-        echo 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;
-
-        content_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)
-        ';
-    }
-
-    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;
-
-        content_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)
-        ';
-    }
-
-    location /foo {
-        echo "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;
-
-        content_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)
-        ';
-    }
-
-    location /foo {
-        echo 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;
-
-        content_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)
-        ';
-    }
-
-    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]
-[alert]
-
-
-
-=== TEST 33: github issue #215: Handle the posted requests in lua cosocket api (failed to resolve)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-
-    location = /sub {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("xxx", 80)
-            if not ok then
-                ngx.say("failed to connect to xxx: ", err)
-                return
-            end
-            ngx.say("successfully connected to xxx!")
-            sock:close()
-        ';
-    }
-
-    location = /lua {
-        content_by_lua '
-            local res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
-
---- stap
-F(ngx_resolve_name_done) {
-    println("resolve name done")
-    #print_ubacktrace()
-}
-
---- stap_out
-resolve name done
-
---- response_body_like chop
-^failed to connect to xxx: xxx could not be resolved.*?Host not found
-
---- no_error_log
-[error]
-
-
-
-=== TEST 34: github issue #215: Handle the posted requests in lua cosocket api (successfully resolved)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 5s;
-
-    location = /sub {
-        content_by_lua '
-            if not package.i then
-                package.i = 1
-            end
-
-            local servers = {"openresty.org", "agentzh.org", "sregex.org"}
-            local server = servers[package.i]
-            package.i = package.i + 1
-
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect(server, 80)
-            if not ok then
-                ngx.say("failed to connect to ", server, ": ", err)
-                return
-            end
-            ngx.say("successfully connected to xxx!")
-            sock:close()
-        ';
-    }
-
-    location = /lua {
-        content_by_lua '
-            local res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-successfully connected to xxx!
-
---- stap
-F(ngx_http_lua_socket_resolve_handler) {
-    println("lua socket resolve handler")
-}
-
-F(ngx_http_lua_socket_tcp_conn_retval_handler) {
-    println("lua socket tcp connect retval handler")
-}
-
-F(ngx_http_run_posted_requests) {
-    println("run posted requests")
-}
-
---- stap_out_like
-run posted requests
-lua socket resolve handler
-run posted requests
-lua socket tcp connect retval handler
-run posted requests
-
---- no_error_log
-[error]
---- timeout: 10
-
-
-
-=== TEST 35: connection refused (tcp) - lua_socket_log_errors off
---- config
-    location /test {
-        lua_socket_log_errors off;
-        content_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)
-        ';
-    }
---- request
-    GET /test
---- response_body
-connect: nil connection refused
-send: nil closed
-receive: nil closed
-close: nil closed
---- no_error_log eval
-[qr/connect\(\) failed \(\d+: Connection refused\)/]
-
-
-
-=== TEST 36: reread after a read time out happen (receive -> receive)
---- config
-    server_tokens off;
-    lua_socket_read_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_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)
-
-                line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive: ", err)
-                end
-            end
-        ';
-    }
---- request
-GET /t
---- response_body
-connected: 1
-failed to receive: timeout
-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 37: successful reread after a read time out happen (receive -> receive)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", ngx.var.server_port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("GET /back HTTP/1.1\\r\\nHost: localhost\\r\\n\\r\\n")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-                return
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local header, err = reader()
-            if not header then
-                ngx.say("failed to read the response header: ", err)
-                return
-            end
-
-            sock:settimeout(100)
-
-            local data, err, partial = sock:receive(100)
-            if data then
-                ngx.say("received: ", data)
-            else
-                ngx.say("failed to receive: ", err, ", partial: ", partial)
-
-                sock:settimeout(123)
-                ngx.sleep(0.1)
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-            end
-        ';
-    }
-
-    location /back {
-        content_by_lua '
-            ngx.print("hi")
-            ngx.flush(true)
-            ngx.sleep(0.2)
-            ngx.print("world")
-        ';
-    }
---- request
-GET /t
---- response_body eval
-"failed to receive: timeout, partial: 2\r
-hi\r
-
-received: 5
-received: world
-"
---- error_log
-lua tcp socket read timed out
---- no_error_log
-[alert]
-
-
-
-=== TEST 38: successful reread after a read time out happen (receive -> receiveuntil)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", ngx.var.server_port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("GET /back HTTP/1.1\\r\\nHost: localhost\\r\\n\\r\\n")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-                return
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local header, err = reader()
-            if not header then
-                ngx.say("failed to read the response header: ", err)
-                return
-            end
-
-            sock:settimeout(100)
-
-            local data, err, partial = sock:receive(100)
-            if data then
-                ngx.say("received: ", data)
-            else
-                ngx.say("failed to receive: ", err, ", partial: ", partial)
-
-                ngx.sleep(0.1)
-
-                sock:settimeout(123)
-                local reader = sock:receiveuntil("\\r\\n")
-
-                local line, err = reader()
-                if not line then
-                    ngx.say("failed to receive: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-
-                local line, err = reader()
-                if not line then
-                    ngx.say("failed to receive: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-            end
-        ';
-    }
-
-    location /back {
-        content_by_lua '
-            ngx.print("hi")
-            ngx.flush(true)
-            ngx.sleep(0.2)
-            ngx.print("world")
-        ';
-    }
---- request
-GET /t
---- response_body eval
-"failed to receive: timeout, partial: 2\r
-hi\r
-
-received: 5
-received: world
-"
---- error_log
-lua tcp socket read timed out
---- no_error_log
-[alert]
-
-
-
-=== TEST 39: successful reread after a read time out happen (receiveuntil -> receiveuntil)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", ngx.var.server_port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("GET /back HTTP/1.1\\r\\nHost: localhost\\r\\n\\r\\n")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-                return
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local header, err = reader()
-            if not header then
-                ngx.say("failed to read the response header: ", err)
-                return
-            end
-
-            sock:settimeout(100)
-
-            local reader = sock:receiveuntil("no-such-terminator")
-            local data, err, partial = reader()
-            if data then
-                ngx.say("received: ", data)
-            else
-                ngx.say("failed to receive: ", err, ", partial: ", partial)
-
-                ngx.sleep(0.1)
-
-                sock:settimeout(123)
-
-                local reader = sock:receiveuntil("\\r\\n")
-
-                local line, err = reader()
-                if not line then
-                    ngx.say("failed to receive: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-
-                local line, err = reader()
-                if not line then
-                    ngx.say("failed to receive: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-            end
-        ';
-    }
-
-    location /back {
-        content_by_lua '
-            ngx.print("hi")
-            ngx.flush(true)
-            ngx.sleep(0.2)
-            ngx.print("world")
-        ';
-    }
---- request
-GET /t
---- response_body eval
-"failed to receive: timeout, partial: 2\r
-hi\r
-
-received: 5
-received: world
-"
---- error_log
-lua tcp socket read timed out
---- no_error_log
-[alert]
-
-
-
-=== TEST 40: successful reread after a read time out happen (receiveuntil -> receive)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", ngx.var.server_port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("GET /back HTTP/1.1\\r\\nHost: localhost\\r\\n\\r\\n")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-                return
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local header, err = reader()
-            if not header then
-                ngx.say("failed to read the response header: ", err)
-                return
-            end
-
-            sock:settimeout(100)
-
-            local reader = sock:receiveuntil("no-such-terminator")
-            local data, err, partial = reader()
-            if data then
-                ngx.say("received: ", data)
-            else
-                ngx.say("failed to receive: ", err, ", partial: ", partial)
-
-                ngx.sleep(0.1)
-
-                sock:settimeout(123)
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-            end
-        ';
-    }
-
-    location /back {
-        content_by_lua '
-            ngx.print("hi")
-            ngx.flush(true)
-            ngx.sleep(0.2)
-            ngx.print("world")
-        ';
-    }
---- request
-GET /t
---- response_body eval
-"failed to receive: timeout, partial: 2\r
-hi\r
-
-received: 5
-received: world
-"
---- error_log
-lua tcp socket read timed out
---- no_error_log
-[alert]
-
-
-
-=== TEST 41: receive(0)
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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 data, err = sock:receive(0)
-            if not data then
-                ngx.say("failed to receive: ", err)
-                return
-            end
-
-            ngx.say("received: ", data)
-
-            ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
-    location /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-received: 
-close: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 42: empty options table
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
-    location /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-close: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 43: u->coctx left over bug
---- config
-    server_tokens off;
-    location = /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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 ready = false
-            local fatal = false
-
-            function f()
-                local line, err, part = sock:receive()
-                if not line then
-                    ngx.say("failed to receive the 1st line: ", err, " [", part, "]")
-                    fatal = true
-                    return
-                end
-                ready = true
-                ngx.sleep(1)
-            end
-
-            local st = ngx.thread.spawn(f)
-            while true do
-                if fatal then
-                    return
-                end
-
-                if not ready then
-                    ngx.sleep(0.01)
-                else
-                    break
-                end
-            end
-
-            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)
-            ngx.exit(0)
-        ';
-    }
-
-    location /foo {
-        content_by_lua 'ngx.sleep(0.1) ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-request sent: 57
-close: 1 nil
---- no_error_log
-[error]
---- error_log
-lua clean up the timer for pending ngx.sleep
-
-
-
-=== TEST 44: bad request tries to connect
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                test.new_sock()
-            end
-            local sock = test.get_sock()
-            local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-            else
-                ngx.say("connected")
-            end
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):7: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 45: bad request tries to receive
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:receive()
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 46: bad request tries to send
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:send("a")
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 47: bad request tries to close
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:close()
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 48: bad request tries to set keepalive
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:setkeepalive()
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 49: bad request tries to receiveuntil
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:connect("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                else
-                    ngx.say("connected")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            local it, err = sock:receiveuntil("abc")
-            if it then
-                it()
-            end
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.tcp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^connected
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):16: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 50: cosocket resolving aborted by coroutine yielding failures (require)
---- http_config
-    lua_package_path "$prefix/html/?.lua;;";
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-
---- config
-    location = /t {
-        content_by_lua '
-            package.loaded.myfoo = nil
-            require "myfoo"
-        ';
-    }
---- request
-    GET /t
---- user_files
->>> myfoo.lua
-local sock = ngx.socket.tcp()
-local ok, err = sock:connect("agentzh.org")
-if not ok then
-    ngx.log(ngx.ERR, "failed to connect: ", err)
-    return
-end
-
---- response_body_like: 500 Internal Server Error
---- wait: 0.3
---- error_code: 500
---- error_log
-resolve name done
-runtime error: attempt to yield across C-call boundary
---- no_error_log
-[alert]
-
-
-
-=== TEST 51: cosocket resolving aborted by coroutine yielding failures (xpcall err)
---- http_config
-    lua_package_path "$prefix/html/?.lua;;";
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-
---- config
-    location = /t {
-        content_by_lua '
-            local function f()
-                return error(1)
-            end
-            local function err()
-                local sock = ngx.socket.tcp()
-                local ok, err = sock:connect("agentzh.org")
-                if not ok then
-                    ngx.log(ngx.ERR, "failed to connect: ", err)
-                    return
-                end
-            end
-            xpcall(f, err)
-            ngx.say("ok")
-        ';
-    }
---- request
-    GET /t
---- response_body
-ok
---- wait: 0.3
---- error_log
-resolve name done
---- no_error_log
-[error]
-[alert]
-could not cancel
-
-
-
-=== TEST 52: tcp_nodelay on
---- config
-    tcp_nodelay on;
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
---- error_log
-lua socket tcp_nodelay
---- no_error_log
-[error]
-
-
-
-=== TEST 53: tcp_nodelay off
---- config
-    tcp_nodelay off;
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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)
-        ';
-    }
-
-    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: 1 nil
---- no_error_log
-lua socket tcp_nodelay
-[error]
-
-
-
-=== TEST 54: IPv6
---- http_config
-    server_tokens off;
-
-    server {
-        listen [::1]:$TEST_NGINX_SERVER_PORT;
-
-        location /foo {
-            content_by_lua 'ngx.say("foo")';
-            more_clear_headers Date;
-        }
-    }
---- config
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local port = ngx.var.port
-            local ok, err = sock:connect("[::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)
-        ';
-    }
-
---- 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: 1 nil
---- no_error_log
-[error]
---- skip_eval: 3: system("ping6 -c 1 ::1 >/dev/null 2>&1") ne 0
-
-
-
-=== TEST 55: kill a thread with a connecting socket
---- config
-    server_tokens off;
-    lua_socket_connect_timeout 1s;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        content_by_lua '
-            local sock
-
-            local thr = ngx.thread.spawn(function ()
-                sock = ngx.socket.tcp()
-                local ok, err = sock:connect("agentzh.org", 12345)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-            end)
-
-            ngx.sleep(0.002)
-            ngx.thread.kill(thr)
-            ngx.sleep(0.001)
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.say("failed to setkeepalive: ", err)
-            else
-                ngx.say("setkeepalive: ", ok)
-            end
-        ';
-    }
-
---- request
-GET /t
---- response_body
-failed to setkeepalive: closed
---- error_log
-lua tcp socket connect timeout: 100
---- timeout: 10
-
-
-
-=== TEST 56: reuse cleanup
---- config
-    server_tokens off;
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local port = ngx.var.port
-
-            for i = 1, 2 do
-                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)
-
-                while true do
-                    local line, err, part = sock:receive()
-                    if not line then
-                        ngx.say("failed to receive a line: ", err, " [", part, "]")
-                        break
-                    end
-                end
-
-                ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end
-        }
-    }
-
-    location /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-request sent: 57
-failed to receive a line: closed []
-close: 1 nil
-connected: 1
-request sent: 57
-failed to receive a line: closed []
-close: 1 nil
---- error_log
-lua http cleanup reuse
-
-
-
-=== TEST 57: reuse cleanup in ngx.timer (fake_request)
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua_block {
-            local total_send_bytes = 0
-            local port = ngx.var.port
-
-            local function network()
-                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 = "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.log(ngx.ERR, "failed to send request: ", err)
-                    return
-                end
-
-                total_send_bytes = total_send_bytes + bytes
-
-                while true do
-                    local line, err, part = sock:receive()
-                    if not line then
-                        break
-                    end
-                end
-
-                ok, err = sock:close()
-            end
-
-            local done = false
-
-            local function double_network()
-                network()
-                network()
-                done = true
-            end
-
-            local ok, err = ngx.timer.at(0, double_network)
-            if not ok then
-                ngx.say("failed to create timer: ", err)
-            end
-
-            i = 1
-            while not done do
-                local time = 0.005 * i
-                if time > 0.1 then
-                    time = 0.1
-                end
-                ngx.sleep(time)
-                i = i + 1
-            end
-
-            collectgarbage("collect")
-
-            ngx.say("total_send_bytes: ", total_send_bytes)
-        }
-    }
-
-    location /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-total_send_bytes: 114
---- error_log
-lua http cleanup reuse
-
-
-
-=== TEST 58: free cleanup in ngx.timer (without sock:close)
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua_block {
-            local total_send_bytes = 0
-            local port = ngx.var.port
-
-            local function network()
-                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 = "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.log(ngx.ERR, "failed to send request: ", err)
-                    return
-                end
-
-                total_send_bytes = total_send_bytes + bytes
-
-                while true do
-                    local line, err, part = sock:receive()
-                    if not line then
-                        break
-                    end
-                end
-            end
-
-            local done = false
-
-            local function double_network()
-                network()
-                network()
-                done = true
-            end
-
-            local ok, err = ngx.timer.at(0, double_network)
-            if not ok then
-                ngx.say("failed to create timer: ", err)
-            end
-
-            i = 1
-            while not done do
-                local time = 0.005 * i
-                if time > 0.1 then
-                    time = 0.1
-                end
-                ngx.sleep(time)
-                i = i + 1
-            end
-
-            collectgarbage("collect")
-
-            ngx.say("total_send_bytes: ", total_send_bytes)
-        }
-    }
-
-    location /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-total_send_bytes: 114
---- no_error_log
-[error]
-
-
-
-=== TEST 59: reuse cleanup in subrequest
---- config
-    server_tokens off;
-    location /t {
-        echo_location /tt;
-    }
-
-    location /tt {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local port = ngx.var.port
-
-            for i = 1, 2 do
-                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)
-
-                while true do
-                    local line, err, part = sock:receive()
-                    if not line then
-                        ngx.say("failed to receive a line: ", err, " [", part, "]")
-                        break
-                    end
-                end
-
-                ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end
-        ';
-    }
-
-    location /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-request sent: 57
-failed to receive a line: closed []
-close: 1 nil
-connected: 1
-request sent: 57
-failed to receive a line: closed []
-close: 1 nil
---- error_log
-lua http cleanup reuse
-
-
-
-=== TEST 60: options_table is nil
---- config
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local port = ngx.var.port
-
-            local ok, err = sock:connect("127.0.0.1", port, nil)
-            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)
-        }
-    }
---- request
-GET /t
---- response_body
-connected: 1
-request sent: 11
-received: OK
-close: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 61: resolver send query failing immediately in connect()
-this case did not clear coctx->cleanup properly and would lead to memory invalid accesses.
-
-this test case requires the following iptables rule to work properly:
-
-sudo iptables -I OUTPUT 1 -p udp --dport 10086 -j REJECT
-
---- config
-    location /t {
-        resolver 127.0.0.1:10086 ipv6=off;
-        resolver_timeout 10ms;
-
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            for i = 1, 3 do -- retry
-                local ok, err = sock:connect("www.google.com", 80)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                end
-            end
-
-            ngx.say("hello!")
-        }
-    }
---- request
-GET /t
---- response_body
-failed to connect: www.google.com could not be resolved
-failed to connect: www.google.com could not be resolved
-failed to connect: www.google.com could not be resolved
-hello!
---- error_log eval
-qr{\[alert\] .*? send\(\) failed \(\d+: Operation not permitted\) while resolving}
-
-
-
-=== TEST 62: the upper bound of port range should be 2^16 - 1
---- config
-    location /t {
-        content_by_lua_block {
-            local sock, err = ngx.socket.connect("127.0.0.1", 65536)
-            if not sock then
-                ngx.say("failed to connect: ", err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-failed to connect: bad port number: 65536
---- no_error_log
-[error]
-
-
-
-=== TEST 63: send boolean and nil
---- config
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_by_lua_block {
-            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
-
-            local function send(data)
-                local bytes, err = sock:send(data)
-                if not bytes then
-                    ngx.say("failed to send request: ", err)
-                    return
-                end
-            end
-
-            local req = "GET /foo HTTP/1.0\r\nHost: localhost\r\nConnection: close\r\nTest: "
-            send(req)
-            send(true)
-            send(false)
-            send(nil)
-            send("\r\n\r\n")
-
-            while true do
-                local line, err, part = sock:receive()
-                if line then
-                    ngx.say("received: ", line)
-                else
-                    break
-                end
-            end
-
-            ok, err = sock:close()
-        }
-    }
-
-    location /foo {
-        server_tokens off;
-        more_clear_headers Date;
-        echo $http_test;
-    }
-
---- request
-GET /t
---- response_body
-received: HTTP/1.1 200 OK
-received: Server: nginx
-received: Content-Type: text/plain
-received: Connection: close
-received: 
-received: truefalsenil
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/059-unix-socket.t b/debian/modules/http-lua/t/059-unix-socket.t
deleted file mode 100644
index b06ba6e..0000000
--- a/debian/modules/http-lua/t/059-unix-socket.t
+++ /dev/null
@@ -1,203 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 1);
-
-$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 {
-        content_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)
-        ';
-    }
---- request
-    GET /test
---- response_body
-connect: nil no such file or directory
-send: nil closed
-receive: nil closed
-close: nil closed
---- error_log eval
-qr{\[crit\] .*? connect\(\) to unix:/tmp/nosuchfile\.sock failed}
-
-
-
-=== TEST 2: invalid host argument
---- config
-    location /test {
-        content_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)
-        ';
-    }
---- 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 {
-        content_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)
-        ';
-    }
---- 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: 1 nil
-
-
-
-=== TEST 4: ngx.socket.stream
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-        default_type 'text/plain';
-
-        server_tokens off;
-        location /foo {
-            content_by_lua_block { ngx.say("foo") }
-            more_clear_headers Date;
-        }
-    }
---- config
-    location /test {
-        content_by_lua_block {
-            local sock = ngx.socket.stream()
-            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)
-        }
-    }
---- 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: 1 nil
diff --git a/debian/modules/http-lua/t/060-lua-memcached.t b/debian/modules/http-lua/t/060-lua-memcached.t
deleted file mode 100644
index 0751238..0000000
--- a/debian/modules/http-lua/t/060-lua-memcached.t
+++ /dev/null
@@ -1,168 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 1);
-
-our $HtmlDir = html_dir;
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-my $pwd = `pwd`;
-chomp $pwd;
-$ENV{TEST_NGINX_PWD} ||= $pwd;
-
-#master_on();
-workers(1);
-#log_level('warn');
-#worker_connections(1014);
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- http_config
-    lua_package_path '$TEST_NGINX_PWD/t/lib/?.lua;;';
---- config
-    location /test {
-        content_by_lua '
-            package.loaded["socket"] = ngx.socket
-            local Memcached = require "Memcached"
-            Memcached.socket = ngx.socket
-
-            local memc = Memcached.Connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-
-            memc:set("some_key", "hello 1234")
-            local data = memc:get("some_key")
-            ngx.say("some_key: ", data)
-        ';
-    }
---- request
-    GET /test
---- response_body
-some_key: hello 1234
---- no_error_log
-[error]
-
-
-
-=== TEST 2: raw memcached
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;;';"
---- config
-    location /t {
-        content_by_lua '
-            local memcached = require "resty.memcached"
-            local memc, err = memcached.connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-
-            local ok, err = memc:set("some_key", "hello 1234")
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set some_key: ", err)
-                ngx.exit(500)
-            end
-
-            local data, err = memc:get("some_key")
-            if not data and err then
-                ngx.log(ngx.ERR, "failed to get some_key: ", err)
-                ngx.exit(500)
-            end
-
-            ngx.say("some_key: ", data)
-
-            local res, err = memc:set_keepalive()
-            if not res then
-                ngx.say("failed to set keepalive: ", err)
-                return
-            end
-        ';
-    }
---- user_files
->>> resty/memcached.lua
-module("resty.memcached", package.seeall)
-
-local mt = { __index = resty.memcached }
-local sub = string.sub
-local escape_uri = ngx.escape_uri
-local socket_connect = ngx.socket.connect
-local match = string.match
-
-function connect(...)
-    local sock, err = socket_connect(...)
-    return setmetatable({ sock = sock }, mt)
-end
-
-function get(self, key)
-    local cmd = "get " .. escape_uri(key) .. "\r\n"
-    local bytes, err = self.sock:send(cmd)
-    if not bytes then
-        return nil, err
-    end
-
-    local line, err = self.sock:receive()
-    if line == 'END' then
-        return nil, nil
-    end
-
-    local flags, len = match(line, [[^VALUE %S+ (%d+) (%d+)]])
-    if not flags then
-        return nil, "bad response: " .. line
-    end
-
-    print("size: ", size, ", flags: ", len)
-
-    local data, err = self.sock:receive(len)
-    if not data then
-        return nil, err
-    end
-
-    line, err = self.sock:receive(2) -- discard the trailing CRLF
-    if not line then
-        return nil, nil, "failed to receive CRLF: " .. (err or "")
-    end
-
-    line, err = self.sock:receive() -- discard "END\r\n"
-    if not line then
-        return nil, nil, "failed to receive END CRLF: " .. (err or "")
-    end
-
-    return data
-end
-
-function set(self, key, value, exptime, flags)
-    if not exptime then
-        exptime = 0
-    end
-
-    if not flags then
-        flags = 0
-    end
-
-    local cmd = table.concat({"set ", escape_uri(key), " ", flags, " ", exptime, " ", #value, "\r\n", value, "\r\n"}, "")
-
-    local bytes, err = self.sock:send(cmd)
-    if not bytes then
-        return nil, err
-    end
-
-    local data, err = self.sock:receive()
-    if sub(data, 1, 6) == "STORED" then
-        return true
-    end
-
-    return false, err
-end
-
-function set_keepalive(self)
-    return self.sock:setkeepalive(0, 100)
-end
---- request
-    GET /t
---- response_body
-some_key: hello 1234
---- no_error_log
-[error]
---- error_log
-lua reuse free buf memory
diff --git a/debian/modules/http-lua/t/061-lua-redis.t b/debian/modules/http-lua/t/061-lua-redis.t
deleted file mode 100644
index ebfa6d1..0000000
--- a/debian/modules/http-lua/t/061-lua-redis.t
+++ /dev/null
@@ -1,184 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-$ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
-
-#log_level "warn";
-#worker_connections(1024);
-#master_on();
-
-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__
-
-=== TEST 1: sanity
---- http_config
-    lua_package_path '$TEST_NGINX_PWD/t/lib/?.lua;;';
---- config
-    location /test {
-        content_by_lua '
-            package.loaded["socket"] = ngx.socket
-            local Redis = require "Redis"
-
-            local redis = Redis.connect("127.0.0.1", $TEST_NGINX_REDIS_PORT)
-
-            redis:set("some_key", "hello 1234")
-            local data = redis:get("some_key")
-            ngx.say("some_key: ", data)
-        ';
-    }
---- request
-    GET /test
---- response_body
-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 ljson = require "ljson"
-
-            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: ", ljson.encode(msg))
-            end
-
-            for i = 1, 3 do
-                r1:publish("foo", "test " .. i)
-                msg, abort = loop()
-                if msg then
-                    ngx.say("msg: ", ljson.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: {"channel":"foo","kind":"subscribe","payload":1}
-msg: {"channel":"foo","kind":"message","payload":"test 1"}
-abort: function
-msg: {"channel":"foo","kind":"message","payload":"test 2"}
-abort: function
-msg: {"channel":"foo","kind":"message","payload":"test 3"}
-abort: function
-msg type: nil
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/062-count.t b/debian/modules/http-lua/t/062-count.t
deleted file mode 100644
index 2ad2f9f..0000000
--- a/debian/modules/http-lua/t/062-count.t
+++ /dev/null
@@ -1,570 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(4);
-#log_level('warn');
-no_root_location();
-
-#repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-our $HtmlDir = html_dir;
-
-#$ENV{LUA_CPATH} = "/usr/local/openresty/lualib/?.so;" . $ENV{LUA_CPATH};
-
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: entries under ngx. (content by lua)
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx) do
-                    n = n + 1
-                end
-                ngx.say("ngx: ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-ngx: 117
---- no_error_log
-[error]
-
-
-
-=== TEST 2: entries under ngx. (set by lua)
---- config
-        location = /test {
-            set_by_lua $n '
-                local n = 0
-                for k, v in pairs(ngx) do
-                    n = n + 1
-                end
-                return n;
-            ';
-            echo $n;
-        }
---- request
-GET /test
---- response_body
-117
---- no_error_log
-[error]
-
-
-
-=== TEST 3: entries under ngx. (header filter by lua)
---- config
-        location = /test {
-            set $n '';
-
-            content_by_lua '
-                ngx.send_headers()
-                ngx.say("n = ", ngx.var.n)
-            ';
-
-            header_filter_by_lua '
-                local n = 0
-                for k, v in pairs(ngx) do
-                    n = n + 1
-                end
-
-                ngx.var.n = n
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 117
---- no_error_log
-[error]
-
-
-
-=== TEST 4: entries under ndk. (content by lua)
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ndk) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 1
---- no_error_log
-[error]
-
-
-
-=== TEST 5: entries under ngx.req (content by lua)
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx.req) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 24
---- no_error_log
-[error]
-
-
-
-=== TEST 6: entries under ngx.req (set by lua)
---- config
-        location = /test {
-            set_by_lua $n '
-                local n = 0
-                for k, v in pairs(ngx.req) do
-                    n = n + 1
-                end
-                return n
-            ';
-
-            echo "n = $n";
-        }
---- request
-GET /test
---- response_body
-n = 24
---- no_error_log
-[error]
-
-
-
-=== TEST 7: entries under ngx.req (header filter by lua)
---- config
-        location = /test {
-            set $n '';
-
-            header_filter_by_lua '
-                local n = 0
-                for k, v in pairs(ngx.req) do
-                    n = n + 1
-                end
-                ngx.var.n = n
-            ';
-
-            content_by_lua '
-                ngx.send_headers()
-                ngx.say("n = ", ngx.var.n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 24
---- no_error_log
-[error]
-
-
-
-=== TEST 8: entries under ngx.location
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx.location) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 2
---- no_error_log
-[error]
-
-
-
-=== TEST 9: entries under ngx.socket
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx.socket) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 4
---- no_error_log
-[error]
-
-
-
-=== TEST 10: entries under ngx._tcp_meta
---- SKIP
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx._tcp_meta) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 10
---- no_error_log
-[error]
-
-
-
-=== TEST 11: entries under the metatable of req sockets
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                local sock, err = ngx.req.socket()
-                if not sock then
-                    ngx.say("failed to get the request socket: ", err)
-                end
-
-                for k, v in pairs(getmetatable(sock)) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-POST /test
-hello world
---- response_body
-n = 5
---- no_error_log
-[error]
-
-
-
-=== TEST 12: shdict metatable
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-            local mt = dogs.__index
-            local n = 0
-            for k, v in pairs(mt) do
-                n = n + 1
-            end
-            ngx.say("n = ", n)
-        ';
-    }
---- request
-GET /test
---- response_body
-n = 18
---- 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: 117
-
-
-
-=== TEST 14: entries under ngx.timer
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx.timer) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 4
---- no_error_log
-[error]
-
-
-
-=== TEST 15: entries under ngx.config
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx.config) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 6
---- no_error_log
-[error]
-
-
-
-=== TEST 16: entries under ngx.re
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx.re) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 5
---- no_error_log
-[error]
-
-
-
-=== TEST 17: entries under coroutine. (content by lua)
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(coroutine) do
-                    n = n + 1
-                end
-                ngx.say("coroutine: ", n)
-            ';
-        }
---- request
-GET /test
---- stap2
-global c
-probe process("$LIBLUA_PATH").function("rehashtab") {
-    c++
-    printf("rehash: %d\n", c)
-}
---- stap_out2
-3
---- response_body
-coroutine: 14
---- no_error_log
-[error]
-
-
-
-=== TEST 18: entries under ngx.thread. (content by lua)
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx.thread) do
-                    n = n + 1
-                end
-                ngx.say("thread: ", n)
-            ';
-        }
---- request
-GET /test
---- stap2
-global c
-probe process("$LIBLUA_PATH").function("rehashtab") {
-    c++
-    printf("rehash: %d\n", c)
-}
---- stap_out2
---- response_body
-thread: 3
---- no_error_log
-[error]
-
-
-
-=== TEST 19: entries under ngx.worker
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                for k, v in pairs(ngx.worker) do
-                    n = n + 1
-                end
-                ngx.say("worker: ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-worker: 4
---- no_error_log
-[error]
-
-
-
-=== TEST 20: entries under the metatable of udp sockets
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                local sock = ngx.socket.udp()
-                for k, v in pairs(getmetatable(sock)) do
-                    n = n + 1
-                end
-                ngx.say("n = ", n)
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 6
---- no_error_log
-[error]
-
-
-
-=== TEST 21: entries under the metatable of req raw sockets
---- config
-        location = /test {
-            content_by_lua '
-                local n = 0
-                ngx.req.read_body()
-                local sock, err = ngx.req.socket(true)
-                if not sock then
-                    ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                    return
-                end
-
-                for k, v in pairs(getmetatable(sock)) do
-                    n = n + 1
-                end
-
-                local ok, err = sock:send("HTTP/1.1 200 OK\\r\\nContent-Length: 6\\r\\n\\r\\nn = "..n.."\\n")
-                if not ok then
-                    ngx.log(ngx.ERR, "failed to send: ", err)
-                    return
-                end
-            ';
-        }
---- request
-GET /test
---- response_body
-n = 6
---- no_error_log
-[error]
-
-
-
-=== TEST 22: entries under the req raw sockets
---- config
-        location = /test {
-            content_by_lua_block {
-                local narr = 0
-                local nrec = 0
-                ngx.req.read_body()
-                local sock, err = ngx.req.socket(true)
-                if not sock then
-                    ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                    return
-                end
-                sock:settimeouts(1000, 2000, 3000)
-                for k, v in ipairs(sock) do
-                    narr = narr + 1
-                end
-                for k, v in pairs(sock) do
-                    nrec = nrec + 1
-                end
-                -- include '__index'
-                nrec = nrec - narr + 1
-
-                local ok, err = sock:send("HTTP/1.1 200 OK\r\n\r\nnarr = "..narr.."\nnrec = "..nrec.."\n")
-                if not ok then
-                    ngx.log(ngx.ERR, "failed to send: ", err)
-                    return
-                end
-            }
-        }
---- request
-GET /test
---- response_body
-narr = 2
-nrec = 3
---- no_error_log
-[error]
-
-
-
-=== TEST 23: entries under the req sockets
---- config
-        location = /test {
-            content_by_lua_block {
-                local narr = 0
-                local nrec = 0
-                local sock, err = ngx.req.socket()
-                if not sock then
-                    ngx.log(ngx.ERR, "server: failed to get req socket: ", err)
-                    return
-                end
-                sock:settimeouts(1000, 2000, 3000)
-                for k, v in ipairs(sock) do
-                    narr = narr + 1
-                end
-                for k, v in pairs(sock) do
-                    nrec = nrec + 1
-                end
-                -- include '__index'
-                nrec = nrec - narr + 1
-
-                ngx.say("narr = "..narr.."\nnrec = "..nrec)
-            }
-        }
---- request
-POST /test
-hello world
---- response_body
-narr = 2
-nrec = 3
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/063-abort.t b/debian/modules/http-lua/t/063-abort.t
deleted file mode 100644
index 411a07e..0000000
--- a/debian/modules/http-lua/t/063-abort.t
+++ /dev/null
@@ -1,1019 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-worker_connections(1014);
-#master_on();
-#workers(4);
-#log_level('warn');
-no_root_location();
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 2);
-
-our $HtmlDir = html_dir;
-
-#$ENV{LUA_CPATH} = "/usr/local/openresty/lualib/?.so;" . $ENV{LUA_CPATH};
-
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: ngx.exit(400) should abort print
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /memc_query {
-            internal;
-            set               $memc_cmd     $arg_cmd;
-            set_unescape_uri  $memc_key     $arg_key;
-            set_unescape_uri  $memc_value   $arg_value;
-            set $memc_exptime $arg_exptime;
-
-            memc_cmds_allowed get set add delete;
-            memc_pass 127.0.0.1:11211;
-        }
-
-        location = /test {
-            content_by_lua_file html/test.lua;
-        }
---- user_files
->>> test.lua
-local memd = require 'memd'
-ngx.exit(400)
-local res = memd.query( { cmd = 'get', key = id } )
->>> memd.lua
-module('memd', package.seeall)
-
-local URL = '/memc_query'
-local capture = ngx.location.capture
-
-function query(arg)
-    if type(arg) ~= 'table' then
-        return nil
-    end
-
-    print("HELLO WORLD")
-    return capture(URL, { args = arg } )
-end
---- request
-GET /test?a
---- response_body_like: 400 Bad Request
---- no_error_log eval
-["lua print: HELLO WORLD", q{the "$memc_key" variable is not set}]
---- error_code: 400
-
-
-
-=== TEST 2: ngx.exit(400) should abort ngx.log
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /memc_query {
-            internal;
-            set               $memc_cmd     $arg_cmd;
-            set_unescape_uri  $memc_key     $arg_key;
-            set_unescape_uri  $memc_value   $arg_value;
-            set $memc_exptime $arg_exptime;
-
-            memc_cmds_allowed get set add delete;
-            memc_pass 127.0.0.1:11211;
-        }
-
-        location = /test {
-            content_by_lua_file html/test.lua;
-        }
---- user_files
->>> test.lua
-local memd = require 'memd'
-ngx.exit(400)
-local res = memd.query( { cmd = 'get', key = id } )
->>> memd.lua
-module('memd', package.seeall)
-
-local URL = '/memc_query'
-local capture = ngx.location.capture
-local log = ngx.log
-local level = ngx.ERR
-
-function query(arg)
-    if type(arg) ~= 'table' then
-        return nil
-    end
-
-    log(level, "HELLO WORLD")
-    return capture(URL, { args = arg } )
-end
---- request
-GET /test?a
---- response_body_like: 400 Bad Request
---- no_error_log eval
-["HELLO WORLD", q{the "$memc_key" variable is not set}]
---- error_code: 400
-
-
-
-=== TEST 3: ngx.exit(400) should abort ngx.location.capture
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /memc_query {
-            internal;
-            set               $memc_cmd     $arg_cmd;
-            set_unescape_uri  $memc_key     $arg_key;
-            set_unescape_uri  $memc_value   $arg_value;
-            set $memc_exptime $arg_exptime;
-
-            memc_cmds_allowed get set add delete;
-            memc_pass 127.0.0.1:11211;
-        }
-
-        location = /test {
-            content_by_lua_file html/test.lua;
-        }
---- user_files
->>> test.lua
-local memd = require 'memd'
-ngx.exit(400)
-local res = memd.query( { cmd = 'get', key = id } )
->>> memd.lua
-module('memd', package.seeall)
-
-local URL = '/memc_query'
-local capture = ngx.location.capture
-
-function query(arg)
-    if type(arg) ~= 'table' then
-        return nil
-    end
-
-    return capture(URL, { args = arg } )
-end
---- request
-GET /test?a
---- response_body_like: 400 Bad Request
---- no_error_log
-the "$memc_key" variable is not set
---- error_code: 400
-
-
-
-=== TEST 4: ngx.exit(400) should abort ngx.location.capture_multi
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /memc_query {
-            internal;
-            set               $memc_cmd     $arg_cmd;
-            set_unescape_uri  $memc_key     $arg_key;
-            set_unescape_uri  $memc_value   $arg_value;
-            set $memc_exptime $arg_exptime;
-
-            memc_cmds_allowed get set add delete;
-            memc_pass 127.0.0.1:11211;
-        }
-
-        location = /test {
-            content_by_lua_file html/test.lua;
-        }
---- user_files
->>> test.lua
-local memd = require 'memd'
-ngx.exit(400)
-local res = memd.query( { cmd = 'get', key = id } )
->>> memd.lua
-module('memd', package.seeall)
-
-local URL = '/memc_query'
-local capture_multi = ngx.location.capture_multi
-
-function query(arg)
-    if type(arg) ~= 'table' then
-        return nil
-    end
-
-    return capture_multi{ {URL, { args = arg }} }
-end
---- request
-GET /test?a
---- response_body_like: 400 Bad Request
---- no_error_log
-the "$memc_key" variable is not set
---- error_code: 400
-
-
-
-=== TEST 5: ngx.exit(400) should abort ngx.redirect
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.redirect("/blah")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua redirect to "/blah" with code 302
---- error_code: 400
-
-
-
-=== TEST 6: ngx.exit(400) should abort ngx.exit
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.exit(503)
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua exit with code 503
---- error_code: 400
-
-
-
-=== TEST 7: ngx.exit(400) should abort ngx.exec
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.exec("/blah")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua exec "/blah?"
---- error_code: 400
-
-
-
-=== TEST 8: ngx.exit(400) should abort ngx.send_headers
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.send_headers()
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua send headers
---- error_code: 400
-
-
-
-=== TEST 9: ngx.exit(400) should abort ngx.print
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.print("HELLO WORLD")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua print response
---- error_code: 400
-
-
-
-=== TEST 10: ngx.exit(400) should abort ngx.say
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.say("HELLO WORLD")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua say response
---- error_code: 400
-
-
-
-=== TEST 11: ngx.exit(400) should abort ngx.flush
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.flush()
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua flush asynchronously
---- error_code: 400
-
-
-
-=== TEST 12: ngx.exit(400) should abort ngx.eof
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.eof()
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua send eof
---- error_code: 400
-
-
-
-=== TEST 13: ngx.exit(400) should abort ngx.re.match
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.re.match("a", "a", "jo")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua compiling match regex "a" with options "jo"
---- error_code: 400
-
-
-
-=== TEST 14: ngx.exit(400) should abort ngx.re.gmatch
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.re.gmatch("a", "a", "jo")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua compiling gmatch regex "a" with options "jo"
---- error_code: 400
-
-
-
-=== TEST 15: ngx.exit(400) should abort ngx.re.sub
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.re.sub("a", "a", "", "jo")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua compiling sub regex "a" with options "jo"
---- error_code: 400
-
-
-
-=== TEST 16: ngx.exit(400) should abort ngx.re.gsub
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go()
-    ngx.re.gsub("a", "a", "", "jo")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-lua compiling gsub regex "a" with options "jo"
---- error_code: 400
-
-
-
-=== TEST 17: ngx.exit(400) should abort ngx.shared.DICT (set)
---- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                local dogs = ngx.shared.dogs
-                print("foo = ", dogs:get("foo"))
-                dogs:set("foo", 32)
-                ngx.exit(400)
-                test.go(dogs)
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go(dogs)
-    dogs:set("foo", 56)
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-foo = 56
---- error_code: 400
-
-
-
-=== TEST 18: ngx.exit(400) should abort ngx.shared.DICT (replace)
---- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                local dogs = ngx.shared.dogs
-                print("foo = ", dogs:get("foo"))
-                dogs:set("foo", 32)
-                ngx.exit(400)
-                test.go(dogs)
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go(dogs)
-    dogs:replace("foo", 56)
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-foo = 56
---- error_code: 400
-
-
-
-=== TEST 19: ngx.exit(400) should abort ngx.shared.DICT (incr)
---- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                local dogs = ngx.shared.dogs
-                print("foo = ", dogs:get("foo"))
-                dogs:set("foo", 32)
-                ngx.exit(400)
-                test.go(dogs)
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go(dogs)
-    dogs:incr("foo", 56)
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-foo = 88
---- error_code: 400
-
-
-
-=== TEST 20: ngx.exit(400) should abort ngx.shared.DICT (get)
---- http_config eval
-    "lua_shared_dict dogs 1m; lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                local dogs = ngx.shared.dogs
-                dogs:set("foo", 32)
-                ngx.exit(400)
-                test.go(dogs)
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-function go(dogs)
-    dogs:get("foo")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-fetching key "foo" in shared dict "dogs"
---- error_code: 400
-
-
-
-=== TEST 21: ngx.exit(400) should skip os.execute
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                ngx.exit(400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-local exec = os.execute
-
-function go()
-    exec("sleep 5")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- error_code: 400
---- no_error_log
-[error]
---- timeout: 2
-
-
-
-=== TEST 22: ngx.exit(400) should break pcall and skip os.execute
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                pcall(ngx.exit, 400)
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-local exec = os.execute
-
-function go()
-    exec("sleep 5")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- no_error_log
-fetching key "foo" in shared dict "dogs"
---- error_code: 400
---- timeout: 2
-
-
-
-=== TEST 23: ngx.exit(400) should break pcall and skip os.execute (all in user module)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-local exec = os.execute
-
-function go()
-    pcall(ngx.exit, 400)
-    exec("sleep 5")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- error_code: 400
---- no_error_log
-[error]
---- timeout: 2
-
-
-
-=== TEST 24: ngx.redirect() should break pcall and skip os.execute (all in user module)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-local exec = os.execute
-
-function go()
-    pcall(ngx.redirect, "/blah")
-    exec("sleep 5")
-end
---- request
-GET /test
---- response_body_like: 302 Found
---- no_error_log
-[error]
---- error_code: 302
---- timeout: 2
-
-
-
-=== TEST 25: ngx.redirect() should skip os.execute (all in user module)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-local exec = os.execute
-
-function go()
-    ngx.redirect("/blah")
-    exec("sleep 5")
-end
---- request
-GET /test
---- response_body_like: 302 Found
---- no_error_log
-[error]
---- error_code: 302
---- timeout: 2
-
-
-
-=== TEST 26: ngx.exec() should break pcall and skip os.execute (all in user module)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                test.go()
-            ';
-        }
-        location = /foo {
-            echo foo;
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-local exec = os.execute
-
-function go()
-    pcall(ngx.exec, "/foo")
-    exec("sleep 5")
-end
---- request
-GET /test
---- response_body
-foo
---- no_error_log
-[error]
---- timeout: 2
-
-
-
-=== TEST 27: ngx.exec() should skip os.execute (all in user module)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                test.go()
-            ';
-        }
-        location = /foo {
-            echo foo;
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-local exec = os.execute
-
-function go()
-    ngx.exec("/foo")
-    exec("sleep 5")
-end
---- request
-GET /test
---- response_body
-foo
---- no_error_log
-[error]
---- timeout: 2
-
-
-
-=== TEST 28: ngx.set_uri(uri, true) should break pcall and skip os.execute (all in user module)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            rewrite_by_lua '
-                local test = require "test"
-                test.go()
-            ';
-            echo hello;
-        }
-        location = /foo {
-            echo foo;
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-local exec = os.execute
-
-function go()
-    local ok, err = pcall(ngx.req.set_uri, "/foo", true)
-    if not ok then
-        ngx.log(ngx.ERR, "error: ", err)
-    end
-
-    exec("sleep 5")
-end
---- request
-GET /test
---- response_body
-foo
---- no_error_log
-[error]
---- timeout: 2
-
-
-
-=== TEST 29: abort does not affect following coroutines
---- config
-        location = /test {
-            rewrite_by_lua 'ngx.exit(0)';
-            content_by_lua '
-                pcall(ngx.say, "hello world")
-            ';
-        }
---- request
-GET /test
---- response_body
-hello world
---- no_error_log
-[error]
---- timeout: 2
-
-
-
-=== TEST 30: ngx.exit(400) should break xpcall and skip os.execute (all in user module)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                test.go()
-            ';
-        }
---- user_files
->>> test.lua
-module('test', package.seeall)
-
-local exec = os.execute
-
-function myexit()
-    ngx.exit(400)
-end
-
-function go()
-    xpcall(myexit, function () end)
-    exec("sleep 5")
-end
---- request
-GET /test
---- response_body_like: 400 Bad Request
---- error_code: 400
---- no_error_log
-[error]
---- timeout: 2
-
-
-
-=== TEST 31: ngx.exec() should skip os.execute (all in user module)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                test.go()
-            ';
-        }
-        location = /foo {
-            echo foo;
-        }
---- user_files
->>> test.lua
-local os_exec = os.execute
-local ngx_exec = ngx.exec
-module('test')
-
-function go()
-    ngx_exec("/foo")
-    os_exec("sleep 5")
-end
---- request
-GET /test
---- response_body
-foo
---- no_error_log
-[error]
---- timeout: 2
-
-
-
-=== TEST 32: ngx.exec() should break pcall and skip os.execute (all in user module)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                local test = require "test"
-                test.go()
-            ';
-        }
-        location = /foo {
-            echo foo;
-        }
---- user_files
->>> test.lua
-local os_exec = os.execute
-local ngx_exec = ngx.exec
-local pcall = pcall
-module('test')
-
-function go()
-    pcall(ngx_exec, "/foo")
-    os_exec("sleep 5")
-end
---- request
-GET /test
---- response_body
-foo
---- no_error_log
-[error]
---- timeout: 2
diff --git a/debian/modules/http-lua/t/064-pcall.t b/debian/modules/http-lua/t/064-pcall.t
deleted file mode 100644
index 3011f3e..0000000
--- a/debian/modules/http-lua/t/064-pcall.t
+++ /dev/null
@@ -1,106 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-worker_connections(1014);
-#master_on();
-#workers(4);
-#log_level('warn');
-no_root_location();
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-our $HtmlDir = html_dir;
-
-#$ENV{LUA_CPATH} = "/usr/local/openresty/lualib/?.so;" . $ENV{LUA_CPATH};
-
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: pcall works
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                function f(a, b)
-                    if a == 0 and b == 0 then
-                        error("zero error")
-                    end
-
-                    return 23, "hello", true
-                end
-
-                local res = {pcall(f, 0, 0)}
-                ngx.say("res len: ", #res)
-                ngx.say("res: ", unpack(res))
-
-                res = {pcall(f, 0)}
-                ngx.say("res len: ", #res)
-                ngx.say("res: ", unpack(res))
-            ';
-        }
---- request
-GET /test
---- response_body eval
-qr/^res len: 2
-res: falsecontent_by_lua\(nginx\.conf:\d+\):4: zero error
-res len: 4
-res: true23hellotrue
-$/s
---- no_error_log
-[error]
-
-
-
-=== TEST 2: xpcall works
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-        location = /test {
-            content_by_lua '
-                function f(a, b)
-                    if a == 0 and b == 0 then
-                        error("zero error")
-                    end
-
-                    return 23, "hello", true
-                end
-
-                function g()
-                    return f(0, 0)
-                end
-
-                function h()
-                    return f(0)
-                end
-
-                function err(...)
-                    ngx.say("error handler called: ", ...)
-                    return "this is the new err"
-                end
-
-                local res = {xpcall(g, err)}
-                ngx.say("res len: ", #res)
-                ngx.say("res: ", unpack(res))
-
-                res = {xpcall(h, err)}
-                ngx.say("res len: ", #res)
-                ngx.say("res: ", unpack(res))
-            ';
-        }
---- request
-GET /test
---- response_body eval
-qr/^error handler called: content_by_lua\(nginx\.conf:\d+\):4: zero error
-res len: 2
-res: falsethis is the new err
-res len: 4
-res: true23hellotrue
-$/
-
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/065-tcp-socket-timeout.t b/debian/modules/http-lua/t/065-tcp-socket-timeout.t
deleted file mode 100644
index 78b8cff..0000000
--- a/debian/modules/http-lua/t/065-tcp-socket-timeout.t
+++ /dev/null
@@ -1,1018 +0,0 @@
-# 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}";
-    }
-
-    if ($ENV{MOCKEAGAIN} eq 'r') {
-        $ENV{MOCKEAGAIN} = 'rw';
-
-    } else {
-        $ENV{MOCKEAGAIN} = 'w';
-    }
-
-    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
-    $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'get helloworld';
-}
-
-use Test::Nginx::Socket::Lua;
-use t::StapThread;
-
-our $GCScript = $t::StapThread::GCScript;
-our $StapScript = $t::StapThread::StapScript;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4 + 6);
-
-our $HtmlDir = html_dir;
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
-
-log_level("debug");
-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 ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            ngx.say("connected: ", ok)
-        ';
-    }
---- request
-GET /t
---- response_body
-failed to connect: timeout
---- error_log
-lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
---- timeout: 10
-
-
-
-=== TEST 2: sock:settimeout() overrides lua_socket_connect_timeout
---- config
-    server_tokens off;
-    lua_socket_connect_timeout 60s;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(150)
-            local ok, err = sock:connect("agentzh.org", 12345)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            ngx.say("connected: ", ok)
-        ';
-    }
---- request
-GET /t
---- response_body
-failed to connect: timeout
---- error_log
-lua tcp socket connect timeout: 150
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
---- timeout: 10
-
-
-
-=== TEST 3: sock:settimeout(nil) does not override lua_socket_connect_timeout
---- config
-    server_tokens off;
-    lua_socket_connect_timeout 102ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(nil)
-            local ok, err = sock:connect("agentzh.org", 12345)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            ngx.say("connected: ", ok)
-        ';
-    }
---- request
-GET /t
---- response_body
-failed to connect: timeout
---- error_log
-lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
-
-
-
-=== TEST 4: sock:settimeout(0) does not override lua_socket_connect_timeout
---- config
-    server_tokens off;
-    lua_socket_connect_timeout 102ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(0)
-            local ok, err = sock:connect("agentzh.org", 12345)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            ngx.say("connected: ", ok)
-        ';
-    }
---- request
-GET /t
---- response_body
-failed to connect: timeout
---- error_log
-lua tcp socket connect timeout: 102
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
---- timeout: 10
-
-
-
-=== TEST 5: -1 is bad timeout value
---- config
-    server_tokens off;
-    lua_socket_connect_timeout 102ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(-1)
-            local ok, err = sock:connect("agentzh.org", 12345)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            ngx.say("connected: ", ok)
-        ';
-    }
---- request
-GET /t
---- response_body_like chomp
-500 Internal Server Error
---- error_log
-bad timeout value
---- error_code: 500
-
-
-
-=== TEST 6: lua_socket_read_timeout only
---- config
-    server_tokens off;
-    lua_socket_read_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_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
-        ';
-    }
---- 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 ipv6=off;
-    location /t {
-        content_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
-        ';
-    }
---- 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 ipv6=off;
-    location /t {
-        content_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
-        ';
-    }
---- 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 ipv6=off;
-    location /t {
-        content_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
-
-        ';
-    }
---- 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: -1 is bad timeout value
---- config
-    server_tokens off;
-    lua_socket_read_timeout 102ms;
-    #resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_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
-
-            sock:settimeout(-1)
-
-            local line
-            line, err = sock:receive()
-            if line then
-                ngx.say("received: ", line)
-            else
-                ngx.say("failed to receive: ", err)
-            end
-        ';
-    }
---- request
-GET /t
---- response_body_like chomp
-500 Internal Server Error
---- error_code: 500
---- error_log
-bad timeout value
-
-
-
-=== TEST 11: lua_socket_send_timeout only
---- config
-    server_tokens off;
-    lua_socket_send_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_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
-        ';
-    }
---- 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 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 ipv6=off;
-    location /t {
-        content_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
-        ';
-    }
---- 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 ipv6=off;
-    location /t {
-        content_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
-        ';
-    }
---- 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 ipv6=off;
-    location /t {
-        content_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
-        ';
-    }
---- 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 ipv6=off;
-    location /t {
-        content_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
-
-            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
-        ';
-    }
---- request
-GET /t
---- response_body_like chomp
-500 Internal Server Error
---- error_log
-bad timeout value
---- error_code: 500
-
-
-
-=== 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- response_body
-before
-hello in thread
-after
---- no_error_log
-[error]
-
-
-
-=== TEST 17: re-connect after timed out
---- config
-    server_tokens off;
-    lua_socket_connect_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 12345)
-            if not ok then
-                ngx.say("1: failed to connect: ", err)
-
-                local ok, err = sock:connect("127.0.0.1", ngx.var.server_port)
-                if not ok then
-                    ngx.say("2: failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("2: connected: ", ok)
-                return
-            end
-
-            ngx.say("1: connected: ", ok)
-        ';
-    }
---- request
-GET /t
---- response_body
-1: failed to connect: timeout
-2: connected: 1
---- error_log
-lua tcp socket connect timeout: 100
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
---- timeout: 10
-
-
-
-=== TEST 18: re-send on the same object after a send timeout happens
---- config
-    server_tokens off;
-    lua_socket_send_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_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)
-                bytes, err = sock:send("blah")
-                if not bytes then
-                    ngx.say("failed to send again: ", err)
-                end
-            end
-        ';
-    }
---- 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
-failed to send again: closed
---- error_log
-lua tcp socket send timeout: 100
-lua tcp socket connect timeout: 60000
-lua tcp socket write timed out
-
-
-
-=== TEST 19: abort when upstream sockets pending on writes
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_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(100)
-            ngx.thread.spawn(function () ngx.sleep(0.001) ngx.say("done") ngx.exit(200) end)
-            local bytes
-            bytes, err = sock:send("get helloworld!")
-            if bytes then
-                ngx.say("sent: ", bytes)
-            else
-                ngx.say("failed to send: ", err)
-            end
-        ';
-    }
---- 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
-done
---- error_log
-lua tcp socket send timeout: 100
-lua tcp socket connect timeout: 60000
---- no_error_log
-lua tcp socket write timed out
-
-
-
-=== TEST 20: abort when downstream socket pending on writes
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.flush(true)
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.say("failed to acquire the req socket: ", err)
-                return
-            end
-
-            sock:settimeout(100)
-            ngx.thread.spawn(function ()
-                ngx.sleep(0.001)
-                ngx.log(ngx.WARN, "quitting request now")
-                ngx.exit(200)
-            end)
-            local bytes
-            bytes, err = sock:send("e\\r\\nget helloworld!")
-            if bytes then
-                ngx.say("sent: ", bytes)
-            else
-                ngx.say("failed to send: ", err)
-            end
-        ';
-    }
---- 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())
-    }
-}
---- ignore_response
---- error_log
-lua tcp socket send timeout: 100
-quitting request now
---- no_error_log
-lua tcp socket write timed out
-[alert]
-
-
-
-=== TEST 21: read timeout on receive(N)
---- config
-    server_tokens off;
-    lua_socket_read_timeout 100ms;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_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(10)
-
-            local line
-            line, err = sock:receive(3)
-            if line then
-                ngx.say("received: ", line)
-            else
-                ngx.say("failed to receive: ", err)
-            end
-        ';
-    }
---- request
-GET /t
---- response_body
-connected: 1
-failed to receive: timeout
---- error_log
-lua tcp socket read timeout: 10
-lua tcp socket connect timeout: 60000
-lua tcp socket read timed out
-
-
-
-=== TEST 22: concurrent operations while writing
---- config
-    server_tokens off;
-    lua_socket_log_errors off;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ready = false
-
-            local function f()
-                while not ready do
-                    ngx.sleep(0.001)
-                end
-
-                local bytes, err = sock:send("flush_all")
-                ngx.say("send: ", bytes, " ", err)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-
-                local ok, err = sock:getreusedtimes()
-                ngx.say("getreusedtimes: ", ok, " ", err)
-
-                local ok, err = sock:setkeepalive()
-                ngx.say("setkeepalive: ", ok, " ", err)
-
-                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-                ngx.say("connect: ", ok, " ", err)
-
-                sock:settimeout(1)
-                local res, err = sock:receive(1)
-                ngx.say("receive: ", res, " ", err)
-            end
-
-            local ok, err = ngx.thread.spawn(f)
-            if not ok then
-                ngx.say("failed to spawn writer thread: ", err)
-                return
-            end
-
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-            ngx.say("connect: ", ok, " ", err)
-
-            ready = true
-
-            sock:settimeout(300)
-            local bytes, err = sock:send("get helloworld!")
-            if not bytes then
-                ngx.say("send failed: ", err)
-            end
-
-            local ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connect: 1 nil
-send: nil socket busy writing
-close: nil socket busy writing
-getreusedtimes: 0 nil
-setkeepalive: nil socket busy writing
-connect: nil socket busy writing
-receive: nil timeout
-send failed: timeout
-close: 1 nil
-
---- no_error_log
-[error]
-
-
-
-=== TEST 23: timeout overflow detection
---- config
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local ok, err = pcall(sock.settimeout, sock, (2 ^ 31) - 1)
-            if not ok then
-                ngx.say("failed to set timeout: ", err)
-            else
-                ngx.say("settimeout: ok")
-            end
-
-            ok, err = pcall(sock.settimeout, sock, 2 ^ 31)
-            if not ok then
-                ngx.say("failed to set timeout: ", err)
-            else
-                ngx.say("settimeout: ok")
-            end
-        }
-    }
---- request
-GET /t
---- response_body_like
-settimeout: ok
-failed to set timeout: bad timeout value
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/066-socket-receiveuntil.t b/debian/modules/http-lua/t/066-socket-receiveuntil.t
deleted file mode 100644
index ffe74aa..0000000
--- a/debian/modules/http-lua/t/066-socket-receiveuntil.t
+++ /dev/null
@@ -1,1331 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-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: memcached read lines
---- config
-    server_tokens off;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_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 readline = sock:receiveuntil("\\r\\n")
-            local line, err, part = readline()
-            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)
-        ';
-    }
---- request
-GET /t
---- response_body
-connected: 1
-request sent: 11
-received: OK
-close: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 2: http read lines
---- config
-    server_tokens off;
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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"
-
-            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 readline = sock:receiveuntil("\\r\\n")
-            local line, err, part
-
-            for i = 1, 7 do
-                line, err, part = readline()
-                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 {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: HTTP/1.1 200 OK
-read: Server: nginx
-read: Content-Type: text/plain
-read: Content-Length: 4
-read: Connection: close
-read: 
-failed to read a line: closed [foo
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 3: http read all the headers in a single run
---- config
-    server_tokens off;
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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"
-
-            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 line, err, part
-
-            for i = 1, 2 do
-                line, err, part = read_headers()
-                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 {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: HTTP/1.1 200 OK\r
-Server: nginx\r
-Content-Type: text/plain\r
-Content-Length: 4\r
-Connection: close
-failed to read a line: closed [foo
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 4: ambiguous boundary patterns (abcabd)
---- 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")
-
-            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 {
-        content_by_lua 'ngx.say("abcabcabd")';
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: abc
-failed to read a line: closed [
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 5: ambiguous boundary patterns (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")
-
-            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 {
-        content_by_lua 'ngx.say("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: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 6: ambiguous boundary patterns (aaa)
---- 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("aaa")
-
-            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 abaabcaaaef;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: abaabc
-failed to read a line: closed [ef
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 7: ambiguous boundary patterns (aaaaad)
---- 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("aaaaad")
-
-            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 baaaaaaaaeaaaaaaadf;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: baaaaaaaaeaa
-failed to read a line: closed [f
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 8: ambiguous boundary patterns (aaaaad), small buffer, 2 bytes
---- config
-    server_tokens off;
-    lua_socket_buffer_size 2;
-    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("aaaaad")
-
-            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 baaaaaaaaeaaaaaaadf;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: baaaaaaaaeaa
-failed to read a line: closed [f
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 9: ambiguous boundary patterns (aaaaad), small buffer, 1 byte
---- 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("aaaaad")
-
-            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 baaaaaaaaeaaaaaaadf;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: baaaaaaaaeaa
-failed to read a line: closed [f
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 10: ambiguous boundary patterns (abcabdabcabe)
---- 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")
-
-            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 abcabdabcabdabcabe;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: abcabd
-failed to read a line: closed [
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 11: ambiguous boundary patterns (abcabdabcabe 2)
---- 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")
-
-            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 abcabdabcabcabdabcabe;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: abcabdabc
-failed to read a line: closed [
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 12: ambiguous boundary patterns (abcabdabcabe 3)
---- 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")
-
-            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 abcabcabdabcabe;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: abc
-failed to read a line: closed [
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 13: ambiguous boundary patterns (abcabdabcabe 4)
---- 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")
-
-            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: ab
-failed to read a line: closed [
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 14: ambiguous boundary patterns (--abc)
---- 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("--abc")
-
-            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 -- ----abc;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: --
-failed to read a line: closed [
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 15: ambiguous boundary patterns (--abc)
---- 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("--abc")
-
-            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: 
-failed to read a line: nil [nil]
-failed to read a line: closed [
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 16: 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")
-
-            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: 
-failed to read a line: nil [nil]
-failed to read a line: closed [
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 17: 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")
-
-            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: 
-read one byte: 
-
-failed to read a chunk: nil [nil]
-failed to read a byte: closed []
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 18: ambiguous boundary patterns (abcabd), small buffer
---- config
-    server_tokens off;
-    lua_socket_buffer_size 3;
-    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")
-
-            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 abcabcabd;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-read: abc
-failed to read a line: closed [
-]
-close: 1 nil
-}
---- no_error_log
-[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
-    POST /t
-
---- more_headers: Content-Length: 1024
---- response_body
-ok
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/067-req-socket.t b/debian/modules/http-lua/t/067-req-socket.t
deleted file mode 100644
index 229d5cc..0000000
--- a/debian/modules/http-lua/t/067-req-socket.t
+++ /dev/null
@@ -1,1098 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 9);
-
-our $HtmlDir = html_dir;
-
-#$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-no_long_string();
-#no_diff();
-#log_level 'warn';
-no_shuffle();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /t {
-        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, 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
-        ';
-    }
---- 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 {
-        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
-
-            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
-        ';
-    }
---- 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 {
-        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
-
-            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
-        ';
-    }
---- 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 {
-        content_by_lua '
-            local test = require "test"
-            test.go()
-            ngx.say("done")
-        ';
-    }
---- 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 {
-        content_by_lua '
-            local test = require "test"
-            test.go()
-            ngx.say("done")
-        ';
-    }
---- 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 {
-        content_by_lua '
-            local test = require "test"
-            test.go()
-            ngx.say("done")
-        ';
-    }
---- 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 {
-        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)
-                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
-        ';
-    }
---- 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]
-
-
-
-=== 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]
-
-
-
-=== TEST 9: chunked support is still a TODO
---- config
-    location /t {
-        content_by_lua '
-            local sock, err = ngx.req.socket()
-            if sock then
-                ngx.say("got the request socket")
-            else
-                ngx.req.read_body()
-                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
-        ';
-    }
---- raw_request eval
-"POST /t HTTP/1.1\r
-Host: localhost\r
-Transfer-Encoding: chunked\r
-Connection: close\r
-\r
-b\r
-hello world\r
-0\r
-\r
-"
---- stap2
-/*
-F(ngx_http_finalize_request) {
-    if ($r->main->count == 2) {
-        print_ubacktrace()
-    }
-}
-F(ngx_http_free_request) {
-    print_ubacktrace()
-}
-*/
---- response_body
-failed to get the request socket: chunked request bodies not supported yet
---- no_error_log
-[error]
-[alert]
---- skip_nginx: 4: <1.3.9
-
-
-
-=== TEST 10: chunked support in ngx.req.read_body
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.say(ngx.req.get_body_data())
-        ';
-    }
---- raw_request eval
-"POST /t HTTP/1.1\r
-Host: localhost\r
-Transfer-Encoding: chunked\r
-Connection: close\r
-\r
-b\r
-hello world\r
-0\r
-\r
-"
---- stap2
-/*
-F(ngx_http_finalize_request) {
-    if ($r->main->count == 2) {
-        print_ubacktrace()
-    }
-}
-F(ngx_http_free_request) {
-    print_ubacktrace()
-}
-*/
---- response_body
-hello world
---- no_error_log
-[error]
-[alert]
---- skip_nginx: 4: <1.3.9
-
-
-
-=== TEST 11: downstream cosocket for GET requests (w/o request bodies)
---- config
-    #resolver 8.8.8.8;
-    location = /t {
-        content_by_lua '
-           local sock, err = ngx.req.socket()
-
-           if not sock then
-              ngx.say("failed to get socket: ", err)
-              return nil
-           end
-
-           while true do
-              local data, err, partial = sock:receive(4096)
-
-              ngx.log(ngx.INFO, "Received data")
-
-              if err then
-                 ngx.say("err: ", err)
-                 if partial then
-                    ngx.print(partial)
-                 end
-
-                 break
-              end
-
-              if data then
-                 ngx.print(data)
-              end
-           end
-        ';
-    }
-
---- request
-GET /t
---- response_body
-failed to get socket: no body
---- no_error_log
-[error]
-
-
-
-=== TEST 12: downstream cosocket for POST requests with 0 size bodies
---- config
-    #resolver 8.8.8.8;
-    location = /t {
-        content_by_lua '
-           local sock, err = ngx.req.socket()
-
-           if not sock then
-              ngx.say("failed to get socket: ", err)
-              return nil
-           end
-
-           while true do
-              local data, err, partial = sock:receive(4096)
-
-              ngx.log(ngx.INFO, "Received data")
-
-              if err then
-                 ngx.say("err: ", err)
-                 if partial then
-                    ngx.print(partial)
-                 end
-
-                 break
-              end
-
-              if data then
-                 ngx.print(data)
-              end
-           end
-        ';
-    }
-
---- request
-POST /t
---- more_headers
-Content-Length: 0
---- response_body
-failed to get socket: no body
---- no_error_log
-[error]
-
-
-
-=== TEST 13: failing reread after reading timeout happens
---- config
-    location = /t {
-        content_by_lua '
-            local sock, err = ngx.req.socket()
-
-            if not sock then
-               ngx.say("failed to get socket: ", err)
-               return nil
-            end
-
-            sock:settimeout(100);
-
-            local data, err, partial = sock:receive(4096)
-            if err then
-               ngx.say("err: ", err, ", partial: ", partial)
-            end
-
-            local data, err, partial = sock:receive(4096)
-            if err then
-               ngx.say("err: ", err, ", partial: ", partial)
-               return
-            end
-        ';
-    }
-
---- raw_request eval
-"POST /t HTTP/1.0\r
-Host: localhost\r
-Content-Length: 10245\r
-\r
-hello"
---- response_body
-err: timeout, partial: hello
-err: timeout, partial: 
-
---- error_log
-lua tcp socket read timed out
-
-
-
-=== TEST 14: successful reread after reading timeout happens (receive -> receive)
---- config
-    location = /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", ngx.var.server_port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("POST /back HTTP/1.0\\r\\nHost: localhost\\r\\nContent-Length: 1024\\r\\n\\r\\nabc")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-            else
-                ngx.say("sent: ", bytes)
-            end
-
-            ngx.sleep(0.2)
-
-            local bytes, err = sock:send("hello world")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-            else
-                ngx.say("sent: ", bytes)
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local header, err = reader()
-            if not header then
-                ngx.say("failed to receive header: ", err)
-                return
-            end
-
-            for i = 1, 2 do
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive line: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-            end
-        ';
-    }
-
-    location = /back {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.flush(true)
-
-            local sock, err = ngx.req.socket()
-
-            if not sock then
-               ngx.say("failed to get socket: ", err)
-               return nil
-            end
-
-            sock:settimeout(100);
-
-            local data, err, partial = sock:receive(4096)
-            if err then
-               ngx.say("err: ", err, ", partial: ", partial)
-            else
-                ngx.say("received: ", data)
-            end
-
-            ngx.sleep(0.1)
-
-            local data, err, partial = sock:receive(11)
-            if err then
-               ngx.say("err: ", err, ", partial: ", partial)
-            else
-                ngx.say("received: ", data)
-            end
-        ';
-    }
-
---- request
-GET /t
---- response_body
-sent: 65
-sent: 11
-received: err: timeout, partial: abc
-received: received: hello world
-
---- error_log
-lua tcp socket read timed out
-
-
-
-=== TEST 15: successful reread after reading timeout happens (receive -> receiveuntil)
---- config
-    location = /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", ngx.var.server_port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("POST /back HTTP/1.0\\r\\nHost: localhost\\r\\nContent-Length: 1024\\r\\n\\r\\nabc")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-            else
-                ngx.say("sent: ", bytes)
-            end
-
-            ngx.sleep(0.2)
-
-            local bytes, err = sock:send("hello world\\n")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-            else
-                ngx.say("sent: ", bytes)
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local header, err = reader()
-            if not header then
-                ngx.say("failed to receive header: ", err)
-                return
-            end
-
-            for i = 1, 2 do
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive line: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-            end
-        ';
-    }
-
-    location = /back {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.flush(true)
-
-            local sock, err = ngx.req.socket()
-
-            if not sock then
-               ngx.say("failed to get socket: ", err)
-               return nil
-            end
-
-            sock:settimeout(100);
-
-            local data, err, partial = sock:receive(4096)
-            if err then
-               ngx.say("err: ", err, ", partial: ", partial)
-            else
-                ngx.say("received: ", data)
-            end
-
-            ngx.sleep(0.1)
-
-            local reader = sock:receiveuntil("\\n")
-            local data, err, partial = reader()
-            if err then
-               ngx.say("err: ", err, ", partial: ", partial)
-            else
-                ngx.say("received: ", data)
-            end
-        ';
-    }
-
---- request
-GET /t
---- response_body
-sent: 65
-sent: 12
-received: err: timeout, partial: abc
-received: received: hello world
-
---- error_log
-lua tcp socket read timed out
-
-
-
-=== TEST 16: successful reread after reading timeout happens (receiveuntil -> receive)
---- config
-    location = /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", ngx.var.server_port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("POST /back HTTP/1.0\\r\\nHost: localhost\\r\\nContent-Length: 1024\\r\\n\\r\\nabc")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-            else
-                ngx.say("sent: ", bytes)
-            end
-
-            ngx.sleep(0.2)
-
-            local bytes, err = sock:send("hello world\\n")
-            if not bytes then
-                ngx.say("failed to send: ", err)
-            else
-                ngx.say("sent: ", bytes)
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local header, err = reader()
-            if not header then
-                ngx.say("failed to receive header: ", err)
-                return
-            end
-
-            for i = 1, 2 do
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive line: ", err)
-                    return
-                end
-                ngx.say("received: ", line)
-            end
-        ';
-    }
-
-    location = /back {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.flush(true)
-
-            local sock, err = ngx.req.socket()
-
-            if not sock then
-               ngx.say("failed to get socket: ", err)
-               return nil
-            end
-
-            sock:settimeout(100);
-
-            local reader = sock:receiveuntil("no-such-terminator")
-            local data, err, partial = reader()
-            if not data then
-               ngx.say("err: ", err, ", partial: ", partial)
-            else
-                ngx.say("received: ", data)
-            end
-
-            ngx.sleep(0.1)
-
-            local data, err, partial = sock:receive()
-            if err then
-               ngx.say("err: ", err, ", partial: ", partial)
-            else
-                ngx.say("received: ", data)
-            end
-        ';
-    }
-
---- request
-GET /t
---- response_body
-sent: 65
-sent: 12
-received: err: timeout, partial: abc
-received: received: hello world
-
---- error_log
-lua tcp socket read timed out
-
-
-
-=== TEST 17: req socket GC'd
---- config
-    location /t {
-        content_by_lua '
-            do
-                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
-            end
-            collectgarbage()
-            ngx.log(ngx.WARN, "GC cycle done")
-
-            ngx.say("done")
-        ';
-    }
---- request
-POST /t
-hello world
---- response_body
-got the request socket
-done
---- no_error_log
-[error]
---- grep_error_log eval: qr/lua finalize socket|GC cycle done/
---- grep_error_log_out
-lua finalize socket
-GC cycle done
diff --git a/debian/modules/http-lua/t/068-socket-keepalive.t b/debian/modules/http-lua/t/068-socket-keepalive.t
deleted file mode 100644
index f052e9a..0000000
--- a/debian/modules/http-lua/t/068-socket-keepalive.t
+++ /dev/null
@@ -1,1553 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 5 + 9);
-
-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';
-log_level 'debug';
-
-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;
-        content_by_lua '
-            local test = require "test"
-            local port = ngx.var.port
-            test.go(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
-
-    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
-connected: 1, reused: 0
-request sent: 11
-received: OK
-connected: 1, reused: 1
-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;
-        content_by_lua '
-            local test = require "test"
-            local port = ngx.var.port
-            test.go(port, true)
-            test.go(port, false)
-        ';
-    }
---- 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
-connected: 1, reused: 0
-request sent: 11
-received: OK
-connected: 1, reused: 1
-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;
-        content_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")
-        ';
-    }
-
-    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;
-        content_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")
-        ';
-    }
-
-    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;
-        content_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")
-        ';
-    }
-
-    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;
-        content_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")
-        ';
-    }
-
-    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;
-        content_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")
-        ';
-    }
-
-    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;
-        content_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")
-        ';
-    }
-
-    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;
-        content_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")
-        ';
-    }
-
-    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;
-        content_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")
-        ';
-    }
-
-    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;
-        content_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)
-        ';
-    }
---- 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
-connected: 1, reused: 0
-request sent: 61
-received response of 119 bytes
-connected: 1, reused: 1
-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;
-        content_by_lua_file html/t.lua;
-    }
-
-    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]
-
-
-
-=== 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
-connected: 1, reused: 0
-connected: 1, reused: 0
---- error_code: 200
---- no_error_log
-[error]
-
-
-
-=== 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]
-
-
-
-=== TEST 24: setkeepalive() with explicit nil args
---- config
-   server_tokens off;
-   location /t {
-       lua_socket_keepalive_timeout 100ms;
-
-        set $port $TEST_NGINX_SERVER_PORT;
-        content_by_lua_block {
-            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(nil, nil)
-            if not ok then
-                ngx.say("failed to set reusable: ", err)
-            end
-
-            ngx.location.capture("/sleep")
-
-            ngx.say("done")
-        }
-    }
-
-    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
diff --git a/debian/modules/http-lua/t/069-null.t b/debian/modules/http-lua/t/069-null.t
deleted file mode 100644
index e4c26af..0000000
--- a/debian/modules/http-lua/t/069-null.t
+++ /dev/null
@@ -1,95 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-#master_on();
-#workers(1);
-#log_level('debug');
-#log_level('warn');
-#worker_connections(1024);
-
-plan tests => repeat_each() * (blocks() * 3 + 1);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
-
-our $LuaCpath = $ENV{LUA_CPATH} ||
-    '/usr/local/openresty-debug/lualib/?.so;/usr/local/openresty/lualib/?.so;;';
-
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: compare ngx.null with cjson.null
---- http_config eval
-    "lua_package_cpath '$::LuaCpath';";
---- config
-    location /lua {
-        content_by_lua '
-            local cjson = require "cjson"
-            ngx.say(cjson.null == ngx.null)
-            ngx.say(cjson.encode(ngx.null))
-        ';
-    }
---- request
-GET /lua
---- response_body
-true
-null
---- no_error_log
-[error]
-
-
-
-=== TEST 2: output ngx.null
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("ngx.null: ", ngx.null)
-        ';
-    }
---- request
-GET /lua
---- response_body
-ngx.null: null
---- no_error_log
-[error]
-
-
-
-=== TEST 3: output ngx.null in a table
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say({"ngx.null: ", ngx.null})
-        ';
-    }
---- request
-GET /lua
---- response_body
-ngx.null: null
---- no_error_log
-[error]
-
-
-
-=== TEST 4: log ngx.null
---- config
-    location /lua {
-        content_by_lua '
-            print("ngx.null: ", ngx.null)
-            ngx.say("done")
-        ';
-    }
---- request
-GET /lua
---- response_body
-done
---- error_log
-ngx.null: null
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/070-sha1.t b/debian/modules/http-lua/t/070-sha1.t
deleted file mode 100644
index 62823a9..0000000
--- a/debian/modules/http-lua/t/070-sha1.t
+++ /dev/null
@@ -1,70 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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: set sha1 hello
---- config
-    location = /sha1 {
-        content_by_lua 'ngx.say(ngx.encode_base64(ngx.sha1_bin("hello")))';
-    }
---- request
-GET /sha1
---- response_body
-qvTGHdzF6KLavt4PO0gs2a6pQ00=
---- no_error_log
-[error]
-
-
-
-=== TEST 2: set sha1 ""
---- config
-    location = /sha1 {
-        content_by_lua 'ngx.say(ngx.encode_base64(ngx.sha1_bin("")))';
-    }
---- request
-GET /sha1
---- response_body
-2jmj7l5rSw0yVb/vlWAYkK/YBwk=
---- no_error_log
-[error]
-
-
-
-=== TEST 3: set sha1 nil
---- config
-    location = /sha1 {
-        content_by_lua 'ngx.say(ngx.encode_base64(ngx.sha1_bin(nil)))';
-    }
---- request
-GET /sha1
---- response_body
-2jmj7l5rSw0yVb/vlWAYkK/YBwk=
---- no_error_log
-[error]
-
-
-
-=== TEST 4: set sha1 number
---- config
-    location = /sha1 {
-        content_by_lua 'ngx.say(ngx.encode_base64(ngx.sha1_bin(512)))';
-    }
---- request
-GET /sha1
---- response_body
-zgmxJ9SPg4aKRWReJG07UvS97L4=
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/071-idle-socket.t b/debian/modules/http-lua/t/071-idle-socket.t
deleted file mode 100644
index c9002be..0000000
--- a/debian/modules/http-lua/t/071-idle-socket.t
+++ /dev/null
@@ -1,433 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-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: read events come when socket is idle
---- config
-    server_tokens off;
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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.1\\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 reader = sock:receiveuntil("foofoo\\r\\n")
-            local line, err, part = reader()
-            if line then
-                ngx.print("read: ", line)
-
-            else
-                ngx.say("failed to read a line: ", err, " [", part, "]")
-            end
-
-            ngx.location.capture("/sleep")
-
-            local data, err, part = sock:receive("*a")
-            if not data then
-                ngx.say("failed to read the 2nd part: ", err)
-            else
-                ngx.say("2nd part: [", data, "]")
-            end
-
-            ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
-    location /sleep {
-        echo_sleep 0.5;
-        more_clear_headers Date;
-    }
-
-    location /foo {
-        echo -n foofoo;
-        echo_flush;
-        echo_sleep 0.3;
-        echo -n barbar;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 57
-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
-2nd part: [6\r
-barbar\r
-0\r
-\r
-]
-close: 1 nil
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 2: read timer cleared in time
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local port = ngx.var.port
-
-            sock:settimeout(400)
-
-            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
-
-            ngx.location.capture("/sleep")
-
-            local bytes, err = sock:send(req)
-            if not bytes then
-                ngx.say("failed to send request: ", err)
-                return
-            end
-            ngx.say("request sent again: ", bytes)
-
-            ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
-    location /sleep {
-        echo_sleep 0.5;
-    }
-
-    location /foo {
-        echo foo;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body
-connected: 1
-request sent: 11
-received: OK
-request sent again: 11
-close: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 3: connect timer cleared in time
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local port = ngx.var.port
-
-            sock:settimeout(300)
-
-            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)
-
-            ngx.location.capture("/sleep")
-
-            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)
-
-            ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
-    location /sleep {
-        echo_sleep 0.5;
-    }
-
-    location /foo {
-        echo foo;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body
-connected: 1
-request sent: 11
-close: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 4: send timer cleared in time
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local port = ngx.var.port
-
-            sock:settimeout(300)
-
-            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)
-
-            ngx.location.capture("/sleep")
-
-            local line, err, part = sock:receive()
-            if line then
-                ngx.say("received: ", line)
-
-            else
-                ngx.say("failed to receive a line: ", err, " [", part, "]")
-                return
-            end
-
-            ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
-    location /sleep {
-        echo_sleep 0.5;
-    }
-
-    location /foo {
-        echo foo;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body
-connected: 1
-request sent: 11
-received: OK
-close: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 5: set keepalive when system socket recv buffer has unread data
---- config
-    server_tokens off;
-    location /t {
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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.1\\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 reader = sock:receiveuntil("foofoo\\r\\n")
-            local line, err, part = reader()
-            if line then
-                ngx.print("read: ", line)
-
-            else
-                ngx.say("failed to read a line: ", err, " [", part, "]")
-            end
-
-            ngx.location.capture("/sleep")
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.say("failed to set keepalive: ", err)
-            end
-        ';
-    }
-
-    location /sleep {
-        echo_sleep 0.5;
-        more_clear_headers Date;
-    }
-
-    location /foo {
-        echo -n foofoo;
-        echo_flush;
-        echo_sleep 0.3;
-        echo -n barbar;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body_like eval
-qr{connected: 1
-request sent: 57
-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: (?:unread data in buffer|connection in dubious state)
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 6: set keepalive when cosocket recv buffer has unread data
---- config
-    server_tokens off;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_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 data, err = sock:receive(1)
-            if not data then
-                ngx.say("failed to read the 1st byte: ", err)
-                return
-            end
-
-            ngx.say("read: ", data)
-
-            local ok, err = sock:setkeepalive()
-            if not ok then
-                ngx.say("failed to set keepalive: ", err)
-            end
-        ';
-    }
-
-    location /foo {
-        echo foo;
-        more_clear_headers Date;
-    }
---- request
-GET /t
---- response_body eval
-qq{connected: 1
-request sent: 11
-read: O
-failed to set keepalive: unread data in buffer
-}
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/072-conditional-get.t b/debian/modules/http-lua/t/072-conditional-get.t
deleted file mode 100644
index 7cf2dcd..0000000
--- a/debian/modules/http-lua/t/072-conditional-get.t
+++ /dev/null
@@ -1,90 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-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);
-
-plan tests => repeat_each() * (blocks() * 3 + 2);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: If-Modified-Since true
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.last_modified = "Thu, 10 May 2012 07:50:59 GMT"
-            ngx.say("hello")
-        ';
-    }
---- request
-GET /lua
---- more_headers
-If-Modified-Since: Thu, 10 May 2012 07:50:59 GMT
---- response_body
---- error_code: 304
---- no_error_log
-[error]
-
-
-
-=== TEST 2: If-Modified-Since true
---- config
-    location /lua {
-        if_modified_since before;
-        content_by_lua '
-            ngx.header.last_modified = "Thu, 10 May 2012 07:50:48 GMT"
-            ngx.say("hello")
-        ';
-    }
---- request
-GET /lua
---- more_headers
-If-Modified-Since: Thu, 10 May 2012 07:50:59 GMT
---- response_body
---- error_code: 304
---- no_error_log
-[error]
-
-
-
-=== TEST 3: If-Unmodified-Since false
---- config
-    location /lua {
-        #if_modified_since before;
-        content_by_lua '
-            ngx.header.last_modified = "Thu, 10 May 2012 07:50:48 GMT"
-            local ok, err = ngx.say("hello")
-            if not ok then
-                ngx.log(ngx.WARN, "say failed: ", err)
-            end
-        ';
-    }
---- request
-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: ok
-delete thread 1
-
---- response_body_like: 412 Precondition Failed
---- error_code: 412
---- error_log
-say failed: nginx output filter error
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/073-backtrace.t b/debian/modules/http-lua/t/073-backtrace.t
deleted file mode 100644
index 6c54692..0000000
--- a/debian/modules/http-lua/t/073-backtrace.t
+++ /dev/null
@@ -1,189 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * 51;
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /lua {
-        content_by_lua
-        '   function bar()
-                return lua_concat(3)
-            end
-            function foo()
-                bar()
-            end
-            foo()
-        ';
-    }
---- request
-GET /lua
---- ignore_response
---- error_log
-attempt to call global 'lua_concat'
-: in function 'bar'
-: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 eval
-[
-'lua entry thread aborted: runtime error: unknown reason',
-'stack traceback:',
-" in function 'error'",
-": in function 'bar'",
-":5: in function 'foo'",
-qr/:7: in function <content_by_lua\(nginx\.conf:\d+\):1>/,
-]
-
-
-
-=== TEST 3: deep backtrace in a single coroutine (more than 15)
---- config eval
-my $s = "
-    location /lua {
-        content_by_lua '
-";
-my $prev;
-for my $i (1..18) {
-    if (!defined $prev) {
-        $s .= "
-            local function func$i()
-                return error([[blah]])
-            end";
-    } else {
-        $s .= "
-            local function func$i()
-                local v = func$prev()
-                return v
-            end";
-    }
-    $prev = $i;
-}
-$s .= "
-            func$prev()
-        ';
-    }
-";
---- request
-GET /lua
---- stap2
-probe process("$LIBLUA_PATH").function("lua_concat") {
-    println("lua concat")
-    //print_ubacktrace()
-}
---- stap_out2
---- ignore_response
---- error_log
-: blah
-: in function 'func1'
-:7: in function 'func2'
-:11: in function 'func3'
-:15: in function 'func4'
-:19: in function 'func5'
-:23: in function 'func6'
-:27: in function 'func7'
-:31: in function 'func8'
-:35: in function 'func9'
-:39: in function 'func10'
-:43: in function 'func11'
-:47: in function 'func12'
-:51: in function 'func13'
-:55: in function 'func14'
-:59: in function 'func15'
-:63: in function 'func16'
-:67: in function 'func17'
-:71: in function 'func18'
-:74: in function
-
-
-
-=== TEST 4: deep backtrace in a single coroutine (more than 22)
---- config eval
-my $s = "
-    location /lua {
-        content_by_lua '
-";
-my $prev;
-for my $i (1..23) {
-    if (!defined $prev) {
-        $s .= "
-            local function func$i()
-                return error([[blah]])
-            end";
-    } else {
-        $s .= "
-            local function func$i()
-                local v = func$prev()
-                return v
-            end";
-    }
-    $prev = $i;
-}
-$s .= "
-            func$prev()
-        ';
-    }
-";
---- request
-GET /lua
---- stap2
-probe process("$LIBLUA_PATH").function("lua_concat") {
-    println("lua concat")
-    //print_ubacktrace()
-}
---- stap_out2
---- ignore_response
---- error_log
-: blah
-: in function 'func1'
-:7: in function 'func2'
-:11: in function 'func3'
-:15: in function 'func4'
-:19: in function 'func5'
-:23: in function 'func6'
-:27: in function 'func7'
-:31: in function 'func8'
-:35: in function 'func9'
-:39: in function 'func10'
-:43: in function 'func11'
-:47: in function 'func12'
-:59: in function 'func15'
-:63: in function 'func16'
-:67: in function 'func17'
-:71: in function 'func18'
-:75: in function 'func19'
-:79: in function 'func20'
-:83: in function 'func21'
-...
diff --git a/debian/modules/http-lua/t/074-prefix-var.t b/debian/modules/http-lua/t/074-prefix-var.t
deleted file mode 100644
index c116d84..0000000
--- a/debian/modules/http-lua/t/074-prefix-var.t
+++ /dev/null
@@ -1,66 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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: $prefix
---- http_config: lua_package_path "$prefix/html/?.lua;;";
---- config
-    location /t {
-        content_by_lua '
-            local foo = require "foo"
-            foo.go()
-        ';
-    }
---- user_files
->>> foo.lua
-module("foo", package.seeall)
-
-function go()
-    ngx.say("Greetings from module foo.")
-end
---- request
-GET /t
---- response_body
-Greetings from module foo.
---- no_error_log
-[error]
-
-
-
-=== TEST 2: ${prefix}
---- http_config: lua_package_path "${prefix}html/?.lua;;";
---- config
-    location /t {
-        content_by_lua '
-            local foo = require "foo"
-            foo.go()
-        ';
-    }
---- user_files
->>> foo.lua
-module("foo", package.seeall)
-
-function go()
-    ngx.say("Greetings from module foo.")
-end
---- request
-GET /t
---- response_body
-Greetings from module foo.
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/075-logby.t b/debian/modules/http-lua/t/075-logby.t
deleted file mode 100644
index 520c62e..0000000
--- a/debian/modules/http-lua/t/075-logby.t
+++ /dev/null
@@ -1,583 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-log_level('debug');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 10);
-
-#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 eval
-qr/failed to run log_by_lua\*: log_by_lua\(nginx\.conf:\d+\):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'
-
-
-
-=== TEST 29: Lua file does not exist
---- config
-    location /lua {
-        echo ok;
-        log_by_lua_file html/test2.lua;
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- response_body
-ok
---- error_log eval
-qr/failed to load external Lua file ".*?test2\.lua": cannot open .*? No such file or directory/
-
-
-
-=== TEST 30: log_by_lua runs before access logging (github issue #254)
---- config
-    location /lua {
-        echo ok;
-        access_log logs/foo.log;
-        log_by_lua 'print("hello")';
-    }
---- request
-GET /lua
---- stap
-F(ngx_http_log_handler) {
-    println("log handler")
-}
-F(ngx_http_lua_log_handler) {
-    println("lua log handler")
-}
---- stap_out
-lua log handler
-log handler
-
---- response_body
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 31: reading ngx.header.HEADER in log_by_lua
---- config
-    location /lua {
-        echo ok;
-        log_by_lua 'ngx.log(ngx.WARN, "content-type: ", ngx.header.content_type)';
-    }
---- request
-GET /lua
-
---- response_body
-ok
---- error_log eval
-qr{log_by_lua\(nginx\.conf:\d+\):1: content-type: text/plain}
-
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/076-no-postpone.t b/debian/modules/http-lua/t/076-no-postpone.t
deleted file mode 100644
index 94da63a..0000000
--- a/debian/modules/http-lua/t/076-no-postpone.t
+++ /dev/null
@@ -1,146 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 3 + 1);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: rewrite no postpone on
---- http_config
-    rewrite_by_lua_no_postpone on;
---- config
-    set $foo '';
-    location /t {
-        rewrite_by_lua '
-            ngx.var.foo = 1
-        ';
-        if ($foo = 1) {
-            echo "foo: $foo";
-        }
-        echo "no foo: $foo";
-    }
---- request
-GET /t
---- response_body
-foo: 1
---- no_error_log
-[error]
-
-
-
-=== TEST 2: rewrite no postpone explicitly off
---- http_config
-    rewrite_by_lua_no_postpone off;
---- config
-    set $foo '';
-    location /t {
-        rewrite_by_lua '
-            ngx.var.foo = 1
-        ';
-        if ($foo = 1) {
-            echo "foo: $foo";
-        }
-        echo "no foo: $foo";
-    }
---- request
-GET /t
---- response_body
-no foo: 1
---- no_error_log
-[error]
-
-
-
-=== TEST 3: rewrite no postpone off by default
---- config
-    set $foo '';
-    location /t {
-        rewrite_by_lua '
-            ngx.var.foo = 1
-        ';
-        if ($foo = 1) {
-            echo "foo: $foo";
-        }
-        echo "no foo: $foo";
-    }
---- request
-GET /t
---- response_body
-no foo: 1
---- no_error_log
-[error]
-
-
-
-=== TEST 4: access no postpone on
---- http_config
-    access_by_lua_no_postpone on;
---- config
-    location /t {
-        access_by_lua '
-            ngx.redirect("http://www.taobao.com/foo")
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-        deny all;
-    }
---- request
-GET /t
---- response_headers
-Location: http://www.taobao.com/foo
---- response_body_like: 302 Found
---- error_code: 302
---- no_error_log
-[error]
-
-
-
-=== TEST 5: access no postpone explicitly off
---- http_config
-    access_by_lua_no_postpone off;
---- config
-    location /t {
-        access_by_lua '
-            ngx.redirect("http://www.taobao.com/foo")
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-        deny all;
-    }
---- request
-GET /t
---- response_body_like: 403 Forbidden
---- error_code: 403
---- error_log
-access forbidden by rule
-
-
-
-=== TEST 6: access no postpone off by default
---- config
-    location /t {
-        access_by_lua '
-            ngx.redirect("http://www.taobao.com/foo")
-            ngx.say("hi")
-        ';
-        content_by_lua 'return';
-        deny all;
-    }
---- request
-GET /t
---- response_body_like: 403 Forbidden
---- error_code: 403
---- error_log
-access forbidden by rule
diff --git a/debian/modules/http-lua/t/077-sleep.t b/debian/modules/http-lua/t/077-sleep.t
deleted file mode 100644
index 96f04bd..0000000
--- a/debian/modules/http-lua/t/077-sleep.t
+++ /dev/null
@@ -1,502 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-log_level('debug');
-
-repeat_each(2);
-
-plan tests => repeat_each() * 71;
-
-#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]
-
-
-
-=== TEST 9: sleep 0
---- config
-    location /test {
-        content_by_lua '
-            ngx.update_time()
-            local before = ngx.now()
-            ngx.sleep(0)
-            local now = ngx.now()
-            ngx.say("elapsed: ", now - before)
-        ';
-    }
---- request
-GET /test
---- response_body_like chop
-elapsed: 0
---- error_log
-lua ready to sleep for
-lua sleep timer expired: "/test?"
-lua sleep timer expired: "/test?"
---- no_error_log
-[error]
-
-
-
-=== TEST 10: ngx.sleep unavailable in log_by_lua
---- config
-    location /t {
-        echo hello;
-        log_by_lua '
-            ngx.sleep(0.1)
-        ';
-    }
---- request
-GET /t
---- response_body
-hello
---- wait: 0.1
---- error_log
-API disabled in the context of log_by_lua*
-
-
-
-=== TEST 11: ngx.sleep() fails to yield (xpcall err handler)
---- config
-    location = /t {
-        content_by_lua '
-            local function f()
-                return error(1)
-            end
-            local function err()
-                ngx.sleep(0.001)
-            end
-            xpcall(f, err)
-            ngx.say("ok")
-        ';
-    }
---- request
-    GET /t
---- response_body
-ok
---- error_log
-lua clean up the timer for pending ngx.sleep
---- no_error_log
-[error]
-
-
-
-=== TEST 12: ngx.sleep() fails to yield (require)
---- http_config
-    lua_package_path "$prefix/html/?.lua;;";
---- config
-    location = /t {
-        content_by_lua '
-            package.loaded["foosleep"] = nil
-            require "foosleep";
-        ';
-    }
---- request
-    GET /t
---- user_files
->>> foosleep.lua
-ngx.sleep(0.001)
-
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- wait: 0.2
---- error_log eval
-[
-"lua clean up the timer for pending ngx.sleep",
-qr{runtime error: attempt to yield across (?:metamethod/)?C-call boundary},
-]
-
-
-
-=== TEST 13: sleep coctx handler did not get called in ngx.exit().
---- config
-    location /t {
-         content_by_lua "
-            local function sleep(t)
-                --- nginx return reply to client without waiting
-                ngx.sleep(t)
-            end
-
-            local function wait()
-                 --- worker would crash afterwards
-                 xpcall(function () error(1) end, function() return sleep(0.001) end)
-                 --- ngx.exit was required to crash worker
-                 ngx.exit(200)
-            end
-
-            wait()
-         ";
-    }
---- request
-    GET /t
-
---- wait: 0.1
---- response_body
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 14: sleep coctx handler did not get called in ngx.exec().
---- config
-    location /t {
-         content_by_lua '
-            local function sleep(t)
-                --- nginx return reply to client without waiting
-                ngx.sleep(t)
-            end
-
-            local function wait()
-                 --- worker would crash afterwards
-                 xpcall(function () error(1) end, function() return sleep(0.001) end)
-                 --- ngx.exit was required to crash worker
-                 ngx.exec("/dummy")
-            end
-
-            wait()
-         ';
-    }
-
-    location /dummy {
-        echo ok;
-    }
---- request
-    GET /t
-
---- wait: 0.1
---- response_body
-ok
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 15: sleep coctx handler did not get called in ngx.req.set_uri(uri, true).
---- config
-    location /t {
-         rewrite_by_lua '
-            local function sleep(t)
-                --- nginx return reply to client without waiting
-                ngx.sleep(t)
-            end
-
-            local function wait()
-                 --- worker would crash afterwards
-                 xpcall(function () error(1) end, function() return sleep(0.001) end)
-                 --- ngx.exit was required to crash worker
-                 ngx.req.set_uri("/dummy", true)
-            end
-
-            wait()
-         ';
-    }
-
-    location /dummy {
-        echo ok;
-    }
---- request
-    GET /t
-
---- wait: 0.1
---- response_body
-ok
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 16: sleep 0
---- config
-    location /t {
-        content_by_lua_block {
-            local function f (n)
-                print("f begin ", n)
-                ngx.sleep(0)
-                print("f middle ", n)
-                ngx.sleep(0)
-                print("f end ", n)
-                ngx.sleep(0)
-            end
-
-            for i = 1, 3 do
-                assert(ngx.thread.spawn(f, i))
-            end
-
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/\bf (?:begin|middle|end)\b|\bworker cycle$|\be?poll timer: \d+$/
---- grep_error_log_out eval
-qr/f begin
-f begin
-f begin
-worker cycle
-e?poll timer: 0
-f middle
-f middle
-f middle
-worker cycle
-e?poll timer: 0
-f end
-f end
-f end
-worker cycle
-e?poll timer: 0
-/
-
-
-
-=== TEST 17: sleep short times less than 1ms
---- config
-    location /t {
-        content_by_lua_block {
-            local delay = 0.0005
-
-            local function f (n)
-                print("f begin ", n)
-                ngx.sleep(delay)
-                print("f middle ", n)
-                ngx.sleep(delay)
-                print("f end ", n)
-                ngx.sleep(delay)
-            end
-
-            for i = 1, 3 do
-                assert(ngx.thread.spawn(f, i))
-            end
-
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/\bf (?:begin|middle|end)\b|\bworker cycle$|\be?poll timer: \d+$/
---- grep_error_log_out eval
-qr/f begin
-f begin
-f begin
-worker cycle
-e?poll timer: 0
-f middle
-f middle
-f middle
-worker cycle
-e?poll timer: 0
-f end
-f end
-f end
-worker cycle
-e?poll timer: 0
-/
diff --git a/debian/modules/http-lua/t/078-hup-vars.t b/debian/modules/http-lua/t/078-hup-vars.t
deleted file mode 100644
index 5072c4d..0000000
--- a/debian/modules/http-lua/t/078-hup-vars.t
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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;
-        undef $ENV{TEST_NGINX_USE_STAP};
-    }
-}
-
-use Test::Nginx::Socket::Lua $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/http-lua/t/079-unused-directives.t b/debian/modules/http-lua/t/079-unused-directives.t
deleted file mode 100644
index aacd0d3..0000000
--- a/debian/modules/http-lua/t/079-unused-directives.t
+++ /dev/null
@@ -1,342 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-log_level('debug');
-
-repeat_each(2);
-
-plan tests => repeat_each() * 110;
-
-#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]
---- log_level: debug
-
-
-
-=== 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" c:1
-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" c:1
-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]
-
-
-
-=== TEST 11: header_filter_by_lua with multiple http blocks (github issue #294)
-This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
-have been prohibited since then.
---- SKIP
---- config
-    location = /t {
-        echo ok;
-        header_filter_by_lua '
-            ngx.status = 201
-            ngx.header.Foo = "foo"
-        ';
-
-    }
---- post_main_config
-    http {
-    }
---- request
-GET /t
---- response_headers
-Foo: foo
---- response_body
-ok
---- error_code: 201
---- no_error_log
-[error]
-
-
-
-=== TEST 12: body_filter_by_lua in multiple http blocks (github issue #294)
-This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
-have been prohibited since then.
---- SKIP
---- config
-    location = /t {
-        echo -n ok;
-        body_filter_by_lua '
-            if ngx.arg[2] then
-                ngx.arg[1] = ngx.arg[1] .. "ay\\n"
-            end
-        ';
-
-    }
---- post_main_config
-    http {
-    }
---- request
-GET /t
---- response_body
-okay
---- no_error_log
-[error]
-
-
-
-=== TEST 13: capture filter with multiple http blocks (github issue #294)
-This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
-have been prohibited since then.
---- SKIP
---- config
-    location = /t {
-        content_by_lua '
-            local res = ngx.location.capture("/sub")
-            ngx.say("sub: ", res.body)
-        ';
-    }
-
-    location = /sub {
-        echo -n sub;
-    }
---- post_main_config
-    http {
-    }
---- request
-GET /t
---- response_body
-sub: sub
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/080-hup-shdict.t b/debian/modules/http-lua/t/080-hup-shdict.t
deleted file mode 100644
index c762556..0000000
--- a/debian/modules/http-lua/t/080-hup-shdict.t
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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;
-        undef $ENV{TEST_NGINX_USE_STAP};
-    }
-}
-
-use Test::Nginx::Socket::Lua $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/http-lua/t/081-bytecode.t b/debian/modules/http-lua/t/081-bytecode.t
deleted file mode 100644
index cb50e94..0000000
--- a/debian/modules/http-lua/t/081-bytecode.t
+++ /dev/null
@@ -1,373 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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: 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 jit then
-                if not string.find(jit.version, "LuaJIT 2.0") then
-                    ngx.say("test skipped")
-                    return
-                end
-                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_like chop
-^(?:hello|test skipped)$
---- no_error_log
-[error]
-
-
-
-=== 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 eval
-qr/failed to load external Lua file ".*?test\.lua": bad byte-code header/
-
-
-
-=== 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\x80\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
-bytecode format version unsupported
-
-
-
-=== 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 do_jit
-            if jit then
-                if not string.find(jit.version, "LuaJIT 2.0") then
-                    ngx.say("test skipped")
-                    return
-                end
-
-                do_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 do_jit and res.status == 200 then
-                ngx.say("ok")
-            elseif not do_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_like chop
-^(?:ok|test skipped)$
---- no_error_log
-[error]
-
-
-
-=== 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
---- no_error_log
-[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 jit then
-                if not string.find(jit.version, "LuaJIT 2.0") then
-                    ngx.say("test skipped")
-                    return
-                end
-
-                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_like chop
-^(?:hello|test skipped)$
---- no_error_log
-[error]
-
-
-
-=== TEST 7: generate & load bytecode for LuaJIT (stripped)
---- config
-    location = /t {
-        content_by_lua '
-            local bcsave = require "jit.bcsave"
-            if jit then
-                local prefix = ngx.config.prefix()
-                local infile = prefix .. "html/a.lua"
-                local outfile = prefix .. "html/a.luac"
-                bcsave.start("-s", infile, outfile)
-                return ngx.exec("/call")
-            end
-
-            ngx.say("test skipped!")
-        ';
-    }
-    location = /call {
-        content_by_lua_file html/a.luac;
-    }
---- request
-    GET /t
-
---- user_files
->>> a.lua
-ngx.status = 201 ngx.say("hello from Lua!")
---- response_body_like chop
-^(?:hello from Lua!|test skipped!)$
---- no_error_log
-[error]
---- error_code: 201
-
-
-
-=== TEST 8: generate & load bytecode for LuaJIT (not stripped)
---- config
-    location = /t {
-        content_by_lua '
-            local bcsave = require "jit.bcsave"
-            if jit then
-                local prefix = ngx.config.prefix()
-                local infile = prefix .. "html/a.lua"
-                local outfile = prefix .. "html/a.luac"
-                bcsave.start("-g", infile, outfile)
-                return ngx.exec("/call")
-            end
-
-            ngx.say("test skipped!")
-        ';
-    }
-    location = /call {
-        content_by_lua_file html/a.luac;
-    }
---- request
-    GET /t
-
---- user_files
->>> a.lua
-ngx.status = 201 ngx.say("hello from Lua!")
---- response_body_like chop
-^(?:hello from Lua!|test skipped!)$
---- no_error_log
-[error]
---- error_code: 201
-
-
-
-=== TEST 9: bytecode (not stripped)
---- config
-    location = /t {
-        content_by_lua_block {
-            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
-            local bc = string.dump(f)
-            local f = assert(io.open("t/servroot/html/a.luac", "w"))
-            f:write(bc)
-            f:close()
-        }
-    }
-
-    location = /t2 {
-        content_by_lua_file html/a.luac;
-    }
-
-    location = /main {
-        echo_location /t;
-        echo_location /t2;
-    }
---- request
-GET /main
---- response_body
-a = 1
---- no_error_log
-[error]
-
-
-
-=== TEST 10: bytecode (stripped)
---- config
-    location = /t {
-        content_by_lua_block {
-            local f = assert(loadstring("a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
-            local bc = string.dump(f, true)
-            local f = assert(io.open("t/servroot/html/a.luac", "w"))
-            f:write(bc)
-            f:close()
-        }
-    }
-
-    location = /t2 {
-        content_by_lua_file html/a.luac;
-    }
-
-    location = /main {
-        echo_location /t;
-        echo_location /t2;
-    }
---- request
-GET /main
---- response_body
-a = 1
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/082-body-filter.t b/debian/modules/http-lua/t/082-body-filter.t
deleted file mode 100644
index 98efa84..0000000
--- a/debian/modules/http-lua/t/082-body-filter.t
+++ /dev/null
@@ -1,839 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-log_level('debug');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 11);
-
-#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*: 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'
-
-
-
-=== TEST 18: setting "eof" in subrequests
---- config
-    location /t {
-        echo_location /read;
-        echo_location /read;
-    }
-
-    location /read {
-        echo -n hello world;
-        echo -n hiya globe;
-
-        body_filter_by_lua '
-            ngx.arg[2] = 1
-        ';
-    }
---- request
-GET /t
---- response_body chop
-hello worldhello world
---- no_error_log
-[error]
-
-
-
-=== TEST 19: Lua file does not exist
---- config
-    location /lua {
-        echo ok;
-        body_filter_by_lua_file html/test2.lua;
-    }
---- user_files
->>> test.lua
-v = ngx.var["request_uri"]
-ngx.print("request_uri: ", v, "\n")
---- request
-GET /lua?a=1&b=2
---- ignore_response
---- error_log eval
-qr/failed to load external Lua file ".*?test2\.lua": cannot open .*? No such file or directory/
-
-
-
-=== TEST 20: overwrite eof
---- config
-    location /read {
-        return 200 "hello world";
-
-        body_filter_by_lua '
-            local chunk, eof = ngx.arg[1], ngx.arg[2]
-            if eof then
-                ngx.arg[2] = false
-            end
-        ';
-    }
-
-    location = /t {
-        content_by_lua '
-            local res = ngx.location.capture("/read")
-            ngx.say("truncated: ", res.truncated)
-        ';
-    }
---- request
-GET /t
---- response_body
-truncated: true
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 21: zero-size bufs
---- config
-    location = /t {
-        echo hello;
-        echo world;
-
-        body_filter_by_lua '
-            ngx.arg[1] = ""
-        ';
-    }
---- request
-GET /t
---- response_body
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 22: body filter + ngx.say() (github issue #386)
---- config
-    postpone_output 1;
-    location = /t {
-        header_filter_by_lua 'ngx.header.content_length = nil';
-
-        body_filter_by_lua '
-            -- do return end
-            if not ngx.ctx.chunks then
-                ngx.ctx.chunks = {}
-            end
-
-            table.insert(ngx.ctx.chunks, ngx.arg[1])
-            print("got chunk ", ngx.arg[1])
-            ngx.arg[1] = nil
-
-            if ngx.arg[2] then
-                print("seen eof: ", string.upper(table.concat(ngx.ctx.chunks)))
-                ngx.arg[1] = string.upper(table.concat(ngx.ctx.chunks))
-            end
-        ';
-
-        content_by_lua '
-            for i = 1, 10 do
-                assert(ngx.say("hello world"))
-            end
-        ';
-    }
---- request
-GET /t
---- response_body eval
-"HELLO WORLD\n" x 10
-
---- stap2
-global active = 1
-F(ngx_http_lua_body_filter_by_chunk) {
-    printf("body filter by lua: %p: %s\n", $in, ngx_chain_dump($in))
-}
-
-F(ngx_http_write_filter) {
-    printf("write filter: %p: %s\n", $in, ngx_chain_dump($in))
-}
-
-
-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 %p: %s\n", $in, 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))
-}
-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)
-    }
-}
-
---- stap_out2
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 23: body filter + ngx.say() (github issue #386), with flush
---- config
-    location = /t {
-        header_filter_by_lua 'ngx.header.content_length = nil';
-
-        body_filter_by_lua '
-            -- do return end
-            if not ngx.ctx.chunks then
-                ngx.ctx.chunks = {}
-            end
-
-            table.insert(ngx.ctx.chunks, ngx.arg[1])
-            print("got chunk ", ngx.arg[1])
-            ngx.arg[1] = nil
-
-            if ngx.arg[2] then
-                print("seen eof: ", string.upper(table.concat(ngx.ctx.chunks)))
-                ngx.arg[1] = string.upper(table.concat(ngx.ctx.chunks))
-            end
-        ';
-
-        content_by_lua '
-            for i = 1, 10 do
-                assert(ngx.say("hello world"))
-                ngx.flush(true)
-            end
-        ';
-    }
---- request
-GET /t
---- response_body eval
-"HELLO WORLD\n" x 10
-
---- stap
-F(ngx_http_write_filter) {
-    for (cl = $in; cl; cl = @cast(cl, "ngx_chain_t")->next) {
-        if (@cast(cl, "ngx_chain_t")->buf->flush) {
-            printf("seen flush buf.\n")
-        }
-
-        if (@cast(cl, "ngx_chain_t")->buf->last_buf) {
-            printf("seen last buf.\n")
-        }
-    }
-}
-
---- stap_out_like eval
-qr/^(?:seen flush buf\.
-){10,}seen last buf\.
-$/
-
---- stap2
-global active = 1
-F(ngx_http_lua_body_filter_by_chunk) {
-    printf("body filter by lua: %p: %s\n", $in, ngx_chain_dump($in))
-}
-
-F(ngx_http_write_filter) {
-    printf("write filter: %p: %s\n", $in, ngx_chain_dump($in))
-}
-
-F(ngx_http_charset_body_filter) {
-    printf("charset body filter: %p: %s\n", $in, ngx_chain_dump($in))
-}
-
-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 %p: %s\n", $in, 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))
-}
-
-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)
-    }
-}
-
---- stap_out2
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 24: clear ngx.arg[1] and then read it
---- config
-    location /t {
-        echo hello;
-        echo world;
-
-        body_filter_by_lua '
-            ngx.arg[1] = nil
-            local data = ngx.arg[1]
-            print([[data chunk: "]], data, [["]])
-
-            ngx.arg[1] = ""
-            data = ngx.arg[1]
-            print([[data chunk 2: "]], data, [["]])
-        ';
-    }
---- request
-GET /t
---- response_body
---- log_level: info
---- grep_error_log eval: qr/data chunk(?: \d+)?: [^,]+/
---- grep_error_log_out
-data chunk: ""
-data chunk 2: ""
-data chunk: ""
-data chunk 2: ""
-data chunk: ""
-data chunk 2: ""
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 25: clear ngx.arg[1] and then read ngx.arg[2]
---- config
-    location /t {
-        echo hello;
-        echo world;
-
-        body_filter_by_lua '
-            ngx.arg[1] = nil
-            local eof = ngx.arg[2]
-            print([[eof: ]], eof)
-
-            ngx.arg[1] = ""
-            eof = ngx.arg[2]
-            print([[eof 2: ]], eof)
-        ';
-    }
---- request
-GET /t
---- response_body
---- log_level: info
---- grep_error_log eval: qr/eof(?: \d+)?: [^,]+/
---- grep_error_log_out
-eof: false
-eof 2: false
-eof: false
-eof 2: false
-eof: true
-eof 2: true
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 26: no ngx.print
---- config
-    location /lua {
-        echo ok;
-        body_filter_by_lua "ngx.print(32) return 1";
-    }
---- request
-GET /lua
---- ignore_response
---- error_log
-API disabled in the context of body_filter_by_lua*
diff --git a/debian/modules/http-lua/t/083-bad-sock-self.t b/debian/modules/http-lua/t/083-bad-sock-self.t
deleted file mode 100644
index 7a76752..0000000
--- a/debian/modules/http-lua/t/083-bad-sock-self.t
+++ /dev/null
@@ -1,138 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-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
-    POST /t
---- more_headers: Content-Length: 1024
---- 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
-    POST /t
---- more_headers: Content-Length: 1024
---- 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/http-lua/t/084-inclusive-receiveuntil.t b/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
deleted file mode 100644
index f7d5d3d..0000000
--- a/debian/modules/http-lua/t/084-inclusive-receiveuntil.t
+++ /dev/null
@@ -1,745 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-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: 1 nil
-}
---- 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: 1 nil
-}
---- 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: 1 nil
-}
---- 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: 1 nil
-}
---- 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: 1 nil
-}
---- 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: 1 nil
-}
---- 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: 1 nil
-}
---- 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: 1 nil
-}
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/085-if.t b/debian/modules/http-lua/t/085-if.t
deleted file mode 100644
index 33f57ca..0000000
--- a/debian/modules/http-lua/t/085-if.t
+++ /dev/null
@@ -1,200 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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/http-lua/t/086-init-by.t b/debian/modules/http-lua/t/086-init-by.t
deleted file mode 100644
index bea34a4..0000000
--- a/debian/modules/http-lua/t/086-init-by.t
+++ /dev/null
@@ -1,323 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 2);
-
-#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
---- grep_error_log chop
-log from init_by_lua
---- grep_error_log_out eval
-["log from init_by_lua\n", ""]
-
-
-
-=== 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
---- grep_error_log chop
-log from init_by_lua
---- grep_error_log_out eval
-["log from init_by_lua\n", ""]
-
-
-
-=== 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]
-
-
-
-=== TEST 9: coroutine API (inlined init_by_lua)
---- http_config
-    init_by_lua '
-        local function f()
-            foo = 32
-            coroutine.yield(78)
-            bar = coroutine.status(coroutine.running())
-        end
-        local co = coroutine.create(f)
-        local ok, err = coroutine.resume(co)
-        if not ok then
-            print("Failed to resume our co: ", err)
-            return
-        end
-        baz = err
-        coroutine.resume(co)
-    ';
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("foo = ", foo)
-            ngx.say("bar = ", bar)
-            ngx.say("baz = ", baz)
-        ';
-    }
---- request
-GET /lua
---- response_body
-foo = 32
-bar = running
-baz = 78
---- no_error_log
-[error]
-Failed to resume our co: 
-
-
-
-=== TEST 10: coroutine API (init_by_lua_file)
---- http_config
-    init_by_lua_file html/init.lua;
-
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("foo = ", foo)
-            ngx.say("bar = ", bar)
-            ngx.say("baz = ", baz)
-        ';
-    }
---- request
-GET /lua
---- user_files
->>> init.lua
-local function f()
-    foo = 32
-    coroutine.yield(78)
-    bar = coroutine.status(coroutine.running())
-end
-local co = coroutine.create(f)
-local ok, err = coroutine.resume(co)
-if not ok then
-    print("Failed to resume our co: ", err)
-    return
-end
-baz = err
-coroutine.resume(co)
-
---- response_body
-foo = 32
-bar = running
-baz = 78
---- no_error_log
-[error]
-Failed to resume our co: 
-
-
-
-=== TEST 11: access a field in the ngx. table
---- http_config
-    init_by_lua '
-        print("INIT 1: foo = ", ngx.foo)
-        ngx.foo = 3
-        print("INIT 2: foo = ", ngx.foo)
-    ';
---- config
-    location /t {
-        echo ok;
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/INIT \d+: foo = \S+/
---- grep_error_log_out eval
-[
-"INIT 1: foo = nil
-INIT 2: foo = 3
-",
-"",
-]
-
-
-
-=== TEST 12: error in init
---- http_config
-    init_by_lua_block {
-        error("failed to init")
-    }
---- config
-    location /t {
-        echo ok;
-    }
---- must_die
---- error_log
-failed to init
---- error_log
-[error]
diff --git a/debian/modules/http-lua/t/087-udp-socket.t b/debian/modules/http-lua/t/087-udp-socket.t
deleted file mode 100644
index 8bedc32..0000000
--- a/debian/modules/http-lua/t/087-udp-socket.t
+++ /dev/null
@@ -1,1176 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (3 * blocks() + 14);
-
-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();
-#no_shuffle();
-check_accum_error_log();
-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("udp resume: %p\n", $coctx)
-    print_ubacktrace()
-}
-
---- request
-GET /main
---- response_body_like: \b500\b
---- error_log eval
-qr/content_by_lua\(nginx\.conf:\d+\):8: bad request/
-
-
-
-=== 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 eval
-qr/content_by_lua\(nginx\.conf:\d+\):6: bad request/
-
-
-
-=== 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 re-receive
---- 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("$TEST_NGINX_RESOLVER", 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
---- no_check_leak
-
-
-
-=== TEST 11: access the google DNS server (using domain names)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua '
-            -- avoid flushing google in "check leak" testing mode:
-            local counter = package.loaded.counter
-            if not counter then
-                counter = 1
-            elseif counter >= 2 then
-                return ngx.exit(503)
-            else
-                counter = counter + 1
-            end
-            package.loaded.counter = counter
-
-            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
---- no_check_leak
-
-
-
-=== TEST 12: github issue #215: Handle the posted requests in lua cosocket api (failed to resolve)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 5s;
-
-    location = /sub {
-        content_by_lua '
-            local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("xxx", 80)
-            if not ok then
-                ngx.say("failed to connect to xxx: ", err)
-                return
-            end
-            ngx.say("successfully connected to xxx!")
-            sock:close()
-        ';
-    }
-
-    location = /lua {
-        content_by_lua '
-            local res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /sub
-
---- stap
-F(ngx_resolve_name_done) {
-    println("resolve name done")
-}
-
---- stap_out
-resolve name done
-
---- response_body_like chop
-^failed to connect to xxx: xxx could not be resolved.*?Host not found
-
---- no_error_log
-[error]
---- timeout: 10
-
-
-
-=== TEST 13: github issue #215: Handle the posted requests in lua cosocket api (successfully resolved)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 5s;
-
-    location = /sub {
-        content_by_lua '
-            if not package.i then
-                package.i = 1
-            end
-
-            local servers = {"openresty.org", "agentzh.org", "sregex.org"}
-            local server = servers[package.i]
-            package.i = package.i + 1
-
-            local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername(server, 80)
-            if not ok then
-                ngx.say("failed to connect to ", server, ": ", err)
-                return
-            end
-            ngx.say("successfully connected to xxx!")
-            sock:close()
-        ';
-    }
-
-    location = /lua {
-        content_by_lua '
-            local res = ngx.location.capture("/sub")
-            ngx.print(res.body)
-        ';
-    }
---- request
-GET /lua
---- response_body
-successfully connected to xxx!
-
---- no_error_log
-[error]
---- timeout: 10
-
-
-
-=== TEST 14: datagram unix domain socket
---- 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("unix:a.sock")
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            ngx.say("connected")
-
-            local req = "hello,\\nserver"
-            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
-
---- udp_listen: a.sock
---- udp_reply
-hello,
-client
-
---- response_body
-connected
-received 14 bytes: hello,
-client
-
---- stap2
-probe syscall.socket, syscall.connect {
-    print(name, "(", argstr, ")")
-}
-
-probe syscall.socket.return, syscall.connect.return {
-    println(" = ", retstr)
-}
---- no_error_log
-[error]
-[crit]
---- skip_eval: 3: $^O ne 'linux'
-
-
-
-=== TEST 15: bad request tries to setpeer
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:setpeername("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to set peer: ", err)
-                else
-                    ngx.say("peer set")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:setpeername("127.0.0.1", ngx.var.port)
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.udp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^peer set
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 16: bad request tries to send
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:setpeername("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to set peer: ", err)
-                else
-                    ngx.say("peer set")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:send("a")
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.udp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^peer set
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 17: bad request tries to receive
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:setpeername("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to set peer: ", err)
-                else
-                    ngx.say("peer set")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:receive()
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.udp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^peer set
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 18: bad request tries to close
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:setpeername("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to set peer: ", err)
-                else
-                    ngx.say("peer set")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:send("a")
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.udp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^peer set
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 19: bad request tries to receive
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
---- config
-    server_tokens off;
-    location = /main {
-        echo_location /t?reset=1;
-        echo_location /t;
-    }
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local test = require "test"
-            if ngx.var.arg_reset then
-                local sock = test.new_sock()
-                local ok, err = sock:setpeername("127.0.0.1", ngx.var.port)
-                if not ok then
-                    ngx.say("failed to set peer: ", err)
-                else
-                    ngx.say("peer set")
-                end
-                return
-            end
-            local sock = test.get_sock()
-            sock:close()
-        ';
-    }
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local sock
-
-function new_sock()
-    sock = ngx.socket.udp()
-    return sock
-end
-
-function get_sock()
-    return sock
-end
---- request
-GET /main
---- response_body_like eval
-qr/^peer set
-<html.*?500 Internal Server Error/ms
-
---- error_log eval
-qr/runtime error: content_by_lua\(nginx\.conf:\d+\):14: bad request/
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 20: the upper bound of port range should be 2^16 - 1
---- config
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("127.0.0.1", 65536)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-failed to connect: bad port number: 65536
---- no_error_log
-[error]
-
-
-
-=== TEST 21: send boolean and nil
---- config
-    server_tokens off;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local socket = ngx.socket
-            local udp = socket.udp()
-            local port = ngx.var.port
-            udp:settimeout(1000) -- 1 sec
-
-            local ok, err = udp:setpeername("127.0.0.1", ngx.var.port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local function send(data)
-                local bytes, err = udp:send(data)
-                if not bytes then
-                    ngx.say("failed to send: ", err)
-                    return
-                end
-                ngx.say("sent ok")
-            end
-
-            send(true)
-            send(false)
-            send(nil)
-        }
-    }
---- request
-GET /t
---- response_body
-sent ok
-sent ok
-sent ok
---- no_error_log
-[error]
---- grep_error_log eval
-qr/send: fd:\d+ \d+ of \d+/
---- grep_error_log_out eval
-qr/send: fd:\d+ 4 of 4
-send: fd:\d+ 5 of 5
-send: fd:\d+ 3 of 3/
---- log_level: debug
diff --git a/debian/modules/http-lua/t/088-req-method.t b/debian/modules/http-lua/t/088-req-method.t
deleted file mode 100644
index 198b3b3..0000000
--- a/debian/modules/http-lua/t/088-req-method.t
+++ /dev/null
@@ -1,264 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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]
-
-
-
-=== TEST 11: set GET to WebDAV methods
---- config
-    location /t {
-        content_by_lua '
-            local methods = {
-                ngx.HTTP_MKCOL,
-                ngx.HTTP_COPY,
-                ngx.HTTP_MOVE,
-                ngx.HTTP_PROPFIND,
-                ngx.HTTP_PROPPATCH,
-                ngx.HTTP_LOCK,
-                ngx.HTTP_UNLOCK,
-                ngx.HTTP_PATCH,
-                ngx.HTTP_TRACE,
-            }
-
-            for i, method in ipairs(methods) do
-                ngx.req.set_method(method)
-                ngx.say("method: ", ngx.var.echo_request_method)
-            end
-        ';
-    }
---- request
-    HEAD /t
---- response_body
-method: MKCOL
-method: COPY
-method: MOVE
-method: PROPFIND
-method: PROPPATCH
-method: LOCK
-method: UNLOCK
-method: PATCH
-method: TRACE
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/089-phase.t b/debian/modules/http-lua/t/089-phase.t
deleted file mode 100644
index 94b7619..0000000
--- a/debian/modules/http-lua/t/089-phase.t
+++ /dev/null
@@ -1,178 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-log_level('warn');
-
-repeat_each(2);
-
-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
-
-
-
-=== TEST 9: get_phase in ngx.timer callback
---- config
-    location /lua {
-        echo "OK";
-        log_by_lua '
-            local function f()
-                ngx.log(ngx.WARN, "current phase: ", ngx.get_phase())
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to add timer: ", err)
-            end
-        ';
-    }
---- request
-GET /lua
---- no_error_log
-[error]
---- error_log
-current phase: timer
-
-
-
-=== TEST 10: get_phase in init_worker_by_lua
---- http_config
-    init_worker_by_lua 'phase = ngx.get_phase()';
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say(phase)
-        ';
-    }
---- request
-GET /lua
---- response_body
-init_worker
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/090-log-socket-errors.t b/debian/modules/http-lua/t/090-log-socket-errors.t
deleted file mode 100644
index 16576b6..0000000
--- a/debian/modules/http-lua/t/090-log-socket-errors.t
+++ /dev/null
@@ -1,108 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: log socket errors off (tcp)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-
-    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("agentzh.org", 12345)
-            ngx.say(err)
-        ';
-    }
---- request
-GET /t
---- response_body
-timeout
---- no_error_log
-[error]
-
-
-
-=== TEST 2: log socket errors on (tcp)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-
-    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("agentzh.org", 12345)
-            ngx.say(err)
-        ';
-    }
---- request
-GET /t
---- response_body
-timeout
---- error_log
-lua tcp socket connect timed out, when connecting to 172.105.207.225:12345
-
-
-
-=== TEST 3: log socket errors on (udp)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-
-    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("agentzh.org", 12345)
-            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
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-
-    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("agentzh.org", 12345)
-            ok, err = sock:receive()
-            ngx.say(err)
-        ';
-    }
---- request
-GET /t
---- response_body
-timeout
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/091-coroutine.t b/debian/modules/http-lua/t/091-coroutine.t
deleted file mode 100644
index bceb512..0000000
--- a/debian/modules/http-lua/t/091-coroutine.t
+++ /dev/null
@@ -1,1317 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 5);
-
-$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") }
-F(ngx_http_lua_ffi_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 ipv6=off;
-    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",
-                "iscribblet.org",
-                "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: iscribblet.org
-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.fmod(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.fmod(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 ipv6=off;
-    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",
-                "iscribblet.org",
-                "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: iscribblet.org
-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 eval
-qr/^child: resume: falsecontent_by_lua\(nginx\.conf:\d+\):4: bad
-child: status: dead
-parent: status: running
-$/s
---- error_log eval
-qr/lua coroutine: runtime error: content_by_lua\(nginx\.conf:\d+\):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]
-
-
-
-=== TEST 23: github issue #208: coroutine as iterator doesn't work
---- config
-    location = /t {
-        content_by_lua '
-            local say = ngx.say
-            local wrap, yield = coroutine.wrap, coroutine.yield
-
-            local function it(it_state)
-              for i = 1, it_state.i do
-                yield(it_state.path, tostring(i))
-              end
-              return nil
-            end
-
-            local function it_factory(path)
-              local it_state = { i = 10, path = path }
-              return wrap(it), it_state
-            end
-
-            --[[
-            for path, value in it_factory("test") do
-              say(path, value)
-            end
-            ]]
-
-            do
-              local f, s, var = it_factory("test")
-              while true do
-                local path, value = f(s, var)
-                var = path
-                if var == nil then break end
-                say(path, value)
-              end
-            end
-        ';
-    }
---- request
-    GET /t
---- more_headers
-Cookie: abc=32
---- stap2 eval: $::StapScript
---- response_body
-test1
-test2
-test3
-test4
-test5
-test6
-test7
-test8
-test9
-test10
---- no_error_log
-[error]
-
-
-
-=== TEST 24: init_by_lua + our own coroutines in content_by_lua
---- http_config
-    init_by_lua 'return';
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    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",
-            }
-
-            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
-*** All Done ***
---- no_error_log
-[error]
---- timeout: 10
-
-
-
-=== TEST 25: init_by_lua_file + our own coroutines in content_by_lua
---- http_config
-    init_by_lua_file html/init.lua;
-
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    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"
-            }
-
-            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 ***")
-        ';
-    }
---- user_files
->>> init.lua
-return
-
---- request
-GET /lua
---- response_body
-successfully connected to: agentzh.org
-*** All Done ***
---- no_error_log
-[error]
---- timeout: 10
-
-
-
-=== TEST 26: mixing coroutine.* API between init_by_lua and other contexts (github #304) - init_by_lua
---- http_config
-    init_by_lua '
-          co_wrap = coroutine.wrap
-          co_yield = coroutine.yield
-    ';
-
---- config
-    location /cotest {
-        content_by_lua '
-            function generator()
-                return co_wrap(function()
-                    co_yield("data")
-                end)
-            end
-
-            local co = generator()
-            local data = co()
-            ngx.say(data)
-        ';
-    }
-
---- request
-GET /cotest
---- stap2 eval: $::StapScript
---- response_body
-data
---- no_error_log
-[error]
-
-
-
-=== TEST 27: mixing coroutine.* API between init_by_lua and other contexts (github #304) - init_by_lua_file
---- http_config
-    init_by_lua_file html/init.lua;
-
---- config
-    location /cotest {
-        content_by_lua '
-            function generator()
-                return co_wrap(function()
-                    co_yield("data")
-                end)
-            end
-
-            local co = generator()
-            local data = co()
-            ngx.say(data)
-        ';
-    }
-
---- user_files
->>> init.lua
-co_wrap = coroutine.wrap
-co_yield = coroutine.yield
-
---- request
-GET /cotest
---- stap2 eval: $::StapScript
---- response_body
-data
---- no_error_log
-[error]
-
-
-
-=== TEST 28: coroutine context collicisions
---- config
-    location /lua {
-        content_by_lua '
-            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
-
-            function f()
-                return 3
-            end
-
-            for i = 1, 10 do
-                collectgarbage()
-                local c = cc(f)
-                if coroutine.status(c) == "dead" then
-                    ngx.say("found a dead coroutine")
-                    return
-                end
-                cr(c)
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /lua
---- stap2 eval: $::StapScript
---- response_body
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 29: require "coroutine"
---- config
-    location /lua {
-        content_by_lua '
-            local coroutine = require "coroutine"
-            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
-
-            function f()
-                local cnt = 0
-                for i = 1, 20 do
-                    ngx.say("Hello, ", cnt)
-                    ngx.sleep(0.001)
-                    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 30: basic coroutine in header_filter_by_lua
---- config
-    location = /t {
-        echo ok;
-        header_filter_by_lua '
-            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
-
-            function f()
-                local cnt = 0
-                for i = 1, 20 do
-                    print("co yield: ", cnt)
-                    cy()
-                    cnt = cnt + 1
-                end
-            end
-
-            local c = cc(f)
-            for i = 1, 3 do
-                print("co resume.")
-                cr(c)
-            end
-        ';
-    }
---- request
-GET /t
---- response_body
-ok
---- grep_error_log eval: qr/co (?:yield: \d+|resume\.)/
---- grep_error_log_out
-co resume.
-co yield: 0
-co resume.
-co yield: 1
-co resume.
-co yield: 2
---- no_error_log
-[error]
-
-
-
-=== TEST 31: basic coroutine in body_filter_by_lua
---- config
-    location = /t {
-        echo ok;
-        body_filter_by_lua '
-            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
-
-            function f()
-                local cnt = 0
-                for i = 1, 20 do
-                    print("co yield: ", cnt)
-                    cy()
-                    cnt = cnt + 1
-                end
-            end
-
-            local c = cc(f)
-            for i = 1, 3 do
-                print("co resume.")
-                cr(c)
-            end
-        ';
-    }
---- request
-GET /t
---- response_body
-ok
---- grep_error_log eval: qr/co (?:yield: \d+|resume\.)/
---- grep_error_log_out
-co resume.
-co yield: 0
-co resume.
-co yield: 1
-co resume.
-co yield: 2
-co resume.
-co yield: 0
-co resume.
-co yield: 1
-co resume.
-co yield: 2
-
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/092-eof.t b/debian/modules/http-lua/t/092-eof.t
deleted file mode 100644
index 86778de..0000000
--- a/debian/modules/http-lua/t/092-eof.t
+++ /dev/null
@@ -1,82 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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/http-lua/t/093-uthread-spawn.t b/debian/modules/http-lua/t/093-uthread-spawn.t
deleted file mode 100644
index b622d30..0000000
--- a/debian/modules/http-lua/t/093-uthread-spawn.t
+++ /dev/null
@@ -1,1674 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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
-
---- wait: 0.1
---- 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 eval
-qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):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:0 c:3 a:0
-post subreq: /proxy/1 rc=0, 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:0 c:2 a:0
-post subreq: /proxy/2 rc=0, 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/http-lua/t/094-uthread-exit.t b/debian/modules/http-lua/t/094-uthread-exit.t
deleted file mode 100644
index 2f7d9ba..0000000
--- a/debian/modules/http-lua/t/094-uthread-exit.t
+++ /dev/null
@@ -1,1650 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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
-
---- wait: 0.1
---- 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 agentzh.org;
-        resolver_timeout 12s;
-        content_by_lua '
-            function f()
-                ngx.say("hello in thread")
-                ngx.sleep(0.001)
-                ngx.exit(0)
-            end
-
-            ngx.say("before")
-            ngx.thread.spawn(f)
-            ngx.say("after")
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("agentzh.org", 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 == 1) {
-        timers[$arg1] = $arg2
-        printf("add timer %d\n", $arg2)
-    }
-}
-
-M(timer-del) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        printf("delete timer %d\n", tm)
-        delete timers[$arg1]
-    }
-    /*
-    if (tm == 12000) {
-        print_ubacktrace()
-    }
-    */
-}
-
-M(timer-expire) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        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 1
-resolving agentzh.org
-add timer 12000
-expire timer 1
-terminate 2: ok
-delete thread 2
-lua tcp resolve cleanup
-delete timer 12000
-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 agentzh.org;
-        resolver_timeout 12s;
-        content_by_lua '
-            function f()
-                ngx.say("hello in thread")
-                ngx.sleep(0.001)
-                ngx.exit(0)
-            end
-
-            ngx.say("before")
-            ngx.thread.spawn(f)
-            ngx.say("after")
-            local sock = ngx.socket.udp()
-            local ok, err = sock:setpeername("agentzh.org", 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 == 1) {
-        timers[$arg1] = $arg2
-        printf("add timer %d\n", $arg2)
-    }
-}
-
-M(timer-del) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        printf("delete timer %d\n", tm)
-        delete timers[$arg1]
-    }
-    /*
-    if (tm == 12000) {
-        print_ubacktrace()
-    }
-    */
-}
-
-M(timer-expire) {
-    tm = timers[$arg1]
-    if (tm == 12000 || tm == 1) {
-        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 1
-resolving agentzh.org
-add timer 12000
-expire timer 1
-terminate 2: ok
-delete thread 2
-lua udp resolve cleanup
-delete timer 12000
-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("172.105.207.225", 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-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
-delete thread 2
-lua udp socket cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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
---- 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_coctx_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
-delete thread 2
-lua tcp socket cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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
-delete thread 2
-lua req body cleanup
-delete timer 12000
-delete thread 1
-free request
-
---- wait: 0.1
---- 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
---- 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
---- 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
---- 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
-
---- wait: 0.1
---- 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
---- 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
-
---- wait: 0.1
---- 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
-
---- wait: 0.1
---- 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
-
---- wait: 0.1
---- 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
-
---- wait: 0.1
---- 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
-
---- wait: 0.1
---- ignore_response
---- no_error_log
-[alert]
-[error]
-[warn]
diff --git a/debian/modules/http-lua/t/095-uthread-exec.t b/debian/modules/http-lua/t/095-uthread-exec.t
deleted file mode 100644
index 56156c4..0000000
--- a/debian/modules/http-lua/t/095-uthread-exec.t
+++ /dev/null
@@ -1,425 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-delete thread 3
-free request
-
---- wait: 0.1
---- 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
---- 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/http-lua/t/096-uthread-redirect.t b/debian/modules/http-lua/t/096-uthread-redirect.t
deleted file mode 100644
index 003c642..0000000
--- a/debian/modules/http-lua/t/096-uthread-redirect.t
+++ /dev/null
@@ -1,279 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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
---- 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
-
---- wait: 0.1
---- 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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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/http-lua/t/097-uthread-rewrite.t b/debian/modules/http-lua/t/097-uthread-rewrite.t
deleted file mode 100644
index 2f0c06f..0000000
--- a/debian/modules/http-lua/t/097-uthread-rewrite.t
+++ /dev/null
@@ -1,347 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-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
-delete thread 2
-lua sleep cleanup
-delete timer 1000
-delete thread 3
-free request
-
---- response_body
-hello foo
---- no_error_log
-[error]
---- wait: 0.1
-
-
-
-=== 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")
-        ';
-    }
-
-    location = /sleep {
-        echo_sleep 0.2;
-    }
-
-    location = /foo {
-        echo hello world;
-    }
---- 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 == 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
diff --git a/debian/modules/http-lua/t/098-uthread-wait.t b/debian/modules/http-lua/t/098-uthread-wait.t
deleted file mode 100644
index 4948596..0000000
--- a/debian/modules/http-lua/t/098-uthread-wait.t
+++ /dev/null
@@ -1,1323 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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 eval
-qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):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 eval
-qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):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 eval
-qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):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 eval
-qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):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 eval
-qr/lua entry thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):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 eval
-qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):5: f done/
-
-
-
-=== TEST 21: waiting on a dead coroutine
---- 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
-
-            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
-failed to run thread: already waited or killed
---- no_error_log
-[error]
-
-
-
-=== TEST 22: spawn and wait uthreads for many times
---- config
-    location /lua {
-        content_by_lua '
-            function f()
-                -- ngx.say("hello in thread")
-                return "done"
-            end
-
-            for i = 1, 100 do
-                local t, err = ngx.thread.spawn(f)
-                if not t then
-                    ngx.say("failed to spawn thread: ", err)
-                    break
-                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)
-                    break
-                end
-
-                ngx.say(i, ": ", res)
-            end
-        ';
-    }
---- request
-GET /lua
---- response_body eval
-my $s = '';
-for my $i (1..100) {
-    $s .= "$i: done\n";
-}
-$s;
-
---- no_error_log
-[error]
-[alert]
diff --git a/debian/modules/http-lua/t/099-c-api.t b/debian/modules/http-lua/t/099-c-api.t
deleted file mode 100644
index a0b375c..0000000
--- a/debian/modules/http-lua/t/099-c-api.t
+++ /dev/null
@@ -1,397 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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]
-
-
-
-=== TEST 7: find zone (multiple zones)
---- http_config
-    lua_shared_dict dogs 1m;
-    lua_shared_dict cats 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, "cats", 4)
-            local zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
-            local cats = tostring(zone)
-
-            ffi.copy(buf, "dogs", 4)
-            zone = ffi.C.ngx_http_lua_find_zone(buf, 4)
-            local dogs = tostring(zone)
-
-            ngx.say("dogs == cats ? ", dogs == cats)
-            -- ngx.say("dogs: ", dogs)
-            -- ngx.say("cats ", cats)
-        ';
-    }
---- request
-GET /test
---- response_body
-dogs == cats ? false
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/100-client-abort.t b/debian/modules/http-lua/t/100-client-abort.t
deleted file mode 100644
index 89c1f6a..0000000
--- a/debian/modules/http-lua/t/100-client-abort.t
+++ /dev/null
@@ -1,1066 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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;
-        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://agentzh.org:12345/;
-    }
-
-    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://agentzh.org:12345/;
-    }
---- 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
-
---- wait: 0.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]
-
-
-
-=== TEST 27: ngx.say
---- config
-    location /t {
-        postpone_output 1;
-        content_by_lua '
-            ngx.sleep(0.2)
-            local ok, err = ngx.say("hello")
-            if not ok then
-                ngx.log(ngx.WARN, "say failed: ", err)
-                return
-            end
-        ';
-    }
---- request
-GET /t
-
---- wait: 0.2
---- timeout: 0.1
---- abort
---- ignore_response
---- no_error_log
-[error]
-[alert]
---- error_log
-say failed: nginx output filter error
-
-
-
-=== TEST 28: ngx.print
---- config
-    location /t {
-        postpone_output 1;
-        content_by_lua '
-            ngx.sleep(0.2)
-            local ok, err = ngx.print("hello")
-            if not ok then
-                ngx.log(ngx.WARN, "print failed: ", err)
-                return
-            end
-        ';
-    }
---- request
-GET /t
-
---- wait: 0.2
---- timeout: 0.1
---- abort
---- ignore_response
---- no_error_log
-[error]
-[alert]
---- error_log
-print failed: nginx output filter error
-
-
-
-=== TEST 29: ngx.send_headers
---- config
-    location /t {
-        postpone_output 1;
-        content_by_lua '
-            ngx.sleep(0.2)
-            local ok, err = ngx.send_headers()
-            if not ok then
-                ngx.log(ngx.WARN, "send headers failed: ", err)
-                return
-            end
-            ngx.log(ngx.WARN, "send headers succeeded")
-        ';
-    }
---- request
-GET /t
-
---- wait: 0.2
---- timeout: 0.1
---- abort
---- ignore_response
---- no_error_log
-[error]
-[alert]
---- error_log
-send headers succeeded
-
-
-
-=== TEST 30: ngx.flush
---- config
-    location /t {
-        #postpone_output 1;
-        content_by_lua '
-            ngx.say("hello")
-            ngx.sleep(0.2)
-            local ok, err = ngx.flush()
-            if not ok then
-                ngx.log(ngx.WARN, "flush failed: ", err)
-                return
-            end
-            ngx.log(ngx.WARN, "flush succeeded")
-        ';
-    }
---- request
-GET /t
-
---- wait: 0.2
---- timeout: 0.1
---- abort
---- ignore_response
---- no_error_log
-[error]
-[alert]
---- error_log
-flush succeeded
-
-
-
-=== TEST 31: ngx.eof
---- config
-    location /t {
-        postpone_output 1;
-        content_by_lua '
-            ngx.sleep(0.2)
-            local ok, err = ngx.eof()
-            if not ok then
-                ngx.log(ngx.WARN, "eof failed: ", err)
-                return
-            end
-            ngx.log(ngx.WARN, "eof succeeded")
-        ';
-    }
---- request
-GET /t
-
---- wait: 0.2
---- timeout: 0.1
---- abort
---- ignore_response
---- no_error_log
-[error]
-[alert]
-eof succeeded
---- error_log
-eof failed: nginx output filter error
diff --git a/debian/modules/http-lua/t/101-on-abort.t b/debian/modules/http-lua/t/101-on-abort.t
deleted file mode 100644
index 182d12c..0000000
--- a/debian/modules/http-lua/t/101-on-abort.t
+++ /dev/null
@@ -1,848 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-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 + 19);
-
-$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_like chop
-^create 2 in 1
-lua check broken conn
-terminate 2: ok
-(?:lua check broken conn
-)?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
-
---- wait: 0.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.7
---- ignore_response
---- error_log eval
-[
-'client prematurely closed connection',
-'on abort called',
-qr/lua user thread aborted: runtime error: content_by_lua\(nginx\.conf:\d+\):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.5
---- 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
---- wait: 0.1
---- 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]
-
-
-
-=== TEST 18: regsiter on_abort callback but no client abortion (2 uthreads and 1 pending)
---- 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")
-                ngx.exit(200)
-            end)
-
-            ngx.thread.spawn(function ()
-                ngx.sleep(100)
-            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
-create 4 in 1
-spawn user thread 4 in 1
-terminate 1: ok
-delete thread 1
-terminate 3: ok
-lua req cleanup
-delete thread 2
-delete thread 3
-delete thread 4
-
---- wait: 0.5
---- response_body
-done
---- no_error_log
-[error]
-client prematurely closed connection
-on abort called
-main handler done
diff --git a/debian/modules/http-lua/t/102-req-start-time.t b/debian/modules/http-lua/t/102-req-start-time.t
deleted file mode 100644
index 3b041af..0000000
--- a/debian/modules/http-lua/t/102-req-start-time.t
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- mode: conf -*-
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#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/http-lua/t/103-req-http-ver.t b/debian/modules/http-lua/t/103-req-http-ver.t
deleted file mode 100644
index e6de238..0000000
--- a/debian/modules/http-lua/t/103-req-http-ver.t
+++ /dev/null
@@ -1,48 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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: HTTP 1.1
---- config
-    location /t {
-        content_by_lua '
-            ngx.say(ngx.req.http_version())
-        ';
-    }
---- request
-GET /t
---- response_body
-1.1
---- no_error_log
-[error]
-
-
-
-=== TEST 2: HTTP 1.0
---- config
-    location /t {
-        content_by_lua '
-            ngx.say(ngx.req.http_version())
-        ';
-    }
---- request
-GET /t HTTP/1.0
---- response_body
-1
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/104-req-raw-header.t b/debian/modules/http-lua/t/104-req-raw-header.t
deleted file mode 100644
index ac1f89e..0000000
--- a/debian/modules/http-lua/t/104-req-raw-header.t
+++ /dev/null
@@ -1,990 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 15);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: small header
---- config
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- request
-GET /t
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 2: large header
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- request
-GET /t
---- more_headers eval
-CORE::join "\n", map { "Header$_: value-$_" } 1..512
-
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 3: large header (no request line)
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header(true))
-        ';
-    }
---- request
-GET /t
---- more_headers eval
-CORE::join "\n", map { "Header$_: value-$_" } 1..512
-
---- response_body eval
-qq{Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 4: small header (no request line)
---- config
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header(true))
-        ';
-    }
---- request
-GET /t
---- response_body eval
-qq{Host: localhost\r
-Connection: close\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 5: small header (no request line, with leading CRLF)
---- config
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header(true))
-        ';
-    }
---- raw_request eval
-"\r\nGET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-"
---- response_body eval
-qq{Host: localhost\r
-Connection: close\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 6: small header, with leading CRLF
---- config
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- raw_request eval
-"\r\nGET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-"
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 7: large header, with leading CRLF
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
-
---- raw_request eval
-"\r\nGET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-".
-(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 8: large header, with leading CRLF, excluding request line
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header(true))
-        ';
-    }
-
---- raw_request eval
-"\r\nGET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-".
-(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- response_body eval
-qq{Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 9: large header, with lots of leading CRLF, excluding request line
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header(true))
-        ';
-    }
-
---- raw_request eval
-("\r\n" x 534) . "GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-".
-(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- response_body eval
-qq{Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 10: small header, pipelined
---- config
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- pipelined_requests eval
-["GET /t", "GET /th"]
-
---- more_headers
-Foo: bar
-
---- response_body eval
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-Foo: bar\r
-\r
-}, qq{GET /th HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar\r
-\r
-}]
---- no_error_log
-[error]
-
-
-
-=== TEST 11: large header, pipelined
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- pipelined_requests eval
-["GET /t", "GET /t"]
-
---- more_headers eval
-CORE::join "\n", map { "Header$_: value-$_" } 1..512
-
---- response_body eval
-my $headers = (CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n";
-
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-$headers},
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-$headers}]
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 12: small header, multi-line header
---- config
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar baz\r
-  blah\r
-\r
-"
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar baz\r
-  blah\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 13: large header, multi-line header
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 50 567;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
-
---- raw_request eval
-my $headers = (CORE::join "\r\n", map { "Header$_: value-$_\r\n hello $_ world blah blah" } 1..512) . "\r\n\r\n";
-
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-$headers}
-
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_\r\n hello $_ world blah blah" } 1..512) . "\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 14: small header (POST body)
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- request
-POST /t
-hello
---- response_body eval
-qq{POST /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Content-Length: 5\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 15: small header (POST body) - in subrequests
---- config
-    location /t {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/t")
-            ngx.print(res.body)
-        ';
-    }
-
---- request
-POST /main
-hello
---- response_body eval
-qq{POST /main HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Content-Length: 5\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 16: large header (POST body)
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- request
-POST /t
-hello
---- more_headers eval
-CORE::join"\n", map { "Header$_: value-$_" } 1..512
-
---- response_body eval
-qq{POST /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\nContent-Length: 5\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 17: large header (POST body) - in subrequests
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        content_by_lua '
-            ngx.req.read_body()
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
-
-    location /main {
-        content_by_lua '
-            local res = ngx.location.capture("/t")
-            ngx.print(res.body)
-        ';
-    }
---- request
-POST /main
-hello
---- more_headers eval
-CORE::join"\n", map { "Header$_: value-$_" } 1..512
-
---- response_body eval
-qq{POST /main HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\nContent-Length: 5\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 18: large header (POST body) - r->header_end is outside r->header_in
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 564;
-    location /t {
-        content_by_lua '
-            -- ngx.req.read_body()
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- request
-POST /t
-hello
---- more_headers eval
-CORE::join("\n", map { "Header$_: value-$_" } 1..80) . "\nA: abcdefghijklmnopqrs\n"
-
---- response_body eval
-qq{POST /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..80)
-. "\r\nA: abcdefghijklmnopqrs\r\nContent-Length: 5\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 19: large header (POST body) - r->header_end is outside r->header_in (2)
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 564;
-    location /t {
-        content_by_lua '
-            -- ngx.req.read_body()
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- request
-POST /t
-hello
---- more_headers eval
-CORE::join("\n", map { "Header$_: value-$_" } 1..52) . "\nA: abcdefghijklmnopqrs\n"
-
---- response_body eval
-qq{POST /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..52)
-. "\r\nA: abcdefghijklmnopqrs\r\nContent-Length: 5\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 20: raw_header (the default header buffer can hold the request line, but not the header entries) - without request line)
---- config
-    location /t {
-        content_by_lua '
-           ngx.print(ngx.req.raw_header(true))
-        ';
-    }
---- request
-GET /t
---- more_headers eval
-my $s = "User-Agent: curl\nBah: bah\n";
-$s .= "Accept: */*\n";
-$s .= "Cookie: " . "C" x 1200 . "\n";
-$s
---- response_body eval
-"Host: localhost\r
-Connection: close\r
-User-Agent: curl\r
-Bah: bah\r
-Accept: */*\r
-Cookie: " . ("C" x 1200) . "\r\n\r\n"
---- no_error_log
-[error]
-
-
-
-=== TEST 21: raw_header (the default header buffer can hold the request line, but not the header entries) - with request line)
---- config
-    location /t {
-        content_by_lua '
-           ngx.print(ngx.req.raw_header())
-        ';
-    }
---- request
-GET /t
---- more_headers eval
-my $s = "User-Agent: curl\nBah: bah\n";
-$s .= "Accept: */*\n";
-$s .= "Cookie: " . "C" x 1200 . "\n";
-$s
---- response_body eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-User-Agent: curl\r
-Bah: bah\r
-Accept: */*\r
-Cookie: " . ("C" x 1200) . "\r\n\r\n"
---- no_error_log
-[error]
-
-
-
-=== TEST 22: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers
---- config
-    location = /t {
-        proxy_buffering off;
-        proxy_pass http://127.0.0.1:$server_port/bad;
-        proxy_intercept_errors on;
-        error_page 500 = /500;
-    }
-
-    location = /bad {
-        return 500;
-    }
-
-    location = /500 {
-        internal;
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- request
-GET /t
---- response_body eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 23: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (exclusive LF in the request data)
---- config
-    location = /t {
-        proxy_buffering off;
-        proxy_pass http://127.0.0.1:$server_port/bad;
-        proxy_intercept_errors on;
-        error_page 500 = /500;
-    }
-
-    location = /bad {
-        return 500;
-    }
-
-    location = /500 {
-        internal;
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- raw_request eval
-"GET /t HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 5
-
-hello"
---- response_body eval
-"GET /t HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 5
-
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 24: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (exclusive LF in the request data, and no status line)
---- config
-    location = /t {
-        proxy_buffering off;
-        proxy_pass http://127.0.0.1:$server_port/bad;
-        proxy_intercept_errors on;
-        error_page 500 = /500;
-    }
-
-    location = /bad {
-        return 500;
-    }
-
-    location = /500 {
-        internal;
-        content_by_lua '
-            ngx.print(ngx.req.raw_header(true))
-        ';
-    }
---- raw_request eval
-"GET /t HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 5
-
-hello"
---- response_body eval
-"Host: localhost
-Connection: close
-Content-Length: 5
-
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 25: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (mixed LF and CRLF in the request data, and no status line)
---- config
-    location = /t {
-        proxy_buffering off;
-        proxy_pass http://127.0.0.1:$server_port/bad;
-        proxy_intercept_errors on;
-        error_page 500 = /500;
-    }
-
-    location = /bad {
-        return 500;
-    }
-
-    location = /500 {
-        internal;
-        content_by_lua '
-            ngx.print(ngx.req.raw_header(true))
-        ';
-    }
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost
-Connection: close\r
-Content-Length: 5\r
-
-hello"
---- response_body eval
-"Host: localhost
-Connection: close\r
-Content-Length: 5\r
-
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 26: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (another way of mixing LF and CRLF in the request data, and no status line)
---- config
-    location = /t {
-        proxy_buffering off;
-        proxy_pass http://127.0.0.1:$server_port/bad;
-        proxy_intercept_errors on;
-        error_page 500 = /500;
-    }
-
-    location = /bad {
-        return 500;
-    }
-
-    location = /500 {
-        internal;
-        content_by_lua '
-            ngx.print(ngx.req.raw_header(true))
-        ';
-    }
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost
-Connection: close\r
-Content-Length: 5
-\r
-hello"
---- response_body eval
-"Host: localhost
-Connection: close\r
-Content-Length: 5
-\r
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 27: two pipelined requests with large headers
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 3 5610;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- pipelined_requests eval
-["GET /t", "GET /t"]
---- more_headers eval
-CORE::join "\n", map { "Header$_: value-$_" } 1..585
-
---- response_body eval
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..585) . "\r\n\r\n",
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..585) . "\r\n\r\n",
-,
-]
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 28: a request with large header and a smaller pipelined request following
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 2 1921;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- pipelined_requests eval
-["GET /t", "GET /t"]
---- more_headers eval
-[CORE::join("\n", map { "Header$_: value-$_" } 1..170), "Foo: bar\n"]
-
---- response_body eval
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..170) . "\r\n\r\n",
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar\r
-\r
-},
-]
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 29: a request with large header and a smaller pipelined request following
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 2 1921;
-    location /t {
-        content_by_lua '
-            ngx.print(ngx.req.raw_header())
-        ';
-    }
---- pipelined_requests eval
-["GET /t", "GET /t" . ("a" x 512)]
---- more_headers eval
-[CORE::join("\n", map { "Header$_: value-$_" } 1..170), "Foo: bar\n"]
-
---- response_body eval
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..170) . "\r\n\r\n",
-qq{GET /t} . ("a" x 512) . qq{ HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar\r
-\r
-},
-]
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 30: large headers (using single LF as line break)
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.print(ngx.req.raw_header())
-        }
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1
-Host: localhost
-Connection: close
-".
-(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
-
---- response_body eval
-qq{GET /t HTTP/1.1
-Host: localhost
-Connection: close
-}
-.(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 31: large headers without request line (using single LF as line break)
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.print(ngx.req.raw_header(true))
-        }
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1
-Host: localhost
-Connection: close
-".
-(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
-
---- response_body eval
-qq{Host: localhost
-Connection: close
-}
-.(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 32: large headers with leading CRLF (using single LF as line break)
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.print(ngx.req.raw_header())
-        }
-    }
-
---- raw_request eval
-"\r
-GET /t HTTP/1.1
-Host: localhost
-Connection: close
-".
-(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
-
---- response_body eval
-qq{GET /t HTTP/1.1
-Host: localhost
-Connection: close
-}
-.(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 33: large headers without request line but contains leading CRLF (using single LF as line break)
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.print(ngx.req.raw_header(true))
-        }
-    }
-
---- raw_request eval
-"\r
-GET /t HTTP/1.1
-Host: localhost
-Connection: close
-".
-(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
-
---- response_body eval
-qq{Host: localhost
-Connection: close
-}
-.(CORE::join "\n", map { "Header$_: value-$_" } 1..512) . "\n\n"
-
---- no_error_log
-[error]
---- timeout: 5
diff --git a/debian/modules/http-lua/t/105-pressure.t b/debian/modules/http-lua/t/105-pressure.t
deleted file mode 100644
index 9d1ba1f..0000000
--- a/debian/modules/http-lua/t/105-pressure.t
+++ /dev/null
@@ -1,53 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#log_level('debug');
-
-repeat_each(20);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-our $HtmlDir = html_dir;
-#warn $html_dir;
-
-our $Id;
-
-#no_diff();
-#no_long_string();
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#no_shuffle();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: memory issue in the "args" string option for ngx.location.capture
---- config
-    location /test1 {
-        content_by_lua '
-            local res = ngx.location.capture("/test2/auth", {args = ngx.var.args})
-            ngx.print(res.body)
-        ';
-    }
-    location /test2 {
-        content_by_lua '
-            collectgarbage()
-            ngx.say(ngx.var.args)
-        ';
-    }
-
---- request eval
-$::Id = int rand 10000;
-"GET /test1?parent=$::Id&name=2013031816214284300707&footprint=dsfasfwefklds"
-
---- response_body eval
-"parent=$::Id&name=2013031816214284300707&footprint=dsfasfwefklds\n"
-
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/106-timer.t b/debian/modules/http-lua/t/106-timer.t
deleted file mode 100644
index 3e4741e..0000000
--- a/debian/modules/http-lua/t/106-timer.t
+++ /dev/null
@@ -1,2195 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-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);
-
-plan tests => repeat_each() * (blocks() * 8 + 72);
-
-#no_diff();
-no_long_string();
-
-our $HtmlDir = html_dir;
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
-
-worker_connections(1024);
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple at
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f(premature)
-                print("elapsed: ", ngx.now() - begin)
-                print("timer prematurely expired: ", premature)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-timer prematurely expired: true
-
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])\d*, context: ngx\.timer, client: \d+\.\d+\.\d+\.\d+, server: 0\.0\.0\.0:\d+/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"timer prematurely expired: false",
-]
-
-
-
-=== TEST 2: separated global env
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f()
-                foo = 3
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.06)
-            ngx.say("foo = ", foo)
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-foo = nil
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 3: lua variable sharing via upvalue
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local foo
-            local function f()
-                foo = 3
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.06)
-            ngx.say("foo = ", foo)
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-foo = 3
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 4: simple at (sleep in the timer callback)
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-                ngx.sleep(0.2)
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.3
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] .*? my lua timer handler/,
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:1[4-9]|2[0-6]?)/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 5: tcp cosocket in timer handler (short connections)
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-            local function f()
-                print("my lua timer handler")
-                local sock = ngx.socket.tcp()
-                local port = $TEST_NGINX_SERVER_PORT
-                local ok, err = sock:connect("127.0.0.1", port)
-                if not ok then
-                    fail("failed to connect: ", err)
-                    return
-                end
-
-                print("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
-                    fail("failed to send request: ", err)
-                    return
-                end
-
-                print("request sent: ", bytes)
-
-                while true do
-                    local line, err, part = sock:receive()
-                    if line then
-                        print("received: ", line)
-
-                    else
-                        if err == "closed" then
-                            break
-                        end
-                        fail("failed to receive a line: ", err, " [", part, "]")
-                        break
-                    end
-                end
-
-                ok, err = sock:close()
-                print("close: ", ok, " ", err)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
-
-    location = /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"connected: 1",
-"request sent: 57",
-"received: HTTP/1.1 200 OK",
-qr/received: Server: \S+/,
-"received: Content-Type: text/plain",
-"received: Content-Length: 4",
-"received: Connection: close",
-"received: foo",
-"close: 1 nil",
-]
-
-
-
-=== TEST 6: tcp cosocket in timer handler (keep-alive connections)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set reusable: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 7: 0 timer
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0(?:[^.]|\.00)/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 8: udp cosocket in timer handler
---- config
-    location = /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-            local function f()
-                print("my lua timer handler")
-                local socket = ngx.socket
-                -- local socket = require "socket"
-
-                local udp = socket.udp()
-
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                udp:settimeout(1000) -- 1 sec
-
-                local ok, err = udp:setpeername("127.0.0.1", port)
-                if not ok then
-                    fail("failed to connect: ", err)
-                    return
-                end
-
-                print("connected: ", ok)
-
-                local req = "\\0\\1\\0\\0\\0\\1\\0\\0flush_all\\r\\n"
-                local ok, err = udp:send(req)
-                if not ok then
-                    fail("failed to send: ", err)
-                    return
-                end
-
-                local data, err = udp:receive()
-                if not data then
-                    fail("failed to receive data: ", err)
-                    return
-                end
-                print("received ", #data, " bytes: ", data)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
-
-    location = /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"connected: 1",
-"received 12 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}"
-]
-
-
-
-=== TEST 9: simple at (sleep in the timer callback) - log_by_lua
---- config
-    location /t {
-        echo hello world;
-        log_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-                ngx.sleep(0.02)
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-hello world
-
---- wait: 0.12
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 10: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        echo hello;
-        log_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-        ';
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set reusable: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-hello
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 11: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        echo hello;
-        header_filter_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-        ';
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set reusable: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap3
-global count = 0
-F(ngx_http_lua_header_filter) {
-    if (count++ == 10) {
-        println("header filter")
-        print_ubacktrace()
-    }
-}
-
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-hello
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 12: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        echo hello;
-        body_filter_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-        ';
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set keep alive: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap3
-global count = 0
-F(ngx_http_lua_header_filter) {
-    if (count++ == 10) {
-        println("header filter")
-        print_ubacktrace()
-    }
-}
-
---- stap eval: $::GCScript
---- stap_out_like chop
-create 2 in 1
-create 3 in 1
-(?:terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-|terminate 3: ok
-delete thread 3
-terminate 2: ok
-delete thread 2)$
-
---- response_body
-hello
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 13: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        set_by_lua $a '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-            return 32
-        ';
-        echo $a;
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set reusable: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap3
-global count = 0
-F(ngx_http_lua_header_filter) {
-    if (count++ == 10) {
-        println("header filter")
-        print_ubacktrace()
-    }
-}
-
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-32
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 14: coroutine API
---- config
-    location /t {
-        content_by_lua '
-            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
-            local function f()
-                function f()
-                    local cnt = 0
-                    for i = 1, 20 do
-                        print("cnt = ", cnt)
-                        cy()
-                        cnt = cnt + 1
-                    end
-                end
-
-                local c = cc(f)
-                for i=1,3 do
-                    cr(c)
-                    print("after resume, i = ", i)
-                end
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-create 3 in 2
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"cnt = 0",
-"after resume, i = 1",
-"cnt = 1",
-"after resume, i = 2",
-"cnt = 2",
-"after resume, i = 3",
-]
-
-
-
-=== TEST 15: ngx.thread API
---- config
-    location /t {
-        content_by_lua '
-            local function fail (...)
-                ngx.log(ngx.ERR, ...)
-            end
-            local function handle()
-                function f()
-                    print("hello in thread")
-                    return "done"
-                end
-
-                local t, err = ngx.thread.spawn(f)
-                if not t then
-                    fail("failed to spawn thread: ", err)
-                    return
-                end
-
-                print("thread created: ", coroutine.status(t))
-
-                collectgarbage()
-
-                local ok, res = ngx.thread.wait(t)
-                if not ok then
-                    fail("failed to run thread: ", res)
-                    return
-                end
-
-                print("wait result: ", res)
-            end
-            local ok, err = ngx.timer.at(0.01, handle)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-create 3 in 2
-spawn user thread 3 in 2
-terminate 3: ok
-delete thread 3
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"hello in thread",
-"thread created: zombie",
-"wait result: done",
-]
-
-
-
-=== TEST 16: shared dict
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                local dogs = ngx.shared.dogs
-                dogs:set("foo", 32)
-                dogs:set("bah", 10502)
-                local val = dogs:get("foo")
-                print("get foo: ", val, " ", type(val))
-                val = dogs:get("bah")
-                print("get bah: ", val, " ", type(val))
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"get foo: 32 number",
-"get bah: 10502 number",
-]
-
-
-
-=== TEST 17: ngx.exit(0)
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                local function g()
-                    print("BEFORE ngx.exit")
-                    ngx.exit(0)
-                end
-                g()
-                print("CANNOT REACH HERE")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"BEFORE ngx.exit",
-]
---- no_error_log
-CANNOT REACH HERE
-API disabled
-
-
-
-=== TEST 18: ngx.exit(403)
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                local function g()
-                    print("BEFORE ngx.exit")
-                    ngx.exit(403)
-                end
-                g()
-                print("CANNOT REACH HERE")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-CANNOT REACH HERE
-API disabled
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"BEFORE ngx.exit",
-]
-
-
-
-=== TEST 19: exit in user thread (entry thread is still pending on ngx.sleep)
---- config
-    location /t {
-        content_by_lua '
-            local function handle()
-                local function f()
-                    print("hello in thread")
-                    ngx.sleep(0.1)
-                    ngx.exit(0)
-                end
-
-                print("BEFORE thread spawn")
-                ngx.thread.spawn(f)
-                print("AFTER thread spawn")
-                ngx.sleep(1)
-                print("entry thread END")
-            end
-            local ok, err = ngx.timer.at(0.05, handle)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- 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_like chop
-(?:create 2 in 1
-terminate 1: ok
-delete thread 1
-free request
-create 3 in 2
-spawn user thread 3 in 2
-add timer 100
-add timer 1000
-expire timer 100
-terminate 3: ok
-delete thread 3
-lua sleep cleanup
-delete timer 1000
-delete thread 2|create 2 in 1
-terminate 1: ok
-delete thread 1
-create 3 in 2
-spawn user thread 3 in 2
-add timer 100
-add timer 1000
-free request
-expire timer 100
-terminate 3: ok
-delete thread 3
-lua sleep cleanup
-delete timer 1000
-delete thread 2)$
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-API disabled
-entry thread END
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"BEFORE thread spawn",
-"hello in thread",
-"AFTER thread spawn",
-]
-
-
-
-=== TEST 20: chained timers (0 delay)
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                local ok, err = ngx.timer.at(0, g)
-                if not ok then
-                    fail("failed to set timer: ", err)
-                    return
-                end
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-create 3 in 2
-terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-'lua ngx.timer expired',
-'http lua close fake http connection',
-qr/trace: \[m\]\[f\]\[g\], context: ngx\.timer, client: \d+\.\d+\.\d+\.\d+, server: 0\.0\.0\.0:\d+/,
-]
-
-
-
-=== TEST 21: chained timers (non-zero delay)
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                local ok, err = ngx.timer.at(0.01, g)
-                if not ok then
-                    fail("failed to set timer: ", err)
-                    return
-                end
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-create 3 in 2
-terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log
-lua ngx.timer expired
-http lua close fake http connection
-trace: [m][f][g]
-
-
-
-=== TEST 22: multiple parallel timers
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                fail("failed to set timer: ", err)
-                return
-            end
-            local ok, err = ngx.timer.at(0.01, g)
-            if not ok then
-                fail("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-create 3 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log
-lua ngx.timer expired
-http lua close fake http connection
-trace: [m][f][g]
-
-
-
-=== TEST 23: lua_max_pending_timers
---- http_config
-    lua_max_pending_timers 1;
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer f: ", err)
-                return
-            end
-            local ok, err = ngx.timer.at(0.01, g)
-            if not ok then
-                ngx.say("failed to set timer g: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-failed to set timer g: too many pending timers
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-[error]
-
---- error_log
-lua ngx.timer expired
-http lua close fake http connection
-
-
-
-=== TEST 24: lua_max_pending_timers (just not exceeding)
---- http_config
-    lua_max_pending_timers 2;
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer f: ", err)
-                return
-            end
-            local ok, err = ngx.timer.at(0.01, g)
-            if not ok then
-                ngx.say("failed to set timer g: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-create 3 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-[error]
-
---- error_log
-lua ngx.timer expired
-http lua close fake http connection
-trace: [m][f][g]
-
-
-
-=== TEST 25: lua_max_pending_timers - chained timers (non-zero delay) - not exceeding
---- http_config
-    lua_max_pending_timers 1;
-
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                local ok, err = ngx.timer.at(0.01, g)
-                if not ok then
-                    fail("failed to set timer: ", err)
-                    return
-                end
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-create 3 in 2
-terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log
-lua ngx.timer expired
-http lua close fake http connection
-trace: [m][f][g]
-
-
-
-=== TEST 26: lua_max_pending_timers - chained timers (zero delay) - not exceeding
---- http_config
-    lua_max_pending_timers 1;
-
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                local ok, err = ngx.timer.at(0, g)
-                if not ok then
-                    fail("failed to set timer: ", err)
-                    return
-                end
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-create 3 in 2
-terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log
-lua ngx.timer expired
-http lua close fake http connection
-trace: [m][f][g]
-
-
-
-=== TEST 27: lua_max_running_timers (just not enough)
---- http_config
-    lua_max_running_timers 1;
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local f, g
-
-            g = function ()
-                ngx.sleep(0.01)
-            end
-
-            f = function ()
-                ngx.sleep(0.01)
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer f: ", err)
-                return
-            end
-            local ok, err = ngx.timer.at(0, g)
-            if not ok then
-                ngx.say("failed to set timer g: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-create 3 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[crit]
-[error]
-
---- error_log eval
-[
-qr/\[alert\] .*? 1 lua_max_running_timers are not enough/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-]
-
-
-
-=== TEST 28: lua_max_running_timers (just enough)
---- http_config
-    lua_max_running_timers 2;
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local f, g
-
-            g = function ()
-                ngx.sleep(0.01)
-            end
-
-            f = function ()
-                ngx.sleep(0.01)
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer f: ", err)
-                return
-            end
-            local ok, err = ngx.timer.at(0, g)
-            if not ok then
-                ngx.say("failed to set timer g: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-create 3 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-[error]
-
---- error_log
-lua ngx.timer expired
-http lua close fake http connection
-
-
-
-=== TEST 29: lua_max_running_timers (just enough) - 2
---- http_config
-    lua_max_running_timers 2;
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local f, g
-
-            g = function ()
-                ngx.timer.at(0.02, f)
-                ngx.sleep(0.01)
-            end
-
-            f = function ()
-                ngx.sleep(0.01)
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer f: ", err)
-                return
-            end
-            local ok, err = ngx.timer.at(0, g)
-            if not ok then
-                ngx.say("failed to set timer g: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-create 3 in 1
-terminate 1: ok
-delete thread 1
-create 4 in 3
-terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-terminate 4: ok
-delete thread 4
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-[error]
-
---- error_log
-lua ngx.timer expired
-http lua close fake http connection
-
-
-
-=== TEST 30: user args
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f(premature, a, b, c)
-                print("elapsed: ", ngx.now() - begin)
-                print("timer prematurely expired: ", premature)
-                print("timer user args: ", a, " ", b, " ", c)
-            end
-            local ok, err = ngx.timer.at(0.05, f, 1, "hello", true)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-timer prematurely expired: true
-
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])\d*, context: ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"timer prematurely expired: false",
-"timer user args: 1 hello true",
-]
-
-
-
-=== TEST 31: use of ngx.ctx
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f(premature)
-                ngx.ctx.s = "hello"
-                print("elapsed: ", ngx.now() - begin)
-                print("timer prematurely expired: ", premature)
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-timer prematurely expired: true
-
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: .*?, context: ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"timer prematurely expired: false",
-"lua release ngx.ctx at ref ",
-]
-
-
-
-=== TEST 32: syslog error log
---- http_config
-    #error_log syslog:server=127.0.0.1:12345 error;
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.log(ngx.ERR, "Bad bad bad")
-            end
-            ngx.timer.at(0, f)
-            ngx.sleep(0.001)
-            ngx.say("ok")
-        ';
-    }
---- log_level: error
---- error_log_file: syslog:server=127.0.0.1:12345
---- udp_listen: 12345
---- udp_query eval: qr/Bad bad bad/
---- udp_reply: hello
---- wait: 0.1
---- request
-    GET /t
---- response_body
-ok
---- error_log
-Bad bad bad
---- skip_nginx: 4: < 1.7.1
diff --git a/debian/modules/http-lua/t/107-timer-errors.t b/debian/modules/http-lua/t/107-timer-errors.t
deleted file mode 100644
index 3201612..0000000
--- a/debian/modules/http-lua/t/107-timer-errors.t
+++ /dev/null
@@ -1,1422 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 7);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: accessing nginx variables
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                print("uri: ", ngx.var.uri)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 2: reading ngx.status
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                print("uri: ", ngx.status)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 3: writing ngx.status
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.status = 200
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 4: ngx.req.raw_header
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                print("raw header: ", ngx.req.raw_header())
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 5: ngx.req.get_headers
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.get_headers()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 6: ngx.req.set_header
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.set_header("Foo", 32)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 7: ngx.req.clear_header
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.clear_header("Foo")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 8: ngx.req.set_uri
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.set_uri("/foo")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 9: ngx.req.set_uri_args
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.set_uri_args("foo")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 10: ngx.redirect()
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.redirect("/foo")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 11: ngx.exec()
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.exec("/foo")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 12: ngx.say()
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.say("hello")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 13: ngx.print()
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.print("hello")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 14: ngx.flush()
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.flush()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 15: ngx.send_headers()
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.send_headers()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 16: ngx.req.get_uri_args()
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.get_uri_args()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 17: ngx.req.read_body
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.read_body()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 18: ngx.req.discard_body
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.discard_body()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 19: ngx.req.init_body
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.init_body()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 20: ngx.header
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.header.Foo = 3
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 21: ngx.on_abort
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.on_abort(f)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 22: ngx.location.capture
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.location.capture("/")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 23: ngx.location.capture_multi
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.location.capture_multi{{"/"}}
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 24: ngx.req.get_method
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.get_method()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 25: ngx.req.set_method
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.set_method(ngx.HTTP_POST)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 26: ngx.req.http_version
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.http_version()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 27: ngx.req.get_post_args
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.get_post_args()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 28: ngx.req.get_body_data
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.get_body_data()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 29: ngx.req.get_body_file
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.get_body_file()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 30: ngx.req.set_body_data
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.set_body_data("hello")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 31: ngx.req.set_body_file
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.set_body_file("hello")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 32: ngx.req.append_body
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.append_body("hello")
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 33: ngx.req.finish_body
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.req.finish_body()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 34: ngx.headers_sent
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.headers_sent()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the current context/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 35: ngx.eof
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                ngx.eof()
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 36: ngx.req.socket
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                local sock, err = ngx.req.socket()
-                if not sock then
-                    ngx.log(ngx.ERR, "failed to get req sock: ", err)
-                end
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[error\] .*? runtime error: content_by_lua\(nginx\.conf:\d+\):3: API disabled in the context of ngx\.timer/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
diff --git a/debian/modules/http-lua/t/108-timer-safe.t b/debian/modules/http-lua/t/108-timer-safe.t
deleted file mode 100644
index 2795998..0000000
--- a/debian/modules/http-lua/t/108-timer-safe.t
+++ /dev/null
@@ -1,1397 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-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);
-
-plan tests => repeat_each() * (blocks() * 8 + 60);
-
-#no_diff();
-no_long_string();
-
-our $HtmlDir = html_dir;
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
-
-worker_connections(1024);
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple at
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.05)
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-terminate 1: ok
-delete thread 1
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 2: simple at (sleep in the timer callback)
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-                ngx.sleep(0.02)
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.05)
-        ';
-    }
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.5
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] .*? my lua timer handler/,
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 3: tcp cosocket in timer handler (short connections)
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-            local function f()
-                print("my lua timer handler")
-                local sock = ngx.socket.tcp()
-                local port = $TEST_NGINX_SERVER_PORT
-                local ok, err = sock:connect("127.0.0.1", port)
-                if not ok then
-                    fail("failed to connect: ", err)
-                    return
-                end
-
-                print("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
-                    fail("failed to send request: ", err)
-                    return
-                end
-
-                print("request sent: ", bytes)
-
-                while true do
-                    local line, err, part = sock:receive()
-                    if line then
-                        print("received: ", line)
-
-                    else
-                        if err == "closed" then
-                            break
-                        end
-                        fail("failed to receive a line: ", err, " [", part, "]")
-                        break
-                    end
-                end
-
-                ok, err = sock:close()
-                print("close: ", ok, " ", err)
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.02)
-        ';
-    }
-
-    location = /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap3 eval: $::GCScript
---- stap_out2
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 3: ok
-delete thread 3
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"connected: 1",
-"request sent: 57",
-"received: HTTP/1.1 200 OK",
-qr/received: Server: \S+/,
-"received: Content-Type: text/plain",
-"received: Content-Length: 4",
-"received: Connection: close",
-"received: foo",
-"close: 1 nil",
-]
-
-
-
-=== TEST 4: tcp cosocket in timer handler (keep-alive connections)
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.02)
-        ';
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set reusable: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap3 eval: $::GCScript
---- stap_out2
-create 2 in 1
-terminate 2: ok
-delete thread 2
-terminate 1: ok
-delete thread 1
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 5: 0 timer
---- config
-    location /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 1: ok
-delete thread 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-registered timer
-
---- wait: 0.02
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0(?:[^.]|\.00)/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 6: udp cosocket in timer handler
---- config
-    location = /t {
-        content_by_lua '
-            local begin = ngx.now()
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-            local function f()
-                print("my lua timer handler")
-                local socket = ngx.socket
-                -- local socket = require "socket"
-
-                local udp = socket.udp()
-
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                udp:settimeout(1000) -- 1 sec
-
-                local ok, err = udp:setpeername("127.0.0.1", port)
-                if not ok then
-                    fail("failed to connect: ", err)
-                    return
-                end
-
-                print("connected: ", ok)
-
-                local req = "\\0\\1\\0\\0\\0\\1\\0\\0flush_all\\r\\n"
-                local ok, err = udp:send(req)
-                if not ok then
-                    fail("failed to send: ", err)
-                    return
-                end
-
-                local data, err = udp:receive()
-                if not data then
-                    fail("failed to receive data: ", err)
-                    return
-                end
-                print("received ", #data, " bytes: ", data)
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.05)
-        ';
-    }
-
-    location = /foo {
-        content_by_lua 'ngx.say("foo")';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-terminate 1: ok
-delete thread 1
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"connected: 1",
-"received 12 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}"
-]
-
-
-
-=== TEST 7: simple at (sleep in the timer callback) - log_by_lua
---- config
-    location /t {
-        echo hello world;
-        echo_sleep 0.07;
-        log_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-                ngx.sleep(0.02)
-                print("elapsed: ", ngx.now() - begin)
-            end
-            local ok, err = ngx.timer.at(0.05, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-        ';
-    }
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-hello world
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-qr/\[lua\] log_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:6[4-9]|7[0-6])/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 8: tcp cosocket in timer handler (keep-alive connections) - log_by_lua
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        echo hello;
-        echo_sleep 0.01;
-        log_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-        ';
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set reusable: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-hello
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 9: tcp cosocket in timer handler (keep-alive connections) - header_filter_by_lua
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        echo hello;
-        echo_sleep 0.01;
-        header_filter_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-        ';
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set reusable: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap3
-global count = 0
-F(ngx_http_lua_header_filter) {
-    if (count++ == 10) {
-        println("header filter")
-        print_ubacktrace()
-    }
-}
-
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-hello
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 10: tcp cosocket in timer handler (keep-alive connections) - body_filter_by_lua
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        echo_sleep 0.01;
-        echo hello;
-        body_filter_by_lua '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-        ';
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set reusable: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap3
-global count = 0
-F(ngx_http_lua_header_filter) {
-    if (count++ == 10) {
-        println("header filter")
-        print_ubacktrace()
-    }
-}
-
---- stap eval: $::GCScript
---- stap_out_like chop
-create 2 in 1
-create 3 in 1
-(?:terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-|terminate 3: ok
-delete thread 3
-terminate 2: ok
-delete thread 2)$
-
---- response_body
-hello
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 11: tcp cosocket in timer handler (keep-alive connections) - set_by_lua
---- http_config eval
-    "lua_package_path '$::HtmlDir/?.lua;./?.lua';"
-
---- config
-    location = /t {
-        set_by_lua $a '
-            local begin = ngx.now()
-            local function f()
-                print("my lua timer handler")
-
-                local test = require "test"
-                local port = $TEST_NGINX_MEMCACHED_PORT
-                test.go(port)
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set timer: ", err)
-                return
-            end
-            print("registered timer")
-            return 32
-        ';
-        echo $a;
-        echo_sleep 0.01;
-    }
-
---- user_files
->>> test.lua
-module("test", package.seeall)
-
-local function fail(...)
-    ngx.log(ngx.ERR, ...)
-end
-
-function go(port)
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1", port)
-    if not ok then
-        fail("failed to connect: ", err)
-        return
-    end
-
-    print("connected: ", ok, ", reused: ", sock:getreusedtimes())
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        fail("failed to send request: ", err)
-        return
-    end
-    print("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        print("received: ", line)
-
-    else
-        fail("failed to receive a line: ", err, " [", part, "]")
-    end
-
-    local ok, err = sock:setkeepalive()
-    if not ok then
-        fail("failed to set reusable: ", err)
-    end
-end
-
---- request
-GET /t
---- stap2 eval: $::StapScript
---- stap3
-global count = 0
-F(ngx_http_lua_header_filter) {
-    if (count++ == 10) {
-        println("header filter")
-        print_ubacktrace()
-    }
-}
-
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-
---- response_body
-32
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"registered timer",
-qr/\[lua\] .*? my lua timer handler/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-qr/go\(\): connected: 1, reused: \d+/,
-"go(): request sent: 11",
-"go(): received: OK",
-]
-
-
-
-=== TEST 12: coroutine API
---- config
-    location /t {
-        content_by_lua '
-            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
-            local function f()
-                function f()
-                    local cnt = 0
-                    for i = 1, 20 do
-                        print("cnt = ", cnt)
-                        cy()
-                        cnt = cnt + 1
-                    end
-                end
-
-                local c = cc(f)
-                for i=1,3 do
-                    cr(c)
-                    print("after resume, i = ", i)
-                end
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.01)
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-create 3 in 2
-terminate 2: ok
-delete thread 2
-terminate 1: ok
-delete thread 1
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"cnt = 0",
-"after resume, i = 1",
-"cnt = 1",
-"after resume, i = 2",
-"cnt = 2",
-"after resume, i = 3",
-]
-
-
-
-=== TEST 13: ngx.thread API
---- config
-    location /t {
-        content_by_lua '
-            local function fail (...)
-                ngx.log(ngx.ERR, ...)
-            end
-            local function handle()
-                function f()
-                    print("hello in thread")
-                    return "done"
-                end
-
-                local t, err = ngx.thread.spawn(f)
-                if not t then
-                    fail("failed to spawn thread: ", err)
-                    return
-                end
-
-                print("thread created: ", coroutine.status(t))
-
-                collectgarbage()
-
-                local ok, res = ngx.thread.wait(t)
-                if not ok then
-                    fail("failed to run thread: ", res)
-                    return
-                end
-
-                print("wait result: ", res)
-            end
-            local ok, err = ngx.timer.at(0.01, handle)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.02)
-        ';
-    }
---- request
-GET /t
-
---- 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
-delete thread 2
-terminate 1: ok
-delete thread 1
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"hello in thread",
-"thread created: zombie",
-"wait result: done",
-]
-
-
-
-=== TEST 14: shared dict
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                local dogs = ngx.shared.dogs
-                dogs:set("foo", 32)
-                dogs:set("bah", 10502)
-                local val = dogs:get("foo")
-                print("get foo: ", val, " ", type(val))
-                val = dogs:get("bah")
-                print("get bah: ", val, " ", type(val))
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.02)
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-terminate 2: ok
-delete thread 2
-terminate 1: ok
-delete thread 1
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"get foo: 32 number",
-"get bah: 10502 number",
-]
-
-
-
-=== TEST 15: ngx.exit(0)
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                local function g()
-                    print("BEFORE ngx.exit")
-                    ngx.exit(0)
-                end
-                g()
-                print("CANNOT REACH HERE")
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.01)
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[alert]
-[crit]
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"BEFORE ngx.exit",
-]
---- no_error_log
-CANNOT REACH HERE
-API disabled
-
-
-
-=== TEST 16: ngx.exit(403)
---- config
-    location /t {
-        content_by_lua '
-            local function f()
-                local function g()
-                    print("BEFORE ngx.exit")
-                    ngx.exit(403)
-                end
-                g()
-                print("CANNOT REACH HERE")
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.01)
-        ';
-    }
---- request
-GET /t
---- stap2
-F(ngx_http_lua_timer_handler) {
-    println("lua timer handler")
-}
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-CANNOT REACH HERE
-API disabled
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"BEFORE ngx.exit",
-]
-
-
-
-=== TEST 17: exit in user thread (entry thread is still pending on ngx.sleep)
---- config
-    location /t {
-        content_by_lua '
-            local function handle()
-                local function f()
-                    print("hello in thread")
-                    ngx.sleep(0.1)
-                    ngx.exit(0)
-                end
-
-                print("BEFORE thread spawn")
-                ngx.thread.spawn(f)
-                print("AFTER thread spawn")
-                ngx.sleep(1)
-                print("entry thread END")
-            end
-            local ok, err = ngx.timer.at(0.01, handle)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.12)
-        ';
-    }
---- request
-GET /t
---- 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
-create 3 in 2
-spawn user thread 3 in 2
-add timer 100
-add timer 1000
-expire timer 100
-terminate 3: ok
-delete thread 3
-lua sleep cleanup
-delete timer 1000
-delete thread 2
-terminate 1: ok
-delete thread 1
-free request
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-API disabled
-entry thread END
-
---- error_log eval
-[
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"BEFORE thread spawn",
-"hello in thread",
-"AFTER thread spawn",
-]
-
-
-
-=== TEST 18: chained timers (non-zero delay)
---- config
-    location /t {
-        content_by_lua '
-            local s = ""
-
-            local function fail(...)
-                ngx.log(ngx.ERR, ...)
-            end
-
-            local function g()
-                s = s .. "[g]"
-                print("trace: ", s)
-            end
-
-            local function f()
-                local ok, err = ngx.timer.at(0.01, g)
-                if not ok then
-                    fail("failed to set timer: ", err)
-                    return
-                end
-                s = s .. "[f]"
-            end
-            local ok, err = ngx.timer.at(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            s = "[m]"
-            ngx.sleep(0.03)
-        ';
-    }
---- request
-GET /t
-
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-create 3 in 2
-terminate 2: ok
-delete thread 2
-terminate 3: ok
-delete thread 3
-terminate 1: ok
-delete thread 1
-
---- response_body
-registered timer
-
---- wait: 0.1
---- no_error_log
-[error]
-[alert]
-[crit]
-
---- error_log
-lua ngx.timer expired
-http lua close fake http connection
-trace: [m][f][g]
diff --git a/debian/modules/http-lua/t/109-timer-hup.t b/debian/modules/http-lua/t/109-timer-hup.t
deleted file mode 100644
index 0864046..0000000
--- a/debian/modules/http-lua/t/109-timer-hup.t
+++ /dev/null
@@ -1,502 +0,0 @@
-# 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;
-        undef $ENV{TEST_NGINX_USE_STAP};
-    }
-}
-
-use Test::Nginx::Socket::Lua $SkipReason ? (skip_all => $SkipReason) : ();
-
-
-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);
-
-plan tests => repeat_each() * 81;
-
-#no_diff();
-no_long_string();
-
-our $HtmlDir = html_dir;
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
-
-worker_connections(1024);
-run_tests();
-
-__DATA__
-
-=== TEST 1: single timer
---- config
-    location /t {
-        content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
-            if not f then
-                ngx.say("failed to open nginx.pid: ", err)
-                return
-            end
-
-            local pid = f:read()
-            -- ngx.say("master pid: [", pid, "]")
-
-            f:close()
-
-            local i = 0
-            local function f(premature)
-                i = i + 1
-                print("timer prematurely expired: ", premature)
-                print("in callback: hello, ", i)
-            end
-            local ok, err = ngx.timer.at(3, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            os.execute("kill -HUP " .. pid)
-        ';
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.3
---- no_error_log
-[error]
-[alert]
-[crit]
-in callback: hello, 2
-timer prematurely expired: false
-
---- error_log
-lua abort pending timers
-lua ngx.timer expired
-http lua close fake http connection
-in callback: hello, 1
-timer prematurely expired: true
-
-
-
-=== TEST 2: multiple timers
---- config
-    location /t {
-        content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
-            if not f then
-                ngx.say("failed to open nginx.pid: ", err)
-                return
-            end
-
-            local pid = f:read()
-            -- ngx.say("master pid: [", pid, "]")
-
-            f:close()
-
-            local i = 0
-            local function f(premature)
-                i = i + 1
-                print("timer prematurely expired: ", premature)
-                print("in callback: hello, ", i, "!")
-            end
-            for i = 1, 10 do
-                local ok, err = ngx.timer.at(3, f)
-                if not ok then
-                    ngx.say("failed to set timer: ", err)
-                    return
-                end
-            end
-            ngx.say("registered timers")
-            os.execute("kill -HUP " .. pid)
-        ';
-    }
---- request
-GET /t
-
---- response_body
-registered timers
-
---- wait: 0.3
---- no_error_log
-[error]
-[alert]
-[crit]
-in callback: hello, 11!
-timer prematurely expired: false
-
---- error_log
-lua abort pending timers
-lua ngx.timer expired
-http lua close fake http connection
-in callback: hello, 1!
-in callback: hello, 2!
-in callback: hello, 3!
-in callback: hello, 4!
-in callback: hello, 5!
-in callback: hello, 6!
-in callback: hello, 7!
-in callback: hello, 8!
-in callback: hello, 9!
-in callback: hello, 10!
-timer prematurely expired: true
-
-
-
-=== TEST 3: trying to add new timer after HUP reload
---- config
-    location /t {
-        content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
-            if not f then
-                ngx.say("failed to open nginx.pid: ", err)
-                return
-            end
-
-            local pid = f:read()
-            -- ngx.say("master pid: [", pid, "]")
-
-            f:close()
-
-            local function f(premature)
-                print("timer prematurely expired: ", premature)
-                local ok, err = ngx.timer.at(3, f)
-                if not ok then
-                    print("failed to register a new timer after reload: ", err)
-                else
-                    print("registered a new timer after reload")
-                end
-            end
-            local ok, err = ngx.timer.at(3, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            os.execute("kill -HUP " .. pid)
-        ';
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-in callback: hello, 2
-timer prematurely expired: false
-
---- error_log
-lua abort pending timers
-lua ngx.timer expired
-http lua close fake http connection
-timer prematurely expired: true
-failed to register a new timer after reload: process exiting, context: ngx.timer
-
-
-
-=== TEST 4: trying to add new timer after HUP reload
---- config
-    location /t {
-        content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
-            if not f then
-                ngx.say("failed to open nginx.pid: ", err)
-                return
-            end
-
-            local pid = f:read()
-            -- ngx.say("master pid: [", pid, "]")
-
-            f:close()
-
-            local function g(premature)
-                print("g: timer prematurely expired: ", premature)
-                print("g: exiting=", ngx.worker.exiting())
-            end
-
-            local function f(premature)
-                print("f: timer prematurely expired: ", premature)
-                print("f: exiting=", ngx.worker.exiting())
-                local ok, err = ngx.timer.at(0, g)
-                if not ok then
-                    print("f: failed to register a new timer after reload: ", err)
-                else
-                    print("f: registered a new timer after reload")
-                end
-            end
-            local ok, err = ngx.timer.at(3, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            os.execute("kill -HUP " .. pid)
-        ';
-    }
---- request
-GET /t
-
---- response_body
-registered timer
-
---- wait: 0.2
---- no_error_log
-[error]
-[alert]
-[crit]
-in callback: hello, 2
-failed to register a new timer after reload
-
---- error_log
-lua abort pending timers
-lua ngx.timer expired
-http lua close fake http connection
-f: timer prematurely expired: true
-f: registered a new timer after reload
-f: exiting=true
-g: timer prematurely expired: false
-g: exiting=true
-
-
-
-=== TEST 5: HUP reload should abort pending timers
---- config
-    location /t {
-        content_by_lua '
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
-            if not f then
-                ngx.say("failed to open nginx.pid: ", err)
-                return
-            end
-
-            local pid = f:read()
-            -- ngx.say("master pid: [", pid, "]")
-
-            f:close()
-
-            local function f(premature)
-                print("f: timer prematurely expired: ", premature)
-                print("f: exiting=", ngx.worker.exiting())
-            end
-
-            for i = 1, 100 do
-                local ok, err = ngx.timer.at(3 + i, f)
-                if not ok then
-                    ngx.say("failed to set timer: ", err)
-                    return
-                end
-            end
-            ngx.say("ok")
-            os.execute("kill -HUP " .. pid)
-        ';
-    }
---- request
-GET /t
-
---- response_body
-ok
-
---- wait: 0.5
---- no_error_log
-[error]
-[alert]
-[crit]
-in callback: hello, 2
-failed to register a new timer after reload
-
---- grep_error_log eval: qr/lua found \d+ pending timers/
---- grep_error_log_out
-lua found 100 pending timers
-
-
-
-=== TEST 6: HUP reload should abort pending timers (coroutine + cosocket)
---- http_config
-    lua_shared_dict test_dict 1m;
-
-    server {
-        listen 12355;
-        location = /foo {
-            echo 'foo';
-        }
-    }
-
---- config
-    location /t {
-        content_by_lua '
-            local http_req = {"GET /foo HTTP/1.1", "Host: localhost:1234", "", ""}
-            http_req = table.concat(http_req, "\\r\\n")
-
-            -- Connect the socket
-            local sock = ngx.socket.tcp()
-            local ok,err = sock:connect("127.0.0.1", 12355)
-            if not ok then
-                ngx.log(ngx.ERR, err)
-            end
-
-            -- Send the request
-            local ok,err = sock:send(http_req)
-
-            -- Get Headers
-            repeat
-                local line, err = sock:receive("*l")
-            until not line or string.find(line, "^%s*$")
-
-            function foo()
-                repeat
-                    -- Get and read chunk
-                    local line, err = sock:receive("*l")
-                    local len = tonumber(line)
-                    if len > 0 then
-                        local chunk, err = sock:receive(len)
-                        coroutine.yield(chunk)
-                        sock:receive(2)
-                    else
-                        -- Read last newline
-                        sock:receive(2)
-                    end
-                until len == 0
-            end
-
-            co = coroutine.create(foo)
-            repeat
-                local chunk = select(2,coroutine.resume(co))
-            until chunk == nil
-
-            -- Breaks the timer
-            sock:setkeepalive()
-            ngx.say("ok")
-        ';
-
-        log_by_lua '
-            local background_thread
-            background_thread = function(premature)
-                ngx.log(ngx.DEBUG, premature)
-                if premature then
-                    ngx.shared["test_dict"]:delete("background_flag")
-                    return
-                end
-                local ok, err = ngx.timer.at(1, background_thread)
-
-                local f, err = io.open("t/servroot/logs/nginx.pid", "r")
-                if not f then
-                    ngx.say("failed to open nginx.pid: ", err)
-                    return
-                end
-                local pid = f:read()
-                -- ngx.say("master pid: [", pid, "]")
-                f:close()
-
-                os.execute("kill -HUP " .. pid)
-            end
-            local dict = ngx.shared["test_dict"]
-
-            if dict:get("background_flag") == nil then
-                local ok, err = ngx.timer.at(0, background_thread)
-                if ok then
-                    dict:set("test_dict", 1)
-                end
-            end
-        ';
-    }
---- request
-GET /t
-
---- response_body
-ok
-
---- wait: 0.3
---- no_error_log
-[error]
-[alert]
-[crit]
-in callback: hello, 2
-failed to register a new timer after reload
-
---- grep_error_log eval: qr/lua found \d+ pending timers/
---- grep_error_log_out
-lua found 1 pending timers
-
-
-
-=== TEST 7: HUP reload should abort pending timers (fuzz test)
---- http_config
-    lua_max_pending_timers 8192;
-
---- config
-    location /t {
-        content_by_lua '
-            local job = function(premature, kill)
-                if premature then
-                    return
-                end
-
-                if kill then
-                    local f, err = io.open("t/servroot/logs/nginx.pid", "r")
-                    if not f then
-                        ngx.log(ngx.ERR, "failed to open nginx.pid: ", err)
-                        return
-                    end
-                    local pid = f:read()
-                    -- ngx.say("master pid: [", pid, "]")
-                    f:close()
-
-                    os.execute("kill -HUP " .. pid)
-                end
-            end
-
-            math.randomseed(ngx.time())
-            local rand = math.random
-            local newtimer = ngx.timer.at
-            for i = 1, 8191 do
-                local delay = rand(4096)
-                local ok, err = newtimer(delay, job, false)
-                if not ok then
-                    ngx.say("failed to create timer at ", delay, ": ", err)
-                    return
-                end
-            end
-            local ok, err = newtimer(0, job, true)
-            if not ok then
-                ngx.say("failed to create the killer timer: ", err)
-                return
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-GET /t
-
---- response_body
-ok
-
---- wait: 0.3
---- no_error_log
-[error]
-[alert]
-
---- grep_error_log eval: qr/lua found \d+ pending timers/
---- grep_error_log_out
-lua found 8191 pending timers
---- timeout: 20
diff --git a/debian/modules/http-lua/t/110-etag.t b/debian/modules/http-lua/t/110-etag.t
deleted file mode 100644
index 0a94d3d..0000000
--- a/debian/modules/http-lua/t/110-etag.t
+++ /dev/null
@@ -1,83 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: If-None-Match true
---- config
-    location /t {
-        content_by_lua '
-            ngx.header["ETag"] = "123456789"
-            ngx.header.last_modified = "Thu, 10 May 2012 07:50:59 GMT"
-            ngx.say(ngx.var.http_if_none_match)
-        ';
-    }
---- request
-GET /t
---- more_headers
-If-None-Match: 123456789
-If-Modified-Since: Thu, 10 May 2012 07:50:59 GMT
---- response_body
---- error_code: 304
---- no_error_log
-[error]
-
-
-
-=== TEST 2: If-None-Match false
---- config
-    location /t {
-        etag on;
-        content_by_lua '
-            ngx.header["ETag"] = "123456789"
-            ngx.header.last_modified = "Thu, 10 May 2012 07:50:59 GMT"
-            ngx.say(ngx.var.http_if_none_match)
-        ';
-    }
---- request
-GET /t
---- more_headers
-If-None-Match: 123456780
-If-Modified-Since: Thu, 10 May 2012 07:50:59 GMT
---- response_body
-123456780
---- no_error_log
-[error]
---- skip_nginx: 3: < 1.3.3
-
-
-
-=== TEST 3: Etag clear
---- config
-    location /t {
-        etag on;
-        content_by_lua '
-            ngx.header["ETag"] = "123456789"
-            ngx.header.last_modified = "Thu, 10 May 2012 07:50:59 GMT"
-            ngx.header["ETag"] = nil
-            ngx.say(ngx.var.http_if_none_match)
-        ';
-    }
---- request
-GET /t
---- more_headers
-If-None-Match: 123456789
-If-Modified-Since: Thu, 10 May 2012 07:50:59 GMT
---- response_body
-123456789
---- no_error_log
-[error]
---- skip_nginx: 3: < 1.3.3
diff --git a/debian/modules/http-lua/t/111-req-header-ua.t b/debian/modules/http-lua/t/111-req-header-ua.t
deleted file mode 100644
index 9e501e3..0000000
--- a/debian/modules/http-lua/t/111-req-header-ua.t
+++ /dev/null
@@ -1,675 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (4 * blocks());
-
-#no_diff();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: clear Opera user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", nil)
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Opera/9.80 (Macintosh; Intel Mac OS X 10.7.4; U; en) Presto/2.10.229 Version/11.62
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: opera: %d\n", $r->headers_in->opera)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: opera: %d\n", $r->headers_in->opera)
-}
-
---- stap_out
-rewrite: opera: 1
-content: opera: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 2: clear MSIE 4 user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", nil)
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=1 msie6=1
-content: msie=0 msie6=0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 3: set custom MSIE 4 user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)")
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=1
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)
---- no_error_log
-[error]
-
-
-
-=== TEST 4: clear MSIE 5 user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", nil)
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/4.0 (compatible; MSIE 5.01; Windows 95; MSIECrawler)
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=1 msie6=1
-content: msie=0 msie6=0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 5: set custom MSIE 5 user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.01; Windows 95; MSIECrawler)")
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=1
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 5.01; Windows 95; MSIECrawler)
---- no_error_log
-[error]
-
-
-
-=== TEST 6: clear MSIE 6 (without SV1) user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", nil)
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=1 msie6=1
-content: msie=0 msie6=0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 7: set custom MSIE 6 (without SV1) user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)")
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=1
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)
---- no_error_log
-[error]
-
-
-
-=== TEST 8: clear MSIE 6 (with SV1) user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", nil)
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=1 msie6=0
-content: msie=0 msie6=0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 9: set custom MSIE 6 (with SV1) user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)")
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=0
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)
---- no_error_log
-[error]
-
-
-
-=== TEST 10: set custom MSIE 7 user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; winfx; .NET CLR 1.1.4322; .NET CLR 2.0.50727; Zune 2.0)")
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=0
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; winfx; .NET CLR 1.1.4322; .NET CLR 2.0.50727; Zune 2.0)
---- no_error_log
-[error]
-
-
-
-=== TEST 11: clear Gecko user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", nil)
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: gecko: %d\n", $r->headers_in->gecko)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: gecko: %d\n", $r->headers_in->gecko)
-}
-
---- stap_out
-rewrite: gecko: 1
-content: gecko: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 12: set custom Gecko user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0")
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: gecko: %d\n", $r->headers_in->gecko)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: gecko: %d\n", $r->headers_in->gecko)
-}
-
---- stap_out
-rewrite: gecko: 0
-content: gecko: 1
-
---- response_body
-User-Agent: Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0
---- no_error_log
-[error]
-
-
-
-=== TEST 13: clear Chrome user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", nil)
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.151 Safari/535.19
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: chrome: %d\n", $r->headers_in->chrome)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: chrome: %d\n", $r->headers_in->chrome)
-}
-
---- stap_out
-rewrite: chrome: 1
-content: chrome: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 14: set custom Chrome user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.151 Safari/535.19")
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: chrome: %d\n", $r->headers_in->chrome)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: chrome: %d\n", $r->headers_in->chrome)
-}
-
---- stap_out
-rewrite: chrome: 0
-content: chrome: 1
-
---- response_body
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.151 Safari/535.19
---- no_error_log
-[error]
-
-
-
-=== TEST 15: clear Safari (Mac OS X) user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", nil)
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: safari: %d\n", $r->headers_in->safari)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: safari: %d\n", $r->headers_in->safari)
-}
-
---- stap_out
-rewrite: safari: 1
-content: safari: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 16: set custom Safari user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8")
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: safari: %d\n", $r->headers_in->safari)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: safari: %d\n", $r->headers_in->safari)
-}
-
---- stap_out
-rewrite: safari: 0
-content: safari: 1
-
---- response_body
-User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8
---- no_error_log
-[error]
-
-
-
-=== TEST 17: clear Konqueror user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", nil)
-
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: konqueror: %d\n", $r->headers_in->konqueror)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: konqueror: %d\n", $r->headers_in->konqueror)
-}
-
---- stap_out
-rewrite: konqueror: 1
-content: konqueror: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 18: set custom Konqueror user-agent
---- config
-    location /t {
-        rewrite_by_lua '
-            ngx.req.set_header("User-Agent", "Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)")
-        ';
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: konqueror: %d\n", $r->headers_in->konqueror)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: konqueror: %d\n", $r->headers_in->konqueror)
-}
-
---- stap_out
-rewrite: konqueror: 0
-content: konqueror: 1
-
---- response_body
-User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/112-req-header-conn.t b/debian/modules/http-lua/t/112-req-header-conn.t
deleted file mode 100644
index 51bc8a4..0000000
--- a/debian/modules/http-lua/t/112-req-header-conn.t
+++ /dev/null
@@ -1,148 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (4 * blocks());
-
-#no_diff();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: clear the Connection req header
---- config
-    location /req-header {
-        rewrite_by_lua '
-            ngx.req.set_header("Connection", nil);
-        ';
-
-        echo "connection: $http_connection";
-    }
---- request
-GET /req-header
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: conn type: %d\n", $r->headers_in->connection_type)
-}
-
---- stap_out
-rewrite: conn type: 1
-content: conn type: 0
-
---- response_body
-connection: 
---- no_error_log
-[error]
-
-
-
-=== TEST 2: set custom Connection req header (close)
---- config
-    location /req-header {
-        rewrite_by_lua '
-            ngx.req.set_header("Connection", "CLOSE");
-        ';
-
-        echo "connection: $http_connection";
-    }
---- request
-GET /req-header
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: conn type: %d\n", $r->headers_in->connection_type)
-}
-
---- stap_out
-rewrite: conn type: 1
-content: conn type: 1
-
---- response_body
-connection: CLOSE
---- no_error_log
-[error]
-
-
-
-=== TEST 3: set custom Connection req header (keep-alive)
---- config
-    location /req-header {
-        rewrite_by_lua '
-            ngx.req.set_header("Connection", "keep-alive");
-        ';
-
-        echo "connection: $http_connection";
-    }
---- request
-GET /req-header
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: conn type: %d\n", $r->headers_in->connection_type)
-}
-
---- stap_out
-rewrite: conn type: 1
-content: conn type: 2
-
---- response_body
-connection: keep-alive
---- no_error_log
-[error]
-
-
-
-=== TEST 4: set custom Connection req header (bad)
---- config
-    location /req-header {
-        rewrite_by_lua '
-            ngx.req.set_header("Connection", "bad");
-        ';
-
-        echo "connection: $http_connection";
-    }
---- request
-GET /req-header
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: conn type: %d\n", $r->headers_in->connection_type)
-}
-
---- stap_out
-rewrite: conn type: 1
-content: conn type: 0
-
---- response_body
-connection: bad
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/113-req-header-cookie.t b/debian/modules/http-lua/t/113-req-header-cookie.t
deleted file mode 100644
index 4a93053..0000000
--- a/debian/modules/http-lua/t/113-req-header-cookie.t
+++ /dev/null
@@ -1,249 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (4 * blocks());
-
-#no_diff();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: clear cookie (with existing cookies)
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("Cookie", nil)
-        ';
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
---- more_headers
-Cookie: foo=bar
-Cookie: baz=blah
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 2
-content: cookies: 0
-
---- response_body
-Cookie foo: 
-Cookie baz: 
-Cookie: 
-
---- no_error_log
-[error]
-
-
-
-=== TEST 2: clear cookie (without existing cookies)
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("Cookie", nil)
-        ';
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 0
-content: cookies: 0
-
---- response_body
-Cookie foo: 
-Cookie baz: 
-Cookie: 
-
---- no_error_log
-[error]
-
-
-
-=== TEST 3: set one custom cookie (with existing cookies)
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("Cookie", "boo=123")
-        ';
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie boo: $cookie_boo";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
---- more_headers
-Cookie: foo=bar
-Cookie: baz=blah
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 2
-content: cookies: 1
-
---- response_body
-Cookie foo: 
-Cookie baz: 
-Cookie boo: 123
-Cookie: boo=123
-
---- no_error_log
-[error]
-
-
-
-=== TEST 4: set one custom cookie (without existing cookies)
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("Cookie", "boo=123")
-        ';
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie boo: $cookie_boo";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 0
-content: cookies: 1
-
---- response_body
-Cookie foo: 
-Cookie baz: 
-Cookie boo: 123
-Cookie: boo=123
-
---- no_error_log
-[error]
-
-
-
-=== TEST 5: set multiple custom cookies (with existing cookies)
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("Cookie", {"boo=123","foo=78"})
-        ';
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie boo: $cookie_boo";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
---- more_headers
-Cookie: foo=bar
-Cookie: baz=blah
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 2
-content: cookies: 2
-
---- response_body
-Cookie foo: 78
-Cookie baz: 
-Cookie boo: 123
-Cookie: boo=123; foo=78
-
---- no_error_log
-[error]
-
-
-
-=== TEST 6: set multiple custom cookies (without existing cookies)
---- config
-    location /t {
-        rewrite_by_lua '
-           ngx.req.set_header("Cookie", {"boo=123", "foo=bar"})
-        ';
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie boo: $cookie_boo";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
-
---- stap
-F(ngx_http_lua_rewrite_by_chunk) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 0
-content: cookies: 2
-
---- response_body
-Cookie foo: bar
-Cookie baz: 
-Cookie boo: 123
-Cookie: boo=123; foo=bar
-
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/114-config.t b/debian/modules/http-lua/t/114-config.t
deleted file mode 100644
index 9d6680d..0000000
--- a/debian/modules/http-lua/t/114-config.t
+++ /dev/null
@@ -1,48 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: ngx.config.debug
---- config
-    location /t {
-        content_by_lua '
-            ngx.say("debug: ", ngx.config.debug)
-        ';
-    }
---- request
-GET /t
---- response_body_like chop
-^debug: (?:true|false)$
---- no_error_log
-[error]
-
-
-
-=== TEST 2: ngx.config.subystem
---- config
-    location /t {
-        content_by_lua '
-            ngx.say("subsystem: ", ngx.config.subsystem)
-        ';
-    }
---- request
-GET /t
---- response_body
-subsystem: http
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/115-quote-sql-str.t b/debian/modules/http-lua/t/115-quote-sql-str.t
deleted file mode 100644
index 66553b1..0000000
--- a/debian/modules/http-lua/t/115-quote-sql-str.t
+++ /dev/null
@@ -1,76 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#log_level("warn");
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: \0
---- config
-    location = /set {
-        content_by_lua '
-            ngx.say(ngx.quote_sql_str("a\\0b\\0"))
-        ';
-    }
---- request
-GET /set
---- response_body
-'a\0b\0'
---- no_error_log
-[error]
-
-
-
-=== TEST 2: \t
---- config
-    location = /set {
-        content_by_lua '
-            ngx.say(ngx.quote_sql_str("a\\tb\\t"))
-        ';
-    }
---- request
-GET /set
---- response_body
-'a\tb\t'
---- no_error_log
-[error]
-
-
-
-=== TEST 3: \b
---- config
-    location = /set {
-        content_by_lua '
-            ngx.say(ngx.quote_sql_str("a\\bb\\b"))
-        ';
-    }
---- request
-GET /set
---- response_body
-'a\bb\b'
---- no_error_log
-[error]
-
-
-
-=== TEST 4: \Z
---- config
-    location = /set {
-        content_by_lua '
-            ngx.say(ngx.quote_sql_str("a\\026b\\026"))
-        ';
-    }
---- request
-GET /set
---- response_body
-'a\Zb\Z'
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/116-raw-req-socket.t b/debian/modules/http-lua/t/116-raw-req-socket.t
deleted file mode 100644
index ab06ee4..0000000
--- a/debian/modules/http-lua/t/116-raw-req-socket.t
+++ /dev/null
@@ -1,878 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * 40;
-
-our $HtmlDir = html_dir;
-
-$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();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    server_tokens off;
-    location = /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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
-
-            local req = "GET /mysock HTTP/1.1\\r\\nUpgrade: mysock\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\nhello"
-            -- req = "OK"
-
-            local bytes, err = sock:send(req)
-            if not bytes then
-                ngx.say("failed to send request: ", err)
-                return
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local data, err, partial = reader()
-            if not data then
-                ngx.say("no response header found")
-                return
-            end
-
-            local msg, err = sock:receive()
-            if not msg then
-                ngx.say("failed to receive: ", err)
-                return
-            end
-
-            ngx.say("msg: ", msg)
-
-            ok, err = sock:close()
-            if not ok then
-                ngx.say("failed to close socket: ", err)
-                return
-            end
-        ';
-    }
-
-    location = /mysock {
-        content_by_lua '
-            ngx.status = 101
-            ngx.send_headers()
-            ngx.flush(true)
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-
-            local data, err = sock:receive(5)
-            if not data then
-                ngx.log(ngx.ERR, "server: failed to receive: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("1: received: " .. data .. "\\n")
-            if not bytes then
-                ngx.log(ngx.ERR, "server: failed to send: ", err)
-                return
-            end
-        ';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-msg: 1: received: hello
---- grep_error_log: lua socket tcp_nodelay
---- grep_error_log_out
-lua socket tcp_nodelay
-lua socket tcp_nodelay
---- no_error_log
-[error]
-
-
-
-=== TEST 2: header not sent yet
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            ngx.status = 101
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-            local ok, err = sock:send("HTTP/1.1 200 OK\\r\\nContent-Length: 5\\r\\n\\r\\nhello")
-            if not ok then
-                ngx.log(ngx.ERR, "failed to send: ", err)
-                return
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.0\r
-Host: localhost\r
-Content-Length: 5\r
-\r
-hello"
---- response_headers
-Content-Length: 5
---- response_body chop
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 3: http 1.0 buffering
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            ngx.say("hello")
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return ngx.exit(500)
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.0\r
-Host: localhost\r
-Upgrade: mysocket\r
-\r
-hello"
---- stap2
-F(ngx_http_header_filter) {
-    println("header filter")
-}
-F(ngx_http_lua_req_socket) {
-    println("lua req socket")
-}
---- ignore_response
---- error_log
-server: failed to get raw req socket: http 1.0 buffering
-
-
-
-=== TEST 4: multiple raw req sockets
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            ngx.say("hello")
-            ngx.flush(true)
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-            local sock2, err = ngx.req.socket(true)
-            if not sock2 then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket2: ", err)
-                return
-            end
-
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Upgrade: mysocket\r
-\r
-hello"
---- stap2
-F(ngx_http_header_filter) {
-    println("header filter")
-}
-F(ngx_http_lua_req_socket) {
-    println("lua req socket")
-}
---- ignore_response
---- error_log
-server: failed to get raw req socket2: duplicate call
-
-
-
-=== TEST 5: ngx.say after ngx.req.socket(true)
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.flush(true)
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-            local ok, err = ngx.say("ok")
-            if not ok then
-                ngx.log(ngx.ERR, "failed to say: ", err)
-                return
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Upgrade: mysocket\r
-\r
-hello"
---- ignore_response
---- error_log
-failed to say: raw request socket acquired
-
-
-
-=== TEST 6: ngx.print after ngx.req.socket(true)
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.flush(true)
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-            local ok, err = ngx.print("ok")
-            if not ok then
-                ngx.log(ngx.ERR, "failed to print: ", err)
-                return
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Upgrade: mysocket\r
-\r
-hello"
---- ignore_response
---- error_log
-failed to print: raw request socket acquired
-
-
-
-=== TEST 7: ngx.eof after ngx.req.socket(true)
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.flush(true)
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-            local ok, err = ngx.eof()
-            if not ok then
-                ngx.log(ngx.ERR, "failed to eof: ", err)
-                return
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Upgrade: mysocket\r
-\r
-hello"
---- ignore_response
---- error_log
-failed to eof: raw request socket acquired
-
-
-
-=== TEST 8: ngx.flush after ngx.req.socket(true)
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.flush(true)
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-            local ok, err = ngx.flush()
-            if not ok then
-                ngx.log(ngx.ERR, "failed to flush: ", err)
-                return
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Upgrade: mysocket\r
-\r
-hello"
---- ignore_response
---- error_log
-failed to flush: raw request socket acquired
-
-
-
-=== TEST 9: receive timeout
---- config
-    server_tokens off;
-    postpone_output 1;
-    location = /t {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.req.read_body()
-            ngx.flush(true)
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-
-            sock:settimeout(100)
-
-            local data, err, partial = sock:receive(10)
-            if not data then
-                ngx.log(ngx.ERR, "server: 1: failed to receive: ", err, ", received: ", partial)
-            end
-
-            data, err, partial = sock:receive(10)
-            if not data then
-                ngx.log(ngx.ERR, "server: 2: failed to receive: ", err, ", received: ", partial)
-            end
-
-            ngx.exit(444)
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Upgrade: mysocket\r
-Connection: close\r
-\r
-ab"
---- ignore_response
---- wait: 0.1
---- error_log
-lua tcp socket read timed out
-server: 1: failed to receive: timeout, received: ab,
-server: 2: failed to receive: timeout, received: ,
---- no_error_log
-[alert]
-
-
-
-=== TEST 10: on_abort called during ngx.sleep()
---- config
-    server_tokens off;
-    lua_check_client_abort on;
-    location = /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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
-
-            local req = "GET /mysock HTTP/1.1\\r\\nUpgrade: mysock\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\nhello"
-            -- req = "OK"
-
-            local bytes, err = sock:send(req)
-            if not bytes then
-                ngx.say("failed to send request: ", err)
-                return
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local data, err, partial = reader()
-            if not data then
-                ngx.say("no response header found")
-                return
-            end
-
-            local msg, err = sock:receive()
-            if not msg then
-                ngx.say("failed to receive: ", err)
-                return
-            end
-
-            ngx.say("msg: ", msg)
-
-            ngx.sleep(0.1)
-
-            ok, err = sock:close()
-            if not ok then
-                ngx.say("failed to close socket: ", err)
-                return
-            end
-        ';
-    }
-
-    location = /mysock {
-        content_by_lua '
-            ngx.status = 101
-            ngx.send_headers()
-            ngx.flush(true)
-
-            local ok, err = ngx.on_abort(function (premature) ngx.log(ngx.WARN, "mysock handler aborted") end)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set on_abort handler: ", err)
-                return
-            end
-
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-
-            local data, err = sock:receive(5)
-            if not data then
-                ngx.log(ngx.ERR, "server: failed to receive: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("1: received: " .. data .. "\\n")
-            if not bytes then
-                ngx.log(ngx.ERR, "server: failed to send: ", err)
-                return
-            end
-
-            ngx.sleep(1)
-        ';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-msg: 1: received: hello
---- error_log
-mysock handler aborted
---- no_error_log
-[error]
---- wait: 1.1
-
-
-
-=== TEST 11: on_abort called during sock:receive()
---- config
-    server_tokens off;
-    lua_check_client_abort on;
-    location = /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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
-
-            local req = "GET /mysock HTTP/1.1\\r\\nUpgrade: mysock\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\nhello"
-            -- req = "OK"
-
-            local bytes, err = sock:send(req)
-            if not bytes then
-                ngx.say("failed to send request: ", err)
-                return
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local data, err, partial = reader()
-            if not data then
-                ngx.say("no response header found")
-                return
-            end
-
-            local msg, err = sock:receive()
-            if not msg then
-                ngx.say("failed to receive: ", err)
-                return
-            end
-
-            ngx.say("msg: ", msg)
-
-            ngx.sleep(0.1)
-
-            ok, err = sock:close()
-            if not ok then
-                ngx.say("failed to close socket: ", err)
-                return
-            end
-        ';
-    }
-
-    location = /mysock {
-        content_by_lua '
-            ngx.status = 101
-            ngx.send_headers()
-            ngx.flush(true)
-
-            local ok, err = ngx.on_abort(function (premature) ngx.log(ngx.WARN, "mysock handler aborted") end)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to set on_abort handler: ", err)
-                return
-            end
-
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-
-            local data, err = sock:receive(5)
-            if not data then
-                ngx.log(ngx.ERR, "server: failed to receive: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("1: received: " .. data .. "\\n")
-            if not bytes then
-                ngx.log(ngx.ERR, "server: failed to send: ", err)
-                return
-            end
-
-            local data, err = sock:receive()
-            if not data then
-                ngx.log(ngx.WARN, "failed to receive a line: ", err)
-                return
-            end
-        ';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-msg: 1: received: hello
---- error_log
-failed to receive a line: client aborted
---- no_error_log
-[error]
---- wait: 0.1
-
-
-
-=== TEST 12: receiveuntil
---- config
-    server_tokens off;
-    location = /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_SERVER_PORT;
-
-        content_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
-
-            local req = "GET /mysock HTTP/1.1\\r\\nUpgrade: mysock\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\nhello"
-            -- req = "OK"
-
-            local bytes, err = sock:send(req)
-            if not bytes then
-                ngx.say("failed to send request: ", err)
-                return
-            end
-
-            local bytes, err = sock:send(", ")
-            if not bytes then
-                ngx.say("failed to send packet 1: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("world")
-            if not bytes then
-                ngx.say("failed to send packet 2: ", err)
-                return
-            end
-
-            local reader = sock:receiveuntil("\\r\\n\\r\\n")
-            local data, err, partial = reader()
-            if not data then
-                ngx.say("no response header found")
-                return
-            end
-
-            local msg, err = sock:receive()
-            if not msg then
-                ngx.say("failed to receive: ", err)
-                return
-            end
-
-            ngx.say("msg: ", msg)
-
-            ok, err = sock:close()
-            if not ok then
-                ngx.say("failed to close socket: ", err)
-                return
-            end
-        ';
-    }
-
-    location = /mysock {
-        content_by_lua '
-            ngx.status = 101
-            ngx.send_headers()
-            ngx.flush(true)
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-
-            local reader = sock:receiveuntil("rld")
-            local data, err = reader()
-            if not data then
-                ngx.log(ngx.ERR, "server: failed to receive: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("1: received: " .. data .. "\\n")
-            if not bytes then
-                ngx.log(ngx.ERR, "server: failed to send: ", err)
-                return
-            end
-        ';
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body
-msg: 1: received: hello, wo
---- no_error_log
-[error]
-
-
-
-=== TEST 13: request body not read yet
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-
-            local data, err = sock:receive(5)
-            if not data then
-                ngx.log(ngx.ERR, "failed to receive: ", err)
-                return
-            end
-
-            local ok, err = sock:send("HTTP/1.1 200 OK\\r\\nContent-Length: 5\\r\\n\\r\\n" .. data)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to send: ", err)
-                return
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.0\r
-Host: localhost\r
-Content-Length: 5\r
-\r
-hello"
---- response_headers
-Content-Length: 5
---- response_body chop
-hello
---- no_error_log
-[error]
-
-
-
-=== TEST 14: pending request body reading
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua '
-            ngx.thread.spawn(function ()
-                ngx.req.read_body()
-            end)
-
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.WARN, "server: failed to get raw req socket: ", err)
-                return ngx.exit(444)
-            end
-
-            local data, err = sock:receive(5)
-            if not data then
-                ngx.log(ngx.ERR, "failed to receive: ", err)
-                return
-            end
-
-            local ok, err = sock:send("HTTP/1.1 200 OK\\r\\nContent-Length: 5\\r\\n\\r\\n" .. data)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to send: ", err)
-                return
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.0\r
-Host: localhost\r
-Content-Length: 5\r
-\r
-hell"
---- ignore_response
---- no_error_log
-[error]
-[alert]
---- error_log
-server: failed to get raw req socket: pending request body reading in some other thread
-
-
-
-=== TEST 15: read chunked request body with raw req socket
---- config
-    location = /t {
-        content_by_lua '
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "failed to new: ", err)
-                return
-            end
-            local function err(...)
-                ngx.log(ngx.ERR, ...)
-                return ngx.exit(400)
-            end
-            local num = tonumber
-            local MAX_CHUNKS = 1000
-            local eof = false
-            local chunks = {}
-            for i = 1, MAX_CHUNKS do
-                local line, err = sock:receive()
-                if not line then
-                    err("failed to receive chunk size: ", err)
-                end
-
-                local size = num(line, 16)
-                if not size then
-                    err("bad chunk size: ", line)
-                end
-
-                if size == 0 then -- last chunk
-                    -- receive the last line
-                    line, err = sock:receive()
-                    if not line then
-                        err("failed to receive last chunk: ", err)
-                    end
-
-                    if line ~= "" then
-                        err("bad last chunk: ", line)
-                    end
-
-                    eof = true
-                    break
-                end
-
-                local chunk, err = sock:receive(size)
-                if not chunk then
-                    err("failed to receive chunk of size ", size, ": ", err)
-                end
-
-                local data, err = sock:receive(2)
-                if not data then
-                    err("failed to receive chunk terminator: ", err)
-                end
-
-                if data ~= "\\r\\n" then
-                    err("bad chunk terminator: ", data)
-                end
-
-                chunks[i] = chunk
-            end
-
-            if not eof then
-                err("too many chunks (more than ", MAX_CHUNKS, ")")
-            end
-
-            local concat = table.concat
-            local body = concat{"got ", #chunks, " chunks.\\nrequest body: "}
-                         .. concat(chunks) .. "\\n"
-            local ok, err = sock:send("HTTP/1.1 200 OK\\r\\nConnection: close\\r\\nContent-Length: "
-                            .. #body .. "\\r\\n\\r\\n" .. body)
-            if not ok then
-                err("failed to send response: ", err)
-            end
-        ';
-    }
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Transfer-Encoding: chunked\r
-Connection: close\r
-\r
-5\r
-hey, \r
-b\r
-hello world\r
-0\r
-\r
-"
---- response_body
-got 2 chunks.
-request body: hey, hello world
-
---- no_error_log
-[error]
-[alert]
diff --git a/debian/modules/http-lua/t/117-raw-req-socket-timeout.t b/debian/modules/http-lua/t/117-raw-req-socket-timeout.t
deleted file mode 100644
index 07abadc..0000000
--- a/debian/modules/http-lua/t/117-raw-req-socket-timeout.t
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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}";
-    }
-
-    if ($ENV{MOCKEAGAIN} eq 'r') {
-        $ENV{MOCKEAGAIN} = 'rw';
-
-    } else {
-        $ENV{MOCKEAGAIN} = 'w';
-    }
-
-    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
-    $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'hello, world';
-    $ENV{TEST_NGINX_POSTPONE_OUTPUT} = 1;
-}
-
-use Test::Nginx::Socket::Lua;
-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);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: pending response header data
---- config
-    server_tokens off;
-    postpone_output 1;
-    location = /t {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.req.read_body()
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Upgrade: mysocket\r
-Connection: close\r
-\r
-"
---- stap2
-F(ngx_http_header_filter) {
-    println("header filter")
-}
-F(ngx_http_lua_req_socket) {
-    println("lua req socket")
-}
---- response_body
---- error_log
-server: failed to get raw req socket: pending data to write
-
-
-
-=== TEST 2: send timeout
---- config
-    server_tokens off;
-    postpone_output 1;
-    location = /t {
-        content_by_lua '
-            ngx.send_headers()
-            ngx.req.read_body()
-            ngx.flush(true)
-            local sock, err = ngx.req.socket(true)
-            if not sock then
-                ngx.log(ngx.ERR, "server: failed to get raw req socket: ", err)
-                return
-            end
-            sock:settimeout(100)
-            local ok, err = sock:send("hello, world!")
-            if not ok then
-                ngx.log(ngx.ERR, "server: failed to send: ", err)
-            end
-            ngx.exit(444)
-        ';
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Upgrade: mysocket\r
-Connection: close\r
-\r
-"
---- ignore_response
---- error_log
-lua tcp socket write timed out
-server: failed to send: timeout
---- no_error_log
-[alert]
diff --git a/debian/modules/http-lua/t/118-use-default-type.t b/debian/modules/http-lua/t/118-use-default-type.t
deleted file mode 100644
index 6008d65..0000000
--- a/debian/modules/http-lua/t/118-use-default-type.t
+++ /dev/null
@@ -1,140 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4);
-
-our $HtmlDir = html_dir;
-
-$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();
-run_tests();
-
-__DATA__
-
-=== TEST 1: lua_use_default_type default on
---- config
-    location /lua {
-        default_type text/plain;
-        content_by_lua '
-            ngx.say("hello")
-        ';
-    }
---- request
-GET /lua
---- response_body
-hello
---- response_headers
-Content-Type: text/plain
---- no_error_log
-[error]
-
-
-
-=== TEST 2: lua_use_default_type explicitly on
---- config
-    lua_use_default_type on;
-    location /lua {
-        default_type text/plain;
-        content_by_lua '
-            ngx.say("hello")
-        ';
-    }
---- request
-GET /lua
---- response_body
-hello
---- response_headers
-Content-Type: text/plain
---- no_error_log
-[error]
-
-
-
-=== TEST 3: lua_use_default_type off
---- config
-    lua_use_default_type off;
-    location /lua {
-        default_type text/plain;
-        content_by_lua '
-            ngx.say("hello")
-        ';
-    }
---- request
-GET /lua
---- response_body
-hello
---- response_headers
-!Content-Type
---- no_error_log
-[error]
-
-
-
-=== TEST 4: overriding lua_use_default_type off
---- config
-    lua_use_default_type off;
-    location /lua {
-        lua_use_default_type on;
-        default_type text/plain;
-        content_by_lua '
-            ngx.say("hello")
-        ';
-    }
---- request
-GET /lua
---- response_body
-hello
---- response_headers
-Content-Type: text/plain
---- no_error_log
-[error]
-
-
-
-=== TEST 5: overriding lua_use_default_type on
---- config
-    lua_use_default_type on;
-    location /lua {
-        lua_use_default_type off;
-        default_type text/plain;
-        content_by_lua '
-            ngx.say("hello")
-        ';
-    }
---- request
-GET /lua
---- response_body
-hello
---- response_headers
-!Content-Type
---- no_error_log
-[error]
-
-
-
-=== TEST 6: lua_use_default_type on does not set content type on 304
---- config
-    lua_use_default_type on;
-    location /lua {
-        default_type text/plain;
-        content_by_lua '
-            ngx.status = ngx.HTTP_NOT_MODIFIED
-        ';
-    }
---- request
-GET /lua
---- response_body
---- response_headers
-!Content-Type
---- no_error_log
-[error]
---- error_code: 304
diff --git a/debian/modules/http-lua/t/119-config-prefix.t b/debian/modules/http-lua/t/119-config-prefix.t
deleted file mode 100644
index 3f79320..0000000
--- a/debian/modules/http-lua/t/119-config-prefix.t
+++ /dev/null
@@ -1,32 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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: content_by_lua
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("prefix: ", ngx.config.prefix())
-        ';
-    }
---- request
-GET /lua
---- response_body_like chop
-^prefix: \/\S+$
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/120-re-find.t b/debian/modules/http-lua/t/120-re-find.t
deleted file mode 100644
index 73e6134..0000000
--- a/debian/modules/http-lua/t/120-re-find.t
+++ /dev/null
@@ -1,919 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 1);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "([0-9]+)", "jo")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                if err then
-                    ngx.say("error: ", err)
-                end
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 8
-to: 11
-matched: 1234
---- no_error_log
-[error]
-
-
-
-=== TEST 2: empty matched string
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, world"
-            local from, to, err = ngx.re.find(s, "[0-9]*")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                if err then
-                    ngx.say("error: ", err)
-                end
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 1
-to: 0
-matched: 
---- no_error_log
-[error]
-
-
-
-=== TEST 3: multiple captures (with o)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "([a-z]+).*?([0-9]{2})[0-9]+", "o")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 1
-to: 11
-matched: hello, 1234
---- no_error_log
-[error]
-
-
-
-=== TEST 4: not matched
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "foo")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched.
---- no_error_log
-[error]
-
-
-
-=== TEST 5: case sensitive by default
---- config
-    location /re {
-        content_by_lua '
-            local from = ngx.re.find("hello, 1234", "HELLO")
-            if from then
-                ngx.say(from)
-            else
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched.
---- no_error_log
-[error]
-
-
-
-=== TEST 6: case insensitive
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "HELLO", "i")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 1
-to: 5
-matched: hello
---- no_error_log
-[error]
-
-
-
-=== TEST 7: UTF-8 mode
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello章亦春"
-            local from, to, err = ngx.re.find(s, "HELLO.{2}", "iu")
-            if not from then
-                ngx.say("FAIL: ", err)
-                return
-            end
-
-            ngx.say(string.sub(s, from, to))
-        ';
-    }
---- request
-    GET /re
---- response_body_like chop
-^(?:FAIL: bad argument \#2 to '\?' \(pcre_compile\(\) failed: this version of PCRE is not compiled with PCRE_UTF8 support in "HELLO\.\{2\}" at "HELLO\.\{2\}"\)|hello章亦)$
---- no_error_log
-[error]
-
-
-
-=== TEST 8: multi-line mode (^ at line head)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello\\nworld"
-            local from, to, err = ngx.re.find(s, "^world", "m")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 7
-to: 11
-matched: world
---- no_error_log
-[error]
-
-
-
-=== TEST 9: multi-line mode (. does not match \n)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello\\nworld"
-            local from, to, err = ngx.re.find(s, ".*", "m")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 1
-to: 5
-matched: hello
---- no_error_log
-[error]
-
-
-
-=== TEST 10: single-line mode (^ as normal)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello\\nworld"
-            local from, to, err = ngx.re.find(s, "^world", "s")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched.
---- no_error_log
-[error]
-
-
-
-=== TEST 11: single-line mode (dot all)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello\\nworld"
-            local from, to, err = ngx.re.find(s, ".*", "s")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 1
-to: 11
-matched: hello
-world
---- no_error_log
-[error]
-
-
-
-=== TEST 12: extended mode (ignore whitespaces)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello\\nworld"
-            local from, to, err = ngx.re.find(s, "\\\\w     \\\\w", "x")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 1
-to: 2
-matched: he
---- no_error_log
-[error]
-
-
-
-=== TEST 13: bad pattern
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello\\nworld"
-            local from, to, err = ngx.re.find(s, "(abc")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                if err then
-                    ngx.say("error: ", err)
-
-                else
-                    ngx.say("not matched.")
-                end
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: pcre_compile() failed: missing ) in "(abc"
---- no_error_log
-[error]
-
-
-
-=== TEST 14: bad option
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello\\nworld"
-            local from, to, err = ngx.re.find(s, ".*", "H")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                if err then
-                    ngx.say("error: ", err)
-                    return
-                end
-
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log
-unknown flag "H"
-
-
-
-=== TEST 15: anchored match (failed)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "([0-9]+)", "a")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                if err then
-                    ngx.say("error: ", err)
-                    return
-                end
-
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched.
---- no_error_log
-[error]
-
-
-
-=== TEST 16: anchored match (succeeded)
---- config
-    location /re {
-        content_by_lua '
-            local s = "1234, hello"
-            local from, to, err = ngx.re.find(s, "([0-9]+)", "a")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                if err then
-                    ngx.say("error: ", err)
-                    return
-                end
-
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 1
-to: 4
-matched: 1234
---- no_error_log
-[error]
-
-
-
-=== TEST 17: match with ctx but no pos
---- config
-    location /re {
-        content_by_lua '
-            local ctx = {}
-            local from, to = ngx.re.find("1234, hello", "([0-9]+)", "", ctx)
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("pos: ", ctx.pos)
-            else
-                ngx.say("not matched!")
-                ngx.say("pos: ", ctx.pos)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 1
-to: 4
-pos: 5
---- no_error_log
-[error]
-
-
-
-=== TEST 18: match with ctx and a pos
---- config
-    location /re {
-        content_by_lua '
-            local ctx = { pos = 3 }
-            local from, to, err = ngx.re.find("1234, hello", "([0-9]+)", "", ctx)
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("pos: ", ctx.pos)
-            else
-                ngx.say("not matched!")
-                ngx.say("pos: ", ctx.pos)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 3
-to: 4
-pos: 5
---- no_error_log
-[error]
-
-
-
-=== TEST 19: named subpatterns w/ extraction
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "(?<first>[a-z]+), [0-9]+")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                if err then
-                    ngx.say("error: ", err)
-                    return
-                end
-
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 1
-to: 11
-matched: hello, 1234
---- no_error_log
-[error]
-
-
-
-=== TEST 20: bad UTF-8
---- config
-    location = /t {
-        content_by_lua '
-            local target = "你好"
-            local regex = "你好"
-
-            local from, to, err = ngx.re.find(string.sub(target, 1, 4), regex, "u")
-
-            if err then
-                ngx.say("error: ", err)
-                return
-            end
-
-            if m then
-                ngx.say("matched: ", from)
-            else
-                ngx.say("not matched")
-            end
-        ';
-    }
---- request
-GET /t
---- response_body_like chop
-^error: pcre_exec\(\) failed: -10$
-
---- no_error_log
-[error]
-
-
-
-=== TEST 21: UTF-8 mode without UTF-8 sequence checks
---- config
-    location /re {
-        content_by_lua '
-            local s = "你好"
-            local from, to, err = ngx.re.find(s, ".", "U")
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-
-            else
-                ngx.say("not matched.")
-            end
-        ';
-    }
---- stap
-probe process("$LIBPCRE_PATH").function("pcre_compile") {
-    printf("compile opts: %x\n", $options)
-}
-
-probe process("$LIBPCRE_PATH").function("pcre_exec") {
-    printf("exec opts: %x\n", $options)
-}
-
---- stap_out
-compile opts: 800
-exec opts: 2000
-
---- request
-    GET /re
---- response_body
-from: 1
-to: 3
-matched: 你
---- no_error_log
-[error]
-
-
-
-=== TEST 22: just hit match limit
---- http_config
-    lua_regex_match_limit 5000;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local from, to, err = ngx.re.find(s, re, "o")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if not from then
-    if err then
-        ngx.say("error: ", err)
-        return
-    end
-    ngx.say("failed to match.")
-    return
-end
-
---- request
-    GET /re
---- response_body
-error: pcre_exec() failed: -8
---- no_error_log
-[error]
-
-
-
-=== TEST 23: just not hit match limit
---- http_config
-    lua_regex_match_limit 5100;
---- config
-    location /re {
-        content_by_lua_file html/a.lua;
-    }
-
---- user_files
->>> a.lua
-local re = [==[(?i:([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:=|<=>|r?like|sounds\s+like|regexp)([\s'\"`´’‘\(\)]*)?\2|([\s'\"`´’‘\(\)]*)?([\d\w]+)([\s'\"`´’‘\(\)]*)?(?:!=|<=|>=|<>|<|>|\^|is\s+not|not\s+like|not\s+regexp)([\s'\"`´’‘\(\)]*)?(?!\6)([\d\w]+))]==]
-
-s = string.rep([[ABCDEFG]], 10)
-
-local start = ngx.now()
-
-local from, to, err = ngx.re.find(s, re, "o")
-
---[[
-ngx.update_time()
-local elapsed = ngx.now() - start
-ngx.say(elapsed, " sec elapsed.")
-]]
-
-if not from then
-    if err then
-        ngx.say("error: ", err)
-        return
-    end
-    ngx.say("failed to match")
-    return
-end
-
---- request
-    GET /re
---- response_body
-failed to match
---- no_error_log
-[error]
-
-
-
-=== TEST 24: specify the group (1)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "([0-9])([0-9]+)", "jo", nil, 1)
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                if err then
-                    ngx.say("error: ", err)
-                end
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 8
-to: 8
-matched: 1
---- no_error_log
-[error]
-
-
-
-=== TEST 25: specify the group (0)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "([0-9])([0-9]+)", "jo", nil, 0)
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                if err then
-                    ngx.say("error: ", err)
-                end
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 8
-to: 11
-matched: 1234
---- no_error_log
-[error]
-
-
-
-=== TEST 26: specify the group (2)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "([0-9])([0-9]+)", "jo", nil, 2)
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                if err then
-                    ngx.say("error: ", err)
-                end
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 9
-to: 11
-matched: 234
---- no_error_log
-[error]
-
-
-
-=== TEST 27: specify the group (3)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "([0-9])([0-9]+)", "jo", nil, 3)
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                if err then
-                    ngx.say("error: ", err)
-                    return
-                end
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: nth out of bound
---- no_error_log
-[error]
-
-
-
-=== TEST 28: specify the group (4)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "([0-9])([0-9]+)", "jo", nil, 4)
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                if err then
-                    ngx.say("error: ", err)
-                    return
-                end
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-error: nth out of bound
---- no_error_log
-[error]
-
-
-
-=== TEST 29: nil submatch (2nd)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "([0-9])|(hello world)", "jo", nil, 2)
-            if from or to then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                if err then
-                    ngx.say("error: ", err)
-                    return
-                end
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched!
---- no_error_log
-[error]
-
-
-
-=== TEST 30: nil submatch (1st)
---- config
-    location /re {
-        content_by_lua '
-            local s = "hello, 1234"
-            local from, to, err = ngx.re.find(s, "(hello world)|([0-9])", "jo", nil, 1)
-            if from or to then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("matched: ", string.sub(s, from, to))
-            else
-                if err then
-                    ngx.say("error: ", err)
-                    return
-                end
-                ngx.say("not matched!")
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-not matched!
---- no_error_log
-[error]
-
-
-
-=== TEST 31: match with ctx and a pos (anchored by \G)
---- config
-    location /re {
-        content_by_lua '
-            local ctx = { pos = 3 }
-            local from, to, err = ngx.re.find("1234, hello", [[(\G[0-9]+)]], "", ctx)
-            if from then
-                ngx.say("from: ", from)
-                ngx.say("to: ", to)
-                ngx.say("pos: ", ctx.pos)
-            else
-                ngx.say("not matched!")
-                ngx.say("pos: ", ctx.pos)
-            end
-        ';
-    }
---- request
-    GET /re
---- response_body
-from: 3
-to: 4
-pos: 5
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/121-version.t b/debian/modules/http-lua/t/121-version.t
deleted file mode 100644
index 9000eb3..0000000
--- a/debian/modules/http-lua/t/121-version.t
+++ /dev/null
@@ -1,48 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#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: nginx version
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("version: ", ngx.config.nginx_version)
-        ';
-    }
---- request
-GET /lua
---- response_body_like chop
-^version: \d+$
---- no_error_log
-[error]
-
-
-
-=== TEST 2: ngx_lua_version
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("version: ", ngx.config.ngx_lua_version)
-        ';
-    }
---- request
-GET /lua
---- response_body_like chop
-^version: \d+$
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/122-worker.t b/debian/modules/http-lua/t/122-worker.t
deleted file mode 100644
index b74c81f..0000000
--- a/debian/modules/http-lua/t/122-worker.t
+++ /dev/null
@@ -1,81 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: content_by_lua + ngx.worker.exiting
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("worker exiting: ", ngx.worker.exiting())
-        ';
-    }
---- request
-GET /lua
---- response_body
-worker exiting: false
---- no_error_log
-[error]
-
-
-
-=== TEST 2: content_by_lua + ngx.worker.pid
---- config
-    location /lua {
-        content_by_lua '
-            local pid = ngx.worker.pid()
-            ngx.say("worker pid: ", pid)
-            if pid ~= tonumber(ngx.var.pid) then
-                ngx.say("worker pid is wrong.")
-            else
-                ngx.say("worker pid is correct.")
-            end
-        ';
-    }
---- request
-GET /lua
---- response_body_like
-worker pid: \d+
-worker pid is correct\.
---- no_error_log
-[error]
-
-
-
-=== TEST 3: init_worker_by_lua + ngx.worker.pid
---- http_config
-    init_worker_by_lua '
-        my_pid = ngx.worker.pid()
-    ';
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say("worker pid: ", my_pid)
-            if my_pid ~= tonumber(ngx.var.pid) then
-                ngx.say("worker pid is wrong.")
-            else
-                ngx.say("worker pid is correct.")
-            end
-        ';
-    }
---- request
-GET /lua
---- response_body_like
-worker pid: \d+
-worker pid is correct\.
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/123-lua-path.t b/debian/modules/http-lua/t/123-lua-path.t
deleted file mode 100644
index 23681a9..0000000
--- a/debian/modules/http-lua/t/123-lua-path.t
+++ /dev/null
@@ -1,70 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 3 + 1);
-
-$ENV{LUA_PATH} = "/foo/bar/baz";
-$ENV{LUA_CPATH} = "/baz/bar/foo";
-#no_diff();
-#no_long_string();
-master_on();
-no_shuffle();
-check_accum_error_log();
-run_tests();
-
-__DATA__
-
-=== TEST 1: LUA_PATH & LUA_CPATH env (code cache on)
---- main_config
-env LUA_PATH;
-env LUA_CPATH;
-
---- config
-    location /lua {
-        content_by_lua '
-            ngx.say(package.path)
-            ngx.say(package.cpath)
-        ';
-    }
---- request
-GET /lua
---- response_body
-/foo/bar/baz
-/baz/bar/foo
-
---- no_error_log
-[error]
-
-
-
-=== TEST 2: LUA_PATH & LUA_CPATH env (code cache off)
---- main_config
-env LUA_PATH;
-env LUA_CPATH;
-
---- config
-    lua_code_cache off;
-    location /lua {
-        content_by_lua '
-            ngx.say(package.path)
-            ngx.say(package.cpath)
-        ';
-    }
---- request
-GET /lua
---- response_body
-/foo/bar/baz
-/baz/bar/foo
-
---- no_error_log
-[error]
---- error_log eval
-qr/\[alert\] .*? lua_code_cache is off/
diff --git a/debian/modules/http-lua/t/124-init-worker.t b/debian/modules/http-lua/t/124-init-worker.t
deleted file mode 100644
index 9b2a91f..0000000
--- a/debian/modules/http-lua/t/124-init-worker.t
+++ /dev/null
@@ -1,955 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 4 + 4);
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
-
-our $ServerRoot = server_root();
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: set a global lua var
---- http_config
-    init_worker_by_lua '
-        foo = ngx.md5("hello world")
-    ';
---- config
-    location /t {
-        content_by_lua '
-            ngx.say("foo = ", foo)
-        ';
-    }
---- request
-    GET /t
---- response_body
-foo = 5eb63bbbe01eeed093cb22bb8f5acdc3
---- no_error_log
-[error]
-
-
-
-=== TEST 2: no ngx.say()
---- http_config
-    init_worker_by_lua '
-        ngx.say("hello")
-    ';
---- config
-    location /t {
-        content_by_lua '
-            ngx.say("foo = ", foo)
-        ';
-    }
---- request
-    GET /t
---- response_body
-foo = nil
---- error_log
-API disabled in the context of init_worker_by_lua*
-
-
-
-=== TEST 3: timer.at
---- http_config
-    init_worker_by_lua '
-        _G.my_counter = 0
-        local function warn(...)
-            ngx.log(ngx.WARN, ...)
-        end
-        local function handler(premature)
-            warn("timer expired (premature: ", premature, "; counter: ",
-                 _G.my_counter, ")")
-            _G.my_counter = _G.my_counter + 1
-        end
-        local ok, err = ngx.timer.at(0, handler)
-        if not ok then
-            ngx.log(ngx.ERR, "failed to create timer: ", err)
-        end
-        warn("created timer: ", ok)
-    ';
---- config
-    location /t {
-        content_by_lua '
-            -- ngx.sleep(0.001)
-            ngx.say("my_counter = ", _G.my_counter)
-            _G.my_counter = _G.my_counter + 1
-        ';
-    }
---- request
-    GET /t
---- response_body
-my_counter = 1
---- grep_error_log eval: qr/warn\(\): [^,]*/
---- grep_error_log_out
-warn(): created timer: 1
-warn(): timer expired (premature: false; counter: 0)
-
---- no_error_log
-[error]
-
-
-
-=== TEST 4: timer.at + cosocket
---- http_config
-    init_worker_by_lua '
-        _G.done = false
-        local function warn(...)
-            ngx.log(ngx.WARN, ...)
-        end
-        local function error(...)
-            ngx.log(ngx.ERR, ...)
-        end
-        local function handler(premature)
-            warn("timer expired (premature: ", premature, ")")
-
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-            if not ok then
-                error("failed to connect: ", err)
-                _G.done = true
-                return
-            end
-
-            local req = "flush_all\\r\\n"
-
-            local bytes, err = sock:send(req)
-            if not bytes then
-                error("failed to send request: ", err)
-                _G.done = true
-                return
-            end
-
-            warn("request sent: ", bytes)
-
-            local line, err, part = sock:receive()
-            if line then
-                warn("received: ", line)
-            else
-                error("failed to receive a line: ", err, " [", part, "]")
-            end
-            _G.done = true
-        end
-
-        local ok, err = ngx.timer.at(0, handler)
-        if not ok then
-            error("failed to create timer: ", err)
-        end
-        warn("created timer: ", ok)
-    ';
---- config
-    location = /t {
-        content_by_lua '
-            local waited = 0
-            local sleep = ngx.sleep
-            while not _G.done do
-                local delay = 0.001
-                sleep(delay)
-                waited = waited + delay
-                if waited > 1 then
-                    ngx.say("timed out")
-                    return
-                end
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-    GET /t
---- response_body
-ok
---- grep_error_log eval: qr/warn\(\): [^,]*/
---- grep_error_log_out
-warn(): created timer: 1
-warn(): timer expired (premature: false)
-warn(): request sent: 11
-warn(): received: OK
-
---- log_level: debug
---- error_log
-lua tcp socket connect timeout: 60000
-lua tcp socket send timeout: 60000
-lua tcp socket read timeout: 60000
---- no_error_log
-[error]
-
-
-
-=== TEST 5: init_worker_by_lua_file (simple global var)
---- http_config
-    init_worker_by_lua_file html/foo.lua;
---- config
-    location /t {
-        content_by_lua '
-            ngx.say("foo = ", foo)
-        ';
-    }
---- user_files
->>> foo.lua
-foo = ngx.md5("hello world")
---- request
-    GET /t
---- response_body
-foo = 5eb63bbbe01eeed093cb22bb8f5acdc3
---- no_error_log
-[error]
-
-
-
-=== TEST 6: timer.at + cosocket (by_lua_file)
---- main_config
-env TEST_NGINX_MEMCACHED_PORT;
---- http_config
-    init_worker_by_lua_file html/foo.lua;
---- user_files
->>> foo.lua
-_G.done = false
-local function warn(...)
-    ngx.log(ngx.WARN, ...)
-end
-local function error(...)
-    ngx.log(ngx.ERR, ...)
-end
-local function handler(premature)
-    warn("timer expired (premature: ", premature, ")")
-
-    local sock = ngx.socket.tcp()
-    local ok, err = sock:connect("127.0.0.1",
-                                 os.getenv("TEST_NGINX_MEMCACHED_PORT"))
-    if not ok then
-        error("failed to connect: ", err)
-        _G.done = true
-        return
-    end
-
-    local req = "flush_all\r\n"
-
-    local bytes, err = sock:send(req)
-    if not bytes then
-        error("failed to send request: ", err)
-        _G.done = true
-        return
-    end
-
-    warn("request sent: ", bytes)
-
-    local line, err, part = sock:receive()
-    if line then
-        warn("received: ", line)
-    else
-        error("failed to receive a line: ", err, " [", part, "]")
-    end
-    _G.done = true
-end
-
-local ok, err = ngx.timer.at(0, handler)
-if not ok then
-    error("failed to create timer: ", err)
-end
-warn("created timer: ", ok)
-
---- config
-    location = /t {
-        content_by_lua '
-            local waited = 0
-            local sleep = ngx.sleep
-            while not _G.done do
-                local delay = 0.001
-                sleep(delay)
-                waited = waited + delay
-                if waited > 1 then
-                    ngx.say("timed out")
-                    return
-                end
-            end
-            ngx.say("ok")
-        ';
-    }
---- request
-    GET /t
---- response_body
-ok
---- grep_error_log eval: qr/warn\(\): [^,]*/
---- grep_error_log_out
-warn(): created timer: 1
-warn(): timer expired (premature: false)
-warn(): request sent: 11
-warn(): received: OK
-
---- log_level: debug
---- error_log
-lua tcp socket connect timeout: 60000
-lua tcp socket send timeout: 60000
-lua tcp socket read timeout: 60000
---- no_error_log
-[error]
-
-
-
-=== TEST 7: ngx.ctx
---- http_config
-    init_worker_by_lua '
-        ngx.ctx.foo = "hello world"
-        local function warn(...)
-            ngx.log(ngx.WARN, ...)
-        end
-        warn("foo = ", ngx.ctx.foo)
-    ';
---- config
-    location /t {
-        echo ok;
-    }
---- request
-    GET /t
---- response_body
-ok
---- grep_error_log eval: qr/warn\(\): [^,]*/
---- grep_error_log_out
-warn(): foo = hello world
---- no_error_log
-[error]
-
-
-
-=== TEST 8: print
---- http_config
-    init_worker_by_lua '
-        print("md5 = ", ngx.md5("hello world"))
-    ';
---- config
-    location /t {
-        echo ok;
-    }
---- request
-    GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- error_log
-md5 = 5eb63bbbe01eeed093cb22bb8f5acdc3
-
-
-
-=== TEST 9: unescape_uri
---- http_config
-    init_worker_by_lua '
-        local function warn(...)
-            ngx.log(ngx.WARN, ...)
-        end
-
-        warn(ngx.unescape_uri("hello%20world"))
-    ';
---- config
-    location /t {
-        echo ok;
-    }
---- request
-    GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/warn\(\): [^,]*/
---- grep_error_log_out
-warn(): hello world
-
-
-
-=== TEST 10: escape_uri
---- http_config
-    init_worker_by_lua '
-        local function warn(...)
-            ngx.log(ngx.WARN, ...)
-        end
-
-        warn(ngx.escape_uri("hello world"))
-    ';
---- config
-    location /t {
-        echo ok;
-    }
---- request
-    GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/warn\(\): [^,]*/
---- grep_error_log_out
-warn(): hello%20world
-
-
-
-=== TEST 11: ngx.re
---- http_config
-    init_worker_by_lua '
-        local function warn(...)
-            ngx.log(ngx.WARN, ...)
-        end
-
-        warn((ngx.re.sub("hello world", "world", "XXX", "jo")))
-    ';
---- config
-    location /t {
-        echo ok;
-    }
---- request
-    GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/warn\(\): [^,]*/
---- grep_error_log_out
-warn(): hello XXX
-
-
-
-=== TEST 12: ngx.http_time
---- http_config
-    init_worker_by_lua '
-        local function warn(...)
-            ngx.log(ngx.WARN, ...)
-        end
-
-        warn(ngx.http_time(5678))
-    ';
---- config
-    location /t {
-        echo ok;
-    }
---- request
-    GET /t
---- response_body
-ok
---- no_error_log
-[error]
---- grep_error_log eval: qr/warn\(\): .*?(?=, context)/
---- grep_error_log_out
-warn(): Thu, 01 Jan 1970 01:34:38 GMT
-
-
-
-=== TEST 13: cosocket with resolver
---- timeout: 10
---- http_config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    init_worker_by_lua '
-        -- global
-        logs = ""
-        done = false
-        local function say(...)
-            logs = logs .. table.concat({...}) .. "\\n"
-        end
-
-        local function handler()
-            local sock = ngx.socket.tcp()
-            local port = 80
-            local ok, err = sock:connect("agentzh.org", port)
-            if not ok then
-                say("failed to connect: ", err)
-                done = true
-                return
-            end
-
-            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
-                say("failed to send request: ", err)
-                done = true
-                return
-            end
-
-            say("request sent: ", bytes)
-
-            local line, err = sock:receive()
-            if line then
-                say("first line received: ", line)
-
-            else
-                say("failed to receive the first line: ", err)
-            end
-
-            line, err = sock:receive()
-            if line then
-                say("second line received: ", line)
-
-            else
-                say("failed to receive the second line: ", err)
-            end
-
-            done = true
-        end
-
-        local ok, err = ngx.timer.at(0, handler)
-        if not ok then
-            say("failed to create timer: ", err)
-        else
-            say("timer created")
-        end
-    ';
-
---- config
-    location = /t {
-        content_by_lua '
-            local i = 0
-            while not done and i < 3000 do
-                ngx.sleep(0.001)
-                i = i + 1
-            end
-            ngx.print(logs)
-        ';
-    }
---- request
-GET /t
---- response_body
-timer created
-connected: 1
-request sent: 56
-first line received: HTTP/1.1 200 OK
-second line received: Server: openresty
---- no_error_log
-[error]
---- timeout: 10
-
-
-
-=== TEST 14: connection refused (tcp) - log_errors on by default
---- http_config
-    init_worker_by_lua '
-        logs = ""
-        done = false
-        local function say(...)
-            logs = logs .. table.concat{...} .. "\\n"
-        end
-
-        local function handler()
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", 16787)
-            if not ok then
-                say("failed to connect: ", err)
-            else
-                say("connect: ", ok, " ", err)
-            end
-        end
-
-        local ok, err = ngx.timer.at(0, handler)
-        if not ok then
-            say("failed to create timer: ", err)
-        else
-            say("timer created")
-        end
-    ';
-
---- config
-    location = /t {
-        content_by_lua '
-            local i = 0
-            while not done and i < 1000 do
-                ngx.sleep(0.001)
-                i = i + 1
-            end
-            ngx.print(logs)
-        ';
-    }
-
---- request
-    GET /t
---- response_body
-timer created
-failed to connect: connection refused
---- error_log eval
-qr/connect\(\) failed \(\d+: Connection refused\), context: ngx\.timer$/
-
-
-
-=== TEST 15: connection refused (tcp) - log_errors explicitly on
---- http_config
-    lua_socket_log_errors on;
-    init_worker_by_lua '
-        logs = ""
-        done = false
-        local function say(...)
-            logs = logs .. table.concat{...} .. "\\n"
-        end
-
-        local function handler()
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", 16787)
-            if not ok then
-                say("failed to connect: ", err)
-            else
-                say("connect: ", ok, " ", err)
-            end
-        end
-
-        local ok, err = ngx.timer.at(0, handler)
-        if not ok then
-            say("failed to create timer: ", err)
-        else
-            say("timer created")
-        end
-    ';
-
---- config
-    location = /t {
-        content_by_lua '
-            local i = 0
-            while not done and i < 1000 do
-                ngx.sleep(0.001)
-                i = i + 1
-            end
-            ngx.print(logs)
-        ';
-    }
-
---- request
-    GET /t
---- response_body
-timer created
-failed to connect: connection refused
---- error_log eval
-qr/connect\(\) failed \(\d+: Connection refused\)/
-
-
-
-=== TEST 16: connection refused (tcp) - log_errors explicitly off
---- http_config
-    lua_socket_log_errors off;
-    init_worker_by_lua '
-        logs = ""
-        done = false
-        local function say(...)
-            logs = logs .. table.concat{...} .. "\\n"
-        end
-
-        local function handler()
-            local sock = ngx.socket.tcp()
-            local ok, err = sock:connect("127.0.0.1", 16787)
-            if not ok then
-                say("failed to connect: ", err)
-            else
-                say("connect: ", ok, " ", err)
-            end
-        end
-
-        local ok, err = ngx.timer.at(0, handler)
-        if not ok then
-            say("failed to create timer: ", err)
-        else
-            say("timer created")
-        end
-    ';
-
---- config
-    location = /t {
-        content_by_lua '
-            local i = 0
-            while not done and i < 1000 do
-                ngx.sleep(0.001)
-                i = i + 1
-            end
-            ngx.print(logs)
-        ';
-    }
-
---- request
-    GET /t
---- response_body
-timer created
-failed to connect: connection refused
---- no_error_log eval
-[
-'qr/connect\(\) failed \(\d+: Connection refused\)/',
-'[error]',
-]
-
-
-
-=== TEST 17: init_by_lua + proxy_temp_path which has side effects in cf->cycle->paths
---- http_config eval
-qq{
-    proxy_temp_path $::ServerRoot/proxy_temp;
-    init_worker_by_lua '
-        local a = 2 + 3
-    ';
-}
---- config
-    location /t {
-        echo ok;
-    }
---- request
-    GET /t
---- response_body
-ok
---- no_error_log
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 18: syslog error log
---- http_config
-    #error_log syslog:server=127.0.0.1:12345 error;
-    init_worker_by_lua '
-        done = false
-        os.execute("sleep 0.1")
-        ngx.log(ngx.ERR, "Bad bad bad")
-        done = true
-    ';
---- config
-    location /t {
-        content_by_lua '
-            while not done do
-                ngx.sleep(0.001)
-            end
-            ngx.say("ok")
-        ';
-    }
---- log_level: error
---- error_log_file: syslog:server=127.0.0.1:12345
---- udp_listen: 12345
---- udp_query eval: qr/Bad bad bad/
---- udp_reply: hello
---- wait: 0.1
---- request
-    GET /t
---- response_body
-ok
---- error_log
-Bad bad bad
---- skip_nginx: 4: < 1.7.1
-
-
-
-=== TEST 19: fake module calls ngx_http_conf_get_module_srv_conf in its merge_srv_conf callback (GitHub issue #554)
-This also affects merge_loc_conf
---- http_config
-    init_worker_by_lua return;
---- config
-    location = /t {
-        return 200 ok;
-    }
---- request
-GET /t
---- response_body chomp
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 20: destroy Lua VM in cache processes (without privileged agent or shdict)
---- http_config
-    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
-
-    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
-
-    #lua_shared_dict dummy 500k;
-
-    init_by_lua_block {
-        require "resty.core.regex"
-        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
-        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
-    }
-
---- config
-    location = /t {
-        return 200;
-    }
---- request
-    GET /t
---- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
---- grep_error_log_out eval
-qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \1
-lua close the global Lua VM \1 in the cache helper process \d+
-lua close the global Lua VM \1
-|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \2 in the cache helper process \d+
-lua close the global Lua VM \2
-lua close the global Lua VM \2
-)(?:lua close the global Lua VM [0-9A-F]+
-)*\z/
---- no_error_log
-[error]
-start privileged agent process
-
-
-
-=== TEST 21: destroy Lua VM in cache processes (without privileged agent but with shdict)
---- http_config
-    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
-
-    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
-
-    lua_shared_dict dummy 500k;
-
-    init_by_lua_block {
-        require "resty.core.regex"
-        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
-        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
-    }
-
---- config
-    location = /t {
-        return 200;
-    }
---- request
-    GET /t
---- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
---- grep_error_log_out eval
-qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \1
-lua close the global Lua VM \1 in the cache helper process \d+
-lua close the global Lua VM \1
-|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \2 in the cache helper process \d+
-lua close the global Lua VM \2
-lua close the global Lua VM \2
-)(?:lua close the global Lua VM [0-9A-F]+
-)*\z/
---- no_error_log
-[error]
-start privileged agent process
-
-
-
-=== TEST 22: destroy Lua VM in cache processes (with privileged agent)
---- http_config
-    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
-
-    #lua_shared_dict dogs 1m;
-
-    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
-
-    init_by_lua_block {
-        assert(require "ngx.process".enable_privileged_agent())
-        require "resty.core.regex"
-        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
-        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
-    }
-
---- config
-    location = /t {
-        return 200;
-    }
---- request
-    GET /t
---- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
---- grep_error_log_out eval
-qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \1
-lua close the global Lua VM \1 in the cache helper process \d+
-lua close the global Lua VM \1
-|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \2 in the cache helper process \d+
-lua close the global Lua VM \2
-lua close the global Lua VM \2
-)(?:lua close the global Lua VM [0-9A-F]+
-)*\z/
---- error_log eval
-qr/start privileged agent process \d+/
---- no_error_log
-[error]
-
-
-
-=== TEST 23: destroy Lua VM in cache processes (with init worker and privileged agent)
---- http_config
-    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
-
-    #lua_shared_dict dogs 1m;
-
-    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
-
-    init_by_lua_block {
-        assert(require "ngx.process".enable_privileged_agent())
-        require "resty.core.regex"
-        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
-        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
-    }
-
-    init_worker_by_lua_block {
-        ngx.log(ngx.WARN, "hello from init worker by lua")
-    }
-
---- config
-    location = /t {
-        return 200;
-    }
---- request
-    GET /t
---- grep_error_log eval: qr/hello from init worker by lua/
---- grep_error_log_out
-hello from init worker by lua
-hello from init worker by lua
-
---- error_log eval
-[
-qr/start privileged agent process \d+$/,
-qr/lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+$/,
-qr/lua close the global Lua VM ([0-9A-F]+)$/,
-]
---- no_error_log
-[error]
-
-
-
-=== TEST 24: destroy Lua VM in cache processes (with init worker but without privileged agent)
---- http_config
-    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
-
-    #lua_shared_dict dogs 1m;
-
-    proxy_cache_path /tmp/cache levels=1:2 keys_zone=cache:1m;
-
-    init_by_lua_block {
-        require "resty.core.regex"
-        assert(ngx.re.match("hello, world", [[hello, \w+]], "joi"))
-        assert(ngx.re.match("hi, world", [[hi, \w+]], "ji"))
-    }
-
-    init_worker_by_lua_block {
-        ngx.log(ngx.WARN, "hello from init worker by lua")
-    }
-
---- config
-    location = /t {
-        return 200;
-    }
---- request
-    GET /t
-
---- grep_error_log eval: qr/hello from init worker by lua/
---- grep_error_log_out
-hello from init worker by lua
-
---- error_log eval
-[
-qr/lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+$/,
-qr/lua close the global Lua VM ([0-9A-F]+)$/,
-]
---- no_error_log
-[error]
-start privileged agent process
diff --git a/debian/modules/http-lua/t/125-configure-args.t b/debian/modules/http-lua/t/125-configure-args.t
deleted file mode 100644
index 4160d4e..0000000
--- a/debian/modules/http-lua/t/125-configure-args.t
+++ /dev/null
@@ -1,31 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: nginx configure
---- config
-    location /configure_args {
-        content_by_lua '
-            ngx.say(ngx.config.nginx_configure())
-        ';
-    }
---- request
-GET /configure_args
---- response_body_like chop
-^\s*\-\-[^-]+
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/126-shdict-frag.t b/debian/modules/http-lua/t/126-shdict-frag.t
deleted file mode 100644
index 5a2aff8..0000000
--- a/debian/modules/http-lua/t/126-shdict-frag.t
+++ /dev/null
@@ -1,1266 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-#repeat_each(2);
-
-plan tests => repeat_each() * 39;
-
-#no_diff();
-no_long_string();
-#master_on();
-#workers(2);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: merge 2 single-page free blocks (forcibly evicted, merge forward)
---- http_config
-    lua_shared_dict dogs 20k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-
-            local function check_key(key)
-                local res, err = dogs:get(key)
-                if res then
-                    ngx.say("found ", key, ": ", #res)
-                else
-                    if not err then
-                        ngx.say(key, " not found")
-                    else
-                        ngx.say("failed to fetch key: ", err)
-                    end
-                end
-            end
-
-            local function set_key(key, value)
-                local ok, err, force = dogs:set(key, value)
-                if ok then
-                    ngx.print("successfully set ", key)
-                    if force then
-                        ngx.say(" with force.")
-                    else
-                        ngx.say(".")
-                    end
-                else
-                    ngx.say("failed to set ", key, ": ", err)
-                end
-            end
-
-            for i = 1, 2 do
-                set_key("foo", string.rep("a", 4000))
-                set_key("bar", string.rep("b", 4001))
-                set_key("baz", string.rep("c", 8102))
-
-                check_key("foo")
-                check_key("bar")
-                check_key("baz")
-            end
-
-            collectgarbage()
-        ';
-    }
---- request
-GET /test
---- stap
-global first_time = 1
-global active = 1
-
-F(ngx_http_lua_shdict_init_zone) {
-    active = 0
-}
-
-F(ngx_http_lua_shdict_init_zone).return {
-    active = 1
-}
-
-F(ngx_slab_alloc_pages) {
-    if (first_time) {
-        printf("total pages: %d\n", $pool->pages->slab)
-        first_time = 0
-    }
-    if (active) {
-        printf("alloc pages: %d", $pages)
-        //print_ubacktrace()
-    } else {
-        printf("init zone alloc pages: %d", $pages)
-    }
-}
-
-F(ngx_slab_alloc_pages).return {
-    if ($return) {
-        printf(" ok\n")
-
-    } else {
-        printf(" NOT OK\n")
-    }
-}
-
-F(ngx_slab_free_pages) {
-    printf("free pages: %d\n", $pages)
-}
-
---- stap_out
-total pages: 4
-init zone alloc pages: 1 ok
-init zone alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 ok
-alloc pages: 1 NOT OK
-free pages: 2
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 ok
-
---- response_body
-successfully set foo.
-successfully set bar.
-successfully set baz with force.
-foo not found
-bar not found
-found baz: 8102
-successfully set foo with force.
-successfully set bar.
-successfully set baz with force.
-foo not found
-bar not found
-found baz: 8102
-
---- no_error_log
-[error]
-
-
-
-=== TEST 2: merge 2 single-page free slabs (forcibly evicted, merge backward)
---- http_config
-    lua_shared_dict dogs 20k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-
-            local function check_key(key)
-                local res, err = dogs:get(key)
-                if res then
-                    ngx.say("found ", key, ": ", #res)
-                else
-                    if not err then
-                        ngx.say(key, " not found")
-                    else
-                        ngx.say("failed to fetch key: ", err)
-                    end
-                end
-            end
-
-            local function set_key(key, value)
-                local ok, err, force = dogs:set(key, value)
-                if ok then
-                    ngx.print("successfully set ", key)
-                    if force then
-                        ngx.say(" with force.")
-                    else
-                        ngx.say(".")
-                    end
-                else
-                    ngx.say("failed to set ", key, ": ", err)
-                end
-            end
-
-            for i = 1, 2 do
-                set_key("foo", string.rep("a", 4000))
-                set_key("bar", string.rep("b", 4001))
-                check_key("foo")
-                set_key("baz", string.rep("c", 8102))
-
-                check_key("foo")
-                check_key("bar")
-                check_key("baz")
-            end
-
-            collectgarbage()
-        ';
-    }
---- request
-GET /test
---- stap
-global first_time = 1
-global active = 1
-
-F(ngx_http_lua_shdict_init_zone) {
-    active = 0
-}
-
-F(ngx_http_lua_shdict_init_zone).return {
-    active = 1
-}
-
-F(ngx_slab_alloc_pages) {
-    if (first_time) {
-        printf("total pages: %d\n", $pool->pages->slab)
-        first_time = 0
-    }
-    if (active) {
-        printf("alloc pages: %d", $pages)
-        //print_ubacktrace()
-    } else {
-        printf("init zone alloc pages: %d", $pages)
-    }
-}
-
-F(ngx_slab_alloc_pages).return {
-    if ($return) {
-        printf(" ok\n")
-
-    } else {
-        printf(" NOT OK\n")
-    }
-}
-
-F(ngx_slab_free_pages) {
-    printf("free pages: %d\n", $pages)
-}
-
---- stap_out
-total pages: 4
-init zone alloc pages: 1 ok
-init zone alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 ok
-alloc pages: 1 NOT OK
-free pages: 2
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 ok
-
---- response_body
-successfully set foo.
-successfully set bar.
-found foo: 4000
-successfully set baz with force.
-foo not found
-bar not found
-found baz: 8102
-successfully set foo with force.
-successfully set bar.
-found foo: 4000
-successfully set baz with force.
-foo not found
-bar not found
-found baz: 8102
-
---- no_error_log
-[error]
-
-
-
-=== TEST 3: merge 3 single-page free slabs (actively deleted, merge backward AND forward)
---- http_config
-    lua_shared_dict dogs 25k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-
-            local function check_key(key)
-                local res, err = dogs:get(key)
-                if res then
-                    ngx.say("found ", key, ": ", #res)
-                else
-                    if not err then
-                        ngx.say(key, " not found")
-                    else
-                        ngx.say("failed to fetch key: ", err)
-                    end
-                end
-            end
-
-            local function set_key(key, value)
-                local ok, err, force = dogs:set(key, value)
-                if ok then
-                    ngx.print("successfully set ", key)
-                    if force then
-                        ngx.say(" with force.")
-                    else
-                        ngx.say(".")
-                    end
-                else
-                    ngx.say("failed to set ", key, ": ", err)
-                end
-            end
-
-            local function safe_set_key(key, value)
-                local ok, err = dogs:safe_set(key, value)
-                if ok then
-                    ngx.say("successfully safe set ", key)
-                else
-                    ngx.say("failed to safe set ", key, ": ", err)
-                end
-            end
-
-            for i = 1, 2 do
-                set_key("foo", string.rep("a", 4000))
-                set_key("bar", string.rep("b", 4001))
-                set_key("baz", string.rep("c", 4002))
-
-                check_key("foo")
-                check_key("bar")
-                check_key("baz")
-
-                dogs:delete("foo")
-                safe_set_key("blah", string.rep("a", 8100))
-                dogs:delete("baz")
-                safe_set_key("blah", string.rep("a", 8100))
-                dogs:delete("bar")
-                safe_set_key("blah", string.rep("a", 12010))
-            end
-
-            collectgarbage()
-        ';
-    }
---- request
-GET /test
---- stap
-global first_time = 1
-global active = 1
-
-F(ngx_http_lua_shdict_init_zone) {
-    active = 0
-}
-
-F(ngx_http_lua_shdict_init_zone).return {
-    active = 1
-}
-
-F(ngx_slab_alloc_pages) {
-    if (first_time) {
-        printf("total pages: %d\n", $pool->pages->slab)
-        first_time = 0
-    }
-    if (active) {
-        printf("alloc pages: %d", $pages)
-        //print_ubacktrace()
-    } else {
-        printf("init zone alloc pages: %d", $pages)
-    }
-}
-
-F(ngx_slab_alloc_pages).return {
-    if ($return) {
-        printf(" ok\n")
-
-    } else {
-        printf(" NOT OK\n")
-    }
-}
-
-F(ngx_slab_free_pages) {
-    printf("free pages: %d\n", $pages)
-}
-
---- stap_out
-total pages: 5
-init zone alloc pages: 1 ok
-init zone alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 3 ok
-alloc pages: 1 NOT OK
-free pages: 3
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 3 ok
-
---- response_body
-successfully set foo.
-successfully set bar.
-successfully set baz.
-found foo: 4000
-found bar: 4001
-found baz: 4002
-failed to safe set blah: no memory
-failed to safe set blah: no memory
-successfully safe set blah
-successfully set foo with force.
-successfully set bar.
-successfully set baz.
-found foo: 4000
-found bar: 4001
-found baz: 4002
-failed to safe set blah: no memory
-failed to safe set blah: no memory
-successfully safe set blah
-
---- no_error_log
-[error]
-
-
-
-=== TEST 4: merge one single-page block backward, but no more
---- http_config
-    lua_shared_dict dogs 25k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-
-            local function check_key(key)
-                local res, err = dogs:get(key)
-                if res then
-                    ngx.say("found ", key, ": ", #res)
-                else
-                    if not err then
-                        ngx.say(key, " not found")
-                    else
-                        ngx.say("failed to fetch key: ", err)
-                    end
-                end
-            end
-
-            local function set_key(key, value)
-                local ok, err, force = dogs:set(key, value)
-                if ok then
-                    ngx.print("successfully set ", key)
-                    if force then
-                        ngx.say(" with force.")
-                    else
-                        ngx.say(".")
-                    end
-                else
-                    ngx.say("failed to set ", key, ": ", err)
-                end
-            end
-
-            local function safe_set_key(key, value)
-                local ok, err = dogs:safe_set(key, value)
-                if ok then
-                    ngx.say("successfully safe set ", key)
-                else
-                    ngx.say("failed to safe set ", key, ": ", err)
-                end
-            end
-
-            for i = 1, 1 do
-                set_key("foo", string.rep("a", 4000))
-                set_key("bar", string.rep("b", 4001))
-                set_key("baz", string.rep("c", 4002))
-
-                check_key("foo")
-                check_key("bar")
-                check_key("baz")
-
-                dogs:delete("bar")
-                safe_set_key("blah", string.rep("a", 8100))
-                dogs:delete("baz")
-                safe_set_key("blah", string.rep("a", 8100))
-                check_key("foo")
-                dogs:delete("foo")
-                check_key("blah")
-            end
-
-            collectgarbage()
-        ';
-    }
---- request
-GET /test
---- stap
-global first_time = 1
-global active = 1
-
-F(ngx_http_lua_shdict_init_zone) {
-    active = 0
-}
-
-F(ngx_http_lua_shdict_init_zone).return {
-    active = 1
-}
-
-F(ngx_slab_alloc_pages) {
-    if (first_time) {
-        printf("total pages: %d\n", $pool->pages->slab)
-        first_time = 0
-    }
-    if (active) {
-        printf("alloc pages: %d", $pages)
-        //print_ubacktrace()
-    } else {
-        printf("init zone alloc pages: %d", $pages)
-    }
-}
-
-F(ngx_slab_alloc_pages).return {
-    if ($return) {
-        printf(" ok\n")
-
-    } else {
-        printf(" NOT OK\n")
-    }
-}
-
-F(ngx_slab_free_pages) {
-    printf("free pages: %d\n", $pages)
-}
-
---- stap_out
-total pages: 5
-init zone alloc pages: 1 ok
-init zone alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 ok
-free pages: 1
-
---- response_body
-successfully set foo.
-successfully set bar.
-successfully set baz.
-found foo: 4000
-found bar: 4001
-found baz: 4002
-failed to safe set blah: no memory
-successfully safe set blah
-found foo: 4000
-found blah: 8100
-
---- no_error_log
-[error]
-
-
-
-=== TEST 5: merge one single-page block forward, but no more
---- http_config
-    lua_shared_dict dogs 25k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-
-            local function check_key(key)
-                local res, err = dogs:get(key)
-                if res then
-                    ngx.say("found ", key, ": ", #res)
-                else
-                    if not err then
-                        ngx.say(key, " not found")
-                    else
-                        ngx.say("failed to fetch key: ", err)
-                    end
-                end
-            end
-
-            local function set_key(key, value)
-                local ok, err, force = dogs:set(key, value)
-                if ok then
-                    ngx.print("successfully set ", key)
-                    if force then
-                        ngx.say(" with force.")
-                    else
-                        ngx.say(".")
-                    end
-                else
-                    ngx.say("failed to set ", key, ": ", err)
-                end
-            end
-
-            local function safe_set_key(key, value)
-                local ok, err = dogs:safe_set(key, value)
-                if ok then
-                    ngx.say("successfully safe set ", key)
-                else
-                    ngx.say("failed to safe set ", key, ": ", err)
-                end
-            end
-
-            for i = 1, 1 do
-                set_key("foo", string.rep("a", 4000))
-                set_key("bar", string.rep("b", 4001))
-                set_key("baz", string.rep("c", 4002))
-
-                check_key("foo")
-                check_key("bar")
-                check_key("baz")
-
-                dogs:delete("bar")
-                safe_set_key("blah", string.rep("a", 8100))
-                dogs:delete("foo")
-                safe_set_key("blah", string.rep("a", 8100))
-                check_key("baz")
-                dogs:delete("baz")
-                check_key("blah")
-            end
-
-            collectgarbage()
-        ';
-    }
---- request
-GET /test
---- stap
-global first_time = 1
-global active = 1
-
-F(ngx_http_lua_shdict_init_zone) {
-    active = 0
-}
-
-F(ngx_http_lua_shdict_init_zone).return {
-    active = 1
-}
-
-F(ngx_slab_alloc_pages) {
-    if (first_time) {
-        printf("total pages: %d\n", $pool->pages->slab)
-        first_time = 0
-    }
-    if (active) {
-        printf("alloc pages: %d", $pages)
-        //print_ubacktrace()
-    } else {
-        printf("init zone alloc pages: %d", $pages)
-    }
-}
-
-F(ngx_slab_alloc_pages).return {
-    if ($return) {
-        printf(" ok\n")
-
-    } else {
-        printf(" NOT OK\n")
-    }
-}
-
-F(ngx_slab_free_pages) {
-    printf("free pages: %d\n", $pages)
-}
-
---- stap_out
-total pages: 5
-init zone alloc pages: 1 ok
-init zone alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 ok
-free pages: 1
-
---- response_body
-successfully set foo.
-successfully set bar.
-successfully set baz.
-found foo: 4000
-found bar: 4001
-found baz: 4002
-failed to safe set blah: no memory
-successfully safe set blah
-found baz: 4002
-found blah: 8100
-
---- no_error_log
-[error]
-
-
-
-=== TEST 6: merge 2 multi-page blocks (forcibly evicted, merge backward)
---- http_config
-    lua_shared_dict dogs 30k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-
-            local function check_key(key)
-                local res, err = dogs:get(key)
-                if res then
-                    ngx.say("found ", key, ": ", #res)
-                else
-                    if not err then
-                        ngx.say(key, " not found")
-                    else
-                        ngx.say("failed to fetch key: ", err)
-                    end
-                end
-            end
-
-            local function set_key(key, value)
-                local ok, err, force = dogs:set(key, value)
-                if ok then
-                    ngx.print("successfully set ", key)
-                    if force then
-                        ngx.say(" with force.")
-                    else
-                        ngx.say(".")
-                    end
-                else
-                    ngx.say("failed to set ", key, ": ", err)
-                end
-            end
-
-            local function safe_set_key(key, value)
-                local ok, err = dogs:safe_set(key, value)
-                if ok then
-                    ngx.say("successfully safe set ", key)
-                else
-                    ngx.say("failed to safe set ", key, ": ", err)
-                end
-            end
-
-            for i = 1, 1 do
-                set_key("foo", string.rep("a", 8100))
-                set_key("bar", string.rep("b", 8101))
-                check_key("foo")
-                safe_set_key("baz", string.rep("c", 16300))
-                dogs:delete("foo")
-                check_key("bar")
-                dogs:delete("bar")
-                safe_set_key("baz", string.rep("c", 16300))
-
-                check_key("foo")
-                check_key("bar")
-                check_key("baz")
-            end
-
-            collectgarbage()
-        ';
-    }
---- request
-GET /test
---- stap
-global first_time = 1
-global active = 1
-
-F(ngx_http_lua_shdict_init_zone) {
-    active = 0
-}
-
-F(ngx_http_lua_shdict_init_zone).return {
-    active = 1
-}
-
-F(ngx_slab_alloc_pages) {
-    if (first_time) {
-        printf("total pages: %d\n", $pool->pages->slab)
-        first_time = 0
-    }
-    if (active) {
-        printf("alloc pages: %d", $pages)
-        //print_ubacktrace()
-    } else {
-        printf("init zone alloc pages: %d", $pages)
-    }
-}
-
-F(ngx_slab_alloc_pages).return {
-    if ($return) {
-        printf(" ok\n")
-
-    } else {
-        printf(" NOT OK\n")
-    }
-}
-
-F(ngx_slab_free_pages) {
-    printf("free pages: %d\n", $pages)
-}
-
---- stap_out
-total pages: 6
-init zone alloc pages: 1 ok
-init zone alloc pages: 1 ok
-alloc pages: 2 ok
-alloc pages: 2 ok
-alloc pages: 4 NOT OK
-free pages: 2
-free pages: 2
-alloc pages: 4 ok
-
---- response_body
-successfully set foo.
-successfully set bar.
-found foo: 8100
-failed to safe set baz: no memory
-found bar: 8101
-successfully safe set baz
-foo not found
-bar not found
-found baz: 16300
-
---- no_error_log
-[error]
-
-
-
-=== TEST 7: merge big slabs (less than max slab size) backward
---- http_config
-    lua_shared_dict dogs 20k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-
-            local function check_key(key)
-                local res, err = dogs:get(key)
-                if res then
-                    ngx.say("found ", key, ": ", #res)
-                else
-                    if not err then
-                        ngx.say(key, " not found")
-                    else
-                        ngx.say("failed to fetch key: ", err)
-                    end
-                end
-            end
-
-            local function set_key(key, value)
-                local ok, err, force = dogs:set(key, value)
-                if ok then
-                    ngx.print("successfully set ", key)
-                    if force then
-                        ngx.say(" with force.")
-                    else
-                        ngx.say(".")
-                    end
-                else
-                    ngx.say("failed to set ", key, ": ", err)
-                end
-            end
-
-            local function safe_set_key(key, value)
-                local ok, err = dogs:safe_set(key, value)
-                if ok then
-                    ngx.say("successfully safe set ", key)
-                else
-                    ngx.say("failed to safe set ", key, ": ", err)
-                end
-            end
-
-            for i = 1, 1 do
-                for j = 1, 50 do
-                    dogs:set("foo" .. j, string.rep("a", 5))
-                end
-                set_key("bar", string.rep("a", 4000))
-
-                for j = 1, 50 do
-                    dogs:delete("foo" .. j)
-                end
-
-                safe_set_key("baz", string.rep("b", 8100))
-                check_key("bar")
-
-                ngx.say("delete bar")
-                dogs:delete("bar")
-
-                safe_set_key("baz", string.rep("b", 8100))
-            end
-
-            collectgarbage()
-        ';
-    }
---- request
-GET /test
---- stap
-global first_time = 1
-global active = 1
-
-F(ngx_http_lua_shdict_init_zone) {
-    active = 0
-}
-
-F(ngx_http_lua_shdict_init_zone).return {
-    active = 1
-}
-
-F(ngx_slab_alloc_pages) {
-    if (first_time) {
-        //printf("slab max size: %d\n", @var("ngx_slab_max_size"))
-        printf("total pages: %d\n", $pool->pages->slab)
-        first_time = 0
-    }
-    if (active) {
-        printf("alloc pages: %d", $pages)
-        //print_ubacktrace()
-    } else {
-        printf("init zone alloc pages: %d", $pages)
-    }
-}
-
-F(ngx_slab_alloc_pages).return {
-    if ($return) {
-        printf(" ok\n")
-
-    } else {
-        printf(" NOT OK\n")
-    }
-}
-
-F(ngx_slab_free_pages) {
-    printf("free pages: %d\n", $pages)
-}
-
---- stap_out
-total pages: 4
-init zone alloc pages: 1 ok
-init zone alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-free pages: 1
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 ok
-
---- response_body
-successfully set bar.
-failed to safe set baz: no memory
-found bar: 4000
-delete bar
-successfully safe set baz
-
---- no_error_log
-[error]
-
-
-
-=== TEST 8: cannot merge in-used big slabs page (backward)
---- http_config
-    lua_shared_dict dogs 20k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-
-            local function check_key(key)
-                local res, err = dogs:get(key)
-                if res then
-                    ngx.say("found ", key, ": ", #res)
-                else
-                    if not err then
-                        ngx.say(key, " not found")
-                    else
-                        ngx.say("failed to fetch key: ", err)
-                    end
-                end
-            end
-
-            local function set_key(key, value)
-                local ok, err, force = dogs:set(key, value)
-                if ok then
-                    ngx.print("successfully set ", key)
-                    if force then
-                        ngx.say(" with force.")
-                    else
-                        ngx.say(".")
-                    end
-                else
-                    ngx.say("failed to set ", key, ": ", err)
-                end
-            end
-
-            local function safe_set_key(key, value)
-                local ok, err = dogs:safe_set(key, value)
-                if ok then
-                    ngx.say("successfully safe set ", key)
-                else
-                    ngx.say("failed to safe set ", key, ": ", err)
-                end
-            end
-
-            for i = 1, 1 do
-                for j = 1, 63 do
-                    dogs:set("foo" .. j, string.rep("a", 5))
-                end
-                set_key("bar", string.rep("a", 4000))
-
-                --[[
-                for j = 1, 50 do
-                    dogs:delete("foo" .. j)
-                end
-                ]]
-
-                safe_set_key("baz", string.rep("b", 8100))
-                check_key("bar")
-
-                ngx.say("delete bar")
-                dogs:delete("bar")
-
-                safe_set_key("baz", string.rep("b", 8100))
-            end
-
-            collectgarbage()
-        ';
-    }
---- request
-GET /test
---- stap
-global first_time = 1
-global active = 1
-
-F(ngx_http_lua_shdict_init_zone) {
-    active = 0
-}
-
-F(ngx_http_lua_shdict_init_zone).return {
-    active = 1
-}
-
-F(ngx_slab_alloc_pages) {
-    if (first_time) {
-        //printf("slab max size: %d\n", @var("ngx_slab_max_size"))
-        printf("total pages: %d\n", $pool->pages->slab)
-        first_time = 0
-    }
-    if (active) {
-        printf("alloc pages: %d", $pages)
-        //print_ubacktrace()
-    } else {
-        printf("init zone alloc pages: %d", $pages)
-    }
-}
-
-F(ngx_slab_alloc_pages).return {
-    if ($return) {
-        printf(" ok\n")
-
-    } else {
-        printf(" NOT OK\n")
-    }
-}
-
-F(ngx_slab_free_pages) {
-    printf("free pages: %d\n", $pages)
-}
-
---- stap_out
-total pages: 4
-init zone alloc pages: 1 ok
-init zone alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 NOT OK
-
---- response_body
-successfully set bar.
-failed to safe set baz: no memory
-found bar: 4000
-delete bar
-failed to safe set baz: no memory
-
---- no_error_log
-[error]
-
-
-
-=== TEST 9: cannot merge in-used big slabs page (forward)
---- http_config
-    lua_shared_dict dogs 20k;
---- config
-    location = /test {
-        content_by_lua '
-            local dogs = ngx.shared.dogs
-
-            local function check_key(key)
-                local res, err = dogs:get(key)
-                if res then
-                    ngx.say("found ", key, ": ", #res)
-                else
-                    if not err then
-                        ngx.say(key, " not found")
-                    else
-                        ngx.say("failed to fetch key: ", err)
-                    end
-                end
-            end
-
-            local function set_key(key, value)
-                local ok, err, force = dogs:set(key, value)
-                if ok then
-                    ngx.print("successfully set ", key)
-                    if force then
-                        ngx.say(" with force.")
-                    else
-                        ngx.say(".")
-                    end
-                else
-                    ngx.say("failed to set ", key, ": ", err)
-                end
-            end
-
-            local function safe_set_key(key, value)
-                local ok, err = dogs:safe_set(key, value)
-                if ok then
-                    ngx.say("successfully safe set ", key)
-                else
-                    ngx.say("failed to safe set ", key, ": ", err)
-                end
-            end
-
-            for i = 1, 1 do
-                set_key("bar", string.rep("a", 4000))
-                for j = 1, 50 do
-                    dogs:set("foo" .. j, string.rep("a", 5))
-                end
-
-                --[[
-                for j = 1, 50 do
-                    dogs:delete("foo" .. j)
-                end
-                ]]
-
-                safe_set_key("baz", string.rep("b", 8100))
-                check_key("bar")
-
-                ngx.say("delete bar")
-                dogs:delete("bar")
-
-                safe_set_key("baz", string.rep("b", 8100))
-            end
-
-            collectgarbage()
-        ';
-    }
---- request
-GET /test
---- stap
-global first_time = 1
-global active = 1
-
-F(ngx_http_lua_shdict_init_zone) {
-    active = 0
-}
-
-F(ngx_http_lua_shdict_init_zone).return {
-    active = 1
-}
-
-F(ngx_slab_alloc_pages) {
-    if (first_time) {
-        //printf("slab max size: %d\n", @var("ngx_slab_max_size"))
-        printf("total pages: %d\n", $pool->pages->slab)
-        first_time = 0
-    }
-    if (active) {
-        printf("alloc pages: %d", $pages)
-        //print_ubacktrace()
-    } else {
-        printf("init zone alloc pages: %d", $pages)
-    }
-}
-
-F(ngx_slab_alloc_pages).return {
-    if ($return) {
-        printf(" ok\n")
-
-    } else {
-        printf(" NOT OK\n")
-    }
-}
-
-F(ngx_slab_free_pages) {
-    printf("free pages: %d\n", $pages)
-}
-
---- stap_out
-total pages: 4
-init zone alloc pages: 1 ok
-init zone alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 1 ok
-alloc pages: 2 NOT OK
-free pages: 1
-alloc pages: 2 NOT OK
-
---- response_body
-successfully set bar.
-failed to safe set baz: no memory
-found bar: 4000
-delete bar
-failed to safe set baz: no memory
-
---- no_error_log
-[error]
-
-
-
-=== TEST 10: fuzz testing
---- http_config
-    lua_shared_dict dogs 200k;
---- config
-    location = /t {
-        content_by_lua '
-            local rand = math.random
-            local dogs = ngx.shared.dogs
-            local maxsz = 9000
-            local maxkeyidx = 30
-            local rep = string.rep
-
-            math.randomseed(ngx.time())
-            for i = 1, 30000 do
-                local key = "mylittlekey" .. rand(maxkeyidx)
-                local ok, err = dogs:get(key)
-                if not ok or rand() > 0.6 then
-                    sz = rand(maxsz)
-                    val = rep("a", sz)
-                    local ok, err, forcible = dogs:set(key, val)
-                    if err then
-                        ngx.log(ngx.ERR, "failed to set key: ", err)
-                        -- return
-                    end
-                    if forcible then
-                        -- error("forcible")
-                    end
-                end
-            end
-            ngx.say("ok")
-            collectgarbage()
-        ';
-    }
---- request
-GET /t
---- response_body
-ok
-
---- no_error_log
-[error]
---- timeout: 60
diff --git a/debian/modules/http-lua/t/127-uthread-kill.t b/debian/modules/http-lua/t/127-uthread-kill.t
deleted file mode 100644
index cc43c62..0000000
--- a/debian/modules/http-lua/t/127-uthread-kill.t
+++ /dev/null
@@ -1,507 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-use t::StapThread;
-
-our $GCScript = $t::StapThread::GCScript;
-our $StapScript = $t::StapThread::StapScript;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 5 + 2);
-
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
-
-#no_shuffle();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: kill pending sleep
---- config
-    location /lua {
-        content_by_lua '
-            function f()
-                ngx.say("hello from f()")
-                ngx.sleep(1)
-            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, err = ngx.thread.kill(t)
-            if not ok then
-                ngx.say("failed to kill thread: ", err)
-                return
-            end
-
-            ngx.say("killed")
-
-            local ok, err = ngx.thread.kill(t)
-            if not ok then
-                ngx.say("failed to kill thread: ", err)
-                return
-            end
-        ';
-    }
---- request
-GET /lua
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-spawn user thread 2 in 1
-delete thread 2
-terminate 1: ok
-delete thread 1
-
---- response_body
-hello from f()
-thread created: running
-killed
-failed to kill thread: already waited or killed
-
---- no_error_log
-[error]
---- error_log
-lua clean up the timer for pending ngx.sleep
-
-
-
-=== TEST 2: already waited
---- config
-    location /lua {
-        content_by_lua '
-            function f()
-                ngx.say("hello from f()")
-                ngx.sleep(0.001)
-                return 32
-            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 kill thread: ", res)
-                return
-            end
-
-            ngx.say("waited: ", res)
-
-            local ok, err = ngx.thread.kill(t)
-            if not ok then
-                ngx.say("failed to kill thread: ", err)
-                return
-            end
-        ';
-    }
---- 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 from f()
-thread created: running
-waited: 32
-failed to kill thread: already waited or killed
-
---- no_error_log
-[error]
-lua clean up the timer for pending ngx.sleep
-
-
-
-=== TEST 3: kill pending resolver
---- config
-    resolver agentzh.org:12345;
-    location /lua {
-        content_by_lua '
-            function f()
-                local sock = ngx.socket.tcp()
-                sock:connect("some.agentzh.org", 12345)
-            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, err = ngx.thread.kill(t)
-            if not ok then
-                ngx.say("failed to kill thread: ", err)
-                return
-            end
-
-            ngx.say("killed")
-        ';
-    }
---- request
-GET /lua
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-spawn user thread 2 in 1
-delete thread 2
-terminate 1: ok
-delete thread 1
-
---- response_body
-thread created: running
-killed
-
---- no_error_log
-[error]
---- error_log
-lua tcp socket abort resolver
-resolve name done: -2
-
-
-
-=== TEST 4: kill pending connect
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /lua {
-        content_by_lua '
-            local ready = false
-            function f()
-                local sock = ngx.socket.tcp()
-                sock:connect("agentzh.org", 80)
-                sock:close()
-                ready = true
-                sock:settimeout(10000)
-                sock:connect("agentzh.org", 12345)
-            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()
-
-            while not ready do
-                ngx.sleep(0.001)
-            end
-
-            local ok, err = ngx.thread.kill(t)
-            if not ok then
-                ngx.say("failed to kill thread: ", err)
-                return
-            end
-
-            ngx.say("killed")
-        ';
-    }
---- request
-GET /lua
---- stap2 eval: $::StapScript
---- stap eval: $::GCScript
---- stap_out
-create 2 in 1
-spawn user thread 2 in 1
-delete thread 2
-terminate 1: ok
-delete thread 1
-
---- response_body
-thread created: running
-killed
-
---- no_error_log
-[error]
-lua tcp socket abort resolver
---- grep_error_log: lua finalize socket
---- grep_error_log_out
-lua finalize socket
-lua finalize socket
-
---- error_log
-
-
-
-=== TEST 5: cannot kill a pending subrequest
---- config
-    location = /sub {
-        echo_sleep 0.3;
-        echo ok;
-    }
-
-    location = /t {
-        content_by_lua '
-            function f()
-                ngx.location.capture("/sub")
-            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, err = ngx.thread.kill(t)
-            if not ok then
-                ngx.say("failed to kill thread: ", err)
-                return
-            end
-
-            ngx.say("killed")
-        ';
-    }
---- request
-GET /t
---- stap2 eval: $::StapScript
---- response_body
-thread created: running
-failed to kill thread: pending subrequests
-
---- no_error_log
-[error]
-[alert]
-lua tcp socket abort resolver
---- error_log
-
-
-
-=== TEST 6: cannot kill a pending subrequest not in the thread being killed
---- config
-    location = /sub {
-        echo_sleep 0.3;
-        echo ok;
-    }
-
-    location = /t {
-        content_by_lua '
-            function f()
-                ngx.location.capture("/sub")
-            end
-
-            function g()
-                ngx.sleep(0.3)
-            end
-
-            local tf, err = ngx.thread.spawn(f)
-            if not tf then
-                ngx.say("failed to spawn thread 1: ", err)
-                return
-            end
-
-            ngx.say("thread f 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("thread g created: ", coroutine.status(tg))
-
-            collectgarbage()
-
-            local ok, err = ngx.thread.kill(tf)
-            if not ok then
-                ngx.say("failed to kill thread f: ", err)
-            else
-                ngx.say("killed f")
-            end
-
-            local ok, err = ngx.thread.kill(tg)
-            if not ok then
-                ngx.say("failed to kill thread g: ", err)
-            else
-                ngx.say("killed g")
-            end
-        ';
-    }
---- request
-GET /t
---- stap2 eval: $::StapScript
---- response_body
-thread f created: running
-thread g created: running
-failed to kill thread f: pending subrequests
-killed g
-
---- no_error_log
-[error]
-[alert]
-lua tcp socket abort resolver
---- error_log
-
-
-
-=== TEST 7: kill a thread that has done a subrequest but no pending ones
---- config
-    location = /sub {
-        echo ok;
-    }
-
-    location = /t {
-        content_by_lua '
-            local ready = false
-            function f()
-                ngx.location.capture("/sub")
-                ready = true
-                ngx.sleep(0.5)
-            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()
-
-            while not ready do
-                ngx.sleep(0.001)
-            end
-
-            local ok, err = ngx.thread.kill(t)
-            if not ok then
-                ngx.say("failed to kill thread: ", err)
-                return
-            end
-
-            ngx.say("killed")
-        ';
-    }
---- request
-GET /t
---- stap2 eval: $::StapScript
---- response_body
-thread created: running
-killed
-
---- no_error_log
-[error]
-[alert]
-lua tcp socket abort resolver
---- error_log
-
-
-
-=== TEST 8: kill a thread already terminated
---- config
-    location = /t {
-        content_by_lua '
-            function f()
-                return
-            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, err = ngx.thread.kill(t)
-            if not ok then
-                ngx.say("failed to kill thread: ", err)
-                return
-            end
-
-            ngx.say("killed")
-        ';
-    }
---- request
-GET /t
---- stap2 eval: $::StapScript
---- response_body
-thread created: zombie
-failed to kill thread: already terminated
-
---- no_error_log
-[error]
-[alert]
-lua tcp socket abort resolver
---- error_log
-
-
-
-=== TEST 9: kill self
---- config
-    location = /t {
-        content_by_lua '
-            local ok, err = ngx.thread.kill(coroutine.running())
-            if not ok then
-                ngx.say("failed to kill main thread: ", err)
-            else
-                ngx.say("killed main thread.")
-            end
-
-            function f()
-                local ok, err = ngx.thread.kill(coroutine.running())
-                if not ok then
-                    ngx.say("failed to kill user thread: ", err)
-                else
-                    ngx.say("user thread thread.")
-                end
-
-            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))
-        ';
-    }
---- request
-GET /t
---- stap2 eval: $::StapScript
---- response_body
-failed to kill main thread: not user thread
-failed to kill user thread: killer not parent
-thread created: zombie
-
---- no_error_log
-[error]
-[alert]
-lua tcp socket abort resolver
---- error_log
diff --git a/debian/modules/http-lua/t/128-duplex-tcp-socket.t b/debian/modules/http-lua/t/128-duplex-tcp-socket.t
deleted file mode 100644
index aed560c..0000000
--- a/debian/modules/http-lua/t/128-duplex-tcp-socket.t
+++ /dev/null
@@ -1,631 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 2);
-
-our $HtmlDir = html_dir;
-
-$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();
-run_tests();
-
-__DATA__
-
-=== TEST 1: pipelined memcached requests (sent one byte at a time)
---- config
-    server_tokens off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_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\\nget foo\\r\\nget bar\\r\\n"
-            -- req = "OK"
-            local send_idx = 1
-
-            local function writer()
-                local sub = string.sub
-                while send_idx <= #req do
-                    local bytes, err = sock:send(sub(req, send_idx, send_idx))
-                    if not bytes then
-                        ngx.say("failed to send request: ", err)
-                        return
-                    end
-                    -- if send_idx % 2 == 0 then
-                        ngx.sleep(0.001)
-                    -- end
-                    send_idx = send_idx + 1
-                end
-                -- ngx.say("request sent.")
-            end
-
-            local ok, err = ngx.thread.spawn(writer)
-            if not ok then
-                ngx.say("failed to spawn writer thread: ", err)
-                return
-            end
-
-            for i = 1, 3 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:setkeepalive()
-            ngx.say("setkeepalive: ", ok, " ", err)
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-received: OK
-received: END
-received: END
-setkeepalive: 1 nil
-
---- no_error_log
-[error]
-
-
-
-=== TEST 2: read timeout errors won't affect writing
---- config
-    server_tokens off;
-    lua_socket_log_errors off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_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"
-            -- req = "OK"
-            local send_idx = 1
-
-            sock:settimeout(1)
-
-            local function writer()
-                local sub = string.sub
-                while send_idx <= #req do
-                    local bytes, err = sock:send(sub(req, send_idx, send_idx))
-                    if not bytes then
-                        ngx.say("failed to send request: ", err)
-                        return
-                    end
-                    ngx.sleep(0.001)
-                    send_idx = send_idx + 1
-                end
-                -- ngx.say("request sent.")
-            end
-
-            local ok, err = ngx.thread.spawn(writer)
-            if not ok then
-                ngx.say("failed to spawn writer thread: ", err)
-                return
-            end
-
-            local data = ""
-            local ntm = 0
-            local done = false
-            for i = 1, 300 do
-                local line, err, part = sock:receive()
-                if not line then
-                    if part then
-                        data = data .. part
-                    end
-                    if err ~= "timeout" then
-                        ngx.say("failed to receive: ", err)
-                        return
-                    end
-
-                    ntm = ntm + 1
-
-                else
-                    data = data .. line
-                    ngx.say("received: ", data)
-                    done = true
-                    break
-                end
-            end
-
-            if not done then
-                ngx.say("partial read: ", data)
-            end
-
-            ngx.say("read timed out: ", ntm)
-            ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
---- request
-GET /t
---- response_body_like chop
-^connected: 1
-(?:received: OK|failed to send request: timeout
-partial read: )
-read timed out: [1-9]\d*
-close: 1 nil$
-
---- no_error_log
-[error]
-
-
-
-=== TEST 3: writes are rejected while reads are not
---- config
-    server_tokens off;
-    lua_socket_log_errors off;
-    location /t {
-        #set $port 5000;
-        set $port 7658;
-
-        content_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"
-            -- req = "OK"
-            local send_idx = 1
-
-            local function writer()
-                local sub = string.sub
-                while send_idx <= #req do
-                    local bytes, err = sock:send(sub(req, send_idx, send_idx))
-                    if not bytes then
-                        ngx.say("failed to send request: ", err)
-                        return
-                    end
-                    ngx.sleep(0.001)
-                    send_idx = send_idx + 1
-                end
-                -- ngx.say("request sent.")
-            end
-
-            local ok, err = ngx.thread.spawn(writer)
-            if not ok then
-                ngx.say("failed to spawn writer thread: ", err)
-                return
-            end
-
-            local data = ""
-            local ntm = 0
-            local done = false
-            for i = 1, 3 do
-                local res, err, part = sock:receive(1)
-                if not res then
-                    ngx.say("failed to receive: ", err)
-                    return
-                else
-                    data = data .. res
-                end
-                ngx.sleep(0.001)
-            end
-
-            ngx.say("received: ", data)
-            ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
---- request
-GET /t
---- response_body_like chop
-^connected: 1
-received: OK!
-close: (?:nil socket busy writing|1 nil
-failed to send request: closed)$
-
---- tcp_listen: 7658
---- tcp_shutdown: 0
---- tcp_reply: OK!
---- tcp_no_close: 1
---- no_error_log
-[error]
-
-
-
-=== TEST 4: reads are rejected while writes are not
---- config
-    server_tokens off;
-    lua_socket_log_errors off;
-    location /t {
-        #set $port 5000;
-        set $port 7658;
-
-        content_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"
-            -- req = "OK"
-            local send_idx = 1
-
-            local function writer()
-                local sub = string.sub
-                while send_idx <= #req do
-                    local bytes, err = sock:send(sub(req, send_idx, send_idx))
-                    if not bytes then
-                        ngx.say("failed to send request: ", err)
-                        return
-                    end
-                    -- ngx.say("sent: ", bytes)
-                    ngx.sleep(0.001)
-                    send_idx = send_idx + 1
-                end
-                ngx.say("request sent.")
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end
-
-            local ok, err = ngx.thread.spawn(writer)
-            if not ok then
-                ngx.say("failed to spawn writer thread: ", err)
-                return
-            end
-
-            local data = ""
-            local ntm = 0
-            local aborted = false
-            for i = 1, 3 do
-                if not aborted then
-                    local res, err, part = sock:receive(1)
-                    if not res then
-                        ngx.say("failed to receive: ", err)
-                        aborted = true
-                    else
-                        data = data .. res
-                    end
-                end
-
-                ngx.sleep(0.001)
-            end
-
-            if not aborted then
-                ngx.say("received: ", data)
-            end
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to receive: closed
-request sent.
-close: 1 nil
-
---- stap2
-F(ngx_http_lua_socket_tcp_finalize_write_part) {
-    print_ubacktrace()
-}
---- stap_out2
---- tcp_listen: 7658
---- tcp_shutdown: 1
---- tcp_query eval: "flush_all\r\n"
---- tcp_query_len: 11
---- no_error_log
-[error]
---- wait: 0.05
-
-
-
-=== TEST 5: concurrent socket operations while connecting
---- config
-    server_tokens off;
-    lua_socket_log_errors off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-
-            local function f()
-                ngx.sleep(0.001)
-                local res, err = sock:receive(1)
-                ngx.say("receive: ", res, " ", err)
-
-                local bytes, err = sock:send("hello")
-                ngx.say("send: ", bytes, " ", err)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-
-                local ok, err = sock:getreusedtimes()
-                ngx.say("getreusedtimes: ", ok, " ", err)
-
-                local ok, err = sock:setkeepalive()
-                ngx.say("setkeepalive: ", ok, " ", err)
-
-                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-                ngx.say("connect: ", ok, " ", err)
-            end
-
-            local ok, err = ngx.thread.spawn(f)
-            if not ok then
-                ngx.say("failed to spawn writer thread: ", err)
-                return
-            end
-
-            sock:settimeout(300)
-            local ok, err = sock:connect("172.105.207.225", 12345)
-            ngx.say("connect: ", ok, " ", err)
-
-            local ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
---- request
-GET /t
---- response_body
-receive: nil socket busy connecting
-send: nil socket busy connecting
-close: nil socket busy connecting
-getreusedtimes: 0 nil
-setkeepalive: nil socket busy connecting
-connect: nil socket busy connecting
-connect: nil timeout
-close: nil closed
-
---- no_error_log
-[error]
-
-
-
-=== TEST 6: concurrent operations while resolving
---- config
-    server_tokens off;
-    lua_socket_log_errors off;
-    resolver agentzh.org:12345;
-    resolver_timeout 300ms;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-
-            local function f()
-                ngx.sleep(0.001)
-                local res, err = sock:receive(1)
-                ngx.say("receive: ", res, " ", err)
-
-                local bytes, err = sock:send("hello")
-                ngx.say("send: ", bytes, " ", err)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-
-                local ok, err = sock:getreusedtimes()
-                ngx.say("getreusedtimes: ", ok, " ", err)
-
-                local ok, err = sock:setkeepalive()
-                ngx.say("setkeepalive: ", ok, " ", err)
-
-                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-                ngx.say("connect: ", ok, " ", err)
-            end
-
-            local ok, err = ngx.thread.spawn(f)
-            if not ok then
-                ngx.say("failed to spawn writer thread: ", err)
-                return
-            end
-
-            sock:settimeout(300)
-            local ok, err = sock:connect("some2.agentzh.org", 12345)
-            ngx.say("connect: ", ok, " ", err)
-
-            local ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
---- request
-GET /t
---- response_body
-receive: nil closed
-send: nil closed
-close: nil closed
-getreusedtimes: nil closed
-setkeepalive: nil closed
-connect: nil socket busy connecting
-connect: nil some2.agentzh.org could not be resolved (110: Operation timed out)
-close: nil closed
-
---- no_error_log
-[error]
-
-
-
-=== TEST 7: concurrent operations while reading (receive)
---- config
-    server_tokens off;
-    lua_socket_log_errors off;
-    location /t {
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            local ready = false
-
-            local function f()
-                while not ready do
-                    ngx.sleep(0.001)
-                end
-
-                local res, err = sock:receive(1)
-                ngx.say("receive: ", res, " ", err)
-
-                local bytes, err = sock:send("flush_all")
-                ngx.say("send: ", bytes, " ", err)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-
-                local ok, err = sock:getreusedtimes()
-                ngx.say("getreusedtimes: ", ok, " ", err)
-
-                local ok, err = sock:setkeepalive()
-                ngx.say("setkeepalive: ", ok, " ", err)
-
-                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-                ngx.say("connect: ", ok, " ", err)
-            end
-
-            local ok, err = ngx.thread.spawn(f)
-            if not ok then
-                ngx.say("failed to spawn writer thread: ", err)
-                return
-            end
-
-            sock:settimeout(300)
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-            ngx.say("connect: ", ok, " ", err)
-
-            ready = true
-
-            local res, err = sock:receive(1)
-            ngx.say("receive: ", res, " ", err)
-
-            local ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connect: 1 nil
-receive: nil socket busy reading
-send: 9 nil
-close: nil socket busy reading
-getreusedtimes: 0 nil
-setkeepalive: nil socket busy reading
-connect: nil socket busy reading
-receive: nil timeout
-close: 1 nil
-
---- no_error_log
-[error]
-
-
-
-=== TEST 8: concurrent operations while reading (receiveuntil)
---- config
-    server_tokens off;
-    lua_socket_log_errors off;
-    location /t {
-        content_by_lua '
-            local ready = false
-            local sock = ngx.socket.tcp()
-
-            local function f()
-                while not ready do
-                    ngx.sleep(0.001)
-                end
-
-                local res, err = sock:receive(1)
-                ngx.say("receive: ", res, " ", err)
-
-                local bytes, err = sock:send("flush_all")
-                ngx.say("send: ", bytes, " ", err)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-
-                local ok, err = sock:getreusedtimes()
-                ngx.say("getreusedtimes: ", ok, " ", err)
-
-                local ok, err = sock:setkeepalive()
-                ngx.say("setkeepalive: ", ok, " ", err)
-
-                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-                ngx.say("connect: ", ok, " ", err)
-            end
-
-            local ok, err = ngx.thread.spawn(f)
-            if not ok then
-                ngx.say("failed to spawn writer thread: ", err)
-                return
-            end
-
-            sock:settimeout(300)
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-            ngx.say("connect: ", ok, " ", err)
-
-            ready = true
-
-            local it, err = sock:receiveuntil("\\r\\n")
-            if not it then
-                ngx.say("receiveuntil() failed: ", err)
-                return
-            end
-
-            local res, err = it()
-            ngx.say("receiveuntil() iterator: ", res, " ", err)
-
-            local ok, err = sock:close()
-            ngx.say("close: ", ok, " ", err)
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connect: 1 nil
-receive: nil socket busy reading
-send: 9 nil
-close: nil socket busy reading
-getreusedtimes: 0 nil
-setkeepalive: nil socket busy reading
-connect: nil socket busy reading
-receiveuntil() iterator: nil timeout
-close: 1 nil
-
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/129-ssl-socket.t b/debian/modules/http-lua/t/129-ssl-socket.t
deleted file mode 100644
index 3f05640..0000000
--- a/debian/modules/http-lua/t/129-ssl-socket.t
+++ /dev/null
@@ -1,2532 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * 211;
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
-$ENV{TEST_NGINX_SERVER_SSL_PORT} ||= 12345;
-
-#log_level 'warn';
-log_level 'debug';
-
-no_long_string();
-#no_diff();
-
-sub read_file {
-    my $infile = shift;
-    open my $in, $infile
-        or die "cannot open $infile for reading: $!";
-    my $cert = do { local $/; <$in> };
-    close $in;
-    $cert;
-}
-
-our $DSTRootCertificate = read_file("t/cert/dst-ca.crt");
-our $EquifaxRootCertificate = read_file("t/cert/equifax.crt");
-our $TestCertificate = read_file("t/cert/test.crt");
-our $TestCertificateKey = read_file("t/cert/test.key");
-our $TestCRL = read_file("t/cert/test.crl");
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: www.google.com
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            -- avoid flushing google in "check leak" testing mode:
-            local counter = package.loaded.counter
-            if not counter then
-                counter = 1
-            elseif counter >= 2 then
-                return ngx.exit(503)
-            else
-                counter = counter + 1
-            end
-            package.loaded.counter = counter
-
-            do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(2000)
-                local ok, err = sock:connect("www.google.com", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake()
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: www.google.com\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body_like chop
-\Aconnected: 1
-ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 (?:200 OK|302 Found)
-close: 1 nil
-\z
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- no_error_log
-lua ssl server name:
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 2: no SNI, no verify
---- http_config
-    server {
-        listen $TEST_NGINX_SERVER_SSL_PORT ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        location / {
-            content_by_lua_block {
-                ngx.exit(201)
-            }
-        }
-    }
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(2000)
-                local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_SSL_PORT)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake()
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 53 bytes.
-received: HTTP/1.1 201 Created
-close: 1 nil
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- no_error_log
-lua ssl server name:
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 3: SNI, no verify
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org")
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\r\nHost: openresty.org\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 58 bytes.
-received: HTTP/1.1 302 Moved Temporarily
-close: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- error_log
-lua ssl server name: "openresty.org"
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 4: ssl session reuse
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_protocols TLSv1.2;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-
-            local session
-            for i = 1, 2 do
-                local ok, err = sock:connect("agentzh.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                session, err = sock:sslhandshake(session, "agentzh.org")
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end
-
-            end -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 200 OK
-close: 1 nil
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 200 OK
-close: 1 nil
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl set session: \1
-lua ssl save session: \1
-lua ssl free session: \1
-lua ssl free session: \1
-$/
-
---- error_log
-SSL reused session
-lua ssl free session
-
---- log_level: debug
---- no_error_log
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 5: certificate does not match host name (verify)
-The certificate of "openresty.org" does not contain the name "blah.openresty.org".
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 5;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "blah.openresty.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                else
-                    ngx.say("ssl handshake: ", type(session))
-                end
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::DSTRootCertificate"
-
---- request
-GET /t
---- response_body_like chomp
-\Aconnected: 1
-failed to do SSL handshake: (?:handshake failed|certificate host mismatch)
-failed to send http request: closed
-\z
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log
-lua ssl server name: "blah.openresty.org"
---- no_error_log
-SSL reused session
-[alert]
---- timeout: 5
-
-
-
-=== TEST 6: certificate does not match host name (verify, no log socket errors)
-The certificate for "openresty.org" does not contain the name "blah.openresty.org".
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_socket_log_errors off;
-    lua_ssl_verify_depth 2;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "blah.openresty.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                else
-                    ngx.say("ssl handshake: ", type(session))
-                end
-
-                local req = "GET / HTTP/1.1\\r\\nHost: blah.openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::DSTRootCertificate"
-
---- request
-GET /t
---- response_body_like chomp
-\Aconnected: 1
-failed to do SSL handshake: (?:handshake failed|certificate host mismatch)
-failed to send http request: closed
-\z
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log
-lua ssl server name: "blah.openresty.org"
---- no_error_log
-lua ssl certificate does not match host
-SSL reused session
-[alert]
---- timeout: 5
-
-
-
-=== TEST 7: certificate does not match host name (no verify)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(4000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org", false)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: agentzh.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 404 Not Found
-close: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
-
---- error_log
-lua ssl server name: "openresty.org"
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 8: openresty.org: passing SSL verify
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 2;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(4000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::DSTRootCertificate"
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 58 bytes.
-received: HTTP/1.1 302 Moved Temporarily
-close: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]++/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
-
---- error_log
-lua ssl server name: "openresty.org"
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 9: ssl verify depth not enough (with automatic error logging)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 0;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                else
-                    ngx.say("ssl handshake: ", type(session))
-                end
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::DSTRootCertificate"
-
---- request
-GET /t
---- response_body eval
-qr{connected: 1
-failed to do SSL handshake: (22: certificate chain too long|20: unable to get local issuer certificate)
-failed to send http request: closed
-}
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log eval
-['lua ssl server name: "openresty.org"',
-qr/lua ssl certificate verify error: \((22: certificate chain too long|20: unable to get local issuer certificate)\)/]
---- no_error_log
-SSL reused session
-[alert]
---- timeout: 5
-
-
-
-=== TEST 10: ssl verify depth not enough (without automatic error logging)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 0;
-    lua_socket_log_errors off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                else
-                    ngx.say("ssl handshake: ", type(session))
-                end
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::DSTRootCertificate"
-
---- request
-GET /t
---- response_body eval
-qr/connected: 1
-failed to do SSL handshake: (22: certificate chain too long|20: unable to get local issuer certificate)
-failed to send http request: closed
-/
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log
-lua ssl server name: "openresty.org"
---- no_error_log
-lua ssl certificate verify error
-SSL reused session
-[alert]
---- timeout: 7
-
-
-
-=== TEST 11: openresty.org: SSL verify enabled and no corresponding trusted certificates
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 2;
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(4000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\r\nHost: openresty.org\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        }
-    }
-
---- user_files eval
-">>> trusted.crt
-$::EquifaxRootCertificate"
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: 20: unable to get local issuer certificate
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log
-lua ssl server name: "openresty.org"
-lua ssl certificate verify error: (20: unable to get local issuer certificate)
---- no_error_log
-SSL reused session
-[alert]
---- timeout: 5
-
-
-
-=== TEST 12: openresty.org: passing SSL verify with multiple certificates
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 2;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(4000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::EquifaxRootCertificate
-$::DSTRootCertificate"
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 58 bytes.
-received: HTTP/1.1 302 Moved Temporarily
-close: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
-
---- error_log
-lua ssl server name: "openresty.org"
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 13: default cipher
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org")
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 58 bytes.
-received: HTTP/1.1 302 Moved Temporarily
-close: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- error_log
-lua ssl server name: "openresty.org"
-SSL: TLSv1.2, cipher: "ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 14: explicit cipher configuration
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_ciphers ECDHE-RSA-AES256-SHA;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org")
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 58 bytes.
-received: HTTP/1.1 302 Moved Temporarily
-close: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- error_log eval
-['lua ssl server name: "openresty.org"',
-qr/SSL: TLSv1.2, cipher: "ECDHE-RSA-AES256-SHA (SSLv3|TLSv1)/]
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 10
-
-
-
-=== TEST 15: explicit ssl protocol configuration
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_protocols TLSv1;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org")
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 58 bytes.
-received: HTTP/1.1 302 Moved Temporarily
-close: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- error_log eval
-['lua ssl server name: "openresty.org"',
-qr/SSL: TLSv1, cipher: "ECDHE-RSA-AES128-SHA (SSLv3|TLSv1)/]
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 16: unsupported ssl protocol
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_protocols SSLv2;
-    lua_socket_log_errors off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org")
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                else
-                    ngx.say("ssl handshake: ", type(session))
-                end
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: handshake failed
-failed to send http request: closed
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log eval
-[
-qr/\[crit\] .*?SSL_do_handshake\(\) failed .*?(unsupported protocol|no protocols available)/,
-'lua ssl server name: "openresty.org"',
-]
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 17: openresty.org: passing SSL verify: keepalive (reuse the ssl session)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 2;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-
-            local session
-            for i = 1, 3 do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                session, err = sock:sslhandshake(session, "openresty.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local ok, err = sock:setkeepalive()
-                ngx.say("set keepalive: ", ok, " ", err)
-            end  -- do
-
-            end
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::DSTRootCertificate"
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-set keepalive: 1 nil
-connected: 1
-ssl handshake: userdata
-set keepalive: 1 nil
-connected: 1
-ssl handshake: userdata
-set keepalive: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: \1
-$/
-
---- error_log
-lua tcp socket get keepalive peer: using connection
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 18: openresty.org: passing SSL verify: keepalive (no reusing the ssl session)
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 2;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            do
-
-            for i = 1, 3 do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local session, err = sock:sslhandshake(nil, "openresty.org", true)
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-
-                local ok, err = sock:setkeepalive()
-                ngx.say("set keepalive: ", ok, " ", err)
-            end  -- do
-
-            end
-            collectgarbage()
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::DSTRootCertificate"
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-set keepalive: 1 nil
-connected: 1
-ssl handshake: userdata
-set keepalive: 1 nil
-connected: 1
-ssl handshake: userdata
-set keepalive: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl save session: \1
-lua ssl save session: \1
-lua ssl free session: \1
-lua ssl free session: \1
-lua ssl free session: \1
-$/
-
---- error_log
-lua tcp socket get keepalive peer: using connection
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 19: downstream cosockets do not support ssl handshake
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/trusted.crt;
-    lua_ssl_verify_depth 2;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.req.socket()
-            local sess, err = sock:sslhandshake()
-            if not sess then
-                ngx.say("failed to do ssl handshake: ", err)
-            else
-                ngx.say("ssl handshake: ", type(sess))
-            end
-        ';
-    }
-
---- user_files eval
-">>> trusted.crt
-$::DSTRootCertificate"
-
---- request
-POST /t
-hello world
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log
-attempt to call method 'sslhandshake' (a nil value)
---- no_error_log
-[alert]
---- timeout: 3
-
-
-
-=== TEST 20: unix domain ssl cosocket (no verify)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua 'ngx.status = 201 ngx.say("foo") ngx.exit(201)';
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(3000)
-                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 sess, err = sock:sslhandshake()
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\\r\\nHost: test.com\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- no_error_log
-lua ssl server name:
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 21: unix domain ssl cosocket (verify)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua 'ngx.status = 201 ngx.say("foo") ngx.exit(201)';
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/test.crt;
-
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(3000)
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\\r\\nHost: test.com\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- error_log
-lua ssl server name: "test.com"
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 22: unix domain ssl cosocket (no ssl on server)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-        server_name   test.com;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua 'ngx.status = 201 ngx.say("foo") ngx.exit(201)';
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake()
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\\r\\nHost: test.com\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: handshake failed
-
---- user_files eval
-">>> test.crt
-$::TestCertificate"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log eval
-qr/SSL_do_handshake\(\) failed .*?(unknown protocol|wrong version number)/
---- no_error_log
-lua ssl server name:
-SSL reused session
-[alert]
---- timeout: 3
-
-
-
-=== TEST 23: lua_ssl_crl
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua 'ngx.status = 201 ngx.say("foo") ngx.exit(201)';
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_crl ../html/test.crl;
-    lua_ssl_trusted_certificate ../html/test.crt;
-    lua_socket_log_errors off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(3000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                else
-                    ngx.say("ssl handshake: ", type(sess))
-                end
-
-                local req = "GET /foo HTTP/1.0\\r\\nHost: test.com\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: 12: CRL has expired
-failed to send http request: closed
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate
->>> test.crl
-$::TestCRL"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log
-lua ssl server name: "test.com"
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 24: multiple handshake calls
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                for i = 1, 2 do
-                    local session, err = sock:sslhandshake(nil, "openresty.org")
-                    if not session then
-                        ngx.say("failed to do SSL handshake: ", err)
-                        return
-                    end
-
-                    ngx.say("ssl handshake: ", type(session))
-                end
-
-                local req = "GET / HTTP/1.1\\r\\nHost: openresty.org\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                local line, err = sock:receive()
-                if not line then
-                    ngx.say("failed to receive response status line: ", err)
-                    return
-                end
-
-                ngx.say("received: ", line)
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-ssl handshake: userdata
-sent http request: 58 bytes.
-received: HTTP/1.1 302 Moved Temporarily
-close: 1 nil
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- error_log
-lua ssl server name: "openresty.org"
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 25: handshake timed out
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-
-            sock:settimeout(2000)
-
-            do
-                local ok, err = sock:connect("openresty.org", 443)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                sock:settimeout(1);  -- should timeout immediately
-                local session, err = sock:sslhandshake(nil, "openresty.org")
-                if not session then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(session))
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: timeout
-
---- log_level: debug
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log
-lua ssl server name: "openresty.org"
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 26: unix domain ssl cosocket (no gen session)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua 'ngx.status = 201 ngx.say("foo") ngx.exit(201)';
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(3000)
-                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 sess, err = sock:sslhandshake(false)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", sess)
-
-                sock:close()
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: true
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- no_error_log
-lua ssl server name:
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 27: unix domain ssl cosocket (gen session, true)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua 'ngx.status = 201 ngx.say("foo") ngx.exit(201)';
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(3000)
-                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 sess, err = sock:sslhandshake(true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                sock:close()
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- no_error_log
-lua ssl server name:
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 28: unix domain ssl cosocket (keepalive)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua 'ngx.status = 201 ngx.say("foo") ngx.exit(201)';
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            local sock = ngx.socket.tcp()
-            sock:settimeout(3000)
-            for i = 1, 2 do
-                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 sess, err = sock:sslhandshake(false)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", sess)
-
-                local ok, err = sock:setkeepalive()
-                if not ok then
-                    ngx.say("failed to set keepalive: ", err)
-                    return
-                end
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: true
-connected: 1
-ssl handshake: true
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- no_error_log
-lua ssl server name:
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 29: unix domain ssl cosocket (verify cert but no host name check, passed)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua 'ngx.status = 201 ngx.say("foo") ngx.exit(201)';
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate ../html/test.crt;
-
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(3000)
-                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 sess, err = sock:sslhandshake(nil, nil, true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\\r\\nHost: test.com\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out eval
-qr/^lua ssl save session: ([0-9A-F]+)
-lua ssl free session: ([0-9A-F]+)
-$/
---- error_log
---- no_error_log
-SSL reused session
-[error]
-[alert]
---- timeout: 5
-
-
-
-=== TEST 30: unix domain ssl cosocket (verify cert but no host name check, NOT passed)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua 'ngx.status = 201 ngx.say("foo") ngx.exit(201)';
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    #lua_ssl_trusted_certificate ../html/test.crt;
-
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua '
-            do
-                local sock = ngx.socket.tcp()
-                sock:settimeout(3000)
-                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 sess, err = sock:sslhandshake(nil, nil, true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\\r\\nHost: test.com\\r\\nConnection: close\\r\\n\\r\\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            collectgarbage()
-        ';
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: 18: self signed certificate
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
-
---- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/
---- grep_error_log_out
---- error_log
-lua ssl certificate verify error: (18: self signed certificate)
---- no_error_log
-SSL reused session
-[alert]
---- timeout: 5
-
-
-
-=== TEST 31: handshake, too many arguments
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-
-            local ok, err = sock:connect("openresty.org", 443)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            ngx.say("connected: ", ok)
-
-            local session, err = sock.sslhandshake()
-        }
-    }
-
---- request
-GET /t
---- ignore_response
---- error_log eval
-qr/\[error\] .* ngx.socket sslhandshake: expecting 1 ~ 5 arguments \(including the object\), but seen 0/
---- no_error_log
-[alert]
---- timeout: 5
diff --git a/debian/modules/http-lua/t/130-internal-api.t b/debian/modules/http-lua/t/130-internal-api.t
deleted file mode 100644
index eba0980..0000000
--- a/debian/modules/http-lua/t/130-internal-api.t
+++ /dev/null
@@ -1,49 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * 3;
-
-#no_diff();
-no_long_string();
-#master_on();
-#workers(2);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: __ngx_req and __ngx_cycle
---- http_config
-    init_by_lua '
-        my_cycle = __ngx_cycle
-    ';
-
---- config
-    location = /t {
-        content_by_lua '
-            local ffi = require "ffi"
-            local function tonum(ud)
-                return tonumber(ffi.cast("uintptr_t", ud))
-            end
-            ngx.say(string.format("init: cycle=%#x", tonum(my_cycle)))
-            ngx.say(string.format("content cycle=%#x", tonum(__ngx_cycle)))
-            ngx.say(string.format("content req=%#x", tonum(__ngx_req)))
-        ';
-    }
---- request
-GET /t
-
---- response_body_like chop
-^init: cycle=(0x[a-f0-9]{4,})
-content cycle=\1
-content req=0x[a-f0-9]{4,}
-$
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/131-duplex-req-socket.t b/debian/modules/http-lua/t/131-duplex-req-socket.t
deleted file mode 100644
index 5d698b9..0000000
--- a/debian/modules/http-lua/t/131-duplex-req-socket.t
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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}";
-    }
-
-    if ($ENV{MOCKEAGAIN} eq 'r') {
-        $ENV{MOCKEAGAIN} = 'rw';
-
-    } else {
-        $ENV{MOCKEAGAIN} = 'w';
-    }
-
-    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
-    $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'slow';
-}
-
-use Test::Nginx::Socket::Lua;
-
-log_level('debug');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: raw downstream cosocket used in two different threads. See issue #481
---- config
-    lua_socket_read_timeout 1ms;
-    lua_socket_send_timeout 1s;
-    lua_socket_log_errors off;
-
-    location /t {
-        content_by_lua '
-            local function reader(req_socket)
-               -- First we receive in a blocking fashion so that ctx->downstream_co_ctx will be changed
-               local data, err, partial = req_socket:receive(1)
-               if err ~= "timeout" then
-                  ngx.log(ngx.ERR, "Did not get timeout in the receiving thread!")
-                  return
-               end
-
-               -- Now, sleep so that coctx->data is changed to sleep handler
-               ngx.sleep(1)
-            end
-
-            local function writer(req_socket)
-               -- send in a slow manner with a low timeout, so that the timeout handler will be
-               local bytes, err = req_socket:send("slow!!!")
-               if err ~= "timeout" then
-                  return error("Did not get timeout in the sending thread!")
-               end
-            end
-
-            local req_socket, err = ngx.req.socket(true)
-            if req_socket == nil then
-               ngx.status = 500
-               return error("Unable to get request socket:" .. (err or "nil"))
-            end
-
-            local writer_thread = ngx.thread.spawn(writer, req_socket)
-            local reader_thread = ngx.thread.spawn(reader, req_socket)
-
-            ngx.thread.wait(writer_thread)
-            ngx.thread.wait(reader_thread)
-            print("The two threads finished")
-';
-        }
---- request
-POST /t
---- more_headers
-Content-Length: 1
---- no_error_log
-[error]
---- error_log: The two threads finished
---- wait: 0.1
---- ignore_response
---- timeout: 10
-
-
-
-=== TEST 2: normal downstream cosocket used in two different threads. See issue #481
---- config
-    lua_socket_read_timeout 1ms;
-    lua_socket_send_timeout 1s;
-    lua_socket_log_errors off;
-    send_timeout 1s;
-
-    location /t {
-        content_by_lua '
-            local function reader(req_socket)
-               -- First we receive in a blocking fashion so that ctx->downstream_co_ctx will be changed
-               local data, err, partial = req_socket:receive(1)
-               if err ~= "timeout" then
-                  ngx.log(ngx.ERR, "Did not get timeout in the receiving thread!")
-                  return
-               end
-
-               -- Now, sleep so that coctx->data is changed to sleep handler
-               ngx.sleep(1)
-            end
-
-            local function writer(req_socket)
-               -- send in a slow manner with a low timeout, so that the timeout handler will be
-               ngx.sleep(0.3)
-               ngx.say("slow!!!")
-               ngx.flush(true)
-            end
-
-            local req_socket, err = ngx.req.socket()
-            if req_socket == nil then
-               ngx.status = 500
-               return error("Unable to get request socket:" .. (err or "nil"))
-            end
-
-            local writer_thread = ngx.thread.spawn(writer, req_socket)
-            local reader_thread = ngx.thread.spawn(reader, req_socket)
-
-            ngx.thread.wait(writer_thread)
-            ngx.thread.wait(reader_thread)
-            print("The two threads finished")
-';
-        }
---- request
-POST /t
---- more_headers
-Content-Length: 1
---- no_error_log
-[error]
---- error_log: The two threads finished
---- wait: 0.1
---- ignore_response
---- timeout: 10
diff --git a/debian/modules/http-lua/t/132-lua-blocks.t b/debian/modules/http-lua/t/132-lua-blocks.t
deleted file mode 100644
index 292af58..0000000
--- a/debian/modules/http-lua/t/132-lua-blocks.t
+++ /dev/null
@@ -1,729 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-#repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 3 + 13);
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: content_by_lua_block (simplest)
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say("hello, world")
-        }
-    }
---- request
-GET /t
---- response_body
-hello, world
---- no_error_log
-[error]
-
-
-
-=== TEST 2: content_by_lua_block (nested curly braces)
---- config
-    location = /t {
-        content_by_lua_block {
-            local a = {
-                dogs = {32, 78, 96},
-                cat = "kitty",
-            }
-            ngx.say("a.dogs[1] = ", a.dogs[1])
-            ngx.say("a.dogs[2] = ", a.dogs[2])
-            ngx.say("a.dogs[3] = ", a.dogs[3])
-            ngx.say("a.cat = ", a.cat)
-        }
-    }
---- request
-GET /t
---- response_body
-a.dogs[1] = 32
-a.dogs[2] = 78
-a.dogs[3] = 96
-a.cat = kitty
-
---- no_error_log
-[error]
-
-
-
-=== TEST 3: content_by_lua_block (curly braces in strings)
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say("}1, 2)")
-            ngx.say('{1, 2)')
-        }
-    }
---- request
-GET /t
---- response_body
-}1, 2)
-{1, 2)
-
---- no_error_log
-[error]
-
-
-
-=== TEST 4: content_by_lua_block (curly braces in strings, with escaped terminators)
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say("\"}1, 2)")
-            ngx.say('\'{1, 2)')
-        }
-    }
---- request
-GET /t
---- response_body
-"}1, 2)
-'{1, 2)
-
---- no_error_log
-[error]
-
-
-
-=== TEST 5: content_by_lua_block (curly braces in long brackets)
---- config
-    location = /t {
-        content_by_lua_block {
-            --[[
-                {{{
-
-                        }
-            ]]
-            --[==[
-                }}}
-
-                        {
-            ]==]
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 6: content_by_lua_block ("nested" long brackets)
---- config
-    location = /t {
-        content_by_lua_block {
-            --[[
-                ]=]
-            '  "
-                        }
-            ]]
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 7: content_by_lua_block (curly braces in line comments)
---- config
-    location = /t {
-        content_by_lua_block {
-            --}} {}
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 8: content_by_lua_block (cosockets)
---- config
-    server_tokens off;
-    location = /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local port = ngx.var.port
-            local ok, err = sock:connect('127.0.0.1', tonumber(ngx.var.server_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)
-        }
-    }
-
-    location /foo {
-        content_by_lua_block { 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: 1 nil
---- no_error_log
-[error]
-
-
-
-=== TEST 9: all in one
---- http_config
-    init_by_lua_block {
-        glob = "init by lua }here{"
-    }
-
-    init_worker_by_lua_block {
-        glob = glob .. ", init worker }here{"
-    }
---- config
-    location = /t {
-        set $a '';
-        rewrite_by_lua_block {
-            local s = ngx.var.a
-            s = s .. "}rewrite{\n"
-            ngx.var.a = s
-        }
-        access_by_lua_block {
-            local s = ngx.var.a
-            s = s .. '}access{\n'
-            ngx.var.a = s
-        }
-        content_by_lua_block {
-            local s = ngx.var.a
-            s = s .. [[}content{]]
-            ngx.say(s)
-            ngx.say("glob: ", glob)
-        }
-        log_by_lua_block {
-            print("log by lua running \"}{!\"")
-        }
-        header_filter_by_lua_block {
-            ngx.header["Foo"] = "\"Hello, world\""
-            ngx.header["Content-Length"] = nil
-        }
-        body_filter_by_lua_block {
-            local data, eof = ngx.arg[1], ngx.arg[2]
-            print("eof = ", eof)
-            if eof then
-                if not data then
-                    data = ""
-                end
-                data = data .. "}body filter{\n"
-                print("data: ", data)
-                ngx.arg[1] = data
-            end
-        }
-    }
---- request
-GET /t
---- response_body
-}rewrite{
-}access{
-}content{
-glob: init by lua }here{, init worker }here{
-}body filter{
-
---- response_headers
-Foo: "Hello, world"
---- error_log
-log by lua running "}{!"
---- no_error_log
-[error]
-
-
-
-=== TEST 10: missing ]] (string)
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say([[hello, world")
-        }
-    }
---- request
-GET /t
---- response_body
-hello, world
---- no_error_log
-[error]
---- must_die
---- error_log eval
-qr/\[emerg\] .*? Lua code block missing the closing long bracket "]]" in .*?\bnginx\.conf:41/
-
-
-
-=== TEST 11: missing ]==] (string)
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say([==[hello, world")
-        }
-    }
---- request
-GET /t
---- response_body
-hello, world
---- no_error_log
-[error]
---- must_die
---- error_log eval
-qr/\[emerg\] .*? Lua code block missing the closing long bracket "]==]" in .*?\bnginx\.conf:41/
-
-
-
-=== TEST 12: missing ]] (comment)
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say(--[[hello, world")
-        }
-    }
---- request
-GET /t
---- response_body
-hello, world
---- no_error_log
-[error]
---- must_die
---- error_log eval
-qr/\[emerg\] .*? Lua code block missing the closing long bracket "]]" in .*?\bnginx\.conf:41/
-
-
-
-=== TEST 13: missing ]=] (comment)
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say(--[=[hello, world")
-        }
-    }
---- request
-GET /t
---- response_body
-hello, world
---- no_error_log
-[error]
---- must_die
---- error_log eval
-qr/\[emerg\] .*? Lua code block missing the closing long bracket "]=]" in .*?\bnginx\.conf:41/
-
-
-
-=== TEST 14: missing }
-FIXME: we need better diagnostics by actually loading the inlined Lua code while parsing
-the *_by_lua_block directive.
-
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say("hello")
---- request
-GET /t
---- response_body
-hello, world
---- no_error_log
-[error]
---- error_log
-"events" directive is not allowed here
---- must_die
-
-
-
-=== TEST 15: content_by_lua_block (compact)
---- config
-    location = /t {
-        content_by_lua_block {ngx.say("hello, world", {"!"})}
-    }
---- request
-GET /t
---- response_body
-hello, world!
---- no_error_log
-[error]
-
-
-
-=== TEST 16: content_by_lua_block unexpected closing long brackets must FAIL
---- config
-    location = /t {
-        content_by_lua_block {
-            ]=]
-        }
-    }
---- request
-GET /t
---- error_code: 500
---- error_log eval
-qr{\[error\] .*? unexpected symbol near ']'}
-
-
-
-=== TEST 17: content_by_lua_block unexpected closing long brackets ignored (GitHub #748)
---- config
-    location = /t {
-        content_by_lua_block {
-            local t1, t2 = {"hello world"}, {1}
-            ngx.say(t1[t2[1]])
-        }
-    }
---- request
-GET /t
---- response_body
-hello world
---- no_error_log
-[error]
-
-
-
-=== TEST 18: simple set_by_lua_block (integer)
---- config
-    location /lua {
-        set_by_lua_block $res { return 1+1 }
-        echo $res;
-    }
---- request
-GET /lua
---- response_body
-2
---- no_error_log
-[error]
-
-
-
-=== TEST 19: ambiguous line comments inside a long bracket string (GitHub #596)
---- config
-    location = /t {
-        content_by_lua_block {
-            ngx.say([[ok--]])
-            ngx.say([==[ok--]==])
-            ngx.say([==[ok-- ]==])
-            --[[ --]] ngx.say("done")
-        }
-    }
---- request
-GET /t
---- response_body
-ok--
-ok--
-ok-- 
-done
---- no_error_log
-[error]
-
-
-
-=== TEST 20: double quotes in long brackets
---- config
-    location = /t {
-        rewrite_by_lua_block { print([[Hey, it is "!]]) } content_by_lua_block { ngx.say([["]]) }
-    }
---- request
-GET /t
---- response_body
-"
---- error_log
-Hey, it is "!
---- no_error_log
-[error]
-
-
-
-=== TEST 21: single quotes in long brackets
---- config
-    location = /t {
-        rewrite_by_lua_block { print([[Hey, it is '!]]) } content_by_lua_block { ngx.say([[']]) }
-    }
---- request
-GET /t
---- response_body
-'
---- error_log
-Hey, it is '!
---- no_error_log
-[error]
-
-
-
-=== TEST 22: lexer no match due to incomplete data chunks in a fixed size buffer
---- config
-        location /test1 {
-            content_by_lua_block {
-                ngx.say("1: this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error")
-            }
-        }
-        location /test2 {
-            content_by_lua_block {
-                ngx.say("2: this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error")
-            }
-        }
-
-        location /test3 {
-            content_by_lua_block {
-                ngx.say("3: this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error",
-                "this is just some random filler to cause an error")
-            }
-        }
---- request
-GET /test3
---- response_body eval
-"3: " . ("this is just some random filler to cause an error" x 20) . "\n"
---- no_error_log
-[error]
-
-
-
-=== TEST 23: lexer should not stop lexing in the middle of a value
---- config
-    location /t {
-        content_by_lua_block {
-            ngx.say("}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                }")
-            ngx.say("}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                }")
-        }
-    }
---- request
-GET /t
---- response_body_like: }
---- no_error_log
-[error]
-
-
-
-=== TEST 24: inline Lua code cache should not mess up across different phases
---- http_config
-            # The indent is enforced to generate the same hash tags
-            ssl_session_fetch_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-            ssl_session_store_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-
-        upstream backend {
-            server 0.0.0.1;
-            balancer_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-        }
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-            ssl_certificate_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-        ssl_session_tickets off;
-
-        location /foo {
-            set_by_lua_block $x {
-                ngx.log(ngx.INFO, "hello")
-            }
-            rewrite_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-            access_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-            content_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-            header_filter_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-            body_filter_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-            log_by_lua_block {
-                ngx.log(ngx.INFO, "hello")
-            }
-        }
-    }
---- config
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location = /proxy {
-        proxy_pass http://backend;
-    }
-
-    location /t {
-        content_by_lua_block {
-            ngx.location.capture("/proxy")
-
-            local sock = ngx.socket.tcp()
-            sock:settimeout(2000)
-            local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local sess, err = sock:sslhandshake(nil, "test.com", true)
-            if not sess then
-                ngx.say("failed to do SSL handshake: ", err)
-                return
-            end
-            package.loaded.session = sess
-            sock:close()
-
-            local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock")
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-            if not sess then
-                ngx.say("failed to do SSL handshake: ", err)
-                return
-            end
-
-            local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-            local bytes, err = sock:send(req)
-            if not bytes then
-                ngx.say("failed to send http request: ", err)
-                return
-            end
-        }
-    }
---- request
-GET /t
---- no_error_log
-[error]
---- error_log eval
-[
-qr/balancer_by_lua:\d+: hello/,
-qr/ssl_session_fetch_by_lua_block:\d+: hello/,
-qr/ssl_certificate_by_lua:\d+: hello/,
-qr/ssl_session_store_by_lua_block:\d+: hello/,
-qr/set_by_lua:\d+: hello/,
-qr/rewrite_by_lua\(nginx\.conf:\d+\):\d+: hello/,
-qr/access_by_lua\(nginx\.conf:\d+\):\d+: hello/,
-qr/content_by_lua\(nginx\.conf:\d+\):\d+: hello/,
-qr/header_filter_by_lua:\d+: hello/,
-qr/body_filter_by_lua:\d+: hello/,
-qr/log_by_lua\(nginx\.conf:\d+\):\d+: hello/,
-]
diff --git a/debian/modules/http-lua/t/133-worker-count.t b/debian/modules/http-lua/t/133-worker-count.t
deleted file mode 100644
index 3e03ecc..0000000
--- a/debian/modules/http-lua/t/133-worker-count.t
+++ /dev/null
@@ -1,72 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: content_by_lua
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say("workers: ", ngx.worker.count())
-        }
-    }
---- request
-GET /lua
---- response_body
-workers: 1
---- no_error_log
-[error]
-
-
-
-=== TEST 2: init_by_lua
---- http_config
-    init_by_lua_block {
-        package.loaded.count = ngx.worker.count()
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say("workers: ", package.loaded.count)
-        }
-    }
---- request
-GET /lua
---- response_body
-workers: 1
---- no_error_log
-[error]
-
-
-
-=== TEST 3: init_worker_by_lua
---- http_config
-    init_worker_by_lua_block {
-        init_worker_count = ngx.worker.count()
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say("workers: ", init_worker_count)
-        }
-    }
---- request
-GET /lua
---- response_body
-workers: 1
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/134-worker-count-5.t b/debian/modules/http-lua/t/134-worker-count-5.t
deleted file mode 100644
index b257c12..0000000
--- a/debian/modules/http-lua/t/134-worker-count-5.t
+++ /dev/null
@@ -1,78 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-workers(5);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say("worker count: ", ngx.worker.count())
-        }
-    }
---- request
-GET /lua
---- response_body
-worker count: 5
---- no_error_log
-[error]
-
-
-
-=== TEST 2: init_by_lua
---- http_config
-    init_by_lua_block {
-        package.loaded.count = ngx.worker.count()
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say("workers: ", package.loaded.count)
-        }
-    }
---- request
-GET /lua
---- response_body
-workers: 5
---- no_error_log
-[error]
-
-
-
-=== TEST 3: init_by_lua + module (github #681)
---- http_config
-    lua_package_path "t/servroot/html/?.lua;;";
-
-    init_by_lua_block {
-        local blah = require "file"
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say("ok")
-        }
-    }
---- user_files
->>> file.lua
-local timer_interval = 1
-local time_factor = timer_interval / (ngx.worker.count() * 60)
---- request
-GET /lua
---- response_body
-ok
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/135-worker-id.t b/debian/modules/http-lua/t/135-worker-id.t
deleted file mode 100644
index 8241157..0000000
--- a/debian/modules/http-lua/t/135-worker-id.t
+++ /dev/null
@@ -1,33 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-master_on();
-workers(2);
-#log_level('warn');
-
-#repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say("worker id: ", ngx.worker.id())
-        }
-    }
---- request
-GET /lua
---- response_body_like chop
-^worker id: [0-1]$
---- no_error_log
-[error]
---- skip_nginx: 3: <=1.9.0
diff --git a/debian/modules/http-lua/t/136-timer-counts.t b/debian/modules/http-lua/t/136-timer-counts.t
deleted file mode 100644
index 8f5329b..0000000
--- a/debian/modules/http-lua/t/136-timer-counts.t
+++ /dev/null
@@ -1,111 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(1);
-
-plan tests => blocks() * (repeat_each() * 3);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: running count with no running timers
---- config
-    location /timers {
-        content_by_lua_block { ngx.say(ngx.timer.running_count()) }
-    }
---- request
-GET /timers
---- response_body
-0
---- no_error_log
-[error]
-
-
-
-=== TEST 2: running count with no pending timers
---- config
-    location /timers {
-        content_by_lua_block { ngx.say(ngx.timer.pending_count()) }
-    }
---- request
-GET /timers
---- response_body
-0
---- no_error_log
-[error]
-
-
-
-=== TEST 3: pending count with one pending timer
---- config
-    location /timers {
-        content_by_lua_block {
-            ngx.timer.at(3, function() end)
-            ngx.say(ngx.timer.pending_count())
-        }
-    }
---- request
-GET /timers
---- response_body
-1
---- no_error_log
-[error]
-
-
-
-=== TEST 4: pending count with 3 pending timers
---- config
-    location /timers {
-        content_by_lua_block {
-            ngx.timer.at(4, function() end)
-            ngx.timer.at(2, function() end)
-            ngx.timer.at(1, function() end)
-            ngx.say(ngx.timer.pending_count())
-        }
-    }
---- request
-GET /timers
---- response_body
-3
---- no_error_log
-[error]
-
-
-
-=== TEST 5: one running timer
---- config
-    location /timers {
-        content_by_lua_block {
-            ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
-            ngx.sleep(0.2)
-            ngx.say(ngx.timer.running_count())
-        }
-    }
---- request
-GET /timers
---- response_body
-1
---- no_error_log
-[error]
-
-
-
-=== TEST 6: 3 running timers
---- config
-    location /timers {
-        content_by_lua_block {
-            ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
-            ngx.timer.at(0.11, function() ngx.sleep(0.3) end)
-            ngx.timer.at(0.09, function() ngx.sleep(0.3) end)
-            ngx.sleep(0.2)
-            ngx.say(ngx.timer.running_count())
-        }
-    }
---- request
-GET /timers
---- response_body
-3
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/137-req-misc.t b/debian/modules/http-lua/t/137-req-misc.t
deleted file mode 100644
index d56f80e..0000000
--- a/debian/modules/http-lua/t/137-req-misc.t
+++ /dev/null
@@ -1,61 +0,0 @@
-use Test::Nginx::Socket::Lua;
-
-#master_on();
-#workers(1);
-#worker_connections(1014);
-#log_level('warn');
-#master_process_enabled(1);
-
-repeat_each(2);
-
-plan tests => repeat_each() * blocks() * 2;
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#no_diff();
-no_long_string();
-#no_shuffle();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: not internal request
---- config
-    location /test {
-        rewrite ^/test$ /lua last;
-    }
-    location /lua {
-        content_by_lua '
-            if ngx.req.is_internal() then
-                ngx.say("internal")
-            else
-                ngx.say("not internal")
-            end
-        ';
-    }
---- request
-GET /lua
---- response_body
-not internal
-
-
-
-=== TEST 2: internal request
---- config
-    location /test {
-        rewrite ^/test$ /lua last;
-    }
-    location /lua {
-        content_by_lua '
-            if ngx.req.is_internal() then
-                ngx.say("internal")
-            else
-                ngx.say("not internal")
-            end
-        ';
-    }
---- request
-GET /test
---- response_body
-internal
diff --git a/debian/modules/http-lua/t/138-balancer.t b/debian/modules/http-lua/t/138-balancer.t
deleted file mode 100644
index 0aba66d..0000000
--- a/debian/modules/http-lua/t/138-balancer.t
+++ /dev/null
@@ -1,528 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4 + 9);
-
-#no_diff();
-no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple logging
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            print("hello from balancer by lua!")
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-[
-'[lua] balancer_by_lua:2: hello from balancer by lua! while connecting to upstream,',
-qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
-]
---- no_error_log
-[warn]
-
-
-
-=== TEST 2: exit 403
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            print("hello from balancer by lua!")
-            ngx.exit(403)
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- response_body_like: 403 Forbidden
---- error_code: 403
---- error_log
-[lua] balancer_by_lua:2: hello from balancer by lua! while connecting to upstream,
---- no_error_log eval
-[
-'[warn]',
-qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
-]
-
-
-
-=== TEST 3: exit OK
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            print("hello from balancer by lua!")
-            ngx.exit(ngx.OK)
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-[
-'[lua] balancer_by_lua:2: hello from balancer by lua! while connecting to upstream,',
-qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
-]
---- no_error_log
-[warn]
-
-
-
-=== TEST 4: ngx.var works
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            print("1: variable foo = ", ngx.var.foo)
-            ngx.var.foo = tonumber(ngx.var.foo) + 1
-            print("2: variable foo = ", ngx.var.foo)
-        }
-    }
---- config
-    location = /t {
-        set $foo 32;
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-[
-"1: variable foo = 32",
-"2: variable foo = 33",
-qr/\[crit\] .* connect\(\) .*? failed/,
-]
---- no_error_log
-[warn]
-
-
-
-=== TEST 5: ngx.req.get_headers works
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            print("header foo: ", ngx.req.get_headers()["foo"])
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- more_headers
-Foo: bar
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-[
-"header foo: bar",
-qr/\[crit\] .* connect\(\) .*? failed/,
-]
---- no_error_log
-[warn]
-
-
-
-=== TEST 6: ngx.req.get_uri_args() works
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            print("arg foo: ", (ngx.req.get_uri_args())["foo"])
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t?baz=blah&foo=bar
---- more_headers
-Foo: bar
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-["arg foo: bar",
-qr/\[crit\] .* connect\(\) .*? failed/,
-]
---- no_error_log
-[warn]
-
-
-
-=== TEST 7: ngx.req.get_method() works
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            print("method: ", ngx.req.get_method())
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- more_headers
-Foo: bar
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-[
-"method: GET",
-qr/\[crit\] .* connect\(\) .*? failed/,
-]
---- no_error_log
-[warn]
-
-
-
-=== TEST 8: simple logging (by_lua_file)
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_file html/a.lua;
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- user_files
->>> a.lua
-print("hello from balancer by lua!")
---- request
-    GET /t
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-[
-'[lua] a.lua:1: hello from balancer by lua! while connecting to upstream,',
-qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
-]
---- no_error_log
-[warn]
-
-
-
-=== TEST 9: cosockets are disabled
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            local sock, err = ngx.socket.tcp()
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-qr/\[error\] .*? failed to run balancer_by_lua\*: balancer_by_lua:2: API disabled in the context of balancer_by_lua\*/
-
-
-
-=== TEST 10: ngx.sleep is disabled
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            ngx.sleep(0.1)
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- response_body_like: 500 Internal Server Error
---- error_code: 500
---- error_log eval
-qr/\[error\] .*? failed to run balancer_by_lua\*: balancer_by_lua:2: API disabled in the context of balancer_by_lua\*/
-
-
-
-=== TEST 11: get_phase
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            print("I am in phase ", ngx.get_phase())
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- grep_error_log eval: qr/I am in phase \w+/
---- grep_error_log_out
-I am in phase balancer
---- error_log eval
-qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"}
---- no_error_log
-[error]
-
-
-
-=== TEST 12: code cache off
---- http_config
-    lua_package_path "$TEST_NGINX_SERVER_ROOT/html/?.lua;;";
-
-    lua_code_cache off;
-
-    upstream backend {
-        server 127.0.0.1:$TEST_NGINX_SERVER_PORT;
-        balancer_by_lua_block {
-            require("test")
-        }
-    }
---- config
-    location = /t {
-        echo_location /main;
-        echo_location /update;
-        echo_location /main;
-    }
-
-    location = /update {
-        content_by_lua_block {
-            -- os.execute("(echo HERE; pwd) > /dev/stderr")
-            local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
-            f:write("print('me: ', 101)")
-            f:close()
-            ngx.say("updated")
-        }
-    }
-
-    location = /main {
-        proxy_pass http://backend/back;
-    }
-
-    location = /back {
-        echo ok;
-    }
---- request
-    GET /t
---- user_files
->>> test.lua
-print("me: ", 32)
-return {}
---- response_body
-ok
-updated
-ok
---- grep_error_log eval: qr/\bme: \w+/
---- grep_error_log_out
-me: 32
-me: 101
---- no_error_log
-[error]
-
-
-
-=== TEST 13: lua subrequests
---- http_config
-    lua_package_path "t/servroot/html/?.lua;;";
-
-    lua_code_cache off;
-
-    upstream backend {
-        server 127.0.0.1:$TEST_NGINX_SERVER_PORT;
-        balancer_by_lua_block {
-            print("ctx counter: ", ngx.ctx.count)
-            if not ngx.ctx.count then
-                ngx.ctx.count = 1
-            else
-                ngx.ctx.count = ngx.ctx.count + 1
-            end
-        }
-    }
---- config
-    location = /t {
-        content_by_lua_block {
-            local res = ngx.location.capture("/main")
-            ngx.print(res.body)
-            res = ngx.location.capture("/main")
-            ngx.print(res.body)
-        }
-    }
-
-    location = /main {
-        proxy_pass http://backend/back;
-    }
-
-    location = /back {
-        echo ok;
-    }
---- request
-    GET /t
---- response_body
-ok
-ok
---- grep_error_log eval: qr/\bctx counter: \w+/
---- grep_error_log_out
-ctx counter: nil
-ctx counter: nil
---- no_error_log
-[error]
-
-
-
-=== TEST 14: ngx.log(ngx.ERR, ...) github #816
---- http_config
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            ngx.log(ngx.ERR, "hello from balancer by lua!")
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- error_log eval
-[
-'[lua] balancer_by_lua:2: hello from balancer by lua! while connecting to upstream,',
-qr{\[crit\] .*? connect\(\) to 0\.0\.0\.1:80 failed .*?, upstream: "http://0\.0\.0\.1:80/t"},
-]
---- no_error_log
-[warn]
-
-
-
-=== TEST 15: test if execeed proxy_next_upstream_limit
---- http_config
-    lua_package_path "../lua-resty-core/lib/?.lua;;";
-
-    proxy_next_upstream_tries 5;
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            local b = require "ngx.balancer"
-
-            if not ngx.ctx.tries then
-                ngx.ctx.tries = 0
-            end
-
-            if ngx.ctx.tries >= 6 then
-                ngx.log(ngx.ERR, "retry count exceed limit")
-                ngx.exit(500)
-            end
-
-            ngx.ctx.tries = ngx.ctx.tries + 1
-            print("retry counter: ", ngx.ctx.tries)
-
-            local ok, err = b.set_more_tries(2)
-            if not ok then
-                return error("failed to set more tries: ", err)
-            elseif err then
-                ngx.log(ngx.WARN, "set more tries: ", err)
-            end
-
-            assert(b.set_current_peer("127.0.0.1", 81))
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend/back;
-    }
-
-    location = /back {
-        return 404;
-    }
---- request
-    GET /t
---- response_body_like: 502 Bad Gateway
---- error_code: 502
---- grep_error_log eval: qr/\bretry counter: \w+/
---- grep_error_log_out
-retry counter: 1
-retry counter: 2
-retry counter: 3
-retry counter: 4
-retry counter: 5
-
---- error_log
-set more tries: reduced tries due to limit
-
-
-
-=== TEST 16: set_more_tries bugfix
---- http_config
-    lua_package_path "../lua-resty-core/lib/?.lua;;";
-	proxy_next_upstream_tries 0;
-    upstream backend {
-        server 0.0.0.1;
-        balancer_by_lua_block {
-            local balancer = require "ngx.balancer"
-			local ctx = ngx.ctx
-			if not ctx.has_run then
-				ctx.has_run = true
-				local _, err = balancer.set_more_tries(3)
-				if err then
-					ngx.log(ngx.ERR, "failed to set more tries: ", err)
-				end
-			end
-			balancer.set_current_peer("127.0.0.1", 81)
-        }
-    }
---- config
-    location = /t {
-        proxy_pass http://backend;
-    }
---- request
-    GET /t
---- error_code: 502
---- grep_error_log eval: qr/http next upstream, \d+/
---- grep_error_log_out
-http next upstream, 2
-http next upstream, 2
-http next upstream, 2
-http next upstream, 2
---- no_error_log
-failed to set more tries: reduced tries due to limit
-[alert]
diff --git a/debian/modules/http-lua/t/139-ssl-cert-by.t b/debian/modules/http-lua/t/139-ssl-cert-by.t
deleted file mode 100644
index a65d703..0000000
--- a/debian/modules/http-lua/t/139-ssl-cert-by.t
+++ /dev/null
@@ -1,2077 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(3);
-
-# All these tests need to have new openssl
-my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
-my $openssl_version = eval { `$NginxBinary -V 2>&1` };
-
-if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
-    plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
-} else {
-    plan tests => repeat_each() * (blocks() * 6 + 4);
-}
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-#log_level 'warn';
-log_level 'debug';
-
-no_long_string();
-#no_diff();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple logging
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-
---- no_error_log
-[error]
-[alert]
---- grep_error_log eval: qr/ssl_certificate_by_lua:.*?,|\bssl cert: connection reusable: \d+|\breusable connection: \d+/
---- grep_error_log_out eval
-qr/reusable connection: 1
-ssl cert: connection reusable: 1
-reusable connection: 0
-ssl_certificate_by_lua:1: ssl cert by lua is running!,
-/
-
-
-
-=== TEST 2: sleep
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            local begin = ngx.now()
-            ngx.sleep(0.1)
-            print("elapsed in ssl cert by lua: ", ngx.now() - begin)
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log eval
-[
-'lua ssl server name: "test.com"',
-qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
-]
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 3: timer
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            local function f()
-                print("my timer run!")
-            end
-            local ok, err = ngx.timer.at(0, f)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to create timer: ", err)
-                return
-            end
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-my timer run!
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 4: cosocket
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeout(2000)
-
-            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to connect to memc: ", err)
-                return
-            end
-
-            local bytes, err = sock:send("flush_all\r\n")
-            if not bytes then
-                ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
-                return
-            end
-
-            local res, err = sock:receive()
-            if not res then
-                ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
-                return
-            end
-
-            print("received memc reply: ", res)
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-received memc reply: OK
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 5: ngx.exit(0) - no yield
---- http_config
-    server {
-        listen 127.0.0.2:8080 ssl;
-        server_name test.com;
-        ssl_certificate_by_lua_block {
-            ngx.exit(0)
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                local ok, err = sock:connect("127.0.0.2", 8080)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake(false, nil, true, false)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: boolean
-
---- error_log
-lua exit with code 0
-
---- no_error_log
-should never reached here
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 6: ngx.exit(ngx.ERROR) - no yield
---- http_config
-    server {
-        listen 127.0.0.2:8080 ssl;
-        server_name test.com;
-        ssl_certificate_by_lua_block {
-            ngx.exit(ngx.ERROR)
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                local ok, err = sock:connect("127.0.0.2", 8080)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake(false, nil, true, false)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: handshake failed
-
---- error_log eval
-[
-'lua_certificate_by_lua: handler return value: -1, cert cb exit code: 0',
-qr/\[crit\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
-'lua exit with code -1',
-]
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 7: ngx.exit(0) -  yield
---- http_config
-    server {
-        listen 127.0.0.2:8080 ssl;
-        server_name test.com;
-        ssl_certificate_by_lua_block {
-            ngx.sleep(0.001)
-            ngx.exit(0)
-
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                local ok, err = sock:connect("127.0.0.2", 8080)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake(false, nil, true, false)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: boolean
-
---- error_log
-lua exit with code 0
-
---- no_error_log
-should never reached here
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 8: ngx.exit(ngx.ERROR) - yield
---- http_config
-    server {
-        listen 127.0.0.2:8080 ssl;
-        server_name test.com;
-        ssl_certificate_by_lua_block {
-            ngx.sleep(0.001)
-            ngx.exit(ngx.ERROR)
-
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                local ok, err = sock:connect("127.0.0.2", 8080)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake(false, nil, true, false)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: handshake failed
-
---- error_log eval
-[
-'lua_certificate_by_lua: cert cb exit code: 0',
-qr/\[crit\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
-'lua exit with code -1',
-]
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 9: lua exception - no yield
---- http_config
-    server {
-        listen 127.0.0.2:8080 ssl;
-        server_name test.com;
-        ssl_certificate_by_lua_block {
-            error("bad bad bad")
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                local ok, err = sock:connect("127.0.0.2", 8080)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake(false, nil, true, false)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: handshake failed
-
---- error_log eval
-[
-'runtime error: ssl_certificate_by_lua:2: bad bad bad',
-'lua_certificate_by_lua: handler return value: 500, cert cb exit code: 0',
-qr/\[crit\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
-qr/context: ssl_certificate_by_lua\*, client: \d+\.\d+\.\d+\.\d+, server: \d+\.\d+\.\d+\.\d+:\d+/,
-]
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 10: lua exception - yield
---- http_config
-    server {
-        listen 127.0.0.2:8080 ssl;
-        server_name test.com;
-        ssl_certificate_by_lua_block {
-            ngx.sleep(0.001)
-            error("bad bad bad")
-            ngx.log(ngx.ERR, "should never reached here...")
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                local ok, err = sock:connect("127.0.0.2", 8080)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake(false, nil, true, false)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: handshake failed
-
---- error_log eval
-[
-'runtime error: ssl_certificate_by_lua:3: bad bad bad',
-'lua_certificate_by_lua: cert cb exit code: 0',
-qr/\[crit\] .*? SSL_do_handshake\(\) failed .*?cert cb error/,
-]
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 11: get phase
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {print("get_phase: ", ngx.get_phase())}
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-            end
-            collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-
---- error_log
-lua ssl server name: "test.com"
-get_phase: ssl_cert
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 12: connection aborted prematurely
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            ngx.sleep(0.3)
-            -- local ssl = require "ngx.ssl"
-            -- ssl.clear_certs()
-            print("ssl-cert-by-lua: after sleeping")
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(150)
-
-                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 sess, err = sock:sslhandshake(false, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
-
---- response_body
-connected: 1
-failed to do SSL handshake: timeout
-
---- error_log
-lua ssl server name: "test.com"
-ssl-cert-by-lua: after sleeping
-
---- no_error_log
-[error]
-[alert]
---- wait: 0.6
-
-
-
-=== TEST 13: subrequests disabled
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {ngx.location.capture("/foo")}
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: handshake failed
-
---- error_log eval
-[
-'lua ssl server name: "test.com"',
-'ssl_certificate_by_lua:1: API disabled in the context of ssl_certificate_by_lua*',
-qr/\[crit\] .*?cert cb error/,
-]
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 14: simple logging (by_lua_file)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_file html/a.lua;
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block {ngx.status = 201 ngx.say("foo") ngx.exit(201)}
-            more_clear_headers Date;
-        }
-    }
-
---- user_files
->>> a.lua
-print("ssl cert by lua is running!")
-
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-a.lua:1: ssl cert by lua is running!
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 15: coroutine API
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            local cc, cr, cy = coroutine.create, coroutine.resume, coroutine.yield
-
-            local function f()
-                local cnt = 0
-                for i = 1, 20 do
-                    print("co yield: ", cnt)
-                    cy()
-                    cnt = cnt + 1
-                end
-            end
-
-            local c = cc(f)
-            for i = 1, 3 do
-                print("co resume, status: ", coroutine.status(c))
-                cr(c)
-            end
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- grep_error_log eval: qr/co (?:yield: \d+|resume, status: \w+)/
---- grep_error_log_out
-co resume, status: suspended
-co yield: 0
-co resume, status: suspended
-co yield: 1
-co resume, status: suspended
-co yield: 2
-
---- error_log
-lua ssl server name: "test.com"
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 16: simple user thread wait with yielding
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            function f()
-                ngx.sleep(0.01)
-                print("uthread: hello in thread")
-                return "done"
-            end
-
-            local t, err = ngx.thread.spawn(f)
-            if not t then
-                ngx.log(ngx.ERR, "uthread: failed to spawn thread: ", err)
-                return ngx.exit(ngx.ERROR)
-            end
-
-            print("uthread: thread created: ", coroutine.status(t))
-
-            local ok, res = ngx.thread.wait(t)
-            if not ok then
-                print("uthread: failed to wait thread: ", res)
-                return
-            end
-
-            print("uthread: ", res)
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- no_error_log
-[error]
-[alert]
---- grep_error_log eval: qr/uthread: [^.,]+/
---- grep_error_log_out
-uthread: thread created: running
-uthread: hello in thread
-uthread: done
-
-
-
-=== TEST 17: simple logging - use ssl_certificate_by_lua* on the http {} level
-GitHub openresty/lua-resty-core#42
---- http_config
-    ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
-    ssl_certificate ../../cert/test.crt;
-    ssl_certificate_key ../../cert/test.key;
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-ssl_certificate_by_lua:1: ssl cert by lua is running!
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 18: simple logging (syslog)
-github issue #723
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        error_log syslog:server=127.0.0.1:12345 debug;
-
-        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log eval
-[
-qr/\[error\] .*? send\(\) failed/,
-'lua ssl server name: "test.com"',
-]
---- no_error_log
-[alert]
-ssl_certificate_by_lua:1: ssl cert by lua is running!
-
-
-
-=== TEST 19: check the count of running timers
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /timers {
-            default_type 'text/plain';
-            content_by_lua_block {
-                ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
-                ngx.timer.at(0.11, function() ngx.sleep(0.3) end)
-                ngx.timer.at(0.09, function() ngx.sleep(0.3) end)
-                ngx.sleep(0.2)
-                ngx.say(ngx.timer.running_count())
-            }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /timers HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 59 bytes.
-received: HTTP/1.1 200 OK
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 2
-received: Connection: close
-received: 
-received: 3
-close: 1 nil
-
---- error_log eval
-[
-'ssl_certificate_by_lua:1: ssl cert by lua is running!',
-'lua ssl server name: "test.com"',
-]
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 20: some server {} block missing ssl_certificate_by_lua* handlers (literal server name)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /timers {
-            default_type 'text/plain';
-            content_by_lua_block {
-                ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
-                ngx.timer.at(0.11, function() ngx.sleep(0.3) end)
-                ngx.timer.at(0.09, function() ngx.sleep(0.3) end)
-                ngx.sleep(0.2)
-                ngx.say(ngx.timer.running_count())
-            }
-            more_clear_headers Date;
-        }
-    }
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test2.com;
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test2.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /timers HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: handshake failed
-
---- error_log eval
-[
-qr/\[alert\] .*? no ssl_certificate_by_lua\* defined in server test2\.com\b/,
-qr/\[crit\] .*? SSL_do_handshake\(\) failed\b/,
-]
-
-
-
-=== TEST 21: some server {} block missing ssl_certificate_by_lua* handlers (regex server name)
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block { print("ssl cert by lua is running!") }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /timers {
-            default_type 'text/plain';
-            content_by_lua_block {
-                ngx.timer.at(0.1, function() ngx.sleep(0.3) end)
-                ngx.timer.at(0.11, function() ngx.sleep(0.3) end)
-                ngx.timer.at(0.09, function() ngx.sleep(0.3) end)
-                ngx.sleep(0.2)
-                ngx.say(ngx.timer.running_count())
-            }
-            more_clear_headers Date;
-        }
-    }
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name ~test2\.com;
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test2.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /timers HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-failed to do SSL handshake: handshake failed
-
---- error_log eval
-[
-qr/\[alert\] .*? no ssl_certificate_by_lua\* defined in server ~test2\\\.com\b/,
-qr/\[crit\] .*? SSL_do_handshake\(\) failed\b/,
-]
-
-
-
-=== TEST 22: get raw_client_addr - IPv4
---- http_config
-    lua_package_path "../lua-resty-core/lib/?.lua;;";
-
-    server {
-        listen 127.0.0.1:12345 ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block {
-            local ssl = require "ngx.ssl"
-            local byte = string.byte
-            local addr, addrtype, err = ssl.raw_client_addr()
-            local ip = string.format("%d.%d.%d.%d", byte(addr, 1), byte(addr, 2),
-                       byte(addr, 3), byte(addr, 4))
-            print("client ip: ", ip)
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                local ok, err = sock:connect("127.0.0.1", 12345)
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-client ip: 127.0.0.1
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 23: get raw_client_addr - unix domain socket
---- http_config
-    lua_package_path "../lua-resty-core/lib/?.lua;;";
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block {
-            local ssl = require "ngx.ssl"
-            local addr, addrtyp, err = ssl.raw_client_addr()
-            print("client socket file: ", addr)
-        }
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-client socket file: 
-
---- no_error_log
-[error]
-[alert]
diff --git a/debian/modules/http-lua/t/140-ssl-c-api.t b/debian/modules/http-lua/t/140-ssl-c-api.t
deleted file mode 100644
index 8734d14..0000000
--- a/debian/modules/http-lua/t/140-ssl-c-api.t
+++ /dev/null
@@ -1,813 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(3);
-
-# All these tests need to have new openssl
-my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
-my $openssl_version = eval { `$NginxBinary -V 2>&1` };
-
-if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
-    plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
-} else {
-    plan tests => repeat_each() * (blocks() * 5 + 1);
-}
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-
-#log_level 'warn';
-log_level 'debug';
-
-no_long_string();
-#no_diff();
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    if (!defined $block->user_files) {
-        $block->set_value("user_files", <<'_EOC_');
->>> defines.lua
-local ffi = require "ffi"
-
-ffi.cdef[[
-    int ngx_http_lua_ffi_cert_pem_to_der(const unsigned char *pem,
-        size_t pem_len, unsigned char *der, char **err);
-
-    int ngx_http_lua_ffi_priv_key_pem_to_der(const unsigned char *pem,
-        size_t pem_len, unsigned char *der, char **err);
-
-    int ngx_http_lua_ffi_ssl_set_der_certificate(void *r,
-        const char *data, size_t len, char **err);
-
-    int ngx_http_lua_ffi_ssl_set_der_private_key(void *r,
-        const char *data, size_t len, char **err);
-
-    int ngx_http_lua_ffi_ssl_clear_certs(void *r, char **err);
-
-    void *ngx_http_lua_ffi_parse_pem_cert(const unsigned char *pem,
-        size_t pem_len, char **err);
-
-    void *ngx_http_lua_ffi_parse_pem_priv_key(const unsigned char *pem,
-        size_t pem_len, char **err);
-
-    int ngx_http_lua_ffi_set_cert(void *r,
-        void *cdata, char **err);
-
-    int ngx_http_lua_ffi_set_priv_key(void *r,
-        void *cdata, char **err);
-
-    void ngx_http_lua_ffi_free_cert(void *cdata);
-
-    void ngx_http_lua_ffi_free_priv_key(void *cdata);
-
-    int ngx_http_lua_ffi_ssl_clear_certs(void *r, char **err);
-]]
-_EOC_
-    }
-
-    my $http_config = $block->http_config || '';
-    $http_config .= <<'_EOC_';
-lua_package_path "$prefix/html/?.lua;;";
-_EOC_
-    $block->set_value("http_config", $http_config);
-});
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple cert + private key
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block {
-            collectgarbage()
-
-            require "defines"
-            local ffi = require "ffi"
-
-            local errmsg = ffi.new("char *[1]")
-
-            local r = getfenv(0).__ngx_req
-            if not r then
-                ngx.log(ngx.ERR, "no request found")
-                return
-            end
-
-            ffi.C.ngx_http_lua_ffi_ssl_clear_certs(r, errmsg)
-
-            local f = assert(io.open("t/cert/test.crt", "rb"))
-            local cert = f:read("*all")
-            f:close()
-
-            local out = ffi.new("char [?]", #cert)
-
-            local rc = ffi.C.ngx_http_lua_ffi_cert_pem_to_der(cert, #cert, out, errmsg)
-            if rc < 1 then
-                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            local cert_der = ffi.string(out, rc)
-
-            local rc = ffi.C.ngx_http_lua_ffi_ssl_set_der_certificate(r, cert_der, #cert_der, errmsg)
-            if rc ~= 0 then
-                ngx.log(ngx.ERR, "failed to set DER cert: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            f = assert(io.open("t/cert/test.key", "rb"))
-            local pkey = f:read("*all")
-            f:close()
-
-            out = ffi.new("char [?]", #pkey)
-
-            local rc = ffi.C.ngx_http_lua_ffi_priv_key_pem_to_der(pkey, #pkey, out, errmsg)
-            if rc < 1 then
-                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            local pkey_der = ffi.string(out, rc)
-
-            local rc = ffi.C.ngx_http_lua_ffi_ssl_set_der_private_key(r, pkey_der, #pkey_der, errmsg)
-            if rc ~= 0 then
-                ngx.log(ngx.ERR, "failed to set DER priv key: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-        }
-
-        ssl_certificate ../../cert/test2.crt;
-        ssl_certificate_key ../../cert/test2.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 2: ECDSA cert + private key
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block {
-            collectgarbage()
-
-            local ffi = require "ffi"
-            require "defines"
-
-            local errmsg = ffi.new("char *[1]")
-
-            local r = getfenv(0).__ngx_req
-            if not r then
-                ngx.log(ngx.ERR, "no request found")
-                return
-            end
-
-            ffi.C.ngx_http_lua_ffi_ssl_clear_certs(r, errmsg)
-
-            local f = assert(io.open("t/cert/test_ecdsa.crt", "rb"))
-            local cert = f:read("*all")
-            f:close()
-
-            local out = ffi.new("char [?]", #cert)
-
-            local rc = ffi.C.ngx_http_lua_ffi_cert_pem_to_der(cert, #cert, out, errmsg)
-            if rc < 1 then
-                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            local cert_der = ffi.string(out, rc)
-
-            local rc = ffi.C.ngx_http_lua_ffi_ssl_set_der_certificate(r, cert_der, #cert_der, errmsg)
-            if rc ~= 0 then
-                ngx.log(ngx.ERR, "failed to set DER cert: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            f = assert(io.open("t/cert/test_ecdsa.key", "rb"))
-            local pkey = f:read("*all")
-            f:close()
-
-            out = ffi.new("char [?]", #pkey)
-
-            local rc = ffi.C.ngx_http_lua_ffi_priv_key_pem_to_der(pkey, #pkey, out, errmsg)
-            if rc < 1 then
-                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            local pkey_der = ffi.string(out, rc)
-
-            local rc = ffi.C.ngx_http_lua_ffi_ssl_set_der_private_key(r, pkey_der, #pkey_der, errmsg)
-            if rc ~= 0 then
-                ngx.log(ngx.ERR, "failed to set DER priv key: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-        }
-
-        ssl_certificate ../../cert/test2.crt;
-        ssl_certificate_key ../../cert/test2.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test_ecdsa.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 3: Handshake continue when cert_pem_to_der errors
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block {
-            collectgarbage()
-
-            local ffi = require "ffi"
-            require "defines"
-
-            local errmsg = ffi.new("char *[1]")
-
-            local r = getfenv(0).__ngx_req
-            if not r then
-                ngx.log(ngx.ERR, "no request found")
-                return
-            end
-
-            local cert = "garbage data"
-
-            local out = ffi.new("char [?]", #cert)
-
-            local rc = ffi.C.ngx_http_lua_ffi_cert_pem_to_der(cert, #cert, out, errmsg)
-            if rc < 1 then
-                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
-                        ffi.string(errmsg[0]))
-            end
-
-            local pkey = "garbage key data"
-
-            out = ffi.new("char [?]", #pkey)
-
-            local rc = ffi.C.ngx_http_lua_ffi_priv_key_pem_to_der(pkey, #pkey, out, errmsg)
-            if rc < 1 then
-                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
-                        ffi.string(errmsg[0]))
-            end
-        }
-
-        ssl_certificate ../../cert/test.crt;
-        ssl_certificate_key ../../cert/test.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-failed to parse PEM cert: PEM_read_bio_X509_AUX()
-failed to parse PEM priv key: PEM_read_bio_PrivateKey() failed
-
---- no_error_log
-[alert]
-
-
-
-=== TEST 4: simple cert + private key cdata
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block {
-            collectgarbage()
-
-            local ffi = require "ffi"
-            require "defines"
-
-            local errmsg = ffi.new("char *[1]")
-
-            local r = getfenv(0).__ngx_req
-            if not r then
-                ngx.log(ngx.ERR, "no request found")
-                return
-            end
-
-            ffi.C.ngx_http_lua_ffi_ssl_clear_certs(r, errmsg)
-
-            local f = assert(io.open("t/cert/test.crt", "rb"))
-            local cert_data = f:read("*all")
-            f:close()
-
-            local cert = ffi.C.ngx_http_lua_ffi_parse_pem_cert(cert_data, #cert_data, errmsg)
-            if not cert then
-                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            local rc = ffi.C.ngx_http_lua_ffi_set_cert(r, cert, errmsg)
-            if rc ~= 0 then
-                ngx.log(ngx.ERR, "failed to set cdata cert: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            ffi.C.ngx_http_lua_ffi_free_cert(cert)
-
-            f = assert(io.open("t/cert/test.key", "rb"))
-            local pkey_data = f:read("*all")
-            f:close()
-
-            local pkey = ffi.C.ngx_http_lua_ffi_parse_pem_priv_key(pkey_data, #pkey_data, errmsg)
-            if pkey == nil then
-                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            local rc = ffi.C.ngx_http_lua_ffi_set_priv_key(r, pkey, errmsg)
-            if rc ~= 0 then
-                ngx.log(ngx.ERR, "failed to set cdata priv key: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            ffi.C.ngx_http_lua_ffi_free_priv_key(pkey)
-        }
-
-        ssl_certificate ../../cert/test2.crt;
-        ssl_certificate_key ../../cert/test2.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 5: ECDSA cert + private key cdata
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate_by_lua_block {
-            collectgarbage()
-
-            local ffi = require "ffi"
-            require "defines"
-
-            local errmsg = ffi.new("char *[1]")
-
-            local r = getfenv(0).__ngx_req
-            if not r then
-                ngx.log(ngx.ERR, "no request found")
-                return
-            end
-
-            ffi.C.ngx_http_lua_ffi_ssl_clear_certs(r, errmsg)
-
-            local f = assert(io.open("t/cert/test_ecdsa.crt", "rb"))
-            local cert_data = f:read("*all")
-            f:close()
-
-            local cert = ffi.C.ngx_http_lua_ffi_parse_pem_cert(cert_data, #cert_data, errmsg)
-            if not cert then
-                ngx.log(ngx.ERR, "failed to parse PEM cert: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            local rc = ffi.C.ngx_http_lua_ffi_set_cert(r, cert, errmsg)
-            if rc ~= 0 then
-                ngx.log(ngx.ERR, "failed to set cdata cert: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            ffi.C.ngx_http_lua_ffi_free_cert(cert)
-
-            f = assert(io.open("t/cert/test_ecdsa.key", "rb"))
-            local pkey_data = f:read("*all")
-            f:close()
-
-            local pkey = ffi.C.ngx_http_lua_ffi_parse_pem_priv_key(pkey_data, #pkey_data, errmsg)
-            if pkey == nil then
-                ngx.log(ngx.ERR, "failed to parse PEM priv key: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            local rc = ffi.C.ngx_http_lua_ffi_set_priv_key(r, pkey, errmsg)
-            if rc ~= 0 then
-                ngx.log(ngx.ERR, "failed to set cdata priv key: ",
-                        ffi.string(errmsg[0]))
-                return
-            end
-
-            ffi.C.ngx_http_lua_ffi_free_priv_key(pkey)
-        }
-
-        ssl_certificate ../../cert/test2.crt;
-        ssl_certificate_key ../../cert/test2.key;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-            more_clear_headers Date;
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../../cert/test_ecdsa.crt;
-
-    location /t {
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(2000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local req = "GET /foo HTTP/1.0\r\nHost: test.com\r\nConnection: close\r\n\r\n"
-                local bytes, err = sock:send(req)
-                if not bytes then
-                    ngx.say("failed to send http request: ", err)
-                    return
-                end
-
-                ngx.say("sent http request: ", bytes, " bytes.")
-
-                while true do
-                    local line, err = sock:receive()
-                    if not line then
-                        -- ngx.say("failed to receive response status line: ", err)
-                        break
-                    end
-
-                    ngx.say("received: ", line)
-                end
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-sent http request: 56 bytes.
-received: HTTP/1.1 201 Created
-received: Server: nginx
-received: Content-Type: text/plain
-received: Content-Length: 4
-received: Connection: close
-received: 
-received: foo
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-
---- no_error_log
-[error]
-[alert]
diff --git a/debian/modules/http-lua/t/141-luajit.t b/debian/modules/http-lua/t/141-luajit.t
deleted file mode 100644
index 36418d1..0000000
--- a/debian/modules/http-lua/t/141-luajit.t
+++ /dev/null
@@ -1,48 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua
-    skip_all => 'no mmap(sbrk(0)) trick since glibc leaks memory in this case';
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-#no_diff();
-#no_long_string();
-run_tests();
-
-__DATA__
-
-=== TEST 1: avoid the data segment from growing on Linux
-This is to maximize the address space that can be used by LuaJIT.
---- config
-    location = /t {
-        content_by_lua_block {
-            local ffi = require "ffi"
-            ffi.cdef[[
-                void *malloc(size_t size);
-                void free(void *p);
-            ]]
-            local p = ffi.C.malloc(1);
-            local num = tonumber(ffi.cast("uintptr_t", p))
-            ffi.C.free(p)
-            if ffi.abi("64bit") then
-                if num < 2^31 then
-                    ngx.say("fail: ", string.format("p = %#x", num))
-                    return
-                end
-            end
-            ngx.say("pass")
-        }
-    }
---- request
-GET /t
---- response_body
-pass
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/142-ssl-session-store.t b/debian/modules/http-lua/t/142-ssl-session-store.t
deleted file mode 100644
index cc3a664..0000000
--- a/debian/modules/http-lua/t/142-ssl-session-store.t
+++ /dev/null
@@ -1,903 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-use Cwd qw(abs_path realpath);
-use File::Basename;
-
-repeat_each(3);
-
-plan tests => repeat_each() * (blocks() * 6 - 1);
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
-$ENV{TEST_NGINX_CERT_DIR} ||= dirname(realpath(abs_path(__FILE__)));
-
-#log_level 'warn';
-log_level 'debug';
-
-no_long_string();
-#no_diff();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple logging
---- http_config
-    ssl_session_store_by_lua_block { print("ssl session store by lua is running!") }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-
---- no_error_log
-[error]
-[alert]
---- grep_error_log eval: qr/ssl_session_store_by_lua_block:.*?,|\bssl session store: connection reusable: \d+|\breusable connection: \d+/
---- grep_error_log_out eval
-qr/^reusable connection: 0
-ssl session store: connection reusable: 0
-ssl_session_store_by_lua_block:1: ssl session store by lua is running!,
-/m,
-
-
-
-=== TEST 2: sleep is not allowed
---- http_config
-    ssl_session_store_by_lua_block {
-        local begin = ngx.now()
-        ngx.sleep(0.1)
-        print("elapsed in ssl store session by lua: ", ngx.now() - begin)
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-API disabled in the context of ssl_session_store_by_lua*
-
---- no_error_log
-[alert]
-[emerg]
-
-
-
-=== TEST 3: timer
---- http_config
-    ssl_session_store_by_lua_block {
-        local function f()
-            print("my timer run!")
-        end
-        local ok, err = ngx.timer.at(0, f)
-        if not ok then
-            ngx.log(ngx.ERR, "failed to create timer: ", err)
-            return
-        end
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-my timer run!
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 4: cosocket is not allowed
---- http_config
-    ssl_session_store_by_lua_block {
-        local sock = ngx.socket.tcp()
-
-        sock:settimeout(5000)
-
-        local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-        if not ok then
-            ngx.log(ngx.ERR, "failed to connect to memc: ", err)
-            return
-        end
-
-        local bytes, err = sock:send("flush_all\\r\\n")
-        if not bytes then
-            ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
-            return
-        end
-
-        local res, err = sock:receive()
-        if not res then
-            ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
-            return
-        end
-
-        print("received memc reply: ", res)
-    }
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-API disabled in the context of ssl_session_store_by_lua*
-
---- no_error_log
-[alert]
-[emerg]
-
-
-
-=== TEST 5: ngx.exit(0) - no yield
---- http_config
-    ssl_session_store_by_lua_block {
-        ngx.exit(0)
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-lua exit with code 0
-
---- no_error_log
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 6: ngx.exit(ngx.ERROR) - no yield
-ngx.exit does not yield and the error code is eaten.
---- http_config
-    ssl_session_store_by_lua_block {
-        ngx.exit(ngx.ERROR)
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-lua exit with code -1
-ssl_session_store_by_lua*: handler return value: 0, sess new cb exit code: 0
-
---- no_error_log
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 7: lua exception - no yield
---- http_config
-    ssl_session_store_by_lua_block {
-        error("bad bad bad")
-        ngx.log(ngx.ERR, "should never reached here...")
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-failed to run session_store_by_lua*: ssl_session_store_by_lua_block:2: bad bad bad
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 8: get phase
---- http_config
-    ssl_session_store_by_lua_block {
-        print("get_phase: ", ngx.get_phase())
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-get_phase: ssl_session_store
-
---- no_error_log
-[alert]
-[emerg]
-[error]
-
-
-
-=== TEST 9: inter-operation with ssl_certificate_by_lua
---- http_config
-    ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            local begin = ngx.now()
-            ngx.sleep(0.1)
-            print("elapsed in ssl cert by lua: ", ngx.now() - begin)
-        }
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log eval
-[
-'lua ssl server name: "test.com"',
-qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
-'ssl_session_store_by_lua_block:1: ssl store session by lua is running!',
-]
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 10: simple logging (by file)
---- http_config
-    ssl_session_store_by_lua_file html/a.lua;
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- user_files
->>> a.lua
-print("ssl store session by lua is running!")
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-a.lua:1: ssl store session by lua is running!
-
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 11: will crash when ssl_session_store_by_lua* is allowed in server context
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name foo.com;
-        ssl_session_store_by_lua_block {
-            print("handler in test.com")
-        }
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-
-        server_tokens off;
-    }
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- no_error_log
-[error]
---- must_die
---- error_log eval
-qr/\[emerg\] .*? "ssl_session_store_by_lua_block" directive is not allowed here .*?\bnginx\.conf:28/
-
-
-
-=== TEST 12: mixing ssl virtual servers with non-ssl virtual servers
---- http_config
-    ssl_session_store_by_lua_block { print("ssl session store by lua is running!") }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/https.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/http.sock;
-        server_name   foo.com;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/https.sock")
-                if not ok then
-                    ngx.say("failed to connect: ", err)
-                    return
-                end
-
-                ngx.say("connected: ", ok)
-
-                local sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- error_log
-lua ssl server name: "test.com"
-ssl_session_store_by_lua_block:1: ssl session store by lua is running!
-
---- no_error_log
-[error]
-[alert]
diff --git a/debian/modules/http-lua/t/143-ssl-session-fetch.t b/debian/modules/http-lua/t/143-ssl-session-fetch.t
deleted file mode 100644
index 4dc992d..0000000
--- a/debian/modules/http-lua/t/143-ssl-session-fetch.t
+++ /dev/null
@@ -1,1116 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use lib 'lib';
-use Test::Nginx::Socket::Lua;
-use Cwd qw(abs_path realpath);
-use File::Basename;
-
-repeat_each(3);
-
-plan tests => repeat_each() * (blocks() * 6);
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
-$ENV{TEST_NGINX_CERT_DIR} ||= dirname(realpath(abs_path(__FILE__)));
-
-#log_level 'warn';
-log_level 'debug';
-
-no_long_string();
-#no_diff();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple logging
---- http_config
-    ssl_session_fetch_by_lua_block { print("ssl fetch sess by lua is running!") }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval: qr/ssl_session_fetch_by_lua_block:.*?,|\bssl session fetch: connection reusable: \d+|\breusable connection: \d+/
-
---- grep_error_log_out eval
-[
-qr/\A(?:reusable connection: [01]\n)+\z/s,
-qr/^reusable connection: 1
-ssl session fetch: connection reusable: 1
-reusable connection: 0
-ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!,
-/m,
-qr/^reusable connection: 1
-ssl session fetch: connection reusable: 1
-reusable connection: 0
-ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!,
-/m,
-]
-
---- no_error_log
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 2: sleep
---- http_config
-    ssl_session_fetch_by_lua_block {
-        local begin = ngx.now()
-        ngx.sleep(0.1)
-        print("elapsed in ssl fetch session by lua: ", ngx.now() - begin)
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
-
---- grep_error_log_out eval
-[
-'',
-qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
-qr/elapsed in ssl fetch session by lua: 0.(?:09|1[01])\d+,/,
-]
-
---- no_error_log
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 3: timer
---- http_config
-    ssl_session_fetch_by_lua_block {
-        local function f()
-            print("my timer run!")
-        end
-        local ok, err = ngx.timer.at(0, f)
-        if not ok then
-            ngx.log(ngx.ERR, "failed to create timer: ", err)
-            return
-        end
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/my timer run!/s
-
---- grep_error_log_out eval
-[
-'',
-'my timer run!
-',
-'my timer run!
-',
-]
-
---- no_error_log
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 4: cosocket
---- http_config
-    ssl_session_fetch_by_lua_block {
-        local sock = ngx.socket.tcp()
-
-        sock:settimeout(5000)
-
-        local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT)
-        if not ok then
-            ngx.log(ngx.ERR, "failed to connect to memc: ", err)
-            return
-        end
-
-        local bytes, err = sock:send("flush_all\r\n")
-        if not bytes then
-            ngx.log(ngx.ERR, "failed to send flush_all command: ", err)
-            return
-        end
-
-        local res, err = sock:receive()
-        if not res then
-            ngx.log(ngx.ERR, "failed to receive memc reply: ", err)
-            return
-        end
-
-        print("received memc reply: ", res)
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/received memc reply: OK/s
-
---- grep_error_log_out eval
-[
-'',
-'received memc reply: OK
-',
-'received memc reply: OK
-',
-]
-
---- no_error_log
-[alert]
-[error]
-[emerg]
-
-
-
-=== TEST 5: ngx.exit(0) - yield
---- http_config
-    ssl_session_fetch_by_lua_block {
-        ngx.exit(0)
-        ngx.log(ngx.ERR, "should never reached here...")
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/lua exit with code 0/s
-
---- grep_error_log_out eval
-[
-'',
-'lua exit with code 0
-',
-'lua exit with code 0
-',
-]
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 6: ngx.exit(ngx.ERROR) - yield
---- http_config
-    ssl_session_fetch_by_lua_block {
-        ngx.exit(ngx.ERROR)
-        ngx.log(ngx.ERR, "should never reached here...")
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/ssl_session_fetch_by_lua\*: handler return value: -1, sess get cb exit code: 0/s
-
---- grep_error_log_out eval
-[
-'',
-'ssl_session_fetch_by_lua*: handler return value: -1, sess get cb exit code: 0
-',
-'ssl_session_fetch_by_lua*: handler return value: -1, sess get cb exit code: 0
-',
-]
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 7: ngx.exit(ngx.ERROR) - yield
---- http_config
-    ssl_session_fetch_by_lua_block {
-        ngx.sleep(0.001)
-        ngx.exit(ngx.ERROR)
-        ngx.log(ngx.ERR, "should never reached here...")
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/ssl_session_fetch_by_lua\*: sess get cb exit code: 0/s
-
---- grep_error_log_out eval
-[
-'',
-'ssl_session_fetch_by_lua*: sess get cb exit code: 0
-',
-'ssl_session_fetch_by_lua*: sess get cb exit code: 0
-',
-]
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 8: lua exception - no yield
---- http_config
-    ssl_session_fetch_by_lua_block {
-        error("bad bad bad")
-        ngx.log(ngx.ERR, "should never reached here...")
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/ssl_session_fetch_by_lua_block:2: bad bad bad/s
-
---- grep_error_log_out eval
-[
-'',
-'ssl_session_fetch_by_lua_block:2: bad bad bad
-',
-'ssl_session_fetch_by_lua_block:2: bad bad bad
-',
-
-]
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 9: lua exception - yield
---- http_config
-    ssl_session_fetch_by_lua_block {
-        ngx.sleep(0.001)
-        error("bad bad bad")
-        ngx.log(ngx.ERR, "should never reached here...")
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-    lua_ssl_verify_depth 3;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/ssl_session_fetch_by_lua_block:3: bad bad bad|ssl_session_fetch_by_lua\*: sess get cb exit code: 0/s
-
---- grep_error_log_out eval
-[
-'',
-'ssl_session_fetch_by_lua_block:3: bad bad bad
-ssl_session_fetch_by_lua*: sess get cb exit code: 0
-',
-'ssl_session_fetch_by_lua_block:3: bad bad bad
-ssl_session_fetch_by_lua*: sess get cb exit code: 0
-',
-
-]
-
---- no_error_log
-should never reached here
-[alert]
-[emerg]
-
-
-
-=== TEST 10: get phase
---- http_config
-    ssl_session_fetch_by_lua_block { print("get_phase: ", ngx.get_phase()) }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/get_phase: ssl_session_fetch/s
-
---- grep_error_log_out eval
-[
-'',
-'get_phase: ssl_session_fetch
-',
-'get_phase: ssl_session_fetch
-',
-]
-
---- no_error_log
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 11: inter-operation with ssl_certificate_by_lua
---- http_config
-    ssl_session_store_by_lua_block { print("ssl store session by lua is running!") }
-    ssl_session_fetch_by_lua_block {
-        ngx.sleep(0.1)
-        print("ssl fetch session by lua is running!")
-    }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate_by_lua_block {
-            ngx.sleep(0.1)
-            print("ssl cert by lua is running!")
-        }
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
-
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/ssl ((fetch|store) session|cert) by lua is running!/s
-
---- grep_error_log_out eval
-[
-'ssl cert by lua is running!
-ssl store session by lua is running!
-',
-'ssl fetch session by lua is running!
-ssl cert by lua is running!
-ssl store session by lua is running!
-',
-'ssl fetch session by lua is running!
-ssl cert by lua is running!
-ssl store session by lua is running!
-',
-]
-
---- no_error_log
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 12: simple logging (by file)
---- http_config
-    ssl_session_fetch_by_lua_file html/a.lua;
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- user_files
->>> a.lua
-print("ssl fetch sess by lua is running!")
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/\S+:\d+: ssl fetch sess by lua is running!/s
-
---- grep_error_log_out eval
-[
-'',
-'a.lua:1: ssl fetch sess by lua is running!
-',
-'a.lua:1: ssl fetch sess by lua is running!
-',
-]
-
---- no_error_log
-[error]
-[alert]
-[emerg]
-
-
-
-=== TEST 13: mixing ssl virtual servers with non-ssl virtual servers
---- http_config
-    ssl_session_fetch_by_lua_block { print("ssl fetch sess by lua is running!") }
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-        ssl_certificate_key $TEST_NGINX_CERT_DIR/cert/test.key;
-        ssl_session_tickets off;
-
-        server_tokens off;
-    }
-
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/http.sock;
-        server_name   foo.com;
-
-        server_tokens off;
-    }
---- config
-    server_tokens off;
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    lua_ssl_trusted_certificate $TEST_NGINX_CERT_DIR/cert/test.crt;
-
-    location /t {
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(5000)
-
-                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 sess, err = sock:sslhandshake(package.loaded.session, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                    return
-                end
-
-                ngx.say("ssl handshake: ", type(sess))
-
-                package.loaded.session = sess
-
-                local ok, err = sock:close()
-                ngx.say("close: ", ok, " ", err)
-            end  -- do
-            -- collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-close: 1 nil
-
---- grep_error_log eval
-qr/ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!/s
-
---- grep_error_log_out eval
-[
-'',
-'ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!
-',
-'ssl_session_fetch_by_lua_block:1: ssl fetch sess by lua is running!
-',
-]
-
---- no_error_log
-[error]
-[alert]
-[emerg]
diff --git a/debian/modules/http-lua/t/144-shdict-incr-init.t b/debian/modules/http-lua/t/144-shdict-incr-init.t
deleted file mode 100644
index 71bb566..0000000
--- a/debian/modules/http-lua/t/144-shdict-incr-init.t
+++ /dev/null
@@ -1,226 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 0);
-
-#no_diff();
-no_long_string();
-#master_on();
-#workers(2);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: incr key with init (key exists)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 32)
-            local res, err = dogs:incr("foo", 10502, 1)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        }
-    }
---- request
-GET /test
---- response_body
-incr: 10534 nil
-foo = 10534
---- no_error_log
-[error]
-
-
-
-=== TEST 2: incr key with init (key not exists)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            dogs:flush_all()
-            dogs:set("bah", 32)
-            local res, err = dogs:incr("foo", 10502, 1)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        }
-    }
---- request
-GET /test
---- response_body
-incr: 10503 nil
-foo = 10503
---- no_error_log
-[error]
-
-
-
-=== TEST 3: incr key with init (key expired and size not matched)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            for i = 1, 20 do
-                dogs:set("bar" .. i, i, 0.001)
-            end
-            dogs:set("foo", "32", 0.001)
-            ngx.location.capture("/sleep/0.002")
-            local res, err = dogs:incr("foo", 10502, 0)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        }
-    }
-    location ~ ^/sleep/(.+) {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-incr: 10502 nil
-foo = 10502
---- no_error_log
-[error]
-
-
-
-=== TEST 4: incr key with init (key expired and size matched)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            for i = 1, 20 do
-                dogs:set("bar" .. i, i, 0.001)
-            end
-            dogs:set("foo", 32, 0.001)
-            ngx.location.capture("/sleep/0.002")
-            local res, err = dogs:incr("foo", 10502, 0)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        }
-    }
-    location ~ ^/sleep/(.+) {
-        echo_sleep $1;
-    }
---- request
-GET /test
---- response_body
-incr: 10502 nil
-foo = 10502
---- no_error_log
-[error]
-
-
-
-=== TEST 5: incr key with init (forcibly override other valid entries)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            dogs:flush_all()
-            local long_prefix = string.rep("1234567890", 100)
-            for i = 1, 1000 do
-                local success, err, forcible = dogs:set(long_prefix .. i, i)
-                if forcible then
-                    dogs:delete(long_prefix .. i)
-                    break
-                end
-            end
-            local res, err, forcible = dogs:incr(long_prefix .. "bar", 10502, 0)
-            ngx.say("incr: ", res, " ", err, " ", forcible)
-            local res, err, forcible = dogs:incr(long_prefix .. "foo", 10502, 0)
-            ngx.say("incr: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get(long_prefix .. "foo"))
-        }
-    }
---- request
-GET /test
---- response_body
-incr: 10502 nil false
-incr: 10502 nil true
-foo = 10502
---- no_error_log
-[error]
-
-
-
-=== TEST 6: incr key without init (no forcible returned)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", 1)
-            local res, err, forcible = dogs:incr("foo", 1)
-            ngx.say("incr: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        }
-    }
---- request
-GET /test
---- response_body
-incr: 2 nil nil
-foo = 2
---- no_error_log
-[error]
-
-
-
-=== TEST 7: incr key (original value is not number)
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            dogs:set("foo", true)
-            local res, err = dogs:incr("foo", 1, 0)
-            ngx.say("incr: ", res, " ", err)
-            ngx.say("foo = ", dogs:get("foo"))
-        }
-    }
---- request
-GET /test
---- response_body
-incr: nil not a number
-foo = true
---- no_error_log
-[error]
-
-
-
-=== TEST 8: init is not number
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            local res, err, forcible = dogs:incr("foo", 1, "bar")
-            ngx.say("incr: ", res, " ", err, " ", forcible)
-            ngx.say("foo = ", dogs:get("foo"))
-        }
-    }
---- request
-GET /test
---- error_code: 500
---- response_body_like: 500 Internal Server Error
---- error_log
-number expected, got string
diff --git a/debian/modules/http-lua/t/145-shdict-list.t b/debian/modules/http-lua/t/145-shdict-list.t
deleted file mode 100644
index 9bb1592..0000000
--- a/debian/modules/http-lua/t/145-shdict-list.t
+++ /dev/null
@@ -1,745 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-#repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 0);
-
-#no_diff();
-no_long_string();
-#master_on();
-#workers(2);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: lpush & lpop
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local len, err = dogs:lpush("foo", "bar")
-            if len then
-                ngx.say("push success")
-            else
-                ngx.say("push err: ", err)
-            end
-
-            local val, err = dogs:llen("foo")
-            ngx.say(val, " ", err)
-
-            local val, err = dogs:lpop("foo")
-            ngx.say(val, " ", err)
-
-            local val, err = dogs:llen("foo")
-            ngx.say(val, " ", err)
-
-            local val, err = dogs:lpop("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-push success
-1 nil
-bar nil
-0 nil
-nil nil
---- no_error_log
-[error]
-
-
-
-=== TEST 2: get operation on list type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local len, err = dogs:lpush("foo", "bar")
-            if len then
-                ngx.say("push success")
-            else
-                ngx.say("push err: ", err)
-            end
-
-            local val, err = dogs:get("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-push success
-nil value is a list
---- no_error_log
-[error]
-
-
-
-=== TEST 3: set operation on list type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local len, err = dogs:lpush("foo", "bar")
-            if len then
-                ngx.say("push success")
-            else
-                ngx.say("push err: ", err)
-            end
-
-            local ok, err = dogs:set("foo", "bar")
-            ngx.say(ok, " ", err)
-
-            local val, err = dogs:get("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-push success
-true nil
-bar nil
---- no_error_log
-[error]
-
-
-
-=== TEST 4: replace operation on list type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local len, err = dogs:lpush("foo", "bar")
-            if len then
-                ngx.say("push success")
-            else
-                ngx.say("push err: ", err)
-            end
-
-            local ok, err = dogs:replace("foo", "bar")
-            ngx.say(ok, " ", err)
-
-            local val, err = dogs:get("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-push success
-true nil
-bar nil
---- no_error_log
-[error]
-
-
-
-=== TEST 5: add operation on list type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local len, err = dogs:lpush("foo", "bar")
-            if len then
-                ngx.say("push success")
-            else
-                ngx.say("push err: ", err)
-            end
-
-            local ok, err = dogs:add("foo", "bar")
-            ngx.say(ok, " ", err)
-
-            local val, err = dogs:get("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-push success
-false exists
-nil value is a list
---- no_error_log
-[error]
-
-
-
-=== TEST 6: delete operation on list type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local len, err = dogs:lpush("foo", "bar")
-            if len then
-                ngx.say("push success")
-            else
-                ngx.say("push err: ", err)
-            end
-
-            local ok, err = dogs:delete("foo")
-            ngx.say(ok, " ", err)
-
-            local val, err = dogs:get("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-push success
-true nil
-nil nil
---- no_error_log
-[error]
-
-
-
-=== TEST 7: incr operation on list type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local len, err = dogs:lpush("foo", "bar")
-            if len then
-                ngx.say("push success")
-            else
-                ngx.say("push err: ", err)
-            end
-
-            local ok, err = dogs:incr("foo", 1)
-            ngx.say(ok, " ", err)
-
-            local val, err = dogs:get("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-push success
-nil not a number
-nil value is a list
---- no_error_log
-[error]
-
-
-
-=== TEST 8: get_keys operation on list type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local len, err = dogs:lpush("foo", "bar")
-            if len then
-                ngx.say("push success")
-            else
-                ngx.say("push err: ", err)
-            end
-
-            local keys, err = dogs:get_keys()
-            ngx.say("key: ", keys[1])
-        }
-    }
---- request
-GET /test
---- response_body
-push success
-key: foo
---- no_error_log
-[error]
-
-
-
-=== TEST 9: push operation on key-value type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local ok, err = dogs:set("foo", "bar")
-            if ok then
-                ngx.say("set success")
-            else
-                ngx.say("set err: ", err)
-            end
-
-            local len, err = dogs:lpush("foo", "bar")
-            ngx.say(len, " ", err)
-
-            local val, err = dogs:get("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-set success
-nil value not a list
-bar nil
---- no_error_log
-[error]
-
-
-
-=== TEST 10: pop operation on key-value type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local ok, err = dogs:set("foo", "bar")
-            if ok then
-                ngx.say("set success")
-            else
-                ngx.say("set err: ", err)
-            end
-
-            local val, err = dogs:lpop("foo")
-            ngx.say(val, " ", err)
-
-            local val, err = dogs:get("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-set success
-nil value not a list
-bar nil
---- no_error_log
-[error]
-
-
-
-=== TEST 11: llen operation on key-value type
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local ok, err = dogs:set("foo", "bar")
-            if ok then
-                ngx.say("set success")
-            else
-                ngx.say("set err: ", err)
-            end
-
-            local val, err = dogs:llen("foo")
-            ngx.say(val, " ", err)
-
-            local val, err = dogs:get("foo")
-            ngx.say(val, " ", err)
-        }
-    }
---- request
-GET /test
---- response_body
-set success
-nil value not a list
-bar nil
---- no_error_log
-[error]
-
-
-
-=== TEST 12: lpush and lpop
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            for i = 1, 3 do
-                local len, err = dogs:lpush("foo", i)
-                if len ~= i then
-                    ngx.say("push err: ", err)
-                    break
-                end
-            end
-
-            for i = 1, 3 do
-                local val, err = dogs:lpop("foo")
-                if not val then
-                    ngx.say("pop err: ", err)
-                    break
-                else
-                    ngx.say(val)
-                end
-            end
-        }
-    }
---- request
-GET /test
---- response_body
-3
-2
-1
---- no_error_log
-[error]
-
-
-
-=== TEST 13: lpush and rpop
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            for i = 1, 3 do
-                local len, err = dogs:lpush("foo", i)
-                if len ~= i then
-                    ngx.say("push err: ", err)
-                    break
-                end
-            end
-
-            for i = 1, 3 do
-                local val, err = dogs:rpop("foo")
-                if not val then
-                    ngx.say("pop err: ", err)
-                    break
-                else
-                    ngx.say(val)
-                end
-            end
-        }
-    }
---- request
-GET /test
---- response_body
-1
-2
-3
---- no_error_log
-[error]
-
-
-
-=== TEST 14: rpush and lpop
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            for i = 1, 3 do
-                local len, err = dogs:rpush("foo", i)
-                if len ~= i then
-                    ngx.say("push err: ", err)
-                    break
-                end
-            end
-
-            for i = 1, 3 do
-                local val, err = dogs:lpop("foo")
-                if not val then
-                    ngx.say("pop err: ", err)
-                    break
-                else
-                    ngx.say(val)
-                end
-            end
-        }
-    }
---- request
-GET /test
---- response_body
-1
-2
-3
---- no_error_log
-[error]
-
-
-
-=== TEST 15: list removed: expired
---- http_config
-    lua_shared_dict dogs 900k;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local N = 100000
-            local max = 0
-
-            for i = 1, N do
-                local key = string.format("%05d", i)
-
-                local len , err = dogs:lpush(key, i)
-                if not len then
-                    max = i
-                    break
-                end
-            end
-
-            local keys = dogs:get_keys(0)
-
-            ngx.say("max - 1 matched keys length: ", max - 1 == #keys)
-
-            dogs:flush_all()
-
-            local keys = dogs:get_keys(0)
-
-            ngx.say("keys all expired, left number: ", #keys)
-
-            for i = 100000, 1, -1 do
-                local key = string.format("%05d", i)
-
-                local len, err = dogs:lpush(key, i)
-                if not len then
-                    ngx.say("loop again, max matched: ", N + 1 - i == max)
-                    break
-                end
-            end
-
-            dogs:flush_all()
-
-            dogs:flush_expired()
-
-            for i = 1, N do
-                local key = string.format("%05d", i)
-
-                local len, err = dogs:lpush(key, i)
-                if not len then
-                    ngx.say("loop again, max matched: ", i == max)
-                    break
-                end
-            end
-        }
-    }
---- request
-GET /test
---- response_body
-max - 1 matched keys length: true
-keys all expired, left number: 0
-loop again, max matched: true
-loop again, max matched: true
---- no_error_log
-[error]
---- timeout: 9
-
-
-
-=== TEST 16: list removed: forcibly
---- http_config
-    lua_shared_dict dogs 900k;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local N = 200000
-            local max = 0
-            for i = 1, N do
-                local ok, err, forcible  = dogs:set(i, i)
-                if not ok or forcible then
-                    max = i
-                    break
-                end
-            end
-
-            local two = dogs:get(2)
-
-            ngx.say("two == number 2: ", two == 2)
-
-            dogs:flush_all()
-            dogs:flush_expired()
-
-            local keys = dogs:get_keys(0)
-
-            ngx.say("no one left: ", #keys)
-
-            for i = 1, N do
-                local key = string.format("%05d", i)
-
-                local len, err = dogs:lpush(key, i)
-                if not len then
-                    break
-                end
-            end
-
-            for i = 1, max do
-                local ok, err = dogs:set(i, i)
-                if not ok then
-                    ngx.say("set err: ", err)
-                    break
-                end
-            end
-
-            local two = dogs:get(2)
-
-            ngx.say("two == number 2: ", two == 2)
-        }
-    }
---- request
-GET /test
---- response_body
-two == number 2: true
-no one left: 0
-two == number 2: true
---- no_error_log
-[error]
---- timeout: 9
-
-
-
-=== TEST 17: expire on all types
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local len, err = dogs:lpush("list", "foo")
-            if not len then
-                ngx.say("push err: ", err)
-            end
-
-            local ok, err = dogs:set("key", "bar")
-            if not ok then
-                ngx.say("set err: ", err)
-            end
-
-            local keys = dogs:get_keys(0)
-
-            ngx.say("keys number: ", #keys)
-
-            dogs:flush_all()
-
-            local keys = dogs:get_keys(0)
-
-            ngx.say("keys number: ", #keys)
-        }
-    }
---- request
-GET /test
---- response_body
-keys number: 2
-keys number: 0
---- no_error_log
-[error]
-
-
-
-=== TEST 18: long list node
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local long_str = string.rep("foo", 10)
-
-            for i = 1, 3 do
-                local len, err = dogs:lpush("list", long_str)
-                if not len then
-                    ngx.say("push err: ", err)
-                end
-            end
-
-            for i = 1, 3 do
-                local val, err = dogs:lpop("list")
-                if val then
-                    ngx.say(val)
-                end
-            end
-        }
-    }
---- request
-GET /test
---- response_body
-foofoofoofoofoofoofoofoofoofoo
-foofoofoofoofoofoofoofoofoofoo
-foofoofoofoofoofoofoofoofoofoo
---- no_error_log
-[error]
-
-
-
-=== TEST 19: incr on expired list
---- http_config
-    lua_shared_dict dogs 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-
-            local long_str = string.rep("foo", 10 * 1024) -- 30k
-
-            for i = 1, 100 do
-                for j = 1, 10 do
-                    local key = "list" .. j
-                    local len, err = dogs:lpush(key, long_str)
-                    if not len then
-                        ngx.say("push err: ", err)
-                    end
-                end
-
-                dogs:flush_all()
-
-                for j = 10, 1, -1 do
-                    local key = "list" .. j
-                    local newval, err = dogs:incr(key, 1, 0)
-                    if not newval then
-                        ngx.say("incr err: ", err)
-                    end
-                end
-
-                dogs:flush_all()
-            end
-
-            ngx.say("done")
-        }
-    }
---- request
-GET /test
---- response_body
-done
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/146-malloc-trim.t b/debian/modules/http-lua/t/146-malloc-trim.t
deleted file mode 100644
index fc425ce..0000000
--- a/debian/modules/http-lua/t/146-malloc-trim.t
+++ /dev/null
@@ -1,342 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-#repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4 + 3);
-
-#no_diff();
-no_long_string();
-#master_on();
-#workers(2);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: malloc_trim() every 1 req, in subreq
---- http_config
-    lua_malloc_trim 1;
---- config
-    location = /t {
-        return 200 "ok\n";
-    }
-
-    location = /main {
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-    }
---- request
-GET /main
---- response_body
-ok
-ok
-ok
-ok
-ok
---- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out eval
-qr/\Amalloc_trim\(1\) returned [01]
-\z/
---- wait: 0.2
---- no_error_log
-[error]
-
-
-
-=== TEST 2: malloc_trim() every 1 req, in subreq
---- http_config
-    lua_malloc_trim 1;
---- config
-    location = /t {
-        log_subrequest on;
-        return 200 "ok\n";
-    }
-
-    location = /main {
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-    }
---- request
-GET /main
---- response_body
-ok
-ok
-ok
-ok
-ok
---- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out eval
-qr/\Amalloc_trim\(1\) returned [01]
-malloc_trim\(1\) returned [01]
-malloc_trim\(1\) returned [01]
-malloc_trim\(1\) returned [01]
-malloc_trim\(1\) returned [01]
-malloc_trim\(1\) returned [01]
-\z/
---- wait: 0.2
---- no_error_log
-[error]
-
-
-
-=== TEST 3: malloc_trim() every 2 req, in subreq
---- http_config
-    lua_malloc_trim 2;
---- config
-    location = /t {
-        log_subrequest on;
-        return 200 "ok\n";
-    }
-
-    location = /main {
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-    }
---- request
-GET /main
---- response_body
-ok
-ok
-ok
-ok
-ok
---- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out eval
-qr/\Amalloc_trim\(1\) returned [01]
-malloc_trim\(1\) returned [01]
-malloc_trim\(1\) returned [01]
-\z/
---- wait: 0.2
---- no_error_log
-[error]
-
-
-
-=== TEST 4: malloc_trim() every 3 req, in subreq
---- http_config
-    lua_malloc_trim 3;
---- config
-    location = /t {
-        log_subrequest on;
-        return 200 "ok\n";
-    }
-
-    location = /main {
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-    }
---- request
-GET /main
---- response_body
-ok
-ok
-ok
-ok
-ok
---- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out eval
-qr/\Amalloc_trim\(1\) returned [01]
-malloc_trim\(1\) returned [01]
-\z/
---- wait: 0.2
---- no_error_log
-[error]
-
-
-
-=== TEST 5: malloc_trim() every 2 req, in subreq, big memory usage
---- http_config
-    lua_malloc_trim 2;
-    lua_package_path "$prefix/html/?.lua;;";
---- config
-    location = /t {
-        log_subrequest on;
-        content_by_lua_block {
-            require("foo")()
-        }
-    }
-
-    location = /main {
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-    }
---- user_files
->>> foo.lua
-local ffi = require "ffi"
-
-ffi.cdef[[
-    void *malloc(size_t sz);
-    void free(void *p);
-]]
-
-return function ()
-    local t = {}
-    for i = 1, 10 do
-        t[i] = ffi.C.malloc(1024 * 128)
-    end
-    for i = 1, 10 do
-        ffi.C.free(t[i])
-    end
-    ngx.say("ok")
-end
---- request
-GET /main
---- response_body
-ok
-ok
-ok
-ok
-ok
---- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out
-malloc_trim(1) returned 1
-malloc_trim(1) returned 1
-malloc_trim(1) returned 1
---- wait: 0.2
---- no_error_log
-[error]
-
-
-
-=== TEST 6: zero count means off
---- http_config
-    lua_malloc_trim 0;
-    lua_package_path "$prefix/html/?.lua;;";
---- config
-    location = /t {
-        content_by_lua_block {
-            require("foo")()
-        }
-    }
---- user_files
->>> foo.lua
-local ffi = require "ffi"
-
-ffi.cdef[[
-    void *malloc(size_t sz);
-    void free(void *p);
-]]
-
-return function ()
-    local t = {}
-    for i = 1, 10 do
-        t[i] = ffi.C.malloc(1024 * 128)
-    end
-    for i = 1, 10 do
-        ffi.C.free(t[i])
-    end
-    ngx.say("ok")
-end
-
---- request
-GET /t
---- response_body
-ok
---- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out
---- wait: 0.2
---- no_error_log
-malloc_trim() disabled
-[error]
-
-
-
-=== TEST 7: zero count means off, log_by_lua
---- http_config
-    lua_malloc_trim 0;
-    lua_package_path "$prefix/html/?.lua;;";
---- config
-    location = /t {
-        content_by_lua_block {
-            require("foo")()
-        }
-        log_by_lua_block {
-            print("Hello from log")
-        }
-    }
---- user_files
->>> foo.lua
-local ffi = require "ffi"
-
-ffi.cdef[[
-    void *malloc(size_t sz);
-    void free(void *p);
-]]
-
-return function ()
-    local t = {}
-    for i = 1, 10 do
-        t[i] = ffi.C.malloc(1024 * 128)
-    end
-    for i = 1, 10 do
-        ffi.C.free(t[i])
-    end
-    ngx.say("ok")
-end
-
---- request
-GET /t
---- response_body
-ok
---- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out
---- wait: 0.2
---- error_log
-Hello from log
-malloc_trim() disabled
---- no_error_log
-[error]
-
-
-
-=== TEST 8: malloc_trim() every 1 req
---- http_config
-    lua_malloc_trim 1;
---- config
-    location = /t {
-        return 200 "ok\n";
-    }
-
-    location = /main {
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-        echo_location /t;
-    }
---- request
-GET /main
---- response_body
-ok
-ok
-ok
-ok
-ok
---- grep_error_log eval: qr/malloc_trim\(\d+\) returned \d+/
---- grep_error_log_out eval
-qr/\Amalloc_trim\(1\) returned [01]
-\z/
---- wait: 0.2
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t b/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
deleted file mode 100644
index 4ebc8f3..0000000
--- a/debian/modules/http-lua/t/147-tcp-socket-timeouts.t
+++ /dev/null
@@ -1,627 +0,0 @@
-# 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}";
-    }
-
-    if ($ENV{MOCKEAGAIN} eq 'r') {
-        $ENV{MOCKEAGAIN} = 'rw';
-
-    } else {
-        $ENV{MOCKEAGAIN} = 'w';
-    }
-
-    $ENV{TEST_NGINX_EVENT_TYPE} = 'poll';
-    $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'slowdata';
-}
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 + 1);
-
-$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
-
-#log_level 'warn';
-log_level 'debug';
-
-no_long_string();
-#no_diff();
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    server_tokens off;
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeouts(150, 150, 150)  -- 150ms read timeout
-
-            local port = ngx.var.server_port
-            local ok, err = sock:connect("127.0.0.1", port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            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
-
-            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()
-        }
-    }
-
-    location /foo {
-        content_by_lua_block {
-            ngx.sleep(0.01) -- 10 ms
-            ngx.say("foo")
-        }
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body_like
-received: foo
---- no_error_log
-[error]
-
-
-
-=== TEST 2: read timeout
---- config
-    server_tokens off;
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeouts(150, 150, 2)  -- 2ms read timeout
-
-            local port = ngx.var.server_port
-            local ok, err = sock:connect("127.0.0.1", port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            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
-
-            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()
-        }
-    }
-
-    location /foo {
-        content_by_lua_block {
-            ngx.sleep(0.01) -- 10 ms
-            ngx.say("foo")
-        }
-        more_clear_headers Date;
-    }
-
---- request
-GET /t
---- response_body_like
-failed to receive a line: timeout \[\]
---- error_log
-lua tcp socket read timed out
-
-
-
-=== TEST 3: send ok
---- config
-    server_tokens off;
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeouts(500, 500, 500)  -- 500ms timeout
-
-            local port = ngx.var.server_port
-            local ok, err = sock:connect("127.0.0.1", port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local data = string.rep("a", 8) -- 8 bytes
-            local num = 10 -- total: 80 bytes
-
-            local req = "POST /foo HTTP/1.0\r\nHost: localhost\r\nContent-Length: "
-                        .. #data * num .. "\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
-
-            for i = 1, num do
-                local bytes, err = sock:send(data)
-                if not bytes then
-                    ngx.say("failed to send body: ", err)
-                    return
-                end
-            end
-
-            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()
-        }
-    }
-
-    location /foo {
-        content_by_lua_block {
-            local content_length = ngx.req.get_headers()["Content-Length"]
-
-            local sock = ngx.req.socket()
-
-            sock:settimeouts(500, 500, 500)
-
-            local chunk = 8
-
-            for i = 1, content_length, chunk do
-                local data, err = sock:receive(chunk)
-                if not data then
-                    ngx.say("failed to receive chunk: ", err)
-                    return
-                end
-            end
-
-            ngx.say("got len: ", content_length)
-        }
-    }
-
---- request
-GET /t
---- response_body_like
-received: got len: 80
---- no_error_log
-[error]
-
-
-
-=== TEST 4: send timeout
---- config
-    server_tokens off;
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeouts(500, 500, 500)  -- 500ms timeout
-
-            local port = ngx.var.server_port
-            local ok, err = sock:connect("127.0.0.1", port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local data = "slowdata" -- slow data
-            local num = 10
-
-            local req = "POST /foo HTTP/1.0\r\nHost: localhost\r\nContent-Length: "
-                        .. #data * num .. "\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
-
-            for i = 1, num do
-                local bytes, err = sock:send(data)
-                if not bytes then
-                    ngx.say("failed to send body: ", err)
-                    return
-                end
-            end
-
-            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()
-        }
-    }
-
-    location /foo {
-        content_by_lua_block {
-            local content_length = ngx.req.get_headers()["Content-Length"]
-
-            local sock = ngx.req.socket()
-
-            sock:settimeouts(500, 500, 500)
-
-            local chunk = 8
-
-            for i = 1, content_length, chunk do
-                local data, err = sock:receive(chunk)
-                if not data then
-                    ngx.say("failed to receive chunk: ", err)
-                    return
-                end
-            end
-
-            ngx.say("got len: ", content_length)
-        }
-    }
-
---- request
-GET /t
---- response_body
-failed to send body: timeout
---- error_log
-lua tcp socket write timed out
-
-
-
-=== TEST 5: connection timeout (tcp)
---- config
-    resolver $TEST_NGINX_RESOLVER ipv6=off;
-    resolver_timeout 3s;
-    location /test {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeouts(100, 100, 100)
-
-            local ok, err = sock:connect("agentzh.org", 12345)
-            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)
-        }
-    }
---- 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, when connecting to 172.105.207.225:12345
---- timeout: 10
-
-
-
-=== TEST 6: different timeout with duplex socket (settimeout)
---- config
-    server_tokens off;
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeouts(200, 200, 200)  -- 200ms timeout
-
-            local port = ngx.var.server_port
-            local ok, err = sock:connect("127.0.0.1", port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local data = string.rep("a", 4) -- 4 bytes
-            local num = 3
-
-            local req = "POST /foo HTTP/1.0\r\nHost: localhost\r\nContent-Length: "
-                        .. #data * num .. "\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
-
-            for i = 1, num do
-                local bytes, err = sock:send(data)
-                if not bytes then
-                    ngx.log(ngx.ERR, "failed to send body: ", err)
-                    return
-                end
-                ngx.sleep(0.12) -- 120ms
-            end
-
-            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()
-        }
-    }
-
-    location /foo {
-        content_by_lua_block {
-            local content_length = ngx.req.get_headers()["Content-Length"]
-
-            local sock = ngx.req.socket(true)
-
-            local chunk = 4
-
-            function read()
-                sock:settimeout(200) -- read: 200 ms
-
-                local data, err = sock:receive(content_length)
-                if not data then
-                    ngx.log(ngx.ERR, "failed to receive data: ", err)
-                    return
-                end
-            end
-
-            local co = ngx.thread.spawn(read)
-
-            sock:settimeout(100) -- send: 100ms
-            sock:send("ok\n")
-
-            local ok, err = ngx.thread.wait(co)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to wait co: ", err)
-            end
-        }
-    }
-
---- request
-GET /t
---- response_body
-received: ok
-failed to receive a line: closed []
---- error_log
-lua tcp socket read timed out
-failed to receive data: timeout
-
-
-
-=== TEST 7: different timeout with duplex socket (settimeouts)
---- config
-    server_tokens off;
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-
-            sock:settimeouts(200, 200, 200)  -- 200ms timeout
-
-            local port = ngx.var.server_port
-            local ok, err = sock:connect("127.0.0.1", port)
-            if not ok then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local data = string.rep("a", 4) -- 4 bytes
-            local num = 3
-
-            local req = "POST /foo HTTP/1.0\r\nHost: localhost\r\nContent-Length: "
-                        .. #data * num .. "\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
-
-            for i = 1, num do
-                local bytes, err = sock:send(data)
-                if not bytes then
-                    ngx.log(ngx.ERR, "failed to send body: ", err)
-                    return
-                end
-                ngx.sleep(0.12) -- 120ms
-            end
-
-            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()
-        }
-    }
-
-    location /foo {
-        content_by_lua_block {
-            local content_length = ngx.req.get_headers()["Content-Length"]
-
-            local sock = ngx.req.socket(true)
-
-            sock:settimeouts(0, 100, 200) -- send: 100ms, read: 200ms
-
-            local chunk = 4
-
-            function read()
-                local data, err = sock:receive(content_length)
-                if not data then
-                    ngx.log(ngx.ERR, "failed to receive data: ", err)
-                    return
-                end
-            end
-
-            local co = ngx.thread.spawn(read)
-
-            sock:send("ok\n")
-
-            local ok, err = ngx.thread.wait(co)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to wait co: ", err)
-            end
-        }
-    }
-
---- request
-GET /t
---- response_body
-received: ok
-failed to receive a line: closed []
---- no_error_log
-[error]
-
-
-
-=== TEST 8: connection timeout overflow detection
---- config
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local ok, err = pcall(sock.settimeouts, sock,
-                                  (2 ^ 31) - 1, 500, 500)
-            if not ok then
-                ngx.say("failed to set timeouts: ", err)
-            else
-                ngx.say("settimeouts: ok")
-            end
-
-            ok, err = pcall(sock.settimeouts, sock, 2 ^ 31, 500, 500)
-            if not ok then
-                ngx.say("failed to set timeouts: ", err)
-            else
-                ngx.say("settimeouts: ok")
-            end
-        }
-    }
---- request
-GET /t
---- response_body_like
-settimeouts: ok
-failed to set timeouts: bad timeout value
---- no_error_log
-[error]
-
-
-
-=== TEST 9: send timeout overflow detection
---- config
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local ok, err = pcall(sock.settimeouts, sock,
-                                  500, (2 ^ 31) - 1, 500)
-            if not ok then
-                ngx.say("failed to set timeouts: ", err)
-            else
-                ngx.say("settimeouts: ok")
-            end
-
-            ok, err = pcall(sock.settimeouts, sock, 500, 2 ^ 31, 500)
-            if not ok then
-                ngx.say("failed to set timeouts: ", err)
-            else
-                ngx.say("settimeouts: ok")
-            end
-        }
-    }
---- request
-GET /t
---- response_body_like
-settimeouts: ok
-failed to set timeouts: bad timeout value
---- no_error_log
-[error]
-
-
-
-=== TEST 10: read timeout overflow detection
---- config
-    location /t {
-        content_by_lua_block {
-            local sock = ngx.socket.tcp()
-            local ok, err = pcall(sock.settimeouts, sock,
-                                  500, 500, (2 ^ 31) - 1)
-            if not ok then
-                ngx.say("failed to set timeouts: ", err)
-            else
-                ngx.say("settimeouts: ok")
-            end
-
-            ok, err = pcall(sock.settimeouts, sock, 500, 500, 2 ^ 31)
-            if not ok then
-                ngx.say("failed to set timeouts: ", err)
-            else
-                ngx.say("settimeouts: ok")
-            end
-        }
-    }
---- request
-GET /t
---- response_body_like
-settimeouts: ok
-failed to set timeouts: bad timeout value
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/148-fake-shm-zone.t b/debian/modules/http-lua/t/148-fake-shm-zone.t
deleted file mode 100644
index b8a9227..0000000
--- a/debian/modules/http-lua/t/148-fake-shm-zone.t
+++ /dev/null
@@ -1,170 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_process_enabled(1);
-#log_level('warn');
-
-#repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3 - 1);
-
-#no_diff();
-no_long_string();
-#master_on();
-#workers(2);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: require test
---- http_config
-    lua_fake_shm x1 1m;
-    lua_fake_shm x2 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local shm_zones = require("fake_shm_zones")
-            ngx.say(type(shm_zones))
-            local x1 = shm_zones.x1
-            ngx.say(type(x1))
-            local x2 = shm_zones.x2
-            ngx.say(type(x1))
-        }
-    }
---- request
-GET /test
---- response_body
-table
-table
-table
---- no_error_log
-[error]
-
-
-
-=== TEST 2: index shm_zone
---- http_config
-    lua_fake_shm x1 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local shm_zones = require("fake_shm_zones")
-            local x1 = shm_zones.x1
-            ngx.say(type(x1))
-        }
-    }
---- request
-GET /test
---- response_body
-table
---- no_error_log
-[error]
-
-
-
-=== TEST 3: get_info
---- http_config
-    lua_fake_shm x1 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local shm_zones = require("fake_shm_zones")
-            local name, size, isinit, isold
-            local x1 = shm_zones.x1
-
-            name, size, isinit, isold = x1:get_info()
-            ngx.say("name=", name)
-            ngx.say("size=", size)
-            ngx.say("isinit=", isinit)
-            ngx.say("isold=", isold)
-        }
-    }
---- request
-GET /test
---- response_body
-name=x1
-size=1048576
-isinit=true
-isold=false
---- no_error_log
-[error]
-
-
-
-=== TEST 4: multiply zones
---- http_config
-    lua_fake_shm x1 1m;
-    lua_fake_shm x2 2m;
-    lua_fake_shm x3 3m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local shm_zones = require("fake_shm_zones")
-            local name, size, isinit, isold
-            local x1 = shm_zones.x1
-            local x2 = shm_zones.x2
-            local x3 = shm_zones.x3
-
-            name, size, isinit, isold = x1:get_info()
-            ngx.say("name=", name)
-            ngx.say("size=", size)
-            ngx.say("isinit=", isinit)
-            ngx.say("isold=", isold)
-
-            name, size, isinit, isold = x2:get_info()
-            ngx.say("name=", name)
-            ngx.say("size=", size)
-            ngx.say("isinit=", isinit)
-            ngx.say("isold=", isold)
-
-            name, size, isinit, isold = x3:get_info()
-            ngx.say("name=", name)
-            ngx.say("size=", size)
-            ngx.say("isinit=", isinit)
-            ngx.say("isold=", isold)
-        }
-    }
---- request
-GET /test
---- response_body
-name=x1
-size=1048576
-isinit=true
-isold=false
-name=x2
-size=2097152
-isinit=true
-isold=false
-name=x3
-size=3145728
-isinit=true
-isold=false
---- no_error_log
-[error]
-
-
-
-=== TEST 5: duplicate zones
---- http_config
-    lua_fake_shm x1 1m;
-    lua_fake_shm x1 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local shm_zones = require("fake_shm_zones")
-            local x1 = shm_zones.x1
-            ngx.say("error")
-        }
-    }
---- request
-GET /test
---- request_body_unlike
-error
---- must_die
---- error_log
-lua_fake_shm "x1" is already defined as "x1"
---- error_log
-[emerg]
diff --git a/debian/modules/http-lua/t/149-hup-fake-shm-zone.t b/debian/modules/http-lua/t/149-hup-fake-shm-zone.t
deleted file mode 100644
index 1b7b4b5..0000000
--- a/debian/modules/http-lua/t/149-hup-fake-shm-zone.t
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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;
-        undef $ENV{TEST_NGINX_USE_STAP};
-    }
-}
-
-use lib 'lib';
-use Test::Nginx::Socket::Lua $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: get_info, before HUP reload
---- http_config
-    lua_fake_shm x1 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local shm_zones = require("fake_shm_zones")
-            local name, size, isinit, isold
-            local x1 = shm_zones.x1
-
-            name, size, isinit, isold = x1:get_info()
-            ngx.say("name=", name)
-            ngx.say("size=", size)
-            ngx.say("isinit=", isinit)
-            ngx.say("isold=", isold)
-        }
-    }
---- request
-GET /test
---- response_body
-name=x1
-size=1048576
-isinit=true
-isold=false
---- no_error_log
-[error]
-
-
-
-=== TEST 2: get_info, after HUP reload
---- http_config
-    lua_fake_shm x1 1m;
---- config
-    location = /test {
-        content_by_lua_block {
-            local shm_zones = require("fake_shm_zones")
-            local name, size, isinit, isold
-            local x1 = shm_zones.x1
-
-            name, size, isinit, isold = x1:get_info()
-            ngx.say("name=", name)
-            ngx.say("size=", size)
-            ngx.say("isinit=", isinit)
-            ngx.say("isold=", isold)
-        }
-    }
---- request
-GET /test
---- response_body
-name=x1
-size=1048576
-isinit=true
-isold=true
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/150-fake-delayed-load.t b/debian/modules/http-lua/t/150-fake-delayed-load.t
deleted file mode 100644
index 232bbf3..0000000
--- a/debian/modules/http-lua/t/150-fake-delayed-load.t
+++ /dev/null
@@ -1,56 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
-use Test::Nginx::Socket::Lua;
-
-#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);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: lua code cache on
---- http_config
-    lua_code_cache on;
---- config
-    location = /cache_on {
-        content_by_lua_block {
-            local delayed_load = require("ngx.delayed_load")
-            ngx.say(type(delayed_load.get_function))
-        }
-    }
---- request
-GET /cache_on
---- response_body
-function
---- no_error_log
-[error]
-
-
-
-=== TEST 2: lua code cache off
---- http_config
-    lua_code_cache off;
---- config
-    location = /cache_off {
-        content_by_lua_block {
-            local delayed_load = require("ngx.delayed_load")
-            ngx.say(type(delayed_load.get_function))
-        }
-    }
---- request
-GET /cache_off
---- response_body
-function
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/151-initby-hup.t b/debian/modules/http-lua/t/151-initby-hup.t
deleted file mode 100644
index f278867..0000000
--- a/debian/modules/http-lua/t/151-initby-hup.t
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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;
-        undef $ENV{TEST_NGINX_USE_STAP};
-    }
-}
-
-use Test::Nginx::Socket::Lua 'no_plan';
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(1);
-
-#plan tests => repeat_each() * (blocks() * 3 + 3);
-
-#no_diff();
-#no_long_string();
-no_shuffle();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: no error in init before HUP
---- http_config
-    init_by_lua_block {
-        foo = "hello, FOO"
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say(foo)
-        }
-    }
---- request
-GET /lua
---- response_body
-hello, FOO
---- no_error_log
-[error]
-
-
-
-=== TEST 2: error in init after HUP (master still alive, worker process still the same as before)
---- http_config
-    init_by_lua_block {
-        error("failed to init")
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say(foo)
-        }
-    }
---- request
-GET /lua
---- response_body
-hello, FOO
---- error_log
-failed to init
---- reload_fails
-
-
-
-=== TEST 3: no error in init again
---- http_config
-    init_by_lua_block {
-        foo = "hello, foo"
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say(foo)
-        }
-    }
---- request
-GET /lua
---- response_body
-hello, foo
---- no_error_log
-[error]
-
-
-
-=== TEST 4: no error in init before HUP, used ngx.shared.DICT
---- http_config
-    lua_shared_dict dogs 1m;
-
-    init_by_lua_block {
-        local dogs = ngx.shared.dogs
-        dogs:set("foo", "hello, FOO")
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            local foo = dogs:get("foo")
-            ngx.say(foo)
-        }
-    }
---- request
-GET /lua
---- response_body
-hello, FOO
---- no_error_log
-[error]
-
-
-
-=== TEST 5: error in init after HUP, not reloaded but foo have changed.
---- http_config
-    lua_shared_dict dogs 1m;
-
-    init_by_lua_block {
-        local dogs = ngx.shared.dogs
-        dogs:set("foo", "foo have changed")
-
-        error("failed to init")
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            ngx.say("HUP reload failed")
-        }
-    }
---- request
-GET /lua
---- response_body
-foo have changed
---- error_log
-failed to init
---- reload_fails
-
-
-
-=== TEST 6: no error in init again, reload success and foo still have changed.
---- http_config
-    lua_shared_dict dogs 1m;
-
-    init_by_lua_block {
-        -- do nothing
-    }
---- config
-    location /lua {
-        content_by_lua_block {
-            local dogs = ngx.shared.dogs
-            local foo = dogs:get("foo")
-            ngx.say(foo)
-            ngx.say("reload success")
-        }
-    }
---- request
-GET /lua
---- response_body
-foo have changed
-reload success
---- no_error_log
-[error]
diff --git a/debian/modules/http-lua/t/152-timer-every.t b/debian/modules/http-lua/t/152-timer-every.t
deleted file mode 100644
index c8d62e7..0000000
--- a/debian/modules/http-lua/t/152-timer-every.t
+++ /dev/null
@@ -1,385 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(1014);
-#master_on();
-#workers(2);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 7 + 2);
-
-#no_diff();
-no_long_string();
-
-our $HtmlDir = html_dir;
-
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-$ENV{TEST_NGINX_HTML_DIR} = $HtmlDir;
-
-worker_connections(1024);
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple very
---- config
-    location /t {
-        content_by_lua_block {
-            local begin = ngx.now()
-            local function f(premature)
-                print("elapsed: ", ngx.now() - begin)
-                print("timer prematurely expired: ", premature)
-            end
-
-            local ok, err = ngx.timer.every(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-
-            ngx.say("registered timer")
-        }
-    }
---- request
-GET /t
---- response_body
-registered timer
---- wait: 0.11
---- no_error_log
-[error]
-[alert]
-[crit]
-timer prematurely expired: true
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.0(?:4[4-9]|5[0-6])\d*, context: ngx\.timer, client: \d+\.\d+\.\d+\.\d+, server: 0\.0\.0\.0:\d+/,
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0\.(?:09|10)\d*, context: ngx\.timer, client: \d+\.\d+\.\d+\.\d+, server: 0\.0\.0\.0:\d+/,
-"lua ngx.timer expired",
-"http lua close fake http connection",
-"timer prematurely expired: false",
-]
-
-
-
-=== TEST 2: separated global env
---- config
-    location /t {
-        content_by_lua_block {
-            local begin = ngx.now()
-            local function f()
-                foo = 3
-                print("foo in timer: ", foo)
-            end
-            local ok, err = ngx.timer.every(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.sleep(0.11)
-            ngx.say("foo = ", foo)
-        }
-    }
---- request
-GET /t
---- response_body
-foo = nil
---- wait: 0.12
---- no_error_log
-[error]
-[alert]
-[crit]
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 3/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 3: lua variable sharing via upvalue
---- config
-    location /t {
-        content_by_lua_block {
-            local begin = ngx.now()
-            local foo = 0
-            local function f()
-                foo = foo + 3
-                print("foo in timer: ", foo)
-            end
-            local ok, err = ngx.timer.every(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.11)
-            ngx.say("foo = ", foo)
-        }
-    }
---- request
-GET /t
---- response_body
-registered timer
-foo = 6
---- wait: 0.12
---- no_error_log
-[error]
-[alert]
-[crit]
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 3/,
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 6/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 4: create the next timer immediately when timer start running
---- config
-    location /t {
-        content_by_lua_block {
-            local begin = ngx.now()
-            local foo = 0
-            local function f()
-                foo = foo + 3
-                print("foo in timer: ", foo)
-
-                ngx.sleep(0.1)
-            end
-            local ok, err = ngx.timer.every(0.05, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-            ngx.say("registered timer")
-            ngx.sleep(0.11)
-            ngx.say("foo = ", foo)
-        }
-    }
---- request
-GET /t
---- response_body
-registered timer
-foo = 6
---- wait: 0.12
---- no_error_log
-[error]
-[alert]
-[crit]
---- error_log eval
-[
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 3/,
-qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: foo in timer: 6/,
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 5: callback args
---- config
-    location /t {
-        content_by_lua_block {
-            local n = 0
-
-            local function f(premature, a, b, c)
-                n = n + 1
-                print("the ", n, " time, args: ", a, ", ", b, ", ", c)
-
-                a, b, c = 0, 0, 0
-            end
-
-            local ok, err = ngx.timer.every(0.05, f, 1, 2)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-
-            ngx.say("registered timer")
-            ngx.sleep(0.11)
-        }
-    }
---- request
-GET /t
---- response_body
-registered timer
---- wait: 0.12
---- no_error_log
-[error]
-[alert]
-[crit]
---- error_log eval
-[
-"the 1 time, args: 1, 2, nil",
-"the 2 time, args: 1, 2, nil",
-"lua ngx.timer expired",
-"http lua close fake http connection"
-]
-
-
-
-=== TEST 6: memory leak check
---- config
-    location /t {
-        content_by_lua_block {
-            local function f()
-                local a = 1
-                -- do nothing
-            end
-
-            for i = 1, 100 do
-                local ok, err = ngx.timer.every(0.1, f)
-                if not ok then
-                    ngx.say("failed to set timer: ", err)
-                    return
-                end
-            end
-
-            ngx.say("registered timer")
-
-            collectgarbage("collect")
-            local start = collectgarbage("count")
-
-            ngx.sleep(0.21)
-
-            collectgarbage("collect")
-            local growth1 = collectgarbage("count") - start
-
-            ngx.sleep(0.51)
-
-            collectgarbage("collect")
-            local growth2 = collectgarbage("count") - start
-
-            ngx.say("growth1 == growth2: ", growth1 == growth2)
-        }
-    }
---- request
-GET /t
---- response_body
-registered timer
-growth1 == growth2: true
---- no_error_log
-[error]
-[alert]
-[crit]
---- timeout: 8
-
-
-
-=== TEST 7: respect lua_max_pending_timers
---- http_config
-    lua_max_pending_timers 10;
---- config
-    location /t {
-        content_by_lua_block {
-            local function f()
-                local a = 1
-                -- do nothing
-            end
-
-            for i = 1, 11 do
-                local ok, err = ngx.timer.every(0.1, f)
-                if not ok then
-                    ngx.say("failed to set timer: ", err)
-                    return
-                end
-            end
-
-            ngx.say("registered 10 timers")
-        }
-    }
---- request
-GET /t
---- response_body
-failed to set timer: too many pending timers
---- no_error_log
-[error]
-[alert]
-[crit]
-
-
-
-=== TEST 8: respect lua_max_running_timers
---- http_config
-    lua_max_pending_timers 100;
-    lua_max_running_timers 9;
---- config
-    location /t {
-        content_by_lua_block {
-            local function f()
-                local a = 1
-                ngx.sleep(0.02)
-                -- do nothing
-            end
-
-            for i = 1, 10 do
-                local ok, err = ngx.timer.every(0.01, f)
-                if not ok then
-                    ngx.say("failed to set timer: ", err)
-                    return
-                end
-            end
-
-            ngx.say("registered 10 timers")
-
-            ngx.sleep(0.03)
-        }
-    }
---- request
-GET /t
---- response_body
-registered 10 timers
---- no_error_log
-[error]
-[crit]
---- error_log
-lua_max_running_timers are not enough
-
-
-
-=== TEST 9: lua_code_cache off
-FIXME: it is know that this test case leaks memory.
-so we skip it in the "check leak" testing mode.
---- http_config
-    lua_code_cache off;
---- config
-    location /t {
-        content_by_lua_block {
-            local function f()
-                local a = 1
-                -- do nothing
-            end
-
-            local ok, err = ngx.timer.every(0.01, f)
-            if not ok then
-                ngx.say("failed to set timer: ", err)
-                return
-            end
-
-            collectgarbage("collect")
-            ngx.say("registered timer")
-
-            ngx.sleep(0.03)
-
-            collectgarbage("collect")
-
-            ngx.sleep(0.03)
-
-            collectgarbage("collect")
-            ngx.say("ok")
-        }
-    }
---- request
-GET /t
---- response_body
-registered timer
-ok
---- no_error_log
-[error]
-[crit]
---- no_check_leak
diff --git a/debian/modules/http-lua/t/153-semaphore-hup.t b/debian/modules/http-lua/t/153-semaphore-hup.t
deleted file mode 100644
index c85a21d..0000000
--- a/debian/modules/http-lua/t/153-semaphore-hup.t
+++ /dev/null
@@ -1,154 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(10140);
-#workers(1);
-log_level('warn');
-master_process_enabled(1);
-repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 3);
-
-no_long_string();
-#no_diff();
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    my $http_config = $block->http_config || '';
-    $http_config .= <<'_EOC_';
-    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
-    lua_shared_dict shdict 4m;
-
-    init_by_lua_block {
-        require "resty.core"
-        local process = require "ngx.process"
-        local ok, err = process.enable_privileged_agent()
-        if not ok then
-            ngx.log(ngx.ERR, "failed to enable_privileged_agent: ", err)
-        end
-    }
-
-    init_worker_by_lua_block {
-        local function test(pre)
-            if pre then
-                return
-            end
-
-            local semaphore = require "ngx.semaphore"
-            local sem = semaphore.new()
-
-            ngx.log(ngx.ERR, "created semaphore object")
-
-            local function sem_wait()
-
-                local ok, err = sem:wait(100)
-                if not ok then
-                    ngx.log(ngx.ERR, "err: ", err)
-                else
-                    ngx.log(ngx.ERR, "wait success")
-                end
-            end
-
-            while not ngx.worker.exiting() do
-                local co = ngx.thread.spawn(sem_wait)
-                ngx.thread.wait(co)
-            end
-        end
-
-        local ok, err = ngx.timer.at(0, test)
-        if not ok then
-            ngx.log(ngx.ERR, "failed to create semaphore timer err: ", err)
-        end
-
-        local function reload(pre)
-            if pre then
-                return
-            end
-
-            shdict = ngx.shared.shdict
-            local success = shdict:add("reloaded", 1)
-            if not success then
-                return
-            end
-
-            ngx.log(ngx.ERR, "try to reload nginx")
-
-            local f, err = io.open(ngx.config.prefix() .. "/logs/nginx.pid", "r")
-            if not f then
-                ngx.say("failed to open nginx.pid: ", err)
-                return
-            end
-
-            local pid = f:read()
-
-            f:close()
-            os.execute("kill -HUP " .. pid)
-        end
-
-        local typ = require "ngx.process".type
-        if typ() == "privileged agent" then
-            local ok, err = ngx.timer.at(0.1, reload)
-            if not ok then
-                ngx.log(ngx.ERR, "failed to create semaphore timer err: ", err)
-            end
-        end
-    }
-_EOC_
-    $block->set_value("http_config", $http_config);
-});
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: timer + reload
---- config
-    location /test {
-        content_by_lua_block {
-            ngx.sleep(1)
-            ngx.say("hello")
-        }
-    }
---- request
-GET /test
---- response_body
-hello
---- grep_error_log eval: qr/created semaphore object|try to reload nginx|semaphore gc wait queue is not empty/
---- grep_error_log_out
-created semaphore object
-created semaphore object
-try to reload nginx
-created semaphore object
-created semaphore object
---- skip_nginx: 3: < 1.11.2
---- no_check_leak
---- wait: 0.2
-
-
-
-=== TEST 2: timer + reload (lua code cache off)
---- http_config
-    lua_code_cache off;
---- config
-    location /test {
-        content_by_lua_block {
-            ngx.sleep(1)
-            ngx.say("hello")
-        }
-    }
---- request
-GET /test
---- response_body
-hello
---- grep_error_log eval: qr/created semaphore object|try to reload nginx|semaphore gc wait queue is not empty/
---- grep_error_log_out
-created semaphore object
-created semaphore object
-try to reload nginx
-created semaphore object
-created semaphore object
---- skip_nginx: 3: < 1.11.2
---- no_check_leak
---- wait: 0.2
diff --git a/debian/modules/http-lua/t/154-semaphore.t b/debian/modules/http-lua/t/154-semaphore.t
deleted file mode 100644
index 875f181..0000000
--- a/debian/modules/http-lua/t/154-semaphore.t
+++ /dev/null
@@ -1,120 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-use lib 'lib';
-use Test::Nginx::Socket::Lua;
-
-#worker_connections(10140);
-#workers(1);
-#log_level('warn');
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 3) + blocks();
-
-no_long_string();
-#no_diff();
-
-add_block_preprocessor(sub {
-    my $block = shift;
-
-    my $http_config = $block->http_config || '';
-    $http_config .= <<'_EOC_';
-    lua_package_path "../lua-resty-core/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
-
-    init_by_lua_block {
-        require "resty.core"
-    }
-_EOC_
-    $block->set_value("http_config", $http_config);
-});
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: timer + shutdown error log
---- config
-    location /test {
-        content_by_lua_block {
-            local function test(pre)
-
-                local semaphore = require "ngx.semaphore"
-                local sem = semaphore.new()
-
-                local function sem_wait()
-
-                    local ok, err = sem:wait(10)
-                    if not ok then
-                        ngx.log(ngx.ERR, "err: ", err)
-                    else
-                        ngx.log(ngx.ERR, "wait success")
-                    end
-                end
-
-                while not ngx.worker.exiting() do
-                    local co = ngx.thread.spawn(sem_wait)
-                    ngx.thread.wait(co)
-                end
-            end
-
-            local ok, err = ngx.timer.at(0, test)
-            ngx.log(ngx.ERR, "hello, world")
-            ngx.say("time: ", ok)
-        }
-    }
---- request
-GET /test
---- response_body
-time: 1
---- grep_error_log eval: qr/hello, world|semaphore gc wait queue is not empty/
---- grep_error_log_out
-hello, world
---- shutdown_error_log
---- no_shutdown_error_log
-semaphore gc wait queue is not empty
-
-
-
-=== TEST 2: timer + shutdown error log (lua code cache off)
-FIXME: this test case leaks memory.
---- http_config
-    lua_code_cache off;
---- config
-    location /test {
-        content_by_lua_block {
-            local function test(pre)
-
-                local semaphore = require "ngx.semaphore"
-                local sem = semaphore.new()
-
-                local function sem_wait()
-
-                    local ok, err = sem:wait(10)
-                    if not ok then
-                        ngx.log(ngx.ERR, "err: ", err)
-                    else
-                        ngx.log(ngx.ERR, "wait success")
-                    end
-                end
-
-                while not ngx.worker.exiting() do
-                    local co = ngx.thread.spawn(sem_wait)
-                    ngx.thread.wait(co)
-                end
-            end
-
-            local ok, err = ngx.timer.at(0, test)
-            ngx.log(ngx.ERR, "hello, world")
-            ngx.say("time: ", ok)
-        }
-    }
---- request
-GET /test
---- response_body
-time: 1
---- grep_error_log eval: qr/hello, world|semaphore gc wait queue is not empty/
---- grep_error_log_out
-hello, world
---- shutdown_error_log
---- no_shutdown_error_log
-semaphore gc wait queue is not empty
---- SKIP
diff --git a/debian/modules/http-lua/t/155-tls13.t b/debian/modules/http-lua/t/155-tls13.t
deleted file mode 100644
index 9f7cf86..0000000
--- a/debian/modules/http-lua/t/155-tls13.t
+++ /dev/null
@@ -1,106 +0,0 @@
-# vim:set ft= ts=4 sw=4 et fdm=marker:
-
-use Test::Nginx::Socket::Lua;
-
-repeat_each(3);
-
-# All these tests need to have new openssl
-my $NginxBinary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
-my $openssl_version = eval { `$NginxBinary -V 2>&1` };
-
-if ($openssl_version =~ m/built with OpenSSL (0\S*|1\.0\S*|1\.1\.0\S*)/) {
-    plan(skip_all => "too old OpenSSL, need 1.1.1, was $1");
-} else {
-    plan tests => repeat_each() * (blocks() * 5);
-}
-
-$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-
-sub read_file {
-    my $infile = shift;
-    open my $in, $infile
-        or die "cannot open $infile for reading: $!";
-    my $cert = do { local $/; <$in> };
-    close $in;
-    $cert;
-}
-
-our $TestCertificate = read_file("t/cert/test.crt");
-our $TestCertificateKey = read_file("t/cert/test.key");
-
-#log_level 'warn';
-log_level 'debug';
-
-no_long_string();
-#no_diff();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: handshake, TLSv1.3
---- http_config
-    server {
-        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
-        server_name   test.com;
-        ssl_certificate ../html/test.crt;
-        ssl_certificate_key ../html/test.key;
-        ssl_protocols TLSv1.2 TLSv1.3;
-
-        server_tokens off;
-        location /foo {
-            default_type 'text/plain';
-            content_by_lua_block { ngx.status = 201 ngx.say("foo") ngx.exit(201) }
-        }
-    }
---- config
-    server_tokens off;
-    lua_ssl_trusted_certificate ../html/test.crt;
-    lua_ssl_protocols TLSv1.2 TLSv1.3;
-    location /t {
-        #set $port 5000;
-        set $port $TEST_NGINX_MEMCACHED_PORT;
-
-        content_by_lua_block {
-            do
-                local sock = ngx.socket.tcp()
-
-                sock:settimeout(3000)
-
-                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 sess, err = sock:sslhandshake(nil, "test.com", true)
-                if not sess then
-                    ngx.say("failed to do SSL handshake: ", err)
-                else
-                    ngx.say("ssl handshake: ", type(sess))
-                end
-            end  -- do
-            collectgarbage()
-        }
-    }
-
---- request
-GET /t
---- response_body
-connected: 1
-ssl handshake: userdata
-
---- user_files eval
-">>> test.key
-$::TestCertificateKey
->>> test.crt
-$::TestCertificate"
---- error_log
-SSL: TLSv1.3,
---- no_error_log
-[error]
-[alert]
---- timeout: 5
diff --git a/debian/modules/http-lua/t/StapThread.pm b/debian/modules/http-lua/t/StapThread.pm
deleted file mode 100644
index e958863..0000000
--- a/debian/modules/http-lua/t/StapThread.pm
+++ /dev/null
@@ -1,282 +0,0 @@
-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_ffi_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_ffi_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/http-lua/t/cert/dst-ca.crt b/debian/modules/http-lua/t/cert/dst-ca.crt
deleted file mode 100644
index 738121f..0000000
--- a/debian/modules/http-lua/t/cert/dst-ca.crt
+++ /dev/null
@@ -1,63 +0,0 @@
-subject=/C=US/O=Digital Signature Trust Co./OU=TrustID Server/CN=TrustID Server CA A5
-issuer=/O=Digital Signature Trust Co./CN=DST Root CA X3
------BEGIN CERTIFICATE-----
-MIIGiTCCBXGgAwIBAgIRALCqqJD4YLUEJLy76IZcvf8wDQYJKoZIhvcNAQEFBQAw
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzAeFw0wNzA4MjQxNzU0MTlaFw0xNDA4MjQxNDEzMzVa
-MGsxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVz
-dCBDby4xFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMR0wGwYDVQQDExRUcnVzdElE
-IFNlcnZlciBDQSBBNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOae
-jyufM+mrKgTCpPm9ha5UBAORNLhAv3PFlmzA8n6lnEvBTJfeG5vUZYQrlZMMKmZl
-F1D3mYRFAhT/qFbBsTMlF9XsDNF40NB21ABTquuEB3Ji8mmC1Z2cZjwa4VeKxGIq
-kTdBypQgWekopNVvoOGLPbRXgYKW4UCc6pt7Q+We+eUuonp2XIRIOvmJQtXb/rNz
-4B1ahu3QB4HnystmQ9dW8BySSGDhZ/kzIcSU8GuHcL58SHsei07gjFzXRhMkkbJH
-MT8zS/hrjNsB8Z5kamI4QL7nLVNuCF1Sg9zgB1POdMPLEnm4uDx+BRLwVMGZMwza
-MNfEATnWTvLazzIDarMCAwEAAaOCA1IwggNOMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgHGMEcGA1UdJQRAMD4GCCsGAQUFBwMBBggrBgEFBQcDAwYIKwYB
-BQUHAwUGCCsGAQUFBwMGBggrBgEFBQcDBwYKKwYBBAGCNwoDATCCATIGA1UdIASC
-ASkwggElMIIBIQYKYIZIAYb5LwAGAzCCAREwSgYIKwYBBQUHAgEWPmh0dHBzOi8v
-c2VjdXJlLmlkZW50cnVzdC5jb20vY2VydGlmaWNhdGVzL3BvbGljeS90cy9pbmRl
-eC5odG1sMIHCBggrBgEFBQcCAjCBtRqBslRoaXMgVHJ1c3RJRCBTZXJ2ZXIgQ2Vy
-dGlmaWNhdGUgaGFzIGJlZW4gaXNzdWVkIGluIGFjY29yZGFuY2Ugd2l0aCBJZGVu
-VHJ1c3QncyBUcnVzdElEIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRw
-czovL3NlY3VyZS5pZGVudHJ1c3QuY29tLyBjZXJ0aWZpY2F0ZXMvcG9saWN5L3Rz
-L2luZGV4Lmh0bWwwgbkGA1UdHwSBsTCBrjAuoCygKoYoaHR0cDovL2NybC5pZGVu
-dHJ1c3QuY29tL0RTVFJPT1RDQVgzLmNybDB8oHqgeIZ2bGRhcDovL2xkYXAuaWRl
-bnRydXN0LmNvbS9jbj1EU1QlMjBSb290JTIwQ0ElMjBYMyxvPURpZ2l0YWwlMjBT
-aWduYXR1cmUlMjBUcnVzdCUyMENvLj9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0
-O2JpbmFyeTCBrwYIKwYBBQUHAQEEgaIwgZ8wJQYIKwYBBQUHMAGGGWh0dHA6Ly9v
-Y3NwLmlkZW50cnVzdC5jb20wdgYIKwYBBQUHMAKGamxkYXA6Ly9sZGFwLmlkZW50
-cnVzdC5jb20vY249RFNUJTIwUm9vdCUyMENBJTIwWDMsbz1EaWdpdGFsJTIwU2ln
-bmF0dXJlJTIwVHJ1c3QlMjBDby4/Y0FDZXJ0aWZpY2F0ZTtiaW5hcnkwHwYDVR0j
-BBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAwHQYDVR0OBBYEFLeoy2iu3EVD0tyJ
-EamBZhn5+3XpMA0GCSqGSIb3DQEBBQUAA4IBAQAtreoVqLQx+G35L8byM/IvGqNa
-MzbWYzGIidH3+hT8B2e0duWfZCDazgu272ErWL/T4HL5psUEOIHfzNxEWHA24XhY
-zBFsYR64vaTRV7T+iYKv5Nxptidk26zOZ2/F+TKZvOfhPg5IqnH3FyXHEcRDWm1/
-QJsZ4mqgUFx38pc50i1ed6XUdvBObMnGJc1fGdfVqcNqbvHACNrw+WJE9PIeMKJQ
-HC/NkE87xFP/Q1OW7hPmqQvmIIbm6BLZ7U0kxqNL3HmegxkJ2yJQntsX+5BooJqj
-/uVpwzAEei7IjKsdtomxkHCDPFGEJYBldDLBH0ScSlngQZ6V5HNM473l8bWs
------END CERTIFICATE-----
-
-subject=/O=Digital Signature Trust Co./CN=DST Root CA X3
-issuer=/O=Digital Signature Trust Co./CN=DST Root CA X3
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
-rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
-OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
-xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
-7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
-aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
-SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
-ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
-AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
-R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
-JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
-Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
diff --git a/debian/modules/http-lua/t/cert/equifax.crt b/debian/modules/http-lua/t/cert/equifax.crt
deleted file mode 100644
index f300652..0000000
--- a/debian/modules/http-lua/t/cert/equifax.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
-UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
-dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
-MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
-dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
-BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
-cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
-AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
-MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
-aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
-ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
-IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
-MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
-A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
-7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
-1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
------END CERTIFICATE-----
diff --git a/debian/modules/http-lua/t/cert/test.crl b/debian/modules/http-lua/t/cert/test.crl
deleted file mode 100644
index 098fd54..0000000
--- a/debian/modules/http-lua/t/cert/test.crl
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN X509 CRL-----
-MIIBjzCB+QIBATANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMCVVMxEzARBgNV
-BAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xEjAQBgNVBAoM
-CU9wZW5SZXN0eTESMBAGA1UECwwJT3BlblJlc3R5MREwDwYDVQQDDAh0ZXN0LmNv
-bTEgMB4GCSqGSIb3DQEJARYRYWdlbnR6aEBnbWFpbC5jb20XDTE0MDcyMTIxNDEy
-MloXDTE0MDgyMDIxNDEyMlowHDAaAgkApQ5tVpK3luIXDTE0MDcyMTIxNDEwMlqg
-DzANMAsGA1UdFAQEAgIQATANBgkqhkiG9w0BAQUFAAOBgQBDZ6UY0Qg7qDoLrXXl
-gJElFilZ7LiKPqjE3+Rfx7XkgdbPxjGCr77TfMm+smdvawk7WHv1AOvRH7kGrgGT
-kGJZwqJ4vKa/NpEWJIMAZ1Gq9BIH/Ig6ffmPk+S9ozcVHKJDW7x4nMuotyj1hILN
-EePv78DZCYMZgf8WwMElNgz6Hw==
------END X509 CRL-----
diff --git a/debian/modules/http-lua/t/cert/test.crt b/debian/modules/http-lua/t/cert/test.crt
deleted file mode 100644
index a69a011..0000000
--- a/debian/modules/http-lua/t/cert/test.crt
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICqTCCAhICCQClDm1WkreW4jANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28x
-EjAQBgNVBAoMCU9wZW5SZXN0eTESMBAGA1UECwwJT3BlblJlc3R5MREwDwYDVQQD
-DAh0ZXN0LmNvbTEgMB4GCSqGSIb3DQEJARYRYWdlbnR6aEBnbWFpbC5jb20wIBcN
-MTQwNzIxMDMyMzQ3WhgPMjE1MTA2MTMwMzIzNDdaMIGXMQswCQYDVQQGEwJVUzET
-MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzESMBAG
-A1UECgwJT3BlblJlc3R5MRIwEAYDVQQLDAlPcGVuUmVzdHkxETAPBgNVBAMMCHRl
-c3QuY29tMSAwHgYJKoZIhvcNAQkBFhFhZ2VudHpoQGdtYWlsLmNvbTCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEA6P18zUvtmaKQK2xePy8ZbFwSyTLw+jW6t9eZ
-aiTec8X3ibN9WemrxHzkTRikxP3cAQoITRuZiQvF4Q7DO6wMkz/b0zwfgX5uedGq
-047AJP6n/mwlDOjGSNomBLoXQzo7tVe60ikEm3ZyDUqnJPJMt3hImO5XSop4MPMu
-Za9WhFcCAwEAATANBgkqhkiG9w0BAQUFAAOBgQA4OBb9bOyWB1//93nSXX1mdENZ
-IQeyTK0Dd6My76lnZxnZ4hTWrvvd0b17KLDU6JnS2N5ee3ATVkojPidRLWLIhnh5
-0eXrcKalbO2Ce6nShoFvQCQKXN2Txmq2vO/Mud2bHAWwJALg+qi1Iih/gVYB9sct
-FLg8zFOzRlYiU+6Mmw==
------END CERTIFICATE-----
diff --git a/debian/modules/http-lua/t/cert/test.key b/debian/modules/http-lua/t/cert/test.key
deleted file mode 100644
index 6c13527..0000000
--- a/debian/modules/http-lua/t/cert/test.key
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDo/XzNS+2ZopArbF4/LxlsXBLJMvD6Nbq315lqJN5zxfeJs31Z
-6avEfORNGKTE/dwBCghNG5mJC8XhDsM7rAyTP9vTPB+Bfm550arTjsAk/qf+bCUM
-6MZI2iYEuhdDOju1V7rSKQSbdnINSqck8ky3eEiY7ldKingw8y5lr1aEVwIDAQAB
-AoGBANgB66sKMga2SKN5nQdHS3LDCkevCutu1OWM5ZcbB4Kej5kC57xsf+tzPtab
-emeIVGhCPOAALqB4YcT+QtMX967oM1MjcFbtH7si5oq6UYyp3i0G9Si6jIoVHz3+
-8yOUaqwKbK+bRX8VS0YsHZmBsPK5ryN50iUwsU08nemoA94BAkEA9GS9Q5OPeFkM
-tFxsIQ1f2FSsZAuN/1cpZgJqY+YaAN7MSPGTWyfd7nWG/Zgk3GO9/2ihh4gww+7B
-To09GkmW4QJBAPQOHC2V+t2TA98+6Lj6+TYwcGEkhOENfVpH25mQ+kXgF/1Bd6rA
-nosT1bdAY+SnmWXbSw6Kv5C20Em+bEX8WjcCQCSRRjhsRdVODbaW9Z7kb2jhEoJN
-sEt6cTlQNzcHYPCsZYisjM3g4zYg47fiIfHQAsfKkhDDcfh/KvFj9LaQOEECQQCH
-eBWYEDpSJ7rsfqT7mQQgWj7nDThdG/nK1TxGP71McBmg0Gg2dfkLRhVJRQqt74Is
-kc9V4Rp4n6F6baL4Lh19AkEA6pZZer0kg3Kv9hjhaITIKUYdfIp9vYnDRWbQlBmR
-atV8V9u9q2ETZvqfHpN+9Lu6NYR4yXIEIRf1bnIZ/mr9eQ==
------END RSA PRIVATE KEY-----
diff --git a/debian/modules/http-lua/t/cert/test2.crt b/debian/modules/http-lua/t/cert/test2.crt
deleted file mode 100644
index edc3b0d..0000000
--- a/debian/modules/http-lua/t/cert/test2.crt
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIChzCCAfACCQDjCkJpJUtZmjANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28x
-EjAQBgNVBAoMCU9wZW5SZXN0eTESMBAGA1UEAwwJdGVzdDIuY29tMSIwIAYJKoZI
-hvcNAQkBFhNvcGVucmVzdHlAZ21haWwuY29tMCAXDTE0MDkxMzAwMTgxMFoYDzIx
-MTQwODIwMDAxODEwWjCBhjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3Ju
-aWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xEjAQBgNVBAoMCU9wZW5SZXN0eTES
-MBAGA1UEAwwJdGVzdDIuY29tMSIwIAYJKoZIhvcNAQkBFhNvcGVucmVzdHlAZ21h
-aWwuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDy+OVI2u5NBOeB2Cyz
-Gnwy9b7Ao4CSi05XtUxh2IoVdzYZz6c4PFb9C1ad52LDdRStiQT5A7+RKLj6Kr7f
-JrKFziJxMy4g4Kdn9G659vE7CWu/UAVjRUtc+mTBAEfjdbumizmHLG7DmnNhGl3R
-NGiVNLsUInSMGfUlJRzZJXhI4QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAEMmRvyN
-N7uE24Tc6TR19JadNHK8g3YGktRoXWiqd/y0HY4NRPgvnK/nX7CY/wXa1j+uDO8K
-e6/Ldm5RZrjtvfHJmTSAu8zkqTJz8bqRDH7kzL5Ni2Ky2x8r9dtB0ImpOiSlwvZN
-snMvbrxEdwBiqlC9prV2f9aG+ACo1KnPL0j6
------END CERTIFICATE-----
diff --git a/debian/modules/http-lua/t/cert/test2.key b/debian/modules/http-lua/t/cert/test2.key
deleted file mode 100644
index 82ce6ce..0000000
--- a/debian/modules/http-lua/t/cert/test2.key
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDy+OVI2u5NBOeB2CyzGnwy9b7Ao4CSi05XtUxh2IoVdzYZz6c4
-PFb9C1ad52LDdRStiQT5A7+RKLj6Kr7fJrKFziJxMy4g4Kdn9G659vE7CWu/UAVj
-RUtc+mTBAEfjdbumizmHLG7DmnNhGl3RNGiVNLsUInSMGfUlJRzZJXhI4QIDAQAB
-AoGAEqBB83PVENJvbOTFiHVfUAjGtr3R/Wnwd4jOcjHHZB3fZ9sjVoxJntxfp3s1
-dwZir2rxlqVS6i3VAFiGiVTOGo2Vvzhw2J7f58twCECmnLb2f863AkGEYe4dAndD
-GHGD0WI0CBMD1sT18YCj561o0Wol5deWH0gM9pr2N3HkeIECQQD6hUKFlFhrpaHP
-WNJsl6BxgE6pB5kxLcMcpIQ7P+kHUvtyvCJl5QZJqPrpPGjRsAI5Ph92rpsp/zDp
-/IZNWGVjAkEA+Ele31Rt+XbV32MrLKZgBDBk+Pzss5LTn9fZ5v1k/7hrMk2VVWvk
-AD6n5QiGe/g59woANpPb1T9l956SBf0d6wJABTXOS17pc9uvANP1FGMW6CVl/Wf2
-DKrJ+weE5IKQwyE7r4gwIvRfbBrClSU3fNzvPueG2f4JphbzmnoxBNzIxwJAYivY
-mGNwzHehXx99/byXMHDWK+EN0n8WsBgP75Z3rekEcbJdfpYXY8Via1vwmOnwOW65
-4NqbzHix37PSNw37GwJBALxaGNpREO2Tk+oWOvsD2QyviMVae3mXAJHc6nLVdKDM
-q0YvDT6VdeNYYFTkAuzJacsVXOpn6AnUMFj0OBedMhc=
------END RSA PRIVATE KEY-----
diff --git a/debian/modules/http-lua/t/cert/test_ecdsa.crt b/debian/modules/http-lua/t/cert/test_ecdsa.crt
deleted file mode 100644
index b3e1e9f..0000000
--- a/debian/modules/http-lua/t/cert/test_ecdsa.crt
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBtDCCAVoCCQD0QJnL8zpA0jAKBggqhkjOPQQDAjBhMQswCQYDVQQGEwJVUzET
-MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzESMBAG
-A1UECgwJT3BlblJlc3R5MREwDwYDVQQDDAh0ZXN0LmNvbTAgFw0xNTA3MTcyMTUx
-NDFaGA8yMTE1MDYyMzIxNTE0MVowYTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
-bGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xEjAQBgNVBAoMCU9wZW5S
-ZXN0eTERMA8GA1UEAwwIdGVzdC5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
-AAT/OtGmlIlbtvvJ3OP0dm5lyEMCrMnpDTDjwBPnUZ2f+16LCmNsdtEJ0r0Sd4GM
-o4Lss2JpwzPy2SLGEj3KwGKSMAoGCCqGSM49BAMCA0gAMEUCIQDbNwDkq1FiqcRD
-XdbP1MPAc33N2IK9EDIfMgJ0nTL82wIgNZiL4xvCQe9UA0zC+JqHLnVCQHYAM9kI
-BbvzNrt0hEM=
------END CERTIFICATE-----
diff --git a/debian/modules/http-lua/t/cert/test_ecdsa.key b/debian/modules/http-lua/t/cert/test_ecdsa.key
deleted file mode 100644
index 46eb72c..0000000
--- a/debian/modules/http-lua/t/cert/test_ecdsa.key
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0vwBPGgv1hE6RnQo
-3imyoceR+5dLsKegodOlBwnWtbuhRANCAAT/OtGmlIlbtvvJ3OP0dm5lyEMCrMnp
-DTDjwBPnUZ2f+16LCmNsdtEJ0r0Sd4GMo4Lss2JpwzPy2SLGEj3KwGKS
------END PRIVATE KEY-----
diff --git a/debian/modules/http-lua/t/data/fake-delayed-load-module/config b/debian/modules/http-lua/t/data/fake-delayed-load-module/config
deleted file mode 100644
index a5fa6fb..0000000
--- a/debian/modules/http-lua/t/data/fake-delayed-load-module/config
+++ /dev/null
@@ -1,3 +0,0 @@
-ngx_addon_name="ngx_http_lua_fake_delayed_load_module"
-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_lua_fake_delayed_load_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_lua_fake_delayed_load_module.c"
diff --git a/debian/modules/http-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c b/debian/modules/http-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c
deleted file mode 100644
index 2898255..0000000
--- a/debian/modules/http-lua/t/data/fake-delayed-load-module/ngx_http_lua_fake_delayed_load_module.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * This fake_delayed_load delayed load module was used to reproduce
- * a bug in ngx_lua's function ngx_http_lua_add_package_preload.
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <nginx.h>
-
-
-#include "ngx_http_lua_api.h"
-
-
-static ngx_int_t ngx_http_lua_fake_delayed_load_init(ngx_conf_t *cf);
-static int ngx_http_lua_fake_delayed_load_preload(lua_State *L);
-static int ngx_http_lua_fake_delayed_load_function(lua_State * L);
-
-
-static ngx_http_module_t ngx_http_lua_fake_delayed_load_module_ctx = {
-    NULL,                                 /* preconfiguration */
-    ngx_http_lua_fake_delayed_load_init,  /* postconfiguration */
-
-    NULL,                                 /* create main configuration */
-    NULL,                                 /* init main configuration */
-
-    NULL,                                 /* create server configuration */
-    NULL,                                 /* merge server configuration */
-
-    NULL,                                 /* create location configuration */
-    NULL,                                 /* merge location configuration */
-};
-
-/* flow identify module struct */
-ngx_module_t  ngx_http_lua_fake_delayed_load_module = {
-    NGX_MODULE_V1,
-    &ngx_http_lua_fake_delayed_load_module_ctx,   /* module context */
-    NULL,                                         /* module directives */
-    NGX_HTTP_MODULE,                              /* module type */
-    NULL,                                         /* init master */
-    NULL,                                         /* init module */
-    NULL,                                         /* init process */
-    NULL,                                         /* init thread */
-    NULL,                                         /* exit thread */
-    NULL,                                         /* exit process */
-    NULL,                                         /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_int_t
-ngx_http_lua_fake_delayed_load_init(ngx_conf_t *cf)
-{
-    ngx_http_lua_add_package_preload(cf, "ngx.delayed_load",
-                                     ngx_http_lua_fake_delayed_load_preload);
-    return NGX_OK;
-}
-
-
-static int
-ngx_http_lua_fake_delayed_load_preload(lua_State *L)
-{
-    lua_createtable(L, 0, 1);
-
-    lua_pushcfunction(L, ngx_http_lua_fake_delayed_load_function);
-    lua_setfield(L, -2, "get_function");
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_fake_delayed_load_function(lua_State * L)
-{
-    return 0;
-}
diff --git a/debian/modules/http-lua/t/data/fake-module/config b/debian/modules/http-lua/t/data/fake-module/config
deleted file mode 100644
index 00cc8e8..0000000
--- a/debian/modules/http-lua/t/data/fake-module/config
+++ /dev/null
@@ -1,3 +0,0 @@
-ngx_addon_name=ngx_http_fake_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_fake_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fake_module.c"
diff --git a/debian/modules/http-lua/t/data/fake-module/ngx_http_fake_module.c b/debian/modules/http-lua/t/data/fake-module/ngx_http_fake_module.c
deleted file mode 100644
index 650f4f7..0000000
--- a/debian/modules/http-lua/t/data/fake-module/ngx_http_fake_module.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This fake module was used to reproduce a bug in ngx_lua's
- * init_worker_by_lua implementation.
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <nginx.h>
-
-
-typedef struct {
-    ngx_int_t a;
-} ngx_http_fake_srv_conf_t;
-
-
-typedef struct {
-    ngx_int_t a;
-} ngx_http_fake_loc_conf_t;
-
-
-static void *ngx_http_fake_create_srv_conf(ngx_conf_t *cf);
-static char *ngx_http_fake_merge_srv_conf(ngx_conf_t *cf, void *prev, void *conf);
-static void *ngx_http_fake_create_loc_conf(ngx_conf_t *cf);
-static char *ngx_http_fake_merge_loc_conf(ngx_conf_t *cf, void *prev, void *conf);
-
-
-/* flow identify module configure struct */
-static ngx_http_module_t  ngx_http_fake_module_ctx = {
-    NULL,                           /* preconfiguration */
-    NULL,                           /* postconfiguration */
-
-    NULL,                           /* create main configuration */
-    NULL,                           /* init main configuration */
-
-    ngx_http_fake_create_srv_conf,  /* create server configuration */
-    ngx_http_fake_merge_srv_conf,   /* merge server configuration */
-
-    ngx_http_fake_create_loc_conf,  /* create location configuration */
-    ngx_http_fake_merge_loc_conf    /* merge location configuration */
-};
-
-/* flow identify module struct */
-ngx_module_t  ngx_http_fake_module = {
-    NGX_MODULE_V1,
-    &ngx_http_fake_module_ctx,      /* module context */
-    NULL,                           /* module directives */
-    NGX_HTTP_MODULE,                /* module type */
-    NULL,                           /* init master */
-    NULL,                           /* init module */
-    NULL,                           /* init process */
-    NULL,                           /* init thread */
-    NULL,                           /* exit thread */
-    NULL,                           /* exit process */
-    NULL,                           /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-/* create server configure */
-static void *ngx_http_fake_create_srv_conf(ngx_conf_t *cf)
-{
-    ngx_http_fake_srv_conf_t   *fscf;
-
-    fscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_fake_srv_conf_t));
-    if (fscf == NULL) {
-        return NULL;
-    }
-
-    return fscf;
-}
-
-
-/* merge server configure */
-static char *ngx_http_fake_merge_srv_conf(ngx_conf_t *cf, void *prev, void *conf)
-{
-    ngx_http_fake_srv_conf_t   *fscf;
-
-    fscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_fake_module);
-    if (fscf == NULL) {
-        ngx_conf_log_error(NGX_LOG_ALERT, cf, 0,
-                           "get module srv conf failed in merge srv conf");
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-/* create location configure */
-static void *ngx_http_fake_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_http_fake_loc_conf_t   *flcf;
-
-    flcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_fake_loc_conf_t));
-    if (flcf == NULL) {
-        return NULL;
-    }
-
-    return flcf;
-}
-
-
-/* merge location configure */
-static char *ngx_http_fake_merge_loc_conf(ngx_conf_t *cf, void *prev, void *conf)
-{
-    ngx_http_fake_loc_conf_t   *flcf;
-
-    flcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_fake_module);
-    if (flcf == NULL) {
-        ngx_conf_log_error(NGX_LOG_ALERT, cf, 0,
-                           "get module loc conf failed in merge loc conf");
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
diff --git a/debian/modules/http-lua/t/data/fake-shm-module/config b/debian/modules/http-lua/t/data/fake-shm-module/config
deleted file mode 100644
index 0274529..0000000
--- a/debian/modules/http-lua/t/data/fake-shm-module/config
+++ /dev/null
@@ -1,3 +0,0 @@
-ngx_addon_name=ngx_http_lua_shm_fake_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_lua_fake_shm_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_lua_fake_shm_module.c"
diff --git a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c b/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
deleted file mode 100644
index 0286853..0000000
--- a/debian/modules/http-lua/t/data/fake-shm-module/ngx_http_lua_fake_shm_module.c
+++ /dev/null
@@ -1,294 +0,0 @@
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <nginx.h>
-
-
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-
-
-#include "ngx_http_lua_api.h"
-
-
-static void *ngx_http_lua_fake_shm_create_main_conf(ngx_conf_t *cf);
-static ngx_int_t ngx_http_lua_fake_shm_init(ngx_conf_t *cf);
-
-static char *ngx_http_lua_fake_shm(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static ngx_int_t ngx_http_lua_fake_shm_init_zone(ngx_shm_zone_t *shm_zone,
-    void *data);
-static int ngx_http_lua_fake_shm_preload(lua_State *L);
-static int ngx_http_lua_fake_shm_get_info(lua_State *L);
-
-
-typedef struct {
-    ngx_array_t     *shm_zones;
-} ngx_http_lua_fake_shm_main_conf_t;
-
-
-static ngx_command_t ngx_http_lua_fake_shm_cmds[] = {
-
-    { ngx_string("lua_fake_shm"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE2,
-      ngx_http_lua_fake_shm,
-      0,
-      0,
-      NULL },
-
-    ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_http_lua_fake_shm_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_http_lua_fake_shm_init,             /* postconfiguration */
-
-    ngx_http_lua_fake_shm_create_main_conf, /* create main configuration */
-    NULL,                                   /* init main configuration */
-
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-
-    NULL,                                   /* create location configuration */
-    NULL,                                   /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_http_lua_fake_shm_module = {
-    NGX_MODULE_V1,
-    &ngx_http_lua_fake_shm_module_ctx, /* module context */
-    ngx_http_lua_fake_shm_cmds,        /* module directives */
-    NGX_HTTP_MODULE,                   /* module type */
-    NULL,                              /* init master */
-    NULL,                              /* init module */
-    NULL,                              /* init process */
-    NULL,                              /* init thread */
-    NULL,                              /* exit thread */
-    NULL,                              /* exit process */
-    NULL,                              /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-typedef struct {
-    ngx_str_t   name;
-    size_t      size;
-    ngx_int_t   isold;
-    ngx_int_t   isinit;
-} ngx_http_lua_fake_shm_ctx_t;
-
-
-static void *
-ngx_http_lua_fake_shm_create_main_conf(ngx_conf_t *cf)
-{
-    ngx_http_lua_fake_shm_main_conf_t *lfsmcf;
-
-    lfsmcf = ngx_pcalloc(cf->pool, sizeof(*lfsmcf));
-    if (lfsmcf == NULL) {
-        return NULL;
-    }
-
-    return lfsmcf;
-}
-
-
-static char *
-ngx_http_lua_fake_shm(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_lua_fake_shm_main_conf_t   *lfsmcf = conf;
-
-    ngx_str_t                   *value, name;
-    ngx_shm_zone_t              *zone;
-    ngx_shm_zone_t             **zp;
-    ngx_http_lua_fake_shm_ctx_t *ctx;
-    ssize_t                      size;
-
-    if (lfsmcf->shm_zones == NULL) {
-        lfsmcf->shm_zones = ngx_palloc(cf->pool, sizeof(ngx_array_t));
-        if (lfsmcf->shm_zones == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        if (ngx_array_init(lfsmcf->shm_zones, cf->pool, 2,
-                           sizeof(ngx_shm_zone_t *))
-            != NGX_OK)
-        {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    value = cf->args->elts;
-
-    ctx = NULL;
-
-    if (value[1].len == 0) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid lua fake_shm name \"%V\"", &value[1]);
-        return NGX_CONF_ERROR;
-    }
-
-    name = value[1];
-
-    size = ngx_parse_size(&value[2]);
-
-    if (size <= 8191) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid lua fake_shm size \"%V\"", &value[2]);
-        return NGX_CONF_ERROR;
-    }
-
-    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_lua_fake_shm_ctx_t));
-    if (ctx == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ctx->name = name;
-    ctx->size = size;
-
-    zone = ngx_http_lua_shared_memory_add(cf, &name, (size_t) size,
-                                          &ngx_http_lua_fake_shm_module);
-    if (zone == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (zone->data) {
-        ctx = zone->data;
-
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "lua_fake_shm \"%V\" is already defined as "
-                           "\"%V\"", &name, &ctx->name);
-        return NGX_CONF_ERROR;
-    }
-
-    zone->init = ngx_http_lua_fake_shm_init_zone;
-    zone->data = ctx;
-
-    zp = ngx_array_push(lfsmcf->shm_zones);
-    if (zp == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    *zp = zone;
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_fake_shm_init_zone(ngx_shm_zone_t *shm_zone, void *data)
-{
-    ngx_http_lua_fake_shm_ctx_t  *octx = data;
-
-    ngx_http_lua_fake_shm_ctx_t  *ctx;
-
-    ctx = shm_zone->data;
-
-    if (octx) {
-        ctx->isold = 1;
-    }
-
-    ctx->isinit = 1;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_lua_fake_shm_init(ngx_conf_t *cf)
-{
-    ngx_http_lua_add_package_preload(cf, "fake_shm_zones",
-                                     ngx_http_lua_fake_shm_preload);
-    return NGX_OK;
-}
-
-
-static int
-ngx_http_lua_fake_shm_preload(lua_State *L)
-{
-    ngx_http_lua_fake_shm_main_conf_t *lfsmcf;
-    ngx_http_conf_ctx_t               *hmcf_ctx;
-    ngx_cycle_t                       *cycle;
-
-    ngx_uint_t                   i;
-    ngx_shm_zone_t             **zone;
-
-    lua_getglobal(L, "__ngx_cycle");
-    cycle = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    hmcf_ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index];
-    lfsmcf = hmcf_ctx->main_conf[ngx_http_lua_fake_shm_module.ctx_index];
-
-    if (lfsmcf->shm_zones != NULL) {
-        lua_createtable(L, 0, lfsmcf->shm_zones->nelts /* nrec */);
-
-        lua_createtable(L, 0 /* narr */, 2 /* nrec */); /* shared mt */
-
-        lua_pushcfunction(L, ngx_http_lua_fake_shm_get_info);
-        lua_setfield(L, -2, "get_info");
-
-        lua_pushvalue(L, -1); /* shared mt mt */
-        lua_setfield(L, -2, "__index"); /* shared mt */
-
-        zone = lfsmcf->shm_zones->elts;
-
-        for (i = 0; i < lfsmcf->shm_zones->nelts; i++) {
-            lua_pushlstring(L, (char *) zone[i]->shm.name.data,
-                            zone[i]->shm.name.len);
-
-            /* shared mt key */
-
-            lua_createtable(L, 1 /* narr */, 0 /* nrec */);
-                /* table of zone[i] */
-            lua_pushlightuserdata(L, zone[i]); /* shared mt key ud */
-            lua_rawseti(L, -2, 1); /* {zone[i]} */
-            lua_pushvalue(L, -3); /* shared mt key ud mt */
-            lua_setmetatable(L, -2); /* shared mt key ud */
-            lua_rawset(L, -4); /* shared mt */
-        }
-
-        lua_pop(L, 1); /* shared */
-
-    } else {
-        lua_newtable(L);    /* ngx.shared */
-    }
-
-    return 1;
-}
-
-
-static int
-ngx_http_lua_fake_shm_get_info(lua_State *L)
-{
-    ngx_int_t                    n;
-    ngx_shm_zone_t              *zone;
-    ngx_http_lua_fake_shm_ctx_t *ctx;
-
-    n = lua_gettop(L);
-
-    if (n != 1) {
-        return luaL_error(L, "expecting exactly one arguments, "
-                          "but only seen %d", n);
-    }
-
-    luaL_checktype(L, 1, LUA_TTABLE);
-
-    lua_rawgeti(L, 1, 1);
-    zone = lua_touserdata(L, -1);
-    lua_pop(L, 1);
-
-    if (zone == NULL) {
-        return luaL_error(L, "bad \"zone\" argument");
-    }
-
-    ctx = (ngx_http_lua_fake_shm_ctx_t *) zone->data;
-
-    lua_pushlstring(L, (char *) zone->shm.name.data, zone->shm.name.len);
-    lua_pushnumber(L, zone->shm.size);
-    lua_pushboolean(L, ctx->isinit);
-    lua_pushboolean(L, ctx->isold);
-
-    return 4;
-}
diff --git a/debian/modules/http-lua/t/lib/CRC32.lua b/debian/modules/http-lua/t/lib/CRC32.lua
deleted file mode 100755
index fcf260c..0000000
--- a/debian/modules/http-lua/t/lib/CRC32.lua
+++ /dev/null
@@ -1,173 +0,0 @@
---Copyright (c) 2007-2008 Neil Richardson (nrich@iinet.net.au)
---
---Permission is hereby granted, free of charge, to any person obtaining a copy 
---of this software and associated documentation files (the "Software"), to deal
---in the Software without restriction, including without limitation the rights 
---to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
---copies of the Software, and to permit persons to whom the Software is 
---furnished to do so, subject to the following conditions:
---
---The above copyright notice and this permission notice shall be included in all
---copies or substantial portions of the Software.
---
---THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
---IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
---FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
---AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
---LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
---OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
---IN THE SOFTWARE.
-
-module('CRC32', package.seeall)
-
-local max = 2^32 -1
-
-local CRC32 = {
-    0,79764919,159529838,222504665,319059676,
-    398814059,445009330,507990021,638119352,
-    583659535,797628118,726387553,890018660,
-    835552979,1015980042,944750013,1276238704,
-    1221641927,1167319070,1095957929,1595256236,
-    1540665371,1452775106,1381403509,1780037320,
-    1859660671,1671105958,1733955601,2031960084,
-    2111593891,1889500026,1952343757,2552477408,
-    2632100695,2443283854,2506133561,2334638140,
-    2414271883,2191915858,2254759653,3190512472,
-    3135915759,3081330742,3009969537,2905550212,
-    2850959411,2762807018,2691435357,3560074640,
-    3505614887,3719321342,3648080713,3342211916,
-    3287746299,3467911202,3396681109,4063920168,
-    4143685023,4223187782,4286162673,3779000052,
-    3858754371,3904687514,3967668269,881225847,
-    809987520,1023691545,969234094,662832811,
-    591600412,771767749,717299826,311336399,
-    374308984,453813921,533576470,25881363,
-    88864420,134795389,214552010,2023205639,
-    2086057648,1897238633,1976864222,1804852699,
-    1867694188,1645340341,1724971778,1587496639,
-    1516133128,1461550545,1406951526,1302016099,
-    1230646740,1142491917,1087903418,2896545431,
-    2825181984,2770861561,2716262478,3215044683,
-    3143675388,3055782693,3001194130,2326604591,
-    2389456536,2200899649,2280525302,2578013683,
-    2640855108,2418763421,2498394922,3769900519,
-    3832873040,3912640137,3992402750,4088425275,
-    4151408268,4197601365,4277358050,3334271071,
-    3263032808,3476998961,3422541446,3585640067,
-    3514407732,3694837229,3640369242,1762451694,
-    1842216281,1619975040,1682949687,2047383090,
-    2127137669,1938468188,2001449195,1325665622,
-    1271206113,1183200824,1111960463,1543535498,
-    1489069629,1434599652,1363369299,622672798,
-    568075817,748617968,677256519,907627842,
-    853037301,1067152940,995781531,51762726,
-    131386257,177728840,240578815,269590778,
-    349224269,429104020,491947555,4046411278,
-    4126034873,4172115296,4234965207,3794477266,
-    3874110821,3953728444,4016571915,3609705398,
-    3555108353,3735388376,3664026991,3290680682,
-    3236090077,3449943556,3378572211,3174993278,
-    3120533705,3032266256,2961025959,2923101090,
-    2868635157,2813903052,2742672763,2604032198,
-    2683796849,2461293480,2524268063,2284983834,
-    2364738477,2175806836,2238787779,1569362073,
-    1498123566,1409854455,1355396672,1317987909,
-    1246755826,1192025387,1137557660,2072149281,
-    2135122070,1912620623,1992383480,1753615357,
-    1816598090,1627664531,1707420964,295390185,
-    358241886,404320391,483945776,43990325,
-    106832002,186451547,266083308,932423249,
-    861060070,1041341759,986742920,613929101,
-    542559546,756411363,701822548,3316196985,
-    3244833742,3425377559,3370778784,3601682597,
-    3530312978,3744426955,3689838204,3819031489,
-    3881883254,3928223919,4007849240,4037393693,
-    4100235434,4180117107,4259748804,2310601993,
-    2373574846,2151335527,2231098320,2596047829,
-    2659030626,2470359227,2550115596,2947551409,
-    2876312838,2788305887,2733848168,3165939309,
-    3094707162,3040238851,2985771188,
-}
-
-local function xor(a, b)
-    local calc = 0    
-
-    for i = 32, 0, -1 do
-	local val = 2 ^ i
-	local aa = false
-	local bb = false
-
-	if a == 0 then
-	    calc = calc + b
-	    break
-	end
-
-	if b == 0 then
-	    calc = calc + a
-	    break
-	end
-
-	if a >= val then
-	    aa = true
-	    a = a - val
-	end
-
-	if b >= val then
-	    bb = true
-	    b = b - val
-	end
-
-	if not (aa and bb) and (aa or bb) then
-	    calc = calc + val
-	end
-    end
-
-    return calc
-end
-
-local function lshift(num, left)
-    local res = num * (2 ^ left)
-    return res % (2 ^ 32)
-end
-
-local function rshift(num, right)
-    local res = num / (2 ^ right)
-    return math.floor(res)
-end
-
-function Hash(str)
-    local count = string.len(tostring(str))
-    local crc = max
-    
-    local i = 1
-    while count > 0 do
-	local byte = string.byte(str, i)
-
-	crc = xor(lshift(crc, 8), CRC32[xor(rshift(crc, 24), byte) + 1])
-
-	i = i + 1
-	count = count - 1
-    end
-
-    return crc
-end
-
-
---
--- CRC32.lua
---
--- A pure Lua implementation of a CRC32 hashing algorithm. Slower than using a C implemtation,
--- but useful having no other dependencies.
---
---
--- Synopsis
---
--- require('CRC32')
---
--- crchash = CRC32.Hash('a string')
---
--- Methods:
---
--- hashval = CRC32.Hash(val)
---    Calculates and returns (as an integer) the CRC32 hash of the parameter 'val'. 
-
diff --git a/debian/modules/http-lua/t/lib/Memcached.lua b/debian/modules/http-lua/t/lib/Memcached.lua
deleted file mode 100755
index e3288ac..0000000
--- a/debian/modules/http-lua/t/lib/Memcached.lua
+++ /dev/null
@@ -1,567 +0,0 @@
---Copyright (c) 2006-2008 Neil Richardson (nrich@iinet.net.au)
---
---Permission is hereby granted, free of charge, to any person obtaining a copy 
---of this software and associated documentation files (the "Software"), to deal
---in the Software without restriction, including without limitation the rights 
---to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
---copies of the Software, and to permit persons to whom the Software is 
---furnished to do so, subject to the following conditions:
---
---The above copyright notice and this permission notice shall be included in all
---copies or substantial portions of the Software.
---
---THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
---IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
---FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
---AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
---LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
---OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
---IN THE SOFTWARE.
-
-module('Memcached', package.seeall)
-
-require('socket')
-require('CRC32')
-
-local SERVER_RETRIES = 10
-
-local STATS_KEYS = {
-    malloc = true,
-    sizes = true,
-    slabs = true,
-    items = true,
-}
-
-local FLAGS = {
-    'STORABLE',
-    'COMPRESSED',
-    'SERIALISED',
-}
-
-local function warn(str)
-    io.stderr:write(string.format('Warning: %s\n', tostring(str)))
-end
-
-local function _select_server(cache, key)
-    local server_count = #cache.servers
-
-    local hashfunc = cache.hash or CRC32.Hash
-
-    if server_count == 1 then
-	return cache.servers[1].socket
-    else
-	local serverhash = hashfunc(key)
-
-	for i = 0, SERVER_RETRIES do
-	    local index = (serverhash % server_count) + 1
-	    local server = cache.servers[index].socket
-
-	    if not server then
-		serverhash = hashfunc(serverhash .. i)
-	    else
-		return server
-	    end
-	end
-    end
-
-    error('No servers found')
-    return nil
-end
-
-local function _retrieve(cache, key, str)
-    local server = _select_server(cache, key)
-
-    server:send(str .. '\r\n')
-
-    local function toboolean(value)
-	if type(value) == 'string' then
-	    if value == 'true' then
-		return true
-	    elseif value == 'false' then
-		return false 
-	    end
-	end
-
-	return nil
-    end
-
-    local function extract_flags(str)
-	local num = tonumber(str)
-	local flags = {}
-
-	for i = table.maxn(FLAGS), 1, -1 do
-	    local bf = 2 ^ (i - 1)
-
-	    if num >= bf then
-		flags[FLAGS[i]] = true
-		num = num - bf
-	    end
-	end
-
-	return flags
-    end
-
-    local returndata = {}
-    while true do
-	local line, err = server:receive()
-
-	if line == 'END' then
-	    break
-	elseif string.sub(line, 1, 5) == 'VALUE' then
-	    local key,flagstr,size,cas = string.match(line, 'VALUE (%S+) (%d+) (%d+)')
-	    flags = extract_flags(flagstr)
-
-	    local data = server:receive(size)
-
-	    if flags.COMPRESSED and cache.compress_enabled then
-		data = cache.decompress(data)
-	    end
-
-            if flags.SERIALISED then
-                returndata[key] = cache.decode(data)
-            else
-                local ldata = tonumber(data) or toboolean(data) 
-
-                if ldata == nil then
-                    if data == 'nil' then
-                        returndata[key] = nil
-                    else
-                        returndata[key] = data
-                    end
-                else
-                    returndata[key] = ldata
-                end
-            end
-	end
-    end
-
-    return returndata
-end
-
-local function _send(cache, key, str)
-    local server = _select_server(cache, key)
-
-    server:send(str .. "\r\n")
-    local line, err = server:receive()
-    
-    if not err then return line end
-end
-
-local function _store(cache, op, key, value, expiry)
-    local str
-    local flags = 0
-
-    if type(value) == 'table' then
-	str = cache.encode(value)    
-	-- TODO lookup rather than hard code 
-        flags = flags + 4
-    else
-	str = tostring(value)
-    end
-
-    if cache.compress_enabled and string.len(str) > cache.compress_threshold then
-	local cstr = cache.compress(str)
-
-	if string.len(cstr) < (string.len(str) * 0.8) then
-	    str = cstr
-
-	    -- TODO lookup rather than hard code 
-	    flags = flags + 2
-	end
-    end
-
-    local len = string.len(str)
-
-    expiry = expiry or 0
-
-    local cmd = op .. ' ' .. key .. ' ' .. flags .. ' ' .. expiry .. ' ' .. len .. '\r\n' .. str
-
-    local res = _send(cache, key, cmd)
-
-    if res ~= 'STORED' then
-	return false, res
-    end
-
-    return true
-end
-
-local function set(cache, key, value, expiry)
-    return _store(cache, 'set', key, value, expiry)
-end
-
-local function add(cache, key, value, expiry)
-    return _store(cache, 'add', key, value, expiry)
-end
-
-local function replace(cache, key, value, expiry)
-    return _store(cache, 'replace', key, value, expiry)
-end
-
-local function get(cache, key)
-    local dataset = _retrieve(cache, key, 'get ' .. key)
-    return dataset[key]
-end
-
-local function delete(cache, key)
-    local res = _send(cache, key, 'delete ' .. key)
-
-    if res == 'NOT_FOUND' then
-	return false
-    end
-
-    if res ~= 'DELETED' then
-	return false, res
-    end
-
-    return true
-end
-
-local function incr(cache, key, val)
-    val = val or 1
-	
-    local res = _send(cache, key, 'incr ' .. key .. ' ' .. val)
-
-    if res == 'ERROR' or res == 'CLIENT_ERROR' then
-        return false, res
-    end
-
-    return res
-end
-
-local function decr(cache, key, val)
-    val = val or 1
-
-    local res = _send(cache, key, 'decr ' .. key .. ' ' .. val)
-
-    if res == 'ERROR' or res == 'CLIENT_ERROR' then
-        return false, res
-    end
-
-    return res
-end
-
-local function stats(cache, key)
-    local servers = {}
-
-    key = key or ''
-
-    if string.len(key) > 0 and not STATS_KEYS[key] then
-	error(string.format("Unknown stats key '%s'", key))
-    end
-
-    for i,server in pairs(cache.servers) do
-	server.socket:send('stats ' .. key .. '\r\n')
-
-	local stats = {}
-
-	while true do
-	    local line, err = server.socket:receive()
-
-	    if line == 'END' or line == 'ERROR' then
-		break
-	    end
-
-	    local k,v = string.match(line, 'STAT (%S+) (%S+)')
-
-	    if k then
-		stats[k] = v
-	    end
-	end
-
-	servers[server.name] = stats
-    end
-
-    return servers
-end 
-
-local function get_multi(cache, ...)
-    local dataset = nil
-
-    if table.maxn(cache.servers) > 1 then
-	dataset = {}
-
-	for i,k in ipairs(arg) do
-	    local data = _retrieve(cache, k, 'get ' .. k)
-	    dataset[k] = data[k]
-	end
-    else
-	local keys = table.concat(arg, ' ')
-	dataset = _retrieve(cache, keys, 'get ' .. keys)
-    end
-
-    return dataset
-end
-
-local function flush_all(cache)
-    local success = true
-
-    for i,server in ipairs(cache.servers) do
-	server.socket:send('flush_all\r\n')
-	local res = assert(server.socket:receive())
-
-	if res ~= 'OK' then
-	    success = false
-	end
-    end
-
-    return success
-end
-
-local function disconnect_all(cache)
-    while true do
-	local server = table.remove(cache.servers)
-
-	if not server then
-	    break
-	end
-
-	server.socket:close()
-    end    
-end
-
-local function set_hash(cache, hashfunc)
-    cache.hash = hashfunc
-end
-
-local function set_encode(cache, func)
-    cache.encode = func
-end
-
-local function set_decode(cache, func)
-    cache.decode = func
-end
-
-local function set_compress(cache, func)
-    cache.compress = func
-end
-
-local function set_decompress(cache, func)
-    cache.decompress = func
-end
-
-function Connect(hostlist, port)
-    local servers = {}
-
-    if type(hostlist) == 'table' then
-	for i,host in pairs(hostlist) do
-	    local h, p
-
-	    if type(host) == 'table' then
-		h = host[1]
-		p = host[2]
-	    elseif type(host) == 'string' then
-		h = host
-	    elseif type(host) == 'number' then
-		p = host
-		h = nil
-	    end
-
-	    if not h then
-		h = '127.0.0.1'
-	    end
-
-	    if not p then 
-		p = 11211
-	    end
-
-	    local server = socket.connect(h, p)
-
-	    if not server then
-		warn('Could not connect to ' .. h .. ':' .. p)
-	    else
-		table.insert(servers, {socket = server, name = string.format('%s:%d', h, p)})
-	    end
-	end
-    else
-	local address = hostlist
-
-	if type(address) == 'number' then
-	    port = address
-	    address = nil
-	end
-
-	if address == nil then
-	    address = '127.0.0.1'
-	end
-
-	if port == nil then
-	    port = 11211
-	end
-
-	local server = socket.connect(address, port)
-
-	if not server then
-	    warn('Could not connect to ' .. address .. ':' .. port)
-	else
-	    servers = {{socket = server, name = string.format('%s:%d', address, port)}}
-	end
-    end
-
-    if table.maxn(servers) < 1 then
-	error('No servers available')
-    end
-
-    local cache = {
-	servers = servers,
-
-	set_hash = set_hash,
-	set_encode = set_encode,
-	set_decode = set_decode,
-	set_decompress = set_decompress,
-	set_compress = set_compress,
-
-	compress_enabled = false,
-	enable_compression = function(self, on)
-	    self.compress_enabled = on
-	end,
-
-	hash = nil,
-	encode = function()
-	    error('No encode function set')
-	end,
-
-	decode = function()
-	    error('No decode function set')
-	end,
-
-	compress = function()
-	    error('No compress function set')
-	end,
-
-	decompress = function()
-	    error('No decompress function set')
-	end,
-
-	-- 10K default
-	compress_threshold = 10240,
-	set_compress_threshold = function(self, threshold)
-	    if threshold == nil then
-		self:enable_compression(false)
-	    else
-		self.compress_threshold = threshold
-	    end
-	end,
-
-	set = set,
-	add = add,
-	replace = replace,
-	get = get,
-	delete = delete,
-	incr = incr,
-	decr = decr,
-
-	get_multi = get_multi,
-	stats = stats,
-	flush_all = flush_all,
-	disconnect_all = disconnect_all,
-    }
-
-    return cache
-end
-
-function New(hostlist, port)
-    return Connect(hostlist, port)
-end
-
--- 
--- Memcached.lua
--- 
--- A pure Lua implementation of a simple memcached client. 1 or more memcached server(s) are currently supported. Requires the luasocket library.
--- See http://www.danga.com/memcached/ for more information about memcached.
---
---
---
--- Synopsis
---
--- require('Memcached')
---
--- memcache = Memcached.Connect('some.host.com', 11000)
---    OR
--- memcache = Memcached.New('some.host.com', 11000)
---
--- memcache:set('some_key', 1234)
--- memcache:add('new_key', 'add new value')
--- memcache:replace('existing_key', 'replace old value')
---
--- cached_data = memcache:get('some_key')
---
--- memcache:delete('old_key')
---
---
---
--- Methods:
---
--- memcache = Memcached.Connect()
---    Connect to memcached server at localhost on port number 11211. 
---
--- memcache = Memcached.Connect(host[, port])
---    Connect to memcached server at 'host' on port number 'port'. If port is not provided, port 11211 is used.  
---
----memcache = Memcached.Connect(port)
---    Connect to memcached server at localhost on port number 'port'.
---
--- memcache = Memcached.Connect({{'host', port}, 'host', port})  
---    Connect to multiple memcached servers.
---
--- memcache:set(key, value[, expiry])
---    Unconditionally sets a key to a given value in the memcache. The value for 'expiry' is the expiration
---    time (default is 0, never expire).
---     
--- memcache:add(key, value[, expiry])
---    Like set, but only stores in memcache if the key doesn't already exist.
---    
--- memcache:replace(key, value[, expiry])
---    Like set, but only stores in memcache if the key already exists. The opposite of add.
---    
--- value = memcache:get(key)
---    Retrieves a key from the memcache. Returns the value or nil
---    
--- values = memcache:get_multi(...)
---    Retrieves multiple keys from the memcache doing just one query.  Returns a table of key/value pairs that were available.
---    
--- memcache:delete(key)
---    Deletes a key. Returns true on deletion, false if the key was not found.
---    
--- value = memcache:incr(key[, value])
---    Sends a command to the server to atomically increment the value for key by value, or by 1 if value is nil. 
---    Returns nil if key doesn't exist on server, otherwise it returns the new value after incrementing. Value should be zero or greater.
---    
--- value = memcache:decr(key[, value])
---    Like incr, but decrements. Unlike incr, underflow is checked and new values are capped at 0. If server value is 1, a decrement of 2 returns 0, not -1.
---
--- servers = memcache:stats([key])
---    Returns a table of statistical data regarding the memcache server(s). Allowed keys are:
---	'', 'malloc', 'sizes', 'slabs', 'items'
---
---  success = memcache:flush_all()
---     Runs the memcached "flush_all" command on all configured hosts, emptying all their caches. 
---
---  memcache:disconnect_all()
---     Closes all cached sockets to all memcached servers.
---
---  memcache:set_hash(hashfunc)
---     Sets a custom hash function for key values. The default is a CRC32 hashing function.
---     'hashfunc' should be defined receiving a single string parameter and returing a single integer value.
---
---  memcache:set_encode(func)
---     Sets a custom encode function for serialising table values. 'func' should be defined receiving a single
---     table value and returning a single string value.
---
---  memcache:set_decode(func)
---     Sets a custom decode function for deserialising table values. 'func' should be defined receiving a 
---     single single and returning a single table value
---
---  memcache:enable_compression(onflag)
---     Turns data compression support on or off.
---
---  memcache:set_compress_threshold(size)
---     Set the compression threshold. If the value to be stored is larger than `size' bytes (and compression 
---     is enabled), compress before storing.
---
---  memcache:set_compress(func)
---     Sets a custom data compression function. 'func' should be defined receiving a single string value and
---     returning a single string value.
---
---  memcache:set_decompress(func)
---     Sets a custom data decompression function. 'func' should be defined receiving a single string value and
---     returning a single string value.
diff --git a/debian/modules/http-lua/t/lib/Redis.lua b/debian/modules/http-lua/t/lib/Redis.lua
deleted file mode 100644
index 8bc2804..0000000
--- a/debian/modules/http-lua/t/lib/Redis.lua
+++ /dev/null
@@ -1,1120 +0,0 @@
---[[
-Copyright (c) 2009-2011 Daniele Alessandri
- 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
- 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-]]
-
-module('Redis', package.seeall)
-
-local commands, network, request, response = {}, {}, {}, {}
-
-local defaults = {
-    host        = '127.0.0.1',
-    port        = 6379,
-    tcp_nodelay = true,
-    path        = nil
-}
-
-local protocol = {
-    newline = '\r\n',
-    ok      = 'OK',
-    err     = 'ERR',
-    queued  = 'QUEUED',
-    null    = 'nil'
-}
-
-local lua_error = error
-local function default_error_fn(message, level)
-    lua_error(message, (level or 1) + 1)
-end
-
-local function merge_defaults(parameters)
-    if parameters == nil then
-        parameters = {}
-    end
-    for k, v in pairs(defaults) do
-        if parameters[k] == nil then
-            parameters[k] = defaults[k]
-        end
-    end
-    return parameters
-end
-
-local function parse_boolean(v)
-    if v == '1' or v == 'true' or v == 'TRUE' then
-        return true
-    elseif v == '0' or v == 'false' or v == 'FALSE' then
-        return false
-    else
-        return nil
-    end
-end
-
-local function toboolean(value) return value == 1 end
-
-local function fire_and_forget(client, command)
-    -- let's fire and forget! the connection is closed as soon
-    -- as the SHUTDOWN command is received by the server.
-    client.network.write(client, command .. protocol.newline)
-    return false
-end
-
-local function zset_range_request(client, command, ...)
-    local args, opts = {...}, { }
-
-    if #args >= 1 and type(args[#args]) == 'table' then
-        local options = table.remove(args, #args)
-        if options.withscores then
-            table.insert(opts, 'WITHSCORES')
-        end
-    end
-
-    for _, v in pairs(opts) do table.insert(args, v) end
-    request.multibulk(client, command, args)
-end
-
-local function zset_range_byscore_request(client, command, ...)
-    local args, opts = {...}, { }
-
-    if #args >= 1 and type(args[#args]) == 'table' then
-        local options = table.remove(args, #args)
-        if options.limit then
-            table.insert(opts, 'LIMIT')
-            table.insert(opts, options.limit.offset or options.limit[1])
-            table.insert(opts, options.limit.count or options.limit[2])
-        end
-        if options.withscores then
-            table.insert(opts, 'WITHSCORES')
-        end
-    end
-
-    for _, v in pairs(opts) do table.insert(args, v) end
-    request.multibulk(client, command, args)
-end
-
-local function zset_range_reply(reply, command, ...)
-    local args = {...}
-    local opts = args[4]
-    if opts and (opts.withscores or string.lower(tostring(opts)) == 'withscores') then
-        local new_reply = { }
-        for i = 1, #reply, 2 do
-            table.insert(new_reply, { reply[i], reply[i + 1] })
-        end
-        return new_reply
-    else
-        return reply
-    end
-end
-
-local function zset_store_request(client, command, ...)
-    local args, opts = {...}, { }
-
-    if #args >= 1 and type(args[#args]) == 'table' then
-        local options = table.remove(args, #args)
-        if options.weights and type(options.weights) == 'table' then
-            table.insert(opts, 'WEIGHTS')
-            for _, weight in ipairs(options.weights) do
-                table.insert(opts, weight)
-            end
-        end
-        if options.aggregate then
-            table.insert(opts, 'AGGREGATE')
-            table.insert(opts, options.aggregate)
-        end
-    end
-
-    for _, v in pairs(opts) do table.insert(args, v) end
-    request.multibulk(client, command, args)
-end
-
-local function mset_filter_args(client, command, ...)
-    local args, arguments = {...}, {}
-    if (#args == 1 and type(args[1]) == 'table') then
-        for k,v in pairs(args[1]) do
-            table.insert(arguments, k)
-            table.insert(arguments, v)
-        end
-    else
-        arguments = args
-    end
-    request.multibulk(client, command, arguments)
-end
-
-local function hash_multi_request_builder(builder_callback)
-    return function(client, command, ...)
-        local args, arguments = {...}, { }
-        if #args == 2 then
-            table.insert(arguments, args[1])
-            for k, v in pairs(args[2]) do
-                builder_callback(arguments, k, v)
-            end
-        else
-            arguments = args
-        end
-        request.multibulk(client, command, arguments)
-    end
-end
-
-local function parse_info(response)
-    local info = {}
-    response:gsub('([^\r\n]*)\r\n', function(kv)
-        local k,v = kv:match(('([^:]*):([^:]*)'):rep(1))
-        if (k:match('db%d+')) then
-            info[k] = {}
-            v:gsub(',', function(dbkv)
-                local dbk,dbv = kv:match('([^:]*)=([^:]*)')
-                info[k][dbk] = dbv
-            end)
-        else
-            info[k] = v
-        end
-    end)
-    return info
-end
-
-local function parse_info_new(response)
-    local info, current = {}, nil
-    response:gsub('([^\r\n]*)\r\n', function(kv)
-        if kv == '' then return end
-
-        local section = kv:match(('^# (%w+)'):rep(1))
-        if section then
-            current = section:lower()
-            info[current] = {}
-            return
-        end
-
-        local k,v = kv:match(('([^:]*):([^:]*)'):rep(1))
-        if (k:match('db%d+')) then
-            info[current][k] = {}
-            v:gsub(',', function(dbkv)
-                local dbk,dbv = kv:match('([^:]*)=([^:]*)')
-                info[current][dbk] = dbv
-            end)
-        else
-            info[current][k] = v
-        end
-    end)
-    return info
-end
-
-local function load_methods(proto, methods)
-    local redis = setmetatable ({}, getmetatable(proto))
-    for i, v in pairs(proto) do redis[i] = v end
-    for i, v in pairs(methods) do redis[i] = v end
-    return redis
-end
-
-local function create_client(proto, client_socket, methods)
-    local redis = load_methods(proto, methods)
-    redis.network = {
-        socket = client_socket,
-        read   = network.read,
-        write  = network.write,
-    }
-    redis.requests = {
-        multibulk = request.multibulk,
-    }
-    return redis
-end
-
--- ############################################################################
-
-function network.write(client, buffer)
-    local _, err = client.network.socket:send(buffer)
-    if err then client.error(err) end
-end
-
-function network.read(client, len)
-    if len == nil then len = '*l' end
-    local line, err = client.network.socket:receive(len)
-    if not err then return line else client.error('connection error: ' .. err) end
-end
-
--- ############################################################################
-
-function response.read(client)
-    local res = client.network.read(client)
-    local prefix  = res:sub(1, -#res)
-    local handler = protocol.prefixes[prefix]
-    if not handler then
-        client.error('unknown response prefix: '..prefix)
-    end
-    return handler(client, res)
-end
-
-function response.status(client, data)
-    local sub = data:sub(2)
-
-    if sub == protocol.ok then
-        return true
-    elseif sub == protocol.queued then
-        return { queued = true }
-    else
-        return sub
-    end
-end
-
-function response.error(client, data)
-    local err_line = data:sub(2)
-
-    if err_line:sub(1, 3) == protocol.err then
-        client.error('redis error: ' .. err_line:sub(5))
-    else
-        client.error('redis error: ' .. err_line)
-    end
-end
-
-function response.bulk(client, data)
-    local str = data:sub(2)
-    local len = tonumber(str)
-    if not len then
-        client.error('cannot parse ' .. str .. ' as data length')
-    end
-
-    if len == -1 then return nil end
-    local next_chunk = client.network.read(client, len + 2)
-    return next_chunk:sub(1, -3);
-end
-
-function response.multibulk(client, data)
-    local str = data:sub(2)
-    local list_count = tonumber(str)
-
-    if list_count == -1 then
-        return nil
-    else
-        local list = {}
-        if list_count > 0 then
-            for i = 1, list_count do
-                table.insert(list, i, response.read(client))
-            end
-        end
-        return list
-    end
-end
-
-function response.integer(client, data)
-    local res = data:sub(2)
-    local number = tonumber(res)
-
-    if not number then
-        if res == protocol.null then
-            return nil
-        end
-        client.error('cannot parse '..res..' as a numeric response.')
-    end
-
-    return number
-end
-
-protocol.prefixes = {
-    ['+'] = response.status,
-    ['-'] = response.error,
-    ['$'] = response.bulk,
-    ['*'] = response.multibulk,
-    [':'] = response.integer,
-}
-
--- ############################################################################
-
-function request.raw(client, buffer)
-    local bufferType = type(buffer)
-
-    if bufferType == 'table' then
-        client.network.write(client, table.concat(buffer))
-    elseif bufferType == 'string' then
-        client.network.write(client, buffer)
-    else
-        client.error('argument error: ' .. bufferType)
-    end
-end
-
-function request.multibulk(client, command, ...)
-    local args      = {...}
-    local args_len  = #args
-    local buffer    = { true, true }
-    local proto_nl  = protocol.newline
-
-    if args_len == 1 and type(args[1]) == 'table' then
-        args_len, args = #args[1], args[1]
-    end
-
-    buffer[1] = '*' .. tostring(args_len + 1) .. proto_nl
-    buffer[2] = '$' .. #command .. proto_nl .. command .. proto_nl
-
-    for _, argument in pairs(args) do
-        s_argument = tostring(argument)
-        table.insert(buffer, '$' .. #s_argument .. proto_nl .. s_argument .. proto_nl)
-    end
-
-    request.raw(client, buffer)
-end
-
--- ############################################################################
-
-local function custom(command, send, parse)
-    return function(client, ...)
-        local has_reply = send(client, command, ...)
-        if has_reply == false then return end
-        local reply = response.read(client)
-
-        if type(reply) == 'table' and reply.queued then
-            reply.parser = parse
-            return reply
-        else
-            if parse then
-                return parse(reply, command, ...)
-            else
-                return reply
-            end
-        end
-    end
-end
-
-function command(command, opts)
-    if opts == nil or type(opts) == 'function' then
-        return custom(command, request.multibulk, opts)
-    else
-        return custom(command, opts.request or request.multibulk, opts.response)
-    end
-end
-
-local define_command_impl = function(target, name, opts)
-    local opts = opts or {}
-    target[string.lower(name)] = custom(
-        opts.command or string.upper(name),
-        opts.request or request.multibulk,
-        opts.response or nil
-    )
-end
-
-function define_command(name, opts)
-    define_command_impl(commands, name, opts)
-end
-
-local undefine_command_impl = function(target, name)
-    target[string.lower(name)] = nil
-end
-
-function undefine_command(name)
-    undefine_command_impl(commands, name)
-end
-
--- ############################################################################
-
-local client_prototype = {}
-
-client_prototype.raw_cmd = function(client, buffer)
-    request.raw(client, buffer .. protocol.newline)
-    return response.read(client)
-end
-
-client_prototype.define_command = function(client, name, opts)
-    define_command_impl(client, name, opts)
-end
-
-client_prototype.undefine_command = function(client, name)
-    undefine_command_impl(client, name)
-end
-
--- Command pipelining
-
-client_prototype.pipeline = function(client, block)
-    local requests, replies, parsers = {}, {}, {}
-    local socket_write, socket_read = client.network.write, client.network.read
-
-    client.network.write = function(_, buffer)
-        table.insert(requests, buffer)
-    end
-
-    -- TODO: this hack is necessary to temporarily reuse the current
-    --       request -> response handling implementation of redis-lua
-    --       without further changes in the code, but it will surely
-    --       disappear when the new command-definition infrastructure
-    --       will finally be in place.
-    client.network.read = function() return '+QUEUED' end
-
-    local pipeline = setmetatable({}, {
-        __index = function(env, name)
-            local cmd = client[name]
-            if not cmd then
-                client.error('unknown redis command: ' .. name, 2)
-            end
-            return function(self, ...)
-                local reply = cmd(client, ...)
-                table.insert(parsers, #requests, reply.parser)
-                return reply
-            end
-        end
-    })
-
-    local success, retval = pcall(block, pipeline)
-
-    client.network.write, client.network.read = socket_write, socket_read
-    if not success then client.error(retval, 0) end
-
-    client.network.write(client, table.concat(requests, ''))
-
-    for i = 1, #requests do
-        local reply, parser = response.read(client), parsers[i]
-        if parser then
-            reply = parser(reply)
-        end
-        table.insert(replies, i, reply)
-    end
-
-    return replies, #requests
-end
-
--- Publish/Subscribe
-
-do
-    local channels = function(channels)
-        if type(channels) == 'string' then
-            channels = { channels }
-        end
-        return channels
-    end
-
-    local subscribe = function(client, ...)
-        request.multibulk(client, 'subscribe', ...)
-    end
-    local psubscribe = function(client, ...)
-        request.multibulk(client, 'psubscribe', ...)
-    end
-    local unsubscribe = function(client, ...)
-        request.multibulk(client, 'unsubscribe')
-    end
-    local punsubscribe = function(client, ...)
-        request.multibulk(client, 'punsubscribe')
-    end
-
-    local consumer_loop = function(client)
-        local aborting, subscriptions = false, 0
-
-        local abort = function()
-            if not aborting then
-                unsubscribe(client)
-                punsubscribe(client)
-                aborting = true
-            end
-        end
-
-        return coroutine.wrap(function()
-            while true do
-                local message
-                local response = response.read(client)
-
-                if response[1] == 'pmessage' then
-                    message = {
-                        kind    = response[1],
-                        pattern = response[2],
-                        channel = response[3],
-                        payload = response[4],
-                    }
-                else
-                    message = {
-                        kind    = response[1],
-                        channel = response[2],
-                        payload = response[3],
-                    }
-                end
-
-                if string.match(message.kind, '^p?subscribe$') then
-                    subscriptions = subscriptions + 1
-                end
-                if string.match(message.kind, '^p?unsubscribe$') then
-                    subscriptions = subscriptions - 1
-                end
-
-                if aborting and subscriptions == 0 then
-                    break
-                end
-                coroutine.yield(message, abort)
-            end
-        end)
-    end
-
-    client_prototype.pubsub = function(client, subscriptions)
-        if type(subscriptions) == 'table' then
-            if subscriptions.subscribe then
-                subscribe(client, channels(subscriptions.subscribe))
-            end
-            if subscriptions.psubscribe then
-                psubscribe(client, channels(subscriptions.psubscribe))
-            end
-        end
-        return consumer_loop(client)
-    end
-end
-
--- Redis transactions (MULTI/EXEC)
-
-do
-    local function identity(...) return ... end
-    local emptytable = {}
-
-    local function initialize_transaction(client, options, block, queued_parsers)
-        local coro = coroutine.create(block)
-
-        if options.watch then
-            local watch_keys = {}
-            for _, key in pairs(options.watch) do
-                table.insert(watch_keys, key)
-            end
-            if #watch_keys > 0 then
-                client:watch(unpack(watch_keys))
-            end
-        end
-
-        local transaction_client = setmetatable({}, {__index=client})
-        transaction_client.exec  = function(...)
-            client.error('cannot use EXEC inside a transaction block')
-        end
-        transaction_client.multi = function(...)
-            coroutine.yield()
-        end
-        transaction_client.commands_queued = function()
-            return #queued_parsers
-        end
-
-        assert(coroutine.resume(coro, transaction_client))
-
-        transaction_client.multi = nil
-        transaction_client.discard = function(...)
-            local reply = client:discard()
-            for i, v in pairs(queued_parsers) do
-                queued_parsers[i]=nil
-            end
-            coro = initialize_transaction(client, options, block, queued_parsers)
-            return reply
-        end
-        transaction_client.watch = function(...)
-            client.error('WATCH inside MULTI is not allowed')
-        end
-        setmetatable(transaction_client, { __index = function(t, k)
-                local cmd = client[k]
-                if type(cmd) == "function" then
-                    local function queuey(self, ...)
-                        local reply = cmd(client, ...)
-                        assert((reply or emptytable).queued == true, 'a QUEUED reply was expected')
-                        table.insert(queued_parsers, reply.parser or identity)
-                        return reply
-                    end
-                    t[k]=queuey
-                    return queuey
-                else
-                    return cmd
-                end
-            end
-        })
-        client:multi()
-        return coro
-    end
-
-    local function transaction(client, options, coroutine_block, attempts)
-        local queued_parsers, replies = {}, {}
-        local retry = tonumber(attempts) or tonumber(options.retry) or 2
-        local coro = initialize_transaction(client, options, coroutine_block, queued_parsers)
-
-        local success, retval
-        if coroutine.status(coro) == 'suspended' then
-            success, retval = coroutine.resume(coro)
-        else
-            -- do not fail if the coroutine has not been resumed (missing t:multi() with CAS)
-            success, retval = true, 'empty transaction'
-        end
-        if #queued_parsers == 0 or not success then
-            client:discard()
-            assert(success, retval)
-            return replies, 0
-        end
-
-        local raw_replies = client:exec()
-        if not raw_replies then
-            if (retry or 0) <= 0 then
-                client.error("MULTI/EXEC transaction aborted by the server")
-            else
-                --we're not quite done yet
-                return transaction(client, options, coroutine_block, retry - 1)
-            end
-        end
-
-        for i, parser in pairs(queued_parsers) do
-            table.insert(replies, i, parser(raw_replies[i]))
-        end
-
-        return replies, #queued_parsers
-    end
-
-    client_prototype.transaction = function(client, arg1, arg2)
-        local options, block
-        if not arg2 then
-            options, block = {}, arg1
-        elseif arg1 then --and arg2, implicitly
-            options, block = type(arg1)=="table" and arg1 or { arg1 }, arg2
-        else
-            client.error("Invalid parameters for redis transaction.")
-        end
-
-        if not options.watch then
-            watch_keys = { }
-            for i, v in pairs(options) do
-                if tonumber(i) then
-                    table.insert(watch_keys, v)
-                    options[i] = nil
-                end
-            end
-            options.watch = watch_keys
-        elseif not (type(options.watch) == 'table') then
-            options.watch = { options.watch }
-        end
-
-        if not options.cas then
-            local tx_block = block
-            block = function(client, ...)
-                client:multi()
-                return tx_block(client, ...) --can't wrap this in pcall because we're in a coroutine.
-            end
-        end
-
-        return transaction(client, options, block)
-    end
-end
-
--- ############################################################################
-
-local function connect_tcp(socket, parameters)
-    local host, port = parameters.host, tonumber(parameters.port)
-    local ok, err = socket:connect(host, port)
-    if not ok then
-        default_error_fn('could not connect to '..host..':'..port..' ['..err..']')
-    end
-    socket:setoption('tcp-nodelay', parameters.tcp_nodelay)
-    return socket
-end
-
-local function connect_unix(socket, parameters)
-    local ok, err = socket:connect(parameters.path)
-    if not ok then
-        default_error_fn('could not connect to '..parameters.path..' ['..err..']')
-    end
-    return socket
-end
-
-local function create_connection(parameters)
-    local perform_connection, socket
-
-    if parameters.scheme == 'unix' then
-        perform_connection, socket = connect_unix, require('socket.unix')
-        assert(socket, 'your build of LuaSocket does not support UNIX domain sockets')
-    else
-        if parameters.scheme then
-            local scheme = parameters.scheme
-            assert(scheme == 'redis' or scheme == 'tcp', 'invalid scheme: '..scheme)
-        end
-        perform_connection, socket = connect_tcp, require('socket').tcp
-    end
-
-    return perform_connection(socket(), parameters)
-end
-
-function connect(...)
-    local args, parameters = {...}, nil
-
-    if #args == 1 then
-        if type(args[1]) == 'table' then
-            parameters = args[1]
-        else
-            local uri = require('socket.url')
-            parameters = uri.parse(select(1, ...))
-            if parameters.scheme then
-                if parameters.query then
-                    for k, v in parameters.query:gmatch('([-_%w]+)=([-_%w]+)') do
-                        if k == 'tcp_nodelay' or k == 'tcp-nodelay' then
-                            parameters.tcp_nodelay = parse_boolean(v)
-                        end
-                    end
-                end
-            else
-                parameters.host = parameters.path
-            end
-        end
-    elseif #args > 1 then
-        local host, port = unpack(args)
-        parameters = { host = host, port = port }
-    end
-
-    local socket = create_connection(merge_defaults(parameters))
-    local client = create_client(client_prototype, socket, commands)
-    
-    client.error = default_error_fn
-
-    return client
-end
-
--- ############################################################################
-
-commands = {
-    -- commands operating on the key space
-    exists           = command('EXISTS', {
-        response = toboolean
-    }),
-    del              = command('DEL'),
-    type             = command('TYPE'),
-    rename           = command('RENAME'),
-    renamenx         = command('RENAMENX', {
-        response = toboolean
-    }),
-    expire           = command('EXPIRE', {
-        response = toboolean
-    }),
-    pexpire          = command('PEXPIRE', {     -- >= 2.6
-        response = toboolean
-    }),
-    expireat         = command('EXPIREAT', {
-        response = toboolean
-    }),
-    pexpireat        = command('PEXPIREAT', {   -- >= 2.6
-        response = toboolean
-    }),
-    ttl              = command('TTL'),
-    pttl             = command('PTTL'),         -- >= 2.6
-    move             = command('MOVE', {
-        response = toboolean
-    }),
-    dbsize           = command('DBSIZE'),
-    persist          = command('PERSIST', {     -- >= 2.2
-        response = toboolean
-    }),
-    keys             = command('KEYS', {
-        response = function(response)
-            if type(response) == 'string' then
-                -- backwards compatibility path for Redis < 2.0
-                local keys = {}
-                response:gsub('[^%s]+', function(key)
-                    table.insert(keys, key)
-                end)
-                response = keys
-            end
-            return response
-        end
-    }),
-    randomkey        = command('RANDOMKEY', {
-        response = function(response)
-            if response == '' then
-                return nil
-            else
-                return response
-            end
-        end
-    }),
-    sort             = command('SORT', {
-        request = function(client, command, key, params)
-            --[[ params = {
-                    by    = 'weight_*',
-                    get   = 'object_*',
-                    limit = { 0, 10 },
-                    sort  = 'desc',
-                    alpha = true,
-                } --]]
-            local query = { key }
-
-            if params then
-                if params.by then
-                    table.insert(query, 'BY')
-                    table.insert(query, params.by)
-                end
-
-                if type(params.limit) == 'table' then
-                    -- TODO: check for lower and upper limits
-                    table.insert(query, 'LIMIT')
-                    table.insert(query, params.limit[1])
-                    table.insert(query, params.limit[2])
-                end
-
-                if params.get then
-                    if (type(params.get) == 'table') then
-                        for _, getarg in pairs(params.get) do
-                            table.insert(query, 'GET')
-                            table.insert(query, getarg)
-                        end
-                    else
-                        table.insert(query, 'GET')
-                        table.insert(query, params.get)
-                    end
-                end
-
-                if params.sort then
-                    table.insert(query, params.sort)
-                end
-
-                if params.alpha == true then
-                    table.insert(query, 'ALPHA')
-                end
-
-                if params.store then
-                    table.insert(query, 'STORE')
-                    table.insert(query, params.store)
-                end
-            end
-
-            request.multibulk(client, command, query)
-        end
-    }),
-
-    -- commands operating on string values
-    set              = command('SET'),
-    setnx            = command('SETNX', {
-        response = toboolean
-    }),
-    setex            = command('SETEX'),        -- >= 2.0
-    psetex           = command('PSETEX'),       -- >= 2.6
-    mset             = command('MSET', {
-        request = mset_filter_args
-    }),
-    msetnx           = command('MSETNX', {
-        request  = mset_filter_args,
-        response = toboolean
-    }),
-    get              = command('GET'),
-    mget             = command('MGET'),
-    getset           = command('GETSET'),
-    incr             = command('INCR'),
-    incrby           = command('INCRBY'),
-    incrbyfloat      = command('INCRBYFLOAT', { -- >= 2.6
-        response = function(reply, command, ...)
-            return tonumber(reply)
-        end,
-    }),
-    decr             = command('DECR'),
-    decrby           = command('DECRBY'),
-    append           = command('APPEND'),       -- >= 2.0
-    substr           = command('SUBSTR'),       -- >= 2.0
-    strlen           = command('STRLEN'),       -- >= 2.2
-    setrange         = command('SETRANGE'),     -- >= 2.2
-    getrange         = command('GETRANGE'),     -- >= 2.2
-    setbit           = command('SETBIT'),       -- >= 2.2
-    getbit           = command('GETBIT'),       -- >= 2.2
-
-    -- commands operating on lists
-    rpush            = command('RPUSH'),
-    lpush            = command('LPUSH'),
-    llen             = command('LLEN'),
-    lrange           = command('LRANGE'),
-    ltrim            = command('LTRIM'),
-    lindex           = command('LINDEX'),
-    lset             = command('LSET'),
-    lrem             = command('LREM'),
-    lpop             = command('LPOP'),
-    rpop             = command('RPOP'),
-    rpoplpush        = command('RPOPLPUSH'),
-    blpop            = command('BLPOP'),        -- >= 2.0
-    brpop            = command('BRPOP'),        -- >= 2.0
-    rpushx           = command('RPUSHX'),       -- >= 2.2
-    lpushx           = command('LPUSHX'),       -- >= 2.2
-    linsert          = command('LINSERT'),      -- >= 2.2
-    brpoplpush       = command('BRPOPLPUSH'),   -- >= 2.2
-
-    -- commands operating on sets
-    sadd             = command('SADD', {
-        response = toboolean
-    }),
-    srem             = command('SREM', {
-        response = toboolean
-    }),
-    spop             = command('SPOP'),
-    smove            = command('SMOVE', {
-        response = toboolean
-    }),
-    scard            = command('SCARD'),
-    sismember        = command('SISMEMBER', {
-        response = toboolean
-    }),
-    sinter           = command('SINTER'),
-    sinterstore      = command('SINTERSTORE'),
-    sunion           = command('SUNION'),
-    sunionstore      = command('SUNIONSTORE'),
-    sdiff            = command('SDIFF'),
-    sdiffstore       = command('SDIFFSTORE'),
-    smembers         = command('SMEMBERS'),
-    srandmember      = command('SRANDMEMBER'),
-
-    -- commands operating on sorted sets
-    zadd             = command('ZADD', {
-        response = toboolean
-    }),
-    zincrby          = command('ZINCRBY'),
-    zrem             = command('ZREM', {
-        response = toboolean
-    }),
-    zrange           = command('ZRANGE', {
-        request  = zset_range_request,
-        response = zset_range_reply,
-    }),
-    zrevrange        = command('ZREVRANGE', {
-        request  = zset_range_request,
-        response = zset_range_reply,
-    }),
-    zrangebyscore    = command('ZRANGEBYSCORE', {
-        request  = zset_range_byscore_request,
-        response = zset_range_reply,
-    }),
-    zrevrangebyscore = command('ZREVRANGEBYSCORE', {    -- >= 2.2
-        request  = zset_range_byscore_request,
-        response = zset_range_reply,
-    }),
-    zunionstore      = command('ZUNIONSTORE', {         -- >= 2.0
-        request = zset_store_request
-    }),
-    zinterstore      = command('ZINTERSTORE', {         -- >= 2.0
-        request = zset_store_request
-    }),
-    zcount           = command('ZCOUNT'),
-    zcard            = command('ZCARD'),
-    zscore           = command('ZSCORE'),
-    zremrangebyscore = command('ZREMRANGEBYSCORE'),
-    zrank            = command('ZRANK'),                -- >= 2.0
-    zrevrank         = command('ZREVRANK'),             -- >= 2.0
-    zremrangebyrank  = command('ZREMRANGEBYRANK'),      -- >= 2.0
-
-    -- commands operating on hashes
-    hset             = command('HSET', {        -- >= 2.0
-        response = toboolean
-    }),
-    hsetnx           = command('HSETNX', {      -- >= 2.0
-        response = toboolean
-    }),
-    hmset            = command('HMSET', {       -- >= 2.0
-        request  = hash_multi_request_builder(function(args, k, v)
-            table.insert(args, k)
-            table.insert(args, v)
-        end),
-    }),
-    hincrby          = command('HINCRBY'),      -- >= 2.0
-    hincrbyfloat     = command('HINCRBYFLOAT', {-- >= 2.6
-        response = function(reply, command, ...)
-            return tonumber(reply)
-        end,
-    }),
-    hget             = command('HGET'),         -- >= 2.0
-    hmget            = command('HMGET', {       -- >= 2.0
-        request  = hash_multi_request_builder(function(args, k, v)
-            table.insert(args, v)
-        end),
-    }),
-    hdel             = command('HDEL', {        -- >= 2.0
-        response = toboolean
-    }),
-    hexists          = command('HEXISTS', {     -- >= 2.0
-        response = toboolean
-    }),
-    hlen             = command('HLEN'),         -- >= 2.0
-    hkeys            = command('HKEYS'),        -- >= 2.0
-    hvals            = command('HVALS'),        -- >= 2.0
-    hgetall          = command('HGETALL', {     -- >= 2.0
-        response = function(reply, command, ...)
-            local new_reply = { }
-            for i = 1, #reply, 2 do new_reply[reply[i]] = reply[i + 1] end
-            return new_reply
-        end
-    }),
-
-    -- connection related commands
-    ping             = command('PING', {
-        response = function(response) return response == 'PONG' end
-    }),
-    echo             = command('ECHO'),
-    auth             = command('AUTH'),
-    select           = command('SELECT'),
-    quit             = command('QUIT', {
-        request = fire_and_forget
-    }),
-
-    -- transactions
-    multi            = command('MULTI'),        -- >= 2.0
-    exec             = command('EXEC'),         -- >= 2.0
-    discard          = command('DISCARD'),      -- >= 2.0
-    watch            = command('WATCH'),        -- >= 2.2
-    unwatch          = command('UNWATCH'),      -- >= 2.2
-
-    -- publish - subscribe
-    subscribe        = command('SUBSCRIBE'),    -- >= 2.0
-    unsubscribe      = command('UNSUBSCRIBE'),  -- >= 2.0
-    psubscribe       = command('PSUBSCRIBE'),   -- >= 2.0
-    punsubscribe     = command('PUNSUBSCRIBE'), -- >= 2.0
-    publish          = command('PUBLISH'),      -- >= 2.0
-
-    -- redis scripting
-    eval             = command('EVAL'),         -- >= 2.6
-    evalsha          = command('EVALSHA'),      -- >= 2.6
-    script           = command('SCRIPT'),       -- >= 2.6
-
-    -- remote server control commands
-    bgrewriteaof     = command('BGREWRITEAOF'),
-    config           = command('CONFIG', {     -- >= 2.0
-        response = function(reply, command, ...)
-            if (type(reply) == 'table') then
-                local new_reply = { }
-                for i = 1, #reply, 2 do new_reply[reply[i]] = reply[i + 1] end
-                return new_reply
-            end
-
-            return reply
-        end
-    }),
-    client           = command('CLIENT'),       -- >= 2.4
-    slaveof          = command('SLAVEOF'),
-    save             = command('SAVE'),
-    bgsave           = command('BGSAVE'),
-    lastsave         = command('LASTSAVE'),
-    flushdb          = command('FLUSHDB'),
-    flushall         = command('FLUSHALL'),
-    shutdown         = command('SHUTDOWN', {
-        request = fire_and_forget
-    }),
-    slowlog          = command('SLOWLOG', {     -- >= 2.2.13
-        response = function(reply, command, ...)
-            if (type(reply) == 'table') then
-                local structured = { }
-                for index, entry in ipairs(reply) do
-                    structured[index] = {
-                        id = tonumber(entry[1]),
-                        timestamp = tonumber(entry[2]),
-                        duration = tonumber(entry[3]),
-                        command = entry[4],
-                    }
-                end
-                return structured
-            end
-
-            return reply
-        end
-    }),
-    info             = command('INFO', {
-        response = function(response)
-            if string.find(response, '^# ') then
-                return parse_info_new(response)
-            end
-            return parse_info(response)
-        end
-    }),
-}
diff --git a/debian/modules/http-lua/t/lib/ljson.lua b/debian/modules/http-lua/t/lib/ljson.lua
deleted file mode 100644
index 1084724..0000000
--- a/debian/modules/http-lua/t/lib/ljson.lua
+++ /dev/null
@@ -1,89 +0,0 @@
-local ngx_null = ngx.null
-local tostring = tostring
-local byte = string.byte
-local gsub = string.gsub
-local sort = table.sort
-local pairs = pairs
-local ipairs = ipairs
-local concat = table.concat
-
-local ok, new_tab = pcall(require, "table.new")
-if not ok then
-    new_tab = function (narr, nrec) return {} end
-end
-
-local _M = {}
-
-local metachars = {
-    ['\t'] = '\\t',
-    ["\\"] = "\\\\",
-    ['"'] = '\\"',
-    ['\r'] = '\\r',
-    ['\n'] = '\\n',
-}
-
-local function encode_str(s)
-    -- XXX we will rewrite this when string.buffer is implemented
-    -- in LuaJIT 2.1 because string.gsub cannot be JIT compiled.
-    return gsub(s, '["\\\r\n\t]', metachars)
-end
-
-local function is_arr(t)
-    local exp = 1
-    for k, _ in pairs(t) do
-        if k ~= exp then
-            return nil
-        end
-        exp = exp + 1
-    end
-    return exp - 1
-end
-
-local encode
-
-encode = function (v)
-    if v == nil or v == ngx_null then
-        return "null"
-    end
-
-    local typ = type(v)
-    if typ == 'string' then
-        return '"' .. encode_str(v) .. '"'
-    end
-
-    if typ == 'number' or typ == 'boolean' then
-        return tostring(v)
-    end
-
-    if typ == 'table' then
-        local n = is_arr(v)
-        if n then
-            local bits = new_tab(n, 0)
-            for i, elem in ipairs(v) do
-                bits[i] = encode(elem)
-            end
-            return "[" .. concat(bits, ",") .. "]"
-        end
-
-        local keys = {}
-        local i = 0
-        for key, _ in pairs(v) do
-            i = i + 1
-            keys[i] = key
-        end
-        sort(keys)
-
-        local bits = new_tab(0, i)
-        i = 0
-        for _, key in ipairs(keys) do
-            i = i + 1
-            bits[i] = encode(key) .. ":" .. encode(v[key])
-        end
-        return "{" .. concat(bits, ",") .. "}"
-    end
-
-    return '"<' .. typ .. '>"'
-end
-_M.encode = encode
-
-return _M
diff --git a/debian/modules/http-lua/tapset/ngx_lua.stp b/debian/modules/http-lua/tapset/ngx_lua.stp
deleted file mode 100644
index 04fecb5..0000000
--- a/debian/modules/http-lua/tapset/ngx_lua.stp
+++ /dev/null
@@ -1,5 +0,0 @@
-function ngx_http_lua_ctx_context(r)
-{
-
-}
-
diff --git a/debian/modules/http-lua/util/build.sh b/debian/modules/http-lua/util/build.sh
deleted file mode 100755
index 164bf9f..0000000
--- a/debian/modules/http-lua/util/build.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-# this script is for developers only.
-# dependent on the ngx-build script from the nginx-devel-utils repostory:
-#   https://github.com/openresty/nginx-devel-utils/blob/master/ngx-build
-# the resulting nginx is located at ./work/nginx/sbin/nginx
-
-root=`pwd`
-version=${1:-1.4.1}
-home=~
-force=$2
-
-# the ngx-build script is from https://github.com/agentzh/nginx-devel-utils
-
-            #--add-module=$home/work/nginx_upload_module-2.2.0 \
-
-            #--without-pcre \
-            #--without-http_rewrite_module \
-            #--without-http_autoindex_module \
-            #--with-cc=gcc46 \
-            #--with-cc=clang \
-            #--without-http_referer_module \
-            #--with-http_spdy_module \
-
-time ngx-build $force $version \
-            --with-pcre-jit \
-            --with-ipv6 \
-            --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" \
-            --with-http_v2_module \
-            --with-http_realip_module \
-            --with-http_ssl_module \
-            --add-module=$root/../ndk-nginx-module \
-            --add-module=$root/../set-misc-nginx-module \
-            --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:$OPENSSL_LIB" \
-            --without-mail_pop3_module \
-            --without-mail_imap_module \
-            --with-http_image_filter_module \
-            --without-mail_smtp_module \
-            --with-stream \
-            --with-stream_ssl_module \
-            --without-http_upstream_ip_hash_module \
-            --without-http_memcached_module \
-            --without-http_auth_basic_module \
-            --without-http_userid_module \
-            --with-http_auth_request_module \
-                --add-module=$root/../echo-nginx-module \
-                --add-module=$root/../memc-nginx-module \
-                --add-module=$root/../srcache-nginx-module \
-                --add-module=$root \
-                --add-module=$root/../lua-upstream-nginx-module \
-              --add-module=$root/../headers-more-nginx-module \
-                --add-module=$root/../drizzle-nginx-module \
-                --add-module=$root/../rds-json-nginx-module \
-                --add-module=$root/../coolkit-nginx-module \
-                --add-module=$root/../redis2-nginx-module \
-                --add-module=$root/../stream-lua-nginx-module \
-                --add-module=$root/t/data/fake-module \
-                --add-module=$root/t/data/fake-shm-module \
-                --add-module=$root/t/data/fake-delayed-load-module \
-                --with-http_gunzip_module \
-                --with-http_dav_module \
-          --with-select_module \
-          --with-poll_module \
-                $opts \
-                --with-debug
-
diff --git a/debian/modules/http-lua/util/fix-comments b/debian/modules/http-lua/util/fix-comments
deleted file mode 100644
index bcf1d5d..0000000
--- a/debian/modules/http-lua/util/fix-comments
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-for my $infile (@ARGV) {
-    warn "Processing $infile...\n";
-    open my $in, $infile or
-        die "Cannot open $infile for reading: $!\n";
-    my $s;
-    my $changed = 0;
-    while (<$in>) {
-        $changed += s{//(.*)}{/* $1 */};
-        $s .= $_;
-    }
-    close $in;
-
-    if ($changed) {
-        my $outfile = $infile;
-        open my $out, ">$outfile" or
-            die "Cannot open $outfile for writing: $!\n";
-        print $out $s;
-        close $out;
-        warn "Wrote $outfile\n";
-    }
-}
-
diff --git a/debian/modules/http-lua/util/gen-lexer-c b/debian/modules/http-lua/util/gen-lexer-c
deleted file mode 100755
index dfed3fc..0000000
--- a/debian/modules/http-lua/util/gen-lexer-c
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$1" ]; then
-    level=0
-else
-    level="$1"
-fi
-
-#echo '{' '}' '\[=*\[' '--\[=*\[' '\]=*\]' '--[^\n]*' '"(?:\\[^\n]|[^"\n\\])*"' $'\'(?:\\\\[^\\n]|[^\'\\n\\\\])*\''
-
-# we need the re.pl script here:
-#   https://github.com/openresty/sregex/blob/dfa-multi-re/re.pl
-re.pl -W --no-main -c --cc="clang -O2" \
-    --func-name ngx_http_lua_lex \
-    --header ngx_http_lua_lex.h -o src/ngx_http_lua_lex.c \
-    --debug=$level -n 8 \
-    -- '{' '}' '\[=*\[' '--\[=*\[' '\]=*\]' '--[^\n]*' '"(?:\\[^\n]|[^"\n\\])*"' $'\'(?:\\\\[^\\n]|[^\'\\n\\\\])*\'' \
-    || exit 1
diff --git a/debian/modules/http-lua/util/ngx-links b/debian/modules/http-lua/util/ngx-links
deleted file mode 100755
index 8afe91e..0000000
--- a/debian/modules/http-lua/util/ngx-links
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-use Cwd qw( cwd );
-use Getopt::Std;
-
-my %opts;
-getopts('f', \%opts) or
-    die "Usage: $0 [-f]
-Options:
-    -f          Override existing symbolic links with force
-";
-
-my $root = shift || 'src';
-
-my $force = $opts{f};
-
-opendir my $dir, $root
-    or die "Can't open directory src/ for reading: $!\n";
-
-my @links;
-
-while (my $entry = readdir $dir) {
-    my ($base, $ext);
-
-    my $source = "$root/$entry";
-
-    if (-l $source || -d $source) {
-        warn "skipping $source\n";
-        next;
-    }
-
-    if ($entry =~ m{ ^ ngx_ (?: \w+ _ )+ (\w+) \. ([ch]|rl) $}x) {
-        ($base, $ext) = ($1, $2);
-    } else {
-        next;
-    }
-
-    my $target = "$root/$base.$ext";
-    if (-e $target && ! -l $target) {
-        die "target $target already exists, and not a symlink, not overriding...Abort.\n";
-    } elsif (-l $target) {
-        #warn "it's a link";
-        if ( ! $force ) {
-            die "target $target already exists, not overriding...Abort.\n";
-        }
-        warn "overriding existing symlink $target\n";
-    }
-    #warn "creating $target --> $root/$entry\n";
-    system("ln -svf `pwd`/$source $target") == 0 or
-        die "Failed to create the symlink\n";;
-
-    push @links, $target;
-}
-
-print join("\n", @links), "\n";
-
-close $dir;
-
-
diff --git a/debian/modules/http-lua/util/releng b/debian/modules/http-lua/util/releng
deleted file mode 100755
index adc2f4d..0000000
--- a/debian/modules/http-lua/util/releng
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-./update-readme
-ack '(?<=\#define)\s*DDEBUG\s*1' src
-echo ====================================================
-ack '(?<=_version_string) "\d+\.\d+\.\d+"' src
-ack '(?<=This document describes rds-json-nginx-module v)\d+\.\d+' README
-
diff --git a/debian/modules/http-lua/util/retab b/debian/modules/http-lua/util/retab
deleted file mode 100755
index 89cd1b0..0000000
--- a/debian/modules/http-lua/util/retab
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-for f in $*; do
-	if [ -f "$f" ]; then
-		vim -c retab -c x $f
-	fi
-done
-
diff --git a/debian/modules/http-lua/util/revim b/debian/modules/http-lua/util/revim
deleted file mode 100755
index aa14da2..0000000
--- a/debian/modules/http-lua/util/revim
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-# vim:set ft=perl ts=4 sw=4 et fdm=marker:
-#
-# revim - add customized vim modeline for given files
-# Copyright (c) 2010 chaoslawful
-
-use strict;
-use warnings;
-use Getopt::Std;
-
-my %opts;
-
-getopts('hm:', \%opts);
-
-if($opts{h} or !@ARGV) {
-    die <<EOT;
-Usage: revim [-m <vim modeline>] src/*
-
-In <vim modeline>, the following placeholder(s) can be used:
-
-    * %t - Expands to vim file type. E.g. 'c' for .c files, 'perl' for .pl files.
-EOT
-}
-
-my $vim_ml = $opts{m} || "vim:set ft=%t ts=4 sw=4 et fdm=marker:";
-my @files = map glob, @ARGV;
-for my $file (@files) {
-    next if -d $file;
-    my ($ft, $ml) = detect_filetype($file, $vim_ml);
-    next if !defined($ft);
-    revim($file, $ml);
-}
-
-sub detect_filetype
-{
-    my ($f, $tmpl) = @_;
-    my ($ft, $lcmt, $rcmt);
-    my %phs;
-
-    if($f =~ /.([cC]|[hH])$/) {
-        $ft = "c";
-        ($lcmt, $rcmt) = ("/* ", " */");
-    } elsif($f =~ /.(pl|pm)$/) {
-        $ft = "perl";
-        ($lcmt, $rcmt) = ("# ", "");
-    } elsif($f =~ /.t_?$/) {
-        # assuming tests are written in perl
-        $ft = "perl";
-        ($lcmt, $rcmt) = ("# ", "");
-    } else {
-        $ft = undef;
-    }
-
-    if(defined($ft)) {
-        %phs = (
-            "%t" => $ft,
-        );
-
-        $tmpl =~ s/(%[a-z])/$phs{$1}/ge;
-        $tmpl =~ s/^/$lcmt/;
-        $tmpl =~ s/$/$rcmt/;
-
-        return ($ft, $tmpl);
-    }
-
-    return (undef, undef);
-}
-
-sub revim
-{
-    my ($f, $ml) = @_;
-    my @lines;
-
-    open my $in, $f
-        or die "Can't open $f for reading: $!";
-    while(<$in>) {
-        push(@lines, $_);
-    }
-    close $in;
-
-    my @nlines = grep {!/\bvim?:/} @lines;
-    warn "revim: $f:\tremoved existing vim modeline.\n"
-        if(@nlines != @lines);
-
-    if($nlines[0] =~ /^#!/) {    # has shebang line
-        my $shebang = shift @nlines;
-        unshift(@nlines, $shebang, "$ml\n");
-    } else {
-        unshift(@nlines, "$ml\n");
-    }
-
-    my $text = join '', @nlines;
-
-    open my $out, "> $f"
-        or die "Can't open $f for writing: $!";
-    binmode $out;
-    print $out $text;
-    close $out;
-
-    warn "revim: $f:\tdone.\n";
-}
-
diff --git a/debian/modules/http-lua/util/run_test.sh b/debian/modules/http-lua/util/run_test.sh
deleted file mode 100755
index 1f5b12f..0000000
--- a/debian/modules/http-lua/util/run_test.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-script_dir=$(dirname $0)
-root=$(readlink -f $script_dir/..)
-testfile=${1:-$root/t/*.t $root/t/*/*.t}
-cd $root
-$script_dir/reindex $testfile
-export PATH=$root/work/sbin:$PATH
-killall nginx
-prove -I$root/../test-nginx/lib $testfile
-
diff --git a/debian/modules/http-lua/util/update-readme.sh b/debian/modules/http-lua/util/update-readme.sh
deleted file mode 100755
index cf71f25..0000000
--- a/debian/modules/http-lua/util/update-readme.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-perl util/wiki2pod.pl doc/manpage.wiki > /tmp/a.pod && pod2text /tmp/a.pod > README
-
diff --git a/debian/modules/http-lua/valgrind.suppress b/debian/modules/http-lua/valgrind.suppress
deleted file mode 100644
index 7fff542..0000000
--- a/debian/modules/http-lua/valgrind.suppress
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-   <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
-   fun:ngx_vslprintf
-   fun:ngx_snprintf
-   fun:ngx_sock_ntop
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr1
-   fun:ngx_vslprintf
-   fun:ngx_snprintf
-   fun:ngx_sock_ntop
-   fun:ngx_event_accept
-}
-{
-   <insert_a_suppression_name_here>
-   exp-sgcheck:SorG
-   fun:ngx_http_lua_ndk_set_var_get
-}
-{
-   <insert_a_suppression_name_here>
-   exp-sgcheck:SorG
-   fun:ngx_http_variables_init_vars
-   fun:ngx_http_block
-}
-{
-   <insert_a_suppression_name_here>
-   exp-sgcheck:SorG
-   fun:ngx_conf_parse
-}
-{
-   <insert_a_suppression_name_here>
-   exp-sgcheck:SorG
-   fun:ngx_vslprintf
-   fun:ngx_log_error_core
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_ctl(event)
-   fun:epoll_ctl
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:ngx_conf_flush_files
-   fun:ngx_single_process_cycle
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:memcpy
-   fun:ngx_vslprintf
-   fun:ngx_log_error_core
-   fun:ngx_http_charset_header_filter
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   socketcall.setsockopt(optval)
-   fun:setsockopt
-   fun:drizzle_state_connect
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:ngx_conf_flush_files
-   fun:ngx_single_process_cycle
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_event_process_init
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   sendmsg(mmsg[0].msg_hdr)
-   fun:sendmmsg
-   fun:__libc_res_nsend
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   sendmsg(msg.msg_iov[0])
-   fun:__sendmsg_nocancel
-   fun:ngx_write_channel
-   fun:ngx_pass_open_channel
-   fun:ngx_start_cache_manager_processes
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:ngx_init_cycle
-   fun:ngx_master_process_cycle
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:index
-   fun:expand_dynamic_string_token
-   fun:_dl_map_object
-   fun:map_doit
-   fun:_dl_catch_error
-   fun:do_preload
-   fun:dl_main
-   fun:_dl_sysdep_start
-   fun:_dl_start
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   sendmsg(mmsg[0].msg_hdr)
-   fun:sendmmsg
-   fun:__libc_res_nsend
-   fun:__libc_res_nquery
-   fun:__libc_res_nquerydomain
-   fun:__libc_res_nsearch
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_set_environment
-   fun:ngx_single_process_cycle
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   obj:*
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_set_environment
-   fun:ngx_worker_process_init
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_create_pool
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_pwait(sigmask)
-   fun:epoll_pwait
-   fun:epoll_wait
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_pwait(sigmask)
-   fun:epoll_pwait
-   fun:epoll_wait
-   fun:ngx_epoll_test_rdhup
-   fun:ngx_epoll_init
-   fun:ngx_event_process_init
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_pwait(sigmask)
-   fun:epoll_pwait
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_pwait(sigmask)
-   fun:epoll_pwait
-   fun:ngx_epoll_test_rdhup
-   fun:ngx_epoll_init
-   fun:ngx_event_process_init
-}
diff --git a/debian/modules/patches/http-lua/CVE-2020-11724.patch b/debian/modules/patches/http-lua/CVE-2020-11724.patch
deleted file mode 100644
index 5e0eff7..0000000
--- a/debian/modules/patches/http-lua/CVE-2020-11724.patch
+++ /dev/null
@@ -1,856 +0,0 @@
-From 9ab38e8ee35fc08a57636b1b6190dca70b0076fa Mon Sep 17 00:00:00 2001
-From: Thibault Charbonnier <thibaultcha@me.com>
-Date: Mon, 23 Mar 2020 19:40:47 -0700
-Origin: https://github.com/openresty/lua-nginx-module/commit/9ab38e8ee35fc08a57636b1b6190dca70b0076fa
-Subject: [PATCH] bugfix: prevented request smuggling in the
- ngx.location.capture API.
-
-Signed-off-by: Yichun Zhang (agentzh) <yichun@openresty.com>
----
- src/ngx_http_lua_subrequest.c | 196 +++++--------
- t/020-subrequest.t            | 520 +++++++++++++++++++++++++++++++++-
- 2 files changed, 585 insertions(+), 131 deletions(-)
-
-Index: http-lua/src/ngx_http_lua_subrequest.c
-===================================================================
---- http-lua.orig/src/ngx_http_lua_subrequest.c	2020-07-14 09:50:35.830928117 +0200
-+++ http-lua/src/ngx_http_lua_subrequest.c	2020-07-14 09:50:35.826928232 +0200
-@@ -56,8 +56,6 @@
-     ngx_string("Content-Length");
- 
- 
--static ngx_int_t ngx_http_lua_set_content_length_header(ngx_http_request_t *r,
--    off_t len);
- static ngx_int_t ngx_http_lua_adjust_subrequest(ngx_http_request_t *sr,
-     ngx_uint_t method, int forward_body,
-     ngx_http_request_body_t *body, unsigned vars_action,
-@@ -78,7 +76,7 @@
- static ngx_int_t ngx_http_post_request_to_head(ngx_http_request_t *r);
- static ngx_int_t ngx_http_lua_copy_in_file_request_body(ngx_http_request_t *r);
- static ngx_int_t ngx_http_lua_copy_request_headers(ngx_http_request_t *sr,
--    ngx_http_request_t *r);
-+    ngx_http_request_t *pr, int pr_not_chunked);
- 
- 
- /* ngx.location.capture is just a thin wrapper around
-@@ -628,8 +626,8 @@
-     unsigned vars_action, ngx_array_t *extra_vars)
- {
-     ngx_http_request_t          *r;
--    ngx_int_t                    rc;
-     ngx_http_core_main_conf_t   *cmcf;
-+    int                          pr_not_chunked = 0;
-     size_t                       size;
- 
-     r = sr->parent;
-@@ -639,46 +637,32 @@
-     if (body) {
-         sr->request_body = body;
- 
--        rc = ngx_http_lua_set_content_length_header(sr,
--                                                    body->buf
--                                                    ? ngx_buf_size(body->buf)
--                                                    : 0);
--
--        if (rc != NGX_OK) {
--            return NGX_ERROR;
--        }
--
-     } else if (!always_forward_body
-                && method != NGX_HTTP_PUT
-                && method != NGX_HTTP_POST
-                && r->headers_in.content_length_n > 0)
-     {
--        rc = ngx_http_lua_set_content_length_header(sr, 0);
--        if (rc != NGX_OK) {
--            return NGX_ERROR;
--        }
--
--#if 1
-         sr->request_body = NULL;
--#endif
- 
-     } else {
--        if (ngx_http_lua_copy_request_headers(sr, r) != NGX_OK) {
--            return NGX_ERROR;
-+        if (!r->headers_in.chunked) {
-+            pr_not_chunked = 1;
-         }
- 
--        if (sr->request_body) {
-+        if (sr->request_body && sr->request_body->temp_file) {
- 
-             /* deep-copy the request body */
- 
--            if (sr->request_body->temp_file) {
--                if (ngx_http_lua_copy_in_file_request_body(sr) != NGX_OK) {
--                    return NGX_ERROR;
--                }
-+            if (ngx_http_lua_copy_in_file_request_body(sr) != NGX_OK) {
-+                return NGX_ERROR;
-             }
-         }
-     }
- 
-+    if (ngx_http_lua_copy_request_headers(sr, r, pr_not_chunked) != NGX_OK) {
-+        return NGX_ERROR;
-+    }
-+
-     sr->method = method;
- 
-     switch (method) {
-@@ -1124,100 +1108,6 @@
- }
- 
- 
--static ngx_int_t
--ngx_http_lua_set_content_length_header(ngx_http_request_t *r, off_t len)
--{
--    ngx_table_elt_t                 *h, *header;
--    u_char                          *p;
--    ngx_list_part_t                 *part;
--    ngx_http_request_t              *pr;
--    ngx_uint_t                       i;
--
--    r->headers_in.content_length_n = len;
--
--    if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
--                      sizeof(ngx_table_elt_t)) != NGX_OK)
--    {
--        return NGX_ERROR;
--    }
--
--    h = ngx_list_push(&r->headers_in.headers);
--    if (h == NULL) {
--        return NGX_ERROR;
--    }
--
--    h->key = ngx_http_lua_content_length_header_key;
--    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
--    if (h->lowcase_key == NULL) {
--        return NGX_ERROR;
--    }
--
--    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
--
--    r->headers_in.content_length = h;
--
--    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
--    if (p == NULL) {
--        return NGX_ERROR;
--    }
--
--    h->value.data = p;
--
--    h->value.len = ngx_sprintf(h->value.data, "%O", len) - h->value.data;
--
--    h->hash = ngx_http_lua_content_length_hash;
--
--#if 0
--    dd("content length hash: %lu == %lu", (unsigned long) h->hash,
--       ngx_hash_key_lc((u_char *) "Content-Length",
--                       sizeof("Content-Length") - 1));
--#endif
--
--    dd("r content length: %.*s",
--       (int) r->headers_in.content_length->value.len,
--       r->headers_in.content_length->value.data);
--
--    pr = r->parent;
--
--    if (pr == NULL) {
--        return NGX_OK;
--    }
--
--    /* forward the parent request's all other request headers */
--
--    part = &pr->headers_in.headers.part;
--    header = part->elts;
--
--    for (i = 0; /* void */; i++) {
--
--        if (i >= part->nelts) {
--            if (part->next == NULL) {
--                break;
--            }
--
--            part = part->next;
--            header = part->elts;
--            i = 0;
--        }
--
--        if (header[i].key.len == sizeof("Content-Length") - 1
--            && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length",
--                               sizeof("Content-Length") - 1) == 0)
--        {
--            continue;
--        }
--
--        if (ngx_http_lua_set_input_header(r, header[i].key,
--                                          header[i].value, 0) == NGX_ERROR)
--        {
--            return NGX_ERROR;
--        }
--    }
--
--    return NGX_OK;
--}
--
--
- static void
- ngx_http_lua_handle_subreq_responses(ngx_http_request_t *r,
-     ngx_http_lua_ctx_t *ctx)
-@@ -1732,11 +1622,17 @@
- 
- 
- static ngx_int_t
--ngx_http_lua_copy_request_headers(ngx_http_request_t *sr, ngx_http_request_t *r)
-+ngx_http_lua_copy_request_headers(ngx_http_request_t *sr,
-+    ngx_http_request_t *pr, int pr_not_chunked)
- {
--    ngx_table_elt_t                 *header;
-+    ngx_table_elt_t                 *clh, *header;
-     ngx_list_part_t                 *part;
-     ngx_uint_t                       i;
-+    u_char                          *p;
-+    off_t                            len;
-+
-+    dd("before: parent req headers count: %d",
-+       (int) pr->headers_in.headers.part.nelts);
- 
-     if (ngx_list_init(&sr->headers_in.headers, sr->pool, 20,
-                       sizeof(ngx_table_elt_t)) != NGX_OK)
-@@ -1744,10 +1640,46 @@
-         return NGX_ERROR;
-     }
- 
--    dd("before: parent req headers count: %d",
--       (int) r->headers_in.headers.part.nelts);
-+    if (sr->request_body && !pr_not_chunked) {
-+
-+        /* craft our own Content-Length */
-+
-+        len = sr->request_body->buf ? ngx_buf_size(sr->request_body->buf) : 0;
-+
-+        clh = ngx_list_push(&sr->headers_in.headers);
-+        if (clh == NULL) {
-+            return NGX_ERROR;
-+        }
- 
--    part = &r->headers_in.headers.part;
-+        clh->hash = ngx_http_lua_content_length_hash;
-+        clh->key = ngx_http_lua_content_length_header_key;
-+        clh->lowcase_key = ngx_pnalloc(sr->pool, clh->key.len);
-+        if (clh->lowcase_key == NULL) {
-+            return NGX_ERROR;
-+        }
-+
-+        ngx_strlow(clh->lowcase_key, clh->key.data, clh->key.len);
-+
-+        p = ngx_palloc(sr->pool, NGX_OFF_T_LEN);
-+        if (p == NULL) {
-+            return NGX_ERROR;
-+        }
-+
-+        clh->value.data = p;
-+        clh->value.len = ngx_sprintf(clh->value.data, "%O", len)
-+                         - clh->value.data;
-+
-+        sr->headers_in.content_length = clh;
-+        sr->headers_in.content_length_n = len;
-+
-+        dd("sr crafted content-length: %.*s",
-+           (int) sr->headers_in.content_length->value.len,
-+           sr->headers_in.content_length->value.data);
-+    }
-+
-+    /* copy the parent request's headers */
-+
-+    part = &pr->headers_in.headers.part;
-     header = part->elts;
- 
-     for (i = 0; /* void */; i++) {
-@@ -1762,7 +1694,14 @@
-             i = 0;
-         }
- 
--        dd("setting request header %.*s: %.*s", (int) header[i].key.len,
-+        if (!pr_not_chunked && header[i].key.len == sizeof("Content-Length") - 1
-+            && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length",
-+                               sizeof("Content-Length") - 1) == 0)
-+        {
-+            continue;
-+        }
-+
-+        dd("sr copied req header %.*s: %.*s", (int) header[i].key.len,
-            header[i].key.data, (int) header[i].value.len,
-            header[i].value.data);
- 
-@@ -1774,9 +1713,10 @@
-     }
- 
-     dd("after: parent req headers count: %d",
--       (int) r->headers_in.headers.part.nelts);
-+       (int) pr->headers_in.headers.part.nelts);
- 
-     return NGX_OK;
- }
- 
-+
- /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
-Index: http-lua/t/020-subrequest.t
-===================================================================
---- http-lua.orig/t/020-subrequest.t	2020-07-14 09:50:35.830928117 +0200
-+++ http-lua/t/020-subrequest.t	2020-07-14 09:50:35.826928232 +0200
-@@ -14,6 +14,7 @@
- plan tests => repeat_each() * (blocks() * 3 + 23);
- 
- $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
-+$ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
- 
- #no_diff();
- no_long_string();
-@@ -210,7 +211,7 @@
- 
- 
- 
--=== TEST 8: PUT (nobody, proxy method)
-+=== TEST 8: PUT (with body, proxy method)
- --- config
-     location /other {
-         default_type 'foo/bar';
-@@ -242,7 +243,7 @@
- 
- 
- 
--=== TEST 9: PUT (nobody, no proxy method)
-+=== TEST 9: PUT (with body, no proxy method)
- --- config
-     location /other {
-         default_type 'foo/bar';
-@@ -271,7 +272,7 @@
- 
- 
- 
--=== TEST 10: PUT (nobody, no proxy method)
-+=== TEST 10: PUT (no body, no proxy method)
- --- config
-     location /other {
-         default_type 'foo/bar';
-@@ -2877,3 +2878,516 @@
- --- no_error_log
- [error]
- --- error_code: 200
-+
-+
-+
-+=== TEST 77: avoid request smuggling 1/4 (default capture + smuggle in header)
-+--- http_config
-+    upstream backend {
-+        server unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-+        keepalive 32;
-+    }
-+
-+    server {
-+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-+
-+        location / {
-+            content_by_lua_block {
-+                ngx.say("method: ", ngx.var.request_method,
-+                        ", uri: ", ngx.var.uri,
-+                        ", X: ", ngx.var.http_x)
-+            }
-+        }
-+    }
-+--- config
-+    location /proxy {
-+        proxy_http_version 1.1;
-+        proxy_set_header   Connection "";
-+        proxy_pass         http://backend/foo;
-+    }
-+
-+    location /capture {
-+        server_tokens off;
-+        more_clear_headers Date;
-+
-+        content_by_lua_block {
-+            local res = ngx.location.capture("/proxy")
-+            ngx.print(res.body)
-+        }
-+    }
-+
-+    location /t {
-+        content_by_lua_block {
-+            local req = [[
-+GET /capture HTTP/1.1
-+Host: test.com
-+Content-Length: 37
-+Transfer-Encoding: chunked
-+
-+0
-+
-+GET /capture HTTP/1.1
-+Host: test.com
-+X: GET /bar HTTP/1.0
-+
-+]]
-+
-+            local sock = ngx.socket.tcp()
-+            sock:settimeout(1000)
-+
-+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_PORT)
-+            if not ok then
-+                ngx.say("failed to connect: ", err)
-+                return
-+            end
-+
-+            local bytes, err = sock:send(req)
-+            if not bytes then
-+                ngx.say("failed to send req: ", err)
-+                return
-+            end
-+
-+            ngx.say("req bytes: ", bytes)
-+
-+            local n_resp = 0
-+
-+            local reader = sock:receiveuntil("\r\n")
-+            while true do
-+                local line, err = reader()
-+                if line then
-+                    ngx.say(line)
-+                    if line == "0" then
-+                        n_resp = n_resp + 1
-+                    end
-+
-+                    if n_resp >= 2 then
-+                        break
-+                    end
-+
-+                else
-+                    ngx.say("err: ", err)
-+                    break
-+                end
-+            end
-+
-+            sock:close()
-+        }
-+    }
-+--- request
-+GET /t
-+--- response_body
-+req bytes: 146
-+HTTP/1.1 200 OK
-+Server: nginx
-+Content-Type: text/plain
-+Transfer-Encoding: chunked
-+Connection: keep-alive
-+
-+1f
-+method: GET, uri: /foo, X: nil
-+
-+0
-+
-+HTTP/1.1 200 OK
-+Server: nginx
-+Content-Type: text/plain
-+Transfer-Encoding: chunked
-+Connection: keep-alive
-+
-+2d
-+method: GET, uri: /foo, X: GET /bar HTTP/1.0
-+
-+0
-+--- no_error_log
-+[error]
-+
-+
-+
-+=== TEST 78: avoid request smuggling 2/4 (POST capture + smuggle in body)
-+--- http_config
-+    upstream backend {
-+        server unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-+        keepalive 32;
-+    }
-+
-+    server {
-+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-+
-+        location / {
-+            content_by_lua_block {
-+                ngx.say("method: ", ngx.var.request_method,
-+                        ", uri: ", ngx.var.uri)
-+            }
-+        }
-+    }
-+--- config
-+    location /proxy {
-+        proxy_http_version 1.1;
-+        proxy_set_header   Connection "";
-+        proxy_pass         http://backend/foo;
-+    }
-+
-+    location /capture {
-+        server_tokens off;
-+        more_clear_headers Date;
-+
-+        content_by_lua_block {
-+            ngx.req.read_body()
-+            local res = ngx.location.capture("/proxy", { method = ngx.HTTP_POST })
-+            ngx.print(res.body)
-+        }
-+    }
-+
-+    location /t {
-+        content_by_lua_block {
-+            local req = [[
-+GET /capture HTTP/1.1
-+Host: test.com
-+Content-Length: 57
-+Transfer-Encoding: chunked
-+
-+0
-+
-+POST /capture HTTP/1.1
-+Host: test.com
-+Content-Length: 60
-+
-+POST /bar HTTP/1.1
-+Host: test.com
-+Content-Length: 5
-+
-+hello
-+
-+]]
-+
-+            local sock = ngx.socket.tcp()
-+            sock:settimeout(1000)
-+
-+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_PORT)
-+            if not ok then
-+                ngx.say("failed to connect: ", err)
-+                return
-+            end
-+
-+            local bytes, err = sock:send(req)
-+            if not bytes then
-+                ngx.say("failed to send req: ", err)
-+                return
-+            end
-+
-+            ngx.say("req bytes: ", bytes)
-+
-+            local n_resp = 0
-+
-+            local reader = sock:receiveuntil("\r\n")
-+            while true do
-+                local line, err = reader()
-+                if line then
-+                    ngx.say(line)
-+                    if line == "0" then
-+                        n_resp = n_resp + 1
-+                    end
-+
-+                    if n_resp >= 2 then
-+                        break
-+                    end
-+
-+                else
-+                    ngx.say("err: ", err)
-+                    break
-+                end
-+            end
-+
-+            sock:close()
-+        }
-+    }
-+--- request
-+GET /t
-+--- response_body
-+req bytes: 205
-+HTTP/1.1 200 OK
-+Server: nginx
-+Content-Type: text/plain
-+Transfer-Encoding: chunked
-+Connection: keep-alive
-+
-+18
-+method: POST, uri: /foo
-+
-+0
-+
-+HTTP/1.1 200 OK
-+Server: nginx
-+Content-Type: text/plain
-+Transfer-Encoding: chunked
-+Connection: keep-alive
-+
-+18
-+method: POST, uri: /foo
-+
-+0
-+--- no_error_log
-+[error]
-+
-+
-+
-+=== TEST 79: avoid request smuggling 3/4 (POST capture w/ always_forward_body + smuggle in body)
-+--- http_config
-+    upstream backend {
-+        server unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-+        keepalive 32;
-+    }
-+
-+    server {
-+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-+
-+        location / {
-+            content_by_lua_block {
-+                ngx.say("method: ", ngx.var.request_method,
-+                        ", uri: ", ngx.var.uri)
-+            }
-+        }
-+    }
-+--- config
-+    location /proxy {
-+        proxy_http_version 1.1;
-+        proxy_set_header   Connection "";
-+        proxy_pass         http://backend/foo;
-+    }
-+
-+    location /capture {
-+        server_tokens off;
-+        more_clear_headers Date;
-+
-+        content_by_lua_block {
-+            ngx.req.read_body()
-+            local res = ngx.location.capture("/proxy", {
-+                method = ngx.HTTP_POST,
-+                always_forward_body = true
-+            })
-+            ngx.print(res.body)
-+        }
-+    }
-+
-+    location /t {
-+        content_by_lua_block {
-+            local req = [[
-+GET /capture HTTP/1.1
-+Host: test.com
-+Content-Length: 57
-+Transfer-Encoding: chunked
-+
-+0
-+
-+POST /capture HTTP/1.1
-+Host: test.com
-+Content-Length: 60
-+
-+POST /bar HTTP/1.1
-+Host: test.com
-+Content-Length: 5
-+
-+hello
-+
-+]]
-+
-+            local sock = ngx.socket.tcp()
-+            sock:settimeout(1000)
-+
-+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_PORT)
-+            if not ok then
-+                ngx.say("failed to connect: ", err)
-+                return
-+            end
-+
-+            local bytes, err = sock:send(req)
-+            if not bytes then
-+                ngx.say("failed to send req: ", err)
-+                return
-+            end
-+
-+            ngx.say("req bytes: ", bytes)
-+
-+            local n_resp = 0
-+
-+            local reader = sock:receiveuntil("\r\n")
-+            while true do
-+                local line, err = reader()
-+                if line then
-+                    ngx.say(line)
-+                    if line == "0" then
-+                        n_resp = n_resp + 1
-+                    end
-+
-+                    if n_resp >= 2 then
-+                        break
-+                    end
-+
-+                else
-+                    ngx.say("err: ", err)
-+                    break
-+                end
-+            end
-+
-+            sock:close()
-+        }
-+    }
-+--- request
-+GET /t
-+--- response_body
-+req bytes: 205
-+HTTP/1.1 200 OK
-+Server: nginx
-+Content-Type: text/plain
-+Transfer-Encoding: chunked
-+Connection: keep-alive
-+
-+18
-+method: POST, uri: /foo
-+
-+0
-+
-+HTTP/1.1 200 OK
-+Server: nginx
-+Content-Type: text/plain
-+Transfer-Encoding: chunked
-+Connection: keep-alive
-+
-+18
-+method: POST, uri: /foo
-+
-+0
-+--- no_error_log
-+[error]
-+
-+
-+
-+=== TEST 80: avoid request smuggling 4/4 (POST capture w/ body + smuggle in body)
-+--- http_config
-+    upstream backend {
-+        server unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-+        keepalive 32;
-+    }
-+
-+    server {
-+        listen unix:$TEST_NGINX_HTML_DIR/nginx.sock;
-+
-+        location / {
-+            content_by_lua_block {
-+                ngx.say("method: ", ngx.var.request_method,
-+                        ", uri: ", ngx.var.uri)
-+            }
-+        }
-+    }
-+--- config
-+    location /proxy {
-+        proxy_http_version 1.1;
-+        proxy_set_header   Connection "";
-+        proxy_pass         http://backend/foo;
-+    }
-+
-+    location /capture {
-+        server_tokens off;
-+        more_clear_headers Date;
-+
-+        content_by_lua_block {
-+            ngx.req.read_body()
-+            local res = ngx.location.capture("/proxy", {
-+                method = ngx.HTTP_POST,
-+                always_forward_body = true,
-+                body = ngx.req.get_body_data()
-+            })
-+            ngx.print(res.body)
-+        }
-+    }
-+
-+    location /t {
-+        content_by_lua_block {
-+            local req = [[
-+GET /capture HTTP/1.1
-+Host: test.com
-+Content-Length: 57
-+Transfer-Encoding: chunked
-+
-+0
-+
-+POST /capture HTTP/1.1
-+Host: test.com
-+Content-Length: 60
-+
-+POST /bar HTTP/1.1
-+Host: test.com
-+Content-Length: 5
-+
-+hello
-+
-+]]
-+
-+            local sock = ngx.socket.tcp()
-+            sock:settimeout(1000)
-+
-+            local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_PORT)
-+            if not ok then
-+                ngx.say("failed to connect: ", err)
-+                return
-+            end
-+
-+            local bytes, err = sock:send(req)
-+            if not bytes then
-+                ngx.say("failed to send req: ", err)
-+                return
-+            end
-+
-+            ngx.say("req bytes: ", bytes)
-+
-+            local n_resp = 0
-+
-+            local reader = sock:receiveuntil("\r\n")
-+            while true do
-+                local line, err = reader()
-+                if line then
-+                    ngx.say(line)
-+                    if line == "0" then
-+                        n_resp = n_resp + 1
-+                    end
-+
-+                    if n_resp >= 2 then
-+                        break
-+                    end
-+
-+                else
-+                    ngx.say("err: ", err)
-+                    break
-+                end
-+            end
-+
-+            sock:close()
-+        }
-+    }
-+--- request
-+GET /t
-+--- response_body
-+req bytes: 205
-+HTTP/1.1 200 OK
-+Server: nginx
-+Content-Type: text/plain
-+Transfer-Encoding: chunked
-+Connection: keep-alive
-+
-+18
-+method: POST, uri: /foo
-+
-+0
-+
-+HTTP/1.1 200 OK
-+Server: nginx
-+Content-Type: text/plain
-+Transfer-Encoding: chunked
-+Connection: keep-alive
-+
-+18
-+method: POST, uri: /foo
-+
-+0
-+--- no_error_log
-+[error]
diff --git a/debian/modules/patches/http-lua/bug-994178-segfault.patch b/debian/modules/patches/http-lua/bug-994178-segfault.patch
deleted file mode 100644
index 89dee6a..0000000
--- a/debian/modules/patches/http-lua/bug-994178-segfault.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Datong Sun <dndx@idndx.com>
-Date: Wed Jul 18 16:21:09 2018 -0700
-Origin: https://github.com/openresty/lua-nginx-module/commit/e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
-Subject: fixed segfault in NGINX core >= 1.15.0 when init_worker_by_lua* is
- used.
-
-Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
-
-diff --git a/src/ngx_http_lua_initworkerby.c b/src/ngx_http_lua_initworkerby.c
-index 4a722a06..2a82fcb9 100644
---- a/src/ngx_http_lua_initworkerby.c
-+++ b/src/ngx_http_lua_initworkerby.c
-@@ -25,6 +25,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
-     void                        *cur, *prev;
-     ngx_uint_t                   i;
-     ngx_conf_t                   conf;
-+    ngx_conf_file_t              cf_file;
-     ngx_cycle_t                 *fake_cycle;
-     ngx_module_t               **modules;
-     ngx_open_file_t             *file, *ofile;
-@@ -166,6 +167,10 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
-     conf.pool = fake_cycle->pool;
-     conf.log = cycle->log;
-
-+    ngx_memzero(&cf_file, sizeof(cf_file));
-+    cf_file.file.name = cycle->conf_file;
-+    conf.conf_file = &cf_file;
-+
-     http_ctx.loc_conf = ngx_pcalloc(conf.pool,
-                                     sizeof(void *) * ngx_http_max_module);
-     if (http_ctx.loc_conf == NULL) {
diff --git a/debian/modules/patches/http-lua/discover-luajit-2.1.patch b/debian/modules/patches/http-lua/discover-luajit-2.1.patch
deleted file mode 100644
index 4fcbbac..0000000
--- a/debian/modules/patches/http-lua/discover-luajit-2.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0bb37a210d165870f7c4c9ad85e1751bdc1aec8f Mon Sep 17 00:00:00 2001
-From: Christos Trochalakis <yatiohi@ideopolis.gr>
-Date: Mon, 28 Aug 2017 13:48:08 +0300
-Subject: [PATCH] Inventorize LuaJIT 2.1
-
----
- config | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/config b/config
-index 01a6b3c3..5819c00f 100644
---- a/config
-+++ b/config
-@@ -281,6 +281,30 @@ END
-             fi
-             . auto/feature
-         fi
-+
-+        if [ $ngx_found = no ]; then
-+            # LuaJIT-2.1, try with -ldl
-+            ngx_feature="LuaJIT 2.1 library in /usr/"
-+            ngx_feature_path="/usr/include/luajit-2.1"
-+            if [ $NGX_RPATH = YES ]; then
-+                ngx_feature_libs="-R/usr/lib -L/usr/lib -lm -lluajit-5.1 -ldl"
-+            else
-+                ngx_feature_libs="-L/usr/lib -lm -lluajit-5.1 -ldl"
-+            fi
-+            . auto/feature
-+        fi
-+
-+        if [ $ngx_found = no ]; then
-+            # Gentoo with LuaJIT 2.1
-+            ngx_feature="LuaJIT library in /usr/"
-+            ngx_feature_path="/usr/include/luajit-2.1"
-+            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
- 
--- 
-2.14.1
-
diff --git a/debian/modules/patches/http-lua/series b/debian/modules/patches/http-lua/series
deleted file mode 100644
index 61d5c01..0000000
--- a/debian/modules/patches/http-lua/series
+++ /dev/null
@@ -1,3 +0,0 @@
-discover-luajit-2.1.patch
-CVE-2020-11724.patch
-bug-994178-segfault.patch
diff --git a/debian/rules b/debian/rules
index 4471089..8a7354b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,6 @@ DYN_MODS := \
 	http-geoip2 \
 	http-headers-more-filter \
 	http-image-filter \
-	http-lua \
 	http-ndk \
 	http-perl \
 	http-subs-filter \
@@ -126,7 +125,6 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/http-fancyindex \
 			--add-dynamic-module=$(MODULESDIR)/http-geoip2 \
 			--add-dynamic-module=$(MODULESDIR)/nchan \
-			--add-dynamic-module=$(MODULESDIR)/http-lua \
 			--add-dynamic-module=$(MODULESDIR)/rtmp \
 			--add-dynamic-module=$(MODULESDIR)/http-uploadprogress \
 			--add-dynamic-module=$(MODULESDIR)/http-upstream-fair \
diff --git a/debian/tests/control b/debian/tests/control
index 4a24735..3e2c64e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -6,10 +6,6 @@ Tests: ec-x25519
 Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-light, ssl-cert, curl
 
-Tests: lua
-Restrictions: allow-stderr isolation-container needs-root
-Depends: nginx-extras, curl
-
 Tests: core-simple
 Restrictions: allow-stderr isolation-container
 Depends: nginx-core, curl
@@ -35,7 +31,7 @@ Depends: nginx-core,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua,
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
@@ -61,7 +57,7 @@ Depends: nginx-full,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua,
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
@@ -87,7 +83,7 @@ Depends: nginx-light,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua,
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
@@ -113,7 +109,7 @@ Depends: nginx-extras,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua,
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
diff --git a/debian/tests/lua b/debian/tests/lua
deleted file mode 100644
index 82c1820..0000000
--- a/debian/tests/lua
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-rm /etc/nginx/sites-enabled/default
-cat <<EOF > "/etc/nginx/sites-enabled/lua"
-server {
-	listen 80 default_server;
-
-	location /ping {
-		content_by_lua 'ngx.say("PONG")';
-	}
-}
-EOF
-
-nginx -t
-invoke-rc.d nginx restart
-curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/ping

From 9867fd494095d22973278465391a6d9c5a5a6308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 17 Aug 2022 18:39:07 +0200
Subject: [PATCH 423/600] release nginx 1.22.0-3, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fff7b8f..6317f3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-nginx (1.22.0-3) UNRELEASED; urgency=medium
+nginx (1.22.0-3) unstable; urgency=medium
 
   * d/changelog: fixed typo in bug number 61261 -> 861261 (Closes: 861261) 
   * d/p/nginx-ssl_cert_cb_yield.patch added (Closes: 884434)
   * http-lua: removed the http-lua module and moved it to a separate package
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 08 Aug 2022 12:29:34 +0200
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 17 Aug 2022 18:38:15 +0200
 
 nginx (1.22.0-2) unstable; urgency=medium
 

From d9b4c476c1d736112847f0826fe713fdb099c6e4 Mon Sep 17 00:00:00 2001
From: Gioele Barabucci <gioele@svario.it>
Date: Sun, 25 Sep 2022 21:54:53 +0200
Subject: [PATCH 424/600] d/nginx-*.postinst: Use invoke-rc.d instead of pidof
 and ad-hoc tests

Checking if nginx is running using and a mixture of file tests and
`pidof` is fragile. Debian policy 9.3.3 states that `invoke-rc.d` should
be used instead to perform these checks.

In addition, the use of `pidof` creates an implicit depency on
`sysvinit-utils`. `sysvinit-utils` is currently essential, but that
may change in the future.

Patch originally contributed by @ah: https://paste.debian.net/1254794/
---
 debian/nginx-core.postinst   | 27 +++++++++++----------------
 debian/nginx-extras.postinst | 27 +++++++++++----------------
 debian/nginx-light.postinst  | 27 +++++++++++----------------
 3 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/debian/nginx-core.postinst b/debian/nginx-core.postinst
index b43571a..80be4de 100644
--- a/debian/nginx-core.postinst
+++ b/debian/nginx-core.postinst
@@ -5,11 +5,9 @@ case "$1" in
   abort-upgrade|abort-remove|abort-deconfigure|configure)
     ;;
   triggered)
-    if [ -x /etc/init.d/nginx ]; then
-      if [ -s /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-        echo "Triggering nginx reload ..."
-        invoke-rc.d nginx reload || true
-      fi
+    if invoke-rc.d --quiet nginx status >/dev/null; then
+      echo "Triggering nginx reload ..."
+      invoke-rc.d nginx reload || true
     fi
     exit 0
     ;;
@@ -19,17 +17,14 @@ case "$1" in
     ;;
 esac
 
-if [ -x /etc/init.d/nginx ]; then
-  if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-    invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
-    exit $?
-  else
-    if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
-      invoke-rc.d nginx start || exit $?
-    else
-      echo "Not attempting to start NGINX, port 80 is already in use."
-      exit 0
-    fi
+if invoke-rc.d --quiet nginx status >/dev/null; then
+  invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
+  exit $?
+else
+  if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
+    invoke-rc.d nginx start || exit $?
+    echo "Not attempting to start NGINX, port 80 is already in use."
+    exit 0
   fi
 fi
 
diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst
index b43571a..80be4de 100644
--- a/debian/nginx-extras.postinst
+++ b/debian/nginx-extras.postinst
@@ -5,11 +5,9 @@ case "$1" in
   abort-upgrade|abort-remove|abort-deconfigure|configure)
     ;;
   triggered)
-    if [ -x /etc/init.d/nginx ]; then
-      if [ -s /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-        echo "Triggering nginx reload ..."
-        invoke-rc.d nginx reload || true
-      fi
+    if invoke-rc.d --quiet nginx status >/dev/null; then
+      echo "Triggering nginx reload ..."
+      invoke-rc.d nginx reload || true
     fi
     exit 0
     ;;
@@ -19,17 +17,14 @@ case "$1" in
     ;;
 esac
 
-if [ -x /etc/init.d/nginx ]; then
-  if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-    invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
-    exit $?
-  else
-    if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
-      invoke-rc.d nginx start || exit $?
-    else
-      echo "Not attempting to start NGINX, port 80 is already in use."
-      exit 0
-    fi
+if invoke-rc.d --quiet nginx status >/dev/null; then
+  invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
+  exit $?
+else
+  if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
+    invoke-rc.d nginx start || exit $?
+    echo "Not attempting to start NGINX, port 80 is already in use."
+    exit 0
   fi
 fi
 
diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst
index b43571a..80be4de 100644
--- a/debian/nginx-light.postinst
+++ b/debian/nginx-light.postinst
@@ -5,11 +5,9 @@ case "$1" in
   abort-upgrade|abort-remove|abort-deconfigure|configure)
     ;;
   triggered)
-    if [ -x /etc/init.d/nginx ]; then
-      if [ -s /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-        echo "Triggering nginx reload ..."
-        invoke-rc.d nginx reload || true
-      fi
+    if invoke-rc.d --quiet nginx status >/dev/null; then
+      echo "Triggering nginx reload ..."
+      invoke-rc.d nginx reload || true
     fi
     exit 0
     ;;
@@ -19,17 +17,14 @@ case "$1" in
     ;;
 esac
 
-if [ -x /etc/init.d/nginx ]; then
-  if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
-    invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
-    exit $?
-  else
-    if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
-      invoke-rc.d nginx start || exit $?
-    else
-      echo "Not attempting to start NGINX, port 80 is already in use."
-      exit 0
-    fi
+if invoke-rc.d --quiet nginx status >/dev/null; then
+  invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
+  exit $?
+else
+  if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
+    invoke-rc.d nginx start || exit $?
+    echo "Not attempting to start NGINX, port 80 is already in use."
+    exit 0
   fi
 fi
 

From 6cad8ef578345b14c4703d3d4a56dc893fff569d Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sat, 15 Oct 2022 12:28:07 +0200
Subject: [PATCH 425/600] Import Debian changes 1.22.0-3.1

nginx (1.22.0-3.1) unstable; urgency=medium
.
  * Non-maintainer upload.
  * No source change upload to rebuild with debhelper 13.10.
---
 debian/changelog                                         | 7 +++++++
 debian/modules/http-fancyindex/.gitattributes            | 4 ----
 debian/modules/http-ndk/.gitignore                       | 4 ----
 debian/modules/nchan/src/.gitignore                      | 2 --
 debian/modules/nchan/src/store/redis/hiredis/.gitignore  | 9 ---------
 .../nchan/src/store/redis/redis-lua-scripts/.gitignore   | 1 -
 6 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 debian/modules/http-fancyindex/.gitattributes
 delete mode 100644 debian/modules/http-ndk/.gitignore
 delete mode 100644 debian/modules/nchan/src/.gitignore
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/.gitignore
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/.gitignore

diff --git a/debian/changelog b/debian/changelog
index 6317f3d..99c641b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.22.0-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * No source change upload to rebuild with debhelper 13.10.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 15 Oct 2022 12:28:07 +0200
+
 nginx (1.22.0-3) unstable; urgency=medium
 
   * d/changelog: fixed typo in bug number 61261 -> 861261 (Closes: 861261) 
diff --git a/debian/modules/http-fancyindex/.gitattributes b/debian/modules/http-fancyindex/.gitattributes
deleted file mode 100644
index c710740..0000000
--- a/debian/modules/http-fancyindex/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-/.gitignore export-ignore
-/.travis.yml export-ignore
-/make-dist export-ignore
-t/* text eol=lf
diff --git a/debian/modules/http-ndk/.gitignore b/debian/modules/http-ndk/.gitignore
deleted file mode 100644
index 0fd79d0..0000000
--- a/debian/modules/http-ndk/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-tags
-cscope.*
-*~
-*.swp
diff --git a/debian/modules/nchan/src/.gitignore b/debian/modules/nchan/src/.gitignore
deleted file mode 100644
index 67fd4b3..0000000
--- a/debian/modules/nchan/src/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-nginx
-nginx-source
\ No newline at end of file
diff --git a/debian/modules/nchan/src/store/redis/hiredis/.gitignore b/debian/modules/nchan/src/store/redis/hiredis/.gitignore
deleted file mode 100644
index 056959f..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/hiredis-test
-/examples/hiredis-example*
-/*.o
-/*.so
-/*.dylib
-/*.a
-/*.pc
-*.dSYM
-tags
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/.gitignore b/debian/modules/nchan/src/store/redis/redis-lua-scripts/.gitignore
deleted file mode 100644
index b844b14..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Gemfile.lock

From dbf15d0b7a2155f27efa2197c54caa99a7ffff4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 25 Oct 2022 18:28:51 +0200
Subject: [PATCH 426/600] New upstream version 1.22.1

---
 CHANGES                                |   8 ++
 CHANGES.ru                             |   9 ++
 src/core/nginx.h                       |   4 +-
 src/http/modules/ngx_http_mp4_module.c | 147 +++++++++++++++++++++++++
 4 files changed, 166 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6b232cf..c356ba7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,12 @@
 
+Changes with nginx 1.22.1                                        19 Oct 2022
+
+    *) Security: processing of a specially crafted mp4 file by the
+       ngx_http_mp4_module might cause a worker process crash, worker
+       process memory disclosure, or might have potential other impact
+       (CVE-2022-41741, CVE-2022-41742).
+
+
 Changes with nginx 1.22.0                                        24 May 2022
 
     *) 1.22.x stable branch.
diff --git a/CHANGES.ru b/CHANGES.ru
index bd49853..9ee9e11 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,13 @@
 
+Изменения в nginx 1.22.1                                          19.10.2022
+
+    *) Безопасность: обработка специально созданного mp4-файла модулем
+       ngx_http_mp4_module могла приводить к падению рабочего процесса,
+       отправке клиенту части содержимого памяти рабочего процесса, а также
+       потенциально могла иметь другие последствия (CVE-2022-41741,
+       CVE-2022-41742).
+
+
 Изменения в nginx 1.22.0                                          24.05.2022
 
     *) Стабильная ветка 1.22.x.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 329b603..9f8756b 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1022000
-#define NGINX_VERSION      "1.22.0"
+#define nginx_version      1022001
+#define NGINX_VERSION      "1.22.1"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 9c3f627..4eff01e 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -1121,6 +1121,12 @@ ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
         return NGX_ERROR;
     }
 
+    if (mp4->ftyp_atom.buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 ftyp atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size;
 
     ftyp_atom = ngx_palloc(mp4->request->pool, atom_size);
@@ -1179,6 +1185,12 @@ ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
         return NGX_DECLINED;
     }
 
+    if (mp4->moov_atom.buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 moov atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module);
 
     if (atom_data_size > mp4->buffer_size) {
@@ -1246,6 +1258,12 @@ ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdat atom");
 
+    if (mp4->mdat_atom.buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 mdat atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     data = &mp4->mdat_data_buf;
     data->file = &mp4->file;
     data->in_file = 1;
@@ -1372,6 +1390,12 @@ ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mvhd atom");
 
+    if (mp4->mvhd_atom.buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 mvhd atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom_header = ngx_mp4_atom_header(mp4);
     mvhd_atom = (ngx_mp4_mvhd_atom_t *) atom_header;
     mvhd64_atom = (ngx_mp4_mvhd64_atom_t *) atom_header;
@@ -1637,6 +1661,13 @@ ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
     atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size;
 
     trak = ngx_mp4_last_trak(mp4);
+
+    if (trak->out[NGX_HTTP_MP4_TKHD_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 tkhd atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     trak->tkhd_size = atom_size;
     trak->movie_duration = duration;
 
@@ -1676,6 +1707,12 @@ ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     trak = ngx_mp4_last_trak(mp4);
 
+    if (trak->out[NGX_HTTP_MP4_MDIA_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 mdia atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom = &trak->mdia_atom_buf;
     atom->temporary = 1;
     atom->pos = atom_header;
@@ -1799,6 +1836,13 @@ ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
     atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size;
 
     trak = ngx_mp4_last_trak(mp4);
+
+    if (trak->out[NGX_HTTP_MP4_MDHD_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 mdhd atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     trak->mdhd_size = atom_size;
     trak->timescale = timescale;
     trak->duration = duration;
@@ -1862,6 +1906,12 @@ ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     trak = ngx_mp4_last_trak(mp4);
 
+    if (trak->out[NGX_HTTP_MP4_HDLR_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 hdlr atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom = &trak->hdlr_atom_buf;
     atom->temporary = 1;
     atom->pos = atom_header;
@@ -1890,6 +1940,12 @@ ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     trak = ngx_mp4_last_trak(mp4);
 
+    if (trak->out[NGX_HTTP_MP4_MINF_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 minf atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom = &trak->minf_atom_buf;
     atom->temporary = 1;
     atom->pos = atom_header;
@@ -1933,6 +1989,15 @@ ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     trak = ngx_mp4_last_trak(mp4);
 
+    if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf
+        || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf)
+    {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 vmhd/smhd atom in \"%s\"",
+                      mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom = &trak->vmhd_atom_buf;
     atom->temporary = 1;
     atom->pos = atom_header;
@@ -1964,6 +2029,15 @@ ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     trak = ngx_mp4_last_trak(mp4);
 
+    if (trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf
+        || trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf)
+    {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 vmhd/smhd atom in \"%s\"",
+                      mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom = &trak->smhd_atom_buf;
     atom->temporary = 1;
     atom->pos = atom_header;
@@ -1995,6 +2069,12 @@ ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     trak = ngx_mp4_last_trak(mp4);
 
+    if (trak->out[NGX_HTTP_MP4_DINF_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 dinf atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom = &trak->dinf_atom_buf;
     atom->temporary = 1;
     atom->pos = atom_header;
@@ -2023,6 +2103,12 @@ ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     trak = ngx_mp4_last_trak(mp4);
 
+    if (trak->out[NGX_HTTP_MP4_STBL_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 stbl atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom = &trak->stbl_atom_buf;
     atom->temporary = 1;
     atom->pos = atom_header;
@@ -2144,6 +2230,12 @@ ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
 
     trak = ngx_mp4_last_trak(mp4);
 
+    if (trak->out[NGX_HTTP_MP4_STSD_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 stsd atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     atom = &trak->stsd_atom_buf;
     atom->temporary = 1;
     atom->pos = atom_header;
@@ -2212,6 +2304,13 @@ ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
     atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t);
 
     trak = ngx_mp4_last_trak(mp4);
+
+    if (trak->out[NGX_HTTP_MP4_STTS_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 stts atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     trak->time_to_sample_entries = entries;
 
     atom = &trak->stts_atom_buf;
@@ -2480,6 +2579,13 @@ ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
                    "sync sample entries:%uD", entries);
 
     trak = ngx_mp4_last_trak(mp4);
+
+    if (trak->out[NGX_HTTP_MP4_STSS_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 stss atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     trak->sync_samples_entries = entries;
 
     atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t);
@@ -2678,6 +2784,13 @@ ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
                    "composition offset entries:%uD", entries);
 
     trak = ngx_mp4_last_trak(mp4);
+
+    if (trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 ctts atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     trak->composition_offset_entries = entries;
 
     atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t);
@@ -2881,6 +2994,13 @@ ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
     atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t);
 
     trak = ngx_mp4_last_trak(mp4);
+
+    if (trak->out[NGX_HTTP_MP4_STSC_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 stsc atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     trak->sample_to_chunk_entries = entries;
 
     atom = &trak->stsc_atom_buf;
@@ -3213,6 +3333,13 @@ ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
                    "sample uniform size:%uD, entries:%uD", size, entries);
 
     trak = ngx_mp4_last_trak(mp4);
+
+    if (trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 stsz atom in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     trak->sample_sizes_entries = entries;
 
     atom_table = atom_header + sizeof(ngx_mp4_stsz_atom_t);
@@ -3396,6 +3523,16 @@ ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
     atom_end = atom_table + entries * sizeof(uint32_t);
 
     trak = ngx_mp4_last_trak(mp4);
+
+    if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf
+        || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf)
+    {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 stco/co64 atom in \"%s\"",
+                      mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     trak->chunks = entries;
 
     atom = &trak->stco_atom_buf;
@@ -3602,6 +3739,16 @@ ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
     atom_end = atom_table + entries * sizeof(uint64_t);
 
     trak = ngx_mp4_last_trak(mp4);
+
+    if (trak->out[NGX_HTTP_MP4_STCO_ATOM].buf
+        || trak->out[NGX_HTTP_MP4_CO64_ATOM].buf)
+    {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "duplicate mp4 stco/co64 atom in \"%s\"",
+                      mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     trak->chunks = entries;
 
     atom = &trak->co64_atom_buf;

From 372da465bf7fc5f9ce1808bf3b8cc570fc1a15f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 25 Oct 2022 18:30:43 +0200
Subject: [PATCH 427/600] d/changelog New upstream version 1.22.1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 99c641b..a5a2679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.22.1-1) UNRELEASED; urgency=medium
+
+  * New upstream version 1.22.1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Oct 2022 18:29:34 +0200
+
 nginx (1.22.0-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.

From 8ac7c1efb5f33e3023fefe12671085aee43814f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 26 Oct 2022 17:27:15 +0200
Subject: [PATCH 428/600] d/changelog added exact version of dependency
 libnginx-mod-http-lua

---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a5a2679..9e60466 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 nginx (1.22.1-1) UNRELEASED; urgency=medium
 
   * New upstream version 1.22.1
+  * d/changelog added exact version of dependency libnginx-mod-http-lua
+    (>=1:0.10.22-3)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Oct 2022 18:29:34 +0200
 
diff --git a/debian/control b/debian/control
index 206523f..ded4458 100644
--- a/debian/control
+++ b/debian/control
@@ -207,7 +207,7 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-geoip2 (= ${binary:Version}),
          libnginx-mod-http-headers-more-filter (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
+         libnginx-mod-http-lua (>=1:0.10.22-3) [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
          libnginx-mod-http-perl (= ${binary:Version}),
          libnginx-mod-http-subs-filter (= ${binary:Version}),
          libnginx-mod-http-uploadprogress (= ${binary:Version}),

From a8134e474143473b26965e53079c6760235282f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 27 Oct 2022 16:35:14 +0200
Subject: [PATCH 429/600] Add libnginx-mod-http-lua powerpc architecture

---
 debian/changelog     | 1 +
 debian/control       | 2 +-
 debian/tests/control | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e60466..45181bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nginx (1.22.1-1) UNRELEASED; urgency=medium
   * New upstream version 1.22.1
   * d/changelog added exact version of dependency libnginx-mod-http-lua
     (>=1:0.10.22-3)
+  * Added libnginx-mod-http-lua powerpc architecture
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Oct 2022 18:29:34 +0200
 
diff --git a/debian/control b/debian/control
index ded4458..6495d5b 100644
--- a/debian/control
+++ b/debian/control
@@ -207,7 +207,7 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-geoip2 (= ${binary:Version}),
          libnginx-mod-http-headers-more-filter (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
-         libnginx-mod-http-lua (>=1:0.10.22-3) [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
+         libnginx-mod-http-lua (>=1:0.10.22-3) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
          libnginx-mod-http-perl (= ${binary:Version}),
          libnginx-mod-http-subs-filter (= ${binary:Version}),
          libnginx-mod-http-uploadprogress (= ${binary:Version}),
diff --git a/debian/tests/control b/debian/tests/control
index 3e2c64e..51bee11 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -31,7 +31,7 @@ Depends: nginx-core,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
@@ -57,7 +57,7 @@ Depends: nginx-full,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
@@ -83,7 +83,7 @@ Depends: nginx-light,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
@@ -109,7 +109,7 @@ Depends: nginx-extras,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x],
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,

From cc9cec69997e3cfcfb85668738557e3d2a9aeb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 28 Oct 2022 09:59:47 +0200
Subject: [PATCH 430/600] d/changelog fix whitespace

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 45181bc..65c11f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ nginx (1.22.0-3.1) unstable; urgency=medium
 
 nginx (1.22.0-3) unstable; urgency=medium
 
-  * d/changelog: fixed typo in bug number 61261 -> 861261 (Closes: 861261) 
+  * d/changelog: fixed typo in bug number 61261 -> 861261 (Closes: 861261)
   * d/p/nginx-ssl_cert_cb_yield.patch added (Closes: 884434)
   * http-lua: removed the http-lua module and moved it to a separate package
 

From 304ba44d130a7350b1ca8642faf51924ec2ec172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 28 Oct 2022 10:01:22 +0200
Subject: [PATCH 431/600] d/control fix implicit version libnginx-mod-http-lua
 >=1:0.10.22-3~

---
 debian/changelog | 6 ++++--
 debian/control   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65c11f1..10dba50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 nginx (1.22.1-1) UNRELEASED; urgency=medium
 
   * New upstream version 1.22.1
-  * d/changelog added exact version of dependency libnginx-mod-http-lua
-    (>=1:0.10.22-3)
+  * d/control: added implicit version of dependency libnginx-mod-http-lua
+    (>=1:0.10.22-3~), because it is a rebuilt version with nginx 1.22.1.
+    In order for the dependency to work even in an experimental environment,
+    the version is terminated by '~'.
   * Added libnginx-mod-http-lua powerpc architecture
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Oct 2022 18:29:34 +0200
diff --git a/debian/control b/debian/control
index 6495d5b..079d3b0 100644
--- a/debian/control
+++ b/debian/control
@@ -207,7 +207,7 @@ Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
          libnginx-mod-http-geoip2 (= ${binary:Version}),
          libnginx-mod-http-headers-more-filter (= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
-         libnginx-mod-http-lua (>=1:0.10.22-3) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
+         libnginx-mod-http-lua (>=1:0.10.22-3~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
          libnginx-mod-http-perl (= ${binary:Version}),
          libnginx-mod-http-subs-filter (= ${binary:Version}),
          libnginx-mod-http-uploadprogress (= ${binary:Version}),

From 974e91ad9d9f84960f3f964c7039de38a2955e80 Mon Sep 17 00:00:00 2001
From: Debian Janitor <janitor@jelmer.uk>
Date: Fri, 28 Oct 2022 08:39:19 +0000
Subject: [PATCH 432/600] Fix day-of-week for changelog entry 0.5.11-1.

Changes-By: lintian-brush
Fixes: lintian: debian-changelog-has-wrong-day-of-week
See-also: https://lintian.debian.org/tags/debian-changelog-has-wrong-day-of-week.html
---
 debian/changelog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 10dba50..5ee9950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 nginx (1.22.1-1) UNRELEASED; urgency=medium
 
+  [ Jan Mojžíš ]
   * New upstream version 1.22.1
   * d/control: added implicit version of dependency libnginx-mod-http-lua
     (>=1:0.10.22-3~), because it is a rebuilt version with nginx 1.22.1.
@@ -7,6 +8,9 @@ nginx (1.22.1-1) UNRELEASED; urgency=medium
     the version is terminated by '~'.
   * Added libnginx-mod-http-lua powerpc architecture
 
+  [ Debian Janitor ]
+  * Fix day-of-week for changelog entry 0.5.11-1.
+
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Oct 2022 18:29:34 +0200
 
 nginx (1.22.0-3.1) unstable; urgency=medium
@@ -2585,7 +2589,7 @@ nginx (0.5.11-1) unstable; urgency=low
 
   * New upstream version. (Closes: #405983)
 
- -- Jose Parrella <joseparrella@cantv.net>  Sun, 5 Feb 2007 19:35:56 -0400
+ -- Jose Parrella <joseparrella@cantv.net>  Mon, 05 Feb 2007 19:35:56 -0400
 
 nginx (0.4.13-2) unstable; urgency=low
 

From c2f4bc019b75856f00c57e7725e9d1cd45367953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 28 Oct 2022 15:13:30 +0200
Subject: [PATCH 433/600] d/changelog update changelog text

---
 debian/changelog | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10dba50..1141e4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ nginx (1.22.1-1) UNRELEASED; urgency=medium
 
   * New upstream version 1.22.1
   * d/control: added implicit version of dependency libnginx-mod-http-lua
-    (>=1:0.10.22-3~), because it is a rebuilt version with nginx 1.22.1.
-    In order for the dependency to work even in an experimental environment,
-    the version is terminated by '~'.
+    (>=1:0.10.22-3~), it is a rebuilt version with nginx 1.22.1.
+    To make the dependency work also with the experimental version of
+    libnginx-mod-http-lua in the experimental environment, the version
+    is terminated by '~'.
   * Added libnginx-mod-http-lua powerpc architecture
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Oct 2022 18:29:34 +0200

From 4243cedb55b8e9ba75537a8c87440e0c7ff17b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 10 Nov 2022 18:23:04 +0100
Subject: [PATCH 434/600] release nginx 1.22.1-1, upload to unstable

---
 debian/changelog | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a3d995..14d8b63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,15 @@
-nginx (1.22.1-1) UNRELEASED; urgency=medium
+nginx (1.22.1-1) unstable; urgency=medium
 
   [ Jan Mojžíš ]
   * New upstream version 1.22.1
   * d/control: added implicit version of dependency libnginx-mod-http-lua
     (>=1:0.10.22-3~), it is a rebuilt version with nginx 1.22.1.
-    To make the dependency work also with the experimental version of
-    libnginx-mod-http-lua in the experimental environment, the version
-    is terminated by '~'.
   * Added libnginx-mod-http-lua powerpc architecture
 
   [ Debian Janitor ]
   * Fix day-of-week for changelog entry 0.5.11-1.
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Oct 2022 18:29:34 +0200
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 10 Nov 2022 18:21:43 +0100
 
 nginx (1.22.0-3.1) unstable; urgency=medium
 

From c3f0a001206f099bd031b7764c57174534bf651e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 11 Nov 2022 06:14:27 +0100
Subject: [PATCH 435/600] d/control fix spelling-error-in-description
 Subsitution -> Substitution

---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 14d8b63..aeea119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.22.1-2) UNRELEASED; urgency=medium
+
+  * d/control: fixed spelling-error-in-description 
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 11 Nov 2022 06:15:39 +0100
+
 nginx (1.22.1-1) unstable; urgency=medium
 
   [ Jan Mojžíš ]
diff --git a/debian/control b/debian/control
index 079d3b0..7949bc6 100644
--- a/debian/control
+++ b/debian/control
@@ -484,7 +484,7 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
 Recommends: nginx,
 Description: Substitution filter module for Nginx
- Subsitution Nginx module can do both regular expression and fixed string
+ Substitution Nginx module can do both regular expression and fixed string
  substitutions on response bodies. The module is quite different from Nginx's
  native Substitution module. It scans the output chains buffer and
  matches string line by line, just like Apache's mod_substitute.

From dce642e6425379779c64e22956ee71b599bf9204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 26 Nov 2022 11:19:43 +0100
Subject: [PATCH 436/600] d/changelog: d/nginx-*.postinst: Use invoke-rc.d
 instead of pidof and ad-hoc tests

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index aeea119..a0d94c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 nginx (1.22.1-2) UNRELEASED; urgency=medium
 
   * d/control: fixed spelling-error-in-description 
+  * d/nginx-*.postinst: fixed postinst script, used invoke-rc.d instead of
+    pidof and ad-hoc tests, tnx Gioele Barabucci
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 11 Nov 2022 06:15:39 +0100
 

From a056949f1bf1faed5223dc458764b94c83becd3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 26 Nov 2022 13:37:19 +0100
Subject: [PATCH 437/600] d/changelog fix whitespace

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a0d94c0..eacb6e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 nginx (1.22.1-2) UNRELEASED; urgency=medium
 
-  * d/control: fixed spelling-error-in-description 
+  * d/control: fixed spelling-error-in-description
   * d/nginx-*.postinst: fixed postinst script, used invoke-rc.d instead of
     pidof and ad-hoc tests, tnx Gioele Barabucci
 

From c2ce778dcbe563613294a750523a40c05431af5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 26 Nov 2022 14:21:07 +0100
Subject: [PATCH 438/600] d/tests/ssi-module-test add

---
 debian/changelog             |  1 +
 debian/tests/control         |  4 ++++
 debian/tests/ssi-module-test | 25 +++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 debian/tests/ssi-module-test

diff --git a/debian/changelog b/debian/changelog
index eacb6e7..6dab007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nginx (1.22.1-2) UNRELEASED; urgency=medium
   * d/control: fixed spelling-error-in-description
   * d/nginx-*.postinst: fixed postinst script, used invoke-rc.d instead of
     pidof and ad-hoc tests, tnx Gioele Barabucci
+  * d/tests/ssi-module-test added, simple ngx_http_ssi_filter_module test
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 11 Nov 2022 06:15:39 +0100
 
diff --git a/debian/tests/control b/debian/tests/control
index 51bee11..537bfca 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -125,3 +125,7 @@ Depends: nginx-extras,
 Tests: reboot
 Restrictions: isolation-container, needs-root, needs-reboot
 Depends: nginx-light, curl
+
+Tests: ssi-module-test
+Restrictions: allow-stderr, isolation-container, needs-root,
+Depends: nginx, nginx-core, curl
diff --git a/debian/tests/ssi-module-test b/debian/tests/ssi-module-test
new file mode 100644
index 0000000..6ebd090
--- /dev/null
+++ b/debian/tests/ssi-module-test
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+cat <<EOF > "/etc/nginx/sites-enabled/default"
+server {
+  listen 80 default_server;
+  root /var/www/html;
+
+  location /loc1.html {
+    add_after_body /loc2.html;
+  }
+
+  location /loc2.html {
+    ssi on;
+  }
+}
+EOF
+mkdir -p /var/www/html
+echo '<p>Hi from location 1 !</p>' > /var/www/html/loc1.html
+echo '<p>Hi from location 2 on <!--#echo var="host" --> !</p>' > /var/www/html/loc2.html
+
+nginx -t
+invoke-rc.d nginx restart || { journalctl -n all -xu nginx.service; exit 1; }
+
+curl --fail -w "response_code: %{http_code}\n" http://127.0.0.1/loc1.html

From fa37bc17aba4e8d1dac51ed8c038e9d3cd291699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 26 Nov 2022 14:37:23 +0100
Subject: [PATCH 439/600] d/p/bug-1024605.patch add, bugfix 1024605 fixes
 problem when a subrequest has SSI enabled but its main request does not, the
 SSI module may crash the worker due to NULL-pointer dereference. The patch is
 backported from the upstream

---
 debian/changelog                 |   4 ++
 debian/patches/bug-1024605.patch | 101 +++++++++++++++++++++++++++++++
 debian/patches/series            |   1 +
 3 files changed, 106 insertions(+)
 create mode 100644 debian/patches/bug-1024605.patch

diff --git a/debian/changelog b/debian/changelog
index 6dab007..ee044e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ nginx (1.22.1-2) UNRELEASED; urgency=medium
   * d/nginx-*.postinst: fixed postinst script, used invoke-rc.d instead of
     pidof and ad-hoc tests, tnx Gioele Barabucci
   * d/tests/ssi-module-test added, simple ngx_http_ssi_filter_module test
+  * d/p/bug-1024605.patch added: fixes problem when a subrequest has SSI
+    enabled but its main request does not, the SSI module may crash the worker
+    due to NULL-pointer dereference. The patch is backported from the upstream
+    (Closes: 1024605)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 11 Nov 2022 06:15:39 +0100
 
diff --git a/debian/patches/bug-1024605.patch b/debian/patches/bug-1024605.patch
new file mode 100644
index 0000000..0598bb5
--- /dev/null
+++ b/debian/patches/bug-1024605.patch
@@ -0,0 +1,101 @@
+Description: SSI: handling of subrequests from other modules
+Author: User Ciel Zhao <i@ciel.dev>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024605
+Last-Update: 2022-11-21
+Origin: https://hg.nginx.org/nginx/raw-rev/49e7db44b57c
+---
+# HG changeset patch
+# User Ciel Zhao <i@ciel.dev>
+# Date 1669039294 -10800
+# Node ID 49e7db44b57c9f4d54b87d19a696178b913aec5c
+# Parent  42bc158a47ecb3c2bd0396c723c307c757f2770e
+SSI: handling of subrequests from other modules (ticket #1263).
+
+As the SSI parser always uses the context from the main request for storing
+variables and blocks, that context should always exist for subrequests using
+SSI, even though the main request does not necessarily have SSI enabled.
+
+However, `ngx_http_get_module_ctx(r->main, ...)` is getting NULL in such cases,
+resulting in the worker crashing SIGSEGV when accessing its attributes.
+
+This patch links the first initialized context to the main request, and
+upgrades it only when main context is initialized.
+
+diff -r 42bc158a47ec -r 49e7db44b57c src/http/modules/ngx_http_ssi_filter_module.c
+--- a/src/http/modules/ngx_http_ssi_filter_module.c	Tue Nov 08 12:48:21 2022 +0300
++++ b/src/http/modules/ngx_http_ssi_filter_module.c	Mon Nov 21 17:01:34 2022 +0300
+@@ -329,7 +329,7 @@
+ static ngx_int_t
+ ngx_http_ssi_header_filter(ngx_http_request_t *r)
+ {
+-    ngx_http_ssi_ctx_t       *ctx;
++    ngx_http_ssi_ctx_t       *ctx, *mctx;
+     ngx_http_ssi_loc_conf_t  *slcf;
+ 
+     slcf = ngx_http_get_module_loc_conf(r, ngx_http_ssi_filter_module);
+@@ -341,6 +341,8 @@
+         return ngx_http_next_header_filter(r);
+     }
+ 
++    mctx = ngx_http_get_module_ctx(r->main, ngx_http_ssi_filter_module);
++
+     ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_ssi_ctx_t));
+     if (ctx == NULL) {
+         return NGX_ERROR;
+@@ -367,6 +369,26 @@
+     r->filter_need_in_memory = 1;
+ 
+     if (r == r->main) {
++
++        if (mctx) {
++
++            /*
++             * if there was a shared context previously used as main,
++             * copy variables and blocks
++             */
++
++            ctx->variables = mctx->variables;
++            ctx->blocks = mctx->blocks;
++
++#if (NGX_PCRE)
++            ctx->ncaptures = mctx->ncaptures;
++            ctx->captures = mctx->captures;
++            ctx->captures_data = mctx->captures_data;
++#endif
++
++            mctx->shared = 0;
++        }
++
+         ngx_http_clear_content_length(r);
+         ngx_http_clear_accept_ranges(r);
+ 
+@@ -379,6 +401,10 @@
+         } else {
+             ngx_http_weak_etag(r);
+         }
++
++    } else if (mctx == NULL) {
++        ngx_http_set_ctx(r->main, ctx, ngx_http_ssi_filter_module);
++        ctx->shared = 1;
+     }
+ 
+     return ngx_http_next_header_filter(r);
+@@ -405,6 +431,7 @@
+     ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module);
+ 
+     if (ctx == NULL
++        || (ctx->shared && r == r->main)
+         || (in == NULL
+             && ctx->buf == NULL
+             && ctx->in == NULL
+diff -r 42bc158a47ec -r 49e7db44b57c src/http/modules/ngx_http_ssi_filter_module.h
+--- a/src/http/modules/ngx_http_ssi_filter_module.h	Tue Nov 08 12:48:21 2022 +0300
++++ b/src/http/modules/ngx_http_ssi_filter_module.h	Mon Nov 21 17:01:34 2022 +0300
+@@ -71,6 +71,7 @@
+     u_char                   *captures_data;
+ #endif
+ 
++    unsigned                  shared:1;
+     unsigned                  conditional:2;
+     unsigned                  encoding:2;
+     unsigned                  block:1;
diff --git a/debian/patches/series b/debian/patches/series
index 52e1dc4..da26839 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 nginx-fix-pidfile.patch
 nginx-ssl_cert_cb_yield.patch
+bug-1024605.patch

From 70c390852c3ebeb908a5b7db4a33404ef164ae09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 26 Nov 2022 16:03:37 +0100
Subject: [PATCH 440/600] d/control update implicit dependencies of third-party
 modules

---
 debian/changelog |  2 ++
 debian/control   | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee044e0..4735a81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ nginx (1.22.1-2) UNRELEASED; urgency=medium
     enabled but its main request does not, the SSI module may crash the worker
     due to NULL-pointer dereference. The patch is backported from the upstream
     (Closes: 1024605)
+  * d/control: updated implicit dependencies of third-party modules
+    for easier transition to third-party modules in separate packages.
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 11 Nov 2022 06:15:39 +0100
 
diff --git a/debian/control b/debian/control
index 7949bc6..769452a 100644
--- a/debian/control
+++ b/debian/control
@@ -171,7 +171,7 @@ Description: nginx web/proxy server (standard version with 3rd parties)
 
 Package: nginx-light
 Architecture: any
-Depends: libnginx-mod-http-echo (= ${binary:Version}),
+Depends: libnginx-mod-http-echo (>= ${binary:Version}),
          nginx-common (= ${source:Version}),
          iproute2,
          ${misc:Depends},
@@ -198,26 +198,26 @@ Description: nginx web/proxy server (basic version)
 
 Package: nginx-extras
 Architecture: any
-Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
-         libnginx-mod-http-cache-purge (= ${binary:Version}),
-         libnginx-mod-http-dav-ext (= ${binary:Version}),
-         libnginx-mod-http-echo (= ${binary:Version}),
-         libnginx-mod-http-fancyindex (= ${binary:Version}),
+Depends: libnginx-mod-http-auth-pam (>= ${binary:Version}),
+         libnginx-mod-http-cache-purge (>= ${binary:Version}),
+         libnginx-mod-http-dav-ext (>= ${binary:Version}),
+         libnginx-mod-http-echo (>= ${binary:Version}),
+         libnginx-mod-http-fancyindex (>= ${binary:Version}),
          libnginx-mod-http-geoip (= ${binary:Version}),
-         libnginx-mod-http-geoip2 (= ${binary:Version}),
-         libnginx-mod-http-headers-more-filter (= ${binary:Version}),
+         libnginx-mod-http-geoip2 (>= ${binary:Version}),
+         libnginx-mod-http-headers-more-filter (>= ${binary:Version}),
          libnginx-mod-http-image-filter (= ${binary:Version}),
          libnginx-mod-http-lua (>=1:0.10.22-3~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
          libnginx-mod-http-perl (= ${binary:Version}),
-         libnginx-mod-http-subs-filter (= ${binary:Version}),
-         libnginx-mod-http-uploadprogress (= ${binary:Version}),
-         libnginx-mod-http-upstream-fair (= ${binary:Version}),
+         libnginx-mod-http-subs-filter (>= ${binary:Version}),
+         libnginx-mod-http-uploadprogress (>= ${binary:Version}),
+         libnginx-mod-http-upstream-fair (>= ${binary:Version}),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
-         libnginx-mod-nchan (= ${binary:Version}),
+         libnginx-mod-nchan (>= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
-         libnginx-mod-stream-geoip2 (= ${binary:Version}),
+         libnginx-mod-stream-geoip2 (>= ${binary:Version}),
          nginx-common (= ${source:Version}),
          iproute2,
          ${misc:Depends},

From 6d3c163fd32148bf41fbc7455426a1d2ef90ee69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 27 Nov 2022 12:53:46 +0100
Subject: [PATCH 441/600] Add buildsystem nginx_mod to dh-sequence nginx

---
 debian/debhelper/nginx.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/debhelper/nginx.pm b/debian/debhelper/nginx.pm
index 0473815..0e41120 100644
--- a/debian/debhelper/nginx.pm
+++ b/debian/debhelper/nginx.pm
@@ -3,6 +3,12 @@ use warnings;
 use strict;
 use Debian::Debhelper::Dh_Lib;
 
+add_command_options( "dh_auto_test",      "--buildsystem=nginx_mod" );
+add_command_options( "dh_auto_configure", "--buildsystem=nginx_mod" );
+add_command_options( "dh_auto_build",     "--buildsystem=nginx_mod" );
+add_command_options( "dh_auto_install",   "--buildsystem=nginx_mod" );
+add_command_options( "dh_auto_clean",     "--buildsystem=nginx_mod" );
+
 insert_after("dh_install", "dh_nginx");
 
 1;

From cb417c7e2ca0e9404a8a1e6f0555ad291ea9a3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 27 Nov 2022 12:55:48 +0100
Subject: [PATCH 442/600] nginx-dev provides dh-sequence-nginx

---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 769452a..f464dd8 100644
--- a/debian/control
+++ b/debian/control
@@ -81,6 +81,7 @@ Depends: ${misc:Depends},
          zlib1g-dev,
          nginx-core (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
          nginx-core (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version})
+Provides: dh-sequence-nginx
 Description: nginx web/proxy server - development headers
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server

From 393320b207fe65a088a9663be2e9cffce2fb9095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 27 Nov 2022 12:57:51 +0100
Subject: [PATCH 443/600] Update changelog

---
 debian/changelog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4735a81..c1bfa31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 nginx (1.22.1-2) UNRELEASED; urgency=medium
 
+  [ Jan Mojžíš ]
   * d/control: fixed spelling-error-in-description
   * d/nginx-*.postinst: fixed postinst script, used invoke-rc.d instead of
     pidof and ad-hoc tests, tnx Gioele Barabucci
@@ -11,7 +12,11 @@ nginx (1.22.1-2) UNRELEASED; urgency=medium
   * d/control: updated implicit dependencies of third-party modules
     for easier transition to third-party modules in separate packages.
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 11 Nov 2022 06:15:39 +0100
+  [ Jérémy Lal ]
+  * d/debhelper: set nginx_mod buildsystem by default
+  * d/control: nginx-dev provides dh-sequence-nginx (Closes: #1024879)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 26 Nov 2022 22:27:46 +0100
 
 nginx (1.22.1-1) unstable; urgency=medium
 

From b99e3ad524d7d209b35cf76ba2b92d70337a75db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 29 Nov 2022 13:17:04 +0100
Subject: [PATCH 444/600] Remove constraints unnecessary since buster
 (oldstable) * nginx-dev: Drop versioned constraint on dpkg-dev in Depends.

Changes-By: deb-scrub-obsolete
---
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c1bfa31..445f818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ nginx (1.22.1-2) UNRELEASED; urgency=medium
   * d/debhelper: set nginx_mod buildsystem by default
   * d/control: nginx-dev provides dh-sequence-nginx (Closes: #1024879)
 
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since buster (oldstable):
+    + nginx-dev: Drop versioned constraint on dpkg-dev in Depends.
+
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 26 Nov 2022 22:27:46 +0100
 
 nginx (1.22.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index f464dd8..1167137 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Package: nginx-dev
 Architecture: all
 Depends: ${misc:Depends},
          debhelper-compat (= 13),
-         dpkg-dev (>= 1.15.5),
+         dpkg-dev,
          libgd-dev,
          libgeoip-dev,
          libpcre3-dev,

From ad7d6fcf98b0b7d000e54d0da2ef3595c5c42f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Tue, 29 Nov 2022 20:27:42 +0100
Subject: [PATCH 445/600] Uploaders for a team needs only one name

---
 debian/control | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 1167137..adfe43e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,7 @@ Source: nginx
 Section: httpd
 Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
-Uploaders: Christos Trochalakis <ctrochalakis@debian.org>,
-           Ondřej Nový <onovy@debian.org>,
-           Thomas Ward <teward@ubuntu.com>,
-           Jan Mojžíš <jan.mojzis@gmail.com>,
+Uploaders: Jan Mojžíš <jan.mojzis@gmail.com>
 Build-Depends: debhelper-compat (= 13),
                libexpat-dev,
                libgd-dev,

From 65aa43c3d5d2b03772102603edc222d69a6906a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Wed, 30 Nov 2022 17:36:47 +0100
Subject: [PATCH 446/600] Update changelog

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 445f818..83742cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ nginx (1.22.1-2) UNRELEASED; urgency=medium
   [ Jérémy Lal ]
   * d/debhelper: set nginx_mod buildsystem by default
   * d/control: nginx-dev provides dh-sequence-nginx (Closes: #1024879)
+  * d/control: remove Uploaders that are part of nginx-team,
+    keep only the most recent active one, per policy 5.6.3.
 
   [ Debian Janitor ]
   * Remove constraints unnecessary since buster (oldstable):

From 6b407926344c24fa2191b283addd4a67018113a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 30 Nov 2022 17:40:35 +0100
Subject: [PATCH 447/600] release nginx 1.22.1-2, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83742cc..5db16cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.22.1-2) UNRELEASED; urgency=medium
+nginx (1.22.1-2) unstable; urgency=medium
 
   [ Jan Mojžíš ]
   * d/control: fixed spelling-error-in-description
@@ -22,7 +22,7 @@ nginx (1.22.1-2) UNRELEASED; urgency=medium
   * Remove constraints unnecessary since buster (oldstable):
     + nginx-dev: Drop versioned constraint on dpkg-dev in Depends.
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 26 Nov 2022 22:27:46 +0100
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 17:39:42 +0100
 
 nginx (1.22.1-1) unstable; urgency=medium
 

From f868709a45e3f30bf095a4ba2295fbfb5a5f9100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 2 Dec 2022 00:31:15 +0100
Subject: [PATCH 448/600] d/control: added Multi-Arch: foreign for package
 nginx-dev

---
 debian/changelog | 6 ++++++
 debian/control   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5db16cc..2126ef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.22.1-3) UNRELEASED; urgency=medium
+
+  * d/control: added Multi-Arch: foreign for package nginx-dev
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 02 Dec 2022 00:30:39 +0100
+
 nginx (1.22.1-2) unstable; urgency=medium
 
   [ Jan Mojžíš ]
diff --git a/debian/control b/debian/control
index adfe43e..a8f0c8d 100644
--- a/debian/control
+++ b/debian/control
@@ -64,6 +64,7 @@ Description: small, powerful, scalable web/proxy server - common files
 
 Package: nginx-dev
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          debhelper-compat (= 13),
          dpkg-dev,

From 6c68d264f3e2303bfd2a587858ff07dc69081324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 3 Dec 2022 08:28:23 +0100
Subject: [PATCH 449/600] d/rules: enable NDK upstream list module
 NDK_UPSTREAM_LIST

---
 debian/changelog |  1 +
 debian/rules     | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2126ef7..c8ce4bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nginx (1.22.1-3) UNRELEASED; urgency=medium
 
   * d/control: added Multi-Arch: foreign for package nginx-dev
+  * d/rules: enabled NDK upstream list module NDK_UPSTREAM_LIST
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 02 Dec 2022 00:30:39 +0100
 
diff --git a/debian/rules b/debian/rules
index 8a7354b..f2fd124 100755
--- a/debian/rules
+++ b/debian/rules
@@ -201,8 +201,14 @@ config.arch.%:
 	cp -Pa $(CURDIR)/man $(BUILDDIR_$*)/
 	cd $(BUILDDIR_$*) && ./configure $($*_configure_flags)
 	if [ "$(BUILDDIR_$*)" = "$(BUILDDIR_extras)" ]; then \
-	  have="NDK_SET_VAR"; \
-	  /bin/echo -e "#ifndef $$have\n#define $$have  1\n#endif" >> $(BUILDDIR_$*)/objs/ngx_auto_config.h; \
+	  for have in NDK_SET_VAR NDK_UPSTREAM_LIST; do \
+	    ( \
+	      echo "#ifndef $$have"; \
+	      echo "#define $$have 1"; \
+	      echo "#endif"; \
+	      echo; \
+	    ) >> $(BUILDDIR_$*)/objs/ngx_auto_config.h; \
+	  done \
 	fi
 
 config.src:

From 58657d6178cc1bf4edd76b9ff6042333aad5d959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 4 Dec 2022 18:37:45 +0100
Subject: [PATCH 450/600] d/p/bug-1024605.patch Forwarded: not-needed

---
 debian/changelog                 | 1 +
 debian/patches/bug-1024605.patch | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c8ce4bb..40e5f81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nginx (1.22.1-3) UNRELEASED; urgency=medium
 
   * d/control: added Multi-Arch: foreign for package nginx-dev
   * d/rules: enabled NDK upstream list module NDK_UPSTREAM_LIST
+  * d/p/bug-1024605.patch: added header Forwarded: not-needed
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 02 Dec 2022 00:30:39 +0100
 
diff --git a/debian/patches/bug-1024605.patch b/debian/patches/bug-1024605.patch
index 0598bb5..28b7d18 100644
--- a/debian/patches/bug-1024605.patch
+++ b/debian/patches/bug-1024605.patch
@@ -3,6 +3,7 @@ Author: User Ciel Zhao <i@ciel.dev>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024605
 Last-Update: 2022-11-21
 Origin: https://hg.nginx.org/nginx/raw-rev/49e7db44b57c
+Forwarded: not-needed
 ---
 # HG changeset patch
 # User Ciel Zhao <i@ciel.dev>

From 616ee027250cc6d7707a04b53f50d8a8958f9902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 5 Dec 2022 18:25:29 +0100
Subject: [PATCH 451/600] release nginx 1.22.1-3, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40e5f81..4f5067d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-nginx (1.22.1-3) UNRELEASED; urgency=medium
+nginx (1.22.1-3) unstable; urgency=medium
 
   * d/control: added Multi-Arch: foreign for package nginx-dev
   * d/rules: enabled NDK upstream list module NDK_UPSTREAM_LIST
   * d/p/bug-1024605.patch: added header Forwarded: not-needed
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 02 Dec 2022 00:30:39 +0100
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 05 Dec 2022 18:25:16 +0100
 
 nginx (1.22.1-2) unstable; urgency=medium
 

From 2e0b1943b00e4cea1c84f780230dc5a802190067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 8 Dec 2022 09:58:23 +0100
Subject: [PATCH 452/600] d/t/*-module-deps: add curl timeout 300 seconds +
 nginx restart

---
 debian/changelog                | 7 +++++++
 debian/tests/control            | 8 ++++----
 debian/tests/core-module-deps   | 8 ++++++--
 debian/tests/extras-module-deps | 4 +---
 debian/tests/full-module-deps   | 4 +---
 debian/tests/light-module-deps  | 4 +---
 6 files changed, 20 insertions(+), 15 deletions(-)
 mode change 100644 => 120000 debian/tests/extras-module-deps
 mode change 100644 => 120000 debian/tests/full-module-deps
 mode change 100644 => 120000 debian/tests/light-module-deps

diff --git a/debian/changelog b/debian/changelog
index 4f5067d..a4af5c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.22.1-4) UNRELEASED; urgency=medium
+
+  * d/t/*-module-deps: updated, added curl timeout 300 seconds and
+    added nginx restart before calling curl
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 08 Dec 2022 09:47:06 +0100
+
 nginx (1.22.1-3) unstable; urgency=medium
 
   * d/control: added Multi-Arch: foreign for package nginx-dev
diff --git a/debian/tests/control b/debian/tests/control
index 537bfca..f2f9328 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -19,7 +19,7 @@ Restrictions: allow-stderr isolation-container
 Depends: nginx-extras, curl
 
 Tests: core-module-deps
-Restrictions: allow-stderr isolation-container
+Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-core,
          curl,
          libnginx-mod-http-auth-pam,
@@ -45,7 +45,7 @@ Depends: nginx-core,
          libnginx-mod-stream,
 
 Tests: full-module-deps
-Restrictions: allow-stderr isolation-container
+Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-full,
          curl,
          libnginx-mod-http-auth-pam,
@@ -71,7 +71,7 @@ Depends: nginx-full,
          libnginx-mod-stream,
 
 Tests: light-module-deps
-Restrictions: allow-stderr isolation-container
+Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-light,
          curl,
          libnginx-mod-http-auth-pam,
@@ -97,7 +97,7 @@ Depends: nginx-light,
          libnginx-mod-stream,
 
 Tests: extras-module-deps
-Restrictions: allow-stderr isolation-container
+Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-extras,
          curl,
          libnginx-mod-http-auth-pam,
diff --git a/debian/tests/core-module-deps b/debian/tests/core-module-deps
index cefed50..8978b2a 100644
--- a/debian/tests/core-module-deps
+++ b/debian/tests/core-module-deps
@@ -1,3 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
+# restart nginx before the test
+invoke-rc.d nginx restart || :
+sleep 30
+
+curl --max-time 300 --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/extras-module-deps b/debian/tests/extras-module-deps
deleted file mode 100644
index cefed50..0000000
--- a/debian/tests/extras-module-deps
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/extras-module-deps b/debian/tests/extras-module-deps
new file mode 120000
index 0000000..ef5f1bc
--- /dev/null
+++ b/debian/tests/extras-module-deps
@@ -0,0 +1 @@
+core-module-deps
\ No newline at end of file
diff --git a/debian/tests/full-module-deps b/debian/tests/full-module-deps
deleted file mode 100644
index cefed50..0000000
--- a/debian/tests/full-module-deps
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/full-module-deps b/debian/tests/full-module-deps
new file mode 120000
index 0000000..ef5f1bc
--- /dev/null
+++ b/debian/tests/full-module-deps
@@ -0,0 +1 @@
+core-module-deps
\ No newline at end of file
diff --git a/debian/tests/light-module-deps b/debian/tests/light-module-deps
deleted file mode 100644
index cefed50..0000000
--- a/debian/tests/light-module-deps
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/light-module-deps b/debian/tests/light-module-deps
new file mode 120000
index 0000000..ef5f1bc
--- /dev/null
+++ b/debian/tests/light-module-deps
@@ -0,0 +1 @@
+core-module-deps
\ No newline at end of file

From ccd8b068906a0bd09a3a586f69a5bca3b472d634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 8 Dec 2022 12:21:44 +0100
Subject: [PATCH 453/600] d/t/*-module-deps: update: - add tests for new ext.
 module libnginx-mod-http-set-misc - add tests for new ext. module
 libnginx-mod-http-brotli-filter - add tests for new ext. module
 libnginx-mod-http-brotli-static - add tests for new ext. module
 libnginx-mod-http-memc - add tests for new ext. module
 libnginx-mod-http-srcache-filter

---
 debian/changelog     |  6 ++++++
 debian/tests/control | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a4af5c7..dd4da4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ nginx (1.22.1-4) UNRELEASED; urgency=medium
 
   * d/t/*-module-deps: updated, added curl timeout 300 seconds and
     added nginx restart before calling curl
+  * d/t/*-module-deps: update:
+    - added tests for new ext. module libnginx-mod-http-set-misc
+    - added tests for new ext. module libnginx-mod-http-brotli-filter
+    - added tests for new ext. module libnginx-mod-http-brotli-static
+    - added tests for new ext. module libnginx-mod-http-memc
+    - added tests for new ext. module libnginx-mod-http-srcache-filter
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 08 Dec 2022 09:47:06 +0100
 
diff --git a/debian/tests/control b/debian/tests/control
index f2f9328..1de8b0c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -43,6 +43,11 @@ Depends: nginx-core,
          libnginx-mod-stream-geoip,
          libnginx-mod-stream-geoip2,
          libnginx-mod-stream,
+         libnginx-mod-http-set-misc,
+         libnginx-mod-http-brotli-filter,
+         libnginx-mod-http-brotli-static,
+         libnginx-mod-http-memc,
+         libnginx-mod-http-srcache-filter,
 
 Tests: full-module-deps
 Restrictions: allow-stderr isolation-container needs-root
@@ -69,6 +74,11 @@ Depends: nginx-full,
          libnginx-mod-stream-geoip,
          libnginx-mod-stream-geoip2,
          libnginx-mod-stream,
+         libnginx-mod-http-set-misc,
+         libnginx-mod-http-brotli-filter,
+         libnginx-mod-http-brotli-static,
+         libnginx-mod-http-memc,
+         libnginx-mod-http-srcache-filter,
 
 Tests: light-module-deps
 Restrictions: allow-stderr isolation-container needs-root
@@ -95,6 +105,11 @@ Depends: nginx-light,
          libnginx-mod-stream-geoip,
          libnginx-mod-stream-geoip2,
          libnginx-mod-stream,
+         libnginx-mod-http-set-misc,
+         libnginx-mod-http-brotli-filter,
+         libnginx-mod-http-brotli-static,
+         libnginx-mod-http-memc,
+         libnginx-mod-http-srcache-filter,
 
 Tests: extras-module-deps
 Restrictions: allow-stderr isolation-container needs-root
@@ -121,6 +136,11 @@ Depends: nginx-extras,
          libnginx-mod-stream-geoip,
          libnginx-mod-stream-geoip2,
          libnginx-mod-stream,
+         libnginx-mod-http-set-misc,
+         libnginx-mod-http-brotli-filter,
+         libnginx-mod-http-brotli-static,
+         libnginx-mod-http-memc,
+         libnginx-mod-http-srcache-filter,
 
 Tests: reboot
 Restrictions: isolation-container, needs-root, needs-reboot

From 11ca3f56935f8df84ffa9ca2618d16daed378f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 8 Dec 2022 11:12:34 +0100
Subject: [PATCH 454/600] remove modules ndk,nchan,rtmp

---
 debian/changelog                           |  4 ++
 debian/control                             | 60 +--------------------
 debian/copyright                           | 62 ----------------------
 debian/libnginx-mod-http-ndk-dev.install   |  5 --
 debian/libnginx-mod-http-ndk.nginx         |  2 -
 debian/libnginx-mod-nchan.nginx            | 13 -----
 debian/libnginx-mod-rtmp.docs              |  1 -
 debian/libnginx-mod-rtmp.examples          |  1 -
 debian/libnginx-mod-rtmp.nginx             | 13 -----
 debian/libnginx-mod.conf/mod-http-lua.conf |  1 -
 debian/libnginx-mod.conf/mod-http-ndk.conf |  1 -
 debian/libnginx-mod.conf/mod-nchan.conf    |  1 -
 debian/libnginx-mod.conf/mod-rtmp.conf     |  1 -
 debian/rules                               | 38 ++-----------
 14 files changed, 9 insertions(+), 194 deletions(-)
 delete mode 100644 debian/libnginx-mod-http-ndk-dev.install
 delete mode 100644 debian/libnginx-mod-http-ndk.nginx
 delete mode 100755 debian/libnginx-mod-nchan.nginx
 delete mode 100644 debian/libnginx-mod-rtmp.docs
 delete mode 100644 debian/libnginx-mod-rtmp.examples
 delete mode 100755 debian/libnginx-mod-rtmp.nginx
 delete mode 100644 debian/libnginx-mod.conf/mod-http-lua.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-ndk.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-nchan.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-rtmp.conf

diff --git a/debian/changelog b/debian/changelog
index dd4da4f..d2cc473 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ nginx (1.22.1-4) UNRELEASED; urgency=medium
     - added tests for new ext. module libnginx-mod-http-brotli-static
     - added tests for new ext. module libnginx-mod-http-memc
     - added tests for new ext. module libnginx-mod-http-srcache-filter
+  * removed 3th party modules and moved to separate packages:
+    - libnginx-mod-nchan module
+    - libnginx-mod-rtmp module
+    - libnginx-mod-http-ndk module
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 08 Dec 2022 09:47:06 +0100
 
diff --git a/debian/control b/debian/control
index a8f0c8d..8229516 100644
--- a/debian/control
+++ b/debian/control
@@ -213,7 +213,7 @@ Depends: libnginx-mod-http-auth-pam (>= ${binary:Version}),
          libnginx-mod-http-upstream-fair (>= ${binary:Version}),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
-         libnginx-mod-nchan (>= ${binary:Version}),
+         libnginx-mod-nchan (>= 1:1.3.5+dfsg-2~),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
          libnginx-mod-stream-geoip2 (>= ${binary:Version}),
@@ -361,50 +361,6 @@ Description: PAM authentication module for Nginx
  The module uses PAM as a backend for simple http authentication. It
  also allows setting the pam service name to allow more fine grained control.
 
-Package: libnginx-mod-http-ndk
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: Nginx Development Kit module
- The NDK is an Nginx module that is designed to extend the core functionality of
- the excellent Nginx webserver in a way that can be used as a basis of other
- Nginx modules.
- .
- It has functions and macros to deal with generic tasks that don't currently
- have generic code as part of the core distribution. The NDK itself adds few
- features that are seen from a user's point of view - it's just designed to help
- reduce the code that Nginx module developers need to write.
-
-Package: libnginx-mod-http-ndk-dev
-Architecture: all
-Depends: libnginx-mod-http-ndk (<< ${source:Version}.1~), libnginx-mod-http-ndk (>= ${source:Version}),
-         nginx-dev (>= ${source:Version}), nginx-dev (<< ${source:Version}.1~), ${misc:Depends}
-Description: Nginx Development Kit module - development files
- The NDK is an Nginx module that is designed to extend the core functionality of
- the excellent Nginx webserver in a way that can be used as a basis of other
- Nginx modules.
- .
- This package provides development headers and necessary config scripts
- for the Nginx development kit module, useful to develop and link third party
- additions to the Debian nginx web/proxy server packages using Nginx
- development kit module.
- .
- Development files.
-
-Package: libnginx-mod-nchan
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: Fast, flexible pub/sub server for Nginx
- Nchan is a scalable, flexible pub/sub server for the modern web, It can be
- configured as a standalone server, or as a shim between your application and
- tens, thousands, or millions of live subscribers. It can buffer messages in
- memory, on-disk, or via Redis. All connections are handled asynchronously and
- distributed among any number of worker processes. It can also scale to many
- nginx server instances with Redis.
- .
- Full documentation available at https://nchan.slact.net
-
 Package: libnginx-mod-http-echo
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
@@ -498,17 +454,3 @@ Description: WebDAV missing commands support for Nginx
  .
  WebDAV Ext provides the missing PROPFIND & OPTIONS methods.
 
-Package: libnginx-mod-rtmp
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: RTMP support for Nginx
- The nginx RTMP module is a fully-featured streaming solution implemented in
- nginx.
- .
- It provides the following features:
-  - Live streaming with RTMP, HLS and MPEG-DASH;
-  - RTMP Video on Demand from local or HTTP sources;
-  - Stream relay support via a push or pull model;
-  - Integrated stream recording;
-  - and more.
diff --git a/debian/copyright b/debian/copyright
index 2aabc8d..713892f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -61,21 +61,6 @@ Files: debian/modules/http-geoip2/*
 Copyright: 2014, Lee Valentine <lee@leev.net>
 License: BSD-2-clause
 
-Files: debian/modules/http-ndk/*
-Copyright: 2010-2018, Marcus Clyne
-License: BSD-3-clause
-
-Files: debian/modules/http-ndk/src/hash/md5.h
-       debian/modules/http-ndk/src/hash/sha.h
-Copyright: 1995-1998, Eric Young <eay@cryptsoft.com>
-License: BSD-4-clause
-
-Files: debian/modules/http-ndk/src/hash/murmurhash2.c
-Copyright: Austin Appleby
-License: public-domain
- All MurmurHash versions are public domain software, and the author
- disclaims all copyright to their code.
-
 Files: debian/modules/http-auth-pam/*
 Copyright: 2008-2020, Sergio Talens Oliag
 License: BSD-2-clause
@@ -89,24 +74,6 @@ Copyright: 2007, Grzegorz Nosek
                  Igor Sysoev
 License: BSD-2-clause
 
-Files: debian/modules/nchan/*
-Copyright: 2009-2016, Leo Ponomarev (slact)
-           2014,      Wandenberg Peixoto
-                      Alexander Lyalin
-                      Rogério Carvalho Schneider <stockrt@gmail.com>
-License: Expat
-
-Files: debian/modules/nchan/src/store/redis/hiredis/*
-Copyright: 2006-2014, Salvatore Sanfilippo <antirez@gmail.com>
-           2010-2011, Pieter Noordhuis <pcnoordhuis@gmail.com>
-           2015,      Matt Stancliff <matt@genges.com>
-                      Jan-Erik Rediger <janerik.fnordig.com>
-License: BSD-3-clause
-
-Files: debian/modules/nchan/src/store/redis/cmp.*
-Copyright: 2017, Charles Gunyon
-License: Expat
-
 Files: debian/modules/http-uploadprogress/*
 Copyright: 2007, Brice Figureau
            2002-2007, Igor Sysoev
@@ -135,10 +102,6 @@ Copyright: 2009-2011, Taobao Inc., Alibaba Group
                       agentzh (章亦春) "<agentzh@gmail.com>"
 License: BSD-3-clause
 
-Files: debian/modules/rtmp/*
-Copyright: 2012-2014, Roman Arutyunyan
-License: BSD-2-clause
-
 License: BSD-2-clause
  All rights reserved.
  .
@@ -191,31 +154,6 @@ License: BSD-3-clause
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-4-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 4. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to
diff --git a/debian/libnginx-mod-http-ndk-dev.install b/debian/libnginx-mod-http-ndk-dev.install
deleted file mode 100644
index 980066f..0000000
--- a/debian/libnginx-mod-http-ndk-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/build-ndksrc/auto usr/share/nginx-ndk/src/
-debian/build-ndksrc/src usr/share/nginx-ndk/src/
-debian/build-ndksrc/objs usr/share/nginx-ndk/src/
-debian/build-ndksrc/config usr/share/nginx-ndk/src/
-debian/build-ndksrc/ngx_auto_lib_core usr/share/nginx-ndk/src/
\ No newline at end of file
diff --git a/debian/libnginx-mod-http-ndk.nginx b/debian/libnginx-mod-http-ndk.nginx
deleted file mode 100644
index 562723b..0000000
--- a/debian/libnginx-mod-http-ndk.nginx
+++ /dev/null
@@ -1,2 +0,0 @@
-mod debian/build-extras/objs/ndk_http_module.so
-mod debian/libnginx-mod.conf/mod-http-ndk.conf 10
diff --git a/debian/libnginx-mod-nchan.nginx b/debian/libnginx-mod-nchan.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-nchan.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-rtmp.docs b/debian/libnginx-mod-rtmp.docs
deleted file mode 100644
index e5c5c00..0000000
--- a/debian/libnginx-mod-rtmp.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/modules/rtmp/README.md
diff --git a/debian/libnginx-mod-rtmp.examples b/debian/libnginx-mod-rtmp.examples
deleted file mode 100644
index 563f038..0000000
--- a/debian/libnginx-mod-rtmp.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/modules/rtmp/stat.xsl
diff --git a/debian/libnginx-mod-rtmp.nginx b/debian/libnginx-mod-rtmp.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-rtmp.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod.conf/mod-http-lua.conf b/debian/libnginx-mod.conf/mod-http-lua.conf
deleted file mode 100644
index f6311f4..0000000
--- a/debian/libnginx-mod.conf/mod-http-lua.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_lua_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-ndk.conf b/debian/libnginx-mod.conf/mod-http-ndk.conf
deleted file mode 100644
index 3908af6..0000000
--- a/debian/libnginx-mod.conf/mod-http-ndk.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ndk_http_module.so;
diff --git a/debian/libnginx-mod.conf/mod-nchan.conf b/debian/libnginx-mod.conf/mod-nchan.conf
deleted file mode 100644
index 0a524e5..0000000
--- a/debian/libnginx-mod.conf/mod-nchan.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_nchan_module.so;
diff --git a/debian/libnginx-mod.conf/mod-rtmp.conf b/debian/libnginx-mod.conf/mod-rtmp.conf
deleted file mode 100644
index 4e87e6e..0000000
--- a/debian/libnginx-mod.conf/mod-rtmp.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_rtmp_module.so;
diff --git a/debian/rules b/debian/rules
index f2fd124..5369e83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,22 +16,19 @@ DYN_MODS := \
 	http-geoip2 \
 	http-headers-more-filter \
 	http-image-filter \
-	http-ndk \
 	http-perl \
 	http-subs-filter \
 	http-uploadprogress \
 	http-upstream-fair \
 	http-xslt-filter \
 	mail \
-	nchan \
-	rtmp \
 	stream \
 	stream-geoip \
 	stream-geoip2
 
 MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
-$(foreach flavour,$(FLAVOURS) src ndksrc,$(eval BUILDDIR_$(flavour) = $(CURDIR)/debian/build-$(flavour)))
+$(foreach flavour,$(FLAVOURS) src ,$(eval BUILDDIR_$(flavour) = $(CURDIR)/debian/build-$(flavour)))
 
 DEB_BUILD_ARCH ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifeq ($(DEB_BUILD_ARCH),sparc)
@@ -120,12 +117,9 @@ extras_configure_flags := \
 			--add-dynamic-module=$(MODULESDIR)/http-auth-pam \
 			--add-dynamic-module=$(MODULESDIR)/http-cache-purge \
 			--add-dynamic-module=$(MODULESDIR)/http-dav-ext \
-			--add-dynamic-module=$(MODULESDIR)/http-ndk \
 			--add-dynamic-module=$(MODULESDIR)/http-echo \
 			--add-dynamic-module=$(MODULESDIR)/http-fancyindex \
 			--add-dynamic-module=$(MODULESDIR)/http-geoip2 \
-			--add-dynamic-module=$(MODULESDIR)/nchan \
-			--add-dynamic-module=$(MODULESDIR)/rtmp \
 			--add-dynamic-module=$(MODULESDIR)/http-uploadprogress \
 			--add-dynamic-module=$(MODULESDIR)/http-upstream-fair \
 			--add-dynamic-module=$(MODULESDIR)/http-subs-filter
@@ -133,10 +127,10 @@ extras_configure_flags := \
 %:
 	dh $@ --without autoreconf
 
-override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour)) config.src config.ndksrc
-override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour)) build.src build.ndksrc
+override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour)) config.src
+override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour)) build.src
 override_dh_strip:          $(foreach flavour,$(FLAVOURS),strip.arch.$(flavour)) $(foreach mod,$(DYN_MODS),strip.mods.$(mod))
-override_dh_clean:          clean_patch_modules $(foreach flavour,$(FLAVOURS),clean.$(flavour)) clean.src clean.ndksrc
+override_dh_clean:          clean_patch_modules $(foreach flavour,$(FLAVOURS),clean.$(flavour)) clean.src
 	dh_clean
 
 override_dh_install:
@@ -163,16 +157,6 @@ build.src:
 	echo "NGX_CONF_FLAGS=(" $(basic_configure_flags) ")" > $(BUILDDIR_src)/conf_flags
 	pod2man debian/debhelper/dh_nginx > $(BUILDDIR_src)/dh_nginx.1
 
-build.ndksrc:
-	cp -Pa $(CURDIR)/debian/modules/http-ndk/auto \
-	       $(CURDIR)/debian/modules/http-ndk/config \
-		   $(CURDIR)/debian/modules/http-ndk/ngx_auto_lib_core $(BUILDDIR_ndksrc)/
-	for i in src objs; do \
-	  find $(CURDIR)/debian/modules/http-ndk/$$i -type f -name '*.h' -printf "$$i/%P\0" | \
-	    tar -C $(CURDIR)/debian/modules/http-ndk --null --files-from - -c | tar -C $(BUILDDIR_ndksrc)/ -x; \
-	done
-	chmod +x $(CURDIR)/debian/build-ndksrc/auto/build
-
 strip.arch.%:
 	dh_strip --package=nginx-$(*) -O--dbgsym-migration='nginx-$(*)-dbg (<< 1.10.1-3~)'
 
@@ -200,25 +184,11 @@ config.arch.%:
 	cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/man $(BUILDDIR_$*)/
 	cd $(BUILDDIR_$*) && ./configure $($*_configure_flags)
-	if [ "$(BUILDDIR_$*)" = "$(BUILDDIR_extras)" ]; then \
-	  for have in NDK_SET_VAR NDK_UPSTREAM_LIST; do \
-	    ( \
-	      echo "#ifndef $$have"; \
-	      echo "#define $$have 1"; \
-	      echo "#endif"; \
-	      echo; \
-	    ) >> $(BUILDDIR_$*)/objs/ngx_auto_config.h; \
-	  done \
-	fi
 
 config.src:
 	dh_testdir
 	mkdir -p $(BUILDDIR_src)
 
-config.ndksrc:
-	dh_testdir
-	mkdir -p $(BUILDDIR_ndksrc)
-
 clean.%:
 	rm -rf $(BUILDDIR_$*)
 

From 075c5d85db87e83a024ab6fba5bfd0c6566c6252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 8 Dec 2022 13:03:18 +0100
Subject: [PATCH 455/600] d/control fix whitespace

---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 8229516..7415b24 100644
--- a/debian/control
+++ b/debian/control
@@ -453,4 +453,3 @@ Description: WebDAV missing commands support for Nginx
  WebDAV support.
  .
  WebDAV Ext provides the missing PROPFIND & OPTIONS methods.
-

From 4fa26185022dc12c9db3478c76e2846759eb4f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 8 Dec 2022 13:39:15 +0100
Subject: [PATCH 456/600] remove modules ndk,nchan,rtmp

---
 debian/modules/control                        |   22 -
 debian/modules/http-ndk/LICENSE               |   13 -
 debian/modules/http-ndk/README.md             |  254 -
 debian/modules/http-ndk/README_AUTO_LIB.md    |  394 --
 debian/modules/http-ndk/auto/actions/array    |   10 -
 debian/modules/http-ndk/auto/actions/palloc   |    8 -
 debian/modules/http-ndk/auto/build            |  597 --
 .../http-ndk/auto/data/action_replacements    |    5 -
 .../modules/http-ndk/auto/data/action_types   |   12 -
 debian/modules/http-ndk/auto/data/conf_args   |   22 -
 debian/modules/http-ndk/auto/data/conf_locs   |   25 -
 debian/modules/http-ndk/auto/data/conf_macros |   35 -
 debian/modules/http-ndk/auto/data/contexts    |   22 -
 .../modules/http-ndk/auto/data/header_files   |    3 -
 debian/modules/http-ndk/auto/data/headers     |    4 -
 .../http-ndk/auto/data/module_dependencies    |    5 -
 .../http-ndk/auto/data/modules_optional       |   15 -
 debian/modules/http-ndk/auto/data/prefixes    |    2 -
 debian/modules/http-ndk/auto/src/array.h      |    7 -
 .../http-ndk/auto/src/conf_cmd_basic.h        |   43 -
 debian/modules/http-ndk/auto/src/conf_merge.h |   78 -
 debian/modules/http-ndk/auto/src/palloc.h     |    6 -
 debian/modules/http-ndk/auto/text/autogen     |   12 -
 debian/modules/http-ndk/config                |   65 -
 .../modules/http-ndk/docs/core/action_macros  |   63 -
 debian/modules/http-ndk/docs/core/conf_cmds   |   62 -
 debian/modules/http-ndk/docs/modules/set_var  |  124 -
 .../http-ndk/docs/patches/more_logging_info   |   48 -
 debian/modules/http-ndk/docs/upstream/list    |   45 -
 debian/modules/http-ndk/examples/README       |   12 -
 .../http-ndk/examples/http/set_var/config     |    4 -
 .../ngx_http_set_var_examples_module.c        |  136 -
 debian/modules/http-ndk/ngx_auto_lib_core     |  797 ---
 debian/modules/http-ndk/notes/CHANGES         |   17 -
 debian/modules/http-ndk/notes/LICENSE         |   24 -
 debian/modules/http-ndk/objs/ndk_array.h      |  113 -
 .../http-ndk/objs/ndk_conf_cmd_basic.h        | 2203 -------
 .../http-ndk/objs/ndk_conf_cmd_extra.h        | 5423 -----------------
 debian/modules/http-ndk/objs/ndk_conf_merge.h |  227 -
 debian/modules/http-ndk/objs/ndk_config.c     |   72 -
 debian/modules/http-ndk/objs/ndk_config.h     |   98 -
 debian/modules/http-ndk/objs/ndk_includes.h   |   66 -
 debian/modules/http-ndk/objs/ndk_palloc.h     |  112 -
 debian/modules/http-ndk/patches/auto_config   |   16 -
 .../http-ndk/patches/expose_rewrite_functions |  291 -
 .../http-ndk/patches/rewrite_phase_handler    |   19 -
 debian/modules/http-ndk/src/hash/md5.h        |  117 -
 .../modules/http-ndk/src/hash/murmurhash2.c   |   77 -
 debian/modules/http-ndk/src/hash/sha.h        |  200 -
 debian/modules/http-ndk/src/ndk.c             |  155 -
 debian/modules/http-ndk/src/ndk.h             |   58 -
 debian/modules/http-ndk/src/ndk_buf.c         |   43 -
 debian/modules/http-ndk/src/ndk_buf.h         |    5 -
 .../modules/http-ndk/src/ndk_complex_path.c   |  129 -
 .../modules/http-ndk/src/ndk_complex_path.h   |   30 -
 .../modules/http-ndk/src/ndk_complex_value.c  |  192 -
 .../modules/http-ndk/src/ndk_complex_value.h  |   21 -
 debian/modules/http-ndk/src/ndk_conf_file.c   |  396 --
 debian/modules/http-ndk/src/ndk_conf_file.h   |   44 -
 debian/modules/http-ndk/src/ndk_debug.c       |   72 -
 debian/modules/http-ndk/src/ndk_debug.h       |  171 -
 debian/modules/http-ndk/src/ndk_encoding.c    |   57 -
 debian/modules/http-ndk/src/ndk_encoding.h    |   12 -
 debian/modules/http-ndk/src/ndk_hash.c        |   82 -
 debian/modules/http-ndk/src/ndk_hash.h        |   45 -
 debian/modules/http-ndk/src/ndk_http.c        |  138 -
 debian/modules/http-ndk/src/ndk_http.h        |    3 -
 .../modules/http-ndk/src/ndk_http_headers.h   |   35 -
 debian/modules/http-ndk/src/ndk_log.c         |    3 -
 debian/modules/http-ndk/src/ndk_log.h         |  165 -
 debian/modules/http-ndk/src/ndk_parse.h       |   67 -
 debian/modules/http-ndk/src/ndk_path.c        |  583 --
 debian/modules/http-ndk/src/ndk_path.h        |   22 -
 debian/modules/http-ndk/src/ndk_process.c     |   20 -
 debian/modules/http-ndk/src/ndk_process.h     |   12 -
 debian/modules/http-ndk/src/ndk_regex.c       |  215 -
 debian/modules/http-ndk/src/ndk_regex.h       |    7 -
 debian/modules/http-ndk/src/ndk_rewrite.c     |  103 -
 debian/modules/http-ndk/src/ndk_rewrite.h     |   26 -
 debian/modules/http-ndk/src/ndk_set_var.c     |  602 --
 debian/modules/http-ndk/src/ndk_set_var.h     |   44 -
 debian/modules/http-ndk/src/ndk_string.c      |  434 --
 debian/modules/http-ndk/src/ndk_string.h      |   37 -
 debian/modules/http-ndk/src/ndk_string_util.h |   14 -
 .../modules/http-ndk/src/ndk_upstream_list.c  |  205 -
 .../modules/http-ndk/src/ndk_upstream_list.h  |   27 -
 debian/modules/http-ndk/src/ndk_uri.c         |   45 -
 debian/modules/http-ndk/src/ndk_uri.h         |    6 -
 debian/modules/nchan/LICENCE                  |   24 -
 debian/modules/nchan/README.md                | 1552 -----
 debian/modules/nchan/changelog.txt            |  541 --
 debian/modules/nchan/cloc-exclude.txt         |   16 -
 debian/modules/nchan/config                   |  166 -
 debian/modules/nchan/src/nchan_commands.rb    |  933 ---
 .../modules/nchan/src/nchan_config_commands.c | 1302 ----
 debian/modules/nchan/src/nchan_defs.c         |   98 -
 debian/modules/nchan/src/nchan_defs.h         |  117 -
 debian/modules/nchan/src/nchan_module.c       | 1265 ----
 debian/modules/nchan/src/nchan_module.h       |   70 -
 debian/modules/nchan/src/nchan_setup.c        | 1615 -----
 debian/modules/nchan/src/nchan_types.h        |  532 --
 debian/modules/nchan/src/nchan_variables.c    |  281 -
 debian/modules/nchan/src/nchan_variables.h    |    1 -
 debian/modules/nchan/src/nchan_version.h      |    1 -
 .../nchan/src/nchan_websocket_publisher.c     |   81 -
 .../nchan/src/nchan_websocket_publisher.h     |    2 -
 .../modules/nchan/src/store/memory/groups.c   |  570 --
 .../modules/nchan/src/store/memory/groups.h   |   55 -
 .../nchan/src/store/memory/ipc-handlers.c     | 1158 ----
 .../nchan/src/store/memory/ipc-handlers.h     |   26 -
 debian/modules/nchan/src/store/memory/ipc.c   |  553 --
 debian/modules/nchan/src/store/memory/ipc.h   |   64 -
 .../modules/nchan/src/store/memory/memstore.c | 3544 -----------
 .../modules/nchan/src/store/memory/recycloc.c |   47 -
 .../nchan/src/store/memory/store-private.h    |  179 -
 debian/modules/nchan/src/store/memory/store.h |   13 -
 debian/modules/nchan/src/store/ngx_rwlock.c   |  178 -
 debian/modules/nchan/src/store/ngx_rwlock.h   |    5 -
 debian/modules/nchan/src/store/redis/cmp.c    | 3352 ----------
 debian/modules/nchan/src/store/redis/cmp.h    |  526 --
 .../nchan/src/store/redis/hiredis/.travis.yml |  131 -
 .../src/store/redis/hiredis/CHANGELOG.md      |  364 --
 .../nchan/src/store/redis/hiredis/COPYING     |   29 -
 .../nchan/src/store/redis/hiredis/Makefile    |  308 -
 .../nchan/src/store/redis/hiredis/README.md   |  664 --
 .../nchan/src/store/redis/hiredis/alloc.c     |   86 -
 .../nchan/src/store/redis/hiredis/alloc.h     |   91 -
 .../nchan/src/store/redis/hiredis/async.c     |  887 ---
 .../nchan/src/store/redis/hiredis/async.h     |  147 -
 .../src/store/redis/hiredis/async_private.h   |   75 -
 .../nchan/src/store/redis/hiredis/dict.c      |  357 --
 .../nchan/src/store/redis/hiredis/dict.h      |  126 -
 .../nchan/src/store/redis/hiredis/fmacros.h   |   12 -
 .../nchan/src/store/redis/hiredis/hiredis.c   | 1174 ----
 .../nchan/src/store/redis/hiredis/hiredis.h   |  339 --
 .../src/store/redis/hiredis/hiredis_ssl.h     |  127 -
 .../nchan/src/store/redis/hiredis/net.c       |  615 --
 .../nchan/src/store/redis/hiredis/net.h       |   56 -
 .../nchan/src/store/redis/hiredis/read.c      |  739 ---
 .../nchan/src/store/redis/hiredis/read.h      |  129 -
 .../nchan/src/store/redis/hiredis/sds.c       | 1294 ----
 .../nchan/src/store/redis/hiredis/sds.h       |  278 -
 .../nchan/src/store/redis/hiredis/sdsalloc.h  |   44 -
 .../src/store/redis/hiredis/sockcompat.c      |  248 -
 .../src/store/redis/hiredis/sockcompat.h      |   92 -
 .../nchan/src/store/redis/hiredis/ssl.c       |  526 --
 .../nchan/src/store/redis/hiredis/test.c      | 1387 -----
 .../nchan/src/store/redis/hiredis/win32.h     |   56 -
 .../modules/nchan/src/store/redis/rdsstore.c  | 2648 --------
 .../src/store/redis/redis-lua-scripts/Gemfile |   11 -
 .../redis/redis-lua-scripts/add_fakesub.lua   |   34 -
 .../redis-lua-scripts/channel_keepalive.lua   |   35 -
 .../store/redis/redis-lua-scripts/delete.lua  |   68 -
 .../redis/redis-lua-scripts/find_channel.lua  |   70 -
 .../redis/redis-lua-scripts/get_message.lua   |  155 -
 .../get_message_from_key.lua                  |    8 -
 .../get_subscriber_info_id.lua                |   18 -
 .../store/redis/redis-lua-scripts/publish.lua |  287 -
 .../redis-lua-scripts/publish_status.lua      |   26 -
 .../request_subscriber_info.lua               |   15 -
 .../store/redis/redis-lua-scripts/rsck.lua    |  216 -
 .../redis-lua-scripts/subscriber_register.lua |   62 -
 .../subscriber_unregister.lua                 |   49 -
 .../redis/redis-lua-scripts/testscripts.rb    |  269 -
 .../src/store/redis/redis_lua_commands.c      | 1073 ----
 .../src/store/redis/redis_lua_commands.h      |   80 -
 .../src/store/redis/redis_nginx_adapter.c     |  165 -
 .../src/store/redis/redis_nginx_adapter.h     |   22 -
 .../nchan/src/store/redis/redis_nodeset.c     | 2678 --------
 .../nchan/src/store/redis/redis_nodeset.h     |  305 -
 .../src/store/redis/redis_nodeset_parser.c    |  241 -
 .../src/store/redis/redis_nodeset_parser.h    |   40 -
 .../redis/scripts/get_unique_request_id.lua   |    1 -
 .../nchan/src/store/redis/store-private.h     |  111 -
 debian/modules/nchan/src/store/redis/store.h  |   22 -
 debian/modules/nchan/src/store/spool.c        | 1302 ----
 debian/modules/nchan/src/store/spool.h        |  117 -
 debian/modules/nchan/src/store/store_common.c |    7 -
 debian/modules/nchan/src/store/store_common.h |   12 -
 .../modules/nchan/src/subscribers/benchmark.c |   72 -
 .../modules/nchan/src/subscribers/benchmark.h |    3 -
 debian/modules/nchan/src/subscribers/common.c |  456 --
 debian/modules/nchan/src/subscribers/common.h |   27 -
 .../nchan/src/subscribers/eventsource.c       |  413 --
 .../nchan/src/subscribers/eventsource.h       |    4 -
 .../nchan/src/subscribers/getmsg_proxy.c      |  106 -
 .../nchan/src/subscribers/getmsg_proxy.h      |    1 -
 .../nchan/src/subscribers/http-chunked.c      |  258 -
 .../nchan/src/subscribers/http-chunked.h      |    4 -
 .../src/subscribers/http-multipart-mixed.c    |  290 -
 .../src/subscribers/http-multipart-mixed.h    |    3 -
 .../nchan/src/subscribers/http-raw-stream.c   |  156 -
 .../nchan/src/subscribers/http-raw-stream.h   |    1 -
 .../modules/nchan/src/subscribers/internal.c  |  298 -
 .../modules/nchan/src/subscribers/internal.h  |   32 -
 .../nchan/src/subscribers/intervalpoll.c      |   32 -
 .../nchan/src/subscribers/intervalpoll.h      |    1 -
 .../nchan/src/subscribers/longpoll-private.h  |   38 -
 .../modules/nchan/src/subscribers/longpoll.c  |  550 --
 .../modules/nchan/src/subscribers/longpoll.h  |    2 -
 .../nchan/src/subscribers/memstore_ipc.c      |  197 -
 .../nchan/src/subscribers/memstore_ipc.h      |    5 -
 .../nchan/src/subscribers/memstore_multi.c    |  175 -
 .../nchan/src/subscribers/memstore_multi.h    |    2 -
 .../nchan/src/subscribers/memstore_redis.c    |  261 -
 .../nchan/src/subscribers/memstore_redis.h    |    3 -
 .../modules/nchan/src/subscribers/websocket.c | 2066 -------
 .../modules/nchan/src/subscribers/websocket.h |    5 -
 debian/modules/nchan/src/uthash.h             | 1208 ----
 debian/modules/nchan/src/util/hdr_histogram.c | 1015 ---
 debian/modules/nchan/src/util/hdr_histogram.h |  427 --
 .../modules/nchan/src/util/nchan_benchmark.c  |  804 ---
 .../modules/nchan/src/util/nchan_benchmark.h  |   91 -
 .../nchan/src/util/nchan_bufchainpool.c       |  237 -
 .../nchan/src/util/nchan_bufchainpool.h       |   56 -
 .../modules/nchan/src/util/nchan_channel_id.c |  316 -
 .../modules/nchan/src/util/nchan_channel_id.h |    6 -
 debian/modules/nchan/src/util/nchan_debug.c   |   81 -
 debian/modules/nchan/src/util/nchan_debug.h   |   13 -
 .../nchan/src/util/nchan_fake_request.c       |  524 --
 .../nchan/src/util/nchan_fake_request.h       |   58 -
 debian/modules/nchan/src/util/nchan_list.c    |  172 -
 debian/modules/nchan/src/util/nchan_list.h    |   52 -
 debian/modules/nchan/src/util/nchan_msg.c     |  773 ---
 debian/modules/nchan/src/util/nchan_msg.h     |   35 -
 debian/modules/nchan/src/util/nchan_output.c  |  670 --
 debian/modules/nchan/src/util/nchan_output.h  |   30 -
 .../nchan/src/util/nchan_output_info.c        |  284 -
 .../nchan/src/util/nchan_output_info.h        |    6 -
 debian/modules/nchan/src/util/nchan_rbtree.c  |  379 --
 debian/modules/nchan/src/util/nchan_rbtree.h  |   64 -
 debian/modules/nchan/src/util/nchan_reaper.c  |  320 -
 debian/modules/nchan/src/util/nchan_reaper.h  |   33 -
 .../nchan/src/util/nchan_reuse_queue.c        |  151 -
 .../nchan/src/util/nchan_reuse_queue.h        |   24 -
 debian/modules/nchan/src/util/nchan_slist.c   |  164 -
 debian/modules/nchan/src/util/nchan_slist.h   |   41 -
 .../modules/nchan/src/util/nchan_subrequest.c |  324 -
 .../modules/nchan/src/util/nchan_subrequest.h |    6 -
 .../modules/nchan/src/util/nchan_thingcache.c |  208 -
 .../modules/nchan/src/util/nchan_thingcache.h |    4 -
 debian/modules/nchan/src/util/nchan_util.c    | 1273 ----
 debian/modules/nchan/src/util/nchan_util.h    |   80 -
 .../nchan/src/util/ngx_nchan_hacked_slab.c    |  770 ---
 .../nchan/src/util/ngx_nchan_hacked_slab.h    |   26 -
 debian/modules/nchan/src/util/shmem.c         |  223 -
 debian/modules/nchan/src/util/shmem.h         |   33 -
 debian/modules/rtmp/AUTHORS                   |    8 -
 debian/modules/rtmp/LICENSE                   |   22 -
 debian/modules/rtmp/README.md                 |  332 -
 debian/modules/rtmp/config                    |  133 -
 .../modules/rtmp/dash/ngx_rtmp_dash_module.c  | 1531 -----
 debian/modules/rtmp/dash/ngx_rtmp_mp4.c       | 1167 ----
 debian/modules/rtmp/dash/ngx_rtmp_mp4.h       |   52 -
 debian/modules/rtmp/doc/README.md             |    2 -
 debian/modules/rtmp/hls/ngx_rtmp_hls_module.c | 2459 --------
 debian/modules/rtmp/hls/ngx_rtmp_mpegts.c     |  399 --
 debian/modules/rtmp/hls/ngx_rtmp_mpegts.h     |   46 -
 debian/modules/rtmp/ngx_rtmp.c                |  861 ---
 debian/modules/rtmp/ngx_rtmp.h                |  624 --
 debian/modules/rtmp/ngx_rtmp_access_module.c  |  471 --
 debian/modules/rtmp/ngx_rtmp_amf.c            |  648 --
 debian/modules/rtmp/ngx_rtmp_amf.h            |   71 -
 .../modules/rtmp/ngx_rtmp_auto_push_module.c  |  578 --
 debian/modules/rtmp/ngx_rtmp_bandwidth.c      |   26 -
 debian/modules/rtmp/ngx_rtmp_bandwidth.h      |   31 -
 debian/modules/rtmp/ngx_rtmp_bitop.c          |   63 -
 debian/modules/rtmp/ngx_rtmp_bitop.h          |   46 -
 debian/modules/rtmp/ngx_rtmp_cmd_module.c     |  856 ---
 debian/modules/rtmp/ngx_rtmp_cmd_module.h     |  151 -
 debian/modules/rtmp/ngx_rtmp_codec_module.c   |  956 ---
 debian/modules/rtmp/ngx_rtmp_codec_module.h   |   87 -
 debian/modules/rtmp/ngx_rtmp_control_module.c |  732 ---
 debian/modules/rtmp/ngx_rtmp_core_module.c    |  755 ---
 debian/modules/rtmp/ngx_rtmp_eval.c           |  285 -
 debian/modules/rtmp/ngx_rtmp_eval.h           |   44 -
 debian/modules/rtmp/ngx_rtmp_exec_module.c    | 1604 -----
 debian/modules/rtmp/ngx_rtmp_flv_module.c     |  675 --
 debian/modules/rtmp/ngx_rtmp_handler.c        |  903 ---
 debian/modules/rtmp/ngx_rtmp_handshake.c      |  631 --
 debian/modules/rtmp/ngx_rtmp_init.c           |  331 -
 debian/modules/rtmp/ngx_rtmp_limit_module.c   |  205 -
 debian/modules/rtmp/ngx_rtmp_live_module.c    | 1153 ----
 debian/modules/rtmp/ngx_rtmp_live_module.h    |   83 -
 debian/modules/rtmp/ngx_rtmp_log_module.c     | 1016 ---
 debian/modules/rtmp/ngx_rtmp_mp4_module.c     | 2591 --------
 debian/modules/rtmp/ngx_rtmp_netcall_module.c |  725 ---
 debian/modules/rtmp/ngx_rtmp_netcall_module.h |   67 -
 debian/modules/rtmp/ngx_rtmp_notify_module.c  | 1730 ------
 debian/modules/rtmp/ngx_rtmp_play_module.c    | 1278 ----
 debian/modules/rtmp/ngx_rtmp_play_module.h    |   93 -
 debian/modules/rtmp/ngx_rtmp_proxy_protocol.c |  197 -
 debian/modules/rtmp/ngx_rtmp_proxy_protocol.h |   19 -
 debian/modules/rtmp/ngx_rtmp_receive.c        |  464 --
 debian/modules/rtmp/ngx_rtmp_record_module.c  | 1307 ----
 debian/modules/rtmp/ngx_rtmp_record_module.h  |   96 -
 debian/modules/rtmp/ngx_rtmp_relay_module.c   | 1690 -----
 debian/modules/rtmp/ngx_rtmp_relay_module.h   |   72 -
 debian/modules/rtmp/ngx_rtmp_send.c           |  635 --
 debian/modules/rtmp/ngx_rtmp_shared.c         |  126 -
 debian/modules/rtmp/ngx_rtmp_stat_module.c    |  863 ---
 debian/modules/rtmp/ngx_rtmp_streams.h        |   19 -
 debian/modules/rtmp/ngx_rtmp_version.h        |   15 -
 debian/modules/rtmp/stat.xsl                  |  355 --
 debian/modules/watch/http-ndk                 |    4 -
 debian/modules/watch/nchan                    |    4 -
 debian/modules/watch/rtmp                     |    4 -
 307 files changed, 104578 deletions(-)
 delete mode 100644 debian/modules/http-ndk/LICENSE
 delete mode 100644 debian/modules/http-ndk/README.md
 delete mode 100644 debian/modules/http-ndk/README_AUTO_LIB.md
 delete mode 100644 debian/modules/http-ndk/auto/actions/array
 delete mode 100644 debian/modules/http-ndk/auto/actions/palloc
 delete mode 100644 debian/modules/http-ndk/auto/build
 delete mode 100644 debian/modules/http-ndk/auto/data/action_replacements
 delete mode 100644 debian/modules/http-ndk/auto/data/action_types
 delete mode 100644 debian/modules/http-ndk/auto/data/conf_args
 delete mode 100644 debian/modules/http-ndk/auto/data/conf_locs
 delete mode 100644 debian/modules/http-ndk/auto/data/conf_macros
 delete mode 100644 debian/modules/http-ndk/auto/data/contexts
 delete mode 100644 debian/modules/http-ndk/auto/data/header_files
 delete mode 100644 debian/modules/http-ndk/auto/data/headers
 delete mode 100644 debian/modules/http-ndk/auto/data/module_dependencies
 delete mode 100644 debian/modules/http-ndk/auto/data/modules_optional
 delete mode 100644 debian/modules/http-ndk/auto/data/prefixes
 delete mode 100644 debian/modules/http-ndk/auto/src/array.h
 delete mode 100644 debian/modules/http-ndk/auto/src/conf_cmd_basic.h
 delete mode 100644 debian/modules/http-ndk/auto/src/conf_merge.h
 delete mode 100644 debian/modules/http-ndk/auto/src/palloc.h
 delete mode 100644 debian/modules/http-ndk/auto/text/autogen
 delete mode 100644 debian/modules/http-ndk/config
 delete mode 100644 debian/modules/http-ndk/docs/core/action_macros
 delete mode 100644 debian/modules/http-ndk/docs/core/conf_cmds
 delete mode 100644 debian/modules/http-ndk/docs/modules/set_var
 delete mode 100644 debian/modules/http-ndk/docs/patches/more_logging_info
 delete mode 100644 debian/modules/http-ndk/docs/upstream/list
 delete mode 100644 debian/modules/http-ndk/examples/README
 delete mode 100644 debian/modules/http-ndk/examples/http/set_var/config
 delete mode 100644 debian/modules/http-ndk/examples/http/set_var/ngx_http_set_var_examples_module.c
 delete mode 100644 debian/modules/http-ndk/ngx_auto_lib_core
 delete mode 100644 debian/modules/http-ndk/notes/CHANGES
 delete mode 100644 debian/modules/http-ndk/notes/LICENSE
 delete mode 100644 debian/modules/http-ndk/objs/ndk_array.h
 delete mode 100644 debian/modules/http-ndk/objs/ndk_conf_cmd_basic.h
 delete mode 100644 debian/modules/http-ndk/objs/ndk_conf_cmd_extra.h
 delete mode 100644 debian/modules/http-ndk/objs/ndk_conf_merge.h
 delete mode 100644 debian/modules/http-ndk/objs/ndk_config.c
 delete mode 100644 debian/modules/http-ndk/objs/ndk_config.h
 delete mode 100644 debian/modules/http-ndk/objs/ndk_includes.h
 delete mode 100644 debian/modules/http-ndk/objs/ndk_palloc.h
 delete mode 100644 debian/modules/http-ndk/patches/auto_config
 delete mode 100644 debian/modules/http-ndk/patches/expose_rewrite_functions
 delete mode 100644 debian/modules/http-ndk/patches/rewrite_phase_handler
 delete mode 100644 debian/modules/http-ndk/src/hash/md5.h
 delete mode 100644 debian/modules/http-ndk/src/hash/murmurhash2.c
 delete mode 100644 debian/modules/http-ndk/src/hash/sha.h
 delete mode 100644 debian/modules/http-ndk/src/ndk.c
 delete mode 100644 debian/modules/http-ndk/src/ndk.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_buf.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_buf.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_complex_path.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_complex_path.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_complex_value.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_complex_value.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_conf_file.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_conf_file.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_debug.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_debug.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_encoding.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_encoding.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_hash.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_hash.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_http.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_http.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_http_headers.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_log.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_log.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_parse.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_path.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_path.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_process.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_process.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_regex.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_regex.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_rewrite.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_rewrite.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_set_var.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_set_var.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_string.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_string.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_string_util.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_upstream_list.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_upstream_list.h
 delete mode 100644 debian/modules/http-ndk/src/ndk_uri.c
 delete mode 100644 debian/modules/http-ndk/src/ndk_uri.h
 delete mode 100644 debian/modules/nchan/LICENCE
 delete mode 100644 debian/modules/nchan/README.md
 delete mode 100644 debian/modules/nchan/changelog.txt
 delete mode 100644 debian/modules/nchan/cloc-exclude.txt
 delete mode 100644 debian/modules/nchan/config
 delete mode 100644 debian/modules/nchan/src/nchan_commands.rb
 delete mode 100644 debian/modules/nchan/src/nchan_config_commands.c
 delete mode 100644 debian/modules/nchan/src/nchan_defs.c
 delete mode 100644 debian/modules/nchan/src/nchan_defs.h
 delete mode 100644 debian/modules/nchan/src/nchan_module.c
 delete mode 100644 debian/modules/nchan/src/nchan_module.h
 delete mode 100644 debian/modules/nchan/src/nchan_setup.c
 delete mode 100644 debian/modules/nchan/src/nchan_types.h
 delete mode 100644 debian/modules/nchan/src/nchan_variables.c
 delete mode 100644 debian/modules/nchan/src/nchan_variables.h
 delete mode 100644 debian/modules/nchan/src/nchan_version.h
 delete mode 100644 debian/modules/nchan/src/nchan_websocket_publisher.c
 delete mode 100644 debian/modules/nchan/src/nchan_websocket_publisher.h
 delete mode 100644 debian/modules/nchan/src/store/memory/groups.c
 delete mode 100644 debian/modules/nchan/src/store/memory/groups.h
 delete mode 100644 debian/modules/nchan/src/store/memory/ipc-handlers.c
 delete mode 100644 debian/modules/nchan/src/store/memory/ipc-handlers.h
 delete mode 100755 debian/modules/nchan/src/store/memory/ipc.c
 delete mode 100755 debian/modules/nchan/src/store/memory/ipc.h
 delete mode 100755 debian/modules/nchan/src/store/memory/memstore.c
 delete mode 100644 debian/modules/nchan/src/store/memory/recycloc.c
 delete mode 100644 debian/modules/nchan/src/store/memory/store-private.h
 delete mode 100644 debian/modules/nchan/src/store/memory/store.h
 delete mode 100644 debian/modules/nchan/src/store/ngx_rwlock.c
 delete mode 100644 debian/modules/nchan/src/store/ngx_rwlock.h
 delete mode 100644 debian/modules/nchan/src/store/redis/cmp.c
 delete mode 100644 debian/modules/nchan/src/store/redis/cmp.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/.travis.yml
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/COPYING
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/Makefile
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/README.md
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/alloc.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/alloc.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/async.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/async.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/async_private.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/dict.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/dict.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/fmacros.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/hiredis.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/hiredis.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/hiredis_ssl.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/net.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/net.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/read.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/read.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/sds.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/sds.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/sdsalloc.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/sockcompat.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/sockcompat.h
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/ssl.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/test.c
 delete mode 100644 debian/modules/nchan/src/store/redis/hiredis/win32.h
 delete mode 100755 debian/modules/nchan/src/store/redis/rdsstore.c
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/Gemfile
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/add_fakesub.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/channel_keepalive.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/delete.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/find_channel.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message_from_key.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/publish.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/publish_status.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/request_subscriber_info.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/rsck.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_register.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
 delete mode 100755 debian/modules/nchan/src/store/redis/redis-lua-scripts/testscripts.rb
 delete mode 100644 debian/modules/nchan/src/store/redis/redis_lua_commands.c
 delete mode 100644 debian/modules/nchan/src/store/redis/redis_lua_commands.h
 delete mode 100644 debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
 delete mode 100644 debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
 delete mode 100644 debian/modules/nchan/src/store/redis/redis_nodeset.c
 delete mode 100644 debian/modules/nchan/src/store/redis/redis_nodeset.h
 delete mode 100644 debian/modules/nchan/src/store/redis/redis_nodeset_parser.c
 delete mode 100644 debian/modules/nchan/src/store/redis/redis_nodeset_parser.h
 delete mode 100644 debian/modules/nchan/src/store/redis/scripts/get_unique_request_id.lua
 delete mode 100644 debian/modules/nchan/src/store/redis/store-private.h
 delete mode 100755 debian/modules/nchan/src/store/redis/store.h
 delete mode 100755 debian/modules/nchan/src/store/spool.c
 delete mode 100644 debian/modules/nchan/src/store/spool.h
 delete mode 100644 debian/modules/nchan/src/store/store_common.c
 delete mode 100644 debian/modules/nchan/src/store/store_common.h
 delete mode 100644 debian/modules/nchan/src/subscribers/benchmark.c
 delete mode 100644 debian/modules/nchan/src/subscribers/benchmark.h
 delete mode 100644 debian/modules/nchan/src/subscribers/common.c
 delete mode 100644 debian/modules/nchan/src/subscribers/common.h
 delete mode 100644 debian/modules/nchan/src/subscribers/eventsource.c
 delete mode 100644 debian/modules/nchan/src/subscribers/eventsource.h
 delete mode 100644 debian/modules/nchan/src/subscribers/getmsg_proxy.c
 delete mode 100644 debian/modules/nchan/src/subscribers/getmsg_proxy.h
 delete mode 100644 debian/modules/nchan/src/subscribers/http-chunked.c
 delete mode 100644 debian/modules/nchan/src/subscribers/http-chunked.h
 delete mode 100644 debian/modules/nchan/src/subscribers/http-multipart-mixed.c
 delete mode 100644 debian/modules/nchan/src/subscribers/http-multipart-mixed.h
 delete mode 100644 debian/modules/nchan/src/subscribers/http-raw-stream.c
 delete mode 100644 debian/modules/nchan/src/subscribers/http-raw-stream.h
 delete mode 100644 debian/modules/nchan/src/subscribers/internal.c
 delete mode 100644 debian/modules/nchan/src/subscribers/internal.h
 delete mode 100644 debian/modules/nchan/src/subscribers/intervalpoll.c
 delete mode 100644 debian/modules/nchan/src/subscribers/intervalpoll.h
 delete mode 100644 debian/modules/nchan/src/subscribers/longpoll-private.h
 delete mode 100644 debian/modules/nchan/src/subscribers/longpoll.c
 delete mode 100644 debian/modules/nchan/src/subscribers/longpoll.h
 delete mode 100644 debian/modules/nchan/src/subscribers/memstore_ipc.c
 delete mode 100644 debian/modules/nchan/src/subscribers/memstore_ipc.h
 delete mode 100644 debian/modules/nchan/src/subscribers/memstore_multi.c
 delete mode 100644 debian/modules/nchan/src/subscribers/memstore_multi.h
 delete mode 100644 debian/modules/nchan/src/subscribers/memstore_redis.c
 delete mode 100644 debian/modules/nchan/src/subscribers/memstore_redis.h
 delete mode 100644 debian/modules/nchan/src/subscribers/websocket.c
 delete mode 100644 debian/modules/nchan/src/subscribers/websocket.h
 delete mode 100644 debian/modules/nchan/src/uthash.h
 delete mode 100644 debian/modules/nchan/src/util/hdr_histogram.c
 delete mode 100644 debian/modules/nchan/src/util/hdr_histogram.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_benchmark.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_benchmark.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_bufchainpool.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_bufchainpool.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_channel_id.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_channel_id.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_debug.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_debug.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_fake_request.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_fake_request.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_list.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_list.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_msg.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_msg.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_output.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_output.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_output_info.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_output_info.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_rbtree.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_rbtree.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_reaper.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_reaper.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_reuse_queue.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_reuse_queue.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_slist.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_slist.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_subrequest.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_subrequest.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_thingcache.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_thingcache.h
 delete mode 100644 debian/modules/nchan/src/util/nchan_util.c
 delete mode 100644 debian/modules/nchan/src/util/nchan_util.h
 delete mode 100644 debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
 delete mode 100644 debian/modules/nchan/src/util/ngx_nchan_hacked_slab.h
 delete mode 100644 debian/modules/nchan/src/util/shmem.c
 delete mode 100644 debian/modules/nchan/src/util/shmem.h
 delete mode 100644 debian/modules/rtmp/AUTHORS
 delete mode 100644 debian/modules/rtmp/LICENSE
 delete mode 100644 debian/modules/rtmp/README.md
 delete mode 100644 debian/modules/rtmp/config
 delete mode 100644 debian/modules/rtmp/dash/ngx_rtmp_dash_module.c
 delete mode 100644 debian/modules/rtmp/dash/ngx_rtmp_mp4.c
 delete mode 100644 debian/modules/rtmp/dash/ngx_rtmp_mp4.h
 delete mode 100644 debian/modules/rtmp/doc/README.md
 delete mode 100644 debian/modules/rtmp/hls/ngx_rtmp_hls_module.c
 delete mode 100644 debian/modules/rtmp/hls/ngx_rtmp_mpegts.c
 delete mode 100644 debian/modules/rtmp/hls/ngx_rtmp_mpegts.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_access_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_amf.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_amf.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_auto_push_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_bandwidth.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_bandwidth.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_bitop.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_bitop.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_cmd_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_cmd_module.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_codec_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_codec_module.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_control_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_core_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_eval.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_eval.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_exec_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_flv_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_handler.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_handshake.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_init.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_limit_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_live_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_live_module.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_log_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_mp4_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_netcall_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_netcall_module.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_notify_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_play_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_play_module.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_proxy_protocol.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_proxy_protocol.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_receive.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_record_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_record_module.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_relay_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_relay_module.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_send.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_shared.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_stat_module.c
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_streams.h
 delete mode 100644 debian/modules/rtmp/ngx_rtmp_version.h
 delete mode 100644 debian/modules/rtmp/stat.xsl
 delete mode 100644 debian/modules/watch/http-ndk
 delete mode 100644 debian/modules/watch/nchan
 delete mode 100644 debian/modules/watch/rtmp

diff --git a/debian/modules/control b/debian/modules/control
index b3e517e..7ff9851 100644
--- a/debian/modules/control
+++ b/debian/modules/control
@@ -3,10 +3,6 @@ Homepage: https://github.com/agentzh/headers-more-nginx-module
 Version: 0.33
 Files-Excluded: .gitignore .gitattributes .travis.yml
 
-Module: http-ndk
-Homepage: https://github.com/simpl/ngx_devel_kit/
-Version: 0.3.1
-
 Module: http-auth-pam
 Homepage: https://github.com/sto/ngx_http_auth_pam_module
 Version: 1.5.3
@@ -20,14 +16,6 @@ Module: http-geoip2
 Homepage: https://github.com/leev/ngx_http_geoip2_module
 Version: 3.3
 
-Module: http-lua
-Homepage: https://github.com/openresty/lua-nginx-module
-Version: v0.10.13
-Patch:
-  openssl-1.1.0.patch
-  discover-luajit-2.1.patch
-Files-Excluded: .gitignore .gitattributes .travis.yml .github
-
 Module: http-upstream-fair
 Homepage: https://github.com/gnosek/nginx-upstream-fair
 Version: a18b409
@@ -36,11 +24,6 @@ Patch:
   openssl-1.1.0.patch
   drop-default-port.patch
 
-Module: nchan
-Homepage: https://github.com/slact/nchan
-Version: 1.2.15
-Files-Excluded: dev nchan_logo.png NchanSubscriber.js src/hiredis nchan
-
 Module: http-uploadprogress
 Homepage: https://github.com/masterzen/nginx-upload-progress-module
 Files-Excluded: test
@@ -67,8 +50,3 @@ Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
 Version: 0.6.4
 Patch: dynamic-module.patch
 
-Module: rtmp
-Homepage: https://github.com/arut/nginx-rtmp-module
-Files-Excluded: test
-Version: 1.2.2
-
diff --git a/debian/modules/http-ndk/LICENSE b/debian/modules/http-ndk/LICENSE
deleted file mode 100644
index e1a5221..0000000
--- a/debian/modules/http-ndk/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2010-2018, Marcus Clyne
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/http-ndk/README.md b/debian/modules/http-ndk/README.md
deleted file mode 100644
index d9d3972..0000000
--- a/debian/modules/http-ndk/README.md
+++ /dev/null
@@ -1,254 +0,0 @@
-Name
-====
-
-Nginx Development Kit (NDK)
-
-Table of Contents
-=================
-
-* [Name](#name)
-* [Synopsis](#synopsis)
-* [Status](#status)
-* [Features](#features)
-* [Design](#design)
-    * [modular](#modular)
-    * [auto-generated & easily extensible](#auto-generated--easily-extensible)
-* [Usage for users](#usage-for-users)
-    * [Building as a dynamic module](#building-as-a-dynamic-module)
-* [Usage for developers](#usage-for-developers)
-    * [Warning: using NDK_ALL](#warning-using-ndk_all)
-* [Modules using NDK](#modules-using-ndk)
-* [TODO](#todo)
-* [License](#license)
-* [Contributing / Feedback](#contributing--feedback)
-* [Authors](#authors)
-* [Special Thanks](#special-thanks)
-
-Synopsis
-========
-
-The NDK is an Nginx module that is designed to extend the core functionality of the
-excellent Nginx webserver in a way that can be used as a basis of other Nginx modules.
-
-It has functions and macros to deal with generic tasks that don't currently have
-generic code as part of the core distribution.  The NDK itself adds few features
-that are seen from a user's point of view - it's just designed to help reduce the
-code that Nginx module developers need to write.
-
-Nginx module developers wishing to use any of the features in the NDK should specify
-that the NDK is a dependency of their module, and that users will need to compile
-it as well when they compile their own modules.  They will also need to declare in
-their own modules which features of the NDK they wish to use (explained below).
-
-If you are not an Nginx module developer, then the only useful part of this project
-will be the 'usage for users' section below.
-
-[Back to TOC](#table-of-contents)
-
-Status
-======
-
-The NDK is now considered to be stable. It is already being used in quite a few third
-party modules (see list below).
-
-[Back to TOC](#table-of-contents)
-
-Features
-========
-
-* additional conf_set functions for regexes, complex/script values, paths...
-* macros to simplify tasks like checking for NULL values when doing ngx_array_push
-* patches to the main source code
-* ngx_auto_lib_core generic external library handler is included (see separate readme)
-
-[Back to TOC](#table-of-contents)
-
-Design
-======
-
-modular
--------
-
-The kit itself is designed in a modular way, so that only the required code is compiled.
-It's possible to add just a single NDK module, a few or all of them.
-
-[Back to TOC](#table-of-contents)
-
-auto-generated & easily extensible
-----------------------------------
-
-Many of the macros available in the NDK are auto-generated from simple configuration
-files.  This makes creating similar macros for your own code very simple - it's usually
-just the case of adding an extra line to a config file and re-running the build script.
-
-[Back to TOC](#table-of-contents)
-
-Usage for users
-===============
-
-If another Nginx module you wish to use specifies that the NDK is a dependency, you
-will need to do the following :
-
-1. download the source (https://github.com/simpl/ngx_devel_kit)
-2. unpack the source (tar -xzf $name)
-3. compile Nginx with the following extra option `--add-module=/path/to/ngx_devel_kit`.
-
-e.g.
-
-```bash
-./configure --add-module=/path/to/ngx_devel_kit \
-            --add-module=/path/to/another/module
-```
-
-[Back to TOC](#table-of-contents)
-
-Building as a dynamic module
-----------------------------
-
-Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
-`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
-directive, for example,
-
-```nginx
-load_module /path/to/modules/ndk_http_module.so;
-load_module /path/to/another/module.so;
-```
-
-[Back to TOC](#table-of-contents)
-
-Usage for developers
-====================
-
-To use the NDK in your own module, you need to add the following:
-
-1. add this line to your module
-
-```C
-#include    <ndk.h>
-```
-
-Note: since the NDK includes the following lines
-
-```C
-#include    <ngx_config.h>
-#include    <ngx_core.h>
-#include    <ngx_http.h>
-```
-
-you can replace these with the single include above.
-2. add the following line in the config file for your module:
-
-```bash
-have=NDK_[module_name]  . auto/have
-```
-
-for each NDK module that you wish to use (you need to include auto/have multiple
-times if you wish to use multiple NDK modules.
-
-Note: the old method of setting
-
-```config
-CFLAGS="$CFLAGS -DNDK_[module_name]"
-```
-
-is now deprecated. It will still work, but results in unnecessary lines being
-displayed when compiling Nginx.
-
-[Back to TOC](#table-of-contents)
-
-Warning: Using NDK_ALL
-----------------------
-
-You can also set `NDK_ALL` to include all the NDK modules.  This is primarily as
-a convenience in the early stages of development of another module. However,
-
-DO NOT LEAVE `NDK_ALL` IN YOUR CONFIG FILE WHEN PUBLISHING
-
-Although the NDK is fairly small now, it could in time become a large repository
-of code that would, if using NDK_ALL, result in considerably more code being compiled
-than is necessary.
-
-[Back to TOC](#table-of-contents)
-
-Modules using NDK
-=================
-
-The following 3rd-party modules make use of NDK.
-
-* [ngx_http_lua_module](https://github.com/openresty/lua-nginx-module#readme)
-* [ngx_http_set_misc_module](https://github.com/openresty/set-misc-nginx-module#readme)
-* [ngx_http_encrypted_session_module](https://github.com/openresty/encrypted-session-nginx-module#readme)
-* [ngx_http_form_input_module](https://github.com/calio/form-input-nginx-module#readme)
-* [ngx_http_iconv_module](https://github.com/calio/iconv-nginx-module#readme)
-* [ngx_http_array_var_module](https://github.com/openresty/array-var-nginx-module#readme)
-
-If you would like to add your module to this list, please let us know.
-
-[Back to TOC](#table-of-contents)
-
-TODO
-====
-
-* documentation for modules that don't already have it
-* additional phase-handler functions
-* generically testing for needing to add a handler
-* remove dependency of set_var on OpenSSL being compiled in
-* for backward compatability, add the ndk_macros
-
-[Back to TOC](#table-of-contents)
-
-License
-=======
-
-Copyright (c) 2010-2018, Marcus Clyne
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of
-conditions and the following disclaimer in the documentation and/or other materials
-provided with the distribution.
-3. Neither the name of the copyright holder nor the names of its contributors may be used
-to endorse or promote products derived from this software without specific prior
-written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-[Back to TOC](#table-of-contents)
-
-Contributing / Feedback
-=======================
-
-If you are an Nginx module developer, and have developed some functions that are
-generic in nature (or would be easily adapted to be so), then please send them to
-me at the address below, and I'll addmclyne to the kit.
-
-[Back to TOC](#table-of-contents)
-
-Author
-======
-
-[Marcus Clyne](https://github.com/mclyne)
-
-[Back to TOC](#table-of-contents)
-
-
-Special Thanks
-==============
-
-A special thanks goes to [Yichun Zhang](https://github.com/agentzh) for helping to maintain
-this module.
-
-[Back to TOC](#table-of-contents)
diff --git a/debian/modules/http-ndk/README_AUTO_LIB.md b/debian/modules/http-ndk/README_AUTO_LIB.md
deleted file mode 100644
index f2c3371..0000000
--- a/debian/modules/http-ndk/README_AUTO_LIB.md
+++ /dev/null
@@ -1,394 +0,0 @@
-Nginx Auto Lib Core
-===================
-
-Nginx Auto Lib Core is a generic external library-handler that has been designed to
-facilitate the inclusion of external libraries in modules for the Nginx web server.
-It has been written both for the benefit of Nginx module developers and for the end
-users of those Nginx modules, and can provide a consistent, intelligent, flexible
-cross-platform way to include external libraries.
-
-Any developers of Nginx modules are encouraged to use Auto Lib Core to handle library
-dependencies for their modules rather than writing their own custom handler from scratch.
-
-Note : The latest version can be found [here](https://github.com/simplresty/ngx_auto_lib).
-
-
-Information for end users
-=========================
-
-To include external libraries using Auto Lib to you may need or wish to export some
-variables before you run configure. e.g.
-
-$ export MOZJS=/path/to/mozjs
-$ export MOZJS_SHARED=NO
-$ ./configure ...
-
-In all cases below [PFX] should be replaced with the name of the library (e.g. MOZJS). The
-specific value for [PFX] should be mentioned in the README file for the module that
-uses Auto Lib Core.
-
-
-Search order for paths
-----------------------
-
-(1) [PFX]_INC and [PFX]_LIB
-(2) [PFX] (source or install dir)
-(3) any dirs under [PFX]_BASE (see below)
-(4) any dirs under the parent directory of the Nginx source dir beginning with '[pfx]-'
-(5) standard system paths (including /usr/local, /usr, /opt/local, /opt, /usr/pkg)
-
-If any of 1-3 are specified, then any set values will be searched, and the the Nginx
-source's parent directory and system paths are not searched unless [PFX]_SEARCH_[PLACE]
-variable is set to YES, where PLACE ::= PARENT | SYSTEM. e.g.
-
-$ export OPENSSL_LIB=/path/to/openssl/lib
-$ export OPENSSL_INC=/path/to/openssl/inc
-$ ./configure
-
-will search only in the lib and include paths specified, and
-
-$ export OPENSSL_LIB=/path/to/openssl/lib
-$ export OPENSSL_INC=/path/to/openssl/inc
-$ export OPENSSL_BASE=/path/to/openssl/base
-$ export OPENSSL_SEARCH_PARENT=YES
-$ ./configure --with-openssl=/path/to/openssl
-
-will search first in the lib & inc dirs specified, then in /path/to/openssl, then will
-look for directories in /path/to/openssl/base and then in the Nginx source parent
-directory, but will skip checking the system paths.
-
-Note : apart from system paths, all dirs are checked as both source and install directories,
-so static versions of installed OpenSSL, PCRE, Zlib etc libraries can be used with Nginx
-if desired.
-
-
-Specifying a path to find a library
------------------------------------
-
-If the version of a library you wish to include is in any of the standard paths (e.g.
-/usr/local, /usr ...), you will not need to specify a path to include the library.
-
-If you do wish to specify a specific path, in most cases just specifying
-[PFX]=/path/to/library will be sufficient. e.g.
-
-$ export MOZJS=/path/to/mozjs
-$ ./configure ...
-
-The path can be either a source directory or an install directory. Auto Lib will search
-
-
-Searching under base paths
---------------------------
-
-Rather than specifying a specific path to find new libraries in non-standard locations,
-you may wish to specify a base path (or just let Auto Lib search the directory that the
-Nginx source is located in). This will then automatically find the most recent versions
-of libraries and check them before older versions.
-
-e.g.
-
-You have installations
-
-/openssl/version/0.9.8m
-/openssl/version/1.0.0a
-...
-
-$ export OPENSSL_BASE=/openssl/version
-$ ./configure ...
-
-Any directories under /openssl/version will be searched IN REVERSE ORDER, i.e. most recent
-version first. Here /openssl/version/1.0.0a would be searched before /openssl/version/0.9.8m.
-
-If [PFX]_BASE_SEARCH_PREFIX=YES, then only directories beginning with '[pfx]-' are searched.
-If [PFX]_BASE_SEARCH_PREFIX=something, then only directories beginning with 'something' are
-searched.
-
-When searching under [PFX]_BASE no prefix is added to the search, but when searching under
-the directory that the Nginx source is located in, the prefix [pfx]- is automatically added.
-
-Note : there is currently a minor bug (due to the implementation of the 'sort' command)
-means versions that include hyphens (e.g. 1.0.0-beta5) are checked before versions like
-1.0.0a. This will be fixed soon, and searching of -build folders before normal source ones
-will be added too.
-
-
-
-Shared or static?
------------------
-
-The default for most libraries is to look for shared libraries, though this can be overridden
-by the user by setting [PFX]_SHARED=NO.
-
-In the near future the default action will be to look for shared libraries then to look
-for static libraries in each directory searched unless one of [PFX]_SHARED and/or
-[PFX]_STATIC = NO. If both are set to NO, then Auto Lib will not be used at all.
-
-
-
-Variables that users can set to help find libraries
----------------------------------------------------
-
-[PFX]                   Location of dir where the library can be found      (PATH, see below)
-[PFX]_INC               Include dir for library headers                     (PATH)
-[PFX]_LIB               Lib dir for library archive/shared objects          (PATH)
-[PFX]_BASE              Base dir under which to search for other dirs       (PATH)
-[PFX]_SEARCH_LIB_INC    Search in [PFX]_INC and [PFX]_LIB if set            (YES|NO, def=YES)
-[PFX]_SEARCH_DIR        Search [PFX] if set                                 (YES|NO, def=YES)
-[PFX]_SEARCH_BASE       Search under [PFX]_BASE if set                      (YES|NO, def=YES)
-[PFX]_SEARCH_PARENT     Search under the dir that the Nginx source is in    (YES|NO, see above)
-[PFX]_SEARCH_SYSTEM     Search in standard system paths                     (YES|NO, see above)
-[PFX]_SHARED            Use shared library rather than static               (YES|NO, def=YES)
-[PFX]_SYSTEM_DIRS       System dirs to search in (PATHS, space-separated, overrides the defaults)
-USE_[PFX]               Whether or not to install the library               (YES|NO, def=YES)
-
-
-Note : for libraries that have configure options (e.g. --with-openssl=/path), the [PFX]
-variable is set automatically by configure, so will not be used if exported.
-
-
-
-Information for module developers
-=================================
-
-How Auto Lib Core works
------------------------
-
-Auto Lib Core works as an interface layer between the module and the auto/feature part of
-the Nginx source. This is the file that results in the 'checking for ...' lines that you
-see when you call ./configure.
-
-auto/feature works by using a few key variables (see below) to generate some C code, trying
-to compile it to see if it works and optionally running the code. This output file is called
-autotest.c (located under the objs/ directory whilst configure is running, but is deleted
-after each call to auto/feature).
-
-Normally, whenever an external library is required, a module developer will write a number
-of calls to auto/feature manually in their config files - e.g. to check under a range of
-different possible locations to find a library. Apart from being tedious, this is obviously
-potentially error-prone.
-
-Auto Lib Core will automatically generate all the calls to auto/feature for you, and will
-take into account different operating systems etc in a consistent way, 'intelligent' way.
-
-
-Including Nginx Auto Lib Core with custom modules
--------------------------------------------------
-
-Option 1 :
-
-- include ngx_auto_lib_core in the same directory that your module config file is
-  located
-- add the following line to your config file
-
-  . $ngx_addon_dir/ngx_auto_lib_core
-
-NOTE : if you want to include the file in a different directory to your config
-file, you will need to change both the include line in your config file AND
-the line in the ngx_auto_lib_core file that points to the file (it's the line that
-has $ngx_addon_dir/ngx_auto_lib_core in it)
-
-Option 2 :
-
-- make the Nginx Development Kit (github.com/simpl-it/ngx_devel_kit) a dependency
-  for your module (Auto Lib Core is included automatically with it)
-
-
-Recommended way of including Auto Lib Core
-------------------------------------------
-
-If the Nginx Development Kit (NDK) is already a dependency for your module, then you do
-not need to do anything - just follow the 'using Auto Lib Core' instructions below.
-
-If the NDK is not a dependency for your module, then it is recommended to include a
-copy of ngx_auto_lib_core with your module, but to recommend to users of your module
-to include the NDK when compiling. If the module is not required for anything else, this
-will not make any difference to the Nginx binary that they compile, but will mean they
-will get the latest version of Auto Lib Core (which probably won't change much anyway,
-but you never know).
-
-You will also probably want to include a copy of this readme file for Auto Lib Core
-(at least the user section), and mention what the relevant [PFX] you use for your module
-is in your module's readme file so that users will know what to write for any variables
-that they might use to control the search paths for libraries (see above user section).
-
-
-Using Auto Lib Core
--------------------
-
-To use Auto Lib Core, you should do the following in your config file for each
-external library that you want to include :
-
-1 - Call ngx_auto_lib_init
-2 - Define any variables used for testing
-3 - Define any hooks (custom functions)
-4 - Call ngx_auto_lib_run
-
-
-Calling ngx_auto_lib_init() and ngx_auto_lib_run()
---------------------------------------------------
-
-You can pass either one or two variables to ngx_auto_lib_init(). The first is the name of
-the library as it will appear when running ./configure, the second is the prefix that is
-used for internal variables and looking for directory prefixes. If the second is not
-specified, it defaults to the first.
-
-The init function resets all key variables and functions, so it must be called before
-setting any other variables or functions that are to be used as hooks (see the notes below).
-
-ngx_auto_lib_run() should be called in the config files after all the variables and hooks
-have been defined. This will then run through all the tests to try to find the external
-library.
-
-
-Variables you can set in your config files
-------------------------------------------
-
-All the variables that you set in Auto Lib Core are similar to the ones you set for
-including libraries in the normal way.
-
-       name                           description
-----------------------------------------------------------------------------------------
-
-core variables (i.e. the ones in the core Nginx source)
-
-ngx_feature_inc_path                CFLAGS and include path info (including -I)
-ngx_feature_incs                    Include/define code inserted before main() in autotest.c
-ngx_feature_libs                    External libraries to add (see below)
-ngx_feature_path                    Space-separated include path
-ngx_feature_run                     Whether to run the autotest binary (default = no)
-ngx_feature_test                    C-code inserted inside main() in autotest.c
-
-extended variables (only work in NALC) :
-
-ngx_feature_add_libs                Add libraries (but do not add include files)
-ngx_feature_add_path                Add extra directories to include path
-ngx_feature_build_dirs              Sub dirs that builds might be found
-ngx_feature_build_inc_dirs          Sub dirs that include files might be found
-ngx_feature_build_lib_dirs          Sub dirs that lib files might be found
-ngx_feature_check_macros_defined    Lib required only if one of these macros is defined
-ngx_feature_check_macros_non_zero   Lib required only if one of these macros is non-zero
-ngx_feature_defines                 Define these macros if the library is found
-ngx_feature_deps                    Deps to add (e.g. to CORE_DEPS) if the library is found
-ngx_feature_exit_if_not_found       Quit configure if the library is not found
-ngx_feature_haves                   Set these macros to 1 if the library is found
-ngx_feature_inc_names               Names for include files (not including the .h)
-ngx_feature_lib_files               Add these files under the lib dir for static inclusions
-ngx_feature_lib_names               Names for lib files (not including -l or .a)
-ngx_feature_modules                 Modules to add if the library is found
-ngx_feature_srcs                    Sources to add (e.g. to ADDON_SRCS) if the lib is found
-ngx_feature_shared                  If set to 'no', then only use static lib versions
-ngx_feature_test_libs               Add these libs when testing, but not to the final binary
-ngx_feature_variables               Set these variables if the library is found
-
-standard variables that are completely over-written (i.e. they won't work with NALC) :
-
-ngx_feature_name                    Message that is displayed after 'checking for' in configure
-
-
-Using these variables
----------------------
-
-You do not need to set most of these variables, since 'intelligent' guesses are made that
-will work for most cases. With the exception of ngx_feature_test, you should generally use
-the extended variables rather than the core ones, since sensible core variables will be
-automatically generated from them, and will work for both static and shared libraries.
-
-
-Variable defaults
------------------
-
-ngx_feature_incs            for i in $ngx_feature_inc_names { #include <$i.h> }
-ngx_feature_libs            for l in $ngx_feature_lib_names { -l$l or $LIB/lib$l.a }
-                            + $ngx_feature_add_libs
-ngx_feature_inc_names       $ngx_feature_lib_names
-ngx_feature_lib_names       $pfx
-pfx                         str_to_lower (if two variables are passed to ngx_auto_lib_init, then
-                            then $2, otherwise, $1)
-
-The easiest way to understand how all the defaults work is probably to look at the source code
-of ngx_auto_lib_test_setup() and to look at the examples in the standard Nginx Auto Lib module
-which has code for OpenSSL, PCRE, Zlib, MD5 and SHA1.
-
-
-Hooks
------
-
-To facilitate using Auto Lib Core in a flexible way, a number of 'hooks' have been
-placed in the testing cycle. These hooks are implemented as functions that you define
-in your config file which are called if required by the core library. In the core
-library they are left as empty functions that return either 0 or 1. Any functions
-you write will
-
-Note : ngx_auto_lib_init() resets the variables and functions each time it is called, so
-you must DEFINE HOOKS AFTER YOU CALL ngx_auto_lib_init.
-
-Note : an update on what hooks are available will be added later. To see what hooks are
-available, just look in the source code of ngx_auto_lib_core for any functions that just
-return 0 or 1.
-
-See the MD5 and SHA1 libraries of Nginx Auto Lib module for examples.
-
-
-
-Checking that a library is required
------------------------------------
-
-Although in most cases Auto Lib Core will be used where external libraries are
-definitely required (for a module to work), this may not always be the case. In the
-standard Nginx Auto Lib module (github.com/simpl-it/ngx_auto_lib) - which is designed
-to improve the inclusion of OpenSSL, PCRE and Zlib libraries and increase compilation
-speed where possible - the libraries are not always required, so checks are made to
-see if it is necessary.
-
-
-
-How Auto Lib Core checks if a library is required - ngx_auto_lib_check_require()
-------------------------------------------------------------------------------------
-
-- search for USE_[PFX]=YES (it is set to YES by default for most modules)
-- search for any external libraries that have been included in the CORE_LIBS or ADDON_LIBS
-  variables that use the same lib name as any set in ngx_feature_lib_names
-- search for any macros that have been defined either in the CFLAGS variable or using
-  auto/have or auto/define as set in the ngx_feature_check_macros_defined and
-  ngx_feature_ngx_macros_non_zero variables
-- any custom checks implemented by creating an ngx_auto_lib_check hook function (which
-  should return 0 if the library is required and return 1 at the end if the module is
-  not required)
-
-
-
-Guaranteeing that the correct version of a shared library is linked at run time
--------------------------------------------------------------------------------
-
-Sometimes users will want to use shared libraries that are in non-standard locations
-that the linker may have a problem in locating at run time - even if the correct
-linker path (-L/path/to/lib) is supplied when checking. To make sure that the linker
-can find the library at run time, and to make sure that the linker will use the correct
-version of a library if the library is also located in a standard directory, a run path
-is added to the linker flags (using -Wl,--rpath -Wl,/path/to/lib/dir). In most cases this
-will guarantee that the correct library is used when linking - though care should be taken
-by any users specifying specific paths for libraries that the correct version of the
-library has been linked at run time (e.g. using ldd etc).
-
-As an additional check when running auto/feature, as well as the compilation of the
-autotest.c file, a check is made by ldd to see that the path of the shared library
-that the linker links to is the same as the one specified. This is done because
-
-
-To do
------
-
-- Change how library paths are searched to include both shared and static libraries
-- Touch up documentation
-
-
-License
--------
-
-    BSD
-
-
-Copyright
----------
-
-    [Marcus Clyne](https://github.com/mclyne) (c) 2010
diff --git a/debian/modules/http-ndk/auto/actions/array b/debian/modules/http-ndk/auto/actions/array
deleted file mode 100644
index 04cd889..0000000
--- a/debian/modules/http-ndk/auto/actions/array
+++ /dev/null
@@ -1,10 +0,0 @@
-
-array_create        (a,pl,n,sz)     a = %1%_array_create (pl,n,sz); if (a == NULL) %A%
-array_init          (a,pl,n,sz)     if (%1%_array_init (a,pl,n,sz) == %E%) %A%
-array_push          (p,a)           p = %1%_array_push (a);     if (p == NULL) %A%
-array_push_clean    (p,a)           p = %1%_array_push (a);     if (p == NULL) %A%; %2%_zerop (p)
-array_push_n        (p,a,n)         p = %1%_array_push_n (a,n); if (p == NULL) %A%
-array_push_n_clean  (p,a,n)         p = %1%_array_push_n (a,n); if (p == NULL) %A%; %2%_zeropn (p,n)
-
-
-
diff --git a/debian/modules/http-ndk/auto/actions/palloc b/debian/modules/http-ndk/auto/actions/palloc
deleted file mode 100644
index 6d430bd..0000000
--- a/debian/modules/http-ndk/auto/actions/palloc
+++ /dev/null
@@ -1,8 +0,0 @@
-
-palloc              (p,pl,sz)       p = %1%_palloc (pl,sz);    if (p == NULL) %A%
-pallocp             (p,pl)          %2%_pallocp (p,pl);        if (p == NULL) %A%
-pallocpn            (p,pl,n)        %2%_pallocpn (p,pl,n);     if (p == NULL) %A%
-pcalloc             (p,pl,sz)       p = %1%_pcalloc (pl,sz);   if (p == NULL) %A%
-pcallocp            (p,pl)          %2%_pcallocp (p,pl);       if (p == NULL) %A%
-pcallocpn           (p,pl,n)        %2%_pcallocpn (p,pl,n);    if (p == NULL) %A%
-
diff --git a/debian/modules/http-ndk/auto/build b/debian/modules/http-ndk/auto/build
deleted file mode 100644
index feb84b3..0000000
--- a/debian/modules/http-ndk/auto/build
+++ /dev/null
@@ -1,597 +0,0 @@
-#! /bin/bash
-
-cd `dirname $0`
-
-if [ $# -eq 2 ];
-then
-  if [ `expr $2 : /` -eq 1 ];
-  then
-    output_dir=$2
-  else
-    output_dir=$1/$2
-  fi
-else
-    output_dir=../objs
-fi
-
-list_file=data/action_list
-types_file=data/action_types
-reps_file=data/action_replacements
-prefix_file=data/prefixes 
-header_file=data/header_files
-optional_modules_file=data/modules_optional
-headers_file=data/headers
-module_dependencies_file=data/module_dependencies
-conf_macros_file=data/conf_macros
-conf_locs_file=data/conf_locs
-conf_args_file=data/conf_args
-
-autogen_notice=text/autogen
-
-actions_dir=actions
-srcs_dir=src
-include_prefix=
-file_prefix=ndk_
-auto_file_name=config
-auto_includes_name=includes
-
-conf_merge_filename=conf_merge.h
-conf_cmd_basic_filename=conf_cmd_basic.h
-conf_cmd_extra_filename=conf_cmd_extra.h
-
-
-spacer=¬
-
-sed_delete_empty_lines='t_NEL;d;:_NEL'
-
-
-function trim_lines {
-    sed -e '/./,$!d' -e :a -e '/^\n*$/{$d;N;ba' -e '}'
-}
-
-
-function strtoupper {
-    [ $# -eq 1 ] || return 1
-    local _str _cu _cl _x
-    _cu=(A B C D E F G H I J K L M N O P Q R S T U V W X Y Z)
-    _cl=(a b c d e f g h i j k l m n o p q r s t u v w x y z)
-    _str=$1
-    for ((_x=0;_x<${#_cl[*]};_x++)); do
-        _str=${_str//${_cl[$_x]}/${_cu[$_x]}}
-    done
-    echo $_str
-}
-
-
-function sed_pad_right {
-    len=$1
-    spacer=$2
-    prefix=_PR$3
-
-    # returns a SED script that pads out (spaces) to the right to alignment $len
-    # this script should be used inside a call to sed
-    # NOTE : a spacer character $spacer should have already been written into the parsed string
-
-    echo "t${prefix}a;:${prefix}a;s/^[^$spacer]{$len}/&/;\
-t${prefix}b;s/^[^$spacer]*/& /;t${prefix}a;:${prefix}b;s/$spacer/ /"
-}
-
-
-function sed_pad_left {
-
-    len=$1
-    spacer=$2
-    prefix=_PL$3
-
-   # echo "t${prefix}a;:${prefix}a;s/^[^$spacer]{$len}/& /;t${prefix}a"     # NOT CORRECT?
-}
-
-
-function add_notice {
-
-    echo > $1
-    cat $autogen_notice | trim_lines >> $1
-    echo >> $1
-    echo >> $1
-}
-
-function add_non_generated_content {
-
-    file=src/$1.h
-    [ ! -f $file ] && return
-
-    echo "/* Non-generated macros */" >> $2
-    echo >> $2
-
-    cat $file | trim_lines >> $2
-
-    echo >> $2
-    echo >> $2
-}
-
-
-function add_action_macros {
-
-    list_file=$actions_dir/$1
-
-    [ ! -f $list_file ] && return
-
-    out=$2
-
-
-    # alignment settings
-
-    align1=20
-    align2=35
-    align3=62
-    base_shrink=12
-    define="#define     "
-
-
-
-    # base macros
-
-    echo "/* base action macro macros */" >> $out
-    echo >> $out
-
-    cat $list_file | trim_lines | sed -r \
-    -e "s/^[ ]*([a-zA-Z0-9_]+)([ ]*)\(([a-zA-Z0-9_,]+)\)([ ]*)(.*)/$define%2%_\1_ac(\3,ac)\2\4  {\5;}/" \
-    -e "s/[ ]{$base_shrink}\{/\{/" \
-    -e 's/%A%/ac/g' \
-    >> $out
-
-    echo >> $out
-    echo >> $out
-
-
-
-    # generated macros
-
-    echo "/* generated action macros */" >> $out
-    echo >> $out
-
-    cat -s $list_file | while read list_line; do
-
-        [ "x`echo $list_line`" = 'x' ] && continue
-
-        cat $types_file | while read type_line; do
-
-            [ "x`echo $type_line`" = 'x' ] && continue  
-
-            #ext=`echo $type_line | grep -E '^[a-zA-Z0-9_]+' | cut -d " " -f1`
-            ext=`echo $type_line | sed -r 's/^([a-zA-Z0-9_]+).*/\1/'`
-            params=`echo $type_line | sed -r 's/^[a-zA-Z0-9_]+[ ]*\((.*)\).*/\1/;ta;d;:a'`
-            act=`echo $type_line | sed -r 's/^[a-zA-Z0-9_]+[ ]*(\(.*\))?(.*)/\2/'`
-            [ "x$params" != "x" ] && params=",$params"
-
-            echo $list_line | sed -r \
-            -e "s/^([a-zA-Z0-9_]+)[ ]*\(([a-zA-Z0-9_,]+)\).*/%2%_\1_$ext(\2$params)$spacer%2%_\1_ac$spacer(\2,$act)/" \
-            -e 's/[ ]*,[ ]*/,/g' \
-            -e "`sed_pad_right $align2 $spacer 1`" \
-            -e "`sed_pad_right $align3 $spacer 2`" \
-            -e "s/.*/$define&/" \
-            >> $out
-        done
-        echo >> $out
-    done
-}
-
-
-function replace_prefixes {
-
-    temp=.temp
-
-    file=`cat $prefix_file`
-
-    prefix1=
-    prefix2=
-
-    for prefix in $file ; do
-        [ "x$prefix2" != "x" ] && echo "Too many prefixes in prefix file $prefix_file" && exit 1
-        [ "x$prefix1" != "x" ] && prefix2=$prefix && continue
-        prefix1=$prefix
-    done
-
-    sed -r "s/%1%/$prefix1/g;s/%2%/$prefix2/g" < $1 > $temp
-
-    mv -f $temp $1
-}
-
-
-function replace_other_strings {
-
-    temp=.temp
-
-    cat $reps_file | while read line; do
-
-        rep1=
-        rep2=
-
-        for rep in $line ; do
-            [ "x$rep2" != "x" ] && echo "Too many replacments in replacements file $reps_file" && exit 1
-            [ "x$rep1" != "x" ] && rep2=$rep && continue
-            rep1=$rep
-        done
-
-        sed -r "s/%$rep1%/$rep2/g" < $1 > $temp
-        mv -f $temp $1
-    done
-}
-
-
-function generate_header_file {
-
-    name=$1
-    out=$output_dir/$file_prefix$name.h
-
-    add_notice $out
-    add_non_generated_content $name $out
-    add_action_macros $name $out
-    replace_prefixes $out
-    replace_other_strings $out
-}
-
-
-function add_auto_include {
-    echo "#include  <${file_prefix}$2>" >> $1
-}
-
-
-function add_include {
-    echo "#include  <${include_prefix}${file_prefix}$2>" >> $1
-}
-
-
-function generate_non_optional_h_includes {
-
-    # TODO : split into auto-generated and non-auto-generated ones
-
-    echo "/* non-optional includes */" >> $1
-    echo >> $1
-
-    for mod in `cat $headers_file | sort`; do
-
-        add_auto_include  $1  $mod.h
-    done
-
-    echo >> $1
-    echo >> $1
-}
-
-
-function generate_include_all_includes {
-
-    echo "/* include all optional modules */" >> $1
-    echo >> $1
-    echo "#ifdef NDK_ALL" >> $1
-    echo >> $1
-
-    modules=`cat $optional_modules_file | sed 's/*//g' | sort`
-
-    for mod in $modules; do
-        def="NDK_`strtoupper $mod`"
-        echo "#ifndef $def" >> $1
-        echo "#define $def 1" >> $1
-        echo "#endif" >> $1
-    done
-
-    echo >> $1
-    echo "#endif" >> $1
-    echo >> $1
-    echo >> $1
-}
-
-
-function generate_dependent_includes {
-
-    echo "/* module dependencies */" >> $1
-    echo >> $1
-
-    cat $module_dependencies_file | while read line; do
-
-        first=1
-
-        for mod in $line; do
-
-            def="NDK_`strtoupper $mod`"
-
-            if [ $first = 1 ] ; then
-
-                echo "#ifdef  $def" >> $1
-                first=0
-            else
-                echo "#ifndef $def" >> $1
-                echo "#define $def 1" >> $1
-                echo "#endif" >> $1
-            fi
-        done
-
-        [ $first = 0 ] && echo "#endif" >> $1
-    done
-
-    echo >> $1
-    echo >> $1
-}
-
-
-
-function generate_optional_h_includes {
-
-    echo "/* optional includes */" >> $1
-    echo >> $1
-
-    for mod in $modules; do
-        def="NDK_`strtoupper $mod`"
-        echo "#if ($def)" >> $1
-        add_include  $1  $mod.h
-        echo "#endif" >> $1
-    done
-
-    echo >> $1
-    echo >> $1
-}
-
-
-
-
-
-function generate_conf_merge_macros_file {
-
-    file=$conf_merge_filename
-    out_file=${file_prefix}$file
-    out=$output_dir/$out_file
-
-    add_notice $out
-
-    echo "/* conf-merge-value macros */" >> $out
-    echo >> $out
-
-    cat $srcs_dir/$file | trim_lines >> $out
-    echo >> $out
-    echo >> $out
-
-    echo "/* conf-merge-prop macros */" >> $out
-    echo >> $out
-
-    echo "#define     ndk_conf_merge_prop(prop,default)\\" >> $out
-    echo "            ndk_conf_merge_value\\" >> $out
-    echo "                (conf->prop, prev->prop, default)" >> $out
-    echo >> $out
-
-    # loads macros, removes empty elements, sorts and translates to merge-prop macros
-
-    cat $conf_macros_file | sed -r 's/^[A-Z0-9_]+[ ]*[A-Z0-9_]+[ ]*([a-z0-9_]+).*$/\1/;ta;d;:a' \
-        | sort | sed -r \
-        's/(.*)/#define     ndk_conf_merge_\1_prop(prop,default,...)\\\
-            ndk_conf_merge_\1_value\\\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)\
-    /' \
-    >> $out
-
-    add_auto_include $1 $file
-}
-
-
-
-
-function generate_conf_cmd_basic_file {
-
-    temp=.rep
-    file=$conf_cmd_basic_filename
-    out_file=${file_prefix}$file
-    out=$output_dir/$out_file
-
-    align1=35
-
-    # initial text
-
-    add_notice $out
-
-
-    # add ndk bitmasks
-
-    echo "/* conf cmd core values/bitmasks */" >> $out
-    echo >> $out
-
-
-    cat $conf_args_file | sort | trim_lines | sed -r \
-    -e "s/^([A-Z0-9_]+)/${define}NDK_\1${spacer}NGX_\1/" \
-    -e $sed_delete_empty_lines \
-    -e  "`sed_pad_right $align1 $spacer`" \
-    >> $out
-
-    echo >> $out
-    echo >> $out
-
-
-    # add additional bitmasks stored in file
-
-    echo "/* conf cmd bitmasks */" >> $out
-    echo >> $out
-
-    cat $srcs_dir/$conf_cmd_basic_filename | trim_lines >> $out
-
-    echo >> $out
-    echo >> $out
-
-    echo "/* conf cmd basic macros */" >> $out
-    echo >> $out
-
-
-    # build replacement string
-
-    echo -n "s/^([A-Z0-9_]+)$/" > $temp
-
-    cat $conf_locs_file | sed \
-    -r -e 's/^([A-Z0-9_]+) *([A-Z0-9_]+).*/#define     NDK_\1_CONF_\\1\(name,func,off1,off2,post)\\\\\\\
-                                    {ngx_string (name),\\\\\\\
-                                    NGX_CONF_\\1|NDK_\1_CONF,\\\\\\\
-                                    func, off1, off2, post},\\\
-\\/' -e $sed_delete_empty_lines \
-    >> $temp
-
-    echo -n "/;$sed_delete_empty_lines" >> $temp
-
-
-    # apply the replacement string to the 
-
-    cat $conf_args_file | sort | trim_lines | sed -rf $temp >> $out
-    rm -f $temp
-
-    add_auto_include $1 $file
-}
-
-
-
-function generate_conf_cmd_extra_file {
-
-    temp=.rep
-    file=$conf_cmd_extra_filename
-    out=$output_dir/${file_prefix}$file
-
-    align1=35
-
-    # initial text
-
-    add_notice $out
-
-    echo "/* conf command macros */" >> $out
-    echo >> $out
-
-
-    # build replacement string
-
-    echo -n 's/^([A-Z0-9_]+)[ ]*([A-Z0-9_]+)[ ]*([a-z0-9_]+).*$/' > $temp
-
-    cat $conf_locs_file | sed \
-    -r -e 's/^([A-Z0-9_]+)[ ]*([A-Z0-9_]+)[ ]*([a-zA-Z0-9_]+)/#define     NDK_\1_CONF_\\1(name,p,post\)\\\\\\\
-            NDK_\1_CONF_\\2\\\\\\\
-                (name,\\\\\\\
-                ndk_conf_set_\\3_slot,\\\\\\\
-                NGX_\2_CONF_OFFSET,\\\\\\\
-                offsetof (ndk_module_\3_conf_t, p),\\\\\\\
-                post)\\\
-\\/' -e $sed_delete_empty_lines \
-    >> $temp
-
-    echo -n "/;$sed_delete_empty_lines" >> $temp
-    #echo -n ";`sed_pad_right 60 $spacer`" >> $temp
-
-
-    # apply the replacement string to the 
-
-    cat $conf_macros_file | sort | trim_lines | sed -rf $temp -e "`sed_pad_right 60 $spacer`" >> $out
-    rm -f $temp
-
-    add_auto_include $1 $file
-}
-
-
-
-function generate_auto_generated_h_includes {
-
-    echo "/* auto-generated headers */" >> $1
-    echo >> $1
-
-    for name in `cat $header_file | sort` ; do
-
-        generate_header_file $name
-        add_auto_include $1 $name.h
-    done
-
-    generate_conf_merge_macros_file $1
-    generate_conf_cmd_basic_file $1
-    generate_conf_cmd_extra_file $1
-
-    echo >> $1
-    echo >> $1
-}
-
-
-
-function generate_optional_c_includes {
-
-    echo "/* optional includes */" >> $1
-    echo >> $1
-
-    modules=`cat $optional_modules_file | sed 's/*//g' | sort`
-
-    for mod in $modules; do
-        def="NDK_`strtoupper "$mod"`"
-        echo "#if ($def)" >> $1
-        add_include $1 $mod.c
-        echo "#endif" >> $1
-    done
-
-    echo >> $1
-    echo >> $1
-}
-
-
-function generate_commands {
-
-    echo "/* module commands */" >> $1
-    echo >> $1
-    echo "static ngx_command_t  ndk_http_commands[] = {" >> $1
-
-    cat $optional_modules_file | sort | while read line; do
-
-        cmds=`echo "$line" | grep -E '\*'`
-
-        [ "x$cmds" = "x" ] && continue
-
-        mod=`echo "$line" | grep -E '^[a-zA-Z0-9_]+' | cut -d " " -f1`
-        up=`strtoupper $mod`
-        def="NDK_$up"
-        defcmd="NDK_${up}_CMDS"
-
-        echo "#if ($def)"                   >> $1
-        echo "#define $defcmd 1"            >> $1
-        add_include  $1  $mod.h
-        echo "#undef  $defcmd"              >> $1
-        echo "#endif"                       >> $1
-
-    done
-
-    echo -e "    ngx_null_command\n};"      >> $1
-}
-
-
-function generate_all_h_files {
-
-    out=$output_dir/${file_prefix}$auto_file_name.h
-
-    add_notice $out
-
-    generate_include_all_includes $out
-    generate_dependent_includes $out
-
-    out=$output_dir/${file_prefix}$auto_includes_name.h
-
-    generate_optional_h_includes $out
-    generate_non_optional_h_includes $out
-    generate_auto_generated_h_includes $out $list
-}
-
-
-function generate_all_c_files {
-
-    out=$output_dir/${file_prefix}$auto_file_name.c
-
-    add_notice $out
-    generate_optional_c_includes $out
-    generate_commands $out
-}
-
-
-
-function generate_all_files {
-
-    mkdir -p $output_dir
-    rm -f $output_dir/*
-
-    generate_all_h_files
-    generate_all_c_files
-}
-
-generate_all_files
diff --git a/debian/modules/http-ndk/auto/data/action_replacements b/debian/modules/http-ndk/auto/data/action_replacements
deleted file mode 100644
index f419bc3..0000000
--- a/debian/modules/http-ndk/auto/data/action_replacements
+++ /dev/null
@@ -1,5 +0,0 @@
-
-OK      NGX_OK
-E       NGX_ERROR
-CE      NGX_CONF_ERROR
-COK     NGX_CONF_OK
diff --git a/debian/modules/http-ndk/auto/data/action_types b/debian/modules/http-ndk/auto/data/action_types
deleted file mode 100644
index 284a5cb..0000000
--- a/debian/modules/http-ndk/auto/data/action_types
+++ /dev/null
@@ -1,12 +0,0 @@
-r0          return 0
-r1          return 1
-r_1         return -1
-rok         return %OK%
-rce         return %CE%
-rcok        return %COK%
-re          return %E%
-rn          return NULL
-rse         {ngx_script_error (e); return;}
-sce         {ngx_script_configure_error (c); return;}
-g(_lb)      goto _lb
-ge          goto error
diff --git a/debian/modules/http-ndk/auto/data/conf_args b/debian/modules/http-ndk/auto/data/conf_args
deleted file mode 100644
index 752b533..0000000
--- a/debian/modules/http-ndk/auto/data/conf_args
+++ /dev/null
@@ -1,22 +0,0 @@
- 
-TAKE1
-TAKE2
-TAKE3
-TAKE4
-TAKE5
-TAKE6
-TAKE7
-TAKE8
-TAKE12
-TAKE13
-TAKE23
-TAKE123
-TAKE1234
-1MORE
-2MORE
-ANY
-FLAG
-BLOCK
-MULTI
-ARGS_NUMBER
-
diff --git a/debian/modules/http-ndk/auto/data/conf_locs b/debian/modules/http-ndk/auto/data/conf_locs
deleted file mode 100644
index f5352c3..0000000
--- a/debian/modules/http-ndk/auto/data/conf_locs
+++ /dev/null
@@ -1,25 +0,0 @@
-
-HTTP_MAIN                   HTTP_MAIN       main
-HTTP_SRV                    HTTP_SRV        srv
-HTTP_SIF                    HTTP_SRV        srv
-HTTP_LOC                    HTTP_LOC        loc
-HTTP_LIF                    HTTP_LOC        loc
-
-HTTP_MAIN_SRV               HTTP_SRV        srv
-HTTP_MAIN_SIF               HTTP_SRV        srv
-HTTP_MAIN_LOC               HTTP_LOC        loc
-HTTP_MAIN_LIF               HTTP_LOC        loc
-
-HTTP_SRV_LOC                HTTP_LOC        loc
-HTTP_SRV_LIF                HTTP_LOC        loc
-HTTP_SIF_LOC                HTTP_LOC        loc
-HTTP_SIF_LIF                HTTP_LOC        loc
-
-HTTP_MAIN_SRV_LOC           HTTP_LOC        loc
-HTTP_MAIN_SRV_LIF           HTTP_LOC        loc
-HTTP_MAIN_SIF_LOC           HTTP_LOC        loc
-HTTP_MAIN_SRV_SIF_LOC       HTTP_LOC        loc
-HTTP                        HTTP_LOC        loc
-HTTP_UPS                    HTTP_LOC        loc
-HTTP_ANY                    HTTP_LOC        loc
-ANY                         HTTP_LOC        loc
diff --git a/debian/modules/http-ndk/auto/data/conf_macros b/debian/modules/http-ndk/auto/data/conf_macros
deleted file mode 100644
index f42206a..0000000
--- a/debian/modules/http-ndk/auto/data/conf_macros
+++ /dev/null
@@ -1,35 +0,0 @@
-
-BITMASK             1MORE       bitmask
-BUFS                TAKE1       bufs
-COMPLEX_KEYVAL      TAKE2       http_complex_keyval
-COMPLEX_PATH        TAKE1       http_complex_path
-COMPLEX_VALUE       TAKE1       http_complex_value
-COMPLEX_VALUE_ARRAY 1MORE       http_complex_value_array
-ENCODING            TAKE1       encoding
-ENUM                TAKE1       enum
-FALSE               NOARGS      false
-FULL_PATH           TAKE1       full_path
-KEYVAL              TAKE2       keyval
-KEYVAL1             TAKE2       keyval1
-MSEC                TAKE1       msec
-NULL                NOARGS      null
-NUM                 TAKE1       num
-NUM64               TAKE1       num64
-NUM_FLAG            TAKE1       num_flag
-ONOFF               FLAG        flag
-OFF                 TAKE1       off
-PATH                TAKE1       split_path
-REXEX               TAKE1       regex
-REGEX_CL            TAKE1       regex_caseless
-REGEX_ARRAY         1MORE       regex_array
-REGEX_ARRAY_CL      1MORE       regex_array_caseless
-PTR                 NOARGS      ptr
-SEC                 TAKE1       sec
-SEC_FLAG            TAKE2       sec_flag
-SIZE                TAKE1       size
-STR                 TAKE1       str
-STR_ARRAY           1MORE       str_array_multi
-STR_ARRAY1          TAKE1       str_array
-TRUE                NOARGS      true
-
- 
diff --git a/debian/modules/http-ndk/auto/data/contexts b/debian/modules/http-ndk/auto/data/contexts
deleted file mode 100644
index e7e8ff0..0000000
--- a/debian/modules/http-ndk/auto/data/contexts
+++ /dev/null
@@ -1,22 +0,0 @@
- 
-MAIN
-SRV
-SIF
-LOC
-LIF
-
-MAIN_SRV
-MAIN_SIF
-MAIN_LOC
-MAIN_LIF
-SRV_LOC
-SRV_LIF
-SIF_LOC
-SIF_LIF
-
-MAIN_SRV_LOC
-MAIN_SRV_LIF
-MAIN_SIF_LOC
-MAIN_SIF_LIF
-ANY_MAIN
-
diff --git a/debian/modules/http-ndk/auto/data/header_files b/debian/modules/http-ndk/auto/data/header_files
deleted file mode 100644
index aa0f11c..0000000
--- a/debian/modules/http-ndk/auto/data/header_files
+++ /dev/null
@@ -1,3 +0,0 @@
-array
-palloc
-
diff --git a/debian/modules/http-ndk/auto/data/headers b/debian/modules/http-ndk/auto/data/headers
deleted file mode 100644
index 7583cb9..0000000
--- a/debian/modules/http-ndk/auto/data/headers
+++ /dev/null
@@ -1,4 +0,0 @@
-http_headers
-log
-parse
-string_util
diff --git a/debian/modules/http-ndk/auto/data/module_dependencies b/debian/modules/http-ndk/auto/data/module_dependencies
deleted file mode 100644
index a179316..0000000
--- a/debian/modules/http-ndk/auto/data/module_dependencies
+++ /dev/null
@@ -1,5 +0,0 @@
-complex_path    complex_value   path
-conf_file       string
-hash            string
-set_var         rewrite
-upstream_list   http_create_main_conf
diff --git a/debian/modules/http-ndk/auto/data/modules_optional b/debian/modules/http-ndk/auto/data/modules_optional
deleted file mode 100644
index bbd6ec5..0000000
--- a/debian/modules/http-ndk/auto/data/modules_optional
+++ /dev/null
@@ -1,15 +0,0 @@
-buf
-complex_path
-complex_value
-conf_file
-encoding
-hash
-http
-path
-process
-regex
-rewrite
-set_var
-string
-upstream_list   *
-uri
diff --git a/debian/modules/http-ndk/auto/data/prefixes b/debian/modules/http-ndk/auto/data/prefixes
deleted file mode 100644
index ee53474..0000000
--- a/debian/modules/http-ndk/auto/data/prefixes
+++ /dev/null
@@ -1,2 +0,0 @@
-ngx
-ndk 
diff --git a/debian/modules/http-ndk/auto/src/array.h b/debian/modules/http-ndk/auto/src/array.h
deleted file mode 100644
index a583759..0000000
--- a/debian/modules/http-ndk/auto/src/array.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#define     %2%_array_count(a)                  ((a)->nelts)
-#define     %2%_array_get_first(a)              ((a)->elts)
-#define     %2%_array_get_index(a,n)            ((void*) ((char*) (a)->elts + (a)->size * n))
-#define     %2%_array_get_last(a)               ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1)))
-#define     %2%_array_get_reverse_index(a,n)    ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1 - n)))
-#define     %2%_array_push_clean(p,a)           {p = %1%_array_push (a); %2%_zerop (p);}
diff --git a/debian/modules/http-ndk/auto/src/conf_cmd_basic.h b/debian/modules/http-ndk/auto/src/conf_cmd_basic.h
deleted file mode 100644
index 38743a6..0000000
--- a/debian/modules/http-ndk/auto/src/conf_cmd_basic.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-/* TODO : finish this */
-
-#define     NDK_HTTP_MAIN_CONF              NGX_HTTP_MAIN_CONF
-#define     NDK_HTTP_SRV_CONF               NGX_HTTP_SRV_CONF
-#define     NDK_HTTP_SIF_CONF               NGX_HTTP_SIF_CONF
-#define     NDK_HTTP_LOC_CONF               NGX_HTTP_LOC_CONF
-#define     NDK_HTTP_LIF_CONF               NGX_HTTP_LIF_CONF
-#define     NDK_HTTP_UPS_CONF               NGX_HTTP_UPS_CONF
-#define     NDK_MAIN_CONF                   NGX_MAIN_CONF
-#define     NDK_ANY_CONF                    NGX_ANY_CONF
-
-
-/* compound locations */
-
-#define     NDK_HTTP_MAIN_SRV_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_CONF
-#define     NDK_HTTP_MAIN_SIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_SIF_CONF
-#define     NDK_HTTP_MAIN_LOC_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_CONF
-#define     NDK_HTTP_MAIN_LIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_LIF_CONF
-
-#define     NDK_HTTP_SRV_SIF_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_SIF_CONF
-#define     NDK_HTTP_SRV_LOC_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_CONF
-#define     NDK_HTTP_SRV_LOC_LIF_CONF               NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_LIF_CONF
-#define     NDK_HTTP_SRV_SIF_LOC_CONF               NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_CONF
-#define     NDK_HTTP_SRV_SIF_LOC_LIF_CONF           NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_LIF_CONF
-
-#define     NDK_HTTP_LOC_LIF_CONF                   NDK_HTTP_LOC_CONF|NDK_HTTP_LIF_CONF
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LOC_CONF
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LIF_CONF
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SIF_LOC_CONF
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF      NDK_HTTP_SRV_SIF_LOC_LIF_CONF|NDK_MAIN_CONF
-#define     NDK_HTTP_CONF                           NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF
-#define     NDK_HTTP_ANY_CONF                       NDK_HTTP_CONF|NDK_HTTP_UPS_CONF
-
-
-/* property offsets     NOTE : ngx_module_main_conf_t etc should be defined in the module's .c file before the commands */
-
-#define     NDK_HTTP_MAIN_CONF_PROP(p)      NGX_HTTP_MAIN_CONF_OFFSET, offsetof (ndk_module_main_conf_t, p)
-#define     NDK_HTTP_SRV_CONF_PROP(p)       NGX_HTTP_SRV_CONF_OFFSET, offsetof (ndk_module_srv_conf_t, p)
-#define     NDK_HTTP_LOC_CONF_PROP(p)       NGX_HTTP_LOC_CONF_OFFSET, offsetof (ndk_module_loc_conf_t, p)
-
-
diff --git a/debian/modules/http-ndk/auto/src/conf_merge.h b/debian/modules/http-ndk/auto/src/conf_merge.h
deleted file mode 100644
index 1e3ba70..0000000
--- a/debian/modules/http-ndk/auto/src/conf_merge.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-/* TODO : check that all the main types have a corresponding merge function */
-
-#define     ndk_conf_merge_value            ngx_conf_merge_value
-#define     ndk_conf_merge_off_value        ngx_conf_merge_off_value 
-#define     ndk_conf_merge_ptr_value        ngx_conf_merge_ptr_value
-#define     ndk_conf_merge_str_value        ngx_conf_merge_str_value
-#define     ndk_conf_merge_size_value       ngx_conf_merge_size_value 
-
-
-#define     ndk_conf_merge_keyval_value(conf,prev,default)                                  \
-                                                                                            \
-                conf = prev ? prev : default;
-
-#define     ndk_conf_merge_str_array_value(conf,prev,val1,...)                              \
-                                                                                            \
-                if (conf == NGX_CONF_UNSET_PTR) {                                           \
-                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
-                        if (val1 == NULL) {                                                 \
-                            conf = NULL;                                                    \
-                        } else {                                                            \
-                            char * elts[] = {val1,##__VA_ARGS__};                           \
-                            int    n = sizeof(elts)/sizeof(char*);                          \
-                                                                                            \
-                            conf = ndk_str_array_create (cf->pool, elts, n);                \
-                                                                                            \
-                            if (conf == NULL)                                               \
-                                return  NGX_CONF_ERROR;                                     \
-                        }                                                                   \
-                    } else {                                                                \
-                        conf = prev;                                                        \
-                    }                                                                       \
-                }
-
-#define     ndk_conf_merge_http_complex_value_value(conf,prev,default)                      \
-                                                                                            \
-                if (!conf.str.len) {                                                        \
-                    if (prev.str.len) {                                                     \
-                        conf = prev;                                                        \
-                    } else {                                                                \
-                        conf.str.data = (u_char *) default;                                 \
-                        conf.str.len = sizeof (default) - 1;                                \
-                                                                                            \
-                        if (ndk_http_complex_value_compile (cf, &conf))                     \
-                            return  NGX_CONF_ERROR;                                         \
-                    }                                                                       \
-                }
-
-#define     ndk_conf_merge_http_complex_value_array_value(conf,prev,val1,...)               \
-                                                                                            \
-                if (conf == NGX_CONF_UNSET_PTR) {                                           \
-                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
-                        if (val1 == NULL)                                                   \
-                            conf = NULL;                                                    \
-                        else {                                                              \
-                            char * elts[] = {val1,##__VA_ARGS__};                           \
-                            int    n = sizeof(elts)/sizeof(char*);                          \
-                                                                                            \
-                            conf = ndk_http_complex_value_array_create (cf, elts, n);       \
-                                                                                            \
-                            if (conf == NULL)                                               \
-                                return  NGX_CONF_ERROR;                                     \
-                        }                                                                   \
-                    } else {                                                                \
-                        conf = prev;                                                        \
-                    }                                                                       \
-                }
-
-#define     ndk_conf_merge_http_complex_path_value(conf,prev,...)                           \
-                ndk_conf_merge_http_complex_value_array_value (conf.a, prev.a, __VA_ARGS__)
-
-#define     ndk_conf_merge_split_path_value(conf,prev,path)                                 \
-                                                                                            \
-                if (conf == NGX_CONF_UNSET_PTR)  {                                          \
-                    conf = (prev == NGX_CONF_UNSET_PTR ?                                    \
-                        ndk_split_path_create_raw (cf, path) : prev);                       \
-                }
-
diff --git a/debian/modules/http-ndk/auto/src/palloc.h b/debian/modules/http-ndk/auto/src/palloc.h
deleted file mode 100644
index 798e360..0000000
--- a/debian/modules/http-ndk/auto/src/palloc.h
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#define     %2%_pallocp(p,pl)                   p = %1%_palloc (pl,sizeof(*p))
-#define     %2%_pallocpn(p,pl,n)                p = %1%_palloc (pl,sizeof(*p)*(n))
-
-#define     %2%_pcallocp(p,pl)                  p = %1%_pcalloc (pl,sizeof(*p))
-#define     %2%_pcallocpn(p,pl,n)               p = %1%_pcalloc (pl,sizeof(*p)*(n))
diff --git a/debian/modules/http-ndk/auto/text/autogen b/debian/modules/http-ndk/auto/text/autogen
deleted file mode 100644
index 6a244c2..0000000
--- a/debian/modules/http-ndk/auto/text/autogen
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/* 
- * 2010 (C) Marcus Clyne 
- *
- * DO NOT EDIT THIS FILE MANUALLY
- * ------------------------------
- * This file has been generated automatically from scripts in the $base/auto dir and
- * data in the $base/auto/data dir. If you wish to edit the output of this file, then
- * you should edit these files instead.
- *
-*/
-
diff --git a/debian/modules/http-ndk/config b/debian/modules/http-ndk/config
deleted file mode 100644
index 8cb7ad0..0000000
--- a/debian/modules/http-ndk/config
+++ /dev/null
@@ -1,65 +0,0 @@
-
-###############
-## FUNCTIONS ##
-###############
-
-# TODO : provide information about checking versions of sed etc
-# TODO : an optional patch function
-
-ndk_generate_files() {
-    echo "building Nginx Development Kit utility functions and macros ..."
-
-    autobuild="$ngx_addon_dir/auto/build"
-    chmod +x $autobuild
-    $autobuild `pwd` $NGX_OBJS/addon/ndk || exit 1
-}
-
-ndk_get_nginx_version() {
-    # We get the Nginx version number from the string form rather than
-    # nginx_version because it is available in more (every?) version
-
-    cat src/core/nginx.h                                |
-    grep  '#define NGINX_VERSION'                       |
-    sed -r                                              \
-        -e 's/[^0-9.]*([0-9.]+).*/\1/'                  \
-        -e 's/([0-9]+\.[0-9]+\.)([0-9]{1})$/\100\2/'    \
-        -e 's/([0-9]+\.[0-9]+\.)([0-9]{2})$/\10\2/'     \
-        -e 's/\.//g'                                    \
-        -e 's/^0+(.*)/\1/'
-}
-
-#####################
-## CONFIG SETTINGS ##
-#####################
-
-ngx_addon_name=ngx_devel_kit
-ngx_objs_dirs="$ngx_addon_dir/objs $NGX_OBJS/addon/ndk"
-
-NDK_SRCS="$ngx_addon_dir/src/ndk.c"
-NDK_DEPS="$ngx_addon_dir/src/ndk.h"
-NDK_INCS="$ngx_addon_dir/src $ngx_objs_dirs"
-
-CORE_INCS="$CORE_INCS $ngx_objs_dirs"
-HTTP_INCS="$HTTP_INCS $ngx_addon_dir/src $ngx_objs_dir"
-
-if test -n "$ngx_module_link"; then
-    ngx_module_type=HTTP
-    ngx_module_name="ndk_http_module"
-    ngx_module_srcs="$NDK_SRCS"
-    ngx_module_deps="$NDK_DEPS"
-    ngx_module_incs="$NDK_INCS"
-
-    . auto/module
-else
-    HTTP_MODULES="$HTTP_MODULES ndk_http_module"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $NDK_SRCS"
-    NGX_ADDON_DEPS="$NGX_ADDON_SRCS $NDK_DEPS"
-fi
-
-have=NDK . auto/have
-
-##############
-## INCLUDES ##
-##############
-
-. $ngx_addon_dir/ngx_auto_lib_core
diff --git a/debian/modules/http-ndk/docs/core/action_macros b/debian/modules/http-ndk/docs/core/action_macros
deleted file mode 100644
index 802eb1f..0000000
--- a/debian/modules/http-ndk/docs/core/action_macros
+++ /dev/null
@@ -1,63 +0,0 @@
-
-    GENERAL NOTES
-    -------------
-
-    These functions and macros have been provided as a tool for Nginx module developers.  They have
-    been created with four main purposes:
-
-        - to speed up code-writing
-        - to reduce the code you have to read on file
-        - to add additional generic functionality similar to exising Nginx functions 
-        - to reduce code errors
-
-    Most of the utility macros are just wrappers around commonly used code, especially checking for
-    NULL and returning a value, zeroing data etc.  The functions add things like extra conf_set_X_slot
-    functions that don't exist in the standard Nginx distribution, but which might be useful in more
-    than one module.
-
-    A consistent approach has been taken to creating the macros, so that in theory you should be able
-    to 'know' the macro name from using the few rules below and your knowledge of the existing Nginx
-    functions.  As much as possible, the ordering of variables used within the underlying functions
-    remain the same, to reduce the learning time.  Also, a constent naming pattern has been used to
-    make it easier to read the macros above.
-
-    Obviously not all programmers will want to use all or any of these macros, but they are provided
-    as a tool for those who wish to use them.
-
-    If you have any comments about them, including any additions or errors please let me know at 
-    'eugaia at gmail dot com'.  I don't promise to include all additions people send, but if they seem
-    like they could be of use to multiple developers, I will.
-
-
-    UTILITY MACRO PARAMS
-    --------------------
-    p       pointer                 - used to set the result of a function to a pointer
-    a       array
-    pl      pool
-    n       multiplication factor   - for allocating multiple pointers & pushing 'n' elts in arrays etc
-    sz      size
-    l       log
-    rv      return value
-
-
-
-    UTILITY MACRO FUNCTION SUFFIXES
-    -------------------------------
-
- - general
-
-    p       p = [FUNCTION] ()
-    _r      [ if result of function is NULL | NGX_ERROR (as appropriate) ] return rv
-    _rce    rv = NGX_CONF_ERROR
-    _re     rv = NGX_ERROR
-    _rn     rv = NULL
-
- - (p)(c)alloc functions
-
-    p       p = [function] (pool, sizeof (*p))
-    pn      p = [function] (pool, sizeof (*p) * n)
-
-
-    UTILITY MACRO PARAMS ORDER
-    --------------------------
-    p, pl|a, sz|n, l, rv 
diff --git a/debian/modules/http-ndk/docs/core/conf_cmds b/debian/modules/http-ndk/docs/core/conf_cmds
deleted file mode 100644
index 70978b1..0000000
--- a/debian/modules/http-ndk/docs/core/conf_cmds
+++ /dev/null
@@ -1,62 +0,0 @@
-
-Conf command macros
--------------------
-
-The build script generates a large number of macros for reducing the code required for command
-definitions.
-
-There are basically three types of macros :
-
-- combination bitmasks
-
-    e.g. NDK_HTTP_MAIN_SRV_CONF  =  (NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF)
-
-- base command structures
-
-    e.g. NDK_HTTP_MAIN_CONF_TAKE1
-
-- conf-set command structures
-
-    e.g. NDK_HTTP_CONF_STR
-
-
-Combination bitmasks
---------------------
-
-Basically combinations of existing bitmasks for locations, with general > specific order
-
-NDK_HTTP_CONF = (NGX_HTTP_MAIN_CONF | NGX_HTTP_SVR_CONF | NGX_HTTP_SIF_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF)
-
-
-Base command structures
------------------------
-
-These macros are basically there as wrappers for the conf-set command structures, and but incorporate 
-the bitmask element into the name of the macro.
-
-
-Conf-set command structures
----------------------------
-
-These macros simplify creating commands that use any of the build-in conf-set functions or any of those
-added by the NDK.
-
-e.g.  NGX_HTTP_MAIN_SRV_STR ("name", prop, NULL)
-
-where prop is the name of the property that is a ngx_str_t.  Whether this is in the loc conf, main conf
-or svr conf is generated automatically in by the macro.
-
-NOTE : you need to set the following if they will be used (using macro definitions) :
-
-ndk_module_main_conf_t
-ndk_module_srv_conf_t
-ndk_module_loc_conf_t
-
-e.g
-
-#define     ndk_module_loc_conf_t       ngx_http_my_module_loc_conf_t
-
-
-TODO
-----
-Much better documentation for this
diff --git a/debian/modules/http-ndk/docs/modules/set_var b/debian/modules/http-ndk/docs/modules/set_var
deleted file mode 100644
index 6be5c0f..0000000
--- a/debian/modules/http-ndk/docs/modules/set_var
+++ /dev/null
@@ -1,124 +0,0 @@
-
-set var tools
-=============
-
-OVERVIEW
---------
-This collection of tools is designed to make it easier to set Nginx variables
-using a common interface.  It works by plugging into and extending the features
-of the internal rewrite module, and operations performed by this module are
-therefore done at the rewrite phase of handling.
-
-
-ADVANTAGES OF USING THIS MODULE
--------------------------------
-
-- simple interface - you don't have to worry about lots of http script compiling
-- it plugs into the rewrite module, so setting (and getting) vars will happen
-  in the order you expect based on how they appear in the configuration file
-- you do not have to worry about overriding the v->get_handler (useful if
-  a variable of a specific name could be set in multiple different ways)
-
-
-WHEN TO USE THIS AND WHEN TO USE v->get_handler = my_func
----------------------------------------------------------
-
-- if you want a variable to always be generated using a specific function,
-    and should not be over-ridden by 'set' functions (e.g. $request_uri, 
-    $document_root), then you should use v->get_handler
-
-- if you want to allow a variable to be set using many possible methods,
-    including using the 'set' directive, then this module provides an easy way
-    for you to do so (if you use the v->get_handler method in this case, you may
-    run into problems because the get_handler may over-ride previous uses of the
-    set directive)
-
-
-USAGE
------
-
-- decide on the type of function you'll need to write
-
-    type                                use when there are these requirements
-    ----                                -------------------------------------
-    NDK_SET_VAR_BASIC                   0 variable values, no extra data
-    NDK_SET_VAR_DATA                    0 variable values, extra data
-    NDK_SET_VAR_VALUE                   1 variable value, no extra data
-    NDK_SET_VAR_VALUE_DATA              1 variable value, extra data
-    NDK_SET_VAR_MULTI_VALUE             2+ variable values, no extra data
-    NDK_SET_VAR_MULTI_VALUE_DATA        2+ variable values, extra data
-    NDK_SET_VAR_HASH                    the space needed for the result string 
-                                        value is known in advance (usually 
-                                        used in a hash function)
-
-    NOTE : if none of these generic calling types suit your needs, it is
-    easy to extend the list of types in the .c file (and you if you let me know
-    I'll add them to the list
-
-
-- define the filter function with the respective prototype
-
-    type                                prototype
-    ----                                ---------
-    NDK_SET_VAR_BASIC                   ndk_set_var_pt
-    NDK_SET_VAR_DATA                    ndk_set_var_data_pt
-    NDK_SET_VAR_VALUE                   ndk_set_var_value_pt
-    NDK_SET_VAR_DATA_VALUE              ndk_set_var_value_data_pt
-    NDK_SET_VAR_MULTI_VALUE             ndk_set_var_value_pt
-    NDK_SET_VAR_MULTI_VALUE_DATA        ndk_set_var_value_data_pt
-    NDK_SET_VAR_HASH                    ndk_set_var_hash_pt
-
-    (See ngx_tools_module.h for the prototype definitions.)
-
-    Note : For the multi_value functions, the variable value pointer is to the
-    first value (with the others being in an array following it)
-
-
-to use one of the default setup functions
------------------------------------------
-
-- define one or multiple ngx_http_var_filter_t's at the global scope, setting :
-
-    type = (one of types above)
-    func = function to call
-    size = (for multi value)        the number of variable values
-           (for hash)               length of buffer to allocate
-    data = (for data functions)     additional data (see note below)
-
-- define a configuration directive (see in the .c file for examples), where the
-    function is 'ngx_http_set_var' and the 'post' is a pointer your filter definition
-
-
-to setup in a customized way
-----------------------------
-
-- define a configuration directive which has your own specific configuration function
-
-- inside your config function, define one or several ngx_http_var_filter_t's like
-    above, and call one of the ngx_http_set_var_..._core functions, passing the 
-    variable name and value pointers as appropriate - see examples section
-
-Note : if you're passing extra data to the function, then you will probably want
-to use this second method and store the data either in the loc conf, or just
-allocate the space for it using one of the ngx_palloc functions.
-
-If the values that will be used for processing are in the same order as in the
-config file and there aren't any additional values that are input, then you can
-just use the (ngx_str_t *) (cf->args->elts) + 1 as your base for the values or 
-possibly not use the _core versions of the functions.
-
-
-That's it!
-
-
-FEEDBACK
---------
-
-If you have any comments (good/bad), or have found any bugs, please let me know at:
-ngx.eugaia AT gmail DOT com
-
-
-TODO
-----
-- add more documentation/examples
-
diff --git a/debian/modules/http-ndk/docs/patches/more_logging_info b/debian/modules/http-ndk/docs/patches/more_logging_info
deleted file mode 100644
index 3685916..0000000
--- a/debian/modules/http-ndk/docs/patches/more_logging_info
+++ /dev/null
@@ -1,48 +0,0 @@
-When tracking down some potential issues in the nginx constellation,
-we've found it useful to understand where particular error messages
-are coming from, since many of the same messages are repeated in
-various places. This patch will write the source file from which the
-message originated, the function name, and the line number if you're
-using GCC to compile nginx. Here's an example:
-
-Old Output:
-2010/01/12 14:43:10 [notice] 67772#0: nginx/0.7.64
-2010/01/12 14:43:10 [notice] 67772#0: built by gcc 4.0.1 (Apple Inc. build 5490)
-2010/01/12 14:43:10 [notice] 67772#0: OS: Darwin 9.8.0
-2010/01/12 14:43:10 [notice] 67772#0: hw.ncpu: 2
-2010/01/12 14:43:10 [notice] 67772#0: net.inet.tcp.sendspace: 65536
-2010/01/12 14:43:10 [notice] 67772#0: kern.ipc.somaxconn: 128
-2010/01/12 14:43:10 [notice] 67772#0: getrlimit(RLIMIT_NOFILE):
-256:9223372036854775807
-2010/01/12 14:43:10 [notice] 67772#0: start worker processes
-2010/01/12 14:43:10 [notice] 67772#0: start worker process 67785
-2010/01/12 14:43:16 [notice] 67772#0: signal 20 (SIGCHLD) received
-
-New Output:
-2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_posix_init.c
-ngx_os_status(   80) nginx/0.7.64
-2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_posix_init.c
-ngx_os_status(   83) built by gcc 4.0.1 (Apple Inc. build 5490)
-2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_darwin_init.c
-ngx_os_specific_status(  153) OS: Darwin 9.8.0
-2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_darwin_init.c
-ngx_os_specific_status(  166) hw.ncpu: 2
-2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_darwin_init.c
-ngx_os_specific_status(  166) net.inet.tcp.sendspace: 65536
-2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_darwin_init.c
-ngx_os_specific_status(  166) kern.ipc.somaxconn: 128
-2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_posix_init.c
-ngx_os_status(   92) getrlimit(RLIMIT_NOFILE):
-2560:9223372036854775807
-2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_process_cycle.c
-ngx_start_worker_processes(  337) start worker processes
-2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_process.c
-ngx_spawn_process(  201) start worker process 27254
-2010/01/14 16:35:14 [notice] 27241#0: src/os/unix/ngx_process.c
-ngx_signal_handler(  420) signal 20 (SIGCHLD) received
-
-Formatting the filename and function name fields into fixed-width
-fields would be nicer, however that would require further changes in
-src/core/ngx_string.c
-
-(C) Brian Moran - bmoran@onehub.com  (posted to nginx-devel mailing list on 15/01/10)
diff --git a/debian/modules/http-ndk/docs/upstream/list b/debian/modules/http-ndk/docs/upstream/list
deleted file mode 100644
index 3ad485d..0000000
--- a/debian/modules/http-ndk/docs/upstream/list
+++ /dev/null
@@ -1,45 +0,0 @@
-
-NDK_UPSTREAM_LIST
------------------
-
-This submodule provides a directive that creates a list of upstreams, with
-optional weighting. This list can then be used by other modules to hash over
-the upstreams however they choose.
-
-
-USAGE IN CONF FILE
-------------------
-
-e.g. upstream_list   name    backend1  4:backend2    3:backend3;
-
-
-
-USAGE WITH OTHER MODULES
-------------------------
-
-Add a line like
-
-CFLAGS="$CFLAGS -DNDK_UPSTREAM_LIST"
-
-to the config file of your module.
-
-
-
-INTEGRATING WITH YOUR MODULE
-----------------------------
-
-The upstream lists are stored in the array given in the lists.h file, which is
-an array of ndk_upstream_list_t elts.  The elts are currently all pointers to 
-strings which have been distributed according to the weight - so if there are
-two backends, with weight 3 and 4 respectively, there will be 7 pointers in
-total with the first 3 pointing to the first backend and the last 4 to the 
-second.
-
-
-
-TODO
-----
--   replace strings with pointers to upstreams if they are available (and if 
-    this is possible)
--   add additional 'http://' to strings if necessary
--   improve this documentation
diff --git a/debian/modules/http-ndk/examples/README b/debian/modules/http-ndk/examples/README
deleted file mode 100644
index 22e2417..0000000
--- a/debian/modules/http-ndk/examples/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-2010 (C) Marcus Clyne
-
-
-Examples
---------
-
-In this section there are a number of examples of the various features of the tools
-module.  These have been given in the form of dummy modules, to make it easier to
-use as templates for your own module should you choose to do so.
-
-
diff --git a/debian/modules/http-ndk/examples/http/set_var/config b/debian/modules/http-ndk/examples/http/set_var/config
deleted file mode 100644
index aa58f77..0000000
--- a/debian/modules/http-ndk/examples/http/set_var/config
+++ /dev/null
@@ -1,4 +0,0 @@
-ngx_addon_name=ngx_http_set_var_examples_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_set_var_examples_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_set_var_examples_module.c"
-have=NDK_SET_VAR . auto/have
\ No newline at end of file
diff --git a/debian/modules/http-ndk/examples/http/set_var/ngx_http_set_var_examples_module.c b/debian/modules/http-ndk/examples/http/set_var/ngx_http_set_var_examples_module.c
deleted file mode 100644
index 7a4daae..0000000
--- a/debian/modules/http-ndk/examples/http/set_var/ngx_http_set_var_examples_module.c
+++ /dev/null
@@ -1,136 +0,0 @@
-
-/*
- * 2010 (C) Marcus Clyne
- */
- 
-
-#include    <ndk.h>
-
-
-static ngx_int_t    ngx_http_set_var_concat2    (ngx_http_request_t *r, ngx_str_t *val, ngx_http_variable_value_t *v);
-static char *       ngx_http_set_prepend_hello   (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-
-
-static  ndk_set_var_t      ngx_http_var_set_concat2 = {
-    NDK_SET_VAR_MULTI_VALUE,
-    ngx_http_set_var_concat2,
-    2,
-    NULL
-};
-
-
-static ngx_command_t  ngx_http_set_var_examples_commands[] = {
-    {
-        ngx_string ("set_concat2"),
-        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE3,
-        ndk_set_var_multi_value,
-        0,
-        0,
-        &ngx_http_var_set_concat2
-    },
-    {
-        ngx_string ("set_prepend_hello"),
-        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-        ngx_http_set_prepend_hello,
-        0,
-        0,
-        NULL
-    },
-    ngx_null_command
-};
-
-
-ngx_http_module_t     ngx_http_set_var_examples_module_ctx = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
-ngx_module_t          ngx_http_set_var_examples_module = {
-
-    NGX_MODULE_V1,
-    &ngx_http_set_var_examples_module_ctx,  // module context
-    ngx_http_set_var_examples_commands,     // module directives
-    NGX_HTTP_MODULE,                        // module type
-    NULL,                                   // init master
-    NULL,                                   // init module
-    NULL,                                   // init process
-    NULL,                                   // init thread
-    NULL,                                   // exit thread
-    NULL,                                   // exit process
-    NULL,                                   // exit master
-    NGX_MODULE_V1_PADDING
-};
-
-
-/*
-    This function is called by both examples, takes two variable values and concatenates them
-    to give a third string.
-*/
-
-static ngx_int_t
-ngx_http_set_var_concat2 (ngx_http_request_t *r, ngx_str_t *val, ngx_http_variable_value_t *v)
-{
-    size_t                      len;
-    ngx_http_variable_value_t   *v2;
-    u_char                      *p;
-
-    v2 = v + 1;
-
-    len = v->len + v2->len;
-
-	/*
-	 * NDK provided abbreviation for the following code:
-	 *
-	 * p = ngx_palloc (r->pool, len);
-	 * if (p == NULL)
-	 * 		return  NGX_ERROR;
-	 *
-	 * */
-	ndk_palloc_re(p, r->pool, len);
-
-    val->data = p;
-    val->len = len;
-
-    ngx_memzero (p, len);
-
-    p = ngx_cpymem (p, v->data, v->len);
-    ngx_memcpy (p, v2->data, v2->len);
-
-    return  NGX_OK;
-}
-
-
-
-/*  
-    This function demonstrates using the 'core' function in a function that appends the word
-    'hello_' to the beginning of a variable.
-
-    set                 $var      world;
-    set_prepend_hello    $var      $var;
-
-    If the arguments used in the variable value filter do not all come directly from the conf
-    file, or are not given in the order
-
-    direcive    $var_name   val1 "val2 string $var" ...
-
-    then the _core functions should be used inside the function that is called when the directive
-    is read.
-*/
-
-static char *
-ngx_http_set_prepend_hello (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_str_t               s[2], *var_name;
-    ndk_set_var_t      filter;
-
-    var_name = cf->args->elts;
-    var_name++;
-
-    s[0].data = (u_char*) "hello_";
-    s[0].len = 6;
-
-    s[1] = *(var_name + 1);
-
-    filter.type = NDK_SET_VAR_MULTI_VALUE;
-    filter.func = ngx_http_set_var_concat2;
-    filter.size = 2;
-
-    return  ndk_set_var_multi_value_core (cf, var_name, (ngx_str_t *) s, &filter);
-}
-
diff --git a/debian/modules/http-ndk/ngx_auto_lib_core b/debian/modules/http-ndk/ngx_auto_lib_core
deleted file mode 100644
index d5441fb..0000000
--- a/debian/modules/http-ndk/ngx_auto_lib_core
+++ /dev/null
@@ -1,797 +0,0 @@
-
-## Directories to search for usable builds:
-##
-## - [$PFX]_INC and [$PFX]_LIB
-## - the dir specified by --with-[$pfx]=*
-## - each dir named [$pfx]-* under [$PFX]_BASE (descending order)
-## - each dir named [$pfx]-* under $ngx_src_dir/.. (descending order)
-## - system_paths (see below)
-##
-## Note : specifying [$PFX]_INC or [$PFX]_LIB prevents other dirs being tried
-##        specifying --with-[$pfx]= prevents autodiscovery of dirs
-##
-## Note : if this file is not in the same directory as the config file, the value
-##        for ngx_auto_lib_file should be changed to a relative path from that file
-## e.g. : $ngx_addon_dir/libs/ngx_auto_lib
-##
-## TODO : explain hooks
-
-#############
-## VERSION ##
-#############
-
-ngx_auto_lib_version=1001
-
-if [ ! $ngx_auto_lib_file_version ] || [ $ngx_auto_lib_file_version -lt $ngx_auto_lib_version ]; then
-
-    if [ ! $ngx_addon_dir ]; then
-        ngx_addon_dir=`cd $(dirname $0); pwd`
-    fi
-
-    ngx_auto_lib_file="$ngx_addon_dir/ngx_auto_lib_core"
-    ngx_auto_lib_file_version="$ngx_auto_lib_version"
-fi
-
-###############
-## VARIABLES ##
-###############
-
-v=
-v="$v       inc_path"
-v="$v       incs"
-v="$v       libs"
-v="$v       name"
-v="$v       path"
-v="$v       run"
-v="$v       test"
-ev=
-ev="$ev     add_libs"
-ev="$ev     add_path"
-ev="$ev     build_dirs"
-ev="$ev     build_inc_dirs"
-ev="$ev     build_lib_dirs"
-ev="$ev     check_macros_defined"
-ev="$ev     check_macros_non_zero"
-ev="$ev     defines"
-ev="$ev     deps"
-ev="$ev     exit_if_not_found"
-ev="$ev     haves"
-ev="$ev     inc_names"
-ev="$ev     lib_files"
-ev="$ev     lib_names"
-ev="$ev     libs_to_add"
-ev="$ev     modules"
-ev="$ev     srcs"
-ev="$ev     shared"
-ev="$ev     test_libs"
-ev="$ev     variables"
-
-ngx_feature_vars="$v"
-ngx_feature_extra_vars="$ev"
-ngx_feature_all_vars="$v $ev"
-
-NGX_AUTO_LIB_DEFAULT_SYSTEM_DIRS='/usr/local /usr /opt/local /opt /usr/pkg'
-
-####################
-## UTIL FUNCTIONS ##
-####################
-
-to_upper() {
-    echo "$@" | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-}
-
-to_lower() {
-    echo "$@" | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
-}
-
-####################
-## INIT FUNCTIONS ##
-####################
-
-ngx_auto_lib_init() {
-
-    . $ngx_auto_lib_file
-
-    ngx_auto_lib_init_latest  $@
-}
-
-ngx_auto_lib_init_latest() {
-
-    # set name and prefixes
-
-    if [ ! $1 ]; then
-        echo "ngx_auto_lib_init() requires that a name be passed"
-        exit 1
-    fi
-
-    ngx_auto_lib_name=$1
-    ngx_auto_lib_module_name=$2
-
-    if [ $2 ]; then
-        NGX_AUTO_LIB_PFX=`to_upper $2`
-    else
-        NGX_AUTO_LIB_PFX=`to_upper $1`
-    fi
-
-    ngx_auto_lib_pfx=`to_lower $NGX_AUTO_LIB_PFX`
-
-    ngx_auto_lib_clean_feature_vars
-}
-
-ngx_auto_lib_clean_feature_vars() {
-    for var in $ngx_feature_all_vars; do
-        eval ngx_feature_$var=
-    done
-}
-
-ngx_auto_lib_get_variables() {
-
-    local pfx=$ngx_auto_lib_pfx
-    local PFX=$NGX_AUTO_LIB_PFX
-
-    eval NGX_AUTO_LIB_INC=\"\$${PFX}_INC\"
-    eval NGX_AUTO_LIB_LIB=\"\$${PFX}_LIB\"
-    eval NGX_AUTO_LIB_DIR=\"\$${PFX}\"
-    eval NGX_AUTO_LIB_BASE=\"\$${PFX}_BASE\"
-    eval NGX_AUTO_LIB_SEARCH_LIB_INC=\"\$${PFX}_SEARCH_LIB_INC\"
-    eval NGX_AUTO_LIB_SEARCH_DIR=\"\$${PFX}_SEARCH_DIR\"
-    eval NGX_AUTO_LIB_SEARCH_BASE=\"\$${PFX}_SEARCH_BASE\"
-    eval NGX_AUTO_LIB_SEARCH_BASE_PREFIX=\"\$${PFX}_SEARCH_BASE_PREFIX\"
-    eval NGX_AUTO_LIB_SEARCH_PARENT=\"\$${PFX}_SEARCH_PARENT\"
-    eval NGX_AUTO_LIB_SEARCH_SYSTEM=\"\$${PFX}_SEARCH_SYSTEM\"
-    eval NGX_AUTO_LIB_SHARED=\"\$${PFX}_SHARED\"
-    eval NGX_AUTO_LIB_SYSTEM_DIRS=\"\$${PFX}_SYSTEM_DIR\"
-    eval USE_NGX_AUTO_LIB=\"\$USE_${LIB}\"
-
-    if [ ! "$NGX_AUTO_LIB_DIR" ]; then
-        NGX_AUTO_LIB_DIR=NONE
-    fi
-
-    if [ ! "$USE_NGX_AUTO_LIB" ]; then
-        if [ $ngx_feature_check_macros_defined -o $ngx_feature_check_macros_non_zero ]; then
-            USE_NGX_AUTO_LIB=MAYBE
-        elif [ "$ngx_feature_required" = no ]; then
-            USE_NGX_AUTO_LIB=MAYBE
-        else
-            USE_NGX_AUTO_LIB=YES
-        fi
-    fi
-
-    if [ ! "$NGX_AUTO_LIB_SYSTEM_DIRS" ]; then
-        NGX_AUTO_LIB_SYSTEM_DIRS=$NGX_AUTO_LIB_DEFAULT_SYSTEM_DIRS
-    fi
-
-    # TODO : add _STATIC, and do searches for both static and shared libs
-
-    if [ ! "$NGX_AUTO_LIB_SHARED" ]; then
-        if [ "$ngx_feature_shared" = no ]; then
-            NGX_AUTO_LIB_SHARED=NO
-        else
-            NGX_AUTO_LIB_SHARED=YES
-        fi
-    fi
-
-    NGX_AUTO_LIB_SEARCH_DEP=NO
-
-    # set default search methods
-    # Note : these can be over-ridden by setting NGX_AUTO_LIB_SEARCH_[type]=YES|NO
-
-    local auto=y
-
-    if [ "$NGX_AUTO_LIB_INC" ] || [ "$NGX_AUTO_LIB_LIB" ]; then
-        ngx_auto_lib_search  LIB_INC    YES
-        auto=n
-    fi
-
-    if [ "$NGX_AUTO_LIB_DIR" != NONE ]; then
-        ngx_auto_lib_search  DIR        YES
-        auto=n
-    fi
-
-    if [ "$NGX_AUTO_LIB_BASE" ]; then
-        ngx_auto_lib_search  BASE       YES
-        auto=n
-    fi
-
-    if [ $auto = y ]; then
-        ngx_auto_lib_search  PARENT     YES
-        ngx_auto_lib_search  SYSTEM     YES
-    fi
-
-    ngx_auto_lib_search  LIB_INC    NO
-    ngx_auto_lib_search  DIR        NO
-    ngx_auto_lib_search  BASE       NO
-    ngx_auto_lib_search  PARENT     NO
-    ngx_auto_lib_search  SYSTEM     NO
-
-    if [ ! "$ngx_feature_lib_names" ]; then
-        ngx_feature_lib_names=$pfx
-    fi
-
-    if [ ! "$ngx_feature_inc_names" ]; then
-        ngx_feature_inc_names=$ngx_feature_lib_names
-    fi
-
-    if [ ! "$ngx_feature_exit_if_not_found" ]; then
-        ngx_feature_exit_if_not_found=yes
-    fi
-}
-
-#######################
-## DEFAULT FUNCTIONS ##
-#######################
-
-ngx_auto_lib_set_default() {
-
-    local suffix=
-    if [ $1 ]; then
-        suffix="_$1"
-    fi
-
-    local def=$2
-    local var="NGX_AUTO_LIB$suffix"
-
-    val=
-    if [ ! `eval echo '$'$var` ]; then
-        eval $var=\"$def\"
-    fi
-
-    #eval echo "$var = \$$var"
-}
-
-ngx_auto_lib_search() {
-    ngx_auto_lib_set_default "SEARCH_$1" $2
-}
-
-####################
-## SAVE FUNCTIONS ##
-####################
-
-ngx_auto_lib_save_vars() {
-    OLD_CORE_DEPS=$CORE_DEPS
-    OLD_CORE_INCS=$CORE_INCS
-    OLD_CORE_LIBS=$CORE_LIBS
-    OLD_CORE_SRCS=$CORE_SRCS
-    OLD_LINK_DEPS=$LINK_DEPS
-
-    CORE_DEPS=
-    CORE_INCS=
-    CORE_LIBS=
-    CORE_SRCS=
-    LINK_DEPS=
-}
-
-ngx_auto_lib_reset_vars() {
-    CORE_DEPS=$OLD_CORE_DEPS
-    CORE_INCS=$OLD_CORE_INCS
-    CORE_LIBS=$OLD_CORE_LIBS
-    CORE_SRCS=$OLD_CORE_SRCS
-    LINK_DEPS=$OLD_LINK_DEPS
-}
-
-ngx_auto_lib_save_feature_vars() {
-    for var in $ngx_feature_all_vars; do
-        eval main_ngx_feature_$var=\"\$ngx_feature_$var\"
-    done
-}
-
-ngx_auto_lib_reset_feature_vars() {
-    for var in $ngx_feature_all_vars; do
-        eval ngx_feature_$var=\"\$main_ngx_feature_$var\"
-    done
-}
-
-########################
-## CHECKING FUNCTIONS ##
-########################
-
-ngx_auto_lib_check_auto_config() {
-
-    ngx_auto_lib_save_feature_vars
-    ngx_auto_lib_clean_feature_vars
-
-    ngx_feature=$1
-    ngx_feature_inc_path="`echo $CFLAGS | tr ' ' '\n' | grep -- -D | tr '\n' ' '`"
-    ngx_feature_incs="#include <$NGX_AUTO_CONFIG_H>"
-    ngx_feature_libs=
-    ngx_feature_path=`pwd`
-    ngx_feature_run=no
-    ngx_feature_test=$2
-
-    #ngx_auto_lib_print_feature_vars
-
-    . auto/feature
-
-    if [ $ngx_found = yes ]; then
-        rv=0
-    else
-        rv=1
-    fi
-
-    ngx_auto_lib_reset_feature_vars
-
-    return $rv
-}
-
-ngx_auto_lib_check_macro_defined() {
-
-    for m in $@; do
-        ngx_auto_lib_check_auto_config  "$m"  "
-    #ifndef $m
-        rubbish
-    #endif"  && return 0
-    done
-
-    return 1
-}
-
-ngx_auto_lib_check_macro_non_zero() {
-
-    for m in $@; do
-        ngx_auto_lib_check_auto_config  "$m" "
-    #if !($m)
-        rubbish
-    #endif"  && return 0
-    done
-
-    return 1
-}
-
-ngx_auto_lib_check_require() {
-
-    if [ $USE_NGX_AUTO_LIB = YES ]; then
-        return 0
-    elif [ $USE_NGX_AUTO_LIB = NO ]; then
-        return 1
-    fi
-
-
-    # check if the libraries are required elsewhere
-
-    for l in $ngx_feature_lib_names; do
-        [ ! "`echo $CORE_LIBS $ADDON_LIBS | grep -w -- -l$l`" ] && return 0
-    done
-
-
-
-    # check that any required macros are set
-
-    local d=$ngx_feature_check_macros_defined
-    local nz=$ngx_feature_check_macros_non_zero
-
-    if [ "$d" ] || [ "$nz" ]; then
-
-        ngx_auto_lib_check_macro_defined   $d  && return 0
-        ngx_auto_lib_check_macro_non_zero  $nz  && return 0
-    fi
-
-
-    ngx_auto_lib_check
-}
-
-ngx_auto_lib_check() {
-    return 1
-}
-
-##################################
-## TEST PHASE HANDLER FUNCTIONS ##
-##################################
-
-ngx_auto_lib_test() {
-    ngx_auto_lib_test_pre_setup "$@"
-    ngx_auto_lib_test_setup "$@"
-    ngx_auto_lib_test_post_setup "$@"
-    ngx_auto_lib_test_feature
-}
-
-ngx_auto_lib_test_pre_setup() {
-    return 0
-}
-
-ngx_auto_lib_test_setup() {
-
-    local INC=$1
-    local LIB=$2
-
-    ngx_auto_lib_inc_dir=$INC
-    ngx_auto_lib_lib_dir=$LIB
-
-    ngx_auto_lib_reset_feature_vars
-
-    if [ ! "$ngx_feature_path" ]; then
-        ngx_feature_path="$INC"
-    fi
-
-    ngx_feature_path="$ngx_feature_path $ngx_feature_add_path"
-
-    for sfx in $ngx_feature_path_suffixes; do
-        ngx_feature_path="$ngx_feature_path $INC/$sfx"
-    done
-
-
-    local inc=
-    local lib=
-    local incs="$ngx_feature_inc_names"
-    local libs="$ngx_feature_lib_names"
-    local lib_files="$ngx_feature_lib_files"
-
-    for inc in $incs; do
-        ngx_feature_incs="$ngx_feature_incs
-#include <$inc.h>"
-    done
-
-
-    if [ ! "$ngx_feature_libs" ]; then
-
-        if [ $NGX_AUTO_LIB_SHARED = YES ]; then
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R$LIB"
-            fi
-            ngx_feature_libs="$ngx_feature_libs -L$LIB"
-
-            for lib in $libs; do
-                ngx_feature_libs="$ngx_feature_libs -l$lib"
-            done
-
-            # TODO : only add --rpath when the path is not a standard system path - warn if /usr
-
-            ngx_feature_libs="$ngx_feature_libs -Wl,--rpath -Wl,$LIB"
-
-        else
-
-            for lib in $lib_files; do
-                ngx_feature_libs="$ngx_feature_libs $LIB/$lib"      
-            done
-
-            for lib in $libs; do
-                ngx_feature_libs="$ngx_feature_libs $LIB/lib$lib.a"
-            done
-        fi
-    fi
-
-    if [ ! $ngx_feature_run ]; then
-        ngx_feature_run=no
-    fi
-
-    if [ $NGX_AUTO_LIB_SHARED = YES ]; then
-
-        # Add a test to be called in auto/feature after compilation that will check 
-        # whether any libraries that are linked are in fact using the path provided to
-        # link libraries rather than a standard path. Note : this test will work on 
-        # all linked shared objects, even if supplied directly by setting 
-        # $ngx_feature_libs instead of usign $ngx_feature_lib_names
-
-        # TODO : allow for some libraries to not be checked here if desired - if part of system paths
-
-        libs="`echo $ngx_feature_libs | tr ' ' '\n' | grep -- -l | sed 's|-l||g'`"
-
-        local test="
-            for l in $libs; do
-                o="'\`ldd '$NGX_AUTOTEST' | grep '$LIB'/lib\$l\\.so\`;
-                if [ ! \"\$o\" ]; then
-                    chmod -x $NGX_AUTOTEST;
-                    echo Linker does not link to correct version
-                else
-                    chmod +x $NGX_AUTOTEST;
-                fi
-            done'
-        test="`echo "$test" | tr '\n' ' '`"
-
-        ngx_feature_test_libs="$ngx_feature_test_libs; $test"
-    fi
-
-    ngx_feature_libs="$ngx_feature_libs $ngx_feature_add_libs"
-    ngx_feature_libs_to_add="$ngx_feature_libs"
-    ngx_feature_libs="$ngx_feature_libs $ngx_feature_test_libs"
-    ngx_feature="$ngx_auto_lib_name library $ngx_feature"
-}
-
-ngx_auto_lib_test_post_setup() {
-    return 0
-}
-
-ngx_auto_lib_test_feature() {
-    #ngx_auto_lib_print_feature_vars
-    . auto/feature
-    [ $ngx_found = yes ] && return 0
-    return 1
-}
-
-########################
-## TEST DIR FUNCTIONS ##
-########################
-
-ngx_auto_lib_test_dir_pair() {
-    ngx_auto_lib_test_inc_dir=$1
-    ngx_auto_lib_test_lib_dir=$2
-
-    if [ $1 = $2 ]; then
-        ngx_feature="in $1$3"
-    else
-        ngx_feature="in $1 and $2$3"
-    fi
-    ngx_auto_lib_test "$1" "$2" "$3"
-}
-
-ngx_auto_lib_test_dir_pairs() {
-    ngx_auto_lib_test_dir_pair  "$1/include"  "$2/lib"  "$3"   && return 0
-    ngx_auto_lib_test_dir_pair  "$1"          "$2"      "$3"   && return 0
-    return 1
-}
-
-ngx_auto_lib_test_dirs() {
-
-    local msg="$1"
-    local bdir idir ldir
-
-    local bdirs=$ngx_feature_build_dirs
-    local idirs=$ngx_feature_build_inc_dirs
-    local ldirs=$ngx_feature_build_lib_dirs
-
-    shift
-
-    for dir in "$@"; do
-        ngx_auto_lib_test_dir=$dir
-
-        for ldir in $ldirs; do
-            for idir in $idirs; do
-                ngx_auto_lib_test_dir_pair   "$dir/$idir"  "$dir/$ldir"  "$msg"  && return 0
-            done
-        done
-
-        for ldir in $ldirs; do
-            ngx_auto_lib_test_dir_pair       "$dir"        "$dir/$ldir"  "$msg"  && return 0
-        done
-
-        for idir in $idirs; do
-            ngx_auto_lib_test_dir_pair       "$dir/$idir"  "$dir"        "$msg"  && return 0
-        done
-
-        for bdir in $bdirs; do
-            ngx_auto_lib_test_dir_pairs      "$dir/$bdir"  "$dir/$bdir"  "$msg"  && return 0
-        done
-
-        ngx_auto_lib_test_dir_pairs          "$dir"        "$dir"        "$msg"  && return 0
-        ngx_auto_lib_test_dir=
-    done
-
-    return 1
-}
-
-ngx_auto_lib_test_install_dirs() {
-
-    local msg="$1"
-    local dir=
-
-    shift
-
-    for dir in "$@"; do
-        ngx_auto_lib_test_dir=$dir
-        ngx_auto_lib_test_dir_pair  "$dir/include"  "$dir/lib"  "$msg"   && return 0
-        ngx_auto_lib_test_dir=
-    done
-
-    return 1
-}
-
-ngx_auto_lib_run_tests() {
-
-    local name="$ngx_auto_lib_name"
-    local pfx="$ngx_auto_lib_pfx"
-    local PFX="$NGX_AUTO_LIB_PFX"
-    local INC="$NGX_AUTO_LIB_INC"
-    local LIB="$NGX_AUTO_LIB_LIB"
-    local DIR="$NGX_AUTO_LIB_DIR"
-    local BASE="$NGX_AUTO_LIB_BASE"
-    local MSG="$NGX_AUTO_LIB_MSG"
-
-
-    ngx_found=no
-
-
-    # dependency
-
-    if [ $NGX_AUTO_LIB_SEARCH_DEP = YES ]; then
-        ngx_auto_lib_test_dir_pair  "$INC"  "$LIB"  "$MSG"
-        return $?
-    fi
-
-
-    # lib and include dirs set explicitly (e.g. $OPENSSL_INC, $OPENSSL_LIB)
-
-    if [ $NGX_AUTO_LIB_SEARCH_LIB_INC = YES ]; then
-        ngx_auto_lib_test_dir_pair  "$INC"  "$LIB"  " (specified by \$${PFX}_INC and \$${PFX}_LIB)"  && return 0
-    fi
-
-
-    # path specified by ${PFX} (e.g. $OPENSSL, $PCRE)
-    # Note : these will be set automatically by configure for OpenSSL, PCRE, Zlib etc
-    # TODO : change to searching more than one path
-
-    if [ $NGX_AUTO_LIB_SEARCH_DIR = YES ] && [ $DIR != NONE ]; then
-        ngx_auto_lib_test_dirs  " (specified by \$${PFX})"  $DIR  && return 0
-    fi
-
-
-    # directories beginning with '$pfx-' that are in $NGX_AUTO_LIB_BASE (e.g. $OPENSSL_BASE)
-
-    if [ $NGX_AUTO_LIB_SEARCH_BASE = YES ] && [ $BASE ]; then
-
-        p=$NGX_AUTO_LIB_SEARCH_BASE_PREFIX
-
-        if [ "$p" = YES ]; then
-            p="!ame $pfx-*"
-        elif [ "$p" ]; then
-            p="!ame $p*"
-        fi
-
-        ngx_auto_lib_test_dirs " (found under \$${PFX}_BASE)" \
-                `find $BASE/* -maxdepth 0 -type d $p 2> /dev/null | sort -r`  && return 0
-    fi
-
-
-    # directories beginning with '$pfx-' that are in the same directory as the Nginx source
-
-    if [ $NGX_AUTO_LIB_SEARCH_PARENT = YES ]; then
-        local src_dir=`cd ..; pwd`
-        ngx_auto_lib_test_dirs " (found under Nginx source parent dir)" \
-                `find $src_dir/* -maxdepth 0 -type d !ame $pfx-* 2> /dev/null | sort -r` && return 0
-    fi
-
-
-    # system folders
-
-    if [ $NGX_AUTO_LIB_SEARCH_SYSTEM = YES ]; then
-        ngx_auto_lib_test_install_dirs  ""  $NGX_AUTO_LIB_SYSTEM_DIRS  && return 0
-    fi
-
-    return 1
-}
-
-#######################
-## HANDLER FUNCTIONS ##
-#######################
-
-ngx_auto_lib_run() {
-    ngx_auto_lib_get_variables
-    eval AUTO_$NGX_AUTO_LIB_PFX=NO
-
-    ngx_auto_lib_check_require  || return
-    ngx_auto_lib_setup          || return
-    ngx_auto_lib_save_feature_vars
-    ngx_auto_lib_run_tests
-    ngx_auto_lib_post_tests     || return
-    ngx_auto_lib_finalize
-}
-
-ngx_auto_lib_print_feature_vars() {
-    echo ----------------------------
-    for var in $ngx_feature_vars; do
-        eval "echo ngx_feature_$var = \$ngx_feature_$var"
-    done
-    echo ----------------------------
-}
-
-ngx_auto_lib_setup() {
-    return 0
-}
-
-ngx_auto_lib_post_tests() {
-    return 0
-}
-
-#############################
-## SET VARIABLES FUNCTIONS ##
-#############################
-
-# TODO : add HTTP/ADDON settings too
-
-ngx_auto_lib_set_core_variables() {
-    # TODO : don't add includes / libs more than once
-
-    eval CORE_DEPS=\"$CORE_DEPS $ngx_feature_deps\"
-    eval CORE_INCS=\"$CORE_INCS $ngx_feature_path\"
-    eval CORE_LIBS=\"$CORE_LIBS $ngx_feature_libs_to_add\"
-    eval CORE_SRCS=\"$CORE_SRCS $ngx_feature_srcs\"
-}
-
-ngx_auto_lib_set_generic_variables() {
-    local INC=$ngx_auto_lib_test_inc_dir
-    local LIB=$ngx_auto_lib_test_lib_dir
-
-    modules="$modules $ngx_feature_modules"
-
-    for have in $ngx_feature_haves; do
-        . auto/have
-    done
-
-    set - $ngx_feature_defines
-
-    while [ $1 ]; do
-        have=$1
-        value=$2
-        . auto/define
-    done
-
-    local PFX=$NGX_AUTO_LIB_PFX
-
-    eval USE_$PFX=NO
-
-    if [ $ngx_auto_lib_test_dir ]; then
-        eval $PFX=$ngx_auto_lib_test_dir
-    else
-        eval $PFX=$ngx_auto_lib_lib_dir
-    fi
-
-    if [ $NGX_AUTO_LIB_SHARED != YES ]; then
-        for l in $ngx_feature_lib_names; do
-            CORE_LIBS=`echo $CORE_LIBS | sed 's|-\<l$l\>||g'`
-            ADDON_LIBS=`echo $ADDON_LIBS | sed 's|-\<l$l\>||g'`
-        done
-    fi
-
-    eval ${PFX}_INC=$INC
-    eval ${PFX}_LIB=$LIB
-    eval ${PFX}_SHARED=$NGX_AUTO_LIB_SHARED
-    eval AUTO_$PFX=YES
-}
-
-ngx_auto_lib_set_custom_variables() {
-    return 0
-}
-
-########################
-## FINALIZE FUNCTIONS ##
-########################
-
-ngx_auto_lib_finalize() {
-    ngx_auto_lib_finalize_core
-}
-
-ngx_auto_lib_finalize_core() {
-
-    if [ $ngx_found = yes ]; then
-
-        ngx_auto_lib_set_core_variables
-        ngx_auto_lib_set_generic_variables
-
-        if [ "$ngx_feature_variables" ]; then
-            eval $ngx_feature_variables
-        fi
-
-        ngx_auto_lib_set_custom_variables
-
-    elif [ $ngx_feature_exit_if_not_found = yes ]; then
-
-        if [ $ngx_auto_lib_module_name ]; then
-            module_txt=" by the $ngx_auto_lib_module_name module" 
-        else
-            module_text=
-        fi        
-
-        lib=$ngx_auto_lib_name
-        pfx=$ngx_auto_lib_pfx
-        PFX=$NGX_AUTO_LIB_PFX
-
-cat << END
-
-$0: error: the $lib library is required$module_txt, but cannot
-be found using the current configuration. In order for the compilation to succeed,
-you will need to install the library using your system's package installer or point
-the configure script to the library using one of the following variables :
-
-to define a dir to find $pfx library (source or install dir)    $PFX
-to define $pfx lib and include dirs separately                  ${PFX}_LIB & ${PFX}_INC
-to define a base dir to search for dirs beginning with $pfx-    ${PFX}_BASE
-
-e.g.
-
-$ export ${PFX}_LIB=/path/to/library/lib
-$ export ${PFX}_LIB=/path/to/library/include
-$ $0 ...
-
-END
-        exit 1
-    fi
-}
-
diff --git a/debian/modules/http-ndk/notes/CHANGES b/debian/modules/http-ndk/notes/CHANGES
deleted file mode 100644
index eaaef0b..0000000
--- a/debian/modules/http-ndk/notes/CHANGES
+++ /dev/null
@@ -1,17 +0,0 @@
-Changelog
----------
-
-0.1         feature : set_var functions
-0.1.1       feature : upstream_list directive and functions
-0.2         feature : conf merge functions
-            feature : conf command macros
-            feature : 'action' macros
-0.2.1       bugfix  : ndk_map_uri_to_path_add_suffix
-0.2.2       feature : regex conf functions
-0.2.3       feature : version number
-0.2.4       change  : the auto/build script is now executed automatically on compilation
-0.2.9       feature : ngx_auto_lib included with source
-0.2.11      bugfix  : hash functions did not display properly
-0.2.12      feature : patches for rewrite functions and rewrite phase handler
-0.2.13      change  : revert to old behaviour rewrite functions
-            change  : pre-generated config and macro files now provided
\ No newline at end of file
diff --git a/debian/modules/http-ndk/notes/LICENSE b/debian/modules/http-ndk/notes/LICENSE
deleted file mode 100644
index 7074f57..0000000
--- a/debian/modules/http-ndk/notes/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2010, Marcus Clyne, Simpl (simpl.it)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the organization (Simpl) nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL MARCUS CLYNE OR SIMPL BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/http-ndk/objs/ndk_array.h b/debian/modules/http-ndk/objs/ndk_array.h
deleted file mode 100644
index 4e0d518..0000000
--- a/debian/modules/http-ndk/objs/ndk_array.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-/* 
- * 2010 (C) Marcus Clyne 
- *
- * DO NOT EDIT THIS FILE MANUALLY
- * ------------------------------
- * This file has been generated automatically from scripts in the $base/auto dir and
- * data in the $base/auto/data dir. If you wish to edit the output of this file, then
- * you should edit these files instead.
- *
-*/
-
-
-/* Non-generated macros */
-
-#define     ndk_array_count(a)                  ((a)->nelts)
-#define     ndk_array_get_first(a)              ((a)->elts)
-#define     ndk_array_get_index(a,n)            ((void*) ((char*) (a)->elts + (a)->size * n))
-#define     ndk_array_get_last(a)               ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1)))
-#define     ndk_array_get_reverse_index(a,n)    ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1 - n)))
-#define     ndk_array_push_clean(p,a)           {p = ngx_array_push (a); ndk_zerop (p);}
-
-
-/* base action macro macros */
-
-#define     ndk_array_create_ac(a,pl,n,sz,ac)   {a = ngx_array_create (pl,n,sz); if (a == NULL) ac;}
-#define     ndk_array_init_ac(a,pl,n,sz,ac)     {if (ngx_array_init (a,pl,n,sz) == NGX_ERROR) ac;}
-#define     ndk_array_push_ac(p,a,ac)           {p = ngx_array_push (a);     if (p == NULL) ac;}
-#define     ndk_array_push_clean_ac(p,a,ac)     {p = ngx_array_push (a);     if (p == NULL) ac; ndk_zerop (p);}
-#define     ndk_array_push_n_ac(p,a,n,ac)       {p = ngx_array_push_n (a,n); if (p == NULL) ac;}
-#define     ndk_array_push_n_clean_ac(p,a,n,ac) {p = ngx_array_push_n (a,n); if (p == NULL) ac; ndk_zeropn (p,n);}
-
-
-/* generated action macros */
-
-#define     ndk_array_create_r0(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,return 0)
-#define     ndk_array_create_r1(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,return 1)
-#define     ndk_array_create_r_1(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,return -1)
-#define     ndk_array_create_rok(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,return NGX_OK)
-#define     ndk_array_create_rce(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,return NGX_CONF_ERROR)
-#define     ndk_array_create_rcok(a,pl,n,sz)    ndk_array_create_ac        (a,pl,n,sz,return NGX_CONF_OK)
-#define     ndk_array_create_re(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,return NGX_ERROR)
-#define     ndk_array_create_rn(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,return NULL)
-#define     ndk_array_create_rse(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,{ngx_script_error (e); return;})
-#define     ndk_array_create_sce(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,{ngx_script_configure_error (c); return;})
-#define     ndk_array_create_g(a,pl,n,sz,_lb)   ndk_array_create_ac        (a,pl,n,sz,goto _lb)
-#define     ndk_array_create_ge(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,goto error)
-
-#define     ndk_array_init_r0(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,return 0)
-#define     ndk_array_init_r1(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,return 1)
-#define     ndk_array_init_r_1(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,return -1)
-#define     ndk_array_init_rok(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,return NGX_OK)
-#define     ndk_array_init_rce(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,return NGX_CONF_ERROR)
-#define     ndk_array_init_rcok(a,pl,n,sz)      ndk_array_init_ac          (a,pl,n,sz,return NGX_CONF_OK)
-#define     ndk_array_init_re(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,return NGX_ERROR)
-#define     ndk_array_init_rn(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,return NULL)
-#define     ndk_array_init_rse(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,{ngx_script_error (e); return;})
-#define     ndk_array_init_sce(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,{ngx_script_configure_error (c); return;})
-#define     ndk_array_init_g(a,pl,n,sz,_lb)     ndk_array_init_ac          (a,pl,n,sz,goto _lb)
-#define     ndk_array_init_ge(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,goto error)
-
-#define     ndk_array_push_r0(p,a)              ndk_array_push_ac          (p,a,return 0)
-#define     ndk_array_push_r1(p,a)              ndk_array_push_ac          (p,a,return 1)
-#define     ndk_array_push_r_1(p,a)             ndk_array_push_ac          (p,a,return -1)
-#define     ndk_array_push_rok(p,a)             ndk_array_push_ac          (p,a,return NGX_OK)
-#define     ndk_array_push_rce(p,a)             ndk_array_push_ac          (p,a,return NGX_CONF_ERROR)
-#define     ndk_array_push_rcok(p,a)            ndk_array_push_ac          (p,a,return NGX_CONF_OK)
-#define     ndk_array_push_re(p,a)              ndk_array_push_ac          (p,a,return NGX_ERROR)
-#define     ndk_array_push_rn(p,a)              ndk_array_push_ac          (p,a,return NULL)
-#define     ndk_array_push_rse(p,a)             ndk_array_push_ac          (p,a,{ngx_script_error (e); return;})
-#define     ndk_array_push_sce(p,a)             ndk_array_push_ac          (p,a,{ngx_script_configure_error (c); return;})
-#define     ndk_array_push_g(p,a,_lb)           ndk_array_push_ac          (p,a,goto _lb)
-#define     ndk_array_push_ge(p,a)              ndk_array_push_ac          (p,a,goto error)
-
-#define     ndk_array_push_clean_r0(p,a)        ndk_array_push_clean_ac    (p,a,return 0)
-#define     ndk_array_push_clean_r1(p,a)        ndk_array_push_clean_ac    (p,a,return 1)
-#define     ndk_array_push_clean_r_1(p,a)       ndk_array_push_clean_ac    (p,a,return -1)
-#define     ndk_array_push_clean_rok(p,a)       ndk_array_push_clean_ac    (p,a,return NGX_OK)
-#define     ndk_array_push_clean_rce(p,a)       ndk_array_push_clean_ac    (p,a,return NGX_CONF_ERROR)
-#define     ndk_array_push_clean_rcok(p,a)      ndk_array_push_clean_ac    (p,a,return NGX_CONF_OK)
-#define     ndk_array_push_clean_re(p,a)        ndk_array_push_clean_ac    (p,a,return NGX_ERROR)
-#define     ndk_array_push_clean_rn(p,a)        ndk_array_push_clean_ac    (p,a,return NULL)
-#define     ndk_array_push_clean_rse(p,a)       ndk_array_push_clean_ac    (p,a,{ngx_script_error (e); return;})
-#define     ndk_array_push_clean_sce(p,a)       ndk_array_push_clean_ac    (p,a,{ngx_script_configure_error (c); return;})
-#define     ndk_array_push_clean_g(p,a,_lb)     ndk_array_push_clean_ac    (p,a,goto _lb)
-#define     ndk_array_push_clean_ge(p,a)        ndk_array_push_clean_ac    (p,a,goto error)
-
-#define     ndk_array_push_n_r0(p,a,n)          ndk_array_push_n_ac        (p,a,n,return 0)
-#define     ndk_array_push_n_r1(p,a,n)          ndk_array_push_n_ac        (p,a,n,return 1)
-#define     ndk_array_push_n_r_1(p,a,n)         ndk_array_push_n_ac        (p,a,n,return -1)
-#define     ndk_array_push_n_rok(p,a,n)         ndk_array_push_n_ac        (p,a,n,return NGX_OK)
-#define     ndk_array_push_n_rce(p,a,n)         ndk_array_push_n_ac        (p,a,n,return NGX_CONF_ERROR)
-#define     ndk_array_push_n_rcok(p,a,n)        ndk_array_push_n_ac        (p,a,n,return NGX_CONF_OK)
-#define     ndk_array_push_n_re(p,a,n)          ndk_array_push_n_ac        (p,a,n,return NGX_ERROR)
-#define     ndk_array_push_n_rn(p,a,n)          ndk_array_push_n_ac        (p,a,n,return NULL)
-#define     ndk_array_push_n_rse(p,a,n)         ndk_array_push_n_ac        (p,a,n,{ngx_script_error (e); return;})
-#define     ndk_array_push_n_sce(p,a,n)         ndk_array_push_n_ac        (p,a,n,{ngx_script_configure_error (c); return;})
-#define     ndk_array_push_n_g(p,a,n,_lb)       ndk_array_push_n_ac        (p,a,n,goto _lb)
-#define     ndk_array_push_n_ge(p,a,n)          ndk_array_push_n_ac        (p,a,n,goto error)
-
-#define     ndk_array_push_n_clean_r0(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,return 0)
-#define     ndk_array_push_n_clean_r1(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,return 1)
-#define     ndk_array_push_n_clean_r_1(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,return -1)
-#define     ndk_array_push_n_clean_rok(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,return NGX_OK)
-#define     ndk_array_push_n_clean_rce(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,return NGX_CONF_ERROR)
-#define     ndk_array_push_n_clean_rcok(p,a,n)  ndk_array_push_n_clean_ac  (p,a,n,return NGX_CONF_OK)
-#define     ndk_array_push_n_clean_re(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,return NGX_ERROR)
-#define     ndk_array_push_n_clean_rn(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,return NULL)
-#define     ndk_array_push_n_clean_rse(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,{ngx_script_error (e); return;})
-#define     ndk_array_push_n_clean_sce(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,{ngx_script_configure_error (c); return;})
-#define     ndk_array_push_n_clean_g(p,a,n,_lb) ndk_array_push_n_clean_ac  (p,a,n,goto _lb)
-#define     ndk_array_push_n_clean_ge(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,goto error)
-
diff --git a/debian/modules/http-ndk/objs/ndk_conf_cmd_basic.h b/debian/modules/http-ndk/objs/ndk_conf_cmd_basic.h
deleted file mode 100644
index c2db894..0000000
--- a/debian/modules/http-ndk/objs/ndk_conf_cmd_basic.h
+++ /dev/null
@@ -1,2203 +0,0 @@
-
-/*
- * 2010 (C) Marcus Clyne
- *
- * DO NOT EDIT THIS FILE MANUALLY
- * ------------------------------
- * This file has been generated automatically from scripts in the $base/auto dir and
- * data in the $base/auto/data dir. If you wish to edit the output of this file, then
- * you should edit these files instead.
- *
-*/
-
-
-/* conf cmd core values/bitmasks */
-
-#define     NDK_1MORE               NGX_1MORE
-#define     NDK_2MORE               NGX_2MORE
-#define     NDK_ANY                 NGX_ANY
-#define     NDK_ARGS_NUMBER         NGX_ARGS_NUMBER
-#define     NDK_BLOCK               NGX_BLOCK
-#define     NDK_FLAG                NGX_FLAG
-#define     NDK_MULTI               NGX_MULTI
-#define     NDK_TAKE1               NGX_TAKE1
-#define     NDK_TAKE12              NGX_TAKE12
-#define     NDK_TAKE123             NGX_TAKE123
-#define     NDK_TAKE1234            NGX_TAKE1234
-#define     NDK_TAKE13              NGX_TAKE13
-#define     NDK_TAKE2               NGX_TAKE2
-#define     NDK_TAKE23              NGX_TAKE23
-#define     NDK_TAKE3               NGX_TAKE3
-#define     NDK_TAKE4               NGX_TAKE4
-#define     NDK_TAKE5               NGX_TAKE5
-#define     NDK_TAKE6               NGX_TAKE6
-#define     NDK_TAKE7               NGX_TAKE7
-#define     NDK_TAKE8               NGX_TAKE8
-
-
-/* conf cmd bitmasks */
-
-/* TODO : finish this */
-
-#define     NDK_HTTP_MAIN_CONF              NGX_HTTP_MAIN_CONF
-#define     NDK_HTTP_SRV_CONF               NGX_HTTP_SRV_CONF
-#define     NDK_HTTP_SIF_CONF               NGX_HTTP_SIF_CONF
-#define     NDK_HTTP_LOC_CONF               NGX_HTTP_LOC_CONF
-#define     NDK_HTTP_LIF_CONF               NGX_HTTP_LIF_CONF
-#define     NDK_HTTP_UPS_CONF               NGX_HTTP_UPS_CONF
-#define     NDK_MAIN_CONF                   NGX_MAIN_CONF
-#define     NDK_ANY_CONF                    NGX_ANY_CONF
-
-
-/* compound locations */
-
-#define     NDK_HTTP_MAIN_SRV_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_CONF
-#define     NDK_HTTP_MAIN_SIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_SIF_CONF
-#define     NDK_HTTP_MAIN_LOC_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_CONF
-#define     NDK_HTTP_MAIN_LIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_LIF_CONF
-
-#define     NDK_HTTP_SRV_SIF_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_SIF_CONF
-#define     NDK_HTTP_SRV_LOC_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_CONF
-#define     NDK_HTTP_SRV_LOC_LIF_CONF               NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_LIF_CONF
-#define     NDK_HTTP_SRV_SIF_LOC_CONF               NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_CONF
-#define     NDK_HTTP_SRV_SIF_LOC_LIF_CONF           NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_LIF_CONF
-
-#define     NDK_HTTP_LOC_LIF_CONF                   NDK_HTTP_LOC_CONF|NDK_HTTP_LIF_CONF
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LOC_CONF
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LIF_CONF
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SIF_LOC_CONF
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF      NDK_HTTP_SRV_SIF_LOC_LIF_CONF|NDK_MAIN_CONF
-#define     NDK_HTTP_CONF                           NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF
-#define     NDK_HTTP_ANY_CONF                       NDK_HTTP_CONF|NDK_HTTP_UPS_CONF
-
-
-/* property offsets     NOTE : ngx_module_main_conf_t etc should be defined in the module's .c file before the commands */
-
-#define     NDK_HTTP_MAIN_CONF_PROP(p)      NGX_HTTP_MAIN_CONF_OFFSET, offsetof (ndk_module_main_conf_t, p)
-#define     NDK_HTTP_SRV_CONF_PROP(p)       NGX_HTTP_SRV_CONF_OFFSET, offsetof (ndk_module_srv_conf_t, p)
-#define     NDK_HTTP_LOC_CONF_PROP(p)       NGX_HTTP_LOC_CONF_OFFSET, offsetof (ndk_module_loc_conf_t, p)
-
-
-/* conf cmd basic macros */
-
-#define     NDK_HTTP_MAIN_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_1MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_1MORE|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_2MORE(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_2MORE|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_ANY(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ANY|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_ARGS_NUMBER|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_BLOCK(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_BLOCK|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_FLAG(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_FLAG|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_MULTI(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_MULTI|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE1(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE12(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE12|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE123(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE123|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE1234(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE1234|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE13(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE13|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE2(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE2|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE23(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE23|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE3(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE3|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE4(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE4|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE5(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE5|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE6(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE6|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE7(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE7|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
-#define     NDK_HTTP_MAIN_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LOC_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_LIF_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SRV_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LOC_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SRV_LIF_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LOC_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_SIF_LIF_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_SIF_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SRV_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SRV_LIF_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_UPS_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_UPS_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_HTTP_ANY_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_HTTP_ANY_CONF,\
-                                    func, off1, off2, post},
-
-#define     NDK_ANY_CONF_TAKE8(name,func,off1,off2,post)\
-                                    {ngx_string (name),\
-                                    NGX_CONF_TAKE8|NDK_ANY_CONF,\
-                                    func, off1, off2, post},
-
-
diff --git a/debian/modules/http-ndk/objs/ndk_conf_cmd_extra.h b/debian/modules/http-ndk/objs/ndk_conf_cmd_extra.h
deleted file mode 100644
index 68e276f..0000000
--- a/debian/modules/http-ndk/objs/ndk_conf_cmd_extra.h
+++ /dev/null
@@ -1,5423 +0,0 @@
-
-/*
- * 2010 (C) Marcus Clyne
- *
- * DO NOT EDIT THIS FILE MANUALLY
- * ------------------------------
- * This file has been generated automatically from scripts in the $base/auto dir and
- * data in the $base/auto/data dir. If you wish to edit the output of this file, then
- * you should edit these files instead.
- *
-*/
-
-
-/* conf command macros */
-
-#define     NDK_HTTP_MAIN_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_MAIN_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_UPS_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_BITMASK(name,p,post)\
-            NDK_HTTP_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_BITMASK(name,p,post)\
-            NDK_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_bitmask_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_BUFS(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_BUFS(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_BUFS(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_BUFS(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_BUFS(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_BUFS(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_BUFS(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_BUFS(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_BUFS(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_BUFS(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_BUFS(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_BUFS(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_BUFS(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_BUFS(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_BUFS(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_BUFS(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_BUFS(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_BUFS(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_BUFS(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_BUFS(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_BUFS(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_bufs_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_COMPLEX_KEYVAL(name,p,post)\
-            NDK_ANY_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_http_complex_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_COMPLEX_PATH(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_UPS_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_HTTP_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
-            NDK_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_http_complex_value_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_COMPLEX_VALUE(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_http_complex_value_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_ENCODING(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_ENCODING(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_encoding_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_ENUM(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_ENUM(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_ENUM(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_ENUM(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_ENUM(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_ENUM(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_ENUM(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_ENUM(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_ENUM(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_ENUM(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_ENUM(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_ENUM(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_ENUM(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ENUM(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ENUM(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ENUM(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ENUM(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_ENUM(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_ENUM(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_ENUM(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_ENUM(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_enum_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_FALSE(name,p,post)\
-            NDK_HTTP_MAIN_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_FALSE(name,p,post)\
-            NDK_HTTP_SRV_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_FALSE(name,p,post)\
-            NDK_HTTP_SIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_FALSE(name,p,post)\
-            NDK_HTTP_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_FALSE(name,p,post)\
-            NDK_HTTP_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_FALSE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_FALSE(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_FALSE(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_FALSE(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_FALSE(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_FALSE(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_FALSE(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_FALSE(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_FALSE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_FALSE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_FALSE(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_FALSE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_FALSE(name,p,post)\
-            NDK_HTTP_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_FALSE(name,p,post)\
-            NDK_HTTP_UPS_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_FALSE(name,p,post)\
-            NDK_HTTP_ANY_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_FALSE(name,p,post)\
-            NDK_ANY_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_false_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_FULL_PATH(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_FULL_PATH(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_full_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_KEYVAL1(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_KEYVAL1(name,p,post)\
-            NDK_ANY_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval1_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_KEYVAL(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_KEYVAL(name,p,post)\
-            NDK_ANY_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_keyval_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_MSEC(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_MSEC(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_MSEC(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_MSEC(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_MSEC(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_MSEC(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_MSEC(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_MSEC(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_MSEC(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_MSEC(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_MSEC(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_MSEC(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_MSEC(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_MSEC(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_MSEC(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_MSEC(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_MSEC(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_MSEC(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_MSEC(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_MSEC(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_MSEC(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_msec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_NULL(name,p,post)\
-            NDK_HTTP_MAIN_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_NULL(name,p,post)\
-            NDK_HTTP_SRV_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_NULL(name,p,post)\
-            NDK_HTTP_SIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_NULL(name,p,post)\
-            NDK_HTTP_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_NULL(name,p,post)\
-            NDK_HTTP_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_NULL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_NULL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_NULL(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_NULL(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_NULL(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_NULL(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_NULL(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_NULL(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_NULL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_NULL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_NULL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NULL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_NULL(name,p,post)\
-            NDK_HTTP_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_NULL(name,p,post)\
-            NDK_HTTP_UPS_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_NULL(name,p,post)\
-            NDK_HTTP_ANY_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_NULL(name,p,post)\
-            NDK_ANY_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_null_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_NUM64(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_NUM64(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_NUM64(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_NUM64(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_NUM64(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_NUM64(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_NUM64(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_NUM64(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_NUM64(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_NUM64(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_NUM64(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_NUM64(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_NUM64(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_NUM64(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_NUM64(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_NUM64(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NUM64(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_NUM64(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_NUM64(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_NUM64(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_NUM64(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num64_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_NUM_FLAG(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_NUM_FLAG(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_NUM(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_NUM(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_NUM(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_NUM(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_NUM(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_NUM(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_NUM(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_NUM(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_NUM(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_NUM(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_NUM(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_NUM(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_NUM(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_NUM(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_NUM(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_NUM(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NUM(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_NUM(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_NUM(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_NUM(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_NUM(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_num_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_OFF(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_OFF(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_OFF(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_OFF(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_OFF(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_OFF(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_OFF(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_OFF(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_OFF(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_OFF(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_OFF(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_OFF(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_OFF(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_OFF(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_OFF(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_OFF(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_OFF(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_OFF(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_OFF(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_OFF(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_OFF(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_off_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_MAIN_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_SRV_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_SIF_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_LOC_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_LIF_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_UPS_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_ONOFF(name,p,post)\
-            NDK_HTTP_ANY_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_ONOFF(name,p,post)\
-            NDK_ANY_CONF_FLAG\
-                (name,\
-                ndk_conf_set_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_PATH(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_PATH(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_PATH(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_PATH(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_PATH(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_PATH(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_PATH(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_PATH(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_PATH(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_PATH(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_PATH(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_PATH(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_PATH(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_PATH(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_PATH(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_PATH(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_split_path_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_PTR(name,p,post)\
-            NDK_HTTP_MAIN_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_PTR(name,p,post)\
-            NDK_HTTP_SRV_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_PTR(name,p,post)\
-            NDK_HTTP_SIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_PTR(name,p,post)\
-            NDK_HTTP_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_PTR(name,p,post)\
-            NDK_HTTP_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_PTR(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_PTR(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_PTR(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_PTR(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_PTR(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_PTR(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_PTR(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_PTR(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_PTR(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_PTR(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_PTR(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_PTR(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_PTR(name,p,post)\
-            NDK_HTTP_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_PTR(name,p,post)\
-            NDK_HTTP_UPS_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_PTR(name,p,post)\
-            NDK_HTTP_ANY_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_PTR(name,p,post)\
-            NDK_ANY_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_ptr_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_UPS_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_HTTP_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_REGEX_ARRAY(name,p,post)\
-            NDK_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_MAIN_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_UPS_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_HTTP_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_REGEX_ARRAY_CL(name,p,post)\
-            NDK_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_regex_array_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_REGEX_CL(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_REGEX_CL(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_caseless_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_REXEX(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_REXEX(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_REXEX(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_REXEX(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_REXEX(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_REXEX(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_REXEX(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_REXEX(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_REXEX(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_REXEX(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_REXEX(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_REXEX(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_REXEX(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_REXEX(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_REXEX(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_REXEX(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_REXEX(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_REXEX(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_REXEX(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_REXEX(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_REXEX(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_regex_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_SEC_FLAG(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_SEC_FLAG(name,p,post)\
-            NDK_ANY_CONF_TAKE2\
-                (name,\
-                ndk_conf_set_sec_flag_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_SEC(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_SEC(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_SEC(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_SEC(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_SEC(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_SEC(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_SEC(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_SEC(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_SEC(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_SEC(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_SEC(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_SEC(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_SEC(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_SEC(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_SEC(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_SEC(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_SEC(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_SEC(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_SEC(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_SEC(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_SEC(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_sec_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_SIZE(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_SIZE(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_SIZE(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_SIZE(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_SIZE(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_SIZE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_SIZE(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_SIZE(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_SIZE(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_SIZE(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_SIZE(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_SIZE(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_SIZE(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_SIZE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_SIZE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_SIZE(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_SIZE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_SIZE(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_SIZE(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_SIZE(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_SIZE(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_size_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_UPS_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_STR_ARRAY(name,p,post)\
-            NDK_HTTP_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_STR_ARRAY(name,p,post)\
-            NDK_ANY_CONF_1MORE\
-                (name,\
-                ndk_conf_set_str_array_multi_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_STR_ARRAY1(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_STR_ARRAY1(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_array_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_STR(name,p,post)\
-            NDK_HTTP_MAIN_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_STR(name,p,post)\
-            NDK_HTTP_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_STR(name,p,post)\
-            NDK_HTTP_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_STR(name,p,post)\
-            NDK_HTTP_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_STR(name,p,post)\
-            NDK_HTTP_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_STR(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_STR(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_STR(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_STR(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_STR(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_STR(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_STR(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_STR(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_STR(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_STR(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_STR(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_STR(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_STR(name,p,post)\
-            NDK_HTTP_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_STR(name,p,post)\
-            NDK_HTTP_UPS_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_STR(name,p,post)\
-            NDK_HTTP_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_STR(name,p,post)\
-            NDK_ANY_CONF_TAKE1\
-                (name,\
-                ndk_conf_set_str_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
-#define     NDK_HTTP_MAIN_CONF_TRUE(name,p,post)\
-            NDK_HTTP_MAIN_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_MAIN_CONF_OFFSET,\
-                offsetof (ndk_module_main_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_CONF_TRUE(name,p,post)\
-            NDK_HTTP_SRV_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_CONF_TRUE(name,p,post)\
-            NDK_HTTP_SIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LOC_CONF_TRUE(name,p,post)\
-            NDK_HTTP_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_LIF_CONF_TRUE(name,p,post)\
-            NDK_HTTP_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_CONF_TRUE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_CONF_TRUE(name,p,post)\
-            NDK_HTTP_MAIN_SIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_SRV_CONF_OFFSET,\
-                offsetof (ndk_module_srv_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LOC_CONF_TRUE(name,p,post)\
-            NDK_HTTP_MAIN_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_LIF_CONF_TRUE(name,p,post)\
-            NDK_HTTP_MAIN_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LOC_CONF_TRUE(name,p,post)\
-            NDK_HTTP_SRV_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SRV_LIF_CONF_TRUE(name,p,post)\
-            NDK_HTTP_SRV_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LOC_CONF_TRUE(name,p,post)\
-            NDK_HTTP_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_SIF_LIF_CONF_TRUE(name,p,post)\
-            NDK_HTTP_SIF_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TRUE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TRUE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_LIF_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TRUE(name,p,post)\
-            NDK_HTTP_MAIN_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TRUE(name,p,post)\
-            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_CONF_TRUE(name,p,post)\
-            NDK_HTTP_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_UPS_CONF_TRUE(name,p,post)\
-            NDK_HTTP_UPS_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_HTTP_ANY_CONF_TRUE(name,p,post)\
-            NDK_HTTP_ANY_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-#define     NDK_ANY_CONF_TRUE(name,p,post)\
-            NDK_ANY_CONF_NOARGS\
-                (name,\
-                ndk_conf_set_true_slot,\
-                NGX_HTTP_LOC_CONF_OFFSET,\
-                offsetof (ndk_module_loc_conf_t, p),\
-                post)
-
-
diff --git a/debian/modules/http-ndk/objs/ndk_conf_merge.h b/debian/modules/http-ndk/objs/ndk_conf_merge.h
deleted file mode 100644
index 4f7855f..0000000
--- a/debian/modules/http-ndk/objs/ndk_conf_merge.h
+++ /dev/null
@@ -1,227 +0,0 @@
-
-/* 
- * 2010 (C) Marcus Clyne 
- *
- * DO NOT EDIT THIS FILE MANUALLY
- * ------------------------------
- * This file has been generated automatically from scripts in the $base/auto dir and
- * data in the $base/auto/data dir. If you wish to edit the output of this file, then
- * you should edit these files instead.
- *
-*/
-
-
-/* conf-merge-value macros */
-
-/* TODO : check that all the main types have a corresponding merge function */
-
-#define     ndk_conf_merge_value            ngx_conf_merge_value
-#define     ndk_conf_merge_off_value        ngx_conf_merge_off_value 
-#define     ndk_conf_merge_ptr_value        ngx_conf_merge_ptr_value
-#define     ndk_conf_merge_str_value        ngx_conf_merge_str_value
-#define     ndk_conf_merge_size_value       ngx_conf_merge_size_value 
-
-
-#define     ndk_conf_merge_keyval_value(conf,prev,default)                                  \
-                                                                                            \
-                conf = prev ? prev : default;
-
-#define     ndk_conf_merge_str_array_value(conf,prev,val1,...)                              \
-                                                                                            \
-                if (conf == NGX_CONF_UNSET_PTR) {                                           \
-                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
-                        if (val1 == NULL) {                                                 \
-                            conf = NULL;                                                    \
-                        } else {                                                            \
-                            char * elts[] = {val1,##__VA_ARGS__};                           \
-                            int    n = sizeof(elts)/sizeof(char*);                          \
-                                                                                            \
-                            conf = ndk_str_array_create (cf->pool, elts, n);                \
-                                                                                            \
-                            if (conf == NULL)                                               \
-                                return  NGX_CONF_ERROR;                                     \
-                        }                                                                   \
-                    } else {                                                                \
-                        conf = prev;                                                        \
-                    }                                                                       \
-                }
-
-#define     ndk_conf_merge_http_complex_value_value(conf,prev,default)                      \
-                                                                                            \
-                if (!conf.str.len) {                                                        \
-                    if (prev.str.len) {                                                     \
-                        conf = prev;                                                        \
-                    } else {                                                                \
-                        conf.str.data = (u_char *) default;                                 \
-                        conf.str.len = sizeof (default) - 1;                                \
-                                                                                            \
-                        if (ndk_http_complex_value_compile (cf, &conf))                     \
-                            return  NGX_CONF_ERROR;                                         \
-                    }                                                                       \
-                }
-
-#define     ndk_conf_merge_http_complex_value_array_value(conf,prev,val1,...)               \
-                                                                                            \
-                if (conf == NGX_CONF_UNSET_PTR) {                                           \
-                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
-                        if (val1 == NULL)                                                   \
-                            conf = NULL;                                                    \
-                        else {                                                              \
-                            char * elts[] = {val1,##__VA_ARGS__};                           \
-                            int    n = sizeof(elts)/sizeof(char*);                          \
-                                                                                            \
-                            conf = ndk_http_complex_value_array_create (cf, elts, n);       \
-                                                                                            \
-                            if (conf == NULL)                                               \
-                                return  NGX_CONF_ERROR;                                     \
-                        }                                                                   \
-                    } else {                                                                \
-                        conf = prev;                                                        \
-                    }                                                                       \
-                }
-
-#define     ndk_conf_merge_http_complex_path_value(conf,prev,...)                           \
-                ndk_conf_merge_http_complex_value_array_value (conf.a, prev.a, __VA_ARGS__)
-
-#define     ndk_conf_merge_split_path_value(conf,prev,path)                                 \
-                                                                                            \
-                if (conf == NGX_CONF_UNSET_PTR)  {                                          \
-                    conf = (prev == NGX_CONF_UNSET_PTR ?                                    \
-                        ndk_split_path_create_raw (cf, path) : prev);                       \
-                }
-
-
-/* conf-merge-prop macros */
-
-#define     ndk_conf_merge_prop(prop,default)\
-            ndk_conf_merge_value\
-                (conf->prop, prev->prop, default)
-
-#define     ndk_conf_merge_bitmask_prop(prop,default,...)\
-            ndk_conf_merge_bitmask_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_bufs_prop(prop,default,...)\
-            ndk_conf_merge_bufs_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_encoding_prop(prop,default,...)\
-            ndk_conf_merge_encoding_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_enum_prop(prop,default,...)\
-            ndk_conf_merge_enum_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_false_prop(prop,default,...)\
-            ndk_conf_merge_false_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_flag_prop(prop,default,...)\
-            ndk_conf_merge_flag_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_full_path_prop(prop,default,...)\
-            ndk_conf_merge_full_path_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_http_complex_keyval_prop(prop,default,...)\
-            ndk_conf_merge_http_complex_keyval_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_http_complex_path_prop(prop,default,...)\
-            ndk_conf_merge_http_complex_path_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_http_complex_value_prop(prop,default,...)\
-            ndk_conf_merge_http_complex_value_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_http_complex_value_array_prop(prop,default,...)\
-            ndk_conf_merge_http_complex_value_array_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_keyval_prop(prop,default,...)\
-            ndk_conf_merge_keyval_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_keyval1_prop(prop,default,...)\
-            ndk_conf_merge_keyval1_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_msec_prop(prop,default,...)\
-            ndk_conf_merge_msec_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_null_prop(prop,default,...)\
-            ndk_conf_merge_null_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_num_prop(prop,default,...)\
-            ndk_conf_merge_num_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_num64_prop(prop,default,...)\
-            ndk_conf_merge_num64_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_num_flag_prop(prop,default,...)\
-            ndk_conf_merge_num_flag_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_off_prop(prop,default,...)\
-            ndk_conf_merge_off_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_ptr_prop(prop,default,...)\
-            ndk_conf_merge_ptr_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_regex_prop(prop,default,...)\
-            ndk_conf_merge_regex_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_regex_array_prop(prop,default,...)\
-            ndk_conf_merge_regex_array_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_regex_array_caseless_prop(prop,default,...)\
-            ndk_conf_merge_regex_array_caseless_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_regex_caseless_prop(prop,default,...)\
-            ndk_conf_merge_regex_caseless_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_sec_prop(prop,default,...)\
-            ndk_conf_merge_sec_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_sec_flag_prop(prop,default,...)\
-            ndk_conf_merge_sec_flag_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_size_prop(prop,default,...)\
-            ndk_conf_merge_size_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_split_path_prop(prop,default,...)\
-            ndk_conf_merge_split_path_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_str_prop(prop,default,...)\
-            ndk_conf_merge_str_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_str_array_prop(prop,default,...)\
-            ndk_conf_merge_str_array_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_str_array_multi_prop(prop,default,...)\
-            ndk_conf_merge_str_array_multi_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
-#define     ndk_conf_merge_true_prop(prop,default,...)\
-            ndk_conf_merge_true_value\
-                (conf->prop, prev->prop, default,##__VA_ARGS__)
-    
diff --git a/debian/modules/http-ndk/objs/ndk_config.c b/debian/modules/http-ndk/objs/ndk_config.c
deleted file mode 100644
index d2e572f..0000000
--- a/debian/modules/http-ndk/objs/ndk_config.c
+++ /dev/null
@@ -1,72 +0,0 @@
-
-/*
- * 2010 (C) Marcus Clyne
- *
- * DO NOT EDIT THIS FILE MANUALLY
- * ------------------------------
- * This file has been generated automatically from scripts in the $base/auto dir and
- * data in the $base/auto/data dir. If you wish to edit the output of this file, then
- * you should edit these files instead.
- *
-*/
-
-
-/* optional includes */
-
-#if (NDK_BUF)
-#include  <ndk_buf.c>
-#endif
-#if (NDK_COMPLEX_PATH)
-#include  <ndk_complex_path.c>
-#endif
-#if (NDK_COMPLEX_VALUE)
-#include  <ndk_complex_value.c>
-#endif
-#if (NDK_CONF_FILE)
-#include  <ndk_conf_file.c>
-#endif
-#if (NDK_ENCODING)
-#include  <ndk_encoding.c>
-#endif
-#if (NDK_HASH)
-#include  <ndk_hash.c>
-#endif
-#if (NDK_HTTP)
-#include  <ndk_http.c>
-#endif
-#if (NDK_PATH)
-#include  <ndk_path.c>
-#endif
-#if (NDK_PROCESS)
-#include  <ndk_process.c>
-#endif
-#if (NDK_REGEX)
-#include  <ndk_regex.c>
-#endif
-#if (NDK_REWRITE)
-#include  <ndk_rewrite.c>
-#endif
-#if (NDK_SET_VAR)
-#include  <ndk_set_var.c>
-#endif
-#if (NDK_STRING)
-#include  <ndk_string.c>
-#endif
-#if (NDK_UPSTREAM_LIST)
-#include  <ndk_upstream_list.c>
-#endif
-#if (NDK_URI)
-#include  <ndk_uri.c>
-#endif
-
-
-/* module commands */
-
-static ngx_command_t  ndk_http_commands[] = {
-#if (NDK_UPSTREAM_LIST)
-#define NDK_UPSTREAM_LIST_CMDS 1
-#include  <ndk_upstream_list.h>
-#undef  NDK_UPSTREAM_LIST_CMDS
-#endif
-    ngx_null_command
-};
diff --git a/debian/modules/http-ndk/objs/ndk_config.h b/debian/modules/http-ndk/objs/ndk_config.h
deleted file mode 100644
index 7223950..0000000
--- a/debian/modules/http-ndk/objs/ndk_config.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-/* 
- * 2010 (C) Marcus Clyne 
- *
- * DO NOT EDIT THIS FILE MANUALLY
- * ------------------------------
- * This file has been generated automatically from scripts in the $base/auto dir and
- * data in the $base/auto/data dir. If you wish to edit the output of this file, then
- * you should edit these files instead.
- *
-*/
-
-
-/* include all optional modules */
-
-#ifdef NDK_ALL
-
-#ifndef NDK_BUF
-#define NDK_BUF 1
-#endif
-#ifndef NDK_COMPLEX_PATH
-#define NDK_COMPLEX_PATH 1
-#endif
-#ifndef NDK_COMPLEX_VALUE
-#define NDK_COMPLEX_VALUE 1
-#endif
-#ifndef NDK_CONF_FILE
-#define NDK_CONF_FILE 1
-#endif
-#ifndef NDK_ENCODING
-#define NDK_ENCODING 1
-#endif
-#ifndef NDK_HASH
-#define NDK_HASH 1
-#endif
-#ifndef NDK_HTTP
-#define NDK_HTTP 1
-#endif
-#ifndef NDK_PATH
-#define NDK_PATH 1
-#endif
-#ifndef NDK_PROCESS
-#define NDK_PROCESS 1
-#endif
-#ifndef NDK_REGEX
-#define NDK_REGEX 1
-#endif
-#ifndef NDK_REWRITE
-#define NDK_REWRITE 1
-#endif
-#ifndef NDK_SET_VAR
-#define NDK_SET_VAR 1
-#endif
-#ifndef NDK_STRING
-#define NDK_STRING 1
-#endif
-#ifndef NDK_UPSTREAM_LIST
-#define NDK_UPSTREAM_LIST 1
-#endif
-#ifndef NDK_URI
-#define NDK_URI 1
-#endif
-
-#endif
-
-
-/* module dependencies */
-
-#ifdef  NDK_COMPLEX_PATH
-#ifndef NDK_COMPLEX_VALUE
-#define NDK_COMPLEX_VALUE 1
-#endif
-#ifndef NDK_PATH
-#define NDK_PATH 1
-#endif
-#endif
-#ifdef  NDK_CONF_FILE
-#ifndef NDK_STRING
-#define NDK_STRING 1
-#endif
-#endif
-#ifdef  NDK_HASH
-#ifndef NDK_STRING
-#define NDK_STRING 1
-#endif
-#endif
-#ifdef  NDK_SET_VAR
-#ifndef NDK_REWRITE
-#define NDK_REWRITE 1
-#endif
-#endif
-#ifdef  NDK_UPSTREAM_LIST
-#ifndef NDK_HTTP_CREATE_MAIN_CONF
-#define NDK_HTTP_CREATE_MAIN_CONF 1
-#endif
-#endif
-
-
diff --git a/debian/modules/http-ndk/objs/ndk_includes.h b/debian/modules/http-ndk/objs/ndk_includes.h
deleted file mode 100644
index cbbf60a..0000000
--- a/debian/modules/http-ndk/objs/ndk_includes.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* optional includes */
-
-#if (NDK_BUF)
-#include  <ndk_buf.h>
-#endif
-#if (NDK_COMPLEX_PATH)
-#include  <ndk_complex_path.h>
-#endif
-#if (NDK_COMPLEX_VALUE)
-#include  <ndk_complex_value.h>
-#endif
-#if (NDK_CONF_FILE)
-#include  <ndk_conf_file.h>
-#endif
-#if (NDK_ENCODING)
-#include  <ndk_encoding.h>
-#endif
-#if (NDK_HASH)
-#include  <ndk_hash.h>
-#endif
-#if (NDK_HTTP)
-#include  <ndk_http.h>
-#endif
-#if (NDK_PATH)
-#include  <ndk_path.h>
-#endif
-#if (NDK_PROCESS)
-#include  <ndk_process.h>
-#endif
-#if (NDK_REGEX)
-#include  <ndk_regex.h>
-#endif
-#if (NDK_REWRITE)
-#include  <ndk_rewrite.h>
-#endif
-#if (NDK_SET_VAR)
-#include  <ndk_set_var.h>
-#endif
-#if (NDK_STRING)
-#include  <ndk_string.h>
-#endif
-#if (NDK_UPSTREAM_LIST)
-#include  <ndk_upstream_list.h>
-#endif
-#if (NDK_URI)
-#include  <ndk_uri.h>
-#endif
-
-
-/* non-optional includes */
-
-#include  <ndk_http_headers.h>
-#include  <ndk_log.h>
-#include  <ndk_parse.h>
-#include  <ndk_string_util.h>
-
-
-/* auto-generated headers */
-
-#include  <ndk_array.h>
-#include  <ndk_palloc.h>
-#include  <ndk_conf_merge.h>
-#include  <ndk_conf_cmd_basic.h>
-#include  <ndk_conf_cmd_extra.h>
-
-
diff --git a/debian/modules/http-ndk/objs/ndk_palloc.h b/debian/modules/http-ndk/objs/ndk_palloc.h
deleted file mode 100644
index db8aaf1..0000000
--- a/debian/modules/http-ndk/objs/ndk_palloc.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-/* 
- * 2010 (C) Marcus Clyne 
- *
- * DO NOT EDIT THIS FILE MANUALLY
- * ------------------------------
- * This file has been generated automatically from scripts in the $base/auto dir and
- * data in the $base/auto/data dir. If you wish to edit the output of this file, then
- * you should edit these files instead.
- *
-*/
-
-
-/* Non-generated macros */
-
-#define     ndk_pallocp(p,pl)                   p = ngx_palloc (pl,sizeof(*p))
-#define     ndk_pallocpn(p,pl,n)                p = ngx_palloc (pl,sizeof(*p)*(n))
-
-#define     ndk_pcallocp(p,pl)                  p = ngx_pcalloc (pl,sizeof(*p))
-#define     ndk_pcallocpn(p,pl,n)               p = ngx_pcalloc (pl,sizeof(*p)*(n))
-
-
-/* base action macro macros */
-
-#define     ndk_palloc_ac(p,pl,sz,ac)           {p = ngx_palloc (pl,sz);    if (p == NULL) ac;}
-#define     ndk_pallocp_ac(p,pl,ac)             {ndk_pallocp (p,pl);        if (p == NULL) ac;}
-#define     ndk_pallocpn_ac(p,pl,n,ac)          {ndk_pallocpn (p,pl,n);     if (p == NULL) ac;}
-#define     ndk_pcalloc_ac(p,pl,sz,ac)          {p = ngx_pcalloc (pl,sz);   if (p == NULL) ac;}
-#define     ndk_pcallocp_ac(p,pl,ac)            {ndk_pcallocp (p,pl);       if (p == NULL) ac;}
-#define     ndk_pcallocpn_ac(p,pl,n,ac)         {ndk_pcallocpn (p,pl,n);    if (p == NULL) ac;}
-
-
-/* generated action macros */
-
-#define     ndk_palloc_r0(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,return 0)
-#define     ndk_palloc_r1(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,return 1)
-#define     ndk_palloc_r_1(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,return -1)
-#define     ndk_palloc_rok(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,return NGX_OK)
-#define     ndk_palloc_rce(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,return NGX_CONF_ERROR)
-#define     ndk_palloc_rcok(p,pl,sz)            ndk_palloc_ac              (p,pl,sz,return NGX_CONF_OK)
-#define     ndk_palloc_re(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,return NGX_ERROR)
-#define     ndk_palloc_rn(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,return NULL)
-#define     ndk_palloc_rse(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,{ngx_script_error (e); return;})
-#define     ndk_palloc_sce(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,{ngx_script_configure_error (c); return;})
-#define     ndk_palloc_g(p,pl,sz,_lb)           ndk_palloc_ac              (p,pl,sz,goto _lb)
-#define     ndk_palloc_ge(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,goto error)
-
-#define     ndk_pallocp_r0(p,pl)                ndk_pallocp_ac             (p,pl,return 0)
-#define     ndk_pallocp_r1(p,pl)                ndk_pallocp_ac             (p,pl,return 1)
-#define     ndk_pallocp_r_1(p,pl)               ndk_pallocp_ac             (p,pl,return -1)
-#define     ndk_pallocp_rok(p,pl)               ndk_pallocp_ac             (p,pl,return NGX_OK)
-#define     ndk_pallocp_rce(p,pl)               ndk_pallocp_ac             (p,pl,return NGX_CONF_ERROR)
-#define     ndk_pallocp_rcok(p,pl)              ndk_pallocp_ac             (p,pl,return NGX_CONF_OK)
-#define     ndk_pallocp_re(p,pl)                ndk_pallocp_ac             (p,pl,return NGX_ERROR)
-#define     ndk_pallocp_rn(p,pl)                ndk_pallocp_ac             (p,pl,return NULL)
-#define     ndk_pallocp_rse(p,pl)               ndk_pallocp_ac             (p,pl,{ngx_script_error (e); return;})
-#define     ndk_pallocp_sce(p,pl)               ndk_pallocp_ac             (p,pl,{ngx_script_configure_error (c); return;})
-#define     ndk_pallocp_g(p,pl,_lb)             ndk_pallocp_ac             (p,pl,goto _lb)
-#define     ndk_pallocp_ge(p,pl)                ndk_pallocp_ac             (p,pl,goto error)
-
-#define     ndk_pallocpn_r0(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,return 0)
-#define     ndk_pallocpn_r1(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,return 1)
-#define     ndk_pallocpn_r_1(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,return -1)
-#define     ndk_pallocpn_rok(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,return NGX_OK)
-#define     ndk_pallocpn_rce(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,return NGX_CONF_ERROR)
-#define     ndk_pallocpn_rcok(p,pl,n)           ndk_pallocpn_ac            (p,pl,n,return NGX_CONF_OK)
-#define     ndk_pallocpn_re(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,return NGX_ERROR)
-#define     ndk_pallocpn_rn(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,return NULL)
-#define     ndk_pallocpn_rse(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,{ngx_script_error (e); return;})
-#define     ndk_pallocpn_sce(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,{ngx_script_configure_error (c); return;})
-#define     ndk_pallocpn_g(p,pl,n,_lb)          ndk_pallocpn_ac            (p,pl,n,goto _lb)
-#define     ndk_pallocpn_ge(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,goto error)
-
-#define     ndk_pcalloc_r0(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,return 0)
-#define     ndk_pcalloc_r1(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,return 1)
-#define     ndk_pcalloc_r_1(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,return -1)
-#define     ndk_pcalloc_rok(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,return NGX_OK)
-#define     ndk_pcalloc_rce(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,return NGX_CONF_ERROR)
-#define     ndk_pcalloc_rcok(p,pl,sz)           ndk_pcalloc_ac             (p,pl,sz,return NGX_CONF_OK)
-#define     ndk_pcalloc_re(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,return NGX_ERROR)
-#define     ndk_pcalloc_rn(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,return NULL)
-#define     ndk_pcalloc_rse(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,{ngx_script_error (e); return;})
-#define     ndk_pcalloc_sce(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,{ngx_script_configure_error (c); return;})
-#define     ndk_pcalloc_g(p,pl,sz,_lb)          ndk_pcalloc_ac             (p,pl,sz,goto _lb)
-#define     ndk_pcalloc_ge(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,goto error)
-
-#define     ndk_pcallocp_r0(p,pl)               ndk_pcallocp_ac            (p,pl,return 0)
-#define     ndk_pcallocp_r1(p,pl)               ndk_pcallocp_ac            (p,pl,return 1)
-#define     ndk_pcallocp_r_1(p,pl)              ndk_pcallocp_ac            (p,pl,return -1)
-#define     ndk_pcallocp_rok(p,pl)              ndk_pcallocp_ac            (p,pl,return NGX_OK)
-#define     ndk_pcallocp_rce(p,pl)              ndk_pcallocp_ac            (p,pl,return NGX_CONF_ERROR)
-#define     ndk_pcallocp_rcok(p,pl)             ndk_pcallocp_ac            (p,pl,return NGX_CONF_OK)
-#define     ndk_pcallocp_re(p,pl)               ndk_pcallocp_ac            (p,pl,return NGX_ERROR)
-#define     ndk_pcallocp_rn(p,pl)               ndk_pcallocp_ac            (p,pl,return NULL)
-#define     ndk_pcallocp_rse(p,pl)              ndk_pcallocp_ac            (p,pl,{ngx_script_error (e); return;})
-#define     ndk_pcallocp_sce(p,pl)              ndk_pcallocp_ac            (p,pl,{ngx_script_configure_error (c); return;})
-#define     ndk_pcallocp_g(p,pl,_lb)            ndk_pcallocp_ac            (p,pl,goto _lb)
-#define     ndk_pcallocp_ge(p,pl)               ndk_pcallocp_ac            (p,pl,goto error)
-
-#define     ndk_pcallocpn_r0(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,return 0)
-#define     ndk_pcallocpn_r1(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,return 1)
-#define     ndk_pcallocpn_r_1(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,return -1)
-#define     ndk_pcallocpn_rok(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,return NGX_OK)
-#define     ndk_pcallocpn_rce(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,return NGX_CONF_ERROR)
-#define     ndk_pcallocpn_rcok(p,pl,n)          ndk_pcallocpn_ac           (p,pl,n,return NGX_CONF_OK)
-#define     ndk_pcallocpn_re(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,return NGX_ERROR)
-#define     ndk_pcallocpn_rn(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,return NULL)
-#define     ndk_pcallocpn_rse(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,{ngx_script_error (e); return;})
-#define     ndk_pcallocpn_sce(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,{ngx_script_configure_error (c); return;})
-#define     ndk_pcallocpn_g(p,pl,n,_lb)         ndk_pcallocpn_ac           (p,pl,n,goto _lb)
-#define     ndk_pcallocpn_ge(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,goto error)
-
diff --git a/debian/modules/http-ndk/patches/auto_config b/debian/modules/http-ndk/patches/auto_config
deleted file mode 100644
index ba4fdd4..0000000
--- a/debian/modules/http-ndk/patches/auto_config
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -pNr a/src/core/ngx_config.h b/src/core/ngx_config.h
-*** a/src/core/ngx_config.h	2008-09-19 13:47:13.000000000 +0100
---- b/src/core/ngx_config.h	2010-10-09 17:14:13.000000000 +0100
-*************** typedef intptr_t        ngx_flag_t;
-*** 127,131 ****
-  #define NGX_MAX_UINT32_VALUE  (uint32_t) 0xffffffff
-  #endif
-  
-! 
-  #endif /* _NGX_CONFIG_H_INCLUDED_ */
---- 127,131 ----
-  #define NGX_MAX_UINT32_VALUE  (uint32_t) 0xffffffff
-  #endif
-  
-! #include <ndk_config.h>
-  #endif /* _NGX_CONFIG_H_INCLUDED_ */
diff --git a/debian/modules/http-ndk/patches/expose_rewrite_functions b/debian/modules/http-ndk/patches/expose_rewrite_functions
deleted file mode 100644
index ec1d6d8..0000000
--- a/debian/modules/http-ndk/patches/expose_rewrite_functions
+++ /dev/null
@@ -1,291 +0,0 @@
-diff -rNp a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
-*** a/src/http/modules/ngx_http_rewrite_module.c	2010-06-18 16:15:20.000000000 +0100
---- b/src/http/modules/ngx_http_rewrite_module.c	2010-10-09 14:47:10.000000000 +0100
-***************
-*** 8,14 ****
-  #include <ngx_core.h>
-  #include <ngx_http.h>
-  
-! 
-  typedef struct {
-      ngx_array_t  *codes;        /* uintptr_t */
-  
---- 8,14 ----
-  #include <ngx_core.h>
-  #include <ngx_http.h>
-  
-! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
-  typedef struct {
-      ngx_array_t  *codes;        /* uintptr_t */
-  
-*************** typedef struct {
-*** 17,23 ****
-      ngx_flag_t    log;
-      ngx_flag_t    uninitialized_variable_warn;
-  } ngx_http_rewrite_loc_conf_t;
-! 
-  
-  static void *ngx_http_rewrite_create_loc_conf(ngx_conf_t *cf);
-  static char *ngx_http_rewrite_merge_loc_conf(ngx_conf_t *cf,
---- 17,23 ----
-      ngx_flag_t    log;
-      ngx_flag_t    uninitialized_variable_warn;
-  } ngx_http_rewrite_loc_conf_t;
-! #endif
-  
-  static void *ngx_http_rewrite_create_loc_conf(ngx_conf_t *cf);
-  static char *ngx_http_rewrite_merge_loc_conf(ngx_conf_t *cf,
-*************** static char *ngx_http_rewrite_return(ngx
-*** 28,44 ****
-      void *conf);
-  static char *ngx_http_rewrite_break(ngx_conf_t *cf, ngx_command_t *cmd,
-      void *conf);
-  static char *ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd,
-      void *conf);
-  static char * ngx_http_rewrite_if_condition(ngx_conf_t *cf,
-      ngx_http_rewrite_loc_conf_t *lcf);
-  static char *ngx_http_rewrite_variable(ngx_conf_t *cf,
-      ngx_http_rewrite_loc_conf_t *lcf, ngx_str_t *value);
-  static char *ngx_http_rewrite_set(ngx_conf_t *cf, ngx_command_t *cmd,
-      void *conf);
-  static char * ngx_http_rewrite_value(ngx_conf_t *cf,
-      ngx_http_rewrite_loc_conf_t *lcf, ngx_str_t *value);
-! 
-  
-  static ngx_command_t  ngx_http_rewrite_commands[] = {
-  
---- 28,47 ----
-      void *conf);
-  static char *ngx_http_rewrite_break(ngx_conf_t *cf, ngx_command_t *cmd,
-      void *conf);
-+ #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
-  static char *ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd,
-      void *conf);
-  static char * ngx_http_rewrite_if_condition(ngx_conf_t *cf,
-      ngx_http_rewrite_loc_conf_t *lcf);
-  static char *ngx_http_rewrite_variable(ngx_conf_t *cf,
-      ngx_http_rewrite_loc_conf_t *lcf, ngx_str_t *value);
-+ #endif
-  static char *ngx_http_rewrite_set(ngx_conf_t *cf, ngx_command_t *cmd,
-      void *conf);
-+ #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
-  static char * ngx_http_rewrite_value(ngx_conf_t *cf,
-      ngx_http_rewrite_loc_conf_t *lcf, ngx_str_t *value);
-! #endif
-  
-  static ngx_command_t  ngx_http_rewrite_commands[] = {
-  
-*************** ngx_http_rewrite_handler(ngx_http_reques
-*** 178,185 ****
-      return r->err_status;
-  }
-  
-! 
-! static ngx_int_t
-  ngx_http_rewrite_var(ngx_http_request_t *r, ngx_http_variable_value_t *v,
-      uintptr_t data)
-  {
---- 181,190 ----
-      return r->err_status;
-  }
-  
-! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
-! static
-! #endif
-! ngx_int_t
-  ngx_http_rewrite_var(ngx_http_request_t *r, ngx_http_variable_value_t *v,
-      uintptr_t data)
-  {
-*************** ngx_http_rewrite_break(ngx_conf_t *cf, n
-*** 511,517 ****
-  }
-  
-  
-! static char *
-  ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-  {
-      ngx_http_rewrite_loc_conf_t  *lcf = conf;
---- 516,525 ----
-  }
-  
-  
-! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
-! static
-! #endif
-! char *
-  ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-  {
-      ngx_http_rewrite_loc_conf_t  *lcf = conf;
-*************** ngx_http_rewrite_if(ngx_conf_t *cf, ngx_
-*** 627,633 ****
-  }
-  
-  
-! static char *
-  ngx_http_rewrite_if_condition(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf)
-  {
-      u_char                        *p;
---- 635,644 ----
-  }
-  
-  
-! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
-! static
-! #endif
-! char *
-  ngx_http_rewrite_if_condition(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf)
-  {
-      u_char                        *p;
-*************** ngx_http_rewrite_if_condition(ngx_conf_t
-*** 847,853 ****
-  }
-  
-  
-! static char *
-  ngx_http_rewrite_variable(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
-      ngx_str_t *value)
-  {
---- 858,867 ----
-  }
-  
-  
-! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
-! static
-! #endif
-! char *
-  ngx_http_rewrite_variable(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
-      ngx_str_t *value)
-  {
-*************** ngx_http_rewrite_set(ngx_conf_t *cf, ngx
-*** 948,954 ****
-  }
-  
-  
-! static char *
-  ngx_http_rewrite_value(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
-      ngx_str_t *value)
-  {
---- 962,971 ----
-  }
-  
-  
-! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
-! static
-! #endif
-! char *
-  ngx_http_rewrite_value(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
-      ngx_str_t *value)
-  {
-diff -rNp a/src/http/modules/ngx_http_rewrite_module.h b/src/http/modules/ngx_http_rewrite_module.h
-*** a/src/http/modules/ngx_http_rewrite_module.h	1970-01-01 01:00:00.000000000 +0100
---- b/src/http/modules/ngx_http_rewrite_module.h	2010-10-09 14:38:04.000000000 +0100
-***************
-*** 0 ****
---- 1,47 ----
-+ 
-+ /*
-+  * Copyright (C) Marcus Clyne
-+  *
-+  * Note : this file has been created by the Nginx Development Kit using
-+  * some code from ngx_http_rewrite_module.c
-+  */
-+ 
-+ #if (NDK_EXPOSE_REWRITE_FUNCTIONS)
-+ 
-+ #ifndef _NGX_HTTP_REWRITE_H_INCLUDED_
-+ #define _NGX_HTTP_REWRITE_H_INCLUDED_
-+ 
-+ #include <ngx_config.h>
-+ #include <ngx_core.h>
-+ #include <ngx_http.h>
-+ 
-+ 
-+ extern  ngx_module_t  ngx_http_rewrite_module;
-+ 
-+ 
-+ typedef struct {
-+     ngx_array_t  *codes;        /* uintptr_t */
-+ 
-+     ngx_uint_t    stack_size;
-+ 
-+     ngx_flag_t    log;
-+     ngx_flag_t    uninitialized_variable_warn;
-+ } ngx_http_rewrite_loc_conf_t;
-+ 
-+ 
-+ char *
-+ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-+ char *
-+ ngx_http_rewrite_if_condition(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf);
-+ char *
-+ ngx_http_rewrite_variable(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
-+     ngx_str_t *value);
-+ char *
-+ ngx_http_rewrite_value(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
-+     ngx_str_t *value);
-+ ngx_int_t
-+ ngx_http_rewrite_var(ngx_http_request_t *r, ngx_http_variable_value_t *v,
-+     uintptr_t data);
-+ 
-+ #endif
-+ #endif
-diff -rNp a/src/http/ngx_http.h b/src/http/ngx_http.h
-*** a/src/http/ngx_http.h	2010-06-15 16:13:34.000000000 +0100
---- b/src/http/ngx_http.h	2010-10-09 14:25:56.000000000 +0100
-*************** typedef u_char *(*ngx_http_log_handler_p
-*** 43,48 ****
---- 43,52 ----
-  #include <ngx_http_ssl_module.h>
-  #endif
-  
-+ #if (NDK_EXPOSE_REWRITE_FUNCTIONS)
-+ #include <ngx_http_rewrite_module.h>
-+ #endif
-+ 
-  
-  struct ngx_http_log_ctx_s {
-      ngx_connection_t    *connection;
-diff -rNp a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
-*** a/src/http/ngx_http_script.c	2010-09-13 13:44:43.000000000 +0100
---- b/src/http/ngx_http_script.c	2010-10-09 14:36:10.000000000 +0100
-*************** static size_t ngx_http_script_full_name_
-*** 26,35 ****
---- 26,43 ----
-  static void ngx_http_script_full_name_code(ngx_http_script_engine_t *e);
-  
-  
-+ #if (NDK_EXPOSE_REWRITE_FUNCTIONS)
-+ 
-+ uintptr_t ngx_http_script_exit_code = (uintptr_t) NULL;
-+ 
-+ #else
-+ 
-  #define ngx_http_script_exit  (u_char *) &ngx_http_script_exit_code
-  
-  static uintptr_t ngx_http_script_exit_code = (uintptr_t) NULL;
-  
-+ #endif
-+ 
-  
-  void
-  ngx_http_script_flush_complex_value(ngx_http_request_t *r,
-diff -rNp a/src/http/ngx_http_script.h b/src/http/ngx_http_script.h
-*** a/src/http/ngx_http_script.h	2010-09-13 13:44:43.000000000 +0100
---- b/src/http/ngx_http_script.h	2010-10-09 14:33:40.000000000 +0100
-***************
-*** 12,17 ****
---- 12,25 ----
-  #include <ngx_core.h>
-  #include <ngx_http.h>
-  
-+ #if (NDK_EXPOSE_REWRITE_FUNCTIONS)
-+ 
-+ #define ngx_http_script_exit  (u_char *) &ngx_http_script_exit_code
-+ 
-+ extern uintptr_t ngx_http_script_exit_code;
-+ 
-+ #endif
-+ 
-  
-  typedef struct {
-      u_char                     *ip;
diff --git a/debian/modules/http-ndk/patches/rewrite_phase_handler b/debian/modules/http-ndk/patches/rewrite_phase_handler
deleted file mode 100644
index bd5161f..0000000
--- a/debian/modules/http-ndk/patches/rewrite_phase_handler
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -p -r a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
-*** a/src/http/ngx_http_core_module.c	2010-09-27 12:48:12.000000000 +0100
---- b/src/http/ngx_http_core_module.c	2010-10-09 13:44:09.000000000 +0100
-*************** ngx_http_core_rewrite_phase(ngx_http_req
-*** 910,915 ****
---- 910,922 ----
-          return NGX_AGAIN;
-      }
-  
-+ #if defined(nginx_version) && nginx_version >= 8042 && (NDK_REWRITE_PHASE)
-+ 
-+     if (rc == NGX_AGAIN || rc == NGX_DONE) {
-+         return NGX_OK;
-+     }
-+     
-+ #endif
-      /* rc == NGX_OK || rc == NGX_ERROR || rc == NGX_HTTP_...  */
-  
-      ngx_http_finalize_request(r, rc);
diff --git a/debian/modules/http-ndk/src/hash/md5.h b/debian/modules/http-ndk/src/hash/md5.h
deleted file mode 100644
index 4cbf843..0000000
--- a/debian/modules/http-ndk/src/hash/md5.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* crypto/md5/md5.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MD5_H
-#define HEADER_MD5_H
-
-#include <openssl/e_os2.h>
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef OPENSSL_NO_MD5
-#error MD5 is disabled.
-#endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD5_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD5_LONG_LOG2 has to be defined along.			   !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(__LP32__)
-#define MD5_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#define MD5_LONG unsigned long
-#define MD5_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *					<appro@fy.chalmers.se>
- */
-#else
-#define MD5_LONG unsigned int
-#endif
-
-#define MD5_CBLOCK	64
-#define MD5_LBLOCK	(MD5_CBLOCK/4)
-#define MD5_DIGEST_LENGTH 16
-
-typedef struct MD5state_st
-	{
-	MD5_LONG A,B,C,D;
-	MD5_LONG Nl,Nh;
-	MD5_LONG data[MD5_LBLOCK];
-	unsigned int num;
-	} MD5_CTX;
-
-int MD5_Init(MD5_CTX *c);
-int MD5_Update(MD5_CTX *c, const void *data, size_t len);
-int MD5_Final(unsigned char *md, MD5_CTX *c);
-unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md);
-void MD5_Transform(MD5_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/debian/modules/http-ndk/src/hash/murmurhash2.c b/debian/modules/http-ndk/src/hash/murmurhash2.c
deleted file mode 100644
index ac899b4..0000000
--- a/debian/modules/http-ndk/src/hash/murmurhash2.c
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-#ifndef MURMURHASH2_C
-#define MURMURHASH2_C
-
-#define     MURMURHASH2_DIGEST_LENGTH   4
-
-/*
- * -----------------------------------------------------------------------------
- * MurmurHash2, by Austin Appleby
-
- * Note - This code makes a few assumptions about how your machine behaves -
-
- * 1. We can read a 4-byte value from any address without crashing
- * 2. sizeof(int) == 4
-
- * And it has a few limitations -
-
- * 1. It will not work incrementally.
- * 2. It will not produce the same results on little-endian and big-endian
- *    machines.
- */
-
-unsigned int MurmurHash2 ( const void * key, int len, unsigned int seed )
-{
-	/*
-         * 'm' and 'r' are mixing constants generated offline.
-	 * They're not really 'magic', they just happen to work well.
-         */
-
-	const unsigned int m = 0x5bd1e995;
-	const int r = 24;
-
-	/* Initialize the hash to a 'random' value */
-
-	unsigned int h = seed ^ len;
-
-	/* Mix 4 bytes at a time into the hash */
-
-	const unsigned char * data = (const unsigned char *)key;
-
-	while(len >= 4)
-	{
-		unsigned int k = *(unsigned int *)data;
-
-		k *= m;
-		k ^= k >> r;
-		k *= m;
-
-		h *= m;
-		h ^= k;
-
-		data += 4;
-		len -= 4;
-	}
-
-	/* Handle the last few bytes of the input array */
-
-	switch(len)
-	{
-	case 3: h ^= data[2] << 16;
-	case 2: h ^= data[1] << 8;
-	case 1: h ^= data[0];
-	        h *= m;
-	};
-
-	/* Do a few final mixes of the hash to ensure the last few
-	 * bytes are well-incorporated. */
-
-	h ^= h >> 13;
-	h *= m;
-	h ^= h >> 15;
-
-	return h;
-}
-
-#endif
diff --git a/debian/modules/http-ndk/src/hash/sha.h b/debian/modules/http-ndk/src/hash/sha.h
deleted file mode 100644
index 16cacf9..0000000
--- a/debian/modules/http-ndk/src/hash/sha.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* crypto/sha/sha.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SHA_H
-#define HEADER_SHA_H
-
-#include <openssl/e_os2.h>
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
-#error SHA is disabled.
-#endif
-
-#if defined(OPENSSL_FIPS)
-#define FIPS_SHA_SIZE_T size_t
-#endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! SHA_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(__LP32__)
-#define SHA_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#define SHA_LONG unsigned long
-#define SHA_LONG_LOG2 3
-#else
-#define SHA_LONG unsigned int
-#endif
-
-#define SHA_LBLOCK	16
-#define SHA_CBLOCK	(SHA_LBLOCK*4)	/* SHA treats input data as a
-					 * contiguous array of 32 bit
-					 * wide big-endian values. */
-#define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
-#define SHA_DIGEST_LENGTH 20
-
-typedef struct SHAstate_st
-	{
-	SHA_LONG h0,h1,h2,h3,h4;
-	SHA_LONG Nl,Nh;
-	SHA_LONG data[SHA_LBLOCK];
-	unsigned int num;
-	} SHA_CTX;
-
-#ifndef OPENSSL_NO_SHA0
-int SHA_Init(SHA_CTX *c);
-int SHA_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md);
-void SHA_Transform(SHA_CTX *c, const unsigned char *data);
-#endif
-#ifndef OPENSSL_NO_SHA1
-int SHA1_Init(SHA_CTX *c);
-int SHA1_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA1_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
-void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
-#endif
-
-#define SHA256_CBLOCK	(SHA_LBLOCK*4)	/* SHA-256 treats input data as a
-					 * contiguous array of 32 bit
-					 * wide big-endian values. */
-#define SHA224_DIGEST_LENGTH	28
-#define SHA256_DIGEST_LENGTH	32
-
-typedef struct SHA256state_st
-	{
-	SHA_LONG h[8];
-	SHA_LONG Nl,Nh;
-	SHA_LONG data[SHA_LBLOCK];
-	unsigned int num,md_len;
-	} SHA256_CTX;
-
-#ifndef OPENSSL_NO_SHA256
-int SHA224_Init(SHA256_CTX *c);
-int SHA224_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA224_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA224(const unsigned char *d, size_t n,unsigned char *md);
-int SHA256_Init(SHA256_CTX *c);
-int SHA256_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA256_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA256(const unsigned char *d, size_t n,unsigned char *md);
-void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
-#endif
-
-#define SHA384_DIGEST_LENGTH	48
-#define SHA512_DIGEST_LENGTH	64
-
-#ifndef OPENSSL_NO_SHA512
-/*
- * Unlike 32-bit digest algorithms, SHA-512 *relies* on SHA_LONG64
- * being exactly 64-bit wide. See Implementation Notes in sha512.c
- * for further details.
- */
-#define SHA512_CBLOCK	(SHA_LBLOCK*8)	/* SHA-512 treats input data as a
-					 * contiguous array of 64 bit
-					 * wide big-endian values. */
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#define SHA_LONG64 unsigned __int64
-#define U64(C)     C##UI64
-#elif defined(__arch64__)
-#define SHA_LONG64 unsigned long
-#define U64(C)     C##UL
-#else
-#define SHA_LONG64 unsigned long long
-#define U64(C)     C##ULL
-#endif
-
-typedef struct SHA512state_st
-	{
-	SHA_LONG64 h[8];
-	SHA_LONG64 Nl,Nh;
-	union {
-		SHA_LONG64	d[SHA_LBLOCK];
-		unsigned char	p[SHA512_CBLOCK];
-	} u;
-	unsigned int num,md_len;
-	} SHA512_CTX;
-#endif
-
-#ifndef OPENSSL_NO_SHA512
-int SHA384_Init(SHA512_CTX *c);
-int SHA384_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA384_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA384(const unsigned char *d, size_t n,unsigned char *md);
-int SHA512_Init(SHA512_CTX *c);
-int SHA512_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA512_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA512(const unsigned char *d, size_t n,unsigned char *md);
-void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/debian/modules/http-ndk/src/ndk.c b/debian/modules/http-ndk/src/ndk.c
deleted file mode 100644
index d57040a..0000000
--- a/debian/modules/http-ndk/src/ndk.c
+++ /dev/null
@@ -1,155 +0,0 @@
-
-/*
- * 2010 (C) Marcus Clyne
- */
-
-#include    <ndk.h>
-
-#include    <ndk_config.c>
-
-
-#if (NDK_HTTP_PRE_CONFIG)
-static  ngx_int_t   ndk_http_preconfiguration    (ngx_conf_t *cf);
-#endif
-#if (NDK_HTTP_POST_CONFIG)
-static  ngx_int_t   ndk_http_postconfiguration   (ngx_conf_t *cf);
-#endif
-#if (NDK_HTTP_CREATE_MAIN_CONF)
-static void *       ndk_http_create_main_conf    (ngx_conf_t *cf);
-#endif
-#if (NDK_HTTP_INIT_MAIN_CONF)
-static char *       ndk_http_init_main_conf      (ngx_conf_t *cf, void *conf);
-#endif
-#if (NDK_HTTP_CREATE_SRV_CONF)
-static void *       ndk_http_create_srv_conf     (ngx_conf_t *cf);
-#endif
-#if (NDK_HTTP_MERGE_SRV_CONF)
-static char *       ndk_http_merge_srv_conf      (ngx_conf_t *cf, void *parent, void *child);
-#endif
-#if (NDK_HTTP_CREATE_LOC_CONF)
-static void *       ndk_http_create_loc_conf     (ngx_conf_t *cf);
-#endif
-#if (NDK_HTTP_MERGE_LOC_CONF)
-static char *       ndk_http_merge_loc_conf      (ngx_conf_t *cf, void *parent, void *child);
-#endif
-
-
-#if (NDK_HTTP_INIT_MASTER)
-static ngx_int_t    ndk_http_init_master         (ngx_log_t *log);
-#endif
-#if (NDK_HTTP_INIT_MODULE)
-static ngx_int_t    ndk_http_init_module         (ngx_cycle_t *cycle);
-#endif
-#if (NDK_HTTP_INIT_PROCESS)
-static ngx_int_t    ndk_http_init_process        (ngx_cycle_t *cycle);
-#endif
-#if (NDK_HTTP_EXIT_PROCESS)
-static void         ndk_http_exit_process        (ngx_cycle_t *cycle);
-#endif
-#if (NDK_HTTP_EXIT_MASTER)
-static void         ndk_http_exit_master         (ngx_cycle_t *cycle);
-#endif
-
-
-ngx_http_module_t   ndk_http_module_ctx = {
-
-#if (NDK_HTTP_PRE_CONFIG)
-    ndk_http_preconfiguration,
-#else
-    NULL,
-#endif
-#if (NDK_HTTP_POST_CONFIG)
-    ndk_http_postconfiguration,
-#else
-    NULL,
-#endif
-
-#if (NDK_HTTP_CREATE_MAIN_CONF)
-    ndk_http_create_main_conf,
-#else
-    NULL,
-#endif
-#if (NDK_HTTP_INIT_MAIN_CONF)
-    ndk_http_merge_main_conf,
-#else
-    NULL,
-#endif
-
-#if (NDK_HTTP_CREATE_SVR_CONF)
-    ndk_http_create_srv_conf,
-#else
-    NULL,
-#endif
-#if (NDK_HTTP_MERGE_SVR_CONF)
-    ndk_http_merge_srv_conf,
-#else
-    NULL,
-#endif
-
-#if (NDK_HTTP_CREATE_LOC_CONF)
-    ndk_http_create_loc_conf,
-#else
-    NULL,
-#endif
-#if (NDK_HTTP_MERGE_LOC_CONF)
-    ndk_http_merge_loc_conf,
-#else
-    NULL,
-#endif
-
-};
-
-ngx_module_t          ndk_http_module = {
-
-    NGX_MODULE_V1,
-    &ndk_http_module_ctx,          /* module context */
-    ndk_http_commands,             /* module directives */
-    NGX_HTTP_MODULE,               /* module type */
-
-#if (NDK_HTTP_INIT_MASTER)
-    ndk_http_init_master,
-#else
-    NULL,
-#endif
-
-#if (NDK_HTTP_INIT_MODULE)
-    ndk_http_init_module,
-#else
-    NULL,
-#endif
-#if (NDK_HTTP_INIT_PROCESS)
-    ndk_http_init_process,
-#else
-    NULL,
-#endif
-
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-
-#if (NDK_HTTP_EXIT_PROCESS)
-    ndk_http_exit_process,
-#else
-    NULL,
-#endif
-#if (NDK_HTTP_EXIT_MASTER)
-    ndk_http_exit_master,
-#else
-    NULL,
-#endif
-    NGX_MODULE_V1_PADDING
-};
-
-
-
-#if (NDK_HTTP_CREATE_MAIN_CONF)
-static void *
-ndk_http_create_main_conf (ngx_conf_t *cf)
-{
-    ndk_http_main_conf_t    *mcf;
-
-    ndk_pcallocp_rce (mcf, cf->pool);
-
-    return  mcf;
-}
-#endif
-
diff --git a/debian/modules/http-ndk/src/ndk.h b/debian/modules/http-ndk/src/ndk.h
deleted file mode 100644
index febcc32..0000000
--- a/debian/modules/http-ndk/src/ndk.h
+++ /dev/null
@@ -1,58 +0,0 @@
- 
-/*
- * 2010 (C) Marcus Clyne
-*/
-
-
-#ifndef NDK_H
-#define NDK_H
-
-
-#include    <ngx_config.h>
-#include    <ngx_core.h>
-#include    <ngx_http.h>
-
-
-#define     ndk_version     2015
-#define     NDK_VERSION     "0.2.15"
-
-
-#if (NGX_DEBUG)
-#ifndef     NDK_DEBUG
-#define     NDK_DEBUG 1
-#endif
-#else
-#ifndef     NDK_DEBUG
-#define     NDK_DEBUG 0
-#endif
-#endif
-
-
-#if !(NDK)
-#error At least one module requires the Nginx Development Kit to be compiled with \
-the source (add --with-module=/path/to/devel/kit/src to configure command)
-#endif
-
-#include    <ndk_config.h>
-
-
-#if (NDK_HTTP_CREATE_MAIN_CONF)
-
-#define     ndk_http_conf_get_main_conf(cf)   ngx_http_conf_get_module_main_conf (cf, ndk_http_module)
-#define     ndk_http_get_main_conf(r)         ngx_http_get_module_main_conf (r, ndk_http_module)
-
-typedef struct {
-#if (NDK_UPSTREAM_LIST)
-    ngx_array_t         *upstreams;
-#endif
-} ndk_http_main_conf_t;
-
-#endif /* NDK_HTTP_CREATE_MAIN_CONF */
-
-#include    <ndk_includes.h>
-
-
-extern  ngx_module_t    ndk_http_module;
-
-
-#endif
diff --git a/debian/modules/http-ndk/src/ndk_buf.c b/debian/modules/http-ndk/src/ndk_buf.c
deleted file mode 100644
index c491f72..0000000
--- a/debian/modules/http-ndk/src/ndk_buf.c
+++ /dev/null
@@ -1,43 +0,0 @@
-
-ngx_int_t
-ndk_copy_chain_to_str (ngx_pool_t *pool, ngx_chain_t *in, ngx_str_t *str)
-{
-    ngx_chain_t     *cl;
-    size_t           len;
-    u_char          *p;
-    ngx_buf_t       *b;
-    
-    len = 0;
-    for (cl = in; cl; cl = cl->next)
-        len += ngx_buf_size (cl->buf);
-    
-    ndk_palloc_re (p, pool, len + 1);
-    
-    str->data = p;
-    str->len = len;
-    
-    for (cl = in; cl; cl = cl->next) {
-        
-        b = cl->buf;
-        
-        if (ngx_buf_in_memory (b)) {
-            p = ngx_cpymem (p, b->pos, b->last - b->pos);
-        }
-    }
-    
-    *p = '\0';
-    
-    return  NGX_OK;
-}
-
-
-char *
-ndk_copy_chain_to_charp (ngx_pool_t *pool, ngx_chain_t *in)
-{
-    ngx_str_t   str;
-    
-    if (ndk_copy_chain_to_str (pool, in, &str) != NGX_OK)
-        return  NULL;
-    
-    return  (char *) str.data;
-}
\ No newline at end of file
diff --git a/debian/modules/http-ndk/src/ndk_buf.h b/debian/modules/http-ndk/src/ndk_buf.h
deleted file mode 100644
index e6334ad..0000000
--- a/debian/modules/http-ndk/src/ndk_buf.h
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-ngx_int_t   ndk_copy_chain_to_str   (ngx_pool_t *pool, ngx_chain_t *in, ngx_str_t *str);
-char *      ndk_copy_chain_to_charp (ngx_pool_t *pool, ngx_chain_t *in);
-
diff --git a/debian/modules/http-ndk/src/ndk_complex_path.c b/debian/modules/http-ndk/src/ndk_complex_path.c
deleted file mode 100644
index a66a808..0000000
--- a/debian/modules/http-ndk/src/ndk_complex_path.c
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-ndk_http_complex_path_value_t     ndk_empty_http_complex_path_value = {{0,NULL},0};
-
-
-ngx_int_t
-ndk_http_complex_path_value_compile (ngx_conf_t *cf, ngx_http_complex_value_t *cv, ngx_str_t *value, ngx_uint_t prefix)
-{
-    ngx_http_compile_complex_value_t   ccv;
-
-    ngx_memzero (&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = value;
-    ccv.complex_value = cv;
-
-    switch (prefix) {
-
-    case    1 :
-        ccv.root_prefix = 1;
-        break;
-
-    case    2 :
-        ccv.conf_prefix = 1;
-        break;
-    }
-
-    ndk_path_to_dir_safe (value, 1, 0);
-
-    if (!value->len)
-        return  NGX_OK;
-
-    return  ngx_http_compile_complex_value (&ccv);
-}
-
-
-
-ngx_array_t *
-ndk_http_complex_path_create_compile (ngx_conf_t *cf, ngx_str_t *path, ngx_uint_t prefix)
-{
-    ndk_http_complex_path_elt_t     *cpe;
-    ngx_array_t                     *a;
-    ngx_int_t                        n;
-    u_char                          *m, *s, *e;
-    ngx_str_t                        value;
-
-    n = ndk_strcntc (path, ':') + 1;
-
-    a = ngx_array_create (cf->pool, n, sizeof (ndk_http_complex_path_elt_t));
-    if (a == NULL) {
-        return  NULL;
-    }
-
-    s = path->data;
-    e = s + path->len;
-
-
-    while (s < e) {
-
-        m = s;
-
-        while (m < e && *m != ':') m++;
-
-        if (m == s) {
-            s = m+1;
-            continue;
-        }
-
-        cpe = ngx_array_push (a);
-        if (cpe == NULL) {
-            return  NULL;
-        }
-
-        if (*s == '#') {
-            s++;
-            cpe->dynamic = 1;
-        } else {
-            cpe->dynamic = 0;
-        }
-
-        value.data = s;
-        value.len = m - s;
-
-        if (ndk_http_complex_path_value_compile (cf, &cpe->val, &value, prefix) == NGX_ERROR)
-            return  NULL;
-
-        s = m+1;
-    }
-
-    return  a;
-}
-
-
-
-
-char *
-ndk_conf_set_http_complex_path_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_str_t                   *path;
-    ngx_array_t                 *a;
-    ngx_conf_post_t             *post;
-    ndk_http_complex_path_t     *cp;
-
-    cp = (ndk_http_complex_path_t *) (p + cmd->offset);
-
-    if (cp->a != NGX_CONF_UNSET_PTR) {
-        return  "is duplicate";
-    }
-
-    path = cf->args->elts;
-    path++;
-
-    cp->a = ndk_http_complex_path_create_compile (cf, path, cp->prefix);
-    if (cp->a == NULL)
-        /* TODO : log */
-        return  NGX_CONF_ERROR;
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, a);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
diff --git a/debian/modules/http-ndk/src/ndk_complex_path.h b/debian/modules/http-ndk/src/ndk_complex_path.h
deleted file mode 100644
index eb93d1f..0000000
--- a/debian/modules/http-ndk/src/ndk_complex_path.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-typedef struct {
-    ngx_array_t                    *a;
-    ngx_uint_t                      prefix;
-} ndk_http_complex_path_t;
-
-typedef struct {
-    ngx_http_complex_value_t        val;
-    ngx_flag_t                      dynamic;
-} ndk_http_complex_path_elt_t;
-
-typedef struct {
-    ngx_str_t                       val;
-    ngx_flag_t                      dynamic;
-} ndk_http_complex_path_value_t;
-
-typedef struct {
-    ndk_http_complex_path_value_t  *elts;
-    ngx_uint_t                      nelts;
-} ndk_http_complex_path_values_t;
-
-
-extern  ndk_http_complex_path_value_t     ndk_empty_http_complex_path_value;
-
-
-ngx_array_t *   ndk_http_complex_path_create_compile     (ngx_conf_t *cf, ngx_str_t *path, ngx_uint_t prefix);
-ngx_int_t       ndk_http_complex_path_value_compile      (ngx_conf_t *cf, ngx_http_complex_value_t *cv, 
-                                                                    ngx_str_t *value, ngx_uint_t prefix);
-char *          ndk_conf_set_http_complex_path_slot      (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
diff --git a/debian/modules/http-ndk/src/ndk_complex_value.c b/debian/modules/http-ndk/src/ndk_complex_value.c
deleted file mode 100644
index 97681ff..0000000
--- a/debian/modules/http-ndk/src/ndk_complex_value.c
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-ngx_int_t
-ndk_http_complex_value_compile (ngx_conf_t *cf, ngx_http_complex_value_t *cv, ngx_str_t *value)
-{
-    ngx_http_compile_complex_value_t   ccv;
-
-    ngx_memzero (&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = value;
-    ccv.complex_value = cv;
-
-    return  ngx_http_compile_complex_value (&ccv);
-}
-
-
-
-
-ngx_array_t *
-ndk_http_complex_value_array_create (ngx_conf_t *cf, char **s, ngx_int_t n)
-{
-    ngx_int_t                    i;
-    ngx_http_complex_value_t    *cv;
-    ngx_array_t                 *a;
-    ngx_str_t                    value;
-
-    a = ngx_array_create (cf->pool, n, sizeof (ngx_http_complex_value_t));
-    if (a == NULL)
-        return  NULL;
-
-
-    for (i=0; i<n; i++, s++) {
-
-        cv = ngx_array_push (a);
-
-        value.data = (u_char *) *s;
-        value.len = strlen (*s);
-
-        if (ndk_http_complex_value_compile (cf, cv, &value))
-            return  NULL;
-    }
-
-    return  a;
-}
-
-
-
-ngx_int_t
-ndk_http_complex_value_array_compile (ngx_conf_t *cf, ngx_array_t *a)
-{
-    ngx_uint_t                  i;
-    ngx_http_complex_value_t   *cv;
-
-    if (a == NULL || a == NGX_CONF_UNSET_PTR) {
-        return  NGX_ERROR;
-    }
-
-    cv = a->elts;
-
-    for (i=0; i<a->nelts; i++, cv++) {
-
-        if (ndk_http_complex_value_compile (cf, cv, &cv->value))
-            return  NGX_ERROR;
-    }
-
-    return  NGX_OK;
-}
-
-
-
-char *
-ndk_conf_set_http_complex_value_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_http_complex_value_t    *cv;
-    ngx_str_t                   *value;
-    ngx_conf_post_t             *post;
-
-    cv = (ngx_http_complex_value_t *) (p + cmd->offset);
-
-    if (cv->value.data) {
-        return "is duplicate";
-    }
-
-    value = cf->args->elts;
-
-    if (ndk_http_complex_value_compile (cf, cv, value + 1))
-        return  NGX_CONF_ERROR;
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, cv);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_http_complex_value_array_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char *p = conf;
-
-    ngx_str_t                   *value;
-    ngx_http_complex_value_t    *cv;
-    ngx_array_t                **a;
-    ngx_conf_post_t             *post;
-    ngx_uint_t                   i, alloc;
-
-    a = (ngx_array_t **) (p + cmd->offset);
-
-    if (*a == NULL || *a == NGX_CONF_UNSET_PTR) {
-
-        alloc = cf->args->nelts > 4 ? cf->args->nelts : 4;
-
-        *a = ngx_array_create (cf->pool, alloc, sizeof (ngx_http_complex_value_t));
-        if (*a == NULL) {
-            return  NGX_CONF_ERROR;
-        }
-    }
-
-    value = cf->args->elts;
-
-    for (i=1; i<cf->args->nelts; i++) {
-
-        cv = ngx_array_push (*a);
-        if (cv == NULL) {
-            return  NGX_CONF_ERROR;
-        }
-
-        if (ndk_http_complex_value_compile (cf, cv, &value[i]) == NGX_ERROR)
-            return  NGX_CONF_ERROR;
-    }
-
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, a);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-char *
-ndk_conf_set_http_complex_keyval_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char *p = conf;
-
-    ngx_str_t                   *value;
-    ndk_http_complex_keyval_t   *ckv;
-    ngx_array_t                **a;
-    ngx_conf_post_t             *post;
-    ngx_int_t                    alloc;
-
-    a = (ngx_array_t **) (p + cmd->offset);
-
-    if (*a == NULL || *a == NGX_CONF_UNSET_PTR) {
-
-        alloc = cf->args->nelts > 4 ? cf->args->nelts : 4;
-
-        *a = ngx_array_create (cf->pool, alloc, sizeof (ndk_http_complex_keyval_t));
-        if (*a == NULL) {
-            return  NGX_CONF_ERROR;
-        }
-    }
-
-    ckv = ngx_array_push (*a);
-    if (ckv == NULL) {
-        return  NGX_CONF_ERROR;
-    }
-
-    value = cf->args->elts;
-
-    ckv->key = value[1];
-
-    if (ndk_http_complex_value_compile (cf, &ckv->value, &value[2]) == NGX_ERROR)
-        return  NGX_CONF_ERROR;
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, a);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-/* TODO : complex keyval1 */
diff --git a/debian/modules/http-ndk/src/ndk_complex_value.h b/debian/modules/http-ndk/src/ndk_complex_value.h
deleted file mode 100644
index 4178d62..0000000
--- a/debian/modules/http-ndk/src/ndk_complex_value.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-typedef struct {
-    ngx_str_t                   key;
-    ngx_http_complex_value_t    value;
-} ndk_http_complex_keyval_t;
-
-
-
-/* create/compile functions */
-
-ngx_int_t      ndk_http_complex_value_compile        (ngx_conf_t *cf, ngx_http_complex_value_t *cv, ngx_str_t *value);
-ngx_array_t *  ndk_http_complex_value_array_create   (ngx_conf_t *cf, char **s, ngx_int_t n);
-ngx_int_t      ndk_http_complex_value_array_compile  (ngx_conf_t *cf, ngx_array_t *a);
-
-
-/* conf set slot functions */
-
-char *  ndk_conf_set_http_complex_keyval_slot        (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_http_complex_value_slot         (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_http_complex_value_array_slot   (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
diff --git a/debian/modules/http-ndk/src/ndk_conf_file.c b/debian/modules/http-ndk/src/ndk_conf_file.c
deleted file mode 100644
index 980641c..0000000
--- a/debian/modules/http-ndk/src/ndk_conf_file.c
+++ /dev/null
@@ -1,396 +0,0 @@
-
-
-/* NOTE : you will find other conf_set functions in the following files :
- *
- * complex_value.c
- * encoding.c
- * path.c
- *
- */
-
-
-char *
-ndk_conf_set_true_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_flag_t       *fp;
-    ngx_conf_post_t  *post;
-
-    fp = (ngx_flag_t*) (p + cmd->offset);
-
-    if (*fp != NGX_CONF_UNSET) {
-        return  "is duplicate";
-    }
-
-    *fp = 1;
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, fp);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_false_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_flag_t       *fp;
-    ngx_conf_post_t  *post;
-
-    fp = (ngx_flag_t*) (p + cmd->offset);
-
-    if (*fp != NGX_CONF_UNSET) {
-        return  "is duplicate";
-    }
-
-    *fp = 0;
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, fp);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
-
-char *
-ndk_conf_set_ptr_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    void  **ptr;
-
-    ptr = (void**) (p + cmd->offset);
-
-    if (*ptr != NGX_CONF_UNSET_PTR) {
-        return  "is duplicate";
-    }
-
-    *ptr = cmd->post;
-
-    return  NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_null_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    void            **pp;
-    ngx_conf_post_t  *post;
-
-    pp = (void **) (p + cmd->offset);
-
-    if (*pp != NGX_CONF_UNSET_PTR) {
-        return  "is duplicate";
-    }
-
-    *pp = NULL;
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, pp);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-char *
-ndk_conf_set_num64_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    int64_t          *np;
-    ngx_str_t        *value;
-    ngx_conf_post_t  *post;
-
-
-    np = (int64_t *) (p + cmd->offset);
-
-    if (*np != NGX_CONF_UNSET) {
-        return "is duplicate";
-    }
-
-    value = cf->args->elts;
-    *np = ndk_atoi64 (value[1].data, value[1].len);
-    if (*np == NGX_ERROR) {
-        return "invalid number";
-    }
-
-    if (cmd->post) {
-        post = cmd->post;
-        return post->post_handler(cf, post, np);
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-char *
-ndk_conf_set_str_array_multi_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_str_t         *value, *s;
-    ngx_array_t      **a;
-    ngx_conf_post_t   *post;
-    ngx_uint_t         i;
-
-    a = (ngx_array_t **) (p + cmd->offset);
-
-    if (*a == NGX_CONF_UNSET_PTR) {
-        *a = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t));
-        if (*a == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    s = NULL;
-
-    for (i=cf->args->nelts-1; i; i--) {
-
-        s = ngx_array_push(*a);
-        if (s == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        value = cf->args->elts;
-
-        *s = value[i];
-    }
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler(cf, post, s);
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_keyval1_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_str_t           *value;
-    ngx_keyval_t        *kv;
-    ngx_conf_post_t     *post;
-
-    kv = (ngx_keyval_t *) (p + cmd->offset);
-
-    if (kv->key.data)
-        return  "is duplicate";
-
-    value = cf->args->elts;
-
-    kv->key = value[1];
-    kv->value = value[2];
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, kv);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_num_flag_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_int_t        *np;
-    ngx_str_t        *value;
-    ngx_conf_post_t  *post;
-
-    np = (ngx_int_t *) (p + cmd->offset);
-
-    if (*np != NGX_CONF_UNSET) {
-        return  "is duplicate";
-    }
-
-    value = cf->args->elts;
-
-    if (ngx_strcasecmp (value[1].data, (u_char *) "on") == 0) {
-        *np = NDK_CONF_SET_TRUE;
-
-    } else if (ngx_strcasecmp (value[1].data, (u_char *) "off") == 0) {
-        *np = NDK_CONF_SET_FALSE;
-
-    } else {
-        *np = ngx_atoi (value[1].data, value[1].len);
-        if (*np == NGX_ERROR) {
-            return  "invalid number and not 'on'/'off'";
-        }
-    }
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, np);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_sec_flag_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    time_t              *tp;
-    ngx_str_t           *value;
-    ngx_conf_post_t     *post;
-
-    tp = (time_t *) (p + cmd->offset);
-
-    if (*tp != NGX_CONF_UNSET) {
-        return  "is duplicate";
-    }
-
-    value = cf->args->elts;
-
-    if (ngx_strcasecmp (value[1].data, (u_char *) "on") == 0) {
-        *tp = NDK_CONF_SET_TRUE;
-
-    } else if (ngx_strcasecmp (value[1].data, (u_char *) "off") == 0) {
-        *tp = NDK_CONF_SET_FALSE;
-
-    } else {
-        *tp = ngx_parse_time (&value[1], 1);
-        if (*tp == NGX_ERROR) {
-            return  "has an invalid time and not 'on'/'off'";
-        }
-    }
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, tp);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
-ngx_http_conf_ctx_t *
-ndk_conf_create_http_location (ngx_conf_t *cf)
-{
-    ngx_http_conf_ctx_t          *ctx, *pctx;
-    void                         *mconf;
-    ngx_http_core_loc_conf_t     *clcf, *pclcf;
-    ngx_uint_t                    i;
-    ngx_http_module_t            *module;
-
-    ndk_pcallocp_rce (ctx, cf->pool);
-
-    pctx = cf->ctx;
-    ctx->main_conf = pctx->main_conf;
-    ctx->srv_conf = pctx->srv_conf;
-
-    ndk_pcalloc_rce (ctx->loc_conf, cf->pool, sizeof(void *) * ngx_http_max_module);
-
-
-    for (i = 0; ngx_modules[i]; i++) {
-        if (ngx_modules[i]->type != NGX_HTTP_MODULE) {
-            continue;
-        }
-
-        module = ngx_modules[i]->ctx;
-
-        if (module->create_loc_conf) {
-
-            mconf = module->create_loc_conf(cf);
-            if (mconf == NULL) {
-                 return NGX_CONF_ERROR;
-            }
-
-            ctx->loc_conf[ngx_modules[i]->ctx_index] = mconf;
-        }
-    }
-
-    pclcf = pctx->loc_conf[ngx_http_core_module.ctx_index];
-
-    clcf = ctx->loc_conf[ngx_http_core_module.ctx_index];
-    clcf->loc_conf = ctx->loc_conf;
-    clcf->name = pclcf->name;
-    clcf->noname = 1;
-
-    if (ngx_http_add_location(cf, &pclcf->locations, clcf) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    return  ctx;
-}
-
-
-ngx_http_conf_ctx_t *
-ngx_conf_create_http_named_location (ngx_conf_t *cf, ngx_str_t *name)
-{
-    ngx_http_conf_ctx_t          *ctx;
-    ngx_http_core_loc_conf_t     *clcf;
-
-    ctx = ndk_conf_create_http_location (cf);
-    if (ctx == NGX_CONF_ERROR)
-        return  NGX_CONF_ERROR;
-
-    clcf = ctx->loc_conf[ngx_http_core_module.ctx_index];
-
-    /* in case the developer forgets to add '@' at the beginning of the named location */
-
-    if (name->data[0] != '@' && ndk_catstrf (cf->pool, name, "sS", "@", name) == NULL)
-        return  NGX_CONF_ERROR;
-
-    clcf->name = *name;     /* TODO : copy? */
-    clcf->noname = 0;
-    clcf->named = 1;
-
-    return  ctx;
-}
-
-
-ngx_int_t
-ndk_replace_command (ngx_command_t *new_cmd, ngx_uint_t module_type)
-{
-    ngx_uint_t       i;
-    ngx_command_t   *cmd;
-
-    for (i = 0; ngx_modules[i]; i++) {
-
-        if (ngx_modules[i]->type != module_type)
-            continue;
-
-        cmd = ngx_modules[i]->commands;
-        if (cmd == NULL) {
-            continue;
-        }
-
-        for ( /* void */ ; cmd->name.len; cmd++) {
-
-            if (ndk_cmpstr (&new_cmd->name, &cmd->name) == 0) {
-
-                ndk_memcpyp (cmd, new_cmd);
-                return  NGX_OK;
-            }
-        }
-    }
-
-    return  NGX_DECLINED;
-}
diff --git a/debian/modules/http-ndk/src/ndk_conf_file.h b/debian/modules/http-ndk/src/ndk_conf_file.h
deleted file mode 100644
index 6956b17..0000000
--- a/debian/modules/http-ndk/src/ndk_conf_file.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-/* conf set functions */
-
-char *  ndk_conf_set_true_slot              (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_false_slot             (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_full_path_slot         (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_ptr_slot               (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_null_slot              (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_str_array_multi_slot   (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_keyval1_slot           (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_num_flag               (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_num64_slot             (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_sec_flag_slot          (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-
-ngx_http_conf_ctx_t *   ndk_conf_create_http_location           (ngx_conf_t *cf);
-ngx_http_conf_ctx_t *   ngx_conf_create_http_named_location     (ngx_conf_t *cf, ngx_str_t *name);
-
-ngx_int_t               ndk_replace_command     (ngx_command_t *new_cmd, ngx_uint_t module_type);
-
-
-/* values for conf_set_xxx_flag */
-
-#define     NDK_CONF_SET_TRUE       -2
-#define     NDK_CONF_SET_FALSE      -3
-
-
-/* wrappers for utility macros */
-
-#define     ndk_conf_set_bitmask_slot       ngx_conf_set_bitmask_slot
-#define     ndk_conf_set_bufs_slot          ngx_conf_set_bufs_slot
-#define     ndk_conf_set_enum_slot          ngx_conf_set_enum_slot
-#define     ndk_conf_set_flag_slot          ngx_conf_set_flag_slot
-#define     ndk_conf_set_keyval_slot        ngx_conf_set_keyval_slot
-#define     ndk_conf_set_msec_slot          ngx_conf_set_msec_slot
-#define     ndk_conf_set_num_slot           ngx_conf_set_num_slot
-#define     ndk_conf_set_off_slot           ngx_conf_set_off_slot
-#define     ndk_conf_set_sec_slot           ngx_conf_set_sec_slot
-#define     ndk_conf_set_size_slot          ngx_conf_set_size_slot
-#define     ndk_conf_set_str_slot           ngx_conf_set_str_slot
-
-
-
-
diff --git a/debian/modules/http-ndk/src/ndk_debug.c b/debian/modules/http-ndk/src/ndk_debug.c
deleted file mode 100644
index e0251cc..0000000
--- a/debian/modules/http-ndk/src/ndk_debug.c
+++ /dev/null
@@ -1,72 +0,0 @@
-
-#if (NGX_DEBUG)
-
-void
-ndk_debug_helper (const char *func, const char *fmt, ...)
-{
-    size_t   len, flen, tlen;
-    char    *s, *p, *e;
-
-    /* check to see if the format is empty */
-
-    flen = strlen (fmt);
-
-    /* build func name */
-
-    len = strlen (func);
-
-    if (flen == 0)
-        tlen = len + 1;
-    else
-
-    char    func_name [len + flen + 1];
-
-    s = func_name;
-    e = s + len;
-
-    memcpy (s, func, len);
-
-    /* remove initial ngx_ */
-
-    if (strncmp (s, "ngx_", 4) == 0)
-        s += 4;
-
-    /* replace '_' with ' ' */
-
-    for (p=s; p<e; p++) {
-        if (*p == '_')
-            *p = ' ';
-    }
-
-    vfprintf (stderr, const char *format, va_list ap)
-}
-
-
-void
-ndk_debug_request_helper (const char *func, ngx_http_request_t *r)
-{
-    ngx_http_posted_request_t       *pr;
-
-    /* TODO : improve the format */
-
-    fprintf (stderr, "%s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
-            func,
-            (int) r->method_name.len, r->method_name.data,
-            (int) r->uri.len, r->uri.data,
-            (int) r->args.len, r->args.data,
-            0/*(int) r->main->count*/, r->main,
-            r, r->connection->data, r->parent);
-
-    if (r->posted_requests) {
-        fprintf(stderr, " posted:");
-
-        for (pr = r->posted_requests; pr; pr = pr->next) {
-            fprintf (stderr, "%p,", pr);
-        }
-    }
-
-    fprintf (stderr, "\n");
-}
-
-
-#endif
diff --git a/debian/modules/http-ndk/src/ndk_debug.h b/debian/modules/http-ndk/src/ndk_debug.h
deleted file mode 100644
index 883a6eb..0000000
--- a/debian/modules/http-ndk/src/ndk_debug.h
+++ /dev/null
@@ -1,171 +0,0 @@
-#ifndef NDK_DEBUG_H
-#define NDK_DEBUG_H
-
-
-/* TODO : use the Nginx printf function */
-
-
-#include <ngx_core.h>
-#include <ngx_http.h>
-
-/* TODO
-- andk_debug variety of debugging formats
-- global include file for all debugging - can pass declaration to cflags for the option
-*/
-
-
-#if (NDK_DEBUG)
-
-    #if (NGX_HAVE_VARIADIC_MACROS)
-
-        #define ndk_debug(...)  ndk_debug_helper (__func__,__VA_ARGS__)
-
-        #define ndk_debug_helper(func,...) \
-            fprintf(stderr, "%-60s", func); \
-            fprintf(stderr, (const char *)__VA_ARGS__); \
-            fprintf(stderr,"\n");
-            /*fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)*/
-
-    #else
-
-        /* NOTE : these includes might not be necessary since they're probably included with the core */
-
-        #include <stdarg.h>
-        #include <stdio.h>
-        #include <stdarg.h>
-
-        static void ndk_debug (const char * fmt, ...) {
-        }
-
-    #endif
-
-    #if NDK_DEBUG > 1
-
-        #define ndk_debug_request()  ndk_debug_request_helper(r, __func__)
-
-        static ngx_inline void
-        ndk_debug_request_helper (ngx_http_request_t *r, const char *func)
-        {
-            ngx_http_posted_request_t       *pr;
-
-            /* TODO : improve the format */
-
-            fprintf (stderr, "%s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
-                    func,
-                    (int) r->method_name.len, r->method_name.data,
-                    (int) r->uri.len, r->uri.data,
-                    (int) r->args.len, r->args.data,
-                    0/*(int) r->main->count*/, r->main,
-                    r, r->connection->data, r->parent);
-
-            if (r->posted_requests) {
-                fprintf(stderr, " posted:");
-
-                for (pr = r->posted_requests; pr; pr = pr->next) {
-                    fprintf (stderr, "%p,", pr);
-                }
-            }
-
-            fprintf (stderr, "\n");
-        }
-
-
-    #else
-
-        #define ndk_debug_request()
-
-    #endif
-
-
-    static ngx_inline void
-    ndk_debug_print_posted_requests (ngx_http_request_t *r)
-    {
-        ngx_http_posted_request_t   *pr;
-
-        ndk_request_log_debug_http (r, "ndk debug - http posted requests");
-
-        for (pr = r->main->posted_requests; pr; pr = pr->next) {
-
-            if (!pr->request)
-                continue;
-
-            ndk_request_log_debug_http (r, "ndk debug - http posted request:%V", &pr->request->uri);
-        }
-    }
-
-
-    #define ndk_debug_http_conf_location(cf)    ndk_debug_http_conf_location_helper (cf, __func__)
-
-    static ngx_inline void
-    ndk_debug_http_conf_location_helper (ngx_conf_t *cf, const char *func)
-    {
-        ngx_http_core_loc_conf_t        *lcf;
-
-        lcf = ngx_http_conf_get_module_loc_conf (cf, ngx_http_core_module);
-
-        ndk_debug_helper (func, "[%s]", lcf->name.data);
-    }
-
-    /*
-    static void
-    ndk_debug_log_chain (ngx_log_t *log, ngx_chain_t *cl)
-    {
-
-
-    }
-    */
-
-#else
-
-    #if (NGX_HAVE_VARIADIC_MACROS)
-
-        #define     ndk_debug(...)
-        #define     ndk_debug_request()
-
-    #else
-
-        #include <stdarg.h>
-
-        static void ndk_debug (const char * fmt, ...) {
-        }
-
-        static void ndk_debug_request() {
-        }
-
-    #endif
-
-    #define     ndk_debug_http_conf_location(cf)
-
-#endif
-
-#if (NDK_DEBUG)
-
-    #define     ndk_debug_check_read_event_handler(r)                               \
-                                                                                    \
-                    ndk_debug("r->read_event_handler = %s",                         \
-                        r->read_event_handler == ngx_http_block_reading ?           \
-                            "ngx_http_block_reading" :                              \
-                        r->read_event_handler == ngx_http_test_reading ?            \
-                            "ngx_http_test_reading" :                               \
-                        r->read_event_handler == ngx_http_request_empty_handler ?   \
-                            "ngx_http_request_empty_handler" : "UNKNOWN")
-
-    #define     ndk_debug_check_write_event_handler(r)                              \
-                                                                                    \
-                    ndk_debug ("r->write_event_handler = %s",                       \
-                        r->write_event_handler == ngx_http_handler ?                \
-                            "ngx_http_handler" :                                    \
-                        r->write_event_handler == ngx_http_core_run_phases ?        \
-                            "ngx_http_core_run_phases" :                            \
-                        r->write_event_handler == ngx_http_request_empty_handler ?  \
-                            "ngx_http_request_empty_handler" : "UNKNOWN")
-
-#else
-
-    #define     ndk_debug_check_read_event_handler(r)
-    #define     ndk_debug_check_write_event_handler(r)
-
-#endif
-
-#endif /* NDK_DEBUG_H */
-
diff --git a/debian/modules/http-ndk/src/ndk_encoding.c b/debian/modules/http-ndk/src/ndk_encoding.c
deleted file mode 100644
index 4a07872..0000000
--- a/debian/modules/http-ndk/src/ndk_encoding.c
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-char *
-ndk_conf_set_encoding_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char    *p = conf;
-
-    ndk_encoding_t  *ep;
-    ngx_str_t       *value;
-    size_t           len;
-    iconv_t          ic;
-
-    ep = (ndk_encoding_t *) (p + cmd->offset);
-    if (ep->from && ep->to)
-        return  "is duplicate";
-
-    value = cf->args->elts;
-
-
-    if (ep->from) {
-
-        ep->to = (char *) value[1].data;
-        len = strlen (ep->from);
-
-    } else if (ep->to) {
-
-        ep->from = (char *) value[1].data;
-        len = strlen (ep->to);
-
-    } else {
-        return  "has no base encoding";
-    }
-
-
-    if (len == value[1].len && !strncasecmp (ep->to, ep->from, len)) {
-
-        ngx_log_error (NGX_LOG_WARN, cf->log, 0, 
-            "\"%V\" '%V' encoding is ignored (no conversion)", &value[0], &value[1]);
-
-        return  NGX_CONF_OK;
-    }
-
-
-    ic = iconv_open (ep->to, ep->from);
-    if (ic == (iconv_t)-1)
-        return  "has an invalid encoding";
-
-
-    if (iconv_close (ic)) {
-        ngx_log_error (NGX_LOG_EMERG, cf->log, errno, "iconv_close()");
-        return  NGX_CONF_ERROR;
-    }
-
-    return  NGX_CONF_OK;
-}
-
diff --git a/debian/modules/http-ndk/src/ndk_encoding.h b/debian/modules/http-ndk/src/ndk_encoding.h
deleted file mode 100644
index b295b18..0000000
--- a/debian/modules/http-ndk/src/ndk_encoding.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-#include    <iconv.h>
-
-typedef struct {
-    char        *from;
-    char        *to;
-} ndk_encoding_t;
-
-
-char *  ndk_conf_set_encoding_slot  (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-
diff --git a/debian/modules/http-ndk/src/ndk_hash.c b/debian/modules/http-ndk/src/ndk_hash.c
deleted file mode 100644
index dec3d41..0000000
--- a/debian/modules/http-ndk/src/ndk_hash.c
+++ /dev/null
@@ -1,82 +0,0 @@
-
-#include <ndk_hash.h>
-
-
-
-/* openssl hashes */
-
-#define     NDK_OPENSSL_HASH(type,ctxt_type,upper)                  \
-    u_char              md [ctxt_type ## _DIGEST_LENGTH];           \
-    ctxt_type ##_CTX    c;                                          \
-                                                                    \
-    type ## _Init (&c);                                             \
-    type ## _Update (&c, data, len);                                \
-    type ## _Final (md, &c);                                        \
-                                                                    \
-    ndk_hex_dump (p, (u_char *) md, ctxt_type ## _DIGEST_LENGTH);   \
-    if (upper) {                                                    \
-        ndk_strtoupper (p, (ctxt_type ## _DIGEST_LENGTH) *2);       \
-    }
-
-
-#ifdef NDK_MD5
-
-void
-ndk_md5_hash (u_char *p, char *data, size_t len)
-{
-    NDK_OPENSSL_HASH (MD5, MD5, 0);
-}
-
-void
-ndk_md5_hash_upper (u_char *p, char *data, size_t len)
-{
-    NDK_OPENSSL_HASH (MD5, MD5, 1);
-}
-
-#endif
-#ifdef NDK_SHA1
-
-void
-ndk_sha1_hash (u_char *p, char *data, size_t len)
-{
-    NDK_OPENSSL_HASH (SHA1, SHA, 0);
-}
-
-void
-ndk_sha1_hash_upper (u_char *p, char *data, size_t len)
-{
-    NDK_OPENSSL_HASH (SHA1, SHA, 1);
-}
-
-#endif
-
-
-
-/* non-openssl hashes */
-
-#ifdef NDK_MURMUR2
-
-#include    "hash/murmurhash2.c"
-
-void
-ndk_murmur2_hash (u_char *p, char *data, size_t len)
-{
-    uint32_t    hash;
-
-    hash = MurmurHash2 (data, len, 47);
-
-    ndk_hex_dump (p, (u_char*) &hash, 4);
-}
-
-void
-ndk_murmur2_hash_upper (u_char *p, char *data, size_t len)
-{
-    uint32_t    hash;
-
-    hash = MurmurHash2 (data, len, 47);
-
-    ndk_hex_dump (p, (u_char*) &hash, 4);
-    ndk_strtoupper (p, 8);
-}
-
-#endif
diff --git a/debian/modules/http-ndk/src/ndk_hash.h b/debian/modules/http-ndk/src/ndk_hash.h
deleted file mode 100644
index a15e923..0000000
--- a/debian/modules/http-ndk/src/ndk_hash.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-#ifndef NDK_HASH_H
-#define NDK_HASH_H
-
-#ifdef NDK_HASH_ALL
-
-#ifndef NDK_MD5
-#define NDK_MD5
-#endif
-
-#ifndef NDK_MURMUR2
-#define NDK_MURMUR2
-#endif
-
-#ifndef NDK_SHA1
-#define NDK_SHA1
-#endif
-
-#endif
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-typedef void (*ndk_hash_pt) (u_char *p, char *data, size_t len);
-
-
-#ifdef NDK_MD5
-#include <ngx_md5.h>
-void    ndk_md5_hash            (u_char *p, char *data, size_t len);
-void    ndk_md5_hash_upper      (u_char *p, char *data, size_t len);
-#endif
-
-#ifdef NDK_MURMUR2
-#define MURMURHASH2_DIGEST_LENGTH   4
-void    ndk_murmur2_hash        (u_char *p, char *data, size_t len);
-void    ndk_murmur2_hash_upper  (u_char *p, char *data, size_t len);
-#endif
-
-#ifdef NDK_SHA1
-#include <ngx_sha1.h>
-void    ndk_sha1_hash           (u_char *p, char *data, size_t len);
-void    ndk_sha1_hash_upper     (u_char *p, char *data, size_t len);
-#endif
-
-#endif /* NDK_HASH_H */
-
diff --git a/debian/modules/http-ndk/src/ndk_http.c b/debian/modules/http-ndk/src/ndk_http.c
deleted file mode 100644
index 60728bb..0000000
--- a/debian/modules/http-ndk/src/ndk_http.c
+++ /dev/null
@@ -1,138 +0,0 @@
-
-ngx_uint_t
-ndk_http_count_phase_handlers (ngx_http_core_main_conf_t *cmcf)
-{
-    ngx_http_phase_handler_t    *ph;
-    ngx_uint_t                   i;
-    
-    ph = cmcf->phase_engine.handlers;
-    
-    for (i=0; ph[i].checker; i++) /* void */;
-        
-    return  i;        
-}
-
-
-ngx_uint_t
-ndk_http_parse_request_method (ngx_str_t *m)
-{
-    switch (m->len) {
-
-        case 3:
-            
-#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
-        {
-            u_char    t[4];
-            
-            ngx_memcpy (t, m->data, 3);
-            t[3] = ' ';
-            
-            if (ndk_str3_cmp (t, 'G', 'E', 'T', ' ')) {
-                return  NGX_HTTP_GET;
-            }
-
-            if (ndk_str3_cmp (t, 'P', 'U', 'T', ' ')) {
-                return  NGX_HTTP_PUT;
-            }
-        }
-            
-#else
-
-            if (ndk_str3_cmp (m->data, 'G', 'E', 'T', ' ')) {
-                return  NGX_HTTP_GET;
-            }
-
-            if (ndk_str3_cmp (m->data, 'P', 'U', 'T', ' ')) {
-                return  NGX_HTTP_PUT;
-            }
-
-#endif
-            break;
-
-        case 4:
-            
-            if  (m->data[1] == 'O') {
-
-                if (ndk_str3Ocmp (m->data, 'P', 'O', 'S', 'T')) {
-                    return  NGX_HTTP_POST;
-                }
-
-                if (ndk_str3Ocmp (m->data, 'C', 'O', 'P', 'Y')) {
-                    return  NGX_HTTP_COPY;
-                }
-
-                if (ndk_str3Ocmp (m->data, 'M', 'O', 'V', 'E')) {
-                    return  NGX_HTTP_MOVE;
-                }
-
-                if (ndk_str3Ocmp (m->data, 'L', 'O', 'C', 'K')) {
-                    return  NGX_HTTP_LOCK;
-                }
-
-            } else {
-
-                if (ndk_str4cmp (m->data, 'H', 'E', 'A', 'D')) {
-                    return  NGX_HTTP_HEAD;
-                }
-            }
-
-            break;
-
-        case 5:
-            
-            if (ndk_str5cmp (m->data, 'M', 'K', 'C', 'O', 'L')) {
-                return  NGX_HTTP_MKCOL;
-            }
-
-            if (ndk_str5cmp (m->data, 'P', 'A', 'T', 'C', 'H')) {
-                return  NGX_HTTP_PATCH;
-            }
-
-            if (ndk_str5cmp (m->data, 'T', 'R', 'A', 'C', 'E')) {
-                return  NGX_HTTP_TRACE;
-            }
-
-            break;
-
-        case 6:
-            
-            if (ndk_str6cmp (m->data, 'D', 'E', 'L', 'E', 'T', 'E')) {
-                return  NGX_HTTP_DELETE;
-            }
-
-            if (ndk_str6cmp (m->data, 'U', 'N', 'L', 'O', 'C', 'K')) {
-                return  NGX_HTTP_UNLOCK;
-            }
-
-            break;
-
-        case 7:
-            
-            if (ndk_str7_cmp (m->data, 'O', 'P', 'T', 'I', 'O', 'N', 'S', ' '))
-            {
-                return  NGX_HTTP_OPTIONS;
-            }
-
-            break;
-
-        case 8:
-            
-            if (ndk_str8cmp (m->data, 'P', 'R', 'O', 'P', 'F', 'I', 'N', 'D'))
-            {
-                return  NGX_HTTP_PROPFIND;
-            }
-
-            break;
-
-        case 9:
-            
-            if (ndk_str9cmp (m->data, 'P', 'R', 'O', 'P', 'P', 'A', 'T', 'C', 'H'))
-            {
-                return  NGX_HTTP_PROPPATCH;
-            }
-
-            break;
-    }
-
-    return  0;
-}
\ No newline at end of file
diff --git a/debian/modules/http-ndk/src/ndk_http.h b/debian/modules/http-ndk/src/ndk_http.h
deleted file mode 100644
index 6a9d1c5..0000000
--- a/debian/modules/http-ndk/src/ndk_http.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-ngx_uint_t  ndk_http_count_phase_handlers       (ngx_http_core_main_conf_t *cmcf);
-ngx_uint_t  ndk_http_parse_request_method       (ngx_str_t *m);
diff --git a/debian/modules/http-ndk/src/ndk_http_headers.h b/debian/modules/http-ndk/src/ndk_http_headers.h
deleted file mode 100644
index e71c70e..0000000
--- a/debian/modules/http-ndk/src/ndk_http_headers.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-/* TODO : organize and add */
-/* TODO : check - should it be r->main? */
-
-#define     ndk_http_uri(r)                         (r)->uri
-#define     ndk_http_request_uri(r)                 (r)->unparsed_uri
-
-#define     ndk_http_header_in(r,name)              ((r)->headers_in.name ? &(r)->headers_in.name->value : NULL)
-#define     ndk_http_header_out(r,name)             ((r)->headers_out.name ? &(r)->headers_out.name->value : NULL)
-
-#define     ndk_http_host_header(r)                 ndk_http_header_in (r, host)
-#define     ndk_http_connection_header(r)           ndk_http_header_in (r, connection)
-#define     ndk_http_if_modified_since_header(r)    ndk_http_header_in (r, if_modified_since)
-#define     ndk_http_user_agent_header(r)           ndk_http_header_in (r, user_agent)
-#define     ndk_http_referer_header(r)              ndk_http_header_in (r, referer)
-#define     ndk_http_content_length_header(r)       ndk_http_header_in (r, content_length)
-#define     ndk_http_content_type_header(r)         ndk_http_header_in (r, content_type)
-#define     ndk_http_range_header(r)                ndk_http_header_in (r, range)
-#define     ndk_http_if_range_header(r)             ndk_http_header_in (r, if_range)
-#define     ndk_http_transfer_encoding_header(r)    ndk_http_header_in (r, transfer_encoding)
-#define     ndk_http_expect_header(r)               ndk_http_header_in (r, expect)
-#define     ndk_http_accept_encoding_header(r)      ndk_http_header_in (r, accept_encoding)
-#define     ndk_http_via_header(r)                  ndk_http_header_in (r, via)
-#define     ndk_http_authorization_header(r)        ndk_http_header_in (r, authorization)
-#define     ndk_http_keep_alive_header(r)           ndk_http_header_in (r, keep_alive)
-#define     ndk_http_x_forwarded_for_header(r)      ndk_http_header_in (r, x_forwarded_for)
-#define     ndk_http_x_real_ip_header(r)            ndk_http_header_in (r, x_real_ip)
-#define     ndk_http_accept_header(r)               ndk_http_header_in (r, accept)
-#define     ndk_http_accept_language_header(r)      ndk_http_header_in (r, accept_language)
-#define     ndk_http_depth_header(r)                ndk_http_header_in (r, depth)
-#define     ndk_http_destination_header(r)          ndk_http_header_in (r, destination)
-#define     ndk_http_overwrite_header(r)            ndk_http_header_in (r, overwrite)
-#define     ndk_http_date_header(r)                 ndk_http_header_in (r, date)
-
diff --git a/debian/modules/http-ndk/src/ndk_log.c b/debian/modules/http-ndk/src/ndk_log.c
deleted file mode 100644
index 36dca15..0000000
--- a/debian/modules/http-ndk/src/ndk_log.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-/* TODO : the required functions if the compiler does not have variadic macros */
diff --git a/debian/modules/http-ndk/src/ndk_log.h b/debian/modules/http-ndk/src/ndk_log.h
deleted file mode 100644
index 1dd9c22..0000000
--- a/debian/modules/http-ndk/src/ndk_log.h
+++ /dev/null
@@ -1,165 +0,0 @@
-
-/* TODO : fix the conf_log macros */
-
-#define NGX_LOG_DEBUG_SCRIPT        NGX_LOG_DEBUG_HTTP      /* TODO : add new section to log/conf directives */
-
-#define ndk_conf_to_log(cf)         ((cf)->log)
-
-#ifndef ndk_request_to_log
-#define ndk_request_to_log(r)       ((r)->connection->log)
-#endif
-
-
-/*********************************/
-
-#if (NGX_HAVE_C99_VARIADIC_MACROS)
-
-#define ndk_log_stderr(log,...)                     ngx_log_error (NGX_LOG_STDERR, log, 0, __VA_ARGS__)
-#define ndk_log_emerg(log,...)                      ngx_log_error (NGX_LOG_EMERG, log, 0, __VA_ARGS__)
-#define ndk_log_alert(log,...)                      ngx_log_error (NGX_LOG_ALERT, log, 0, __VA_ARGS__)
-#define ndk_log_crit(log,...)                       ngx_log_error (NGX_LOG_CRIT, log, 0, __VA_ARGS__)
-#define ndk_log_err(log,...)                        ngx_log_error (NGX_LOG_ERR, log, 0, __VA_ARGS__)
-#define ndk_log_warning(log,...)                    ngx_log_error (NGX_LOG_WARN, log, 0, __VA_ARGS__)
-#define ndk_log_notice(log,...)                     ngx_log_error (NGX_LOG_NOTICE, log, 0, __VA_ARGS__)
-#define ndk_log_info(log,...)                       ngx_log_error (NGX_LOG_INFO, log, 0, __VA_ARGS__)
-
-#define ndk_conf_log_stderr(cf,...)                 ngx_conf_log_error (NGX_LOG_STDERR, cf, 0, __VA_ARGS__)
-#define ndk_conf_log_emerg(cf,...)                  ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, __VA_ARGS__)
-#define ndk_conf_log_alert(cf,...)                  ngx_conf_log_error (NGX_LOG_ALERT, cf, 0, __VA_ARGS__)
-#define ndk_conf_log_crit(cf,...)                   ngx_conf_log_error (NGX_LOG_CRIT, cf, 0, __VA_ARGS__)
-#define ndk_conf_log_err(cf,...)                    ngx_conf_log_error (NGX_LOG_ERR, cf, 0, __VA_ARGS__)
-#define ndk_conf_log_warning(cf,...)                ngx_conf_log_error (NGX_LOG_WARN, cf, 0, __VA_ARGS__)
-#define ndk_conf_log_notice(cf,...)                 ngx_conf_log_error (NGX_LOG_NOTICE, cf, 0, __VA_ARGS__)
-#define ndk_conf_log_info(cf,...)                   ngx_conf_log_error (NGX_LOG_INFO, cf, 0, __VA_ARGS__)
-
-#define ndk_request_log_stderr(r,...)               ndk_log_stderr (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_emerg(r,...)                ndk_log_emerg (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_alert(r,...)                ndk_log_alert (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_crit(r,...)                 ndk_log_crit (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_err(r,...)                  ndk_log_err (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_warning(r,...)              ndk_log_warning (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_notice(r,...)               ndk_log_notice (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_info(r,...)                 ndk_log_info (ndk_request_to_log(r), __VA_ARGS__)
-
-
-#if (NGX_DEBUG)
-
-#define ndk_log_debug_core(log,...)                 ngx_log_debug (NGX_LOG_DEBUG_CORE, log, 0, __VA_ARGS__)
-#define ndk_log_debug_alloc(log,...)                ngx_log_debug (NGX_LOG_DEBUG_ALLOC, log, 0, __VA_ARGS__)
-#define ndk_log_debug_mutex(log,...)                ngx_log_debug (NGX_LOG_DEBUG_MUTEX, log, 0, __VA_ARGS__)
-#define ndk_log_debug_event(log,...)                ngx_log_debug (NGX_LOG_DEBUG_EVENT, log, 0, __VA_ARGS__)
-#define ndk_log_debug_http(log,...)                 ngx_log_debug (NGX_LOG_DEBUG_HTTP, log, 0, __VA_ARGS__)
-#define ndk_log_debug_mail(log,...)                 ngx_log_debug (NGX_LOG_DEBUG_MAIL, log, 0, __VA_ARGS__)
-#define ndk_log_debug_mysql(log,...)                ngx_log_debug (NGX_LOG_DEBUG_MYSQL, log, 0, __VA_ARGS__)
-
-#define ndk_conf_log_debug_core(r,...)              ndk_log_debug_core (ndk_conf_to_log(r), __VA_ARGS__)
-#define ndk_conf_log_debug_alloc(r,...)             ndk_log_debug_alloc (ndk_conf_to_log(r), __VA_ARGS__)
-#define ndk_conf_log_debug_mutex(r,...)             ndk_log_debug_mutex (ndk_conf_to_log(r), __VA_ARGS__)
-#define ndk_conf_log_debug_event(r,...)             ndk_log_debug_event (ndk_conf_to_log(r), __VA_ARGS__)
-#define ndk_conf_log_debug_http(r,...)              ndk_log_debug_http (ndk_conf_to_log(r), __VA_ARGS__)
-#define ndk_conf_log_debug_mail(r,...)              ndk_log_debug_mail (ndk_conf_to_log(r), __VA_ARGS__)
-#define ndk_conf_log_debug_mysql(r,...)             ndk_log_debug_mysql (ndk_conf_to_log(r), __VA_ARGS__)
-
-#define ndk_request_log_debug_core(r,...)           ndk_log_debug_core (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_debug_alloc(r,...)          ndk_log_debug_alloc (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_debug_mutex(r,...)          ndk_log_debug_mutex (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_debug_event(r,...)          ndk_log_debug_event (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_debug_http(r,...)           ndk_log_debug_http (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_debug_mail(r,...)           ndk_log_debug_mail (ndk_request_to_log(r), __VA_ARGS__)
-#define ndk_request_log_debug_mysql(r,...)          ndk_log_debug_mysql (ndk_request_to_log(r), __VA_ARGS__)
-
-#else 
-
-#define ndk_log_debug_core(log,...)
-#define ndk_log_debug_alloc(log,...)
-#define ndk_log_debug_mutex(log,...)
-#define ndk_log_debug_event(log,...)
-#define ndk_log_debug_http(log,...)
-#define ndk_log_debug_mail(log,...)
-#define ndk_log_debug_mysql(log,...)
-
-#define ndk_conf_log_debug_core(r,...)
-#define ndk_conf_log_debug_alloc(r,...)
-#define ndk_conf_log_debug_mutex(r,...)
-#define ndk_conf_log_debug_event(r,...)
-#define ndk_conf_log_debug_http(r,...)
-#define ndk_conf_log_debug_mail(r,...)
-#define ndk_conf_log_debug_mysql(r,...)
-
-#define ndk_request_log_debug_core(r,...)
-#define ndk_request_log_debug_alloc(r,...)
-#define ndk_request_log_debug_mutex(r,...)
-#define ndk_request_log_debug_event(r,...)
-#define ndk_request_log_debug_http(r,...)
-#define ndk_request_log_debug_mail(r,...)
-#define ndk_request_log_debug_mysql(r,...)
-
-#endif
-
-
-/*********************************/
-
-#elif (NGX_HAVE_GCC_VARIADIC_MACROS)
-
-#define ndk_log_stderr(log,args...)                 ngx_log_error (NGX_LOG_STDERR, log, 0, args)
-#define ndk_log_emerg(log,args...)                  ngx_log_error (NGX_LOG_EMERG, log, 0, args)
-#define ndk_log_alert(log,args...)                  ngx_log_error (NGX_LOG_ALERT, log, 0, args)
-#define ndk_log_crit(log,args...)                   ngx_log_error (NGX_LOG_CRIT, log, 0, args)
-#define ndk_log_err(log,args...)                    ngx_log_error (NGX_LOG_ERR, log, 0, args)
-#define ndk_log_warning(log,args...)                ngx_log_error (NGX_LOG_WARN, log, 0, args)
-#define ndk_log_notice(log,args...)                 ngx_log_error (NGX_LOG_NOTICE, log, 0, args)
-#define ndk_log_info(log,args...)                   ngx_log_error (NGX_LOG_INFO, log, 0, args)
-
-#define ndk_log_debug_core(log,args...)             ngx_log_debug (NGX_LOG_DEBUG_CORE, log, 0, args)
-#define ndk_log_debug_alloc(log,args...)            ngx_log_debug (NGX_LOG_DEBUG_ALLOC, log, 0, args)
-#define ndk_log_debug_mutex(log,args...)            ngx_log_debug (NGX_LOG_DEBUG_MUTEX, log, 0, args)
-#define ndk_log_debug_event(log,args...)            ngx_log_debug (NGX_LOG_DEBUG_EVENT, log, 0, args)
-#define ndk_log_debug_http(log,args...)             ngx_log_debug (NGX_LOG_DEBUG_HTTP, log, 0, args)
-#define ndk_log_debug_mail(log,args...)             ngx_log_debug (NGX_LOG_DEBUG_MAIL, log, 0, args)
-#define ndk_log_debug_mysql(log,args...)            ngx_log_debug (NGX_LOG_DEBUG_MYSQL, log, 0, args)
-#define ndk_log_debug_script(log,args...)           ngx_log_debug (NGX_LOG_DEBUG_SCRIPT, log, 0, args)
-
-#define ndk_conf_log_stderr(cf,args...)             ngx_conf_log_error (NGX_LOG_STDERR, cf, 0, args)
-#define ndk_conf_log_emerg(cf,args...)              ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, args)
-#define ndk_conf_log_alert(cf,args...)              ngx_conf_log_error (NGX_LOG_ALERT, cf, 0, args)
-#define ndk_conf_log_crit(cf,args...)               ngx_conf_log_error (NGX_LOG_CRIT, cf, 0, args)
-#define ndk_conf_log_err(cf,args...)                ngx_conf_log_error (NGX_LOG_ERR, cf, 0, args)
-#define ndk_conf_log_warning(cf,args...)            ngx_conf_log_error (NGX_LOG_WARN, cf, 0, args)
-#define ndk_conf_log_notice(cf,args...)             ngx_conf_log_error (NGX_LOG_NOTICE, cf, 0, args)
-#define ndk_conf_log_info(cf,args...)               ngx_conf_log_error (NGX_LOG_INFO, cf, 0, args)
-
-#define ndk_conf_log_debug_core(r,args...)          ndk_log_debug_core (ndk_conf_to_log(r), args)
-#define ndk_conf_log_debug_alloc(r,args...)         ndk_log_debug_alloc (ndk_conf_to_log(r), args)
-#define ndk_conf_log_debug_mutex(r,args...)         ndk_log_debug_mutex (ndk_conf_to_log(r), args)
-#define ndk_conf_log_debug_event(r,args...)         ndk_log_debug_event (ndk_conf_to_log(r), args)
-#define ndk_conf_log_debug_http(r,args...)          ndk_log_debug_http (ndk_conf_to_log(r), args)
-#define ndk_conf_log_debug_mail(r,args...)          ndk_log_debug_mail (ndk_conf_to_log(r), args)
-#define ndk_conf_log_debug_mysql(r,args...)         ndk_log_debug_mysql (ndk_conf_to_log(r), args)
-#define ndk_conf_log_debug_script(r,args...)        ndk_log_debug_script (ndk_conf_to_log(r), args)
-
-#define ndk_request_log_stderr(r,args...)           ndk_log_stderr (ndk_request_to_log(r), args)
-#define ndk_request_log_emerg(r,args...)            ndk_log_emerg (ndk_request_to_log(r), args)
-#define ndk_request_log_alert(r,args...)            ndk_log_alert (ndk_request_to_log(r), args)
-#define ndk_request_log_crit(r,args...)             ndk_log_crit (ndk_request_to_log(r), args)
-#define ndk_request_log_err(r,args...)              ndk_log_err (ndk_request_to_log(r), args)
-#define ndk_request_log_warning(r,args...)          ndk_log_warning (ndk_request_to_log(r), args)
-#define ndk_request_log_notice(r,args...)           ndk_log_notice (ndk_request_to_log(r), args)
-#define ndk_request_log_info(r,args...)             ndk_log_info (ndk_request_to_log(r), args)
-
-#define ndk_request_log_debug_core(r,args...)       ndk_log_debug_core (ndk_request_to_log(r), args)
-#define ndk_request_log_debug_alloc(r,args...)      ndk_log_debug_alloc (ndk_request_to_log(r), args)
-#define ndk_request_log_debug_mutex(r,args...)      ndk_log_debug_mutex (ndk_request_to_log(r), args)
-#define ndk_request_log_debug_event(r,args...)      ndk_log_debug_event (ndk_request_to_log(r), args)
-#define ndk_request_log_debug_http(r,args...)       ndk_log_debug_http (ndk_request_to_log(r), args)
-#define ndk_request_log_debug_mail(r,args...)       ndk_log_debug_mail (ndk_request_to_log(r), args)
-#define ndk_request_log_debug_mysql(r,args...)      ndk_log_debug_mysql (ndk_request_to_log(r), args)
-#define ndk_request_log_debug_script(r,args...)     ndk_log_debug_script (ndk_request_to_log(r), args)
-
-/*********************************/
-
-#else /* NO VARIADIC MACROS */
-
-/* #warning does not work on Windows */
-#pragma message("Nginx Devel Kit logging without variadic macros not yet implemented")
-
-#endif /* VARIADIC MACROS */
diff --git a/debian/modules/http-ndk/src/ndk_parse.h b/debian/modules/http-ndk/src/ndk_parse.h
deleted file mode 100644
index 7c43e14..0000000
--- a/debian/modules/http-ndk/src/ndk_parse.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
-
-#define ndk_str3_cmp(m, c0, c1, c2, c3)                                       \
-    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)
-
-#define ndk_str3Ocmp(m, c0, c1, c2, c3)                                       \
-    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)
-
-#define ndk_str4cmp(m, c0, c1, c2, c3)                                        \
-    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)
-
-#define ndk_str5cmp(m, c0, c1, c2, c3, c4)                                    \
-    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
-        && m[4] == c4
-
-#define ndk_str6cmp(m, c0, c1, c2, c3, c4, c5)                                \
-    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
-        && (((uint32_t *) m)[1] & 0xffff) == ((c5 << 8) | c4)
-
-#define ndk_str7_cmp(m, c0, c1, c2, c3, c4, c5, c6, c7)                       \
-    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
-        && ((uint32_t *) m)[1] == ((c7 << 24) | (c6 << 16) | (c5 << 8) | c4)
-
-#define ndk_str8cmp(m, c0, c1, c2, c3, c4, c5, c6, c7)                        \
-    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
-        && ((uint32_t *) m)[1] == ((c7 << 24) | (c6 << 16) | (c5 << 8) | c4)
-
-#define ndk_str9cmp(m, c0, c1, c2, c3, c4, c5, c6, c7, c8)                    \
-    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
-        && ((uint32_t *) m)[1] == ((c7 << 24) | (c6 << 16) | (c5 << 8) | c4)  \
-        && m[8] == c8
-
-#else /* !(NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED) */
-
-#define ndk_str3_cmp(m, c0, c1, c2, c3)                                       \
-    m[0] == c0 && m[1] == c1 && m[2] == c2
-
-#define ndk_str3Ocmp(m, c0, c1, c2, c3)                                       \
-    m[0] == c0 && m[2] == c2 && m[3] == c3
-
-#define ndk_str4cmp(m, c0, c1, c2, c3)                                        \
-    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3
-
-#define ndk_str5cmp(m, c0, c1, c2, c3, c4)                                    \
-    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3 && m[4] == c4
-
-#define ndk_str6cmp(m, c0, c1, c2, c3, c4, c5)                                \
-    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3                      \
-        && m[4] == c4 && m[5] == c5
-
-#define ndk_str7_cmp(m, c0, c1, c2, c3, c4, c5, c6, c7)                       \
-    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3                      \
-        && m[4] == c4 && m[5] == c5 && m[6] == c6
-
-#define ndk_str8cmp(m, c0, c1, c2, c3, c4, c5, c6, c7)                        \
-    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3                      \
-        && m[4] == c4 && m[5] == c5 && m[6] == c6 && m[7] == c7
-
-#define ndk_str9cmp(m, c0, c1, c2, c3, c4, c5, c6, c7, c8)                    \
-    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3                      \
-        && m[4] == c4 && m[5] == c5 && m[6] == c6 && m[7] == c7 && m[8] == c8
-
-#endif
-
diff --git a/debian/modules/http-ndk/src/ndk_path.c b/debian/modules/http-ndk/src/ndk_path.c
deleted file mode 100644
index 0b7c266..0000000
--- a/debian/modules/http-ndk/src/ndk_path.c
+++ /dev/null
@@ -1,583 +0,0 @@
-
-
-
-/* This function cleans a path to its most basic form, performing the following transformations :
- *
- *  - ./ -> [empty]
- *  - // -> /
- *  - /base/parent/../ -> /base/
- *
- * If possible, it leaves the original string in place and does not copy characters, otherwise
- * characters are copied.
-*/
-
-void
-ndk_clean_path (ngx_str_t *path, ngx_uint_t complex, size_t off)
-{
-    u_char         *s, *p, *m, *e, c, *l;
-    ngx_uint_t      root;
-
-    if (path->len == 1) {
-
-        if (path->data[0] == '.') {
-            path->len = 0;
-        }
-
-        return;
-    }
-
-    /* strip initial './' */
-
-    s = path->data;
-    e = s + path->len;
-
-    if (off) {
-        p = s + off;
-        goto check_basic;
-    }
-
-    if (*s == '/')
-        root = 1;
-    else
-        root = 0;
-
-    while (s < e) {
-
-        switch (*s) {
-
-        case    '/' :
-
-            /* '//' => '/' */
-
-            s++;
-            continue;
-
-        case    '.' :
-
-            if (s == e-1) {
-
-                if (root) {
-                    path->data[0] = '/';
-                    path->len = 1;
-                } else {
-                    path->len = 0;
-                }
-
-                return;
-            }
-
-            /* './' => '' */
-
-            if (s[1] == '/') {
-
-                s += 2;
-
-                if (s == e) {
-
-                    path->len = 0;
-                    return;
-                }
-
-                continue;
-            }
-        }
-
-        break;
-    }
-
-    if (root && *s != '/') {
-        s--;
-    }
-
-    p = s;
-
-check_basic :
-
-    for ( ; p<e; p++) {
-
-        if (*p == '/') {
-
-        new_dir_first :
-
-            if (e - p == 1)
-                break;
-
-            switch (p[1]) {
-
-            case    '/' :
-
-                /* '//' => '/' */
-
-                m = p + 2;
-                goto copy;
-
-            case    '.' :
-
-                if (e - p == 2)
-                    break;
-
-                switch (p[2]) {
-
-                case    '/' :
-
-                    /* './' => '' */
-
-                    m = p + 2;
-                    goto copy;
-
-                case    '.' :
-
-                    if (e - p == 3 || p[3] == '/') {
-
-                        if (p == s) {
-
-                            s += 3;
-                            continue;
-                        }
-
-                        if (p - s >= 2) {
-
-                            if (p[-1] == '.' && p[-2] == '.') {
-
-                                if (p - s == 2 || p[-3] == '/') {    /* = '../../' */
-
-                                    p += 2;     /* 3? */
-                                    continue;
-                                }
-                            }
-                        }
-
-                        m = p + 4;
-
-                        if (complex) {
-
-                            for (p--; p >= s; p--) {
-
-                                switch (*p) {
-
-                                case    '/' :
-                                    goto copy;
-
-                                case    '$' :
-
-                                    p = m - 1;
-
-                                    if (m == e)
-                                        goto end_basic;
-
-                                    goto new_dir_first;
-                                }
-                            }
-
-                        } else {
-
-                           for (p--; p > s; p--) {
-
-                                /* '/path/folder/../' => '/path/' */
-
-                                if (*p == '/')
-                                    break;
-                            }
-                        }
-
-                        goto copy;
-                    }
-                }
-            }
-        }
-    }
-
-end_basic :
-
-    path->data = s;
-    path->len = p - s;
-
-    return;
-
-copy :
-
-    p++;
-
-    if (m < e)
-        goto new_dir;
-
-    while (m < e) {       
-
-        c = *m;
-        *p = c;
-        p++;
-
-        if (c == '/') {
-
-            m++;
-
-        new_dir :
-
-            for ( ; m<e; m++) {
-
-                c = *m;
-                if (c != '/')
-                    break;
-            }
-
-            if (m == e)
-                break;
-
-            if (c == '.') {
-
-                if (e - m == 1)
-                    break;
-
-                switch (m[1]) {
-
-                case    '/' :
-
-                    /* './' => '' */
-
-                    m += 2;
-                    if (m == e)
-                        break;
-
-                    goto new_dir;
-
-                case    '.' :
-
-                    if (e - m == 2 || m[2] == '/') {
-
-                        if (m - s >= 3) {   /* NOTE : this is one higher than above because m has moved on 1 */
-
-                            if (p[-2] == '.' && p[-3] == '.') {
-
-                                if (m - s == 3 || p[-4] == '/') {    /* = '../../' */
-
-                                    p[0] = '.';
-                                    p[1] = '.';
-                                    p[2] = '/';
-                                    p += 3;
-                                    m += 3;
-                                    goto new_dir;
-                                }
-                            }
-                        }
-
-                        if (complex) {
-
-                            l = p;
-
-                            for (p -= 2; p >= s; p--) {
-
-                                switch (*p) {
-
-                                case    '/' :
-                                    break;
-
-                                case    '$' :
-
-                                    l[0] = '.';
-                                    l[1] = '.';
-                                    l[2] = '/';
-                                    p = l + 4;
-                                    break;
-
-                                default :
-                                    continue;
-                                }
-
-                                break;
-                            }
-
-                            m += 3;
-                            if (m == e)
-                                goto end;
-
-                            goto new_dir;
-
-                        } else {
-
-                            for (p -= 2; p > s; p--) {
-
-                                /* '/path/folder/../' => '/path/' */
-
-                                if (*p == '/')
-                                    break;
-                            }
-
-                            m += 3;
-                            if (m == e)
-                                goto end;
-
-                            goto new_dir;
-                        }
-                    }
-                }
-            }
-
-        } else {
-            m++;
-        }
-    }
-
-end :
-
-    path->data = s;
-    path->len = p - s;
-}
-
-
-/* This function converts a path to its directory version, and assumes that there is always space
- * to allocatate an extra character on the end (which is only true if the provided strings always
- * have NULL's at the end (hence the 'safe').
-*/
-
-void
-ndk_path_to_dir_safe (ngx_str_t *path, ngx_uint_t complex, size_t off)
-{
-    size_t   len;
-    u_char  *p, *m;
-
-    ndk_clean_path (path, complex, off);
-
-    len = path->len;
-    if (!len)
-        return;
-
-    p = path->data;
-    m = p + len - 1;
-
-    if (*m != '/') {
-
-        p [len] = '/';
-        path->len++;
-    }
-}
-
-
-/* Divides a path given by path/to/path1:path/to/path2 into separate strings and returns an
- * array of these strings.
-*/
-
-ngx_array_t *
-ndk_split_path_create (ngx_conf_t *cf, ngx_str_t *path)
-{
-    ngx_str_t         *str;
-    int                n;
-    u_char            *m, *s, *e;
-    ngx_array_t       *a; 
-
-    if (path == NULL)
-        return  NULL;
-
-    n = ndk_strcntc (path, ':');
-
-    a = ngx_array_create (cf->pool, n + 1, sizeof (ngx_str_t));
-    if (a == NULL) {
-        return  NULL;
-    }
-
-    s = path->data;
-    e = s + path->len;
-
-    while (s < e) {
-
-        m = s;
-
-        while (m < e && *m != ':') m++;
-
-        if (m == s) {
-            s = m+1;
-            continue;
-        }
-
-        str = ngx_array_push (a);
-        if (str == NULL) {
-            return  NULL;
-        }
-
-        str->data = s;
-        str->len = m - s;
-
-        if (ngx_conf_full_name (cf->cycle, str, 0) == NGX_ERROR)
-            return  NULL;
-
-        s = m+1;
-    }
-
-    return  a;
-}
-
-
-
-ngx_array_t *
-ndk_split_path_create_raw (ngx_conf_t *cf, char *path)
-{
-    ngx_str_t         *str;
-    int                n;
-    char              *m, *s;
-    ngx_array_t       *a; 
-
-    if (path == NULL)
-        return  NULL;
-
-    n = ndk_strccnt (path, ':');
-
-    a = ngx_array_create (cf->pool, n + 1, sizeof (ngx_str_t));
-    if (a == NULL) {
-        return  NULL;
-    }
-
-    s = path;
-
-
-    while (*s != '\0') {
-
-        m = s;
-
-        while (*m != '\0' && *m != ':') m++;
-
-        if (m == s) {
-            s = m+1;
-            continue;
-        }
-
-        str = ngx_array_push (a);
-        if (str == NULL) {
-            return  NULL;
-        }
-
-        str->data = (u_char *) s;
-        str->len = m - s;
-
-        if (ngx_conf_full_name (cf->cycle, str, 0) == NGX_ERROR)
-            return  NULL;
-
-        if (*m == '\0')
-            break;
-
-        s = m+1;
-    }
-
-    return  a;
-}
-
-
-
-char *
-ndk_conf_set_full_path_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_str_t        *path, *value;
-    ngx_conf_post_t  *post;
-
-    path = (ngx_str_t *) (p + cmd->offset);
-
-    if (path->data) {
-        return "is duplicate";
-    }
-
-    value = cf->args->elts;
-
-    *path = value[1];
-
-    if (ngx_conf_full_name (cf->cycle, path, 0) == NGX_ERROR)
-        return  NGX_CONF_ERROR;
-
-    if (cmd->post) {
-        post = cmd->post;
-        return post->post_handler(cf, post, path);
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_split_path_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)     
-{
-    /* TODO : change to use the path func above */
-
-    char  *p = conf;
-
-    ngx_str_t         *value, *str;
-    ngx_array_t      **a;
-    ngx_conf_post_t   *post;
-    int                n;
-    u_char            *m, *s, *e;
-
-    a = (ngx_array_t **) (p + cmd->offset);
-
-    if (*a != NGX_CONF_UNSET_PTR) {
-        return  "is duplicate";
-    }
-
-    value = cf->args->elts;
-    value++;
-
-    n = ndk_strcntc (value, ':') + 1;
-
-    *a = ngx_array_create (cf->pool, n, sizeof (ngx_str_t));
-    if (*a == NULL) {
-        return  NGX_CONF_ERROR;
-    }
-
-    s = value->data;
-    e = s + value->len;
-
-    while (s < e) {
-
-        m = s;
-
-        while (m < e && *m != ':') m++;
-
-        if (m == s) {
-            s = m+1;
-            continue;
-        }
-
-        str = ngx_array_push (*a);
-        if (str == NULL) {
-            return  NGX_CONF_ERROR;
-        }
-
-        str->data = s;
-        str->len = m - s;
-
-        if (ngx_conf_full_name (cf->cycle, str, 0) == NGX_ERROR)
-            return  NGX_CONF_ERROR;
-
-        s = m+1;
-    }
-
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, a);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_full_path (ngx_conf_t *cf, void *data, ngx_str_t *path)
-{
-    if (ngx_conf_full_name (cf->cycle, path, 0) == NGX_ERROR)
-        return  NGX_CONF_ERROR;
-
-    return  NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_full_conf_path (ngx_conf_t *cf, void *data, ngx_str_t *path)
-{
-    if (ngx_conf_full_name (cf->cycle, path, 1) == NGX_ERROR)
-        return  NGX_CONF_ERROR;
-
-    return  NGX_CONF_OK;
-}
-
-
diff --git a/debian/modules/http-ndk/src/ndk_path.h b/debian/modules/http-ndk/src/ndk_path.h
deleted file mode 100644
index 22ba945..0000000
--- a/debian/modules/http-ndk/src/ndk_path.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-/* path conversion functions */
-
-void            ndk_clean_path                  (ngx_str_t *path, ngx_uint_t complex, size_t off);
-void            ndk_path_to_dir_safe            (ngx_str_t *path, ngx_uint_t complex, size_t off);
-
-/* path create functions */
-
-ngx_array_t *   ndk_split_path_create           (ngx_conf_t *cf, ngx_str_t *path);
-ngx_array_t *   ndk_split_path_create_raw       (ngx_conf_t *cf, char *path);
-
-/* conf set functions */
-
-char *          ndk_conf_set_full_path_slot     (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *          ndk_conf_set_split_path_slot    (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-
-/* conf set post functions */
-
-char *          ndk_conf_set_full_path          (ngx_conf_t *cf, void *data, ngx_str_t *path);
-char *          ndk_conf_set_full_conf_path     (ngx_conf_t *cf, void *data, ngx_str_t *path);
-
diff --git a/debian/modules/http-ndk/src/ndk_process.c b/debian/modules/http-ndk/src/ndk_process.c
deleted file mode 100644
index fbc789c..0000000
--- a/debian/modules/http-ndk/src/ndk_process.c
+++ /dev/null
@@ -1,20 +0,0 @@
-
-ngx_int_t
-ndk_init_signals (ngx_signal_t *sig, ngx_log_t *log)
-{
-    struct sigaction   sa;
-
-    for ( ; sig->signo != 0; sig++) {
-        ndk_zerov (sa);
-        sa.sa_handler = sig->handler;
-        sigemptyset (&sa.sa_mask);
-        
-        if (sigaction (sig->signo, &sa, NULL) == -1) {
-            ngx_log_error (NGX_LOG_EMERG, log, ngx_errno,
-                          "sigaction(%s) failed", sig->signame);
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-ndk/src/ndk_process.h b/debian/modules/http-ndk/src/ndk_process.h
deleted file mode 100644
index 7ac1d99..0000000
--- a/debian/modules/http-ndk/src/ndk_process.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-typedef struct {
-    int     signo;
-    char   *signame;
-    char   *name;
-    void  (*handler)(int signo);
-} ngx_signal_t;
-
-
-ngx_int_t   ndk_init_signals    (ngx_signal_t *sig, ngx_log_t *log);
-
diff --git a/debian/modules/http-ndk/src/ndk_regex.c b/debian/modules/http-ndk/src/ndk_regex.c
deleted file mode 100644
index c1efd86..0000000
--- a/debian/modules/http-ndk/src/ndk_regex.c
+++ /dev/null
@@ -1,215 +0,0 @@
-
-
-char *
-ndk_conf_set_regex_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_str_t               *value;
-    ngx_conf_post_t         *post;
-    ngx_regex_elt_t         *re;   
-    ngx_regex_compile_t      rc;
-    u_char                   errstr[NGX_MAX_CONF_ERRSTR];
-
-    re = (ngx_regex_elt_t *) (p + cmd->offset);
-
-    if (re->name) {
-        return  "is duplicate";
-    }
-
-    value = cf->args->elts;
-    value++;
-
-    ndk_zerov (rc);
-
-    rc.pool = cf->pool;
-    rc.err.len = NGX_MAX_CONF_ERRSTR;
-    rc.err.data = errstr;
-    rc.pattern = *value;
-
-    if (ngx_regex_compile(&rc) != NGX_OK) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
-        return NGX_CONF_ERROR;
-    }
-
-    re->regex = rc.regex;
-    re->name = value->data;
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, re);
-    }
-
-    return  NGX_CONF_OK;
-}
- 
-
-char *
-ndk_conf_set_regex_caseless_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_str_t               *value;
-    ngx_conf_post_t         *post;
-    ngx_regex_elt_t         *re;   
-    ngx_regex_compile_t      rc;
-    u_char                   errstr[NGX_MAX_CONF_ERRSTR];
-
-    re = (ngx_regex_elt_t *) (p + cmd->offset);
-
-    if (re->name) {
-        return  "is duplicate";
-    }
-
-    value = cf->args->elts;
-    value++;
-
-    ndk_zerov (rc);
-
-    rc.pool = cf->pool;
-    rc.err.len = NGX_MAX_CONF_ERRSTR;
-    rc.err.data = errstr;
-    rc.pattern = *value;
-    rc.options = NGX_REGEX_CASELESS;
-
-    if (ngx_regex_compile(&rc) != NGX_OK) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
-        return NGX_CONF_ERROR;
-    }
-
-    re->regex = rc.regex;
-    re->name = value->data;
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, re);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_regex_array_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_str_t               *value;
-    ngx_conf_post_t         *post;
-    ngx_array_t            **a;
-    ngx_regex_elt_t         *re;   
-    ngx_regex_compile_t      rc;
-    ngx_uint_t               i, n = 0;
-    u_char                   errstr[NGX_MAX_CONF_ERRSTR];
-
-    a = (ngx_array_t **) (p + cmd->offset);
-
-    if (*a != NGX_CONF_UNSET_PTR) {
-
-        n = cf->args->nelts > 4 ? cf->args->nelts : 4;
-
-        *a = ngx_array_create (cf->pool, n, sizeof (ngx_regex_elt_t));
-        if (*a == NULL) {
-            return  NGX_CONF_ERROR;
-        }
-    }
-
-    ndk_zerov (rc);
-
-    rc.pool = cf->pool;
-    rc.err.len = NGX_MAX_CONF_ERRSTR;
-    rc.err.data = errstr;
-
-    value = cf->args->elts;
-    value++;
-
-    for (i=0; i<n; i++, value++) {
-
-        re = ngx_array_push (*a);
-        if (re == NULL)
-            return  NGX_CONF_ERROR;
-
-        rc.pattern = *value;
-
-        if (ngx_regex_compile(&rc) != NGX_OK) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
-            return NGX_CONF_ERROR;
-        }
-
-        re->regex = rc.regex;
-        re->name = value->data;
-    }
-
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, a);
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-
-char *
-ndk_conf_set_regex_array_caseless_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_str_t               *value;
-    ngx_conf_post_t         *post;
-    ngx_array_t            **a;
-    ngx_regex_elt_t         *re;   
-    ngx_regex_compile_t      rc;
-    ngx_uint_t               i, n = 0;
-    u_char                   errstr[NGX_MAX_CONF_ERRSTR];
-
-    a = (ngx_array_t **) (p + cmd->offset);
-
-    if (*a != NGX_CONF_UNSET_PTR) {
-
-        n = cf->args->nelts > 4 ? cf->args->nelts : 4;
-
-        *a = ngx_array_create (cf->pool, n, sizeof (ngx_regex_elt_t));
-        if (*a == NULL) {
-            return  NGX_CONF_ERROR;
-        }
-    }
-
-    ndk_zerov (rc);
-
-    rc.pool = cf->pool;
-    rc.err.len = NGX_MAX_CONF_ERRSTR;
-    rc.err.data = errstr;
-
-    value = cf->args->elts;
-    value++;
-
-    for (i=0; i<n; i++, value++) {
-
-        re = ngx_array_push (*a);
-        if (re == NULL)
-            return  NGX_CONF_ERROR;
-
-        rc.pattern = *value;
-        rc.options = NGX_REGEX_CASELESS;
-
-        if (ngx_regex_compile(&rc) != NGX_OK) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
-            return NGX_CONF_ERROR;
-        }
-
-        re->regex = rc.regex;
-        re->name = value->data;
-    }
-
-
-    if (cmd->post) {
-        post = cmd->post;
-        return  post->post_handler (cf, post, a);
-    }
-
-    return  NGX_CONF_OK;
-}
-
diff --git a/debian/modules/http-ndk/src/ndk_regex.h b/debian/modules/http-ndk/src/ndk_regex.h
deleted file mode 100644
index 4319b04..0000000
--- a/debian/modules/http-ndk/src/ndk_regex.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-char *  ndk_conf_set_regex_slot                 (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_regex_caseless_slot        (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_regex_array_slot           (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_conf_set_regex_array_caseless_slot  (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-
diff --git a/debian/modules/http-ndk/src/ndk_rewrite.c b/debian/modules/http-ndk/src/ndk_rewrite.c
deleted file mode 100644
index 77ce9f8..0000000
--- a/debian/modules/http-ndk/src/ndk_rewrite.c
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-/* these have been taken from the rewrite module and http_script file
- * because those functions are defined as being static - a patch will
- * be provided later to un-define them as being static
- */
-
-
-uintptr_t ndk_http_script_exit_code = (uintptr_t) NULL;
-
-
-char *
-ndk_http_rewrite_value (ngx_conf_t *cf, ndk_http_rewrite_loc_conf_t *lcf,
-    ngx_str_t *value)
-{
-    ngx_int_t                              n;
-    ngx_http_script_compile_t              sc;
-    ngx_http_script_value_code_t          *val;
-    ngx_http_script_complex_value_code_t  *complex;
-
-    n = ngx_http_script_variables_count(value);
-
-    if (n == 0) {
-        val = ngx_http_script_start_code(cf->pool, &lcf->codes,
-                                         sizeof(ngx_http_script_value_code_t));
-        if (val == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        n = ngx_atoi(value->data, value->len);
-
-        if (n == NGX_ERROR) {
-            n = 0;
-        }
-
-        val->code = ngx_http_script_value_code;
-        val->value = (uintptr_t) n;
-        val->text_len = (uintptr_t) value->len;
-        val->text_data = (uintptr_t) value->data;
-
-        return NGX_CONF_OK;
-    }
-
-    complex = ngx_http_script_start_code(cf->pool, &lcf->codes,
-                                 sizeof(ngx_http_script_complex_value_code_t));
-    if (complex == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    complex->code = ngx_http_script_complex_value_code;
-    complex->lengths = NULL;
-
-    ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
-
-    sc.cf = cf;
-    sc.source = value;
-    sc.lengths = &complex->lengths;
-    sc.values = &lcf->codes;
-    sc.variables = n;
-    sc.complete_lengths = 1;
-
-    if (ngx_http_script_compile(&sc) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-ngx_int_t
-ndk_http_rewrite_var (ngx_http_request_t *r, ngx_http_variable_value_t *v,
-    uintptr_t data)
-{
-    ngx_http_variable_t          *var;
-    ngx_http_core_main_conf_t    *cmcf;
-    ndk_http_rewrite_loc_conf_t  *rlcf;
-
-    rlcf = ngx_http_get_module_loc_conf(r, ngx_http_rewrite_module);
-
-    if (rlcf->uninitialized_variable_warn == 0) {
-        *v = ngx_http_variable_null_value;
-        return NGX_OK;
-    }
-
-    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-    var = cmcf->variables.elts;
-
-    /*
-     * the ngx_http_rewrite_module sets variables directly in r->variables,
-     * and they should be handled by ngx_http_get_indexed_variable(),
-     * so the handler is called only if the variable is not initialized
-     */
-
-    ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                  "using uninitialized \"%V\" variable", &var[data].name);
-
-    *v = ngx_http_variable_null_value;
-
-    return  NGX_OK;
-}
-
-
diff --git a/debian/modules/http-ndk/src/ndk_rewrite.h b/debian/modules/http-ndk/src/ndk_rewrite.h
deleted file mode 100644
index 2479aa2..0000000
--- a/debian/modules/http-ndk/src/ndk_rewrite.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-/* TODO : should remove this when not needed */
-
-
-
-/* used for plugging into the rewrite module (taken from the rewrite module) */
-
-typedef struct {
-    ngx_array_t  *codes;        /* uintptr_t */
-    ngx_uint_t    stack_size;
-    ngx_flag_t    log;
-    ngx_flag_t    uninitialized_variable_warn;
-} ndk_http_rewrite_loc_conf_t;
-
-
-extern  ngx_module_t    ngx_http_rewrite_module;
-extern  uintptr_t       ndk_http_script_exit_code;
-
-char *      ndk_http_rewrite_value      (ngx_conf_t *cf, ndk_http_rewrite_loc_conf_t *lcf,
-                                            ngx_str_t *value);
-ngx_int_t   ndk_http_rewrite_var        (ngx_http_request_t *r, 
-                                            ngx_http_variable_value_t *v, uintptr_t data);
-
-#define     ndk_http_script_exit  (u_char *) &ndk_http_script_exit_code
-
diff --git a/debian/modules/http-ndk/src/ndk_set_var.c b/debian/modules/http-ndk/src/ndk_set_var.c
deleted file mode 100644
index 388f873..0000000
--- a/debian/modules/http-ndk/src/ndk_set_var.c
+++ /dev/null
@@ -1,602 +0,0 @@
-#include    <ndk.h>
-
-
-typedef struct {
-    ngx_http_script_code_pt     code;
-    void                       *func;
-} ndk_set_var_code_t;
-
-
-typedef struct {
-    ngx_http_script_code_pt     code;
-    void                       *func;
-    size_t                      size;
-} ndk_set_var_size_code_t;
-
-
-typedef struct {
-    ngx_http_script_code_pt     code;
-    void                       *func;
-    void                       *data;
-} ndk_set_var_data_code_t;
-
-
-typedef struct {
-    ngx_http_script_code_pt     code;
-    void                       *func;
-    size_t                      size;
-    void                       *data;
-} ndk_set_var_size_data_code_t;
-
-
-typedef struct {
-    ngx_int_t                        index;
-    ngx_str_t                       *value;
-    ngx_http_variable_t             *v;
-    ngx_conf_t                      *cf;
-    ndk_http_rewrite_loc_conf_t     *rlcf;
-} ndk_set_var_info_t;
-
-
-static void     ndk_set_var_code           (ngx_http_script_engine_t *e);
-static void     ndk_set_var_hash_code      (ngx_http_script_engine_t *e);
-static void     ndk_set_var_value_code     (ngx_http_script_engine_t *e);
-
-
-static ngx_inline void
-ndk_set_var_code_finalize(ngx_http_script_engine_t *e, ngx_int_t rc,
-                                ngx_http_variable_value_t *v, ngx_str_t *str)
-{
-    switch (rc) {
-
-    case NGX_OK:
-
-        v->data = str->data;
-        v->len = str->len;
-        v->valid = 1;
-        v->no_cacheable = 0;
-        v->not_found = 0;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0,
-                        "http script value (post filter): \"%v\"", v);
-        break;
-
-    case NGX_DECLINED:
-
-        v->valid = 0;
-        v->not_found = 1;
-        v->no_cacheable = 1;
-        break;
-
-    case NGX_ERROR:
-
-        e->ip = ndk_http_script_exit;
-        e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
-        break;
-    }
-}
-
-
-
-static void
-ndk_set_var_code(ngx_http_script_engine_t *e)
-{
-    ngx_int_t                    rc;
-    ngx_str_t                    str;
-    ngx_http_variable_value_t   *v;
-    ndk_set_var_code_t          *sv;
-    ndk_set_var_pt               func;
-
-    sv = (ndk_set_var_code_t *) e->ip;
-
-    e->ip += sizeof(ndk_set_var_code_t);
-
-    v = e->sp++;
-
-    func = (ndk_set_var_pt) sv->func;
-
-    rc = func(e->request, &str);
-
-    ndk_set_var_code_finalize(e, rc, v, &str);
-}
-
-
-static void
-ndk_set_var_data_code(ngx_http_script_engine_t *e)
-{
-    ngx_int_t                    rc;
-    ngx_str_t                    str;
-    ngx_http_variable_value_t   *v;
-    ndk_set_var_data_code_t     *svd;
-    ndk_set_var_data_pt          func;
-
-    svd = (ndk_set_var_data_code_t *) e->ip;
-
-    e->ip += sizeof(ndk_set_var_data_code_t);
-
-    v = e->sp++;
-
-    func = (ndk_set_var_data_pt) svd->func;
-
-    rc = func(e->request, &str, svd->data);
-
-    ndk_set_var_code_finalize(e, rc, v, &str);
-}
-
-
-static void
-ndk_set_var_value_code(ngx_http_script_engine_t *e)
-{
-    ngx_int_t                    rc;
-    ngx_str_t                    str;
-    ngx_http_variable_value_t   *v;
-    ndk_set_var_code_t          *sv;
-    ndk_set_var_value_pt         func;
-
-    sv = (ndk_set_var_code_t *) e->ip;
-
-    e->ip += sizeof(ndk_set_var_code_t);
-
-    v = e->sp - 1;
-
-    func = (ndk_set_var_value_pt) sv->func;
-
-    rc = func(e->request, &str, v);
-
-    ndk_set_var_code_finalize(e, rc, v, &str);
-}
-
-
-static void
-ndk_set_var_value_data_code(ngx_http_script_engine_t *e)
-{
-    ngx_int_t                    rc;
-    ngx_str_t                    str;
-    ngx_http_variable_value_t   *v;
-    ndk_set_var_data_code_t     *svd;
-    ndk_set_var_value_data_pt    func;
-
-    svd = (ndk_set_var_data_code_t *) e->ip;
-
-    e->ip += sizeof(ndk_set_var_data_code_t);
-
-    v = e->sp - 1;
-
-    func = (ndk_set_var_value_data_pt) svd->func;
-
-    rc = func(e->request, &str, v, svd->data);
-
-    ndk_set_var_code_finalize(e, rc, v, &str);
-}
-
-
-static void
-ndk_set_var_multi_value_code(ngx_http_script_engine_t *e)
-{
-    ngx_int_t                    rc;
-    ngx_str_t                    str;
-    ngx_http_variable_value_t   *v;
-    ndk_set_var_size_code_t     *svs;
-    ndk_set_var_value_pt         func;
-
-    svs = (ndk_set_var_size_code_t *) e->ip;
-
-    e->ip += sizeof(ndk_set_var_size_code_t);
-
-    v = e->sp - svs->size;
-    e->sp = v + 1;
-
-    func = (ndk_set_var_value_pt) svs->func;
-
-    rc = func(e->request, &str, v);
-
-    ndk_set_var_code_finalize(e, rc, v, &str);
-}
-
-
-static void
-ndk_set_var_multi_value_data_code(ngx_http_script_engine_t *e)
-{
-    ngx_int_t                        rc;
-    ngx_str_t                        str;
-    ngx_http_variable_value_t       *v;
-    ndk_set_var_size_data_code_t    *svsd;
-    ndk_set_var_value_data_pt        func;
-
-    svsd = (ndk_set_var_size_data_code_t *) e->ip;
-
-    e->ip += sizeof(ndk_set_var_size_data_code_t);
-
-    v = e->sp - svsd->size;
-    e->sp = v + 1;
-
-    func = (ndk_set_var_value_data_pt) svsd->func;
-
-    rc = func(e->request, &str, v, svsd->data);
-
-    ndk_set_var_code_finalize(e, rc, v, &str);
-}
-
-
-static void
-ndk_set_var_hash_code(ngx_http_script_engine_t *e)
-{
-    u_char                      *p;
-    ngx_http_variable_value_t   *v;
-    ndk_set_var_size_code_t     *svs;
-    ndk_set_var_hash_pt          func;
-
-    svs = (ndk_set_var_size_code_t *) e->ip;
-
-    e->ip += sizeof(ndk_set_var_size_code_t);
-
-    p = ngx_palloc(e->request->pool, svs->size);
-    if (p == NULL) {
-        e->ip = ndk_http_script_exit;
-        e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
-        return;
-    }
-
-    v = e->sp - 1;
-
-    func = (ndk_set_var_hash_pt) svs->func;
-
-    func(p, (char *) v->data, v->len);
-
-    v->data = (u_char *) p;
-    v->len = svs->size;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0,
-                   "http script hashed value: \"%v\"", v);
-}
-
-
-
-static char *
-ndk_set_var_name(ndk_set_var_info_t *info, ngx_str_t *varname)
-{
-    ngx_int_t                        index;
-    ngx_http_variable_t             *v;
-    ngx_conf_t                      *cf;
-    ndk_http_rewrite_loc_conf_t     *rlcf;
-    ngx_str_t                        name;
-
-    name = *varname;
-
-    cf = info->cf;
-    rlcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_rewrite_module);
-
-    if (name.data[0] != '$') {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid variable name \"%V\"", &name);
-        return NGX_CONF_ERROR;
-    }
-
-    name.len--;
-    name.data++;
-
-    v = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
-    if (v == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    index = ngx_http_get_variable_index(cf, &name);
-    if (index == NGX_ERROR) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (v->get_handler == NULL
-        && ngx_strncasecmp(name.data, (u_char *) "arg_", 4) != 0
-        && ngx_strncasecmp(name.data, (u_char *) "cookie_", 7) != 0
-        && ngx_strncasecmp(name.data, (u_char *) "http_", 5) != 0
-        && ngx_strncasecmp(name.data, (u_char *) "sent_http_", 10) != 0
-        && ngx_strncasecmp(name.data, (u_char *) "upstream_http_", 14) != 0)
-    {
-        v->get_handler = ndk_http_rewrite_var;
-        v->data = index;
-    }
-
-    info->v = v;
-    info->index = index;
-    info->rlcf = rlcf;
-
-    return NGX_CONF_OK;
-}
-
-
-
-static void
-ndk_set_variable_value_space(ndk_http_rewrite_loc_conf_t *rlcf, ngx_uint_t count)
-{
-    /* if the number of variable values that will be used is greater than 10,
-     * make sure there is enough space allocated on the rewrite value stack
-     */
-
-    if (count <= 10)
-        return;
-
-    if (rlcf->stack_size == NGX_CONF_UNSET_UINT) {
-        rlcf->stack_size = count;
-        return;
-    }
-
-    if (rlcf->stack_size < count)
-        rlcf->stack_size = count;
-}
-
-
-
-static char *
-ndk_set_var_filter(ngx_conf_t *cf, ndk_http_rewrite_loc_conf_t *rlcf,
-    ndk_set_var_t *filter)
-{
-    ndk_set_var_code_t             *sv;
-    ndk_set_var_size_code_t        *svs;
-    ndk_set_var_data_code_t        *svd;
-    ndk_set_var_size_data_code_t   *svsd;
-
-    if (filter == NULL) {
-        return "no filter set";
-    }
-
-    switch (filter->type) {
-    case NDK_SET_VAR_BASIC:
-
-        sv = ngx_http_script_start_code(cf->pool, &rlcf->codes,
-                                         sizeof(ndk_set_var_code_t));
-        if (sv == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        sv->code = ndk_set_var_code;
-        sv->func = filter->func;
-        break;
-
-    case NDK_SET_VAR_DATA:
-
-        svd = ngx_http_script_start_code(cf->pool, &rlcf->codes,
-                                         sizeof(ndk_set_var_data_code_t));
-        if (svd == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        svd->code = ndk_set_var_data_code;
-        svd->func = filter->func;
-        svd->data = filter->data;
-        break;
-
-    case NDK_SET_VAR_VALUE:
-
-        sv = ngx_http_script_start_code(cf->pool, &rlcf->codes,
-                                         sizeof(ndk_set_var_code_t));
-        if (sv == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        sv->code = ndk_set_var_value_code;
-        sv->func = filter->func;
-        break;
-
-    case NDK_SET_VAR_VALUE_DATA:
-
-        svd = ngx_http_script_start_code(cf->pool, &rlcf->codes,
-                                         sizeof(ndk_set_var_data_code_t));
-        if (svd == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        svd->code = ndk_set_var_value_data_code;
-        svd->func = filter->func;
-        svd->data = filter->data;
-        break;
-
-    case NDK_SET_VAR_MULTI_VALUE:
-
-        svs = ngx_http_script_start_code(cf->pool, &rlcf->codes,
-                                          sizeof(ndk_set_var_size_code_t));
-        if (svs == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        svs->code = ndk_set_var_multi_value_code;
-        svs->func = filter->func;
-        svs->size = filter->size;
-
-        ndk_set_variable_value_space(rlcf, svs->size);
-        break;
-
-    case NDK_SET_VAR_MULTI_VALUE_DATA:
-
-        svsd = ngx_http_script_start_code(cf->pool, &rlcf->codes,
-                                          sizeof(ndk_set_var_size_data_code_t));
-        if (svsd == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        svsd->code = ndk_set_var_multi_value_data_code;
-        svsd->func = filter->func;
-        svsd->size = filter->size;
-        svsd->data = filter->data;
-
-        ndk_set_variable_value_space(rlcf, svsd->size);
-        break;
-
-
-    case NDK_SET_VAR_HASH:
-
-        svs = ngx_http_script_start_code(cf->pool, &rlcf->codes,
-                                          sizeof(ndk_set_var_size_code_t));
-        if (svs == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        svs->code = ndk_set_var_hash_code;
-        svs->func = filter->func;
-        svs->size = filter->size;
-        break;
-
-    default:
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid filter type \"%ul\"", filter->type);
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ndk_set_var_filter_value(ndk_set_var_info_t *info, ndk_set_var_t *filter)
-{
-    ngx_conf_t                          *cf;
-    ngx_http_variable_t                 *v;
-    ndk_http_rewrite_loc_conf_t         *rlcf;
-    ngx_http_script_var_code_t          *vcode;
-    ngx_http_script_var_handler_code_t  *vhcode;
-
-    v = info->v;
-    cf = info->cf;
-    rlcf = info->rlcf;
-
-    if (ndk_set_var_filter(cf, rlcf, filter) != NGX_CONF_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (v->set_handler) {
-        vhcode = ngx_http_script_start_code(cf->pool, &rlcf->codes,
-                                   sizeof(ngx_http_script_var_handler_code_t));
-        if (vhcode == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        vhcode->code = ngx_http_script_var_set_handler_code;
-        vhcode->handler = v->set_handler;
-        vhcode->data = v->data;
-
-        return NGX_CONF_OK;
-    }
-
-    vcode = ngx_http_script_start_code(cf->pool, &rlcf->codes,
-                                       sizeof(ngx_http_script_var_code_t));
-    if (vcode == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    vcode->code = ngx_http_script_set_var_code;
-    vcode->index = (uintptr_t) info->index;
-
-    return NGX_CONF_OK;
-}
-
-
-char *
-ndk_set_var_core(ngx_conf_t *cf, ngx_str_t *name, ndk_set_var_t *filter)
-{
-    char                    *p;
-    ndk_set_var_info_t       info;
-
-    info.cf = cf;
-
-    p = ndk_set_var_name(&info, name);
-    if (p != NGX_CONF_OK) {
-        return p;
-    }
-
-    return ndk_set_var_filter_value(&info, filter);
-}
-
-
-char *
-ndk_set_var_value_core(ngx_conf_t *cf, ngx_str_t *name, ngx_str_t *value, ndk_set_var_t *filter)
-{
-    char                    *p;
-    ndk_set_var_info_t       info;
-
-    info.cf = cf;
-
-    p = ndk_set_var_name(&info, name);
-    if (p != NGX_CONF_OK) {
-        return p;
-    }
-
-    p = ndk_http_rewrite_value(cf, info.rlcf, value);
-    if (p != NGX_CONF_OK) {
-        return p;
-    }
-
-    return ndk_set_var_filter_value(&info, filter);
-}
-
-
-char *
-ndk_set_var_multi_value_core(ngx_conf_t *cf, ngx_str_t *name,
-        ngx_str_t *value, ndk_set_var_t *filter)
-{
-    char                    *p;
-    ndk_set_var_info_t       info;
-    ngx_int_t                i;
-
-    info.cf = cf;
-
-    p = ndk_set_var_name(&info, name);
-    if (p != NGX_CONF_OK) {
-        return p;
-    }
-
-    for (i = filter->size; i; i--, value++) {
-
-        p = ndk_http_rewrite_value(cf, info.rlcf, value);
-        if (p != NGX_CONF_OK) {
-            return p;
-        }
-    }
-
-    return ndk_set_var_filter_value(&info, filter);
-}
-
-
-char *
-ndk_set_var(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_str_t               *value;
-    ndk_set_var_t      *filter;
-
-    value = cf->args->elts;
-    value++;
-
-    filter = (ndk_set_var_t *) cmd->post;
-
-    return ndk_set_var_core(cf, value, filter);
-}
-
-
-char *
-ndk_set_var_value(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_str_t               *value;
-    ndk_set_var_t           *filter;
-
-    value = cf->args->elts;
-    value++;
-
-    filter = (ndk_set_var_t *) cmd->post;
-
-    return ndk_set_var_value_core(cf, value,
-            cf->args->nelts == 1 + 1 ? value : value + 1, filter);
-}
-
-
-char *
-ndk_set_var_multi_value(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_str_t               *value;
-    ndk_set_var_t      *filter;
-
-    value = cf->args->elts;
-    value++;
-
-    filter = (ndk_set_var_t *) cmd->post;
-
-    return ndk_set_var_multi_value_core(cf, value, value + 1, filter);
-}
-
diff --git a/debian/modules/http-ndk/src/ndk_set_var.h b/debian/modules/http-ndk/src/ndk_set_var.h
deleted file mode 100644
index 5dcba97..0000000
--- a/debian/modules/http-ndk/src/ndk_set_var.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 2010 (C) Marcus Clyne
- */
-
-#ifndef _NDK_SET_VAR_H_INCLUDED_
-#define _NDK_SET_VAR_H_INCLUDED_
-
-
-typedef ngx_int_t   (*ndk_set_var_pt)              (ngx_http_request_t *r, ngx_str_t *val);
-typedef ngx_int_t   (*ndk_set_var_data_pt)         (ngx_http_request_t *r, ngx_str_t *val, void *data);
-typedef ngx_int_t   (*ndk_set_var_value_pt)        (ngx_http_request_t *r, ngx_str_t *val, ngx_http_variable_value_t *v);
-typedef ngx_int_t   (*ndk_set_var_value_data_pt)   (ngx_http_request_t *r, ngx_str_t *val, ngx_http_variable_value_t *v, void *data);
-typedef void        (*ndk_set_var_hash_pt)         (u_char *p, char *data, size_t len);
-
-
-typedef struct {
-    ngx_uint_t      type;
-    void           *func;
-    size_t          size;
-    void           *data;
-} ndk_set_var_t;
-
-
-enum {
-    NDK_SET_VAR_BASIC = 0,
-    NDK_SET_VAR_DATA,
-    NDK_SET_VAR_VALUE,
-    NDK_SET_VAR_VALUE_DATA,
-    NDK_SET_VAR_MULTI_VALUE,
-    NDK_SET_VAR_MULTI_VALUE_DATA,
-    NDK_SET_VAR_HASH
-};
-
-
-char *  ndk_set_var                    (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_set_var_value              (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *  ndk_set_var_multi_value        (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-
-
-char *  ndk_set_var_core               (ngx_conf_t *cf, ngx_str_t *name, ndk_set_var_t *filter);
-char *  ndk_set_var_value_core         (ngx_conf_t *cf, ngx_str_t *name, ngx_str_t *value, ndk_set_var_t *filter);
-char *  ndk_set_var_multi_value_core   (ngx_conf_t *cf, ngx_str_t *name, ngx_str_t *value, ndk_set_var_t *filter);
-
-#endif /* _NDK_SET_VAR_H_INCLUDED_ */
diff --git a/debian/modules/http-ndk/src/ndk_string.c b/debian/modules/http-ndk/src/ndk_string.c
deleted file mode 100644
index 7c2a965..0000000
--- a/debian/modules/http-ndk/src/ndk_string.c
+++ /dev/null
@@ -1,434 +0,0 @@
-
-
-int64_t
-ndk_atoi64 (u_char *line, size_t n)
-{
-    int64_t  value;
-
-    if (n == 0ll) {
-        return NGX_ERROR;
-    }
-
-    for (value = 0ll; n--; line++) {
-        if (*line < '0' || *line > '9') {
-            return NGX_ERROR;
-        }
-
-        value = value * 10ll + (*line - '0');
-    }
-
-    if (value < 0ll) {
-        return NGX_ERROR;
-    }
-
-    return value;
-}
-
-
-ngx_int_t
-ndk_strcntc (ngx_str_t *s, char c)
-{
-    ngx_int_t   n;
-    size_t      i;
-    u_char     *p;
-
-    i = s->len;
-    p = s->data;
-
-    for (n=0; i; i--, p++) {
-
-        if (*p == (u_char) c)
-            n++;
-    }
-
-    return  n;
-}
-
-
-ngx_int_t
-ndk_strccnt (char *s, char c)
-{
-    ngx_int_t   n;
-
-    n = 0;
-
-    while (*s != '\0') {
-
-        if (*s == 'c')
-            n++;
-
-        s++;
-    }
-
-    return  n;
-}
-
-
-
-ngx_array_t *
-ndk_str_array_create (ngx_pool_t *pool, char **s, ngx_int_t n)
-{
-    ngx_int_t        i;
-    ngx_str_t       *str;
-    ngx_array_t     *a;
-
-    a = ngx_array_create (pool, n, sizeof (ngx_str_t));
-    if (a == NULL)
-        return  NULL;
-
-
-    for (i=0; i<n; i++, s++) {
-
-        str = ngx_array_push (a);
-
-        str->data = (u_char *) *s;
-        str->len = strlen (*s);
-    }
-
-    return  a;
-}
-
-
-
-u_char *
-ndk_vcatstrf (ngx_pool_t *pool, ngx_str_t *dest, const char *fmt, va_list args)
-{
-    size_t          len, l, el;
-    int             argc;
-    u_char         *p, *m, *e, c, c1, *cp;
-
-    argc = strlen (fmt);
-
-    ngx_str_t      *s;
-    ndk_estr_t     *sp, *sp2, ss [argc];
-    u_char        cs [argc];
-
-    sp = sp2 = ss;
-    cp = cs;
-
-    len = 0;
-
-    /* TODO : maybe have 'e' at the beginning? */
-
-    /* parse format to get strings */
-
-    while (*fmt) {
-
-        switch (*fmt) {
-
-        case    'S'     :
-
-            s = va_arg (args, ngx_str_t *);
-
-            sp->data = s->data;
-            sp->len = s->len;
-            sp->escaped = 0;
-
-            len += sp->len;
-            break;
-
-        case    's'     :
-
-            sp->data = va_arg (args, u_char *);
-            sp->len = (size_t) ngx_strlen (sp->data);
-            sp->escaped = 0;
-
-            len += sp->len;
-            break;
-
-        case    'l'     :
-
-            sp->data = va_arg (args, u_char *);
-            sp->len = (size_t) va_arg (args, int);
-            sp->escaped = 0;
-
-            len += sp->len;
-            break;
-
-        case    'L'     :
-
-            sp->data = va_arg (args, u_char *);
-            sp->len = va_arg (args, size_t);
-            sp->escaped = 0;
-
-            len += sp->len;
-            break;
-
-        case    'e' :
-
-            p = va_arg (args, u_char *);
-
-            sp->data = p;
-
-            l = 0;
-            el = 0;
-            c = *p;
-
-            while (c != '\0') {
-
-                if (c == '\\') {
-                    l += 2;
-                    p += 2;
-                } else {
-                    l++;
-                    p++;
-                }
-
-                el++; 
-                c = *p;
-            }
-
-            sp->len = l;
-            sp->escaped = 1;
-
-            len += el;
-            break;
-
-        case    'E' :
-
-            s = va_arg (args, ngx_str_t *);
-
-            sp->data = s->data;
-            sp->len = s->len;
-
-            p = sp->data;
-
-            el = 0;
-            e = p + sp->len;
-
-            while (p < e) {
-
-                c = *p;
-
-                if (c == '\\') {
-                    p += 2;
-                } else {
-                    p++;
-                }
-
-                el++;                    
-            }
-
-            sp->escaped = 1;
-
-            len += el;
-            break;
-
-        case    'n' :
-
-            sp->data = va_arg (args, u_char *);
-            sp->len = (size_t) va_arg (args, int);
-
-            p = sp->data;
-
-            el = 0;
-            e = p + sp->len;
-
-            while (p < e) {
-
-                c = *p;
-
-                if (c == '\\') {
-                    p += 2;
-                } else {
-                    p++;
-                }
-
-                el++;                    
-            }
-
-            sp->escaped = 1;
-
-            len += el;
-            break;
-
-        case    'c' :
-
-            *cp = (u_char) va_arg (args, int);
-
-            sp->data = cp;
-            sp->len = (size_t) 1;
-
-            len++;
-            cp++;
-
-            break; 
-
-        default         :
-
-            ndk_log_alert (pool->log, 0, "catstrf () : format [%s] incorrect", fmt);
-
-            return  NULL;
-
-        }
-
-        sp++;
-        fmt++;
-    }
-
-
-
-    /* create space for string (assumes no NULL's in strings) */
-
-    ndk_palloc_rn (p, pool, len + 1);
-
-    dest->data = p;
-    dest->len = len;
-
-    /* copy other strings */
-
-    if (len) {
-
-        while (sp2 < sp) {
-
-            if (sp2->escaped) {
-
-                m = sp2->data;
-                e = m + sp2->len;
-
-                while (m < e) {
-
-                    c = *m;
-
-                    if (c == '\\') {
-
-                        if (m == e - 1) {
-                            *p = '\\';
-                            p++;
-                            break;
-                        }
-
-                        c1 = m[1];
-
-                        switch (c1) {
-
-                        case    'n' :
-                            *p = '\n';
-                            break;
-
-                        case    't' :
-                            *p = '\t';
-                            break;
-
-                        case    '0' :
-                            *p = '\0';
-                            break;
-
-                        case    '\\' :
-                            *p = '\\';
-                            break;
-
-                        case    's' :
-                            *p = ' ';
-                            break;
-
-                        case    'b' :
-                            *p = '\b';
-                            break;
-
-                        case    'r' :
-                            *p = '\r';
-                            break;
-
-                        default :
-
-                            *p = c1;
-                            break;
-                        }
-
-                        m += 2;
-
-                    } else {
-
-                        *p = c;
-                        m++;
-                    }
-
-                    p++;
-                }
-
-            } else {
-
-                p = ngx_cpymem (p, sp2->data, sp2->len);
-            }
-
-            sp2++;
-        }
-    }
-
-    *p = '\0';
-
-    return  dest->data;
-}
-
-
-u_char *
-ndk_catstrf (ngx_pool_t *pool, ngx_str_t *dest, const char *fmt, ...)
-{
-    u_char       *p;
-    va_list         args;
-
-    va_start (args, fmt);
-    p = ndk_vcatstrf (pool, dest, fmt, args);
-    va_end (args);
-
-    return  p;
-}
-
-
-ngx_int_t
-ndk_cmpstr (ngx_str_t *s1, ngx_str_t *s2)
-{
-    ngx_int_t   rv;
-    size_t      len1, len2;
-
-    len1 = s1->len;
-    len2 = s2->len;
-
-    if (len1 == len2) {
-        return  ngx_strncmp (s1->data, s2->data, len1);
-    }
-
-    if (len1 > len2) {
-
-        rv = ngx_strncmp (s1->data, s2->data, len2);
-        if (rv == 0)
-            return  1;
-
-        return  rv;
-    }
-
-    rv = ngx_strncmp (s1->data, s2->data, len1);
-    if (rv == 0)
-        return  -1;
-
-    return  rv;
-}
-
-
-u_char *
-ndk_dupstr (ngx_pool_t *pool, ngx_str_t *dest, ngx_str_t *src)
-{
-    u_char       *d;
-    size_t       n;
-
-    n = src->len;
-
-    ndk_palloc_rn (d, pool, n + 1);
-    ndk_strncpy (d, src->data, n);
-
-    dest->data = d;
-    dest->len = n;
-
-    return  d;
-}
-
-/*
-ngx_keyval_t *
-ndk_url_args_to_keyval_list (ngx_pool_t *pool, ngx_str_t *str)
-{
-    ngx_keyval_t    *kv;
-    ngx_st
-    
-}
-*/
diff --git a/debian/modules/http-ndk/src/ndk_string.h b/debian/modules/http-ndk/src/ndk_string.h
deleted file mode 100644
index ecd21c4..0000000
--- a/debian/modules/http-ndk/src/ndk_string.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-#if 1
-/* TODO : set ndk_hex_dump for older versions of Nginx */
-#define     ndk_hex_dump                    ngx_hex_dump
-#endif
-
-typedef struct {
-    size_t          len;
-    u_char         *data;
-    ngx_flag_t      escaped;
-} ndk_estr_t;
-
-int64_t         ndk_atoi64                  (u_char *line, size_t n);
-
-ngx_int_t       ndk_strcntc                 (ngx_str_t *s, char c);
-ngx_int_t       ndk_strccnt                 (char *s, char c);
-ngx_array_t *   ndk_str_array_create        (ngx_pool_t *pool, char **s, ngx_int_t n);
-u_char *        ndk_catstrf                 (ngx_pool_t *pool, ngx_str_t *dest, const char *fmt, ...);
-ngx_int_t       ndk_cmpstr                  (ngx_str_t *s1, ngx_str_t *s2);
-u_char *        ndk_dupstr                  (ngx_pool_t *pool, ngx_str_t *dest, ngx_str_t *src);
-
-static ngx_inline void
-ndk_strtoupper (u_char *p, size_t len)
-{
-    u_char *e = p + len;
-    for ( ; p<e; p++) {
-        *p = ngx_toupper(*p);
-    }
-}
-
-
-static ngx_inline u_char *
-ndk_strncpy (u_char *d, u_char *s, size_t n)
-{
-    return  (u_char *) strncpy ((char *) d, (char *) s, n);
-}
diff --git a/debian/modules/http-ndk/src/ndk_string_util.h b/debian/modules/http-ndk/src/ndk_string_util.h
deleted file mode 100644
index d23b8e1..0000000
--- a/debian/modules/http-ndk/src/ndk_string_util.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-#define     ndk_str_init(ns,s)              {(ns).data = (u_char*) s; (ns).len = sizeof (s) - 1;}
-#define     ndk_strp_init(ns,s)             {(ns)->data = (u_char*) s; (ns)->len = sizeof (s) - 1;}
-
-#define     ndk_zero(p,sz)                  memset (p,'\0',sz)
-#define     ndk_zerop(p)                    ndk_zero (p,sizeof(*p))
-#define     ndk_zeropn(p,n)                 ndk_zero (p,sizeof(*p)*(n))
-#define     ndk_zerov(v)                    ndk_zero (&v,sizeof(v))
-
-#define     ngx_null_enum   { ngx_null_string, 0 }
-
-#define     ndk_memcpyp(d,s)                ngx_memcpy(d,s,sizeof(s))
-
diff --git a/debian/modules/http-ndk/src/ndk_upstream_list.c b/debian/modules/http-ndk/src/ndk_upstream_list.c
deleted file mode 100644
index 7381777..0000000
--- a/debian/modules/http-ndk/src/ndk_upstream_list.c
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-/* TODO : generalize this into a generic list module, with weight */
-
-
-typedef struct {
-    ngx_uint_t      weight;
-    ngx_str_t       s;
-    ngx_conf_t     *cf;
-} ndk_upstream_list_parse_t;
-
-
-
-static ngx_int_t
-ndk_upstream_list_parse_weight (ndk_upstream_list_parse_t *ulp)
-{
-    size_t      i;
-    ngx_str_t   *s;
-
-    s = &ulp->s;
-
-    for (i=0; i<s->len; i++) {
-
-        if (s->data[i] < '0' || s->data[i] > '9')
-            break;
-    }
-
-    if (!i) {
-        ulp->weight = 1;
-        return  NGX_OK;
-    }
-
-    if (i == s->len) {
-        ngx_conf_log_error (NGX_LOG_EMERG, ulp->cf, 0,
-            "upstream list just consists of number \"%V\"", s);
-
-        return  NGX_ERROR;
-    }
-
-    if (s->data[i] != ':') {
-        ngx_conf_log_error (NGX_LOG_EMERG, ulp->cf, 0,
-            "upstream list not correct format \"%V\"", s);
-
-        return  NGX_ERROR;
-    }
-
-
-    ulp->weight = ngx_atoi (s->data, i);
-
-    s->data += (i + 1);
-    s->len -= (i + 1);
-
-    return  NGX_OK;
-}
-
-
-
-static char *
-ndk_upstream_list (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    /* TODO : change this for getting upstream pointer if available */
-
-    ngx_uint_t                   buckets, count, i, j;
-    ngx_str_t                   *value, **bucket, *us;
-    ngx_array_t                 *ula;
-    ndk_upstream_list_t         *ul, *ule;
-    ndk_upstream_list_parse_t    ulp;
-
-    ndk_http_main_conf_t        *mcf;
-
-    mcf = ngx_http_conf_get_module_main_conf (cf, ndk_http_module);
-
-    ula = mcf->upstreams;
-
-    /* create array of upstream lists it doesn't already exist */
-
-    if (ula == NULL) {
-
-        ula = ngx_array_create (cf->pool, 4, sizeof (ndk_upstream_list_t));
-        if (ula == NULL)
-            return  NGX_CONF_ERROR;
-
-        mcf->upstreams = ula;
-    }
-
-
-    /* check to see if the list already exists */
-
-    value = cf->args->elts;
-    value++;
-
-    ul = ula->elts;
-    ule = ul + ula->nelts;
-
-    for ( ; ul<ule; ul++) {
-
-        if (ul->name.len == value->len &&
-            ngx_strncasecmp (ul->name.data, value->data, value->len) == 0) {
-
-            ngx_conf_log_error (NGX_LOG_EMERG, cf, 0,
-                           "duplicate upstream list name \"%V\"", value);
-
-            return  NGX_CONF_ERROR;
-        }
-    }
-
-
-    /* create a new list */
-
-    ul = ngx_array_push (ula);
-    if (ul == NULL)
-        return  NGX_CONF_ERROR;
-
-    ul->name = *value;
-
-
-
-    /* copy all the upstream names */
-
-    count = cf->args->nelts - 2;
-
-    us = ngx_palloc (cf->pool, count * sizeof (ngx_str_t));
-    if (us == NULL)
-        return  NGX_CONF_ERROR;
-
-    ngx_memcpy (us, value + 1, count * sizeof (ngx_str_t));
-
-
-    /* calculate the total number of buckets */
-
-    buckets = 0;
-
-    ulp.cf = cf;
-
-    for (i=0; i<count; i++, us++) {
-
-        ulp.s = *us;
-
-        if (ndk_upstream_list_parse_weight (&ulp) != NGX_OK)
-            return  NGX_CONF_ERROR;
-
-        buckets += ulp.weight;
-    }
-
-
-    /* allocate space for all buckets */
-
-    bucket = ngx_palloc (cf->pool, buckets * sizeof (ngx_str_t **));
-    if (bucket == NULL)
-        return  NGX_CONF_ERROR;
-
-    ul->elts = bucket;
-    ul->nelts = buckets;
-
-
-    /* set values for each bucket */
-
-    us -= count;
-
-    for (i=0; i<count; i++, us++) {
-
-        ulp.s = *us;
-
-        if (ndk_upstream_list_parse_weight (&ulp) != NGX_OK)
-            return  NGX_CONF_ERROR;
-
-        us->data = ulp.s.data;
-        us->len = ulp.s.len;
-
-        /* TODO : check format of upstream */
-        /* TODO : add automatic adding of http:// in upstreams? */
-
-        for (j=0; j<ulp.weight; j++, bucket++) {
-
-            *bucket = us;
-        }
-    }
-
-    return  NGX_CONF_OK;
-}
-
-
-ndk_upstream_list_t *
-ndk_get_upstream_list (ndk_http_main_conf_t *mcf, u_char *data, size_t len)
-{
-    ndk_upstream_list_t         *ul, *ule;
-    ngx_array_t                 *ua = mcf->upstreams;
-
-    if (ua == NULL) {
-        return NULL;
-    }
-
-    ul = ua->elts;
-    ule = ul + ua->nelts;
-
-    for (; ul < ule; ul++) {
-        if (ul->name.len == len && ngx_strncasecmp(ul->name.data, data, len) == 0)
-        {
-            return ul;
-        }
-    }
-
-    return NULL;
-}
-
diff --git a/debian/modules/http-ndk/src/ndk_upstream_list.h b/debian/modules/http-ndk/src/ndk_upstream_list.h
deleted file mode 100644
index 3786456..0000000
--- a/debian/modules/http-ndk/src/ndk_upstream_list.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#if (NDK_UPSTREAM_LIST_CMDS)
-
-/* TODO : use the generated commands */
-
-{
-    ngx_string ("upstream_list"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_2MORE,
-    ndk_upstream_list,
-    0,
-    0,
-    NULL
-},
-
-#else
-
-typedef struct {
-    ngx_str_t       **elts;
-    ngx_uint_t        nelts;
-    ngx_str_t         name;
-} ndk_upstream_list_t;
-
-
-ndk_upstream_list_t *
-ndk_get_upstream_list (ndk_http_main_conf_t *mcf, u_char *data, size_t len);
-
-#endif
diff --git a/debian/modules/http-ndk/src/ndk_uri.c b/debian/modules/http-ndk/src/ndk_uri.c
deleted file mode 100644
index 19e90e8..0000000
--- a/debian/modules/http-ndk/src/ndk_uri.c
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-/* TODO : check that this is correct */
-
-u_char *
-ndk_map_uri_to_path_add_suffix (ngx_http_request_t *r, ngx_str_t *path, ngx_str_t *suffix, ngx_int_t dot)
-{
-    size_t      root_size;
-    u_char     *p;
-
-    if (suffix->len) {
-
-        if (dot) {
-
-            p = ngx_http_map_uri_to_path (r, path, &root_size, suffix->len + 1);
-
-            if (p == NULL)
-                return  NULL;
-
-            *p = '.';
-            p++;
-
-        } else {
-
-            p = ngx_http_map_uri_to_path (r, path, &root_size, suffix->len);
-
-            if (p == NULL)
-                return  NULL;
-        }       
-
-        path->len--;
-
-        p = ngx_cpymem (p, suffix->data, suffix->len);
-        *p = '\0';
-
-        return  p;  
-    }
-
-    p = ngx_http_map_uri_to_path (r, path, &root_size, 0);
-
-    path->len--;
-
-    return  p;
-}
-
diff --git a/debian/modules/http-ndk/src/ndk_uri.h b/debian/modules/http-ndk/src/ndk_uri.h
deleted file mode 100644
index dac3880..0000000
--- a/debian/modules/http-ndk/src/ndk_uri.h
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-u_char *  ndk_map_uri_to_path_add_suffix  (ngx_http_request_t *r, ngx_str_t *path, ngx_str_t *suffix, ngx_int_t dot);
-
-
diff --git a/debian/modules/nchan/LICENCE b/debian/modules/nchan/LICENCE
deleted file mode 100644
index aed1f30..0000000
--- a/debian/modules/nchan/LICENCE
+++ /dev/null
@@ -1,24 +0,0 @@
-This work is distributed under the MIT Licence.
-
-Written by Leo Ponomarev (slact) 2009-2015.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above authorship notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/debian/modules/nchan/README.md b/debian/modules/nchan/README.md
deleted file mode 100644
index f1c2a4d..0000000
--- a/debian/modules/nchan/README.md
+++ /dev/null
@@ -1,1552 +0,0 @@
-<img class="logo" alt="NCHAN" src="https://nchan.io/github-logo.png" />
-
-https://nchan.io
-
-Nchan is a scalable, flexible pub/sub server for the modern web, built as a module for the [Nginx](http://nginx.org) web server. It can be configured as a standalone server, or as a shim between your application and hundreds, thousands, or millions of live subscribers. It can buffer messages in memory, on-disk, or via [Redis](http://redis.io). All connections are handled asynchronously and distributed among any number of worker processes. It can also scale to many Nginx servers with [Redis](http://redis.io).
-
-Messages are [published](#publisher-endpoints) to channels with HTTP `POST` requests or Websocket, and [subscribed](#subscriber-endpoint) also through [Websocket](#websocket), [long-polling](#long-polling), [EventSource](#eventsource) (SSE), old-fashioned [interval polling](#interval-polling), [and](#http-chunked-transfer) [more](#http-multipart-mixed).
-
-In a web browser, you can use Websocket or EventSource natively, or the [NchanSubscriber.js](https://github.com/slact/nchan.js) wrapper library. It supports Long-Polling, EventSource, and resumable Websockets, and has a few other added convenience options. It's also available on [NPM](https://www.npmjs.com/package/nchan).
-
-## Features
- - RESTful, HTTP-native [API](#publishing-messages).
- - Supports [Websocket](#websocket), [EventSource (Server-Sent Events)](#eventsource), [Long-Polling](#long-polling) and other HTTP-based subscribers.
- - Per-channel configurable message buffers with no-repeat, no-loss message delivery guarantees.
- - Subscribe to [hundreds of channels](#channel-multiplexing) over a single subscriber connection.
- - HTTP request [callbacks and hooks](#hooks-and-callbacks) for easy integration.
- - Introspection with [channel events](#channel-events) and [url for monitoring performance statistics](#nchan_stub_status-stats).
- - Channel [group](#channel-groups) usage [accounting and limits](#limits-and-accounting).
- - Fast, nonblocking [shared-memory local message storage](#memory-storage) and optional, slower, persistent storage with [Redis](#redis).
- - Horizontally scalable (using [Redis](#redis)).
- - Auto-failover and [high availability](#high-availability) with no single point of failure using [Redis Cluster](#redis-cluster).
-
-## Status and History
-
-The latest Nchan release is 1.2.15 (December 27, 2021) ([changelog](https://nchan.io/changelog)).
-
-The first iteration of Nchan was written in 2009-2010 as the [Nginx HTTP Push Module](https://pushmodule.slact.net), and was vastly refactored into its present state in 2014-2016.
-
-#### Upgrade from Nginx HTTP Push Module
-
-Although Nchan is backwards-compatible with all Push Module configuration directives, some of the more unusual and rarely used settings have been disabled and will be ignored (with a warning). See the [upgrade page](https://nchan.io/upgrade) for a detailed list of changes and improvements, as well as a full list of incompatibilities.
-
-
-## Does it scale?
-
-<img class="benchmark_graph" alt="benchmarking internal subscriber response times" src="https://nchan.io/img/benchmark_internal_total.png" />
-
-Yes it does. Like Nginx, Nchan can easily handle as much traffic as you can throw at it. I've tried to benchmark it, but my benchmarking tools are much slower than Nchan. The data I've gathered is on how long Nchan itself takes to respond to every subscriber after publishing a message -- this excludes TCP handshake times and internal HTTP request parsing. Basically, it measures how Nchan scales assuming all other components are already tuned for scalability. The graphed data are averages of 5 runs with 50-byte messages.
-
-With a well-tuned OS and network stack on commodity server hardware, expect to handle upwards of 300K concurrent subscribers per second at minimal CPU load. Nchan can also be scaled out to multiple Nginx instances using the [Redis storage engine](#nchan_use_redis), and that too can be scaled up beyond a single-point-of-failure by using [Redis Cluster](#redis-cluster).
-
-
-## Install
-
-#### Download Packages
- - [Arch Linux](https://archlinux.org): [nginx-mod-nchan](https://aur.archlinux.org/packages/nginx-mod-nchan/) and [nginx-mainline-mod-nchan](https://aur.archlinux.org/packages/nginx-mainline-mod-nchan/) are available in the Arch User Repository.
- - Mac OS X: a [homebrew](http://brew.sh) package is available. `brew tap denji/nginx; brew install nginx-full --with-nchan-module`
- - [Debian](https://www.debian.org/): A dynamic module build is available in the Debian package repository: [libnginx-mod-nchan](https://packages.debian.org/sid/libnginx-mod-nchan).  
- Additionally, you can use the pre-built static module packages [nginx-common.deb](https://nchan.io/download/nginx-common.deb) and [nginx-extras.deb](https://nchan.io/download/nginx-extras.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`.
- - [Ubuntu](http://www.ubuntu.com/):  [nginx-common.ubuntu.deb](https://nchan.io/download/nginx-common.ubuntu.deb) and [nginx-extras.ubuntu.deb](https://nchan.io/download/nginx-extras.ubuntu.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`. Who knows when Ubuntu will add Nchan to their repository?...
- - [Fedora](https://fedoraproject.org): Dynamic module builds for Nginx > 1.10.0 are available: [nginx-mod-nchan.x86_64.rpm](https://nchan.io/download/nginx-mod-nchan.x86-64.rpm), [nginx-mod-nchan.src.rpm](https://nchan.io/download/nginx-mod-nchan.src.rpm). 
- - [Heroku](https://heroku.com): A buildpack for compiling Nchan into Nginx is available: [nchan-buildpack](https://github.com/andjosh/nchan-buildpack). A one-click, readily-deployable app is also available: [nchan-heroku](https://github.com/andjosh/nchan-heroku).
- - A statically compiled binary and associated linux nginx installation files are also [available as a tarball](https://nchan.io/download/nginx-nchan-latest.tar.gz).
-
-
-#### Build From Source
-Grab the latest copy of Nginx from [nginx.org](http://nginx.org). Grab the latest Nchan source from [github](https://github.com/slact/nchan/releases). Follow the instructions for [building Nginx](https://www.nginx.com/resources/wiki/start/topics/tutorials/install/#source-releases), except during the `configure` stage, add
-```
-./configure --add-module=path/to/nchan ...
-```
-
-If you're using Nginx  > 1.9.11, you can build Nchan as a [dynamic module](https://www.nginx.com/blog/dynamic-modules-nginx-1-9-11/) with `--add-dynamic-module=path/to/nchan`
-
-Run `make`, then `make install`.
-
-## Getting Started
-
-Once you've built and installed Nchan, it's very easy to start using. Add two locations to your nginx config:
-
-```nginx
-#...
-http {  
-  server {
-    #...
-    
-    location = /sub {
-      nchan_subscriber;
-      nchan_channel_id $arg_id;
-    }
-    
-    location = /pub {
-      nchan_publisher;
-      nchan_channel_id $arg_id;
-    }
-  }
-}
-```
-
-You can now publish messages to channels by `POST`ing data to `/pub?id=channel_id` , and subscribe by pointing Websocket, EventSource, or [NchanSubscriber.js](https://github.com/slact/nchan.js) to `sub/?id=channel_id`. It's that simple.
-
-But Nchan is very flexible and highly configurable. So, of course, it can get a lot more complicated...
-
-### Conceptual Overview
-
-The basic unit of most pub/sub solutions is the messaging *channel*. Nchan is no different. Publishers send messages to channels with a certain *channel id*, and subscribers subscribed to those channels receive them. Some number of messages may be buffered for a time in a channel's message buffer before they are deleted. Pretty simple, right? 
-
-Well... the trouble is that nginx configuration does not deal with channels, publishers, and subscribers. Rather, it has several sections for incoming requests to match against *server* and *location* sections. **Nchan configuration directives map servers and locations onto channel publishing and subscribing endpoints**:
-
-```nginx
-#very basic nchan config
-worker_processes 5;
-
-http {  
-  server {
-    listen       80;
-    
-    location = /sub {
-      nchan_subscriber;
-      nchan_channel_id foobar;
-    }
-    
-    location = /pub {
-      nchan_publisher;
-      nchan_channel_id foobar;
-    }
-  }
-}
-```
-
-The above maps requests to the URI `/sub` onto the channel `foobar`'s *subscriber endpoint* , and similarly `/pub` onto channel `foobar`'s *publisher endpoint*.
-
-
-## Publisher Endpoints
-
-Publisher endpoints are Nginx config *locations* with the [*`nchan_publisher`*](#nchan_publisher) directive.
-
-Messages can be published to a channel by sending HTTP **POST** requests with the message contents to the *publisher endpoint* locations. You can also publish messages through a **Websocket** connection to the same location.
-
-```nginx
-  location /pub {
-    #example publisher location
-    nchan_publisher;
-    nchan_channel_id foo;
-    nchan_channel_group test;
-    nchan_message_buffer_length 50;
-    nchan_message_timeout 5m;
-  }
-```
-
-<!-- tag:publisher -->
-
-### Publishing Messages
-
-Requests and websocket messages are responded to with information about the channel at time of message publication. Here's an example from publishing with `curl`:
-
-```console
->  curl --request POST --data "test message" http://127.0.0.1:80/pub
-
- queued messages: 5
- last requested: 18 sec. ago
- active subscribers: 0
- last message id: 1450755280:0
-```
-
-The response can be in plaintext (as above), JSON, or XML, based on the request's *`Accept`* header:
-
-```console
-> curl --request POST --data "test message" -H "Accept: text/json" http://127.0.0.2:80/pub
-
- {"messages": 5, "requested": 18, "subscribers": 0, "last_message_id": "1450755280:0" }
-```
-
-Websocket publishers also receive the same responses when publishing, with the encoding determined by the *`Accept`* header present during the handshake.
-
-The response code for an HTTP request is *`202` Accepted* if no subscribers are present at time of publication, or *`201` Created* if at least 1 subscriber was present.
-
-Metadata can be added to a message when using an HTTP POST request for publishing. A `Content-Type` header will be associated as the message's content type (and output to Long-Poll, Interval-Poll, and multipart/mixed subscribers). A `X-EventSource-Event` header can also be used to associate an EventSource `event:` line value with a message.
-
-### Other Publisher Endpoint Actions
-
-**HTTP `GET`** requests return channel information without publishing a message. The response code is `200` if the channel exists, and `404` otherwise:  
-```console
-> curl --request POST --data "test message" http://127.0.0.2:80/pub
-  ...
-
-> curl -v --request GET -H "Accept: text/json" http://127.0.0.2:80/pub
-
- {"messages": 1, "requested": 7, "subscribers": 0, "last_message_id": "1450755421:0" }
-```
-
-
-**HTTP `DELETE`** requests delete a channel and end all subscriber connections. Like the `GET` requests, this returns a `200` status response with channel info if the channel existed, and a `404` otherwise.
-
-### How Channel Settings Work
-
-*A channel's configuration is set to the that of its last-used publishing location.*
-So, if you want a channel to behave consistently, and want to publish to it from multiple locations, *make sure those locations have the same configuration*.
-
-You can also can use differently-configured publisher locations to dynamically update a channel's message buffer settings. This can be used to erase messages or to scale an existing channel's message buffer as desired.
-
-## Subscriber Endpoints
-
-Subscriber endpoints are Nginx config *locations* with the [*`nchan_subscriber`*](#nchan_subscriber) directive.
-
-Nchan supports several different kinds of subscribers for receiving messages: [*Websocket*](#websocket), [*EventSource*](#eventsource) (Server Sent Events),  [*Long-Poll*](#long-polling), [*Interval-Poll*](#interval-polling). [*HTTP chunked transfer*](#http-chunked-transfer), and [*HTTP multipart/mixed*](#http-multipart-mixed).
-
-```nginx
-  location /sub {
-    #example subscriber location
-    nchan_subscriber;
-    nchan_channel_id foo;
-    nchan_channel_group test;
-    nchan_subscriber_first_message oldest;
-  }
-```
-
-<!-- tag:subscriber -->
-
-- ### Long-Polling
-  The tried-and-true server-push method supported by every browser out there.  
-  Initiated by sending an HTTP `GET` request to a channel subscriber endpoint.  
-  The long-polling subscriber walks through a channel's message queue via the built-in cache mechanism of HTTP clients, namely with the "`Last-Modified`" and "`Etag`" headers. Explicitly, to receive the next message for given a long-poll subscriber response, send a request with the "`If-Modified-Since`" header set to the previous response's "`Last-Modified`" header, and "`If-None-Match`" likewise set to the previous response's "`Etag`" header.  
-  Sending a request without a "`If-Modified-Since`" or "`If-None-Match`" headers returns the oldest message in a channel's message queue, or waits until the next published message, depending on the value of the `nchan_subscriber_first_message` config directive.  
-  A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
-  <!-- tag:subscriber-longpoll -->
-  
-- ### Interval-Polling
-  Works just like long-polling, except if the requested message is not yet available, immediately responds with a `304 Not Modified`.
-  Nchan cannot automatically distinguish between long-poll and interval-poll subscriber requests, so long-polling must be disabled for a subscriber location if you wish to use interval-polling.
-
-- ### Websocket
-  Bidirectional communication for web browsers. Part of the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html). Nchan supports the latest protocol version 13 ([RFC 6455](https://tools.ietf.org/html/rfc6455)).  
-  Initiated by sending a websocket handshake to the desired subscriber endpoint location.  
-  If the websocket connection is closed by the server, the `close` frame will contain the HTTP response code and status line describing the reason for closing the connection. Server-initiated keep-alive pings can be configured with the [`nchan_websocket_ping_interval`](#nchan_websocket_ping_interval) config directive.
-  Messages are delivered to subscribers in `text` websocket frames, except if a message's `content-type` is "`application/octet-stream`" -- then it is delivered in a `binary` frame.
-  <br />
-  Websocket subscribers can use the custom `ws+meta.nchan` subprotocol to receive message metadata with messages, making websocket connections resumable. Messages received with this subprotocol are of the form
-  <pre>
-  id: message_id
-  content-type: message_content_type
-  \n
-  message_data
-  </pre>   
-  The `content-type:` line may be omitted.
-  <br />
-  #### Websocket Publisher
-  Messages published through a websocket connection can be forwarded to an upstream application with the [`nchan_publisher_upstream_request`](#nchan_publisher_upstream_request) config directive.   
-  Messages published in a binary frame are automatically given the `content-type` "`application/octet-stream`".
-  #### Permessage-deflate
-  Nchan version 1.1.8 and above supports the [permessage-deflate protocol extension](https://tools.ietf.org/html/rfc7692). Messages are deflated once when they are published, and then can be broadcast to any number of compatible websocket subscribers. Message deflation is enabled by setting the [`nchan_deflate_message_for_websocket on;`](#nchan_deflate_message_for_websocket) directive in a publisher location.
-  <br />
-  The deflated data is stored alongside the original message in memory, or, if large enough, on disk. This means more [shared memory](#nchan_shared_memory_size) is necessary when using `nchan_deflate_message_for_websocket`.
-  <br />
-  Deflation parameters (speed, memory use, strategy, etc.), can be tweaked using the [`nchan_permessage_deflate_compression_window`](#nchan_permessage_deflate_compression_window), [`nchan_permessage_deflate_compression_level`](#nchan_permessage_deflate_compression_level),
-  [`nchan_permessage_deflate_compression_strategy`](#nchan_permessage_deflate_compression_strategy), and 
-  [`nchan_permessage_deflate_compression_window`](#nchan_permessage_deflate_compression_window) settings.
-  <br />
-  Nchan also supports the (deprecated) [perframe-deflate extension](https://tools.ietf.org/html/draft-tyoshino-hybi-websocket-perframe-deflate-06) still in use by Safari as `x-webkit-perframe-deflate`.
-  <br />
-  <!-- tag:subscriber-websocket -->
-  
-- ### EventSource
-  Also known as [Server-Sent Events](https://en.wikipedia.org/wiki/Server-sent_events) or SSE, it predates Websockets in the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html), and is a [very simple protocol](http://www.w3.org/TR/eventsource/#event-stream-interpretation).  
-  Initiated by sending an HTTP `GET` request to a channel subscriber endpoint with the "`Accept: text/event-stream`" header.    
-  Each message `data: ` segment will be prefaced by the message `id: `.  
-  To resume a closed EventSource connection from the last-received message, one *should* start the connection with the "`Last-Event-ID`" header set to the last message's `id`.  
-  Unfortunately, browsers [don't support setting](http://www.w3.org/TR/2011/WD-eventsource-20111020/#concept-event-stream-last-event-id) this header for an `EventSource` object, so by default the last message id is set either from the "`Last-Event-Id`" header or the `last_event_id` url query string argument.  
-  This behavior can be configured via the [`nchan_subscriber_last_message_id`](#nchan_subscriber_last_message_id) config.  
-  A message's `content-type` will not be received by an EventSource subscriber, as the protocol makes no provisions for this metadata.
-  A message's associated `event` type, if present, will be sent to this subscriber with the `event:` line.  
-  <!-- tag:subscriber-eventsource -->
-  
-- ### HTTP [multipart/mixed](http://www.w3.org/Protocols/rfc1341/7_2_Multipart.html#z0)
-  The `multipart/mixed` MIMEtype was conceived for emails, but hey, why not use it for HTTP? It's easy to parse and includes metadata with each message.  
-  Initiated by including an `Accept: multipart/mixed` header.  
-  The response headers and the unused "preamble" portion of the response body are sent right away, with the boundary string generated randomly for each subscriber.  Each subsequent message will be sent as one part of the multipart message, and will include the message time and tag (`Last-Modified` and `Etag`) as well as the optional `Content-Type` headers.  
-  Each message is terminated with the next multipart message's boundary **without a trailing newline**. While this conforms to the multipart spec, it is unusual as multipart messages are defined as *starting*, rather than ending with a boundary.  
-  A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
-  <!-- tag:subscriber-multipart -->
-  
-- ### HTTP Raw Stream
-  A simple subscription method similar to the [streaming subscriber](https://github.com/wandenberg/nginx-push-stream-module/blob/master/docs/directives/subscribers.textile#push_stream_subscriber) of the [Nginx HTTP Push Stream Module](https://github.com/wandenberg/nginx-push-stream-module). Messages are appended to the response body, separated by a newline or configurable by `nchan_subscriber_http_raw_stream_separator`.
-  <!-- tag:subscriber-rawstream -->
-
-- ### HTTP [Chunked Transfer](http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1)
-  This subscription method uses the `chunked` `Transfer-Encoding` to receive messages.   
-  Initiated by explicitly including `chunked` in the [`TE` header](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.39):  
-  `TE: chunked` (or `TE: chunked;q=??` where the qval > 0)  
-  The response headers are sent right away, and each message will be sent as an individual chunk. Note that because a zero-length chunk terminates the transfer, **zero-length messages will not be sent** to the subscriber.  
-  Unlike the other subscriber types, the `chunked` subscriber cannot be used with http/2 because it dissallows chunked encoding.
-  <!-- tag:subscriber-chunked -->
-
-## PubSub Endpoint  
-
-PubSub endpoints are Nginx config *locations* with the [*`nchan_pubsub`*](#nchan_pubsub) directive.
-
-A combination of *publisher* and *subscriber* endpoints, this location treats all HTTP `GET`
-requests as subscribers, and all HTTP `POST` as publishers. One simple use case is an echo server:
-
-```nginx
-  location = /pubsub {
-    nchan_pubsub;
-    nchan_channel_id foo;
-    nchan_channel_group test;
-  }
-```
-
-A more interesting setup may set different publisher and subscriber channel ids:
-
-```nginx
-  location = /pubsub {
-    nchan_pubsub;
-    nchan_publisher_channel_id foo;
-    nchan_subscriber_channel_id bar;
-    nchan_channel_group test;
-  }
-```
-
-Here, subscribers will listen for messages on channel `foo`, and publishers will publish messages to channel `bar`. This can be useful when setting up websocket proxying between web clients and your application.
-
-<!-- tag:pubsub -->
-
-## The Channel ID
-
-So far the examples have used static channel ids, which is not very useful. In practice, the channel id can be set to any nginx *variable*, such as a querystring argument, a header value, or a part of the location url:
-
-```nginx
-  location = /sub_by_ip {
-    #channel id is the subscriber's IP address
-    nchan_subscriber;
-    nchan_channel_id $remote_addr;
-  }
-  
-  location /sub_by_querystring {
-    #channel id is the query string parameter chanid
-    # GET /sub/sub_by_querystring?foo=bar&chanid=baz will have the channel id set to 'baz'
-    nchan_subscriber;
-    nchan_channel_id $arg_chanid;
-  }
-
-  location ~ /sub/(\w+)$ {
-    #channel id is the word after /sub/
-    # GET /sub/foobar_baz will have the channel id set to 'foobar_baz'
-    # I hope you know your regular expressions...
-    nchan_subscriber;
-    nchan_channel_id $1; #first capture of the location match
-  }
-```
-
-I recommend using the last option, a channel id derived from the request URL via a regular expression. It makes things nice and RESTful.
-
-<!-- tag:channel-id -->
-
-### Channel Multiplexing
-
-With channel multiplexing, subscribers can subscribe to up to 255 channels per connection. Messages published to all the specified channels will be delivered in-order to the subscriber. There are two ways to enable multiplexing:
-
-Up to 7 channel ids can be specified for the `nchan_channel_id` or `nchan_channel_subscriber_id` config directive:
-
-```nginx
-  location ~ /multisub/(\w+)/(\w+)$ {
-    nchan_subscriber;
-    nchan_channel_id "$1" "$2" "common_channel";
-    #GET /multisub/foo/bar will be subscribed to:
-    # channels 'foo', 'bar', and 'common_channel',
-    #and will receive messages from all of the above.
-  }
-```
-
-For more than 7 channels, `nchan_channel_id_split_delimiter` can be used to split the `nchan_channel_id` or `nchan_channel_subscriber_id` into up to 255 individual channel ids:
-
-```nginx
-  location ~ /multisub-split/(.*)$ {
-    nchan_subscriber;
-    nchan_channel_id "$1";
-    nchan_channel_id_split_delimiter ",";
-    #GET /multisub-split/foo,bar,baz,a will be subscribed to:
-    # channels 'foo', 'bar', 'baz', and 'a'
-    #and will receive messages from all of the above.
-  }
-```
-
-It is also possible to publish to multiple channels with a single request as well as delete multiple channels with a single request, with similar configuration:
-
-```nginx
-  location ~ /multipub/(\w+)/(\w+)$ {
-    nchan_publisher;
-    nchan_channel_id "$1" "$2" "another_channel";
-    #POST /multipub/foo/bar will publish to:
-    # channels 'foo', 'bar', 'another_channel'
-    #DELETE /multipub/foo/bar will delete:
-    # channels 'foo', 'bar', 'another_channel'
-  }
-```
-
-When a channel is deleted, all of its messages are deleted, and all of its subscribers' connection are closed -- including ones subscribing through a multiplexed location. For example, suppose a subscriber is subscribed to channels "foo" and "bar" via a single multiplexed connection. If "foo" is deleted, the connection is closed, and the subscriber therefore loses the "bar" subscription as well.
-
-See the [Channel Security](#securing-channels) section about using good IDs and keeping private channels secure.
-
-<!-- tag:channel-multiplexing -->
-
-### Channel Groups
-
-Channels can be associated with groups to avoid channel ID conflicts:
-
-```nginx
-  location /test_pubsub {
-    nchan_pubsub;
-    nchan_channel_group "test";
-    nchan_channel_id "foo";
-  }
-  
-  location /pubsub {
-    nchan_pubsub;
-    nchan_channel_group "production";
-    nchan_channel_id "foo";
-    #same channel id, different channel group. Thus, different channel.
-  }
-  
-  location /flexgroup_pubsub {
-    nchan_pubsub;
-    nchan_channel_group $arg_group;
-    nchan_channel_id "foo";
-    #group can be set with request variables too
-  }
-```
-
-#### Limits and Accounting
-
-Groups can be used to track aggregate channel usage, as well as set limits on the number of channels, subscribers, stored messages, memory use, etc:
-
-```nginx
-  #enable group accounting
-  nchan_channel_group_accounting on;
-  
-  location ~ /pubsub/(\w+)$ {
-    nchan_pubsub;
-    nchan_channel_group "limited";
-    nchan_channel_id $1;
-  }
-  
-  location ~ /prelimited_pubsub/(\w+)$ {
-    nchan_pubsub;
-    nchan_channel_group "limited";
-    nchan_channel_id $1;
-    nchan_group_max_subscribers 100;
-    nchan_group_max_messages_memory 50M;
-  }
-  
-  location /group {
-    nchan_channel_group limited;
-    nchan_group_location;
-    nchan_group_max_channels $arg_max_channels;
-    nchan_group_max_messages $arg_max_messages;
-    nchan_group_max_messages_memory $arg_max_messages_mem;
-    nchan_group_max_messages_disk $arg_max_messages_disk;
-    nchan_group_max_subscribers $arg_max_subs;
-  }
-```
-
-Here, `/group` is an `nchan_group_location`, which is used for accessing and modifying group data. To get group data, send a `GET` request to a `nchan_group_location`:
-
-```sh
->  curl http://localhost/group
-
-channels: 10
-subscribers: 0
-messages: 219
-shared memory used by messages: 42362 bytes
-disk space used by messages: 0 bytes
-limits:
-  max channels: 0
-  max subscribers: 0
-  max messages: 0
-  max messages shared memory: 0
-  max messages disk space: 0  
-```
-
-By default, the data is returned in human-readable plaintext, but can also be formatted as JSON, XML, or YAML:
-
-```sh
->  curl -H "Accept: text/json" http://localhost/group
-
-{
-  "channels": 21,
-  "subscribers": 40,
-  "messages": 53,
-  "messages_memory": 19941,
-  "messages_disk": 0,
-  "limits": {
-    "channels": 0,
-    "subscribers": 0,
-    "messages": 0,
-    "messages_memory": 0,
-    "messages_disk": 0
-  }
-}
-```
-
-The data in the response are for the single Nchan instance only, regardless of whether Redis is used. A limit of 0 means 'unlimited'.
-
-Limits can be set per-location, as with the above `/prelimited_pubsub/...` location, or with a POST request to the `nchan_group_location`:
-```sh
->  curl -X POST "http://localhost/group?max_channels=15&max_subs=1000&max_messages_disk=0.5G"
-
-channels: 0
-subscribers: 0
-messages: 0
-shared memory used by messages: 0 bytes
-disk space used by messages: 0 bytes
-limits:
-  max channels: 15
-  max subscribers: 1000
-  max messages: 0
-  max messages shared memory: 0
-  max messages disk space: 536870912
-
-```
-
-Limits are only applied locally, regardless of whether Redis is enabled. 
-If a publisher or subscriber request exceeds a group limit, Nchan will respond to it with a `403 Forbidden` response.
-
-<!-- tag:group -->
-
-## Hooks and Callbacks
-
-<!-- tag:hook -->
-  
-### Request Authorization
-
-This feature, configured with [`nchan_authorize_request`](#nchan_authorize_request), behaves just like the Nginx [http_auth_request module](http://nginx.org/en/docs/http/ngx_http_auth_request_module.html#auth_request_set).
-
-Consider the configuration:
-```nginx
-  upstream my_app {
-    server 127.0.0.1:8080;
-  }
-  location = /auth {
-    proxy_pass http://my_app/pubsub_authorize;
-    proxy_pass_request_body off;
-    proxy_set_header Content-Length "";
-    proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
-    proxy_set_header X-Publisher-Type $nchan_publisher_type;
-    proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
-    proxy_set_header X-Channel-Id $nchan_channel_id;
-    proxy_set_header X-Original-URI $request_uri;
-    proxy_set_header X-Forwarded-For $remote_addr;
-  }
-  
-  location ~ /pubsub/auth/(\w+)$ {
-    nchan_channel_id $1;
-    nchan_authorize_request /auth;
-    nchan_pubsub;
-    nchan_channel_group test;
-  }
-```
-
-Here, any request to the location `/pubsub/auth/<...>` will need to be authorized by your application (`my_app`). Nginx will generate a `GET /pubsub_authorize` request to the application, with additional headers set by the `proxy_set_header` directives. Note that Nchan-specific variables are available for this authorization request. Once your application receives this request, it should decide whether or not to authorize the subscriber. This can be done based on a forwarded session cookie, IP address, or any set of parameters of your choosing. If authorized, it should respond with an empty `200 OK` response.  
-All non-`2xx` response codes (such as `403 Forbidden`) are intepreted as authorization failures. In this case, the failing response is proxied to the client. 
-
-Note that Websocket and EventSource clients will only try to authorize during the initial handshake request, whereas Long-Poll and Interval-Poll subscribers will need to be authorized each time they request the next message, which may flood your application with too many authorization requests.
-
-<!-- commands: nchan_authorize_request -->
-
-### Subscriber Presence
-
-Subscribers can notify an application when they have subscribed and unsubscribed to a channel using the [`nchan_subscribe_request`](#nchan_subscribe_request)
-and [`nchan_unsubscribe_request`](#nchan_unsubscribe_request) settings. 
-These should point to Nginx locations configured to forward requests to an upstream proxy (your application):
-
-```nginx
-  location ~ /sub/(\w+)$ {
-    nchan_channel_id $1;
-    nchan_subscribe_request /upstream/sub;
-    nchan_unsubscribe_request /upstream/unsub;
-    nchan_subscriber;
-    nchan_channel_group test;
-  }
-
-  location = /upstream/unsub {
-    proxy_pass http://127.0.0.1:9292/unsub;
-    proxy_ignore_client_abort on;  #!!!important!!!!
-    proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
-    proxy_set_header X-Channel-Id $nchan_channel_id;
-    proxy_set_header X-Original-URI $request_uri;
-  } 
-  location = /upstream/sub {
-    proxy_pass http://127.0.0.1:9292/sub;
-    proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
-    proxy_set_header X-Message-Id $nchan_message_id;
-    proxy_set_header X-Channel-Id $nchan_channel_id;
-    proxy_set_header X-Original-URI $request_uri;
-  } 
-```
-
-In order for `nchan_unsubscribe_request` to work correctly, the location it points to must have `proxy_ignore_client_abort on;`. Otherwise, suddenly aborted subscribers may not trigger an unsubscribe request.
-
-Note that the subscribe/unsubscribe hooks are **disabled for long-poll and interval-poll clients**, because they would trigger these hooks each time they receive a message.
-
-<!-- commands: nchan_subscribe_request nchan_unsubscribe_request -->
-
-### Message Forwarding
-
-Messages can be forwarded to an upstream application before being published using the `nchan_publisher_upstream_request` setting:
-
-```nginx
-  location ~ /pub/(\w+)$ {
-    #publisher endpoint
-    nchan_channel_id $1;
-    nchan_pubsub;
-    nchan_publisher_upstream_request /upstream_pub;
-  }
-  
-  location = /upstream_pub {
-    proxy_pass http://127.0.0.1:9292/pub;
-    proxy_set_header X-Publisher-Type $nchan_publisher_type;
-    proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
-    proxy_set_header X-Channel-Id $nchan_channel_id;
-    proxy_set_header X-Original-URI $request_uri;
-  } 
-```
-With this configuration, incoming messages are first `POST`ed to `http://127.0.0.1:9292/pub`.
-The upstream response code determines how publishing will proceed:
-  - `304 Not Modified` publishes the message as received, without modifification.
-  - `204 No Content` discards the message
-  - `200 OK` is used for modifying the message. Instead of the original incoming message, the message contained in this HTTP response is published.
-
-There are two main use cases for `nchan_publisher_upstream_request`: forwarding incoming data from Websocket publishers to an application, and mutating incoming messages.
-
-<!-- commands: nchan_publisher_upstream_request -->
-
-## Storage
-
-Nchan can stores messages in memory, on disk, or via Redis. Memory storage is much faster, whereas Redis has additional overhead as is considerably slower for publishing messages, but offers near unlimited scalability for broadcast use cases with far more subscribers than publishers.
-
-### Memory Storage
-
-This default storage method uses a segment of shared memory to store messages and channel data. Large messages as determined by Nginx's caching layer are stored on-disk. The size of the memory segment is configured with `nchan_shared_memory_size`. Data stored here is not persistent, and is lost if Nginx is restarted or reloaded.
-
-<!-- tag:memstore -->
-
-### Redis
-
-[Redis](http://redis.io) can be used to add **data persistence** and **horizontal scalability**, **failover** and **high availability** to your Nchan setup. 
-
-<!-- tag:redis -->
-
-#### Connecting to a Redis Server
-To connect to a single Redis master server, use an `upstream` with `nchan_redis_server` and `nchan_redis_pass` settings:
-
-```nginx
-http {
-  upstream my_redis_server {
-    nchan_redis_server 127.0.0.1;
-  }
-  server {
-    listen 80;
-    
-    location ~ /redis_sub/(\w+)$ {
-      nchan_subscriber;
-      nchan_channel_id $1;
-      nchan_redis_pass my_redis_server;
-    }
-    location ~ /redis_pub/(\w+)$ {
-      nchan_redis_pass my_redis_server;
-      nchan_publisher;
-      nchan_channel_id $1;
-    }
-  }
-} 
-```
-
-All servers with the above configuration connecting to the same redis server share channel and message data.
-
-Channels that don't use Redis can be configured side-by-side with Redis-backed channels, provided the endpoints never overlap. (This can be ensured, as above, by setting separate `nchan_channel_group`s.). Different locations can also connect to different Redis servers.
-
-Nchan can work with a single Redis master. It can also auto-discover and use Redis slaves to balance PUBSUB traffic.
-
-<!-- commands: nchan_redis_server nchan_redis_pass -->
-
-#### Redis Cluster
-Nchan also supports using Redis Cluster, which adds scalability via sharding channels among cluster nodes. Redis cluster also provides **automatic failover**, **high availability**, and eliminates the single point of failure of one shared Redis server. It is configred and used like so:
-
-```nginx
-http {
-  upstream redis_cluster {
-    nchan_redis_server redis://127.0.0.1:7000;
-    nchan_redis_server redis://127.0.0.1:7001;
-    nchan_redis_server redis://127.0.0.1:7002;
-    # you don't need to specify all the nodes, they will be autodiscovered
-    # however, it's recommended that you do specify at least a few master nodes.
-  }
-  server {
-    listen 80;
-    
-    location ~ /sub/(\w+)$ {
-      nchan_subscriber;
-      nchan_channel_id $1;
-      nchan_redis_pass redis_cluster;
-    }
-    location ~ /pub/(\w+)$ {
-      nchan_publisher;
-      nchan_channel_id $1;
-      nchan_redis_pass redis_cluster;
-    }
-  }
-} 
-```
-
-<!-- commands: nchan_redis_server nchan_redis_pass -->
-
-##### High Availability
-Redis Cluster connections are designed to be resilient and try to recover from errors. Interrupted connections will have their commands queued until reconnection, and Nchan will publish any messages it successfully received while disconnected. Nchan is also adaptive to cluster modifications. It will add new nodes and remove them as needed.
-
-All Nchan servers sharing a Redis server or cluster should have their times synchronized (via ntpd or your favorite ntp daemon). Failure to do so may result in missed or duplicate messages.
-
-#### Using Redis securely
-
-Redis servers can be connected to via TLS by using the [nchan_redis_ssl](#nchan_redis_ssl) config setting in an `upstream` block, or by using the `rediss://`  schema for the server URLs.
-
-A password and optional username for the `AUTH` command can be set by the [nchan_redis_username](#nchan_redis_username) and [nchan_redis_password](#nchan_redis_password) config settings in an `upstream` block, or by using the `redis://<username>:<password>@hostname` server URL schema.
-
-Note that autodiscovered Redis nodes inherit their parent's SSL, username, and password settings.
-
-#### Tweaks and Optimizations
-
-As of version 1.2.0, Nchan uses Redis slaves to load-balance PUBSUB traffic. By default, there is an equal chance that a channel's PUBSUB subscription will go to any master or slave. The [`nchan_redis_subscribe_weights`](#nchan_redis_subscribe_weights) setting is available to fine-tune this load-balancing.
-
-Also from 1.2.0 onward, [`nchan_redis_optimize_target`](#nchan_redis_optimize_target) can be used to prefer optimizing Redis slaves for CPU or bandwidth. For heavy publishing loads, the tradeoff is very roughly 35% replication bandwidth per slave to 30% CPU load on slaves.
-
-## Introspection
-
-There are several ways to see what's happening inside Nchan. These are useful for debugging application integration and for measuring performance.
-
-### Channel Events
-
-Channel events are messages automatically published by Nchan when certain events occur in a channel. These are very useful for debugging the use of channels. However, they carry a significant performance overhead and should be used during development, and not in production.
-
-Channel events are published to special 'meta' channels associated with normal channels. Here's how to configure them:
-
-```nginx
-location ~ /pubsub/(.+)$ {
-  nchan_pubsub;
-  nchan_channel_id $1;
-  nchan_channel_events_channel_id $1; #enables channel events for this location
-}
-
-location ~ /channel_events/(.+) {
-  #channel events subscriber location
-  nchan_subscriber;
-  nchan_channel_group meta; #"meta" is a SPECIAL channel group
-  nchan_channel_id $1;
-}
-```
-
-Note the `/channel_events/...` location has a *special* `nchan_channel_group`, `meta`. This group is reserved for accessing "channel events channels", or"metachannels".
-
-Now, say I subscribe to `/channel_events/foo` I will refer to this as the channel events subscriber.
-
-Let's see what this channel events subscriber receives when I publish messages to 
-
-Subscribing to `/pubsub/foo` produces the channel event
-```
-subscriber_enqueue foo
-```
-
-Publishing a message to `/pubsub/foo`:
-```
-channel_publish foo
-```
-
-Unsubscribing from `/pubsub/foo`:
-```
-subscriber_dequeue foo
-```
-
-Deleting `/pubsub/foo` (with HTTP `DELETE /pubsub/foo`):
-```
-channel_delete foo
-```
-
-The event string itself is configirable with [nchan_channel_event_string](#nchan_channel_event_string). By default, it is set to `$nchan_channel_event $nchan_channel_id`. 
-This string can use any Nginx and [Nchan variables](/#variables).
-
-
-### nchan_stub_status Stats
-
-Like Nginx's [stub_status](https://nginx.org/en/docs/http/ngx_http_stub_status_module.html),
-`nchan_stub_status` is used to get performance metrics.
-
-```nginx
-  location /nchan_stub_status {
-    nchan_stub_status;
-  }
-```
-
-Sending a GET request to this location produces the response:
-
-```text
-total published messages: 1906
-stored messages: 1249
-shared memory used: 1824K
-channels: 80
-subscribers: 90
-redis pending commands: 0
-redis connected servers: 0
-total interprocess alerts received: 1059634
-interprocess alerts in transit: 0
-interprocess queued alerts: 0
-total interprocess send delay: 0
-total interprocess receive delay: 0
-nchan version: 1.1.5
-```
-
-Here's what each line means, and how to interpret it:
-  - `total published messages`: Number of messages published to all channels through this Nchan server.
-  - `stored messages`: Number of messages currently buffered in memory
-  - `shared memory used`: Total shared memory used for buffering messages, storing channel information, and other purposes. This value should be comfortably below `nchan_shared_memory_size`.
-  - `channels`: Number of channels present on this Nchan server.
-  - `subscribers`: Number of subscribers to all channels on this Nchan server.
-  - `redis pending commands`: Number of commands sent to Redis that are awaiting a reply. May spike during high load, especially if the Redis server is overloaded. Should tend towards 0.
-  - `redis connected servers`: Number of redis servers to which Nchan is currently connected.
-  - `total interprocess alerts received`: Number of interprocess communication packets transmitted between Nginx workers processes for Nchan. Can grow at 100-10000 per second at high load.
-  - `interprocess alerts in transit`: Number of interprocess communication packets in transit between Nginx workers. May be nonzero during high load, but should always tend toward 0 over time.
-  - `interprocess queued alerts`: Number of interprocess communication packets waiting to be sent. May be nonzero during high load, but should always tend toward 0 over time.
-  - `total interprocess send delay`: Total amount of time interprocess communication packets spend being queued if delayed. May increase during high load.
-  - `total interprocess receive delay`: Total amount of time interprocess communication packets spend in transit if delayed. May increase during high load.
-  - `nchan_version`: current version of Nchan. Available for version 1.1.5 and above.
-
-Additionally, when there is at least one `nchan_stub_status` location, the following Nginx variables are available:
-  - `$nchan_stub_status_total_published_messages`  
-  - `$nchan_stub_status_stored_messages`  
-  - `$nchan_stub_status_shared_memory_used`  
-  - `$nchan_stub_status_channels`  
-  - `$nchan_stub_status_subscribers`  
-  - `$nchan_stub_status_redis_pending_commands`  
-  - `$nchan_stub_status_redis_connected_servers`  
-  - `$nchan_stub_status_total_ipc_alerts_received`  
-  - `$nchan_stub_status_ipc_queued_alerts`  
-  - `$nchan_stub_status_total_ipc_send_delay`  
-  - `$nchan_stub_status_total_ipc_receive_delay`  
-
-  
-## Securing Channels
-
-### Securing Publisher Endpoints
-Consider the use case of an application where authenticated users each use a private, dedicated channel for live updates. The configuration might look like this:
-
-```nginx
-http {
-  server {
-    #available only on localhost
-    listen  127.0.0.1:8080;
-    location ~ /pub/(\w+)$ {
-      nchan_publisher;
-      nchan_channel_group my_app_group;
-      nchan_channel_id $1;
-    }
-  }
-  
-  server {
-    #available to the world
-    listen 80;
-    
-    location ~ /sub/(\w+)$ {
-      nchan_subscriber;
-      nchan_channel_group my_app_group;
-      nchan_channel_id $1;
-    }
-  }
-}
-
-```
-
-Here, the subscriber endpoint is available on a public-facing port 80, and the publisher endpoint is only available on localhost, so can be accessed only by applications residing on that machine. Another way to limit access to the publisher endpoint is by using the allow/deny settings:
-
-```nginx
-
-  server {
-    #available to the world
-    listen 80; 
-    location ~ /pub/(\w+)$ {
-      allow 127.0.0.1;
-      deny all;
-      nchan_publisher;
-      nchan_channel_group my_app_group;
-      nchan_channel_id $1;
-    }
-```
-
-Here, only the local IP 127.0.0.1 is allowed to use the publisher location, even though it is defined in a non-localhost server block.
-
-### Keeping a Channel Private
-
-A Channel ID that is meant to be private should be treated with the same care as a session ID token. Considering the above use case of one-channel-per-user, how can we ensure that only the authenticated user, and no one else, is able to access his channel? 
-
-First, if you intend on securing the channel contents, you must use TLS/SSL:
-
-```nginx 
-http {
-  server {
-    #available only on localhost
-    listen  127.0.0.1:8080;
-    #...publisher endpoint config
-  }
-  server {
-    #available to the world
-    listen 443 ssl;
-    #SSL config goes here
-    location ~ /sub/(\w+)$ {
-      nchan_subscriber;
-      nchan_channel_group my_app_group;
-      nchan_channel_id $1;
-    }
-  }
-}
-```
-
-Now that you have a secure connection between the subscriber client and the server, you don't need to worry about the channel ID or messages being passively intercepted. This is a minimum requirement for secure message delivery, but it is not sufficient. 
-
-You must also take care to do at least one of the following:
-  - [Generate good, high-entropy Channel IDs](#good-ids).
-  - [Authorize all subscribers with the `nchan_authorize_request` config directive](#request-authorization).
-  - [Authorize subscribers and hide channel IDs with the "`X-Accel-Redirect`" mechanism](#x-accel-redirect).
-  
-#### Good IDs
-
-An ID that can be guessed is an ID that can be hijacked. If you are not authenticating subscribers (as described below), a channel ID should be impossible to guess. Use at least 128 bits of entropy to generate a random token, associate it with the authenticated user, and share it only with the user's client. Do not reuse tokens, just as you would not reuse session IDs.
-
-#### X-Accel-Redirect
-
-This feature uses the [X-Accel feature](https://www.nginx.com/resources/wiki/start/topics/examples/x-accel) of Nginx upstream proxies to perform an internal request to a subscriber endpoint.
-It allows a subscriber client to be authenticated by your application, and then redirected by nginx internally to a location chosen by your appplication (such as a publisher or subscriber endpoint). This makes it possible to have securely authenticated clients that are unaware of the channel id they are subscribed to.
-
-Consider the following configuration:
-```nginx 
-upstream upstream_app {
-  server 127.0.0.1:8080;
-}
-
-server {
-  listen 80; 
-  
-  location = /sub_upstream {
-    proxy_pass http://upstream_app/subscriber_x_accel_redirect;
-    proxy_set_header X-Forwarded-For $remote_addr;
-  }
-  
-  location ~ /sub/internal/(\w+)$ {
-    internal; #this location only accessible for internal nginx redirects
-    nchan_subscriber;
-    nchan_channel_id $1;
-    nchan_channel_group test;
-  }
-}
-```
-
-As commented, `/sub/internal/` is inaccessible from the outside:
-```console
-> curl  -v  http://127.0.0.1/sub/internal/foo
-  
-  < HTTP/1.1 404 Not Found
-  < Server: nginx/1.9.5
-  <
-  <html>
-  <head><title>404 Not Found</title></head>
-  <body bgcolor="white">
-  <center><h1>404 Not Found</h1></center>
-  <hr><center>nginx/1.9.5</center>
-  </body>
-  </html>
-```
-
-But if a request is made to `/sub_upstream`, it gets forwarded to your application (`my_app`) on port 8080 with the url `/subscriber_x_accel_redirect`.
-Note that you can set any forwarded headers here like any [`proxy_pass`](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass) Nginx location, 
-but unlike the case with `nchan_authorize_request`, Nchan-specific variables are not available.
-
-Now, your application must be set up to handle the request to `/subscriber_x_accel_redirect`. You should make sure the client is properly authenticated (maybe using a session cookie), and generate an associated channel id. If authentication fails, respond with a normal `403 Forbidden` response. You can also pass extra information about the failure in the response body and headers.
-
-If your application successfully authenticates the subscriber request, you now need to instruct Nginx to issue an internal redirect to `/sub/internal/my_channel_id`.
-This is accomplished by responding with an empty `200 OK` response that includes two headers:
-- `X-Accel-Redirect: /sub/internal/my_channel_id`
-- `X-Accel-Buffering: no`
-
-In the presence of these headers, Nginx will not forward your app's response to the client, and instead will *internally* redirect to `/sub/internal/my_channel_id`. 
-This will behave as if the client had requested the subscriber endpoint location directly.
-
-Thus using X-Accel-Redirect it is possible to both authenticate all subscribers *and* keep channel IDs completely hidden from subscribers.
-
-This method is especially useful for EventSource and Websocket subscribers. Long-Polling subscribers will need to be re-authenticated for every new message, which may flood your application with too many authentication requests.
-
-### Revoking Channel Authorization
-
-In some cases, you may want to revoke a particular subscriber's authorization for a given channel (e.g., if the user's permissions are changed). If the channel is unique to the subscriber, this is simply accomplished by deleting the channel. The same can be achieved for shared channels by subscribing each subscriber to both the shared channel and a subscriber-specific channel via a multiplexed connection. Deleting the subscriber-specific channel will terminate the subscriber''s connection, thereby also terminating their subscription to the shared channel. Consider the following configuration:
-
-```nginx
-location ~ /sub/(\w+) {
-  nchan_subscriber;
-  nchan_channel_id shared_$1 user_$arg_userid;
-  nchan_authorize_request /authorize;
-}
-
-location /pub/user {
-  nchan_publisher;
-  nchan_channel_id user_$arg_userid;
-}
-```
-
-A request to `/sub/foo?userid=1234` will subscribe to channels "shared_foo" and "user_1234" via a multiplexed connection. If you later send a `DELETE` request to `/pub/user?userid=1234`, this subscriber will be disconnected and therefore unsubscribed from both "user_1234" and "shared_foo".
-  
-## Variables
-
-Nchan makes several variables usabled in the config file:
- 
-- `$nchan_channel_id`  
-  The channel id extracted from a publisher or subscriber location request. For multiplexed locations, this is the first channel id in the list.
-
-- `$nchan_channel_id1`, `$nchan_channel_id2`, `$nchan_channel_id3`, `$nchan_channel_id4`  
-  As above, but for the nth channel id in multiplexed channels.
-
-- `$nchan_subscriber_type`  
-  For subscriber locations, this variable is set to the subscriber type (websocket, longpoll, etc.).
-
-- `$nchan_channel_subscriber_last_seen`  
-  For publisher locations, this variable is set to the timestamp for the last connected subscriber.
-  
-- `$nchan_channel_subscriber_count`  
-  For publisher locations, this variable is set to the number of subscribers in the published channel.
-  
-- `$nchan_channel_message_count`  
-  For publisher locations, this variable is set to the number of messages buffered in the published channel.
-  
-- `$nchan_publisher_type`  
-  For publisher locations, this variable is set to the subscriber type (http or websocket).
-  
-- `$nchan_prev_message_id`, `$nchan_message_id`  
-  The current and previous (if applicable) message id for publisher request or subscriber response.
-
-- `$nchan_channel_event`  
-  For channel events, this is the event name. Useful when configuring `nchan_channel_event_string`.
-
-- `$nchan_version`  
-  Current Nchan version. Available since 1.1.5.
-  
-Additionally, `nchan_stub_status` data is also exposed as variables. These are available only when `nchan_stub_status` is enabled on at least one location:
-
-- `$nchan_stub_status_total_published_messages`  
-- `$nchan_stub_status_stored_messages`  
-- `$nchan_stub_status_shared_memory_used`  
-- `$nchan_stub_status_channels`  
-- `$nchan_stub_status_subscribers`  
-- `$nchan_stub_status_redis_pending_commands`  
-- `$nchan_stub_status_redis_connected_servers`  
-- `$nchan_stub_status_total_ipc_alerts_received`  
-- `$nchan_stub_status_ipc_queued_alerts`  
-- `$nchan_stub_status_total_ipc_send_delay`  
-- `$nchan_stub_status_total_ipc_receive_delay`  
-
-
-## Configuration Directives
-
-- **nchan_channel_id**  
-  arguments: 1 - 7  
-  default: `(none)`  
-  context: server, location, if  
-  > Channel id for a publisher or subscriber location. Can have up to 4 values to subscribe to up to 4 channels.    
-  [more details](#the-channel-id)  
-
-- **nchan_channel_id_split_delimiter**  
-  arguments: 1  
-  default: `(none)`  
-  context: server, location, if  
-  > Split the channel id into several ids for multiplexing using the delimiter string provided.    
-  [more details](#channel-multiplexing)  
-
-- **nchan_deflate_message_for_websocket** `[ on | off ]`  
-  arguments: 1  
-  default: `off`  
-  context: server, location  
-  > Store a compressed (deflated) copy of the message along with the original to be sent to websocket clients supporting the permessage-deflate protocol extension    
-
-- **nchan_eventsource_event**  
-  arguments: 1  
-  default: `(none)`  
-  context: server, location, if  
-  > Set the EventSource `event:` line to this value. When used in a publisher location, overrides the published message's `X-EventSource-Event` header and associates the message with the given value. When used in a subscriber location, overrides all messages' associated `event:` string with the given value.    
-
-- **nchan_eventsource_ping_comment**  
-  arguments: 1  
-  default: `(empty)`  
-  context: server, location, if  
-  > Set the EventSource comment `: ...` line for periodic pings from server to client. Newlines are not allowed. If empty, no comment is sent with the ping.    
-
-- **nchan_eventsource_ping_data**  
-  arguments: 1  
-  default: `(empty)`  
-  context: server, location, if  
-  > Set the EventSource `data:` line for periodic pings from server to client. Newlines are not allowed. If empty, no data is sent with the ping.    
-
-- **nchan_eventsource_ping_event**  
-  arguments: 1  
-  default: `ping`  
-  context: server, location, if  
-  > Set the EventSource `event:` line for periodic pings from server to client. Newlines are not allowed. If empty, no event type is sent with the ping.    
-
-- **nchan_eventsource_ping_interval** `<number> (seconds)`  
-  arguments: 1  
-  default: `0 (none)`  
-  context: server, location, if  
-  > Interval for sending ping messages to EventSource subscribers. Disabled by default.    
-
-- **nchan_longpoll_multipart_response** `[ off | on | raw ]`  
-  arguments: 1  
-  default: `off`  
-  context: server, location, if  
-  > when set to 'on', enable sending multiple messages in a single longpoll response, separated using the multipart/mixed content-type scheme. If there is only one available message in response to a long-poll request, it is sent unmodified. This is useful for high-latency long-polling connections as a way to minimize round-trips to the server. When set to 'raw', sends multiple messages using the http-raw-stream message separator.    
-
-- **nchan_permessage_deflate_compression_level** `[ 0-9 ]`  
-  arguments: 1  
-  default: `6`  
-  context: http  
-  > Compression level for the `deflate` algorithm used in websocket's permessage-deflate extension. 0: no compression, 1: fastest, worst, 9: slowest, best    
-
-- **nchan_permessage_deflate_compression_memlevel** `[ 1-9 ]`  
-  arguments: 1  
-  default: `8`  
-  context: http  
-  > Memory level for the `deflate` algorithm used in websocket's permessage-deflate extension. How much memory should be allocated for the internal compression state. 1 - minimum memory, slow and reduces compression ratio; 9 - maximum memory for optimal speed    
-
-- **nchan_permessage_deflate_compression_strategy** `[ default | filtered | huffman-only | rle | fixed ]`  
-  arguments: 1  
-  default: `default`  
-  context: http  
-  > Compression strategy for the `deflate` algorithm used in websocket's permessage-deflate extension. Use 'default' for normal data, For details see [zlib's section on copression strategies](http://zlib.net/manual.html#Advanced)    
-
-- **nchan_permessage_deflate_compression_window** `[ 9-15 ]`  
-  arguments: 1  
-  default: `10`  
-  context: http  
-  > Compression window for the `deflate` algorithm used in websocket's permessage-deflate extension. The base two logarithm of the window size (the size of the history buffer). The bigger the window, the better the compression, but the more memory used by the compressor.    
-
-- **nchan_publisher** `[ http | websocket ]`  
-  arguments: 0 - 2  
-  default: `http websocket`  
-  context: server, location, if  
-  legacy name: push_publisher  
-  > Defines a server or location as a publisher endpoint. Requests to a publisher location are treated as messages to be sent to subscribers. See the protocol documentation for a detailed description.    
-  [more details](#publisher-endpoints)  
-
-- **nchan_publisher_channel_id**  
-  arguments: 1 - 7  
-  default: `(none)`  
-  context: server, location, if  
-  > Channel id for publisher location.    
-
-- **nchan_publisher_upstream_request** `<url>`  
-  arguments: 1  
-  context: server, location, if  
-  > Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.    
-  > The upstream response code determines how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.    
-  [more details](#message-forwarding)  
-
-- **nchan_pubsub** `[ http | websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
-  arguments: 0 - 6  
-  default: `http websocket eventsource longpoll chunked multipart-mixed`  
-  context: server, location, if  
-  > Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server.    
-  [more details](#pubsub-endpoint)  
-
-- **nchan_subscribe_request** `<url>`  
-  arguments: 1  
-  context: server, location, if  
-  > Send GET request to internal location (which may proxy to an upstream server) after subscribing. Disabled for longpoll and interval-polling subscribers.    
-  [more details](#subscriber-presence)  
-
-- **nchan_subscriber** `[ websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
-  arguments: 0 - 5  
-  default: `websocket eventsource longpoll chunked multipart-mixed`  
-  context: server, location, if  
-  legacy name: push_subscriber  
-  > Defines a server or location as a channel subscriber endpoint. This location represents a subscriber's interface to a channel's message queue. The queue is traversed automatically, starting at the position defined by the `nchan_subscriber_first_message` setting.    
-  >  The value is a list of permitted subscriber types.    
-  [more details](#subscriber-endpoints)  
-
-- **nchan_subscriber_channel_id**  
-  arguments: 1 - 7  
-  default: `(none)`  
-  context: server, location, if  
-  > Channel id for subscriber location. Can have up to 4 values to subscribe to up to 4 channels.    
-
-- **nchan_subscriber_compound_etag_message_id**  
-  arguments: 1  
-  default: `off`  
-  context: server, location, if  
-  > Override the default behavior of using both `Last-Modified` and `Etag` headers for the message id.    
-  > Enabling this option packs the entire message id into the `Etag` header, and discards  
-  > `Last-Modified` and `If-Modified-Since` headers.    
-  [more details]()  
-
-- **nchan_subscriber_first_message** `[ oldest | newest | <number> ]`  
-  arguments: 1  
-  default: `oldest`  
-  context: server, location, if  
-  > Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` starts at `n`th from now). 0 is equivalent to 'newest'.    
-
-- **nchan_subscriber_http_raw_stream_separator** `<string>`  
-  arguments: 1  
-  default: `\n`  
-  context: server, location, if  
-  > Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character if not explicitly set to an empty string.    
-
-- **nchan_subscriber_info**  
-  arguments: 0  
-  context: location  
-  > A subscriber location for debugging the state of subscribers on a given channel. The subscribers of the channel specified by `nchan_channel_id` evaluate `nchan_subscriber_info_string` and send it back to the requested on this location. This is useful to see where subscribers are in an Nchan cluster, as well as debugging subscriber connection issues.    
-
-- **nchan_subscriber_info_string**  
-  arguments: 1  
-  default: `$nchan_subscriber_type $remote_addr:$remote_port $http_user_agent $server_name $request_uri $pid`  
-  context: server, location  
-  > this string is evaluated by each subscriber on a given channel and sent to the requester of a `nchan_subscriber_info` location    
-
-- **nchan_subscriber_last_message_id**  
-  arguments: 1 - 5  
-  default: `$http_last_event_id $arg_last_event_id`  
-  context: server, location, if  
-  > If `If-Modified-Since` and `If-None-Match` headers are absent, set the message id to the first non-empty of these values. Used primarily as a workaround for the inability to set the first `Last-Message-Id` of a web browser's EventSource object.     
-
-- **nchan_subscriber_message_id_custom_etag_header**  
-  arguments: 1  
-  default: `(none)`  
-  context: server, location, if  
-  > Use a custom header instead of the Etag header for message ID in subscriber responses. This setting is a hack, useful when behind a caching proxy such as Cloudflare that under some conditions (like using gzip encoding) swallow the Etag header.    
-
-- **nchan_subscriber_timeout** `<number> (seconds)`  
-  arguments: 1  
-  default: `0 (none)`  
-  context: http, server, location, if  
-  legacy name: push_subscriber_timeout  
-  > Maximum time a subscriber may wait for a message before being disconnected. If you don't want a subscriber's connection to timeout, set this to 0. When possible, the subscriber will get a response with a `408 Request Timeout` status; otherwise the subscriber will simply be disconnected.    
-
-- **nchan_unsubscribe_request** `<url>`  
-  arguments: 1  
-  context: server, location, if  
-  > Send GET request to internal location (which may proxy to an upstream server) after unsubscribing. Disabled for longpoll and interval-polling subscribers.    
-  [more details](#subscriber-presence)  
-
-- **nchan_websocket_client_heartbeat** `<heartbeat_in> <heartbeat_out>`  
-  arguments: 2  
-  default: `none (disabled)`  
-  context: server, location, if  
-  > Most browser Websocket clients do not allow manually sending PINGs to the server. To overcome this limitation, this setting can be used to set up a PING/PONG message/response connection heartbeat. When the client sends the server message *heartbeat_in* (PING), the server automatically responds with *heartbeat_out* (PONG).    
-
-- **nchan_websocket_ping_interval** `<number> (seconds)`  
-  arguments: 1  
-  default: `0 (none)`  
-  context: server, location, if  
-  > Interval for sending websocket ping frames. Disabled by default.    
-
-- **nchan_access_control_allow_credentials**  
-  arguments: 1  
-  default: `on`  
-  context: http, server, location, if  
-  > When enabled, sets the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Credentials` header to `true`.    
-
-- **nchan_access_control_allow_origin** `<string>`  
-  arguments: 1  
-  default: `$http_origin`  
-  context: http, server, location, if  
-  > Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the incoming request's `Origin` header does not match this value, respond with a `403 Forbidden`. Multiple origins can be provided in a single argument separated with a space.    
-
-- **nchan_authorize_request** `<url>`  
-  arguments: 1  
-  context: server, location, if  
-  > Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it.    
-  [more details](#request-authorization)  
-
-- **nchan_channel_group** `<string>`  
-  arguments: 1  
-  default: `(none)`  
-  context: server, location, if  
-  legacy name: push_channel_group  
-  > The accounting and security group a channel belongs to. Works like a prefix string to the channel id. Can be set with nginx variables.    
-
-- **nchan_channel_group_accounting**  
-  arguments: 1  
-  default: `off`  
-  context: server, location  
-  > Enable tracking channel, subscriber, and message information on a per-channel-group basis. Can be used to place upper limits on channel groups.    
-
-- **nchan_group_location** `[ get | set | delete | off ]`  
-  arguments: 0 - 3  
-  default: `get set delete`  
-  context: location  
-  > Group information and configuration location. GET request for group info, POST to set limits, DELETE to delete all channels in group.    
-
-- **nchan_group_max_channels** `<number>`  
-  arguments: 1  
-  default: `0 (unlimited)`  
-  context: location  
-  > Maximum number of channels allowed in the group.    
-
-- **nchan_group_max_messages** `<number>`  
-  arguments: 1  
-  default: `0 (unlimited)`  
-  context: location  
-  > Maximum number of messages allowed for all the channels in the group.    
-
-- **nchan_group_max_messages_disk** `<number>`  
-  arguments: 1  
-  default: `0 (unlimited)`  
-  context: location  
-  > Maximum amount of disk space allowed for the messages of all the channels in the group.    
-
-- **nchan_group_max_messages_memory** `<number>`  
-  arguments: 1  
-  default: `0 (unlimited)`  
-  context: location  
-  > Maximum amount of shared memory allowed for the messages of all the channels in the group.    
-
-- **nchan_group_max_subscribers** `<number>`  
-  arguments: 1  
-  default: `0 (unlimited)`  
-  context: location  
-  > Maximum number of subscribers allowed for the messages of all the channels in the group.    
-
-- **nchan_max_channel_id_length** `<number>`  
-  arguments: 1  
-  default: `1024`  
-  context: http, server, location  
-  legacy name: push_max_channel_id_length  
-  > Maximum permissible channel id length (number of characters). This settings applies to ids before they may be split by the `nchan_channel_id_split_delimiter` Requests with a channel id that is too long will receive a `403 Forbidden` response.    
-
-- **nchan_max_channel_subscribers** `<number>`  
-  arguments: 1  
-  default: `0 (unlimited)`  
-  context: http, server, location  
-  legacy name: push_max_channel_subscribers  
-  > Maximum concurrent subscribers to the channel on this Nchan server. Does not include subscribers on other Nchan instances when using a shared Redis server.    
-
-- **nchan_subscribe_existing_channels_only** `[ on | off ]`  
-  arguments: 1  
-  default: `off`  
-  context: http, server, location  
-  legacy name: push_authorized_channels_only  
-  > Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response.    
-
-- **nchan_message_buffer_length** `[ <number> | <variable> ]`  
-  arguments: 1  
-  default: `10`  
-  context: http, server, location  
-  legacy names: push_max_message_buffer_length, push_message_buffer_length  
-  > Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages. An Nginx variable can also be used to set the buffer length dynamically.    
-
-- **nchan_message_temp_path** `<path>`  
-  arguments: 1  
-  default: `<client_body_temp_path>`  
-  context: http  
-  > Large messages are stored in temporary files in the `client_body_temp_path` or the `nchan_message_temp_path` if the former is unavailable. Default is the built-in default `client_body_temp_path`    
-
-- **nchan_message_timeout** `[ <time> | <variable> ]`  
-  arguments: 1  
-  default: `1h`  
-  context: http, server, location  
-  legacy name: push_message_timeout  
-  > Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Note that messages always expire from oldest to newest, so an older message may prevent a newer one with a shorter timeout from expiring. An Nginx variable can also be used to set the timeout dynamically.    
-
-- **nchan_redis_cluster_check_interval**  
-  arguments: 1  
-  default: `5s`  
-  context: http, server, upstream, location  
-  > Send a CLUSTER INFO command to each connected Redis node to see if the cluster config epoch has changed. Sent only when in Cluster mode and if any other command that may result in a MOVE error has not been sent in the configured time.    
-
-- **nchan_redis_connect_timeout**  
-  arguments: 1  
-  default: `600ms`  
-  context: upstream  
-  > Redis server connection timeout.    
-
-- **nchan_redis_discovered_ip_range_blacklist** `<CIDR range>`  
-  arguments: 1 - 7  
-  context: upstream  
-  > do not attempt to connect to **autodiscovered** nodes with IPs in the specified ranges. Useful for blacklisting private network ranges for clusters and Redis slaves. NOTE that this blacklist applies only to autodiscovered nodes, and not ones specified in the upstream block    
-
-- **nchan_redis_idle_channel_cache_timeout** `<time>`  
-  arguments: 1  
-  default: `30s`  
-  context: http, server, location  
-  > A Redis-stored channel and its messages are removed from memory (local cache) after this timeout, provided there are no local subscribers.    
-
-- **nchan_redis_namespace** `<string>`  
-  arguments: 1  
-  context: http, server, upstream, location  
-  > Prefix all Redis keys with this string. All Nchan-related keys in redis will be of the form "nchan_redis_namespace:*" . Default is empty.    
-
-- **nchan_redis_nostore_fastpublish** `[ on | off ]`  
-  arguments: 1  
-  default: `off`  
-  context: http, server, upstream  
-  > Increases publishing capacity by 2-3x for Redis nostore mode at the expense of inaccurate subscriber counts in the publisher response.    
-
-- **nchan_redis_optimize_target** `[ cpu | bandwidth ]`  
-  arguments: 1  
-  default: `cpu`  
-  context: upstream  
-  > This tweaks whether [effect replication](https://redis.io/commands/eval#replicating-commands-instead-of-scripts) is enabled. Optimizing for CPU usage enables effect replication, costing additional bandwidth (between 1.2 and 2 times more) between all master->slave links. Optimizing for bandwidth increases CPU load on slaves, but keeps outgoing bandwidth used for replication the same as the incoming bandwidth on Master.    
-
-- **nchan_redis_pass** `<upstream-name>`  
-  arguments: 1  
-  context: http, server, location  
-  > Use an upstream config block for Redis servers.    
-  [more details](#connecting-to-a-redis-server)  
-
-- **nchan_redis_password**  
-  arguments: 1  
-  default: `<none>`  
-  context: upstream  
-  > Set Redis password for AUTH command. All servers in the upstream block will use this password _unless_ a different password is specified by a server URL.    
-
-- **nchan_redis_ping_interval**  
-  arguments: 1  
-  default: `4m`  
-  context: http, server, upstream, location  
-  > Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable.    
-
-- **nchan_redis_server** `<redis-url>`  
-  arguments: 1  
-  context: upstream  
-  > Used in upstream { } blocks to set redis servers. Redis url is in the form 'redis://:password@hostname:6379/0'. Shorthands 'host:port' or 'host' are permitted.    
-  [more details](#connecting-to-a-redis-server)  
-
-- **nchan_redis_ssl** `[ on | off ]`  
-  arguments: 1  
-  default: `off`  
-  context: upstream  
-  > Enables SSL/TLS for all connections to Redis servers in this upstream block. When enabled, no unsecured connections are permitted    
-
-- **nchan_redis_ssl_ciphers**  
-  arguments: 1  
-  default: `<system default>`  
-  context: upstream  
-  > Acceptable cipers when using TLS for Redis connections    
-
-- **nchan_redis_ssl_client_certificate**  
-  arguments: 1  
-  context: upstream  
-  > Path to client certificate when using TLS for Redis connections    
-
-- **nchan_redis_ssl_client_certificate_key**  
-  arguments: 1  
-  context: upstream  
-  > Path to client certificate key when using TLS for Redis connections    
-
-- **nchan_redis_ssl_server_name**  
-  arguments: 1  
-  context: upstream  
-  > Server name to verify (CN) when using TLS for Redis connections    
-
-- **nchan_redis_ssl_trusted_certificate**  
-  arguments: 1  
-  context: upstream  
-  > Trusted certificate (CA) when using TLS for Redis connections    
-
-- **nchan_redis_ssl_trusted_certificate_path**  
-  arguments: 1  
-  default: `<system default>`  
-  context: upstream  
-  > Trusted certificate (CA) when using TLS for Redis connections. Defaults tothe system's SSL cert path unless nchan_redis_ssl_trusted_certificate is set    
-
-- **nchan_redis_ssl_verify_certificate** `[ on | off ]`  
-  arguments: 1  
-  default: `on`  
-  context: upstream  
-  > Should the server certificate be verified when using TLS for Redis connections? Useful to disable when testing with a self-signed server certificate.    
-
-- **nchan_redis_storage_mode** `[ distributed | backup | nostore ]`  
-  arguments: 1  
-  default: `distributed`  
-  context: http, server, upstream, location  
-  > The mode of operation of the Redis server. In `distributed` mode, messages are published directly to Redis, and retrieved in real-time. Any number of Nchan servers in distributed mode can share the Redis server (or cluster). Useful for horizontal scalability, but suffers the latency penalty of all message publishing going through Redis first.  
-  >   
-  > In `backup` mode, messages are published locally first, then later forwarded to Redis, and are retrieved only upon chanel initialization. Only one Nchan server should use a Redis server (or cluster) in this mode. Useful for data persistence without sacrificing response times to the latency of a round-trip to Redis.  
-  >   
-  > In `nostore` mode, messages are published as in `distributed` mode, but are not stored. Thus Redis is used to broadcast messages to many Nchan instances with no delivery guarantees during connection failure, and only local in-memory storage. This means that there are also no message delivery guarantees for subscribers switching from one Nchan instance to another connected to the same Redis server or cluster. Nostore mode increases Redis publishing capacity by an order of magnitude.    
-
-- **nchan_redis_subscribe_weights** `master=<integer> slave=<integer>`  
-  arguments: 1 - 2  
-  default: `master=1 slave=1`  
-  context: upstream  
-  > Determines how subscriptions to Redis PUBSUB channels are distributed between master and slave nodes. The higher the number, the more likely that each node of that type will be chosen for each new channel. The weights for slave nodes are cumulative, so an equal 1:1 master:slave weight ratio with two slaves would have a 1/3 chance of picking a master, and 2/3 chance of picking one of the slaves. The weight must be a non-negative integer.    
-
-- **nchan_redis_url** `<redis-url>`  
-  arguments: 1  
-  default: `127.0.0.1:6379`  
-  context: http, server, location  
-  > Use of this command is discouraged in favor of upstreams blocks with (`nchan_redis_server`)[#nchan_redis_server]. The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.    
-  [more details](#connecting-to-a-redis-server)  
-
-- **nchan_redis_username**  
-  arguments: 1  
-  default: `<none>`  
-  context: upstream  
-  > Set Redis username for AUTH command (available when using ACLs on the Redis server). All servers in the upstream block will use this username _unless_ a different username is specified by a server URL.    
-
-- **nchan_shared_memory_size** `<size>`  
-  arguments: 1  
-  default: `128M`  
-  context: http  
-  legacy names: push_max_reserved_memory, nchan_max_reserved_memory  
-  > Shared memory slab pre-allocated for Nchan. Used for channel statistics, message storage, and interprocess communication.    
-  [more details](#memory-storage)  
-
-- **nchan_store_messages** `[ on | off ]`  
-  arguments: 1  
-  default: `on`  
-  context: http, server, location, if  
-  legacy name: push_store_messages  
-  > Publisher configuration. "`off`" is equivalent to setting `nchan_message_buffer_length 0`, which disables the buffering of old messages. Using this setting is not recommended when publishing very quickly, as it may result in missed messages.    
-
-- **nchan_use_redis** `[ on | off ]`  
-  arguments: 1  
-  default: `off`  
-  context: http, server, location  
-  > Use of this command is discouraged in favor of (`nchan_redis_pass`)[#nchan_redis_pass]. Use Redis for message storage at this location.    
-  [more details](#connecting-to-a-redis-server)  
-
-- **nchan_channel_event_string** `<string>`  
-  arguments: 1  
-  default: `"$nchan_channel_event $nchan_channel_id"`  
-  context: server, location, if  
-  > Contents of channel event message    
-
-- **nchan_channel_events_channel_id**  
-  arguments: 1  
-  context: server, location, if  
-  > Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'.    
-  [more details](#channel-events)  
-
-- **nchan_stub_status**  
-  arguments: 0  
-  context: location  
-  > Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc.    
-  [more details](#nchan_stub_status)  
-
-- **nchan_channel_timeout**  
-  arguments: 1  
-  context: http, server, location  
-  legacy name: push_channel_timeout  
-  > Amount of time an empty channel hangs around. Don't mess with this setting unless you know what you are doing!    
-
-- **nchan_storage_engine** `[ memory | redis ]`  
-  arguments: 1  
-  default: `memory`  
-  context: http, server, location  
-  > Development directive to completely replace default storage engine. Don't use unless you are an Nchan developer.    
-
-- **nchan_redis_wait_after_connecting**  
-  arguments: 1  
-  context: http, server, location  
-
-## Contribute
-Please support this project with a donation to keep me warm through the winter. I accept bitcoin at 15dLBzRS4HLRwCCVjx4emYkxXcyAPmGxM3 . Other donation methods can be found at https://nchan.io
diff --git a/debian/modules/nchan/changelog.txt b/debian/modules/nchan/changelog.txt
deleted file mode 100644
index 3763e6d..0000000
--- a/debian/modules/nchan/changelog.txt
+++ /dev/null
@@ -1,541 +0,0 @@
-1.2.15 (Dec. 27 2021)
- fix: publishing to >255 string-delimitered channels could result in a crash
- fix: Redis connection failures (since 1 2.14)
-1.2.14 [WITHDRAWN] (Dec. 20 2021)
- fix: compiler warnings from the use of the 'typeof' macro
- fix: Nchan can't be built without the Nginx SSL module (bug introduced in 1.2.13)
- update: hiredis updated to 1.0.2
- fix: some Redis connection failures could result in a crash (bug introduced in 1.2.13)
- fix: upstream subrequests crashed with Nginx >= 1.19.9
-1.2.13 [WITHDRAWN] (Dec. 13 2021)
- feature: Redis ACL support with username and passwword
- feature: Redis TLS support
-1.2.12 (Sep. 22 2021)
- fix: better Redis cluster connection logging
- fix: redundant method to discover Redis slave nodes in cluster mode could result in receiving unreachable IPs
-1.2.11 (Sep. 17 2021)
- feature: nchan_redis_discovered_ip_range_blacklist for ignoring autotiscoreved nodes
- feature: nchan_redis_storage_mode is now configurable in location contexts 
-1.2.10 (Aug. 25 2021)
- fix: Nchan could not be built without openssl due to hiredis dependency
-      (introduced in v1.2.9)
- feature: allow no separator for http-raw-stream (thanks @sclem)
-1.2.9 (Aug. 12 2021)
- feature: Redis cluster reconfiguration check timer,
-      nchan_redis_cluster_check_interval setting
- fix: detect Redis cluster reconfiguration when publishing messages in "nostore" mode
- update: hiredis updated to v1.0.0 
- fix: segfault on out-of-shared-memory condition for multiplexed publishers
-1.2.8 (Apr. 12 2021)
- feature: nchan_subscriber_info locations for receiving customizable info from 
-      subscribers of a given channel.
- fix: incorrect lgging of disconnected subscribers with 400 error instead of 499
-      (bug introduced in v1.2.7)
- feature: add $nchan_channel_subscriber_last_seen, $nchan_channel_subscriber_count 
-      and $nchan_channel_message_count variables
- fix: GCC 10 compatibility
-1.2.7 (Mar. 17 2020)
- fix: unidirectional subscribers have their connection terminated if they send any data to the server
-      after the initial request handshake. This applies to all subscribers except Websocket
- feature: periodic pings for EventSource subscribers
- fix: Redis pending commands count may be incorrect in nchan's stub status page
- fix: channel deletion fails to propagate to Redis slaves
- fix: possible stack overflow when using websocket subscribers
-1.2.6 (Jun. 18 2019)
- fix: when using Redis, a channel can stop receiving new messages if 
-      they are published faster than they can be sent to subscribers and the 
-      message buffer is sufficiently small
- fix: websocket PONG response did not contain PING frame data
- fix: multiplexed channels may stop receiving messages
- fix (security): specially crafted websocket publisher requests when using Redis
-      may result in use-after-free memory access
- fix: Nginx config reload may result in crash when using Redis cluster
-1.2.5 (Mar. 20 2019)
- fix: using multiplexed channels with Redis in backup mode may result in worker crash
- fix: nchan_publisher_channel_id could not be set exclusively in a publisher location
- fix: Google pagespeed module compatibility
- fix: nchan prevents nginx from starting if no http {} block is configured
-1.2.4 (Feb. 25 2019)
- fix: Redis cluster info with zero-length hostname may result in worker crash
- fix: build problems with included hiredis lib in FreeBSD
- feature: nchan_redis_namespace and nchan_redis_ping_interval now work in upstream blocks
- fix: websocket publisher did not publishing channel events
- fix: Redis namespace was limited to 8 bytes
-1.2.3 (Oct. 15 2018)
- fix: possible invalid memory access when the initial connection to a Redis cluster node times out
-1.2.2 (Oct. 9 2018)
- fix (security): using an unresponsive, overloaded Redis server may result in invalid memory access
- fix: incorrect logging of discovered Redis cluster nodes
- fix: better handling of connection loss when Redis server is unresponsive
- fix: presence of Redis cluster nodes with no known address ("noaddr") nodes could result in worker crash
- fix (security): subscriber may erroneously receive a 400 Bad Request or crash a worker 
-      based on data from a previous subscriber
- feature: built-in backend benchmark
- feature: add optimized fastpublish option to Redis nostore mode for maximum
-      message publishing thoroughput via Redis
- feature: add no-store Redis mode that uses Redis for broadcasting messages, not storage
- fix: connecting to load-balancing Redis proxy resulted in crash
- fix: using longpoll-multipart in "raw" mode cound result in worker crash
- fix: channel events used with Redis resulted in segfault
-1.2.1 (Aug. 2 2018)
- fix: channel last_requested was set to 0 instead of -1 on channel creation
- fix: authentication failure body not forwarded for Nginx > 1.13.10
- fix: possible invalid memory access for websocket unsubscribe requests
- fix: building Nchan could interfere with building other modules
-1.2.0 (Jul. 23 2018)
- feature: configurable support for CORS Access-Control-Allow-Credentials header
- fix: better compliance with RFC7692  Websocket permessage-deflate parameter negotiation
- fix (security): possible busy-loop denial-of-service for specially crafted 
-      handshakes from Websocket subscribers using permessage-deflate
-      (Thanks, Benjamin Michéle)
- fix: nchan_permessage_deflate_compression_memlevel was not applied when set
- refactor: all publisher and subscriber upstream requests are now more memory-efficient
- fix: Using websocket publisher upstream requests may result in invalid memory access
- fix: publishing Redis-backed messages with 1-second expiration may fail after
-      cluster restart
- change: nchan_redis_wait_after_connecting directive is now obsolete, and is ignored
- feature: nchan_redis_optimize_target for "cpu" or "bandwidth". Trades off CPU
-      load on Redis slaves for syncronization bandwidth.
- feature: configurable Redis master/slave channel subscribe weights with
-      nchan_redis_subscribe_weights
- fix: Compilation issues on OS X and systems lacking non-POSIX memrchr()
- fix: nchan_pubsub CORS Allowed headers did not include headers used by subscribers
- fix: Redis-backed channel buffer length could exceed nchan_message_buffer_length
- fix: Publisher upstream compatibility for Nginx > 1.13.10
- feature: nchan_redis_connect_timeout to configure maximum connection time 
-      to Redis servers
- feature: Offload Redis SUBSCRIBE traffic to slaves 
-      (one SUBSCRIBE per channel per worker)
- fix: Redis cluster and master/slave failover and reconnection issues
- refactor: Redis connection handling rewritten from scratch
- fix: subscribers may not receive new messages after reconnecting to Redis
- fix: publishing to an unavailable Redis-backed channel may result in a 
-      following 400 Bad Request
- change: Old Redis-backed channel messages are now delivered after the message
-      buffer is fully loaded into memory. Previously they were delivered
-      incrementally while the buffer loaded.
- fix: multiplexed Redis-backed channels may not deliver messages if one or
-      more channels' messages all expire
- fix: possible crash when catching up to reconnected Redis channel with
-      subscribers waiting for consecutive messages
- fix: possible crash from rapidly creating and deleting channels
-1.1.15 (Apr. 27 2018)
- fix: A disconnect from a Redis cluster node can result in a segfault
- fix: Using Redis-backed multiplexed channels can result in a segfault
-1.1.14 (Jan. 10 2018)
- feature: added nchan_redis_wait_after_connecting setting
- fix: compatibility with Redis >= 4.0 cluster
-1.1.13 (Dec. 4 2017)
- fix: added Redis backwards compatibility with Nchan 1.1.7 and below
-      for online upgrades with mixed-version Nchan cluster
-1.1.12 (Dec. 1 2017)
- fix: possible "Unexpected spool == nuspool" worker crash
- fix: subscriber messages delivered during active nchan_subscribe subrequest
-      may be garbled
-1.1.11 (Nov. 29 2017)
- fix: Redis backup-mode not working (since 1.1.9)
- fix: incorrect handling of Redis permessage-deflated messages results in
-      missing first char of eventsource event type
- fix: worker crash when unable to create temp file for large websocket
-      permessage-deflate message
- fix: CPU-bound overloaded Nginx may result in worker crashes
-      (may occur with large Openresty Lua load)
- change: default nchan_shared_memory_size is now 128M
- fix: some channel info from publisher GET requests may be incorrect with Redis
- fix: file descriptor leak when reconnecting to Redis
-1.1.10 (Nov. 13 2017)
- feature: nchan_authorize_request failure response forwarded back to subscriber
-      Sponsored by Symless (https://symless.com/)
- fix: allow nchan_access_control_allow_origin in if blocks
- fix: longpoll-multipart may read uninitialized memory when receiving 
-      zero-length message
- fix (security): invalid memory access for aborted websocket subscriber 
-      after channel existence check via Redis
- fix: websocket handhshake failure handled incorrectly when messages 
-      are available
- fix (security): websocket subscriber disconnecting before handshake may
-      result in invalid memory access
- fix (security): possible invalid memory access for disappearing longpoll sub
- feature: add "shared memory limit" to nchan_stub_status output
-1.1.9 (Oct. 30 2017)
- fix: more proper websocket extension negotiation with more 
-      informative failure messages
- fix: websocket handshake failure response included superfluous CLOSE frame
- feature: websocket deflate-frame and x-webkit-deflate-frame support
-1.1.8 (Oct. 26 2017)
- feature: websocket permessage-deflate support
-      Sponsored by HYFN (https://hyfn.com/)
- fix (security): websocket publisher may crash worker when publishing with
-      channel group accounting on to a new group
- fix: messages published to Nchan via websocket binary frames 
-      should have content-type set to "application/octet-stream"
- fix: accept websocket publisher binary frames (thanks @rponczkowski)
- fix: multiplexing over exactly 255 channels results in worker crash
- fix (security): Specially crafted invalid subscriber msgid may crash worker
- fix: nchan_subscriber_first_message <= 0 (newest) with existing Redis data
-      incorrectly treated as "oldest" for initial subscribers
- fix: 0-length channel name may crash worker
- fix: subscribe/unsubscribe callback requests do not work when used with
-      authorization callback request
- fix (security): Messages published with Redis through websocket publisher 
-      may result in worker crash (bug introduced in 1.1.5)
- fix: nchan_pubsub setting may not be parsed correctly
-1.1.7 (Jul. 3 2017)
- fix: possible read-after-free after redis disconnect
- fix: publishing to redis cluster before it is connected results in worker crash
- fix: possible use-after-free for suddenly disconnected longpoll-multipart subscriber
- fix: possible use-after-free when using nchan_authorize_request for slow subscribers and slow upstream
- fix: nchan_stub_status "stored messages" value could be incorrect when using Redis
-1.1.6 (May 9 2017)
- fix: messages published through Redis may crash worker (introduced in 1.1.5)
- fix (security): urlencoded message id in url parsed incorrectly can result in worker crash
-1.1.5 (May 3 2017)
- feature: get current Nchan version through $nchan_version variable 
-      and nchan_stub_status
- fix (security): invalid memory access for multiplexed channel subscribers 
-      with buffered output (Thanks Casey Forbes (@caseyf) for debugging.)
- fix: "redis pending commands" nchan_stub_status stat could be wrong after 
-      deleting channels
- fix: invalid memory access when using Redis under high load
- fix: possible "message from the past" errors under high publishing load
- fix: graceful publisher/subscriber notifications when out of shared memory
-      (via HTTP 507 Insufficient Storage status code)
- fix: compatibility with limit_except directive
-1.1.4 (Apr. 25 2017)
- fix (security): possible memory corruption using multiplexed channels 
-      at high load (Thanks Giovanni Caporaletti (@TrustNoOne) for debugging.)
- fix: possible crash when reconnecting to Redis cluster (introduced in 1.1.3)
-1.1.3 (Mar. 25 2017)
- fix (security): incorrect handling of WS optimization could trigger SIGABRT
- fix: Redis cluster reconnect readiness verification
-1.1.2 (Mar. 1 2017)
- change: "interprocess alert X delayed by Y sec" log messages downgraded 
-      from ERROR to NOTICE
- fix: "group info string too short" error
- fix: Incorrect handling of connections to Redis cluster nodes with round-robin
-      DNS hostnames (Thanks to ring.com for sponsoring this fix!)
-1.1.1 (Feb. 8 2017)
- fix: incorrect stats for nchan_stub_status after reload.
-      (Stats are no longer reset after reload)
- fix: websocket subscriber may receive two CLOSE frames
- fix: websocket with ws+meta.nchan subprotocol did not receive empty messages
- feature: websocket client heartbeats with nchan_websocket_client_heartbeat
- fix: websocket now echoes code and reason when connection close initiated from client
-1.1.0 (Jan. 4 2017)
- feature: websocket subscribers now receive "application/octet-stream" messages
-      in binary frame rather than text
- fix: publisher request variables not always passed to nchan_publisher_upstream_request
- feature: Redis storage 'backup' mode strictly for data persistence
- fix: possible lingering subscriber if connection is closed just before subscribing
- fix: possible memory leak when using multiplexed channels
- security fix: subscribing with If-Modified-Since and without If-None-Match headers
-      crashed the Nginx worker (thanks @supertong)
- security fix: sending an empty message to multipart/mixed subscriber crashed Nginx worker
- fix: publisher & subscriber response codes were logged incorrectly
- fix: websocket subscriber memory leak on upstream authentication failure
- fix: possible crash after reloading when using several instances of Nchan with Redis
- feature: nchan_access_control_allow_origin can accept nginx variables
- feature: Redis key namespaces
- feature: all size configurations can now parse decimal values
- fix: off-by-one subscriber count when using multiplexed channels
- feature: accounting and dynamic limits for channel groups
-1.0.8 (Nov. 28 2016)
- fix: possible crash under severely heavy load, introduced in 1.0.7 with stack-overflow fix
-1.0.7 (Nov. 27 2016)
- fix: memory leak after websocket publisher uncleanly aborts connection
- fix: misbehaving websocket publisher with nchan_publisher_upstream_request
- fix: potential stack overflow with very large message buffers
- fix: invalid memory access with empty nchan_publisher_upstream_request for websocket publisher
- fix: incorrect handling of chunked response from nchan_publisher_upstream_request
- fix: publishing through websocket too fast may result in buffered messages that never arrive
- fix: DELETE to multiplexed channel should delete all listed channels
- fix: abort if publishing to multiple channels while using redis
-1.0.6 (Nov. 15 2016)
- fix: large messages were sometimes incorrectly cleaned up, leaving behind temp files
- fix: file descriptor leak when listening on a unix socket and suddenly 
-      aborting client connections
- fix: invalid memory access after reloading twice with redis enabled
- fix: crash after shutting down nginx when 'master_process' set to 'off'
- change: nchan_max_channel_subscribers now always refers to subscribers on this instance of
-      Nchan, even when using Redis.
- feature: subscribe/unsubscribe callbacks with nchan_subscribe_request and nchan_unsubscribe_request
-1.0.4 (Oct. 28 2016)
- security: fix crash when receiving large messages over websocket with ws+nchan subprotocol
-1.0.3 (Sept. 3 2016)
- feature: nchan_message_timeout and nchan_message_buffer_length 
-      can now use nginx variables for dynamic values
- fix: unsolicited websocket PONGs disconnected the subscriber in violation of RFC6455
- fix: possible script error when getting channel from Redis
- fix: possible incorrect message IDs when using Redis (thanks @supertong)
- security: possible invalid memory access on publisher GET, POST, or DELETE when
-      using Redis and the publisher connection is terminated before receiving
-      a response
- fix: correct publisher response code when nchan_authorize_request is unavailable
-      (502 instead of 500)
- security: crash if publisher POSTs request with no Content-Length header when 
-      using nchan_authorize_request
-1.0.2 (Aug. 29 2016)
- fix: more informative missed-message warnings
- fix: invalid memory access when Redis enabled without setting server URL
- fix: incomplete redis channel deletion
- fix: Redis command responses may not be processed after large message
-      until next command
- feature: catch up with missed messages after reconnecting to Redis cluster
- fix: possible invalid memory access after disconnecting from Redis cluster
- fix: Redis-stored unbuffered messages may not be delivered
- fix: possible invalid memory access when using previously idling channels
- fix: invalid memory access if publisher POST request's connection terminates
-      before receiving response
- fix: messages published rapidly to Redis via different Ncnan servers may
-      be received out of order
- fix: possible stack overflow when receiving messages through Redis
-      for multiplexed channels
- fix: channels with 'nchan_store_messages off' published 1 message per second
- fix: issue warning when out-of-order published message is detected
- fix: Redis cluster compatibility with channel ids containing '}' character
- fix: Redis-stored channel deleted too quickly when publishing short-lived messages
-1.0.1 (Aug. 22 2016)
- feature: nchan_stub_status shared memory accounting
- fix: various compiler warnings
-1.0.0 (Aug. 20 2016)
- fix: incorrectly repeated subscriber_enqueue channel events
- fix: badly handled Redis messages with TTL < 1 (again)
- fix: websocket didn't close connection on PING fail
- feature: nchan_stub_status stats location
- fix: bad memory access for Redis channels when unsubscribing and very busy
- optimize: SSE2 & AVX2 optimizations for websocket frame unmasking
- feature: Redis Cluster support
- (WARNING:) data in Redis from previous versions will be inaccessible
- feature: different locations can use different Redis servers
- feature: nchan_subscriber_first_message can take a number (positive or negative) 
-      for nth message (from first or last)
- feature: expire Redis-stored idle channels with nchan_redis_idle_channel_cache_timeout
- fix: some multiplexed channels never garbage-collected when inactive
- fix: unbuffered message garbage collector was too lazy
- fix: update nchan_message_buffer_length correctly when using Redis (thanks @supertong)
- fix: incorrect handling of missing/expired messages in multiplexed channels
- fix: memory leak when publishing via Websocket on a pubsub location
- fix: multiplexed channel DELETE when using Redis handled incorrectly
- fix: rare Redis script error when publishing message
- fix: Redis connection ping infinite loop when reloading
- fix: crash if Redis message TTL less than 1 sec
- fix: message delivery occasionally stopped when using Redis 
-      and rapidly publishing messages
- fix: logpoll-multipart sometimes failed to respond when using Redis 
-      and rapidly publishing messages
- fix: don't crash if Redis server is busy loading data
-0.99.16 (Jun 10 2016)
- fix: invalid memory access when upstream subscriber authorize request failed
- fix: longpoll-multipart subscriber was managed incorrectly on channel deletion
- fix: subscribers may not receive messages after Redis reconnection
-0.99.15 (May 31 2016)
- feature: Redis client keepalive configurable with nchan_redis_ping_interval
- feature: try to reconnect to Redis after lost connection to Redis
- fix: invalid memory access after lost connection to Redis
- fix: use-after-free error if subscriber disconnects before response 
-      from upstream authorize server (thanks Filip Jenicek)
- fix: corrupt longpoll-multipart boundary data with long messages
- feature: 'raw' mode for longpoll-multipart
- feature: http-raw-stream client, like Push Stream Module's 'stream' mode
- fix: incomplete longpoll-multipart response when using Redis
- fix: "subrequests cycle" error for websocket publisher for nginx > 1.9.4
- fix: nchan_channel_id_split_delimiter inheritance
- fix: subscriber memory leak from 0.99.8
- fix: reload crash from 0.99.14
-0.99.14 (May 4 2016)
- fix: trailing NULL character in Publisher response content-type for json, xml, and yaml
- fix: don't crash when out of shared memory
- fix: invalid memory access when using nchan_publisher_upstream_request with websocket 
- fix: incorrect stored messages count when using Redis store
- fix: incorrect last_message_id on publisher GETs (memstore and Redis)
- fix: incorrect behavior when subscribing right after startup before all workers are ready
- fix: some internal event loop timers were not being canceled, leading to slow shutdown
- fix: resuming some subscribers with valid message ids didn't work when using Redis store
- fix: possible invalid memory access when restarting Nginx after using multiplexed channels
- fix: accept url-encoded message ids
- feature: add ws+meta.nchan websocket subprotocol that include message metadata
- fix: all requests after X-Accel-Redirect from upstream were treated as GETs
-0.99.13 (Apr. 20 2016)
- fix: invalid content-length for nchan_authorize_request publisher requests
- fix: "subrequests cycle" error after 200 websocket publish requests
- fix: zero-size buf warning when publishing empty messages via websocket
- fix: nchan_max_channel_subscribers was ignored
- fix: use a blocking Redis connection for commands during shutdown to ensure commands are sent
- fix: better TTL handling for Redis keys
-0.99.12 (Apr. 10 2016)
- fix: SPDY compatibility with EventSource and multipart/mixed subscribers
- fix: warnings when shutting down Redis storage
- feature: use system's hiredis library if present
- fix: incorrect handling of missing messages when publishing to Redis
-0.99.11 (Apr. 3 2016)
- feature: nchan can be built as a dynamic module (for nginx >= 1.9.11)
-0.99.10 (Apr. 2 2016)
- fix: messages not freed until expired after being deleted from channel
- fix: buffering and output issues for large messages
- update: hiredis updated to v0.13.3
- fix: Redis publishing and subscribing memory leaks
- optimize: per-channel Redis subscriber counts batched into 100-ms intervals
-    to prevent Redis roundtrip floods
- fix: Redis subscriber memory leak
- refactor: extracted shared subscriber and message store logic
- fix: use-after-free error for Redis channels without subscribers
- fix: channel readying logic sometimes got confused and tripped up assert()s
- fix: even more proper handling of websocket close frames
- change: 408 Request Timeout instead of 304 No Content status code for timed out subscribers
-0.99.8 (Mar. 13 2016)
- fix: multipart/mixed subscriber output issues
- fix: memory leak for multiplexed > 4 channels
- fix: invalid memory access for aborted subscriber connection with Redis
-      and nchan_subscribe_existing_channels_only
- fix: accept websocket binary data frames
- fix: proper handling of websocket close frames
- fix: incorrect expire calculation for cached Redis-stored messages
- fix: double free for multiplexed >4 websocket subs
-0.99.7 (Mar. 10 2016)
- fix: websocket infinite ping loop after reload
- feature: nchan_subscriber_message_id_custom_etag_header for misbehaving proxies that eat etags
- fix: 100% cpu after lost Redis connection
- fix: refined CORS cross-origin access control headers and logic
- fix: longpoll subscriber in multipart mode didn't output all messages
- fix: longpoll subscriber in multipart mode could access invalid memory
- fix: compatibility with supported Redis versions < 2.8.14
- fix: nchan_message_timeout 0 should not expire messages
-0.99.6 (Feb. 22 2016)
- fix: SIGHUP reloading under load
-0.99.5 (Feb 15 2016)
- fix: publishing with client_body_in_file_only enabled
-0.99.4 (Feb 12 2016)
- fix: invalid memory access in channel DELETE response
- fix: race condition in IPC during channel creation (thanks vtslothy)
-0.99.3 (Feb 10 2016)
- fix: SIGHUP reloading
- fix: startup with insufficient file descriptors shouldn't crash
- fix: longpoll-multipart failure to immediately respond
- fix: longpoll-multipart abort handling
- fix: Redis-store cached message timeouts
- fix: Redis connection-lost handling
- fix: startup with 'master_process off' (single-process mode)
- feature: EventSource 'event:' line support with custom header or config
-0.98 (Jan 21 2016)
- feature: publish to multiple channels with one request
- feature: nchan_longpoll_multipart_response config setting
- fix: large message (in-file) handling for multipart/mixed and chunked subscribers
- fix: 400 Bad Request error on 32-bit systems
- fix: memory allocation error for >8 multi-channel subscribers
-0.97 (Jan 5 2016) 
- fix: build issues with debian
- fix: compatibility with nginx versions down to 1.0.15
- fix: publishing bug introduced in 0.96
-0.961 (Jan 4 2016)
- fix: compiler warning
-0.96 (Jan 1. 2016)
- feature: websocket ping with nchan_websocket_ping_interval
- fix: unsafe memory access for Redis publisher
- feature: nchan_publisher_upstream_request
- fix: http/2 compatibility for EventSource and multipart/mixed
- fix: nchan_authorize_request for publisher location endpoints
- fix: publishing long (stored in file) messages to Redis-store
-0.95 (Dec. 24 2015)
- feature: configurable nchan_access_control_origin_header, default to *
- fix: recognize non-preflighted CORS requests
- fix: Redis invalid memory access after timeout
-0.94 (Dec. 22 2015)
- feature: last mesage id in channel info response
- feature: subscribe up to 255 channel ids using nchan_channel_id_split_delimiter
- fix: tried connecting to Redis when not needed
- change: "last requested" no longer has a -1 value for 'never requested'.
- fix: "last requested" in channel info sometimes not updated
- fix: deleting empty channels
- change: more compact message ids
-0.931 (Dec. 14 2015)
- optimize: inter-process internal subscriber fetched too many messages
-0.93 (Dec. 12 2015)
- feature: optionally only use Etag for subscriber message id
- feature: optionally get requested message id from variable config
-0.92 (Dec. 11 2015)
- feature: HTTP multipart/mixed subscriber
- fix: EventSource bad memory access on disconnect
- feature: HTTP chunked encoding subscriber
- fix: resolved some strict compiler warnings
- fix: more stringent out-of-memory detection during response output. thanks @woodyhymns
- fix: less-than-optimal cache filename handling. thanks @ZhouBox
- fix: incorrect EventSource charset in header. thanks @eschultz
- fix: segfault when websocket publishes message and immediately disconnects
- fix: Duplicate "Connection: Upgrade" header for websocket handshake. thanks @eschultz 
-0.904 (Dec. 7 2015)
- fix: more flexible Websocket handshake for "Connection" header. thanks @eschultz
- fix: out-of-memory safety check. thanks @woodyhymns
-0.903 (Dec 3 2015)
- fix: better Redis engine connection initializer
- change: simpler message buffer settings
- fix: more backwards-compatibility for pushmodule config settings
-0.9 (Dec. 2 2015) - first beta pre-release tag after rebranding as Nchan
- feature: meta channel events: track when subscribers connect and disconnect, and when messages are
-          published, with configurable event strings
- feature: request authorization: send upstream request before publishing or subscribing.
-          works just like the auth_request module.
- feature: channel multiplexing. up to 4 channels can be subscribed to from a single location
- fix: channel ids were not set within if statements in the nginx config
- feature: hybrid memstore + Redis storage. local caching + distributed message publishing, the best
-          of both worlds. (still slower than pure memstore though)
- feature: pubsub locations, optional separate publisher and subscriber channel ids per location
- feature: websocket publisher support
- name change: we're nchan now. code renamed, and cleaned up. config options are backwards-compatible.
- feature: websocket subscriber support
- huge refactor: completely new in-memory storage engine. No more global lock.
-    Actually, no more locks at all!
- feature: Redis storage engine. 
-0.73 (Sep. 2 2014)
- fix: turning on gzip cleared Etag subscriber response header
- fix: channels incorrectly deleted when overwhelmed with connections
- feature: CORS support via OPTIONS request method response
- fix: file descriptor leak when restarting nginx via SIGHUP
- improve: concurrency for interprocess notifications
- refactor: completely encapsulated message store
- fix: slow memory leak introduced in 0.7
- fix: memory leak when not using message buffer
-0.712 (Mar. 21 2014)
- fix: intermittently dropped long-polling connections on internal redirects
- fix: unable to proxy long-polling subscribers. (thanks wandenberg and sanmai)
-0.711 (Mar. 13 2014)
- fix: incompatibility with cache manager (proxy_cache and fastcgi_cache directives)
-0.71 (Mar. 1 2014)
- fix: removed unused variables and functions to quiet down GCC
-0.7: (Feb. 20 2014)
- fix: last-in concurrency setting wasn't working reliably
- refactor: partially separated message storage. add a test harness.
- fix: segfault from concurrency bug while garbage-collecting channels
- fix: some large messages got lost
-0.692 (Feb. 3 2010)
- fix: error log reported failed close() for some publisher requests with large messages
- fix: occasional memory leak during message deletion
- fix: worker messages intended for dead worker processes were not deleted
-0.691 (Feb. 2 2010)
- fix: server reload (via SIGHUP signal) was failing
- fix: segfault on messages longer than client_body_buffer_size (thanks wfelipe)
- change: removed push_min_message_recipients, added push_delete_oldest_received_message
-0.69 (Nov. 17 2009)
- fix: publisher got a 201 Created response even if the channel had no subscribers at the time (should be 202 Accepted)
- fix: small memory leak after each message broadcast to a channel
- feature: optional push_max_channel_subscribers setting added
- fix: first-in concurrency setting wasn't responding to subscribers with a correct status code on conflict
- fix: reused subscriber connections sometimes failed to receive messages
- unfeature: no more nginx 0.6 support. not worth the hassle.
-0.683 (Nov. 10 2009)
- change: default max. reserved memory size changed form 16MB to 32 MB
- change: unused node garbage collection made a little more aggressive (max. 3 unused channels per channel search instead of 1)
- fix: unused nodes were deleted only on channel id hash collision (very rare)
- fix: segmentation fault from allocating insufficient memory for interprocess messaging
-0.681 (Nov. 6 2009)
- feature: added push_message_buffer_length setting, which sets push_message_max_buffer_length and push_message_min_buffer_length at once.
- fix: publisher channel info text/json response now uses double quotes instead of single.
- fix: interprocess messages were not removed from shared memory correctly, causing weird errors
-0.68 (Nov. 5 2009)
- change: default push_subscriber_concurrency value is now "broadcast"
- fix: incorrect error messages for invalid push_pubscriber and push_subscriber_concurrency settings
- change: removed deprecated push_buffer_size and push_queue_messages settings
- feature: rudimentary content-type negotiation for publisher channel info response.
-   support text/plain, text/json, text/yaml and application/xml (and mimetype equivalents)
- fix: publisher GET response has HTTP status 0
-0.67beta (Nov. 4 2009) and older
- see git repository
diff --git a/debian/modules/nchan/cloc-exclude.txt b/debian/modules/nchan/cloc-exclude.txt
deleted file mode 100644
index fdf0e34..0000000
--- a/debian/modules/nchan/cloc-exclude.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-src/uthash.h
-src/hiredis
-src/util/ngx_nchan_hacked_slab.c
-src/util/hdr_histogram.c
-src/util/hdr_histogram.h
-src/store/redis/cmp.c
-src/store/redis/cmp.h
-src/store/redis/redis_lua_commands.h
-src/nginx-source
-src/nchan_config_commands.c
-dev/bench
-dev/nginx-pkg
-dev/clang-analyzer
-dev/package
-dev/src
-dev/redis-trib.rb
diff --git a/debian/modules/nchan/config b/debian/modules/nchan/config
deleted file mode 100644
index a246ed1..0000000
--- a/debian/modules/nchan/config
+++ /dev/null
@@ -1,166 +0,0 @@
-ngx_addon_name=ngx_nchan_module
-
-nchan_libs=""
-#do we have hiredis on the platform?
-# it's currently no longer possible to link the platform's hiredis lib, 
-# because we now use a hacked connect function
-# maybe it can be brought back at some later time...
-ngx_feature="hiredis with stored sockaddr"
-ngx_feature_name="NCHAN_HAVE_HIREDIS_WITH_SOCKADDR"
-ngx_feature_run=yes
-ngx_feature_path=
-ngx_feature_incs=" \
-  #include <hiredis/hiredis.h>
-  #include <sys/socket.h>
-"
-ngx_feature_libs="-lhiredis"
-ngx_feature_test=" \
-  redisContext c; \
-  if(HIREDIS_SONAME < 0.13) { return 1; } \
-  if(sizeof(c.sockaddr) != sizeof(struct sockaddr)) { return 1;} \
-"
-. auto/feature
-if [ $ngx_found = no ]; then
-  _NCHAN_HIREDIS_SRCS="\
-    ${ngx_addon_dir}/src/store/redis/hiredis/alloc.c \
-    ${ngx_addon_dir}/src/store/redis/hiredis/async.c \
-    ${ngx_addon_dir}/src/store/redis/hiredis/dict.c \
-    ${ngx_addon_dir}/src/store/redis/hiredis/hiredis.c \
-    ${ngx_addon_dir}/src/store/redis/hiredis/net.c \
-    ${ngx_addon_dir}/src/store/redis/hiredis/read.c \
-    ${ngx_addon_dir}/src/store/redis/hiredis/sds.c \
-    ${ngx_addon_dir}/src/store/redis/hiredis/sockcompat.c \
-  "
-  
-  if [ $USE_OPENSSL = YES ]; then
-    _NCHAN_HIREDIS_SRCS="$_NCHAN_HIREDIS_SRCS\
-      ${ngx_addon_dir}/src/store/redis/hiredis/ssl.c \
-    "
-  fi
-  
-  ngx_feature_libs=""
-else
-  nchan_libs="$nchan_libs $ngx_feature_libs"
-  _NCHAN_HIREDIS_SRCS=""
-fi
-
-ngx_feature="math lib"
-ngx_feature_name="NCHAN_HAVE_MATH"
-ngx_feature_run=yes
-ngx_feature_path=
-ngx_feature_incs="#include <math.h>"
-ngx_feature_libs="-lm"
-ngx_feature_test="sqrt(20);"
-. auto/feature
-if [ $ngx_found = yes ]; then
-  nchan_libs="$nchan_libs $ngx_feature_libs"
-fi
-
-#do we have memrchr() on the platform?
-ngx_feature="memrchr()"
-ngx_feature_name="NCHAN_HAVE_MEMRCHR"
-ngx_feature_run=yes
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_incs=" \
-  #include <string.h> 
-  #include <stddef.h> 
-"
-ngx_feature_test=" \
-  const char *str = \"aboobar\"; \
-  const void *place = &str[4]; \
-  const void *found = memrchr(str, 'b', strlen(str)); \
-  if(place != found) { return 1; } \
-"
-. auto/feature
-
-_NCHAN_SUBSCRIBERS_SRCS="\
-  ${ngx_addon_dir}/src/subscribers/common.c \
-  ${ngx_addon_dir}/src/subscribers/longpoll.c \
-  ${ngx_addon_dir}/src/subscribers/intervalpoll.c \
-  ${ngx_addon_dir}/src/subscribers/eventsource.c \
-  ${ngx_addon_dir}/src/subscribers/http-chunked.c \
-  ${ngx_addon_dir}/src/subscribers/http-multipart-mixed.c \
-  ${ngx_addon_dir}/src/subscribers/http-raw-stream.c \
-  ${ngx_addon_dir}/src/subscribers/websocket.c \
-  ${ngx_addon_dir}/src/nchan_websocket_publisher.c \
-  ${ngx_addon_dir}/src/subscribers/internal.c \
-  ${ngx_addon_dir}/src/subscribers/memstore_ipc.c \
-  ${ngx_addon_dir}/src/subscribers/memstore_multi.c \
-  ${ngx_addon_dir}/src/subscribers/memstore_redis.c \
-  ${ngx_addon_dir}/src/subscribers/getmsg_proxy.c \
-  ${ngx_addon_dir}/src/subscribers/benchmark.c \
-"
-
-_NCHAN_REDIS_STORE_SRCS="\
-  ${_NCHAN_HIREDIS_SRCS} \
-  ${ngx_addon_dir}/src/store/redis/cmp.c \
-  ${ngx_addon_dir}/src/store/redis/redis_lua_commands.c \
-  ${ngx_addon_dir}/src/store/redis/redis_nodeset_parser.c \
-  ${ngx_addon_dir}/src/store/redis/redis_nodeset.c \
-  ${ngx_addon_dir}/src/store/redis/rdsstore.c \
-  ${ngx_addon_dir}/src/store/redis/redis_nginx_adapter.c \
-"
-_NCHAN_MEMORY_STORE_SRCS="\
-  ${ngx_addon_dir}/src/store/memory/ipc.c \
-  ${ngx_addon_dir}/src/store/memory/ipc-handlers.c \
-  ${ngx_addon_dir}/src/store/memory/groups.c \
-  ${ngx_addon_dir}/src/store/memory/memstore.c \
-"
-
-_nchan_util_dir="${ngx_addon_dir}/src/util"
-_NCHAN_UTIL_SRCS=" \
-  $_nchan_util_dir/nchan_debug.c \
-  $_nchan_util_dir/nchan_list.c \
-  $_nchan_util_dir/nchan_slist.c \
-  $_nchan_util_dir/ngx_nchan_hacked_slab.c \
-  $_nchan_util_dir/shmem.c \
-  $_nchan_util_dir/nchan_rbtree.c \
-  $_nchan_util_dir/nchan_reuse_queue.c \
-  $_nchan_util_dir/nchan_output.c \
-  $_nchan_util_dir/nchan_util.c \
-  $_nchan_util_dir/nchan_fake_request.c \
-  $_nchan_util_dir/nchan_bufchainpool.c \
-  $_nchan_util_dir/nchan_channel_id.c \
-  $_nchan_util_dir/nchan_output_info.c \
-  $_nchan_util_dir/nchan_msg.c \
-  $_nchan_util_dir/nchan_thingcache.c \
-  $_nchan_util_dir/nchan_reaper.c \
-  $_nchan_util_dir/nchan_subrequest.c \
-  $_nchan_util_dir/nchan_benchmark.c \
-  $_nchan_util_dir/hdr_histogram.c \
-"
-
-_NCHAN_STORE_SRCS="\
-  ${ngx_addon_dir}/src/store/spool.c \
-  ${ngx_addon_dir}/src/store/ngx_rwlock.c \
-  ${ngx_addon_dir}/src/store/store_common.c \
-  $_NCHAN_MEMORY_STORE_SRCS \
-  $_NCHAN_REDIS_STORE_SRCS \
-"
-
-_NCHAN_SRCS="\
-  ${ngx_addon_dir}/src/nchan_defs.c \
-  ${ngx_addon_dir}/src/nchan_variables.c \
-  ${ngx_addon_dir}/src/nchan_module.c \
-  $_NCHAN_UTIL_SRCS \
-  $_NCHAN_SUBSCRIBERS_SRCS \
-  $_NCHAN_STORE_SRCS \
-"
-
-ngx_module_incs=$ngx_addon_dir/src
-
-have=NGX_HTTP_HEADERS . auto/have
-
-if test -n "$ngx_module_link"; then
-  ngx_module_type=HTTP
-  ngx_module_name=$ngx_addon_name
-  ngx_module_srcs="$_NCHAN_SRCS"
-  ngx_module_libs=$nchan_libs
-  . auto/module
-else
-  NGX_ADDON_SRCS="$NGX_ADDON_SRCS $_NCHAN_SRCS"
-  CORE_LIBS="$CORE_LIBS $nchan_libs"
-  CORE_INCS="$CORE_INCS $ngx_module_incs"
-  HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
-fi
diff --git a/debian/modules/nchan/src/nchan_commands.rb b/debian/modules/nchan/src/nchan_commands.rb
deleted file mode 100644
index 9ffc27a..0000000
--- a/debian/modules/nchan/src/nchan_commands.rb
+++ /dev/null
@@ -1,933 +0,0 @@
-CfCmd.new do
-  
-  nchan_channel_id [:srv, :loc, :if],
-      :nchan_set_pubsub_channel_id,
-      :loc_conf,
-      args: 1..7,
-      alt: [ :nchan_pubsub_channel_id ],
-      
-      group: "pubsub",
-      default: "(none)",
-      tags: [ 'channel-id' ],
-      info: "Channel id for a publisher or subscriber location. Can have up to 4 values to subscribe to up to 4 channels.",
-      uri: "#the-channel-id"
-  
-  nchan_publisher_channel_id [:srv, :loc, :if],
-      :nchan_set_pub_channel_id,
-      :loc_conf,
-      args: 1..7,
-      alt: [ :nchan_pub_channel_id ],
-      
-      group: "pubsub",
-      tags: [ 'pubsub', 'channel-id' ],
-      default: "(none)",
-      info: "Channel id for publisher location."
-  
-  nchan_publisher_upstream_request [:srv, :loc, :if],
-      :ngx_http_set_complex_value_slot,
-      [:loc_conf, :publisher_upstream_request_url],
-      
-      group: "pubsub",
-      tags: [ 'publisher', 'hook' ],
-      value: "<url>",
-      uri: "#message-forwarding",
-      info: <<-EOS.gsub(/^ {8}/, '')
-        Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.  
-        The upstream response code determines how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.
-      EOS
-  
-      
-  nchan_deflate_message_for_websocket [:srv, :loc],
-      :nchan_set_message_compression_slot,
-      :loc_conf,
-      args: 1,
-      
-      group: "pubsub",
-      tags: ["publisher", 'subscriber-websocket'],
-      value: ['on', 'off'],
-      default: "off",
-      info: "Store a compressed (deflated) copy of the message along with the original to be sent to websocket clients supporting the permessage-deflate protocol extension"
-      
-  nchan_channel_id_split_delimiter [:srv, :loc, :if],
-      :ngx_conf_set_str_slot,
-      [:loc_conf, :channel_id_split_delimiter],
-      
-      group: "pubsub",
-      tags: [ 'channel-id', 'channel-multiplexing' ],
-      default: "(none)",
-      info: "Split the channel id into several ids for multiplexing using the delimiter string provided.",
-      uri: "#channel-multiplexing"
-  
-  nchan_subscriber_channel_id [:srv, :loc, :if],
-      :nchan_set_sub_channel_id,
-      :loc_conf,
-      args: 1..7,
-      alt: :nchan_sub_channel_id,
-      group: "pubsub",
-      tags: ["pubsub", 'channel-id'],
-      
-      default: "(none)",
-      info: "Channel id for subscriber location. Can have up to 4 values to subscribe to up to 4 channels."
-  
-  nchan_pubsub [:srv, :loc, :if],
-      :nchan_pubsub_directive,
-      :loc_conf,
-      args: 0..6,
-      alt: :nchan_pubsub_location,
-      
-      group: "pubsub",
-      tags: [ 'publisher', 'subscriber', 'pubsub' ],
-      value: ["http", "websocket", "eventsource", "longpoll", "intervalpoll", "chunked", "multipart-mixed", "http-raw-stream"],
-      default: ["http", "websocket", "eventsource", "longpoll", "chunked", "multipart-mixed"],
-      info: "Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server.",
-      uri: '#pubsub-endpoint'
-  
-  nchan_subscriber_info [:loc],
-      :nchan_subscriber_info_directive,
-      :loc_conf,
-      args: 0,
-      
-      group: "pubsub",
-      tags: ["subscriber", "debug"],
-      info: "A subscriber location for debugging the state of subscribers on a given channel. The subscribers of the channel specified by `nchan_channel_id` evaluate `nchan_subscriber_info_string` and send it back to the requested on this location. This is useful to see where subscribers are in an Nchan cluster, as well as debugging subscriber connection issues."
-  
-  nchan_subscriber_info_string [:srv, :loc],
-      :ngx_http_set_complex_value_slot,
-      [:loc_conf, :subscriber_info_string],
-      args: 1,
-      
-      group: "pubsub",
-      tags: ["subscriber", "debug"],
-      default: "$nchan_subscriber_type $remote_addr:$remote_port $http_user_agent $server_name $request_uri $pid",
-      info: "this string is evaluated by each subscriber on a given channel and sent to the requester of a `nchan_subscriber_info` location"
-  
-  nchan_longpoll_multipart_response [:srv, :loc, :if],
-      :nchan_set_longpoll_multipart,
-      [:loc_conf, :longpoll_multimsg],
-      args: 1,
-      
-      group: "pubsub",
-      tags: ['subscriber-longpoll'],
-      default: "off",
-      value: ["off", "on", "raw"],
-      info: "when set to 'on', enable sending multiple messages in a single longpoll response, separated using the multipart/mixed content-type scheme. If there is only one available message in response to a long-poll request, it is sent unmodified. This is useful for high-latency long-polling connections as a way to minimize round-trips to the server. When set to 'raw', sends multiple messages using the http-raw-stream message separator."
-  
-  nchan_eventsource_event [:srv, :loc, :if],
-      :ngx_conf_set_str_slot,
-      [:loc_conf, :eventsource_event],
-      args: 1,
-      
-      group: "pubsub",
-      tags: ['subscriber-eventsource'],
-      default: "(none)",
-      info: "Set the EventSource `event:` line to this value. When used in a publisher location, overrides the published message's `X-EventSource-Event` header and associates the message with the given value. When used in a subscriber location, overrides all messages' associated `event:` string with the given value."
-  
-  nchan_eventsource_ping_comment [:srv, :loc, :if],
-      :ngx_conf_set_str_slot_no_newlines,
-      [:loc_conf, :"eventsource_ping.comment"],
-      args: 1,
-      
-      group: "pubsub",
-      tags: ['subscriber-eventsource'],
-      default: "(empty)",
-      info: "Set the EventSource comment `: ...` line for periodic pings from server to client. Newlines are not allowed. If empty, no comment is sent with the ping."
-  
-  nchan_eventsource_ping_event [:srv, :loc, :if],
-      :ngx_conf_set_str_slot_no_newlines,
-      [:loc_conf, :"eventsource_ping.event"],
-      args: 1,
-      
-      group: "pubsub",
-      tags: ['subscriber-eventsource'],
-      default: "ping",
-      info: "Set the EventSource `event:` line for periodic pings from server to client. Newlines are not allowed. If empty, no event type is sent with the ping."
-  
-  nchan_eventsource_ping_data [:srv, :loc, :if],
-      :ngx_conf_set_str_slot_no_newlines,
-      [:loc_conf, :"eventsource_ping.data"],
-      args: 1,
-      
-      group: "pubsub",
-      tags: ['subscriber-eventsource'],
-      default: "(empty)",
-      info: "Set the EventSource `data:` line for periodic pings from server to client. Newlines are not allowed. If empty, no data is sent with the ping."
-  
-    nchan_eventsource_ping_interval [:srv, :loc, :if],
-      :ngx_conf_set_sec_slot,
-      [:loc_conf, :"eventsource_ping.interval"],
-      
-      group: "pubsub",
-      tags: ['subscriber-eventsource'],
-      value: "<number> (seconds)",
-      default: "0 (none)",
-      info: "Interval for sending ping messages to EventSource subscribers. Disabled by default."
-  
-  nchan_subscriber [:srv, :loc, :if],
-      :nchan_subscriber_directive,
-      :loc_conf,
-      args: 0..5,
-      legacy: "push_subscriber",
-      alt: :nchan_subscriber_location,
-      
-      group: "pubsub",
-      tags: ['subscriber'],
-      value: ["websocket", "eventsource", "longpoll", "intervalpoll", "chunked", "multipart-mixed", "http-raw-stream"],
-      default: ["websocket", "eventsource", "longpoll", "chunked", "multipart-mixed"],
-      info: "Defines a server or location as a channel subscriber endpoint. This location represents a subscriber's interface to a channel's message queue. The queue is traversed automatically, starting at the position defined by the `nchan_subscriber_first_message` setting.  \n The value is a list of permitted subscriber types." ,
-      uri: "#subscriber-endpoints"
-  
-  nchan_subscriber_compound_etag_message_id [:srv, :loc, :if], 
-      :ngx_conf_set_flag_slot,
-      [:loc_conf, :msg_in_etag_only],
-      args: 1,
-      
-      group: "pubsub",
-      tags: ['subscriber'],
-      default: "off",
-      uri: "",
-      info: <<-EOS.gsub(/^ {8}/, '')
-        Override the default behavior of using both `Last-Modified` and `Etag` headers for the message id.  
-        Enabling this option packs the entire message id into the `Etag` header, and discards
-        `Last-Modified` and `If-Modified-Since` headers.
-      EOS
-      
-  nchan_subscriber_message_id_custom_etag_header [:srv, :loc, :if], 
-      :ngx_conf_set_str_slot, 
-      [:loc_conf, :custom_msgtag_header],
-      args: 1,
-      
-      group: "pubsub",
-      tags: ['subscriber'],
-      default: "(none)",
-      info: <<-EOS.gsub(/^ {8}/, '')
-        Use a custom header instead of the Etag header for message ID in subscriber responses. This setting is a hack, useful when behind a caching proxy such as Cloudflare that under some conditions (like using gzip encoding) swallow the Etag header.
-      EOS
-  
-  nchan_subscriber_last_message_id [:srv, :loc, :if], 
-      :nchan_subscriber_last_message_id,
-      :loc_conf,
-      args: 1..5,
-      
-      group: "pubsub",
-      tags: ['subscriber'],
-      default: ["$http_last_event_id", "$arg_last_event_id"],
-      info: "If `If-Modified-Since` and `If-None-Match` headers are absent, set the message id to the first non-empty of these values. Used primarily as a workaround for the inability to set the first `Last-Message-Id` of a web browser's EventSource object. "
-  
-  nchan_subscriber_http_raw_stream_separator [:srv, :loc, :if],
-      :nchan_set_raw_subscriber_separator,
-      [:loc_conf, :subscriber_http_raw_stream_separator],
-      args: 1,
-      
-      group: "pubsub",
-      tags: ['subscriber-rawstream'],
-      value: "<string>",
-      default: "\\n",
-      info: "Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character if not explicitly set to an empty string."
-  
-  nchan_subscriber_first_message [:srv, :loc, :if],
-      :nchan_subscriber_first_message_directive,
-      :loc_conf,
-      args: 1,
-      
-      group: "pubsub",
-      tags: ['subscriber'],
-      value: ["oldest", "newest", "<number>"],
-      default: "oldest",
-      info: "Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` starts at `n`th from now). 0 is equivalent to 'newest'."
-  
-  
-  #nchan_subscriber_concurrency [:main, :srv, :loc, :if],
-  #    :nchan_set_subscriber_concurrency,
-  #    [:loc_conf, :subscriber_concurrency],
-  #    legacy: "push_subscriber_concurrency",
-  #    
-  #    group: "pubsub",
-  #    value: [ :last, :first, :broadcast ],
-  #    info: "Controls how multiple subscriber requests to a channel (identified by some common ID) are handled.The values work as follows:
-  #    - broadcast: any number of concurrent subscriber requests may be held.
-  #    - last: only the most recent subscriber request is kept, all others get a 409 Conflict response.
-  #    - first: only the oldest subscriber request is kept, all others get a 409 Conflict response."
-  
-  nchan_websocket_ping_interval [:srv, :loc, :if],
-      :ngx_conf_set_sec_slot,
-      [:loc_conf, :websocket_ping_interval],
-      
-      group: "pubsub",
-      tags: ['subscriber-websocket'],
-      value: "<number> (seconds)",
-      default: "0 (none)",
-      info: "Interval for sending websocket ping frames. Disabled by default."
-  
-  nchan_websocket_client_heartbeat [:srv, :loc, :if],
-      :nchan_websocket_heartbeat_directive,
-      [:loc_conf, :websocket_heartbeat],
-      args: 2,
-      
-      group: "pubsub",
-      tags:['subscriber-websocket'],
-      value: "<heartbeat_in> <heartbeat_out>",
-      default: "none (disabled)",
-      info: "Most browser Websocket clients do not allow manually sending PINGs to the server. To overcome this limitation, this setting can be used to set up a PING/PONG message/response connection heartbeat. When the client sends the server message *heartbeat_in* (PING), the server automatically responds with *heartbeat_out* (PONG)."
-  
-  nchan_publisher [:srv, :loc, :if],
-      :nchan_publisher_directive,
-      :loc_conf,
-      args: 0..2,
-      legacy: "push_publisher",
-      alt: :nchan_publisher_location,
-      
-      group: "pubsub",
-      tags: ['publisher'],
-      value: ["http", "websocket"],
-      default: ["http", "websocket"],
-      info: "Defines a server or location as a publisher endpoint. Requests to a publisher location are treated as messages to be sent to subscribers. See the protocol documentation for a detailed description.",
-      uri: "#publisher-endpoints"
-  
-  nchan_subscriber_timeout [:main, :srv, :loc, :if],
-      :ngx_conf_set_sec_slot,
-      [:loc_conf, :subscriber_timeout],
-      legacy: "push_subscriber_timeout",
-      
-      group: "pubsub",
-      tags: ['subscriber'],
-      value: "<number> (seconds)",
-      default: "0 (none)",
-      info: "Maximum time a subscriber may wait for a message before being disconnected. If you don't want a subscriber's connection to timeout, set this to 0. When possible, the subscriber will get a response with a `408 Request Timeout` status; otherwise the subscriber will simply be disconnected."
-      
-  
-  nchan_authorize_request [:srv, :loc, :if], 
-      :ngx_http_set_complex_value_slot,
-      [:loc_conf, :authorize_request_url],
-      
-      group: "security",
-      tags: ['publisher', 'subscriber', 'hook'],
-      value: "<url>",
-      info: "Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it.",
-      uri: "#request-authorization"
-  
-  nchan_subscribe_request [:srv, :loc, :if], 
-      :ngx_http_set_complex_value_slot,
-      [:loc_conf, :subscribe_request_url],
-      
-      group: "pubsub",
-      tags: ['subscriber', 'hook'],
-      value: "<url>",
-      info: "Send GET request to internal location (which may proxy to an upstream server) after subscribing. Disabled for longpoll and interval-polling subscribers.",
-      uri: "#subscriber-presence"
-  
-  nchan_unsubscribe_request [:srv, :loc, :if], 
-      :ngx_http_set_unsubscribe_request_url,
-      [:loc_conf, :unsubscribe_request_url],
-      
-      group: "pubsub",
-      tags: ['subscriber', 'hook'],
-      value: "<url>",
-      info: "Send GET request to internal location (which may proxy to an upstream server) after unsubscribing. Disabled for longpoll and interval-polling subscribers.",
-      uri: "#subscriber-presence"
-  
-  nchan_message_temp_path [:main],
-      :ngx_conf_set_path_slot,
-      [:main_conf, :message_temp_path],
-      
-      group: "storage",
-      tags: ["memstore"],
-      value: "<path>",
-      default: "<client_body_temp_path>",
-      info: "Large messages are stored in temporary files in the `client_body_temp_path` or the `nchan_message_temp_path` if the former is unavailable. Default is the built-in default `client_body_temp_path`"
-      
-  
-  nchan_store_messages [:main, :srv, :loc, :if],
-      :nchan_store_messages_directive,
-      :loc_conf,
-      legacy: "push_store_messages",
-      
-      group: "storage",
-      tags: ['publisher'],
-      value: [:on, :off],
-      default: :on,
-      info: "Publisher configuration. \"`off`\" is equivalent to setting `nchan_message_buffer_length 0`, which disables the buffering of old messages. Using this setting is not recommended when publishing very quickly, as it may result in missed messages."
-    
-  nchan_shared_memory_size [:main],
-      :nchan_conf_set_size_slot,
-      [:main_conf, :shm_size],
-      legacy: ["push_max_reserved_memory", "nchan_max_reserved_memory"],
-      
-      group: "storage",
-      tags: ['memstore'],
-      value: "<size>",
-      default: "128M",
-      info: "Shared memory slab pre-allocated for Nchan. Used for channel statistics, message storage, and interprocess communication.",
-      uri: "#memory-storage"
-  
-  nchan_permessage_deflate_compression_level [:main],
-      :nchan_conf_deflate_compression_level_directive,
-      :main_conf,
-      
-      group: "pubsub",
-      tags: ['subscriber-websocket'],
-      value: ["0-9"],
-      default: "6",
-      info: "Compression level for the `deflate` algorithm used in websocket's permessage-deflate extension. 0: no compression, 1: fastest, worst, 9: slowest, best"
-  
-  nchan_permessage_deflate_compression_strategy [:main],
-      :nchan_conf_deflate_compression_strategy_directive,
-      :main_conf,
-      
-      group: "pubsub",
-      tags: ['subscriber-websocket'],
-      value: ["default", "filtered", "huffman-only", "rle", "fixed"],
-      default: "default",
-      info: "Compression strategy for the `deflate` algorithm used in websocket's permessage-deflate extension. Use 'default' for normal data, For details see [zlib's section on copression strategies](http://zlib.net/manual.html#Advanced)"
-  
-  nchan_permessage_deflate_compression_window [:main],
-      :nchan_conf_deflate_compression_window_directive,
-      :main_conf,
-      
-      group: "pubsub",
-      tags: ['subscriber-websocket'],
-      value: ["9-15"],
-      default: "10",
-      info: "Compression window for the `deflate` algorithm used in websocket's permessage-deflate extension. The base two logarithm of the window size (the size of the history buffer). The bigger the window, the better the compression, but the more memory used by the compressor."
-  
-  nchan_permessage_deflate_compression_memlevel [:main],
-      :nchan_conf_deflate_compression_memlevel_directive,
-      :main_conf,
-      
-      group: "pubsub",
-      tags: ['subscriber-websocket'],
-      value: ["1-9"],
-      default: "8",
-      info: "Memory level for the `deflate` algorithm used in websocket's permessage-deflate extension. How much memory should be allocated for the internal compression state. 1 - minimum memory, slow and reduces compression ratio; 9 - maximum memory for optimal speed"
-  
-  nchan_redis_url [:main, :srv, :loc],
-      :ngx_conf_set_redis_url,
-      [:loc_conf, :"redis.url"],
-      
-      group: "storage",
-      tags: ['redis'],
-      value: "<redis-url>",
-      default: "127.0.0.1:6379",
-      info: "Use of this command is discouraged in favor of upstreams blocks with (`nchan_redis_server`)[#nchan_redis_server]. The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.",
-      uri: "#connecting-to-a-redis-server"
-  
-  nchan_redis_pass [:main, :srv, :loc],
-      :ngx_conf_set_redis_upstream_pass,
-      [:loc_conf, :"redis"],
-      
-      group: "storage",
-      tags: ['publisher', 'subscriber', 'redis'],
-      value: "<upstream-name>",
-      info: "Use an upstream config block for Redis servers.",
-      uri: "#connecting-to-a-redis-server"
-  
-  nchan_redis_pass_inheritable [:main, :srv, :loc],
-      :ngx_conf_set_flag_slot,
-      [:loc_conf, :"redis.upstream_inheritable"],
-      
-      undocumented: true,
-      group: "debug"
-  
-  nchan_redis_publish_msgpacked_max_size [:main],
-      :ngx_conf_set_size_slot,
-      [:main_conf, :redis_publish_message_msgkey_size],
-      undocumented: true,
-      group: "storage"
-  
-  nchan_redis_discovered_ip_range_blacklist [:upstream],
-      :ngx_conf_set_redis_ip_blacklist,
-      :srv_conf,
-      args: 1..7,
-      group: "storage",
-      tags: ['redis'],
-      value: "<CIDR range>",
-      info: "do not attempt to connect to **autodiscovered** nodes with IPs in the specified ranges. Useful for blacklisting private network ranges for clusters and Redis slaves. NOTE that this blacklist applies only to autodiscovered nodes, and not ones specified in the upstream block"
-  
-  nchan_redis_server [:upstream],
-      :ngx_conf_upstream_redis_server,
-      :loc_conf,
-      group: "storage",
-      tags: ['redis'],
-      value: "<redis-url>",
-      info: "Used in upstream { } blocks to set redis servers. Redis url is in the form 'redis://:password@hostname:6379/0'. Shorthands 'host:port' or 'host' are permitted.",
-      uri: "#connecting-to-a-redis-server"
-  
-  nchan_redis_storage_mode [:main, :srv, :upstream, :loc], 
-      :ngx_conf_set_redis_storage_mode_slot,
-      [:loc_conf, :"redis.storage_mode"],
-      
-      group: "storage",
-      tags: ['redis'],
-      value: ["distributed", "backup", "nostore"],
-      default: "distributed",
-      info: <<-EOS.gsub(/^ {8}/, '')
-        The mode of operation of the Redis server. In `distributed` mode, messages are published directly to Redis, and retrieved in real-time. Any number of Nchan servers in distributed mode can share the Redis server (or cluster). Useful for horizontal scalability, but suffers the latency penalty of all message publishing going through Redis first.
-        
-        In `backup` mode, messages are published locally first, then later forwarded to Redis, and are retrieved only upon chanel initialization. Only one Nchan server should use a Redis server (or cluster) in this mode. Useful for data persistence without sacrificing response times to the latency of a round-trip to Redis.
-        
-        In `nostore` mode, messages are published as in `distributed` mode, but are not stored. Thus Redis is used to broadcast messages to many Nchan instances with no delivery guarantees during connection failure, and only local in-memory storage. This means that there are also no message delivery guarantees for subscribers switching from one Nchan instance to another connected to the same Redis server or cluster. Nostore mode increases Redis publishing capacity by an order of magnitude.
-      EOS
-  
-  nchan_redis_nostore_fastpublish [:main, :srv, :upstream],
-      :ngx_conf_set_flag_slot,
-      [:loc_conf, :"redis.nostore_fastpublish"],
-      
-      group: "storage",
-      tags: ['redis', 'publisher'],
-      value: [:on, :off],
-      default: :off,
-      info: "Increases publishing capacity by 2-3x for Redis nostore mode at the expense of inaccurate subscriber counts in the publisher response."
-  
-  nchan_redis_username [:upstream],
-      :ngx_conf_set_str_slot,
-      [:srv_conf, :"redis.username"],
-      
-      group: "storage",
-      tags: ['redis'],
-      default: "<none>",
-      info: "Set Redis username for AUTH command (available when using ACLs on the Redis server). All servers in the upstream block will use this username _unless_ a different username is specified by a server URL."
-  
-  nchan_redis_password [:upstream],
-      :ngx_conf_set_str_slot,
-      [:srv_conf, :"redis.password"],
-      
-      group: "storage",
-      tags: ['redis'],
-      default: "<none>",
-      info: "Set Redis password for AUTH command. All servers in the upstream block will use this password _unless_ a different password is specified by a server URL."
-  
-  nchan_redis_ssl [:upstream],
-      :ngx_conf_set_flag_slot,
-      [:srv_conf, :"redis.tls.enabled"],
-      alt: :nchan_redis_tls,
-      
-      group: "storage",
-      tags: ['redis', 'ssl'],
-      value: [:on, :off],
-      default: :off,
-      info: "Enables SSL/TLS for all connections to Redis servers in this upstream block. When enabled, no unsecured connections are permitted"
-  
-  nchan_redis_ssl_client_certificate [:upstream],
-      :ngx_conf_set_str_slot,
-      [:srv_conf, :"redis.tls.client_certificate"],
-      alt: :nchan_redis_tls_client_certificate,
-      
-      group: "storage",
-      tags: ['redis', 'ssl'],
-      info: "Path to client certificate when using TLS for Redis connections"
-  
-  nchan_redis_ssl_client_certificate_key [:upstream],
-      :ngx_conf_set_str_slot,
-      [:srv_conf, :"redis.tls.client_certificate_key"],
-      alt: :nchan_redis_tls_client_certificate,
-      
-      group: "storage",
-      tags: ['redis', 'ssl'],
-      info: "Path to client certificate key when using TLS for Redis connections"
-  
-  nchan_redis_ssl_server_name [:upstream],
-      :ngx_conf_set_str_slot,
-      [:srv_conf, :"redis.tls.server_name"],
-      alt: :nchan_redis_tls_server_name,
-      
-      group: "storage",
-      tags: ['redis', 'ssl'],
-      info: "Server name to verify (CN) when using TLS for Redis connections"
-  
-  nchan_redis_ssl_trusted_certificate [:upstream],
-      :ngx_conf_set_str_slot,
-      [:srv_conf, :"redis.tls.trusted_certificate"],
-      alt: :nchan_redis_tls_trusted_certificate,
-      
-      group: "storage",
-      tags: ['redis', 'ssl'],
-      info: "Trusted certificate (CA) when using TLS for Redis connections"
-      
-  nchan_redis_ssl_trusted_certificate_path [:upstream],
-      :ngx_conf_set_str_slot,
-      [:srv_conf, :"redis.tls.trusted_certificate_path"],
-      alt: :nchan_redis_tls_trusted_certificate_path,
-      
-      group: "storage",
-      default: "<system default>",
-      tags: ['redis', 'ssl'],
-      info: "Trusted certificate (CA) when using TLS for Redis connections. Defaults tothe system's SSL cert path unless nchan_redis_ssl_trusted_certificate is set"
-  
-  nchan_redis_ssl_ciphers [:upstream],
-      :ngx_conf_set_str_slot,
-      [:srv_conf, :"redis.tls.ciphers"],
-      alt: :nchan_redis_tls_ciphers,
-      
-      group: "storage",
-      default: "<system default>",
-      tags: ['redis', 'ssl'],
-      info: "Acceptable cipers when using TLS for Redis connections"
-  
-  nchan_redis_ssl_verify_certificate [:upstream],
-      :ngx_conf_set_flag_slot,
-      [:srv_conf, :"redis.tls.ciphers"],
-      alt: :nchan_redis_tls_verify_certificate,
-      
-      group: "storage",
-      value: [:on, :off],
-      default: :on,
-      tags: ['redis', 'ssl'],
-      info: "Should the server certificate be verified when using TLS for Redis connections? Useful to disable when testing with a self-signed server certificate."
-  
-  nchan_use_redis [:main, :srv, :loc],
-      :ngx_conf_enable_redis,
-      [:loc_conf, :"redis.url_enabled"],
-      
-      group: "storage",
-      tags: ['redis', 'publisher', 'subscriber'],
-      value: [ :on, :off ],
-      default: :off,
-      info: "Use of this command is discouraged in favor of (`nchan_redis_pass`)[#nchan_redis_pass]. Use Redis for message storage at this location.",
-      uri: "#connecting-to-a-redis-server"
-  
-  nchan_redis_ping_interval [:main, :srv, :upstream, :loc],
-      :ngx_conf_set_sec_slot,
-      [:loc_conf, :"redis.ping_interval"],
-      
-      group: "storage",
-      tags: ['redis'],
-      default: "4m",
-      info: "Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable."
-  
-  nchan_redis_cluster_check_interval [:main, :srv, :upstream, :loc],
-      :ngx_conf_set_sec_slot,
-      [:loc_conf, :"redis.cluster_check_interval"],
-      
-      group: "storage",
-      tags: ['redis'],
-      default: "5s",
-      info: "Send a CLUSTER INFO command to each connected Redis node to see if the cluster config epoch has changed. Sent only when in Cluster mode and if any other command that may result in a MOVE error has not been sent in the configured time."
-  
-  nchan_redis_wait_after_connecting [:main, :srv, :loc],
-      :nchan_ignore_obsolete_setting,
-      :loc_conf,
-      
-      group: "obsolete",
-      tags: ['redis'],
-      uncocumented: true
-  
-  nchan_redis_connect_timeout [:upstream],
-      :ngx_conf_set_msec_slot,
-      [:srv_conf, :"redis.connect_timeout"],
-      
-      group: "storage",
-      tags: ['redis'],
-      default: "600ms",
-      info: "Redis server connection timeout."
-  
-  nchan_redis_subscribe_weights [:upstream],
-      :ngx_conf_set_redis_subscribe_weights,
-      :srv_conf,
-      args: 1..2,
-      
-      group: "storage",
-      tags: ['redis'],
-      value: "master=<integer> slave=<integer>",
-      default: "master=1 slave=1",
-      info: "Determines how subscriptions to Redis PUBSUB channels are distributed between master and slave nodes. The higher the number, the more likely that each node of that type will be chosen for each new channel. The weights for slave nodes are cumulative, so an equal 1:1 master:slave weight ratio with two slaves would have a 1/3 chance of picking a master, and 2/3 chance of picking one of the slaves. The weight must be a non-negative integer."
-  
-  nchan_redis_optimize_target [:upstream],
-      :ngx_conf_set_redis_optimize_target,
-      :srv_conf,
-      
-      group: "storage",
-      tags: ['redis'],
-      value: [:cpu, :bandwidth],
-      default: "cpu",
-      info: "This tweaks whether [effect replication](https://redis.io/commands/eval#replicating-commands-instead-of-scripts) is enabled. Optimizing for CPU usage enables effect replication, costing additional bandwidth (between 1.2 and 2 times more) between all master->slave links. Optimizing for bandwidth increases CPU load on slaves, but keeps outgoing bandwidth used for replication the same as the incoming bandwidth on Master."
-  
-  nchan_redis_namespace [:main, :srv, :upstream, :loc], 
-      :ngx_conf_set_str_slot,
-      [:loc_conf, :"redis.namespace"],
-      args: 1,
-      post_handler: "ngx_conf_process_redis_namespace_slot",
-      
-      group: "storage",
-      value: "<string>",
-      tags: ['redis'],
-      info: "Prefix all Redis keys with this string. All Nchan-related keys in redis will be of the form \"nchan_redis_namespace:*\" . Default is empty."
-  
-  nchan_redis_fakesub_timer_interval [:main],
-      :ngx_conf_set_msec_slot,
-      [:main_conf, :redis_fakesub_timer_interval],
-      
-      group: "tweak",
-      undocumented: true,
-      default: "100ms"
-  
-  nchan_redis_idle_channel_cache_timeout [:main, :srv, :loc],
-      :ngx_conf_set_sec_slot,
-      [:loc_conf, :redis_idle_channel_cache_timeout],
-      
-      group: "storage",
-      tags: ['redis'],
-      value: "<time>",
-      default: "30s",
-      info: "A Redis-stored channel and its messages are removed from memory (local cache) after this timeout, provided there are no local subscribers."
-  
-  nchan_message_timeout [:main, :srv, :loc], 
-      :nchan_set_message_timeout, 
-      [:loc_conf, :message_timeout],
-      legacy: "push_message_timeout",
-      
-      group: "storage",
-      tags: ['publisher'],
-      value: ["<time>", "<variable>"],
-      default: "1h",
-      info: "Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Note that messages always expire from oldest to newest, so an older message may prevent a newer one with a shorter timeout from expiring. An Nginx variable can also be used to set the timeout dynamically."
-  
-  nchan_message_buffer_length [:main, :srv, :loc],
-      :nchan_set_message_buffer_length,
-      [:loc_conf, :max_messages],
-      legacy: [ "push_max_message_buffer_length", "push_message_buffer_length" ],
-      alt: :nchan_message_max_buffer_length,
-      
-      group: "storage",
-      tags: ['publisher'],
-      value: ["<number>", "<variable>"],
-      default: 10,
-      info: "Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages. An Nginx variable can also be used to set the buffer length dynamically."
-  
-  nchan_subscribe_existing_channels_only [:main, :srv, :loc],
-      :ngx_conf_set_flag_slot, 
-      [:loc_conf, :subscribe_only_existing_channel],
-      legacy: "push_authorized_channels_only",
-      
-      group: "security",
-      tags: ['subscriber'],
-      value: [:on, :off],
-      default: :off,
-      info: "Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response."
-  
-  nchan_access_control_allow_origin [:main, :srv, :loc, :if], 
-      :ngx_http_set_complex_value_slot,
-      [:loc_conf, :allow_origin],
-      args: 1,
-      
-      group: "security",
-      value: "<string>",
-      tags: ['publisher', 'subscriber'],
-      default: "$http_origin",
-      info: "Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the incoming request's `Origin` header does not match this value, respond with a `403 Forbidden`. Multiple origins can be provided in a single argument separated with a space."
-
-  nchan_access_control_allow_credentials [:main, :srv, :loc, :if], 
-      :ngx_conf_set_flag_slot,
-      [:loc_conf, :allow_credentials],
-      args: 1,
-      
-      group: "security",
-      tags: ['publisher', 'subscriber'],
-      default: "on",
-      info: "When enabled, sets the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Credentials` header to `true`."
-  
-  
-  nchan_channel_group [:srv, :loc, :if], 
-      :ngx_http_set_complex_value_slot, 
-      [:loc_conf, :channel_group],
-      legacy: "push_channel_group",
-      
-      group: "security",
-      tags: ['publisher', 'subscriber', 'channel-events', 'group'],
-      value: "<string>",
-      default: "(none)",
-      info: "The accounting and security group a channel belongs to. Works like a prefix string to the channel id. Can be set with nginx variables."
-  
-  nchan_channel_group_accounting [:srv, :loc], 
-      :ngx_conf_set_flag_slot,
-      [:loc_conf, "group.enable_accounting"],
-      
-      group: "security",
-      tags: ['group', 'security'],
-      default: "off",
-      info: "Enable tracking channel, subscriber, and message information on a per-channel-group basis. Can be used to place upper limits on channel groups."
-  
-  nchan_group_location [:loc], 
-      :nchan_group_directive, 
-      [:loc_conf],
-      args: 0..3,
-      
-      group: "security",
-      tags: ['group'],
-      value: ["get", "set", "delete", "off"],
-      default: ["get", "set", "delete"],
-      info: "Group information and configuration location. GET request for group info, POST to set limits, DELETE to delete all channels in group."
-  
-  nchan_group_max_channels [:loc], 
-      :ngx_http_set_complex_value_slot, 
-      [:loc_conf, "group.max_channels"],
-      
-      group: "security",
-      tags: ['group', 'security'],
-      value: "<number>",
-      default: "0 (unlimited)",
-      info: "Maximum number of channels allowed in the group."
-  
-  nchan_group_max_messages [:loc], 
-      :ngx_http_set_complex_value_slot, 
-      [:loc_conf, "group.max_messages"],
-      
-      group: "security",
-      tags: ['group', 'security'],
-      value: "<number>",
-      default: "0 (unlimited)",
-      info: "Maximum number of messages allowed for all the channels in the group."
-  
-  nchan_group_max_messages_memory [:loc], 
-      :ngx_http_set_complex_value_slot, 
-      [:loc_conf, "group.max_messages_shm_bytes"],
-      
-      group: "security",
-      tags: ['group', 'security'],
-      value: "<number>",
-      default: "0 (unlimited)",
-      info: "Maximum amount of shared memory allowed for the messages of all the channels in the group."
-  
-  nchan_group_max_messages_disk [:loc], 
-      :ngx_http_set_complex_value_slot, 
-      [:loc_conf, "group.max_messages_file_bytes"],
-      
-      group: "security",
-      tags: ['group', 'security'],
-      value: "<number>",
-      default: "0 (unlimited)",
-      info: "Maximum amount of disk space allowed for the messages of all the channels in the group."
-  
-  nchan_group_max_subscribers [:loc], 
-      :ngx_http_set_complex_value_slot, 
-      [:loc_conf, "group.max_subscribers"],
-      
-      group: "security",
-      tags: ['group', 'security'],
-      value: "<number>",
-      default: "0 (unlimited)",
-      info: "Maximum number of subscribers allowed for the messages of all the channels in the group."
-  
-  nchan_channel_events_channel_id [:srv, :loc, :if],
-      :nchan_set_channel_events_channel_id,
-      :loc_conf,
-      args: 1,
-      
-      group: "meta",
-      tags: ['publisher', 'subscriber', 'channel-events', 'introspection'],
-      uri: "#channel-events",
-      info: "Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'."
-  
-  nchan_stub_status [:loc],
-      :nchan_stub_status_directive,
-      :loc_conf,
-      args: 0,
-      
-      group: "meta",
-      tags: ['introspection'],
-      info: "Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc.",
-      uri: "#nchan_stub_status"
-  
-  nchan_channel_event_string [:srv, :loc, :if], 
-      :ngx_http_set_complex_value_slot,
-      [:loc_conf, :channel_event_string],
-      
-      group: "meta",
-      tags: ['publisher', 'subscriber', 'channel-events', 'introspection'],
-      value: "<string>",
-      default: "\"$nchan_channel_event $nchan_channel_id\"",
-      info: "Contents of channel event message"
-  
-  nchan_max_channel_id_length [:main, :srv, :loc],
-      :ngx_conf_set_num_slot,
-      [:loc_conf, :max_channel_id_length],
-      legacy: "push_max_channel_id_length",
-      
-      group: "security",
-      tags: ['publisher', 'subscriber', 'channel-id' ],
-      value: "<number>",
-      default: 1024,
-      info: "Maximum permissible channel id length (number of characters). This settings applies to ids before they may be split by the `nchan_channel_id_split_delimiter` Requests with a channel id that is too long will receive a `403 Forbidden` response."
-  
-  nchan_max_channel_subscribers [:main, :srv, :loc],
-      :ngx_conf_set_num_slot,
-      [:loc_conf, :max_channel_subscribers],
-      legacy: "push_max_channel_subscribers",
-      
-      group: "security",
-      tags: ['subscriber'],
-      value: "<number>",
-      default: "0 (unlimited)",
-      info: "Maximum concurrent subscribers to the channel on this Nchan server. Does not include subscribers on other Nchan instances when using a shared Redis server."
-  
-  nchan_channel_timeout [:main, :srv, :loc],
-      :ngx_conf_set_sec_slot,
-      [:loc_conf, :channel_timeout],
-      legacy: "push_channel_timeout",
-      
-      group: "development",
-      info: "Amount of time an empty channel hangs around. Don't mess with this setting unless you know what you are doing!"
-  
-  nchan_storage_engine [:main, :srv, :loc],
-      :nchan_set_storage_engine, 
-      [:loc_conf, :storage_engine],
-      
-      group: "development",
-      value: ["memory", "redis"],
-      default: "memory",
-      info: "Development directive to completely replace default storage engine. Don't use unless you are an Nchan developer."
-  
-  nchan_benchmark [:loc],
-      :nchan_benchmark_directive,
-      [:loc_conf],
-      group: "development",
-      undocumented: true,
-      args: 0
-  nchan_benchmark_time [:loc],
-      :ngx_conf_set_sec_slot,
-      [:loc_conf, "benchmark.time"],
-      group: "development",
-      undocumented: true
-  nchan_benchmark_messages_per_channel_per_minute [:loc],
-      :ngx_conf_set_num_slot,
-      [:loc_conf, "benchmark.msgs_per_minute"],
-      group: "development",
-      undocumented: true
-  nchan_benchmark_message_padding_bytes [:loc],
-      :ngx_conf_set_num_slot,
-      [:loc_conf, "benchmark.msg_padding"],
-      group: "development",
-      undocumented: true
-  nchan_benchmark_channels [:loc],
-      :ngx_conf_set_num_slot,
-      [:loc_conf, "benchmark.channels"],
-      group: "development",
-      undocumented: true
-  nchan_benchmark_subscribers_per_channel [:loc],
-      :ngx_conf_set_num_slot,
-      [:loc_conf, "benchmark.subscribers_per_channel"],
-      group: "development",
-      undocumented: true
-  nchan_benchmark_subscriber_distribution [:loc],
-      :nchan_benchmark_subscriber_distribution_directive,
-      [:loc_conf, "benchmark.subscriber_distribution"],
-      group: "development",
-      undocumented: true
-  nchan_benchmark_publisher_distribution [:loc],
-      :nchan_benchmark_publisher_distribution_directive,
-      [:loc_conf, "benchmark.publisher_distribution"],
-      group: "development",
-      undocumented: true
-
-  
-  push_min_message_buffer_length [:srv, :loc, :if],
-      :nchan_ignore_obsolete_setting,
-      :loc_conf,
-      undocumented: true,
-      group: "obsolete"
-  
-  push_subscriber_concurrency [:srv, :loc, :if],
-      :nchan_ignore_subscriber_concurrency,
-      :loc_conf,
-      undocumented: true,
-      group: "obsolete"
-  
-end
diff --git a/debian/modules/nchan/src/nchan_config_commands.c b/debian/modules/nchan/src/nchan_config_commands.c
deleted file mode 100644
index 19d2fb0..0000000
--- a/debian/modules/nchan/src/nchan_config_commands.c
+++ /dev/null
@@ -1,1302 +0,0 @@
-//AUTOGENERATED, do not edit! see nchan_commands.rb
-static ngx_conf_post_t nchan_redis_namespace__post_handler = {
-  ngx_conf_process_redis_namespace_slot
-};
-
-static ngx_command_t  nchan_commands[] = {
-    { ngx_string("nchan_channel_id"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
-    nchan_set_pubsub_channel_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_pubsub_channel_id"), //alt for nchan_channel_id
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
-    nchan_set_pubsub_channel_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_publisher_channel_id"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
-    nchan_set_pub_channel_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_pub_channel_id"), //alt for nchan_publisher_channel_id
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
-    nchan_set_pub_channel_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_publisher_upstream_request"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, publisher_upstream_request_url),
-    NULL } ,
-  { ngx_string("nchan_publisher_upstream_request"), //alt for nchan_publisher_upstream_request
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, publisher_upstream_request_url),
-    NULL } ,
-
-  { ngx_string("nchan_deflate_message_for_websocket"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_compression_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_deflate_message_for_websocket"), //alt for nchan_deflate_message_for_websocket
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_compression_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_channel_id_split_delimiter"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_id_split_delimiter),
-    NULL } ,
-  { ngx_string("nchan_channel_id_split_delimiter"), //alt for nchan_channel_id_split_delimiter
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_id_split_delimiter),
-    NULL } ,
-
-  { ngx_string("nchan_subscriber_channel_id"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
-    nchan_set_sub_channel_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_sub_channel_id"), //alt for nchan_subscriber_channel_id
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
-    nchan_set_sub_channel_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_pubsub"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6,
-    nchan_pubsub_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_pubsub_location"), //alt for nchan_pubsub
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6,
-    nchan_pubsub_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_subscriber_info"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
-    nchan_subscriber_info_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_subscriber_info"), //alt for nchan_subscriber_info
-    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
-    nchan_subscriber_info_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_subscriber_info_string"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscriber_info_string),
-    NULL } ,
-  { ngx_string("nchan_subscriber_info_string"), //alt for nchan_subscriber_info_string
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscriber_info_string),
-    NULL } ,
-
-  { ngx_string("nchan_longpoll_multipart_response"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_set_longpoll_multipart,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, longpoll_multimsg),
-    NULL } ,
-  { ngx_string("nchan_longpoll_multipart_response"), //alt for nchan_longpoll_multipart_response
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_set_longpoll_multipart,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, longpoll_multimsg),
-    NULL } ,
-
-  { ngx_string("nchan_eventsource_event"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_event),
-    NULL } ,
-  { ngx_string("nchan_eventsource_event"), //alt for nchan_eventsource_event
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_event),
-    NULL } ,
-
-  { ngx_string("nchan_eventsource_ping_comment"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot_no_newlines,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_ping.comment),
-    NULL } ,
-  { ngx_string("nchan_eventsource_ping_comment"), //alt for nchan_eventsource_ping_comment
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot_no_newlines,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_ping.comment),
-    NULL } ,
-
-  { ngx_string("nchan_eventsource_ping_event"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot_no_newlines,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_ping.event),
-    NULL } ,
-  { ngx_string("nchan_eventsource_ping_event"), //alt for nchan_eventsource_ping_event
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot_no_newlines,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_ping.event),
-    NULL } ,
-
-  { ngx_string("nchan_eventsource_ping_data"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot_no_newlines,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_ping.data),
-    NULL } ,
-  { ngx_string("nchan_eventsource_ping_data"), //alt for nchan_eventsource_ping_data
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot_no_newlines,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_ping.data),
-    NULL } ,
-
-  { ngx_string("nchan_eventsource_ping_interval"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_ping.interval),
-    NULL } ,
-  { ngx_string("nchan_eventsource_ping_interval"), //alt for nchan_eventsource_ping_interval
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, eventsource_ping.interval),
-    NULL } ,
-
-  { ngx_string("nchan_subscriber"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
-    nchan_subscriber_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("push_subscriber"), //legacy for nchan_subscriber
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
-    nchan_subscriber_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_subscriber_location"), //alt for nchan_subscriber
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
-    nchan_subscriber_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_subscriber_compound_etag_message_id"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, msg_in_etag_only),
-    NULL } ,
-  { ngx_string("nchan_subscriber_compound_etag_message_id"), //alt for nchan_subscriber_compound_etag_message_id
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, msg_in_etag_only),
-    NULL } ,
-
-  { ngx_string("nchan_subscriber_message_id_custom_etag_header"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, custom_msgtag_header),
-    NULL } ,
-  { ngx_string("nchan_subscriber_message_id_custom_etag_header"), //alt for nchan_subscriber_message_id_custom_etag_header
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, custom_msgtag_header),
-    NULL } ,
-
-  { ngx_string("nchan_subscriber_last_message_id"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
-    nchan_subscriber_last_message_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_subscriber_last_message_id"), //alt for nchan_subscriber_last_message_id
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
-    nchan_subscriber_last_message_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_subscriber_http_raw_stream_separator"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_set_raw_subscriber_separator,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscriber_http_raw_stream_separator),
-    NULL } ,
-  { ngx_string("nchan_subscriber_http_raw_stream_separator"), //alt for nchan_subscriber_http_raw_stream_separator
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_set_raw_subscriber_separator,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscriber_http_raw_stream_separator),
-    NULL } ,
-
-  { ngx_string("nchan_subscriber_first_message"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_subscriber_first_message_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_subscriber_first_message"), //alt for nchan_subscriber_first_message
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_subscriber_first_message_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_websocket_ping_interval"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, websocket_ping_interval),
-    NULL } ,
-  { ngx_string("nchan_websocket_ping_interval"), //alt for nchan_websocket_ping_interval
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, websocket_ping_interval),
-    NULL } ,
-
-  { ngx_string("nchan_websocket_client_heartbeat"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE2,
-    nchan_websocket_heartbeat_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, websocket_heartbeat),
-    NULL } ,
-  { ngx_string("nchan_websocket_client_heartbeat"), //alt for nchan_websocket_client_heartbeat
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE2,
-    nchan_websocket_heartbeat_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, websocket_heartbeat),
-    NULL } ,
-
-  { ngx_string("nchan_publisher"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
-    nchan_publisher_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("push_publisher"), //legacy for nchan_publisher
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
-    nchan_publisher_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_publisher_location"), //alt for nchan_publisher
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
-    nchan_publisher_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_subscriber_timeout"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscriber_timeout),
-    NULL } ,
-  { ngx_string("push_subscriber_timeout"), //legacy for nchan_subscriber_timeout
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscriber_timeout),
-    NULL } ,
-  { ngx_string("nchan_subscriber_timeout"), //alt for nchan_subscriber_timeout
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscriber_timeout),
-    NULL } ,
-
-  { ngx_string("nchan_authorize_request"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, authorize_request_url),
-    NULL } ,
-  { ngx_string("nchan_authorize_request"), //alt for nchan_authorize_request
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, authorize_request_url),
-    NULL } ,
-
-  { ngx_string("nchan_subscribe_request"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscribe_request_url),
-    NULL } ,
-  { ngx_string("nchan_subscribe_request"), //alt for nchan_subscribe_request
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscribe_request_url),
-    NULL } ,
-
-  { ngx_string("nchan_unsubscribe_request"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_unsubscribe_request_url,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, unsubscribe_request_url),
-    NULL } ,
-  { ngx_string("nchan_unsubscribe_request"), //alt for nchan_unsubscribe_request
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_unsubscribe_request_url,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, unsubscribe_request_url),
-    NULL } ,
-
-  { ngx_string("nchan_message_temp_path"),
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_path_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, message_temp_path),
-    NULL } ,
-  { ngx_string("nchan_message_temp_path"), //alt for nchan_message_temp_path
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_path_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, message_temp_path),
-    NULL } ,
-
-  { ngx_string("nchan_store_messages"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_store_messages_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("push_store_messages"), //legacy for nchan_store_messages
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_store_messages_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_store_messages"), //alt for nchan_store_messages
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_store_messages_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_shared_memory_size"),
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_set_size_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, shm_size),
-    NULL } ,
-  { ngx_string("push_max_reserved_memory"), //legacy for nchan_shared_memory_size
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_set_size_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, shm_size),
-    NULL } ,
-  { ngx_string("nchan_max_reserved_memory"), //legacy for nchan_shared_memory_size
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_set_size_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, shm_size),
-    NULL } ,
-  { ngx_string("nchan_shared_memory_size"), //alt for nchan_shared_memory_size
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_set_size_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, shm_size),
-    NULL } ,
-
-  { ngx_string("nchan_permessage_deflate_compression_level"),
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_deflate_compression_level_directive,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_permessage_deflate_compression_level"), //alt for nchan_permessage_deflate_compression_level
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_deflate_compression_level_directive,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_permessage_deflate_compression_strategy"),
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_deflate_compression_strategy_directive,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_permessage_deflate_compression_strategy"), //alt for nchan_permessage_deflate_compression_strategy
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_deflate_compression_strategy_directive,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_permessage_deflate_compression_window"),
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_deflate_compression_window_directive,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_permessage_deflate_compression_window"), //alt for nchan_permessage_deflate_compression_window
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_deflate_compression_window_directive,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_permessage_deflate_compression_memlevel"),
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_deflate_compression_memlevel_directive,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_permessage_deflate_compression_memlevel"), //alt for nchan_permessage_deflate_compression_memlevel
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    nchan_conf_deflate_compression_memlevel_directive,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_redis_url"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_redis_url,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.url),
-    NULL } ,
-  { ngx_string("nchan_redis_url"), //alt for nchan_redis_url
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_redis_url,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.url),
-    NULL } ,
-
-  { ngx_string("nchan_redis_pass"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_redis_upstream_pass,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis),
-    NULL } ,
-  { ngx_string("nchan_redis_pass"), //alt for nchan_redis_pass
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_redis_upstream_pass,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis),
-    NULL } ,
-
-  { ngx_string("nchan_redis_pass_inheritable"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.upstream_inheritable),
-    NULL } ,
-  { ngx_string("nchan_redis_pass_inheritable"), //alt for nchan_redis_pass_inheritable
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.upstream_inheritable),
-    NULL } ,
-
-  { ngx_string("nchan_redis_publish_msgpacked_max_size"),
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_size_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, redis_publish_message_msgkey_size),
-    NULL } ,
-  { ngx_string("nchan_redis_publish_msgpacked_max_size"), //alt for nchan_redis_publish_msgpacked_max_size
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_size_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, redis_publish_message_msgkey_size),
-    NULL } ,
-
-  { ngx_string("nchan_redis_discovered_ip_range_blacklist"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
-    ngx_conf_set_redis_ip_blacklist,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_redis_discovered_ip_range_blacklist"), //alt for nchan_redis_discovered_ip_range_blacklist
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
-    ngx_conf_set_redis_ip_blacklist,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_redis_server"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_upstream_redis_server,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_redis_server"), //alt for nchan_redis_server
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_upstream_redis_server,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_redis_storage_mode"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_redis_storage_mode_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.storage_mode),
-    NULL } ,
-  { ngx_string("nchan_redis_storage_mode"), //alt for nchan_redis_storage_mode
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_redis_storage_mode_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.storage_mode),
-    NULL } ,
-
-  { ngx_string("nchan_redis_nostore_fastpublish"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.nostore_fastpublish),
-    NULL } ,
-  { ngx_string("nchan_redis_nostore_fastpublish"), //alt for nchan_redis_nostore_fastpublish
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.nostore_fastpublish),
-    NULL } ,
-
-  { ngx_string("nchan_redis_username"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.username),
-    NULL } ,
-  { ngx_string("nchan_redis_username"), //alt for nchan_redis_username
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.username),
-    NULL } ,
-
-  { ngx_string("nchan_redis_password"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.password),
-    NULL } ,
-  { ngx_string("nchan_redis_password"), //alt for nchan_redis_password
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.password),
-    NULL } ,
-
-  { ngx_string("nchan_redis_ssl"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.enabled),
-    NULL } ,
-  { ngx_string("nchan_redis_tls"), //alt for nchan_redis_ssl
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.enabled),
-    NULL } ,
-
-  { ngx_string("nchan_redis_ssl_client_certificate"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.client_certificate),
-    NULL } ,
-  { ngx_string("nchan_redis_tls_client_certificate"), //alt for nchan_redis_ssl_client_certificate
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.client_certificate),
-    NULL } ,
-
-  { ngx_string("nchan_redis_ssl_client_certificate_key"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.client_certificate_key),
-    NULL } ,
-  { ngx_string("nchan_redis_tls_client_certificate"), //alt for nchan_redis_ssl_client_certificate_key
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.client_certificate_key),
-    NULL } ,
-
-  { ngx_string("nchan_redis_ssl_server_name"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.server_name),
-    NULL } ,
-  { ngx_string("nchan_redis_tls_server_name"), //alt for nchan_redis_ssl_server_name
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.server_name),
-    NULL } ,
-
-  { ngx_string("nchan_redis_ssl_trusted_certificate"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate),
-    NULL } ,
-  { ngx_string("nchan_redis_tls_trusted_certificate"), //alt for nchan_redis_ssl_trusted_certificate
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate),
-    NULL } ,
-
-  { ngx_string("nchan_redis_ssl_trusted_certificate_path"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate_path),
-    NULL } ,
-  { ngx_string("nchan_redis_tls_trusted_certificate_path"), //alt for nchan_redis_ssl_trusted_certificate_path
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate_path),
-    NULL } ,
-
-  { ngx_string("nchan_redis_ssl_ciphers"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
-    NULL } ,
-  { ngx_string("nchan_redis_tls_ciphers"), //alt for nchan_redis_ssl_ciphers
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
-    NULL } ,
-
-  { ngx_string("nchan_redis_ssl_verify_certificate"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
-    NULL } ,
-  { ngx_string("nchan_redis_tls_verify_certificate"), //alt for nchan_redis_ssl_verify_certificate
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
-    NULL } ,
-
-  { ngx_string("nchan_use_redis"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_enable_redis,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.url_enabled),
-    NULL } ,
-  { ngx_string("nchan_use_redis"), //alt for nchan_use_redis
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_enable_redis,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.url_enabled),
-    NULL } ,
-
-  { ngx_string("nchan_redis_ping_interval"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.ping_interval),
-    NULL } ,
-  { ngx_string("nchan_redis_ping_interval"), //alt for nchan_redis_ping_interval
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.ping_interval),
-    NULL } ,
-
-  { ngx_string("nchan_redis_cluster_check_interval"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.cluster_check_interval),
-    NULL } ,
-  { ngx_string("nchan_redis_cluster_check_interval"), //alt for nchan_redis_cluster_check_interval
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.cluster_check_interval),
-    NULL } ,
-
-  { ngx_string("nchan_redis_wait_after_connecting"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_ignore_obsolete_setting,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_redis_wait_after_connecting"), //alt for nchan_redis_wait_after_connecting
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_ignore_obsolete_setting,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_redis_connect_timeout"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_msec_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.connect_timeout),
-    NULL } ,
-  { ngx_string("nchan_redis_connect_timeout"), //alt for nchan_redis_connect_timeout
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_msec_slot,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    offsetof(nchan_srv_conf_t, redis.connect_timeout),
-    NULL } ,
-
-  { ngx_string("nchan_redis_subscribe_weights"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
-    ngx_conf_set_redis_subscribe_weights,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_redis_subscribe_weights"), //alt for nchan_redis_subscribe_weights
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
-    ngx_conf_set_redis_subscribe_weights,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_redis_optimize_target"),
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_redis_optimize_target,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_redis_optimize_target"), //alt for nchan_redis_optimize_target
-    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_redis_optimize_target,
-    NGX_HTTP_SRV_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_redis_namespace"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.namespace),
-    &nchan_redis_namespace__post_handler } ,
-  { ngx_string("nchan_redis_namespace"), //alt for nchan_redis_namespace
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_str_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis.namespace),
-    &nchan_redis_namespace__post_handler } ,
-
-  { ngx_string("nchan_redis_fakesub_timer_interval"),
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_msec_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, redis_fakesub_timer_interval),
-    NULL } ,
-  { ngx_string("nchan_redis_fakesub_timer_interval"), //alt for nchan_redis_fakesub_timer_interval
-    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_msec_slot,
-    NGX_HTTP_MAIN_CONF_OFFSET,
-    offsetof(nchan_main_conf_t, redis_fakesub_timer_interval),
-    NULL } ,
-
-  { ngx_string("nchan_redis_idle_channel_cache_timeout"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis_idle_channel_cache_timeout),
-    NULL } ,
-  { ngx_string("nchan_redis_idle_channel_cache_timeout"), //alt for nchan_redis_idle_channel_cache_timeout
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, redis_idle_channel_cache_timeout),
-    NULL } ,
-
-  { ngx_string("nchan_message_timeout"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_timeout,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, message_timeout),
-    NULL } ,
-  { ngx_string("push_message_timeout"), //legacy for nchan_message_timeout
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_timeout,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, message_timeout),
-    NULL } ,
-  { ngx_string("nchan_message_timeout"), //alt for nchan_message_timeout
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_timeout,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, message_timeout),
-    NULL } ,
-
-  { ngx_string("nchan_message_buffer_length"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_buffer_length,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_messages),
-    NULL } ,
-  { ngx_string("push_max_message_buffer_length"), //legacy for nchan_message_buffer_length
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_buffer_length,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_messages),
-    NULL } ,
-  { ngx_string("push_message_buffer_length"), //legacy for nchan_message_buffer_length
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_buffer_length,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_messages),
-    NULL } ,
-  { ngx_string("nchan_message_max_buffer_length"), //alt for nchan_message_buffer_length
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_buffer_length,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_messages),
-    NULL } ,
-
-  { ngx_string("nchan_subscribe_existing_channels_only"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscribe_only_existing_channel),
-    NULL } ,
-  { ngx_string("push_authorized_channels_only"), //legacy for nchan_subscribe_existing_channels_only
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscribe_only_existing_channel),
-    NULL } ,
-  { ngx_string("nchan_subscribe_existing_channels_only"), //alt for nchan_subscribe_existing_channels_only
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, subscribe_only_existing_channel),
-    NULL } ,
-
-  { ngx_string("nchan_access_control_allow_origin"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, allow_origin),
-    NULL } ,
-  { ngx_string("nchan_access_control_allow_origin"), //alt for nchan_access_control_allow_origin
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, allow_origin),
-    NULL } ,
-
-  { ngx_string("nchan_access_control_allow_credentials"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, allow_credentials),
-    NULL } ,
-  { ngx_string("nchan_access_control_allow_credentials"), //alt for nchan_access_control_allow_credentials
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, allow_credentials),
-    NULL } ,
-
-  { ngx_string("nchan_channel_group"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_group),
-    NULL } ,
-  { ngx_string("push_channel_group"), //legacy for nchan_channel_group
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_group),
-    NULL } ,
-  { ngx_string("nchan_channel_group"), //alt for nchan_channel_group
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_group),
-    NULL } ,
-
-  { ngx_string("nchan_channel_group_accounting"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.enable_accounting),
-    NULL } ,
-  { ngx_string("nchan_channel_group_accounting"), //alt for nchan_channel_group_accounting
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_flag_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.enable_accounting),
-    NULL } ,
-
-  { ngx_string("nchan_group_location"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3,
-    nchan_group_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_group_location"), //alt for nchan_group_location
-    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3,
-    nchan_group_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_group_max_channels"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_channels),
-    NULL } ,
-  { ngx_string("nchan_group_max_channels"), //alt for nchan_group_max_channels
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_channels),
-    NULL } ,
-
-  { ngx_string("nchan_group_max_messages"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_messages),
-    NULL } ,
-  { ngx_string("nchan_group_max_messages"), //alt for nchan_group_max_messages
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_messages),
-    NULL } ,
-
-  { ngx_string("nchan_group_max_messages_memory"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_messages_shm_bytes),
-    NULL } ,
-  { ngx_string("nchan_group_max_messages_memory"), //alt for nchan_group_max_messages_memory
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_messages_shm_bytes),
-    NULL } ,
-
-  { ngx_string("nchan_group_max_messages_disk"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_messages_file_bytes),
-    NULL } ,
-  { ngx_string("nchan_group_max_messages_disk"), //alt for nchan_group_max_messages_disk
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_messages_file_bytes),
-    NULL } ,
-
-  { ngx_string("nchan_group_max_subscribers"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_subscribers),
-    NULL } ,
-  { ngx_string("nchan_group_max_subscribers"), //alt for nchan_group_max_subscribers
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, group.max_subscribers),
-    NULL } ,
-
-  { ngx_string("nchan_channel_events_channel_id"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_set_channel_events_channel_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_channel_events_channel_id"), //alt for nchan_channel_events_channel_id
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_set_channel_events_channel_id,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_stub_status"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
-    nchan_stub_status_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_stub_status"), //alt for nchan_stub_status
-    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
-    nchan_stub_status_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_channel_event_string"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_event_string),
-    NULL } ,
-  { ngx_string("nchan_channel_event_string"), //alt for nchan_channel_event_string
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    ngx_http_set_complex_value_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_event_string),
-    NULL } ,
-
-  { ngx_string("nchan_max_channel_id_length"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_channel_id_length),
-    NULL } ,
-  { ngx_string("push_max_channel_id_length"), //legacy for nchan_max_channel_id_length
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_channel_id_length),
-    NULL } ,
-  { ngx_string("nchan_max_channel_id_length"), //alt for nchan_max_channel_id_length
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_channel_id_length),
-    NULL } ,
-
-  { ngx_string("nchan_max_channel_subscribers"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_channel_subscribers),
-    NULL } ,
-  { ngx_string("push_max_channel_subscribers"), //legacy for nchan_max_channel_subscribers
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_channel_subscribers),
-    NULL } ,
-  { ngx_string("nchan_max_channel_subscribers"), //alt for nchan_max_channel_subscribers
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, max_channel_subscribers),
-    NULL } ,
-
-  { ngx_string("nchan_channel_timeout"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_timeout),
-    NULL } ,
-  { ngx_string("push_channel_timeout"), //legacy for nchan_channel_timeout
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_timeout),
-    NULL } ,
-  { ngx_string("nchan_channel_timeout"), //alt for nchan_channel_timeout
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, channel_timeout),
-    NULL } ,
-
-  { ngx_string("nchan_storage_engine"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_storage_engine,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, storage_engine),
-    NULL } ,
-  { ngx_string("nchan_storage_engine"), //alt for nchan_storage_engine
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_storage_engine,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, storage_engine),
-    NULL } ,
-
-  { ngx_string("nchan_benchmark"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
-    nchan_benchmark_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("nchan_benchmark"), //alt for nchan_benchmark
-    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
-    nchan_benchmark_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("nchan_benchmark_time"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.time),
-    NULL } ,
-  { ngx_string("nchan_benchmark_time"), //alt for nchan_benchmark_time
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_sec_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.time),
-    NULL } ,
-
-  { ngx_string("nchan_benchmark_messages_per_channel_per_minute"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.msgs_per_minute),
-    NULL } ,
-  { ngx_string("nchan_benchmark_messages_per_channel_per_minute"), //alt for nchan_benchmark_messages_per_channel_per_minute
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.msgs_per_minute),
-    NULL } ,
-
-  { ngx_string("nchan_benchmark_message_padding_bytes"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.msg_padding),
-    NULL } ,
-  { ngx_string("nchan_benchmark_message_padding_bytes"), //alt for nchan_benchmark_message_padding_bytes
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.msg_padding),
-    NULL } ,
-
-  { ngx_string("nchan_benchmark_channels"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.channels),
-    NULL } ,
-  { ngx_string("nchan_benchmark_channels"), //alt for nchan_benchmark_channels
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.channels),
-    NULL } ,
-
-  { ngx_string("nchan_benchmark_subscribers_per_channel"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.subscribers_per_channel),
-    NULL } ,
-  { ngx_string("nchan_benchmark_subscribers_per_channel"), //alt for nchan_benchmark_subscribers_per_channel
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    ngx_conf_set_num_slot,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.subscribers_per_channel),
-    NULL } ,
-
-  { ngx_string("nchan_benchmark_subscriber_distribution"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_benchmark_subscriber_distribution_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.subscriber_distribution),
-    NULL } ,
-  { ngx_string("nchan_benchmark_subscriber_distribution"), //alt for nchan_benchmark_subscriber_distribution
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_benchmark_subscriber_distribution_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.subscriber_distribution),
-    NULL } ,
-
-  { ngx_string("nchan_benchmark_publisher_distribution"),
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_benchmark_publisher_distribution_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.publisher_distribution),
-    NULL } ,
-  { ngx_string("nchan_benchmark_publisher_distribution"), //alt for nchan_benchmark_publisher_distribution
-    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_benchmark_publisher_distribution_directive,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    offsetof(nchan_loc_conf_t, benchmark.publisher_distribution),
-    NULL } ,
-
-  { ngx_string("push_min_message_buffer_length"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_ignore_obsolete_setting,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("push_min_message_buffer_length"), //alt for push_min_message_buffer_length
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_ignore_obsolete_setting,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-  { ngx_string("push_subscriber_concurrency"),
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_ignore_subscriber_concurrency,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("push_subscriber_concurrency"), //alt for push_subscriber_concurrency
-    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-    nchan_ignore_subscriber_concurrency,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
-
-  ngx_null_command
-};
diff --git a/debian/modules/nchan/src/nchan_defs.c b/debian/modules/nchan/src/nchan_defs.c
deleted file mode 100644
index 8dbd49c..0000000
--- a/debian/modules/nchan/src/nchan_defs.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include <ngx_http.h>
-#include "nchan_defs.h"
-
-//string constants
-//headers
-const  ngx_str_t NCHAN_HEADER_ETAG = ngx_string("Etag");
-const  ngx_str_t NCHAN_HEADER_IF_NONE_MATCH = ngx_string("If-None-Match");
-const  ngx_str_t NCHAN_HEADER_VARY = ngx_string("Vary");
-const  ngx_str_t NCHAN_HEADER_ALLOW = ngx_string("Allow");
-const  ngx_str_t NCHAN_HEADER_CACHE_CONTROL = ngx_string("Cache-Control");
-const  ngx_str_t NCHAN_HEADER_PRAGMA = ngx_string("Pragma");
-const  ngx_str_t NCHAN_HEADER_ORIGIN = ngx_string("Origin");
-
-const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS = ngx_string("Access-Control-Allow-Headers");
-const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS = ngx_string("Access-Control-Allow-Methods");
-const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN = ngx_string("Access-Control-Allow-Origin");
-const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS = ngx_string("Access-Control-Expose-Headers");
-const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS = ngx_string("Access-Control-Allow-Credentials");
-
-const  ngx_str_t NCHAN_HEADER_EVENTSOURCE_EVENT = ngx_string("X-EventSource-Event");
-
-//websocket headers
-
-const ngx_str_t NCHAN_HEADER_CONNECTION = ngx_string("Connection");
-const ngx_str_t NCHAN_HEADER_UPGRADE = ngx_string("Upgrade");
-const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_KEY = ngx_string("Sec-WebSocket-Key");
-const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT = ngx_string("Sec-WebSocket-Accept");
-const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_VERSION = ngx_string("Sec-WebSocket-Version");
-const ngx_str_t NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL = ngx_string("Sec-WebSocket-Protocol");
-const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS = ngx_string("Sec-WebSocket-Extensions");
-
-//and some wobsockety values
-const ngx_str_t NCHAN_UPGRADE = ngx_string("Upgrade");
-const ngx_str_t NCHAN_WEBSOCKET = ngx_string("websocket");
-
-
-//header values
-const  ngx_str_t NCHAN_CACHE_CONTROL_VALUE = ngx_string("no-cache");
-
-//status strings
-const  ngx_str_t NCHAN_HTTP_STATUS_101 = ngx_string("101 Switching Protocols");
-const  ngx_str_t NCHAN_HTTP_STATUS_204 = ngx_string("204 No Content");
-const  ngx_str_t NCHAN_HTTP_STATUS_304 = ngx_string("304 Not Modified");
-const  ngx_str_t NCHAN_HTTP_STATUS_400 = ngx_string("400 Bad Request");
-const  ngx_str_t NCHAN_HTTP_STATUS_408 = ngx_string("408 Request Timeout");
-const  ngx_str_t NCHAN_HTTP_STATUS_409 = ngx_string("409 Conflict");
-const  ngx_str_t NCHAN_HTTP_STATUS_410 = ngx_string("410 Gone");
-
-//other stuff
-const  ngx_str_t NCHAN_SUBSCRIBER_TIMEOUT= ngx_string("Subscriber Timeout");
-const  ngx_str_t NCHAN_ANYSTRING= ngx_string("*");
-const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_GROUP_HEADERS = ngx_string("Accept, Content-Type");
-const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS = ngx_string("Content-Type");
-const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS = ngx_string("If-None-Match, If-Modified-Since, Content-Type, Cache-Control, X-EventSource-Event");
-const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBSUB_HEADERS = ngx_string("If-None-Match, If-Modified-Since, Content-Type, Cache-Control, X-EventSource-Event");
-const  ngx_str_t NCHAN_ALLOW_GET_POST_PUT_DELETE= ngx_string("GET, POST, PUT, DELETE");
-const  ngx_str_t NCHAN_ALLOW_GET= ngx_string("GET");
-const  ngx_str_t NCHAN_ALLOW_GET_POST_DELETE= ngx_string("GET, POST, DELETE");
-
-
-const  ngx_str_t NCHAN_VARY_HEADER_VALUE = ngx_string("If-None-Match, If-Modified-Since");
-const  ngx_str_t NCHAN_MSG_RESPONSE_ALLOWED_HEADERS = ngx_string("Last-Modified, Etag, Content-Type");
-const  char *NCHAN_MSG_RESPONSE_ALLOWED_CUSTOM_ETAG_HEADERS_STRF = "Last-Modified, %V, Content-Type";
-
-const ngx_str_t  NCHAN_CONTENT_TYPE_TEXT_PLAIN = ngx_string("text/plain");
-
-const ngx_str_t NCHAN_CHANNEL_INFO_PLAIN = ngx_string(
-  "queued messages: %ui" CRLF
-  "last requested: %d sec. ago" CRLF
-  "active subscribers: %ui" CRLF
-  "last message id: %V" 
-  "\0");
-
-const ngx_str_t NCHAN_CHANNEL_INFO_JSON = ngx_string(
-  "{\"messages\": %ui, "
-  "\"requested\": %d, "
-  "\"subscribers\": %ui, "
-  "\"last_message_id\": \"%V\" }"
-  "\0");
-
-const ngx_str_t NCHAN_CHANNEL_INFO_XML = ngx_string(
-  "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" CRLF
-  "<channel>" CRLF
-  "  <messages>%ui</messages>" CRLF
-  "  <requested>%d</requested>" CRLF
-  "  <subscribers>%ui</subscribers>" CRLF
-  "  <last_message_id>%V</last_message_id>" CRLF
-  "</channel>"
-  "\0");
-
-const ngx_str_t NCHAN_CHANNEL_INFO_YAML = ngx_string(
-  "---" CRLF
-  "messages: %ui" CRLF
-  "requested: %d" CRLF
-  "subscribers: %ui" CRLF
-  "last_message_id: \"%V\"" CRLF
-  CRLF
-  "\0");
diff --git a/debian/modules/nchan/src/nchan_defs.h b/debian/modules/nchan/src/nchan_defs.h
deleted file mode 100644
index 0110c80..0000000
--- a/debian/modules/nchan/src/nchan_defs.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef NCHAN_DEFS_H
-#define NCHAN_DEFS_H
-
-#define NCHAN_DEFAULT_SHM_SIZE 134217728 //128 megs
-#define NCHAN_DEFAULT_MESSAGE_TIMEOUT 3600
-#define NCHAN_DEFAULT_REDIS_IDLE_CHANNEL_CACHE_TIMEOUT 30
-#define NCHAN_DEFAULT_SUBSCRIBER_TIMEOUT 0  //default: never timeout
-#define NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC 600
-//(liucougar: this is a bit confusing, but it is what's the default behavior before this option is introducecd)
-#define NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL 0
-
-#define NCHAN_DEFAULT_CHANNEL_TIMEOUT 5 //default: timeout in 5 seconds
-
-#define NCHAN_DEFAULT_MIN_MESSAGES 1
-#define NCHAN_DEFAULT_MAX_MESSAGES 10
-
-#define NCHAN_SUBSCRIBER_DEFAULT_FIRST_MESSAGE 1
-#define NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET 4096
-
-#define NCHAN_MAX_CHANNEL_ID_LENGTH 1024 //bytes
-
-#define NCHAN_META_CHANNEL_MAX_MESSAGES 100
-#define NCHAN_META_CHANNEL_MESSAGE_TTL 10
-#define NCHAN_META_CHANNEL_TIMEOUT 30
-
-#ifndef NGX_HTTP_REQUEST_TIMEOUT
-#define NGX_HTTP_REQUEST_TIMEOUT 408
-#endif
-
-#ifndef NGX_HTTP_CONFLICT
-#define NGX_HTTP_CONFLICT 409
-#endif
-
-#ifndef NGX_HTTP_SWITCHING_PROTOCOLS
-#define NGX_HTTP_SWITCHING_PROTOCOLS       101
-#endif
-
-#ifndef NGX_HTTP_GONE
-#define NGX_HTTP_GONE 410
-#endif
-
-#ifndef NGX_HTTP_CREATED
-#define NGX_HTTP_CREATED 201
-#endif
-
-#ifndef NGX_HTTP_ACCEPTED
-#define NGX_HTTP_ACCEPTED 202
-#endif
-
-#define NCHAN_MESSAGE_RECEIVED  9000
-#define NCHAN_MESSAGE_QUEUED    9001
-
-#define NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST 1337
-
-#define NCHAN_SUBSCRIBER_INFO_CHANNEL_ID_BUFFER_SIZE 64
-
-extern const ngx_str_t NCHAN_HEADER_ETAG;
-extern const ngx_str_t NCHAN_HEADER_IF_NONE_MATCH;
-extern const ngx_str_t NCHAN_HEADER_VARY;
-extern const ngx_str_t NCHAN_HEADER_ALLOW;
-extern const ngx_str_t NCHAN_HEADER_CACHE_CONTROL;
-extern const ngx_str_t NCHAN_HEADER_PRAGMA;
-extern const ngx_str_t NCHAN_HEADER_ORIGIN;
-
-extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS;
-extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS;
-extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN;
-extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS;
-extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS;
-
-extern const ngx_str_t NCHAN_HEADER_EVENTSOURCE_EVENT;
-
-extern const ngx_str_t NCHAN_HEADER_CONNECTION;
-extern const ngx_str_t NCHAN_HEADER_UPGRADE;
-extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_KEY;
-extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT;
-extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_VERSION;
-extern const ngx_str_t NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL;
-extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS;
-
-//header values
-extern const  ngx_str_t NCHAN_CACHE_CONTROL_VALUE;
-
-//status strings
-extern const  ngx_str_t NCHAN_HTTP_STATUS_101;
-extern const  ngx_str_t NCHAN_HTTP_STATUS_204;
-extern const  ngx_str_t NCHAN_HTTP_STATUS_304;
-extern const  ngx_str_t NCHAN_HTTP_STATUS_400;
-extern const  ngx_str_t NCHAN_HTTP_STATUS_408;
-extern const  ngx_str_t NCHAN_HTTP_STATUS_409;
-extern const  ngx_str_t NCHAN_HTTP_STATUS_410;
-
-//other stuff
-
-extern const ngx_str_t NCHAN_UPGRADE;
-extern const ngx_str_t NCHAN_SUBSCRIBER_TIMEOUT;
-extern const ngx_str_t NCHAN_WEBSOCKET;
-extern const ngx_str_t NCHAN_ANYSTRING;
-extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS;
-extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS;
-extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBSUB_HEADERS;
-extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_GROUP_HEADERS;
-extern const ngx_str_t NCHAN_ALLOW_GET_POST_PUT_DELETE;
-extern const ngx_str_t NCHAN_ALLOW_GET_POST_DELETE;
-extern const ngx_str_t NCHAN_ALLOW_GET;
-extern const ngx_str_t NCHAN_VARY_HEADER_VALUE;
-extern const ngx_str_t NCHAN_MSG_RESPONSE_ALLOWED_HEADERS;
-extern const char *NCHAN_MSG_RESPONSE_ALLOWED_CUSTOM_ETAG_HEADERS_STRF;
-extern const ngx_str_t NCHAN_CONTENT_TYPE_TEXT_PLAIN;
-extern const ngx_str_t NCHAN_CHANNEL_INFO_PLAIN;
-extern const ngx_str_t NCHAN_CHANNEL_INFO_JSON;
-extern const ngx_str_t NCHAN_CHANNEL_INFO_XML;
-extern const ngx_str_t NCHAN_CHANNEL_INFO_YAML;
-
-#define NCHAN_REDIS_DEFAULT_URL "redis://127.0.0.1:6379"
-
-#endif /* NCHAN_DEFS_H */
diff --git a/debian/modules/nchan/src/nchan_module.c b/debian/modules/nchan/src/nchan_module.c
deleted file mode 100644
index f60e396..0000000
--- a/debian/modules/nchan/src/nchan_module.c
+++ /dev/null
@@ -1,1265 +0,0 @@
-/*
- *  Written by Leo Ponomarev 2009-2015
- */
-
-#include <nchan_module.h>
-#include <util/nchan_subrequest.h>
-#include <assert.h>
-
-#include <subscribers/longpoll.h>
-#include <subscribers/intervalpoll.h>
-#include <subscribers/eventsource.h>
-#include <subscribers/http-chunked.h>
-#include <subscribers/http-multipart-mixed.h>
-#include <subscribers/http-raw-stream.h>
-#include <subscribers/websocket.h>
-#include <subscribers/benchmark.h>
-#include <store/memory/store.h>
-#include <store/redis/store.h>
-
-#include <nchan_setup.c>
-
-#if (NGX_ZLIB)
-#include <zlib.h>
-#endif
-
-
-#if FAKESHARD
-#include <store/memory/ipc.h>
-#include <store/memory/shmem.h>
-//#include <store/memory/store-private.h> //for debugging
-#endif
-#include <util/nchan_output.h>
-#include <nchan_websocket_publisher.h>
-
-ngx_int_t           nchan_worker_processes;
-int                 nchan_stub_status_enabled = 0;
-
-
-static void nchan_publisher_body_handler(ngx_http_request_t *r);
-static void nchan_publisher_unavailable_body_handler(ngx_http_request_t *r);
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-//#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-//#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "NCHAN:" fmt, ##args)
-
-typedef struct {
-  ngx_http_request_t    *r;
-  ngx_http_cleanup_t    *cln;
-} safe_request_ptr_t;
-static safe_request_ptr_t *nchan_set_safe_request_ptr(ngx_http_request_t *r);
-static ngx_http_request_t *nchan_get_safe_request_ptr(safe_request_ptr_t *pd);
-
-ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *r, channel_event_type_t event_type) {
-  static nchan_loc_conf_t            evcf_data;
-  static nchan_loc_conf_t           *evcf = NULL;
-  
-  static ngx_str_t group =           ngx_string("meta");
-  
-  static ngx_str_t evt_sub_enqueue = ngx_string("subscriber_enqueue");
-  static ngx_str_t evt_sub_dequeue = ngx_string("subscriber_dequeue");
-  static ngx_str_t evt_sub_recvmsg = ngx_string("subscriber_receive_message");
-  static ngx_str_t evt_sub_recvsts = ngx_string("subscriber_receive_status");
-  static ngx_str_t evt_chan_publish= ngx_string("channel_publish");
-  static ngx_str_t evt_chan_delete = ngx_string("channel_delete");
-
-  nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  ngx_http_complex_value_t  *cv = cf->channel_events_channel_id;
-  if(cv==NULL) {
-    //nothing to send
-    return NGX_OK;
-  }
-  
-  nchan_request_ctx_t       *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  ngx_str_t                  tmpid;
-  size_t                     sz;
-  ngx_str_t                 *id;
-  u_char                    *cur;
-  ngx_str_t                  evstr;
-  nchan_msg_t                msg;
-  
-  switch(event_type) {
-    case SUB_ENQUEUE:
-      ctx->channel_event_name = &evt_sub_enqueue;
-      break;
-    case SUB_DEQUEUE:
-      ctx->channel_event_name = &evt_sub_dequeue;
-      break;
-    case SUB_RECEIVE_MESSAGE:
-      ctx->channel_event_name = &evt_sub_recvmsg;
-      break;
-    case SUB_RECEIVE_STATUS:
-      ctx->channel_event_name = &evt_sub_recvsts;
-      break;
-    case CHAN_PUBLISH:
-      ctx->channel_event_name = &evt_chan_publish;
-      break;
-    case CHAN_DELETE:
-      ctx->channel_event_name = &evt_chan_delete;
-      break;
-  }
-  
-  //the id
-  ngx_http_complex_value(r, cv, &tmpid); 
-  sz = group.len + 1 + tmpid.len;
-  if((id = ngx_palloc(r->pool, sizeof(*id) + sz)) == NULL) {
-    nchan_log_request_error(r, "can't allocate space for legacy channel id");
-    return NGX_ERROR;
-  }
-  id->len = sz;
-  id->data = (u_char *)&id[1];
-  cur = id->data;  
-  ngx_memcpy(cur, group.data, group.len);
-  cur += group.len;
-  cur[0]='/';
-  cur++;
-  ngx_memcpy(cur, tmpid.data, tmpid.len);
-  
-  
-  //the event message
-  ngx_http_complex_value(r, cf->channel_event_string, &evstr);
-  
-  ngx_memzero(&msg, sizeof(msg));
-  
-  msg.buf.temporary = 1;
-  msg.buf.memory = 1;
-  msg.buf.last_buf = 1;
-  msg.buf.pos = evstr.data;
-  msg.buf.last = evstr.data + evstr.len;
-  msg.buf.start = msg.buf.pos;
-  msg.buf.end = msg.buf.last;
-  
-  msg.id.time = 0;
-  msg.id.tag.fixed[0] = 0;
-  msg.id.tagactive = 0;
-  msg.id.tagcount = 1;
-  msg.storage = NCHAN_MSG_STACK;
-  
-  if(evcf == NULL) {
-    evcf = &evcf_data;
-    ngx_memzero(evcf, sizeof(*evcf));
-
-    evcf->message_timeout = NCHAN_META_CHANNEL_MESSAGE_TTL;
-    evcf->max_messages = NCHAN_META_CHANNEL_MAX_MESSAGES;
-    evcf->complex_max_messages = NULL;
-    evcf->complex_message_timeout = NULL;
-    evcf->subscriber_first_message = 0;
-    evcf->channel_timeout = NCHAN_META_CHANNEL_TIMEOUT;
-  }
-  evcf->storage_engine = cf->storage_engine;
-  evcf->redis = cf->redis;
-  
-  evcf->storage_engine->publish(id, &msg, evcf, NULL, NULL);
-  
-  return NGX_OK;
-}
-
-#if FAKESHARD 
-static void memstore_sub_debug_start() {
-  #ifdef SUB_FAKE_WORKER
-  memstore_fakeprocess_push(SUB_FAKE_WORKER);
-  #else
-  memstore_fakeprocess_push_random();
-  #endif
-}
-static void memstore_sub_debug_end() {
-  memstore_fakeprocess_pop();
-}
-static void memstore_pub_debug_start() {
-  #ifdef PUB_FAKE_WORKER
-  memstore_fakeprocess_push(PUB_FAKE_WORKER);
-  #else
-  memstore_fakeprocess_push_random();
-  #endif
-}
-static void memstore_pub_debug_end() {
-  memstore_fakeprocess_pop();
-}
-#endif
-
-time_t nchan_loc_conf_message_timeout(nchan_loc_conf_t *cf) {
-  time_t                        timeout;
-  nchan_loc_conf_shared_data_t *shcf;
-  
-  if(!cf->complex_message_timeout) {
-    timeout = cf->message_timeout;
-  }
-  else {
-    shcf = memstore_get_conf_shared_data(cf);
-    timeout = shcf->message_timeout;
-  }
-  
-  return timeout != 0 ? timeout : 525600 * 60;
-}
-
-ngx_int_t nchan_loc_conf_max_messages(nchan_loc_conf_t *cf) {  
-  ngx_int_t                     num;
-  nchan_loc_conf_shared_data_t *shcf;
-  
-  if(!cf->complex_max_messages) {
-    num = cf->max_messages;
-  }
-  else {
-    shcf = memstore_get_conf_shared_data(cf);
-    num = shcf->max_messages;
-  }
-  
-  return num;
-}
-
-static ngx_int_t nchan_http_publisher_handler(ngx_http_request_t * r, void (*body_handler)(ngx_http_request_t *r)) {
-  ngx_int_t                       rc;
-  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
-  static ngx_str_t                publisher_name = ngx_string("http");
-  
-  if(ctx) ctx->publisher_type = &publisher_name;
-  
-  /* Instruct ngx_http_read_client_request_body to store the request
-     body entirely in a memory buffer or in a file */
-  r->request_body_in_single_buf = 1;
-  r->request_body_in_persistent_file = 1;
-  r->request_body_in_clean_file = 0;
-  r->request_body_file_log_level = 0;
-  
-  //don't buffer the request body --send it right on through
-  //r->request_body_no_buffering = 1;
-
-  rc = ngx_http_read_client_request_body(r, body_handler);
-  if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-    return rc;
-  }
-  return NGX_DONE;
-}
-
-ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r) {
-  ngx_buf_t           *b;
-  ngx_chain_t          out;
-  nchan_stub_status_t *stats;
-  
-  nchan_main_conf_t   *mcf = ngx_http_get_module_main_conf(r, ngx_nchan_module);
-  
-  float                shmem_used, shmem_max;
-  
-  char     *buf_fmt = "total published messages: %ui\n"
-                      "stored messages: %ui\n"
-                      "shared memory used: %fK\n"
-                      "shared memory limit: %fK\n"
-                      "channels: %ui\n"
-                      "subscribers: %ui\n"
-                      "redis pending commands: %ui\n"
-                      "redis connected servers: %ui\n"
-                      "total interprocess alerts received: %ui\n"
-                      "interprocess alerts in transit: %ui\n"
-                      "interprocess queued alerts: %ui\n"
-                      "total interprocess send delay: %ui\n"
-                      "total interprocess receive delay: %ui\n"
-                      "nchan version: %s\n";
-  
-  if ((b = ngx_pcalloc(r->pool, sizeof(*b) + 800)) == NULL) {
-    nchan_log_request_error(r, "Failed to allocate response buffer for nchan_stub_status.");
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  
-  shmem_used = (float )((float )nchan_get_used_shmem() / 1024.0);
-  shmem_max = (float )((float )mcf->shm_size / 1024.0);
-  
-  stats = nchan_get_stub_status_stats();
-  
-  b->start = (u_char *)&b[1];
-  b->pos = b->start;
-  
-  b->end = ngx_snprintf(b->start, 800, buf_fmt, stats->total_published_messages, stats->messages, shmem_used, shmem_max, stats->channels, stats->subscribers, stats->redis_pending_commands, stats->redis_connected_servers, stats->ipc_total_alerts_received, stats->ipc_total_alerts_sent - stats->ipc_total_alerts_received, stats->ipc_queue_size, stats->ipc_total_send_delay, stats->ipc_total_receive_delay, NCHAN_VERSION);
-  b->last = b->end;
-
-  b->memory = 1;
-  b->last_buf = 1;
-  
-  r->headers_out.status = NGX_HTTP_OK;
-  r->headers_out.content_type.len = sizeof("text/plain") - 1;
-  r->headers_out.content_type.data = (u_char *) "text/plain";
-  
-  r->headers_out.content_length_n = b->end - b->start;
-  ngx_http_send_header(r);
-  
-  out.buf = b;
-  out.next = NULL;
-  
-  return ngx_http_output_filter(r, &out);
-}
-
-int nchan_parse_message_buffer_config(ngx_http_request_t *r, nchan_loc_conf_t *cf, char **err) {
-  ngx_str_t                      val;
-  nchan_loc_conf_shared_data_t  *shcf;
-  
-  if(!cf->complex_message_timeout && !cf->complex_max_messages) {
-    return 1;
-  }
-  
-  if(cf->complex_message_timeout) {
-    time_t    timeout;
-    if(ngx_http_complex_value(r, cf->complex_message_timeout, &val) != NGX_OK) {
-      nchan_log_request_error(r, "cannot evaluate nchan_message_timeout value");
-      *err = NULL;
-      return 0;
-    }
-    if(val.len == 0) {
-      *err = "missing nchan_message_timeout value";
-      nchan_log_request_error(r, "%s", *err);
-      return 0;
-    }
-    
-    if((timeout = ngx_parse_time(&val, 1)) == (time_t )NGX_ERROR) {
-      *err = "invalid nchan_message_timeout value";
-      nchan_log_request_error(r, "%s '%V'", *err, &val);
-      return 0;
-    }
-    
-    shcf = memstore_get_conf_shared_data(cf);
-    shcf->message_timeout = timeout;
-  }
-  if(cf->complex_max_messages) {
-    ngx_int_t                      num;
-    if(ngx_http_complex_value(r, cf->complex_max_messages, &val) != NGX_OK) {
-      nchan_log_request_error(r, "cannot evaluate nchan_message_buffer_length value");
-      *err = NULL;
-      return 0;
-    }
-    
-    if(val.len == 0) {
-      *err = "missing nchan_message_buffer_length value";
-      nchan_log_request_error(r, "%s", *err);
-      return 0;
-    }
-    
-    num = ngx_atoi(val.data, val.len);
-    if(num == NGX_ERROR || num < 0) {
-      *err = "invalid nchan_message_buffer_length value";
-      nchan_log_request_error(r, "%s %V", *err, &val);
-      return 0;
-    }
-    
-    shcf = memstore_get_conf_shared_data(cf);
-    shcf->max_messages = num;
-  }
-  return 1;
-}
-
-static ngx_int_t group_handler_callback(ngx_int_t status, nchan_group_t *group, ngx_http_request_t *r) {
-  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
-  if(!group) {
-    group = ngx_pcalloc(r->pool, sizeof(*group));
-  }
-  
-  if(!ctx->request_ran_content_handler) {
-    r->main->count--;
-    nchan_group_info(r, group);
-  }
-  else {
-    nchan_http_finalize_request(r, nchan_group_info(r, group));
-  }
-  
-  
-  
-  return NGX_OK;
-}
-
-
-static ngx_int_t parse_size_limit(u_char *data, size_t len) {
-  ngx_str_t  str;
-  str.data = data;
-  str.len = len;
-  return nchan_parse_size(&str);
-}
-
-static ngx_int_t set_group_num_limit(ngx_http_request_t *r, ngx_http_complex_value_t *cv, ngx_atomic_int_t *dst, ngx_int_t (*parsefunc)(u_char *, size_t), char *errstr) {
-  ngx_str_t               tmp;
-  ngx_int_t               num;
-  if(cv) {
-    ngx_http_complex_value(r, cv, &tmp);
-    if(tmp.len == 0) {
-      *dst = -1;
-      return 1;
-    }
-    else if((num = parsefunc(tmp.data, tmp.len)) == NGX_ERROR || num < 0) {
-      nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, errstr, 0);
-      return 0;
-    }
-    *dst = num;
-  }
-  else {
-    *dst = -1;
-  }
-  return 1;
-}
-
-static ngx_int_t parse_group_limits(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_group_limits_t *limits) {
-  set_group_num_limit(r, cf->group.max_channels, &limits->channels, ngx_atoi, "invalid nchan_group_max_channels value");
-  set_group_num_limit(r, cf->group.max_subscribers, &limits->subscribers, ngx_atoi, "invalid nchan_group_max_subscribers value");
-  set_group_num_limit(r, cf->group.max_messages, &limits->messages, ngx_atoi, "invalid nchan_group_max_messages value");
-  set_group_num_limit(r, cf->group.max_messages_shm_bytes, &limits->messages_shmem_bytes, parse_size_limit, "invalid nchan_group_max_messages_memory value");
-  set_group_num_limit(r, cf->group.max_messages_file_bytes, &limits->messages_file_bytes, parse_size_limit, "invalid nchan_group_max_messages_disk value");
-  
-  return r->headers_out.status != NGX_HTTP_FORBIDDEN ? NGX_OK : NGX_ERROR;
-}
-
-ngx_int_t nchan_group_handler(ngx_http_request_t *r) {
-  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  nchan_request_ctx_t    *ctx;
-  ngx_int_t               rc = NGX_DONE;
-  ngx_str_t              *group;
-  
-  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
-  
-  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
-    ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
-    return NGX_ERROR;
-  }
-  
-  if(!cf->group.enable_accounting) {
-    nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Channel group accounting is disabled.", 0);
-    return NGX_OK;
-  }
-  
-  group = nchan_get_group_name(r, cf, ctx);
-  if(group == NULL) {
-    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "No group specified", 0);
-    return NGX_OK;
-  }
-  
-  switch(r->method) {
-    case NGX_HTTP_GET:
-      if(!cf->group.get) {
-        rc = nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
-      }
-      r->main->count++;
-      cf->storage_engine->get_group(group, cf, (callback_pt )group_handler_callback, r);
-      
-      break;
-      
-    case NGX_HTTP_POST:
-      if(!cf->group.set) {
-        rc = nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
-      }
-      
-      nchan_group_limits_t     limits;
-      
-      if(parse_group_limits(r, cf, &limits) != NGX_OK) {
-        return NGX_OK;
-      }
-      
-      r->main->count++;
-      cf->storage_engine->set_group_limits(group, cf, &limits, (callback_pt )group_handler_callback, r);
-      break;
-      
-    case NGX_HTTP_DELETE:
-      if(!cf->group.delete) {
-        rc = nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
-      }
-      r->main->count++;
-      cf->storage_engine->delete_group(group, cf, (callback_pt )group_handler_callback, r);
-      break;
-      
-    case NGX_HTTP_OPTIONS:
-        rc= nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_GROUP_HEADERS, &NCHAN_ALLOW_GET_POST_DELETE);
-      break;
-  }
-  ctx->request_ran_content_handler = 1;
-  return rc;
-}
-
-static ngx_int_t nchan_subscriber_info_handler_continued(ngx_int_t, void *, void *);
-static void nchan_subscriber_info_publish_info_request_after_subscribing(subscriber_t *, void *);
-
-ngx_int_t nchan_subscriber_info_handler(ngx_http_request_t *r) {
-  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
-    ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
-    return NGX_ERROR;
-  } 
-  
-  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  
-  nchan_request_ctx_t    *ctx;
-  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
-  
-  
-  if(r->upstream && r->upstream->headers_in.x_accel_redirect) {
-    nchan_recover_x_accel_redirected_request_method(r);
-  }
-  
-  if(!nchan_match_origin_header(r, cf, ctx)) {
-    nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
-    ctx->request_ran_content_handler = 1;
-    return NGX_OK;
-  }
-  
-  if(cf->redis.enabled && !nchan_store_redis_ready(cf)) {
-    nchan_respond_status(r, NGX_HTTP_SERVICE_UNAVAILABLE, NULL, NULL, 0);
-    return NGX_OK;
-  }
-  
-  ngx_int_t rc = cf->storage_engine->get_subscriber_info_id(cf, nchan_subscriber_info_handler_continued, r);
-  //get_unique_request is expected to never complete in the current event loop cycle.
-  if(rc == NGX_ERROR) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  
-  r->main->count++; //hold that request!
-  ctx->request_ran_content_handler = 1;
-  return NGX_DONE;
-}
-
-static ngx_int_t nchan_subscriber_info_handler_continued(ngx_int_t rc, void *d, void *pd) {
-  ngx_http_request_t     *r = pd;
-  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  
-  uintptr_t               response_id = (uintptr_t )d;
-  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  ctx->subscriber_info_response_id = response_id;
-  
-  if(rc == NGX_ERROR) {
-    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
-    return NGX_ERROR;
-  }
-  
-  if(r->method == NGX_HTTP_OPTIONS) {
-    nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS, &NCHAN_ALLOW_GET);
-    return NGX_ERROR;
-  }
-  
-  ngx_str_t              *channel_id = nchan_get_subscriber_info_response_channel_id(r, response_id);
-  if(channel_id == NULL) {
-    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
-    return NGX_ERROR;
-  }
-  
-  subscriber_t *(*sub_create)(ngx_http_request_t *r, nchan_msg_id_t *msg_id) = NULL;
-  
-  if(nchan_detect_websocket_request(r)) {
-    if(!cf->sub.websocket) {
-      nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
-      return NGX_ERROR;
-    }
-    sub_create = websocket_subscriber_create;
-  }
-  else if(r->method != NGX_HTTP_GET) {
-    nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
-    return NGX_ERROR;
-  }
-  else {
-    if(cf->sub.eventsource && nchan_detect_eventsource_request(r)) {
-      sub_create = eventsource_subscriber_create;
-    }
-    else if(cf->sub.http_chunked && nchan_detect_chunked_subscriber_request(r)) {
-      sub_create = http_chunked_subscriber_create;
-    }
-    else if(cf->sub.http_multipart && nchan_detect_multipart_subscriber_request(r)) {
-      sub_create = http_multipart_subscriber_create;
-    }
-    else if(cf->sub.poll) {
-      sub_create = intervalpoll_subscriber_create;
-    }
-    else if(cf->sub.http_raw_stream) {
-      sub_create = http_raw_stream_subscriber_create;
-    }
-    else if(cf->sub.longpoll) {
-      sub_create = longpoll_subscriber_create;
-    }
-  }
-  
-  if(!sub_create) {
-    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
-    return NGX_ERROR;
-  }
-  
-  nchan_msg_id_t *msg_id;
-  if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
-    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Message ID invalid", 0);
-    return NGX_ERROR;
-  }
-  
-  subscriber_t *sub;
-  if((sub = sub_create(r, msg_id)) == NULL) {
-    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
-    return NGX_ERROR;
-  }
-  
-  if(sub->fn->set_enqueue_callback(sub, nchan_subscriber_info_publish_info_request_after_subscribing, r) != NGX_OK) {
-    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
-    return NGX_ERROR;
-  }
-  
-  if(sub->fn->subscribe(sub, channel_id) != NGX_OK) {
-    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
-    return NGX_ERROR;
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t info_request_publish_callback(ngx_int_t status, void *d, void *pd) {
-  //whatever
-  return NGX_OK;
-}
-
-static void really_publish_info_request(void *pd) {
-  subscriber_t           *sub = pd;
-  ngx_http_request_t     *r = sub->request;
-  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  ngx_str_t              *channel_id;
-  if((channel_id = nchan_get_channel_id(r, PUB, 1))==NULL) {
-    sub->fn->respond_status(sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL);
-    return;
-  }
-  
-  cf->storage_engine->request_subscriber_info(channel_id, ctx->subscriber_info_response_id, cf, (callback_pt) &info_request_publish_callback, r);
-  nchan_update_stub_status(total_published_messages, 1);
-}
-
-static void nchan_subscriber_info_publish_info_request_after_subscribing(subscriber_t *sub, void *pd) {
-  //publishing needs to happen AFTER this subscriber has enqueued, not during.
-  nchan_add_oneshot_timer(really_publish_info_request, sub, 0);
-}
-
-
-ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
-  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  ngx_str_t              *channel_id;
-  subscriber_t           *sub;
-  nchan_msg_id_t         *msg_id;
-  ngx_int_t               rc = NGX_DONE;
-  nchan_request_ctx_t    *ctx;
-  nchan_group_limits_t    group_limits;
-  
-  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
-    ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
-    return NGX_ERROR;
-  }  
-  
-  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
-
-  //X-Accel-Redirected requests get their method mangled to GET. De-mangle it if necessary
-  if(r->upstream && r->upstream->headers_in.x_accel_redirect) {
-    //yep, we got x-accel-redirected. what was the original method?...
-    nchan_recover_x_accel_redirected_request_method(r);
-  }
-  
-  if(!nchan_match_origin_header(r, cf, ctx)) {
-    goto forbidden;
-  }
-  
-  if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
-    goto bad_msgid;
-  }
-  
-  if(parse_group_limits(r, cf, &group_limits) == NGX_OK) {
-    // unless the group already exists, these limits may only be set after this incoming request.
-    // TODO: fix this, although that will lead to even gnarlier control flow.
-    cf->storage_engine->set_group_limits(nchan_get_group_name(r, cf, ctx), cf, &group_limits, NULL, NULL);
-  }
-  else {
-    // there waas an error parsing group limit strings, and it has already been sent in the response. 
-    // just quit.
-    return NGX_OK;
-  }
-  
-  if(cf->redis.enabled && !nchan_store_redis_ready(cf)) {
-    //using redis, and it's not ready yet
-    if(r->method == NGX_HTTP_POST || r->method == NGX_HTTP_PUT) {
-      //discard request body before responding
-      nchan_http_publisher_handler(r, nchan_publisher_unavailable_body_handler);
-    }
-    else {
-      nchan_respond_status(r, NGX_HTTP_SERVICE_UNAVAILABLE, NULL, NULL, 0);
-    }
-    return NGX_OK;
-  }
-  
-  if(cf->pub.websocket || cf->pub.http) {
-    char *err;
-    if(!nchan_parse_message_buffer_config(r, cf, &err)) {
-      if(err) {
-        nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, err, 0);
-        return NGX_OK;
-      }
-      else {
-        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
-        return NGX_OK;
-      }
-    }
-  }
-  
-  if(nchan_detect_websocket_request(r)) {
-    //want websocket?
-    if(cf->sub.websocket) {
-      //we prefer to subscribe
-      if((channel_id = nchan_get_channel_id(r, SUB, 1)) == NULL) {
-        return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
-      }
-      
-#if FAKESHARD
-      memstore_sub_debug_start();
-#endif
-      if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
-        goto bad_msgid;
-      }
-      if((sub = websocket_subscriber_create(r, msg_id)) == NULL) {
-        nchan_log_request_error(r, "unable to create websocket subscriber");
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-      }
-      if(sub->fn->subscribe(sub, channel_id) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-      }
-#if FAKESHARD      
-      memstore_sub_debug_end();
-#endif
-    }
-    else if(cf->pub.websocket) {
-      //no need to subscribe, but keep a connection open for publishing
-      nchan_create_websocket_publisher(r);
-    }
-    else goto forbidden;
-    return NGX_DONE;
-  }
-  else {
-    subscriber_t *(*sub_create)(ngx_http_request_t *r, nchan_msg_id_t *msg_id) = NULL;
-    
-    switch(r->method) {
-      case NGX_HTTP_GET:
-        if(cf->sub.eventsource && nchan_detect_eventsource_request(r)) {
-          sub_create = eventsource_subscriber_create;
-        }
-        else if(cf->sub.http_chunked && nchan_detect_chunked_subscriber_request(r)) {
-          sub_create = http_chunked_subscriber_create;
-        }
-        else if(cf->sub.http_multipart && nchan_detect_multipart_subscriber_request(r)) {
-          sub_create = http_multipart_subscriber_create;
-        }
-        else if(cf->sub.poll) {
-          sub_create = intervalpoll_subscriber_create;
-        }
-        else if(cf->sub.http_raw_stream) {
-          sub_create = http_raw_stream_subscriber_create;
-        }
-        else if(cf->sub.longpoll) {
-          sub_create = longpoll_subscriber_create;
-        }
-        else if(cf->pub.http) {
-          nchan_http_publisher_handler(r, nchan_publisher_body_handler);
-        }
-        else {
-          goto forbidden;
-        }
-        
-        if(sub_create) {
-          if((channel_id = nchan_get_channel_id(r, SUB, 1)) == NULL) {
-            return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
-          }
-#if FAKESHARD
-          memstore_sub_debug_start();
-#endif
-          if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
-            goto bad_msgid;
-          }
-          
-          if((sub = sub_create(r, msg_id)) == NULL) {
-            nchan_log_request_error(r, "unable to create subscriber");
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-          }
-          
-          if(sub->fn->subscribe(sub, channel_id) != NGX_OK) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-          }
-#if FAKESHARD
-          memstore_sub_debug_end();
-#endif
-        }
-        
-        break;
-      
-      case NGX_HTTP_POST:
-      case NGX_HTTP_PUT:
-        if(cf->pub.http) {
-          nchan_http_publisher_handler(r, nchan_publisher_body_handler);
-        }
-        else goto forbidden;
-        break;
-      
-      case NGX_HTTP_DELETE:
-        if(cf->pub.http) {
-          nchan_http_publisher_handler(r, nchan_publisher_body_handler);
-        }
-        else goto forbidden;
-        break;
-      
-      case NGX_HTTP_OPTIONS:
-        if(cf->pub.http && (cf->sub.poll || cf->sub.longpoll || cf->sub.eventsource || cf->sub.websocket)) {
-          nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_PUBSUB_HEADERS, &NCHAN_ALLOW_GET_POST_PUT_DELETE);
-        }
-        else if(cf->pub.http) {
-          nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS, &NCHAN_ALLOW_GET_POST_PUT_DELETE);
-        }
-        else if(cf->sub.poll || cf->sub.longpoll || cf->sub.eventsource || cf->sub.websocket) {
-          nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS, &NCHAN_ALLOW_GET);
-        }
-        else goto forbidden;
-        break;
-    }
-  }
-  ctx->request_ran_content_handler = 1;
-  return rc;
-  
-forbidden:
-  nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
-  ctx->request_ran_content_handler = 1;
-  return NGX_OK;
-
-bad_msgid:
-  nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Message ID invalid", 0);
-  ctx->request_ran_content_handler = 1;
-  return NGX_OK;
-  
-}
-
-static ngx_int_t channel_info_callback(ngx_int_t status, void *rptr, void *pd) {
-  ngx_http_request_t *r = nchan_get_safe_request_ptr(pd);
-  if(r == NULL) {
-    return NGX_ERROR;
-  }
-  if(status>=500 && status <= 599) {
-    nchan_http_finalize_request(r, status);
-  }
-  else {
-    nchan_http_finalize_request(r, nchan_response_channel_ptr_info( (nchan_channel_t *)rptr, r, 0));
-  }
-  return NGX_OK;
-}
-
-static void clear_request_pointer(safe_request_ptr_t *pdata) {
-  if(pdata) {
-    pdata->r = NULL;
-  }
-}
-
-static safe_request_ptr_t *nchan_set_safe_request_ptr(ngx_http_request_t *r) {
-  safe_request_ptr_t           *data = ngx_alloc(sizeof(*data), ngx_cycle->log);
-  ngx_http_cleanup_t           *cln = ngx_http_cleanup_add(r, 0);
-  
-  if(!data || !cln) {
-    nchan_log_request_error(r, "couldn't allocate request cleanup stuff.");
-    if(cln) {
-      cln->data = NULL;
-      cln->handler = (ngx_http_cleanup_pt )clear_request_pointer;
-    }
-    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-    return NULL;
-  }
-  
-  data->cln = cln;
-  data->r = r;
-  
-  cln->data = data;
-  cln->handler = (ngx_http_cleanup_pt )clear_request_pointer;
-  
-  return data;
-}
-
-static ngx_http_request_t *nchan_get_safe_request_ptr(safe_request_ptr_t *d) {
-  ngx_http_request_t    *r = d->r;
-  ngx_http_cleanup_t    *cln = d->cln;
-  
-  ngx_free(d);
-  
-  if(r) {
-    cln->data = NULL;
-  }
-  
-  return r;
-}
-
-
-static ngx_int_t publish_callback(ngx_int_t status, void *data, safe_request_ptr_t *pd) {
-  nchan_request_ctx_t   *ctx;
-  static nchan_msg_id_t  empty_msgid = NCHAN_ZERO_MSGID;
-  nchan_channel_t       *ch = data;
-  
-  ngx_http_request_t    *r = nchan_get_safe_request_ptr(pd);
-  
-  if(r == NULL) { // the request has since disappered
-    return NGX_ERROR;
-  }
-  ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
-  //DBG("publish_callback %V owner %i status %i", ch_id, memstore_channel_owner(ch_id), status);
-  switch(status) {
-    case NCHAN_MESSAGE_QUEUED:
-      //message was queued successfully, but there were no subscribers to receive it.
-      ctx->prev_msg_id = ctx->msg_id;
-      ctx->msg_id = ch != NULL ? ch->last_published_msg_id : empty_msgid;
-      
-      nchan_maybe_send_channel_event_message(r, CHAN_PUBLISH);
-      nchan_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_ACCEPTED));
-      return NGX_OK;
-      
-    case NCHAN_MESSAGE_RECEIVED:
-      //message was queued successfully, and it was already sent to at least one subscriber
-      ctx->prev_msg_id = ctx->msg_id;
-      ctx->msg_id = ch != NULL ? ch->last_published_msg_id : empty_msgid;
-      
-      nchan_maybe_send_channel_event_message(r, CHAN_PUBLISH);
-      nchan_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_CREATED));
-      return NGX_OK;
-      
-    case NGX_ERROR:
-      status = NGX_HTTP_INTERNAL_SERVER_ERROR;
-      /*fallthrough*/
-    case NGX_HTTP_INSUFFICIENT_STORAGE:
-    case NGX_HTTP_INTERNAL_SERVER_ERROR:
-    case NGX_HTTP_SERVICE_UNAVAILABLE:
-      //WTF?
-      nchan_log_request_error(r, "error publishing message (HTTP status code %i)", status);
-      ctx->prev_msg_id = empty_msgid;
-      ctx->msg_id = empty_msgid;
-      nchan_http_finalize_request(r, status);
-      return NGX_ERROR;
-      
-    case NGX_HTTP_FORBIDDEN:
-      ctx->prev_msg_id = empty_msgid;
-      ctx->msg_id = empty_msgid;
-      if(data) {
-        nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, (char *)data, 1);
-      }
-      else {
-        nchan_http_finalize_request(r, NGX_HTTP_FORBIDDEN);
-      }
-      return NGX_OK;
-      
-    default:
-      //for debugging, mostly. I don't expect this branch to behit during regular operation
-      ctx->prev_msg_id = empty_msgid;;
-      ctx->msg_id = empty_msgid;
-      nchan_log_request_error(r, "TOTALLY UNEXPECTED error publishing message (HTTP status code %i)", status);
-      nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-      return NGX_ERROR;
-  }
-}
-
-static void nchan_publisher_post_request(ngx_http_request_t *r, ngx_str_t *content_type, size_t content_length, ngx_chain_t *request_body_chain, ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
-  ngx_buf_t                      *buf;
-  nchan_msg_t                    *msg;
-  ngx_str_t                      *eventsource_event;
-  
-  safe_request_ptr_t             *pd;
-
-#if FAKESHARD
-  memstore_pub_debug_start();
-#endif
-  if((msg = ngx_pcalloc(r->pool, sizeof(*msg))) == NULL) {
-    nchan_log_request_error(r, "can't allocate msg in request pool");
-    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-    return; 
-  }
-  msg->storage = NCHAN_MSG_POOL;
-  
-  
-  if(cf->eventsource_event.len > 0) {
-    msg->eventsource_event = &cf->eventsource_event;
-  }
-  else if((eventsource_event = nchan_get_header_value(r, NCHAN_HEADER_EVENTSOURCE_EVENT)) != NULL) {
-    msg->eventsource_event = eventsource_event;
-  }
-  
-  //content type
-  if(content_type) {
-    msg->content_type = content_type;
-  }
-  
-  if(content_length == 0) {
-    buf = ngx_create_temp_buf(r->pool, 0);
-  }
-  else if(request_body_chain!=NULL) {
-    buf = nchan_chain_to_single_buffer(r->pool, request_body_chain, content_length);
-  }
-  else {
-    nchan_log_request_error(r, "unexpected publisher message request body buffer location. please report this to the nchan developers.");
-    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-    return;
-  }
-  
-  msg->id.time = 0;
-  msg->id.tag.fixed[0] = 0;
-  msg->id.tagactive = 0;
-  msg->id.tagcount = 1;
-  
-  msg->buf = *buf;
-#if NCHAN_MSG_LEAK_DEBUG
-  msg->lbl = r->uri;
-#endif
-  nchan_deflate_message_if_needed(msg, cf, r, r->pool);
-  if((pd = nchan_set_safe_request_ptr(r)) == NULL) {
-    return;
-  }
-  
-  cf->storage_engine->publish(channel_id, msg, cf, (callback_pt) &publish_callback, pd);
-  nchan_update_stub_status(total_published_messages, 1);
-#if FAKESHARD
-  memstore_pub_debug_end();
-#endif
-}
-
-typedef struct {
-  ngx_str_t       *ch_id;
-} nchan_pub_upstream_data_t;
-
-typedef struct {
-  ngx_http_post_subrequest_t    psr;
-  nchan_pub_upstream_data_t   psr_data;
-} nchan_pub_upstream_stuff_t;
-
-static ngx_int_t nchan_publisher_upstream_handler(ngx_http_request_t *sr, void *data, ngx_int_t rc) {
-  ngx_http_request_t         *r = sr->parent;
-  nchan_pub_upstream_data_t  *d = (nchan_pub_upstream_data_t *)data;
-  
-  //switch(r->headers_out
-  if(rc == NGX_OK) {
-    nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-    ngx_int_t                 code = sr->headers_out.status;
-    ngx_str_t                *content_type;
-    ngx_int_t                 content_length;
-    ngx_chain_t              *request_chain;
-    
-    switch(code) {
-      case NGX_HTTP_OK:
-      case NGX_HTTP_CREATED:
-      case NGX_HTTP_ACCEPTED:
-        if(sr->upstream) {
-          content_type = (sr->upstream->headers_in.content_type ? &sr->upstream->headers_in.content_type->value : NULL);
-          content_length = nchan_subrequest_content_length(sr);
-#if nginx_version >= 1013010
-          request_chain = sr->out;
-#else
-          request_chain = sr->upstream->out_bufs;
-#endif
-        }
-        else {
-          content_type = NULL;
-          content_length = 0;
-          request_chain = NULL;
-        }
-        nchan_publisher_post_request(r, content_type, content_length, request_chain, d->ch_id, cf);
-        break;
-      
-      case NGX_HTTP_NOT_MODIFIED:
-        content_type = (r->headers_in.content_type ? &r->headers_in.content_type->value : NULL);
-        content_length = r->headers_in.content_length_n > 0 ? r->headers_in.content_length_n : 0;
-        nchan_publisher_post_request(r, content_type, content_length, r->request_body->bufs, d->ch_id, cf);
-        break;
-        
-      case NGX_HTTP_NO_CONTENT:
-        //cancel publication
-        nchan_http_finalize_request(r, NGX_HTTP_NO_CONTENT);
-        break;
-      
-      default:
-        nchan_http_finalize_request(r, NGX_HTTP_FORBIDDEN);
-    }
-  }
-  else {
-    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-  }
-  
-  return NGX_OK;
-}
-
-static void nchan_publisher_body_handler_continued(ngx_http_request_t *r, ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
-  ngx_http_complex_value_t       *publisher_upstream_request_url_ccv;
-  static ngx_str_t                POST_REQUEST_STRING = {4, (u_char *)"POST "};
-  safe_request_ptr_t             *pd;
-  
-  switch(r->method) {
-    case NGX_HTTP_GET:
-      if((pd = nchan_set_safe_request_ptr(r)) == NULL){
-        return;
-      }
-      cf->storage_engine->find_channel(channel_id, cf, (callback_pt) &channel_info_callback, pd);
-      break;
-    
-    case NGX_HTTP_PUT:
-    case NGX_HTTP_POST:
-      publisher_upstream_request_url_ccv = cf->publisher_upstream_request_url;
-      if(publisher_upstream_request_url_ccv == NULL) {
-        ngx_str_t    *content_type = (r->headers_in.content_type ? &r->headers_in.content_type->value : NULL);
-        ngx_int_t     content_length = r->headers_in.content_length_n > 0 ? r->headers_in.content_length_n : 0;
-        // no need to check for chunked transfer-encoding, nginx automatically sets the 
-        // content-length either way.
-        
-        nchan_publisher_post_request(r, content_type, content_length, r->request_body->bufs, channel_id, cf);
-      }
-      else {
-        nchan_pub_upstream_stuff_t    *psr_stuff;
-        
-        if((psr_stuff = ngx_palloc(r->pool, sizeof(*psr_stuff))) == NULL) {
-          nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest");
-          nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-          return;
-        }
-        
-        ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
-        nchan_pub_upstream_data_t     *psrd = &psr_stuff->psr_data;
-        ngx_http_request_t            *sr;
-        ngx_str_t                      publisher_upstream_request_url;
-        
-        ngx_http_complex_value(r, publisher_upstream_request_url_ccv, &publisher_upstream_request_url);
-        
-        psr->handler = nchan_publisher_upstream_handler;
-        psr->data = psrd;
-        
-        psrd->ch_id = channel_id;
-        
-        ngx_http_subrequest(r, &publisher_upstream_request_url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
-        nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, r->request_body, r->headers_in.content_length_n);
-        sr->args = r->args;
-      }
-      break;
-      
-    case NGX_HTTP_DELETE:
-      if((pd = nchan_set_safe_request_ptr(r)) == NULL){
-        return;
-      }
-      cf->storage_engine->delete_channel(channel_id, cf, (callback_pt) &channel_info_callback, pd);
-      nchan_maybe_send_channel_event_message(r, CHAN_DELETE);
-      break;
-      
-    default: 
-      nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
-  }
-  
-}
-
-typedef struct {
-  ngx_str_t       *ch_id;
-} nchan_pub_subrequest_data_t;
-
-typedef struct {
-  ngx_http_post_subrequest_t    psr;
-  nchan_pub_subrequest_data_t   psr_data;
-} nchan_pub_subrequest_stuff_t;
-
-
-static ngx_int_t nchan_publisher_body_authorize_handler(ngx_http_request_t *r, void *data, ngx_int_t rc) {
-  nchan_pub_subrequest_data_t  *d = data;
-  
-  if(rc == NGX_OK) {
-    nchan_loc_conf_t    *cf = ngx_http_get_module_loc_conf(r->parent, ngx_nchan_module);
-    ngx_int_t            code = r->headers_out.status;
-    if(code >= 200 && code <299) {
-      //authorized. proceed as planned
-      nchan_publisher_body_handler_continued(r->parent, d->ch_id, cf);
-    }
-    else { //anything else means forbidden
-      nchan_http_finalize_request(r->parent, NGX_HTTP_FORBIDDEN);
-    }
-  }
-  else {
-    nchan_http_finalize_request(r->parent, rc);
-  }
-  return NGX_OK;
-}
-
-static void nchan_publisher_unavailable_body_handler(ngx_http_request_t *r) {
-  nchan_http_finalize_request(r, NGX_HTTP_SERVICE_UNAVAILABLE);
-  return;
-}
-
-static void nchan_publisher_body_handler(ngx_http_request_t *r) {
-  ngx_str_t                      *channel_id;
-  nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  ngx_table_elt_t                *content_length_elt;
-  ngx_http_complex_value_t       *authorize_request_url_ccv = cf->authorize_request_url;
-  
-  if((channel_id = nchan_get_channel_id(r, PUB, 1))==NULL) {
-    nchan_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
-    return;
-  }
-  
-  if(!authorize_request_url_ccv) {
-    nchan_publisher_body_handler_continued(r, channel_id, cf);
-  }
-  else {
-    nchan_pub_subrequest_stuff_t   *psr_stuff;
-    
-    if((psr_stuff = ngx_palloc(r->pool, sizeof(*psr_stuff))) == NULL) {
-      nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest");
-      nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-      return;
-    }
-    
-    ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
-    nchan_pub_subrequest_data_t   *psrd = &psr_stuff->psr_data;
-    ngx_http_request_t            *sr;
-    ngx_str_t                      auth_request_url;
-    
-    ngx_http_complex_value(r, authorize_request_url_ccv, &auth_request_url);
-    
-    psr->handler = nchan_publisher_body_authorize_handler;
-    psr->data = psrd;
-    
-    psrd->ch_id = channel_id;
-    
-    ngx_http_subrequest(r, &auth_request_url, NULL, &sr, psr, 0);
-    
-    if((sr->request_body = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t))) == NULL) {
-      nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest body");
-      nchan_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
-      return;
-    }
-    if((content_length_elt = ngx_palloc(r->pool, sizeof(*content_length_elt))) == NULL) {
-      nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest content-length header");
-      nchan_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
-      return;
-    }
-    
-    if(sr->headers_in.content_length) {
-      *content_length_elt = *sr->headers_in.content_length;
-      content_length_elt->value.len=1;
-      content_length_elt->value.data=(u_char *)"0";
-      sr->headers_in.content_length = content_length_elt;
-    }
-    
-    sr->headers_in.content_length_n = 0;
-    sr->args = r->args;
-    sr->header_only = 1;
-  }
-}
-
-ngx_int_t nchan_benchmark_handler(ngx_http_request_t *r) {
-  nchan_request_ctx_t    *ctx;
-  
-  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
-  
-  return nchan_benchmark_ws_initialize(r);
-  
-  /*
-  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
-  nchan_bufchain_pool_init(ctx->bcp, r->pool);
-  return nchan_benchmark_initialize(r);
-  */
-}
diff --git a/debian/modules/nchan/src/nchan_module.h b/debian/modules/nchan/src/nchan_module.h
deleted file mode 100644
index c3230a5..0000000
--- a/debian/modules/nchan/src/nchan_module.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef NCHAN_MODULE_H
-#define NCHAN_MODULE_H
-//#define NCHAN_SUBSCRIBER_LEAK_DEBUG 1
-//#define NCHAN_MSG_RESERVE_DEBUG 1
-//#define NCHAN_MSG_LEAK_DEBUG 1
-
-//debugging config
-//#define FAKESHARD 1
-//#define FAKE_SHMEM 1
-#if FAKESHARD
-//#define PUB_FAKE_WORKER 0
-//#define SUB_FAKE_WORKER 1
-//#define ONE_FAKE_CHANNEL_OWNER 2
-#define MAX_FAKE_WORKERS 5
-#endif
-#include <nchan_version.h>
-#include <ngx_http.h>
-
-//building for old versions
-#ifndef NGX_MAX_INT_T_VALUE
-#if (NGX_PTR_SIZE == 4)
-#define NGX_MAX_INT_T_VALUE  2147483647
-#else
-#define NGX_MAX_INT_T_VALUE  9223372036854775807
-#endif
-#endif
-
-#include <nginx.h>
-#include <nchan_types.h>
-#include <nchan_defs.h>
-#include <util/nchan_util.h>
-#include <util/nchan_channel_id.h>
-#include <util/nchan_output_info.h>
-#include <util/nchan_msg.h>
-#include <util/nchan_output.h>
-#include <util/nchan_debug.h>
-
-extern ngx_pool_t *nchan_pool;
-extern ngx_int_t nchan_worker_processes;
-extern ngx_module_t ngx_nchan_module;
-extern nchan_store_t *nchan_store;
-
-extern int nchan_stub_status_enabled;
-
-ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r);
-ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r);
-ngx_int_t nchan_group_handler(ngx_http_request_t *r);
-ngx_int_t nchan_subscriber_info_handler(ngx_http_request_t *r);
-ngx_int_t nchan_benchmark_handler(ngx_http_request_t *r);
-
-time_t nchan_loc_conf_message_timeout(nchan_loc_conf_t *cf);
-ngx_int_t nchan_loc_conf_max_messages(nchan_loc_conf_t *cf);
-
-ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *, channel_event_type_t);
-
-#define nchan_update_stub_status(counter_name, count) __memstore_update_stub_status(offsetof(nchan_stub_status_t, counter_name), count)
-void __memstore_update_stub_status(off_t offset, int count);
-nchan_stub_status_t *nchan_get_stub_status_stats(void);
-size_t nchan_get_used_shmem(void);
-
-#define nchan_log(level, log, errno, fmt, args...) ngx_log_error(level, log, errno, "nchan: " fmt, ##args)
-#define nchan_log_notice(fmt, args...) nchan_log(NGX_LOG_NOTICE, ngx_cycle->log, 0, fmt, ##args)
-#define nchan_log_warning(fmt, args...) nchan_log(NGX_LOG_WARN, ngx_cycle->log, 0, fmt, ##args)
-#define nchan_log_error(fmt, args...) nchan_log(NGX_LOG_ERR, ngx_cycle->log, 0, fmt, ##args)
-#define nchan_log_ooshm_error(fmt, args...) nchan_log(NGX_LOG_ERR, ngx_cycle->log, 0, "Out of shared memory while " fmt ". Increase nchan_max_reserved_memory.", ##args)
-
-#define nchan_log_request_warning(request, fmt, args...) ngx_log_error(NGX_LOG_WARN, (request)->connection->log, 0, "nchan: " fmt, ##args)
-#define nchan_log_request_error(request, fmt, args...)    ngx_log_error(NGX_LOG_ERR, ((request) ? (request)->connection->log : ngx_cycle->log), 0, "nchan: " fmt, ##args)
-
-#endif /*NCHAN_MODULE_H*/
diff --git a/debian/modules/nchan/src/nchan_setup.c b/debian/modules/nchan/src/nchan_setup.c
deleted file mode 100644
index efa2406..0000000
--- a/debian/modules/nchan/src/nchan_setup.c
+++ /dev/null
@@ -1,1615 +0,0 @@
-#include <nchan_websocket_publisher.h>
-#include <nchan_types.h>
-#include <util/nchan_output.h>
-#include <nchan_variables.h>
-#include <store/memory/store.h>
-#include <store/redis/store.h>
-#if (NGX_ZLIB)
-#include <zlib.h>
-#endif
-
-static char *nchan_set_complex_value_array(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, nchan_complex_value_arr_t *chid);
-static ngx_int_t set_complex_value_array_size1(ngx_conf_t *cf, nchan_complex_value_arr_t *chid, char *val);
-
-static ngx_str_t      DEFAULT_CHANNEL_EVENT_STRING = ngx_string("$nchan_channel_event $nchan_channel_id");
-
-static ngx_str_t      DEFAULT_SUBSCRIBER_INFO_STRING = ngx_string("$nchan_subscriber_type $remote_addr:$remote_port $http_user_agent $server_name $request_uri $pid");
-
-nchan_store_t   *default_storage_engine = &nchan_store_memory;
-ngx_flag_t       global_nchan_enabled = 0;
-ngx_flag_t       global_redis_enabled = 0;
-ngx_flag_t       global_zstream_needed = 0;
-ngx_flag_t       global_benchmark_enabled = 0;
-void            *global_owner_cycle = NULL;
-
-#define MERGE_UNSET_CONF(conf, prev, unset, default)         \
-if (conf == unset) {                                         \
-  conf = (prev == unset) ? default : prev;                   \
-}
-
-#define MERGE_CONF(cf, prev_cf, name) if((cf)->name == NULL) { (cf)->name = (prev_cf)->name; }
-
-static ngx_int_t nchan_init_module(ngx_cycle_t *cycle) {
-  if(global_owner_cycle && global_owner_cycle != ngx_cycle) {
-    global_nchan_enabled = 0;
-    global_redis_enabled = 0;
-    global_zstream_needed = 0;
-    global_benchmark_enabled = 0;
-  }
-  global_owner_cycle = (void *)ngx_cycle;
-  
-  if(!global_nchan_enabled) {
-    return NGX_OK;
-  }
-  ngx_core_conf_t         *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-  nchan_worker_processes = ccf->worker_processes;
-  
-  //initialize storage engines
-  nchan_store_memory.init_module(cycle);
-  if(global_benchmark_enabled) {
-    nchan_benchmark_init_module(cycle);
-  }
-  if(global_redis_enabled) {
-    nchan_store_redis.init_module(cycle);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_init_worker(ngx_cycle_t *cycle) {
-  if(!global_nchan_enabled) {
-    return NGX_OK;
-  }
-  if (ngx_process != NGX_PROCESS_WORKER && ngx_process != NGX_PROCESS_SINGLE) {
-    //not a worker, stop initializing stuff.
-    return NGX_OK;
-  }
-  
-  if(nchan_store_memory.init_worker(cycle)!=NGX_OK) {
-    return NGX_ERROR;
-  }
-  if(global_benchmark_enabled) {
-    nchan_benchmark_init_worker(cycle);
-  }
-  
-  if(global_redis_enabled && nchan_store_redis.init_worker(cycle)!=NGX_OK) {
-    return NGX_ERROR;
-  }
-  
-  nchan_websocket_publisher_llist_init();
-  nchan_output_init();
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_preconfig(ngx_conf_t *cf) {
-  global_owner_cycle = (void *)ngx_cycle;
-  global_nchan_enabled = 0;
-  return nchan_add_variables(cf);
-}
-
-static ngx_int_t nchan_postconfig(ngx_conf_t *cf) {
-  global_owner_cycle = (void *)ngx_cycle;
-  if(nchan_store_memory.init_postconfig(cf)!=NGX_OK) {
-    return NGX_ERROR;
-  }
-  if(global_redis_enabled && nchan_store_redis.init_postconfig(cf)!=NGX_OK) {
-    return NGX_ERROR;
-  }
-  
-#if (NGX_ZLIB)
-  if(global_zstream_needed) {
-    nchan_main_conf_t  *mcf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
-    nchan_common_deflate_init(mcf);
-  }
-#endif
-  
-  global_nchan_enabled = 1;
-  
-  return NGX_OK;
-}
-
-//main config
-static void * nchan_create_main_conf(ngx_conf_t *cf) {
-  nchan_main_conf_t      *mcf = ngx_pcalloc(cf->pool, sizeof(*mcf));
-  if(mcf == NULL) {
-    return NGX_CONF_ERROR;
-  }
-  
-  static ngx_path_init_t nchan_temp_path = { ngx_string(NGX_HTTP_CLIENT_TEMP_PATH), { 0, 0, 0 } };
-  ngx_conf_merge_path_value(cf, &mcf->message_temp_path, NULL, &nchan_temp_path);
-  
-  nchan_store_memory.create_main_conf(cf, mcf);
-  nchan_store_redis.create_main_conf(cf, mcf);
-  
-#if (NGX_ZLIB)
-  mcf->zlib_params.level = Z_DEFAULT_COMPRESSION;
-  mcf->zlib_params.windowBits = 10;
-  mcf->zlib_params.memLevel = 8;
-  mcf->zlib_params.strategy = Z_DEFAULT_STRATEGY;
-#endif
-  
-  return mcf;
-}
-
-static void *nchan_create_srv_conf(ngx_conf_t *cf) {
-  nchan_srv_conf_t       *scf = ngx_pcalloc(cf->pool, sizeof(*scf));
-  if(scf == NULL) {
-    return NGX_CONF_ERROR;
-  }
-  scf->redis.connect_timeout = NGX_CONF_UNSET_MSEC;
-  scf->redis.optimize_target = NCHAN_REDIS_OPTIMIZE_UNSET;
-  scf->redis.master_weight = NGX_CONF_UNSET;
-  scf->redis.slave_weight = NGX_CONF_UNSET;
-  scf->redis.blacklist_count = NGX_CONF_UNSET;
-  scf->redis.blacklist = NULL;
-  scf->redis.tls.enabled = NGX_CONF_UNSET;
-  scf->redis.tls.verify_certificate = NGX_CONF_UNSET;
-  scf->upstream_nchan_loc_conf = NULL;
-  return scf;
-}
-
-static char *nchan_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) {
-  nchan_srv_conf_t       *prev = parent, *conf = child;
-  ngx_conf_merge_msec_value(conf->redis.connect_timeout, prev->redis.connect_timeout, NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC);
-  MERGE_UNSET_CONF(conf->redis.optimize_target, prev->redis.optimize_target, NCHAN_REDIS_OPTIMIZE_UNSET, NCHAN_REDIS_OPTIMIZE_CPU);
-  ngx_conf_merge_value(conf->redis.master_weight, prev->redis.master_weight, 1);
-  ngx_conf_merge_value(conf->redis.slave_weight, prev->redis.slave_weight, 1);
-  ngx_conf_merge_value(conf->redis.blacklist_count, prev->redis.blacklist_count, 0);
-  if(conf->redis.blacklist == NULL) {
-    conf->redis.blacklist = prev->redis.blacklist;
-  }
-  ngx_conf_merge_value(conf->redis.tls.enabled, prev->redis.tls.enabled, 0);
-  ngx_conf_merge_value(conf->redis.tls.verify_certificate, prev->redis.tls.verify_certificate, 1);
-  ngx_conf_merge_str_value(conf->redis.tls.trusted_certificate, prev->redis.tls.trusted_certificate, "");
-    ngx_conf_merge_str_value(conf->redis.tls.trusted_certificate_path, prev->redis.tls.trusted_certificate_path, "");
-  ngx_conf_merge_str_value(conf->redis.tls.client_certificate, prev->redis.tls.client_certificate, "");
-  ngx_conf_merge_str_value(conf->redis.tls.client_certificate_key, prev->redis.tls.client_certificate_key, "");
-  ngx_conf_merge_str_value(conf->redis.tls.server_name, prev->redis.tls.server_name, "");
-  ngx_conf_merge_str_value(conf->redis.tls.ciphers, prev->redis.tls.ciphers, "");
-  
-  ngx_conf_merge_str_value(conf->redis.username, prev->redis.username, "");
-  ngx_conf_merge_str_value(conf->redis.password, prev->redis.password, "");
-  
-  return NGX_CONF_OK;
-}
-
-//location config stuff
-static void *nchan_create_loc_conf(ngx_conf_t *cf) {
-  nchan_loc_conf_t       *lcf = ngx_pcalloc(cf->pool, sizeof(*lcf));
-  if(lcf == NULL) {
-    return NGX_CONF_ERROR;
-  }
-  
-  lcf->pub.http=0;
-  lcf->pub.websocket=0;
-  
-  lcf->sub.poll=0;
-  lcf->sub.longpoll=0;
-  lcf->sub.eventsource=0;
-  lcf->sub.websocket=0;
-  lcf->sub.http_chunked=0;
-  
-  // lcf->group is already zeroed
-  lcf->group.enable_accounting = NGX_CONF_UNSET;
-  
-  lcf->shared_data_index=NGX_CONF_UNSET;
-  
-  lcf->authorize_request_url = NULL;
-  lcf->publisher_upstream_request_url = NULL;
-  lcf->unsubscribe_request_url = NULL;
-  lcf->subscribe_request_url = NULL;
-  lcf->channel_group = NULL;
-  
-  lcf->message_timeout=NGX_CONF_UNSET;
-  lcf->max_messages=NGX_CONF_UNSET;
-  
-  lcf->complex_message_timeout = NULL;
-  lcf->complex_max_messages = NULL;
-  
-  lcf->subscriber_first_message=NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET;
-  
-  lcf->subscriber_info_string=NULL;
-  lcf->subscriber_info_location=NGX_CONF_UNSET;
-  
-  lcf->subscriber_timeout=NGX_CONF_UNSET;
-  lcf->subscribe_only_existing_channel=NGX_CONF_UNSET;
-  lcf->redis_idle_channel_cache_timeout=NGX_CONF_UNSET;
-  lcf->max_channel_id_length=NGX_CONF_UNSET;
-  lcf->max_channel_subscribers=NGX_CONF_UNSET;
-  lcf->channel_timeout=NGX_CONF_UNSET;
-  lcf->storage_engine=NULL;
-  
-  lcf->websocket_ping_interval=NGX_CONF_UNSET;
-  
-  lcf->eventsource_ping.interval=NGX_CONF_UNSET;
-  
-  lcf->msg_in_etag_only = NGX_CONF_UNSET;
-  
-  lcf->allow_origin = NULL;
-  lcf->allow_credentials = NGX_CONF_UNSET;
-  
-  lcf->channel_events_channel_id = NULL;
-  lcf->channel_event_string = NULL;
-  
-  lcf->websocket_heartbeat.enabled=NGX_CONF_UNSET;
-  
-  lcf->message_compression = NCHAN_MSG_COMPRESSION_INVALID;
-  
-  lcf->longpoll_multimsg=NGX_CONF_UNSET;
-  lcf->longpoll_multimsg_use_raw_stream_separator=NGX_CONF_UNSET;
-  
-  ngx_memzero(&lcf->pub_chid, sizeof(nchan_complex_value_arr_t));
-  ngx_memzero(&lcf->sub_chid, sizeof(nchan_complex_value_arr_t));
-  ngx_memzero(&lcf->pubsub_chid, sizeof(nchan_complex_value_arr_t));
-  ngx_memzero(&lcf->last_message_id, sizeof(nchan_complex_value_arr_t));
-  
-  ngx_memzero(&lcf->redis, sizeof(lcf->redis));
-  lcf->redis.url_enabled=NGX_CONF_UNSET;
-  lcf->redis.ping_interval = NGX_CONF_UNSET;
-  lcf->redis.cluster_check_interval=NGX_CONF_UNSET;
-  lcf->redis.upstream_inheritable=NGX_CONF_UNSET;
-  lcf->redis.storage_mode = REDIS_MODE_CONF_UNSET;
-  lcf->redis.nostore_fastpublish = NGX_CONF_UNSET;
-  lcf->redis.privdata = NULL;
-  lcf->redis.nodeset = NULL;
-  
-  lcf->request_handler = NULL;
-  
-  lcf->benchmark.time = NGX_CONF_UNSET;
-  lcf->benchmark.msgs_per_minute = NGX_CONF_UNSET;
-  lcf->benchmark.msg_padding = NGX_CONF_UNSET;
-  lcf->benchmark.channels = NGX_CONF_UNSET;
-  lcf->benchmark.subscribers_per_channel = NGX_CONF_UNSET;
-  lcf->benchmark.subscriber_distribution = NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_UNSET;
-  lcf->benchmark.publisher_distribution = NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_UNSET;
-  return lcf;
-}
-
-static char * create_complex_value_from_ngx_str(ngx_conf_t *cf, ngx_http_complex_value_t **dst_cv, ngx_str_t *str) {
-  ngx_http_complex_value_t           *cv;
-  ngx_http_compile_complex_value_t    ccv;
-  
-  cv = ngx_palloc(cf->pool, sizeof(*cv));
-  if (cv == NULL) {
-    ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "unable to allocate space for complex value");
-    return NGX_CONF_ERROR;
-  }
-  
-  ngx_memzero(&ccv, sizeof(ccv));
-  
-  ccv.cf = cf;
-  ccv.value = str;
-  ccv.complex_value = cv;
-  
-  if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-    return NGX_CONF_ERROR;
-  }
-  
-  *dst_cv = cv;
-  return NGX_CONF_OK;
-}
-
-static int is_pub_location(nchan_loc_conf_t *lcf) {
-  return lcf->pub.http || lcf->pub.websocket;
-}
-static int is_sub_location(nchan_loc_conf_t *lcf) {
-  nchan_conf_subscriber_types_t s = lcf->sub;
-  return s.poll || s.http_raw_stream || s.longpoll || s.http_chunked || s.http_multipart || s.eventsource || s.websocket;
-}
-static int is_group_location(nchan_loc_conf_t *lcf) {
-  return lcf->group.get || lcf->group.set || lcf->group.delete;
-}
-
-static int is_valid_location(ngx_conf_t *cf, nchan_loc_conf_t *lcf) {
-  
-  if(is_group_location(lcf)) {
-    if(is_pub_location(lcf) && is_sub_location(lcf)) {
-      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a publisher and subscriber location and also be a group access location (nchan_group + nchan_publisher, nchan_subscriber or nchan_pubsub)");
-      return 0;
-    }
-    else if(is_pub_location(lcf)) {
-      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a publisher location and also be a group access location (nchan_group + nchan_publisher)");
-      return 0;
-    }
-    else if(is_sub_location(lcf)) {
-      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a subscriber location and also be a group access location (nchan_group + nchan_subscriber)");
-      return 0;
-    }
-  }
-  return 1;
-}
-
-static char *ngx_conf_set_redis_upstream(ngx_conf_t *cf, ngx_str_t *url, void *conf) {  
-  ngx_url_t             upstream_url;
-  nchan_loc_conf_t     *lcf = conf;
-  if (lcf->redis.upstream) {
-    return "is duplicate";
-  }
-  
-  ngx_memzero(&upstream_url, sizeof(upstream_url));
-  upstream_url.url = *url;
-  upstream_url.no_resolve = 1;
-  
-  if ((lcf->redis.upstream = ngx_http_upstream_add(cf, &upstream_url, 0)) == NULL) {
-    return NGX_CONF_ERROR;
-  }
-  
-  lcf->redis.enabled = 1;
-  global_redis_enabled = 1;
-  nchan_store_redis_add_active_loc_conf(cf, lcf);
-  
-  return NGX_CONF_OK;
-}
-
-static char *nchan_setup_handler(ngx_conf_t *cf, ngx_int_t (*handler)(ngx_http_request_t *)) {
-  ngx_http_core_loc_conf_t       *clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-  //nchan_loc_conf_t               *plcf = conf;
-  clcf->handler = handler;
-  clcf->if_modified_since = NGX_HTTP_IMS_OFF;
-  
-  return NGX_CONF_OK;
-}
-
-static nchan_loc_conf_t *nchan_loc_conf_get_upstream_lcf(nchan_loc_conf_t *conf, nchan_loc_conf_t *prev) {
-  nchan_redis_conf_t *rcf = &conf->redis, *prev_rcf = &prev->redis;
-  if(rcf->upstream == prev_rcf->upstream || rcf->upstream == NULL) {
-    //same or no upstream, so don't bother
-    return NULL;
-  }
-  else {
-    assert(rcf->upstream);
-    nchan_srv_conf_t      *upstream_scf = ngx_http_conf_upstream_srv_conf(rcf->upstream, ngx_nchan_module);
-    if(upstream_scf && upstream_scf->upstream_nchan_loc_conf) {
-      return upstream_scf->upstream_nchan_loc_conf;
-    }
-    else {
-      //ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "nchan upstream srv_conf loc_conf ptr is null");
-      return NULL;
-    }
-  }
-}
-
-
-static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
-  nchan_loc_conf_t       *prev = parent, *conf = child;
-  nchan_loc_conf_t       *up = nchan_loc_conf_get_upstream_lcf(conf, prev);
-  //publisher types
-  ngx_conf_merge_bitmask_value(conf->pub.http, prev->pub.http, 0);
-  ngx_conf_merge_bitmask_value(conf->pub.websocket, prev->pub.websocket, 0);
-  
-  //subscriber types
-  ngx_conf_merge_bitmask_value(conf->sub.poll, prev->sub.poll, 0);
-  ngx_conf_merge_bitmask_value(conf->sub.longpoll, prev->sub.longpoll, 0);
-  ngx_conf_merge_bitmask_value(conf->sub.eventsource, prev->sub.eventsource, 0);
-  ngx_conf_merge_bitmask_value(conf->sub.http_chunked, prev->sub.http_chunked, 0);
-  ngx_conf_merge_bitmask_value(conf->sub.websocket, prev->sub.websocket, 0);
-  
-  //group request types
-  ngx_conf_merge_bitmask_value(conf->group.get, prev->group.get, 0);
-  ngx_conf_merge_bitmask_value(conf->group.set, prev->group.set, 0);
-  ngx_conf_merge_bitmask_value(conf->group.delete, prev->group.delete, 0);
-  
-  ngx_conf_merge_value(conf->group.enable_accounting, prev->group.enable_accounting, 0);
-  
-  //validate location
-  if(!is_valid_location(cf, conf)) {
-    return NGX_CONF_ERROR;
-  }
-  
-  MERGE_UNSET_CONF(conf->message_compression, prev->message_compression, NCHAN_MSG_COMPRESSION_INVALID, NCHAN_MSG_NO_COMPRESSION);
-  
-  ngx_conf_merge_sec_value(conf->message_timeout, prev->message_timeout, NCHAN_DEFAULT_MESSAGE_TIMEOUT);
-  ngx_conf_merge_value(conf->max_messages, prev->max_messages, NCHAN_DEFAULT_MAX_MESSAGES);
-  
-  MERGE_CONF(conf, prev, complex_message_timeout);
-  MERGE_CONF(conf, prev, complex_max_messages);
-  
-  if (conf->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) {
-    conf->subscriber_first_message = (prev->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) ? NCHAN_SUBSCRIBER_DEFAULT_FIRST_MESSAGE : prev->subscriber_first_message;
-  }
-  
-  MERGE_CONF(conf, prev, subscriber_info_string);
-  if(conf->subscriber_info_string == NULL) { //still null? use the default string
-    if(create_complex_value_from_ngx_str(cf, &conf->subscriber_info_string, &DEFAULT_SUBSCRIBER_INFO_STRING) == NGX_CONF_ERROR) {
-      return NGX_CONF_ERROR;
-    }
-  }
-  
-  ngx_conf_merge_value(conf->subscriber_info_location, prev->subscriber_info_location, 0);
-  
-  ngx_conf_merge_sec_value(conf->websocket_ping_interval, prev->websocket_ping_interval, NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL);
-  
-  ngx_conf_merge_sec_value(conf->eventsource_ping.interval, prev->eventsource_ping.interval, NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL);
-  ngx_conf_merge_str_value(conf->eventsource_ping.data, prev->eventsource_ping.comment, "");
-  ngx_conf_merge_str_value(conf->eventsource_ping.event, prev->eventsource_ping.event, "ping");
-  ngx_conf_merge_str_value(conf->eventsource_ping.data, prev->eventsource_ping.data, "");
-  
-  ngx_conf_merge_sec_value(conf->subscriber_timeout, prev->subscriber_timeout, NCHAN_DEFAULT_SUBSCRIBER_TIMEOUT);
-  ngx_conf_merge_sec_value(conf->redis_idle_channel_cache_timeout, prev->redis_idle_channel_cache_timeout, NCHAN_DEFAULT_REDIS_IDLE_CHANNEL_CACHE_TIMEOUT);
-  
-  ngx_conf_merge_value(conf->subscribe_only_existing_channel, prev->subscribe_only_existing_channel, 0);
-  ngx_conf_merge_value(conf->max_channel_id_length, prev->max_channel_id_length, NCHAN_MAX_CHANNEL_ID_LENGTH);
-  ngx_conf_merge_value(conf->max_channel_subscribers, prev->max_channel_subscribers, 0);
-  ngx_conf_merge_value(conf->channel_timeout, prev->channel_timeout, NCHAN_DEFAULT_CHANNEL_TIMEOUT);
-  
-  ngx_conf_merge_str_value(conf->subscriber_http_raw_stream_separator, prev->subscriber_http_raw_stream_separator, "\n");
-  
-  ngx_conf_merge_str_value(conf->channel_id_split_delimiter, prev->channel_id_split_delimiter, "");
-  MERGE_CONF(conf, prev, allow_origin);
-  ngx_conf_merge_value(conf->allow_credentials, prev->allow_credentials, 1);
-  ngx_conf_merge_str_value(conf->eventsource_event, prev->eventsource_event, "");
-  ngx_conf_merge_str_value(conf->custom_msgtag_header, prev->custom_msgtag_header, "");
-  ngx_conf_merge_value(conf->msg_in_etag_only, prev->msg_in_etag_only, 0);
-  ngx_conf_merge_value(conf->longpoll_multimsg, prev->longpoll_multimsg, 0);
-  ngx_conf_merge_value(conf->longpoll_multimsg_use_raw_stream_separator, prev->longpoll_multimsg_use_raw_stream_separator, 0);
-  
-  ngx_conf_merge_value(conf->websocket_heartbeat.enabled, prev->websocket_heartbeat.enabled, 0);
-  MERGE_CONF(conf, prev, websocket_heartbeat.in);
-  MERGE_CONF(conf, prev, websocket_heartbeat.out);
-  
-  MERGE_CONF(conf, prev, channel_events_channel_id);
-  MERGE_CONF(conf, prev, channel_event_string);
-  
-  if(conf->channel_event_string == NULL) { //still null? use the default string
-    if(create_complex_value_from_ngx_str(cf, &conf->channel_event_string, &DEFAULT_CHANNEL_EVENT_STRING) == NGX_CONF_ERROR) {
-      return NGX_CONF_ERROR;
-    }
-  }
-
-  if(conf->storage_engine == NULL) {
-    conf->storage_engine = prev->storage_engine ? prev->storage_engine : default_storage_engine;
-  }
-
-  MERGE_CONF(conf, prev, authorize_request_url);
-  MERGE_CONF(conf, prev, publisher_upstream_request_url);
-  MERGE_CONF(conf, prev, unsubscribe_request_url);
-  MERGE_CONF(conf, prev, subscribe_request_url);
-  MERGE_CONF(conf, prev, channel_group);
-  
-  MERGE_CONF(conf, prev, group.max_channels);
-  MERGE_CONF(conf, prev, group.max_subscribers);
-  MERGE_CONF(conf, prev, group.max_messages);
-  MERGE_CONF(conf, prev, group.max_messages_shm_bytes);
-  MERGE_CONF(conf, prev, group.max_messages_file_bytes);
-  
-  if(conf->pub_chid.n == 0) {
-    conf->pub_chid = prev->pub_chid;
-  }
-  if(conf->sub_chid.n == 0) {
-    conf->sub_chid = prev->sub_chid;
-  }
-  if(conf->pubsub_chid.n == 0) {
-    conf->pubsub_chid = prev->pubsub_chid;
-  }
-  if(conf->last_message_id.n == 0) {
-    conf->last_message_id = prev->last_message_id;
-  }
-  if(conf->last_message_id.n == 0) { //if it's still null
-    ngx_str_t      first_choice_msgid = ngx_string("$http_last_event_id");
-    ngx_str_t      second_choice_msgid = ngx_string("$arg_last_event_id");
-    
-    if(create_complex_value_from_ngx_str(cf, &conf->last_message_id.cv[0], &first_choice_msgid) == NGX_CONF_ERROR) {
-      return NGX_CONF_ERROR;
-    }
-    if(create_complex_value_from_ngx_str(cf, &conf->last_message_id.cv[1], &second_choice_msgid) == NGX_CONF_ERROR) {
-      return NGX_CONF_ERROR;
-    }
-    conf->last_message_id.n = 2;
-  }
-    
-  ngx_conf_merge_value(conf->redis.url_enabled, prev->redis.url_enabled, 0);
-  
-  ngx_conf_merge_value(conf->redis.upstream_inheritable, prev->redis.upstream_inheritable, 0);
-  ngx_conf_merge_str_value(conf->redis.url, prev->redis.url, NCHAN_REDIS_DEFAULT_URL);
-  
-  if(up && up->redis.namespace.len > 0) { //upstream has a namespace set
-    ngx_conf_merge_str_value(conf->redis.namespace, up->redis.namespace, ""); 
-  }
-  else {
-    ngx_conf_merge_str_value(conf->redis.namespace, prev->redis.namespace, "");
-  }
-  
-  if(up)
-    ngx_conf_merge_value(conf->redis.ping_interval, up->redis.ping_interval, NGX_CONF_UNSET);
-  ngx_conf_merge_value(conf->redis.ping_interval, prev->redis.ping_interval, NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME);
-  
-  if(up)
-    ngx_conf_merge_value(conf->redis.cluster_check_interval, up->redis.cluster_check_interval, NGX_CONF_UNSET);
-  ngx_conf_merge_value(conf->redis.cluster_check_interval, prev->redis.cluster_check_interval, NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_TIME);
-  
-  if(up)
-    ngx_conf_merge_value(conf->redis.nostore_fastpublish, up->redis.nostore_fastpublish, NGX_CONF_UNSET);
-  ngx_conf_merge_value(conf->redis.nostore_fastpublish, prev->redis.nostore_fastpublish, 0);
-  
-  if(conf->redis.url_enabled) {
-    conf->redis.enabled = 1;
-    nchan_store_redis_add_active_loc_conf(cf, conf);
-  }
-  if(conf->redis.upstream_inheritable && !conf->redis.upstream && prev->redis.upstream && prev->redis.upstream_url.len > 0) {
-    conf->redis.upstream_url = prev->redis.upstream_url;
-    ngx_conf_set_redis_upstream(cf, &conf->redis.upstream_url, conf);
-  }
-  
-  if(up)
-    MERGE_UNSET_CONF(conf->redis.storage_mode, up->redis.storage_mode, REDIS_MODE_CONF_UNSET, REDIS_MODE_CONF_UNSET);
-  MERGE_UNSET_CONF(conf->redis.storage_mode, prev->redis.storage_mode, REDIS_MODE_CONF_UNSET, REDIS_MODE_DISTRIBUTED);
-  
-  if(prev->request_handler != NULL && conf->request_handler == NULL) {
-    conf->request_handler = prev->request_handler;
-  }
-  if(conf->request_handler != NULL) {
-    nchan_setup_handler(cf, conf->request_handler);
-  }
-  
-  ngx_conf_merge_value(conf->benchmark.time, prev->benchmark.time, 10);
-  ngx_conf_merge_value(conf->benchmark.msgs_per_minute, prev->benchmark.msgs_per_minute, 120);
-  ngx_conf_merge_value(conf->benchmark.msg_padding, prev->benchmark.msg_padding, 0);
-  ngx_conf_merge_value(conf->benchmark.channels, prev->benchmark.channels, 1000);
-  ngx_conf_merge_value(conf->benchmark.subscribers_per_channel, prev->benchmark.subscribers_per_channel, 100);
-  MERGE_UNSET_CONF(conf->benchmark.subscriber_distribution, prev->benchmark.subscriber_distribution, NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_UNSET, NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM);
-  MERGE_UNSET_CONF(conf->benchmark.publisher_distribution, prev->benchmark.publisher_distribution, NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_UNSET, NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM);
-  
-  return NGX_CONF_OK;
-}
-
-static char *nchan_set_storage_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t     *lcf = conf;
-  ngx_str_t            *val = &((ngx_str_t *) cf->args->elts)[1];
-  
-  if(nchan_strmatch(val, 1, "memory")) {
-    lcf->storage_engine = &nchan_store_memory;
-  }
-  else if(nchan_strmatch(val, 1, "redis")) {
-    lcf->storage_engine = &nchan_store_redis;
-    global_redis_enabled = 1;
-  }
-  else {
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "invalid %V value: %V", &cmd->name, val);
-    return NGX_CONF_ERROR;
-  }
-
-  return NGX_CONF_OK;
-}
-
-#define WEBSOCKET_STRINGS "websocket", "ws", "websockets"
-#define WEBSOCKET_STRINGS_N 3
-
-#define EVENTSOURCE_STRINGS "eventsource", "event-source", "es", "sse"
-#define EVENTSOURCE_STRINGS_N 4
-
-#define HTTP_CHUNKED_STRINGS "chunked", "http-chunked"
-#define HTTP_CHUNKED_STRINGS_N 2
-
-#define HTTP_MULTIPART_STRINGS "multipart", "multipart/mixed", "http-multipart", "multipart-mixed"
-#define HTTP_MULTIPART_STRINGS_N 4
-
-#define LONGPOLL_STRINGS "longpoll", "long-poll"
-#define LONGPOLL_STRINGS_N 2
-
-#define INTERVALPOLL_STRINGS "poll", "interval-poll", "intervalpoll", "http"
-#define INTERVALPOLL_STRINGS_N 4
-
-#define HTTP_RAW_STREAM_STRINGS "http-raw-stream"
-#define HTTP_RAW_STREAM_STRINGS_N 1
-
-#define DISABLED_STRINGS "none", "off", "disabled"
-#define DISABLED_STRINGS_N 3
-
-static char *nchan_publisher_directive_parse(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, ngx_int_t fail) {
-  nchan_loc_conf_t     *lcf = conf;
-  ngx_str_t            *val;
-  ngx_uint_t            i;
-  
-  
-  nchan_conf_publisher_types_t *pubt = &lcf->pub;
-  
-  if(cf->args->nelts == 1){ //no arguments
-    pubt->http=1;
-    pubt->websocket=1;
-  }
-  else {
-    for(i=1; i < cf->args->nelts; i++) {
-      val = &((ngx_str_t *) cf->args->elts)[i];
-      if(nchan_strmatch(val, 1, "http")) {
-        pubt->http=1;
-      }
-      else if(nchan_strmatch(val, WEBSOCKET_STRINGS_N, WEBSOCKET_STRINGS)) {
-        pubt->websocket=1;
-      }
-      else{
-         if(fail) {
-          ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
-         }
-        return NGX_CONF_ERROR;
-      }
-    }
-  }
-  
-  if(!is_valid_location(cf, lcf)) {
-    return NGX_CONF_ERROR;
-  }
-  lcf->request_handler = &nchan_pubsub_handler;
-  return NGX_CONF_OK;
-}
-
-static char *nchan_publisher_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  return nchan_publisher_directive_parse(cf, cmd, conf, 1);
-}
-
-static char *nchan_subscriber_directive_parse(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, ngx_int_t fail) {
-  nchan_loc_conf_t     *lcf = conf;
-  ngx_str_t            *val;
-  ngx_uint_t            i;
-  
-  nchan_conf_subscriber_types_t *subt = &lcf->sub;
-  
-  if(cf->args->nelts == 1){ //no arguments
-    subt->poll=0;
-    subt->http_raw_stream = 0;
-    subt->longpoll=1;
-    subt->websocket=1;
-    subt->eventsource=1;
-    subt->http_chunked=1;
-    subt->http_multipart=1;
-  }
-  else {
-    for(i=1; i < cf->args->nelts; i++) {
-      val = &((ngx_str_t *) cf->args->elts)[i];
-      if(nchan_strmatch(val, LONGPOLL_STRINGS_N, LONGPOLL_STRINGS)) {
-        subt->longpoll=1;
-      }
-      else if(nchan_strmatch(val, INTERVALPOLL_STRINGS_N, INTERVALPOLL_STRINGS)) {
-        subt->poll=1;
-      }
-      else if(nchan_strmatch(val, HTTP_RAW_STREAM_STRINGS_N, HTTP_RAW_STREAM_STRINGS)) {
-        subt->http_raw_stream=1;
-      }
-      else if(nchan_strmatch(val, HTTP_CHUNKED_STRINGS_N, HTTP_CHUNKED_STRINGS)) {
-        subt->http_chunked=1;
-      }
-      else if(nchan_strmatch(val, HTTP_MULTIPART_STRINGS_N, HTTP_MULTIPART_STRINGS)) {
-        subt->http_multipart=1;
-      }
-      else if(nchan_strmatch(val, WEBSOCKET_STRINGS_N, WEBSOCKET_STRINGS)) {
-        subt->websocket=1;
-      }
-      else if(nchan_strmatch(val, EVENTSOURCE_STRINGS_N, EVENTSOURCE_STRINGS)) {
-        subt->eventsource=1;
-      }
-      else if(nchan_strmatch(val, DISABLED_STRINGS_N, DISABLED_STRINGS)) {
-        subt->poll=0;
-        subt->longpoll=0;
-        subt->websocket=0;
-        subt->eventsource=0;
-        subt->http_chunked=0;
-        subt->http_multipart=0;
-      }
-      else {
-        if(fail) {
-          ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
-        }
-        return NGX_CONF_ERROR;
-      }
-    }
-  }
-  
-  if(!is_valid_location(cf, lcf)) {
-    return NGX_CONF_ERROR;
-  }
-  lcf->request_handler = &nchan_pubsub_handler;
-  return NGX_CONF_OK;
-}
-
-static char *nchan_subscriber_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  return nchan_subscriber_directive_parse(cf, cmd, conf, 1);
-}
-
-static char *nchan_pubsub_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t            *val;
-  ngx_uint_t            i;
-  nchan_loc_conf_t     *lcf = conf;
-  nchan_publisher_directive_parse(cf, cmd, conf, 0);
-  nchan_subscriber_directive_parse(cf, cmd, conf, 0);
-  for(i=1; i < cf->args->nelts; i++) {
-    val = &((ngx_str_t *) cf->args->elts)[i];
-    if(! nchan_strmatch(val, 
-      WEBSOCKET_STRINGS_N + EVENTSOURCE_STRINGS_N + HTTP_CHUNKED_STRINGS_N + HTTP_MULTIPART_STRINGS_N + LONGPOLL_STRINGS_N + INTERVALPOLL_STRINGS_N + HTTP_RAW_STREAM_STRINGS_N + DISABLED_STRINGS_N,
-      WEBSOCKET_STRINGS, EVENTSOURCE_STRINGS, HTTP_CHUNKED_STRINGS, HTTP_MULTIPART_STRINGS, LONGPOLL_STRINGS, INTERVALPOLL_STRINGS, HTTP_RAW_STREAM_STRINGS, DISABLED_STRINGS)) {
-      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
-      return NGX_CONF_ERROR;
-    }
-  }
-  
-  if(!is_valid_location(cf, lcf)) {
-    return NGX_CONF_ERROR;
-  }
-  
-  return NGX_CONF_OK;
-}
-
-static char *nchan_subscriber_info_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t     *lcf = conf;
-  nchan_conf_subscriber_types_t *subt = &lcf->sub;
-  
-  // doesn't make sense to have longpoll be the default HTTP subscriber, since channel info locations are likely to be curl'd by developers
-  subt->poll=0;
-  subt->http_raw_stream = 1;
-  subt->longpoll=0;
-  subt->websocket=1;
-  subt->eventsource=1;
-  subt->http_chunked=1;
-  subt->http_multipart=1;
-  
-  lcf->subscriber_info_location = 1;
-  
-  lcf->message_timeout=10;
-  lcf->complex_message_timeout = NULL;
-  
-  lcf->request_handler = &nchan_subscriber_info_handler;
-  return NGX_CONF_OK;
-}
-
-static char *nchan_group_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t     *lcf = conf;
-  ngx_str_t            *val;
-  ngx_uint_t            i;
-  nchan_conf_group_t   *group = &lcf->group;
-  
-  if(cf->args->nelts == 1){ //no arguments
-    group->get=1;
-    group->set=1;
-    group->delete=1;
-  }
-  else {
-    for(i=1; i < cf->args->nelts; i++) {
-      val = &((ngx_str_t *) cf->args->elts)[i];
-      if(nchan_strmatch(val, 1, "get")) {
-        group->get=1;
-      }
-      else if(nchan_strmatch(val, 1, "set")) {
-        group->set=1;
-      }
-      else if(nchan_strmatch(val, 1, "delete")) {
-        group->delete=1;
-      }
-      else if(nchan_strmatch(val, 1, "off")) {
-        group->get=0;
-        group->set=0;
-        group->delete=0;
-      }
-      else {
-        ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
-        return NGX_CONF_ERROR;
-      }
-    }
-  }
-  
-  if(!is_valid_location(cf, lcf)) {
-    return NGX_CONF_ERROR;
-  }
-  lcf->request_handler = &nchan_group_handler;
-  return NGX_CONF_OK;
-}
-
-static ngx_int_t set_complex_value(ngx_conf_t *cf, ngx_http_complex_value_t **cv, char *val) {
-  ngx_http_compile_complex_value_t    ccv;
-  ngx_str_t                          *value = ngx_palloc(cf->pool, sizeof(ngx_str_t));;
-  if(value == NULL) {
-    return NGX_ERROR;
-  }
-  value->data = (u_char *)val;
-  value->len = strlen(val);
-  *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
-  if (*cv == NULL) {
-    return NGX_ERROR;
-  } 
-  ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-  ccv.cf = cf;
-  ccv.value = value;
-  ccv.complex_value = *cv;
-  if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-    return NGX_ERROR;
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t set_complex_value_array_size1(ngx_conf_t *cf, nchan_complex_value_arr_t *chid, char *val) {
-  chid->n = 1;
-  return set_complex_value(cf, &chid->cv[0], val);
-}
-
-static char *nchan_benchmark_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t     *lcf = conf;
-  global_benchmark_enabled = 1;
-  lcf->request_handler = &nchan_benchmark_handler;
-  
-  
-  //set group
-  if(set_complex_value(cf, &lcf->channel_group, "benchmark") != NGX_OK) {
-    return "error setting benchmark channel group";
-  }
-  //set pub and sub channel ids
-  if(set_complex_value_array_size1(cf, &lcf->pub_chid, "control") != NGX_OK) {
-    return "error setting benchmark control channel";
-  }
-  if(set_complex_value_array_size1(cf, &lcf->sub_chid, "data") != NGX_OK) {
-    return "error setting benchmark data channel";
-  }
-  
-  lcf->sub.websocket = 1;
-  lcf->pub.websocket = 1;
-  
-  return NGX_CONF_OK;
-}
-
-static char *nchan_benchmark_subscriber_distribution_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
-  nchan_loc_conf_t   *lcf = conf;
-  if(nchan_strmatch(val, 1, "random")) {
-    lcf->benchmark.subscriber_distribution = NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM;
-  }
-  else if(nchan_strmatch(val, 2, "optimal", "best")) {
-    lcf->benchmark.subscriber_distribution = NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_OPTIMAL;
-  }
-  else {
-    return "invalid value, must be \"random\" or \"optimal\"";
-  }
-  return NGX_CONF_OK;
-}
-static char *nchan_benchmark_publisher_distribution_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
-  nchan_loc_conf_t   *lcf = conf;
-  if(nchan_strmatch(val, 1, "random")) {
-    lcf->benchmark.publisher_distribution = NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM;
-  }
-  else if(nchan_strmatch(val, 2, "optimal", "best")) {
-    lcf->benchmark.publisher_distribution = NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_OPTIMAL;
-  }
-  else {
-    return "invalid value, must be \"random\" or \"optimal\"";
-  }
-  return NGX_CONF_OK;
-}
-
-static char *nchan_subscriber_first_message_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t   *lcf = (nchan_loc_conf_t *)conf;
-  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
-  if(nchan_strmatch(val, 1, "oldest")) {
-    lcf->subscriber_first_message = 1;
-  }
-  else if(nchan_strmatch(val, 1, "newest")) {
-    lcf->subscriber_first_message = 0;
-  }
-  else {
-    //maybe a number?
-    ngx_str_t num = *val;
-    int       sign = 1;
-    ngx_int_t n;
-    
-    if(num.len > 0 && num.data[0] == '-') {
-      num.len--;
-      num.data++;
-      sign = -1;
-    }
-    if((n = ngx_atoi(num.data, num.len)) == NGX_ERROR) {
-      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V, must be 'oldest', 'newest', or a number", &cmd->name, val);
-      return NGX_CONF_ERROR;
-    }
-    if (n > 32) {
-      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V, must be 'oldest', 'newest', or a number between -32 and 32", &cmd->name, val);
-      return NGX_CONF_ERROR;
-    }
-    lcf->subscriber_first_message = n * sign;
-  }
-  return NGX_CONF_OK;
-}
-
-static char *nchan_websocket_heartbeat_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t   *lcf = (nchan_loc_conf_t *)conf;
-  ngx_str_t          *heartbeat_in = &((ngx_str_t *) cf->args->elts)[1];
-  ngx_str_t          *heartbeat_out = &((ngx_str_t *) cf->args->elts)[2];
-  ngx_str_t          *in, *out;
-  lcf->websocket_heartbeat.enabled = 1;
-  
-  in = ngx_pcalloc(cf->pool, sizeof(ngx_str_t) + heartbeat_in->len);
-  in->data = (u_char *)&in[1];
-  in->len = heartbeat_in->len;
-  ngx_memcpy(in->data, heartbeat_in->data, heartbeat_in->len);
-  lcf->websocket_heartbeat.in = in;
-  
-  out = ngx_pcalloc(cf->pool, sizeof(ngx_str_t) + heartbeat_out->len);
-  out->data = (u_char *)&out[1];
-  out->len = heartbeat_out->len;
-  ngx_memcpy(out->data, heartbeat_out->data, heartbeat_out->len);
-  lcf->websocket_heartbeat.out = out;
-  
-  return NGX_CONF_OK;
-}
-
-static char *nchan_conf_deflate_compression_level_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-#if (NGX_ZLIB)
-  nchan_main_conf_t  *mcf = (nchan_main_conf_t *)conf;
-  ngx_int_t           np;
-  ngx_str_t           *value = cf->args->elts;
-  np = ngx_atoi(value[1].data, value[1].len);
-  if (np == NGX_ERROR) {
-    return "invalid number";
-  }
-  if(np < 0 || np > 9) {
-    return "must be between 0 and 9";
-  }
-  
-  mcf->zlib_params.level = np;
-#endif
-  return NGX_CONF_OK;
-}
-
-static char *nchan_conf_deflate_compression_strategy_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-#if (NGX_ZLIB)
-  nchan_main_conf_t   *mcf = (nchan_main_conf_t *)conf;
-  ngx_str_t           *val = cf->args->elts;
-  if(nchan_strmatch(val, 1, "default")) {
-    mcf->zlib_params.strategy = Z_DEFAULT_STRATEGY;
-  }
-  else if(nchan_strmatch(val, 1, "filtered")) {
-    mcf->zlib_params.strategy = Z_FILTERED;
-  }
-  else if(nchan_strmatch(val, 1, "huffman-only")) {
-    mcf->zlib_params.strategy = Z_HUFFMAN_ONLY;
-  }
-  else if(nchan_strmatch(val, 1, "rle")) {
-    mcf->zlib_params.strategy = Z_RLE;
-  }
-  else if(nchan_strmatch(val, 1, "fixed")) {
-    mcf->zlib_params.strategy = Z_FIXED;
-  }
-  else {
-    return "invalid compression strategy";
-  }
-#endif
-  return NGX_CONF_OK;
-}
-
-static char *nchan_conf_deflate_compression_window_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-#if (NGX_ZLIB)
-  nchan_main_conf_t  *mcf = (nchan_main_conf_t *)conf;
-  ngx_int_t           np;
-  ngx_str_t           *value = cf->args->elts;
-  np = ngx_atoi(value[1].data, value[1].len);
-  if (np == NGX_ERROR) {
-    return "invalid number";
-  }
-  if(np < 9 || np > 15) {
-    return "must be between 9 and 15";
-  }
-  
-  mcf->zlib_params.windowBits = np;
-#endif
-  return NGX_CONF_OK;
-}
-
-static char *nchan_conf_deflate_compression_memlevel_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-#if (NGX_ZLIB)
-  nchan_main_conf_t  *mcf = (nchan_main_conf_t *)conf;
-  ngx_int_t           np;
-  ngx_str_t           *value = cf->args->elts;
-  np = ngx_atoi(value[1].data, value[1].len);
-  if (np == NGX_ERROR) {
-    return "invalid number";
-  }
-  if(np < 1 || np > 9) {
-    return "must be between 1 and 9";
-  }
-  
-  mcf->zlib_params.memLevel = np;
-#endif
-  return NGX_CONF_OK;
-}
-
-
-static void nchan_exit_worker(ngx_cycle_t *cycle) {
-  if(!global_nchan_enabled) {
-    return;
-  }
-  if(global_redis_enabled) {
-    redis_store_prepare_to_exit_worker();
-  }
-  nchan_store_memory.exit_worker(cycle);
-  if(global_redis_enabled) {
-    nchan_store_redis.exit_worker(cycle);
-  }
-  nchan_output_shutdown();
-#if (NGX_ZLIB)
-  if(global_zstream_needed) {
-    nchan_common_deflate_shutdown();
-  }
-#endif
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-  subscriber_debug_assert_isempty();
-#endif
-}
-
-static void nchan_exit_master(ngx_cycle_t *cycle) {
-  if(!global_nchan_enabled) {
-    return;
-  }
-  if(global_benchmark_enabled) {
-    nchan_benchmark_exit_master(cycle);
-  }
-  nchan_store_memory.exit_master(cycle);
-  if(global_redis_enabled) {
-    nchan_store_redis.exit_master(cycle);
-  }
-#if (NGX_ZLIB)
-  if(global_zstream_needed) {
-    nchan_common_deflate_shutdown();
-  }
-#endif
-}
-
-static char *nchan_set_complex_value_array(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, nchan_complex_value_arr_t *chid) {
-  ngx_uint_t                          i;
-  ngx_str_t                          *value;
-  ngx_http_complex_value_t          **cv;
-  ngx_http_compile_complex_value_t    ccv;  
-  
-  chid->n = cf->args->nelts - 1;
-  for(i=1; i < cf->args->nelts && i <= NCHAN_COMPLEX_VALUE_ARRAY_MAX; i++) {
-    value = &((ngx_str_t *) cf->args->elts)[i];
-    
-    cv = &chid->cv[i-1];
-    *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
-    if (*cv == NULL) {
-      return NGX_CONF_ERROR;
-    }
-    
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-    ccv.cf = cf;
-    ccv.value = value;
-    ccv.complex_value = *cv;
-    
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-      return NGX_CONF_ERROR;
-    }
-  }
-  
-  return NGX_CONF_OK;
-}
-
-static char *nchan_set_pub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->pub_chid);
-}
-
-static char *nchan_set_sub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t *lcf = conf;
-  return nchan_set_complex_value_array(cf, cmd, conf, &lcf->sub_chid);
-}
-
-static char *nchan_set_pubsub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t *lcf = conf;
-  return nchan_set_complex_value_array(cf, cmd, conf, &lcf->pubsub_chid);
-}
-
-static char *nchan_subscriber_last_message_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->last_message_id);
-}
-
-static char *nchan_set_channel_events_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t                          *value = &((ngx_str_t *) cf->args->elts)[1];
-  ngx_http_complex_value_t          **cv = &((nchan_loc_conf_t *)conf)->channel_events_channel_id;
-  ngx_http_compile_complex_value_t    ccv;  
-  
-  *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
-  if (*cv == NULL) {
-    return NGX_CONF_ERROR;
-  }
-  
-  ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-  ccv.cf = cf;
-  ccv.value = value;
-  ccv.complex_value = *cv;
-  
-  if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-    return NGX_CONF_ERROR;
-  }
-  
-  return NGX_CONF_OK;
-}
-
-static char *nchan_store_messages_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  char    *p = conf;
-  ngx_str_t *val = cf->args->elts;
-
-  
-  if (ngx_strcasecmp(val[1].data, (u_char *) "off") == 0) {
-    ngx_int_t *max;
-    max = (ngx_int_t *) (p + offsetof(nchan_loc_conf_t, max_messages));
-    *max=0;
-  }
-  return NGX_CONF_OK;
-}
-
-static char *nchan_set_message_buffer_length(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t    *lcf = conf;
-  ngx_str_t *val = cf->args->elts;
-  ngx_str_t *arg = &val[1];
-  
-  if(memchr(arg->data, '$', arg->len)) {
-    //complex
-    lcf->max_messages = NGX_CONF_UNSET;
-    cmd->offset = offsetof(nchan_loc_conf_t, complex_max_messages);
-    ngx_http_set_complex_value_slot(cf, cmd, conf);
-    memstore_reserve_conf_shared_data(lcf);
-  }
-  else {
-    //simple
-    lcf->complex_max_messages = NULL;
-    cmd->offset = offsetof(nchan_loc_conf_t, max_messages);
-    ngx_conf_set_num_slot(cf, cmd, conf);
-  }
-  return NGX_CONF_OK;
-}
-
-static char *ngx_http_set_unsubscribe_request_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-#if nginx_version >= 1003015
-  return ngx_http_set_complex_value_slot(cf, cmd, conf);
-#else
-  ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "%V not available on nginx version: %s, must be at least 1.3.15", &cmd->name, NGINX_VERSION);
-  return NGX_CONF_ERROR;
-#endif
-}
-
-static char *nchan_set_message_timeout(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t    *lcf = conf;
-  ngx_str_t *val = cf->args->elts;
-  ngx_str_t *arg = &val[1];
-  
-  if(memchr(arg->data, '$', arg->len)) {
-    //complex
-    lcf->message_timeout = NGX_CONF_UNSET;
-    cmd->offset = offsetof(nchan_loc_conf_t, complex_message_timeout);
-    ngx_http_set_complex_value_slot(cf, cmd, conf);
-    memstore_reserve_conf_shared_data(lcf);
-  }
-  else {
-    //simple
-    lcf->complex_message_timeout = NULL;
-    cmd->offset = offsetof(nchan_loc_conf_t, message_timeout);
-    ngx_conf_set_sec_slot(cf, cmd, conf);
-  }
-  return NGX_CONF_OK;
-}
-
-static char *nchan_ignore_obsolete_setting(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "ignoring obsolete nchan config directive '%V'.", &cmd->name);
-  return NGX_CONF_OK;
-}
-
-static char *nchan_ignore_subscriber_concurrency(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
-  if(!nchan_strmatch(val, 1, "broadcast")) {
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "ignoring obsolete nchan config directive '%V %V;'. Only 'broadcast' is currently supported.", &cmd->name, val);
-  }
-  return NGX_CONF_OK;
-}
-
-static char *nchan_set_raw_subscriber_separator(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
-  nchan_loc_conf_t   *lcf = conf;
-  ngx_str_t          *cf_val = &lcf->subscriber_http_raw_stream_separator;
-  
-  if( val->len && val->data[val->len - 1] != '\n' ) { //must end in a newline if not empty
-    u_char   *cur;
-    if((cur = ngx_palloc(cf->pool, val->len + 1)) == NULL) {
-      return NGX_CONF_ERROR;
-    }
-    ngx_memcpy(cur, val->data, val->len);
-    cur[val->len] = '\n';
-    cf_val->len = val->len + 1;
-    cf_val->data = cur;
-  }
-  else {
-    *cf_val = *val;
-  }
-  return NGX_CONF_OK;
-}
-
-static char *nchan_set_message_compression_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
-  nchan_loc_conf_t   *lcf = conf;
-#if (NGX_ZLIB)
-  if(nchan_strmatch(val, 1, "on")) {
-    lcf->message_compression = 1;
-    global_zstream_needed = 1;
-  }
-  else if(nchan_strmatch(val, 1, "off")) {
-    lcf->message_compression = 0;
-  }
-  else {
-    return "invalid value: must be 'on' or 'off'";
-  }
-  return NGX_CONF_OK;
-#else
-  return "cannot use compression, Nginx was built without zlib";
-#endif
-}
-
-static char *nchan_set_longpoll_multipart(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
-  nchan_loc_conf_t   *lcf = conf;
-  if(nchan_strmatch(val, 1, "on")) {
-    lcf->longpoll_multimsg = 1;
-  }
-  else if(nchan_strmatch(val, 1, "off")) {
-    lcf->longpoll_multimsg = 0;
-  }
-  else if(nchan_strmatch(val, 1, "raw")) {
-    lcf->longpoll_multimsg = 1;
-    lcf->longpoll_multimsg_use_raw_stream_separator = 1;
-  }
-  else {
-    ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid value for %V: %V;'. Must be 'on', 'off', or 'raw'", &cmd->name, val);
-    return NGX_CONF_ERROR;
-  }
-  return NGX_CONF_OK;
-}
-
-static char *ngx_conf_set_redis_subscribe_weights(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_int_t  master = NGX_CONF_UNSET;
-  ngx_int_t  slave = NGX_CONF_UNSET;
-  ngx_str_t *val = cf->args->elts;
-  ngx_str_t *cur;
-  unsigned   i;
-  nchan_srv_conf_t *scf = conf;
-  for(i=1; i < cf->args->nelts; i++) {
-    cur = &val[i];
-    if(nchan_str_after(&cur, "master=")) {
-      if((master = ngx_atoi(cur->data, cur->len)) == NGX_ERROR) {
-        return "has invalid weight for master";
-      }
-    }
-    else if(nchan_str_after(&cur, "slave=")) {
-      if((slave = ngx_atoi(cur->data, cur->len)) == NGX_ERROR) {
-        return "has invalid weight for slave";
-      }
-    }
-  }
-  
-  if(master != NGX_CONF_UNSET) {
-    scf->redis.master_weight = master;
-  }
-  if(slave != NGX_CONF_UNSET) {
-    scf->redis.slave_weight = slave;
-  }
-  
-  return NGX_CONF_OK;
-}
-
-static char *ngx_conf_set_redis_optimize_target(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
-  nchan_srv_conf_t   *scf = conf;
-  if(nchan_strmatch(val, 2, "bandwidth", "bw")) {
-    scf->redis.optimize_target = NCHAN_REDIS_OPTIMIZE_BANDWIDTH;
-  }
-  else if(nchan_strmatch(val, 2, "cpu", "CPU")) {
-    scf->redis.optimize_target = NCHAN_REDIS_OPTIMIZE_CPU;
-  }
-  else {
-    return "invalid value, must be \"bandwidth\" or \"cpu\"";
-  }
-  return NGX_CONF_OK;
-}
-
-static char *ngx_conf_enable_redis(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  char                *rc;
-  ngx_flag_t          *fp;
-  char                *p = conf;
-  nchan_loc_conf_t    *lcf = conf;
-  
-  ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Use of %V is discouraged in favor of nchan_redis_pass.", &cmd->name);
-  
-  rc = ngx_conf_set_flag_slot(cf, cmd, conf);
-  if(rc == NGX_CONF_ERROR) {
-    return rc;
-  }
-  fp = (ngx_flag_t *) (p + cmd->offset);
-  
-  if(*fp) {
-    if(!lcf->redis.enabled) {
-      lcf->redis.enabled = 1;
-      nchan_store_redis_add_active_loc_conf(cf, lcf);
-    }
-    global_redis_enabled = 1;
-  }
-  else {
-    nchan_store_redis_remove_active_loc_conf(cf, lcf);
-  }
-  
-  return rc;
-}
-
-static char *nchan_stub_status_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t    *lcf = conf;
-  nchan_stub_status_enabled = 1;
-  lcf->request_handler = &nchan_stub_status_handler;
-  return NGX_CONF_OK;
-}
-
-
-static ngx_int_t nchan_upstream_dummy_roundrobin_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us) {
-  return NGX_OK;
-}
-
-static char *ngx_conf_upstream_redis_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_http_upstream_srv_conf_t        *uscf;
-  ngx_str_t                           *value;
-  ngx_http_upstream_server_t          *usrv;
-  nchan_loc_conf_t                    *lcf = conf;
-  uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);  
-  nchan_srv_conf_t                    *scf = NULL;
-  scf = ngx_http_conf_upstream_srv_conf(uscf, ngx_nchan_module);
-  if(scf->upstream_nchan_loc_conf) {
-    assert(scf->upstream_nchan_loc_conf == lcf);
-  }
-  else {
-    //is this even a safe technique? it might break in the future...
-    scf->upstream_nchan_loc_conf = lcf;
-  }
-  
-  
-  if(uscf->servers == NULL) {
-        uscf->servers = ngx_array_create(cf->pool, 4, sizeof(ngx_http_upstream_server_t));
-  }
-  if ((usrv = ngx_array_push(uscf->servers)) == NULL) {
-    return NGX_CONF_ERROR;
-  }
-  value = cf->args->elts;
-  
-  if(!nchan_store_redis_validate_url(&value[1])) {
-    return "url is invalid";
-  }
-  
-  ngx_memzero(usrv, sizeof(*usrv));
-#if nginx_version >= 1007002
-  usrv->name = value[1];
-#endif
-  usrv->addrs = ngx_pcalloc(cf->pool, sizeof(ngx_addr_t));
-  usrv->addrs->name = value[1];
-  
-  uscf->peer.init_upstream = nchan_upstream_dummy_roundrobin_init;
-  return NGX_CONF_OK;
-}
-
-static void ipv6_prefix_size_to_mask(int prefix_size, struct in6_addr *mask) {
-  ngx_memzero(mask, sizeof(*mask));
-  int i;
-  for(i=0; prefix_size > 0; prefix_size-=8, i++) {
-    mask->s6_addr[i]= (prefix_size >= 8) ? 0xFF : (unsigned long)(0xFFU << (8 - prefix_size));
-  }
-}
-
-static void ipv4_prefix_size_to_mask(int prefix_size, struct in_addr *mask) {
-  mask->s_addr= (in_addr_t )(prefix_size > 0 ? htonl(~((1 << (32 - prefix_size)) - 1)) : 0);
-}
-
-static char *ngx_conf_set_redis_ip_blacklist(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_srv_conf_t    *scf = conf;
-  ngx_str_t           *cur;
-  ngx_str_t           *val = cf->args->elts;
-  int                  i;
-  nchan_redis_ip_range_t *blacklist = ngx_palloc(cf->pool, sizeof(*blacklist) * (cf->args->nelts - 1));
-  if(blacklist == NULL) {
-    return "couldn't allocate Redis server blacklist";
-  }
-  
-  scf->redis.blacklist = blacklist;
-  scf->redis.blacklist_count = cf->args->nelts - 1;
-  
-  for(i=1; i <= scf->redis.blacklist_count; i++) {
-    cur = &val[i];
-    nchan_redis_ip_range_t *entry = &blacklist[i-1];
-    entry->str = *cur;
-    int                     prefix_size;
-    u_char                 *slash = memchr(cur->data, '/', cur->len);
-    if(slash) {
-      prefix_size = ngx_atoi(slash+1, cur->len - (slash + 1 - cur->data));
-      if(prefix_size == NGX_ERROR) {
-        return "invalid CIDR range prefix size";
-      }
-    }
-    else {
-      prefix_size = -1;
-      slash = &cur->data[cur->len];
-    }
-    
-    char buf[64];
-    ngx_memzero(buf, sizeof(buf));
-    memcpy(buf, cur->data, (slash - cur->data));
-    
-    struct addrinfo hints = {0};
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_flags    = AI_PASSIVE;
-    
-    struct addrinfo *res;
-    if(getaddrinfo(buf, NULL, &hints, &res) != 0) {
-      return "unable to parse IP address";
-    }
-    entry->family = res->ai_family;
-    if(entry->family == AF_INET) {
-      struct sockaddr_in *sa = (struct sockaddr_in *)res->ai_addr;
-      entry->addr.ipv4 = sa->sin_addr;
-      entry->addr_block.ipv4 = sa->sin_addr;
-    }
-#ifdef AF_INET6
-    else if(entry->family == AF_INET6) {
-      struct sockaddr_in6 *sa = (struct sockaddr_in6 *)res->ai_addr;
-      entry->addr.ipv6 = sa->sin6_addr;
-      entry->addr_block.ipv6 = sa->sin6_addr;
-    }
-#endif
-    else {
-      return "invalid address family";
-    }
-    
-    if(prefix_size == 0) {
-      return "netmask size of 0 would block everything";
-    }
-    
-    if(prefix_size == -1) {
-      //no prefix size given, assume we're blacklisting single ip.
-      //prefix size depends on ipv4 or ipv6
-      prefix_size = entry->family == AF_INET ? 32 : 128;
-    }
-    entry->prefix_size = prefix_size;
-    
-    if(entry->family == AF_INET) {
-      if(prefix_size > 32) {
-        return "netmask size cannot exceed 32 for IPv4";
-      }
-      ipv4_prefix_size_to_mask(prefix_size, &entry->mask.ipv4);
-      entry->addr_block.ipv4.s_addr &= entry->mask.ipv4.s_addr;
-      
-    }
-#ifdef AF_INET6
-    else if(entry->family == AF_INET6) {
-      if(prefix_size > 128) {
-        return "netmask size cannot exceed 128 for IPv4";
-      }
-      ipv6_prefix_size_to_mask(prefix_size, &entry->mask.ipv6);
-      unsigned j;
-      uint8_t *addr = entry->addr_block.ipv6.s6_addr;
-      uint8_t *mask = entry->mask.ipv6.s6_addr;
-      for(j=0; j<sizeof(entry->addr_block.ipv6.s6_addr); j++) {
-        addr[j] &= mask[j];
-      }
-    }
-#endif
-    else {
-      return "invalid address family";
-    }
-    freeaddrinfo(res);
-  }
-  return NGX_OK;
-}
-
-static char *ngx_conf_set_str_slot_no_newlines(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  ngx_str_t *val = cf->args->elts;
-  ngx_str_t *arg = &val[1];
-  
-  if(nchan_ngx_str_substr(arg, "\n")) {
-    return "can't contain any newline characters";
-  }
-  
-  return ngx_conf_set_str_slot(cf, cmd, conf);
-}
-
-static char *ngx_conf_set_redis_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t  *lcf = conf;
-  ngx_str_t *val = cf->args->elts;
-  ngx_str_t *arg = &val[1];
-  
-  ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Use of %V is discouraged in favor of an upstream { } block with nchan_redis_server %V;", &cmd->name, arg);
-  
-  if(lcf->redis.upstream) {
-    return "can't be set here: already using nchan_redis_pass";
-  }
-  if(!nchan_store_redis_validate_url(arg)) {
-    return "url is invalid";
-  }
-  
-  return ngx_conf_set_str_slot(cf, cmd, conf);
-}
-
-static char *ngx_conf_process_redis_namespace_slot(ngx_conf_t *cf, void *post, void *fld) {
-  ngx_str_t *arg = fld;
-
-  if(memchr(arg->data, '{', arg->len)) {
-    return "can't contain character '{'";
-  }
-  
-  if(memchr(arg->data, '}', arg->len)) {
-    return "can't contain character '}'";
-  }
-  
-  if(arg->len > 0 && arg->data[arg->len-1] != ':') {
-    u_char  *nns;
-    if((nns = ngx_palloc(cf->pool, arg->len + 2)) == NULL) {
-      return "couldn't allocate redis namespace data";
-    }
-    ngx_memcpy(nns, arg->data, arg->len);
-    nns[arg->len]=':';
-    nns[arg->len+1]='\0';
-    arg->len++;
-    arg->data=nns;
-  }
-  
-  return NGX_CONF_OK;
-}
-
-static char *ngx_conf_set_redis_storage_mode_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  char                         *p = conf;
-  ngx_str_t                    *val = cf->args->elts;
-  ngx_str_t                    *arg = &val[1];
-  
-  nchan_redis_storage_mode_t   *field;
-
-  field = (nchan_redis_storage_mode_t *) (p + cmd->offset);
-  
-  if(*field != REDIS_MODE_CONF_UNSET) {
-    return "is duplicate";
-  }
-  
-  if(nchan_strmatch(arg, 1, "backup")) {
-    *field = REDIS_MODE_BACKUP;
-  }
-  else if(nchan_strmatch(arg, 1, "distributed")) {
-    *field = REDIS_MODE_DISTRIBUTED;
-  }
-  else if(nchan_strmatch(arg, 1, "nostore") ||  nchan_strmatch(arg, 1, "distributed-nostore")) {
-    *field = REDIS_MODE_DISTRIBUTED_NOSTORE;
-  }
-  else {
-    return "is invalid, must be one of 'distributed',  'backup' or 'nostore'";
-  }
-  
-  return NGX_CONF_OK;
-}
-
-static char *ngx_conf_set_redis_upstream_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  nchan_loc_conf_t  *lcf = conf;
-  ngx_str_t         *value = cf->args->elts;
-  
-  lcf->redis.upstream_url = value[1];
-  return ngx_conf_set_redis_upstream(cf, &value[1], conf);
-}
-
-
-#include "nchan_config_commands.c" //hideous but hey, it works
-
-static ngx_http_module_t  nchan_module_ctx = {
-    nchan_preconfig,               /* preconfiguration */
-    nchan_postconfig,              /* postconfiguration */
-    nchan_create_main_conf,        /* create main configuration */
-    NULL,                          /* init main configuration */
-    nchan_create_srv_conf,         /* create server configuration */
-    nchan_merge_srv_conf,          /* merge server configuration */
-    nchan_create_loc_conf,         /* create location configuration */
-    nchan_merge_loc_conf,          /* merge location configuration */
-};
-
-ngx_module_t  ngx_nchan_module = {
-    NGX_MODULE_V1,
-    &nchan_module_ctx,             /* module context */
-    nchan_commands,                /* module directives */
-    NGX_HTTP_MODULE,               /* module type */
-    NULL,                          /* init master */
-    nchan_init_module,             /* init module */
-    nchan_init_worker,             /* init process */
-    NULL,                          /* init thread */
-    NULL,                          /* exit thread */
-    nchan_exit_worker,             /* exit process */
-    nchan_exit_master,             /* exit master */
-    NGX_MODULE_V1_PADDING
-};
diff --git a/debian/modules/nchan/src/nchan_types.h b/debian/modules/nchan/src/nchan_types.h
deleted file mode 100644
index 5a3890e..0000000
--- a/debian/modules/nchan/src/nchan_types.h
+++ /dev/null
@@ -1,532 +0,0 @@
-#ifndef NCHAN_TYPES_H
-#define NCHAN_TYPES_H
-#include <util/nchan_reuse_queue.h>
-#include <util/nchan_bufchainpool.h>
-
-typedef ngx_int_t (*callback_pt)(ngx_int_t, void *, void *);
-
-#include <util/nchan_fake_request.h>
-
-typedef enum {MSG_ERROR, MSG_CHANNEL_NOTREADY, MSG_INVALID, MSG_PENDING, MSG_NOTFOUND, MSG_FOUND, MSG_EXPECTED, MSG_EXPIRED} nchan_msg_status_t;
-typedef enum {INACTIVE, NOTREADY, WAITING, STUBBED, READY, DELETED} chanhead_pubsub_status_t;
-
-typedef enum {NCHAN_CONTENT_TYPE_PLAIN, NCHAN_CONTENT_TYPE_JSON, NCHAN_CONTENT_TYPE_XML, NCHAN_CONTENT_TYPE_YAML, NCHAN_CONTENT_TYPE_HTML} nchan_content_type_t;
-
-typedef enum {REDIS_MODE_CONF_UNSET = NGX_CONF_UNSET, REDIS_MODE_BACKUP = 1, REDIS_MODE_DISTRIBUTED = 2, REDIS_MODE_DISTRIBUTED_NOSTORE = 3} nchan_redis_storage_mode_t;
-
-typedef enum {
-  SUB_ENQUEUE, SUB_DEQUEUE, SUB_RECEIVE_MESSAGE, SUB_RECEIVE_STATUS, 
-  CHAN_PUBLISH, CHAN_DELETE  
-} channel_event_type_t;
-//on with the declarations
-typedef struct {
-  size_t                          shm_size;
-  ngx_msec_t                      redis_fakesub_timer_interval;
-  size_t                          redis_publish_message_msgkey_size;
-#if (NGX_ZLIB)
-  struct {
-                                    int level;
-                                    int windowBits;
-                                    int memLevel;
-                                    int strategy;
-  }                               zlib_params;
-#endif
-  ngx_path_t                     *message_temp_path;
-} nchan_main_conf_t;
-
-
-typedef struct {
-  ngx_str_t                     url;
-  ngx_flag_t                    url_enabled;
-  time_t                        ping_interval;
-  time_t                        cluster_check_interval;
-  ngx_str_t                     namespace;
-  nchan_redis_storage_mode_t    storage_mode;
-  ngx_int_t                     nostore_fastpublish;
-  ngx_str_t                     upstream_url;
-  ngx_http_upstream_srv_conf_t *upstream;
-  ngx_flag_t                    upstream_inheritable;
-  unsigned                      enabled:1;
-  void                         *nodeset;
-  void                         *privdata;
-} nchan_redis_conf_t;
-
-typedef struct {
-  ngx_atomic_int_t  lock;
-  ngx_atomic_t      mutex;
-  ngx_int_t         write_pid;
-} ngx_rwlock_t;
-
-
-#define NCHAN_OLDEST_MSGID_TIME 0
-#define NCHAN_NEWEST_MSGID_TIME -1
-#define NCHAN_NTH_MSGID_TIME -2
-
-#define NCHAN_ZERO_MSGID {0, {{0}}, 0, 0}
-#define NCHAN_OLDEST_MSGID {NCHAN_OLDEST_MSGID_TIME, {{0}}, 0, 1}
-#define NCHAN_NEWEST_MSGID {NCHAN_NEWEST_MSGID_TIME, {{0}}, 0, 1}
-#define NCHAN_NTH_MSGID {NCHAN_NTH_MSGID_TIME, {{0}}, 0, 1}
-
-#define NCHAN_MULTITAG_MAX 255
-#define NCHAN_FIXED_MULTITAG_MAX 4
-union nchan_msg_multitag {
-  int16_t         fixed[NCHAN_FIXED_MULTITAG_MAX];
-  int16_t        *allocd;
-};
-
-typedef struct {
-  time_t                          time; //tag message by time
-  union nchan_msg_multitag        tag;
-  int16_t                         tagactive;
-  int16_t                         tagcount;
-} nchan_msg_id_t;
-
-typedef struct {
-  time_t                          time;
-  int16_t                         tag;
-} nchan_msg_tiny_id_t;
-
-//message queue
-
-#if NCHAN_MSG_RESERVE_DEBUG
-typedef struct msg_rsv_dbg_s msg_rsv_dbg_t;
-struct msg_rsv_dbg_s {
-  char                  *lbl;
-  msg_rsv_dbg_t         *prev;
-  msg_rsv_dbg_t         *next;
-}; //msg_rsv_dbg_s
-#endif
-
-typedef struct nchan_loc_conf_s nchan_loc_conf_t;
-typedef struct nchan_msg_s nchan_msg_t;
-
-typedef enum {NCHAN_MSG_SHARED, NCHAN_MSG_HEAP, NCHAN_MSG_POOL, NCHAN_MSG_STACK} nchan_msg_storage_t;
-
-typedef enum {
-  NCHAN_MSG_COMPRESSION_INVALID = -1,
-  NCHAN_MSG_NO_COMPRESSION = 0, 
-  NCHAN_MSG_COMPRESSION_WEBSOCKET_PERMESSAGE_DEFLATE
-} nchan_msg_compression_type_t;
-  
-typedef struct {
-  ngx_buf_t                       buf;
-  nchan_msg_compression_type_t    compression;
-} nchan_compressed_msg_t;
-
-struct nchan_msg_s {
-  nchan_msg_id_t                  id;
-  nchan_msg_id_t                  prev_id;
-  ngx_str_t                      *content_type;
-  ngx_str_t                      *eventsource_event;
-  //  ngx_str_t                   charset;
-  ngx_buf_t                       buf;
-  time_t                          expires;
-  
-  ngx_atomic_int_t                refcount;
-  nchan_msg_t                    *parent;
-  nchan_compressed_msg_t         *compressed;
-  //struct nchan_msg_s             *reload_next;
-  
-  nchan_msg_storage_t             storage;
-  
-#if NCHAN_MSG_RESERVE_DEBUG
-  struct msg_rsv_dbg_s           *rsv;
-#endif
-#if NCHAN_MSG_LEAK_DEBUG
-  ngx_str_t                       lbl;
-  struct nchan_msg_s             *dbg_prev;
-  struct nchan_msg_s             *dbg_next;
-#endif
-}; // nchan_msg_t
-
-typedef struct {
-  ngx_str_t                       id;
-  ngx_int_t                       messages;
-  ngx_int_t                       subscribers;
-  time_t                          last_seen;
-  time_t                          expires;
-  nchan_msg_id_t                  last_published_msg_id;
-} nchan_channel_t;
-
-
-//garbage collecting goodness
-typedef struct {
-  ngx_queue_t                     queue;
-  nchan_channel_t                *channel;
-} nchan_channel_queue_t;
-
-
-typedef struct {
-  ngx_queue_t                    queue;
-  ngx_rwlock_t                   lock;
-} nchan_worker_msg_sentinel_t;
-
-typedef struct {
-  ngx_atomic_uint_t      channels;
-  ngx_atomic_uint_t      subscribers;
-  ngx_atomic_uint_t      total_published_messages;
-  ngx_atomic_uint_t      messages;
-  ngx_atomic_uint_t      redis_pending_commands;
-  ngx_atomic_uint_t      redis_connected_servers;
-  ngx_atomic_uint_t      ipc_total_alerts_sent;
-  ngx_atomic_uint_t      ipc_total_alerts_received;
-  ngx_atomic_uint_t      ipc_queue_size;
-  ngx_atomic_uint_t      ipc_total_send_delay;
-  ngx_atomic_uint_t      ipc_total_receive_delay;
-} nchan_stub_status_t;
-
-typedef struct subscriber_s subscriber_t;
-
-typedef struct {
-  //must be made entirely of ngx_atomic_int_t
-  ngx_atomic_int_t                channels;
-  ngx_atomic_int_t                subscribers;
-  ngx_atomic_int_t                messages;
-  ngx_atomic_int_t                messages_shmem_bytes;
-  ngx_atomic_int_t                messages_file_bytes;
-} nchan_group_limits_t;
-
-typedef struct {
-  ngx_atomic_int_t               channels;
-  ngx_atomic_int_t               multiplexed_channels;
-  ngx_atomic_int_t               subscribers;
-  ngx_atomic_int_t               messages;
-  ngx_atomic_int_t               messages_shmem_bytes;
-  ngx_atomic_int_t               messages_file_bytes;
-  nchan_group_limits_t           limit;
-  ngx_str_t                      name;
-} nchan_group_t;
-
-typedef struct{
-  //init
-  ngx_int_t (*init_module)(ngx_cycle_t *cycle);
-  ngx_int_t (*init_worker)(ngx_cycle_t *cycle);
-  ngx_int_t (*init_postconfig)(ngx_conf_t *cf);
-  void      (*create_main_conf)(ngx_conf_t *cf, nchan_main_conf_t *mcf);
-  
-  //quit
-  void      (*exit_worker)(ngx_cycle_t *cycle);
-  void      (*exit_master)(ngx_cycle_t *cycle);
-  
-  //async-friendly functions with callbacks
-  ngx_int_t (*get_message) (ngx_str_t *, nchan_msg_id_t *, nchan_loc_conf_t *cf, callback_pt, void *);
-  ngx_int_t (*subscribe)   (ngx_str_t *, subscriber_t *);
-  ngx_int_t (*publish)     (ngx_str_t *, nchan_msg_t *, nchan_loc_conf_t *, callback_pt, void *);
-  
-    //channel actions
-  ngx_int_t (*delete_channel)(ngx_str_t *, nchan_loc_conf_t *, callback_pt, void *);
-  ngx_int_t (*find_channel)(ngx_str_t *, nchan_loc_conf_t *, callback_pt, void*);
-  
-  //group actions
-  ngx_int_t (*get_group)(ngx_str_t *name, nchan_loc_conf_t *, callback_pt, void *);
-  ngx_int_t (*set_group_limits)(ngx_str_t *name, nchan_loc_conf_t *, nchan_group_limits_t *limits, callback_pt, void *);
-  ngx_int_t (*delete_group)(ngx_str_t *name, nchan_loc_conf_t *, callback_pt, void *);
-
-  //subscriber info stuff
-  ngx_int_t (*get_subscriber_info_id)(nchan_loc_conf_t *,  callback_pt, void *);
-  ngx_int_t (*request_subscriber_info)(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *, callback_pt, void *);
-  
-} nchan_store_t;
-
-#define NCHAN_MULTI_SEP_CHR '\0'
-
-typedef struct {
-  unsigned                        http:1;
-  unsigned                        websocket:1;
-} nchan_conf_publisher_types_t;
-
-typedef struct {
-  unsigned                        poll:1; //bleugh
-  unsigned                        http_raw_stream:1; //ugleh
-  unsigned                        longpoll:1;
-  unsigned                        http_chunked:1;
-  unsigned                        http_multipart:1;
-  unsigned                        eventsource:1;
-  unsigned                        websocket:1;
-} nchan_conf_subscriber_types_t;
-
-typedef struct {
-  unsigned                        get:1;
-  unsigned                        set:1;
-  unsigned                        delete:1;
-  
-  ngx_int_t                       enable_accounting;
-  
-  ngx_http_complex_value_t       *max_channels;
-  ngx_http_complex_value_t       *max_subscribers;
-  ngx_http_complex_value_t       *max_messages;
-  ngx_http_complex_value_t       *max_messages_shm_bytes;
-  ngx_http_complex_value_t       *max_messages_file_bytes;
-} nchan_conf_group_t;
-
-#define NCHAN_COMPLEX_VALUE_ARRAY_MAX 8
-typedef struct {
-  ngx_http_complex_value_t       *cv[NCHAN_COMPLEX_VALUE_ARRAY_MAX];
-  ngx_int_t                       n;
-} nchan_complex_value_arr_t;
-
-typedef struct {
- ngx_atomic_uint_t               message_timeout;
- ngx_atomic_uint_t               max_messages;
-} nchan_loc_conf_shared_data_t;
-
-typedef enum {
-  NCHAN_REDIS_OPTIMIZE_UNSET = -1,
-  NCHAN_REDIS_OPTIMIZE_CPU = 1,
-  NCHAN_REDIS_OPTIMIZE_BANDWIDTH = 2
-} nchan_redis_optimize_t;
-
-typedef struct {
-  int family;
-  int prefix_size;
-  ngx_str_t str;
-  struct {
-    union {
-      struct in_addr ipv4;
-#ifdef AF_INET6
-      struct in6_addr ipv6;
-      char            str[16];
-#endif
-    };
-  } addr;
-  struct {
-    union {
-      struct in_addr ipv4;
-#ifdef AF_INET6
-      struct in6_addr ipv6;
-      char            str[16];
-#endif
-    };
-  } addr_block;
-  struct {
-    union {
-      struct in_addr ipv4;
-#ifdef AF_INET6
-      struct in6_addr ipv6;
-#endif
-      char            str[16];
-    };
-  } mask;
-} nchan_redis_ip_range_t;
-
-typedef struct {
-  ngx_int_t         enabled;
-  ngx_str_t         trusted_certificate;
-  ngx_str_t         trusted_certificate_path;
-  ngx_str_t         client_certificate;
-  ngx_str_t         client_certificate_key;
-  ngx_str_t         server_name;
-  ngx_str_t         ciphers;
-  ngx_int_t         verify_certificate;
-} nchan_redis_tls_settings_t;
-
-typedef struct {
-  struct {
-      ngx_msec_t                    connect_timeout;
-      nchan_redis_optimize_t        optimize_target;
-      ngx_int_t                     master_weight;
-      ngx_int_t                     slave_weight;
-      ngx_int_t                     blacklist_count;
-      nchan_redis_ip_range_t       *blacklist;
-      ngx_str_t                     username;
-      ngx_str_t                     password;
-      nchan_redis_tls_settings_t    tls;
-  }                               redis;
-  nchan_loc_conf_t                *upstream_nchan_loc_conf;
-} nchan_srv_conf_t;
-
-typedef struct {
-  time_t                          time;
-  ngx_int_t                       msgs_per_minute;
-  ngx_int_t                       msg_padding;
-  ngx_int_t                       channels;
-  ngx_int_t                       subscribers_per_channel;
-  enum {
-    NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_UNSET = -1,
-    NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM = 1,
-    NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_OPTIMAL = 2
-  }                               subscriber_distribution;
-  enum {
-    NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_UNSET = -1,
-    NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM = 1,
-    NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_OPTIMAL = 2
-  }                               publisher_distribution;
-} nchan_benchmark_conf_t;
-
-struct nchan_loc_conf_s { //nchan_loc_conf_t
-  
-  ngx_int_t                       shared_data_index;
-  
-  time_t                          message_timeout;
-  ngx_int_t                       max_messages;
-  
-  ngx_http_complex_value_t       *complex_message_timeout;
-  ngx_http_complex_value_t       *complex_max_messages;
-  
-  ngx_http_complex_value_t       *authorize_request_url;
-  ngx_http_complex_value_t       *publisher_upstream_request_url;
-  
-  ngx_http_complex_value_t       *unsubscribe_request_url;
-  ngx_http_complex_value_t       *subscribe_request_url;
-  
-  nchan_complex_value_arr_t       pub_chid;
-  nchan_complex_value_arr_t       sub_chid;
-  nchan_complex_value_arr_t       pubsub_chid;
-  ngx_http_complex_value_t       *channel_group;
-  
-  ngx_str_t                       channel_id_split_delimiter;
-  
-  ngx_str_t                       subscriber_http_raw_stream_separator;
-
-  ngx_http_complex_value_t       *allow_origin;
-  ngx_int_t                       allow_credentials;
-  
-  nchan_complex_value_arr_t       last_message_id;
-  ngx_str_t                       custom_msgtag_header;
-  ngx_int_t                       msg_in_etag_only;
-  
-  nchan_conf_publisher_types_t    pub;
-  nchan_conf_subscriber_types_t   sub; 
-  nchan_conf_group_t              group;
-  time_t                          subscriber_timeout;
-  
-  ngx_int_t                       longpoll_multimsg;
-  ngx_int_t                       longpoll_multimsg_use_raw_stream_separator;
-  
-  ngx_str_t                       eventsource_event;
-  
-  time_t                          websocket_ping_interval;
-  struct {
-    time_t                          interval;
-    ngx_str_t                       event;
-    ngx_str_t                       data;
-    ngx_str_t                       comment;
-  }                               eventsource_ping;
-  
-  struct {
-    ngx_int_t   enabled;
-    ngx_str_t  *in;
-    ngx_str_t  *out;
-  }                               websocket_heartbeat;
-  
-  nchan_msg_compression_type_t    message_compression;
-  
-  ngx_int_t                       subscriber_first_message;
-  
-  ngx_http_complex_value_t       *subscriber_info_string;
-  ngx_int_t                       subscriber_info_location;
-  
-  ngx_http_complex_value_t       *channel_events_channel_id;
-  ngx_http_complex_value_t       *channel_event_string;
-  
-  ngx_int_t                       subscribe_only_existing_channel;
-  
-  nchan_redis_conf_t              redis;
-  time_t                          redis_idle_channel_cache_timeout;
-  
-  ngx_int_t                       max_channel_id_length;
-  ngx_int_t                       max_channel_subscribers;
-  time_t                          channel_timeout;
-  nchan_store_t                  *storage_engine;
-  
-  nchan_benchmark_conf_t          benchmark;
-  
-  ngx_int_t                     (*request_handler)(ngx_http_request_t *r);
-};// nchan_loc_conf_t;
-
-typedef struct nchan_llist_timed_s {
-  struct nchan_llist_timed_s     *prev;
-  void                           *data;
-  time_t                          time;
-  struct nchan_llist_timed_s     *next;
-} nchan_llist_timed_t;
-
-typedef enum {PUB, SUB} pub_or_sub_t;
-typedef enum {LONGPOLL, HTTP_CHUNKED, HTTP_MULTIPART, HTTP_RAW_STREAM, INTERVALPOLL, EVENTSOURCE, WEBSOCKET, INTERNAL, SUBSCRIBER_TYPES} subscriber_type_t;
-typedef void (*subscriber_callback_pt)(subscriber_t *, void *);
-
-typedef struct {
-  ngx_int_t              (*enqueue)(struct subscriber_s *);
-  ngx_int_t              (*dequeue)(struct subscriber_s *);
-  ngx_int_t              (*respond_message)(struct subscriber_s *, nchan_msg_t *);
-  ngx_int_t              (*respond_status)(struct subscriber_s *, ngx_int_t, const ngx_str_t *, ngx_chain_t *);
-  ngx_int_t              (*set_enqueue_callback)(subscriber_t *self, subscriber_callback_pt cb, void *privdata);
-  ngx_int_t              (*set_dequeue_callback)(subscriber_t *self, subscriber_callback_pt cb, void *privdata);
-  ngx_int_t              (*reserve)(struct subscriber_s *);
-  ngx_int_t              (*release)(struct subscriber_s *, uint8_t nodestroy);
-  ngx_int_t              (*notify)(struct subscriber_s *, ngx_int_t code, void *data);
-  ngx_int_t              (*subscribe)(subscriber_t *, ngx_str_t *);
-  
-} subscriber_fn_t;
-
-typedef enum {ALIVE, DEAD, UNKNOWN, PININGFORTHEFJORDS} nchan_subscriber_status_t;
-
-struct subscriber_s {
-  ngx_str_t                 *name;
-  subscriber_type_t          type;
-  const subscriber_fn_t     *fn;
-  nchan_subscriber_status_t  status;
-  nchan_msg_id_t             last_msgid;
-  nchan_loc_conf_t          *cf;
-  ngx_http_request_t        *request;
-  void                      *upstream_requestmachine;
-  ngx_uint_t                 reserved;
-  
-  unsigned                   enable_sub_unsub_callbacks;
-  unsigned                   dequeue_after_response:1;
-  unsigned                   destroy_after_dequeue:1;
-  unsigned                   enqueued:1;
-  
-#if FAKESHARD
-  ngx_int_t                  owner;
-#endif
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-  u_char                    *lbl;
-  subscriber_t              *dbg_prev;
-  subscriber_t              *dbg_next;
-#endif
-}; //subscriber_t
-
-#define NCHAN_MULTITAG_REQUEST_CTX_MAX 4
-typedef struct {
-  subscriber_t                  *sub;
-  nchan_reuse_queue_t           *output_str_queue;
-  nchan_reuse_queue_t           *reserved_msg_queue;
-  nchan_bufchain_pool_t         *bcp; //bufchainpool maybe?
-  
-  ngx_str_t                     *subscriber_type;
-  nchan_msg_id_t                 msg_id;
-  nchan_msg_id_t                 prev_msg_id;
-  ngx_str_t                     *publisher_type;
-  ngx_str_t                     *multipart_boundary;
-  ngx_str_t                     *channel_event_name;
-  ngx_str_t                      channel_id[NCHAN_MULTITAG_REQUEST_CTX_MAX];
-  int                            channel_id_count;
-  time_t                         channel_subscriber_last_seen;
-  int                            channel_subscriber_count;
-  int                            channel_message_count;
-  ngx_str_t                     *channel_group_name;
-  
-  ngx_str_t                     *request_origin_header;
-  ngx_str_t                     *allow_origin;
-  
-  ngx_int_t                      subscriber_info_response_id;
-  ngx_str_t                     *subscriber_info_response_channel_id;
-  
-  unsigned                       sent_unsubscribe_request:1;
-  unsigned                       request_ran_content_handler:1;
-  
-} nchan_request_ctx_t;
-
-
-typedef struct {
-  ngx_str_t     hostname;
-  ngx_str_t     peername; // resolved hostname (ip address)
-  ngx_int_t     port;
-  ngx_str_t     username;
-  ngx_str_t     password;
-  ngx_int_t     db;
-  ngx_int_t     use_tls;
-} redis_connect_params_t;
-
-#endif  /* NCHAN_TYPES_H */
diff --git a/debian/modules/nchan/src/nchan_variables.c b/debian/modules/nchan/src/nchan_variables.c
deleted file mode 100644
index 8d31f2a..0000000
--- a/debian/modules/nchan/src/nchan_variables.c
+++ /dev/null
@@ -1,281 +0,0 @@
-#include <nchan_module.h>
-#include <util/nchan_output.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "VARIABLES:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "VARIABLES:" fmt, ##arg)
-
-typedef struct {
-  ngx_str_t                   name;
-  ngx_http_get_variable_pt    handler;
-  uintptr_t                   data;
-} nchan_variable_t;
-
-static nchan_request_ctx_t *get_main_request_ctx(ngx_http_request_t *r){
-  nchan_request_ctx_t        *ctx;
-  ngx_http_request_t        *rcur;
-  
-  //if this is an subrequest, get nearest parent existing ctx
-  for(rcur = r; rcur != NULL; rcur = rcur->parent) {
-    ctx = ngx_http_get_module_ctx(rcur, ngx_nchan_module);
-    if(ctx) return ctx;
-  }
-  
-  //no existing ctx found
-  return NULL;
-}
-
-static void set_varval(ngx_http_variable_value_t *v, u_char *data, size_t len) {
-  v->valid = 1;
-  v->no_cacheable = 1;
-  v->not_found = 0;
-  v->len = len;
-  v->data = data;
-}
-
-static ngx_int_t nchan_channel_event(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
-  if(ctx == NULL || ctx->channel_event_name == NULL) {
-    v->not_found = 1;
-    return NGX_OK;
-  }
-  
-  set_varval(v, ctx->channel_event_name->data, ctx->channel_event_name->len);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_channel_id_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
-  if(ctx == NULL) {
-    v->not_found = 1;
-    return NGX_OK;
-  }
-  
-  set_varval(v, ctx->channel_id[data].data, ctx->channel_id[data].len);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_subscriber_type_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
-  if(ctx == NULL || ctx->subscriber_type == NULL) {
-    v->not_found = 1;
-    return NGX_OK;
-  }
-  
-  set_varval(v, ctx->subscriber_type->data, ctx->subscriber_type->len);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_publisher_type_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
-  if(ctx == NULL || ctx->publisher_type == NULL) {
-    v->not_found = 1;
-    return NGX_OK;
-  }
-  
-  set_varval(v, ctx->publisher_type->data, ctx->publisher_type->len);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_message_id_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  static u_char        msgidbuf[100];
-  ngx_str_t           *msgid;
-  
-  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
-  if(ctx == NULL || (ctx->msg_id.time == 0 && ctx->msg_id.tagcount == 0)) {
-    v->not_found = 1;
-    return NGX_OK;
-  }
-  
-  msgid = msgid_to_str(&ctx->msg_id);
-  ngx_memcpy(msgidbuf, msgid->data, msgid->len);
-  set_varval(v, msgidbuf, msgid->len);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_prev_message_id_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  static u_char        msgidbuf[100];
-  ngx_str_t           *msgid;
-  
-  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
-  if(ctx == NULL  || (ctx->prev_msg_id.time == 0 && ctx->prev_msg_id.tagcount == 0)) {
-    v->not_found = 1;
-    return NGX_OK;
-  }
-  
-  msgid = msgid_to_str(&ctx->prev_msg_id);
-  ngx_memcpy(msgidbuf, msgid->data, msgid->len);
-  set_varval(v, msgidbuf, msgid->len);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_channel_subscriber_last_seen_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  static u_char         buf[NGX_INT_T_LEN + 4];
-  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
-  if(ctx == NULL) {
-    v->not_found = 1;
-    return NGX_OK;
-  }
-  ngx_str_t             str;
-  str.data = &buf[0];
-  str.len = ngx_sprintf(str.data, "%l", (long)ctx->channel_subscriber_last_seen) - str.data;
-  set_varval(v, str.data, str.len);  
-  return NGX_OK;
-}
-static ngx_int_t nchan_channel_subscriber_count_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  static u_char         buf[NGX_INT_T_LEN + 4];
-  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
-  if(ctx == NULL) {
-    v->not_found = 1;
-    return NGX_OK;
-  }
-  ngx_str_t             str;
-  str.data = &buf[0];
-  str.len = ngx_sprintf(str.data, "%i", (int)ctx->channel_subscriber_count) - str.data;
-  set_varval(v, str.data, str.len);
-  return NGX_OK;
-}
-static ngx_int_t nchan_channel_message_count_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  static u_char         buf[NGX_INT_T_LEN + 4];
-  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
-  if(ctx == NULL) {
-    v->not_found = 1;
-    return NGX_OK;
-  }
-  ngx_str_t             str;
-  str.data = &buf[0];
-  str.len = ngx_sprintf(str.data, "%i", (int)ctx->channel_message_count) - str.data;
-  set_varval(v, str.data, str.len); 
-  return NGX_OK;
-}
-
-
-/*
-static ngx_int_t nchan_message_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  
-  
-  v->not_found = 1;
-  return NGX_OK;
-}
-*/
-
-/*
-static ngx_int_t nchan_message_alert_type_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  
-  
-  v->not_found = 1;
-  return NGX_OK;
-}
-*/
-
-static ngx_int_t nchan_stub_status_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  static u_char         buf[sizeof(nchan_stub_status_t)/sizeof(ngx_atomic_uint_t)][NGX_INT_T_LEN + 4];
-  off_t                 offset = (off_t )data;
-  int                   n = offset / sizeof(ngx_atomic_uint_t);
-  nchan_stub_status_t  *stats = nchan_get_stub_status_stats();
-  ngx_atomic_uint_t     stat = *(ngx_atomic_uint_t *)((char *)stats + offset);
-  ngx_str_t             str;
-  
-  str.data = &buf[n][0];
-  str.len = ngx_sprintf(str.data, "%ui", stat) - str.data;
-  
-  set_varval(v, str.data, str.len);
-  
-  return NGX_OK;
-}
-
-
-static ngx_int_t nchan_stub_status_ipc_alerts_in_transit(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
-  static u_char         buf[NGX_INT_T_LEN + 4];
-  nchan_stub_status_t  *stats = nchan_get_stub_status_stats();
-  ngx_str_t             str;
-  
-  str.data = &buf[0];
-  str.len = ngx_sprintf(str.data, "%ui", stats->ipc_total_alerts_sent - stats->ipc_total_alerts_received) - str.data;
-  
-  set_varval(v, str.data, str.len);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_stub_status_shared_memory_used(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t d) {
-  static u_char data[30];
-  
-  set_varval(v, data, ngx_snprintf(data, 30, "%fK", (float )((float )nchan_get_used_shmem() / 1024.0)) - data);
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_version_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t d) {
-  set_varval(v, (u_char *)NCHAN_VERSION, strlen(NCHAN_VERSION));
-  return NGX_OK;
-}
-
-
-
-#define STUB_STATUS_VARIABLE(counter) \
-  {  ngx_string("nchan_stub_status_"#counter), nchan_stub_status_variable, offsetof(nchan_stub_status_t, counter) }
-  
-#define STUB_STATUS_NAMED_VARIABLE(var_name, counter) \
-  {  ngx_string("nchan_stub_status_" var_name), nchan_stub_status_variable, offsetof(nchan_stub_status_t, counter) }
-
-
-nchan_variable_t nchan_vars[] = {
-  { ngx_string("nchan_channel_id"),         nchan_channel_id_variable, 0},
-  { ngx_string("nchan_channel_id1"),        nchan_channel_id_variable, 0},
-  { ngx_string("nchan_channel_id2"),        nchan_channel_id_variable, 1},
-  { ngx_string("nchan_channel_id3"),        nchan_channel_id_variable, 2},
-  { ngx_string("nchan_channel_id4"),        nchan_channel_id_variable, 3},
-  { ngx_string("nchan_channel_subscriber_last_seen"), nchan_channel_subscriber_last_seen_variable, 0},
-  { ngx_string("nchan_channel_subscriber_count"),     nchan_channel_subscriber_count_variable, 0},
-  { ngx_string("nchan_channel_message_count"),        nchan_channel_message_count_variable, 0},
-  { ngx_string("nchan_channel_event"),      nchan_channel_event, 0},
-  { ngx_string("nchan_subscriber_type"),    nchan_subscriber_type_variable, 0},
-  { ngx_string("nchan_publisher_type"),     nchan_publisher_type_variable, 0},
-//  { ngx_string("nchan_message"),            nchan_message_variable, 0},
-  { ngx_string("nchan_prev_message_id"),    nchan_prev_message_id_variable, 0},
-  { ngx_string("nchan_message_id"),         nchan_message_id_variable, 0},
-  
-  STUB_STATUS_VARIABLE(channels),
-  STUB_STATUS_VARIABLE(subscribers),
-  STUB_STATUS_VARIABLE(total_published_messages),
-  STUB_STATUS_NAMED_VARIABLE("stored_messages", messages),
-  STUB_STATUS_VARIABLE(redis_pending_commands),
-  STUB_STATUS_VARIABLE(redis_connected_servers),
-  STUB_STATUS_NAMED_VARIABLE("total_ipc_alerts_received", ipc_total_alerts_received),
-  { ngx_string("nchan_stub_status_shared_memory_used"),  nchan_stub_status_shared_memory_used, 0},
-  { ngx_string("nchan_stub_status_ipc_alerts_in_transit"),  nchan_stub_status_ipc_alerts_in_transit, 0},
-  STUB_STATUS_NAMED_VARIABLE("ipc_queued_alerts", ipc_queue_size),
-  STUB_STATUS_NAMED_VARIABLE("total_ipc_send_delay", ipc_total_send_delay),
-  STUB_STATUS_NAMED_VARIABLE("total_ipc_receive_delay", ipc_total_receive_delay),
-  { ngx_string("nchan_version"), nchan_version_variable, 0},
-  
-//  { ngx_string("nchan_message_alert_type"), nchan_message_alert_type_variable, 0},
-  
-  { ngx_null_string,                        NULL, 0 }
-};
-
-
-ngx_int_t nchan_add_variables(ngx_conf_t *cf) {
-  nchan_variable_t              *var;
-  ngx_http_variable_t           *v;
-
-  for (var = nchan_vars; var->name.len; var++) {
-    
-    v = ngx_http_add_variable(cf, &var->name, NGX_HTTP_VAR_CHANGEABLE);
-    if (v == NULL) {
-      return NGX_ERROR;
-    }
-    
-    v->get_handler = var->handler;
-    v->data = var->data;
-  }
-
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/nchan_variables.h b/debian/modules/nchan/src/nchan_variables.h
deleted file mode 100644
index 726b99c..0000000
--- a/debian/modules/nchan/src/nchan_variables.h
+++ /dev/null
@@ -1 +0,0 @@
-ngx_int_t nchan_add_variables(ngx_conf_t *cf);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/nchan_version.h b/debian/modules/nchan/src/nchan_version.h
deleted file mode 100644
index 731f179..0000000
--- a/debian/modules/nchan/src/nchan_version.h
+++ /dev/null
@@ -1 +0,0 @@
-#define NCHAN_VERSION "1.2.15"
diff --git a/debian/modules/nchan/src/nchan_websocket_publisher.c b/debian/modules/nchan/src/nchan_websocket_publisher.c
deleted file mode 100644
index d198088..0000000
--- a/debian/modules/nchan/src/nchan_websocket_publisher.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <nchan_module.h>
-#include "subscribers/websocket.h"
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "WEBSOCKET_PUBLISHER:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "WEBSOCKET_PUBLISHER:" fmt, ##arg)
-
-static nchan_llist_timed_t  ws_pub_head;
-
-void nchan_websocket_publisher_llist_init() {
-  DBG("init WS publisher llist");
-  ws_pub_head.prev = &ws_pub_head;
-  ws_pub_head.next = &ws_pub_head;
-  ws_pub_head.data = NULL;
-  ws_pub_head.time = 0;
-}
-
-
-static nchan_llist_timed_t   *nchan_ws_llist_enqueue(subscriber_t *sub) {
-  nchan_llist_timed_t    *cur, *last;
-  if((cur = ngx_alloc(sizeof(*cur), ngx_cycle->log)) == NULL) {
-    ERR("couldn't allocate llink for websocket publisher");
-    return NULL;
-  }
-  last = ws_pub_head.prev;
-  
-  cur->prev = last;
-  last->next = cur;
-  
-  cur->next = &ws_pub_head;
-  ws_pub_head.prev = cur;
-  
-  cur->time = ngx_time();
-  cur->data = (void *)sub;
-  return cur;
-}
-
-static ngx_int_t nchan_ws_llink_destroy(nchan_llist_timed_t *cur) {
-  nchan_llist_timed_t    *prev, *next;
-  prev = cur->prev;
-  next = cur->next;
-  
-  prev->next = next;
-  next->prev = prev;
-  
-  ngx_memset(cur, 0xC4, sizeof(*cur)); //debugstuffs
-  ngx_free(cur);
-  return NGX_OK;
-}
-
-static void ws_publisher_dequeue_callback(subscriber_t *sub, void *privdata) {
-  nchan_ws_llink_destroy((nchan_llist_timed_t *)privdata);
-}
-
-static ngx_str_t   pub_name = ngx_string("websocket");
-
-ngx_int_t nchan_create_websocket_publisher(ngx_http_request_t  *r) {
-  subscriber_t         *sub;
-  nchan_llist_timed_t  *sub_link;
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  if(ctx) {
-    ctx->publisher_type = &pub_name;
-  }
-  
-  if((sub = websocket_subscriber_create(r, NULL)) == NULL) {
-    ERR("couldn't create websocket publisher.");
-    return NGX_ERROR;
-  }
-  
-  if((sub_link = nchan_ws_llist_enqueue(sub)) == NULL) {
-    websocket_subscriber_destroy(sub);
-    ERR("couldn't create websocket publisher llink");
-    return NGX_ERROR;
-  }
-  
-  sub->fn->set_dequeue_callback(sub, ws_publisher_dequeue_callback, sub_link);
-  sub->fn->enqueue(sub);
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/nchan_websocket_publisher.h b/debian/modules/nchan/src/nchan_websocket_publisher.h
deleted file mode 100644
index b08e419..0000000
--- a/debian/modules/nchan/src/nchan_websocket_publisher.h
+++ /dev/null
@@ -1,2 +0,0 @@
-void nchan_websocket_publisher_llist_init();
-ngx_int_t nchan_create_websocket_publisher(ngx_http_request_t  *r);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/store/memory/groups.c b/debian/modules/nchan/src/store/memory/groups.c
deleted file mode 100644
index 9691b0a..0000000
--- a/debian/modules/nchan/src/store/memory/groups.c
+++ /dev/null
@@ -1,570 +0,0 @@
-#include "groups.h"
-#include "store.h"
-#include "ipc-handlers.h"
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:GROUPS: " fmt, ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:GROUPS: " fmt, ##args)
-
-//#define NCHAN_DEBUG_GROUP_NOCACAHE 1
-#define MAX_GETGROUP_WAIT_TIME_BEFORE_RETRY 5
-
-static void *group_id(void *d) {
-  return &((group_tree_node_t *)d)->name;
-}
-
-#if NCHAN_DEBUG_GROUP_NOCACAHE
-ngx_int_t clear_group_if_not_owner(rbtree_seed_t *seed, void *node_data, void *pd) {
-  group_tree_node_t *gtn = node_data;
-  ngx_int_t          myslot = memstore_slot();
-  
-  if(memstore_str_owner(&gtn->name) != myslot) {
-    gtn->group = NULL; //asshole.
-    //DBG("cleared group %V shared data", &gtn->name);
-  }
-  return NGX_OK;
-}
-
-ngx_int_t jerk_group_clearer(void *pd) {
-  memstore_groups_t *gp = pd;
-  
-  rbtree_walk(&gp->tree, clear_group_if_not_owner, NULL);
-  
-  return NGX_OK;
-}
-#endif
-
-ngx_int_t memstore_groups_init(memstore_groups_t *gp) {
-  return rbtree_init(&gp->tree, "memstore groups", group_id, NULL, NULL);
-}
-
-ngx_int_t shutdown_walker(rbtree_seed_t *seed, void *node_data, void *privdata) {
-  group_tree_node_t *gtn = (group_tree_node_t *)node_data;
-  shmem_t *          shm = nchan_store_memory_shmem;
-  ngx_int_t          myslot = memstore_slot();
-  DBG("shutdown_walker %V group %p", &gtn->name, gtn->group);
-  if(memstore_str_owner(&gtn->name) == myslot) {
-    shm_free(shm, gtn->group);
-  }
-  return NGX_OK;
-}
-
-ngx_int_t memstore_groups_shutdown(memstore_groups_t *gp) {
-  rbtree_empty(&gp->tree, shutdown_walker, NULL);
-  DBG("empties rbtree");
-  return NGX_OK;
-}
-
-static group_tree_node_t *group_create_node(memstore_groups_t *gp, ngx_str_t *name, nchan_group_t *shm_group) {
-  //assumes node does not yet exist
-  ngx_rbtree_node_t      *node;
-  group_tree_node_t      *gtn;
-  
-  if((node = rbtree_create_node(&gp->tree, sizeof(group_tree_node_t) + name->len)) == NULL) {
-    ERR("couldn't alloc rbtree node for group %V", name);
-    return NULL;
-  }
-  gtn = rbtree_data_from_node(node);
-  gtn->name.len = name->len;
-  gtn->name.data = (u_char *)(&gtn[1]);
-  ngx_memcpy(gtn->name.data, name->data, name->len);
-  
-  gtn->group = shm_group;
-  
-  gtn->when_ready_head = NULL;
-  gtn->when_ready_tail = NULL;
-  
-  gtn->owned_chanhead_head = NULL;
-  
-  gtn->getting_group = 0;
-  
-  rbtree_insert_node(&gp->tree, node);
-  
-  return gtn;
-}
-
-static group_tree_node_t *group_owner_create_node(memstore_groups_t *gp, ngx_str_t *name) {
-  //ASSUMES group name is owned by current worker, AND node does not yet exist
-  group_tree_node_t      *gtn;
-  nchan_group_t          *group;
-  group = shm_calloc(nchan_store_memory_shmem, sizeof(*group) + name->len, "group");
-  if(group == NULL) {
-    nchan_log_ooshm_error("creating group %V", name);
-    return NULL;
-  }
-  
-  group->name.len = name->len;
-  group->name.data = (u_char *)(&group[1]);
-  ngx_memcpy(group->name.data, name->data, name->len);
-  
-  DBG("created group %p %V", group, &group->name);
-  
-  if((gtn = group_create_node(gp, name, group)) == NULL) {
-    shm_free(nchan_store_memory_shmem, group);
-    return NULL;
-  }
-  
-  memstore_ipc_broadcast_group(group);
-  
-  return gtn;
-}
-
-nchan_group_t *memstore_group_owner_find(memstore_groups_t *gp, ngx_str_t *name, int *group_just_created) {
-  ngx_rbtree_node_t      *node;
-  group_tree_node_t      *gtn;
-  assert(memstore_str_owner(name) == memstore_slot());
-  if((node = rbtree_find_node(&gp->tree, name)) != NULL) {
-    gtn = rbtree_data_from_node(node);
-    if(group_just_created) *group_just_created = 0;
-  }
-  else {
-    gtn = group_owner_create_node(gp, name);
-    if(group_just_created) *group_just_created = 1;
-  }
-  
-  return gtn ? gtn->group : NULL;
-}
-
-
-static ngx_int_t add_whenready_callback(group_tree_node_t *gtn, char *lbl, callback_pt cb, void *pd) {
-  //not ready yet, queue up the callback
-  group_callback_t  *gcb;
-  DBG("add to %p whenready %s for group %V", gtn, lbl, &gtn->name);
-  if((gcb = ngx_alloc(sizeof(*gcb), ngx_cycle->log)) == NULL) {
-    ERR("couldn't allocate callback link for group %V", &gtn->name);
-    cb(NGX_ERROR, NULL, pd);
-    return NGX_ERROR;
-  }
-  
-  gcb->cb = cb;
-  gcb->pd = pd;
-  gcb->label = lbl;
-  gcb->next = NULL;
-  
-  if(gtn->when_ready_tail) {
-    gtn->when_ready_tail->next = gcb;
-  }
-  
-  if(!gtn->when_ready_head) {
-    gtn->when_ready_head = gcb;
-  }
-  
-  
-  gtn->when_ready_tail = gcb;
-  
-  for(gcb = gtn->when_ready_head; gcb != NULL; gcb = gcb->next){
-    DBG("  whenready %s", gcb->label);
-  }
-  
-  if(ngx_time() - gtn->getting_group > MAX_GETGROUP_WAIT_TIME_BEFORE_RETRY) {
-    gtn->getting_group = ngx_time();
-    memstore_ipc_send_get_group(memstore_str_owner(&gtn->name), &gtn->name);    
-  }
-  
-  return NGX_OK;
-}
-
-static void call_whenready_callbacks(group_tree_node_t *gtn, nchan_group_t *shm_group) {
-  group_callback_t       *gcb, *next_gcb;
-  
-  for(gcb = gtn->when_ready_head; gcb != NULL; gcb = next_gcb) {
-    DBG("whenready for %p callback %s for group %V", gtn, gcb->label, &gtn->name);
-    next_gcb = gcb->next;
-    gcb->cb(shm_group ? NGX_OK : NGX_ERROR, shm_group , gcb->pd);
-    ngx_free(gcb);
-  }
-  gtn->when_ready_head = NULL;
-  gtn->when_ready_tail = NULL;
-}
-
-ngx_int_t memstore_group_find_from_groupnode(memstore_groups_t *gp, group_tree_node_t *gtn, callback_pt cb, void *pd) {
-  if(!gtn) {
-    cb(NGX_ERROR, NULL, pd);
-    return NGX_ERROR;
-  }
-  if(gtn->group) {
-    cb(NGX_OK, gtn->group, pd);
-  }
-  else {
-    add_whenready_callback(gtn, "group find", cb, pd);
-  }
-  return NGX_OK;
-}
-
-ngx_int_t memstore_group_find(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd) {
-#if NCHAN_DEBUG_GROUP_NOCACAHE
-  static int hmm = 0;
-  if(!hmm) {
-    nchan_add_interval_timer(jerk_group_clearer, gp, 100);
-    hmm = 1; 
-  }
-#endif
-  group_tree_node_t  *gtn = memstore_groupnode_get(gp, name);
-  return memstore_group_find_from_groupnode(gp, gtn, cb, pd);
-}
-
-group_tree_node_t *memstore_groupnode_get(memstore_groups_t *gp, ngx_str_t *name) {
-  ngx_rbtree_node_t      *node;
-  group_tree_node_t      *gtn = NULL;
-  ngx_int_t               owner;
-  if((node = rbtree_find_node(&gp->tree, name)) != NULL) {
-    gtn = rbtree_data_from_node(node);
-  }
-  else {
-    owner = memstore_str_owner(name);
-    if(owner == memstore_slot()) {
-      gtn = group_owner_create_node(gp, name);
-    }
-    else {
-      if((gtn = group_create_node(gp, name, NULL))!=NULL) {
-        gtn->getting_group=1;
-        memstore_ipc_send_get_group(memstore_str_owner(name), name);
-      }
-    }
-    if(!gtn) {
-      ERR("couldn't create groupnode for group %V", name);
-    }
-  }
-  return gtn;
-}
-
-ngx_int_t memstore_group_receive(memstore_groups_t *gp, nchan_group_t *shm_group) {
-  ngx_rbtree_node_t      *node;
-  group_tree_node_t      *gtn = NULL;
-  
-  assert(memstore_str_owner(&shm_group->name) != memstore_slot());
-  
-  DBG("memstore group receive %V", &shm_group->name);
-  
-  if((node = rbtree_find_node(&gp->tree, &shm_group->name)) != NULL) {
-    gtn = rbtree_data_from_node(node);  
-    gtn->group = shm_group;
-    gtn->getting_group = 0;
-    call_whenready_callbacks(gtn, shm_group);
-    
-#if NCHAN_DEBUG_GROUP_NOCACAHE
-    gtn->group = NULL;
-#endif
-    
-  }
-  else {
-    gtn = group_create_node(gp, &shm_group->name, shm_group);
-    DBG("created node %p", gtn);
-  }
-  
-  return NGX_OK;
-}
-
-ngx_int_t memstore_group_receive_delete(memstore_groups_t *gp, nchan_group_t *shm_group) {
-  memstore_channel_head_t    *cur;
-  group_tree_node_t          *gtn = NULL;
-  ngx_rbtree_node_t          *node;
-  DBG("receive GROUP DELETE for %V", &shm_group->name);
-  if((node = rbtree_find_node(&gp->tree, &shm_group->name)) != NULL) {
-    gtn = rbtree_data_from_node(node);
-  }
-  DBG("gtn is %V", gtn);
-  if(gtn) {
-    
-    call_whenready_callbacks(gtn, NULL);
-    
-    while((cur = gtn->owned_chanhead_head) != NULL) {
-      memstore_group_dissociate_own_channel(cur);
-      nchan_store_memory.delete_channel(&cur->id, cur->cf, NULL, NULL);
-    }
-  }
-  
-  return NGX_OK;
-}
-
-typedef struct {
-  callback_pt        cb;
-  void              *pd;
-  memstore_groups_t *gp;
-  unsigned           owned;
-} group_delete_callback_data_t;
-
-static ngx_int_t group_delete_callback(ngx_int_t rc, nchan_group_t *shm_group, group_delete_callback_data_t *d) {
-  static nchan_group_t  group;
-  if(shm_group) {
-    DBG("GROUP DELETE find_group callback for %V", &shm_group->name);
-    group = *shm_group;
-    if(d->owned) {
-      memstore_group_receive_delete(d->gp, shm_group);
-    }
-    memstore_ipc_broadcast_group_delete(shm_group);
-  }
-  else {
-    ERR("group for delete callback is NULL");
-    ngx_memzero(&group, sizeof(group));
-  }
-  d->cb(rc, &group, d->pd);
-  ngx_free(d);
-  return NGX_OK;
-}
-
-ngx_int_t memstore_group_delete(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd) {
-  group_tree_node_t            *gtn = NULL;
-  ngx_int_t                     owner = memstore_str_owner(name);
-  group_delete_callback_data_t *d;
-  
-  if((gtn = memstore_groupnode_get(gp, name)) == NULL) {
-    ERR("couldn't get groupnode for deletion");
-    cb(NGX_ERROR, NULL, pd);
-    return NGX_ERROR;
-  }
-  
-  if((d = ngx_alloc(sizeof(*d), ngx_cycle->log)) == NULL) {
-    ERR("couldn't alloc callback data for group deletion");
-    cb(NGX_ERROR, NULL, pd);
-    return NGX_ERROR;
-  }
-  
-  d->cb = cb;
-  d->pd = pd;
-  d->gp = gp;
-  d->owned = owner == memstore_slot();
-  DBG("start DELETE GROUP %V", &gtn->name);
-  return memstore_group_find(gp, &gtn->name, (callback_pt )group_delete_callback, d);
-}
-
-
-static void verify_gnd(memstore_channel_head_t *ch) {
-  /*
-  memstore_channel_head_t *cur;
-  int n=0, n2=0;
-  for(cur = ch; cur != NULL; cur = cur->groupnode_next) {
-    if(cur->groupnode_next) {
-      assert(cur->groupnode_next->groupnode_prev == cur);
-      n++;
-    }
-  }
-  for(cur = ch; cur != NULL; cur = cur->groupnode_prev) {
-    if(cur->groupnode_prev) {
-      assert(cur->groupnode_prev->groupnode_next == cur);
-      n++;
-    }
-  }
-
-  if(ch->groupnode) {
-    int prevnulls = 0;
-    int nextnulls = 0;
-    for(cur = ch->groupnode->owned_chanhead_head; cur != NULL; cur = cur->groupnode_next) {
-      n2++;
-      if(!cur->groupnode_prev) {
-        assert(++prevnulls <= 1);
-      }
-      else {
-        assert(cur->groupnode_prev->groupnode_next == cur);
-      }
-      
-      if(!cur->groupnode_next) {
-        assert(++nextnulls <= 1);
-      }
-      else {
-        assert(cur->groupnode_next->groupnode_prev == cur);
-      }
-    }
-    if(n>0) {
-      assert(n2 - 1 == n);
-    }
-  }
-  */
-}
-
-static void verify_gnd_ch_absent(memstore_channel_head_t *ch) {
-  /*memstore_channel_head_t *cur;
-  for(cur = ch->groupnode->owned_chanhead_head; cur != NULL; cur = cur->groupnode_next) {
-    assert(cur != ch);
-    if(cur->groupnode_prev) {      
-      assert(cur->groupnode_prev != ch);
-    }
-  }
-  */
-  /*memstore_channel_head_t *tmp;
-  HASH_ITER(hh, mpt->hash, cur, tmp) {
-    assert(cur->groupnode_prev != ch);
-    assert(cur->groupnode_next != ch);
-  }*/
-}
-
-
-void memstore_group_associate_own_channel(memstore_channel_head_t *ch) {
-  group_tree_node_t *gtn = ch->groupnode;
-  
-  verify_gnd(ch);
-  verify_gnd_ch_absent(ch);
-  
-  assert(ch->owner == memstore_slot());
-  
-  if(!ch->multi) {
-    ch->groupnode_next = gtn->owned_chanhead_head;
-    if(gtn->owned_chanhead_head) {
-      gtn->owned_chanhead_head->groupnode_prev = ch;
-    }
-    gtn->owned_chanhead_head = ch;
-    
-  }
-  
-  verify_gnd(ch);
-}
-
-void memstore_group_dissociate_own_channel(memstore_channel_head_t *ch) {
-  verify_gnd(ch);
-  assert(ch->owner == memstore_slot());
-  if(!ch->multi) {
-    if(ch->groupnode->owned_chanhead_head == ch) {
-      ch->groupnode->owned_chanhead_head = ch->groupnode_next;
-    }
-    if(ch->groupnode_prev) {
-      assert(ch->groupnode_prev->groupnode_next == ch);
-      ch->groupnode_prev->groupnode_next = ch->groupnode_next;
-    }
-    if(ch->groupnode_next) {
-      assert(ch->groupnode_next->groupnode_prev == ch);
-      ch->groupnode_next->groupnode_prev = ch->groupnode_prev;
-    }
-    
-    ch->groupnode_prev = NULL;
-    ch->groupnode_next = NULL;
-  }
-  assert(ch->groupnode->owned_chanhead_head != ch);
-  verify_gnd(ch);
-  verify_gnd_ch_absent(ch);
-}
-
-
-
-static ngx_int_t group_add_channel_internal(nchan_group_t *shm_group, int multi, int self_owned, int n) {
-  if(shm_group) {
-    if(multi) {
-      ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->multiplexed_channels, n);
-    }
-    else if (self_owned) {
-      ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->channels, n);
-    }
-  }
-  return NGX_OK;
-}
-
-typedef struct {
-  int       n;
-  unsigned  multi:1;
-  unsigned  self_owned:1;
-} add_channel_count_callback_data_t;
-
-static ngx_int_t group_add_channel_callback(ngx_int_t rc, nchan_group_t *shm_group, add_channel_count_callback_data_t *d) {
-  group_add_channel_internal(shm_group, d->multi, d->self_owned, d->n);
-  ngx_free(d);
-  return NGX_OK;
-}
-
-static ngx_int_t memstore_group_add_channel_generic(memstore_channel_head_t *ch, int n) {
-  int self_owned = ch->owner == memstore_slot();
-  if(ch->groupnode->group) {
-    group_add_channel_internal(ch->groupnode->group, ch->multi != NULL, self_owned, n);
-  }
-  else {
-    add_channel_count_callback_data_t             *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
-    if(!d) {
-      ERR("Couldn't allocate group_add_channel data");
-      return NGX_ERROR;
-    }
-    else {
-      d->n = n;
-      d->multi = ch->multi != NULL;
-      d->self_owned = self_owned;
-      add_whenready_callback(ch->groupnode, "add channel", (callback_pt )group_add_channel_callback, d);
-    }
-  }
-  return NGX_OK;
-}
-
-ngx_int_t memstore_group_add_channel(memstore_channel_head_t *ch) {
-  return memstore_group_add_channel_generic(ch, 1);
-}
-
-ngx_int_t memstore_group_remove_channel(memstore_channel_head_t *ch) {
-  return memstore_group_add_channel_generic(ch, -1);
-}
-
-static ngx_int_t group_add_message_internal(nchan_group_t *shm_group, size_t mem_sz, size_t file_sz, int n) {
-  
-  if(shm_group) {
-    ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->messages, n);
-    ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->messages_shmem_bytes, n * mem_sz);
-    if(file_sz > 0) {
-      ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->messages_file_bytes, n * file_sz);
-    }
-  }
-  return NGX_OK;
-}
-
-typedef struct {
-  int n;
-  size_t mem_sz;
-  size_t file_sz;
-} add_message_callback_data_t;
-
-static ngx_int_t group_add_message_callback(ngx_int_t rc, nchan_group_t *shm_group, add_message_callback_data_t *d) {
-  group_add_message_internal(shm_group, d->mem_sz, d->file_sz, d->n);
-  ngx_free(d);
-  return NGX_OK;
-}
-
-static ngx_int_t memstore_group_add_message_generic(group_tree_node_t *gtn, nchan_msg_t *msg, int n) {
-  size_t         mem_sz = memstore_msg_memsize(msg);
-  size_t         file_sz = ngx_buf_in_memory_only((&msg->buf)) ? 0 : ngx_buf_size((&msg->buf));
-  if(gtn->group) {
-    group_add_message_internal(gtn->group, mem_sz, file_sz, n);
-  }
-  else {
-    add_message_callback_data_t *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
-    if(!d) {
-      ERR("Couldn't allocate group_add_message data");
-      return NGX_ERROR;
-    }
-    else {
-      d->n = n;
-      d->mem_sz = mem_sz;
-      d->file_sz = file_sz;
-      add_whenready_callback(gtn, "add message", (callback_pt )group_add_message_callback, d);
-    }
-  }
-  return NGX_OK;
-}
-
-ngx_int_t memstore_group_add_message(group_tree_node_t *gtn, nchan_msg_t *msg) {
-  return memstore_group_add_message_generic(gtn, msg, 1);
-}
-
-ngx_int_t memstore_group_remove_message(group_tree_node_t *gtn, nchan_msg_t *msg) {
-  return memstore_group_add_message_generic(gtn, msg, -1);
-}
-
-
-
-static ngx_int_t group_add_subscribers_internal(nchan_group_t *shm_group, int n) {
-  if(shm_group) {
-    ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->subscribers, n);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t group_add_subscribers_callback(ngx_int_t rc, nchan_group_t *shm_group, void *pd) {
-  intptr_t    n = (intptr_t )pd;
-  group_add_subscribers_internal(shm_group, n);
-  return NGX_OK;
-}
-
-ngx_int_t memstore_group_add_subscribers(group_tree_node_t *gtn, int count) {
-  if(gtn->group) {
-    group_add_subscribers_internal(gtn->group, count);
-  }
-  else {
-    add_whenready_callback(gtn, "add subscribers", (callback_pt )group_add_subscribers_callback, (void *)(intptr_t )count);
-  }
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/store/memory/groups.h b/debian/modules/nchan/src/store/memory/groups.h
deleted file mode 100644
index 6fc80dd..0000000
--- a/debian/modules/nchan/src/store/memory/groups.h
+++ /dev/null
@@ -1,55 +0,0 @@
- #ifndef MEMSTORE_GROUPS_HEADER
-#define MEMSTORE_GROUPS_HEADER
-#include <nchan_module.h>
-#include <util/nchan_rbtree.h>
-
-typedef struct {
-  rbtree_seed_t           tree;
-} memstore_groups_t;
-
-typedef struct group_tree_node_s group_tree_node_t ;
-
-#include "store-private.h"
-
-typedef struct group_callback_s group_callback_t ;
-struct group_callback_s {
-  callback_pt         cb;
-  void               *pd;
-  group_callback_t   *next;
-  char               *label;
-};
-
-struct group_tree_node_s {
-  ngx_str_t                 name; //local memory copy of group name
-  nchan_group_t            *group;
-  group_callback_t         *when_ready_head;
-  group_callback_t         *when_ready_tail;
-  memstore_channel_head_t  *owned_chanhead_head;
-  time_t                    getting_group;
-};
-
-ngx_int_t memstore_groups_init(memstore_groups_t *);
-ngx_int_t memstore_groups_shutdown(memstore_groups_t *);
-
-
-ngx_int_t memstore_group_find(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd);
-ngx_int_t memstore_group_find_from_groupnode(memstore_groups_t *gp, group_tree_node_t *gtn, callback_pt cb, void *pd);
-
-
-group_tree_node_t *memstore_groupnode_get(memstore_groups_t *gp, ngx_str_t *name);
-nchan_group_t *memstore_group_owner_find(memstore_groups_t *gp, ngx_str_t *name, int *group_just_created);
-ngx_int_t memstore_group_receive(memstore_groups_t *gp, nchan_group_t *shm_group);
-ngx_int_t memstore_group_delete(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd);
-ngx_int_t memstore_group_receive_delete(memstore_groups_t *gp, nchan_group_t *shm_group);
-
-ngx_int_t memstore_group_add_channel(memstore_channel_head_t *ch);
-ngx_int_t memstore_group_remove_channel(memstore_channel_head_t *ch);
-
-void memstore_group_associate_own_channel(memstore_channel_head_t *ch);
-void memstore_group_dissociate_own_channel(memstore_channel_head_t *ch);
-
-ngx_int_t memstore_group_add_message(group_tree_node_t *gtn, nchan_msg_t *msg);
-ngx_int_t memstore_group_remove_message(group_tree_node_t *gtn, nchan_msg_t *msg);
-
-ngx_int_t memstore_group_add_subscribers(group_tree_node_t *gtn, int count);
-#endif //MEMSTORE_GROUPS_HEADER
diff --git a/debian/modules/nchan/src/store/memory/ipc-handlers.c b/debian/modules/nchan/src/store/memory/ipc-handlers.c
deleted file mode 100644
index 5b7a6bc..0000000
--- a/debian/modules/nchan/src/store/memory/ipc-handlers.c
+++ /dev/null
@@ -1,1158 +0,0 @@
-#include <nchan_module.h>
-#include <ngx_channel.h>
-#include "ipc.h"
-#include "ipc-handlers.h"
-#include "store-private.h"
-#include "store.h"
-#include <assert.h>
-#include <store/redis/store.h>
-#include <subscribers/memstore_ipc.h>
-#include <subscribers/getmsg_proxy.h>
-#include <subscribers/memstore_redis.h>
-#include <util/nchan_msg.h>
-#include <util/nchan_benchmark.h>
-
-
-//macro black magic, AKA X-Macros
-#define LIST_IPC_COMMANDS(L) \
-  L(subscribe) \
-  L(subscribe_reply) \
-  L(subscribe_chanhead_release) \
-  L(subscribe_chanhead_nevermind_release) \
-  L(unsubscribed) \
-  L(publish_message) \
-  L(publish_message_reply) \
-  L(publish_status) \
-  L(publish_notice) \
-  L(get_message) \
-  L(get_message_reply) \
-  L(delete) \
-  L(delete_reply) \
-  L(get_channel_info) \
-  L(get_channel_info_reply) \
-  L(channel_auth_check) \
-  L(channel_auth_check_reply) \
-  L(subscriber_keepalive) \
-  L(subscriber_keepalive_reply) \
-  L(get_group) \
-  L(group) \
-  L(group_delete) \
-  L(flood_test) \
-  L(benchmark_initialize) \
-  L(benchmark_start) \
-  L(benchmark_stop) \
-  L(benchmark_abort) \
-  L(benchmark_finish) \
-  L(benchmark_finish_reply) \
-
-
-
-#define MAKE_ipc_handlers_t(val) ipc_handler_pt val;
-typedef struct {
-  LIST_IPC_COMMANDS(MAKE_ipc_handlers_t)
-} ipc_handlers_t;
-
-#define MAKE_ipc_command_codes_t(val) int val;
-typedef struct {
-  LIST_IPC_COMMANDS(MAKE_ipc_command_codes_t);
-} ipc_command_codes_t;
-
-#define MAKE_ipc_cmd(val) offsetof(ipc_handlers_t, val)/sizeof(ipc_handler_pt),
-static ipc_command_codes_t ipc_cmd = {
-  LIST_IPC_COMMANDS(MAKE_ipc_cmd)
-};
-
-#define IPC_CMDS (sizeof(ipc_handlers_t)/sizeof(ipc_handler_pt))
-
-#define ipc_cmd(cmd, dst, data) ipc_alert(nchan_memstore_get_ipc(), dst, ipc_cmd.cmd, data, sizeof(*(data)))
-#define ipc_broadcast_cmd(cmd, data) ipc_broadcast_alert(nchan_memstore_get_ipc(), ipc_cmd.cmd, data, sizeof(*(data)))
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "IPC-HANDLERS(%i):" fmt, memstore_slot(), ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "IPC-HANDLERS(%i):" fmt, memstore_slot(), ##args)
-
-//#define DEBUG_MEMZERO(var) ngx_memzero(var, sizeof(*(var)))
-#define DEBUG_MEMZERO(var) /*nothing*/
-
-//lots of copypasta here, but it's the fastest way for me to write these IPC handlers
-//maybe TODO: simplify this stuff, but probably not as it's not a performance penalty and the code is simple
-
-
-//static ngx_int_t empty_callback() {
-//  return NGX_OK;
-//}
-
-static nchan_msg_id_t zero_msgid = NCHAN_ZERO_MSGID;
-
-static ngx_str_t *str_shm_copy(ngx_str_t *str){
-  ngx_str_t *out;
-  out = shm_copy_immutable_string(nchan_store_memory_shmem, str);
-  if(out) {
-    DBG("create shm_str %p (data@ %p) %V", out, out->data, out);
-  }
-  return out;
-}
-
-static void str_shm_free(ngx_str_t *str) {
-  DBG("free shm_str %V @ %p", str, str->data);
-  shm_free_immutable_string(nchan_store_memory_shmem, str);
-}
-
-////////// SUBSCRIBE ////////////////
-typedef struct {
-  ngx_str_t                   *shm_chid;
-  store_channel_head_shm_t    *shared_channel_data;
-  nchan_loc_conf_t            *cf;
-  memstore_channel_head_t     *origin_chanhead;
-  memstore_channel_head_t     *owner_chanhead;
-  subscriber_t                *subscriber;
-  ngx_int_t                    rc;
-} subscribe_data_t;
-
-ngx_int_t memstore_ipc_send_subscribe(ngx_int_t dst, ngx_str_t *chid, memstore_channel_head_t *origin_chanhead, nchan_loc_conf_t *cf) {
-  DBG("send subscribe to %i, %V", dst, chid);
-
-  subscribe_data_t   data; 
-  DEBUG_MEMZERO(&data);
-  
-  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
-    nchan_log_ooshm_error("sending IPC subscribe alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-  data.shared_channel_data = NULL;
-  data.origin_chanhead = origin_chanhead;
-  data.owner_chanhead = NULL;
-  data.cf = cf;
-  
-  assert(memstore_str_owner(data.shm_chid) == dst);
-  
-  return ipc_cmd(subscribe, dst, &data);
-}
-static void receive_subscribe(ngx_int_t sender, subscribe_data_t *d) {
-  memstore_channel_head_t    *head;
-  subscriber_t               *ipc_sub = NULL;
-  ngx_int_t                   rc;
-  
-  DBG("received subscribe request for channel %V", d->shm_chid);
-  head = nchan_memstore_get_chanhead(d->shm_chid, d->cf);
-  
-  if(head == NULL) {
-    //ERR("couldn't get chanhead while receiving subscribe ipc msg");
-    d->shared_channel_data = NULL;
-    d->subscriber = NULL;
-  }
-  else {
-    ipc_sub = memstore_ipc_subscriber_create(sender, &head->id, d->cf, d->origin_chanhead);
-    d->subscriber = ipc_sub;
-    d->shared_channel_data = head->shared;
-    d->owner_chanhead = head;
-    memstore_chanhead_reserve(head, "interprocess subscribe");
-    
-    ngx_atomic_fetch_add(&head->shared->gc.outside_refcount, 1); //it's awkward to put this refcount here, but necessary.
-    
-    assert(d->shared_channel_data);
-  }
-  
-  if(ipc_sub) {
-    rc = head->spooler.fn->add(&head->spooler, ipc_sub);
-    d->rc = rc;
-  }
-  else {
-    d->rc = NGX_ERROR;
-  }
-  
-  ipc_cmd(subscribe_reply, sender, d);
-  DBG("sent subscribe reply for channel %V to %i", d->shm_chid, sender);
-}
-static void receive_subscribe_reply(ngx_int_t sender, subscribe_data_t *d) {
-  memstore_channel_head_t      *head;
-  store_channel_head_shm_t     *old_shared;
-  DBG("received subscribe reply for channel %V", d->shm_chid);
-  //we have the chanhead address, but are too afraid to use it.
-  
-  if((head = nchan_memstore_get_chanhead_no_ipc_sub(d->shm_chid, d->cf)) == NULL) {
-    ERR("Error regarding an aspect of life or maybe freshly fallen cookie crumbles");
-    str_shm_free(d->shm_chid);
-    return;
-  }
-  
-  if(head != d->origin_chanhead) {    
-    assert(d->owner_chanhead);
-    ipc_cmd(subscribe_chanhead_nevermind_release, sender, d);
-    return;
-  }
-  
-  if(!d->shared_channel_data && !d->subscriber) {
-    //ERR("failed to subscribe");
-    nchan_memstore_publish_generic(head, NULL, NGX_HTTP_INSUFFICIENT_STORAGE, NULL);
-    head->status = NOTREADY;
-    chanhead_gc_add(head, "failed to subscribe to channel owner worker");
-  }
-  else {
-    old_shared = head->shared;
-    if(old_shared) {
-      assert(old_shared == d->shared_channel_data);
-    }
-    DBG("receive subscribe proceed to do ipc_sub stuff");
-    head->shared = d->shared_channel_data;
-    
-    if(old_shared == NULL) {
-      //ERR("%V local total_sub_count %i, internal_sub_count %i", &head->id,  head->sub_count, head->internal_sub_count);
-      assert(head->total_sub_count >= head->internal_sub_count);
-      ngx_atomic_fetch_add(&head->shared->sub_count, head->total_sub_count - head->internal_sub_count);
-      ngx_atomic_fetch_add(&head->shared->internal_sub_count, head->internal_sub_count);
-    }
-    else {
-      ERR("%V sub count already shared, don't update", &head->id);
-    }
-    
-    assert(head->shared != NULL);
-    if(head->foreign_owner_ipc_sub && head->foreign_owner_ipc_sub != d->subscriber) {
-      // we got another subscriber for this chanhead, probably due to some very heavy delays
-      // discard it, keeping the old one.
-      // (It might be nice to discard the _old_ subscriber, but the owner worker may have already deleted it
-      // or may have changed altogether due to a previous worker crash)
-      ERR("Got ipc-subscriber for an already subscribed channel %V", &head->id);
-      memstore_ready_chanhead_unless_stub(head);
-      ipc_cmd(subscribe_chanhead_nevermind_release, sender, d);
-      return;
-    }
-    else {
-      head->foreign_owner_ipc_sub = d->subscriber;
-    }
-    
-    memstore_ready_chanhead_unless_stub(head);
-  }
-  
-  str_shm_free(d->shm_chid);
-  if(d->owner_chanhead) {
-    ipc_cmd(subscribe_chanhead_release, sender, d);
-  }
-}
-
-static void receive_subscribe_chanhead_release(ngx_int_t sender, subscribe_data_t *d) {
-  DBG("release the %V", &d->owner_chanhead->id);
-  memstore_chanhead_release(d->owner_chanhead, "interprocess subscribe");
-}
-static void receive_subscribe_chanhead_nevermind_release(ngx_int_t sender, subscribe_data_t *d) {
-  ERR("release & nevermind the %V", &d->owner_chanhead->id);
-  memstore_channel_head_t      *head;
-  head = nchan_memstore_find_chanhead(d->shm_chid);
-  if(head == NULL || head != d->owner_chanhead) {
-    ERR("wrong chanhead on receive_subscribe_chanhead_nevermind_release ( expected %p, got %p)", d->owner_chanhead, head);
-    return;
-  }
-  
-  memstore_ipc_subscriber_unhook(d->subscriber);
-  d->subscriber->fn->respond_status(d->subscriber, NGX_HTTP_GONE, NULL, NULL);
-  
-  memstore_chanhead_release(d->owner_chanhead, "interprocess subscribe");
-  str_shm_free(d->shm_chid);
-}
-
-
-////////// UNSUBSCRIBED ////////////////
-typedef struct {
-  ngx_str_t    *shm_chid;
-  void         *privdata;
-} unsubscribed_data_t;
-
-ngx_int_t memstore_ipc_send_unsubscribed(ngx_int_t dst, ngx_str_t *chid, void* privdata) {
-  DBG("send unsubscribed to %i %V", dst, chid);
-  unsubscribed_data_t        data = {str_shm_copy(chid), privdata};
-  if(data.shm_chid == NULL) {
-    nchan_log_ooshm_error("sending IPC unsubscribe alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-  return ipc_cmd(unsubscribed, dst, &data);
-}
-static void receive_unsubscribed(ngx_int_t sender, unsubscribed_data_t *d) {
-  DBG("received unsubscribed request for channel %V privdata %p", d->shm_chid, d->privdata);
-  if(memstore_channel_owner(d->shm_chid) != memstore_slot()) {
-    memstore_channel_head_t    *head;
-    //find channel
-    head = nchan_memstore_find_chanhead(d->shm_chid);
-    if(head == NULL) {
-      //already deleted maybe?
-      DBG("already unsubscribed...");
-      return;
-    }
-    //gc if no subscribers
-    if(head->total_sub_count == 0) {
-      DBG("add %p to GC", head);
-      head->foreign_owner_ipc_sub = NULL;
-      chanhead_gc_add(head, "received UNSUBSCRIVED over ipc, sub_count == 0");
-    }
-    else {
-      //subscribe again?...
-      DBG("maybe subscribe again?...");
-    }
-  }
-  else {
-    ERR("makes no sense...");
-  }
-  str_shm_free(d->shm_chid);
-}
-
-////////// PUBLISH STATUS ////////////////
-typedef struct {
-  ngx_str_t                 *shm_chid;
-  ngx_int_t                  code;
-  const ngx_str_t           *data;
-  callback_pt                callback;
-  void                      *callback_privdata;
-} publish_code_data_t;
-
-ngx_int_t memstore_ipc_send_publish_status(ngx_int_t dst, ngx_str_t *chid, ngx_int_t status_code, const ngx_str_t *status_line, callback_pt callback, void *privdata) {
-  DBG("IPC: send publish status to %i ch %V", dst, chid);
-  publish_code_data_t  data = {str_shm_copy(chid), status_code, status_line, callback, privdata};
-  if(data.shm_chid == NULL) {
-    nchan_log_ooshm_error("sending IPC status alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-  return ipc_cmd(publish_status, dst, &data);
-}
-
-static void receive_publish_status(ngx_int_t sender, publish_code_data_t *d) {
-  memstore_channel_head_t       *chead;
-  
-  if((chead = nchan_memstore_find_chanhead(d->shm_chid)) == NULL) {
-    if(ngx_exiting || ngx_quit) {
-      ERR("can't find chanhead for id %V, but it's okay.", d->shm_chid);
-    }
-    else {
-      ERR("Can't find chanhead for id %V while publishing status %i. This is not a big deal if you just reloaded Nchan.", d->shm_chid, d->code);
-    }
-    str_shm_free(d->shm_chid);
-    return;
-  }
-  
-  DBG("IPC: received publish status for channel %V status %i", d->shm_chid, d->code);
-  
-  nchan_memstore_publish_generic(chead, NULL, d->code, d->data);
-  
-  str_shm_free(d->shm_chid);
-  d->shm_chid=NULL;
-}
-
-////////// PUBLISH_NOTICE ////////////////
-ngx_int_t memstore_ipc_send_publish_notice(ngx_int_t dst, ngx_str_t *chid, ngx_int_t notice_code, void *notice_data) {
-  DBG("IPC: send publish notice to %i ch %V", dst, chid);
-  publish_code_data_t  data = {str_shm_copy(chid), notice_code, notice_data, NULL, NULL};
-  if(data.shm_chid == NULL) {
-    nchan_log_ooshm_error("sending IPC notice alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-  return ipc_cmd(publish_notice, dst, &data);
-}
-
-static void receive_publish_notice(ngx_int_t sender, publish_code_data_t *d) {
-  memstore_channel_head_t       *chead;
-  if((chead = nchan_memstore_find_chanhead(d->shm_chid)) == NULL) {
-    if(ngx_exiting || ngx_quit) {
-      ERR("can't find chanhead for id %V, but it's okay.", d->shm_chid);
-    }
-    else {
-      ERR("Can't find chanhead for id %V while publishing status %i. This is not a big deal if you just reloaded Nchan.", d->shm_chid, d->code);
-    }
-    str_shm_free(d->shm_chid);
-    return;
-  }
-  
-  DBG("IPC: received publish notice for channel %V notice %i", d->shm_chid, d->code);
-  
-  nchan_memstore_publish_notice(chead, d->code, d->data);
-  
-  str_shm_free(d->shm_chid);
-}
-
-////////// PUBLISH  ////////////////
-typedef struct {
-  ngx_str_t                 *shm_chid;
-  nchan_msg_t               *shm_msg;
-  nchan_loc_conf_t          *cf;
-  callback_pt                callback;
-  void                      *callback_privdata;
-  
-} publish_data_t;
-
-ngx_int_t memstore_ipc_send_publish_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_t *shm_msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  publish_data_t    data; 
-  DEBUG_MEMZERO(&data);
-  
-  DBG("IPC: send publish message to %i ch %V", dst, chid);
-  assert(shm_msg->storage == NCHAN_MSG_SHARED);
-  assert(chid->data != NULL);
-  data.shm_chid = str_shm_copy(chid);
-  if(data.shm_chid == NULL) {
-    nchan_log_ooshm_error("sending IPC publish-message alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-  data.shm_msg = shm_msg;
-  data.cf = cf;
-  data.callback = callback;
-  data.callback_privdata = privdata;
-  
-  assert(data.shm_chid->data != NULL);
-  assert(msg_reserve(shm_msg, "publish_message") == NGX_OK);
-  
-  return ipc_cmd(publish_message, dst, &data);
-}
-
-typedef struct {
-  ngx_int_t        sender;
-  publish_data_t  *d;
-  unsigned         allocd:1;
-} publish_callback_data;
-
-static ngx_int_t publish_message_generic_callback(ngx_int_t, void *, void *);
-
-static void receive_publish_message(ngx_int_t sender, publish_data_t *d) {
-  
-  publish_callback_data         cd_data;
-  publish_callback_data        *cd;
-  memstore_channel_head_t      *head;
-
-  assert(d->shm_chid->data != NULL);
-  
-  DBG("IPC: received publish request for channel %V  msg %p", d->shm_chid, d->shm_msg);
-  
-  if(memstore_channel_owner(d->shm_chid) == memstore_slot()) {
-    if(d->cf->redis.enabled) {
-      cd = ngx_alloc(sizeof(*cd) + sizeof(*d), ngx_cycle->log);
-      cd->allocd=1;
-      cd->d = (publish_data_t *)&cd[1];
-      *cd->d = *d;
-    }
-    else {
-      cd = &cd_data;
-      cd->allocd=0;
-      cd->d = d;
-    }
-    
-    cd->sender = sender;
-    
-    nchan_store_publish_message_generic(d->shm_chid, d->shm_msg, 1, d->cf, publish_message_generic_callback, cd);
-    //string will be freed on publish response
-  }
-  else {
-    if((head = nchan_memstore_get_chanhead(d->shm_chid, d->cf))) {
-      nchan_memstore_publish_generic(head, d->shm_msg, 0, NULL);
-    }
-    else {
-      ERR("Unable to get chanhead for publishing");
-    }
-    
-    //don't deallocate shm_msg
-  }
-  
-  msg_release(d->shm_msg, "publish_message");
-  str_shm_free(d->shm_chid);
-  d->shm_chid=NULL;
-}
-
-typedef struct {
-  uint16_t        status;// NCHAN_MESSAGE_RECEIVED or NCHAN_MESSAGE_QUEUED;
-  uint32_t        subscribers;
-  uint16_t        messages;
-  time_t          last_seen;
-  time_t          msg_time;
-  uint16_t        msg_tag;
-  callback_pt     callback;
-  void           *callback_privdata;
-} publish_response_data;
-
-static ngx_int_t publish_message_generic_callback(ngx_int_t status, void *rptr, void *privdata) {
-  DBG("IPC: publish message generic callback");
-  publish_callback_data   *cd = (publish_callback_data *)privdata;
-  publish_response_data    rd; 
-  DEBUG_MEMZERO(&rd);
-  
-  nchan_channel_t *ch = (nchan_channel_t *)rptr;
-  rd.status = status;
-  rd.callback = cd->d->callback;
-  rd.callback_privdata = cd->d->callback_privdata;
-  if(ch != NULL) {
-    rd.last_seen = ch->last_seen;
-    rd.subscribers = ch->subscribers;
-    rd.messages = ch->messages;
-    assert(ch->last_published_msg_id.tagcount == 1);
-    rd.msg_time = ch->last_published_msg_id.time;
-    rd.msg_tag = ch->last_published_msg_id.tag.fixed[0];
-  }
-  ipc_cmd(publish_message_reply, cd->sender, &rd);
-  if(cd->allocd) {
-    ngx_free(cd);
-  }
-  return NGX_OK;
-}
-static void receive_publish_message_reply(ngx_int_t sender, publish_response_data *d) {
-  nchan_channel_t         ch;
-  DBG("IPC: received publish reply");
-  
-  ch.last_seen = d->last_seen;
-  ch.subscribers = d->subscribers;
-  ch.messages = d->messages;
-  ch.last_published_msg_id.time = d->msg_time;
-  ch.last_published_msg_id.tag.fixed[0] = d->msg_tag;
-  ch.last_published_msg_id.tagcount = 1;
-  ch.last_published_msg_id.tagactive = 0;
-  d->callback(d->status, &ch, d->callback_privdata);
-}
-
-
-////////// GET MESSAGE ////////////////
-union getmsg_u {
-  struct req_s {
-    nchan_msg_id_t          msgid;
-  } req;
-  
-  struct resp_s {
-    nchan_msg_status_t      getmsg_code;
-    nchan_msg_t            *shm_msg;
-  } resp; 
-};
-
-typedef struct {
-  ngx_str_t              *shm_chid;
-  void                   *privdata;
-  union getmsg_u          d;
-} getmessage_data_t;
-
-ngx_int_t memstore_ipc_send_get_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_id_t *msgid, void *privdata) {
-  getmessage_data_t      data;
-  
-  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
-    nchan_log_ooshm_error("sending IPC get-message alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-  data.privdata = privdata;
-  data.d.req.msgid = *msgid;
-  
-  DBG("IPC: send get message from %i ch %V", dst, chid);
-  assert(data.shm_chid->len >= 1);
-  return ipc_cmd(get_message, dst, &data);
-}
-
-
-typedef struct {
-  ngx_int_t            sender;
-  getmessage_data_t    data;
-} getmessage_data_proxy_pd_t;
-
-//for retrieving messages from unready buffers
-static ngx_int_t ipc_getmsg_proxy_callback(ngx_int_t code, nchan_msg_t *msg, getmessage_data_proxy_pd_t *ppd) {
-  ppd->data.d.resp.getmsg_code = code;
-  ppd->data.d.resp.shm_msg = msg;
-  if(msg) {
-    assert(msg_reserve(msg, "get_message_reply") == NGX_OK);
-  }
-  ipc_cmd(get_message_reply, ppd->sender, &ppd->data);
-  ngx_free(ppd);
-  return NGX_OK;
-}
-
-static void receive_get_message(ngx_int_t sender, getmessage_data_t *d) {
-  memstore_channel_head_t     *head;
-  store_message_t             *msg = NULL;
-  
-  
-  assert(d->shm_chid->len >= 1);
-  assert(d->shm_chid->data!=NULL);
-  DBG("IPC: received get_message request for channel %V privdata %p", d->shm_chid, d->privdata);
-  
-  head = nchan_memstore_find_chanhead(d->shm_chid);
-  if(head == NULL) {
-    //no such thing here. reply.
-    d->d.resp.getmsg_code = MSG_NOTFOUND;
-    d->d.resp.shm_msg = NULL;
-  }
-  else if(head->msg_buffer_complete) {
-    msg = chanhead_find_next_message(head, &d->d.req.msgid, &d->d.resp.getmsg_code);
-    d->d.resp.shm_msg = msg == NULL ? NULL : msg->msg;
-  }
-  else {
-    //buffer is not ready. reply when it's ready
-    getmessage_data_proxy_pd_t *ppd = ngx_alloc(sizeof(*ppd), ngx_cycle->log);
-    if(ppd == NULL) {
-      ERR("couldn't allocate getmessage proxy data for ipc get_message");
-      goto err;
-    }
-    ppd->data = *d;
-    ppd->sender = sender;
-    
-    subscriber_t *getmsg_sub = getmsg_proxy_subscriber_create(&d->d.req.msgid, (callback_pt )ipc_getmsg_proxy_callback, ppd);
-    if(!getmsg_sub) {
-      ERR("couldn't allocate getmessage proxy subscriber for ipc get_message");
-      goto err;
-    }
-    if(head->spooler.fn->add(&head->spooler, getmsg_sub) != NGX_OK) {
-      ERR("couldn't enqueue getmsg proxy subscriber for ipc get_message");
-      goto err;
-    }
-    return;
-  }
-  if(d->d.resp.shm_msg) {
-    assert(msg_reserve(d->d.resp.shm_msg, "get_message_reply") == NGX_OK);
-  }
-  DBG("IPC: send get_message_reply for channel %V  msg %p, privdata: %p", d->shm_chid, msg, d->privdata);
-  ipc_cmd(get_message_reply, sender, d);
-  return;
-
-err:
-  d->d.resp.getmsg_code = MSG_ERROR;
-  d->d.resp.shm_msg = NULL;
-  ipc_cmd(get_message_reply, sender, d);
-}
-
-static void receive_get_message_reply(ngx_int_t sender, getmessage_data_t *d) {
-  
-  assert(d->shm_chid->len >= 1);
-  assert(d->shm_chid->data!=NULL);
-  DBG("IPC: received get_message reply for channel %V msg %p privdata %p", d->shm_chid, d->d.resp.shm_msg, d->privdata);
-  nchan_memstore_handle_get_message_reply(d->d.resp.shm_msg, d->d.resp.getmsg_code, d->privdata);
-  if(d->d.resp.shm_msg) {
-    msg_release(d->d.resp.shm_msg, "get_message_reply");
-  }
-  str_shm_free(d->shm_chid);
-}
-
-
-
-
-////////// DELETE ////////////////
-typedef struct {
-  ngx_str_t           *shm_chid;
-  ngx_int_t            sender;
-  nchan_channel_t     *shm_channel_info;
-  ngx_int_t            code;
-  callback_pt          callback;
-  void                *privdata;
-} delete_data_t;
-
-ngx_int_t memstore_ipc_send_delete(ngx_int_t dst, ngx_str_t *chid, callback_pt callback,void *privdata) {
-  delete_data_t  data = {str_shm_copy(chid), 0, NULL, 0, callback, privdata};
-  if(data.shm_chid == NULL) {
-    nchan_log_ooshm_error("sending IPC send-delete alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-  DBG("IPC: send delete to %i ch %V", dst, chid);
-  return ipc_cmd(delete, dst, &data);
-}
-
-static ngx_int_t delete_callback_handler(ngx_int_t, nchan_channel_t *, delete_data_t *);
-
-static void receive_delete(ngx_int_t sender, delete_data_t *d) {
-  d->sender = sender;
-  DBG("IPC received delete request for channel %V privdata %p", d->shm_chid, d->privdata);
-  nchan_memstore_force_delete_channel(d->shm_chid, (callback_pt )delete_callback_handler, d);
-}
-
-static ngx_int_t delete_callback_handler(ngx_int_t code, nchan_channel_t *chan, delete_data_t *d) {
-  nchan_channel_t      *chan_info;
-  
-  d->code = code;
-  if (chan) {
-    if((chan_info = shm_alloc(nchan_store_memory_shmem, sizeof(*chan_info), "channel info for delete IPC response")) == NULL) {
-      d->shm_channel_info = NULL;
-      d->code = NGX_HTTP_INSUFFICIENT_STORAGE;
-      nchan_log_ooshm_error("sending IPC delete-reply alert for channel %V", d->shm_chid);
-    }
-    else {
-      d->shm_channel_info= chan_info;
-      chan_info->messages = chan->messages;
-      chan_info->subscribers = chan->subscribers;
-      chan_info->last_seen = chan->last_seen;
-      
-      if(chan->last_published_msg_id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
-        //meh, this can't be triggered... can it?...
-        nchan_msg_id_t           zeroid = NCHAN_ZERO_MSGID;
-        chan_info->last_published_msg_id = zeroid;
-      }
-      else {
-        chan_info->last_published_msg_id = chan->last_published_msg_id;
-      }
-    }
-  }
-  else {
-    d->shm_channel_info = NULL;
-  }
-  ipc_cmd(delete_reply, d->sender, d);
-  return NGX_OK;
-}
-static void receive_delete_reply(ngx_int_t sender, delete_data_t *d) {
-  
-  DBG("IPC received delete reply for channel %V privdata %p", d->shm_chid, d->privdata);
-  d->callback(d->code, d->shm_channel_info, d->privdata);
-  
-  if(d->shm_channel_info != NULL) {
-    shm_free(nchan_store_memory_shmem, d->shm_channel_info);
-  }
-  str_shm_free(d->shm_chid);
-}
-
-
-
-
-////////// GET CHANNEL INFO ////////////////
-typedef struct {
-  ngx_str_t                 *shm_chid;
-  nchan_loc_conf_t          *cf;
-  store_channel_head_shm_t  *channel_info;
-  nchan_msg_id_t             last_msgid;
-  callback_pt                callback;
-  void                      *privdata;
-} channel_info_data_t;
-
-ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata) {
-  DBG("send get_channel_info to %i %V", dst, chid);
-  channel_info_data_t        data;
-  DEBUG_MEMZERO(&data);
-  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
-    nchan_log_ooshm_error("sending IPC get-channel-info alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-
-  data.channel_info = NULL;
-  data.last_msgid = zero_msgid;
-  data.cf = cf;
-  data.callback = callback;
-  data.privdata = privdata;
-  return ipc_cmd(get_channel_info, dst, &data);
-}
-
-typedef struct {
-  channel_info_data_t   d;
-  ngx_int_t             sender;
-} channel_info_find_chanhead_backup_data_t;
-
-static void receive_get_channel_info_continued(ngx_int_t sender, channel_info_data_t *d, memstore_channel_head_t *head) {
-  assert(memstore_slot() == memstore_channel_owner(d->shm_chid));
-  if(head == NULL) {
-    //already deleted maybe?
-    DBG("channel not for for get_channel_info");
-    d->channel_info = NULL;
-  }
-  else {
-    d->channel_info = head->shared;
-    assert(head->latest_msgid.tagcount <= 1);
-    d->last_msgid = head->latest_msgid;
-  }
-  ipc_cmd(get_channel_info_reply, sender, d);
-}
-
-static ngx_int_t find_chanhead_w_backup_callback(ngx_int_t rc, void *vd, void *pd) {
-  channel_info_find_chanhead_backup_data_t *d = pd;
-  memstore_channel_head_t                  *head = vd;
-  
-  receive_get_channel_info_continued(d->sender, &d->d, head);
-  
-  ngx_free(d);
-  return NGX_OK;
-}
-
-static void receive_get_channel_info(ngx_int_t sender, channel_info_data_t *d) {
-  memstore_channel_head_t    *head;
-  
-  DBG("received get_channel_info request for channel %V privdata %p", d->shm_chid, d->privdata);
-  if(d->cf->redis.enabled && d->cf->redis.storage_mode == REDIS_MODE_BACKUP) {
-    channel_info_find_chanhead_backup_data_t *dd = ngx_alloc(sizeof(*dd), ngx_cycle->log);
-    dd->d = *d;
-    dd->sender = sender;
-    nchan_memstore_find_chanhead_with_backup(d->shm_chid, d->cf, find_chanhead_w_backup_callback, dd);
-  }
-  else {
-    head = nchan_memstore_find_chanhead(d->shm_chid);
-    receive_get_channel_info_continued(sender, d, head);
-  }
-}
-
-static void receive_get_channel_info_reply(ngx_int_t sender, channel_info_data_t *d) {
-  nchan_channel_t            chan;
-  store_channel_head_shm_t  *chinfo = d->channel_info;
-  
-  if(chinfo) {
-    //construct channel
-    chan.subscribers = chinfo->sub_count;
-    chan.last_seen = chinfo->last_seen;
-    chan.id.data = d->shm_chid->data;
-    chan.id.len = d->shm_chid->len;
-    chan.messages = chinfo->stored_message_count;
-    chan.last_published_msg_id = d->last_msgid;
-    d->callback(NGX_OK, &chan, d->privdata);
-  }
-  else {
-    d->callback(NGX_OK, NULL, d->privdata);
-  }
-  str_shm_free(d->shm_chid);
-}
-
-
-////////// CHANNEL AUTHORIZATION DATA ////////////////
-typedef struct {
-  ngx_str_t               *shm_chid;
-  unsigned                 auth_ok:1;
-  unsigned                 channel_must_exist:1;
-  nchan_loc_conf_t        *cf;
-  ngx_int_t                max_subscribers;
-  callback_pt              callback;
-  void                    *privdata;
-} channel_authcheck_data_t;
-
-ngx_int_t memstore_ipc_send_channel_existence_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata) {
-  DBG("send channel_auth_check to %i %V", dst, chid);
-  channel_authcheck_data_t        data;
-  DEBUG_MEMZERO(&data);
-  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
-    nchan_log_ooshm_error("sending IPC channel-existence-check alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-  data.auth_ok = 0;
-  data.channel_must_exist = cf->subscribe_only_existing_channel;
-  data.cf = cf;
-  data.max_subscribers = cf->max_channel_subscribers;
-  data.callback = callback;
-  data.privdata = privdata;
-  
-  return ipc_cmd(channel_auth_check, dst, &data);
-}
-
-typedef struct {
-  ngx_int_t                 sender;
-  channel_authcheck_data_t  d;
-} channel_authcheck_data_callback_t;
-
-static ngx_int_t redis_receive_channel_auth_check_callback(ngx_int_t status, void *ch, void *d) {
-  nchan_channel_t                     *channel = (nchan_channel_t *)ch;
-  channel_authcheck_data_callback_t   *data = (channel_authcheck_data_callback_t *)d;
-  if(channel == NULL) {
-    data->d.auth_ok = !data->d.channel_must_exist;
-  }
-  else if(data->d.max_subscribers == 0) {
-    data->d.auth_ok = 1;
-  }
-  else {
-    data->d.auth_ok = channel->subscribers < data->d.max_subscribers;
-  }
-  ipc_cmd(channel_auth_check_reply, data->sender, &data->d);
-  ngx_free(d);
-  return NGX_OK;
-}
-
-static void receive_channel_auth_check(ngx_int_t sender, channel_authcheck_data_t *d) {
-  memstore_channel_head_t    *head;
-  
-  DBG("received channel_auth_check request for channel %V privdata %p", d->shm_chid, d->privdata);
-  
-  assert(memstore_slot() == memstore_channel_owner(d->shm_chid));
-  if(!d->cf->redis.enabled) {
-    head = nchan_memstore_find_chanhead(d->shm_chid);
-    if(head == NULL) {
-      d->auth_ok = !d->channel_must_exist;
-    }
-    else if (d->max_subscribers == 0) {
-      d->auth_ok = 1;
-    }
-    else {
-      assert(head->shared);
-      d->auth_ok = head->shared->sub_count < (ngx_uint_t )d->max_subscribers;
-    }
-    ipc_cmd(channel_auth_check_reply, sender, d);
-  }
-  else {
-    channel_authcheck_data_callback_t    *dd = ngx_alloc(sizeof(*dd), ngx_cycle->log);
-    dd->d = *d;
-    dd->sender = sender;
-    nchan_store_redis.find_channel(d->shm_chid, d->cf, redis_receive_channel_auth_check_callback, dd);
-  }
-}
-
-static void receive_channel_auth_check_reply(ngx_int_t sender, channel_authcheck_data_t *d) {
-  d->callback(d->auth_ok, NULL, d->privdata);
-  str_shm_free(d->shm_chid);
-}
-
-/////////// SUBSCRIBER KEEPALIVE ///////////
-typedef enum {
-  KA_REPLY_NORENEW = 0, 
-  KA_REPLY_RENEW,
-  KA_REPLY_UNHOOK_NORENEW,
-} keepalive_reply_action_t;
-
-typedef struct {
-  ngx_str_t                   *shm_chid;
-  subscriber_t                *ipc_sub;
-  memstore_channel_head_t     *originator;
-  keepalive_reply_action_t     reply_action;  
-} sub_keepalive_data_t;
-
-ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch) {
-  sub_keepalive_data_t        data;
-  DEBUG_MEMZERO(&data);
-  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
-    nchan_log_ooshm_error("sending IPC keepalive alert for channel %V", chid);
-    return NGX_DECLINED;
-  }
-  data.ipc_sub = sub;
-  data.originator = ch;
-  
-  data.reply_action = KA_REPLY_NORENEW;
-  
-  sub->fn->reserve(sub);
-  
-  DBG("send SUBSCRIBER KEEPALIVE to %i %V", dst, chid);
-  
-  ipc_cmd(subscriber_keepalive, dst, &data);
-  return NGX_OK;
-}
-static void receive_subscriber_keepalive(ngx_int_t sender, sub_keepalive_data_t *d) {
-  memstore_channel_head_t    *head;
-  DBG("received SUBSCRIBER KEEPALIVE from %i for channel %V", sender, d->shm_chid);
-  head = nchan_memstore_find_chanhead(d->shm_chid);
-  str_shm_free(d->shm_chid);
-  
-  if(head == NULL) {
-    DBG("not subscribed anymore");
-    d->reply_action = KA_REPLY_NORENEW;
-  }
-  else {
-    if(head != d->originator) {
-      ERR("Got keepalive for expired channel %V", &head->id);
-      d->reply_action = KA_REPLY_UNHOOK_NORENEW;
-    }
-    else if(head->status != READY && head->status != STUBBED) {
-      if(head->status == WAITING && head->foreign_owner_ipc_sub == NULL) {
-        //wrong-status head. don't renew, get rid of this chanhead
-        nchan_memstore_publish_generic(head, NULL, NGX_HTTP_SERVICE_UNAVAILABLE, NULL);
-        nchan_memstore_force_delete_channel(d->shm_chid, NULL, NULL);
-        d->reply_action = KA_REPLY_UNHOOK_NORENEW;
-      }
-      else {
-        //something's gone extra weird. 
-        //kick out these subs, delete chanhead... just in case
-        nchan_memstore_publish_generic(head, NULL, NGX_HTTP_SERVICE_UNAVAILABLE, NULL);
-        nchan_memstore_force_delete_channel(d->shm_chid, NULL, NULL);
-        d->reply_action = KA_REPLY_UNHOOK_NORENEW;
-      }
-    }
-    else if(head->foreign_owner_ipc_sub != d->ipc_sub) {
-      // we got another subscriber for this chanhead, probably due to some very heavy delays
-      // discard it, keeping the old one.
-      // (It might be nice to discard the _old_ subscriber, but the owner worker may have already deleted it
-      ERR("Got ipc-subscriber during keepalive for an already subscribed channel %V", &head->id);
-      d->reply_action = KA_REPLY_UNHOOK_NORENEW;
-    }
-    else if(head->total_sub_count == 0) {
-      if(ngx_time() - head->last_subscribed_local > MEMSTORE_IPC_SUBSCRIBER_TIMEOUT) {
-        d->reply_action = KA_REPLY_NORENEW;
-        DBG("No subscribers lately. Time... to die.");
-      }
-      else {
-        DBG("No subscribers, but there was one %i sec ago. don't unsubscribe.", ngx_time() - head->last_subscribed_local);
-        d->reply_action = KA_REPLY_RENEW;
-      }
-    }
-    else {
-      d->reply_action = KA_REPLY_RENEW;
-    }
-  }
-  ipc_cmd(subscriber_keepalive_reply, sender, d);
-}
-
-static void receive_subscriber_keepalive_reply(ngx_int_t sender, sub_keepalive_data_t *d) {
-  subscriber_t     *sub = d->ipc_sub;
-  switch(d->reply_action) {
-    case KA_REPLY_NORENEW:
-      sub->fn->dequeue(sub);
-      sub->fn->release(sub, 0);
-      break;
-    case KA_REPLY_RENEW:
-      memstore_ipc_subscriber_keepalive_renew(sub);
-      sub->fn->release(sub, 0);
-      break;
-    case KA_REPLY_UNHOOK_NORENEW:
-      memstore_ipc_subscriber_unhook(sub);
-      sub->fn->release(sub, 0);
-      break;
-    default:
-      raise(SIGABRT);
-  }
-}
-
-
-/////////// GROUPS ///////////
-
-ngx_int_t memstore_ipc_send_get_group(ngx_int_t dst, ngx_str_t *group_id) {
-  ngx_str_t         *shm_id = str_shm_copy(group_id);
-  if(shm_id == NULL) {
-    nchan_log_ooshm_error("sending IPC get-group alert for group %V", group_id);
-    return NGX_DECLINED;
-  }
-  DBG("send GET GROUP to %i %p %V", dst, shm_id, shm_id);
-  ipc_cmd(get_group, dst, &shm_id);
-  return NGX_OK;
-}
-
-static void receive_get_group(ngx_int_t sender, ngx_str_t **group_id) {
-  nchan_group_t  *shared_group;
-  int             new_group;
-  DBG("received GET GROUP from %i %p %V", sender, *group_id, *group_id);
-  
-  shared_group = memstore_group_owner_find(nchan_memstore_get_groups(), *group_id, &new_group);
-  if(!new_group) { //new group is automatically broadcast to everyone, this one already exists.
-    ipc_cmd(group, sender, &shared_group);
-  }
-  
-  str_shm_free(*group_id);
-}
-
-ngx_int_t memstore_ipc_broadcast_group(nchan_group_t *shared_group) {
-  DBG("broadcast GROUP %V to everyone but me", &shared_group->name);
-  ipc_broadcast_cmd(group, &shared_group);
-  
-  return NGX_OK;
-}
-
-static void receive_group(ngx_int_t sender, nchan_group_t **shared_group) {
-  DBG("receive GROUP %V", &(*shared_group)->name);
-  
-  memstore_group_receive(nchan_memstore_get_groups(), *shared_group);
-}
-
-ngx_int_t memstore_ipc_broadcast_group_delete(nchan_group_t *shared_group) {
-  DBG("send DELETE GROUP");
-  ipc_broadcast_cmd(group_delete, &shared_group);
-  return NGX_OK;
-}
-
-static void receive_group_delete(ngx_int_t sender, nchan_group_t **shared_group) {
-  DBG("receive GROUP DELETE %V", &(*shared_group)->name);
-  
-  memstore_group_receive_delete(nchan_memstore_get_groups(), *shared_group);
-}
-
-/////////// FLOOD TEST ///////////
-typedef struct {
-  uint64_t          n;
-} flood_data_t;
-
-
-static int  flood_seq = 0;
-ngx_int_t memstore_ipc_send_flood_test(ngx_int_t dst) {
-  flood_data_t        data = {flood_seq++};
-  ipc_cmd(flood_test, dst, &data);
-  return NGX_OK;
-}
-
-
-static void receive_flood_test(ngx_int_t sender, flood_data_t *d) {
-  struct timespec  tv;
-  tv.tv_sec=0;
-  tv.tv_nsec=8000000;
-  ERR("      received FLOOD TEST from %i seq %l", sender, d->n);
-  nanosleep(&tv, NULL);
-}
-
-////////// BENCHMARK INITIALIZE //////////////
-typedef struct {
-  nchan_loc_conf_t *loc_conf;
-  time_t        time;
-  uint32_t      id;
-  nchan_benchmark_shared_t shared;
-} benchmark_initialize_data_t;
-
-ngx_int_t memstore_ipc_broadcast_benchmark_initialize(void *bench_pd) {
-  nchan_benchmark_t            *bench = bench_pd;
-  benchmark_initialize_data_t   data;
-  DEBUG_MEMZERO(&data);
-  data.loc_conf = bench->loc_conf;
-  data.id = bench->id;
-  data.time = bench->time.init;
-  data.shared = bench->shared;
-  
-  return ipc_broadcast_cmd(benchmark_initialize, &data);
-}
-static void receive_benchmark_initialize(ngx_int_t sender, benchmark_initialize_data_t *d) {
-  nchan_benchmark_initialize_from_ipc(sender, d->loc_conf, d->time, d->id, &d->shared);
-}
-
-////////// BENCHMARK RUN ////////////////
-typedef struct {
-  nchan_loc_conf_t *loc_conf;
-} benchmark_run_data_t;
-
-ngx_int_t memstore_ipc_broadcast_benchmark_run(void) {
-  benchmark_run_data_t        data;
-  DEBUG_MEMZERO(&data);
-  return ipc_broadcast_cmd(benchmark_start, &data);
-}
-static void receive_benchmark_start(ngx_int_t sender, benchmark_run_data_t *d) {
-  nchan_benchmark_run();
-}
-
-////////// BENCHMARK STOP ////////////////
-typedef struct {
-  nchan_loc_conf_t *loc_conf;
-} benchmark_stop_data_t;
-
-ngx_int_t memstore_ipc_broadcast_benchmark_stop(void) {
-  benchmark_stop_data_t        data;
-  DEBUG_MEMZERO(&data);
-  return ipc_broadcast_cmd(benchmark_stop, &data);
-}
-static void receive_benchmark_stop(ngx_int_t sender, benchmark_stop_data_t *d) {
-  nchan_benchmark_stop();
-}
-
-////////// BENCHMARK FINISH ////////////////
-typedef struct {
-  nchan_benchmark_data_t data;
-} benchmark_finish_data_t;
-
-ngx_int_t memstore_ipc_broadcast_benchmark_finish(void) {
-  benchmark_finish_data_t        data;
-  DEBUG_MEMZERO(&data);
-  return ipc_broadcast_cmd(benchmark_finish, &data);
-}
-static void receive_benchmark_finish(ngx_int_t sender, benchmark_finish_data_t *d) {
-  nchan_benchmark_t        *bench = nchan_benchmark_get_active();
-  benchmark_finish_data_t   data;
-  DEBUG_MEMZERO(&data);
-  nchan_benchmark_dequeue_subscribers();
-  data.data = bench->data;
-  ipc_cmd(benchmark_finish_reply, sender, &data);
-  nchan_benchmark_cleanup();
-}
-
-static void receive_benchmark_finish_reply(ngx_int_t sender, benchmark_finish_data_t *d) {
-  nchan_benchmark_receive_finished_data(&d->data);
-}
-
-////////// BENCHMARK ABORT ////////////////
-typedef struct {
-  nchan_benchmark_data_t data;
-} benchmark_abort_data_t;
-
-ngx_int_t memstore_ipc_broadcast_benchmark_abort(void) {
-  benchmark_abort_data_t        data;
-  DEBUG_MEMZERO(&data);
-  return ipc_broadcast_cmd(benchmark_abort, &data);
-}
-static void receive_benchmark_abort(ngx_int_t sender, benchmark_abort_data_t *d) {
-  nchan_benchmark_abort();
-}
-
-#define MAKE_ipc_cmd_handler(val) [offsetof(ipc_handlers_t, val)/sizeof(ipc_handler_pt)] = (ipc_handler_pt )receive_ ## val,
-static ipc_handler_pt ipc_cmd_handler[] = {
-  LIST_IPC_COMMANDS(MAKE_ipc_cmd_handler)
-};
-
-void memstore_ipc_alert_handler(ngx_int_t sender, ngx_uint_t code, void *data) {
-  if(code >= IPC_CMDS) {
-    ERR("received invalid code %ui from sender %i", code, sender);
-    return;
-  }
-  ipc_cmd_handler[code](sender, data);
-}
diff --git a/debian/modules/nchan/src/store/memory/ipc-handlers.h b/debian/modules/nchan/src/store/memory/ipc-handlers.h
deleted file mode 100644
index 412974f..0000000
--- a/debian/modules/nchan/src/store/memory/ipc-handlers.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "store-private.h"
-
-typedef void (*ipc_handler_pt)(ngx_int_t, void *);
-
-ngx_int_t memstore_ipc_send_subscribe(ngx_int_t owner, ngx_str_t *shm_chid, memstore_channel_head_t *, nchan_loc_conf_t *);
-ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch);
-ngx_int_t memstore_ipc_send_unsubscribe(ngx_int_t dst, ngx_str_t *chid, void *subscriber, void* privdata);
-ngx_int_t memstore_ipc_send_unsubscribed(ngx_int_t dst, ngx_str_t *chid, void* privdata);
-ngx_int_t memstore_ipc_send_publish_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_t *shm_msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
-ngx_int_t memstore_ipc_send_publish_status(ngx_int_t dst, ngx_str_t *chid, ngx_int_t status_code, const ngx_str_t *status_line, callback_pt callback, void *privdata);
-ngx_int_t memstore_ipc_send_publish_notice(ngx_int_t dst, ngx_str_t *chid, ngx_int_t notice_code, void *notice_data);
-ngx_int_t memstore_ipc_send_get_message(ngx_int_t owner, ngx_str_t *shm_chid, nchan_msg_id_t *msgid, void * privdata);
-ngx_int_t memstore_ipc_send_delete(ngx_int_t owner, ngx_str_t *shm_chid, callback_pt callback, void *privdata);
-void memstore_ipc_alert_handler(ngx_int_t sender, ngx_uint_t code, void *data);
-ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata);
-ngx_int_t memstore_ipc_send_channel_existence_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata);
-ngx_int_t memstore_ipc_broadcast_group(nchan_group_t *shared_group);
-ngx_int_t memstore_ipc_send_get_group(ngx_int_t dst, ngx_str_t *group_id);
-ngx_int_t memstore_ipc_broadcast_group_delete(nchan_group_t *shared_group);
-ngx_int_t memstore_ipc_send_flood_test(ngx_int_t dst);
-
-ngx_int_t memstore_ipc_broadcast_benchmark_initialize(void *bench);
-ngx_int_t memstore_ipc_broadcast_benchmark_run(void);
-ngx_int_t memstore_ipc_broadcast_benchmark_stop(void);
-ngx_int_t memstore_ipc_broadcast_benchmark_finish(void);
-ngx_int_t memstore_ipc_broadcast_benchmark_abort(void);
diff --git a/debian/modules/nchan/src/store/memory/ipc.c b/debian/modules/nchan/src/store/memory/ipc.c
deleted file mode 100755
index f7152da..0000000
--- a/debian/modules/nchan/src/store/memory/ipc.c
+++ /dev/null
@@ -1,553 +0,0 @@
-//worker processes of the world, unite.
-#include <nchan_module.h>
-#include <ngx_channel.h>
-#include <assert.h>
-#include "ipc.h"
-#include "groups.h"
-
-#include "store-private.h"
-
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-//#define DEBUG_LEVEL NGX_LOG_WARN
-
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "IPC:" fmt, ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "IPC:" fmt, ##args)
-
-//#define DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC 100
-
-static ngx_event_t  receive_alert_delay_log_timer;
-static ngx_event_t  send_alert_delay_log_timer;
-static void receive_alert_delay_log_timer_handler(ngx_event_t *ev);
-static void send_alert_delay_log_timer_handler(ngx_event_t *ev);
-
-static void ipc_read_handler(ngx_event_t *ev);
-
-ngx_int_t ipc_init(ipc_t *ipc) {
-  int                             i = 0;
-  ipc_process_t                  *proc;
-  
-  nchan_init_timer(&receive_alert_delay_log_timer, receive_alert_delay_log_timer_handler, NULL);
-  nchan_init_timer(&send_alert_delay_log_timer, send_alert_delay_log_timer_handler, NULL);
-  
-  for(i=0; i< NGX_MAX_PROCESSES; i++) {
-    proc = &ipc->process[i];
-    proc->ipc = ipc;
-    proc->pipe[0]=NGX_INVALID_FILE;
-    proc->pipe[1]=NGX_INVALID_FILE;
-    proc->c=NULL;
-    proc->active = 0;
-    ngx_memzero(proc->wbuf.alerts, sizeof(proc->wbuf.alerts));
-    proc->wbuf.first = 0;
-    proc->wbuf.n = 0;
-    proc->wbuf.overflow_first = NULL;
-    proc->wbuf.overflow_last = NULL;
-    proc->wbuf.overflow_n = 0;
-    ipc->worker_slots[i]=NGX_ERROR;
-  }
-  ipc->workers = NGX_ERROR;
-  return NGX_OK;
-}
-
-ngx_int_t ipc_set_handler(ipc_t *ipc, void (*alert_handler)(ngx_int_t, ngx_uint_t, void *)) {
-  ipc->handler=alert_handler;
-  return NGX_OK;
-}
-
-static void ipc_try_close_fd(ngx_socket_t *fd) {
-  if(*fd != NGX_INVALID_FILE) {
-    ngx_close_socket(*fd);
-    *fd=NGX_INVALID_FILE;
-  }
-}
-
-ngx_int_t ipc_open(ipc_t *ipc, ngx_cycle_t *cycle, ngx_int_t workers, void (*slot_callback)(int slot, int worker)) {
-//initialize pipes for workers in advance.
-  int                             i, j, s = 0;
-  ngx_int_t                       last_expected_process = ngx_last_process;
-  ipc_process_t                  *proc;
-  ngx_socket_t                   *socks;
-  
-  /* here's the deal: we have no control over fork()ing, nginx's internal 
-    * socketpairs are unusable for our purposes (as of nginx 0.8 -- check the 
-    * code to see why), and the module initialization callbacks occur before
-    * any workers are spawned. Rather than futzing around with existing 
-    * socketpairs, we make our own pipes array. 
-    * Trouble is, ngx_spawn_process() creates them one-by-one, and we need to 
-    * do it all at once. So we must guess all the workers' ngx_process_slots in 
-    * advance. Meaning the spawning logic must be copied to the T.
-    * ... with some allowances for already-opened sockets...
-    */
-  for(i=0; i < workers; i++) {
-    //copypasta from os/unix/ngx_process.c (ngx_spawn_process)
-    while (s < last_expected_process && ngx_processes[s].pid != -1) {
-      //find empty existing slot
-      s++;
-    }
-    
-    if(slot_callback) {
-      slot_callback(s, i);
-    }
-    
-    ipc->worker_slots[i] = s;
-    
-    proc = &ipc->process[s];
-
-    socks = proc->pipe;
-    
-    if(proc->active) {
-      // reinitialize already active pipes. This is done to prevent IPC alerts
-      // from a previous restart that were never read from being received by
-      // a newly restarted worker
-      ipc_try_close_fd(&socks[0]);
-      ipc_try_close_fd(&socks[1]);
-      proc->active = 0;
-    }
-    
-    assert(socks[0] == NGX_INVALID_FILE && socks[1] == NGX_INVALID_FILE);
-    
-    //make-a-pipe
-    if (pipe(socks) == -1) {
-      ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "pipe() failed while initializing nchan IPC");
-      return NGX_ERROR;
-    }
-    //make both ends nonblocking
-    for(j=0; j <= 1; j++) {
-      if (ngx_nonblocking(socks[j]) == -1) {
-	ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_nonblocking_n " failed on pipe socket %i while initializing nchan", j);
-	ipc_try_close_fd(&socks[0]);
-	ipc_try_close_fd(&socks[1]);
-	return NGX_ERROR;
-      }
-    }
-    //It's ALIIIIIVE! ... erm.. active...
-    proc->active = 1;
-    
-    s++; //NEXT!!
-  }
-  ipc->workers = workers;
-  
-  //ERR("ipc_alert_t size %i bytes", sizeof(ipc_alert_t));
-  
-  return NGX_OK;
-}
-
-
-
-ngx_int_t ipc_close(ipc_t *ipc, ngx_cycle_t *cycle) {
-  int i;
-  ipc_process_t            *proc;
-  ipc_writebuf_overflow_t  *of, *of_next;
-  
-  DBG("start closing");
-  
-  for (i=0; i<NGX_MAX_PROCESSES; i++) {
-    proc = &ipc->process[i];
-    if(!proc->active) continue;
-    
-    if(proc->c) {
-      ngx_close_connection(proc->c);
-      proc->c = NULL;
-    }
-    
-    for(of = proc->wbuf.overflow_first; of != NULL; of = of_next) {
-      of_next = of->next;
-      ngx_free(of);
-    }
-    
-    ipc_try_close_fd(&proc->pipe[0]);
-    ipc_try_close_fd(&proc->pipe[1]);
-    ipc->process[i].active = 0;
-  }
-  DBG("done closing");
-  return NGX_OK;
-}
-
-static ngx_uint_t delayed_sent_alerts_count;
-static ngx_uint_t delayed_sent_alerts_delay;
-
-static void send_alert_delay_log_timer_handler(ngx_event_t *ev) {
-  nchan_log_notice("Sending %ui interprocess alert%s delayed by %ui sec.", delayed_sent_alerts_count, delayed_sent_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_sent_alerts_count > 0 ? delayed_sent_alerts_delay / delayed_sent_alerts_count : 0));
-  
-  delayed_sent_alerts_count = 0;
-  delayed_sent_alerts_delay = 0;
-}
-
-static void ipc_record_alert_send_delay(ngx_uint_t delay) {
-  delayed_sent_alerts_count ++;
-  delayed_sent_alerts_delay += delay;
-  nchan_update_stub_status(ipc_total_send_delay, delay);
-  if(!send_alert_delay_log_timer.timer_set && !ngx_exiting && !ngx_quit) {
-    ngx_add_timer(&send_alert_delay_log_timer, 1000);
-  }
-}
-
-static ngx_int_t ipc_write_alert_fd(ngx_socket_t fd, ipc_alert_t *alert) {
-  int         n;
-  ngx_int_t   err;
-  
-  n = write(fd, alert, sizeof(*alert));
- 
-  if (n == -1) {
-    err = ngx_errno;
-    if (err == NGX_EAGAIN) {
-      return NGX_AGAIN;
-    }
-    
-    ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, "write() failed");
-    assert(0);
-    return NGX_ERROR;
-  }
-  
-  if(ngx_time() - alert->time_sent >= 2) {
-    ipc_record_alert_send_delay(ngx_time() - alert->time_sent);
-  }
-  return NGX_OK;
-}
-
-static void ipc_write_handler(ngx_event_t *ev) {
-  ngx_connection_t        *c = ev->data;
-  ngx_socket_t             fd = c->fd;
-  
-  ipc_process_t           *proc = (ipc_process_t *) c->data;
-  ipc_alert_t             *alerts = proc->wbuf.alerts;
-  
-  int                      n = proc->wbuf.n;
-  int                      i, first = proc->wbuf.first, last = first + n;
-  uint8_t                  write_aborted = 0;
-  
-  //DBG("%i alerts to write, with %i in overflow", proc->wbuf.n, proc->wbuf.overflow_n);
-  
-  if(!memstore_ready()) {
-#if nginx_version >= 1008000
-    ev->cancelable = 1;
-#endif
-    ngx_add_timer(ev, 1000);
-    return;
-  }
-#if nginx_version >= 1008000
-  else {
-    ev->cancelable = 0;
-  }
-#endif
-  
-  for(i = first; i < last; i++) {
-    //ERR("send alert at %i", i % IPC_WRITEBUF_SIZE );
-    if(ipc_write_alert_fd(fd, &alerts[i % IPC_WRITEBUF_SIZE]) != NGX_OK) {
-      write_aborted = 1;
-      //DBG("write aborted at %i iter. first: %i, n: %i", i - first, first, proc->wbuf.n);
-      break;
-    }
-    /*
-    else {
-      DBG("wrote alert at %i", i % IPC_WRITEBUF_SIZE);
-    }
-    */
-  }
-  
-  if(i==last) { //sent all outstanding alerts
-    //DBG("finished writing %i alerts.", proc->wbuf.n);
-    proc->wbuf.first = 0; // for debugging and stuff
-    proc->wbuf.n = 0;
-  }
-  else {
-    proc->wbuf.first = i;
-    proc->wbuf.n -= (i - first);
-    //DBG("first now at %i, %i alerts remain", i, proc->wbuf.n);
-  }
-  
-  nchan_update_stub_status(ipc_queue_size, proc->wbuf.n - n);
-  
-  if(proc->wbuf.overflow_n > 0 && i - first > 0) {
-    ipc_writebuf_overflow_t  *of;
-    first = proc->wbuf.first + proc->wbuf.n;
-    last = first + (IPC_WRITEBUF_SIZE - proc->wbuf.n);
-    //DBG("try to squeeze in overflow between %i and %i", first, last);
-    for(i = first; i < last; i++) {
-      of = proc->wbuf.overflow_first;
-      ///DBG("looking at overflow %p next %p", of, of->next);
-      alerts[i % IPC_WRITEBUF_SIZE] = of->alert;
-      proc->wbuf.overflow_n--;
-      proc->wbuf.n++;
-      assert(proc->wbuf.overflow_n >= 0);
-      
-      proc->wbuf.overflow_first = of->next;
-      
-      ngx_free(of);
-      
-      //DBG("squeezed in overflow at %i, %i overflow remaining", i, proc->wbuf.overflow_n);
-      
-      if(proc->wbuf.overflow_first == NULL) {
-        proc->wbuf.overflow_last = NULL;
-        break;
-      }
-    }
-    
-    if(!write_aborted) {
-      //retry
-      //DBG("retry write after squeezing in overflow");
-      ipc_write_handler(ev);
-      return;
-    }
-    
-  }
-  
-  if(write_aborted) {
-    //DBG("re-add event because the write failed");
-    ngx_handle_write_event(c->write, 0);
-  }
-}
-
-ngx_int_t ipc_register_worker(ipc_t *ipc, ngx_cycle_t *cycle) {
-  int                    i;    
-  ngx_connection_t      *c;
-  ipc_process_t         *proc;
-  
-  for(i=0; i< NGX_MAX_PROCESSES; i++) {
-    
-    proc = &ipc->process[i];
-    
-    if(!proc->active) continue;
-    
-    assert(proc->pipe[0] != NGX_INVALID_FILE);
-    assert(proc->pipe[1] != NGX_INVALID_FILE);
-    
-    if(i==ngx_process_slot) {
-      //set up read connection
-      c = ngx_get_connection(proc->pipe[0], cycle->log);
-      c->data = ipc;
-      
-      c->read->handler = ipc_read_handler;
-      c->read->log = cycle->log;
-      c->write->handler = NULL;
-      
-      ngx_add_event(c->read, NGX_READ_EVENT, 0);
-      proc->c=c;
-    }
-    else {
-      //set up write connection
-      c = ngx_get_connection(proc->pipe[1], cycle->log);
-      
-      c->data = proc;
-      
-      c->read->handler = NULL;
-      c->write->log = cycle->log;
-      c->write->handler = ipc_write_handler;
-      
-      proc->c=c;
-    }
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t ipc_read_socket(ngx_socket_t s, ipc_alert_t *alert, ngx_log_t *log) {
-  DBG("IPC read channel");
-  ssize_t             n;
-  ngx_err_t           err;
-  //static char         buf[sizeof(ipc_alert_t) * 2];
-  //static char        *cur;
-  
-  n = read(s, alert, sizeof(ipc_alert_t));
- 
-  if (n == -1) {
-    err = ngx_errno;
-    if (err == NGX_EAGAIN) {
-      return NGX_AGAIN;
-    }
-    
-    ngx_log_error(NGX_LOG_ERR, log, err, "nchan IPC: read() failed");
-    return NGX_ERROR;
-  }
- 
-  if (n == 0) {
-    ngx_log_debug0(NGX_LOG_ERR, log, 0, "nchan IPC: read() returned zero");
-    return NGX_ERROR;
-  }
- 
-  if ((size_t) n < sizeof(*alert)) {
-    ngx_log_error(NGX_LOG_ERR, log, 0, "nchan IPC: read() returned not enough data: %z", n);
-    return NGX_ERROR;
-  }
-  
-  return n;
-}
-
-static ngx_uint_t delayed_received_alerts_count;
-static ngx_uint_t delayed_received_alerts_delay;
-
-static void receive_alert_delay_log_timer_handler(ngx_event_t *ev) {
-  nchan_log_notice("Received %ui interprocess alert%s delayed by %ui sec.", delayed_received_alerts_count, delayed_received_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_received_alerts_count > 0 ? delayed_received_alerts_delay / delayed_received_alerts_count : 0));
-  
-  delayed_received_alerts_count = 0;
-  delayed_received_alerts_delay = 0;
-}
-
-static void ipc_record_alert_receive_delay(ngx_uint_t delay) {
-  delayed_received_alerts_count ++;
-  delayed_received_alerts_delay += delay;
-  nchan_update_stub_status(ipc_total_receive_delay, delay);
-  if(!receive_alert_delay_log_timer.timer_set && !ngx_exiting && !ngx_quit) {
-    ngx_add_timer(&receive_alert_delay_log_timer, 1000);
-  }
-}
-
-#if DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC
-typedef struct {
-  ngx_event_t   timer;
-  ipc_alert_t   alert;
-  ipc_t        *ipc;
-} delayed_alert_glob_t;
-static void fake_ipc_alert_delay_handler(ngx_event_t *ev) {
-  delayed_alert_glob_t *glob = (delayed_alert_glob_t *)ev->data;
-  
-  if(ngx_time() - glob->alert.time_sent >= 2) {
-    ipc_record_alert_receive_delay(ngx_time() - glob->alert.time_sent);
-  }
-  
-  glob->ipc->handler(glob->alert.src_slot, glob->alert.code, glob->alert.data);
-  ngx_free(glob);
-}
-#endif
-
-static void ipc_read_handler(ngx_event_t *ev) {
-  DBG("IPC channel handler");
-  //copypasta from os/unix/ngx_process_cycle.c (ngx_channel_handler)
-  ngx_int_t          n;
-  ipc_alert_t        alert;
-  ngx_connection_t  *c;
-  if (ev->timedout) {
-    ev->timedout = 0;
-    return;
-  }
-  c = ev->data;
-  
-  while(1) {
-    n = ipc_read_socket(c->fd, &alert, ev->log);
-    if (n == NGX_ERROR) {
-      ERR("IPC_READ_SOCKET failed: bad connection. This should never have happened, yet here we are...");
-      assert(0);
-      return;
-    }
-    if (n == NGX_AGAIN) {
-      return;
-    }
-    //ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, "nchan: channel command: %d", ch.command);
-    
-    assert(n == sizeof(alert));
-    if(alert.worker_generation < memstore_worker_generation) {
-      ERR("Got IPC alert for previous generation's worker. discarding.");
-    }
-    else {
-#if DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC
-      delayed_alert_glob_t   *glob = ngx_alloc(sizeof(*glob), ngx_cycle->log);
-      if (NULL == glob) {
-          ERR("Couldn't allocate memory for alert glob data.");
-          return;
-      }
-      ngx_memzero(&glob->timer, sizeof(glob->timer));
-      nchan_init_timer(&glob->timer, fake_ipc_alert_delay_handler, glob);
-      
-      glob->alert = alert;
-      glob->ipc = (ipc_t *)c->data;
-      ngx_add_timer(&glob->timer, DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC);
-#else
-      if(ngx_time() - alert.time_sent >= 2) {
-        ipc_record_alert_receive_delay(ngx_time() - alert.time_sent);
-      }
-      nchan_update_stub_status(ipc_total_alerts_received, 1);
-      ((ipc_t *)c->data)->handler(alert.src_slot, alert.code, alert.data);
-#endif
-    }
-  }
-}
-
-
-ngx_int_t ipc_broadcast_alert(ipc_t *ipc, ngx_uint_t code, void *data, size_t data_size) {
-  ngx_int_t   i, slot, rc, ret = NGX_OK;
-  ngx_int_t   my_slot = memstore_slot();
-  DBG("broadcast alert");
-  for(i=0; i < ipc->workers; i++) {
-    slot = ipc->worker_slots[i];
-    if(my_slot != slot) {
-      if((rc = ipc_alert(ipc, slot, code, data, data_size)) != NGX_OK)  {
-        ERR("Error sending alert to slot %i", slot);
-        ret = NGX_ERROR;
-      }
-    }
-  }
-  return ret;
-}
-
-ngx_int_t ipc_alert(ipc_t *ipc, ngx_int_t slot, ngx_uint_t code, void *data, size_t data_size) {
-  DBG("IPC send alert code %i to slot %i", code, slot);
-  
-  if(data_size > IPC_DATA_SIZE) {
-    ERR("IPC_DATA_SIZE too small. wanted %i, have %i", data_size, IPC_DATA_SIZE);
-    assert(0);
-  }
-  nchan_update_stub_status(ipc_total_alerts_sent, 1);
-#if (FAKESHARD)
-  
-  ipc_alert_t         alert = {0};
-  
-  alert.src_slot = memstore_slot();
-  alert.time_sent = ngx_time();
-  alert.worker_generation = memstore_worker_generation;
-  alert.code = code;
-  ngx_memcpy(alert.data, data, data_size);
-  
-  //switch to destination
-  memstore_fakeprocess_push(slot);
-  ipc->handler(alert.src_slot, alert.code, alert.data);
-  memstore_fakeprocess_pop();
-  //switch back  
-  
-#else
-  
-  ipc_process_t      *proc = &ipc->process[slot];
-  ipc_writebuf_t     *wb = &proc->wbuf;
-  ipc_alert_t        *alert;
-  
-  assert(proc->active);
-  
-  nchan_update_stub_status(ipc_queue_size, 1);
-  
-  if(wb->n < IPC_WRITEBUF_SIZE) {
-    alert = &wb->alerts[(wb->first + wb->n++) % IPC_WRITEBUF_SIZE];
-  }
-  else { //overflow
-    ipc_writebuf_overflow_t  *overflow;
-    DBG("writebuf overflow, allocating memory");
-    if((overflow = ngx_alloc(sizeof(*overflow), ngx_cycle->log)) == NULL) {
-      ERR("can't allocate memory for IPC write buffer overflow");
-      return NGX_ERROR;
-    }
-    overflow->next = NULL;
-    alert= &overflow->alert;
-    
-    if(wb->overflow_first == NULL) {
-      wb->overflow_first = overflow;
-    }
-    if(wb->overflow_last) {
-      wb->overflow_last->next = overflow;
-    }
-    wb->overflow_last = overflow;
-  
-    wb->overflow_n++;
-  }
-  
-  alert->src_slot = ngx_process_slot;
-  alert->time_sent = ngx_time();
-  alert->code = code;
-  alert->worker_generation = memstore_worker_generation;
-  ngx_memcpy(&alert->data, data, data_size);
-  
-  ipc_write_handler(proc->c->write);
-  
-  //ngx_handle_write_event(ipc->c[slot]->write, 0);
-  //ngx_add_event(ipc->c[slot]->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT);
-  
-#endif
-
-  return NGX_OK;
-}
-
diff --git a/debian/modules/nchan/src/store/memory/ipc.h b/debian/modules/nchan/src/store/memory/ipc.h
deleted file mode 100755
index 522dcc5..0000000
--- a/debian/modules/nchan/src/store/memory/ipc.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef NCHAN_IPC_H
-#define NCHAN_IPC_H
-
-#define IPC_DATA_SIZE 64
-//#define IPC_DATA_SIZE 80
-
-typedef struct {
-  char            data[IPC_DATA_SIZE];
-  time_t          time_sent;
-  int16_t         src_slot;
-  uint16_t        worker_generation;
-  uint8_t         code;
-} ipc_alert_t;
-
-#define IPC_WRITEBUF_SIZE 32
-
-typedef struct ipc_writebuf_overflow_s ipc_writebuf_overflow_t;
-struct ipc_writebuf_overflow_s {
-  ipc_alert_t               alert;
-  ipc_writebuf_overflow_t  *next;
-};
-
-typedef struct ipc_writebuf_s ipc_writebuf_t;
-struct ipc_writebuf_s {
-  //a ring buffer with a linked-list overflow for writing alerts, 
-  uint16_t                  n;
-  uint16_t                  first;
-  int32_t                   overflow_n;
-  ipc_writebuf_overflow_t  *overflow_first;
-  ipc_writebuf_overflow_t  *overflow_last;
-  ipc_alert_t               alerts[IPC_WRITEBUF_SIZE];
-}; //ipc_writebuf_t
-
-typedef struct ipc_s ipc_t;
-
-typedef struct {
-  ipc_t                 *ipc; //useful for write events
-  ngx_socket_t           pipe[2];
-  ngx_connection_t      *c;
-  ipc_writebuf_t         wbuf;
-  unsigned               active:1;
-} ipc_process_t;
-
-struct ipc_s {
-  const char            *name;
-  
-  ipc_process_t         process[NGX_MAX_PROCESSES];
-  
-  void                  (*handler)(ngx_int_t, ngx_uint_t, void*);
-  
-  ngx_int_t             workers;
-  ngx_int_t             worker_slots[NGX_MAX_PROCESSES];
-}; //ipc_t
-
-ngx_int_t ipc_init(ipc_t *ipc);
-ngx_int_t ipc_open(ipc_t *ipc, ngx_cycle_t *cycle, ngx_int_t workers, void (*slot_callback)(int slot, int worker));
-ngx_int_t ipc_set_handler(ipc_t *ipc, void (*alert_handler)(ngx_int_t, ngx_uint_t , void *data));
-ngx_int_t ipc_register_worker(ipc_t *ipc, ngx_cycle_t *cycle);
-ngx_int_t ipc_close(ipc_t *ipc, ngx_cycle_t *cycle);
-
-ngx_int_t ipc_broadcast_alert(ipc_t *ipc, ngx_uint_t code, void *data, size_t data_size);
-ngx_int_t ipc_alert(ipc_t *ipc, ngx_int_t slot, ngx_uint_t code,  void *data, size_t data_size);
-
-#endif //NCHAN_IPC_H
diff --git a/debian/modules/nchan/src/store/memory/memstore.c b/debian/modules/nchan/src/store/memory/memstore.c
deleted file mode 100755
index 4571659..0000000
--- a/debian/modules/nchan/src/store/memory/memstore.c
+++ /dev/null
@@ -1,3544 +0,0 @@
-#include <nchan_module.h>
-
-#include <signal.h> 
-#include <assert.h>
-#include "uthash.h"
-#include "store.h"
-#include <util/shmem.h>
-#include "ipc.h"
-#include "ipc-handlers.h"
-#include "store-private.h"
-#include "groups.h"
-#include <store/spool.h>
-
-#include <util/nchan_reaper.h>
-#include <util/nchan_debug.h>
-
-#include <store/redis/store.h>
-#include <store/store_common.h>
-#include <subscribers/memstore_redis.h>
-#include <subscribers/getmsg_proxy.h>
-#include <subscribers/memstore_multi.h>
-
-#define NCHAN_CHANHEAD_EXPIRE_SEC 5
-
-static ngx_int_t redis_fakesub_timer_interval;
-#define REDIS_DEFAULT_FAKESUB_TIMER_INTERVAL 100;
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#if FAKESHARD
-
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
-#define WARN(fmt, args...) ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
-
-#else
-
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
-#define WARN(fmt, args...) ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
-
-#endif
-
-uint16_t  memstore_worker_generation;
-
-
-typedef struct {
-  //memstore_channel_head_t       unbuffered_dummy_chanhead;
-  store_channel_head_shm_t        dummy_shared_chaninfo;
-  memstore_channel_head_t        *hash;
-  nchan_reaper_t                  msg_reaper;
-  nchan_reaper_t                  nobuffer_msg_reaper;
-  nchan_reaper_t                  chanhead_reaper;
-  
-  nchan_reaper_t                  chanhead_churner;
-  
-  ngx_int_t                       workers;
-  
-#if FAKESHARD
-  ngx_int_t                       fake_slot;
-#endif
-} memstore_data_t;
-
-
-ngx_int_t                         memstore_procslot_offset = 0;
-static nchan_loc_conf_t           default_multiconf;
-
-static ngx_int_t nchan_memstore_store_msg_ready_to_reap_generic(store_message_t *smsg, uint8_t respect_expire, uint8_t force) {
-  if(!force) {
-    if(respect_expire && smsg->msg->expires > ngx_time()) {
-      //not time yet
-      return NGX_DECLINED;
-    }
-    
-    if(msg_refcount_invalidate_if_zero(smsg->msg)) {
-      return NGX_OK;
-    }
-    return NGX_DECLINED;
-  }
-  else {
-    if(!msg_refcount_invalidate_if_zero(smsg->msg)) {
-      if(smsg->msg->refcount > 0) {
-        ERR("force-reaping msg with refcount %d", smsg->msg->refcount);
-      }
-      msg_refcount_invalidate(smsg->msg);
-    }
-    return NGX_OK;
-  }
-}
-
-static ngx_int_t nchan_memstore_store_msg_ready_to_reap(store_message_t *smsg, uint8_t force) {
-  return nchan_memstore_store_msg_ready_to_reap_generic(smsg, 0, force);
-}
-
-static ngx_int_t nchan_memstore_store_msg_ready_to_reap_wait_util_expired(store_message_t *smsg, uint8_t force) {
-  return nchan_memstore_store_msg_ready_to_reap_generic(smsg, 1, force);
-}
-
-static void memstore_reap_message( nchan_msg_t *msg );
-static void memstore_reap_store_message( store_message_t *smsg );
-
-static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch);
-
-#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
-static void log_memstore_chanhead_reservations(memstore_channel_head_t *ch) {
-#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
-  nchan_list_el_t  *cur;
-  char            **lbl;
-  DBG("%p %V reservations: %i", ch, &ch->id, ch->reserved.n);
-  for(cur = ch->reserved.head; cur != NULL; cur = cur->next) {
-    lbl = nchan_list_data_from_el(cur);
-    DBG("   %s", *lbl);
-  }
-#else
-  DBG("%p %V reservations: %i", ch, &ch->id, ch->reserved);
-#endif
-}
-#endif
-
-static int memstore_chanhead_reservations(memstore_channel_head_t *ch) {
-#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
-  return ch->reserved.n;
-#else
-  return ch->reserved;
-#endif
-}
-
-void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *lbl) {
-#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
-  char   **label = nchan_list_append(&ch->reserved);
-  *label = (char *)lbl;
-#else
-  ch->reserved++;
-#endif
-}
-
-void memstore_chanhead_release(memstore_channel_head_t *ch, char *label) {
-#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
-  nchan_list_el_t  *cur;
-  char            **lbl;
-  for(cur = ch->reserved.head; cur != NULL; cur = cur->next) {
-    lbl = nchan_list_data_from_el(cur);
-    if(strcmp(label, *lbl) == 0) {
-      nchan_list_remove(&ch->reserved, lbl);
-      return;
-    }
-  }
-  ERR("can't release for channel %p %V reservation %s (total reservations: %i)", ch, &ch->id, label, ch->reserved.n);
-  assert(0);
-#else
-  ch->reserved--;
-#endif
-}
-
-static ngx_int_t memstore_chanhead_reserved_or_in_use(memstore_channel_head_t *ch) {
-  if (ch->total_sub_count > 0) { //there are subscribers
-    DBG("not ready to reap %V, %i subs left", &ch->id, ch->total_sub_count);
-    return 1;
-  }
-  
-  if(memstore_chanhead_reservations(ch) > 0) {
-#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
-    DBG("not ready to reap %V, still reserved:", &ch->id);
-    log_memstore_chanhead_reservations(ch);
-#endif
-    return 1;
-  }
-  
-  if(ch->cf && ch->cf->redis.enabled && ch->churn_start_time + ch->redis_idle_cache_ttl < ngx_time()) {
-    DBG("idle redis cache channel %p %V (msgs: %i)", ch, &ch->id, ch->channel.messages);
-    // any stored messages are unimportant, they're backed up in redis
-  }
-  else if(ch->channel.messages > 0) {
-    assert(ch->msg_first != NULL);
-    DBG("not ready to reap %V, %i messages left", &ch->id, ch->channel.messages);
-    return 1;
-  }
-  
-  if(ch->owner == ch->slot && ch->shared && ch->shared->gc.outside_refcount > 0) {
-    DBG("channel %p %V shared data still used by %i workers.", ch, &ch->id, ch->shared->gc.outside_refcount);
-    return 1;
-  }
-  
-  return 0;
-}
-
-static ngx_int_t nchan_memstore_chanhead_ready_to_reap(memstore_channel_head_t *ch, uint8_t force) {
-  
-  memstore_chanhead_messages_gc(ch);
-  
-  if(force) {
-    //force delete is always ok
-    return NGX_OK;
-  }
-  
-  if(ch->status != INACTIVE) {
-    DBG("not ready to reap %V : status %i", &ch->id, ch->status);
-    return NGX_DECLINED;
-  }
-  
-  if(ch->gc_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
-    DBG("not ready to reap %V, %i sec left", &ch->id, ch->gc_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
-    return NGX_DECLINED;
-  }
-    
-  if(memstore_chanhead_reserved_or_in_use(ch)) {
-    return NGX_DECLINED;
-  }
-    
-  DBG("ok to delete channel %V", &ch->id);
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_memstore_chanhead_ready_to_reap_slowly(memstore_channel_head_t *ch, uint8_t force) {
-  
-  memstore_chanhead_messages_gc(ch);
-  if(force) {
-    return NGX_OK;
-  }
-  
-  if(ch->churn_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
-    DBG("not ready to reap %p %V, %i sec left", ch, &ch->id, ch->churn_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
-    return NGX_DECLINED;
-  }
-    
-  if(memstore_chanhead_reserved_or_in_use(ch)) {
-    return NGX_DECLINED;
-  }
-  
-  DBG("ok to slow-delete channel %V", &ch->id);
-  return NGX_OK;
-}
-
-static void memstore_reap_chanhead(memstore_channel_head_t *ch);
-static void memstore_reap_churned_chanhead(memstore_channel_head_t *ch) { //different method for some debug tracing
-  memstore_reap_chanhead(ch);
-}
-
-static void init_mpt(memstore_data_t *m) {
-  
-  nchan_reaper_start(&m->msg_reaper, 
-                     "memstore message", 
-                     offsetof(store_message_t, prev), 
-                     offsetof(store_message_t, next), 
-    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_store_msg_ready_to_reap,
-         (void (*)(void *)) memstore_reap_store_message,
-                     5
-  );
-  
-  nchan_reaper_start(&m->nobuffer_msg_reaper, 
-                     "memstore nobuffer message", 
-                     offsetof(store_message_t, prev), 
-                     offsetof(store_message_t, next), 
-    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_store_msg_ready_to_reap_wait_util_expired,
-         (void (*)(void *)) memstore_reap_store_message,
-                     2
-  );
-  m->nobuffer_msg_reaper.strategy = ROTATE;
-  m->nobuffer_msg_reaper.max_notready_ratio = 0.20;
-  
-  nchan_reaper_start(&m->chanhead_reaper, 
-                     "chanhead", 
-                     offsetof(memstore_channel_head_t, gc_prev), 
-                     offsetof(memstore_channel_head_t, gc_next), 
-    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_chanhead_ready_to_reap,
-         (void (*)(void *)) memstore_reap_chanhead,
-                     4
-  );
-  
-  nchan_reaper_start(&m->chanhead_churner, 
-                     "chanhead churner", 
-                     offsetof(memstore_channel_head_t, churn_prev), 
-                     offsetof(memstore_channel_head_t, churn_next), 
-    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_chanhead_ready_to_reap_slowly,
-         (void (*)(void *)) memstore_reap_churned_chanhead,
-                     10
-  );
-  m->chanhead_churner.strategy = KEEP_PLACE;
-  m->chanhead_churner.max_notready_ratio = 0.10;
-  
-}
-
-static shmem_t         *shm = NULL;
-void                   *nchan_store_memory_shmem = NULL;
-static shm_data_t      *shdata = NULL;
-static ipc_t            ipc_data;
-static ipc_t           *ipc = NULL;
-
-static memstore_groups_t groups_data;
-static memstore_groups_t *groups = NULL;
-
-#if FAKESHARD
-
-static memstore_data_t  mdata[MAX_FAKE_WORKERS];
-static memstore_data_t fake_default_mdata;
-memstore_data_t *mpt = &fake_default_mdata;
-
-ngx_int_t memstore_slot(void) {
-  return mpt->fake_slot;
-}
-
-int memstore_ready(void) {
-  return 1;
-}
-#else
-
-static memstore_data_t  mdata;
-memstore_data_t *mpt = &mdata;
-
-
-ngx_int_t memstore_slot(void) {
-  return ngx_process_slot;
-}
-
-int memstore_ready(void) {
-  if(memstore_worker_generation == shdata->generation && shdata->max_workers == shdata->current_active_workers) {
-    return 1;
-  }
-  else if(memstore_worker_generation < shdata->generation) {
-    return 1;
-  }
-  return 0;
-}
-#endif
-
-ipc_t *nchan_memstore_get_ipc(void){
-  return ipc;
-}
-
-memstore_groups_t *nchan_memstore_get_groups(void) {
-  return groups;
-}
-
-static ngx_int_t                  shared_loc_conf_count = 0;
-ngx_int_t memstore_reserve_conf_shared_data(nchan_loc_conf_t *cf) {
-  if(cf->shared_data_index == NGX_CONF_UNSET) {
-    cf->shared_data_index = shared_loc_conf_count++;
-  }
-  //DBG("shared_loc_conf_count is %i", shared_loc_conf_count);
-  return NGX_OK;
-}
-
-nchan_loc_conf_shared_data_t *memstore_get_conf_shared_data(nchan_loc_conf_t *cf) {
-  assert(cf->shared_data_index != NGX_CONF_UNSET);
-  return &shdata->conf_data[cf->shared_data_index];
-}
-
-
-#define CHANNEL_HASH_FIND(id_buf, p)    HASH_FIND( hh, mpt->hash, (id_buf)->data, (id_buf)->len, p)
-#define CHANNEL_HASH_ADD(chanhead)      HASH_ADD_KEYPTR( hh, mpt->hash, (chanhead->id).data, (chanhead->id).len, chanhead)
-#define CHANNEL_HASH_DEL(chanhead)      HASH_DEL( mpt->hash, chanhead)
-
-#define NCHAN_NOBUFFER_MSG_EXPIRE_SEC 10
-
-
-#if FAKESHARD
-
-static nchan_llist_timed_t *fakeprocess_top = NULL;
-void memstore_fakeprocess_push(ngx_int_t slot) {
-  assert(slot < MAX_FAKE_WORKERS);
-  nchan_llist_timed_t *link = ngx_calloc(sizeof(*fakeprocess_top), ngx_cycle->log);
-  link->data = (void *)slot;
-  link->time = ngx_time();
-  link->next = fakeprocess_top;
-  if(fakeprocess_top != NULL) {
-    fakeprocess_top->prev = link;
-  }
-  fakeprocess_top = link;
-  //DBG("push fakeprocess %i onto stack", slot);
-  mpt = &mdata[slot];
-}
-
-ngx_int_t memstore_fakeprocess_pop(void) {
-  nchan_llist_timed_t   *next;
-  if(fakeprocess_top == NULL) {
-    DBG("can't pop empty fakeprocess stack");
-    return 0;
-  }
-  next = fakeprocess_top->next;
-  ngx_free(fakeprocess_top);
-  if(next == NULL) {
-    DBG("can't pop last item off of fakeprocess stack");
-    return 0;
-  }
-  //DBG("pop fakeprocess to return to %i", (ngx_int_t)next->data);
-  next->prev = NULL;
-  fakeprocess_top = next;
-  mpt = &mdata[(ngx_int_t )fakeprocess_top->data];
-  return 1;
-}
-
-void memstore_fakeprocess_push_random(void) {
-  return memstore_fakeprocess_push(rand() % MAX_FAKE_WORKERS);
-}
-
-#endif
-
-ngx_int_t memstore_str_owner(ngx_str_t *str) {
-  uint32_t        h;
-  ngx_int_t       workers;
-  
-  workers = shdata->max_workers;
-  h = ngx_crc32_short(str->data, str->len);
-#if FAKESHARD
-  #ifdef ONE_FAKE_CHANNEL_OWNER
-  h++; //just to avoid the unused variable warning
-  return ONE_FAKE_CHANNEL_OWNER;
-  #else
-  return h % MAX_FAKE_WORKERS;
-  #endif
-#else
-  ngx_int_t       i, slot;
-  i = h % workers;
-  assert(i >= 0);
-  slot = shdata->procslot[i + memstore_procslot_offset];
-  //DBG("owner for %V workers=%i (max=%i active=%i) h=%ui m_p_off=%i i=%i slot=%i", str, workers, shdata->max_workers, shdata->total_active_workers, h, memstore_procslot_offset, i, slot);
-  if(slot == NCHAN_INVALID_SLOT) {
-    ERR("something went wrong, the channel owner is invalid. i: %i h: %ui, workers: %i", i, h, workers);
-    assert(0);
-    return NCHAN_INVALID_SLOT;
-  }
-  return slot;
-#endif
-}
-
-ngx_int_t nchan_nginx_worker_procslot(ngx_int_t worker_number) {
-  if( worker_number < 0 || worker_number > shdata->max_workers) {
-    return NGX_ERROR;
-  }
-  return shdata->procslot[worker_number + memstore_procslot_offset];
-}
-
-ngx_int_t memstore_channel_owner(ngx_str_t *id) {
-  return nchan_channel_id_is_multi(id) ? memstore_slot() : memstore_str_owner(id);
-}
-
-#if NCHAN_MSG_LEAK_DEBUG
-
-void msg_debug_add(nchan_msg_t *msg) {
-  //ensure this message is present only once
-  nchan_msg_t      *cur;
-  shmtx_lock(shm);
-  for(cur = shdata->msgdebug_head; cur != NULL; cur = cur->dbg_next) {
-    assert(cur != msg);
-  }
-  
-  if(shdata->msgdebug_head == NULL) {
-    msg->dbg_next = NULL;
-    msg->dbg_prev = NULL;
-  }
-  else {
-    msg->dbg_next = shdata->msgdebug_head;
-    msg->dbg_prev = NULL;
-    assert(shdata->msgdebug_head->dbg_prev == NULL);
-    shdata->msgdebug_head->dbg_prev = msg;
-  }
-  shdata->msgdebug_head = msg;
-  shmtx_unlock(shm);
-}
-void msg_debug_remove(nchan_msg_t *msg) {
-  nchan_msg_t *prev, *next;
-  shmtx_lock(shm);
-  prev = msg->dbg_prev;
-  next = msg->dbg_next;
-  if(shdata->msgdebug_head == msg) {
-    assert(msg->dbg_prev == NULL);
-    if(next) {
-      next->dbg_prev = NULL;
-    }
-    shdata->msgdebug_head = next;
-  }
-  else {
-    if(prev) {
-      prev->dbg_next = next;
-    }
-    if(next) {
-      next->dbg_prev = prev;
-    }
-  }
-  
-  msg->dbg_next = NULL;
-  msg->dbg_prev = NULL;
-  shmtx_unlock(shm);
-}
-void msg_debug_assert_isempty(void) {
-  assert(shdata->msgdebug_head == NULL);
-}
-#endif
-
-
-
-static ngx_int_t chanhead_churner_add(memstore_channel_head_t *ch) {
-  DBG("Chanhead churn add %p %V", ch, &ch->id);
-  
-  //the churner is only allowed to churn self-owned channels
-  assert(ch->owner == ch->slot);
-  
-  if(!ch->shutting_down) {
-    assert(ch->foreign_owner_ipc_sub == NULL); //we don't accept still-subscribed chanheads
-  }
-
-  assert(!ch->in_gc_queue);
-  
-  if(!ch->in_churn_queue) {
-    ch->in_churn_queue = 1;
-    ch->churn_start_time = ngx_time();
-    nchan_reaper_add(&mpt->chanhead_churner, ch);
-  }
-
-  return NGX_OK;
-}
-
-static ngx_int_t chanhead_churner_withdraw(memstore_channel_head_t *ch) {
-  //remove from gc list if we're there
-  DBG("Chanhead churn withdraw %p %V", ch, &ch->id);
-  
-  if(ch->in_churn_queue) {
-    ch->in_churn_queue = 0;
-    nchan_reaper_withdraw(&mpt->chanhead_churner, ch);
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
-  shm_data_t         *d;
-  ngx_int_t           i;
-  if(data) { //zone being passed after restart
-    zone->data = data;
-    d = zone->data;
-    DBG("reattached shm data at %p", data);
-    shmtx_lock(shm);
-    d->generation ++;
-    d->current_active_workers = 0;
-    
-    if(d->conf_data) {
-      shm_locked_free(shm, d->conf_data);
-      d->conf_data = NULL;
-    }
-    
-    // don't reinitialize stub stats, because this may happen before the
-    // old workers shut down. Rather than add a generational conditional
-    // to __memstore_update_stub_status, we just don't reset the stats.
-    //ngx_memzero(&d->stats, sizeof(d->stats));
-#if nginx_version <= 1011006
-  shm_set_allocd_pages_tracker(shm, &d->shmem_pages_used);
-#endif
-    shmtx_unlock(shm);
-  }
-  else {
-    shm_init(shm);
-    
-    if((d = shm_calloc(shm, sizeof(*d), "root shared data")) == NULL) {
-      return NGX_ERROR;
-    }
-    
-    zone->data = d;
-    shdata = d;
-    shdata->rlch = NULL;
-    shdata->max_workers = NGX_CONF_UNSET;
-    shdata->old_max_workers = NGX_CONF_UNSET;
-    shdata->generation = 0;
-    shdata->subscriber_info_response_id = 1;
-    shdata->total_active_workers = 0;
-    shdata->current_active_workers = 0;
-    shdata->reloading = 0;
-    
-    
-    for(i=0; i< NGX_MAX_PROCESSES; i++) {
-      shdata->procslot[i]=NCHAN_INVALID_SLOT;
-    }
-    ngx_memzero(&d->stats, sizeof(d->stats));
-    
-#if nginx_version <= 1011006
-    shdata->shmem_pages_used=0;
-    shm_set_allocd_pages_tracker(shm, &d->shmem_pages_used);
-#endif
-    DBG("Shm created with data at %p", d);
-#if NCHAN_MSG_LEAK_DEBUG
-    shdata->msgdebug_head = NULL;
-#endif
-  }
-  
-  if(shared_loc_conf_count > 0) {
-    d->conf_data = shm_calloc(shm, sizeof(nchan_loc_conf_shared_data_t) * shared_loc_conf_count, "shared config data");
-    if(d->conf_data == NULL) {
-      return NGX_ERROR;
-    }
-  }
-  return NGX_OK;
-}
-
-
-void __memstore_update_stub_status(off_t offset, int count) {
-  if(nchan_stub_status_enabled) {
-    ngx_atomic_fetch_add((ngx_atomic_uint_t *)((char *)&shdata->stats + offset), count);
-  }
-}
-
-nchan_stub_status_t *nchan_get_stub_status_stats(void) {
-  return &shdata->stats;
-}
-
-size_t nchan_get_used_shmem(void) {
-#if nginx_version <= 1011006
-  return shdata->shmem_pages_used * ngx_pagesize;
-#else
-  return shm_used_pages(shm) * ngx_pagesize;
-#endif
-}
-
-static int send_redis_fakesub_delta(memstore_channel_head_t *head) {
-  if(head->delta_fakesubs != 0) {
-    nchan_store_redis_fakesub_add(&head->id, head->cf, head->delta_fakesubs, head->shutting_down);
-    head->delta_fakesubs = 0;
-    return 1;
-  }
-  return 0;
-}
-
-static void memstore_reap_chanhead(memstore_channel_head_t *ch) {
-  int       i;
-  
-  chanhead_messages_delete(ch);
-  
-  if(ch->total_sub_count > 0) {
-    ch->spooler.fn->broadcast_status(&ch->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
-  }
-  stop_spooler(&ch->spooler, 0);
-  if(ch->cf && ch->cf->redis.enabled && ch->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED && !ch->multi) {
-    send_redis_fakesub_delta(ch);
-    if(ch->delta_fakesubs_timer_ev.timer_set) {
-      ngx_del_timer(&ch->delta_fakesubs_timer_ev);
-    }
-  }
-  if(ch->owner == memstore_slot()) {
-    nchan_update_stub_status(channels, -1);
-    if(ch->shared)
-      shm_free(shm, ch->shared);
-  }
-  
-  DBG("chanhead %p (%V) is empty and expired. DELETE.", ch, &ch->id);
-  CHANNEL_HASH_DEL(ch);
-  if(ch->redis_sub) {
-    if(ch->redis_sub->enqueued) {
-      ch->redis_sub->fn->dequeue(ch->redis_sub);
-    }
-    memstore_redis_subscriber_destroy(ch->redis_sub);
-  }
-  
-  if(ch->groupnode) {
-    if(ch->owner == memstore_slot()) {
-      memstore_group_dissociate_own_channel(ch);
-    }
-    memstore_group_remove_channel(ch);
-  }
-  assert(ch->groupnode_prev == NULL);
-  assert(ch->groupnode_next == NULL);
-  
-  
-  if(ch->multi) {
-    for(i=0; i < ch->multi_count; i++) {
-      if(ch->multi[i].sub) {
-        ch->multi[i].sub->fn->dequeue(ch->multi[i].sub);
-      }
-    }
-    ngx_free(ch->multi);
-    nchan_free_msg_id(&ch->latest_msgid);
-    nchan_free_msg_id(&ch->oldest_msgid);
-  }
-  
-  ch->status = DELETED;
-  
-  ngx_free(ch);
-}
-
-static store_message_t *create_shared_message(nchan_msg_t *m, ngx_int_t msg_already_in_shm);
-static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_message_t *msg);
-
-static ngx_int_t nchan_store_init_worker(ngx_cycle_t *cycle) {
-  ngx_core_conf_t    *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-  ngx_int_t           workers = ccf->worker_processes;
-  ngx_int_t           i, procslot_found = 0;
-  
-#if FAKESHARD
-  for(i = 0; i < MAX_FAKE_WORKERS; i++) {
-  memstore_fakeprocess_push(i);
-#endif
-  
-  
-  init_mpt(mpt);
-
-#if FAKESHARD
-  memstore_fakeprocess_pop();
-  }
-#endif
-
-  ipc_register_worker(ipc, cycle);
-  
-  DBG("init memstore worker pid:%i slot:%i max workers :%i or %i", ngx_pid, memstore_slot(), shdata->max_workers, workers);
-
-  shmtx_lock(shm);
-  
-  if(shdata->max_workers != workers) {
-    DBG("update number of workers from %i to %i", shdata->max_workers, workers);
-    if(shdata->old_max_workers != shdata->max_workers) {
-      shdata->old_max_workers = shdata->max_workers;
-    }
-    shdata->max_workers = workers;
-  }
-  
-  shdata->total_active_workers++;
-  shdata->current_active_workers++;
-  
-  for(i = memstore_procslot_offset; i < NGX_MAX_PROCESSES - memstore_procslot_offset; i++) {
-    if(shdata->procslot[i] == ngx_process_slot) {
-      DBG("found my procslot (ngx_process_slot %i, procslot %i)", ngx_process_slot, i);
-      procslot_found = 1;
-      break;
-    }
-  }
-  assert(procslot_found == 1);
-  
-  mpt->workers = workers;
-  
-  if(i >= workers) {
-    //we're probably reloading or something
-    DBG("that was a reload just now");
-  }
-  
-  //reload_msgs();
-  
-  DBG("shm: %p, shdata: %p", shm, shdata);
-  shmtx_unlock(shm);
-  
-  return NGX_OK;
-}
-
-#define CHANHEAD_SHARED_OKAY(head) head->status == READY || head->status == STUBBED || (!head->stub && head->cf->redis.enabled == 1 && head->status == WAITING && head->owner == head->slot)
-
-void memstore_fakesub_add(memstore_channel_head_t *head, ngx_int_t n) {
-  assert(head->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED);
-  if(redis_fakesub_timer_interval == 0) {
-    nchan_store_redis_fakesub_add(&head->id, head->cf, n, head->shutting_down);
-  }
-  else {
-    head->delta_fakesubs += n;
-    if(!head->delta_fakesubs_timer_ev.timer_set && !head->shutting_down && !ngx_exiting && !ngx_quit) {
-      //ERR("%V start fakesub timer", &head->id);
-      ngx_add_timer(&head->delta_fakesubs_timer_ev, redis_fakesub_timer_interval);
-    }
-  }
-}
-
-static void memstore_spooler_use_handler(channel_spooler_t *spl, void *d) {
-  memstore_channel_head_t  *head = d;
-  time_t t = ngx_time();
-  //ugh, this is so redundant. TODO: clean this shit up
-  head->last_subscribed_local = t;
-  head->channel.last_seen = t;
-  if(head->shared) {
-    head->shared->last_seen = t;
-  }
-}
-
-static void memstore_spooler_add_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
-  memstore_channel_head_t   *head = (memstore_channel_head_t *)privdata;
-  head->total_sub_count++;
-  if(sub->type == INTERNAL) {
-    head->internal_sub_count++;
-    if(head->shared) {
-      assert(CHANHEAD_SHARED_OKAY(head));
-      ngx_atomic_fetch_add(&head->shared->internal_sub_count, 1);
-    }
-  }
-  else {
-    if(head->shared) {
-      assert(CHANHEAD_SHARED_OKAY(head));
-      ngx_atomic_fetch_add(&head->shared->sub_count, 1);
-    }
-    if(head->cf && head->cf->redis.enabled && head->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED && !head->multi) {
-      memstore_fakesub_add(head, 1);
-    }
-    nchan_update_stub_status(subscribers, 1);
-    if(head->groupnode) {
-      memstore_group_add_subscribers(head->groupnode, 1);
-    }
-    if(head->multi) {
-      ngx_int_t      i, max = head->multi_count;
-      subscriber_t  *msub;
-      for(i = 0; i < max; i++) {
-        msub = head->multi[i].sub;
-        if(msub) {
-          msub->fn->notify(msub, NCHAN_SUB_MULTI_NOTIFY_ADDSUB, (void *)1);
-        }
-      }
-    }
-  }
-  head->channel.subscribers = head->total_sub_count - head->internal_sub_count;
-  assert(head->total_sub_count >= head->internal_sub_count);
-}
-
-static void memstore_spooler_bulk_dequeue_handler(channel_spooler_t *spl, subscriber_type_t type, ngx_int_t count, void *privdata) {
-  memstore_channel_head_t   *head = (memstore_channel_head_t *)privdata;
-  if (type == INTERNAL) {
-    //internal subscribers are *special* and don't really count
-    head->internal_sub_count -= count;
-    if(head->shared) {
-      ngx_atomic_fetch_add(&head->shared->internal_sub_count, -count);
-    }
-  }
-  else {
-    if(head->shared){
-      ngx_atomic_fetch_add(&head->shared->sub_count, -count);
-    }
-    /*
-    else if(head->shared == NULL) {
-      assert(head->shutting_down == 1);
-    }
-    */
-    if(head->cf && head->cf->redis.enabled && head->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED && !head->multi) {
-      memstore_fakesub_add(head, -count);
-    }
-    
-    nchan_update_stub_status(subscribers, -count);
-    
-    if(head->multi) {
-      ngx_int_t     i, max = head->multi_count;
-      subscriber_t *sub;
-      for(i = 0; i < max; i++) {
-        sub = head->multi[i].sub;
-        if(sub) {
-          sub->fn->notify(sub, NCHAN_SUB_MULTI_NOTIFY_ADDSUB, (void *)-count);
-        }
-      }
-    }
-    if(head->groupnode) {
-      memstore_group_add_subscribers(head->groupnode, -(count));
-    }
-  }
-  head->total_sub_count -= count;
-  head->channel.subscribers = head->total_sub_count - head->internal_sub_count;
-  assert(head->total_sub_count >= 0);
-  assert(head->internal_sub_count >= 0);
-  assert(head->channel.subscribers >= 0);
-  assert(head->total_sub_count >= head->internal_sub_count);
-  if(head->total_sub_count == 0 && head->foreign_owner_ipc_sub == NULL) {
-    chanhead_gc_add(head, "sub count == 0 after spooler dequeue");
-  }
-}
-
-
-
-static ngx_int_t start_chanhead_spooler(memstore_channel_head_t *head) {
-  static channel_spooler_handlers_t handlers = {
-    memstore_spooler_add_handler,
-    NULL,
-    memstore_spooler_bulk_dequeue_handler,
-    memstore_spooler_use_handler,
-    NULL,
-    NULL
-  };
-  
-  start_spooler(&head->spooler, &head->id, &head->status, &head->msg_buffer_complete, &nchan_store_memory, head->cf, NCHAN_SPOOL_FETCH, &handlers, head);
-  if(head->meta) {
-    head->spooler.publish_events = 0;
-  }
-  return NGX_OK;
-}
-
-ngx_int_t memstore_ready_chanhead_unless_stub(memstore_channel_head_t *head) {
-  if(head->stub) {
-    head->status = STUBBED;
-  }
-  else {
-    head->status = READY;
-    head->spooler.fn->handle_channel_status_change(&head->spooler);
-    if(head->status == INACTIVE) {
-      chanhead_gc_withdraw(head, "rare weird condition after handle_channel_status_change");
-      head->status = READY;
-    }
-  }
-  return NGX_OK;
-}
-
-ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8_t ipc_subscribe_if_needed) {
-  ngx_int_t                      owner;
-  ngx_int_t                      i;
-  if(head == NULL) {
-    return NGX_OK;
-  }
-  assert(!head->stub && head->cf);
-  owner = head->owner;
-  DBG("ensure chanhead ready: chanhead %p, status %i, foreign_ipc_sub:%p", head, (ngx_int_t )head->status, head->foreign_owner_ipc_sub);
-  if(head->in_gc_queue) {//recycled chanhead
-    chanhead_gc_withdraw(head, "readying INACTIVE");
-  }
-  if(head->owner == head->slot && !head->in_churn_queue) {
-    chanhead_churner_add(head);
-  }
-  
-  if(!head->spooler.running) {
-    DBG("ensure chanhead ready: Spooler for channel %p %V wasn't running. start it.", head, &head->id);
-    start_chanhead_spooler(head);
-  }
-  
-  for(i=0; i< head->multi_count; i++) {
-    if(head->multi[i].sub == NULL) {
-      if(memstore_multi_subscriber_create(head, i) == NULL) { //stores and enqueues automatically
-        ERR("can't create multi subscriber for channel");
-        return NGX_ERROR;
-      }
-    }
-  }
-  
-  if(owner != memstore_slot()) {
-    if(head->foreign_owner_ipc_sub == NULL && head->status != WAITING) {
-      head->status = WAITING;
-      if(ipc_subscribe_if_needed) {
-        ngx_int_t       rc;
-        assert(head->cf);
-        DBG("ensure chanhead ready: request for %V from %i to %i", &head->id, memstore_slot(), owner);
-        if((rc = memstore_ipc_send_subscribe(owner, &head->id, head, head->cf)) != NGX_OK) {
-          return rc;
-        }
-      }
-    }
-    else if(head->foreign_owner_ipc_sub != NULL && head->status == WAITING) {
-      DBG("ensure chanhead ready: subscribe request for %V from %i to %i", &head->id, memstore_slot(), owner);
-      memstore_ready_chanhead_unless_stub(head);
-    }
-  }
-  else {
-    if(head->cf && head->cf->redis.enabled && !head->multi && head->status != READY) { //both redis BACKUP and DISTRIBUTED storage modes
-      if(head->redis_sub == NULL) {
-        head->redis_sub = memstore_redis_subscriber_create(head);
-        nchan_store_redis.subscribe(&head->id, head->redis_sub);
-        head->status = WAITING;
-      }
-      else {
-        if(head->redis_sub->enqueued) {
-          memstore_ready_chanhead_unless_stub(head);
-        }
-        else {
-          head->status = WAITING;
-        }
-      }
-    }
-    else if(head->status != READY) {
-      memstore_ready_chanhead_unless_stub(head);
-    }
-  }
-  return NGX_OK;
-}
-
-
-static ngx_int_t parse_multi_id(ngx_str_t *id, ngx_str_t ids[]) {
-  ngx_int_t       n = 0;
-  u_char         *cur = id->data;
-  u_char         *last = cur + id->len;
-  u_char         *sep;
-  
-  if(nchan_channel_id_is_multi(id)) {
-    cur += 3;
-    while((sep = ngx_strlchr(cur, last, NCHAN_MULTI_SEP_CHR)) != NULL) {
-      ids[n].data=cur;
-      ids[n].len = sep - cur;
-      cur = sep + 1;
-      n++;
-    }
-    return n;
-  }
-  return 0;
-}
-
-static int count_channel_id(ngx_str_t *id) {
-  int       n = 0;
-  u_char   *cur = id->data;
-  u_char   *last = cur + id->len;
-  u_char   *sep;
-  
-  if(nchan_channel_id_is_multi(id)) {
-    cur += 3;
-    while((sep = ngx_strlchr(cur, last, NCHAN_MULTI_SEP_CHR)) != NULL) {
-      cur = sep + 1;
-      n++;
-    }
-    return n;
-  }
-  else {
-    return 1;
-  }
-}
-
-static void delta_fakesubs_timer_handler(ngx_event_t *ev) {
-  memstore_channel_head_t *head = (memstore_channel_head_t *)ev->data;
-  if(send_redis_fakesub_delta(head) && !ngx_exiting && !ngx_quit && ev->timedout) {
-    ev->timedout = 0;
-    ngx_add_timer(ev, redis_fakesub_timer_interval);
-  }
-}
-
-static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
-  memstore_channel_head_t      *head;
-  ngx_int_t                     owner = memstore_channel_owner(channel_id);
-  ngx_str_t                     ids[NCHAN_MULTITAG_MAX];
-  ngx_int_t                     i, n = 0;
-  ngx_str_t                     group_name;
-  group_tree_node_t            *groupnode;
-  
-  head=ngx_calloc(sizeof(*head) + sizeof(u_char)*(channel_id->len), ngx_cycle->log);
-  
-  if(head == NULL) {
-    ERR("can't allocate memory for (new) chanhead");
-    return NULL;
-  }
-  
-  head->channel.last_published_msg_id.time=0;
-  head->channel.last_published_msg_id.tagcount=1;
-  head->channel.last_published_msg_id.tagactive=0;
-  head->channel.last_published_msg_id.tag.fixed[0]=0;
-  
-  head->slot = memstore_slot();
-  head->owner = owner;
-  head->shutting_down = 0;
-  head->in_gc_queue = 0;
-  head->in_churn_queue = 0;
-  head->gc_queued_times = 0;
-  head->redis_sub = NULL;
-  if(cf) {
-    head->stub = 0;
-    head->cf=cf;
-  }
-  else {
-    head->stub = 1;
-    head->cf = NULL;
-  }
-  
-  if(head->slot == owner) {
-    if((head->shared = shm_alloc(shm, sizeof(*head->shared), "channel shared data")) == NULL) {
-      ngx_free(head);
-      nchan_log_ooshm_error("allocating channel %V", channel_id);
-      return NULL;
-    }
-    head->shared->sub_count = 0;
-    head->shared->internal_sub_count = 0;
-    head->shared->total_message_count = 0;
-    head->shared->stored_message_count = 0;
-    head->shared->last_seen = 0;
-    head->shared->gc.outside_refcount=0;
-    nchan_update_stub_status(channels, 1);
-  }
-  else {
-    head->shared = NULL;
-  }
-  
-  //no lock needed, no one else knows about this chanhead yet.
-  head->id.len = channel_id->len;
-  head->id.data = (u_char *)&head[1];
-  ngx_memcpy(head->id.data, channel_id->data, channel_id->len);
-  head->total_sub_count=0;
-  head->internal_sub_count=0;
-  head->status = NOTREADY;
-  head->msg_last = NULL;
-  head->msg_first = NULL;
-  head->foreign_owner_ipc_sub = NULL;
-  head->last_subscribed_local = 0;
-  
-#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
-  nchan_list_init(&head->reserved, sizeof(char *), "chanhead reserve (debug)");
-#else
-  head->reserved = 0;
-#endif
-  head->multi=NULL;
-  head->multi_count = 0;
-  head->multi_subscribers_pending = 0;
-  
-  //set channel
-  ngx_memcpy(&head->channel.id, &head->id, sizeof(ngx_str_t));
-  head->channel.messages = 0;
-  head->channel.subscribers = 0;
-  head->channel.last_seen = 0;
-  head->max_messages = (ngx_int_t) -1;
-  
-  if(head->id.len >= 5 && ngx_strncmp(head->id.data, "meta/", 5) == 0) {
-    head->meta = 1;
-    head->max_messages = NCHAN_META_CHANNEL_MAX_MESSAGES;
-  }
-  else {
-    head->meta = 0;
-  }
-  
-  head->spooler.running=0;
-  
-  if((n = parse_multi_id(&head->id, ids)) > 0) {
-    memstore_multi_t          *multi;
-    int16_t                   *tags_latest, *tags_oldest;
-    
-    if((multi = ngx_calloc(sizeof(*multi) * n, ngx_cycle->log)) == NULL) {
-      ERR("can't allocate multi array for multi-channel %p", head);
-      return NULL;
-    }
-    
-    head->latest_msgid.time = 0;
-    head->latest_msgid.tagcount = n;
-    head->oldest_msgid.time = 0;
-    head->oldest_msgid.tagcount = n;
-    
-    if(n <= NCHAN_FIXED_MULTITAG_MAX) {
-      tags_latest = head->latest_msgid.tag.fixed;
-      tags_oldest = head->oldest_msgid.tag.fixed;
-    }
-    else {
-      head->latest_msgid.tag.allocd = ngx_alloc(sizeof(*head->latest_msgid.tag.allocd) * n, ngx_cycle->log);
-      head->oldest_msgid.tag.allocd = ngx_alloc(sizeof(*head->oldest_msgid.tag.allocd) * n, ngx_cycle->log);
-      if(!head->latest_msgid.tag.allocd  || !head->oldest_msgid.tag.allocd) {
-        ERR("can't allocate multi tag array for multi-channel %p", head);
-        return NULL;
-      }
-      
-      tags_latest = head->latest_msgid.tag.allocd;
-      tags_oldest = head->oldest_msgid.tag.allocd;
-    }
-    
-    for(i=0; i < n; i++) {
-      tags_latest[i] = 0;
-      tags_oldest[i] = 0;
-      multi[i].id = ids[i];
-      multi[i].sub = NULL;
-    }
-    
-    head->multi_count = n;
-    head->multi_subscribers_pending = n;
-    head->multi = multi;
-    head->owner = head->slot; //multis are always self-owned
-  }
-  else {
-    head->multi_count = 0;
-    head->multi_subscribers_pending = n;
-    
-    head->latest_msgid.time = 0;
-    head->latest_msgid.tag.fixed[0] = 0;
-    head->latest_msgid.tagcount = 1;
-    
-    head->oldest_msgid.time = 0;
-    head->oldest_msgid.tag.fixed[0] = 0;
-    head->oldest_msgid.tagcount = 1;
-    
-    head->multi = NULL;
-  }
-  
-  if(head->cf && head->cf->redis.enabled && !head->multi) { // both DISTRIBUTED and BACKUP redis storage modes
-    nchan_init_timer(&head->delta_fakesubs_timer_ev, delta_fakesubs_timer_handler, head);
-    head->delta_fakesubs = 0;
-    head->redis_idle_cache_ttl = cf->redis_idle_channel_cache_timeout;
-    
-    
-    if(head->slot == owner) {
-      head->msg_buffer_complete = 0;
-    }
-    else {
-      head->msg_buffer_complete = 1; //always assume buffer is complete, and let the owner figure out the details
-    }
-  }
-  else {
-    head->redis_idle_cache_ttl = 0;
-    head->msg_buffer_complete = 1;
-  }
-  
-  start_chanhead_spooler(head);
-
-  //get group
-  if(cf && cf->group.enable_accounting) {
-    group_name = nchan_get_group_from_channel_id(&head->id);
-    if((groupnode = memstore_groupnode_get(groups, &group_name)) == NULL) {
-      ERR("couldn't get groupnode %V for chanhead %V", &group_name, &head->id);
-    }
-    else {
-      head->groupnode = groupnode;
-      memstore_group_add_channel(head);
-      if(head->owner == head->slot) {
-        memstore_group_associate_own_channel(head);
-      }
-    }
-  }
-  
-  CHANNEL_HASH_ADD(head);
-  
-  return head;
-}
-
-static ngx_inline memstore_channel_head_t *ensure_chanhead_ready_or_trash_chanhead(memstore_channel_head_t *head, int8_t ipc_sub_if_needed) {
-  if(head != NULL) {
-    if(memstore_ensure_chanhead_is_ready(head, ipc_sub_if_needed) != NGX_OK) {
-      head->status = INACTIVE;
-      chanhead_gc_add(head, "bad chanhead, couldn't ensure readiness");
-      return NULL;
-    }
-  }
-  return head;
-}
-
-memstore_channel_head_t * nchan_memstore_find_chanhead(ngx_str_t *channel_id) {
-  memstore_channel_head_t     *head = NULL;
-  //ERR("channel id %V", channel_id);
-  CHANNEL_HASH_FIND(channel_id, head);
-  return ensure_chanhead_ready_or_trash_chanhead(head, 1);
-}
-
-typedef struct {
-  ngx_str_t        *chid;
-  nchan_loc_conf_t *cf;
-  callback_pt       cb;
-  void             *pd;
-} find_ch_backup_data_t;
-
-
-static ngx_int_t memstore_find_chanhead_with_backup_callback(ngx_int_t rc, void *vd, void *pd) {
-  nchan_channel_t             *chinfo = vd;
-  find_ch_backup_data_t       *d = pd;
-  memstore_channel_head_t     *ch = NULL;
-  if(chinfo) {
-    ch = nchan_memstore_get_chanhead(d->chid, d->cf);
-    d->cb(ch ? NGX_OK : NGX_ERROR, ch, d->pd);
-  }
-  else {
-    d->cb(NGX_OK, NULL, d->pd);
-  }
-  
-  ngx_free(d);
-  return NGX_OK;
-}
-
-ngx_int_t nchan_memstore_find_chanhead_with_backup(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
-  memstore_channel_head_t     *head = NULL;
-  if((head = nchan_memstore_find_chanhead(channel_id)) == NULL) {
-    find_ch_backup_data_t     *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
-    if(!d) {
-      ERR("couldn't allocate data for nchan_memstore_find_chanhead_with_backup");
-      cb(NGX_ERROR, NULL, pd);
-      return NGX_ERROR;
-    }
-    d->chid = channel_id;
-    d->cf = cf;
-    d->cb = cb;
-    d->pd = pd;
-    
-    return nchan_store_redis.find_channel(channel_id, cf, memstore_find_chanhead_with_backup_callback, d);
-  }
-  
-  cb(NGX_OK, head, pd);
-  return NGX_OK;
-}
-
-memstore_channel_head_t *nchan_memstore_get_chanhead(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
-  memstore_channel_head_t          *head;
-  head = nchan_memstore_find_chanhead(channel_id);
-  if(head==NULL) {
-    head = chanhead_memstore_create(channel_id, cf);
-    return ensure_chanhead_ready_or_trash_chanhead(head, 1);
-  }
-  
-  if(cf->pub.http || cf->pub.websocket) {
-    head->cf = cf;
-  }
-  
-  return head;
-}
-
-memstore_channel_head_t *nchan_memstore_get_chanhead_no_ipc_sub(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
-  memstore_channel_head_t     *head = NULL;
-  CHANNEL_HASH_FIND(channel_id, head);
-  if(head != NULL) {
-    return ensure_chanhead_ready_or_trash_chanhead(head, 0);
-  }
-  else {
-    head = chanhead_memstore_create(channel_id, cf);
-    return ensure_chanhead_ready_or_trash_chanhead(head, 0);
-  }
-  return head;
-}
-
-ngx_int_t chanhead_gc_add(memstore_channel_head_t *ch, const char *reason) {
-  ngx_int_t                   slot = memstore_slot();
-  DBG("Chanhead gc add %p %V: %s", ch, &ch->id, reason);
-  
-  if(!ch->shutting_down) {
-    assert(ch->foreign_owner_ipc_sub == NULL); //we don't accept still-subscribed chanheads
-  }
-  
-  if(ch->slot != ch->owner && ch->shared) {
-    ngx_atomic_fetch_add(&ch->shared->gc.outside_refcount, -1);
-    ch->shared = NULL;
-  }
-  if(ch->status == WAITING && !(ch->cf && ch->cf->redis.enabled) && !(ngx_exiting || ngx_quit)) {
-    ERR("tried adding WAITING chanhead %p %V to chanhead_gc. why?", ch, &ch->id);
-    //don't gc it just yet.
-    return NGX_OK;
-  }
-  
-  assert(ch->slot == slot);
-  
-  if(! ch->in_gc_queue) {
-    ch->gc_start_time = ngx_time();
-    ch->status = INACTIVE;
-    ch->gc_queued_times ++;
-    chanhead_churner_withdraw(ch);
-    ch->in_gc_queue = 1;
-    nchan_reaper_add(&mpt->chanhead_reaper, ch);
-  }
-  else {
-    DBG("gc_add chanhead %V: already added", &ch->id);
-  }
-
-  return NGX_OK;
-}
-
-ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *ch, const char *reason) {
-  //remove from gc list if we're there
-  DBG("Chanhead gc withdraw %p %V: %s", ch, &ch->id, reason);
-  
-  if(ch->in_gc_queue) {
-    nchan_reaper_withdraw(&mpt->chanhead_reaper, ch);
-    ch->in_gc_queue = 0;
-  }
-  if(ch->owner == ch->slot) {
-    chanhead_churner_add(ch);
-  }
-  
-  return NGX_OK;
-}
-
-
-/*
-static ngx_str_t *msg_to_str(nchan_msg_t *msg) {
-  static ngx_str_t str;
-  ngx_buf_t *buf = msg->buf;
-  if(ngx_buf_in_memory(buf)) {
-    str.data = buf->start;
-    str.len = buf->end - buf->start;
-  }
-  else {
-    str.data= (u_char *)"{not in memory}";
-    str.len =  15;
-  }
-  return &str;
-}
-*/
-/*
-static ngx_str_t *chanhead_msg_to_str(store_message_t *msg) {
-  static ngx_str_t str;
-  if (msg == NULL) {
-    str.data=(u_char *)"{NULL}";
-    str.len = 6;
-    return &str;
-  }
-  else {
-    return msg_to_str(msg->msg); //WHOA, shared space!
-  }
-}
-*/
-
-ngx_int_t nchan_memstore_publish_notice(memstore_channel_head_t *head, ngx_int_t notice_code, const void *notice_data) {
-  
-  DBG("tried publishing notice %i to chanhead %p (subs: %i)", notice_code, head, head->total_sub_count);
-  
-  switch(notice_code) {
-    case NCHAN_NOTICE_BUFFER_LOADED:
-      //DBG("buffer loaded from Redis");
-      if(head->msg_buffer_complete == 0) {
-        head->msg_buffer_complete = 1;
-        ensure_chanhead_ready_or_trash_chanhead(head, 0);
-        head->spooler.fn->handle_channel_status_change(&head->spooler);
-      }
-      break;
-    
-    default:
-      //do nothing
-      break;
-  }
-  
-  return head->spooler.fn->broadcast_notice(&head->spooler, notice_code, (void *)notice_data);
-}
-
-ngx_int_t nchan_memstore_publish_generic(memstore_channel_head_t *head, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line) {
-  
-  ngx_int_t          shared_sub_count = 0;
-
-  if(head==NULL) {
-    /*
-    if(msg) {
-      DBG("tried publishing %V with a NULL chanhead", msgid_to_str(&msg->id));
-    }
-    else {
-      DBG("tried publishing status %i msg with a NULL chanhead", status_code);
-    }
-    */
-    return NCHAN_MESSAGE_QUEUED;
-  }
-  
-  if(head->shared) {
-    if(!(head->cf && head->cf->redis.enabled) && !head->multi) {
-      assert(head->status == READY || head->status == STUBBED);
-    }
-    shared_sub_count = head->shared->sub_count;
-  }
-
-  if(msg) {
-    //DBG("tried publishing %V to chanhead %p (subs: %i)", msgid_to_str(&msg->id), head, head->total_sub_count);
-    head->spooler.fn->respond_message(&head->spooler, msg);
-    
-    //wait what?...
-    //if(msg->temp_allocd) {
-    //  ngx_free(msg);
-    //}
-  }
-  else {
-    DBG("tried publishing status %i to chanhead %p (subs: %i)", status_code, head, head->total_sub_count);
-    head->spooler.fn->broadcast_status(&head->spooler, status_code, status_line);
-  }
-    
-  //TODO: be smarter about garbage-collecting chanheads
-  if(head->owner == memstore_slot()) {
-    //the owner is responsible for the chanhead and its interprocess siblings
-    //when removed, said siblings will be notified via IPC
-    chanhead_gc_add(head, "add owner chanhead after publish");
-  }
-  
-  if(head->shared) {
-    head->channel.subscribers = head->shared->sub_count;
-  }
-  
-  return (shared_sub_count > 0) ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED;
-}
-
-static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch);
-
-static ngx_int_t empty_callback(){
-  return NGX_OK;
-}
-
-typedef struct {
-  ngx_int_t       n;
-  nchan_channel_t chinfo;
-  callback_pt     cb;
-  void           *pd;
-} delete_multi_data_t;
-
-static ngx_int_t delete_multi_callback_handler(ngx_int_t code, nchan_channel_t* chinfo, delete_multi_data_t *d) {
-  assert(d->n >= 1);
-  d->n--;
-  
-  if(chinfo) {
-    d->chinfo.subscribers += chinfo->subscribers;
-    if(d->chinfo.last_seen < chinfo->last_seen) {
-      d->chinfo.last_seen = chinfo->last_seen;
-    }
-  }
-  
-  if(d->n == 0) {
-    if(d->cb) {
-      d->cb(code, &d->chinfo, d->pd);
-    }
-    ngx_free(d);
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_delete_single_channel_id(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  ngx_int_t                owner;
-  ngx_int_t                rc;
-  
-  assert(!nchan_channel_id_is_multi(channel_id));
-  owner = memstore_channel_owner(channel_id);
-  
-  if(cf->redis.enabled) {
-    if(cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
-      return nchan_store_redis.delete_channel(channel_id, cf, callback, privdata);
-    }
-    else {
-      nchan_store_redis.delete_channel(channel_id, cf, NULL, NULL);
-    }
-  }
-  
-  if(owner == memstore_slot()) {
-    return nchan_memstore_force_delete_channel(channel_id, callback, privdata);
-  }
-  else {
-    rc = memstore_ipc_send_delete(owner, channel_id, callback, privdata);
-    if(rc == NGX_DECLINED) {
-      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
-      return NGX_ERROR;
-    }
-    else {
-      return NGX_OK;
-    }
-  }
-}
-
-static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  if(!nchan_channel_id_is_multi(channel_id)) {
-    return nchan_store_delete_single_channel_id(channel_id, cf, callback, privdata);
-  }
-  else {
-    //send the delete to all the individually multiplexed channels
-    ngx_int_t             i, n = 0;
-    ngx_str_t             ids[NCHAN_MULTITAG_MAX];
-    
-    n = parse_multi_id(channel_id, ids);
-    
-
-    
-    delete_multi_data_t   *d = ngx_calloc(sizeof(*d), ngx_cycle->log);
-    assert(d);
-    //everyone might have this multi. broadcast the delete everywhere
-    d->n = n;
-    d->cb = callback;
-    d->pd = privdata;
-
-    for(i=0; i<n; i++) {
-      nchan_store_delete_single_channel_id(&ids[i], cf, (callback_pt )delete_multi_callback_handler, d);
-    }
-    
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t chanhead_delete_message(memstore_channel_head_t *ch, store_message_t *msg);
-
-static ngx_int_t nchan_memstore_force_delete_chanhead(memstore_channel_head_t *ch, callback_pt callback, void *privdata) {
-  
-  nchan_channel_t                chaninfo_copy;
-  store_message_t               *msg = NULL;
-  
-  assert(ch->owner == memstore_slot());
-  if(callback == NULL) {
-    callback = empty_callback;
-  }
-  chaninfo_copy.messages = ch->shared->stored_message_count;
-  chaninfo_copy.subscribers = ch->shared->sub_count;
-  chaninfo_copy.last_seen = ch->shared->last_seen;
-  chaninfo_copy.last_published_msg_id = ch->latest_msgid;
-  
-  nchan_memstore_publish_generic(ch, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
-  callback(NGX_OK, &chaninfo_copy, privdata);
-  //delete all messages
-  while((msg = ch->msg_first) != NULL) {
-    chanhead_delete_message(ch, msg);
-  }
-  chanhead_gc_add(ch, "forced delete");
-  
-  return NGX_OK;
-}
-
-ngx_int_t nchan_memstore_force_delete_channel(ngx_str_t *channel_id, callback_pt callback, void *privdata) {
-  memstore_channel_head_t       *ch;
-
-  assert(memstore_channel_owner(channel_id) == memstore_slot());
-  
-  if(callback == NULL) {
-    callback = empty_callback;
-  }
-  if((ch = nchan_memstore_find_chanhead(channel_id))) {
-    nchan_memstore_force_delete_chanhead(ch, callback, privdata);
-  }
-  else {
-    callback(NGX_OK, NULL, privdata);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_find_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  ngx_int_t                    owner = memstore_channel_owner(channel_id);
-  memstore_channel_head_t     *ch;
-  nchan_channel_t              chaninfo;
-  
-  if(cf->redis.enabled && cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
-    return nchan_store_redis.find_channel(channel_id, cf, callback, privdata);
-  }
-  else if(memstore_slot() == owner) {
-    ch = nchan_memstore_find_chanhead(channel_id);
-    if(ch == NULL) {
-      if(cf->redis.enabled && cf->redis.storage_mode == REDIS_MODE_BACKUP) {
-        DBG("channel %V not found in backup mode. Try Redis...", channel_id);
-        return nchan_store_redis.find_channel(channel_id, cf, callback, privdata);
-      }
-      else {
-        callback(NGX_OK, NULL, privdata);
-      }
-    }
-    else {
-      chaninfo = ch->channel;
-      if(ch->shared) {
-        chaninfo.last_seen = ch->shared->last_seen;
-      }
-      chaninfo.last_published_msg_id = ch->latest_msgid;
-      callback(NGX_OK, &chaninfo, privdata);
-    }
-    
-  }
-  else {
-    if(memstore_ipc_send_get_channel_info(owner, channel_id, cf, callback, privdata) == NGX_DECLINED) {
-      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
-    }
-  }
-  return NGX_OK;
-}
-
-static void init_shdata_procslots(int slot, int n) {
-  shmtx_lock(shm);
-  ngx_int_t          offset = memstore_procslot_offset + n;
-  assert(shdata->procslot[offset] == NCHAN_INVALID_SLOT);
-  DBG("set shdata->procslot[%i] = %i", offset, slot);
-  shdata->procslot[offset] = slot;
-  shmtx_unlock(shm);
-}
-
-//initialization
-static ngx_int_t nchan_store_init_module(ngx_cycle_t *cycle) {
-  ngx_int_t          i;
-  shmtx_lock(shm);
-#if FAKESHARD
-
-  shdata->max_workers = MAX_FAKE_WORKERS;
-  
-  
-  memstore_data_t   *cur;
-  for(i = 0; i < MAX_FAKE_WORKERS; i++) {
-    cur = &mdata[i];
-    cur->fake_slot = i;
-  }
-  
-  memstore_fakeprocess_push(0);
-
-#else
-  ngx_int_t           count = 0;
-  ngx_core_conf_t    *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-  
-  if(shdata->total_active_workers > 0) {
-    shdata->reloading += shdata->max_workers;
-  }
-  
-  shdata->old_max_workers = shdata->max_workers;
-  shdata->max_workers = ccf->worker_processes;
-  if(shdata->old_max_workers == NCHAN_INVALID_SLOT) {
-    shdata->old_max_workers = shdata->max_workers;
-  }
-  
-  //figure out the memstore_procslot_offset
-  for(i = 0; i < NGX_MAX_PROCESSES; i++) {
-    if(shdata->procslot[i] == NCHAN_INVALID_SLOT) {
-      count++;
-    }
-    else {
-      count = 0;
-    }
-    if(count == shdata->max_workers) {
-      break;
-    }
-  }
-  if(count < shdata->max_workers) {
-    ERR("Not enough free procslots?! Don't know what to do... :'(");
-    return NGX_ERROR;
-  }
-  memstore_procslot_offset = i + 1 - shdata->max_workers;
-
-#endif
-  memstore_worker_generation = shdata->generation;
-  shmtx_unlock(shm);
-  DBG("memstore init_module pid %i. ipc: %p, procslot_offset: %i", ngx_pid, ipc, memstore_procslot_offset);
-
-  //initialize our little IPC
-  if(ipc == NULL) {
-    ipc = &ipc_data;
-    ipc_init(ipc);
-    ipc_set_handler(ipc, memstore_ipc_alert_handler);
-  }
-  ipc_open(ipc, cycle, shdata->max_workers, &init_shdata_procslots);
-
-  if(groups == NULL) {
-    groups = &groups_data;
-    memstore_groups_init(groups);
-  }
-  
-  //initialize default shared multi-channel config
-  ngx_memzero(&default_multiconf, sizeof(default_multiconf));
-  default_multiconf.complex_message_timeout = NULL;
-  default_multiconf.message_timeout = 0;
-  default_multiconf.max_messages = -1;
-  default_multiconf.complex_max_messages = NULL;
-  default_multiconf.max_channel_id_length = NCHAN_MAX_CHANNEL_ID_LENGTH;
-  default_multiconf.max_channel_subscribers = -1;
-  
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
-  nchan_main_conf_t     *conf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
-  ngx_str_t              name = ngx_string("memstore");
-  if(conf->shm_size==NGX_CONF_UNSET_SIZE) {
-    conf->shm_size=NCHAN_DEFAULT_SHM_SIZE;
-  }
-  if(conf->redis_fakesub_timer_interval == NGX_CONF_UNSET_MSEC) {
-    conf->redis_fakesub_timer_interval = REDIS_DEFAULT_FAKESUB_TIMER_INTERVAL;
-  }
-  redis_fakesub_timer_interval = conf->redis_fakesub_timer_interval;
-  
-  shm = shm_create(&name, cf, conf->shm_size, initialize_shm, &ngx_nchan_module);
-  nchan_store_memory_shmem = shm;
-  return NGX_OK;
-}
-
-static void nchan_store_create_main_conf(ngx_conf_t *cf, nchan_main_conf_t *mcf) {
-  mcf->shm_size=NGX_CONF_UNSET_SIZE;
-  mcf->redis_fakesub_timer_interval=NGX_CONF_UNSET_MSEC;
-}
-
-static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
-  memstore_channel_head_t            *cur, *tmp;
-  ngx_int_t                           i, my_procslot_index = NCHAN_INVALID_SLOT;
-    
-  DBG("exit worker %i  (slot %i)", ngx_pid, ngx_process_slot);
-  
-#if FAKESHARD
-  for(i = 0; i < MAX_FAKE_WORKERS; i++) {
-  memstore_fakeprocess_push(i);
-#endif
-  HASH_ITER(hh, mpt->hash, cur, tmp) {
-    cur->shutting_down = 1;
-    
-    //serialize_chanhead_msgs_for_reload(cur);
-    
-    chanhead_gc_add(cur, "exit worker");
-  }
-  
-  nchan_exit_notice_about_remaining_things("channel", "", mpt->chanhead_reaper.count);
-  nchan_exit_notice_about_remaining_things("channel", "in churner ", mpt->chanhead_churner.count);
-  nchan_exit_notice_about_remaining_things("unbuffered message", "", mpt->nobuffer_msg_reaper.count);
-  nchan_exit_notice_about_remaining_things("message", "", mpt->msg_reaper.count);
-  
-  nchan_reaper_stop(&mpt->chanhead_churner);
-  nchan_reaper_stop(&mpt->chanhead_reaper);
-  
-  nchan_reaper_stop(&mpt->nobuffer_msg_reaper);
-  nchan_reaper_stop(&mpt->msg_reaper);
-#if FAKESHARD
-  memstore_fakeprocess_pop();
-  }
-#endif
-  
-  memstore_groups_shutdown(groups);
-  
-  shmtx_lock(shm);
-  
-  if(shdata->old_max_workers == NGX_CONF_UNSET) {
-    shdata->old_max_workers = shdata->max_workers;
-  }
-  
-  shdata->reloading--;
-  
-  //don't care if this is 'inefficient', it only happens once per worker per load
-  for(i = memstore_procslot_offset; i < memstore_procslot_offset + shdata->old_max_workers; i++) {
-    if(ngx_process_slot == shdata->procslot[i]) {
-      my_procslot_index = i;
-      break;
-    }
-  }
-  if(my_procslot_index == NCHAN_INVALID_SLOT) {
-    ERR("my procslot not found! I don't know what to do!");
-    assert(0);
-  }
-  ipc_close(ipc, cycle);
-  
-  if(shdata->reloading == 0) {
-    for(i = memstore_procslot_offset; i < memstore_procslot_offset + shdata->old_max_workers; i++) {
-      shdata->procslot[i] = NCHAN_INVALID_SLOT;
-    }
-  }
-
-  shdata->total_active_workers--;
-  
-  shmtx_unlock(shm);
-  
-#if NCHAN_MSG_LEAK_DEBUG
-  msg_debug_assert_isempty();
-#endif
-  
-  shm_destroy(shm); //just for this worker...
-  
-#if FAKESHARD
-  while(memstore_fakeprocess_pop()) {  };
-#endif
-}
-
-static void nchan_store_exit_master(ngx_cycle_t *cycle) {
-  ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-  
-  DBG("exit master from pid %i", ngx_pid);
-  
-  ipc_close(ipc, cycle);
-#if FAKESHARD
-  while(memstore_fakeprocess_pop()) {  };
- #endif
-  if (ccf->master != 0) {
-    shm_free(shm, shdata);
-    shm_destroy(shm);
-  }
-}
-
-static ngx_int_t validate_chanhead_messages(memstore_channel_head_t *ch) {
-  /*
-  ngx_int_t              count = ch->channel.messages;
-  ngx_int_t              rev_count = count;
-  ngx_int_t              owner = memstore_channel_owner(&ch->id);
-  store_message_t        *cur;
-  
-  if(memstore_slot() == owner) {
-    assert(ch->shared->stored_message_count == ch->channel.messages);
-  }
-  //walk it forwards
-  for(cur = ch->msg_first; cur != NULL; cur=cur->next){
-    count--;
-  }
-  for(cur = ch->msg_last; cur != NULL; cur=cur->prev){
-    rev_count--;
-  }
-  
-  assert(count == 0);
-  assert(rev_count == 0);
-  */
-  return NGX_OK;
-}
-
-static void memstore_reap_message( nchan_msg_t *msg ) {
-  ngx_buf_t         *buf = &msg->buf;
-  ngx_file_t        *f = buf->file;
-  
-  assert(!msg_refcount_valid(msg));
-  
-  if(f != NULL) {
-    if(f->fd != NGX_INVALID_FILE) {
-      DBG("close fd %u ", f->fd);
-      ngx_close_file(f->fd);
-    }
-    else {
-      DBG("reap msg fd invalid");
-    }
-    ngx_delete_file(f->name.data); // assumes string is zero-terminated, which required trickery during allocation
-  }
-  
-  if(msg->compressed && msg->compressed->buf.file) {
-    f = msg->compressed->buf.file;
-    if(f->fd != NGX_INVALID_FILE) {
-      ngx_close_file(f->fd);
-    }
-    ngx_delete_file(f->name.data); // assumes string is zero-terminated, which required trickery during allocation
-  }
-  //DBG("free smsg %p",s msg);
-#if NCHAN_MSG_LEAK_DEBUG  
-  msg_debug_remove(msg);
-#endif
-  
-  //ERR("reap msg %p", msg);
-  nchan_free_msg_id(&msg->id);
-  nchan_free_msg_id(&msg->prev_id);
-  ngx_memset(msg, 0xFA, sizeof(*msg)); //debug stuff
-  shm_free(shm, msg);
-  nchan_update_stub_status(messages, -1);
-}
-
-static void memstore_reap_store_message( store_message_t *smsg ) {
-  
-  memstore_reap_message(smsg->msg);
-  
-  ngx_memset(smsg, 0xBC, sizeof(*smsg)); //debug stuff
-  ngx_free(smsg);
-}
-
-
-
-static ngx_int_t chanhead_delete_message(memstore_channel_head_t *ch, store_message_t *msg) {
-  //validate_chanhead_messages(ch);
-  
-  //DBG("withdraw message %V from ch %p %V", msgid_to_str(&msg->msg->id), ch, &ch->id);
-  if(ch->msg_first == msg) {
-    //DBG("first message removed");
-    ch->msg_first = msg->next;
-  }
-  if(ch->msg_last == msg) {
-    //DBG("last message removed");
-    ch->msg_last = msg->prev;
-  }
-  if(msg->next != NULL) {
-    //DBG("set next");
-    msg->next->prev = msg->prev;
-  }
-  if(msg->prev != NULL) {
-    //DBG("set prev");
-    assert(0);
-    msg->prev->next = msg->next;
-  }
-  
-  ch->channel.messages--;
-  
-  ngx_atomic_fetch_add(&ch->shared->stored_message_count, -1);
-  
-  if(ch->groupnode) {
-    memstore_group_remove_message(ch->groupnode, msg->msg);
-  }
-  
-  if(ch->channel.messages == 0) {
-    assert(ch->msg_first == NULL);
-    assert(ch->msg_last == NULL);
-  }
-  
-  nchan_reaper_add(&mpt->msg_reaper, msg);
-  return NGX_OK;
-}
-
-static ngx_int_t chanhead_messages_gc_custom(memstore_channel_head_t *ch, ngx_int_t max_messages) {
-  validate_chanhead_messages(ch);
-  store_message_t   *cur = ch->msg_first;
-  store_message_t   *next = NULL;
-  time_t             now = ngx_time();
-  ngx_int_t          started_count, tried_count, deleted_count;
-  DBG("chanhead_gc max %i count %i", max_messages, ch->channel.messages);
-  
-  started_count = ch->channel.messages;
-  tried_count = 0;
-  deleted_count = 0;
-  
-  //is the message queue too big?
-  while(cur != NULL && max_messages >= 0 && ch->channel.messages > max_messages) {
-    tried_count++;
-    next = cur->next;
-    chanhead_delete_message(ch, cur);
-    deleted_count++;        
-    cur = next;
-  }
-  
-  //any expired messages?
-  while(cur != NULL && now > cur->msg->expires) {
-    tried_count++;
-    next = cur->next;
-    chanhead_delete_message(ch, cur);
-    cur = next;
-  }
-  DBG("message GC results: started with %i, walked %i, deleted %i msgs", started_count, tried_count, deleted_count);
-  validate_chanhead_messages(ch);
-  return NGX_OK;
-}
-
-ngx_int_t memstore_chanhead_messages_gc(memstore_channel_head_t *ch) {
-  //DBG("messages gc for ch %p %V", ch, &ch->id);
-  return chanhead_messages_gc_custom(ch, ch->max_messages);
-}
-
-static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch) {
-  chanhead_messages_gc_custom(ch, 0);
-  return NGX_OK;
-}
-
-store_message_t *chanhead_find_next_message(memstore_channel_head_t *ch, nchan_msg_id_t *msgid, nchan_msg_status_t *status) {
-  store_message_t      *cur, *first;
-  
-  time_t           mid_time; //optimization yeah
-  int16_t          mid_tag; //optimization yeah
-  
-  assert(ch->msg_buffer_complete); //we only deal with complete buffers here
-  
-  //DBG("find next message %V", msgid_to_str(msgid));
-  if(ch == NULL) {
-    *status = MSG_NOTFOUND;
-    return NULL;
-  }
-  memstore_chanhead_messages_gc(ch);
-  
-  first = ch->msg_first;
-  cur = ch->msg_last;
-  
-  if(cur == NULL) {
-    if(msgid->time == NCHAN_OLDEST_MSGID_TIME || ch->max_messages == 0) {
-      *status = MSG_EXPECTED;
-    }
-    else {
-      *status = MSG_NOTFOUND;
-    }
-    return NULL;
-  }
-  else if(msgid->time == NCHAN_NEWEST_MSGID_TIME) {
-    ERR("wanted 'NCHAN_NEWEST_MSGID_TIME', which is weird...");
-    *status = MSG_EXPECTED; //future message
-    return NULL;
-  }
-  
-  mid_time = msgid->time;
-  mid_tag = msgid->tag.fixed[0];
-  
-  if(mid_time == NCHAN_NTH_MSGID_TIME) {
-    int               direction = mid_tag > 0 ? 1 : -1;
-    int               nth_msg = mid_tag * direction;
-    int               n = nth_msg;
-    store_message_t  *prev = NULL;
-    
-    assert(mid_tag != 0);
-    
-    for(cur = (direction>0 ? ch->msg_first : ch->msg_last); cur != NULL && n > 1; cur = (direction>0 ? cur->next : cur->prev)) {
-      prev = cur;
-      n--;
-    }
-    cur = cur ? cur : prev;
-    if(cur) {
-      *status = MSG_FOUND;
-      return cur;
-    }
-    else {
-      *status = MSG_EXPECTED;
-      return NULL;
-    }
-  }
-  else {
-    assert(msgid->tagcount == 1 && first->msg->id.tagcount == 1);
-    if(msgid == NULL || (mid_time < first->msg->id.time || (mid_time == first->msg->id.time && mid_tag < first->msg->id.tag.fixed[0])) ) {
-      //DBG("found message %V", msgid_to_str(&first->msg->id));
-      *status = MSG_FOUND;
-      return first;
-    }
-    
-    while(cur != NULL) {
-      //assert(cur->msg->id.tagcount == 1);
-      //DBG("cur: (chid: %V)  %V %V", &ch->id, msgid_to_str(&cur->msg->id), chanhead_msg_to_str(cur));
-      
-      if(mid_time > cur->msg->id.time || (mid_time == cur->msg->id.time && mid_tag >= cur->msg->id.tag.fixed[0])){
-        if(cur->next != NULL) {
-          *status = MSG_FOUND;
-          //DBG("found message %V", msgid_to_str(&cur->next->msg->id));
-          return cur->next;
-        }
-        else {
-          *status = MSG_EXPECTED;
-          return NULL;
-        }
-      }
-      cur=cur->prev;
-    }
-    //DBG("looked everywhere, not found");
-    *status = MSG_NOTFOUND;
-    return NULL;
-  }
-}
-
-typedef struct {
-  subscriber_t                *sub;
-  ngx_int_t                    channel_owner;
-  memstore_channel_head_t     *chanhead;
-  ngx_str_t                   *channel_id;
-  nchan_msg_id_t               msg_id;
-  callback_pt                  cb;
-  void                        *cb_privdata;
-  unsigned                     channel_exists:1;
-  unsigned                     group_channel_limit_pass:1;
-  unsigned                     reserved:1;
-  unsigned                     subbed:1;
-  unsigned                     allocd:1;
-} subscribe_data_t;
-
-//static subscribe_data_t        static_subscribe_data;
-
-static subscribe_data_t *subscribe_data_alloc(ngx_int_t owner) {
-  subscribe_data_t            *d;
-  //fuck it, just always allocate. we need to handle multis and shit too
-  d = ngx_alloc(sizeof(*d), ngx_cycle->log);
-  assert(d);
-  d->allocd = 1;
-  /*if(memstore_slot() != owner) {
-    d = ngx_alloc(sizeof(*d), ngx_cycle->log);
-    d->allocd = 1;
-  }
-  else {
-    d = &static_subscribe_data;
-    d->allocd = 0;
-  }*/
-  return d;
-}
-
-static void subscribe_data_free(subscribe_data_t *d) {
-  if(d->allocd) {
-    ngx_free(d);
-  }
-}
-
-#define SUB_CHANNEL_UNAUTHORIZED 0
-#define SUB_CHANNEL_AUTHORIZED 1
-#define SUB_CHANNEL_NOTSURE 2
-
-static ngx_int_t nchan_store_subscribe_channel_existence_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d);
-static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d);
-
-static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub) {
-  ngx_int_t                    owner = memstore_channel_owner(channel_id);
-  subscribe_data_t            *d = subscribe_data_alloc(sub->cf->redis.enabled ? -1 : owner);
-  
-  assert(d != NULL);
-  
-  d->channel_owner = owner;
-  d->channel_id = channel_id;
-  d->sub = sub;
-  d->subbed = 0;
-  d->reserved = 0;
-  d->channel_exists = 0;
-  d->group_channel_limit_pass = 0;
-  d->msg_id = sub->last_msgid;
-  
-  if(sub->cf->subscribe_only_existing_channel || sub->cf->max_channel_subscribers > 0) {
-    sub->fn->reserve(sub);
-    d->reserved = 1;
-    if(memstore_slot() != owner) {
-      ngx_int_t rc;
-      rc = memstore_ipc_send_channel_existence_check(owner, channel_id, sub->cf, (callback_pt )nchan_store_subscribe_channel_existence_check_callback, d);
-      if(rc == NGX_DECLINED) { // out of memory
-        nchan_store_subscribe_channel_existence_check_callback(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
-        return NGX_ERROR;
-      }
-    }
-    else {
-      return nchan_store_subscribe_continued(SUB_CHANNEL_NOTSURE, NULL, d);
-    }
-  }
-  else {
-    return nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_subscribe_channel_existence_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
-  if(d->sub->fn->release(d->sub, 0) == NGX_OK) {
-    d->reserved = 0;
-    return nchan_store_subscribe_continued(channel_status, _, d);
-  }
-  else {//don't go any further, the sub has been deleted
-    subscribe_data_free(d);
-    return NGX_OK;
-  }
-}
-
-static ngx_int_t redis_subscribe_channel_existence_callback(ngx_int_t status, void *ch, void *d) {
-  nchan_channel_t    *channel = (nchan_channel_t *)ch;
-  subscribe_data_t   *data = (subscribe_data_t *)d;
-  nchan_loc_conf_t   *cf = data->sub->cf;
-  ngx_int_t           channel_status;
-  
-  data->channel_exists = channel != NULL;
-  
-  if(status == NGX_OK) {
-    if(channel == NULL) {
-      channel_status = cf->subscribe_only_existing_channel ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
-    }
-    /*
-    else if (cf->max_channel_subscribers > 0) {
-      // don't check this anymore -- a total subscribers count check is less
-      // useful as a per-instance check, which is handled in nchan_store_subscribe_continued
-      // shared total subscriber count check can be re-enabled with another config setting
-      channel_status = channel->subscribers >= cf->max_channel_subscribers ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
-    }
-    */
-    else {
-      channel_status = SUB_CHANNEL_AUTHORIZED;
-
-    }
-    nchan_store_subscribe_continued(channel_status, NULL, data);
-  }
-  else {
-    //error!!
-    subscribe_data_free(data);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t group_subscribe_accounting_check(ngx_int_t rc, nchan_group_t *shm_group, subscribe_data_t *d) {
-  
-  memstore_channel_head_t  *ch = ensure_chanhead_ready_or_trash_chanhead(d->chanhead, 0);
-  
-  if(ch && d->sub->status != DEAD) {
-    if(shm_group) {
-      if(!shm_group->limit.subscribers || shm_group->subscribers < shm_group->limit.subscribers) { 
-        //not an atomic comparison but we don't really care
-        d->chanhead->spooler.fn->add(&d->chanhead->spooler, d->sub);
-      }
-      else {
-        d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
-      }
-    }
-    else {
-      ERR("coldn't find group for group_subscribe_accounting_check");
-      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
-    }
-  }
-  
-  if(d->reserved) {
-    d->sub->fn->release(d->sub, 0);
-  }
-  memstore_chanhead_release(d->chanhead, "group accounting check");
-  
-  subscribe_data_free(d);
-  return NGX_OK;
-}
-
-
-static ngx_int_t group_subscribe_channel_limit_reached(ngx_int_t rc, nchan_channel_t *chaninfo, subscribe_data_t *d) {
-  //no new hannels!
-  if(d->sub->status != DEAD) {
-    if(chaninfo) {
-      //ok, channel already exists.
-      nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
-    }
-    else {
-      //nope. no channel, no subscribing.
-      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
-      if(d->reserved)  d->sub->fn->release(d->sub, 0);
-      subscribe_data_free(d);
-    }
-  }
-  else {
-    if(d->reserved)  d->sub->fn->release(d->sub, 0);
-    subscribe_data_free(d);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t group_subscribe_channel_limit_check(ngx_int_t _, nchan_group_t *shm_group, subscribe_data_t *d) {
-  ngx_int_t    rc = NGX_OK;
-  DBG("group subscribe limit check");
-  if(d->sub->status != DEAD) {
-    if(shm_group) {
-      if(!shm_group->limit.channels || (shm_group->channels < shm_group->limit.channels)) {
-        d->group_channel_limit_pass = 1;
-        rc = nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
-      }
-      else if (shm_group->limit.channels && shm_group->channels == shm_group->limit.channels){
-        //no new channels!
-        rc = nchan_store_find_channel(d->channel_id, d->sub->cf, (callback_pt )group_subscribe_channel_limit_reached, d);
-      }
-      else {
-        rc = nchan_store_subscribe_continued(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
-      }
-      
-    }
-    else {
-      //well that's unusual...
-      ERR("coldn't find group for group_subscribe_channel_limit_check");
-      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
-      if(d->reserved)  d->sub->fn->release(d->sub, 0);
-      subscribe_data_free(d);
-      rc = NGX_ERROR;
-    }
-  }
-  else {
-    if(d->reserved)  d->sub->fn->release(d->sub, 0);
-    subscribe_data_free(d);
-  }
-  return rc;
-}
-
-static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
-  memstore_channel_head_t       *chanhead = NULL;
-  int                            retry_null_chanhead = 1;
-  //store_message_t             *chmsg;
-  //nchan_msg_status_t           findmsg_status;
-  ngx_int_t                      check_redis = d->sub->cf->redis.enabled; // for BACKUP and DISTRIBUTED mode
-  nchan_loc_conf_t              *cf = d->sub->cf;
-  ngx_int_t                      rc = NGX_OK;
-  nchan_request_ctx_t           *ctx = NULL;
-  
-  if(d->sub->status == DEAD) {
-    if(d->reserved) {
-      d->sub->fn->release(d->sub, 0);
-      d->reserved = 0;
-    }
-    subscribe_data_free(d);
-    return rc;
-  }
-  
-  if(d->sub->request) {
-    ctx = ngx_http_get_module_ctx(d->sub->request, ngx_nchan_module);
-  }
-  
-  switch(channel_status) {
-    case SUB_CHANNEL_AUTHORIZED:
-      if(cf->group.enable_accounting) {
-        //now we dance the careful dance of making sure the group channel limit is not exceeded
-        //it isn't a pretty dance.
-        if(d->group_channel_limit_pass || d->channel_exists) {
-          //already checked, or no need to check
-          chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
-          retry_null_chanhead = 0;
-          if(!chanhead) rc = NGX_ERROR;
-        }
-        else if((chanhead = nchan_memstore_find_chanhead(d->channel_id)) != NULL) {
-          //well, the channel exists already, so using it won't exceed the limit
-          d->group_channel_limit_pass = 1;
-        }
-        else {
-          //can't find the channel. gotta check if it really does exist
-          DBG("can't find the channel. gotta check if it really does exist");
-          if(ctx) {
-            if(!d->reserved) {
-              d->sub->fn->reserve(d->sub);
-              d->reserved = 1;
-            }
-            return memstore_group_find(groups, nchan_get_group_name(d->sub->request, cf, ctx), (callback_pt )group_subscribe_channel_limit_check, d);
-          }
-          else {
-            retry_null_chanhead = 0;
-            rc = NGX_ERROR;
-            chanhead = NULL;
-          }
-        }
-      }
-      else {
-        chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
-        if(!chanhead) rc = NGX_ERROR;
-        retry_null_chanhead = 0;
-      }
-      break;
-    
-    case SUB_CHANNEL_UNAUTHORIZED:
-      chanhead = NULL;
-      break;
-    
-    case SUB_CHANNEL_NOTSURE:
-      if(check_redis) {
-        if(cf->subscribe_only_existing_channel) {
-          //we used to also check if cf->max_channel_subscribers == 0 here, but that's
-          //no longer necessary, as the shared subscriber total check is now disabled
-          if((chanhead = nchan_memstore_find_chanhead(d->channel_id)) != NULL) {
-            break;
-          }
-        }
-        nchan_store_redis.find_channel(d->channel_id, cf, redis_subscribe_channel_existence_callback, d);
-        return rc;
-      }
-      else {
-        chanhead = nchan_memstore_find_chanhead(d->channel_id);
-      }
-      break;
-  }
-  
-
-  if ((channel_status == SUB_CHANNEL_UNAUTHORIZED) || 
-      (!chanhead && cf->subscribe_only_existing_channel) ||
-      (chanhead && cf->max_channel_subscribers > 0 && chanhead->shared && chanhead->shared->sub_count >= (ngx_uint_t )cf->max_channel_subscribers)) {
-    
-    d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
-    
-    if(d->reserved) {
-      d->sub->fn->release(d->sub, 0);
-      d->reserved = 0;
-    }
-    
-    //sub should be destroyed by now.
-    
-    d->sub = NULL; //debug
-    //d->cb(NGX_HTTP_NOT_FOUND, NULL, d->cb_privdata);
-    subscribe_data_free(d);
-    return rc;
-  }
-  else if(!chanhead && retry_null_chanhead) {
-    chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
-  }
-  
-  if(!chanhead) { //nchan_memstore_get_chanhead could fail when out of shared memory
-      rc = NGX_ERROR;
-  }
-  
-  d->chanhead = chanhead;
-  
-  if(d->reserved) {
-    d->sub->fn->release(d->sub, 1);
-    d->reserved = 0;
-  }
-  if(chanhead) {
-    
-    //check message id appropriateness
-    if(!nchan_msgid_tagcount_match(&d->sub->last_msgid, chanhead->multi ? chanhead->multi_count : 1)) {
-      d->sub->fn->reserve(d->sub);
-      d->sub->fn->respond_status(d->sub, NGX_HTTP_BAD_REQUEST, NULL, NULL);
-      d->sub->fn->release(d->sub, 0);
-    }
-    else if(cf->group.enable_accounting || chanhead->groupnode) {
-      //per-group max subscriber check
-      DBG("per-group max subscriber check");
-      assert(d->allocd);
-      d->sub->fn->reserve(d->sub);
-      d->reserved = 1;
-      memstore_chanhead_reserve(chanhead, "group accounting check");
-      if(chanhead->groupnode) {
-        DBG("memstore_group_find_from_groupnode(groups, chanhead->groupnode, (callback_pt )group_subscribe_accounting_check, d) sub: %p", d->sub);
-        memstore_group_find_from_groupnode(groups, chanhead->groupnode, (callback_pt )group_subscribe_accounting_check, d);
-      }
-      else {
-        if(ctx) {
-          // this means group accounting was disabled when the channel was created.
-          // that's okay though, we should check it anyway.
-          DBG("memstore_group_find(groups, nchan_get_group_name(d->sub->request, cf, ctx), (callback_pt )group_subscribe_accounting_check, d); sub: %p", d->sub);
-          memstore_group_find(groups, nchan_get_group_name(d->sub->request, cf, ctx), (callback_pt )group_subscribe_accounting_check, d);
-        }
-        else {
-          d->sub->fn->respond_status(d->sub, NGX_HTTP_BAD_REQUEST, NULL, NULL);
-          subscribe_data_free(d);
-          return NGX_ERROR;
-        }
-      }
-      return rc;
-    }
-    else {
-      chanhead->spooler.fn->add(&chanhead->spooler, d->sub);
-    }
-  }
-  else {
-    //out-of-memory condition
-    d->sub->fn->respond_status(d->sub, NGX_HTTP_INSUFFICIENT_STORAGE, NULL, NULL);
-  }
-
-  subscribe_data_free(d);
-
-  return rc;
-}
-
-static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
-
-typedef struct get_multi_message_data_s get_multi_message_data_t;
-struct get_multi_message_data_s {
-  memstore_channel_head_t     *chanhead;
-  nchan_msg_status_t           msg_status;
-  nchan_msg_t                 *msg;
-  ngx_int_t                    n;
-  
-  nchan_msg_id_t               wanted_msgid;
-  ngx_int_t                    getting;
-  ngx_int_t                    multi_count;
-  
-  ngx_event_t                  timer; 
-  
-  time_t                       expired;
-  
-  callback_pt                  cb;
-  void                        *privdata;
-};
-
-typedef struct {
-  ngx_int_t                   n;
-  get_multi_message_data_t   *d;
-} get_multi_message_data_single_t;
-
-typedef struct {
-  get_multi_message_data_t         d;
-  get_multi_message_data_single_t  sd;
-} get_multi_message_data_blob_t;
-
-static ngx_inline void set_multimsg_msg(get_multi_message_data_t *d, get_multi_message_data_single_t *sd, nchan_msg_t *msg, nchan_msg_status_t status) {
-  d->msg_status = status;
-  if(d->msg) msg_release(d->msg, "get multi msg");
-  d->msg = msg;
-  if(msg) assert(msg_reserve(msg, "get multi msg") == NGX_OK);
-  d->n = sd->n;
-  d->msg_status = status;
-}
-
-static ngx_int_t nchan_store_async_get_multi_message_callback(ngx_int_t code, void *d, void *pd);
-
-static ngx_int_t nchan_store_async_get_multi_message_callback_cleanup(get_multi_message_data_t *d) {
-  if(d->getting == 0) {
-    nchan_free_msg_id(&d->wanted_msgid);
-    if(d->timer.timer_set) {
-      ngx_del_timer(&d->timer);
-    }
-    ngx_free(d);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_async_get_multi_message_callback(ngx_int_t code, void *ptr, void *pd) {
-  nchan_msg_status_t          status = code;
-  nchan_msg_t                *msg = ptr;
-  get_multi_message_data_single_t *sd = pd;
-  
-  static int16_t              multi_largetag[NCHAN_MULTITAG_MAX], multi_prevlargetag[NCHAN_MULTITAG_MAX];
-  //ngx_str_t                   empty_id_str = ngx_string("-");
-  get_multi_message_data_t   *d = sd->d;
-  nchan_msg_t                 retmsg;
-  
-  /*
-  switch(status) {
-    case MSG_FOUND:
-      ERR("multi[%i] of %i msg FOUND (getting: %i) %V %p", sd->n, d->multi_count, d->getting, msgid_to_str(&msg->id), msg);
-      break;
-    default: 
-      ERR("multi[%i] of %i msg %s (getting: %i)", sd->n, d->multi_count, nchan_msgstatus_to_str(status), d->getting);
-  }
-  */
-  if(d->expired) {
-    ERR("multimsg callback #%i for %p received after expiring at %ui status %i msg %p", d->n, d, d->expired, status, msg);
-    d->getting--;
-    return nchan_store_async_get_multi_message_callback_cleanup(d);
-  }
-  d->getting--;
-  
-  if(d->msg_status == MSG_PENDING) {
-    set_multimsg_msg(d, sd, msg, status);
-  }
-  else if(msg) {
-    if(d->msg == NULL) {
-      //DBG("first response: %V (n:%i) %p", d->msg ? msgid_to_str(&d->msg->id) : &empty_id_str, d->n, d->msg);
-      set_multimsg_msg(d, sd, msg, status); 
-    }
-    else {
-      //DBG("prev best response: %V (n:%i) %p", d->msg ? msgid_to_str(&d->msg->id) : &empty_id_str, d->n, d->msg);
-      
-      assert(d->wanted_msgid.time <= msg->id.time);
-      
-      if(msg->id.time < d->msg->id.time) {
-        set_multimsg_msg(d, sd, msg, status);
-      }
-      else if((msg->id.time == d->msg->id.time && msg->id.tag.fixed[0] <  d->msg->id.tag.fixed[0]) 
-           || (msg->id.time == d->msg->id.time && msg->id.tag.fixed[0] == d->msg->id.tag.fixed[0] && sd->n < d->n) ) {
-        
-        //DBG("got a better response %V (n:%i), replace.", msgid_to_str(&msg->id), sd->n);
-        set_multimsg_msg(d, sd, msg, status);    
-      }
-      //else {
-      //  DBG("got a worse response %V (n:%i), keep prev.", msgid_to_str(&msg->id), sd->n);
-      //}
-    }
-  }
-  else if(d->msg == NULL && d->msg_status != MSG_EXPECTED) {
-    d->msg_status = status;
-  }
-  
-  if(d->getting == 0) {
-    //got all the messages we wanted
-    memstore_chanhead_release(d->chanhead, "multimsg");
-    if(d->msg) {
-      int16_t      *muhtags;
-      ngx_int_t     n = d->n;
-      
-      assert(d->msg->id.tagcount == 1);
-      
-      nchan_msg_derive_stack(d->msg, &retmsg, NULL);
-      
-      nchan_copy_msg_id(&retmsg.prev_id, &d->wanted_msgid, multi_prevlargetag);
-      
-      //TODO: some kind of missed-message check maybe?
-      
-      if (d->wanted_msgid.time != d->msg->id.time) {
-        nchan_copy_msg_id(&retmsg.id, &d->msg->id, NULL);
-        
-        if(d->multi_count > NCHAN_FIXED_MULTITAG_MAX) {
-          retmsg.id.tag.allocd = multi_largetag;
-          retmsg.id.tag.allocd[0] = d->msg->id.tag.fixed[0];
-        }
-        retmsg.id.tagcount = d->multi_count;
-        nchan_expand_msg_id_multi_tag(&retmsg.id, 0, n, -1);
-      }
-      else {
-        nchan_copy_msg_id(&retmsg.id, &d->wanted_msgid, multi_largetag); 
-      }
-      
-      muhtags = (d->multi_count > NCHAN_FIXED_MULTITAG_MAX) ? retmsg.id.tag.allocd : retmsg.id.tag.fixed;
-      muhtags[n] = d->msg->id.tag.fixed[0];
-      
-      retmsg.id.tagactive = n;
-      
-      //DBG("respond msg id transformed into %p %V", &retmsg.copy, msgid_to_str(&retmsg.copy.id));
-      
-      d->cb(d->msg_status, &retmsg, d->privdata);
-      
-      msg_release(d->msg, "get multi msg");
-    }
-    else {
-      d->cb(d->msg_status, NULL, d->privdata);
-    }
-  }
-
-  return nchan_store_async_get_multi_message_callback_cleanup(d);
-}
-
-static void get_multimsg_timeout(ngx_event_t *ev) {
-  get_multi_message_data_t    *d = (get_multi_message_data_t *)ev->data;
-  WARN("multimsg %p timeout!!", d);
-  d->expired = ngx_time();
-  
-  memstore_chanhead_release(d->chanhead, "multimsg");
-  //don't free it, a multimsg callback might arrive late. ngx_free(d);
-}
-
-static ngx_int_t nchan_store_async_get_multi_message(ngx_str_t *chid, nchan_msg_id_t *msg_id, callback_pt callback, void *privdata) {
-  
-  memstore_channel_head_t     *chead;
-  memstore_multi_t            *multi = NULL;
-  
-  ngx_int_t                    n;
-  uint8_t                      want[NCHAN_MULTITAG_MAX];
-  ngx_str_t                    ids[NCHAN_MULTITAG_MAX];
-  nchan_msg_id_t               req_msgid[NCHAN_MULTITAG_MAX];
-  
-  nchan_msg_id_t              *lastid;
-  ngx_str_t                   *getmsg_chid;
-  ngx_int_t                    getting = 0;
-  
-  ngx_int_t                    i;
-  
-  ngx_memzero(req_msgid, sizeof(req_msgid));
-  
-  if((chead = nchan_memstore_get_chanhead(chid, &default_multiconf)) == NULL) {
-    //probably out of memory
-    callback(MSG_EXPECTED, NULL, privdata); // this is a lie.
-    return NGX_ERROR;
-  }
-  
-  n = chead->multi_count;
-  
-  multi = chead->multi;
-  
-  //init loop
-  for(i = 0; i < n; i++) {
-    want[i] = 0;
-  }
-  
-  //DBG("get multi msg %V (count: %i)", msgid_to_str(msg_id), n);
-  if(msg_id->time == 0) {
-    for(i = 0; i < n; i++) {
-      assert(nchan_extract_from_multi_msgid(msg_id, i, &req_msgid[i]) == NGX_OK);
-      want[i] = 1;
-    }
-    getting = n;
-    //DBG("want all msgs");
-  }
-  else {
-    //what msgids do we want?
-    for(i = 0; i < n; i++) {
-      assert(nchan_extract_from_multi_msgid(msg_id, i, &req_msgid[i]) == NGX_OK);
-      //DBG("might want msgid %V from chan_index %i", msgid_to_str(&req_msgid[i]), i);
-    }
-    
-    //what do we need to fetch?
-    for(i = 0; i < n; i++) {
-      lastid = &multi[i].sub->last_msgid;
-      //DBG("chan index %i last id %V", i, msgid_to_str(lastid));
-      if(lastid->time == 0 
-        || lastid->time == -1
-        || lastid->time > req_msgid[i].time
-        || (lastid->time == req_msgid[i].time && lastid->tag.fixed[0] >= req_msgid[i].tag.fixed[0])) {
-        want[i]=1;
-        getting++;
-        DBG("want %i", i);
-      }
-      else {
-        DBG("Do not want %i", i);
-      }
-    }
-  }
-  
-  if(getting == 0) { //don't need to explicitly fetch messages, we know all the responses will be MSG_EXPECTED
-    DBG("don't need to explicitly fetch messages for %V (msgid %V), we know all the responses will be MSG_EXPECTED", chid, msgid_to_str(msg_id));
-    callback(MSG_EXPECTED, NULL, privdata);
-    return NGX_OK;
-  }
-  
-  memstore_chanhead_reserve(chead, "multimsg");
-  
-  get_multi_message_data_t         *d;
-  get_multi_message_data_single_t  *sd;
-  get_multi_message_data_blob_t    *dblob = ngx_alloc(sizeof(*dblob) + sizeof(*sd)*(getting - 1), ngx_cycle->log);
-  assert(dblob);
-  d = &dblob->d;
-  sd = &dblob->sd;
-  
-  d->cb = callback;
-  d->privdata = privdata;
-  d->multi_count = n;
-  d->msg_status = getting == n ? MSG_PENDING : MSG_EXPECTED;
-  d->msg = NULL;
-  d->n = -1;
-  d->getting = getting;
-  d->chanhead = chead;
-  d->expired = 0;
-  
-  ngx_memzero(&d->timer, sizeof(d->timer));
-  nchan_init_timer(&d->timer, get_multimsg_timeout, d);
-  ngx_add_timer(&d->timer, 20000);
-  
-  nchan_copy_new_msg_id(&d->wanted_msgid, msg_id);
-  
-  //do it.
-  for(i = 0; i < n; i++) {
-    if(want[i]) {
-      ngx_memzero(sd, sizeof(*sd));
-      sd->d = d;
-      sd->n = i;
-      
-      getmsg_chid = (multi == NULL) ? &ids[i] : &multi[i].id;
-      //DBG("get message from %V (n: %i) %V", getmsg_chid, i, msgid_to_str(&req_msgid[i]));
-      nchan_store_async_get_message(getmsg_chid, &req_msgid[i], chead->cf, nchan_store_async_get_multi_message_callback, sd);
-      sd++;
-    }
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t getmsg_proxy_completebuffer_callback(ngx_int_t code, nchan_msg_t *msg, void *data) {
-  return nchan_memstore_handle_get_message_reply(msg, code, data);
-}
-
-static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  store_message_t             *chmsg;
-  ngx_int_t                    owner = memstore_channel_owner(channel_id);
-  subscribe_data_t            *d; 
-  nchan_msg_status_t           findmsg_status;
-  memstore_channel_head_t     *chead;
-  
-  if(callback==NULL) {
-    ERR("no callback given for async get_message. someone's using the API wrong!");
-    return NGX_ERROR;
-  }
-  
-  if(nchan_channel_id_is_multi(channel_id)) {
-    return nchan_store_async_get_multi_message(channel_id, msg_id, callback, privdata);
-  }
-  
-  chead = nchan_memstore_find_chanhead(channel_id);
-  
-  d = subscribe_data_alloc(owner);
-  d->channel_owner = owner;
-  d->channel_id = channel_id;
-  d->cb = callback;
-  d->cb_privdata = privdata;
-  d->sub = NULL;
-  d->msg_id = *msg_id;
-  d->chanhead = chead;
-  
-  if(memstore_slot() != owner) {
-    //check if we need to ask for a message
-    if(memstore_ipc_send_get_message(d->channel_owner, d->channel_id, &d->msg_id, d) == NGX_DECLINED) {
-      subscribe_data_free(d);
-      callback(MSG_ERROR, NULL, privdata);
-      return NGX_ERROR;
-    }
-  }
-  else if(!chead->msg_buffer_complete) {
-    assert(d->allocd == 1); //let's assume subscribe_data_alloc always allocates
-    subscriber_t *getmsg_sub = getmsg_proxy_subscriber_create(msg_id, (callback_pt )getmsg_proxy_completebuffer_callback, d);
-    if(getmsg_sub == NULL) {
-      ERR("Unable to create getmsg proxy sub for async get_message");
-      subscribe_data_free(d);
-      callback(MSG_ERROR, NULL, privdata);
-      return NGX_ERROR;
-    }
-    if(chead->spooler.fn->add(&chead->spooler, getmsg_sub) != NGX_OK) {
-      ERR("Unable to subscribe getmsg sub for async get_message");
-      subscribe_data_free(d);
-      callback(MSG_ERROR, NULL, privdata);
-      return NGX_ERROR;
-    }
-    return NGX_OK;
-  }
-  else {
-    chmsg = chanhead_find_next_message(d->chanhead, &d->msg_id, &findmsg_status);
-    return nchan_memstore_handle_get_message_reply(chmsg == NULL ? NULL : chmsg->msg, findmsg_status, d);
-  }
-  
-  return NGX_OK; //async only now!
-}
-
-ngx_int_t nchan_memstore_handle_get_message_reply(nchan_msg_t *msg, nchan_msg_status_t findmsg_status, void *data) {
-  subscribe_data_t           *d = (subscribe_data_t *)data;
-  //memstore_channel_head_t    *chanhead = d->chanhead;
-  d->cb(findmsg_status, msg, d->cb_privdata);
-  
-  subscribe_data_free(d);
-  return NGX_OK;
-}
-
-static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_message_t *msg) {
-  msg->next = NULL;
-  msg->prev = ch->msg_last;
-  
-  assert(msg->msg->id.tagcount == 1);
-  
-  if(msg->prev != NULL) {
-    msg->prev->next = msg;
-    msg->msg->prev_id = msg->prev->msg->id;
-  }
-  else {
-    msg->msg->prev_id.time = 0;
-    msg->msg->prev_id.tag.fixed[0] = 0;
-    msg->msg->prev_id.tagcount = 1;
-  }
-  
-  //set time and tag
-  if(msg->msg->id.time == 0) {
-    msg->msg->id.time = ngx_time();
-  }
-  if(ch->msg_last && ch->msg_last->msg->id.time == msg->msg->id.time) {
-    msg->msg->id.tag.fixed[0] = ch->msg_last->msg->id.tag.fixed[0] + 1;
-  }
-  else if(!ch->cf->redis.enabled || ch->cf->redis.storage_mode < REDIS_MODE_DISTRIBUTED) { //TODO: check this logic
-    msg->msg->id.tag.fixed[0] = 0;
-  }
-
-  if(ch->msg_first == NULL) {
-    ch->msg_first = msg;
-  }
-  ch->channel.messages++;
-  ngx_atomic_fetch_add(&ch->shared->stored_message_count, 1);
-  ngx_atomic_fetch_add(&ch->shared->total_message_count, 1);
-
-  if(ch->groupnode) {
-    memstore_group_add_message(ch->groupnode, msg->msg);
-  }
-  
-  ch->msg_last = msg;
-  
-  //DBG("create %V %V", msgid_to_str(&msg->msg->id), chanhead_msg_to_str(msg));
-  memstore_chanhead_messages_gc(ch);
-  if(ch->msg_last != msg) { //why does this happen?
-    ERR("just-published messages is no longer the last message for some reason... This is unexpected.");
-  }
-  return ch->msg_last == msg ? NGX_OK : NGX_ERROR;
-}
-
-static u_char* copy_preallocated_str_to_cur(ngx_str_t *dst, ngx_str_t *src, u_char *cur) {
-  size_t   sz = src->len;
-  dst->len = sz; 
-  if(sz > 0) {
-    dst->data = cur;
-    ngx_memcpy(dst->data, src->data, sz);
-  }
-  else {
-    dst->data = NULL;
-  }
-  return cur + sz;
-}
-
-static size_t memstore_buf_memsize(ngx_buf_t *buf) {
-  size_t buf_size = 0;
-  if(ngx_buf_in_memory_only(buf)) {
-    buf_size += ngx_buf_size(buf);
-  }
-  if(buf->in_file && buf->file != NULL) {
-    buf_size = sizeof(ngx_file_t) + buf->file->name.len + 1; //+1 to ensure NUL-terminated filename string
-  }
-  return buf_size;
-}
-
-size_t memstore_msg_memsize(nchan_msg_t *m) {
-  size_t                  total_sz, buf_contents_size = 0, content_type_size = 0, eventsource_event_size = 0, compressed_sz = 0;
-  ngx_buf_t              *mbuf = &m->buf;
-  if(m->eventsource_event)
-    eventsource_event_size += m->eventsource_event->len + sizeof(ngx_str_t);
-  if(m->content_type)
-    content_type_size += m->content_type->len + sizeof(ngx_str_t);
-  
-  buf_contents_size = memstore_buf_memsize(mbuf);
-  
-  if(m->compressed) {
-    compressed_sz += sizeof(nchan_compressed_msg_t) + memstore_buf_memsize(&m->compressed->buf);
-  }
-  
-  total_sz = sizeof(nchan_msg_t) + (buf_contents_size + content_type_size + eventsource_event_size + compressed_sz);
-#if NCHAN_MSG_LEAK_DEBUG
-  size_t    debug_sz = m->lbl.len;
-  total_sz += debug_sz;
-#endif
-  
-  return total_sz;
-}
-
-static u_char *copy_buf_contents(ngx_buf_t *in, ngx_buf_t *out, u_char *rest) {
-  size_t buf_mem_body_size = 0;
-  
-  if(in->file!=NULL) {
-    out->file = (ngx_file_t *)rest;
-    *out->file = *in->file;
-    out->file->fd = NGX_INVALID_FILE;
-    out->file->log = ngx_cycle->log;
-    
-    rest = (u_char *)&out->file[1];
-    rest = copy_preallocated_str_to_cur(&out->file->name, &in->file->name, rest);
-    //ensure last char is NUL
-    *(rest++) = '\0';
-  }
-  
-  if(ngx_buf_in_memory_only(in)) {
-    buf_mem_body_size = ngx_buf_size(in);
-  }
-  
-  if(buf_mem_body_size > 0) {
-    ngx_str_t   dst_str, src_str = {buf_mem_body_size, in->pos};
-    
-    rest = copy_preallocated_str_to_cur(&dst_str, &src_str, rest);
-    
-    out->pos = dst_str.data;
-    out->last = out->pos + dst_str.len;
-    out->start = out->pos;
-    out->end = out->last;
-  }
-  
-  return rest;
-}
-
-//#define NCHAN_CREATE_SHM_MSG_DEBUG 1
-
-static nchan_msg_t *create_shm_msg(nchan_msg_t *m) {
-  nchan_msg_t             *msg;
-  ngx_buf_t               *mbuf = NULL;
-  u_char                  *cur;
-  size_t                   memsize = memstore_msg_memsize(m);
-
-#if NCHAN_CREATE_SHM_MSG_DEBUG
-  memsize += 5;
-#endif
-  mbuf = &m->buf;
-    
-  if((msg = shm_alloc(shm, memsize, "message")) == NULL) {
-    nchan_log_ooshm_error("allocating message of size %i", memsize);
-    return NULL;
-  }
-  
-#if NCHAN_CREATE_SHM_MSG_DEBUG
-  cur = (u_char *)msg;
-  cur[memsize+1]='e';
-  cur[memsize+2]='n';
-  cur[memsize+3]='d';
-  cur[memsize+4]='\0';
-#endif
-  
-  cur = (u_char *)&msg[1];
-  assert(m->id.tagcount == 1);
-  
-  *msg = *m;
-  
-  if(m->content_type) {
-    msg->content_type = (ngx_str_t *)cur;
-    cur = (u_char *)(&msg->content_type[1]);
-    cur = copy_preallocated_str_to_cur(msg->content_type, m->content_type, cur);
-  }
-  else {
-    msg->content_type = NULL;
-  }
-  
-  if(m->eventsource_event) {
-    msg->eventsource_event = (ngx_str_t *)cur;
-    cur = (u_char *)(&msg->eventsource_event[1]);
-    cur = copy_preallocated_str_to_cur(msg->eventsource_event, m->eventsource_event, cur);
-  }
-  else {
-    msg->eventsource_event = NULL;
-  }
-  
-  cur = copy_buf_contents(mbuf, &msg->buf, cur);
-  msg->buf.last_buf = 1;
-  
-  msg->storage = NCHAN_MSG_SHARED;
-  msg->parent = NULL;
-  
-  if(m->compressed) {
-    msg->compressed = (nchan_compressed_msg_t *)cur;
-    cur = (u_char *)&msg->compressed[1];
-    *msg->compressed = *m->compressed;    
-    cur = copy_buf_contents(&m->compressed->buf, &msg->compressed->buf, cur);
-    msg->compressed->buf.last_buf = 1;
-  }
-  
-#if NCHAN_MSG_RESERVE_DEBUG
-  msg->rsv = NULL;
-#endif
-#if NCHAN_MSG_LEAK_DEBUG 
-  assert((u_char *)msg + memsize == cur + m->lbl.len);
-  msg->lbl.len = m->lbl.len;
-  msg->lbl.data = cur;
-  ngx_memcpy(msg->lbl.data, m->lbl.data, msg->lbl.len);
-  
-  msg_debug_add(msg);
-#endif
-#if NCHAN_CREATE_SHM_MSG_DEBUG
-  assert(ngx_memcmp(((u_char *)msg) + memsize + 1, "end", 4) == 0);
-#endif
-  return msg;
-}
-
-static store_message_t *create_shared_message(nchan_msg_t *m, ngx_int_t msg_already_in_shm) {
-  store_message_t          *chmsg;
-  nchan_msg_t              *msg;
-  
-  if(msg_already_in_shm) {
-    msg = m;
-  }
-  else {
-    if((msg=create_shm_msg(m)) == NULL ) {
-      return NULL;
-    }
-  }
-  if((chmsg = ngx_alloc(sizeof(*chmsg), ngx_cycle->log)) != NULL) {
-    chmsg->prev = NULL;
-    chmsg->next = NULL;
-    chmsg->msg  = msg;
-  }
-  return chmsg;
-}
-
-typedef struct {
-  uint16_t              n;
-  ngx_int_t             rc;
-  nchan_channel_t       ch;
-  callback_pt           callback;
-  void                 *privdata;
-} publish_multi_data_t;
-
-static ngx_int_t publish_multi_callback(ngx_int_t status, void *rptr, void *privdata) {
-  nchan_channel_t       *ch = rptr;
-  publish_multi_data_t  *pd = privdata;
-  static nchan_msg_id_t  empty_msgid = NCHAN_ZERO_MSGID;
-  
-  if(status == NGX_HTTP_INTERNAL_SERVER_ERROR || (status == NCHAN_MESSAGE_RECEIVED && pd->rc != NGX_HTTP_INTERNAL_SERVER_ERROR)) {
-    pd->rc = status;
-  }
-  
-  if(ch) {
-    if(pd->ch.last_seen < ch->last_seen) {
-      pd->ch.last_seen = ch->last_seen;
-    }
-    
-    if(pd->ch.messages < ch->messages) {
-      pd->ch.messages = ch->messages;
-    }
-    
-    pd->ch.subscribers += ch->subscribers;
-  }
-  
-  pd->n--;
-  
-  if(pd->n == 0) {
-    pd->ch.last_published_msg_id = empty_msgid;
-    pd->callback(pd->rc, &pd->ch, pd->privdata);
-    ngx_free(pd);
-  }
-  
-  return NGX_OK;
-}
-
-typedef struct {
-  ngx_str_t        *chid;
-  ngx_str_t         groupname;
-  nchan_msg_t      *msg;
-  nchan_loc_conf_t *cf;
-  callback_pt       cb;
-  void             *pd;
-} group_publish_accounting_check_data_t;
-
-static ngx_int_t group_publish_accounting_channelcheck(ngx_int_t rc, nchan_channel_t *chaninfo, group_publish_accounting_check_data_t *d) {
-  if(chaninfo) {
-    //channel already exists. we may proceed.
-    nchan_store_publish_message_generic(d->chid, d->msg, 0, d->cf, d->cb, d->pd);
-  }
-  else {
-    char *err = "Group limit reached for number of channels.";
-    nchan_log_warning("%s (group %V)", err, &d->groupname);
-    d->cb(NGX_HTTP_FORBIDDEN, err, d->pd);
-  }
-  ngx_free(d);
-  return NGX_OK;
-}
-
-static ngx_int_t group_publish_accounting_check(ngx_int_t rc, nchan_group_t *shm_group, group_publish_accounting_check_data_t *d) {
-  int     n;
-  int     ok = 0;
-  ssize_t msg_sz;
-  char   *err = "unknown error";
-  
-  
-  if(!shm_group) {
-    ERR("couldn't find group %V for publishing accounting check.", &d->groupname);
-    d->cb(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->pd);
-    ngx_free(d);
-    return NGX_ERROR;
-  }
-  
-  if((ok = !shm_group->limit.messages || shm_group->messages < shm_group->limit.messages) == 0) {
-    err = "Group limit reached for number of messages.";
-  }
-
-  if(ok && shm_group->limit.messages_shmem_bytes) {
-    n = count_channel_id(d->chid);
-    msg_sz = memstore_msg_memsize(d->msg);
-    ok = (shm_group->messages_shmem_bytes + n * msg_sz) <= shm_group->limit.messages_shmem_bytes;
-    if(!ok) err = "Group limit reached for memory used by messages.";
-  }
-  
-  if(ok && shm_group->limit.messages_file_bytes) {
-    ok = shm_group->messages_file_bytes + ngx_buf_size((&d->msg->buf)) <= shm_group->limit.messages_file_bytes;
-    // no need to multiply ngx_buf_size by n because the file is shared for all the messages.
-    if(!ok) err = "Group limit reached for disk space used by messages.";
-  }
-  
-  if(ok && shm_group->limit.channels) {
-    //channel check
-    if(shm_group->channels + 1 == shm_group->limit.channels) {
-      //need to check if publishing will create a channel
-      memstore_channel_head_t *ch;
-      
-      //first try it the easy way
-      ch = nchan_memstore_find_chanhead(d->chid);
-      if(!ch) {
-        //this is going to be kind of costly...
-        nchan_store_find_channel(d->chid, d->cf, (callback_pt )group_publish_accounting_channelcheck, d);
-        return NGX_OK;
-      }
-    }
-    else if(shm_group->channels >= shm_group->limit.channels) {
-      ok = 0;
-      err = "Group limit reached for number of channels.";
-    }
-  }
-  
-  if(ok) {
-    ngx_int_t pub_rc = nchan_store_publish_message_generic(d->chid, d->msg, 0, d->cf, d->cb, d->pd);
-    if(pub_rc == NGX_DECLINED) { //out of memory probably
-      d->cb(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, d->pd);
-    }
-  }
-  else {
-    nchan_log_warning("%s (group %V)", err, &d->groupname);
-    d->cb(NGX_HTTP_FORBIDDEN, err, d->pd);
-  }
-  
-  ngx_free(d);
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t *msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  if(cf->group.enable_accounting) {
-    // it might be better to do this later when a chanhead is available,
-    // so we can avoid the group lookup in the group-tree and use chanhead->groupnode.
-    
-    // but the code is much cleaner doing it the less efficient way, and I don't think
-    // publishing is really going to be a bottleneck. Still, a possible TODO for later.
-    group_publish_accounting_check_data_t  *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
-    if(d == NULL) {
-      ERR("Couldn't allocate data for group publishing check");
-      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
-      return NGX_ERROR;
-    }
-    
-    d->chid = channel_id;
-    d->groupname = nchan_get_group_from_channel_id(channel_id);
-    d->msg = msg;
-    d->cf = cf;
-    d->cb = callback;
-    d->pd = privdata;
-    
-    return memstore_group_find(groups, &d->groupname, (callback_pt )group_publish_accounting_check, d);
-  }
-  else {
-    return nchan_store_publish_message_generic(channel_id, msg, 0, cf, callback, privdata);
-  }
-}
-
-static void fill_message_timedata(nchan_msg_t *msg, time_t timeout) {
-  if(msg->id.time == 0) {
-    // cached time is okay to use here, because this is the channel owner.
-    // even if it's a second behind, so will the previous messages. 
-    // monotonicity is still preserved.
-    msg->id.time = ngx_time();
-  }
-  if(msg->expires == 0) {
-    msg->expires = msg->id.time + timeout;
-  }
-}
-
-static ngx_int_t nchan_store_publish_message_to_single_channel_id(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  memstore_channel_head_t  *chead;
-  
-  if(callback == NULL) {
-    callback = empty_callback;
-  }
-  
-  if(cf->redis.enabled) {
-    fill_message_timedata(msg, nchan_loc_conf_message_timeout(cf));
-    
-    if(cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
-      assert(!msg_in_shm);
-      return nchan_store_redis.publish(channel_id, msg, cf, callback, privdata);
-    }
-    //BACKUP mode gets published later
-  }
-  
-  if((chead = nchan_memstore_get_chanhead(channel_id, cf)) == NULL) {
-    //ERR("can't get chanhead for id %V", channel_id);
-    //we probably just ran out of shared memory
-    callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
-    return NGX_ERROR;
-  }
-  
-  return nchan_store_chanhead_publish_message_generic(chead, msg, msg_in_shm, cf, callback, privdata);
-}
-
-ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  ngx_int_t   rc;
-  if(nchan_channel_id_is_multi(channel_id)) {
-    ngx_int_t             i, n = 0;
-    ngx_str_t             ids[NCHAN_MULTITAG_MAX];
-    ngx_int_t             trc=NGX_OK;
-    publish_multi_data_t *pd;
-    if((pd = ngx_alloc(sizeof(*pd), ngx_cycle->log)) == NULL) {
-      ERR("can't allocate publish multi chanhead data");
-      return NGX_ERROR;
-    }
-    
-    n = parse_multi_id(channel_id, ids);
-    
-    pd->callback = callback;
-    pd->privdata = privdata;
-    pd->n = n;
-    pd->rc = NCHAN_MESSAGE_QUEUED;
-    ngx_memzero(&pd->ch, sizeof(pd->ch));
-    
-    for(i=0; i<n; i++) {
-      rc = nchan_store_publish_message_to_single_channel_id(&ids[i], msg, msg_in_shm, cf, publish_multi_callback, pd);
-      if(rc != NGX_OK) {
-        trc = rc;
-      }
-    }
-    return trc;
-  }
-  else {
-    return nchan_store_publish_message_to_single_channel_id(channel_id, msg, msg_in_shm, cf, callback, privdata);
-  }
-}
-
-ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *chead, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  nchan_channel_t              channel_copy_data;
-  nchan_channel_t             *channel_copy = &channel_copy_data;
-  store_message_t             *shmsg_link;
-  ngx_int_t                    sub_count;
-  nchan_msg_t                 *publish_msg;
-  ngx_int_t                    owner = chead->owner;
-  ngx_int_t                    rc;
-  time_t                       chan_expire, timeout = nchan_loc_conf_message_timeout(cf);
-  
-  if(callback == NULL) {
-    callback = empty_callback;
-  }
-
-  assert(msg->id.tagcount == 1);
-  
-  assert(!cf->redis.enabled || cf->redis.storage_mode == REDIS_MODE_BACKUP);
-  
-  if(memstore_slot() != owner) {
-    if((publish_msg = create_shm_msg(msg)) == NULL) {
-      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
-      return NGX_ERROR;
-    }
-    return memstore_ipc_send_publish_message(owner, &chead->id, publish_msg, cf, callback, privdata);
-  }
-  
-  if(cf->redis.enabled && cf->redis.storage_mode == REDIS_MODE_BACKUP) {
-    nchan_store_redis.publish(&chead->id, msg, cf, empty_callback, NULL);
-  }
-  
-  fill_message_timedata(msg, timeout);
-  
-  chan_expire = ngx_time() + timeout;
-  chead->channel.expires = chan_expire > msg->expires + 5 ? chan_expire : msg->expires + 5;
-  if( chan_expire > chead->channel.expires) {
-    chead->channel.expires = chan_expire;
-  }
-  sub_count = chead->shared->sub_count;
-  
-  chead->max_messages = nchan_loc_conf_max_messages(cf);
-  
-  
-  if(chead->latest_msgid.time > msg->id.time) {
-    if(cf->redis.enabled) {
-      nchan_log_error("A message from the past has just been published. At least one of your servers running Nchan using Redis does not have its time synchronized.");
-    }
-    else {
-      nchan_log_error("A message from the past has just been published. Unless the system time has been adjusted, this should never happen.");
-    }
-  }
-  
-  memstore_chanhead_messages_gc(chead);
-  if(chead->max_messages == 0) {
-    ///no buffer
-    channel_copy=&chead->channel;
-    
-    if((shmsg_link = create_shared_message(msg, msg_in_shm)) == NULL) {
-      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
-      ERR("can't create unbuffered message for channel %V", &chead->id);
-      return NGX_ERROR;
-    }
-    publish_msg= shmsg_link->msg;
-    publish_msg->expires = ngx_time() + NCHAN_NOBUFFER_MSG_EXPIRE_SEC;
-    
-    publish_msg->prev_id.time = 0;
-    publish_msg->prev_id.tag.fixed[0] = 0;
-    publish_msg->prev_id.tagcount = 1;
-    
-    if(chead->latest_msgid.time == publish_msg->id.time) {
-      publish_msg->id.tag.fixed[0] = chead->latest_msgid.tag.fixed[0] + 1;
-    }
-    
-    nchan_reaper_add(&mpt->nobuffer_msg_reaper, shmsg_link);
-  }
-  else {
-    
-    if((shmsg_link = create_shared_message(msg, msg_in_shm)) == NULL) {
-      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
-      ERR("can't create shared message for channel %V", &chead->id);
-      return NGX_ERROR;
-    }
-    
-    if(chanhead_push_message(chead, shmsg_link) != NGX_OK) {
-      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
-      ERR("can't enqueue shared message for channel %V", &chead->id);
-      return NGX_ERROR;
-    }
-    
-    ngx_memcpy(channel_copy, &chead->channel, sizeof(*channel_copy));
-    channel_copy->subscribers = sub_count;
-    assert(shmsg_link != NULL);
-    assert(chead->msg_last == shmsg_link);
-    publish_msg = shmsg_link->msg;
-  }
-  
-  nchan_copy_msg_id(&chead->latest_msgid, &publish_msg->id, NULL);
-  if (chead->shared) {
-    channel_copy->last_seen = chead->shared->last_seen;
-  }
-  nchan_copy_msg_id(&channel_copy->last_published_msg_id, &chead->latest_msgid, NULL);
-  
-  //do the actual publishing
-  assert(publish_msg->id.time != publish_msg->prev_id.time || ( publish_msg->id.time == publish_msg->prev_id.time && publish_msg->id.tag.fixed[0] != publish_msg->prev_id.tag.fixed[0]));
-  
-  nchan_update_stub_status(messages, 1);
-  
-  rc = nchan_memstore_publish_generic(chead, publish_msg, 0, NULL);
-  
-  callback(rc, channel_copy, privdata);
-
-  return rc;
-}
-
-static ngx_int_t nchan_store_get_group(ngx_str_t *name, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
-  if(cf->group.enable_accounting) {
-    return memstore_group_find(groups, name, cb, pd);
-  }
-  else {
-    cb(NGX_ERROR, NULL, pd);
-    return NGX_ERROR;
-  }
-}
-
-typedef struct {
-  callback_pt           cb;
-  void                 *pd;
-  nchan_group_limits_t  limits;
-} group_callback_data_pt;
-
-#define APPLY_GROUP_LIMIT_IF_SET(limits, group, limit_name) \
-if((limits).limit_name != -1) (group)->limit.limit_name = (limits).limit_name
-
-static ngx_int_t set_group_limits_callback(ngx_int_t rc, nchan_group_t *group, group_callback_data_pt *ppd) {
-  
-  if(group) {
-    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, channels);
-    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, subscribers);
-    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, messages);
-    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, messages_shmem_bytes);
-    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, messages_file_bytes);
-  }
-  
-  if(ppd->cb) {
-    ppd->cb(rc, group, ppd->pd);
-  }
-  ngx_free(ppd);
-  return NGX_OK;
-}
-
-#define INIT_GROUP_DOUBLE_CALLBACK(double_privdata, callback, privdata) \
-  if((double_privdata = ngx_alloc(sizeof(*double_privdata), ngx_cycle->log)) == NULL) { \
-    callback(NGX_ERROR, NULL, privdata);                                \
-    return NGX_ERROR;                                                   \
-  }                                                                     \
-  double_privdata->cb = callback;                                       \
-  double_privdata->pd = privdata
-
-
-static ngx_int_t nchan_store_set_group_limits(ngx_str_t *name, nchan_loc_conf_t *cf, nchan_group_limits_t *limits, callback_pt cb, void *pd) {
-  group_callback_data_pt   *ppd;
-  
-  if(!cf->group.enable_accounting) {
-    if(cb)
-      cb(NGX_ERROR, NULL, pd);
-    return NGX_OK;
-  }
-  
-  if(cb == NULL) {
-    ngx_atomic_int_t         *limit;
-    int                       limit_set = 0;
-    //do we even have any limits to set?...
-    //because if not, this whole thing can be bypassed, as there's no callback to run afterwards
-    for(limit = (ngx_atomic_int_t *)limits; limit < (ngx_atomic_int_t *)(limits + 1); limit++) {
-      if (*limit != -1) {
-        limit_set ++;
-        break;
-      }
-    }
-    if(limit_set == 0) {
-      return NGX_OK;
-    }
-  }
-  
-  INIT_GROUP_DOUBLE_CALLBACK(ppd, cb, pd);
-  ppd->limits = *limits;
-  
-  return memstore_group_find(groups, name, (callback_pt )set_group_limits_callback, ppd);
-}
-static ngx_int_t nchan_store_delete_group(ngx_str_t *name, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
-  
-  if(!cf->group.enable_accounting) {
-    cb(NGX_ERROR, NULL, pd);
-    return NGX_OK;
-  }
-  
-  return memstore_group_delete(groups, name, cb, pd);
-}
-
-typedef struct {
-  callback_pt       cb;
-  void             *pd;
-  nchan_loc_conf_t *lcf;
-} get_unique_request_id_data_t;
-
-static void get_unique_request_delay_callback(void *pd);
-static ngx_int_t nchan_store_get_subscriber_info_id(nchan_loc_conf_t *lcf, callback_pt cb, void *pd) {
-  
-  if(lcf->redis.enabled && lcf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
-    return nchan_store_redis.get_subscriber_info_id(lcf, cb, pd);
-  }
-  
-  get_unique_request_id_data_t *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
-  if(d == NULL) {
-    return NGX_ERROR;
-  }
-  
-  d->cb = cb;
-  d->pd = pd;
-  d->lcf = lcf;
-  
-  if(nchan_add_oneshot_timer(get_unique_request_delay_callback, d, 1) == NULL) {
-    return NGX_ERROR;
-  }
-  
-  return NGX_DONE;
-}
-
-static void get_unique_request_delay_callback(void *pd) {
-  get_unique_request_id_data_t *d = pd;
-  ngx_atomic_int_t id = ngx_atomic_fetch_add(&shdata->subscriber_info_response_id, 1);
-  
-  d->cb(NGX_OK, (void *)(uintptr_t )id, d->pd);
-  ngx_free(d);
-}
-
-static ngx_int_t nchan_store_request_subscriber_info_single_channel(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *lcf, callback_pt cb, void *pd) {
-  memstore_channel_head_t     *ch = nchan_memstore_get_chanhead(channel_id, lcf);
-  if(!ch || !ch->cf) {
-    return NGX_ERROR;
-  }
-  if(ch->cf->redis.enabled && ch->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
-    return nchan_store_redis.request_subscriber_info(channel_id, request_id, ch->cf, cb, pd);
-  }
-  else {
-    if(ch->owner == memstore_slot()) {
-      return nchan_memstore_publish_notice(ch, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, (void *)(intptr_t )request_id);
-    }
-    else {
-      return memstore_ipc_send_publish_notice(ch->owner, channel_id, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, (void *)(intptr_t )request_id);
-    }
-  }
-}
-
-static ngx_int_t nchan_store_request_subscriber_info(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *lcf, callback_pt cb, void *pd) {
-  if(!nchan_channel_id_is_multi(channel_id)) {
-    return nchan_store_request_subscriber_info_single_channel(channel_id, request_id, lcf, cb, pd);
-  }
-  else {
-    //send the delete to all the individually multiplexed channels
-    ngx_int_t             i, n = 0;
-    ngx_str_t             ids[NCHAN_MULTITAG_MAX];
-    
-    n = parse_multi_id(channel_id, ids);
-
-    for(i=0; i<n; i++) {
-      ngx_int_t rc = nchan_store_request_subscriber_info_single_channel(channel_id, request_id, lcf, cb, pd);
-      if(rc != NGX_OK && rc != NGX_DONE) {
-        return rc;
-      }
-    }
-    return NGX_OK;
-  }
-}
-
-nchan_store_t  nchan_store_memory = {
-   //init
-  &nchan_store_init_module,
-  &nchan_store_init_worker,
-  &nchan_store_init_postconfig,
-  &nchan_store_create_main_conf,
-  
-  //shutdown
-  &nchan_store_exit_worker,
-  &nchan_store_exit_master,
-  
-  //async-friendly functions with callbacks
-  &nchan_store_async_get_message, //+callback
-  &nchan_store_subscribe, //+callback
-  &nchan_store_publish_message, //+callback
-  
-  &nchan_store_delete_channel, //+callback
-  &nchan_store_find_channel, //+callback
-  
-  &nchan_store_get_group, //+callback
-  &nchan_store_set_group_limits, //+callback
-  &nchan_store_delete_group, //+callback
-  
-  &nchan_store_get_subscriber_info_id, //+callback
-  &nchan_store_request_subscriber_info, //+callback
-};
-
diff --git a/debian/modules/nchan/src/store/memory/recycloc.c b/debian/modules/nchan/src/store/memory/recycloc.c
deleted file mode 100644
index 1424f5a..0000000
--- a/debian/modules/nchan/src/store/memory/recycloc.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <nchan_module.h>
-
-#define DBG(...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, __VA_ARGS__)
-#define ERR(...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, __VA_ARGS__)
-
-typedef struct recycloc_trash_s recycloc_trash_t;
-typedef struct recycloc_s recycloc_t;
-
-struct recycloc_llist_s {
-  void             *data;
-  struct recycloc_page_t  *prev;
-  struct recycloc_page_t  *next;
-};
-
-struct recycloc_s {
-  const char       *name;
-  recycloc_llist_s *head;
-  recycloc_llist_s *tail;
-  recycloc_llist_s *prealloc_start;
-  recycloc_llist_s *prealloc_end;
-}
-
-recycloc_t *recycloc_init(const char *name, recycloc_t *ptr, size_t data_size, size_t prealloc_count) {
-  recycloc_t rec = NULL;
-  if(page_size > ngx_pagesize) {
-    ERR("can't create recycloc: page_size %i > ngx_pagesize %i", page_size, ngx_pagesize);
-    return NULL;
-  }
-  if(!(rec = ngx_alloc(sizeof(recycloc_t) + page_size))){
-    ERR("can't alloc enough (%i) memory for recycloc", sizeof(recycloc_t) + page_size);
-    return NULL;
-  }
-  rec->name=name;
-  rec->data_size = data_size
-  return rec;
-  
-  
-}
-
-void * recycloc_alloc(recycloc_t *self);
-
-
-
-recycloc_t *recycloc_destroy(recycloc_t *self) {
-  
-  
-}
\ No newline at end of file
diff --git a/debian/modules/nchan/src/store/memory/store-private.h b/debian/modules/nchan/src/store/memory/store-private.h
deleted file mode 100644
index c062274..0000000
--- a/debian/modules/nchan/src/store/memory/store-private.h
+++ /dev/null
@@ -1,179 +0,0 @@
- #ifndef MEMSTORE_PRIVATE_HEADER
-#define MEMSTORE_PRIVATE_HEADER
-#include <util/shmem.h>
-#include "ipc.h"
-//#define MEMSTORE_CHANHEAD_RESERVE_DEBUG 1
-
-#define NCHAN_NOTICE_BUFFER_LOADED 0x356F
-#define NCHAN_NOTICE_CHANNEL_SUBSCRIBER_INFO_REQUEST 0x1337
-
-#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
-#include <util/nchan_list.h>
-#endif
-#include "uthash.h"
-typedef struct memstore_channel_head_s memstore_channel_head_t;
-typedef struct store_message_s store_message_t;
-size_t memstore_msg_memsize(nchan_msg_t *m);
-
-#include "groups.h"
-
-struct store_message_s {
-  nchan_msg_t               *msg;
-  store_message_t           *prev;
-  store_message_t           *next;
-}; //store_message_t
-
-#include "../spool.h"
-
-typedef struct {
-  ngx_atomic_t                sub_count;
-  ngx_atomic_t                internal_sub_count;
-  ngx_atomic_t                total_message_count;
-  ngx_atomic_t                stored_message_count;
-  ngx_atomic_t                last_seen;
-  struct {
-    ngx_atomic_t                outside_refcount;
-  }                           gc;
-} store_channel_head_shm_t;
-
-typedef struct {
-  ngx_str_t            id;
-  subscriber_t        *sub;
-} memstore_multi_t;
-
-struct memstore_channel_head_s {
-  ngx_str_t                       id; //channel id
-  ngx_int_t                       owner;
-  ngx_int_t                       slot;
-  nchan_channel_t                 channel;
-  channel_spooler_t               spooler;
-  chanhead_pubsub_status_t        status;
-  ngx_atomic_int_t                total_sub_count;
-  ngx_int_t                       internal_sub_count;
-  time_t                          last_subscribed_local;
-
-#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
-  nchan_list_t                    reserved;
-#else
-  uint16_t                        reserved;
-#endif
-  
-  uint8_t                         multi_subscribers_pending;
-  uint8_t                         multi_count;
-  memstore_multi_t               *multi;
-  
-  ngx_int_t                       gc_queued_times; // useful for debugging
-  store_channel_head_shm_t       *shared;
-  
-  ngx_uint_t                      max_messages;
-  store_message_t                *msg_first;
-  store_message_t                *msg_last;
-  nchan_msg_id_t                  latest_msgid;
-  nchan_msg_id_t                  oldest_msgid;
-  subscriber_t                   *foreign_owner_ipc_sub; //points to NULL or inaacceessible memory.
-  time_t                          redis_idle_cache_ttl;
-  unsigned                        stub:1;
-  unsigned                        shutting_down:1;
-  unsigned                        meta:1;
-  
-  uint8_t                         msg_buffer_complete; //must be a byte because we need to reference it in the spooler
-  
-  nchan_loc_conf_t               *cf;
-  
-  group_tree_node_t              *groupnode;
-  memstore_channel_head_t        *groupnode_prev;
-  memstore_channel_head_t        *groupnode_next;
-
-  subscriber_t                   *redis_sub;
-  ngx_int_t                       delta_fakesubs;
-  ngx_event_t                     delta_fakesubs_timer_ev;
-  
-  memstore_channel_head_t        *gc_prev;
-  memstore_channel_head_t        *gc_next;
-  time_t                          gc_start_time;
-  unsigned                        in_gc_queue:1;
-  
-  memstore_channel_head_t        *churn_prev;
-  memstore_channel_head_t        *churn_next;
-  time_t                          churn_start_time;
-  unsigned                        in_churn_queue:1;
-  
-  UT_hash_handle                  hh;
-};
-
-typedef struct nchan_reloading_channel_s nchan_reloading_channel_t;
-
-struct nchan_reloading_channel_s {
-  ngx_str_t                          id;
-  ngx_uint_t                         max_messages;
-  unsigned                           use_redis:1;
-  struct nchan_reloading_channel_s  *prev;
-  struct nchan_reloading_channel_s  *next;
-  nchan_msg_t                       *msgs;
-};
-
-#define NCHAN_INVALID_SLOT           -1
-
-typedef struct {
-  nchan_reloading_channel_t         *rlch;
-  ngx_atomic_int_t                   procslot[NGX_MAX_PROCESSES];
-  ngx_atomic_int_t                   max_workers;
-  ngx_atomic_int_t                   old_max_workers;
-  ngx_atomic_int_t                   total_active_workers;
-  ngx_atomic_int_t                   current_active_workers;
-  ngx_atomic_int_t                   reloading;
-  ngx_atomic_uint_t                  generation;
-  ngx_atomic_uint_t                  subscriber_info_response_id;
-  
-  nchan_loc_conf_shared_data_t      *conf_data;
-  
-  nchan_stub_status_t                stats;
-#if nginx_version <= 1011006
-  ngx_atomic_uint_t                  shmem_pages_used;
-#endif
-
-#if NCHAN_MSG_LEAK_DEBUG
-  nchan_msg_t                       *msgdebug_head;
-#endif
-} shm_data_t;
-
-memstore_channel_head_t *nchan_memstore_find_chanhead(ngx_str_t *channel_id);
-ngx_int_t nchan_memstore_find_chanhead_with_backup(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt cb, void *pd);
-memstore_channel_head_t *nchan_memstore_get_chanhead(ngx_str_t *channel_id, nchan_loc_conf_t *cf);
-memstore_channel_head_t *nchan_memstore_get_chanhead_no_ipc_sub(ngx_str_t *channel_id, nchan_loc_conf_t *cf);
-store_message_t *chanhead_find_next_message(memstore_channel_head_t *ch, nchan_msg_id_t *msgid, nchan_msg_status_t *status);
-ipc_t *nchan_memstore_get_ipc(void);
-memstore_groups_t *nchan_memstore_get_groups(void);
-ngx_int_t nchan_memstore_handle_get_message_reply(nchan_msg_t *msg, nchan_msg_status_t findmsg_status, void *d);
-
-ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
-ngx_int_t nchan_memstore_publish_generic(memstore_channel_head_t *head, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line);
-ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *chead, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
-ngx_int_t nchan_memstore_publish_notice(memstore_channel_head_t *head, ngx_int_t notice_code, const void *notice_data);
-ngx_int_t nchan_memstore_force_delete_channel(ngx_str_t *channel_id, callback_pt callback, void *privdata);
-ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8_t ipc_subscribe_if_needed);
-ngx_int_t memstore_ready_chanhead_unless_stub(memstore_channel_head_t *head);
-void memstore_fakesub_add(memstore_channel_head_t *head, ngx_int_t n);
-ngx_int_t memstore_chanhead_messages_gc(memstore_channel_head_t *ch);
-
-
-#if FAKESHARD
-void memstore_fakeprocess_push(ngx_int_t slot);
-void memstore_fakeprocess_push_random(void);
-ngx_int_t memstore_fakeprocess_pop(void);
-#endif
-
-ngx_int_t memstore_slot(void);
-ngx_int_t memstore_str_owner(ngx_str_t *str);
-
-int memstore_ready(void);
-ngx_int_t chanhead_gc_add(memstore_channel_head_t *head, const char *);
-ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *chanhead, const char *);
-
-
-void memstore_chanhead_release(memstore_channel_head_t *ch, char *label);
-void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label);
-
-extern uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
-
-#endif /*MEMSTORE_PRIVATE_HEADER*/
diff --git a/debian/modules/nchan/src/store/memory/store.h b/debian/modules/nchan/src/store/memory/store.h
deleted file mode 100644
index c1b9eef..0000000
--- a/debian/modules/nchan/src/store/memory/store.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef NCHAN_MEMSTORE_H
-#define NCHAN_MEMSTORE_H
-
-extern nchan_store_t  nchan_store_memory;
-
-ngx_int_t memstore_channel_owner(ngx_str_t *id);
-
-extern void  *nchan_store_memory_shmem;
-
-nchan_loc_conf_shared_data_t *memstore_get_conf_shared_data(nchan_loc_conf_t *cf);
-ngx_int_t memstore_reserve_conf_shared_data(nchan_loc_conf_t *cf);
-ngx_int_t nchan_nginx_worker_procslot(ngx_int_t worker_number);
-#endif //NCHAN_MEMSTORE_H
diff --git a/debian/modules/nchan/src/store/ngx_rwlock.c b/debian/modules/nchan/src/store/ngx_rwlock.c
deleted file mode 100644
index 0fd04fb..0000000
--- a/debian/modules/nchan/src/store/ngx_rwlock.c
+++ /dev/null
@@ -1,178 +0,0 @@
-#include <nchan_module.h>
-#include "ngx_rwlock.h"
-
-#define NGX_RWLOCK_SPIN         2048
-#define NGX_RWLOCK_WRITE        -1
-
-#define DISABLE_RWLOCK 0  //just use a regular mutex for everything
-#define DEBUG_NGX_RWLOCK 1
-
-void ngx_rwlock_init(ngx_rwlock_t *lock) {
-  lock->mutex=1;
-  lock->lock=0;
-  lock->write_pid=0;
-  lock->mutex=0;
-}
-
-static void rwl_lock_mutex(ngx_rwlock_t *lock) {
-  #if (NGX_HAVE_ATOMIC_OPS)
-  ngx_atomic_t  *mutex = &lock->mutex;
-  ngx_uint_t i, n;
-  for(;;) {
-    if(*mutex == 0 && ngx_atomic_cmp_set(mutex, 0, ngx_pid)) {
-      return;
-    }
-    if(ngx_ncpu > 1) {
-      for(n = 1; n < NGX_RWLOCK_SPIN; n <<= 1) {
-        for(i = 0; i < n; i++) {
-          ngx_cpu_pause();
-        }
-        #if (DEBUG_NGX_RWLOCK)
-        ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p mutex wait", lock);
-        #endif
-        if(*mutex == 0 && ngx_atomic_cmp_set(mutex, 0, ngx_pid)) {
-          return;
-        }
-      }
-    }
-    ngx_sched_yield();
-  }
-  #else
-  #if (NGX_THREADS)
-  #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !
-  #endif
-  #endif
-}
-static void rwl_unlock_mutex(ngx_rwlock_t *lock) {
-  #if (NGX_HAVE_ATOMIC_OPS)
-  ngx_atomic_cmp_set(&lock->mutex, ngx_pid, 0);
-  #else
-  #if (NGX_THREADS)
-  #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !
-  #endif
-  #endif
-}
-
-#define NGX_RWLOCK_MUTEX_COND(lock, cond, stmt)   \
-if(cond) {                                          \
-  rwl_lock_mutex(lock);                             \
-  if(cond) {                                        \
-    stmt;                                           \
-    rwl_unlock_mutex(lock);                         \
-    return;                                         \
-  }                                                 \
-  rwl_unlock_mutex(lock);                           \
-}
-
-void ngx_rwlock_reserve_read(ngx_rwlock_t *lock)
-{
-  #if (NGX_HAVE_ATOMIC_OPS)
-  ngx_uint_t i, n;
-  
-  #if (DISABLE_RWLOCK == 1)
-  rwl_lock_mutex(lock);
-  return;
-  #endif
-  
-  for(;;) {
-    NGX_RWLOCK_MUTEX_COND(lock, (lock->lock != NGX_RWLOCK_WRITE), lock->lock++)
-    #if (DEBUG_NGX_RWLOCK == 1)
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p reserve read read (%i)", lock, lock->lock);
-    #endif
-    if(ngx_ncpu > 1) {
-      for(n = 1; n < NGX_RWLOCK_SPIN; n <<= 1) {
-        for(i = 0; i < n; i++) {
-          ngx_cpu_pause();
-        }
-        #if (DEBUG_NGX_RWLOCK == 1)
-        ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p read lock wait", lock);
-        #endif
-        NGX_RWLOCK_MUTEX_COND(lock, (lock->lock != NGX_RWLOCK_WRITE), lock->lock++)
-      }
-    }
-    ngx_sched_yield();
-  }
-  #else
-  #if (NGX_THREADS)
-  #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !
-  #endif
-  #endif
-}
-void ngx_rwlock_release_read(ngx_rwlock_t *lock) {
-  #if (DISABLE_RWLOCK == 1)
-  rwl_unlock_mutex(lock);
-  #else
-  NGX_RWLOCK_MUTEX_COND(lock, lock->lock != NGX_RWLOCK_WRITE && lock->lock != 0, lock->lock--)
-  #endif
-}
-
-int ngx_rwlock_write_check(ngx_rwlock_t *lock) {
-  if(lock->lock==0) {
-    rwl_lock_mutex(lock);
-    if(lock->lock==0) {
-      lock->lock=NGX_RWLOCK_WRITE;
-      lock->write_pid=ngx_pid;
-      rwl_unlock_mutex(lock);
-      return 1;
-    }
-    rwl_unlock_mutex(lock);
-  }
-  return 0;
-}
-
-void ngx_rwlock_reserve_write(ngx_rwlock_t * lock) {
-  #if (NGX_HAVE_ATOMIC_OPS)
-  ngx_uint_t i, n;
-  
-  #if (DISABLE_RWLOCK == 1)
-  rwl_lock_mutex(lock);
-  return;
-  #endif
-  
-  for(;;) {
-    if(ngx_rwlock_write_check(lock))
-      return;
-    if(ngx_ncpu > 1) {
-      for(n = 1; n < NGX_RWLOCK_SPIN; n <<= 1) {
-        for(i = 0; i < n; i++) {
-          ngx_cpu_pause();
-        }
-        #if (DEBUG_NGX_RWLOCK == 1)
-        ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p write lock wait (reserved by %ui)", lock, lock->write_pid);
-        #endif
-        if(ngx_rwlock_write_check(lock))
-          return;
-      }
-    }
-    ngx_sched_yield();
-  }
-  #else
-  #if (NGX_THREADS)
-  #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !
-  #endif
-  #endif
-}
-
-void ngx_rwlock_release_write(ngx_rwlock_t *lock) {
-  #if (DISABLE_RWLOCK == 1)
-  rwl_unlock_mutex(lock);
-  return;
-  #endif
-  
-  if(lock->lock == NGX_RWLOCK_WRITE) {
-    rwl_lock_mutex(lock);
-    if(lock->lock == NGX_RWLOCK_WRITE) {
-      lock->lock=0;
-      if(lock->write_pid != ngx_pid) {
-        ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p releasing someone else's (pid %ui) write lock.", lock, lock->write_pid);
-      }
-      lock->write_pid = 0;
-      rwl_unlock_mutex(lock);
-      return;
-    }
-    rwl_unlock_mutex(lock);
-  }
-  else {
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p tried to release nonexistent write lock, lock=%i.", lock, lock->lock);
-  }
-}
\ No newline at end of file
diff --git a/debian/modules/nchan/src/store/ngx_rwlock.h b/debian/modules/nchan/src/store/ngx_rwlock.h
deleted file mode 100644
index be0f28b..0000000
--- a/debian/modules/nchan/src/store/ngx_rwlock.h
+++ /dev/null
@@ -1,5 +0,0 @@
-void ngx_rwlock_init(ngx_rwlock_t *lock);
-void ngx_rwlock_release_write(ngx_rwlock_t *lock);
-void ngx_rwlock_reserve_write(ngx_rwlock_t *lock);
-void ngx_rwlock_release_read(ngx_rwlock_t *lock);
-void ngx_rwlock_reserve_read(ngx_rwlock_t *lock);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/store/redis/cmp.c b/debian/modules/nchan/src/store/redis/cmp.c
deleted file mode 100644
index a75bdb1..0000000
--- a/debian/modules/nchan/src/store/redis/cmp.c
+++ /dev/null
@@ -1,3352 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2017 Charles Gunyon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#include "cmp.h"
-
-static const uint32_t version = 17;
-static const uint32_t mp_version = 5;
-
-enum {
-  POSITIVE_FIXNUM_MARKER = 0x00,
-  FIXMAP_MARKER          = 0x80,
-  FIXARRAY_MARKER        = 0x90,
-  FIXSTR_MARKER          = 0xA0,
-  NIL_MARKER             = 0xC0,
-  FALSE_MARKER           = 0xC2,
-  TRUE_MARKER            = 0xC3,
-  BIN8_MARKER            = 0xC4,
-  BIN16_MARKER           = 0xC5,
-  BIN32_MARKER           = 0xC6,
-  EXT8_MARKER            = 0xC7,
-  EXT16_MARKER           = 0xC8,
-  EXT32_MARKER           = 0xC9,
-  FLOAT_MARKER           = 0xCA,
-  DOUBLE_MARKER          = 0xCB,
-  U8_MARKER              = 0xCC,
-  U16_MARKER             = 0xCD,
-  U32_MARKER             = 0xCE,
-  U64_MARKER             = 0xCF,
-  S8_MARKER              = 0xD0,
-  S16_MARKER             = 0xD1,
-  S32_MARKER             = 0xD2,
-  S64_MARKER             = 0xD3,
-  FIXEXT1_MARKER         = 0xD4,
-  FIXEXT2_MARKER         = 0xD5,
-  FIXEXT4_MARKER         = 0xD6,
-  FIXEXT8_MARKER         = 0xD7,
-  FIXEXT16_MARKER        = 0xD8,
-  STR8_MARKER            = 0xD9,
-  STR16_MARKER           = 0xDA,
-  STR32_MARKER           = 0xDB,
-  ARRAY16_MARKER         = 0xDC,
-  ARRAY32_MARKER         = 0xDD,
-  MAP16_MARKER           = 0xDE,
-  MAP32_MARKER           = 0xDF,
-  NEGATIVE_FIXNUM_MARKER = 0xE0
-};
-
-enum {
-  FIXARRAY_SIZE = 0xF,
-  FIXMAP_SIZE   = 0xF,
-  FIXSTR_SIZE   = 0x1F
-};
-
-enum {
-  ERROR_NONE,
-  STR_DATA_LENGTH_TOO_LONG_ERROR,
-  BIN_DATA_LENGTH_TOO_LONG_ERROR,
-  ARRAY_LENGTH_TOO_LONG_ERROR,
-  MAP_LENGTH_TOO_LONG_ERROR,
-  INPUT_VALUE_TOO_LARGE_ERROR,
-  FIXED_VALUE_WRITING_ERROR,
-  TYPE_MARKER_READING_ERROR,
-  TYPE_MARKER_WRITING_ERROR,
-  DATA_READING_ERROR,
-  DATA_WRITING_ERROR,
-  EXT_TYPE_READING_ERROR,
-  EXT_TYPE_WRITING_ERROR,
-  INVALID_TYPE_ERROR,
-  LENGTH_READING_ERROR,
-  LENGTH_WRITING_ERROR,
-  SKIP_DEPTH_LIMIT_EXCEEDED_ERROR,
-  INTERNAL_ERROR,
-  ERROR_MAX
-};
-
-const char *cmp_error_messages[ERROR_MAX + 1] = {
-  "No Error",
-  "Specified string data length is too long (> 0xFFFFFFFF)",
-  "Specified binary data length is too long (> 0xFFFFFFFF)",
-  "Specified array length is too long (> 0xFFFFFFFF)",
-  "Specified map length is too long (> 0xFFFFFFFF)",
-  "Input value is too large",
-  "Error writing fixed value",
-  "Error reading type marker",
-  "Error writing type marker",
-  "Error reading packed data",
-  "Error writing packed data",
-  "Error reading ext type",
-  "Error writing ext type",
-  "Invalid type",
-  "Error reading size",
-  "Error writing size",
-  "Depth limit exceeded while skipping",
-  "Internal error",
-  "Max Error"
-};
-
-static const int32_t _i = 1;
-#define is_bigendian() ((*(char *)&_i) == 0)
-
-static uint16_t be16(uint16_t x) {
-  char *b = (char *)&x;
-
-  if (!is_bigendian()) {
-    char swap = 0;
-
-    swap = b[0];
-    b[0] = b[1];
-    b[1] = swap;
-  }
-
-  return x;
-}
-
-static uint32_t be32(uint32_t x) {
-  char *b = (char *)&x;
-
-  if (!is_bigendian()) {
-    char swap = 0;
-
-    swap = b[0];
-    b[0] = b[3];
-    b[3] = swap;
-
-    swap = b[1];
-    b[1] = b[2];
-    b[2] = swap;
-  }
-
-  return x;
-}
-
-static uint64_t be64(uint64_t x) {
-  char *b = (char *)&x;
-
-  if (!is_bigendian()) {
-    char swap = 0;
-
-    swap = b[0];
-    b[0] = b[7];
-    b[7] = swap;
-
-    swap = b[1];
-    b[1] = b[6];
-    b[6] = swap;
-
-    swap = b[2];
-    b[2] = b[5];
-    b[5] = swap;
-
-    swap = b[3];
-    b[3] = b[4];
-    b[4] = swap;
-  }
-
-  return x;
-}
-
-static float decode_befloat(char *b) {
-  float f = 0.;
-  char *fb = (char *)&f;
-
-  if (!is_bigendian()) {
-    fb[0] = b[3];
-    fb[1] = b[2];
-    fb[2] = b[1];
-    fb[3] = b[0];
-  }
-
-  return f;
-}
-
-static double decode_bedouble(char *b) {
-  double d = 0.;
-  char *db = (char *)&d;
-
-  if (!is_bigendian()) {
-    db[0] = b[7];
-    db[1] = b[6];
-    db[2] = b[5];
-    db[3] = b[4];
-    db[4] = b[3];
-    db[5] = b[2];
-    db[6] = b[1];
-    db[7] = b[0];
-  }
-
-  return d;
-}
-
-static bool read_byte(cmp_ctx_t *ctx, uint8_t *x) {
-  return ctx->read(ctx, x, sizeof(uint8_t));
-}
-
-static bool write_byte(cmp_ctx_t *ctx, uint8_t x) {
-  return (ctx->write(ctx, &x, sizeof(uint8_t)) == (sizeof(uint8_t)));
-}
-
-static bool skip_bytes(cmp_ctx_t *ctx, size_t count) {
-  if (ctx->skip) {
-    return ctx->skip(ctx, count);
-  }
-  else {
-    uint8_t floor;
-    size_t i;
-
-    for (i = 0; i < count; i++) {
-      if (!ctx->read(ctx, &floor, sizeof(uint8_t))) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-}
-
-static bool read_type_marker(cmp_ctx_t *ctx, uint8_t *marker) {
-  if (read_byte(ctx, marker)) {
-    return true;
-  }
-
-  ctx->error = TYPE_MARKER_READING_ERROR;
-  return false;
-}
-
-static bool write_type_marker(cmp_ctx_t *ctx, uint8_t marker) {
-  if (write_byte(ctx, marker))
-    return true;
-
-  ctx->error = TYPE_MARKER_WRITING_ERROR;
-  return false;
-}
-
-static bool write_fixed_value(cmp_ctx_t *ctx, uint8_t value) {
-  if (write_byte(ctx, value))
-    return true;
-
-  ctx->error = FIXED_VALUE_WRITING_ERROR;
-  return false;
-}
-
-static bool type_marker_to_cmp_type(uint8_t type_marker, uint8_t *cmp_type) {
-  if (type_marker <= 0x7F) {
-    *cmp_type = CMP_TYPE_POSITIVE_FIXNUM;
-    return true;
-  }
-
-  if (type_marker <= 0x8F) {
-    *cmp_type = CMP_TYPE_FIXMAP;
-    return true;
-  }
-
-  if (type_marker <= 0x9F) {
-    *cmp_type = CMP_TYPE_FIXARRAY;
-    return true;
-  }
-
-  if (type_marker <= 0xBF) {
-    *cmp_type = CMP_TYPE_FIXSTR;
-    return true;
-  }
-
-  if (type_marker >= 0xE0) {
-    *cmp_type = CMP_TYPE_NEGATIVE_FIXNUM;
-    return true;
-  }
-
-  switch (type_marker) {
-    case NIL_MARKER:
-      *cmp_type = CMP_TYPE_NIL;
-      return true;
-    case FALSE_MARKER:
-      *cmp_type = CMP_TYPE_BOOLEAN;
-      return true;
-    case TRUE_MARKER:
-      *cmp_type = CMP_TYPE_BOOLEAN;
-      return true;
-    case BIN8_MARKER:
-      *cmp_type = CMP_TYPE_BIN8;
-      return true;
-    case BIN16_MARKER:
-      *cmp_type = CMP_TYPE_BIN16;
-      return true;
-    case BIN32_MARKER:
-      *cmp_type = CMP_TYPE_BIN32;
-      return true;
-    case EXT8_MARKER:
-      *cmp_type = CMP_TYPE_EXT8;
-      return true;
-    case EXT16_MARKER:
-      *cmp_type = CMP_TYPE_EXT16;
-      return true;
-    case EXT32_MARKER:
-      *cmp_type = CMP_TYPE_EXT32;
-      return true;
-    case FLOAT_MARKER:
-      *cmp_type = CMP_TYPE_FLOAT;
-      return true;
-    case DOUBLE_MARKER:
-      *cmp_type = CMP_TYPE_DOUBLE;
-      return true;
-    case U8_MARKER:
-      *cmp_type = CMP_TYPE_UINT8;
-      return true;
-    case U16_MARKER:
-      *cmp_type = CMP_TYPE_UINT16;
-      return true;
-    case U32_MARKER:
-      *cmp_type = CMP_TYPE_UINT32;
-      return true;
-    case U64_MARKER:
-      *cmp_type = CMP_TYPE_UINT64;
-      return true;
-    case S8_MARKER:
-      *cmp_type = CMP_TYPE_SINT8;
-      return true;
-    case S16_MARKER:
-      *cmp_type = CMP_TYPE_SINT16;
-      return true;
-    case S32_MARKER:
-      *cmp_type = CMP_TYPE_SINT32;
-      return true;
-    case S64_MARKER:
-      *cmp_type = CMP_TYPE_SINT64;
-      return true;
-    case FIXEXT1_MARKER:
-      *cmp_type = CMP_TYPE_FIXEXT1;
-      return true;
-    case FIXEXT2_MARKER:
-      *cmp_type = CMP_TYPE_FIXEXT2;
-      return true;
-    case FIXEXT4_MARKER:
-      *cmp_type = CMP_TYPE_FIXEXT4;
-      return true;
-    case FIXEXT8_MARKER:
-      *cmp_type = CMP_TYPE_FIXEXT8;
-      return true;
-    case FIXEXT16_MARKER:
-      *cmp_type = CMP_TYPE_FIXEXT16;
-      return true;
-    case STR8_MARKER:
-      *cmp_type = CMP_TYPE_STR8;
-      return true;
-    case STR16_MARKER:
-      *cmp_type = CMP_TYPE_STR16;
-      return true;
-    case STR32_MARKER:
-      *cmp_type = CMP_TYPE_STR32;
-      return true;
-    case ARRAY16_MARKER:
-      *cmp_type = CMP_TYPE_ARRAY16;
-      return true;
-    case ARRAY32_MARKER:
-      *cmp_type = CMP_TYPE_ARRAY32;
-      return true;
-    case MAP16_MARKER:
-      *cmp_type = CMP_TYPE_MAP16;
-      return true;
-    case MAP32_MARKER:
-      *cmp_type = CMP_TYPE_MAP32;
-      return true;
-    default:
-      return false;
-  }
-}
-
-static bool read_type_size(cmp_ctx_t *ctx, uint8_t type_marker,
-                                           uint8_t cmp_type,
-                                           uint32_t *size) {
-  uint8_t u8temp = 0;
-  uint16_t u16temp = 0;
-  uint32_t u32temp = 0;
-
-  switch (cmp_type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-      *size = 0;
-      return true;
-    case CMP_TYPE_FIXMAP:
-      *size = (type_marker & FIXMAP_SIZE);
-      return true;
-    case CMP_TYPE_FIXARRAY:
-      *size = (type_marker & FIXARRAY_SIZE);
-      return true;
-    case CMP_TYPE_FIXSTR:
-      *size = (type_marker & FIXSTR_SIZE);
-      return true;
-    case CMP_TYPE_NIL:
-      *size = 0;
-      return true;
-    case CMP_TYPE_BOOLEAN:
-      *size = 0;
-      return true;
-    case CMP_TYPE_BIN8:
-      if (!ctx->read(ctx, &u8temp, sizeof(uint8_t))) {
-        ctx->error = LENGTH_READING_ERROR;
-        return false;
-      }
-      *size = u8temp;
-      return true;
-    case CMP_TYPE_BIN16:
-      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
-        ctx->error = LENGTH_READING_ERROR;
-        return false;
-      }
-      *size = be16(u16temp);
-      return true;
-    case CMP_TYPE_BIN32:
-      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
-        ctx->error = LENGTH_READING_ERROR;
-        return false;
-      }
-      *size = be32(u32temp);
-      return true;
-    case CMP_TYPE_EXT8:
-      if (!ctx->read(ctx, &u8temp, sizeof(uint8_t))) {
-        ctx->error = LENGTH_READING_ERROR;
-        return false;
-      }
-      *size = u8temp;
-      return true;
-    case CMP_TYPE_EXT16:
-      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
-        ctx->error = LENGTH_READING_ERROR;
-        return false;
-      }
-      *size = be16(u16temp);
-      return true;
-    case CMP_TYPE_EXT32:
-      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
-        ctx->error = LENGTH_READING_ERROR;
-        return false;
-      }
-      *size = be32(u32temp);
-      return true;
-    case CMP_TYPE_FLOAT:
-      *size = 4;
-      return true;
-    case CMP_TYPE_DOUBLE:
-      *size = 8;
-      return true;
-    case CMP_TYPE_UINT8:
-      *size = 1;
-      return true;
-    case CMP_TYPE_UINT16:
-      *size = 2;
-      return true;
-    case CMP_TYPE_UINT32:
-      *size = 4;
-      return true;
-    case CMP_TYPE_UINT64:
-      *size = 8;
-      return true;
-    case CMP_TYPE_SINT8:
-      *size = 1;
-      return true;
-    case CMP_TYPE_SINT16:
-      *size = 2;
-      return true;
-    case CMP_TYPE_SINT32:
-      *size = 4;
-      return true;
-    case CMP_TYPE_SINT64:
-      *size = 8;
-      return true;
-    case CMP_TYPE_FIXEXT1:
-      *size = 1;
-      return true;
-    case CMP_TYPE_FIXEXT2:
-      *size = 2;
-      return true;
-    case CMP_TYPE_FIXEXT4:
-      *size = 4;
-      return true;
-    case CMP_TYPE_FIXEXT8:
-      *size = 8;
-      return true;
-    case CMP_TYPE_FIXEXT16:
-      *size = 16;
-      return true;
-    case CMP_TYPE_STR8:
-      if (!ctx->read(ctx, &u8temp, sizeof(uint8_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      *size = u8temp;
-      return true;
-    case CMP_TYPE_STR16:
-      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      *size = be16(u16temp);
-      return true;
-    case CMP_TYPE_STR32:
-      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      *size = be32(u32temp);
-      return true;
-    case CMP_TYPE_ARRAY16:
-      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      *size = be16(u16temp);
-      return true;
-    case CMP_TYPE_ARRAY32:
-      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      *size = be32(u32temp);
-      return true;
-    case CMP_TYPE_MAP16:
-      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      *size = be16(u16temp);
-      return true;
-    case CMP_TYPE_MAP32:
-      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      *size = be32(u32temp);
-      return true;
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-      *size = 0;
-      return true;
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-static bool read_obj_data(cmp_ctx_t *ctx, uint8_t type_marker,
-                                          cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-      obj->as.u8 = type_marker;
-      return true;
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-      obj->as.s8 = type_marker;
-      return true;
-    case CMP_TYPE_NIL:
-      obj->as.u8 = 0;
-      return true;
-    case CMP_TYPE_BOOLEAN:
-      switch (type_marker) {
-        case TRUE_MARKER:
-          obj->as.boolean = true;
-          return true;
-        case FALSE_MARKER:
-          obj->as.boolean = false;
-          return true;
-        default:
-          break;
-      }
-      ctx->error = INTERNAL_ERROR;
-      return false;
-    case CMP_TYPE_UINT8:
-      if (!ctx->read(ctx, &obj->as.u8, sizeof(uint8_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      return true;
-    case CMP_TYPE_UINT16:
-      if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      obj->as.u16 = be16(obj->as.u16);
-      return true;
-    case CMP_TYPE_UINT32:
-      if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      obj->as.u32 = be32(obj->as.u32);
-      return true;
-    case CMP_TYPE_UINT64:
-      if (!ctx->read(ctx, &obj->as.u64, sizeof(uint64_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      obj->as.u64 = be64(obj->as.u64);
-      return true;
-    case CMP_TYPE_SINT8:
-      if (!ctx->read(ctx, &obj->as.s8, sizeof(int8_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      return true;
-    case CMP_TYPE_SINT16:
-      if (!ctx->read(ctx, &obj->as.s16, sizeof(int16_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      obj->as.s16 = be16(obj->as.s16);
-      return true;
-    case CMP_TYPE_SINT32:
-      if (!ctx->read(ctx, &obj->as.s32, sizeof(int32_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      obj->as.s32 = be32(obj->as.s32);
-      return true;
-    case CMP_TYPE_SINT64:
-      if (!ctx->read(ctx, &obj->as.s64, sizeof(int64_t))) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      obj->as.s64 = be64(obj->as.s64);
-      return true;
-    case CMP_TYPE_FLOAT:
-    {
-      char bytes[4];
-
-      if (!ctx->read(ctx, bytes, 4)) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      obj->as.flt = decode_befloat(bytes);
-      return true;
-    }
-    case CMP_TYPE_DOUBLE:
-    {
-      char bytes[8];
-
-      if (!ctx->read(ctx, bytes, 8)) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      obj->as.dbl = decode_bedouble(bytes);
-      return true;
-    }
-    case CMP_TYPE_BIN8:
-    case CMP_TYPE_BIN16:
-    case CMP_TYPE_BIN32:
-      return read_type_size(ctx, type_marker, obj->type, &obj->as.bin_size);
-    case CMP_TYPE_FIXSTR:
-    case CMP_TYPE_STR8:
-    case CMP_TYPE_STR16:
-    case CMP_TYPE_STR32:
-      return read_type_size(ctx, type_marker, obj->type, &obj->as.str_size);
-    case CMP_TYPE_FIXARRAY:
-    case CMP_TYPE_ARRAY16:
-    case CMP_TYPE_ARRAY32:
-      return read_type_size(ctx, type_marker, obj->type, &obj->as.array_size);
-    case CMP_TYPE_FIXMAP:
-    case CMP_TYPE_MAP16:
-    case CMP_TYPE_MAP32:
-      return read_type_size(ctx, type_marker, obj->type, &obj->as.map_size);
-    case CMP_TYPE_FIXEXT1:
-      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-        ctx->error = EXT_TYPE_READING_ERROR;
-        return false;
-      }
-      obj->as.ext.size = 1;
-      return true;
-    case CMP_TYPE_FIXEXT2:
-      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-        ctx->error = EXT_TYPE_READING_ERROR;
-        return false;
-      }
-      obj->as.ext.size = 2;
-      return true;
-    case CMP_TYPE_FIXEXT4:
-      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-        ctx->error = EXT_TYPE_READING_ERROR;
-        return false;
-      }
-      obj->as.ext.size = 4;
-      return true;
-    case CMP_TYPE_FIXEXT8:
-      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-        ctx->error = EXT_TYPE_READING_ERROR;
-        return false;
-      }
-      obj->as.ext.size = 8;
-      return true;
-    case CMP_TYPE_FIXEXT16:
-      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-        ctx->error = EXT_TYPE_READING_ERROR;
-        return false;
-      }
-      obj->as.ext.size = 16;
-      return true;
-    case CMP_TYPE_EXT8:
-      if (!read_type_size(ctx, type_marker, obj->type, &obj->as.ext.size)) {
-        return false;
-      }
-      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-        ctx->error = EXT_TYPE_READING_ERROR;
-        return false;
-      }
-      return true;
-    case CMP_TYPE_EXT16:
-      if (!read_type_size(ctx, type_marker, obj->type, &obj->as.ext.size)) {
-        return false;
-      }
-      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-        ctx->error = EXT_TYPE_READING_ERROR;
-        return false;
-      }
-      obj->as.ext.type = obj->as.ext.type;
-      return true;
-    case CMP_TYPE_EXT32:
-      if (!read_type_size(ctx, type_marker, obj->type, &obj->as.ext.size)) {
-        return false;
-      }
-      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
-        ctx->error = EXT_TYPE_READING_ERROR;
-        return false;
-      }
-      obj->as.ext.type = obj->as.ext.type;
-      return true;
-    default:
-      break;
-  }
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read,
-                                         cmp_skipper skip,
-                                         cmp_writer write) {
-  ctx->error = ERROR_NONE;
-  ctx->buf = buf;
-  ctx->read = read;
-  ctx->skip = skip;
-  ctx->write = write;
-}
-
-uint32_t cmp_version(void) {
-  return version;
-}
-
-uint32_t cmp_mp_version(void) {
-  return mp_version;
-}
-
-const char* cmp_strerror(cmp_ctx_t *ctx) {
-  if (ctx->error > ERROR_NONE && ctx->error < ERROR_MAX)
-    return cmp_error_messages[ctx->error];
-
-  return "";
-}
-
-bool cmp_write_pfix(cmp_ctx_t *ctx, uint8_t c) {
-  if (c <= 0x7F)
-    return write_fixed_value(ctx, c);
-
-  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
-  return false;
-}
-
-bool cmp_write_nfix(cmp_ctx_t *ctx, int8_t c) {
-  if (c >= -32 && c <= -1)
-    return write_fixed_value(ctx, c);
-
-  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
-  return false;
-}
-
-bool cmp_write_sfix(cmp_ctx_t *ctx, int8_t c) {
-  if (c >= 0)
-    return cmp_write_pfix(ctx, c);
-  if (c >= -32 && c <= -1)
-    return cmp_write_nfix(ctx, c);
-
-  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
-  return false;
-}
-
-bool cmp_write_s8(cmp_ctx_t *ctx, int8_t c) {
-  if (!write_type_marker(ctx, S8_MARKER))
-    return false;
-
-  return ctx->write(ctx, &c, sizeof(int8_t));
-}
-
-bool cmp_write_s16(cmp_ctx_t *ctx, int16_t s) {
-  if (!write_type_marker(ctx, S16_MARKER))
-    return false;
-
-  s = be16(s);
-
-  return ctx->write(ctx, &s, sizeof(int16_t));
-}
-
-bool cmp_write_s32(cmp_ctx_t *ctx, int32_t i) {
-  if (!write_type_marker(ctx, S32_MARKER))
-    return false;
-
-  i = be32(i);
-
-  return ctx->write(ctx, &i, sizeof(int32_t));
-}
-
-bool cmp_write_s64(cmp_ctx_t *ctx, int64_t l) {
-  if (!write_type_marker(ctx, S64_MARKER))
-    return false;
-
-  l = be64(l);
-
-  return ctx->write(ctx, &l, sizeof(int64_t));
-}
-
-bool cmp_write_integer(cmp_ctx_t *ctx, int64_t d) {
-  if (d >= 0)
-    return cmp_write_uinteger(ctx, d);
-  if (d >= -32)
-    return cmp_write_nfix(ctx, (int8_t)d);
-  if (d >= -128)
-    return cmp_write_s8(ctx, (int8_t)d);
-  if (d >= -32768)
-    return cmp_write_s16(ctx, (int16_t)d);
-  if (d >= (-2147483647 - 1))
-    return cmp_write_s32(ctx, (int32_t)d);
-
-  return cmp_write_s64(ctx, d);
-}
-
-bool cmp_write_ufix(cmp_ctx_t *ctx, uint8_t c) {
-  return cmp_write_pfix(ctx, c);
-}
-
-bool cmp_write_u8(cmp_ctx_t *ctx, uint8_t c) {
-  if (!write_type_marker(ctx, U8_MARKER))
-    return false;
-
-  return ctx->write(ctx, &c, sizeof(uint8_t));
-}
-
-bool cmp_write_u16(cmp_ctx_t *ctx, uint16_t s) {
-  if (!write_type_marker(ctx, U16_MARKER))
-    return false;
-
-  s = be16(s);
-
-  return ctx->write(ctx, &s, sizeof(uint16_t));
-}
-
-bool cmp_write_u32(cmp_ctx_t *ctx, uint32_t i) {
-  if (!write_type_marker(ctx, U32_MARKER))
-    return false;
-
-  i = be32(i);
-
-  return ctx->write(ctx, &i, sizeof(uint32_t));
-}
-
-bool cmp_write_u64(cmp_ctx_t *ctx, uint64_t l) {
-  if (!write_type_marker(ctx, U64_MARKER))
-    return false;
-
-  l = be64(l);
-
-  return ctx->write(ctx, &l, sizeof(uint64_t));
-}
-
-bool cmp_write_uinteger(cmp_ctx_t *ctx, uint64_t u) {
-  if (u <= 0x7F)
-    return cmp_write_pfix(ctx, (uint8_t)u);
-  if (u <= 0xFF)
-    return cmp_write_u8(ctx, (uint8_t)u);
-  if (u <= 0xFFFF)
-    return cmp_write_u16(ctx, (uint16_t)u);
-  if (u <= 0xFFFFFFFF)
-    return cmp_write_u32(ctx, (uint32_t)u);
-
-  return cmp_write_u64(ctx, u);
-}
-
-bool cmp_write_float(cmp_ctx_t *ctx, float f) {
-  if (!write_type_marker(ctx, FLOAT_MARKER))
-    return false;
-
-  /*
-   * We may need to swap the float's bytes, but we can't just swap them inside
-   * the float because the swapped bytes may not constitute a valid float.
-   * Therefore, we have to create a buffer and swap the bytes there.
-   */
-  if (!is_bigendian()) {
-    char swapped[sizeof(float)];
-    char *fbuf = (char *)&f;
-    size_t i;
-
-    for (i = 0; i < sizeof(float); i++)
-      swapped[i] = fbuf[sizeof(float) - i - 1];
-
-    return ctx->write(ctx, swapped, sizeof(float));
-  }
-
-  return ctx->write(ctx, &f, sizeof(float));
-}
-
-bool cmp_write_double(cmp_ctx_t *ctx, double d) {
-  if (!write_type_marker(ctx, DOUBLE_MARKER))
-    return false;
-
-  /* Same deal for doubles */
-  if (!is_bigendian()) {
-    char swapped[sizeof(double)];
-    char *dbuf = (char *)&d;
-    size_t i;
-
-    for (i = 0; i < sizeof(double); i++)
-      swapped[i] = dbuf[sizeof(double) - i - 1];
-
-    return ctx->write(ctx, swapped, sizeof(double));
-  }
-
-  return ctx->write(ctx, &d, sizeof(double));
-}
-
-bool cmp_write_decimal(cmp_ctx_t *ctx, double d) {
-  float f = (float)d;
-  double df = (double)f;
-
-  if (df == d)
-    return cmp_write_float(ctx, f);
-  else
-    return cmp_write_double(ctx, d);
-}
-
-bool cmp_write_nil(cmp_ctx_t *ctx) {
-  return write_type_marker(ctx, NIL_MARKER);
-}
-
-bool cmp_write_true(cmp_ctx_t *ctx) {
-  return write_type_marker(ctx, TRUE_MARKER);
-}
-
-bool cmp_write_false(cmp_ctx_t *ctx) {
-  return write_type_marker(ctx, FALSE_MARKER);
-}
-
-bool cmp_write_bool(cmp_ctx_t *ctx, bool b) {
-  if (b)
-    return cmp_write_true(ctx);
-
-  return cmp_write_false(ctx);
-}
-
-bool cmp_write_u8_as_bool(cmp_ctx_t *ctx, uint8_t b) {
-  if (b)
-    return cmp_write_true(ctx);
-
-  return cmp_write_false(ctx);
-}
-
-bool cmp_write_fixstr_marker(cmp_ctx_t *ctx, uint8_t size) {
-  if (size <= FIXSTR_SIZE)
-    return write_fixed_value(ctx, FIXSTR_MARKER | size);
-
-  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
-  return false;
-}
-
-bool cmp_write_fixstr(cmp_ctx_t *ctx, const char *data, uint8_t size) {
-  if (!cmp_write_fixstr_marker(ctx, size))
-    return false;
-
-  if (size == 0)
-    return true;
-
-  if (ctx->write(ctx, data, size))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_str8_marker(cmp_ctx_t *ctx, uint8_t size) {
-  if (!write_type_marker(ctx, STR8_MARKER))
-    return false;
-
-  if (ctx->write(ctx, &size, sizeof(uint8_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_str8(cmp_ctx_t *ctx, const char *data, uint8_t size) {
-  if (!cmp_write_str8_marker(ctx, size))
-    return false;
-
-  if (size == 0)
-    return true;
-
-  if (ctx->write(ctx, data, size))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_str16_marker(cmp_ctx_t *ctx, uint16_t size) {
-  if (!write_type_marker(ctx, STR16_MARKER))
-    return false;
-
-  size = be16(size);
-
-  if (ctx->write(ctx, &size, sizeof(uint16_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_str16(cmp_ctx_t *ctx, const char *data, uint16_t size) {
-  if (!cmp_write_str16_marker(ctx, size))
-    return false;
-
-  if (size == 0)
-    return true;
-
-  if (ctx->write(ctx, data, size))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_str32_marker(cmp_ctx_t *ctx, uint32_t size) {
-  if (!write_type_marker(ctx, STR32_MARKER))
-    return false;
-
-  size = be32(size);
-
-  if (ctx->write(ctx, &size, sizeof(uint32_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_str32(cmp_ctx_t *ctx, const char *data, uint32_t size) {
-  if (!cmp_write_str32_marker(ctx, size))
-    return false;
-
-  if (size == 0)
-    return true;
-
-  if (ctx->write(ctx, data, size))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_str_marker(cmp_ctx_t *ctx, uint32_t size) {
-  if (size <= FIXSTR_SIZE)
-    return cmp_write_fixstr_marker(ctx, (uint8_t)size);
-  if (size <= 0xFF)
-    return cmp_write_str8_marker(ctx, (uint8_t)size);
-  if (size <= 0xFFFF)
-    return cmp_write_str16_marker(ctx, (uint16_t)size);
-
-  return cmp_write_str32_marker(ctx, size);
-}
-
-bool cmp_write_str_marker_v4(cmp_ctx_t *ctx, uint32_t size) {
-  if (size <= FIXSTR_SIZE)
-    return cmp_write_fixstr_marker(ctx, (uint8_t)size);
-  if (size <= 0xFFFF)
-    return cmp_write_str16_marker(ctx, (uint16_t)size);
-
-  return cmp_write_str32_marker(ctx, size);
-}
-
-bool cmp_write_str(cmp_ctx_t *ctx, const char *data, uint32_t size) {
-  if (size <= FIXSTR_SIZE)
-    return cmp_write_fixstr(ctx, data, (uint8_t)size);
-  if (size <= 0xFF)
-    return cmp_write_str8(ctx, data, (uint8_t)size);
-  if (size <= 0xFFFF)
-    return cmp_write_str16(ctx, data, (uint16_t)size);
-
-  return cmp_write_str32(ctx, data, size);
-}
-
-bool cmp_write_str_v4(cmp_ctx_t *ctx, const char *data, uint32_t size) {
-  if (size <= FIXSTR_SIZE)
-    return cmp_write_fixstr(ctx, data, (uint8_t)size);
-  if (size <= 0xFFFF)
-    return cmp_write_str16(ctx, data, (uint16_t)size);
-
-  return cmp_write_str32(ctx, data, size);
-}
-
-bool cmp_write_bin8_marker(cmp_ctx_t *ctx, uint8_t size) {
-  if (!write_type_marker(ctx, BIN8_MARKER))
-    return false;
-
-  if (ctx->write(ctx, &size, sizeof(uint8_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_bin8(cmp_ctx_t *ctx, const void *data, uint8_t size) {
-  if (!cmp_write_bin8_marker(ctx, size))
-    return false;
-
-  if (size == 0)
-    return true;
-
-  if (ctx->write(ctx, data, size))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_bin16_marker(cmp_ctx_t *ctx, uint16_t size) {
-  if (!write_type_marker(ctx, BIN16_MARKER))
-    return false;
-
-  size = be16(size);
-
-  if (ctx->write(ctx, &size, sizeof(uint16_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_bin16(cmp_ctx_t *ctx, const void *data, uint16_t size) {
-  if (!cmp_write_bin16_marker(ctx, size))
-    return false;
-
-  if (size == 0)
-    return true;
-
-  if (ctx->write(ctx, data, size))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_bin32_marker(cmp_ctx_t *ctx, uint32_t size) {
-  if (!write_type_marker(ctx, BIN32_MARKER))
-    return false;
-
-  size = be32(size);
-
-  if (ctx->write(ctx, &size, sizeof(uint32_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_bin32(cmp_ctx_t *ctx, const void *data, uint32_t size) {
-  if (!cmp_write_bin32_marker(ctx, size))
-    return false;
-
-  if (size == 0)
-    return true;
-
-  if (ctx->write(ctx, data, size))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_bin_marker(cmp_ctx_t *ctx, uint32_t size) {
-  if (size <= 0xFF)
-    return cmp_write_bin8_marker(ctx, (uint8_t)size);
-  if (size <= 0xFFFF)
-    return cmp_write_bin16_marker(ctx, (uint16_t)size);
-
-  return cmp_write_bin32_marker(ctx, size);
-}
-
-bool cmp_write_bin(cmp_ctx_t *ctx, const void *data, uint32_t size) {
-  if (size <= 0xFF)
-    return cmp_write_bin8(ctx, data, (uint8_t)size);
-  if (size <= 0xFFFF)
-    return cmp_write_bin16(ctx, data, (uint16_t)size);
-
-  return cmp_write_bin32(ctx, data, size);
-}
-
-bool cmp_write_fixarray(cmp_ctx_t *ctx, uint8_t size) {
-  if (size <= FIXARRAY_SIZE)
-    return write_fixed_value(ctx, FIXARRAY_MARKER | size);
-
-  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
-  return false;
-}
-
-bool cmp_write_array16(cmp_ctx_t *ctx, uint16_t size) {
-  if (!write_type_marker(ctx, ARRAY16_MARKER))
-    return false;
-
-  size = be16(size);
-
-  if (ctx->write(ctx, &size, sizeof(uint16_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_array32(cmp_ctx_t *ctx, uint32_t size) {
-  if (!write_type_marker(ctx, ARRAY32_MARKER))
-    return false;
-
-  size = be32(size);
-
-  if (ctx->write(ctx, &size, sizeof(uint32_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_array(cmp_ctx_t *ctx, uint32_t size) {
-  if (size <= FIXARRAY_SIZE)
-    return cmp_write_fixarray(ctx, (uint8_t)size);
-  if (size <= 0xFFFF)
-    return cmp_write_array16(ctx, (uint16_t)size);
-
-  return cmp_write_array32(ctx, size);
-}
-
-bool cmp_write_fixmap(cmp_ctx_t *ctx, uint8_t size) {
-  if (size <= FIXMAP_SIZE)
-    return write_fixed_value(ctx, FIXMAP_MARKER | size);
-
-  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
-  return false;
-}
-
-bool cmp_write_map16(cmp_ctx_t *ctx, uint16_t size) {
-  if (!write_type_marker(ctx, MAP16_MARKER))
-    return false;
-
-  size = be16(size);
-
-  if (ctx->write(ctx, &size, sizeof(uint16_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_map32(cmp_ctx_t *ctx, uint32_t size) {
-  if (!write_type_marker(ctx, MAP32_MARKER))
-    return false;
-
-  size = be32(size);
-
-  if (ctx->write(ctx, &size, sizeof(uint32_t)))
-    return true;
-
-  ctx->error = LENGTH_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_map(cmp_ctx_t *ctx, uint32_t size) {
-  if (size <= FIXMAP_SIZE)
-    return cmp_write_fixmap(ctx, (uint8_t)size);
-  if (size <= 0xFFFF)
-    return cmp_write_map16(ctx, (uint16_t)size);
-
-  return cmp_write_map32(ctx, size);
-}
-
-bool cmp_write_fixext1_marker(cmp_ctx_t *ctx, int8_t type) {
-  if (!write_type_marker(ctx, FIXEXT1_MARKER))
-    return false;
-
-  if (ctx->write(ctx, &type, sizeof(int8_t)))
-    return true;
-
-  ctx->error = EXT_TYPE_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_fixext1(cmp_ctx_t *ctx, int8_t type, const void *data) {
-  if (!cmp_write_fixext1_marker(ctx, type))
-    return false;
-
-  if (ctx->write(ctx, data, 1))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_fixext2_marker(cmp_ctx_t *ctx, int8_t type) {
-  if (!write_type_marker(ctx, FIXEXT2_MARKER))
-    return false;
-
-  if (ctx->write(ctx, &type, sizeof(int8_t)))
-    return true;
-
-  ctx->error = EXT_TYPE_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_fixext2(cmp_ctx_t *ctx, int8_t type, const void *data) {
-  if (!cmp_write_fixext2_marker(ctx, type))
-    return false;
-
-  if (ctx->write(ctx, data, 2))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_fixext4_marker(cmp_ctx_t *ctx, int8_t type) {
-  if (!write_type_marker(ctx, FIXEXT4_MARKER))
-    return false;
-
-  if (ctx->write(ctx, &type, sizeof(int8_t)))
-    return true;
-
-  ctx->error = EXT_TYPE_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_fixext4(cmp_ctx_t *ctx, int8_t type, const void *data) {
-  if (!cmp_write_fixext4_marker(ctx, type))
-    return false;
-
-  if (ctx->write(ctx, data, 4))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_fixext8_marker(cmp_ctx_t *ctx, int8_t type) {
-  if (!write_type_marker(ctx, FIXEXT8_MARKER))
-    return false;
-
-  if (ctx->write(ctx, &type, sizeof(int8_t)))
-    return true;
-
-  ctx->error = EXT_TYPE_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_fixext8(cmp_ctx_t *ctx, int8_t type, const void *data) {
-  if (!cmp_write_fixext8_marker(ctx, type))
-    return false;
-
-  if (ctx->write(ctx, data, 8))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_fixext16_marker(cmp_ctx_t *ctx, int8_t type) {
-  if (!write_type_marker(ctx, FIXEXT16_MARKER))
-    return false;
-
-  if (ctx->write(ctx, &type, sizeof(int8_t)))
-    return true;
-
-  ctx->error = EXT_TYPE_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_fixext16(cmp_ctx_t *ctx, int8_t type, const void *data) {
-  if (!cmp_write_fixext16_marker(ctx, type))
-    return false;
-
-  if (ctx->write(ctx, data, 16))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_ext8_marker(cmp_ctx_t *ctx, int8_t type, uint8_t size) {
-  if (!write_type_marker(ctx, EXT8_MARKER))
-    return false;
-
-  if (!ctx->write(ctx, &size, sizeof(uint8_t))) {
-    ctx->error = LENGTH_WRITING_ERROR;
-    return false;
-  }
-
-  if (ctx->write(ctx, &type, sizeof(int8_t)))
-    return true;
-
-  ctx->error = EXT_TYPE_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_ext8(cmp_ctx_t *ctx, int8_t tp, uint8_t sz, const void *data) {
-  if (!cmp_write_ext8_marker(ctx, tp, sz))
-    return false;
-
-  if (ctx->write(ctx, data, sz))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_ext16_marker(cmp_ctx_t *ctx, int8_t type, uint16_t size) {
-  if (!write_type_marker(ctx, EXT16_MARKER))
-    return false;
-
-  size = be16(size);
-
-  if (!ctx->write(ctx, &size, sizeof(uint16_t))) {
-    ctx->error = LENGTH_WRITING_ERROR;
-    return false;
-  }
-
-  if (ctx->write(ctx, &type, sizeof(int8_t)))
-    return true;
-
-  ctx->error = EXT_TYPE_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_ext16(cmp_ctx_t *ctx, int8_t tp, uint16_t sz, const void *data) {
-  if (!cmp_write_ext16_marker(ctx, tp, sz))
-    return false;
-
-  if (ctx->write(ctx, data, sz))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_ext32_marker(cmp_ctx_t *ctx, int8_t type, uint32_t size) {
-  if (!write_type_marker(ctx, EXT32_MARKER))
-    return false;
-
-  size = be32(size);
-
-  if (!ctx->write(ctx, &size, sizeof(uint32_t))) {
-    ctx->error = LENGTH_WRITING_ERROR;
-    return false;
-  }
-
-  if (ctx->write(ctx, &type, sizeof(int8_t)))
-    return true;
-
-  ctx->error = EXT_TYPE_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_ext32(cmp_ctx_t *ctx, int8_t tp, uint32_t sz, const void *data) {
-  if (!cmp_write_ext32_marker(ctx, tp, sz))
-    return false;
-
-  if (ctx->write(ctx, data, sz))
-    return true;
-
-  ctx->error = DATA_WRITING_ERROR;
-  return false;
-}
-
-bool cmp_write_ext_marker(cmp_ctx_t *ctx, int8_t tp, uint32_t sz) {
-  if (sz == 1)
-    return cmp_write_fixext1_marker(ctx, tp);
-  if (sz == 2)
-    return cmp_write_fixext2_marker(ctx, tp);
-  if (sz == 4)
-    return cmp_write_fixext4_marker(ctx, tp);
-  if (sz == 8)
-    return cmp_write_fixext8_marker(ctx, tp);
-  if (sz == 16)
-    return cmp_write_fixext16_marker(ctx, tp);
-  if (sz <= 0xFF)
-    return cmp_write_ext8_marker(ctx, tp, (uint8_t)sz);
-  if (sz <= 0xFFFF)
-    return cmp_write_ext16_marker(ctx, tp, (uint16_t)sz);
-
-  return cmp_write_ext32_marker(ctx, tp, sz);
-}
-
-bool cmp_write_ext(cmp_ctx_t *ctx, int8_t tp, uint32_t sz, const void *data) {
-  if (sz == 1)
-    return cmp_write_fixext1(ctx, tp, data);
-  if (sz == 2)
-    return cmp_write_fixext2(ctx, tp, data);
-  if (sz == 4)
-    return cmp_write_fixext4(ctx, tp, data);
-  if (sz == 8)
-    return cmp_write_fixext8(ctx, tp, data);
-  if (sz == 16)
-    return cmp_write_fixext16(ctx, tp, data);
-  if (sz <= 0xFF)
-    return cmp_write_ext8(ctx, tp, (uint8_t)sz, data);
-  if (sz <= 0xFFFF)
-    return cmp_write_ext16(ctx, tp, (uint16_t)sz, data);
-
-  return cmp_write_ext32(ctx, tp, sz, data);
-}
-
-bool cmp_write_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
-  switch(obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-      return cmp_write_pfix(ctx, obj->as.u8);
-    case CMP_TYPE_FIXMAP:
-      return cmp_write_fixmap(ctx, (uint8_t)obj->as.map_size);
-    case CMP_TYPE_FIXARRAY:
-      return cmp_write_fixarray(ctx, (uint8_t)obj->as.array_size);
-    case CMP_TYPE_FIXSTR:
-      return cmp_write_fixstr_marker(ctx, (uint8_t)obj->as.str_size);
-    case CMP_TYPE_NIL:
-      return cmp_write_nil(ctx);
-    case CMP_TYPE_BOOLEAN:
-      if (obj->as.boolean)
-        return cmp_write_true(ctx);
-      return cmp_write_false(ctx);
-    case CMP_TYPE_BIN8:
-      return cmp_write_bin8_marker(ctx, (uint8_t)obj->as.bin_size);
-    case CMP_TYPE_BIN16:
-      return cmp_write_bin16_marker(ctx, (uint16_t)obj->as.bin_size);
-    case CMP_TYPE_BIN32:
-      return cmp_write_bin32_marker(ctx, obj->as.bin_size);
-    case CMP_TYPE_EXT8:
-      return cmp_write_ext8_marker(
-        ctx, obj->as.ext.type, (uint8_t)obj->as.ext.size
-      );
-    case CMP_TYPE_EXT16:
-      return cmp_write_ext16_marker(
-        ctx, obj->as.ext.type, (uint16_t)obj->as.ext.size
-      );
-    case CMP_TYPE_EXT32:
-      return cmp_write_ext32_marker(ctx, obj->as.ext.type, obj->as.ext.size);
-    case CMP_TYPE_FLOAT:
-      return cmp_write_float(ctx, obj->as.flt);
-    case CMP_TYPE_DOUBLE:
-      return cmp_write_double(ctx, obj->as.dbl);
-    case CMP_TYPE_UINT8:
-      return cmp_write_u8(ctx, obj->as.u8);
-    case CMP_TYPE_UINT16:
-      return cmp_write_u16(ctx, obj->as.u16);
-    case CMP_TYPE_UINT32:
-      return cmp_write_u32(ctx, obj->as.u32);
-    case CMP_TYPE_UINT64:
-      return cmp_write_u64(ctx, obj->as.u64);
-    case CMP_TYPE_SINT8:
-      return cmp_write_s8(ctx, obj->as.s8);
-    case CMP_TYPE_SINT16:
-      return cmp_write_s16(ctx, obj->as.s16);
-    case CMP_TYPE_SINT32:
-      return cmp_write_s32(ctx, obj->as.s32);
-    case CMP_TYPE_SINT64:
-      return cmp_write_s64(ctx, obj->as.s64);
-    case CMP_TYPE_FIXEXT1:
-      return cmp_write_fixext1_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_FIXEXT2:
-      return cmp_write_fixext2_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_FIXEXT4:
-      return cmp_write_fixext4_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_FIXEXT8:
-      return cmp_write_fixext8_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_FIXEXT16:
-      return cmp_write_fixext16_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_STR8:
-      return cmp_write_str8_marker(ctx, (uint8_t)obj->as.str_size);
-    case CMP_TYPE_STR16:
-      return cmp_write_str16_marker(ctx, (uint16_t)obj->as.str_size);
-    case CMP_TYPE_STR32:
-      return cmp_write_str32_marker(ctx, obj->as.str_size);
-    case CMP_TYPE_ARRAY16:
-      return cmp_write_array16(ctx, (uint16_t)obj->as.array_size);
-    case CMP_TYPE_ARRAY32:
-      return cmp_write_array32(ctx, obj->as.array_size);
-    case CMP_TYPE_MAP16:
-      return cmp_write_map16(ctx, (uint16_t)obj->as.map_size);
-    case CMP_TYPE_MAP32:
-      return cmp_write_map32(ctx, obj->as.map_size);
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-      return cmp_write_nfix(ctx, obj->as.s8);
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-bool cmp_write_object_v4(cmp_ctx_t *ctx, cmp_object_t *obj) {
-  switch(obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-      return cmp_write_pfix(ctx, obj->as.u8);
-    case CMP_TYPE_FIXMAP:
-      return cmp_write_fixmap(ctx, (uint8_t)obj->as.map_size);
-    case CMP_TYPE_FIXARRAY:
-      return cmp_write_fixarray(ctx, (uint8_t)obj->as.array_size);
-    case CMP_TYPE_FIXSTR:
-      return cmp_write_fixstr_marker(ctx, (uint8_t)obj->as.str_size);
-    case CMP_TYPE_NIL:
-      return cmp_write_nil(ctx);
-    case CMP_TYPE_BOOLEAN:
-      if (obj->as.boolean)
-        return cmp_write_true(ctx);
-      return cmp_write_false(ctx);
-    case CMP_TYPE_EXT8:
-      return cmp_write_ext8_marker(ctx, obj->as.ext.type, (uint8_t)obj->as.ext.size);
-    case CMP_TYPE_EXT16:
-      return cmp_write_ext16_marker(
-        ctx, obj->as.ext.type, (uint16_t)obj->as.ext.size
-      );
-    case CMP_TYPE_EXT32:
-      return cmp_write_ext32_marker(ctx, obj->as.ext.type, obj->as.ext.size);
-    case CMP_TYPE_FLOAT:
-      return cmp_write_float(ctx, obj->as.flt);
-    case CMP_TYPE_DOUBLE:
-      return cmp_write_double(ctx, obj->as.dbl);
-    case CMP_TYPE_UINT8:
-      return cmp_write_u8(ctx, obj->as.u8);
-    case CMP_TYPE_UINT16:
-      return cmp_write_u16(ctx, obj->as.u16);
-    case CMP_TYPE_UINT32:
-      return cmp_write_u32(ctx, obj->as.u32);
-    case CMP_TYPE_UINT64:
-      return cmp_write_u64(ctx, obj->as.u64);
-    case CMP_TYPE_SINT8:
-      return cmp_write_s8(ctx, obj->as.s8);
-    case CMP_TYPE_SINT16:
-      return cmp_write_s16(ctx, obj->as.s16);
-    case CMP_TYPE_SINT32:
-      return cmp_write_s32(ctx, obj->as.s32);
-    case CMP_TYPE_SINT64:
-      return cmp_write_s64(ctx, obj->as.s64);
-    case CMP_TYPE_FIXEXT1:
-      return cmp_write_fixext1_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_FIXEXT2:
-      return cmp_write_fixext2_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_FIXEXT4:
-      return cmp_write_fixext4_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_FIXEXT8:
-      return cmp_write_fixext8_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_FIXEXT16:
-      return cmp_write_fixext16_marker(ctx, obj->as.ext.type);
-    case CMP_TYPE_STR16:
-      return cmp_write_str16_marker(ctx, (uint16_t)obj->as.str_size);
-    case CMP_TYPE_STR32:
-      return cmp_write_str32_marker(ctx, obj->as.str_size);
-    case CMP_TYPE_ARRAY16:
-      return cmp_write_array16(ctx, (uint16_t)obj->as.array_size);
-    case CMP_TYPE_ARRAY32:
-      return cmp_write_array32(ctx, obj->as.array_size);
-    case CMP_TYPE_MAP16:
-      return cmp_write_map16(ctx, (uint16_t)obj->as.map_size);
-    case CMP_TYPE_MAP32:
-      return cmp_write_map32(ctx, obj->as.map_size);
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-      return cmp_write_nfix(ctx, obj->as.s8);
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-bool cmp_read_pfix(cmp_ctx_t *ctx, uint8_t *c) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_POSITIVE_FIXNUM) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *c = obj.as.u8;
-  return true;
-}
-
-bool cmp_read_nfix(cmp_ctx_t *ctx, int8_t *c) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_NEGATIVE_FIXNUM) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *c = obj.as.s8;
-  return true;
-}
-
-bool cmp_read_sfix(cmp_ctx_t *ctx, int8_t *c) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-      *c = obj.as.s8;
-      return true;
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-bool cmp_read_s8(cmp_ctx_t *ctx, int8_t *c) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_SINT8) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *c = obj.as.s8;
-  return true;
-}
-
-bool cmp_read_s16(cmp_ctx_t *ctx, int16_t *s) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_SINT16) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *s = obj.as.s16;
-  return true;
-}
-
-bool cmp_read_s32(cmp_ctx_t *ctx, int32_t *i) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_SINT32) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *i = obj.as.s32;
-  return true;
-}
-
-bool cmp_read_s64(cmp_ctx_t *ctx, int64_t *l) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_SINT64) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *l = obj.as.s64;
-  return true;
-}
-
-bool cmp_read_char(cmp_ctx_t *ctx, int8_t *c) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      *c = obj.as.s8;
-      return true;
-    case CMP_TYPE_UINT8:
-      if (obj.as.u8 <= 127) {
-        *c = obj.as.u8;
-        return true;
-      }
-      break;
-    default:
-      break;
-  }
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-bool cmp_read_short(cmp_ctx_t *ctx, int16_t *s) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      *s = obj.as.s8;
-      return true;
-    case CMP_TYPE_UINT8:
-      *s = obj.as.u8;
-      return true;
-    case CMP_TYPE_SINT16:
-      *s = obj.as.s16;
-      return true;
-    case CMP_TYPE_UINT16:
-      if (obj.as.u16 <= 32767) {
-        *s = obj.as.u16;
-        return true;
-      }
-      break;
-    default:
-      break;
-  }
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-bool cmp_read_int(cmp_ctx_t *ctx, int32_t *i) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      *i = obj.as.s8;
-      return true;
-    case CMP_TYPE_UINT8:
-      *i = obj.as.u8;
-      return true;
-    case CMP_TYPE_SINT16:
-      *i = obj.as.s16;
-      return true;
-    case CMP_TYPE_UINT16:
-      *i = obj.as.u16;
-      return true;
-    case CMP_TYPE_SINT32:
-      *i = obj.as.s32;
-      return true;
-    case CMP_TYPE_UINT32:
-      if (obj.as.u32 <= 2147483647) {
-        *i = obj.as.u32;
-        return true;
-      }
-      break;
-    default:
-      break;
-  }
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-bool cmp_read_long(cmp_ctx_t *ctx, int64_t *d) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      *d = obj.as.s8;
-      return true;
-    case CMP_TYPE_UINT8:
-      *d = obj.as.u8;
-      return true;
-    case CMP_TYPE_SINT16:
-      *d = obj.as.s16;
-      return true;
-    case CMP_TYPE_UINT16:
-      *d = obj.as.u16;
-      return true;
-    case CMP_TYPE_SINT32:
-      *d = obj.as.s32;
-      return true;
-    case CMP_TYPE_UINT32:
-      *d = obj.as.u32;
-      return true;
-    case CMP_TYPE_SINT64:
-      *d = obj.as.s64;
-      return true;
-    case CMP_TYPE_UINT64:
-      if (obj.as.u64 <= 9223372036854775807) {
-        *d = obj.as.u64;
-        return true;
-      }
-      break;
-    default:
-      break;
-  }
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-bool cmp_read_integer(cmp_ctx_t *ctx, int64_t *d) {
-  return cmp_read_long(ctx, d);
-}
-
-bool cmp_read_ufix(cmp_ctx_t *ctx, uint8_t *c) {
-  return cmp_read_pfix(ctx, c);
-}
-
-bool cmp_read_u8(cmp_ctx_t *ctx, uint8_t *c) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_UINT8) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *c = obj.as.u8;
-  return true;
-}
-
-bool cmp_read_u16(cmp_ctx_t *ctx, uint16_t *s) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_UINT16) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *s = obj.as.u16;
-  return true;
-}
-
-bool cmp_read_u32(cmp_ctx_t *ctx, uint32_t *i) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_UINT32) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *i = obj.as.u32;
-  return true;
-}
-
-bool cmp_read_u64(cmp_ctx_t *ctx, uint64_t *l) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_UINT64) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *l = obj.as.u64;
-  return true;
-}
-
-bool cmp_read_uchar(cmp_ctx_t *ctx, uint8_t *c) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      *c = obj.as.u8;
-      return true;
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      if (obj.as.s8 >= 0) {
-        *c = obj.as.s8;
-        return true;
-      }
-      break;
-    default:
-      break;
-  }
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-bool cmp_read_ushort(cmp_ctx_t *ctx, uint16_t *s) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      *s = obj.as.u8;
-      return true;
-    case CMP_TYPE_UINT16:
-      *s = obj.as.u16;
-      return true;
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      if (obj.as.s8 >= 0) {
-        *s = obj.as.s8;
-        return true;
-      }
-      break;
-    case CMP_TYPE_SINT16:
-      if (obj.as.s16 >= 0) {
-        *s = obj.as.s16;
-        return true;
-      }
-      break;
-    default:
-      break;
-  }
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-bool cmp_read_uint(cmp_ctx_t *ctx, uint32_t *i) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      *i = obj.as.u8;
-      return true;
-    case CMP_TYPE_UINT16:
-      *i = obj.as.u16;
-      return true;
-    case CMP_TYPE_UINT32:
-      *i = obj.as.u32;
-      return true;
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      if (obj.as.s8 >= 0) {
-        *i = obj.as.s8;
-        return true;
-      }
-      break;
-    case CMP_TYPE_SINT16:
-      if (obj.as.s16 >= 0) {
-        *i = obj.as.s16;
-        return true;
-      }
-      break;
-    case CMP_TYPE_SINT32:
-      if (obj.as.s32 >= 0) {
-        *i = obj.as.s32;
-        return true;
-      }
-      break;
-    default:
-      break;
-  }
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-bool cmp_read_ulong(cmp_ctx_t *ctx, uint64_t *u) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      *u = obj.as.u8;
-      return true;
-    case CMP_TYPE_UINT16:
-      *u = obj.as.u16;
-      return true;
-    case CMP_TYPE_UINT32:
-      *u = obj.as.u32;
-      return true;
-    case CMP_TYPE_UINT64:
-      *u = obj.as.u64;
-      return true;
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      if (obj.as.s8 >= 0) {
-        *u = obj.as.s8;
-        return true;
-      }
-      break;
-    case CMP_TYPE_SINT16:
-      if (obj.as.s16 >= 0) {
-        *u = obj.as.s16;
-        return true;
-      }
-      break;
-    case CMP_TYPE_SINT32:
-      if (obj.as.s32 >= 0) {
-        *u = obj.as.s32;
-        return true;
-      }
-      break;
-    case CMP_TYPE_SINT64:
-      if (obj.as.s64 >= 0) {
-        *u = obj.as.s64;
-        return true;
-      }
-      break;
-    default:
-      break;
-  }
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-bool cmp_read_uinteger(cmp_ctx_t *ctx, uint64_t *d) {
-  return cmp_read_ulong(ctx, d);
-}
-
-bool cmp_read_float(cmp_ctx_t *ctx, float *f) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_FLOAT) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *f = obj.as.flt;
-
-  return true;
-}
-
-bool cmp_read_double(cmp_ctx_t *ctx, double *d) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_DOUBLE) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *d = obj.as.dbl;
-
-  return true;
-}
-
-bool cmp_read_decimal(cmp_ctx_t *ctx, double *d) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_FLOAT:
-      *d = (double)obj.as.flt;
-      return true;
-    case CMP_TYPE_DOUBLE:
-      *d = obj.as.dbl;
-      return true;
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-bool cmp_read_nil(cmp_ctx_t *ctx) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type == CMP_TYPE_NIL)
-    return true;
-
-  ctx->error = INVALID_TYPE_ERROR;
-  return false;
-}
-
-bool cmp_read_bool(cmp_ctx_t *ctx, bool *b) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_BOOLEAN) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  if (obj.as.boolean)
-    *b = true;
-  else
-    *b = false;
-
-  return true;
-}
-
-bool cmp_read_bool_as_u8(cmp_ctx_t *ctx, uint8_t *b) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_BOOLEAN) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  if (obj.as.boolean)
-    *b = 1;
-  else
-    *b = 0;
-
-  return true;
-}
-
-bool cmp_read_str_size(cmp_ctx_t *ctx, uint32_t *size) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_FIXSTR:
-    case CMP_TYPE_STR8:
-    case CMP_TYPE_STR16:
-    case CMP_TYPE_STR32:
-      *size = obj.as.str_size;
-      return true;
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-bool cmp_read_str(cmp_ctx_t *ctx, char *data, uint32_t *size) {
-  uint32_t str_size = 0;
-
-  if (!cmp_read_str_size(ctx, &str_size))
-    return false;
-
-  if ((str_size + 1) > *size) {
-    *size = str_size;
-    ctx->error = STR_DATA_LENGTH_TOO_LONG_ERROR;
-    return false;
-  }
-
-  if (!ctx->read(ctx, data, str_size)) {
-    ctx->error = DATA_READING_ERROR;
-    return false;
-  }
-
-  data[str_size] = 0;
-
-  *size = str_size;
-  return true;
-}
-
-bool cmp_read_bin_size(cmp_ctx_t *ctx, uint32_t *size) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_BIN8:
-    case CMP_TYPE_BIN16:
-    case CMP_TYPE_BIN32:
-      *size = obj.as.bin_size;
-      return true;
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-bool cmp_read_bin(cmp_ctx_t *ctx, void *data, uint32_t *size) {
-  uint32_t bin_size = 0;
-
-  if (!cmp_read_bin_size(ctx, &bin_size))
-    return false;
-
-  if (bin_size > *size) {
-    ctx->error = BIN_DATA_LENGTH_TOO_LONG_ERROR;
-    return false;
-  }
-
-  if (!ctx->read(ctx, data, bin_size)) {
-    ctx->error = DATA_READING_ERROR;
-    return false;
-  }
-
-  *size = bin_size;
-  return true;
-}
-
-bool cmp_read_array(cmp_ctx_t *ctx, uint32_t *size) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_FIXARRAY:
-    case CMP_TYPE_ARRAY16:
-    case CMP_TYPE_ARRAY32:
-      *size = obj.as.array_size;
-      return true;
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-bool cmp_read_map(cmp_ctx_t *ctx, uint32_t *size) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_FIXMAP:
-    case CMP_TYPE_MAP16:
-    case CMP_TYPE_MAP32:
-      *size = obj.as.map_size;
-      return true;
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-bool cmp_read_fixext1_marker(cmp_ctx_t *ctx, int8_t *type) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-  
-  if (obj.type != CMP_TYPE_FIXEXT1) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *type = obj.as.ext.type;
-  return true;
-}
-
-bool cmp_read_fixext1(cmp_ctx_t *ctx, int8_t *type, void *data) {
-  if (!cmp_read_fixext1_marker(ctx, type))
-    return false;
-
-  if (ctx->read(ctx, data, 1))
-    return true;
-
-  ctx->error = DATA_READING_ERROR;
-  return false;
-}
-
-bool cmp_read_fixext2_marker(cmp_ctx_t *ctx, int8_t *type) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-  
-  if (obj.type != CMP_TYPE_FIXEXT2) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *type = obj.as.ext.type;
-  return true;
-}
-
-bool cmp_read_fixext2(cmp_ctx_t *ctx, int8_t *type, void *data) {
-  if (!cmp_read_fixext2_marker(ctx, type))
-    return false;
-
-  if (ctx->read(ctx, data, 2))
-    return true;
-
-  ctx->error = DATA_READING_ERROR;
-  return false;
-}
-
-bool cmp_read_fixext4_marker(cmp_ctx_t *ctx, int8_t *type) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-  
-  if (obj.type != CMP_TYPE_FIXEXT4) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *type = obj.as.ext.type;
-  return true;
-}
-
-bool cmp_read_fixext4(cmp_ctx_t *ctx, int8_t *type, void *data) {
-  if (!cmp_read_fixext4_marker(ctx, type))
-    return false;
-
-  if (ctx->read(ctx, data, 4))
-    return true;
-
-  ctx->error = DATA_READING_ERROR;
-  return false;
-}
-
-bool cmp_read_fixext8_marker(cmp_ctx_t *ctx, int8_t *type) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-  
-  if (obj.type != CMP_TYPE_FIXEXT8) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *type = obj.as.ext.type;
-  return true;
-}
-
-bool cmp_read_fixext8(cmp_ctx_t *ctx, int8_t *type, void *data) {
-  if (!cmp_read_fixext8_marker(ctx, type))
-    return false;
-
-  if (ctx->read(ctx, data, 8))
-    return true;
-
-  ctx->error = DATA_READING_ERROR;
-  return false;
-}
-
-bool cmp_read_fixext16_marker(cmp_ctx_t *ctx, int8_t *type) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-  
-  if (obj.type != CMP_TYPE_FIXEXT16) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *type = obj.as.ext.type;
-  return true;
-}
-
-bool cmp_read_fixext16(cmp_ctx_t *ctx, int8_t *type, void *data) {
-  if (!cmp_read_fixext16_marker(ctx, type))
-    return false;
-
-  if (ctx->read(ctx, data, 16))
-    return true;
-
-  ctx->error = DATA_READING_ERROR;
-  return false;
-}
-
-bool cmp_read_ext8_marker(cmp_ctx_t *ctx, int8_t *type, uint8_t *size) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_EXT8) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *type = obj.as.ext.type;
-  *size = (uint8_t)obj.as.ext.size;
-
-  return true;
-}
-
-bool cmp_read_ext8(cmp_ctx_t *ctx, int8_t *type, uint8_t *size, void *data) {
-  if (!cmp_read_ext8_marker(ctx, type, size))
-    return false;
-
-  if (ctx->read(ctx, data, *size))
-    return true;
-
-  ctx->error = DATA_READING_ERROR;
-  return false;
-}
-
-bool cmp_read_ext16_marker(cmp_ctx_t *ctx, int8_t *type, uint16_t *size) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_EXT16) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *type = obj.as.ext.type;
-  *size = (uint16_t)obj.as.ext.size;
-
-  return true;
-}
-
-bool cmp_read_ext16(cmp_ctx_t *ctx, int8_t *type, uint16_t *size, void *data) {
-  if (!cmp_read_ext16_marker(ctx, type, size))
-    return false;
-
-  if (ctx->read(ctx, data, *size))
-    return true;
-
-  ctx->error = DATA_READING_ERROR;
-  return false;
-}
-
-bool cmp_read_ext32_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  if (obj.type != CMP_TYPE_EXT32) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  *type = obj.as.ext.type;
-  *size = obj.as.ext.size;
-
-  return true;
-}
-
-bool cmp_read_ext32(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data) {
-  if (!cmp_read_ext32_marker(ctx, type, size))
-    return false;
-
-  if (ctx->read(ctx, data, *size))
-    return true;
-
-  ctx->error = DATA_READING_ERROR;
-  return false;
-}
-
-bool cmp_read_ext_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size) {
-  cmp_object_t obj;
-
-  if (!cmp_read_object(ctx, &obj))
-    return false;
-
-  switch (obj.type) {
-    case CMP_TYPE_FIXEXT1:
-    case CMP_TYPE_FIXEXT2:
-    case CMP_TYPE_FIXEXT4:
-    case CMP_TYPE_FIXEXT8:
-    case CMP_TYPE_FIXEXT16:
-    case CMP_TYPE_EXT8:
-    case CMP_TYPE_EXT16:
-    case CMP_TYPE_EXT32:
-      *type = obj.as.ext.type;
-      *size = obj.as.ext.size;
-      return true;
-    default:
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-  }
-}
-
-bool cmp_read_ext(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data) {
-  if (!cmp_read_ext_marker(ctx, type, size))
-    return false;
-
-  if (ctx->read(ctx, data, *size))
-    return true;
-
-  ctx->error = DATA_READING_ERROR;
-  return false;
-}
-
-bool cmp_read_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
-  uint8_t type_marker = 0;
-
-  if (!read_type_marker(ctx, &type_marker))
-    return false;
-
-  if (!type_marker_to_cmp_type(type_marker, &obj->type)) {
-    ctx->error = INVALID_TYPE_ERROR;
-    return false;
-  }
-
-  return read_obj_data(ctx, type_marker, obj);
-}
-
-bool cmp_skip_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
-  return cmp_skip_object_limit(ctx, obj, 0);
-}
-
-bool cmp_skip_object_limit(cmp_ctx_t *ctx, cmp_object_t *obj, uint32_t limit) {
-  size_t element_count = 1;
-  uint32_t depth = 0;
-
-  while (element_count) {
-    uint8_t type_marker = 0;
-    uint8_t cmp_type;
-    uint32_t size = 0;
-
-    if (!read_type_marker(ctx, &type_marker)) {
-      return false;
-    }
-
-    if (!type_marker_to_cmp_type(type_marker, &cmp_type)) {
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-    }
-
-    switch (cmp_type) {
-      case CMP_TYPE_FIXARRAY:
-      case CMP_TYPE_ARRAY16:
-      case CMP_TYPE_ARRAY32:
-      case CMP_TYPE_FIXMAP:
-      case CMP_TYPE_MAP16:
-      case CMP_TYPE_MAP32:
-        depth++;
-
-        if (depth > limit) {
-          obj->type = cmp_type;
-
-          if (!read_obj_data(ctx, type_marker, obj)) {
-            return false;
-          }
-
-          ctx->error = SKIP_DEPTH_LIMIT_EXCEEDED_ERROR;
-
-          return false;
-        }
-
-        break;
-      default:
-        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
-          return false;
-        }
-
-        if (size) {
-          switch (cmp_type) {
-            case CMP_TYPE_FIXEXT1:
-            case CMP_TYPE_FIXEXT2:
-            case CMP_TYPE_FIXEXT4:
-            case CMP_TYPE_FIXEXT8:
-            case CMP_TYPE_FIXEXT16:
-            case CMP_TYPE_EXT8:
-            case CMP_TYPE_EXT16:
-            case CMP_TYPE_EXT32:
-              size++;
-            default:
-              break;
-          }
-
-          skip_bytes(ctx, size);
-        }
-    }
-
-    element_count--;
-
-    switch (cmp_type) {
-      case CMP_TYPE_FIXARRAY:
-      case CMP_TYPE_ARRAY16:
-      case CMP_TYPE_ARRAY32:
-        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
-          return false;
-        }
-        element_count += size;
-        break;
-      case CMP_TYPE_FIXMAP:
-      case CMP_TYPE_MAP16:
-      case CMP_TYPE_MAP32:
-        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
-          return false;
-        }
-        element_count += ((size_t)size) * 2;
-        break;
-      default:
-        break;
-    }
-  }
-
-  return true;
-}
-
-bool cmp_skip_object_no_limit(cmp_ctx_t *ctx) {
-  size_t element_count = 1;
-
-  while (element_count) {
-    uint8_t type_marker = 0;
-    uint8_t cmp_type = 0;
-    uint32_t size = 0;
-
-    if (!read_type_marker(ctx, &type_marker)) {
-      return false;
-    }
-
-    if (!type_marker_to_cmp_type(type_marker, &cmp_type)) {
-      ctx->error = INVALID_TYPE_ERROR;
-      return false;
-    }
-
-    switch (cmp_type) {
-      case CMP_TYPE_FIXARRAY:
-      case CMP_TYPE_ARRAY16:
-      case CMP_TYPE_ARRAY32:
-      case CMP_TYPE_FIXMAP:
-      case CMP_TYPE_MAP16:
-      case CMP_TYPE_MAP32:
-        break;
-      default:
-        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
-          return false;
-        }
-
-        if (size) {
-          switch (cmp_type) {
-            case CMP_TYPE_FIXEXT1:
-            case CMP_TYPE_FIXEXT2:
-            case CMP_TYPE_FIXEXT4:
-            case CMP_TYPE_FIXEXT8:
-            case CMP_TYPE_FIXEXT16:
-            case CMP_TYPE_EXT8:
-            case CMP_TYPE_EXT16:
-            case CMP_TYPE_EXT32:
-              size++;
-            default:
-              break;
-          }
-
-          skip_bytes(ctx, size);
-        }
-    }
-
-    element_count--;
-
-    switch (cmp_type) {
-      case CMP_TYPE_FIXARRAY:
-      case CMP_TYPE_ARRAY16:
-      case CMP_TYPE_ARRAY32:
-        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
-          return false;
-        }
-        element_count += size;
-        break;
-      case CMP_TYPE_FIXMAP:
-      case CMP_TYPE_MAP16:
-      case CMP_TYPE_MAP32:
-        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
-          return false;
-        }
-        element_count += ((size_t)size) * 2;
-        break;
-      default:
-        break;
-    }
-  }
-
-  return true;
-}
-
-bool cmp_object_is_char(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_short(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-    case CMP_TYPE_SINT16:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_int(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-    case CMP_TYPE_SINT16:
-    case CMP_TYPE_SINT32:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_long(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-    case CMP_TYPE_SINT16:
-    case CMP_TYPE_SINT32:
-    case CMP_TYPE_SINT64:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_sinteger(cmp_object_t *obj) {
-  return cmp_object_is_long(obj);
-}
-
-bool cmp_object_is_uchar(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_ushort(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      return true;
-    case CMP_TYPE_UINT16:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_uint(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-    case CMP_TYPE_UINT16:
-    case CMP_TYPE_UINT32:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_ulong(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-    case CMP_TYPE_UINT16:
-    case CMP_TYPE_UINT32:
-    case CMP_TYPE_UINT64:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_uinteger(cmp_object_t *obj) {
-  return cmp_object_is_ulong(obj);
-}
-
-bool cmp_object_is_float(cmp_object_t *obj) {
-  if (obj->type == CMP_TYPE_FLOAT)
-    return true;
-
-  return false;
-}
-
-bool cmp_object_is_double(cmp_object_t *obj) {
-  if (obj->type == CMP_TYPE_DOUBLE)
-    return true;
-
-  return false;
-}
-
-bool cmp_object_is_nil(cmp_object_t *obj) {
-  if (obj->type == CMP_TYPE_NIL)
-    return true;
-
-  return false;
-}
-
-bool cmp_object_is_bool(cmp_object_t *obj) {
-  if (obj->type == CMP_TYPE_BOOLEAN)
-    return true;
-
-  return false;
-}
-
-bool cmp_object_is_str(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_FIXSTR:
-    case CMP_TYPE_STR8:
-    case CMP_TYPE_STR16:
-    case CMP_TYPE_STR32:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_bin(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_BIN8:
-    case CMP_TYPE_BIN16:
-    case CMP_TYPE_BIN32:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_array(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_FIXARRAY:
-    case CMP_TYPE_ARRAY16:
-    case CMP_TYPE_ARRAY32:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_map(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_FIXMAP:
-    case CMP_TYPE_MAP16:
-    case CMP_TYPE_MAP32:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_is_ext(cmp_object_t *obj) {
-  switch (obj->type) {
-    case CMP_TYPE_FIXEXT1:
-    case CMP_TYPE_FIXEXT2:
-    case CMP_TYPE_FIXEXT4:
-    case CMP_TYPE_FIXEXT8:
-    case CMP_TYPE_FIXEXT16:
-    case CMP_TYPE_EXT8:
-    case CMP_TYPE_EXT16:
-    case CMP_TYPE_EXT32:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_as_char(cmp_object_t *obj, int8_t *c) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      *c = obj->as.s8;
-      return true;
-    case CMP_TYPE_UINT8:
-      if (obj->as.u8 <= 127) {
-        *c = obj->as.s8;
-        return true;
-      }
-      else {
-        return false;
-      }
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_short(cmp_object_t *obj, int16_t *s) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      *s = obj->as.s8;
-      return true;
-    case CMP_TYPE_UINT8:
-      *s = obj->as.u8;
-      return true;
-    case CMP_TYPE_SINT16:
-      *s = obj->as.s16;
-      return true;
-    case CMP_TYPE_UINT16:
-      if (obj->as.u16 <= 32767) {
-        *s = obj->as.u16;
-        return true;
-      }
-      else {
-        return false;
-      }
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_int(cmp_object_t *obj, int32_t *i) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      *i = obj->as.s8;
-      return true;
-    case CMP_TYPE_UINT8:
-      *i = obj->as.u8;
-      return true;
-    case CMP_TYPE_SINT16:
-      *i = obj->as.s16;
-      return true;
-    case CMP_TYPE_UINT16:
-      *i = obj->as.u16;
-      return true;
-    case CMP_TYPE_SINT32:
-      *i = obj->as.s32;
-      return true;
-    case CMP_TYPE_UINT32:
-      if (obj->as.u32 <= 2147483647) {
-        *i = obj->as.u32;
-        return true;
-      }
-      else {
-        return false;
-      }
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_long(cmp_object_t *obj, int64_t *d) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_NEGATIVE_FIXNUM:
-    case CMP_TYPE_SINT8:
-      *d = obj->as.s8;
-      return true;
-    case CMP_TYPE_UINT8:
-      *d = obj->as.u8;
-      return true;
-    case CMP_TYPE_SINT16:
-      *d = obj->as.s16;
-      return true;
-    case CMP_TYPE_UINT16:
-      *d = obj->as.u16;
-      return true;
-    case CMP_TYPE_SINT32:
-      *d = obj->as.s32;
-      return true;
-    case CMP_TYPE_UINT32:
-      *d = obj->as.u32;
-      return true;
-    case CMP_TYPE_SINT64:
-      *d = obj->as.s64;
-      return true;
-    case CMP_TYPE_UINT64:
-      if (obj->as.u64 <= 9223372036854775807) {
-        *d = obj->as.u64;
-        return true;
-      }
-      else {
-        return false;
-      }
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_sinteger(cmp_object_t *obj, int64_t *d) {
-  return cmp_object_as_long(obj, d);
-}
-
-bool cmp_object_as_uchar(cmp_object_t *obj, uint8_t *c) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      *c = obj->as.u8;
-      return true;
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_ushort(cmp_object_t *obj, uint16_t *s) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      *s = obj->as.u8;
-      return true;
-    case CMP_TYPE_UINT16:
-      *s = obj->as.u16;
-      return true;
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_uint(cmp_object_t *obj, uint32_t *i) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      *i = obj->as.u8;
-      return true;
-    case CMP_TYPE_UINT16:
-      *i = obj->as.u16;
-      return true;
-    case CMP_TYPE_UINT32:
-      *i = obj->as.u32;
-      return true;
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_ulong(cmp_object_t *obj, uint64_t *u) {
-  switch (obj->type) {
-    case CMP_TYPE_POSITIVE_FIXNUM:
-    case CMP_TYPE_UINT8:
-      *u = obj->as.u8;
-      return true;
-    case CMP_TYPE_UINT16:
-      *u = obj->as.u16;
-      return true;
-    case CMP_TYPE_UINT32:
-      *u = obj->as.u32;
-      return true;
-    case CMP_TYPE_UINT64:
-      *u = obj->as.u64;
-      return true;
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_uinteger(cmp_object_t *obj, uint64_t *d) {
-  return cmp_object_as_ulong(obj, d);
-}
-
-bool cmp_object_as_float(cmp_object_t *obj, float *f) {
-  if (obj->type == CMP_TYPE_FLOAT) {
-    *f = obj->as.flt;
-    return true;
-  }
-
-  return false;
-}
-
-bool cmp_object_as_double(cmp_object_t *obj, double *d) {
-  if (obj->type == CMP_TYPE_DOUBLE) {
-    *d = obj->as.dbl;
-    return true;
-  }
-
-  return false;
-}
-
-bool cmp_object_as_bool(cmp_object_t *obj, bool *b) {
-  if (obj->type == CMP_TYPE_BOOLEAN) {
-    if (obj->as.boolean)
-      *b = true;
-    else
-      *b = false;
-
-    return true;
-  }
-
-  return false;
-}
-
-bool cmp_object_as_str(cmp_object_t *obj, uint32_t *size) {
-  switch (obj->type) {
-    case CMP_TYPE_FIXSTR:
-    case CMP_TYPE_STR8:
-    case CMP_TYPE_STR16:
-    case CMP_TYPE_STR32:
-      *size = obj->as.str_size;
-      return true;
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_bin(cmp_object_t *obj, uint32_t *size) {
-  switch (obj->type) {
-    case CMP_TYPE_BIN8:
-    case CMP_TYPE_BIN16:
-    case CMP_TYPE_BIN32:
-      *size = obj->as.bin_size;
-      return true;
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_array(cmp_object_t *obj, uint32_t *size) {
-  switch (obj->type) {
-    case CMP_TYPE_FIXARRAY:
-    case CMP_TYPE_ARRAY16:
-    case CMP_TYPE_ARRAY32:
-      *size = obj->as.array_size;
-      return true;
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_map(cmp_object_t *obj, uint32_t *size) {
-  switch (obj->type) {
-    case CMP_TYPE_FIXMAP:
-    case CMP_TYPE_MAP16:
-    case CMP_TYPE_MAP32:
-      *size = obj->as.map_size;
-      return true;
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_as_ext(cmp_object_t *obj, int8_t *type, uint32_t *size) {
-  switch (obj->type) {
-    case CMP_TYPE_FIXEXT1:
-    case CMP_TYPE_FIXEXT2:
-    case CMP_TYPE_FIXEXT4:
-    case CMP_TYPE_FIXEXT8:
-    case CMP_TYPE_FIXEXT16:
-    case CMP_TYPE_EXT8:
-    case CMP_TYPE_EXT16:
-    case CMP_TYPE_EXT32:
-      *type = obj->as.ext.type;
-      *size = obj->as.ext.size;
-      return true;
-    default:
-        return false;
-  }
-}
-
-bool cmp_object_to_str(cmp_ctx_t *ctx, cmp_object_t *obj, char *data,
-                                                          uint32_t buf_size) {
-  uint32_t str_size = 0;
-
-  switch (obj->type) {
-    case CMP_TYPE_FIXSTR:
-    case CMP_TYPE_STR8:
-    case CMP_TYPE_STR16:
-    case CMP_TYPE_STR32:
-      str_size = obj->as.str_size;
-      if ((str_size + 1) > buf_size) {
-        ctx->error = STR_DATA_LENGTH_TOO_LONG_ERROR;
-        return false;
-      }
-
-      if (!ctx->read(ctx, data, str_size)) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-
-      data[str_size] = 0;
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool cmp_object_to_bin(cmp_ctx_t *ctx, cmp_object_t *obj, void *data,
-                                                          uint32_t buf_size) {
-  uint32_t bin_size = 0;
-
-  switch (obj->type) {
-    case CMP_TYPE_BIN8:
-    case CMP_TYPE_BIN16:
-    case CMP_TYPE_BIN32:
-      bin_size = obj->as.bin_size;
-      if (bin_size > buf_size) {
-        ctx->error = BIN_DATA_LENGTH_TOO_LONG_ERROR;
-        return false;
-      }
-
-      if (!ctx->read(ctx, data, bin_size)) {
-        ctx->error = DATA_READING_ERROR;
-        return false;
-      }
-      return true;
-    default:
-      return false;
-  }
-}
-
-/* vi: set et ts=2 sw=2: */
-
diff --git a/debian/modules/nchan/src/store/redis/cmp.h b/debian/modules/nchan/src/store/redis/cmp.h
deleted file mode 100644
index c78b37b..0000000
--- a/debian/modules/nchan/src/store/redis/cmp.h
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2017 Charles Gunyon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#ifndef CMP_H__
-#define CMP_H__
-
-struct cmp_ctx_s;
-
-typedef bool   (*cmp_reader)(struct cmp_ctx_s *ctx, void *data, size_t limit);
-typedef bool   (*cmp_skipper)(struct cmp_ctx_s *ctx, size_t count);
-typedef size_t (*cmp_writer)(struct cmp_ctx_s *ctx, const void *data,
-                                                    size_t count);
-
-enum {
-  CMP_TYPE_POSITIVE_FIXNUM, /*  0 */
-  CMP_TYPE_FIXMAP,          /*  1 */
-  CMP_TYPE_FIXARRAY,        /*  2 */
-  CMP_TYPE_FIXSTR,          /*  3 */
-  CMP_TYPE_NIL,             /*  4 */
-  CMP_TYPE_BOOLEAN,         /*  5 */
-  CMP_TYPE_BIN8,            /*  6 */
-  CMP_TYPE_BIN16,           /*  7 */
-  CMP_TYPE_BIN32,           /*  8 */
-  CMP_TYPE_EXT8,            /*  9 */
-  CMP_TYPE_EXT16,           /* 10 */
-  CMP_TYPE_EXT32,           /* 11 */
-  CMP_TYPE_FLOAT,           /* 12 */
-  CMP_TYPE_DOUBLE,          /* 13 */
-  CMP_TYPE_UINT8,           /* 14 */
-  CMP_TYPE_UINT16,          /* 15 */
-  CMP_TYPE_UINT32,          /* 16 */
-  CMP_TYPE_UINT64,          /* 17 */
-  CMP_TYPE_SINT8,           /* 18 */
-  CMP_TYPE_SINT16,          /* 19 */
-  CMP_TYPE_SINT32,          /* 20 */
-  CMP_TYPE_SINT64,          /* 21 */
-  CMP_TYPE_FIXEXT1,         /* 22 */
-  CMP_TYPE_FIXEXT2,         /* 23 */
-  CMP_TYPE_FIXEXT4,         /* 24 */
-  CMP_TYPE_FIXEXT8,         /* 25 */
-  CMP_TYPE_FIXEXT16,        /* 26 */
-  CMP_TYPE_STR8,            /* 27 */
-  CMP_TYPE_STR16,           /* 28 */
-  CMP_TYPE_STR32,           /* 29 */
-  CMP_TYPE_ARRAY16,         /* 30 */
-  CMP_TYPE_ARRAY32,         /* 31 */
-  CMP_TYPE_MAP16,           /* 32 */
-  CMP_TYPE_MAP32,           /* 33 */
-  CMP_TYPE_NEGATIVE_FIXNUM  /* 34 */
-};
-
-typedef struct cmp_ext_s {
-  int8_t type;
-  uint32_t size;
-} cmp_ext_t;
-
-union cmp_object_data_u {
-  bool      boolean;
-  uint8_t   u8;
-  uint16_t  u16;
-  uint32_t  u32;
-  uint64_t  u64;
-  int8_t    s8;
-  int16_t   s16;
-  int32_t   s32;
-  int64_t   s64;
-  float     flt;
-  double    dbl;
-  uint32_t  array_size;
-  uint32_t  map_size;
-  uint32_t  str_size;
-  uint32_t  bin_size;
-  cmp_ext_t ext;
-};
-
-typedef struct cmp_ctx_s {
-  uint8_t      error;
-  void        *buf;
-  cmp_reader   read;
-  cmp_skipper  skip;
-  cmp_writer   write;
-} cmp_ctx_t;
-
-typedef struct cmp_object_s {
-  uint8_t type;
-  union cmp_object_data_u as;
-} cmp_object_t;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * ============================================================================
- * === Main API
- * ============================================================================
- */
-
-/*
- * Initializes a CMP context
- *
- * If you don't intend to read, `read` may be NULL, but calling `*read*`
- * functions will crash; there is no check.
- *
- * `skip` may be NULL, in which case skipping functions will use `read`.
- *
- * If you don't intend to write, `write` may be NULL, but calling `*write*`
- * functions will crash; there is no check.
- */
-void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read,
-                                         cmp_skipper skip,
-                                         cmp_writer write);
-
-/* Returns CMP's version */
-uint32_t cmp_version(void);
-
-/* Returns the MessagePack version employed by CMP */
-uint32_t cmp_mp_version(void);
-
-/* Returns a string description of a CMP context's error */
-const char* cmp_strerror(cmp_ctx_t *ctx);
-
-/* Writes a signed integer to the backend */
-bool cmp_write_integer(cmp_ctx_t *ctx, int64_t d);
-
-/* Writes an unsigned integer to the backend */
-bool cmp_write_uinteger(cmp_ctx_t *ctx, uint64_t u);
-
-/*
- * Writes a floating-point value (either single or double-precision) to the
- * backend
- */
-bool cmp_write_decimal(cmp_ctx_t *ctx, double d);
-
-/* Writes NULL to the backend */
-bool cmp_write_nil(cmp_ctx_t *ctx);
-
-/* Writes true to the backend */
-bool cmp_write_true(cmp_ctx_t *ctx);
-
-/* Writes false to the backend */
-bool cmp_write_false(cmp_ctx_t *ctx);
-
-/* Writes a boolean value to the backend */
-bool cmp_write_bool(cmp_ctx_t *ctx, bool b);
-
-/*
- * Writes an unsigned char's value to the backend as a boolean.  This is useful
- * if you are using a different boolean type in your application.
- */
-bool cmp_write_u8_as_bool(cmp_ctx_t *ctx, uint8_t b);
-
-/*
- * Writes a string to the backend; according to the MessagePack spec, this must
- * be encoded using UTF-8, but CMP leaves that job up to the programmer.
- */
-bool cmp_write_str(cmp_ctx_t *ctx, const char *data, uint32_t size);
-
-/*
- * Writes a string to the backend.  This avoids using the STR8 marker, which
- * is unsupported by MessagePack v4, the version implemented by many other
- * MessagePack libraries.  No encoding is assumed in this case, not that it
- * matters.
- */
-bool cmp_write_str_v4(cmp_ctx_t *ctx, const char *data, uint32_t size);
-
-/*
- * Writes the string marker to the backend.  This is useful if you are writing
- * data in chunks instead of a single shot.
- */
-bool cmp_write_str_marker(cmp_ctx_t *ctx, uint32_t size);
-
-/*
- * Writes the string marker to the backend.  This is useful if you are writing
- * data in chunks instead of a single shot.  This avoids using the STR8
- * marker, which is unsupported by MessagePack v4, the version implemented by
- * many other MessagePack libraries.  No encoding is assumed in this case, not
- * that it matters.
- */
-bool cmp_write_str_marker_v4(cmp_ctx_t *ctx, uint32_t size);
-
-/* Writes binary data to the backend */
-bool cmp_write_bin(cmp_ctx_t *ctx, const void *data, uint32_t size);
-
-/*
- * Writes the binary data marker to the backend.  This is useful if you are
- * writing data in chunks instead of a single shot.
- */
-bool cmp_write_bin_marker(cmp_ctx_t *ctx, uint32_t size);
-
-/* Writes an array to the backend. */
-bool cmp_write_array(cmp_ctx_t *ctx, uint32_t size);
-
-/* Writes a map to the backend. */
-bool cmp_write_map(cmp_ctx_t *ctx, uint32_t size);
-
-/* Writes an extended type to the backend */
-bool cmp_write_ext(cmp_ctx_t *ctx, int8_t type, uint32_t size,
-                                   const void *data);
-
-/*
- * Writes the extended type marker to the backend.  This is useful if you want
- * to write the type's data in chunks instead of a single shot.
- */
-bool cmp_write_ext_marker(cmp_ctx_t *ctx, int8_t type, uint32_t size);
-
-/* Writes an object to the backend */
-bool cmp_write_object(cmp_ctx_t *ctx, cmp_object_t *obj);
-
-/*
- * Writes an object to the backend. This avoids using the STR8 marker, which
- * is unsupported by MessagePack v4, the version implemented by many other
- * MessagePack libraries.
- */
-bool cmp_write_object_v4(cmp_ctx_t *ctx, cmp_object_t *obj);
-
-/* Reads a signed integer that fits inside a signed char */
-bool cmp_read_char(cmp_ctx_t *ctx, int8_t *c);
-
-/* Reads a signed integer that fits inside a signed short */
-bool cmp_read_short(cmp_ctx_t *ctx, int16_t *s);
-
-/* Reads a signed integer that fits inside a signed int */
-bool cmp_read_int(cmp_ctx_t *ctx, int32_t *i);
-
-/* Reads a signed integer that fits inside a signed long */
-bool cmp_read_long(cmp_ctx_t *ctx, int64_t *d);
-
-/* Reads a signed integer */
-bool cmp_read_integer(cmp_ctx_t *ctx, int64_t *d);
-
-/* Reads an unsigned integer that fits inside an unsigned char */
-bool cmp_read_uchar(cmp_ctx_t *ctx, uint8_t *c);
-
-/* Reads an unsigned integer that fits inside an unsigned short */
-bool cmp_read_ushort(cmp_ctx_t *ctx, uint16_t *s);
-
-/* Reads an unsigned integer that fits inside an unsigned int */
-bool cmp_read_uint(cmp_ctx_t *ctx, uint32_t *i);
-
-/* Reads an unsigned integer that fits inside an unsigned long */
-bool cmp_read_ulong(cmp_ctx_t *ctx, uint64_t *u);
-
-/* Reads an unsigned integer */
-bool cmp_read_uinteger(cmp_ctx_t *ctx, uint64_t *u);
-
-/*
- * Reads a floating point value (either single or double-precision) from the
- * backend
- */
-bool cmp_read_decimal(cmp_ctx_t *ctx, double *d);
-
-/* "Reads" (more like "skips") a NULL value from the backend */
-bool cmp_read_nil(cmp_ctx_t *ctx);
-
-/* Reads a boolean from the backend */
-bool cmp_read_bool(cmp_ctx_t *ctx, bool *b);
-
-/*
- * Reads a boolean as an unsigned char from the backend; this is useful if your
- * application uses a different boolean type.
- */
-bool cmp_read_bool_as_u8(cmp_ctx_t *ctx, uint8_t *b);
-
-/* Reads a string's size from the backend */
-bool cmp_read_str_size(cmp_ctx_t *ctx, uint32_t *size);
-
-/*
- * Reads a string from the backend; according to the spec, the string's data
- * ought to be encoded using UTF-8, 
- */
-bool cmp_read_str(cmp_ctx_t *ctx, char *data, uint32_t *size);
-
-/* Reads the size of packed binary data from the backend */
-bool cmp_read_bin_size(cmp_ctx_t *ctx, uint32_t *size);
-
-/* Reads packed binary data from the backend */
-bool cmp_read_bin(cmp_ctx_t *ctx, void *data, uint32_t *size);
-
-/* Reads an array from the backend */
-bool cmp_read_array(cmp_ctx_t *ctx, uint32_t *size);
-
-/* Reads a map from the backend */
-bool cmp_read_map(cmp_ctx_t *ctx, uint32_t *size);
-
-/* Reads the extended type's marker from the backend */
-bool cmp_read_ext_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size);
-
-/* Reads an extended type from the backend */
-bool cmp_read_ext(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data);
-
-/* Reads an object from the backend */
-bool cmp_read_object(cmp_ctx_t *ctx, cmp_object_t *obj);
-
-/*
- * Skips the next object from the backend.  If that object is an array or map,
- * this function will:
- *   - If `obj` is not `NULL`, fill in `obj` with that object
- *   - Set `ctx->error` to `SKIP_DEPTH_LIMIT_EXCEEDED_ERROR`
- *   - Return `false`
- * Otherwise:
- *   - (Don't touch `obj`)
- *   - Return `true`
- */
-bool cmp_skip_object(cmp_ctx_t *ctx, cmp_object_t *obj);
-
-/*
- * This is similar to `cmp_skip_object`, except it tolerates up to `limit`
- * levels of nesting.  For example, in order to skip an array that contains a
- * map, call `cmp_skip_object_limit(ctx, &obj, 2)`.  Or in other words,
- * `cmp_skip_object(ctx, &obj)` acts similarly to `cmp_skip_object_limit(ctx,
- * &obj, 0)`
- *
- * Specifically, `limit` refers to depth, not breadth.  So in order to skip an
- * array that contains two arrays that each contain 3 strings, you would call
- * `cmp_skip_object_limit(ctx, &obj, 2).  In order to skip an array that
- * contains 4 arrays that each contain 1 string, you would still call
- * `cmp_skip_object_limit(ctx, &obj, 2).
- */
-bool cmp_skip_object_limit(cmp_ctx_t *ctx, cmp_object_t *obj, uint32_t limit);
-
-/*
- * This is similar to `cmp_skip_object`, except it will continually skip
- * nested data structures.
- *
- * WARNING: This can cause your application to spend an unbounded amount of
- *          time reading nested data structures.  Unless you completely trust
- *          the data source, you should strongly consider `cmp_skip_object` or
- *          `cmp_skip_object_limit`.
- */
-bool cmp_skip_object_no_limit(cmp_ctx_t *ctx);
-
-/*
- * ============================================================================
- * === Specific API
- * ============================================================================
- */
-
-bool cmp_write_pfix(cmp_ctx_t *ctx, uint8_t c);
-bool cmp_write_nfix(cmp_ctx_t *ctx, int8_t c);
-
-bool cmp_write_sfix(cmp_ctx_t *ctx, int8_t c);
-bool cmp_write_s8(cmp_ctx_t *ctx, int8_t c);
-bool cmp_write_s16(cmp_ctx_t *ctx, int16_t s);
-bool cmp_write_s32(cmp_ctx_t *ctx, int32_t i);
-bool cmp_write_s64(cmp_ctx_t *ctx, int64_t l);
-
-bool cmp_write_ufix(cmp_ctx_t *ctx, uint8_t c);
-bool cmp_write_u8(cmp_ctx_t *ctx, uint8_t c);
-bool cmp_write_u16(cmp_ctx_t *ctx, uint16_t s);
-bool cmp_write_u32(cmp_ctx_t *ctx, uint32_t i);
-bool cmp_write_u64(cmp_ctx_t *ctx, uint64_t l);
-
-bool cmp_write_float(cmp_ctx_t *ctx, float f);
-bool cmp_write_double(cmp_ctx_t *ctx, double d);
-
-bool cmp_write_fixstr_marker(cmp_ctx_t *ctx, uint8_t size);
-bool cmp_write_fixstr(cmp_ctx_t *ctx, const char *data, uint8_t size);
-bool cmp_write_str8_marker(cmp_ctx_t *ctx, uint8_t size);
-bool cmp_write_str8(cmp_ctx_t *ctx, const char *data, uint8_t size);
-bool cmp_write_str16_marker(cmp_ctx_t *ctx, uint16_t size);
-bool cmp_write_str16(cmp_ctx_t *ctx, const char *data, uint16_t size);
-bool cmp_write_str32_marker(cmp_ctx_t *ctx, uint32_t size);
-bool cmp_write_str32(cmp_ctx_t *ctx, const char *data, uint32_t size);
-
-bool cmp_write_bin8_marker(cmp_ctx_t *ctx, uint8_t size);
-bool cmp_write_bin8(cmp_ctx_t *ctx, const void *data, uint8_t size);
-bool cmp_write_bin16_marker(cmp_ctx_t *ctx, uint16_t size);
-bool cmp_write_bin16(cmp_ctx_t *ctx, const void *data, uint16_t size);
-bool cmp_write_bin32_marker(cmp_ctx_t *ctx, uint32_t size);
-bool cmp_write_bin32(cmp_ctx_t *ctx, const void *data, uint32_t size);
-
-bool cmp_write_fixarray(cmp_ctx_t *ctx, uint8_t size);
-bool cmp_write_array16(cmp_ctx_t *ctx, uint16_t size);
-bool cmp_write_array32(cmp_ctx_t *ctx, uint32_t size);
-
-bool cmp_write_fixmap(cmp_ctx_t *ctx, uint8_t size);
-bool cmp_write_map16(cmp_ctx_t *ctx, uint16_t size);
-bool cmp_write_map32(cmp_ctx_t *ctx, uint32_t size);
-
-bool cmp_write_fixext1_marker(cmp_ctx_t *ctx, int8_t type);
-bool cmp_write_fixext1(cmp_ctx_t *ctx, int8_t type, const void *data);
-bool cmp_write_fixext2_marker(cmp_ctx_t *ctx, int8_t type);
-bool cmp_write_fixext2(cmp_ctx_t *ctx, int8_t type, const void *data);
-bool cmp_write_fixext4_marker(cmp_ctx_t *ctx, int8_t type);
-bool cmp_write_fixext4(cmp_ctx_t *ctx, int8_t type, const void *data);
-bool cmp_write_fixext8_marker(cmp_ctx_t *ctx, int8_t type);
-bool cmp_write_fixext8(cmp_ctx_t *ctx, int8_t type, const void *data);
-bool cmp_write_fixext16_marker(cmp_ctx_t *ctx, int8_t type);
-bool cmp_write_fixext16(cmp_ctx_t *ctx, int8_t type, const void *data);
-
-bool cmp_write_ext8_marker(cmp_ctx_t *ctx, int8_t type, uint8_t size);
-bool cmp_write_ext8(cmp_ctx_t *ctx, int8_t type, uint8_t size,
-                                    const void *data);
-bool cmp_write_ext16_marker(cmp_ctx_t *ctx, int8_t type, uint16_t size);
-bool cmp_write_ext16(cmp_ctx_t *ctx, int8_t type, uint16_t size,
-                                     const void *data);
-bool cmp_write_ext32_marker(cmp_ctx_t *ctx, int8_t type, uint32_t size);
-bool cmp_write_ext32(cmp_ctx_t *ctx, int8_t type, uint32_t size,
-                                     const void *data);
-
-bool cmp_read_pfix(cmp_ctx_t *ctx, uint8_t *c);
-bool cmp_read_nfix(cmp_ctx_t *ctx, int8_t *c);
-
-bool cmp_read_sfix(cmp_ctx_t *ctx, int8_t *c);
-bool cmp_read_s8(cmp_ctx_t *ctx, int8_t *c);
-bool cmp_read_s16(cmp_ctx_t *ctx, int16_t *s);
-bool cmp_read_s32(cmp_ctx_t *ctx, int32_t *i);
-bool cmp_read_s64(cmp_ctx_t *ctx, int64_t *l);
-
-bool cmp_read_ufix(cmp_ctx_t *ctx, uint8_t *c);
-bool cmp_read_u8(cmp_ctx_t *ctx, uint8_t *c);
-bool cmp_read_u16(cmp_ctx_t *ctx, uint16_t *s);
-bool cmp_read_u32(cmp_ctx_t *ctx, uint32_t *i);
-bool cmp_read_u64(cmp_ctx_t *ctx, uint64_t *l);
-
-bool cmp_read_float(cmp_ctx_t *ctx, float *f);
-bool cmp_read_double(cmp_ctx_t *ctx, double *d);
-
-bool cmp_read_fixext1_marker(cmp_ctx_t *ctx, int8_t *type);
-bool cmp_read_fixext1(cmp_ctx_t *ctx, int8_t *type, void *data);
-bool cmp_read_fixext2_marker(cmp_ctx_t *ctx, int8_t *type);
-bool cmp_read_fixext2(cmp_ctx_t *ctx, int8_t *type, void *data);
-bool cmp_read_fixext4_marker(cmp_ctx_t *ctx, int8_t *type);
-bool cmp_read_fixext4(cmp_ctx_t *ctx, int8_t *type, void *data);
-bool cmp_read_fixext8_marker(cmp_ctx_t *ctx, int8_t *type);
-bool cmp_read_fixext8(cmp_ctx_t *ctx, int8_t *type, void *data);
-bool cmp_read_fixext16_marker(cmp_ctx_t *ctx, int8_t *type);
-bool cmp_read_fixext16(cmp_ctx_t *ctx, int8_t *type, void *data);
-
-bool cmp_read_ext8_marker(cmp_ctx_t *ctx, int8_t *type, uint8_t *size);
-bool cmp_read_ext8(cmp_ctx_t *ctx, int8_t *type, uint8_t *size, void *data);
-bool cmp_read_ext16_marker(cmp_ctx_t *ctx, int8_t *type, uint16_t *size);
-bool cmp_read_ext16(cmp_ctx_t *ctx, int8_t *type, uint16_t *size, void *data);
-bool cmp_read_ext32_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size);
-bool cmp_read_ext32(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data);
-
-/*
- * ============================================================================
- * === Object API
- * ============================================================================
- */
-
-bool cmp_object_is_char(cmp_object_t *obj);
-bool cmp_object_is_short(cmp_object_t *obj);
-bool cmp_object_is_int(cmp_object_t *obj);
-bool cmp_object_is_long(cmp_object_t *obj);
-bool cmp_object_is_sinteger(cmp_object_t *obj);
-bool cmp_object_is_uchar(cmp_object_t *obj);
-bool cmp_object_is_ushort(cmp_object_t *obj);
-bool cmp_object_is_uint(cmp_object_t *obj);
-bool cmp_object_is_ulong(cmp_object_t *obj);
-bool cmp_object_is_uinteger(cmp_object_t *obj);
-bool cmp_object_is_float(cmp_object_t *obj);
-bool cmp_object_is_double(cmp_object_t *obj);
-bool cmp_object_is_nil(cmp_object_t *obj);
-bool cmp_object_is_bool(cmp_object_t *obj);
-bool cmp_object_is_str(cmp_object_t *obj);
-bool cmp_object_is_bin(cmp_object_t *obj);
-bool cmp_object_is_array(cmp_object_t *obj);
-bool cmp_object_is_map(cmp_object_t *obj);
-bool cmp_object_is_ext(cmp_object_t *obj);
-
-bool cmp_object_as_char(cmp_object_t *obj, int8_t *c);
-bool cmp_object_as_short(cmp_object_t *obj, int16_t *s);
-bool cmp_object_as_int(cmp_object_t *obj, int32_t *i);
-bool cmp_object_as_long(cmp_object_t *obj, int64_t *d);
-bool cmp_object_as_sinteger(cmp_object_t *obj, int64_t *d);
-bool cmp_object_as_uchar(cmp_object_t *obj, uint8_t *c);
-bool cmp_object_as_ushort(cmp_object_t *obj, uint16_t *s);
-bool cmp_object_as_uint(cmp_object_t *obj, uint32_t *i);
-bool cmp_object_as_ulong(cmp_object_t *obj, uint64_t *u);
-bool cmp_object_as_uinteger(cmp_object_t *obj, uint64_t *u);
-bool cmp_object_as_float(cmp_object_t *obj, float *f);
-bool cmp_object_as_double(cmp_object_t *obj, double *d);
-bool cmp_object_as_bool(cmp_object_t *obj, bool *b);
-bool cmp_object_as_str(cmp_object_t *obj, uint32_t *size);
-bool cmp_object_as_bin(cmp_object_t *obj, uint32_t *size);
-bool cmp_object_as_array(cmp_object_t *obj, uint32_t *size);
-bool cmp_object_as_map(cmp_object_t *obj, uint32_t *size);
-bool cmp_object_as_ext(cmp_object_t *obj, int8_t *type, uint32_t *size);
-
-bool cmp_object_to_str(cmp_ctx_t *ctx, cmp_object_t *obj, char *data, uint32_t buf_size);
-bool cmp_object_to_bin(cmp_ctx_t *ctx, cmp_object_t *obj, void *data, uint32_t buf_size);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-/*
- * ============================================================================
- * === Backwards compatibility defines
- * ============================================================================
- */
-
-#define cmp_write_int      cmp_write_integer
-#define cmp_write_sint     cmp_write_integer
-#define cmp_write_sinteger cmp_write_integer
-#define cmp_write_uint     cmp_write_uinteger
-#define cmp_read_sinteger  cmp_read_integer
-
-#endif /* CMP_H__ */
-
-/* vi: set et ts=2 sw=2: */
-
diff --git a/debian/modules/nchan/src/store/redis/hiredis/.travis.yml b/debian/modules/nchan/src/store/redis/hiredis/.travis.yml
deleted file mode 100644
index f9a9460..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/.travis.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-language: c
-compiler:
-  - gcc
-  - clang
-
-os:
-  - linux
-  - osx
-
-dist: bionic
-
-branches:
-  only:
-    - staging
-    - trying
-    - master
-    - /^release\/.*$/
-
-install:
-    - if [ "$BITS" == "64" ]; then
-        wget https://github.com/redis/redis/archive/6.0.6.tar.gz;
-        tar -xzvf 6.0.6.tar.gz;
-        pushd redis-6.0.6 && BUILD_TLS=yes make && export PATH=$PWD/src:$PATH && popd;
-      fi
-
-before_script:
-    - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-        curl -O https://distfiles.macports.org/MacPorts/MacPorts-2.6.2-10.13-HighSierra.pkg;
-        sudo installer -pkg MacPorts-2.6.2-10.13-HighSierra.pkg -target /;
-        export PATH=$PATH:/opt/local/bin && sudo port -v selfupdate;
-        sudo port -N install openssl redis;
-      fi;
-
-addons:
-  apt:
-    sources:
-    - sourceline: 'ppa:chris-lea/redis-server'
-    packages:
-    - libc6-dbg
-    - libc6-dev
-    - libc6:i386
-    - libc6-dev-i386
-    - libc6-dbg:i386
-    - gcc-multilib
-    - g++-multilib
-    - libssl-dev
-    - libssl-dev:i386
-    - valgrind
-    - redis
-
-env:
-  - BITS="32"
-  - BITS="64"
-
-script:
-  - EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON -DENABLE_SSL:BOOL=ON";
-    if [ "$BITS" == "64" ]; then
-      EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DENABLE_SSL_TESTS:BOOL=ON";
-    fi;
-    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-      if [ "$BITS" == "32" ]; then
-        CFLAGS="-m32 -Werror";
-        CXXFLAGS="-m32 -Werror";
-        LDFLAGS="-m32";
-        EXTRA_CMAKE_OPTS=;
-      else
-        CFLAGS="-Werror";
-        CXXFLAGS="-Werror";
-      fi;
-    else
-      TEST_PREFIX="valgrind --track-origins=yes --leak-check=full";
-      if [ "$BITS" == "32" ]; then
-        CFLAGS="-m32 -Werror";
-        CXXFLAGS="-m32 -Werror";
-        LDFLAGS="-m32";
-        EXTRA_CMAKE_OPTS=;
-      else
-        CFLAGS="-Werror";
-        CXXFLAGS="-Werror";
-      fi;
-    fi;
-    export CFLAGS CXXFLAGS LDFLAGS TEST_PREFIX EXTRA_CMAKE_OPTS
-  - make && make clean;
-    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-      if [ "$BITS" == "64" ]; then
-        OPENSSL_PREFIX="$(ls -d /usr/local/Cellar/openssl@1.1/*)" USE_SSL=1 make;
-      fi;
-    else
-      USE_SSL=1 make;
-    fi;
-  - mkdir build/ && cd build/
-  - cmake .. ${EXTRA_CMAKE_OPTS}
-  - make VERBOSE=1
-  - if [ "$BITS" == "64" ]; then
-      TEST_SSL=1 SKIPS_AS_FAILS=1 ctest -V;
-    else
-      SKIPS_AS_FAILS=1 ctest -V;
-    fi;
-
-jobs:
-  include:
-    # Windows MinGW cross compile on Linux
-    - os: linux
-      dist: xenial
-      compiler: mingw
-      addons:
-        apt:
-          packages:
-            - ninja-build
-            - gcc-mingw-w64-x86-64
-            - g++-mingw-w64-x86-64
-      script:
-        - mkdir build && cd build
-        - CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_WITH_INSTALL_RPATH=on
-        - ninja -v
-
-    # Windows MSVC 2017
-    - os: windows
-      compiler: msvc
-      env:
-        - MATRIX_EVAL="CC=cl.exe && CXX=cl.exe"
-      before_install:
-        - eval "${MATRIX_EVAL}"
-      install:
-        - choco install ninja
-        - choco install -y memurai-developer
-      script:
-        - mkdir build && cd build
-        - cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' amd64 '&&'
-          cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_EXAMPLES=ON '&&' ninja -v
-        - ./hiredis-test.exe
diff --git a/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md b/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md
deleted file mode 100644
index 2a2bc31..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/CHANGELOG.md
+++ /dev/null
@@ -1,364 +0,0 @@
-## [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2) - (2021-10-07)
-
-Announcing Hiredis v1.0.2, which fixes CVE-2021-32765 but returns the SONAME to the correct value of `1.0.0`.
-
-- [Revert SONAME bump](https://github.com/redis/hiredis/commit/d4e6f109a064690cde64765c654e679fea1d3548)
-  ([Michael Grunder](https://github.com/michael-grunder))
-
-## [1.0.1](https://github.com/redis/hiredis/tree/v1.0.1) - (2021-10-04)
-
-<span style="color:red">This release erroneously bumped the SONAME, please use [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2)</span>
-
-Announcing Hiredis v1.0.1, a security release fixing CVE-2021-32765
-
-- Fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2)
-  [commit](https://github.com/redis/hiredis/commit/76a7b10005c70babee357a7d0f2becf28ec7ed1e)
-  ([Yossi Gottlieb](https://github.com/yossigo))
-
-_Thanks to [Yossi Gottlieb](https://github.com/yossigo) for the security fix and to [Microsoft Security Vulnerability Research](https://www.microsoft.com/en-us/msrc/msvr) for finding the bug._ :sparkling_heart:
-
-## [1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) - (2020-08-03)
-
-Announcing Hiredis v1.0.0, which adds support for RESP3, SSL connections, allocator injection, and better Windows support! :tada:
-
-_A big thanks to everyone who helped with this release.  The following list includes everyone who contributed at least five lines, sorted by lines contributed._ :sparkling_heart:
-
-[Michael Grunder](https://github.com/michael-grunder), [Yossi Gottlieb](https://github.com/yossigo),
-[Mark Nunberg](https://github.com/mnunberg), [Marcus Geelnard](https://github.com/mbitsnbites),
-[Justin Brewer](https://github.com/justinbrewer), [Valentino Geron](https://github.com/valentinogeron),
-[Minun Dragonation](https://github.com/dragonation), [Omri Steiner](https://github.com/OmriSteiner),
-[Sangmoon Yi](https://github.com/jman-krafton), [Jinjiazh](https://github.com/jinjiazhang),
-[Odin Hultgren Van Der Horst](https://github.com/Miniwoffer), [Muhammad Zahalqa](https://github.com/tryfinally),
-[Nick Rivera](https://github.com/heronr), [Qi Yang](https://github.com/movebean),
-[kevin1018](https://github.com/kevin1018)
-
-[Full Changelog](https://github.com/redis/hiredis/compare/v0.14.1...v1.0.0)
-
-**BREAKING CHANGES**:
-
-* `redisOptions` now has two timeout fields.  One for connecting, and one for commands.  If you're presently using `options->timeout` you will need to change it to use `options->connect_timeout`. (See [example](https://github.com/redis/hiredis/commit/38b5ae543f5c99eb4ccabbe277770fc6bc81226f#diff-86ba39d37aa829c8c82624cce4f049fbL36))
-
-* Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now protocol errors. This is consistent
-  with the RESP specification. On 32-bit platforms, the upper bound is lowered to `SIZE_MAX`.
-
-* `redisReplyObjectFunctions.createArray` now takes `size_t` for its length parameter.
-
-**New features:**
-- Support for RESP3
-  [\#697](https://github.com/redis/hiredis/pull/697),
-  [\#805](https://github.com/redis/hiredis/pull/805),
-  [\#819](https://github.com/redis/hiredis/pull/819),
-  [\#841](https://github.com/redis/hiredis/pull/841)
-  ([Yossi Gottlieb](https://github.com/yossigo), [Michael Grunder](https://github.com/michael-grunder))
-- Support for SSL connections
-  [\#645](https://github.com/redis/hiredis/pull/645),
-  [\#699](https://github.com/redis/hiredis/pull/699),
-  [\#702](https://github.com/redis/hiredis/pull/702),
-  [\#708](https://github.com/redis/hiredis/pull/708),
-  [\#711](https://github.com/redis/hiredis/pull/711),
-  [\#821](https://github.com/redis/hiredis/pull/821),
-  [more](https://github.com/redis/hiredis/pulls?q=is%3Apr+is%3Amerged+SSL)
-  ([Mark Nunberg](https://github.com/mnunberg), [Yossi Gottlieb](https://github.com/yossigo))
-- Run-time allocator injection
-  [\#800](https://github.com/redis/hiredis/pull/800)
-  ([Michael Grunder](https://github.com/michael-grunder))
-- Improved Windows support (including MinGW and Windows CI)
-  [\#652](https://github.com/redis/hiredis/pull/652),
-  [\#663](https://github.com/redis/hiredis/pull/663)
-  ([Marcus Geelnard](https://www.bitsnbites.eu/author/m/))
-- Adds support for distinct connect and command timeouts
-  [\#839](https://github.com/redis/hiredis/pull/839),
-  [\#829](https://github.com/redis/hiredis/pull/829)
-  ([Valentino Geron](https://github.com/valentinogeron))
-- Add generic pointer and destructor to `redisContext` that users can use for context.
-  [\#855](https://github.com/redis/hiredis/pull/855)
-  ([Michael Grunder](https://github.com/michael-grunder))
-
-**Closed issues (that involved code changes):**
-
-- Makefile does not install TLS libraries  [\#809](https://github.com/redis/hiredis/issues/809)
-- redisConnectWithOptions should not set command timeout [\#722](https://github.com/redis/hiredis/issues/722), [\#829](https://github.com/redis/hiredis/pull/829) ([valentinogeron](https://github.com/valentinogeron))
-- Fix integer overflow in `sdsrange` [\#827](https://github.com/redis/hiredis/issues/827)
-- INFO & CLUSTER commands failed when using RESP3 [\#802](https://github.com/redis/hiredis/issues/802)
-- Windows compatibility patches [\#687](https://github.com/redis/hiredis/issues/687), [\#838](https://github.com/redis/hiredis/issues/838), [\#842](https://github.com/redis/hiredis/issues/842)
-- RESP3 PUSH messages incorrectly use pending callback [\#825](https://github.com/redis/hiredis/issues/825)
-- Asynchronous PSUBSCRIBE command fails when using RESP3 [\#815](https://github.com/redis/hiredis/issues/815)
-- New SSL API [\#804](https://github.com/redis/hiredis/issues/804), [\#813](https://github.com/redis/hiredis/issues/813)
-- Hard-coded limit of nested reply depth [\#794](https://github.com/redis/hiredis/issues/794)
-- Fix TCP_NODELAY in Windows/OSX [\#679](https://github.com/redis/hiredis/issues/679), [\#690](https://github.com/redis/hiredis/issues/690), [\#779](https://github.com/redis/hiredis/issues/779), [\#785](https://github.com/redis/hiredis/issues/785),
-- Added timers to libev adapter.  [\#778](https://github.com/redis/hiredis/issues/778), [\#795](https://github.com/redis/hiredis/pull/795)
-- Initialization discards const qualifier [\#777](https://github.com/redis/hiredis/issues/777)
-- \[BUG\]\[MinGW64\] Error setting socket timeout  [\#775](https://github.com/redis/hiredis/issues/775)
-- undefined reference to hi_malloc [\#769](https://github.com/redis/hiredis/issues/769)
-- hiredis pkg-config file incorrectly ignores multiarch libdir spec'n [\#767](https://github.com/redis/hiredis/issues/767)
-- Don't use -G to build shared object on Solaris [\#757](https://github.com/redis/hiredis/issues/757)
-- error when make USE\_SSL=1 [\#748](https://github.com/redis/hiredis/issues/748)
-- Allow to change SSL Mode [\#646](https://github.com/redis/hiredis/issues/646)
-- hiredis/adapters/libevent.h memleak [\#618](https://github.com/redis/hiredis/issues/618)
-- redisLibuvPoll crash when server closes the connetion [\#545](https://github.com/redis/hiredis/issues/545)
-- about redisAsyncDisconnect question [\#518](https://github.com/redis/hiredis/issues/518)
-- hiredis adapters libuv error for help [\#508](https://github.com/redis/hiredis/issues/508)
-- API/ABI changes analysis [\#506](https://github.com/redis/hiredis/issues/506)
-- Memory leak patch in Redis [\#502](https://github.com/redis/hiredis/issues/502)
-- Remove the depth limitation [\#421](https://github.com/redis/hiredis/issues/421)
-
-**Merged pull requests:**
-
-- Move SSL management to a distinct private pointer [\#855](https://github.com/redis/hiredis/pull/855) ([michael-grunder](https://github.com/michael-grunder))
-- Move include to sockcompat.h to maintain style [\#850](https://github.com/redis/hiredis/pull/850) ([michael-grunder](https://github.com/michael-grunder))
-- Remove erroneous tag and add license to push example [\#849](https://github.com/redis/hiredis/pull/849) ([michael-grunder](https://github.com/michael-grunder))
-- fix windows compiling with mingw [\#848](https://github.com/redis/hiredis/pull/848) ([rmalizia44](https://github.com/rmalizia44))
-- Some Windows quality of life improvements. [\#846](https://github.com/redis/hiredis/pull/846) ([michael-grunder](https://github.com/michael-grunder))
-- Use \_WIN32 define instead of WIN32 [\#845](https://github.com/redis/hiredis/pull/845) ([michael-grunder](https://github.com/michael-grunder))
-- Non Linux CI fixes [\#844](https://github.com/redis/hiredis/pull/844) ([michael-grunder](https://github.com/michael-grunder))
-- Resp3 oob push support [\#841](https://github.com/redis/hiredis/pull/841) ([michael-grunder](https://github.com/michael-grunder))
-- fix \#785: defer TCP\_NODELAY in async tcp connections [\#836](https://github.com/redis/hiredis/pull/836) ([OmriSteiner](https://github.com/OmriSteiner))
-- sdsrange overflow fix [\#830](https://github.com/redis/hiredis/pull/830) ([michael-grunder](https://github.com/michael-grunder))
-- Use explicit pointer casting for c++ compatibility [\#826](https://github.com/redis/hiredis/pull/826) ([aureus1](https://github.com/aureus1))
-- Document allocator injection and completeness fix in test.c [\#824](https://github.com/redis/hiredis/pull/824) ([michael-grunder](https://github.com/michael-grunder))
-- Use unique names for allocator struct members [\#823](https://github.com/redis/hiredis/pull/823) ([michael-grunder](https://github.com/michael-grunder))
-- New SSL API to replace redisSecureConnection\(\). [\#821](https://github.com/redis/hiredis/pull/821) ([yossigo](https://github.com/yossigo))
-- Add logic to handle RESP3 push messages [\#819](https://github.com/redis/hiredis/pull/819) ([michael-grunder](https://github.com/michael-grunder))
-- Use standrad isxdigit instead of custom helper function. [\#814](https://github.com/redis/hiredis/pull/814) ([tryfinally](https://github.com/tryfinally))
-- Fix missing SSL build/install options. [\#812](https://github.com/redis/hiredis/pull/812) ([yossigo](https://github.com/yossigo))
-- Add link to ABI tracker [\#808](https://github.com/redis/hiredis/pull/808) ([michael-grunder](https://github.com/michael-grunder))
-- Resp3 verbatim string support [\#805](https://github.com/redis/hiredis/pull/805) ([michael-grunder](https://github.com/michael-grunder))
-- Allow users to replace allocator and handle OOM everywhere. [\#800](https://github.com/redis/hiredis/pull/800) ([michael-grunder](https://github.com/michael-grunder))
-- Remove nested depth limitation. [\#797](https://github.com/redis/hiredis/pull/797) ([michael-grunder](https://github.com/michael-grunder))
-- Attempt to fix compilation on Solaris [\#796](https://github.com/redis/hiredis/pull/796) ([michael-grunder](https://github.com/michael-grunder))
-- Support timeouts in libev adapater [\#795](https://github.com/redis/hiredis/pull/795) ([michael-grunder](https://github.com/michael-grunder))
-- Fix pkgconfig when installing to a custom lib dir [\#793](https://github.com/redis/hiredis/pull/793) ([michael-grunder](https://github.com/michael-grunder))
-- Fix USE\_SSL=1 make/cmake on OSX and CMake tests [\#789](https://github.com/redis/hiredis/pull/789) ([michael-grunder](https://github.com/michael-grunder))
-- Use correct libuv call on Windows [\#784](https://github.com/redis/hiredis/pull/784) ([michael-grunder](https://github.com/michael-grunder))
-- Added CMake package config and fixed hiredis\_ssl on Windows [\#783](https://github.com/redis/hiredis/pull/783) ([michael-grunder](https://github.com/michael-grunder))
-- CMake: Set hiredis\_ssl shared object version. [\#780](https://github.com/redis/hiredis/pull/780) ([yossigo](https://github.com/yossigo))
-- Win32 tests and timeout fix [\#776](https://github.com/redis/hiredis/pull/776) ([michael-grunder](https://github.com/michael-grunder))
-- Provides an optional cleanup callback for async data. [\#768](https://github.com/redis/hiredis/pull/768) ([heronr](https://github.com/heronr))
-- Housekeeping fixes [\#764](https://github.com/redis/hiredis/pull/764) ([michael-grunder](https://github.com/michael-grunder))
-- install alloc.h [\#756](https://github.com/redis/hiredis/pull/756) ([ch1aki](https://github.com/ch1aki))
-- fix spelling mistakes [\#746](https://github.com/redis/hiredis/pull/746) ([ShooterIT](https://github.com/ShooterIT))
-- Free the reply in redisGetReply when passed NULL [\#741](https://github.com/redis/hiredis/pull/741) ([michael-grunder](https://github.com/michael-grunder))
-- Fix dead code in sslLogCallback relating to should\_log variable. [\#737](https://github.com/redis/hiredis/pull/737) ([natoscott](https://github.com/natoscott))
-- Fix typo in dict.c. [\#731](https://github.com/redis/hiredis/pull/731) ([Kevin-Xi](https://github.com/Kevin-Xi))
-- Adding an option to DISABLE\_TESTS [\#727](https://github.com/redis/hiredis/pull/727) ([pbotros](https://github.com/pbotros))
-- Update README with SSL support. [\#720](https://github.com/redis/hiredis/pull/720) ([yossigo](https://github.com/yossigo))
-- Fixes leaks in unit tests [\#715](https://github.com/redis/hiredis/pull/715) ([michael-grunder](https://github.com/michael-grunder))
-- SSL Tests [\#711](https://github.com/redis/hiredis/pull/711) ([yossigo](https://github.com/yossigo))
-- SSL Reorganization [\#708](https://github.com/redis/hiredis/pull/708) ([yossigo](https://github.com/yossigo))
-- Fix MSVC build. [\#706](https://github.com/redis/hiredis/pull/706) ([yossigo](https://github.com/yossigo))
-- SSL: Properly report SSL\_connect\(\) errors. [\#702](https://github.com/redis/hiredis/pull/702) ([yossigo](https://github.com/yossigo))
-- Silent SSL trace to stdout by default. [\#699](https://github.com/redis/hiredis/pull/699) ([yossigo](https://github.com/yossigo))
-- Port RESP3 support from Redis. [\#697](https://github.com/redis/hiredis/pull/697) ([yossigo](https://github.com/yossigo))
-- Removed whitespace before newline [\#691](https://github.com/redis/hiredis/pull/691) ([Miniwoffer](https://github.com/Miniwoffer))
-- Add install adapters header files [\#688](https://github.com/redis/hiredis/pull/688) ([kevin1018](https://github.com/kevin1018))
-- Remove unnecessary null check before free [\#684](https://github.com/redis/hiredis/pull/684) ([qlyoung](https://github.com/qlyoung))
-- redisReaderGetReply leak memory [\#671](https://github.com/redis/hiredis/pull/671) ([movebean](https://github.com/movebean))
-- fix timeout code in windows [\#670](https://github.com/redis/hiredis/pull/670) ([jman-krafton](https://github.com/jman-krafton))
-- test: fix errstr matching for musl libc [\#665](https://github.com/redis/hiredis/pull/665) ([ghost](https://github.com/ghost))
-- Windows: MinGW fixes and Windows Travis builders [\#663](https://github.com/redis/hiredis/pull/663) ([mbitsnbites](https://github.com/mbitsnbites))
-- The setsockopt and getsockopt API diffs from BSD socket and WSA one [\#662](https://github.com/redis/hiredis/pull/662) ([dragonation](https://github.com/dragonation))
-- Fix Compile Error On Windows \(Visual Studio\) [\#658](https://github.com/redis/hiredis/pull/658) ([jinjiazhang](https://github.com/jinjiazhang))
-- Fix NXDOMAIN test case [\#653](https://github.com/redis/hiredis/pull/653) ([michael-grunder](https://github.com/michael-grunder))
-- Add MinGW support [\#652](https://github.com/redis/hiredis/pull/652) ([mbitsnbites](https://github.com/mbitsnbites))
-- SSL Support [\#645](https://github.com/redis/hiredis/pull/645) ([mnunberg](https://github.com/mnunberg))
-- Fix Invalid argument after redisAsyncConnectUnix [\#644](https://github.com/redis/hiredis/pull/644) ([codehz](https://github.com/codehz))
-- Makefile: use predefined AR [\#632](https://github.com/redis/hiredis/pull/632) ([Mic92](https://github.com/Mic92))
-- FreeBSD  build fix [\#628](https://github.com/redis/hiredis/pull/628) ([devnexen](https://github.com/devnexen))
-- Fix errors not propagating properly with libuv.h. [\#624](https://github.com/redis/hiredis/pull/624) ([yossigo](https://github.com/yossigo))
-- Update README.md [\#621](https://github.com/redis/hiredis/pull/621) ([Crunsher](https://github.com/Crunsher))
-- Fix redisBufferRead documentation [\#620](https://github.com/redis/hiredis/pull/620) ([hacst](https://github.com/hacst))
-- Add CPPFLAGS to REAL\_CFLAGS [\#614](https://github.com/redis/hiredis/pull/614) ([thomaslee](https://github.com/thomaslee))
-- Update createArray to take size\_t [\#597](https://github.com/redis/hiredis/pull/597) ([justinbrewer](https://github.com/justinbrewer))
-- fix common realloc mistake and add null check more [\#580](https://github.com/redis/hiredis/pull/580) ([charsyam](https://github.com/charsyam))
-- Proper error reporting for connect failures [\#578](https://github.com/redis/hiredis/pull/578) ([mnunberg](https://github.com/mnunberg))
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
-
-## [1.0.0-rc1](https://github.com/redis/hiredis/tree/v1.0.0-rc1) - (2020-07-29)
-
-_Note:  There were no changes to code between v1.0.0-rc1 and v1.0.0 so see v1.0.0 for changelog_
-
-### 0.14.1 (2020-03-13)
-
-* Adds safe allocation wrappers (CVE-2020-7105, #747, #752) (Michael Grunder)
-
-### 0.14.0 (2018-09-25)
-**BREAKING CHANGES**:
-
-* Change `redisReply.len` to `size_t`, as it denotes the the size of a string
-
-  User code should compare this to `size_t` values as well.
-  If it was used to compare to other values, casting might be necessary or can be removed, if casting was applied before.
-
-* Make string2ll static to fix conflict with Redis (Tom Lee [c3188b])
-* Use -dynamiclib instead of -shared for OSX (Ryan Schmidt [a65537])
-* Use string2ll from Redis w/added tests (Michael Grunder [7bef04, 60f622])
-* Makefile - OSX compilation fixes (Ryan Schmidt [881fcb, 0e9af8])
-* Remove redundant NULL checks (Justin Brewer [54acc8, 58e6b8])
-* Fix bulk and multi-bulk length truncation (Justin Brewer [109197])
-* Fix SIGSEGV in OpenBSD by checking for NULL before calling freeaddrinfo (Justin Brewer [546d94])
-* Several POSIX compatibility fixes (Justin Brewer [bbeab8, 49bbaa, d1c1b6])
-* Makefile - Compatibility fixes (Dimitri Vorobiev [3238cf, 12a9d1])
-* Makefile - Fix make install on FreeBSD (Zach Shipko [a2ef2b])
-* Makefile - don't assume $(INSTALL) is cp (Igor Gnatenko [725a96])
-* Separate side-effect causing function from assert and small cleanup (amallia [b46413, 3c3234])
-* Don't send negative values to `__redisAsyncCommand` (Frederik Deweerdt [706129])
-* Fix leak if setsockopt fails (Frederik Deweerdt [e21c9c])
-* Fix libevent leak (zfz [515228])
-* Clean up GCC warning (Ichito Nagata [2ec774])
-* Keep track of errno in `__redisSetErrorFromErrno()` as snprintf may use it (Jin Qing [25cd88])
-* Solaris compilation fix (Donald Whyte [41b07d])
-* Reorder linker arguments when building examples (Tustfarm-heart [06eedd])
-* Keep track of subscriptions in case of rapid subscribe/unsubscribe (Hyungjin Kim [073dc8, be76c5, d46999])
-* libuv use after free fix (Paul Scott [cbb956])
-* Properly close socket fd on reconnect attempt (WSL [64d1ec])
-* Skip valgrind in OSX tests (Jan-Erik Rediger [9deb78])
-* Various updates for Travis testing OSX (Ted Nyman [fa3774, 16a459, bc0ea5])
-* Update libevent (Chris Xin [386802])
-* Change sds.h for building in C++ projects (Ali Volkan ATLI [f5b32e])
-* Use proper format specifier in redisFormatSdsCommandArgv (Paulino Huerta, Jan-Erik Rediger [360a06, 8655a6])
-* Better handling of NULL reply in example code (Jan-Erik Rediger [1b8ed3])
-* Prevent overflow when formatting an error (Jan-Erik Rediger [0335cb])
-* Compatibility fix for strerror_r (Tom Lee [bb1747])
-* Properly detect integer parse/overflow errors (Justin Brewer [93421f])
-* Adds CI for Windows and cygwin fixes (owent, [6c53d6, 6c3e40])
-* Catch a buffer overflow when formatting the error message
-* Import latest upstream sds. This breaks applications that are linked against the old hiredis v0.13
-* Fix warnings, when compiled with -Wshadow
-* Make hiredis compile in Cygwin on Windows, now CI-tested
-* Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
-  protocol errors. This is consistent with the RESP specification. On 32-bit
-  platforms, the upper bound is lowered to `SIZE_MAX`.
-
-* Remove backwards compatibility macro's
-
-This removes the following old function aliases, use the new name now:
-
-| Old                         | New                    |
-| --------------------------- | ---------------------- |
-| redisReplyReaderCreate      | redisReaderCreate      |
-| redisReplyReaderCreate      | redisReaderCreate      |
-| redisReplyReaderFree        | redisReaderFree        |
-| redisReplyReaderFeed        | redisReaderFeed        |
-| redisReplyReaderGetReply    | redisReaderGetReply    |
-| redisReplyReaderSetPrivdata | redisReaderSetPrivdata |
-| redisReplyReaderGetObject   | redisReaderGetObject   |
-| redisReplyReaderGetError    | redisReaderGetError    |
-
-* The `DEBUG` variable in the Makefile was renamed to `DEBUG_FLAGS`
-
-Previously it broke some builds for people that had `DEBUG` set to some arbitrary value,
-due to debugging other software.
-By renaming we avoid unintentional name clashes.
-
-Simply rename `DEBUG` to `DEBUG_FLAGS` in your environment to make it working again.
-
-### 0.13.3 (2015-09-16)
-
-* Revert "Clear `REDIS_CONNECTED` flag when connection is closed".
-* Make tests pass on FreeBSD (Thanks, Giacomo Olgeni)
-
-
-If the `REDIS_CONNECTED` flag is cleared,
-the async onDisconnect callback function will never be called.
-This causes problems as the disconnect is never reported back to the user.
-
-### 0.13.2 (2015-08-25)
-
-* Prevent crash on pending replies in async code (Thanks, @switch-st)
-* Clear `REDIS_CONNECTED` flag when connection is closed (Thanks, Jerry Jacobs)
-* Add MacOS X addapter (Thanks, @dizzus)
-* Add Qt adapter (Thanks, Pietro Cerutti)
-* Add Ivykis adapter (Thanks, Gergely Nagy)
-
-All adapters are provided as is and are only tested where possible.
-
-### 0.13.1 (2015-05-03)
-
-This is a bug fix release.
-The new `reconnect` method introduced new struct members, which clashed with pre-defined names in pre-C99 code.
-Another commit forced C99 compilation just to make it work, but of course this is not desirable for outside projects.
-Other non-C99 code can now use hiredis as usual again.
-Sorry for the inconvenience.
-
-* Fix memory leak in async reply handling (Salvatore Sanfilippo)
-* Rename struct member to avoid name clash with pre-c99 code (Alex Balashov, ncopa)
-
-### 0.13.0 (2015-04-16)
-
-This release adds a minimal Windows compatibility layer.
-The parser, standalone since v0.12.0, can now be compiled on Windows
-(and thus used in other client libraries as well)
-
-* Windows compatibility layer for parser code (tzickel)
-* Properly escape data printed to PKGCONF file (Dan Skorupski)
-* Fix tests when assert() undefined (Keith Bennett, Matt Stancliff)
-* Implement a reconnect method for the client context, this changes the structure of `redisContext` (Aaron Bedra)
-
-### 0.12.1 (2015-01-26)
-
-* Fix `make install`: DESTDIR support, install all required files, install PKGCONF in proper location
-* Fix `make test` as 32 bit build on 64 bit platform
-
-### 0.12.0 (2015-01-22)
-
-* Add optional KeepAlive support
-
-* Try again on EINTR errors
-
-* Add libuv adapter
-
-* Add IPv6 support
-
-* Remove possibility of multiple close on same fd
-
-* Add ability to bind source address on connect
-
-* Add redisConnectFd() and redisFreeKeepFd()
-
-* Fix getaddrinfo() memory leak
-
-* Free string if it is unused (fixes memory leak)
-
-* Improve redisAppendCommandArgv performance 2.5x
-
-* Add support for SO_REUSEADDR
-
-* Fix redisvFormatCommand format parsing
-
-* Add GLib 2.0 adapter
-
-* Refactor reading code into read.c
-
-* Fix errno error buffers to not clobber errors
-
-* Generate pkgconf during build
-
-* Silence _BSD_SOURCE warnings
-
-* Improve digit counting for multibulk creation
-
-
-### 0.11.0
-
-* Increase the maximum multi-bulk reply depth to 7.
-
-* Increase the read buffer size from 2k to 16k.
-
-* Use poll(2) instead of select(2) to support large fds (>= 1024).
-
-### 0.10.1
-
-* Makefile overhaul. Important to check out if you override one or more
-  variables using environment variables or via arguments to the "make" tool.
-
-* Issue #45: Fix potential memory leak for a multi bulk reply with 0 elements
-  being created by the default reply object functions.
-
-* Issue #43: Don't crash in an asynchronous context when Redis returns an error
-  reply after the connection has been made (this happens when the maximum
-  number of connections is reached).
-
-### 0.10.0
-
-* See commit log.
diff --git a/debian/modules/nchan/src/store/redis/hiredis/COPYING b/debian/modules/nchan/src/store/redis/hiredis/COPYING
deleted file mode 100644
index a5fc973..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/COPYING
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
-Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of Redis nor the names of its contributors may be used
-  to endorse or promote products derived from this software without specific
-  prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/nchan/src/store/redis/hiredis/Makefile b/debian/modules/nchan/src/store/redis/hiredis/Makefile
deleted file mode 100644
index a8d37a2..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/Makefile
+++ /dev/null
@@ -1,308 +0,0 @@
-# Hiredis Makefile
-# Copyright (C) 2010-2011 Salvatore Sanfilippo <antirez at gmail dot com>
-# Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
-# This file is released under the BSD license, see the COPYING file
-
-OBJ=alloc.o net.o hiredis.o sds.o async.o read.o sockcompat.o
-SSL_OBJ=ssl.o
-EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib hiredis-example-push
-ifeq ($(USE_SSL),1)
-EXAMPLES+=hiredis-example-ssl hiredis-example-libevent-ssl
-endif
-TESTS=hiredis-test
-LIBNAME=libhiredis
-PKGCONFNAME=hiredis.pc
-SSL_LIBNAME=libhiredis_ssl
-SSL_PKGCONFNAME=hiredis_ssl.pc
-
-HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}')
-HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}')
-HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | awk '{print $$3}')
-HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
-
-# Installation related variables and target
-PREFIX?=/usr/local
-INCLUDE_PATH?=include/hiredis
-LIBRARY_PATH?=lib
-PKGCONF_PATH?=pkgconfig
-INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
-INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
-INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
-
-# redis-server configuration used for testing
-REDIS_PORT=56379
-REDIS_SERVER=redis-server
-define REDIS_TEST_CONFIG
-	daemonize yes
-	pidfile /tmp/hiredis-test-redis.pid
-	port $(REDIS_PORT)
-	bind 127.0.0.1
-	unixsocket /tmp/hiredis-test-redis.sock
-endef
-export REDIS_TEST_CONFIG
-
-# Fallback to gcc when $CC is not in $PATH.
-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
-OPTIMIZATION?=-O3
-WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
-DEBUG_FLAGS?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
-REAL_LDFLAGS=$(LDFLAGS)
-
-DYLIBSUFFIX=so
-STLIBSUFFIX=a
-DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
-DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
-DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
-
-DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME)
-STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
-STLIB_MAKE_CMD=$(AR) rcs
-
-SSL_DYLIB_MINOR_NAME=$(SSL_LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
-SSL_DYLIB_MAJOR_NAME=$(SSL_LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
-SSL_DYLIBNAME=$(SSL_LIBNAME).$(DYLIBSUFFIX)
-SSL_STLIBNAME=$(SSL_LIBNAME).$(STLIBSUFFIX)
-SSL_DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(SSL_DYLIB_MINOR_NAME)
-
-# Platform-specific overrides
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
-
-USE_SSL?=0
-
-# This is required for test.c only
-ifeq ($(USE_SSL),1)
-  CFLAGS+=-DHIREDIS_TEST_SSL
-endif
-
-ifeq ($(uname_S),Linux)
-  SSL_LDFLAGS=-lssl -lcrypto
-else
-  OPENSSL_PREFIX?=/usr/local/opt/openssl
-  CFLAGS+=-I$(OPENSSL_PREFIX)/include
-  SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
-endif
-
-ifeq ($(uname_S),SunOS)
-  IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
-  ifeq ($(IS_SUN_CC),1)
-    SUN_SHARED_FLAG=-G
-  else
-    SUN_SHARED_FLAG=-shared
-  endif
-  REAL_LDFLAGS+= -ldl -lnsl -lsocket
-  DYLIB_MAKE_CMD=$(CC) $(SUN_SHARED_FLAG) -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-  SSL_DYLIB_MAKE_CMD=$(CC) $(SUN_SHARED_FLAG) -o $(SSL_DYLIBNAME) -h $(SSL_DYLIB_MINOR_NAME) $(LDFLAGS) $(SSL_LDFLAGS)
-endif
-ifeq ($(uname_S),Darwin)
-  DYLIBSUFFIX=dylib
-  DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
-  DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
-  SSL_DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME) -o $(SSL_DYLIBNAME) $(LDFLAGS) $(SSL_LDFLAGS)
-  DYLIB_PLUGIN=-Wl,-undefined -Wl,dynamic_lookup
-endif
-
-all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
-ifeq ($(USE_SSL),1)
-all: $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(SSL_PKGCONFNAME)
-endif
-
-# Deps (use make dep to generate this)
-alloc.o: alloc.c fmacros.h alloc.h
-async.o: async.c fmacros.h alloc.h async.h hiredis.h read.h sds.h net.h dict.c dict.h win32.h async_private.h
-dict.o: dict.c fmacros.h alloc.h dict.h
-hiredis.o: hiredis.c fmacros.h hiredis.h read.h sds.h alloc.h net.h async.h win32.h
-net.o: net.c fmacros.h net.h hiredis.h read.h sds.h alloc.h sockcompat.h win32.h
-read.o: read.c fmacros.h alloc.h read.h sds.h win32.h
-sds.o: sds.c sds.h sdsalloc.h alloc.h
-sockcompat.o: sockcompat.c sockcompat.h
-ssl.o: ssl.c hiredis.h read.h sds.h alloc.h async.h win32.h async_private.h
-test.o: test.c fmacros.h hiredis.h read.h sds.h alloc.h net.h sockcompat.h win32.h
-
-$(DYLIBNAME): $(OBJ)
-	$(DYLIB_MAKE_CMD) -o $(DYLIBNAME) $(OBJ) $(REAL_LDFLAGS)
-
-$(STLIBNAME): $(OBJ)
-	$(STLIB_MAKE_CMD) $(STLIBNAME) $(OBJ)
-
-$(SSL_DYLIBNAME): $(SSL_OBJ)
-	$(SSL_DYLIB_MAKE_CMD) $(DYLIB_PLUGIN) -o $(SSL_DYLIBNAME) $(SSL_OBJ) $(REAL_LDFLAGS) $(LDFLAGS) $(SSL_LDFLAGS)
-
-$(SSL_STLIBNAME): $(SSL_OBJ)
-	$(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ)
-
-dynamic: $(DYLIBNAME)
-static: $(STLIBNAME)
-ifeq ($(USE_SSL),1)
-dynamic: $(SSL_DYLIBNAME)
-static: $(SSL_STLIBNAME)
-endif
-
-# Binaries:
-hiredis-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-libevent-ssl: examples/example-libevent-ssl.c adapters/libevent.h $(STLIBNAME) $(SSL_STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS)
-
-hiredis-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -lev $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(shell pkg-config --cflags --libs glib-2.0) $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -livykis $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-ssl: examples/example-ssl.c $(STLIBNAME) $(SSL_STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS)
-
-
-ifndef AE_DIR
-hiredis-example-ae:
-	@echo "Please specify AE_DIR (e.g. <redis repository>/src)"
-	@false
-else
-hiredis-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(AE_DIR) $< $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o $(AE_DIR)/../deps/jemalloc/lib/libjemalloc.a -pthread $(STLIBNAME)
-endif
-
-ifndef LIBUV_DIR
-hiredis-example-libuv:
-	@echo "Please specify LIBUV_DIR (e.g. ../libuv/)"
-	@false
-else
-hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME) $(REAL_LDFLAGS)
-endif
-
-ifeq ($(and $(QT_MOC),$(QT_INCLUDE_DIR),$(QT_LIBRARY_DIR)),)
-hiredis-example-qt:
-	@echo "Please specify QT_MOC, QT_INCLUDE_DIR AND QT_LIBRARY_DIR"
-	@false
-else
-hiredis-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME)
-	$(QT_MOC) adapters/qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
-	    $(CXX) -x c++ -o qt-adapter-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
-	$(QT_MOC) examples/example-qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
-	    $(CXX) -x c++ -o qt-example-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
-	$(CXX) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore -L$(QT_LIBRARY_DIR) qt-adapter-moc.o qt-example-moc.o $< -pthread $(STLIBNAME) -lQtCore
-endif
-
-hiredis-example: examples/example.c $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-push: examples/example-push.c $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS)
-
-examples: $(EXAMPLES)
-
-TEST_LIBS = $(STLIBNAME)
-ifeq ($(USE_SSL),1)
-    TEST_LIBS += $(SSL_STLIBNAME)
-    TEST_LDFLAGS = $(SSL_LDFLAGS) -lssl -lcrypto -lpthread
-endif
-
-hiredis-test: test.o $(TEST_LIBS)
-	$(CC) -o $@ $(REAL_CFLAGS) -I. $^ $(REAL_LDFLAGS) $(TEST_LDFLAGS)
-
-hiredis-%: %.o $(STLIBNAME)
-	$(CC) $(REAL_CFLAGS) -o $@ $< $(TEST_LIBS) $(REAL_LDFLAGS)
-
-test: hiredis-test
-	./hiredis-test
-
-check: hiredis-test
-	TEST_SSL=$(USE_SSL) ./test.sh
-
-.c.o:
-	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
-
-clean:
-	rm -rf $(DYLIBNAME) $(STLIBNAME) $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-
-dep:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -MM *.c
-
-INSTALL?= cp -pPR
-
-$(PKGCONFNAME): hiredis.h
-	@echo "Generating $@ for pkgconfig..."
-	@echo prefix=$(PREFIX) > $@
-	@echo exec_prefix=\$${prefix} >> $@
-	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
-	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
-	@echo >> $@
-	@echo Name: hiredis >> $@
-	@echo Description: Minimalistic C client library for Redis. >> $@
-	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
-	@echo Libs: -L\$${libdir} -lhiredis >> $@
-	@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
-
-$(SSL_PKGCONFNAME): hiredis_ssl.h
-	@echo "Generating $@ for pkgconfig..."
-	@echo prefix=$(PREFIX) > $@
-	@echo exec_prefix=\$${prefix} >> $@
-	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
-	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
-	@echo >> $@
-	@echo Name: hiredis_ssl >> $@
-	@echo Description: SSL Support for hiredis. >> $@
-	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
-	@echo Requires: hiredis >> $@
-	@echo Libs: -L\$${libdir} -lhiredis_ssl >> $@
-	@echo Libs.private: -lssl -lcrypto >> $@
-
-install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
-	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH)
-	$(INSTALL) hiredis.h async.h read.h sds.h alloc.h $(INSTALL_INCLUDE_PATH)
-	$(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters
-	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
-	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
-	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-	mkdir -p $(INSTALL_PKGCONF_PATH)
-	$(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
-
-ifeq ($(USE_SSL),1)
-install: install-ssl
-
-install-ssl: $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(SSL_PKGCONFNAME)
-	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-	$(INSTALL) hiredis_ssl.h $(INSTALL_INCLUDE_PATH)
-	$(INSTALL) $(SSL_DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME)
-	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(SSL_DYLIB_MINOR_NAME) $(SSL_DYLIBNAME)
-	$(INSTALL) $(SSL_STLIBNAME) $(INSTALL_LIBRARY_PATH)
-	mkdir -p $(INSTALL_PKGCONF_PATH)
-	$(INSTALL) $(SSL_PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
-endif
-
-32bit:
-	@echo ""
-	@echo "WARNING: if this fails under Linux you probably need to install libc6-dev-i386"
-	@echo ""
-	$(MAKE) CFLAGS="-m32" LDFLAGS="-m32"
-
-32bit-vars:
-	$(eval CFLAGS=-m32)
-	$(eval LDFLAGS=-m32)
-
-gprof:
-	$(MAKE) CFLAGS="-pg" LDFLAGS="-pg"
-
-gcov:
-	$(MAKE) CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs"
-
-coverage: gcov
-	make check
-	mkdir -p tmp/lcov
-	lcov -d . -c -o tmp/lcov/hiredis.info
-	genhtml --legend -o tmp/lcov/report tmp/lcov/hiredis.info
-
-noopt:
-	$(MAKE) OPTIMIZATION=""
-
-.PHONY: all test check clean dep install 32bit 32bit-vars gprof gcov noopt
diff --git a/debian/modules/nchan/src/store/redis/hiredis/README.md b/debian/modules/nchan/src/store/redis/hiredis/README.md
deleted file mode 100644
index c544d57..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/README.md
+++ /dev/null
@@ -1,664 +0,0 @@
-[![Build Status](https://travis-ci.org/redis/hiredis.png)](https://travis-ci.org/redis/hiredis)
-
-**This Readme reflects the latest changed in the master branch. See [v1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) for the Readme and documentation for the latest release ([API/ABI history](https://abi-laboratory.pro/?view=timeline&l=hiredis)).**
-
-# HIREDIS
-
-Hiredis is a minimalistic C client library for the [Redis](http://redis.io/) database.
-
-It is minimalistic because it just adds minimal support for the protocol, but
-at the same time it uses a high level printf-alike API in order to make it
-much higher level than otherwise suggested by its minimal code base and the
-lack of explicit bindings for every Redis command.
-
-Apart from supporting sending commands and receiving replies, it comes with
-a reply parser that is decoupled from the I/O layer. It
-is a stream parser designed for easy reusability, which can for instance be used
-in higher level language bindings for efficient reply parsing.
-
-Hiredis only supports the binary-safe Redis protocol, so you can use it with any
-Redis version >= 1.2.0.
-
-The library comes with multiple APIs. There is the
-*synchronous API*, the *asynchronous API* and the *reply parsing API*.
-
-## Upgrading to `1.0.2`
-
-<span style="color:red">NOTE:  v1.0.1 erroneously bumped SONAME, which is why it is skipped here.</span>
-
-Version 1.0.2 is simply 1.0.0 with a fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2).  They are otherwise identical.
-
-## Upgrading to `1.0.0`
-
-Version 1.0.0 marks the first stable release of Hiredis.
-It includes some minor breaking changes, mostly to make the exposed API more uniform and self-explanatory.
-It also bundles the updated `sds` library, to sync up with upstream and Redis.
-For code changes see the [Changelog](CHANGELOG.md).
-
-_Note:  As described below, a few member names have been changed but most applications should be able to upgrade with minor code changes and recompiling._
-
-## IMPORTANT:  Breaking changes from `0.14.1` -> `1.0.0`
-
-* `redisContext` has two additional members (`free_privdata`, and `privctx`).
-* `redisOptions.timeout` has been renamed to `redisOptions.connect_timeout`, and we've added `redisOptions.command_timeout`.
-* `redisReplyObjectFunctions.createArray` now takes `size_t` instead of `int` for its length parameter.
-
-## IMPORTANT:  Breaking changes when upgrading from 0.13.x -> 0.14.x
-
-Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
-protocol errors. This is consistent with the RESP specification. On 32-bit
-platforms, the upper bound is lowered to `SIZE_MAX`.
-
-Change `redisReply.len` to `size_t`, as it denotes the the size of a string
-
-User code should compare this to `size_t` values as well.  If it was used to
-compare to other values, casting might be necessary or can be removed, if
-casting was applied before.
-
-## Upgrading from `<0.9.0`
-
-Version 0.9.0 is a major overhaul of hiredis in every aspect. However, upgrading existing
-code using hiredis should not be a big pain. The key thing to keep in mind when
-upgrading is that hiredis >= 0.9.0 uses a `redisContext*` to keep state, in contrast to
-the stateless 0.0.1 that only has a file descriptor to work with.
-
-## Synchronous API
-
-To consume the synchronous API, there are only a few function calls that need to be introduced:
-
-```c
-redisContext *redisConnect(const char *ip, int port);
-void *redisCommand(redisContext *c, const char *format, ...);
-void freeReplyObject(void *reply);
-```
-
-### Connecting
-
-The function `redisConnect` is used to create a so-called `redisContext`. The
-context is where Hiredis holds state for a connection. The `redisContext`
-struct has an integer `err` field that is non-zero when the connection is in
-an error state. The field `errstr` will contain a string with a description of
-the error. More information on errors can be found in the **Errors** section.
-After trying to connect to Redis using `redisConnect` you should
-check the `err` field to see if establishing the connection was successful:
-```c
-redisContext *c = redisConnect("127.0.0.1", 6379);
-if (c == NULL || c->err) {
-    if (c) {
-        printf("Error: %s\n", c->errstr);
-        // handle error
-    } else {
-        printf("Can't allocate redis context\n");
-    }
-}
-```
-
-*Note: A `redisContext` is not thread-safe.*
-
-### Sending commands
-
-There are several ways to issue commands to Redis. The first that will be introduced is
-`redisCommand`. This function takes a format similar to printf. In the simplest form,
-it is used like this:
-```c
-reply = redisCommand(context, "SET foo bar");
-```
-
-The specifier `%s` interpolates a string in the command, and uses `strlen` to
-determine the length of the string:
-```c
-reply = redisCommand(context, "SET foo %s", value);
-```
-When you need to pass binary safe strings in a command, the `%b` specifier can be
-used. Together with a pointer to the string, it requires a `size_t` length argument
-of the string:
-```c
-reply = redisCommand(context, "SET foo %b", value, (size_t) valuelen);
-```
-Internally, Hiredis splits the command in different arguments and will
-convert it to the protocol used to communicate with Redis.
-One or more spaces separates arguments, so you can use the specifiers
-anywhere in an argument:
-```c
-reply = redisCommand(context, "SET key:%s %s", myid, value);
-```
-
-### Using replies
-
-The return value of `redisCommand` holds a reply when the command was
-successfully executed. When an error occurs, the return value is `NULL` and
-the `err` field in the context will be set (see section on **Errors**).
-Once an error is returned the context cannot be reused and you should set up
-a new connection.
-
-The standard replies that `redisCommand` are of the type `redisReply`. The
-`type` field in the `redisReply` should be used to test what kind of reply
-was received:
-
-### RESP2
-
-* **`REDIS_REPLY_STATUS`**:
-    * The command replied with a status reply. The status string can be accessed using `reply->str`.
-      The length of this string can be accessed using `reply->len`.
-
-* **`REDIS_REPLY_ERROR`**:
-    *  The command replied with an error. The error string can be accessed identical to `REDIS_REPLY_STATUS`.
-
-* **`REDIS_REPLY_INTEGER`**:
-    * The command replied with an integer. The integer value can be accessed using the
-      `reply->integer` field of type `long long`.
-
-* **`REDIS_REPLY_NIL`**:
-    * The command replied with a **nil** object. There is no data to access.
-
-* **`REDIS_REPLY_STRING`**:
-    * A bulk (string) reply. The value of the reply can be accessed using `reply->str`.
-      The length of this string can be accessed using `reply->len`.
-
-* **`REDIS_REPLY_ARRAY`**:
-    * A multi bulk reply. The number of elements in the multi bulk reply is stored in
-      `reply->elements`. Every element in the multi bulk reply is a `redisReply` object as well
-      and can be accessed via `reply->element[..index..]`.
-      Redis may reply with nested arrays but this is fully supported.
-
-### RESP3
-
-Hiredis also supports every new `RESP3` data type which are as follows.  For more information about the protocol see the `RESP3` [specification.](https://github.com/antirez/RESP3/blob/master/spec.md)
-
-* **`REDIS_REPLY_DOUBLE`**:
-    * The command replied with a double-precision floating point number.
-      The value is stored as a string in the `str` member, and can be converted with `strtod` or similar.
-
-* **`REDIS_REPLY_BOOL`**:
-    * A boolean true/false reply.
-      The value is stored in the `integer` member and will be either `0` or `1`.
-
-* **`REDIS_REPLY_MAP`**:
-    * An array with the added invariant that there will always be an even number of elements.
-      The MAP is functionally equivelant to `REDIS_REPLY_ARRAY` except for the previously mentioned invariant.
-
-* **`REDIS_REPLY_SET`**:
-    * An array response where each entry is unique.
-      Like the MAP type, the data is identical to an array response except there are no duplicate values.
-
-* **`REDIS_REPLY_PUSH`**:
-    * An array that can be generated spontaneously by Redis.
-      This array response will always contain at least two subelements.  The first contains the type of `PUSH` message (e.g. `message`, or `invalidate`), and the second being a sub-array with the `PUSH` payload itself.
-
-* **`REDIS_REPLY_ATTR`**:
-    * An array structurally identical to a `MAP` but intended as meta-data about a reply.
-      _As of Redis 6.0.6 this reply type is not used in Redis_
-
-* **`REDIS_REPLY_BIGNUM`**:
-    * A string representing an arbitrarily large signed or unsigned integer value.
-      The number will be encoded as a string in the `str` member of `redisReply`.
-
-* **`REDIS_REPLY_VERB`**:
-    * A verbatim string, intended to be presented to the user without modification.
-      The string payload is stored in the `str` memeber, and type data is stored in the `vtype` member (e.g. `txt` for raw text or `md` for markdown).
-
-Replies should be freed using the `freeReplyObject()` function.
-Note that this function will take care of freeing sub-reply objects
-contained in arrays and nested arrays, so there is no need for the user to
-free the sub replies (it is actually harmful and will corrupt the memory).
-
-**Important:** the current version of hiredis (1.0.0) frees replies when the
-asynchronous API is used. This means you should not call `freeReplyObject` when
-you use this API. The reply is cleaned up by hiredis _after_ the callback
-returns.  We may introduce a flag to make this configurable in future versions of the library.
-
-### Cleaning up
-
-To disconnect and free the context the following function can be used:
-```c
-void redisFree(redisContext *c);
-```
-This function immediately closes the socket and then frees the allocations done in
-creating the context.
-
-### Sending commands (cont'd)
-
-Together with `redisCommand`, the function `redisCommandArgv` can be used to issue commands.
-It has the following prototype:
-```c
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-```
-It takes the number of arguments `argc`, an array of strings `argv` and the lengths of the
-arguments `argvlen`. For convenience, `argvlen` may be set to `NULL` and the function will
-use `strlen(3)` on every argument to determine its length. Obviously, when any of the arguments
-need to be binary safe, the entire array of lengths `argvlen` should be provided.
-
-The return value has the same semantic as `redisCommand`.
-
-### Pipelining
-
-To explain how Hiredis supports pipelining in a blocking connection, there needs to be
-understanding of the internal execution flow.
-
-When any of the functions in the `redisCommand` family is called, Hiredis first formats the
-command according to the Redis protocol. The formatted command is then put in the output buffer
-of the context. This output buffer is dynamic, so it can hold any number of commands.
-After the command is put in the output buffer, `redisGetReply` is called. This function has the
-following two execution paths:
-
-1. The input buffer is non-empty:
-    * Try to parse a single reply from the input buffer and return it
-    * If no reply could be parsed, continue at *2*
-2. The input buffer is empty:
-    * Write the **entire** output buffer to the socket
-    * Read from the socket until a single reply could be parsed
-
-The function `redisGetReply` is exported as part of the Hiredis API and can be used when a reply
-is expected on the socket. To pipeline commands, the only things that needs to be done is
-filling up the output buffer. For this cause, two commands can be used that are identical
-to the `redisCommand` family, apart from not returning a reply:
-```c
-void redisAppendCommand(redisContext *c, const char *format, ...);
-void redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-```
-After calling either function one or more times, `redisGetReply` can be used to receive the
-subsequent replies. The return value for this function is either `REDIS_OK` or `REDIS_ERR`, where
-the latter means an error occurred while reading a reply. Just as with the other commands,
-the `err` field in the context can be used to find out what the cause of this error is.
-
-The following examples shows a simple pipeline (resulting in only a single call to `write(2)` and
-a single call to `read(2)`):
-```c
-redisReply *reply;
-redisAppendCommand(context,"SET foo bar");
-redisAppendCommand(context,"GET foo");
-redisGetReply(context,(void *)&reply); // reply for SET
-freeReplyObject(reply);
-redisGetReply(context,(void *)&reply); // reply for GET
-freeReplyObject(reply);
-```
-This API can also be used to implement a blocking subscriber:
-```c
-reply = redisCommand(context,"SUBSCRIBE foo");
-freeReplyObject(reply);
-while(redisGetReply(context,(void *)&reply) == REDIS_OK) {
-    // consume message
-    freeReplyObject(reply);
-}
-```
-### Errors
-
-When a function call is not successful, depending on the function either `NULL` or `REDIS_ERR` is
-returned. The `err` field inside the context will be non-zero and set to one of the
-following constants:
-
-* **`REDIS_ERR_IO`**:
-    There was an I/O error while creating the connection, trying to write
-    to the socket or read from the socket. If you included `errno.h` in your
-    application, you can use the global `errno` variable to find out what is
-    wrong.
-
-* **`REDIS_ERR_EOF`**:
-    The server closed the connection which resulted in an empty read.
-
-* **`REDIS_ERR_PROTOCOL`**:
-    There was an error while parsing the protocol.
-
-* **`REDIS_ERR_OTHER`**:
-    Any other error. Currently, it is only used when a specified hostname to connect
-    to cannot be resolved.
-
-In every case, the `errstr` field in the context will be set to hold a string representation
-of the error.
-
-## Asynchronous API
-
-Hiredis comes with an asynchronous API that works easily with any event library.
-Examples are bundled that show using Hiredis with [libev](http://software.schmorp.de/pkg/libev.html)
-and [libevent](http://monkey.org/~provos/libevent/).
-
-### Connecting
-
-The function `redisAsyncConnect` can be used to establish a non-blocking connection to
-Redis. It returns a pointer to the newly created `redisAsyncContext` struct. The `err` field
-should be checked after creation to see if there were errors creating the connection.
-Because the connection that will be created is non-blocking, the kernel is not able to
-instantly return if the specified host and port is able to accept a connection.
-
-*Note: A `redisAsyncContext` is not thread-safe.*
-
-```c
-redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-if (c->err) {
-    printf("Error: %s\n", c->errstr);
-    // handle error
-}
-```
-
-The asynchronous context can hold a disconnect callback function that is called when the
-connection is disconnected (either because of an error or per user request). This function should
-have the following prototype:
-```c
-void(const redisAsyncContext *c, int status);
-```
-On a disconnect, the `status` argument is set to `REDIS_OK` when disconnection was initiated by the
-user, or `REDIS_ERR` when the disconnection was caused by an error. When it is `REDIS_ERR`, the `err`
-field in the context can be accessed to find out the cause of the error.
-
-The context object is always freed after the disconnect callback fired. When a reconnect is needed,
-the disconnect callback is a good point to do so.
-
-Setting the disconnect callback can only be done once per context. For subsequent calls it will
-return `REDIS_ERR`. The function to set the disconnect callback has the following prototype:
-```c
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-```
-`ac->data` may be used to pass user data to this callback, the same can be done for redisConnectCallback.
-### Sending commands and their callbacks
-
-In an asynchronous context, commands are automatically pipelined due to the nature of an event loop.
-Therefore, unlike the synchronous API, there is only a single way to send commands.
-Because commands are sent to Redis asynchronously, issuing a command requires a callback function
-that is called when the reply is received. Reply callbacks should have the following prototype:
-```c
-void(redisAsyncContext *c, void *reply, void *privdata);
-```
-The `privdata` argument can be used to curry arbitrary data to the callback from the point where
-the command is initially queued for execution.
-
-The functions that can be used to issue commands in an asynchronous context are:
-```c
-int redisAsyncCommand(
-  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
-  const char *format, ...);
-int redisAsyncCommandArgv(
-  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
-  int argc, const char **argv, const size_t *argvlen);
-```
-Both functions work like their blocking counterparts. The return value is `REDIS_OK` when the command
-was successfully added to the output buffer and `REDIS_ERR` otherwise. Example: when the connection
-is being disconnected per user-request, no new commands may be added to the output buffer and `REDIS_ERR` is
-returned on calls to the `redisAsyncCommand` family.
-
-If the reply for a command with a `NULL` callback is read, it is immediately freed. When the callback
-for a command is non-`NULL`, the memory is freed immediately following the callback: the reply is only
-valid for the duration of the callback.
-
-All pending callbacks are called with a `NULL` reply when the context encountered an error.
-
-### Disconnecting
-
-An asynchronous connection can be terminated using:
-```c
-void redisAsyncDisconnect(redisAsyncContext *ac);
-```
-When this function is called, the connection is **not** immediately terminated. Instead, new
-commands are no longer accepted and the connection is only terminated when all pending commands
-have been written to the socket, their respective replies have been read and their respective
-callbacks have been executed. After this, the disconnection callback is executed with the
-`REDIS_OK` status and the context object is freed.
-
-### Hooking it up to event library *X*
-
-There are a few hooks that need to be set on the context object after it is created.
-See the `adapters/` directory for bindings to *libev* and *libevent*.
-
-## Reply parsing API
-
-Hiredis comes with a reply parsing API that makes it easy for writing higher
-level language bindings.
-
-The reply parsing API consists of the following functions:
-```c
-redisReader *redisReaderCreate(void);
-void redisReaderFree(redisReader *reader);
-int redisReaderFeed(redisReader *reader, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *reader, void **reply);
-```
-The same set of functions are used internally by hiredis when creating a
-normal Redis context, the above API just exposes it to the user for a direct
-usage.
-
-### Usage
-
-The function `redisReaderCreate` creates a `redisReader` structure that holds a
-buffer with unparsed data and state for the protocol parser.
-
-Incoming data -- most likely from a socket -- can be placed in the internal
-buffer of the `redisReader` using `redisReaderFeed`. This function will make a
-copy of the buffer pointed to by `buf` for `len` bytes. This data is parsed
-when `redisReaderGetReply` is called. This function returns an integer status
-and a reply object (as described above) via `void **reply`. The returned status
-can be either `REDIS_OK` or `REDIS_ERR`, where the latter means something went
-wrong (either a protocol error, or an out of memory error).
-
-The parser limits the level of nesting for multi bulk payloads to 7. If the
-multi bulk nesting level is higher than this, the parser returns an error.
-
-### Customizing replies
-
-The function `redisReaderGetReply` creates `redisReply` and makes the function
-argument `reply` point to the created `redisReply` variable. For instance, if
-the response of type `REDIS_REPLY_STATUS` then the `str` field of `redisReply`
-will hold the status as a vanilla C string. However, the functions that are
-responsible for creating instances of the `redisReply` can be customized by
-setting the `fn` field on the `redisReader` struct. This should be done
-immediately after creating the `redisReader`.
-
-For example, [hiredis-rb](https://github.com/pietern/hiredis-rb/blob/master/ext/hiredis_ext/reader.c)
-uses customized reply object functions to create Ruby objects.
-
-### Reader max buffer
-
-Both when using the Reader API directly or when using it indirectly via a
-normal Redis context, the redisReader structure uses a buffer in order to
-accumulate data from the server.
-Usually this buffer is destroyed when it is empty and is larger than 16
-KiB in order to avoid wasting memory in unused buffers
-
-However when working with very big payloads destroying the buffer may slow
-down performances considerably, so it is possible to modify the max size of
-an idle buffer changing the value of the `maxbuf` field of the reader structure
-to the desired value. The special value of 0 means that there is no maximum
-value for an idle buffer, so the buffer will never get freed.
-
-For instance if you have a normal Redis context you can set the maximum idle
-buffer to zero (unlimited) just with:
-```c
-context->reader->maxbuf = 0;
-```
-This should be done only in order to maximize performances when working with
-large payloads. The context should be set back to `REDIS_READER_MAX_BUF` again
-as soon as possible in order to prevent allocation of useless memory.
-
-### Reader max array elements
-
-By default the hiredis reply parser sets the maximum number of multi-bulk elements
-to 2^32 - 1 or 4,294,967,295 entries.  If you need to process multi-bulk replies
-with more than this many elements you can set the value higher or to zero, meaning
-unlimited with:
-```c
-context->reader->maxelements = 0;
-```
-
-## SSL/TLS Support
-
-### Building
-
-SSL/TLS support is not built by default and requires an explicit flag:
-
-    make USE_SSL=1
-
-This requires OpenSSL development package (e.g. including header files to be
-available.
-
-When enabled, SSL/TLS support is built into extra `libhiredis_ssl.a` and
-`libhiredis_ssl.so` static/dynamic libraries. This leaves the original libraries
-unaffected so no additional dependencies are introduced.
-
-### Using it
-
-First, you'll need to make sure you include the SSL header file:
-
-```c
-#include "hiredis.h"
-#include "hiredis_ssl.h"
-```
-
-You will also need to link against `libhiredis_ssl`, **in addition** to
-`libhiredis` and add `-lssl -lcrypto` to satisfy its dependencies.
-
-Hiredis implements SSL/TLS on top of its normal `redisContext` or
-`redisAsyncContext`, so you will need to establish a connection first and then
-initiate an SSL/TLS handshake.
-
-#### Hiredis OpenSSL Wrappers
-
-Before Hiredis can negotiate an SSL/TLS connection, it is necessary to
-initialize OpenSSL and create a context. You can do that in two ways:
-
-1. Work directly with the OpenSSL API to initialize the library's global context
-   and create `SSL_CTX *` and `SSL *` contexts. With an `SSL *` object you can
-   call `redisInitiateSSL()`.
-2. Work with a set of Hiredis-provided wrappers around OpenSSL, create a
-   `redisSSLContext` object to hold configuration and use
-   `redisInitiateSSLWithContext()` to initiate the SSL/TLS handshake.
-
-```c
-/* An Hiredis SSL context. It holds SSL configuration and can be reused across
- * many contexts.
- */
-redisSSLContext *ssl;
-
-/* An error variable to indicate what went wrong, if the context fails to
- * initialize.
- */
-redisSSLContextError ssl_error;
-
-/* Initialize global OpenSSL state.
- *
- * You should call this only once when your app initializes, and only if
- * you don't explicitly or implicitly initialize OpenSSL it elsewhere.
- */
-redisInitOpenSSL();
-
-/* Create SSL context */
-ssl = redisCreateSSLContext(
-    "cacertbundle.crt",     /* File name of trusted CA/ca bundle file, optional */
-    "/path/to/certs",       /* Path of trusted certificates, optional */
-    "client_cert.pem",      /* File name of client certificate file, optional */
-    "client_key.pem",       /* File name of client private key, optional */
-    "redis.mydomain.com",   /* Server name to request (SNI), optional */
-    &ssl_error
-    ) != REDIS_OK) {
-        printf("SSL error: %s\n", redisSSLContextGetError(ssl_error);
-        /* Abort... */
-    }
-
-/* Create Redis context and establish connection */
-c = redisConnect("localhost", 6443);
-if (c == NULL || c->err) {
-    /* Handle error and abort... */
-}
-
-/* Negotiate SSL/TLS */
-if (redisInitiateSSLWithContext(c, ssl) != REDIS_OK) {
-    /* Handle error, in c->err / c->errstr */
-}
-```
-
-## RESP3 PUSH replies
-Redis 6.0 introduced PUSH replies with the reply-type `>`.  These messages are generated spontaneously and can arrive at any time, so must be handled using callbacks.
-
-### Default behavior
-Hiredis installs handlers on `redisContext` and `redisAsyncContext` by default, which will intercept and free any PUSH replies detected.  This means existing code will work as-is after upgrading to Redis 6 and switching to `RESP3`.
-
-### Custom PUSH handler prototypes
-The callback prototypes differ between `redisContext` and `redisAsyncContext`.
-
-#### redisContext
-```c
-void my_push_handler(void *privdata, void *reply) {
-    /* Handle the reply */
-
-    /* Note: We need to free the reply in our custom handler for
-             blocking contexts.  This lets us keep the reply if
-             we want. */
-    freeReplyObject(reply);
-}
-```
-
-#### redisAsyncContext
-```c
-void my_async_push_handler(redisAsyncContext *ac, void *reply) {
-    /* Handle the reply */
-
-    /* Note:  Because async hiredis always frees replies, you should
-              not call freeReplyObject in an async push callback. */
-}
-```
-
-### Installing a custom handler
-There are two ways to set your own PUSH handlers.
-
-1. Set `push_cb` or `async_push_cb` in the `redisOptions` struct and connect with `redisConnectWithOptions` or `redisAsyncConnectWithOptions`.
-    ```c
-    redisOptions = {0};
-    REDIS_OPTIONS_SET_TCP(&options, "127.0.0.1", 6379);
-    options->push_cb = my_push_handler;
-    redisContext *context = redisConnectWithOptions(&options);
-    ```
-2.  Call `redisSetPushCallback` or `redisAsyncSetPushCallback` on a connected context.
-    ```c
-    redisContext *context = redisConnect("127.0.0.1", 6379);
-    redisSetPushCallback(context, my_push_handler);
-    ```
-
-    _Note `redisSetPushCallback` and `redisAsyncSetPushCallback` both return any currently configured handler,  making it easy to override and then return to the old value._
-
-### Specifying no handler
-If you have a unique use-case where you don't want hiredis to automatically intercept and free PUSH replies, you will want to configure no handler at all.  This can be done in two ways.
-1.  Set the `REDIS_OPT_NO_PUSH_AUTOFREE` flag in `redisOptions` and leave the callback function pointer `NULL`.
-    ```c
-    redisOptions = {0};
-    REDIS_OPTIONS_SET_TCP(&options, "127.0.0.1", 6379);
-    options->options |= REDIS_OPT_NO_PUSH_AUTOFREE;
-    redisContext *context = redisConnectWithOptions(&options);
-    ```
-3.  Call `redisSetPushCallback` with `NULL` once connected.
-    ```c
-    redisContext *context = redisConnect("127.0.0.1", 6379);
-    redisSetPushCallback(context, NULL);
-    ```
-
-    _Note:  With no handler configured, calls to `redisCommand` may generate more than one reply, so this strategy is only applicable when there's some kind of blocking`redisGetReply()` loop (e.g. `MONITOR` or `SUBSCRIBE` workloads)._
-
-## Allocator injection
-
-Hiredis uses a pass-thru structure of function pointers defined in [alloc.h](https://github.com/redis/hiredis/blob/f5d25850/alloc.h#L41) that contain the currently configured allocation and deallocation functions.  By default they just point to libc (`malloc`, `calloc`, `realloc`, etc).
-
-### Overriding
-
-One can override the allocators like so:
-
-```c
-hiredisAllocFuncs myfuncs = {
-    .mallocFn = my_malloc,
-    .callocFn = my_calloc,
-    .reallocFn = my_realloc,
-    .strdupFn = my_strdup,
-    .freeFn = my_free,
-};
-
-// Override allocators (function returns current allocators if needed)
-hiredisAllocFuncs orig = hiredisSetAllocators(&myfuncs);
-```
-
-To reset the allocators to their default libc function simply call:
-
-```c
-hiredisResetAllocators();
-```
-
-## AUTHORS
-
-Salvatore Sanfilippo (antirez at gmail),\
-Pieter Noordhuis (pcnoordhuis at gmail)\
-Michael Grunder (michael dot grunder at gmail)
-
-_Hiredis is released under the BSD license._
diff --git a/debian/modules/nchan/src/store/redis/hiredis/alloc.c b/debian/modules/nchan/src/store/redis/hiredis/alloc.c
deleted file mode 100644
index 7fb6b35..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/alloc.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include "alloc.h"
-#include <string.h>
-#include <stdlib.h>
-
-hiredisAllocFuncs hiredisAllocFns = {
-    .mallocFn = malloc,
-    .callocFn = calloc,
-    .reallocFn = realloc,
-    .strdupFn = strdup,
-    .freeFn = free,
-};
-
-/* Override hiredis' allocators with ones supplied by the user */
-hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *override) {
-    hiredisAllocFuncs orig = hiredisAllocFns;
-
-    hiredisAllocFns = *override;
-
-    return orig;
-}
-
-/* Reset allocators to use libc defaults */
-void hiredisResetAllocators(void) {
-    hiredisAllocFns = (hiredisAllocFuncs) {
-        .mallocFn = malloc,
-        .callocFn = calloc,
-        .reallocFn = realloc,
-        .strdupFn = strdup,
-        .freeFn = free,
-    };
-}
-
-#ifdef _WIN32
-
-void *hi_malloc(size_t size) {
-    return hiredisAllocFns.mallocFn(size);
-}
-
-void *hi_calloc(size_t nmemb, size_t size) {
-    return hiredisAllocFns.callocFn(nmemb, size);
-}
-
-void *hi_realloc(void *ptr, size_t size) {
-    return hiredisAllocFns.reallocFn(ptr, size);
-}
-
-char *hi_strdup(const char *str) {
-    return hiredisAllocFns.strdupFn(str);
-}
-
-void hi_free(void *ptr) {
-    hiredisAllocFns.freeFn(ptr);
-}
-
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/alloc.h b/debian/modules/nchan/src/store/redis/hiredis/alloc.h
deleted file mode 100644
index 34a05f4..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/alloc.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef HIREDIS_ALLOC_H
-#define HIREDIS_ALLOC_H
-
-#include <stddef.h> /* for size_t */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Structure pointing to our actually configured allocators */
-typedef struct hiredisAllocFuncs {
-    void *(*mallocFn)(size_t);
-    void *(*callocFn)(size_t,size_t);
-    void *(*reallocFn)(void*,size_t);
-    char *(*strdupFn)(const char*);
-    void (*freeFn)(void*);
-} hiredisAllocFuncs;
-
-hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *ha);
-void hiredisResetAllocators(void);
-
-#ifndef _WIN32
-
-/* Hiredis' configured allocator function pointer struct */
-extern hiredisAllocFuncs hiredisAllocFns;
-
-static inline void *hi_malloc(size_t size) {
-    return hiredisAllocFns.mallocFn(size);
-}
-
-static inline void *hi_calloc(size_t nmemb, size_t size) {
-    return hiredisAllocFns.callocFn(nmemb, size);
-}
-
-static inline void *hi_realloc(void *ptr, size_t size) {
-    return hiredisAllocFns.reallocFn(ptr, size);
-}
-
-static inline char *hi_strdup(const char *str) {
-    return hiredisAllocFns.strdupFn(str);
-}
-
-static inline void hi_free(void *ptr) {
-    hiredisAllocFns.freeFn(ptr);
-}
-
-#else
-
-void *hi_malloc(size_t size);
-void *hi_calloc(size_t nmemb, size_t size);
-void *hi_realloc(void *ptr, size_t size);
-char *hi_strdup(const char *str);
-void hi_free(void *ptr);
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HIREDIS_ALLOC_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/async.c b/debian/modules/nchan/src/store/redis/hiredis/async.c
deleted file mode 100644
index 020cb09..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/async.c
+++ /dev/null
@@ -1,887 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include "alloc.h"
-#include <stdlib.h>
-#include <string.h>
-#ifndef _MSC_VER
-#include <strings.h>
-#endif
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include "async.h"
-#include "net.h"
-#include "dict.c"
-#include "sds.h"
-#include "win32.h"
-
-#include "async_private.h"
-
-/* Forward declarations of hiredis.c functions */
-int __redisAppendCommand(redisContext *c, const char *cmd, size_t len);
-void __redisSetError(redisContext *c, int type, const char *str);
-
-/* Functions managing dictionary of callbacks for pub/sub. */
-static unsigned int callbackHash(const void *key) {
-    return dictGenHashFunction((const unsigned char *)key,
-                               sdslen((const sds)key));
-}
-
-static void *callbackValDup(void *privdata, const void *src) {
-    ((void) privdata);
-    redisCallback *dup;
-
-    dup = hi_malloc(sizeof(*dup));
-    if (dup == NULL)
-        return NULL;
-
-    memcpy(dup,src,sizeof(*dup));
-    return dup;
-}
-
-static int callbackKeyCompare(void *privdata, const void *key1, const void *key2) {
-    int l1, l2;
-    ((void) privdata);
-
-    l1 = sdslen((const sds)key1);
-    l2 = sdslen((const sds)key2);
-    if (l1 != l2) return 0;
-    return memcmp(key1,key2,l1) == 0;
-}
-
-static void callbackKeyDestructor(void *privdata, void *key) {
-    ((void) privdata);
-    sdsfree((sds)key);
-}
-
-static void callbackValDestructor(void *privdata, void *val) {
-    ((void) privdata);
-    hi_free(val);
-}
-
-static dictType callbackDict = {
-    callbackHash,
-    NULL,
-    callbackValDup,
-    callbackKeyCompare,
-    callbackKeyDestructor,
-    callbackValDestructor
-};
-
-static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
-    redisAsyncContext *ac;
-    dict *channels = NULL, *patterns = NULL;
-
-    channels = dictCreate(&callbackDict,NULL);
-    if (channels == NULL)
-        goto oom;
-
-    patterns = dictCreate(&callbackDict,NULL);
-    if (patterns == NULL)
-        goto oom;
-
-    ac = hi_realloc(c,sizeof(redisAsyncContext));
-    if (ac == NULL)
-        goto oom;
-
-    c = &(ac->c);
-
-    /* The regular connect functions will always set the flag REDIS_CONNECTED.
-     * For the async API, we want to wait until the first write event is
-     * received up before setting this flag, so reset it here. */
-    c->flags &= ~REDIS_CONNECTED;
-
-    ac->err = 0;
-    ac->errstr = NULL;
-    ac->data = NULL;
-    ac->dataCleanup = NULL;
-
-    ac->ev.data = NULL;
-    ac->ev.addRead = NULL;
-    ac->ev.delRead = NULL;
-    ac->ev.addWrite = NULL;
-    ac->ev.delWrite = NULL;
-    ac->ev.cleanup = NULL;
-    ac->ev.scheduleTimer = NULL;
-
-    ac->onConnect = NULL;
-    ac->onDisconnect = NULL;
-
-    ac->replies.head = NULL;
-    ac->replies.tail = NULL;
-    ac->sub.invalid.head = NULL;
-    ac->sub.invalid.tail = NULL;
-    ac->sub.channels = channels;
-    ac->sub.patterns = patterns;
-
-    return ac;
-oom:
-    if (channels) dictRelease(channels);
-    if (patterns) dictRelease(patterns);
-    return NULL;
-}
-
-/* We want the error field to be accessible directly instead of requiring
- * an indirection to the redisContext struct. */
-static void __redisAsyncCopyError(redisAsyncContext *ac) {
-    if (!ac)
-        return;
-
-    redisContext *c = &(ac->c);
-    ac->err = c->err;
-    ac->errstr = c->errstr;
-}
-
-redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options) {
-    redisOptions myOptions = *options;
-    redisContext *c;
-    redisAsyncContext *ac;
-
-    /* Clear any erroneously set sync callback and flag that we don't want to
-     * use freeReplyObject by default. */
-    myOptions.push_cb = NULL;
-    myOptions.options |= REDIS_OPT_NO_PUSH_AUTOFREE;
-
-    myOptions.options |= REDIS_OPT_NONBLOCK;
-    c = redisConnectWithOptions(&myOptions);
-    if (c == NULL) {
-        return NULL;
-    }
-
-    ac = redisAsyncInitialize(c);
-    if (ac == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    /* Set any configured async push handler */
-    redisAsyncSetPushCallback(ac, myOptions.async_push_cb);
-
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    return redisAsyncConnectWithOptions(&options);
-}
-
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port,
-                                         const char *source_addr) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.endpoint.tcp.source_addr = source_addr;
-    return redisAsyncConnectWithOptions(&options);
-}
-
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.options |= REDIS_OPT_REUSEADDR;
-    options.endpoint.tcp.source_addr = source_addr;
-    return redisAsyncConnectWithOptions(&options);
-}
-
-redisAsyncContext *redisAsyncConnectUnix(const char *path) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_UNIX(&options, path);
-    return redisAsyncConnectWithOptions(&options);
-}
-
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn) {
-    if (ac->onConnect == NULL) {
-        ac->onConnect = fn;
-
-        /* The common way to detect an established connection is to wait for
-         * the first write event to be fired. This assumes the related event
-         * library functions are already set. */
-        _EL_ADD_WRITE(ac);
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn) {
-    if (ac->onDisconnect == NULL) {
-        ac->onDisconnect = fn;
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-/* Helper functions to push/shift callbacks */
-static int __redisPushCallback(redisCallbackList *list, redisCallback *source) {
-    redisCallback *cb;
-
-    /* Copy callback from stack to heap */
-    cb = hi_malloc(sizeof(*cb));
-    if (cb == NULL)
-        return REDIS_ERR_OOM;
-
-    if (source != NULL) {
-        memcpy(cb,source,sizeof(*cb));
-        cb->next = NULL;
-    }
-
-    /* Store callback in list */
-    if (list->head == NULL)
-        list->head = cb;
-    if (list->tail != NULL)
-        list->tail->next = cb;
-    list->tail = cb;
-    return REDIS_OK;
-}
-
-static int __redisShiftCallback(redisCallbackList *list, redisCallback *target) {
-    redisCallback *cb = list->head;
-    if (cb != NULL) {
-        list->head = cb->next;
-        if (cb == list->tail)
-            list->tail = NULL;
-
-        /* Copy callback from heap to stack */
-        if (target != NULL)
-            memcpy(target,cb,sizeof(*cb));
-        hi_free(cb);
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisReply *reply) {
-    redisContext *c = &(ac->c);
-    if (cb->fn != NULL) {
-        c->flags |= REDIS_IN_CALLBACK;
-        cb->fn(ac,reply,cb->privdata);
-        c->flags &= ~REDIS_IN_CALLBACK;
-    }
-}
-
-static void __redisRunPushCallback(redisAsyncContext *ac, redisReply *reply) {
-    if (ac->push_cb != NULL) {
-        ac->c.flags |= REDIS_IN_CALLBACK;
-        ac->push_cb(ac, reply);
-        ac->c.flags &= ~REDIS_IN_CALLBACK;
-    }
-}
-
-/* Helper function to free the context. */
-static void __redisAsyncFree(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-    dictIterator *it;
-    dictEntry *de;
-
-    /* Execute pending callbacks with NULL reply. */
-    while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK)
-        __redisRunCallback(ac,&cb,NULL);
-
-    /* Execute callbacks for invalid commands */
-    while (__redisShiftCallback(&ac->sub.invalid,&cb) == REDIS_OK)
-        __redisRunCallback(ac,&cb,NULL);
-
-    /* Run subscription callbacks with NULL reply */
-    if (ac->sub.channels) {
-        it = dictGetIterator(ac->sub.channels);
-        if (it != NULL) {
-            while ((de = dictNext(it)) != NULL)
-                __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-            dictReleaseIterator(it);
-        }
-
-        dictRelease(ac->sub.channels);
-    }
-
-    if (ac->sub.patterns) {
-        it = dictGetIterator(ac->sub.patterns);
-        if (it != NULL) {
-            while ((de = dictNext(it)) != NULL)
-                __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-            dictReleaseIterator(it);
-        }
-
-        dictRelease(ac->sub.patterns);
-    }
-
-    /* Signal event lib to clean up */
-    _EL_CLEANUP(ac);
-
-    /* Execute disconnect callback. When redisAsyncFree() initiated destroying
-     * this context, the status will always be REDIS_OK. */
-    if (ac->onDisconnect && (c->flags & REDIS_CONNECTED)) {
-        if (c->flags & REDIS_FREEING) {
-            ac->onDisconnect(ac,REDIS_OK);
-        } else {
-            ac->onDisconnect(ac,(ac->err == 0) ? REDIS_OK : REDIS_ERR);
-        }
-    }
-
-    if (ac->dataCleanup) {
-        ac->dataCleanup(ac->data);
-    }
-
-    /* Cleanup self */
-    redisFree(c);
-}
-
-/* Free the async context. When this function is called from a callback,
- * control needs to be returned to redisProcessCallbacks() before actual
- * free'ing. To do so, a flag is set on the context which is picked up by
- * redisProcessCallbacks(). Otherwise, the context is immediately free'd. */
-void redisAsyncFree(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    c->flags |= REDIS_FREEING;
-    if (!(c->flags & REDIS_IN_CALLBACK))
-        __redisAsyncFree(ac);
-}
-
-/* Helper function to make the disconnect happen and clean up. */
-void __redisAsyncDisconnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    /* Make sure error is accessible if there is any */
-    __redisAsyncCopyError(ac);
-
-    if (ac->err == 0) {
-        /* For clean disconnects, there should be no pending callbacks. */
-        int ret = __redisShiftCallback(&ac->replies,NULL);
-        assert(ret == REDIS_ERR);
-    } else {
-        /* Disconnection is caused by an error, make sure that pending
-         * callbacks cannot call new commands. */
-        c->flags |= REDIS_DISCONNECTING;
-    }
-
-    /* cleanup event library on disconnect.
-     * this is safe to call multiple times */
-    _EL_CLEANUP(ac);
-
-    /* For non-clean disconnects, __redisAsyncFree() will execute pending
-     * callbacks with a NULL-reply. */
-    if (!(c->flags & REDIS_NO_AUTO_FREE)) {
-      __redisAsyncFree(ac);
-    }
-}
-
-/* Tries to do a clean disconnect from Redis, meaning it stops new commands
- * from being issued, but tries to flush the output buffer and execute
- * callbacks for all remaining replies. When this function is called from a
- * callback, there might be more replies and we can safely defer disconnecting
- * to redisProcessCallbacks(). Otherwise, we can only disconnect immediately
- * when there are no pending callbacks. */
-void redisAsyncDisconnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    c->flags |= REDIS_DISCONNECTING;
-
-    /** unset the auto-free flag here, because disconnect undoes this */
-    c->flags &= ~REDIS_NO_AUTO_FREE;
-    if (!(c->flags & REDIS_IN_CALLBACK) && ac->replies.head == NULL)
-        __redisAsyncDisconnect(ac);
-}
-
-static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, redisCallback *dstcb) {
-    redisContext *c = &(ac->c);
-    dict *callbacks;
-    redisCallback *cb;
-    dictEntry *de;
-    int pvariant;
-    char *stype;
-    sds sname;
-
-    /* Custom reply functions are not supported for pub/sub. This will fail
-     * very hard when they are used... */
-    if (reply->type == REDIS_REPLY_ARRAY || reply->type == REDIS_REPLY_PUSH) {
-        assert(reply->elements >= 2);
-        assert(reply->element[0]->type == REDIS_REPLY_STRING);
-        stype = reply->element[0]->str;
-        pvariant = (tolower(stype[0]) == 'p') ? 1 : 0;
-
-        if (pvariant)
-            callbacks = ac->sub.patterns;
-        else
-            callbacks = ac->sub.channels;
-
-        /* Locate the right callback */
-        assert(reply->element[1]->type == REDIS_REPLY_STRING);
-        sname = sdsnewlen(reply->element[1]->str,reply->element[1]->len);
-        if (sname == NULL)
-            goto oom;
-
-        de = dictFind(callbacks,sname);
-        if (de != NULL) {
-            cb = dictGetEntryVal(de);
-
-            /* If this is an subscribe reply decrease pending counter. */
-            if (strcasecmp(stype+pvariant,"subscribe") == 0) {
-                cb->pending_subs -= 1;
-            }
-
-            memcpy(dstcb,cb,sizeof(*dstcb));
-
-            /* If this is an unsubscribe message, remove it. */
-            if (strcasecmp(stype+pvariant,"unsubscribe") == 0) {
-                if (cb->pending_subs == 0)
-                    dictDelete(callbacks,sname);
-
-                /* If this was the last unsubscribe message, revert to
-                 * non-subscribe mode. */
-                assert(reply->element[2]->type == REDIS_REPLY_INTEGER);
-
-                /* Unset subscribed flag only when no pipelined pending subscribe. */
-                if (reply->element[2]->integer == 0
-                    && dictSize(ac->sub.channels) == 0
-                    && dictSize(ac->sub.patterns) == 0)
-                    c->flags &= ~REDIS_SUBSCRIBED;
-            }
-        }
-        sdsfree(sname);
-    } else {
-        /* Shift callback for invalid commands. */
-        __redisShiftCallback(&ac->sub.invalid,dstcb);
-    }
-    return REDIS_OK;
-oom:
-    __redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
-    return REDIS_ERR;
-}
-
-#define redisIsSpontaneousPushReply(r) \
-    (redisIsPushReply(r) && !redisIsSubscribeReply(r))
-
-static int redisIsSubscribeReply(redisReply *reply) {
-    char *str;
-    size_t len, off;
-
-    /* We will always have at least one string with the subscribe/message type */
-    if (reply->elements < 1 || reply->element[0]->type != REDIS_REPLY_STRING ||
-        reply->element[0]->len < sizeof("message") - 1)
-    {
-        return 0;
-    }
-
-    /* Get the string/len moving past 'p' if needed */
-    off = tolower(reply->element[0]->str[0]) == 'p';
-    str = reply->element[0]->str + off;
-    len = reply->element[0]->len - off;
-
-    return !strncasecmp(str, "subscribe", len) ||
-           !strncasecmp(str, "message", len);
-
-}
-
-void redisProcessCallbacks(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb = {NULL, NULL, 0, NULL};
-    void *reply = NULL;
-    int status;
-
-    while((status = redisGetReply(c,&reply)) == REDIS_OK) {
-        if (reply == NULL) {
-            /* When the connection is being disconnected and there are
-             * no more replies, this is the cue to really disconnect. */
-            if (c->flags & REDIS_DISCONNECTING && sdslen(c->obuf) == 0
-                && ac->replies.head == NULL) {
-                __redisAsyncDisconnect(ac);
-                return;
-            }
-
-            /* If monitor mode, repush callback */
-            if(c->flags & REDIS_MONITORING) {
-                __redisPushCallback(&ac->replies,&cb);
-            }
-
-            /* When the connection is not being disconnected, simply stop
-             * trying to get replies and wait for the next loop tick. */
-            break;
-        }
-
-        /* Send any non-subscribe related PUSH messages to our PUSH handler
-         * while allowing subscribe related PUSH messages to pass through.
-         * This allows existing code to be backward compatible and work in
-         * either RESP2 or RESP3 mode. */
-        if (redisIsSpontaneousPushReply(reply)) {
-            __redisRunPushCallback(ac, reply);
-            c->reader->fn->freeObject(reply);
-            continue;
-        }
-
-        /* Even if the context is subscribed, pending regular
-         * callbacks will get a reply before pub/sub messages arrive. */
-        if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
-            /*
-             * A spontaneous reply in a not-subscribed context can be the error
-             * reply that is sent when a new connection exceeds the maximum
-             * number of allowed connections on the server side.
-             *
-             * This is seen as an error instead of a regular reply because the
-             * server closes the connection after sending it.
-             *
-             * To prevent the error from being overwritten by an EOF error the
-             * connection is closed here. See issue #43.
-             *
-             * Another possibility is that the server is loading its dataset.
-             * In this case we also want to close the connection, and have the
-             * user wait until the server is ready to take our request.
-             */
-            if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
-                c->err = REDIS_ERR_OTHER;
-                snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
-                c->reader->fn->freeObject(reply);
-                __redisAsyncDisconnect(ac);
-                return;
-            }
-            /* No more regular callbacks and no errors, the context *must* be subscribed or monitoring. */
-            assert((c->flags & REDIS_SUBSCRIBED || c->flags & REDIS_MONITORING));
-            if(c->flags & REDIS_SUBSCRIBED)
-                __redisGetSubscribeCallback(ac,reply,&cb);
-        }
-
-        if (cb.fn != NULL) {
-            __redisRunCallback(ac,&cb,reply);
-            c->reader->fn->freeObject(reply);
-
-            /* Proceed with free'ing when redisAsyncFree() was called. */
-            if (c->flags & REDIS_FREEING) {
-                __redisAsyncFree(ac);
-                return;
-            }
-        } else {
-            /* No callback for this reply. This can either be a NULL callback,
-             * or there were no callbacks to begin with. Either way, don't
-             * abort with an error, but simply ignore it because the client
-             * doesn't know what the server will spit out over the wire. */
-            c->reader->fn->freeObject(reply);
-        }
-    }
-
-    /* Disconnect when there was an error reading the reply */
-    if (status != REDIS_OK)
-        __redisAsyncDisconnect(ac);
-}
-
-static void __redisAsyncHandleConnectFailure(redisAsyncContext *ac) {
-    if (ac->onConnect) ac->onConnect(ac, REDIS_ERR);
-    __redisAsyncDisconnect(ac);
-}
-
-/* Internal helper function to detect socket status the first time a read or
- * write event fires. When connecting was not successful, the connect callback
- * is called with a REDIS_ERR status and the context is free'd. */
-static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
-    int completed = 0;
-    redisContext *c = &(ac->c);
-
-    if (redisCheckConnectDone(c, &completed) == REDIS_ERR) {
-        /* Error! */
-        redisCheckSocketError(c);
-        __redisAsyncHandleConnectFailure(ac);
-        return REDIS_ERR;
-    } else if (completed == 1) {
-        /* connected! */
-        if (c->connection_type == REDIS_CONN_TCP &&
-            redisSetTcpNoDelay(c) == REDIS_ERR) {
-            __redisAsyncHandleConnectFailure(ac);
-            return REDIS_ERR;
-        }
-
-        if (ac->onConnect) ac->onConnect(ac, REDIS_OK);
-        c->flags |= REDIS_CONNECTED;
-        return REDIS_OK;
-    } else {
-        return REDIS_OK;
-    }
-}
-
-void redisAsyncRead(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (redisBufferRead(c) == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        /* Always re-schedule reads */
-        _EL_ADD_READ(ac);
-        redisProcessCallbacks(ac);
-    }
-}
-
-/* This function should be called when the socket is readable.
- * It processes all replies that can be read and executes their callbacks.
- */
-void redisAsyncHandleRead(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (!(c->flags & REDIS_CONNECTED)) {
-        /* Abort connect was not successful. */
-        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
-            return;
-        /* Try again later when the context is still not connected. */
-        if (!(c->flags & REDIS_CONNECTED))
-            return;
-    }
-
-    c->funcs->async_read(ac);
-}
-
-void redisAsyncWrite(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    int done = 0;
-
-    if (redisBufferWrite(c,&done) == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        /* Continue writing when not done, stop writing otherwise */
-        if (!done)
-            _EL_ADD_WRITE(ac);
-        else
-            _EL_DEL_WRITE(ac);
-
-        /* Always schedule reads after writes */
-        _EL_ADD_READ(ac);
-    }
-}
-
-void redisAsyncHandleWrite(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (!(c->flags & REDIS_CONNECTED)) {
-        /* Abort connect was not successful. */
-        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
-            return;
-        /* Try again later when the context is still not connected. */
-        if (!(c->flags & REDIS_CONNECTED))
-            return;
-    }
-
-    c->funcs->async_write(ac);
-}
-
-void redisAsyncHandleTimeout(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-
-    if ((c->flags & REDIS_CONNECTED) && ac->replies.head == NULL) {
-        /* Nothing to do - just an idle timeout */
-        return;
-    }
-
-    if (!c->err) {
-        __redisSetError(c, REDIS_ERR_TIMEOUT, "Timeout");
-    }
-
-    if (!(c->flags & REDIS_CONNECTED) && ac->onConnect) {
-        ac->onConnect(ac, REDIS_ERR);
-    }
-
-    while (__redisShiftCallback(&ac->replies, &cb) == REDIS_OK) {
-        __redisRunCallback(ac, &cb, NULL);
-    }
-
-    /**
-     * TODO: Don't automatically sever the connection,
-     * rather, allow to ignore <x> responses before the queue is clear
-     */
-    __redisAsyncDisconnect(ac);
-}
-
-/* Sets a pointer to the first argument and its length starting at p. Returns
- * the number of bytes to skip to get to the following argument. */
-static const char *nextArgument(const char *start, const char **str, size_t *len) {
-    const char *p = start;
-    if (p[0] != '$') {
-        p = strchr(p,'$');
-        if (p == NULL) return NULL;
-    }
-
-    *len = (int)strtol(p+1,NULL,10);
-    p = strchr(p,'\r');
-    assert(p);
-    *str = p+2;
-    return p+2+(*len)+2;
-}
-
-/* Helper function for the redisAsyncCommand* family of functions. Writes a
- * formatted command to the output buffer and registers the provided callback
- * function with the context. */
-static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-    struct dict *cbdict;
-    dictEntry *de;
-    redisCallback *existcb;
-    int pvariant, hasnext;
-    const char *cstr, *astr;
-    size_t clen, alen;
-    const char *p;
-    sds sname;
-    int ret;
-
-    /* Don't accept new commands when the connection is about to be closed. */
-    if (c->flags & (REDIS_DISCONNECTING | REDIS_FREEING)) return REDIS_ERR;
-
-    /* Setup callback */
-    cb.fn = fn;
-    cb.privdata = privdata;
-    cb.pending_subs = 1;
-
-    /* Find out which command will be appended. */
-    p = nextArgument(cmd,&cstr,&clen);
-    assert(p != NULL);
-    hasnext = (p[0] == '$');
-    pvariant = (tolower(cstr[0]) == 'p') ? 1 : 0;
-    cstr += pvariant;
-    clen -= pvariant;
-
-    if (hasnext && strncasecmp(cstr,"subscribe\r\n",11) == 0) {
-        c->flags |= REDIS_SUBSCRIBED;
-
-        /* Add every channel/pattern to the list of subscription callbacks. */
-        while ((p = nextArgument(p,&astr,&alen)) != NULL) {
-            sname = sdsnewlen(astr,alen);
-            if (sname == NULL)
-                goto oom;
-
-            if (pvariant)
-                cbdict = ac->sub.patterns;
-            else
-                cbdict = ac->sub.channels;
-
-            de = dictFind(cbdict,sname);
-
-            if (de != NULL) {
-                existcb = dictGetEntryVal(de);
-                cb.pending_subs = existcb->pending_subs + 1;
-            }
-
-            ret = dictReplace(cbdict,sname,&cb);
-
-            if (ret == 0) sdsfree(sname);
-        }
-    } else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) {
-        /* It is only useful to call (P)UNSUBSCRIBE when the context is
-         * subscribed to one or more channels or patterns. */
-        if (!(c->flags & REDIS_SUBSCRIBED)) return REDIS_ERR;
-
-        /* (P)UNSUBSCRIBE does not have its own response: every channel or
-         * pattern that is unsubscribed will receive a message. This means we
-         * should not append a callback function for this command. */
-     } else if(strncasecmp(cstr,"monitor\r\n",9) == 0) {
-         /* Set monitor flag and push callback */
-         c->flags |= REDIS_MONITORING;
-         __redisPushCallback(&ac->replies,&cb);
-    } else {
-        if (c->flags & REDIS_SUBSCRIBED)
-            /* This will likely result in an error reply, but it needs to be
-             * received and passed to the callback. */
-            __redisPushCallback(&ac->sub.invalid,&cb);
-        else
-            __redisPushCallback(&ac->replies,&cb);
-    }
-
-    __redisAppendCommand(c,cmd,len);
-
-    /* Always schedule a write when the write buffer is non-empty */
-    _EL_ADD_WRITE(ac);
-
-    return REDIS_OK;
-oom:
-    __redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
-    return REDIS_ERR;
-}
-
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap) {
-    char *cmd;
-    int len;
-    int status;
-    len = redisvFormatCommand(&cmd,format,ap);
-
-    /* We don't want to pass -1 or -2 to future functions as a length. */
-    if (len < 0)
-        return REDIS_ERR;
-
-    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    hi_free(cmd);
-    return status;
-}
-
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...) {
-    va_list ap;
-    int status;
-    va_start(ap,format);
-    status = redisvAsyncCommand(ac,fn,privdata,format,ap);
-    va_end(ap);
-    return status;
-}
-
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) {
-    sds cmd;
-    int len;
-    int status;
-    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
-    if (len < 0)
-        return REDIS_ERR;
-    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    sdsfree(cmd);
-    return status;
-}
-
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
-    int status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    return status;
-}
-
-redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn) {
-    redisAsyncPushFn *old = ac->push_cb;
-    ac->push_cb = fn;
-    return old;
-}
-
-int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv) {
-    if (!ac->c.command_timeout) {
-        ac->c.command_timeout = hi_calloc(1, sizeof(tv));
-        if (ac->c.command_timeout == NULL) {
-            __redisSetError(&ac->c, REDIS_ERR_OOM, "Out of memory");
-            __redisAsyncCopyError(ac);
-            return REDIS_ERR;
-        }
-    }
-
-    if (tv.tv_sec != ac->c.command_timeout->tv_sec ||
-        tv.tv_usec != ac->c.command_timeout->tv_usec)
-    {
-        *ac->c.command_timeout = tv;
-    }
-
-    return REDIS_OK;
-}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/async.h b/debian/modules/nchan/src/store/redis/hiredis/async.h
deleted file mode 100644
index b1d2cb2..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/async.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_ASYNC_H
-#define __HIREDIS_ASYNC_H
-#include "hiredis.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
-struct dict; /* dictionary header is included in async.c */
-
-/* Reply callback prototype and container */
-typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
-typedef struct redisCallback {
-    struct redisCallback *next; /* simple singly linked list */
-    redisCallbackFn *fn;
-    int pending_subs;
-    void *privdata;
-} redisCallback;
-
-/* List of callbacks for either regular replies or pub/sub */
-typedef struct redisCallbackList {
-    redisCallback *head, *tail;
-} redisCallbackList;
-
-/* Connection callback prototypes */
-typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
-typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
-typedef void(redisTimerCallback)(void *timer, void *privdata);
-
-/* Context for an async connection to Redis */
-typedef struct redisAsyncContext {
-    /* Hold the regular context, so it can be realloc'ed. */
-    redisContext c;
-
-    /* Setup error flags so they can be used directly. */
-    int err;
-    char *errstr;
-
-    /* Not used by hiredis */
-    void *data;
-    void (*dataCleanup)(void *privdata);
-
-    /* Event library data and hooks */
-    struct {
-        void *data;
-
-        /* Hooks that are called when the library expects to start
-         * reading/writing. These functions should be idempotent. */
-        void (*addRead)(void *privdata);
-        void (*delRead)(void *privdata);
-        void (*addWrite)(void *privdata);
-        void (*delWrite)(void *privdata);
-        void (*cleanup)(void *privdata);
-        void (*scheduleTimer)(void *privdata, struct timeval tv);
-    } ev;
-
-    /* Called when either the connection is terminated due to an error or per
-     * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
-    redisDisconnectCallback *onDisconnect;
-
-    /* Called when the first write event was received. */
-    redisConnectCallback *onConnect;
-
-    /* Regular command callbacks */
-    redisCallbackList replies;
-
-    /* Address used for connect() */
-    struct sockaddr *saddr;
-    size_t addrlen;
-
-    /* Subscription callbacks */
-    struct {
-        redisCallbackList invalid;
-        struct dict *channels;
-        struct dict *patterns;
-    } sub;
-
-    /* Any configured RESP3 PUSH handler */
-    redisAsyncPushFn *push_cb;
-} redisAsyncContext;
-
-/* Functions that proxy to hiredis */
-redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options);
-redisAsyncContext *redisAsyncConnect(const char *ip, int port);
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr);
-redisAsyncContext *redisAsyncConnectUnix(const char *path);
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-
-redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn);
-int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv);
-void redisAsyncDisconnect(redisAsyncContext *ac);
-void redisAsyncFree(redisAsyncContext *ac);
-
-/* Handle read/write events */
-void redisAsyncHandleRead(redisAsyncContext *ac);
-void redisAsyncHandleWrite(redisAsyncContext *ac);
-void redisAsyncHandleTimeout(redisAsyncContext *ac);
-void redisAsyncRead(redisAsyncContext *ac);
-void redisAsyncWrite(redisAsyncContext *ac);
-
-/* Command functions for an async context. Write the command to the
- * output buffer and register the provided callback. */
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/async_private.h b/debian/modules/nchan/src/store/redis/hiredis/async_private.h
deleted file mode 100644
index b9d23ff..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/async_private.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_ASYNC_PRIVATE_H
-#define __HIREDIS_ASYNC_PRIVATE_H
-
-#define _EL_ADD_READ(ctx)                                         \
-    do {                                                          \
-        refreshTimeout(ctx);                                      \
-        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
-    } while (0)
-#define _EL_DEL_READ(ctx) do { \
-        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
-    } while(0)
-#define _EL_ADD_WRITE(ctx)                                          \
-    do {                                                            \
-        refreshTimeout(ctx);                                        \
-        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
-    } while (0)
-#define _EL_DEL_WRITE(ctx) do { \
-        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
-    } while(0)
-#define _EL_CLEANUP(ctx) do { \
-        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
-        ctx->ev.cleanup = NULL; \
-    } while(0);
-
-static inline void refreshTimeout(redisAsyncContext *ctx) {
-    #define REDIS_TIMER_ISSET(tvp) \
-        (tvp && ((tvp)->tv_sec || (tvp)->tv_usec))
-
-    #define REDIS_EL_TIMER(ac, tvp) \
-        if ((ac)->ev.scheduleTimer && REDIS_TIMER_ISSET(tvp)) { \
-            (ac)->ev.scheduleTimer((ac)->ev.data, *(tvp)); \
-        }
-
-    if (ctx->c.flags & REDIS_CONNECTED) {
-        REDIS_EL_TIMER(ctx, ctx->c.command_timeout);
-    } else {
-        REDIS_EL_TIMER(ctx, ctx->c.connect_timeout);
-    }
-}
-
-void __redisAsyncDisconnect(redisAsyncContext *ac);
-void redisProcessCallbacks(redisAsyncContext *ac);
-
-#endif  /* __HIREDIS_ASYNC_PRIVATE_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/dict.c b/debian/modules/nchan/src/store/redis/hiredis/dict.c
deleted file mode 100644
index 74a4633..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/dict.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include "alloc.h"
-#include <stdlib.h>
-#include <assert.h>
-#include <limits.h>
-#include "dict.h"
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-
-/* -------------------------- private prototypes ---------------------------- */
-
-static int _dictExpandIfNeeded(dict *ht);
-static unsigned long _dictNextPower(unsigned long size);
-static int _dictKeyIndex(dict *ht, const void *key);
-static int _dictInit(dict *ht, dictType *type, void *privDataPtr);
-
-/* -------------------------- hash functions -------------------------------- */
-
-/* Generic hash function (a popular one from Bernstein).
- * I tested a few and this was the best. */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len) {
-    unsigned int hash = 5381;
-
-    while (len--)
-        hash = ((hash << 5) + hash) + (*buf++); /* hash * 33 + c */
-    return hash;
-}
-
-/* ----------------------------- API implementation ------------------------- */
-
-/* Reset an hashtable already initialized with ht_init().
- * NOTE: This function should only called by ht_destroy(). */
-static void _dictReset(dict *ht) {
-    ht->table = NULL;
-    ht->size = 0;
-    ht->sizemask = 0;
-    ht->used = 0;
-}
-
-/* Create a new hash table */
-static dict *dictCreate(dictType *type, void *privDataPtr) {
-    dict *ht = hi_malloc(sizeof(*ht));
-    if (ht == NULL)
-        return NULL;
-
-    _dictInit(ht,type,privDataPtr);
-    return ht;
-}
-
-/* Initialize the hash table */
-static int _dictInit(dict *ht, dictType *type, void *privDataPtr) {
-    _dictReset(ht);
-    ht->type = type;
-    ht->privdata = privDataPtr;
-    return DICT_OK;
-}
-
-/* Expand or create the hashtable */
-static int dictExpand(dict *ht, unsigned long size) {
-    dict n; /* the new hashtable */
-    unsigned long realsize = _dictNextPower(size), i;
-
-    /* the size is invalid if it is smaller than the number of
-     * elements already inside the hashtable */
-    if (ht->used > size)
-        return DICT_ERR;
-
-    _dictInit(&n, ht->type, ht->privdata);
-    n.size = realsize;
-    n.sizemask = realsize-1;
-    n.table = hi_calloc(realsize,sizeof(dictEntry*));
-    if (n.table == NULL)
-        return DICT_ERR;
-
-    /* Copy all the elements from the old to the new table:
-     * note that if the old hash table is empty ht->size is zero,
-     * so dictExpand just creates an hash table. */
-    n.used = ht->used;
-    for (i = 0; i < ht->size && ht->used > 0; i++) {
-        dictEntry *he, *nextHe;
-
-        if (ht->table[i] == NULL) continue;
-
-        /* For each hash entry on this slot... */
-        he = ht->table[i];
-        while(he) {
-            unsigned int h;
-
-            nextHe = he->next;
-            /* Get the new element index */
-            h = dictHashKey(ht, he->key) & n.sizemask;
-            he->next = n.table[h];
-            n.table[h] = he;
-            ht->used--;
-            /* Pass to the next element */
-            he = nextHe;
-        }
-    }
-    assert(ht->used == 0);
-    hi_free(ht->table);
-
-    /* Remap the new hashtable in the old */
-    *ht = n;
-    return DICT_OK;
-}
-
-/* Add an element to the target hash table */
-static int dictAdd(dict *ht, void *key, void *val) {
-    int index;
-    dictEntry *entry;
-
-    /* Get the index of the new element, or -1 if
-     * the element already exists. */
-    if ((index = _dictKeyIndex(ht, key)) == -1)
-        return DICT_ERR;
-
-    /* Allocates the memory and stores key */
-    entry = hi_malloc(sizeof(*entry));
-    if (entry == NULL)
-        return DICT_ERR;
-
-    entry->next = ht->table[index];
-    ht->table[index] = entry;
-
-    /* Set the hash entry fields. */
-    dictSetHashKey(ht, entry, key);
-    dictSetHashVal(ht, entry, val);
-    ht->used++;
-    return DICT_OK;
-}
-
-/* Add an element, discarding the old if the key already exists.
- * Return 1 if the key was added from scratch, 0 if there was already an
- * element with such key and dictReplace() just performed a value update
- * operation. */
-static int dictReplace(dict *ht, void *key, void *val) {
-    dictEntry *entry, auxentry;
-
-    /* Try to add the element. If the key
-     * does not exists dictAdd will succeed. */
-    if (dictAdd(ht, key, val) == DICT_OK)
-        return 1;
-    /* It already exists, get the entry */
-    entry = dictFind(ht, key);
-    if (entry == NULL)
-        return 0;
-
-    /* Free the old value and set the new one */
-    /* Set the new value and free the old one. Note that it is important
-     * to do that in this order, as the value may just be exactly the same
-     * as the previous one. In this context, think to reference counting,
-     * you want to increment (set), and then decrement (free), and not the
-     * reverse. */
-    auxentry = *entry;
-    dictSetHashVal(ht, entry, val);
-    dictFreeEntryVal(ht, &auxentry);
-    return 0;
-}
-
-/* Search and remove an element */
-static int dictDelete(dict *ht, const void *key) {
-    unsigned int h;
-    dictEntry *de, *prevde;
-
-    if (ht->size == 0)
-        return DICT_ERR;
-    h = dictHashKey(ht, key) & ht->sizemask;
-    de = ht->table[h];
-
-    prevde = NULL;
-    while(de) {
-        if (dictCompareHashKeys(ht,key,de->key)) {
-            /* Unlink the element from the list */
-            if (prevde)
-                prevde->next = de->next;
-            else
-                ht->table[h] = de->next;
-
-            dictFreeEntryKey(ht,de);
-            dictFreeEntryVal(ht,de);
-            hi_free(de);
-            ht->used--;
-            return DICT_OK;
-        }
-        prevde = de;
-        de = de->next;
-    }
-    return DICT_ERR; /* not found */
-}
-
-/* Destroy an entire hash table */
-static int _dictClear(dict *ht) {
-    unsigned long i;
-
-    /* Free all the elements */
-    for (i = 0; i < ht->size && ht->used > 0; i++) {
-        dictEntry *he, *nextHe;
-
-        if ((he = ht->table[i]) == NULL) continue;
-        while(he) {
-            nextHe = he->next;
-            dictFreeEntryKey(ht, he);
-            dictFreeEntryVal(ht, he);
-            hi_free(he);
-            ht->used--;
-            he = nextHe;
-        }
-    }
-    /* Free the table and the allocated cache structure */
-    hi_free(ht->table);
-    /* Re-initialize the table */
-    _dictReset(ht);
-    return DICT_OK; /* never fails */
-}
-
-/* Clear & Release the hash table */
-static void dictRelease(dict *ht) {
-    _dictClear(ht);
-    hi_free(ht);
-}
-
-static dictEntry *dictFind(dict *ht, const void *key) {
-    dictEntry *he;
-    unsigned int h;
-
-    if (ht->size == 0) return NULL;
-    h = dictHashKey(ht, key) & ht->sizemask;
-    he = ht->table[h];
-    while(he) {
-        if (dictCompareHashKeys(ht, key, he->key))
-            return he;
-        he = he->next;
-    }
-    return NULL;
-}
-
-static dictIterator *dictGetIterator(dict *ht) {
-    dictIterator *iter = hi_malloc(sizeof(*iter));
-    if (iter == NULL)
-        return NULL;
-
-    iter->ht = ht;
-    iter->index = -1;
-    iter->entry = NULL;
-    iter->nextEntry = NULL;
-    return iter;
-}
-
-static dictEntry *dictNext(dictIterator *iter) {
-    while (1) {
-        if (iter->entry == NULL) {
-            iter->index++;
-            if (iter->index >=
-                    (signed)iter->ht->size) break;
-            iter->entry = iter->ht->table[iter->index];
-        } else {
-            iter->entry = iter->nextEntry;
-        }
-        if (iter->entry) {
-            /* We need to save the 'next' here, the iterator user
-             * may delete the entry we are returning. */
-            iter->nextEntry = iter->entry->next;
-            return iter->entry;
-        }
-    }
-    return NULL;
-}
-
-static void dictReleaseIterator(dictIterator *iter) {
-    hi_free(iter);
-}
-
-/* ------------------------- private functions ------------------------------ */
-
-/* Expand the hash table if needed */
-static int _dictExpandIfNeeded(dict *ht) {
-    /* If the hash table is empty expand it to the initial size,
-     * if the table is "full" double its size. */
-    if (ht->size == 0)
-        return dictExpand(ht, DICT_HT_INITIAL_SIZE);
-    if (ht->used == ht->size)
-        return dictExpand(ht, ht->size*2);
-    return DICT_OK;
-}
-
-/* Our hash table capability is a power of two */
-static unsigned long _dictNextPower(unsigned long size) {
-    unsigned long i = DICT_HT_INITIAL_SIZE;
-
-    if (size >= LONG_MAX) return LONG_MAX;
-    while(1) {
-        if (i >= size)
-            return i;
-        i *= 2;
-    }
-}
-
-/* Returns the index of a free slot that can be populated with
- * an hash entry for the given 'key'.
- * If the key already exists, -1 is returned. */
-static int _dictKeyIndex(dict *ht, const void *key) {
-    unsigned int h;
-    dictEntry *he;
-
-    /* Expand the hashtable if needed */
-    if (_dictExpandIfNeeded(ht) == DICT_ERR)
-        return -1;
-    /* Compute the key hash value */
-    h = dictHashKey(ht, key) & ht->sizemask;
-    /* Search if this slot does not already contain the given key */
-    he = ht->table[h];
-    while(he) {
-        if (dictCompareHashKeys(ht, key, he->key))
-            return -1;
-        he = he->next;
-    }
-    return h;
-}
-
-
-#pragma GCC diagnostic pop
diff --git a/debian/modules/nchan/src/store/redis/hiredis/dict.h b/debian/modules/nchan/src/store/redis/hiredis/dict.h
deleted file mode 100644
index 95fcd28..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/dict.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __DICT_H
-#define __DICT_H
-
-#define DICT_OK 0
-#define DICT_ERR 1
-
-/* Unused arguments generate annoying warnings... */
-#define DICT_NOTUSED(V) ((void) V)
-
-typedef struct dictEntry {
-    void *key;
-    void *val;
-    struct dictEntry *next;
-} dictEntry;
-
-typedef struct dictType {
-    unsigned int (*hashFunction)(const void *key);
-    void *(*keyDup)(void *privdata, const void *key);
-    void *(*valDup)(void *privdata, const void *obj);
-    int (*keyCompare)(void *privdata, const void *key1, const void *key2);
-    void (*keyDestructor)(void *privdata, void *key);
-    void (*valDestructor)(void *privdata, void *obj);
-} dictType;
-
-typedef struct dict {
-    dictEntry **table;
-    dictType *type;
-    unsigned long size;
-    unsigned long sizemask;
-    unsigned long used;
-    void *privdata;
-} dict;
-
-typedef struct dictIterator {
-    dict *ht;
-    int index;
-    dictEntry *entry, *nextEntry;
-} dictIterator;
-
-/* This is the initial size of every hash table */
-#define DICT_HT_INITIAL_SIZE     4
-
-/* ------------------------------- Macros ------------------------------------*/
-#define dictFreeEntryVal(ht, entry) \
-    if ((ht)->type->valDestructor) \
-        (ht)->type->valDestructor((ht)->privdata, (entry)->val)
-
-#define dictSetHashVal(ht, entry, _val_) do { \
-    if ((ht)->type->valDup) \
-        entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
-    else \
-        entry->val = (_val_); \
-} while(0)
-
-#define dictFreeEntryKey(ht, entry) \
-    if ((ht)->type->keyDestructor) \
-        (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
-
-#define dictSetHashKey(ht, entry, _key_) do { \
-    if ((ht)->type->keyDup) \
-        entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
-    else \
-        entry->key = (_key_); \
-} while(0)
-
-#define dictCompareHashKeys(ht, key1, key2) \
-    (((ht)->type->keyCompare) ? \
-        (ht)->type->keyCompare((ht)->privdata, key1, key2) : \
-        (key1) == (key2))
-
-#define dictHashKey(ht, key) (ht)->type->hashFunction(key)
-
-#define dictGetEntryKey(he) ((he)->key)
-#define dictGetEntryVal(he) ((he)->val)
-#define dictSlots(ht) ((ht)->size)
-#define dictSize(ht) ((ht)->used)
-
-/* API */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
-static dict *dictCreate(dictType *type, void *privDataPtr);
-static int dictExpand(dict *ht, unsigned long size);
-static int dictAdd(dict *ht, void *key, void *val);
-static int dictReplace(dict *ht, void *key, void *val);
-static int dictDelete(dict *ht, const void *key);
-static void dictRelease(dict *ht);
-static dictEntry * dictFind(dict *ht, const void *key);
-static dictIterator *dictGetIterator(dict *ht);
-static dictEntry *dictNext(dictIterator *iter);
-static void dictReleaseIterator(dictIterator *iter);
-
-#endif /* __DICT_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/fmacros.h b/debian/modules/nchan/src/store/redis/hiredis/fmacros.h
deleted file mode 100644
index 3227faa..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/fmacros.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __HIREDIS_FMACRO_H
-#define __HIREDIS_FMACRO_H
-
-#define _XOPEN_SOURCE 600
-#define _POSIX_C_SOURCE 200112L
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* Enable TCP_KEEPALIVE */
-#define _DARWIN_C_SOURCE
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/hiredis.c b/debian/modules/nchan/src/store/redis/hiredis/hiredis.c
deleted file mode 100644
index ab0e398..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/hiredis.c
+++ /dev/null
@@ -1,1174 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include "hiredis.h"
-#include "net.h"
-#include "sds.h"
-#include "async.h"
-#include "win32.h"
-
-extern int redisContextUpdateConnectTimeout(redisContext *c, const struct timeval *timeout);
-extern int redisContextUpdateCommandTimeout(redisContext *c, const struct timeval *timeout);
-
-static redisContextFuncs redisContextDefaultFuncs = {
-    .free_privctx = NULL,
-    .async_read = redisAsyncRead,
-    .async_write = redisAsyncWrite,
-    .read = redisNetRead,
-    .write = redisNetWrite
-};
-
-static redisReply *createReplyObject(int type);
-static void *createStringObject(const redisReadTask *task, char *str, size_t len);
-static void *createArrayObject(const redisReadTask *task, size_t elements);
-static void *createIntegerObject(const redisReadTask *task, long long value);
-static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len);
-static void *createNilObject(const redisReadTask *task);
-static void *createBoolObject(const redisReadTask *task, int bval);
-
-/* Default set of functions to build the reply. Keep in mind that such a
- * function returning NULL is interpreted as OOM. */
-static redisReplyObjectFunctions defaultFunctions = {
-    createStringObject,
-    createArrayObject,
-    createIntegerObject,
-    createDoubleObject,
-    createNilObject,
-    createBoolObject,
-    freeReplyObject
-};
-
-/* Create a reply object */
-static redisReply *createReplyObject(int type) {
-    redisReply *r = hi_calloc(1,sizeof(*r));
-
-    if (r == NULL)
-        return NULL;
-
-    r->type = type;
-    return r;
-}
-
-/* Free a reply object */
-void freeReplyObject(void *reply) {
-    redisReply *r = reply;
-    size_t j;
-
-    if (r == NULL)
-        return;
-
-    switch(r->type) {
-    case REDIS_REPLY_INTEGER:
-        break; /* Nothing to free */
-    case REDIS_REPLY_ARRAY:
-    case REDIS_REPLY_MAP:
-    case REDIS_REPLY_SET:
-    case REDIS_REPLY_PUSH:
-        if (r->element != NULL) {
-            for (j = 0; j < r->elements; j++)
-                freeReplyObject(r->element[j]);
-            hi_free(r->element);
-        }
-        break;
-    case REDIS_REPLY_ERROR:
-    case REDIS_REPLY_STATUS:
-    case REDIS_REPLY_STRING:
-    case REDIS_REPLY_DOUBLE:
-    case REDIS_REPLY_VERB:
-        hi_free(r->str);
-        break;
-    }
-    hi_free(r);
-}
-
-static void *createStringObject(const redisReadTask *task, char *str, size_t len) {
-    redisReply *r, *parent;
-    char *buf;
-
-    r = createReplyObject(task->type);
-    if (r == NULL)
-        return NULL;
-
-    assert(task->type == REDIS_REPLY_ERROR  ||
-           task->type == REDIS_REPLY_STATUS ||
-           task->type == REDIS_REPLY_STRING ||
-           task->type == REDIS_REPLY_VERB);
-
-    /* Copy string value */
-    if (task->type == REDIS_REPLY_VERB) {
-        buf = hi_malloc(len-4+1); /* Skip 4 bytes of verbatim type header. */
-        if (buf == NULL) goto oom;
-
-        memcpy(r->vtype,str,3);
-        r->vtype[3] = '\0';
-        memcpy(buf,str+4,len-4);
-        buf[len-4] = '\0';
-        r->len = len - 4;
-    } else {
-        buf = hi_malloc(len+1);
-        if (buf == NULL) goto oom;
-
-        memcpy(buf,str,len);
-        buf[len] = '\0';
-        r->len = len;
-    }
-    r->str = buf;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET ||
-               parent->type == REDIS_REPLY_PUSH);
-        parent->element[task->idx] = r;
-    }
-    return r;
-
-oom:
-    freeReplyObject(r);
-    return NULL;
-}
-
-static void *createArrayObject(const redisReadTask *task, size_t elements) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(task->type);
-    if (r == NULL)
-        return NULL;
-
-    if (elements > 0) {
-        if (SIZE_MAX / sizeof(redisReply*) < elements) return NULL;  /* Don't overflow */
-        r->element = hi_calloc(elements,sizeof(redisReply*));
-        if (r->element == NULL) {
-            freeReplyObject(r);
-            return NULL;
-        }
-    }
-
-    r->elements = elements;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET ||
-               parent->type == REDIS_REPLY_PUSH);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createIntegerObject(const redisReadTask *task, long long value) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_INTEGER);
-    if (r == NULL)
-        return NULL;
-
-    r->integer = value;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET ||
-               parent->type == REDIS_REPLY_PUSH);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_DOUBLE);
-    if (r == NULL)
-        return NULL;
-
-    r->dval = value;
-    r->str = hi_malloc(len+1);
-    if (r->str == NULL) {
-        freeReplyObject(r);
-        return NULL;
-    }
-
-    /* The double reply also has the original protocol string representing a
-     * double as a null terminated string. This way the caller does not need
-     * to format back for string conversion, especially since Redis does efforts
-     * to make the string more human readable avoiding the calssical double
-     * decimal string conversion artifacts. */
-    memcpy(r->str, str, len);
-    r->str[len] = '\0';
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createNilObject(const redisReadTask *task) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_NIL);
-    if (r == NULL)
-        return NULL;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createBoolObject(const redisReadTask *task, int bval) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_BOOL);
-    if (r == NULL)
-        return NULL;
-
-    r->integer = bval != 0;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-/* Return the number of digits of 'v' when converted to string in radix 10.
- * Implementation borrowed from link in redis/src/util.c:string2ll(). */
-static uint32_t countDigits(uint64_t v) {
-  uint32_t result = 1;
-  for (;;) {
-    if (v < 10) return result;
-    if (v < 100) return result + 1;
-    if (v < 1000) return result + 2;
-    if (v < 10000) return result + 3;
-    v /= 10000U;
-    result += 4;
-  }
-}
-
-/* Helper that calculates the bulk length given a certain string length. */
-static size_t bulklen(size_t len) {
-    return 1+countDigits(len)+2+len+2;
-}
-
-int redisvFormatCommand(char **target, const char *format, va_list ap) {
-    const char *c = format;
-    char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
-    sds curarg, newarg; /* current argument */
-    int touched = 0; /* was the current argument touched? */
-    char **curargv = NULL, **newargv = NULL;
-    int argc = 0;
-    int totlen = 0;
-    int error_type = 0; /* 0 = no error; -1 = memory error; -2 = format error */
-    int j;
-
-    /* Abort if there is not target to set */
-    if (target == NULL)
-        return -1;
-
-    /* Build the command string accordingly to protocol */
-    curarg = sdsempty();
-    if (curarg == NULL)
-        return -1;
-
-    while(*c != '\0') {
-        if (*c != '%' || c[1] == '\0') {
-            if (*c == ' ') {
-                if (touched) {
-                    newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
-                    if (newargv == NULL) goto memory_err;
-                    curargv = newargv;
-                    curargv[argc++] = curarg;
-                    totlen += bulklen(sdslen(curarg));
-
-                    /* curarg is put in argv so it can be overwritten. */
-                    curarg = sdsempty();
-                    if (curarg == NULL) goto memory_err;
-                    touched = 0;
-                }
-            } else {
-                newarg = sdscatlen(curarg,c,1);
-                if (newarg == NULL) goto memory_err;
-                curarg = newarg;
-                touched = 1;
-            }
-        } else {
-            char *arg;
-            size_t size;
-
-            /* Set newarg so it can be checked even if it is not touched. */
-            newarg = curarg;
-
-            switch(c[1]) {
-            case 's':
-                arg = va_arg(ap,char*);
-                size = strlen(arg);
-                if (size > 0)
-                    newarg = sdscatlen(curarg,arg,size);
-                break;
-            case 'b':
-                arg = va_arg(ap,char*);
-                size = va_arg(ap,size_t);
-                if (size > 0)
-                    newarg = sdscatlen(curarg,arg,size);
-                break;
-            case '%':
-                newarg = sdscat(curarg,"%");
-                break;
-            default:
-                /* Try to detect printf format */
-                {
-                    static const char intfmts[] = "diouxX";
-                    static const char flags[] = "#0-+ ";
-                    char _format[16];
-                    const char *_p = c+1;
-                    size_t _l = 0;
-                    va_list _cpy;
-
-                    /* Flags */
-                    while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++;
-
-                    /* Field width */
-                    while (*_p != '\0' && isdigit(*_p)) _p++;
-
-                    /* Precision */
-                    if (*_p == '.') {
-                        _p++;
-                        while (*_p != '\0' && isdigit(*_p)) _p++;
-                    }
-
-                    /* Copy va_list before consuming with va_arg */
-                    va_copy(_cpy,ap);
-
-                    /* Integer conversion (without modifiers) */
-                    if (strchr(intfmts,*_p) != NULL) {
-                        va_arg(ap,int);
-                        goto fmt_valid;
-                    }
-
-                    /* Double conversion (without modifiers) */
-                    if (strchr("eEfFgGaA",*_p) != NULL) {
-                        va_arg(ap,double);
-                        goto fmt_valid;
-                    }
-
-                    /* Size: char */
-                    if (_p[0] == 'h' && _p[1] == 'h') {
-                        _p += 2;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,int); /* char gets promoted to int */
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: short */
-                    if (_p[0] == 'h') {
-                        _p += 1;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,int); /* short gets promoted to int */
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: long long */
-                    if (_p[0] == 'l' && _p[1] == 'l') {
-                        _p += 2;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,long long);
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: long */
-                    if (_p[0] == 'l') {
-                        _p += 1;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,long);
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                fmt_invalid:
-                    va_end(_cpy);
-                    goto format_err;
-
-                fmt_valid:
-                    _l = (_p+1)-c;
-                    if (_l < sizeof(_format)-2) {
-                        memcpy(_format,c,_l);
-                        _format[_l] = '\0';
-                        newarg = sdscatvprintf(curarg,_format,_cpy);
-
-                        /* Update current position (note: outer blocks
-                         * increment c twice so compensate here) */
-                        c = _p-1;
-                    }
-
-                    va_end(_cpy);
-                    break;
-                }
-            }
-
-            if (newarg == NULL) goto memory_err;
-            curarg = newarg;
-
-            touched = 1;
-            c++;
-        }
-        c++;
-    }
-
-    /* Add the last argument if needed */
-    if (touched) {
-        newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
-        if (newargv == NULL) goto memory_err;
-        curargv = newargv;
-        curargv[argc++] = curarg;
-        totlen += bulklen(sdslen(curarg));
-    } else {
-        sdsfree(curarg);
-    }
-
-    /* Clear curarg because it was put in curargv or was free'd. */
-    curarg = NULL;
-
-    /* Add bytes needed to hold multi bulk count */
-    totlen += 1+countDigits(argc)+2;
-
-    /* Build the command at protocol level */
-    cmd = hi_malloc(totlen+1);
-    if (cmd == NULL) goto memory_err;
-
-    pos = sprintf(cmd,"*%d\r\n",argc);
-    for (j = 0; j < argc; j++) {
-        pos += sprintf(cmd+pos,"$%zu\r\n",sdslen(curargv[j]));
-        memcpy(cmd+pos,curargv[j],sdslen(curargv[j]));
-        pos += sdslen(curargv[j]);
-        sdsfree(curargv[j]);
-        cmd[pos++] = '\r';
-        cmd[pos++] = '\n';
-    }
-    assert(pos == totlen);
-    cmd[pos] = '\0';
-
-    hi_free(curargv);
-    *target = cmd;
-    return totlen;
-
-format_err:
-    error_type = -2;
-    goto cleanup;
-
-memory_err:
-    error_type = -1;
-    goto cleanup;
-
-cleanup:
-    if (curargv) {
-        while(argc--)
-            sdsfree(curargv[argc]);
-        hi_free(curargv);
-    }
-
-    sdsfree(curarg);
-    hi_free(cmd);
-
-    return error_type;
-}
-
-/* Format a command according to the Redis protocol. This function
- * takes a format similar to printf:
- *
- * %s represents a C null terminated string you want to interpolate
- * %b represents a binary safe string
- *
- * When using %b you need to provide both the pointer to the string
- * and the length in bytes as a size_t. Examples:
- *
- * len = redisFormatCommand(target, "GET %s", mykey);
- * len = redisFormatCommand(target, "SET %s %b", mykey, myval, myvallen);
- */
-int redisFormatCommand(char **target, const char *format, ...) {
-    va_list ap;
-    int len;
-    va_start(ap,format);
-    len = redisvFormatCommand(target,format,ap);
-    va_end(ap);
-
-    /* The API says "-1" means bad result, but we now also return "-2" in some
-     * cases.  Force the return value to always be -1. */
-    if (len < 0)
-        len = -1;
-
-    return len;
-}
-
-/* Format a command according to the Redis protocol using an sds string and
- * sdscatfmt for the processing of arguments. This function takes the
- * number of arguments, an array with arguments and an array with their
- * lengths. If the latter is set to NULL, strlen will be used to compute the
- * argument lengths.
- */
-int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
-                              const size_t *argvlen)
-{
-    sds cmd, aux;
-    unsigned long long totlen;
-    int j;
-    size_t len;
-
-    /* Abort on a NULL target */
-    if (target == NULL)
-        return -1;
-
-    /* Calculate our total size */
-    totlen = 1+countDigits(argc)+2;
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        totlen += bulklen(len);
-    }
-
-    /* Use an SDS string for command construction */
-    cmd = sdsempty();
-    if (cmd == NULL)
-        return -1;
-
-    /* We already know how much storage we need */
-    aux = sdsMakeRoomFor(cmd, totlen);
-    if (aux == NULL) {
-        sdsfree(cmd);
-        return -1;
-    }
-
-    cmd = aux;
-
-    /* Construct command */
-    cmd = sdscatfmt(cmd, "*%i\r\n", argc);
-    for (j=0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        cmd = sdscatfmt(cmd, "$%u\r\n", len);
-        cmd = sdscatlen(cmd, argv[j], len);
-        cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
-    }
-
-    assert(sdslen(cmd)==totlen);
-
-    *target = cmd;
-    return totlen;
-}
-
-void redisFreeSdsCommand(sds cmd) {
-    sdsfree(cmd);
-}
-
-/* Format a command according to the Redis protocol. This function takes the
- * number of arguments, an array with arguments and an array with their
- * lengths. If the latter is set to NULL, strlen will be used to compute the
- * argument lengths.
- */
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen) {
-    char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
-    size_t len;
-    int totlen, j;
-
-    /* Abort on a NULL target */
-    if (target == NULL)
-        return -1;
-
-    /* Calculate number of bytes needed for the command */
-    totlen = 1+countDigits(argc)+2;
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        totlen += bulklen(len);
-    }
-
-    /* Build the command at protocol level */
-    cmd = hi_malloc(totlen+1);
-    if (cmd == NULL)
-        return -1;
-
-    pos = sprintf(cmd,"*%d\r\n",argc);
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        pos += sprintf(cmd+pos,"$%zu\r\n",len);
-        memcpy(cmd+pos,argv[j],len);
-        pos += len;
-        cmd[pos++] = '\r';
-        cmd[pos++] = '\n';
-    }
-    assert(pos == totlen);
-    cmd[pos] = '\0';
-
-    *target = cmd;
-    return totlen;
-}
-
-void redisFreeCommand(char *cmd) {
-    hi_free(cmd);
-}
-
-void __redisSetError(redisContext *c, int type, const char *str) {
-    size_t len;
-
-    c->err = type;
-    if (str != NULL) {
-        len = strlen(str);
-        len = len < (sizeof(c->errstr)-1) ? len : (sizeof(c->errstr)-1);
-        memcpy(c->errstr,str,len);
-        c->errstr[len] = '\0';
-    } else {
-        /* Only REDIS_ERR_IO may lack a description! */
-        assert(type == REDIS_ERR_IO);
-        strerror_r(errno, c->errstr, sizeof(c->errstr));
-    }
-}
-
-redisReader *redisReaderCreate(void) {
-    return redisReaderCreateWithFunctions(&defaultFunctions);
-}
-
-static void redisPushAutoFree(void *privdata, void *reply) {
-    (void)privdata;
-    freeReplyObject(reply);
-}
-
-static redisContext *redisContextInit(void) {
-    redisContext *c;
-
-    c = hi_calloc(1, sizeof(*c));
-    if (c == NULL)
-        return NULL;
-
-    c->funcs = &redisContextDefaultFuncs;
-
-    c->obuf = sdsempty();
-    c->reader = redisReaderCreate();
-    c->fd = REDIS_INVALID_FD;
-
-    if (c->obuf == NULL || c->reader == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    return c;
-}
-
-void redisFree(redisContext *c) {
-    if (c == NULL)
-        return;
-    redisNetClose(c);
-
-    sdsfree(c->obuf);
-    redisReaderFree(c->reader);
-    hi_free(c->tcp.host);
-    hi_free(c->tcp.source_addr);
-    hi_free(c->unix_sock.path);
-    hi_free(c->connect_timeout);
-    hi_free(c->command_timeout);
-    hi_free(c->saddr);
-
-    if (c->privdata && c->free_privdata)
-        c->free_privdata(c->privdata);
-
-    if (c->funcs->free_privctx)
-        c->funcs->free_privctx(c->privctx);
-
-    memset(c, 0xff, sizeof(*c));
-    hi_free(c);
-}
-
-redisFD redisFreeKeepFd(redisContext *c) {
-    redisFD fd = c->fd;
-    c->fd = REDIS_INVALID_FD;
-    redisFree(c);
-    return fd;
-}
-
-int redisReconnect(redisContext *c) {
-    c->err = 0;
-    memset(c->errstr, '\0', strlen(c->errstr));
-
-    if (c->privctx && c->funcs->free_privctx) {
-        c->funcs->free_privctx(c->privctx);
-        c->privctx = NULL;
-    }
-
-    redisNetClose(c);
-
-    sdsfree(c->obuf);
-    redisReaderFree(c->reader);
-
-    c->obuf = sdsempty();
-    c->reader = redisReaderCreate();
-
-    if (c->obuf == NULL || c->reader == NULL) {
-        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-        return REDIS_ERR;
-    }
-
-    int ret = REDIS_ERR;
-    if (c->connection_type == REDIS_CONN_TCP) {
-        ret = redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
-               c->connect_timeout, c->tcp.source_addr);
-    } else if (c->connection_type == REDIS_CONN_UNIX) {
-        ret = redisContextConnectUnix(c, c->unix_sock.path, c->connect_timeout);
-    } else {
-        /* Something bad happened here and shouldn't have. There isn't
-           enough information in the context to reconnect. */
-        __redisSetError(c,REDIS_ERR_OTHER,"Not enough information to reconnect");
-        ret = REDIS_ERR;
-    }
-
-    if (c->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
-        redisContextSetTimeout(c, *c->command_timeout);
-    }
-
-    return ret;
-}
-
-redisContext *redisConnectWithOptions(const redisOptions *options) {
-    redisContext *c = redisContextInit();
-    if (c == NULL) {
-        return NULL;
-    }
-    if (!(options->options & REDIS_OPT_NONBLOCK)) {
-        c->flags |= REDIS_BLOCK;
-    }
-    if (options->options & REDIS_OPT_REUSEADDR) {
-        c->flags |= REDIS_REUSEADDR;
-    }
-    if (options->options & REDIS_OPT_NOAUTOFREE) {
-        c->flags |= REDIS_NO_AUTO_FREE;
-    }
-
-    /* Set any user supplied RESP3 PUSH handler or use freeReplyObject
-     * as a default unless specifically flagged that we don't want one. */
-    if (options->push_cb != NULL)
-        redisSetPushCallback(c, options->push_cb);
-    else if (!(options->options & REDIS_OPT_NO_PUSH_AUTOFREE))
-        redisSetPushCallback(c, redisPushAutoFree);
-
-    c->privdata = options->privdata;
-    c->free_privdata = options->free_privdata;
-
-    if (redisContextUpdateConnectTimeout(c, options->connect_timeout) != REDIS_OK ||
-        redisContextUpdateCommandTimeout(c, options->command_timeout) != REDIS_OK) {
-        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-        return c;
-    }
-
-    if (options->type == REDIS_CONN_TCP) {
-        redisContextConnectBindTcp(c, options->endpoint.tcp.ip,
-                                   options->endpoint.tcp.port, options->connect_timeout,
-                                   options->endpoint.tcp.source_addr);
-    } else if (options->type == REDIS_CONN_UNIX) {
-        redisContextConnectUnix(c, options->endpoint.unix_socket,
-                                options->connect_timeout);
-    } else if (options->type == REDIS_CONN_USERFD) {
-        c->fd = options->endpoint.fd;
-        c->flags |= REDIS_CONNECTED;
-    } else {
-        // Unknown type - FIXME - FREE
-        return NULL;
-    }
-
-    if (options->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
-        redisContextSetTimeout(c, *options->command_timeout);
-    }
-
-    return c;
-}
-
-/* Connect to a Redis instance. On error the field error in the returned
- * context will be set to the return value of the error function.
- * When no set of reply functions is given, the default set will be used. */
-redisContext *redisConnect(const char *ip, int port) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.connect_timeout = &tv;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectNonBlock(const char *ip, int port) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.options |= REDIS_OPT_NONBLOCK;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.endpoint.tcp.source_addr = source_addr;
-    options.options |= REDIS_OPT_NONBLOCK;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.endpoint.tcp.source_addr = source_addr;
-    options.options |= REDIS_OPT_NONBLOCK|REDIS_OPT_REUSEADDR;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectUnix(const char *path) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_UNIX(&options, path);
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_UNIX(&options, path);
-    options.connect_timeout = &tv;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectUnixNonBlock(const char *path) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_UNIX(&options, path);
-    options.options |= REDIS_OPT_NONBLOCK;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectFd(redisFD fd) {
-    redisOptions options = {0};
-    options.type = REDIS_CONN_USERFD;
-    options.endpoint.fd = fd;
-    return redisConnectWithOptions(&options);
-}
-
-/* Set read/write timeout on a blocking socket. */
-int redisSetTimeout(redisContext *c, const struct timeval tv) {
-    if (c->flags & REDIS_BLOCK)
-        return redisContextSetTimeout(c,tv);
-    return REDIS_ERR;
-}
-
-/* Enable connection KeepAlive. */
-int redisEnableKeepAlive(redisContext *c) {
-    if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
-        return REDIS_ERR;
-    return REDIS_OK;
-}
-
-/* Set a user provided RESP3 PUSH handler and return any old one set. */
-redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn) {
-    redisPushFn *old = c->push_cb;
-    c->push_cb = fn;
-    return old;
-}
-
-/* Use this function to handle a read event on the descriptor. It will try
- * and read some bytes from the socket and feed them to the reply parser.
- *
- * After this function is called, you may use redisGetReplyFromReader to
- * see if there is a reply available. */
-int redisBufferRead(redisContext *c) {
-    char buf[1024*16];
-    int nread;
-
-    /* Return early when the context has seen an error. */
-    if (c->err)
-        return REDIS_ERR;
-
-    nread = c->funcs->read(c, buf, sizeof(buf));
-    if (nread > 0) {
-        if (redisReaderFeed(c->reader, buf, nread) != REDIS_OK) {
-            __redisSetError(c, c->reader->err, c->reader->errstr);
-            return REDIS_ERR;
-        } else {
-        }
-    } else if (nread < 0) {
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-/* Write the output buffer to the socket.
- *
- * Returns REDIS_OK when the buffer is empty, or (a part of) the buffer was
- * successfully written to the socket. When the buffer is empty after the
- * write operation, "done" is set to 1 (if given).
- *
- * Returns REDIS_ERR if an error occurred trying to write and sets
- * c->errstr to hold the appropriate error string.
- */
-int redisBufferWrite(redisContext *c, int *done) {
-
-    /* Return early when the context has seen an error. */
-    if (c->err)
-        return REDIS_ERR;
-
-    if (sdslen(c->obuf) > 0) {
-        ssize_t nwritten = c->funcs->write(c);
-        if (nwritten < 0) {
-            return REDIS_ERR;
-        } else if (nwritten > 0) {
-            if (nwritten == (ssize_t)sdslen(c->obuf)) {
-                sdsfree(c->obuf);
-                c->obuf = sdsempty();
-                if (c->obuf == NULL)
-                    goto oom;
-            } else {
-                if (sdsrange(c->obuf,nwritten,-1) < 0) goto oom;
-            }
-        }
-    }
-    if (done != NULL) *done = (sdslen(c->obuf) == 0);
-    return REDIS_OK;
-
-oom:
-    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-    return REDIS_ERR;
-}
-
-/* Internal helper function to try and get a reply from the reader,
- * or set an error in the context otherwise. */
-int redisGetReplyFromReader(redisContext *c, void **reply) {
-    if (redisReaderGetReply(c->reader,reply) == REDIS_ERR) {
-        __redisSetError(c,c->reader->err,c->reader->errstr);
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-/* Internal helper that returns 1 if the reply was a RESP3 PUSH
- * message and we handled it with a user-provided callback. */
-static int redisHandledPushReply(redisContext *c, void *reply) {
-    if (reply && c->push_cb && redisIsPushReply(reply)) {
-        c->push_cb(c->privdata, reply);
-        return 1;
-    }
-
-    return 0;
-}
-
-int redisGetReply(redisContext *c, void **reply) {
-    int wdone = 0;
-    void *aux = NULL;
-
-    /* Try to read pending replies */
-    if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
-        return REDIS_ERR;
-
-    /* For the blocking context, flush output buffer and read reply */
-    if (aux == NULL && c->flags & REDIS_BLOCK) {
-        /* Write until done */
-        do {
-            if (redisBufferWrite(c,&wdone) == REDIS_ERR)
-                return REDIS_ERR;
-        } while (!wdone);
-
-        /* Read until there is a reply */
-        do {
-            if (redisBufferRead(c) == REDIS_ERR)
-                return REDIS_ERR;
-
-            /* We loop here in case the user has specified a RESP3
-             * PUSH handler (e.g. for client tracking). */
-            do {
-                if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
-                    return REDIS_ERR;
-            } while (redisHandledPushReply(c, aux));
-        } while (aux == NULL);
-    }
-
-    /* Set reply or free it if we were passed NULL */
-    if (reply != NULL) {
-        *reply = aux;
-    } else {
-        freeReplyObject(aux);
-    }
-
-    return REDIS_OK;
-}
-
-
-/* Helper function for the redisAppendCommand* family of functions.
- *
- * Write a formatted command to the output buffer. When this family
- * is used, you need to call redisGetReply yourself to retrieve
- * the reply (or replies in pub/sub).
- */
-int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) {
-    sds newbuf;
-
-    newbuf = sdscatlen(c->obuf,cmd,len);
-    if (newbuf == NULL) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    }
-
-    c->obuf = newbuf;
-    return REDIS_OK;
-}
-
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len) {
-
-    if (__redisAppendCommand(c, cmd, len) != REDIS_OK) {
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap) {
-    char *cmd;
-    int len;
-
-    len = redisvFormatCommand(&cmd,format,ap);
-    if (len == -1) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    } else if (len == -2) {
-        __redisSetError(c,REDIS_ERR_OTHER,"Invalid format string");
-        return REDIS_ERR;
-    }
-
-    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
-        hi_free(cmd);
-        return REDIS_ERR;
-    }
-
-    hi_free(cmd);
-    return REDIS_OK;
-}
-
-int redisAppendCommand(redisContext *c, const char *format, ...) {
-    va_list ap;
-    int ret;
-
-    va_start(ap,format);
-    ret = redisvAppendCommand(c,format,ap);
-    va_end(ap);
-    return ret;
-}
-
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
-    sds cmd;
-    int len;
-
-    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
-    if (len == -1) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    }
-
-    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
-        sdsfree(cmd);
-        return REDIS_ERR;
-    }
-
-    sdsfree(cmd);
-    return REDIS_OK;
-}
-
-/* Helper function for the redisCommand* family of functions.
- *
- * Write a formatted command to the output buffer. If the given context is
- * blocking, immediately read the reply into the "reply" pointer. When the
- * context is non-blocking, the "reply" pointer will not be used and the
- * command is simply appended to the write buffer.
- *
- * Returns the reply when a reply was successfully retrieved. Returns NULL
- * otherwise. When NULL is returned in a blocking context, the error field
- * in the context will be set.
- */
-static void *__redisBlockForReply(redisContext *c) {
-    void *reply;
-
-    if (c->flags & REDIS_BLOCK) {
-        if (redisGetReply(c,&reply) != REDIS_OK)
-            return NULL;
-        return reply;
-    }
-    return NULL;
-}
-
-void *redisvCommand(redisContext *c, const char *format, va_list ap) {
-    if (redisvAppendCommand(c,format,ap) != REDIS_OK)
-        return NULL;
-    return __redisBlockForReply(c);
-}
-
-void *redisCommand(redisContext *c, const char *format, ...) {
-    va_list ap;
-    va_start(ap,format);
-    void *reply = redisvCommand(c,format,ap);
-    va_end(ap);
-    return reply;
-}
-
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
-    if (redisAppendCommandArgv(c,argc,argv,argvlen) != REDIS_OK)
-        return NULL;
-    return __redisBlockForReply(c);
-}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/hiredis.h b/debian/modules/nchan/src/store/redis/hiredis/hiredis.h
deleted file mode 100644
index 21593b6..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/hiredis.h
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_H
-#define __HIREDIS_H
-#include "read.h"
-#include <stdarg.h> /* for va_list */
-#ifndef _MSC_VER
-#include <sys/time.h> /* for struct timeval */
-#else
-struct timeval; /* forward declaration */
-typedef long long ssize_t;
-#endif
-#include <stdint.h> /* uintXX_t, etc */
-#include "sds.h" /* for sds */
-#include "alloc.h" /* for allocation wrappers */
-
-#include <sys/socket.h> /* for struct sockaddr */
-
-#define HIREDIS_MAJOR 1
-#define HIREDIS_MINOR 0
-#define HIREDIS_PATCH 2
-#define HIREDIS_SONAME 1.0.0
-
-/* Connection type can be blocking or non-blocking and is set in the
- * least significant bit of the flags field in redisContext. */
-#define REDIS_BLOCK 0x1
-
-/* Connection may be disconnected before being free'd. The second bit
- * in the flags field is set when the context is connected. */
-#define REDIS_CONNECTED 0x2
-
-/* The async API might try to disconnect cleanly and flush the output
- * buffer and read all subsequent replies before disconnecting.
- * This flag means no new commands can come in and the connection
- * should be terminated once all replies have been read. */
-#define REDIS_DISCONNECTING 0x4
-
-/* Flag specific to the async API which means that the context should be clean
- * up as soon as possible. */
-#define REDIS_FREEING 0x8
-
-/* Flag that is set when an async callback is executed. */
-#define REDIS_IN_CALLBACK 0x10
-
-/* Flag that is set when the async context has one or more subscriptions. */
-#define REDIS_SUBSCRIBED 0x20
-
-/* Flag that is set when monitor mode is active */
-#define REDIS_MONITORING 0x40
-
-/* Flag that is set when we should set SO_REUSEADDR before calling bind() */
-#define REDIS_REUSEADDR 0x80
-
-/**
- * Flag that indicates the user does not want the context to
- * be automatically freed upon error
- */
-#define REDIS_NO_AUTO_FREE 0x200
-
-#define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
-
-/* number of times we retry to connect in the case of EADDRNOTAVAIL and
- * SO_REUSEADDR is being used. */
-#define REDIS_CONNECT_RETRIES  10
-
-/* Forward declarations for structs defined elsewhere */
-struct redisAsyncContext;
-struct redisContext;
-
-/* RESP3 push helpers and callback prototypes */
-#define redisIsPushReply(r) (((redisReply*)(r))->type == REDIS_REPLY_PUSH)
-typedef void (redisPushFn)(void *, void *);
-typedef void (redisAsyncPushFn)(struct redisAsyncContext *, void *);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the reply object returned by redisCommand() */
-typedef struct redisReply {
-    int type; /* REDIS_REPLY_* */
-    long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
-    double dval; /* The double when type is REDIS_REPLY_DOUBLE */
-    size_t len; /* Length of string */
-    char *str; /* Used for REDIS_REPLY_ERROR, REDIS_REPLY_STRING
-                  REDIS_REPLY_VERB, and REDIS_REPLY_DOUBLE (in additional to dval). */
-    char vtype[4]; /* Used for REDIS_REPLY_VERB, contains the null
-                      terminated 3 character content type, such as "txt". */
-    size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
-    struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
-} redisReply;
-
-redisReader *redisReaderCreate(void);
-
-/* Function to free the reply objects hiredis returns by default. */
-void freeReplyObject(void *reply);
-
-/* Functions to format a command according to the protocol. */
-int redisvFormatCommand(char **target, const char *format, va_list ap);
-int redisFormatCommand(char **target, const char *format, ...);
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
-int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
-void redisFreeCommand(char *cmd);
-void redisFreeSdsCommand(sds cmd);
-
-enum redisConnectionType {
-    REDIS_CONN_TCP,
-    REDIS_CONN_UNIX,
-    REDIS_CONN_USERFD
-};
-
-struct redisSsl;
-
-#define REDIS_OPT_NONBLOCK 0x01
-#define REDIS_OPT_REUSEADDR 0x02
-
-/**
- * Don't automatically free the async object on a connection failure,
- * or other implicit conditions. Only free on an explicit call to disconnect() or free()
- */
-#define REDIS_OPT_NOAUTOFREE 0x04
-
-/* Don't automatically intercept and free RESP3 PUSH replies. */
-#define REDIS_OPT_NO_PUSH_AUTOFREE 0x08
-
-/* In Unix systems a file descriptor is a regular signed int, with -1
- * representing an invalid descriptor. In Windows it is a SOCKET
- * (32- or 64-bit unsigned integer depending on the architecture), where
- * all bits set (~0) is INVALID_SOCKET.  */
-#ifndef _WIN32
-typedef int redisFD;
-#define REDIS_INVALID_FD -1
-#else
-#ifdef _WIN64
-typedef unsigned long long redisFD; /* SOCKET = 64-bit UINT_PTR */
-#else
-typedef unsigned long redisFD;      /* SOCKET = 32-bit UINT_PTR */
-#endif
-#define REDIS_INVALID_FD ((redisFD)(~0)) /* INVALID_SOCKET */
-#endif
-
-typedef struct {
-    /*
-     * the type of connection to use. This also indicates which
-     * `endpoint` member field to use
-     */
-    int type;
-    /* bit field of REDIS_OPT_xxx */
-    int options;
-    /* timeout value for connect operation. If NULL, no timeout is used */
-    const struct timeval *connect_timeout;
-    /* timeout value for commands. If NULL, no timeout is used.  This can be
-     * updated at runtime with redisSetTimeout/redisAsyncSetTimeout. */
-    const struct timeval *command_timeout;
-    union {
-        /** use this field for tcp/ip connections */
-        struct {
-            const char *source_addr;
-            const char *ip;
-            int port;
-        } tcp;
-        /** use this field for unix domain sockets */
-        const char *unix_socket;
-        /**
-         * use this field to have hiredis operate an already-open
-         * file descriptor */
-        redisFD fd;
-    } endpoint;
-
-    /* Optional user defined data/destructor */
-    void *privdata;
-    void (*free_privdata)(void *);
-
-    /* A user defined PUSH message callback */
-    redisPushFn *push_cb;
-    redisAsyncPushFn *async_push_cb;
-} redisOptions;
-
-/**
- * Helper macros to initialize options to their specified fields.
- */
-#define REDIS_OPTIONS_SET_TCP(opts, ip_, port_) \
-    (opts)->type = REDIS_CONN_TCP; \
-    (opts)->endpoint.tcp.ip = ip_; \
-    (opts)->endpoint.tcp.port = port_;
-
-#define REDIS_OPTIONS_SET_UNIX(opts, path) \
-    (opts)->type = REDIS_CONN_UNIX;        \
-    (opts)->endpoint.unix_socket = path;
-
-#define REDIS_OPTIONS_SET_PRIVDATA(opts, data, dtor) \
-    (opts)->privdata = data;                         \
-    (opts)->free_privdata = dtor;                    \
-
-typedef struct redisContextFuncs {
-    void (*free_privctx)(void *);
-    void (*async_read)(struct redisAsyncContext *);
-    void (*async_write)(struct redisAsyncContext *);
-    ssize_t (*read)(struct redisContext *, char *, size_t);
-    ssize_t (*write)(struct redisContext *);
-} redisContextFuncs;
-
-/* Context for a connection to Redis */
-typedef struct redisContext {
-    const redisContextFuncs *funcs;   /* Function table */
-
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-    redisFD fd;
-    struct sockaddr sockaddr;
-    int flags;
-    char *obuf; /* Write buffer */
-    redisReader *reader; /* Protocol reader */
-
-    enum redisConnectionType connection_type;
-    struct timeval *connect_timeout;
-    struct timeval *command_timeout;
-
-    struct {
-        char *host;
-        char *source_addr;
-        int port;
-    } tcp;
-
-    struct {
-        char *path;
-    } unix_sock;
-
-    /* For non-blocking connect */
-    struct sockadr *saddr;
-    size_t addrlen;
-
-    /* Optional data and corresponding destructor users can use to provide
-     * context to a given redisContext.  Not used by hiredis. */
-    void *privdata;
-    void (*free_privdata)(void *);
-
-    /* Internal context pointer presently used by hiredis to manage
-     * SSL connections. */
-    void *privctx;
-
-    /* An optional RESP3 PUSH handler */
-    redisPushFn *push_cb;
-} redisContext;
-
-redisContext *redisConnectWithOptions(const redisOptions *options);
-redisContext *redisConnect(const char *ip, int port);
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
-redisContext *redisConnectNonBlock(const char *ip, int port);
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr);
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr);
-redisContext *redisConnectUnix(const char *path);
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
-redisContext *redisConnectUnixNonBlock(const char *path);
-redisContext *redisConnectFd(redisFD fd);
-
-/**
- * Reconnect the given context using the saved information.
- *
- * This re-uses the exact same connect options as in the initial connection.
- * host, ip (or path), timeout and bind address are reused,
- * flags are used unmodified from the existing context.
- *
- * Returns REDIS_OK on successful connect or REDIS_ERR otherwise.
- */
-int redisReconnect(redisContext *c);
-
-redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn);
-int redisSetTimeout(redisContext *c, const struct timeval tv);
-int redisEnableKeepAlive(redisContext *c);
-void redisFree(redisContext *c);
-redisFD redisFreeKeepFd(redisContext *c);
-int redisBufferRead(redisContext *c);
-int redisBufferWrite(redisContext *c, int *done);
-
-/* In a blocking context, this function first checks if there are unconsumed
- * replies to return and returns one if so. Otherwise, it flushes the output
- * buffer to the socket and reads until it has a reply. In a non-blocking
- * context, it will return unconsumed replies until there are no more. */
-int redisGetReply(redisContext *c, void **reply);
-int redisGetReplyFromReader(redisContext *c, void **reply);
-
-/* Write a formatted command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
-
-/* Write a command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
-int redisAppendCommand(redisContext *c, const char *format, ...);
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-/* Issue a command to Redis. In a blocking context, it is identical to calling
- * redisAppendCommand, followed by redisGetReply. The function will return
- * NULL if there was an error in performing the request, otherwise it will
- * return the reply. In a non-blocking context, it is identical to calling
- * only redisAppendCommand and will always return NULL. */
-void *redisvCommand(redisContext *c, const char *format, va_list ap);
-void *redisCommand(redisContext *c, const char *format, ...);
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/hiredis_ssl.h b/debian/modules/nchan/src/store/redis/hiredis/hiredis_ssl.h
deleted file mode 100644
index 604efe0..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/hiredis_ssl.h
+++ /dev/null
@@ -1,127 +0,0 @@
-
-/*
- * Copyright (c) 2019, Redis Labs
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_SSL_H
-#define __HIREDIS_SSL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the underlying struct for SSL in ssl.h, which is not included to
- * keep build dependencies short here.
- */
-struct ssl_st;
-
-/* A wrapper around OpenSSL SSL_CTX to allow easy SSL use without directly
- * calling OpenSSL.
- */
-typedef struct redisSSLContext redisSSLContext;
-
-/**
- * Initialization errors that redisCreateSSLContext() may return.
- */
-
-typedef enum {
-    REDIS_SSL_CTX_NONE = 0,                     /* No Error */
-    REDIS_SSL_CTX_CREATE_FAILED,                /* Failed to create OpenSSL SSL_CTX */
-    REDIS_SSL_CTX_CERT_KEY_REQUIRED,            /* Client cert and key must both be specified or skipped */
-    REDIS_SSL_CTX_CA_CERT_LOAD_FAILED,          /* Failed to load CA Certificate or CA Path */
-    REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED,      /* Failed to load client certificate */
-    REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED       /* Failed to load private key */
-} redisSSLContextError;
-
-/**
- * Return the error message corresponding with the specified error code.
- */
-
-const char *redisSSLContextGetError(redisSSLContextError error);
-
-/**
- * Helper function to initialize the OpenSSL library.
- *
- * OpenSSL requires one-time initialization before it can be used. Callers should
- * call this function only once, and only if OpenSSL is not directly initialized
- * elsewhere.
- */
-int redisInitOpenSSL(void);
-
-/**
- * Helper function to initialize an OpenSSL context that can be used
- * to initiate SSL connections.
- *
- * cacert_filename is an optional name of a CA certificate/bundle file to load
- * and use for validation.
- *
- * capath is an optional directory path where trusted CA certificate files are
- * stored in an OpenSSL-compatible structure.
- *
- * cert_filename and private_key_filename are optional names of a client side
- * certificate and private key files to use for authentication. They need to
- * be both specified or omitted.
- *
- * server_name is an optional and will be used as a server name indication
- * (SNI) TLS extension.
- *
- * If error is non-null, it will be populated in case the context creation fails
- * (returning a NULL).
- */
-
-redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
-        const char *cert_filename, const char *private_key_filename,
-        const char *server_name, redisSSLContextError *error);
-
-/**
- * Free a previously created OpenSSL context.
- */
-void redisFreeSSLContext(redisSSLContext *redis_ssl_ctx);
-
-/**
- * Initiate SSL on an existing redisContext.
- *
- * This is similar to redisInitiateSSL() but does not require the caller
- * to directly interact with OpenSSL, and instead uses a redisSSLContext
- * previously created using redisCreateSSLContext().
- */
-
-int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx);
-
-/**
- * Initiate SSL/TLS negotiation on a provided OpenSSL SSL object.
- */
-
-int redisInitiateSSL(redisContext *c, struct ssl_st *ssl);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __HIREDIS_SSL_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/net.c b/debian/modules/nchan/src/store/redis/hiredis/net.c
deleted file mode 100644
index 3737430..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/net.c
+++ /dev/null
@@ -1,615 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <sys/types.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <limits.h>
-#include <stdlib.h>
-
-#include "net.h"
-#include "sds.h"
-#include "sockcompat.h"
-#include "win32.h"
-
-/* Defined in hiredis.c */
-void __redisSetError(redisContext *c, int type, const char *str);
-
-void redisNetClose(redisContext *c) {
-    if (c && c->fd != REDIS_INVALID_FD) {
-        close(c->fd);
-        c->fd = REDIS_INVALID_FD;
-    }
-}
-
-ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap) {
-    ssize_t nread = recv(c->fd, buf, bufcap, 0);
-    if (nread == -1) {
-        if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-            /* Try again later */
-            return 0;
-        } else if(errno == ETIMEDOUT && (c->flags & REDIS_BLOCK)) {
-            /* especially in windows */
-            __redisSetError(c, REDIS_ERR_TIMEOUT, "recv timeout");
-            return -1;
-        } else {
-            __redisSetError(c, REDIS_ERR_IO, NULL);
-            return -1;
-        }
-    } else if (nread == 0) {
-        __redisSetError(c, REDIS_ERR_EOF, "Server closed the connection");
-        return -1;
-    } else {
-        return nread;
-    }
-}
-
-ssize_t redisNetWrite(redisContext *c) {
-    ssize_t nwritten = send(c->fd, c->obuf, sdslen(c->obuf), 0);
-    if (nwritten < 0) {
-        if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-            /* Try again later */
-        } else {
-            __redisSetError(c, REDIS_ERR_IO, NULL);
-            return -1;
-        }
-    }
-    return nwritten;
-}
-
-static void __redisSetErrorFromErrno(redisContext *c, int type, const char *prefix) {
-    int errorno = errno;  /* snprintf() may change errno */
-    char buf[128] = { 0 };
-    size_t len = 0;
-
-    if (prefix != NULL)
-        len = snprintf(buf,sizeof(buf),"%s: ",prefix);
-    strerror_r(errorno, (char *)(buf + len), sizeof(buf) - len);
-    __redisSetError(c,type,buf);
-}
-
-static int redisSetReuseAddr(redisContext *c) {
-    int on = 1;
-    if (setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-static int redisCreateSocket(redisContext *c, int type) {
-    redisFD s;
-    if ((s = socket(type, SOCK_STREAM, 0)) == REDIS_INVALID_FD) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        return REDIS_ERR;
-    }
-    c->fd = s;
-    if (type == AF_INET) {
-        if (redisSetReuseAddr(c) == REDIS_ERR) {
-            return REDIS_ERR;
-        }
-    }
-    return REDIS_OK;
-}
-
-static int redisSetBlocking(redisContext *c, int blocking) {
-#ifndef _WIN32
-    int flags;
-
-    /* Set the socket nonblocking.
-     * Note that fcntl(2) for F_GETFL and F_SETFL can't be
-     * interrupted by a signal. */
-    if ((flags = fcntl(c->fd, F_GETFL)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_GETFL)");
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-
-    if (blocking)
-        flags &= ~O_NONBLOCK;
-    else
-        flags |= O_NONBLOCK;
-
-    if (fcntl(c->fd, F_SETFL, flags) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_SETFL)");
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-#else
-    u_long mode = blocking ? 0 : 1;
-    if (ioctl(c->fd, FIONBIO, &mode) == -1) {
-        __redisSetErrorFromErrno(c, REDIS_ERR_IO, "ioctl(FIONBIO)");
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-#endif /* _WIN32 */
-    return REDIS_OK;
-}
-
-int redisKeepAlive(redisContext *c, int interval) {
-    int val = 1;
-    redisFD fd = c->fd;
-
-    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == -1){
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = interval;
-
-#if defined(__APPLE__) && defined(__MACH__)
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-#else
-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = interval/3;
-    if (val == 0) val = 1;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = 3;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-#endif
-#endif
-
-    return REDIS_OK;
-}
-
-int redisSetTcpNoDelay(redisContext *c) {
-    int yes = 1;
-    if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(TCP_NODELAY)");
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-#define __MAX_MSEC (((LONG_MAX) - 999) / 1000)
-
-static int redisContextTimeoutMsec(redisContext *c, long *result)
-{
-    const struct timeval *timeout = c->connect_timeout;
-    long msec = -1;
-
-    /* Only use timeout when not NULL. */
-    if (timeout != NULL) {
-        if (timeout->tv_usec > 1000000 || timeout->tv_sec > __MAX_MSEC) {
-            *result = msec;
-            return REDIS_ERR;
-        }
-
-        msec = (timeout->tv_sec * 1000) + ((timeout->tv_usec + 999) / 1000);
-
-        if (msec < 0 || msec > INT_MAX) {
-            msec = INT_MAX;
-        }
-    }
-
-    *result = msec;
-    return REDIS_OK;
-}
-
-static int redisContextWaitReady(redisContext *c, long msec) {
-    struct pollfd   wfd[1];
-
-    wfd[0].fd     = c->fd;
-    wfd[0].events = POLLOUT;
-
-    if (errno == EINPROGRESS) {
-        int res;
-
-        if ((res = poll(wfd, 1, msec)) == -1) {
-            __redisSetErrorFromErrno(c, REDIS_ERR_IO, "poll(2)");
-            redisNetClose(c);
-            return REDIS_ERR;
-        } else if (res == 0) {
-            errno = ETIMEDOUT;
-            __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-            redisNetClose(c);
-            return REDIS_ERR;
-        }
-
-        if (redisCheckConnectDone(c, &res) != REDIS_OK || res == 0) {
-            redisCheckSocketError(c);
-            return REDIS_ERR;
-        }
-
-        return REDIS_OK;
-    }
-
-    __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-    redisNetClose(c);
-    return REDIS_ERR;
-}
-
-int redisCheckConnectDone(redisContext *c, int *completed) {
-    int rc = connect(c->fd, (const struct sockaddr *)c->saddr, c->addrlen);
-    if (rc == 0) {
-        *completed = 1;
-        return REDIS_OK;
-    }
-    switch (errno) {
-    case EISCONN:
-        *completed = 1;
-        return REDIS_OK;
-    case EALREADY:
-    case EINPROGRESS:
-    case EWOULDBLOCK:
-        *completed = 0;
-        return REDIS_OK;
-    default:
-        return REDIS_ERR;
-    }
-}
-
-int redisCheckSocketError(redisContext *c) {
-    int err = 0, errno_saved = errno;
-    socklen_t errlen = sizeof(err);
-
-    if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"getsockopt(SO_ERROR)");
-        return REDIS_ERR;
-    }
-
-    if (err == 0) {
-        err = errno_saved;
-    }
-
-    if (err) {
-        errno = err;
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
-    const void *to_ptr = &tv;
-    size_t to_sz = sizeof(tv);
-
-    if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,to_ptr,to_sz) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_RCVTIMEO)");
-        return REDIS_ERR;
-    }
-    if (setsockopt(c->fd,SOL_SOCKET,SO_SNDTIMEO,to_ptr,to_sz) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_SNDTIMEO)");
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-int redisContextUpdateConnectTimeout(redisContext *c, const struct timeval *timeout) {
-    /* Same timeval struct, short circuit */
-    if (c->connect_timeout == timeout)
-        return REDIS_OK;
-
-    /* Allocate context timeval if we need to */
-    if (c->connect_timeout == NULL) {
-        c->connect_timeout = hi_malloc(sizeof(*c->connect_timeout));
-        if (c->connect_timeout == NULL)
-            return REDIS_ERR;
-    }
-
-    memcpy(c->connect_timeout, timeout, sizeof(*c->connect_timeout));
-    return REDIS_OK;
-}
-
-int redisContextUpdateCommandTimeout(redisContext *c, const struct timeval *timeout) {
-    /* Same timeval struct, short circuit */
-    if (c->command_timeout == timeout)
-        return REDIS_OK;
-
-    /* Allocate context timeval if we need to */
-    if (c->command_timeout == NULL) {
-        c->command_timeout = hi_malloc(sizeof(*c->command_timeout));
-        if (c->command_timeout == NULL)
-            return REDIS_ERR;
-    }
-
-    memcpy(c->command_timeout, timeout, sizeof(*c->command_timeout));
-    return REDIS_OK;
-}
-
-static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
-                                   const struct timeval *timeout,
-                                   const char *source_addr) {
-    redisFD s;
-    int rv, n;
-    char _port[6];  /* strlen("65535"); */
-    struct addrinfo hints, *servinfo, *bservinfo, *p, *b;
-    int blocking = (c->flags & REDIS_BLOCK);
-    int reuseaddr = (c->flags & REDIS_REUSEADDR);
-    int reuses = 0;
-    long timeout_msec = -1;
-
-    servinfo = NULL;
-    c->connection_type = REDIS_CONN_TCP;
-    c->tcp.port = port;
-
-    /* We need to take possession of the passed parameters
-     * to make them reusable for a reconnect.
-     * We also carefully check we don't free data we already own,
-     * as in the case of the reconnect method.
-     *
-     * This is a bit ugly, but atleast it works and doesn't leak memory.
-     **/
-    if (c->tcp.host != addr) {
-        hi_free(c->tcp.host);
-
-        c->tcp.host = hi_strdup(addr);
-        if (c->tcp.host == NULL)
-            goto oom;
-    }
-
-    if (timeout) {
-        if (redisContextUpdateConnectTimeout(c, timeout) == REDIS_ERR)
-            goto oom;
-    } else {
-        hi_free(c->connect_timeout);
-        c->connect_timeout = NULL;
-    }
-
-    if (redisContextTimeoutMsec(c, &timeout_msec) != REDIS_OK) {
-        __redisSetError(c, REDIS_ERR_IO, "Invalid timeout specified");
-        goto error;
-    }
-
-    if (source_addr == NULL) {
-        hi_free(c->tcp.source_addr);
-        c->tcp.source_addr = NULL;
-    } else if (c->tcp.source_addr != source_addr) {
-        hi_free(c->tcp.source_addr);
-        c->tcp.source_addr = hi_strdup(source_addr);
-    }
-    c->sockaddr.sa_family = AF_UNSPEC;
-
-    snprintf(_port, 6, "%d", port);
-    memset(&hints,0,sizeof(hints));
-    hints.ai_family = AF_INET;
-    hints.ai_socktype = SOCK_STREAM;
-
-    /* Try with IPv6 if no IPv4 address was found. We do it in this order since
-     * in a Redis client you can't afford to test if you have IPv6 connectivity
-     * as this would add latency to every connect. Otherwise a more sensible
-     * route could be: Use IPv6 if both addresses are available and there is IPv6
-     * connectivity. */
-    if ((rv = getaddrinfo(c->tcp.host,_port,&hints,&servinfo)) != 0) {
-         hints.ai_family = AF_INET6;
-         if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) {
-            __redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv));
-            return REDIS_ERR;
-        }
-    }
-    for (p = servinfo; p != NULL; p = p->ai_next) {
-addrretry:
-        if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == REDIS_INVALID_FD)
-            continue;
-
-        c->fd = s;
-        if (redisSetBlocking(c,0) != REDIS_OK)
-            goto error;
-        if (c->tcp.source_addr) {
-            int bound = 0;
-            /* Using getaddrinfo saves us from self-determining IPv4 vs IPv6 */
-            if ((rv = getaddrinfo(c->tcp.source_addr, NULL, &hints, &bservinfo)) != 0) {
-                char buf[128];
-                snprintf(buf,sizeof(buf),"Can't get addr: %s",gai_strerror(rv));
-                __redisSetError(c,REDIS_ERR_OTHER,buf);
-                goto error;
-            }
-
-            if (reuseaddr) {
-                n = 1;
-                if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*) &n,
-                               sizeof(n)) < 0) {
-                    freeaddrinfo(bservinfo);
-                    goto error;
-                }
-            }
-
-            for (b = bservinfo; b != NULL; b = b->ai_next) {
-                if (bind(s,b->ai_addr,b->ai_addrlen) != -1) {
-                    bound = 1;
-                    break;
-                }
-            }
-            freeaddrinfo(bservinfo);
-            if (!bound) {
-                char buf[128];
-                snprintf(buf,sizeof(buf),"Can't bind socket: %s",strerror(errno));
-                __redisSetError(c,REDIS_ERR_OTHER,buf);
-                goto error;
-            }
-        }
-
-        /* For repeat connection */
-        hi_free(c->saddr);
-        c->saddr = hi_malloc(p->ai_addrlen);
-        if (c->saddr == NULL)
-            goto oom;
-
-        memcpy(c->saddr, p->ai_addr, p->ai_addrlen);
-        c->addrlen = p->ai_addrlen;
-
-        if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
-            if (errno == EHOSTUNREACH) {
-                redisNetClose(c);
-                continue;
-            } else if (errno == EINPROGRESS) {
-                if (blocking) {
-                    goto wait_for_ready;
-                }
-                /* This is ok.
-                 * Note that even when it's in blocking mode, we unset blocking
-                 * for `connect()`
-                 */
-            } else if (errno == EADDRNOTAVAIL && reuseaddr) {
-                if (++reuses >= REDIS_CONNECT_RETRIES) {
-                    goto error;
-                } else {
-                    redisNetClose(c);
-                    goto addrretry;
-                }
-            } else {
-                wait_for_ready:
-                if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
-                    goto error;
-                if (redisSetTcpNoDelay(c) != REDIS_OK)
-                    goto error;
-            }
-        }
-        if (blocking && redisSetBlocking(c,1) != REDIS_OK)
-            goto error;
-
-        c->sockaddr = *p->ai_addr;
-
-        c->flags |= REDIS_CONNECTED;
-        rv = REDIS_OK;
-        goto end;
-    }
-    if (p == NULL) {
-        char buf[128];
-        snprintf(buf,sizeof(buf),"Can't create socket: %s",strerror(errno));
-        __redisSetError(c,REDIS_ERR_OTHER,buf);
-        goto error;
-    }
-
-oom:
-    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-error:
-    rv = REDIS_ERR;
-end:
-    if(servinfo) {
-        freeaddrinfo(servinfo);
-    }
-
-    return rv;  // Need to return REDIS_OK if alright
-}
-
-int redisContextConnectTcp(redisContext *c, const char *addr, int port,
-                           const struct timeval *timeout) {
-    return _redisContextConnectTcp(c, addr, port, timeout, NULL);
-}
-
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr) {
-    return _redisContextConnectTcp(c, addr, port, timeout, source_addr);
-}
-
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout) {
-#ifndef _WIN32
-    int blocking = (c->flags & REDIS_BLOCK);
-    struct sockaddr_un *sa;
-    long timeout_msec = -1;
-
-    if (redisCreateSocket(c,AF_UNIX) < 0)
-        return REDIS_ERR;
-    if (redisSetBlocking(c,0) != REDIS_OK)
-        return REDIS_ERR;
-
-    c->connection_type = REDIS_CONN_UNIX;
-    if (c->unix_sock.path != path) {
-        hi_free(c->unix_sock.path);
-
-        c->unix_sock.path = hi_strdup(path);
-        if (c->unix_sock.path == NULL)
-            goto oom;
-    }
-
-    if (timeout) {
-        if (redisContextUpdateConnectTimeout(c, timeout) == REDIS_ERR)
-            goto oom;
-    } else {
-        hi_free(c->connect_timeout);
-        c->connect_timeout = NULL;
-    }
-
-    if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
-        return REDIS_ERR;
-
-    /* Don't leak sockaddr if we're reconnecting */
-    if (c->saddr) hi_free(c->saddr);
-
-    sa = (struct sockaddr_un*)(c->saddr = hi_malloc(sizeof(struct sockaddr_un)));
-    if (sa == NULL)
-        goto oom;
-
-    c->addrlen = sizeof(struct sockaddr_un);
-    sa->sun_family = AF_UNIX;
-    strncpy(sa->sun_path, path, sizeof(sa->sun_path) - 1);
-    if (connect(c->fd, (struct sockaddr*)sa, sizeof(*sa)) == -1) {
-        if (errno == EINPROGRESS && !blocking) {
-            /* This is ok. */
-        } else {
-            if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
-                return REDIS_ERR;
-        }
-    }
-
-    /* Reset socket to be blocking after connect(2). */
-    if (blocking && redisSetBlocking(c,1) != REDIS_OK)
-        return REDIS_ERR;
-
-    c->flags |= REDIS_CONNECTED;
-    return REDIS_OK;
-#else
-    /* We currently do not support Unix sockets for Windows. */
-    /* TODO(m): https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/ */
-    errno = EPROTONOSUPPORT;
-    return REDIS_ERR;
-#endif /* _WIN32 */
-oom:
-    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-    return REDIS_ERR;
-}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/net.h b/debian/modules/nchan/src/store/redis/hiredis/net.h
deleted file mode 100644
index 9f43283..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/net.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __NET_H
-#define __NET_H
-
-#include "hiredis.h"
-
-void redisNetClose(redisContext *c);
-ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap);
-ssize_t redisNetWrite(redisContext *c);
-
-int redisCheckSocketError(redisContext *c);
-int redisContextSetTimeout(redisContext *c, const struct timeval tv);
-int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr);
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
-int redisKeepAlive(redisContext *c, int interval);
-int redisCheckConnectDone(redisContext *c, int *completed);
-
-int redisSetTcpNoDelay(redisContext *c);
-
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/read.c b/debian/modules/nchan/src/store/redis/hiredis/read.c
deleted file mode 100644
index 0952469..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/read.c
+++ /dev/null
@@ -1,739 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <string.h>
-#include <stdlib.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#include <strings.h>
-#endif
-#include <assert.h>
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-#include <math.h>
-
-#include "alloc.h"
-#include "read.h"
-#include "sds.h"
-#include "win32.h"
-
-/* Initial size of our nested reply stack and how much we grow it when needd */
-#define REDIS_READER_STACK_SIZE 9
-
-static void __redisReaderSetError(redisReader *r, int type, const char *str) {
-    size_t len;
-
-    if (r->reply != NULL && r->fn && r->fn->freeObject) {
-        r->fn->freeObject(r->reply);
-        r->reply = NULL;
-    }
-
-    /* Clear input buffer on errors. */
-    sdsfree(r->buf);
-    r->buf = NULL;
-    r->pos = r->len = 0;
-
-    /* Reset task stack. */
-    r->ridx = -1;
-
-    /* Set error. */
-    r->err = type;
-    len = strlen(str);
-    len = len < (sizeof(r->errstr)-1) ? len : (sizeof(r->errstr)-1);
-    memcpy(r->errstr,str,len);
-    r->errstr[len] = '\0';
-}
-
-static size_t chrtos(char *buf, size_t size, char byte) {
-    size_t len = 0;
-
-    switch(byte) {
-    case '\\':
-    case '"':
-        len = snprintf(buf,size,"\"\\%c\"",byte);
-        break;
-    case '\n': len = snprintf(buf,size,"\"\\n\""); break;
-    case '\r': len = snprintf(buf,size,"\"\\r\""); break;
-    case '\t': len = snprintf(buf,size,"\"\\t\""); break;
-    case '\a': len = snprintf(buf,size,"\"\\a\""); break;
-    case '\b': len = snprintf(buf,size,"\"\\b\""); break;
-    default:
-        if (isprint(byte))
-            len = snprintf(buf,size,"\"%c\"",byte);
-        else
-            len = snprintf(buf,size,"\"\\x%02x\"",(unsigned char)byte);
-        break;
-    }
-
-    return len;
-}
-
-static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte) {
-    char cbuf[8], sbuf[128];
-
-    chrtos(cbuf,sizeof(cbuf),byte);
-    snprintf(sbuf,sizeof(sbuf),
-        "Protocol error, got %s as reply type byte", cbuf);
-    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
-}
-
-static void __redisReaderSetErrorOOM(redisReader *r) {
-    __redisReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
-}
-
-static char *readBytes(redisReader *r, unsigned int bytes) {
-    char *p;
-    if (r->len-r->pos >= bytes) {
-        p = r->buf+r->pos;
-        r->pos += bytes;
-        return p;
-    }
-    return NULL;
-}
-
-/* Find pointer to \r\n. */
-static char *seekNewline(char *s, size_t len) {
-    int pos = 0;
-    int _len = len-1;
-
-    /* Position should be < len-1 because the character at "pos" should be
-     * followed by a \n. Note that strchr cannot be used because it doesn't
-     * allow to search a limited length and the buffer that is being searched
-     * might not have a trailing NULL character. */
-    while (pos < _len) {
-        while(pos < _len && s[pos] != '\r') pos++;
-        if (pos==_len) {
-            /* Not found. */
-            return NULL;
-        } else {
-            if (s[pos+1] == '\n') {
-                /* Found. */
-                return s+pos;
-            } else {
-                /* Continue searching. */
-                pos++;
-            }
-        }
-    }
-    return NULL;
-}
-
-/* Convert a string into a long long. Returns REDIS_OK if the string could be
- * parsed into a (non-overflowing) long long, REDIS_ERR otherwise. The value
- * will be set to the parsed value when appropriate.
- *
- * Note that this function demands that the string strictly represents
- * a long long: no spaces or other characters before or after the string
- * representing the number are accepted, nor zeroes at the start if not
- * for the string "0" representing the zero number.
- *
- * Because of its strictness, it is safe to use this function to check if
- * you can convert a string into a long long, and obtain back the string
- * from the number without any loss in the string representation. */
-static int string2ll(const char *s, size_t slen, long long *value) {
-    const char *p = s;
-    size_t plen = 0;
-    int negative = 0;
-    unsigned long long v;
-
-    if (plen == slen)
-        return REDIS_ERR;
-
-    /* Special case: first and only digit is 0. */
-    if (slen == 1 && p[0] == '0') {
-        if (value != NULL) *value = 0;
-        return REDIS_OK;
-    }
-
-    if (p[0] == '-') {
-        negative = 1;
-        p++; plen++;
-
-        /* Abort on only a negative sign. */
-        if (plen == slen)
-            return REDIS_ERR;
-    }
-
-    /* First digit should be 1-9, otherwise the string should just be 0. */
-    if (p[0] >= '1' && p[0] <= '9') {
-        v = p[0]-'0';
-        p++; plen++;
-    } else if (p[0] == '0' && slen == 1) {
-        *value = 0;
-        return REDIS_OK;
-    } else {
-        return REDIS_ERR;
-    }
-
-    while (plen < slen && p[0] >= '0' && p[0] <= '9') {
-        if (v > (ULLONG_MAX / 10)) /* Overflow. */
-            return REDIS_ERR;
-        v *= 10;
-
-        if (v > (ULLONG_MAX - (p[0]-'0'))) /* Overflow. */
-            return REDIS_ERR;
-        v += p[0]-'0';
-
-        p++; plen++;
-    }
-
-    /* Return if not all bytes were used. */
-    if (plen < slen)
-        return REDIS_ERR;
-
-    if (negative) {
-        if (v > ((unsigned long long)(-(LLONG_MIN+1))+1)) /* Overflow. */
-            return REDIS_ERR;
-        if (value != NULL) *value = -v;
-    } else {
-        if (v > LLONG_MAX) /* Overflow. */
-            return REDIS_ERR;
-        if (value != NULL) *value = v;
-    }
-    return REDIS_OK;
-}
-
-static char *readLine(redisReader *r, int *_len) {
-    char *p, *s;
-    int len;
-
-    p = r->buf+r->pos;
-    s = seekNewline(p,(r->len-r->pos));
-    if (s != NULL) {
-        len = s-(r->buf+r->pos);
-        r->pos += len+2; /* skip \r\n */
-        if (_len) *_len = len;
-        return p;
-    }
-    return NULL;
-}
-
-static void moveToNextTask(redisReader *r) {
-    redisReadTask *cur, *prv;
-    while (r->ridx >= 0) {
-        /* Return a.s.a.p. when the stack is now empty. */
-        if (r->ridx == 0) {
-            r->ridx--;
-            return;
-        }
-
-        cur = r->task[r->ridx];
-        prv = r->task[r->ridx-1];
-        assert(prv->type == REDIS_REPLY_ARRAY ||
-               prv->type == REDIS_REPLY_MAP ||
-               prv->type == REDIS_REPLY_SET ||
-               prv->type == REDIS_REPLY_PUSH);
-        if (cur->idx == prv->elements-1) {
-            r->ridx--;
-        } else {
-            /* Reset the type because the next item can be anything */
-            assert(cur->idx < prv->elements);
-            cur->type = -1;
-            cur->elements = -1;
-            cur->idx++;
-            return;
-        }
-    }
-}
-
-static int processLineItem(redisReader *r) {
-    redisReadTask *cur = r->task[r->ridx];
-    void *obj;
-    char *p;
-    int len;
-
-    if ((p = readLine(r,&len)) != NULL) {
-        if (cur->type == REDIS_REPLY_INTEGER) {
-            if (r->fn && r->fn->createInteger) {
-                long long v;
-                if (string2ll(p, len, &v) == REDIS_ERR) {
-                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                            "Bad integer value");
-                    return REDIS_ERR;
-                }
-                obj = r->fn->createInteger(cur,v);
-            } else {
-                obj = (void*)REDIS_REPLY_INTEGER;
-            }
-        } else if (cur->type == REDIS_REPLY_DOUBLE) {
-            if (r->fn && r->fn->createDouble) {
-                char buf[326], *eptr;
-                double d;
-
-                if ((size_t)len >= sizeof(buf)) {
-                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                            "Double value is too large");
-                    return REDIS_ERR;
-                }
-
-                memcpy(buf,p,len);
-                buf[len] = '\0';
-
-                if (strcasecmp(buf,",inf") == 0) {
-                    d = INFINITY; /* Positive infinite. */
-                } else if (strcasecmp(buf,",-inf") == 0) {
-                    d = -INFINITY; /* Negative infinite. */
-                } else {
-                    d = strtod((char*)buf,&eptr);
-                    if (buf[0] == '\0' || eptr[0] != '\0' || isnan(d)) {
-                        __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                                "Bad double value");
-                        return REDIS_ERR;
-                    }
-                }
-                obj = r->fn->createDouble(cur,d,buf,len);
-            } else {
-                obj = (void*)REDIS_REPLY_DOUBLE;
-            }
-        } else if (cur->type == REDIS_REPLY_NIL) {
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-        } else if (cur->type == REDIS_REPLY_BOOL) {
-            int bval = p[0] == 't' || p[0] == 'T';
-            if (r->fn && r->fn->createBool)
-                obj = r->fn->createBool(cur,bval);
-            else
-                obj = (void*)REDIS_REPLY_BOOL;
-        } else {
-            /* Type will be error or status. */
-            if (r->fn && r->fn->createString)
-                obj = r->fn->createString(cur,p,len);
-            else
-                obj = (void*)(size_t)(cur->type);
-        }
-
-        if (obj == NULL) {
-            __redisReaderSetErrorOOM(r);
-            return REDIS_ERR;
-        }
-
-        /* Set reply if this is the root object. */
-        if (r->ridx == 0) r->reply = obj;
-        moveToNextTask(r);
-        return REDIS_OK;
-    }
-
-    return REDIS_ERR;
-}
-
-static int processBulkItem(redisReader *r) {
-    redisReadTask *cur = r->task[r->ridx];
-    void *obj = NULL;
-    char *p, *s;
-    long long len;
-    unsigned long bytelen;
-    int success = 0;
-
-    p = r->buf+r->pos;
-    s = seekNewline(p,r->len-r->pos);
-    if (s != NULL) {
-        p = r->buf+r->pos;
-        bytelen = s-(r->buf+r->pos)+2; /* include \r\n */
-
-        if (string2ll(p, bytelen - 2, &len) == REDIS_ERR) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Bad bulk string length");
-            return REDIS_ERR;
-        }
-
-        if (len < -1 || (LLONG_MAX > SIZE_MAX && len > (long long)SIZE_MAX)) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Bulk string length out of range");
-            return REDIS_ERR;
-        }
-
-        if (len == -1) {
-            /* The nil object can always be created. */
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-            success = 1;
-        } else {
-            /* Only continue when the buffer contains the entire bulk item. */
-            bytelen += len+2; /* include \r\n */
-            if (r->pos+bytelen <= r->len) {
-                if ((cur->type == REDIS_REPLY_VERB && len < 4) ||
-                    (cur->type == REDIS_REPLY_VERB && s[5] != ':'))
-                {
-                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                            "Verbatim string 4 bytes of content type are "
-                            "missing or incorrectly encoded.");
-                    return REDIS_ERR;
-                }
-                if (r->fn && r->fn->createString)
-                    obj = r->fn->createString(cur,s+2,len);
-                else
-                    obj = (void*)(long)cur->type;
-                success = 1;
-            }
-        }
-
-        /* Proceed when obj was created. */
-        if (success) {
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            r->pos += bytelen;
-
-            /* Set reply if this is the root object. */
-            if (r->ridx == 0) r->reply = obj;
-            moveToNextTask(r);
-            return REDIS_OK;
-        }
-    }
-
-    return REDIS_ERR;
-}
-
-static int redisReaderGrow(redisReader *r) {
-    redisReadTask **aux;
-    int newlen;
-
-    /* Grow our stack size */
-    newlen = r->tasks + REDIS_READER_STACK_SIZE;
-    aux = hi_realloc(r->task, sizeof(*r->task) * newlen);
-    if (aux == NULL)
-        goto oom;
-
-    r->task = aux;
-
-    /* Allocate new tasks */
-    for (; r->tasks < newlen; r->tasks++) {
-        r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
-        if (r->task[r->tasks] == NULL)
-            goto oom;
-    }
-
-    return REDIS_OK;
-oom:
-    __redisReaderSetErrorOOM(r);
-    return REDIS_ERR;
-}
-
-/* Process the array, map and set types. */
-static int processAggregateItem(redisReader *r) {
-    redisReadTask *cur = r->task[r->ridx];
-    void *obj;
-    char *p;
-    long long elements;
-    int root = 0, len;
-
-    /* Set error for nested multi bulks with depth > 7 */
-    if (r->ridx == r->tasks - 1) {
-        if (redisReaderGrow(r) == REDIS_ERR)
-            return REDIS_ERR;
-    }
-
-    if ((p = readLine(r,&len)) != NULL) {
-        if (string2ll(p, len, &elements) == REDIS_ERR) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Bad multi-bulk length");
-            return REDIS_ERR;
-        }
-
-        root = (r->ridx == 0);
-
-        if (elements < -1 || (LLONG_MAX > SIZE_MAX && elements > SIZE_MAX) ||
-            (r->maxelements > 0 && elements > r->maxelements))
-        {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Multi-bulk length out of range");
-            return REDIS_ERR;
-        }
-
-        if (elements == -1) {
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            moveToNextTask(r);
-        } else {
-            if (cur->type == REDIS_REPLY_MAP) elements *= 2;
-
-            if (r->fn && r->fn->createArray)
-                obj = r->fn->createArray(cur,elements);
-            else
-                obj = (void*)(long)cur->type;
-
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            /* Modify task stack when there are more than 0 elements. */
-            if (elements > 0) {
-                cur->elements = elements;
-                cur->obj = obj;
-                r->ridx++;
-                r->task[r->ridx]->type = -1;
-                r->task[r->ridx]->elements = -1;
-                r->task[r->ridx]->idx = 0;
-                r->task[r->ridx]->obj = NULL;
-                r->task[r->ridx]->parent = cur;
-                r->task[r->ridx]->privdata = r->privdata;
-            } else {
-                moveToNextTask(r);
-            }
-        }
-
-        /* Set reply if this is the root object. */
-        if (root) r->reply = obj;
-        return REDIS_OK;
-    }
-
-    return REDIS_ERR;
-}
-
-static int processItem(redisReader *r) {
-    redisReadTask *cur = r->task[r->ridx];
-    char *p;
-
-    /* check if we need to read type */
-    if (cur->type < 0) {
-        if ((p = readBytes(r,1)) != NULL) {
-            switch (p[0]) {
-            case '-':
-                cur->type = REDIS_REPLY_ERROR;
-                break;
-            case '+':
-                cur->type = REDIS_REPLY_STATUS;
-                break;
-            case ':':
-                cur->type = REDIS_REPLY_INTEGER;
-                break;
-            case ',':
-                cur->type = REDIS_REPLY_DOUBLE;
-                break;
-            case '_':
-                cur->type = REDIS_REPLY_NIL;
-                break;
-            case '$':
-                cur->type = REDIS_REPLY_STRING;
-                break;
-            case '*':
-                cur->type = REDIS_REPLY_ARRAY;
-                break;
-            case '%':
-                cur->type = REDIS_REPLY_MAP;
-                break;
-            case '~':
-                cur->type = REDIS_REPLY_SET;
-                break;
-            case '#':
-                cur->type = REDIS_REPLY_BOOL;
-                break;
-            case '=':
-                cur->type = REDIS_REPLY_VERB;
-                break;
-            case '>':
-                cur->type = REDIS_REPLY_PUSH;
-                break;
-            default:
-                __redisReaderSetErrorProtocolByte(r,*p);
-                return REDIS_ERR;
-            }
-        } else {
-            /* could not consume 1 byte */
-            return REDIS_ERR;
-        }
-    }
-
-    /* process typed item */
-    switch(cur->type) {
-    case REDIS_REPLY_ERROR:
-    case REDIS_REPLY_STATUS:
-    case REDIS_REPLY_INTEGER:
-    case REDIS_REPLY_DOUBLE:
-    case REDIS_REPLY_NIL:
-    case REDIS_REPLY_BOOL:
-        return processLineItem(r);
-    case REDIS_REPLY_STRING:
-    case REDIS_REPLY_VERB:
-        return processBulkItem(r);
-    case REDIS_REPLY_ARRAY:
-    case REDIS_REPLY_MAP:
-    case REDIS_REPLY_SET:
-    case REDIS_REPLY_PUSH:
-        return processAggregateItem(r);
-    default:
-        assert(NULL);
-        return REDIS_ERR; /* Avoid warning. */
-    }
-}
-
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
-    redisReader *r;
-
-    r = hi_calloc(1,sizeof(redisReader));
-    if (r == NULL)
-        return NULL;
-
-    r->buf = sdsempty();
-    if (r->buf == NULL)
-        goto oom;
-
-    r->task = hi_calloc(REDIS_READER_STACK_SIZE, sizeof(*r->task));
-    if (r->task == NULL)
-        goto oom;
-
-    for (; r->tasks < REDIS_READER_STACK_SIZE; r->tasks++) {
-        r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
-        if (r->task[r->tasks] == NULL)
-            goto oom;
-    }
-
-    r->fn = fn;
-    r->maxbuf = REDIS_READER_MAX_BUF;
-    r->maxelements = REDIS_READER_MAX_ARRAY_ELEMENTS;
-    r->ridx = -1;
-
-    return r;
-oom:
-    redisReaderFree(r);
-    return NULL;
-}
-
-void redisReaderFree(redisReader *r) {
-    if (r == NULL)
-        return;
-
-    if (r->reply != NULL && r->fn && r->fn->freeObject)
-        r->fn->freeObject(r->reply);
-
-    if (r->task) {
-        /* We know r->task[i] is allocated if i < r->tasks */
-        for (int i = 0; i < r->tasks; i++) {
-            hi_free(r->task[i]);
-        }
-
-        hi_free(r->task);
-    }
-
-    sdsfree(r->buf);
-    hi_free(r);
-}
-
-int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
-    sds newbuf;
-
-    /* Return early when this reader is in an erroneous state. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* Copy the provided buffer. */
-    if (buf != NULL && len >= 1) {
-        /* Destroy internal buffer when it is empty and is quite large. */
-        if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) {
-            sdsfree(r->buf);
-            r->buf = sdsempty();
-            if (r->buf == 0) goto oom;
-
-            r->pos = 0;
-        }
-
-        newbuf = sdscatlen(r->buf,buf,len);
-        if (newbuf == NULL) goto oom;
-
-        r->buf = newbuf;
-        r->len = sdslen(r->buf);
-    }
-
-    return REDIS_OK;
-oom:
-    __redisReaderSetErrorOOM(r);
-    return REDIS_ERR;
-}
-
-int redisReaderGetReply(redisReader *r, void **reply) {
-    /* Default target pointer to NULL. */
-    if (reply != NULL)
-        *reply = NULL;
-
-    /* Return early when this reader is in an erroneous state. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* When the buffer is empty, there will never be a reply. */
-    if (r->len == 0)
-        return REDIS_OK;
-
-    /* Set first item to process when the stack is empty. */
-    if (r->ridx == -1) {
-        r->task[0]->type = -1;
-        r->task[0]->elements = -1;
-        r->task[0]->idx = -1;
-        r->task[0]->obj = NULL;
-        r->task[0]->parent = NULL;
-        r->task[0]->privdata = r->privdata;
-        r->ridx = 0;
-    }
-
-    /* Process items in reply. */
-    while (r->ridx >= 0)
-        if (processItem(r) != REDIS_OK)
-            break;
-
-    /* Return ASAP when an error occurred. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* Discard part of the buffer when we've consumed at least 1k, to avoid
-     * doing unnecessary calls to memmove() in sds.c. */
-    if (r->pos >= 1024) {
-        if (sdsrange(r->buf,r->pos,-1) < 0) return REDIS_ERR;
-        r->pos = 0;
-        r->len = sdslen(r->buf);
-    }
-
-    /* Emit a reply when there is one. */
-    if (r->ridx == -1) {
-        if (reply != NULL) {
-            *reply = r->reply;
-        } else if (r->reply != NULL && r->fn && r->fn->freeObject) {
-            r->fn->freeObject(r->reply);
-        }
-        r->reply = NULL;
-    }
-    return REDIS_OK;
-}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/read.h b/debian/modules/nchan/src/store/redis/hiredis/read.h
deleted file mode 100644
index 2d74d77..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/read.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef __HIREDIS_READ_H
-#define __HIREDIS_READ_H
-#include <stdio.h> /* for size_t */
-
-#define REDIS_ERR -1
-#define REDIS_OK 0
-
-/* When an error occurs, the err flag in a context is set to hold the type of
- * error that occurred. REDIS_ERR_IO means there was an I/O error and you
- * should use the "errno" variable to find out what is wrong.
- * For other values, the "errstr" field will hold a description. */
-#define REDIS_ERR_IO 1 /* Error in read or write */
-#define REDIS_ERR_EOF 3 /* End of file */
-#define REDIS_ERR_PROTOCOL 4 /* Protocol error */
-#define REDIS_ERR_OOM 5 /* Out of memory */
-#define REDIS_ERR_TIMEOUT 6 /* Timed out */
-#define REDIS_ERR_OTHER 2 /* Everything else... */
-
-#define REDIS_REPLY_STRING 1
-#define REDIS_REPLY_ARRAY 2
-#define REDIS_REPLY_INTEGER 3
-#define REDIS_REPLY_NIL 4
-#define REDIS_REPLY_STATUS 5
-#define REDIS_REPLY_ERROR 6
-#define REDIS_REPLY_DOUBLE 7
-#define REDIS_REPLY_BOOL 8
-#define REDIS_REPLY_MAP 9
-#define REDIS_REPLY_SET 10
-#define REDIS_REPLY_ATTR 11
-#define REDIS_REPLY_PUSH 12
-#define REDIS_REPLY_BIGNUM 13
-#define REDIS_REPLY_VERB 14
-
-/* Default max unused reader buffer. */
-#define REDIS_READER_MAX_BUF (1024*16)
-
-/* Default multi-bulk element limit */
-#define REDIS_READER_MAX_ARRAY_ELEMENTS ((1LL<<32) - 1)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct redisReadTask {
-    int type;
-    long long elements; /* number of elements in multibulk container */
-    int idx; /* index in parent (array) object */
-    void *obj; /* holds user-generated value for a read task */
-    struct redisReadTask *parent; /* parent task */
-    void *privdata; /* user-settable arbitrary field */
-} redisReadTask;
-
-typedef struct redisReplyObjectFunctions {
-    void *(*createString)(const redisReadTask*, char*, size_t);
-    void *(*createArray)(const redisReadTask*, size_t);
-    void *(*createInteger)(const redisReadTask*, long long);
-    void *(*createDouble)(const redisReadTask*, double, char*, size_t);
-    void *(*createNil)(const redisReadTask*);
-    void *(*createBool)(const redisReadTask*, int);
-    void (*freeObject)(void*);
-} redisReplyObjectFunctions;
-
-typedef struct redisReader {
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-
-    char *buf; /* Read buffer */
-    size_t pos; /* Buffer cursor */
-    size_t len; /* Buffer length */
-    size_t maxbuf; /* Max length of unused buffer */
-    long long maxelements; /* Max multi-bulk elements */
-
-    redisReadTask **task;
-    int tasks;
-
-    int ridx; /* Index of current read task */
-    void *reply; /* Temporary reply pointer */
-
-    redisReplyObjectFunctions *fn;
-    void *privdata;
-} redisReader;
-
-/* Public API for the protocol parser. */
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn);
-void redisReaderFree(redisReader *r);
-int redisReaderFeed(redisReader *r, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *r, void **reply);
-
-#define redisReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
-#define redisReaderGetObject(_r) (((redisReader*)(_r))->reply)
-#define redisReaderGetError(_r) (((redisReader*)(_r))->errstr)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sds.c b/debian/modules/nchan/src/store/redis/hiredis/sds.c
deleted file mode 100644
index feedfe3..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/sds.c
+++ /dev/null
@@ -1,1294 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include <limits.h>
-#include "sds.h"
-#include "sdsalloc.h"
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
-
-static inline int sdsHdrSize(char type) {
-    switch(type&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return sizeof(struct sdshdr5);
-        case SDS_TYPE_8:
-            return sizeof(struct sdshdr8);
-        case SDS_TYPE_16:
-            return sizeof(struct sdshdr16);
-        case SDS_TYPE_32:
-            return sizeof(struct sdshdr32);
-        case SDS_TYPE_64:
-            return sizeof(struct sdshdr64);
-    }
-    return 0;
-}
-
-static inline char sdsReqType(size_t string_size) {
-    if (string_size < 32)
-        return SDS_TYPE_5;
-    if (string_size < 0xff)
-        return SDS_TYPE_8;
-    if (string_size < 0xffff)
-        return SDS_TYPE_16;
-    if (string_size < 0xffffffff)
-        return SDS_TYPE_32;
-    return SDS_TYPE_64;
-}
-
-/* Create a new sds string with the content specified by the 'init' pointer
- * and 'initlen'.
- * If NULL is used for 'init' the string is initialized with zero bytes.
- *
- * The string is always null-termined (all the sds strings are, always) so
- * even if you create an sds string with:
- *
- * mystring = sdsnewlen("abc",3);
- *
- * You can print the string with printf() as there is an implicit \0 at the
- * end of the string. However the string is binary safe and can contain
- * \0 characters in the middle, as the length is stored in the sds header. */
-sds sdsnewlen(const void *init, size_t initlen) {
-    void *sh;
-    sds s;
-    char type = sdsReqType(initlen);
-    /* Empty strings are usually created in order to append. Use type 8
-     * since type 5 is not good at this. */
-    if (type == SDS_TYPE_5 && initlen == 0) type = SDS_TYPE_8;
-    int hdrlen = sdsHdrSize(type);
-    unsigned char *fp; /* flags pointer. */
-
-    sh = s_malloc(hdrlen+initlen+1);
-    if (sh == NULL) return NULL;
-    if (!init)
-        memset(sh, 0, hdrlen+initlen+1);
-    s = (char*)sh+hdrlen;
-    fp = ((unsigned char*)s)-1;
-    switch(type) {
-        case SDS_TYPE_5: {
-            *fp = type | (initlen << SDS_TYPE_BITS);
-            break;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-    }
-    if (initlen && init)
-        memcpy(s, init, initlen);
-    s[initlen] = '\0';
-    return s;
-}
-
-/* Create an empty (zero length) sds string. Even in this case the string
- * always has an implicit null term. */
-sds sdsempty(void) {
-    return sdsnewlen("",0);
-}
-
-/* Create a new sds string starting from a null terminated C string. */
-sds sdsnew(const char *init) {
-    size_t initlen = (init == NULL) ? 0 : strlen(init);
-    return sdsnewlen(init, initlen);
-}
-
-/* Duplicate an sds string. */
-sds sdsdup(const sds s) {
-    return sdsnewlen(s, sdslen(s));
-}
-
-/* Free an sds string. No operation is performed if 's' is NULL. */
-void sdsfree(sds s) {
-    if (s == NULL) return;
-    s_free((char*)s-sdsHdrSize(s[-1]));
-}
-
-/* Set the sds string length to the length as obtained with strlen(), so
- * considering as content only up to the first null term character.
- *
- * This function is useful when the sds string is hacked manually in some
- * way, like in the following example:
- *
- * s = sdsnew("foobar");
- * s[2] = '\0';
- * sdsupdatelen(s);
- * printf("%d\n", sdslen(s));
- *
- * The output will be "2", but if we comment out the call to sdsupdatelen()
- * the output will be "6" as the string was modified but the logical length
- * remains 6 bytes. */
-void sdsupdatelen(sds s) {
-    int reallen = strlen(s);
-    sdssetlen(s, reallen);
-}
-
-/* Modify an sds string in-place to make it empty (zero length).
- * However all the existing buffer is not discarded but set as free space
- * so that next append operations will not require allocations up to the
- * number of bytes previously available. */
-void sdsclear(sds s) {
-    sdssetlen(s, 0);
-    s[0] = '\0';
-}
-
-/* Enlarge the free space at the end of the sds string so that the caller
- * is sure that after calling this function can overwrite up to addlen
- * bytes after the end of the string, plus one more byte for nul term.
- *
- * Note: this does not change the *length* of the sds string as returned
- * by sdslen(), but only the free buffer space we have. */
-sds sdsMakeRoomFor(sds s, size_t addlen) {
-    void *sh, *newsh;
-    size_t avail = sdsavail(s);
-    size_t len, newlen;
-    char type, oldtype = s[-1] & SDS_TYPE_MASK;
-    int hdrlen;
-
-    /* Return ASAP if there is enough space left. */
-    if (avail >= addlen) return s;
-
-    len = sdslen(s);
-    sh = (char*)s-sdsHdrSize(oldtype);
-    newlen = (len+addlen);
-    if (newlen < SDS_MAX_PREALLOC)
-        newlen *= 2;
-    else
-        newlen += SDS_MAX_PREALLOC;
-
-    type = sdsReqType(newlen);
-
-    /* Don't use type 5: the user is appending to the string and type 5 is
-     * not able to remember empty space, so sdsMakeRoomFor() must be called
-     * at every appending operation. */
-    if (type == SDS_TYPE_5) type = SDS_TYPE_8;
-
-    hdrlen = sdsHdrSize(type);
-    if (oldtype==type) {
-        newsh = s_realloc(sh, hdrlen+newlen+1);
-        if (newsh == NULL) return NULL;
-        s = (char*)newsh+hdrlen;
-    } else {
-        /* Since the header size changes, need to move the string forward,
-         * and can't use realloc */
-        newsh = s_malloc(hdrlen+newlen+1);
-        if (newsh == NULL) return NULL;
-        memcpy((char*)newsh+hdrlen, s, len+1);
-        s_free(sh);
-        s = (char*)newsh+hdrlen;
-        s[-1] = type;
-        sdssetlen(s, len);
-    }
-    sdssetalloc(s, newlen);
-    return s;
-}
-
-/* Reallocate the sds string so that it has no free space at the end. The
- * contained string remains not altered, but next concatenation operations
- * will require a reallocation.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdsRemoveFreeSpace(sds s) {
-    void *sh, *newsh;
-    char type, oldtype = s[-1] & SDS_TYPE_MASK;
-    int hdrlen;
-    size_t len = sdslen(s);
-    sh = (char*)s-sdsHdrSize(oldtype);
-
-    type = sdsReqType(len);
-    hdrlen = sdsHdrSize(type);
-    if (oldtype==type) {
-        newsh = s_realloc(sh, hdrlen+len+1);
-        if (newsh == NULL) return NULL;
-        s = (char*)newsh+hdrlen;
-    } else {
-        newsh = s_malloc(hdrlen+len+1);
-        if (newsh == NULL) return NULL;
-        memcpy((char*)newsh+hdrlen, s, len+1);
-        s_free(sh);
-        s = (char*)newsh+hdrlen;
-        s[-1] = type;
-        sdssetlen(s, len);
-    }
-    sdssetalloc(s, len);
-    return s;
-}
-
-/* Return the total size of the allocation of the specifed sds string,
- * including:
- * 1) The sds header before the pointer.
- * 2) The string.
- * 3) The free buffer at the end if any.
- * 4) The implicit null term.
- */
-size_t sdsAllocSize(sds s) {
-    size_t alloc = sdsalloc(s);
-    return sdsHdrSize(s[-1])+alloc+1;
-}
-
-/* Return the pointer of the actual SDS allocation (normally SDS strings
- * are referenced by the start of the string buffer). */
-void *sdsAllocPtr(sds s) {
-    return (void*) (s-sdsHdrSize(s[-1]));
-}
-
-/* Increment the sds length and decrements the left free space at the
- * end of the string according to 'incr'. Also set the null term
- * in the new end of the string.
- *
- * This function is used in order to fix the string length after the
- * user calls sdsMakeRoomFor(), writes something after the end of
- * the current string, and finally needs to set the new length.
- *
- * Note: it is possible to use a negative increment in order to
- * right-trim the string.
- *
- * Usage example:
- *
- * Using sdsIncrLen() and sdsMakeRoomFor() it is possible to mount the
- * following schema, to cat bytes coming from the kernel to the end of an
- * sds string without copying into an intermediate buffer:
- *
- * oldlen = sdslen(s);
- * s = sdsMakeRoomFor(s, BUFFER_SIZE);
- * nread = read(fd, s+oldlen, BUFFER_SIZE);
- * ... check for nread <= 0 and handle it ...
- * sdsIncrLen(s, nread);
- */
-void sdsIncrLen(sds s, int incr) {
-    unsigned char flags = s[-1];
-    size_t len;
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5: {
-            unsigned char *fp = ((unsigned char*)s)-1;
-            unsigned char oldlen = SDS_TYPE_5_LEN(flags);
-            assert((incr > 0 && oldlen+incr < 32) || (incr < 0 && oldlen >= (unsigned int)(-incr)));
-            *fp = SDS_TYPE_5 | ((oldlen+incr) << SDS_TYPE_BITS);
-            len = oldlen+incr;
-            break;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= (unsigned int)incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= (uint64_t)incr) || (incr < 0 && sh->len >= (uint64_t)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        default: len = 0; /* Just to avoid compilation warnings. */
-    }
-    s[len] = '\0';
-}
-
-/* Grow the sds to have the specified length. Bytes that were not part of
- * the original length of the sds will be set to zero.
- *
- * if the specified length is smaller than the current length, no operation
- * is performed. */
-sds sdsgrowzero(sds s, size_t len) {
-    size_t curlen = sdslen(s);
-
-    if (len <= curlen) return s;
-    s = sdsMakeRoomFor(s,len-curlen);
-    if (s == NULL) return NULL;
-
-    /* Make sure added region doesn't contain garbage */
-    memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */
-    sdssetlen(s, len);
-    return s;
-}
-
-/* Append the specified binary-safe string pointed by 't' of 'len' bytes to the
- * end of the specified sds string 's'.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatlen(sds s, const void *t, size_t len) {
-    size_t curlen = sdslen(s);
-
-    s = sdsMakeRoomFor(s,len);
-    if (s == NULL) return NULL;
-    memcpy(s+curlen, t, len);
-    sdssetlen(s, curlen+len);
-    s[curlen+len] = '\0';
-    return s;
-}
-
-/* Append the specified null termianted C string to the sds string 's'.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscat(sds s, const char *t) {
-    return sdscatlen(s, t, strlen(t));
-}
-
-/* Append the specified sds 't' to the existing sds 's'.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatsds(sds s, const sds t) {
-    return sdscatlen(s, t, sdslen(t));
-}
-
-/* Destructively modify the sds string 's' to hold the specified binary
- * safe string pointed by 't' of length 'len' bytes. */
-sds sdscpylen(sds s, const char *t, size_t len) {
-    if (sdsalloc(s) < len) {
-        s = sdsMakeRoomFor(s,len-sdslen(s));
-        if (s == NULL) return NULL;
-    }
-    memcpy(s, t, len);
-    s[len] = '\0';
-    sdssetlen(s, len);
-    return s;
-}
-
-/* Like sdscpylen() but 't' must be a null-termined string so that the length
- * of the string is obtained with strlen(). */
-sds sdscpy(sds s, const char *t) {
-    return sdscpylen(s, t, strlen(t));
-}
-
-/* Helper for sdscatlonglong() doing the actual number -> string
- * conversion. 's' must point to a string with room for at least
- * SDS_LLSTR_SIZE bytes.
- *
- * The function returns the length of the null-terminated string
- * representation stored at 's'. */
-#define SDS_LLSTR_SIZE 21
-int sdsll2str(char *s, long long value) {
-    char *p, aux;
-    unsigned long long v;
-    size_t l;
-
-    /* Generate the string representation, this method produces
-     * an reversed string. */
-    v = (value < 0) ? -value : value;
-    p = s;
-    do {
-        *p++ = '0'+(v%10);
-        v /= 10;
-    } while(v);
-    if (value < 0) *p++ = '-';
-
-    /* Compute length and add null term. */
-    l = p-s;
-    *p = '\0';
-
-    /* Reverse the string. */
-    p--;
-    while(s < p) {
-        aux = *s;
-        *s = *p;
-        *p = aux;
-        s++;
-        p--;
-    }
-    return l;
-}
-
-/* Identical sdsll2str(), but for unsigned long long type. */
-int sdsull2str(char *s, unsigned long long v) {
-    char *p, aux;
-    size_t l;
-
-    /* Generate the string representation, this method produces
-     * an reversed string. */
-    p = s;
-    do {
-        *p++ = '0'+(v%10);
-        v /= 10;
-    } while(v);
-
-    /* Compute length and add null term. */
-    l = p-s;
-    *p = '\0';
-
-    /* Reverse the string. */
-    p--;
-    while(s < p) {
-        aux = *s;
-        *s = *p;
-        *p = aux;
-        s++;
-        p--;
-    }
-    return l;
-}
-
-/* Create an sds string from a long long value. It is much faster than:
- *
- * sdscatprintf(sdsempty(),"%lld\n", value);
- */
-sds sdsfromlonglong(long long value) {
-    char buf[SDS_LLSTR_SIZE];
-    int len = sdsll2str(buf,value);
-
-    return sdsnewlen(buf,len);
-}
-
-/* Like sdscatprintf() but gets va_list instead of being variadic. */
-sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
-    va_list cpy;
-    char staticbuf[1024], *buf = staticbuf, *t;
-    size_t buflen = strlen(fmt)*2;
-
-    /* We try to start using a static buffer for speed.
-     * If not possible we revert to heap allocation. */
-    if (buflen > sizeof(staticbuf)) {
-        buf = s_malloc(buflen);
-        if (buf == NULL) return NULL;
-    } else {
-        buflen = sizeof(staticbuf);
-    }
-
-    /* Try with buffers two times bigger every time we fail to
-     * fit the string in the current buffer size. */
-    while(1) {
-        buf[buflen-2] = '\0';
-        va_copy(cpy,ap);
-        vsnprintf(buf, buflen, fmt, cpy);
-        va_end(cpy);
-        if (buf[buflen-2] != '\0') {
-            if (buf != staticbuf) s_free(buf);
-            buflen *= 2;
-            buf = s_malloc(buflen);
-            if (buf == NULL) return NULL;
-            continue;
-        }
-        break;
-    }
-
-    /* Finally concat the obtained string to the SDS string and return it. */
-    t = sdscat(s, buf);
-    if (buf != staticbuf) s_free(buf);
-    return t;
-}
-
-/* Append to the sds string 's' a string obtained using printf-alike format
- * specifier.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call.
- *
- * Example:
- *
- * s = sdsnew("Sum is: ");
- * s = sdscatprintf(s,"%d+%d = %d",a,b,a+b).
- *
- * Often you need to create a string from scratch with the printf-alike
- * format. When this is the need, just use sdsempty() as the target string:
- *
- * s = sdscatprintf(sdsempty(), "... your format ...", args);
- */
-sds sdscatprintf(sds s, const char *fmt, ...) {
-    va_list ap;
-    char *t;
-    va_start(ap, fmt);
-    t = sdscatvprintf(s,fmt,ap);
-    va_end(ap);
-    return t;
-}
-
-/* This function is similar to sdscatprintf, but much faster as it does
- * not rely on sprintf() family functions implemented by the libc that
- * are often very slow. Moreover directly handling the sds string as
- * new data is concatenated provides a performance improvement.
- *
- * However this function only handles an incompatible subset of printf-alike
- * format specifiers:
- *
- * %s - C String
- * %S - SDS string
- * %i - signed int
- * %I - 64 bit signed integer (long long, int64_t)
- * %u - unsigned int
- * %U - 64 bit unsigned integer (unsigned long long, uint64_t)
- * %% - Verbatim "%" character.
- */
-sds sdscatfmt(sds s, char const *fmt, ...) {
-    const char *f = fmt;
-    int i;
-    va_list ap;
-
-    va_start(ap,fmt);
-    i = sdslen(s); /* Position of the next byte to write to dest str. */
-    while(*f) {
-        char next, *str;
-        size_t l;
-        long long num;
-        unsigned long long unum;
-
-        /* Make sure there is always space for at least 1 char. */
-        if (sdsavail(s)==0) {
-            s = sdsMakeRoomFor(s,1);
-            if (s == NULL) goto fmt_error;
-        }
-
-        switch(*f) {
-        case '%':
-            next = *(f+1);
-            f++;
-            switch(next) {
-            case 's':
-            case 'S':
-                str = va_arg(ap,char*);
-                l = (next == 's') ? strlen(str) : sdslen(str);
-                if (sdsavail(s) < l) {
-                    s = sdsMakeRoomFor(s,l);
-                    if (s == NULL) goto fmt_error;
-                }
-                memcpy(s+i,str,l);
-                sdsinclen(s,l);
-                i += l;
-                break;
-            case 'i':
-            case 'I':
-                if (next == 'i')
-                    num = va_arg(ap,int);
-                else
-                    num = va_arg(ap,long long);
-                {
-                    char buf[SDS_LLSTR_SIZE];
-                    l = sdsll2str(buf,num);
-                    if (sdsavail(s) < l) {
-                        s = sdsMakeRoomFor(s,l);
-                        if (s == NULL) goto fmt_error;
-                    }
-                    memcpy(s+i,buf,l);
-                    sdsinclen(s,l);
-                    i += l;
-                }
-                break;
-            case 'u':
-            case 'U':
-                if (next == 'u')
-                    unum = va_arg(ap,unsigned int);
-                else
-                    unum = va_arg(ap,unsigned long long);
-                {
-                    char buf[SDS_LLSTR_SIZE];
-                    l = sdsull2str(buf,unum);
-                    if (sdsavail(s) < l) {
-                        s = sdsMakeRoomFor(s,l);
-                        if (s == NULL) goto fmt_error;
-                    }
-                    memcpy(s+i,buf,l);
-                    sdsinclen(s,l);
-                    i += l;
-                }
-                break;
-            default: /* Handle %% and generally %<unknown>. */
-                s[i++] = next;
-                sdsinclen(s,1);
-                break;
-            }
-            break;
-        default:
-            s[i++] = *f;
-            sdsinclen(s,1);
-            break;
-        }
-        f++;
-    }
-    va_end(ap);
-
-    /* Add null-term */
-    s[i] = '\0';
-    return s;
-
-fmt_error:
-    va_end(ap);
-    return NULL;
-}
-
-/* Remove the part of the string from left and from right composed just of
- * contiguous characters found in 'cset', that is a null terminted C string.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call.
- *
- * Example:
- *
- * s = sdsnew("AA...AA.a.aa.aHelloWorld     :::");
- * s = sdstrim(s,"Aa. :");
- * printf("%s\n", s);
- *
- * Output will be just "Hello World".
- */
-sds sdstrim(sds s, const char *cset) {
-    char *start, *end, *sp, *ep;
-    size_t len;
-
-    sp = start = s;
-    ep = end = s+sdslen(s)-1;
-    while(sp <= end && strchr(cset, *sp)) sp++;
-    while(ep > sp && strchr(cset, *ep)) ep--;
-    len = (sp > ep) ? 0 : ((ep-sp)+1);
-    if (s != sp) memmove(s, sp, len);
-    s[len] = '\0';
-    sdssetlen(s,len);
-    return s;
-}
-
-/* Turn the string into a smaller (or equal) string containing only the
- * substring specified by the 'start' and 'end' indexes.
- *
- * start and end can be negative, where -1 means the last character of the
- * string, -2 the penultimate character, and so forth.
- *
- * The interval is inclusive, so the start and end characters will be part
- * of the resulting string.
- *
- * The string is modified in-place.
- *
- * Return value:
- * -1 (error) if sdslen(s) is larger than maximum positive ssize_t value.
- *  0 on success.
- *
- * Example:
- *
- * s = sdsnew("Hello World");
- * sdsrange(s,1,-1); => "ello World"
- */
-int sdsrange(sds s, ssize_t start, ssize_t end) {
-    size_t newlen, len = sdslen(s);
-    if (len > SSIZE_MAX) return -1;
-
-    if (len == 0) return 0;
-    if (start < 0) {
-        start = len+start;
-        if (start < 0) start = 0;
-    }
-    if (end < 0) {
-        end = len+end;
-        if (end < 0) end = 0;
-    }
-    newlen = (start > end) ? 0 : (end-start)+1;
-    if (newlen != 0) {
-        if (start >= (ssize_t)len) {
-            newlen = 0;
-        } else if (end >= (ssize_t)len) {
-            end = len-1;
-            newlen = (start > end) ? 0 : (end-start)+1;
-        }
-    } else {
-        start = 0;
-    }
-    if (start && newlen) memmove(s, s+start, newlen);
-    s[newlen] = 0;
-    sdssetlen(s,newlen);
-    return 0;
-}
-
-/* Apply tolower() to every character of the sds string 's'. */
-void sdstolower(sds s) {
-    int len = sdslen(s), j;
-
-    for (j = 0; j < len; j++) s[j] = tolower(s[j]);
-}
-
-/* Apply toupper() to every character of the sds string 's'. */
-void sdstoupper(sds s) {
-    int len = sdslen(s), j;
-
-    for (j = 0; j < len; j++) s[j] = toupper(s[j]);
-}
-
-/* Compare two sds strings s1 and s2 with memcmp().
- *
- * Return value:
- *
- *     positive if s1 > s2.
- *     negative if s1 < s2.
- *     0 if s1 and s2 are exactly the same binary string.
- *
- * If two strings share exactly the same prefix, but one of the two has
- * additional characters, the longer string is considered to be greater than
- * the smaller one. */
-int sdscmp(const sds s1, const sds s2) {
-    size_t l1, l2, minlen;
-    int cmp;
-
-    l1 = sdslen(s1);
-    l2 = sdslen(s2);
-    minlen = (l1 < l2) ? l1 : l2;
-    cmp = memcmp(s1,s2,minlen);
-    if (cmp == 0) return l1-l2;
-    return cmp;
-}
-
-/* Split 's' with separator in 'sep'. An array
- * of sds strings is returned. *count will be set
- * by reference to the number of tokens returned.
- *
- * On out of memory, zero length string, zero length
- * separator, NULL is returned.
- *
- * Note that 'sep' is able to split a string using
- * a multi-character separator. For example
- * sdssplit("foo_-_bar","_-_"); will return two
- * elements "foo" and "bar".
- *
- * This version of the function is binary-safe but
- * requires length arguments. sdssplit() is just the
- * same function but for zero-terminated strings.
- */
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count) {
-    int elements = 0, slots = 5, start = 0, j;
-    sds *tokens;
-
-    if (seplen < 1 || len < 0) return NULL;
-
-    tokens = s_malloc(sizeof(sds)*slots);
-    if (tokens == NULL) return NULL;
-
-    if (len == 0) {
-        *count = 0;
-        return tokens;
-    }
-    for (j = 0; j < (len-(seplen-1)); j++) {
-        /* make sure there is room for the next element and the final one */
-        if (slots < elements+2) {
-            sds *newtokens;
-
-            slots *= 2;
-            newtokens = s_realloc(tokens,sizeof(sds)*slots);
-            if (newtokens == NULL) goto cleanup;
-            tokens = newtokens;
-        }
-        /* search the separator */
-        if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
-            tokens[elements] = sdsnewlen(s+start,j-start);
-            if (tokens[elements] == NULL) goto cleanup;
-            elements++;
-            start = j+seplen;
-            j = j+seplen-1; /* skip the separator */
-        }
-    }
-    /* Add the final element. We are sure there is room in the tokens array. */
-    tokens[elements] = sdsnewlen(s+start,len-start);
-    if (tokens[elements] == NULL) goto cleanup;
-    elements++;
-    *count = elements;
-    return tokens;
-
-cleanup:
-    {
-        int i;
-        for (i = 0; i < elements; i++) sdsfree(tokens[i]);
-        s_free(tokens);
-        *count = 0;
-        return NULL;
-    }
-}
-
-/* Free the result returned by sdssplitlen(), or do nothing if 'tokens' is NULL. */
-void sdsfreesplitres(sds *tokens, int count) {
-    if (!tokens) return;
-    while(count--)
-        sdsfree(tokens[count]);
-    s_free(tokens);
-}
-
-/* Append to the sds string "s" an escaped string representation where
- * all the non-printable characters (tested with isprint()) are turned into
- * escapes in the form "\n\r\a...." or "\x<hex-number>".
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatrepr(sds s, const char *p, size_t len) {
-    s = sdscatlen(s,"\"",1);
-    while(len--) {
-        switch(*p) {
-        case '\\':
-        case '"':
-            s = sdscatprintf(s,"\\%c",*p);
-            break;
-        case '\n': s = sdscatlen(s,"\\n",2); break;
-        case '\r': s = sdscatlen(s,"\\r",2); break;
-        case '\t': s = sdscatlen(s,"\\t",2); break;
-        case '\a': s = sdscatlen(s,"\\a",2); break;
-        case '\b': s = sdscatlen(s,"\\b",2); break;
-        default:
-            if (isprint(*p))
-                s = sdscatprintf(s,"%c",*p);
-            else
-                s = sdscatprintf(s,"\\x%02x",(unsigned char)*p);
-            break;
-        }
-        p++;
-    }
-    return sdscatlen(s,"\"",1);
-}
-
-/* Helper function for sdssplitargs() that converts a hex digit into an
- * integer from 0 to 15 */
-int hex_digit_to_int(char c) {
-    switch(c) {
-    case '0': return 0;
-    case '1': return 1;
-    case '2': return 2;
-    case '3': return 3;
-    case '4': return 4;
-    case '5': return 5;
-    case '6': return 6;
-    case '7': return 7;
-    case '8': return 8;
-    case '9': return 9;
-    case 'a': case 'A': return 10;
-    case 'b': case 'B': return 11;
-    case 'c': case 'C': return 12;
-    case 'd': case 'D': return 13;
-    case 'e': case 'E': return 14;
-    case 'f': case 'F': return 15;
-    default: return 0;
-    }
-}
-
-/* Split a line into arguments, where every argument can be in the
- * following programming-language REPL-alike form:
- *
- * foo bar "newline are supported\n" and "\xff\x00otherstuff"
- *
- * The number of arguments is stored into *argc, and an array
- * of sds is returned.
- *
- * The caller should free the resulting array of sds strings with
- * sdsfreesplitres().
- *
- * Note that sdscatrepr() is able to convert back a string into
- * a quoted string in the same format sdssplitargs() is able to parse.
- *
- * The function returns the allocated tokens on success, even when the
- * input string is empty, or NULL if the input contains unbalanced
- * quotes or closed quotes followed by non space characters
- * as in: "foo"bar or "foo'
- */
-sds *sdssplitargs(const char *line, int *argc) {
-    const char *p = line;
-    char *current = NULL;
-    char **vector = NULL;
-
-    *argc = 0;
-    while(1) {
-        /* skip blanks */
-        while(*p && isspace(*p)) p++;
-        if (*p) {
-            /* get a token */
-            int inq=0;  /* set to 1 if we are in "quotes" */
-            int insq=0; /* set to 1 if we are in 'single quotes' */
-            int done=0;
-
-            if (current == NULL) current = sdsempty();
-            while(!done) {
-                if (inq) {
-                    if (*p == '\\' && *(p+1) == 'x' &&
-                                             isxdigit(*(p+2)) &&
-                                             isxdigit(*(p+3)))
-                    {
-                        unsigned char byte;
-
-                        byte = (hex_digit_to_int(*(p+2))*16)+
-                                hex_digit_to_int(*(p+3));
-                        current = sdscatlen(current,(char*)&byte,1);
-                        p += 3;
-                    } else if (*p == '\\' && *(p+1)) {
-                        char c;
-
-                        p++;
-                        switch(*p) {
-                        case 'n': c = '\n'; break;
-                        case 'r': c = '\r'; break;
-                        case 't': c = '\t'; break;
-                        case 'b': c = '\b'; break;
-                        case 'a': c = '\a'; break;
-                        default: c = *p; break;
-                        }
-                        current = sdscatlen(current,&c,1);
-                    } else if (*p == '"') {
-                        /* closing quote must be followed by a space or
-                         * nothing at all. */
-                        if (*(p+1) && !isspace(*(p+1))) goto err;
-                        done=1;
-                    } else if (!*p) {
-                        /* unterminated quotes */
-                        goto err;
-                    } else {
-                        current = sdscatlen(current,p,1);
-                    }
-                } else if (insq) {
-                    if (*p == '\\' && *(p+1) == '\'') {
-                        p++;
-                        current = sdscatlen(current,"'",1);
-                    } else if (*p == '\'') {
-                        /* closing quote must be followed by a space or
-                         * nothing at all. */
-                        if (*(p+1) && !isspace(*(p+1))) goto err;
-                        done=1;
-                    } else if (!*p) {
-                        /* unterminated quotes */
-                        goto err;
-                    } else {
-                        current = sdscatlen(current,p,1);
-                    }
-                } else {
-                    switch(*p) {
-                    case ' ':
-                    case '\n':
-                    case '\r':
-                    case '\t':
-                    case '\0':
-                        done=1;
-                        break;
-                    case '"':
-                        inq=1;
-                        break;
-                    case '\'':
-                        insq=1;
-                        break;
-                    default:
-                        current = sdscatlen(current,p,1);
-                        break;
-                    }
-                }
-                if (*p) p++;
-            }
-            /* add the token to the vector */
-            {
-                char **new_vector = s_realloc(vector,((*argc)+1)*sizeof(char*));
-                if (new_vector == NULL) {
-                    s_free(vector);
-                    return NULL;
-                }
-
-                vector = new_vector;
-                vector[*argc] = current;
-                (*argc)++;
-                current = NULL;
-            }
-        } else {
-            /* Even on empty input string return something not NULL. */
-            if (vector == NULL) vector = s_malloc(sizeof(void*));
-            return vector;
-        }
-    }
-
-err:
-    while((*argc)--)
-        sdsfree(vector[*argc]);
-    s_free(vector);
-    if (current) sdsfree(current);
-    *argc = 0;
-    return NULL;
-}
-
-/* Modify the string substituting all the occurrences of the set of
- * characters specified in the 'from' string to the corresponding character
- * in the 'to' array.
- *
- * For instance: sdsmapchars(mystring, "ho", "01", 2)
- * will have the effect of turning the string "hello" into "0ell1".
- *
- * The function returns the sds string pointer, that is always the same
- * as the input pointer since no resize is needed. */
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) {
-    size_t j, i, l = sdslen(s);
-
-    for (j = 0; j < l; j++) {
-        for (i = 0; i < setlen; i++) {
-            if (s[j] == from[i]) {
-                s[j] = to[i];
-                break;
-            }
-        }
-    }
-    return s;
-}
-
-/* Join an array of C strings using the specified separator (also a C string).
- * Returns the result as an sds string. */
-sds sdsjoin(char **argv, int argc, char *sep) {
-    sds join = sdsempty();
-    int j;
-
-    for (j = 0; j < argc; j++) {
-        join = sdscat(join, argv[j]);
-        if (j != argc-1) join = sdscat(join,sep);
-    }
-    return join;
-}
-
-/* Like sdsjoin, but joins an array of SDS strings. */
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) {
-    sds join = sdsempty();
-    int j;
-
-    for (j = 0; j < argc; j++) {
-        join = sdscatsds(join, argv[j]);
-        if (j != argc-1) join = sdscatlen(join,sep,seplen);
-    }
-    return join;
-}
-
-/* Wrappers to the allocators used by SDS. Note that SDS will actually
- * just use the macros defined into sdsalloc.h in order to avoid to pay
- * the overhead of function calls. Here we define these wrappers only for
- * the programs SDS is linked to, if they want to touch the SDS internals
- * even if they use a different allocator. */
-void *sds_malloc(size_t size) { return s_malloc(size); }
-void *sds_realloc(void *ptr, size_t size) { return s_realloc(ptr,size); }
-void sds_free(void *ptr) { s_free(ptr); }
-
-#if defined(SDS_TEST_MAIN)
-#include <stdio.h>
-#include "testhelp.h"
-#include "limits.h"
-
-#define UNUSED(x) (void)(x)
-int sdsTest(void) {
-    {
-        sds x = sdsnew("foo"), y;
-
-        test_cond("Create a string and obtain the length",
-            sdslen(x) == 3 && memcmp(x,"foo\0",4) == 0)
-
-        sdsfree(x);
-        x = sdsnewlen("foo",2);
-        test_cond("Create a string with specified length",
-            sdslen(x) == 2 && memcmp(x,"fo\0",3) == 0)
-
-        x = sdscat(x,"bar");
-        test_cond("Strings concatenation",
-            sdslen(x) == 5 && memcmp(x,"fobar\0",6) == 0);
-
-        x = sdscpy(x,"a");
-        test_cond("sdscpy() against an originally longer string",
-            sdslen(x) == 1 && memcmp(x,"a\0",2) == 0)
-
-        x = sdscpy(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk");
-        test_cond("sdscpy() against an originally shorter string",
-            sdslen(x) == 33 &&
-            memcmp(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk\0",33) == 0)
-
-        sdsfree(x);
-        x = sdscatprintf(sdsempty(),"%d",123);
-        test_cond("sdscatprintf() seems working in the base case",
-            sdslen(x) == 3 && memcmp(x,"123\0",4) == 0)
-
-        sdsfree(x);
-        x = sdsnew("--");
-        x = sdscatfmt(x, "Hello %s World %I,%I--", "Hi!", LLONG_MIN,LLONG_MAX);
-        test_cond("sdscatfmt() seems working in the base case",
-            sdslen(x) == 60 &&
-            memcmp(x,"--Hello Hi! World -9223372036854775808,"
-                     "9223372036854775807--",60) == 0)
-        printf("[%s]\n",x);
-
-        sdsfree(x);
-        x = sdsnew("--");
-        x = sdscatfmt(x, "%u,%U--", UINT_MAX, ULLONG_MAX);
-        test_cond("sdscatfmt() seems working with unsigned numbers",
-            sdslen(x) == 35 &&
-            memcmp(x,"--4294967295,18446744073709551615--",35) == 0)
-
-        sdsfree(x);
-        x = sdsnew(" x ");
-        sdstrim(x," x");
-        test_cond("sdstrim() works when all chars match",
-            sdslen(x) == 0)
-
-        sdsfree(x);
-        x = sdsnew(" x ");
-        sdstrim(x," ");
-        test_cond("sdstrim() works when a single char remains",
-            sdslen(x) == 1 && x[0] == 'x')
-
-        sdsfree(x);
-        x = sdsnew("xxciaoyyy");
-        sdstrim(x,"xy");
-        test_cond("sdstrim() correctly trims characters",
-            sdslen(x) == 4 && memcmp(x,"ciao\0",5) == 0)
-
-        y = sdsdup(x);
-        sdsrange(y,1,1);
-        test_cond("sdsrange(...,1,1)",
-            sdslen(y) == 1 && memcmp(y,"i\0",2) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,1,-1);
-        test_cond("sdsrange(...,1,-1)",
-            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,-2,-1);
-        test_cond("sdsrange(...,-2,-1)",
-            sdslen(y) == 2 && memcmp(y,"ao\0",3) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,2,1);
-        test_cond("sdsrange(...,2,1)",
-            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,1,100);
-        test_cond("sdsrange(...,1,100)",
-            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,100,100);
-        test_cond("sdsrange(...,100,100)",
-            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("foo");
-        y = sdsnew("foa");
-        test_cond("sdscmp(foo,foa)", sdscmp(x,y) > 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("bar");
-        y = sdsnew("bar");
-        test_cond("sdscmp(bar,bar)", sdscmp(x,y) == 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("aar");
-        y = sdsnew("bar");
-        test_cond("sdscmp(bar,bar)", sdscmp(x,y) < 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnewlen("\a\n\0foo\r",7);
-        y = sdscatrepr(sdsempty(),x,sdslen(x));
-        test_cond("sdscatrepr(...data...)",
-            memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0)
-
-        {
-            unsigned int oldfree;
-            char *p;
-            int step = 10, j, i;
-
-            sdsfree(x);
-            sdsfree(y);
-            x = sdsnew("0");
-            test_cond("sdsnew() free/len buffers", sdslen(x) == 1 && sdsavail(x) == 0);
-
-            /* Run the test a few times in order to hit the first two
-             * SDS header types. */
-            for (i = 0; i < 10; i++) {
-                int oldlen = sdslen(x);
-                x = sdsMakeRoomFor(x,step);
-                int type = x[-1]&SDS_TYPE_MASK;
-
-                test_cond("sdsMakeRoomFor() len", sdslen(x) == oldlen);
-                if (type != SDS_TYPE_5) {
-                    test_cond("sdsMakeRoomFor() free", sdsavail(x) >= step);
-                    oldfree = sdsavail(x);
-                }
-                p = x+oldlen;
-                for (j = 0; j < step; j++) {
-                    p[j] = 'A'+j;
-                }
-                sdsIncrLen(x,step);
-            }
-            test_cond("sdsMakeRoomFor() content",
-                memcmp("0ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ",x,101) == 0);
-            test_cond("sdsMakeRoomFor() final length",sdslen(x)==101);
-
-            sdsfree(x);
-        }
-    }
-    test_report()
-    return 0;
-}
-#endif
-
-#ifdef SDS_TEST_MAIN
-int main(void) {
-    return sdsTest();
-}
-#endif
-
-#pragma GCC diagnostic pop
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sds.h b/debian/modules/nchan/src/store/redis/hiredis/sds.h
deleted file mode 100644
index eda8833..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/sds.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SDS_H
-#define __SDS_H
-
-#define SDS_MAX_PREALLOC (1024*1024)
-#ifdef _MSC_VER
-#define __attribute__(x)
-typedef long long ssize_t;
-#define SSIZE_MAX (LLONG_MAX >> 1)
-#endif
-
-#include <sys/types.h>
-#include <stdarg.h>
-#include <stdint.h>
-
-typedef char *sds;
-
-/* Note: sdshdr5 is never used, we just access the flags byte directly.
- * However is here to document the layout of type 5 SDS strings. */
-struct __attribute__ ((__packed__)) sdshdr5 {
-    unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr8 {
-    uint8_t len; /* used */
-    uint8_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr16 {
-    uint16_t len; /* used */
-    uint16_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr32 {
-    uint32_t len; /* used */
-    uint32_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr64 {
-    uint64_t len; /* used */
-    uint64_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-
-#define SDS_TYPE_5  0
-#define SDS_TYPE_8  1
-#define SDS_TYPE_16 2
-#define SDS_TYPE_32 3
-#define SDS_TYPE_64 4
-#define SDS_TYPE_MASK 7
-#define SDS_TYPE_BITS 3
-#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)));
-#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
-#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
-
-static inline size_t sdslen(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->len;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->len;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->len;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->len;
-    }
-    return 0;
-}
-
-static inline size_t sdsavail(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5: {
-            return 0;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            return sh->alloc - sh->len;
-        }
-    }
-    return 0;
-}
-
-static inline void sdssetlen(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                *fp = (unsigned char)(SDS_TYPE_5 | (newlen << SDS_TYPE_BITS));
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len = (uint8_t)newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len = (uint16_t)newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len = (uint32_t)newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len = (uint64_t)newlen;
-            break;
-    }
-}
-
-static inline void sdsinclen(sds s, size_t inc) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                unsigned char newlen = SDS_TYPE_5_LEN(flags)+(unsigned char)inc;
-                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len += (uint8_t)inc;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len += (uint16_t)inc;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len += (uint32_t)inc;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len += (uint64_t)inc;
-            break;
-    }
-}
-
-/* sdsalloc() = sdsavail() + sdslen() */
-static inline size_t sdsalloc(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->alloc;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->alloc;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->alloc;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->alloc;
-    }
-    return 0;
-}
-
-static inline void sdssetalloc(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            /* Nothing to do, this type has no total allocation info. */
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->alloc = (uint8_t)newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->alloc = (uint16_t)newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->alloc = (uint32_t)newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->alloc = (uint64_t)newlen;
-            break;
-    }
-}
-
-sds sdsnewlen(const void *init, size_t initlen);
-sds sdsnew(const char *init);
-sds sdsempty(void);
-sds sdsdup(const sds s);
-void sdsfree(sds s);
-sds sdsgrowzero(sds s, size_t len);
-sds sdscatlen(sds s, const void *t, size_t len);
-sds sdscat(sds s, const char *t);
-sds sdscatsds(sds s, const sds t);
-sds sdscpylen(sds s, const char *t, size_t len);
-sds sdscpy(sds s, const char *t);
-
-sds sdscatvprintf(sds s, const char *fmt, va_list ap);
-#ifdef __GNUC__
-sds sdscatprintf(sds s, const char *fmt, ...)
-    __attribute__((format(printf, 2, 3)));
-#else
-sds sdscatprintf(sds s, const char *fmt, ...);
-#endif
-
-sds sdscatfmt(sds s, char const *fmt, ...);
-sds sdstrim(sds s, const char *cset);
-int sdsrange(sds s, ssize_t start, ssize_t end);
-void sdsupdatelen(sds s);
-void sdsclear(sds s);
-int sdscmp(const sds s1, const sds s2);
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
-void sdsfreesplitres(sds *tokens, int count);
-void sdstolower(sds s);
-void sdstoupper(sds s);
-sds sdsfromlonglong(long long value);
-sds sdscatrepr(sds s, const char *p, size_t len);
-sds *sdssplitargs(const char *line, int *argc);
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
-sds sdsjoin(char **argv, int argc, char *sep);
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
-
-/* Low level functions exposed to the user API */
-sds sdsMakeRoomFor(sds s, size_t addlen);
-void sdsIncrLen(sds s, int incr);
-sds sdsRemoveFreeSpace(sds s);
-size_t sdsAllocSize(sds s);
-void *sdsAllocPtr(sds s);
-
-/* Export the allocator used by SDS to the program using SDS.
- * Sometimes the program SDS is linked to, may use a different set of
- * allocators, but may want to allocate or free things that SDS will
- * respectively free or allocate. */
-void *sds_malloc(size_t size);
-void *sds_realloc(void *ptr, size_t size);
-void sds_free(void *ptr);
-
-#ifdef REDIS_TEST
-int sdsTest(int argc, char *argv[]);
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sdsalloc.h b/debian/modules/nchan/src/store/redis/hiredis/sdsalloc.h
deleted file mode 100644
index 5538dd9..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/sdsalloc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* SDS allocator selection.
- *
- * This file is used in order to change the SDS allocator at compile time.
- * Just define the following defines to what you want to use. Also add
- * the include of your alternate allocator if needed (not needed in order
- * to use the default libc allocator). */
-
-#include "alloc.h"
-
-#define s_malloc hi_malloc
-#define s_realloc hi_realloc
-#define s_free hi_free
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sockcompat.c b/debian/modules/nchan/src/store/redis/hiredis/sockcompat.c
deleted file mode 100644
index f99d14b..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/sockcompat.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2019, Marcus Geelnard <m at bitsnbites dot eu>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define REDIS_SOCKCOMPAT_IMPLEMENTATION
-#include "sockcompat.h"
-
-#ifdef _WIN32
-static int _wsaErrorToErrno(int err) {
-    switch (err) {
-        case WSAEWOULDBLOCK:
-            return EWOULDBLOCK;
-        case WSAEINPROGRESS:
-            return EINPROGRESS;
-        case WSAEALREADY:
-            return EALREADY;
-        case WSAENOTSOCK:
-            return ENOTSOCK;
-        case WSAEDESTADDRREQ:
-            return EDESTADDRREQ;
-        case WSAEMSGSIZE:
-            return EMSGSIZE;
-        case WSAEPROTOTYPE:
-            return EPROTOTYPE;
-        case WSAENOPROTOOPT:
-            return ENOPROTOOPT;
-        case WSAEPROTONOSUPPORT:
-            return EPROTONOSUPPORT;
-        case WSAEOPNOTSUPP:
-            return EOPNOTSUPP;
-        case WSAEAFNOSUPPORT:
-            return EAFNOSUPPORT;
-        case WSAEADDRINUSE:
-            return EADDRINUSE;
-        case WSAEADDRNOTAVAIL:
-            return EADDRNOTAVAIL;
-        case WSAENETDOWN:
-            return ENETDOWN;
-        case WSAENETUNREACH:
-            return ENETUNREACH;
-        case WSAENETRESET:
-            return ENETRESET;
-        case WSAECONNABORTED:
-            return ECONNABORTED;
-        case WSAECONNRESET:
-            return ECONNRESET;
-        case WSAENOBUFS:
-            return ENOBUFS;
-        case WSAEISCONN:
-            return EISCONN;
-        case WSAENOTCONN:
-            return ENOTCONN;
-        case WSAETIMEDOUT:
-            return ETIMEDOUT;
-        case WSAECONNREFUSED:
-            return ECONNREFUSED;
-        case WSAELOOP:
-            return ELOOP;
-        case WSAENAMETOOLONG:
-            return ENAMETOOLONG;
-        case WSAEHOSTUNREACH:
-            return EHOSTUNREACH;
-        case WSAENOTEMPTY:
-            return ENOTEMPTY;
-        default:
-            /* We just return a generic I/O error if we could not find a relevant error. */
-            return EIO;
-    }
-}
-
-static void _updateErrno(int success) {
-    errno = success ? 0 : _wsaErrorToErrno(WSAGetLastError());
-}
-
-static int _initWinsock() {
-    static int s_initialized = 0;
-    if (!s_initialized) {
-        static WSADATA wsadata;
-        int err = WSAStartup(MAKEWORD(2,2), &wsadata);
-        if (err != 0) {
-            errno = _wsaErrorToErrno(err);
-            return 0;
-        }
-        s_initialized = 1;
-    }
-    return 1;
-}
-
-int win32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) {
-    /* Note: This function is likely to be called before other functions, so run init here. */
-    if (!_initWinsock()) {
-        return EAI_FAIL;
-    }
-
-    switch (getaddrinfo(node, service, hints, res)) {
-        case 0:                     return 0;
-        case WSATRY_AGAIN:          return EAI_AGAIN;
-        case WSAEINVAL:             return EAI_BADFLAGS;
-        case WSAEAFNOSUPPORT:       return EAI_FAMILY;
-        case WSA_NOT_ENOUGH_MEMORY: return EAI_MEMORY;
-        case WSAHOST_NOT_FOUND:     return EAI_NONAME;
-        case WSATYPE_NOT_FOUND:     return EAI_SERVICE;
-        case WSAESOCKTNOSUPPORT:    return EAI_SOCKTYPE;
-        default:                    return EAI_FAIL;     /* Including WSANO_RECOVERY */
-    }
-}
-
-const char *win32_gai_strerror(int errcode) {
-    switch (errcode) {
-        case 0:            errcode = 0;                     break;
-        case EAI_AGAIN:    errcode = WSATRY_AGAIN;          break;
-        case EAI_BADFLAGS: errcode = WSAEINVAL;             break;
-        case EAI_FAMILY:   errcode = WSAEAFNOSUPPORT;       break;
-        case EAI_MEMORY:   errcode = WSA_NOT_ENOUGH_MEMORY; break;
-        case EAI_NONAME:   errcode = WSAHOST_NOT_FOUND;     break;
-        case EAI_SERVICE:  errcode = WSATYPE_NOT_FOUND;     break;
-        case EAI_SOCKTYPE: errcode = WSAESOCKTNOSUPPORT;    break;
-        default:           errcode = WSANO_RECOVERY;        break; /* Including EAI_FAIL */
-    }
-    return gai_strerror(errcode);
-}
-
-void win32_freeaddrinfo(struct addrinfo *res) {
-    freeaddrinfo(res);
-}
-
-SOCKET win32_socket(int domain, int type, int protocol) {
-    SOCKET s;
-
-    /* Note: This function is likely to be called before other functions, so run init here. */
-    if (!_initWinsock()) {
-        return INVALID_SOCKET;
-    }
-
-    _updateErrno((s = socket(domain, type, protocol)) != INVALID_SOCKET);
-    return s;
-}
-
-int win32_ioctl(SOCKET fd, unsigned long request, unsigned long *argp) {
-    int ret = ioctlsocket(fd, (long)request, argp);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_bind(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen) {
-    int ret = bind(sockfd, addr, addrlen);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen) {
-    int ret = connect(sockfd, addr, addrlen);
-    _updateErrno(ret != SOCKET_ERROR);
-
-    /* For Winsock connect(), the WSAEWOULDBLOCK error means the same thing as
-     * EINPROGRESS for POSIX connect(), so we do that translation to keep POSIX
-     * logic consistent. */
-    if (errno == EWOULDBLOCK) {
-        errno = EINPROGRESS;
-    }
-
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, socklen_t *optlen) {
-    int ret = 0;
-    if ((level == SOL_SOCKET) && ((optname == SO_RCVTIMEO) || (optname == SO_SNDTIMEO))) {
-        if (*optlen >= sizeof (struct timeval)) {
-            struct timeval *tv = optval;
-            DWORD timeout = 0;
-            socklen_t dwlen = 0;
-            ret = getsockopt(sockfd, level, optname, (char *)&timeout, &dwlen);
-            tv->tv_sec = timeout / 1000;
-            tv->tv_usec = (timeout * 1000) % 1000000;
-        } else {
-            ret = WSAEFAULT;
-        }
-        *optlen = sizeof (struct timeval);
-    } else {
-        ret = getsockopt(sockfd, level, optname, (char*)optval, optlen);
-    }
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_setsockopt(SOCKET sockfd, int level, int optname, const void *optval, socklen_t optlen) {
-    int ret = 0;
-    if ((level == SOL_SOCKET) && ((optname == SO_RCVTIMEO) || (optname == SO_SNDTIMEO))) {
-        const struct timeval *tv = optval;
-        DWORD timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
-        ret = setsockopt(sockfd, level, optname, (const char*)&timeout, sizeof(DWORD));
-    } else {
-        ret = setsockopt(sockfd, level, optname, (const char*)optval, optlen);
-    }
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_close(SOCKET fd) {
-    int ret = closesocket(fd);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-ssize_t win32_recv(SOCKET sockfd, void *buf, size_t len, int flags) {
-    int ret = recv(sockfd, (char*)buf, (int)len, flags);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-ssize_t win32_send(SOCKET sockfd, const void *buf, size_t len, int flags) {
-    int ret = send(sockfd, (const char*)buf, (int)len, flags);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_poll(struct pollfd *fds, nfds_t nfds, int timeout) {
-    int ret = WSAPoll(fds, nfds, timeout);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-#endif /* _WIN32 */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/sockcompat.h b/debian/modules/nchan/src/store/redis/hiredis/sockcompat.h
deleted file mode 100644
index 85810e8..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/sockcompat.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2019, Marcus Geelnard <m at bitsnbites dot eu>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SOCKCOMPAT_H
-#define __SOCKCOMPAT_H
-
-#ifndef _WIN32
-/* For POSIX systems we use the standard BSD socket API. */
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <poll.h>
-#else
-/* For Windows we use winsock. */
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600 /* To get WSAPoll etc. */
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <stddef.h>
-#include <errno.h>
-
-#ifdef _MSC_VER
-typedef long long ssize_t;
-#endif
-
-/* Emulate the parts of the BSD socket API that we need (override the winsock signatures). */
-int win32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
-const char *win32_gai_strerror(int errcode);
-void win32_freeaddrinfo(struct addrinfo *res);
-SOCKET win32_socket(int domain, int type, int protocol);
-int win32_ioctl(SOCKET fd, unsigned long request, unsigned long *argp);
-int win32_bind(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
-int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
-int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, socklen_t *optlen);
-int win32_setsockopt(SOCKET sockfd, int level, int optname, const void *optval, socklen_t optlen);
-int win32_close(SOCKET fd);
-ssize_t win32_recv(SOCKET sockfd, void *buf, size_t len, int flags);
-ssize_t win32_send(SOCKET sockfd, const void *buf, size_t len, int flags);
-typedef ULONG nfds_t;
-int win32_poll(struct pollfd *fds, nfds_t nfds, int timeout);
-
-#ifndef REDIS_SOCKCOMPAT_IMPLEMENTATION
-#define getaddrinfo(node, service, hints, res) win32_getaddrinfo(node, service, hints, res)
-#undef gai_strerror
-#define gai_strerror(errcode) win32_gai_strerror(errcode)
-#define freeaddrinfo(res) win32_freeaddrinfo(res)
-#define socket(domain, type, protocol) win32_socket(domain, type, protocol)
-#define ioctl(fd, request, argp) win32_ioctl(fd, request, argp)
-#define bind(sockfd, addr, addrlen) win32_bind(sockfd, addr, addrlen)
-#define connect(sockfd, addr, addrlen) win32_connect(sockfd, addr, addrlen)
-#define getsockopt(sockfd, level, optname, optval, optlen) win32_getsockopt(sockfd, level, optname, optval, optlen)
-#define setsockopt(sockfd, level, optname, optval, optlen) win32_setsockopt(sockfd, level, optname, optval, optlen)
-#define close(fd) win32_close(fd)
-#define recv(sockfd, buf, len, flags) win32_recv(sockfd, buf, len, flags)
-#define send(sockfd, buf, len, flags) win32_send(sockfd, buf, len, flags)
-#define poll(fds, nfds, timeout) win32_poll(fds, nfds, timeout)
-#endif /* REDIS_SOCKCOMPAT_IMPLEMENTATION */
-#endif /* _WIN32 */
-
-#endif /* __SOCKCOMPAT_H */
diff --git a/debian/modules/nchan/src/store/redis/hiredis/ssl.c b/debian/modules/nchan/src/store/redis/hiredis/ssl.c
deleted file mode 100644
index 7df58fb..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/ssl.c
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2019, Redis Labs
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "hiredis.h"
-#include "async.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <pthread.h>
-#endif
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#include "win32.h"
-#include "async_private.h"
-#include "hiredis_ssl.h"
-
-void __redisSetError(redisContext *c, int type, const char *str);
-
-struct redisSSLContext {
-    /* Associated OpenSSL SSL_CTX as created by redisCreateSSLContext() */
-    SSL_CTX *ssl_ctx;
-
-    /* Requested SNI, or NULL */
-    char *server_name;
-};
-
-/* The SSL connection context is attached to SSL/TLS connections as a privdata. */
-typedef struct redisSSL {
-    /**
-     * OpenSSL SSL object.
-     */
-    SSL *ssl;
-
-    /**
-     * SSL_write() requires to be called again with the same arguments it was
-     * previously called with in the event of an SSL_read/SSL_write situation
-     */
-    size_t lastLen;
-
-    /** Whether the SSL layer requires read (possibly before a write) */
-    int wantRead;
-
-    /**
-     * Whether a write was requested prior to a read. If set, the write()
-     * should resume whenever a read takes place, if possible
-     */
-    int pendingWrite;
-} redisSSL;
-
-/* Forward declaration */
-redisContextFuncs redisContextSSLFuncs;
-
-/**
- * OpenSSL global initialization and locking handling callbacks.
- * Note that this is only required for OpenSSL < 1.1.0.
- */
-
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-#define HIREDIS_USE_CRYPTO_LOCKS
-#endif
-
-#ifdef HIREDIS_USE_CRYPTO_LOCKS
-#ifdef _WIN32
-typedef CRITICAL_SECTION sslLockType;
-static void sslLockInit(sslLockType* l) {
-    InitializeCriticalSection(l);
-}
-static void sslLockAcquire(sslLockType* l) {
-    EnterCriticalSection(l);
-}
-static void sslLockRelease(sslLockType* l) {
-    LeaveCriticalSection(l);
-}
-#else
-typedef pthread_mutex_t sslLockType;
-static void sslLockInit(sslLockType *l) {
-    pthread_mutex_init(l, NULL);
-}
-static void sslLockAcquire(sslLockType *l) {
-    pthread_mutex_lock(l);
-}
-static void sslLockRelease(sslLockType *l) {
-    pthread_mutex_unlock(l);
-}
-#endif
-
-static sslLockType* ossl_locks;
-
-static void opensslDoLock(int mode, int lkid, const char *f, int line) {
-    sslLockType *l = ossl_locks + lkid;
-
-    if (mode & CRYPTO_LOCK) {
-        sslLockAcquire(l);
-    } else {
-        sslLockRelease(l);
-    }
-
-    (void)f;
-    (void)line;
-}
-
-static int initOpensslLocks(void) {
-    unsigned ii, nlocks;
-    if (CRYPTO_get_locking_callback() != NULL) {
-        /* Someone already set the callback before us. Don't destroy it! */
-        return REDIS_OK;
-    }
-    nlocks = CRYPTO_num_locks();
-    ossl_locks = hi_malloc(sizeof(*ossl_locks) * nlocks);
-    if (ossl_locks == NULL)
-        return REDIS_ERR;
-
-    for (ii = 0; ii < nlocks; ii++) {
-        sslLockInit(ossl_locks + ii);
-    }
-    CRYPTO_set_locking_callback(opensslDoLock);
-    return REDIS_OK;
-}
-#endif /* HIREDIS_USE_CRYPTO_LOCKS */
-
-int redisInitOpenSSL(void)
-{
-    SSL_library_init();
-#ifdef HIREDIS_USE_CRYPTO_LOCKS
-    initOpensslLocks();
-#endif
-
-    return REDIS_OK;
-}
-
-/**
- * redisSSLContext helper context destruction.
- */
-
-const char *redisSSLContextGetError(redisSSLContextError error)
-{
-    switch (error) {
-        case REDIS_SSL_CTX_NONE:
-            return "No Error";
-        case REDIS_SSL_CTX_CREATE_FAILED:
-            return "Failed to create OpenSSL SSL_CTX";
-        case REDIS_SSL_CTX_CERT_KEY_REQUIRED:
-            return "Client cert and key must both be specified or skipped";
-        case REDIS_SSL_CTX_CA_CERT_LOAD_FAILED:
-            return "Failed to load CA Certificate or CA Path";
-        case REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED:
-            return "Failed to load client certificate";
-        case REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED:
-            return "Failed to load private key";
-        default:
-            return "Unknown error code";
-    }
-}
-
-void redisFreeSSLContext(redisSSLContext *ctx)
-{
-    if (!ctx)
-        return;
-
-    if (ctx->server_name) {
-        hi_free(ctx->server_name);
-        ctx->server_name = NULL;
-    }
-
-    if (ctx->ssl_ctx) {
-        SSL_CTX_free(ctx->ssl_ctx);
-        ctx->ssl_ctx = NULL;
-    }
-
-    hi_free(ctx);
-}
-
-
-/**
- * redisSSLContext helper context initialization.
- */
-
-redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
-        const char *cert_filename, const char *private_key_filename,
-        const char *server_name, redisSSLContextError *error)
-{
-    redisSSLContext *ctx = hi_calloc(1, sizeof(redisSSLContext));
-    if (ctx == NULL)
-        goto error;
-
-    ctx->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-    if (!ctx->ssl_ctx) {
-        if (error) *error = REDIS_SSL_CTX_CREATE_FAILED;
-        goto error;
-    }
-
-    SSL_CTX_set_options(ctx->ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-    SSL_CTX_set_verify(ctx->ssl_ctx, SSL_VERIFY_PEER, NULL);
-
-    if ((cert_filename != NULL && private_key_filename == NULL) ||
-            (private_key_filename != NULL && cert_filename == NULL)) {
-        if (error) *error = REDIS_SSL_CTX_CERT_KEY_REQUIRED;
-        goto error;
-    }
-
-    if (capath || cacert_filename) {
-        if (!SSL_CTX_load_verify_locations(ctx->ssl_ctx, cacert_filename, capath)) {
-            if (error) *error = REDIS_SSL_CTX_CA_CERT_LOAD_FAILED;
-            goto error;
-        }
-    }
-
-    if (cert_filename) {
-        if (!SSL_CTX_use_certificate_chain_file(ctx->ssl_ctx, cert_filename)) {
-            if (error) *error = REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED;
-            goto error;
-        }
-        if (!SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, private_key_filename, SSL_FILETYPE_PEM)) {
-            if (error) *error = REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED;
-            goto error;
-        }
-    }
-
-    if (server_name)
-        ctx->server_name = hi_strdup(server_name);
-
-    return ctx;
-
-error:
-    redisFreeSSLContext(ctx);
-    return NULL;
-}
-
-/**
- * SSL Connection initialization.
- */
-
-
-static int redisSSLConnect(redisContext *c, SSL *ssl) {
-    if (c->privctx) {
-        __redisSetError(c, REDIS_ERR_OTHER, "redisContext was already associated");
-        return REDIS_ERR;
-    }
-
-    redisSSL *rssl = hi_calloc(1, sizeof(redisSSL));
-    if (rssl == NULL) {
-        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-        return REDIS_ERR;
-    }
-
-    c->funcs = &redisContextSSLFuncs;
-    rssl->ssl = ssl;
-
-    SSL_set_mode(rssl->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
-    SSL_set_fd(rssl->ssl, c->fd);
-    SSL_set_connect_state(rssl->ssl);
-
-    ERR_clear_error();
-    int rv = SSL_connect(rssl->ssl);
-    if (rv == 1) {
-        c->privctx = rssl;
-        return REDIS_OK;
-    }
-
-    rv = SSL_get_error(rssl->ssl, rv);
-    if (((c->flags & REDIS_BLOCK) == 0) &&
-        (rv == SSL_ERROR_WANT_READ || rv == SSL_ERROR_WANT_WRITE)) {
-        c->privctx = rssl;
-        return REDIS_OK;
-    }
-
-    if (c->err == 0) {
-        char err[512];
-        if (rv == SSL_ERROR_SYSCALL)
-            snprintf(err,sizeof(err)-1,"SSL_connect failed: %s",strerror(errno));
-        else {
-            unsigned long e = ERR_peek_last_error();
-            snprintf(err,sizeof(err)-1,"SSL_connect failed: %s",
-                    ERR_reason_error_string(e));
-        }
-        __redisSetError(c, REDIS_ERR_IO, err);
-    }
-
-    hi_free(rssl);
-    return REDIS_ERR;
-}
-
-/**
- * A wrapper around redisSSLConnect() for users who manage their own context and
- * create their own SSL object.
- */
-
-int redisInitiateSSL(redisContext *c, SSL *ssl) {
-    return redisSSLConnect(c, ssl);
-}
-
-/**
- * A wrapper around redisSSLConnect() for users who use redisSSLContext and don't
- * manage their own SSL objects.
- */
-
-int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx)
-{
-    if (!c || !redis_ssl_ctx)
-        return REDIS_ERR;
-
-    /* We want to verify that redisSSLConnect() won't fail on this, as it will
-     * not own the SSL object in that case and we'll end up leaking.
-     */
-    if (c->privctx)
-        return REDIS_ERR;
-
-    SSL *ssl = SSL_new(redis_ssl_ctx->ssl_ctx);
-    if (!ssl) {
-        __redisSetError(c, REDIS_ERR_OTHER, "Couldn't create new SSL instance");
-        goto error;
-    }
-
-    if (redis_ssl_ctx->server_name) {
-        if (!SSL_set_tlsext_host_name(ssl, redis_ssl_ctx->server_name)) {
-            __redisSetError(c, REDIS_ERR_OTHER, "Failed to set server_name/SNI");
-            goto error;
-        }
-    }
-
-    return redisSSLConnect(c, ssl);
-
-error:
-    if (ssl)
-        SSL_free(ssl);
-    return REDIS_ERR;
-}
-
-static int maybeCheckWant(redisSSL *rssl, int rv) {
-    /**
-     * If the error is WANT_READ or WANT_WRITE, the appropriate flags are set
-     * and true is returned. False is returned otherwise
-     */
-    if (rv == SSL_ERROR_WANT_READ) {
-        rssl->wantRead = 1;
-        return 1;
-    } else if (rv == SSL_ERROR_WANT_WRITE) {
-        rssl->pendingWrite = 1;
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-/**
- * Implementation of redisContextFuncs for SSL connections.
- */
-
-static void redisSSLFree(void *privctx){
-    redisSSL *rsc = privctx;
-
-    if (!rsc) return;
-    if (rsc->ssl) {
-        SSL_free(rsc->ssl);
-        rsc->ssl = NULL;
-    }
-    hi_free(rsc);
-}
-
-static ssize_t redisSSLRead(redisContext *c, char *buf, size_t bufcap) {
-    redisSSL *rssl = c->privctx;
-
-    int nread = SSL_read(rssl->ssl, buf, bufcap);
-    if (nread > 0) {
-        return nread;
-    } else if (nread == 0) {
-        __redisSetError(c, REDIS_ERR_EOF, "Server closed the connection");
-        return -1;
-    } else {
-        int err = SSL_get_error(rssl->ssl, nread);
-        if (c->flags & REDIS_BLOCK) {
-            /**
-             * In blocking mode, we should never end up in a situation where
-             * we get an error without it being an actual error, except
-             * in the case of EINTR, which can be spuriously received from
-             * debuggers or whatever.
-             */
-            if (errno == EINTR) {
-                return 0;
-            } else {
-                const char *msg = NULL;
-                if (errno == EAGAIN) {
-                    msg = "Resource temporarily unavailable";
-                }
-                __redisSetError(c, REDIS_ERR_IO, msg);
-                return -1;
-            }
-        }
-
-        /**
-         * We can very well get an EWOULDBLOCK/EAGAIN, however
-         */
-        if (maybeCheckWant(rssl, err)) {
-            return 0;
-        } else {
-            __redisSetError(c, REDIS_ERR_IO, NULL);
-            return -1;
-        }
-    }
-}
-
-static ssize_t redisSSLWrite(redisContext *c) {
-    redisSSL *rssl = c->privctx;
-
-    size_t len = rssl->lastLen ? rssl->lastLen : sdslen(c->obuf);
-    int rv = SSL_write(rssl->ssl, c->obuf, len);
-
-    if (rv > 0) {
-        rssl->lastLen = 0;
-    } else if (rv < 0) {
-        rssl->lastLen = len;
-
-        int err = SSL_get_error(rssl->ssl, rv);
-        if ((c->flags & REDIS_BLOCK) == 0 && maybeCheckWant(rssl, err)) {
-            return 0;
-        } else {
-            __redisSetError(c, REDIS_ERR_IO, NULL);
-            return -1;
-        }
-    }
-    return rv;
-}
-
-static void redisSSLAsyncRead(redisAsyncContext *ac) {
-    int rv;
-    redisSSL *rssl = ac->c.privctx;
-    redisContext *c = &ac->c;
-
-    rssl->wantRead = 0;
-
-    if (rssl->pendingWrite) {
-        int done;
-
-        /* This is probably just a write event */
-        rssl->pendingWrite = 0;
-        rv = redisBufferWrite(c, &done);
-        if (rv == REDIS_ERR) {
-            __redisAsyncDisconnect(ac);
-            return;
-        } else if (!done) {
-            _EL_ADD_WRITE(ac);
-        }
-    }
-
-    rv = redisBufferRead(c);
-    if (rv == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        _EL_ADD_READ(ac);
-        redisProcessCallbacks(ac);
-    }
-}
-
-static void redisSSLAsyncWrite(redisAsyncContext *ac) {
-    int rv, done = 0;
-    redisSSL *rssl = ac->c.privctx;
-    redisContext *c = &ac->c;
-
-    rssl->pendingWrite = 0;
-    rv = redisBufferWrite(c, &done);
-    if (rv == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-        return;
-    }
-
-    if (!done) {
-        if (rssl->wantRead) {
-            /* Need to read-before-write */
-            rssl->pendingWrite = 1;
-            _EL_DEL_WRITE(ac);
-        } else {
-            /* No extra reads needed, just need to write more */
-            _EL_ADD_WRITE(ac);
-        }
-    } else {
-        /* Already done! */
-        _EL_DEL_WRITE(ac);
-    }
-
-    /* Always reschedule a read */
-    _EL_ADD_READ(ac);
-}
-
-redisContextFuncs redisContextSSLFuncs = {
-    .free_privctx = redisSSLFree,
-    .async_read = redisSSLAsyncRead,
-    .async_write = redisSSLAsyncWrite,
-    .read = redisSSLRead,
-    .write = redisSSLWrite
-};
-
diff --git a/debian/modules/nchan/src/store/redis/hiredis/test.c b/debian/modules/nchan/src/store/redis/hiredis/test.c
deleted file mode 100644
index c0eeca7..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/test.c
+++ /dev/null
@@ -1,1387 +0,0 @@
-#include "fmacros.h"
-#include "sockcompat.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifndef _WIN32
-#include <strings.h>
-#include <sys/time.h>
-#endif
-#include <assert.h>
-#include <signal.h>
-#include <errno.h>
-#include <limits.h>
-
-#include "hiredis.h"
-#include "async.h"
-#ifdef HIREDIS_TEST_SSL
-#include "hiredis_ssl.h"
-#endif
-#include "net.h"
-#include "win32.h"
-
-enum connection_type {
-    CONN_TCP,
-    CONN_UNIX,
-    CONN_FD,
-    CONN_SSL
-};
-
-struct config {
-    enum connection_type type;
-
-    struct {
-        const char *host;
-        int port;
-        struct timeval timeout;
-    } tcp;
-
-    struct {
-        const char *path;
-    } unix_sock;
-
-    struct {
-        const char *host;
-        int port;
-        const char *ca_cert;
-        const char *cert;
-        const char *key;
-    } ssl;
-};
-
-struct privdata {
-    int dtor_counter;
-};
-
-#ifdef HIREDIS_TEST_SSL
-redisSSLContext *_ssl_ctx = NULL;
-#endif
-
-/* The following lines make up our testing "framework" :) */
-static int tests = 0, fails = 0, skips = 0;
-#define test(_s) { printf("#%02d ", ++tests); printf(_s); }
-#define test_cond(_c) if(_c) printf("\033[0;32mPASSED\033[0;0m\n"); else {printf("\033[0;31mFAILED\033[0;0m\n"); fails++;}
-#define test_skipped() { printf("\033[01;33mSKIPPED\033[0;0m\n"); skips++; }
-
-static long long usec(void) {
-#ifndef _MSC_VER
-    struct timeval tv;
-    gettimeofday(&tv,NULL);
-    return (((long long)tv.tv_sec)*1000000)+tv.tv_usec;
-#else
-    FILETIME ft;
-    GetSystemTimeAsFileTime(&ft);
-    return (((long long)ft.dwHighDateTime << 32) | ft.dwLowDateTime) / 10;
-#endif
-}
-
-/* The assert() calls below have side effects, so we need assert()
- * even if we are compiling without asserts (-DNDEBUG). */
-#ifdef NDEBUG
-#undef assert
-#define assert(e) (void)(e)
-#endif
-
-/* Helper to extract Redis version information.  Aborts on any failure. */
-#define REDIS_VERSION_FIELD "redis_version:"
-void get_redis_version(redisContext *c, int *majorptr, int *minorptr) {
-    redisReply *reply;
-    char *eptr, *s, *e;
-    int major, minor;
-
-    reply = redisCommand(c, "INFO");
-    if (reply == NULL || c->err || reply->type != REDIS_REPLY_STRING)
-        goto abort;
-    if ((s = strstr(reply->str, REDIS_VERSION_FIELD)) == NULL)
-        goto abort;
-
-    s += strlen(REDIS_VERSION_FIELD);
-
-    /* We need a field terminator and at least 'x.y.z' (5) bytes of data */
-    if ((e = strstr(s, "\r\n")) == NULL || (e - s) < 5)
-        goto abort;
-
-    /* Extract version info */
-    major = strtol(s, &eptr, 10);
-    if (*eptr != '.') goto abort;
-    minor = strtol(eptr+1, NULL, 10);
-
-    /* Push info the caller wants */
-    if (majorptr) *majorptr = major;
-    if (minorptr) *minorptr = minor;
-
-    freeReplyObject(reply);
-    return;
-
-abort:
-    freeReplyObject(reply);
-    fprintf(stderr, "Error:  Cannot determine Redis version, aborting\n");
-    exit(1);
-}
-
-static redisContext *select_database(redisContext *c) {
-    redisReply *reply;
-
-    /* Switch to DB 9 for testing, now that we know we can chat. */
-    reply = redisCommand(c,"SELECT 9");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    /* Make sure the DB is emtpy */
-    reply = redisCommand(c,"DBSIZE");
-    assert(reply != NULL);
-    if (reply->type == REDIS_REPLY_INTEGER && reply->integer == 0) {
-        /* Awesome, DB 9 is empty and we can continue. */
-        freeReplyObject(reply);
-    } else {
-        printf("Database #9 is not empty, test can not continue\n");
-        exit(1);
-    }
-
-    return c;
-}
-
-/* Switch protocol */
-static void send_hello(redisContext *c, int version) {
-    redisReply *reply;
-    int expected;
-
-    reply = redisCommand(c, "HELLO %d", version);
-    expected = version == 3 ? REDIS_REPLY_MAP : REDIS_REPLY_ARRAY;
-    assert(reply != NULL && reply->type == expected);
-    freeReplyObject(reply);
-}
-
-/* Togggle client tracking */
-static void send_client_tracking(redisContext *c, const char *str) {
-    redisReply *reply;
-
-    reply = redisCommand(c, "CLIENT TRACKING %s", str);
-    assert(reply != NULL && reply->type == REDIS_REPLY_STATUS);
-    freeReplyObject(reply);
-}
-
-static int disconnect(redisContext *c, int keep_fd) {
-    redisReply *reply;
-
-    /* Make sure we're on DB 9. */
-    reply = redisCommand(c,"SELECT 9");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-    reply = redisCommand(c,"FLUSHDB");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    /* Free the context as well, but keep the fd if requested. */
-    if (keep_fd)
-        return redisFreeKeepFd(c);
-    redisFree(c);
-    return -1;
-}
-
-static void do_ssl_handshake(redisContext *c) {
-#ifdef HIREDIS_TEST_SSL
-    redisInitiateSSLWithContext(c, _ssl_ctx);
-    if (c->err) {
-        printf("SSL error: %s\n", c->errstr);
-        redisFree(c);
-        exit(1);
-    }
-#else
-    (void) c;
-#endif
-}
-
-static redisContext *do_connect(struct config config) {
-    redisContext *c = NULL;
-
-    if (config.type == CONN_TCP) {
-        c = redisConnect(config.tcp.host, config.tcp.port);
-    } else if (config.type == CONN_SSL) {
-        c = redisConnect(config.ssl.host, config.ssl.port);
-    } else if (config.type == CONN_UNIX) {
-        c = redisConnectUnix(config.unix_sock.path);
-    } else if (config.type == CONN_FD) {
-        /* Create a dummy connection just to get an fd to inherit */
-        redisContext *dummy_ctx = redisConnectUnix(config.unix_sock.path);
-        if (dummy_ctx) {
-            int fd = disconnect(dummy_ctx, 1);
-            printf("Connecting to inherited fd %d\n", fd);
-            c = redisConnectFd(fd);
-        }
-    } else {
-        assert(NULL);
-    }
-
-    if (c == NULL) {
-        printf("Connection error: can't allocate redis context\n");
-        exit(1);
-    } else if (c->err) {
-        printf("Connection error: %s\n", c->errstr);
-        redisFree(c);
-        exit(1);
-    }
-
-    if (config.type == CONN_SSL) {
-        do_ssl_handshake(c);
-    }
-
-    return select_database(c);
-}
-
-static void do_reconnect(redisContext *c, struct config config) {
-    redisReconnect(c);
-
-    if (config.type == CONN_SSL) {
-        do_ssl_handshake(c);
-    }
-}
-
-static void test_format_commands(void) {
-    char *cmd;
-    int len;
-
-    test("Format command without interpolation: ");
-    len = redisFormatCommand(&cmd,"SET foo bar");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command with %%s string interpolation: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","foo","bar");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command with %%s and an empty string: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","foo","");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    hi_free(cmd);
-
-    test("Format command with an empty string in between proper interpolations: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","","foo");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$0\r\n\r\n$3\r\nfoo\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(0+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command with %%b string interpolation: ");
-    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"b\0r",(size_t)3);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nb\0r\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command with %%b and an empty string: ");
-    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"",(size_t)0);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    hi_free(cmd);
-
-    test("Format command with literal %%: ");
-    len = redisFormatCommand(&cmd,"SET %% %%");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$1\r\n%\r\n$1\r\n%\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(1+2)+4+(1+2));
-    hi_free(cmd);
-
-    /* Vararg width depends on the type. These tests make sure that the
-     * width is correctly determined using the format and subsequent varargs
-     * can correctly be interpolated. */
-#define INTEGER_WIDTH_TEST(fmt, type) do {                                                \
-    type value = 123;                                                                     \
-    test("Format command with printf-delegation (" #type "): ");                          \
-    len = redisFormatCommand(&cmd,"key:%08" fmt " str:%s", value, "hello");               \
-    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",len) == 0 && \
-        len == 4+5+(12+2)+4+(9+2));                                                       \
-    hi_free(cmd);                                                                         \
-} while(0)
-
-#define FLOAT_WIDTH_TEST(type) do {                                                       \
-    type value = 123.0;                                                                   \
-    test("Format command with printf-delegation (" #type "): ");                          \
-    len = redisFormatCommand(&cmd,"key:%08.3f str:%s", value, "hello");                   \
-    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",len) == 0 && \
-        len == 4+5+(12+2)+4+(9+2));                                                       \
-    hi_free(cmd);                                                                         \
-} while(0)
-
-    INTEGER_WIDTH_TEST("d", int);
-    INTEGER_WIDTH_TEST("hhd", char);
-    INTEGER_WIDTH_TEST("hd", short);
-    INTEGER_WIDTH_TEST("ld", long);
-    INTEGER_WIDTH_TEST("lld", long long);
-    INTEGER_WIDTH_TEST("u", unsigned int);
-    INTEGER_WIDTH_TEST("hhu", unsigned char);
-    INTEGER_WIDTH_TEST("hu", unsigned short);
-    INTEGER_WIDTH_TEST("lu", unsigned long);
-    INTEGER_WIDTH_TEST("llu", unsigned long long);
-    FLOAT_WIDTH_TEST(float);
-    FLOAT_WIDTH_TEST(double);
-
-    test("Format command with invalid printf format: ");
-    len = redisFormatCommand(&cmd,"key:%08p %b",(void*)1234,"foo",(size_t)3);
-    test_cond(len == -1);
-
-    const char *argv[3];
-    argv[0] = "SET";
-    argv[1] = "foo\0xxx";
-    argv[2] = "bar";
-    size_t lens[3] = { 3, 7, 3 };
-    int argc = 3;
-
-    test("Format command by passing argc/argv without lengths: ");
-    len = redisFormatCommandArgv(&cmd,argc,argv,NULL);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command by passing argc/argv with lengths: ");
-    len = redisFormatCommandArgv(&cmd,argc,argv,lens);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
-    hi_free(cmd);
-
-    sds sds_cmd;
-
-    sds_cmd = NULL;
-    test("Format command into sds by passing argc/argv without lengths: ");
-    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,NULL);
-    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    sdsfree(sds_cmd);
-
-    sds_cmd = NULL;
-    test("Format command into sds by passing argc/argv with lengths: ");
-    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,lens);
-    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
-    sdsfree(sds_cmd);
-}
-
-static void test_append_formatted_commands(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    char *cmd;
-    int len;
-
-    c = do_connect(config);
-
-    test("Append format command: ");
-
-    len = redisFormatCommand(&cmd, "SET foo bar");
-
-    test_cond(redisAppendFormattedCommand(c, cmd, len) == REDIS_OK);
-
-    assert(redisGetReply(c, (void*)&reply) == REDIS_OK);
-
-    hi_free(cmd);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_reply_reader(void) {
-    redisReader *reader;
-    void *reply, *root;
-    int ret;
-    int i;
-
-    test("Error handling in reply parser: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"@foo\r\n",6);
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
-    redisReaderFree(reader);
-
-    /* when the reply already contains multiple items, they must be free'd
-     * on an error. valgrind will bark when this doesn't happen. */
-    test("Memory cleanup in reply parser: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"*2\r\n",4);
-    redisReaderFeed(reader,(char*)"$5\r\nhello\r\n",11);
-    redisReaderFeed(reader,(char*)"@foo\r\n",6);
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
-    redisReaderFree(reader);
-
-    reader = redisReaderCreate();
-    test("Can handle arbitrarily nested multi-bulks: ");
-    for (i = 0; i < 128; i++) {
-        redisReaderFeed(reader,(char*)"*1\r\n", 4);
-    }
-    redisReaderFeed(reader,(char*)"$6\r\nLOLWUT\r\n",12);
-    ret = redisReaderGetReply(reader,&reply);
-    root = reply; /* Keep track of the root reply */
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
-        ((redisReply*)reply)->elements == 1);
-
-    test("Can parse arbitrarily nested multi-bulks correctly: ");
-    while(i--) {
-        assert(reply != NULL && ((redisReply*)reply)->type == REDIS_REPLY_ARRAY);
-        reply = ((redisReply*)reply)->element[0];
-    }
-    test_cond(((redisReply*)reply)->type == REDIS_REPLY_STRING &&
-        !memcmp(((redisReply*)reply)->str, "LOLWUT", 6));
-    freeReplyObject(root);
-    redisReaderFree(reader);
-
-    test("Correctly parses LLONG_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":9223372036854775807\r\n",22);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
-            ((redisReply*)reply)->integer == LLONG_MAX);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when > LLONG_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":9223372036854775808\r\n",22);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Bad integer value") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Correctly parses LLONG_MIN: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":-9223372036854775808\r\n",23);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
-            ((redisReply*)reply)->integer == LLONG_MIN);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when < LLONG_MIN: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":-9223372036854775809\r\n",23);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Bad integer value") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when array < -1: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "*-2\r\n+asdf\r\n",12);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when bulk < -1: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "$-2\r\nasdf\r\n",11);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Can configure maximum multi-bulk elements: ");
-    reader = redisReaderCreate();
-    reader->maxelements = 1024;
-    redisReaderFeed(reader, "*1025\r\n", 7);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr, "Multi-bulk length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-#if LLONG_MAX > SIZE_MAX
-    test("Set error when array > SIZE_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "*9223372036854775807\r\n+asdf\r\n",29);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-            strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when bulk > SIZE_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "$9223372036854775807\r\nasdf\r\n",28);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-            strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-#endif
-
-    test("Works with NULL functions for reply: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"+OK\r\n",5);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
-    redisReaderFree(reader);
-
-    test("Works when a single newline (\\r\\n) covers two calls to feed: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"+OK\r",4);
-    ret = redisReaderGetReply(reader,&reply);
-    assert(ret == REDIS_OK && reply == NULL);
-    redisReaderFeed(reader,(char*)"\n",1);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
-    redisReaderFree(reader);
-
-    test("Don't reset state after protocol error: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"x",1);
-    ret = redisReaderGetReply(reader,&reply);
-    assert(ret == REDIS_ERR);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR && reply == NULL);
-    redisReaderFree(reader);
-
-    /* Regression test for issue #45 on GitHub. */
-    test("Don't do empty allocation for empty multi bulk: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"*0\r\n",4);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
-        ((redisReply*)reply)->elements == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    /* RESP3 verbatim strings (GitHub issue #802) */
-    test("Can parse RESP3 verbatim strings: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"=10\r\ntxt:LOLWUT\r\n",17);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_VERB &&
-         !memcmp(((redisReply*)reply)->str,"LOLWUT", 6));
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    /* RESP3 push messages (Github issue #815) */
-    test("Can parse RESP3 push messages: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)">2\r\n$6\r\nLOLWUT\r\n:42\r\n",21);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_PUSH &&
-        ((redisReply*)reply)->elements == 2 &&
-        ((redisReply*)reply)->element[0]->type == REDIS_REPLY_STRING &&
-        !memcmp(((redisReply*)reply)->element[0]->str,"LOLWUT",6) &&
-        ((redisReply*)reply)->element[1]->type == REDIS_REPLY_INTEGER &&
-        ((redisReply*)reply)->element[1]->integer == 42);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-}
-
-static void test_free_null(void) {
-    void *redisCtx = NULL;
-    void *reply = NULL;
-
-    test("Don't fail when redisFree is passed a NULL value: ");
-    redisFree(redisCtx);
-    test_cond(redisCtx == NULL);
-
-    test("Don't fail when freeReplyObject is passed a NULL value: ");
-    freeReplyObject(reply);
-    test_cond(reply == NULL);
-}
-
-static void *hi_malloc_fail(size_t size) {
-    (void)size;
-    return NULL;
-}
-
-static void *hi_calloc_fail(size_t nmemb, size_t size) {
-    (void)nmemb;
-    (void)size;
-    return NULL;
-}
-
-static void *hi_realloc_fail(void *ptr, size_t size) {
-    (void)ptr;
-    (void)size;
-    return NULL;
-}
-
-static void test_allocator_injection(void) {
-    hiredisAllocFuncs ha = {
-        .mallocFn = hi_malloc_fail,
-        .callocFn = hi_calloc_fail,
-        .reallocFn = hi_realloc_fail,
-        .strdupFn = strdup,
-        .freeFn = free,
-    };
-
-    // Override hiredis allocators
-    hiredisSetAllocators(&ha);
-
-    test("redisContext uses injected allocators: ");
-    redisContext *c = redisConnect("localhost", 6379);
-    test_cond(c == NULL);
-
-    test("redisReader uses injected allocators: ");
-    redisReader *reader = redisReaderCreate();
-    test_cond(reader == NULL);
-
-    // Return allocators to default
-    hiredisResetAllocators();
-}
-
-#define HIREDIS_BAD_DOMAIN "idontexist-noreally.com"
-static void test_blocking_connection_errors(void) {
-    redisContext *c;
-    struct addrinfo hints = {.ai_family = AF_INET};
-    struct addrinfo *ai_tmp = NULL;
-
-    int rv = getaddrinfo(HIREDIS_BAD_DOMAIN, "6379", &hints, &ai_tmp);
-    if (rv != 0) {
-        // Address does *not* exist
-        test("Returns error when host cannot be resolved: ");
-        // First see if this domain name *actually* resolves to NXDOMAIN
-        c = redisConnect(HIREDIS_BAD_DOMAIN, 6379);
-        test_cond(
-            c->err == REDIS_ERR_OTHER &&
-            (strcmp(c->errstr, "Name or service not known") == 0 ||
-             strcmp(c->errstr, "Can't resolve: " HIREDIS_BAD_DOMAIN) == 0 ||
-             strcmp(c->errstr, "Name does not resolve") == 0 ||
-             strcmp(c->errstr, "nodename nor servname provided, or not known") == 0 ||
-             strcmp(c->errstr, "No address associated with hostname") == 0 ||
-             strcmp(c->errstr, "Temporary failure in name resolution") == 0 ||
-             strcmp(c->errstr, "hostname nor servname provided, or not known") == 0 ||
-             strcmp(c->errstr, "no address associated with name") == 0 ||
-             strcmp(c->errstr, "No such host is known. ") == 0));
-        redisFree(c);
-    } else {
-        printf("Skipping NXDOMAIN test. Found evil ISP!\n");
-        freeaddrinfo(ai_tmp);
-    }
-
-#ifndef _WIN32
-    test("Returns error when the port is not open: ");
-    c = redisConnect((char*)"localhost", 1);
-    test_cond(c->err == REDIS_ERR_IO &&
-        strcmp(c->errstr,"Connection refused") == 0);
-    redisFree(c);
-
-    test("Returns error when the unix_sock socket path doesn't accept connections: ");
-    c = redisConnectUnix((char*)"/tmp/idontexist.sock");
-    test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
-    redisFree(c);
-#endif
-}
-
-/* Dummy push handler */
-void push_handler(void *privdata, void *reply) {
-    int *counter = privdata;
-    freeReplyObject(reply);
-    *counter += 1;
-}
-
-/* Dummy function just to test setting a callback with redisOptions */
-void push_handler_async(redisAsyncContext *ac, void *reply) {
-    (void)ac;
-    (void)reply;
-}
-
-static void test_resp3_push_handler(redisContext *c) {
-    redisPushFn *old = NULL;
-    redisReply *reply;
-    void *privdata;
-    int n = 0;
-
-    /* Switch to RESP3 and turn on client tracking */
-    send_hello(c, 3);
-    send_client_tracking(c, "ON");
-    privdata = c->privdata;
-    c->privdata = &n;
-
-    reply = redisCommand(c, "GET key:0");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    test("RESP3 PUSH messages are handled out of band by default: ");
-    reply = redisCommand(c, "SET key:0 val:0");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS);
-    freeReplyObject(reply);
-
-    assert((reply = redisCommand(c, "GET key:0")) != NULL);
-    freeReplyObject(reply);
-
-    old = redisSetPushCallback(c, push_handler);
-    test("We can set a custom RESP3 PUSH handler: ");
-    reply = redisCommand(c, "SET key:0 val:0");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && n == 1);
-    freeReplyObject(reply);
-
-    /* Unset the push callback and generate an invalidate message making
-     * sure it is not handled out of band. */
-    test("With no handler, PUSH replies come in-band: ");
-    redisSetPushCallback(c, NULL);
-    assert((reply = redisCommand(c, "GET key:0")) != NULL);
-    freeReplyObject(reply);
-    assert((reply = redisCommand(c, "SET key:0 invalid")) != NULL);
-    test_cond(reply->type == REDIS_REPLY_PUSH);
-    freeReplyObject(reply);
-
-    test("With no PUSH handler, no replies are lost: ");
-    assert(redisGetReply(c, (void**)&reply) == REDIS_OK);
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS);
-    freeReplyObject(reply);
-
-    /* Return to the originally set PUSH handler */
-    assert(old != NULL);
-    redisSetPushCallback(c, old);
-
-    /* Switch back to RESP2 and disable tracking */
-    c->privdata = privdata;
-    send_client_tracking(c, "OFF");
-    send_hello(c, 2);
-}
-
-redisOptions get_redis_tcp_options(struct config config) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, config.tcp.host, config.tcp.port);
-    return options;
-}
-
-static void test_resp3_push_options(struct config config) {
-    redisAsyncContext *ac;
-    redisContext *c;
-    redisOptions options;
-
-    test("We set a default RESP3 handler for redisContext: ");
-    options = get_redis_tcp_options(config);
-    assert((c = redisConnectWithOptions(&options)) != NULL);
-    test_cond(c->push_cb != NULL);
-    redisFree(c);
-
-    test("We don't set a default RESP3 push handler for redisAsyncContext: ");
-    options = get_redis_tcp_options(config);
-    assert((ac = redisAsyncConnectWithOptions(&options)) != NULL);
-    test_cond(ac->c.push_cb == NULL);
-    redisAsyncFree(ac);
-
-    test("Our REDIS_OPT_NO_PUSH_AUTOFREE flag works: ");
-    options = get_redis_tcp_options(config);
-    options.options |= REDIS_OPT_NO_PUSH_AUTOFREE;
-    assert((c = redisConnectWithOptions(&options)) != NULL);
-    test_cond(c->push_cb == NULL);
-    redisFree(c);
-
-    test("We can use redisOptions to set a custom PUSH handler for redisContext: ");
-    options = get_redis_tcp_options(config);
-    options.push_cb = push_handler;
-    assert((c = redisConnectWithOptions(&options)) != NULL);
-    test_cond(c->push_cb == push_handler);
-    redisFree(c);
-
-    test("We can use redisOptions to set a custom PUSH handler for redisAsyncContext: ");
-    options = get_redis_tcp_options(config);
-    options.async_push_cb = push_handler_async;
-    assert((ac = redisAsyncConnectWithOptions(&options)) != NULL);
-    test_cond(ac->push_cb == push_handler_async);
-    redisAsyncFree(ac);
-}
-
-void free_privdata(void *privdata) {
-    struct privdata *data = privdata;
-    data->dtor_counter++;
-}
-
-static void test_privdata_hooks(struct config config) {
-    struct privdata data = {0};
-    redisOptions options;
-    redisContext *c;
-
-    test("We can use redisOptions to set privdata: ");
-    options = get_redis_tcp_options(config);
-    REDIS_OPTIONS_SET_PRIVDATA(&options, &data, free_privdata);
-    assert((c = redisConnectWithOptions(&options)) != NULL);
-    test_cond(c->privdata == &data);
-
-    test("Our privdata destructor fires when we free the context: ");
-    redisFree(c);
-    test_cond(data.dtor_counter == 1);
-}
-
-static void test_blocking_connection(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    int major;
-
-    c = do_connect(config);
-
-    test("Is able to deliver commands: ");
-    reply = redisCommand(c,"PING");
-    test_cond(reply->type == REDIS_REPLY_STATUS &&
-        strcasecmp(reply->str,"pong") == 0)
-    freeReplyObject(reply);
-
-    test("Is a able to send commands verbatim: ");
-    reply = redisCommand(c,"SET foo bar");
-    test_cond (reply->type == REDIS_REPLY_STATUS &&
-        strcasecmp(reply->str,"ok") == 0)
-    freeReplyObject(reply);
-
-    test("%%s String interpolation works: ");
-    reply = redisCommand(c,"SET %s %s","foo","hello world");
-    freeReplyObject(reply);
-    reply = redisCommand(c,"GET foo");
-    test_cond(reply->type == REDIS_REPLY_STRING &&
-        strcmp(reply->str,"hello world") == 0);
-    freeReplyObject(reply);
-
-    test("%%b String interpolation works: ");
-    reply = redisCommand(c,"SET %b %b","foo",(size_t)3,"hello\x00world",(size_t)11);
-    freeReplyObject(reply);
-    reply = redisCommand(c,"GET foo");
-    test_cond(reply->type == REDIS_REPLY_STRING &&
-        memcmp(reply->str,"hello\x00world",11) == 0)
-
-    test("Binary reply length is correct: ");
-    test_cond(reply->len == 11)
-    freeReplyObject(reply);
-
-    test("Can parse nil replies: ");
-    reply = redisCommand(c,"GET nokey");
-    test_cond(reply->type == REDIS_REPLY_NIL)
-    freeReplyObject(reply);
-
-    /* test 7 */
-    test("Can parse integer replies: ");
-    reply = redisCommand(c,"INCR mycounter");
-    test_cond(reply->type == REDIS_REPLY_INTEGER && reply->integer == 1)
-    freeReplyObject(reply);
-
-    test("Can parse multi bulk replies: ");
-    freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
-    freeReplyObject(redisCommand(c,"LPUSH mylist bar"));
-    reply = redisCommand(c,"LRANGE mylist 0 -1");
-    test_cond(reply->type == REDIS_REPLY_ARRAY &&
-              reply->elements == 2 &&
-              !memcmp(reply->element[0]->str,"bar",3) &&
-              !memcmp(reply->element[1]->str,"foo",3))
-    freeReplyObject(reply);
-
-    /* m/e with multi bulk reply *before* other reply.
-     * specifically test ordering of reply items to parse. */
-    test("Can handle nested multi bulk replies: ");
-    freeReplyObject(redisCommand(c,"MULTI"));
-    freeReplyObject(redisCommand(c,"LRANGE mylist 0 -1"));
-    freeReplyObject(redisCommand(c,"PING"));
-    reply = (redisCommand(c,"EXEC"));
-    test_cond(reply->type == REDIS_REPLY_ARRAY &&
-              reply->elements == 2 &&
-              reply->element[0]->type == REDIS_REPLY_ARRAY &&
-              reply->element[0]->elements == 2 &&
-              !memcmp(reply->element[0]->element[0]->str,"bar",3) &&
-              !memcmp(reply->element[0]->element[1]->str,"foo",3) &&
-              reply->element[1]->type == REDIS_REPLY_STATUS &&
-              strcasecmp(reply->element[1]->str,"pong") == 0);
-    freeReplyObject(reply);
-
-    /* Make sure passing NULL to redisGetReply is safe */
-    test("Can pass NULL to redisGetReply: ");
-    assert(redisAppendCommand(c, "PING") == REDIS_OK);
-    test_cond(redisGetReply(c, NULL) == REDIS_OK);
-
-    get_redis_version(c, &major, NULL);
-    if (major >= 6) test_resp3_push_handler(c);
-    test_resp3_push_options(config);
-
-    test_privdata_hooks(config);
-
-    disconnect(c, 0);
-}
-
-/* Send DEBUG SLEEP 0 to detect if we have this command */
-static int detect_debug_sleep(redisContext *c) {
-    int detected;
-    redisReply *reply = redisCommand(c, "DEBUG SLEEP 0\r\n");
-
-    if (reply == NULL || c->err) {
-        const char *cause = c->err ? c->errstr : "(none)";
-        fprintf(stderr, "Error testing for DEBUG SLEEP (Redis error: %s), exiting\n", cause);
-        exit(-1);
-    }
-
-    detected = reply->type == REDIS_REPLY_STATUS;
-    freeReplyObject(reply);
-
-    return detected;
-}
-
-static void test_blocking_connection_timeouts(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    ssize_t s;
-    const char *sleep_cmd = "DEBUG SLEEP 3\r\n";
-    struct timeval tv;
-
-    c = do_connect(config);
-    test("Successfully completes a command when the timeout is not exceeded: ");
-    reply = redisCommand(c,"SET foo fast");
-    freeReplyObject(reply);
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000;
-    redisSetTimeout(c, tv);
-    reply = redisCommand(c, "GET foo");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STRING && memcmp(reply->str, "fast", 4) == 0);
-    freeReplyObject(reply);
-    disconnect(c, 0);
-
-    c = do_connect(config);
-    test("Does not return a reply when the command times out: ");
-    if (detect_debug_sleep(c)) {
-        redisAppendFormattedCommand(c, sleep_cmd, strlen(sleep_cmd));
-        s = c->funcs->write(c);
-        tv.tv_sec = 0;
-        tv.tv_usec = 10000;
-        redisSetTimeout(c, tv);
-        reply = redisCommand(c, "GET foo");
-#ifndef _WIN32
-        test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_IO &&
-                  strcmp(c->errstr, "Resource temporarily unavailable") == 0);
-#else
-        test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_TIMEOUT &&
-                  strcmp(c->errstr, "recv timeout") == 0);
-#endif
-        freeReplyObject(reply);
-    } else {
-        test_skipped();
-    }
-
-    test("Reconnect properly reconnects after a timeout: ");
-    do_reconnect(c, config);
-    reply = redisCommand(c, "PING");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
-    freeReplyObject(reply);
-
-    test("Reconnect properly uses owned parameters: ");
-    config.tcp.host = "foo";
-    config.unix_sock.path = "foo";
-    do_reconnect(c, config);
-    reply = redisCommand(c, "PING");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_blocking_io_errors(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    void *_reply;
-    int major, minor;
-
-    /* Connect to target given by config. */
-    c = do_connect(config);
-    get_redis_version(c, &major, &minor);
-
-    test("Returns I/O error when the connection is lost: ");
-    reply = redisCommand(c,"QUIT");
-    if (major > 2 || (major == 2 && minor > 0)) {
-        /* > 2.0 returns OK on QUIT and read() should be issued once more
-         * to know the descriptor is at EOF. */
-        test_cond(strcasecmp(reply->str,"OK") == 0 &&
-            redisGetReply(c,&_reply) == REDIS_ERR);
-        freeReplyObject(reply);
-    } else {
-        test_cond(reply == NULL);
-    }
-
-#ifndef _WIN32
-    /* On 2.0, QUIT will cause the connection to be closed immediately and
-     * the read(2) for the reply on QUIT will set the error to EOF.
-     * On >2.0, QUIT will return with OK and another read(2) needed to be
-     * issued to find out the socket was closed by the server. In both
-     * conditions, the error will be set to EOF. */
-    assert(c->err == REDIS_ERR_EOF &&
-        strcmp(c->errstr,"Server closed the connection") == 0);
-#endif
-    redisFree(c);
-
-    c = do_connect(config);
-    test("Returns I/O error on socket timeout: ");
-    struct timeval tv = { 0, 1000 };
-    assert(redisSetTimeout(c,tv) == REDIS_OK);
-    int respcode = redisGetReply(c,&_reply);
-#ifndef _WIN32
-    test_cond(respcode == REDIS_ERR && c->err == REDIS_ERR_IO && errno == EAGAIN);
-#else
-    test_cond(respcode == REDIS_ERR && c->err == REDIS_ERR_TIMEOUT);
-#endif
-    redisFree(c);
-}
-
-static void test_invalid_timeout_errors(struct config config) {
-    redisContext *c;
-
-    test("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: ");
-
-    config.tcp.timeout.tv_sec = 0;
-    config.tcp.timeout.tv_usec = 10000001;
-
-    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
-
-    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
-    redisFree(c);
-
-    test("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
-
-    config.tcp.timeout.tv_sec = (((LONG_MAX) - 999) / 1000) + 1;
-    config.tcp.timeout.tv_usec = 0;
-
-    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
-
-    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
-    redisFree(c);
-}
-
-/* Wrap malloc to abort on failure so OOM checks don't make the test logic
- * harder to follow. */
-void *hi_malloc_safe(size_t size) {
-    void *ptr = hi_malloc(size);
-    if (ptr == NULL) {
-        fprintf(stderr, "Error:  Out of memory\n");
-        exit(-1);
-    }
-
-    return ptr;
-}
-
-static void test_throughput(struct config config) {
-    redisContext *c = do_connect(config);
-    redisReply **replies;
-    int i, num;
-    long long t1, t2;
-
-    test("Throughput:\n");
-    for (i = 0; i < 500; i++)
-        freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
-
-    num = 1000;
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c,"PING");
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx PING: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c,"LRANGE mylist 0 499");
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
-        assert(replies[i] != NULL && replies[i]->elements == 500);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx LRANGE with 500 elements: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c, "INCRBY incrkey %d", 1000000);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx INCRBY: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    num = 10000;
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"PING");
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx PING (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"LRANGE mylist 0 499");
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
-        assert(replies[i] != NULL && replies[i]->elements == 500);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"INCRBY incrkey %d", 1000000);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx INCRBY (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    disconnect(c, 0);
-}
-
-// static long __test_callback_flags = 0;
-// static void __test_callback(redisContext *c, void *privdata) {
-//     ((void)c);
-//     /* Shift to detect execution order */
-//     __test_callback_flags <<= 8;
-//     __test_callback_flags |= (long)privdata;
-// }
-//
-// static void __test_reply_callback(redisContext *c, redisReply *reply, void *privdata) {
-//     ((void)c);
-//     /* Shift to detect execution order */
-//     __test_callback_flags <<= 8;
-//     __test_callback_flags |= (long)privdata;
-//     if (reply) freeReplyObject(reply);
-// }
-//
-// static redisContext *__connect_nonblock() {
-//     /* Reset callback flags */
-//     __test_callback_flags = 0;
-//     return redisConnectNonBlock("127.0.0.1", port, NULL);
-// }
-//
-// static void test_nonblocking_connection() {
-//     redisContext *c;
-//     int wdone = 0;
-//
-//     test("Calls command callback when command is issued: ");
-//     c = __connect_nonblock();
-//     redisSetCommandCallback(c,__test_callback,(void*)1);
-//     redisCommand(c,"PING");
-//     test_cond(__test_callback_flags == 1);
-//     redisFree(c);
-//
-//     test("Calls disconnect callback on redisDisconnect: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
-//     redisDisconnect(c);
-//     test_cond(__test_callback_flags == 2);
-//     redisFree(c);
-//
-//     test("Calls disconnect callback and free callback on redisFree: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
-//     redisSetFreeCallback(c,__test_callback,(void*)4);
-//     redisFree(c);
-//     test_cond(__test_callback_flags == ((2 << 8) | 4));
-//
-//     test("redisBufferWrite against empty write buffer: ");
-//     c = __connect_nonblock();
-//     test_cond(redisBufferWrite(c,&wdone) == REDIS_OK && wdone == 1);
-//     redisFree(c);
-//
-//     test("redisBufferWrite against not yet connected fd: ");
-//     c = __connect_nonblock();
-//     redisCommand(c,"PING");
-//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
-//               strncmp(c->error,"write:",6) == 0);
-//     redisFree(c);
-//
-//     test("redisBufferWrite against closed fd: ");
-//     c = __connect_nonblock();
-//     redisCommand(c,"PING");
-//     redisDisconnect(c);
-//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
-//               strncmp(c->error,"write:",6) == 0);
-//     redisFree(c);
-//
-//     test("Process callbacks in the right sequence: ");
-//     c = __connect_nonblock();
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)1,"PING");
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)3,"PING");
-//
-//     /* Write output buffer */
-//     wdone = 0;
-//     while(!wdone) {
-//         usleep(500);
-//         redisBufferWrite(c,&wdone);
-//     }
-//
-//     /* Read until at least one callback is executed (the 3 replies will
-//      * arrive in a single packet, causing all callbacks to be executed in
-//      * a single pass). */
-//     while(__test_callback_flags == 0) {
-//         assert(redisBufferRead(c) == REDIS_OK);
-//         redisProcessCallbacks(c);
-//     }
-//     test_cond(__test_callback_flags == 0x010203);
-//     redisFree(c);
-//
-//     test("redisDisconnect executes pending callbacks with NULL reply: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)1);
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
-//     redisDisconnect(c);
-//     test_cond(__test_callback_flags == 0x0201);
-//     redisFree(c);
-// }
-
-int main(int argc, char **argv) {
-    struct config cfg = {
-        .tcp = {
-            .host = "127.0.0.1",
-            .port = 6379
-        },
-        .unix_sock = {
-            .path = "/tmp/redis.sock"
-        }
-    };
-    int throughput = 1;
-    int test_inherit_fd = 1;
-    int skips_as_fails = 0;
-    int test_unix_socket;
-
-    /* Parse command line options. */
-    argv++; argc--;
-    while (argc) {
-        if (argc >= 2 && !strcmp(argv[0],"-h")) {
-            argv++; argc--;
-            cfg.tcp.host = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"-p")) {
-            argv++; argc--;
-            cfg.tcp.port = atoi(argv[0]);
-        } else if (argc >= 2 && !strcmp(argv[0],"-s")) {
-            argv++; argc--;
-            cfg.unix_sock.path = argv[0];
-        } else if (argc >= 1 && !strcmp(argv[0],"--skip-throughput")) {
-            throughput = 0;
-        } else if (argc >= 1 && !strcmp(argv[0],"--skip-inherit-fd")) {
-            test_inherit_fd = 0;
-        } else if (argc >= 1 && !strcmp(argv[0],"--skips-as-fails")) {
-            skips_as_fails = 1;
-#ifdef HIREDIS_TEST_SSL
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-port")) {
-            argv++; argc--;
-            cfg.ssl.port = atoi(argv[0]);
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-host")) {
-            argv++; argc--;
-            cfg.ssl.host = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-ca-cert")) {
-            argv++; argc--;
-            cfg.ssl.ca_cert  = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-cert")) {
-            argv++; argc--;
-            cfg.ssl.cert = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-key")) {
-            argv++; argc--;
-            cfg.ssl.key = argv[0];
-#endif
-        } else {
-            fprintf(stderr, "Invalid argument: %s\n", argv[0]);
-            exit(1);
-        }
-        argv++; argc--;
-    }
-
-#ifndef _WIN32
-    /* Ignore broken pipe signal (for I/O error tests). */
-    signal(SIGPIPE, SIG_IGN);
-
-    test_unix_socket = access(cfg.unix_sock.path, F_OK) == 0;
-
-#else
-    /* Unix sockets don't exist in Windows */
-    test_unix_socket = 0;
-#endif
-
-    test_allocator_injection();
-
-    test_format_commands();
-    test_reply_reader();
-    test_blocking_connection_errors();
-    test_free_null();
-
-    printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
-    cfg.type = CONN_TCP;
-    test_blocking_connection(cfg);
-    test_blocking_connection_timeouts(cfg);
-    test_blocking_io_errors(cfg);
-    test_invalid_timeout_errors(cfg);
-    test_append_formatted_commands(cfg);
-    if (throughput) test_throughput(cfg);
-
-    printf("\nTesting against Unix socket connection (%s): ", cfg.unix_sock.path);
-    if (test_unix_socket) {
-        printf("\n");
-        cfg.type = CONN_UNIX;
-        test_blocking_connection(cfg);
-        test_blocking_connection_timeouts(cfg);
-        test_blocking_io_errors(cfg);
-        if (throughput) test_throughput(cfg);
-    } else {
-        test_skipped();
-    }
-
-#ifdef HIREDIS_TEST_SSL
-    if (cfg.ssl.port && cfg.ssl.host) {
-
-        redisInitOpenSSL();
-        _ssl_ctx = redisCreateSSLContext(cfg.ssl.ca_cert, NULL, cfg.ssl.cert, cfg.ssl.key, NULL, NULL);
-        assert(_ssl_ctx != NULL);
-
-        printf("\nTesting against SSL connection (%s:%d):\n", cfg.ssl.host, cfg.ssl.port);
-        cfg.type = CONN_SSL;
-
-        test_blocking_connection(cfg);
-        test_blocking_connection_timeouts(cfg);
-        test_blocking_io_errors(cfg);
-        test_invalid_timeout_errors(cfg);
-        test_append_formatted_commands(cfg);
-        if (throughput) test_throughput(cfg);
-
-        redisFreeSSLContext(_ssl_ctx);
-        _ssl_ctx = NULL;
-    }
-#endif
-
-    if (test_inherit_fd) {
-        printf("\nTesting against inherited fd (%s): ", cfg.unix_sock.path);
-        if (test_unix_socket) {
-            printf("\n");
-            cfg.type = CONN_FD;
-            test_blocking_connection(cfg);
-        } else {
-            test_skipped();
-        }
-    }
-
-    if (fails || (skips_as_fails && skips)) {
-        printf("*** %d TESTS FAILED ***\n", fails);
-        if (skips) {
-            printf("*** %d TESTS SKIPPED ***\n", skips);
-        }
-        return 1;
-    }
-
-    printf("ALL TESTS PASSED (%d skipped)\n", skips);
-    return 0;
-}
diff --git a/debian/modules/nchan/src/store/redis/hiredis/win32.h b/debian/modules/nchan/src/store/redis/hiredis/win32.h
deleted file mode 100644
index 04289c6..0000000
--- a/debian/modules/nchan/src/store/redis/hiredis/win32.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef _WIN32_HELPER_INCLUDE
-#define _WIN32_HELPER_INCLUDE
-#ifdef _MSC_VER
-
-#include <winsock2.h> /* for struct timeval */
-
-#ifndef inline
-#define inline __inline
-#endif
-
-#ifndef strcasecmp
-#define strcasecmp stricmp
-#endif
-
-#ifndef strncasecmp
-#define strncasecmp strnicmp
-#endif
-
-#ifndef va_copy
-#define va_copy(d,s) ((d) = (s))
-#endif
-
-#ifndef snprintf
-#define snprintf c99_snprintf
-
-__inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
-{
-    int count = -1;
-
-    if (size != 0)
-        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
-    if (count == -1)
-        count = _vscprintf(format, ap);
-
-    return count;
-}
-
-__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
-{
-    int count;
-    va_list ap;
-
-    va_start(ap, format);
-    count = c99_vsnprintf(str, size, format, ap);
-    va_end(ap);
-
-    return count;
-}
-#endif
-#endif /* _MSC_VER */
-
-#ifdef _WIN32
-#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
-#endif /* _WIN32 */
-
-#endif /* _WIN32_HELPER_INCLUDE */
diff --git a/debian/modules/nchan/src/store/redis/rdsstore.c b/debian/modules/nchan/src/store/redis/rdsstore.c
deleted file mode 100755
index 4080927..0000000
--- a/debian/modules/nchan/src/store/redis/rdsstore.c
+++ /dev/null
@@ -1,2648 +0,0 @@
-#include <nchan_module.h>
-
-#include <assert.h>
-#include <netinet/ip.h>
-#include "store-private.h"
-#include "store.h"
-
-#include "redis_nginx_adapter.h"
-
-#include <util/nchan_msg.h>
-#include <util/nchan_rbtree.h>
-#include <store/store_common.h>
-
-#include <store/memory/store.h>
-
-#include "redis_nodeset.h"
-#include "redis_lua_commands.h"
-
-#define REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_STEP 600 //10min
-#define REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_MAX 2628000 //whole month
-
-#define REDIS_RECONNECT_TIME 5000
-
-#define REDIS_STALL_CHECK_TIME 0 //disable for now
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REDISTORE: " fmt, ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDISTORE: " fmt, ##args)
-
-#define REDIS_CONNECTION_FOR_PUBLISH_WAIT 5000
-
-u_char            redis_subscriber_id[255];
-size_t            redis_subscriber_id_len;
-
-static rdstore_channel_head_t    *chanhead_hash = NULL;
-static size_t                     redis_publish_message_msgkey_size;
-
-
-#define CHANNEL_HASH_FIND(id_buf, p)    HASH_FIND( hh, chanhead_hash, (id_buf)->data, (id_buf)->len, p)
-#define CHANNEL_HASH_ADD(chanhead)      HASH_ADD_KEYPTR( hh, chanhead_hash, (chanhead->id).data, (chanhead->id).len, chanhead)
-#define CHANNEL_HASH_DEL(chanhead)      HASH_DEL( chanhead_hash, chanhead)
-
-#include <stdbool.h>
-#include "cmp.h"
-
-
-#define redis_subscriber_command(node, cb, pd, fmt, args...)        \
-  do {                                                               \
-    if((node)->state >= REDIS_NODE_READY) {                    \
-      redisAsyncCommand((node)->ctx.pubsub, cb, pd, fmt, ##args);      \
-    } else {                                                         \
-      ERR("Can't run redis command: no connection to redis server.");\
-    }                                                                \
-  }while(0)                                                          \
-  
-  
-  
-#define redis_sync_command(node, fmt, args...)                       \
-  do {                                                               \
-    if((node)->ctx.sync == NULL) {                                   \
-      (node)->ctx.sync = node_connect_sync_context(node);            \
-    }                                                                \
-    if((node)->ctx.sync) {                                           \
-      redisCommand((node)->ctx.sync, fmt, ##args);                   \
-    } else {                                                         \
-      ERR("Can't run redis command: no connection to redis server.");\
-    }                                                                \
-  }while(0)
-
-#define redis_sync_script(script_name, node, fmt, args...)                    \
-  redis_sync_command(node, "EVALSHA %s " fmt, redis_lua_scripts.script_name.hash, ##args)
-
-#define nchan_redis_sync_script(script_name, node, channel_id, fmt, args...)  \
-  redis_sync_script(script_name, node, "0 %b %b " fmt, STR(node->nodeset->settings.namespace), STR(channel_id), ##args)
-
-  
-  
-#define redis_command(node, cb, pd, fmt, args...)                 \
-  do {                                                               \
-    if(node->state >= REDIS_NODE_READY) {                            \
-      if((cb) != NULL) {                                               \
-        /* a reply is expected, so track this command */             \
-        node->pending_commands++;                                    \
-        nchan_update_stub_status(redis_pending_commands, 1);         \
-      }                                                              \
-      redisAsyncCommand((node)->ctx.cmd, cb, pd, fmt, ##args);       \
-    } else {                                                         \
-      node_log_error(node, "Can't run redis command: no connection to redis server.");\
-    }                                                                \
-  }while(0)                                                          \
-  
-#define redis_script(script_name, node, cb, pd, fmt, args...)                         \
-  redis_command(node, cb, pd, "EVALSHA %s " fmt, redis_lua_scripts.script_name.hash, ##args)
-
-#define nchan_redis_script(script_name, node, cb, pd, channel_id, fmt, args...)       \
-  redis_script(script_name, node, cb, pd, "0 %b %b " fmt, STR((node)->nodeset->settings.namespace), STR(channel_id), ##args)
-
-  
-#define CHECK_REPLY_STR(reply) ((reply)->type == REDIS_REPLY_STRING)
-#define CHECK_REPLY_STRVAL(reply, v) ( CHECK_REPLY_STR(reply) && ngx_strcmp((reply)->str, v) == 0 )
-#define CHECK_REPLY_STRNVAL(reply, v, n) ( CHECK_REPLY_STR(reply) && ngx_strncmp((reply)->str, v, n) == 0 )
-#define CHECK_REPLY_STATUSVAL(reply, v) ( (reply)->type == REDIS_REPLY_STATUS && ngx_strcmp((reply)->str, v) == 0 )
-#define CHECK_REPLY_INT(reply) ((reply)->type == REDIS_REPLY_INTEGER)
-#define CHECK_REPLY_INTVAL(reply, v) ( CHECK_REPLY_INT(reply) && (reply)->integer == v )
-#define CHECK_REPLY_ARRAY_MIN_SIZE(reply, size) ( (reply)->type == REDIS_REPLY_ARRAY && (reply)->elements >= (unsigned )size )
-#define CHECK_REPLY_NIL(reply) ((reply)->type == REDIS_REPLY_NIL)
-#define CHECK_REPLY_INT_OR_STR(reply) ((reply)->type == REDIS_REPLY_INTEGER || (reply)->type == REDIS_REPLY_STRING)
-  
-static ngx_int_t nchan_store_publish_generic(ngx_str_t *, redis_nodeset_t *, nchan_msg_t *, ngx_int_t, const ngx_str_t *);
-
-static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, redis_nodeset_t *);
-
-static ngx_buf_t *set_buf(ngx_buf_t *buf, u_char *start, off_t len){
-  ngx_memzero(buf, sizeof(*buf));
-  buf->start = start;
-  buf->end = start + len;
-  buf->pos = buf->start;
-  buf->last = buf->end;
-  return buf;
-}
-
-static int ngx_strmatch(ngx_str_t *str, char *match) {
-  return ngx_strncmp(str->data, match, str->len) == 0;
-}
-
-static int ngx_str_chop_if_startswith(ngx_str_t *str, char *match) {
-  char *cur, *max = (char *)str->data + str->len;
-  for(cur = (char *)str->data; cur < max; cur++, match++) {
-    if(*match == '\0') {
-      str->len -= (u_char *)cur - str->data;
-      str->data = (u_char *)cur;
-      return 1;
-    }
-    else if(*match != *cur)
-      break;
-  }
-  return 0;
-}
-
-static u_char *fwd_buf(ngx_buf_t *buf, size_t sz) {
-  u_char *ret = buf->pos;
-  buf->pos += sz;
-  return ret;
-}
-
-static void fwd_buf_to_str(ngx_buf_t *buf, size_t sz, ngx_str_t *str) {
-  str->data = fwd_buf(buf, sz);
-  str->len = sz;;
-}
-
-static bool ngx_buf_reader(cmp_ctx_t *ctx, void *data, size_t limit) {
-  ngx_buf_t   *buf=(ngx_buf_t *)ctx->buf;
-  if(buf->pos + limit > buf->last){
-    return false;
-  }
-  ngx_memcpy(data, buf->pos, limit);
-  buf->pos += limit;
-  return true;
-}
-static size_t ngx_buf_writer(cmp_ctx_t *ctx, const void *data, size_t count) {
-  return 0;
-}
-
-int nchan_store_redis_validate_url(ngx_str_t *url) {
-  redis_connect_params_t rcp;
-  return parse_redis_url(url, &rcp) == NGX_OK;
-}
-
-ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
-  u_char                  *cur, *last, *ret;
-  
-  cur = url->data;
-  last = url->data + url->len;
-  
-  
-  //ignore redis://
-  rcp->use_tls = 0;
-  if(ngx_strnstr(cur, "redis://", 8) != NULL) {
-    cur += 8;
-  }
-  else if(ngx_strnstr(cur, "rediss://", 9) != NULL) {
-    cur += 9;
-    rcp->use_tls = 1;
-  }
-  
-  //username:password@
-  if((ret = ngx_strlchr(cur, last, '@')) != NULL) {
-    u_char *split = ngx_strlchr(cur, ret, ':');
-    if(!split) {
-      return NGX_ERROR;
-    }
-    rcp->username.len = (split - cur);
-    rcp->username.data = rcp->username.len == 0 ? NULL : cur;
-    
-    rcp->password.len = (ret - split - 1);
-    rcp->password.data = rcp->password.len == 0 ? NULL : &split[1];
-    
-    cur = ret + 1;
-  }
-  else {
-    rcp->username.len = 0;
-    rcp->username.data = NULL;
-    rcp->password.len = 0;
-    rcp->password.data = NULL;
-  }
-  
-  ///port:host
-  if((ret = ngx_strlchr(cur, last, ':')) == NULL) {
-    //just host
-    rcp->port = 6379;
-    if((ret = ngx_strlchr(cur, last, '/')) == NULL) {
-      ret = last;
-    }
-    rcp->hostname.data = cur;
-    rcp->hostname.len = ret - cur;
-  }
-  else {
-    rcp->hostname.data = cur;
-    rcp->hostname.len = ret - cur;
-    cur = ret + 1;
-    
-    //port
-    if((ret = ngx_strlchr(cur, last, '/')) == NULL) {
-      ret = last;
-    }
-    rcp->port = ngx_atoi(cur, ret-cur);
-    if(rcp->port == NGX_ERROR) {
-      return NGX_ERROR;
-    }
-  }
-  cur = ret;
-  
-  if(cur[0] == '/') {
-    cur++;
-    rcp->db = ngx_atoi(cur, last-cur);
-    if(rcp->db == NGX_ERROR) {
-      rcp->db = 0;
-    }
-  }
-  else {
-    rcp->db = 0;
-  }
-
-  return NGX_OK;
-}
-
-static void redis_store_reap_chanhead(rdstore_channel_head_t *ch) {
-  if(!ch->shutting_down) {
-    assert(ch->sub_count == 0 && ch->fetching_message_count == 0);
-  }
-  
-  DBG("reap channel %V", &ch->id);
-
-  if(ch->pubsub_status == REDIS_PUBSUB_SUBSCRIBED) {
-    assert(ch->redis.nodeset->settings.storage_mode >= REDIS_MODE_DISTRIBUTED);
-    assert(ch->redis.node.pubsub);
-    ch->pubsub_status = REDIS_PUBSUB_UNSUBSCRIBED;
-    redis_subscriber_command(ch->redis.node.pubsub, NULL, NULL, "UNSUBSCRIBE %b{channel:%b}:pubsub", STR(ch->redis.nodeset->settings.namespace), STR(&ch->id));
-  }
-
-  /*
-  redis_nodeset_t *ns = ch->redis.nodeset;
-  redis_node_t *cmd = ch->redis.node.cmd;
-  redis_node_t *pubsub = ch->redis.node.pubsub;
-  */
-  
-  nodeset_dissociate_chanhead(ch);
-  
-  /*  
-  rdstore_channel_head_t *cur;
-
-
-  for(cur = nchan_slist_first(&ns->channels.all); cur != NULL; cur = nchan_slist_next(&ns->channels.all, cur)) {
-    assert(cur != ch);
-  }
-  for(cur = nchan_slist_first(&ns->channels.disconnected_cmd); cur != NULL; cur = nchan_slist_next(&ns->channels.disconnected_cmd, cur)) {
-    assert(cur != ch);
-  }
-  for(cur = nchan_slist_first(&ns->channels.disconnected_pubsub); cur != NULL; cur = nchan_slist_next(&ns->channels.disconnected_pubsub, cur)) {
-    assert(cur != ch);
-  }
-  if(cmd) {
-    for(cur = nchan_slist_first(&cmd->channels.cmd); cur != NULL; cur = nchan_slist_next(&cmd->channels.cmd, cur)) {
-      assert(cur != ch);
-    }
-    for(cur = nchan_slist_first(&cmd->channels.pubsub); cur != NULL; cur = nchan_slist_next(&cmd->channels.pubsub, cur)) {
-      assert(cur != ch);
-    }
-  }
-  if(pubsub) {
-    for(cur = nchan_slist_first(&pubsub->channels.cmd); cur != NULL; cur = nchan_slist_next(&pubsub->channels.cmd, cur)) {
-      assert(cur != ch);
-    }
-    for(cur = nchan_slist_first(&pubsub->channels.pubsub); cur != NULL; cur = nchan_slist_next(&pubsub->channels.pubsub, cur)) {
-      assert(cur != ch);
-    }
-  }
-*/  
-  
-  
-  DBG("chanhead %p (%V) is empty and expired. delete.", ch, &ch->id);
-  if(ch->keepalive_timer.timer_set) {
-    ngx_del_timer(&ch->keepalive_timer);
-  }
-  stop_spooler(&ch->spooler, 1);
-  CHANNEL_HASH_DEL(ch);
-  
-  ngx_free(ch);
-}
-
-static ngx_int_t nchan_redis_chanhead_ready_to_reap(rdstore_channel_head_t *ch, uint8_t force) {
-  if(!force) {
-    if(ch->status != INACTIVE) {
-      return NGX_DECLINED;
-    }
-    
-    if(ch->reserved > 0 ) {
-      DBG("not yet time to reap %V, %i reservations left", &ch->id, ch->reserved);
-      return NGX_DECLINED;
-    }
-    
-    if(ch->gc.time - ngx_time() > 0) {
-      DBG("not yet time to reap %V, %i sec left", &ch->id, ch->gc.time - ngx_time());
-      return NGX_DECLINED;
-    }
-    
-    if (ch->sub_count > 0) { //there are subscribers
-      DBG("not ready to reap %V, %i subs left", &ch->id, ch->sub_count);
-      return NGX_DECLINED;
-    }
-    
-    if (ch->fetching_message_count > 0) { //there are subscribers
-      DBG("not ready to reap %V, fetching %i messages", &ch->id, ch->fetching_message_count);
-      return NGX_DECLINED;
-    }
-    
-    //if(ch->pubsub_status == REDIS_PUBSUB_SUBSCRIBING) {
-    //  return NGX_DECLINED;
-    //}
-    
-    //DBG("ok to delete channel %V", &ch->id);
-    return NGX_OK;
-  }
-  else {
-    //force delete is always ok
-    return NGX_OK;
-  }
-}
-
-static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privdata);
-
-static ngx_int_t nchan_store_init_worker(ngx_cycle_t *cycle) {
-  ngx_int_t rc = NGX_OK;
-  u_char *cur;
-  cur = ngx_snprintf(redis_subscriber_id, 512, "nchan_worker:{%i:time:%i}%Z", ngx_pid, ngx_time());
-  redis_subscriber_id_len = cur - redis_subscriber_id;
-  
-  //DBG("worker id %s len %i", redis_subscriber_id, redis_subscriber_id_len);
-  
-  redis_nginx_init();
-  
-  nodeset_initialize((char *)redis_subscriber_id, redis_subscriber_callback);
-  nodeset_connect_all();
-  
-  //OLD
-  //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_connector, &rc);
-  return rc;
-}
-
-void redisCheckErrorCallback(redisAsyncContext *c, void *r, void *privdata) {
-  redisReplyOk(c, r);
-}
-int redisReplyOk(redisAsyncContext *ac, void *r) {
-  static const ngx_str_t script_error_start= ngx_string("ERR Error running script (call to f_");
-  redis_node_t         *node = ac->data;
-  redisReply *reply = (redisReply *)r;
-  if(reply == NULL) { //redis disconnected?...
-    if(ac->err) {
-      node_log_error(node, "connection to redis failed while waiting for reply - %s", ac->errstr);
-    }
-    else {
-      node_log_error(node, "got a NULL redis reply for unknown reason");
-    }
-    return 0;
-  }
-  else if(reply->type == REDIS_REPLY_ERROR) {
-    if(ngx_strncmp(reply->str, script_error_start.data, script_error_start.len) == 0 && (unsigned ) reply->len > script_error_start.len + REDIS_LUA_HASH_LENGTH) {
-      char *hash = &reply->str[script_error_start.len];
-      redis_lua_script_t  *script;
-      REDIS_LUA_SCRIPTS_EACH(script) {
-        if (ngx_strncmp(script->hash, hash, REDIS_LUA_HASH_LENGTH)==0) {
-          node_log_error(node, "REDIS SCRIPT ERROR: %s :%s", script->name, &reply->str[script_error_start.len + REDIS_LUA_HASH_LENGTH + 2]);
-          return 0;
-        }
-      }
-      node_log_error(node, "REDIS SCRIPT ERROR: (unknown): %s", reply->str);
-    }
-    else {
-      node_log_error(node, "REDIS REPLY ERROR: %s", reply->str);
-    }
-    return 0;
-  }
-  else {
-    return 1;
-  }
-}
-
-static void redisEchoCallback(redisAsyncContext *ac, void *r, void *privdata) {
-  redisReply      *reply = r;
-  redis_node_t    *node = NULL;
-  unsigned    i;
-  //nchan_channel_t * channel = (nchan_channel_t *)privdata;
-  if(ac) {
-    node = ac->data;
-    if(ac->err) {
-      node_log_error(node, "connection to redis failed - %s", ac->errstr);
-      return;
-    }
-  }
-  else {
-    node_log_error(node, "connection to redis was terminated");
-    return;
-  }
-  if(reply == NULL) {
-    node_log_error(node, "REDIS REPLY is NULL");
-    return;
-  }  
-  
-  switch(reply->type) {
-    case REDIS_REPLY_STATUS:
-      node_log_error(node, "REDIS_REPLY_STATUS  %s", reply->str);
-      break;
-      
-    case REDIS_REPLY_ERROR:
-      redisCheckErrorCallback(ac, r, privdata);
-      break;
-      
-    case REDIS_REPLY_INTEGER:
-      node_log_error(node, "REDIS_REPLY_INTEGER: %i", reply->integer);
-      break;
-      
-    case REDIS_REPLY_NIL:
-      node_log_error(node, "REDIS_REPLY_NIL: nil");
-      break;
-      
-    case REDIS_REPLY_STRING:
-      node_log_error(node, "REDIS_REPLY_STRING: %s", reply->str);
-      break;
-      
-    case REDIS_REPLY_ARRAY:
-      node_log_error(node, "REDIS_REPLY_ARRAY: %i", reply->elements);
-      for(i=0; i< reply->elements; i++) {
-        redisEchoCallback(ac, reply->element[i], "  ");
-      }
-      break;
-  }
-  //redis_subscriber_command(NULL, NULL, "UNSUBSCRIBE {channel:%b}:pubsub", str(&(channel->id)));
-}
-
-static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, nchan_compressed_msg_t *cmsg, ngx_str_t *content_type, ngx_str_t *eventsource_event, redisReply *r, uint16_t offset);
-
-#define SLOW_REDIS_REPLY 100 //ms
-
-static ngx_int_t log_redis_reply(char *name, ngx_msec_t t) {
-  ngx_msec_t   dt = ngx_current_msec - t;
-  if(dt >= SLOW_REDIS_REPLY) {
-    DBG("redis command %s took %i msec", name, dt);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t redisReply_to_ngx_int(redisReply *el, ngx_int_t *integer) {
-  if(CHECK_REPLY_INT(el)) {
-    *integer=el->integer;
-  }
-  else if(CHECK_REPLY_STR(el)) {
-    *integer=ngx_atoi((u_char *)el->str, el->len);
-  }
-  else {
-    return NGX_ERROR;
-  }
-  return NGX_OK;
-}
-
-typedef struct {
-  ngx_msec_t                    t;
-  char                         *name;
-  ngx_str_t                     channel_id;
-  nchan_msg_id_t               *msg_id;
-  ngx_str_t                     msg_key;
-} redis_get_message_from_key_data_t;
-
-static void get_msg_from_msgkey_callback(redisAsyncContext *ac, void *r, void *privdata);
-
-static ngx_int_t get_msg_from_msgkey_send(redis_nodeset_t *ns, void *pd) {
-  redis_get_message_from_key_data_t *d = pd;
-  if(nodeset_ready(ns)) {
-    redis_node_t  *node = nodeset_node_find_by_key(ns, &d->msg_key);
-    redis_script(get_message_from_key, node, &get_msg_from_msgkey_callback, d, "1 %b", STR(&d->msg_key));
-  }
-  else {
-    ngx_free(d);
-  }
-  return NGX_OK;
-}
-
-static void get_msg_from_msgkey_callback(redisAsyncContext *ac, void *r, void *privdata) {
-  redis_get_message_from_key_data_t *d = (redis_get_message_from_key_data_t *)privdata;
-  redisReply           *reply = r;
-  nchan_msg_t           msg;
-  nchan_compressed_msg_t cmsg;
-  ngx_str_t             content_type;
-  ngx_str_t             eventsource_event;
-  ngx_str_t            *chid = &d->channel_id;
-  redis_node_t         *node = ac->data;
-  
-  node->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  DBG("get_msg_from_msgkey_callback");
-  
-  log_redis_reply(d->name, d->t);
-  
-  if(!nodeset_node_reply_keyslot_ok(node, reply)) {
-    nodeset_callback_on_ready(node->nodeset, 1000, get_msg_from_msgkey_send, d);
-    return;
-  }
-  
-  if(reply) {
-    if(chid == NULL) {
-      ERR("get_msg_from_msgkey channel id is NULL");
-      return;
-    }
-    if(msg_from_redis_get_message_reply(&msg, &cmsg, &content_type, &eventsource_event, reply, 0) != NGX_OK) {
-      ERR("invalid message or message absent after get_msg_from_key");
-      return;
-    }
-    nchan_store_publish_generic(chid, node->nodeset, &msg, 0, NULL);
-  }
-  else {
-    //reply is NULL
-  }
-  ngx_free(d);
-}
-
-static bool cmp_err(cmp_ctx_t *cmp) {
-  ERR("msgpack parsing error: %s", cmp_strerror(cmp));
-  return false;
-}
-
-static bool cmp_to_str(cmp_ctx_t *cmp, ngx_str_t *str) {
-  ngx_buf_t      *mpbuf =(ngx_buf_t *)cmp->buf;
-  uint32_t        sz;
-  
-  if(cmp_read_str_size(cmp, &sz)) {
-    fwd_buf_to_str(mpbuf, sz, str);
-    return true;
-  }
-  else {
-    cmp_err(cmp);
-    return false;
-  }
-}
-
-static bool cmp_to_msg(cmp_ctx_t *cmp, nchan_msg_t *msg, nchan_compressed_msg_t *cmsg, ngx_str_t *content_type, ngx_str_t *eventsource_event) {
-  ngx_buf_t  *mpb = (ngx_buf_t *)cmp->buf;
-  uint32_t    sz;
-  uint64_t    msgtag;
-  int32_t     ttl;
-  int32_t     compression;
-  //ttl 
-  if(!cmp_read_int(cmp, &ttl)) {
-    return cmp_err(cmp);
-  }
-  assert(ttl >= 0);
-  if(ttl == 0) {
-    ttl++; // less than a second left for this message... give it a second's lease on life
-  }
-  msg->expires = ngx_time() + ttl;
-  
-  //msg id
-  if(!cmp_read_uinteger(cmp, (uint64_t *)&msg->id.time)) {
-    return cmp_err(cmp);
-  }
-  if(!cmp_read_uinteger(cmp, &msgtag)) {
-    return cmp_err(cmp);
-  }
-  else {
-    msg->id.tag.fixed[0] = msgtag;
-    msg->id.tagactive = 0;
-    msg->id.tagcount = 1;
-  }
-  
-  //msg prev_id
-  if(!cmp_read_uinteger(cmp, (uint64_t *)&msg->prev_id.time)) {
-    return cmp_err(cmp);
-  }
-  if(!cmp_read_uinteger(cmp, &msgtag)) {
-    return cmp_err(cmp);
-  }
-  else {
-    msg->prev_id.tag.fixed[0] = msgtag;
-    msg->prev_id.tagactive = 0;
-    msg->prev_id.tagcount = 1;
-  }
-  
-  //message data
-  if(!cmp_read_str_size(cmp, &sz)) {
-    return cmp_err(cmp);
-  }
-  set_buf(&msg->buf, mpb->pos, sz);
-  fwd_buf(mpb, sz);
-  msg->buf.memory = 1;
-  msg->buf.last_buf = 1;
-  msg->buf.last_in_chain = 1;
-
-  //content-type
-  if(!cmp_read_str_size(cmp, &sz)) {
-    return cmp_err(cmp);
-  }
-  fwd_buf_to_str(mpb, sz, content_type);
-  msg->content_type = sz > 0 ? content_type : NULL;
-  
-  //eventsource_event
-  if(!cmp_read_str_size(cmp, &sz)) {
-    return cmp_err(cmp);
-  }
-  fwd_buf_to_str(mpb, sz, eventsource_event);
-  msg->eventsource_event = sz > 0 ? eventsource_event : NULL;
-  
-  //compression
-  if(!cmp_read_int(cmp, &compression)) {
-    msg->compressed = NULL;
-  }
-  if(compression > 0) {
-    msg->compressed = cmsg;
-    ngx_memzero(&cmsg->buf, sizeof(cmsg->buf));
-    cmsg->compression = compression;
-  }
-  else {
-    msg->compressed = NULL;
-  }
-  
-  return true;
-}
-
-static ngx_int_t get_msg_from_msgkey(ngx_str_t *channel_id, redis_nodeset_t *nodeset, nchan_msg_id_t *msgid, ngx_str_t *msg_redis_hash_key) {
-  rdstore_channel_head_t              *head;
-  redis_get_message_from_key_data_t   *d;
-  DBG("Get message from msgkey %V", msg_redis_hash_key);
-  
-  head = nchan_store_get_chanhead(channel_id, nodeset);
-  if(head->sub_count == 0) {
-    DBG("Nobody wants this message we'll need to grab with an HMGET");
-    return NGX_OK;
-  }
-  
-  if((d=ngx_alloc(sizeof(*d) + (u_char)channel_id->len + (u_char)msg_redis_hash_key->len, ngx_cycle->log)) == 0) {
-    ERR("unable to allocate memory for callback data for message hmget");
-    return NGX_ERROR;
-  }
-  d->channel_id.data = (u_char *)&d[1];
-  nchan_strcpy(&d->channel_id, channel_id, 0);
-  
-  d->msg_key.data = d->channel_id.data + d->channel_id.len;
-  nchan_strcpy(&d->msg_key, msg_redis_hash_key, 0);
-  
-  d->t = ngx_current_msec;
-  
-  d->name = "get_message_from_key";
-  
-  //d->hcln = put_current_subscribers_in_limbo(head);
-  //assert(d->hcln != 0);
-  get_msg_from_msgkey_send(nodeset, d);
-
-  return NGX_OK;
-}
-
-static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub);
-
-static int str_match_redis_subscriber_channel(ngx_str_t *pubsub_channel, ngx_str_t *ns) {
-  ngx_str_t psch = *pubsub_channel;
-  if(pubsub_channel->len != ns->len + redis_subscriber_id_len || psch.len < ns->len) {
-    return 0;
-  }
-  if(ngx_memcmp(psch.data, ns->data, ns->len) != 0) {
-    return 0;
-  }
-  psch.data += ns->len;
-  psch.len -= ns->len;
-  
-  return ngx_strmatch(&psch, (char *)redis_subscriber_id);
-}
-
-static ngx_str_t *get_channel_id_from_pubsub_channel(ngx_str_t *pubsub_channel, ngx_str_t *ns, ngx_str_t *str_in) {
-  if(str_match_redis_subscriber_channel(pubsub_channel, ns)) {
-    return NULL;
-  }
-  str_in->data = pubsub_channel->data + ns->len + 9; //"<namespace>{channel:"
-  str_in->len = pubsub_channel->len - ns->len - 9;
-  str_in->len -= 8;//"}:pubsub"
-  return str_in;
-}
-
-static rdstore_channel_head_t *find_chanhead_for_pubsub_callback(ngx_str_t *chid) {
-  rdstore_channel_head_t *head;
-  CHANNEL_HASH_FIND(chid, head);
-  return head;
-}
-
-static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privdata) {
-  redisReply             *reply = r;
-  redisReply             *el = NULL;
-  nchan_msg_t             msg;
-  nchan_compressed_msg_t  cmsg;
-  ngx_str_t               content_type;
-  ngx_str_t               eventsource_event;
-  ngx_str_t               chid_str;
-  ngx_str_t              *chid = NULL;
-  ngx_str_t               pubsub_channel; 
-  ngx_str_t               msg_redis_hash_key = ngx_null_string;
-  ngx_uint_t              subscriber_id;
-  
-  ngx_buf_t               mpbuf;
-  cmp_ctx_t               cmp;
-  
-  rdstore_channel_head_t     *chanhead = NULL;
-  redis_node_t               *node = c->data;
-  redis_nodeset_t            *nodeset = node->nodeset;
-  ngx_str_t                  *namespace = nodeset->settings.namespace;
-  
-  msg.expires = 0;
-  msg.refcount = 0;
-  msg.parent = NULL;
-  msg.storage = NCHAN_MSG_STACK;
-
-  if(reply == NULL) return;
-  
-  if(CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3)
-   && CHECK_REPLY_STR(reply->element[0])
-   && (CHECK_REPLY_STR(reply->element[1]) || CHECK_REPLY_INT(reply->element[1]))) {
-    pubsub_channel.data = (u_char *)reply->element[1]->str;
-    pubsub_channel.len = reply->element[1]->len;
-    chid = get_channel_id_from_pubsub_channel(&pubsub_channel, namespace, &chid_str);
-  }
-  else {
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "no PUBSUB message, something else");
-    redisEchoCallback(c,r,privdata);
-    return;
-  }
-  
-  if(CHECK_REPLY_STRVAL(reply->element[0], "message") && CHECK_REPLY_STR(reply->element[2])) {
-    
-    //reply->element[1] is the pubsub channel name
-    el = reply->element[2];
-    
-    if(CHECK_REPLY_STRVAL(el, "ping") && str_match_redis_subscriber_channel(&pubsub_channel, namespace)) {
-      DBG("got pinged");
-    }
-    else if(CHECK_REPLY_STR(el)) {
-      uint32_t    array_sz;
-      unsigned    chid_present = 0;
-      ngx_str_t   extracted_channel_id;
-      unsigned    msgbuf_size_changed = 0;
-      int64_t     msgbuf_size = 0;
-      //maybe a message?
-      set_buf(&mpbuf, (u_char *)el->str, el->len);
-      cmp_init(&cmp, &mpbuf, ngx_buf_reader, NULL, ngx_buf_writer);
-      if(cmp_read_array(&cmp, &array_sz)) {
-        
-        if(array_sz != 0) {
-          uint32_t      sz;
-          ngx_str_t     msg_type;
-          cmp_read_str_size(&cmp ,&sz);
-          fwd_buf_to_str(&mpbuf, sz, &msg_type);
-          
-          if(ngx_str_chop_if_startswith(&msg_type, "max_msgs+")) {
-            if(cmp_read_integer(&cmp, &msgbuf_size))
-              msgbuf_size_changed = 1; 
-            else
-              cmp_err(&cmp);
-          }
-          
-          if(ngx_str_chop_if_startswith(&msg_type, "ch+")) {
-            if(cmp_read_str_size(&cmp, &sz)) {
-              fwd_buf_to_str(&mpbuf, sz, &extracted_channel_id);
-              chid = &extracted_channel_id;
-            }
-            else {
-              cmp_err(&cmp);
-            }
-          }
-          //else {
-          //  chid already set from the pubsub channel name
-          //}
-          
-          if(msgbuf_size_changed && (chanhead = nchan_store_get_chanhead(chid, nodeset)) != NULL) {
-            chanhead->spooler.fn->broadcast_notice(&chanhead->spooler, NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE, (void *)(intptr_t )msgbuf_size);
-          }
-          
-          if(!chanhead) {
-            chanhead = find_chanhead_for_pubsub_callback(chid);
-          }
-          
-          if(ngx_strmatch(&msg_type, "msg")) {
-            assert(array_sz >= 9 + msgbuf_size_changed + chid_present);
-            if(chanhead && cmp_to_msg(&cmp, &msg, &cmsg, &content_type, &eventsource_event)) {
-              //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "got msg %V", msgid_to_str(&msg));
-              nchan_store_publish_generic(chid, chanhead ? chanhead->redis.nodeset : nodeset, &msg, 0, NULL);
-            }
-            else {
-              ERR("thought there'd be a channel for msg");
-            }
-          }
-          else if(ngx_strmatch(&msg_type, "msgkey")) {
-            assert(array_sz == 4 + msgbuf_size_changed + chid_present);
-            if(chanhead != NULL) {
-              uint64_t              msgtag;
-              nchan_msg_id_t        msgid;
-              
-              if(!cmp_read_uinteger(&cmp, (uint64_t *)&msgid.time)) {
-                cmp_err(&cmp);
-                return;
-              }
-              
-              if(!cmp_read_uinteger(&cmp, &msgtag)) {
-                cmp_err(&cmp);
-                return;
-              }
-              else {
-                msgid.tag.fixed[0] = msgtag;
-                msgid.tagactive = 0;
-                msgid.tagcount = 1;
-              }
-              
-              if(cmp_to_str(&cmp, &msg_redis_hash_key)) {
-                get_msg_from_msgkey(chid, chanhead ? chanhead->redis.nodeset : node->nodeset, &msgid, &msg_redis_hash_key);
-              }
-            }
-            else {
-              ERR("thought there'd be a channel id around for msgkey");
-            }
-          }
-          else if(ngx_strmatch(&msg_type, "alert") && array_sz > 1) {
-            ngx_str_t    alerttype;
-            
-            if(!cmp_to_str(&cmp, &alerttype)) {
-              return;
-            }
-            
-            if(ngx_strmatch(&alerttype, "delete channel") && array_sz > 2) {
-              if(cmp_to_str(&cmp, &extracted_channel_id)) {
-                rdstore_channel_head_t *doomed_channel;
-                nchan_store_publish_generic(&extracted_channel_id, nodeset, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
-                doomed_channel = nchan_store_get_chanhead(&extracted_channel_id, nodeset);
-                redis_chanhead_gc_add(doomed_channel, 0, "channel deleted");
-              }
-              else {
-                ERR("unexpected \"delete channel\" msgpack message from redis");
-              }
-            }
-            else if(ngx_strmatch(&alerttype, "unsub one") && array_sz > 3) {
-              if(cmp_to_str(&cmp, &extracted_channel_id)) {
-                cmp_to_str(&cmp, &extracted_channel_id);
-                cmp_read_uinteger(&cmp, (uint64_t *)&subscriber_id);
-                //TODO
-              }
-              ERR("unsub one not yet implemented");
-            }
-            else if(ngx_strmatch(&alerttype, "unsub all") && array_sz > 1) {
-              if(cmp_to_str(&cmp, &extracted_channel_id)) {
-                nchan_store_publish_generic(&extracted_channel_id, nodeset, NULL, NGX_HTTP_CONFLICT, &NCHAN_HTTP_STATUS_409);
-              }
-            }
-            else if(ngx_strmatch(&alerttype, "unsub all except")) {
-              if(cmp_to_str(&cmp, &extracted_channel_id)) {
-                cmp_read_uinteger(&cmp, (uint64_t *)&subscriber_id);
-                //TODO
-              }
-              ERR("unsub all except not yet  implemented");
-            }
-            else if(ngx_strmatch(&alerttype, "subscriber info")) {
-              uint64_t request_id;
-              cmp_read_uinteger(&cmp, &request_id);
-              
-              if((chanhead = nchan_store_get_chanhead(chid, nodeset)) == NULL) {
-                ERR("received invalid subscriber info notice with bad channel name");
-              }
-              else {
-                chanhead->spooler.fn->broadcast_notice(&chanhead->spooler, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, (void *)(intptr_t )request_id);
-              }
-            }
-            
-            else {
-              ERR("unexpected msgpack alert from redis");
-            }
-          }
-          else {
-            ERR("unexpected msgpack message from redis");
-          }
-        }
-        else {
-          ERR("unexpected msgpack object from redis");
-        }
-      }
-      else {
-        ERR("invalid msgpack message from redis: %s", cmp_strerror(&cmp));
-      }
-    }
-
-    else { //not a string
-      redisEchoCallback(c, el, NULL);
-    }
-  }
-
-  else if(CHECK_REPLY_STRVAL(reply->element[0], "subscribe") && CHECK_REPLY_INT(reply->element[2])) {
-    
-    if(chid) {
-      chanhead = find_chanhead_for_pubsub_callback(chid);
-      if(chanhead != NULL) {
-        if(chanhead->pubsub_status != REDIS_PUBSUB_SUBSCRIBING) {
-          ERR("expected previous pubsub_status for channel %p (id: %V) to be REDIS_PUBSUB_SUBSCRIBING (%i), was %i", chanhead, &chanhead->id, REDIS_PUBSUB_SUBSCRIBING, chanhead->pubsub_status);
-        }
-        chanhead->pubsub_status = REDIS_PUBSUB_SUBSCRIBED;
-        
-        switch(chanhead->status) {
-          case NOTREADY:
-            chanhead->status = READY;
-            chanhead->spooler.fn->handle_channel_status_change(&chanhead->spooler);
-            //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "REDIS: PUB/SUB subscribed to %s, chanhead %p now READY.", reply->element[1]->str, chanhead);
-            break;
-          case READY:
-            ERR("REDIS: PUB/SUB already subscribed to %s, chanhead %p (id %V) already READY.", reply->element[1]->str, chanhead, &chanhead->id);
-            break;
-          case INACTIVE:
-            // this is fine, inactive channels can be pubsubbed, they will be garbage collected
-            // later if needed
-            break;
-          default:
-            ERR("REDIS: PUB/SUB really unexpected chanhead status %i", chanhead->status);
-            assert(0);
-            //not sposed to happen
-        }
-      }
-      else {
-        ERR("received SUBSCRIBE acknowledgement for unknown channel %V", chid);
-      }
-    }
-    else {
-      DBG("subscribed to worker channel %s", redis_subscriber_id);
-    }
-    
-    DBG("REDIS: PUB/SUB subscribed to %s (%i total)", reply->element[1]->str, reply->element[2]->integer);
-  }
-  else if(CHECK_REPLY_STRVAL(reply->element[0], "unsubscribe") && CHECK_REPLY_INT(reply->element[2])) {
-    
-    if(chid) {
-      DBG("received UNSUBSCRIBE acknowledgement for channel %V", chid);
-    }
-    else {
-      DBG("received UNSUBSCRIBE acknowledgement for worker channel %s", redis_subscriber_id);
-    }
-  }
-  
-  else {
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "Unexpected PUBSUB message %s", reply->element[0]);
-    redisEchoCallback(c,r,privdata);
-  }
-}
-
-static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub);
-static ngx_int_t redis_subscriber_unregister(rdstore_channel_head_t *chanhead, subscriber_t *sub, uint8_t shutting_down);
-static void spooler_add_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
-  rdstore_channel_head_t *head = (rdstore_channel_head_t *)privdata;
-  head->sub_count++;
-  if(sub->type == INTERNAL) {
-    head->internal_sub_count++;
-  }
-  redis_subscriber_register(head, sub);
-}
-
-static void spooler_dequeue_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
-  //need individual subscriber
-  //TODO
-  rdstore_channel_head_t *head = (rdstore_channel_head_t *)privdata;
-  
-  head->sub_count--;
-  if(sub->type == INTERNAL) {
-    head->internal_sub_count--;
-  }
-  
-  redis_subscriber_unregister(head, sub, head->shutting_down);
-  
-  if(head->sub_count == 0 && head->fetching_message_count == 0) {
-    redis_chanhead_gc_add(head, 0, "sub count == 0 and fetching_message_count == 0 after spooler dequeue");
-  }
-  
-}
-
-static void spooler_use_handler(channel_spooler_t *spl, void *d) {
-  //nothing. 
-}
-
-void spooler_get_message_start_handler(channel_spooler_t *spl, void *pd) {
-  ((rdstore_channel_head_t *)pd)->fetching_message_count++;
-}
-
-void spooler_get_message_finish_handler(channel_spooler_t *spl, void *pd) {
-  ((rdstore_channel_head_t *)pd)->fetching_message_count--;
-  assert(((rdstore_channel_head_t *)pd)->fetching_message_count >= 0);
-}
-
-static ngx_int_t start_chanhead_spooler(rdstore_channel_head_t *head) {
-  static uint8_t channel_buffer_complete = 1;
-  spooler_fetching_strategy_t spooling_strategy;
-  static channel_spooler_handlers_t handlers = {
-    spooler_add_handler,
-    spooler_dequeue_handler,
-    NULL,
-    spooler_use_handler,
-    spooler_get_message_start_handler,
-    spooler_get_message_finish_handler
-  };
-  nchan_loc_conf_t *lcf = head->redis.nodeset->first_loc_conf; //any loc_conf that refers to this nodeset will work. 
-  //the spooler needs it to pass to get_message calls, which in rdstore's case only cares about the nodeset referenced in the loc_conf
-  if(head->redis.nodeset->settings.storage_mode == REDIS_MODE_DISTRIBUTED_NOSTORE) {
-    spooling_strategy = NCHAN_SPOOL_PASSTHROUGH;
-  }
-  else {
-    spooling_strategy = NCHAN_SPOOL_FETCH;
-  }
-  
-  start_spooler(&head->spooler, &head->id, &head->status, &channel_buffer_complete, &nchan_store_redis, lcf, spooling_strategy, &handlers, head);
-  return NGX_OK;
-}
-
-static void redis_subscriber_register_cb(redisAsyncContext *c, void *vr, void *privdata);
-
-typedef struct {
-  rdstore_channel_head_t *chanhead;
-  unsigned                generation;
-  subscriber_t           *sub;
-} redis_subscriber_register_t;
-
-static ngx_int_t redis_subscriber_register_send(redis_nodeset_t *nodeset, void *pd) {
-  redis_subscriber_register_t   *d = pd;
-  if(nodeset_ready(nodeset)) {
-    d->chanhead->reserved++;
-    redis_node_t *node = nodeset_node_find_by_chanhead(d->chanhead);
-    
-    nchan_redis_script(subscriber_register, node, &redis_subscriber_register_cb, d, &d->chanhead->id,
-                       "- %i %i 1",
-                       REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_STEP,
-                       ngx_time()
-                      );
-  }
-  else {
-    d->sub->fn->release(d->sub, 0);
-    ngx_free(d);
-  }
-  return NGX_OK;
-}
-
-
-static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub) {
-  redis_subscriber_register_t *sdata=NULL;
-  if((sdata = ngx_alloc(sizeof(*sdata), ngx_cycle->log)) == NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "No memory for sdata. Part IV, subparagraph 12 of the Cryptic Error Series.");
-    return NGX_ERROR;
-  }
-  sdata->chanhead = chanhead;
-  sdata->generation = chanhead->generation;
-  sdata->sub = sub;
-  
-  sub->fn->reserve(sub);
-  
-  //input: keys: [], values: [channel_id, subscriber_id, active_ttl]
-  //  'subscriber_id' can be '-' for new id, or an existing id
-  //  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
-  //output: subscriber_id, num_current_subscribers, next_keepalive_time
-  redis_subscriber_register_send(chanhead->redis.nodeset, sdata);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t redis_subscriber_register_send_retry_wrapper(redis_nodeset_t *nodeset, void *pd) {
-  redis_subscriber_register_t   *d = pd;
-  d->chanhead->reserved--;
-  return redis_subscriber_register_send(nodeset, pd);
-}
-
-static void redis_subscriber_register_cb(redisAsyncContext *c, void *vr, void *privdata) {
-  redis_subscriber_register_t *sdata= (redis_subscriber_register_t *) privdata;
-  redisReply                  *reply = (redisReply *)vr;
-  redis_node_t                *node = c->data;
-  int                          keepalive_ttl;
-  
-  node->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  sdata->chanhead->reserved--;
-  
-  if(!nodeset_node_reply_keyslot_ok(node, reply)) {
-    sdata->chanhead->reserved++;
-    nodeset_callback_on_ready(node->nodeset, 1000, redis_subscriber_register_send_retry_wrapper, sdata);
-    return; 
-  }
-  
-  if (!redisReplyOk(c, reply)) {
-    //TODO: fail less silently, maybe retry subscriber registration?
-    sdata->sub->fn->release(sdata->sub, 0);
-    ngx_free(sdata);
-    return;
-  }
-  
-  if(  CHECK_REPLY_ARRAY_MIN_SIZE(reply, 4)
-    && CHECK_REPLY_INT(reply->element[3])
-  ) {
-    //notify about channel buffer size if it's present
-    sdata->sub->fn->notify(sdata->sub, NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE, (void *)(intptr_t )reply->element[3]->integer);
-  }
-  
-  if(sdata->generation == sdata->chanhead->generation) {
-    //is the subscriber     
-    //TODO: set subscriber id
-    //sdata->sub->id = reply->element[1]->integer;
-  }
-  
-  sdata->sub->fn->release(sdata->sub, 0);
-  sdata->sub = NULL; //don't use it anymore, it might have been freed
-  
-  if ( !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3) || !CHECK_REPLY_INT(reply->element[1]) || !CHECK_REPLY_INT(reply->element[2])) {
-    //no good
-    //TODO: fail less silently, maybe retry subscriber registration?
-    redisEchoCallback(c,reply,privdata);
-    ngx_free(sdata);
-    return;
-  }
-  
-  keepalive_ttl = reply->element[2]->integer;
-  if(keepalive_ttl > 0) {
-    if(!sdata->chanhead->keepalive_timer.timer_set) {
-      ngx_add_timer(&sdata->chanhead->keepalive_timer, keepalive_ttl * 1000);
-    }
-  }
-  ngx_free(sdata);
-}
-
-
-typedef struct {
-  ngx_str_t    *channel_id;
-  time_t        channel_timeout;
-  unsigned      allocd:1;
-} subscriber_unregister_data_t;
-
-static void redis_subscriber_unregister_cb(redisAsyncContext *c, void *r, void *privdata);
-static ngx_int_t redis_subscriber_unregister_send(redis_nodeset_t *nodeset, void *pd) {
-  //input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]
-  // 'subscriber_id' is an existing id
-  // 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
-  //output: subscriber_id, num_current_subscribers
-  subscriber_unregister_data_t *d = pd;
-  if(nodeset_ready(nodeset)) {
-    redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, d->channel_id);
-    nchan_redis_script( subscriber_unregister, node, &redis_subscriber_unregister_cb, NULL, 
-      d->channel_id, "%i %i", 
-                       0/*TODO: sub->id*/,
-                       d->channel_timeout
-                      );
-  }
-  if(d->allocd) {
-    ngx_free(d);
-  }
-  return NGX_OK;
-}
-
-static void redis_subscriber_unregister_cb(redisAsyncContext *c, void *r, void *privdata) {
-  redisReply      *reply = r;
-  redis_node_t    *node = c->data;
-  
-  node->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  if(reply && reply->type == REDIS_REPLY_ERROR) {
-    ngx_str_t    errstr;
-    ngx_str_t    countstr;
-    ngx_str_t    channel_id;
-    ngx_int_t    channel_timeout;
-    
-    errstr.data = (u_char *)reply->str;
-    errstr.len = strlen(reply->str);
-    
-    if(ngx_str_chop_if_startswith(&errstr, "CLUSTER KEYSLOT ERROR. ")) {
-      nodeset_node_keyslot_changed(node);
-      nchan_scan_until_chr_on_line(&errstr, &countstr, ' ');
-      channel_timeout = ngx_atoi(countstr.data, countstr.len);
-      channel_id = errstr;
-      
-      subscriber_unregister_data_t  *d = ngx_alloc(sizeof(*d) + sizeof(ngx_str_t) + channel_id.len, ngx_cycle->log);
-      if(!d) {
-        ERR("can't allocate add_fakesub_data for CLUSTER KEYSLOT ERROR retry");
-        return;
-      }
-      d->channel_timeout = channel_timeout;
-      d->channel_id = (ngx_str_t *)&d[1];
-      d->channel_id->data = (u_char *)&d->channel_id[1];
-      d->allocd = 1;
-      nchan_strcpy(d->channel_id, &channel_id, 0);
-      nodeset_callback_on_ready(node->nodeset, 1000, redis_subscriber_unregister_send, d);
-      return;
-    }
-    
-  }
-  redisCheckErrorCallback(c, r, privdata);
-}
-
-static ngx_int_t redis_subscriber_unregister(rdstore_channel_head_t *chanhead, subscriber_t *sub, uint8_t shutting_down) {
-  nchan_loc_conf_t  *cf = sub->cf;;
-  
-  if(!shutting_down) {
-    subscriber_unregister_data_t d;
-    d.channel_id = &chanhead->id;
-    d.channel_timeout = cf->channel_timeout;
-    d.allocd = 0;
-    redis_subscriber_unregister_send(chanhead->redis.nodeset, &d);
-  }
-  else {
-    if(nodeset_ready(chanhead->redis.nodeset)) {
-      redis_node_t   *node = nodeset_node_find_by_chanhead(chanhead);
-      nchan_redis_sync_script(subscriber_unregister, node, &chanhead->id, "%i %i", 
-                              0/*TODO: sub->id*/,
-                              cf->channel_timeout
-                            );
-    }
-  }
-  return NGX_OK;
-}
-
-
-static void redisChannelKeepaliveCallback(redisAsyncContext *c, void *vr, void *privdata);
-
-static ngx_int_t redisChannelKeepaliveCallback_send(redis_nodeset_t *ns, void *pd) {
-  rdstore_channel_head_t   *head = pd;
-  time_t                    ttl;
-  //TODO: optimize this
-  redis_node_t *node = nodeset_node_find_by_channel_id(head->redis.nodeset, &head->id);
-  if(nodeset_ready(ns)) {
-    head->reserved++;
-    ttl = REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_STEP * (1+head->keepalive_times_sent);
-    if(ttl > REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_MAX) { //1 week at most
-      ttl = REDIS_CHANNEL_EMPTY_BUT_SUBSCRIBED_TTL_MAX;
-    }
-    nchan_redis_script(channel_keepalive, node, &redisChannelKeepaliveCallback, head, &head->id, "%i", ttl);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t redisChannelKeepaliveCallback_retry_wrapper(redis_nodeset_t *ns, void *pd) {
-  rdstore_channel_head_t   *head = pd;
-  head->reserved--;
-  return redisChannelKeepaliveCallback_send(ns, pd);
-}
-
-static void redisChannelKeepaliveCallback(redisAsyncContext *c, void *vr, void *privdata) {
-  rdstore_channel_head_t   *head = (rdstore_channel_head_t *)privdata;
-  redisReply               *reply = (redisReply *)vr;
-  redis_node_t             *node = c->data;
-  
-  head->reserved--;
-  node->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  if(!nodeset_node_reply_keyslot_ok(node, reply)) {
-    head->reserved++;
-    nodeset_callback_on_ready(node->nodeset, 1000, redisChannelKeepaliveCallback_retry_wrapper, head);
-    return;
-  }
-  else {
-    head->keepalive_times_sent++;
-  }
-  
-  if(redisReplyOk(c, vr)) {
-    assert(CHECK_REPLY_INT(reply));
-    
-    //reply->integer == -1 means "let it disappear" (see channel_keepalive.lua)
-    
-    if(reply->integer != -1 && !head->keepalive_timer.timer_set) {
-      ngx_add_timer(&head->keepalive_timer, reply->integer * 1000);
-    }
-  }
-  
-}
-
-static void redis_channel_keepalive_timer_handler(ngx_event_t *ev) {
-  rdstore_channel_head_t   *head = ev->data;
-  if(ev->timedout) {
-    ev->timedout=0;
-    if(head->pubsub_status != REDIS_PUBSUB_SUBSCRIBED || head->status == NOTREADY) {
-      //no use trying to keepalive a not-ready (possibly disconnected) chanhead
-      DBG("Tried sending channel keepalive when channel is not ready");
-      ngx_add_timer(ev, REDIS_RECONNECT_TIME); //retry after reconnect timeout
-    }
-    else {
-      redisChannelKeepaliveCallback_send(head->redis.nodeset, head);
-    }
-  }
-}
-
-ngx_int_t ensure_chanhead_pubsub_subscribed_if_needed(rdstore_channel_head_t *ch) {
-  redis_node_t       *pubsub_node;
-  ngx_str_t          *namespace;
-  if( ch->pubsub_status != REDIS_PUBSUB_SUBSCRIBED && ch->pubsub_status != REDIS_PUBSUB_SUBSCRIBING
-   && ch->redis.nodeset->settings.storage_mode >= REDIS_MODE_DISTRIBUTED
-   && nodeset_ready(ch->redis.nodeset)
-  ) {
-    pubsub_node = nodeset_node_pubsub_find_by_chanhead(ch);
-    namespace = ch->redis.nodeset->settings.namespace;
-    DBG("SUBSCRIBING to %V{channel:%V}:pubsub", namespace, &ch->id);
-    ch->pubsub_status = REDIS_PUBSUB_SUBSCRIBING;
-    redis_subscriber_command(pubsub_node, redis_subscriber_callback, NULL, "SUBSCRIBE %b{channel:%b}:pubsub", STR(namespace), STR(&ch->id));
-  }
-  return NGX_OK;
-}
-
-ngx_int_t redis_chanhead_catch_up_after_reconnect(rdstore_channel_head_t *ch) {
-  return spooler_catch_up(&ch->spooler);
-}
-
-static rdstore_channel_head_t *create_chanhead(ngx_str_t *channel_id, redis_nodeset_t *ns) {
-  rdstore_channel_head_t   *head;
-  
-  head=ngx_calloc(sizeof(*head) + sizeof(u_char)*(channel_id->len), ngx_cycle->log);
-  if(head==NULL) {
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "can't allocate memory for (new) channel subscriber head");
-    return NULL;
-  }
-  head->id.len = channel_id->len;
-  head->id.data = (u_char *)&head[1];
-  ngx_memcpy(head->id.data, channel_id->data, channel_id->len);
-  head->sub_count=0;
-  head->fetching_message_count=0;
-  head->redis_subscriber_privdata = NULL;
-  head->status = NOTREADY;
-  head->pubsub_status = REDIS_PUBSUB_UNSUBSCRIBED;
-  head->generation = 0;
-  head->last_msgid.time=0;
-  head->last_msgid.tag.fixed[0]=0;
-  head->last_msgid.tagcount = 1;
-  head->last_msgid.tagactive = 0;
-  head->shutting_down = 0;
-  head->reserved = 0;
-  head->keepalive_times_sent = 0;
-  
-  head->gc.in_reaper = 0;
-  head->gc.time = 0;
-  head->gc.prev = NULL;
-  head->gc.next = NULL;
-  
-  if(head->id.len >= 5 && ngx_strncmp(head->id.data, "meta/", 5) == 0) {
-    head->meta = 1;
-  }
-  else {
-    head->meta = 0;
-  }
-
-  ngx_memzero(&head->keepalive_timer, sizeof(head->keepalive_timer));
-  nchan_init_timer(&head->keepalive_timer, redis_channel_keepalive_timer_handler, head);
-  
-  if(channel_id->len > 2) { // absolutely no multiplexed channels allowed
-    assert(ngx_strncmp(head->id.data, "m/", 2) != 0);
-  }
-  
-  head->redis.nodeset = ns;
-  head->redis.generation = 0;
-  head->redis.node.cmd = NULL;
-  head->redis.node.pubsub = NULL;
-  ngx_memzero(&head->redis.slist, sizeof(head->redis.slist));
-  
-  if(head->redis.nodeset->settings.storage_mode == REDIS_MODE_BACKUP) {
-    head->status = READY;
-  }
-  
-  head->spooler.running=0;
-  start_chanhead_spooler(head);
-  if(head->meta) {
-    head->spooler.publish_events = 0;
-  }
-  
-  ensure_chanhead_pubsub_subscribed_if_needed(head);
-  CHANNEL_HASH_ADD(head);
-  
-  return head;
-}
-
-static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, redis_nodeset_t *nodeset) {
-  rdstore_channel_head_t    *head;
-  
-  CHANNEL_HASH_FIND(channel_id, head); //BUG: this doesn't account for namespacing!!
-  if(head==NULL) {
-    head = create_chanhead(channel_id, nodeset);
-  }
-  if(head == NULL) {
-    ERR("can't create chanhead for redis store");
-    return NULL;
-  }
-  
-  if (head->status == INACTIVE) { //recycled chanhead
-    ensure_chanhead_pubsub_subscribed_if_needed(head);
-    redis_chanhead_gc_withdraw(head);
-    
-    if(head->redis.nodeset->settings.storage_mode == REDIS_MODE_BACKUP) {
-      head->status = READY;
-    }
-    else {
-      head->status = head->pubsub_status == REDIS_PUBSUB_SUBSCRIBED ? READY : NOTREADY;
-    }
-  }
-
-  if(!head->spooler.running) {
-    DBG("Spooler for channel %p %V wasn't running. start it.", head, &head->id);
-    start_chanhead_spooler(head);
-  }
-  
-  return head;
-}
-
-ngx_int_t redis_chanhead_gc_add(rdstore_channel_head_t *head, ngx_int_t expire, const char *reason) {
-  assert(head->sub_count == 0);
-  nchan_reaper_t *reaper = &head->redis.nodeset->chanhead_reaper;
-  if(!head->gc.in_reaper) {
-    assert(head->status != INACTIVE);
-    head->status = INACTIVE;
-    head->gc.time = ngx_time() + (expire == 0 ? NCHAN_CHANHEAD_EXPIRE_SEC : expire);
-    head->gc.in_reaper = 1;
-    
-    nchan_reaper_add(reaper, head);
-    
-    DBG("gc_add chanhead %V to %s (%s)", &head->id, reaper->name, reason);
-  }
-  else {
-    ERR("gc_add chanhead %V to %s: already added (%s)", &head->id, reaper->name, reason);
-  }
-
-  return NGX_OK;
-}
-
-ngx_int_t redis_chanhead_gc_withdraw(rdstore_channel_head_t *chanhead) {
-  if(chanhead->gc.in_reaper) {
-    nchan_reaper_t *reaper = &chanhead->redis.nodeset->chanhead_reaper;
-    DBG("gc_withdraw chanhead %s from %V", reaper->name, &chanhead->id);
-    assert(chanhead->status == INACTIVE);
-    
-    nchan_reaper_withdraw(reaper, chanhead);
-    chanhead->gc.in_reaper = 0;
-  }
-  else {
-    DBG("gc_withdraw chanhead (%V), but not in gc reaper", &chanhead->id);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_publish_generic(ngx_str_t *channel_id, redis_nodeset_t *nodeset, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line){
-  rdstore_channel_head_t   *head;
-  ngx_int_t                 ret;
-  //redis_channel_head_cleanup_t *hcln;
-  
-  
-  
-  head = nchan_store_get_chanhead(channel_id, nodeset);
-  
-  if(head->sub_count > 0) {
-    if(msg) {
-      assert(msg->id.tagcount == 1);
-      head->last_msgid.time = msg->id.time;
-      head->last_msgid.tag.fixed[0] = msg->id.tag.fixed[0];
-      head->last_msgid.tagcount = 1;
-      head->last_msgid.tagactive = 0;
-      
-      head->spooler.fn->respond_message(&head->spooler, msg);
-    }
-    else {
-      head->spooler.fn->broadcast_status(&head->spooler, status_code, status_line);
-    }
-    ret= NGX_OK;
-  }
-  else {
-    ret= NCHAN_MESSAGE_QUEUED;
-  }
-  return ret;
-}
-
-
-static ngx_int_t redis_array_to_channel(redisReply *r, nchan_channel_t *ch) {
-  ngx_str_t       msgid;
-  nchan_msg_id_t  zeroid = NCHAN_OLDEST_MSGID;
-  
-  if ( CHECK_REPLY_ARRAY_MIN_SIZE(r, 5)
-    && CHECK_REPLY_INT(r->element[0])
-    && CHECK_REPLY_INT(r->element[1])
-    && CHECK_REPLY_INT(r->element[2])
-    && CHECK_REPLY_STR(r->element[3])
-    && CHECK_REPLY_INT(r->element[4])) {
-    
-    //channel info
-    ch->expires = ngx_time() + r->element[0]->integer;
-    ch->last_seen = r->element[1]->integer;
-    ch->subscribers = r->element[2]->integer;
-  
-    msgid.data = (u_char *)r->element[3]->str;
-    msgid.len = r->element[3]->len;
-      
-    if(msgid.len == 0) {
-      ch->last_published_msg_id = zeroid;
-    }
-    else if(nchan_parse_compound_msgid(&ch->last_published_msg_id, &msgid, 1) != NGX_OK) {
-      ERR("failed to parse last-msgid %V from redis", &msgid);
-    }
-  
-    ch->messages = r->element[4]->integer;
-    
-    //no id?..
-    ch->id.len=0;
-    ch->id.data=NULL;
-    
-    //queued messages
-    if( CHECK_REPLY_ARRAY_MIN_SIZE(r, 6)
-      && CHECK_REPLY_INT(r->element[5])) {
-      
-      ch->messages = r->element[5]->integer;
-    }
-    
-    return NGX_OK;
-  }
-  else if(CHECK_REPLY_NIL(r)) {
-    return NGX_DECLINED;
-  }
-  else {
-    return NGX_ERROR;
-  }
-}
-
-typedef struct {
-  ngx_msec_t           t;
-  char                *name;
-  ngx_str_t           *channel_id;
-  callback_pt          callback;
-  void                *privdata;
-} redis_channel_callback_data_t;
-
-#define CREATE_CALLBACK_DATA(d, nodeset, cf, namestr, channel_id, callback, privdata) \
-  do {                                                                       \
-    if ((d = ngx_alloc(sizeof(*d) + ((nodeset)->cluster.enabled ? (sizeof(*channel_id) + channel_id->len) : 0), ngx_cycle->log)) == NULL) { \
-      ERR("Can't allocate redis %s channel callback data", namestr);         \
-      return NGX_ERROR;                                                      \
-    }                                                                        \
-    d->t = ngx_current_msec;                                                 \
-    d->name = namestr;                                                       \
-    if((nodeset)->cluster.enabled) {                                            \
-      /* might need to use channel id later to retry the command */          \
-      d->channel_id = (ngx_str_t *)&d[1];                                    \
-      d->channel_id->data = (u_char *)&d->channel_id[1];                     \
-      nchan_strcpy(d->channel_id, channel_id, 0);                            \
-    }                                                                        \
-    else {                                                                   \
-      d->channel_id = channel_id;                                            \
-    }                                                                        \
-    d->callback = callback;                                                  \
-    d->privdata = privdata;                                                  \
-  } while(0)
-
-static void redisChannelInfoCallback(redisAsyncContext *c, void *r, void *privdata) {
-  redisReply *reply=r;
-  redis_channel_callback_data_t *d=(redis_channel_callback_data_t *)privdata;
-  nchan_channel_t channel;
-  ngx_memzero(&channel, sizeof(channel)); // for ddebugging. this should be removed later.
-  
-  log_redis_reply(d->name, d->t);
-  
-  if(d->callback) {
-    if(reply) {
-      switch(redis_array_to_channel(reply, &channel)) {
-        case NGX_OK:
-          d->callback(NGX_OK, &channel, d->privdata);
-          break;
-        case NGX_DECLINED: //not found
-          d->callback(NGX_OK, NULL, d->privdata);
-          break;
-        case NGX_ERROR:
-        default:
-          redisEchoCallback(c, r, privdata);
-          d->callback(NGX_ERROR, NULL, d->privdata);
-      }
-    }
-    else {
-      d->callback(NGX_ERROR, NULL, d->privdata);
-    }
-  }
-}
-
-static void redisChannelDeleteCallback(redisAsyncContext *c, void *r, void *privdata);
-
-static ngx_int_t nchan_store_delete_channel_send(redis_nodeset_t *ns, void *pd) {
-  redis_channel_callback_data_t *d = pd;
-  if(nodeset_ready(ns)) {
-    redis_node_t *node = nodeset_node_find_by_channel_id(ns, d->channel_id);
-    nchan_redis_script(delete, node, &redisChannelDeleteCallback, d, d->channel_id, "");
-    return NGX_OK;
-  }
-  else {
-    redisChannelDeleteCallback(NULL, NULL, d);
-    return NGX_ERROR;
-  }
-}
-
-static void redisChannelDeleteCallback(redisAsyncContext *ac, void *r, void *privdata) {
-  redis_node_t  *node;
-  
-  nchan_update_stub_status(redis_pending_commands, -1);
-  if(ac) {
-    node = ac->data;
-    node->pending_commands--;
-    
-    if(!nodeset_node_reply_keyslot_ok(node, (redisReply *)r)) {
-      nodeset_callback_on_ready(node->nodeset, 1000, nchan_store_delete_channel_send, privdata);
-      return;
-    }
-  }
-  redisChannelInfoCallback(ac, r, privdata);
-  ngx_free(privdata);
-}
-
-static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  redis_channel_callback_data_t *d;
-  redis_nodeset_t               *ns = nodeset_find(&cf->redis);
-  CREATE_CALLBACK_DATA(d, ns, cf, "delete", channel_id, callback, privdata);
-
-  return nchan_store_delete_channel_send(ns, d);
-}
-
-
-static void redisChannelFindCallback(redisAsyncContext *c, void *r, void *privdata);
-
-static ngx_int_t nchan_store_find_channel_send(redis_nodeset_t *ns, void *pd) {
-  redis_channel_callback_data_t *d = pd;
-  if(nodeset_ready(ns)) {
-    redis_node_t *node = nodeset_node_find_by_channel_id(ns, d->channel_id);
-    nchan_redis_script(find_channel, node, &redisChannelFindCallback, d, d->channel_id, "");
-  }
-  else {
-    redisChannelFindCallback(NULL, NULL, d);
-  }
-  return NGX_OK;
-}
-
-static void redisChannelFindCallback(redisAsyncContext *ac, void *r, void *privdata) {
-  redis_node_t                 *node = NULL;
-  
-  if(ac) {
-    node = ac->data;
-    node->pending_commands--;
-    nchan_update_stub_status(redis_pending_commands, -1);
-    
-    if(!nodeset_node_reply_keyslot_ok(node, (redisReply *)r)) {
-      nodeset_callback_on_ready(node->nodeset, 1000, nchan_store_find_channel_send, privdata);
-      return;
-    }
-  }
-  
-  redisChannelInfoCallback(ac, r, privdata);
-  ngx_free(privdata);
-}
-
-static ngx_int_t nchan_store_find_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  redis_channel_callback_data_t *d;
-  redis_nodeset_t               *ns = nodeset_find(&cf->redis);
-  CREATE_CALLBACK_DATA(d, ns, cf, "find_channel", channel_id, callback, privdata);
-  
-  nchan_store_find_channel_send(ns, d);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, nchan_compressed_msg_t *cmsg, ngx_str_t *content_type, ngx_str_t *eventsource_event, redisReply *r, uint16_t offset) {
-  
-  redisReply         **els = r->element;
-  size_t               content_type_len = 0, es_event_len = 0;
-  ngx_int_t            time_int = 0, ttl;
-  ngx_int_t            compression;
-  
-  if(CHECK_REPLY_ARRAY_MIN_SIZE(r, offset + 8)
-   && CHECK_REPLY_INT(els[offset])            //msg TTL
-   && CHECK_REPLY_INT_OR_STR(els[offset+1])   //id - time
-   && CHECK_REPLY_INT_OR_STR(els[offset+2])   //id - tag
-   && CHECK_REPLY_INT_OR_STR(els[offset+3])   //prev_id - time
-   && CHECK_REPLY_INT_OR_STR(els[offset+4])   //prev_id - tag
-   && CHECK_REPLY_STR(els[offset+5])   //message
-   && CHECK_REPLY_STR(els[offset+6])   //content-type
-   && CHECK_REPLY_STR(els[offset+7])  //eventsource event
-  ) {
-  
-    content_type_len=els[offset+6]->len;
-    es_event_len = els[offset+7]->len;
-    
-    ngx_memzero(msg, sizeof(*msg));
-    
-    msg->buf.start = msg->buf.pos = (u_char *)els[offset+5]->str;
-    msg->buf.end = msg->buf.last = msg->buf.start + els[offset+5]->len;
-    msg->buf.memory = 1;
-    msg->buf.last_buf = 1;
-    msg->buf.last_in_chain = 1;
-    
-    if(redisReply_to_ngx_int(els[offset], &ttl) != NGX_OK) {
-      ERR("invalid ttl integer value in msg response from redis");
-      return NGX_ERROR;
-    }
-    assert(ttl >= 0);
-    if(ttl == 0)
-      ttl++; // less than a second left for this message... give it a second's lease on life
-    
-    msg->expires = ngx_time() + ttl;
-    
-    msg->compressed = NULL;
-    if(r->elements >= (uint16_t )(offset + 8)) {
-      if(!CHECK_REPLY_INT_OR_STR(els[offset+8]) || redisReply_to_ngx_int(els[offset+8], &compression) != NGX_OK) {
-        ERR("invalid compression type integer value in msg response from redis");
-        return NGX_ERROR;
-      }
-      if((nchan_msg_compression_type_t )compression != NCHAN_MSG_COMPRESSION_INVALID && (nchan_msg_compression_type_t )compression != NCHAN_MSG_NO_COMPRESSION) {
-        msg->compressed = cmsg;
-        ngx_memzero(&cmsg->buf, sizeof(cmsg->buf));
-        cmsg->compression = (nchan_msg_compression_type_t )compression;
-      }
-    }
-    
-    if(content_type_len > 0) {
-      msg->content_type = content_type;
-      msg->content_type->len=content_type_len;
-      msg->content_type->data=(u_char *)els[offset+6]->str;
-    }
-    else {
-      msg->content_type = NULL;
-    }
-    
-    if(es_event_len > 0) {
-      msg->eventsource_event = eventsource_event;
-      msg->eventsource_event->len=es_event_len;
-      msg->eventsource_event->data=(u_char *)els[offset+7]->str;
-    }
-    else {
-      msg->eventsource_event = NULL;
-    }
-    
-    if(redisReply_to_ngx_int(els[offset+1], &time_int) == NGX_OK) {
-      msg->id.time = time_int;
-    }
-    else {
-      msg->id.time = 0;
-      ERR("invalid msg time from redis");
-    }
-    
-    redisReply_to_ngx_int(els[offset+2], (ngx_int_t *)&msg->id.tag.fixed[0]); // tag is a uint, meh.
-    msg->id.tagcount = 1;
-    msg->id.tagactive = 0;
-    
-    redisReply_to_ngx_int(els[offset+3], &time_int);
-    msg->prev_id.time = time_int;
-    redisReply_to_ngx_int(els[offset+4], (ngx_int_t *)&msg->prev_id.tag.fixed[0]);
-    msg->prev_id.tagcount = 1;
-    msg->prev_id.tagactive = 0;
-    
-    return NGX_OK;
-  }
-  else {
-    ERR("invalid message redis reply");
-    return NGX_ERROR;
-  }
-}
-
-typedef struct {
-  ngx_msec_t              t;
-  char                   *name;
-  ngx_str_t              *channel_id;
-  nchan_msg_tiny_id_t     msg_id;
-  callback_pt             callback;
-  void                   *privdata;
-} redis_get_message_data_t;
-
-static void redis_get_message_callback(redisAsyncContext *c, void *r, void *privdata);
-
-static ngx_int_t nchan_store_async_get_message_send(redis_nodeset_t *ns, void *pd) {
-  redis_get_message_data_t           *d = pd;
-  //input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
-  //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
-  if(nodeset_ready(ns)) {
-    redis_node_t *node = nodeset_node_find_by_channel_id(ns, d->channel_id);
-    nchan_redis_script(get_message, node, &redis_get_message_callback, d, d->channel_id, "%i %i FILO 0", 
-                       d->msg_id.time, 
-                       d->msg_id.tag
-                      );
-  }
-  else {
-    //TODO: pass on a get_msg error status maybe?
-    ngx_free(d);
-  }
-  return NGX_OK;
-}
-
-static void redis_get_message_callback(redisAsyncContext *ac, void *r, void *privdata) {
-  redisReply                *reply= r;
-  redis_get_message_data_t  *d= (redis_get_message_data_t *)privdata;
-  nchan_msg_t                msg;
-  nchan_compressed_msg_t     cmsg;
-  ngx_str_t                  content_type;
-  ngx_str_t                  eventsource_event;
-  redis_node_t              *node;
-
-  if(d == NULL) {
-    ERR("redis_get_mesage_callback has NULL userdata");
-    return;
-  }
-  
-  if(ac) {
-    node = ac->data;
-    
-    node->pending_commands--;
-    nchan_update_stub_status(redis_pending_commands, -1);
-    
-    if(!nodeset_ready(node->nodeset) || !nodeset_node_reply_keyslot_ok(node, reply)) {
-      nodeset_callback_on_ready(node->nodeset, 1000, nchan_store_async_get_message_send, privdata);
-      return;
-    }
-  
-    log_redis_reply(d->name, d->t);
-  
-    //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count
-    // result_code can be: 200 - ok, 403 - channel not found, 404 - not found, 410 - gone, 418 - not yet available
-  
-    if (!redisReplyOk(ac, r) || !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 1) || !CHECK_REPLY_INT(reply->element[0]) ) {
-      //no good
-      ngx_free(d);
-      return;
-    }
-  
-    switch(reply->element[0]->integer) {
-      case 200: //ok
-        if(msg_from_redis_get_message_reply(&msg, &cmsg, &content_type, &eventsource_event, reply, 1) == NGX_OK) {
-          d->callback(MSG_FOUND, &msg, d->privdata);
-        }
-        break;
-      case 403: //channel not found
-      case 404: //not found
-        d->callback(MSG_NOTFOUND, NULL, d->privdata);
-        break;
-      case 410: //gone
-        d->callback(MSG_EXPIRED, NULL, d->privdata);
-        break;
-      case 418: //not yet available
-        d->callback(MSG_EXPECTED, NULL, d->privdata);
-        break;
-    }
-  }
-  else {
-    ERR("redisAsyncContext NULL for redis_get_message_callback");
-  }
-  
-  ngx_free(d);
-}
-
-static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  redis_get_message_data_t      *d;
-  redis_nodeset_t               *ns = nodeset_find(&cf->redis);
-  if(callback==NULL) {
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "no callback given for async get_message. someone's using the API wrong!");
-    return NGX_ERROR;
-  }
-  
-  assert(msg_id->tagcount == 1);
-  
-  CREATE_CALLBACK_DATA(d, ns, cf, "get_message", channel_id, callback, privdata);
-  d->msg_id.time = msg_id->time;
-  d->msg_id.tag = msg_id->tag.fixed[0];
-  
-  nchan_store_async_get_message_send(ns, d);
-  return NGX_OK; //async only now!
-}
-
-
-typedef struct nchan_redis_conf_ll_s nchan_redis_conf_ll_t;
-struct nchan_redis_conf_ll_s {
-  nchan_loc_conf_t       *lcf;
-  nchan_redis_conf_ll_t  *next;
-};
-
-nchan_redis_conf_ll_t   *redis_conf_head;
-
-ngx_int_t nchan_store_redis_add_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf) {
-  nchan_redis_conf_ll_t  *rcf_ll = ngx_palloc(cf->pool, sizeof(*rcf_ll));
-  rcf_ll->lcf = loc_conf;
-  rcf_ll->next = redis_conf_head;
-  redis_conf_head = rcf_ll;
-  return NGX_OK;
-}
-
-ngx_int_t nchan_store_redis_remove_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf) {
-  nchan_redis_conf_ll_t  *cur, *prev;
-  
-  for(cur = redis_conf_head, prev = NULL; cur != NULL; prev = cur, cur = cur->next) {
-    if(cur->lcf == loc_conf) { //found it
-      if(prev == NULL) {
-        redis_conf_head = cur->next;
-      }
-      else {
-        prev->next = cur->next;
-      }
-      //don't need to ngx_pfree
-      return NGX_OK;
-    }
-  }
-  return NGX_OK;
-}
-
-//initialization
-static ngx_int_t nchan_store_init_module(ngx_cycle_t *cycle) {
-  ngx_core_conf_t                *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-  nchan_worker_processes = ccf->worker_processes;
-  return NGX_OK;
-}
-
-
-ngx_int_t rdstore_initialize_chanhead_reaper(nchan_reaper_t *reaper, char *name) {
-  
-  nchan_reaper_start(reaper, 
-              name, 
-              offsetof(rdstore_channel_head_t, gc.prev), 
-              offsetof(rdstore_channel_head_t, gc.next), 
-  (ngx_int_t (*)(void *, uint8_t)) nchan_redis_chanhead_ready_to_reap,
-  (void (*)(void *)) redis_store_reap_chanhead,
-              4
-  );
-    
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_init_redis_loc_conf_postconfig(nchan_loc_conf_t *lcf) {
-  nchan_redis_conf_t    *rcf = &lcf->redis;
-  
-  assert(rcf->enabled);
-  
-  //server-scope loc_conf may have some undefined values (because it was never merged with a prev)
-  //thus we must reduntantly check for unser values
-  if(rcf->ping_interval == NGX_CONF_UNSET) {
-    rcf->ping_interval = NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME;
-  }
-  if(rcf->storage_mode == REDIS_MODE_CONF_UNSET) {
-    rcf->storage_mode = REDIS_MODE_DISTRIBUTED;
-  }
-  if(rcf->nostore_fastpublish == NGX_CONF_UNSET) {
-    rcf->nostore_fastpublish = 0;
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
-  nchan_loc_conf_t      *lcf;
-  nchan_redis_conf_ll_t *cur;
-  nchan_main_conf_t     *mcf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
-  redis_nodeset_t       *nodeset;
-  
-  if(mcf->redis_publish_message_msgkey_size == NGX_CONF_UNSET_SIZE) {
-    mcf->redis_publish_message_msgkey_size = NCHAN_REDIS_DEFAULT_PUBSUB_MESSAGE_MSGKEY_SIZE;
-  }
-  redis_publish_message_msgkey_size = mcf->redis_publish_message_msgkey_size;
-  
-  for(cur = redis_conf_head; cur != NULL; cur = cur->next) {
-    lcf = cur->lcf;
-    nchan_store_init_redis_loc_conf_postconfig(lcf);
-    
-    if((nodeset = nodeset_find(&lcf->redis)) == NULL) {
-      nodeset = nodeset_create(lcf);
-    }
-    if(!nodeset) {
-      return NGX_ERROR;
-    }
-    rdstore_initialize_chanhead_reaper(&nodeset->chanhead_reaper, "Redis channel reaper");
-  }
-  
-  return NGX_OK;
-}
-
-static void nchan_store_create_main_conf(ngx_conf_t *cf, nchan_main_conf_t *mcf) {
-  mcf->redis_publish_message_msgkey_size=NGX_CONF_UNSET_SIZE;
-  
-  //reset redis_conf_head for reloads
-  redis_conf_head = NULL;
-  nodeset_destroy_all(); //reset all nodesets before loading config
-}
-
-void redis_store_prepare_to_exit_worker() {
-  rdstore_channel_head_t    *cur, *tmp;
-  HASH_ITER(hh, chanhead_hash, cur, tmp) {
-    cur->shutting_down = 1;
-  }
-}
-
-void nodeset_exiter_stage1(redis_nodeset_t *ns, void *pd) {
-  nodeset_abort_on_ready_callbacks(ns);
-}
-void nodeset_exiter_stage2(redis_nodeset_t *ns, void *pd) {
-  unsigned *chanheads = pd;
-  *chanheads += ns->chanhead_reaper.count;
-  nchan_reaper_stop(&ns->chanhead_reaper);
-}
-
-void nodeset_exiter_stage3(redis_nodeset_t *ns, void *pd) {
-  nodeset_disconnect(ns);
-}
-
-static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
-  rdstore_channel_head_t     *cur, *tmp;
-  unsigned                    chanheads = 0;
-  DBG("redis exit worker");
-  
-  //old
-  //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage1, NULL);
-  
-  nodeset_each(nodeset_exiter_stage1, NULL);
-  
-  HASH_ITER(hh, chanhead_hash, cur, tmp) {
-    cur->shutting_down = 1;
-    if(!cur->gc.in_reaper) {
-      cur->spooler.fn->broadcast_status(&cur->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
-      redis_chanhead_gc_add(cur, 0, "exit worker");
-    }
-  }
-  
-  nodeset_each(nodeset_exiter_stage2, &chanheads);
-  
-  //OLD
-  //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage2, &chanheads);
-  nodeset_destroy_all();
-  
-  //OLD
-  //rbtree_empty(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage3, NULL);
-  
-  nchan_exit_notice_about_remaining_things("redis channel", "", chanheads);
-}
-
-static void nchan_store_exit_master(ngx_cycle_t *cycle) {
-  nodeset_destroy_all();
-}
-
-typedef struct {
-  ngx_str_t                   *channel_id;
-  subscriber_t                *sub;
-  unsigned                     allocd:1;
-} redis_subscribe_data_t;
-
-static ngx_int_t nchan_store_subscribe_continued(redis_subscribe_data_t *d);
-
-static ngx_int_t subscribe_existing_channel_callback(ngx_int_t status, void *ch, void *d) {
-  nchan_channel_t              *channel = (nchan_channel_t *)ch;
-  redis_subscribe_data_t       *data = (redis_subscribe_data_t *)d;
-  
-  if(channel == NULL) {
-    data->sub->fn->respond_status(data->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
-    data->sub->fn->release(data->sub, 0);
-  }
-  else {
-    nchan_store_subscribe_continued(d);
-  }
-  assert(data->allocd);
-  ngx_free(data);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub) {
-  redis_subscribe_data_t        d_data;
-  redis_subscribe_data_t       *d = NULL;
-
-  assert(sub->last_msgid.tagcount == 1);
-  
-  if(!sub->cf->subscribe_only_existing_channel) {
-    d_data.allocd = 0;
-    d_data.channel_id = channel_id;
-    d_data.sub = sub;
-    nchan_store_subscribe_continued(&d_data);
-  }
-  else {
-    if((d=ngx_alloc(sizeof(*d) + sizeof(ngx_str_t) + channel_id->len, ngx_cycle->log))==NULL) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "can't allocate redis get_message callback data");
-      return NGX_ERROR;
-    }
-    d->allocd = 1;
-    d->channel_id=(ngx_str_t *)&d[1];
-    d->channel_id->len = channel_id->len;
-    d->channel_id->data = (u_char *)&(d->channel_id)[1];
-    ngx_memcpy(d->channel_id->data, channel_id->data, channel_id->len);
-    d->sub = sub;
-    nchan_store_find_channel(channel_id, sub->cf, subscribe_existing_channel_callback, d);
-  }
-
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_subscribe_continued(redis_subscribe_data_t *d) {
-  //nchan_loc_conf_t           *cf = d->sub->cf;
-  rdstore_channel_head_t       *ch;
-  //ngx_int_t                   create_channel_ttl = cf->subscribe_only_existing_channel==1 ? 0 : cf->channel_timeout;
-  assert(d->sub->cf->redis.enabled);
-  redis_nodeset_t              *nodeset = nodeset_find(&d->sub->cf->redis);
-  ngx_int_t                     rc;
-  
-  ch = nchan_store_get_chanhead(d->channel_id, nodeset);
-  
-  assert(ch != NULL);
-  
-  rc = ch->spooler.fn->add(&ch->spooler, d->sub);
-  //redisAsyncCommand(rds_ctx(), &redis_getmessage_callback, (void *)d, "EVALSHA %s 0 %b %i %i %s %i", redis_lua_scripts.get_message.hash, STR(d->channel_id), d->msg_id->time, d->msg_id->tag[0], "FILO", create_channel_ttl);
-  return rc;
-}
-
-typedef struct {
-  ngx_msec_t            t;
-  char                 *name;
-  ngx_str_t            *channel_id;
-  time_t                msg_time;
-  nchan_msg_t          *msg;
-  unsigned              shared_msg:1;
-  unsigned              cluster_move_error:1;
-  time_t                message_timeout;
-  ngx_int_t             max_messages;
-  nchan_msg_compression_type_t compression;
-  ngx_int_t             msglen;
-  callback_pt           callback;
-  void                 *privdata;
-  uint8_t               retry;
-} redis_publish_callback_data_t;
-
-static void redisPublishCallback(redisAsyncContext *, void *, void *);
-static void redisPublishNostoreCallback(redisAsyncContext *, void *, void *);
-static void redisPublishNostoreQueuedCheckCallback(redisAsyncContext *, void *, void *);
-static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd);
-
-static ngx_int_t redis_publish_message_nodeset_maybe_retry(redis_nodeset_t *ns, redis_publish_callback_data_t *d) {
-  //retry maybe
-  if(d->retry < REDIS_NODESET_NOT_READY_MAX_RETRIES) {
-    d->retry++;
-    nodeset_callback_on_ready(ns, 1000, redis_publish_message_send, d);
-  }
-  else {
-    d->callback(NGX_HTTP_SERVICE_UNAVAILABLE, NULL, d->privdata);
-    ngx_free(d);
-  }
-  return NGX_DECLINED;
-}
-
-static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd) {
-  redis_publish_callback_data_t  *d = pd;
-  ngx_int_t                       mmapped = 0;
-  ngx_buf_t                      *buf;
-  ngx_str_t                       msgstr;
-  nchan_msg_t                    *msg = d->msg;
-  const ngx_str_t                 empty=ngx_string("");
-  
-  if(!nodeset_ready(nodeset)) {
-    return redis_publish_message_nodeset_maybe_retry(nodeset, d);
-  }
-  
-  redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, d->channel_id);
-  
-  buf = &msg->buf;
-  if(ngx_buf_in_memory(buf)) {
-    msgstr.data = buf->pos;
-    msgstr.len = buf->last - msgstr.data;
-  }
-  else { //in a file
-    ngx_fd_t fd = buf->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&buf->file->name) : buf->file->fd;
-    
-    msgstr.len = buf->file_last - buf->file_pos;
-    msgstr.data = mmap(NULL, msgstr.len, PROT_READ, MAP_SHARED, fd, 0);
-    if (msgstr.data != MAP_FAILED) {
-      mmapped = 1;
-    }
-    else {
-      msgstr.data = NULL;
-      msgstr.len = 0;
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno, "Redis store: Couldn't mmap file %V", &buf->file->name);
-    }
-  }
-  d->msglen = msgstr.len;
-  
-  if(nodeset->settings.storage_mode == REDIS_MODE_DISTRIBUTED_NOSTORE) {
-    //hand-roll the msgpacked message
-    /*
-    9A A3"msg" CE<ttl> CE<time> 00 00 00 DB<len><str> D9<len><str> D9<len><str> 0X
-    |  |       |       |        |  |  |  |            |            |            |
-    |  |       |       |        |  |  |  |            |            |    fixint0/1 compression
-    |  |       |       |        |  |  |  |            |    bin8 <uint8 len> eventsource-event
-    |  |       |       |        |  |  |  |     bin8 <uint8 len> content type
-    |  |       |       |        |  |  |  bin32 <uint32 BE len> msg data
-    |  |       |       |      fixint=0 tag=0, prev_time=0, prev_tag=0
-    |  |       |    uint32 (BE) message time
-    |  |     uint32 (BE) message ttl
-    |  fixstr[3]
-    fixarray[10]
-    */
-    
-    uint32_t ttl, time;
-    uint32_t msglen;
-    uint8_t  content_type_len, eventsource_event_len, compression;
-    char     zero='\0';
-    int      fastpublish = nodeset->settings.nostore_fastpublish;
-    void   (*publish_callback)(redisAsyncContext *, void *, void *) = NULL;
-    
-    
-    ttl = htonl(d->message_timeout);
-    time = htonl(msg->id.time);
-    msglen = htonl(d->msglen);
-    content_type_len = msg->content_type ? (msg->content_type->len > 255 ? 255 : msg->content_type->len) : 0;
-    eventsource_event_len = msg->eventsource_event ? (msg->eventsource_event->len > 255 ? 255 : msg->eventsource_event->len) : 0;
-    compression = d->compression;
-    
-    if(!fastpublish) {
-      redis_command(node, NULL, d, "MULTI");
-      publish_callback = redisPublishNostoreQueuedCheckCallback;
-    }
-    else {
-      publish_callback = redisPublishNostoreCallback;
-    }
-    redis_command(node, publish_callback, d,
-      "PUBLISH %b{channel:%b}:pubsub "
-      "\x9A\xA3msg\xCE%b\xCE%b%b%b%b\xDB%b%b\xD9%b%b\xD9%b%b%b",
-      
-      STR(nodeset->settings.namespace),
-      STR(d->channel_id),
-      
-      (char *)&ttl, (size_t )4,
-      (char *)&time, (size_t )4,
-      (char *)&zero, (size_t )1,
-      (char *)&zero, (size_t )1,
-      (char *)&zero, (size_t )1,
-      (char *)&msglen, (size_t )4,
-      STR(&msgstr),
-      (char *)&content_type_len, (size_t )1,
-      STR((msg->content_type ? msg->content_type : &empty)),
-      (char *)&eventsource_event_len, (size_t )1,
-      STR((msg->eventsource_event ? msg->eventsource_event : &empty)),
-      (char *)&compression, (size_t )1
-    );
-    if(!fastpublish) {
-      redis_command(node, publish_callback, d, "HMGET %b{channel:%b} last_seen_fake_subscriber fake_subscribers", 
-        STR(nodeset->settings.namespace),
-        STR(d->channel_id)
-      );
-      redis_command(node, &redisPublishNostoreCallback, d, "EXEC");
-    }
-    
-  }
-  else {  
-    //input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff]
-    //output: message_time, message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
-    nchan_redis_script(publish, node, &redisPublishCallback, d, d->channel_id, 
-                      "%i %b %b %b %i %i %i %i %i", 
-                      msg->id.time, 
-                      STR(&msgstr), 
-                      STR((msg->content_type ? msg->content_type : &empty)), 
-                      STR((msg->eventsource_event ? msg->eventsource_event : &empty)), 
-                      d->compression,
-                      d->message_timeout, 
-                      d->max_messages, 
-                      redis_publish_message_msgkey_size,
-                      nodeset->settings.optimize_target
-                      );
-  }
-  if(mmapped && munmap(msgstr.data, msgstr.len) == -1) {
-    ERR("munmap was a problem");
-    return NGX_ERROR;
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t *msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
-  redis_publish_callback_data_t  *d=NULL;
-  redis_nodeset_t                *ns = nodeset_find(&cf->redis);
-  assert(callback != NULL);
-
-  CREATE_CALLBACK_DATA(d, ns, cf, "publish_message", channel_id, callback, privdata);
-  
-  d->msg_time=msg->id.time;
-  if(d->msg_time == 0) {
-    d->msg_time = ngx_time();
-  }
-  d->msg = msg;
-  d->shared_msg = msg->storage == NCHAN_MSG_SHARED;
-  d->message_timeout = nchan_loc_conf_message_timeout(cf);
-  d->max_messages = nchan_loc_conf_max_messages(cf);
-  d->compression = cf->message_compression;
-  d->retry = 0;
-  d->cluster_move_error = 0;
-  
-  assert(msg->id.tagcount == 1);
-  
-  if(d->shared_msg) {
-    msg_reserve(d->msg, "redis publish");
-  }
-  redis_publish_message_send(ns, d);
-  
-  return NGX_OK;
-}
-
-static int64_t redisReply_to_int(redisReply *reply, int nil_value, int wrong_datatype_value) {
-  switch(reply->type) {
-    case REDIS_REPLY_INTEGER:
-      return reply->integer;
-    case REDIS_REPLY_STRING:
-      return atol(reply->str);
-    case REDIS_REPLY_NIL:
-      return nil_value;
-    default:
-      return wrong_datatype_value;
-  }
-}
-
-static void redisPublishNostoreCallback(redisAsyncContext *c, void *r, void *privdata) {
-  redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
-  redisReply                    *reply=r;
-  redisReply                   **els;
-  nchan_channel_t                ch;
-  
-  
-  
-  redis_node_t                 *node = c->data;
-  node->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  if(d->shared_msg) {
-    msg_release(d->msg, "redis publish");
-  }
-  
-  ngx_memzero(&ch, sizeof(ch)); //for debugging basically. should be removed in the future and zeroed as-needed
-  if(d->cluster_move_error) {
-    nodeset_node_keyslot_changed(node);
-    d->callback(NGX_HTTP_SERVICE_UNAVAILABLE, NULL, d->privdata);
-  }
-  else if(reply) {
-    if(reply->type == REDIS_REPLY_ARRAY && reply->elements == 2 && reply->element[1]->type == REDIS_REPLY_ARRAY && reply->element[1]->elements == 2) {
-      els = reply->element[1]->element;
-      ch.last_seen = redisReply_to_int(els[0], 0, 0);
-      ch.subscribers = redisReply_to_int(els[1], 0, 0);
-      d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
-    }
-    else if(reply->type == REDIS_REPLY_INTEGER) {
-      ch.last_seen = 0;
-      ch.subscribers = redisReply_to_int(reply, 0, 0);
-      d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
-    }
-    else {
-      redisEchoCallback(c, r, privdata);
-      d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
-    }
-  }
-  else {
-    redisEchoCallback(c, r, privdata);
-    d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
-  }
-  
-  ngx_free(d);
-}
-
-static void redisPublishNostoreQueuedCheckCallback(redisAsyncContext *c, void *r, void *privdata) {
-  redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
-  redisReply                    *reply=r;
-  
-  redis_node_t                 *node = c->data;
-  node->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  if(reply && !CHECK_REPLY_STATUSVAL(reply, "QUEUED")) {
-    if(!nodeset_node_reply_keyslot_ok(node, reply)) {
-      d->cluster_move_error = 1;
-    }
-    else {
-      redisEchoCallback(c, r, privdata);
-    }
-  }
-}
-
-static void redisPublishCallback(redisAsyncContext *c, void *r, void *privdata) {
-  redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
-  redisReply                    *reply=r;
-  redisReply                    *cur;
-  nchan_channel_t                ch;
-  
-  redis_node_t                 *node = c->data;
-  node->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  if(!nodeset_node_reply_keyslot_ok(node, reply)) {
-    if(d->shared_msg) {
-      redis_publish_message_nodeset_maybe_retry(node->nodeset, d);
-    }
-    else {
-      //message probably isn't available anymore...
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis store received cluster MOVE/ASK error while publishing, and can't retry publishing after reconfiguring cluster.");
-      d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
-      ngx_free(d);
-    }
-    return;
-  }
-  
-  if(d->shared_msg) {
-    msg_release(d->msg, "redis publish");
-  }
-  
-  ngx_memzero(&ch, sizeof(ch)); //for debugging basically. should be removed in the future and zeroed as-needed
-  
-  if(reply && CHECK_REPLY_ARRAY_MIN_SIZE(reply, 2)) {
-    cur=reply->element[0];
-    switch(redis_array_to_channel(cur, &ch)) {
-      case NGX_OK:
-        d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
-        break;
-      case NGX_DECLINED: //not found
-        d->callback(NGX_OK, NULL, d->privdata);
-        break;
-      case NGX_ERROR:
-      default:
-        redisEchoCallback(c, r, privdata);
-        d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
-    }
-  }
-  else {
-    redisEchoCallback(c, r, privdata);
-    d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
-  }
-  ngx_free(d);
-}
-
-
-
-typedef struct {
-  ngx_str_t      *channel_id;
-  ngx_int_t       count;
-} add_fakesub_data_t;
-
-
-static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r, void *privdata);
-static ngx_int_t nchan_store_redis_add_fakesub_send(redis_nodeset_t *nodeset, void *pd) {
-  add_fakesub_data_t *d = pd;
-  if(nodeset_ready(nodeset)) {
-    redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, d->channel_id);
-    nchan_redis_script(add_fakesub, node, &nchan_store_redis_add_fakesub_callback, NULL, 
-                       d->channel_id,
-                       "%i %i",
-                       d->count,
-                       ngx_time()
-                      );
-    return NGX_OK;
-  }
-  else {
-    return NGX_ERROR;
-  }
-}
-
-static ngx_int_t nchan_store_redis_add_fakesub_send_retry_wrapper(redis_nodeset_t *nodeset, void *pd) {
-  add_fakesub_data_t *d = pd;
-  ngx_int_t rc = nchan_store_redis_add_fakesub_send(nodeset, pd);
-  ngx_free(d);
-  return rc;
-}
-
-static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r, void *privdata) {
-  redisReply      *reply = r;
-  redis_node_t    *node = c->data;
-  
-  node->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  if(reply && reply->type == REDIS_REPLY_ERROR) {
-    ngx_str_t    errstr;
-    ngx_str_t    countstr;
-    ngx_str_t    channel_id;
-    intptr_t     count;
-    
-    errstr.data = (u_char *)reply->str;
-    errstr.len = strlen(reply->str);
-    
-    if(ngx_str_chop_if_startswith(&errstr, "CLUSTER KEYSLOT ERROR. ")) {
-      nodeset_node_keyslot_changed(node);
-      nchan_scan_until_chr_on_line(&errstr, &countstr, ' ');
-      count = ngx_atoi(countstr.data, countstr.len);
-      channel_id = errstr;
-      
-      add_fakesub_data_t  *d = ngx_alloc(sizeof(*d) + sizeof(ngx_str_t) + channel_id.len, ngx_cycle->log);
-      if(!d) {
-        ERR("can't allocate add_fakesub_data for CLUSTER KEYSLOT ERROR retry");
-        return;
-      }
-      d->count = count;
-      d->channel_id = (ngx_str_t *)&d[1];
-      d->channel_id->data = (u_char *)&d->channel_id[1];
-      nchan_strcpy(d->channel_id, &channel_id, 0);
-      nodeset_callback_on_ready(node->nodeset, 1000, nchan_store_redis_add_fakesub_send_retry_wrapper, d);
-      
-      return;
-    }
-    
-  }
-  redisCheckErrorCallback(c, r, privdata);
-}
-
-ngx_int_t nchan_store_redis_fakesub_add(ngx_str_t *channel_id, nchan_loc_conf_t *cf, ngx_int_t count, uint8_t shutting_down) {
-  redis_nodeset_t  *nodeset = nodeset_find(&cf->redis);
-  
-  if(!shutting_down) {
-    add_fakesub_data_t   data = {channel_id, count};
-    nchan_store_redis_add_fakesub_send(nodeset, &data);
-  }
-  else {
-    if(nodeset_ready(nodeset)) {
-      redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, channel_id);
-      redis_sync_command(node, "EVALSHA %s 0 %b %i", redis_lua_scripts.add_fakesub.hash, STR(channel_id), count);
-    }
-  }
-  return NGX_OK;
-}
-
-int nchan_store_redis_ready(nchan_loc_conf_t *cf) {
-  redis_nodeset_t   *nodeset = nodeset_find(&cf->redis);
-  return nodeset && nodeset_ready(nodeset);
-}
-
-
-typedef struct {
-  callback_pt  cb;
-  void        *pd;
-} redis_subscriber_info_id_data_t;
-
-static void get_subscriber_info_id_callback(redisAsyncContext *c, void *r, void *privdata);
-
-static ngx_int_t nchan_store_get_subscriber_info_id(nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
-  redis_nodeset_t  *nodeset = nodeset_find(&cf->redis);
-  
-  if(!nodeset_ready(nodeset)) {
-    return NGX_ERROR;
-  }
-  
-  ngx_str_t request_id_key = ngx_string(NCHAN_REDIS_UNIQUE_REQUEST_ID_KEY);
-  redis_node_t  *node = nodeset_node_find_by_key(nodeset, &request_id_key);
-  if(!node) {
-    return NGX_ERROR;
-  }
-  
-  redis_subscriber_info_id_data_t *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
-  if(d == NULL) {
-    return NGX_ERROR;
-  }
-  
-  d->cb = cb;
-  d->pd = pd;
-  
-  redis_script(get_subscriber_info_id, node, &get_subscriber_info_id_callback, d, "1 %b", STR(&request_id_key));
-  
-  return NGX_DONE;
-}
-
-static void get_subscriber_info_id_callback(redisAsyncContext *c, void *r, void *privdata) {
-  redis_subscriber_info_id_data_t *d = privdata;
-  redisReply                    *reply = r;
-  
-  redis_node_t                 *node = c->data;
-  node->pending_commands--;
-  nchan_update_stub_status(redis_pending_commands, -1);
-  
-  callback_pt  cb = d->cb;
-  void        *cb_pd = d->pd;
-  
-  ngx_free(d);
-  
-  if (!redisReplyOk(c, reply)) {
-    cb(NGX_ERROR, NULL, cb_pd);
-    return;
-  }
-  
-  int64_t new_id = redisReply_to_int(reply, 0, 0);
-  cb(NGX_OK, (void *)(uintptr_t )new_id, cb_pd);
-}
-
-static ngx_int_t nchan_store_request_subscriber_info(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
-  if(nchan_channel_id_is_multi(channel_id)) {
-    ERR("redis nchan_store_request_subscriber_info can't handle multi-channel ids");
-    return NGX_ERROR;
-  }
-  
-  redis_nodeset_t               *nodeset = nodeset_find(&cf->redis);
-  if(!nodeset) {
-    ERR("redis nodeset not found for nchan_store_request_subscriber_info");
-    return NGX_ERROR;
-  }
-  
-  if(!nodeset_ready(nodeset)) {
-    ERR("redis nodeset not ready for nchan_store_request_subscriber_info");
-    return NGX_ERROR;
-  }
-  
-  redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, channel_id);
-  if(!node) {
-    ERR("couldn't find Redis node for nchan_store_request_subscriber_info");
-    return NGX_ERROR;
-  }
-  
-  nchan_redis_script( request_subscriber_info, node, &redisCheckErrorCallback, NULL, channel_id, "%i", (int )request_id);
-  
-  return NGX_DONE;
-}
-
-nchan_store_t nchan_store_redis = {
-  //init
-  &nchan_store_init_module,
-  &nchan_store_init_worker,
-  &nchan_store_init_postconfig,
-  &nchan_store_create_main_conf,
-  
-  //shutdown
-  &nchan_store_exit_worker,
-  &nchan_store_exit_master,
-  
-  //async-friendly functions with callbacks
-  &nchan_store_async_get_message, //+callback
-  &nchan_store_subscribe, //+callback
-  &nchan_store_publish_message, //+callback
-  
-  &nchan_store_delete_channel, //+callback
-  &nchan_store_find_channel, //+callback
-  
-  NULL, //get_group
-  NULL, //set group
-  NULL, //delete group
-  
-  &nchan_store_get_subscriber_info_id, //+callback
-  &nchan_store_request_subscriber_info //+callback
-  
-};
-
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/Gemfile b/debian/modules/nchan/src/store/redis/redis-lua-scripts/Gemfile
deleted file mode 100644
index b792720..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/Gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/ruby
-source 'https://rubygems.org'
-gem 'pry'
-gem 'pry-debundle'
-gem 'pry-rescue'
-
-gem 'minitest'
-gem 'minitest-reporters'
-
-gem "redis"
-gem "hsss"
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/add_fakesub.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/add_fakesub.lua
deleted file mode 100644
index ee2b95f..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/add_fakesub.lua
+++ /dev/null
@@ -1,34 +0,0 @@
---input:  keys: [], values: [namespace, channel_id, number, time]
---output: current_fake_subscribers
-  
-redis.call('echo', ' ####### FAKESUBS ####### ')
-local ns=ARGV[1]
-local id=ARGV[2]
-local num=tonumber(ARGV[3])
-local time = tonumber(ARGV[4])
-if num==nil then
-  return {err="fakesub number not given"}
-end
-
-local chan_key = ('%s{channel:%s}'):format(ns, id)
-
-local res = redis.pcall('EXISTS', chan_key)
-if type(res) == "table" and res["err"] then
-  return {err = ("CLUSTER KEYSLOT ERROR. %i %s"):format(num, id)}
-end
-
-local exists = res == 1
-
-local cur = 0
-
-if exists or (not exists and num > 0) then
-  cur = redis.call('HINCRBY', chan_key, 'fake_subscribers', num)
-  if time then
-    redis.call('HSET', chan_key, 'last_seen_fake_subscriber', time)
-  end
-  if not exists then
-    redis.call('EXPIRE', chan_key, 5) --something small
-  end
-end
-
-return cur
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/channel_keepalive.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/channel_keepalive.lua
deleted file mode 100644
index 4d21548..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/channel_keepalive.lua
+++ /dev/null
@@ -1,35 +0,0 @@
---input:  keys: [], values: [namespace, channel_id, ttl]
--- ttl is for when there are no messages but at least 1 subscriber.
---output: seconds until next keepalive is expected, or -1 for "let it disappear"
-redis.call('ECHO', ' ####### CHANNEL KEEPALIVE ####### ')
-local ns=ARGV[1]
-local id=ARGV[2]
-local ttl=tonumber(ARGV[3])
-if not ttl then
-  return {err="Invalid channel keepalive TTL (2nd arg)"}
-end
-
-local random_safe_next_ttl = function(ttl)
-  return math.floor(ttl/2 + ttl/2.1 * math.random())
-end
-local ch = ('%s{channel:%s}'):format(ns, id)
-local key={
-  channel=   ch, --hash
-  messages=  ch..':messages', --list
-}
-  
-local subs_count = tonumber(redis.call('HGET', key.channel, "subscribers")) or 0
-local msgs_count = tonumber(redis.call('LLEN', key.messages)) or 0
-local actual_ttl = tonumber(redis.call('TTL',  key.channel))
-
-if subs_count > 0 then
-  if msgs_count > 0 and actual_ttl > ttl then
-    return random_safe_next_ttl(actual_ttl)
-  end
-  --refresh ttl
-  redis.call('expire', key.channel, ttl);
-  redis.call('expire', key.messages, ttl);
-  return random_safe_next_ttl(ttl)
-else
-  return -1
-end
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/delete.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/delete.lua
deleted file mode 100644
index d951395..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/delete.lua
+++ /dev/null
@@ -1,68 +0,0 @@
---input: keys: [],  values: [ namespace, channel_id ]
---output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
--- delete this channel and all its messages
-local ns = ARGV[1]
-local id = ARGV[2]
-local ch = ('%s{channel:%s}'):format(ns, id)
-local key_msg=    ch..':msg:%s' --not finished yet
-local key_channel=ch
-local messages=   ch..':messages'
-local subscribers=ch..':subscribers'
-local pubsub=     ch..':pubsub'
-
-redis.call('echo', ' ####### DELETE #######')
-local num_messages = 0
---delete all the messages right now mister!
-local msg
-while true do
-  msg = redis.call('LPOP', messages)
-  if msg then
-    num_messages = num_messages + 1
-    redis.call('DEL', key_msg:format(msg))
-  else
-    break
-  end
-end
-
-local del_msgpack =cmsgpack.pack({"alert", "delete channel", id})
-for k,channel_key in pairs(redis.call('SMEMBERS', subscribers)) do
-  redis.call('PUBLISH', channel_key, del_msgpack)
-end
-
-local tohash=function(arr)
-  if type(arr)~="table" then
-    return nil
-  end
-  local h = {}
-  local k=nil
-  for i, v in ipairs(arr) do
-    if k == nil then
-      k=v
-    else
-      h[k]=v; k=nil
-    end
-  end
-  return h
-end
-
-local channel = nil
-if redis.call('EXISTS', key_channel) ~= 0 then
-  channel = tohash(redis.call('hgetall', key_channel))
-  --leave some crumbs behind showing this channel was just deleted
-  redis.call('setex', ch..":deleted", 5, 1)  
-end
-
-redis.call('DEL', key_channel, messages, subscribers)
-redis.call('PUBLISH', pubsub, del_msgpack)
-
-if channel then
-  return {
-    tonumber(channel.ttl) or 0,
-    tonumber(channel.last_seen_fake_subscriber) or 0,
-    tonumber(channel.fake_subscribers or channel.subscribers) or 0,
-    channel.current_message or "",
-    tonumber(num_messages)
-  }
-else
-  return nil
-end
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/find_channel.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/find_channel.lua
deleted file mode 100644
index 4e09598..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/find_channel.lua
+++ /dev/null
@@ -1,70 +0,0 @@
---input: keys: [],  values: [ namespace, channel_id ]
---output: channel_hash {ttl, time_last_seen, subscribers, last_channel_id, messages} or nil
--- finds and return the info hash of a channel, or nil of channel not found
-local ns = ARGV[1]
-local id = ARGV[2]
-local channel_key = ('%s{channel:%s}'):format(ns, id)
-local messages_key = channel_key..':messages'
-
-redis.call('echo', ' #######  FIND_CHANNEL ######## ')
-
---check old entries
-local oldestmsg=function(list_key, old_fmt)
-  local old, oldkey
-  local n, del=0,0
-  while true do
-    n=n+1
-    old=redis.call('lindex', list_key, -1)
-    if old then
-      oldkey=old_fmt:format(old)
-      local ex=redis.call('exists', oldkey)
-      if ex==1 then
-        return oldkey
-      else
-        redis.call('rpop', list_key)
-        del=del+1
-      end
-    else
-      break
-    end
-  end
-end
-
-local tohash=function(arr)
-  if type(arr)~="table" then
-    return nil
-  end
-  local h = {}
-  local k=nil
-  for i, v in ipairs(arr) do
-    if k == nil then
-      k=v
-    else
-      --dbg(k.."="..v)
-      h[k]=v; k=nil
-    end
-  end
-  return h
-end
-
-if redis.call('EXISTS', channel_key) ~= 0 then
-  local ch = tohash(redis.call('hgetall', channel_key))
-    
-  local msgs_count
-  if redis.call("TYPE", messages_key)['ok'] == 'list' then
-    oldestmsg(messages_key, channel_key ..':msg:%s')
-    msgs_count = tonumber(redis.call('llen', messages_key))
-  else
-    msgs_count = 0
-  end
-  
-  return {
-    tonumber(ch.ttl) or 0,
-    tonumber(ch.last_seen_fake_subscriber) or 0,
-    tonumber(ch.fake_subscribers or ch.subscribers) or 0,
-    ch.current_message or "",
-    msgs_count
-  }
-else
-  return nil
-end
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message.lua
deleted file mode 100644
index 986368f..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message.lua
+++ /dev/null
@@ -1,155 +0,0 @@
---input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
---output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count
--- no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent
--- create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.
--- result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available
-local ns, id, time, tag, subscribe_if_current = ARGV[1], ARGV[2], tonumber(ARGV[3]), tonumber(ARGV[4])
-local no_msgid_order=ARGV[5]
-local create_channel_ttl=tonumber(ARGV[6]) or 0
-local msg_id
-if time and time ~= 0 and tag then
-  msg_id=("%s:%s"):format(time, tag)
-end
-
-if redis.replicate_commands then
-  redis.replicate_commands()
-end
-
--- This script has gotten big and ugly, but there are a few good reasons 
--- to keep it big and ugly. It needs to do a lot of stuff atomically, and 
--- redis doesn't do includes. It could be generated pre-insertion into redis, 
--- but then error messages become less useful, complicating debugging. If you 
--- have a solution to this, please help.
-local ch=('%s{channel:%s}'):format(ns, id)
-local msgkey_fmt=ch..':msg:%s'
-local key={
-  next_message= msgkey_fmt, --hash
-  message=      msgkey_fmt, --hash
-  channel=      ch, --hash
-  messages=     ch..':messages', --list
---  pubsub=       ch..':subscribers:', --set
-}
-
---local dbg = function(...) redis.call('echo', table.concat({...})); end
-
-redis.call('echo', ' #######  GET_MESSAGE ######## ')
-
-local oldestmsg=function(list_key, old_fmt)
-  local old, oldkey
-  local n, del=0,0
-  while true do
-    n=n+1
-    old=redis.call('lindex', list_key, -1)
-    if old then
-      oldkey=old_fmt:format(old)
-      local ex=redis.call('exists', oldkey)
-      if ex==1 then
-        return oldkey
-      else
-        redis.call('rpop', list_key)
-        del=del+1
-      end 
-    else
-      --dbg(list_key, " is empty")
-      break
-    end
-  end
-end
-
-local tohash=function(arr)
-  if type(arr)~="table" then
-    return nil
-  end
-  local h = {}
-  local k=nil
-  for i, v in ipairs(arr) do
-    if k == nil then
-      k=v
-    else
-      --dbg(k.."="..v)
-      h[k]=v; k=nil
-    end
-  end
-  return h
-end
-
-if no_msgid_order ~= 'FIFO' then
-  no_msgid_order = 'FILO'
-end
-
-local channel = tohash(redis.call('HGETALL', key.channel))
-local new_channel = false
-if next(channel) == nil then
-  if create_channel_ttl==0 then
-    return {404, nil}
-  end
-  redis.call('HSET', key.channel, 'time', time)
-  redis.call('EXPIRE', key.channel, create_channel_ttl)
-  channel = {time=time}
-  new_channel = true
-end
-
-local subs_count = tonumber(channel.subscribers)
-
-if msg_id==nil then
-  local found_msg_key
-  if new_channel then
-    --dbg("new channel")
-    return {418, "", "", "", "", subs_count}
-  else
-    --dbg("no msg id given, ord="..no_msgid_order)
-    
-    if no_msgid_order == 'FIFO' then --most recent message
-      --dbg("get most recent")
-      found_msg_key=channel.current_message
-    elseif no_msgid_order == 'FILO' then --oldest message
-      --dbg("get oldest")
-      found_msg_key=oldestmsg(key.messages, msgkey_fmt)
-    end
-    
-    if found_msg_key == nil then
-      --we await a message
-      return {418, "", "", "", "", subs_count}
-    else
-      local msg=tohash(redis.call('HGETALL', found_msg_key))
-      if not next(msg) then --empty
-        return {404, "", "", "", "", subs_count}
-      else
-        --dbg(("found msg %s:%s  after %s:%s"):format(tostring(msg.time), tostring(msg.tag), tostring(time), tostring(tag)))
-        local ttl = redis.call('TTL', found_msg_key)
-        return {200, ttl, tonumber(msg.time) or "", tonumber(msg.tag) or "", tonumber(msg.prev_time) or "", tonumber(msg.prev_tag) or "", msg.data or "", msg.content_type or "", msg.eventsource_event or "", tonumber(msg.compression or 0), subs_count}
-      end
-    end
-  end
-else
-  if msg_id and channel.current_message == msg_id
-   or not channel.current_message then
-    return {418, "", "", "", "", subs_count}
-  end
-
-  key.message=key.message:format(msg_id)
-  local msg=tohash(redis.call('HGETALL', key.message))
-
-  if next(msg) == nil then -- no such message. it might've expired, or maybe it was never there
-    --dbg("MESSAGE NOT FOUND")
-    return {404, nil}
-  end
-
-  local next_msg, next_msgtime, next_msgtag
-  if not msg.next then --this should have been taken care of by the channel.current_message check
-    --dbg("NEXT MESSAGE KEY NOT PRESENT. ERROR, ERROR!")
-    return {404, nil}
-  else
-    --dbg("NEXT MESSAGE KEY PRESENT: " .. msg.next)
-    key.next_message=key.next_message:format(msg.next)
-    if redis.call('EXISTS', key.next_message)~=0 then
-      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event, ncompression=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))
-      local ttl = redis.call('TTL', key.next_message)
-      --dbg(("found msg2 %i:%i  after %i:%i"):format(ntime, ntag, time, tag))
-      return {200, ttl, tonumber(ntime) or "", tonumber(ntag) or "", tonumber(prev_time) or "", tonumber(prev_tag) or "", ndata or "", ncontenttype or "", neventsource_event or "", ncompression or 0, subs_count}
-    else
-      --dbg("NEXT MESSAGE NOT FOUND")
-      return {404, nil}
-    end
-  end
-end
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message_from_key.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message_from_key.lua
deleted file mode 100644
index ad0d742..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_message_from_key.lua
+++ /dev/null
@@ -1,8 +0,0 @@
---input:  keys: [message_key], values: []
---output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count
-local key = KEYS[1]
-
-local ttl = redis.call('TTL', key)
-local time, tag, prev_time, prev_tag, data, content_type, es_event, compression = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))
-
-return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or "", content_type or "", es_event or "", tonumber(compression or 0)}
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua
deleted file mode 100644
index 54cac88..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua
+++ /dev/null
@@ -1,18 +0,0 @@
---input:  keys: [unique_request_id_key], values: []
---output: next_unique_request_id_integer
-local key = KEYS[1]
-
-redis.call("ECHO", "###### GET SUBSCRIBER INFO ID ##########")
-
-local resp = redis.pcall("INCR", key)
-local val
-if type(resp) ~= "number" then
-  redis.call("SET", key, "0")
-  val = redis.call("INCR", key)
-else
-  val = resp
-end
-
-redis.call("ECHO", "val: " .. val)
-
-return val
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish.lua
deleted file mode 100644
index 1d8e416..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish.lua
+++ /dev/null
@@ -1,287 +0,0 @@
---input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, optimize_target]
---output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?
-
-local ns, id=ARGV[1], ARGV[2]
-
-local msg = {}
-
-local store_at_most_n_messages = tonumber(ARGV[9])
-if store_at_most_n_messages == nil or store_at_most_n_messages == "" then
-  return {err="Argument 9, max_msg_buf_size, can't be empty"}
-end
-if store_at_most_n_messages == 0 then
-  msg.unbuffered = 1
-end
-
-local msgpacked_pubsub_cutoff = tonumber(ARGV[10])
-
-local optimize_target = tonumber(ARGV[11]) == 2 and "bandwidth" or "cpu"
-
-local time
-if optimize_target == "cpu" and redis.replicate_commands then
-  -- we're on redis >= 3.2. We can use We can use 'script effects replication' to allow
-  -- writing nondeterministic command values like TIME.
-  -- That's exactly what we want to do, use Redis' TIME rather than the given time from Nginx
-  -- Also, it's more efficient to replicate just the commands in this case rather than run the whole script
-  redis.replicate_commands()
-  time = tonumber(redis.call('TIME')[1])
-else
-  --fallback to the provided time
-  time = tonumber(ARGV[3])
-end
-
-msg.id=nil
-msg.data= ARGV[4]
-msg.content_type=ARGV[5]
-msg.eventsource_event=ARGV[6]
-msg.compression=tonumber(ARGV[7])
-msg.ttl= tonumber(ARGV[8])
-msg.time= time
-msg.tag= 0
-
-if msg.ttl == 0 then
-  msg.ttl = 126144000 --4 years
-end
-
---[[local dbg = function(...)
-  local arg = {...}
-  for i = 1, #arg do
-    arg[i]=tostring(arg[i])
-  end
-  redis.call('echo', table.concat(arg, ", "))
-end]]
-
-if type(msg.content_type)=='string' and msg.content_type:find(':') then
-  return {err='Message content-type cannot contain ":" character.'}
-end
-
-redis.call('echo', ' #######  PUBLISH   ######## ')
-
--- sets all fields for a hash from a dictionary
-local hmset = function (key, dict)
-  if next(dict) == nil then return nil end
-  local bulk = {}
-  for k, v in pairs(dict) do
-    table.insert(bulk, k)
-    table.insert(bulk, v)
-  end
-  return redis.call('HMSET', key, unpack(bulk))
-end
-
-local tohash=function(arr)
-  if type(arr)~="table" then
-    return nil
-  end
-  local h = {}
-  local k=nil
-  for i, v in ipairs(arr) do
-    if k == nil then
-      k=v
-    else
-      h[k]=v; k=nil
-    end
-  end
-  return h
-end
-
-local ch = ('%s{channel:%s}'):format(ns, id)
-local msg_fmt = ch..':msg:%s'
-local key={
-  last_message= msg_fmt, --not finished yet
-  message=      msg_fmt, --not finished yet
-  channel=      ch,
-  messages=     ch..':messages',
-  subscribers=  ch..':subscribers'
-}
-local channel_pubsub = ch..':pubsub'
-
-local new_channel
-local channel
-if redis.call('EXISTS', key.channel) ~= 0 then
-  channel=tohash(redis.call('HGETALL', key.channel))
-  channel.max_stored_messages = tonumber(channel.max_stored_messages)
-end
-
-if channel~=nil then
-  --dbg("channel present")
-  if channel.current_message ~= nil then
-    --dbg("channel current_message present")
-    key.last_message=key.last_message:format(channel.current_message, id)
-  else
-    --dbg("channel current_message absent")
-    key.last_message=nil
-  end
-  new_channel=false
-else
-  --dbg("channel missing")
-  channel={}
-  new_channel=true
-  key.last_message=nil
-end
-
---set new message id
-local lastmsg, lasttime, lasttag
-if key.last_message then
-  lastmsg = redis.call('HMGET', key.last_message, 'time', 'tag')
-  lasttime, lasttag = tonumber(lastmsg[1]), tonumber(lastmsg[2])
-  --dbg("New message id: last_time ", lasttime, " last_tag ", lasttag, " msg_time ", msg.time)
-  if lasttime and tonumber(lasttime) > tonumber(msg.time) then
-    redis.log(redis.LOG_WARNING, "Nchan: message for " .. id .. " arrived a little late and may be delivered out of order. Redis must be very busy, or the Nginx servers do not have their times synchronized.")
-    msg.time = lasttime
-    time = lasttime
-  end
-  if lasttime and lasttime==msg.time then
-    msg.tag=lasttag+1
-  end
-  msg.prev_time = lasttime
-  msg.prev_tag = lasttag
-else
-  msg.prev_time = 0
-  msg.prev_tag = 0
-end
-msg.id=('%i:%i'):format(msg.time, msg.tag)
-
-key.message=key.message:format(msg.id)
-if redis.call('EXISTS', key.message) ~= 0 then
-  local hash_tostr=function(h)
-    local tt = {}
-    for k, v in pairs(h) do
-      table.insert(tt, ("%s: %s"):format(k, v))
-    end
-    return "{" .. table.concat(tt,", ") .. "}"
-  end
-  local existing_msg = tohash(redis.call('HGETALL', key.message))
-  local errmsg = "Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s. dbg: channel: %s, messages_key: %s, msglist: %s, msg: %s, msg_expire: %s."
-  errmsg = errmsg:format(key.message, id, msg.id or "-", time or "-", lasttime or "-", lasttag or "-", hash_tostr(channel), key.messages, "["..table.concat(redis.call('LRANGE', key.messages, 0, -1), ", ").."]", hash_tostr(existing_msg), redis.call('TTL', key.message))
-  return {err=errmsg}
-end
-
-msg.prev=channel.current_message
-if key.last_message and redis.call('exists', key.last_message) == 1 then
-  redis.call('HSET', key.last_message, 'next', msg.id)
-end
-
---update channel
-redis.call('HSET', key.channel, 'current_message', msg.id)
-if msg.prev then
-  redis.call('HSET', key.channel, 'prev_message', msg.prev)
-end
-if time then
-  redis.call('HSET', key.channel, 'time', time)
-end
-
-local message_len_changed = false
-if channel.max_stored_messages ~= store_at_most_n_messages then
-  channel.max_stored_messages = store_at_most_n_messages
-  message_len_changed = true
-  redis.call('HSET', key.channel, 'max_stored_messages', store_at_most_n_messages)
-  --dbg("channel.max_stored_messages was not set, but is now ", store_at_most_n_messages)
-end
-
---write message
-hmset(key.message, msg)
-
-
---check old entries
-local oldestmsg=function(list_key, old_fmt)
-  local old, oldkey
-  local n, del=0,0
-  while true do
-    n=n+1
-    old=redis.call('lindex', list_key, -1)
-    if old then
-      oldkey=old_fmt:format(old)
-      local ex=redis.call('exists', oldkey)
-      if ex==1 then
-        return oldkey
-      else
-        redis.call('rpop', list_key)
-        del=del+1
-      end
-    else
-      break
-    end
-  end
-end
-
-local max_stored_msgs = channel.max_stored_messages or -1
-
-if max_stored_msgs < 0 then --no limit
-  oldestmsg(key.messages, msg_fmt)
-  redis.call('LPUSH', key.messages, msg.id)
-elseif max_stored_msgs > 0 then
-  local stored_messages = tonumber(redis.call('LLEN', key.messages))
-  redis.call('LPUSH', key.messages, msg.id)
-  -- Reduce the message length if necessary
-  local dump_message_ids = redis.call('LRANGE', key.messages, max_stored_msgs, stored_messages);
-  if dump_message_ids then
-    for _, msgid in ipairs(dump_message_ids) do
-      redis.call('DEL', msg_fmt:format(msgid))
-    end
-  end
-  redis.call('LTRIM', key.messages, 0, max_stored_msgs - 1)
-  oldestmsg(key.messages, msg_fmt)
-end
-
-
---set expiration times for all the things
-local channel_ttl = tonumber(redis.call('TTL',  key.channel))
-redis.call('EXPIRE', key.message, msg.ttl)
-if msg.ttl + 1 > channel_ttl then -- a little extra time for failover weirdness for 1-second TTL messages
-  redis.call('EXPIRE', key.channel, msg.ttl + 1)
-  redis.call('EXPIRE', key.messages, msg.ttl + 1)
-  redis.call('EXPIRE', key.subscribers, msg.ttl + 1)
-end
-
---publish message
-local unpacked
-
-if msg.unbuffered or #msg.data < msgpacked_pubsub_cutoff then
-  unpacked= {
-    "msg",
-    msg.ttl or 0,
-    msg.time,
-    tonumber(msg.tag) or 0,
-    (msg.unbuffered and 0 or msg.prev_time) or 0,
-    (msg.unbuffered and 0 or msg.prev_tag) or 0,
-    msg.data or "",
-    msg.content_type or "",
-    msg.eventsource_event or "",
-    msg.compression or 0
-  }
-else
-  unpacked= {
-    "msgkey",
-    msg.time,
-    tonumber(msg.tag) or 0,
-    key.message
-  }
-end
-
-if message_len_changed then
-  unpacked[1] = "max_msgs+" .. unpacked[1]
-  table.insert(unpacked, 2, tonumber(channel.max_stored_messages))
-end
-
-local msgpacked
-
---dbg(("Stored message with id %i:%i => %s"):format(msg.time, msg.tag, msg.data))
-
---we used to publish conditionally on subscribers on the Redis pubsub channel
---but now that we're subscribing to slaves this is not possible
---so just PUBLISH always.
-msgpacked = cmsgpack.pack(unpacked)
-redis.call('PUBLISH', channel_pubsub, msgpacked)
-
-local num_messages = redis.call('llen', key.messages)
-
---dbg("channel ", id, " ttl: ",channel.ttl, ", subscribers: ", channel.subscribers, "(fake: ", channel.fake_subscribers or "nil", "), messages: ", num_messages)
-local ch = {
-  tonumber(channel.ttl or msg.ttl),
-  tonumber(channel.last_seen_fake_subscriber) or 0,
-  tonumber(channel.fake_subscribers or channel.subscribers) or 0,
-  msg.time and msg.time and ("%i:%i"):format(msg.time, msg.tag) or "",
-  tonumber(num_messages)
-}
-
-return {ch, new_channel}
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish_status.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish_status.lua
deleted file mode 100644
index cdb251d..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/publish_status.lua
+++ /dev/null
@@ -1,26 +0,0 @@
---input:  keys: [], values: [namespace, channel_id, status_code]
---output: current_subscribers
-
-redis.call('echo', ' ####### PUBLISH STATUS ####### ')
---local dbg = function(...) redis.call('echo', table.concat({...})); end
-local ns, id=ARGV[1], ARGV[2]
-local code=tonumber(ARGV[3])
-if code==nil then
-  return {err="non-numeric status code given, bailing!"}
-end
-
-local pubmsg = "status:"..code
-local ch = ('%s{channel:%s}'):format(ns, id)
-local subs_key = ch..':subscribers'
-local chan_key = ch
---local channel_pubsub = ch..':pubsub'
-
-for k,channel_key in pairs(redis.call('SMEMBERS', subs_key)) do
-  --not efficient, but useful for a few short-term subscriptions
-  redis.call('PUBLISH', channel_key, pubmsg)
-end
---clear short-term subscriber list
-redis.call('DEL', subs_key)
---now publish to the efficient channel
---what?... redis.call('PUBLISH', channel_pubsub, pubmsg)
-return redis.call('HGET', chan_key, 'subscribers') or 0
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/request_subscriber_info.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/request_subscriber_info.lua
deleted file mode 100644
index afe4090..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/request_subscriber_info.lua
+++ /dev/null
@@ -1,15 +0,0 @@
---input: keys: [],  values: [ namespace, channel_id, info_response_id ]
---output: -nothing-
-
-local ns = ARGV[1]
-local channel_id = ARGV[2]
-local response_id = tonumber(ARGV[3])
-local pubsub = ('%s{channel:%s}:pubsub'):format(ns, channel_id)
-
-redis.call('echo', ' ####### REQUEST_SUBSCRIBER_INFO #######')
-
-local alert_msgpack =cmsgpack.pack({"alert", "subscriber info", response_id})
-
-redis.call('PUBLISH', pubsub, alert_msgpack)
-
-return true
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/rsck.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/rsck.lua
deleted file mode 100644
index 9d351bc..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/rsck.lua
+++ /dev/null
@@ -1,216 +0,0 @@
---redis-store consistency check
-local ns = ARGV[1]
-if ns and #ns > 0 then
-  ns = ns..":"
-end
-
-local concat = function(...)
-  local arg = {...}
-  for i = 1, #arg do
-    arg[i]=tostring(arg[i])
-  end
-  return table.concat(arg, " ")
-end
-local dbg =function(...) redis.call('echo', concat(...)); end
-local errors={}
-local err = function(...)
-  local msg = concat(...)
-  dbg(msg)
-  table.insert(errors, msg)
-end
-
-local tp=function(t, max_n)
-  local tt={}
-  for i, v in pairs(t) do
-    local val = tostring(v)
-    if max_n and #val > max_n then
-      val = val:sub(1, max_n) .. "[...]"
-    end
-    table.insert(tt, tostring(i) .. ": " .. val)
-  end
-  return "{" .. table.concat(tt, ", ") .. "}"
-end
-
-local tohash=function(arr)
-  if type(arr)~="table" then
-    return nil
-  end
-  local h = {}
-  local k=nil
-  for i, v in ipairs(arr) do
-    if k == nil then
-      k=v
-    else
-      h[k]=v; k=nil
-    end
-  end
-  return h
-end
-local type_is = function(key, _type, description)
-  local t = redis.call("TYPE", key)['ok']
-  local type_ok = true
-  if type(_type) == "table" then
-    type_ok = false
-    for i, v in pairs(_type) do
-      if v == _type then
-        type_ok = true
-        break
-      end
-    end
-  elseif t ~= _type then
-    err((description or ""), key, "should be type " .. _type .. ", is", t)
-    type_ok = false
-  end
-  return type_ok, t
-end
-
-local known_msgs_count=0
-local known_msgkeys = {}
-local known_channel_keys = {}
-
-
-local k = {
-  channel = function(chid)
-    return ("%s{channel:%s}"):format(chid)
-  end,
-  msg = function (chid, msgid)
-    return ("%s:msg:%s"):format(k.channel(chid), msgid)
-  end,
-  messages = function(chid)
-    return k.channel(chid) .. ":messages"
-  end
-}
-
-local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)
-  description = description and "msg (" .. description ..")" or "msg"
-  local msgkey = k.msg(chid, msgid)
-  if not known_msgkeys[msgkey] then
-    known_msgs_count = known_msgs_count + 1
-  end
-  known_msgkeys[msgkey]=true
-  local ok, t = type_is(msgkey, {"hash", "none"}, "message hash")
-  if t == "none" then
-    --message is missing, but maybe it expired under normal circumstances. 
-    --check if any earlier messages are present
-    local msgids = redis.call('LRANGE', k.messages(chid), 0, -1)
-    local founds = 0
-    for i=#msgids, 1, -1 do
-      if msgids[i] == msgid then 
-        break
-      end
-      local thismsgkey = k.msg(chid, msgids[i])
-      local ttt = redis.call('type', thismsgkey)['ok']
-      redis.breakpoint()
-      if ttt == "hash" then
-        founds = founds + 1
-      end
-    end
-    
-    if founds > 0 then
-      err("message", msgkey, "missing, with", founds, "prev. msgs in msg list")
-    end
-    
-  end
-  local msg = tohash(redis.call('HGETALL', msgkey))
-  local ttl = tonumber(redis.call('TTL', msgkey))
-  local n = tonumber(redis.call("HLEN", msgkey))
-  if n > 0 and (msg.data == nil or msg.id == nil or msg.time == nil or msg.tag == nil)then
-    err("incomplete " .. description .."(ttl "..ttl..")", msgkey, tp(msg))
-    return false
-  end
-  if t == "hash" and tonumber(ttl) < 0 then
-    err("message", msgkey, "ttl =", ttl)
-  end
-  if ttl ~= -2 then
-    if prev_msgid ~= false and msg.prev ~= prev_msgid then
-      err(description, chid, msgid, "prev_message wrong. expected", prev_msgid, "got", msg.prev)
-    end
-    if next_msgid ~= false and msg.next ~= next_msgid then
-      err(description, chid, msgid, "next_message wrong. expected", next_msgid, "got", msg.next)
-    end
-  end
-end
-
-local check_channel = function(id)
-  local key={
-    ch = k.channel(id),
-    msgs = k.messages(id)
-  }
-  
-  local ok, chkey_type = type_is(key.ch, "hash", "channel hash")
-  if not ok then
-    if chkey_type ~= "none" then
-      err("unecpected channel key", key.ch, "type:", chkey_type);
-    end
-    return false
-  end
-  local _, msgs_list_type = type_is(key.msgs, {"list", "none"}, "channel messages list")
-  
-  local ch = tohash(redis.call('HGETALL', key.ch))
-  local len = tonumber(redis.call("HLEN", key.ch))
-  local ttl = tonumber(redis.call('TTL',  key.ch))
-  if not ch.current_message or not ch.time then
-    if msgs_list_type == "list" then
-      err("incomplete channel (ttl " .. ttl ..")", key.ch, tp(ch))
-    end  
-  elseif (ch.current_message or ch.prev_message) and msgs_list_type ~= "list" then
-    err("channel", key.ch, "has a current_message but no message list")
-  end
-  
-  local msgids = redis.call('LRANGE', key.msgs, 0, -1)
-  for i, msgid in ipairs(msgids) do
-    check_msg(id, msgid, msgids[i+1], msgids[i-1], "msglist")
-  end
-  
-  if ch.prev_message then
-    if redis.call('LINDEX', key.msgs, 1) ~= ch.prev_message then
-      err("channel", key.ch, "prev_message doesn't correspond to", key.msgs, "second list element")
-    end
-    check_msg(id, ch.prev_message, false, ch.current_message, "channel prev_message")
-  end
-  if ch.current_message then
-    if redis.call('LINDEX', key.msgs, 0) ~= ch.current_message then
-      err("channel", key.ch, "current_message doesn't correspond to", key.msgs, "first list element")
-    end
-    check_msg(id, ch.current_message, ch.prev_message, false, "channel current_message")
-  end
-  
-end
-
-local channel_ids = {}
-
-for i, chkey in ipairs(redis.call("KEYS", k.channel("*"))) do
-  local msgs_chid_match = chkey:match("^"..k.messages("*"))
-  if msgs_chid_match then
-    type_is(k.channel(msgs_chid_match), "hash", "channel messages' corresponding hash key")
-  elseif not chkey:match(":msg$") then
-    table.insert(channel_ids, chkey);
-    known_channel_keys[chkey] = true
-  end
-end
-
-dbg("found", #channel_ids, "channels")
-for i, chkey in ipairs(channel_ids) do
-  local chid = chkey:match("^" .. k.channel(".*"))
-  check_channel(chid)
-end
-
-for i, msgkey in ipairs(redis.call("KEYS", k.channel("*")..":msg")) do
-  if not known_msgkeys[msgkey] then
-    local ok, t = type_is(msgkey, "hash")
-    if ok then
-      if not redis.call('HGET', msgkey, 'unbuffered') then
-        err("orphan message", msgkey, "(ttl: " .. redis.call('TTL', msgkey) .. ")", tp(tohash(redis.call('HGETALL', msgkey)), 15))
-      end
-    else
-      err("orphan message", msgkey, "wrong type", t) 
-    end
-  end
-end
-
-if errors then
-  table.insert(errors, 1, concat(#channel_ids, "channels,",known_msgs_count,"messages found", #errors, "problems"))
-  return errors
-else
-  return concat(#channel_ids, "channels,", known_msgs_count, "messages, all ok")
-end
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_register.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_register.lua
deleted file mode 100644
index e2eafca..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_register.lua
+++ /dev/null
@@ -1,62 +0,0 @@
---input: keys: [], values: [namespace, channel_id, subscriber_id, active_ttl, time, want_channel_settings]
---  'subscriber_id' can be '-' for new id, or an existing id
---  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
---output: subscriber_id, num_current_subscribers, next_keepalive_time, channel_buffer_length
---  'channel_buffer_length' is returned only if want_channel_settings is 1
-
-local ns, id, sub_id, active_ttl, time = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20, tonumber(ARGV[5])
-local want_channel_settings = tonumber(ARGV[6]) == 1
-
---local dbg = function(...) redis.call('echo', table.concat({...})); end
-
-redis.call('echo', ' ######## SUBSCRIBER REGISTER SCRIPT ####### ')
-local ch=("%s{channel:%s}"):format(ns, id)
-local keys = {
-  channel =     ch,
-  messages =    ch..':messages',
-  subscribers = ch..':subscribers'
-}
-
-local setkeyttl=function(ttl)
-  for i,v in pairs(keys) do
-    if ttl > 0 then
-      redis.call('expire', v, ttl)
-    else
-      redis.call('persist', v)
-    end
-  end
-end
-
-local random_safe_next_ttl = function(ttl)
-  return math.floor(ttl/2 + ttl/2.1 * math.random())
-end
-
-local sub_count
-
-if sub_id == "-" then
-  sub_id = tonumber(redis.call('HINCRBY', keys.channel, "last_subscriber_id", 1))
-  sub_count=tonumber(redis.call('hincrby', keys.channel, 'subscribers', 1))
-else
-  sub_count=tonumber(redis.call('hget', keys.channel, 'subscribers'))
-end
-if time then
-  redis.call('hset', keys.channel, "last_seen_subscriber", time)
-end
-
-local next_keepalive 
-local actual_ttl = tonumber(redis.call('ttl', keys.channel))
-if actual_ttl < active_ttl then
-  setkeyttl(active_ttl)
-  next_keepalive = random_safe_next_ttl(active_ttl)
-else
-  next_keepalive = random_safe_next_ttl(actual_ttl)
-end
-
-
-local ret = {sub_id, sub_count, next_keepalive}
-if want_channel_settings then
-  local max_messages = tonumber(redis.call('hget', keys.channel, 'max_stored_messages'))
-  table.insert(ret, max_messages)
-end
-
-return ret
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_unregister.lua b/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
deleted file mode 100644
index 0343cc5..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
+++ /dev/null
@@ -1,49 +0,0 @@
---input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]
--- 'subscriber_id' is an existing id
--- 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
---output: subscriber_id, num_current_subscribers
-
-local ns, id, sub_id, empty_ttl = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20
-
---local dbg = function(...) redis.call('echo', table.concat({...})); end
-
-redis.call('echo', ' ######## SUBSCRIBER UNREGISTER SCRIPT ####### ')
-local ch=('%s{channel:%s}'):format(ns, id)
-local keys = {
-  channel =     ch,
-  messages =    ch..':messages',
-  subscribers = ch..':subscribers',
-}
-
-local setkeyttl=function(ttl)
-  for i,v in pairs(keys) do
-    if ttl > 0 then
-      redis.call('expire', v, ttl)
-    elseif ttl < 0 then
-      redis.call('persist', v)
-    else
-      redis.call('del', v)
-    end
-  end
-end
-
-local sub_count = 0
-
-local res = redis.pcall('EXISTS', keys.channel)
-if type(res) == "table" and res["err"] then
-  return {err = ("CLUSTER KEYSLOT ERROR. %i %s"):format(empty_ttl, id)}
-end
-
-if res ~= 0 then
-   sub_count = redis.call('hincrby', keys.channel, 'subscribers', -1)
-
-  if sub_count == 0 and tonumber(redis.call('LLEN', keys.messages)) == 0 then
-    setkeyttl(empty_ttl)
-  elseif sub_count < 0 then
-    return {err="Subscriber count for channel " .. id .. " less than zero: " .. sub_count}
-  end
-else
-  --dbg("channel ", id, " already gone")
-end
-
-return {sub_id, sub_count}
diff --git a/debian/modules/nchan/src/store/redis/redis-lua-scripts/testscripts.rb b/debian/modules/nchan/src/store/redis/redis-lua-scripts/testscripts.rb
deleted file mode 100755
index 739eb42..0000000
--- a/debian/modules/nchan/src/store/redis/redis-lua-scripts/testscripts.rb
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/bin/ruby
-require 'digest/sha1'
-require "redis"
-require 'open3'
-require 'minitest'
-require 'minitest/reporters'
-Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new(:color => true)]
-require "minitest/autorun"
-require 'securerandom'
-require "pry"
-
-REDIS_HOST="127.0.0.1"
-REDIS_PORT=8537
-REDIS_DB=1
-NAMESPACE="nchan:"
-
-class PubSubTest < Minitest::Test
-  @@redis=nil
-  @@scripts= {}
-  @@files=   {}
-  @@scripts= {}
-  @@hashes=  {}
-  
-  def self.test_order
-    :alpha
-  end
-  
-  def self.luac
-    if @@scripts
-      @@scripts.each do |name, script|
-        Open3.popen2e('luac', "-p", @@files[name]) do |stdin, stdouterr, process|
-          raise stdouterr.read unless process.value.success?
-        end
-      end
-    else
-      raise "scripts not loaded yet"
-    end
-  end
-  
-  def self.loadscripts
-    @@scripts.each do |name, script|
-      begin
-        h=@@redis.script :load, script
-        @@hashes[name]=h
-      rescue Redis::CommandError => e
-        e.message.gsub!(/:\s+(user_script):(\d+):/, ": \n#{name}.lua:\\2:")
-        def e.backtrace; []; end
-        raise e
-      end
-    end
-  end
-  
-  def setup
-    unless @@redis
-      @@redis=Redis.new(:host => REDIS_HOST, :port => REDIS_PORT, :db => REDIS_DB)
-
-      Dir[ "#{File.dirname(__FILE__)}/*.lua" ].each do |f|
-        scriptname=File.basename(f, ".lua").to_sym
-        @@scripts[scriptname]=IO.read f
-        @@files[scriptname]=f
-      end
-      self.class.luac
-      self.class.loadscripts
-    end
-  end
-
-  def redis; @@redis; end
-  def hashes; @@hashes; end
-
-  class Msg
-    attr_accessor :data, :chid, :time, :tag, :id, :content_type, :channel_info, :ttl, :max_buf_size, :eventsource_event
-    def _empty_is_nil(v)
-      v == "" ? nil : v
-    end
-    def initialize(channel_id, arg={})
-      @chid= _empty_is_nil channel_id
-      id(arg[:id]) if arg[:id]
-      @time= _empty_is_nil arg[:time]
-      @tag= _empty_is_nil arg[:tag]
-      @data= _empty_is_nil arg[:data]
-      if @data && @time.nil?
-        @time=Time.now.utc.to_i
-      end
-      @ttl=_empty_is_nil arg[:ttl]
-      @eventsource_event = _empty_is_nil arg[:eventsource_event]
-      @max_buf_size = _empty_is_nil arg[:max_buf_size] || 100
-      @content_type=_empty_is_nil arg[:content_type]
-    end
-    def ==(m)
-      self.to_s==m.to_s
-    end
-    
-    def to_s
-      "[#{@chid}]#{id}<#{@content_type}> #{@data}"
-    end
-    
-    def id(msgid=nil)
-      if msgid
-        @id=msgid
-        @time, @tag =@id.split(":")
-      else
-        @id||= "#{time}:#{tag}" unless time.nil? || tag.nil?
-      end
-      @id
-    end
-    def time=(t)
-      @time=t
-      id
-    end
-    def tag=(t)
-      @tag=t
-      id
-    end
-  end
-
-  def publish(*arg)
-    if arg.length==1
-      msg = arg.first
-      msg=Msg.new(msg[:channel_id] || msg[:chid], msg) if Hash === msg
-    elsif arg.length==2
-      msg=Msg.new(arg.first, arg.last)
-    end
-
-    msg.time= Time.now.utc.to_i unless msg.time
-    msg_tag, channel_info=redis.evalsha hashes[:publish], [], [NAMESPACE, msg.chid, msg.time, msg.data, msg.content_type, msg.eventsource_event, msg.ttl, msg.max_buf_size]
-    msg.tag=msg_tag
-    msg.channel_info=channel_info
-    return msg
-  end
-
-  def delete(ch_id)
-    redis.evalsha hashes[:delete], [], [NAMESPACE, ch_id]
-  end
-
-  def getmsg(msg, opt={})
-    if String===opt
-      ch_id=msg
-      msg_id=opt
-      msg_time, msg_tag = msg_id.split(":")
-    elsif Msg === msg
-      msg_id, msg_time, msg_tag = msg.id, msg.time, msg.tag
-      ch_id=msg.chid
-    else
-      msg_time, msg_tag = msg.split(":")
-      msg_id=msg
-    end
-    traverse_order=((Hash === opt) && opt[:getfirst]) ? 'FIFO' : 'FILO'
-    msg_tag=0 if msg_time && msg_tag.nil?
-    #binding.pry
-    status, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, msg_data, msg_content_type, msg_eventsource_event, subscriber_count = redis.evalsha hashes[:get_message], [], [NAMESPACE, ch_id, msg_time || 0, msg_tag || 0, traverse_order, 15 ]
-    if status == 404
-      return nil
-    elsif status == 418 #not ready
-      return false
-    elsif status == 200
-      return Msg.new ch_id, time: msg_time, tag: msg_tag, data: msg_data, content_type: msg_content_type, eventsource_event: msg_eventsource_event, ttl: msg_ttl
-    end
-  end
-
-  def randid
-    SecureRandom.hex
-  end
-
-  def test_connection
-    assert_equal "PONG", redis.ping
-  end
-
-  #now for the real tests
-  def test_publish
-    msg_id, channel = publish chid: randid, data: "hello what is this", ttl: 10, content_type: "X-fruit/banana"
-  end
-  
-  def test_nomessage
-    id = randid
-    publish chid: id, data:"whatever this is", ttl: 100
-    msg = getmsg randid, "1200:0"
-    refute msg, "message should be absent"
-  end
-  
-  def test_simple
-    id=randid
-    msg2_data = "what is this i don't even"
-    m=[]
-    m << Msg.new(id, data: "whatever",ttl: 100, content_type: "X-fruit/banana")
-    m << Msg.new(id, data: msg2_data, ttl: 100, content_type: "X-fruit/banana")
-    m.each do |msg|
-      publish msg
-    end
-    refute_equal m[0], m[1], "two different messages should have different message ids"
-    msg = getmsg m[0]
-
-    assert_equal m[1], msg, "retrieved message doesn't match"
-  end
-  
-  def test_publish_invalid_content_type
-    e = assert_raises Redis::CommandError do
-      publish randid, data: "this message has an invalid content-type", content_type: "foo:bar", ttl: 10
-    end
-    assert_match /cannot contain ":"/, e.message
-  end
-  
-  def test_walk_buffer
-    id=randid
-    sent=[]
-    %w( foobar1 whatthe-somethng-of isnot-even-meaning -has-you-evenr-as-sofar-as-to -even-move-zig).each do |w|
-      sent << Msg.new(id, data: w, ttl: 100)
-      sleep rand(0..1.1)
-    end
-    sent.each do |m|
-      publish m
-    end
-    
-    cur=Msg.new(id)
-    while sent.length>0
-      #binding.pry
-      cur=getmsg cur
-      n=sent.shift
-      assert_equal cur, n
-      cur=n
-    end
-    assert_equal false, getmsg(cur), "Last message should return 'false'"
-  end
-  
-  def test_timeout
-    id=randid
-    sent=[]
-    sent << publish(Msg.new(id, data: "fee", ttl: 3))
-    sleep 2
-    sent << publish(Msg.new(id, data: "foo", ttl: 3))
-    sent << publish(Msg.new(id, data: "fie", ttl: 3))
-    sleep 1.5
-    cur=getmsg id, ""
-    assert_equal cur, sent[1]
-    sleep 1.6
-    cur=getmsg id, ""
-    assert_equal false, cur
-    #nice!
-  end
-  
-  def test_largemsg
-    id=randid
-    sent= publish(Msg.new id, data: "0" * 100000 * 1024, ttl: 20)
-    cur = getmsg id, ""
-    assert_equal cur, sent
-  end
-  
-  def test_delete
-    id=randid
-    sent=[]
-    sent << publish(Msg.new(id, data: "fee", ttl: 30))
-    sent << publish(Msg.new(id, data: "foo", ttl: 30))
-    sent << publish(Msg.new(id, data: "foo2", ttl: 30))
-    
-    cur=getmsg id, ""
-    assert_equal sent[0], cur
-    
-    cur=getmsg cur
-    assert_equal sent[1], cur
-    
-    cur=getmsg cur
-    assert_equal sent[2], cur
-    
-    delete id
-    
-    cur=getmsg Msg.new(id), sub: 'foobar'
-    assert_equal false, cur
-  end
-  
-end
diff --git a/debian/modules/nchan/src/store/redis/redis_lua_commands.c b/debian/modules/nchan/src/store/redis/redis_lua_commands.c
deleted file mode 100644
index b4e8fdb..0000000
--- a/debian/modules/nchan/src/store/redis/redis_lua_commands.c
+++ /dev/null
@@ -1,1073 +0,0 @@
-#include "redis_lua_commands.h"
-
-redis_lua_scripts_t redis_lua_scripts = {
-  {"add_fakesub", "fd2ee193a2518982e607f99623c8200849b21098",
-   "--input:  keys: [], values: [namespace, channel_id, number, time]\n"
-   "--output: current_fake_subscribers\n"
-   "  \n"
-   "redis.call('echo', ' ####### FAKESUBS ####### ')\n"
-   "local ns=ARGV[1]\n"
-   "local id=ARGV[2]\n"
-   "local num=tonumber(ARGV[3])\n"
-   "local time = tonumber(ARGV[4])\n"
-   "if num==nil then\n"
-   "  return {err=\"fakesub number not given\"}\n"
-   "end\n"
-   "\n"
-   "local chan_key = ('%s{channel:%s}'):format(ns, id)\n"
-   "\n"
-   "local res = redis.pcall('EXISTS', chan_key)\n"
-   "if type(res) == \"table\" and res[\"err\"] then\n"
-   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(num, id)}\n"
-   "end\n"
-   "\n"
-   "local exists = res == 1\n"
-   "\n"
-   "local cur = 0\n"
-   "\n"
-   "if exists or (not exists and num > 0) then\n"
-   "  cur = redis.call('HINCRBY', chan_key, 'fake_subscribers', num)\n"
-   "  if time then\n"
-   "    redis.call('HSET', chan_key, 'last_seen_fake_subscriber', time)\n"
-   "  end\n"
-   "  if not exists then\n"
-   "    redis.call('EXPIRE', chan_key, 5) --something small\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "return cur\n"},
-
-  {"channel_keepalive", "7e213d514486887425875dc9835564edfe14e677",
-   "--input:  keys: [], values: [namespace, channel_id, ttl]\n"
-   "-- ttl is for when there are no messages but at least 1 subscriber.\n"
-   "--output: seconds until next keepalive is expected, or -1 for \"let it disappear\"\n"
-   "redis.call('ECHO', ' ####### CHANNEL KEEPALIVE ####### ')\n"
-   "local ns=ARGV[1]\n"
-   "local id=ARGV[2]\n"
-   "local ttl=tonumber(ARGV[3])\n"
-   "if not ttl then\n"
-   "  return {err=\"Invalid channel keepalive TTL (2nd arg)\"}\n"
-   "end\n"
-   "\n"
-   "local random_safe_next_ttl = function(ttl)\n"
-   "  return math.floor(ttl/2 + ttl/2.1 * math.random())\n"
-   "end\n"
-   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
-   "local key={\n"
-   "  channel=   ch, --hash\n"
-   "  messages=  ch..':messages', --list\n"
-   "}\n"
-   "  \n"
-   "local subs_count = tonumber(redis.call('HGET', key.channel, \"subscribers\")) or 0\n"
-   "local msgs_count = tonumber(redis.call('LLEN', key.messages)) or 0\n"
-   "local actual_ttl = tonumber(redis.call('TTL',  key.channel))\n"
-   "\n"
-   "if subs_count > 0 then\n"
-   "  if msgs_count > 0 and actual_ttl > ttl then\n"
-   "    return random_safe_next_ttl(actual_ttl)\n"
-   "  end\n"
-   "  --refresh ttl\n"
-   "  redis.call('expire', key.channel, ttl);\n"
-   "  redis.call('expire', key.messages, ttl);\n"
-   "  return random_safe_next_ttl(ttl)\n"
-   "else\n"
-   "  return -1\n"
-   "end\n"},
-
-  {"delete", "a6008241827ea3bdec215b4460e96ad498cad8cb",
-   "--input: keys: [],  values: [ namespace, channel_id ]\n"
-   "--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil\n"
-   "-- delete this channel and all its messages\n"
-   "local ns = ARGV[1]\n"
-   "local id = ARGV[2]\n"
-   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
-   "local key_msg=    ch..':msg:%s' --not finished yet\n"
-   "local key_channel=ch\n"
-   "local messages=   ch..':messages'\n"
-   "local subscribers=ch..':subscribers'\n"
-   "local pubsub=     ch..':pubsub'\n"
-   "\n"
-   "redis.call('echo', ' ####### DELETE #######')\n"
-   "local num_messages = 0\n"
-   "--delete all the messages right now mister!\n"
-   "local msg\n"
-   "while true do\n"
-   "  msg = redis.call('LPOP', messages)\n"
-   "  if msg then\n"
-   "    num_messages = num_messages + 1\n"
-   "    redis.call('DEL', key_msg:format(msg))\n"
-   "  else\n"
-   "    break\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local del_msgpack =cmsgpack.pack({\"alert\", \"delete channel\", id})\n"
-   "for k,channel_key in pairs(redis.call('SMEMBERS', subscribers)) do\n"
-   "  redis.call('PUBLISH', channel_key, del_msgpack)\n"
-   "end\n"
-   "\n"
-   "local tohash=function(arr)\n"
-   "  if type(arr)~=\"table\" then\n"
-   "    return nil\n"
-   "  end\n"
-   "  local h = {}\n"
-   "  local k=nil\n"
-   "  for i, v in ipairs(arr) do\n"
-   "    if k == nil then\n"
-   "      k=v\n"
-   "    else\n"
-   "      h[k]=v; k=nil\n"
-   "    end\n"
-   "  end\n"
-   "  return h\n"
-   "end\n"
-   "\n"
-   "local channel = nil\n"
-   "if redis.call('EXISTS', key_channel) ~= 0 then\n"
-   "  channel = tohash(redis.call('hgetall', key_channel))\n"
-   "  --leave some crumbs behind showing this channel was just deleted\n"
-   "  redis.call('setex', ch..\":deleted\", 5, 1)  \n"
-   "end\n"
-   "\n"
-   "redis.call('DEL', key_channel, messages, subscribers)\n"
-   "redis.call('PUBLISH', pubsub, del_msgpack)\n"
-   "\n"
-   "if channel then\n"
-   "  return {\n"
-   "    tonumber(channel.ttl) or 0,\n"
-   "    tonumber(channel.last_seen_fake_subscriber) or 0,\n"
-   "    tonumber(channel.fake_subscribers or channel.subscribers) or 0,\n"
-   "    channel.current_message or \"\",\n"
-   "    tonumber(num_messages)\n"
-   "  }\n"
-   "else\n"
-   "  return nil\n"
-   "end\n"},
-
-  {"find_channel", "d027f1bc80eb1afc33f909759dfb7428cf1f9063",
-   "--input: keys: [],  values: [ namespace, channel_id ]\n"
-   "--output: channel_hash {ttl, time_last_seen, subscribers, last_channel_id, messages} or nil\n"
-   "-- finds and return the info hash of a channel, or nil of channel not found\n"
-   "local ns = ARGV[1]\n"
-   "local id = ARGV[2]\n"
-   "local channel_key = ('%s{channel:%s}'):format(ns, id)\n"
-   "local messages_key = channel_key..':messages'\n"
-   "\n"
-   "redis.call('echo', ' #######  FIND_CHANNEL ######## ')\n"
-   "\n"
-   "--check old entries\n"
-   "local oldestmsg=function(list_key, old_fmt)\n"
-   "  local old, oldkey\n"
-   "  local n, del=0,0\n"
-   "  while true do\n"
-   "    n=n+1\n"
-   "    old=redis.call('lindex', list_key, -1)\n"
-   "    if old then\n"
-   "      oldkey=old_fmt:format(old)\n"
-   "      local ex=redis.call('exists', oldkey)\n"
-   "      if ex==1 then\n"
-   "        return oldkey\n"
-   "      else\n"
-   "        redis.call('rpop', list_key)\n"
-   "        del=del+1\n"
-   "      end\n"
-   "    else\n"
-   "      break\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local tohash=function(arr)\n"
-   "  if type(arr)~=\"table\" then\n"
-   "    return nil\n"
-   "  end\n"
-   "  local h = {}\n"
-   "  local k=nil\n"
-   "  for i, v in ipairs(arr) do\n"
-   "    if k == nil then\n"
-   "      k=v\n"
-   "    else\n"
-   "      --dbg(k..\"=\"..v)\n"
-   "      h[k]=v; k=nil\n"
-   "    end\n"
-   "  end\n"
-   "  return h\n"
-   "end\n"
-   "\n"
-   "if redis.call('EXISTS', channel_key) ~= 0 then\n"
-   "  local ch = tohash(redis.call('hgetall', channel_key))\n"
-   "    \n"
-   "  local msgs_count\n"
-   "  if redis.call(\"TYPE\", messages_key)['ok'] == 'list' then\n"
-   "    oldestmsg(messages_key, channel_key ..':msg:%s')\n"
-   "    msgs_count = tonumber(redis.call('llen', messages_key))\n"
-   "  else\n"
-   "    msgs_count = 0\n"
-   "  end\n"
-   "  \n"
-   "  return {\n"
-   "    tonumber(ch.ttl) or 0,\n"
-   "    tonumber(ch.last_seen_fake_subscriber) or 0,\n"
-   "    tonumber(ch.fake_subscribers or ch.subscribers) or 0,\n"
-   "    ch.current_message or \"\",\n"
-   "    msgs_count\n"
-   "  }\n"
-   "else\n"
-   "  return nil\n"
-   "end\n"},
-
-  {"get_message", "fb9c46d33b3798a11d4eca6e0f7a3f92beba8685",
-   "--input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]\n"
-   "--output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count\n"
-   "-- no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent\n"
-   "-- create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.\n"
-   "-- result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available\n"
-   "local ns, id, time, tag, subscribe_if_current = ARGV[1], ARGV[2], tonumber(ARGV[3]), tonumber(ARGV[4])\n"
-   "local no_msgid_order=ARGV[5]\n"
-   "local create_channel_ttl=tonumber(ARGV[6]) or 0\n"
-   "local msg_id\n"
-   "if time and time ~= 0 and tag then\n"
-   "  msg_id=(\"%s:%s\"):format(time, tag)\n"
-   "end\n"
-   "\n"
-   "if redis.replicate_commands then\n"
-   "  redis.replicate_commands()\n"
-   "end\n"
-   "\n"
-   "-- This script has gotten big and ugly, but there are a few good reasons \n"
-   "-- to keep it big and ugly. It needs to do a lot of stuff atomically, and \n"
-   "-- redis doesn't do includes. It could be generated pre-insertion into redis, \n"
-   "-- but then error messages become less useful, complicating debugging. If you \n"
-   "-- have a solution to this, please help.\n"
-   "local ch=('%s{channel:%s}'):format(ns, id)\n"
-   "local msgkey_fmt=ch..':msg:%s'\n"
-   "local key={\n"
-   "  next_message= msgkey_fmt, --hash\n"
-   "  message=      msgkey_fmt, --hash\n"
-   "  channel=      ch, --hash\n"
-   "  messages=     ch..':messages', --list\n"
-   "--  pubsub=       ch..':subscribers:', --set\n"
-   "}\n"
-   "\n"
-   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
-   "\n"
-   "redis.call('echo', ' #######  GET_MESSAGE ######## ')\n"
-   "\n"
-   "local oldestmsg=function(list_key, old_fmt)\n"
-   "  local old, oldkey\n"
-   "  local n, del=0,0\n"
-   "  while true do\n"
-   "    n=n+1\n"
-   "    old=redis.call('lindex', list_key, -1)\n"
-   "    if old then\n"
-   "      oldkey=old_fmt:format(old)\n"
-   "      local ex=redis.call('exists', oldkey)\n"
-   "      if ex==1 then\n"
-   "        return oldkey\n"
-   "      else\n"
-   "        redis.call('rpop', list_key)\n"
-   "        del=del+1\n"
-   "      end \n"
-   "    else\n"
-   "      --dbg(list_key, \" is empty\")\n"
-   "      break\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local tohash=function(arr)\n"
-   "  if type(arr)~=\"table\" then\n"
-   "    return nil\n"
-   "  end\n"
-   "  local h = {}\n"
-   "  local k=nil\n"
-   "  for i, v in ipairs(arr) do\n"
-   "    if k == nil then\n"
-   "      k=v\n"
-   "    else\n"
-   "      --dbg(k..\"=\"..v)\n"
-   "      h[k]=v; k=nil\n"
-   "    end\n"
-   "  end\n"
-   "  return h\n"
-   "end\n"
-   "\n"
-   "if no_msgid_order ~= 'FIFO' then\n"
-   "  no_msgid_order = 'FILO'\n"
-   "end\n"
-   "\n"
-   "local channel = tohash(redis.call('HGETALL', key.channel))\n"
-   "local new_channel = false\n"
-   "if next(channel) == nil then\n"
-   "  if create_channel_ttl==0 then\n"
-   "    return {404, nil}\n"
-   "  end\n"
-   "  redis.call('HSET', key.channel, 'time', time)\n"
-   "  redis.call('EXPIRE', key.channel, create_channel_ttl)\n"
-   "  channel = {time=time}\n"
-   "  new_channel = true\n"
-   "end\n"
-   "\n"
-   "local subs_count = tonumber(channel.subscribers)\n"
-   "\n"
-   "if msg_id==nil then\n"
-   "  local found_msg_key\n"
-   "  if new_channel then\n"
-   "    --dbg(\"new channel\")\n"
-   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
-   "  else\n"
-   "    --dbg(\"no msg id given, ord=\"..no_msgid_order)\n"
-   "    \n"
-   "    if no_msgid_order == 'FIFO' then --most recent message\n"
-   "      --dbg(\"get most recent\")\n"
-   "      found_msg_key=channel.current_message\n"
-   "    elseif no_msgid_order == 'FILO' then --oldest message\n"
-   "      --dbg(\"get oldest\")\n"
-   "      found_msg_key=oldestmsg(key.messages, msgkey_fmt)\n"
-   "    end\n"
-   "    \n"
-   "    if found_msg_key == nil then\n"
-   "      --we await a message\n"
-   "      return {418, \"\", \"\", \"\", \"\", subs_count}\n"
-   "    else\n"
-   "      local msg=tohash(redis.call('HGETALL', found_msg_key))\n"
-   "      if not next(msg) then --empty\n"
-   "        return {404, \"\", \"\", \"\", \"\", subs_count}\n"
-   "      else\n"
-   "        --dbg((\"found msg %s:%s  after %s:%s\"):format(tostring(msg.time), tostring(msg.tag), tostring(time), tostring(tag)))\n"
-   "        local ttl = redis.call('TTL', found_msg_key)\n"
-   "        return {200, ttl, tonumber(msg.time) or \"\", tonumber(msg.tag) or \"\", tonumber(msg.prev_time) or \"\", tonumber(msg.prev_tag) or \"\", msg.data or \"\", msg.content_type or \"\", msg.eventsource_event or \"\", tonumber(msg.compression or 0), subs_count}\n"
-   "      end\n"
-   "    end\n"
-   "  end\n"
-   "else\n"
-   "  if msg_id and channel.current_message == msg_id\n"
-   "   or not channel.current_message then\n"
-   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
-   "  end\n"
-   "\n"
-   "  key.message=key.message:format(msg_id)\n"
-   "  local msg=tohash(redis.call('HGETALL', key.message))\n"
-   "\n"
-   "  if next(msg) == nil then -- no such message. it might've expired, or maybe it was never there\n"
-   "    --dbg(\"MESSAGE NOT FOUND\")\n"
-   "    return {404, nil}\n"
-   "  end\n"
-   "\n"
-   "  local next_msg, next_msgtime, next_msgtag\n"
-   "  if not msg.next then --this should have been taken care of by the channel.current_message check\n"
-   "    --dbg(\"NEXT MESSAGE KEY NOT PRESENT. ERROR, ERROR!\")\n"
-   "    return {404, nil}\n"
-   "  else\n"
-   "    --dbg(\"NEXT MESSAGE KEY PRESENT: \" .. msg.next)\n"
-   "    key.next_message=key.next_message:format(msg.next)\n"
-   "    if redis.call('EXISTS', key.next_message)~=0 then\n"
-   "      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event, ncompression=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))\n"
-   "      local ttl = redis.call('TTL', key.next_message)\n"
-   "      --dbg((\"found msg2 %i:%i  after %i:%i\"):format(ntime, ntag, time, tag))\n"
-   "      return {200, ttl, tonumber(ntime) or \"\", tonumber(ntag) or \"\", tonumber(prev_time) or \"\", tonumber(prev_tag) or \"\", ndata or \"\", ncontenttype or \"\", neventsource_event or \"\", ncompression or 0, subs_count}\n"
-   "    else\n"
-   "      --dbg(\"NEXT MESSAGE NOT FOUND\")\n"
-   "      return {404, nil}\n"
-   "    end\n"
-   "  end\n"
-   "end\n"},
-
-  {"get_message_from_key", "304efcd42590f99e0016686572530defd3de1383",
-   "--input:  keys: [message_key], values: []\n"
-   "--output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count\n"
-   "local key = KEYS[1]\n"
-   "\n"
-   "local ttl = redis.call('TTL', key)\n"
-   "local time, tag, prev_time, prev_tag, data, content_type, es_event, compression = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))\n"
-   "\n"
-   "return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or \"\", content_type or \"\", es_event or \"\", tonumber(compression or 0)}\n"},
-
-  {"get_subscriber_info_id", "3490d5bc3fdc7ed065d9d54b4a0cb8ad6b62c180",
-   "--input:  keys: [unique_request_id_key], values: []\n"
-   "--output: next_unique_request_id_integer\n"
-   "local key = KEYS[1]\n"
-   "\n"
-   "redis.call(\"ECHO\", \"###### GET SUBSCRIBER INFO ID ##########\")\n"
-   "\n"
-   "local resp = redis.pcall(\"INCR\", key)\n"
-   "local val\n"
-   "if type(resp) ~= \"number\" then\n"
-   "  redis.call(\"SET\", key, \"0\")\n"
-   "  val = redis.call(\"INCR\", key)\n"
-   "else\n"
-   "  val = resp\n"
-   "end\n"
-   "\n"
-   "redis.call(\"ECHO\", \"val: \" .. val)\n"
-   "\n"
-   "return val\n"},
-
-  {"publish", "be28281114137d8e85a25a913c50bed2e93d0c7d",
-   "--input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, optimize_target]\n"
-   "--output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?\n"
-   "\n"
-   "local ns, id=ARGV[1], ARGV[2]\n"
-   "\n"
-   "local msg = {}\n"
-   "\n"
-   "local store_at_most_n_messages = tonumber(ARGV[9])\n"
-   "if store_at_most_n_messages == nil or store_at_most_n_messages == \"\" then\n"
-   "  return {err=\"Argument 9, max_msg_buf_size, can't be empty\"}\n"
-   "end\n"
-   "if store_at_most_n_messages == 0 then\n"
-   "  msg.unbuffered = 1\n"
-   "end\n"
-   "\n"
-   "local msgpacked_pubsub_cutoff = tonumber(ARGV[10])\n"
-   "\n"
-   "local optimize_target = tonumber(ARGV[11]) == 2 and \"bandwidth\" or \"cpu\"\n"
-   "\n"
-   "local time\n"
-   "if optimize_target == \"cpu\" and redis.replicate_commands then\n"
-   "  -- we're on redis >= 3.2. We can use We can use 'script effects replication' to allow\n"
-   "  -- writing nondeterministic command values like TIME.\n"
-   "  -- That's exactly what we want to do, use Redis' TIME rather than the given time from Nginx\n"
-   "  -- Also, it's more efficient to replicate just the commands in this case rather than run the whole script\n"
-   "  redis.replicate_commands()\n"
-   "  time = tonumber(redis.call('TIME')[1])\n"
-   "else\n"
-   "  --fallback to the provided time\n"
-   "  time = tonumber(ARGV[3])\n"
-   "end\n"
-   "\n"
-   "msg.id=nil\n"
-   "msg.data= ARGV[4]\n"
-   "msg.content_type=ARGV[5]\n"
-   "msg.eventsource_event=ARGV[6]\n"
-   "msg.compression=tonumber(ARGV[7])\n"
-   "msg.ttl= tonumber(ARGV[8])\n"
-   "msg.time= time\n"
-   "msg.tag= 0\n"
-   "\n"
-   "if msg.ttl == 0 then\n"
-   "  msg.ttl = 126144000 --4 years\n"
-   "end\n"
-   "\n"
-   "--[[local dbg = function(...)\n"
-   "  local arg = {...}\n"
-   "  for i = 1, #arg do\n"
-   "    arg[i]=tostring(arg[i])\n"
-   "  end\n"
-   "  redis.call('echo', table.concat(arg, \", \"))\n"
-   "end]]\n"
-   "\n"
-   "if type(msg.content_type)=='string' and msg.content_type:find(':') then\n"
-   "  return {err='Message content-type cannot contain \":\" character.'}\n"
-   "end\n"
-   "\n"
-   "redis.call('echo', ' #######  PUBLISH   ######## ')\n"
-   "\n"
-   "-- sets all fields for a hash from a dictionary\n"
-   "local hmset = function (key, dict)\n"
-   "  if next(dict) == nil then return nil end\n"
-   "  local bulk = {}\n"
-   "  for k, v in pairs(dict) do\n"
-   "    table.insert(bulk, k)\n"
-   "    table.insert(bulk, v)\n"
-   "  end\n"
-   "  return redis.call('HMSET', key, unpack(bulk))\n"
-   "end\n"
-   "\n"
-   "local tohash=function(arr)\n"
-   "  if type(arr)~=\"table\" then\n"
-   "    return nil\n"
-   "  end\n"
-   "  local h = {}\n"
-   "  local k=nil\n"
-   "  for i, v in ipairs(arr) do\n"
-   "    if k == nil then\n"
-   "      k=v\n"
-   "    else\n"
-   "      h[k]=v; k=nil\n"
-   "    end\n"
-   "  end\n"
-   "  return h\n"
-   "end\n"
-   "\n"
-   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
-   "local msg_fmt = ch..':msg:%s'\n"
-   "local key={\n"
-   "  last_message= msg_fmt, --not finished yet\n"
-   "  message=      msg_fmt, --not finished yet\n"
-   "  channel=      ch,\n"
-   "  messages=     ch..':messages',\n"
-   "  subscribers=  ch..':subscribers'\n"
-   "}\n"
-   "local channel_pubsub = ch..':pubsub'\n"
-   "\n"
-   "local new_channel\n"
-   "local channel\n"
-   "if redis.call('EXISTS', key.channel) ~= 0 then\n"
-   "  channel=tohash(redis.call('HGETALL', key.channel))\n"
-   "  channel.max_stored_messages = tonumber(channel.max_stored_messages)\n"
-   "end\n"
-   "\n"
-   "if channel~=nil then\n"
-   "  --dbg(\"channel present\")\n"
-   "  if channel.current_message ~= nil then\n"
-   "    --dbg(\"channel current_message present\")\n"
-   "    key.last_message=key.last_message:format(channel.current_message, id)\n"
-   "  else\n"
-   "    --dbg(\"channel current_message absent\")\n"
-   "    key.last_message=nil\n"
-   "  end\n"
-   "  new_channel=false\n"
-   "else\n"
-   "  --dbg(\"channel missing\")\n"
-   "  channel={}\n"
-   "  new_channel=true\n"
-   "  key.last_message=nil\n"
-   "end\n"
-   "\n"
-   "--set new message id\n"
-   "local lastmsg, lasttime, lasttag\n"
-   "if key.last_message then\n"
-   "  lastmsg = redis.call('HMGET', key.last_message, 'time', 'tag')\n"
-   "  lasttime, lasttag = tonumber(lastmsg[1]), tonumber(lastmsg[2])\n"
-   "  --dbg(\"New message id: last_time \", lasttime, \" last_tag \", lasttag, \" msg_time \", msg.time)\n"
-   "  if lasttime and tonumber(lasttime) > tonumber(msg.time) then\n"
-   "    redis.log(redis.LOG_WARNING, \"Nchan: message for \" .. id .. \" arrived a little late and may be delivered out of order. Redis must be very busy, or the Nginx servers do not have their times synchronized.\")\n"
-   "    msg.time = lasttime\n"
-   "    time = lasttime\n"
-   "  end\n"
-   "  if lasttime and lasttime==msg.time then\n"
-   "    msg.tag=lasttag+1\n"
-   "  end\n"
-   "  msg.prev_time = lasttime\n"
-   "  msg.prev_tag = lasttag\n"
-   "else\n"
-   "  msg.prev_time = 0\n"
-   "  msg.prev_tag = 0\n"
-   "end\n"
-   "msg.id=('%i:%i'):format(msg.time, msg.tag)\n"
-   "\n"
-   "key.message=key.message:format(msg.id)\n"
-   "if redis.call('EXISTS', key.message) ~= 0 then\n"
-   "  local hash_tostr=function(h)\n"
-   "    local tt = {}\n"
-   "    for k, v in pairs(h) do\n"
-   "      table.insert(tt, (\"%s: %s\"):format(k, v))\n"
-   "    end\n"
-   "    return \"{\" .. table.concat(tt,\", \") .. \"}\"\n"
-   "  end\n"
-   "  local existing_msg = tohash(redis.call('HGETALL', key.message))\n"
-   "  local errmsg = \"Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s. dbg: channel: %s, messages_key: %s, msglist: %s, msg: %s, msg_expire: %s.\"\n"
-   "  errmsg = errmsg:format(key.message, id, msg.id or \"-\", time or \"-\", lasttime or \"-\", lasttag or \"-\", hash_tostr(channel), key.messages, \"[\"..table.concat(redis.call('LRANGE', key.messages, 0, -1), \", \")..\"]\", hash_tostr(existing_msg), redis.call('TTL', key.message))\n"
-   "  return {err=errmsg}\n"
-   "end\n"
-   "\n"
-   "msg.prev=channel.current_message\n"
-   "if key.last_message and redis.call('exists', key.last_message) == 1 then\n"
-   "  redis.call('HSET', key.last_message, 'next', msg.id)\n"
-   "end\n"
-   "\n"
-   "--update channel\n"
-   "redis.call('HSET', key.channel, 'current_message', msg.id)\n"
-   "if msg.prev then\n"
-   "  redis.call('HSET', key.channel, 'prev_message', msg.prev)\n"
-   "end\n"
-   "if time then\n"
-   "  redis.call('HSET', key.channel, 'time', time)\n"
-   "end\n"
-   "\n"
-   "local message_len_changed = false\n"
-   "if channel.max_stored_messages ~= store_at_most_n_messages then\n"
-   "  channel.max_stored_messages = store_at_most_n_messages\n"
-   "  message_len_changed = true\n"
-   "  redis.call('HSET', key.channel, 'max_stored_messages', store_at_most_n_messages)\n"
-   "  --dbg(\"channel.max_stored_messages was not set, but is now \", store_at_most_n_messages)\n"
-   "end\n"
-   "\n"
-   "--write message\n"
-   "hmset(key.message, msg)\n"
-   "\n"
-   "\n"
-   "--check old entries\n"
-   "local oldestmsg=function(list_key, old_fmt)\n"
-   "  local old, oldkey\n"
-   "  local n, del=0,0\n"
-   "  while true do\n"
-   "    n=n+1\n"
-   "    old=redis.call('lindex', list_key, -1)\n"
-   "    if old then\n"
-   "      oldkey=old_fmt:format(old)\n"
-   "      local ex=redis.call('exists', oldkey)\n"
-   "      if ex==1 then\n"
-   "        return oldkey\n"
-   "      else\n"
-   "        redis.call('rpop', list_key)\n"
-   "        del=del+1\n"
-   "      end\n"
-   "    else\n"
-   "      break\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local max_stored_msgs = channel.max_stored_messages or -1\n"
-   "\n"
-   "if max_stored_msgs < 0 then --no limit\n"
-   "  oldestmsg(key.messages, msg_fmt)\n"
-   "  redis.call('LPUSH', key.messages, msg.id)\n"
-   "elseif max_stored_msgs > 0 then\n"
-   "  local stored_messages = tonumber(redis.call('LLEN', key.messages))\n"
-   "  redis.call('LPUSH', key.messages, msg.id)\n"
-   "  -- Reduce the message length if necessary\n"
-   "  local dump_message_ids = redis.call('LRANGE', key.messages, max_stored_msgs, stored_messages);\n"
-   "  if dump_message_ids then\n"
-   "    for _, msgid in ipairs(dump_message_ids) do\n"
-   "      redis.call('DEL', msg_fmt:format(msgid))\n"
-   "    end\n"
-   "  end\n"
-   "  redis.call('LTRIM', key.messages, 0, max_stored_msgs - 1)\n"
-   "  oldestmsg(key.messages, msg_fmt)\n"
-   "end\n"
-   "\n"
-   "\n"
-   "--set expiration times for all the things\n"
-   "local channel_ttl = tonumber(redis.call('TTL',  key.channel))\n"
-   "redis.call('EXPIRE', key.message, msg.ttl)\n"
-   "if msg.ttl + 1 > channel_ttl then -- a little extra time for failover weirdness for 1-second TTL messages\n"
-   "  redis.call('EXPIRE', key.channel, msg.ttl + 1)\n"
-   "  redis.call('EXPIRE', key.messages, msg.ttl + 1)\n"
-   "  redis.call('EXPIRE', key.subscribers, msg.ttl + 1)\n"
-   "end\n"
-   "\n"
-   "--publish message\n"
-   "local unpacked\n"
-   "\n"
-   "if msg.unbuffered or #msg.data < msgpacked_pubsub_cutoff then\n"
-   "  unpacked= {\n"
-   "    \"msg\",\n"
-   "    msg.ttl or 0,\n"
-   "    msg.time,\n"
-   "    tonumber(msg.tag) or 0,\n"
-   "    (msg.unbuffered and 0 or msg.prev_time) or 0,\n"
-   "    (msg.unbuffered and 0 or msg.prev_tag) or 0,\n"
-   "    msg.data or \"\",\n"
-   "    msg.content_type or \"\",\n"
-   "    msg.eventsource_event or \"\",\n"
-   "    msg.compression or 0\n"
-   "  }\n"
-   "else\n"
-   "  unpacked= {\n"
-   "    \"msgkey\",\n"
-   "    msg.time,\n"
-   "    tonumber(msg.tag) or 0,\n"
-   "    key.message\n"
-   "  }\n"
-   "end\n"
-   "\n"
-   "if message_len_changed then\n"
-   "  unpacked[1] = \"max_msgs+\" .. unpacked[1]\n"
-   "  table.insert(unpacked, 2, tonumber(channel.max_stored_messages))\n"
-   "end\n"
-   "\n"
-   "local msgpacked\n"
-   "\n"
-   "--dbg((\"Stored message with id %i:%i => %s\"):format(msg.time, msg.tag, msg.data))\n"
-   "\n"
-   "--we used to publish conditionally on subscribers on the Redis pubsub channel\n"
-   "--but now that we're subscribing to slaves this is not possible\n"
-   "--so just PUBLISH always.\n"
-   "msgpacked = cmsgpack.pack(unpacked)\n"
-   "redis.call('PUBLISH', channel_pubsub, msgpacked)\n"
-   "\n"
-   "local num_messages = redis.call('llen', key.messages)\n"
-   "\n"
-   "--dbg(\"channel \", id, \" ttl: \",channel.ttl, \", subscribers: \", channel.subscribers, \"(fake: \", channel.fake_subscribers or \"nil\", \"), messages: \", num_messages)\n"
-   "local ch = {\n"
-   "  tonumber(channel.ttl or msg.ttl),\n"
-   "  tonumber(channel.last_seen_fake_subscriber) or 0,\n"
-   "  tonumber(channel.fake_subscribers or channel.subscribers) or 0,\n"
-   "  msg.time and msg.time and (\"%i:%i\"):format(msg.time, msg.tag) or \"\",\n"
-   "  tonumber(num_messages)\n"
-   "}\n"
-   "\n"
-   "return {ch, new_channel}\n"},
-
-  {"publish_status", "2f2ce1443b22c8c9cf069d5588bad4bab58d70aa",
-   "--input:  keys: [], values: [namespace, channel_id, status_code]\n"
-   "--output: current_subscribers\n"
-   "\n"
-   "redis.call('echo', ' ####### PUBLISH STATUS ####### ')\n"
-   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
-   "local ns, id=ARGV[1], ARGV[2]\n"
-   "local code=tonumber(ARGV[3])\n"
-   "if code==nil then\n"
-   "  return {err=\"non-numeric status code given, bailing!\"}\n"
-   "end\n"
-   "\n"
-   "local pubmsg = \"status:\"..code\n"
-   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
-   "local subs_key = ch..':subscribers'\n"
-   "local chan_key = ch\n"
-   "--local channel_pubsub = ch..':pubsub'\n"
-   "\n"
-   "for k,channel_key in pairs(redis.call('SMEMBERS', subs_key)) do\n"
-   "  --not efficient, but useful for a few short-term subscriptions\n"
-   "  redis.call('PUBLISH', channel_key, pubmsg)\n"
-   "end\n"
-   "--clear short-term subscriber list\n"
-   "redis.call('DEL', subs_key)\n"
-   "--now publish to the efficient channel\n"
-   "--what?... redis.call('PUBLISH', channel_pubsub, pubmsg)\n"
-   "return redis.call('HGET', chan_key, 'subscribers') or 0\n"},
-
-  {"request_subscriber_info", "93c500e094dfc5364251854eeac8d4331a0223c0",
-   "--input: keys: [],  values: [ namespace, channel_id, info_response_id ]\n"
-   "--output: -nothing-\n"
-   "\n"
-   "local ns = ARGV[1]\n"
-   "local channel_id = ARGV[2]\n"
-   "local response_id = tonumber(ARGV[3])\n"
-   "local pubsub = ('%s{channel:%s}:pubsub'):format(ns, channel_id)\n"
-   "\n"
-   "redis.call('echo', ' ####### REQUEST_SUBSCRIBER_INFO #######')\n"
-   "\n"
-   "local alert_msgpack =cmsgpack.pack({\"alert\", \"subscriber info\", response_id})\n"
-   "\n"
-   "redis.call('PUBLISH', pubsub, alert_msgpack)\n"
-   "\n"
-   "return true\n"},
-
-  {"rsck", "2fca046fa783d6cc25e493c993c407e59998e6e8",
-   "--redis-store consistency check\n"
-   "local ns = ARGV[1]\n"
-   "if ns and #ns > 0 then\n"
-   "  ns = ns..\":\"\n"
-   "end\n"
-   "\n"
-   "local concat = function(...)\n"
-   "  local arg = {...}\n"
-   "  for i = 1, #arg do\n"
-   "    arg[i]=tostring(arg[i])\n"
-   "  end\n"
-   "  return table.concat(arg, \" \")\n"
-   "end\n"
-   "local dbg =function(...) redis.call('echo', concat(...)); end\n"
-   "local errors={}\n"
-   "local err = function(...)\n"
-   "  local msg = concat(...)\n"
-   "  dbg(msg)\n"
-   "  table.insert(errors, msg)\n"
-   "end\n"
-   "\n"
-   "local tp=function(t, max_n)\n"
-   "  local tt={}\n"
-   "  for i, v in pairs(t) do\n"
-   "    local val = tostring(v)\n"
-   "    if max_n and #val > max_n then\n"
-   "      val = val:sub(1, max_n) .. \"[...]\"\n"
-   "    end\n"
-   "    table.insert(tt, tostring(i) .. \": \" .. val)\n"
-   "  end\n"
-   "  return \"{\" .. table.concat(tt, \", \") .. \"}\"\n"
-   "end\n"
-   "\n"
-   "local tohash=function(arr)\n"
-   "  if type(arr)~=\"table\" then\n"
-   "    return nil\n"
-   "  end\n"
-   "  local h = {}\n"
-   "  local k=nil\n"
-   "  for i, v in ipairs(arr) do\n"
-   "    if k == nil then\n"
-   "      k=v\n"
-   "    else\n"
-   "      h[k]=v; k=nil\n"
-   "    end\n"
-   "  end\n"
-   "  return h\n"
-   "end\n"
-   "local type_is = function(key, _type, description)\n"
-   "  local t = redis.call(\"TYPE\", key)['ok']\n"
-   "  local type_ok = true\n"
-   "  if type(_type) == \"table\" then\n"
-   "    type_ok = false\n"
-   "    for i, v in pairs(_type) do\n"
-   "      if v == _type then\n"
-   "        type_ok = true\n"
-   "        break\n"
-   "      end\n"
-   "    end\n"
-   "  elseif t ~= _type then\n"
-   "    err((description or \"\"), key, \"should be type \" .. _type .. \", is\", t)\n"
-   "    type_ok = false\n"
-   "  end\n"
-   "  return type_ok, t\n"
-   "end\n"
-   "\n"
-   "local known_msgs_count=0\n"
-   "local known_msgkeys = {}\n"
-   "local known_channel_keys = {}\n"
-   "\n"
-   "\n"
-   "local k = {\n"
-   "  channel = function(chid)\n"
-   "    return (\"%s{channel:%s}\"):format(chid)\n"
-   "  end,\n"
-   "  msg = function (chid, msgid)\n"
-   "    return (\"%s:msg:%s\"):format(k.channel(chid), msgid)\n"
-   "  end,\n"
-   "  messages = function(chid)\n"
-   "    return k.channel(chid) .. \":messages\"\n"
-   "  end\n"
-   "}\n"
-   "\n"
-   "local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)\n"
-   "  description = description and \"msg (\" .. description ..\")\" or \"msg\"\n"
-   "  local msgkey = k.msg(chid, msgid)\n"
-   "  if not known_msgkeys[msgkey] then\n"
-   "    known_msgs_count = known_msgs_count + 1\n"
-   "  end\n"
-   "  known_msgkeys[msgkey]=true\n"
-   "  local ok, t = type_is(msgkey, {\"hash\", \"none\"}, \"message hash\")\n"
-   "  if t == \"none\" then\n"
-   "    --message is missing, but maybe it expired under normal circumstances. \n"
-   "    --check if any earlier messages are present\n"
-   "    local msgids = redis.call('LRANGE', k.messages(chid), 0, -1)\n"
-   "    local founds = 0\n"
-   "    for i=#msgids, 1, -1 do\n"
-   "      if msgids[i] == msgid then \n"
-   "        break\n"
-   "      end\n"
-   "      local thismsgkey = k.msg(chid, msgids[i])\n"
-   "      local ttt = redis.call('type', thismsgkey)['ok']\n"
-   "      redis.breakpoint()\n"
-   "      if ttt == \"hash\" then\n"
-   "        founds = founds + 1\n"
-   "      end\n"
-   "    end\n"
-   "    \n"
-   "    if founds > 0 then\n"
-   "      err(\"message\", msgkey, \"missing, with\", founds, \"prev. msgs in msg list\")\n"
-   "    end\n"
-   "    \n"
-   "  end\n"
-   "  local msg = tohash(redis.call('HGETALL', msgkey))\n"
-   "  local ttl = tonumber(redis.call('TTL', msgkey))\n"
-   "  local n = tonumber(redis.call(\"HLEN\", msgkey))\n"
-   "  if n > 0 and (msg.data == nil or msg.id == nil or msg.time == nil or msg.tag == nil)then\n"
-   "    err(\"incomplete \" .. description ..\"(ttl \"..ttl..\")\", msgkey, tp(msg))\n"
-   "    return false\n"
-   "  end\n"
-   "  if t == \"hash\" and tonumber(ttl) < 0 then\n"
-   "    err(\"message\", msgkey, \"ttl =\", ttl)\n"
-   "  end\n"
-   "  if ttl ~= -2 then\n"
-   "    if prev_msgid ~= false and msg.prev ~= prev_msgid then\n"
-   "      err(description, chid, msgid, \"prev_message wrong. expected\", prev_msgid, \"got\", msg.prev)\n"
-   "    end\n"
-   "    if next_msgid ~= false and msg.next ~= next_msgid then\n"
-   "      err(description, chid, msgid, \"next_message wrong. expected\", next_msgid, \"got\", msg.next)\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local check_channel = function(id)\n"
-   "  local key={\n"
-   "    ch = k.channel(id),\n"
-   "    msgs = k.messages(id)\n"
-   "  }\n"
-   "  \n"
-   "  local ok, chkey_type = type_is(key.ch, \"hash\", \"channel hash\")\n"
-   "  if not ok then\n"
-   "    if chkey_type ~= \"none\" then\n"
-   "      err(\"unecpected channel key\", key.ch, \"type:\", chkey_type);\n"
-   "    end\n"
-   "    return false\n"
-   "  end\n"
-   "  local _, msgs_list_type = type_is(key.msgs, {\"list\", \"none\"}, \"channel messages list\")\n"
-   "  \n"
-   "  local ch = tohash(redis.call('HGETALL', key.ch))\n"
-   "  local len = tonumber(redis.call(\"HLEN\", key.ch))\n"
-   "  local ttl = tonumber(redis.call('TTL',  key.ch))\n"
-   "  if not ch.current_message or not ch.time then\n"
-   "    if msgs_list_type == \"list\" then\n"
-   "      err(\"incomplete channel (ttl \" .. ttl ..\")\", key.ch, tp(ch))\n"
-   "    end  \n"
-   "  elseif (ch.current_message or ch.prev_message) and msgs_list_type ~= \"list\" then\n"
-   "    err(\"channel\", key.ch, \"has a current_message but no message list\")\n"
-   "  end\n"
-   "  \n"
-   "  local msgids = redis.call('LRANGE', key.msgs, 0, -1)\n"
-   "  for i, msgid in ipairs(msgids) do\n"
-   "    check_msg(id, msgid, msgids[i+1], msgids[i-1], \"msglist\")\n"
-   "  end\n"
-   "  \n"
-   "  if ch.prev_message then\n"
-   "    if redis.call('LINDEX', key.msgs, 1) ~= ch.prev_message then\n"
-   "      err(\"channel\", key.ch, \"prev_message doesn't correspond to\", key.msgs, \"second list element\")\n"
-   "    end\n"
-   "    check_msg(id, ch.prev_message, false, ch.current_message, \"channel prev_message\")\n"
-   "  end\n"
-   "  if ch.current_message then\n"
-   "    if redis.call('LINDEX', key.msgs, 0) ~= ch.current_message then\n"
-   "      err(\"channel\", key.ch, \"current_message doesn't correspond to\", key.msgs, \"first list element\")\n"
-   "    end\n"
-   "    check_msg(id, ch.current_message, ch.prev_message, false, \"channel current_message\")\n"
-   "  end\n"
-   "  \n"
-   "end\n"
-   "\n"
-   "local channel_ids = {}\n"
-   "\n"
-   "for i, chkey in ipairs(redis.call(\"KEYS\", k.channel(\"*\"))) do\n"
-   "  local msgs_chid_match = chkey:match(\"^\"..k.messages(\"*\"))\n"
-   "  if msgs_chid_match then\n"
-   "    type_is(k.channel(msgs_chid_match), \"hash\", \"channel messages' corresponding hash key\")\n"
-   "  elseif not chkey:match(\":msg$\") then\n"
-   "    table.insert(channel_ids, chkey);\n"
-   "    known_channel_keys[chkey] = true\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "dbg(\"found\", #channel_ids, \"channels\")\n"
-   "for i, chkey in ipairs(channel_ids) do\n"
-   "  local chid = chkey:match(\"^\" .. k.channel(\".*\"))\n"
-   "  check_channel(chid)\n"
-   "end\n"
-   "\n"
-   "for i, msgkey in ipairs(redis.call(\"KEYS\", k.channel(\"*\")..\":msg\")) do\n"
-   "  if not known_msgkeys[msgkey] then\n"
-   "    local ok, t = type_is(msgkey, \"hash\")\n"
-   "    if ok then\n"
-   "      if not redis.call('HGET', msgkey, 'unbuffered') then\n"
-   "        err(\"orphan message\", msgkey, \"(ttl: \" .. redis.call('TTL', msgkey) .. \")\", tp(tohash(redis.call('HGETALL', msgkey)), 15))\n"
-   "      end\n"
-   "    else\n"
-   "      err(\"orphan message\", msgkey, \"wrong type\", t) \n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "if errors then\n"
-   "  table.insert(errors, 1, concat(#channel_ids, \"channels,\",known_msgs_count,\"messages found\", #errors, \"problems\"))\n"
-   "  return errors\n"
-   "else\n"
-   "  return concat(#channel_ids, \"channels,\", known_msgs_count, \"messages, all ok\")\n"
-   "end\n"},
-
-  {"subscriber_register", "0418d941e41ce9d8cb938860fd340d85c121d4cc",
-   "--input: keys: [], values: [namespace, channel_id, subscriber_id, active_ttl, time, want_channel_settings]\n"
-   "--  'subscriber_id' can be '-' for new id, or an existing id\n"
-   "--  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec\n"
-   "--output: subscriber_id, num_current_subscribers, next_keepalive_time, channel_buffer_length\n"
-   "--  'channel_buffer_length' is returned only if want_channel_settings is 1\n"
-   "\n"
-   "local ns, id, sub_id, active_ttl, time = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20, tonumber(ARGV[5])\n"
-   "local want_channel_settings = tonumber(ARGV[6]) == 1\n"
-   "\n"
-   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
-   "\n"
-   "redis.call('echo', ' ######## SUBSCRIBER REGISTER SCRIPT ####### ')\n"
-   "local ch=(\"%s{channel:%s}\"):format(ns, id)\n"
-   "local keys = {\n"
-   "  channel =     ch,\n"
-   "  messages =    ch..':messages',\n"
-   "  subscribers = ch..':subscribers'\n"
-   "}\n"
-   "\n"
-   "local setkeyttl=function(ttl)\n"
-   "  for i,v in pairs(keys) do\n"
-   "    if ttl > 0 then\n"
-   "      redis.call('expire', v, ttl)\n"
-   "    else\n"
-   "      redis.call('persist', v)\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local random_safe_next_ttl = function(ttl)\n"
-   "  return math.floor(ttl/2 + ttl/2.1 * math.random())\n"
-   "end\n"
-   "\n"
-   "local sub_count\n"
-   "\n"
-   "if sub_id == \"-\" then\n"
-   "  sub_id = tonumber(redis.call('HINCRBY', keys.channel, \"last_subscriber_id\", 1))\n"
-   "  sub_count=tonumber(redis.call('hincrby', keys.channel, 'subscribers', 1))\n"
-   "else\n"
-   "  sub_count=tonumber(redis.call('hget', keys.channel, 'subscribers'))\n"
-   "end\n"
-   "if time then\n"
-   "  redis.call('hset', keys.channel, \"last_seen_subscriber\", time)\n"
-   "end\n"
-   "\n"
-   "local next_keepalive \n"
-   "local actual_ttl = tonumber(redis.call('ttl', keys.channel))\n"
-   "if actual_ttl < active_ttl then\n"
-   "  setkeyttl(active_ttl)\n"
-   "  next_keepalive = random_safe_next_ttl(active_ttl)\n"
-   "else\n"
-   "  next_keepalive = random_safe_next_ttl(actual_ttl)\n"
-   "end\n"
-   "\n"
-   "\n"
-   "local ret = {sub_id, sub_count, next_keepalive}\n"
-   "if want_channel_settings then\n"
-   "  local max_messages = tonumber(redis.call('hget', keys.channel, 'max_stored_messages'))\n"
-   "  table.insert(ret, max_messages)\n"
-   "end\n"
-   "\n"
-   "return ret\n"},
-
-  {"subscriber_unregister", "a98e07b21485951a7d34cf80736e53db1b6e87a6",
-   "--input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]\n"
-   "-- 'subscriber_id' is an existing id\n"
-   "-- 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec\n"
-   "--output: subscriber_id, num_current_subscribers\n"
-   "\n"
-   "local ns, id, sub_id, empty_ttl = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20\n"
-   "\n"
-   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
-   "\n"
-   "redis.call('echo', ' ######## SUBSCRIBER UNREGISTER SCRIPT ####### ')\n"
-   "local ch=('%s{channel:%s}'):format(ns, id)\n"
-   "local keys = {\n"
-   "  channel =     ch,\n"
-   "  messages =    ch..':messages',\n"
-   "  subscribers = ch..':subscribers',\n"
-   "}\n"
-   "\n"
-   "local setkeyttl=function(ttl)\n"
-   "  for i,v in pairs(keys) do\n"
-   "    if ttl > 0 then\n"
-   "      redis.call('expire', v, ttl)\n"
-   "    elseif ttl < 0 then\n"
-   "      redis.call('persist', v)\n"
-   "    else\n"
-   "      redis.call('del', v)\n"
-   "    end\n"
-   "  end\n"
-   "end\n"
-   "\n"
-   "local sub_count = 0\n"
-   "\n"
-   "local res = redis.pcall('EXISTS', keys.channel)\n"
-   "if type(res) == \"table\" and res[\"err\"] then\n"
-   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(empty_ttl, id)}\n"
-   "end\n"
-   "\n"
-   "if res ~= 0 then\n"
-   "   sub_count = redis.call('hincrby', keys.channel, 'subscribers', -1)\n"
-   "\n"
-   "  if sub_count == 0 and tonumber(redis.call('LLEN', keys.messages)) == 0 then\n"
-   "    setkeyttl(empty_ttl)\n"
-   "  elseif sub_count < 0 then\n"
-   "    return {err=\"Subscriber count for channel \" .. id .. \" less than zero: \" .. sub_count}\n"
-   "  end\n"
-   "else\n"
-   "  --dbg(\"channel \", id, \" already gone\")\n"
-   "end\n"
-   "\n"
-   "return {sub_id, sub_count}\n"}
-};
-const int redis_lua_scripts_count=13;
diff --git a/debian/modules/nchan/src/store/redis/redis_lua_commands.h b/debian/modules/nchan/src/store/redis/redis_lua_commands.h
deleted file mode 100644
index 58eeb17..0000000
--- a/debian/modules/nchan/src/store/redis/redis_lua_commands.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef NCHAN_REDIS_LUA_SCRIPTS_H
-#define NCHAN_REDIS_LUA_SCRIPTS_H
-// don't edit this please, it was auto-generated by hsss
-// https://github.com/slact/hsss
-
-typedef struct {
-  char *name;
-  char *hash;
-  char *script;
-} redis_lua_script_t;
-
-typedef struct {
-  //input:  keys: [], values: [namespace, channel_id, number, time]
-  //output: current_fake_subscribers
-  redis_lua_script_t add_fakesub;
-
-  //input:  keys: [], values: [namespace, channel_id, ttl]
-  // ttl is for when there are no messages but at least 1 subscriber.
-  //output: seconds until next keepalive is expected, or -1 for "let it disappear"
-  redis_lua_script_t channel_keepalive;
-
-  //input: keys: [],  values: [ namespace, channel_id ]
-  //output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
-  // delete this channel and all its messages
-  redis_lua_script_t delete;
-
-  //input: keys: [],  values: [ namespace, channel_id ]
-  //output: channel_hash {ttl, time_last_seen, subscribers, last_channel_id, messages} or nil
-  // finds and return the info hash of a channel, or nil of channel not found
-  redis_lua_script_t find_channel;
-
-  //input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
-  //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count
-  // no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent
-  // create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.
-  // result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available
-  redis_lua_script_t get_message;
-
-  //input:  keys: [message_key], values: []
-  //output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count
-  redis_lua_script_t get_message_from_key;
-
-  //input:  keys: [unique_request_id_key], values: []
-  //output: next_unique_request_id_integer
-  redis_lua_script_t get_subscriber_info_id;
-
-  //input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, optimize_target]
-  //output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?
-  redis_lua_script_t publish;
-
-  //input:  keys: [], values: [namespace, channel_id, status_code]
-  //output: current_subscribers
-  redis_lua_script_t publish_status;
-
-  //input: keys: [],  values: [ namespace, channel_id, info_response_id ]
-  //output: -nothing-
-  redis_lua_script_t request_subscriber_info;
-
-  //redis-store consistency check
-  redis_lua_script_t rsck;
-
-  //input: keys: [], values: [namespace, channel_id, subscriber_id, active_ttl, time, want_channel_settings]
-  //  'subscriber_id' can be '-' for new id, or an existing id
-  //  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
-  //output: subscriber_id, num_current_subscribers, next_keepalive_time, channel_buffer_length
-  //  'channel_buffer_length' is returned only if want_channel_settings is 1
-  redis_lua_script_t subscriber_register;
-
-  //input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]
-  // 'subscriber_id' is an existing id
-  // 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
-  //output: subscriber_id, num_current_subscribers
-  redis_lua_script_t subscriber_unregister;
-
-} redis_lua_scripts_t;
-extern redis_lua_scripts_t redis_lua_scripts;
-extern const int redis_lua_scripts_count;
-#define REDIS_LUA_SCRIPTS_EACH(script) \
-for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++) 
-#endif //NCHAN_REDIS_LUA_SCRIPTS_H
diff --git a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
deleted file mode 100644
index fb5d0a3..0000000
--- a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.c
+++ /dev/null
@@ -1,165 +0,0 @@
-//Copyright (c) 2014 Wandenberg Peixoto under the MIT Licence'
-//additional code from Alexander Lyalin's redis_nginx_module (New BSD licence)
-//edited by slact 2015-2021
-
-#include <ngx_event.h>
-#include <ngx_connection.h>
-#include <signal.h>
-#include "redis_nginx_adapter.h"
-
-#include <nchan_module.h>
-#include <store/redis/store.h>
-
-#include <assert.h>
-
-#define PING_DATABASE_COMMAND "PING"
-
-#define EVENT_FLAGS ((ngx_event_flags & NGX_USE_CLEAR_EVENT) ?  NGX_CLEAR_EVENT : NGX_LEVEL_EVENT)
-
-#define REDIS_MAX_BUFFERED_READ_SIZE 1024*18 //hardcoded into hiredis
-
-//NGX_CLEAR_EVENT for kqueue, epoll
-//NGX_LEVEL_EVENT for select, poll, /dev/poll
-
-void redis_nginx_cleanup(void *privdata);
-
-void redis_nginx_init(void) {
-  signal(SIGPIPE, SIG_IGN);
-}
-
-
-void redis_nginx_force_close_context(redisAsyncContext **context) {
-  if ((context != NULL) && (*context != NULL)) {
-    redisAsyncContext *ac = *context;
-    if (!ac->err) {
-      redisAsyncDisconnect(ac);
-    }
-    *context = NULL;
-  }
-}
-
-void redis_nginx_read_event(ngx_event_t *ev) {
-  redisAsyncContext *ac = ((ngx_connection_t *)ev->data)->data;
-  int                fd = ac->c.fd; //because redisAsyncHandleRead might free the redisAsyncContext
-  int                bytes_left = 0;
-  redisAsyncHandleRead(ac);
-  
-  // we need to do this because hiredis, in its infinite wisdom, will read at 
-  // most 16Kb of data, and there's no reliable way to tell if it read that 
-  // whole amount in one gulp. Otherwise, we could just check if 16Kb have 
-  //been read and try again. But no, apparently that's not an option.
-  
-  ioctl(fd, FIONREAD, &bytes_left);
-  if (bytes_left > 0 && !ac->err) {
-    //ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "again!");
-    redis_nginx_read_event(ev);
-  }
-}
-
-void redis_nginx_write_event(ngx_event_t *ev) {
-  ngx_connection_t *connection = (ngx_connection_t *) ev->data;
-  redisAsyncHandleWrite(connection->data);
-}
-
-
-int redis_nginx_fd_is_valid(int fd) {
-  return (fd > 0) && ((fcntl(fd, F_GETFL) != -1) || (errno != EBADF));
-}
-
-void redis_nginx_add_read(void *privdata) {
-  ngx_connection_t *connection = (ngx_connection_t *) privdata;
-  ngx_int_t         flags = EVENT_FLAGS;
-  if (!connection->read->active && redis_nginx_fd_is_valid(connection->fd)) {
-    connection->read->handler = redis_nginx_read_event;
-    connection->read->log = connection->log;
-    if (ngx_add_event(connection->read, NGX_READ_EVENT, flags) == NGX_ERROR) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not add read event to redis");
-    }
-  }
-}
-
-void redis_nginx_del_read(void *privdata) {
-  ngx_connection_t *connection = (ngx_connection_t *) privdata;
-  ngx_int_t         flags = EVENT_FLAGS;
-  if (connection->read->active && redis_nginx_fd_is_valid(connection->fd)) {
-    if (ngx_del_event(connection->read, NGX_READ_EVENT, flags) == NGX_ERROR) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not delete read event to redis");
-    }
-  }
-  else {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: didn't delete read event %p", connection->read);
-  }
-}
-
-void redis_nginx_add_write(void *privdata) {
-  ngx_connection_t *connection = (ngx_connection_t *) privdata;
-  ngx_int_t         flags = EVENT_FLAGS;
-  if (!connection->write->active && redis_nginx_fd_is_valid(connection->fd)) {
-    connection->write->handler = redis_nginx_write_event;
-    connection->write->log = connection->log;
-    if (ngx_add_event(connection->write, NGX_WRITE_EVENT, flags) == NGX_ERROR) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not add write event to redis");
-    }
-  }
-}
-
-void redis_nginx_del_write(void *privdata) {
-  ngx_connection_t *connection = (ngx_connection_t *) privdata;
-  ngx_int_t         flags = EVENT_FLAGS;
-  if (connection->write->active && redis_nginx_fd_is_valid(connection->fd)) {
-    if (ngx_del_event(connection->write, NGX_WRITE_EVENT, flags) == NGX_ERROR) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not delete write event to redis");
-    }
-  }
-}
-
-void redis_nginx_cleanup(void *privdata) {
-  if (privdata) {
-    ngx_connection_t *connection = (ngx_connection_t *) privdata;
-    redisAsyncContext *ac = (redisAsyncContext *) connection->data;
-    // don't care why the connection is being cleaned up. if there's an error, close the fd. if an fd was being shared between
-    // workers or connections -- tough luck
-    
-    if ((connection->fd != NGX_INVALID_FILE)) {
-      if(connection->read->active) {
-        redis_nginx_del_read(privdata);
-      }
-      if(connection->write->active) {
-        redis_nginx_del_write(privdata);
-      }
-      ngx_close_connection(connection);
-    } else {
-      ngx_free_connection(connection);
-    }
-    
-    ac->ev.data = NULL;
-  }
-}
-
-int redis_nginx_event_attach(redisAsyncContext *ac) {
-  ngx_connection_t *connection;
-  redisContext *c = &(ac->c);
-  
-  /* Nothing should be attached when something is already attached */
-  if (ac->ev.data != NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: context already attached");
-    return REDIS_ERR;
-  }
-  
-  connection = ngx_get_connection(c->fd, ngx_cycle->log);
-  if (connection == NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not get a connection for fd #%d", c->fd);
-    return REDIS_ERR;
-  }
-  
-  /* Register functions to start/stop listening for events */
-  ac->ev.addRead = redis_nginx_add_read;
-  ac->ev.delRead = redis_nginx_del_read;
-  ac->ev.addWrite = redis_nginx_add_write;
-  ac->ev.delWrite = redis_nginx_del_write;
-  ac->ev.cleanup = redis_nginx_cleanup;
-  ac->ev.data = connection;
-  connection->data = ac;
-  
-  return REDIS_OK;
-}
diff --git a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h b/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
deleted file mode 100644
index a3a956b..0000000
--- a/debian/modules/nchan/src/store/redis/redis_nginx_adapter.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//Copyright (c) 2014 Wandenberg Peixoto under the MIT Licence
-//Coptright (c) 2015-2021 slact
-#ifndef __REDIS_NGINX_ADAPTER_H
-#define __REDIS_NGINX_ADAPTER_H
-
-#if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
-#include <hiredis/hiredis.h>
-#include <hiredis/async.h>
-#else
-#include <store/redis/hiredis/hiredis.h>
-#include <store/redis/hiredis/async.h>
-#endif
-
-#include <nchan_module.h>
-#include <store/redis/redis_nodeset.h>
-
-void redis_nginx_init(void);
-int redis_nginx_event_attach(redisAsyncContext *ac);
-void redis_nginx_force_close_context(redisAsyncContext **context);
-void redis_nginx_close_context(redisAsyncContext **context);
-
-#endif // __REDIS_NGINX_ADAPTER_H
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset.c b/debian/modules/nchan/src/store/redis/redis_nodeset.c
deleted file mode 100644
index df2d086..0000000
--- a/debian/modules/nchan/src/store/redis/redis_nodeset.c
+++ /dev/null
@@ -1,2678 +0,0 @@
-#include "redis_nodeset.h"
-
-#include <assert.h>
-#include "store-private.h"
-#include <store/store_common.h>
-#include "store.h"
-#include "redis_nginx_adapter.h"
-#include "redis_nodeset_parser.h"
-#include "redis_lua_commands.h"
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REDIS NODESET: " fmt, ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS NODESET: " fmt, ##args)
-
-static redis_nodeset_t  redis_nodeset[NCHAN_MAX_NODESETS];
-static int              redis_nodeset_count = 0;
-static char            *redis_worker_id = NULL;
-static char            *nchan_redis_blankname = "";
-static redisCallbackFn *redis_subscribe_callback = NULL;
-
-typedef struct {
-  ngx_event_t      ev;
-  ngx_int_t      (*cb)(redis_nodeset_t *, void *);
-  void            *pd;
-  redis_nodeset_t *ns;
-} nodeset_onready_callback_t;
-
-
-static ngx_str_t       default_redis_url = ngx_string(NCHAN_REDIS_DEFAULT_URL);
-
-static void node_connector_callback(redisAsyncContext *ac, void *rep, void *privdata);
-static int nodeset_cluster_keyslot_space_complete(redis_nodeset_t *ns);
-static nchan_redis_ip_range_t *node_ip_blacklisted(redis_nodeset_t *ns, redis_connect_params_t *rcp);
-static char *nodeset_name_cstr(redis_nodeset_t *nodeset, char *buf, size_t maxlen);
-
-static void *rbtree_cluster_keyslots_node_id(void *data) {
-  return &((redis_nodeset_slot_range_node_t *)data)->range;
-}
-static uint32_t rbtree_cluster_keyslots_bucketer(void *vid) {
-  return 1; //no buckets
-}
-static ngx_int_t rbtree_cluster_keyslots_compare(void *v1, void *v2) {
-  redis_slot_range_t   *r1 = v1;
-  redis_slot_range_t   *r2 = v2;
-  
-  if(r1->max < r2->min) //r1 is strictly left of r2
-    return -1;
-  else if(r1->min > r2->max) //r1 is strictly right of r2
-    return 1;
-  else //there's an overlap
-    return 0;
-}
-
-static int reply_str_ok(redisReply *reply) {
-  return (reply != NULL && reply->type != REDIS_REPLY_ERROR && reply->type == REDIS_REPLY_STRING);
-}
-static int reply_status_ok(redisReply *reply) {
-  return (
-    reply != NULL 
-    && reply->type != REDIS_REPLY_ERROR
-    && reply->type == REDIS_REPLY_STATUS
-    && reply->str
-    && strcmp(reply->str, "OK") == 0
-  );
-}
-
-static int nodeset_cluster_node_index_keyslot_ranges(redis_node_t *node) {
-  unsigned                         i;
-  ngx_rbtree_node_t               *rbtree_node;
-  redis_nodeset_slot_range_node_t *keyslot_tree_node;
-  rbtree_seed_t                   *tree = &node->nodeset->cluster.keyslots;
-  if(node->cluster.slot_range.indexed) {
-    node_log_error(node, "cluster keyslot range already indexed");
-    return 0;
-  }
-  
-  for(i=0; i<node->cluster.slot_range.n; i++) {
-    if(nodeset_node_find_by_range(node->nodeset, &node->cluster.slot_range.range[i])) { //overlap!
-      return 0;
-    }
-  }
-  
-  for(i=0; i<node->cluster.slot_range.n; i++) {
-    rbtree_node = rbtree_create_node(tree, sizeof(*keyslot_tree_node));
-    keyslot_tree_node = rbtree_data_from_node(rbtree_node);
-    keyslot_tree_node->range = node->cluster.slot_range.range[i];
-    keyslot_tree_node->node = node;
-    if(rbtree_insert_node(tree, rbtree_node) != NGX_OK) {
-      node_log_error(node, "couldn't insert keyslot node range %d-%d", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
-      rbtree_destroy_node(tree, rbtree_node);
-      return 0;
-    }
-    else {
-      node_log_info(node, "inserted keyslot node range %d-%d", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
-    }
-  }
-  node->cluster.slot_range.indexed = 1;
-  return 1;
-}
-/*
-static ngx_int_t print_slot_range_node(rbtree_seed_t *tree, void *node_data, void *privdata) {
-  redis_nodeset_slot_range_node_t        *rangenode = node_data;
-  node_log_notice(rangenode->node, "slots [%d - %d]", rangenode->range.min, rangenode->range.max);
-  return NGX_OK;
-}
-*/
-static int nodeset_cluster_node_unindex_keyslot_ranges(redis_node_t *node) {
-  ngx_rbtree_node_t               *rbtree_node;
-  redis_slot_range_t              *range;
-  rbtree_seed_t                   *tree = &node->nodeset->cluster.keyslots;
-  unsigned                         i;
-  if(!node->cluster.slot_range.indexed) {
-    //node_log_notice(node, "already unindexed");
-    return 1;
-  }
-  //node_log_notice(node, "unindex keyslot ranges");
-  
-  //rbtree_walk_incr(tree, print_slot_range_node, NULL);
-  
-  for(i=0; i<node->cluster.slot_range.n; i++) {
-    range = &node->cluster.slot_range.range[i];
-    //node_log_notice(node, "unindexing range [%d - %d]", range->min, range->max);
-    if((rbtree_node = rbtree_find_node(tree, range)) != NULL) {
-      rbtree_remove_node(tree, rbtree_node);
-      rbtree_destroy_node(tree, rbtree_node);
-    }
-    else {
-      node_log_error(node, "unable to unindex keyslot range %d-%d: range not found in tree", range->min, range->max);
-      raise(SIGABRT);
-    }
-  }
-  node->cluster.slot_range.indexed = 0;
-  return 1;
-}
-
-#if REDIS_NODESET_DBG
-
-
-static ngx_int_t nodeset_debug_rangetree_collector(rbtree_seed_t *tree, void *node_data, void *privdata) {
-  redis_nodeset_slot_range_node_t     *rangenode = node_data;
-  redis_nodeset_dbg_range_tree_t      *dbg = privdata;
-  dbg->node[dbg->n].range = rangenode->range;
-  dbg->node[dbg->n].node = rangenode->node;
-  dbg->n++;
-  return NGX_OK;
-}
-
-static redis_node_dbg_list_t *nodeset_update_debuginfo(redis_nodeset_t *nodeset) {
-  rbtree_seed_t         *tree = &nodeset->cluster.keyslots;
-  redis_node_dbg_list_t *node_dbg = &nodeset->dbg.nodes;
-  redis_node_t  *cur;
-  ngx_memzero(&nodeset->dbg, sizeof(nodeset->dbg));
-  for(cur = nchan_list_first(&nodeset->nodes); cur != NULL; cur = nchan_list_next(cur)) {
-    node_dbg->node[node_dbg->n++]=cur;
-  }
-  nodeset->dbg.keyspace_complete = nodeset_cluster_keyslot_space_complete(nodeset);
-  rbtree_walk_incr(tree, nodeset_debug_rangetree_collector, &nodeset->dbg.ranges);
-  return NGX_OK;
-}
-#endif
-
-static const char *__rcp_cstr(redis_connect_params_t *rcp, char *buf) {
-  ngx_snprintf((u_char *)buf, 512, "%V:%d%Z", &rcp->hostname, rcp->port, &rcp->peername);
-  return buf;
-}
-
-static const char *__node_cstr(redis_node_t *node, char *buf) {
-  return __rcp_cstr(&node->connect_params, buf);
-}
-
-static const char *rcp_cstr(redis_connect_params_t *rcp) {
-  static char    buf[512];
-  return __rcp_cstr(rcp, buf);
-}
-static const char *node_cstr(redis_node_t *node) {
-  return rcp_cstr(&node->connect_params);
-}
-
-#define MAX_RUN_ID_LENGTH 64
-#define MAX_CLUSTER_ID_LENGTH 64
-#define MAX_VERSION_LENGTH 16
-typedef struct {
-  redis_node_t    node;
-  u_char          peername[INET6_ADDRSTRLEN + 2];
-  u_char          run_id[MAX_RUN_ID_LENGTH];
-  u_char          cluster_id[MAX_CLUSTER_ID_LENGTH];
-  u_char          version[MAX_VERSION_LENGTH];
-} node_blob_t;
-
-static void nodeset_check_status_event(ngx_event_t *ev);
-
-int nodeset_ready(redis_nodeset_t *nodeset) {
-  return nodeset && nodeset->status == REDIS_NODESET_READY;
-}
-
-ngx_int_t nodeset_initialize(char *worker_id, redisCallbackFn *subscribe_handler) {
-  redis_worker_id = worker_id;
-  redis_subscribe_callback = subscribe_handler;
-  return NGX_OK;
-}
-
-
-#if (NGX_OPENSSL)
-static ngx_int_t nodeset_create_ssl_ctx(redis_nodeset_t *ns, char **err) {
-  char        *ca_cert =  ns->settings.tls.trusted_certificate.len > 0 ? 
-                            (char *)ns->settings.tls.trusted_certificate.data
-                            : NULL;
-  char        *ca_path = ns->settings.tls.trusted_certificate_path.len > 0 ?
-                            (char *)ns->settings.tls.trusted_certificate_path.data
-                            : NULL;
-  char        *client_cert_filename = ns->settings.tls.client_certificate.len > 0 ?
-                            (char *)ns->settings.tls.client_certificate.data
-                            : NULL;
-  char        *client_cert_key_filename = ns->settings.tls.client_certificate_key.len > 0 ?
-                            (char *)ns->settings.tls.client_certificate_key.data
-                            : NULL;
-  char        *ciphers = ns->settings.tls.ciphers.len > 0 ?
-                            (char *)ns->settings.tls.ciphers.data
-                            : NULL;
-  int          verify_cert = ns->settings.tls.verify_certificate;
-  
-  SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-  if(!ssl_ctx) {
-    *err = "failed to create SSL_CTX";
-    return 0;
-  }
-  SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-  SSL_CTX_set_verify(ssl_ctx, verify_cert ? SSL_VERIFY_NONE : SSL_VERIFY_PEER, NULL);
-  
-  if(ca_cert || ca_path) {
-    if (!SSL_CTX_load_verify_locations(ssl_ctx, ca_cert, ca_path)) {
-      *err = "Invalid CA Certificate File/Directory";
-      SSL_CTX_free(ssl_ctx);
-      return 0;
-    }
-  }
-  else {
-    if (!SSL_CTX_set_default_verify_paths(ssl_ctx)) {
-      *err = "Failed to use default CA paths";
-      SSL_CTX_free(ssl_ctx);
-      return 0;
-    }
-  }
-  
-  if (client_cert_filename && !SSL_CTX_use_certificate_chain_file(ssl_ctx, client_cert_filename)) {
-    *err = "Invalid client certificate";
-    SSL_CTX_free(ssl_ctx);
-    return 0;
-  }
-  
-  if (client_cert_key_filename && !SSL_CTX_use_PrivateKey_file(ssl_ctx, client_cert_key_filename, SSL_FILETYPE_PEM)) {
-    *err = "Invalid private key";
-    SSL_CTX_free(ssl_ctx);
-    return 0;
-  }
-#ifdef TLS1_3_VERSION
-  if (ciphers && !SSL_CTX_set_cipher_list(ssl_ctx, ciphers)) {
-    *err = "Error while configuring ciphers";
-    SSL_CTX_free(ssl_ctx);
-    return 0;
-  }
-#endif
-
-  ns->ssl_context = ssl_ctx;
-  return 1;
-}
-#else
-static ngx_int_t nodeset_create_ssl_ctx(redis_nodeset_t *ns, char **err) {
-  *err = "Can't create Redis SSL context: Nginx was built without SSL support";
-  return 0;
-}
-#endif
-
-redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf) {
-  nchan_redis_conf_t  *rcf = &lcf->redis;
-  redis_nodeset_t     *ns = &redis_nodeset[redis_nodeset_count]; //incremented once everything is ok
-  assert(rcf->enabled);
-  assert(!rcf->nodeset);
-  
-  ns->first_loc_conf = lcf;
-  
-  if(redis_nodeset_count >= NCHAN_MAX_NODESETS) {
-    nchan_log_error("Cannot create more than %d Redis nodesets", NCHAN_MAX_NODESETS);
-    return NULL;
-  }
-  
-  assert(!nodeset_find(rcf)); //must be unique
-  
-  nchan_list_init(&ns->urls, sizeof(ngx_str_t *), "redis urls");
-  nchan_list_init(&ns->nodes, sizeof(node_blob_t), "redis nodes");
-  nchan_list_init(&ns->onready_callbacks, sizeof(nodeset_onready_callback_t), "nodeset onReady callbacks");
-  
-  nchan_slist_init(&ns->channels.all, rdstore_channel_head_t, redis.slist.nodeset.prev, redis.slist.nodeset.next);
-  nchan_slist_init(&ns->channels.disconnected_cmd, rdstore_channel_head_t, redis.slist.node_cmd.prev, redis.slist.node_cmd.next);
-  nchan_slist_init(&ns->channels.disconnected_pubsub, rdstore_channel_head_t, redis.slist.node_pubsub.prev, redis.slist.node_pubsub.next);
-  
-  ns->reconnect_delay_sec = 5;
-  ns->current_status_times_checked = 0;
-  ns->current_status_start = 0;
-  ns->generation = 0;
-  ns->settings.namespace = &rcf->namespace;
-  ns->settings.storage_mode = rcf->storage_mode;
-  ns->settings.nostore_fastpublish = rcf->nostore_fastpublish;
-  
-  ns->settings.ping_interval = rcf->ping_interval;
-  ns->settings.cluster_check_interval = rcf->cluster_check_interval;
-  
-  ns->status = REDIS_NODESET_DISCONNECTED;
-  ngx_memzero(&ns->status_check_ev, sizeof(ns->status_check_ev));
-  ns->status_msg = NULL;
-  nchan_init_timer(&ns->status_check_ev, nodeset_check_status_event, ns);
-  
-  //init cluster stuff
-  ns->cluster.enabled = 0;
-  rbtree_init(&ns->cluster.keyslots, "redis cluster node (by keyslot) data", rbtree_cluster_keyslots_node_id, rbtree_cluster_keyslots_bucketer, rbtree_cluster_keyslots_compare);
-  
-  //urls
-  if(rcf->upstream) {
-    nchan_srv_conf_t           *scf = NULL;
-    scf = ngx_http_conf_upstream_srv_conf(rcf->upstream, ngx_nchan_module);
-    
-    ngx_uint_t                   i;
-    ngx_array_t                 *servers = rcf->upstream->servers;
-    ngx_http_upstream_server_t  *usrv = servers->elts;
-    ngx_str_t                   *upstream_url, **urlref;
-    ns->upstream = rcf->upstream;
-    
-    ns->settings.connect_timeout = scf->redis.connect_timeout == NGX_CONF_UNSET_MSEC ? NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC : scf->redis.connect_timeout;
-    ns->settings.node_weight.master = scf->redis.master_weight == NGX_CONF_UNSET ? 1 : scf->redis.master_weight;
-    ns->settings.node_weight.slave = scf->redis.slave_weight == NGX_CONF_UNSET ? 1 : scf->redis.slave_weight;
-    
-    ns->settings.optimize_target = scf->redis.optimize_target == NCHAN_REDIS_OPTIMIZE_UNSET ? NCHAN_REDIS_OPTIMIZE_CPU : scf->redis.optimize_target;
-    
-    ns->settings.blacklist.count = scf->redis.blacklist_count;
-    ns->settings.blacklist.list = scf->redis.blacklist;
-    
-    ns->settings.username = scf->redis.username;
-    ns->settings.password = scf->redis.password;
-    
-    ns->settings.tls = scf->redis.tls;
-    //clean up unset values
-    if(ns->settings.tls.enabled == NGX_CONF_UNSET) {
-      ns->settings.tls.enabled = 0;
-    }
-    if(ns->settings.tls.verify_certificate == NGX_CONF_UNSET) {
-      ns->settings.tls.verify_certificate = 1;
-    }
-    
-    for(i=0; i < servers->nelts; i++) {
-#if nginx_version >= 1007002
-      upstream_url = &usrv[i].name;
-#else
-      upstream_url = &usrv[i].addrs->name;
-#endif
-      urlref = nchan_list_append(&ns->urls);
-      *urlref = upstream_url;
-    }
-  }
-  else {
-    ns->upstream = NULL;
-    ns->settings.connect_timeout = NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC;
-    ns->settings.node_weight.master = 1;
-    ns->settings.node_weight.slave = 1;
-    ns->settings.blacklist.count = 0;
-    ns->settings.blacklist.list = NULL;
-    ngx_str_t **urlref = nchan_list_append(&ns->urls);
-    *urlref = rcf->url.len > 0 ? &rcf->url : &default_redis_url;
-  }
-  DBG("nodeset created");
-  
-  char buf[1024];
-  nodeset_name_cstr(ns, buf, 1024);
-  if(strlen(buf)>0) {
-    ns->name = ngx_alloc(strlen(buf)+1, ngx_cycle->log);
-    strcpy(ns->name, buf);
-  }
-  else {
-    ns->name = nchan_redis_blankname;
-  }
-  
-  if(ns->settings.tls.enabled) {
-    //if all the URLs are rediss://, then turn on SSL for the nodeset
-    redis_connect_params_t    rcp;
-    int                       use_tls = 1;
-    ngx_str_t               **url;
-    
-    for(url = nchan_list_first(&ns->urls); url != NULL; url = nchan_list_next(url)) {
-      parse_redis_url(*url, &rcp);
-      use_tls &= rcp.use_tls;
-    }
-    if(use_tls) {
-      ns->settings.tls.enabled = 1;
-    }
-    
-    char *err = NULL;
-    if(!nodeset_create_ssl_ctx(ns, &err)) {
-      nodeset_log_error(ns, "Error creating Redis SSL context: %s", err ? err : "unknown error");
-      return NULL;
-    }
-  }
-  redis_nodeset_count++;
-  rcf->nodeset = ns;
-
-  return ns;
-}
-
-redis_nodeset_t *nodeset_find(nchan_redis_conf_t *rcf) {
-  if(rcf->nodeset) {
-    return rcf->nodeset;
-  }
-  else {
-    int              i;
-    redis_nodeset_t *ns;
-    for(i=0; i<redis_nodeset_count; i++) {
-      ns = &redis_nodeset[i];
-      if(nchan_ngx_str_match(&rcf->namespace, ns->settings.namespace) && rcf->storage_mode == ns->settings.storage_mode) {
-        if(rcf->upstream) {
-          if(ns->upstream == rcf->upstream)
-            return ns;
-        }
-        else {
-          ngx_str_t *search_url = rcf->url.len > 0 ? &rcf->url : &default_redis_url;
-          ngx_str_t **first_url = nchan_list_first(&ns->urls);
-          
-          if(first_url && nchan_ngx_str_match(search_url, *first_url)) {
-            //cache it
-            rcf->nodeset = ns;
-            if(rcf->ping_interval > 0 && ns->settings.ping_interval > rcf->ping_interval) {
-              //use the smallest ping interval found in the settings
-              ns->settings.ping_interval = rcf->ping_interval;
-            }
-            return ns;
-          }
-        }
-      }
-    }
-    return NULL;
-  }
-}
-
-static int node_transfer_slaves(redis_node_t *src, redis_node_t *dst) {
-  int transferred = 0;
-  redis_node_t  **cur;
-  for(cur = nchan_list_first(&src->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
-    node_set_master_node(*cur, dst);
-    node_add_slave_node(dst, *cur); //won't be added if it's already there
-    transferred++;
-  }
-  return transferred;
-}
-
-static int equal_redis_connect_params(void *d1, void *d2) {
-  redis_connect_params_t *cp1 = d1;
-  redis_connect_params_t *cp2 = d2;
-  if(cp1->port != cp2->port || cp1->db != cp2->db) {
-    return 0;  
-  }
-  if( nchan_ngx_str_nonzero_match(&cp1->hostname, &cp2->hostname)
-   || nchan_ngx_str_nonzero_match(&cp1->peername, &cp2->peername)
-   || nchan_ngx_str_nonzero_match(&cp1->peername, &cp2->hostname)
-   || nchan_ngx_str_nonzero_match(&cp1->hostname, &cp2->peername)) {
-    return 1;
-  }
-  else {
-    return 0;
-  }
-}
-
-static int equal_nonzero_strings(void *s1, void *s2) {
-  return ((ngx_str_t *)s1)->len > 0 && ((ngx_str_t *)s2)->len > 0 && 
-    nchan_ngx_str_match((ngx_str_t *)s1, (ngx_str_t *)s2);
-}
-
-typedef struct {
-  char          *name;
-  off_t          offset;
-  int          (*match)(void *, void *);
-} node_match_t;
-
-static struct {
-  node_match_t    run_id;
-  node_match_t    cluster_id;
-  node_match_t    connect_params;
-} _node_match = {
-  .run_id =          {"run_id",      offsetof(redis_node_t, run_id),          equal_nonzero_strings},
-  .cluster_id =      {"cluster_id",  offsetof(redis_node_t, cluster.id),      equal_nonzero_strings},
-  .connect_params =  {"url",         offsetof(redis_node_t, connect_params),  equal_redis_connect_params}
-};
-
-static int nodeset_node_deduplicate_by(redis_node_t *node, node_match_t *match) {
-  redis_node_t   *cur;
-  void *d1, *d2;
-  d1 = &((char *)node)[match->offset];
-  for(cur = nchan_list_first(&node->nodeset->nodes); cur != NULL; cur = nchan_list_next(cur)) {
-    d2 = &((char *)cur)[match->offset];
-    if(cur != node && match->match(d1, d2)) {
-      node_log_notice(node, "deduplicated by %s", match->name);
-      node_transfer_slaves(node, cur); //node->cur
-      nodeset_node_destroy(node);
-      return 1;
-    }
-  }
-  return 0;
-}
-
-int nodeset_node_deduplicate_by_connect_params(redis_node_t *node) {
-  return nodeset_node_deduplicate_by(node, &_node_match.connect_params);
-}
-int nodeset_node_deduplicate_by_run_id(redis_node_t *node) {
-  return nodeset_node_deduplicate_by(node, &_node_match.run_id);
-}
-int nodeset_node_deduplicate_by_cluster_id(redis_node_t *node) {
-  return nodeset_node_deduplicate_by(node, &_node_match.cluster_id);
-}
-
-static redis_node_t *nodeset_node_find_by(redis_nodeset_t *ns, node_match_t *match, void *data) {
-  redis_node_t *cur;
-  void *d2;
-  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
-    d2 = &((char *)cur)[match->offset];
-    if(match->match(data, d2)) {
-      return cur;
-    }
-  }
-  return NULL;
-}
-redis_node_t *nodeset_node_find_by_connect_params(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
-  return nodeset_node_find_by(ns, &_node_match.connect_params, rcp);
-}
-redis_node_t *nodeset_node_find_by_run_id(redis_nodeset_t *ns, ngx_str_t *run_id) {
-  return nodeset_node_find_by(ns, &_node_match.run_id, run_id);
-}
-redis_node_t *nodeset_node_find_by_cluster_id(redis_nodeset_t *ns, ngx_str_t *cluster_id) {
-  return nodeset_node_find_by(ns, &_node_match.cluster_id, cluster_id);
-}
-
-static int keyslot_ranges_overlap(redis_slot_range_t *r1, redis_slot_range_t *r2) {
-  return rbtree_cluster_keyslots_compare(r1, r2) == 0;
-}
-
-redis_node_t *nodeset_node_find_by_range(redis_nodeset_t *ns, redis_slot_range_t *range) {
-  ngx_rbtree_node_t                   *rbtree_node;
-  redis_nodeset_slot_range_node_t     *keyslot_tree_node;
-  
-  if((rbtree_node = rbtree_find_node(&ns->cluster.keyslots, range)) != NULL) {
-    keyslot_tree_node = rbtree_data_from_node(rbtree_node);
-    assert(keyslot_ranges_overlap(range, &keyslot_tree_node->range));
-    return keyslot_tree_node->node;
-  }
-  else {
-    return NULL;
-  }
-}
-
-redis_node_t *nodeset_node_find_by_slot(redis_nodeset_t *ns, uint16_t slot) {
-  redis_slot_range_t range;
-  range.min = slot;
-  range.max = slot;
-  return nodeset_node_find_by_range(ns, &range);
-}
-redis_node_t *nodeset_node_find_any_ready_master(redis_nodeset_t *ns) {
-  redis_node_t *cur;
-  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
-    if(cur->state >= REDIS_NODE_READY && cur->role == REDIS_NODE_ROLE_MASTER) {
-      return cur;
-    }
-  }
-  return NULL;
-}
-
-redis_node_t *nodeset_node_find_by_channel_id(redis_nodeset_t *ns, ngx_str_t *channel_id) {
-  redis_node_t      *node;
-  static uint16_t    prefix_crc = 0;
-  uint16_t           slot;
-  
-  if(!ns->cluster.enabled) {
-    node = nodeset_node_find_any_ready_master(ns);
-  }
-  else {
-    if(prefix_crc == 0) {
-      prefix_crc = redis_crc16(0, "channel:", 8);
-    }
-    slot = redis_crc16(prefix_crc, (const char *)channel_id->data, channel_id->len) % 16384;
-    //DBG("channel id %V (key {channel:%V}) slot %i", str, str, slot);
-    
-    node = nodeset_node_find_by_slot(ns, slot);
-  }
-  
-#if REDIS_NODESET_DBG
-  if(node == NULL) {
-    nodeset_update_debuginfo(ns);
-    raise(SIGABRT);
-  }
-#endif
-  
-  return node;
-}
-
-redis_node_t *nodeset_node_find_by_key(redis_nodeset_t *ns, ngx_str_t *key) {
-  if(!ns->cluster.enabled) {
-    return nodeset_node_find_any_ready_master(ns);
-  }
-  
-  char        *start, *end;
-  ngx_str_t    hashable;
-  uint16_t     slot;
-  
-  if(((start = memchr(key->data, '{', key->len))) != NULL) {
-    start++;
-    end = memchr(start, '}', key->len - ((u_char *)start - key->data));
-    if(end && end - start > 1) {
-      hashable.data = (u_char *)start;
-      hashable.len = (end - start);
-    }
-    else {
-      hashable = *key;
-      // not quite right -- need to ignore zero-length {} and scan to the next {
-      // but it's good enough for the keys we're using
-    }
-  }
-  else {
-    hashable = *key;
-  }
-  slot = redis_crc16(0, (const char *)hashable.data, hashable.len) % 16384;
-  
-  return nodeset_node_find_by_slot(ns, slot);
-}
-
-static void ping_command_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  redisReply                 *reply = rep;
-  redis_node_t               *node = privdata;
-  if(!reply || reply->type == REDIS_REPLY_ERROR || !ac || ac->err) {
-    node_log_error(node, "node ping failed");
-    return;
-  }
-  node_log_debug(node, "node ping command reply ok");
-}
-
-static void node_ping_event(ngx_event_t *ev) {
-  redis_node_t       *node = ev->data;
-  redis_nodeset_t    *ns = node->nodeset;
-  if(!ev->timedout || ngx_exiting || ngx_quit)
-    return;
-  
-  node_log_debug(node, "node ping event");
-  
-  ev->timedout = 0;
-  if(node->state == REDIS_NODE_READY) {
-    assert(node->ctx.cmd);
-    
-    //we used to PUBLISH to the correct keyslot-mapped cluster node
-    //but Redis clusters don't shard the PUBSUB keyspace, so this discrimination isn't necessary
-    //just publish the damn thing if this is a master node, and just a PING for slaves
-    if(node->role == REDIS_NODE_ROLE_MASTER) {
-      redisAsyncCommand(node->ctx.cmd, ping_command_callback, node, "PUBLISH %s ping", redis_worker_id);
-    }
-    else {
-      redisAsyncCommand(node->ctx.cmd, ping_command_callback, node, "PING");
-    }
-    
-    if(ns->settings.ping_interval > 0) {
-      ngx_add_timer(ev, ns->settings.ping_interval * 1000);
-    }
-  }
-}
-
-static void rearm_cluster_check_event(ngx_event_t *ev, redis_node_t *node) {
-  time_t              max_interval = node->nodeset->settings.cluster_check_interval;
-  time_t              interval_since_last_check = ngx_time() - node->cluster.last_successful_check;
-  
-  if(interval_since_last_check <= 0 || interval_since_last_check >= max_interval) {
-    ngx_add_timer(ev, max_interval * 1000);
-  }
-  else {
-    ngx_add_timer(ev, (max_interval - interval_since_last_check) * 1000);
-  }
-}
-
-static void node_cluster_check_event_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  redisReply                 *reply = rep;
-  redis_node_t               *node = privdata;
-  
-  ngx_str_t                   epoch_str;
-  int                         epoch;
-  
-  if(reply == NULL) {
-    node_log_error(node, "CLUSTER INFO command reply is NULL. Node should have already disconnected");
-    return;
-  }
-  
-  if(!reply_str_ok(reply)) {
-    node_log_error(node, "CLUSTER INFO command failed");
-    if(node->state >= REDIS_NODE_READY) {
-      node_disconnect(node, REDIS_NODE_FAILED);
-      nodeset_examine(node->nodeset);
-    }
-    return;
-  } 
-  if(!nchan_get_rest_of_line_in_cstr(reply->str, "cluster_current_epoch:", &epoch_str)) {
-    node_log_error(node, "CLUSTER INFO command reply is weird");
-    //why would this happen? dunno, fail node just in case
-    if(node->state >= REDIS_NODE_READY) {
-      node_disconnect(node, REDIS_NODE_FAILED);
-      nodeset_examine(node->nodeset);
-    }
-    return;
-  }
-  if((epoch = ngx_atoi(epoch_str.data, epoch_str.len)) == NGX_ERROR) {
-    node_log_error(node, "CLUSTER INFO command failed to parse current epoch number");
-    //why would this happen? dunno, fail node just in case
-    if(node->state >= REDIS_NODE_READY) {
-      node_disconnect(node, REDIS_NODE_FAILED);
-      nodeset_examine(node->nodeset);
-    }
-    return;
-  }
-  
-  if(node->cluster.current_epoch < epoch) {
-    node_disconnect(node, REDIS_NODE_FAILED);
-    char errstr[512];
-    ngx_snprintf((u_char *)errstr, 512, "config epoch has changed on node %V:%d. Disconnecting to reconfigure.%Z", &(node)->connect_params.hostname, node->connect_params.port);
-    nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, errstr);
-  }
-  else {
-    rearm_cluster_check_event(&node->cluster.check_timer, node);
-  }
-}
-
-static void node_cluster_check_event(ngx_event_t *ev) {
-  if(!ev->timedout || ngx_exiting || ngx_quit)
-    return;
-  
-  redis_node_t       *node = ev->data;
-  redis_nodeset_t    *ns = node->nodeset;
-  time_t              max_interval = ns->settings.cluster_check_interval;
-  time_t              interval_since_last_check = ngx_time() - node->cluster.last_successful_check;
-  ev->timedout = 0;
-  
-  if(node->state != REDIS_NODE_READY || !node->cluster.ok) {
-    rearm_cluster_check_event(ev, node);
-    return;
-  }
-  if(interval_since_last_check < max_interval) {
-    rearm_cluster_check_event(ev, node);
-    return;
-  }
-  redisAsyncCommand(node->ctx.cmd, node_cluster_check_event_callback, node, "CLUSTER INFO");
-}
-
-redis_node_t *nodeset_node_create_with_space(redis_nodeset_t *ns, redis_connect_params_t *rcp, size_t extra_space, void **extraspace_ptr) {
-  assert(!nodeset_node_find_by_connect_params(ns, rcp));
-  node_blob_t      *node_blob;
-  if(extra_space == 0) {
-    assert(extraspace_ptr == NULL);
-    node_blob = nchan_list_append(&ns->nodes);
-  }
-  else {
-    assert(extraspace_ptr);
-    node_blob = nchan_list_append_sized(&ns->nodes, sizeof(*node_blob)+extra_space);
-    if(extra_space) {
-      *extraspace_ptr = (void *)(&node_blob[1]);
-    }
-  }
-  redis_node_t     *node = &node_blob->node;
-  
-  assert((void *)node_blob == (void *)node);
-  assert(node);
-  node->role = REDIS_NODE_ROLE_UNKNOWN,
-  node->state = REDIS_NODE_DISCONNECTED;
-  node->discovered = 0;
-  node->connect_timeout = NULL;
-  node->connect_params = *rcp;
-  node->connect_params.peername.data = node_blob->peername;
-  node->connect_params.peername.len = 0;
-  node->cluster.id.len = 0;
-  node->cluster.id.data = node_blob->cluster_id;
-  node->cluster.enabled = 0;
-  node->cluster.ok = 0;
-  node->cluster.slot_range.indexed = 0;
-  node->cluster.slot_range.n = 0;
-  node->cluster.slot_range.range = NULL;
-  node->cluster.last_successful_check = 0;
-  node->cluster.current_epoch = 0;
-  ngx_memzero(&node->cluster.check_timer, sizeof(node->cluster.check_timer));
-  nchan_init_timer(&node->cluster.check_timer, node_cluster_check_event, node);
-  node->pending_commands = 0;
-  node->run_id.len = 0;
-  node->run_id.data = node_blob->run_id;
-  node->nodeset = ns;
-  node->generation = 0;
-  
-  if(rcp->password.len == 0 && ns->settings.password.len > 0) {
-    node->connect_params.password = ns->settings.password;
-  }
-  if(rcp->username.len == 0 && ns->settings.username.len > 0) {
-    node->connect_params.username = ns->settings.username;
-  }
-  
-  nchan_slist_init(&node->channels.cmd, rdstore_channel_head_t, redis.slist.node_cmd.prev, redis.slist.node_cmd.next);
-  nchan_slist_init(&node->channels.pubsub, rdstore_channel_head_t, redis.slist.node_pubsub.prev, redis.slist.node_pubsub.next);
-  
-  node->peers.master = NULL;
-  nchan_list_init(&node->peers.slaves, sizeof(redis_node_t *), "node slaves");
-  
-  ngx_memzero(&node->ping_timer, sizeof(node->ping_timer));
-  nchan_init_timer(&node->ping_timer, node_ping_event, node);
-  
-  node->ctx.cmd = NULL;
-  node->ctx.pubsub = NULL;
-  node->ctx.sync = NULL;
-  
-  assert(nodeset_node_find_by_connect_params(ns, rcp));
-  return node;
-}
-
-redis_node_t *nodeset_node_create(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
-  return nodeset_node_create_with_space(ns, rcp, 0, NULL);
-}
-
-redis_node_t *nodeset_node_create_with_connect_params(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
-  redis_node_t  *node;
-  u_char        *space;
-  size_t         sz = rcp->hostname.len + rcp->password.len;
-  node = nodeset_node_create_with_space(ns, rcp, sz, (void **)&space);
-  assert(node);
-  node->connect_params.hostname.data = space;
-  node->connect_params.hostname.len = 0;
-  nchan_strcpy(&node->connect_params.hostname, &rcp->hostname, 0);
-  node->connect_params.password.data = &space[rcp->hostname.len];
-  nchan_strcpy(&node->connect_params.password, &rcp->password, 0);
-  
-  return node;
-}
-
-static void node_remove_peer(redis_node_t *node, redis_node_t *peer) {
-  redis_node_t  **cur;
-  if(node->peers.master == peer) {
-    node->peers.master = NULL;
-  }
-  
-  for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
-    if(*cur == peer) {
-      nchan_list_remove(&node->peers.slaves, cur);
-      return;
-    }
-  }
-}
-
-ngx_int_t nodeset_node_destroy(redis_node_t *node) {
-  redisAsyncContext *ac;
-  redisContext      *c;
-  node_set_role(node, REDIS_NODE_ROLE_UNKNOWN); //removes from all peer lists, and clears own slave list
-  if((ac = node->ctx.cmd) != NULL) {
-    node->ctx.cmd = NULL;
-    redisAsyncFree(ac);
-  }
-  if((ac = node->ctx.pubsub) != NULL) { 
-    node->ctx.pubsub = NULL;
-    redisAsyncFree(ac);
-  }
-  if((c = node->ctx.sync) != NULL) {
-    node->ctx.sync = NULL;
-    redisFree(c);
-  }
-  if(node->connect_timeout) {
-    nchan_abort_oneshot_timer(node->connect_timeout);
-    node->connect_timeout = NULL;
-  }
-  nchan_list_remove(&node->nodeset->nodes, node);
-  return NGX_OK;
-}
-
-static void node_discover_slave(redis_node_t *master, redis_connect_params_t *rcp) {
-  redis_node_t    *slave;
-  if((slave = nodeset_node_find_by_connect_params(master->nodeset, rcp))!= NULL) {
-    //we know about it already
-    if(slave->role != REDIS_NODE_ROLE_SLAVE && slave->state > REDIS_NODE_GET_INFO) {
-      node_log_notice(slave, "Node appears to have changed to slave -- need to update");
-      node_set_role(slave, REDIS_NODE_ROLE_UNKNOWN);
-      node_disconnect(slave, REDIS_NODE_FAILED);
-      node_connect(slave);
-    }
-    //assert(slave->peers.master == master);
-  }
-  else {
-    
-    
-    slave = nodeset_node_create_with_connect_params(master->nodeset, rcp);
-    slave->discovered = 1;
-    node_set_role(slave, REDIS_NODE_ROLE_SLAVE);
-    node_log_notice(master, "Discovering own slave %s", rcp_cstr(rcp));
-  }
-  node_set_master_node(slave, master); //this is idempotent
-  node_add_slave_node(master, slave);  //so is this
-  //try to connect
-  if(slave->state <= REDIS_NODE_DISCONNECTED) {
-    node_connect(slave);
-  }
-}
-
-static void node_discover_master(redis_node_t  *slave, redis_connect_params_t *rcp) {
-  redis_node_t *master;
-  if ((master = nodeset_node_find_by_connect_params(slave->nodeset, rcp)) != NULL) {
-      if(master->role != REDIS_NODE_ROLE_MASTER && master->state > REDIS_NODE_GET_INFO) {
-        node_log_notice(master, "Node appears to have changed to master -- need to update");
-        node_set_role(master, REDIS_NODE_ROLE_UNKNOWN);
-        node_disconnect(master, REDIS_NODE_FAILED);
-        node_connect(master);
-      }
-    //assert(node_find_slave_node(master, slave));
-    //node_log_notice(slave, "Discovering master %s... already known", rcp_cstr(rcp));
-  }
-  else {
-    master = nodeset_node_create_with_connect_params(slave->nodeset, rcp);
-    master->discovered = 1;
-    node_set_role(master, REDIS_NODE_ROLE_MASTER);
-    node_log_notice(slave, "Discovering own master %s", rcp_cstr(rcp));
-  }
-  node_set_master_node(slave, master);
-  node_add_slave_node(master, slave);
-  //try to connect
-  if(master->state <= REDIS_NODE_DISCONNECTED) {
-    node_connect(master);
-  }
-}
-
-static int node_skip_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l) {
-  redis_connect_params_t   rcp;
-  char                    *description = "";
-  char                    *detail = "";
-  char                     detail_buf[64];
-  char                    *role = NULL;
-  ngx_uint_t               loglevel = NGX_LOG_NOTICE;
-  nchan_redis_ip_range_t  *matched;
-  rcp.hostname = l->hostname;
-  rcp.port = l->port;
-  rcp.peername.len = 0;
-  rcp.db = node->connect_params.db;
-  rcp.password = node->connect_params.password;
-  
-  if(l->noaddr) {
-    role = "node";
-    description = "no-address";
-    return 1;
-  }
-  else if(l->handshake) {
-    role = "node";
-    description = "handshaking";
-    
-  }
-  else if(l->hostname.len == 0) {
-    role = "node";
-    description = "empty hostname";
-  }
-  else if(l->failed) {
-    description = "failed";
-  }
-  else if(!l->connected) {
-    description = "disconnected";
-  }
-  else if(l->self) {
-    description = "self";
-    loglevel = NGX_LOG_INFO;
-  }
-  else if((matched = node_ip_blacklisted(node->nodeset, &rcp)) != NULL) {
-    description = "blacklisted";
-    detail = detail_buf;
-    ngx_snprintf((u_char *)detail_buf, 64, " (matched blacklist entry %V)%Z", &matched->str);
-  }
-  else {
-    return 0;
-  }
-  if(!role) role = l->master ? "master" : "slave";
-  nodeset_log(node->nodeset, loglevel, "Skipping %s %s node %s%s", description, role, rcp_cstr(&rcp), detail);
-  return 1;
-}
-
-static int node_discover_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l) {
-  redis_connect_params_t   rcp;
-  redis_node_t            *peer;
-  assert(!l->self);
-  if(l->failed || !l->connected || l->noaddr || l->self) {
-    return 0;
-  }
-  rcp.hostname = l->hostname;
-  rcp.port = l->port;
-  rcp.peername.len = 0;
-  rcp.db = node->connect_params.db;
-  rcp.password = node->connect_params.password;
-  rcp.username = node->connect_params.username;
-  
-  if( ((peer = nodeset_node_find_by_connect_params(node->nodeset, &rcp)) != NULL)
-   || ((peer = nodeset_node_find_by_cluster_id(node->nodeset, &l->id)) != NULL)
-  ) {
-    //node_log_notice(node, "Discovering cluster node %s... already known", rcp_cstr(&rcp));
-    return 0; //we already know this one.
-  }
-  nodeset_log_notice(node->nodeset, "Discovering cluster %s %s", (l->master ? "master" : "slave"), rcp_cstr(&rcp));
-  peer = nodeset_node_create_with_connect_params(node->nodeset, &rcp);
-  peer->discovered = 1;
-  nchan_strcpy(&peer->cluster.id, &l->id, MAX_CLUSTER_ID_LENGTH);
-  node_set_role(peer, l->master ? REDIS_NODE_ROLE_MASTER : REDIS_NODE_ROLE_SLAVE);
-  //ignore all the other things for now
-  node_connect(peer);
-  return 1;
-}
-
-static ngx_int_t set_preallocated_peername(redisAsyncContext *ctx, ngx_str_t *dst);
-
-static void node_connector_fail(redis_node_t *node, const char *err) {
-  const char  *ctxerr = NULL;
-  if(node->ctx.cmd && node->ctx.cmd->err) {
-    ctxerr = node->ctx.cmd->errstr;
-  }
-  else if(node->ctx.pubsub && node->ctx.pubsub->err) {
-    ctxerr = node->ctx.pubsub->errstr;
-  }
-  else if(node->ctx.sync && node->ctx.sync->err) {
-    ctxerr = node->ctx.sync->errstr;
-  }
-  if(node->state == REDIS_NODE_CONNECTION_TIMED_OUT) {
-    node_log_error(node, "connection failed: %s", err == NULL ? "timeout" : err);
-  }
-  else if(ctxerr) {
-    if(err) {
-      node_log_error(node, "connection failed: %s (%s)", err, ctxerr);
-    }
-    else {
-      node_log_error(node, "connection failed: %s", ctxerr);
-    }
-  }
-  else if(err) {
-    node_log_error(node, "connection failed: %s", err);
-  }
-  else {
-    node_log_error(node, "connection failed");
-  }
-  node_disconnect(node, REDIS_NODE_FAILED);
-}
-
-int node_connect(redis_node_t *node) {
-  assert(node->state <= REDIS_NODE_DISCONNECTED);
-  node_connector_callback(NULL, NULL, node);
-  return 1;
-}
-
-int node_disconnect(redis_node_t *node, int disconnected_state) {
-  ngx_int_t prev_state = node->state;
-  node_log_debug(node, "disconnect");
-  redisAsyncContext *ac;
-  redisContext      *c;
-  if((ac = node->ctx.cmd) != NULL) {
-    node->ctx.cmd->onDisconnect = NULL;
-    node->ctx.cmd = NULL;
-    //redisAsyncSetDisconnectCallback(ac, NULL); //this only sets the callback if it's currently null...
-    redisAsyncFree(ac);
-    node_log_debug(node, "redisAsyncFree %p", ac);
-  }
-  if((ac = node->ctx.pubsub) != NULL) {
-    node->ctx.pubsub->onDisconnect = NULL;
-    node->ctx.pubsub = NULL;
-    //redisAsyncSetDisconnectCallback(ac, NULL);  //this only sets the callback if it's currently null...
-    redisAsyncFree(ac);
-    node_log_debug(node, "redisAsyncFree pubsub %p", ac);
-  }
-  if((c = node->ctx.sync) != NULL) {
-    node->ctx.sync = NULL;
-    redisFree(c);
-  }
-  if(node->connect_timeout) {
-    nchan_abort_oneshot_timer(node->connect_timeout);
-    node->connect_timeout = NULL;
-  }
-
-  node->state = disconnected_state;
-  if(prev_state >= REDIS_NODE_READY) {
-    nchan_update_stub_status(redis_connected_servers, -1);
-  }
-  if(node->cluster.enabled) {
-    nodeset_cluster_node_unindex_keyslot_ranges(node);
-  }
-  if(node->cluster.slot_range.range) {
-    ngx_free(node->cluster.slot_range.range);
-    node->cluster.slot_range.n=0;
-    node->cluster.slot_range.range = NULL;
-  }
-  if(node->ping_timer.timer_set) {
-    ngx_del_timer(&node->ping_timer);
-  }
-  if(node->cluster.check_timer.timer_set) {
-    ngx_del_timer(&node->cluster.check_timer);
-  }
-  
-  rdstore_channel_head_t *cur;
-  nchan_slist_t *cmd = &node->channels.cmd;
-  nchan_slist_t *pubsub = &node->channels.pubsub;
-  nchan_slist_t *disconnected_cmd = &node->nodeset->channels.disconnected_cmd;
-  nchan_slist_t *disconnected_pubsub = &node->nodeset->channels.disconnected_pubsub;
-  
-  for(cur = nchan_slist_first(cmd); cur != NULL; cur = nchan_slist_first(cmd)) {
-    nodeset_node_dissociate_chanhead(cur);
-    nchan_slist_append(disconnected_cmd, cur);
-    cur->redis.slist.in_disconnected_cmd_list = 1;
-    if(cur->status && cur->status == READY) {
-      cur->status = NOTREADY;
-    }
-  }
-  for(cur = nchan_slist_first(pubsub); cur != NULL; cur = nchan_slist_first(pubsub)) {
-    nodeset_node_dissociate_pubsub_chanhead(cur);
-    nchan_slist_append(disconnected_pubsub, cur);
-    cur->redis.slist.in_disconnected_pubsub_list = 1;
-    
-    cur->pubsub_status = REDIS_PUBSUB_UNSUBSCRIBED;
-    
-    if(cur->redis.nodeset->settings.storage_mode == REDIS_MODE_BACKUP && cur->status == READY) {
-      cur->status = NOTREADY;
-    }
-
-  }
-  return 1;
-}
-
-void node_set_role(redis_node_t *node, redis_node_role_t role) {
-  if(node->role == role) {
-    return;
-  }
-  node->role = role;
-  redis_node_t  **cur;
-  switch(node->role) {
-    case REDIS_NODE_ROLE_UNKNOWN:
-      if(node->peers.master) {
-        node_remove_peer(node->peers.master, node);
-        DBG("removed %p from peers of %p", node->peers.master, node);
-        node->peers.master = NULL;
-      }
-      for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
-        node_remove_peer(*cur, node);
-      }
-      nchan_list_empty(&node->peers.slaves);
-      break;
-    
-    case REDIS_NODE_ROLE_MASTER:
-      if(node->peers.master) {
-        node_remove_peer(node->peers.master, node);
-        node->peers.master = NULL;
-      }
-      break;
-    
-    case REDIS_NODE_ROLE_SLAVE:
-      //do nothing
-      break;
-      
-  }
-}
-
-int node_set_master_node(redis_node_t *node, redis_node_t *master) {
-  if(node->peers.master && node->peers.master != master) {
-    node_remove_slave_node(master, node);
-  }
-  node->peers.master = master;
-  return 1;
-}
-redis_node_t *node_find_slave_node(redis_node_t *node, redis_node_t *slave) {
-  redis_node_t **cur;
-  for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
-    if (*cur == slave) {
-      return slave;
-    }
-  }
-  return NULL;
-}
-int node_add_slave_node(redis_node_t *node, redis_node_t *slave) {
-  if(!node_find_slave_node(node, slave)) {
-    redis_node_t **slaveref;
-    slaveref = nchan_list_append(&node->peers.slaves);
-    *slaveref = slave;
-    return 1;
-  }
-  return 1;
-}
-int node_remove_slave_node(redis_node_t *node, redis_node_t *slave) {
-  if(!node_find_slave_node(node, slave)) {
-    nchan_list_remove(&node->peers.slaves, slave);
-  }
-  return 1;
-}
-
-static int node_parseinfo_set_preallocd_str(redis_node_t *node, ngx_str_t *target, const char *info, const char *linestart, size_t maxlen) {
-  ngx_str_t found;
-  if(nchan_get_rest_of_line_in_cstr(info, linestart, &found)) {
-    if(found.len > maxlen) {
-      node_log_error(node, "\"%s\" is too long", linestart);
-      return 0;
-    }
-    else {
-      target->len = found.len;
-      ngx_memcpy(target->data, found.data, found.len);
-      return 1;
-    }
-  }
-  return 0;
-}
-
-static int node_parseinfo_set_run_id(redis_node_t *node, const char *info) {
-  return node_parseinfo_set_preallocd_str(node, &node->run_id, info, "run_id:", MAX_RUN_ID_LENGTH);
-}
-
-static int node_connector_loadscript_reply_ok(redis_node_t *node, redis_lua_script_t *script, redisReply *reply) {
-  if (reply == NULL) {
-    node_log_error(node, "missing reply after loading Redis Lua script %s", script->name);
-    return 0;
-  }
-  switch(reply->type) {
-    case REDIS_REPLY_ERROR:
-      node_log_error(node, "failed loading Redis Lua script %s: %s", script->name, reply->str);
-      return 0;
-    
-    case REDIS_REPLY_STRING:
-      if(ngx_strncmp(reply->str, script->hash, REDIS_LUA_HASH_LENGTH)!=0) {
-        node_log_error(node, "Lua script %s has unexpected hash %s (expected %s)", script->name, reply->str, script->hash);
-        return 0;
-      }
-      else {
-        return 1;
-      }
-      break;
-      
-    default:
-      node_log_error(node, "unexpected reply type while loading Redis Lua script %s", script->name);
-      return 0;
-  }
-}
-
-static void redis_nginx_unexpected_disconnect_event_handler(const redisAsyncContext *ac, int status) {
-  redis_node_t    *node = ac->data;
-  //char            *which_ctx;
-  //DBG("unexpected disconnect event handler ac %p", ac);
-  if(node) {
-    if(node->ctx.cmd == ac) {
-      //which_ctx = "cmd";
-      node->ctx.cmd = NULL;
-    }
-    else if(node->ctx.pubsub == ac) {
-      node->ctx.pubsub = NULL;
-      //which_ctx = "pubsub";
-    }
-    else {
-      node_log_error(node, "unknown redisAsyncContext disconnected");
-      //which_ctx = "unknown";
-    }
-    
-    if(node->state >= REDIS_NODE_READY && !ngx_exiting && !ngx_quit) {
-      if(ac->err) {
-        node_log_error(node, "connection lost: %s.", ac->errstr);
-      }
-      else {
-        node_log_error(node, "connection lost");
-      }
-    }
-    node_disconnect(node, REDIS_NODE_FAILED);
-    nodeset_examine(node->nodeset);
-  }
-}
-
-static void redis_nginx_connect_event_handler(const redisAsyncContext *ac, int status) {
-  node_connector_callback((redisAsyncContext *)ac, NULL, ac->data);
-}
-
-static redisAsyncContext *node_connect_context(redis_node_t *node) {
-  redisAsyncContext       *ac = NULL;
-  redis_connect_params_t  *rcp = &node->connect_params;
-  u_char                   hostchr[1024] = {0};
-    if(rcp->hostname.len >= 1023) {
-    node_log_error(node, "redis hostname is too long");
-    return NULL;
-  }
-  ngx_memcpy(hostchr, rcp->hostname.data, rcp->hostname.len);
-  ac = redisAsyncConnect((const char *)hostchr, rcp->port);
-  if (ac == NULL) {
-    node_log_error(node, "count not allocate Redis context");
-    return NULL;
-  }
-  if(ac->err) {
-    node_log_error(node, "could not create Redis context: %s", ac->errstr);
-    redisAsyncFree(ac);
-    return NULL;
-  }
-  
-#if (NGX_OPENSSL)
-  if(node->nodeset->settings.tls.enabled) {
-    SSL *ssl = SSL_new(node->nodeset->ssl_context);
-    if (!ssl) {
-      redisAsyncFree(ac);
-      node_log_error(node, "Failed to create SSL object");
-      return NULL;
-    }
-    
-    if (node->nodeset->settings.tls.server_name.len > 0 && !SSL_set_tlsext_host_name(ssl, (char *)node->nodeset->settings.tls.server_name.data)) {
-        node_log_error(node, "Failed to configure SSL server name");
-        SSL_free(ssl);
-        redisAsyncFree(ac);
-        return NULL;
-    }
-    
-    if(redisInitiateSSL(&ac->c, ssl) != REDIS_OK) {
-      node_log_error(node, "could not initialize Redis SSL context: %s", (ac->errstr ? ac->errstr : "unknown error"));
-      redisAsyncFree(ac);
-      return NULL;
-    }
-  }
-#endif
-  
-  if(redis_nginx_event_attach(ac) != REDIS_OK) {
-    node_log_error(node, "could not attach Nginx events");
-    redisAsyncFree(ac);
-    return NULL;
-  }
-    
-  ac->data = node;
-  
-  redisAsyncSetConnectCallback(ac, redis_nginx_connect_event_handler);
-  redisAsyncSetDisconnectCallback(ac, redis_nginx_unexpected_disconnect_event_handler);
-  return ac;
-}
-
-redisContext *node_connect_sync_context(redis_node_t *node) {
-  redisReply              *reply;
-  redisContext            *c;
-  redis_connect_params_t  *rcp = &node->connect_params;
-  u_char                   hostchr[1024] = {0};
-    if(rcp->hostname.len >= 1023) {
-    node_log_error(node, "redis hostname is too long");
-    return NULL;
-  }
-  ngx_memcpy(hostchr, rcp->hostname.data, rcp->hostname.len);
-  
-  c = redisConnect((const char *)hostchr, rcp->port);
-  if(c == NULL) {
-    node_log_error(node, "could not connect synchronously to Redis");
-    return NULL;
-  }
-  else if(c->err) {
-    node_log_error(node, "could not connect synchronously to Redis: %s", c->errstr);
-    redisFree(c);
-    return NULL;
-  }
-  
-#if (NGX_OPENSSL)
-  if(node->nodeset->settings.tls.enabled) {
-    
-    SSL *ssl = SSL_new(node->nodeset->ssl_context);
-    if (!ssl) {
-      redisFree(c);
-      node_log_error(node, "could not connect synchronously to Redis: Failed to create SSL object");
-      return NULL;
-    }
-    
-    if (node->nodeset->settings.tls.server_name.len > 0 && !SSL_set_tlsext_host_name(ssl, (char *)node->nodeset->settings.tls.server_name.data)) {
-      node_log_error(node, "could not connect synchronously to Redis: Failed to configure SSL server name");
-      SSL_free(ssl);
-      redisFree(c);
-      return NULL;
-    }
-    
-    if(redisInitiateSSL(c, ssl) != REDIS_OK) {
-      node_log_error(node, "could not initialize Redis SSL context: %s", c->errstr);
-      SSL_free(ssl);
-      redisFree(c);
-      return NULL;
-    }
-  }
-#endif
-
-  if(rcp->password.len > 0) {
-    if(rcp->username.len > 0) {
-      reply = redisCommand(c, "AUTH %b %b", rcp->username.data, rcp->username.len, rcp->password.data, rcp->password.len);
-    }
-    else {
-      reply = redisCommand(c, "AUTH %b", rcp->password.data, rcp->password.len);
-    }
-    if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
-      node_log_error(node, "could not connect synchronously to Redis: bad password");
-      redisFree(c);
-      return NULL;
-    }
-  }
-  if(rcp->db != -1) {
-    reply = redisCommand(c, "SELECT %d", rcp->db);
-    if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
-      node_log_error(node, "could not connect synchronously to Redis: bad database number");
-      redisFree(c);
-      return NULL;
-    }
-  }
-  
-  return c;
-}
-
-static nchan_redis_ip_range_t *node_ip_blacklisted(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
-  struct addrinfo *res;
-  char hostname_buf[128];
-  ngx_memzero(hostname_buf, sizeof(hostname_buf));
-  ngx_memcpy(hostname_buf, rcp->hostname.data, rcp->hostname.len);
-  
-  if(getaddrinfo(hostname_buf, NULL, NULL, &res) != 0) {
-    nodeset_log_error(ns, "Failed to getaddrinfo for hostname %V while deciding if IP is blacklisted");
-    return NULL;
-  }
-  int fam = res->ai_family;
-  union {
-    struct in_addr  ipv4;
-#ifdef AF_INET6
-    struct in6_addr ipv6;
-#endif
-  } addr;
-  
-  if(res->ai_family == AF_INET) {
-    addr.ipv4 = ((struct sockaddr_in *)res->ai_addr)->sin_addr;
-  }
-#ifdef AF_INET6
-  else if(res->ai_family == AF_INET6) {
-    addr.ipv6 = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
-  }
-#endif
-  freeaddrinfo(res);
-  int i;
-  for(i=0; i < ns->settings.blacklist.count; i++) {
-    nchan_redis_ip_range_t *entry = &ns->settings.blacklist.list[i];
-    if(entry->family != fam) {
-      continue;
-    }
-    if(fam == AF_INET) {
-      if(entry->addr_block.ipv4.s_addr == (addr.ipv4.s_addr & entry->mask.ipv4.s_addr)) {
-        return entry;
-      }
-    }
-#ifdef AF_INET6
-    else if(fam == AF_INET6) {
-      unsigned           j;
-      struct in6_addr    buf = addr.ipv6;
-      uint8_t           *masked_addr = entry->addr_block.ipv6.s6_addr;
-      uint8_t           *mask = entry->mask.ipv6.s6_addr;
-      
-      for(j=0; j<sizeof(entry->addr_block.ipv6.s6_addr); j++) {
-        masked_addr[j] &= mask[j];
-      }
-      
-      if(memcmp(entry->addr_block.ipv6.s6_addr, &buf, sizeof(buf)) == 0) {
-        return entry;
-      }
-    }
-#endif
-  }
-  
-  return NULL;
-}
-
-static int node_discover_slaves_from_info_reply(redis_node_t *node, redisReply *reply) {
-  redis_connect_params_t   *rcp;
-  size_t                    i, n;
-  if(!(rcp = parse_info_slaves(node, reply->str, &n))) {
-    return 0;
-  }
-  for(i=0; i<n; i++) {
-    nchan_redis_ip_range_t *matched = node_ip_blacklisted(node->nodeset, &rcp[i]);
-    if(matched) {
-      nodeset_log_notice(node->nodeset, "Skipping slave node %V blacklisted by %V", &rcp->hostname, &matched->str);
-    }
-    else {
-      node_discover_slave(node, &rcp[i]);
-    }
-  }
-  return 1;
-}
-
-int nodeset_node_keyslot_changed(redis_node_t *node) {
-  if(node->state >= REDIS_NODE_READY) {
-    node_disconnect(node, REDIS_NODE_FAILED);
-  }
-  
-  char errstr[512];
-  ngx_snprintf((u_char *)errstr, 512, "cluster keyspace needs to be updated as reported by node %V:%d%Z", &(node)->connect_params.hostname, node->connect_params.port);
-  nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, errstr);
-  return 1;
-}
-
-int nodeset_node_reply_keyslot_ok(redis_node_t *node, redisReply *reply) {
-  if(reply && reply->type == REDIS_REPLY_ERROR) {
-    char    *script_nonlocal_key_error = "Lua script attempted to access a non local key in a cluster node";
-    char    *script_error_start = "ERR Error running script";
-    char    *command_move_error = "MOVED ";
-    char    *command_ask_error = "ASK ";
-    
-    if((nchan_cstr_startswith(reply->str, script_error_start) && nchan_strstrn(reply->str, script_nonlocal_key_error))
-     || nchan_cstr_startswith(reply->str, command_move_error)
-     || nchan_cstr_startswith(reply->str, command_ask_error)) {
-      if(!node->cluster.enabled) {
-        node_log_error(node, "got a cluster error on a non-cluster redis connection: %s", reply->str);
-        node_disconnect(node, REDIS_NODE_FAILED);
-        nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, "Strange response from node");
-      }
-      else {
-        nodeset_node_keyslot_changed(node);
-      }
-      return 0;
-    }
-  }
-  if(node->cluster.enabled) {
-    node->cluster.last_successful_check = ngx_time();
-  }
-  return 1;
-}
-
-static void node_subscribe_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  redisReply                 *reply = rep;
-  redis_node_t               *node = privdata;
-  if(node->state == REDIS_NODE_SUBSCRIBING_WORKER) {
-    node_connector_callback(ac, rep, privdata);
-  }
-  else if(reply && reply->type == REDIS_REPLY_ARRAY && reply->elements == 3
-   && reply->element[0]->type == REDIS_REPLY_STRING 
-   && reply->element[1]->type == REDIS_REPLY_STRING
-   && reply->element[2]->type == REDIS_REPLY_STRING
-   && strcmp(reply->element[0]->str, "message") == 0
-   && strcmp(reply->element[1]->str, redis_worker_id) == 0
-   && strcmp(reply->element[2]->str, "ping") == 0
-  ) {
-    node_log_debug(node, "received PUBSUB ping message");
-  }
-  else {
-    redis_subscribe_callback(ac, rep, privdata);
-  }
-}
-
-void node_connector_connect_timeout(void *pd) {
-  redis_node_t  *node = pd;
-  node->connect_timeout = NULL;
-  if(node->state == REDIS_NODE_CMD_CONNECTING || node->state == REDIS_NODE_PUBSUB_CONNECTING) {
-    //onConnect won't be fired, so the connector must be called manually
-    node->state = REDIS_NODE_CONNECTION_TIMED_OUT;
-    node_connector_callback(NULL, NULL, node);
-  }
-  else {
-    node_disconnect(node, REDIS_NODE_CONNECTION_TIMED_OUT);
-  }
-}
-
-static void node_connector_callback(redisAsyncContext *ac, void *rep, void *privdata) {
-  redisReply                 *reply = rep;
-  redis_node_t               *node = privdata;
-  redis_nodeset_t            *nodeset = node->nodeset;
-  char                        errstr[1024];
-  redis_connect_params_t     *cp = &node->connect_params;
-  redis_lua_script_t         *next_script = (redis_lua_script_t *)&redis_lua_scripts;
-  node_log_debug(node, "node_connector_callback state %d", node->state);
-  ngx_str_t                   rest;
-  
-  switch(node->state) {
-    case REDIS_NODE_CONNECTION_TIMED_OUT:
-      return node_connector_fail(node, "connection timed out");
-      break;
-    case REDIS_NODE_FAILED:
-    case REDIS_NODE_DISCONNECTED:
-      assert(!node->connect_timeout);
-      if((node->ctx.cmd = node_connect_context(node)) == NULL) { //always connect the cmd ctx to the hostname
-        return node_connector_fail(node, "failed to open redis async context for cmd");
-      }
-      else if(cp->peername.len == 0) { //don't know peername yet
-        set_preallocated_peername(node->ctx.cmd, &cp->peername);
-      }
-      node->connect_timeout = nchan_add_oneshot_timer(node_connector_connect_timeout, node, nodeset->settings.connect_timeout);
-      node->state = REDIS_NODE_CMD_CONNECTING;
-      break; //wait until the onConnect callback brings us back
-      
-    case REDIS_NODE_CMD_CONNECTING:
-      if(ac->err || ac->c.err) {
-        node->ctx.cmd = NULL; //to avoid calling redisAsyncFree on the ctx during node_disconnect()
-        //(it will be called automatically when this function returns control back to hiredis
-        return node_connector_fail(node, ac->errstr);
-      }
-      if((node->ctx.pubsub = node_connect_context(node)) == NULL) {
-        return node_connector_fail(node, "failed to open redis async context for pubsub");
-      }
-      node->state++;
-      break; //wait until the onConnect callback brings us back
-    
-    case REDIS_NODE_PUBSUB_CONNECTING:
-      if(ac->err || ac->c.err) {
-        node->ctx.pubsub = NULL; //to avoid calling redisAsyncFree on the ctx during node_disconnect()
-        //(it will be called automatically when this function returns control back to hiredis
-        ngx_snprintf((u_char *)errstr, 1024, "(pubsub) %s%Z", ac->errstr);
-        return node_connector_fail(node, errstr);
-      }
-      //connection established. move on...   
-      node->state++;
-      /* fall through */
-      
-    case REDIS_NODE_CMD_CHECKING_CONNECTION:
-      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "PING");
-      node->state++;
-      break;
-      
-    case REDIS_NODE_CMD_CHECKED_CONNECTION:
-      //Was the ping ok? it's alright if there was an AUTH error, as long as we have a response
-      if(!reply || ac->err) {
-        return node_connector_fail(node, NULL);
-      }
-      if(reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")  && cp->password.len == 0) {
-        return node_connector_fail(node, "server expects a password, but none was configured");
-      }
-      node->state++;
-      /* fall through */
-      
-    case REDIS_NODE_PUBSUB_CHECKING_CONNECTION:
-      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "PING");
-      node->state++;
-      break;
-      
-    case REDIS_NODE_PUBSUB_CHECKED_CONNECTION:
-      if(!reply || ac->err) {
-        return node_connector_fail(node, NULL);
-      }
-      if(reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")  && cp->password.len == 0) {
-        return node_connector_fail(node, "server expects a password, but none was configured");
-      }
-      node->state++;
-      /* fall through */
-      
-    case REDIS_NODE_CONNECTED:
-      //now we need to authenticate maybe?
-      if(cp->password.len > 0) {
-        if(!node->ctx.cmd) {
-          return node_connector_fail(node, "cmd connection missing, can't send AUTH command");
-        }
-        if(cp->username.len > 0) {
-          redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "AUTH %b %b", STR(&cp->username), STR(&cp->password));
-        }
-        else {
-          redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "AUTH %b", STR(&cp->password));
-        }
-        node->state++;
-      }
-      else {
-        node->state = REDIS_NODE_SELECT_DB;
-        return node_connector_callback(NULL, NULL, node); //continue as if authenticated
-      }
-      break;
-      
-    case REDIS_NODE_CMD_AUTHENTICATING:
-      if(!reply_status_ok(reply)) {
-        return node_connector_fail(node, "AUTH command failed");
-      }
-      if(!node->ctx.pubsub) {
-        return node_connector_fail(node, "pubsub connection missing, can't send AUTH command");
-      }
-      //now authenticate pubsub ctx
-      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "AUTH %b", STR(&cp->password));
-      node->state++;
-      break;
-    
-    case REDIS_NODE_PUBSUB_AUTHENTICATING:
-      if(!reply_status_ok(reply)) {
-        return node_connector_fail(node, "AUTH command failed");
-      }
-      node->state++;
-      /* fall through */
-    case REDIS_NODE_SELECT_DB:
-      if(cp->db > 0) {
-        if(!node->ctx.cmd) {
-          return node_connector_fail(node, "cmd connection missing, SELECT command");
-        }
-        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "SELECT %d", cp->db);
-        node->state++;
-      }
-      else {
-        node->state = REDIS_NODE_SCRIPTS_LOAD;
-        return node_connector_callback(NULL, NULL, node);
-      }
-      break;
-    
-    case REDIS_NODE_CMD_SELECTING_DB:
-      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
-        return node_connector_fail(node, "Redis SELECT command failed,");
-      }
-      if(!node->ctx.cmd) {
-        return node_connector_fail(node, "pubsub connection missing, can't send SELECT command");
-      }
-      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "SELECT %d", cp->db);
-      node->state++;
-      break;
-    
-    case REDIS_NODE_PUBSUB_SELECTING_DB:
-      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
-        return node_connector_fail(node, "Redis SELECT command failed,");
-      }
-      node->state++; // fallthru
-      /* fall through */
-    case REDIS_NODE_SCRIPTS_LOAD:
-      node->scripts_loaded = 0;
-      if(!node->ctx.cmd) {
-        return node_connector_fail(node, "cmd connection missing, can't send SCRIPT LOAD command");
-      }
-      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "SCRIPT LOAD %s", next_script->script);
-      node->state++;
-      break;
-    
-    case REDIS_NODE_SCRIPTS_LOADING:
-      next_script = &next_script[node->scripts_loaded];
-      
-      if(!node_connector_loadscript_reply_ok(node, next_script, reply)) {
-        return node_connector_fail(node, "SCRIPT LOAD failed,");
-      }
-      else {
-        //node_log_debug(node, "loaded script %s", next_script->name);
-        node->scripts_loaded++;
-        next_script++;
-      }
-      if(node->scripts_loaded < redis_lua_scripts_count) {
-        //load next script
-        if(!node->ctx.cmd) {
-          return node_connector_fail(node, "cmd connection missing, can't send SCRIPT LOAD command");
-        }
-        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "SCRIPT LOAD %s", next_script->script);
-        return;
-      }
-      node_log_debug(node, "all scripts loaded");
-      node->state++;
-      /* fall through */
-    case REDIS_NODE_GET_INFO:
-      //getinfo time
-      if(!node->ctx.cmd) {
-        return node_connector_fail(node, "cmd connection missing, can't send INFO ALL command");
-      }
-      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "INFO ALL");
-      node->state++;
-      break;
-      
-    case REDIS_NODE_GETTING_INFO:
-      if(reply && reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")) {
-        return node_connector_fail(node, "authentication required");
-      }
-      else if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
-        return node_connector_fail(node, "INFO command failed");
-      }
-      else if(!node_parseinfo_set_run_id(node, reply->str)) {
-        return node_connector_fail(node, "failed to set node run_id");
-      }
-      else if(nodeset_node_deduplicate_by_run_id(node)) {
-        // this node already exists
-        // the deduplication has deleted it; we're done here.
-        // commence rejoicing.
-        return;
-      }
-      
-      if(nchan_cstr_match_line(reply->str, "loading:1")) {
-        return node_connector_fail(node, "is busy loading data...");
-      }
-      
-      if(nchan_cstr_match_line(reply->str, "cluster_enabled:1")) {
-        node->cluster.enabled = 1;
-      }
-      
-      if(nchan_cstr_match_line(reply->str, "role:master")) {
-        node_set_role(node, REDIS_NODE_ROLE_MASTER);
-        if(!node->cluster.enabled && !node_discover_slaves_from_info_reply(node, reply)) {
-          return node_connector_fail(node, "failed parsing slaves from INFO");
-        }
-      }
-      else if(nchan_cstr_match_line(reply->str, "role:slave")) {
-        redis_connect_params_t   *rcp;
-        node_set_role(node, REDIS_NODE_ROLE_SLAVE);
-        if(!(rcp = parse_info_master(node, reply->str))) {
-          return node_connector_fail(node, "failed parsing master from INFO");
-        }
-        if(!node->cluster.enabled) {
-          node_discover_master(node, rcp);
-        }
-      }
-      else {
-        return node_connector_fail(node, "can't tell if node is master or slave");
-      }
-      node->state++;
-      /* fall through */
-    case REDIS_NODE_PUBSUB_GET_INFO:
-      if(!node->ctx.pubsub) {
-        return node_connector_fail(node, "cmd connection missing, can't send INFO SERVER command");
-      }
-      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "INFO SERVER");
-      node->state++;
-      break;
-    case REDIS_NODE_PUBSUB_GETTING_INFO:
-      if(reply && reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")) {
-        return node_connector_fail(node, "authentication required");
-      }
-      else if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
-        return node_connector_fail(node, "INFO command failed");
-      }
-      else {
-        u_char    idbuf[MAX_RUN_ID_LENGTH];
-        ngx_str_t pubsub_run_id = {0, idbuf};
-        node_parseinfo_set_preallocd_str(node, &pubsub_run_id, reply->str, "run_id:", MAX_RUN_ID_LENGTH);
-        if(!nchan_ngx_str_match(&node->run_id, &pubsub_run_id)) {
-          return node_connector_fail(node, "IP address connects to more than one server. Is Redis behind a proxy?");
-        }
-        node->state++;
-      }
-      /* fall through */
-    case REDIS_NODE_SUBSCRIBE_WORKER:
-      if(!node->ctx.pubsub) {
-        return node_connector_fail(node, "pubsub connection missing, can't send worker SUBSCRIBE command");
-      }
-      redisAsyncCommand(node->ctx.pubsub, node_subscribe_callback, node, "SUBSCRIBE %s", redis_worker_id);
-      node->state++;
-      break;
-    
-    case REDIS_NODE_SUBSCRIBING_WORKER:  
-      if(!reply) {
-        return node_connector_fail(node, "disconnected while subscribing to worker PUBSUB channel");
-      }
-      if( reply->type != REDIS_REPLY_ARRAY || reply->elements != 3 
-       || reply->element[0]->type != REDIS_REPLY_STRING || reply->element[1]->type != REDIS_REPLY_STRING
-       || strcmp(reply->element[0]->str, "subscribe") != 0
-       || strcmp(reply->element[1]->str, redis_worker_id) != 0
-      ) {
-        return node_connector_fail(node, "failed to subscribe to worker PUBSUB channel");
-      }
-      nchan_update_stub_status(redis_connected_servers, 1);
-      
-      node->state++;
-      /* fall through */
-    case REDIS_NODE_GET_CLUSTERINFO:
-      if(!node->cluster.enabled) {
-        node->state = REDIS_NODE_READY;
-        return node_connector_callback(NULL, NULL, node);
-      }
-      else {
-        if(!node->ctx.cmd) {
-          return node_connector_fail(node, "cmd connection missing, can't send CLUSTER INFO command");
-        }
-        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "CLUSTER INFO");
-        node->state++;
-      }
-      break;
-    
-    case REDIS_NODE_GETTING_CLUSTERINFO:
-      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
-        return node_connector_fail(node, "CLUSTER INFO command failed");
-      }
-      if(!nchan_cstr_match_line(reply->str, "cluster_state:ok")) {
-        node->cluster.ok=0;
-        return node_connector_fail(node, "cluster_state not ok");
-      }
-      
-      if(!nchan_get_rest_of_line_in_cstr(reply->str, "cluster_current_epoch:", &rest)) {
-        return node_connector_fail(node, "CLUSTER INFO command failed to get current epoch");
-      }
-      if((node->cluster.current_epoch = ngx_atoi(rest.data, rest.len)) == NGX_ERROR) {
-        return node_connector_fail(node, "CLUSTER INFO command failed to parse current epoch number");
-      }
-      
-      node->cluster.ok=1;
-      node->state++;
-      /* fall through */
-    case REDIS_NODE_GET_CLUSTER_NODES:
-      if(!node->ctx.cmd) {
-        return node_connector_fail(node, "cmd connection missing, can't send CLUSTER NODES command");
-      }
-      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "CLUSTER NODES");
-      node->state++;
-      break;
-    
-    case REDIS_NODE_GETTING_CLUSTER_NODES:
-      if(!reply_str_ok(reply)) {
-        return node_connector_fail(node, "CLUSTER NODES command failed");
-      }
-      else {
-        size_t                  i, n;
-        cluster_nodes_line_t   *l;
-        if(!(l = parse_cluster_nodes(node, reply->str, &n))) {
-          return node_connector_fail(node, "parsing CLUSTER NODES command failed");
-        }
-        for(i=0; i<n; i++) {
-          if(l[i].self) {
-            nchan_strcpy(&node->cluster.id, &l[i].id, MAX_CLUSTER_ID_LENGTH);
-            if(l[i].slot_ranges_count == 0 && l[i].master) {
-              node_log_notice(node, "is a master cluster node with no keyslots");
-            }
-            else {
-              redis_node_t       *conflict_node;
-              node->cluster.slot_range.n = l[i].slot_ranges_count;
-              size_t                 j;
-              if(node->cluster.slot_range.range) {
-                ngx_free(node->cluster.slot_range.range);
-              }
-              node->cluster.slot_range.range = ngx_alloc(sizeof(redis_slot_range_t) * node->cluster.slot_range.n, ngx_cycle->log);
-              if(!node->cluster.slot_range.range) {
-                return node_connector_fail(node, "failed allocating cluster slots range");
-              }
-              if(!parse_cluster_node_slots(&l[i], node->cluster.slot_range.range)) {
-                return node_connector_fail(node, "failed parsing cluster slots range");
-              }
-              for(j = 0; j<node->cluster.slot_range.n; j++) {
-                if((conflict_node = nodeset_node_find_by_range(nodeset, &node->cluster.slot_range.range[j]))!=NULL) {
-                  u_char buf[1024];
-                  ngx_snprintf(buf, 1024, "keyslot range conflict with node %s. These nodes are probably from different clusters.%Z", node_cstr(conflict_node));
-                  return node_connector_fail(node, (char *)buf);
-                }
-              }
-              
-              if(!nodeset_cluster_node_index_keyslot_ranges(node)) {
-                return node_connector_fail(node, "indexing keyslot ranges failed");
-              }
-            }
-          }
-          else if(!node_skip_cluster_peer(node, &l[i])) {
-            node_discover_cluster_peer(node, &l[i]);
-          }
-        }
-      }
-      node->state = REDIS_NODE_READY;
-      //intentional fall-through is affirmatively consensual
-      //yes, i consent to being fallen through.
-      //                               Signed, 
-      //                                 REDIS_NODE_GETTING_CLUSTER_NODES
-      //NOTE: consent required each time a fallthrough is imposed
-      /* fall through */
-    case REDIS_NODE_READY:
-      if(node->connect_timeout) {
-        nchan_abort_oneshot_timer(node->connect_timeout);
-        node->connect_timeout = NULL;
-      }
-      if(!node->ping_timer.timer_set && nodeset->settings.ping_interval > 0) {
-        ngx_add_timer(&node->ping_timer, nodeset->settings.ping_interval * 1000);
-      }
-      if(node->cluster.enabled) {
-        if(!node->cluster.check_timer.timer_set && nodeset->settings.cluster_check_interval > 0) {
-          ngx_add_timer(&node->cluster.check_timer, nodeset->settings.cluster_check_interval * 1000);
-        }
-        node->cluster.last_successful_check = ngx_time();
-      }
-      node_log_notice(node, "%s", node->generation == 0 ? "connected" : "reconnected");
-      node->generation++;
-      nodeset_examine(nodeset);
-      break;
-  }
-}
-
-static int nodeset_cluster_keyslot_space_complete(redis_nodeset_t *ns) {
-  ngx_rbtree_node_t                  *node;
-  redis_slot_range_t                  range = {0, 0};
-  redis_nodeset_slot_range_node_t    *rangenode;
-  
-  while(range.min <= 16383) {
-    if((node = rbtree_find_node(&ns->cluster.keyslots, &range)) == NULL) {
-      DBG("cluster slots range incomplete: can't find slot %i", range.min);
-      return 0;
-    }
-    rangenode = rbtree_data_from_node(node);
-    
-    if(rangenode->node->state < REDIS_NODE_READY) {
-      node_log_notice(rangenode->node, "cluster node for range %d - %d not connected", rangenode->range.min, rangenode->range.max);
-      return 0;
-    }
-    if(rangenode->node->role != REDIS_NODE_ROLE_MASTER) {
-      node_log_notice(rangenode->node, "cluster node for range %d - %d is not a master. That's weird.", rangenode->range.min, rangenode->range.max);
-      return 0;
-    }
-    
-    range.min = rangenode->range.max + 1;
-    range.max = range.min;
-  }
-  DBG("cluster range complete");
-  //print_cluster_slots(cluster);
-  return 1;
-}
-
-static int nodeset_status_timer_interval(redis_nodeset_status_t status) {
-  switch(status) {
-    case REDIS_NODESET_FAILED:
-    case REDIS_NODESET_INVALID:
-    case REDIS_NODESET_DISCONNECTED:
-      return 2000;
-    case REDIS_NODESET_FAILING:
-    case REDIS_NODESET_CLUSTER_FAILING:
-      return 300;
-    case REDIS_NODESET_CONNECTING:
-      return 1000;
-    case REDIS_NODESET_READY:
-      return 10000;
-  }
-  return 500; //default?
-}
-
-void nodeset_onready_expire_event(ngx_event_t *ev) {
-  nodeset_onready_callback_t *rcb = ev->data;
-  rcb->cb(rcb->ns, rcb->pd);
-  nchan_list_remove(&rcb->ns->onready_callbacks, rcb);
-}
-
-ngx_int_t nodeset_callback_on_ready(redis_nodeset_t *ns, ngx_msec_t max_wait, ngx_int_t (*cb)(redis_nodeset_t *, void *), void *pd) {
-  nodeset_onready_callback_t *ncb;
-  
-  if(ns->status == REDIS_NODESET_READY) {
-    cb(ns, pd);
-    return NGX_OK;
-  }
-  
-  ncb = nchan_list_append(&ns->onready_callbacks);
-  if(ncb == NULL) {
-    ERR("failed to add to onready_callback list");
-    return NGX_ERROR;
-  }
-  
-  ncb->cb = cb;
-  ncb->pd = pd;
-  ncb->ns = ns;
-  ngx_memzero(&ncb->ev, sizeof(ncb->ev));
-  if(max_wait > 0) {
-    nchan_init_timer(&ncb->ev, nodeset_onready_expire_event, ncb);
-    ngx_add_timer(&ncb->ev, max_wait);
-  }
-  
-  return NGX_OK;
-}
-
-ngx_int_t nodeset_run_on_ready_callbacks(redis_nodeset_t *ns) {
-  nodeset_onready_callback_t *rcb;
-  for(rcb = nchan_list_first(&ns->onready_callbacks); rcb != NULL; rcb = nchan_list_next(rcb)) {
-    if(rcb->ev.timer_set) {
-      ngx_del_timer(&rcb->ev);
-    }
-    rcb->cb(ns, rcb->pd);
-  }
-  nchan_list_empty(&ns->onready_callbacks);
-  return NGX_OK;
-}
-
-ngx_int_t nodeset_abort_on_ready_callbacks(redis_nodeset_t *ns) {
-  nodeset_onready_callback_t *rcb;
-  for(rcb = nchan_list_first(&ns->onready_callbacks); rcb != NULL; rcb = nchan_list_next(rcb)) {
-    if(rcb->ev.timer_set) {
-      ngx_del_timer(&rcb->ev);
-    }
-    rcb->cb(ns, rcb->pd);
-  }
-  nchan_list_empty(&ns->onready_callbacks);
-  return NGX_OK;
-}
-
-static ngx_int_t update_chanhead_status_on_reconnect(rdstore_channel_head_t *ch) {
-  if(ch->redis.node.cmd && ch->redis.node.pubsub && ch->pubsub_status == REDIS_PUBSUB_SUBSCRIBED && ch->status == NOTREADY) {
-    ch->status = READY;
-  }
-  return NGX_OK;
-}
-
-ngx_int_t nodeset_reconnect_disconnected_channels(redis_nodeset_t *ns) {
-  rdstore_channel_head_t *cur;
-  nchan_slist_t *disconnected_cmd = &ns->channels.disconnected_cmd;
-  nchan_slist_t *disconnected_pubsub = &ns->channels.disconnected_pubsub;
-  assert(nodeset_ready(ns));
-
-  while((cur = nchan_slist_pop(disconnected_cmd)) != NULL) {
-    assert(cur->redis.node.cmd == NULL);
-    cur->redis.slist.in_disconnected_cmd_list = 0;
-    assert(nodeset_node_find_by_chanhead(cur)); // this reuses the linked-list fields
-    update_chanhead_status_on_reconnect(cur);
-  }
-  
-  while((cur = nchan_slist_pop(disconnected_pubsub)) != NULL) {
-    assert(cur->redis.node.pubsub == NULL);
-    cur->redis.slist.in_disconnected_pubsub_list = 0;
-    assert(nodeset_node_pubsub_find_by_chanhead(cur)); // this reuses the linked-list fields
-    redis_chanhead_catch_up_after_reconnect(cur);
-    ensure_chanhead_pubsub_subscribed_if_needed(cur);
-    update_chanhead_status_on_reconnect(cur);
-  }
-  
-  return NGX_OK;
-}
-
-static char* nodeset_name_cstr(redis_nodeset_t *nodeset, char *buf, size_t maxlen) {
-  const char *what = NULL;
-  ngx_str_t  *name = NULL;
-  if(nodeset->upstream) {
-    what = "upstream";
-    name = &nodeset->upstream->host;
-  }
-  else {
-    ngx_str_t **url = nchan_list_first(&nodeset->urls);
-    if(url && *url) {
-      name = *url;
-    }
-    what = "host";
-  }
-  
-  if(what && name) {
-    ngx_snprintf((u_char *)buf, maxlen, "%s %V%Z", what, name);
-  }
-  else if(what) {
-    ngx_snprintf((u_char *)buf, maxlen, "%s%Z", what);
-  }
-  else if(name) {
-    ngx_snprintf((u_char *)buf, maxlen, "%V%Z", name);
-  }
-  else {
-    ngx_snprintf((u_char *)buf, maxlen, "node set%Z");
-  }
-  return buf;
-}
-
-const char *__node_nickname_cstr(redis_node_t *node) {
-  static char buf[512];
-  if(node) {
-    __node_cstr(node, buf);
-    return buf;
-  }
-  else {
-    return "???";
-  }
-}
-
-ngx_int_t nodeset_set_status(redis_nodeset_t *nodeset, redis_nodeset_status_t status, const char *msg) {
-  nodeset->status_msg = msg;
-  if(nodeset->status != status) {
-    if(msg) {
-      ngx_uint_t  lvl;
-      if(status == REDIS_NODESET_INVALID) {
-        lvl = NGX_LOG_ERR;
-      }
-      else if(status == REDIS_NODESET_DISCONNECTED
-        ||    status == REDIS_NODESET_CLUSTER_FAILING
-        ||    status == REDIS_NODESET_FAILED
-      ) {
-        lvl = NGX_LOG_WARN;
-      }
-      else {
-        lvl = NGX_LOG_NOTICE;
-      }
-      nodeset_log(nodeset, lvl, "%s", msg);
-    }
-    nodeset->current_status_start = ngx_time();
-    nodeset->current_status_times_checked = 0;
-    nodeset->status = status;
-    
-    if(nodeset->status_check_ev.timer_set) {
-      ngx_del_timer(&nodeset->status_check_ev);
-    }
-    
-    switch(status) {
-      case REDIS_NODESET_FAILED:
-      case REDIS_NODESET_DISCONNECTED:
-      case REDIS_NODESET_INVALID:
-        nodeset_disconnect(nodeset);
-        break;
-      case REDIS_NODESET_CLUSTER_FAILING:
-        
-        //very intentional fallthrough
-      case REDIS_NODESET_FAILING:
-        nodeset_connect(nodeset);
-        break;
-      case REDIS_NODESET_CONNECTING:
-        //no special actions
-        break;
-      case REDIS_NODESET_READY:
-        nodeset_reconnect_disconnected_channels(nodeset);
-        nodeset_run_on_ready_callbacks(nodeset);
-        break;
-    }
-  }
-  
-  if(!nodeset->status_check_ev.timer_set) {
-    ngx_add_timer(&nodeset->status_check_ev, nodeset_status_timer_interval(status));
-  }
-  return NGX_OK;
-}
-
-static void node_find_slaves_callback(redisAsyncContext *ac, void *rep, void *pd) {
-  redis_node_t   *node = pd;
-  redisReply     *reply = rep;
-  if(!reply) {
-    node_log_debug(node, "INFO REPLICATION aborted reply");
-    return;
-  }
-  node_discover_slaves_from_info_reply(node, reply);
-}
-
-ngx_int_t nodeset_examine(redis_nodeset_t *nodeset) {
-  redis_node_t *cur, *next;
-  int cluster = 0, masters = 0, slaves = 0, total = 0, connecting = 0, ready = 0, disconnected = 0;
-  int discovered = 0, failed_masters=0, failed_slaves = 0, failed_unknowns = 0;
-  int ready_cluster = 0, ready_non_cluster = 0, connecting_masters = 0;
-  redis_nodeset_status_t current_status = nodeset->status;
-  //ERR("check nodeset %p", nodeset);
-  
-  for(cur = nchan_list_first(&nodeset->nodes); cur != NULL; cur = next) {
-    next = nchan_list_next(cur);
-    total++;
-    if(cur->cluster.enabled == 1) {
-      cluster++;
-    }
-    if(cur->discovered)
-      discovered++;
-    if(cur->role == REDIS_NODE_ROLE_MASTER) {
-      masters++;
-      if(cur->state > REDIS_NODE_DISCONNECTED && cur->state < REDIS_NODE_READY) {
-        connecting_masters++;
-      }
-    }
-    if(cur->role == REDIS_NODE_ROLE_SLAVE)
-      slaves++;
-    if(cur->state <= REDIS_NODE_DISCONNECTED)
-      disconnected++;
-    if(cur->state > REDIS_NODE_DISCONNECTED && cur->state < REDIS_NODE_READY)
-      connecting++;
-    if(cur->state == REDIS_NODE_READY) {
-      ready++;
-      if(cur->cluster.enabled == 1)
-        ready_cluster++;
-      else
-        ready_non_cluster++;
-    }
-    if(cur->state == REDIS_NODE_FAILED) {
-      if(cur->role == REDIS_NODE_ROLE_MASTER) {
-        failed_masters++;
-      }
-      else if(cur->role == REDIS_NODE_ROLE_SLAVE) {
-        failed_slaves++;
-        if(cur->peers.master && cur->peers.master->state >= REDIS_NODE_READY && cur->nodeset->status == REDIS_NODESET_READY) {
-          //rediscover slaves
-          redisAsyncCommand(cur->peers.master->ctx.cmd, node_find_slaves_callback, cur->peers.master, "INFO REPLICATION");
-        }
-        //remove failed slave
-        node_log_notice(cur, "removed failed slave node");
-        node_disconnect(cur, REDIS_NODE_FAILED);
-        nodeset_node_destroy(cur);
-        total--;
-      }
-      else {
-        failed_unknowns++;
-      }
-    }
-  }
-  
-  nodeset->cluster.enabled = cluster > 0;
-  
-  if(current_status == REDIS_NODESET_CONNECTING && connecting > 0) {
-    //still connecting, with a few nodws yet to try to connect
-    return NGX_OK;
-  }
-  if(ready == 0 && total == 0) {
-    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "no reachable servers");
-  }
-  else if(cluster == 0 && masters > 1) {
-    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "invalid config, more than one master in non-cluster");
-  }
-  else if(ready_cluster > 0 && ready_non_cluster > 0) {
-    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "invalid config, cluster and non-cluster servers present");
-  }
-  else if(connecting > 0) {
-    nodeset_set_status(nodeset, REDIS_NODESET_CONNECTING, NULL);
-  }
-  else if(failed_masters > 0) {
-    if(current_status == REDIS_NODESET_READY) {
-      nodeset_set_status(nodeset, REDIS_NODESET_FAILING, NULL);
-    }
-    else {
-      nodeset_set_status(nodeset, REDIS_NODESET_FAILED, NULL);
-    }
-  }
-  else if (masters == 0) {
-    //this prevents slave-of-slave-of-master lookups
-    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "no reachable masters");
-  }
-  else if(cluster > 0 && !nodeset_cluster_keyslot_space_complete(nodeset)) {
-      nodeset_set_status(nodeset, REDIS_NODESET_CONNECTING, "keyslot space incomplete");
-  }
-  else if(current_status == REDIS_NODESET_READY && (ready == 0 || ready < total)) {
-    nodeset_set_status(nodeset, REDIS_NODESET_FAILING, NULL);
-  }
-  else if(ready == 0) {
-    nodeset_set_status(nodeset, REDIS_NODESET_DISCONNECTED, "no connected servers");
-  }
-  else {
-    nodeset_set_status(nodeset, REDIS_NODESET_READY, "ready");
-  } 
-  
-  return NGX_OK;
-}
-
-static void nodeset_check_status_event(ngx_event_t *ev) {
-  redis_nodeset_t *ns = ev->data;
-  
-  if(!ev->timedout) {
-    return;
-  }
-  DBG("nodeset %p status check event", ns);
-  ev->timedout = 0;
-  
-  switch(ns->status) {
-    case REDIS_NODESET_FAILED:
-      //fall-through rather intentionally
-      if(ngx_time() - ns->current_status_start > REDIS_NODESET_RECONNECT_WAIT_TIME_SEC) {
-        nodeset_log_notice(ns, "reconnecting...");
-        nodeset_connect(ns);
-      }
-      break;
-    case REDIS_NODESET_INVALID:
-    case REDIS_NODESET_DISCONNECTED:
-      //connect whatever needs to be connected
-      nodeset_connect(ns);
-      break;
-    
-    case REDIS_NODESET_CONNECTING:
-      //wait it out
-      if(ngx_time() - ns->current_status_start > REDIS_NODESET_MAX_CONNECTING_TIME_SEC) {
-        nodeset_set_status(ns, REDIS_NODESET_DISCONNECTED, "Redis node set took too long to connect");
-      }
-      else {
-        nodeset_examine(ns); // full status check
-      }
-      break;
-    case REDIS_NODESET_CLUSTER_FAILING:
-    case REDIS_NODESET_FAILING:
-      if(ngx_time() - ns->current_status_start > REDIS_NODESET_MAX_FAILING_TIME_SEC) {
-        nodeset_set_status(ns, REDIS_NODESET_FAILED, "Redis node set has failed");
-      }
-      break;
-    
-    case REDIS_NODESET_READY:
-      nodeset_reconnect_disconnected_channels(ns); //in case there are any waiting around
-      nodeset_run_on_ready_callbacks(ns); //in case there are any that got left behind
-      break;
-  }
-  
-  //check again soon!
-  if(!ev->timer_set) {
-    ngx_add_timer(ev, nodeset_status_timer_interval(ns->status));
-  }
-}
-
-int nodeset_connect(redis_nodeset_t *ns) {
-  redis_node_t             *node;
-  ngx_str_t               **url;
-  redis_connect_params_t    rcp;
-  
-  for(url = nchan_list_first(&ns->urls); url != NULL; url = nchan_list_next(url)) {
-    parse_redis_url(*url, &rcp);
-    if((node = nodeset_node_find_by_connect_params(ns, &rcp)) == NULL) {
-      node = nodeset_node_create(ns, &rcp);
-      node_log_debug(node, "created");
-    }
-    assert(node);
-  }
-  for(node = nchan_list_first(&ns->nodes); node != NULL; node = nchan_list_next(node)) {
-    if(node->state <= REDIS_NODE_DISCONNECTED) {
-      node_log_debug(node, "start connecting");
-      node_connect(node);
-    }
-  }
-  nodeset_set_status(ns, REDIS_NODESET_CONNECTING, NULL);
-  return 1;
-}
-
-int nodeset_disconnect(redis_nodeset_t *ns) {
-  redis_node_t *node;
-  for(node = nchan_list_first(&ns->nodes); node != NULL; node = nchan_list_first(&ns->nodes)) {
-    node_log_debug(node, "destroy %p", node);
-    if(node->state > REDIS_NODE_DISCONNECTED) {
-      node_log_debug(node, "intiating disconnect");
-      node_disconnect(node, REDIS_NODE_DISCONNECTED);
-    }
-    nodeset_node_destroy(node);
-  }
-  
-  return 1;
-}
-
-
-ngx_int_t nodeset_connect_all(void) {
-  int                      i;
-  redis_nodeset_t         *ns;
-  DBG("connect all");
-  for(i=0; i<redis_nodeset_count; i++) {
-    ns = &redis_nodeset[i];
-    nodeset_connect(ns);
-  }
-  return NGX_OK;
-}
-
-ngx_int_t nodeset_destroy_all(void) {
-  int                      i;
-  redis_nodeset_t         *ns;
-  DBG("nodeset destroy all");
-  for(i=0; i<redis_nodeset_count; i++) {
-    ns = &redis_nodeset[i];
-    nodeset_disconnect(ns);
-    if(ns->name && ns->name != nchan_redis_blankname) {
-      ngx_free(ns->name);
-    }
-#if (NGX_OPENSSL)
-    if(ns->ssl_context) {
-      SSL_CTX_free(ns->ssl_context);
-      ns->ssl_context = NULL;
-    }
-#endif
-    nchan_list_empty(&ns->urls);
-  }
-  redis_nodeset_count = 0;
-  return NGX_OK;
-}
-
-ngx_int_t nodeset_each(void (*cb)(redis_nodeset_t *, void *), void *privdata) {
-  int                      i;
-  redis_nodeset_t         *ns;
-  for(i=0; i<redis_nodeset_count; i++) {
-    ns = &redis_nodeset[i];
-    cb(ns, privdata);
-  }
-  return NGX_OK;
-}
-ngx_int_t nodeset_each_node(redis_nodeset_t *ns, void (*cb)(redis_node_t *, void *), void *privdata) {
-  redis_node_t             *node, *next;
-  for(node = nchan_list_first(&ns->nodes); node != NULL; node = next) {
-    next = nchan_list_next(node);
-    cb(node, privdata);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t set_preallocated_peername(redisAsyncContext *ctx, ngx_str_t *dst) {
-  char                  *ipstr = (char *)dst->data;
-  struct sockaddr_in    *s4;
-  struct sockaddr_in6   *s6;
-  // deal with both IPv4 and IPv6:
-  switch(ctx->c.sockaddr.sa_family) {
-    case AF_INET:
-      s4 = (struct sockaddr_in *)&ctx->c.sockaddr;
-      inet_ntop(AF_INET, &s4->sin_addr, ipstr, INET6_ADDRSTRLEN);
-      break;
-#ifdef AF_INET6
-    case AF_INET6:
-      s6 = (struct sockaddr_in6 *)&ctx->c.sockaddr;
-      inet_ntop(AF_INET6, &s6->sin6_addr, ipstr, INET6_ADDRSTRLEN);
-      break;
-#endif
-    case AF_UNSPEC:
-    default:
-      DBG("couldn't get sockaddr");
-      return NGX_ERROR;
-  }
-  dst->len = strlen(ipstr);
-  return NGX_OK;
-}
-
-
-//sneaky channel stuff
-ngx_int_t nodeset_associate_chanhead(redis_nodeset_t *ns, void *chan) {
-  rdstore_channel_head_t *ch = chan;
-  if(ch->redis.nodeset && ch->redis.nodeset != ns) {
-    nodeset_dissociate_chanhead(ch);
-  }
-  ngx_memzero(&ch->redis.slist, sizeof(ch->redis.slist));
-  ch->redis.nodeset = ns;
-  nchan_slist_append(&ns->channels.all, ch);
-  return NGX_OK;
-}
-ngx_int_t nodeset_dissociate_chanhead(void *chan) {
-  rdstore_channel_head_t *ch = chan;
-  redis_nodeset_t *ns = ch->redis.nodeset;
-  
-  if(ns) {
-    if(ch->redis.node.cmd) {
-      assert(!ch->redis.slist.in_disconnected_cmd_list);
-      nodeset_node_dissociate_chanhead(ch);
-    }
-    else if(ch->redis.slist.in_disconnected_cmd_list) {
-      ch->redis.slist.in_disconnected_cmd_list = 0;
-      nchan_slist_remove(&ns->channels.disconnected_cmd, ch);
-    }
-    
-    if(ch->redis.node.pubsub) {
-      assert(!ch->redis.slist.in_disconnected_pubsub_list);
-      nodeset_node_dissociate_pubsub_chanhead(ch);
-    }
-    else if(ch->redis.slist.in_disconnected_pubsub_list) {
-      ch->redis.slist.in_disconnected_pubsub_list = 0;
-      nchan_slist_remove(&ns->channels.disconnected_pubsub, ch);
-    }
-    
-    ch->redis.nodeset = NULL;
-    nchan_slist_remove(&ns->channels.all, ch);
-  }
-  return NGX_OK;
-}
-ngx_int_t nodeset_node_associate_chanhead(redis_node_t *node, void *chan) {
-  rdstore_channel_head_t *ch = chan;
-  assert(ch->redis.node.cmd == NULL);
-  assert(node->nodeset == ch->redis.nodeset);
-  assert(ch->redis.slist.in_disconnected_cmd_list == 0);
-  if(ch->redis.node.cmd != node) { //dat idempotence tho
-    nchan_slist_append(&node->channels.cmd, ch);
-  }
-  ch->redis.node.cmd = node;
-  return NGX_OK;
-}
-ngx_int_t nodeset_node_associate_pubsub_chanhead(redis_node_t *node, void *chan) {
-  rdstore_channel_head_t *ch = chan;
-  assert(ch->redis.node.pubsub == NULL);
-  assert(node->nodeset == ch->redis.nodeset);
-  assert(ch->redis.slist.in_disconnected_pubsub_list == 0);
-  if(ch->redis.node.pubsub != node) { //dat idempotence tho
-    nchan_slist_append(&node->channels.pubsub, ch);
-  }
-  ch->redis.node.pubsub = node;
-  return NGX_OK;
-}
-ngx_int_t nodeset_node_dissociate_chanhead(void *chan) {
-  rdstore_channel_head_t *ch = chan;
-  if(ch->redis.node.cmd) {
-    nchan_slist_remove(&ch->redis.node.cmd->channels.cmd, ch);
-  }
-  ch->redis.node.cmd = NULL;
-  return NGX_OK;
-}
-ngx_int_t nodeset_node_dissociate_pubsub_chanhead(void *chan) {
-  rdstore_channel_head_t *ch = chan;
-  if(ch->redis.node.pubsub) {
-    nchan_slist_remove(&ch->redis.node.pubsub->channels.pubsub, ch);
-  }
-  ch->redis.node.pubsub = NULL; 
-  return NGX_OK;
-}
-
-static redis_node_t *nodeset_node_random_master_or_slave(redis_node_t *master) {
-  redis_nodeset_t *ns = master->nodeset;
-  int master_total = ns->settings.node_weight.master;
-  int slave_total = master->peers.slaves.n * ns->settings.node_weight.slave;
-  int n;
-  
-  assert(master->role == REDIS_NODE_ROLE_MASTER);
-  
-  if(master_total + slave_total == 0) {
-    return master;
-  }
-  
-  n = ngx_random() % (slave_total + master_total);
-  if(n < master_total) {
-    return master;
-  }
-  else {
-    int           i = 0;
-    n = ngx_random() % master->peers.slaves.n; //random slave
-    redis_node_t **nodeptr;
-    for(nodeptr = nchan_list_first(&master->peers.slaves); nodeptr != NULL && i < n; nodeptr = nchan_list_next(nodeptr)) {
-      i++;
-    }
-    if(nodeptr == NULL || (*nodeptr)->state < REDIS_NODE_READY) {
-      //not ready? play it safe.
-      //node_log_error(*nodeptr, "got slave, but it's not ready. return master instead");
-      return master;
-    }
-    else {
-      //node_log_error(*nodeptr, "got slave");
-      return *nodeptr;
-    }
-  }
-}
-
-redis_node_t *nodeset_node_find_by_chanhead(void *chan) {
-  rdstore_channel_head_t *ch = chan;
-  redis_node_t           *node;
-  if(ch->redis.node.cmd) {
-    return ch->redis.node.cmd;
-  }
-  node = nodeset_node_find_by_channel_id(ch->redis.nodeset, &ch->id);
-  nodeset_node_associate_chanhead(node, ch);
-  return node;
-}
-redis_node_t *nodeset_node_pubsub_find_by_chanhead(void *chan) {
-  rdstore_channel_head_t *ch = chan;
-  redis_node_t           *node;
-  if(ch->redis.node.pubsub) {
-    return ch->redis.node.pubsub;
-  }
-  node = nodeset_node_find_by_channel_id(ch->redis.nodeset, &ch->id);
-  node = nodeset_node_random_master_or_slave(node);
-  nodeset_node_associate_pubsub_chanhead(node, ch);
-  return ch->redis.node.pubsub;
-}
-
-/*
- * Copyright 2001-2010 Georges Menie (www.menie.org)
- * Copyright 2010 Salvatore Sanfilippo (adapted to Redis coding style)
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the University of California, Berkeley nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* CRC16 implementation according to CCITT standards.
- *
- * Note by @antirez: this is actually the XMODEM CRC 16 algorithm, using the
- * following parameters:
- *
- * Name                       : "XMODEM", also known as "ZMODEM", "CRC-16/ACORN"
- * Width                      : 16 bit
- * Poly                       : 1021 (That is actually x^16 + x^12 + x^5 + 1)
- * Initialization             : 0000
- * Reflect Input byte         : False
- * Reflect Output CRC         : False
- * Xor constant to output CRC : 0000
- * Output for "123456789"     : 31C3
- */
-
-static const uint16_t crc16tab[256]= {
-    0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
-    0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
-    0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
-    0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
-    0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
-    0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
-    0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
-    0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
-    0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
-    0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
-    0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
-    0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
-    0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
-    0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
-    0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
-    0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
-    0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
-    0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
-    0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
-    0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
-    0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
-    0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
-    0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
-    0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
-    0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
-    0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
-    0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
-    0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
-    0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
-    0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
-    0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
-    0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0
-};
-
-uint16_t redis_crc16(uint16_t crc, const char *buf, int len) {
-    int counter;
-    for (counter = 0; counter < len; counter++)
-            crc = (crc<<8) ^ crc16tab[((crc>>8) ^ *buf++)&0x00FF];
-    return crc;
-}
-
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset.h b/debian/modules/nchan/src/store/redis/redis_nodeset.h
deleted file mode 100644
index 1f93b06..0000000
--- a/debian/modules/nchan/src/store/redis/redis_nodeset.h
+++ /dev/null
@@ -1,305 +0,0 @@
-#ifndef NCHAN_REDIS_NODESET_H
-#define NCHAN_REDIS_NODESET_H
-
-#include <nchan_module.h>
-#if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
-#include <hiredis/hiredis.h>
-#include <hiredis/async.h>
-#if (NGX_OPENSSL)
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <hiredis/hiredis_ssl.h>
-#endif
-#else
-#include <store/redis/hiredis/hiredis.h>
-#include <store/redis/hiredis/async.h>
-#if (NGX_OPENSSL)
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <store/redis/hiredis/hiredis_ssl.h>
-#endif
-#endif
-#include <util/nchan_reaper.h>
-#include <util/nchan_rbtree.h>
-#include <util/nchan_list.h>
-#include <util/nchan_slist.h>
-
-//#include "store-private.h"
-
-//#define REDIS_NODESET_DBG 1
-
-#define node_log(node, lvl, fmt, args...) \
-  ngx_log_error(lvl, ngx_cycle->log, 0, "nchan: Redis node %s " fmt, __node_nickname_cstr(node), ##args)
-#define node_log_error(node, fmt, args...)    node_log((node), NGX_LOG_ERR, fmt, ##args)
-#define node_log_warning(node, fmt, args...)  node_log((node), NGX_LOG_WARN, fmt, ##args)
-#define node_log_notice(node, fmt, args...)   node_log((node), NGX_LOG_NOTICE, fmt, ##args)
-#define node_log_info(node, fmt, args...)     node_log((node), NGX_LOG_INFO, fmt, ##args)
-#define node_log_debug(node, fmt, args...)    node_log((node), NGX_LOG_DEBUG, fmt, ##args)
-  
-#define nodeset_log(nodeset, lvl, fmt, args...) \
-  ngx_log_error(lvl, ngx_cycle->log, 0, "nchan: Redis %s: " fmt, (nodeset)->name, ##args)
-#define nodeset_log_error(nodeset, fmt, args...)    nodeset_log((nodeset), NGX_LOG_ERR, fmt, ##args)
-#define nodeset_log_warning(nodeset, fmt, args...)  nodeset_log((nodeset), NGX_LOG_WARN, fmt, ##args)
-#define nodeset_log_notice(nodeset, fmt, args...)   nodeset_log((nodeset), NGX_LOG_NOTICE, fmt, ##args)
-#define nodeset_log_info(nodeset, fmt, args...)     nodeset_log((nodeset), NGX_LOG_INFO, fmt, ##args)
-#define nodeset_log_debug(nodeset, fmt, args...)    nodeset_log((nodeset), NGX_LOG_DEBUG, fmt, ##args)
-
-#define NCHAN_MAX_NODESETS 128
-#define REDIS_NODESET_STATUS_CHECK_TIME_MSEC 4000
-#define REDIS_NODESET_MAX_CONNECTING_TIME_SEC 5
-#define REDIS_NODESET_RECONNECT_WAIT_TIME_SEC 5
-#define REDIS_NODESET_MAX_FAILING_TIME_SEC 2
-
-#define REDIS_NODE_DEDUPLICATED         -100
-#define REDIS_NODE_CONNECTION_TIMED_OUT   -2
-#define REDIS_NODE_FAILED                 -1
-#define REDIS_NODE_DISCONNECTED            0
-#define REDIS_NODE_CMD_CONNECTING          1
-#define REDIS_NODE_PUBSUB_CONNECTING       2
-#define REDIS_NODE_CMD_CHECKING_CONNECTION 3
-#define REDIS_NODE_CMD_CHECKED_CONNECTION  4
-#define REDIS_NODE_PUBSUB_CHECKING_CONNECTION 5
-#define REDIS_NODE_PUBSUB_CHECKED_CONNECTION 6
-#define REDIS_NODE_CONNECTED               7
-#define REDIS_NODE_CMD_AUTHENTICATING      8
-#define REDIS_NODE_PUBSUB_AUTHENTICATING   9
-#define REDIS_NODE_SELECT_DB              10
-#define REDIS_NODE_CMD_SELECTING_DB       11
-#define REDIS_NODE_PUBSUB_SELECTING_DB    12
-#define REDIS_NODE_SCRIPTS_LOAD           13
-#define REDIS_NODE_SCRIPTS_LOADING        14
-#define REDIS_NODE_GET_INFO               15
-#define REDIS_NODE_GETTING_INFO           16
-#define REDIS_NODE_PUBSUB_GET_INFO        17
-#define REDIS_NODE_PUBSUB_GETTING_INFO    18
-#define REDIS_NODE_SUBSCRIBE_WORKER       19
-#define REDIS_NODE_SUBSCRIBING_WORKER     20
-#define REDIS_NODE_GET_CLUSTERINFO        21
-#define REDIS_NODE_GETTING_CLUSTERINFO    22
-#define REDIS_NODE_GET_CLUSTER_NODES      23
-#define REDIS_NODE_GETTING_CLUSTER_NODES  24
-#define REDIS_NODE_READY                  100
-  
-typedef struct redis_nodeset_s redis_nodeset_t;
-typedef struct redis_node_s redis_node_t;
-
-typedef struct { //redis_nodeset_cluster_t
-  unsigned                    enabled:1;
-  rbtree_seed_t               keyslots; //cluster rbtree seed
-} redis_nodeset_cluster_t;
-
-typedef struct {
-  unsigned         min:16;
-  unsigned         max:16;
-} redis_slot_range_t;
-
-typedef enum {
-  REDIS_NODE_ROLE_UNKNOWN = 0, REDIS_NODE_ROLE_MASTER, REDIS_NODE_ROLE_SLAVE
-} redis_node_role_t;
-
-typedef enum {
-  REDIS_NODESET_FAILED = -4,
-  REDIS_NODESET_CLUSTER_FAILING = -3,
-  REDIS_NODESET_FAILING = -2,
-  REDIS_NODESET_INVALID = -1,
-  REDIS_NODESET_DISCONNECTED = 0,
-  REDIS_NODESET_CONNECTING,
-  REDIS_NODESET_READY
-} redis_nodeset_status_t;
-
-#if REDIS_NODESET_DBG
-typedef struct {
-  int  n;
-  redis_node_t *node[128];
-} redis_node_dbg_list_t;
-typedef struct {
-  redis_slot_range_t range;
-  redis_node_t       *node;
-} redis_node_range_dbg_t;
-typedef struct {
-  int  n;
-  redis_node_range_dbg_t node[128];
-} redis_nodeset_dbg_range_tree_t;
-#endif
-
-
-
-struct redis_nodeset_s {
-  //a set of redis nodes
-  //  maybe just 1 master
-  //  maybe a master and its slaves
-  //  maybe a cluster of masters and their slaves
-  //slaves of slaves not included
-  char                       *name;
-  redis_nodeset_status_t      status;
-  ngx_event_t                 status_check_ev;
-  const char                 *status_msg;
-  time_t                      current_status_start;
-  ngx_int_t                   current_status_times_checked;
-  ngx_int_t                   generation;
-  nchan_list_t                urls;
-  nchan_loc_conf_t           *first_loc_conf;
-  ngx_http_upstream_srv_conf_t *upstream;
-  nchan_list_t                nodes;
-  redis_nodeset_cluster_t     cluster;
-  struct {                    //settings
-    nchan_redis_storage_mode_t  storage_mode;
-    ngx_int_t                   nostore_fastpublish;
-    struct {                    //pubsub_subscribe_weight
-      ngx_int_t                   master;
-      ngx_int_t                   slave;
-    }                           node_weight;
-    time_t                      ping_interval;
-    time_t                      cluster_check_interval;
-    ngx_str_t                  *namespace;
-    nchan_redis_optimize_t      optimize_target;
-    ngx_msec_t                  connect_timeout;
-    struct {
-      int                         count;
-      nchan_redis_ip_range_t     *list;
-    }                           blacklist;
-    nchan_redis_tls_settings_t  tls;
-    ngx_str_t                   username;
-    ngx_str_t                   password;
-  }                           settings;
-  
-  #if (NGX_OPENSSL)
-  SSL_CTX                    *ssl_context;
-  #endif
-  
-  struct {
-    nchan_slist_t               all;
-    nchan_slist_t               disconnected_cmd;
-    nchan_slist_t               disconnected_pubsub;
-  }                           channels;
-  
-  nchan_reaper_t              chanhead_reaper;
-  time_t                      reconnect_delay_sec;
-  nchan_list_t                onready_callbacks;
-#if REDIS_NODESET_DBG
-  struct {
-    redis_node_dbg_list_t       nodes;
-    redis_nodeset_dbg_range_tree_t ranges;
-    int                         keyspace_complete;
-  }                           dbg;
-#endif
-  
-}; //redis_nodeset_t
-
-struct redis_node_s {
-  int8_t                    state;
-  unsigned                  discovered:1;
-  redis_node_role_t         role;
-  redis_connect_params_t    connect_params;
-  void                     *connect_timeout;
-  redis_nodeset_t          *nodeset;
-  ngx_str_t                 run_id;
-  ngx_str_t                 version;
-  int                       scripts_loaded;
-  int                       generation;
-  ngx_event_t               ping_timer;
-  struct {
-    unsigned                  enabled:1;
-    unsigned                  ok:1;
-    ngx_str_t                 id;
-    ngx_event_t               check_timer;
-    time_t                    last_successful_check;
-    int                       current_epoch; //as reported on this node
-    struct {
-      redis_slot_range_t         *range;
-      size_t                      n;
-      unsigned                    indexed:1;
-    }                         slot_range; 
-    char                     *cluster_nodes;
-  }                         cluster;
-  struct {
-    redis_node_t              *master;
-    nchan_list_t               slaves;
-  }                         peers;
-  struct {
-    redisAsyncContext         *cmd;
-    redisAsyncContext         *pubsub;
-    redisContext              *sync;
-  }                         ctx;
-  int                       pending_commands;
-  struct {
-  nchan_slist_t               cmd;
-  nchan_slist_t               pubsub;
-  }                         channels;
-}; //redis_node_t
-
-typedef struct {
-  redis_slot_range_t      range;
-  redis_node_t           *node;
-} redis_nodeset_slot_range_node_t;
-
-
-
-redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf);
-ngx_int_t nodeset_initialize(char *worker_id, redisCallbackFn *subscribe_handler);
-redis_nodeset_t *nodeset_find(nchan_redis_conf_t *rcf);
-ngx_int_t nodeset_examine(redis_nodeset_t *nodeset);
-
-ngx_int_t nodeset_node_destroy(redis_node_t *node);
-
-
-int node_disconnect(redis_node_t *node, int disconnected_state);
-int node_connect(redis_node_t *node);
-redisContext *node_connect_sync_context(redis_node_t *node);
-void node_set_role(redis_node_t *node, redis_node_role_t role);
-int node_set_master_node(redis_node_t *node, redis_node_t *master);
-redis_node_t *node_find_slave_node(redis_node_t *node, redis_node_t *slave);
-int node_add_slave_node(redis_node_t *node, redis_node_t *slave);
-int node_remove_slave_node(redis_node_t *node, redis_node_t *slave);
-
-ngx_int_t nodeset_connect_all(void);
-int nodeset_connect(redis_nodeset_t *ns);
-int nodeset_node_keyslot_changed(redis_node_t *node);
-int nodeset_disconnect(redis_nodeset_t *ns);
-ngx_int_t nodeset_destroy_all(void);
-ngx_int_t nodeset_each(void (*)(redis_nodeset_t *, void *), void *privdata);
-ngx_int_t nodeset_each_node(redis_nodeset_t *, void (*)(redis_node_t *, void *), void *privdata);
-ngx_int_t nodeset_callback_on_ready(redis_nodeset_t *ns, ngx_msec_t max_wait, ngx_int_t (*cb)(redis_nodeset_t *, void *), void *pd);
-ngx_int_t nodeset_abort_on_ready_callbacks(redis_nodeset_t *ns);
-ngx_int_t nodeset_run_on_ready_callbacks(redis_nodeset_t *ns);
-
-ngx_int_t nodeset_set_status(redis_nodeset_t *nodeset, redis_nodeset_status_t status, const char *msg);
-
-int nodeset_node_deduplicate_by_connect_params(redis_node_t *node);
-int nodeset_node_deduplicate_by_run_id(redis_node_t *node);
-int nodeset_node_deduplicate_by_cluster_id(redis_node_t *node);
-
-redis_node_t *nodeset_node_find_by_connect_params(redis_nodeset_t *ns, redis_connect_params_t *rcp);
-redis_node_t *nodeset_node_find_by_run_id(redis_nodeset_t *ns, ngx_str_t *run_id);
-redis_node_t *nodeset_node_find_by_cluster_id(redis_nodeset_t *ns, ngx_str_t *cluster_id);
-redis_node_t *nodeset_node_find_by_range(redis_nodeset_t *ns, redis_slot_range_t *range);
-redis_node_t *nodeset_node_find_by_slot(redis_nodeset_t *ns, uint16_t slot);
-redis_node_t *nodeset_node_find_by_channel_id(redis_nodeset_t *ns, ngx_str_t *channel_id);
-redis_node_t *nodeset_node_find_by_key(redis_nodeset_t *ns, ngx_str_t *key);
-redis_node_t *nodeset_node_find_any_ready_master(redis_nodeset_t *ns);
-int nodeset_node_reply_keyslot_ok(redis_node_t *node, redisReply *r);
-int nodeset_ready(redis_nodeset_t *nodeset);
-
-//chanheads are (void *) here to avoid circular typedef dependency with store-private.h
-//it's terrible, and dirty -- but quick
-ngx_int_t nodeset_associate_chanhead(redis_nodeset_t *, void *chanhead);
-ngx_int_t nodeset_dissociate_chanhead(void *chanhead);
-
-ngx_int_t nodeset_node_associate_chanhead(redis_node_t *, void *chanhead);
-ngx_int_t nodeset_node_associate_pubsub_chanhead(redis_node_t *, void *chanhead);
-ngx_int_t nodeset_node_dissociate_chanhead(void *chanhead);
-ngx_int_t nodeset_node_dissociate_pubsub_chanhead(void *chanhead);
-
-redis_node_t *nodeset_node_find_by_chanhead(void *chanhead);
-redis_node_t *nodeset_node_pubsub_find_by_chanhead(void *chanhead);
-
-
-
-redis_node_t *nodeset_node_create(redis_nodeset_t *ns, redis_connect_params_t *rcp);
-
-uint16_t redis_crc16(uint16_t crc, const char *buf, int len);
-
-
-const char *__node_nickname_cstr(redis_node_t *node);
-  
-#endif /* NCHAN_REDIS_NODESET_H */
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset_parser.c b/debian/modules/nchan/src/store/redis/redis_nodeset_parser.c
deleted file mode 100644
index 5db30f0..0000000
--- a/debian/modules/nchan/src/store/redis/redis_nodeset_parser.c
+++ /dev/null
@@ -1,241 +0,0 @@
-#include <nchan_module.h>
-#include <assert.h>
-
-#include "redis_nginx_adapter.h"
-
-#include <util/nchan_util.h>
-#include <util/nchan_msg.h>
-#include <store/store_common.h>
-#include "redis_nodeset_parser.h"
-#include "redis_nodeset.h"
-
-#define nchan_scan_str(str_src, cur, chr, str)\
-  (str)->data = (u_char *)memchr(cur, chr, (str_src)->len - (cur - (str_src)->data));\
-  if(!(str)->data)                            \
-    (str)->data = (str_src)->data + (str_src)->len;\
-  if((str)->data) {                           \
-    (str)->len = (str)->data - cur;           \
-    (str)->data = cur;                        \
-    cur+=(str)->len+1;                        \
-  }                                           \
-  else                                        \
-    goto fail
-
-
-static cluster_nodes_line_t   cluster_node_parsed_lines[MAX_CLUSTER_NODE_PARSED_LINES];
-static redis_connect_params_t parsed_connect_params[MAX_NODE_SLAVES_PARSED];
-
-static u_char *nodeset_parser_scan_cluster_nodes_slots_string(ngx_str_t *str, u_char *cur, redis_slot_range_t *r) {
-  ngx_str_t       slot_min_str, slot_max_str, slot;
-  ngx_int_t       slot_min,     slot_max;
-  u_char         *dash;
-  
-  if(cur == NULL) {
-    cur = str->data;
-  }
-  else if(cur >= str->data + str->len) {
-    return NULL;
-  }
-  if(str->len == 0) {
-    return NULL;
-  }
-  
-  nchan_scan_str(str, cur, ' ', &slot);
-  if(slot.data[0] == '[') {
-    //transitional special slot. ignore it.
-    return nodeset_parser_scan_cluster_nodes_slots_string(str, cur, r);
-  }
-  
-  dash = (u_char *)memchr(slot.data, '-', slot.len);
-  if(dash) {
-    slot_min_str.data = slot.data;
-    slot_min_str.len = dash - slot.data;
-    
-    slot_max_str.data = dash + 1;
-    slot_max_str.len = slot.len - (slot_max_str.data - slot.data);
-  }
-  else {
-    slot_min_str = slot;
-    slot_max_str = slot;
-  }
-  
-  slot_min = ngx_atoi(slot_min_str.data, slot_min_str.len);
-  slot_max = ngx_atoi(slot_max_str.data, slot_max_str.len);
-  
-  //DBG("slots: %i - %i", slot_min, slot_max);
-  
-  r->min = slot_min;
-  r->max = slot_max;
-  
-  return cur;
-  
-fail:
-  return NULL;
-}
-
-int parse_cluster_node_slots(cluster_nodes_line_t *l, redis_slot_range_t *ranges) {
-  //assumes the correct amount of ranges has already been allocated
-int                    i = 0;
-  redis_slot_range_t   range;
-  u_char              *cur = NULL;
-  while((cur = nodeset_parser_scan_cluster_nodes_slots_string(&l->slots, cur, &range)) != NULL) {
-    if(i > l->slot_ranges_count) {
-      return 0; //parsing more slot ranges than was expected
-    }
-    ranges[i]=range;
-    i++;
-  }
-  if(i !=l->slot_ranges_count) {
-    return 0; //parsed the wrong amount of slot ranges
-  }
-  return 1;
-}
-
-static char *nodeset_parser_scan_cluster_nodes_line(const char *line, cluster_nodes_line_t *l) {
-  u_char     *cur = (u_char *)line;
-  u_char     *max = cur;
-  u_char     *tmp;
-  ngx_str_t   rest_line;
-  
-  if(cur[0]=='\0')
-    return NULL;
-  
-  nchan_scan_split_by_chr(&max, strlen((char *)max), &rest_line, '\n');
-  l->line = rest_line;
-  
-  nchan_scan_until_chr_on_line(&rest_line, &l->id,           ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->address,      ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->flags,        ' ');
-  
-  nchan_scan_until_chr_on_line(&rest_line, &l->master_id,    ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->ping_sent,    ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->pong_recv,    ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->config_epoch, ' ');
-  nchan_scan_until_chr_on_line(&rest_line, &l->link_state,   ' ');
-  
-  if(nchan_ngx_str_substr((&l->flags), "master")) {
-    l->slots = rest_line;
-    l->master = 1;
-    
-    //how many slot ranges?
-    int                  i = 0;
-    redis_slot_range_t   range;
-    cur = NULL;
-    while((cur = nodeset_parser_scan_cluster_nodes_slots_string(&l->slots, cur, &range)) != NULL) {
-      i++;
-    }
-    l->slot_ranges_count = i;
-  }
-  else {
-    l->slots.data = NULL;
-    l->slots.len = 0;
-    l->slot_ranges_count = 0;
-    l->master = 0;
-  }
-  l->failed = nchan_ngx_str_substr((&l->flags), "fail");
-  l->self = nchan_ngx_str_substr((&l->flags), "myself");
-  l->noaddr = nchan_ngx_str_substr((&l->flags), "noaddr");
-  l->handshake = nchan_ngx_str_substr((&l->flags), "handshake");
-  
-  l->connected = l->link_state.data[0]=='c' ? 1 : 0; //[c]onnected
-  
-  //redis >= 4.0 CLUSTER NODES format compatibility
-  if((tmp = memrchr(l->address.data, '@', l->address.len)) != NULL) {
-    l->address.len = tmp - l->address.data;
-  }
-  
-  if((tmp = memrchr(l->address.data, ':', l->address.len)) != NULL) {
-    //hostname and port from address
-    ngx_str_t   port;
-    l->hostname.data = l->address.data;
-    l->hostname.len = tmp - l->address.data;
-    port.len = l->address.len - l->hostname.len - 1;
-    port.data = &tmp[1];
-    l->port = ngx_atoi(port.data, port.len);
-  }
-  
-  cur = max;
-  if(&cur[-1] > (u_char *)line && cur[-1] == '\0')
-    cur--;
-  return (char *)cur;
-}
-
-redis_connect_params_t *parse_info_slaves(redis_node_t *node, const char *info, size_t *count) {
-  char                   slavebuf[20]="slave0:";
-  int                    i = 0, skipped = 0;
-  redis_connect_params_t rcp;
-  ngx_str_t              line;
-  while(nchan_get_rest_of_line_in_cstr(info, slavebuf, &line)) {
-    //ip=localhost,port=8537,state=online,offset=420,lag=1
-    ngx_str_t hostname, port;
-    nchan_scan_until_chr_on_line(&line, NULL,      '='); //ip=
-    nchan_scan_until_chr_on_line(&line, &hostname, ','); //ip=([^,]*),
-    nchan_scan_until_chr_on_line(&line, NULL,      '='); //port=
-    nchan_scan_until_chr_on_line(&line, &port,     ','); //port=([^,]*),
-    //don't care about the rest
-    rcp.hostname = hostname;
-    rcp.port = ngx_atoi(port.data, port.len);
-    rcp.password = node->connect_params.password;
-    rcp.peername.len = 0;
-    rcp.db = node->connect_params.db;
-    
-    if(i < MAX_NODE_SLAVES_PARSED) {
-      parsed_connect_params[i]=rcp;
-    }
-    else {
-      node_log_error(node, "too many slaves, skipping slave %d", i+1);
-    }
-    i++;
-    ngx_sprintf((u_char *)slavebuf, "slave%d:", i);
-    
-    
-  }
-  *count = i - skipped;
-  return parsed_connect_params;
-}
-
-redis_connect_params_t *parse_info_master(redis_node_t *node, const char *info) {
-  redis_connect_params_t    rcp;
-  ngx_str_t                 port;
-  if(!nchan_get_rest_of_line_in_cstr(info, "master_host:", &rcp.hostname)) {
-    node_log_error(node, "failed to find master_host while discovering master");
-    return 0;
-  }
-  
-  if(!nchan_get_rest_of_line_in_cstr(info, "master_port:", &port)) {
-    node_log_error(node, "failed to find master_port while discovering master");
-    return 0;
-  }
-  rcp.port = ngx_atoi(port.data, port.len);
-  if(rcp.port == NGX_ERROR) {
-    node_log_error(node, "failed to parse master_port while discovering master");
-    return 0;
-  }
-  rcp.db = node->connect_params.db;
-  rcp.password = node->connect_params.password;
-
-  rcp.peername.data = NULL;
-  rcp.peername.len = 0;
-  
-  parsed_connect_params[0]=rcp;
-  return &parsed_connect_params[0];
-}
-
-cluster_nodes_line_t *parse_cluster_nodes(redis_node_t *node, const char *clusternodes, size_t *count) {
-  
-  const char           *line = clusternodes;
-  size_t                n = 0, discarded = 0;
-  cluster_nodes_line_t  l;
-  while((line = nodeset_parser_scan_cluster_nodes_line(line, &l)) != NULL) {
-    if(n > MAX_CLUSTER_NODE_PARSED_LINES) {
-      node_log_error(node, "too many cluster nodes, discarding line %d", n + discarded);
-      discarded++;
-    }
-    else {
-      cluster_node_parsed_lines[n]=l;
-      n++;
-    }
-  }
-  *count = n;
-  return cluster_node_parsed_lines;
-}
diff --git a/debian/modules/nchan/src/store/redis/redis_nodeset_parser.h b/debian/modules/nchan/src/store/redis/redis_nodeset_parser.h
deleted file mode 100644
index e9f3575..0000000
--- a/debian/modules/nchan/src/store/redis/redis_nodeset_parser.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef REDIS_NODESET_PARSER_H
-#define REDIS_NODESET_PARSER_H
-
-#define MAX_CLUSTER_NODE_PARSED_LINES 512
-#define MAX_NODE_SLAVES_PARSED 512
-
-#include <nchan_module.h>
-#include "store-private.h"
-
-typedef struct {
-  ngx_str_t      line;
-  ngx_str_t      id;         //node id
-  ngx_str_t      address;    //address as known by redis
-  ngx_str_t      hostname;
-  ngx_int_t      port;
-  ngx_str_t      flags;
-  
-  ngx_str_t      master_id;  //if slave
-  ngx_str_t      ping_sent;
-  ngx_str_t      pong_recv;
-  ngx_str_t      config_epoch;
-  ngx_str_t      link_state; //connected or disconnected
-  
-  ngx_str_t      slots;
-  ngx_int_t      slot_ranges_count;
-  
-  unsigned       connected:1;
-  unsigned       master:1;
-  unsigned       noaddr:1;
-  unsigned       failed:1;
-  unsigned       handshake:1;
-  unsigned       self:1;
-} cluster_nodes_line_t;
-
-redis_connect_params_t *parse_info_slaves(redis_node_t *node, const char *info, size_t *count);
-redis_connect_params_t *parse_info_master(redis_node_t *node, const char *info);
-cluster_nodes_line_t *parse_cluster_nodes(redis_node_t *node, const char *clusternodes, size_t *count);
-int parse_cluster_node_slots(cluster_nodes_line_t *l, redis_slot_range_t *ranges);
-
-#endif /*REDIS_NODESET_PARSER_H */
diff --git a/debian/modules/nchan/src/store/redis/scripts/get_unique_request_id.lua b/debian/modules/nchan/src/store/redis/scripts/get_unique_request_id.lua
deleted file mode 100644
index 8d1c8b6..0000000
--- a/debian/modules/nchan/src/store/redis/scripts/get_unique_request_id.lua
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/debian/modules/nchan/src/store/redis/store-private.h b/debian/modules/nchan/src/store/redis/store-private.h
deleted file mode 100644
index f1292f6..0000000
--- a/debian/modules/nchan/src/store/redis/store-private.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#ifndef NCHAN_REDIS_STORE_PRIVATE_H
-#define NCHAN_REDIS_STORE_PRIVATE_H
-
-#define NCHAN_CHANHEAD_EXPIRE_SEC 1
-#define NCHAN_CHANHEAD_CLUSTER_ORPHAN_EXPIRE_SEC 15
-#define NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE 0xB00F
-
-#define NCHAN_REDIS_UNIQUE_REQUEST_ID_KEY "nchan:unique_request_id"
-
-#include <nchan_module.h>
-#include "uthash.h"
-#if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
-#include <hiredis/hiredis.h>
-#include <hiredis/async.h>
-#else
-#include <store/redis/hiredis/hiredis.h>
-#include <store/redis/hiredis/async.h>
-#endif
-#include <util/nchan_reaper.h>
-#include <util/nchan_rbtree.h>
-#include <util/nchan_list.h>
-#include <store/spool.h>
-
-#include "redis_nodeset.h"
-#define REDIS_LUA_HASH_LENGTH 40
-#define REDIS_NODESET_NOT_READY_MAX_RETRIES 2
-
-//OBSOLETE
-typedef struct {
-  unsigned         min:16;
-  unsigned         max:16;
-} redis_cluster_slot_range_t;
-
-
-typedef struct rdstore_channel_head_s rdstore_channel_head_t;
-
-typedef enum {REDIS_PUBSUB_SUBSCRIBING, REDIS_PUBSUB_SUBSCRIBED, REDIS_PUBSUB_UNSUBSCRIBED} redis_pubsub_status_t;
-
-struct rdstore_channel_head_s {
-  ngx_str_t                    id; //channel id
-  channel_spooler_t            spooler;
-  ngx_uint_t                   generation; //subscriber pool generation.
-  chanhead_pubsub_status_t     status;
-  ngx_uint_t                   sub_count;
-  ngx_int_t                    fetching_message_count;
-  ngx_uint_t                   internal_sub_count;
-  ngx_event_t                  keepalive_timer;
-  ngx_uint_t                   keepalive_times_sent;
-  nchan_msg_id_t               last_msgid;
-  
-  void                        *redis_subscriber_privdata;
-  //rdstore_channel_head_cluster_data_t cluster;
-  
-  ngx_int_t                    reserved;
-  
-  struct {                   //redis
-    int                          generation;
-    redis_nodeset_t             *nodeset;
-    struct {                   //node
-      redis_node_t                *cmd;
-      redis_node_t                *pubsub;
-    }                            node;
-    
-    struct {                  //linked list links
-      struct {
-        rdstore_channel_head_t      *prev;
-        rdstore_channel_head_t      *next;
-      }                            nodeset;
-      struct {
-        rdstore_channel_head_t      *prev;
-        rdstore_channel_head_t      *next;
-      }                            node_cmd;
-      struct {
-        rdstore_channel_head_t      *prev;
-        rdstore_channel_head_t      *next;
-      }                            node_pubsub;
-      unsigned                     in_disconnected_cmd_list:1;
-      unsigned                     in_disconnected_pubsub_list:1;
-    }                            slist;
-    
-  }                            redis;
-  
-  struct {                   //gc
-    rdstore_channel_head_t      *prev;
-    rdstore_channel_head_t      *next;
-    time_t                       time;
-    unsigned                     in_reaper:1;
-  }                            gc;
-  
-  
-  
-  redis_pubsub_status_t        pubsub_status;
-  unsigned                     meta:1;
-  unsigned                     shutting_down:1;
-  UT_hash_handle               hh;
-};
-
-
-void redisCheckErrorCallback(redisAsyncContext *c, void *r, void *privdata);
-int redisReplyOk(redisAsyncContext *c, void *r);
-ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp);
-ngx_int_t rdstore_initialize_chanhead_reaper(nchan_reaper_t *reaper, char *name);
-
-ngx_int_t redis_chanhead_gc_add(rdstore_channel_head_t *head, ngx_int_t expire, const char *reason);
-ngx_int_t redis_chanhead_gc_withdraw(rdstore_channel_head_t *head);
-ngx_int_t redis_chanhead_catch_up_after_reconnect(rdstore_channel_head_t *ch);
-
-ngx_int_t ensure_chanhead_pubsub_subscribed_if_needed(rdstore_channel_head_t *ch);
-
-
-#endif //NCHAN_REDIS_STORE_PRIVATE_H
diff --git a/debian/modules/nchan/src/store/redis/store.h b/debian/modules/nchan/src/store/redis/store.h
deleted file mode 100755
index 6bfa30c..0000000
--- a/debian/modules/nchan/src/store/redis/store.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef NCHAN_REDIS_STORE_H
-#define NCHAN_REDIS_STORE_H
-
-#define NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME 4*60
-#define NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_TIME 5
-#define NCHAN_REDIS_DEFAULT_PUBSUB_MESSAGE_MSGKEY_SIZE 1024*5
-
-extern nchan_store_t  nchan_store_redis;
-
-ngx_int_t nchan_store_redis_fakesub_add(ngx_str_t *channel_id, nchan_loc_conf_t *cf, ngx_int_t count, uint8_t shutting_down);
-void redis_store_prepare_to_exit_worker(); // hark! a hack!!
-
-ngx_int_t nchan_store_redis_add_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf);
-ngx_int_t nchan_store_redis_remove_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf);
-
-int nchan_store_redis_ready(nchan_loc_conf_t *cf);
-int nchan_store_redis_validate_url(ngx_str_t *url);
-
-
-
-ngx_int_t redis_store_callback_on_connected(nchan_loc_conf_t *cf, ngx_msec_t max_wait, callback_pt cb, void *privdata);
-#endif // NCHAN_REDIS_STORE_H
diff --git a/debian/modules/nchan/src/store/spool.c b/debian/modules/nchan/src/store/spool.c
deleted file mode 100755
index 1e1592a..0000000
--- a/debian/modules/nchan/src/store/spool.c
+++ /dev/null
@@ -1,1302 +0,0 @@
-#include <nchan_module.h>
-#include "spool.h"
-#include <assert.h>
-
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-//#define DEBUG_LEVEL NGX_LOG_WARN
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SPOOL:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SPOOL:" fmt, ##arg)
-
-#define NCHAN_SPOOL_FETCHMSG_MAX_TIMES 20
-
-//////// SPOOLs -- Subscriber Pools  /////////
-
-static ngx_int_t spool_remove_subscriber(subscriber_pool_t *, spooled_subscriber_t *);
-static void spool_bubbleup_dequeue_handler(subscriber_pool_t *spool, subscriber_t *sub, channel_spooler_t *spl);
-//static void spool_bubbleup_bulk_dequeue_handler(subscriber_pool_t *spool, subscriber_type_t type, ngx_int_t count, channel_spooler_t *spl);
-static ngx_int_t spool_respond_general(subscriber_pool_t *self, nchan_msg_t *msg, ngx_int_t status_code, void *code_data, unsigned notice);
-static ngx_int_t spool_transfer_subscribers(subscriber_pool_t *spool, subscriber_pool_t *newspool, uint8_t update_subscriber_last_msgid);
-static ngx_int_t destroy_spool(subscriber_pool_t *spool);
-static ngx_int_t remove_spool(subscriber_pool_t *spool);
-static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool);
-
-static nchan_msg_id_t     latest_msg_id = NCHAN_NEWEST_MSGID;
-static nchan_msg_id_t     oldest_msg_id = NCHAN_OLDEST_MSGID;
-
-static subscriber_pool_t *find_spool(channel_spooler_t *spl, nchan_msg_id_t *id) {
-  rbtree_seed_t      *seed = &spl->spoolseed;
-  ngx_rbtree_node_t  *node;
-  subscriber_pool_t  *spool = NULL;
-  
-  if(id->time == NCHAN_NEWEST_MSGID_TIME || spl->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
-    spool = &spl->current_msg_spool;
-    spool->msg_status = MSG_EXPECTED;
-  }
-  else if((node = rbtree_find_node(seed, id)) != NULL) {
-    spool = rbtree_data_from_node(node);
-  }
-  
-  return spool;
-}
-/*
-typedef struct {
-  int                  n;
-  subscriber_pool_t   *msg_expected_spool;
-  
-  int                  err;
-} spool_verify_data_t;
-
-
-static void log_spool_err(spool_verify_data_t *d, subscriber_pool_t *spool, char *str) {
-  ERR("%p %s [%s]", spool, msg_status_to_chr(spool->msg_status), str);
-  d->err = 1;
-}
-
-static int validate_spooler_walker(rbtree_seed_t *seed, subscriber_pool_t *spool, spool_verify_data_t *d) {
-  if(spool->msg_status == MSG_EXPECTED) {
-    if(d->msg_expected_spool) {
-      log_spool_err(d, spool, "Found more than 1 spool with MSG_EXPECTED status");
-    }
-    else {
-      d->msg_expected_spool = spool;
-    }
-  }
-  else {
-    if(spool->sub_count == 0) {
-      log_spool_err(d, spool, "empty spool (not MSG_EXPECTED)");
-    }
-  }
-  d->n++;
-
-  return NGX_OK;
-}
-
-static int validate_spooler(channel_spooler_t *spl, char *str) {
-  spool_verify_data_t  d;
-  ngx_memzero(&d, sizeof(d));
-  rbtree_walk(&spl->spoolseed, (rbtree_walk_callback_pt )validate_spooler_walker, &d);
-  if(d.err == 0) {
-    ERR("%s: validated %i spools in channel spooler %V", str, d.n, spl->chid);
-  }
-  else {
-    ERR("%s: validating %i spools  FAILED in channel spooler %V; %i error(s).", str, d.n, spl->chid, d.err);
-  }
-  return d.err == 0;
-}
-*/
-
-static void spool_reserve(subscriber_pool_t *spool) {
-  spool->reserved++;
-}
-static void spool_release(subscriber_pool_t *spool) {
-  spool->reserved--;
-  ngx_int_t immortal_spool = spool->id.time == NCHAN_NEWEST_MSGID_TIME;
-  if(!immortal_spool && spool->reserved == 0 && spool->sub_count == 0) {
-    destroy_spool(spool);
-  }
-}
-
-static int msg_ids_equal(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
-  int           i, max;
-  int16_t      *tags1, *tags2;
-  
-  if(id1->time != id2->time || id1->tagcount != id2->tagcount) return 0;
-  max = id1->tagcount;
-  if(max <= NCHAN_FIXED_MULTITAG_MAX) {
-    tags1 = id1->tag.fixed;
-    tags2 = id2->tag.fixed;
-  }
-  else {
-    tags1 = id1->tag.allocd;
-    tags2 = id2->tag.allocd;
-  }
-  
-  
-  for(i=0; i < max; i++) {
-    if(tags1[i] != tags2[i]) return 0;
-  }
-  return 1;
-}
-
-static void spooler_timer_handler(ngx_event_t *ev) {
-  spooler_event_ll_t *spl_ev = container_of(ev, spooler_event_ll_t, ev);
-  spl_ev->callback(ev->data);
-  if(spl_ev->prev) {
-    spl_ev->prev->next = spl_ev->next;
-  }
-  if(spl_ev->next) {
-    spl_ev->next->prev = spl_ev->prev;
-  }
-  if(spl_ev->spooler->spooler_dependent_events == spl_ev) {
-    spl_ev->spooler->spooler_dependent_events = spl_ev->next;
-  }
-  ngx_free(spl_ev);
-}
-
-ngx_event_t *spooler_add_timer(channel_spooler_t *spl, ngx_msec_t timeout, void (*cb)(void *), void (*cancel)(void *), void *pd) {
-  spooler_event_ll_t  *spl_ev = ngx_alloc(sizeof(*spl_ev), ngx_cycle->log);
-  ngx_memzero(&spl_ev->ev, sizeof(spl_ev->ev));
-  nchan_init_timer(&spl_ev->ev, spooler_timer_handler, pd);
-  
-  spl_ev->callback = cb;
-  spl_ev->cancel = cancel;
-  
-  spl_ev->spooler = spl;
-  spl_ev->next = spl->spooler_dependent_events;
-  spl_ev->prev = NULL;
-  if(spl->spooler_dependent_events) {
-    spl->spooler_dependent_events->prev = spl_ev;
-  }
-  spl->spooler_dependent_events = spl_ev;
-  
-  ngx_add_timer(&spl_ev->ev, timeout);
-  return &spl_ev->ev;
-}
-
-static void fetchmsg_ev_handler(ngx_event_t *ev) {
-  subscriber_pool_t *spool = (subscriber_pool_t *)ev->data;
-  DBG("stack-overflow-buster fetchmsg event for spool %p", spool);
-  if(spool->msg_status == MSG_INVALID) {
-    spool_fetch_msg(spool);
-  }
-}
-
-static ngx_inline void init_spool(channel_spooler_t *spl, subscriber_pool_t *spool, nchan_msg_id_t *id) {
-  nchan_copy_new_msg_id(&spool->id, id);
-  spool->msg = NULL;
-  spool->msg_status = MSG_INVALID;
-  
-  spool->first = NULL;
-  spool->sub_count = 0;
-  spool->non_internal_sub_count = 0;
-  //spool->generation = 0;
-  //spool->responded_count = 0;
-  spool->reserved = 0;
-  ngx_memzero(&spool->fetchmsg_ev, sizeof(spool->fetchmsg_ev));
-  nchan_init_timer(&spool->fetchmsg_ev, fetchmsg_ev_handler, spool);
-  spool->fetchmsg_current_count=0;
-  spool->fetchmsg_prev_msec=0;
-  
-  spool->spooler = spl;
-}
-
-static subscriber_pool_t *get_spool(channel_spooler_t *spl, nchan_msg_id_t *id) {
-  rbtree_seed_t      *seed = &spl->spoolseed;
-  ngx_rbtree_node_t  *node;
-  subscriber_pool_t *spool;
-  
-  
-  if(id->time == NCHAN_NEWEST_MSGID_TIME || spl->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
-    spool = &spl->current_msg_spool;
-    spool->msg_status = MSG_EXPECTED;
-    return &spl->current_msg_spool;
-  }
-  
-  if((node = rbtree_find_node(seed, id)) == NULL) {
-    
-    if((node = rbtree_create_node(seed, sizeof(*spool))) == NULL) {
-      ERR("can't create rbtree node for spool");
-      return NULL;
-    }
-    
-   // DBG("CREATED spool node %p for msgid %V", node, msgid_to_str(id));
-    spool = (subscriber_pool_t *)rbtree_data_from_node(node);
-    
-    init_spool(spl, spool, id);
-    
-    if(rbtree_insert_node(seed, node) != NGX_OK) {
-      ERR("couldn't insert spool node");
-      rbtree_destroy_node(seed, node);
-      return NULL;
-    }
-  }
-  else {
-    spool = (subscriber_pool_t *)rbtree_data_from_node(node);
-    DBG("found spool node %p with msgid %V", node, msgid_to_str(id));
-    assert(spool->id.time == id->time);
-  }
-  return spool;
-}
-
-static ngx_int_t spool_nextmsg(subscriber_pool_t *spool, nchan_msg_id_t *new_last_id) {
-  subscriber_pool_t      *newspool;
-  channel_spooler_t      *spl = spool->spooler;
-  
-  ngx_int_t               immortal_spool = spool->id.time == NCHAN_NEWEST_MSGID_TIME;
-  int16_t                 largetags[NCHAN_MULTITAG_MAX];
-  nchan_msg_id_t          new_id = NCHAN_ZERO_MSGID;
-  
-  if(spl->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
-    if(immortal_spool) {
-      return NGX_OK; //nothing to do, already on the newest spool
-    }
-    else {
-      new_last_id = &latest_msg_id;
-    }
-  }
-  
-  nchan_copy_msg_id(&new_id, &spool->id, largetags);
-  nchan_update_multi_msgid(&new_id, new_last_id, largetags);
-  
-  //ERR("spool %p nextmsg (%V) --", spool, msgid_to_str(&spool->id));
-  //ERR(" --  update with               (%V) --", msgid_to_str(new_last_id));
-  //ERR(" -- newid                       %V", msgid_to_str(&new_id));
-  
-  if(msg_ids_equal(&spool->id, &new_id)) {
-    ERR("nextmsg id same as curmsg (%V)", msgid_to_str(&spool->id));
-    assert(0);
-  }
-  else {
-    newspool = !immortal_spool ? find_spool(spl, &new_id) : get_spool(spl, &new_id);
-    
-    if(newspool != NULL) {
-      //move subs to next, already existing spool
-      assert(spool != newspool);
-      spool_transfer_subscribers(spool, newspool, 0);
-      if(!immortal_spool && spool->reserved == 0) destroy_spool(spool);
-    }
-    else {
-      //next spool doesn't exist. reuse this one as the next
-      ngx_rbtree_node_t       *node;
-      assert(!immortal_spool);
-      node = rbtree_node_from_data(spool);
-      rbtree_remove_node(&spl->spoolseed, node);
-      nchan_copy_msg_id(&spool->id, &new_id, NULL);
-      rbtree_insert_node(&spl->spoolseed, node);
-      spool->msg_status = MSG_INVALID;
-      spool->msg = NULL;
-      newspool = spool;
-      
-      /*
-      newspool = get_spool(spl, &new_id);
-      assert(spool != newspool);
-      spool_transfer_subscribers(spool, newspool, 0);
-      destroy_spool(spool);
-      */
-    }
-
-    
-    if(newspool->non_internal_sub_count > 0 && spl->handlers->use != NULL) {
-      spl->handlers->use(spl, spl->handlers_privdata);
-    }
-    
-    if(newspool->sub_count > 0) {
-      switch(newspool->msg_status) {
-        case MSG_CHANNEL_NOTREADY:
-          newspool->msg_status = MSG_INVALID;
-          /*fallthrough*/
-        case MSG_INVALID:
-          spool_fetch_msg(newspool);
-          break;
-        case MSG_EXPECTED:
-          spool_respond_general(newspool, NULL, NGX_HTTP_NO_CONTENT, NULL, 0);
-          break;
-        default:
-          break;
-      }
-    }
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t spool_fetch_msg_callback(ngx_int_t code, nchan_msg_t *msg, fetchmsg_data_t *data) {
-  nchan_msg_status_t    findmsg_status = code;
-  nchan_msg_status_t    prev_status;
-  subscriber_pool_t    *spool, *nuspool;
-  channel_spooler_t    *spl = data->spooler;
-  int                   free_msg_id = 1;
-  
-  assert(spl->fetching_strategy != NCHAN_SPOOL_PASSTHROUGH);
-  
-  if(spl && data == spl->fetchmsg_cb_data_list) {
-    spl->fetchmsg_cb_data_list = data->next;
-  }
-  if(data->next) {
-    data->next->prev = data->prev;
-  }
-  if(data->prev) {
-    data->prev->next = data->next;
-  }
-  
-  if(spl == NULL) { //channel already deleted
-    nchan_free_msg_id(&data->msgid);
-    ngx_free(data);
-    return NGX_OK;
-  }
-  
-  if(spl->handlers->get_message_finish) {
-    spl->handlers->get_message_finish(spl, spl->handlers_privdata);
-  }
-  
-  if((spool = find_spool(spl, &data->msgid)) == NULL) {
-    DBG("spool for msgid %V not found. discarding getmsg callback response.", msgid_to_str(&data->msgid));
-    nchan_free_msg_id(&data->msgid);
-    ngx_free(data);
-    return NGX_ERROR;
-  }
-  
-  prev_status = spool->msg_status;
-  
-  switch(findmsg_status) {
-    case MSG_FOUND:
-      spool->msg_status = findmsg_status;
-      DBG("fetchmsg callback for spool %p msg FOUND %p %V", spool, msg, msgid_to_str(&msg->id));
-      assert(msg != NULL);
-      spool->msg = msg;
-      spool_respond_general(spool, spool->msg, 0, NULL, 0);
-      
-      spool_nextmsg(spool, &msg->id);      
-      break;
-    
-    case MSG_EXPECTED:
-      // ♫ It's gonna be the future soon ♫
-      if(spool->id.time == NCHAN_NTH_MSGID_TIME) {
-        //wait for message in the NEWEST_ID spool
-        spool_nextmsg(spool, &latest_msg_id); 
-      }
-      else {
-        spool->msg_status = findmsg_status;
-        DBG("fetchmsg callback for spool %p msg EXPECTED", spool);
-        spool_respond_general(spool, NULL, NGX_HTTP_NO_CONTENT, NULL, 0);
-        assert(msg == NULL);
-        spool->msg = NULL;
-      }
-      break;
-    
-    case MSG_CHANNEL_NOTREADY:
-      //just wait it out
-      spool->msg = NULL;
-      spool->msg_status = findmsg_status;
-      break;
-      
-    case MSG_NOTFOUND:
-      if(spl->fetching_strategy == NCHAN_SPOOL_FETCH_IGNORE_MSG_NOTFOUND) {
-        spool->msg_status = prev_status;
-        break;
-      }
-      /*fallthrough*/
-    case MSG_EXPIRED:
-      //is this right?
-      //TODO: maybe message-expired notification
-      spool->msg_status = findmsg_status;
-      spool_respond_general(spool, NULL, NGX_HTTP_NO_CONTENT, NULL, 0);
-      nuspool = get_spool(spool->spooler, &oldest_msg_id);
-      if(spool != nuspool) {
-        spool_transfer_subscribers(spool, nuspool, 1);
-        if(spool->reserved == 0) {
-          destroy_spool(spool);
-        }
-        spool_fetch_msg(nuspool);
-      }
-      else if(spool->id.tagcount == 1 && nchan_compare_msgids(&spool->id, &oldest_msg_id) == 0) {
-        // oldest msgid not found or expired. that means there are no messages in this channel, 
-        // so move these subscribers over to the current_msg_spool
-        nuspool = get_spool(spool->spooler, &latest_msg_id);
-        assert(spool != nuspool);
-        spool_transfer_subscribers(spool, nuspool, 1);
-        if(spool->reserved == 0) {
-          destroy_spool(spool);
-        }
-      }
-      else if(spool == &spool->spooler->current_msg_spool) {
-        //sit there and wait, i guess
-        spool->msg_status = MSG_EXPECTED;
-      }
-      else {
-        ERR("Unexpected spool == nuspool during spool fetch_msg_callback. This is weird, please report this to the developers. findmsg_status: %i", findmsg_status);
-        assert(0);
-      }
-      break;
-    
-    case MSG_PENDING:
-      ERR("spool %p set status to MSG_PENDING", spool);
-      break;
-      
-    case MSG_ERROR:
-      spool_respond_general(spool, NULL, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 0);
-      break;
-      
-    case MSG_INVALID:
-      assert(0); //should never happen
-      break;
-  }
-  
-  if(free_msg_id) {
-    nchan_free_msg_id(&data->msgid);
-  }
-  ngx_free(data);
-  return NGX_OK;
-}
-
-static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool) {
-  fetchmsg_data_t        *data;
-  channel_spooler_t      *spl = spool->spooler;
-  
-  
-  //stack overflow protector
-  //ERR("spool->fetchmsg_prev_msec %i (ngx_timeofday())->msec %i spool->fetchmsg_current_count %i", spool->fetchmsg_prev_msec, (ngx_timeofday())->msec, spool->fetchmsg_current_count);
-  if(spool->fetchmsg_prev_msec == (ngx_timeofday())->msec) {
-    if(spool->fetchmsg_current_count > NCHAN_SPOOL_FETCHMSG_MAX_TIMES) {
-      ngx_add_timer(&spool->fetchmsg_ev, 0);
-      spool->fetchmsg_current_count = 0;
-      return NGX_DONE;
-    }
-    else {
-      spool->fetchmsg_current_count++;
-    }
-  }
-  else {
-    spool->fetchmsg_current_count = 0;
-    spool->fetchmsg_prev_msec = (ngx_timeofday())->msec;
-  }
-  
-  if(*spl->channel_status != READY || !*spl->channel_buffer_complete) {
-    //DBG("%p wanted to fetch msg %V, but channel %V not ready or buffer not complete", spool, msgid_to_str(&spool->id), spl->chid);
-    spool->msg_status = MSG_CHANNEL_NOTREADY;
-    //these will be fetch when channel is ready or when buffer is complete
-    return NGX_DECLINED;
-  }
-  
-  DBG("%p fetch msg %V for channel %V", spool, msgid_to_str(&spool->id), spl->chid);
-  data = ngx_alloc(sizeof(*data), ngx_cycle->log); //correctness over efficiency (at first).
-  //TODO: optimize this alloc away
-  
-  assert(data);
-  
-  data->next = spl->fetchmsg_cb_data_list;
-  if(data->next) {
-    data->next->prev = data;
-  }
-  spl->fetchmsg_cb_data_list = data;
-  data->prev = NULL;
-  
-  nchan_copy_new_msg_id(&data->msgid, &spool->id);
-  data->spooler = spool->spooler;
-  
-  assert(spool->msg == NULL);
-  assert(spool->msg_status == MSG_INVALID);
-  spool->msg_status = MSG_PENDING;
-  if(spl->handlers->get_message_start) {
-    spl->handlers->get_message_start(spl, spl->handlers_privdata);
-  }
-  switch(spl->fetching_strategy) {
-    case NCHAN_SPOOL_FETCH:
-    case NCHAN_SPOOL_FETCH_IGNORE_MSG_NOTFOUND:
-      spool->spooler->store->get_message(spool->spooler->chid, &spool->id, spool->spooler->cf, (callback_pt )spool_fetch_msg_callback, data);
-      break;
-    case NCHAN_SPOOL_PASSTHROUGH:
-      spool_fetch_msg_callback(MSG_EXPECTED, NULL, data);
-      break;
-  }
-  return NGX_OK;
-}
-
-static void spool_sub_dequeue_callback(subscriber_t *sub, void *data) {
-  spooled_subscriber_cleanup_t  *d = (spooled_subscriber_cleanup_t *)data;
-  subscriber_pool_t             *spool = d->spool;
-  
-  DBG("sub %p dequeue callback", sub);
-  
-  assert(sub == d->ssub->sub);
-  spool_remove_subscriber(spool, d->ssub);
-  spool_bubbleup_dequeue_handler(spool, sub, spool->spooler);
-  
-  if(sub->type != INTERNAL && spool->spooler->publish_events) {
-    nchan_maybe_send_channel_event_message(sub->request, SUB_DEQUEUE);
-  }
-}
-
-static ngx_int_t spool_add_subscriber(subscriber_pool_t *self, subscriber_t *sub, uint8_t enqueue) {
-  spooled_subscriber_t       *ssub;
-  ngx_int_t                   rc;
-  ngx_int_t                   internal_sub = sub->type == INTERNAL;
-  
-  ssub = ngx_calloc(sizeof(*ssub), ngx_cycle->log);
-  //DBG("add sub %p to spool %p", sub, self);
-  
-  if(ssub == NULL) {
-    ERR("failed to allocate new sub for spool");
-    return NGX_ERROR;
-  }
-  
-  ssub->next = self->first;
-  ssub->prev = NULL;
-  if(self->first != NULL) {
-    self->first->prev = ssub;
-  }
-  self->first = ssub;
-  self->sub_count++;
-  if(!internal_sub) {
-    self->non_internal_sub_count++;
-  }
-  ssub->dequeue_callback_data.ssub = ssub;
-  ssub->dequeue_callback_data.spool = self;
-  
-  if(enqueue) {
-    if((rc = sub->fn->enqueue(sub)) != NGX_OK) {
-      //enqueue failed. undo everything and get out!
-      self->sub_count --;
-      self->first = ssub->next;
-      if(self->first) {
-        assert(self->first->prev == ssub);
-        self->first->prev = NULL;
-      }
-      if(!internal_sub) {
-        self->non_internal_sub_count--;
-      }
-      ngx_free(ssub);
-      return rc;
-    }
-    else if(sub->type != INTERNAL && self->spooler->publish_events) {
-      nchan_maybe_send_channel_event_message(sub->request, SUB_ENQUEUE);
-    }
-  }
-  
-  sub->fn->set_dequeue_callback(sub, spool_sub_dequeue_callback, &ssub->dequeue_callback_data);
-  ssub->sub = sub;
-  
-  return NGX_OK;
-}
-
-static ngx_int_t spool_remove_subscriber(subscriber_pool_t *self, spooled_subscriber_t *ssub) {
-  assert(ssub->next != ssub);
-  assert(ssub->prev != ssub);
-  spooled_subscriber_t   *prev, *next;
-  prev = ssub->prev;
-  next = ssub->next;
-  if(next) {
-    next->prev = prev;
-  }
-  if(prev) {
-    prev->next = next;
-  }
-  if(self->first == ssub) {
-    self->first = next;
-  }
-  
-  if(ssub->sub->type != INTERNAL) {
-    self->non_internal_sub_count--;
-  }
-  
-  ngx_free(ssub);
-
-  assert(self->sub_count > 0);
-  self->sub_count--;
-  return NGX_OK;
-}
-
-static ngx_int_t spool_respond_general(subscriber_pool_t *self, nchan_msg_t *msg, ngx_int_t code, void *code_data, unsigned notice) {
-  ngx_uint_t                  numsubs[SUBSCRIBER_TYPES];
-  spooled_subscriber_t       *nsub, *nnext;
-  subscriber_t               *sub;
-  
-  //channel_spooler_t          *spl = self->spooler;
-  //validate_spooler(spl, "before respond_general");
-  //nchan_msg_id_t             unid;
-  //nchan_msg_id_t             unprevid;
-  //int8_t                     i, max;
-  
-  ngx_memzero(numsubs, sizeof(numsubs));
-  //self->generation++;
-  
-  DBG("spool %p (%V) (subs: %i) respond with msg %p or code %i", self, msgid_to_str(&self->id), self->sub_count, msg, code);
-  if(msg) {
-    DBG("msgid: %V", msgid_to_str(&msg->id));
-    DBG("prev: %V", msgid_to_str(&msg->prev_id));
-  }
-  
-  /*
-  if(msg && msg->prev_id.time > 0 && msg->id.tagcount > 1) {
-    assert(msg->shared == 0);
-    max = msg->id.tagcount;
-    for(i=0; i< max; i++) {
-      unid.tag[i] =     msg->id.tag[i];
-      unprevid.tag[i] = msg->prev_id.tag[i];
-      if(unid.tag[i] == -1)     msg->id.tag[i]   =    self->id.tag[i];
-      if(unprevid.tag[i] == -1) msg->prev_id.tag[i] = self->id.tag[i];
-    }
-  }
-  */
-  
-  //uint8_t publish_events = self->spooler->publish_events;
-  
-  for(nsub = self->first; nsub != NULL; nsub = nnext) {
-    sub = nsub->sub;
-    nnext = nsub->next;
-    
-    if(msg) {
-      //self->responded_count++;
-      sub->fn->respond_message(sub, msg);
-    }
-    else if(!notice) {
-      //self->responded_count++;
-      sub->fn->respond_status(sub, code, code_data, NULL);
-    }
-    else {
-      sub->fn->notify(sub, code, code_data);
-    }
-  }
-  
-  //if(!notice && code != NGX_HTTP_NO_CONTENT) self->responded_count++;
-  //assert(validate_spooler(spl, "after respond_general"));
-  return NGX_OK;
-}
-
-/////////// SPOOLER - container of several spools //////////
-
-channel_spooler_t *create_spooler() {
-  channel_spooler_t  *spooler;
-  if((spooler = ngx_alloc(sizeof(*spooler), ngx_cycle->log))==NULL) {
-    ERR("Can't allocate spooler");
-    return NULL;
-  }
-  return spooler;
-}
-
-static void spool_bubbleup_dequeue_handler(subscriber_pool_t *spool, subscriber_t *sub, channel_spooler_t *spl) {
-  //bubble on up, yeah
-  channel_spooler_handlers_t *h = spl->handlers;
-  if(h->dequeue) {
-    h->dequeue(spl, sub, spl->handlers_privdata);
-  }
-  else if (h->bulk_dequeue){
-    h->bulk_dequeue(spl, sub->type, 1, spl->handlers_privdata);
-  }
-  else {
-    ERR("Neither dequeue_handler not bulk_dequeue_handler present in spooler for spool sub dequeue");
-  }
-}
-
-/*
-static void spool_bubbleup_bulk_dequeue_handler(subscriber_pool_t *spool, subscriber_type_t type, ngx_int_t count, channel_spooler_t *spl) {
-  //bubble on up, yeah
-  if(spl->handlers->bulk_dequeue) {
-    spl->handlers->bulk_dequeue(spl, type, count, spl->handlers_privdata);
-  }
-}
-*/
-
-static ngx_int_t spooler_add_subscriber(channel_spooler_t *self, subscriber_t *sub) {
-  nchan_msg_id_t          *msgid = &sub->last_msgid;
-  subscriber_pool_t       *spool;
-  subscriber_type_t        subtype;
-  ngx_int_t                rc;
-  
-  if(self->want_to_stop) {
-    ERR("Not accepting new subscribers right now. want to stop.");
-    return NGX_ERROR;
-  }
-  
-  //validate_spooler(self, "before add_subscriber");
-  
-  spool = get_spool(self, msgid);
-  
-  if(self->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
-    assert(spool->id.time == NCHAN_NEWEST_MSGID_TIME);
-  }
-  
-  if(spool == NULL) {
-    return NGX_ERROR;
-  }
-
-  subtype = sub->type;
-  
-  if((rc = spool_add_subscriber(spool, sub, 1)) != NGX_OK) {
-    DBG("couldn't add subscriber to spool %p", spool);
-    return rc;
-  }
-  self->handlers->add(self, sub, self->handlers_privdata);
-  
-  switch(spool->msg_status) {
-    case MSG_FOUND:
-      assert(spool->msg);
-      spool_respond_general(spool, spool->msg, 0, NULL, 0);
-      break;
-    
-    case MSG_INVALID:
-      assert(spool->msg == NULL);
-      spool_fetch_msg(spool);
-      break;
-    
-    case MSG_CHANNEL_NOTREADY:
-    case MSG_PENDING:
-      //nothing to do
-      break;
-      
-    case MSG_EXPECTED:
-      //notify subscriber
-      sub->fn->respond_status(sub, NGX_HTTP_NO_CONTENT, NULL, NULL);
-      break;
-      
-    case MSG_EXPIRED:
-    case MSG_NOTFOUND:
-    case MSG_ERROR:
-      //shouldn't happen
-      
-      assert(0);
-  }
-  
-  if(self->handlers->use != NULL && subtype != INTERNAL) {
-    self->handlers->use(self, self->handlers_privdata);
-  }
-  
-  //validate_spooler(self, "after add_subscriber");
-  
-  return NGX_OK;
-}
-
-
-static ngx_int_t spool_transfer_subscribers(subscriber_pool_t *spool, subscriber_pool_t *newspool, uint8_t update_subscriber_last_msgid) {
-  ngx_int_t               count = 0;
-  subscriber_t           *sub;
-  spooled_subscriber_t   *cur;
-  channel_spooler_t      *spl = spool->spooler;
-  
-  assert(spl == newspool->spooler);
-  
-  if(spool == NULL || newspool == NULL) {
-    ERR("failed to transfer spool subscribers");
-    return 0;
-  }
-  for(cur = spool->first; cur != NULL; cur = spool->first) {
-    sub = cur->sub;
-    spool_remove_subscriber(spool, cur);
-    if(update_subscriber_last_msgid) {
-      sub->last_msgid=newspool->id;
-    }
-    if(spool_add_subscriber(newspool, sub, 0) == NGX_OK) {
-      count++;
-    }
-  }
-  
-  return count;
-}
-
-typedef struct spool_collect_overflow_s spool_collect_overflow_t;
-struct spool_collect_overflow_s {
-  subscriber_pool_t                *spool;
-  struct spool_collect_overflow_s  *next;
-};// spool_collect_overflow_t;
-
-#define SPOOLER_RESPOND_SPOOLARRAY_SIZE 32
-
-typedef struct {
-  nchan_msg_id_t             min;
-  nchan_msg_id_t             max;
-  uint8_t                    multi;
-  ngx_int_t                  n;
-  nchan_msg_t               *msg;
-  subscriber_pool_t         *spools[SPOOLER_RESPOND_SPOOLARRAY_SIZE];
-  spool_collect_overflow_t  *overflow;
-} spooler_respond_data_t;
-
-
-static rbtree_walk_direction_t compare_msgid_onetag_range(nchan_msg_id_t *min, nchan_msg_id_t *max, nchan_msg_id_t *id) {
-  
-  assert(min->tagcount == max->tagcount);
-  assert(max->tagcount == id->tagcount);
-  assert(id->tagcount == 1);
-  
-  if(min->time < id->time || (min->time == id->time && min->tag.fixed[0] <= id->tag.fixed[0])) {
-    if(max->time > id->time || (max->time == id->time && max->tag.fixed[0] > id->tag.fixed[0])) {
-      //inrange
-      return RBTREE_WALK_LEFT_RIGHT;
-    }
-    else {
-      //too large
-      return RBTREE_WALK_LEFT;
-    }
-  }
-  else {
-    //too small
-    return RBTREE_WALK_RIGHT;
-  } 
-}
-
-static int8_t compare_msgid_time(nchan_msg_id_t *min, nchan_msg_id_t *max, nchan_msg_id_t *cur) {
-  if(min->time <= cur->time) {
-    if(max->time >= cur->time) {
-      return 0;
-    }
-    else {
-      return 1;
-    }
-  }
-  else {
-    return -1;
-  }
-}
-
-
-static void spoolcollector_addspool(spooler_respond_data_t *data, subscriber_pool_t *spool) {
-  spool_collect_overflow_t  *overflow;
-  if(data->n < SPOOLER_RESPOND_SPOOLARRAY_SIZE) {
-    data->spools[data->n] = spool;
-  }
-  else {
-    if((overflow = ngx_alloc(sizeof(*overflow), ngx_cycle->log)) == NULL) {
-      ERR("can't allocate spoolcollector overflow");
-      return;
-    }
-    overflow->next = data->overflow;
-    overflow->spool = spool;
-    data->overflow = overflow;
-  }
-  data->n++;
-}
-
-static subscriber_pool_t *spoolcollector_unwind_nextspool(spooler_respond_data_t *data) {
-  spool_collect_overflow_t  *overflow;
-  subscriber_pool_t         *spool;
-  if(data->n > SPOOLER_RESPOND_SPOOLARRAY_SIZE) {
-    overflow = data->overflow;
-    spool = overflow->spool;
-    data->overflow = overflow->next;
-    ngx_free(overflow);
-    data->n--;
-    return spool;
-  }
-  else if(data->n > 0) {
-    return data->spools[--data->n];
-  }
-  else {
-    return NULL;
-  }
-}
-
-
-static rbtree_walk_direction_t collect_spool_range_callback(rbtree_seed_t *seed, subscriber_pool_t *spool, spooler_respond_data_t *data) {
-  rbtree_walk_direction_t  dir;
-  uint8_t multi_count = data->multi;
-  
-  if(multi_count <= 1) {
-    dir = compare_msgid_onetag_range(&data->min, &data->max, &spool->id);
-    if(dir == RBTREE_WALK_LEFT_RIGHT) {
-      spoolcollector_addspool(data, spool);
-    }
-    return dir;
-  }
-  else {
-    int tc = compare_msgid_time(&data->min, &data->max, &spool->id);
-    if(tc < 0) {
-      return RBTREE_WALK_RIGHT;
-    }
-    else if(tc > 0) {
-      return RBTREE_WALK_LEFT;
-    }
-    else {
-      time_t      timmin = data->min.time, timmax = data->max.time, timcur = spool->id.time;
-      
-      int         max_cmp = -1, min_cmp = -1;
-      
-      if( timcur > timmin && timcur < timmax) {
-        spoolcollector_addspool(data, spool);
-      }
-      else if(timcur == timmax && timcur == timmin) {
-        if( nchan_compare_msgid_tags(&spool->id, &data->max) < 0
-         && nchan_compare_msgid_tags(&spool->id, &data->min) >= 0 ) 
-        {
-          spoolcollector_addspool(data, spool);
-        } 
-      }
-      else if((timcur == timmax && (max_cmp = nchan_compare_msgid_tags(&spool->id, &data->max)) < 0) 
-           || (timcur == timmin && (min_cmp = nchan_compare_msgid_tags(&spool->id, &data->min)) >= 0))
-      {
-        spoolcollector_addspool(data, spool);
-      }
-      else if( timcur > timmin && timcur < timmax) {
-        spoolcollector_addspool(data, spool);
-      }
-      /*
-      else {
-        ERR("time_min: %i, time_cur: %i, time_max: %i", timmin, timcur, timmax);
-      }
-      */
-      
-      return RBTREE_WALK_LEFT_RIGHT;
-    }
-  }
-}
-
-static ngx_int_t spooler_respond_status(channel_spooler_t *self, nchan_msg_id_t *id, ngx_int_t status_code, ngx_str_t *status_line) {
-  subscriber_pool_t         *spool = find_spool(self, id);
-  //validate_spooler(self, "before respond_status");
-  if(spool) {
-    if(status_code == NGX_HTTP_NO_CONTENT) {
-      spool->msg_status = MSG_EXPECTED;
-    }
-    spool_respond_general(spool, NULL, status_code, status_line, 0);
-    destroy_spool(spool);
-  }
-  //validate_spooler(self, "after respond_status");
-  return NGX_OK;
-}
-
-static ngx_int_t spooler_respond_message(channel_spooler_t *self, nchan_msg_t *msg) {
-  spooler_respond_data_t     srdata;
-  subscriber_pool_t         *spool;
-  ngx_int_t                  responded_subs = 0;
-  
-  
-  if(self->fetching_strategy != NCHAN_SPOOL_PASSTHROUGH) {
-    srdata.min = msg->prev_id;
-    srdata.max = msg->id;
-    srdata.multi = msg->id.tagcount;
-    srdata.overflow = NULL;
-    srdata.msg = msg;
-    srdata.n = 0;
-    
-    //spooler_print_contents(self);
-    
-    //find all spools between msg->prev_id and msg->id
-    rbtree_conditional_walk(&self->spoolseed, (rbtree_walk_conditional_callback_pt )collect_spool_range_callback, &srdata);
-    /*
-    if(srdata.n == 0) {
-      DBG("no spools in range %V -- ", msgid_to_str(&msg->prev_id));
-      DBG(" -- %V", msgid_to_str(&msg->id));
-    }
-    */
-    while((spool = spoolcollector_unwind_nextspool(&srdata)) != NULL) {
-      responded_subs += spool->sub_count;
-      if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
-        assert(spool->id.tag.allocd != msg->id.tag.allocd);
-      }
-      spool_respond_general(spool, msg, 0, NULL, 0);
-      if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
-        assert(spool->id.tag.allocd != msg->id.tag.allocd);
-      }
-      spool_nextmsg(spool, &msg->id);
-    }
-  }
-  spool = get_spool(self, &latest_msg_id);
-  if(spool->sub_count > 0 && *self->channel_buffer_complete) {
-    spool_respond_general(spool, msg, 0, NULL, 0);
-    spool_nextmsg(spool, &msg->id);
-  }
-
-  nchan_copy_msg_id(&self->prev_msg_id, &msg->id, NULL);
-  
-  return NGX_OK;
-}
-
-typedef struct {
-  channel_spooler_t *spl;
-  nchan_msg_t       *msg;
-  ngx_int_t          code;
-  void              *code_data;
-  unsigned           notice:1;
-} spooler_respond_generic_data_t;
-
-static ngx_int_t spooler_respond_rbtree_node_spool(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
-  spooler_respond_generic_data_t  *d = data;
-  
-  return spool_respond_general(spool, d->msg, d->code, d->code_data, d->notice);
-}
-
-static ngx_int_t spooler_respond_generic(channel_spooler_t *self, nchan_msg_t *msg, ngx_int_t code, void *code_data, unsigned notice) {
-  spooler_respond_generic_data_t  data = {self, msg, code, code_data, notice};
-  rbtree_walk(&self->spoolseed, (rbtree_walk_callback_pt )spooler_respond_rbtree_node_spool, &data);
-  spool_respond_general(&self->current_msg_spool, data.msg, data.code, data.code_data, notice);
-  return NGX_OK;
-}
-
-static ngx_int_t spooler_broadcast_status(channel_spooler_t *self, ngx_int_t code, const ngx_str_t *line) {
-  return spooler_respond_generic(self, NULL, code, (void *)line, 0);
-}
-
-static ngx_int_t spooler_broadcast_notice(channel_spooler_t *self, ngx_int_t code, void *data) {
-  return spooler_respond_generic(self, NULL, code, data, 1);
-}
-
-static ngx_int_t spooler_spool_dequeue_all(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
-  spooled_subscriber_t *cur;
-  
-  for(cur = spool->first; cur != NULL; cur = cur->next) {
-    cur->sub->dequeue_after_response = 1;  
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t spooler_prepare_to_stop(channel_spooler_t *spl) {
-  rbtree_walk(&spl->spoolseed, (rbtree_walk_callback_pt )spooler_spool_dequeue_all, (void *)spl);
-  spl->want_to_stop = 1;
-  return NGX_OK;
-}
-
-
-
-static void *spool_rbtree_node_id(void *data) {
-  return &((subscriber_pool_t *)data)->id;
-}
-
-static uint32_t spool_rbtree_bucketer(void *vid) {
-  nchan_msg_id_t   *id = (nchan_msg_id_t *)vid;
-  return (uint32_t )id->time;
-}
-
-static ngx_int_t spool_rbtree_compare(void *v1, void *v2) {
-  nchan_msg_id_t   *id1 = (nchan_msg_id_t *)v1;
-  nchan_msg_id_t   *id2 = (nchan_msg_id_t *)v2;
-  time_t            t1 = id1->time;
-  time_t            t2 = id2->time;
-  ngx_int_t         tag1;
-  ngx_int_t         tag2;
-  
-  if(t1 > t2) {
-    return 1;
-  }
-  else if (t1 < t2) {
-    return -1;
-  }
-  else {
-    uint16_t   i, max1 = id1->tagcount, max2 = id2->tagcount;
-    uint16_t   max = max1 > max2 ? max1 : max2;
-    int16_t   *tags1, *tags2;
-    
-    tags1 = max1 <= NCHAN_FIXED_MULTITAG_MAX ? id1->tag.fixed : id1->tag.allocd;
-    tags2 = max2 <= NCHAN_FIXED_MULTITAG_MAX ? id2->tag.fixed : id2->tag.allocd;
-    
-    for(i=0; i < max; i++) {
-      tag1 = i < max1 ? tags1[i] : -1;
-      tag2 = i < max2 ? tags2[i] : -1;
-      if(tag1 > tag2) {
-        return 1;
-      }
-      else if(tag1 < tag2) {
-        return -1;
-      }
-    }
-    return 0;
-  }
-}
-
-static int its_time_for_a_spooling_filter(void *data) {
-  subscriber_pool_t *spool = data;
-  if(spool->msg_status == MSG_CHANNEL_NOTREADY || spool->msg_status == MSG_INVALID) {
-    spool_reserve(spool);
-    return 1;
-  }
-  else {
-    return 0;
-  }
-}
-
-static ngx_int_t its_time_for_a_spooling(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
-  ngx_int_t       rc = NGX_OK;
-  //validate_spool(spool);
-  if(spool->msg_status == MSG_CHANNEL_NOTREADY || spool->msg_status == MSG_INVALID) {
-    //TODO: maybe don't fetch spool with zero subs?
-    spool->msg_status = MSG_INVALID;
-    rc = spool_fetch_msg(spool);
-    assert(rc == NGX_OK || rc == NGX_DONE || NGX_DECLINED);
-  }
-  spool_release(spool);
-  return rc;
-}
-
-static ngx_int_t spooler_channel_status_changed(channel_spooler_t *self) {
-  switch(*self->channel_status) {
-    case READY:
-      rbtree_walk_writesafe(&self->spoolseed, its_time_for_a_spooling_filter, (rbtree_walk_callback_pt )its_time_for_a_spooling, NULL); 
-      break;
-      
-    default:
-      //do nothing
-      break;
-  };
-  return NGX_OK;
-}
-
-
-static ngx_int_t spooler_print_contents_callback(rbtree_seed_t *seed, subscriber_pool_t *spool, channel_spooler_t *spl) {
-  spooled_subscriber_t       *cur;
-  
-  ERR("  spool %p id %V", spool, msgid_to_str(&spool->id));
-  for(cur = spool->first; cur != NULL; cur = cur->next) {
-    ERR("    %V", cur->sub->name);
-  }
-  
-  return NGX_OK;
-}
-
-ngx_int_t spooler_print_contents(channel_spooler_t *spl) {
-  ERR("spooler for channel %V", spl->chid);
-  spooler_print_contents_callback(NULL, &spl->current_msg_spool, spl);
-  rbtree_walk_incr(&spl->spoolseed, (rbtree_walk_callback_pt )spooler_print_contents_callback, spl);
-  return NGX_OK;
-}
-
-
-
-static int spooler_catch_up_filter(void *data) {
-  nchan_msg_status_t  status =  ((subscriber_pool_t *)data)->msg_status;
-  return status == MSG_EXPECTED || status == MSG_PENDING;
-}
-
-static ngx_int_t spooler_catch_up_callback(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
-  spool->msg_status = MSG_INVALID;
-  spool_fetch_msg(spool);
-  return NGX_OK;
-}
-
-ngx_int_t spooler_catch_up(channel_spooler_t *spl) {
-  rbtree_walk_writesafe(&spl->spoolseed, spooler_catch_up_filter, (rbtree_walk_callback_pt )spooler_catch_up_callback, NULL); 
-  return NGX_OK;
-}
-
-
-static channel_spooler_fn_t  spooler_fn = {
-  spooler_add_subscriber,
-  spooler_channel_status_changed,
-  spooler_respond_message,
-  spooler_respond_status,
-  spooler_broadcast_status,
-  spooler_broadcast_notice,
-  spooler_prepare_to_stop
-};
-
-channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, uint8_t *channel_buffer_complete, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata) {
-  if(!spl->running) {
-    ngx_memzero(spl, sizeof(*spl));
-    rbtree_init(&spl->spoolseed, "spooler msg_id tree", spool_rbtree_node_id, spool_rbtree_bucketer, spool_rbtree_compare);
-    
-    spl->fn=&spooler_fn;
-    //spl->prev_msg_id.time=0;
-    //spl->prev_msg_id.tag=0;
-    
-    DBG("start SPOOLER %p", *spl);
-    
-    spl->chid = chid;
-    spl->store = store;
-    
-    spl->channel_status = channel_status;
-    spl->channel_buffer_complete = channel_buffer_complete;
-    
-    spl->running = 1;
-    //spl->want_to_stop = 0;
-    spl->publish_events = 1;
-    spl->fetching_strategy = fetching_strategy;
-    
-    init_spool(spl, &spl->current_msg_spool, &latest_msg_id);
-    spl->current_msg_spool.msg_status = MSG_EXPECTED;
-    
-    spl->handlers = handlers;
-    spl->handlers_privdata = handlers_privdata;
-    
-    spl->cf = cf;
-    
-    return spl;
-  }
-  else {
-    ERR("looks like spooler is already running. make sure spooler->running=0 before starting.");
-    assert(0);
-    return NULL;
-  }
-}
-
-static ngx_int_t remove_spool(subscriber_pool_t *spool) {
-  channel_spooler_t    *spl = spool->spooler;
-  ngx_rbtree_node_t    *node = rbtree_node_from_data(spool);
-  
-  assert(spool->reserved == 0);
-  DBG("remove spool node %p", node);
-  
-  assert(spool->spooler->running);
-  
-  if(spool->fetchmsg_ev.timer_set) {
-    ngx_del_timer(&spool->fetchmsg_ev);
-  }
-  
-  nchan_free_msg_id(&spool->id);
-  rbtree_remove_node(&spl->spoolseed, rbtree_node_from_data(spool));
-  
-  //assert((node = rbtree_find_node(&spl->spoolseed, &spool->id)) == NULL);
-  //double-check that it's gone 
-  
-  return NGX_OK;
-}
-
-static ngx_int_t destroy_spool(subscriber_pool_t *spool) {
-  rbtree_seed_t         *seed = &spool->spooler->spoolseed;
-  spooled_subscriber_t  *ssub, *ssub_next;
-  subscriber_t          *sub;
-  ngx_rbtree_node_t     *node = rbtree_node_from_data(spool);
-  
-  remove_spool(spool);
-  
-  DBG("destroy spool node %p", node);
-  
-  for(ssub = spool->first; ssub!=NULL; ssub = ssub_next) {
-    sub = ssub->sub;
-    ssub_next = ssub->next;
-    //DBG("dequeue sub %p in spool %p", sub, spool);
-    sub->fn->dequeue(sub);
-  }
-  assert(spool->sub_count == 0);
-  assert(spool->first == NULL);
-  
-  //ngx_memset(spool, 0x42, sizeof(*spool)); //debug
-  
-  rbtree_destroy_node(seed, node);
-  return NGX_OK;
-}
-
-ngx_int_t stop_spooler(channel_spooler_t *spl, uint8_t dequeue_subscribers) {
-  ngx_rbtree_node_t    *cur, *sentinel;
-  spooler_event_ll_t   *ecur, *ecur_next;
-  subscriber_pool_t    *spool;
-  rbtree_seed_t        *seed = &spl->spoolseed;
-  ngx_rbtree_t         *tree = &seed->tree;
-  ngx_int_t             n=0;
-  sentinel = tree->sentinel;
-  
-  fetchmsg_data_t      *dcur;
-#if NCHAN_RBTREE_DBG
-  ngx_int_t active_before = seed->active_nodes, allocd_before = seed->active_nodes;
-#endif
-  if(spl->running) {
-    
-    for(ecur = spl->spooler_dependent_events; ecur != NULL; ecur = ecur_next) {
-      ecur_next = ecur->next;
-      if(ecur->cancel) {
-        ecur->cancel(ecur->ev.data);
-      }
-      ngx_event_del_timer(&ecur->ev);
-      
-      ngx_free(ecur);
-    }
-    
-    for(cur = tree->root; cur != NULL && cur != sentinel; cur = tree->root) {
-      spool = (subscriber_pool_t *)rbtree_data_from_node(cur);
-      if(dequeue_subscribers) {
-        destroy_spool(spool);
-      }
-      else {
-        remove_spool(spool);
-        rbtree_destroy_node(seed, cur);
-      }
-      n++;
-    }
-    
-    for(dcur = spl->fetchmsg_cb_data_list; dcur != NULL; dcur = dcur->next) {
-      dcur->spooler = NULL;
-    }
-    
-    DBG("stopped %i spools in SPOOLER %p", n, *spl);
-  }
-  else {
-    DBG("SPOOLER %p not running", *spl);
-  }
-#if NCHAN_RBTREE_DBG
-  assert(active_before - n == 0);
-  assert(allocd_before - n == 0);
-  assert(seed->active_nodes == 0);
-  assert(seed->allocd_nodes == 0);
-#endif
-  nchan_free_msg_id(&spl->prev_msg_id);
-  spl->running = 0;
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/store/spool.h b/debian/modules/nchan/src/store/spool.h
deleted file mode 100644
index 88e8d1a..0000000
--- a/debian/modules/nchan/src/store/spool.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef SPOOL_HEADER
-#define SPOOL_HEADER
-
-#include <util/nchan_rbtree.h>
-
-typedef struct spooled_subscriber_s spooled_subscriber_t;
-typedef struct subscriber_pool_s subscriber_pool_t;
-
-typedef struct {
-  spooled_subscriber_t  *ssub;
-  subscriber_pool_t     *spool;
-} spooled_subscriber_cleanup_t;
-  
-struct spooled_subscriber_s {
-  ngx_uint_t                    id; //could be useful later
-  subscriber_t                 *sub;
-  spooled_subscriber_cleanup_t  dequeue_callback_data;
-  spooled_subscriber_t         *next;
-  spooled_subscriber_t         *prev;
-}; //spooled_subscriber_t
-
-
-struct subscriber_pool_s {
-  nchan_msg_id_t              id;
-  nchan_msg_t                *msg;
-  nchan_msg_status_t          msg_status;
-  spooled_subscriber_t       *first;
-  
-  //stack overflow prevention
-  ngx_uint_t                  fetchmsg_prev_msec;
-  ngx_int_t                   fetchmsg_current_count;
-  ngx_event_t                 fetchmsg_ev;
-  
-  ngx_uint_t                  sub_count;
-  ngx_uint_t                  non_internal_sub_count;
-  //ngx_uint_t                  generation;
-  //ngx_uint_t                  responded_count;
-  uint8_t                     reserved;
-  struct channel_spooler_s   *spooler;
-}; // subscriber_pool_t
-
-typedef struct channel_spooler_s channel_spooler_t; //holds many different spools
-typedef struct channel_spooler_handlers_s channel_spooler_handlers_t; //spooler callbacks table
-
-typedef struct {
-  ngx_int_t            (*add)(channel_spooler_t *self, subscriber_t *sub);
-  ngx_int_t            (*handle_channel_status_change)(channel_spooler_t *self);
-  ngx_int_t            (*respond_message)(channel_spooler_t *self, nchan_msg_t *msg);
-  ngx_int_t            (*respond_status)(channel_spooler_t *self, nchan_msg_id_t *id, ngx_int_t status_code, ngx_str_t *status_line);
-  ngx_int_t            (*broadcast_status)(channel_spooler_t *self, ngx_int_t status_code, const ngx_str_t *status_line);
-  ngx_int_t            (*broadcast_notice)(channel_spooler_t *self, ngx_int_t notice_code, void *data);
-  ngx_int_t            (*prepare_to_stop)(channel_spooler_t *self);
-} channel_spooler_fn_t;
-
-typedef enum {NCHAN_SPOOL_FETCH, NCHAN_SPOOL_FETCH_IGNORE_MSG_NOTFOUND, NCHAN_SPOOL_PASSTHROUGH} spooler_fetching_strategy_t;
-
-
-typedef struct fetchmsg_data_s fetchmsg_data_t;
-struct fetchmsg_data_s {
-  channel_spooler_t   *spooler;
-  nchan_msg_id_t       msgid;
-  fetchmsg_data_t     *next;
-  fetchmsg_data_t     *prev;
-};
-
-typedef struct spooler_event_ll_s spooler_event_ll_t;
-struct spooler_event_ll_s {
-  spooler_event_ll_t   *prev;
-  ngx_event_t           ev;
-  void                (*callback)(void *);
-  void                (*cancel)(void *);
-  channel_spooler_t    *spooler;
-  spooler_event_ll_t   *next;
-};
-
-struct channel_spooler_s {
-  rbtree_seed_t               spoolseed;
-  subscriber_pool_t           current_msg_spool;
-  nchan_msg_id_t              prev_msg_id;
-  ngx_uint_t                  responded_count;
-  ngx_str_t                  *chid;
-  chanhead_pubsub_status_t   *channel_status;
-  uint8_t                    *channel_buffer_complete;
-  nchan_store_t              *store;
-  nchan_loc_conf_t           *cf;
-  channel_spooler_fn_t       *fn;
-  channel_spooler_handlers_t *handlers;
-  void                       *handlers_privdata;
-  fetchmsg_data_t            *fetchmsg_cb_data_list;
-  spooler_event_ll_t         *spooler_dependent_events;
-  spooler_fetching_strategy_t fetching_strategy;
-  unsigned                    publish_events:1;
-  unsigned                    running:1;
-  unsigned                    want_to_stop:1;
-  
-};
-
-struct channel_spooler_handlers_s {
-  void                        (*add)(channel_spooler_t *, subscriber_t *, void *);
-  void                        (*dequeue)(channel_spooler_t *, subscriber_t *, void *);
-  void                        (*bulk_dequeue)(channel_spooler_t *, subscriber_type_t, ngx_int_t, void *); //called after dequeueing 1 or many subs
-  void                        (*use)(channel_spooler_t *, void *);
-  void                        (*get_message_start)(channel_spooler_t *, void *);
-  void                        (*get_message_finish)(channel_spooler_t *, void *);
-};
-
-channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, uint8_t *channel_buffer_complete, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata);
-ngx_int_t stop_spooler(channel_spooler_t *spl, uint8_t dequeue_subscribers);
-
-ngx_int_t spooler_catch_up(channel_spooler_t *spl);
-
-ngx_int_t spooler_print_contents(channel_spooler_t *spl);
-
-ngx_event_t *spooler_add_timer(channel_spooler_t *spl, ngx_msec_t timeout, void (*cb)(void *), void (*cancel)(void *), void *pd);
-
-
-#endif  /*SPOOL_HEADER*/
diff --git a/debian/modules/nchan/src/store/store_common.c b/debian/modules/nchan/src/store/store_common.c
deleted file mode 100644
index 873ae73..0000000
--- a/debian/modules/nchan/src/store/store_common.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <nchan_module.h>
-
-void nchan_exit_notice_about_remaining_things(char *thing, char *where, ngx_int_t num) {
-  if(num > 0) {
-    nchan_log_notice("%i %s%s remain%s %sat exit", num, thing, num == 1 ? "" : "s", num == 1 ? "s" : "", where == NULL ? "" : where);
-  }
-}
diff --git a/debian/modules/nchan/src/store/store_common.h b/debian/modules/nchan/src/store/store_common.h
deleted file mode 100644
index c5335de..0000000
--- a/debian/modules/nchan/src/store/store_common.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#undef uthash_malloc
-#undef uthash_free
-#define uthash_malloc(sz) ngx_alloc(sz, ngx_cycle->log)
-#define uthash_free(ptr,sz) ngx_free(ptr)
-
-#define STR(buf) (buf)->data, (buf)->len
-#define BUF(buf) (buf)->pos, ((buf)->last - (buf)->pos)
-
-#define NCHAN_DEFAULT_SUBSCRIBER_POOL_SIZE (5 * 1024)
-#define NCHAN_DEFAULT_CHANHEAD_CLEANUP_INTERVAL 1000
-
-void nchan_exit_notice_about_remaining_things(char *thing, char *where, ngx_int_t num);
diff --git a/debian/modules/nchan/src/subscribers/benchmark.c b/debian/modules/nchan/src/subscribers/benchmark.c
deleted file mode 100644
index 9b97870..0000000
--- a/debian/modules/nchan/src/subscribers/benchmark.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include "internal.h"
-#include "benchmark.h"
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:BENCHMARK:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:BENCHMARK:" fmt, ##arg)
-
-typedef struct {
-  subscriber_t        *sub;
-  nchan_benchmark_t   *bench;
-} sub_data_t;
-
-static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
-  if(nchan_benchmark_active()) {
-    ngx_atomic_fetch_add(d->bench->shared.subscribers_enqueued, 1);
-  }
-  nchan_update_stub_status(subscribers, 1); //needs to be done manually for INTERNAL subs
-  return NGX_OK;
-}
-
-static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
-  if(nchan_benchmark_active()) {
-    ngx_atomic_fetch_add(d->bench->shared.subscribers_dequeued, 1);
-  }
-  nchan_update_stub_status(subscribers, -1); //needs to be done manually for INTERNAL subs
-  return NGX_OK;
-}
-
-static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
-  nchan_msg_t *msg = ptr;
-  uint64_t msec = nchan_benchmark_message_delivery_msec(msg);
-  if(nchan_benchmark_active()) {
-    hdr_record_value(d->bench->data.msg_delivery_latency, msec);
-    d->bench->data.msg_received++;
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
-  return NGX_OK;
-}
-
-static ngx_int_t sub_respond_notice(ngx_int_t notice, void *ptr, sub_data_t *d) {
-  return NGX_OK;
-}
-
-static ngx_str_t  sub_name = ngx_string("benchmark");
-
-subscriber_t *benchmark_subscriber_create(nchan_benchmark_t *bench) {
-  static  nchan_msg_id_t      newest_msgid = NCHAN_NEWEST_MSGID;
-  sub_data_t                 *d;
-  subscriber_t               *sub;
-  nchan_loc_conf_t           *cf = bench->loc_conf;
-  struct timeval tv;
-  
-  sub = internal_subscriber_create_init(&sub_name, cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_respond_notice, NULL);
-  
-  sub->last_msgid = newest_msgid;
-  sub->destroy_after_dequeue = 1;
-  d->sub = sub;
-  d->bench = bench;
-  ngx_gettimeofday(&tv);
-  
-  
-  DBG("%p benchmark subscriber created with privdata %p", sub, d);
-  return sub;
-}
diff --git a/debian/modules/nchan/src/subscribers/benchmark.h b/debian/modules/nchan/src/subscribers/benchmark.h
deleted file mode 100644
index dcb52c9..0000000
--- a/debian/modules/nchan/src/subscribers/benchmark.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <util/nchan_benchmark.h>
-
-subscriber_t *benchmark_subscriber_create(nchan_benchmark_t *bench);
diff --git a/debian/modules/nchan/src/subscribers/common.c b/debian/modules/nchan/src/subscribers/common.c
deleted file mode 100644
index c165334..0000000
--- a/debian/modules/nchan/src/subscribers/common.c
+++ /dev/null
@@ -1,456 +0,0 @@
-#include <nchan_module.h>
-#include <assert.h>
-#include "common.h"
-//#include <util/nchan_fake_request.h>
-#include <util/nchan_subrequest.h>
-
-#include <util/nchan_fake_request.h>
-
-#if FAKESHARD
-#include <store/memory/store.h>
-#endif
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:COMMON:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:COMMON:" fmt, ##arg)
-
-typedef struct {
-  subscriber_t       *sub;
-  ngx_str_t          *ch_id;
-  nchan_fakereq_subrequest_data_t *subrequest;
-} nchan_subscribe_auth_request_data_t;
-
-static ngx_int_t subscriber_authorize_callback(ngx_int_t rc, ngx_http_request_t *sr, void *data) {
-  nchan_subscribe_auth_request_data_t *d = data;
-  subscriber_t                        *sub = d->sub;
-  
-  if(sub->status == DEAD) {
-    nchan_requestmachine_request_cleanup_manual(d->subrequest);
-    sub->fn->release(d->sub, 0);
-  }
-  else if (rc == NGX_HTTP_CLIENT_CLOSED_REQUEST) {
-    //this shouldn't happen, but if it does, no big deal
-    nchan_requestmachine_request_cleanup_manual(d->subrequest);
-    sub->fn->release(d->sub, 1);
-    sub->fn->respond_status(sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL); //couldn't reach upstream
-  }
-  else if(rc == NGX_OK) {
-    ngx_int_t        code = sr->headers_out.status;
-    sub->fn->release(sub, 1);
-    if(code >= 200 && code <299) {
-      nchan_requestmachine_request_cleanup_manual(d->subrequest);
-      nchan_subscriber_subscribe(sub, d->ch_id);
-    }
-    else {
-      //forbidden, but with some data to forward to the subscriber
-      ngx_http_request_t       *r = d->sub->request;
-      ngx_str_t                *content_type;
-      ngx_int_t                 content_length;
-      ngx_chain_t              *request_chain = NULL;
-      content_type = (sr->upstream->headers_in.content_type ? &sr->upstream->headers_in.content_type->value : NULL);
-      content_length = nchan_subrequest_content_length(sr);
-      if(content_length > 0) {
-#if nginx_version >= 1013010
-        request_chain = sr->out;
-#else
-        request_chain = sr->upstream->out_bufs;
-#endif
-      }
-      //copy headers
-      ngx_uint_t                       i;
-      ngx_list_part_t                 *part = &sr->headers_out.headers.part;
-      ngx_table_elt_t                 *header= part->elts;
-      for (i = 0; /* void */ ; i++) {
-        if (i >= part->nelts) {
-          if (part->next == NULL) {
-            break;
-          }
-          part = part->next;
-          header = part->elts;
-          i = 0;
-        }
-        if (!nchan_strmatch(&header[i].key, 4, "Content-Type", "Server", "Content-Length", "Connection")) {
-          //copy header to main request's response
-          nchan_add_response_header(r, &header[i].key, &header[i].value);
-        }
-      }
-      
-      if(content_type) {
-        r->headers_out.content_type = *content_type;
-      }
-      r->headers_out.content_length_n = content_length;
-      nchan_requestmachine_request_cleanup_on_request_finalize(d->subrequest, r);
-      sub->fn->respond_status(sub, code, NULL, request_chain); //auto-closes subscriber
-    }
-  }
-  else if(rc >= 500 && rc < 600) {
-    nchan_requestmachine_request_cleanup_manual(d->subrequest);
-    sub->fn->release(d->sub, 1);
-    sub->fn->respond_status(sub, rc, NULL, NULL); //auto-closes subscriber
-  }
-  else {
-    nchan_requestmachine_request_cleanup_manual(d->subrequest);
-    sub->fn->release(d->sub, 1);
-    d->sub->fn->respond_status(d->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL); //auto-closes subscriber
-  }
-  
-  return NGX_OK;
-}
-
-ngx_int_t nchan_subscriber_authorize_subscribe_request(subscriber_t *sub, ngx_str_t *ch_id) {
-  
-  ngx_http_complex_value_t  *authorize_request_url_ccv = sub->cf->authorize_request_url;
-  //DBG("%p (req %p) nchan_subscriber_authorize_subscribe_request", sub, sub->request);
-  
-  if(!authorize_request_url_ccv) {
-    return nchan_subscriber_subscribe(sub, ch_id);
-  }
-  else {
-    nchan_requestmachine_request_params_t param;
-    param.url.cv = authorize_request_url_ccv;
-    param.url_complex = 1;
-    param.pool = ngx_create_pool(1024, ngx_cycle->log);
-    param.body = NULL;
-    param.response_headers_only = 0;
-    param.manual_cleanup = 1;
-    
-    nchan_subscribe_auth_request_data_t  *d = ngx_palloc(param.pool, sizeof(*d));
-    if(!d) {
-      ngx_destroy_pool(param.pool);
-      return NGX_ERROR;
-    }
-    param.cb = (callback_pt )subscriber_authorize_callback;
-    param.pd = d;
-    
-    d->sub = sub;
-    d->ch_id = ch_id;
-    d->subrequest = nchan_subscriber_subrequest(sub, &param);
-    if(d->subrequest != NULL) {
-      sub->fn->reserve(sub);
-      return NGX_OK;
-    }
-    else {
-      ngx_destroy_pool(param.pool);
-      return NGX_ERROR;
-    }
-  }
-}
-
-static ngx_int_t nchan_subscriber_subrequest_fire_and_forget(subscriber_t *sub, ngx_http_complex_value_t *url_cv) {
-  //DBG("%p (req %p) nchan_subscriber_unsubscribe_request", sub, sub->request);
-    
-  nchan_requestmachine_request_params_t param;
-  param.url.cv = url_cv;
-  param.url_complex = 1;
-  param.cb = NULL;
-  param.pd = NULL;
-  param.pool = NULL;
-  param.body = NULL;
-  param.response_headers_only = 1;
-  param.manual_cleanup = 0;
-  
-  return nchan_subscriber_subrequest(sub, &param) == NULL ? NGX_ERROR : NGX_OK;
-}
-
-ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub) {
-  nchan_request_ctx_t         *ctx;
-  //DBG("%p (req %p) nchan_subscriber_unsubscribe_request", sub, sub->request);
-  
-  if(!sub->enable_sub_unsub_callbacks) {
-    return NGX_OK;
-  }
-  
-  ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
-  if(ctx->sent_unsubscribe_request) {
-    return NGX_OK;
-  }
-  
-  ctx->sent_unsubscribe_request = 1;
-  return nchan_subscriber_subrequest_fire_and_forget(sub, sub->cf->unsubscribe_request_url);
-}
-
-ngx_int_t nchan_subscriber_subscribe_request(subscriber_t *sub) {
-  if(!sub->enable_sub_unsub_callbacks) {
-    return NGX_OK;
-  }
-  return nchan_subscriber_subrequest_fire_and_forget(sub, sub->cf->subscribe_request_url);
-}
-
-
-
-ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id) {
-  ngx_int_t             ret;
-  nchan_request_ctx_t  *ctx;
-  nchan_loc_conf_t     *cf = sub->cf;
-  int                   enable_sub_unsub_callbacks = sub->enable_sub_unsub_callbacks;
-  
-  //DBG("%p (req %p) nchan_subscriber_subscribe", sub, sub->request);
-  
-  ctx = sub->request ? ngx_http_get_module_ctx(sub->request, ngx_nchan_module) : NULL;
-  ret = sub->cf->storage_engine->subscribe(ch_id, sub);
-  //don't access sub directly, it might have already been freed
-  if(ret == NGX_OK && enable_sub_unsub_callbacks && cf->subscribe_request_url && ctx && ctx->sub == sub) {
-    nchan_subscriber_subscribe_request(sub);
-  }
-  return ret;
-}
-
-ngx_int_t nchan_cleverly_output_headers_only_for_later_response(ngx_http_request_t *r) {
-  ngx_int_t                rc;
-  static const ngx_str_t   everything_ok = ngx_string("200 OK");
-  
-  r->headers_out.status_line = everything_ok; //but in reality, we're returning a 200 OK
-#if (NGX_HTTP_V2)
-  if(r->stream) {
-    r->headers_out.status=NGX_HTTP_OK; //no need to fool chunking module
-    r->header_only = 0;
-  }
-  else {
-    r->headers_out.status=NGX_HTTP_NO_CONTENT; //fake it to fool the chunking module (mostly);  
-    r->header_only = 1;
-  }
-#elif (NGX_HTTP_SPDY)
-   if(r->spdy_stream) {
-    r->headers_out.status=NGX_HTTP_OK; //no need to fool chunking module
-    r->header_only = 0;
-  }
-  else {
-    r->headers_out.status=NGX_HTTP_NO_CONTENT; //fake it to fool the chunking module (mostly);  
-    r->header_only = 1;
-  }
-#else
-  r->headers_out.status=NGX_HTTP_NO_CONTENT; //fake it to fool the chunking module (mostly);  
-  r->header_only = 1;
-#endif
-  nchan_include_access_control_if_needed(r, NULL);
-  rc = ngx_http_send_header(r);
-  
-  if(r->headers_out.status == NGX_HTTP_OK) {
-    r->keepalive = 1;
-  }
-  
-  return rc;
-}
-
-
-static void nchan_generate_random_boundary(u_char *buf, int sz) {
-  //use the shitty-ass LFSR-based ngx_random. we're not looking for cryptographic randomness, 
-  //just something unlikely
-  static u_char   itoa64[] ="./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-  int             i;
-  u_char         *p = buf;
-  
-  for(i=0; i < sz; i++) {
-    *p++ = itoa64[ngx_random() % 64];
-  }
-}
-
-ngx_str_t *nchan_request_multipart_boundary(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
-  if(ctx) {
-    if(!ctx->multipart_boundary) {
-      if((ctx->multipart_boundary = ngx_palloc(r->pool, sizeof(ngx_str_t) + 32)) == NULL) {
-        //unable to allocate multipart boundary;
-        return NULL;
-      }
-      ctx->multipart_boundary->data=(u_char *)&ctx->multipart_boundary[1];
-      ctx->multipart_boundary->len = 32;
-      nchan_generate_random_boundary(ctx->multipart_boundary->data, 32);
-    }
-    return ctx->multipart_boundary;
-  }
-  else {
-    return NULL;
-  }
-}
-
-ngx_int_t nchan_request_set_content_type_multipart_boundary_header(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
-  u_char                        *cur;
-  u_char                        *cbuf;
-  ngx_str_t                      val;
-  
-  if((cbuf = ngx_palloc(r->pool, sizeof(u_char)*100)) == NULL) {
-    return NGX_ERROR;
-  }
-  
-  val.data = cbuf;
-  cur = ngx_snprintf(cbuf, 100, "multipart/mixed; boundary=%V", nchan_request_multipart_boundary(r, ctx));
-  val.len = cur - cbuf;
-  
-  r->headers_out.content_type = val;
-  
-  return NGX_OK;
-}
-
-void nchan_subscriber_timeout_ev_handler(ngx_event_t *ev) {
-  subscriber_t *sub = (subscriber_t *)ev->data;
-#if FAKESHARD
-  memstore_fakeprocess_push(sub->owner);
-#endif
-  sub->dequeue_after_response = 1;
-  sub->fn->respond_status(sub, NGX_HTTP_REQUEST_TIMEOUT, &NCHAN_HTTP_STATUS_408, NULL);
-#if FAKESHARD
-  memstore_fakeprocess_pop();
-#endif
-}
-
-
-void nchan_subscriber_init_timeout_timer(subscriber_t *sub, ngx_event_t *ev) {
-  ngx_memzero(ev, sizeof(*ev));
-  nchan_init_timer(ev, nchan_subscriber_timeout_ev_handler, sub);
-}
-
-nchan_fakereq_subrequest_data_t *nchan_subscriber_subrequest(subscriber_t *sub, nchan_requestmachine_request_params_t *params) {
-  if(sub->upstream_requestmachine == NULL) {
-    sub->upstream_requestmachine = ngx_calloc(sizeof(nchan_requestmachine_t), ngx_cycle->log);
-    if(sub->upstream_requestmachine == NULL) {
-      nchan_log_error("failed to allocate upstream_requestmachine for subscriber %p", sub);
-      return NULL;
-    }
-    else {
-      nchan_requestmachine_initialize(sub->upstream_requestmachine, sub->request);
-    }
-  }
-  
-  return nchan_requestmachine_request(sub->upstream_requestmachine, params);
-}
-
-ngx_int_t nchan_subscriber_subrequest_cleanup(subscriber_t *sub) {
-  if(sub->upstream_requestmachine != NULL) {
-    nchan_requestmachine_shutdown(sub->upstream_requestmachine);
-    ngx_free(sub->upstream_requestmachine);
-    sub->upstream_requestmachine = NULL;
-  }
-  return NGX_OK;
-}
-
-void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http_request_t *r, nchan_msg_id_t *msgid) {
-  nchan_request_ctx_t  *ctx = NULL;
-  *sub = *tmpl;
-  sub->request = r;
-  sub->upstream_requestmachine = NULL;
-  if(r) {
-    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-    sub->cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  }
-  sub->reserved = 0;
-  sub->enqueued = 0;
-  sub->status = ALIVE;
-  
-  if(msgid) {
-    nchan_copy_new_msg_id(&sub->last_msgid, msgid);
-  }
-  else {
-    sub->last_msgid.time = 0;
-    sub->last_msgid.tag.fixed[0] = 0;
-    sub->last_msgid.tagcount = 1;
-  }
-  
-  if(ctx) {
-    ctx->prev_msg_id = sub->last_msgid;
-    ctx->sub = sub;
-    ctx->subscriber_type = sub->name;
-  }
-  
-#if FAKESHARD
-  sub->owner = memstore_slot();
-#endif
-  
-}
-
-void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t enable_sub_unsub_callbacks, ngx_int_t dequeue_after_response) {
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
-  sub->type = type;
-  sub->name = name;
-  sub->fn = fn;
-  sub->enable_sub_unsub_callbacks = enable_sub_unsub_callbacks;
-  sub->dequeue_after_response = dequeue_after_response;
-  if(ctx) {
-    ctx->subscriber_type = sub->name;
-  }
-}
-
-ngx_int_t nchan_subscriber_receive_notice(subscriber_t *self, ngx_int_t code, void *data) {
-  if(code == NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST) {
-    nchan_loc_conf_t     *cf = self->cf;
-    ngx_str_t             result;
-    int                   result_allocd = 0;
-    ngx_str_t             content_type = ngx_string("text/plain");
-    ngx_str_t             bad_info_string = ngx_string("bad subscriber info string");
-    intptr_t              response_id = (intptr_t )data;
-    if(!cf->subscriber_info_string) {
-      result = bad_info_string;
-    }
-    else {
-      if(ngx_http_complex_value_alloc(self->request, cf->subscriber_info_string, &result, 4096) == NGX_ERROR) {
-        result = bad_info_string;
-      }
-      else {
-        result_allocd = 1;
-      }
-    }
-    
-    ngx_str_t *response_channel_id = nchan_get_subscriber_info_response_channel_id(self->request, response_id);
-    
-    nchan_msg_t             msg;
-    ngx_memzero(&msg, sizeof(msg));
-    msg.id.time = 0;
-    msg.id.tag.fixed[0]=0;
-    msg.id.tagcount=1;
-    msg.id.tagactive=0;
-    
-    msg.content_type=&content_type;
-    
-    msg.storage = NCHAN_MSG_STACK;
-    
-    msg.buf.temporary = 1;
-    msg.buf.memory = 1;
-    msg.buf.last_buf = 1;
-    msg.buf.pos = result.data;
-    msg.buf.last = result.data + result.len;
-    msg.buf.start = msg.buf.pos;
-    msg.buf.end = msg.buf.last;
-    
-    cf->storage_engine->publish(response_channel_id, &msg, cf, NULL, NULL);
-    
-    if(result_allocd) {
-      ngx_http_complex_value_free(&result);
-    }
-  }
-  return NGX_OK;
-}
-
-
-#define MSGID_BUF_LEN (10*255)
-typedef struct msgidbuf_s msgidbuf_t;
-struct msgidbuf_s {
-  u_char       chr[MSGID_BUF_LEN];
-  msgidbuf_t  *prev;
-  msgidbuf_t  *next;
-};
-
-static void *msgidbuf_alloc(void *pd) {
-  return ngx_palloc((ngx_pool_t *)pd, sizeof(msgidbuf_t));
-}
-
-ngx_int_t nchan_subscriber_init_msgid_reusepool(nchan_request_ctx_t *ctx, ngx_pool_t *request_pool) {
-  ctx->output_str_queue = ngx_palloc(request_pool, sizeof(*ctx->output_str_queue));
-  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(msgidbuf_t, prev), offsetof(msgidbuf_t, next), msgidbuf_alloc, NULL, request_pool);
-  return NGX_OK;
-}
-
-ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid) {
-  ngx_str_t               ret;
-  msgidbuf_t             *msgidbuf;
-  
-  msgidbuf = nchan_reuse_queue_push(ctx->output_str_queue);
-  ret.data = &msgidbuf->chr[0];
-  
-  nchan_strcpy(&ret, msgid_to_str(msgid), MSGID_BUF_LEN);
-  
-  return ret;
-}
-
-ngx_int_t nchan_subscriber_publish_info(subscriber_t *sub, uintptr_t destination_channel_id_number) {
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/subscribers/common.h b/debian/modules/nchan/src/subscribers/common.h
deleted file mode 100644
index 03edec4..0000000
--- a/debian/modules/nchan/src/subscribers/common.h
+++ /dev/null
@@ -1,27 +0,0 @@
-ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id);
-
-ngx_int_t nchan_subscriber_authorize_subscribe_request(subscriber_t *sub, ngx_str_t *ch_id);
-ngx_int_t nchan_subscriber_subscribe_request(subscriber_t *sub);
-ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub);
-ngx_int_t nchan_subscriber_subrequest_cleanup(subscriber_t *sub);
-
-ngx_int_t nchan_cleverly_output_headers_only_for_later_response(ngx_http_request_t *r);
-
-ngx_str_t *nchan_request_multipart_boundary(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
-
-ngx_int_t nchan_request_set_content_type_multipart_boundary_header(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
-
-ngx_int_t nchan_subscriber_receive_notice(subscriber_t *, ngx_int_t code, void *data);
-
-
-nchan_fakereq_subrequest_data_t *nchan_subscriber_subrequest(subscriber_t *sub, nchan_requestmachine_request_params_t *params);
-
-
-void nchan_subscriber_timeout_ev_handler(ngx_event_t *ev);
-void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http_request_t *r, nchan_msg_id_t *msgid);
-void nchan_subscriber_init_timeout_timer(subscriber_t *sub, ngx_event_t *ev);
-void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t enable_sub_unsub_callbacks, ngx_int_t dequeue_after_response);
-ngx_int_t nchan_subscriber_init_msgid_reusepool(nchan_request_ctx_t *ctx, ngx_pool_t *request_pool);
-ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
-
-ngx_int_t nchan_subscriber_publish_info(subscriber_t *sub, uintptr_t channel_id_number);
diff --git a/debian/modules/nchan/src/subscribers/eventsource.c b/debian/modules/nchan/src/subscribers/eventsource.c
deleted file mode 100644
index 2a6df96..0000000
--- a/debian/modules/nchan/src/subscribers/eventsource.c
+++ /dev/null
@@ -1,413 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include <util/nchan_bufchainpool.h>
-#include "longpoll.h"
-#include "longpoll-private.h"
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:EVENTSOURCE:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:EVENTSOURCE:" fmt, ##arg)
-#include <assert.h> 
-
-static nchan_bufchain_pool_t *fsub_bcp(full_subscriber_t *fsub) {
-  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
-  return ctx->bcp;
-}
-
-/*static ngx_inline void str_to_buf(ngx_buf_t *buf, ngx_str_t *str) {
-  buf->start = str->data;
-  buf->pos = str->data;
-  buf->end = str->data + str->len;
-  buf->last = buf->end;
-  buf->memory = 1;
-}
-*/
-
-static void es_ensure_headers_sent(full_subscriber_t *fsub) {
-  static const ngx_str_t   content_type = ngx_string("text/event-stream; charset=utf-8");
-  static const ngx_str_t   hello = ngx_string(": hi\n\n");
-  ngx_http_request_t             *r = fsub->sub.request;
-  ngx_http_core_loc_conf_t       *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-  
-  nchan_buf_and_chain_t          *bc;
-  
-  if(!fsub->data.shook_hands) {
-    bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 1);
-    clcf->chunked_transfer_encoding = 0;
-    
-    r->headers_out.content_type.len = content_type.len;
-    r->headers_out.content_type.data = content_type.data;
-    r->headers_out.content_length_n = -1;
-    //send headers
-    
-    nchan_cleverly_output_headers_only_for_later_response(r);
-    
-    //send a ":hi" comment
-    ngx_init_set_membuf(&bc->buf, hello.data, hello.data + hello.len);
-    
-    bc->buf.last_buf = 0;
-    bc->buf.flush = 1;
-    
-    r->chunked = 0;
-    r->header_only = 0;
-    
-    nchan_output_filter(fsub->sub.request, &bc->chain);
-    
-    fsub->data.shook_hands = 1; 
-  }
-}
-
-static ngx_int_t create_dataline_bufchain(full_subscriber_t *fsub, ngx_chain_t **first_chain, ngx_chain_t **last_chain, ngx_buf_t *databuf) {
-  static ngx_str_t        data_prefix=ngx_string("data: ");
-  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), ngx_buf_size(databuf) == 0 ? 1 : 2);
-  ngx_chain_t            *chain = &bc->chain;
-  
-  if(*last_chain) {
-    (*last_chain)->next = chain;
-  }
-  
-  ngx_init_set_membuf(chain->buf, data_prefix.data, data_prefix.data + data_prefix.len);
-  
-  if(*first_chain == NULL) {
-    *first_chain = chain;
-  }
-  
-  if(ngx_buf_size(databuf) > 0) {
-    chain = chain->next;
-    *chain->buf = *databuf;
-    chain->buf->last_buf = 0;
-    chain->buf->last_in_chain = 0;
-  }
-  *last_chain = chain;
-
-  return NGX_OK;
-}
-
-static void prepend_es_response_line(full_subscriber_t *fsub, ngx_str_t *lbl, ngx_chain_t **first_chain, ngx_str_t *str) {
-  static ngx_str_t        nl = ngx_string("\n");
-  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 3);
-  ngx_chain_t            *chain;
-
-  chain = &bc->chain;
-  ngx_init_set_membuf(chain->buf, lbl->data, lbl->data + lbl->len);
-  chain = chain->next;
-  ngx_init_set_membuf(chain->buf, str->data, str->data + str->len);
-  chain = chain->next;
-  ngx_init_set_membuf(chain->buf, nl.data, nl.data + 1);
-  
-  assert(chain->next == NULL);
-  chain->next = *first_chain;
-  *first_chain = &bc->chain;
-}
-
-static ngx_int_t es_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
-  static ngx_str_t        terminal_newlines=ngx_string("\n\n");
-  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
-  u_char                 *cur = NULL, *last = NULL;
-  ngx_buf_t              *msg_buf = &msg->buf;
-  ngx_buf_t               databuf;
-  nchan_buf_and_chain_t  *bc;
-  ngx_chain_t            *first_link = NULL, *last_link = NULL;
-  ngx_str_t               msgid;
-  static ngx_str_t        id_line = ngx_string("id: ");
-  static ngx_str_t        event_line = ngx_string("event: ");
-  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
-  
-  
-  ctx->prev_msg_id = fsub->sub.last_msgid;
-  update_subscriber_last_msg_id(sub, msg);
-  ctx->msg_id = fsub->sub.last_msgid;
-  
-  if(fsub->data.timeout_ev.timer_set) {
-    ngx_del_timer(&fsub->data.timeout_ev);
-    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
-  }
-  
-  es_ensure_headers_sent(fsub);
-  
-  DBG("%p output msg to subscriber", sub);
-  
-  ngx_memcpy(&databuf, msg_buf, sizeof(*msg_buf));
-  databuf.last_buf = 0;
-  
-  if(!databuf.in_file) {
-    cur = msg_buf->start;
-    last = msg_buf->end;
-    do {
-      databuf.start = cur;
-      databuf.pos = cur;
-      databuf.end = last;
-      databuf.last = last;
-      
-      cur = ngx_strlchr(cur, last, '\n');
-      if(cur == NULL) {
-        //sweet, no newlines!
-        //let's get out of this hellish loop
-        databuf.end = last;
-        databuf.last = last;
-        cur = last + 1;
-      }
-      else {
-        cur++; //include the newline
-        databuf.end = cur;
-        databuf.last = cur;
-      }
-      
-      create_dataline_bufchain(fsub, &first_link, &last_link, &databuf);
-      
-    } while(cur <= last);
-  } 
-  else {
-    //great, we've gotta scan this whole damn file for line breaks.
-    //EventStream really isn't designed for large chunks of data
-    off_t       fcur, flast;
-    //int         chr_int;
-    FILE       *stream;
-    ngx_file_t *msgfile =  nchan_bufchain_pool_reserve_file(ctx->bcp);
-    
-    nchan_msg_buf_open_fd_if_needed(&databuf, msgfile, NULL);
-
-    if(msgfile->fd == NGX_INVALID_FILE) {
-      msgfile->fd = nchan_fdcache_get(&msgfile->name);
-    }
-    stream = fdopen(dup(msgfile->fd), "r");
-    
-    fcur = databuf.file_pos;
-    flast = databuf.file_last;
-    
-    fseek(stream, fcur, SEEK_SET);
-    
-    do {
-      databuf.file_pos = fcur;
-      databuf.file_last = flast;
-      
-      //getc that shit
-      /*for(;;) {
-        chr_int = getc(stream);
-        if(chr_int == EOF) {
-          break;
-        }
-        else if(chr_int == (int )'\n') {
-          fcur++;
-          break;
-        }
-        fcur++;
-      }*/
-      
-      if(fscanf(stream,"%*[^\n]\n") != EOF) {
-        fcur = ftell(stream);
-      }
-      else {
-        fcur = flast;
-      }
-      
-      databuf.file_last = fcur;
-      create_dataline_bufchain(fsub, &first_link, &last_link, &databuf);
-      
-    } while(fcur < flast);
-    
-    fclose(stream);
-  }
-  
-  //now 2 newlines at the end
-  if(last_link) {
-    bc = nchan_bufchain_pool_reserve(ctx->bcp, 1);
-    last_link->next=&bc->chain;
-    ngx_init_set_membuf(&bc->buf, terminal_newlines.data, terminal_newlines.data + terminal_newlines.len);
-    
-    bc->buf.flush = 1;
-    bc->buf.last_buf = 0;
-    
-    bc->chain.next = NULL;
-    bc->chain.buf = &bc->buf;
-    
-    last_link = &bc->chain;
-  }
-  //okay, this crazy data chain is finished. 
-    
-  //now how about the mesage tag?
-  
-  msgid = nchan_subscriber_set_recyclable_msgid_str(ctx, &sub->last_msgid);
-  prepend_es_response_line(fsub, &id_line, &first_link, &msgid);
-  
-  //and maybe the event type?
-  if(sub->cf->eventsource_event.len > 0) {
-    prepend_es_response_line(fsub, &event_line, &first_link, &sub->cf->eventsource_event);
-  }
-  else if(msg->eventsource_event) {
-    prepend_es_response_line(fsub, &event_line, &first_link, msg->eventsource_event);
-  }
-  
-  return nchan_output_msg_filter(fsub->sub.request, msg, first_link);
-}
-
-static void empty_handler(void) {}
-
-static ngx_int_t es_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line,  ngx_chain_t *status_body){
-  
-  static ngx_str_t          empty_line = ngx_string("");
-  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
-  u_char                    resp_buf[256];
-  nchan_buf_and_chain_t     bc;
-  
-  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
-    //ignore
-    return NGX_OK;
-  }
-  
-  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
-    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
-  }
-  
-  es_ensure_headers_sent(fsub);
-  
-  DBG("%p output status to subscriber", sub);
-  
-  bc.chain.buf = &bc.buf;
-  bc.chain.next = NULL;
-  ngx_init_set_membuf(&bc.buf, resp_buf, ngx_snprintf(resp_buf, 256, ":%i: %V\n\n", status_code, status_line ? status_line : &empty_line));
-  bc.buf.flush = 1;
-  bc.buf.last_buf = 1;
-  
-  nchan_output_filter(fsub->sub.request, &bc.chain);
-  
-  if((status_code >=400 && status_code <599) || status_code == NGX_HTTP_NOT_MODIFIED) {
-    fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
-    fsub->sub.request->keepalive=0;
-    sub->request->headers_out.status = status_code;
-    fsub->data.finalize_request=1;
-    sub->fn->dequeue(sub);
-  }
-
-  return NGX_OK;
-}
-
-static void ping_ev_handler(ngx_event_t *ev) {
-  full_subscriber_t    *fsub = (full_subscriber_t *)ev->data;
-  nchan_loc_conf_t     *cf = fsub->sub.cf;
-  
-  if(!ev->timedout) {
-    return;
-  }
-
-  struct {
-    ngx_str_t   prefix;
-    ngx_str_t  *value;
-  } line[3] = {
-    {ngx_string(":"),         &cf->eventsource_ping.comment},
-    {ngx_string("event: "),   &cf->eventsource_ping.event},
-    {ngx_string("data: "),    &cf->eventsource_ping.data}
-  };
-  
-  int chaincount = 1;
-  int i;
-  for(i=0; i<3; i++) {
-    chaincount += line[i].value->len > 0 ? 3 : 0;
-  }
-
-  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), chaincount);
-  ngx_chain_t            *chain = NULL;
-    
-  for(i=0; i<3; i++) {
-    if(line[i].value->len > 0) {
-      chain = chain ? chain->next : &bc->chain;
-      ngx_init_set_membuf_str(chain->buf, &line[i].prefix);
-      
-      chain = chain->next;
-      ngx_init_set_membuf_str(chain->buf, line[i].value);
-      
-      chain = chain->next;
-      ngx_init_set_membuf_char(chain->buf, "\n");
-    }
-  }
-  chain = chain ? chain->next : &bc->chain;
-  if(chaincount > 1) {
-    ngx_init_set_membuf_char(chain->buf, "\n");
-  }
-  else {
-    //everything's empty.
-    //rather than sending a single newline (which is probably a valid event-stream protocol token)
-    //send an empty comment (definitely valid)
-    ngx_init_set_membuf_char(chain->buf, ":\n\n");
-  }
-  chain->buf->last_in_chain = 1;
-  chain->buf->flush = 1;
-  chain->next = NULL;
-  
-  nchan_output_filter(fsub->sub.request, &bc->chain);
-  
-  ev->timedout=0;
-  ngx_add_timer(&fsub->data.ping_ev, fsub->sub.cf->eventsource_ping.interval * 1000);
-}
-
-static ngx_int_t es_enqueue(subscriber_t *sub) {
-  ngx_int_t           rc;
-  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
-  DBG("%p output status to subscriber", sub);
-  rc = longpoll_enqueue(sub);
-  if(rc == NGX_OK) {
-    if(sub->cf->eventsource_ping.interval > 0) {
-      nchan_init_timer(&fsub->data.ping_ev, ping_ev_handler, fsub);
-      ngx_add_timer(&fsub->data.ping_ev, sub->cf->eventsource_ping.interval * 1000);
-    }
-  }
-  
-  fsub->data.finalize_request = 0;
-  es_ensure_headers_sent(fsub);
-  sub->enqueued = 1;
-  return rc;
-}
-
-static ngx_int_t es_dequeue(subscriber_t *sub) {
-  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
-  if(fsub->data.ping_ev.timer_set) {
-    ngx_del_timer(&fsub->data.ping_ev);
-  }
-  return longpoll_dequeue(sub);
-}
-
-static       subscriber_fn_t  eventsource_fn_data;
-static       subscriber_fn_t *eventsource_fn = NULL;
-
-static       ngx_str_t   sub_name = ngx_string("eventsource");
-
-
-subscriber_t *eventsource_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
-  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
-  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
-  if(eventsource_fn == NULL) {
-    eventsource_fn = &eventsource_fn_data;
-    *eventsource_fn = *sub->fn;
-    eventsource_fn->enqueue = es_enqueue;
-    eventsource_fn->dequeue = es_dequeue;
-    eventsource_fn->respond_message= es_respond_message;
-    eventsource_fn->respond_status = es_respond_status;
-  }
-  
-  ngx_memzero(&fsub->data.ping_ev, sizeof(fsub->data.ping_ev));
-  
-  fsub->data.shook_hands = 0;
-  
-  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
-  nchan_bufchain_pool_init(ctx->bcp, r->pool);
-  
-  //msgid bufs -- unique per response
-  nchan_subscriber_init_msgid_reusepool(ctx, r->pool);
-  
-  nchan_subscriber_common_setup(sub, EVENTSOURCE, &sub_name, eventsource_fn, 1, 0);
-  return sub;
-}
-
-ngx_int_t nchan_detect_eventsource_request(ngx_http_request_t *r) {
-  ngx_str_t       *accept_header = nchan_get_accept_header_value(r);
-
-  if(accept_header && ngx_strnstr(accept_header->data, "text/event-stream", accept_header->len)) {
-    return 1;
-  }
-  
-  return 0;
-}
diff --git a/debian/modules/nchan/src/subscribers/eventsource.h b/debian/modules/nchan/src/subscribers/eventsource.h
deleted file mode 100644
index 424a7c7..0000000
--- a/debian/modules/nchan/src/subscribers/eventsource.h
+++ /dev/null
@@ -1,4 +0,0 @@
-subscriber_t *eventsource_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
-//ngx_int_t eventsource_subscriber_destroy(subscriber_t *sub);
-
-ngx_int_t nchan_detect_eventsource_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/getmsg_proxy.c b/debian/modules/nchan/src/subscribers/getmsg_proxy.c
deleted file mode 100644
index fb77b55..0000000
--- a/debian/modules/nchan/src/subscribers/getmsg_proxy.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include "internal.h"
-#include "getmsg_proxy.h"
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:PROXY:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:PROXY:" fmt, ##arg)
-
-
-typedef struct sub_data_s sub_data_t;
-
-struct sub_data_s {
-  subscriber_t                 *sub;
-  ngx_str_t                    *chid;
-  ngx_event_t                   timeout_ev;
-  callback_pt                   cb;
-  void                         *pd;
-}; //sub_data_t
-
-static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
-  DBG("%p enqueued ok", d->sub);
-  return NGX_OK;
-}
-
-static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
-  internal_subscriber_t  *fsub = (internal_subscriber_t  *)d->sub;
-  DBG("%p dequeue:", d->sub);
-
-  //TODO: make sure proxy target is already taken care of
-  
-  if(fsub->sub.reserved > 0) {
-    DBG("%p  not ready to destroy (reserved for %i)", fsub, fsub->sub.reserved);
-    fsub->awaiting_destruction = 1;
-  }
-  else {
-    DBG("%p destroy", fsub);
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
-  DBG("%p forwarding msg", d->sub);
-  nchan_msg_t            *msg = (nchan_msg_t *) ptr;
-  d->cb(MSG_FOUND, msg, d->pd);
-  d->cb = NULL;
-  //TODO : dequeue
-  return NGX_OK;
-}
-
-static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
-  assert(d->cb);
-  if(!ptr) {
-    switch(status) {
-      case NGX_HTTP_GONE: //delete
-        DBG("%p forwarding MSG_EXPIRED", d->sub);
-        d->cb(MSG_EXPIRED, NULL, d->pd);
-        d->cb = NULL;
-        break;
-      case NGX_HTTP_CONFLICT:
-      case NGX_HTTP_CLOSE: //delete
-      case NGX_HTTP_FORBIDDEN:
-      case NGX_HTTP_NOT_FOUND:
-      case NGX_HTTP_REQUEST_TIMEOUT:
-        DBG("%p forwarding MSG_NOTFOUND", d->sub);
-        d->cb(MSG_NOTFOUND, NULL, d->pd);
-        d->cb = NULL;
-        break;
-      case NGX_HTTP_NO_CONTENT:
-        //translate back to MSG request status code
-        DBG("%p forwarding MSG_EXPECTED", d->sub);
-        d->cb(MSG_EXPECTED, NULL, d->pd);
-        d->cb = NULL;
-        break;
-      case NGX_HTTP_NOT_MODIFIED: //does this even ever happen? I don't think so.
-        assert(0);
-        break;
-      default:
-        ERR("unknown status %i", status);
-    }
-  }
-  return NGX_OK;
-}
-
-static ngx_str_t sub_name = ngx_string("getmsg-proxy");
-
-subscriber_t *getmsg_proxy_subscriber_create(nchan_msg_id_t *msgid, callback_pt cb, void *pd) {
-  sub_data_t                 *d;
-  subscriber_t               *sub;
-  
-  sub = internal_subscriber_create_init(&sub_name, NULL /*no config*/, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, NULL, NULL);
-  
-  
-  DBG("created new getmsg_proxy sub %p", sub);
-  nchan_copy_new_msg_id(&sub->last_msgid, msgid);
-  sub->destroy_after_dequeue = 1;
-  sub->dequeue_after_response = 1;
-  d->sub = sub;
-  d->cb = cb;
-  d->pd = pd;
-  return sub;
-}
diff --git a/debian/modules/nchan/src/subscribers/getmsg_proxy.h b/debian/modules/nchan/src/subscribers/getmsg_proxy.h
deleted file mode 100644
index 48a9834..0000000
--- a/debian/modules/nchan/src/subscribers/getmsg_proxy.h
+++ /dev/null
@@ -1 +0,0 @@
-subscriber_t *getmsg_proxy_subscriber_create(nchan_msg_id_t *msgid, callback_pt cb, void *pd);
diff --git a/debian/modules/nchan/src/subscribers/http-chunked.c b/debian/modules/nchan/src/subscribers/http-chunked.c
deleted file mode 100644
index faa056f..0000000
--- a/debian/modules/nchan/src/subscribers/http-chunked.c
+++ /dev/null
@@ -1,258 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include "longpoll.h"
-#include "longpoll-private.h"
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:CHUNKED:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:CHUNKED:" fmt, ##arg)
-#include <assert.h> 
-
-#define CHUNKSIZE_BUF_LEN 20
-
-typedef struct chunksizebuf_s chunksizebuf_t;
-struct chunksizebuf_s {
-  u_char           chr[CHUNKSIZE_BUF_LEN];
-  chunksizebuf_t  *prev;
-  chunksizebuf_t  *next;
-};
-
-static void chunked_ensure_headers_sent(full_subscriber_t *fsub) {
-  static ngx_str_t         transfer_encoding_header = ngx_string("Transfer-Encoding");
-  static ngx_str_t         transfer_encoding = ngx_string("chunked");
-  
-  ngx_http_request_t             *r = fsub->sub.request;
-  ngx_http_core_loc_conf_t       *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-  if(!fsub->data.shook_hands) {
-    
-    clcf->chunked_transfer_encoding = 0;
-    
-    //r->headers_out.content_type.len = content_type.len;
-    //r->headers_out.content_type.data = content_type.data;
-    
-    nchan_add_response_header(r, &transfer_encoding_header, &transfer_encoding);
-    
-    nchan_cleverly_output_headers_only_for_later_response(r);
-    
-    fsub->data.shook_hands = 1; 
-    r->chunked = 0;
-    r->header_only = 0;
-  }
-}
-
-static ngx_int_t chunked_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
-  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
-  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
-  chunksizebuf_t         *chunksizebuf = nchan_reuse_queue_push(ctx->output_str_queue);
-  u_char                 *chunk_start = &chunksizebuf->chr[0];
-  static u_char          *chunk_end=(u_char *)"\r\n";
-  ngx_file_t             *file_copy;
-  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(ctx->bcp, 3);
-  ngx_chain_t            *chain;
-  ngx_buf_t              *buf, *msg_buf = &msg->buf;
-  ngx_int_t               rc;
-  
-  if(fsub->data.timeout_ev.timer_set) {
-    ngx_del_timer(&fsub->data.timeout_ev);
-    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
-  }
-  
-  ctx->prev_msg_id = fsub->sub.last_msgid;
-  update_subscriber_last_msg_id(sub, msg);
-  ctx->msg_id = fsub->sub.last_msgid;
-  
-  if (ngx_buf_size(msg_buf) == 0) {
-    //empty messages are skipped, because a zero-length chunk finalizes the request
-    return NGX_OK;
-  }
-  
-  //chunk size
-  chain = &bc->chain;
-  buf = chain->buf;
-  ngx_memzero(buf, sizeof(*buf));
-  buf->memory = 1;
-  buf->start = chunk_start;
-  buf->pos = chunk_start;
-  buf->end = ngx_snprintf(chunk_start, 15, "%xi\r\n", ngx_buf_size(msg_buf));
-  buf->last = buf->end;
-  
-  //message
-  chain = chain->next;
-  buf = chain->buf;
-  *buf = *msg_buf;
-  if(buf->file) {
-    file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
-    nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
-  }
-  buf->last_buf = 0;
-  buf->last_in_chain = 0;
-  buf->flush = 0;
-  
-  //trailing newlines
-  chain = chain->next;
-  buf = chain->buf;
-  ngx_memzero(buf, sizeof(*buf));
-  buf->start = chunk_end;
-  buf->pos = chunk_end;
-  buf->end = chunk_end + 2;
-  buf->last = buf->end;
-  buf->memory = 1;
-  buf->last_buf = 0;
-  buf->last_in_chain = 1;
-  buf->flush = 1;
-  
-  chunked_ensure_headers_sent(fsub);
-  
-  DBG("%p output msg to subscriber", sub);
-  
-  rc = nchan_output_msg_filter(fsub->sub.request, msg, &bc->chain);
-  
-  return rc;
-}
-
-static ngx_int_t chunked_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line,  ngx_chain_t *status_body){
-  nchan_buf_and_chain_t     bc;
-  ngx_chain_t              *chain = NULL;
-  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
-  
-  if(chain == NULL) {
-    bc.chain.buf=&bc.buf;
-    bc.chain.next=NULL;
-    ngx_memzero(&bc.buf, sizeof(ngx_buf_t));
-    bc.buf.last_buf = 1;
-    bc.buf.last_in_chain = 1;
-    bc.buf.flush = 1;
-    bc.buf.memory = 1;
-    chain = &bc.chain;
-  }
-  
-  bc.buf.start = (u_char *)"0\r\n\r\n";
-  bc.buf.end = bc.buf.start + 5;
-  bc.buf.pos = bc.buf.start;
-  bc.buf.last = bc.buf.end;
-  
-  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
-    //ignore
-    return NGX_OK;
-  }
-  
-  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code < 600) {
-    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
-  }
-  
-  chunked_ensure_headers_sent(fsub);
-  
-  nchan_output_filter(fsub->sub.request, chain);
-  
-  subscriber_maybe_dequeue_after_status_response(fsub, status_code);
-
-  return NGX_OK;
-}
-
-void *chunksizebuf_alloc(void *pd) {
-  return ngx_palloc((ngx_pool_t *)pd, sizeof(chunksizebuf_t));
-}
-
-static ngx_int_t chunked_enqueue(subscriber_t *sub) {
-  ngx_int_t           rc;
-  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
-  DBG("%p output status to subscriber", sub);
-  rc = longpoll_enqueue(sub);
-  fsub->data.finalize_request = 0;
-  chunked_ensure_headers_sent(fsub);
-  sub->enqueued = 1;
-  return rc;
-}
-
-static       subscriber_fn_t  chunked_fn_data;
-static       subscriber_fn_t *chunked_fn = NULL;
-
-static       ngx_str_t   sub_name = ngx_string("http-chunked");
-
-subscriber_t *http_chunked_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
-  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
-  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
-  if(chunked_fn == NULL) {
-    chunked_fn = &chunked_fn_data;
-    *chunked_fn = *sub->fn;
-    chunked_fn->enqueue = chunked_enqueue;
-    chunked_fn->respond_message = chunked_respond_message;
-    chunked_fn->respond_status = chunked_respond_status;
-  }
-  
-  fsub->data.shook_hands = 0;
-  
-  ctx->output_str_queue = ngx_palloc(r->pool, sizeof(*ctx->output_str_queue));
-  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(chunksizebuf_t, prev), offsetof(chunksizebuf_t, next), chunksizebuf_alloc, NULL, r->pool);
-  
-  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
-  nchan_bufchain_pool_init(ctx->bcp, r->pool);
-  
-  nchan_subscriber_common_setup(sub, HTTP_CHUNKED, &sub_name, chunked_fn, 1, 0);
-  return sub;
-}
-
-
-
-ngx_int_t nchan_detect_chunked_subscriber_request(ngx_http_request_t *r) {
-  static ngx_str_t   TE_HEADER = ngx_string("TE");
-  ngx_str_t         *tmp;
-  u_char            *cur, *last;
-  
-  if(r->method != NGX_HTTP_GET) {
-    return 0;
-  }
-  
-  if((tmp = nchan_get_header_value(r, TE_HEADER)) != NULL) {
-    last = tmp->data + tmp->len;
-    cur = ngx_strlcasestrn(tmp->data, last, (u_char *)"chunked", 7 - 1);
-    
-    if(cur == NULL) {
-      return 0;
-    }
-    
-    //see if there's a qvalue
-    cur += 7;
-    if((cur + 1 <= last) && cur[0]==' ') { 
-      //no qvalue. assume non-zero, meaning it's legit
-      return 1;
-    }
-    else if((cur + 4) < last) {
-      //maybe there is...
-      if(cur[0]==';' && cur[1]=='q' && cur[2]=='=') {
-        //parse the freaking qvalue
-        cur += 3;
-        ngx_int_t qval_fp;
-        qval_fp = ngx_atofp(cur, last - cur, 2);
-        if(qval_fp == NGX_ERROR) {
-          DBG("invalid qval. reject.");
-          return 0;
-        }
-        else if(qval_fp > 0) {
-          //got nonzero qval. accept
-          return 1;
-        }
-        else {
-          //qval=0. reject
-          return 0;
-        }
-      }
-      else {
-        //we're looking at  "chunkedsomething", not "chunked;q=<...>". reject.
-        return 0;
-      }
-    }
-    else if (cur == last){
-      //last thing in the header. "chunked". accept
-      return 1;
-    }
-    else {
-      //too small to have a qvalue, not followed by a space. must be "chunkedsomething"
-      return 0;
-    }
-  }
-  else return 0;
-}
diff --git a/debian/modules/nchan/src/subscribers/http-chunked.h b/debian/modules/nchan/src/subscribers/http-chunked.h
deleted file mode 100644
index efb5197..0000000
--- a/debian/modules/nchan/src/subscribers/http-chunked.h
+++ /dev/null
@@ -1,4 +0,0 @@
-subscriber_t *http_chunked_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
-//ngx_int_t http_chunked_subscriber_destroy(subscriber_t *sub);
-
-ngx_int_t nchan_detect_chunked_subscriber_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/http-multipart-mixed.c b/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
deleted file mode 100644
index 3e12411..0000000
--- a/debian/modules/nchan/src/subscribers/http-multipart-mixed.c
+++ /dev/null
@@ -1,290 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include <util/nchan_bufchainpool.h>
-#include "longpoll.h"
-#include "longpoll-private.h"
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MULTIPART:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MULTIPART:" fmt, ##arg)
-#include <assert.h> 
-
-typedef struct {
-  u_char                 boundary[50];
-  u_char                *boundary_end;
-} multipart_privdata_t;
-
-typedef struct {
-  u_char       charbuf[58 + 10*NCHAN_FIXED_MULTITAG_MAX];
-  void        *prev;
-  void        *next;
-} headerbuf_t;
-
-static nchan_bufchain_pool_t *fsub_bcp(full_subscriber_t *fsub) {
-  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
-  return ctx->bcp;
-}
-
-static void multipart_ensure_headers_sent(full_subscriber_t *fsub) {
-  nchan_buf_and_chain_t          *bc;
-  
-  ngx_http_request_t             *r = fsub->sub.request;
-  ngx_http_core_loc_conf_t       *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  multipart_privdata_t           *mpd = (multipart_privdata_t *)fsub->privdata;
-  
-  if(!fsub->data.shook_hands) {
-    clcf->chunked_transfer_encoding = 0;
-    nchan_request_set_content_type_multipart_boundary_header(r, ctx);
-    
-    nchan_cleverly_output_headers_only_for_later_response(r);
-    
-    //set preamble in the request ctx. it would be nicer to store in in the subscriber data, 
-    //but that would mean not reusing longpoll's fsub directly
-    
-    r->header_only = 0;
-    r->chunked = 0;
-    
-    if((bc = nchan_bufchain_pool_reserve(ctx->bcp, 1)) == NULL) {
-      ERR("can't reserve bufchain for multipart headers");
-      nchan_respond_status(fsub->sub.request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 1);
-      return;
-    }
-    
-    ngx_memzero(&bc->buf, sizeof(ngx_buf_t));
-    bc->buf.start = mpd->boundary + 2;
-    bc->buf.pos = bc->buf.start;
-    bc->buf.end = mpd->boundary_end;
-    bc->buf.last = bc->buf.end;
-    bc->buf.memory = 1;
-    bc->buf.last_buf = 0;
-    bc->buf.last_in_chain = 1;
-    bc->buf.flush = 1;
-    
-    nchan_output_filter(r, &bc->chain);
-    
-    fsub->data.shook_hands = 1; 
-  }
-}
-static void *headerbuf_alloc(void *pd) {
-  return ngx_palloc((ngx_pool_t *)pd, sizeof(headerbuf_t));
-}
-
-static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
-  
-  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
-  ngx_buf_t              *buf, *msg_buf = &msg->buf, *msgid_buf;
-  ngx_int_t               rc;
-  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(fsub->sub.request, ngx_nchan_module);
-  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
-  ngx_int_t               n;
-  nchan_buf_and_chain_t  *bc;
-  ngx_chain_t            *chain;
-  ngx_file_t             *file_copy;
-  multipart_privdata_t   *mpd = (multipart_privdata_t *)fsub->privdata;
-  
-  headerbuf_t            *headerbuf = nchan_reuse_queue_push(ctx->output_str_queue);
-  u_char                 *cur = headerbuf->charbuf;
-  
-  if(fsub->data.timeout_ev.timer_set) {
-    ngx_del_timer(&fsub->data.timeout_ev);
-    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
-  }
-  
-  //generate the headers
-  if(!cf->msg_in_etag_only) {
-    //msgtime
-    cur = ngx_cpymem(cur, "\r\nLast-Modified: ", sizeof("\r\nLast-Modified: ") - 1);
-    cur = ngx_http_time(cur, msg->id.time);
-    *cur++ = CR; *cur++ = LF;
-    //msgtag
-    cur = ngx_cpymem(cur, "Etag: ", sizeof("Etag: ") - 1);
-    cur += msgtag_to_strptr(&msg->id, (char *)cur);
-    *cur++ = CR; *cur++ = LF;
-  }
-  else {
-    ngx_str_t   *tmp_etag = msgid_to_str(&msg->id);
-    cur = ngx_snprintf(cur, 58 + 10*NCHAN_FIXED_MULTITAG_MAX, "\r\nEtag: %V\r\n", tmp_etag);
-  }
-  
-  n=4;
-  if(!msg->content_type) {
-    //don't need content_type buf'n'chain
-    n--;
-  }
-  if(ngx_buf_size(msg_buf) == 0) {
-    //don't need msgbuf
-    n --;
-  }
-  if((bc = nchan_bufchain_pool_reserve(ctx->bcp, n)) == NULL) {
-    ERR("can't allocate buf-and-chains for multipart/mixed client output");
-    return NGX_ERROR;
-  }
-  
-  chain = &bc->chain;
-  msgid_buf = chain->buf;
-  
-  //message id
-  ngx_memzero(chain->buf, sizeof(ngx_buf_t));
-  chain->buf->memory = 1;
-  chain->buf->start = headerbuf->charbuf;
-  chain->buf->pos = headerbuf->charbuf;
-  
-  //content_type maybe
-  if(msg->content_type) {
-    chain = chain->next;
-    buf = chain->buf;
-    
-    msgid_buf->last = cur;
-    msgid_buf->end = cur;
-    
-    ngx_memzero(buf, sizeof(ngx_buf_t));
-    buf->memory = 1;
-    buf->start = cur;
-    buf->pos = cur;
-    buf->last = ngx_snprintf(cur, 255, "Content-Type: %V\r\n\r\n", msg->content_type);
-    buf->end = buf->last;
-  }
-  else {
-    *cur++ = CR; *cur++ = LF;
-    msgid_buf->last = cur;
-    msgid_buf->end = cur;
-  }
-  
-  //msgbuf
-  if(ngx_buf_size(msg_buf) > 0) {
-    chain = chain->next;
-    buf = chain->buf;
-    ngx_memcpy(buf, msg_buf, sizeof(*msg_buf));
-    if(msg_buf->file) {
-      file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
-      nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
-    }
-    buf->last_buf = 0;
-    buf->last_in_chain = 0;
-    buf->flush = 0;
-  }
-  
-  chain = chain->next;
-  buf = chain->buf;
-  ngx_memzero(buf, sizeof(ngx_buf_t));
-  buf->start = &mpd->boundary[0];
-  buf->pos = buf->start;
-  buf->end = mpd->boundary_end;
-  buf->last = buf->end;
-  buf->memory = 1;
-  buf->last_buf = 0;
-  buf->last_in_chain = 1;
-  buf->flush = 1;
-  
-  ctx->prev_msg_id = fsub->sub.last_msgid;
-  update_subscriber_last_msg_id(sub, msg);
-  ctx->msg_id = fsub->sub.last_msgid;
-  
-  multipart_ensure_headers_sent(fsub);
-  
-  DBG("%p output msg to subscriber", sub);
-  
-  rc = nchan_output_msg_filter(fsub->sub.request, msg, &bc->chain);
-  
-  return rc;
-}
-
-static ngx_int_t multipart_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body){
-  nchan_buf_and_chain_t    *bc;
-  static u_char            *end_boundary=(u_char *)"--\r\n";
-  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
-  //nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
-  
-  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
-    //ignore
-    return NGX_OK;
-  }
-  
-  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
-    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
-  }
-  
-  multipart_ensure_headers_sent(fsub);
-  
-  if((bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 1)) == NULL) {
-    nchan_respond_status(sub->request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 1);
-    return NGX_ERROR;
-  }
-  
-  ngx_memzero(&bc->buf, sizeof(ngx_buf_t));
-  bc->buf.memory = 1;
-  bc->buf.last_buf = 1;
-  bc->buf.last_in_chain = 1;
-  bc->buf.flush = 1;
-  bc->buf.start = end_boundary;
-  bc->buf.pos = end_boundary;
-  bc->buf.end = end_boundary + 4;
-  bc->buf.last = bc->buf.end;
-  
-  nchan_output_filter(fsub->sub.request, &bc->chain);
-  
-  subscriber_maybe_dequeue_after_status_response(fsub, status_code);
-
-  return NGX_OK;
-}
-
-static ngx_int_t multipart_enqueue(subscriber_t *sub) {
-  ngx_int_t           rc;
-  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
-  DBG("%p output status to subscriber", sub);
-  rc = longpoll_enqueue(sub);
-  fsub->data.finalize_request = 0;
-  multipart_ensure_headers_sent(fsub);
-  sub->enqueued = 1;
-  return rc;
-}
-
-static       subscriber_fn_t  multipart_fn_data;
-static       subscriber_fn_t *multipart_fn = NULL;
-
-static       ngx_str_t   sub_name = ngx_string("http-multipart");
-
-
-subscriber_t *http_multipart_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
-  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
-  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
-  multipart_privdata_t *multipart_data;
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
-  
-  if(multipart_fn == NULL) {
-    multipart_fn = &multipart_fn_data;
-    *multipart_fn = *sub->fn;
-    multipart_fn->enqueue = multipart_enqueue;
-    multipart_fn->respond_message = multipart_respond_message;
-    multipart_fn->respond_status = multipart_respond_status;
-  }
-  
-  fsub->data.shook_hands = 0;
-  
-  fsub->privdata = ngx_palloc(sub->request->pool, sizeof(multipart_privdata_t));
-  multipart_data = (multipart_privdata_t *)fsub->privdata;
-  multipart_data->boundary_end = ngx_snprintf(multipart_data->boundary, 50, "\r\n--%V", nchan_request_multipart_boundary(fsub->sub.request, ctx));
-  
-  //header bufs -- unique per response
-  ctx->output_str_queue = ngx_palloc(r->pool, sizeof(*ctx->output_str_queue));
-  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(headerbuf_t, prev), offsetof(headerbuf_t, next), headerbuf_alloc, NULL, sub->request->pool);
-  
-  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
-  nchan_bufchain_pool_init(ctx->bcp, r->pool);
-  
-  nchan_subscriber_common_setup(sub, HTTP_MULTIPART, &sub_name, multipart_fn, 1, 0);
-  return sub;
-}
-
-ngx_int_t nchan_detect_multipart_subscriber_request(ngx_http_request_t *r) {
-  ngx_str_t       *accept_header = nchan_get_accept_header_value(r);
-
-  if(accept_header && ngx_strnstr(accept_header->data, "multipart/mixed", accept_header->len)) {
-    return 1;
-  }
-  
-  return 0;
-}
diff --git a/debian/modules/nchan/src/subscribers/http-multipart-mixed.h b/debian/modules/nchan/src/subscribers/http-multipart-mixed.h
deleted file mode 100644
index 6a0e097..0000000
--- a/debian/modules/nchan/src/subscribers/http-multipart-mixed.h
+++ /dev/null
@@ -1,3 +0,0 @@
-subscriber_t *http_multipart_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
-
-ngx_int_t nchan_detect_multipart_subscriber_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/http-raw-stream.c b/debian/modules/nchan/src/subscribers/http-raw-stream.c
deleted file mode 100644
index 7d1bc90..0000000
--- a/debian/modules/nchan/src/subscribers/http-raw-stream.c
+++ /dev/null
@@ -1,156 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include <util/nchan_bufchainpool.h>
-#include "longpoll.h"
-#include "longpoll-private.h"
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:RAWSTREAM:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:RAWSTREAM:" fmt, ##arg)
-#include <assert.h> 
-
-static void rawstream_ensure_headers_sent(full_subscriber_t *fsub) {
-  ngx_http_request_t             *r = fsub->sub.request;
-  //nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
-  if(!fsub->data.shook_hands) {
-    nchan_cleverly_output_headers_only_for_later_response(r);
-    fsub->data.shook_hands = 1; 
-    r->header_only = 0;
-    r->chunked = 0;
-  }
-}
-
-static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
-  
-  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
-  ngx_buf_t              *buf = NULL, *msg_buf = &msg->buf;
-  ngx_int_t               rc;
-  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(fsub->sub.request, ngx_nchan_module);
-  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
-  nchan_buf_and_chain_t  *bc;
-  ngx_chain_t            *chain;
-  ngx_file_t             *file_copy;
-  
-  size_t                  separator_len = cf->subscriber_http_raw_stream_separator.len;
-  size_t                  msg_len = ngx_buf_size(msg_buf);
-  
-  
-  if(fsub->data.timeout_ev.timer_set) {
-    ngx_del_timer(&fsub->data.timeout_ev);
-    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
-  }
-  
-  if(msg_len + separator_len == 0) {
-    //nothing to output
-    return NGX_OK;
-  }
-  
-  if((bc = nchan_bufchain_pool_reserve(ctx->bcp, ((separator_len > 0 ? 1 : 0) + (msg_len > 0 ? 1: 0)))) == NULL) {
-    ERR("can't allocate buf-and-chains for http-raw-stream client output");
-    return NGX_ERROR;
-  }
-  
-  chain = &bc->chain;
-  
-  //message
-  if(msg_len > 0) {
-    buf = chain->buf;
-    *buf = *msg_buf;
-    if(buf->file) {
-      file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
-      nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
-    }
-    buf->last_buf = 0;
-    buf->last_in_chain = 0;
-    buf->flush = 0;
-    
-    chain = chain->next;
-  }
-  
-  //separator 
-  if(separator_len) {
-    buf = chain->buf;
-    ngx_memzero(buf, sizeof(ngx_buf_t));
-    buf->start = cf->subscriber_http_raw_stream_separator.data;
-    buf->pos = buf->start;
-    buf->end = buf->start + separator_len;
-    buf->last = buf->end;
-    buf->memory = 1;
-  }
-
-  if(buf) {
-    buf->last_buf = 0;
-    buf->last_in_chain = 1;
-    buf->flush = 1;
-  }
-  
-  rawstream_ensure_headers_sent(fsub);
-  
-  DBG("%p output msg to subscriber", sub);
-  
-  rc = nchan_output_msg_filter(fsub->sub.request, msg, &bc->chain);
-  
-  return rc;
-}
-
-static ngx_int_t rawstream_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body){
-  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
-  //nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
-  
-  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
-    //ignore
-    return NGX_OK;
-  }
-  
-  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code < 600) {
-    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
-  }
-  
-  subscriber_maybe_dequeue_after_status_response(fsub, status_code);
-
-  return NGX_OK;
-}
-
-static ngx_int_t rawstream_enqueue(subscriber_t *sub) {
-  ngx_int_t           rc;
-  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
-  DBG("%p output status to subscriber", sub);
-  rc = longpoll_enqueue(sub);
-  fsub->data.finalize_request = 0;
-  rawstream_ensure_headers_sent(fsub);
-  sub->enqueued = 1;
-  return rc;
-}
-
-static       subscriber_fn_t  rawstream_fn_data;
-static       subscriber_fn_t *rawstream_fn = NULL;
-
-static       ngx_str_t   sub_name = ngx_string("http-raw-stream");
-
-
-subscriber_t *http_raw_stream_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
-  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
-  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
-  
-  if(rawstream_fn == NULL) {
-    rawstream_fn = &rawstream_fn_data;
-    *rawstream_fn = *sub->fn;
-    rawstream_fn->enqueue = rawstream_enqueue;
-    rawstream_fn->respond_message = rawstream_respond_message;
-    rawstream_fn->respond_status = rawstream_respond_status;
-  }
-  
-  fsub->data.shook_hands = 0;
-  r->keepalive=0;
-  
-  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
-  nchan_bufchain_pool_init(ctx->bcp, r->pool);
-  
-  nchan_subscriber_common_setup(sub, HTTP_RAW_STREAM, &sub_name, rawstream_fn, 1, 0);
-  return sub;
-}
-
diff --git a/debian/modules/nchan/src/subscribers/http-raw-stream.h b/debian/modules/nchan/src/subscribers/http-raw-stream.h
deleted file mode 100644
index b85530b..0000000
--- a/debian/modules/nchan/src/subscribers/http-raw-stream.h
+++ /dev/null
@@ -1 +0,0 @@
-subscriber_t *http_raw_stream_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
diff --git a/debian/modules/nchan/src/subscribers/internal.c b/debian/modules/nchan/src/subscribers/internal.c
deleted file mode 100644
index aba5bbc..0000000
--- a/debian/modules/nchan/src/subscribers/internal.c
+++ /dev/null
@@ -1,298 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include "internal.h"
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:INTERNAL:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:INTERNAL:" fmt, ##arg)
-
-static const subscriber_t new_internal_sub;
-
-static ngx_int_t empty_callback(ngx_int_t code, void *ptr, void *d) {
-  return NGX_OK;
-}
-
-ngx_int_t internal_subscriber_set_enqueue_handler(subscriber_t *sub, callback_pt handler) {
-  ((internal_subscriber_t *)sub)->enqueue = handler;
-  return NGX_OK;
-}
-ngx_int_t internal_subscriber_set_dequeue_handler(subscriber_t *sub, callback_pt handler) {
-  ((internal_subscriber_t *)sub)->dequeue = handler;
-  return NGX_OK;
-}
-ngx_int_t internal_subscriber_set_notify_handler(subscriber_t *sub, callback_pt handler) {
-  ((internal_subscriber_t *)sub)->notify = handler;
-  return NGX_OK;
-}
-ngx_int_t internal_subscriber_set_respond_message_handler(subscriber_t *sub, callback_pt handler) {
-  ((internal_subscriber_t *)sub)->respond_message = handler;
-  return NGX_OK;
-}
-ngx_int_t internal_subscriber_set_respond_status_handler(subscriber_t *sub, callback_pt handler) {
-  ((internal_subscriber_t *)sub)->respond_status = handler;
-  return NGX_OK;
-}
-ngx_int_t internal_subscriber_set_destroy_handler(subscriber_t *sub, callback_pt handler) {
-  ((internal_subscriber_t *)sub)->destroy = handler;
-  return NGX_OK;
-}
-
-static ngx_str_t     subscriber_name = ngx_string("internal");
-
-subscriber_t *internal_subscriber_create(ngx_str_t *name, nchan_loc_conf_t *cf, size_t pd_size, void **pd) {
-  internal_subscriber_t               *fsub;
-  
-  if((fsub = ngx_alloc(sizeof(*fsub) + pd_size, ngx_cycle->log)) == NULL) {
-    ERR("Unable to allocate");
-    return NULL;
-  }
-  if(pd) {
-    *pd = pd_size > 0 ? &fsub[1] : NULL;
-  }
-  
-  nchan_subscriber_init(&fsub->sub, &new_internal_sub, NULL, NULL);
-  nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->timeout_ev);
-  fsub->sub.cf = cf;
-  fsub->sub.name= (name == NULL ? &subscriber_name : name);
-  
-  fsub->enqueue = empty_callback;
-  fsub->dequeue = empty_callback;
-  fsub->respond_message = empty_callback;
-  fsub->respond_status = empty_callback;
-  fsub->notify = empty_callback;
-  fsub->destroy = empty_callback;
-  
-  DBG("%p create %V with privdata %p", fsub, fsub->sub.name, *pd);
-  fsub->privdata = pd_size == 0 ? NULL : *pd;
-  
-  fsub->already_dequeued = 0;
-  fsub->awaiting_destruction = 0;
-  
-  fsub->enqueue_callback = NULL;
-  fsub->enqueue_callback_data = NULL;
-  
-  fsub->dequeue_callback = NULL;
-  fsub->dequeue_callback_data = NULL;
-  
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-  subscriber_debug_add(&fsub->sub);
-#endif
-  
-  return &fsub->sub;
-}
-
-subscriber_t *internal_subscriber_create_init(ngx_str_t *sub_name, nchan_loc_conf_t *cf, size_t pd_sz, void **pd, callback_pt enqueue, callback_pt dequeue, callback_pt respond_message, callback_pt respond_status, callback_pt notify_handler, callback_pt destroy_handler) {
-  subscriber_t          *sub;
-  
-  if(pd == NULL) {
-    ERR("nowhere to allocate %V subscriber data", sub_name);
-    return NULL;
-  }
-  
-  sub = internal_subscriber_create(sub_name, cf, pd_sz, pd);
-  if(enqueue)
-    internal_subscriber_set_enqueue_handler(sub, enqueue);
-  if(dequeue)
-    internal_subscriber_set_dequeue_handler(sub, dequeue);
-  if(respond_message)
-    internal_subscriber_set_respond_message_handler(sub, respond_message);
-  if(respond_status)
-    internal_subscriber_set_respond_status_handler(sub, respond_status);
-  if(notify_handler)
-    internal_subscriber_set_notify_handler(sub, notify_handler);
-  if(destroy_handler) 
-    internal_subscriber_set_destroy_handler(sub, destroy_handler);
-  return sub;
-}
-
-ngx_int_t internal_subscriber_destroy(subscriber_t *sub) {
-  internal_subscriber_t  *fsub = (internal_subscriber_t  *)sub;
-  if(sub->reserved > 0) {
-    DBG("%p not ready to destroy (reserved for %i)", sub, sub->reserved);
-    fsub->awaiting_destruction = 1;
-  }
-  else {
-    DBG("%p (%V) destroy", sub, fsub->sub.name);
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-    subscriber_debug_remove(sub);
-#endif
-    fsub->destroy(NGX_OK, NULL, fsub->privdata);
-    nchan_free_msg_id(&sub->last_msgid);
-    ngx_free(fsub);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t internal_reserve(subscriber_t *self) {
-  internal_subscriber_t  *fsub = (internal_subscriber_t  *)self;
-  DBG("%p ) (%V) reserve", self, fsub->sub.name);
-  self->reserved++;
-  return NGX_OK;
-}
-static ngx_int_t internal_release(subscriber_t *sub, uint8_t nodestroy) {
-  internal_subscriber_t  *fsub = (internal_subscriber_t  *)sub;
-  DBG("%p (%V) release", sub, fsub->sub.name);
-  sub->reserved--;
-  if(nodestroy == 0 && fsub->awaiting_destruction == 1 && sub->reserved == 0) {
-    DBG("%p (%V) free", sub, fsub->sub.name);
-    fsub->destroy(NGX_OK, NULL, fsub->privdata);
-    nchan_free_msg_id(&sub->last_msgid);
-    ngx_free(fsub);
-    return NGX_ABORT;
-  }
-  else {
-    return NGX_OK;
-  }
-}
-
-void *internal_subscriber_get_privdata(subscriber_t *sub) {
-  internal_subscriber_t               *fsub = (internal_subscriber_t *)sub;
-  return fsub->privdata;
-}
-
-static void reset_timer(internal_subscriber_t *f) {
-  if(f->sub.cf && f->sub.cf->subscriber_timeout > 0) {
-    if(f->timeout_ev.timer_set) {
-      ngx_del_timer(&f->timeout_ev);
-    }
-    ngx_add_timer(&f->timeout_ev, f->sub.cf->subscriber_timeout * 1000);
-  }
-}
-
-static ngx_int_t internal_enqueue(subscriber_t *self) {
-  internal_subscriber_t   *fsub = (internal_subscriber_t *)self;
-  DBG("%p (%V) enqueue", self, fsub->sub.name);
-  if(self->cf && self->cf->subscriber_timeout > 0 && !fsub->timeout_ev.timer_set) {
-    //add timeout timer
-    reset_timer(fsub);
-  }
-  fsub->enqueue(NGX_OK, NULL, fsub->privdata);
-  if(fsub->enqueue_callback) {
-    fsub->enqueue_callback(self, fsub->enqueue_callback_data);
-  }
-  self->enqueued = 1;
-  return NGX_OK;
-}
-
-static ngx_int_t internal_dequeue(subscriber_t *self) {
-  internal_subscriber_t   *f = (internal_subscriber_t *)self;
-  if (f->already_dequeued) {
-    return NGX_OK; //it's ok to be dequeued more than once,
-    //because a subscriber may linger a bit before being deleted
-  }
-  f->already_dequeued = 1;
-  DBG("%p (%V) dequeue sub", self, f->sub.name);
-  f->dequeue(NGX_OK, NULL, f->privdata);
-  if(f->dequeue_callback) {
-    f->dequeue_callback(self, f->dequeue_callback_data);
-  }
-  if(self->cf && self->cf->subscriber_timeout > 0 && f->timeout_ev.timer_set) {
-    ngx_del_timer(&f->timeout_ev);
-  }
-  self->enqueued = 0;
-  if(self->destroy_after_dequeue) {
-    internal_subscriber_destroy(self);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t dequeue_maybe(subscriber_t *self) {
-  if(self->dequeue_after_response) {
-    self->fn->dequeue(self);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t internal_respond_message(subscriber_t *self, nchan_msg_t *msg) {
-  internal_subscriber_t   *f = (internal_subscriber_t *)self;
-  
-  update_subscriber_last_msg_id(self, msg);
-  
-  DBG("%p (%V) respond msg %p", self, f->sub.name, msg);
-  f->respond_message(NGX_OK, msg, f->privdata);
-  reset_timer(f);
-  return dequeue_maybe(self);
-}
-
-static ngx_int_t internal_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
-  internal_subscriber_t   *f = (internal_subscriber_t *)self;
-  DBG("%p status %i", self, status_code);
-  if(status_code == NGX_HTTP_GONE) {
-    self->dequeue_after_response = 1;
-  }
-  f->respond_status(status_code, (void *)status_line, f->privdata);
-  reset_timer(f);
-  return dequeue_maybe(self);
-}
-
-static ngx_int_t internal_set_enqueue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
-  internal_subscriber_t   *f = (internal_subscriber_t *)self;
-  if(cb != NULL) {
-    DBG("%p set enqueue callback to %p", self, cb);
-    f->dequeue_callback = cb;
-  }
-  if(privdata != NULL) {
-    DBG("%p set enqueue callback data to %p", self, cb);
-    f->dequeue_callback_data = privdata;
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t internal_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
-  internal_subscriber_t   *f = (internal_subscriber_t *)self;
-  if(cb != NULL) {
-    DBG("%p set dequeue callback to %p", self, cb);
-    f->dequeue_callback = cb;
-  }
-  if(privdata != NULL) {
-    DBG("%p set dequeue callback data to %p", self, cb);
-    f->dequeue_callback_data = privdata;
-  }
-  return NGX_OK;
-}
-
-
-ngx_int_t internal_subscriber_set_name(subscriber_t *self, ngx_str_t *name) {
-  self->name = name;
-  return NGX_OK;
-}
-
-static ngx_int_t internal_notify(subscriber_t *self, ngx_int_t code, void *data) {
-  internal_subscriber_t   *fsub = (internal_subscriber_t *)self;
-  return fsub->notify(code, data, fsub->privdata);
-}
-
-static const subscriber_fn_t internal_sub_fn = {
-  &internal_enqueue,
-  &internal_dequeue,
-  &internal_respond_message,
-  &internal_respond_status,
-  &internal_set_enqueue_callback,
-  &internal_set_dequeue_callback,
-  &internal_reserve,
-  &internal_release,
-  &internal_notify,
-  &nchan_subscriber_subscribe
-};
-
-static const subscriber_t new_internal_sub = {
-  &subscriber_name,
-  INTERNAL,
-  &internal_sub_fn,
-  UNKNOWN,
-  NCHAN_ZERO_MSGID,
-  NULL,
-  NULL,
-  NULL,
-  0, //reserved
-  0, //enable sub/unsub callbacks
-  0, //stick around after response
-  1, //destroy after dequeue
-  0, //enqueued
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-  NULL, NULL, NULL
-#endif
-};
diff --git a/debian/modules/nchan/src/subscribers/internal.h b/debian/modules/nchan/src/subscribers/internal.h
deleted file mode 100644
index 0c9e609..0000000
--- a/debian/modules/nchan/src/subscribers/internal.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#define NCHAN_DEFAULT_INTERNAL_SUBSCRIBER_POOL_SIZE 1024
-
-typedef struct {
-  subscriber_t            sub;
-  callback_pt             enqueue;
-  callback_pt             dequeue;
-  callback_pt             respond_message;
-  callback_pt             respond_status;
-  callback_pt             notify;
-  callback_pt             destroy;
-  ngx_event_t             timeout_ev;
-  subscriber_callback_pt  enqueue_callback;
-  void                   *enqueue_callback_data;
-  subscriber_callback_pt  dequeue_callback;
-  void                   *dequeue_callback_data;
-  void                   *privdata;
-  unsigned                already_dequeued:1;
-  unsigned                awaiting_destruction:1;
-} internal_subscriber_t;
-
-extern subscriber_t *internal_subscriber_create(ngx_str_t *, nchan_loc_conf_t *cf, size_t pd_sz, void **pd);
-extern ngx_int_t internal_subscriber_destroy(subscriber_t *sub);
-
-subscriber_t *internal_subscriber_create_init(ngx_str_t *sub_name, nchan_loc_conf_t *cf, size_t pd_sz, void **pd, callback_pt enqueue, callback_pt dequeue, callback_pt respond_message, callback_pt respond_status, callback_pt notify_handler, callback_pt destroy_handler);
-ngx_int_t internal_subscriber_set_name(subscriber_t *sub, ngx_str_t *name);
-ngx_int_t internal_subscriber_set_enqueue_handler(subscriber_t *sub, callback_pt handler);
-ngx_int_t internal_subscriber_set_dequeue_handler(subscriber_t *sub, callback_pt handler);
-ngx_int_t internal_subscriber_set_notify_handler(subscriber_t *sub, callback_pt handler);
-ngx_int_t internal_subscriber_set_respond_message_handler(subscriber_t *sub, callback_pt handler);
-ngx_int_t internal_subscriber_set_respond_status_handler(subscriber_t *sub, callback_pt handler);
-ngx_int_t internal_subscriber_set_destroy_handler(subscriber_t *sub, callback_pt handler);
-void *internal_subscriber_get_privdata(subscriber_t *sub);
diff --git a/debian/modules/nchan/src/subscribers/intervalpoll.c b/debian/modules/nchan/src/subscribers/intervalpoll.c
deleted file mode 100644
index 54537bf..0000000
--- a/debian/modules/nchan/src/subscribers/intervalpoll.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include "longpoll.h"
-#include "longpoll-private.h"
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:INTERVALPOLL:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:INTERVALPOLL:" fmt, ##arg)
-#include <assert.h> 
-
-static       ngx_str_t   sub_name = ngx_string("intervalpoll");
-
-subscriber_t *intervalpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
-  subscriber_t         *sub;
-  full_subscriber_t    *fsub;
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  sub = longpoll_subscriber_create(r, msg_id);
-  
-  fsub = (full_subscriber_t *)sub;
-  
-  fsub->data.act_as_intervalpoll = 1;
-  
-  sub->name = &sub_name;
-  sub->type = INTERVALPOLL;
-  
-  if(ctx) {
-    ctx->subscriber_type = sub->name;
-  }
-  return sub;
-}
diff --git a/debian/modules/nchan/src/subscribers/intervalpoll.h b/debian/modules/nchan/src/subscribers/intervalpoll.h
deleted file mode 100644
index c493730..0000000
--- a/debian/modules/nchan/src/subscribers/intervalpoll.h
+++ /dev/null
@@ -1 +0,0 @@
-subscriber_t *intervalpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/longpoll-private.h b/debian/modules/nchan/src/subscribers/longpoll-private.h
deleted file mode 100644
index cd9d85c..0000000
--- a/debian/modules/nchan/src/subscribers/longpoll-private.h
+++ /dev/null
@@ -1,38 +0,0 @@
-typedef struct nchan_longpoll_multimsg_s nchan_longpoll_multimsg_t;
-struct nchan_longpoll_multimsg_s {
-  nchan_msg_t                   *msg;
-  nchan_longpoll_multimsg_t     *next;
-};
-
-typedef struct {
-  ngx_http_cleanup_t      *cln;
-  subscriber_callback_pt  enqueue_callback;
-  void                   *enqueue_callback_data;
-  subscriber_callback_pt  dequeue_callback;
-  void                   *dequeue_callback_data;
-  ngx_event_t             timeout_ev;
-  ngx_event_t             ping_ev;
-  
-  nchan_longpoll_multimsg_t *multimsg_first;
-  nchan_longpoll_multimsg_t *multimsg_last;
-  
-  unsigned                act_as_intervalpoll:1;
-  unsigned                holding:1;
-  unsigned                finalize_request:1;
-  unsigned                already_responded:1;
-  unsigned                awaiting_destruction:1;
-  unsigned                shook_hands:1;
-} subscriber_data_t;
-
-typedef struct {
-  subscriber_t       sub;
-  subscriber_data_t  data;
-  void              *privdata;
-} full_subscriber_t;
-
-ngx_int_t longpoll_enqueue(subscriber_t *self);
-ngx_int_t longpoll_dequeue(subscriber_t *self);
-
-void subscriber_maybe_dequeue_after_status_response(full_subscriber_t *fsub, ngx_int_t status_code);
-
-ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t  *status_body);
diff --git a/debian/modules/nchan/src/subscribers/longpoll.c b/debian/modules/nchan/src/subscribers/longpoll.c
deleted file mode 100644
index e7a6a65..0000000
--- a/debian/modules/nchan/src/subscribers/longpoll.c
+++ /dev/null
@@ -1,550 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:LONGPOLL:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:LONGPOLL:" fmt, ##arg)
-#include <assert.h>
-#include "longpoll-private.h"
-
-#include <store/memory/store.h>
-
-void memstore_fakeprocess_push(ngx_int_t slot);
-void memstore_fakeprocess_push_random(void);
-void memstore_fakeprocess_pop(void);
-ngx_int_t memstore_slot(void);
-
-static const subscriber_t new_longpoll_sub;
-
-static void empty_handler() { }
-
-static void sudden_abort_handler(subscriber_t *sub) {
-  if(sub->request && sub->status != DEAD) {
-    sub->request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
-  }
-#if FAKESHARD
-  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
-  memstore_fakeprocess_push(fsub->sub.owner);
-#endif
-  sub->status = DEAD;
-  sub->fn->dequeue(sub);
-#if FAKESHARD
-  memstore_fakeprocess_pop();
-#endif
-}
-
-//void verify_unique_response(ngx_str_t *uri, nchan_msg_id_t *msgid, nchan_msg_t *msg, subscriber_t *sub);
-
-subscriber_t *longpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
-  DBG("create for req %p", r);
-  full_subscriber_t      *fsub;
-
-  //TODO: allocate from pool (but not the request's pool)
-  if((fsub = ngx_alloc(sizeof(*fsub), ngx_cycle->log)) == NULL) {
-    ERR("Unable to allocate");
-    assert(0);
-    return NULL;
-  }
-  
-  nchan_subscriber_init(&fsub->sub, &new_longpoll_sub, r, msg_id);
-  fsub->privdata = NULL;
-  fsub->data.cln = NULL;
-  fsub->data.finalize_request = 1;
-  fsub->data.holding = 0;
-  fsub->data.act_as_intervalpoll = 0;
-  
-  nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->data.timeout_ev);
-  
-  fsub->data.enqueue_callback = empty_handler;
-  fsub->data.enqueue_callback_data = NULL;
-  
-  fsub->data.dequeue_callback = empty_handler;
-  fsub->data.dequeue_callback_data = NULL;
-  
-  fsub->data.already_responded = 0;
-  fsub->data.awaiting_destruction = 0;
-  
-  if(fsub->sub.cf->longpoll_multimsg) {
-    nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-    fsub->sub.dequeue_after_response = 0;
-    ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
-    nchan_bufchain_pool_init(ctx->bcp, r->pool);
-
-  }
-  
-  fsub->data.multimsg_first = NULL;
-  fsub->data.multimsg_last = NULL;
-  
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-  subscriber_debug_add(&fsub->sub);
-#endif
-  
-  //http request sudden close cleanup
-  if((fsub->data.cln = ngx_http_cleanup_add(r, 0)) == NULL) {
-    ERR("Unable to add request cleanup for longpoll subscriber");
-    assert(0);
-    return NULL;
-  }
-  fsub->data.cln->data = fsub;
-  fsub->data.cln->handler = (ngx_http_cleanup_pt )sudden_abort_handler;
-  DBG("%p created for request %p", &fsub->sub, r);
-  
-  
-  return &fsub->sub;
-}
-
-ngx_int_t longpoll_subscriber_destroy(subscriber_t *sub) {
-  full_subscriber_t   *fsub = (full_subscriber_t  *)sub;
-  
-  if(sub->reserved > 0) {
-    DBG("%p not ready to destroy (reserved for %i) for req %p", sub, sub->reserved, fsub->sub.request);
-    fsub->data.awaiting_destruction = 1;
-  }
-  else {
-    DBG("%p destroy for req %p", sub, fsub->sub.request);
-    nchan_free_msg_id(&fsub->sub.last_msgid);
-    assert(sub->status == DEAD);
-    nchan_subscriber_subrequest_cleanup(sub);
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-    subscriber_debug_remove(sub);
-    ngx_memset(fsub, 0xB9, sizeof(*fsub)); //debug
-#endif
-    ngx_free(fsub);
-  }
-  return NGX_OK;
-}
-
-static void finalize_request_handler(ngx_http_request_t *r) {
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  if(ctx->sub == NULL) {
-    ngx_http_test_reading(r);
-    return;
-  }
-  subscriber_t *sub = ctx->sub;
-  #if FAKESHARD
-    memstore_fakeprocess_push(sub->owner);
-  #endif
-    
-    ngx_connection_t *c = r->connection;
-    ngx_event_t      *rev = c->read;
-  
-  
-    if (c->error || c->timedout || c->close || c->destroyed || rev->closed || rev->eof || rev->pending_eof) {
-      ngx_http_test_reading(r);
-      return;
-    }
-    
-    sub->dequeue_after_response = 1;
-    sub->fn->respond_status(sub, NGX_HTTP_BAD_REQUEST, &NCHAN_HTTP_STATUS_400, NULL);
-  #if FAKESHARD
-    memstore_fakeprocess_pop();
-  #endif
-}
-
-static void ensure_request_hold(full_subscriber_t *fsub) {
-  if(fsub->data.holding == 0) {
-    DBG("hodl request %p", fsub->sub.request);
-    fsub->data.holding = 1;
-    fsub->sub.request->read_event_handler = finalize_request_handler;
-    fsub->sub.request->write_event_handler = ngx_http_request_empty_handler;
-    fsub->sub.request->main->count++; //this is the right way to hold and finalize the request... maybe
-  }
-}
-
-static ngx_int_t longpoll_reserve(subscriber_t *self) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  ensure_request_hold(fsub);
-  self->reserved++;
-  DBG("%p reserve for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
-  return NGX_OK;
-}
-static ngx_int_t longpoll_release(subscriber_t *self, uint8_t nodestroy) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  assert(self->reserved > 0);
-  self->reserved--;
-  DBG("%p release for req %p. reservations: %i", self, fsub->sub.request, self->reserved);
-  if(nodestroy == 0 && fsub->data.awaiting_destruction == 1 && self->reserved == 0) {
-    longpoll_subscriber_destroy(self);
-    return NGX_ABORT;
-  }
-  else {
-    return NGX_OK;
-  }
-}
-
-ngx_int_t longpoll_enqueue(subscriber_t *self) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  assert(fsub->sub.enqueued == 0);
-  DBG("%p enqueue", self);
-  
-  fsub->data.finalize_request = 1;
-  
-  fsub->sub.enqueued = 1;
-  ensure_request_hold(fsub);
-  if(self->cf->subscriber_timeout > 0) {
-    //add timeout timer
-    ngx_add_timer(&fsub->data.timeout_ev, self->cf->subscriber_timeout * 1000);
-  }
-  
-  if(fsub->data.enqueue_callback) {
-    fsub->data.enqueue_callback(self, fsub->data.enqueue_callback_data);
-  }
-  
-  return NGX_OK;
-}
-
-ngx_int_t longpoll_dequeue(subscriber_t *self) {
-  full_subscriber_t    *fsub = (full_subscriber_t  *)self;
-  ngx_http_request_t   *r = fsub->sub.request;
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  int                   finalize_now = fsub->data.finalize_request;
-  if(fsub->data.timeout_ev.timer_set) {
-    ngx_del_timer(&fsub->data.timeout_ev);
-  }
-  DBG("%p dequeue", self);
-  if(fsub->data.dequeue_callback) {
-    fsub->data.dequeue_callback(self, fsub->data.dequeue_callback_data);
-  }
-  
-  if(self->enqueued && self->enable_sub_unsub_callbacks && self->cf->unsubscribe_request_url) {
-    nchan_subscriber_unsubscribe_request(self);
-  }
-  
-  self->enqueued = 0;
-  
-  ctx->sub = NULL;
-  
-  if(finalize_now) {
-    DBG("finalize request %p", r);
-    nchan_http_finalize_request(r, NGX_OK);
-    self->status = DEAD;
-  }
-  
-  if(self->destroy_after_dequeue) {
-    longpoll_subscriber_destroy(self);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t dequeue_maybe(subscriber_t *self) {
-  if(self->dequeue_after_response) {
-    self->fn->dequeue(self);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t abort_response(subscriber_t *sub, char *errmsg) {
-  if(sub->request) {
-    nchan_log_request_warning(sub->request, "%V subscriber: %s", sub->name, errmsg ? errmsg : "weird response error");
-  }
-  else {
-    nchan_log_warning("%V subscriber: %s", sub->name, errmsg ? errmsg : "weird response error");
-  }
-  sub->fn->dequeue(sub);
-  return NGX_ERROR;
-}
-
-static ngx_int_t longpoll_multipart_add(full_subscriber_t *fsub, nchan_msg_t *msg, char **err) {
-  
-  nchan_longpoll_multimsg_t     *mmsg;
-  
-  if((mmsg = ngx_palloc(fsub->sub.request->pool, sizeof(*mmsg))) == NULL) {
-    *err = "can't allocate multipart msg link";
-    return NGX_ERROR;
-  }
-  
-  if(msg->storage != NCHAN_MSG_SHARED) {
-    if((msg = nchan_msg_derive_palloc(msg, fsub->sub.request->pool)) == NULL) {
-      *err = "can't allocate derived msg in request pool";
-      return NGX_ERROR;
-    }
-  }
-  msg_reserve(msg, "longpoll multipart");
-  assert(msg->refcount > 0);
-  
-  mmsg->msg = msg;
-  mmsg->next = NULL;
-  if(fsub->data.multimsg_first == NULL) {
-    fsub->data.multimsg_first = mmsg;
-  }
-  if(fsub->data.multimsg_last) {
-    fsub->data.multimsg_last->next = mmsg;
-  }
-  fsub->data.multimsg_last = mmsg;
-  
-  return NGX_OK;
-}
-
-static ngx_int_t longpoll_respond_message(subscriber_t *self, nchan_msg_t *msg) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  ngx_int_t                  rc;
-  char                      *err = NULL;
-  ngx_http_request_t        *r = fsub->sub.request;
-  nchan_request_ctx_t       *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  nchan_loc_conf_t          *cf = fsub->sub.cf;
-  
-  DBG("%p respond req %p msg %p", self, r, msg);
-  
-  ctx->prev_msg_id = self->last_msgid;
-  update_subscriber_last_msg_id(self, msg);
-  ctx->msg_id = self->last_msgid;
-
-  //verify_unique_response(&fsub->data.request->uri, &self->last_msgid, msg, self);
-  if(fsub->data.timeout_ev.timer_set) {
-    ngx_del_timer(&fsub->data.timeout_ev);
-  }
-  if(!cf->longpoll_multimsg) {
-    //disable abort handler
-    fsub->data.cln->handler = empty_handler;
-    
-    assert(fsub->data.already_responded != 1);
-    fsub->data.already_responded = 1;
-    if((rc = nchan_respond_msg(r, msg, &self->last_msgid, 0, &err)) != NGX_OK) {
-      return abort_response(self, err);
-    }
-  }
-  else {
-    if((rc = longpoll_multipart_add(fsub, msg, &err)) != NGX_OK) {
-      return abort_response(self, err);
-    }
-  }
-  dequeue_maybe(self);
-  return rc;
-}
-
-static void multipart_request_cleanup_handler(nchan_longpoll_multimsg_t *first) {
-  nchan_longpoll_multimsg_t    *cur;
-  for(cur = first; cur != NULL; cur = cur->next) {
-    msg_release(cur->msg, "longpoll multipart");
-  }
-}
-
-static ngx_int_t longpoll_multipart_respond(full_subscriber_t *fsub) {
-  ngx_http_request_t    *r = fsub->sub.request;
-  nchan_request_ctx_t   *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  char                  *err;
-  ngx_int_t              rc;
-  u_char                *char_boundary = NULL;
-  u_char                *char_boundary_last;
-  
-  struct {
-    ngx_buf_t            first;
-    ngx_buf_t            mid;
-    ngx_buf_t            last;
-  }                      boundary;
-  
-  ngx_buf_t              double_newline_buf;
-  ngx_str_t             *content_type;
-  nchan_loc_conf_t      *cf = fsub->sub.cf;
-  int                    use_raw_stream_separator = cf->longpoll_multimsg_use_raw_stream_separator;
-  
-  ngx_init_set_membuf_char(&double_newline_buf, "\r\n\r\n");
-  
-  nchan_longpoll_multimsg_t *first, *cur;
-  
-  //disable abort handler
-  fsub->data.cln->handler = empty_handler;
-  
-  first = fsub->data.multimsg_first;
-  
-  fsub->sub.dequeue_after_response = 1;
-  
-  //cleanup to release msgs
-  fsub->data.cln = ngx_http_cleanup_add(fsub->sub.request, 0);
-  fsub->data.cln->data = first;
-  fsub->data.cln->handler = (ngx_http_cleanup_pt )multipart_request_cleanup_handler;
-  
-  if(fsub->data.multimsg_first == fsub->data.multimsg_last) {
-    //just one message.
-    if((rc = nchan_respond_msg(r, fsub->data.multimsg_first->msg, &fsub->sub.last_msgid, 0, &err)) != NGX_OK) {
-      return abort_response(&fsub->sub, err);
-    }
-    return NGX_OK;
-  }
-  
-  //multi messages
-  if(!use_raw_stream_separator) {
-    nchan_request_set_content_type_multipart_boundary_header(r, ctx);
-    char_boundary = ngx_palloc(r->pool, 50);
-    char_boundary_last = ngx_snprintf(char_boundary, 50, ("\r\n--%V--\r\n"), nchan_request_multipart_boundary(r, ctx));
-    
-    //set up the boundaries
-    ngx_init_set_membuf(&boundary.first, &char_boundary[2], &char_boundary_last[-4]);
-    ngx_init_set_membuf(&boundary.mid, &char_boundary[0], &char_boundary_last[-4]);
-    ngx_init_set_membuf(&boundary.last, &char_boundary[0], char_boundary_last);
-  }
-  
-  for(cur = first; cur != NULL; cur = cur->next) {
-    if(!use_raw_stream_separator) {
-      // each buffer needs to be unique for the purpose of dealing with nginx output guts
-      // (something about max. 64 iovecs per write call and counting the number of bytes already sent)
-      
-      nchan_bufchain_append_buf(ctx->bcp, cur == first ? &boundary.first : &boundary.mid);
-      
-      content_type = cur->msg->content_type;
-      if (content_type) {
-        nchan_bufchain_append_cstr(ctx->bcp, "\r\nContent-Type: ");
-        nchan_bufchain_append_str(ctx->bcp, content_type);
-      }
-      nchan_bufchain_append_cstr(ctx->bcp, "\r\n\r\n");
-    }
-    
-    if(ngx_buf_size((&cur->msg->buf)) > 0) {
-      ngx_buf_t             msgbuf = cur->msg->buf;
-      
-      if(msgbuf.file) {
-        ngx_file_t  *file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
-        nchan_msg_buf_open_fd_if_needed(&msgbuf, file_copy, NULL);
-      }
-      nchan_bufchain_append_buf(ctx->bcp, &msgbuf);
-    }
-    
-    if(use_raw_stream_separator) {
-      nchan_bufchain_append_str(ctx->bcp, &cf->subscriber_http_raw_stream_separator);
-    }
-    else if(cur->next == NULL) { //lastmsg
-      nchan_bufchain_append_buf(ctx->bcp, &boundary.last);
-    }
-  }
-  
-  r->headers_out.status = NGX_HTTP_OK;
-  r->headers_out.content_length_n = nchan_bufchain_length(ctx->bcp);
-  nchan_set_msgid_http_response_headers(r, ctx, &fsub->data.multimsg_last->msg->id);
-  nchan_include_access_control_if_needed(r, ctx);
-  if(ngx_http_send_header(r) != NGX_OK) {
-    return abort_response(&fsub->sub, "failed to send longpoll-multipart headers");
-  }
-  if(nchan_output_filter(r, nchan_bufchain_first_chain(ctx->bcp)) != NGX_OK) {
-    return abort_response(&fsub->sub, "failed to send longpoll-multipart body");
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t longpoll_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
-  full_subscriber_t     *fsub = (full_subscriber_t *)self;
-  ngx_http_request_t    *r = fsub->sub.request;
-  nchan_loc_conf_t      *cf = fsub->sub.cf;
-  
-  if(fsub->data.act_as_intervalpoll) {
-    if(status_code == NGX_HTTP_NO_CONTENT || status_code == NGX_HTTP_NOT_MODIFIED || status_code == NGX_HTTP_NOT_FOUND ) {
-      status_code = NGX_HTTP_NOT_MODIFIED;
-    }
-  }
-  else if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
-    if(cf->longpoll_multimsg) {
-      if(fsub->data.multimsg_first != NULL) {
-        if(longpoll_multipart_respond(fsub) == NGX_OK) {
-          dequeue_maybe(self);
-        }
-        else {
-          DBG("%p should have been dequeued through abort_response");
-        }
-      }
-      return NGX_OK;
-    }
-    else { 
-      //don't care, ignore
-      return NGX_OK;
-    }
-  }
-  
-  DBG("%p respond req %p status %i", self, r, status_code);
-  
-  fsub->sub.dequeue_after_response = 1;
-  
-  nchan_set_msgid_http_response_headers(r, NULL, &self->last_msgid);
-  
-  //disable abort handler
-  fsub->data.cln->handler = empty_handler;
-  
-  nchan_respond_status(r, status_code, status_line, status_body, 0);
-
-  dequeue_maybe(self);
-  return NGX_OK;
-}
-
-ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
-  ngx_http_request_t     *r = fsub->sub.request;
-  nchan_loc_conf_t       *cf = fsub->sub.cf;
-  nchan_request_ctx_t    *ctx;
-  
-  fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
-  fsub->data.finalize_request = 0;
-  fsub->sub.status = DEAD;
-  fsub->sub.fn->dequeue(&fsub->sub);
-  if(cf->unsubscribe_request_url || cf->subscribe_request_url) {
-    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-    ctx->sent_unsubscribe_request = 1; //lie about having sent the unsub request already to avoid sending it
-  }
-  return nchan_respond_status(r, status_code, status_line, status_body, 1);
-}
-
-void subscriber_maybe_dequeue_after_status_response(full_subscriber_t *fsub, ngx_int_t status_code) {
-  if((status_code >=400 && status_code < 600) || status_code == NGX_HTTP_NOT_MODIFIED) {
-    fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
-    fsub->sub.request->keepalive=0;
-    fsub->data.finalize_request=1;
-    fsub->sub.request->headers_out.status = status_code;
-    fsub->sub.fn->dequeue(&fsub->sub);
-  }
-}
-
-static void request_cleanup_handler(subscriber_t *sub) {
-
-}
-
-
-static ngx_int_t longpoll_set_enqueue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  fsub->data.enqueue_callback = cb;
-  fsub->data.enqueue_callback_data = privdata;
-  return NGX_OK;
-}
-
-static ngx_int_t longpoll_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  if(fsub->data.cln == NULL) {
-    fsub->data.cln = ngx_http_cleanup_add(fsub->sub.request, 0);
-    fsub->data.cln->data = self;
-    fsub->data.cln->handler = (ngx_http_cleanup_pt )request_cleanup_handler;
-  }
-  fsub->data.dequeue_callback = cb;
-  fsub->data.dequeue_callback_data = privdata;
-  return NGX_OK;
-}
-
-static const subscriber_fn_t longpoll_fn = {
-  &longpoll_enqueue,
-  &longpoll_dequeue,
-  &longpoll_respond_message,
-  &longpoll_respond_status,
-  &longpoll_set_enqueue_callback,
-  &longpoll_set_dequeue_callback,
-  &longpoll_reserve,
-  &longpoll_release,
-  &nchan_subscriber_receive_notice,
-  &nchan_subscriber_authorize_subscribe_request
-};
-
-static ngx_str_t  sub_name = ngx_string("longpoll");
-
-static const subscriber_t new_longpoll_sub = {
-  &sub_name,
-  LONGPOLL,
-  &longpoll_fn,
-  UNKNOWN,
-  NCHAN_ZERO_MSGID,
-  NULL,
-  NULL,
-  NULL,
-  0, //reservations
-  0, //enable sub/unsub callbacks
-  1, //deque after response
-  1, //destroy after dequeue
-  0, //enqueued
-  
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-  NULL, NULL, NULL
-#endif
-};
diff --git a/debian/modules/nchan/src/subscribers/longpoll.h b/debian/modules/nchan/src/subscribers/longpoll.h
deleted file mode 100644
index 65509ed..0000000
--- a/debian/modules/nchan/src/subscribers/longpoll.h
+++ /dev/null
@@ -1,2 +0,0 @@
-subscriber_t *longpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
-ngx_int_t longpoll_subscriber_destroy(subscriber_t *sub);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/subscribers/memstore_ipc.c b/debian/modules/nchan/src/subscribers/memstore_ipc.c
deleted file mode 100644
index a0a2579..0000000
--- a/debian/modules/nchan/src/subscribers/memstore_ipc.c
+++ /dev/null
@@ -1,197 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include <store/memory/ipc.h>
-#include <store/memory/store-private.h>
-#include <store/memory/ipc-handlers.h>
-#include "internal.h"
-#include "memstore_ipc.h"
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MEM-IPC:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-IPC:" fmt, ##arg)
-
-
-typedef struct sub_data_s sub_data_t;
-
-struct sub_data_s {
-  subscriber_t                 *sub;
-  ngx_str_t                    *chid;
-  ngx_int_t                     originator;
-  ngx_int_t                     unhooked;
-  ngx_int_t                     owner;
-  void                         *foreign_chanhead;
-  ngx_event_t                   timeout_ev;
-}; //sub_data_t
-
-static ngx_int_t empty_callback(){
-  return NGX_OK;
-}
-
-static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
-  DBG("%p (%V) memstore subsriber enqueued ok", d->sub, d->chid);
-  return NGX_OK;
-}
-
-static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
-  ngx_int_t           ret;
-  internal_subscriber_t  *fsub = (internal_subscriber_t  *)d->sub;
-  DBG("%p (%V) memstore subscriber dequeue: notify owner", d->sub, d->chid);
-  if(d->timeout_ev.timer_set) {
-    ngx_del_timer(&d->timeout_ev);
-  }
-  if(!d->unhooked) {
-    ret = memstore_ipc_send_unsubscribed(d->originator, d->chid, NULL);
-  }
-  else {
-    ret = NGX_OK;
-  }
-  
-  if(fsub->sub.reserved > 0) {
-    DBG("%p (%V) not ready to destroy (reserved for %i)", fsub, d->chid, fsub->sub.reserved);
-    fsub->awaiting_destruction = 1;
-  }
-  else {
-    DBG("%p (%V) destroy", fsub, d->chid);
-  }
-  
-  return ret;
-}
-
-static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
-  ngx_int_t               rc;
-  nchan_msg_t            *msg = (nchan_msg_t *) ptr;
-  internal_subscriber_t  *fsub = (internal_subscriber_t  *)d->sub;
-  
-  //DBG("%p (%V) memstore subscriber (lastid %V) respond with message %V (lastid %V)", d->sub, d->chid, msgid_to_str(&d->sub->last_msg_id), msgid_to_str(&msg->id), msgid_to_str(&msg->prev_id));
-  
-  //update_subscriber_last_msg_id(d->sub, msg);
-  if(!d->unhooked) {
-    rc = memstore_ipc_send_publish_message(d->originator, d->chid, msg, d->sub->cf, empty_callback, NULL);
-  }
-  else {
-    rc = NGX_OK;
-  }
-  //no multi-ids allowed here
-  assert(msg->id.tagcount == 1);
-    
-  fsub->sub.last_msgid = msg->id;
-  
-  return rc;
-}
-
-static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
-  const ngx_str_t   *status_line = (const ngx_str_t *)ptr;
-  if((status == NGX_HTTP_NO_CONTENT || status == NGX_HTTP_NOT_MODIFIED) && !status_line) {
-    //don't care, ignore
-    return NGX_OK;
-  }
-  
-  if(!ptr) {
-    switch(status) {
-      case NGX_HTTP_GONE: //delete
-        status_line = &NCHAN_HTTP_STATUS_410;
-        break;
-      case NGX_HTTP_CONFLICT:
-        status_line = &NCHAN_HTTP_STATUS_409;
-        break;
-      case NGX_HTTP_NO_CONTENT:
-        assert(0);
-        break;
-      case NGX_HTTP_CLOSE: //delete
-        break;
-      case NGX_HTTP_NOT_MODIFIED: //timeout?
-        break;
-      case NGX_HTTP_FORBIDDEN:
-        break;
-      default:
-        ERR("unknown status %i", status);
-    }
-  }
-  if(!d->unhooked) {
-    return memstore_ipc_send_publish_status(d->originator, d->chid, status, status_line, empty_callback, NULL);
-  }
-  else {
-    return NGX_OK;
-  }
-}
-
-static ngx_int_t sub_respond_notice(ngx_int_t notice, void *ptr, sub_data_t *d) {
-  
-  if(!d->unhooked) {
-    return memstore_ipc_send_publish_notice(d->originator, d->chid, notice, ptr);
-  }
-  else {
-    return NGX_OK;
-  }
-}
-
-static void reset_timer(sub_data_t *data) {
-  if(data->timeout_ev.timer_set) {
-    ngx_del_timer(&data->timeout_ev);
-  }
-  ngx_add_timer(&data->timeout_ev, MEMSTORE_IPC_SUBSCRIBER_TIMEOUT * 1000);
-}
-
-ngx_int_t memstore_ipc_subscriber_keepalive_renew(subscriber_t *sub) {
-  sub_data_t *d = internal_subscriber_get_privdata(sub);
-  reset_timer(d);
-  return NGX_OK;
-}
-
-static void timeout_ev_handler(ngx_event_t *ev) {
-  sub_data_t *d = (sub_data_t *)ev->data;
-  
-  if(!ev->timedout) {
-    return;
-  }
-  ev->timedout = 0;
-  
-#if FAKESHARD
-  memstore_fakeprocess_push(d->owner);
-#endif
-  DBG("%p (%V), timeout event. Ping originator to see if still needed.", d->sub, d->chid);
-  if(!d->unhooked) {
-    memstore_ipc_send_memstore_subscriber_keepalive(d->originator, d->chid, d->sub, d->foreign_chanhead);
-  }
-#if FAKESHARD
-  memstore_fakeprocess_pop();
-#endif
-}
-
-static ngx_str_t  sub_name = ngx_string("memstore-ipc");
-
-subscriber_t *memstore_ipc_subscriber_create(ngx_int_t originator_slot, ngx_str_t *chid, nchan_loc_conf_t *cf, void* foreign_chanhead) { //, nchan_channel_head_t *local_chanhead) {
-  static  nchan_msg_id_t      newest_msgid = NCHAN_NEWEST_MSGID;
-  sub_data_t                 *d;
-  subscriber_t               *sub;
-  
-  assert(originator_slot != memstore_slot());
-  sub = internal_subscriber_create_init(&sub_name, cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_respond_notice, NULL);
-  
-  sub->last_msgid = newest_msgid;
-  sub->destroy_after_dequeue = 1;
-  d->sub = sub;
-  d->chid = chid;
-  d->originator = originator_slot;
-  d->unhooked = 0;
-  assert(foreign_chanhead != NULL);
-  d->foreign_chanhead = foreign_chanhead;
-  //d->chanhead = local_chanhead;
-  d->owner = memstore_slot();
-
-  ngx_memzero(&d->timeout_ev, sizeof(d->timeout_ev));
-  nchan_init_timer(&d->timeout_ev, timeout_ev_handler, d);
-
-  reset_timer(d);
-  DBG("%p (%V) memstore-ipc subscriber created with privdata %p", d->sub, d->chid, d);
-  return sub;
-}
-
-ngx_int_t memstore_ipc_subscriber_unhook(subscriber_t *sub) {
-  sub_data_t *d = internal_subscriber_get_privdata(sub);
-  d->unhooked = 1;
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/subscribers/memstore_ipc.h b/debian/modules/nchan/src/subscribers/memstore_ipc.h
deleted file mode 100644
index 15d58e8..0000000
--- a/debian/modules/nchan/src/subscribers/memstore_ipc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define MEMSTORE_IPC_SUBSCRIBER_TIMEOUT 5
-subscriber_t *memstore_ipc_subscriber_create(ngx_int_t originator_slot, ngx_str_t *chid, nchan_loc_conf_t *cf, void* foreign_chanhead);
-
-ngx_int_t memstore_ipc_subscriber_unhook(subscriber_t *sub);
-ngx_int_t memstore_ipc_subscriber_keepalive_renew(subscriber_t *sub);
diff --git a/debian/modules/nchan/src/subscribers/memstore_multi.c b/debian/modules/nchan/src/subscribers/memstore_multi.c
deleted file mode 100644
index 8bc2118..0000000
--- a/debian/modules/nchan/src/subscribers/memstore_multi.c
+++ /dev/null
@@ -1,175 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include <store/memory/ipc.h>
-#include <store/memory/store-private.h>
-#include <store/memory/ipc-handlers.h>
-
-#include <store/memory/store.h>
-#include <store/redis/store.h>
-
-#include "internal.h"
-#include "memstore_multi.h"
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MEM-MULTI:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-MULTI:" fmt, ##arg)
-
-
-typedef struct {
-  memstore_channel_head_t      *target_chanhead;
-  memstore_channel_head_t      *multi_chanhead;
-  memstore_multi_t             *multi;
-  ngx_int_t                     n;
-} sub_data_t;
-
-/*
-static ngx_int_t empty_callback(){
-  return NGX_OK;
-}
-*/
-
-static void change_sub_count(memstore_channel_head_t *ch, ngx_int_t n) {
-  ch->total_sub_count += n;
-  ch->channel.subscribers += n;
-  if(ch->shared) {
-    ngx_atomic_fetch_add(&ch->shared->sub_count, n);
-  }
-  if(ch->cf->redis.enabled && ch->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
-    memstore_fakesub_add(ch, n);
-  }
-}
-
-static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
-  DBG("%p enqueued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
-  assert(d->multi_chanhead->multi_subscribers_pending > 0);
-  d->multi_chanhead->multi_subscribers_pending --;
-  if(d->multi_chanhead->multi_subscribers_pending == 0) {
-    memstore_ready_chanhead_unless_stub(d->multi_chanhead);
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
-  DBG("%p dequeued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
-  d->multi_chanhead->status = WAITING;
-  d->multi_chanhead->multi_subscribers_pending++;
-  d->multi->sub = NULL;
-  
-  return NGX_OK;
-}
-
-static ngx_int_t sub_respond_message(ngx_int_t status, nchan_msg_t *msg, sub_data_t* d) {
-  nchan_msg_t       remsg;
-  ngx_int_t         mcount;
-  
-  int16_t          tags[NCHAN_MULTITAG_MAX], prevtags[NCHAN_MULTITAG_MAX];
-  
-  //remsg = ngx_alloc(sizeof(*remsg), ngx_cycle->log);
-  //assert(remsg);
-  
-  assert( msg->id.tagcount == 1 );
-  assert( msg->prev_id.tagcount == 1 );
-  nchan_msg_derive_stack(msg, &remsg, tags);
-  
-  mcount = d->multi_chanhead->multi_count;
-  
-  remsg.prev_id.tagcount = mcount;
-  remsg.prev_id.tagactive = d->n;
-  
-  remsg.id.tagcount = mcount;
-  remsg.id.tagactive = d->n;
-  
-  if(mcount > NCHAN_FIXED_MULTITAG_MAX) {
-    remsg.id.tag.allocd = tags;
-    tags[0]=msg->id.tag.fixed[0];
-    remsg.prev_id.tag.allocd = prevtags;
-    prevtags[0]=msg->prev_id.tag.fixed[0];
-  }
-  
-  nchan_expand_msg_id_multi_tag(&remsg.prev_id, 0, d->n, -1);
-  nchan_expand_msg_id_multi_tag(&remsg.id, 0, d->n, -1);
-  
-  memstore_ensure_chanhead_is_ready(d->multi_chanhead, 1);
-  
-  DBG("%p respond with transformed message %p %V (%p %V %i) %V", d->multi->sub, &remsg, msgid_to_str(&remsg.id), d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
-  
-  nchan_memstore_publish_generic(d->multi_chanhead, &remsg, 0, NULL);
-  
-  return NGX_OK;
-}
-
-static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
-  DBG("%p subscriber respond with status %i (%p %V %i) %V", d->multi->sub, status, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
-  switch(status) {
-    case NGX_HTTP_GONE: //delete
-    case NGX_HTTP_CLOSE: //delete
-      nchan_memstore_publish_generic(d->multi_chanhead, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
-      //nchan_store_memory.delete_channel(d->chid, NULL, NULL);
-      break;
-    
-    case NGX_HTTP_CONFLICT:
-      nchan_memstore_publish_generic(d->multi_chanhead, NULL, NGX_HTTP_CONFLICT, &NCHAN_HTTP_STATUS_410);
-      break;
-    
-    default:
-      //meh, no big deal.
-      break;
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t sub_notify_handler(ngx_int_t code, void *data, sub_data_t *d) {
-  if(code == NCHAN_SUB_MULTI_NOTIFY_ADDSUB) {
-    change_sub_count(d->target_chanhead, (ngx_int_t )data);
-  }
-  else if(code == NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST) {
-    nchan_memstore_publish_notice(d->multi_chanhead, code, data);
-  }
-  return NGX_OK;
-}
-
-static ngx_str_t  sub_name = ngx_string("memstore-multi");
-
-subscriber_t *memstore_multi_subscriber_create(memstore_channel_head_t *chanhead, uint8_t n) {
-  static nchan_msg_id_t        latest_msgid = NCHAN_NEWEST_MSGID;
-  sub_data_t                  *d;
-  memstore_channel_head_t     *target_ch;
-  ngx_int_t                    multi_subs;
-  subscriber_t                *sub;
-  
-  if((target_ch = nchan_memstore_get_chanhead(&chanhead->multi[n].id, chanhead->cf))==NULL) {
-    return NULL;
-  }
-  
-  assert(chanhead->cf);
-  
-  sub = internal_subscriber_create_init(&sub_name, chanhead->cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_notify_handler, NULL);
-  
-  sub->last_msgid = latest_msgid;
-  
-  sub->destroy_after_dequeue = 1;
-  sub->dequeue_after_response = 0;
-
-  //DBG("create multi sub for %V (n=%i) pending=%i", &chanhead->multi[n].id, n, chanhead->multi_subscribers_pending);
-  d->multi = &chanhead->multi[n];
-  d->multi->sub = sub;
-  d->multi_chanhead = chanhead;
-  d->n = n;
-  d->target_chanhead = target_ch;
-  
-  assert(chanhead->multi_subscribers_pending > 0);
-
-  target_ch->spooler.fn->add(&target_ch->spooler, sub);
-  
-  multi_subs = chanhead->shared->sub_count;
-
-  change_sub_count(target_ch, multi_subs);
-  
-  DBG("%p created with privdata %p", d->multi->sub, d);
-  return sub;
-}
diff --git a/debian/modules/nchan/src/subscribers/memstore_multi.h b/debian/modules/nchan/src/subscribers/memstore_multi.h
deleted file mode 100644
index d735598..0000000
--- a/debian/modules/nchan/src/subscribers/memstore_multi.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NCHAN_SUB_MULTI_NOTIFY_ADDSUB 0
-subscriber_t *memstore_multi_subscriber_create(memstore_channel_head_t *chanhead, uint8_t n);
diff --git a/debian/modules/nchan/src/subscribers/memstore_redis.c b/debian/modules/nchan/src/subscribers/memstore_redis.c
deleted file mode 100644
index 73d4e91..0000000
--- a/debian/modules/nchan/src/subscribers/memstore_redis.c
+++ /dev/null
@@ -1,261 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-
-#include <store/memory/ipc.h>
-#include <store/memory/store-private.h>
-#include <store/memory/ipc-handlers.h>
-#include <store/memory/store.h>
-
-#include <store/redis/store.h>
-#include <store/redis/store-private.h>
-#include <store/redis/redis_nodeset.h>
-
-#include <util/nchan_msg.h>
-#include "internal.h"
-#include "memstore_redis.h"
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MEM-REDIS:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-REDIS:" fmt, ##arg)
-
-
-typedef struct sub_data_s sub_data_t;
-
-struct sub_data_s {
-  subscriber_t                 *sub;
-  memstore_channel_head_t      *chanhead;
-  ngx_str_t                    *chid;
-  ngx_event_t                   timeout_ev;
-  nchan_msg_status_t            last_msg_status;
-  sub_data_t                  **onconnect_callback_pd;
-}; //sub_data_t
-
-/*
-static ngx_int_t empty_callback(){
-  return NGX_OK;
-}
-*/
-
-static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
-  DBG("%p memstore-redis subsriber enqueued ok", d->sub);
-  if(d->chanhead) {
-    d->chanhead->status = READY;
-    d->chanhead->spooler.fn->handle_channel_status_change(&d->chanhead->spooler);
-  }
-  
-  return NGX_OK;
-}
-
-ngx_int_t memstore_redis_subscriber_destroy(subscriber_t *sub) {
-  DBG("%p destroy", sub);
-  sub_data_t  *d = internal_subscriber_get_privdata(sub);
-  d->chanhead = NULL; //memstore chanhead should be presumed missing
-  return internal_subscriber_destroy(sub);
-}
-
-static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
-  DBG("%p dequeue", d->sub);
-  return NGX_OK;
-}
-
-static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
-  nchan_msg_t       *msg = (nchan_msg_t *) ptr;
-  nchan_loc_conf_t   cf;
-  nchan_msg_id_t    *lastid;
-  ngx_pool_t        *deflate_pool = NULL;
-  int                nostore_mode;
-  if(!d->chanhead) {
-    DBG("memstore chanhead gone");
-    return NGX_DECLINED;
-  }
-  nostore_mode = d->chanhead->cf->redis.storage_mode == REDIS_MODE_DISTRIBUTED_NOSTORE;
-  DBG("%p memstore-redis subscriber respond with message", d->sub);
-
-  cf.max_messages = d->chanhead->max_messages;
-  cf.redis.enabled = 0;
-  cf.message_timeout = msg->expires - ngx_time();
-  cf.complex_max_messages = NULL;
-  cf.complex_message_timeout = NULL;
-  cf.message_compression = msg->compressed ? msg->compressed->compression : NCHAN_MSG_NO_COMPRESSION;
-  
-  if(cf.message_compression != NCHAN_MSG_NO_COMPRESSION) {
-    deflate_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE / 2, ngx_cycle->log);
-    if(!deflate_pool) {
-      ERR("unable to create deflatepool");
-      return NGX_ERROR;
-    }
-    nchan_deflate_message_if_needed(msg, &cf, NULL, deflate_pool);
-  }
-  else {
-    msg->compressed = NULL;
-  }
-  
-  lastid = &d->chanhead->latest_msgid;
-  
-  assert(lastid->tagcount == 1 && msg->id.tagcount == 1);
-  if(nostore_mode || lastid->time < msg->id.time || 
-    (lastid->time == msg->id.time && lastid->tag.fixed[0] < msg->id.tag.fixed[0])) {
-    if(nostore_mode) {
-      //out of order messages are ok, we don't care. publish them like they just got here. we can't lose messages due to network lag
-      msg->expires = 0;
-      msg->id.time = 0;
-    }
-    memstore_ensure_chanhead_is_ready(d->chanhead, 1);
-    nchan_store_chanhead_publish_message_generic(d->chanhead, msg, 0, &cf, NULL, NULL);
-  }
-  else {
-    //meh, this message has already been delivered probably hopefully
-  }
-  if(deflate_pool) {
-    ngx_destroy_pool(deflate_pool);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t sub_destroy_handler(ngx_int_t status, void *d, sub_data_t *pd) {
-  DBG("%p sub_destroy_handler", pd->sub);
-  if(pd->onconnect_callback_pd)
-    (*pd->onconnect_callback_pd) = NULL;
-  return NGX_OK;
-}
-
-static ngx_int_t reconnect_callback(redis_nodeset_t *ns, void *pd) {
-  sub_data_t *sd = *((sub_data_t **) pd);
-  if(!sd->chanhead || !nodeset_ready(ns)) {
-    return NGX_ERROR;
-  }
-  if(sd) {
-    DBG("%reconnect callback");
-    assert(sd->chanhead->redis_sub == sd->sub);
-    assert(&sd->chanhead->id == sd->chid);
-    nchan_store_redis.subscribe(sd->chid, sd->chanhead->redis_sub);
-    sd->onconnect_callback_pd = NULL;
-    sd->sub->dequeue_after_response = 0;
-    ((internal_subscriber_t *)sd->sub)->already_dequeued = 0;
-    ngx_free(pd);
-  }
-  else {
-    DBG("%reconnect callback skipped"); //probably because the channel was deleted while we were waiting
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
-  nchan_loc_conf_t  fake_cf;
-  redis_nodeset_t   *nodeset;
-  if(!d->chanhead) {
-    return NGX_DECLINED;
-  }
-  
-  DBG("%p memstore-redis subscriber respond with status %i", d->sub, status);
-  switch(status) {
-    case NGX_HTTP_GONE: //delete
-    case NGX_HTTP_CLOSE: //delete
-      fake_cf = *d->sub->cf;
-      fake_cf.redis.enabled = 0;
-      d->sub->destroy_after_dequeue = 1;
-      nchan_store_memory.delete_channel(d->chid, &fake_cf, NULL, NULL);
-      //now the chanhead will be in the garbage collector
-      d->chanhead->redis_sub = NULL;
-      
-      nodeset = nodeset_find(&d->sub->cf->redis);
-      if(!nodeset_ready(nodeset) && d->onconnect_callback_pd == NULL) {
-        sub_data_t **dd = ngx_alloc(sizeof(*d), ngx_cycle->log);
-        *dd = d;
-        d->onconnect_callback_pd = dd;
-        nodeset_callback_on_ready(nodeset, 0, reconnect_callback, dd);
-      }
-      break;
-      
-    case NGX_HTTP_NO_CONTENT:
-      if(d->last_msg_status != MSG_EXPECTED) {
-        //the message buffer has just been walked start to finish
-        nchan_memstore_publish_notice(d->chanhead, NCHAN_NOTICE_BUFFER_LOADED, NULL);
-      }
-      d->last_msg_status = MSG_EXPECTED;
-      //TODO: stuff about REDIS_MODE_BACKUP
-      
-      break;
-      
-    default:
-      //meh, no big deal.
-      break;
-  }
-  
-  return NGX_OK;
-}
-
-static ngx_int_t sub_notify_handler(ngx_int_t code, void *data, sub_data_t *d) {
-  intptr_t  max_messages;
-  if(!d->chanhead) {
-    return NGX_DECLINED;
-  }
-  switch(code) {
-    case NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE:
-      max_messages = (intptr_t )data;
-      d->chanhead->max_messages = max_messages;
-      memstore_chanhead_messages_gc(d->chanhead);
-      break;
-      
-    case NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST:
-      nchan_memstore_publish_notice(d->chanhead, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, data);
-      break;
-  }
-  return NGX_OK;
-}
-
-/*
-static void reset_timer(sub_data_t *data) {
-  if(data->timeout_ev.timer_set) {
-    ngx_del_timer(&data->timeout_ev);
-  }
-  ngx_add_timer(&data->timeout_ev, MEMSTORE_REDIS_SUBSCRIBER_TIMEOUT * 1000);
-}
-*/
-/*
-static ngx_int_t keepalive_reply_handler(ngx_int_t renew, void *_, void* pd) {
-  sub_data_t *d = (sub_data_t *)pd;
-  if(d->sub->release(d->sub) == NGX_OK) {
-    if(renew) {
-      reset_timer(d);
-    }
-    else{
-      d->sub->dequeue(d->sub);
-    }
-  }
-  return NGX_OK;
-}
-*/
-
-static ngx_str_t   sub_name = ngx_string("memstore-redis");
-
-subscriber_t *memstore_redis_subscriber_create(memstore_channel_head_t *chanhead) {
-  subscriber_t               *sub;
-  sub_data_t                 *d;
-  
-  assert(chanhead->cf);
-  
-  sub = internal_subscriber_create_init(&sub_name, chanhead->cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_notify_handler, (callback_pt )sub_destroy_handler);
-  
-  
-  sub->destroy_after_dequeue = 0;
-  sub->dequeue_after_response = 0;
-  
-  d->sub = sub;
-  d->chanhead = chanhead;
-  d->chid = &chanhead->id;
-  d->last_msg_status = MSG_PENDING;
-  d->onconnect_callback_pd = NULL;
-
-  
-  /*
-  ngx_memzero(&d->timeout_ev, sizeof(d->timeout_ev));
-  nchan_init_timer(&d->timeout_ev, timeout_ev_handler, d)
-  reset_timer(d);
-  */
-  DBG("%p created memstore-redis subscriber with privdata %p", d->sub, d);
-  return sub;
-}
diff --git a/debian/modules/nchan/src/subscribers/memstore_redis.h b/debian/modules/nchan/src/subscribers/memstore_redis.h
deleted file mode 100644
index 5c8d0e4..0000000
--- a/debian/modules/nchan/src/subscribers/memstore_redis.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MEMSTORE_REDIS_SUBSCRIBER_TIMEOUT 10
-subscriber_t *memstore_redis_subscriber_create(memstore_channel_head_t *chanhead);
-ngx_int_t memstore_redis_subscriber_destroy(subscriber_t *sub);
diff --git a/debian/modules/nchan/src/subscribers/websocket.c b/debian/modules/nchan/src/subscribers/websocket.c
deleted file mode 100644
index beb762b..0000000
--- a/debian/modules/nchan/src/subscribers/websocket.c
+++ /dev/null
@@ -1,2066 +0,0 @@
-#include <nchan_module.h>
-#include <subscribers/common.h>
-#include <util/nchan_subrequest.h>
-#include <util/nchan_fake_request.h>
-#include <util/nchan_util.h>
-#if nginx_version >= 1000003
-#include <ngx_crypt.h>
-#endif
-#include <ngx_sha1.h>
-#include <nginx.h>
-
-
-#if (NGX_ZLIB)
-#include <zlib.h>
-#endif
-
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:WEBSOCKET:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:WEBSOCKET:" fmt, ##arg)
-#include <assert.h>
-
-#if 0 //debug WS optimized xor
-  #define WEBSOCKET_OPTIMIZED_UNMASK 1
-  #define WEBSOCKET_FAKEOPTIMIZED_UNMASK 1
-  #define __vector_size_bytes 32
-#elif __AVX2__
-  #include <immintrin.h>                     // AVX2 intrinsics
-  #define WEBSOCKET_OPTIMIZED_UNMASK 1
-  
-  #define __vector_size_bytes 32
-  #define __vector_type __m256i
-  #define __vector_load_intrinsic _mm256_load_si256
-  #define __vector_xor_intrinsic _mm256_xor_si256
-  #define __vector_store_intrinsic _mm256_store_si256
-    
-#elif __SSE2__
-  #define WEBSOCKET_OPTIMIZED_UNMASK 1
-  #include <emmintrin.h>                     // SSE2 intrinsics
-  
-  #define __vector_size_bytes 16
-  #define __vector_type __m128i
-  #define __vector_load_intrinsic _mm_load_si128
-  #define __vector_xor_intrinsic _mm_xor_si128
-  #define __vector_store_intrinsic _mm_store_si128
-#endif
-
-#define WEBSOCKET_LAST_FRAME                0x8
-#define WEBSOCKET_LAST_FRAME_RSV1           0xC
-
-#define WEBSOCKET_OPCODE_TEXT               0x1
-#define WEBSOCKET_OPCODE_BINARY             0x2
-#define WEBSOCKET_OPCODE_CLOSE              0x8
-#define WEBSOCKET_OPCODE_PING               0x9
-#define WEBSOCKET_OPCODE_PONG               0xA
-  
-#define WEBSOCKET_READ_START_STEP           0
-#define WEBSOCKET_READ_GET_REAL_SIZE_STEP   1
-#define WEBSOCKET_READ_GET_MASK_KEY_STEP    2
-#define WEBSOCKET_READ_GET_PAYLOAD_STEP     3
-
-
-#define WEBSOCKET_FRAME_HEADER_MAX_LENGTH   146 //144 + 2 for possible close status code
-
-#define WEBSOCKET_CLOSING_TIMEOUT           250 //ms
-
-#define DEFLATE_MAX_WINDOW_BITS             15
-#define DEFLATE_MIN_WINDOW_BITS             9 //it should be 8, but zlib doesn't support window size of 8 these days
-#define DEFLATE_DEFAULT_CLIENT_WINDOW_BITS  15
-
-/**
- * here's what a websocket frame looks like
- * 
-   0                   1                   2                   3
-   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-  +-+-+-+-+-------+-+-------------+-------------------------------+
-  |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
-  |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
-  |N|V|V|V|       |S|             |   (if payload len==126/127)   |
-  | |1|2|3|       |K|             |                               |
-  +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
-  |     Extended payload length continued, if payload len == 127  |
-  + - - - - - - - - - - - - - - - +-------------------------------+
-  |                               |Masking-key, if MASK set to 1  |
-  +-------------------------------+-------------------------------+
-  | Masking-key (continued)       |          Payload Data         |
-  +-------------------------------- - - - - - - - - - - - - - - - +
-  :                     Payload Data continued ...                :
-  + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
-  |                     Payload Data continued ...                |
-  +---------------------------------------------------------------+
- */
-
-#define CLOSE_NORMAL                 1000
-#define CLOSE_GOING_AWAY             1001
-#define CLOSE_PROTOCOL_ERROR         1002
-#define CLOSE_UNSUPPORTED_DATA       1003
-#define CLOSE_INVALID_PAYLOAD        1007
-#define CLOSE_POLICY_VIOLATION       1008
-#define CLOSE_MESSAGE_TOO_BIG        1009
-#define CLOSE_EXTENSION_MISSING      1010
-#define CLOSE_INTERNAL_SERVER_ERROR  1011
-
-#define REQUEST_PCALLOC(r, what) what = ngx_pcalloc((r)->pool, sizeof(*(what)))
-#define REQUEST_PALLOC(r, what) what = ngx_palloc((r)->pool, sizeof(*(what)))
-
-static const u_char WEBSOCKET_PAYLOAD_LEN_16_BYTE = 126;
-static const u_char WEBSOCKET_PAYLOAD_LEN_64_BYTE = 127;
-
-static const u_char WEBSOCKET_TEXT_LAST_FRAME_BYTE =  WEBSOCKET_OPCODE_TEXT  | (WEBSOCKET_LAST_FRAME << 4);
-static const u_char WEBSOCKET_TEXT_DEFLATED_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_TEXT | (WEBSOCKET_LAST_FRAME_RSV1 << 4);
-
-static const u_char WEBSOCKET_BINARY_LAST_FRAME_BYTE =  WEBSOCKET_OPCODE_BINARY  | (WEBSOCKET_LAST_FRAME << 4);
-static const u_char WEBSOCKET_BINARY_DEFLATED_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_BINARY  | (WEBSOCKET_LAST_FRAME_RSV1 << 4);
-
-static const u_char WEBSOCKET_CLOSE_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_CLOSE | (WEBSOCKET_LAST_FRAME << 4);
-static const u_char WEBSOCKET_PONG_LAST_FRAME_BYTE  = WEBSOCKET_OPCODE_PONG  | (WEBSOCKET_LAST_FRAME << 4);
-static const u_char WEBSOCKET_PING_LAST_FRAME_BYTE  = WEBSOCKET_OPCODE_PING  | (WEBSOCKET_LAST_FRAME << 4);
-
-static ngx_str_t   binary_mimetype = ngx_string("application/octet-stream");
-
-#define NCHAN_WS_TMP_POOL_SIZE (4*1024)
-
-
-typedef struct framebuf_s framebuf_t;
-struct framebuf_s {
-  u_char        chr[WEBSOCKET_FRAME_HEADER_MAX_LENGTH + 10]; // +10 for the reservoir tip. just to be safe.
-  framebuf_t   *prev;
-  framebuf_t   *next;
-};
-
-
-#if FAKESHARD
-//debugstuff
-void memstore_fakeprocess_push(ngx_int_t slot);
-void memstore_fakeprocess_push_random(void);
-void memstore_fakeprocess_pop();
-ngx_int_t memstore_slot();
-#endif
-
-static const subscriber_t new_websocket_sub;
-
-typedef struct {
-  u_char fin:1;
-  u_char rsv1:1;
-  u_char rsv2:1;
-  u_char rsv3:1;
-  u_char opcode:4;
-  u_char mask:1;
-  u_char mask_key[4];
-  uint64_t payload_len;
-  u_char  header[8];
-  u_char *payload;
-  u_char *last;
-  ngx_uint_t step;
-} ws_frame_t;
-
-typedef struct full_subscriber_s full_subscriber_t;
-
-typedef struct nchan_pub_upstream_request_data_s nchan_pub_upstream_request_data_t;
-struct nchan_pub_upstream_request_data_s {
-  ngx_http_request_t                 *sr;
-  ngx_buf_t                           body_buf;
-  full_subscriber_t                  *fsub;
-  nchan_pub_upstream_request_data_t  *next;
-  unsigned                            sent:1;
-  unsigned                            binary:1;
-};
-
-typedef struct {
-#if (NGX_ZLIB)
-  z_stream               *zstream_in;
-#endif
-  int8_t                  server_max_window_bits;
-  int8_t                  client_max_window_bits;
-  unsigned                server_no_context_takeover:1;
-  unsigned                client_no_context_takeover:1;
-  unsigned                enabled:1;
-} permessage_deflate_t;
-
-struct full_subscriber_s {
-  subscriber_t            sub;
-  ngx_http_cleanup_t     *cln;
-  nchan_request_ctx_t    *ctx;
-  subscriber_callback_pt  enqueue_callback;
-  void                   *enqueue_callback_data;
-  subscriber_callback_pt  dequeue_callback;
-  void                   *dequeue_callback_data;
-  ngx_event_t             timeout_ev;
-  ngx_event_t             closing_ev;
-  ws_frame_t              frame;
-  
-  ngx_event_t             ping_ev;
-  
-  permessage_deflate_t    deflate;
-  
-  struct {
-    ngx_str_t               *channel_id;
-    ngx_str_t               *upstream_request_url;
-    ngx_pool_t              *msg_pool;
-    void                   (*intercept)(subscriber_t *, nchan_msg_t *);
-  }                       publisher;
-  
-  unsigned                awaiting_pong:1;
-  unsigned                ws_meta_subprotocol:1;
-  unsigned                holding:1; //make sure the request doesn't close right away
-  unsigned                shook_hands:1;
-  unsigned                sent_close_frame:1;
-  unsigned                received_close_frame:1;
-  unsigned                finalize_request:1;
-  unsigned                awaiting_destruction:1;
-};// full_subscriber_t
-
-static void empty_handler() { }
-
-static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *chain);
-static void set_buf_to_str(ngx_buf_t *buf, const ngx_str_t *str);
-static ngx_chain_t *websocket_frame_header_chain(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *chain);
-static ngx_flag_t is_utf8(ngx_buf_t *);
-static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err);
-static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err);
-static ngx_int_t websocket_send_close_frame_cstr(full_subscriber_t *fsub, uint16_t code, const char *err);
-static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body);
-
-static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, int binary);
-
-static ngx_int_t websocket_reserve(subscriber_t *self);
-static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy);
-
-static void websocket_delete_timers(full_subscriber_t *fsub);
-static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg_t *msg);
-
-/*
-ngx_int_t ws_reserve_tmp_pool(full_subscriber_t *fsub) {
-  if(!fsub->tmp_pool) {
-    fsub->tmp_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, fsub->sub.request->connection->log);
-  }
-  if(!fsub->tmp_pool) {
-    ERR("unable to create temp pool for websocket sub %p", fsub);
-    return NGX_ERROR;
-  }
-  fsub->tmp_pool_use_count++;
-  return NGX_OK;
-}
-
-ngx_int_t ws_release_tmp_pool(full_subscriber_t *fsub) {
-  if(!fsub->tmp_pool) {
-    ERR("attempted to release tmp_pool when it's NULL");
-    return NGX_ERROR;
-  }
-  if(--fsub->tmp_pool_use_count == 0) {
-    ngx_destroy_pool(fsub->tmp_pool);
-    fsub->tmp_pool = NULL;
-  } else {
-  }
-
-  return NGX_OK;
-}
-*/
-
-ngx_pool_t *ws_get_msgpool(full_subscriber_t *fsub) {
-  if(!fsub->publisher.msg_pool) {
-    fsub->publisher.msg_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, fsub->sub.request->connection->log);
-  }
-  return fsub->publisher.msg_pool;
-}
-ngx_int_t ws_destroy_msgpool(full_subscriber_t *fsub) {
-  if(fsub->publisher.msg_pool) {
-    ngx_destroy_pool(fsub->publisher.msg_pool);
-    fsub->publisher.msg_pool = NULL;
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t websocket_finalize_request(full_subscriber_t *fsub) {
-  subscriber_t       *sub = &fsub->sub;
-  ngx_http_request_t *r = sub->request;
-  
-  if(fsub->cln) {
-    fsub->cln->handler = (ngx_http_cleanup_pt )empty_handler;
-  }
-  
-  if(sub->cf->unsubscribe_request_url && sub->enqueued) {
-    nchan_subscriber_unsubscribe_request(sub);
-  }
-  nchan_subscriber_subrequest_cleanup(sub);
-  
-  sub->status = DEAD;
-  if(sub->enqueued) {
-    sub->fn->dequeue(sub);
-  }
-  nchan_http_finalize_request(r, NGX_HTTP_OK);
-  return NGX_OK;
-}
-
-static void aborted_ws_close_request_rev_handler(ngx_http_request_t *r) {
-  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
-  if(fsub) {
-    ctx->sub->status = DEAD;
-    fsub->sub.request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
-    websocket_finalize_request(fsub);
-  }
-}
-
-static void sudden_abort_handler(subscriber_t *sub) {
-  //DBG("sudden abort handler for sub %p request %p", sub, sub->request);
-  if(!sub) {
-    //DBG("%p already freed apparently?...", sub);
-    return; //websocket subscriber already freed
-  }
-#if FAKESHARD
-  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
-  memstore_fakeprocess_push(fsub->sub.owner);
-#endif
-  sub->request->read_event_handler = aborted_ws_close_request_rev_handler;
-  sub->fn->dequeue(sub);
-#if FAKESHARD
-  memstore_fakeprocess_pop();
-#endif
-}
-
-static void ws_request_empty_handler(ngx_http_request_t *r) {
-  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;  
-  
-  if(r->connection->read->eof) {
-    //sudden disconnect
-    nchan_add_oneshot_timer((void (*)(void *))sudden_abort_handler, &fsub->sub, 0);
-  }
-}
-
-/*
-static void sudden_upstream_request_abort_handler(full_subscriber_t *fsub) {
-  
-}
-*/
-
-static void init_buf(ngx_buf_t *buf, int8_t last);
-static void init_msg_buf(ngx_buf_t *buf);
-
-#if WEBSOCKET_OPTIMIZED_UNMASK
-static void websocket_unmask_frame(ws_frame_t *frame) {
-  //stupid overcomplicated websockets and their masks
-  
-  uint64_t   i, j, payload_len = frame->payload_len;
-  u_char    *payload = frame->payload;
-  u_char    *mask_key = frame->mask_key;
-  uint64_t   preamble_len = payload_len <= __vector_size_bytes ? payload_len : (uintptr_t )payload % __vector_size_bytes;
-  uint64_t   fastlen;
-  u_char     extended_mask[__vector_size_bytes];  
-  
-  //preamble -- for alignment or msglen < __vector_size_bytes
-  for (i = 0; i < preamble_len && i < payload_len; i++) {
-    payload[i] ^= mask_key[i % 4];
-  }
-  //are we done?
-  if(payload_len < __vector_size_bytes) {
-    return;
-  }
-  
-  if((uintptr_t )(&payload[i]) % __vector_size_bytes != 0) { //didn't get alignment right for some reason
-    fastlen = 0;
-  }
-  else {
-    fastlen = ((payload_len - i) / __vector_size_bytes) * __vector_size_bytes;
-  }
-    
-#if WEBSOCKET_FAKEOPTIMIZED_UNMASK
-  for (/*void*/; i < fastlen + preamble_len; i++) {
-    payload[i] ^= mask_key[i % 4];
-  }
-#else
-  __vector_type    w, w_mask;
-  
-  if (fastlen > 0) {
-    for(j=0; j<__vector_size_bytes; j+=4) {
-      ngx_memcpy(&extended_mask[j], mask_key, 4);
-    }
-    w_mask = __vector_load_intrinsic((__vector_type *)extended_mask);
-    for (/*void*/; i < fastlen + preamble_len; i += __vector_size_bytes) {
-      w = __vector_load_intrinsic((__vector_type *)&payload[i]);       // load [__vector_size_bytes] bytes
-      w = __vector_xor_intrinsic(w, w_mask);           // XOR with mask
-      __vector_store_intrinsic((__vector_type *)&payload[i], w);   // store [__vector_size_bytes] masked bytes
-    }
-  }
-#endif
-  
-  //leftovers
-  for (/*void*/; i < payload_len; i++) {
-    payload[i] ^= mask_key[i % 4];
-  }
-  
-}
-#else
-static void websocket_unmask_frame(ws_frame_t *frame) {
-  //stupid overcomplicated websockets and their masks
-  uint64_t   i, mpayload_len = frame->payload_len;
-  u_char    *mpayload = frame->payload;
-  u_char    *mask_key = frame->mask_key;
-  
-  for (i = 0; i < mpayload_len; i++) {
-    mpayload[i] ^= mask_key[i % 4];
-  }
-}
-#endif
-
-static ngx_int_t ws_output_filter(full_subscriber_t *fsub, ngx_chain_t *chain) {
-  /*if(fsub->publish_upstream && fsub->sub.request->pool == fsub->publish_upstream->temp_request_pool) {
-    ngx_int_t rc;
-    fsub->sub.request->pool = fsub->publish_upstream->real_request_pool;
-    rc = nchan_output_filter(fsub->sub.request, chain);
-    fsub->sub.request->pool = fsub->publish_upstream->temp_request_pool;
-    return rc;
-  }
-  else {
-    return nchan_output_filter(fsub->sub.request, chain);
-  }*/
-  //placate google's devious ngx_pagespeed by not using the header_only hack
-  ngx_http_request_t *r = fsub->sub.request;
-  r->header_only = 0;
-  r->chunked = 0;
-  return nchan_output_filter(r, chain);
-}
-
-static ngx_int_t ws_output_msg_filter(full_subscriber_t *fsub, nchan_msg_t *msg) {
-  /*if(fsub->publish_upstream && fsub->sub.request->pool != fsub->publish_upstream->real_request_pool) {
-    ngx_int_t rc;
-    ngx_pool_t *fake_pool = fsub->sub.request->pool;
-    fsub->sub.request->pool = fsub->publish_upstream->real_request_pool;
-    rc = nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
-    fsub->sub.request->pool = fake_pool;
-    return rc;
-  }
-  else {
-    return nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
-  }*/
-  return nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
-}
-
-typedef struct {
-  full_subscriber_t *fsub;
-  ngx_pool_t        *pool;
-  ngx_buf_t         *msgbuf;
-  nchan_fakereq_subrequest_data_t *subrequest;
-  unsigned           binary:1;
-  nchan_msg_t        msg;
-} ws_publish_data_t;
-
-
-static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *ch, ws_publish_data_t *d) {
-  time_t                 last_seen = 0;
-  ngx_uint_t             subscribers = 0;
-  ngx_uint_t             messages = 0;
-  full_subscriber_t     *fsub = d->fsub;
-  nchan_msg_id_t        *msgid = NULL;
-  ngx_http_request_t    *r = fsub->sub.request;
-  ngx_str_t             *accept_header = NULL;
-  ngx_buf_t             *tmp_buf;
-  nchan_buf_and_chain_t *bc;
-  if(ch) {
-    subscribers = ch->subscribers;
-    last_seen = ch->last_seen;
-    messages  = ch->messages;
-    msgid = &ch->last_published_msg_id;
-    fsub->ctx->channel_subscriber_last_seen = last_seen;
-    fsub->ctx->channel_subscriber_count = subscribers;
-    fsub->ctx->channel_message_count = messages;
-  }
-  if(d->subrequest) {
-    nchan_requestmachine_request_cleanup_manual(d->subrequest);
-  }
-  else {
-    ngx_destroy_pool(d->pool);
-  }
-  d = NULL;
-  
-  if(websocket_release(&fsub->sub, 0) == NGX_ABORT || fsub->sub.status == DEAD) {
-    //zombie publisher
-    //nothing more to do, we're finished here
-    return NGX_OK;
-  }
-  
-  switch(status) {
-    case NCHAN_MESSAGE_QUEUED:
-    case NCHAN_MESSAGE_RECEIVED:
-      nchan_maybe_send_channel_event_message(fsub->sub.request, CHAN_PUBLISH);
-      if(fsub->sub.cf->sub.websocket) {
-        //don't reply with status info, this websocket is used for subscribing too,
-        //so it should only be receiving messages
-        return NGX_OK;
-      }
-      accept_header = nchan_get_accept_header_value(r);
-      bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
-      tmp_buf = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, NULL);
-      ngx_memcpy(&bc->buf, tmp_buf, sizeof(*tmp_buf));
-      bc->buf.last_buf=1;
-      
-      ws_output_filter(fsub, websocket_frame_header_chain(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, ngx_buf_size((&bc->buf)), &bc->chain));
-      break;
-    case NGX_HTTP_INSUFFICIENT_STORAGE:
-      websocket_respond_status(&fsub->sub, NGX_HTTP_INSUFFICIENT_STORAGE, NULL, NULL);
-      break;
-    case NGX_ERROR:
-    case NGX_HTTP_INTERNAL_SERVER_ERROR:
-      websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL);
-      break;
-  }
-  return NGX_OK;
-}
-
-static void websocket_publish_continue(ws_publish_data_t *d) {
-  nchan_msg_t             *msg = &d->msg;
-  struct timeval           tv;
-  full_subscriber_t       *fsub = d->fsub;
-  ngx_http_request_t      *r = d->fsub->sub.request;
-  
-  ngx_memzero(msg, sizeof(*msg));
-  
-  msg->buf=*d->msgbuf;
-  if(r->headers_in.content_type) {
-    msg->content_type = &r->headers_in.content_type->value;
-  }
-  
-  ngx_gettimeofday(&tv);
-  msg->id.time = tv.tv_sec;
-  msg->id.tag.fixed[0]=0;
-  msg->id.tagcount=1;
-  msg->id.tagactive=0;
-  
-  if(d->binary) {
-    msg->content_type = &binary_mimetype;
-  }
-  //ERR("%p pool sz %d", fsub, r->pool->total_allocd);
-  msg->storage = NCHAN_MSG_POOL;
-  
-  if(nchan_need_to_deflate_message(fsub->sub.cf)) {
-    nchan_deflate_message_if_needed(msg, fsub->sub.cf, r, d->pool);
-  }
-  
-  if(fsub->publisher.intercept) {
-    fsub->publisher.intercept(&fsub->sub, msg);
-    ngx_destroy_pool(d->pool);
-  }
-  else {
-    websocket_reserve(&fsub->sub);
-    fsub->sub.cf->storage_engine->publish(fsub->publisher.channel_id, msg, fsub->sub.cf, (callback_pt )websocket_publish_callback, d); 
-    nchan_update_stub_status(total_published_messages, 1);
-  }
-  
-}
-
-
-static ngx_int_t websocket_heartbeat(full_subscriber_t *fsub, ngx_buf_t *buf) {
-  ngx_str_t      str_in;
-  if(!fsub->sub.cf->websocket_heartbeat.enabled) {
-    return NGX_DECLINED;
-  }
-  
-  str_in.data = buf->pos;
-  str_in.len = buf->last - buf->pos;
-  if(nchan_ngx_str_match(fsub->sub.cf->websocket_heartbeat.in, &str_in)) {
-    nchan_buf_and_chain_t *bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
-    init_buf(&bc->buf, 1);
-    set_buf_to_str(&bc->buf, fsub->sub.cf->websocket_heartbeat.out);
-    websocket_send_frame(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, fsub->sub.cf->websocket_heartbeat.out->len, &bc->chain);
-    return NGX_OK;
-  }
-  else {
-    return NGX_DECLINED;
-  }
-}
-
-ngx_int_t websocket_publish_upstream_handler(ngx_int_t rc, ngx_http_request_t *sr, void *pd) {
-  ws_publish_data_t       *d = pd;
-  full_subscriber_t       *fsub = d->fsub;
-  
-  assert(d->subrequest);
-  
-  if(websocket_release(&fsub->sub, 0) == NGX_ABORT || rc == NGX_ABORT) {
-    //websocket client disappered, or subrequest got canceled some other way
-    nchan_requestmachine_request_cleanup_manual(d->subrequest);
-    return NGX_OK;
-  }
-  
-  if(rc == NGX_OK) {
-    ngx_int_t                        code = sr->headers_out.status;
-    ngx_int_t                        content_length;
-    ngx_chain_t                     *request_chain;
-    
-    switch(code) {
-      case NGX_HTTP_OK:
-      case NGX_HTTP_CREATED:
-      case NGX_HTTP_ACCEPTED:
-        if(sr->upstream) {
-          ngx_buf_t    *buf;
-          
-          content_length = nchan_subrequest_content_length(sr);
-#if nginx_version >= 1013010
-          request_chain = sr->out;
-#else
-          request_chain = sr->upstream->out_bufs;
-#endif
-          if(content_length > 0 && request_chain) {
-            if (request_chain->next != NULL) {
-              buf = nchan_chain_to_single_buffer(d->pool, request_chain, content_length);
-            }
-            else {
-              buf = request_chain->buf;
-              if(buf->memory) {
-                buf->start = buf->pos;
-                buf->end = buf->last;
-                buf->last_in_chain = 1;
-                buf->last_buf = 1;
-              }
-            }
-          }
-          else {
-            buf = ngx_pcalloc(d->pool, sizeof(*buf));
-            buf->memory=1;
-            buf->last_in_chain=1;
-            buf->last_buf=1;
-          }
-          d->msgbuf = buf;
-          websocket_publish_continue(d);
-        }
-        else {
-          request_chain = NULL;
-          ERR("upstream missing from upstream subrequest");
-        }
-        
-        break;
-      
-      case NGX_HTTP_NOT_MODIFIED:
-        websocket_publish_continue(d);
-        //cleaned up later
-        break;
-        
-      case NGX_HTTP_NO_CONTENT:
-        //cancel publishing
-        nchan_requestmachine_request_cleanup_manual(d->subrequest);
-        break;
-      
-      default:
-        nchan_requestmachine_request_cleanup_manual(d->subrequest);
-        websocket_respond_status(&fsub->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
-        break;
-    }
-  }
-  else {
-    nchan_requestmachine_request_cleanup_manual(d->subrequest);
-    websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL);
-  }
-  
-  
-  
-  return NGX_OK;
-}
-static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, int binary) {
-#if (NGX_DEBUG_POOL)
-  ERR("ws request pool size: %V", ngx_http_debug_pool_str(fsub->sub.request->pool));
-#endif
-  
-  ngx_int_t          rc = NGX_OK;
-  ws_publish_data_t *d = ngx_palloc(ws_get_msgpool(fsub), sizeof(*d));
-  if(d == NULL) {
-    return NGX_ERROR;
-  }
-  d->fsub = fsub;
-  d->binary = binary;
-  //move the msg pool
-  d->pool = fsub->publisher.msg_pool;
-  d->msgbuf = buf;
-  fsub->publisher.msg_pool = NULL;
-  
-  if(fsub->publisher.intercept || fsub->publisher.upstream_request_url == NULL) { // don't need to send request upstream
-    d->subrequest = NULL;
-    websocket_publish_continue(d);
-  }
-  else {
-    nchan_requestmachine_request_params_t param;
-    param.url.str = fsub->publisher.upstream_request_url;
-    param.url_complex = 0;
-    param.pool = d->pool;
-    param.body = buf;
-    param.response_headers_only = 0;
-    param.cb = (callback_pt )websocket_publish_upstream_handler;
-    param.pd = d;
-    param.manual_cleanup = 1;
-    
-    websocket_reserve(&d->fsub->sub);
-    
-    d->subrequest = nchan_subscriber_subrequest(&fsub->sub, &param);
-    
-    rc = d->subrequest == NULL ? NGX_ERROR : NGX_OK;
-  }
-  
-  return rc;
-}
-
-static void websocket_init_frame(ws_frame_t *frame) {
-  ngx_memzero(frame, sizeof(*frame)); 
-  frame->step = WEBSOCKET_READ_START_STEP;
-  frame->last = NULL;
-  frame->payload = NULL;
-}
-
-static void *framebuf_alloc(void *pd) {
-  return ngx_palloc((ngx_pool_t *)pd, sizeof(framebuf_t));
-}
-
-static void closing_ev_handler(ngx_event_t *ev) {
-  full_subscriber_t *fsub = (full_subscriber_t *)ev->data;
-  DBG("closing_ev timer handler for %p, delayed", fsub);
-  //fsub->sub.status = DEAD;
-  websocket_finalize_request(fsub);
-}
-
-subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  char                 *err;
-  
-  DBG("create for req %p", r);
-  full_subscriber_t  *fsub = NULL;
-  if((fsub = ngx_alloc(sizeof(*fsub), ngx_cycle->log)) == NULL) {
-    err="Unable to allocate";
-    goto fail;
-  }
-  
-  nchan_subscriber_init(&fsub->sub, &new_websocket_sub, r, msg_id);
-  fsub->cln = NULL;
-  fsub->ctx = ctx;
-  fsub->ws_meta_subprotocol = 0;
-  fsub->finalize_request = 0;
-  fsub->holding = 0;
-  fsub->shook_hands = 0;
-  fsub->awaiting_pong = 0;
-  fsub->sent_close_frame = 0;
-  fsub->received_close_frame = 0;
-  ngx_memzero(&fsub->ping_ev, sizeof(fsub->ping_ev));
-  
-  nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->timeout_ev);
-  
-  ngx_memzero(&fsub->deflate, sizeof(fsub->deflate));
-  
-  fsub->enqueue_callback = empty_handler;
-  fsub->enqueue_callback_data = NULL;
-  
-  fsub->dequeue_callback = empty_handler;
-  fsub->dequeue_callback_data = NULL;
-  fsub->awaiting_destruction = 0;
-  
-  ngx_memzero(&fsub->closing_ev, sizeof(fsub->closing_ev));
-  nchan_init_timer(&fsub->closing_ev, closing_ev_handler, fsub);
-  
-  //what should the buffers look like?
-  
-  /*
-  //mesage buf
-  b->last_buf = 1;
-  b->last_in_chain = 1;
-  b->flush = 1;
-  b->memory = 1;
-  b->temporary = 0;
-  */
-  
-  ngx_memzero(&fsub->publisher, sizeof(fsub->publisher));
-  
-  
-  if(fsub->sub.cf->pub.websocket) {
-    fsub->publisher.channel_id = nchan_get_channel_id(r, PUB, 0);
-  }
-  
-  if(fsub->sub.cf->publisher_upstream_request_url) {
-    ngx_str_t *url = ngx_palloc(r->pool, sizeof(*url));
-    if(url == NULL) {
-      err="Unable to allocate websocket upstream url";
-      goto fail;
-    }
-    ngx_http_complex_value(r, fsub->sub.cf->publisher_upstream_request_url, url);
-    fsub->publisher.upstream_request_url = url;
-  }
-  else {
-    fsub->publisher.upstream_request_url = NULL;
-  }
-  
-  websocket_init_frame(&fsub->frame);
-  
-  //http request sudden close cleanup
-  if((fsub->cln = ngx_http_cleanup_add(r, 0)) == NULL) {
-    err = "Unable to add request cleanup for websocket subscriber";
-    goto fail;
-  }
-  fsub->cln->data = fsub;
-  fsub->cln->handler = (ngx_http_cleanup_pt )sudden_abort_handler;
-  DBG("%p created for request %p", &fsub->sub, r);
-  
-  assert(ctx != NULL);
-  ctx->sub = &fsub->sub; //gonna need this for recv
-  ctx->subscriber_type = fsub->sub.name;
-  
-  #if NCHAN_SUBSCRIBER_LEAK_DEBUG
-    subscriber_debug_add(&fsub->sub);
-  #endif
-
-  //send-frame buffer
-  ctx->output_str_queue = ngx_palloc(r->pool, sizeof(*ctx->output_str_queue));
-  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(framebuf_t, prev), offsetof(framebuf_t, next), framebuf_alloc, NULL, r->pool);
-  
-  //bufchain pool
-  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
-  nchan_bufchain_pool_init(ctx->bcp, r->pool);
-  
-  return &fsub->sub;
-  
-  
-fail: 
-  if(fsub) {
-    if(fsub->cln) {
-      fsub->cln->data = NULL;
-    }
-    ngx_free(fsub);
-  }
-  ERR("%s", (u_char *)err);
-  return NULL;
-}
-
-ngx_int_t websocket_subscriber_destroy(subscriber_t *sub) {
-  full_subscriber_t            *fsub = (full_subscriber_t  *)sub;
-  
-  if(!fsub->awaiting_destruction) {
-    fsub->ctx->sub = NULL;
-  }
-   
-  if(sub->reserved > 0) {
-    DBG("%p not ready to destroy (reserved for %i) for req %p", sub, sub->reserved, fsub->sub.request);
-    fsub->awaiting_destruction = 1;
-    sub->status = DEAD;
-  }
-  else {
-    DBG("%p destroy for req %p", sub, fsub->sub.request);
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-    subscriber_debug_remove(&fsub->sub);
-#endif
-
-    websocket_delete_timers(fsub);
-    nchan_free_msg_id(&sub->last_msgid);
-    //ngx_memset(fsub, 0x13, sizeof(*fsub));
-    ws_destroy_msgpool(fsub);
-    if(fsub->deflate.zstream_in) {
-      inflateEnd(fsub->deflate.zstream_in);
-      ngx_free(fsub->deflate.zstream_in);
-      fsub->deflate.zstream_in = NULL;
-    }
-    
-    nchan_subscriber_subrequest_cleanup(sub);
-    ngx_free(fsub);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t extract_deflate_window_bits(full_subscriber_t *fsub, u_char *lcur, u_char *lend, const char* setting_name, int8_t *bits_out) {
-  ngx_int_t bits;
-  u_char    *ltmp;
-  if((ltmp = ngx_strnstr(lcur, (char *)setting_name, lend - lcur)) != NULL) {
-    ltmp += strlen(setting_name); //strlen
-    if(*ltmp == '=') ltmp++;
-    if(*ltmp == '"') ltmp++;
-    u_char    *nend = ltmp;
-    while(nend <= lend && *nend >='0' && *nend <='9') nend++;
-    if(nend - ltmp == 0) {
-      //no value, don't set
-      return NGX_OK;
-    }
-    bits = ngx_atoi(ltmp, nend - ltmp);
-    switch (bits) {
-      case NGX_ERROR: //bad value
-        return NGX_ERROR;
-      case DEFLATE_MIN_WINDOW_BITS ... DEFLATE_MAX_WINDOW_BITS:
-        *bits_out = bits;
-        return NGX_OK;
-      default:
-        return NGX_ERROR; //out of range
-    }
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t respond_with_error(full_subscriber_t *fsub, const char* msg) {
-  fsub->sub.dequeue_after_response = 1;
-  fsub->sub.request->header_only = 0;
-  nchan_respond_sprintf(fsub->sub.request, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, 1, "%s", msg);
-  return NGX_ERROR;
-}
-  
-static ngx_int_t websocket_perform_handshake(full_subscriber_t *fsub) {
-  static ngx_str_t    magic = ngx_string("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
-  ngx_str_t           ws_accept_key, sha1_str;
-  u_char              buf_sha1[21];
-  u_char              buf[255];
-  u_char              permessage_deflate_buf[128];
-  ngx_str_t          *tmp, *ws_key, *subprotocols;
-  ngx_int_t           ws_version;
-  ngx_http_request_t *r = fsub->sub.request;
-  
-  nchan_main_conf_t  *mcf = ngx_http_get_module_main_conf(r, ngx_nchan_module);
-  int server_window_bits = mcf->zlib_params.windowBits;
-  
-  ngx_str_t          *which_deflate_extension = NULL;
-  static ngx_str_t permessage_deflate = ngx_string("permessage-deflate");
-  static ngx_str_t perframe_deflate = ngx_string("deflate-frame");
-  static ngx_str_t webkit_perframe_deflate = ngx_string("x-webkit-deflate-frame");
-  
-  permessage_deflate_t pmd;
-#if (NGX_ZLIB)
-  pmd.zstream_in = NULL;
-#endif
-  pmd.server_max_window_bits = NGX_CONF_UNSET;
-  pmd.client_max_window_bits = NGX_CONF_UNSET;
-  pmd.server_no_context_takeover = 0;
-  pmd.client_no_context_takeover = 0;
-  pmd.enabled = 0;
-  
-  ngx_sha1_t          sha1;
-  
-  ws_accept_key.data = buf;
-  
-  r->headers_out.content_length_n = 0;
-  r->chunked = 0;
-  r->header_only = 1;
-  
-  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_VERSION)) == NULL) {
-    fsub->sub.dequeue_after_response=1;
-    r->header_only = 0;
-    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "No Sec-Websocket-Version header present", 1);
-    return NGX_ERROR;
-  }
-  else {
-    ws_version=ngx_atoi(tmp->data, tmp->len);
-    if(ws_version != 13) {
-      //only websocket version 13 (RFC 6455) is supported
-      fsub->sub.dequeue_after_response=1;
-      r->header_only = 0;
-      nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Unsupported websocket protocol version (only version 13 is supported)", 1);
-      return NGX_ERROR;
-    }
-  }
-  
-  if((ws_key = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_KEY)) == NULL) {
-    fsub->sub.dequeue_after_response=1;
-    r->header_only = 0;
-    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "No Sec-Websocket-Key header present", 1);
-    return NGX_ERROR;
-  }
-  
-  if((subprotocols = nchan_get_header_value(r, NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL)) != NULL) {
-    static ngx_str_t     ws_meta = ngx_string("ws+meta.nchan");
-    if(subprotocols->len >= ws_meta.len && ngx_strncmp(subprotocols->data, ws_meta.data, ws_meta.len) == 0) {
-      fsub->ws_meta_subprotocol = 1;
-      nchan_add_response_header(r, &NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL, &ws_meta);
-      
-      //init meta headers str reuse queue
-      nchan_subscriber_init_msgid_reusepool(fsub->ctx, r->pool);
-    }
-    else {
-      nchan_add_response_header(r, &NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL, NULL);
-    }
-  }
-  
-  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS)) != NULL) {
-    
-    u_char      *cur = tmp->data, *end = tmp->data + tmp->len;
-    u_char      *lcur, *lend;
-    
-    if(nchan_strscanstr(&cur, &permessage_deflate, end)) {
-      which_deflate_extension = &permessage_deflate;
-    }
-    else if(nchan_strscanstr(&cur, &webkit_perframe_deflate, end)) {
-      which_deflate_extension = &webkit_perframe_deflate;
-    }
-    else if(nchan_strscanstr(&cur, &perframe_deflate, end)) {
-      which_deflate_extension = &perframe_deflate;
-    }
-
-    if(which_deflate_extension) {
-      lcur = cur;
-      lend = memchr(lcur, ',', end - lcur); 
-      if(lend == NULL) lend = end;
-      
-      pmd.enabled = 1;
-      
-      pmd.client_no_context_takeover = ngx_strnstr(lcur, "client_no_context_takeover", lend - lcur) != NULL ? 1 : 0;
-      pmd.server_no_context_takeover = ngx_strnstr(lcur, "server_no_context_takeover", lend - lcur) != NULL ? 1 : 0;
-      
-      if(which_deflate_extension == &permessage_deflate) {
-        if(extract_deflate_window_bits(fsub, lcur, lend, "client_max_window_bits", &pmd.client_max_window_bits) != NGX_OK) {
-          return respond_with_error(fsub, "invalid client_max_window_bits permessage-deflate setting");
-        }
-        if(extract_deflate_window_bits(fsub, lcur, lend, "server_max_window_bits", &pmd.server_max_window_bits) != NGX_OK) {
-          return respond_with_error(fsub, "invalid server_max_window_bits permessage-deflate setting");
-        }
-      }
-      else if(which_deflate_extension == &webkit_perframe_deflate || which_deflate_extension == &perframe_deflate) {
-        if(extract_deflate_window_bits(fsub, lcur, lend, "max_window_bits", &pmd.server_max_window_bits) == NGX_OK) {
-          pmd.client_max_window_bits = pmd.server_max_window_bits;
-        }
-        else {
-          return respond_with_error(fsub, "invalid max_window_bits perframe-deflate setting");
-        }
-      }
-    }
-  }
-  
-  //generate permessage-deflate headers
-  if(pmd.enabled) {
-    u_char *ws_ext_end;
-    ngx_str_t ws_extensions;
-    ws_extensions.data = permessage_deflate_buf;
-    
-    if(which_deflate_extension == &webkit_perframe_deflate || which_deflate_extension == &perframe_deflate) {
-      ws_ext_end = ngx_snprintf(permessage_deflate_buf, 128, "%V; ", which_deflate_extension);
-      if (pmd.server_max_window_bits != NGX_CONF_UNSET) {
-        if(pmd.server_max_window_bits < server_window_bits) {
-          return respond_with_error(fsub, "max_window_bits perframe-deflate is too small");
-        }
-        pmd.server_max_window_bits = server_window_bits; //always the configured window bits
-        ws_ext_end = ngx_snprintf(ws_ext_end, (permessage_deflate_buf + 128 - ws_ext_end),
-                                  "max_window_bits=%i; ",
-                                  pmd.server_max_window_bits);
-      }
-      else {
-        pmd.server_max_window_bits = pmd.client_max_window_bits = server_window_bits;
-      }
-    }
-    else {
-      ws_ext_end = ngx_snprintf(permessage_deflate_buf, 128, "%V; %s%s", 
-                                which_deflate_extension,
-                                pmd.server_no_context_takeover ? "server_no_context_takeover; " : "",
-                                pmd.client_no_context_takeover ? "client_no_context_takeover; " : "");
-      if (pmd.server_max_window_bits != NGX_CONF_UNSET) {
-        if(pmd.server_max_window_bits < server_window_bits) {
-          return respond_with_error(fsub, "server_max_window_bits perframe-deflate is too small");
-        }
-        pmd.server_max_window_bits = server_window_bits; //always the configured window bits
-        ws_ext_end = ngx_snprintf(ws_ext_end, (permessage_deflate_buf + 128 - ws_ext_end), "server_max_window_bits=%i; ", pmd.server_max_window_bits);
-      }
-      else {
-        pmd.server_max_window_bits = server_window_bits;
-      }
-      
-      if (pmd.client_max_window_bits != NGX_CONF_UNSET) {
-        ws_ext_end = ngx_snprintf(ws_ext_end, (permessage_deflate_buf + 128 - ws_ext_end), "client_max_window_bits=%i; ", pmd.client_max_window_bits);
-      }
-      else {
-        pmd.client_max_window_bits = DEFLATE_DEFAULT_CLIENT_WINDOW_BITS;
-      }
-    }
-    ws_extensions.len = ws_ext_end - permessage_deflate_buf - 2; //-2 for the trailing "; "
-    nchan_add_response_header(r, &NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS, &ws_extensions);
-  }
-  fsub->deflate = pmd;
-
-  //generate accept key
-  ngx_sha1_init(&sha1);
-  ngx_sha1_update(&sha1, ws_key->data, ws_key->len);
-  ngx_sha1_update(&sha1, magic.data, magic.len);
-  ngx_sha1_final(buf_sha1, &sha1);
-  sha1_str.len=20;
-  sha1_str.data=buf_sha1;
-  
-  ws_accept_key.len=ngx_base64_encoded_length(sha1_str.len);
-  assert(ws_accept_key.len < 255);
-  ngx_encode_base64(&ws_accept_key, &sha1_str);
-  
-  nchan_include_access_control_if_needed(r, fsub->ctx);
-  nchan_add_response_header(r, &NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT, &ws_accept_key);
-  nchan_add_response_header(r, &NCHAN_HEADER_UPGRADE, &NCHAN_WEBSOCKET);
-#if nginx_version < 1003013
-  nchan_add_response_header(r, &NCHAN_HEADER_CONNECTION, &NCHAN_UPGRADE);
-#endif
-  r->headers_out.status_line = NCHAN_HTTP_STATUS_101;
-  r->headers_out.status = NGX_HTTP_SWITCHING_PROTOCOLS;
-  
-  r->keepalive=0; //apparently, websocket must not use keepalive.
-  
-  ngx_http_send_header(r);
-  return NGX_OK;
-}
-
-static void websocket_reading(ngx_http_request_t *r);
-
-static ngx_buf_t *websocket_inflate_message(full_subscriber_t *fsub, ngx_buf_t *msgbuf, ngx_pool_t *pool) {
-#if (NGX_ZLIB)
-  z_stream      *strm;
-  int            rc;
-  ngx_buf_t     *outbuf;
-  
-  if(fsub->deflate.zstream_in == NULL) {
-    if((fsub->deflate.zstream_in = ngx_calloc(sizeof(*strm), ngx_cycle->log)) == NULL) {
-      nchan_log_error("couldn't allocate deflate stream.");
-      return NULL;
-    }
-    strm = fsub->deflate.zstream_in;
-    
-    strm->zalloc = Z_NULL;
-    strm->zfree = Z_NULL;
-    strm->opaque = Z_NULL;
-    
-    rc = inflateInit2(strm, -fsub->deflate.client_max_window_bits);
-    
-    if(rc != Z_OK) {
-      nchan_log_error("couldn't initialize inflate stream.");
-      ngx_free(strm);
-      fsub->deflate.zstream_in = NULL;
-      return NULL;
-    }
-  }
-  
-  strm = fsub->deflate.zstream_in;
-  
-  outbuf = nchan_inflate(strm, msgbuf, fsub->sub.request, pool);
-  return outbuf;
-#else
-  return NULL;
-#endif
-}
-
-static void ensure_request_hold(full_subscriber_t *fsub) {
-  if(fsub->holding == 0) {
-    fsub->sub.request->read_event_handler = websocket_reading;
-    fsub->sub.request->write_event_handler = ws_request_empty_handler;
-    fsub->sub.request->main->count++; //this is the right way to hold and finalize the
-    fsub->holding = 1;
-  }
-}
-
-static ngx_int_t ensure_handshake(full_subscriber_t *fsub) {
-  if(fsub->shook_hands == 0) {
-    ensure_request_hold(fsub);
-    if(websocket_perform_handshake(fsub) == NGX_OK) {
-      fsub->shook_hands = 1;
-      return NGX_OK;
-    }
-    else {
-      return NGX_ERROR;
-    }
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t websocket_reserve(subscriber_t *self) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  ensure_request_hold(fsub);
-  self->reserved++;
-  //DBG("%p reserve for req %p. reservations: %i", self, fsub->sub.request, self->reserved);
-  return NGX_OK;
-}
-static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  //DBG("%p release for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
-  assert(self->reserved > 0);
-  self->reserved--;
-  if(nodestroy == 0 && fsub->awaiting_destruction == 1 && self->reserved == 0) {
-    websocket_subscriber_destroy(self);
-    return NGX_ABORT;
-  }
-  else {
-    return NGX_OK;
-  }
-}
-
-static void ping_ev_handler(ngx_event_t *ev) {
-  full_subscriber_t *fsub = (full_subscriber_t *)ev->data;
-  if(ev->timedout) {
-    ev->timedout=0;
-    if(fsub->awaiting_pong) {
-      //never got a PONG back
-      //NGX_HTTP_CLIENT_CLOSED_REQUEST?
-      websocket_finalize_request(fsub);
-    }
-    else {
-      fsub->awaiting_pong = 1;
-      websocket_send_frame(fsub, WEBSOCKET_PING_LAST_FRAME_BYTE, 0, NULL); 
-      ngx_add_timer(&fsub->ping_ev, fsub->sub.cf->websocket_ping_interval * 1000);
-    }
-  }
-}
-
-static ngx_int_t websocket_enqueue(subscriber_t *self) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  ngx_int_t           rc;
-  if((rc = ensure_handshake(fsub)) != NGX_OK) {
-    return rc;
-  }
-  self->enqueued = 1;
-  
-  if(fsub->enqueue_callback) {
-    fsub->enqueue_callback(&fsub->sub, fsub->enqueue_callback_data);
-  }
-  
-  if(self->cf->websocket_ping_interval > 0) {
-    //add timeout timer
-    //nextsub->ev should be zeroed;
-    nchan_init_timer(&fsub->ping_ev, ping_ev_handler, fsub);
-    ngx_add_timer(&fsub->ping_ev, self->cf->websocket_ping_interval * 1000);
-  }
-  
-  if(self->cf->subscriber_timeout > 0) {
-    //add timeout timer
-    ngx_add_timer(&fsub->timeout_ev, self->cf->subscriber_timeout * 1000);
-  }
-  
-  return NGX_OK;
-}
-
-static void websocket_delete_timers(full_subscriber_t *fsub) {
-  if(fsub->ping_ev.timer_set) {
-    ngx_del_timer(&fsub->ping_ev);
-  }
-  
-  if(fsub->closing_ev.timer_set) {
-    ngx_del_timer(&fsub->closing_ev);
-  }
-  
-  if(fsub->timeout_ev.timer_set) {
-    ngx_del_timer(&fsub->timeout_ev);
-  }
-}
-
-static ngx_int_t websocket_dequeue(subscriber_t *self) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  DBG("%p dequeue", self);
-  if(fsub->dequeue_callback) {
-    fsub->dequeue_callback(&fsub->sub, fsub->dequeue_callback_data);
-  }
-  
-  self->enqueued = 0;
-  
-  if(!fsub->sent_close_frame && fsub->shook_hands) {
-    websocket_send_close_frame_cstr(fsub, CLOSE_NORMAL, "410 Gone");
-  }
-  
-  websocket_delete_timers(fsub);
-  
-  if(self->destroy_after_dequeue) {
-    websocket_subscriber_destroy(self);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t websocket_set_enqueue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  fsub->enqueue_callback = cb;
-  fsub->enqueue_callback_data = privdata;
-  return NGX_OK;
-}
-
-static ngx_int_t websocket_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
-  fsub->dequeue_callback = cb;
-  fsub->dequeue_callback_data = privdata;
-  return NGX_OK;
-}
-
-static ngx_int_t ws_recv(ngx_connection_t *c, ngx_event_t *rev, ngx_buf_t *buf, ssize_t len) {
-  ssize_t         n;
-  n = c->recv(c, buf->last, (ssize_t) len - (buf->last - buf->start));
-
-  if (n == NGX_AGAIN) {
-    return NGX_AGAIN;
-  }
-  else if (n == NGX_ERROR || rev->eof) {
-    return NGX_ERROR;
-  }
-  else if (n == 0) {
-    return NGX_DONE;
-  }
-  
-  buf->pos = buf->last;
-  buf->last += n;
-
-  if ((buf->last - buf->start) < len) {
-    return NGX_AGAIN;
-  }
-
-  return NGX_OK;
-}
-
-static void set_buffer(ngx_buf_t *buf, u_char *start, u_char *last, ssize_t len) {
-  ngx_memzero(buf, sizeof(*buf));
-  buf->start = start;
-  buf->pos = buf->start;
-  buf->last = (last != NULL) ? last : start;
-  buf->end = buf->start + len;
-  buf->temporary = 0;
-  buf->memory = 1;
-}
-
-static void websocket_reading_finalize(ngx_http_request_t *r) {
-  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
-  
-  //fsub->sub.status = DEAD;
-  if(fsub) {
-    websocket_delete_timers(fsub);
-    websocket_finalize_request(fsub);
-  }
-}
-  
-/* based on code from push stream module, written by
- * Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
- * thanks, guys!
-*/
-static void websocket_reading(ngx_http_request_t *r) {
-  nchan_request_ctx_t        *ctx;
-  full_subscriber_t          *fsub;
-  ws_frame_t                 *frame;
-  ngx_int_t                   rc;
-  ngx_event_t                *rev;
-  ngx_connection_t           *c;
-  ngx_buf_t                  *msgbuf, buf;
-  //ngx_str_t                 msg_in_str;
-retry:
-  ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  fsub = (full_subscriber_t *)ctx->sub;
-  frame = &fsub->frame;
-  rc = NGX_OK;
-
-  c = r->connection;
-  rev = c->read;
-  
-  if(!fsub) {
-    nchan_http_finalize_request(r, NGX_OK);
-    return;
-  }
-  
-  set_buffer(&buf, frame->header, frame->last, 8);
-
-  //DBG("websocket_reading fsub: %p, frame: %p", fsub, frame);
-  
-
-
-  for (;;) {
-    if (c->error || c->timedout || c->close || c->destroyed || rev->closed || rev->eof || rev->pending_eof) {
-      //ERR("c->error %i c->timedout %i c->close %i c->destroyed %i rev->closed %i rev->eof %i", c->error, c->timedout, c->close, c->destroyed, rev->closed, rev->eof);
-      fsub->sub.request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
-      return websocket_reading_finalize(r);
-    }
-    
-    switch (frame->step) {
-      case WEBSOCKET_READ_START_STEP:
-        //reading frame header
-        if ((rc = ws_recv(c, rev, &buf, 2)) != NGX_OK) {
-          fsub->sub.request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
-          goto exit;
-        }
-        
-        frame->fin  = (frame->header[0] >> 7) & 1;
-        frame->rsv1 = (frame->header[0] >> 6) & 1;
-        frame->rsv2 = (frame->header[0] >> 5) & 1;
-        frame->rsv3 = (frame->header[0] >> 4) & 1;
-        frame->opcode = frame->header[0] & 0xf;
-        
-        frame->mask = (frame->header[1] >> 7) & 1;
-        frame->payload_len = frame->header[1] & 0x7f;
-        
-        frame->step = WEBSOCKET_READ_GET_REAL_SIZE_STEP;
-        break;
-      
-      case WEBSOCKET_READ_GET_REAL_SIZE_STEP:
-        switch(frame->payload_len) {
-          uint64_t len;
-          case 126:
-            if ((rc = ws_recv(c, rev, &buf, 2)) != NGX_OK) {
-              goto exit;
-            }
-            ngx_memcpy(&len, frame->header, 2);
-            frame->payload_len = ntohs(len);
-            break;
-            
-          case 127:
-            if ((rc = ws_recv(c, rev, &buf, 8)) != NGX_OK) {
-              goto exit;
-            }
-            ngx_memcpy(&len, frame->header, 8);
-            frame->payload_len = nchan_ntohll(len);
-            break;
-        }
-        
-        frame->step = WEBSOCKET_READ_GET_MASK_KEY_STEP;
-        break;
-      
-      case WEBSOCKET_READ_GET_MASK_KEY_STEP:
-        if (frame->mask) {
-          if ((rc = ws_recv(c, rev, &buf, 4)) != NGX_OK) {
-            goto exit;
-          }
-          ngx_memcpy(frame->mask_key, buf.start, 4);
-        }
-        
-        frame->step = WEBSOCKET_READ_GET_PAYLOAD_STEP;
-        break;
-      
-      case WEBSOCKET_READ_GET_PAYLOAD_STEP:
-        
-        switch(frame->opcode) {
-          case WEBSOCKET_OPCODE_PING:
-          case WEBSOCKET_OPCODE_PONG:
-          case WEBSOCKET_OPCODE_CLOSE:
-            { //block-scope these vars
-              u_char                  payloadbuf[1024];
-              int                     close_code;
-              ngx_str_t               payload_str;
-              nchan_buf_and_chain_t  *bc;
-              
-              if (frame->payload_len == 0) {
-                frame->payload = NULL;
-              }
-              else if(frame->payload_len < 1024) {
-                frame->payload = payloadbuf;
-                frame->last = frame->payload;
-                set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
-                if ((rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
-                  ERR("ws_recv NOT OK when receiving payload");
-                  goto exit;
-                }
-                if (frame->mask) {
-                  websocket_unmask_frame(frame);
-                }
-              }
-              else {
-                //ERROR: frame too big
-                websocket_send_close_frame(fsub, CLOSE_MESSAGE_TOO_BIG, NULL);
-                return websocket_reading_finalize(r);
-              }
-              
-              switch(frame->opcode) {
-                case WEBSOCKET_OPCODE_PING:
-                  bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
-                  DBG("%p got pinged", fsub);
-                  init_buf(&bc->buf, 1);
-                  payload_str.data = frame->payload;
-                  payload_str.len = frame->payload_len;
-                  set_buf_to_str(&bc->buf, &payload_str);
-                  websocket_send_frame(fsub, WEBSOCKET_PONG_LAST_FRAME_BYTE, frame->payload_len, &bc->chain);
-                  break;
-                
-                case WEBSOCKET_OPCODE_PONG:
-                  DBG("%p Got ponged", fsub);
-                  if(fsub->awaiting_pong) {
-                    fsub->awaiting_pong = 0;
-                  }
-                  // unsolicited pongs are ok too as per 
-                  // https://tools.ietf.org/html/rfc6455#page-37
-                  break;
-                
-                case WEBSOCKET_OPCODE_CLOSE:
-                  fsub->received_close_frame = 1;
-                  if(frame->payload_len >= 2) {
-                    ngx_memcpy(&close_code, frame->payload, 2);
-                    close_code = ntohs(close_code);
-                    payload_str.data = frame->payload + 2;
-                    payload_str.len = frame->payload_len - 2;
-                  }
-                  else {
-                    close_code = 0;
-                    payload_str.data = (u_char *)"";
-                    payload_str.len = 0;
-                  }
-                  DBG("%p wants to close (code %i reason \"%V\")", fsub, close_code, &payload_str);
-                  if(!fsub->sent_close_frame) {
-                    websocket_send_close_frame(fsub, close_code, &payload_str);
-                  }
-                  return websocket_reading_finalize(r);
-                  break; //good practice?
-              }
-            }
-            break;
-          case WEBSOCKET_OPCODE_TEXT:
-          case WEBSOCKET_OPCODE_BINARY:
-            
-            if(!fsub->sub.cf->pub.websocket) {
-              websocket_send_close_frame_cstr(fsub, CLOSE_POLICY_VIOLATION, "Publishing not allowed.");
-              return websocket_reading_finalize(r);
-            }
-            
-            //TODO: check max websocket message length
-            if(frame->payload == NULL) {
-              if(ws_get_msgpool(fsub) == NULL) {
-                ERR("failed to get msgpool");
-                websocket_send_close_frame(fsub, CLOSE_INTERNAL_SERVER_ERROR, NULL);
-                return websocket_reading_finalize(r);
-              }
-              if((frame->payload = ngx_palloc(ws_get_msgpool(fsub), frame->payload_len == 0 ? 1 : frame->payload_len)) == NULL) {
-                ERR("failed to reserve payload len in tmp pool");
-                websocket_send_close_frame(fsub, CLOSE_INTERNAL_SERVER_ERROR, NULL);
-                ws_destroy_msgpool(fsub);
-                fsub->publisher.msg_pool = NULL;
-                return websocket_reading_finalize(r);
-              }
-              frame->last = frame->payload;
-            }
-            
-            set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
-            
-            if (frame->payload_len > 0 && (rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
-              DBG("ws_recv NOT OK when receiving payload, but that's ok");
-              goto exit;
-            }
-            
-            if (frame->mask) {
-              websocket_unmask_frame(frame);
-            }
-            
-            if((msgbuf = ngx_palloc(ws_get_msgpool(fsub), sizeof(*msgbuf))) == NULL) {
-              ERR("failed to reserve payload msgbuf in tmp pool");
-              websocket_send_close_frame(fsub, CLOSE_INTERNAL_SERVER_ERROR, NULL);
-              ws_destroy_msgpool(fsub);
-              fsub->publisher.msg_pool = NULL;
-              return websocket_reading_finalize(r);
-            }
-            
-            init_msg_buf(msgbuf);
-            
-            msgbuf->start = frame->payload;
-            msgbuf->pos = msgbuf->start;
-            msgbuf->end = msgbuf->start + frame->payload_len;
-            msgbuf->last = msgbuf->end;
-            
-            //inflate message if needed
-            if(fsub->deflate.enabled && frame->rsv1) {
-              if((msgbuf = websocket_inflate_message(fsub, msgbuf, ws_get_msgpool(fsub))) == NULL) {
-                websocket_send_close_frame_cstr(fsub, CLOSE_INVALID_PAYLOAD, "Invalid permessage-deflate data");
-                ws_destroy_msgpool(fsub);
-                return websocket_reading_finalize(r);
-              }
-            }
-            
-            if (frame->opcode == WEBSOCKET_OPCODE_TEXT && !is_utf8(msgbuf)) {
-              ws_destroy_msgpool(fsub);
-              websocket_send_close_frame_cstr(fsub, CLOSE_INVALID_PAYLOAD, "Invalid text frame (not UTF8).");
-              return websocket_reading_finalize(r);
-            }
-            
-            if(websocket_heartbeat(fsub, msgbuf) != NGX_OK) {
-              websocket_publish(fsub, msgbuf, frame->opcode == WEBSOCKET_OPCODE_BINARY);
-            }
-            else {
-              ws_destroy_msgpool(fsub);
-            }
-            break;
-          default:
-            //invalid frame or something
-            websocket_send_frame(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL); //TODO: more specific close frame plz
-            return websocket_reading_finalize(r);
-            break;
-        }
-        
-        frame->step = WEBSOCKET_READ_START_STEP; //restart loop
-        frame->last = NULL;
-        frame->payload = NULL;
-        goto retry; //I know, Dijkstra, I know.
-        break;
-        
-      default:
-        nchan_log(NGX_LOG_ERR, c->log, 0, "unknown websocket step (%d)", frame->step);
-        return websocket_reading_finalize(r);
-    }
-    
-    set_buffer(&buf, frame->header, NULL, 8);
-  }
-
-exit:
-  
-  if (rc == NGX_AGAIN) {
-    frame->last = buf.last;
-    if (!c->read->ready) {
-      if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-        nchan_log(NGX_LOG_INFO, c->log, ngx_socket_errno, "websocket client: failed to restore read events");
-        return websocket_reading_finalize(r);
-      }
-    }
-  }
-
-  if (rc == NGX_ERROR) {
-    rev->eof = 1;
-    c->error = 1;
-    nchan_log(NGX_LOG_INFO, c->log, ngx_socket_errno, "websocket client prematurely closed connection");
-    return websocket_reading_finalize(r);
-  }
-}
-
-
-static ngx_flag_t is_utf8(ngx_buf_t *buf) {
-  
-  u_char *p;
-  size_t n;
-  
-  u_char  c, *last;
-  size_t  len;
-  int     mmapped = 0;
-  
-  if(ngx_buf_in_memory(buf)) {
-    n = ngx_buf_size(buf);
-    p = buf->pos;
-  }
-  else {
-    ngx_fd_t fd = buf->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&buf->file->name) : buf->file->fd;
-    n = buf->file_last - buf->file_pos;
-    p = mmap(NULL, n, PROT_READ, MAP_SHARED, fd, buf->file_pos);
-    if (p == MAP_FAILED) {
-      return 0;
-    }
-    mmapped = 1;
-  }
-  
-  last = p + n;
-  
-  for (len = 0; p < last; len++) {
-    c = *p;
-    
-    if (c < 0x80) {
-      p++;
-      continue;
-    }
-    
-    if (ngx_utf8_decode(&p, last - p) > 0x10ffff) {
-      /* invalid UTF-8 */
-      if(mmapped) {
-        munmap(p, n);
-      }
-      return 0;
-    }
-  }
-  if(mmapped) {
-    munmap(p, n);
-  }
-  return 1;
-}
-
-static void init_buf(ngx_buf_t *buf, int8_t last){
-  ngx_memzero(buf, sizeof(*buf));
-  buf->memory = 1;
-  if(last) {
-    buf->last_buf = 1;
-    buf->last_in_chain = 1;
-    buf->flush = 1;
-  }
-}
-
-static void init_header_buf(ngx_buf_t *buf) {
-  init_buf(buf, 0);
-}
-
-static void init_msg_buf(ngx_buf_t *buf) {
-  init_buf(buf, 1);
-}
-
-static ngx_int_t websocket_frame_header(full_subscriber_t *fsub, ngx_buf_t *buf, const u_char opcode, off_t len) {
-  
-  framebuf_t           *framebuf = nchan_reuse_queue_push(fsub->ctx->output_str_queue);
-  u_char               *last = framebuf->chr;
-  uint64_t              len_net;
-  init_header_buf(buf);
-  buf->start = last;
-  *last = opcode;
-  last++;
-  if (len <= 125) {
-    last = ngx_copy(last, &len, 1);
-    buf->end++;
-  }
-  else if (len < (1 << 16)) {
-    last = ngx_copy(last, &WEBSOCKET_PAYLOAD_LEN_16_BYTE, sizeof(WEBSOCKET_PAYLOAD_LEN_16_BYTE));
-    len_net = htons(len);
-    last = ngx_copy(last, &len_net, 2);
-  }
-  else {
-    last = ngx_copy(last, &WEBSOCKET_PAYLOAD_LEN_64_BYTE, sizeof(WEBSOCKET_PAYLOAD_LEN_64_BYTE));
-    len_net = nchan_htonll(len);
-    last = ngx_copy(last, &len_net, 8);
-  }
-  buf->end=last;
-  buf->last=last;
-  buf->last_buf= len == 0;
-  buf->pos=buf->start;
-  return NGX_OK;
-}
-
-/*static ngx_int_t websocket_msg_frame_header(ngx_buf_t *buf, off_t len) {
-  return websocket_frame_header(buf, WEBSOCKET_TEXT_LAST_FRAME_BYTE, len);
-}
-*/
-
-static void set_buf_to_str(ngx_buf_t *buf, const ngx_str_t *str) {
-  buf->start=str->data;
-  buf->end=str->data + str->len;
-  buf->pos = buf->start;
-  buf->last = buf->end;
-}
-
-static ngx_chain_t *websocket_frame_header_chain(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *msg_chain) {
-  
-  nchan_buf_and_chain_t   *bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
-
-  init_header_buf(&bc->buf);
-  
-  websocket_frame_header(fsub, &bc->buf, opcode, len);
-  
-  if(len == 0) {
-    bc->buf.last_buf=1;
-  }
-  else {
-    bc->buf.last_buf=0;
-    assert(msg_chain != NULL);
-    bc->chain.next = msg_chain;
-  }
-  bc->buf.pos=bc->buf.start;
-
-  return &bc->chain;
-}
-
-static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *msg_chain) {
-  return ws_output_filter(fsub, websocket_frame_header_chain(fsub, opcode, len, msg_chain));
-}
-
-static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg_t *msg) {
-  nchan_buf_and_chain_t *bc;
-  ngx_file_t            *file_copy;
-  ngx_buf_t             *chained_msgbuf = NULL;
-  size_t                 sz;
-  u_char                 frame_opcode;
-  int                    compressed;
-  ngx_buf_t             *msgbuf;
-  compressed = fsub->deflate.enabled && msg->compressed && msg->compressed->compression == NCHAN_MSG_COMPRESSION_WEBSOCKET_PERMESSAGE_DEFLATE;
-
-  msgbuf = compressed ? &msg->compressed->buf : &msg->buf;
-  sz = ngx_buf_size(msgbuf);
-  
-  if(msg->content_type && nchan_ngx_str_match(msg->content_type, &binary_mimetype)) {
-    frame_opcode = compressed ? WEBSOCKET_BINARY_DEFLATED_LAST_FRAME_BYTE : WEBSOCKET_BINARY_LAST_FRAME_BYTE;
-  }
-  else {
-    frame_opcode = compressed ? WEBSOCKET_TEXT_DEFLATED_LAST_FRAME_BYTE : WEBSOCKET_TEXT_LAST_FRAME_BYTE;
-  }
-  
-  if(fsub->ws_meta_subprotocol) {
-    if(!compressed) {
-      static ngx_str_t          id_line = ngx_string("id: ");
-      static ngx_str_t          content_type_line = ngx_string("\ncontent-type: ");
-      static ngx_str_t          two_newlines = ngx_string("\n\n");
-      ngx_chain_t              *cur;
-      ngx_str_t                 msgid;
-      bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 4 + (msg->content_type ? 2 : 0));
-      cur = &bc->chain;
-      
-      // id: 
-      ngx_init_set_membuf(cur->buf, id_line.data, id_line.data + id_line.len);
-      sz += id_line.len;
-      cur = cur->next;
-      
-      //msgid value
-      msgid = nchan_subscriber_set_recyclable_msgid_str(fsub->ctx, &fsub->sub.last_msgid);
-      ngx_init_set_membuf(cur->buf, msgid.data, msgid.data + msgid.len);
-      sz += msgid.len;
-      cur = cur->next;
-      
-      if(msg->content_type) {
-        // content-type: 
-        ngx_init_set_membuf(cur->buf, content_type_line.data, content_type_line.data + content_type_line.len);
-        sz += content_type_line.len;
-        cur = cur->next;
-        
-        //content-type value
-        ngx_init_set_membuf(cur->buf, msg->content_type->data, msg->content_type->data + msg->content_type->len);
-        sz += msg->content_type->len;
-        cur = cur->next;
-      }
-      
-      // \n\n
-      ngx_init_set_membuf(cur->buf, two_newlines.data, two_newlines.data + two_newlines.len);
-      sz += two_newlines.len;
-    
-    
-      if(ngx_buf_size(msgbuf) > 0) {
-        cur = cur->next;
-        //now the message
-        *cur->buf = *msgbuf;
-        chained_msgbuf = cur->buf;
-        assert(cur->next == NULL);
-      }
-      else {
-        cur->next = NULL;
-        cur->buf->last_in_chain = 1;
-        cur->buf->last_buf = 1;
-      }
-    }
-    else {
-#if (NGX_ZLIB)
-      u_char        ws_meta_header[512];
-      static u_char ws_meta_header_deflated[512];
-      ngx_chain_t  *cur;
-      u_char       *end;
-      ngx_str_t     ws_meta_header_str_in;
-      ngx_str_t     ws_meta_header_str_out;
-      
-      ws_meta_header_str_out.data = ws_meta_header_deflated;
-      ws_meta_header_str_out.len = 512;
-      
-      ngx_str_t     msgid = nchan_subscriber_set_recyclable_msgid_str(fsub->ctx, &fsub->sub.last_msgid);
-      if(msg->content_type) {
-        end = ngx_snprintf(ws_meta_header, 512, "id: %V\ncontent-type: %V\n\n", &msgid, msg->content_type);
-      }
-      else {
-        end = ngx_snprintf(ws_meta_header, 512, "id: %V\n\n", &msgid);
-      }
-      
-      ws_meta_header_str_in.data = ws_meta_header;
-      ws_meta_header_str_in.len = end - ws_meta_header;
-      
-      bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 2);
-      cur = &bc->chain;
-      
-      nchan_common_simple_deflate_raw_block(&ws_meta_header_str_in, &ws_meta_header_str_out);
-      
-      ngx_init_set_membuf(cur->buf, ws_meta_header_str_out.data, ws_meta_header_str_out.data + ws_meta_header_str_out.len);
-      sz += ws_meta_header_str_out.len;
-      cur = cur->next;
-      
-      //now the message
-      *cur->buf = *msgbuf;
-      chained_msgbuf = cur->buf;
-#endif
-    }
-  }
-  else {
-    bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
-    //message first
-    chained_msgbuf = &bc->buf;
-    bc->buf = *msgbuf;
-  }
-  
-  if(chained_msgbuf && msgbuf->file) {
-    file_copy = nchan_bufchain_pool_reserve_file(fsub->ctx->bcp);
-    nchan_msg_buf_open_fd_if_needed(chained_msgbuf, file_copy, NULL);
-  }
-  
-  //DBG("opcode: %i, orig sz: %i compressed sz: %i", frame_opcode, ngx_buf_size((&msg->buf)), compressed ? ngx_buf_size(msgbuf) : 0);
-  //now the header
-  return websocket_frame_header_chain(fsub, frame_opcode, sz, &bc->chain);
-}
-
-static ngx_int_t websocket_send_close_frame_cstr(full_subscriber_t *fsub, uint16_t code, const char *err) {
-  ngx_str_t errstr=ngx_string(err);
-  return websocket_send_close_frame(fsub, code, &errstr);
-}
-
-static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err) {
-  if(fsub->sent_close_frame == 1) {
-    DBG("%p already sent close frame");
-    websocket_finalize_request(fsub);
-  }
-  else {
-    ws_output_filter(fsub, websocket_close_frame_chain(fsub, code, err));
-    fsub->sent_close_frame = 1;
-    ngx_add_timer(&fsub->closing_ev, fsub->received_close_frame ? 0 : WEBSOCKET_CLOSING_TIMEOUT);
-  }
-  return NGX_OK;
-}
-
-static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err) {
-  nchan_buf_and_chain_t *bc; 
-  ngx_chain_t    *hdr_chain;
-  ngx_buf_t      *code_buf, *msg_buf;
-  ngx_str_t       alt_err;
-  static uint16_t code_net;
-  
-  if(err) {
-    alt_err.data=err->data;
-    alt_err.len=err->len;
-  }
-  else {
-    alt_err.data=NULL;
-    alt_err.len=0;
-  }
-  err = &alt_err;
-  
-  if(code == 0) {
-    return websocket_frame_header_chain(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL);
-  }
-  
-  if(code < 1000 || code == 1005 || code == 1006 || code >= 5000) {
-    ERR("invalid websocket close status code %i", code);
-    code=CLOSE_NORMAL;
-  }  
-  bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, err->len > 0 ? 2 : 1);
-  
-  code_buf = &bc->buf;
-  
-  init_buf(code_buf, err->len == 0);
-  code_net=htons(code);
-  code_buf->start = code_buf->pos = (u_char *)&code_net;
-  code_buf->last = code_buf->end = ngx_copy(code_buf->pos, &code_net, 2);
-  
-  if(err->len > 0) {
-    if(err->len > 123) {
-      ERR("websocket close frame reason string is too long (length %i)", err->len);
-      err->len = 123;
-    }
-    msg_buf = bc->chain.next->buf;
-    init_msg_buf(msg_buf);
-    set_buf_to_str(msg_buf, err);
-  }
-
-  
-  hdr_chain = websocket_frame_header_chain(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, err->len + 2, &bc->chain);
-  return hdr_chain;
-}
-
-
-static ngx_int_t websocket_respond_message(subscriber_t *self, nchan_msg_t *msg) {
-  ngx_int_t            rc;
-  full_subscriber_t   *fsub = (full_subscriber_t *)self;
-  if((rc = ensure_handshake(fsub)) != NGX_OK) {
-    return rc;
-  }
-  ngx_http_request_t *r = self->request;
-  r->header_only = 0;
-  
-  if(fsub->timeout_ev.timer_set) {
-    ngx_del_timer(&fsub->timeout_ev);
-    ngx_add_timer(&fsub->timeout_ev, fsub->sub.cf->subscriber_timeout * 1000);
-  }
-  
-  fsub->ctx->prev_msg_id = self->last_msgid;
-  update_subscriber_last_msg_id(self, msg);
-  fsub->ctx->msg_id = self->last_msgid;
-  
-  rc = ws_output_msg_filter(fsub, msg);
-  
-  return rc;
-}
-
-static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
-  static const ngx_str_t    STATUS_410=ngx_string("410 Channel Deleted");
-  static const ngx_str_t    STATUS_403=ngx_string("403 Forbidden");
-  static const ngx_str_t    STATUS_500=ngx_string("500 Internal Server Error");
-  static const ngx_str_t    STATUS_507=ngx_string("507 Insufficient Storage");
-  static const ngx_str_t    empty=ngx_string("");
-  u_char                    msgbuf[50];
-  ngx_str_t                 custom_close_msg;
-  ngx_str_t                *close_msg = NULL;
-  uint16_t                  close_code = 0;
-  full_subscriber_t        *fsub = (full_subscriber_t *)self;
-  
-  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
-    //don't care, ignore
-    return NGX_OK;
-  }
-  
-  if(!fsub->shook_hands) {
-    //still in HTTP land
-    fsub->cln = NULL;
-    return nchan_respond_status(fsub->sub.request, status_code, status_line, status_body, 1);
-  }
-  
-  switch(status_code) {
-    case 410:
-      close_code = CLOSE_GOING_AWAY;
-      fsub->sub.request->headers_out.status = NGX_HTTP_GONE;
-      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_410);
-      break;
-    case 403:
-      close_code = CLOSE_POLICY_VIOLATION;
-      fsub->sub.request->headers_out.status = NGX_HTTP_FORBIDDEN;
-      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_403);
-      break;
-    case 500: 
-      close_code = CLOSE_INTERNAL_SERVER_ERROR;
-      fsub->sub.request->headers_out.status = NGX_HTTP_INTERNAL_SERVER_ERROR;
-      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_500);
-      break;
-    case 507: 
-      close_code = CLOSE_INTERNAL_SERVER_ERROR;
-      fsub->sub.request->headers_out.status = NGX_HTTP_INSUFFICIENT_STORAGE;
-      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_507);
-      break;
-    default:
-      if((status_code >= 400 && status_code < 600) || status_code == NGX_HTTP_NOT_MODIFIED) {
-        custom_close_msg.data=msgbuf;
-        fsub->sub.request->headers_out.status = status_code;
-        custom_close_msg.len = ngx_sprintf(msgbuf,"%i %v", status_code, (status_line ? status_line : &empty)) - msgbuf;
-        close_msg = &custom_close_msg;
-        close_code = status_code >=500 && status_code <= 599 ? CLOSE_INTERNAL_SERVER_ERROR : CLOSE_NORMAL;
-      }
-      else {
-        ERR("unhandled code %i, %v", status_code, (status_line ? status_line : &empty));
-        assert(0);
-      }
-  }
-  websocket_send_close_frame(fsub, close_code, close_msg);
-  
-  return NGX_OK;
-}
-
-
-ngx_int_t nchan_detect_websocket_request(ngx_http_request_t *r) {
-  ngx_str_t       *tmp;
-  
-  if(r->method != NGX_HTTP_GET) {
-    return 0;
-  }
-  
-  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_CONNECTION))) {
-    if(ngx_strlcasestrn(tmp->data, tmp->data + tmp->len, NCHAN_UPGRADE.data, NCHAN_UPGRADE.len - 1) == NULL) return 0;
-  }
-  else return 0;
-  
-  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_UPGRADE))) {
-    if(tmp->len != NCHAN_WEBSOCKET.len || ngx_strncasecmp(tmp->data, NCHAN_WEBSOCKET.data, NCHAN_WEBSOCKET.len) != 0) return 0;
-  }
-  else return 0;
-
-  return 1;
-}
-
-ngx_int_t websocket_intercept_published_message(subscriber_t *sub, void (*interceptor)(subscriber_t *, nchan_msg_t *)) {
-  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
-  fsub->publisher.intercept = interceptor;
-  return NGX_OK;
-}
-
-static const subscriber_fn_t websocket_fn = {
-  &websocket_enqueue,
-  &websocket_dequeue,
-  &websocket_respond_message,
-  &websocket_respond_status,
-  &websocket_set_enqueue_callback,
-  &websocket_set_dequeue_callback,
-  &websocket_reserve,
-  &websocket_release,
-  &nchan_subscriber_receive_notice,
-  &nchan_subscriber_authorize_subscribe_request
-};
-
-static ngx_str_t     sub_name = ngx_string("websocket");
-
-static const subscriber_t new_websocket_sub = {
-  &sub_name,
-  WEBSOCKET,
-  &websocket_fn,
-  UNKNOWN,
-  NCHAN_ZERO_MSGID,
-  NULL,
-  NULL,
-  NULL,
-  0, //reserved
-  1, //enable sub/unsub callbacks
-  0, //deque after response
-  1, //destroy after dequeue
-  0, //enqueued
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-  NULL, NULL, NULL
-#endif
-};
diff --git a/debian/modules/nchan/src/subscribers/websocket.h b/debian/modules/nchan/src/subscribers/websocket.h
deleted file mode 100644
index 034b0b5..0000000
--- a/debian/modules/nchan/src/subscribers/websocket.h
+++ /dev/null
@@ -1,5 +0,0 @@
-subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
-ngx_int_t websocket_subscriber_destroy(subscriber_t *sub);
-ngx_int_t websocket_intercept_published_message(subscriber_t *sub, void (*)(subscriber_t *, nchan_msg_t *));
-
-ngx_int_t nchan_detect_websocket_request(ngx_http_request_t *r);
diff --git a/debian/modules/nchan/src/uthash.h b/debian/modules/nchan/src/uthash.h
deleted file mode 100644
index 91db592..0000000
--- a/debian/modules/nchan/src/uthash.h
+++ /dev/null
@@ -1,1208 +0,0 @@
-/*
-Copyright (c) 2003-2017, Troy D. Hanson     http://troydhanson.github.com/uthash/
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef UTHASH_H
-#define UTHASH_H
-
-#define UTHASH_VERSION 2.0.2
-
-#include <string.h>   /* memcmp, memset, strlen */
-#include <stddef.h>   /* ptrdiff_t */
-#include <stdlib.h>   /* exit */
-
-/* These macros use decltype or the earlier __typeof GNU extension.
-   As decltype is only available in newer compilers (VS2010 or gcc 4.3+
-   when compiling c++ source) this code uses whatever method is needed
-   or, for VS2008 where neither is available, uses casting workarounds. */
-#if !defined(DECLTYPE) && !defined(NO_DECLTYPE)
-#if defined(_MSC_VER)   /* MS compiler */
-#if _MSC_VER >= 1600 && defined(__cplusplus)  /* VS2010 or newer in C++ mode */
-#define DECLTYPE(x) (decltype(x))
-#else                   /* VS2008 or older (or VS2010 in C mode) */
-#define NO_DECLTYPE
-#endif
-#elif defined(__BORLANDC__) || defined(__ICCARM__) || defined(__LCC__) || defined(__WATCOMC__)
-#define NO_DECLTYPE
-#else                   /* GNU, Sun and other compilers */
-#define DECLTYPE(x) (__typeof(x))
-#endif
-#endif
-
-#ifdef NO_DECLTYPE
-#define DECLTYPE(x)
-#define DECLTYPE_ASSIGN(dst,src)                                                 \
-do {                                                                             \
-  char **_da_dst = (char**)(&(dst));                                             \
-  *_da_dst = (char*)(src);                                                       \
-} while (0)
-#else
-#define DECLTYPE_ASSIGN(dst,src)                                                 \
-do {                                                                             \
-  (dst) = DECLTYPE(dst)(src);                                                    \
-} while (0)
-#endif
-
-/* a number of the hash function use uint32_t which isn't defined on Pre VS2010 */
-#if defined(_WIN32)
-#if defined(_MSC_VER) && _MSC_VER >= 1600
-#include <stdint.h>
-#elif defined(__WATCOMC__) || defined(__MINGW32__) || defined(__CYGWIN__)
-#include <stdint.h>
-#else
-typedef unsigned int uint32_t;
-typedef unsigned char uint8_t;
-#endif
-#elif defined(__GNUC__) && !defined(__VXWORKS__)
-#include <stdint.h>
-#else
-typedef unsigned int uint32_t;
-typedef unsigned char uint8_t;
-#endif
-
-#ifndef uthash_malloc
-#define uthash_malloc(sz) malloc(sz)      /* malloc fcn                      */
-#endif
-#ifndef uthash_free
-#define uthash_free(ptr,sz) free(ptr)     /* free fcn                        */
-#endif
-#ifndef uthash_bzero
-#define uthash_bzero(a,n) memset(a,'\0',n)
-#endif
-#ifndef uthash_memcmp
-#define uthash_memcmp(a,b,n) memcmp(a,b,n)
-#endif
-#ifndef uthash_strlen
-#define uthash_strlen(s) strlen(s)
-#endif
-
-#ifndef uthash_noexpand_fyi
-#define uthash_noexpand_fyi(tbl)          /* can be defined to log noexpand  */
-#endif
-#ifndef uthash_expand_fyi
-#define uthash_expand_fyi(tbl)            /* can be defined to log expands   */
-#endif
-
-#ifndef HASH_NONFATAL_OOM
-#define HASH_NONFATAL_OOM 0
-#endif
-
-#if HASH_NONFATAL_OOM
-/* malloc failures can be recovered from */
-
-#ifndef uthash_nonfatal_oom
-#define uthash_nonfatal_oom(obj) do {} while (0)    /* non-fatal OOM error */
-#endif
-
-#define HASH_RECORD_OOM(oomed) do { (oomed) = 1; } while (0)
-#define IF_HASH_NONFATAL_OOM(x) x
-
-#else
-/* malloc failures result in lost memory, hash tables are unusable */
-
-#ifndef uthash_fatal
-#define uthash_fatal(msg) exit(-1)        /* fatal OOM error */
-#endif
-
-#define HASH_RECORD_OOM(oomed) uthash_fatal("out of memory")
-#define IF_HASH_NONFATAL_OOM(x)
-
-#endif
-
-/* initial number of buckets */
-#define HASH_INITIAL_NUM_BUCKETS 32U     /* initial number of buckets        */
-#define HASH_INITIAL_NUM_BUCKETS_LOG2 5U /* lg2 of initial number of buckets */
-#define HASH_BKT_CAPACITY_THRESH 10U     /* expand when bucket count reaches */
-
-/* calculate the element whose hash handle address is hhp */
-#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho)))
-/* calculate the hash handle from element address elp */
-#define HH_FROM_ELMT(tbl,elp) ((UT_hash_handle *)(((char*)(elp)) + ((tbl)->hho)))
-
-#define HASH_ROLLBACK_BKT(hh, head, itemptrhh)                                   \
-do {                                                                             \
-  struct UT_hash_handle *_hd_hh_item = (itemptrhh);                              \
-  unsigned _hd_bkt;                                                              \
-  HASH_TO_BKT(_hd_hh_item->hashv, (head)->hh.tbl->num_buckets, _hd_bkt);         \
-  (head)->hh.tbl->buckets[_hd_bkt].count++;                                      \
-  _hd_hh_item->hh_next = NULL;                                                   \
-  _hd_hh_item->hh_prev = NULL;                                                   \
-} while (0)
-
-#define HASH_VALUE(keyptr,keylen,hashv)                                          \
-do {                                                                             \
-  HASH_FCN(keyptr, keylen, hashv);                                               \
-} while (0)
-
-#define HASH_FIND_BYHASHVALUE(hh,head,keyptr,keylen,hashval,out)                 \
-do {                                                                             \
-  (out) = NULL;                                                                  \
-  if (head) {                                                                    \
-    unsigned _hf_bkt;                                                            \
-    HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _hf_bkt);                  \
-    if (HASH_BLOOM_TEST((head)->hh.tbl, hashval) != 0) {                         \
-      HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ], keyptr, keylen, hashval, out); \
-    }                                                                            \
-  }                                                                              \
-} while (0)
-
-#define HASH_FIND(hh,head,keyptr,keylen,out)                                     \
-do {                                                                             \
-  unsigned _hf_hashv;                                                            \
-  HASH_VALUE(keyptr, keylen, _hf_hashv);                                         \
-  HASH_FIND_BYHASHVALUE(hh, head, keyptr, keylen, _hf_hashv, out);               \
-} while (0)
-
-#ifdef HASH_BLOOM
-#define HASH_BLOOM_BITLEN (1UL << HASH_BLOOM)
-#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8UL) + (((HASH_BLOOM_BITLEN%8UL)!=0UL) ? 1UL : 0UL)
-#define HASH_BLOOM_MAKE(tbl,oomed)                                               \
-do {                                                                             \
-  (tbl)->bloom_nbits = HASH_BLOOM;                                               \
-  (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN);                 \
-  if (!(tbl)->bloom_bv) {                                                        \
-    HASH_RECORD_OOM(oomed);                                                      \
-  } else {                                                                       \
-    uthash_bzero((tbl)->bloom_bv, HASH_BLOOM_BYTELEN);                           \
-    (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE;                                     \
-  }                                                                              \
-} while (0)
-
-#define HASH_BLOOM_FREE(tbl)                                                     \
-do {                                                                             \
-  uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN);                              \
-} while (0)
-
-#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8U] |= (1U << ((idx)%8U)))
-#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8U] & (1U << ((idx)%8U)))
-
-#define HASH_BLOOM_ADD(tbl,hashv)                                                \
-  HASH_BLOOM_BITSET((tbl)->bloom_bv, (hashv & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U)))
-
-#define HASH_BLOOM_TEST(tbl,hashv)                                               \
-  HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U)))
-
-#else
-#define HASH_BLOOM_MAKE(tbl,oomed)
-#define HASH_BLOOM_FREE(tbl)
-#define HASH_BLOOM_ADD(tbl,hashv)
-#define HASH_BLOOM_TEST(tbl,hashv) (1)
-#define HASH_BLOOM_BYTELEN 0U
-#endif
-
-#define HASH_MAKE_TABLE(hh,head,oomed)                                           \
-do {                                                                             \
-  (head)->hh.tbl = (UT_hash_table*)uthash_malloc(sizeof(UT_hash_table));         \
-  if (!(head)->hh.tbl) {                                                         \
-    HASH_RECORD_OOM(oomed);                                                      \
-  } else {                                                                       \
-    uthash_bzero((head)->hh.tbl, sizeof(UT_hash_table));                         \
-    (head)->hh.tbl->tail = &((head)->hh);                                        \
-    (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS;                      \
-    (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2;            \
-    (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head);                  \
-    (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc(                    \
-        HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket));               \
-    (head)->hh.tbl->signature = HASH_SIGNATURE;                                  \
-    if (!(head)->hh.tbl->buckets) {                                              \
-      HASH_RECORD_OOM(oomed);                                                    \
-      uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                        \
-    } else {                                                                     \
-      uthash_bzero((head)->hh.tbl->buckets,                                      \
-          HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket));             \
-      HASH_BLOOM_MAKE((head)->hh.tbl, oomed);                                    \
-      IF_HASH_NONFATAL_OOM(                                                      \
-        if (oomed) {                                                             \
-          uthash_free((head)->hh.tbl->buckets,                                   \
-              HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));           \
-          uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                    \
-        }                                                                        \
-      )                                                                          \
-    }                                                                            \
-  }                                                                              \
-} while (0)
-
-#define HASH_REPLACE_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,replaced,cmpfcn) \
-do {                                                                             \
-  (replaced) = NULL;                                                             \
-  HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \
-  if (replaced) {                                                                \
-    HASH_DELETE(hh, head, replaced);                                             \
-  }                                                                              \
-  HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn); \
-} while (0)
-
-#define HASH_REPLACE_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add,replaced) \
-do {                                                                             \
-  (replaced) = NULL;                                                             \
-  HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \
-  if (replaced) {                                                                \
-    HASH_DELETE(hh, head, replaced);                                             \
-  }                                                                              \
-  HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add); \
-} while (0)
-
-#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced)                   \
-do {                                                                             \
-  unsigned _hr_hashv;                                                            \
-  HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv);                         \
-  HASH_REPLACE_BYHASHVALUE(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced); \
-} while (0)
-
-#define HASH_REPLACE_INORDER(hh,head,fieldname,keylen_in,add,replaced,cmpfcn)    \
-do {                                                                             \
-  unsigned _hr_hashv;                                                            \
-  HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv);                         \
-  HASH_REPLACE_BYHASHVALUE_INORDER(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced, cmpfcn); \
-} while (0)
-
-#define HASH_APPEND_LIST(hh, head, add)                                          \
-do {                                                                             \
-  (add)->hh.next = NULL;                                                         \
-  (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail);           \
-  (head)->hh.tbl->tail->next = (add);                                            \
-  (head)->hh.tbl->tail = &((add)->hh);                                           \
-} while (0)
-
-#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn)                                 \
-do {                                                                             \
-  do {                                                                           \
-    if (cmpfcn(DECLTYPE(head)(_hs_iter), add) > 0) {                             \
-      break;                                                                     \
-    }                                                                            \
-  } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next));           \
-} while (0)
-
-#ifdef NO_DECLTYPE
-#undef HASH_AKBI_INNER_LOOP
-#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn)                                 \
-do {                                                                             \
-  char *_hs_saved_head = (char*)(head);                                          \
-  do {                                                                           \
-    DECLTYPE_ASSIGN(head, _hs_iter);                                             \
-    if (cmpfcn(head, add) > 0) {                                                 \
-      DECLTYPE_ASSIGN(head, _hs_saved_head);                                     \
-      break;                                                                     \
-    }                                                                            \
-    DECLTYPE_ASSIGN(head, _hs_saved_head);                                       \
-  } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next));           \
-} while (0)
-#endif
-
-#if HASH_NONFATAL_OOM
-
-#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed)            \
-do {                                                                             \
-  if (!(oomed)) {                                                                \
-    unsigned _ha_bkt;                                                            \
-    (head)->hh.tbl->num_items++;                                                 \
-    HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt);                  \
-    HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed);    \
-    if (oomed) {                                                                 \
-      HASH_ROLLBACK_BKT(hh, head, &(add)->hh);                                   \
-      HASH_DELETE_HH(hh, head, &(add)->hh);                                      \
-      (add)->hh.tbl = NULL;                                                      \
-      uthash_nonfatal_oom(add);                                                  \
-    } else {                                                                     \
-      HASH_BLOOM_ADD((head)->hh.tbl, hashval);                                   \
-      HASH_EMIT_KEY(hh, head, keyptr, keylen_in);                                \
-    }                                                                            \
-  } else {                                                                       \
-    (add)->hh.tbl = NULL;                                                        \
-    uthash_nonfatal_oom(add);                                                    \
-  }                                                                              \
-} while (0)
-
-#else
-
-#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed)            \
-do {                                                                             \
-  unsigned _ha_bkt;                                                              \
-  (head)->hh.tbl->num_items++;                                                   \
-  HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt);                    \
-  HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed);      \
-  HASH_BLOOM_ADD((head)->hh.tbl, hashval);                                       \
-  HASH_EMIT_KEY(hh, head, keyptr, keylen_in);                                    \
-} while (0)
-
-#endif
-
-
-#define HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh,head,keyptr,keylen_in,hashval,add,cmpfcn) \
-do {                                                                             \
-  IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; )                                     \
-  (add)->hh.hashv = (hashval);                                                   \
-  (add)->hh.key = (char*) (keyptr);                                              \
-  (add)->hh.keylen = (unsigned) (keylen_in);                                     \
-  if (!(head)) {                                                                 \
-    (add)->hh.next = NULL;                                                       \
-    (add)->hh.prev = NULL;                                                       \
-    HASH_MAKE_TABLE(hh, add, _ha_oomed);                                         \
-    IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { )                                    \
-      (head) = (add);                                                            \
-    IF_HASH_NONFATAL_OOM( } )                                                    \
-  } else {                                                                       \
-    void *_hs_iter = (head);                                                     \
-    (add)->hh.tbl = (head)->hh.tbl;                                              \
-    HASH_AKBI_INNER_LOOP(hh, head, add, cmpfcn);                                 \
-    if (_hs_iter) {                                                              \
-      (add)->hh.next = _hs_iter;                                                 \
-      if (((add)->hh.prev = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev)) {     \
-        HH_FROM_ELMT((head)->hh.tbl, (add)->hh.prev)->next = (add);              \
-      } else {                                                                   \
-        (head) = (add);                                                          \
-      }                                                                          \
-      HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev = (add);                      \
-    } else {                                                                     \
-      HASH_APPEND_LIST(hh, head, add);                                           \
-    }                                                                            \
-  }                                                                              \
-  HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed);       \
-  HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE_INORDER");                    \
-} while (0)
-
-#define HASH_ADD_KEYPTR_INORDER(hh,head,keyptr,keylen_in,add,cmpfcn)             \
-do {                                                                             \
-  unsigned _hs_hashv;                                                            \
-  HASH_VALUE(keyptr, keylen_in, _hs_hashv);                                      \
-  HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, keyptr, keylen_in, _hs_hashv, add, cmpfcn); \
-} while (0)
-
-#define HASH_ADD_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,cmpfcn) \
-  HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn)
-
-#define HASH_ADD_INORDER(hh,head,fieldname,keylen_in,add,cmpfcn)                 \
-  HASH_ADD_KEYPTR_INORDER(hh, head, &((add)->fieldname), keylen_in, add, cmpfcn)
-
-#define HASH_ADD_KEYPTR_BYHASHVALUE(hh,head,keyptr,keylen_in,hashval,add)        \
-do {                                                                             \
-  IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; )                                     \
-  (add)->hh.hashv = (hashval);                                                   \
-  (add)->hh.key = (char*) (keyptr);                                              \
-  (add)->hh.keylen = (unsigned) (keylen_in);                                     \
-  if (!(head)) {                                                                 \
-    (add)->hh.next = NULL;                                                       \
-    (add)->hh.prev = NULL;                                                       \
-    HASH_MAKE_TABLE(hh, add, _ha_oomed);                                         \
-    IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { )                                    \
-      (head) = (add);                                                            \
-    IF_HASH_NONFATAL_OOM( } )                                                    \
-  } else {                                                                       \
-    (add)->hh.tbl = (head)->hh.tbl;                                              \
-    HASH_APPEND_LIST(hh, head, add);                                             \
-  }                                                                              \
-  HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed);       \
-  HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE");                            \
-} while (0)
-
-#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add)                            \
-do {                                                                             \
-  unsigned _ha_hashv;                                                            \
-  HASH_VALUE(keyptr, keylen_in, _ha_hashv);                                      \
-  HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, keyptr, keylen_in, _ha_hashv, add);      \
-} while (0)
-
-#define HASH_ADD_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add)            \
-  HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add)
-
-#define HASH_ADD(hh,head,fieldname,keylen_in,add)                                \
-  HASH_ADD_KEYPTR(hh, head, &((add)->fieldname), keylen_in, add)
-
-#define HASH_TO_BKT(hashv,num_bkts,bkt)                                          \
-do {                                                                             \
-  bkt = ((hashv) & ((num_bkts) - 1U));                                           \
-} while (0)
-
-/* delete "delptr" from the hash table.
- * "the usual" patch-up process for the app-order doubly-linked-list.
- * The use of _hd_hh_del below deserves special explanation.
- * These used to be expressed using (delptr) but that led to a bug
- * if someone used the same symbol for the head and deletee, like
- *  HASH_DELETE(hh,users,users);
- * We want that to work, but by changing the head (users) below
- * we were forfeiting our ability to further refer to the deletee (users)
- * in the patch-up process. Solution: use scratch space to
- * copy the deletee pointer, then the latter references are via that
- * scratch pointer rather than through the repointed (users) symbol.
- */
-#define HASH_DELETE(hh,head,delptr)                                              \
-    HASH_DELETE_HH(hh, head, &(delptr)->hh)
-
-#define HASH_DELETE_HH(hh,head,delptrhh)                                         \
-do {                                                                             \
-  struct UT_hash_handle *_hd_hh_del = (delptrhh);                                \
-  if ((_hd_hh_del->prev == NULL) && (_hd_hh_del->next == NULL)) {                \
-    HASH_BLOOM_FREE((head)->hh.tbl);                                             \
-    uthash_free((head)->hh.tbl->buckets,                                         \
-                (head)->hh.tbl->num_buckets * sizeof(struct UT_hash_bucket));    \
-    uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                          \
-    (head) = NULL;                                                               \
-  } else {                                                                       \
-    unsigned _hd_bkt;                                                            \
-    if (_hd_hh_del == (head)->hh.tbl->tail) {                                    \
-      (head)->hh.tbl->tail = HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev);     \
-    }                                                                            \
-    if (_hd_hh_del->prev != NULL) {                                              \
-      HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev)->next = _hd_hh_del->next;   \
-    } else {                                                                     \
-      DECLTYPE_ASSIGN(head, _hd_hh_del->next);                                   \
-    }                                                                            \
-    if (_hd_hh_del->next != NULL) {                                              \
-      HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->next)->prev = _hd_hh_del->prev;   \
-    }                                                                            \
-    HASH_TO_BKT(_hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt);        \
-    HASH_DEL_IN_BKT((head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del);               \
-    (head)->hh.tbl->num_items--;                                                 \
-  }                                                                              \
-  HASH_FSCK(hh, head, "HASH_DELETE_HH");                                         \
-} while (0)
-
-/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
-#define HASH_FIND_STR(head,findstr,out)                                          \
-    HASH_FIND(hh,head,findstr,(unsigned)uthash_strlen(findstr),out)
-#define HASH_ADD_STR(head,strfield,add)                                          \
-    HASH_ADD(hh,head,strfield[0],(unsigned)uthash_strlen(add->strfield),add)
-#define HASH_REPLACE_STR(head,strfield,add,replaced)                             \
-    HASH_REPLACE(hh,head,strfield[0],(unsigned)uthash_strlen(add->strfield),add,replaced)
-#define HASH_FIND_INT(head,findint,out)                                          \
-    HASH_FIND(hh,head,findint,sizeof(int),out)
-#define HASH_ADD_INT(head,intfield,add)                                          \
-    HASH_ADD(hh,head,intfield,sizeof(int),add)
-#define HASH_REPLACE_INT(head,intfield,add,replaced)                             \
-    HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced)
-#define HASH_FIND_PTR(head,findptr,out)                                          \
-    HASH_FIND(hh,head,findptr,sizeof(void *),out)
-#define HASH_ADD_PTR(head,ptrfield,add)                                          \
-    HASH_ADD(hh,head,ptrfield,sizeof(void *),add)
-#define HASH_REPLACE_PTR(head,ptrfield,add,replaced)                             \
-    HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced)
-#define HASH_DEL(head,delptr)                                                    \
-    HASH_DELETE(hh,head,delptr)
-
-/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined.
- * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined.
- */
-#ifdef HASH_DEBUG
-#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
-#define HASH_FSCK(hh,head,where)                                                 \
-do {                                                                             \
-  struct UT_hash_handle *_thh;                                                   \
-  if (head) {                                                                    \
-    unsigned _bkt_i;                                                             \
-    unsigned _count = 0;                                                         \
-    char *_prev;                                                                 \
-    for (_bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; ++_bkt_i) {           \
-      unsigned _bkt_count = 0;                                                   \
-      _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head;                            \
-      _prev = NULL;                                                              \
-      while (_thh) {                                                             \
-        if (_prev != (char*)(_thh->hh_prev)) {                                   \
-          HASH_OOPS("%s: invalid hh_prev %p, actual %p\n",                       \
-              (where), (void*)_thh->hh_prev, (void*)_prev);                      \
-        }                                                                        \
-        _bkt_count++;                                                            \
-        _prev = (char*)(_thh);                                                   \
-        _thh = _thh->hh_next;                                                    \
-      }                                                                          \
-      _count += _bkt_count;                                                      \
-      if ((head)->hh.tbl->buckets[_bkt_i].count !=  _bkt_count) {                \
-        HASH_OOPS("%s: invalid bucket count %u, actual %u\n",                    \
-            (where), (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count);         \
-      }                                                                          \
-    }                                                                            \
-    if (_count != (head)->hh.tbl->num_items) {                                   \
-      HASH_OOPS("%s: invalid hh item count %u, actual %u\n",                     \
-          (where), (head)->hh.tbl->num_items, _count);                           \
-    }                                                                            \
-    _count = 0;                                                                  \
-    _prev = NULL;                                                                \
-    _thh =  &(head)->hh;                                                         \
-    while (_thh) {                                                               \
-      _count++;                                                                  \
-      if (_prev != (char*)_thh->prev) {                                          \
-        HASH_OOPS("%s: invalid prev %p, actual %p\n",                            \
-            (where), (void*)_thh->prev, (void*)_prev);                           \
-      }                                                                          \
-      _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh);                         \
-      _thh = (_thh->next ? HH_FROM_ELMT((head)->hh.tbl, _thh->next) : NULL);     \
-    }                                                                            \
-    if (_count != (head)->hh.tbl->num_items) {                                   \
-      HASH_OOPS("%s: invalid app item count %u, actual %u\n",                    \
-          (where), (head)->hh.tbl->num_items, _count);                           \
-    }                                                                            \
-  }                                                                              \
-} while (0)
-#else
-#define HASH_FSCK(hh,head,where)
-#endif
-
-/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to
- * the descriptor to which this macro is defined for tuning the hash function.
- * The app can #include <unistd.h> to get the prototype for write(2). */
-#ifdef HASH_EMIT_KEYS
-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                                   \
-do {                                                                             \
-  unsigned _klen = fieldlen;                                                     \
-  write(HASH_EMIT_KEYS, &_klen, sizeof(_klen));                                  \
-  write(HASH_EMIT_KEYS, keyptr, (unsigned long)fieldlen);                        \
-} while (0)
-#else
-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)
-#endif
-
-/* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */
-#ifdef HASH_FUNCTION
-#define HASH_FCN HASH_FUNCTION
-#else
-#define HASH_FCN HASH_JEN
-#endif
-
-/* The Bernstein hash function, used in Perl prior to v5.6. Note (x<<5+x)=x*33. */
-#define HASH_BER(key,keylen,hashv)                                               \
-do {                                                                             \
-  unsigned _hb_keylen = (unsigned)keylen;                                        \
-  const unsigned char *_hb_key = (const unsigned char*)(key);                    \
-  (hashv) = 0;                                                                   \
-  while (_hb_keylen-- != 0U) {                                                   \
-    (hashv) = (((hashv) << 5) + (hashv)) + *_hb_key++;                           \
-  }                                                                              \
-} while (0)
-
-
-/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at
- * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */
-#define HASH_SAX(key,keylen,hashv)                                               \
-do {                                                                             \
-  unsigned _sx_i;                                                                \
-  const unsigned char *_hs_key = (const unsigned char*)(key);                    \
-  hashv = 0;                                                                     \
-  for (_sx_i=0; _sx_i < keylen; _sx_i++) {                                       \
-    hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i];                       \
-  }                                                                              \
-} while (0)
-/* FNV-1a variation */
-#define HASH_FNV(key,keylen,hashv)                                               \
-do {                                                                             \
-  unsigned _fn_i;                                                                \
-  const unsigned char *_hf_key = (const unsigned char*)(key);                    \
-  (hashv) = 2166136261U;                                                         \
-  for (_fn_i=0; _fn_i < keylen; _fn_i++) {                                       \
-    hashv = hashv ^ _hf_key[_fn_i];                                              \
-    hashv = hashv * 16777619U;                                                   \
-  }                                                                              \
-} while (0)
-
-#define HASH_OAT(key,keylen,hashv)                                               \
-do {                                                                             \
-  unsigned _ho_i;                                                                \
-  const unsigned char *_ho_key=(const unsigned char*)(key);                      \
-  hashv = 0;                                                                     \
-  for(_ho_i=0; _ho_i < keylen; _ho_i++) {                                        \
-      hashv += _ho_key[_ho_i];                                                   \
-      hashv += (hashv << 10);                                                    \
-      hashv ^= (hashv >> 6);                                                     \
-  }                                                                              \
-  hashv += (hashv << 3);                                                         \
-  hashv ^= (hashv >> 11);                                                        \
-  hashv += (hashv << 15);                                                        \
-} while (0)
-
-#define HASH_JEN_MIX(a,b,c)                                                      \
-do {                                                                             \
-  a -= b; a -= c; a ^= ( c >> 13 );                                              \
-  b -= c; b -= a; b ^= ( a << 8 );                                               \
-  c -= a; c -= b; c ^= ( b >> 13 );                                              \
-  a -= b; a -= c; a ^= ( c >> 12 );                                              \
-  b -= c; b -= a; b ^= ( a << 16 );                                              \
-  c -= a; c -= b; c ^= ( b >> 5 );                                               \
-  a -= b; a -= c; a ^= ( c >> 3 );                                               \
-  b -= c; b -= a; b ^= ( a << 10 );                                              \
-  c -= a; c -= b; c ^= ( b >> 15 );                                              \
-} while (0)
-
-#define HASH_JEN(key,keylen,hashv)                                               \
-do {                                                                             \
-  unsigned _hj_i,_hj_j,_hj_k;                                                    \
-  unsigned const char *_hj_key=(unsigned const char*)(key);                      \
-  hashv = 0xfeedbeefu;                                                           \
-  _hj_i = _hj_j = 0x9e3779b9u;                                                   \
-  _hj_k = (unsigned)(keylen);                                                    \
-  while (_hj_k >= 12U) {                                                         \
-    _hj_i +=    (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 )                      \
-        + ( (unsigned)_hj_key[2] << 16 )                                         \
-        + ( (unsigned)_hj_key[3] << 24 ) );                                      \
-    _hj_j +=    (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 )                      \
-        + ( (unsigned)_hj_key[6] << 16 )                                         \
-        + ( (unsigned)_hj_key[7] << 24 ) );                                      \
-    hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 )                         \
-        + ( (unsigned)_hj_key[10] << 16 )                                        \
-        + ( (unsigned)_hj_key[11] << 24 ) );                                     \
-                                                                                 \
-     HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                          \
-                                                                                 \
-     _hj_key += 12;                                                              \
-     _hj_k -= 12U;                                                               \
-  }                                                                              \
-  hashv += (unsigned)(keylen);                                                   \
-  switch ( _hj_k ) {                                                             \
-    case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); /* FALLTHROUGH */         \
-    case 10: hashv += ( (unsigned)_hj_key[9] << 16 );  /* FALLTHROUGH */         \
-    case 9:  hashv += ( (unsigned)_hj_key[8] << 8 );   /* FALLTHROUGH */         \
-    case 8:  _hj_j += ( (unsigned)_hj_key[7] << 24 );  /* FALLTHROUGH */         \
-    case 7:  _hj_j += ( (unsigned)_hj_key[6] << 16 );  /* FALLTHROUGH */         \
-    case 6:  _hj_j += ( (unsigned)_hj_key[5] << 8 );   /* FALLTHROUGH */         \
-    case 5:  _hj_j += _hj_key[4];                      /* FALLTHROUGH */         \
-    case 4:  _hj_i += ( (unsigned)_hj_key[3] << 24 );  /* FALLTHROUGH */         \
-    case 3:  _hj_i += ( (unsigned)_hj_key[2] << 16 );  /* FALLTHROUGH */         \
-    case 2:  _hj_i += ( (unsigned)_hj_key[1] << 8 );   /* FALLTHROUGH */         \
-    case 1:  _hj_i += _hj_key[0];                                                \
-  }                                                                              \
-  HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                             \
-} while (0)
-
-/* The Paul Hsieh hash function */
-#undef get16bits
-#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__)             \
-  || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
-#define get16bits(d) (*((const uint16_t *) (d)))
-#endif
-
-#if !defined (get16bits)
-#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)             \
-                       +(uint32_t)(((const uint8_t *)(d))[0]) )
-#endif
-#define HASH_SFH(key,keylen,hashv)                                               \
-do {                                                                             \
-  unsigned const char *_sfh_key=(unsigned const char*)(key);                     \
-  uint32_t _sfh_tmp, _sfh_len = (uint32_t)keylen;                                \
-                                                                                 \
-  unsigned _sfh_rem = _sfh_len & 3U;                                             \
-  _sfh_len >>= 2;                                                                \
-  hashv = 0xcafebabeu;                                                           \
-                                                                                 \
-  /* Main loop */                                                                \
-  for (;_sfh_len > 0U; _sfh_len--) {                                             \
-    hashv    += get16bits (_sfh_key);                                            \
-    _sfh_tmp  = ((uint32_t)(get16bits (_sfh_key+2)) << 11) ^ hashv;              \
-    hashv     = (hashv << 16) ^ _sfh_tmp;                                        \
-    _sfh_key += 2U*sizeof (uint16_t);                                            \
-    hashv    += hashv >> 11;                                                     \
-  }                                                                              \
-                                                                                 \
-  /* Handle end cases */                                                         \
-  switch (_sfh_rem) {                                                            \
-    case 3: hashv += get16bits (_sfh_key);                                       \
-            hashv ^= hashv << 16;                                                \
-            hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)]) << 18;              \
-            hashv += hashv >> 11;                                                \
-            break;                                                               \
-    case 2: hashv += get16bits (_sfh_key);                                       \
-            hashv ^= hashv << 11;                                                \
-            hashv += hashv >> 17;                                                \
-            break;                                                               \
-    case 1: hashv += *_sfh_key;                                                  \
-            hashv ^= hashv << 10;                                                \
-            hashv += hashv >> 1;                                                 \
-  }                                                                              \
-                                                                                 \
-  /* Force "avalanching" of final 127 bits */                                    \
-  hashv ^= hashv << 3;                                                           \
-  hashv += hashv >> 5;                                                           \
-  hashv ^= hashv << 4;                                                           \
-  hashv += hashv >> 17;                                                          \
-  hashv ^= hashv << 25;                                                          \
-  hashv += hashv >> 6;                                                           \
-} while (0)
-
-#ifdef HASH_USING_NO_STRICT_ALIASING
-/* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads.
- * For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error.
- * MurmurHash uses the faster approach only on CPU's where we know it's safe.
- *
- * Note the preprocessor built-in defines can be emitted using:
- *
- *   gcc -m64 -dM -E - < /dev/null                  (on gcc)
- *   cc -## a.c (where a.c is a simple test file)   (Sun Studio)
- */
-#if (defined(__i386__) || defined(__x86_64__)  || defined(_M_IX86))
-#define MUR_GETBLOCK(p,i) p[i]
-#else /* non intel */
-#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 3UL) == 0UL)
-#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 3UL) == 1UL)
-#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 3UL) == 2UL)
-#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 3UL) == 3UL)
-#define WP(p) ((uint32_t*)((unsigned long)(p) & ~3UL))
-#if (defined(__BIG_ENDIAN__) || defined(SPARC) || defined(__ppc__) || defined(__ppc64__))
-#define MUR_THREE_ONE(p) ((((*WP(p))&0x00ffffff) << 8) | (((*(WP(p)+1))&0xff000000) >> 24))
-#define MUR_TWO_TWO(p)   ((((*WP(p))&0x0000ffff) <<16) | (((*(WP(p)+1))&0xffff0000) >> 16))
-#define MUR_ONE_THREE(p) ((((*WP(p))&0x000000ff) <<24) | (((*(WP(p)+1))&0xffffff00) >>  8))
-#else /* assume little endian non-intel */
-#define MUR_THREE_ONE(p) ((((*WP(p))&0xffffff00) >> 8) | (((*(WP(p)+1))&0x000000ff) << 24))
-#define MUR_TWO_TWO(p)   ((((*WP(p))&0xffff0000) >>16) | (((*(WP(p)+1))&0x0000ffff) << 16))
-#define MUR_ONE_THREE(p) ((((*WP(p))&0xff000000) >>24) | (((*(WP(p)+1))&0x00ffffff) <<  8))
-#endif
-#define MUR_GETBLOCK(p,i) (MUR_PLUS0_ALIGNED(p) ? ((p)[i]) :           \
-                            (MUR_PLUS1_ALIGNED(p) ? MUR_THREE_ONE(p) : \
-                             (MUR_PLUS2_ALIGNED(p) ? MUR_TWO_TWO(p) :  \
-                                                      MUR_ONE_THREE(p))))
-#endif
-#define MUR_ROTL32(x,r) (((x) << (r)) | ((x) >> (32 - (r))))
-#define MUR_FMIX(_h) \
-do {                 \
-  _h ^= _h >> 16;    \
-  _h *= 0x85ebca6bu; \
-  _h ^= _h >> 13;    \
-  _h *= 0xc2b2ae35u; \
-  _h ^= _h >> 16;    \
-} while (0)
-
-#define HASH_MUR(key,keylen,hashv)                                     \
-do {                                                                   \
-  const uint8_t *_mur_data = (const uint8_t*)(key);                    \
-  const int _mur_nblocks = (int)(keylen) / 4;                          \
-  uint32_t _mur_h1 = 0xf88D5353u;                                      \
-  uint32_t _mur_c1 = 0xcc9e2d51u;                                      \
-  uint32_t _mur_c2 = 0x1b873593u;                                      \
-  uint32_t _mur_k1 = 0;                                                \
-  const uint8_t *_mur_tail;                                            \
-  const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+(_mur_nblocks*4)); \
-  int _mur_i;                                                          \
-  for (_mur_i = -_mur_nblocks; _mur_i != 0; _mur_i++) {                \
-    _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i);                        \
-    _mur_k1 *= _mur_c1;                                                \
-    _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
-    _mur_k1 *= _mur_c2;                                                \
-                                                                       \
-    _mur_h1 ^= _mur_k1;                                                \
-    _mur_h1 = MUR_ROTL32(_mur_h1,13);                                  \
-    _mur_h1 = (_mur_h1*5U) + 0xe6546b64u;                              \
-  }                                                                    \
-  _mur_tail = (const uint8_t*)(_mur_data + (_mur_nblocks*4));          \
-  _mur_k1=0;                                                           \
-  switch ((keylen) & 3U) {                                             \
-    case 0: break;                                                     \
-    case 3: _mur_k1 ^= (uint32_t)_mur_tail[2] << 16; /* FALLTHROUGH */ \
-    case 2: _mur_k1 ^= (uint32_t)_mur_tail[1] << 8;  /* FALLTHROUGH */ \
-    case 1: _mur_k1 ^= (uint32_t)_mur_tail[0];                         \
-    _mur_k1 *= _mur_c1;                                                \
-    _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
-    _mur_k1 *= _mur_c2;                                                \
-    _mur_h1 ^= _mur_k1;                                                \
-  }                                                                    \
-  _mur_h1 ^= (uint32_t)(keylen);                                       \
-  MUR_FMIX(_mur_h1);                                                   \
-  hashv = _mur_h1;                                                     \
-} while (0)
-#endif  /* HASH_USING_NO_STRICT_ALIASING */
-
-/* iterate over items in a known bucket to find desired item */
-#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,hashval,out)               \
-do {                                                                             \
-  if ((head).hh_head != NULL) {                                                  \
-    DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (head).hh_head));                     \
-  } else {                                                                       \
-    (out) = NULL;                                                                \
-  }                                                                              \
-  while ((out) != NULL) {                                                        \
-    if ((out)->hh.hashv == (hashval) && (out)->hh.keylen == (keylen_in)) {       \
-      if (uthash_memcmp((out)->hh.key, keyptr, keylen_in) == 0) {                \
-        break;                                                                   \
-      }                                                                          \
-    }                                                                            \
-    if ((out)->hh.hh_next != NULL) {                                             \
-      DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (out)->hh.hh_next));                \
-    } else {                                                                     \
-      (out) = NULL;                                                              \
-    }                                                                            \
-  }                                                                              \
-} while (0)
-
-/* add an item to a bucket  */
-#define HASH_ADD_TO_BKT(head,hh,addhh,oomed)                                     \
-do {                                                                             \
-  UT_hash_bucket *_ha_head = &(head);                                            \
-  _ha_head->count++;                                                             \
-  (addhh)->hh_next = _ha_head->hh_head;                                          \
-  (addhh)->hh_prev = NULL;                                                       \
-  if (_ha_head->hh_head != NULL) {                                               \
-    _ha_head->hh_head->hh_prev = (addhh);                                        \
-  }                                                                              \
-  _ha_head->hh_head = (addhh);                                                   \
-  if ((_ha_head->count >= ((_ha_head->expand_mult + 1U) * HASH_BKT_CAPACITY_THRESH)) \
-      && !(addhh)->tbl->noexpand) {                                              \
-    HASH_EXPAND_BUCKETS(addhh,(addhh)->tbl, oomed);                              \
-    IF_HASH_NONFATAL_OOM(                                                        \
-      if (oomed) {                                                               \
-        HASH_DEL_IN_BKT(head,addhh);                                             \
-      }                                                                          \
-    )                                                                            \
-  }                                                                              \
-} while (0)
-
-/* remove an item from a given bucket */
-#define HASH_DEL_IN_BKT(head,delhh)                                              \
-do {                                                                             \
-  UT_hash_bucket *_hd_head = &(head);                                            \
-  _hd_head->count--;                                                             \
-  if (_hd_head->hh_head == (delhh)) {                                            \
-    _hd_head->hh_head = (delhh)->hh_next;                                        \
-  }                                                                              \
-  if ((delhh)->hh_prev) {                                                        \
-    (delhh)->hh_prev->hh_next = (delhh)->hh_next;                                \
-  }                                                                              \
-  if ((delhh)->hh_next) {                                                        \
-    (delhh)->hh_next->hh_prev = (delhh)->hh_prev;                                \
-  }                                                                              \
-} while (0)
-
-/* Bucket expansion has the effect of doubling the number of buckets
- * and redistributing the items into the new buckets. Ideally the
- * items will distribute more or less evenly into the new buckets
- * (the extent to which this is true is a measure of the quality of
- * the hash function as it applies to the key domain).
- *
- * With the items distributed into more buckets, the chain length
- * (item count) in each bucket is reduced. Thus by expanding buckets
- * the hash keeps a bound on the chain length. This bounded chain
- * length is the essence of how a hash provides constant time lookup.
- *
- * The calculation of tbl->ideal_chain_maxlen below deserves some
- * explanation. First, keep in mind that we're calculating the ideal
- * maximum chain length based on the *new* (doubled) bucket count.
- * In fractions this is just n/b (n=number of items,b=new num buckets).
- * Since the ideal chain length is an integer, we want to calculate
- * ceil(n/b). We don't depend on floating point arithmetic in this
- * hash, so to calculate ceil(n/b) with integers we could write
- *
- *      ceil(n/b) = (n/b) + ((n%b)?1:0)
- *
- * and in fact a previous version of this hash did just that.
- * But now we have improved things a bit by recognizing that b is
- * always a power of two. We keep its base 2 log handy (call it lb),
- * so now we can write this with a bit shift and logical AND:
- *
- *      ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0)
- *
- */
-#define HASH_EXPAND_BUCKETS(hh,tbl,oomed)                                        \
-do {                                                                             \
-  unsigned _he_bkt;                                                              \
-  unsigned _he_bkt_i;                                                            \
-  struct UT_hash_handle *_he_thh, *_he_hh_nxt;                                   \
-  UT_hash_bucket *_he_new_buckets, *_he_newbkt;                                  \
-  _he_new_buckets = (UT_hash_bucket*)uthash_malloc(                              \
-           2UL * (tbl)->num_buckets * sizeof(struct UT_hash_bucket));            \
-  if (!_he_new_buckets) {                                                        \
-    HASH_RECORD_OOM(oomed);                                                      \
-  } else {                                                                       \
-    uthash_bzero(_he_new_buckets,                                                \
-        2UL * (tbl)->num_buckets * sizeof(struct UT_hash_bucket));               \
-    (tbl)->ideal_chain_maxlen =                                                  \
-       ((tbl)->num_items >> ((tbl)->log2_num_buckets+1U)) +                      \
-       ((((tbl)->num_items & (((tbl)->num_buckets*2U)-1U)) != 0U) ? 1U : 0U);    \
-    (tbl)->nonideal_items = 0;                                                   \
-    for (_he_bkt_i = 0; _he_bkt_i < (tbl)->num_buckets; _he_bkt_i++) {           \
-      _he_thh = (tbl)->buckets[ _he_bkt_i ].hh_head;                             \
-      while (_he_thh != NULL) {                                                  \
-        _he_hh_nxt = _he_thh->hh_next;                                           \
-        HASH_TO_BKT(_he_thh->hashv, (tbl)->num_buckets * 2U, _he_bkt);           \
-        _he_newbkt = &(_he_new_buckets[_he_bkt]);                                \
-        if (++(_he_newbkt->count) > (tbl)->ideal_chain_maxlen) {                 \
-          (tbl)->nonideal_items++;                                               \
-          _he_newbkt->expand_mult = _he_newbkt->count / (tbl)->ideal_chain_maxlen; \
-        }                                                                        \
-        _he_thh->hh_prev = NULL;                                                 \
-        _he_thh->hh_next = _he_newbkt->hh_head;                                  \
-        if (_he_newbkt->hh_head != NULL) {                                       \
-          _he_newbkt->hh_head->hh_prev = _he_thh;                                \
-        }                                                                        \
-        _he_newbkt->hh_head = _he_thh;                                           \
-        _he_thh = _he_hh_nxt;                                                    \
-      }                                                                          \
-    }                                                                            \
-    uthash_free((tbl)->buckets, (tbl)->num_buckets * sizeof(struct UT_hash_bucket)); \
-    (tbl)->num_buckets *= 2U;                                                    \
-    (tbl)->log2_num_buckets++;                                                   \
-    (tbl)->buckets = _he_new_buckets;                                            \
-    (tbl)->ineff_expands = ((tbl)->nonideal_items > ((tbl)->num_items >> 1)) ?   \
-        ((tbl)->ineff_expands+1U) : 0U;                                          \
-    if ((tbl)->ineff_expands > 1U) {                                             \
-      (tbl)->noexpand = 1;                                                       \
-      uthash_noexpand_fyi(tbl);                                                  \
-    }                                                                            \
-    uthash_expand_fyi(tbl);                                                      \
-  }                                                                              \
-} while (0)
-
-
-/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
-/* Note that HASH_SORT assumes the hash handle name to be hh.
- * HASH_SRT was added to allow the hash handle name to be passed in. */
-#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn)
-#define HASH_SRT(hh,head,cmpfcn)                                                 \
-do {                                                                             \
-  unsigned _hs_i;                                                                \
-  unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize;               \
-  struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail;            \
-  if (head != NULL) {                                                            \
-    _hs_insize = 1;                                                              \
-    _hs_looping = 1;                                                             \
-    _hs_list = &((head)->hh);                                                    \
-    while (_hs_looping != 0U) {                                                  \
-      _hs_p = _hs_list;                                                          \
-      _hs_list = NULL;                                                           \
-      _hs_tail = NULL;                                                           \
-      _hs_nmerges = 0;                                                           \
-      while (_hs_p != NULL) {                                                    \
-        _hs_nmerges++;                                                           \
-        _hs_q = _hs_p;                                                           \
-        _hs_psize = 0;                                                           \
-        for (_hs_i = 0; _hs_i < _hs_insize; ++_hs_i) {                           \
-          _hs_psize++;                                                           \
-          _hs_q = ((_hs_q->next != NULL) ?                                       \
-            HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL);                   \
-          if (_hs_q == NULL) {                                                   \
-            break;                                                               \
-          }                                                                      \
-        }                                                                        \
-        _hs_qsize = _hs_insize;                                                  \
-        while ((_hs_psize != 0U) || ((_hs_qsize != 0U) && (_hs_q != NULL))) {    \
-          if (_hs_psize == 0U) {                                                 \
-            _hs_e = _hs_q;                                                       \
-            _hs_q = ((_hs_q->next != NULL) ?                                     \
-              HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL);                 \
-            _hs_qsize--;                                                         \
-          } else if ((_hs_qsize == 0U) || (_hs_q == NULL)) {                     \
-            _hs_e = _hs_p;                                                       \
-            if (_hs_p != NULL) {                                                 \
-              _hs_p = ((_hs_p->next != NULL) ?                                   \
-                HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL);               \
-            }                                                                    \
-            _hs_psize--;                                                         \
-          } else if ((cmpfcn(                                                    \
-                DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_p)),             \
-                DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_q))              \
-                )) <= 0) {                                                       \
-            _hs_e = _hs_p;                                                       \
-            if (_hs_p != NULL) {                                                 \
-              _hs_p = ((_hs_p->next != NULL) ?                                   \
-                HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL);               \
-            }                                                                    \
-            _hs_psize--;                                                         \
-          } else {                                                               \
-            _hs_e = _hs_q;                                                       \
-            _hs_q = ((_hs_q->next != NULL) ?                                     \
-              HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL);                 \
-            _hs_qsize--;                                                         \
-          }                                                                      \
-          if ( _hs_tail != NULL ) {                                              \
-            _hs_tail->next = ((_hs_e != NULL) ?                                  \
-              ELMT_FROM_HH((head)->hh.tbl, _hs_e) : NULL);                       \
-          } else {                                                               \
-            _hs_list = _hs_e;                                                    \
-          }                                                                      \
-          if (_hs_e != NULL) {                                                   \
-            _hs_e->prev = ((_hs_tail != NULL) ?                                  \
-              ELMT_FROM_HH((head)->hh.tbl, _hs_tail) : NULL);                    \
-          }                                                                      \
-          _hs_tail = _hs_e;                                                      \
-        }                                                                        \
-        _hs_p = _hs_q;                                                           \
-      }                                                                          \
-      if (_hs_tail != NULL) {                                                    \
-        _hs_tail->next = NULL;                                                   \
-      }                                                                          \
-      if (_hs_nmerges <= 1U) {                                                   \
-        _hs_looping = 0;                                                         \
-        (head)->hh.tbl->tail = _hs_tail;                                         \
-        DECLTYPE_ASSIGN(head, ELMT_FROM_HH((head)->hh.tbl, _hs_list));           \
-      }                                                                          \
-      _hs_insize *= 2U;                                                          \
-    }                                                                            \
-    HASH_FSCK(hh, head, "HASH_SRT");                                             \
-  }                                                                              \
-} while (0)
-
-/* This function selects items from one hash into another hash.
- * The end result is that the selected items have dual presence
- * in both hashes. There is no copy of the items made; rather
- * they are added into the new hash through a secondary hash
- * hash handle that must be present in the structure. */
-#define HASH_SELECT(hh_dst, dst, hh_src, src, cond)                              \
-do {                                                                             \
-  unsigned _src_bkt, _dst_bkt;                                                   \
-  void *_last_elt = NULL, *_elt;                                                 \
-  UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL;                         \
-  ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst));                 \
-  if ((src) != NULL) {                                                           \
-    for (_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) {    \
-      for (_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head;               \
-        _src_hh != NULL;                                                         \
-        _src_hh = _src_hh->hh_next) {                                            \
-        _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh);                         \
-        if (cond(_elt)) {                                                        \
-          IF_HASH_NONFATAL_OOM( int _hs_oomed = 0; )                             \
-          _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho);                 \
-          _dst_hh->key = _src_hh->key;                                           \
-          _dst_hh->keylen = _src_hh->keylen;                                     \
-          _dst_hh->hashv = _src_hh->hashv;                                       \
-          _dst_hh->prev = _last_elt;                                             \
-          _dst_hh->next = NULL;                                                  \
-          if (_last_elt_hh != NULL) {                                            \
-            _last_elt_hh->next = _elt;                                           \
-          }                                                                      \
-          if ((dst) == NULL) {                                                   \
-            DECLTYPE_ASSIGN(dst, _elt);                                          \
-            HASH_MAKE_TABLE(hh_dst, dst, _hs_oomed);                             \
-            IF_HASH_NONFATAL_OOM(                                                \
-              if (_hs_oomed) {                                                   \
-                uthash_nonfatal_oom(_elt);                                       \
-                (dst) = NULL;                                                    \
-                continue;                                                        \
-              }                                                                  \
-            )                                                                    \
-          } else {                                                               \
-            _dst_hh->tbl = (dst)->hh_dst.tbl;                                    \
-          }                                                                      \
-          HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt);      \
-          HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt], hh_dst, _dst_hh, _hs_oomed); \
-          (dst)->hh_dst.tbl->num_items++;                                        \
-          IF_HASH_NONFATAL_OOM(                                                  \
-            if (_hs_oomed) {                                                     \
-              HASH_ROLLBACK_BKT(hh_dst, dst, _dst_hh);                           \
-              HASH_DELETE_HH(hh_dst, dst, _dst_hh);                              \
-              _dst_hh->tbl = NULL;                                               \
-              uthash_nonfatal_oom(_elt);                                         \
-              continue;                                                          \
-            }                                                                    \
-          )                                                                      \
-          HASH_BLOOM_ADD(_dst_hh->tbl, _dst_hh->hashv);                          \
-          _last_elt = _elt;                                                      \
-          _last_elt_hh = _dst_hh;                                                \
-        }                                                                        \
-      }                                                                          \
-    }                                                                            \
-  }                                                                              \
-  HASH_FSCK(hh_dst, dst, "HASH_SELECT");                                         \
-} while (0)
-
-#define HASH_CLEAR(hh,head)                                                      \
-do {                                                                             \
-  if ((head) != NULL) {                                                          \
-    HASH_BLOOM_FREE((head)->hh.tbl);                                             \
-    uthash_free((head)->hh.tbl->buckets,                                         \
-                (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket));      \
-    uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                          \
-    (head) = NULL;                                                               \
-  }                                                                              \
-} while (0)
-
-#define HASH_OVERHEAD(hh,head)                                                   \
- (((head) != NULL) ? (                                                           \
- (size_t)(((head)->hh.tbl->num_items   * sizeof(UT_hash_handle))   +             \
-          ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket))   +             \
-           sizeof(UT_hash_table)                                   +             \
-           (HASH_BLOOM_BYTELEN))) : 0U)
-
-#ifdef NO_DECLTYPE
-#define HASH_ITER(hh,head,el,tmp)                                                \
-for(((el)=(head)), ((*(char**)(&(tmp)))=(char*)((head!=NULL)?(head)->hh.next:NULL)); \
-  (el) != NULL; ((el)=(tmp)), ((*(char**)(&(tmp)))=(char*)((tmp!=NULL)?(tmp)->hh.next:NULL)))
-#else
-#define HASH_ITER(hh,head,el,tmp)                                                \
-for(((el)=(head)), ((tmp)=DECLTYPE(el)((head!=NULL)?(head)->hh.next:NULL));      \
-  (el) != NULL; ((el)=(tmp)), ((tmp)=DECLTYPE(el)((tmp!=NULL)?(tmp)->hh.next:NULL)))
-#endif
-
-/* obtain a count of items in the hash */
-#define HASH_COUNT(head) HASH_CNT(hh,head)
-#define HASH_CNT(hh,head) ((head != NULL)?((head)->hh.tbl->num_items):0U)
-
-typedef struct UT_hash_bucket {
-   struct UT_hash_handle *hh_head;
-   unsigned count;
-
-   /* expand_mult is normally set to 0. In this situation, the max chain length
-    * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If
-    * the bucket's chain exceeds this length, bucket expansion is triggered).
-    * However, setting expand_mult to a non-zero value delays bucket expansion
-    * (that would be triggered by additions to this particular bucket)
-    * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH.
-    * (The multiplier is simply expand_mult+1). The whole idea of this
-    * multiplier is to reduce bucket expansions, since they are expensive, in
-    * situations where we know that a particular bucket tends to be overused.
-    * It is better to let its chain length grow to a longer yet-still-bounded
-    * value, than to do an O(n) bucket expansion too often.
-    */
-   unsigned expand_mult;
-
-} UT_hash_bucket;
-
-/* random signature used only to find hash tables in external analysis */
-#define HASH_SIGNATURE 0xa0111fe1u
-#define HASH_BLOOM_SIGNATURE 0xb12220f2u
-
-typedef struct UT_hash_table {
-   UT_hash_bucket *buckets;
-   unsigned num_buckets, log2_num_buckets;
-   unsigned num_items;
-   struct UT_hash_handle *tail; /* tail hh in app order, for fast append    */
-   ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */
-
-   /* in an ideal situation (all buckets used equally), no bucket would have
-    * more than ceil(#items/#buckets) items. that's the ideal chain length. */
-   unsigned ideal_chain_maxlen;
-
-   /* nonideal_items is the number of items in the hash whose chain position
-    * exceeds the ideal chain maxlen. these items pay the penalty for an uneven
-    * hash distribution; reaching them in a chain traversal takes >ideal steps */
-   unsigned nonideal_items;
-
-   /* ineffective expands occur when a bucket doubling was performed, but
-    * afterward, more than half the items in the hash had nonideal chain
-    * positions. If this happens on two consecutive expansions we inhibit any
-    * further expansion, as it's not helping; this happens when the hash
-    * function isn't a good fit for the key domain. When expansion is inhibited
-    * the hash will still work, albeit no longer in constant time. */
-   unsigned ineff_expands, noexpand;
-
-   uint32_t signature; /* used only to find hash tables in external analysis */
-#ifdef HASH_BLOOM
-   uint32_t bloom_sig; /* used only to test bloom exists in external analysis */
-   uint8_t *bloom_bv;
-   uint8_t bloom_nbits;
-#endif
-
-} UT_hash_table;
-
-typedef struct UT_hash_handle {
-   struct UT_hash_table *tbl;
-   void *prev;                       /* prev element in app order      */
-   void *next;                       /* next element in app order      */
-   struct UT_hash_handle *hh_prev;   /* previous hh in bucket order    */
-   struct UT_hash_handle *hh_next;   /* next hh in bucket order        */
-   void *key;                        /* ptr to enclosing struct's key  */
-   unsigned keylen;                  /* enclosing struct's key len     */
-   unsigned hashv;                   /* result of hash-fcn(key)        */
-} UT_hash_handle;
-
-#endif /* UTHASH_H */
diff --git a/debian/modules/nchan/src/util/hdr_histogram.c b/debian/modules/nchan/src/util/hdr_histogram.c
deleted file mode 100644
index 9b4a770..0000000
--- a/debian/modules/nchan/src/util/hdr_histogram.c
+++ /dev/null
@@ -1,1015 +0,0 @@
-/**
- * hdr_histogram.c
- * Written by Michael Barker and released to the public domain,
- * as explained at http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-#include <inttypes.h>
-
-#include <nchan_module.h>
-#include <util/shmem.h>
-#include <store/memory/store.h>
-
-#include "hdr_histogram.h"
-
-//  ######   #######  ##     ## ##    ## ########  ######
-// ##    ## ##     ## ##     ## ###   ##    ##    ##    ##
-// ##       ##     ## ##     ## ####  ##    ##    ##
-// ##       ##     ## ##     ## ## ## ##    ##     ######
-// ##       ##     ## ##     ## ##  ####    ##          ##
-// ##    ## ##     ## ##     ## ##   ###    ##    ##    ##
-//  ######   #######   #######  ##    ##    ##     ######
-
-static int32_t normalize_index(const struct hdr_histogram* h, int32_t index)
-{
-    if (h->normalizing_index_offset == 0)
-    {
-        return index;
-    }
-
-    int32_t normalized_index = index - h->normalizing_index_offset;
-    int32_t adjustment = 0;
-
-    if (normalized_index < 0)
-    {
-        adjustment = h->counts_len;
-    }
-    else if (normalized_index >= h->counts_len)
-    {
-        adjustment = -h->counts_len;
-    }
-
-    return normalized_index + adjustment;
-}
-
-static int64_t counts_get_direct(const struct hdr_histogram* h, int32_t index)
-{
-    return h->counts[index];
-}
-
-static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t index)
-{
-    return counts_get_direct(h, normalize_index(h, index));
-}
-
-static void counts_inc_normalised(
-    struct hdr_histogram* h, int32_t index, int64_t value)
-{
-    int32_t normalised_index = normalize_index(h, index);
-    h->counts[normalised_index] += value;
-    h->total_count += value;
-}
-
-static void update_min_max(struct hdr_histogram* h, int64_t value)
-{
-    h->min_value = (value < h->min_value && value != 0) ? value : h->min_value;
-    h->max_value = (value > h->max_value) ? value : h->max_value;
-}
-
-// ##     ## ######## #### ##       #### ######## ##    ##
-// ##     ##    ##     ##  ##        ##     ##     ##  ##
-// ##     ##    ##     ##  ##        ##     ##      ####
-// ##     ##    ##     ##  ##        ##     ##       ##
-// ##     ##    ##     ##  ##        ##     ##       ##
-// ##     ##    ##     ##  ##        ##     ##       ##
-//  #######     ##    #### ######## ####    ##       ##
-
-static int64_t power(int64_t base, int64_t exp)
-{
-    int64_t result = 1;
-    while(exp)
-    {
-        result *= base; exp--;
-    }
-    return result;
-}
-
-#if defined(_MSC_VER)
-#pragma intrinsic(_BitScanReverse64)
-#endif
-
-static int32_t get_bucket_index(const struct hdr_histogram* h, int64_t value)
-{
-#if defined(_MSC_VER)
-    uint32_t leading_zero = 0;
-    _BitScanReverse64(&leading_zero, value | h->sub_bucket_mask);
-    int32_t pow2ceiling = 64 - (63 - leading_zero); // smallest power of 2 containing value
-#else
-    int32_t pow2ceiling = 64 - __builtin_clzll(value | h->sub_bucket_mask); // smallest power of 2 containing value
-#endif
-    return pow2ceiling - h->unit_magnitude - (h->sub_bucket_half_count_magnitude + 1);
-}
-
-static int32_t get_sub_bucket_index(int64_t value, int32_t bucket_index, int32_t unit_magnitude)
-{
-    return (int32_t)(value >> (bucket_index + unit_magnitude));
-}
-
-static int32_t counts_index(const struct hdr_histogram* h, int32_t bucket_index, int32_t sub_bucket_index)
-{
-    // Calculate the index for the first entry in the bucket:
-    // (The following is the equivalent of ((bucket_index + 1) * subBucketHalfCount) ):
-    int32_t bucket_base_index = (bucket_index + 1) << h->sub_bucket_half_count_magnitude;
-    // Calculate the offset in the bucket:
-    int32_t offset_in_bucket = sub_bucket_index - h->sub_bucket_half_count;
-    // The following is the equivalent of ((sub_bucket_index  - subBucketHalfCount) + bucketBaseIndex;
-    return bucket_base_index + offset_in_bucket;
-}
-
-static int64_t value_from_index(int32_t bucket_index, int32_t sub_bucket_index, int32_t unit_magnitude)
-{
-    return ((int64_t) sub_bucket_index) << (bucket_index + unit_magnitude);
-}
-
-int32_t counts_index_for(const struct hdr_histogram* h, int64_t value)
-{
-    int32_t bucket_index     = get_bucket_index(h, value);
-    int32_t sub_bucket_index = get_sub_bucket_index(value, bucket_index, h->unit_magnitude);
-
-    return counts_index(h, bucket_index, sub_bucket_index);
-}
-
-int64_t hdr_value_at_index(const struct hdr_histogram *h, int32_t index)
-{
-    int32_t bucket_index = (index >> h->sub_bucket_half_count_magnitude) - 1;
-    int32_t sub_bucket_index = (index & (h->sub_bucket_half_count - 1)) + h->sub_bucket_half_count;
-
-    if (bucket_index < 0)
-    {
-        sub_bucket_index -= h->sub_bucket_half_count;
-        bucket_index = 0;
-    }
-
-    return value_from_index(bucket_index, sub_bucket_index, h->unit_magnitude);
-}
-
-int64_t hdr_size_of_equivalent_value_range(const struct hdr_histogram* h, int64_t value)
-{
-    int32_t bucket_index     = get_bucket_index(h, value);
-    int32_t sub_bucket_index = get_sub_bucket_index(value, bucket_index, h->unit_magnitude);
-    int32_t adjusted_bucket  = (sub_bucket_index >= h->sub_bucket_count) ? (bucket_index + 1) : bucket_index;
-    return INT64_C(1) << (h->unit_magnitude + adjusted_bucket);
-}
-
-static int64_t lowest_equivalent_value(const struct hdr_histogram* h, int64_t value)
-{
-    int32_t bucket_index     = get_bucket_index(h, value);
-    int32_t sub_bucket_index = get_sub_bucket_index(value, bucket_index, h->unit_magnitude);
-    return value_from_index(bucket_index, sub_bucket_index, h->unit_magnitude);
-}
-
-int64_t hdr_next_non_equivalent_value(const struct hdr_histogram *h, int64_t value)
-{
-    return lowest_equivalent_value(h, value) + hdr_size_of_equivalent_value_range(h, value);
-}
-
-static int64_t highest_equivalent_value(const struct hdr_histogram* h, int64_t value)
-{
-    return hdr_next_non_equivalent_value(h, value) - 1;
-}
-
-int64_t hdr_median_equivalent_value(const struct hdr_histogram *h, int64_t value)
-{
-    return lowest_equivalent_value(h, value) + (hdr_size_of_equivalent_value_range(h, value) >> 1);
-}
-
-static int64_t non_zero_min(const struct hdr_histogram* h)
-{
-    if (INT64_MAX == h->min_value)
-    {
-        return INT64_MAX;
-    }
-
-    return lowest_equivalent_value(h, h->min_value);
-}
-
-void hdr_reset_internal_counters(struct hdr_histogram* h)
-{
-    int min_non_zero_index = -1;
-    int max_index = -1;
-    int64_t observed_total_count = 0;
-    int i;
-
-    for (i = 0; i < h->counts_len; i++)
-    {
-        int64_t count_at_index;
-
-        if ((count_at_index = counts_get_direct(h, i)) > 0)
-        {
-            observed_total_count += count_at_index;
-            max_index = i;
-            if (min_non_zero_index == -1 && i != 0)
-            {
-                min_non_zero_index = i;
-            }
-        }
-    }
-
-    if (max_index == -1)
-    {
-        h->max_value = 0;
-    }
-    else
-    {
-        int64_t max_value = hdr_value_at_index(h, max_index);
-        h->max_value = highest_equivalent_value(h, max_value);
-    }
-
-    if (min_non_zero_index == -1)
-    {
-        h->min_value = INT64_MAX;
-    }
-    else
-    {
-        h->min_value = hdr_value_at_index(h, min_non_zero_index);
-    }
-
-    h->total_count = observed_total_count;
-}
-
-static int32_t buckets_needed_to_cover_value(int64_t value, int32_t sub_bucket_count, int32_t unit_magnitude)
-{
-    int64_t smallest_untrackable_value = ((int64_t) sub_bucket_count) << unit_magnitude;
-    int32_t buckets_needed = 1;
-    while (smallest_untrackable_value <= value)
-    {
-        if (smallest_untrackable_value > INT64_MAX / 2)
-        {
-            return buckets_needed + 1;
-        }
-        smallest_untrackable_value <<= 1;
-        buckets_needed++;
-    }
-
-    return buckets_needed;
-}
-
-// ##     ## ######## ##     ##  #######  ########  ##    ##
-// ###   ### ##       ###   ### ##     ## ##     ##  ##  ##
-// #### #### ##       #### #### ##     ## ##     ##   ####
-// ## ### ## ######   ## ### ## ##     ## ########     ##
-// ##     ## ##       ##     ## ##     ## ##   ##      ##
-// ##     ## ##       ##     ## ##     ## ##    ##     ##
-// ##     ## ######## ##     ##  #######  ##     ##    ##
-
-int hdr_calculate_bucket_config(
-        int64_t lowest_trackable_value,
-        int64_t highest_trackable_value,
-        int significant_figures,
-        struct hdr_histogram_bucket_config* cfg)
-{
-    if (lowest_trackable_value < 1 ||
-            significant_figures < 1 || 5 < significant_figures)
-    {
-        return EINVAL;
-    }
-    else if (lowest_trackable_value * 2 > highest_trackable_value)
-    {
-        return EINVAL;
-    }
-
-    cfg->lowest_trackable_value = lowest_trackable_value;
-    cfg->significant_figures = significant_figures;
-    cfg->highest_trackable_value = highest_trackable_value;
-
-    int64_t largest_value_with_single_unit_resolution = 2 * power(10, significant_figures);
-    int32_t sub_bucket_count_magnitude = (int32_t) ceil(log((double)largest_value_with_single_unit_resolution) / log(2));
-    cfg->sub_bucket_half_count_magnitude = ((sub_bucket_count_magnitude > 1) ? sub_bucket_count_magnitude : 1) - 1;
-
-    cfg->unit_magnitude = (int32_t) floor(log((double)lowest_trackable_value) / log(2));
-
-    cfg->sub_bucket_count      = (int32_t) pow(2, (cfg->sub_bucket_half_count_magnitude + 1));
-    cfg->sub_bucket_half_count = cfg->sub_bucket_count / 2;
-    cfg->sub_bucket_mask       = ((int64_t) cfg->sub_bucket_count - 1) << cfg->unit_magnitude;
-
-    if (cfg->unit_magnitude + cfg->sub_bucket_half_count_magnitude > 61)
-    {
-        return EINVAL;
-    }
-
-    cfg->bucket_count = buckets_needed_to_cover_value(highest_trackable_value, cfg->sub_bucket_count, (int32_t)cfg->unit_magnitude);
-    cfg->counts_len = (cfg->bucket_count + 1) * (cfg->sub_bucket_count / 2);
-
-    return 0;
-}
-
-void hdr_init_preallocated(struct hdr_histogram* h, struct hdr_histogram_bucket_config* cfg)
-{
-    h->lowest_trackable_value          = cfg->lowest_trackable_value;
-    h->highest_trackable_value         = cfg->highest_trackable_value;
-    h->unit_magnitude                  = (int32_t)cfg->unit_magnitude;
-    h->significant_figures             = (int32_t)cfg->significant_figures;
-    h->sub_bucket_half_count_magnitude = cfg->sub_bucket_half_count_magnitude;
-    h->sub_bucket_half_count           = cfg->sub_bucket_half_count;
-    h->sub_bucket_mask                 = cfg->sub_bucket_mask;
-    h->sub_bucket_count                = cfg->sub_bucket_count;
-    h->min_value                       = INT64_MAX;
-    h->max_value                       = 0;
-    h->normalizing_index_offset        = 0;
-    h->conversion_ratio                = 1.0;
-    h->bucket_count                    = cfg->bucket_count;
-    h->counts_len                      = cfg->counts_len;
-    h->total_count                     = 0;
-}
-
-int hdr_init_nchan_shm(
-        int64_t lowest_trackable_value,
-        int64_t highest_trackable_value,
-        int significant_figures,
-        struct hdr_histogram** result)
-{
-    struct hdr_histogram_bucket_config cfg;
-
-    int r = hdr_calculate_bucket_config(lowest_trackable_value, highest_trackable_value, significant_figures, &cfg);
-    if (r)
-    {
-        return r;
-    }
-
-    int64_t* counts = shm_calloc(nchan_store_memory_shmem, (size_t) cfg.counts_len * sizeof(int64_t), "hdrhistogram counts");
-    struct hdr_histogram* histogram = shm_calloc(nchan_store_memory_shmem, sizeof(struct hdr_histogram), "hdrhistogram");
-
-    if (!counts || !histogram)
-    {
-        return ENOMEM;
-    }
-
-    histogram->counts = counts;
-
-    hdr_init_preallocated(histogram, &cfg);
-    *result = histogram;
-
-    return 0;
-}
-
-void hdr_close_nchan_shm(struct hdr_histogram* h)
-{
-    shm_free(nchan_store_memory_shmem, h->counts);
-    shm_free(nchan_store_memory_shmem, h);
-}
-
-// reset a histogram to zero.
-void hdr_reset(struct hdr_histogram *h)
-{
-     h->total_count=0;
-     h->min_value = INT64_MAX;
-     h->max_value = 0;
-     memset(h->counts, 0, (sizeof(int64_t) * h->counts_len));
-}
-
-size_t hdr_get_memory_size(struct hdr_histogram *h)
-{
-    return sizeof(struct hdr_histogram) + h->counts_len * sizeof(int64_t);
-}
-
-// ##     ## ########  ########     ###    ######## ########  ######
-// ##     ## ##     ## ##     ##   ## ##      ##    ##       ##    ##
-// ##     ## ##     ## ##     ##  ##   ##     ##    ##       ##
-// ##     ## ########  ##     ## ##     ##    ##    ######    ######
-// ##     ## ##        ##     ## #########    ##    ##             ##
-// ##     ## ##        ##     ## ##     ##    ##    ##       ##    ##
-//  #######  ##        ########  ##     ##    ##    ########  ######
-
-
-bool hdr_record_value(struct hdr_histogram* h, int64_t value)
-{
-    return hdr_record_values(h, value, 1);
-}
-
-bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
-{
-    if (value < 0)
-    {
-        return false;
-    }
-
-    int32_t counts_index = counts_index_for(h, value);
-
-    if (counts_index < 0 || h->counts_len <= counts_index)
-    {
-        return false;
-    }
-
-    counts_inc_normalised(h, counts_index, count);
-    update_min_max(h, value);
-
-    return true;
-}
-
-bool hdr_record_corrected_value(struct hdr_histogram* h, int64_t value, int64_t expected_interval)
-{
-    return hdr_record_corrected_values(h, value, 1, expected_interval);
-}
-
-
-bool hdr_record_corrected_values(struct hdr_histogram* h, int64_t value, int64_t count, int64_t expected_interval)
-{
-    if (!hdr_record_values(h, value, count))
-    {
-        return false;
-    }
-
-    if (expected_interval <= 0 || value <= expected_interval)
-    {
-        return true;
-    }
-
-    int64_t missing_value = value - expected_interval;
-    for (; missing_value >= expected_interval; missing_value -= expected_interval)
-    {
-        if (!hdr_record_values(h, missing_value, count))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-int64_t hdr_add(struct hdr_histogram* h, const struct hdr_histogram* from)
-{
-    struct hdr_iter iter;
-    hdr_iter_recorded_init(&iter, from);
-    int64_t dropped = 0;
-
-    while (hdr_iter_next(&iter))
-    {
-        int64_t value = iter.value;
-        int64_t count = iter.count;
-
-        if (!hdr_record_values(h, value, count))
-        {
-            dropped += count;
-        }
-    }
-
-    return dropped;
-}
-
-int64_t hdr_add_while_correcting_for_coordinated_omission(
-        struct hdr_histogram* h, struct hdr_histogram* from, int64_t expected_interval)
-{
-    struct hdr_iter iter;
-    hdr_iter_recorded_init(&iter, from);
-    int64_t dropped = 0;
-
-    while (hdr_iter_next(&iter))
-    {
-        int64_t value = iter.value;
-        int64_t count = iter.count;
-
-        if (!hdr_record_corrected_values(h, value, count, expected_interval))
-        {
-            dropped += count;
-        }
-    }
-
-    return dropped;
-}
-
-
-
-// ##     ##    ###    ##       ##     ## ########  ######
-// ##     ##   ## ##   ##       ##     ## ##       ##    ##
-// ##     ##  ##   ##  ##       ##     ## ##       ##
-// ##     ## ##     ## ##       ##     ## ######    ######
-//  ##   ##  ######### ##       ##     ## ##             ##
-//   ## ##   ##     ## ##       ##     ## ##       ##    ##
-//    ###    ##     ## ########  #######  ########  ######
-
-
-int64_t hdr_max(const struct hdr_histogram* h)
-{
-    if (0 == h->max_value)
-    {
-        return 0;
-    }
-
-    return highest_equivalent_value(h, h->max_value);
-}
-
-int64_t hdr_min(const struct hdr_histogram* h)
-{
-    if (0 < hdr_count_at_index(h, 0))
-    {
-        return 0;
-    }
-
-    return non_zero_min(h);
-}
-
-int64_t hdr_value_at_percentile(const struct hdr_histogram* h, double percentile)
-{
-    struct hdr_iter iter;
-    hdr_iter_init(&iter, h);
-
-    double requested_percentile = percentile < 100.0 ? percentile : 100.0;
-    int64_t count_at_percentile =
-        (int64_t) (((requested_percentile / 100) * h->total_count) + 0.5);
-    count_at_percentile = count_at_percentile > 1 ? count_at_percentile : 1;
-    int64_t total = 0;
-
-    while (hdr_iter_next(&iter))
-    {
-        total += iter.count;
-
-        if (total >= count_at_percentile)
-        {
-            int64_t value_from_index = iter.value;
-            return highest_equivalent_value(h, value_from_index);
-        }
-    }
-
-    return 0;
-}
-
-double hdr_mean(const struct hdr_histogram* h)
-{
-    struct hdr_iter iter;
-    int64_t total = 0;
-
-    hdr_iter_init(&iter, h);
-
-    while (hdr_iter_next(&iter))
-    {
-        if (0 != iter.count)
-        {
-            total += iter.count * hdr_median_equivalent_value(h, iter.value);
-        }
-    }
-
-    return (total * 1.0) / h->total_count;
-}
-
-double hdr_stddev(const struct hdr_histogram* h)
-{
-    double mean = hdr_mean(h);
-    double geometric_dev_total = 0.0;
-
-    struct hdr_iter iter;
-    hdr_iter_init(&iter, h);
-
-    while (hdr_iter_next(&iter))
-    {
-        if (0 != iter.count)
-        {
-            double dev = (hdr_median_equivalent_value(h, iter.value) * 1.0) - mean;
-            geometric_dev_total += (dev * dev) * iter.count;
-        }
-    }
-
-    return sqrt(geometric_dev_total / h->total_count);
-}
-
-bool hdr_values_are_equivalent(const struct hdr_histogram* h, int64_t a, int64_t b)
-{
-    return lowest_equivalent_value(h, a) == lowest_equivalent_value(h, b);
-}
-
-int64_t hdr_lowest_equivalent_value(const struct hdr_histogram* h, int64_t value)
-{
-    return lowest_equivalent_value(h, value);
-}
-
-int64_t hdr_count_at_value(const struct hdr_histogram* h, int64_t value)
-{
-    return counts_get_normalised(h, counts_index_for(h, value));
-}
-
-int64_t hdr_count_at_index(const struct hdr_histogram* h, int32_t index)
-{
-    return counts_get_normalised(h, index);
-}
-
-
-// #### ######## ######## ########     ###    ########  #######  ########   ######
-//  ##     ##    ##       ##     ##   ## ##      ##    ##     ## ##     ## ##    ##
-//  ##     ##    ##       ##     ##  ##   ##     ##    ##     ## ##     ## ##
-//  ##     ##    ######   ########  ##     ##    ##    ##     ## ########   ######
-//  ##     ##    ##       ##   ##   #########    ##    ##     ## ##   ##         ##
-//  ##     ##    ##       ##    ##  ##     ##    ##    ##     ## ##    ##  ##    ##
-// ####    ##    ######## ##     ## ##     ##    ##     #######  ##     ##  ######
-
-
-static bool has_buckets(struct hdr_iter* iter)
-{
-    return iter->counts_index < iter->h->counts_len;
-}
-
-static bool has_next(struct hdr_iter* iter)
-{
-    return iter->cumulative_count < iter->total_count;
-}
-
-static bool move_next(struct hdr_iter* iter)
-{
-    iter->counts_index++;
-
-    if (!has_buckets(iter))
-    {
-        return false;
-    }
-
-    iter->count = counts_get_normalised(iter->h, iter->counts_index);
-    iter->cumulative_count += iter->count;
-
-    iter->value = hdr_value_at_index(iter->h, iter->counts_index);
-    iter->highest_equivalent_value = highest_equivalent_value(iter->h, iter->value);
-    iter->lowest_equivalent_value = lowest_equivalent_value(iter->h, iter->value);
-    iter->median_equivalent_value = hdr_median_equivalent_value(iter->h, iter->value);
-
-    return true;
-}
-
-static int64_t peek_next_value_from_index(struct hdr_iter* iter)
-{
-    return hdr_value_at_index(iter->h, iter->counts_index + 1);
-}
-
-static bool next_value_greater_than_reporting_level_upper_bound(
-    struct hdr_iter *iter, int64_t reporting_level_upper_bound)
-{
-    if (iter->counts_index >= iter->h->counts_len)
-    {
-        return false;
-    }
-
-    return peek_next_value_from_index(iter) > reporting_level_upper_bound;
-}
-
-static bool _basic_iter_next(struct hdr_iter *iter)
-{
-    if (!has_next(iter) || iter->counts_index >= iter->h->counts_len)
-    {
-        return false;
-    }
-
-    move_next(iter);
-
-    return true;
-}
-
-static void _update_iterated_values(struct hdr_iter* iter, int64_t new_value_iterated_to)
-{
-    iter->value_iterated_from = iter->value_iterated_to;
-    iter->value_iterated_to = new_value_iterated_to;
-}
-
-static bool _all_values_iter_next(struct hdr_iter* iter)
-{
-    bool result = move_next(iter);
-
-    if (result)
-    {
-        _update_iterated_values(iter, iter->value);
-    }
-
-    return result;
-}
-
-void hdr_iter_init(struct hdr_iter* iter, const struct hdr_histogram* h)
-{
-    iter->h = h;
-
-    iter->counts_index = -1;
-    iter->total_count = h->total_count;
-    iter->count = 0;
-    iter->cumulative_count = 0;
-    iter->value = 0;
-    iter->highest_equivalent_value = 0;
-    iter->value_iterated_from = 0;
-    iter->value_iterated_to = 0;
-
-    iter->_next_fp = _all_values_iter_next;
-}
-
-bool hdr_iter_next(struct hdr_iter* iter)
-{
-    return iter->_next_fp(iter);
-}
-
-// ########  ######## ########   ######  ######## ##    ## ######## #### ##       ########  ######
-// ##     ## ##       ##     ## ##    ## ##       ###   ##    ##     ##  ##       ##       ##    ##
-// ##     ## ##       ##     ## ##       ##       ####  ##    ##     ##  ##       ##       ##
-// ########  ######   ########  ##       ######   ## ## ##    ##     ##  ##       ######    ######
-// ##        ##       ##   ##   ##       ##       ##  ####    ##     ##  ##       ##             ##
-// ##        ##       ##    ##  ##    ## ##       ##   ###    ##     ##  ##       ##       ##    ##
-// ##        ######## ##     ##  ######  ######## ##    ##    ##    #### ######## ########  ######
-
-static bool _percentile_iter_next(struct hdr_iter* iter)
-{
-    struct hdr_iter_percentiles* percentiles = &iter->specifics.percentiles;
-
-    if (!has_next(iter))
-    {
-        if (percentiles->seen_last_value)
-        {
-            return false;
-        }
-
-        percentiles->seen_last_value = true;
-        percentiles->percentile = 100.0;
-
-        return true;
-    }
-
-    if (iter->counts_index == -1 && !_basic_iter_next(iter))
-    {
-        return false;
-    }
-
-    do
-    {
-        double current_percentile = (100.0 * (double) iter->cumulative_count) / iter->h->total_count;
-        if (iter->count != 0 &&
-                percentiles->percentile_to_iterate_to <= current_percentile)
-        {
-            _update_iterated_values(iter, highest_equivalent_value(iter->h, iter->value));
-
-            percentiles->percentile = percentiles->percentile_to_iterate_to;
-            int64_t temp = (int64_t)(log(100 / (100.0 - (percentiles->percentile_to_iterate_to))) / log(2)) + 1;
-            int64_t half_distance = (int64_t) pow(2, (double) temp);
-            int64_t percentile_reporting_ticks = percentiles->ticks_per_half_distance * half_distance;
-            percentiles->percentile_to_iterate_to += 100.0 / percentile_reporting_ticks;
-
-            return true;
-        }
-    }
-    while (_basic_iter_next(iter));
-
-    return true;
-}
-
-void hdr_iter_percentile_init(struct hdr_iter* iter, const struct hdr_histogram* h, int32_t ticks_per_half_distance)
-{
-    iter->h = h;
-
-    hdr_iter_init(iter, h);
-
-    iter->specifics.percentiles.seen_last_value          = false;
-    iter->specifics.percentiles.ticks_per_half_distance  = ticks_per_half_distance;
-    iter->specifics.percentiles.percentile_to_iterate_to = 0.0;
-    iter->specifics.percentiles.percentile               = 0.0;
-
-    iter->_next_fp = _percentile_iter_next;
-}
-
-static void format_line_string(char* str, size_t len, int significant_figures, format_type format)
-{
-#if defined(_MSC_VER)
-#define snprintf _snprintf
-#pragma warning(push)
-#pragma warning(disable: 4996)
-#endif
-    const char* format_str = "%s%d%s";
-
-    switch (format)
-    {
-        case CSV:
-            snprintf(str, len, format_str, "%.", significant_figures, "f,%f,%d,%.2f\n");
-            break;
-        case CLASSIC:
-            snprintf(str, len, format_str, "%12.", significant_figures, "f %12f %12d %12.2f\n");
-            break;
-        default:
-            snprintf(str, len, format_str, "%12.", significant_figures, "f %12f %12d %12.2f\n");
-    }
-#if defined(_MSC_VER)
-#undef snprintf
-#pragma warning(pop)
-#endif
-}
-
-
-// ########  ########  ######   #######  ########  ########  ######## ########
-// ##     ## ##       ##    ## ##     ## ##     ## ##     ## ##       ##     ##
-// ##     ## ##       ##       ##     ## ##     ## ##     ## ##       ##     ##
-// ########  ######   ##       ##     ## ########  ##     ## ######   ##     ##
-// ##   ##   ##       ##       ##     ## ##   ##   ##     ## ##       ##     ##
-// ##    ##  ##       ##    ## ##     ## ##    ##  ##     ## ##       ##     ##
-// ##     ## ########  ######   #######  ##     ## ########  ######## ########
-
-
-static bool _recorded_iter_next(struct hdr_iter* iter)
-{
-    while (_basic_iter_next(iter))
-    {
-        if (iter->count != 0)
-        {
-            _update_iterated_values(iter, iter->value);
-
-            iter->specifics.recorded.count_added_in_this_iteration_step = iter->count;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void hdr_iter_recorded_init(struct hdr_iter* iter, const struct hdr_histogram* h)
-{
-    hdr_iter_init(iter, h);
-
-    iter->specifics.recorded.count_added_in_this_iteration_step = 0;
-
-    iter->_next_fp = _recorded_iter_next;
-}
-
-// ##       #### ##    ## ########    ###    ########
-// ##        ##  ###   ## ##         ## ##   ##     ##
-// ##        ##  ####  ## ##        ##   ##  ##     ##
-// ##        ##  ## ## ## ######   ##     ## ########
-// ##        ##  ##  #### ##       ######### ##   ##
-// ##        ##  ##   ### ##       ##     ## ##    ##
-// ######## #### ##    ## ######## ##     ## ##     ##
-
-
-static bool _iter_linear_next(struct hdr_iter* iter)
-{
-    struct hdr_iter_linear* linear = &iter->specifics.linear;
-
-    linear->count_added_in_this_iteration_step = 0;
-
-    if (has_next(iter) ||
-        next_value_greater_than_reporting_level_upper_bound(
-            iter, linear->next_value_reporting_level_lowest_equivalent))
-    {
-        do
-        {
-            if (iter->value >= linear->next_value_reporting_level_lowest_equivalent)
-            {
-                _update_iterated_values(iter, linear->next_value_reporting_level);
-
-                linear->next_value_reporting_level += linear->value_units_per_bucket;
-                linear->next_value_reporting_level_lowest_equivalent =
-                    lowest_equivalent_value(iter->h, linear->next_value_reporting_level);
-
-                return true;
-            }
-
-            if (!move_next(iter))
-            {
-                return true;
-            }
-
-            linear->count_added_in_this_iteration_step += iter->count;
-        }
-        while (true);
-    }
-
-    return false;
-}
-
-
-void hdr_iter_linear_init(struct hdr_iter* iter, const struct hdr_histogram* h, int64_t value_units_per_bucket)
-{
-    hdr_iter_init(iter, h);
-
-    iter->specifics.linear.count_added_in_this_iteration_step = 0;
-    iter->specifics.linear.value_units_per_bucket = value_units_per_bucket;
-    iter->specifics.linear.next_value_reporting_level = value_units_per_bucket;
-    iter->specifics.linear.next_value_reporting_level_lowest_equivalent = lowest_equivalent_value(h, value_units_per_bucket);
-
-    iter->_next_fp = _iter_linear_next;
-}
-
-// ##        #######   ######      ###    ########  #### ######## ##     ## ##     ## ####  ######
-// ##       ##     ## ##    ##    ## ##   ##     ##  ##     ##    ##     ## ###   ###  ##  ##    ##
-// ##       ##     ## ##         ##   ##  ##     ##  ##     ##    ##     ## #### ####  ##  ##
-// ##       ##     ## ##   #### ##     ## ########   ##     ##    ######### ## ### ##  ##  ##
-// ##       ##     ## ##    ##  ######### ##   ##    ##     ##    ##     ## ##     ##  ##  ##
-// ##       ##     ## ##    ##  ##     ## ##    ##   ##     ##    ##     ## ##     ##  ##  ##    ##
-// ########  #######   ######   ##     ## ##     ## ####    ##    ##     ## ##     ## ####  ######
-
-static bool _log_iter_next(struct hdr_iter *iter)
-{
-    struct hdr_iter_log* logarithmic = &iter->specifics.log;
-
-    logarithmic->count_added_in_this_iteration_step = 0;
-
-    if (has_next(iter) ||
-        next_value_greater_than_reporting_level_upper_bound(
-            iter, logarithmic->next_value_reporting_level_lowest_equivalent))
-    {
-        do
-        {
-            if (iter->value >= logarithmic->next_value_reporting_level_lowest_equivalent)
-            {
-                _update_iterated_values(iter, logarithmic->next_value_reporting_level);
-
-                logarithmic->next_value_reporting_level *= (int64_t)logarithmic->log_base;
-                logarithmic->next_value_reporting_level_lowest_equivalent = lowest_equivalent_value(iter->h, logarithmic->next_value_reporting_level);
-
-                return true;
-            }
-
-            if (!move_next(iter))
-            {
-                return true;
-            }
-
-            logarithmic->count_added_in_this_iteration_step += iter->count;
-        }
-        while (true);
-    }
-
-    return false;
-}
-
-void hdr_iter_log_init(
-        struct hdr_iter* iter,
-        const struct hdr_histogram* h,
-        int64_t value_units_first_bucket,
-        double log_base)
-{
-    hdr_iter_init(iter, h);
-    iter->specifics.log.count_added_in_this_iteration_step = 0;
-    iter->specifics.log.log_base = log_base;
-    iter->specifics.log.next_value_reporting_level = value_units_first_bucket;
-    iter->specifics.log.next_value_reporting_level_lowest_equivalent = lowest_equivalent_value(h, value_units_first_bucket);
-
-    iter->_next_fp = _log_iter_next;
-}
-
-// Printing.
-
-static const char* format_head_string(format_type format)
-{
-    switch (format)
-    {
-        case CSV:
-            return "%s,%s,%s,%s\n";
-        case CLASSIC:
-            return "%12s %12s %12s %12s\n\n";
-        default:
-            return "%12s %12s %12s %12s\n\n";
-    }
-}
-
-static const char CLASSIC_FOOTER[] =
-    "#[Mean    = %12.3f, StdDeviation   = %12.3f]\n"
-    "#[Max     = %12.3f, Total count    = %12" PRIu64 "]\n"
-    "#[Buckets = %12d, SubBuckets     = %12d]\n";
-
-int hdr_percentiles_print(
-        struct hdr_histogram* h, FILE* stream, int32_t ticks_per_half_distance,
-        double value_scale, format_type format)
-{
-    char line_format[25];
-    format_line_string(line_format, 25, h->significant_figures, format);
-    const char* head_format = format_head_string(format);
-    int rc = 0;
-
-    struct hdr_iter iter;
-    hdr_iter_percentile_init(&iter, h, ticks_per_half_distance);
-
-    if (fprintf(
-            stream, head_format,
-            "Value", "Percentile", "TotalCount", "1/(1-Percentile)") < 0)
-    {
-        rc = EIO;
-        goto cleanup;
-    }
-
-    struct hdr_iter_percentiles * percentiles = &iter.specifics.percentiles;
-    while (hdr_iter_next(&iter))
-    {
-        double  value               = iter.highest_equivalent_value / value_scale;
-        double  percentile          = percentiles->percentile / 100.0;
-        int64_t total_count         = iter.cumulative_count;
-        double  inverted_percentile = (1.0 / (1.0 - percentile));
-
-        if (fprintf(
-                stream, line_format, value, percentile, total_count, inverted_percentile) < 0)
-        {
-            rc = EIO;
-            goto cleanup;
-        }
-    }
-
-    if (CLASSIC == format)
-    {
-        double mean   = hdr_mean(h)   / value_scale;
-        double stddev = hdr_stddev(h) / value_scale;
-        double max    = hdr_max(h)    / value_scale;
-
-        if (fprintf(
-                stream, CLASSIC_FOOTER,  mean, stddev, max,
-                h->total_count, h->bucket_count, h->sub_bucket_count) < 0)
-        {
-            rc = EIO;
-            goto cleanup;
-        }
-    }
-
-    cleanup:
-    return rc;
-}
diff --git a/debian/modules/nchan/src/util/hdr_histogram.h b/debian/modules/nchan/src/util/hdr_histogram.h
deleted file mode 100644
index 010a4b8..0000000
--- a/debian/modules/nchan/src/util/hdr_histogram.h
+++ /dev/null
@@ -1,427 +0,0 @@
-/**
- * hdr_histogram.h
- * Written by Michael Barker and released to the public domain,
- * as explained at http://creativecommons.org/publicdomain/zero/1.0/
- *
- * The source for the hdr_histogram utilises a few C99 constructs, specifically
- * the use of stdint/stdbool and inline variable declaration.
- */
-
-#ifndef HDR_HISTOGRAM_H
-#define HDR_HISTOGRAM_H 1
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdio.h>
-
-struct hdr_histogram
-{
-    int64_t lowest_trackable_value;
-    int64_t highest_trackable_value;
-    int32_t unit_magnitude;
-    int32_t significant_figures;
-    int32_t sub_bucket_half_count_magnitude;
-    int32_t sub_bucket_half_count;
-    int64_t sub_bucket_mask;
-    int32_t sub_bucket_count;
-    int32_t bucket_count;
-    int64_t min_value;
-    int64_t max_value;
-    int32_t normalizing_index_offset;
-    double conversion_ratio;
-    int32_t counts_len;
-    int64_t total_count;
-    int64_t* counts;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Allocate the memory and initialise the hdr_histogram.
- *
- * Due to the size of the histogram being the result of some reasonably
- * involved math on the input parameters this function it is tricky to stack allocate.
- * The histogram is allocated in a single contigious block so can be delete via free,
- * without any structure specific destructor.
- *
- * @param lowest_trackable_value The smallest possible value to be put into the
- * histogram.
- * @param highest_trackable_value The largest possible value to be put into the
- * histogram.
- * @param significant_figures The level of precision for this histogram, i.e. the number
- * of figures in a decimal number that will be maintained.  E.g. a value of 3 will mean
- * the results from the histogram will be accurate up to the first three digits.  Must
- * be a value between 1 and 5 (inclusive).
- * @param result Output parameter to capture allocated histogram.
- * @return 0 on success, EINVAL if lowest_trackable_value is < 1 or the
- * significant_figure value is outside of the allowed range, ENOMEM if malloc
- * failed.
- */
-int hdr_init_nchan_shm(
-    int64_t lowest_trackable_value,
-    int64_t highest_trackable_value,
-    int significant_figures,
-    struct hdr_histogram** result);
-
-/**
- * Free the memory and close the hdr_histogram.
- *
- * @param h The histogram you want to close.
- */
-void hdr_close_nchan_shm(struct hdr_histogram* h);
-
-
-/**
- * Reset a histogram to zero - empty out a histogram and re-initialise it
- *
- * If you want to re-use an existing histogram, but reset everything back to zero, this
- * is the routine to use.
- *
- * @param h The histogram you want to reset to empty.
- *
- */
-void hdr_reset(struct hdr_histogram* h);
-
-/**
- * Get the memory size of the hdr_histogram.
- *
- * @param h "This" pointer
- * @return The amount of memory used by the hdr_histogram in bytes
- */
-size_t hdr_get_memory_size(struct hdr_histogram* h);
-
-/**
- * Records a value in the histogram, will round this value of to a precision at or better
- * than the significant_figure specified at construction time.
- *
- * @param h "This" pointer
- * @param value Value to add to the histogram
- * @return false if the value is larger than the highest_trackable_value and can't be recorded,
- * true otherwise.
- */
-bool hdr_record_value(struct hdr_histogram* h, int64_t value);
-
-/**
- * Records count values in the histogram, will round this value of to a
- * precision at or better than the significant_figure specified at construction
- * time.
- *
- * @param h "This" pointer
- * @param value Value to add to the histogram
- * @param count Number of 'value's to add to the histogram
- * @return false if any value is larger than the highest_trackable_value and can't be recorded,
- * true otherwise.
- */
-bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count);
-
-
-/**
- * Record a value in the histogram and backfill based on an expected interval.
- *
- * Records a value in the histogram, will round this value of to a precision at or better
- * than the significant_figure specified at contruction time.  This is specifically used
- * for recording latency.  If the value is larger than the expected_interval then the
- * latency recording system has experienced co-ordinated omission.  This method fills in the
- * values that would have occured had the client providing the load not been blocked.
-
- * @param h "This" pointer
- * @param value Value to add to the histogram
- * @param expected_interval The delay between recording values.
- * @return false if the value is larger than the highest_trackable_value and can't be recorded,
- * true otherwise.
- */
-bool hdr_record_corrected_value(struct hdr_histogram* h, int64_t value, int64_t expexcted_interval);
-/**
- * Record a value in the histogram 'count' times.  Applies the same correcting logic
- * as 'hdr_record_corrected_value'.
- *
- * @param h "This" pointer
- * @param value Value to add to the histogram
- * @param count Number of 'value's to add to the histogram
- * @param expected_interval The delay between recording values.
- * @return false if the value is larger than the highest_trackable_value and can't be recorded,
- * true otherwise.
- */
-bool hdr_record_corrected_values(struct hdr_histogram* h, int64_t value, int64_t count, int64_t expected_interval);
-
-/**
- * Adds all of the values from 'from' to 'this' histogram.  Will return the
- * number of values that are dropped when copying.  Values will be dropped
- * if they around outside of h.lowest_trackable_value and
- * h.highest_trackable_value.
- *
- * @param h "This" pointer
- * @param from Histogram to copy values from.
- * @return The number of values dropped when copying.
- */
-int64_t hdr_add(struct hdr_histogram* h, const struct hdr_histogram* from);
-
-/**
- * Adds all of the values from 'from' to 'this' histogram.  Will return the
- * number of values that are dropped when copying.  Values will be dropped
- * if they around outside of h.lowest_trackable_value and
- * h.highest_trackable_value.
- *
- * @param h "This" pointer
- * @param from Histogram to copy values from.
- * @return The number of values dropped when copying.
- */
-int64_t hdr_add_while_correcting_for_coordinated_omission(
-    struct hdr_histogram* h, struct hdr_histogram* from, int64_t expected_interval);
-
-/**
- * Get minimum value from the histogram.  Will return 2^63-1 if the histogram
- * is empty.
- *
- * @param h "This" pointer
- */
-int64_t hdr_min(const struct hdr_histogram* h);
-
-/**
- * Get maximum value from the histogram.  Will return 0 if the histogram
- * is empty.
- *
- * @param h "This" pointer
- */
-int64_t hdr_max(const struct hdr_histogram* h);
-
-/**
- * Get the value at a specific percentile.
- *
- * @param h "This" pointer.
- * @param percentile The percentile to get the value for
- */
-int64_t hdr_value_at_percentile(const struct hdr_histogram* h, double percentile);
-
-/**
- * Gets the standard deviation for the values in the histogram.
- *
- * @param h "This" pointer
- * @return The standard deviation
- */
-double hdr_stddev(const struct hdr_histogram* h);
-
-/**
- * Gets the mean for the values in the histogram.
- *
- * @param h "This" pointer
- * @return The mean
- */
-double hdr_mean(const struct hdr_histogram* h);
-
-/**
- * Determine if two values are equivalent with the histogram's resolution.
- * Where "equivalent" means that value samples recorded for any two
- * equivalent values are counted in a common total count.
- *
- * @param h "This" pointer
- * @param a first value to compare
- * @param b second value to compare
- * @return 'true' if values are equivalent with the histogram's resolution.
- */
-bool hdr_values_are_equivalent(const struct hdr_histogram* h, int64_t a, int64_t b);
-
-/**
- * Get the lowest value that is equivalent to the given value within the histogram's resolution.
- * Where "equivalent" means that value samples recorded for any two
- * equivalent values are counted in a common total count.
- *
- * @param h "This" pointer
- * @param value The given value
- * @return The lowest value that is equivalent to the given value within the histogram's resolution.
- */
-int64_t hdr_lowest_equivalent_value(const struct hdr_histogram* h, int64_t value);
-
-/**
- * Get the count of recorded values at a specific value
- * (to within the histogram resolution at the value level).
- *
- * @param h "This" pointer
- * @param value The value for which to provide the recorded count
- * @return The total count of values recorded in the histogram within the value range that is
- * {@literal >=} lowestEquivalentValue(<i>value</i>) and {@literal <=} highestEquivalentValue(<i>value</i>)
- */
-int64_t hdr_count_at_value(const struct hdr_histogram* h, int64_t value);
-
-int64_t hdr_count_at_index(const struct hdr_histogram* h, int32_t index);
-
-int64_t hdr_value_at_index(const struct hdr_histogram* h, int32_t index);
-
-struct hdr_iter_percentiles
-{
-    bool seen_last_value;
-    int32_t ticks_per_half_distance;
-    double percentile_to_iterate_to;
-    double percentile;
-};
-
-struct hdr_iter_recorded
-{
-    int64_t count_added_in_this_iteration_step;
-};
-
-struct hdr_iter_linear
-{
-    int64_t value_units_per_bucket;
-    int64_t count_added_in_this_iteration_step;
-    int64_t next_value_reporting_level;
-    int64_t next_value_reporting_level_lowest_equivalent;
-};
-
-struct hdr_iter_log
-{
-    double log_base;
-    int64_t count_added_in_this_iteration_step;
-    int64_t next_value_reporting_level;
-    int64_t next_value_reporting_level_lowest_equivalent;
-};
-
-/**
- * The basic iterator.  This is a generic structure
- * that supports all of the types of iteration.  Use
- * the appropriate initialiser to get the desired
- * iteration.
- *
- * @
- */
-struct hdr_iter
-{
-    const struct hdr_histogram* h;
-    /** raw index into the counts array */
-    int32_t counts_index;
-    /** snapshot of the length at the time the iterator is created */
-    int32_t total_count;
-    /** value directly from array for the current counts_index */
-    int64_t count;
-    /** sum of all of the counts up to and including the count at this index */
-    int64_t cumulative_count;
-    /** The current value based on counts_index */
-    int64_t value;
-    int64_t highest_equivalent_value;
-    int64_t lowest_equivalent_value;
-    int64_t median_equivalent_value;
-    int64_t value_iterated_from;
-    int64_t value_iterated_to;
-
-    union
-    {
-        struct hdr_iter_percentiles percentiles;
-        struct hdr_iter_recorded recorded;
-        struct hdr_iter_linear linear;
-        struct hdr_iter_log log;
-    } specifics;
-
-    bool (* _next_fp)(struct hdr_iter* iter);
-
-};
-
-/**
- * Initalises the basic iterator.
- *
- * @param itr 'This' pointer
- * @param h The histogram to iterate over
- */
-void hdr_iter_init(struct hdr_iter* iter, const struct hdr_histogram* h);
-
-/**
- * Initialise the iterator for use with percentiles.
- */
-void hdr_iter_percentile_init(struct hdr_iter* iter, const struct hdr_histogram* h, int32_t ticks_per_half_distance);
-
-/**
- * Initialise the iterator for use with recorded values.
- */
-void hdr_iter_recorded_init(struct hdr_iter* iter, const struct hdr_histogram* h);
-
-/**
- * Initialise the iterator for use with linear values.
- */
-void hdr_iter_linear_init(
-    struct hdr_iter* iter,
-    const struct hdr_histogram* h,
-    int64_t value_units_per_bucket);
-
-/**
- * Initialise the iterator for use with logarithmic values
- */
-void hdr_iter_log_init(
-    struct hdr_iter* iter,
-    const struct hdr_histogram* h,
-    int64_t value_units_first_bucket,
-    double log_base);
-
-/**
- * Iterate to the next value for the iterator.  If there are no more values
- * available return faluse.
- *
- * @param itr 'This' pointer
- * @return 'false' if there are no values remaining for this iterator.
- */
-bool hdr_iter_next(struct hdr_iter* iter);
-
-typedef enum
-{
-    CLASSIC,
-    CSV
-} format_type;
-
-/**
- * Print out a percentile based histogram to the supplied stream.  Note that
- * this call will not flush the FILE, this is left up to the user.
- *
- * @param h 'This' pointer
- * @param stream The FILE to write the output to
- * @param ticks_per_half_distance The number of iteration steps per half-distance to 100%
- * @param value_scale Scale the output values by this amount
- * @param format_type Format to use, e.g. CSV.
- * @return 0 on success, error code on failure.  EIO if an error occurs writing
- * the output.
- */
-int hdr_percentiles_print(
-    struct hdr_histogram* h, FILE* stream, int32_t ticks_per_half_distance,
-    double value_scale, format_type format);
-
-/**
-* Internal allocation methods, used by hdr_dbl_histogram.
-*/
-struct hdr_histogram_bucket_config
-{
-    int64_t lowest_trackable_value;
-    int64_t highest_trackable_value;
-    int64_t unit_magnitude;
-    int64_t significant_figures;
-    int32_t sub_bucket_half_count_magnitude;
-    int32_t sub_bucket_half_count;
-    int64_t sub_bucket_mask;
-    int32_t sub_bucket_count;
-    int32_t bucket_count;
-    int32_t counts_len;
-};
-
-int hdr_calculate_bucket_config(
-    int64_t lowest_trackable_value,
-    int64_t highest_trackable_value,
-    int significant_figures,
-    struct hdr_histogram_bucket_config* cfg);
-
-void hdr_init_preallocated(struct hdr_histogram* h, struct hdr_histogram_bucket_config* cfg);
-
-int64_t hdr_size_of_equivalent_value_range(const struct hdr_histogram* h, int64_t value);
-
-int64_t hdr_next_non_equivalent_value(const struct hdr_histogram* h, int64_t value);
-
-int64_t hdr_median_equivalent_value(const struct hdr_histogram* h, int64_t value);
-
-/**
- * Used to reset counters after importing data manuallying into the histogram, used by the logging code
- * and other custom serialisation tools.
- */
-void hdr_reset_internal_counters(struct hdr_histogram* h);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/debian/modules/nchan/src/util/nchan_benchmark.c b/debian/modules/nchan/src/util/nchan_benchmark.c
deleted file mode 100644
index 767f8c7..0000000
--- a/debian/modules/nchan/src/util/nchan_benchmark.c
+++ /dev/null
@@ -1,804 +0,0 @@
-#include "nchan_benchmark.h"
-#include <subscribers/benchmark.h>
-#include <subscribers/websocket.h>
-#include <util/shmem.h>
-#include <store/memory/store.h>
-#include <store/memory/ipc-handlers.h>
-#include <assert.h>
-#include <sys/time.h> /* for struct timeval */
-#include <inttypes.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "BENCHMARK: " fmt, ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "BENCHMARK: " fmt, ##args)
-
-nchan_benchmark_t    bench;
-
-ngx_atomic_int_t    *worker_counter = NULL;
-ngx_int_t            bench_worker_number = 0;
-
-int nchan_benchmark_active(void) {
-  return bench.state && *bench.state > NCHAN_BENCHMARK_INACTIVE;
-}
-
-static ngx_int_t benchmark_client_respond(char *cstr) {
-  if(!bench.client) {
-    return NGX_ERROR;
-  }
-  nchan_msg_t    msg;
-  nchan_msg_id_t msgid = NCHAN_NEWEST_MSGID;
-  ngx_memzero(&msg, sizeof(msg));
-  msg.storage = NCHAN_MSG_STACK;
-  msg.id = msgid;
-  ngx_init_set_membuf(&msg.buf, (u_char *)cstr, (u_char *)&cstr[strlen(cstr)]);
-  msg.buf.last_buf = 1;
-  msg.buf.last_in_chain = 1;
-  bench.client->fn->respond_message(bench.client, &msg);
-  return NGX_OK;
-}
-
-ngx_int_t nchan_benchmark_init_module(ngx_cycle_t *cycle) {
-  bench.state = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_int_t), "benchmark state");
-  worker_counter = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_int_t), "benchmark worker counter");
-  bench.config = shm_calloc(nchan_store_memory_shmem, sizeof(*bench.config), "benchmark config (shared)");
-  
-  return NGX_OK;
-}
-
-ngx_int_t nchan_benchmark_init_worker(ngx_cycle_t *cycle) {
-  DBG("init worker");
-  bench_worker_number = ngx_atomic_fetch_add((ngx_atomic_uint_t *)worker_counter, 1);
-  return NGX_OK;
-}
-
-ngx_int_t nchan_benchmark_exit_master(ngx_cycle_t *cycle) {
-  shm_free(nchan_store_memory_shmem, bench.state);
-  shm_free(nchan_store_memory_shmem, worker_counter);
-  shm_free(nchan_store_memory_shmem, bench.config);
-  bench.state = NULL;
-  bench.config = NULL;
-  worker_counter = NULL;
-  return NGX_OK;
-}
-
-static ngx_int_t benchmark_publish_callback(ngx_int_t status, void *data, void *pd) {
-  struct      timeval tv;
-  uint64_t    t1;
-  uintptr_t   t0 = (uintptr_t )pd;
-  if(nchan_benchmark_active()) {
-    ngx_gettimeofday(&tv);
-    t1 = (tv.tv_sec - bench.time.init) * (uint64_t)1000000 + tv.tv_usec;
-    switch(status) {
-      case NCHAN_MESSAGE_QUEUED:
-      case NCHAN_MESSAGE_RECEIVED:
-        bench.data.msg_send_confirmed++;
-        break;
-      default:
-        bench.data.msg_send_failed++;
-    }
-    hdr_record_value(bench.data.msg_publishing_latency, t1-t0);
-  }
-  return NGX_OK;
-}
-
-static void benchmark_publish_message(nchan_benchmark_channel_t *chan) {
-  struct      timeval tv;
-  uint64_t    now;
-  u_char     *last;
-  uint64_t    msgnum;
-  nchan_msg_t msg;
-  ngx_str_t   channel_id;
-  
-  nchan_benchmark_channel_id(chan->n, &channel_id);
-  
-  msgnum = ngx_atomic_fetch_add(&chan->msg_count, 1);
-  
-  ngx_gettimeofday(&tv);
-  now = (tv.tv_sec - bench.time.init) * (uint64_t)1000000 + tv.tv_usec;
-  
-  last = ngx_snprintf(bench.msgbuf, 64, "%D %D zzzzzzzz", now, msgnum);
-  
-  //DBG("publish to channel %V msg #%D (t: %D)", &channel_id, msgnum, now);
-  
-  ngx_memzero(&msg, sizeof(msg));
-  msg.buf.temporary = 1;
-  msg.buf.memory = 1;
-  msg.buf.last_buf = 1;
-  msg.buf.pos = msg.buf.start = bench.msgbuf;
-  msg.buf.last = msg.buf.end = &last[bench.config->msg_padding];
-  msg.id.time = 0;
-  msg.id.tag.fixed[0] = 0;
-  msg.id.tagactive = 0;
-  msg.id.tagcount = 1;
-  msg.storage = NCHAN_MSG_STACK;
-  
-  msg.content_type = (ngx_str_t *)&NCHAN_CONTENT_TYPE_TEXT_PLAIN;
-  
-  bench.loc_conf->storage_engine->publish(&channel_id, &msg, bench.loc_conf, (callback_pt )benchmark_publish_callback, (void *)(uintptr_t)now);
-  bench.data.msg_sent++;
-}
-
-static ngx_int_t benchmark_publish_message_interval_timer(void *pd) {  
-  nchan_benchmark_channel_t *chan = pd;
-  if(!nchan_benchmark_active()) {
-    DBG("benchmark not running. stop trying to publish");
-    bench.timer.publishers[chan->n] = NULL;
-    return NGX_ABORT; //we're done here
-  }
-  
-  benchmark_publish_message(chan);
-  
-  return bench.base_msg_period;
-}
-
-static void benchmark_timer_running_stop(void *pd);
-static void benchmark_timer_finishing_check(void *pd);
-
-ngx_int_t nchan_benchmark_initialize(void) {
-  int           c, i;
-  subscriber_t **sub;
-  ngx_str_t     channel_id;
-  ngx_int_t     subs_per_channel;
-      
-  assert(bench.subs.array == NULL);
-  assert(bench.subs.n == 0);
-  
-  if(bench.config->subscriber_distribution == NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM) {
-    ngx_int_t divided_subs = bench.config->subscribers_per_channel / nchan_worker_processes;
-    ngx_int_t leftover_subs = bench.config->subscribers_per_channel % nchan_worker_processes;
-    for(c=0; c<bench.config->channels; c++) {
-      bench.subs.n += divided_subs;
-      if (c%nchan_worker_processes == bench_worker_number) {
-        bench.subs.n += leftover_subs;
-      }
-    }
-    DBG("bench.subs.n = %d", bench.subs.n);
-    bench.subs.array = ngx_alloc(sizeof(subscriber_t *) * bench.subs.n, ngx_cycle->log);
-    sub = &bench.subs.array[0];
-    
-    for(c=0; c<bench.config->channels; c++) {
-      subs_per_channel = divided_subs + (((c % nchan_worker_processes) == bench_worker_number) ? leftover_subs : 0);
-      //DBG("worker number %d channel %d subs %d", bench_worker_number, c, subs_per_channel);
-      nchan_benchmark_channel_id(c, &channel_id);
-      for(i=0; i<subs_per_channel; i++) {
-        *sub = benchmark_subscriber_create(&bench);
-        if((*sub)->fn->subscribe(*sub, &channel_id) != NGX_OK) {
-          return NGX_ERROR;
-        }
-        sub++;
-      }
-    }
-  }
-  else {
-    subs_per_channel = bench.config->subscribers_per_channel;
-    for(c=0; c<bench.config->channels; c++) {
-      nchan_benchmark_channel_id(c, &channel_id);
-      if(memstore_channel_owner(&channel_id) == ngx_process_slot) {
-        bench.subs.n += subs_per_channel;
-      }
-    }
-    bench.subs.array = ngx_alloc(sizeof(subscriber_t *) * bench.subs.n, ngx_cycle->log);
-    sub = &bench.subs.array[0];
-    
-    for(c=0; c<bench.config->channels; c++) {
-      nchan_benchmark_channel_id(c, &channel_id);
-      if(memstore_channel_owner(&channel_id) == ngx_process_slot) {
-        for(i=0; i<subs_per_channel; i++) {
-          *sub = benchmark_subscriber_create(&bench);
-          if((*sub)->fn->subscribe(*sub, &channel_id) != NGX_OK) {
-            return NGX_ERROR;
-          }
-          sub++;
-        }
-      }
-    }
-  }
-  
-  return NGX_OK;
-}
-
-ngx_int_t nchan_benchmark_run(void) {
-  uint64_t required_subs = bench.config->subscribers_per_channel * bench.config->channels;
-  assert(*bench.shared.subscribers_enqueued == required_subs);
-  int       i;
-  size_t msgbuf_maxlen = bench.config->msg_padding + 64;
-  unsigned pubstart;
-  int64_t total_offset = 0;
-  bench.msgbuf = ngx_alloc(msgbuf_maxlen, ngx_cycle->log);
-  ngx_memset(bench.msgbuf, 'z', msgbuf_maxlen);
-  
-  bench.base_msg_period = 1000.0/((double)bench.config->msgs_per_minute / 60.0);
-  assert(bench.timer.publishers == NULL);
-  bench.timer.publishers = ngx_alloc(sizeof(void *) * bench.config->channels, ngx_cycle->log);
-  if(bench.config->publisher_distribution == NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM) {
-    bench.base_msg_period *= nchan_worker_processes;
-    for(i=0; i < bench.config->channels; i++) {
-      pubstart = (rand() / (RAND_MAX / bench.base_msg_period));
-      total_offset += pubstart;
-      bench.timer.publishers[i] = nchan_add_interval_timer(benchmark_publish_message_interval_timer, &bench.shared.channels[i], pubstart);
-    }
-  }
-  else if(bench.config->publisher_distribution == NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_OPTIMAL) {
-    ngx_str_t channel_id;
-    for(i=0; i < bench.config->channels; i++) {
-      nchan_benchmark_channel_id(i, &channel_id);
-      if(memstore_channel_owner(&channel_id) == ngx_process_slot) {
-        pubstart = (rand() / (RAND_MAX / bench.base_msg_period));
-        total_offset += pubstart;
-        bench.timer.publishers[i] = nchan_add_interval_timer(benchmark_publish_message_interval_timer, &bench.shared.channels[i], pubstart);
-      }
-      else {
-        bench.timer.publishers[i] = NULL;
-      }
-    }
-  }
-  
-  return NGX_OK;
-}
-
-
-ngx_int_t nchan_benchmark_dequeue_subscribers(void) {
-  unsigned i;
-  for(i=0; i < bench.subs.n; i++) {
-    bench.subs.array[i]->fn->dequeue(bench.subs.array[i]);
-  }
-  ngx_free(bench.subs.array);
-  bench.subs.array = NULL;
-  bench.subs.n = 0;
-  return NGX_OK;
-}
-
-static void benchmark_timer_running_stop(void *pd) {
-  bench.timer.running = NULL;
-  bench.time.end = ngx_time();
-  memstore_ipc_broadcast_benchmark_stop();
-  nchan_benchmark_stop();
-  bench.timer.finishing = nchan_add_oneshot_timer(benchmark_timer_finishing_check, NULL, 3000);
-}
-static void benchmark_timer_finishing_check(void *pd) {
-  bench.timer.finishing = NULL;
-  nchan_benchmark_dequeue_subscribers();
-  bench.waiting_for_results = nchan_worker_processes - 1;
-  if(bench.waiting_for_results == 0) {
-    nchan_benchmark_finish_response();
-    nchan_benchmark_finish();
-  }
-  else {
-    memstore_ipc_broadcast_benchmark_finish();
-  }
-}
-
-ngx_int_t nchan_benchmark_receive_finished_data(nchan_benchmark_data_t *data) {
-  DBG("received benchmark data");
-  assert(bench.waiting_for_results > 0);
-  bench.waiting_for_results  --;
-  bench.data.msg_sent += data->msg_sent;
-  bench.data.msg_send_confirmed += data->msg_send_confirmed;
-  bench.data.msg_send_failed += data->msg_send_failed;
-  bench.data.msg_received += data->msg_received;
-  hdr_add(bench.data.msg_delivery_latency, data->msg_delivery_latency);
-  hdr_close_nchan_shm(data->msg_delivery_latency);
-  hdr_add(bench.data.msg_publishing_latency, data->msg_publishing_latency);
-  hdr_close_nchan_shm(data->msg_publishing_latency);
-  hdr_add(bench.data.subscriber_readiness_latency, data->subscriber_readiness_latency);
-  hdr_close_nchan_shm(data->subscriber_readiness_latency);
-  
-  if(bench.waiting_for_results  == 0) {
-    nchan_benchmark_finish_response();
-    nchan_benchmark_finish();
-  }
-  return NGX_OK;
-}
-
-ngx_int_t nchan_benchmark_finish_response(void) {
-  u_char                *str;
-  ngx_http_request_t    *r = bench.client->request;
-  ngx_str_t             *accept_header = nchan_get_accept_header_value(r);
-  const char            *fmt;
-  char stats[2048];
-  fmt = 
-    "  \"start_time\":           %d,\n"
-    "  \"run_time_sec\":         %d,\n"
-    "  \"channels\":             %d,\n"
-    "  \"subscribers\":          %d,\n"
-    "  \"message_length\":       %d,\n"
-    "  \"messages\": {\n"
-    "    \"sent\":               %d,\n"
-    "    \"send_confirmed\":     %d,\n"
-    "    \"send_unconfirmed\":   %d,\n"
-    "    \"send_failed\":        %d,\n"
-    "    \"received\":           %d,\n"
-    "    \"unreceived\":         %d\n"
-    "  },\n"
-    "  \"message_publishing_latency\": {\n"
-    "    \"min\":               \"%.3fms\",\n"
-    "    \"avg\":               \"%.3fms\",\n"
-    "    \"99th_percentile\":   \"%.3fms\",\n"
-    "    \"max\":               \"%.3fms\",\n"
-    "    \"stddev\":            \"%.3fms\",\n"
-    "    \"samples\":            %D\n"
-    "  },\n"
-    "  \"message_delivery_latency\": {\n"
-    "    \"min\":               \"%.3fms\",\n"
-    "    \"avg\":               \"%.3fms\",\n"
-    "    \"99th_percentile\":   \"%.3fms\",\n"
-    "    \"max\":               \"%.3fms\",\n"
-    "    \"stddev\":            \"%.3fms\",\n"
-    "    \"samples\":            %D\n"
-    "  }%Z";
-    
-  ngx_snprintf((u_char *)stats, 2048, fmt, 
-    bench.time.start,
-    bench.time.end - bench.time.start,
-    bench.config->channels,
-    *bench.shared.subscribers_enqueued,
-    bench.config->msg_padding + 5,
-    bench.data.msg_sent,
-    bench.data.msg_send_confirmed,
-    bench.data.msg_sent - bench.data.msg_send_confirmed,
-    bench.data.msg_send_failed,
-    bench.data.msg_received,
-    bench.data.msg_sent * bench.config->subscribers_per_channel - bench.data.msg_received,
-    (double )hdr_min(bench.data.msg_publishing_latency)/1000.0,
-    (double )hdr_mean(bench.data.msg_publishing_latency)/1000.0,
-    (double )hdr_value_at_percentile(bench.data.msg_publishing_latency, 99.0)/1000.0,
-    (double )hdr_max(bench.data.msg_publishing_latency)/1000.0,
-    (double )hdr_stddev(bench.data.msg_publishing_latency)/1000.0,
-    bench.data.msg_publishing_latency->total_count,
-    
-    (double )hdr_min(bench.data.msg_delivery_latency)/1000.0,
-    (double )hdr_mean(bench.data.msg_delivery_latency)/1000.0,
-    (double )hdr_value_at_percentile(bench.data.msg_delivery_latency, 99.0)/1000.0,
-    (double )hdr_max(bench.data.msg_delivery_latency)/1000.0,
-    (double )hdr_stddev(bench.data.msg_delivery_latency)/1000.0,
-    bench.data.msg_delivery_latency->total_count
-  );
-  if(accept_header && ngx_strnstr(accept_header->data, "text/x-json-hdrhistogram", accept_header->len)) {
-    ngx_str_t *serialized_publishing_histogram, *serialized_delivery_histogram;
-    size_t sz;
-    fmt = 
-      "RESULTS\n"
-      "{\n"
-      "%s,\n"
-      "  \"message_publishing_histogram\":\n"
-      "    \"%V\",\n"
-      "  \"message_delivery_histogram\":\n"
-      "    \"%V\"\n"
-      "}\n"
-      "%Z";
-    sz = strlen(stats) + strlen(fmt);
-    serialized_publishing_histogram = nchan_hdrhistogram_serialize(bench.data.msg_publishing_latency, r->pool);
-    serialized_delivery_histogram = nchan_hdrhistogram_serialize(bench.data.msg_delivery_latency, r->pool);
-    
-    sz += serialized_publishing_histogram->len;
-    sz += serialized_delivery_histogram->len;
-    str = ngx_palloc(r->pool, sz);
-    if(str == NULL) {
-      benchmark_client_respond("ERROR: unable to create results response");
-      return NGX_ERROR;
-    }
-    
-    ngx_snprintf(str, sz, fmt, 
-      stats,
-      serialized_publishing_histogram,
-      serialized_delivery_histogram
-    );
-  }
-  else {
-        fmt = 
-      "RESULTS\n"
-      "{\n"
-      "%s\n"
-      "}\n"
-      "%Z";
-    str = ngx_palloc(r->pool, strlen(stats) + strlen(fmt));
-    ngx_sprintf(str, fmt, stats);
-  } 
-  
-  benchmark_client_respond((char *)str);
-  return NGX_OK;
-}
-
-ngx_int_t nchan_benchmark_abort(void) {
-  int active = nchan_benchmark_active();
-  
-  nchan_benchmark_dequeue_subscribers();
-  nchan_benchmark_stop();
-  nchan_benchmark_cleanup();
-  
-  return active ? NGX_OK : NGX_DECLINED;
-}
-
-ngx_int_t nchan_benchmark_stop(void) {
-  int i;
-  DBG("stop benchmark");
-  if(bench.timer.publishers) {
-    for(i=0; i< bench.config->channels; i++) {
-      if(bench.timer.publishers[i]) {
-        nchan_abort_interval_timer(bench.timer.publishers[i]);
-      }
-    }
-    ngx_free(bench.timer.publishers);
-    bench.timer.publishers = NULL;
-  }
-  return NGX_OK;
-}
-
-ngx_int_t nchan_benchmark_finish(void) {
-  //free all the things
-  shm_free(nchan_store_memory_shmem, (void *)bench.shared.subscribers_enqueued);
-  shm_free(nchan_store_memory_shmem, (void *)bench.shared.subscribers_dequeued);
-  shm_free(nchan_store_memory_shmem, bench.shared.channels);
-  hdr_close_nchan_shm(bench.data.msg_publishing_latency);
-  hdr_close_nchan_shm(bench.data.msg_delivery_latency);
-  hdr_close_nchan_shm(bench.data.subscriber_readiness_latency);
-  bench.client->fn->respond_status(bench.client, NGX_HTTP_GONE, NULL, NULL);
-  nchan_benchmark_cleanup();
-  DBG("benchmark finished");
-  return NGX_OK;
-}
-
-ngx_int_t nchan_benchmark_cleanup(void) {
-  DBG("benchmark cleanup");
-  bench.client = NULL;
-  assert(bench.timer.publishers == NULL);
-  assert(bench.subs.array == NULL);
-  assert(bench.subs.n == 0);
-  bench.id = 0;
-  if(bench.msgbuf) {
-    ngx_free(bench.msgbuf);
-    bench.msgbuf = NULL;
-  }
-  
-  ngx_memzero(&bench.time, sizeof(bench.time));
-  *bench.state = NCHAN_BENCHMARK_INACTIVE;
-  bench.waiting_for_results = 0;
-  
-  if(bench.timer.ready) {
-    nchan_abort_interval_timer(bench.timer.ready);
-    bench.timer.ready = NULL;
-  }
-  if(bench.timer.running) {
-    nchan_abort_oneshot_timer(bench.timer.running);
-    bench.timer.running = NULL;
-  }
-  if(bench.timer.finishing) {
-    nchan_abort_oneshot_timer(bench.timer.finishing);
-    bench.timer.finishing = NULL;
-  }
-  
-  return NGX_OK;
-}
-
-ngx_int_t nchan_benchmark_channel_id(int n, ngx_str_t *chid) {
-  static u_char  id[255];
-  u_char        *last;
-  chid->data = id;
-  last = ngx_snprintf(id, 255, "/benchmark.%T-%D.%D", bench.time.init, bench.id, n);
-  chid->len = last - id;
-  return NGX_OK;
-}
-
-uint64_t nchan_benchmark_message_delivery_msec(nchan_msg_t *msg) {
-  struct timeval tv;
-  ngx_gettimeofday(&tv);
-  
-  uint64_t now = (tv.tv_sec - bench.time.init) * (uint64_t)1000000 + tv.tv_usec;
-  int then;
-  
-  if(ngx_buf_in_memory((&msg->buf))) {
-    then = atoi((char *)msg->buf.start);
-  }
-  else {
-    //not supported yet
-    then = now;
-    raise(SIGABRT);
-  }
-  
-  return now - then;
-}
-
-nchan_benchmark_t *nchan_benchmark_get_active(void) {
-  return &bench;
-}
-
-char throwaway_buf[128];
-static void serialize_int64_t(int write, char **cur, int64_t val) {
-  char  *buf;
-  buf = write ? *cur : throwaway_buf;
-  *cur += sprintf(buf, "%" PRId64 " ", val);
-}
-static void serialize_int32_t(int write, char **cur, int32_t val) {
-  char  *buf;
-  buf = write ? *cur : throwaway_buf;
-  *cur += sprintf(buf, "%" PRId32 " ", val);
-}
-static void serialize_double(int write, char **cur, double val) {
-  char  *buf;
-  buf = write ? *cur : throwaway_buf;
-  *cur += sprintf(buf, "%lf ", val);
-}
-static void serialize_numrun(int write, char **cur, int num, int runcount) {
-  char  *numrun="~!@#$%^&*";
-  char  *buf;
-  assert((size_t)num < strlen(numrun));
-  buf = write ? *cur : throwaway_buf;
-  if(runcount == 0) {
-    *cur += sprintf(buf, "%i ", num);
-  }
-  else {
-    *cur += sprintf(buf, "%c%i ", numrun[num], runcount);
-  }
-}
-
-size_t hdrhistogram_serialize(int write, char *start, const struct hdr_histogram* hdr) {
-  int    i;
-  char  *fakestart = NULL;
-  char **cur;
-  if(start == NULL) {
-    start = fakestart;
-  }
-  cur = &start;
-  char *first = start;
-  
-  serialize_int64_t(write, cur, hdr->lowest_trackable_value);
-  serialize_int64_t(write, cur, hdr->highest_trackable_value);
-  serialize_int32_t(write, cur, hdr->unit_magnitude);
-  serialize_int32_t(write, cur, hdr->significant_figures);
-  serialize_int32_t(write, cur, hdr->sub_bucket_half_count_magnitude);
-  serialize_int32_t(write, cur, hdr->sub_bucket_half_count);
-  serialize_int64_t(write, cur, hdr->sub_bucket_mask);
-  serialize_int32_t(write, cur, hdr->sub_bucket_count);
-  serialize_int32_t(write, cur, hdr->bucket_count);
-  serialize_int64_t(write, cur, hdr->min_value);
-  serialize_int64_t(write, cur, hdr->max_value);
-  serialize_int32_t(write, cur, hdr->normalizing_index_offset);
-  serialize_double (write, cur, hdr->conversion_ratio);
-  serialize_int32_t(write, cur, hdr->counts_len);
-  serialize_int64_t(write, cur, hdr->total_count);
-  
-  if(write) {
-    **cur='[';
-  }
-  (*cur)++;
-  
-  int runcount=0;
-  int64_t ncur=0, nprev=0;
-  for(i=1, nprev=hdr->counts[0]; i<hdr->counts_len; i++) {
-    ncur = hdr->counts[i];
-    nprev = hdr->counts[i-1];
-    if(ncur <= 8 && ncur == nprev) {
-      runcount++;
-    }
-    else {
-      if(runcount > 0) {
-        serialize_numrun(write, cur, nprev, runcount+1);
-        runcount = 0;
-      }
-      else {
-        serialize_int64_t(write, cur, nprev);
-      }
-    }
-  }
-  if(runcount > 0) {
-    serialize_numrun(write, cur, ncur, runcount+1);
-  }
-  else {
-    serialize_int64_t(write, cur, ncur);
-  }
-  
-  if(write) {
-    **cur=']';
-  }
-  (*cur)++;
-  
-  return *cur - first;
-}
-
-
-ngx_str_t *nchan_hdrhistogram_serialize(const struct hdr_histogram* hdr, ngx_pool_t *pool) {
-  char *start=NULL;
-  ngx_str_t *str = ngx_palloc(pool, sizeof(*str));
-  size_t sz = hdrhistogram_serialize(0, NULL, hdr);
-  start = ngx_palloc(pool, sz);
-  hdrhistogram_serialize(1, start, hdr);
-  str->data = (u_char *)start;
-  str->len = sz;
-  return str;
-}
-
-static ngx_int_t benchmark_timer_ready_check(void *pd) {
-  uint64_t required_subs = bench.config->subscribers_per_channel * bench.config->channels;
-  if(*bench.shared.subscribers_enqueued == required_subs) {
-    char     ready_reply[512];
-    assert(*bench.state == NCHAN_BENCHMARK_INITIALIZING);
-    *bench.state = NCHAN_BENCHMARK_READY;
-    ngx_snprintf((u_char *)ready_reply, 512, "READY\n"
-      "{\n"
-      "  \"init_time\":                        %T,\n"
-      "  \"time\":                             %T,\n"
-      "  \"messages_per_channel_per_minute\":  %d,\n"
-      "  \"message_padding_bytes\":            %d,\n"
-      "  \"channels\":                         %d,\n"
-      "  \"subscribers_per_channel\":          %d\n"
-      "}\n%Z",
-      bench.time.init,
-      bench.config->time,
-      bench.config->msgs_per_minute,
-      bench.config->msg_padding,
-      bench.config->channels,
-      bench.config->subscribers_per_channel);
-    
-    benchmark_client_respond(ready_reply);
-    bench.timer.ready = NULL;
-    return NGX_DONE;
-  }
-  else {
-    return NGX_AGAIN;
-  }
-}
-
-ngx_int_t nchan_benchmark_initialize_from_ipc(ngx_int_t initiating_worker_slot, nchan_loc_conf_t *cf, time_t init_time, uint32_t id, nchan_benchmark_shared_t *shared_data) {
-  DBG("init benchmark via IPC (time %d src %d)", init_time, initiating_worker_slot);
-  bench.loc_conf = cf;
-  bench.time.init = init_time;
-  bench.id = id;
-  bench.shared = *shared_data;
-  ngx_memzero(&bench.data, sizeof(bench.data));
-  hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_delivery_latency);
-  hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_publishing_latency);
-  hdr_init_nchan_shm(1, 10000000, 3, &bench.data.subscriber_readiness_latency);
-  
-  nchan_benchmark_initialize();
-  
-  return NGX_OK;
-}
-
-static ngx_int_t init_command_get_config_value(const char *config, ngx_str_t *cmd, ngx_int_t *val) {
-  ngx_str_t find;
-  u_char   *cur = cmd->data, *end = cmd->data + cmd->len, *vend;
-  find.data = (u_char *)config;
-  find.len = strlen(config);
-  if(nchan_strscanstr(&cur, &find, end)) {
-    if((vend = memchr(cur, ' ', end - cur)) == NULL) {
-      vend = end;
-    }
-    if((*val = ngx_atoi(cur, vend - cur)) == NGX_ERROR) {
-      return 0;
-    }
-    else {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-void benchmark_controller(subscriber_t *sub, nchan_msg_t *msg) {
-  ngx_str_t            cmd = {msg->buf.last - msg->buf.pos, msg->buf.pos};
-  ngx_http_request_t  *r = sub->request;
-  nchan_loc_conf_t   *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  
-  if(nchan_str_startswith(&cmd, "init")) {
-    int       i;
-    ngx_int_t val;
-    
-    if(!ngx_atomic_cmp_set((ngx_atomic_uint_t *)bench.state, NCHAN_BENCHMARK_INACTIVE, NCHAN_BENCHMARK_INITIALIZING)) {
-      benchmark_client_respond("ERROR: a benchmark is already initialized");
-      return;
-    }
-    
-    DBG("init benchmark");
-    benchmark_client_respond("INITIALIZING");
-    
-    bench.loc_conf = cf;
-    *bench.config = cf->benchmark;
-    
-    if(init_command_get_config_value(" time=", &cmd, &val)) {
-      bench.config->time = val;
-    }
-    if(init_command_get_config_value(" messages_per_channel_per_minute=", &cmd, &val)) {
-      bench.config->msgs_per_minute = val;
-    }
-    if(init_command_get_config_value(" message_padding_bytes=", &cmd, &val)) {
-      bench.config->msg_padding = val;
-    }
-    if(init_command_get_config_value(" channels=", &cmd, &val)) {
-      bench.config->channels = val;
-    }
-    if(init_command_get_config_value(" subscribers_per_channel=", &cmd, &val)) {
-      bench.config->subscribers_per_channel = val;
-    }
-    
-    bench.time.init = ngx_time();
-    bench.id = rand();
-    bench.client = sub;
-    ngx_memzero(&bench.data, sizeof(bench.data));
-    
-    bench.shared.subscribers_enqueued = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_t), "hdrhistogram subscribers_enqueued count");
-    bench.shared.subscribers_dequeued = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_t), "hdrhistogram subscribers_dequeued count");
-    bench.shared.channels = shm_calloc(nchan_store_memory_shmem, sizeof(nchan_benchmark_channel_t) * bench.config->channels, "benchmark channel states");
-    hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_delivery_latency);
-    hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_publishing_latency);
-    hdr_init_nchan_shm(1, 10000000, 3, &bench.data.subscriber_readiness_latency);
-    
-    for(i=0; i<bench.config->channels; i++) {
-      bench.shared.channels[i].n=i;
-      bench.shared.channels[i].msg_count=0;
-    }
-    
-    bench.msgbuf = NULL;
-    
-    //broadcast workload to other workers
-    memstore_ipc_broadcast_benchmark_initialize(&bench);
-    
-    nchan_benchmark_initialize();
-    
-    bench.timer.ready = nchan_add_interval_timer(benchmark_timer_ready_check, NULL, 250);
-  }
-  else if(nchan_strmatch(&cmd, 2, "run", "start")) {
-    if(!ngx_atomic_cmp_set((ngx_atomic_uint_t *)bench.state, NCHAN_BENCHMARK_READY, NCHAN_BENCHMARK_RUNNING)) {
-      benchmark_client_respond(*bench.state < NCHAN_BENCHMARK_READY ? "ERROR: not ready" : "ERROR: already running");
-      return;
-    }
-    
-    bench.time.start = ngx_time();
-    benchmark_client_respond("RUNNING");
-    
-    memstore_ipc_broadcast_benchmark_run();
-    nchan_benchmark_run();
-    
-    bench.timer.running = nchan_add_oneshot_timer(benchmark_timer_running_stop, NULL, bench.config->time * 1000);
-  }
-  else if(nchan_strmatch(&cmd, 2, "finish", "end")) {
-    //benchmark_finish();
-  }
-  else if(nchan_strmatch(&cmd, 1, "abort"))  {
-    if(nchan_benchmark_abort() == NGX_OK) {
-      memstore_ipc_broadcast_benchmark_abort();
-      benchmark_client_respond("ABORTED");
-    }
-    else {
-      benchmark_client_respond("ERROR: no active benchmark to abort");
-    }
-  }
-  else {
-    benchmark_client_respond("ERROR: unknown command");
-  }
-}
-
-void benchmark_request_cleanup_handler(void *pd) {
-  if(nchan_benchmark_abort() == NGX_OK) {
-    memstore_ipc_broadcast_benchmark_abort();
-  }
-  bench.client = NULL;
-}
-
-ngx_int_t nchan_benchmark_ws_initialize(ngx_http_request_t *r) {
-  nchan_msg_id_t          newest_msgid = NCHAN_NEWEST_MSGID;
-  ngx_http_cleanup_t     *cln;
-  if(!nchan_detect_websocket_request(r)) {
-    return NGX_HTTP_BAD_REQUEST;
-  }
-  
-  if(nchan_benchmark_active()) {
-    return nchan_respond_cstring(r, NGX_HTTP_CONFLICT, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "benchmark already running", 0);
-  }
-  if(bench.client) {
-    return nchan_respond_cstring(r, NGX_HTTP_CONFLICT, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "benchmark client already running", 0);
-  }
-  if((cln = ngx_http_cleanup_add(r, 0)) == NULL) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  cln->data = NULL;
-  cln->handler = benchmark_request_cleanup_handler;
-  if((bench.client = websocket_subscriber_create(r, &newest_msgid)) == NULL) {
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-  websocket_intercept_published_message(bench.client, &benchmark_controller);
-  bench.client->fn->enqueue(bench.client);
-  
-  
-  return NGX_DONE;
-}
diff --git a/debian/modules/nchan/src/util/nchan_benchmark.h b/debian/modules/nchan/src/util/nchan_benchmark.h
deleted file mode 100644
index c9bab81..0000000
--- a/debian/modules/nchan/src/util/nchan_benchmark.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef NCHAN_BENCHMARK_H
-#define NCHAN_BENCHMARK_H
-
-#include <nchan_module.h>
-#include <util/hdr_histogram.h>
-
-typedef struct {
-  struct hdr_histogram* msg_publishing_latency;
-  struct hdr_histogram* msg_delivery_latency;
-  struct hdr_histogram* subscriber_readiness_latency;
-  uint64_t              msg_sent;
-  uint64_t              msg_send_confirmed;
-  uint64_t              msg_send_failed;
-  uint64_t              msg_received;
-} nchan_benchmark_data_t;
-
-typedef struct {
-  uint64_t              n;
-  ngx_atomic_t          msg_count;
-  u_char               *msgbuf;
-} nchan_benchmark_channel_t;
-
-typedef struct {
-  ngx_atomic_t              *subscribers_enqueued;
-  ngx_atomic_t              *subscribers_dequeued;
-  nchan_benchmark_channel_t *channels;
-} nchan_benchmark_shared_t;
-
-
-#define NCHAN_BENCHMARK_INACTIVE      0
-#define NCHAN_BENCHMARK_INITIALIZING  1
-#define NCHAN_BENCHMARK_READY         2
-#define NCHAN_BENCHMARK_RUNNING       3
-#define NCHAN_BENCHMARK_FINISHED      4
-
-typedef struct nchan_benchmark_s nchan_benchmark_t;
-struct nchan_benchmark_s {
-  subscriber_t       *client;
-  nchan_benchmark_conf_t   *config;
-  nchan_loc_conf_t   *loc_conf;
-  uint32_t            id;
-  struct {
-    time_t              init;
-    time_t              start;
-    time_t              end;
-  }                   time;
-  struct {
-    void             *ready;
-    void             *running;
-    void             *finishing;
-    void            **publishers;
-  }                   timer;
-  u_char             *msgbuf;
-  ngx_atomic_int_t   *state;
-  struct {
-    size_t              n;
-    subscriber_t      **array;
-  }                   subs;
-  unsigned            base_msg_period;
-  int                 waiting_for_results;
-  nchan_benchmark_shared_t shared;
-  nchan_benchmark_data_t data;
-  
-}; //nchan_benchmark_t
-
-int nchan_benchmark_active(void);
-  
-ngx_int_t nchan_benchmark_init_module(ngx_cycle_t *cycle);
-ngx_int_t nchan_benchmark_init_worker(ngx_cycle_t *cycle);
-ngx_int_t nchan_benchmark_exit_master(ngx_cycle_t *cycle);
-
-ngx_int_t nchan_benchmark_initialize(void);
-ngx_int_t nchan_benchmark_initialize_from_ipc(ngx_int_t initiating_worker_slot, nchan_loc_conf_t *cf, time_t time_start, uint32_t id, nchan_benchmark_shared_t *shared_data);
-ngx_int_t nchan_benchmark_run(void);
-
-ngx_int_t nchan_benchmark_stop(void);
-ngx_int_t nchan_benchmark_dequeue_subscribers(void);
-ngx_int_t nchan_benchmark_finish_response(void);
-ngx_str_t *nchan_hdrhistogram_serialize(const struct hdr_histogram* hdr, ngx_pool_t *pool);
-ngx_int_t nchan_benchmark_receive_finished_data(nchan_benchmark_data_t *data);
-ngx_int_t nchan_benchmark_finish(void);
-ngx_int_t nchan_benchmark_abort(void);
-ngx_int_t nchan_benchmark_cleanup(void);
-
-ngx_int_t nchan_benchmark_channel_id(int n, ngx_str_t *chid);
-uint64_t nchan_benchmark_message_delivery_msec(nchan_msg_t *msg);
-nchan_benchmark_t *nchan_benchmark_get_active(void);
-
-
-ngx_int_t nchan_benchmark_ws_initialize(ngx_http_request_t *r);
-#endif //NCHAN_BENCHMARK_H
diff --git a/debian/modules/nchan/src/util/nchan_bufchainpool.c b/debian/modules/nchan/src/util/nchan_bufchainpool.c
deleted file mode 100644
index 2148c11..0000000
--- a/debian/modules/nchan/src/util/nchan_bufchainpool.c
+++ /dev/null
@@ -1,237 +0,0 @@
-#include <nchan_module.h>
-#include <util/nchan_output.h>
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "BUFCHAINPOOL:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "BUFCHAINPOOL:" fmt, ##arg)
-/*
-static void validate_stuff(nchan_bufchain_pool_t *bcp) {
-  nchan_bufchain_link_t      *cur;
-  nchan_file_link_t          *fcur;
-  int                         bcs=0, rbcs = 0, files=0, rfiles = 0;
-  for(cur = bcp->bc_head; cur != NULL; cur = cur->next) {
-    bcs++;
-  }
-  assert(bcs == bcp->bc_count);
-  for(cur = bcp->bc_recycle_head; cur != NULL; cur = cur->next) {
-    rbcs++;
-  }
-  assert(rbcs == bcp->bc_recycle_count);
-  for(fcur = bcp->file_head; fcur != NULL; fcur = fcur->next) {
-    files++;
-  }
-  assert(files == bcp->file_count);
-  for(fcur = bcp->file_recycle_head; fcur != NULL; fcur = fcur->next) {
-    rfiles++;
-  }
-  assert(rfiles == bcp->file_recycle_count);
-}
-*/
-
-
-
-nchan_buf_and_chain_t *nchan_bufchain_pool_reserve(nchan_bufchain_pool_t *bcp, ngx_int_t count) {
-  nchan_bufchain_link_t      *cur = NULL, *last = NULL, *first = NULL;
-  nchan_bufchain_link_t      **rhead = &bcp->bc_recycle_head;
-  //validate_stuff(bcp);
-  if(count <= 0) {
-    return NULL;
-  }
-  while(count > 0) {
-    if(*rhead) {
-      cur = *rhead;
-      *rhead = cur->next;
-      bcp->bc_recycle_count --;
-    } else {
-      cur = ngx_palloc(bcp->pool, sizeof(*cur));
-      cur->bc.chain.buf = &cur->bc.buf;
-    }
-    if(!first) {
-      first = cur;
-    }
-    if(last) {
-      last->next = cur;
-      last->bc.chain.next = &cur->bc.chain;
-    }
-    last = cur;
-    count --;
-    bcp->bc_count++;
-  }
-  last->next = bcp->bc_head;
-  last->bc.chain.next=NULL;
-  bcp->bc_head = first;
-  DBG("%p bcs %i (rec. %i), files %i (rec. %i)", bcp, bcp->bc_count, bcp->bc_recycle_count, bcp->file_count, bcp->file_recycle_count);
-  //validate_stuff(bcp);
-  return &first->bc;
-}
-
-static ngx_buf_t *nchan_bufchain_append(nchan_bufchain_pool_t *bcp) {
-  static ngx_buf_t            throwaway;
-  ngx_chain_t                *chain;
-  ngx_chain_t               **rhead = &bcp->bc.recycle_head;
-  
-  if(*rhead) {
-    chain = *rhead;
-    *rhead = chain->next;
-    bcp->bc.recycle_count --;
-  } 
-  else {
-    nchan_buf_and_chain_t *bufchain = ngx_palloc(bcp->pool, sizeof(*bufchain));
-    if(bufchain == NULL) {
-      nchan_log_error("unable to palloc bufchain");
-      return &throwaway;
-    }
-    chain = &bufchain->chain;
-    chain->buf = &bufchain->buf;
-  }
-  
-  chain->buf->last_buf = 1;
-  chain->buf->last_in_chain = 1;
-  chain->next = NULL;
-  
-  if(!bcp->bc.head) {
-    bcp->bc.head = chain;
-  }
-  
-  if(bcp->bc.tail) {
-    ngx_buf_t *tbuf = bcp->bc.tail->buf;
-    tbuf->last_buf = 0;
-    tbuf->last_in_chain = 0;
-    bcp->bc.tail->next = chain;
-  }
-  bcp->bc.tail = chain;
-  bcp->bc.count++;
-  return chain->buf;
-}
-
-ngx_int_t nchan_bufchain_append_buf(nchan_bufchain_pool_t *bcp, ngx_buf_t *inbuf) {
-  ngx_buf_t *buf = nchan_bufchain_append(bcp);
-  *buf = *inbuf;
-  buf->last_buf = 1;
-  buf->last_in_chain = 1;
-  bcp->bc.length += ngx_buf_size(inbuf);
-  return NGX_OK;
-}
-
-ngx_int_t nchan_bufchain_append_str(nchan_bufchain_pool_t *bcp, ngx_str_t *str) {
-  ngx_buf_t *buf = nchan_bufchain_append(bcp);
-  ngx_memzero(buf, sizeof(*buf));
-  buf->start = str->data;
-  buf->pos = buf->start;
-  buf->end = str->data + str->len;
-  buf->last = buf->end;
-  buf->memory = 1;
-  buf->last_buf = 1;
-  buf->last_in_chain = 1;
-  bcp->bc.length += str->len;
-  return NGX_OK;
-}
-ngx_int_t nchan_bufchain_append_cstr(nchan_bufchain_pool_t *bcp, char *cstr) {
-  ngx_str_t str;
-  str.data = (u_char *)cstr;
-  str.len = strlen(cstr);
-  return nchan_bufchain_append_str(bcp, &str);
-}
-
-size_t nchan_bufchain_length(nchan_bufchain_pool_t *bcp) {
-  return bcp->bc.length;
-}
-ngx_chain_t *nchan_bufchain_first_chain(nchan_bufchain_pool_t *bcp) {
-  return bcp->bc.head;
-}
-
-
-ngx_file_t *nchan_bufchain_pool_reserve_file(nchan_bufchain_pool_t *bcp) {
-  nchan_file_link_t    *cur;
-  //validate_stuff(bcp);
-  if(bcp->file_recycle_head) {
-    cur = bcp->file_recycle_head;
-    bcp->file_recycle_head = cur->next;
-    bcp->file_recycle_count --;
-  }
-  else {
-    cur = ngx_palloc(bcp->pool, sizeof(*cur));
-  }
-  cur->next = bcp->file_head;
-  bcp->file_head = cur;
-  bcp->file_count++;
-  DBG("%p bcs %i (rec. %i), files %i (rec. %i)", bcp, bcp->bc_count, bcp->bc_recycle_count, bcp->file_count, bcp->file_recycle_count);
-  //validate_stuff(bcp);
-  return &cur->file;
-}
-
-void nchan_bufchain_pool_refresh_files(nchan_bufchain_pool_t *bcp) {
-  nchan_file_link_t    *cur;
-  //validate_stuff(bcp);
-  for(cur = bcp->file_head; cur != NULL; cur = cur->next) {
-    cur->file.fd = nchan_fdcache_get(&cur->file.name);
-  }
-}
-
-ngx_int_t nchan_bufchain_pool_init(nchan_bufchain_pool_t *bcp, ngx_pool_t *pool) {
-  bcp->bc_count = 0;
-  bcp->file_count = 0;
-  
-  bcp->bc_recycle_count = 0;
-  bcp->file_recycle_count = 0;
-  
-  bcp->bc_head = NULL;
-  bcp->bc_recycle_head = NULL;
-  
-  bcp->bc.head = NULL;
-  bcp->bc.tail = NULL;
-  bcp->bc.recycle_head = NULL;
-  bcp->bc.count = 0;
-  bcp->bc.recycle_count = 0;
-  bcp->bc.length = 0;
-  
-  bcp->file_head = NULL;
-  bcp->file_recycle_head = NULL;
-  
-  bcp->pool = pool;
-  //validate_stuff(bcp);
-  return NGX_OK;
-}
-
-void nchan_bufchain_pool_flush(nchan_bufchain_pool_t *bcp) {
-  nchan_bufchain_link_t      *cur;
-  nchan_file_link_t          *fcur, **fhead = &bcp->file_head, **rfhead = &bcp->file_recycle_head;
-  //validate_stuff(bcp);
-  
-  if(bcp->bc.tail) {
-    bcp->bc.tail->next = bcp->bc.recycle_head; //link just-used and recycled-in-waiting chains
-  }
-  bcp->bc.recycle_head = bcp->bc.head;
-  bcp->bc.recycle_count += bcp->bc.count;
-  bcp->bc.count = 0;
-  bcp->bc.length = 0;
-  bcp->bc.tail = NULL;
-  bcp->bc.head = NULL;
-  
-  while(bcp->bc_head != NULL) {
-    cur = bcp->bc_head;
-    bcp->bc_head = cur->next;
-    
-    cur->next = bcp->bc_recycle_head;
-    bcp->bc_recycle_head = cur;
-    bcp->bc_count--;
-    bcp->bc_recycle_count ++;
-  }
-  assert(bcp->bc_count == 0);
-  //validate_stuff(bcp);
-  while(*fhead) {
-    fcur = *fhead;
-    *fhead = fcur->next;
-    
-    fcur->next = *rfhead;
-    *rfhead = fcur;
-    bcp->file_count--;
-    bcp->file_recycle_count ++;
-  }
-  assert(bcp->file_count == 0);
-  //validate_stuff(bcp);
-  DBG("%p bcs %i (rec. %i), files %i (rec. %i)", bcp, bcp->bc_count, bcp->bc_recycle_count, bcp->file_count, bcp->file_recycle_count);
-}
diff --git a/debian/modules/nchan/src/util/nchan_bufchainpool.h b/debian/modules/nchan/src/util/nchan_bufchainpool.h
deleted file mode 100644
index fa12299..0000000
--- a/debian/modules/nchan/src/util/nchan_bufchainpool.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef NCHAN_BUFCHAINPOOL_H
-#define NCHAN_BUFCHAINPOOL_H
-#include <nchan_module.h>
-
-typedef struct {
-  ngx_chain_t     chain;
-  ngx_buf_t       buf;
-} nchan_buf_and_chain_t;
-
-typedef struct nchan_bufchain_link_s nchan_bufchain_link_t;
-struct nchan_bufchain_link_s {
-  nchan_bufchain_link_t    *next;
-  nchan_buf_and_chain_t     bc;
-};
-
-typedef struct nchan_file_link_s nchan_file_link_t;
-struct nchan_file_link_s{
-  nchan_file_link_t        *next;
-  ngx_file_t                file;
-};
-
-typedef struct {
-  ngx_int_t                  bc_count;
-  ngx_int_t                  file_count;
-  ngx_int_t                  bc_recycle_count;
-  ngx_int_t                  file_recycle_count;
-  nchan_bufchain_link_t     *bc_head;
-  nchan_bufchain_link_t     *bc_recycle_head;
-  nchan_file_link_t         *file_head;
-  nchan_file_link_t         *file_recycle_head;
-  ngx_pool_t                *pool;
-  
-  struct {
-    size_t                     length;
-    ngx_int_t                  count;
-    ngx_chain_t               *head;
-    ngx_chain_t               *tail;
-    
-    ngx_int_t                  recycle_count;
-    ngx_chain_t               *recycle_head;
-  }                          bc;
-} nchan_bufchain_pool_t;
-
-ngx_int_t nchan_bufchain_pool_init(nchan_bufchain_pool_t *bcp, ngx_pool_t *pool);
-nchan_buf_and_chain_t *nchan_bufchain_pool_reserve(nchan_bufchain_pool_t *bcp, ngx_int_t count);
-ngx_file_t *nchan_bufchain_pool_reserve_file(nchan_bufchain_pool_t *bcp);
-void nchan_bufchain_pool_refresh_files(nchan_bufchain_pool_t *bcp);
-void nchan_bufchain_pool_flush(nchan_bufchain_pool_t *bcp);
-
-ngx_chain_t *nchan_bufchain_first_chain(nchan_bufchain_pool_t *bcp);
-size_t nchan_bufchain_length(nchan_bufchain_pool_t *bcp);
-ngx_int_t nchan_bufchain_append_buf(nchan_bufchain_pool_t *bcp, ngx_buf_t *buf);
-ngx_int_t nchan_bufchain_append_str(nchan_bufchain_pool_t *bcp, ngx_str_t *str);
-ngx_int_t nchan_bufchain_append_cstr(nchan_bufchain_pool_t *bcp, char *cstr);
-
-#endif //NCHAN_BUFCHAINPOOL_H
diff --git a/debian/modules/nchan/src/util/nchan_channel_id.c b/debian/modules/nchan/src/util/nchan_channel_id.c
deleted file mode 100644
index 1c761e1..0000000
--- a/debian/modules/nchan/src/util/nchan_channel_id.c
+++ /dev/null
@@ -1,316 +0,0 @@
-#include <nchan_module.h>
-#include <assert.h>
-
-static ngx_int_t validate_id(ngx_http_request_t *r, ngx_str_t *id, nchan_loc_conf_t *cf) {
-  if(id->len > (unsigned )cf->max_channel_id_length) {
-    nchan_log_request_warning(r, "channel id is too long: should be at most %i, is %i.", cf->max_channel_id_length, id->len);
-    return NGX_ERROR;
-  }
-  return NGX_OK;
-}
-
-ngx_int_t nchan_channel_id_is_multi(ngx_str_t *id) {
-  u_char         *cur = id->data;
-  return (id->len >= 3 && cur[0] == 'm' && cur[1] == '/' && cur[2] == NCHAN_MULTI_SEP_CHR);
-}
-
-
-
-static ngx_int_t nchan_process_multi_channel_id(ngx_http_request_t *r, nchan_complex_value_arr_t *idcf, nchan_loc_conf_t *cf, ngx_str_t **ret_id) {
-  ngx_int_t                   i, n = idcf->n, n_out = 0;
-  ngx_str_t                   id[NCHAN_MULTITAG_MAX];
-  ngx_str_t                  *id_out;
-  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  ngx_str_t                  *group = nchan_get_group_name(r, cf, ctx);
-  if(group == NULL) {
-    return NGX_ERROR;
-  }
-  size_t                      sz = 0, grouplen = group->len;
-  u_char                     *cur;
-  
-  //static ngx_str_t            empty_string = ngx_string("");
-  
-  for(i=0; i < n && n_out < NCHAN_MULTITAG_MAX; i++) {
-    ngx_http_complex_value(r, idcf->cv[i], &id[n_out]);
-    if(validate_id(r, &id[n_out], cf) != NGX_OK) {
-      *ret_id = NULL;
-      return NGX_DECLINED;
-    }
-    
-    if(cf->channel_id_split_delimiter.len > 0) {
-      ngx_str_t  *delim = &cf->channel_id_split_delimiter;
-      u_char     *cur_last, *last;
-      cur = id[n_out].data;
-      last = cur + id[n_out].len;
-      
-      u_char     *cur_first = cur;
-      while ((cur_last = nchan_strsplit(&cur, delim, last)) != NULL) {
-        if(n_out >= NCHAN_MULTITAG_MAX) {
-          nchan_log_warning("can't exceed %d channels on a single multiplexed location", NCHAN_MULTITAG_MAX);
-          *ret_id = NULL;
-          return NGX_DECLINED;
-        }
-        id[n_out].data = cur_first;
-        id[n_out].len = cur_last - cur_first;
-        cur_first = cur;
-        sz += id[n_out].len + 1 + grouplen; // "group/<channel-id>"
-        if(n_out < NCHAN_MULTITAG_REQUEST_CTX_MAX) {
-          ctx->channel_id[n_out] = id[n_out];
-        }
-        n_out++;
-      }
-      
-    }
-    else {
-      if(n_out >= NCHAN_MULTITAG_MAX) {
-        nchan_log_warning("can't exceed %d channels on a single multiplexed location", NCHAN_MULTITAG_MAX);
-        *ret_id = NULL;
-        return NGX_DECLINED;
-      }
-      sz += id[n_out].len + 1 + grouplen; // "group/<channel-id>"
-      if(n_out < NCHAN_MULTITAG_REQUEST_CTX_MAX) {
-        ctx->channel_id[n_out] = id[n_out];
-      }
-      n_out++;
-    }
-  }
-  if(n_out>1) {
-    sz += 3 + n_out; //space for null-separators and "m/<SEP>" prefix for multi-chid
-  }
-  if(ctx) {
-    ctx->channel_id_count = n_out;
-    //for(; i < NCHAN_MULTITAG_REQUEST_CTX_MAX; i++) {
-    //  ctx->channel_id[i] = empty_string;
-    //}
-  }
-
-  if((id_out = ngx_palloc(r->pool, sizeof(*id_out) + sz)) == NULL) {
-    nchan_log_warning("can't allocate space for channel id");
-    *ret_id = NULL;
-    return NGX_ERROR;
-  }
-  id_out->len = sz;
-  id_out->data = (u_char *)&id_out[1];
-  cur = id_out->data;
-  
-  if(n_out > 1) {
-    cur[0]='m';
-    cur[1]='/';
-    cur[2]=NCHAN_MULTI_SEP_CHR;
-    cur+=3;
-  }
-  
-  for(i = 0; i < n_out; i++) {
-    ngx_memcpy(cur, group->data, grouplen);
-    cur += grouplen;
-    cur[0] = '/';
-    cur++;
-    ngx_memcpy(cur, id[i].data, id[i].len);
-    cur += id[i].len;
-    if(n_out>1) {
-      cur[0] = NCHAN_MULTI_SEP_CHR;
-      cur++;
-    }
-  }
-  *ret_id = id_out;
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_process_legacy_channel_id(ngx_http_request_t *r, nchan_loc_conf_t *cf, ngx_str_t **ret_id) {
-  static ngx_str_t            channel_id_var_name = ngx_string("push_channel_id");
-  ngx_uint_t                  key = ngx_hash_key(channel_id_var_name.data, channel_id_var_name.len);
-  ngx_http_variable_value_t  *vv = NULL;
-  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  ngx_str_t                  *group = nchan_get_group_name(r, cf, ctx);
-  ngx_str_t                   tmpid;
-  ngx_str_t                  *id;
-  size_t                      sz;
-  u_char                     *cur;
-  
-  
-  ctx->channel_id_count = 0;
-  
-  vv = ngx_http_get_variable(r, &channel_id_var_name, key);
-  if (vv == NULL || vv->not_found || vv->len == 0) {
-    //nchan_log_warning("the legacy $push_channel_id variable is not set");
-    return NGX_ABORT;
-  }
-  else {
-    tmpid.len = vv->len;
-    tmpid.data = vv->data;
-  }
-  
-  if(validate_id(r, &tmpid, cf) != NGX_OK) {
-    *ret_id = NULL;
-    return NGX_DECLINED;
-  }
-  
-  sz = group->len + 1 + tmpid.len;
-  if((id = ngx_palloc(r->pool, sizeof(*id) + sz)) == NULL) {
-    nchan_log_error("can't allocate space for legacy channel id");
-    *ret_id = NULL;
-    return NGX_ERROR;
-  }
-  id->len = sz;
-  id->data = (u_char *)&id[1];
-  cur = id->data;
-  
-  ngx_memcpy(cur, group->data, group->len);
-  cur += group->len;
-  cur[0]='/';
-  cur++;
-  ngx_memcpy(cur, tmpid.data, tmpid.len);
-  
-  ctx->channel_id_count = 1;
-  ctx->channel_id[0] = *id;
-  
-  *ret_id = id;
-  return NGX_OK;
-}
-
-ngx_str_t nchan_get_group_from_channel_id(ngx_str_t *id) {
-  ngx_str_t group;
-  u_char *cur, *end;
-  size_t  len;
-  if(nchan_channel_id_is_multi(id)) {
-    cur = &id->data[3];
-    len = id->len - 3;
-  }
-  else {
-    cur = id->data;
-    len = id->len;
-  }
-  end = memchr(cur, '/', len);
-  
-  assert(end); //if slash wasn't found, we have a malformed id string. 
-  //this is crashworthy to investigate how it happened.
-  
-  group.data = cur;
-  group.len = (end - cur);
-  
-  return group;
-}
-
-ngx_str_t *nchan_get_group_name(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx) {
-  if(!ctx->channel_group_name) {
-    if((ctx->channel_group_name = ngx_palloc(r->pool, sizeof(*ctx->channel_group_name))) == NULL) {
-      nchan_log_request_error(r, "couldn't allocate a tiny little channel group string.");
-      return NULL;
-    }
-    
-    if(cf->channel_group == NULL) {
-      ctx->channel_group_name->len = 0;
-      ctx->channel_group_name->data = NULL;
-    }
-    else {
-      ngx_http_complex_value(r, cf->channel_group, ctx->channel_group_name);
-    }
-  }
-  
-  return ctx->channel_group_name;
-}
-
-ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_int_t fail_hard) {
-  static const ngx_str_t          NO_CHANNEL_ID_MESSAGE = ngx_string("No channel id provided.");
-  nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  ngx_int_t                       rc;
-  ngx_str_t                      *id = NULL;
-  nchan_complex_value_arr_t      *chid_conf;
-  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  ngx_str_t                      *group = nchan_get_group_name(r, cf, ctx);
-  
-  //validate group
-  if(group->len == 1 && group->data[0]=='m') {
-    nchan_log_request_warning(r, "channel group \"m\" is reserved and cannot be used in a request.");
-    rc = NGX_DECLINED;
-    goto done;
-  }
-  else if(memchr(group->data, '/', group->len)) {
-    nchan_log_request_warning(r, "character \"/\" not allowed in channel group.");
-    rc = NGX_DECLINED;
-    goto done;
-  }
-  
-  chid_conf = what == PUB ? &cf->pub_chid : &cf->sub_chid;
-  if(chid_conf->n == 0) {
-    chid_conf = &cf->pubsub_chid;
-  }
-  
-  if(chid_conf->n > 0) {
-    rc = nchan_process_multi_channel_id(r, chid_conf, cf, &id);
-  }
-  else {
-    //fallback to legacy $push_channel_id
-    rc = nchan_process_legacy_channel_id(r, cf, &id);
-  }
-  
-  if(cf->redis.enabled && id) {
-    // make sure all closing curlybrace '}' are silently and unambiguously replaced by \31
-    // that's because failing to do so will mess up cluster sharding {channel key strings}
-    // it's not pretty, but it _is_ good enough.
-    ngx_str_t id_cur = *id;
-    char     *cur;
-    if(memchr(id_cur.data, '\31', id_cur.len)) {
-      nchan_log_request_warning(r, "character \\31 not allowed in channel id when using Redis.");
-      id = NULL;
-      rc = NGX_DECLINED;
-      goto done;
-    }
-    
-    while((cur = memchr(id_cur.data, '}', id_cur.len)) != NULL) {
-      *cur='\31';
-      id_cur.len -= (cur - (char *)id_cur.data + 1);
-      id_cur.data = (u_char *)cur + 1;
-    }
-  }
-
-done:
-  if(id == NULL && fail_hard) {
-    assert(rc != NGX_OK);
-    switch(rc) {
-      case NGX_ERROR:
-        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
-        break;
-      
-      case NGX_DECLINED:
-        nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
-        break;
-      
-      case NGX_ABORT:
-        nchan_respond_string(r, NGX_HTTP_NOT_FOUND, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, &NO_CHANNEL_ID_MESSAGE, 0);
-        break;
-    }
-    //DBG("%s channel id NULL", what == PUB ? "pub" : "sub");
-  }
-  else {
-    //DBG("%s channel id %V", what == PUB ? "pub" : "sub", id);
-  }
-  
-  return id;
-}
-
-
-ngx_str_t *nchan_get_subscriber_info_response_channel_id(ngx_http_request_t *r, uintptr_t request_id) {
-  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
-  ngx_str_t *chid = ctx->subscriber_info_response_channel_id;
-  if(!chid) {
-    chid = ngx_palloc(r->pool, sizeof(ngx_str_t));
-    if(chid == NULL) {
-      return NULL;
-    }
-    ctx->subscriber_info_response_channel_id = chid;
-    
-    chid->data = ngx_palloc(r->pool, NCHAN_SUBSCRIBER_INFO_CHANNEL_ID_BUFFER_SIZE);
-    if(chid->data == NULL) {
-      ctx->subscriber_info_response_channel_id = NULL;
-      return NULL;
-    }
-  }
-    
-  u_char *end = ngx_snprintf(chid->data, NCHAN_SUBSCRIBER_INFO_CHANNEL_ID_BUFFER_SIZE, "meta/sr%d", (ngx_int_t )request_id);
-  chid->len = end - chid->data;
-  
-  return chid;
-  
-}
diff --git a/debian/modules/nchan/src/util/nchan_channel_id.h b/debian/modules/nchan/src/util/nchan_channel_id.h
deleted file mode 100644
index 0276227..0000000
--- a/debian/modules/nchan/src/util/nchan_channel_id.h
+++ /dev/null
@@ -1,6 +0,0 @@
-ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_int_t fail_hard);
-ngx_int_t nchan_channel_id_is_multi(ngx_str_t *id);
-ngx_str_t *nchan_get_group_name(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
-ngx_str_t nchan_get_group_from_channel_id(ngx_str_t *id);
-
-ngx_str_t *nchan_get_subscriber_info_response_channel_id(ngx_http_request_t *r, uintptr_t request_id);
diff --git a/debian/modules/nchan/src/util/nchan_debug.c b/debian/modules/nchan/src/util/nchan_debug.c
deleted file mode 100644
index 0092c51..0000000
--- a/debian/modules/nchan/src/util/nchan_debug.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "nchan_debug.h"
-#include <assert.h>
-
-#define STRINGIFY_ENUM(val) \
-  case val:                 \
-    return #val;
-
-char *nchan_msg_status_to_cstr(nchan_msg_status_t status) {
-  switch(status) {
-    STRINGIFY_ENUM(MSG_CHANNEL_NOTREADY)
-    STRINGIFY_ENUM(MSG_INVALID)
-    STRINGIFY_ENUM(MSG_PENDING)
-    STRINGIFY_ENUM(MSG_NOTFOUND)
-    STRINGIFY_ENUM(MSG_FOUND)
-    STRINGIFY_ENUM(MSG_EXPECTED)
-    STRINGIFY_ENUM(MSG_EXPIRED)
-    STRINGIFY_ENUM(MSG_ERROR)
-  }
-  return "???";
-}
-
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-
-subscriber_t *subdebug_head = NULL;
-
-void subscriber_debug_add(subscriber_t *sub) {
-  if(subdebug_head == NULL) {
-    sub->dbg_next = NULL;
-    sub->dbg_prev = NULL;
-  }
-  else {
-    sub->dbg_next = subdebug_head;
-    sub->dbg_prev = NULL;
-    assert(subdebug_head->dbg_prev == NULL);
-    subdebug_head->dbg_prev = sub;
-  }
-  if(sub->request) {
-    sub->lbl = ngx_calloc(sub->request->uri.len+1, ngx_cycle->log);
-    ngx_memcpy(sub->lbl, sub->request->uri.data, sub->request->uri.len);
-  }
-  else {
-    sub->lbl = NULL;
-  }
-  
-  subdebug_head = sub;
-}
-void subscriber_debug_remove(subscriber_t *sub) {
-  subscriber_t *prev, *next;
-  prev = sub->dbg_prev;
-  next = sub->dbg_next;
-  if(subdebug_head == sub) {
-    assert(sub->dbg_prev == NULL);
-    if(next) {
-      next->dbg_prev = NULL;
-    }
-    subdebug_head = next;
-  }
-  else {
-    if(prev) {
-      prev->dbg_next = next;
-    }
-    if(next) {
-      next->dbg_prev = prev;
-    }
-  }
-  
-  sub->dbg_next = NULL;
-  sub->dbg_prev = NULL;
-  ngx_free(sub->lbl);
-  sub->lbl = NULL;
-}
-void subscriber_debug_assert_isempty(void) {
-  if(subdebug_head != NULL) {
-    subscriber_t *cur;
-    for(cur = subdebug_head; cur != NULL; cur = cur->dbg_next) {
-      nchan_log_error("  LEFTOVER: %V sub (req. %p (pool %p) cf %p rsv: %d) lbl %s", cur->name, cur->request, cur->request ? cur->request->pool : NULL, cur->cf, cur->reserved, cur->lbl ? cur->lbl : (u_char *)"nolbl");
-    }
-    raise(SIGABRT);
-  }
-}
-#endif
diff --git a/debian/modules/nchan/src/util/nchan_debug.h b/debian/modules/nchan/src/util/nchan_debug.h
deleted file mode 100644
index 640870a..0000000
--- a/debian/modules/nchan/src/util/nchan_debug.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef NCHAN_DEBUG_H
-#define NCHAN_DEBUG_H
-#include <nchan_module.h>
-
-char *nchan_msg_status_to_cstr(nchan_msg_status_t status);
-
-#if NCHAN_SUBSCRIBER_LEAK_DEBUG
-void subscriber_debug_add(subscriber_t *);
-void subscriber_debug_remove(subscriber_t *);
-void subscriber_debug_assert_isempty(void);
-#endif
-
-#endif //NCHAN_DEBUG_H
diff --git a/debian/modules/nchan/src/util/nchan_fake_request.c b/debian/modules/nchan/src/util/nchan_fake_request.c
deleted file mode 100644
index 868a739..0000000
--- a/debian/modules/nchan/src/util/nchan_fake_request.c
+++ /dev/null
@@ -1,524 +0,0 @@
-#include "nchan_fake_request.h"
-#include <util/nchan_subrequest.h>
-#include <assert.h>
-//fake request and connection code adapted from lua-nginx-module by agentzh
-
-static void nchan_close_fake_request(ngx_http_request_t *r);
-static void nchan_close_fake_connection(ngx_connection_t *c);
-
-static ngx_connection_t *nchan_create_fake_connection(ngx_pool_t *pool) {
-  ngx_log_t               *log;
-  ngx_connection_t        *c;
-  ngx_connection_t        *saved_c = NULL;
-  assert(pool);
-
-  /* (we temporarily use a valid fd (0) to make ngx_get_connection happy) */
-  if (ngx_cycle->files) {
-      saved_c = ngx_cycle->files[0];
-  }
-
-  c = ngx_get_connection(0, ngx_cycle->log);
-
-  if (ngx_cycle->files) {
-    ngx_cycle->files[0] = saved_c;
-  }
-
-  if (c == NULL) {
-    return NULL;
-  }
-
-  c->fd = (ngx_socket_t) -1;
-  c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
-
-  c->pool = pool;
-
-  log = ngx_pcalloc(c->pool, sizeof(ngx_log_t));
-  if (log == NULL) {
-      goto failed;
-  }
-
-  c->write->active = 1;
-  
-  c->log = log;
-  c->log->connection = c->number;
-  c->log->action = NULL;
-  c->log->data = NULL;
-  c->log->data = ngx_pcalloc(c->pool, sizeof(ngx_http_log_ctx_t));
-  if(c->log->data == NULL) {
-    goto failed;
-  }
-  c->read->log = log;
-  c->write->log = log;
-#if nginx_version >= 1019009
-  c->read->active = 1;
-#endif  
-  c->log_error = NGX_ERROR_INFO;
-
-  c->error = 0;
-
-  return c;
-
-failed:
-
-  nchan_close_fake_connection(c);
-  return NULL;
-}
-
-static void nchan_close_fake_connection(ngx_connection_t *c) {
-  ngx_pool_t          *pool;
-  ngx_connection_t    *saved_c = NULL;
-
-  ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                  "http close fake http connection %p", c);
-
-  c->destroyed = 1;
-
-  pool = c->pool;
-
-  if (c->read->timer_set) {
-    ngx_del_timer(c->read);
-  }
-
-  if (c->write->timer_set) {
-    ngx_del_timer(c->write);
-  }
-
-  c->read->closed = 1;
-  c->write->active = 0;
-  c->write->closed = 1;
-
-  /* we temporarily use a valid fd (0) to make ngx_free_connection happy */
-
-  c->fd = 0;
-
-  if (ngx_cycle->files) {
-    saved_c = ngx_cycle->files[0];
-  }
-
-  ngx_free_connection(c);
-
-  c->fd = (ngx_socket_t) -1;
-
-  if (ngx_cycle->files) {
-    ngx_cycle->files[0] = saved_c;
-  }
-
-  if (pool) {
-    ngx_destroy_pool(pool);
-  }
-}
-
-static ngx_http_request_t *nchan_new_fake_request(ngx_connection_t *c) {
-  ngx_http_request_t *r = ngx_palloc(c->pool, sizeof(ngx_http_request_t));
-  assert(c->data == NULL);
-  if (r == NULL) {
-    return NULL;
-  }
-
-  c->requests++;
-
-  c->data = r;
-  return r;
-}
-/*
-static ngx_int_t nchan_initialize_fake_request(ngx_http_request_t *r, ngx_connection_t *c) {
-  ngx_memzero(r, sizeof(*r));
-  r->pool = c->pool;
-  assert(c->data == r);
-  
-  #if 0
-  hc = ngx_pcalloc(c->pool, sizeof(ngx_http_connection_t));
-  if (hc == NULL) {
-      goto failed;
-  }
-
-  r->header_in = c->buffer;
-  r->header_end = c->buffer->start;
-
-  if (ngx_list_init(&r->headers_out.headers, r->pool, 0,
-                    sizeof(ngx_table_elt_t))
-      != NGX_OK)
-  {
-      goto failed;
-  }
-
-  if (ngx_list_init(&r->headers_in.headers, r->pool, 0,
-                    sizeof(ngx_table_elt_t))
-      != NGX_OK)
-  {
-      goto failed;
-  }
-#endif
-
-  r->ctx = ngx_pcalloc(c->pool, sizeof(void *) * ngx_http_max_module);
-  if (r->ctx == NULL) {
-      return NGX_ERROR;
-  }
-
-#if 0
-  cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-  r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts
-                              * sizeof(ngx_http_variable_value_t));
-  if (r->variables == NULL) {
-      goto failed;
-  }
-#endif
-  
-  r->connection = c;
-
-  r->headers_in.content_length_n = 0;
-  c->data = r;
-#if 0
-  hc->request = r;
-  r->http_connection = hc;
-#endif
-  r->signature = NGX_HTTP_MODULE;
-  r->main = r;
-  r->count = 1;
-
-  r->method = NGX_HTTP_UNKNOWN;
-
-  r->headers_in.keep_alive_n = -1;
-  r->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
-  r->subrequests = NGX_HTTP_MAX_SUBREQUESTS + 1;
-
-  r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
-  r->discard_body = 1;
-  return NGX_OK;
-}
-*/
-void empty_handler(ngx_http_request_t *r) {
-  //do nothing
-}
-
-ngx_http_request_t *nchan_create_derivative_fake_request(ngx_connection_t *c, ngx_http_request_t *rsrc) {
-  ngx_http_request_t      *fr = nchan_new_fake_request(c);
-  if(fr == NULL) {
-    return NULL;
-  }
-  
-  *fr = *rsrc;
-  fr->read_event_handler = empty_handler;
-  fr->write_event_handler = empty_handler;
-  fr->connection = c;
-  fr->main = fr;
-  fr->pool = c->pool;
-  fr->parent = NULL;
-  fr->cleanup = NULL;
-  fr->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
-  fr->signature = NGX_HTTP_MODULE;
-  fr->count = 1;
-  
-  return fr;
-}
-
-void nchan_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc) {
-  ngx_connection_t          *c;
-#if (NGX_HTTP_SSL)
-  ngx_ssl_conn_t            *ssl_conn;
-#endif
-
-  c = r->connection;
-
-  ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                  "http finalize fake request: %d, a:%d, c:%d",
-                  rc, r == c->data, r->main->count);
-
-  if (rc == NGX_DONE) {
-      nchan_close_fake_request(r);
-      return;
-  }
-
-  if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-
-#if (NGX_HTTP_SSL)
-
-    if (r->connection->ssl) {
-        ssl_conn = r->connection->ssl->connection;
-        if (ssl_conn) {
-          c = ngx_ssl_get_connection(ssl_conn);
-        }
-    }
-
-#endif
-
-    nchan_close_fake_request(r);
-    return;
-  }
-
-  if (c->read->timer_set) {
-    ngx_del_timer(c->read);
-  }
-
-  if (c->write->timer_set) {
-    c->write->delayed = 0;
-    ngx_del_timer(c->write);
-  }
-
-  nchan_close_fake_request(r);
-}
-
-static void nchan_close_fake_request(ngx_http_request_t *r) {
-  ngx_connection_t  *c;
-
-  r = r->main;
-  c = r->connection;
-
-  ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                  "http fake request count:%d", r->count);
-
-  if (r->count == 0) {
-    ngx_log_error(NGX_LOG_ALERT, c->log, 0, "http fake request count is zero");
-  }
-
-  r->count--;
-
-  if (r->count) {
-    return;
-  }
-
-  nchan_free_fake_request(r);
-  nchan_close_fake_connection(c);
-}
-
-void nchan_free_fake_request(ngx_http_request_t *r) {
-  ngx_log_t                 *log;
-  ngx_http_cleanup_t        *cln;
-
-  log = r->connection->log;
-
-  ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "http close fake request");
-
-  if (r->pool == NULL) {
-    ngx_log_error(NGX_LOG_ALERT, log, 0, "http fake request already closed");
-    return;
-  }
-
-  cln = r->cleanup;
-  r->cleanup = NULL;
-
-  while (cln) {
-    if (cln->handler) {
-      cln->handler(cln->data);
-    }
-
-    cln = cln->next;
-  }
-
-  r->request_line.len = 0;
-
-  r->connection->destroyed = 1;
-}
-
-
-
-ngx_int_t nchan_requestmachine_initialize(nchan_requestmachine_t *rm, ngx_http_request_t *template_request) {
-  rm->template_request = template_request;
-  nchan_slist_init(&rm->request_queue, nchan_fakereq_subrequest_data_t, slist.prev, slist.next);
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_requestmachine_run(nchan_requestmachine_t *rm) {
-  nchan_fakereq_subrequest_data_t *head = nchan_slist_first(&rm->request_queue);
-  if(head && !head->running) {
-    head->running = 1;
-    ngx_http_run_posted_requests(head->r->connection);
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t nchan_requestmachine_subrequest_handler(ngx_http_request_t *sr, void *pd, ngx_int_t code) {
-  nchan_fakereq_subrequest_data_t *d = pd;
-  d->running = 0;
-  if(d->rm) {
-    assert(d->rm->request_queue.head == d);
-    if(d->cb) {
-      d->cb(code, sr, d->pd);
-    }
-    if(d->rm) {
-      nchan_slist_remove(&d->rm->request_queue, d);
-      nchan_requestmachine_run(d->rm);
-    }
-  }
-  else if(d->cb) {
-    d->cb(NGX_ABORT, sr, d->pd);
-  }
-  if(!d->manual_cleanup && !d->cleanup_timer.timer_set) {
-    ngx_add_timer(&d->cleanup_timer, 0);
-  }
-  return NGX_OK;
-}
-
-ngx_int_t nchan_requestmachine_request_cleanup_manual(nchan_fakereq_subrequest_data_t *d) {
-  if(!d->cleanup_timer.timer_set) {
-    ngx_add_timer(&d->cleanup_timer, 0);
-  }
-  return NGX_OK;
-}
-
-static void nchan_requestmachine_request_cleanup_on_request_finalize_cln_handler(void *d) {
-  nchan_requestmachine_request_cleanup_manual(d);
-}
-
-ngx_int_t nchan_requestmachine_request_cleanup_on_request_finalize(nchan_fakereq_subrequest_data_t *d, ngx_http_request_t *r) {
-  ngx_http_cleanup_t     *cln = ngx_http_cleanup_add(r, 0);
-  if(cln == NULL) {
-    return NGX_ERROR;
-  }
-  cln->data = d;
-  cln->handler = nchan_requestmachine_request_cleanup_on_request_finalize_cln_handler;
-  return NGX_OK;
-}
-
-static void fakerequest_cleanup_timer_handler(ngx_event_t *ev) {
-  nchan_fakereq_subrequest_data_t *d = ev->data;
-  d->r->main->count--;
-  assert(d->r->main->count == 1);
-  nchan_finalize_fake_request(d->r, NGX_OK);
-}
-
-nchan_fakereq_subrequest_data_t *nchan_requestmachine_request(nchan_requestmachine_t *rm, nchan_requestmachine_request_params_t *params) {
-  nchan_fakereq_subrequest_data_t *d;
-  ngx_pool_t *pool = params->pool;
-  int         created_pool = 0;
-  ngx_str_t url;
-  
-  if(!pool) {
-    if((pool = ngx_create_pool(1024, ngx_cycle->log)) == NULL) {
-      nchan_log_error("failed to create requestmachine pool");
-      return NULL;
-    }
-    created_pool = 1;
-  }
-  
-  if(params->url_complex) {
-    if(ngx_http_complex_value_custom_pool(rm->template_request, params->url.cv, &url, pool) != NGX_OK) {
-      if(created_pool) {
-        ngx_destroy_pool(pool);
-      }
-      nchan_log_error("failed to create subrequest url");
-      return NULL;
-    }
-    params->url.str = &url;
-  }
-  
-  ngx_connection_t            *fc = nchan_create_fake_connection(pool);
-  if(fc == NULL) {
-    if(created_pool) {
-      ngx_destroy_pool(pool);
-    }
-    return NULL;
-  }
-  ngx_http_request_t          *fr = nchan_create_derivative_fake_request(fc, rm->template_request);
-  ngx_http_request_t          *sr;
-  
-  d = ngx_palloc(pool, sizeof(*d));
-  ngx_http_post_subrequest_t  *psr = ngx_pcalloc(pool, sizeof(*psr));
-  if(fr == NULL || d == NULL || psr == NULL) {
-    if(created_pool) {
-      ngx_destroy_pool(pool);
-    }
-    return NULL;
-  }
-  
-  fr->main_conf = rm->template_request->main_conf;
-  fr->srv_conf = rm->template_request->srv_conf;
-  fr->loc_conf = rm->template_request->loc_conf;
-  
-  d->pd = params->pd;
-  d->cb = params->cb;
-  d->running = 0;
-  d->r = fr;
-  d->rm = rm;
-  d->manual_cleanup = params->manual_cleanup;
-  ngx_memzero(&d->cleanup_timer, sizeof(d->cleanup_timer));
-  nchan_init_timer(&d->cleanup_timer, fakerequest_cleanup_timer_handler, d);
-  
-  fr->main->count++; //make sure the fake request doesn't auto-finalize on subrequest completion
-  
-  psr->handler = nchan_requestmachine_subrequest_handler;
-  psr->data = d;
-  
-  ngx_http_subrequest(fr, params->url.str, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
-  if(sr == NULL) {
-    if(created_pool) {
-      ngx_destroy_pool(pool);
-    }
-    return NULL;
-  }
-  d->sr = sr;
-  
-  if((sr->request_body = ngx_pcalloc(pool, sizeof(*sr->request_body))) == NULL) { //dummy request body 
-    if(created_pool) {
-      ngx_destroy_pool(pool);
-    }
-    return NULL;
-  }
-  
-  if(params->body && ngx_buf_size(params->body) > 0) {
-    static ngx_str_t                   POST_REQUEST_STRING = {4, (u_char *)"POST "};
-    size_t                             sz = ngx_buf_size(params->body);;
-    ngx_http_request_body_t           *sr_body = sr->request_body;
-    ngx_chain_t                       *fakebody_chain;
-    ngx_buf_t                         *fakebody_buf;
-    
-    fakebody_chain = ngx_palloc(pool, sizeof(*fakebody_chain));
-    fakebody_buf = ngx_pcalloc(pool, sizeof(*fakebody_buf));
-    sr_body->bufs = fakebody_chain;
-    fakebody_chain->next = NULL;
-    fakebody_chain->buf = fakebody_buf;
-    *fakebody_buf = *params->body;
-    fakebody_buf->last_buf = 1;
-    fakebody_buf->last_in_chain = 1;
-    fakebody_buf->flush = 1;
-    fakebody_buf->memory = 1;
-    
-    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, sr_body, sz);
-  }
-  else {
-    nchan_set_content_length_header(sr, 0);
-  }
-  
-  sr->header_only = params->response_headers_only;
-  
-  sr->args = fr->args;
-  
-  nchan_slist_append(&rm->request_queue, d);
-  
-  nchan_requestmachine_run(rm);
-  return d;
-}
-ngx_int_t nchan_requestmachine_shutdown(nchan_requestmachine_t *rm) {
-  return nchan_requestmachine_abort(rm);
-}
-
-ngx_int_t nchan_requestmachine_abort(nchan_requestmachine_t *rm) {
-  nchan_fakereq_subrequest_data_t *cur;
-  ngx_http_request_t              *r;
-  ngx_http_core_main_conf_t       *cmcf;
-  while((cur = nchan_slist_pop(&rm->request_queue)) != NULL) {
-    cur->rm = NULL; //no requestmachine ref means the machine stopped.
-    r = cur->r;
-    //clear stuff that might be used after the upstream request finishes
-    /*
-    if (ngx_list_init(&r->headers_out.headers, r->pool, 0, sizeof(ngx_table_elt_t)) != NGX_OK) {
-      nchan_log_error("couldn't create headers_out for requestmachine request");
-    }
-    if (ngx_list_init(&r->headers_in.headers, r->pool, 0,sizeof(ngx_table_elt_t)) != NGX_OK) {
-      nchan_log_error("couldn't create headers_in for requestmachine request");
-    }
-    */
-
-    r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
-    if (r->ctx == NULL) {
-      nchan_log_error("couldn't create ctx for requestmachine request");
-    }
-    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-    r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts * sizeof(ngx_http_variable_value_t));
-    if (r->variables == NULL) {
-      nchan_log_error("couldn't create vars for requestmachine request");
-    }
-  }
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/util/nchan_fake_request.h b/debian/modules/nchan/src/util/nchan_fake_request.h
deleted file mode 100644
index eab1de9..0000000
--- a/debian/modules/nchan/src/util/nchan_fake_request.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef NCHAN_FAKE_REQUEST_H
-#define NCHAN_FAKE_REQUEST_H
-
-#include <nchan_module.h>
-#include <util/nchan_slist.h>
-
-ngx_http_request_t *nchan_create_derivative_fake_request(ngx_connection_t *c, ngx_http_request_t *rsrc);
-void nchan_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc);
-void nchan_free_fake_request(ngx_http_request_t *r);
-
-typedef struct nchan_fakereq_subrequest_data_s nchan_fakereq_subrequest_data_t;
-typedef struct nchan_requestmachine_s nchan_requestmachine_t;
-
-struct nchan_fakereq_subrequest_data_s {
-  ngx_http_request_t *r;
-  ngx_http_request_t *sr;
-  void          *pd;
-  callback_pt    cb;
-  nchan_requestmachine_t *rm;
-  ngx_event_t    cleanup_timer;
-  unsigned       manual_cleanup:1;
-  unsigned       running:1;
-  unsigned       aborted:1;
-  struct {
-    nchan_fakereq_subrequest_data_t *prev;
-    nchan_fakereq_subrequest_data_t *next;
-  }              slist;
-};// nchan_fakereq_subrequest_data_t
-
-struct nchan_requestmachine_s {
-  ngx_http_request_t *template_request;
-  nchan_slist_t       request_queue;
-  unsigned            shutdown_when_finished;
-};// nchan_requestmachine_t;
-
-typedef struct {
-  union {
-    ngx_str_t                 *str;
-    ngx_http_complex_value_t  *cv;
-  }                          url;
-  ngx_pool_t                *pool;
-  ngx_buf_t                 *body;
-  
-  callback_pt                cb;
-  void                      *pd;
-  unsigned                   manual_cleanup:1;
-  unsigned                   response_headers_only:1;
-  unsigned                   url_complex:1;
-} nchan_requestmachine_request_params_t;
-
-ngx_int_t nchan_requestmachine_initialize(nchan_requestmachine_t *rm, ngx_http_request_t *template_request);
-nchan_fakereq_subrequest_data_t *nchan_requestmachine_request(nchan_requestmachine_t *rm, nchan_requestmachine_request_params_t *params);
-ngx_int_t nchan_requestmachine_request_cleanup_manual(nchan_fakereq_subrequest_data_t *d);
-ngx_int_t nchan_requestmachine_request_cleanup_on_request_finalize(nchan_fakereq_subrequest_data_t *d, ngx_http_request_t *r);
-ngx_int_t nchan_requestmachine_abort(nchan_requestmachine_t *rm);
-ngx_int_t nchan_requestmachine_shutdown(nchan_requestmachine_t *rm);
-
-#endif //NCHAN_FAKE_REQUEST_H
diff --git a/debian/modules/nchan/src/util/nchan_list.c b/debian/modules/nchan/src/util/nchan_list.c
deleted file mode 100644
index 8368b30..0000000
--- a/debian/modules/nchan/src/util/nchan_list.c
+++ /dev/null
@@ -1,172 +0,0 @@
-#include "nchan_list.h"
-
- /*
-  * Regular boring unoptimized doubly linked list.
-  * Allocates elements from heap.
-  * Should not be used in tight loops.
-  */
-
-ngx_int_t nchan_list_init(nchan_list_t *list, size_t data_sz, char *name) {
-  return nchan_list_pool_init(list, data_sz, 0, name);
-}
-
-ngx_int_t nchan_list_pool_init(nchan_list_t *list, size_t data_sz, size_t pool_sz, char *name) {
-#if NCHAN_LIST_DEBUG
-  list->name = name;
-#endif
-  list->head = NULL;
-  list->tail = NULL;
-  list->data_sz = data_sz;
-  list->n = 0;
-  list->pool = NULL;
-  list->pool_sz = pool_sz;
-  return NGX_OK;
-}
-
-ngx_pool_t *nchan_list_get_pool(nchan_list_t *list) {
-  if(!list->pool && list->pool_sz) {
-    list->pool = ngx_create_pool(list->pool_sz, ngx_cycle->log);
-  }
-  return list->pool;
-}
-
-void *nchan_list_append(nchan_list_t *list) {
- return nchan_list_append_sized(list, list->data_sz);
-}
-
-void *nchan_list_first(nchan_list_t *list) {
-  if(list->head) {
-    return nchan_list_data_from_el(list->head);
-  }
-  else {
-    return NULL;
-  }
-}
-void *nchan_list_last(nchan_list_t *list) {
-  if(list->tail) {
-    return nchan_list_data_from_el(list->tail);
-  }
-  else {
-    return NULL;
-  }
-}
-
-void *nchan_list_prev(void *data) {
-  nchan_list_el_t  *el = nchan_list_el_from_data(data)->prev;
-  return el == NULL ? NULL : nchan_list_data_from_el(el);
-}
-void *nchan_list_next(void *data) {
-  nchan_list_el_t  *el = nchan_list_el_from_data(data)->next;
-  return el == NULL ? NULL : nchan_list_data_from_el(el);
-}
-
-void *nchan_list_append_sized(nchan_list_t *list, size_t sz) {
-  nchan_list_el_t  *el, *tail = list->tail;
-  if(list->pool_sz > 0) {
-    el = ngx_palloc(nchan_list_get_pool(list), sizeof(*el) + sz);
-  }
-  else {
-    el = ngx_alloc(sizeof(*el) + sz, ngx_cycle->log);
-  }
-  if(tail)
-    tail->next = el;
-  
-  el->prev = tail;
-  el->next = NULL;
-  
-  if(!list->head)
-    list->head = el;
-  
-  list->tail = el;
-  list->n++;
-  return (void *)&el[1];
-}
-
-
-void *nchan_list_prepend(nchan_list_t *list) {
-  return nchan_list_prepend_sized(list, list->data_sz);
-}
-
-void *nchan_list_prepend_sized(nchan_list_t *list, size_t sz) {
-nchan_list_el_t  *el, *head = list->head;
-  el = ngx_alloc(sizeof(*el) + sz, ngx_cycle->log);
-  if(head)
-    head->prev = el;
-  
-  el->prev = NULL;
-  el->next = head;
-  
-  list->head = el;
-  
-  if(!list->tail)
-    list->head = el;
-  list->n++;
-  return (void *)&el[1];
-}
-
-ngx_int_t nchan_list_remove(nchan_list_t *list, void *el_data) {
-  
-  nchan_list_el_t  *el = (nchan_list_el_t *)el_data - 1;
-  
-  if(el->prev) 
-    el->prev->next = el->next;
-  
-  if(el->next)
-    el->next->prev = el->prev;
-  
-  if(list->head == el)
-    list->head = el->next;
-  
-  if(list->tail == el)
-    list->tail = el->prev;
-  list->n--;
-  
-  if(list->pool)
-    ngx_pfree(list->pool, el);
-  else
-    ngx_free(el);
-  
-  return NGX_OK;
-}
-
-ngx_int_t nchan_list_empty(nchan_list_t *list) {
-  nchan_list_el_t  *el, *next;
-  if(list->pool) {
-    ngx_destroy_pool(list->pool);
-    list->pool = NULL;
-  }
-  else {
-    for(el = list->head; el != NULL; el = next) {
-      next = el->next;
-      ngx_free(el);
-    }
-  }
-  list->head = NULL;
-  list->tail = NULL;
-  list->n = 0;
-  return NGX_OK;
-}
-
-
-ngx_int_t nchan_list_traverse_and_empty(nchan_list_t *list, void (*cb)(void *data, void *pd), void *pd) {
-  nchan_list_el_t  *head = list->head, *el, *next;
-  ngx_pool_t       *pool = list->pool;
-  
-  list->head = NULL;
-  list->tail = NULL;
-  list->n = 0;
-  list->pool = NULL;
-  
-  for(el = head; el != NULL; el = next) {
-    cb(nchan_list_data_from_el(el), pd);
-    next = el->next;
-    if(!pool) {
-      ngx_free(el);
-    }
-  }
-  
-  if(pool)
-    ngx_destroy_pool(pool);
-  
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/util/nchan_list.h b/debian/modules/nchan/src/util/nchan_list.h
deleted file mode 100644
index 4b590ab..0000000
--- a/debian/modules/nchan/src/util/nchan_list.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef NCHAN_LIST_H
-#define NCHAN_LIST_H
-
-#define NCHAN_LIST_DEBUG 1
-
-#include <nginx.h>
-#include <ngx_http.h>
-
-typedef struct nchan_list_el_s nchan_list_el_t;
-
-struct nchan_list_el_s {
-  nchan_list_el_t  *prev;
-  nchan_list_el_t  *next;
-};
-
-typedef struct {
-#if NCHAN_LIST_DEBUG
-  char            *name;
-#endif
-  nchan_list_el_t *head;
-  nchan_list_el_t *tail;
-  ngx_uint_t       n;
-  size_t           data_sz;
-  ngx_pool_t      *pool;
-  size_t           pool_sz;
-} nchan_list_t;
-
-ngx_int_t nchan_list_init(nchan_list_t *list, size_t data_sz, char *name);
-ngx_int_t nchan_list_pool_init(nchan_list_t *list, size_t data_sz, size_t pool_sz, char *name);
-ngx_pool_t *nchan_list_get_pool(nchan_list_t *list);
-
-void *nchan_list_append(nchan_list_t *list);
-void *nchan_list_prepend(nchan_list_t *list);
-
-void *nchan_list_first(nchan_list_t *list);
-void *nchan_list_last(nchan_list_t *list);
-void *nchan_list_prev(void *data);
-void *nchan_list_next(void *data);
-
-void *nchan_list_prepend_sized(nchan_list_t *list, size_t sz);
-void *nchan_list_append_sized(nchan_list_t *list, size_t sz);
-
-ngx_int_t nchan_list_remove(nchan_list_t *list, void *el_data);
-ngx_int_t nchan_list_empty(nchan_list_t *list);
-ngx_int_t nchan_list_traverse_and_empty(nchan_list_t *list, void (*)(void *data, void *pd), void *pd);
-
-#define nchan_list_el_from_data(el_data) \
-  ((nchan_list_el_t *)el_data - 1)
-#define nchan_list_data_from_el(el) \
-  ((void *)&el[1])
-
-#endif //NCHAN_LIST_H
diff --git a/debian/modules/nchan/src/util/nchan_msg.c b/debian/modules/nchan/src/util/nchan_msg.c
deleted file mode 100644
index c1fe850..0000000
--- a/debian/modules/nchan/src/util/nchan_msg.c
+++ /dev/null
@@ -1,773 +0,0 @@
-#include <nchan_module.h>
-#include <assert.h>
-#include <store/memory/store.h>
-#include <util/shmem.h>
-
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "NCHAN MSG:" fmt, ##args)
-
-#define MSG_REFCOUNT_INVALID -9000
-
-#if NCHAN_MSG_RESERVE_DEBUG  
-static void nchan_msg_reserve_debug(nchan_msg_t *msg, char *lbl) {
-  msg_rsv_dbg_t     *rsv;
-  int shared = msg->storage == NCHAN_MSG_SHARED;
-  
-  if(shared) 
-    shmtx_lock(nchan_store_memory_shmem);  
-  
-  if(shared) 
-    rsv=shm_locked_calloc(nchan_store_memory_shmem, sizeof(*rsv) + ngx_strlen(lbl) + 1, "msgdebug");
-  else
-    rsv=ngx_calloc(sizeof(*rsv) + ngx_strlen(lbl) + 1, ngx_cycle->log);
-    
-  rsv->lbl = (char *)(&rsv[1]);
-  ngx_memcpy(rsv->lbl, lbl, ngx_strlen(lbl));
-  if(msg->rsv == NULL) {
-    msg->rsv = rsv;
-    rsv->prev = NULL;
-    rsv->next = NULL;
-  }
-  else {
-    msg->rsv->prev = rsv;
-    rsv->next = msg->rsv;
-    rsv->prev = NULL;
-    msg->rsv = rsv;
-  }
-  
-  if(shared)
-    shmtx_unlock(nchan_store_memory_shmem);
-}
-
-static void nchan_msg_release_debug(nchan_msg_t *msg, char *lbl) {
-  msg_rsv_dbg_t     *cur, *prev, *next;
-  size_t             sz = ngx_strlen(lbl);
-  ngx_int_t          rsv_found=0;
-  int shared = msg->storage == NCHAN_MSG_SHARED;
-  
-  if(shared)
-    shmtx_lock(nchan_store_memory_shmem);
-  
-  assert(msg->refcount > 0);
-  for(cur = msg->rsv; cur != NULL; cur = cur->next) {
-    if(ngx_memcmp(lbl, cur->lbl, sz) == 0) {
-      prev = cur->prev;
-      next = cur->next;
-      if(prev) {
-        prev->next = next;
-      }
-      if(next) {
-        next->prev = prev;
-      }
-      if(cur == msg->rsv) {
-        msg->rsv = next;
-      }
-      
-      if(shared)
-        shm_locked_free(nchan_store_memory_shmem, cur);
-      else
-        ngx_free(cur);
-      
-      rsv_found = 1;
-      break;
-    }
-  }
-  assert(rsv_found);
-  if(shared)
-    shmtx_unlock(nchan_store_memory_shmem);
-}
-#endif
-
-int msg_refcount_valid(nchan_msg_t *msg) {
-  return msg->refcount >= 0;
-}
-
-int msg_refcount_invalidate_if_zero(nchan_msg_t *msg) {
-  return ngx_atomic_cmp_set((ngx_atomic_uint_t *)&msg->refcount, 0, MSG_REFCOUNT_INVALID);
-}
-void msg_refcount_invalidate(nchan_msg_t *msg) {
-  msg->refcount = MSG_REFCOUNT_INVALID;
-}
-
-
-ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl) {
-  if(msg->parent) {
-    assert(msg->storage != NCHAN_MSG_SHARED);
-    msg->refcount++;
-#if NCHAN_MSG_RESERVE_DEBUG
-    nchan_msg_reserve_debug(msg, lbl);
-#endif
-    return msg_reserve(msg->parent, lbl);
-  }
-  assert(!msg->parent);
-  
-  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, 1);
-  assert(msg->refcount >= 0);
-  if(msg->refcount < 0) {
-    msg->refcount = MSG_REFCOUNT_INVALID;
-    return NGX_ERROR;
-  }
-#if NCHAN_MSG_RESERVE_DEBUG  
-  nchan_msg_reserve_debug(msg, lbl);
-#endif
-
-  //DBG("msg %p reserved (%i) %s", msg, msg->refcount, lbl);
-  return NGX_OK;
-}
-
-ngx_int_t msg_release(nchan_msg_t *msg, char *lbl) {
-  nchan_msg_t    *parent = msg->parent;
-  if(parent) {
-    assert(msg->storage != NCHAN_MSG_SHARED);
-#if NCHAN_MSG_RESERVE_DEBUG
-    nchan_msg_release_debug(msg, lbl);
-#endif
-    msg->refcount--;
-    assert(msg->refcount >= 0);
-    
-    if(msg->refcount == 0) {
-      switch(msg->storage) {
-        case NCHAN_MSG_POOL:
-          //free the id, the rest of the msg will be cleaned with the pool
-          nchan_free_msg_id(&msg->id);
-          break;
-          
-        case NCHAN_MSG_HEAP:
-          nchan_free_msg_id(&msg->id);
-          ngx_free(msg);
-          break;
-          
-        default:
-          break;
-          //do nothing for NCHAN_MSG_STACK. NCHAN_MSG_SHARED should never be seen here.
-      }
-    }
-    return msg_release(parent, lbl);
-  }
-  assert(!parent);
-  
-#if NCHAN_MSG_RESERVE_DEBUG
-  nchan_msg_release_debug(msg, lbl);
-#endif
-  assert(msg->refcount > 0);
-  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, -1);
-  //DBG("msg %p released (%i) %s", msg, msg->refcount, lbl);
-  return NGX_OK;
-}
-
-
-int nchan_msgid_tagcount_match(nchan_msg_id_t *id, int count) {
-  switch(id->time) {
-    case NCHAN_OLDEST_MSGID_TIME:
-    case NCHAN_NEWEST_MSGID_TIME:
-    case NCHAN_NTH_MSGID_TIME:
-      if(id->tagcount == 1 && id->tagactive == 0)
-        return 1;
-      break;
-    default:
-      if(id->tagcount == count && id->tagactive >= 0 && id->tagactive < count)
-        return 1;
-      break;
-  }
-  return 0;
-}
-
-void nchan_expand_msg_id_multi_tag(nchan_msg_id_t *id, uint8_t in_n, uint8_t out_n, int16_t fill) {
-  int16_t v, n = id->tagcount;
-  int16_t *tags = n <= NCHAN_FIXED_MULTITAG_MAX ? id->tag.fixed : id->tag.allocd;
-  uint8_t i;
-  assert(n > in_n && n > out_n);
-  v = tags[in_n];
-  
-  for(i=0; i < n; i++) {
-    tags[i] = (i == out_n) ? v : fill;
-  }
-}
-
-void nchan_expand_tiny_msgid(nchan_msg_tiny_id_t *tinyid, nchan_msg_id_t *id) {
-  id->time = tinyid->time;
-  id->tag.fixed[0]=tinyid->tag;
-  id->tagcount = 1;
-  id->tagactive = 1;
-}
-
-void nchan_shrink_normal_msgid(nchan_msg_id_t *id, nchan_msg_tiny_id_t *tinyid) {
-  assert(id->tagcount <= 1);
-  tinyid->time = id->time;
-  tinyid->tag = id->tag.fixed[0];
-}
-
-ngx_int_t nchan_copy_new_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src) {
-  ngx_memcpy(dst, src, sizeof(*src));
-  if(src->tagcount > NCHAN_FIXED_MULTITAG_MAX) {
-    size_t sz = sizeof(*src->tag.allocd) * src->tagcount;
-    if((dst->tag.allocd = ngx_alloc(sz, ngx_cycle->log)) == NULL) {
-      return NGX_ERROR;
-    }
-    ngx_memcpy(dst->tag.allocd, src->tag.allocd, sz);
-  }
-  return NGX_OK; 
-}
-ngx_int_t nchan_copy_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src, int16_t *largetags) {
-  uint16_t dst_n = dst->tagcount, src_n = src->tagcount;
-  dst->time = src->time;
-  
-  if(dst_n > NCHAN_FIXED_MULTITAG_MAX && dst_n != src_n) {
-    ngx_free(dst->tag.allocd);
-    dst_n = NCHAN_FIXED_MULTITAG_MAX;
-  }
-  
-  dst->tagcount = src->tagcount;
-  dst->tagactive = src->tagactive;
-  
-  if(src_n <= NCHAN_FIXED_MULTITAG_MAX) {
-    dst->tag = src->tag;
-  }
-  else {
-    if(dst_n != src_n) {
-      if(!largetags) {
-        if((largetags = ngx_alloc(sizeof(*largetags) * src_n, ngx_cycle->log)) == NULL) {
-          return NGX_ERROR;
-        }
-      }
-      dst->tag.allocd = largetags;
-    }
-    
-    ngx_memcpy(dst->tag.allocd, src->tag.allocd, sizeof(*src->tag.allocd) * src_n);
-  }
-  return NGX_OK;
-}
-
-ngx_int_t nchan_free_msg_id(nchan_msg_id_t *id) {
-  if(id->tagcount > NCHAN_FIXED_MULTITAG_MAX) {
-    ngx_free(id->tag.allocd);
-    id->tag.allocd = NULL;
-  }
-  return NGX_OK;
-}
-
-static ngx_int_t verify_msg_id(nchan_msg_id_t *id1, nchan_msg_id_t *id2, nchan_msg_id_t *msgid, char **err) {
-  int16_t  *tags1 = id1->tagcount <= NCHAN_FIXED_MULTITAG_MAX ? id1->tag.fixed : id1->tag.allocd;
-  int16_t  *tags2 = id2->tagcount <= NCHAN_FIXED_MULTITAG_MAX ? id2->tag.fixed : id2->tag.allocd;
-  if(id1->time > 0 && id2->time > 0) {
-    if(id1->time != id2->time) {
-      //is this a missed message, or just a multi msg?
-      
-      if(id2->tagcount > 1) {
-        int       i = -1, j, max = id2->tagcount;  
-        int16_t  *msgidtags = msgid->tagcount <= NCHAN_FIXED_MULTITAG_MAX ? msgid->tag.fixed : msgid->tag.allocd;
-        
-        for(j=0; j < max; j++) {
-          if(tags2[j] != -1) {
-            if( i != -1) {
-              *err = "more than one tag set to something besides -1. that means this isn't a single channel's forwarded multi msg";
-              return NGX_ERROR;
-            }
-            else {
-              i = j;
-            }
-          }
-        }
-        if(msgidtags[i] != 0) {
-          *err = "only the first message in a given second is ok. anything else means a missed message.";
-          return NGX_ERROR;
-        }
-        //ok, it's just the first-per-second message of a channel from a multi-channel
-        //this is a rather convoluted description... but basically this is ok.
-        return NGX_OK;
-      }
-      else {
-        *err = "previous message id times don't match";
-        return NGX_ERROR;
-      }
-    }
-    
-    if(id1->tagcount == 1) {
-      if(tags1[0] != tags2[0]){
-        *err = "previous message id tags don't match";
-        return NGX_ERROR;
-      }
-    }
-    else {
-      int   i, max = id1->tagcount;
-      for(i=0; i < max; i++) {
-        if(tags2[i] != -1 && tags1[i] != tags2[i]) {
-          *err = "previous message multitag mismatch";
-          return NGX_ERROR;
-        }
-      }
-    }
-  }
-  return NGX_OK;
-}
-
-void nchan_update_multi_msgid(nchan_msg_id_t *oldid, nchan_msg_id_t *newid, int16_t *largetags) {
-  if(newid->tagcount == 1) {
-    //nice and simple
-    *oldid = *newid;
-  }
-  else {
-    //DBG("======= updating multi_msgid ======");
-    //DBG("======= old: %V", msgid_to_str(oldid));
-    //DBG("======= new: %V", msgid_to_str(newid));
-    uint16_t         newcount = newid->tagcount, oldcount = oldid->tagcount;
-    if(newcount > NCHAN_FIXED_MULTITAG_MAX && oldcount < newcount) {
-      int16_t       *oldtags, *old_largetags = NULL;
-      int            i;
-      size_t         sz = sizeof(*oldid->tag.allocd) * newcount;
-      if(oldcount > NCHAN_FIXED_MULTITAG_MAX) {
-        old_largetags = oldid->tag.allocd;
-        oldtags = old_largetags;
-      }
-      else {
-        oldtags = oldid->tag.fixed;
-      }
-      if(largetags == NULL) {
-        largetags = ngx_alloc(sz, ngx_cycle->log);
-      }
-      oldid->tag.allocd = largetags;
-      for(i=0; i < newcount; i++) {
-        oldid->tag.allocd[i] = (i < oldcount) ? oldtags[i] : -1;
-      }
-      if(old_largetags) {
-        ngx_free(old_largetags);
-      }
-      oldid->tagcount = newcount;
-    }
-    
-    if(oldid->time != newid->time) {
-      nchan_copy_msg_id(oldid, newid, NULL);
-    }
-    else {
-      int i, max = newcount;
-      int16_t  *oldtags = oldcount <= NCHAN_FIXED_MULTITAG_MAX ? oldid->tag.fixed : oldid->tag.allocd;
-      int16_t  *newtags = oldcount <= NCHAN_FIXED_MULTITAG_MAX ? newid->tag.fixed : newid->tag.allocd;
-      
-      assert(max == oldcount);
-      
-      for(i=0; i< max; i++) {
-        
-        //DEBUG CHECK -- REMOVE BEFORE RELEASE
-        if(newid->tagactive == i && newtags[i] != -1 && oldtags[i] != -1) {
-          assert(newtags[i] > oldtags[i]);
-        }
-        
-        
-        if (newtags[i] != -1) {
-          oldtags[i] = newtags[i];
-        }
-      }
-      oldid->tagactive = newid->tagactive;
-    }
-    //DBG("=== updated: %V", msgid_to_str(oldid));
-  }
-}
-
-ngx_int_t update_subscriber_last_msg_id(subscriber_t *sub, nchan_msg_t *msg) {
-  if(msg) {
-    char *err, *huh;
-    if(verify_msg_id(&sub->last_msgid, &msg->prev_id, &msg->id, &err) == NGX_ERROR) {
-      struct timeval    tv;
-      time_t            time;
-      int               ttl = msg->expires - msg->id.time;
-      ngx_gettimeofday(&tv);
-      time = tv.tv_sec;
-      
-      if(sub->last_msgid.time + ttl <= time) {
-        huh = "The message probably expired.";
-      }
-      else {
-        huh = "Try increasing the message buffer length.";
-      }
-      
-      if(sub->type == INTERNAL) {
-        nchan_log_warning("Missed message for internal %V subscriber: %s. %s", sub->name, err, huh);
-      }
-      else {
-        nchan_log_request_warning(sub->request, "Missed message for %V subscriber: %s. %s", sub->name, err, huh);
-      }
-    }
-    
-    nchan_update_multi_msgid(&sub->last_msgid, &msg->id, NULL);
-  }
-  
-  return NGX_OK;
-}
-
-
-
-
-
-
-static ngx_int_t nchan_parse_msg_tag(u_char *first, u_char *last, nchan_msg_id_t *mid, ngx_int_t expected_tag_count) {
-  u_char           *cur = first;
-  u_char            c;
-  int16_t           i = 0;
-  int8_t            sign = 1;
-  int16_t           val = 0;
-  static int16_t    tags[NCHAN_MULTITAG_MAX];
-  int brace_open_total = 0;
-  int brace_close_total = 0;
-  int tagactive = NGX_ERROR;
-  
-  while(first != NULL && last != NULL && cur <= last && i < NCHAN_MULTITAG_MAX) {
-    if(cur == last) {
-      tags[i]=(val == 0 && sign == -1) ? -1 : val * sign; //shorthand "-" for "-1";
-      i++;
-      break;
-    }
-    
-    c = *cur;
-    if(c == '-') {
-      sign = -1;
-    }
-    else if (c >= '0' && c <= '9') {
-      val = 10 * val + (c - '0');
-    }
-    else if (c == '[') {
-      if(++brace_open_total > 1) {
-        return NGX_ERROR;
-      }
-      tagactive = i;
-    }
-    else if (c == ']') {
-      if(++brace_close_total > 1 || brace_open_total - brace_close_total != 0) {
-        return NGX_ERROR;
-      }
-    }
-    else if (c == ',') {
-      tags[i]=(val == 0 && sign == -1) ? -1 : val * sign; //shorthand "-" for "-1"
-      sign=1;
-      val=0;
-      i++;
-    }
-    cur++;
-  }
-  
-  if (i == 0) {
-    mid->tagactive = -1; // No tags, so no active tag
-  }
-  if(tagactive == NGX_ERROR) {
-    if(i==1) {
-      //single message tag, so it's active by defaiult
-      mid->tagactive = 0;
-    }
-    else {
-      //got a multitag with no tag braced as [active]. That's invalid.
-      return NGX_ERROR;
-    }
-  }
-  else {
-    mid->tagactive = tagactive;
-  }
-  
-  // We fill the rest of the tag needed with value '-1'
-  while (i < expected_tag_count) {
-    tags[i] = -1;
-    i++;
-  }
-  
-  mid->tagcount = i;
-  
-  if(i <= NCHAN_FIXED_MULTITAG_MAX) {
-    ngx_memcpy(mid->tag.fixed, tags, sizeof(mid->tag.fixed));
-  }
-  else {
-    mid->tag.allocd = tags;
-  }
-  return NGX_OK;
-}
-
-ngx_int_t nchan_extract_from_multi_msgid(nchan_msg_id_t *src, uint16_t n, nchan_msg_id_t *dst) {
-  uint8_t count = src->tagcount;
-  int16_t *tags;
-  
-  if(src->time == NCHAN_OLDEST_MSGID_TIME || src->time == NCHAN_NEWEST_MSGID_TIME) {
-    dst->time = src->time;
-    dst->tag.fixed[0] = 0;
-    dst->tagcount = 1;
-    dst->tagactive = 0;
-    return NGX_OK;
-  }
-  else if(src->time == NCHAN_NTH_MSGID_TIME) {
-    dst->time = src->time;
-    dst->tag.fixed[0] = src->tag.fixed[0];
-    dst->tagcount = 1;
-    dst->tagactive = 0;
-    return NGX_OK; 
-  }
-  
-  if(n >= count) {
-    ERR("can't extract msgid %i from multi-msg of count %i", n, count);
-    return NGX_ERROR;
-  }
-  tags = (count <= NCHAN_FIXED_MULTITAG_MAX) ? src->tag.fixed : src->tag.allocd;
-  
-  dst->time = src->time;
-  if(tags[n] == -1) {
-    dst->time --;
-    dst->tag.fixed[0] = 32767; //eeeeeh this is bad. but it's good enough.
-  }
-  else {
-    dst->tag.fixed[0] = tags[n];
-  }
-  dst->tagcount = 1;
-  dst->tagactive = 0;
-  
-  return NGX_OK; 
-}
-
-static ngx_str_t *nchan_subscriber_get_etag(ngx_http_request_t * r) {
-#if nginx_version >= 1008000
-  return r->headers_in.if_none_match ? &r->headers_in.if_none_match->value : NULL;
-#else
-  ngx_uint_t                       i;
-  ngx_list_part_t                 *part = &r->headers_in.headers.part;
-  ngx_table_elt_t                 *header= part->elts;
-  for (i = 0;  ; i++) {
-    if (i >= part->nelts) {
-      if (part->next == NULL) {
-        break;
-      }
-      part = part->next;
-      header = part->elts;
-      i = 0;
-    }
-    if (header[i].key.len == NCHAN_HEADER_IF_NONE_MATCH.len
-      && ngx_strncasecmp(header[i].key.data, NCHAN_HEADER_IF_NONE_MATCH.data, header[i].key.len) == 0) {
-      return &header[i].value;
-    }
-  }
-  return NULL;
-#endif
-}
-
-ngx_int_t nchan_parse_compound_msgid(nchan_msg_id_t *id, ngx_str_t *str, ngx_int_t expected_tag_count) {
-  //parse url-unescaped compound msgid
-  u_char       *split, *last;
-  ngx_int_t     time;
-  uint8_t       len;
-  //"<msg_time>:<msg_tag>"
-  last = str->data + str->len;
-  if((split = ngx_strlchr(str->data, last, ':')) != NULL) {
-    len = 1;
-  }
-  else {
-    len = 0; //placate dumb GCC warning
-  }
-  if(split) {
-    time = ngx_atoi(str->data, split - str->data);
-    split += len;
-    if(time != NGX_ERROR) {
-      id->time = time;
-      return nchan_parse_msg_tag(split, last, id, expected_tag_count);
-    }
-    else {
-      return NGX_ERROR;
-    }
-  }
-  return NGX_DECLINED;
-}
-
-
-
-static ngx_int_t set_default_id(nchan_loc_conf_t *cf, nchan_msg_id_t *id) {
-  static nchan_msg_id_t           nth_msg_id = NCHAN_NTH_MSGID;
-  static nchan_msg_id_t           oldest_msg_id = NCHAN_OLDEST_MSGID;
-  static nchan_msg_id_t           newest_msg_id = NCHAN_NEWEST_MSGID;
-  switch(cf->subscriber_first_message) {
-    case 1:
-      *id = oldest_msg_id;
-      break;
-    case 0: 
-      *id = newest_msg_id;
-      break;
-    default:
-      *id = nth_msg_id;
-      id->tag.fixed[0] = cf->subscriber_first_message;
-      break;
-  }
-  return NGX_OK;
-}
-
-nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r) {
-  static nchan_msg_id_t           id = NCHAN_ZERO_MSGID;
-  
-  ngx_str_t                      *if_none_match;
-  nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  int                             i;
-  ngx_int_t                       rc;
-  
-  if_none_match = nchan_subscriber_get_etag(r);
-  
-  if(!cf->msg_in_etag_only && r->headers_in.if_modified_since != NULL) {
-    id.time=ngx_http_parse_time(r->headers_in.if_modified_since->value.data, r->headers_in.if_modified_since->value.len);
-    
-    if(id.time <= 0) { //anything before 1-1-1970 is reserved and treated as no msgid provided
-      set_default_id(cf, &id);
-      return &id;
-    }
-
-    u_char *first = NULL, *last = NULL;
-    if(if_none_match != NULL) {
-      first = if_none_match->data;
-      last = if_none_match->data + if_none_match->len;
-    }
-
-    if(nchan_parse_msg_tag(first, last, &id, ctx->channel_id_count) == NGX_ERROR) {
-      return NULL;
-    }
-
-    return &id;
-  }
-  else if((cf->msg_in_etag_only || r->headers_in.if_modified_since == NULL) && if_none_match) {
-    rc = nchan_parse_compound_msgid(&id, if_none_match, ctx->channel_id_count);
-    if(rc == NGX_OK) {
-      return &id;
-    }
-    else if(rc == NGX_ERROR) {
-      return NULL;
-    }
-  }
-  else {
-    nchan_complex_value_arr_t   *alt_msgid_cv_arr = &cf->last_message_id;
-    u_char                       buf[128];
-    ngx_str_t                    str;
-    int                          n = alt_msgid_cv_arr->n;
-    ngx_int_t                    rc2;
-    
-    str.len = 0;
-    str.data = buf;
-    
-    for(i=0; i < n; i++) {
-      rc = ngx_http_complex_value_noalloc(r, alt_msgid_cv_arr->cv[i], &str, 128);
-      if(str.len > 0 && rc == NGX_OK) {
-        rc2 = nchan_parse_compound_msgid(&id, nchan_urldecode_str(r, &str), ctx->channel_id_count);
-        if(rc2 == NGX_OK) {
-          return &id;
-        }
-        else if(rc2 == NGX_ERROR) {
-          return NULL;
-        }
-      }
-    }
-  }
-  
-  set_default_id(cf, &id);
-  return &id;
-}
-
-
-int8_t nchan_compare_msgid_tags(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
-  uint8_t active = id2->tagactive;
-  int16_t *tags1, *tags2;
-  int16_t t1, t2;
-  
-  tags1 = (id1->tagcount <= NCHAN_FIXED_MULTITAG_MAX) ? id1->tag.fixed : id1->tag.allocd;
-  tags2 = (id2->tagcount <= NCHAN_FIXED_MULTITAG_MAX) ? id2->tag.fixed : id2->tag.allocd;
-  
-  //debugstuff that prevents this function from getting inlined
-  assert(id1->time == id2->time);
-  int i, nonnegs = 0;
-  for (i=0; i < id2->tagcount; i++) {
-    if(tags2[i] >= 0) nonnegs++;
-  }
-  assert(nonnegs == 1);
-  
-  if(id1->time == 0 && id2->time == 0) return 0; //always equal on zero-time
-  
-  t1 = (active < id1->tagcount) ? tags1[active] : -1;
-  t2 = tags2[active];
-  
-  //ERR("Comparing msgids: id1: %V --", msgid_to_str(id1));
-  //ERR("  --- id2: %V --", msgid_to_str(id2));
-  
-  if(t1 < t2){ 
-    //ERR("id1 is smaller. -1");
-    return -1;
-  }
-  if(t1 > t2){
-    //ERR("id1 is larger. 1");
-    return  1;
-  }
-  //ERR("id1 equals id2. 0");
-  return 0;
-}
-
-int8_t nchan_compare_msgids(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
-  assert(id1->tagcount == id2->tagcount);
-  if(id1->time < id2->time) {
-    return -1;
-  }
-  else if(id1->time > id2->time) {
-    return 1;
-  }
-  else {
-    assert(id1->tagcount == id2->tagcount);
-    if(id1->tagcount == 1) {
-      if(id1->tag.fixed[0] < id2->tag.fixed[0]) {
-        return -1;
-      }
-      else if(id1->tag.fixed[0] > id2->tag.fixed[0]) {
-        return 1;
-      }
-      else {
-        return 0;
-      }
-    }
-    else {
-      return nchan_compare_msgid_tags(id1, id2);
-    }
-  }
-}
-
-
-static nchan_msg_t *get_shared_msg(nchan_msg_t *msg) {
-  if(msg->storage == NCHAN_MSG_SHARED) {
-    assert(msg->parent == NULL);
-    return msg;
-  }
-  else {
-    assert(msg->parent);
-    assert(msg->parent->storage == NCHAN_MSG_SHARED);
-    return msg->parent;
-  }
-}
-
-static ngx_inline nchan_msg_t *msg_derive_init(nchan_msg_t *parent, nchan_msg_t *msg, nchan_msg_storage_t storage_type) {
-  nchan_msg_t    *shared = get_shared_msg(parent);
-  if(!msg) { return NULL; }
-  *msg = *shared;
-  msg->id.tagcount=1;
-  msg->parent = shared;
-  msg->storage = storage_type;
-#if NCHAN_MSG_RESERVE_DEBUG
-  msg->rsv = NULL;
-#endif
-  msg->refcount = 0;
-  return msg;
-}
-
-nchan_msg_t *nchan_msg_derive_alloc(nchan_msg_t *parent) {
-  nchan_msg_t *msg = msg_derive_init(parent, ngx_alloc(sizeof(nchan_msg_t), ngx_cycle->log), NCHAN_MSG_HEAP);
-  if(!msg || nchan_copy_new_msg_id(&msg->id, &parent->id) != NGX_OK) {
-    ngx_free(msg);
-    return NULL;
-  }
-  return msg;
-}
-nchan_msg_t *nchan_msg_derive_palloc(nchan_msg_t *parent, ngx_pool_t *pool) {
-  nchan_msg_t *msg = msg_derive_init(parent, ngx_palloc(pool, sizeof(nchan_msg_t)), NCHAN_MSG_POOL);
-  if(!msg || nchan_copy_new_msg_id(&msg->id, &parent->id) != NGX_OK) {
-    return NULL;
-  }
-  return msg;
-}
-nchan_msg_t *nchan_msg_derive_stack(nchan_msg_t *parent, nchan_msg_t *child, int16_t *largetags) {
-  nchan_msg_t *msg = msg_derive_init(parent, child, NCHAN_MSG_STACK);
-  if(!msg || nchan_copy_msg_id(&msg->id, &parent->id, largetags) != NGX_OK) {
-    return NULL;
-  }
-  return msg;
-}
-
diff --git a/debian/modules/nchan/src/util/nchan_msg.h b/debian/modules/nchan/src/util/nchan_msg.h
deleted file mode 100644
index 99d35d8..0000000
--- a/debian/modules/nchan/src/util/nchan_msg.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef NCHAN_MSG_H
-#define NCHAN_MSG_H
-ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl);
-ngx_int_t msg_release(nchan_msg_t *msg, char *lbl);
-int msg_refcount_valid(nchan_msg_t *msg);
-int msg_refcount_invalidate_if_zero(nchan_msg_t *msg);
-void msg_refcount_invalidate(nchan_msg_t *msg);
-
-void nchan_expand_msg_id_multi_tag(nchan_msg_id_t *id, uint8_t in_n, uint8_t out_n, int16_t fill);
-ngx_int_t nchan_copy_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src, int16_t *largetags);
-ngx_int_t nchan_copy_new_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src);
-ngx_int_t nchan_free_msg_id(nchan_msg_id_t *id);
-
-ngx_int_t nchan_parse_compound_msgid(nchan_msg_id_t *id, ngx_str_t *str, ngx_int_t expected_tag_count);
-void nchan_update_multi_msgid(nchan_msg_id_t *oldid, nchan_msg_id_t *newid, int16_t *largetags);
-ngx_int_t update_subscriber_last_msg_id(subscriber_t *sub, nchan_msg_t *msg);
-nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r);
-ngx_int_t nchan_extract_from_multi_msgid(nchan_msg_id_t *src, uint16_t n, nchan_msg_id_t *dst);
-
-int8_t nchan_compare_msgid_tags(nchan_msg_id_t *id1, nchan_msg_id_t *id2);
-int8_t nchan_compare_msgids(nchan_msg_id_t *id1, nchan_msg_id_t *id2);
-
-int nchan_msgid_tagcount_match(nchan_msg_id_t *id, int count);
-
-void nchan_expand_tiny_msgid(nchan_msg_tiny_id_t *tinyid, nchan_msg_id_t *id);
-void nchan_shrink_normal_msgid(nchan_msg_id_t *id, nchan_msg_tiny_id_t *tinyid);
-
-
-nchan_msg_t *nchan_msg_derive_alloc(nchan_msg_t *parent);
-nchan_msg_t *nchan_msg_derive_palloc(nchan_msg_t *parent, ngx_pool_t *pool);
-nchan_msg_t *nchan_msg_derive_stack(nchan_msg_t *parent, nchan_msg_t *child, int16_t *largetags);
-
-
-
-#endif //NCHAN_MSG_H
diff --git a/debian/modules/nchan/src/util/nchan_output.c b/debian/modules/nchan/src/util/nchan_output.c
deleted file mode 100644
index 1f62028..0000000
--- a/debian/modules/nchan/src/util/nchan_output.c
+++ /dev/null
@@ -1,670 +0,0 @@
-#include <ngx_http.h>
-#include <nchan_module.h>
-#include "nchan_output.h"
-#include <util/nchan_thingcache.h>
-#include <util/nchan_bufchainpool.h>
-#include <store/memory/store.h>
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "OUTPUT:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "OUTPUT:" fmt, ##arg)
-
-#define REQUEST_PCALLOC(r, what) what = ngx_pcalloc((r)->pool, sizeof(*(what)))
-#define REQUEST_PALLOC(r, what) what = ngx_palloc((r)->pool, sizeof(*(what)))
-
-//file descriptor cache
-static void *fd_cache = NULL;
-
-static void *fd_open(ngx_str_t *filename) {
-  static u_char   fn_buf[512];
-  u_char         *fname, *last;
-  ngx_fd_t        fd;
-  off_t           len = filename->len;
-  last = filename->data + len;
-  if(*last == '\0' || (len > 0 && *(last - 1) == '\0')) {
-    fname = filename->data;
-  }
-  else if(filename->len < 512) {
-    DBG("non-null-terminated filename. gotta copy.");
-    ngx_memcpy(&fn_buf, filename->data, filename->len);
-    fn_buf[filename->len]='\0';
-    fname = fn_buf;
-  }
-  else{
-    DBG("filaname too long: %V", filename);
-    return (void *)NGX_INVALID_FILE;
-  }
-  if(fname == NULL) {
-    //static analyzer pointed this out. This is a damn unlikely condition, but
-    //ALL HAIL CLANG'S STATIC ANALYZER
-    return (void *)NGX_INVALID_FILE;
-  }
-  
-  
-  fd = ngx_open_file(fname, NGX_FILE_RDONLY, NGX_FILE_OPEN, NGX_FILE_OWNER_ACCESS);
-  return (void *)(uintptr_t)fd;
-}
-
-static ngx_int_t fd_close(ngx_str_t *id, void *fdv) {
-  ngx_fd_t     fd = (ngx_fd_t )(uintptr_t )fdv;
-  
-  DBG("fdcache close fd %i", fd);
-  
-  ngx_close_file(fd);
-  return 1;
-}
-
-ngx_fd_t nchan_fdcache_get(ngx_str_t *filename) {
-  ngx_fd_t    fd;
-  fd = (ngx_fd_t)(uintptr_t )nchan_thingcache_get(fd_cache, filename);
-  DBG("fdcache fd %i", fd);
-  return fd;
-}
-
-ngx_int_t nchan_msg_buf_open_fd_if_needed(ngx_buf_t *buf, ngx_file_t *file, ngx_http_request_t *r) {
-  if(buf->in_file) {
-    //open file fd if necessary
-    if(!file) {
-      if(r) {
-        if((file = ngx_pcalloc(r->pool, sizeof(*file))) == NULL) {
-          ERR("couldn't allocate memory for file struct while responding with msg");
-          return NGX_ERROR;
-        }
-      }
-      else {
-        //no file given, can't allocate from NULL pool
-        return NGX_ERROR;
-      }
-    }
-    
-    ngx_memcpy(file, buf->file, sizeof(*file));
-    if(file->fd == NGX_INVALID_FILE) {
-      file->fd = nchan_fdcache_get(&file->name);
-      if(file->fd == NGX_INVALID_FILE) {
-        ERR("can't create output chain, file in buffer won't open");
-        return NGX_ERROR;
-      }
-    }
-    buf->file = file;
-  }
-  return NGX_OK;
-}
-
-
-void nchan_output_init(void) {
-  fd_cache = nchan_thingcache_init("fd_cache", fd_open, fd_close, 5);
-  
-}
-
-void nchan_output_shutdown(void) {
-  nchan_thingcache_shutdown(fd_cache);
-}
-
-typedef struct rsvmsg_queue_s rsvmsg_queue_t;
-struct rsvmsg_queue_s {
-  nchan_msg_t                  *msg;
-  rsvmsg_queue_t               *prev;
-  rsvmsg_queue_t               *next;
-};
-
-static void *rsvmsg_queue_palloc(void *pd) {
-  return ngx_palloc(((ngx_http_request_t *)pd)->pool, sizeof(rsvmsg_queue_t));
-}
-
-static ngx_int_t rsvmsg_queue_release(void *pd, void *thing) {
-  //ERR("release msg %p", ((rsvmsg_queue_t *)thing)->msg);
-  msg_release(((rsvmsg_queue_t *)thing)->msg, "output reservation");
-  return NGX_OK;
-}
-
-static void nchan_push_release_entire_message_queue(nchan_request_ctx_t *ctx) {
-  if(ctx->reserved_msg_queue) {
-    nchan_reuse_queue_flush(ctx->reserved_msg_queue);
-  }
-}
-
-static void nchan_reserve_msg_cleanup(void *pd) {
-  nchan_push_release_entire_message_queue((nchan_request_ctx_t *)pd);
-}
-
-static void nchan_output_reserve_message_queue(ngx_http_request_t *r, nchan_msg_t *msg) {
-  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  ngx_http_cleanup_t   *cln;
-  
-  if(msg->storage != NCHAN_MSG_SHARED) {
-    if((msg = nchan_msg_derive_alloc(msg)) == NULL) {
-      ERR("Coudln't alloc derived msg for output_reserve_message_queue");
-      return;
-    }
-  }
-  
-  if(!ctx->reserved_msg_queue) {
-    if((ctx->reserved_msg_queue = ngx_palloc(r->pool, sizeof(*ctx->reserved_msg_queue))) == NULL) {
-      ERR("Coudln't palloc reserved_msg_queue");
-      return;
-    }
-    nchan_reuse_queue_init(ctx->reserved_msg_queue, offsetof(rsvmsg_queue_t, prev), offsetof(rsvmsg_queue_t, next), rsvmsg_queue_palloc, rsvmsg_queue_release, r);
-    
-    if((cln = ngx_http_cleanup_add(r, 0)) == NULL) {
-      ERR("Unable to add request cleanup for reserved_msg_queue queue");
-      assert(0);
-      return;
-    }
-    
-    cln->data = ctx;
-    cln->handler = nchan_reserve_msg_cleanup;
-  }
-  
-  rsvmsg_queue_t   *qmsg = nchan_reuse_queue_push(ctx->reserved_msg_queue);
-  qmsg->msg = msg;
-  msg_reserve(msg, "output reservation");
-}
-
-//general request-output functions and the iraq and the asian countries and dated references and the, uh, such
-
-void nchan_flush_pending_output(ngx_http_request_t *r) {
-  int                        rc;
-  ngx_event_t               *wev;
-  ngx_connection_t          *c;
-  ngx_http_core_loc_conf_t  *clcf;
-  
-  c = r->connection;
-  wev = c->write;
-  
-  //ngx_log_debug2(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer handler: \"%V?%V\"", &r->uri, &r->args);
-
-  clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
-
-  if (wev->timedout) {
-    if (!wev->delayed) {
-      ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "request timed out");
-      c->timedout = 1;
-      nchan_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
-      return;
-    }
-    wev->timedout = 0;
-    wev->delayed = 0;
-
-    if (!wev->ready) {
-      ngx_add_timer(wev, clcf->send_timeout);
-      if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-        nchan_http_finalize_request(r, 0);
-      }
-      return;
-    }
-  }
-  
-  if (wev->delayed || r->aio) {
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer delayed");
-    if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-      nchan_http_finalize_request(r, 0);
-    }
-    return;
-  }
-  
-  rc = nchan_output_filter(r, NULL);
-
-  //ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, "http writer output filter: %d, \"%V?%V\"", rc, &r->uri, &r->args);
-
-  if (rc == NGX_ERROR) {
-    nchan_http_finalize_request(r, rc);
-    return;
-  }
-
-  if (r->buffered || r->postponed || (r == r->main && c->buffered)) {
-    if (!wev->delayed) {
-      ngx_add_timer(wev, clcf->send_timeout);
-    }
-    if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
-      nchan_http_finalize_request(r, 0);
-      return;
-    }
-  }
-  //ngx_log_debug2(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer done: \"%V?%V\"", &r->uri, &r->args);
-  if(r->out == NULL) {
-    r->write_event_handler = ngx_http_request_empty_handler;
-  }
-}
-
-static void flush_all_the_reserved_things(nchan_request_ctx_t *ctx) {
-  nchan_push_release_entire_message_queue(ctx);
-  if(ctx->bcp) {
-    nchan_bufchain_pool_flush(ctx->bcp);
-  }
-  if(ctx->output_str_queue) {
-    nchan_reuse_queue_flush(ctx->output_str_queue);
-  }
-}
-
-static ngx_int_t nchan_output_filter_generic(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in) {
-/* from push stream module, written by
- * Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
- * thanks, guys!
- * modified to fit the needs of websockets and eventsources and multipartses and so on
-*/
-  ngx_http_core_loc_conf_t               *clcf;
-  ngx_int_t                               rc;
-  ngx_event_t                            *wev;
-  ngx_connection_t                       *c;
-  nchan_request_ctx_t                    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
-  c = r->connection;
-  wev = c->write;
-
-  if(ctx && ctx->bcp) {
-    nchan_bufchain_pool_refresh_files(ctx->bcp);
-  }
-  
-  rc = ngx_http_output_filter(r, in);
-  //ERR("outpuit filter plz");
-
-  if (c->buffered & NGX_HTTP_LOWLEVEL_BUFFERED) {
-    //ERR("what's the deal with this NGX_HTTP_LOWLEVEL_BUFFERED thing?");
-    clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
-    r->write_event_handler = nchan_flush_pending_output;
-    if(msg) {
-      nchan_output_reserve_message_queue(r, msg);
-    }
-    if (!wev->delayed) {
-      //ERR("delay output by %ims", clcf->send_timeout);
-      ngx_add_timer(wev, clcf->send_timeout);
-    }
-    if ((ngx_handle_write_event(wev, clcf->send_lowat)) != NGX_OK) {
-      if(ctx) {
-        flush_all_the_reserved_things(ctx);
-      }
-      return NGX_ERROR;
-    }
-    return NGX_OK;
-  } 
-  else {
-    if (wev->timer_set) {
-      //ERR("nevermind timer");
-      ngx_del_timer(wev);
-    }
-  }
-  
-  if(r->out == NULL) {
-    if(ctx) {
-      flush_all_the_reserved_things(ctx);
-    }
-  }
-  
-  return rc;
-}
-
-ngx_int_t nchan_output_filter(ngx_http_request_t *r, ngx_chain_t *in) {
-  return nchan_output_filter_generic(r, NULL, in);
-}
-ngx_int_t nchan_output_msg_filter(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in) {
-  return nchan_output_filter_generic(r, msg, in);
-}
-
-void nchan_include_access_control_if_needed(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
-  ngx_str_t          *origin;
-  ngx_str_t          *allow_origin_val;
-  static ngx_str_t    true_string = ngx_string("true");
-  nchan_loc_conf_t   *cf;
-  if(!ctx) {
-    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  }
-  if(!ctx) {
-    return;
-  }
-  
-  if((origin = nchan_get_header_value_origin(r, ctx)) != NULL) {
-    cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-    
-    if(cf->allow_credentials) {
-      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS, &true_string);
-    }
-    allow_origin_val = nchan_get_allow_origin_value(r, cf, ctx);
-    if(allow_origin_val && allow_origin_val->len == 1 && allow_origin_val->data[0]=='*') {
-      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, allow_origin_val);
-    }
-    else { //otherwise echo the origin
-      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, origin);
-    }
-  }
-}
-
-ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body, ngx_int_t finalize) {
-  ngx_int_t    rc = NGX_OK;
-  r->headers_out.status=status_code;
-  if(status_line!=NULL) {
-    r->headers_out.status_line.len =status_line->len;
-    r->headers_out.status_line.data=status_line->data;
-  }
-  if(status_body == NULL) {
-    r->headers_out.content_length_n = 0;
-    r->header_only = 1;
-  }
-  
-  nchan_include_access_control_if_needed(r, NULL);
-  
-  rc= ngx_http_send_header(r);
-  if(status_body) {
-    rc = ngx_http_output_filter(r, status_body);
-  }
-  if(finalize) {
-    nchan_http_finalize_request(r, rc);
-  }
-  return rc;
-}
-
-ngx_int_t nchan_respond_cstring(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, char *body, ngx_int_t finalize) {
-  ngx_str_t str;
-  str.data = (u_char *)body;
-  str.len=strlen(body);
-  return nchan_respond_string(r, status_code, content_type, &str, finalize);
-}
-
-ngx_int_t nchan_respond_sprintf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_int_t finalize, char *fmt, ...) {
-  u_char *p;
-  ngx_str_t str;
-  va_list   args;
-    
-  str.len = 1024;
-  str.data = ngx_palloc(r->pool, 1024);
-  if(str.data == NULL) {
-    return nchan_respond_status(r, status_code, NULL, NULL, finalize);
-    return NGX_ERROR;
-  }
-
-  va_start(args, fmt);
-  p = ngx_vslprintf(str.data, str.data + str.len, fmt, args);
-  va_end(args);
-  
-  str.len = p - str.data;
-  return nchan_respond_string(r, status_code, content_type, &str, finalize);
-}
-
-ngx_int_t nchan_respond_membuf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, ngx_buf_t *body, ngx_int_t finalize) {
-  ngx_str_t str;
-  str.len = ngx_buf_size(body);
-  str.data = body->start;
-  return nchan_respond_string(r, status_code, content_type, &str, finalize);
-}
-/*
-static size_t etag_maxlen(nchan_msg_id_t *id) {
-  return 7 * id->multi_count;
-}
-*/
-
-
-static ngx_str_t msgtag_str;
-static char msgtag_str_buf[10*255 + 30];
-
-size_t msgtag_to_strptr(nchan_msg_id_t *id, char *ch) {
-
-  uint8_t   max = id->tagcount;
-  int16_t  *t = max <= NCHAN_FIXED_MULTITAG_MAX ? id->tag.fixed : id->tag.allocd;
-  
-  uint8_t   i;
-  char     *cur;
-  
-  static char* inactive="%i,";
-  static char*  active="[%i],";
-  if(max == 1) {
-    return sprintf(ch, "%i", t[0]);
-  }
-  else {
-    cur = ch;
-    for(i=0; i < max; i++) {
-      
-      assert(t[i] >= -2);
-      
-      if(t[i] != -1) {
-        cur += sprintf(cur, id->tagactive != i ? inactive : active, t[i]);
-      }
-      else { //shorthand
-        assert(id->tagactive != i);
-        *cur++='-';
-        *cur++=',';
-      }
-    }
-    cur[-1]='\0';
-    return cur - ch - 1;
-  }  
-}
-
-ngx_str_t *msgtag_to_str(nchan_msg_id_t *id) {
-  size_t len;
-  len = msgtag_to_strptr(id, msgtag_str_buf);
-  msgtag_str.len = len;
-  msgtag_str.data = (u_char *)msgtag_str_buf;
-  return &msgtag_str;
-}
-
-ngx_str_t *msgid_to_str(nchan_msg_id_t *id) {
-  int   l1, l2;
-  char *cur;
-  l1 = sprintf(msgtag_str_buf, "%li:", id->time);
-  cur = &msgtag_str_buf[l1];
-  l2 = msgtag_to_strptr(id, cur);
-  msgtag_str.len = l1 + l2;
-  msgtag_str.data = (u_char *)msgtag_str_buf;
-  return &msgtag_str;
-}
-
-ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid) {
-  ngx_str_t                 *etag, *tmp_etag;
-  nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  int8_t                     output_etag = 1;
-  ngx_str_t                 *origin_header;
-  
-  if(!ctx) {
-    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  }
-  origin_header = ctx ? nchan_get_header_value_origin(r, ctx) : NULL; 
-
-  if(!cf->msg_in_etag_only) {
-    //last-modified
-    if(msgid->time > 0) {
-      r->headers_out.last_modified_time = msgid->time;
-    }
-    else {
-      output_etag = 0;
-    }
-    tmp_etag = msgtag_to_str(msgid);
-  }
-  else {
-    tmp_etag = msgid_to_str(msgid);
-  }
-  
-  if((etag = ngx_palloc(r->pool, sizeof(*etag) + tmp_etag->len))==NULL) {
-    return NGX_ERROR;
-  }
-  etag->data = (u_char *)(etag+1);
-  etag->len = tmp_etag->len;
-  ngx_memcpy(etag->data, tmp_etag->data, tmp_etag->len);
-
-  if(cf->custom_msgtag_header.len == 0) {
-    if(output_etag) {
-      nchan_add_response_header(r, &NCHAN_HEADER_ETAG, etag);
-    }
-    if(origin_header) {
-      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS, &NCHAN_MSG_RESPONSE_ALLOWED_HEADERS);
-    }
-  }
-  else {
-    if(output_etag) {
-      nchan_add_response_header(r, &cf->custom_msgtag_header, etag);
-    }
-    if(origin_header) {
-      u_char        *cur = ngx_palloc(r->pool, 255);
-      if(cur == NULL) {
-        return NGX_ERROR;
-      }
-      ngx_str_t      allowed;
-      allowed.data = cur;
-      cur = ngx_snprintf(cur, 255, NCHAN_MSG_RESPONSE_ALLOWED_CUSTOM_ETAG_HEADERS_STRF, &cf->custom_msgtag_header);
-      allowed.len = cur - allowed.data;
-      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS, &allowed);
-     }
-  }
-  
-  //Vary header needed for proper HTTP caching.
-  nchan_add_response_header(r, &NCHAN_HEADER_VARY, &NCHAN_VARY_HEADER_VALUE);
-  return NGX_OK;
-}
-
-ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_id_t *msgid, ngx_int_t finalize, char **err) {
-  ngx_buf_t                 *buffer = &msg->buf;
-  nchan_buf_and_chain_t     *cb;
-  ngx_int_t                  rc;
-  ngx_chain_t               *rchain = NULL;
-  ngx_buf_t                 *rbuffer;
-  nchan_request_ctx_t       *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
-  if(ngx_buf_size(buffer) > 0) {
-    cb = ngx_palloc(r->pool, sizeof(*cb));
-    if (!cb) {
-      if(err) *err = "couldn't allocate memory for buf-and-chain while responding with msg";
-      return NGX_ERROR;
-    }
-    rchain = &cb->chain;
-    rbuffer = &cb->buf;
-    
-    rchain->next = NULL;
-    rchain->buf = rbuffer;
-    
-    ngx_memcpy(rbuffer, buffer, sizeof(*buffer));
-    nchan_msg_buf_open_fd_if_needed(rbuffer, NULL, r);
-    
-    r->headers_out.content_length_n=ngx_buf_size(rbuffer);
-  }
-  else {
-    r->headers_out.content_length_n = 0;
-    r->header_only = 1;
-  }
-
-  if (msg->content_type) {
-    r->headers_out.content_type = *msg->content_type;
-  }
-  
-  if(msgid == NULL) {
-    msgid = &msg->id;
-  }
-  
-  if(nchan_set_msgid_http_response_headers(r, ctx, msgid) != NGX_OK) {
-    if(err) *err = "can't set msgid headers";
-    return NGX_ERROR;
-  }
-  
-  r->headers_out.status=NGX_HTTP_OK;
-  
-  nchan_include_access_control_if_needed(r, ctx);
-  
-  //we know the entity length, and we're using just one buffer. so no chunking please.
-  if((rc = ngx_http_send_header(r)) >= NGX_HTTP_SPECIAL_RESPONSE) {
-    ERR("request %p, send_header response %i", r, rc);
-    if(err) *err="WTF just happened to request?";
-    return NGX_ERROR;
-  }
-  
-  if(rchain) {
-    rc= nchan_output_filter(r, rchain);
-    if(rc != NGX_OK && err) *err="failed to write data to connection socket, probably because the connection got closed";
-  }
-  
-  if(finalize) {
-    nchan_http_finalize_request(r, rc);
-  }
-  return rc;
-}
-
-ngx_int_t nchan_respond_string(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_str_t *body, ngx_int_t finalize) {
-  ngx_int_t    rc = NGX_OK;
-  ngx_buf_t   *b = REQUEST_PCALLOC(r, b);
-  ngx_chain_t *chain = REQUEST_PALLOC(r, chain);
-  
-  //assume both were alloc'd fine
-  
-  r->headers_out.status=status_code;
-  r->headers_out.content_length_n = body->len;
-  
-  if(content_type) {
-    r->headers_out.content_type.len = content_type->len;
-    r->headers_out.content_type.data = content_type->data;
-  }
-  
-  nchan_include_access_control_if_needed(r, NULL);
-  
-  if ((!b) || (!chain)) {
-    ERR("Couldn't allocate ngx buf or chain.");
-    r->headers_out.status=NGX_HTTP_INTERNAL_SERVER_ERROR;
-    r->headers_out.content_length_n = 0;
-    r->header_only = 1;
-    ngx_http_send_header(r);
-    rc=NGX_ERROR;
-  }
-  else {
-    chain->buf=b;
-    chain->next=NULL;
-    
-    b->last_buf = 1;
-    b->last_in_chain = 1;
-    b->flush = 1; //flush just to be sure, although I should perhaps rethink this
-    b->memory = 1;
-    b->start = body->data;
-    b->pos = body->data;
-    b->end = body->data + body->len;
-    b->last = b->end;
-    
-    if ((rc = ngx_http_send_header(r)) == NGX_OK) {
-      rc= nchan_output_filter(r, chain);
-    }
-  }
-  
-  if(finalize) {
-    nchan_http_finalize_request(r, rc);
-  }
-  return rc;
-}
-
-ngx_table_elt_t * nchan_add_response_header(ngx_http_request_t *r, const ngx_str_t *header_name, const ngx_str_t *header_value) {
-  ngx_table_elt_t                *h = ngx_list_push(&r->headers_out.headers);
-  if (h == NULL) {
-    return NULL;
-  }
-  h->hash = 1;
-  h->key.len = header_name->len;
-  h->key.data = header_name->data;
-  if(header_value) {
-    h->value.len = header_value->len;
-    h->value.data = header_value->data;
-  }
-  else {
-    h->value.len = 0;
-    h->value.data = NULL;
-  }
-  return h;
-}
-
-ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods) {
-  nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  
-  nchan_add_response_header(r, &NCHAN_HEADER_ALLOW, allowed_methods);
-  
-  if(ctx && nchan_get_header_value_origin(r, ctx)) {
-    //Access-Control-Allow-Origin is included later
-    nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS, allowed_headers);
-    nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS, allowed_methods);
-  }
-  return nchan_respond_status(r, NGX_HTTP_OK, NULL, NULL, 0);
-}
-
-void nchan_http_finalize_request(ngx_http_request_t *r, ngx_int_t code) {
-  if(r->connection && r->connection->write->error) {
-    r->write_event_handler = NULL;
-    //this will close the connection when request is finalized
-    ngx_http_finalize_request(r, NGX_ERROR);
-  }
-  else {
-    ngx_http_finalize_request(r, code);
-  }
-}
diff --git a/debian/modules/nchan/src/util/nchan_output.h b/debian/modules/nchan/src/util/nchan_output.h
deleted file mode 100644
index d465de8..0000000
--- a/debian/modules/nchan/src/util/nchan_output.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <nchan_defs.h>
-#include <nchan_types.h>
-
-void nchan_output_init(void);
-void nchan_output_shutdown(void);
-
-ngx_int_t nchan_output_filter(ngx_http_request_t *r, ngx_chain_t *in);
-ngx_int_t nchan_output_msg_filter(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in);
-
-ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *body, ngx_int_t finalize);
-ngx_int_t nchan_respond_string(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_str_t *body, ngx_int_t finalize);
-ngx_int_t nchan_respond_sprintf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_int_t finalize, char *fmt, ...);
-ngx_int_t nchan_respond_cstring(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, char *body, ngx_int_t finalize);
-ngx_int_t nchan_respond_membuf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, ngx_buf_t *body, ngx_int_t finalize);
-ngx_table_elt_t * nchan_add_response_header(ngx_http_request_t *r, const ngx_str_t *header_name, const ngx_str_t *header_value);
-ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
-ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods);
-ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_id_t *msgid, ngx_int_t finalize, char **err);
-void nchan_include_access_control_if_needed(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
-void nchan_flush_pending_output(ngx_http_request_t *r);
-
-void nchan_http_finalize_request(ngx_http_request_t *r, ngx_int_t code);
-
-ngx_fd_t nchan_fdcache_get(ngx_str_t *filename);
-
-ngx_int_t nchan_msg_buf_open_fd_if_needed(ngx_buf_t *buf, ngx_file_t *file, ngx_http_request_t *r);
-
-ngx_str_t *msgtag_to_str(nchan_msg_id_t *id);
-ngx_str_t *msgid_to_str(nchan_msg_id_t *id);
-size_t msgtag_to_strptr(nchan_msg_id_t *id, char *ch);
diff --git a/debian/modules/nchan/src/util/nchan_output_info.c b/debian/modules/nchan/src/util/nchan_output_info.c
deleted file mode 100644
index 217af88..0000000
--- a/debian/modules/nchan/src/util/nchan_output_info.c
+++ /dev/null
@@ -1,284 +0,0 @@
-#include <nchan_module.h>
-
-typedef struct {
-  ngx_str_t            subtype;
-  nchan_content_type_t ct;
-} nchan_content_subtype_t;
-
-nchan_content_type_t nchan_output_info_type(ngx_str_t *accept) {
-  nchan_content_subtype_t subtypes[] = {
-    { ngx_string("plain"),    NCHAN_CONTENT_TYPE_PLAIN },
-    { ngx_string("json"),     NCHAN_CONTENT_TYPE_JSON },
-    { ngx_string("x-json"),   NCHAN_CONTENT_TYPE_JSON },
-    { ngx_string("yaml"),     NCHAN_CONTENT_TYPE_YAML },
-    { ngx_string("x-yaml"),   NCHAN_CONTENT_TYPE_YAML },
-    { ngx_string("xml"),      NCHAN_CONTENT_TYPE_XML }
-  };
-  
-  ngx_str_t  text_ = ngx_string("text/");
-  ngx_str_t  application_ = ngx_string("application/");
-  
-  if(!accept) {
-    return NCHAN_CONTENT_TYPE_PLAIN;
-  }
-  
-  unsigned i;
-  size_t len;
-  u_char *cur, *last, *curend;
-  
-  for(cur = accept->data, last = accept->data + accept->len; cur < last; cur = curend) {
-    if((curend = memchr(cur, ',', last - cur)) != NULL) {
-      curend++;
-    }
-    else {
-      curend = last;
-    }
-    
-    if(nchan_strscanstr(&cur, &text_, curend) || nchan_strscanstr(&cur, &application_, curend)) {
-      len = curend - cur;
-      for(i=0; i<(sizeof(subtypes)/sizeof(nchan_content_subtype_t)); i++) {
-        if(len >= subtypes[i].subtype.len && ngx_memcmp(cur, subtypes[i].subtype.data, subtypes[i].subtype.len) == 0) {
-          return subtypes[i].ct;
-        }
-      }
-    }
-    else {
-      continue;
-    }
-  }
-  
-  return NCHAN_CONTENT_TYPE_PLAIN;
-}
-
-#define NCHAN_CHANNEL_INFO_MAX_LEN 512
-ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type) {
-  static ngx_buf_t                channel_info_buf;
-  static u_char                   channel_info_buf_str[NCHAN_CHANNEL_INFO_MAX_LEN]; //big enough
-  
-  ngx_buf_t                      *b = &channel_info_buf;
-  ngx_uint_t                      len;
-  const ngx_str_t                *format;
-  time_t                          time_elapsed = ngx_time() - last_seen;
-  static nchan_msg_id_t           zero_msgid = NCHAN_ZERO_MSGID;
-  nchan_content_type_t            ct;
-  
-  static struct {
-    ngx_str_t        content_type;
-    const ngx_str_t *format_string;
-  } content_type_map[] = {
-    [NCHAN_CONTENT_TYPE_PLAIN]    = { ngx_string("text/plain"), &NCHAN_CHANNEL_INFO_PLAIN }, 
-    [NCHAN_CONTENT_TYPE_JSON]     = { ngx_string("text/json"), &NCHAN_CHANNEL_INFO_JSON },
-    [NCHAN_CONTENT_TYPE_YAML]     = { ngx_string("text/yaml"), &NCHAN_CHANNEL_INFO_YAML },
-    [NCHAN_CONTENT_TYPE_XML]      = { ngx_string("text/xml"), &NCHAN_CHANNEL_INFO_XML }
-  };
-  
-  if(!last_msgid) {
-    last_msgid = &zero_msgid;
-  }
- 
-  b->start = channel_info_buf_str;
-  b->pos = b->start;
-  b->last_buf = 1;
-  b->last_in_chain = 1;
-  b->flush = 1;
-  b->memory = 1;
-  
-  ct = nchan_output_info_type(accept_header);
-
-  if(generated_content_type) {
-    *generated_content_type = &content_type_map[ct].content_type;
-  }
-  
-  format = content_type_map[ct].format_string;
-  
-  len = format->len - 8 - 1 + 3*NGX_INT_T_LEN; //minus 8 sprintf
-  
-  if(len > NCHAN_CHANNEL_INFO_MAX_LEN) {
-    nchan_log_error("Channel info string too long: max: %i, is: %i", NCHAN_CHANNEL_INFO_MAX_LEN, len);
-  }
-  
-  b->last = ngx_snprintf(b->start, NCHAN_CHANNEL_INFO_MAX_LEN, (char *)format->data, messages, last_seen==0 ? -1 : (ngx_int_t) time_elapsed, subscribers, msgid_to_str(last_msgid));
-  b->end = b->last;
-  
-  return b;
-}
-
-
-#define NCHAN_GROUP_INFO_MAX_LEN 1024
-static ngx_buf_t *nchan_group_info_buf(ngx_str_t *accept_header, const nchan_group_t *group, ngx_str_t **generated_content_type) {
-  static ngx_buf_t                info_buf;
-  static u_char                   info_buf_str[NCHAN_GROUP_INFO_MAX_LEN]; //big enough
-  
-  ngx_buf_t                      *b = &info_buf;
-  ngx_uint_t                      len;
-  const ngx_str_t                *format;
-  nchan_content_type_t            ct;
-  
-  static struct {
-    ngx_str_t        content_type;
-    const ngx_str_t  format_string;
-  } content_type_map[] = {
-    [NCHAN_CONTENT_TYPE_PLAIN]    = { ngx_string("text/plain"), ngx_string(
-      "channels: %ui" CRLF
-      "subscribers: %ui" CRLF
-      "messages: %ui" CRLF
-      "shared memory used by messages: %ui bytes" CRLF
-      "disk space used by messages: %ui bytes" CRLF
-      "limits:" CRLF
-      "  max channels: %ui" CRLF
-      "  max subscribers: %ui" CRLF
-      "  max messages: %ui" CRLF
-      "  max messages shared memory: %ui" CRLF
-      "  max messages disk space: %ui" CRLF
-    )}, 
-    [NCHAN_CONTENT_TYPE_JSON]     = { ngx_string("text/json"), ngx_string(
-      "{" CRLF
-      "  \"channels\": %ui," CRLF
-      "  \"subscribers\": %ui," CRLF
-      "  \"messages\": %ui," CRLF
-      "  \"messages_memory\": %ui," CRLF
-      "  \"messages_disk\": %ui," CRLF
-      "  \"limits\": {" CRLF
-      "    \"channels\": %ui," CRLF
-      "    \"subscribers\": %ui," CRLF
-      "    \"messages\": %ui," CRLF
-      "    \"messages_memory\": %ui,"CRLF
-      "    \"messages_disk\": %ui" CRLF  
-      "  }" CRLF
-      "}"
-    )},
-    [NCHAN_CONTENT_TYPE_YAML]     = { ngx_string("text/yaml"), ngx_string(
-      "---" CRLF
-      "channels: %ui" CRLF
-      "subscribers: %ui" CRLF
-      "messages: %ui" CRLF
-      "messages_memory: %ui" CRLF
-      "messages_disk: %ui" CRLF
-      "limits:" CRLF
-      "  channels: %ui" CRLF
-      "  subscribers: %ui" CRLF
-      "  messages: %ui" CRLF
-      "  messages_memory: %ui" CRLF
-      "  messages_disk: %ui" CRLF
-      CRLF
-    )},
-    [NCHAN_CONTENT_TYPE_XML]      = { ngx_string("text/xml"), ngx_string(
-      "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" CRLF
-      "<group>" CRLF
-      "  <channels>%ui</channels>" CRLF
-      "  <subscribers>%ui</subscribers>" CRLF
-      "  <messages>%ui</messages>" CRLF
-      "  <messages_memory>%ui</messages_memory>" CRLF
-      "  <messages_disk>%ui</messages_disk>" CRLF
-      "  <limits>" CRLF
-      "    <channels>%ui</channels>" CRLF
-      "    <subscribers>%ui</subscribers>" CRLF
-      "    <messages>%ui</messages>" CRLF
-      "    <messages_memory>%ui</messages_memory>" CRLF
-      "    <messages_disk>%ui</messages_disk>" CRLF
-      "  </limits>" CRLF
-      "</group>"
-    )}
-  };
- 
-  b->start = info_buf_str;
-  b->pos = b->start;
-  b->last_buf = 1;
-  b->last_in_chain = 1;
-  b->flush = 1;
-  b->memory = 1;
-  
-  ct = nchan_output_info_type(accept_header);
-
-  if(generated_content_type) {
-    *generated_content_type = &content_type_map[ct].content_type;
-  }
-  
-  format = &content_type_map[ct].format_string;
-  
-  len = format->len + 5*NGX_INT_T_LEN; //minus 8 sprintf
-  
-  if(len > NCHAN_GROUP_INFO_MAX_LEN) {
-    nchan_log_error("Group info string too long: max: %i, is: %i", NCHAN_GROUP_INFO_MAX_LEN, len);
-  }
-  
-  b->last = ngx_snprintf(b->start, NCHAN_GROUP_INFO_MAX_LEN, (char *)format->data, 
-                         group->channels, 
-                         group->subscribers, 
-                         group->messages, 
-                         group->messages_shmem_bytes, 
-                         group->messages_file_bytes, 
-                         //now limits
-                         group->limit.channels, 
-                         group->limit.subscribers,
-                         group->limit.messages,
-                         group->limit.messages_shmem_bytes,
-                         group->limit.messages_file_bytes
-                        );
-  b->end = b->last;
-  
-  return b;
-}
-
-//print information about a group
-ngx_int_t nchan_group_info(ngx_http_request_t *r, const nchan_group_t *group) {
-  ngx_buf_t                      *b;
-  ngx_str_t                      *content_type;
-  ngx_str_t                      *accept_header = nchan_get_accept_header_value(r);
-
-  b = nchan_group_info_buf(accept_header, group, &content_type);
-  
-  return nchan_respond_membuf(r, NGX_HTTP_OK, content_type, b, 0);
-}
-
-//print information about a channel
-ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_int_t status_code, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid) {
-  ngx_buf_t                      *b;
-  ngx_str_t                      *content_type;
-  ngx_str_t                      *accept_header = nchan_get_accept_header_value(r);
-
-  b = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, &content_type);
-  
-  return nchan_respond_membuf(r, status_code, content_type, b, 0);
-}
-
-ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code) {
-  static const ngx_str_t CREATED_LINE = ngx_string("201 Created");
-  static const ngx_str_t ACCEPTED_LINE = ngx_string("202 Accepted");
-  
-  time_t                last_seen = 0;
-  ngx_uint_t            subscribers = 0;
-  ngx_uint_t            messages = 0;
-  nchan_msg_id_t       *msgid = NULL;
-  nchan_request_ctx_t  *ctx;
-  
-  if(channel!=NULL) {
-    subscribers = channel->subscribers;
-    last_seen = channel->last_seen;
-    messages  = channel->messages;
-    msgid = &channel->last_published_msg_id;
-    r->headers_out.status = status_code == NGX_OK ? NGX_HTTP_OK : status_code;
-    if (status_code == NGX_HTTP_CREATED) {
-      ngx_memcpy(&r->headers_out.status_line, &CREATED_LINE, sizeof(ngx_str_t));
-    }
-    else if (status_code == NGX_HTTP_ACCEPTED) {
-      ngx_memcpy(&r->headers_out.status_line, &ACCEPTED_LINE, sizeof(ngx_str_t));
-    }
-    
-    //set request context values for vars that could be used for logging
-    //does this really belong here? nope.
-    //it's getting refactored out soon though, so these noodles are, for now, acceptable
-    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-    if(ctx) {
-      ctx->channel_subscriber_last_seen = last_seen;
-      ctx->channel_subscriber_count = subscribers;
-      ctx->channel_message_count = messages;
-    }
-    
-    return nchan_channel_info(r, r->headers_out.status, messages, subscribers, last_seen, msgid);
-  }
-  else {
-    //404!
-    return nchan_respond_status(r, NGX_HTTP_NOT_FOUND, NULL, NULL, 0);
-  }
-}
diff --git a/debian/modules/nchan/src/util/nchan_output_info.h b/debian/modules/nchan/src/util/nchan_output_info.h
deleted file mode 100644
index 36c5152..0000000
--- a/debian/modules/nchan/src/util/nchan_output_info.h
+++ /dev/null
@@ -1,6 +0,0 @@
-ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type);
-
-ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_int_t status_code, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid);
-ngx_int_t nchan_group_info(ngx_http_request_t *r, const nchan_group_t *group);
-
-ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code);
diff --git a/debian/modules/nchan/src/util/nchan_rbtree.c b/debian/modules/nchan/src/util/nchan_rbtree.c
deleted file mode 100644
index 5614979..0000000
--- a/debian/modules/nchan/src/util/nchan_rbtree.c
+++ /dev/null
@@ -1,379 +0,0 @@
-#include <nchan_module.h>
-#include "nchan_rbtree.h"
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "RBTREE:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "RBTREE:" fmt, ##arg)
-
-static uint32_t rbtree_hash_crc32(void *str) {
-  return ngx_crc32_short(((ngx_str_t *)str)->data, ((ngx_str_t *)str)->len);
-}
-static ngx_int_t rbtree_compare_str(void *id1, void *id2) {
-  return ngx_memn2cmp(((ngx_str_t *)id1)->data, ((ngx_str_t *)id2)->data, ((ngx_str_t *)id1)->len, ((ngx_str_t *)id2)->len);
-}
-
-/*
-static ngx_int_t rbtree_validate_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
-  if (node == &seed->sentinel) {
-    return 1;
-  }
-  
-  ngx_int_t    i, max, valid;
-  ngx_rbtree_node_t *cur;
-  valid = 0;
-  max = sizeof(seed->actives)/sizeof(cur);
-  
-  for(i=0; i<max; i++){
-    if(seed->actives[i] == node) {
-      valid = 1;
-      break;
-    }
-  }
-  return valid;
-  
-}
-*/
-
-/*
-static ngx_int_t rbtree_validate_nodes_reachable(rbtree_seed_t *seed) {
-  ngx_int_t    i, max;
-  ngx_rbtree_node_t *cur, *match;
-  max = sizeof(seed->actives)/sizeof(cur);
-  
-  for(i=0; i<max; i++){
-    cur = seed->actives[i];
-    if(cur != NULL) {
-      match = rbtree_find_node(seed, seed->id(rbtree_data_from_node(cur)));
-      assert(match == cur);
-    }
-  }
-  return 1;
-}
-*/
-
-static ngx_rbtree_node_t * rbtree_find_node_generic(rbtree_seed_t *seed, void *id, uint32_t hash, ngx_rbtree_node_t **last_parent, ngx_int_t *last_compare) {
-  ngx_rbtree_node_t              *root = seed->tree.root;
-  ngx_rbtree_node_t              *node = root;
-  ngx_rbtree_node_t              *sentinel = seed->tree.sentinel;
-  ngx_int_t                       rc;
-
-  while (node != sentinel) {
-    if (hash < node->key) {
-      node = node->left;
-      continue;
-    }
-    if (hash > node->key) {
-      node = node->right;
-      continue;
-    }
-
-    /* hash == node->key */
-    rc = seed->compare(id, seed->id(rbtree_data_from_node(node)));
-    if (rc == 0) {
-      return node;
-    }
-    node = (rc < 0) ? node->left : node->right;
-  }
-  /* not found */
-
-  return NULL;
-}
-
-ngx_rbtree_node_t *rbtree_find_node(rbtree_seed_t *seed, void *id) {
-  ngx_rbtree_node_t *found;
-  found = rbtree_find_node_generic(seed, id, seed->hash(id), NULL, NULL);
-  if(found) {
-    DBG("found node %p", found);
-  }
-  else {
-    DBG("node not found");
-  }
-  return found;
-}
-
-static void rbtree_insert_generic(ngx_rbtree_node_t *temp, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) {
-  ngx_int_t         offset = offsetof(rbtree_seed_t, sentinel);
-  rbtree_seed_t    *seed = (rbtree_seed_t *)((char *)sentinel - offset);
-  ngx_int_t         rc;
-  void             *id = seed->id(rbtree_data_from_node(node));
-  
-  ngx_rbtree_node_t  **p;
- 
-  for ( ;; ) {
-    
-    if (node->key != temp->key) {
-      p = (node->key < temp->key) ? &temp->left : &temp->right;
-    }
-    else {
-      rc = seed->compare(id, seed->id(rbtree_data_from_node(temp)));
-      p = (rc < 0) ? &temp->left : &temp->right;
-    }
-    
-    if (*p == sentinel) {
-      break;
-    }
-    
-    temp = *p;
-  }
-
-  *p = node;
-  node->parent = temp;
-  node->left = sentinel;
-  node->right = sentinel;
-  ngx_rbt_red(node);
-}
-
-ngx_rbtree_node_t *rbtree_create_node(rbtree_seed_t *seed, size_t data) {
-  ngx_rbtree_node_t *node = ngx_alloc(sizeof(ngx_rbtree_node_t) + data, ngx_cycle->log);
-  if(node) {
-    node->left = NULL;
-    node->right = NULL;
-    node->parent = NULL;
-    seed->allocd_nodes++;
-  }
-  DBG("created node %p", node);
-  return node;
-}
-
-ngx_int_t rbtree_destroy_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
-  seed->allocd_nodes--;
-#if NCHAN_RBTREE_DBG
-  ngx_memset(node, 0x67, sizeof(*node));
-#endif
-  DBG("Destroyed node %p", node);
-  ngx_free(node);
-  
-  return NGX_OK;
-}
-
-ngx_int_t rbtree_insert_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
-  void  *id = seed->id(rbtree_data_from_node(node));
-  node->key = seed->hash(id);
-  ngx_rbtree_insert(&seed->tree, node);
-  seed->active_nodes++;
-  
-#if NCHAN_RBTREE_DBG
-  
-  //assert(rbtree_find_node(seed, seed->id(rbtree_data_from_node(node))) == node);
-  
-  //super-heavy debugging
-  /*
-  ngx_int_t    i, max, inserted = 0;
-  ngx_rbtree_node_t *cur;
-  max = sizeof(seed->actives)/sizeof(cur);
-  
-  assert(seed->active_nodes < max);
-  
-  for(i=0; i<max; i++){
-    if(seed->actives[i] == NULL) {
-      seed->actives[i]=node;
-      inserted = 1;
-      break;
-    }
-  }
-  assert(inserted);
-  */
-  
-#endif
-  DBG("inserted node %p", node);
-  return NGX_OK;
-}
-
-ngx_int_t rbtree_remove_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
-  
-  ngx_rbtree_delete(&seed->tree, node);
-  DBG("Removed node %p", node);
-  seed->active_nodes--;
-  
-#if NCHAN_RBTREE_DBG
-  //assert(rbtree_find_node(seed, seed->id(rbtree_data_from_node(node))) == NULL);
-  ngx_memset(node, 0x65, sizeof(*node));
-  
-  
-  //super-heavy debugging
-  /*
-  ngx_int_t    i, max, removed = 0;
-  ngx_rbtree_node_t *cur;
-  max = sizeof(seed->actives)/sizeof(cur);
-  
-  assert(seed->active_nodes < max);
-  
-  for(i=0; i<max; i++){
-    if(seed->actives[i] == node) {
-      seed->actives[i]=NULL;
-      removed = 1;
-      break;
-    }
-  }
-  assert(removed);
-  
-  */
-  
-#endif
-  return NGX_OK;
-}
-
-static ngx_inline void rbtree_walk_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_callback_pt callback, void *data) {
-  ngx_rbtree_node_t  *left, *right;
-  if(node == sentinel || node == NULL) {
-    return;
-  }
-  left = node->left;
-  right = node->right;
-  rbtree_walk_real(seed, left, sentinel, callback, data);
-  rbtree_walk_real(seed, right, sentinel, callback, data);
-  callback(seed, rbtree_data_from_node(node), data);
-}
-
-static ngx_inline void rbtree_walk_ordered_incr_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_callback_pt callback, void *data) {
-  ngx_rbtree_node_t  *left, *right;
-  if(node == sentinel || node == NULL) {
-    return;
-  }
-  left = node->left;
-  right = node->right;
-  rbtree_walk_real(seed, left, sentinel, callback, data);
-  callback(seed, rbtree_data_from_node(node), data);
-  rbtree_walk_real(seed, right, sentinel, callback, data);
-}
-
-static ngx_inline void rbtree_walk_ordered_decr_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_callback_pt callback, void *data) {
-  ngx_rbtree_node_t  *left, *right;
-  if(node == sentinel || node == NULL) {
-    return;
-  }
-  left = node->left;
-  right = node->right;
-  rbtree_walk_real(seed, right, sentinel, callback, data);
-  callback(seed, rbtree_data_from_node(node), data);
-  rbtree_walk_real(seed, left, sentinel, callback, data);
-}
-
-ngx_int_t rbtree_walk(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
-  rbtree_walk_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
-  return NGX_OK;
-}
-
-ngx_int_t rbtree_walk_incr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
-  rbtree_walk_ordered_incr_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
-  return NGX_OK;
-}
-ngx_int_t rbtree_walk_decr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
-  rbtree_walk_ordered_decr_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
-  return NGX_OK;
-}
-
-typedef struct {
-  void                **els;
-  int                 (*include)(void *);
-  int                   n;
-} rbtree_walk_writesafe_data_t;
-
-static ngx_int_t rbtree_walk_writesafe_callback(rbtree_seed_t *seed, void *node_data, rbtree_walk_writesafe_data_t *d) {
-  if(d->include(node_data)) {
-    d->els[d->n++]=node_data;
-  }
-  return NGX_OK;
-}
-
-ngx_int_t rbtree_walk_writesafe(rbtree_seed_t *seed, int (*include)(void *), rbtree_walk_callback_pt callback, void *data) {
-  void                         *els_static[32];
-  int                           allocd;
-  int                           i;
-  rbtree_walk_writesafe_data_t  d;
-  if(seed->active_nodes > 32) {
-    d.els = ngx_alloc(sizeof(void *) * seed->active_nodes, ngx_cycle->log);
-    allocd = 1;
-  }
-  else {
-    d.els = els_static;
-    allocd = 0;
-  }
-  d.include = include;
-  d.n = 0;
-  rbtree_walk(seed, (rbtree_walk_callback_pt )rbtree_walk_writesafe_callback, &d);
-  
-  for(i=0; i<d.n; i++) {
-    callback(seed, d.els[i], data);
-  }
-  
-  if(allocd) ngx_free(d.els);
-  return NGX_OK;
-}
-
-unsigned rbtree_empty(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
-  ngx_rbtree_t         *tree = &seed->tree;
-  ngx_rbtree_node_t    *cur, *sentinel = tree->sentinel;
-  unsigned int          n = 0;
-  
-  for(cur = tree->root; cur != NULL && cur != sentinel; cur = tree->root) {
-    if(callback) {
-      callback(seed, rbtree_data_from_node(cur), data);
-    }
-    rbtree_remove_node(seed, cur);
-    rbtree_destroy_node(seed, cur);
-    n++;
-  }
-  return n;
-}
-
-
-static ngx_inline void rbtree_conditional_walk_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_conditional_callback_pt callback, void *data) {
-  rbtree_walk_direction_t    direction;
-  
-  if(node == sentinel || node == NULL) {
-    return;
-  }
-  
-  direction = callback(seed, rbtree_data_from_node(node), data);
-  switch(direction) {
-    case RBTREE_WALK_LEFT:
-      rbtree_conditional_walk_real(seed, node->left, sentinel, callback, data);
-      break;
-    
-    case RBTREE_WALK_RIGHT:
-      rbtree_conditional_walk_real(seed, node->right, sentinel, callback, data);
-      break;
-    
-    case RBTREE_WALK_LEFT_RIGHT:
-      rbtree_conditional_walk_real(seed, node->left, sentinel, callback, data);
-      rbtree_conditional_walk_real(seed, node->right, sentinel, callback, data);
-      break;
-    
-    case RBTREE_WALK_STOP:
-      //no more
-      break;
-  }
-}
-
-ngx_int_t rbtree_conditional_walk(rbtree_seed_t *seed, rbtree_walk_conditional_callback_pt callback, void *data) {
-  rbtree_conditional_walk_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
-  return NGX_OK;
-}
-
-ngx_int_t rbtree_init(rbtree_seed_t *seed, char *name, void *(*id)(void *), uint32_t (*hash)(void *), ngx_int_t (*compare)(void *, void *)) {
-  seed->name=name;
-  assert(id != NULL);
-  if(hash==NULL) {
-    hash = &rbtree_hash_crc32;
-  }
-  if(compare == NULL) {
-    compare = &rbtree_compare_str;
-  }
-  seed->id = id;
-  seed->hash = hash;
-  seed->compare = compare;
-  seed->active_nodes = 0;
-  seed->allocd_nodes = 0;
-#if NCHAN_RBTREE_DBG
-  /*
-  //super-heavy debugging setup
-  ngx_int_t max = sizeof(seed->actives);
-  ngx_memzero(seed->actives, sizeof(seed->actives));
-  */
-#endif
-  ngx_rbtree_init(&seed->tree, &seed->sentinel, &rbtree_insert_generic);
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/util/nchan_rbtree.h b/debian/modules/nchan/src/util/nchan_rbtree.h
deleted file mode 100644
index f67ad3b..0000000
--- a/debian/modules/nchan/src/util/nchan_rbtree.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef NCHAN_RBTREE_UTIL_HEADER
-#define NCHAN_RBTREE_UTIL_HEADER
-
-#define NCHAN_RBTREE_DBG 0
-
-typedef struct {
-  char              *name;
-  ngx_rbtree_t       tree;
-  ngx_rbtree_node_t  sentinel;
-  ngx_uint_t         allocd_nodes;
-  ngx_uint_t         active_nodes;
-  void              *(*id)(void *node);
-  uint32_t           (*hash)(void *);
-  ngx_int_t          (*compare)(void *, void *);
-  #if NCHAN_RBTREE_DBG   
-  //ngx_rbtree_node_t *actives[4096]; //super-heavy debugging
-#endif
-} rbtree_seed_t;
-
-
-#if NCHAN_RBTREE_DBG 
-typedef struct ngx_rbtree_debug_node_s ngx_rbtree_debug_node_t;
-
-typedef struct {
-  struct ngx_rbtree_debug_node_s  *prev;
-  struct ngx_rbtree_debug_node_s  *next;
-} ngx_rbtree_debug_node_link_t;
-
-struct ngx_rbtree_debug_node_s {
-  ngx_rbtree_node_t              node;
-  ngx_rbtree_debug_node_link_t   allocd;
-  ngx_rbtree_debug_node_link_t   active;
-}; //ngx_rbtree_debug_node_t;
-#endif
-
-typedef enum {RBTREE_WALK_LEFT, RBTREE_WALK_RIGHT, RBTREE_WALK_LEFT_RIGHT, RBTREE_WALK_STOP} rbtree_walk_direction_t;
-
-typedef ngx_int_t (*rbtree_walk_callback_pt)(rbtree_seed_t *, void *node_data, void *privdata);
-typedef rbtree_walk_direction_t (*rbtree_walk_conditional_callback_pt)(rbtree_seed_t *, void *, void *);
-
-ngx_int_t rbtree_init(rbtree_seed_t *seed, char *name, void *(*id)(void *), uint32_t (*hash)(void *), ngx_int_t (*compare)(void *, void *));
-unsigned             rbtree_empty(rbtree_seed_t *, rbtree_walk_callback_pt, void *data);
-
-ngx_rbtree_node_t   *rbtree_create_node(rbtree_seed_t *, size_t data_size);
-ngx_int_t            rbtree_insert_node(rbtree_seed_t *, ngx_rbtree_node_t *);
-ngx_int_t            rbtree_remove_node(rbtree_seed_t *, ngx_rbtree_node_t *);
-ngx_int_t            rbtree_destroy_node(rbtree_seed_t *, ngx_rbtree_node_t *);
-
-ngx_rbtree_node_t   *rbtree_find_node(rbtree_seed_t *, void *id);
-
-ngx_int_t            rbtree_walk(rbtree_seed_t *seed, rbtree_walk_callback_pt, void *data);
-ngx_int_t            rbtree_walk_incr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data);
-ngx_int_t            rbtree_walk_decr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data);
-ngx_int_t            rbtree_walk_writesafe(rbtree_seed_t *seed, int (*include)(void *), rbtree_walk_callback_pt callback, void *data);
-
-ngx_int_t            rbtree_conditional_walk(rbtree_seed_t *seed, rbtree_walk_conditional_callback_pt, void *data);
-
-ngx_rbtree_node_t   *rbtree_node_from_data(void *);
-
-
-#define rbtree_data_from_node(node) ((void *)(&node[1]))
-#define rbtree_node_from_data(data) (ngx_rbtree_node_t *)((u_char *)data - sizeof(ngx_rbtree_node_t))
-
-#endif /*NCHAN_RBTREE_UTIL_HEADER*/
diff --git a/debian/modules/nchan/src/util/nchan_reaper.c b/debian/modules/nchan/src/util/nchan_reaper.c
deleted file mode 100644
index 25604ab..0000000
--- a/debian/modules/nchan/src/util/nchan_reaper.c
+++ /dev/null
@@ -1,320 +0,0 @@
-#include <nchan_module.h>
-#include "nchan_reaper.h"
-#include <assert.h>
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REAPER: " fmt, ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REAPER: " fmt, ##args)
-
-static void reaper_timer_handler(ngx_event_t *ev);
-void verify_reaper_list(nchan_reaper_t *rp, void *thing);
-
-ngx_int_t nchan_reaper_start(nchan_reaper_t *rp, char *name, int prev, int next, ngx_int_t (*ready)(void *, uint8_t), void (*reap)(void *), int tick_sec) {
-  rp->name = name;
-  rp->count = 0;
-  rp->next_ptr_offset = next;
-  rp->prev_ptr_offset = prev;
-  rp->last = NULL;
-  rp->first = NULL;
-  rp->ready = ready;
-  rp->reap = reap;
-  ngx_memzero(&rp->timer, sizeof(rp->timer));
-  nchan_init_timer(&rp->timer, reaper_timer_handler, rp);
-  
-  rp->tick_usec = tick_sec * 1000;
-  rp->strategy = RESCAN;
-  rp->max_notready_ratio = 0; //disabled
-  rp->position = NULL;
-  
-  DBG("start reaper %s with tick time of %i sec", name, tick_sec);
-  verify_reaper_list(rp, NULL);
-  return NGX_OK;
-}
-
-static void its_reaping_time(nchan_reaper_t *rp, uint8_t force);
-
-ngx_int_t nchan_reaper_flush(nchan_reaper_t *rp) {
-  its_reaping_time(rp, 1);
-  return NGX_OK;
-}
-
-ngx_int_t nchan_reaper_stop(nchan_reaper_t *rp) {
-  nchan_reaper_flush(rp);
-  if(rp->timer.timer_set) {
-    ngx_del_timer(&rp->timer);
-  }
-  DBG("stopped reaper %s", rp->name);
-  return NGX_OK;
-}
-
-static ngx_inline void **thing_next_ptr(nchan_reaper_t *rp, void *thing) {
-  return (void *)((char *)thing + rp->next_ptr_offset);
-}
-static ngx_inline void *thing_next(nchan_reaper_t *rp, void *thing) {
-  return *thing_next_ptr(rp, thing);
-}
-
-static ngx_inline void **thing_prev_ptr(nchan_reaper_t *rp, void *thing) {
-  return (void *)((char *)thing + rp->prev_ptr_offset);
-}
-static ngx_inline void *thing_prev(nchan_reaper_t *rp, void *thing) {
-  return *thing_prev_ptr(rp, thing);
-}
-
-void nchan_reaper_each(nchan_reaper_t *rp, void (*cb)(void *thing, void *pd), void *pd) {
-  void                *cur;
-  for(cur = rp->first; cur != NULL; cur = thing_next(rp, cur)) {
-    cb(cur, pd);
-  }
-}
-
-ngx_inline void verify_reaper_list(nchan_reaper_t *rp, void *thing) {
-  /*
-  if(rp->first == NULL) {
-    assert(rp->count == 0 && rp->last == NULL);
-  }
-  else {
-    assert(rp->count > 0 && rp->last != NULL);
-  }
-  
-  if(rp->last == NULL) {
-    assert(rp->count == 0 && rp->first == NULL);
-  }
-  else {
-    assert(rp->count > 0 && rp->first != NULL);
-  }
-  
-  if(rp->count == 0) {
-    assert(rp->last == NULL && rp->first == NULL);
-  }
-  else {
-    assert(rp->last != NULL && rp->first != NULL);
-  }
-  
-  int i=0;
-  void *cur;
-  for(cur = rp->first; cur != NULL; cur = thing_next(rp, cur)) {
-    i++;
-    if(thing) assert(cur != thing);
-  }
-  assert(i == rp->count);
-  */
-}
-
-static ngx_inline void reaper_reset_timer(nchan_reaper_t *rp) {
-  verify_reaper_list(rp, NULL);
-  if (!ngx_exiting && !ngx_quit && rp->count > 0 && !rp->timer.timer_set) {
-    DBG("reap %s again later (remaining: %i)", rp->name, rp->count);
-    ngx_add_timer(&rp->timer, rp->tick_usec);
-  }
-  
-}
-
-ngx_int_t nchan_reaper_add(nchan_reaper_t *rp, void *thing) {
-  verify_reaper_list(rp, thing);
-  
-  if(rp->ready(thing, 0) == NGX_OK) {
-    rp->reap(thing);
-    return NGX_OK;
-  }
-  
-  void    **next = thing_next_ptr(rp, thing);
-  void    **prev = thing_prev_ptr(rp, thing);
-  
-  if(rp->last) {
-    *thing_next_ptr(rp, rp->last) = thing;
-  }
-  *prev = rp->last;
-  *next = NULL;
-  rp->last = thing;
-  
-  if(rp->first == NULL) {
-    rp->first = thing;
-  }
-  
-  assert(rp->count >= 0);
-  rp->count++;
-  
-  DBG("reap %s %p later (waiting to be reaped: %i)", rp->name, thing, rp->count);
-  verify_reaper_list(rp, NULL);
-  reaper_reset_timer(rp);
-  return NGX_OK;
-}
-
-
-//this is not a safe function -- it doesn't check if the thing is actually being reaped.
-ngx_int_t nchan_reaper_withdraw(nchan_reaper_t *rp, void *thing) {
-  void *prev, *next;
-  
-  prev = thing_prev(rp, thing);
-  next = thing_next(rp, thing);
-  
-  if(prev) *thing_next_ptr(rp, prev) = next;
-  if(next) *thing_prev_ptr(rp, next) = prev;
-  
-  if(thing == rp->first) rp->first = next;
-  if(thing == rp->last)  rp->last  = prev;
-  
-  assert(rp->count > 0);
-  rp->count--;
-  
-  if(rp->strategy == KEEP_PLACE && rp->position == thing) {
-    rp->position = next;
-  }
-  
-  *thing_next_ptr(rp, thing) = NULL;
-  *thing_prev_ptr(rp, thing) = NULL;
-
-  verify_reaper_list(rp, thing);
-  
-  DBG("withdraw %s %p", rp->name, thing);
-  return NGX_OK;
-}
-
-static ngx_inline void reap_ready_thing(nchan_reaper_t *rp, void *cur, void *next) {
-  void   *prev;
-  prev = thing_prev(rp, cur);
-  if(prev != NULL && next != NULL) {
-    assert(prev != next);
-  }
-  assert(cur != prev);
-  assert(cur != next);
-  if(prev) *thing_next_ptr(rp, prev) = next;
-  if(next) *thing_prev_ptr(rp, next) = prev;
-  if(cur == rp->first) rp->first = next;
-  if(cur == rp->last)  rp->last = prev;
-  if(rp->strategy == KEEP_PLACE && rp->position == cur) {
-    rp->position = next;
-  }
-  rp->count--;
-  
-  rp->reap(cur);
-  
-  assert(rp->count >= 0);
-  verify_reaper_list(rp, cur);
-  DBG("reaped %s %p (waiting to be reaped: %i)", rp->name, cur, rp->count);
-}
-
-static void its_reaping_time(nchan_reaper_t *rp, uint8_t force) {
-  void                *cur = rp->first, *next;
-  int                  max_notready, notready = 0; 
-  
-  max_notready = rp->max_notready_ratio * rp->count;
-  
-  DBG("%s scan max notready %i", rp->name, max_notready);
-  
-  while(cur != NULL && notready <= max_notready) {
-    next = thing_next(rp, cur);
-    if(rp->ready(cur, force) == NGX_OK) {
-      reap_ready_thing(rp, cur, next);
-      verify_reaper_list(rp, cur);
-    }
-    else if(max_notready > 0){
-      DBG("not ready to reap %s %p", rp->name, cur);
-      notready++;
-      verify_reaper_list(rp, NULL);
-    }
-    cur = next;
-  } 
-}
-
-static void its_reaping_time_keep_place(nchan_reaper_t *rp, uint8_t force) {
-  void                *cur, *next;
-  int                  max_notready, notready = 0; 
-  int                  n = 0;
-  max_notready = rp->max_notready_ratio * rp->count;
-  cur = rp->position == NULL ? rp->first : rp->position;
-  
-  DBG("%s keep_place max notready %i, cur %p", rp->name, max_notready, cur);
-  
-  while(n < rp->count && notready <= max_notready) {
-    n++;
-    next = thing_next(rp, cur);
-    if(rp->ready(cur, force) == NGX_OK) {
-      reap_ready_thing(rp, cur, next);
-      verify_reaper_list(rp, cur);
-    }
-    else if(max_notready > 0) {
-      DBG("not ready to reap %s %p", rp->name, cur);
-      notready++;
-      verify_reaper_list(rp, NULL);
-    }
-    cur = (next == NULL ? rp->first : next);
-  }
-  rp->position = cur;
-}
-
-static void its_reaping_rotating_time(nchan_reaper_t *rp, uint8_t force) {
-  void                *cur = rp->first, *next, *prev;
-  void                *firstmoved = NULL;
-  void               **next_ptr, **prev_ptr;
-  int                  max_notready, notready = 0; 
-  
-  max_notready = rp->max_notready_ratio * rp->count;
-  
-  DBG("%s rotatey max notready %i", rp->name, max_notready);
-  
-  while(cur != NULL && cur != firstmoved && notready <= max_notready) {
-    next = thing_next(rp, cur);
-    if(rp->ready(cur, force) == NGX_OK) {
-      reap_ready_thing(rp, cur, next);
-    }
-    else {
-      //move to the end of the list
-      //TODO: bulk move
-      if(max_notready > 0) {
-        DBG("not ready to reap %s %p", rp->name, cur);
-        notready++;
-        verify_reaper_list(rp, NULL);
-      }
-      
-      if(!firstmoved) firstmoved = cur;
-      
-      if(rp->last != cur) {
-        prev = thing_prev(rp, cur);
-        
-        if(prev) *thing_next_ptr(rp, prev) = next;
-        if(next) *thing_prev_ptr(rp, next) = prev;
-        
-        next_ptr = thing_next_ptr(rp, cur);
-        prev_ptr = thing_prev_ptr(rp, cur);
-        
-        if(rp->last) {
-          *thing_next_ptr(rp, rp->last) = cur;
-        }
-        
-        *prev_ptr = rp->last;
-        *next_ptr = NULL;
-        rp->last = cur;
-        
-        if(rp->first == NULL) {
-          rp->first = cur;
-        }
-        else if(rp->first == cur) {
-          rp->first = next;
-        }
-      }
-      verify_reaper_list(rp, NULL);
-    }
-    cur = next;
-  } 
-}
-
-static void reaper_timer_handler(ngx_event_t *ev) {
-  nchan_reaper_t      *rp = ev->data;
-  switch (rp->strategy) {
-    case RESCAN:
-      its_reaping_time(rp, 0);
-      reaper_reset_timer(rp);
-      return;
-    case ROTATE:
-      its_reaping_rotating_time(rp, 0);
-      reaper_reset_timer(rp);
-      return;
-    case KEEP_PLACE:
-      its_reaping_time_keep_place(rp, 0);
-      reaper_reset_timer(rp);
-      return;
-  }
-}
diff --git a/debian/modules/nchan/src/util/nchan_reaper.h b/debian/modules/nchan/src/util/nchan_reaper.h
deleted file mode 100644
index f737874..0000000
--- a/debian/modules/nchan/src/util/nchan_reaper.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef NCHAN_REAPER_H
-#define NCHAN_REAPER_H
-
-typedef enum {RESCAN, ROTATE, KEEP_PLACE} nchan_reaper_strategy_t;
-
-typedef struct {
-  char                      *name;
-  ngx_int_t                  count;
-  int                        next_ptr_offset;
-  int                        prev_ptr_offset;
-  void                      *last;
-  void                      *first;
-  ngx_int_t                  (*ready)(void *, uint8_t force); //ready to be reaped?
-  void                       (*reap)(void *); //reap it
-  ngx_event_t                timer;
-  int                        tick_usec;
-  nchan_reaper_strategy_t    strategy;
-  float                      max_notready_ratio;
-  void                      *position;
-
-} nchan_reaper_t;
-
-ngx_int_t nchan_reaper_start(nchan_reaper_t *rp, char *name, int prev, int next, ngx_int_t (*ready)(void *, uint8_t force), void (*reap)(void *), int tick_sec);
-
-ngx_int_t nchan_reaper_flush(nchan_reaper_t *rp);
-ngx_int_t nchan_reaper_stop(nchan_reaper_t *rp);
-void nchan_reaper_each(nchan_reaper_t *rp, void (*cb)(void *thing, void *pd), void *pd);
-
-
-ngx_int_t nchan_reaper_add(nchan_reaper_t *rp, void *thing);
-ngx_int_t nchan_reaper_withdraw(nchan_reaper_t *rp, void *thing);
-
-#endif /*NCHAN_REAPER_H*/
diff --git a/debian/modules/nchan/src/util/nchan_reuse_queue.c b/debian/modules/nchan/src/util/nchan_reuse_queue.c
deleted file mode 100644
index c79ceb0..0000000
--- a/debian/modules/nchan/src/util/nchan_reuse_queue.c
+++ /dev/null
@@ -1,151 +0,0 @@
-#include <nchan_module.h>
-#include "nchan_reuse_queue.h"
-#include <assert.h>
-#define DEBUG_LEVEL NGX_LOG_WARN
-//#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REUSEQUEUE:" fmt, ##arg)
-#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REUSEQUEUE:" fmt, ##arg)
-
-ngx_int_t nchan_reuse_queue_init(nchan_reuse_queue_t *rq, int prev, int next, void *(*alloc)(void *), ngx_int_t (*free)(void *, void*), void *privdata) {
-  rq->size = 0;
-  rq->prev_ptr_offset = prev;
-    rq->next_ptr_offset = next;
-  rq->first = NULL;
-  rq->last = NULL;
-  rq->reserve = NULL;
-  rq->alloc = alloc;
-  rq->free = free;
-  rq->pd = privdata;
-  
-  return NGX_OK;
-}
-
-static ngx_inline void **thing_next_ptr(nchan_reuse_queue_t *rq, void *thing) {
-  return (void *)((char *)thing + rq->next_ptr_offset);
-}
-static ngx_inline void *thing_next(nchan_reuse_queue_t *rq, void *thing) {
-  return *thing_next_ptr(rq, thing);
-}
-
-static ngx_inline void **thing_prev_ptr(nchan_reuse_queue_t *rq, void *thing) {
-  return (void *)((char *)thing + rq->prev_ptr_offset);
-}
-
-/*static ngx_inline void *thing_prev(nchan_reuse_queue_t *rq, void *thing) {
-  return *thing_prev_ptr(rq, thing);
-}
-
-
-static void check_queue(nchan_reuse_queue_t *rq) {
-  void *cur;
-  for(cur = rq->first; cur != NULL; cur = thing_next(rq, cur)) {
-    if(thing_prev_ptr(rq, rq->first)) {
-      assert(thing_prev(rq, rq->first) != rq->first);
-    }
-    if(thing_next_ptr(rq, rq->first)) {
-      assert(thing_next(rq, rq->first) != rq->first);
-    }
-  }
-}
-*/
-
-ngx_int_t nchan_reuse_queue_flush(nchan_reuse_queue_t *rq) {
-  void *pd = rq->pd;
-  void *thing, *next;
-  ngx_int_t     i=0;
-  next = rq->first;
-  while((thing = next) != NULL) {
-    i++;
-    next = thing_next(rq, thing);
-    if(rq->free) rq->free(pd, thing);
-  }
-  rq->reserve = rq->first;
-  rq->first = NULL;
-  rq->last = NULL;
-  return i;
-}
-
-ngx_int_t nchan_reuse_queue_shutdown(nchan_reuse_queue_t *rq) {
-  if(rq->free) {
-    void *pd = rq->pd;
-    void *thing, *next;
-    next = rq->first;
-    while((thing = next) != NULL) {
-      next = thing_next(rq, thing);
-      rq->free(pd, thing);
-    }
-    next = rq->reserve;
-    while((thing = next) != NULL) {
-      next = thing_next(rq, thing);
-      rq->free(pd, thing);
-    }
-  }
-  
-  if(rq->last) {
-    *thing_next_ptr(rq, rq->last) = rq->reserve;
-  }
-  rq->first = NULL;
-  rq->last = NULL;
-  
-  if(rq->first) {
-    rq->reserve = rq->first;
-  }
-  return NGX_OK;
-}
-
-void *nchan_reuse_queue_push(nchan_reuse_queue_t *rq) {
-  void     *q;
-  //check_queue(rq);
-  if(rq->reserve) {
-    q = rq->reserve;
-    rq->reserve = thing_next(rq, q);
-  }
-  else {
-    q = rq->alloc(rq->pd);
-    rq->size++;
-  }
-  *thing_next_ptr(rq, q) = NULL;
-  *thing_prev_ptr(rq, q) = rq->last;
-  if(rq->last) {
-    *thing_next_ptr(rq, rq->last) = q;
-  }
-  rq->last = q;
-  if(!rq->first) {
-    rq->first = q;
-  }
-  //check_queue(rq);
-  return q;
-}
-
-
-
-void *nchan_reuse_queue_first(nchan_reuse_queue_t *rq) {
-  return rq->first;
-}
-
-void nchan_reuse_queue_each(nchan_reuse_queue_t *rq, void (*callback)(void *)) {
-  void      *cur;
-  for(cur = rq->first; cur != NULL; cur = thing_next(rq, cur)) {
-    callback(cur);
-  }
-}
-
-ngx_int_t nchan_reuse_queue_pop(nchan_reuse_queue_t *rq) {
-  void      *q = rq->first;
-  //check_queue(rq);
-  if(q) {
-    rq->first = thing_next(rq, q);
-    if(rq->first) {
-      *thing_prev_ptr(rq, rq->first) = NULL;
-    }
-    if(rq->last == q) {
-      rq->last = NULL;
-    }
-    *thing_prev_ptr(rq, q) = NULL;
-    *thing_next_ptr(rq, q) = rq->reserve;
-    rq->reserve = q;
-  }
-  //check_queue(rq);
-  return NGX_OK;
-}
diff --git a/debian/modules/nchan/src/util/nchan_reuse_queue.h b/debian/modules/nchan/src/util/nchan_reuse_queue.h
deleted file mode 100644
index 660f8e0..0000000
--- a/debian/modules/nchan/src/util/nchan_reuse_queue.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef NCHAN_REUSE_QUEUE_H
-#define NCHAN_REUSE_QUEUE_H
-
-typedef struct {
-  int                        size;
-  int                        next_ptr_offset;
-  int                        prev_ptr_offset;
-  void                      *first;
-  void                      *last;
-  void                      *reserve;
-  void                      *(*alloc)(void *privdata);
-  ngx_int_t                  (*free)(void *privdata, void *thing);
-  void                      *pd;
-} nchan_reuse_queue_t;
-
-ngx_int_t nchan_reuse_queue_init(nchan_reuse_queue_t *rq, int prev, int next, void *(*alloc)(void *), ngx_int_t (*free)(void *, void*), void *privdata);
-ngx_int_t nchan_reuse_queue_shutdown(nchan_reuse_queue_t *rq);
-ngx_int_t nchan_reuse_queue_flush(nchan_reuse_queue_t *rq);
-void nchan_reuse_queue_each(nchan_reuse_queue_t *rq, void (*calback)(void *));
-void *nchan_reuse_queue_first(nchan_reuse_queue_t *rq);
-void *nchan_reuse_queue_push(nchan_reuse_queue_t *rq);
-ngx_int_t nchan_reuse_queue_pop(nchan_reuse_queue_t *rq);
-
-#endif /*NCHAN_REUSE_QUEUE_H*/
diff --git a/debian/modules/nchan/src/util/nchan_slist.c b/debian/modules/nchan/src/util/nchan_slist.c
deleted file mode 100644
index 8d67318..0000000
--- a/debian/modules/nchan/src/util/nchan_slist.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#include "nchan_slist.h"
-#include <assert.h>
-
- /*
-  * Boring non-allocating doubly-linked "static" list.
-  *uses preset offsets for the prev and next fields on pre-allocated data
-  */
- 
-ngx_int_t __nchan_slist_init(nchan_slist_t *list, off_t offset_prev, off_t offset_next) {
-  list->offset.prev = offset_prev;
-  list->offset.next = offset_next;
-  return nchan_slist_reset(list);
-}
-
-ngx_int_t nchan_slist_reset(nchan_slist_t *list) {
-  list->head = NULL;
-  list->tail = NULL;
-  list->n = 0;
-  return NGX_OK;
-}
-
-void *nchan_slist_first(nchan_slist_t *list) {
-  return list->head;
-}
-void *nchan_slist_last(nchan_slist_t *list) {
-  return list->tail;
-}
-static void **nchan_slist_next_ptr(nchan_slist_t *list, void *el) {
-  return (void **)&(((char *)el)[list->offset.next]);
-}
-static void **nchan_slist_prev_ptr(nchan_slist_t *list, void *el) {
-  return (void **)&(((char *)el)[list->offset.prev]);
-}
-
-void *nchan_slist_next(nchan_slist_t *list, void *el) {
-  void **ptr = nchan_slist_next_ptr(list, el);
-  return *ptr;
-}
-void *nchan_slist_prev(nchan_slist_t *list, void *el) {
-  void **ptr = nchan_slist_prev_ptr(list, el);
-  return *ptr;
-}
-
-ngx_int_t nchan_slist_append(nchan_slist_t *list, void *el) {
-  void **el_prev_ptr = nchan_slist_prev_ptr(list, el);
-  void **el_next_ptr = nchan_slist_next_ptr(list, el);
-  if(list->head == NULL) {
-    list->head = el;
-  }
-  if(list->tail == NULL) {
-    *el_prev_ptr = NULL;
-  }
-  else {
-    void **tail_next = nchan_slist_next_ptr(list, list->tail);
-    *el_prev_ptr = list->tail;
-    *tail_next = el;
-  }
-  list->tail = el;
-  *el_next_ptr = NULL;
-  list->n++;
-  return NGX_OK;
-}
-ngx_int_t nchan_slist_prepend(nchan_slist_t *list, void *el) {
-  void **el_prev_ptr = nchan_slist_prev_ptr(list, el);
-  void **el_next_ptr = nchan_slist_next_ptr(list, el);
-  if(list->tail == NULL) {
-    list->tail = el;
-  }
-  if(list->head == NULL) {
-    *el_next_ptr = NULL;
-  }
-  else {
-    void **head_prev_ptr = nchan_slist_prev_ptr(list, list->head);
-    *el_next_ptr = list->head;
-    *head_prev_ptr = el;
-  }
-  list->head = el;
-  *el_prev_ptr = NULL;
-  list->n++;
-  return NGX_OK;
-}
-ngx_int_t nchan_slist_remove(nchan_slist_t *list, void *el) {
-  void **el_prev_ptr = nchan_slist_prev_ptr(list, el);
-  void **el_next_ptr = nchan_slist_next_ptr(list, el);
-  void *el_prev = *el_prev_ptr, *el_next = *el_next_ptr;
-  if(list->head == el) {
-    list->head = el_next;
-  }
-  if(list->tail == el) {
-    list->tail = el_prev;
-  }
-  if(el_prev) {
-    void **el_prev_next_ptr = nchan_slist_next_ptr(list, el_prev);
-    *el_prev_next_ptr = el_next;
-  }
-  if(el_next) {
-    void **el_next_prev_ptr = nchan_slist_prev_ptr(list, el_next);
-    *el_next_prev_ptr = el_prev;
-  }
-  list->n--;
-  *el_prev_ptr = NULL;
-  *el_next_ptr = NULL;
-  return NGX_OK;
-}
-
-ngx_int_t nchan_slist_transfer(nchan_slist_t *dst, nchan_slist_t *src) {
-  assert(dst->offset.prev == src->offset.prev); //same-ish slists
-  assert(dst->offset.next == src->offset.next); //same-ish slists
-  void **src_head_prev_ptr = nchan_slist_prev_ptr(src, src->head);
-  void **dst_tail_next_ptr = nchan_slist_next_ptr(dst, src->tail);
-  
-  if(src->n == 0) {
-    assert(src->head == NULL);
-    assert(src->tail == NULL);
-    return NGX_OK; //nothing to do
-  }
-  
-  *src_head_prev_ptr = dst->tail;
-  if(dst->tail) {
-    *dst_tail_next_ptr = src->head;
-  }
-  dst->tail = src->tail;
-  
-  if(dst->head == NULL) {
-    dst->head = src->head;
-  }
-  dst->tail = src->tail;
-  dst->n += src->n;
-  
-  src->n = 0;
-  src->head = NULL;
-  src->tail = NULL;
-  
-  return NGX_OK;
-}
-
-void *nchan_slist_shift(nchan_slist_t *list) {
-  void *head = list->head;
-  if(head) {
-    nchan_slist_remove(list, head);
-  }
-  return head;
-}
-
-void *nchan_slist_pop(nchan_slist_t *list) {
-  void *tail = list->tail;
-  if(tail) {
-    nchan_slist_remove(list, tail);
-  }
-  return tail;
-}
-
-int nchan_slist_is_empty(nchan_slist_t *list) {
-  if(list->n == 0) {
-    assert(list->head == NULL);
-    assert(list->tail == NULL);
-    return 1;
-  }
-  else {
-    assert(list->head != NULL);
-    assert(list->tail != NULL);
-    return 0;
-  }
-}
diff --git a/debian/modules/nchan/src/util/nchan_slist.h b/debian/modules/nchan/src/util/nchan_slist.h
deleted file mode 100644
index df8dcb9..0000000
--- a/debian/modules/nchan/src/util/nchan_slist.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef NCHAN_SLIST_H
-#define NCHAN_SLIST_H
-
-#define NCHAN_SLIST_DEBUG 0
-
-#include <nginx.h>
-#include <ngx_http.h>
-
-typedef struct {
-  off_t           prev;
-  off_t           next;
-} nchan_slist_offsets_t;
-
-typedef struct {
-  void                 *head;
-  void                 *tail;
-  ngx_uint_t            n;
-  nchan_slist_offsets_t offset;
-} nchan_slist_t;
-
-
-
-#define nchan_slist_init(slist, data_type, prev_field, next_field) \
-  __nchan_slist_init(slist, offsetof(data_type, prev_field), offsetof(data_type, next_field))
-ngx_int_t __nchan_slist_init(nchan_slist_t *list, off_t offset_prev, off_t offset_next);
-void *nchan_slist_first(nchan_slist_t *list);
-void *nchan_slist_last(nchan_slist_t *list);
-void *nchan_slist_next(nchan_slist_t *list, void *el);
-void *nchan_slist_prev(nchan_slist_t *list, void *el);
-ngx_int_t nchan_slist_append(nchan_slist_t *list, void *el);
-ngx_int_t nchan_slist_prepend(nchan_slist_t *list, void *el);
-ngx_int_t nchan_slist_remove(nchan_slist_t *list, void *el);
-
-ngx_int_t nchan_slist_reset(nchan_slist_t *list);
-ngx_int_t nchan_slist_transfer(nchan_slist_t *dst, nchan_slist_t *src);
-void *nchan_slist_pop(nchan_slist_t *list);
-void *nchan_slist_shift(nchan_slist_t *list);
-
-int nchan_slist_is_empty(nchan_slist_t *list);
-
-#endif /*NCHAN_SLIST_H*/
diff --git a/debian/modules/nchan/src/util/nchan_subrequest.c b/debian/modules/nchan/src/util/nchan_subrequest.c
deleted file mode 100644
index a9f5141..0000000
--- a/debian/modules/nchan/src/util/nchan_subrequest.c
+++ /dev/null
@@ -1,324 +0,0 @@
-// Taken from agenzh's echo nginx module
-// https://github.com/openresty/echo-nginx-module
-// Thanks, agenzh!
-
-/*
-Copyright (C) 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#include <nchan_module.h>
-
-ngx_str_t  nchan_content_length_header_key = ngx_string("Content-Length");
-
-static ngx_inline ngx_uint_t nchan_hash_str(u_char *src, size_t n) {
-  ngx_uint_t  key;
-  key = 0;
-  while (n--) {
-    key = ngx_hash(key, *src);
-    src++;
-  }
-  return key;
-}
-#define nchan_hash_literal(s)                                        \
-  nchan_hash_str((u_char *) s, sizeof(s) - 1)
-
-ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t len) {
-  ngx_table_elt_t                 *h, *header;
-  ngx_list_part_t                 *part;
-  ngx_http_request_t              *pr;
-  ngx_uint_t                       i;
-  u_char                          *p;
-  static ngx_uint_t                nchan_content_length_hash = 0;
-  if(nchan_content_length_hash == 0) {
-    nchan_content_length_hash = nchan_hash_literal("content-length");
-  }
-  
-  r->headers_in.content_length_n = len;
-  
-  if (ngx_list_init(&r->headers_in.headers, r->pool, 20, sizeof(ngx_table_elt_t)) != NGX_OK) {
-    return NGX_ERROR;
-  }
-
-  h = ngx_list_push(&r->headers_in.headers);
-  if (h == NULL) {
-    return NGX_ERROR;
-  }
-
-  h->key = nchan_content_length_header_key;
-  h->lowcase_key= (u_char *)"content-length";
-
-  r->headers_in.content_length = h;
-  p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
-  if (p == NULL) {
-    return NGX_ERROR;
-  }
-
-  h->value.data = p;
-  h->value.len = ngx_sprintf(h->value.data, "%O", len) - h->value.data;
-
-  h->hash = nchan_content_length_hash;
-
-  pr = r->parent;
-
-  if (pr == NULL) {
-    return NGX_OK;
-  }
-
-  /* forward the parent request's all other request headers */
-
-  part = &pr->headers_in.headers.part;
-  header = part->elts;
-
-  for (i = 0; /* void */; i++) {
-    
-    if (i >= part->nelts) {
-      if (part->next == NULL) {
-        break;
-      }
-      part = part->next;
-      header = part->elts;
-      i = 0;
-    }
-    if (header[i].key.len == sizeof("Content-Length") - 1 
-        && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length", sizeof("Content-Length") - 1) == 0) {
-      continue;
-    }
-    h = ngx_list_push(&r->headers_in.headers);
-    if (h == NULL) {
-      return NGX_ERROR;
-    }
-    *h = header[i];
-  }
-
-  /* XXX maybe we should set those built-in header slot in
-    * ngx_http_headers_in_t too? */
-
-  return NGX_OK;
-}
-
-ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n) {
-  //ngx_http_core_main_conf_t  *cmcf;
-  ngx_http_request_t         *r;
-  ngx_http_request_body_t    *body;
-  ngx_int_t                   rc;
-
-  sr->method = method;
-  sr->method_name = *method_name;
-
-  if (sr->method == NGX_HTTP_HEAD) {
-    sr->header_only = 1;
-  }
-  r = sr->parent;
-
-  sr->header_in = r->header_in;
-
-  /* XXX work-around a bug in ngx_http_subrequest */
-  if (r->headers_in.headers.last == &r->headers_in.headers.part) {
-    sr->headers_in.headers.last = &sr->headers_in.headers.part;
-  }
-
-  
-  /* we do not inherit the parent request's variables */
-  //scratch that, let's inherit those vars
-  //cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
-  //sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts * sizeof(ngx_http_variable_value_t));
-
-  if (sr->variables == NULL) {
-    return NGX_ERROR;
-  }
-
-  if ((body = request_body)!=NULL) {
-    sr->request_body = body;
-
-    rc = nchan_set_content_length_header(sr, content_length_n);
-    
-    if (rc != NGX_OK) {
-      return NGX_ERROR;
-    }
-  }
-
-  //dd("subrequest body: %p", sr->request_body);
-
-  return NGX_OK;
-}
-#if (NGX_HTTP_V2) || (NGX_HTTP_SPDY)
-static void nchan_recover_upstream_hacky_request_method(ngx_http_request_t *r) {
-  ngx_uint_t           i;
-  ngx_buf_t            request_buf;
-  u_char              *str;
-  ngx_int_t            len;
-  
-  static const struct {
-    int8_t            len;
-    const u_char      method[11];
-    uint32_t          code;
-  } tests[] = {
-    { 3, "GET ",       NGX_HTTP_GET },
-    { 4, "POST ",      NGX_HTTP_POST },
-    { 4, "HEAD ",      NGX_HTTP_HEAD },
-    { 7, "OPTIONS ",   NGX_HTTP_OPTIONS },
-    { 8, "PROPFIND ",  NGX_HTTP_PROPFIND },
-    { 3, "PUT ",       NGX_HTTP_PUT },
-    { 5, "MKCOL ",     NGX_HTTP_MKCOL },
-    { 6, "DELETE ",    NGX_HTTP_DELETE },
-    { 4, "COPY ",      NGX_HTTP_COPY },
-    { 4, "MOVE ",      NGX_HTTP_MOVE },
-    { 9, "PROPPATCH ", NGX_HTTP_PROPPATCH },
-    { 4, "LOCK ",      NGX_HTTP_LOCK },
-    { 6, "UNLOCK ",    NGX_HTTP_UNLOCK },
-    { 5, "PATCH ",     NGX_HTTP_PATCH },
-    { 5, "TRACE ",     NGX_HTTP_TRACE }
-  };
-  
-  request_buf = *r->upstream->request_bufs->buf;
-  str= request_buf.start;
-  len = request_buf.end - request_buf.start;
-  
-  for(i=0; i < sizeof(tests) / sizeof(tests[0]); i++) {
-    if(len >= tests[i].len + 1 && ngx_strncmp(str, tests[i].method, tests[i].len + 1) == 0) {
-      r->method = tests[i].code;
-      r->method_name.len = tests[i].len;
-      r->method_name.data = (u_char *)tests[i].method;
-      break;
-    }
-  }
-}
-#endif
-
-
-static void nchan_recover_http_request_method(ngx_http_request_t *r) {
-  ngx_http_request_t       rdummy;
-  ngx_buf_t                header_in_buf = *r->header_in;
-  ngx_int_t                rc;
-  
-  header_in_buf.pos = header_in_buf.start;
-  ngx_memzero(&rdummy, sizeof(rdummy));
-  rdummy.request_line = r->request_line;
-  
-  rc = ngx_http_parse_request_line(&rdummy, &header_in_buf);
-
-  if (rc == NGX_OK) {
-    r->method_name.len = rdummy.method_end - rdummy.request_start + 1;
-    r->method_name.data = rdummy.request_line.data;
-    r->method = rdummy.method;
-  }
-}
-
-ngx_int_t nchan_recover_x_accel_redirected_request_method(ngx_http_request_t *r) {
-#if (NGX_HTTP_V2)
-  if(r->stream) {
-    nchan_recover_upstream_hacky_request_method(r);
-  }
-  else {
-    nchan_recover_http_request_method(r);
-  }
-#elif (NGX_HTTP_SPDY)
-  if(r->spdy_stream) {
-    nchan_recover_upstream_hacky_request_method(r);
-  }
-  else {
-    nchan_recover_http_request_method(r);
-  }
-#else
-  nchan_recover_http_request_method(r);
-#endif
-  return NGX_OK;
-}
-
-size_t nchan_subrequest_content_length(ngx_http_request_t *sr) {
-  size_t                            len = 0;
-  ngx_http_upstream_headers_in_t   *headers_in = &sr->upstream->headers_in;
-  ngx_chain_t                      *chain;
-  ngx_chain_t                      *body_chain;
-#if nginx_version >= 1013010
-  body_chain = sr->out;
-#else
-  body_chain = sr->upstream->out_bufs;
-#endif
-  
-  
-  if(headers_in->chunked || headers_in->content_length_n == -1) {
-    //count it
-    for(chain = body_chain; chain != NULL; chain = chain->next) {
-      len += ngx_buf_size((chain->buf));
-    }
-  }
-  else {
-    len = headers_in->content_length_n > 0 ? headers_in->content_length_n : 0;
-  }
-  
-  return len;
-}
-
-
-ngx_http_request_t *nchan_create_subrequest(ngx_http_request_t *r, ngx_str_t *url, ngx_buf_t *body, ngx_http_post_subrequest_pt cb, void *pd) {
-  ngx_http_post_subrequest_t    *psr = ngx_pcalloc(r->pool, sizeof(*psr));
-  ngx_http_request_t            *sr;
-  
-  psr->handler = cb;
-  psr->data = pd;
-  
-  ngx_http_subrequest(r, url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
-  
-  if((sr->request_body = ngx_pcalloc(r->pool, sizeof(*sr->request_body))) == NULL) { //dummy request body 
-    return NULL;
-  }
-  
-  if(body && ngx_buf_size(body) > 0) {
-    static ngx_str_t                   POST_REQUEST_STRING = {4, (u_char *)"POST "};
-    size_t                             sz;
-    ngx_http_request_body_t           *sr_body = sr->request_body;
-    ngx_chain_t                       *fakebody_chain;
-    ngx_buf_t                         *fakebody_buf;
-    
-    fakebody_chain = ngx_palloc(r->pool, sizeof(*fakebody_chain));
-    fakebody_buf = ngx_pcalloc(r->pool, sizeof(*fakebody_buf));
-    sr_body->bufs = fakebody_chain;
-    fakebody_chain->next = NULL;
-    fakebody_chain->buf = fakebody_buf;
-    fakebody_buf->last_buf = 1;
-    fakebody_buf->last_in_chain = 1;
-    fakebody_buf->flush = 1;
-    fakebody_buf->memory = 1;
-    
-    //just copy the buffer contents. it's inefficient but I don't care at the moment.
-    //this can and should be optimized later
-    sz = ngx_buf_size(body);
-    fakebody_buf->start = ngx_palloc(r->pool, sz); //huuh?
-    ngx_memcpy(fakebody_buf->start, body->start, sz);
-    fakebody_buf->end = fakebody_buf->start + sz;
-    fakebody_buf->pos = fakebody_buf->start;
-    fakebody_buf->last = fakebody_buf->end;
-    
-    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, sr_body, sz);
-  }
-  else {
-    sr->header_only = 1;
-  }
-  sr->args = r->args;
-  
-  return sr;
-}
diff --git a/debian/modules/nchan/src/util/nchan_subrequest.h b/debian/modules/nchan/src/util/nchan_subrequest.h
deleted file mode 100644
index b96b78d..0000000
--- a/debian/modules/nchan/src/util/nchan_subrequest.h
+++ /dev/null
@@ -1,6 +0,0 @@
-ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t len);
-ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n);
-size_t nchan_subrequest_content_length(ngx_http_request_t *sr);
-ngx_int_t nchan_recover_x_accel_redirected_request_method(ngx_http_request_t *r);
-
-ngx_http_request_t *nchan_create_subrequest(ngx_http_request_t *r, ngx_str_t *url, ngx_buf_t *body, ngx_http_post_subrequest_pt cb, void *pd);
diff --git a/debian/modules/nchan/src/util/nchan_thingcache.c b/debian/modules/nchan/src/util/nchan_thingcache.c
deleted file mode 100644
index 537ea98..0000000
--- a/debian/modules/nchan/src/util/nchan_thingcache.c
+++ /dev/null
@@ -1,208 +0,0 @@
-#include <nchan_module.h>
-#include <uthash.h>
-#define THING_HASH_FIND(tc, id_str, p)    HASH_FIND( hh, tc->things, (id_str)->data, (id_str)->len, p)
-#define THING_HASH_ADD(tc, thing)      HASH_ADD_KEYPTR( hh, tc->things, (thing->id).data, (thing->id).len, thing)
-#define THING_HASH_DEL(tc, thing)      HASH_DEL(tc->things, thing)
-
-#undef uthash_malloc
-#undef uthash_free
-#define uthash_malloc(sz) ngx_alloc(sz, ngx_cycle->log)
-#define uthash_free(ptr,sz) ngx_free(ptr)
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "THINGCACHE: " fmt, ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "THINGCACHE: " fmt, ##args)
-
-typedef struct {
-  ngx_str_t            id;
-  nchan_llist_timed_t  ll;
-  UT_hash_handle       hh;
-} thing_t;
-
-typedef struct {
-  void *               (*create)(ngx_str_t *id);
-  ngx_int_t            (*destroy)(ngx_str_t *id, void *);
-  char                  *name;
-  ngx_uint_t             ttl;
-  thing_t               *things;
-  nchan_llist_timed_t   *thing_head;
-  nchan_llist_timed_t   *thing_tail;
-  ngx_event_t            gc_timer;
-} nchan_thing_cache_t;
-
-/*
-static ngx_int_t walk_tc(nchan_thing_cache_t *tc) {
-  nchan_llist_timed_t    *cur;
-  int                     head_to_tail = 0, tail_to_head = 0;
-  for(cur = tc->thing_head; cur != NULL; cur = cur->next) {
-    head_to_tail++;
-  }
-  for(cur = tc->thing_tail; cur != NULL; cur = cur->prev) {
-    tail_to_head++;
-  }
-  
-  assert(head_to_tail == tail_to_head);
-  return tail_to_head;
-}
-
-static void verify_tc(nchan_thing_cache_t *tc) {
-  thing_t                *thing, *ttmp;
-  int                    hash = 0;
-  HASH_ITER(hh, (tc->things), thing, ttmp) {  
-    hash++;
-  }
-  assert(walk_tc(tc) == hash);
-}
-*/
-
-static void enqueue_llist_thing(nchan_thing_cache_t *tc, nchan_llist_timed_t *cur) {
-  //verify_tc(tc);
-  if(tc->thing_head == NULL) {
-    cur->prev = NULL;
-    tc->thing_head = cur;
-  }
-  if(tc->thing_tail) {
-    tc->thing_tail->next = cur;
-  }
-  cur->prev = tc->thing_tail;
-  cur->next = NULL;
-  cur->time = ngx_time() + tc->ttl;
-  tc->thing_tail = cur;
-  
-  //start the clock
-  if(! tc->gc_timer.timer_set) {
-    ngx_add_timer(&tc->gc_timer, tc->ttl * 1000);
-  }
-  //walk_tc(tc);
-}
-
-static void nchan_thingcache_gc_timer_handler(ngx_event_t *ev) {
-  nchan_llist_timed_t    *cur, *next;
-  nchan_thing_cache_t    *tc = (nchan_thing_cache_t *)ev->data;
-  time_t                  time = ngx_time();
-  thing_t                *thing;
-  cur = tc->thing_head;
-  while(cur != NULL) {
-    //verify_tc(tc);
-    next = cur->next;
-    if(cur->time <= time) {
-      if(cur->prev) {
-        cur->prev->next = next;
-      }
-      if(next) {
-        next->prev = cur->prev;
-      }
-      thing = container_of(cur, thing_t, ll);
-      if(!tc->destroy(&thing->id, thing->ll.data)) {
-        //time extended!
-        enqueue_llist_thing(tc, cur);
-      }
-      else {
-        if(tc->thing_head == cur) {
-          tc->thing_head = cur->next;
-        }
-        if(tc->thing_tail == cur) {
-          tc->thing_tail = cur->prev;
-        }
-        THING_HASH_DEL(tc, thing);
-        //verify_tc(tc);
-        ngx_free(thing);
-      }
-    }
-    else {
-      break;
-    }
-    cur = next;
-  }
-  
-  if(tc->thing_head != NULL) {
-    ngx_add_timer(&tc->gc_timer, tc->ttl * 1000);
-  }
-  //verify_tc(tc);
-}
-
-void *nchan_thingcache_init(char *name, void *(*create)(ngx_str_t *), ngx_int_t(*destroy)(ngx_str_t *, void *), ngx_uint_t ttl) {
-  nchan_thing_cache_t *tc;
-  if((tc = ngx_alloc(sizeof(*tc), ngx_cycle->log)) == NULL) {
-    return NULL;
-  }
-  DBG("init %s %p", name, tc);
-  
-  tc->name = name;
-  tc->create = create;
-  tc->destroy = destroy;
-  tc->ttl = ttl;
-  tc->thing_head = NULL;
-  tc->thing_tail = NULL;
-  tc->things = NULL;
-  ngx_memzero(&tc->gc_timer, sizeof(tc->gc_timer));
-  nchan_init_timer(&tc->gc_timer, nchan_thingcache_gc_timer_handler, tc);
-  return (void *)tc;
-}
-
-ngx_int_t nchan_thingcache_shutdown(void *tcv) {
-  nchan_thing_cache_t   *tc = (nchan_thing_cache_t *)tcv;
-  nchan_llist_timed_t   *cur = tc->thing_head;
-  thing_t               *thing;
-  nchan_llist_timed_t   *next; 
-  DBG("shutdown %s %p", tc->name, tc);
-  
-  while(cur != NULL) {
-    thing = container_of(cur, thing_t, ll);
-    next = cur->next;
-    tc->destroy(&thing->id, cur->data);
-    THING_HASH_DEL(tc, thing);
-    ngx_free(thing);
-    cur = next;
-  }
-  
-  if(tc->gc_timer.timer_set) {
-    ngx_del_timer(&tc->gc_timer);
-  }
-  
-  ngx_free(tc);
-  return NGX_OK;
-}
-
-void *nchan_thingcache_find(void *tcv, ngx_str_t *id) {
-  nchan_thing_cache_t   *tc = (nchan_thing_cache_t *)tcv;
-  thing_t               *thing;
-  
-  //verify_tc(tc);
-  THING_HASH_FIND(tc, id, thing);
-  return thing ? thing->ll.data : NULL;
-}
-
-void *nchan_thingcache_get(void *tcv, ngx_str_t *id) {
-  nchan_thing_cache_t   *tc = (nchan_thing_cache_t *)tcv;
-  nchan_llist_timed_t   *cur;
-  thing_t               *thing;
-  
-  //verify_tc(tc);
-  
-  THING_HASH_FIND(tc, id, thing);
-  if(thing == NULL) {
-    DBG("not found in %s %p", tc->name, tc);
-    
-    if((thing = ngx_alloc(sizeof(*thing) + id->len, ngx_cycle->log)) == NULL) {
-      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "nchan thingcache %p: can't allocate memory for thing with id %V", tc, id);
-      return NULL;
-    }
-    cur = &thing->ll;
-    cur->data = thing;
-    thing->id.len = id->len;
-    thing->id.data = (u_char *)(&thing[1]);
-    ngx_memcpy(thing->id.data, id->data, id->len);
-    
-    thing->ll.data = tc->create(id);
-    
-    enqueue_llist_thing(tc, cur);
-    THING_HASH_ADD(tc, thing);
-  }
-  
-  //verify_tc(tc);
-  
-  return thing->ll.data;
-}
diff --git a/debian/modules/nchan/src/util/nchan_thingcache.h b/debian/modules/nchan/src/util/nchan_thingcache.h
deleted file mode 100644
index 2b0b8bd..0000000
--- a/debian/modules/nchan/src/util/nchan_thingcache.h
+++ /dev/null
@@ -1,4 +0,0 @@
-void *nchan_thingcache_init(char *name, void *(*create)(ngx_str_t *), ngx_int_t(*destroy)(ngx_str_t *, void *), ngx_uint_t ttl);
-ngx_int_t nchan_thingcache_shutdown(void *tcv);
-void *nchan_thingcache_get(void *tcv, ngx_str_t *id);
-void *nchan_thingcache_find(void *tcv, ngx_str_t *id);
\ No newline at end of file
diff --git a/debian/modules/nchan/src/util/nchan_util.c b/debian/modules/nchan/src/util/nchan_util.c
deleted file mode 100644
index d3fb428..0000000
--- a/debian/modules/nchan/src/util/nchan_util.c
+++ /dev/null
@@ -1,1273 +0,0 @@
-#include <nchan_module.h>
-#include <assert.h>
-
-#if (NGX_ZLIB)
-#include <zlib.h>
-#endif
-
-#ifndef NCHAN_HAVE_MEMRCHR
-void *memrchr(const void *s, int c, size_t n) {
-  const char *start = s;
-  const char *end = &start[n]; //one too much on purpose
-  while(--end >= start) { //and this is why
-    if(c == *end) {
-      return (void *)end;
-    }
-  }
-  return NULL;
-}
-#endif
-
-int nchan_ngx_str_match(ngx_str_t *str1, ngx_str_t *str2) {
-  if(str1 == str2) {
-    return 1;
-  }
-  if(str1->len != str2->len) {
-    return 0;
-  }
-  if(str1->len == 0) {
-    return 1;
-  }
-  return memcmp(str1->data, str2->data, str1->len) == 0;
-}
-
-
-int nchan_ngx_str_nonzero_match(ngx_str_t *str1, ngx_str_t *str2) {
-  if(str1->len == 0) {
-    return 0;
-  }
-  else {
-    return nchan_ngx_str_match(str1, str2);
-  }
-}
-
-int nchan_strscanstr(u_char **cur, ngx_str_t *find, u_char *last) {
-  //inspired by ngx_strnstr
-  char   *s2 = (char *)find->data;
-  u_char *s1 = *cur;
-  size_t  len = last - s1;
-  u_char  c1, c2;
-  size_t  n;
-  c2 = *(u_char *) s2++;
-  n = find->len - 1;
-  do {
-    do {
-      if (len-- == 0) {
-        return 0;
-      }
-      c1 = *s1++;
-      if (c1 == 0) {
-        return 0;
-      }
-    } while (c1 != c2);
-    if (n > len) {
-      return 0;
-    }
-  } while (ngx_strncmp(s1, (u_char *) s2, n) != 0);
-  *cur = s1 + n;
-  return 1;
-}
-
-ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen) {
-  size_t                        len;
-  ngx_http_script_code_pt       code;
-  ngx_http_script_len_code_pt   lcode;
-  ngx_http_script_engine_t      e;
-
-  if (val->lengths == NULL) {
-    *value = val->value;
-    return NGX_OK;
-  }
-
-  ngx_http_script_flush_complex_value(r, val);
-
-  ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
-
-  e.ip = val->lengths;
-  e.request = r;
-  e.flushed = 1;
-
-  len = 0;
-
-  while (*(uintptr_t *) e.ip) {
-    lcode = *(ngx_http_script_len_code_pt *) e.ip;
-    len += lcode(&e);
-  }
-  
-  if(len > maxlen) {
-    return NGX_ERROR;
-  }
-  
-  value->len = len;
-
-  e.ip = val->values;
-  e.pos = value->data;
-  e.buf = *value;
-
-  while (*(uintptr_t *) e.ip) {
-    code = *(ngx_http_script_code_pt *) e.ip;
-    code((ngx_http_script_engine_t *) &e);
-  }
-
-  *value = e.buf;
-
-  return NGX_OK;
-}
-
-ngx_int_t ngx_http_complex_value_alloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen) {
-  size_t                        len;
-  ngx_http_script_code_pt       code;
-  ngx_http_script_len_code_pt   lcode;
-  ngx_http_script_engine_t      e;
-
-  if (val->lengths == NULL) {
-    *value = val->value;
-    return NGX_OK;
-  }
-
-  ngx_http_script_flush_complex_value(r, val);
-
-  ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
-
-  e.ip = val->lengths;
-  e.request = r;
-  e.flushed = 1;
-
-  len = 0;
-
-  while (*(uintptr_t *) e.ip) {
-    lcode = *(ngx_http_script_len_code_pt *) e.ip;
-    len += lcode(&e);
-  }
-  
-  if(len > maxlen) {
-    return NGX_ERROR;
-  }
-  
-  if((value->data = ngx_alloc(len, r->connection->log)) == NULL) {
-    return NGX_ERROR;
-  }
-  
-  value->len = len;
-
-  e.ip = val->values;
-  e.pos = value->data;
-  e.buf = *value;
-
-  while (*(uintptr_t *) e.ip) {
-    code = *(ngx_http_script_code_pt *) e.ip;
-    code((ngx_http_script_engine_t *) &e);
-  }
-
-  *value = e.buf;
-
-  return NGX_OK;
-}
-
-ngx_int_t ngx_http_complex_value_free(ngx_str_t *value) {
-  ngx_free(value->data);
-  value->data = NULL;
-  value->len = 0;
-  return NGX_OK;
-}
-
-ngx_int_t ngx_http_complex_value_custom_pool(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, ngx_pool_t *pool) {
-  size_t                        len;
-  ngx_http_script_code_pt       code;
-  ngx_http_script_len_code_pt   lcode;
-  ngx_http_script_engine_t      e;
-
-  if (val->lengths == NULL) {
-    *value = val->value;
-    return NGX_OK;
-  }
-
-  ngx_http_script_flush_complex_value(r, val);
-
-  ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
-
-  e.ip = val->lengths;
-  e.request = r;
-  e.flushed = 1;
-
-  len = 0;
-
-  while (*(uintptr_t *) e.ip) {
-    lcode = *(ngx_http_script_len_code_pt *) e.ip;
-    len += lcode(&e);
-  }
-  
-  value->data = ngx_palloc(pool, len);
-  if(value->data == NULL) {
-    nchan_log_error("couldn't palloc for ngx_http_complex_value_custom_pool");
-    return NGX_ERROR;
-  }
-  value->len = len;
-
-  e.ip = val->values;
-  e.pos = value->data;
-  e.buf = *value;
-
-  while (*(uintptr_t *) e.ip) {
-    code = *(ngx_http_script_code_pt *) e.ip;
-    code((ngx_http_script_engine_t *) &e);
-  }
-
-  *value = e.buf;
-
-  return NGX_OK;
-}
-
-u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char) {
-  u_char   *delim = sub->data;
-  size_t    delim_sz = sub->len;
-  u_char   *last = last_char - delim_sz;
-  u_char   *cur;
-  
-  for(cur = *s1; cur < last; cur++) {
-    if(ngx_strncmp(cur, delim, delim_sz) == 0) {
-      *s1 = cur + delim_sz;
-      return cur;
-    }
-  }
-  *s1 = last_char;
-  if(cur == last) {
-    return last_char;
-  }
-  else if(cur > last) {
-    return NULL;
-  }
-  assert(0);
-  return NULL;
-}
-
-ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name) {
-  ngx_uint_t                       i;
-  ngx_list_part_t                 *part = &r->headers_in.headers.part;
-  ngx_table_elt_t                 *header= part->elts;
-  
-  for (i = 0; /* void */ ; i++) {
-    if (i >= part->nelts) {
-      if (part->next == NULL) {
-        break;
-      }
-      part = part->next;
-      header = part->elts;
-      i = 0;
-    }
-    if (header[i].key.len == header_name.len
-      && ngx_strncasecmp(header[i].key.data, header_name.data, header[i].key.len) == 0) {
-      return &header[i].value;
-      }
-  }
-  return NULL;
-}
-
-ngx_str_t *nchan_get_header_value_origin(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
-  ngx_str_t         *origin_header;
-  static ngx_str_t   empty_str = ngx_string("");
-  if(!ctx) {
-    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  }
-  
-  if(!ctx->request_origin_header) {
-    if((origin_header = nchan_get_header_value(r, NCHAN_HEADER_ORIGIN)) != NULL) {
-      ctx->request_origin_header = origin_header;
-    }
-    else {
-      ctx->request_origin_header = &empty_str;
-    }
-  }
-  
-  return ctx->request_origin_header == &empty_str ? NULL : ctx->request_origin_header;
-}
-
-ngx_str_t *nchan_get_accept_header_value(ngx_http_request_t *r) {
-#if (NGX_HTTP_HEADERS)  
-  if(r->headers_in.accept == NULL) {
-    return NULL;
-  }
-  else {
-    return &r->headers_in.accept->value;
-  }
-#else
-  ngx_str_t             accept_header_name = ngx_string("Accept");
-  return nchan_get_header_value(r, accept_header_name);
-#endif
-}
-
-static int nchan_strmatch_va_list(ngx_str_t *val, ngx_int_t n, va_list args) {
-  u_char   *match;
-  ngx_int_t i;
-  for(i=0; i<n; i++) {
-    match = va_arg(args, u_char *);
-    if(ngx_strncasecmp(val->data, match, val->len)==0) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-int nchan_strmatch(ngx_str_t *val, ngx_int_t n, ...) {
-  int      rc;
-  va_list  args;
-  va_start(args, n);  
-  rc = nchan_strmatch_va_list(val, n, args);
-  va_end(args);
-  return rc;
-}
-
-int nchan_cstrmatch(char *cstr, ngx_int_t n, ...) {
-  int       rc;
-  va_list   args;
-  ngx_str_t str;
-  str.data = (u_char *)cstr;
-  str.len = strlen(cstr);
-  va_start(args, n);  
-  rc = nchan_strmatch_va_list(&str, n, args);
-  va_end(args);
-  return rc;
-}
-
-int nchan_cstr_startswith(char *cstr, char *match) {
-  for(/*void*/; *match != '\0'; cstr++, match++) {
-    if(*cstr == '\0' || *cstr != *match)
-      return 0;
-  }
-  return 1;
-}
-int nchan_str_startswith(ngx_str_t *str, const char *match) {
-  size_t sz = strlen(match);
-  if(sz > str->len) {
-    return 0;
-  }
-  if(memcmp(str->data, match, sz) == 0) {
-    return 1;
-  }
-  return 0;
-}
-
-int nchan_str_after(ngx_str_t **str, const char *match) {
-  if(nchan_str_startswith(*str, match)) {
-    size_t sz = strlen(match);
-    (*str)->data+=sz;
-    (*str)->len-=sz;
-    return 1;
-  }
-  else {
-    return 0;
-  }
-}
-
-
-void nchan_scan_split_by_chr(u_char **cur, size_t max_len, ngx_str_t *str, u_char chr) {
-  u_char   *shortest = NULL;
-  u_char   *start = *cur;
-  u_char   *tmp_cur;
-  
-  for(tmp_cur = *cur; shortest == NULL && (tmp_cur == *cur || tmp_cur - start < (ssize_t )max_len); tmp_cur++) {
-    if(*tmp_cur == chr) {
-      shortest = tmp_cur;
-    }
-  }
-  if(shortest) {
-    str->data = (u_char *)*cur;
-    str->len = shortest - *cur;
-    *cur = shortest + 1;
-  }
-  else if(tmp_cur - start == (ssize_t )max_len) {
-    str->data = start;
-    str->len = max_len;
-    *cur = start + max_len;
-  }
-  else {
-    str->data = NULL;
-    str->len = 0;
-  }
-}
-
-void nchan_scan_until_chr_on_line(ngx_str_t *line, ngx_str_t *str, u_char chr) {
-  u_char     *cur;
-  //ERR("rest_line: \"%V\"", line);
-  cur = (u_char *)memchr(line->data, chr, line->len);
-  if(!cur) {
-    if(str) {
-      *str = *line;
-    }
-    line->data += line->len;
-    line->len = 0;
-  }
-  else {
-    if(str) {
-      str->data = line->data;
-      str->len = (cur - line->data);
-    }
-    line->len -= (cur - line->data) + 1;
-    line->data += (cur - line->data) + 1;
-  }
-  //ERR("str: \"%V\"", str);
-}
-
-void nchan_strcpy(ngx_str_t *dst, ngx_str_t *src, size_t maxlen) {
-  size_t len = src->len > maxlen && maxlen > 0 ? maxlen : src->len;
-  memcpy(dst->data, src->data, len);
-  dst->len = len;
-}
-
-static ngx_buf_t *ensure_last_buf(ngx_pool_t *pool, ngx_buf_t *buf) {
-  ngx_buf_t *cbuf;
-  if(buf->last_buf == 1) {
-    return buf;
-  }
-  else {
-    cbuf = ngx_create_temp_buf(pool,sizeof(*cbuf));
-    *cbuf = *buf;
-    cbuf->last_buf = 1;
-    return cbuf;
-  }
-}
-
-ngx_str_t *nchan_get_allow_origin_value(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx) {
-  if(!ctx) ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
-  if(!cf)  cf  = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
-  if(!ctx->allow_origin && cf->allow_origin) {
-    ngx_str_t                 *allow_origin = ngx_palloc(r->pool, sizeof(*allow_origin));
-    ngx_http_complex_value(r, cf->allow_origin, allow_origin);
-    ctx->allow_origin = allow_origin;
-  }
-  
-  return ctx->allow_origin;
-}
-
-int nchan_match_origin_header(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx) {
-  ngx_str_t                 *origin_header;
-  ngx_str_t                 *allow_origin;
-  ngx_str_t                  curstr;
-  u_char                    *cur, *end;
-  
-  if(cf->allow_origin == NULL) { //default is to always match
-    return 1;
-  }
-  
-  if((origin_header = nchan_get_header_value_origin(r, ctx)) == NULL) {
-    return 1;
-  }
-
-  allow_origin = nchan_get_allow_origin_value(r, cf, ctx);
-  
-  cur = allow_origin->data;
-  end = cur + allow_origin->len;
-  
-  while(cur < end) {
-    nchan_scan_split_by_chr(&cur, end - cur, &curstr, ' ');
-    if(curstr.len == 1 && curstr.data[0] == '*') {
-      return 1;
-    }
-    if(nchan_ngx_str_match(&curstr, origin_header)) {
-      return 1;
-    }
-  }
-  
-  return 0;
-}
-
-// this function adapted from push stream module. thanks Wandenberg Peixoto <wandenberg@gmail.com> and Rogério Carvalho Schneider <stockrt@gmail.com>
-ngx_buf_t * nchan_chain_to_single_buffer(ngx_pool_t *pool, ngx_chain_t *chain, size_t content_length) {
-  ngx_buf_t *buf = NULL;
-  ssize_t n;
-  size_t len;
-
-  if (chain->next == NULL) {
-    return ensure_last_buf(pool, chain->buf);
-  }
-  //nchan_log_error("multiple buffers in request, need memcpy :(");
-  if (chain->buf->in_file) {
-    if (ngx_buf_in_memory(chain->buf)) {
-      nchan_log_error("can't handle a buffer in a temp file and in memory ");
-    }
-    if (chain->next != NULL) {
-      nchan_log_error("error reading request body with multiple ");
-    }
-    return ensure_last_buf(pool, chain->buf);
-  }
-  buf = ngx_create_temp_buf(pool, content_length + 1);
-  if (buf != NULL) {
-    ngx_memset(buf->start, '\0', content_length + 1);
-    while ((chain != NULL) && (chain->buf != NULL)) {
-      len = ngx_buf_size(chain->buf);
-      // if buffer is equal to content length all the content is in this buffer
-      if (len >= content_length) {
-        buf->start = buf->pos;
-        buf->last = buf->pos;
-        len = content_length;
-      }
-      if (chain->buf->in_file) {
-        n = ngx_read_file(chain->buf->file, buf->start, len, 0);
-        if (n == NGX_FILE_ERROR) {
-          nchan_log_error("cannot read file with request body");
-          return NULL;
-        }
-        buf->last = buf->last + len;
-        ngx_delete_file(chain->buf->file->name.data);
-        chain->buf->file->fd = NGX_INVALID_FILE;
-      } else {
-        buf->last = ngx_copy(buf->start, chain->buf->pos, len);
-      }
-      
-      chain = chain->next;
-      buf->start = buf->last;
-    }
-    buf->last_buf = 1;
-  }
-  return buf;
-}
-
-ngx_int_t nchan_init_timer(ngx_event_t *ev, void (*cb)(ngx_event_t *), void *pd) {
-#if nginx_version >= 1008000
-  ev->cancelable = 1;
-#endif
-  ev->handler = cb;
-  ev->data = pd;
-  ev->log = ngx_cycle->log;
-  return NGX_OK;
-}
-
-
-typedef struct {
-  ngx_event_t    ev;
-  void          (*cb)(void *pd);
-} oneshot_timer_t;
-
-void oneshot_timer_callback(ngx_event_t *ev) {
-  oneshot_timer_t  *timer = container_of(ev, oneshot_timer_t, ev);
-  timer->cb(ev->data);
-  ngx_free(timer);
- }
-
-void *nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay) {
-  oneshot_timer_t *timer = ngx_alloc(sizeof(*timer), ngx_cycle->log);
-  ngx_memzero(&timer->ev, sizeof(timer->ev));
-  timer->cb = cb;
-  nchan_init_timer(&timer->ev, oneshot_timer_callback, pd);
-  ngx_add_timer(&timer->ev, delay);
-  return timer;
-}
-
-void nchan_abort_oneshot_timer(void *t) {
-  oneshot_timer_t *timer = t;
-  if(timer->ev.timer_set) {
-    ngx_del_timer(&timer->ev);
-  }
-  ngx_free(timer);
-}
-
-typedef struct {
-  ngx_event_t    ev;
-  ngx_msec_t     wait;
-  ngx_int_t    (*cb)(void *pd);
-} interval_timer_t;
-
-void interval_timer_callback(ngx_event_t *ev) {
-  interval_timer_t  *timer = container_of(ev, interval_timer_t, ev);
-  ngx_int_t rc = timer->cb(ev->data);
-  if((rc == NGX_OK || rc == NGX_AGAIN) && ev->timedout) {
-    ev->timedout=0;
-    ngx_add_timer(&timer->ev, timer->wait);
-  }
-  else if(rc > NGX_OK && ev->timedout) {
-    timer->wait = rc;
-    ev->timedout=0;
-    ngx_add_timer(&timer->ev, timer->wait);
-  }
-  else { //rc < 0, != NGX_EAGAIN
-    //NGX_DONE, for example, or NGX_ABORT
-    ngx_free(timer);
-  }
-}
-
-void *nchan_add_interval_timer(ngx_int_t (*cb)(void *), void *pd, ngx_msec_t interval) {
-  interval_timer_t *timer = ngx_alloc(sizeof(*timer), ngx_cycle->log);
-  ngx_memzero(&timer->ev, sizeof(timer->ev));
-  timer->cb = cb;
-  timer->wait = interval;
-  nchan_init_timer(&timer->ev, interval_timer_callback, pd);
-  ngx_add_timer(&timer->ev, interval);
-  return timer;
-}
-void nchan_abort_interval_timer(void *t) {
-  interval_timer_t *timer = t;
-  if(timer->ev.timer_set) {
-    ngx_del_timer(&timer->ev);
-  }
-  ngx_free(timer);
-}
-
-
-ngx_str_t *nchan_urldecode_str(ngx_http_request_t *r, ngx_str_t *str) {
-  ngx_str_t   *out;
-  u_char      *dst, *src;
-  if(memchr(str->data, '%', str->len) == NULL) {
-    return str;
-  }
-  
-  out = ngx_palloc(r->pool, sizeof(*out) + str->len);
-  out->data = (u_char *)&out[1];
-  
-  dst = out->data;
-  src = str->data;
-  
-  ngx_unescape_uri(&dst, &src, str->len, 0);
-  out->len = dst - out->data;
-  
-  return out;
-}
-
-int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz) {
-  //naive non-null-terminated string matcher. don't use it in tight loops!
-  char   *cur = (char *)str->data;
-  size_t  len;
-  for(len = str->len; len >= sz; cur++, len--) {
-    if(strncmp(cur, substr, sz) == 0) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-int nchan_cstr_match_line(const char *cstr, const char *line) {
-  ngx_str_t rest;
-  if(nchan_get_rest_of_line_in_cstr(cstr, line, &rest)) {
-    return rest.len == 0 ? 1 : 0;
-  }
-  return 0;
-}
-
-int nchan_get_rest_of_line_in_cstr(const char *cstr, const char *line_start, ngx_str_t *rest) {
-  const char *cur = cstr;
-  const char *end = cur + strlen(cur);
-  
-  while(cur && cur < end) {
-    char *first = strstr(cstr, line_start);
-    if(!first) { //not found at all
-      if(rest) rest->len = 0;
-      return 0;
-    }
-    
-    if(first == cstr || first[-1]=='\n') { //start of line or start of string
-      const char *last = strchr(first, '\n');
-      if(!last) { // end of string
-        last = end;
-      }
-      else if(last > first && last[-1]=='\r') {
-        last--;
-      }
-      if(rest) {
-        rest->len = last - first - strlen(line_start);
-        rest->data = (u_char *)first + strlen(line_start);
-      }
-      return 1;
-    }
-    else {
-      //we found a match in the middle of the string
-      cur = strchr(cur, '\n'); //move on, redo
-    }
-  }
-  return 0;
-}
-
-//converts string to positive double float
-static double nchan_atof(u_char *line, ssize_t n) {
-  ssize_t cutoff, cutlim;
-  double  value = 0;
-  
-  u_char *decimal, *cur, *last = line + n;
-  
-  if (n == 0) {
-    return NGX_ERROR;
-  }
-
-  cutoff = NGX_MAX_SIZE_T_VALUE / 10;
-  cutlim = NGX_MAX_SIZE_T_VALUE % 10;
-  
-  decimal = memchr(line, '.', n);
-  
-  if(decimal == NULL) {
-    decimal = line + n;
-  }
-  
-  for (n = decimal - line; n-- > 0; line++) {
-    if (*line < '0' || *line > '9') {
-      return NGX_ERROR;
-    }
-
-    if (value >= cutoff && (value > cutoff || (*line - '0') > cutlim)) {
-      return NGX_ERROR;
-    }
-
-    value = value * 10 + (*line - '0');
-  }
-  
-  double decval = 0;
-  
-  
-  
-  for(cur = (decimal - last) > 10 ? decimal + 10 : last-1; cur > decimal && cur < last; cur--) {
-    if (*cur < '0' || *cur > '9') {
-      return NGX_ERROR;
-    }
-    decval = decval / 10 + (*cur - '0');
-  }
-  value = value + decval/10;
-  
-  return value;
-}
-
-ssize_t nchan_parse_size(ngx_str_t *line) {
-  u_char   unit;
-  size_t   len;
-  ssize_t  size, scale, max;
-  double   floaty;
-  
-  len = line->len;
-  unit = line->data[len - 1];
-
-  switch (unit) {
-  case 'K':
-  case 'k':
-      len--;
-      max = NGX_MAX_SIZE_T_VALUE / 1024;
-      scale = 1024;
-      break;
-
-  case 'M':
-  case 'm':
-      len--;
-      max = NGX_MAX_SIZE_T_VALUE / (1024 * 1024);
-      scale = 1024 * 1024;
-      break;
-  
-  case 'G':
-  case 'g':
-      len--;
-      max = NGX_MAX_SIZE_T_VALUE / (1024 * 1024 * 1024);
-      scale = 1024 * 1024 * 1024;
-      break;
-
-  default:
-      max = NGX_MAX_SIZE_T_VALUE;
-      scale = 1;
-  }
-
-  floaty = nchan_atof(line->data, len);
-  
-  if (floaty == NGX_ERROR || floaty > max) {
-      return NGX_ERROR;
-  }
-
-  size = floaty * scale;
-
-  return size;
-}
-
-char *nchan_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
-  char  *p = conf;
-
-  size_t           *sp;
-  ngx_str_t        *value;
-  ngx_conf_post_t  *post;
-
-
-  sp = (size_t *) (p + cmd->offset);
-  if (*sp != NGX_CONF_UNSET_SIZE) {
-      return "is duplicate";
-  }
-
-  value = cf->args->elts;
-
-  *sp = nchan_parse_size(&value[1]);
-  if (*sp == (size_t) NGX_ERROR) {
-    return "invalid value";
-  }
-
-  if (cmd->post) {
-    post = cmd->post;
-    return post->post_handler(cf, post, sp);
-  }
-
-  return NGX_CONF_OK;
-}
-
-void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end) {
-  ngx_memzero(buf, sizeof(*buf));
-  buf->start = start;
-  buf->pos = start;
-  buf->end = end;
-  buf->last = end;
-  buf->memory = 1;
-}
-
-void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str) {
-  ngx_memzero(buf, sizeof(*buf));
-  buf->start = str->data;
-  buf->pos = str->data;
-  buf->end = str->data + str->len;
-  buf->last = buf->end;
-  buf->memory = 1;
-}
-
-
-#if (NGX_ZLIB)
-static z_stream        *deflate_zstream = NULL;
-static z_stream        *deflate_dummy_zstream = NULL;
-
-static ngx_path_t      *message_temp_path = NULL;
-
-ngx_int_t nchan_common_deflate_init(nchan_main_conf_t  *mcf) {
-  int rc;
-  int windowBits;
-  message_temp_path = mcf->message_temp_path;
-  
-  if((deflate_zstream = ngx_calloc(sizeof(*deflate_zstream), ngx_cycle->log)) == NULL) {
-    nchan_log_error("couldn't allocate deflate stream.");
-    return NGX_ERROR;
-  }
-  
-  windowBits = -mcf->zlib_params.windowBits; //negative to disable headers and use a raw stream
-  
-  deflate_zstream->zalloc = Z_NULL;
-  deflate_zstream->zfree = Z_NULL;
-  deflate_zstream->opaque = Z_NULL;
-  
-  rc = deflateInit2(deflate_zstream, (int) mcf->zlib_params.level, Z_DEFLATED, windowBits, mcf->zlib_params.memLevel, mcf->zlib_params.strategy);
-  if(rc != Z_OK) {
-    nchan_log_error("couldn't initialize deflate stream.");
-    deflate_zstream = NULL;
-    return NGX_ERROR;
-  }
-  
-  if((deflate_dummy_zstream = ngx_calloc(sizeof(*deflate_dummy_zstream), ngx_cycle->log)) == NULL) {
-    nchan_log_error("couldn't allocate dummy deflate stream.");
-    return NGX_ERROR;
-  }
-  
-  deflate_dummy_zstream->zalloc = Z_NULL;
-  deflate_dummy_zstream->zfree = Z_NULL;
-  deflate_dummy_zstream->opaque = Z_NULL;
-  
-  rc = deflateInit2(deflate_dummy_zstream, 0, Z_DEFLATED, -9, 1, Z_DEFAULT_STRATEGY);
-  if(rc != Z_OK) {
-    nchan_log_error("couldn't initialize deflate stream.");
-    deflate_dummy_zstream = NULL;
-    return NGX_ERROR;
-  }
-  
-  return NGX_OK;
-}
-
-ngx_int_t nchan_common_deflate_shutdown(void) {
-  if(deflate_zstream) {
-    deflateEnd(deflate_zstream);
-    ngx_free(deflate_zstream);
-    deflate_zstream = NULL;
-  }
-  
-  if(deflate_dummy_zstream) {
-    deflateEnd(deflate_dummy_zstream);
-    ngx_free(deflate_dummy_zstream);
-    deflate_dummy_zstream = NULL;
-  }
-  return NGX_OK;
-}
-
-#define ZLIB_CHUNK 16384
-
-static ngx_temp_file_t *make_temp_file(ngx_http_request_t *r, ngx_pool_t *pool) {
-  ngx_temp_file_t           *tf;
-  ngx_path_t                *temp_path;
-  if(r) {
-    ngx_http_core_loc_conf_t  *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-    temp_path = clcf->client_body_temp_path;
-  }
-  else {
-    temp_path = message_temp_path;
-  }
-  tf = ngx_pcalloc(pool, sizeof(*tf));
-  if(!tf) {
-    if(r) {
-      nchan_log_request_error(r, "failed to allocate space for temp_file struct.");
-    } else {
-      nchan_log_error("failed to allocate space for temp_file struct.");
-    }
-    return NULL;
-  }
-  tf->file.fd = NGX_INVALID_FILE;
-  if(r) {
-    tf->file.log = r->connection->log;
-  }
-  else if(pool && pool->log) {
-    tf->file.log = pool->log;
-  }
-  else {
-    tf->file.log = ngx_cycle->log;
-  }
-  tf->path = temp_path;
-  tf->pool = pool;
-  tf->persistent = 1;
-  tf->clean = 0; //this will close the file on pool cleanup
-  tf->access = 0;
-  if(ngx_create_temp_file(&tf->file, tf->path, tf->pool, tf->persistent, tf->clean, tf->access) != NGX_OK) {
-    if(r) {
-      nchan_log_request_error(r, "failed to create temp file for deflated message");
-    } else {
-      nchan_log_error("failed to create temp file for deflated message");
-    }
-    return NULL;
-  }
-  return tf;
-}
-
-ngx_buf_t *nchan_common_deflate(ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool) {
-  ngx_str_t           mm_instr;
-  int                 mmapped = 0;
-  ngx_temp_file_t    *tf = NULL;
-  
-  int                 rc;
-  ngx_buf_t          *out = NULL;
-  u_char              outbuf[ZLIB_CHUNK];
-  unsigned            have = 0;
-  off_t               written = 0;
-  
-  //input
-  
-  if(ngx_buf_in_memory(in)) {
-    deflate_zstream->avail_in = ngx_buf_size(in);
-    deflate_zstream->next_in = in->pos;
-  }
-  else {
-    ngx_fd_t fd = in->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&in->file->name) : in->file->fd;
-    mm_instr.len = in->file_last - in->file_pos;
-    mm_instr.data = mmap(NULL, mm_instr.len, PROT_READ, MAP_SHARED, fd, in->file_pos);
-    if (mm_instr.data == MAP_FAILED) {
-      nchan_log_request_error(r, "failed to mmap input file for deflated message");
-      return NULL;
-    }
-    deflate_zstream->avail_in = mm_instr.len;
-    deflate_zstream->next_in = mm_instr.data;
-    mmapped = 1;
-  }
-
-  //output
-  
-  do {
-    deflate_zstream->avail_out = ZLIB_CHUNK;
-    deflate_zstream->next_out = outbuf;
-    
-    rc = deflate(deflate_zstream, Z_SYNC_FLUSH);
-    assert(rc != Z_STREAM_ERROR);
-    
-    have = ZLIB_CHUNK - deflate_zstream->avail_out;
-    
-    if(deflate_zstream->avail_out == 0 && tf == NULL) {
-      //if we filled up the buffer, let's start dumping to a file.
-      tf = make_temp_file(r, pool);
-      if(tf == NULL) { //couldn't make temp file for some reason
-        nchan_log_request_error(r, "failed to allocate output buf for deflated message");
-        deflateReset(deflate_zstream);
-        return NULL;
-      }
-    }
-    if(tf) {
-      ngx_write_file(&tf->file, outbuf, have, written);
-    }
-    
-    written += have;
-  } while(rc != Z_BUF_ERROR);
-  
-  if(mmapped) {
-    munmap(mm_instr.data, mm_instr.len);
-  }
-  
-  if((out = ngx_palloc(pool, sizeof(*out))) == NULL) {
-    nchan_log_request_error(r, "failed to allocate output buf for deflated message");
-    deflateReset(deflate_zstream);
-    return NULL;
-  }
-  
-  if(written > 4) { //there will be a 00 00 FF FF chunk at the end. remove it as the permessage-deflate spec demands
-    written -= 4;
-  }
-  
-  if(tf) { //using a tempfile
-    //thanks to tf->clean = 0, file will be closed on pool cleanup
-    ngx_memzero(out, sizeof(*out));
-    out->file_pos = 0;
-    out->file_last = written;
-    out->in_file = 1;
-    out->file = &tf->file;
-  }
-  else {
-    u_char  *outpooled = ngx_palloc(pool, written);
-    if(!outpooled) {
-      nchan_log_request_error(r, "failed to allocate output data for deflated message");
-      deflateReset(deflate_zstream);
-      return NULL;
-    }
-    ngx_memcpy(outpooled, outbuf, written);
-    ngx_init_set_membuf(out, outpooled, outpooled + written);
-  }
-  out->last_buf = 1;
-  
-  deflateReset(deflate_zstream);
-  return out;
-}
-
-ngx_buf_t *nchan_inflate(z_stream *stream, ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool) {
-  ngx_str_t           mm_instr = {0, NULL};
-  int                 mmapped = 0;
-  ngx_temp_file_t    *tf = NULL;
-  
-  int                 rc;
-  ngx_buf_t          *out = NULL;
-  u_char              outbuf[ZLIB_CHUNK];
-  unsigned            have = 0;
-  off_t               written = 0;
-  int                 trailer_appended = 0;
-  
-  //input
-  if(ngx_buf_in_memory(in)) {
-    stream->avail_in = ngx_buf_size(in);
-    stream->next_in = in->pos;
-  }
-  else {
-    ngx_fd_t fd = in->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&in->file->name) : in->file->fd;
-    mm_instr.len = in->file_last - in->file_pos;
-    mm_instr.data = mmap(NULL, mm_instr.len, PROT_READ, MAP_SHARED, fd, in->file_pos);
-    if (mm_instr.data == MAP_FAILED) {
-      nchan_log_request_error(r, "failed to mmap input file for deflated message");
-      return NULL;
-    }
-    stream->avail_in = mm_instr.len;
-    stream->next_in = mm_instr.data;
-    mmapped = 1;
-  }
-
-  //output
-  
-  do {
-    stream->avail_out = ZLIB_CHUNK;
-    stream->next_out = outbuf;
-    
-    if(stream->avail_in == 0 && !trailer_appended) {
-      stream->avail_in = 4;
-      stream->next_in = (u_char *)"\x00\x00\xFF\xFF";
-      trailer_appended = 1;
-    }
-    rc = inflate(stream, trailer_appended ? Z_SYNC_FLUSH : Z_NO_FLUSH);
-    assert(rc != Z_STREAM_ERROR);
-    switch (rc) {
-      case Z_DATA_ERROR:
-        nchan_log_request_error(r, "inflate error %d: %s", rc, stream->msg);
-        break;
-      case Z_NEED_DICT:
-      case Z_MEM_ERROR:
-        nchan_log_request_error(r, "inflate error %d", rc);
-        break;
-    }
-
-    have = ZLIB_CHUNK - stream->avail_out;
-    
-    if(stream->avail_out == 0 && tf == NULL) {
-      //if we filled up the buffer, let's start dumping to a file.
-      tf = make_temp_file(r, pool);
-    }
-    if(tf) {
-      ngx_write_file(&tf->file, outbuf, have, written);
-    }
-    written += have;
-  } while(rc == Z_OK);
-  
-  if(mmapped) {
-    munmap(mm_instr.data, mm_instr.len);
-  }
-  
-  if((out = ngx_palloc(pool, sizeof(*out))) == NULL) {
-    nchan_log_request_error(r, "failed to allocate output buf for deflated message");
-    deflateReset(deflate_zstream);
-    return NULL;
-  }
-  
-  if(tf) { //using a tempfile
-    //thanks to tf->clean = 0, file will be closed on pool cleanup
-    ngx_memzero(out, sizeof(*out));
-    out->file_pos = 0;
-    out->file_last = written;
-    out->in_file = 1;
-    out->file = &tf->file;
-  }
-  else {
-    u_char  *outpooled = ngx_palloc(pool, written);
-    if(!outpooled) {
-      nchan_log_request_error(r, "failed to allocate output data for deflated message");
-      deflateReset(deflate_zstream);
-      return NULL;
-    }
-    ngx_memcpy(outpooled, outbuf, written);
-    ngx_init_set_membuf(out, outpooled, outpooled + written);
-  }
-  out->last_buf = 1;
-  
-  deflateReset(deflate_zstream);
-  return out;
-}
-
-
-static ngx_int_t nchan_common_simple_deflate_internal(z_stream *strm, ngx_str_t *in, ngx_str_t *out) {
-  int rc;
-  strm->avail_in = in->len;
-  strm->next_in = in->data;
-
-  //output
-  strm->avail_out = out->len;
-  strm->next_out = out->data;
-
-  rc = deflate(strm, Z_SYNC_FLUSH);
-  if(rc != Z_STREAM_ERROR) {
-    out->len = strm->total_out;
-  }
-  
-  deflateReset(strm);
-  
-  return rc != Z_STREAM_ERROR ? NGX_OK : NGX_ERROR;
-}
-
-ngx_int_t nchan_common_simple_deflate(ngx_str_t *in, ngx_str_t *out) {
-  return nchan_common_simple_deflate_internal(deflate_zstream, in, out);
-}
-
-ngx_int_t nchan_common_simple_deflate_raw_block(ngx_str_t *in, ngx_str_t *out) {
-  return nchan_common_simple_deflate_internal(deflate_dummy_zstream, in, out);
-}
-  
-#endif
-
-ngx_flag_t nchan_need_to_deflate_message(nchan_loc_conf_t *cf) {
-#if (NGX_ZLIB)
-  if(cf->redis.enabled && cf->redis.storage_mode != REDIS_MODE_BACKUP) {
-    //redis mode ns non-backup storage mode gets the messages deflated later on
-    return 0;
-  }  
-  return cf->message_compression == NCHAN_MSG_COMPRESSION_WEBSOCKET_PERMESSAGE_DEFLATE;
-#else
-  return 0;
-#endif
-}
-
-ngx_int_t nchan_deflate_message_if_needed(nchan_msg_t *msg, nchan_loc_conf_t *cf, ngx_http_request_t *r, ngx_pool_t  *pool) {
-#if (NGX_ZLIB)
-  if(nchan_need_to_deflate_message(cf)) {
-    msg->compressed = ngx_pcalloc(pool, sizeof(*msg->compressed));
-    if(!msg->compressed) {
-      if(r) {
-        nchan_log_request_error(r, "no memory to compress message");
-      }
-      else {
-        nchan_log_error("no memory to compress message");
-      }
-    }
-    else {
-      ngx_buf_t  *compressed_buf = nchan_common_deflate(&msg->buf, r, pool);
-      if(!compressed_buf) {
-        if(r) {
-          nchan_log_request_error(r, "failed to compress message");
-        }
-        else {
-          nchan_log_error("failed to compress message");
-        }
-      }
-      else {
-        msg->compressed->compression = cf->message_compression;
-        msg->compressed->buf = *compressed_buf;
-      }
-    }
-  }
-  return NGX_OK;
-#else
-  return NGX_DECLINED;
-#endif
-}
-
-static uint64_t flip_uint64_if_little_endian(uint64_t value) {
-int num = 42;
-  if (*(char *)&num == 42) {
-    uint32_t high_part = htonl((uint32_t)(value >> 32));
-    uint32_t low_part = htonl((uint32_t)(value & 0xFFFFFFFFLL));
-    return (((uint64_t)low_part) << 32) | high_part;
-  } else {
-    return value;
-  }
-}
-
-uint64_t nchan_htonll(uint64_t value) {
-  return flip_uint64_if_little_endian(value); 
-}
-uint64_t nchan_ntohll(uint64_t value) {
-  return flip_uint64_if_little_endian(value);
-}
-
-#if (NGX_DEBUG_POOL)
-//Copyright (C) 2015 Alibaba Group Holding Limited
-static ngx_str_t            debug_pool_str;
-ngx_str_t *ngx_http_debug_pool_str(ngx_pool_t *pool) {
-  u_char              *p, *unit;
-  size_t               s, n, cn, ln;
-  ngx_uint_t           i;
-  ngx_pool_stat_t     *stat;
-  static u_char        charbuf[512];
-  
-  debug_pool_str.len = 0;
-  debug_pool_str.data = charbuf;
-  
-#define NGX_POOL_PID_SIZE       (NGX_TIME_T_LEN + sizeof("pid:\n") - 1)     /* sizeof pid_t equals time_t */
-#define NGX_POOL_PID_FORMAT     "pid:%P\n"
-#define NGX_POOL_ENTRY_SIZE     (48 /* func */ + 12 * 4 + sizeof("size: num: cnum: lnum: \n") - 1)
-#define NGX_POOL_ENTRY_FORMAT   "size:%12z num:%12z cnum:%12z lnum:%12z %s\n"
-#define NGX_POOL_SUMMARY_SIZE   (12 * 4 + sizeof("size: num: cnum: lnum: [SUMMARY]\n") - 1)
-#define NGX_POOL_SUMMARY_FORMAT "size:%10z%2s num:%12z cnum:%12z lnum:%12z [SUMMARY]\n"
-
-  p = charbuf;
-  p = ngx_sprintf(p, NGX_POOL_PID_FORMAT, ngx_pid);
-
-  /* lines of entry */
-
-  s = n = cn = ln = 0;
-
-  for (i = 0; i < NGX_POOL_STATS_MAX; i++) {
-      for (stat = ngx_pool_stats[i]; stat != NULL; stat = stat->next) {
-          p = ngx_snprintf(p, NGX_POOL_ENTRY_SIZE, NGX_POOL_ENTRY_FORMAT,
-                            stat->size, stat->num, stat->cnum, stat->lnum,
-                            stat->func);
-          s += stat->size;
-          n += stat->num;
-          cn += stat->cnum;
-          ln += stat->lnum;
-      }
-  }
-
-  /* summary line */
-
-  unit = (u_char *) " B";
-  if (s > 1024 * 1024) {
-    s = s / (1024 * 1024);
-    unit = (u_char *) "MB";
-  } else if (s > 1024) {
-    s = s / 1024;
-    unit = (u_char *) "KB";
-  }
-
-  p = ngx_snprintf(p, NGX_POOL_SUMMARY_SIZE, NGX_POOL_SUMMARY_FORMAT, s, unit, n, cn, ln);
-
-  debug_pool_str.len = p - debug_pool_str.data;
-  
-  return &debug_pool_str;
-}
-#endif
diff --git a/debian/modules/nchan/src/util/nchan_util.h b/debian/modules/nchan/src/util/nchan_util.h
deleted file mode 100644
index bba0bd5..0000000
--- a/debian/modules/nchan/src/util/nchan_util.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <string.h>
-#include <stddef.h>
-#ifndef NCHAN_HAVE_MEMRCHR
-void *memrchr(const void *s, int c, size_t n);
-#endif
-ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen);
-ngx_int_t ngx_http_complex_value_alloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen);
-ngx_int_t ngx_http_complex_value_free(ngx_str_t *value);
-
-ngx_int_t ngx_http_complex_value_custom_pool(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, ngx_pool_t *pool);
-u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char);
-ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name);
-ngx_str_t *nchan_get_header_value_origin(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
-
-int nchan_match_origin_header(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
-ngx_str_t *nchan_get_allow_origin_value(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
-
-ngx_str_t *nchan_get_accept_header_value(ngx_http_request_t *r);
-ngx_buf_t *nchan_chain_to_single_buffer(ngx_pool_t *pool, ngx_chain_t *chain, size_t content_length);
-ngx_str_t *ngx_http_debug_pool_str(ngx_pool_t *pool);
-int nchan_strmatch(ngx_str_t *val, ngx_int_t n, ...);
-int nchan_cstrmatch(char *cstr, ngx_int_t n, ...);
-int nchan_cstr_startswith(char *cstr, char *match);
-int nchan_str_startswith(ngx_str_t *str, const char *match);
-int nchan_str_after(ngx_str_t **str, const char *match);
-
-void nchan_scan_split_by_chr(u_char **cur, size_t max_len, ngx_str_t *str, u_char chr);
-void nchan_scan_until_chr_on_line(ngx_str_t *line, ngx_str_t *str, u_char chr);
-int nchan_get_rest_of_line_in_cstr(const char *cstr, const char *line_start, ngx_str_t *rest);
-
-int nchan_ngx_str_match(ngx_str_t *str1, ngx_str_t *str2);
-int nchan_ngx_str_nonzero_match(ngx_str_t *str1, ngx_str_t *str2);
-int nchan_cstr_match_line(const char *cstr, const char *line);
-
-void nchan_strcpy(ngx_str_t *dst, ngx_str_t *src, size_t maxlen);
-ngx_int_t nchan_init_timer(ngx_event_t *ev, void (*cb)(ngx_event_t *), void *pd);
-void *nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay);
-void nchan_abort_oneshot_timer(void *timer);
-
-void *nchan_add_interval_timer(ngx_int_t (*cb)(void *), void *pd, ngx_msec_t interval);
-void nchan_abort_interval_timer(void *t);
-int nchan_strscanstr(u_char **cur, ngx_str_t *find, u_char *last);
-
-char *nchan_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-ssize_t nchan_parse_size(ngx_str_t *line);
-
-void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end);
-void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str);
-#define ngx_init_set_membuf_char(buf, str) \
-  ngx_init_set_membuf(buf, (u_char *)str, ((u_char *)str) + sizeof(str)-1)
-
-ngx_str_t *nchan_urldecode_str(ngx_http_request_t *r, ngx_str_t *str);
-
-int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz);
-#define nchan_ngx_str_substr(str, substr) \
-  nchan_ngx_str_char_substr(str, substr, sizeof(substr)-1)
-  
-#define nchan_strstrn(haystack, needle) ngx_strstrn((u_char *)(haystack), (needle), sizeof(needle) - 2)
-
-#ifndef container_of
-
-#define container_of(ptr, type, member) ({                      \
-        const __typeof__( ((type *)0)->member ) *__mptr = (ptr);    \
-        (type *)( (char *)__mptr - offsetof(type,member) );})
-#endif
-
-ngx_flag_t nchan_need_to_deflate_message(nchan_loc_conf_t *cf);
-ngx_int_t nchan_deflate_message_if_needed(nchan_msg_t *msg, nchan_loc_conf_t *cf, ngx_http_request_t *r, ngx_pool_t  *pool);
-#if (NGX_ZLIB)
-#include <zlib.h>
-ngx_int_t nchan_common_deflate_shutdown(void);
-ngx_int_t nchan_common_deflate_init(nchan_main_conf_t  *mcf);
-ngx_buf_t *nchan_common_deflate(ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool);
-ngx_int_t nchan_common_simple_deflate_raw_block(ngx_str_t *in, ngx_str_t *out);
-ngx_int_t nchan_common_simple_deflate(ngx_str_t *in, ngx_str_t *out);
-ngx_buf_t *nchan_inflate(z_stream *stream, ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool);
-
-uint64_t nchan_htonll(uint64_t value);
-uint64_t nchan_ntohll(uint64_t value);
-#endif
diff --git a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
deleted file mode 100644
index 5670b73..0000000
--- a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.c
+++ /dev/null
@@ -1,770 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) Nginx, Inc.
- */
-
-#if nginx_version <= 1011006
-
-#include "ngx_nchan_hacked_slab.h"
-
-#define NGX_SLAB_PAGE_MASK   3
-#define NGX_SLAB_PAGE        0
-#define NGX_SLAB_BIG         1
-#define NGX_SLAB_EXACT       2
-#define NGX_SLAB_SMALL       3
-
-#if (NGX_PTR_SIZE == 4)
-
-#define NGX_SLAB_PAGE_FREE   0
-#define NGX_SLAB_PAGE_BUSY   0xffffffff
-#define NGX_SLAB_PAGE_START  0x80000000
-
-#define NGX_SLAB_SHIFT_MASK  0x0000000f
-#define NGX_SLAB_MAP_MASK    0xffff0000
-#define NGX_SLAB_MAP_SHIFT   16
-
-#define NGX_SLAB_BUSY        0xffffffff
-
-#else /* (NGX_PTR_SIZE == 8) */
-
-#define NGX_SLAB_PAGE_FREE   0
-#define NGX_SLAB_PAGE_BUSY   0xffffffffffffffff
-#define NGX_SLAB_PAGE_START  0x8000000000000000
-
-#define NGX_SLAB_SHIFT_MASK  0x000000000000000f
-#define NGX_SLAB_MAP_MASK    0xffffffff00000000
-#define NGX_SLAB_MAP_SHIFT   32
-
-#define NGX_SLAB_BUSY        0xffffffffffffffff
-
-#endif
-
-
-#if (NGX_DEBUG_MALLOC)
-
-#define ngx_slab_junk(p, size)     ngx_memset(p, 0xA5, size)
-
-#elif (NGX_HAVE_DEBUG_MALLOC)
-
-#define ngx_slab_junk(p, size)                                                \
-    if (ngx_debug_malloc)          ngx_memset(p, 0xA5, size)
-
-#else
-
-#define ngx_slab_junk(p, size)
-
-#endif
-
-static ngx_slab_page_t *nchan_slab_alloc_pages(ngx_slab_pool_t *pool,
-    ngx_uint_t pages);
-static void nchan_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
-    ngx_uint_t pages);
-static void ngx_slab_error(ngx_slab_pool_t *pool, ngx_uint_t level,
-    char *text);
-
-
-static ngx_uint_t  ngx_slab_max_size;
-static ngx_uint_t  ngx_slab_exact_size;
-static ngx_uint_t  ngx_slab_exact_shift;
-
-static ngx_atomic_uint_t *nchan_slab_reserved_pagecount;
-static ngx_int_t          nchan_slab_reserved_pagecount_temp;
-
-
-void
-nchan_slab_init(ngx_slab_pool_t *pool)
-{
-  ngx_uint_t        n;
-
-  /* STUB */
-  if (ngx_slab_max_size == 0) {
-    ngx_slab_max_size = ngx_pagesize / 2;
-    ngx_slab_exact_size = ngx_pagesize / (8 * sizeof(uintptr_t));
-    for (n = ngx_slab_exact_size; n >>= 1; ngx_slab_exact_shift++) {
-      /* void */
-    }
-  }
-  /**/
-}
-
-
-static void nchan_track_slab_reserved_pages(ngx_slab_pool_t *pool, ngx_int_t pages) {
-  if(nchan_slab_reserved_pagecount) {
-    ngx_atomic_fetch_add(nchan_slab_reserved_pagecount, pages);
-  }
-  else {
-    nchan_slab_reserved_pagecount_temp += pages;
-  }
-}
-
-void nchan_slab_set_reserved_pages_tracker(ngx_slab_pool_t *pool, ngx_atomic_uint_t *ref) {
-  nchan_slab_reserved_pagecount = ref;
-  nchan_track_slab_reserved_pages(pool, nchan_slab_reserved_pagecount_temp);
-  nchan_slab_reserved_pagecount_temp = 0;
-}
-
-void *
-nchan_slab_alloc(ngx_slab_pool_t *pool, size_t size)
-{
-    void  *p;
-
-    ngx_shmtx_lock(&pool->mutex);
-
-    p = nchan_slab_alloc_locked(pool, size);
-
-    ngx_shmtx_unlock(&pool->mutex);
-
-    return p;
-}
-
-
-void *
-nchan_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
-{
-    size_t            s;
-    uintptr_t         p, n, m, mask, *bitmap;
-    ngx_uint_t        i, slot, shift, map;
-    ngx_slab_page_t  *page, *prev, *slots;
-
-    if (size > ngx_slab_max_size) {
-
-        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
-                       "slab alloc: %uz", size);
-
-        page = nchan_slab_alloc_pages(pool, (size >> ngx_pagesize_shift)
-                                          + ((size % ngx_pagesize) ? 1 : 0));
-        if (page) {
-            p = (page - pool->pages) << ngx_pagesize_shift;
-            p += (uintptr_t) pool->start;
-
-        } else {
-            p = 0;
-        }
-
-        goto done;
-    }
-
-    if (size > pool->min_size) {
-        shift = 1;
-        for (s = size - 1; s >>= 1; shift++) { /* void */ }
-        slot = shift - pool->min_shift;
-
-    } else {
-        size = pool->min_size;
-        shift = pool->min_shift;
-        slot = 0;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
-                   "slab alloc: %uz slot: %ui", size, slot);
-
-    slots = (ngx_slab_page_t *) ((u_char *) pool + sizeof(ngx_slab_pool_t));
-    page = slots[slot].next;
-
-    if (page->next != page) {
-
-        if (shift < ngx_slab_exact_shift) {
-
-            do {
-                p = (page - pool->pages) << ngx_pagesize_shift;
-                bitmap = (uintptr_t *) (pool->start + p);
-
-                map = (1 << (ngx_pagesize_shift - shift))
-                          / (sizeof(uintptr_t) * 8);
-
-                for (n = 0; n < map; n++) {
-
-                    if (bitmap[n] != NGX_SLAB_BUSY) {
-
-                        for (m = 1, i = 0; m; m <<= 1, i++) {
-                            if ((bitmap[n] & m)) {
-                                continue;
-                            }
-
-                            bitmap[n] |= m;
-
-                            i = ((n * sizeof(uintptr_t) * 8) << shift)
-                                + (i << shift);
-
-                            if (bitmap[n] == NGX_SLAB_BUSY) {
-                                for (n = n + 1; n < map; n++) {
-                                    if (bitmap[n] != NGX_SLAB_BUSY) {
-                                        p = (uintptr_t) bitmap + i;
-
-                                        goto done;
-                                    }
-                                }
-
-                                prev = (ngx_slab_page_t *)
-                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
-                                prev->next = page->next;
-                                page->next->prev = page->prev;
-
-                                page->next = NULL;
-                                page->prev = NGX_SLAB_SMALL;
-                            }
-
-                            p = (uintptr_t) bitmap + i;
-
-                            goto done;
-                        }
-                    }
-                }
-
-                page = page->next;
-
-            } while (page);
-
-        } else if (shift == ngx_slab_exact_shift) {
-
-            do {
-                if (page->slab != NGX_SLAB_BUSY) {
-
-                    for (m = 1, i = 0; m; m <<= 1, i++) {
-                        if ((page->slab & m)) {
-                            continue;
-                        }
-
-                        page->slab |= m;
-
-                        if (page->slab == NGX_SLAB_BUSY) {
-                            prev = (ngx_slab_page_t *)
-                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
-                            prev->next = page->next;
-                            page->next->prev = page->prev;
-
-                            page->next = NULL;
-                            page->prev = NGX_SLAB_EXACT;
-                        }
-
-                        p = (page - pool->pages) << ngx_pagesize_shift;
-                        p += i << shift;
-                        p += (uintptr_t) pool->start;
-
-                        goto done;
-                    }
-                }
-
-                page = page->next;
-
-            } while (page);
-
-        } else { /* shift > ngx_slab_exact_shift */
-
-            n = ngx_pagesize_shift - (page->slab & NGX_SLAB_SHIFT_MASK);
-            n = 1 << n;
-            n = ((uintptr_t) 1 << n) - 1;
-            mask = n << NGX_SLAB_MAP_SHIFT;
-
-            do {
-                if ((page->slab & NGX_SLAB_MAP_MASK) != mask) {
-
-                    for (m = (uintptr_t) 1 << NGX_SLAB_MAP_SHIFT, i = 0;
-                         m & mask;
-                         m <<= 1, i++)
-                    {
-                        if ((page->slab & m)) {
-                            continue;
-                        }
-
-                        page->slab |= m;
-
-                        if ((page->slab & NGX_SLAB_MAP_MASK) == mask) {
-                            prev = (ngx_slab_page_t *)
-                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
-                            prev->next = page->next;
-                            page->next->prev = page->prev;
-
-                            page->next = NULL;
-                            page->prev = NGX_SLAB_BIG;
-                        }
-
-                        p = (page - pool->pages) << ngx_pagesize_shift;
-                        p += i << shift;
-                        p += (uintptr_t) pool->start;
-
-                        goto done;
-                    }
-                }
-
-                page = page->next;
-
-            } while (page);
-        }
-    }
-
-    page = nchan_slab_alloc_pages(pool, 1);
-
-    if (page) {
-        if (shift < ngx_slab_exact_shift) {
-            p = (page - pool->pages) << ngx_pagesize_shift;
-            bitmap = (uintptr_t *) (pool->start + p);
-
-            s = 1 << shift;
-            n = (1 << (ngx_pagesize_shift - shift)) / 8 / s;
-
-            if (n == 0) {
-                n = 1;
-            }
-
-            bitmap[0] = (2 << n) - 1;
-
-            map = (1 << (ngx_pagesize_shift - shift)) / (sizeof(uintptr_t) * 8);
-
-            for (i = 1; i < map; i++) {
-                bitmap[i] = 0;
-            }
-
-            page->slab = shift;
-            page->next = &slots[slot];
-            page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_SMALL;
-
-            slots[slot].next = page;
-
-            p = ((page - pool->pages) << ngx_pagesize_shift) + s * n;
-            p += (uintptr_t) pool->start;
-
-            goto done;
-
-        } else if (shift == ngx_slab_exact_shift) {
-
-            page->slab = 1;
-            page->next = &slots[slot];
-            page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_EXACT;
-
-            slots[slot].next = page;
-
-            p = (page - pool->pages) << ngx_pagesize_shift;
-            p += (uintptr_t) pool->start;
-
-            goto done;
-
-        } else { /* shift > ngx_slab_exact_shift */
-
-            page->slab = ((uintptr_t) 1 << NGX_SLAB_MAP_SHIFT) | shift;
-            page->next = &slots[slot];
-            page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_BIG;
-
-            slots[slot].next = page;
-
-            p = (page - pool->pages) << ngx_pagesize_shift;
-            p += (uintptr_t) pool->start;
-
-            goto done;
-        }
-    }
-
-    p = 0;
-
-done:
-
-    ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
-                   "slab alloc: %p", (void *) p);
-
-    return (void *) p;
-}
-
-
-void *
-nchan_slab_calloc(ngx_slab_pool_t *pool, size_t size)
-{
-    void  *p;
-
-    ngx_shmtx_lock(&pool->mutex);
-
-    p = nchan_slab_calloc_locked(pool, size);
-
-    ngx_shmtx_unlock(&pool->mutex);
-
-    return p;
-}
-
-
-void *
-nchan_slab_calloc_locked(ngx_slab_pool_t *pool, size_t size)
-{
-    void  *p;
-
-    p = nchan_slab_alloc_locked(pool, size);
-    if (p) {
-        ngx_memzero(p, size);
-    }
-
-    return p;
-}
-
-
-void
-nchan_slab_free(ngx_slab_pool_t *pool, void *p)
-{
-    ngx_shmtx_lock(&pool->mutex);
-
-    nchan_slab_free_locked(pool, p);
-
-    ngx_shmtx_unlock(&pool->mutex);
-}
-
-
-void
-nchan_slab_free_locked(ngx_slab_pool_t *pool, void *p)
-{
-    size_t            size;
-    uintptr_t         slab, m, *bitmap;
-    ngx_uint_t        n, type, slot, shift, map;
-    ngx_slab_page_t  *slots, *page;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0, "slab free: %p", p);
-
-    if ((u_char *) p < pool->start || (u_char *) p > pool->end) {
-        ngx_slab_error(pool, NGX_LOG_ALERT, "ngx_slab_free(): outside of pool");
-        goto fail;
-    }
-
-    n = ((u_char *) p - pool->start) >> ngx_pagesize_shift;
-    page = &pool->pages[n];
-    slab = page->slab;
-    type = page->prev & NGX_SLAB_PAGE_MASK;
-
-    switch (type) {
-
-    case NGX_SLAB_SMALL:
-
-        shift = slab & NGX_SLAB_SHIFT_MASK;
-        size = 1 << shift;
-
-        if ((uintptr_t) p & (size - 1)) {
-            goto wrong_chunk;
-        }
-
-        n = ((uintptr_t) p & (ngx_pagesize - 1)) >> shift;
-        m = (uintptr_t) 1 << (n & (sizeof(uintptr_t) * 8 - 1));
-        n /= (sizeof(uintptr_t) * 8);
-        bitmap = (uintptr_t *)
-                             ((uintptr_t) p & ~((uintptr_t) ngx_pagesize - 1));
-
-        if (bitmap[n] & m) {
-
-            if (page->next == NULL) {
-                slots = (ngx_slab_page_t *)
-                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
-                slot = shift - pool->min_shift;
-
-                page->next = slots[slot].next;
-                slots[slot].next = page;
-
-                page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_SMALL;
-                page->next->prev = (uintptr_t) page | NGX_SLAB_SMALL;
-            }
-
-            bitmap[n] &= ~m;
-
-            n = (1 << (ngx_pagesize_shift - shift)) / 8 / (1 << shift);
-
-            if (n == 0) {
-                n = 1;
-            }
-
-            if (bitmap[0] & ~(((uintptr_t) 1 << n) - 1)) {
-                goto done;
-            }
-
-            map = (1 << (ngx_pagesize_shift - shift)) / (sizeof(uintptr_t) * 8);
-
-            for (n = 1; n < map; n++) {
-                if (bitmap[n]) {
-                    goto done;
-                }
-            }
-
-            nchan_slab_free_pages(pool, page, 1);
-
-            goto done;
-        }
-
-        goto chunk_already_free;
-
-    case NGX_SLAB_EXACT:
-
-        m = (uintptr_t) 1 <<
-                (((uintptr_t) p & (ngx_pagesize - 1)) >> ngx_slab_exact_shift);
-        size = ngx_slab_exact_size;
-
-        if ((uintptr_t) p & (size - 1)) {
-            goto wrong_chunk;
-        }
-
-        if (slab & m) {
-            if (slab == NGX_SLAB_BUSY) {
-                slots = (ngx_slab_page_t *)
-                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
-                slot = ngx_slab_exact_shift - pool->min_shift;
-
-                page->next = slots[slot].next;
-                slots[slot].next = page;
-
-                page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_EXACT;
-                page->next->prev = (uintptr_t) page | NGX_SLAB_EXACT;
-            }
-
-            page->slab &= ~m;
-
-            if (page->slab) {
-                goto done;
-            }
-
-            nchan_slab_free_pages(pool, page, 1);
-
-            goto done;
-        }
-
-        goto chunk_already_free;
-
-    case NGX_SLAB_BIG:
-
-        shift = slab & NGX_SLAB_SHIFT_MASK;
-        size = 1 << shift;
-
-        if ((uintptr_t) p & (size - 1)) {
-            goto wrong_chunk;
-        }
-
-        m = (uintptr_t) 1 << ((((uintptr_t) p & (ngx_pagesize - 1)) >> shift)
-                              + NGX_SLAB_MAP_SHIFT);
-
-        if (slab & m) {
-
-            if (page->next == NULL) {
-                slots = (ngx_slab_page_t *)
-                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
-                slot = shift - pool->min_shift;
-
-                page->next = slots[slot].next;
-                slots[slot].next = page;
-
-                page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_BIG;
-                page->next->prev = (uintptr_t) page | NGX_SLAB_BIG;
-            }
-
-            page->slab &= ~m;
-
-            if (page->slab & NGX_SLAB_MAP_MASK) {
-                goto done;
-            }
-
-            nchan_slab_free_pages(pool, page, 1);
-
-            goto done;
-        }
-
-        goto chunk_already_free;
-
-    case NGX_SLAB_PAGE:
-
-        if ((uintptr_t) p & (ngx_pagesize - 1)) {
-            goto wrong_chunk;
-        }
-
-        if (slab == NGX_SLAB_PAGE_FREE) {
-            ngx_slab_error(pool, NGX_LOG_ALERT,
-                           "ngx_slab_free(): page is already free");
-            goto fail;
-        }
-
-        if (slab == NGX_SLAB_PAGE_BUSY) {
-            ngx_slab_error(pool, NGX_LOG_ALERT,
-                           "ngx_slab_free(): pointer to wrong page");
-            goto fail;
-        }
-
-        n = ((u_char *) p - pool->start) >> ngx_pagesize_shift;
-        size = slab & ~NGX_SLAB_PAGE_START;
-
-        nchan_slab_free_pages(pool, &pool->pages[n], size);
-
-        ngx_slab_junk(p, size << ngx_pagesize_shift);
-
-        return;
-    }
-
-    /* not reached */
-
-    return;
-
-done:
-
-    ngx_slab_junk(p, size);
-
-    return;
-
-wrong_chunk:
-
-    ngx_slab_error(pool, NGX_LOG_ALERT,
-                   "ngx_slab_free(): pointer to wrong chunk");
-
-    goto fail;
-
-chunk_already_free:
-
-    ngx_slab_error(pool, NGX_LOG_ALERT,
-                   "ngx_slab_free(): chunk is already free");
-
-fail:
-
-    return;
-}
-
-
-static ngx_slab_page_t *
-nchan_slab_alloc_pages(ngx_slab_pool_t *pool, ngx_uint_t pages)
-{
-    ngx_slab_page_t  *page, *p;
-    ngx_uint_t        need_pages = pages;
-
-    
-    for (page = pool->free.next; page != &pool->free; page = page->next) {
-
-        if (page->slab >= pages) {
-
-            if (page->slab > pages) {
-                page[page->slab - 1].prev = (uintptr_t) &page[pages];
-
-                page[pages].slab = page->slab - pages;
-                page[pages].next = page->next;
-                page[pages].prev = page->prev;
-
-                p = (ngx_slab_page_t *) page->prev;
-                p->next = &page[pages];
-                page->next->prev = (uintptr_t) &page[pages];
-
-            } else {
-                p = (ngx_slab_page_t *) page->prev;
-                p->next = page->next;
-                page->next->prev = page->prev;
-            }
-
-            page->slab = pages | NGX_SLAB_PAGE_START;
-            page->next = NULL;
-            page->prev = NGX_SLAB_PAGE;
-
-            if (--pages == 0) {
-                nchan_track_slab_reserved_pages(pool, need_pages);
-                return page;
-            }
-
-            for (p = page + 1; pages; pages--) {
-                p->slab = NGX_SLAB_PAGE_BUSY;
-                p->next = NULL;
-                p->prev = NGX_SLAB_PAGE;
-                p++;
-            }
-            
-            nchan_track_slab_reserved_pages(pool, need_pages);
-            return page;
-        }
-    }
-#if nginx_version >= 1005003
-    if (pool->log_nomem) {
-        ngx_slab_error(pool, NGX_LOG_CRIT,
-                       "ngx_slab_alloc() failed: no memory");
-    }
-#endif
-    return NULL;
-}
-
-
-static void
-nchan_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
-    ngx_uint_t pages)
-{
-#if nginx_version >= 1007002
-    ngx_uint_t        type;
-    ngx_slab_page_t  *prev, *join;
-#else
-    ngx_slab_page_t  *prev;
-#endif
-    nchan_track_slab_reserved_pages(pool, -pages);
-    
-    page->slab = pages--;
-    
-    if (pages) {
-        ngx_memzero(&page[1], pages * sizeof(ngx_slab_page_t));
-    }
-
-    if (page->next) {
-        prev = (ngx_slab_page_t *) (page->prev & ~NGX_SLAB_PAGE_MASK);
-        prev->next = page->next;
-        page->next->prev = page->prev;
-    }
-#if nginx_version >= 1007002
-
-    join = page + page->slab;
-
-    if (join < pool->last) {
-        type = join->prev & NGX_SLAB_PAGE_MASK;
-
-        if (type == NGX_SLAB_PAGE) {
-
-            if (join->next != NULL) {
-                pages += join->slab;
-                page->slab += join->slab;
-
-                prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
-                prev->next = join->next;
-                join->next->prev = join->prev;
-
-                join->slab = NGX_SLAB_PAGE_FREE;
-                join->next = NULL;
-                join->prev = NGX_SLAB_PAGE;
-            }
-        }
-    }
-
-    if (page > pool->pages) {
-        join = page - 1;
-        type = join->prev & NGX_SLAB_PAGE_MASK;
-
-        if (type == NGX_SLAB_PAGE) {
-
-            if (join->slab == NGX_SLAB_PAGE_FREE) {
-                join = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
-            }
-
-            if (join->next != NULL) {
-                pages += join->slab;
-                join->slab += page->slab;
-
-                prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
-                prev->next = join->next;
-                join->next->prev = join->prev;
-
-                page->slab = NGX_SLAB_PAGE_FREE;
-                page->next = NULL;
-                page->prev = NGX_SLAB_PAGE;
-
-                page = join;
-            }
-        }
-    }
-
-    if (pages) {
-        page[pages].prev = (uintptr_t) page;
-    }
-#endif
-
-    page->prev = (uintptr_t) &pool->free;
-    page->next = pool->free.next;
-
-    page->next->prev = (uintptr_t) page;
-
-    pool->free.next = page;
-}
-
-
-static void
-ngx_slab_error(ngx_slab_pool_t *pool, ngx_uint_t level, char *text)
-{
-    ngx_log_error(level, ngx_cycle->log, 0, "%s%s", text, pool->log_ctx);
-}
-
-#endif
diff --git a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.h b/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.h
deleted file mode 100644
index 87b8f05..0000000
--- a/debian/modules/nchan/src/util/ngx_nchan_hacked_slab.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) Nginx, Inc.
- */
-
-
-#ifndef _NCHAN_HACKED_SLAB_H_INCLUDED_
-#define _NCHAN_HACKED_SLAB_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-
-
-void nchan_slab_init(ngx_slab_pool_t *pool);
-void *nchan_slab_alloc(ngx_slab_pool_t *pool, size_t size);
-void *nchan_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size);
-void *nchan_slab_calloc(ngx_slab_pool_t *pool, size_t size);
-void *nchan_slab_calloc_locked(ngx_slab_pool_t *pool, size_t size);
-void nchan_slab_free(ngx_slab_pool_t *pool, void *p);
-void nchan_slab_free_locked(ngx_slab_pool_t *pool, void *p);
-
-void nchan_slab_set_reserved_pages_tracker(ngx_slab_pool_t *pool, ngx_atomic_uint_t *ref);
-
-#endif /* _NCHAN_HACKED_SLAB_H_INCLUDED_ */
diff --git a/debian/modules/nchan/src/util/shmem.c b/debian/modules/nchan/src/util/shmem.c
deleted file mode 100644
index 817579d..0000000
--- a/debian/modules/nchan/src/util/shmem.c
+++ /dev/null
@@ -1,223 +0,0 @@
-#include <nchan_module.h>
-#include "shmem.h"
-#include "assert.h"
-
-#if nginx_version <= 1011006
-//old ugly slab-hack to track alloc'd pages
-#include <util/ngx_nchan_hacked_slab.h>
-#endif
-
-#define DEBUG_SHM_ALLOC 0
-
-#define SHPOOL(shmem) ((ngx_slab_pool_t *)(shmem)->zone->shm.addr)
-
-//#define DEBUG_LEVEL NGX_LOG_WARN
-#define DEBUG_LEVEL NGX_LOG_DEBUG
-
-#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SHMEM(%i):" fmt, memstore_slot(), ##args)
-#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SHMEM(%i):" fmt, memstore_slot(), ##args)
-
-//#include <valgrind/memcheck.h>
-
-//shared memory
-shmem_t *shm_create(ngx_str_t *name, ngx_conf_t *cf, size_t shm_size, ngx_int_t (*init)(ngx_shm_zone_t *, void *), void *privdata) {
-
-  ngx_shm_zone_t    *zone;
-  shmem_t           *shm;
-
-  shm_size = ngx_align(shm_size, ngx_pagesize);
-  if (shm_size < 8 * ngx_pagesize) {
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "The push_max_reserved_memory value must be at least %udKiB", (8 * ngx_pagesize) >> 10);
-    shm_size = 8 * ngx_pagesize;
-  }
-  /*
-  if(nchan_shm_zone && nchan_shm_zone->shm.size != shm_size) {
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Cannot change memory area size without restart, ignoring change");
-  }
-  */
-  ngx_conf_log_error(NGX_LOG_INFO, cf, 0, "Using %udKiB of shared memory for nchan", shm_size >> 10);
-
-  shm = ngx_alloc(sizeof(*shm), ngx_cycle->log);
-  zone = ngx_shared_memory_add(cf, name, shm_size, &ngx_nchan_module);
-  if (zone == NULL || shm == NULL) {
-    return NULL;
-  }
-  shm->zone = zone;
-
-  zone->init = init;
-  zone->data = (void *) 1;
-  return shm;
-}
-
-#if nginx_version <= 1011006
-void shm_set_allocd_pages_tracker(shmem_t *shm, ngx_atomic_uint_t *ptr) {
-  nchan_slab_set_reserved_pages_tracker(SHPOOL(shm), ptr);
-}
-#else
-size_t shm_used_pages(shmem_t *shm) {
-  ngx_slab_pool_t    *shpool = SHPOOL(shm);
-  ngx_slab_page_t    *slots = (ngx_slab_page_t *) ((u_char *) (shpool) + sizeof(ngx_slab_pool_t));
-  size_t              size = shpool->end - (u_char *) slots;
-  
-  ngx_uint_t          max = (ngx_uint_t) (size / (ngx_pagesize + sizeof(ngx_slab_page_t)));
-  return max - shpool->pfree;
-}
-#endif
-
-ngx_int_t shm_init(shmem_t *shm) {
-  ngx_slab_pool_t    *shpool = SHPOOL(shm);
-  #if (DEBUG_SHM_ALLOC == 1)
-  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "nchan_shpool start %p size %i", shpool->start, (u_char *)shpool->end - (u_char *)shpool->start);
-  #endif
-#if nginx_version <= 1011006
-  nchan_slab_init(shpool);
-#else
-  ngx_slab_init(shpool);
-#endif  
-  
-  return NGX_OK;
-}
-
-ngx_int_t shm_reinit(shmem_t *shm) {
-  ngx_slab_pool_t    *shpool = SHPOOL(shm);
-#if nginx_version <= 1011006
-  nchan_slab_init(shpool);
-#else
-  ngx_slab_init(shpool);
-#endif  
-  
-  return NGX_OK;
-}
-
-void shmtx_lock(shmem_t *shm) {
-  ngx_shmtx_lock(&SHPOOL(shm)->mutex);
-}
-void shmtx_unlock(shmem_t *shm) {
-  ngx_shmtx_unlock(&SHPOOL(shm)->mutex);
-}
-
-ngx_int_t shm_destroy(shmem_t *shm) {
-  //VALGRIND_DESTROY_MEMPOOL(SHPOOL(shm));
-  ngx_free(shm);
-  
-  return NGX_OK;
-}
-void *shm_alloc(shmem_t *shm, size_t size, const char *label) {
-  void         *p;
-#if (FAKESHARD || FAKE_SHMEM)
-  p = ngx_alloc(size, ngx_cycle->log);
-#else
-  #if nginx_version <= 1011006
-  p = nchan_slab_alloc(SHPOOL(shm), size);  
-  #else
-  p = ngx_slab_alloc(SHPOOL(shm), size);
-  #endif
-#endif
-  if(p == NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "shpool alloc failed");
-  }
-
-  #if (DEBUG_SHM_ALLOC == 1)
-  if (p != NULL) {
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool alloc addr %p size %ui label %s", p, size, label == NULL ? "none" : label);
-  }
-  #endif
-  return p;
-}
-
-void *shm_calloc(shmem_t *shm, size_t size, const char *label) {
-  void *p = shm_alloc(shm, size, label);
-  if(p != NULL) {
-    ngx_memzero(p, size);
-  }
-  return p;
-}
-
-void shm_free(shmem_t *shm, void *p) {
-#if (FAKESHARD || FAKE_SHMEM)
-  ngx_free(p);
-#else
-  #if nginx_version <= 1011006
-  nchan_slab_free(SHPOOL(shm), p);
-  #else
-  ngx_slab_free(SHPOOL(shm), p);
-  #endif
-#endif
-#if (DEBUG_SHM_ALLOC == 1)
-  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool free addr %p", p);
-#endif
-}
-
-
-
-//copypasta because these should only be used for debugging
-
-void *shm_locked_alloc(shmem_t *shm, size_t size, const char *label) {
-  void         *p;
-#if (FAKESHARD || FAKE_SHMEM)
-  p = ngx_alloc(size, ngx_cycle->log);
-#else
-  #if nginx_version <= 1011006
-  p = nchan_slab_alloc_locked(SHPOOL(shm), size);
-  #else 
-  p = ngx_slab_alloc_locked(SHPOOL(shm), size);
-  #endif
-#endif
-  if(p == NULL) {
-    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "shpool alloc failed");
-  }
-
-  #if (DEBUG_SHM_ALLOC == 1)
-  if (p != NULL) {
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool alloc addr %p size %ui label %s", p, size, label == NULL ? "none" : label);
-  }
-  #endif
-  return p;
-}
-
-void *shm_locked_calloc(shmem_t *shm, size_t size, const char *label) {
-  void *p = shm_locked_alloc(shm, size, label);
-  if(p != NULL) {
-    ngx_memzero(p, size);
-  }
-  return p;
-}
-
-void shm_locked_free(shmem_t *shm, void *p) {
-#if (FAKESHARD || FAKE_SHMEM)
-  ngx_free(p);
-#else
-  #if nginx_version <= 1011006
-  nchan_slab_free_locked(SHPOOL(shm), p);
-  #else
-  ngx_slab_free_locked(SHPOOL(shm), p);
-  #endif
-#endif
-#if (DEBUG_SHM_ALLOC == 1)
-  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool free addr %p", p);
-#endif
-}
-
-void shm_verify_immutable_string(shmem_t *shm, ngx_str_t *str) {
- /* u_char    *pt=(u_char *)str-1;
-  assert(pt[0]=='<');
-  pt=str->data;
-  assert(pt[str->len]=='>');
-  */
-}
-
-void shm_free_immutable_string(shmem_t *shm, ngx_str_t *str) {
-  shm_free(shm, (void *)str);
-}
-
-ngx_str_t *shm_copy_immutable_string(shmem_t *shm, ngx_str_t *str_in) {
-  ngx_str_t    *str;
-  size_t        sz = sizeof(*str) + str_in->len;
-  if((str = shm_alloc(shm, sz, "string")) == NULL) {
-    return NULL;
-  }
-  str->data=(u_char *)&str[1];
-  str->len=str_in->len;
-  ngx_memcpy(str->data, str_in->data, str_in->len);
-  return str;
-}
diff --git a/debian/modules/nchan/src/util/shmem.h b/debian/modules/nchan/src/util/shmem.h
deleted file mode 100644
index 52417dc..0000000
--- a/debian/modules/nchan/src/util/shmem.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef NCHAN_SHMEM_H
-#define NCHAN_SHMEM_H
-typedef struct {
-  ngx_shm_zone_t        *zone;
-} shmem_t;
-
-shmem_t          *shm_create(ngx_str_t *name, ngx_conf_t *cf, size_t shm_size, ngx_int_t (*init)(ngx_shm_zone_t *, void *), void *privdata);
-ngx_int_t         shm_init(shmem_t *shm);
-ngx_int_t         shm_reinit(shmem_t *shm);
-ngx_int_t         shm_destroy(shmem_t *shm);
-void             *shm_alloc(shmem_t *shm, size_t size, const char *label);
-void             *shm_calloc(shmem_t *shm, size_t size, const char *label);
-void              shm_free(shmem_t *shm, void *p);
-
-void             *shm_locked_alloc(shmem_t *shm, size_t size, const char *label);
-void             *shm_locked_calloc(shmem_t *shm, size_t size, const char *label);
-void              shm_locked_free(shmem_t *shm, void *p);
-
-void              shmtx_lock(shmem_t *shm);
-void              shmtx_unlock(shmem_t *shm);
-
-ngx_str_t        *shm_copy_immutable_string(shmem_t *shm, ngx_str_t *str);
-void              shm_free_immutable_string(shmem_t *shm, ngx_str_t *str);
-void              shm_verify_immutable_string(shmem_t *shm, ngx_str_t *str);
-
-#if nginx_version <= 1011006
-void shm_set_allocd_pages_tracker(shmem_t *shm, ngx_atomic_uint_t *ptr);
-#else
-ngx_uint_t shm_used_pages(shmem_t *shm);
-#endif
-
-
-#endif //NCHAN_SHMEM_H
diff --git a/debian/modules/rtmp/AUTHORS b/debian/modules/rtmp/AUTHORS
deleted file mode 100644
index e169dff..0000000
--- a/debian/modules/rtmp/AUTHORS
+++ /dev/null
@@ -1,8 +0,0 @@
-Project author:
-
-  Roman Arutyunyan
-    Moscow, Russia
-
-  Contacts:
-    arut@qip.ru
-    arutyunyan.roman@gmail.com
diff --git a/debian/modules/rtmp/LICENSE b/debian/modules/rtmp/LICENSE
deleted file mode 100644
index 15cb1e0..0000000
--- a/debian/modules/rtmp/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2012-2014, Roman Arutyunyan
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/rtmp/README.md b/debian/modules/rtmp/README.md
deleted file mode 100644
index b4c9a69..0000000
--- a/debian/modules/rtmp/README.md
+++ /dev/null
@@ -1,332 +0,0 @@
-# NGINX-based Media Streaming Server
-## nginx-rtmp-module
-
-
-### Project blog
-
-  http://nginx-rtmp.blogspot.com
-
-### Wiki manual
-
-  https://github.com/arut/nginx-rtmp-module/wiki/Directives
-
-### Google group
-
-  https://groups.google.com/group/nginx-rtmp
-
-  https://groups.google.com/group/nginx-rtmp-ru (Russian)
-
-### Donation page (Paypal etc)
-
-  http://arut.github.com/nginx-rtmp-module/
-
-### Features
-
-* RTMP/HLS/MPEG-DASH live streaming
-
-* RTMP Video on demand FLV/MP4,
-  playing from local filesystem or HTTP
-
-* Stream relay support for distributed
-  streaming: push & pull models
-
-* Recording streams in multiple FLVs
-
-* H264/AAC support
-
-* Online transcoding with FFmpeg
-
-* HTTP callbacks (publish/play/record/update etc)
-
-* Running external programs on certain events (exec)
-
-* HTTP control module for recording audio/video and dropping clients
-
-* Advanced buffering techniques
-  to keep memory allocations at a minimum
-  level for faster streaming and low
-  memory footprint
-
-* Proved to work with Wirecast, FMS, Wowza,
-  JWPlayer, FlowPlayer, StrobeMediaPlayback,
-  ffmpeg, avconv, rtmpdump, flvstreamer
-  and many more
-
-* Statistics in XML/XSL in machine- & human-
-  readable form
-
-* Linux/FreeBSD/MacOS/Windows
-
-### Build
-
-cd to NGINX source directory & run this:
-
-    ./configure --add-module=/path/to/nginx-rtmp-module
-    make
-    make install
-
-Several versions of nginx (1.3.14 - 1.5.0) require http_ssl_module to be
-added as well:
-
-    ./configure --add-module=/path/to/nginx-rtmp-module --with-http_ssl_module
-
-For building debug version of nginx add `--with-debug`
-
-    ./configure --add-module=/path/to-nginx/rtmp-module --with-debug
-
-[Read more about debug log](https://github.com/arut/nginx-rtmp-module/wiki/Debug-log)
-
-### Windows limitations
-
-Windows support is limited. These features are not supported
-
-* execs
-* static pulls
-* auto_push
-
-### RTMP URL format
-
-    rtmp://rtmp.example.com/app[/name]
-
-app -  should match one of application {}
-         blocks in config
-
-name - interpreted by each application
-         can be empty
-
-
-### Multi-worker live streaming
-
-Module supports multi-worker live
-streaming through automatic stream pushing
-to nginx workers. This option is toggled with
-rtmp_auto_push directive.
-
-
-### Example nginx.conf
-
-    rtmp {
-
-        server {
-
-            listen 1935;
-
-            chunk_size 4000;
-
-            # TV mode: one publisher, many subscribers
-            application mytv {
-
-                # enable live streaming
-                live on;
-
-                # record first 1K of stream
-                record all;
-                record_path /tmp/av;
-                record_max_size 1K;
-
-                # append current timestamp to each flv
-                record_unique on;
-
-                # publish only from localhost
-                allow publish 127.0.0.1;
-                deny publish all;
-
-                #allow play all;
-            }
-
-            # Transcoding (ffmpeg needed)
-            application big {
-                live on;
-
-                # On every pusblished stream run this command (ffmpeg)
-                # with substitutions: $app/${app}, $name/${name} for application & stream name.
-                #
-                # This ffmpeg call receives stream from this application &
-                # reduces the resolution down to 32x32. The stream is the published to
-                # 'small' application (see below) under the same name.
-                #
-                # ffmpeg can do anything with the stream like video/audio
-                # transcoding, resizing, altering container/codec params etc
-                #
-                # Multiple exec lines can be specified.
-
-                exec ffmpeg -re -i rtmp://localhost:1935/$app/$name -vcodec flv -acodec copy -s 32x32
-                            -f flv rtmp://localhost:1935/small/${name};
-            }
-
-            application small {
-                live on;
-                # Video with reduced resolution comes here from ffmpeg
-            }
-
-            application webcam {
-                live on;
-
-                # Stream from local webcam
-                exec_static ffmpeg -f video4linux2 -i /dev/video0 -c:v libx264 -an
-                                   -f flv rtmp://localhost:1935/webcam/mystream;
-            }
-
-            application mypush {
-                live on;
-
-                # Every stream published here
-                # is automatically pushed to
-                # these two machines
-                push rtmp1.example.com;
-                push rtmp2.example.com:1934;
-            }
-
-            application mypull {
-                live on;
-
-                # Pull all streams from remote machine
-                # and play locally
-                pull rtmp://rtmp3.example.com pageUrl=www.example.com/index.html;
-            }
-
-            application mystaticpull {
-                live on;
-
-                # Static pull is started at nginx start
-                pull rtmp://rtmp4.example.com pageUrl=www.example.com/index.html name=mystream static;
-            }
-
-            # video on demand
-            application vod {
-                play /var/flvs;
-            }
-
-            application vod2 {
-                play /var/mp4s;
-            }
-
-            # Many publishers, many subscribers
-            # no checks, no recording
-            application videochat {
-
-                live on;
-
-                # The following notifications receive all
-                # the session variables as well as
-                # particular call arguments in HTTP POST
-                # request
-
-                # Make HTTP request & use HTTP retcode
-                # to decide whether to allow publishing
-                # from this connection or not
-                on_publish http://localhost:8080/publish;
-
-                # Same with playing
-                on_play http://localhost:8080/play;
-
-                # Publish/play end (repeats on disconnect)
-                on_done http://localhost:8080/done;
-
-                # All above mentioned notifications receive
-                # standard connect() arguments as well as
-                # play/publish ones. If any arguments are sent
-                # with GET-style syntax to play & publish
-                # these are also included.
-                # Example URL:
-                #   rtmp://localhost/myapp/mystream?a=b&c=d
-
-                # record 10 video keyframes (no audio) every 2 minutes
-                record keyframes;
-                record_path /tmp/vc;
-                record_max_frames 10;
-                record_interval 2m;
-
-                # Async notify about an flv recorded
-                on_record_done http://localhost:8080/record_done;
-
-            }
-
-
-            # HLS
-
-            # For HLS to work please create a directory in tmpfs (/tmp/hls here)
-            # for the fragments. The directory contents is served via HTTP (see
-            # http{} section in config)
-            #
-            # Incoming stream must be in H264/AAC. For iPhones use baseline H264
-            # profile (see ffmpeg example).
-            # This example creates RTMP stream from movie ready for HLS:
-            #
-            # ffmpeg -loglevel verbose -re -i movie.avi  -vcodec libx264
-            #    -vprofile baseline -acodec libmp3lame -ar 44100 -ac 1
-            #    -f flv rtmp://localhost:1935/hls/movie
-            #
-            # If you need to transcode live stream use 'exec' feature.
-            #
-            application hls {
-                live on;
-                hls on;
-                hls_path /tmp/hls;
-            }
-
-            # MPEG-DASH is similar to HLS
-
-            application dash {
-                live on;
-                dash on;
-                dash_path /tmp/dash;
-            }
-        }
-    }
-
-    # HTTP can be used for accessing RTMP stats
-    http {
-
-        server {
-
-            listen      8080;
-
-            # This URL provides RTMP statistics in XML
-            location /stat {
-                rtmp_stat all;
-
-                # Use this stylesheet to view XML as web page
-                # in browser
-                rtmp_stat_stylesheet stat.xsl;
-            }
-
-            location /stat.xsl {
-                # XML stylesheet to view RTMP stats.
-                # Copy stat.xsl wherever you want
-                # and put the full directory path here
-                root /path/to/stat.xsl/;
-            }
-
-            location /hls {
-                # Serve HLS fragments
-                types {
-                    application/vnd.apple.mpegurl m3u8;
-                    video/mp2t ts;
-                }
-                root /tmp;
-                add_header Cache-Control no-cache;
-            }
-
-            location /dash {
-                # Serve DASH fragments
-                root /tmp;
-                add_header Cache-Control no-cache;
-            }
-        }
-    }
-
-
-### Multi-worker streaming example
-
-    rtmp_auto_push on;
-
-    rtmp {
-        server {
-            listen 1935;
-
-            application mytv {
-                live on;
-            }
-        }
-    }
diff --git a/debian/modules/rtmp/config b/debian/modules/rtmp/config
deleted file mode 100644
index 51176f3..0000000
--- a/debian/modules/rtmp/config
+++ /dev/null
@@ -1,133 +0,0 @@
-ngx_addon_name="ngx_rtmp_module"
-
-RTMP_CORE_MODULES="                                         \
-                ngx_rtmp_module                             \
-                ngx_rtmp_core_module                        \
-                ngx_rtmp_cmd_module                         \
-                ngx_rtmp_codec_module                       \
-                ngx_rtmp_access_module                      \
-                ngx_rtmp_record_module                      \
-                ngx_rtmp_live_module                        \
-                ngx_rtmp_play_module                        \
-                ngx_rtmp_flv_module                         \
-                ngx_rtmp_mp4_module                         \
-                ngx_rtmp_netcall_module                     \
-                ngx_rtmp_relay_module                       \
-                ngx_rtmp_exec_module                        \
-                ngx_rtmp_auto_push_module                   \
-                ngx_rtmp_auto_push_index_module             \
-                ngx_rtmp_notify_module                      \
-                ngx_rtmp_log_module                         \
-                ngx_rtmp_limit_module                       \
-                ngx_rtmp_hls_module                         \
-                ngx_rtmp_dash_module                        \
-                "
-
-
-RTMP_HTTP_MODULES="                                         \
-                ngx_rtmp_stat_module                        \
-                ngx_rtmp_control_module                     \
-                "
-
-
-RTMP_DEPS="                                                 \
-                $ngx_addon_dir/ngx_rtmp_amf.h               \
-                $ngx_addon_dir/ngx_rtmp_bandwidth.h         \
-                $ngx_addon_dir/ngx_rtmp_cmd_module.h        \
-                $ngx_addon_dir/ngx_rtmp_codec_module.h      \
-                $ngx_addon_dir/ngx_rtmp_eval.h              \
-                $ngx_addon_dir/ngx_rtmp.h                   \
-                $ngx_addon_dir/ngx_rtmp_version.h           \
-                $ngx_addon_dir/ngx_rtmp_live_module.h       \
-                $ngx_addon_dir/ngx_rtmp_netcall_module.h    \
-                $ngx_addon_dir/ngx_rtmp_play_module.h       \
-                $ngx_addon_dir/ngx_rtmp_record_module.h     \
-                $ngx_addon_dir/ngx_rtmp_relay_module.h      \
-                $ngx_addon_dir/ngx_rtmp_streams.h           \
-                $ngx_addon_dir/ngx_rtmp_bitop.h             \
-                $ngx_addon_dir/ngx_rtmp_proxy_protocol.h    \
-                $ngx_addon_dir/hls/ngx_rtmp_mpegts.h        \
-                $ngx_addon_dir/dash/ngx_rtmp_mp4.h          \
-                "
-
-
-RTMP_CORE_SRCS="                                            \
-                $ngx_addon_dir/ngx_rtmp.c                   \
-                $ngx_addon_dir/ngx_rtmp_init.c              \
-                $ngx_addon_dir/ngx_rtmp_handshake.c         \
-                $ngx_addon_dir/ngx_rtmp_handler.c           \
-                $ngx_addon_dir/ngx_rtmp_amf.c               \
-                $ngx_addon_dir/ngx_rtmp_send.c              \
-                $ngx_addon_dir/ngx_rtmp_shared.c            \
-                $ngx_addon_dir/ngx_rtmp_eval.c              \
-                $ngx_addon_dir/ngx_rtmp_receive.c           \
-                $ngx_addon_dir/ngx_rtmp_core_module.c       \
-                $ngx_addon_dir/ngx_rtmp_cmd_module.c        \
-                $ngx_addon_dir/ngx_rtmp_codec_module.c      \
-                $ngx_addon_dir/ngx_rtmp_access_module.c     \
-                $ngx_addon_dir/ngx_rtmp_record_module.c     \
-                $ngx_addon_dir/ngx_rtmp_live_module.c       \
-                $ngx_addon_dir/ngx_rtmp_play_module.c       \
-                $ngx_addon_dir/ngx_rtmp_flv_module.c        \
-                $ngx_addon_dir/ngx_rtmp_mp4_module.c        \
-                $ngx_addon_dir/ngx_rtmp_netcall_module.c    \
-                $ngx_addon_dir/ngx_rtmp_relay_module.c      \
-                $ngx_addon_dir/ngx_rtmp_bandwidth.c         \
-                $ngx_addon_dir/ngx_rtmp_exec_module.c       \
-                $ngx_addon_dir/ngx_rtmp_auto_push_module.c  \
-                $ngx_addon_dir/ngx_rtmp_notify_module.c     \
-                $ngx_addon_dir/ngx_rtmp_log_module.c        \
-                $ngx_addon_dir/ngx_rtmp_limit_module.c      \
-                $ngx_addon_dir/ngx_rtmp_bitop.c             \
-                $ngx_addon_dir/ngx_rtmp_proxy_protocol.c    \
-                $ngx_addon_dir/hls/ngx_rtmp_hls_module.c    \
-                $ngx_addon_dir/dash/ngx_rtmp_dash_module.c  \
-                $ngx_addon_dir/hls/ngx_rtmp_mpegts.c        \
-                $ngx_addon_dir/dash/ngx_rtmp_mp4.c          \
-                "
-
-
-RTMP_HTTP_SRCS="                                            \
-                $ngx_addon_dir/ngx_rtmp_stat_module.c       \
-                $ngx_addon_dir/ngx_rtmp_control_module.c    \
-                "
-
-if [ -f auto/module ] ; then
-    ngx_module_incs=$ngx_addon_dir
-    ngx_module_deps=$RTMP_DEPS
-
-    if [ $ngx_module_link = DYNAMIC ] ; then
-        ngx_module_name="$RTMP_CORE_MODULES $RTMP_HTTP_MODULES"
-        ngx_module_srcs="$RTMP_CORE_SRCS $RTMP_HTTP_SRCS"
-
-        . auto/module
-
-    else
-        ngx_module_type=CORE
-        ngx_module_name=$RTMP_CORE_MODULES
-        ngx_module_srcs=$RTMP_CORE_SRCS
-
-        . auto/module
-
-
-        ngx_module_type=HTTP
-        ngx_module_name=$RTMP_HTTP_MODULES
-        ngx_module_incs=
-        ngx_module_deps=
-        ngx_module_srcs=$RTMP_HTTP_SRCS
-
-        . auto/module
-    fi
-
-else
-    CORE_MODULES="$CORE_MODULES $RTMP_CORE_MODULES"
-    HTTP_MODULES="$HTTP_MODULES $RTMP_HTTP_MODULES"
-
-    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $RTMP_DEPS"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $RTMP_CORE_SRCS $RTMP_HTTP_SRCS"
-
-    CFLAGS="$CFLAGS -I$ngx_addon_dir"
-fi
-
-USE_OPENSSL=YES
-
diff --git a/debian/modules/rtmp/dash/ngx_rtmp_dash_module.c b/debian/modules/rtmp/dash/ngx_rtmp_dash_module.c
deleted file mode 100644
index 81bc343..0000000
--- a/debian/modules/rtmp/dash/ngx_rtmp_dash_module.c
+++ /dev/null
@@ -1,1531 +0,0 @@
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_rtmp.h>
-#include <ngx_rtmp_codec_module.h>
-#include "ngx_rtmp_live_module.h"
-#include "ngx_rtmp_mp4.h"
-
-
-static ngx_rtmp_publish_pt              next_publish;
-static ngx_rtmp_close_stream_pt         next_close_stream;
-static ngx_rtmp_stream_begin_pt         next_stream_begin;
-static ngx_rtmp_stream_eof_pt           next_stream_eof;
-
-
-static ngx_int_t ngx_rtmp_dash_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_dash_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_dash_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-static ngx_int_t ngx_rtmp_dash_write_init_segments(ngx_rtmp_session_t *s);
-
-
-#define NGX_RTMP_DASH_BUFSIZE           (1024*1024)
-#define NGX_RTMP_DASH_MAX_MDAT          (10*1024*1024)
-#define NGX_RTMP_DASH_MAX_SAMPLES       1024
-#define NGX_RTMP_DASH_DIR_ACCESS        0744
-
-
-typedef struct {
-    uint32_t                            timestamp;
-    uint32_t                            duration;
-} ngx_rtmp_dash_frag_t;
-
-
-typedef struct {
-    ngx_uint_t                          id;
-    ngx_uint_t                          opened;
-    ngx_uint_t                          mdat_size;
-    ngx_uint_t                          sample_count;
-    ngx_uint_t                          sample_mask;
-    ngx_fd_t                            fd;
-    char                                type;
-    uint32_t                            earliest_pres_time;
-    uint32_t                            latest_pres_time;
-    ngx_rtmp_mp4_sample_t               samples[NGX_RTMP_DASH_MAX_SAMPLES];
-} ngx_rtmp_dash_track_t;
-
-
-typedef struct {
-    ngx_str_t                           playlist;
-    ngx_str_t                           playlist_bak;
-    ngx_str_t                           name;
-    ngx_str_t                           stream;
-    time_t                              start_time;
-
-    ngx_uint_t                          nfrags;
-    ngx_uint_t                          frag;
-    ngx_rtmp_dash_frag_t               *frags; /* circular 2 * winfrags + 1 */
-
-    unsigned                            opened:1;
-    unsigned                            has_video:1;
-    unsigned                            has_audio:1;
-
-    ngx_file_t                          video_file;
-    ngx_file_t                          audio_file;
-
-    ngx_uint_t                          id;
-
-    ngx_rtmp_dash_track_t               audio;
-    ngx_rtmp_dash_track_t               video;
-} ngx_rtmp_dash_ctx_t;
-
-
-typedef struct {
-    ngx_str_t                           path;
-    ngx_msec_t                          playlen;
-} ngx_rtmp_dash_cleanup_t;
-
-
-typedef struct {
-    ngx_flag_t                          dash;
-    ngx_msec_t                          fraglen;
-    ngx_msec_t                          playlen;
-    ngx_flag_t                          nested;
-    ngx_str_t                           path;
-    ngx_uint_t                          winfrags;
-    ngx_flag_t                          cleanup;
-    ngx_path_t                         *slot;
-} ngx_rtmp_dash_app_conf_t;
-
-
-static ngx_command_t ngx_rtmp_dash_commands[] = {
-
-    { ngx_string("dash"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_dash_app_conf_t, dash),
-      NULL },
-
-    { ngx_string("dash_fragment"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_dash_app_conf_t, fraglen),
-      NULL },
-
-    { ngx_string("dash_path"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_dash_app_conf_t, path),
-      NULL },
-
-    { ngx_string("dash_playlist_length"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_dash_app_conf_t, playlen),
-      NULL },
-
-    { ngx_string("dash_cleanup"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_dash_app_conf_t, cleanup),
-      NULL },
-
-    { ngx_string("dash_nested"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_dash_app_conf_t, nested),
-      NULL },
-
-    ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_dash_module_ctx = {
-    NULL,                               /* preconfiguration */
-    ngx_rtmp_dash_postconfiguration,    /* postconfiguration */
-
-    NULL,                               /* create main configuration */
-    NULL,                               /* init main configuration */
-
-    NULL,                               /* create server configuration */
-    NULL,                               /* merge server configuration */
-
-    ngx_rtmp_dash_create_app_conf,      /* create location configuration */
-    ngx_rtmp_dash_merge_app_conf,       /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_dash_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_dash_module_ctx,          /* module context */
-    ngx_rtmp_dash_commands,             /* module directives */
-    NGX_RTMP_MODULE,                    /* module type */
-    NULL,                               /* init master */
-    NULL,                               /* init module */
-    NULL,                               /* init process */
-    NULL,                               /* init thread */
-    NULL,                               /* exit thread */
-    NULL,                               /* exit process */
-    NULL,                               /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_rtmp_dash_frag_t *
-ngx_rtmp_dash_get_frag(ngx_rtmp_session_t *s, ngx_int_t n)
-{
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_dash_app_conf_t  *dacf;
-
-    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-
-    return &ctx->frags[(ctx->frag + n) % (dacf->winfrags * 2 + 1)];
-}
-
-
-static void
-ngx_rtmp_dash_next_frag(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_dash_app_conf_t  *dacf;
-
-    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-
-    if (ctx->nfrags == dacf->winfrags) {
-        ctx->frag++;
-    } else {
-        ctx->nfrags++;
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_rename_file(u_char *src, u_char *dst)
-{
-    /* rename file with overwrite */
-
-#if (NGX_WIN32)
-    return MoveFileEx((LPCTSTR) src, (LPCTSTR) dst, MOVEFILE_REPLACE_EXISTING);
-#else
-    return ngx_rename_file(src, dst);
-#endif
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_write_playlist(ngx_rtmp_session_t *s)
-{
-    char                      *sep;
-    u_char                    *p, *last;
-    ssize_t                    n;
-    ngx_fd_t                   fd;
-    struct tm                  tm;
-    ngx_str_t                  noname, *name;
-    ngx_uint_t                 i;
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_codec_ctx_t      *codec_ctx;
-    ngx_rtmp_dash_frag_t      *f;
-    ngx_rtmp_dash_app_conf_t  *dacf;
-
-    static u_char              buffer[NGX_RTMP_DASH_BUFSIZE];
-    static u_char              start_time[sizeof("1970-09-28T12:00:00Z")];
-    static u_char              pub_time[sizeof("1970-09-28T12:00:00Z")];
-
-    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (dacf == NULL || ctx == NULL || codec_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (ctx->id == 0) {
-        ngx_rtmp_dash_write_init_segments(s);
-    }
-
-    fd = ngx_open_file(ctx->playlist_bak.data, NGX_FILE_WRONLY,
-                       NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
-
-    if (fd == NGX_INVALID_FILE) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: open failed: '%V'", &ctx->playlist_bak);
-        return NGX_ERROR;
-    }
-
-#define NGX_RTMP_DASH_MANIFEST_HEADER                                          \
-    "<?xml version=\"1.0\"?>\n"                                                \
-    "<MPD\n"                                                                   \
-    "    type=\"dynamic\"\n"                                                   \
-    "    xmlns=\"urn:mpeg:dash:schema:mpd:2011\"\n"                            \
-    "    availabilityStartTime=\"%s\"\n"                                       \
-    "    publishTime=\"%s\"\n"                                                 \
-    "    minimumUpdatePeriod=\"PT%uiS\"\n"                                     \
-    "    minBufferTime=\"PT%uiS\"\n"                                           \
-    "    timeShiftBufferDepth=\"PT%uiS\"\n"                                    \
-    "    profiles=\"urn:hbbtv:dash:profile:isoff-live:2012,"                   \
-                   "urn:mpeg:dash:profile:isoff-live:2011\"\n"                 \
-    "    xmlns:xsi=\"http://www.w3.org/2011/XMLSchema-instance\"\n"            \
-    "    xsi:schemaLocation=\"urn:mpeg:DASH:schema:MPD:2011 DASH-MPD.xsd\">\n" \
-    "  <Period start=\"PT0S\" id=\"dash\">\n"
-
-
-#define NGX_RTMP_DASH_MANIFEST_VIDEO                                           \
-    "    <AdaptationSet\n"                                                     \
-    "        id=\"1\"\n"                                                       \
-    "        segmentAlignment=\"true\"\n"                                      \
-    "        maxWidth=\"%ui\"\n"                                               \
-    "        maxHeight=\"%ui\"\n"                                              \
-    "        maxFrameRate=\"%ui\">\n"                                          \
-    "      <Representation\n"                                                  \
-    "          id=\"%V_H264\"\n"                                               \
-    "          mimeType=\"video/mp4\"\n"                                       \
-    "          codecs=\"avc1.%02uxi%02uxi%02uxi\"\n"                           \
-    "          width=\"%ui\"\n"                                                \
-    "          height=\"%ui\"\n"                                               \
-    "          frameRate=\"%ui\"\n"                                            \
-    "          startWithSAP=\"1\"\n"                                           \
-    "          bandwidth=\"%ui\">\n"                                           \
-    "        <SegmentTemplate\n"                                               \
-    "            timescale=\"1000\"\n"                                         \
-    "            media=\"%V%s$Time$.m4v\"\n"                                   \
-    "            initialization=\"%V%sinit.m4v\">\n"                           \
-    "          <SegmentTimeline>\n"
-
-
-#define NGX_RTMP_DASH_MANIFEST_VIDEO_FOOTER                                    \
-    "          </SegmentTimeline>\n"                                           \
-    "        </SegmentTemplate>\n"                                             \
-    "      </Representation>\n"                                                \
-    "    </AdaptationSet>\n"
-
-
-#define NGX_RTMP_DASH_MANIFEST_TIME                                            \
-    "             <S t=\"%uD\" d=\"%uD\"/>\n"
-
-
-#define NGX_RTMP_DASH_MANIFEST_AUDIO                                           \
-    "    <AdaptationSet\n"                                                     \
-    "        id=\"2\"\n"                                                       \
-    "        segmentAlignment=\"true\">\n"                                     \
-    "      <AudioChannelConfiguration\n"                                       \
-    "          schemeIdUri=\"urn:mpeg:dash:"                                   \
-                                "23003:3:audio_channel_configuration:2011\"\n" \
-    "          value=\"1\"/>\n"                                                \
-    "      <Representation\n"                                                  \
-    "          id=\"%V_AAC\"\n"                                                \
-    "          mimeType=\"audio/mp4\"\n"                                       \
-    "          codecs=\"mp4a.%s\"\n"                                           \
-    "          audioSamplingRate=\"%ui\"\n"                                    \
-    "          startWithSAP=\"1\"\n"                                           \
-    "          bandwidth=\"%ui\">\n"                                           \
-    "        <SegmentTemplate\n"                                               \
-    "            timescale=\"1000\"\n"                                         \
-    "            media=\"%V%s$Time$.m4a\"\n"                                   \
-    "            initialization=\"%V%sinit.m4a\">\n"                           \
-    "          <SegmentTimeline>\n"
-
-
-#define NGX_RTMP_DASH_MANIFEST_AUDIO_FOOTER                                    \
-    "          </SegmentTimeline>\n"                                           \
-    "        </SegmentTemplate>\n"                                             \
-    "      </Representation>\n"                                                \
-    "    </AdaptationSet>\n"
-
-
-#define NGX_RTMP_DASH_MANIFEST_FOOTER                                          \
-    "  </Period>\n"                                                            \
-    "</MPD>\n"
-
-    ngx_libc_gmtime(ctx->start_time, &tm);
-
-    ngx_sprintf(start_time, "%4d-%02d-%02dT%02d:%02d:%02dZ%Z",
-                tm.tm_year + 1900, tm.tm_mon + 1,
-                tm.tm_mday, tm.tm_hour,
-                tm.tm_min, tm.tm_sec);
-
-    ngx_libc_gmtime(ngx_time(), &tm);
-
-    ngx_sprintf(pub_time, "%4d-%02d-%02dT%02d:%02d:%02dZ%Z",
-                tm.tm_year + 1900, tm.tm_mon + 1,
-                tm.tm_mday, tm.tm_hour,
-                tm.tm_min, tm.tm_sec);
-
-    last = buffer + sizeof(buffer);
-
-    p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_HEADER,
-                     start_time,
-                     pub_time,
-                     (ngx_uint_t) (dacf->fraglen / 1000),
-                     (ngx_uint_t) (dacf->fraglen / 1000),
-                     (ngx_uint_t) (dacf->fraglen / 250 + 1));
-
-    /*
-     * timeShiftBufferDepth formula:
-     *     2 * minBufferTime + max_fragment_length + 1
-     */
-
-    n = ngx_write_fd(fd, buffer, p - buffer);
-
-    ngx_str_null(&noname);
-
-    name = (dacf->nested ? &noname : &ctx->name);
-    sep = (dacf->nested ? "" : "-");
-
-    if (ctx->has_video) {
-        p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_VIDEO,
-                         codec_ctx->width,
-                         codec_ctx->height,
-                         codec_ctx->frame_rate,
-                         &ctx->name,
-                         codec_ctx->avc_profile,
-                         codec_ctx->avc_compat,
-                         codec_ctx->avc_level,
-                         codec_ctx->width,
-                         codec_ctx->height,
-                         codec_ctx->frame_rate,
-                         (ngx_uint_t) (codec_ctx->video_data_rate * 1000),
-                         name, sep,
-                         name, sep);
-
-        for (i = 0; i < ctx->nfrags; i++) {
-            f = ngx_rtmp_dash_get_frag(s, i);
-            p = ngx_slprintf(p, last, NGX_RTMP_DASH_MANIFEST_TIME,
-                             f->timestamp, f->duration);
-        }
-
-        p = ngx_slprintf(p, last, NGX_RTMP_DASH_MANIFEST_VIDEO_FOOTER);
-
-        n = ngx_write_fd(fd, buffer, p - buffer);
-    }
-
-    if (ctx->has_audio) {
-        p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_AUDIO,
-                         &ctx->name,
-                         codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC ?
-                         (codec_ctx->aac_sbr ? "40.5" : "40.2") : "6b",
-                         codec_ctx->sample_rate,
-                         (ngx_uint_t) (codec_ctx->audio_data_rate * 1000),
-                         name, sep,
-                         name, sep);
-
-        for (i = 0; i < ctx->nfrags; i++) {
-            f = ngx_rtmp_dash_get_frag(s, i);
-            p = ngx_slprintf(p, last, NGX_RTMP_DASH_MANIFEST_TIME,
-                             f->timestamp, f->duration);
-        }
-
-        p = ngx_slprintf(p, last, NGX_RTMP_DASH_MANIFEST_AUDIO_FOOTER);
-
-        n = ngx_write_fd(fd, buffer, p - buffer);
-    }
-
-    p = ngx_slprintf(buffer, last, NGX_RTMP_DASH_MANIFEST_FOOTER);
-    n = ngx_write_fd(fd, buffer, p - buffer);
-
-    if (n < 0) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: write failed: '%V'", &ctx->playlist_bak);
-        ngx_close_file(fd);
-        return NGX_ERROR;
-    }
-
-    ngx_close_file(fd);
-
-    if (ngx_rtmp_dash_rename_file(ctx->playlist_bak.data, ctx->playlist.data)
-        == NGX_FILE_ERROR)
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: rename failed: '%V'->'%V'",
-                      &ctx->playlist_bak, &ctx->playlist);
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_write_init_segments(ngx_rtmp_session_t *s)
-{
-    ngx_fd_t               fd;
-    ngx_int_t              rc;
-    ngx_buf_t              b;
-    ngx_rtmp_dash_ctx_t   *ctx;
-    ngx_rtmp_codec_ctx_t  *codec_ctx;
-
-    static u_char          buffer[NGX_RTMP_DASH_BUFSIZE];
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (ctx == NULL || codec_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    /* init video */
-
-    *ngx_sprintf(ctx->stream.data + ctx->stream.len, "init.m4v") = 0;
-
-    fd = ngx_open_file(ctx->stream.data, NGX_FILE_RDWR, NGX_FILE_TRUNCATE,
-                       NGX_FILE_DEFAULT_ACCESS);
-
-    if (fd == NGX_INVALID_FILE) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: error creating video init file");
-        return NGX_ERROR;
-    }
-
-    b.start = buffer;
-    b.end = b.start + sizeof(buffer);
-    b.pos = b.last = b.start;
-
-    ngx_rtmp_mp4_write_ftyp(&b);
-    ngx_rtmp_mp4_write_moov(s, &b, NGX_RTMP_MP4_VIDEO_TRACK);
-
-    rc = ngx_write_fd(fd, b.start, (size_t) (b.last - b.start));
-    if (rc == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: writing video init failed");
-    }
-
-    ngx_close_file(fd);
-
-    /* init audio */
-
-    *ngx_sprintf(ctx->stream.data + ctx->stream.len, "init.m4a") = 0;
-
-    fd = ngx_open_file(ctx->stream.data, NGX_FILE_RDWR, NGX_FILE_TRUNCATE,
-                       NGX_FILE_DEFAULT_ACCESS);
-
-    if (fd == NGX_INVALID_FILE) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: error creating dash audio init file");
-        return NGX_ERROR;
-    }
-
-    b.pos = b.last = b.start;
-
-    ngx_rtmp_mp4_write_ftyp(&b);
-    ngx_rtmp_mp4_write_moov(s, &b, NGX_RTMP_MP4_AUDIO_TRACK);
-
-    rc = ngx_write_fd(fd, b.start, (size_t) (b.last - b.start));
-    if (rc == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: writing audio init failed");
-    }
-
-    ngx_close_file(fd);
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_dash_close_fragment(ngx_rtmp_session_t *s, ngx_rtmp_dash_track_t *t)
-{
-    u_char                    *pos, *pos1;
-    size_t                     left;
-    ssize_t                    n;
-    ngx_fd_t                   fd;
-    ngx_buf_t                  b;
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_dash_frag_t      *f;
-
-    static u_char              buffer[NGX_RTMP_DASH_BUFSIZE];
-
-    if (!t->opened) {
-        return;
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "dash: close fragment id=%ui, type=%c, pts=%uD",
-                   t->id, t->type, t->earliest_pres_time);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-
-    b.start = buffer;
-    b.end = buffer + sizeof(buffer);
-    b.pos = b.last = b.start;
-
-    ngx_rtmp_mp4_write_styp(&b);
-
-    pos = b.last;
-    b.last += 44; /* leave room for sidx */
-
-    ngx_rtmp_mp4_write_moof(&b, t->earliest_pres_time, t->sample_count,
-                            t->samples, t->sample_mask, t->id);
-    pos1 = b.last;
-    b.last = pos;
-
-    ngx_rtmp_mp4_write_sidx(&b, t->mdat_size + 8 + (pos1 - (pos + 44)),
-                            t->earliest_pres_time, t->latest_pres_time);
-    b.last = pos1;
-    ngx_rtmp_mp4_write_mdat(&b, t->mdat_size + 8);
-
-    /* move the data down to make room for the headers */
-
-    f = ngx_rtmp_dash_get_frag(s, ctx->nfrags);
-
-    *ngx_sprintf(ctx->stream.data + ctx->stream.len, "%uD.m4%c",
-                 f->timestamp, t->type) = 0;
-
-    fd = ngx_open_file(ctx->stream.data, NGX_FILE_RDWR,
-                       NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
-
-    if (fd == NGX_INVALID_FILE) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: error creating dash temp video file");
-        goto done;
-    }
-
-    if (ngx_write_fd(fd, b.pos, (size_t) (b.last - b.pos)) == NGX_ERROR) {
-        goto done;
-    }
-
-    left = (size_t) t->mdat_size;
-
-#if (NGX_WIN32)
-    if (SetFilePointer(t->fd, 0, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "dash: SetFilePointer error");
-        goto done;
-    }
-#else
-    if (lseek(t->fd, 0, SEEK_SET) == -1) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: lseek error");
-        goto done;
-    }
-#endif
-
-    while (left > 0) {
-
-        n = ngx_read_fd(t->fd, buffer, ngx_min(sizeof(buffer), left));
-        if (n == NGX_ERROR) {
-            break;
-        }
-
-        n = ngx_write_fd(fd, buffer, (size_t) n);
-        if (n == NGX_ERROR) {
-            break;
-        }
-
-        left -= n;
-    }
-
-done:
-
-    if (fd != NGX_INVALID_FILE) {
-        ngx_close_file(fd);
-    }
-
-    ngx_close_file(t->fd);
-
-    t->fd = NGX_INVALID_FILE;
-    t->opened = 0;
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_close_fragments(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_dash_ctx_t  *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-    if (ctx == NULL || !ctx->opened) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "dash: close fragments");
-
-    ngx_rtmp_dash_close_fragment(s, &ctx->video);
-    ngx_rtmp_dash_close_fragment(s, &ctx->audio);
-
-    ngx_rtmp_dash_next_frag(s);
-
-    ngx_rtmp_dash_write_playlist(s);
-
-    ctx->id++;
-    ctx->opened = 0;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_open_fragment(ngx_rtmp_session_t *s, ngx_rtmp_dash_track_t *t,
-    ngx_uint_t id, char type)
-{
-    ngx_rtmp_dash_ctx_t   *ctx;
-
-    if (t->opened) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "dash: open fragment id=%ui, type='%c'", id, type);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-
-    *ngx_sprintf(ctx->stream.data + ctx->stream.len, "raw.m4%c", type) = 0;
-
-    t->fd = ngx_open_file(ctx->stream.data, NGX_FILE_RDWR,
-                          NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
-
-    if (t->fd == NGX_INVALID_FILE) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: error creating fragment file");
-        return NGX_ERROR;
-    }
-
-    t->id = id;
-    t->type = type;
-    t->sample_count = 0;
-    t->earliest_pres_time = 0;
-    t->latest_pres_time = 0;
-    t->mdat_size = 0;
-    t->opened = 1;
-
-    if (type == 'v') {
-        t->sample_mask = NGX_RTMP_MP4_SAMPLE_SIZE|
-                         NGX_RTMP_MP4_SAMPLE_DURATION|
-                         NGX_RTMP_MP4_SAMPLE_DELAY|
-                         NGX_RTMP_MP4_SAMPLE_KEY;
-    } else {
-        t->sample_mask = NGX_RTMP_MP4_SAMPLE_SIZE|
-                         NGX_RTMP_MP4_SAMPLE_DURATION;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_open_fragments(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_dash_ctx_t  *ctx;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "dash: open fragments");
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-
-    if (ctx->opened) {
-        return NGX_OK;
-    }
-
-    ngx_rtmp_dash_open_fragment(s, &ctx->video, ctx->id, 'v');
-
-    ngx_rtmp_dash_open_fragment(s, &ctx->audio, ctx->id, 'a');
-
-    ctx->opened = 1;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_ensure_directory(ngx_rtmp_session_t *s)
-{
-    size_t                     len;
-    ngx_file_info_t            fi;
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_dash_app_conf_t  *dacf;
-
-    static u_char              path[NGX_MAX_PATH + 1];
-
-    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
-
-    *ngx_snprintf(path, sizeof(path) - 1, "%V", &dacf->path) = 0;
-
-    if (ngx_file_info(path, &fi) == NGX_FILE_ERROR) {
-
-        if (ngx_errno != NGX_ENOENT) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                          "dash: " ngx_file_info_n " failed on '%V'",
-                          &dacf->path);
-            return NGX_ERROR;
-        }
-
-        /* ENOENT */
-
-        if (ngx_create_dir(path, NGX_RTMP_DASH_DIR_ACCESS) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                          "dash: " ngx_create_dir_n " failed on '%V'",
-                          &dacf->path);
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "dash: directory '%V' created", &dacf->path);
-
-    } else {
-
-        if (!ngx_is_dir(&fi)) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "dash: '%V' exists and is not a directory",
-                          &dacf->path);
-            return  NGX_ERROR;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "dash: directory '%V' exists", &dacf->path);
-    }
-
-    if (!dacf->nested) {
-        return NGX_OK;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-
-    len = dacf->path.len;
-    if (dacf->path.data[len - 1] == '/') {
-        len--;
-    }
-
-    *ngx_snprintf(path, sizeof(path) - 1, "%*s/%V", len, dacf->path.data,
-                  &ctx->name) = 0;
-
-    if (ngx_file_info(path, &fi) != NGX_FILE_ERROR) {
-
-        if (ngx_is_dir(&fi)) {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "dash: directory '%s' exists", path);
-            return NGX_OK;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "dash: '%s' exists and is not a directory", path);
-
-        return  NGX_ERROR;
-    }
-
-    if (ngx_errno != NGX_ENOENT) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: " ngx_file_info_n " failed on '%s'", path);
-        return NGX_ERROR;
-    }
-
-    /* NGX_ENOENT */
-
-    if (ngx_create_dir(path, NGX_RTMP_DASH_DIR_ACCESS) == NGX_FILE_ERROR) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: " ngx_create_dir_n " failed on '%s'", path);
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "dash: directory '%s' created", path);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    u_char                    *p;
-    size_t                     len;
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_dash_frag_t      *f;
-    ngx_rtmp_dash_app_conf_t  *dacf;
-
-    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
-    if (dacf == NULL || !dacf->dash || dacf->path.len == 0) {
-        goto next;
-    }
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "dash: publish: name='%s' type='%s'", v->name, v->type);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-
-    if (ctx == NULL) {
-        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_dash_ctx_t));
-        if (ctx == NULL) {
-            goto next;
-        }
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_dash_module);
-
-    } else {
-        if (ctx->opened) {
-            goto next;
-        }
-
-        f = ctx->frags;
-        ngx_memzero(ctx, sizeof(ngx_rtmp_dash_ctx_t));
-        ctx->frags = f;
-    }
-
-    if (ctx->frags == NULL) {
-        ctx->frags = ngx_pcalloc(s->connection->pool,
-                                 sizeof(ngx_rtmp_dash_frag_t) *
-                                 (dacf->winfrags * 2 + 1));
-        if (ctx->frags == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    ctx->id = 0;
-
-    if (ngx_strstr(v->name, "..")) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "dash: bad stream name: '%s'", v->name);
-        return NGX_ERROR;
-    }
-
-    ctx->name.len = ngx_strlen(v->name);
-    ctx->name.data = ngx_palloc(s->connection->pool, ctx->name.len + 1);
-
-    if (ctx->name.data == NULL) {
-        return NGX_ERROR;
-    }
-
-    *ngx_cpymem(ctx->name.data, v->name, ctx->name.len) = 0;
-
-    len = dacf->path.len + 1 + ctx->name.len + sizeof(".mpd");
-    if (dacf->nested) {
-        len += sizeof("/index") - 1;
-    }
-
-    ctx->playlist.data = ngx_palloc(s->connection->pool, len);
-    p = ngx_cpymem(ctx->playlist.data, dacf->path.data, dacf->path.len);
-
-    if (p[-1] != '/') {
-        *p++ = '/';
-    }
-
-    p = ngx_cpymem(p, ctx->name.data, ctx->name.len);
-
-    /*
-     * ctx->stream holds initial part of stream file path
-     * however the space for the whole stream path
-     * is allocated
-     */
-
-    ctx->stream.len = p - ctx->playlist.data + 1;
-    ctx->stream.data = ngx_palloc(s->connection->pool,
-                                  ctx->stream.len + NGX_INT32_LEN +
-                                  sizeof(".m4x"));
-
-    ngx_memcpy(ctx->stream.data, ctx->playlist.data, ctx->stream.len - 1);
-    ctx->stream.data[ctx->stream.len - 1] = (dacf->nested ? '/' : '-');
-
-    if (dacf->nested) {
-        p = ngx_cpymem(p, "/index.mpd", sizeof("/index.mpd") - 1);
-    } else {
-        p = ngx_cpymem(p, ".mpd", sizeof(".mpd") - 1);
-    }
-
-    ctx->playlist.len = p - ctx->playlist.data;
-
-    *p = 0;
-
-    /* playlist bak (new playlist) path */
-
-    ctx->playlist_bak.data = ngx_palloc(s->connection->pool,
-                                        ctx->playlist.len + sizeof(".bak"));
-    p = ngx_cpymem(ctx->playlist_bak.data, ctx->playlist.data,
-                   ctx->playlist.len);
-    p = ngx_cpymem(p, ".bak", sizeof(".bak") - 1);
-
-    ctx->playlist_bak.len = p - ctx->playlist_bak.data;
-
-    *p = 0;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "dash: playlist='%V' playlist_bak='%V' stream_pattern='%V'",
-                   &ctx->playlist, &ctx->playlist_bak, &ctx->stream);
-
-    ctx->start_time = ngx_time();
-
-    if (ngx_rtmp_dash_ensure_directory(s) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
-{
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_dash_app_conf_t  *dacf;
-
-    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-
-    if (dacf == NULL || !dacf->dash || ctx == NULL) {
-        goto next;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "dash: delete stream");
-
-    ngx_rtmp_dash_close_fragments(s);
-
-next:
-    return next_close_stream(s, v);
-}
-
-
-static void
-ngx_rtmp_dash_update_fragments(ngx_rtmp_session_t *s, ngx_int_t boundary,
-    uint32_t timestamp)
-{
-    int32_t                    d;
-    ngx_int_t                  hit;
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_dash_frag_t      *f;
-    ngx_rtmp_dash_app_conf_t  *dacf;
-
-    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-    f = ngx_rtmp_dash_get_frag(s, ctx->nfrags);
-
-    d = (int32_t) (timestamp - f->timestamp);
-
-    if (d >= 0) {
-
-        f->duration = timestamp - f->timestamp;
-        hit = (f->duration >= dacf->fraglen);
-
-        /* keep fragment lengths within 2x factor for dash.js  */
-        if (f->duration >= dacf->fraglen * 2) {
-            boundary = 1;
-        }
-
-    } else {
-
-        /* sometimes clients generate slightly unordered frames */
-
-        hit = (-d > 1000);
-    }
-
-    if (ctx->has_video && !hit) {
-        boundary = 0;
-    }
-
-    if (!ctx->has_video && ctx->has_audio) {
-        boundary = hit;
-    }
-
-    if (ctx->audio.mdat_size >= NGX_RTMP_DASH_MAX_MDAT) {
-        boundary = 1;
-    }
-
-    if (ctx->video.mdat_size >= NGX_RTMP_DASH_MAX_MDAT) {
-        boundary = 1;
-    }
-
-    if (!ctx->opened) {
-        boundary = 1;
-    }
-
-    if (boundary) {
-        ngx_rtmp_dash_close_fragments(s);
-        ngx_rtmp_dash_open_fragments(s);
-
-        f = ngx_rtmp_dash_get_frag(s, ctx->nfrags);
-        f->timestamp = timestamp;
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_append(ngx_rtmp_session_t *s, ngx_chain_t *in,
-    ngx_rtmp_dash_track_t *t, ngx_int_t key, uint32_t timestamp, uint32_t delay)
-{
-    u_char                 *p;
-    size_t                  size, bsize;
-    ngx_rtmp_mp4_sample_t  *smpl;
-
-    static u_char           buffer[NGX_RTMP_DASH_BUFSIZE];
-
-    p = buffer;
-    size = 0;
-
-    for (; in && size < sizeof(buffer); in = in->next) {
-
-        bsize = (size_t) (in->buf->last - in->buf->pos);
-        if (size + bsize > sizeof(buffer)) {
-            bsize = (size_t) (sizeof(buffer) - size);
-        }
-
-        p = ngx_cpymem(p, in->buf->pos, bsize);
-        size += bsize;
-    }
-
-    ngx_rtmp_dash_update_fragments(s, key, timestamp);
-
-    if (t->sample_count == 0) {
-        t->earliest_pres_time = timestamp;
-    }
-
-    t->latest_pres_time = timestamp;
-
-    if (t->sample_count < NGX_RTMP_DASH_MAX_SAMPLES) {
-
-        if (ngx_write_fd(t->fd, buffer, size) == NGX_ERROR) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                          "dash: " ngx_write_fd_n " failed");
-            return NGX_ERROR;
-        }
-
-        smpl = &t->samples[t->sample_count];
-
-        smpl->delay = delay;
-        smpl->size = (uint32_t) size;
-        smpl->duration = 0;
-        smpl->timestamp = timestamp;
-        smpl->key = (key ? 1 : 0);
-
-        if (t->sample_count > 0) {
-            smpl = &t->samples[t->sample_count - 1];
-            smpl->duration = timestamp - smpl->timestamp;
-        }
-
-        t->sample_count++;
-        t->mdat_size += (ngx_uint_t) size;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_audio(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-    ngx_chain_t *in)
-{
-    u_char                     htype;
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_codec_ctx_t      *codec_ctx;
-    ngx_rtmp_dash_app_conf_t  *dacf;
-
-    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (dacf == NULL || !dacf->dash || ctx == NULL ||
-        codec_ctx == NULL || h->mlen < 2)
-    {
-        return NGX_OK;
-    }
-
-    /* Only AAC is supported */
-
-    if (codec_ctx->audio_codec_id != NGX_RTMP_AUDIO_AAC ||
-        codec_ctx->aac_header == NULL)
-    {
-        return NGX_OK;
-    }
-
-    if (in->buf->last - in->buf->pos < 2) {
-        return NGX_ERROR;
-    }
-
-    /* skip AAC config */
-
-    htype = in->buf->pos[1];
-    if (htype != 1) {
-        return NGX_OK;
-    }
-
-    ctx->has_audio = 1;
-
-    /* skip RTMP & AAC headers */
-
-    in->buf->pos += 2;
-
-    return ngx_rtmp_dash_append(s, in, &ctx->audio, 0, h->timestamp, 0);
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_video(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-    ngx_chain_t *in)
-{
-    u_char                    *p;
-    uint8_t                    ftype, htype;
-    uint32_t                   delay;
-    ngx_rtmp_dash_ctx_t       *ctx;
-    ngx_rtmp_codec_ctx_t      *codec_ctx;
-    ngx_rtmp_dash_app_conf_t  *dacf;
-
-    dacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_dash_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_dash_module);
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (dacf == NULL || !dacf->dash || ctx == NULL || codec_ctx == NULL ||
-        codec_ctx->avc_header == NULL || h->mlen < 5)
-    {
-        return NGX_OK;
-    }
-
-    /* Only H264 is supported */
-
-    if (codec_ctx->video_codec_id != NGX_RTMP_VIDEO_H264) {
-        return NGX_OK;
-    }
-
-    if (in->buf->last - in->buf->pos < 5) {
-        return NGX_ERROR;
-    }
-
-    ftype = (in->buf->pos[0] & 0xf0) >> 4;
-
-    /* skip AVC config */
-
-    htype = in->buf->pos[1];
-    if (htype != 1) {
-        return NGX_OK;
-    }
-
-    p = (u_char *) &delay;
-
-    p[0] = in->buf->pos[4];
-    p[1] = in->buf->pos[3];
-    p[2] = in->buf->pos[2];
-    p[3] = 0;
-
-    ctx->has_video = 1;
-
-    /* skip RTMP & H264 headers */
-
-    in->buf->pos += 5;
-
-    return ngx_rtmp_dash_append(s, in, &ctx->video, ftype == 1, h->timestamp,
-                                delay);
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
-{
-    return next_stream_begin(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_eof_t *v)
-{
-    ngx_rtmp_dash_close_fragments(s);
-
-    return next_stream_eof(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_cleanup_dir(ngx_str_t *ppath, ngx_msec_t playlen)
-{
-    time_t           mtime, max_age;
-    u_char          *p;
-    u_char           path[NGX_MAX_PATH + 1], mpd_path[NGX_MAX_PATH + 1];
-    ngx_dir_t        dir;
-    ngx_err_t        err;
-    ngx_str_t        name, spath, mpd;
-    ngx_int_t        nentries, nerased;
-    ngx_file_info_t  fi;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                   "dash: cleanup path='%V' playlen=%M", ppath, playlen);
-
-    if (ngx_open_dir(ppath, &dir) != NGX_OK) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, ngx_errno,
-                       "dash: cleanup open dir failed '%V'", ppath);
-        return NGX_ERROR;
-    }
-
-    nentries = 0;
-    nerased = 0;
-
-    for ( ;; ) {
-        ngx_set_errno(0);
-
-        if (ngx_read_dir(&dir) == NGX_ERROR) {
-            err = ngx_errno;
-
-            if (ngx_close_dir(&dir) == NGX_ERROR) {
-                ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, ngx_errno,
-                              "dash: cleanup " ngx_close_dir_n " \"%V\" failed",
-                              ppath);
-            }
-
-            if (err == NGX_ENOMOREFILES) {
-                return nentries - nerased;
-            }
-
-            ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, err,
-                          "dash: cleanup " ngx_read_dir_n
-                          " '%V' failed", ppath);
-            return NGX_ERROR;
-        }
-
-        name.data = ngx_de_name(&dir);
-        if (name.data[0] == '.') {
-            continue;
-        }
-
-        name.len = ngx_de_namelen(&dir);
-
-        p = ngx_snprintf(path, sizeof(path) - 1, "%V/%V", ppath, &name);
-        *p = 0;
-
-        spath.data = path;
-        spath.len = p - path;
-
-        nentries++;
-
-        if (!dir.valid_info && ngx_de_info(path, &dir) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, ngx_errno,
-                          "dash: cleanup " ngx_de_info_n " \"%V\" failed",
-                          &spath);
-
-            continue;
-        }
-
-        if (ngx_de_is_dir(&dir)) {
-
-            if (ngx_rtmp_dash_cleanup_dir(&spath, playlen) == 0) {
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                               "dash: cleanup dir '%V'", &name);
-
-                /*
-                 * null-termination gets spoiled in win32
-                 * version of ngx_open_dir
-                 */
-
-                *p = 0;
-
-                if (ngx_delete_dir(path) == NGX_FILE_ERROR) {
-                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                                  "dash: cleanup " ngx_delete_dir_n
-                                  " failed on '%V'", &spath);
-                } else {
-                    nerased++;
-                }
-            }
-
-            continue;
-        }
-
-        if (!ngx_de_is_file(&dir)) {
-            continue;
-        }
-
-        if (name.len >= 8 && name.data[name.len - 8] == 'i' &&
-                             name.data[name.len - 7] == 'n' &&
-                             name.data[name.len - 6] == 'i' &&
-                             name.data[name.len - 5] == 't' &&
-                             name.data[name.len - 4] == '.' &&
-                             name.data[name.len - 3] == 'm' &&
-                             name.data[name.len - 2] == '4')
-        {
-            if (name.len == 8) {
-                ngx_str_set(&mpd, "index");
-            } else {
-                mpd.data = name.data;
-                mpd.len = name.len - 9;
-            }
-
-            p = ngx_snprintf(mpd_path, sizeof(mpd_path) - 1, "%V/%V.mpd",
-                             ppath, &mpd);
-            *p = 0;
-
-            if (ngx_file_info(mpd_path, &fi) != NGX_FILE_ERROR) {
-                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                               "dash: cleanup '%V' delayed, mpd exists '%s'",
-                               &name, mpd_path);
-                continue;
-            }
-
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                           "dash: cleanup '%V' allowed, mpd missing '%s'",
-                           &name, mpd_path);
-
-            max_age = 0;
-
-        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
-                                    name.data[name.len - 3] == 'm' &&
-                                    name.data[name.len - 2] == '4' &&
-                                    name.data[name.len - 1] == 'v')
-        {
-            max_age = playlen / 500;
-
-        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
-                                    name.data[name.len - 3] == 'm' &&
-                                    name.data[name.len - 2] == '4' &&
-                                    name.data[name.len - 1] == 'a')
-        {
-            max_age = playlen / 500;
-
-        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
-                                    name.data[name.len - 3] == 'm' &&
-                                    name.data[name.len - 2] == 'p' &&
-                                    name.data[name.len - 1] == 'd')
-        {
-            max_age = playlen / 500;
-
-        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
-                                    name.data[name.len - 3] == 'r' &&
-                                    name.data[name.len - 2] == 'a' &&
-                                    name.data[name.len - 1] == 'w')
-        {
-            max_age = playlen / 1000;
-
-        } else {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                           "dash: cleanup skip unknown file type '%V'", &name);
-            continue;
-        }
-
-        mtime = ngx_de_mtime(&dir);
-        if (mtime + max_age > ngx_cached_time->sec) {
-            continue;
-        }
-
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                       "dash: cleanup '%V' mtime=%T age=%T",
-                       &name, mtime, ngx_cached_time->sec - mtime);
-
-        if (ngx_delete_file(path) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "dash: cleanup " ngx_delete_file_n " failed on '%V'",
-                          &spath);
-            continue;
-        }
-
-        nerased++;
-    }
-}
-
-
-#if (nginx_version >= 1011005)
-static ngx_msec_t
-#else
-static time_t
-#endif
-ngx_rtmp_dash_cleanup(void *data)
-{
-    ngx_rtmp_dash_cleanup_t *cleanup = data;
-
-    ngx_rtmp_dash_cleanup_dir(&cleanup->path, cleanup->playlen);
-
-#if (nginx_version >= 1011005)
-    return cleanup->playlen * 2;
-#else
-    return cleanup->playlen / 500;
-#endif
-}
-
-
-static void *
-ngx_rtmp_dash_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_dash_app_conf_t *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_dash_app_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    conf->dash = NGX_CONF_UNSET;
-    conf->fraglen = NGX_CONF_UNSET_MSEC;
-    conf->playlen = NGX_CONF_UNSET_MSEC;
-    conf->cleanup = NGX_CONF_UNSET;
-    conf->nested = NGX_CONF_UNSET;
-
-    return conf;
-}
-
-
-static char *
-ngx_rtmp_dash_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_dash_app_conf_t    *prev = parent;
-    ngx_rtmp_dash_app_conf_t    *conf = child;
-    ngx_rtmp_dash_cleanup_t     *cleanup;
-
-    ngx_conf_merge_value(conf->dash, prev->dash, 0);
-    ngx_conf_merge_msec_value(conf->fraglen, prev->fraglen, 5000);
-    ngx_conf_merge_msec_value(conf->playlen, prev->playlen, 30000);
-    ngx_conf_merge_value(conf->cleanup, prev->cleanup, 1);
-    ngx_conf_merge_value(conf->nested, prev->nested, 0);
-
-    if (conf->fraglen) {
-        conf->winfrags = conf->playlen / conf->fraglen;
-    }
-
-    /* schedule cleanup */
-
-    if (conf->dash && conf->path.len && conf->cleanup) {
-        if (conf->path.data[conf->path.len - 1] == '/') {
-            conf->path.len--;
-        }
-
-        cleanup = ngx_pcalloc(cf->pool, sizeof(*cleanup));
-        if (cleanup == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        cleanup->path = conf->path;
-        cleanup->playlen = conf->playlen;
-
-        conf->slot = ngx_pcalloc(cf->pool, sizeof(*conf->slot));
-        if (conf->slot == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        conf->slot->manager = ngx_rtmp_dash_cleanup;
-        conf->slot->name = conf->path;
-        conf->slot->data = cleanup;
-        conf->slot->conf_file = cf->conf_file->file.name.data;
-        conf->slot->line = cf->conf_file->line;
-
-        if (ngx_add_path(cf, &conf->slot) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    ngx_conf_merge_str_value(conf->path, prev->path, "");
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_dash_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_handler_pt        *h;
-    ngx_rtmp_core_main_conf_t  *cmcf;
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
-    *h = ngx_rtmp_dash_video;
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
-    *h = ngx_rtmp_dash_audio;
-
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_dash_publish;
-
-    next_close_stream = ngx_rtmp_close_stream;
-    ngx_rtmp_close_stream = ngx_rtmp_dash_close_stream;
-
-    next_stream_begin = ngx_rtmp_stream_begin;
-    ngx_rtmp_stream_begin = ngx_rtmp_dash_stream_begin;
-
-    next_stream_eof = ngx_rtmp_stream_eof;
-    ngx_rtmp_stream_eof = ngx_rtmp_dash_stream_eof;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/dash/ngx_rtmp_mp4.c b/debian/modules/rtmp/dash/ngx_rtmp_mp4.c
deleted file mode 100644
index dd680c9..0000000
--- a/debian/modules/rtmp/dash/ngx_rtmp_mp4.c
+++ /dev/null
@@ -1,1167 +0,0 @@
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_mp4.h"
-#include <ngx_rtmp_codec_module.h>
-
-
-static ngx_int_t
-ngx_rtmp_mp4_field_32(ngx_buf_t *b, uint32_t n)
-{
-    u_char  bytes[4];
-
-    bytes[0] = ((uint32_t) n >> 24) & 0xFF;
-    bytes[1] = ((uint32_t) n >> 16) & 0xFF;
-    bytes[2] = ((uint32_t) n >> 8) & 0xFF;
-    bytes[3] = (uint32_t) n & 0xFF;
-
-    if (b->last + sizeof(bytes) > b->end) {
-        return NGX_ERROR;
-    }
-
-    b->last = ngx_cpymem(b->last, bytes, sizeof(bytes));
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_field_24(ngx_buf_t *b, uint32_t n)
-{
-    u_char  bytes[3];
-
-    bytes[0] = ((uint32_t) n >> 16) & 0xFF;
-    bytes[1] = ((uint32_t) n >> 8) & 0xFF;
-    bytes[2] = (uint32_t) n & 0xFF;
-
-    if (b->last + sizeof(bytes) > b->end) {
-        return NGX_ERROR;
-    }
-
-    b->last = ngx_cpymem(b->last, bytes, sizeof(bytes));
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_field_16(ngx_buf_t *b, uint16_t n)
-{
-    u_char  bytes[2];
-
-    bytes[0] = ((uint32_t) n >> 8) & 0xFF;
-    bytes[1] = (uint32_t) n & 0xFF;
-
-    if (b->last + sizeof(bytes) > b->end) {
-        return NGX_ERROR;
-    }
-
-    b->last = ngx_cpymem(b->last, bytes, sizeof(bytes));
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_field_8(ngx_buf_t *b, uint8_t n)
-{
-    u_char  bytes[1];
-
-    bytes[0] = n & 0xFF;
-
-    if (b->last + sizeof(bytes) > b->end) {
-        return NGX_ERROR;
-    }
-
-    b->last = ngx_cpymem(b->last, bytes, sizeof(bytes));
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_put_descr(ngx_buf_t *b, int tag, size_t size)
-{
-    ngx_rtmp_mp4_field_8(b, (uint8_t) tag);
-    ngx_rtmp_mp4_field_8(b, size & 0x7F);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_data(ngx_buf_t *b, void *data, size_t n)
-{
-    if (b->last + n > b->end) {
-        return NGX_ERROR;
-    }
-
-    b->last = ngx_cpymem(b->last, (u_char *) data, n);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_box(ngx_buf_t *b, const char box[4])
-{
-    if (b->last + 4 > b->end) {
-        return NGX_ERROR;
-    }
-
-    b->last = ngx_cpymem(b->last, (u_char *) box, 4);
-
-    return NGX_OK;
-}
-
-
-static u_char *
-ngx_rtmp_mp4_start_box(ngx_buf_t *b, const char box[4])
-{
-    u_char  *p;
-
-    p = b->last;
-
-    if (ngx_rtmp_mp4_field_32(b, 0) != NGX_OK) {
-        return NULL;
-    }
-
-    if (ngx_rtmp_mp4_box(b, box) != NGX_OK) {
-        return NULL;
-    }
-
-    return p;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_update_box_size(ngx_buf_t *b, u_char *p)
-{
-    u_char  *curpos;
-
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    curpos = b->last;
-
-    b->last = p;
-
-    ngx_rtmp_mp4_field_32(b, (uint32_t) (curpos - p));
-
-    b->last = curpos;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_matrix(ngx_buf_t *buf, uint32_t a, uint32_t b, uint32_t c,
-    uint32_t d, uint32_t tx, uint32_t ty)
-{
-
-/*
- * transformation matrix
- * |a  b  u|
- * |c  d  v|
- * |tx ty w|
- */
-
-    ngx_rtmp_mp4_field_32(buf, a << 16);  /* 16.16 format */
-    ngx_rtmp_mp4_field_32(buf, b << 16);  /* 16.16 format */
-    ngx_rtmp_mp4_field_32(buf, 0);        /* u in 2.30 format */
-    ngx_rtmp_mp4_field_32(buf, c << 16);  /* 16.16 format */
-    ngx_rtmp_mp4_field_32(buf, d << 16);  /* 16.16 format */
-    ngx_rtmp_mp4_field_32(buf, 0);        /* v in 2.30 format */
-    ngx_rtmp_mp4_field_32(buf, tx << 16); /* 16.16 format */
-    ngx_rtmp_mp4_field_32(buf, ty << 16); /* 16.16 format */
-    ngx_rtmp_mp4_field_32(buf, 1 << 30);  /* w in 2.30 format */
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_mp4_write_ftyp(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "ftyp");
-
-    /* major brand */
-    ngx_rtmp_mp4_box(b, "iso6");
-
-    /* minor version */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    /* compatible brands */
-    ngx_rtmp_mp4_box(b, "isom");
-    ngx_rtmp_mp4_box(b, "iso6");
-    ngx_rtmp_mp4_box(b, "dash");
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_mp4_write_styp(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "styp");
-
-    /* major brand */
-    ngx_rtmp_mp4_box(b, "iso6");
-
-    /* minor version */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    /* compatible brands */
-    ngx_rtmp_mp4_box(b, "isom");
-    ngx_rtmp_mp4_box(b, "iso6");
-    ngx_rtmp_mp4_box(b, "dash");
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_mvhd(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "mvhd");
-
-    /* version */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* creation time */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* modification time */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* timescale */
-    ngx_rtmp_mp4_field_32(b, 1000);
-
-    /* duration */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0x00010000);
-    ngx_rtmp_mp4_field_16(b, 0x0100);
-    ngx_rtmp_mp4_field_16(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    ngx_rtmp_mp4_write_matrix(b, 1, 0, 0, 1, 0, 0);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* next track id */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_tkhd(ngx_rtmp_session_t *s, ngx_buf_t *b,
-    ngx_rtmp_mp4_track_type_t ttype)
-{
-    u_char                *pos;
-    ngx_rtmp_codec_ctx_t  *codec_ctx;
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    pos = ngx_rtmp_mp4_start_box(b, "tkhd");
-
-    /* version */
-    ngx_rtmp_mp4_field_8(b, 0);
-
-    /* flags: TrackEnabled */
-    ngx_rtmp_mp4_field_24(b, 0x0000000f);
-
-    /* creation time */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* modification time */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* track id */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* duration */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_16(b, ttype == NGX_RTMP_MP4_VIDEO_TRACK ?  0 : 0x0100);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_16(b, 0);
-
-    ngx_rtmp_mp4_write_matrix(b, 1, 0, 0, 1, 0, 0);
-
-    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
-        ngx_rtmp_mp4_field_32(b, (uint32_t) codec_ctx->width << 16);
-        ngx_rtmp_mp4_field_32(b, (uint32_t) codec_ctx->height << 16);
-    } else {
-        ngx_rtmp_mp4_field_32(b, 0);
-        ngx_rtmp_mp4_field_32(b, 0);
-    }
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_mdhd(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "mdhd");
-
-    /* version */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* creation time */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* modification time */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* time scale*/
-    ngx_rtmp_mp4_field_32(b, 1000);
-
-    /* duration */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* lanuguage */
-    ngx_rtmp_mp4_field_16(b, 0x15C7);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_16(b, 0);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_hdlr(ngx_buf_t *b, ngx_rtmp_mp4_track_type_t ttype)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "hdlr");
-
-    /* version and flags */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* pre defined */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
-        ngx_rtmp_mp4_box(b, "vide");
-    } else {
-        ngx_rtmp_mp4_box(b, "soun");
-    }
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
-        /* video handler string, NULL-terminated */
-        ngx_rtmp_mp4_data(b, "VideoHandler", sizeof("VideoHandler"));
-    } else {
-        /* sound handler string, NULL-terminated */
-        ngx_rtmp_mp4_data(b, "SoundHandler", sizeof("SoundHandler"));
-    }
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_vmhd(ngx_buf_t *b)
-{
-    /* size is always 20, apparently */
-    ngx_rtmp_mp4_field_32(b, 20);
-
-    ngx_rtmp_mp4_box(b, "vmhd");
-
-    /* version and flags */
-    ngx_rtmp_mp4_field_32(b, 0x01);
-
-    /* reserved (graphics mode=copy) */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_smhd(ngx_buf_t *b)
-{
-    /* size is always 16, apparently */
-    ngx_rtmp_mp4_field_32(b, 16);
-
-    ngx_rtmp_mp4_box(b, "smhd");
-
-    /* version and flags */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* reserved (balance normally=0) */
-    ngx_rtmp_mp4_field_16(b, 0);
-    ngx_rtmp_mp4_field_16(b, 0);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_dref(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "dref");
-
-    /* version and flags */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* entry count */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    /* url size */
-    ngx_rtmp_mp4_field_32(b, 0xc);
-
-    ngx_rtmp_mp4_box(b, "url ");
-
-    /* version and flags */
-    ngx_rtmp_mp4_field_32(b, 0x00000001);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_dinf(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "dinf");
-
-    ngx_rtmp_mp4_write_dref(b);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_avcc(ngx_rtmp_session_t *s, ngx_buf_t *b)
-{
-    u_char                *pos, *p;
-    ngx_chain_t           *in;
-    ngx_rtmp_codec_ctx_t  *codec_ctx;
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (codec_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    in = codec_ctx->avc_header;
-    if (in == NULL) {
-        return NGX_ERROR;
-    }
-
-    pos = ngx_rtmp_mp4_start_box(b, "avcC");
-
-    /* assume config fits one chunk (highly probable) */
-
-    /*
-     * Skip:
-     * - flv fmt
-     * - H264 CONF/PICT (0x00)
-     * - 0
-     * - 0
-     * - 0
-     */
-
-    p = in->buf->pos + 5;
-
-    if (p < in->buf->last) {
-        ngx_rtmp_mp4_data(b, p, (size_t) (in->buf->last - p));
-    } else {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "dash: invalid avcc received");
-    }
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_video(ngx_rtmp_session_t *s, ngx_buf_t *b)
-{
-    u_char                *pos;
-    ngx_rtmp_codec_ctx_t  *codec_ctx;
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    pos = ngx_rtmp_mp4_start_box(b, "avc1");
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_16(b, 0);
-
-    /* data reference index */
-    ngx_rtmp_mp4_field_16(b, 1);
-
-    /* codec stream version & revision */
-    ngx_rtmp_mp4_field_16(b, 0);
-    ngx_rtmp_mp4_field_16(b, 0);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* width & height */
-    ngx_rtmp_mp4_field_16(b, (uint16_t) codec_ctx->width);
-    ngx_rtmp_mp4_field_16(b, (uint16_t) codec_ctx->height);
-
-    /* horizontal & vertical resolutions 72 dpi */
-    ngx_rtmp_mp4_field_32(b, 0x00480000);
-    ngx_rtmp_mp4_field_32(b, 0x00480000);
-
-    /* data size */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* frame count */
-    ngx_rtmp_mp4_field_16(b, 1);
-
-    /* compressor name */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_16(b, 0x18);
-    ngx_rtmp_mp4_field_16(b, 0xffff);
-
-    ngx_rtmp_mp4_write_avcc(s, b);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_esds(ngx_rtmp_session_t *s, ngx_buf_t *b)
-{
-    size_t                 dsi_len;
-    u_char                *pos, *dsi;
-    ngx_buf_t             *db;
-    ngx_rtmp_codec_ctx_t  *codec_ctx;
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (codec_ctx == NULL || codec_ctx->aac_header == NULL) {
-        return NGX_ERROR;
-    }
-
-    db = codec_ctx->aac_header->buf;
-    if (db == NULL) {
-        return NGX_ERROR;
-    }
-
-    dsi = db->pos + 2;
-    if (dsi > db->last) {
-        return NGX_ERROR;
-    }
-
-    dsi_len = db->last - dsi;
-
-    pos = ngx_rtmp_mp4_start_box(b, "esds");
-
-    /* version */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-
-    /* ES Descriptor */
-
-    ngx_rtmp_mp4_put_descr(b, 0x03, 23 + dsi_len);
-
-    /* ES_ID */
-    ngx_rtmp_mp4_field_16(b, 1);
-
-    /* flags */
-    ngx_rtmp_mp4_field_8(b, 0);
-
-
-    /* DecoderConfig Descriptor */
-
-    ngx_rtmp_mp4_put_descr(b, 0x04, 15 + dsi_len);
-
-    /* objectTypeIndication: Audio ISO/IEC 14496-3 (AAC) */
-    ngx_rtmp_mp4_field_8(b, 0x40);
-
-    /* streamType: AudioStream */
-    ngx_rtmp_mp4_field_8(b, 0x15);
-
-    /* bufferSizeDB */
-    ngx_rtmp_mp4_field_24(b, 0);
-
-    /* maxBitrate */
-    ngx_rtmp_mp4_field_32(b, 0x0001F151);
-
-    /* avgBitrate */
-    ngx_rtmp_mp4_field_32(b, 0x0001F14D);
-
-
-    /* DecoderSpecificInfo Descriptor */
-
-    ngx_rtmp_mp4_put_descr(b, 0x05, dsi_len);
-    ngx_rtmp_mp4_data(b, dsi, dsi_len);
-
-
-    /* SL Descriptor */
-
-    ngx_rtmp_mp4_put_descr(b, 0x06, 1);
-    ngx_rtmp_mp4_field_8(b, 0x02);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_audio(ngx_rtmp_session_t *s, ngx_buf_t *b)
-{
-    u_char                *pos;
-    ngx_rtmp_codec_ctx_t  *codec_ctx;
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    pos = ngx_rtmp_mp4_start_box(b, "mp4a");
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_16(b, 0);
-
-    /* data reference index */
-    ngx_rtmp_mp4_field_16(b, 1);
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* channel count */
-    ngx_rtmp_mp4_field_16(b, (uint16_t) codec_ctx->audio_channels);
-
-    /* sample size */
-    ngx_rtmp_mp4_field_16(b, (uint16_t) (codec_ctx->sample_size * 8));
-
-    /* reserved */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* time scale */
-    ngx_rtmp_mp4_field_16(b, 1000);
-
-    /* sample rate */
-    ngx_rtmp_mp4_field_16(b, (uint16_t) codec_ctx->sample_rate);
-
-    ngx_rtmp_mp4_write_esds(s, b);
-#if 0
-    /* tag size*/
-    ngx_rtmp_mp4_field_32(b, 8);
-
-    /* null tag */
-    ngx_rtmp_mp4_field_32(b, 0);
-#endif
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_stsd(ngx_rtmp_session_t *s, ngx_buf_t *b,
-    ngx_rtmp_mp4_track_type_t ttype)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "stsd");
-
-    /* version & flags */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* entry count */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
-        ngx_rtmp_mp4_write_video(s, b);
-    } else {
-        ngx_rtmp_mp4_write_audio(s, b);
-    }
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_stts(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "stts");
-
-    ngx_rtmp_mp4_field_32(b, 0); /* version */
-    ngx_rtmp_mp4_field_32(b, 0); /* entry count */
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_stsc(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "stsc");
-
-    ngx_rtmp_mp4_field_32(b, 0); /* version */
-    ngx_rtmp_mp4_field_32(b, 0); /* entry count */
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_stsz(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "stsz");
-
-    ngx_rtmp_mp4_field_32(b, 0); /* version */
-    ngx_rtmp_mp4_field_32(b, 0); /* entry count */
-    ngx_rtmp_mp4_field_32(b, 0); /* moar zeros */
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_stco(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "stco");
-
-    ngx_rtmp_mp4_field_32(b, 0); /* version */
-    ngx_rtmp_mp4_field_32(b, 0); /* entry count */
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_stbl(ngx_rtmp_session_t *s, ngx_buf_t *b,
-    ngx_rtmp_mp4_track_type_t ttype)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "stbl");
-
-    ngx_rtmp_mp4_write_stsd(s, b, ttype);
-    ngx_rtmp_mp4_write_stts(b);
-    ngx_rtmp_mp4_write_stsc(b);
-    ngx_rtmp_mp4_write_stsz(b);
-    ngx_rtmp_mp4_write_stco(b);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_minf(ngx_rtmp_session_t *s, ngx_buf_t *b,
-    ngx_rtmp_mp4_track_type_t ttype)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "minf");
-
-    if (ttype == NGX_RTMP_MP4_VIDEO_TRACK) {
-        ngx_rtmp_mp4_write_vmhd(b);
-    } else {
-        ngx_rtmp_mp4_write_smhd(b);
-    }
-
-    ngx_rtmp_mp4_write_dinf(b);
-    ngx_rtmp_mp4_write_stbl(s, b, ttype);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_mdia(ngx_rtmp_session_t *s, ngx_buf_t *b,
-    ngx_rtmp_mp4_track_type_t ttype)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "mdia");
-
-    ngx_rtmp_mp4_write_mdhd(b);
-    ngx_rtmp_mp4_write_hdlr(b, ttype);
-    ngx_rtmp_mp4_write_minf(s, b, ttype);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-static ngx_int_t
-ngx_rtmp_mp4_write_trak(ngx_rtmp_session_t *s, ngx_buf_t *b,
-    ngx_rtmp_mp4_track_type_t ttype)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "trak");
-
-    ngx_rtmp_mp4_write_tkhd(s, b, ttype);
-    ngx_rtmp_mp4_write_mdia(s, b, ttype);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_mvex(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "mvex");
-
-    ngx_rtmp_mp4_field_32(b, 0x20);
-
-    ngx_rtmp_mp4_box(b, "trex");
-
-    /* version & flags */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* track id */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    /* default sample description index */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    /* default sample duration */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* default sample size, 1024 for AAC */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* default sample flags, key on */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_mp4_write_moov(ngx_rtmp_session_t *s, ngx_buf_t *b,
-    ngx_rtmp_mp4_track_type_t ttype)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "moov");
-
-    ngx_rtmp_mp4_write_mvhd(b);
-    ngx_rtmp_mp4_write_mvex(b);
-    ngx_rtmp_mp4_write_trak(s, b, ttype);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_tfhd(ngx_buf_t *b)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "tfhd");
-
-    /* version & flags */
-    ngx_rtmp_mp4_field_32(b, 0x00020000);
-
-    /* track id */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_tfdt(ngx_buf_t *b, uint32_t earliest_pres_time)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "tfdt");
-
-    /* version == 1 aka 64 bit integer */
-    ngx_rtmp_mp4_field_32(b, 0x00000000);
-    ngx_rtmp_mp4_field_32(b, earliest_pres_time);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_trun(ngx_buf_t *b, uint32_t sample_count,
-    ngx_rtmp_mp4_sample_t *samples, ngx_uint_t sample_mask, u_char *moof_pos)
-{
-    u_char    *pos;
-    uint32_t   i, offset, nitems, flags;
-
-    pos = ngx_rtmp_mp4_start_box(b, "trun");
-
-    nitems = 0;
-
-    /* data offset present */
-    flags = 0x01;
-
-    if (sample_mask & NGX_RTMP_MP4_SAMPLE_DURATION) {
-        nitems++;
-        flags |= 0x000100;
-    }
-
-    if (sample_mask & NGX_RTMP_MP4_SAMPLE_SIZE) {
-        nitems++;
-        flags |= 0x000200;
-    }
-
-    if (sample_mask & NGX_RTMP_MP4_SAMPLE_KEY) {
-        nitems++;
-        flags |= 0x000400;
-    }
-
-    if (sample_mask & NGX_RTMP_MP4_SAMPLE_DELAY) {
-        nitems++;
-        flags |= 0x000800;
-    }
-
-    offset = (pos - moof_pos) + 20 + (sample_count * nitems * 4) + 8;
-
-    ngx_rtmp_mp4_field_32(b, flags);
-    ngx_rtmp_mp4_field_32(b, sample_count);
-    ngx_rtmp_mp4_field_32(b, offset);
-
-    for (i = 0; i < sample_count; i++, samples++) {
-
-        if (sample_mask & NGX_RTMP_MP4_SAMPLE_DURATION) {
-            ngx_rtmp_mp4_field_32(b, samples->duration);
-        }
-
-        if (sample_mask & NGX_RTMP_MP4_SAMPLE_SIZE) {
-            ngx_rtmp_mp4_field_32(b, samples->size);
-        }
-
-        if (sample_mask & NGX_RTMP_MP4_SAMPLE_KEY) {
-            ngx_rtmp_mp4_field_32(b, samples->key ? 0x00000000 : 0x00010000);
-        }
-
-        if (sample_mask & NGX_RTMP_MP4_SAMPLE_DELAY) {
-            ngx_rtmp_mp4_field_32(b, samples->delay);
-        }
-    }
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_traf(ngx_buf_t *b, uint32_t earliest_pres_time,
-    uint32_t sample_count, ngx_rtmp_mp4_sample_t *samples,
-    ngx_uint_t sample_mask, u_char *moof_pos)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "traf");
-
-    ngx_rtmp_mp4_write_tfhd(b);
-    ngx_rtmp_mp4_write_tfdt(b, earliest_pres_time);
-    ngx_rtmp_mp4_write_trun(b, sample_count, samples, sample_mask, moof_pos);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_write_mfhd(ngx_buf_t *b, uint32_t index)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "mfhd");
-
-    /* don't know what this is */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* fragment index. */
-    ngx_rtmp_mp4_field_32(b, index);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_mp4_write_sidx(ngx_buf_t *b, ngx_uint_t reference_size,
-    uint32_t earliest_pres_time, uint32_t latest_pres_time)
-{
-    u_char    *pos;
-    uint32_t   duration;
-
-    duration = latest_pres_time - earliest_pres_time;
-
-    pos = ngx_rtmp_mp4_start_box(b, "sidx");
-
-    /* version */
-    ngx_rtmp_mp4_field_32(b, 0);
-
-    /* reference id */
-    ngx_rtmp_mp4_field_32(b, 1);
-
-    /* timescale */
-    ngx_rtmp_mp4_field_32(b, 1000);
-
-    /* earliest presentation time */
-    ngx_rtmp_mp4_field_32(b, earliest_pres_time);
-
-    /* first offset */
-    ngx_rtmp_mp4_field_32(b, duration); /*TODO*/
-
-    /* reserved */
-    ngx_rtmp_mp4_field_16(b, 0);
-
-    /* reference count = 1 */
-    ngx_rtmp_mp4_field_16(b, 1);
-
-    /* 1st bit is reference type, the rest is reference size */
-    ngx_rtmp_mp4_field_32(b, reference_size);
-
-    /* subsegment duration */
-    ngx_rtmp_mp4_field_32(b, duration);
-
-    /* first bit is startsWithSAP (=1), next 3 bits are SAP type (=001) */
-    ngx_rtmp_mp4_field_8(b, 0x90);
-
-    /* SAP delta time */
-    ngx_rtmp_mp4_field_24(b, 0);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_mp4_write_moof(ngx_buf_t *b, uint32_t earliest_pres_time,
-    uint32_t sample_count, ngx_rtmp_mp4_sample_t *samples,
-    ngx_uint_t sample_mask, uint32_t index)
-{
-    u_char  *pos;
-
-    pos = ngx_rtmp_mp4_start_box(b, "moof");
-
-    ngx_rtmp_mp4_write_mfhd(b, index);
-    ngx_rtmp_mp4_write_traf(b, earliest_pres_time, sample_count, samples,
-                            sample_mask, pos);
-
-    ngx_rtmp_mp4_update_box_size(b, pos);
-
-    return NGX_OK;
-}
-
-
-ngx_uint_t
-ngx_rtmp_mp4_write_mdat(ngx_buf_t *b, ngx_uint_t size)
-{
-    ngx_rtmp_mp4_field_32(b, size);
-
-    ngx_rtmp_mp4_box(b, "mdat");
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/dash/ngx_rtmp_mp4.h b/debian/modules/rtmp/dash/ngx_rtmp_mp4.h
deleted file mode 100644
index 697b6c8..0000000
--- a/debian/modules/rtmp/dash/ngx_rtmp_mp4.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-#ifndef _NGX_RTMP_MP4_H_INCLUDED_
-#define _NGX_RTMP_MP4_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_rtmp.h>
-
-
-#define NGX_RTMP_MP4_SAMPLE_SIZE        0x01
-#define NGX_RTMP_MP4_SAMPLE_DURATION    0x02
-#define NGX_RTMP_MP4_SAMPLE_DELAY       0x04
-#define NGX_RTMP_MP4_SAMPLE_KEY         0x08
-
-
-typedef struct {
-    uint32_t        size;
-    uint32_t        duration;
-    uint32_t        delay;
-    uint32_t        timestamp;
-    unsigned        key:1;
-} ngx_rtmp_mp4_sample_t;
-
-
-typedef enum {
-    NGX_RTMP_MP4_FILETYPE_INIT,
-    NGX_RTMP_MP4_FILETYPE_SEG
-} ngx_rtmp_mp4_file_type_t;
-
-
-typedef enum {
-    NGX_RTMP_MP4_VIDEO_TRACK,
-    NGX_RTMP_MP4_AUDIO_TRACK
-} ngx_rtmp_mp4_track_type_t;
-
-
-ngx_int_t ngx_rtmp_mp4_write_ftyp(ngx_buf_t *b);
-ngx_int_t ngx_rtmp_mp4_write_styp(ngx_buf_t *b);
-ngx_int_t ngx_rtmp_mp4_write_moov(ngx_rtmp_session_t *s, ngx_buf_t *b,
-    ngx_rtmp_mp4_track_type_t ttype);
-ngx_int_t ngx_rtmp_mp4_write_moof(ngx_buf_t *b, uint32_t earliest_pres_time,
-    uint32_t sample_count, ngx_rtmp_mp4_sample_t *samples,
-    ngx_uint_t sample_mask, uint32_t index);
-ngx_int_t ngx_rtmp_mp4_write_sidx(ngx_buf_t *b,
-    ngx_uint_t reference_size, uint32_t earliest_pres_time,
-    uint32_t latest_pres_time);
-ngx_uint_t ngx_rtmp_mp4_write_mdat(ngx_buf_t *b, ngx_uint_t size);
-
-
-#endif /* _NGX_RTMP_MP4_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/doc/README.md b/debian/modules/rtmp/doc/README.md
deleted file mode 100644
index 407efa7..0000000
--- a/debian/modules/rtmp/doc/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Documentation is available here:
-https://github.com/arut/nginx-rtmp-module/wiki
diff --git a/debian/modules/rtmp/hls/ngx_rtmp_hls_module.c b/debian/modules/rtmp/hls/ngx_rtmp_hls_module.c
deleted file mode 100644
index 25166cb..0000000
--- a/debian/modules/rtmp/hls/ngx_rtmp_hls_module.c
+++ /dev/null
@@ -1,2459 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_rtmp.h>
-#include <ngx_rtmp_cmd_module.h>
-#include <ngx_rtmp_codec_module.h>
-#include "ngx_rtmp_mpegts.h"
-
-
-static ngx_rtmp_publish_pt              next_publish;
-static ngx_rtmp_close_stream_pt         next_close_stream;
-static ngx_rtmp_stream_begin_pt         next_stream_begin;
-static ngx_rtmp_stream_eof_pt           next_stream_eof;
-
-
-static char * ngx_rtmp_hls_variant(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static ngx_int_t ngx_rtmp_hls_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_hls_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-static ngx_int_t ngx_rtmp_hls_flush_audio(ngx_rtmp_session_t *s);
-static ngx_int_t ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s,
-       ngx_str_t *path);
-
-
-#define NGX_RTMP_HLS_BUFSIZE            (1024*1024)
-#define NGX_RTMP_HLS_DIR_ACCESS         0744
-
-
-typedef struct {
-    uint64_t                            id;
-    uint64_t                            key_id;
-    double                              duration;
-    unsigned                            active:1;
-    unsigned                            discont:1; /* before */
-} ngx_rtmp_hls_frag_t;
-
-
-typedef struct {
-    ngx_str_t                           suffix;
-    ngx_array_t                         args;
-} ngx_rtmp_hls_variant_t;
-
-
-typedef struct {
-    unsigned                            opened:1;
-
-    ngx_rtmp_mpegts_file_t              file;
-
-    ngx_str_t                           playlist;
-    ngx_str_t                           playlist_bak;
-    ngx_str_t                           var_playlist;
-    ngx_str_t                           var_playlist_bak;
-    ngx_str_t                           stream;
-    ngx_str_t                           keyfile;
-    ngx_str_t                           name;
-    u_char                              key[16];
-
-    uint64_t                            frag;
-    uint64_t                            frag_ts;
-    uint64_t                            key_id;
-    ngx_uint_t                          nfrags;
-    ngx_rtmp_hls_frag_t                *frags; /* circular 2 * winfrags + 1 */
-
-    ngx_uint_t                          audio_cc;
-    ngx_uint_t                          video_cc;
-    ngx_uint_t                          key_frags;
-
-    uint64_t                            aframe_base;
-    uint64_t                            aframe_num;
-
-    ngx_buf_t                          *aframe;
-    uint64_t                            aframe_pts;
-
-    ngx_rtmp_hls_variant_t             *var;
-} ngx_rtmp_hls_ctx_t;
-
-
-typedef struct {
-    ngx_str_t                           path;
-    ngx_msec_t                          playlen;
-    ngx_uint_t                          frags_per_key;
-} ngx_rtmp_hls_cleanup_t;
-
-
-typedef struct {
-    ngx_flag_t                          hls;
-    ngx_msec_t                          fraglen;
-    ngx_msec_t                          max_fraglen;
-    ngx_msec_t                          muxdelay;
-    ngx_msec_t                          sync;
-    ngx_msec_t                          playlen;
-    ngx_uint_t                          winfrags;
-    ngx_flag_t                          continuous;
-    ngx_flag_t                          nested;
-    ngx_str_t                           path;
-    ngx_uint_t                          naming;
-    ngx_uint_t                          slicing;
-    ngx_uint_t                          type;
-    ngx_path_t                         *slot;
-    ngx_msec_t                          max_audio_delay;
-    size_t                              audio_buffer_size;
-    ngx_flag_t                          cleanup;
-    ngx_array_t                        *variant;
-    ngx_str_t                           base_url;
-    ngx_int_t                           granularity;
-    ngx_flag_t                          keys;
-    ngx_str_t                           key_path;
-    ngx_str_t                           key_url;
-    ngx_uint_t                          frags_per_key;
-} ngx_rtmp_hls_app_conf_t;
-
-
-#define NGX_RTMP_HLS_NAMING_SEQUENTIAL  1
-#define NGX_RTMP_HLS_NAMING_TIMESTAMP   2
-#define NGX_RTMP_HLS_NAMING_SYSTEM      3
-
-
-#define NGX_RTMP_HLS_SLICING_PLAIN      1
-#define NGX_RTMP_HLS_SLICING_ALIGNED    2
-
-
-#define NGX_RTMP_HLS_TYPE_LIVE          1
-#define NGX_RTMP_HLS_TYPE_EVENT         2
-
-
-static ngx_conf_enum_t                  ngx_rtmp_hls_naming_slots[] = {
-    { ngx_string("sequential"),         NGX_RTMP_HLS_NAMING_SEQUENTIAL },
-    { ngx_string("timestamp"),          NGX_RTMP_HLS_NAMING_TIMESTAMP  },
-    { ngx_string("system"),             NGX_RTMP_HLS_NAMING_SYSTEM     },
-    { ngx_null_string,                  0 }
-};
-
-
-static ngx_conf_enum_t                  ngx_rtmp_hls_slicing_slots[] = {
-    { ngx_string("plain"),              NGX_RTMP_HLS_SLICING_PLAIN },
-    { ngx_string("aligned"),            NGX_RTMP_HLS_SLICING_ALIGNED  },
-    { ngx_null_string,                  0 }
-};
-
-
-static ngx_conf_enum_t                  ngx_rtmp_hls_type_slots[] = {
-    { ngx_string("live"),               NGX_RTMP_HLS_TYPE_LIVE  },
-    { ngx_string("event"),              NGX_RTMP_HLS_TYPE_EVENT },
-    { ngx_null_string,                  0 }
-};
-
-
-static ngx_command_t ngx_rtmp_hls_commands[] = {
-
-    { ngx_string("hls"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, hls),
-      NULL },
-
-    { ngx_string("hls_fragment"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, fraglen),
-      NULL },
-
-    { ngx_string("hls_max_fragment"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, max_fraglen),
-      NULL },
-
-    { ngx_string("hls_path"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, path),
-      NULL },
-
-    { ngx_string("hls_playlist_length"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, playlen),
-      NULL },
-
-    { ngx_string("hls_muxdelay"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, muxdelay),
-      NULL },
-
-    { ngx_string("hls_sync"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, sync),
-      NULL },
-
-    { ngx_string("hls_continuous"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, continuous),
-      NULL },
-
-    { ngx_string("hls_nested"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, nested),
-      NULL },
-
-    { ngx_string("hls_fragment_naming"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_enum_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, naming),
-      &ngx_rtmp_hls_naming_slots },
-
-    { ngx_string("hls_fragment_slicing"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_enum_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, slicing),
-      &ngx_rtmp_hls_slicing_slots },
-
-    { ngx_string("hls_type"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_enum_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, type),
-      &ngx_rtmp_hls_type_slots },
-
-    { ngx_string("hls_max_audio_delay"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, max_audio_delay),
-      NULL },
-
-    { ngx_string("hls_audio_buffer_size"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, audio_buffer_size),
-      NULL },
-
-    { ngx_string("hls_cleanup"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, cleanup),
-      NULL },
-
-    { ngx_string("hls_variant"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_hls_variant,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("hls_base_url"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, base_url),
-      NULL },
-
-    { ngx_string("hls_fragment_naming_granularity"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, granularity),
-      NULL },
-
-    { ngx_string("hls_keys"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, keys),
-      NULL },
-
-    { ngx_string("hls_key_path"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, key_path),
-      NULL },
-
-    { ngx_string("hls_key_url"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, key_url),
-      NULL },
-
-    { ngx_string("hls_fragments_per_key"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_hls_app_conf_t, frags_per_key),
-      NULL },
-
-    ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_hls_module_ctx = {
-    NULL,                               /* preconfiguration */
-    ngx_rtmp_hls_postconfiguration,     /* postconfiguration */
-
-    NULL,                               /* create main configuration */
-    NULL,                               /* init main configuration */
-
-    NULL,                               /* create server configuration */
-    NULL,                               /* merge server configuration */
-
-    ngx_rtmp_hls_create_app_conf,       /* create location configuration */
-    ngx_rtmp_hls_merge_app_conf,        /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_hls_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_hls_module_ctx,           /* module context */
-    ngx_rtmp_hls_commands,              /* module directives */
-    NGX_RTMP_MODULE,                    /* module type */
-    NULL,                               /* init master */
-    NULL,                               /* init module */
-    NULL,                               /* init process */
-    NULL,                               /* init thread */
-    NULL,                               /* exit thread */
-    NULL,                               /* exit process */
-    NULL,                               /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_rtmp_hls_frag_t *
-ngx_rtmp_hls_get_frag(ngx_rtmp_session_t *s, ngx_int_t n)
-{
-    ngx_rtmp_hls_ctx_t         *ctx;
-    ngx_rtmp_hls_app_conf_t    *hacf;
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    return &ctx->frags[(ctx->frag + n) % (hacf->winfrags * 2 + 1)];
-}
-
-
-static void
-ngx_rtmp_hls_next_frag(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_hls_ctx_t         *ctx;
-    ngx_rtmp_hls_app_conf_t    *hacf;
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    if (ctx->nfrags == hacf->winfrags) {
-        ctx->frag++;
-    } else {
-        ctx->nfrags++;
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_rename_file(u_char *src, u_char *dst)
-{
-    /* rename file with overwrite */
-
-#if (NGX_WIN32)
-    return MoveFileEx((LPCTSTR) src, (LPCTSTR) dst, MOVEFILE_REPLACE_EXISTING);
-#else
-    return ngx_rename_file(src, dst);
-#endif
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_write_variant_playlist(ngx_rtmp_session_t *s)
-{
-    static u_char             buffer[1024];
-
-    u_char                   *p, *last;
-    ssize_t                   rc;
-    ngx_fd_t                  fd;
-    ngx_str_t                *arg;
-    ngx_uint_t                n, k;
-    ngx_rtmp_hls_ctx_t       *ctx;
-    ngx_rtmp_hls_variant_t   *var;
-    ngx_rtmp_hls_app_conf_t  *hacf;
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    fd = ngx_open_file(ctx->var_playlist_bak.data, NGX_FILE_WRONLY,
-                       NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
-
-    if (fd == NGX_INVALID_FILE) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "hls: " ngx_open_file_n " failed: '%V'",
-                      &ctx->var_playlist_bak);
-
-        return NGX_ERROR;
-    }
-
-#define NGX_RTMP_HLS_VAR_HEADER "#EXTM3U\n#EXT-X-VERSION:3\n"
-
-    rc = ngx_write_fd(fd, NGX_RTMP_HLS_VAR_HEADER,
-                      sizeof(NGX_RTMP_HLS_VAR_HEADER) - 1);
-    if (rc < 0) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "hls: " ngx_write_fd_n " failed: '%V'",
-                      &ctx->var_playlist_bak);
-        ngx_close_file(fd);
-        return NGX_ERROR;
-    }
-
-    var = hacf->variant->elts;
-    for (n = 0; n < hacf->variant->nelts; n++, var++)
-    {
-        p = buffer;
-        last = buffer + sizeof(buffer);
-
-        p = ngx_slprintf(p, last, "#EXT-X-STREAM-INF:PROGRAM-ID=1");
-
-        arg = var->args.elts;
-        for (k = 0; k < var->args.nelts; k++, arg++) {
-            p = ngx_slprintf(p, last, ",%V", arg);
-        }
-
-        if (p < last) {
-            *p++ = '\n';
-        }
-
-        p = ngx_slprintf(p, last, "%V%*s%V",
-                         &hacf->base_url,
-                         ctx->name.len - ctx->var->suffix.len, ctx->name.data,
-                         &var->suffix);
-        if (hacf->nested) {
-            p = ngx_slprintf(p, last, "%s", "/index");
-        }
-
-        p = ngx_slprintf(p, last, "%s", ".m3u8\n");
-
-        rc = ngx_write_fd(fd, buffer, p - buffer);
-        if (rc < 0) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                          "hls: " ngx_write_fd_n " failed '%V'",
-                          &ctx->var_playlist_bak);
-            ngx_close_file(fd);
-            return NGX_ERROR;
-        }
-    }
-
-    ngx_close_file(fd);
-
-    if (ngx_rtmp_hls_rename_file(ctx->var_playlist_bak.data,
-                                 ctx->var_playlist.data)
-        == NGX_FILE_ERROR)
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "hls: rename failed: '%V'->'%V'",
-                      &ctx->var_playlist_bak, &ctx->var_playlist);
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_write_playlist(ngx_rtmp_session_t *s)
-{
-    static u_char                   buffer[1024];
-    ngx_fd_t                        fd;
-    u_char                         *p, *end;
-    ngx_rtmp_hls_ctx_t             *ctx;
-    ssize_t                         n;
-    ngx_rtmp_hls_app_conf_t        *hacf;
-    ngx_rtmp_hls_frag_t            *f;
-    ngx_uint_t                      i, max_frag;
-    ngx_str_t                       name_part, key_name_part;
-    uint64_t                        prev_key_id;
-    const char                     *sep, *key_sep;
-
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    fd = ngx_open_file(ctx->playlist_bak.data, NGX_FILE_WRONLY,
-                       NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
-
-    if (fd == NGX_INVALID_FILE) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "hls: " ngx_open_file_n " failed: '%V'",
-                      &ctx->playlist_bak);
-        return NGX_ERROR;
-    }
-
-    max_frag = hacf->fraglen / 1000;
-
-    for (i = 0; i < ctx->nfrags; i++) {
-        f = ngx_rtmp_hls_get_frag(s, i);
-        if (f->duration > max_frag) {
-            max_frag = (ngx_uint_t) (f->duration + .5);
-        }
-    }
-
-    p = buffer;
-    end = p + sizeof(buffer);
-
-    p = ngx_slprintf(p, end,
-                     "#EXTM3U\n"
-                     "#EXT-X-VERSION:3\n"
-                     "#EXT-X-MEDIA-SEQUENCE:%uL\n"
-                     "#EXT-X-TARGETDURATION:%ui\n",
-                     ctx->frag, max_frag);
-
-    if (hacf->type == NGX_RTMP_HLS_TYPE_EVENT) {
-        p = ngx_slprintf(p, end, "#EXT-X-PLAYLIST-TYPE: EVENT\n");
-    }
-
-    n = ngx_write_fd(fd, buffer, p - buffer);
-    if (n < 0) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "hls: " ngx_write_fd_n " failed: '%V'",
-                      &ctx->playlist_bak);
-        ngx_close_file(fd);
-        return NGX_ERROR;
-    }
-
-    sep = hacf->nested ? (hacf->base_url.len ? "/" : "") : "-";
-    key_sep = hacf->nested ? (hacf->key_url.len ? "/" : "") : "-";
-
-    name_part.len = 0;
-    if (!hacf->nested || hacf->base_url.len) {
-        name_part = ctx->name;
-    }
-
-    key_name_part.len = 0;
-    if (!hacf->nested || hacf->key_url.len) {
-        key_name_part = ctx->name;
-    }
-
-    prev_key_id = 0;
-
-    for (i = 0; i < ctx->nfrags; i++) {
-        f = ngx_rtmp_hls_get_frag(s, i);
-
-        p = buffer;
-        end = p + sizeof(buffer);
-
-        if (f->discont) {
-            p = ngx_slprintf(p, end, "#EXT-X-DISCONTINUITY\n");
-        }
-
-        if (hacf->keys && (i == 0 || f->key_id != prev_key_id)) {
-            p = ngx_slprintf(p, end, "#EXT-X-KEY:METHOD=AES-128,"
-                             "URI=\"%V%V%s%uL.key\",IV=0x%032XL\n",
-                             &hacf->key_url, &key_name_part,
-                             key_sep, f->key_id, f->key_id);
-        }
-
-        prev_key_id = f->key_id;
-
-        p = ngx_slprintf(p, end,
-                         "#EXTINF:%.3f,\n"
-                         "%V%V%s%uL.ts\n",
-                         f->duration, &hacf->base_url, &name_part, sep, f->id);
-
-        ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "hls: fragment frag=%uL, n=%ui/%ui, duration=%.3f, "
-                       "discont=%i",
-                       ctx->frag, i + 1, ctx->nfrags, f->duration, f->discont);
-
-        n = ngx_write_fd(fd, buffer, p - buffer);
-        if (n < 0) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                          "hls: " ngx_write_fd_n " failed '%V'",
-                          &ctx->playlist_bak);
-            ngx_close_file(fd);
-            return NGX_ERROR;
-        }
-    }
-
-    ngx_close_file(fd);
-
-    if (ngx_rtmp_hls_rename_file(ctx->playlist_bak.data, ctx->playlist.data)
-        == NGX_FILE_ERROR)
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "hls: rename failed: '%V'->'%V'",
-                      &ctx->playlist_bak, &ctx->playlist);
-        return NGX_ERROR;
-    }
-
-    if (ctx->var) {
-        return ngx_rtmp_hls_write_variant_playlist(s);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_copy(ngx_rtmp_session_t *s, void *dst, u_char **src, size_t n,
-    ngx_chain_t **in)
-{
-    u_char  *last;
-    size_t   pn;
-
-    if (*in == NULL) {
-        return NGX_ERROR;
-    }
-
-    for ( ;; ) {
-        last = (*in)->buf->last;
-
-        if ((size_t)(last - *src) >= n) {
-            if (dst) {
-                ngx_memcpy(dst, *src, n);
-            }
-
-            *src += n;
-
-            while (*in && *src == (*in)->buf->last) {
-                *in = (*in)->next;
-                if (*in) {
-                    *src = (*in)->buf->pos;
-                }
-            }
-
-            return NGX_OK;
-        }
-
-        pn = last - *src;
-
-        if (dst) {
-            ngx_memcpy(dst, *src, pn);
-            dst = (u_char *)dst + pn;
-        }
-
-        n -= pn;
-        *in = (*in)->next;
-
-        if (*in == NULL) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "hls: failed to read %uz byte(s)", n);
-            return NGX_ERROR;
-        }
-
-        *src = (*in)->buf->pos;
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_append_aud(ngx_rtmp_session_t *s, ngx_buf_t *out)
-{
-    static u_char   aud_nal[] = { 0x00, 0x00, 0x00, 0x01, 0x09, 0xf0 };
-
-    if (out->last + sizeof(aud_nal) > out->end) {
-        return NGX_ERROR;
-    }
-
-    out->last = ngx_cpymem(out->last, aud_nal, sizeof(aud_nal));
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_append_sps_pps(ngx_rtmp_session_t *s, ngx_buf_t *out)
-{
-    ngx_rtmp_codec_ctx_t           *codec_ctx;
-    u_char                         *p;
-    ngx_chain_t                    *in;
-    ngx_rtmp_hls_ctx_t             *ctx;
-    int8_t                          nnals;
-    uint16_t                        len, rlen;
-    ngx_int_t                       n;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (ctx == NULL || codec_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    in = codec_ctx->avc_header;
-    if (in == NULL) {
-        return NGX_ERROR;
-    }
-
-    p = in->buf->pos;
-
-    /*
-     * Skip bytes:
-     * - flv fmt
-     * - H264 CONF/PICT (0x00)
-     * - 0
-     * - 0
-     * - 0
-     * - version
-     * - profile
-     * - compatibility
-     * - level
-     * - nal bytes
-     */
-
-    if (ngx_rtmp_hls_copy(s, NULL, &p, 10, &in) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    /* number of SPS NALs */
-    if (ngx_rtmp_hls_copy(s, &nnals, &p, 1, &in) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    nnals &= 0x1f; /* 5lsb */
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: SPS number: %uz", nnals);
-
-    /* SPS */
-    for (n = 0; ; ++n) {
-        for (; nnals; --nnals) {
-
-            /* NAL length */
-            if (ngx_rtmp_hls_copy(s, &rlen, &p, 2, &in) != NGX_OK) {
-                return NGX_ERROR;
-            }
-
-            ngx_rtmp_rmemcpy(&len, &rlen, 2);
-
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "hls: header NAL length: %uz", (size_t) len);
-
-            /* AnnexB prefix */
-            if (out->end - out->last < 4) {
-                ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                              "hls: too small buffer for header NAL size");
-                return NGX_ERROR;
-            }
-
-            *out->last++ = 0;
-            *out->last++ = 0;
-            *out->last++ = 0;
-            *out->last++ = 1;
-
-            /* NAL body */
-            if (out->end - out->last < len) {
-                ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                              "hls: too small buffer for header NAL");
-                return NGX_ERROR;
-            }
-
-            if (ngx_rtmp_hls_copy(s, out->last, &p, len, &in) != NGX_OK) {
-                return NGX_ERROR;
-            }
-
-            out->last += len;
-        }
-
-        if (n == 1) {
-            break;
-        }
-
-        /* number of PPS NALs */
-        if (ngx_rtmp_hls_copy(s, &nnals, &p, 1, &in) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "hls: PPS number: %uz", nnals);
-    }
-
-    return NGX_OK;
-}
-
-
-static uint64_t
-ngx_rtmp_hls_get_fragment_id(ngx_rtmp_session_t *s, uint64_t ts)
-{
-    ngx_rtmp_hls_ctx_t         *ctx;
-    ngx_rtmp_hls_app_conf_t    *hacf;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-
-    switch (hacf->naming) {
-
-    case NGX_RTMP_HLS_NAMING_TIMESTAMP:
-        return ts;
-
-    case NGX_RTMP_HLS_NAMING_SYSTEM:
-        return (uint64_t) ngx_cached_time->sec * 1000 + ngx_cached_time->msec;
-
-    default: /* NGX_RTMP_HLS_NAMING_SEQUENTIAL */
-        return ctx->frag + ctx->nfrags;
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_close_fragment(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_hls_ctx_t         *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-    if (ctx == NULL || !ctx->opened) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: close fragment n=%uL", ctx->frag);
-
-    ngx_rtmp_mpegts_close_file(&ctx->file);
-
-    ctx->opened = 0;
-
-    ngx_rtmp_hls_next_frag(s);
-
-    ngx_rtmp_hls_write_playlist(s);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
-    ngx_int_t discont)
-{
-    uint64_t                  id;
-    ngx_fd_t                  fd;
-    ngx_uint_t                g;
-    ngx_rtmp_hls_ctx_t       *ctx;
-    ngx_rtmp_hls_frag_t      *f;
-    ngx_rtmp_hls_app_conf_t  *hacf;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    if (ctx->opened) {
-        return NGX_OK;
-    }
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-
-    if (ngx_rtmp_hls_ensure_directory(s, &hacf->path) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    if (hacf->keys &&
-        ngx_rtmp_hls_ensure_directory(s, &hacf->key_path) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    id = ngx_rtmp_hls_get_fragment_id(s, ts);
-
-    if (hacf->granularity) {
-        g = (ngx_uint_t) hacf->granularity;
-        id = (uint64_t) (id / g) * g;
-    }
-
-    ngx_sprintf(ctx->stream.data + ctx->stream.len, "%uL.ts%Z", id);
-
-    if (hacf->keys) {
-        if (ctx->key_frags == 0) {
-
-            ctx->key_frags = hacf->frags_per_key - 1;
-            ctx->key_id = id;
-
-            if (RAND_bytes(ctx->key, 16) < 0) {
-                ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                              "hls: failed to create key");
-                return NGX_ERROR;
-            }
-
-            ngx_sprintf(ctx->keyfile.data + ctx->keyfile.len, "%uL.key%Z", id);
-
-            fd = ngx_open_file(ctx->keyfile.data, NGX_FILE_WRONLY,
-                               NGX_FILE_TRUNCATE, NGX_FILE_DEFAULT_ACCESS);
-
-            if (fd == NGX_INVALID_FILE) {
-                ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                              "hls: failed to open key file '%s'",
-                              ctx->keyfile.data);
-                return NGX_ERROR;
-            }
-
-            if (ngx_write_fd(fd, ctx->key, 16) != 16) {
-                ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                              "hls: failed to write key file '%s'",
-                              ctx->keyfile.data);
-                ngx_close_file(fd);
-                return NGX_ERROR;
-            }
-
-            ngx_close_file(fd);
-
-        } else {
-            if (hacf->frags_per_key) {
-                ctx->key_frags--;
-            }
-
-            if (ngx_set_file_time(ctx->keyfile.data, 0, ngx_cached_time->sec)
-                != NGX_OK)
-            {
-                ngx_log_error(NGX_LOG_ALERT, s->connection->log, ngx_errno,
-                              ngx_set_file_time_n " '%s' failed",
-                              ctx->keyfile.data);
-            }
-        }
-    }
-
-    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: open fragment file='%s', keyfile='%s', "
-                   "frag=%uL, n=%ui, time=%uL, discont=%i",
-                   ctx->stream.data,
-                   ctx->keyfile.data ? ctx->keyfile.data : (u_char *) "",
-                   ctx->frag, ctx->nfrags, ts, discont);
-
-    if (hacf->keys &&
-        ngx_rtmp_mpegts_init_encryption(&ctx->file, ctx->key, 16, ctx->key_id)
-        != NGX_OK)
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "hls: failed to initialize hls encryption");
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_mpegts_open_file(&ctx->file, ctx->stream.data,
-                                  s->connection->log)
-        != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    ctx->opened = 1;
-
-    f = ngx_rtmp_hls_get_frag(s, ctx->nfrags);
-
-    ngx_memzero(f, sizeof(*f));
-
-    f->active = 1;
-    f->discont = discont;
-    f->id = id;
-    f->key_id = ctx->key_id;
-
-    ctx->frag_ts = ts;
-
-    /* start fragment with audio to make iPhone happy */
-
-    ngx_rtmp_hls_flush_audio(s);
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_hls_restore_stream(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_hls_ctx_t             *ctx;
-    ngx_file_t                      file;
-    ssize_t                         ret;
-    off_t                           offset;
-    u_char                         *p, *last, *end, *next, *pa, *pp, c;
-    ngx_rtmp_hls_frag_t            *f;
-    double                          duration;
-    ngx_int_t                       discont;
-    uint64_t                        mag, key_id, base;
-    static u_char                   buffer[4096];
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    ngx_memzero(&file, sizeof(file));
-
-    file.log = s->connection->log;
-
-    ngx_str_set(&file.name, "m3u8");
-
-    file.fd = ngx_open_file(ctx->playlist.data, NGX_FILE_RDONLY, NGX_FILE_OPEN,
-                            0);
-    if (file.fd == NGX_INVALID_FILE) {
-        return;
-    }
-
-    offset = 0;
-    ctx->nfrags = 0;
-    f = NULL;
-    duration = 0;
-    discont = 0;
-    key_id = 0;
-
-    for ( ;; ) {
-
-        ret = ngx_read_file(&file, buffer, sizeof(buffer), offset);
-        if (ret <= 0) {
-            goto done;
-        }
-
-        p = buffer;
-        end = buffer + ret;
-
-        for ( ;; ) {
-            last = ngx_strlchr(p, end, '\n');
-
-            if (last == NULL) {
-                if (p == buffer) {
-                    goto done;
-                }
-                break;
-            }
-
-            next = last + 1;
-            offset += (next - p);
-
-            if (p != last && last[-1] == '\r') {
-                last--;
-            }
-
-
-#define NGX_RTMP_MSEQ           "#EXT-X-MEDIA-SEQUENCE:"
-#define NGX_RTMP_MSEQ_LEN       (sizeof(NGX_RTMP_MSEQ) - 1)
-
-
-            if (ngx_memcmp(p, NGX_RTMP_MSEQ, NGX_RTMP_MSEQ_LEN) == 0) {
-
-                ctx->frag = (uint64_t) strtod((const char *)
-                                              &p[NGX_RTMP_MSEQ_LEN], NULL);
-
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "hls: restore sequence frag=%uL", ctx->frag);
-            }
-
-
-#define NGX_RTMP_XKEY           "#EXT-X-KEY:"
-#define NGX_RTMP_XKEY_LEN       (sizeof(NGX_RTMP_XKEY) - 1)
-
-            if (ngx_memcmp(p, NGX_RTMP_XKEY, NGX_RTMP_XKEY_LEN) == 0) {
-
-                /* recover key id from initialization vector */
-
-                key_id = 0;
-                base = 1;
-                pp = last - 1;
-
-                for ( ;; ) {
-                    if (pp < p) {
-                        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                                "hls: failed to read key id");
-                        break;
-                    }
-
-                    c = *pp;
-                    if (c == 'x') {
-                        break;
-                    }
-
-                    if (c >= '0' && c <= '9') {
-                        c -= '0';
-                        goto next;
-                    }
-
-                    c |= 0x20;
-
-                    if (c >= 'a' && c <= 'f') {
-                        c -= 'a' - 10;
-                        goto next;
-                    }
-
-                    ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                                  "hls: bad character in key id");
-                    break;
-
-                next:
-
-                    key_id += base * c;
-                    base *= 0x10;
-                    pp--;
-                }
-            }
-
-
-#define NGX_RTMP_EXTINF         "#EXTINF:"
-#define NGX_RTMP_EXTINF_LEN     (sizeof(NGX_RTMP_EXTINF) - 1)
-
-
-            if (ngx_memcmp(p, NGX_RTMP_EXTINF, NGX_RTMP_EXTINF_LEN) == 0) {
-
-                duration = strtod((const char *) &p[NGX_RTMP_EXTINF_LEN], NULL);
-
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "hls: restore durarion=%.3f", duration);
-            }
-
-
-#define NGX_RTMP_DISCONT        "#EXT-X-DISCONTINUITY"
-#define NGX_RTMP_DISCONT_LEN    (sizeof(NGX_RTMP_DISCONT) - 1)
-
-
-            if (ngx_memcmp(p, NGX_RTMP_DISCONT, NGX_RTMP_DISCONT_LEN) == 0) {
-
-                discont = 1;
-
-                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "hls: discontinuity");
-            }
-
-            /* find '.ts\r' */
-
-            if (p + 4 <= last &&
-                last[-3] == '.' && last[-2] == 't' && last[-1] == 's')
-            {
-                f = ngx_rtmp_hls_get_frag(s, ctx->nfrags);
-
-                ngx_memzero(f, sizeof(*f));
-
-                f->duration = duration;
-                f->discont = discont;
-                f->active = 1;
-                f->id = 0;
-
-                discont = 0;
-
-                mag = 1;
-                for (pa = last - 4; pa >= p; pa--) {
-                    if (*pa < '0' || *pa > '9') {
-                        break;
-                    }
-                    f->id += (*pa - '0') * mag;
-                    mag *= 10;
-                }
-
-                f->key_id = key_id;
-
-                ngx_rtmp_hls_next_frag(s);
-
-                ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "hls: restore fragment '%*s' id=%uL, "
-                               "duration=%.3f, frag=%uL, nfrags=%ui",
-                               (size_t) (last - p), p, f->id, f->duration,
-                               ctx->frag, ctx->nfrags);
-            }
-
-            p = next;
-        }
-    }
-
-done:
-    ngx_close_file(file.fd);
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_ensure_directory(ngx_rtmp_session_t *s, ngx_str_t *path)
-{
-    size_t                    len;
-    ngx_file_info_t           fi;
-    ngx_rtmp_hls_ctx_t       *ctx;
-    ngx_rtmp_hls_app_conf_t  *hacf;
-
-    static u_char  zpath[NGX_MAX_PATH + 1];
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-
-    if (path->len + 1 > sizeof(zpath)) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "hls: too long path");
-        return NGX_ERROR;
-    }
-
-    ngx_snprintf(zpath, sizeof(zpath), "%V%Z", path);
-
-    if (ngx_file_info(zpath, &fi) == NGX_FILE_ERROR) {
-
-        if (ngx_errno != NGX_ENOENT) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                          "hls: " ngx_file_info_n " failed on '%V'", path);
-            return NGX_ERROR;
-        }
-
-        /* ENOENT */
-
-        if (ngx_create_dir(zpath, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                          "hls: " ngx_create_dir_n " failed on '%V'", path);
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "hls: directory '%V' created", path);
-
-    } else {
-
-        if (!ngx_is_dir(&fi)) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "hls: '%V' exists and is not a directory", path);
-            return  NGX_ERROR;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "hls: directory '%V' exists", path);
-    }
-
-    if (!hacf->nested) {
-        return NGX_OK;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    len = path->len;
-    if (path->data[len - 1] == '/') {
-        len--;
-    }
-
-    if (len + 1 + ctx->name.len + 1 > sizeof(zpath)) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "hls: too long path");
-        return NGX_ERROR;
-    }
-
-    ngx_snprintf(zpath, sizeof(zpath) - 1, "%*s/%V%Z", len, path->data,
-                 &ctx->name);
-
-    if (ngx_file_info(zpath, &fi) != NGX_FILE_ERROR) {
-
-        if (ngx_is_dir(&fi)) {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "hls: directory '%s' exists", zpath);
-            return NGX_OK;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "hls: '%s' exists and is not a directory", zpath);
-
-        return  NGX_ERROR;
-    }
-
-    if (ngx_errno != NGX_ENOENT) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "hls: " ngx_file_info_n " failed on '%s'", zpath);
-        return NGX_ERROR;
-    }
-
-    /* NGX_ENOENT */
-
-    if (ngx_create_dir(zpath, NGX_RTMP_HLS_DIR_ACCESS) == NGX_FILE_ERROR) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "hls: " ngx_create_dir_n " failed on '%s'", zpath);
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: directory '%s' created", zpath);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    ngx_rtmp_hls_app_conf_t        *hacf;
-    ngx_rtmp_hls_ctx_t             *ctx;
-    u_char                         *p, *pp;
-    ngx_rtmp_hls_frag_t            *f;
-    ngx_buf_t                      *b;
-    size_t                          len;
-    ngx_rtmp_hls_variant_t         *var;
-    ngx_uint_t                      n;
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-    if (hacf == NULL || !hacf->hls || hacf->path.len == 0) {
-        goto next;
-    }
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: publish: name='%s' type='%s'",
-                   v->name, v->type);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    if (ctx == NULL) {
-
-        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_hls_ctx_t));
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_hls_module);
-
-    } else {
-
-        f = ctx->frags;
-        b = ctx->aframe;
-
-        ngx_memzero(ctx, sizeof(ngx_rtmp_hls_ctx_t));
-
-        ctx->frags = f;
-        ctx->aframe = b;
-
-        if (b) {
-            b->pos = b->last = b->start;
-        }
-    }
-
-    if (ctx->frags == NULL) {
-        ctx->frags = ngx_pcalloc(s->connection->pool,
-                                 sizeof(ngx_rtmp_hls_frag_t) *
-                                 (hacf->winfrags * 2 + 1));
-        if (ctx->frags == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    if (ngx_strstr(v->name, "..")) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "hls: bad stream name: '%s'", v->name);
-        return NGX_ERROR;
-    }
-
-    ctx->name.len = ngx_strlen(v->name);
-    ctx->name.data = ngx_palloc(s->connection->pool, ctx->name.len + 1);
-
-    if (ctx->name.data == NULL) {
-        return NGX_ERROR;
-    }
-
-    *ngx_cpymem(ctx->name.data, v->name, ctx->name.len) = 0;
-
-    len = hacf->path.len + 1 + ctx->name.len + sizeof(".m3u8");
-    if (hacf->nested) {
-        len += sizeof("/index") - 1;
-    }
-
-    ctx->playlist.data = ngx_palloc(s->connection->pool, len);
-    p = ngx_cpymem(ctx->playlist.data, hacf->path.data, hacf->path.len);
-
-    if (p[-1] != '/') {
-        *p++ = '/';
-    }
-
-    p = ngx_cpymem(p, ctx->name.data, ctx->name.len);
-
-    /*
-     * ctx->stream holds initial part of stream file path
-     * however the space for the whole stream path
-     * is allocated
-     */
-
-    ctx->stream.len = p - ctx->playlist.data + 1;
-    ctx->stream.data = ngx_palloc(s->connection->pool,
-                                  ctx->stream.len + NGX_INT64_LEN +
-                                  sizeof(".ts"));
-
-    ngx_memcpy(ctx->stream.data, ctx->playlist.data, ctx->stream.len - 1);
-    ctx->stream.data[ctx->stream.len - 1] = (hacf->nested ? '/' : '-');
-
-    /* varint playlist path */
-
-    if (hacf->variant) {
-        var = hacf->variant->elts;
-        for (n = 0; n < hacf->variant->nelts; n++, var++) {
-            if (ctx->name.len > var->suffix.len &&
-                ngx_memcmp(var->suffix.data,
-                           ctx->name.data + ctx->name.len - var->suffix.len,
-                           var->suffix.len)
-                == 0)
-            {
-                ctx->var = var;
-
-                len = (size_t) (p - ctx->playlist.data);
-
-                ctx->var_playlist.len = len - var->suffix.len + sizeof(".m3u8")
-                                        - 1;
-                ctx->var_playlist.data = ngx_palloc(s->connection->pool,
-                                                    ctx->var_playlist.len + 1);
-
-                pp = ngx_cpymem(ctx->var_playlist.data, ctx->playlist.data,
-                               len - var->suffix.len);
-                pp = ngx_cpymem(pp, ".m3u8", sizeof(".m3u8") - 1);
-                *pp = 0;
-
-                ctx->var_playlist_bak.len = ctx->var_playlist.len +
-                                            sizeof(".bak") - 1;
-                ctx->var_playlist_bak.data = ngx_palloc(s->connection->pool,
-                                                 ctx->var_playlist_bak.len + 1);
-
-                pp = ngx_cpymem(ctx->var_playlist_bak.data,
-                                ctx->var_playlist.data,
-                                ctx->var_playlist.len);
-                pp = ngx_cpymem(pp, ".bak", sizeof(".bak") - 1);
-                *pp = 0;
-
-                break;
-            }
-        }
-    }
-
-
-    /* playlist path */
-
-    if (hacf->nested) {
-        p = ngx_cpymem(p, "/index.m3u8", sizeof("/index.m3u8") - 1);
-    } else {
-        p = ngx_cpymem(p, ".m3u8", sizeof(".m3u8") - 1);
-    }
-
-    ctx->playlist.len = p - ctx->playlist.data;
-
-    *p = 0;
-
-    /* playlist bak (new playlist) path */
-
-    ctx->playlist_bak.data = ngx_palloc(s->connection->pool,
-                                        ctx->playlist.len + sizeof(".bak"));
-    p = ngx_cpymem(ctx->playlist_bak.data, ctx->playlist.data,
-                   ctx->playlist.len);
-    p = ngx_cpymem(p, ".bak", sizeof(".bak") - 1);
-
-    ctx->playlist_bak.len = p - ctx->playlist_bak.data;
-
-    *p = 0;
-
-    /* key path */
-
-    if (hacf->keys) {
-        len = hacf->key_path.len + 1 + ctx->name.len + 1 + NGX_INT64_LEN
-              + sizeof(".key");
-
-        ctx->keyfile.data = ngx_palloc(s->connection->pool, len);
-        if (ctx->keyfile.data == NULL) {
-            return NGX_ERROR;
-        }
-
-        p = ngx_cpymem(ctx->keyfile.data, hacf->key_path.data,
-                       hacf->key_path.len);
-
-        if (p[-1] != '/') {
-            *p++ = '/';
-        }
-
-        p = ngx_cpymem(p, ctx->name.data, ctx->name.len);
-        *p++ = (hacf->nested ? '/' : '-');
-
-        ctx->keyfile.len = p - ctx->keyfile.data;
-    }
-
-    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: playlist='%V' playlist_bak='%V' "
-                   "stream_pattern='%V' keyfile_pattern='%V'",
-                   &ctx->playlist, &ctx->playlist_bak,
-                   &ctx->stream, &ctx->keyfile);
-
-    if (hacf->continuous) {
-        ngx_rtmp_hls_restore_stream(s);
-    }
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
-{
-    ngx_rtmp_hls_app_conf_t        *hacf;
-    ngx_rtmp_hls_ctx_t             *ctx;
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    if (hacf == NULL || !hacf->hls || ctx == NULL) {
-        goto next;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: close stream");
-
-    ngx_rtmp_hls_close_fragment(s);
-
-next:
-    return next_close_stream(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_parse_aac_header(ngx_rtmp_session_t *s, ngx_uint_t *objtype,
-    ngx_uint_t *srindex, ngx_uint_t *chconf)
-{
-    ngx_rtmp_codec_ctx_t   *codec_ctx;
-    ngx_chain_t            *cl;
-    u_char                 *p, b0, b1;
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    cl = codec_ctx->aac_header;
-
-    p = cl->buf->pos;
-
-    if (ngx_rtmp_hls_copy(s, NULL, &p, 2, &cl) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_hls_copy(s, &b0, &p, 1, &cl) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_hls_copy(s, &b1, &p, 1, &cl) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    *objtype = b0 >> 3;
-    if (*objtype == 0 || *objtype == 0x1f) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "hls: unsupported adts object type:%ui", *objtype);
-        return NGX_ERROR;
-    }
-
-    if (*objtype > 4) {
-
-        /*
-         * Mark all extended profiles as LC
-         * to make Android as happy as possible.
-         */
-
-        *objtype = 2;
-    }
-
-    *srindex = ((b0 << 1) & 0x0f) | ((b1 & 0x80) >> 7);
-    if (*srindex == 0x0f) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "hls: unsupported adts sample rate:%ui", *srindex);
-        return NGX_ERROR;
-    }
-
-    *chconf = (b1 >> 3) & 0x0f;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: aac object_type:%ui, sample_rate_index:%ui, "
-                   "channel_config:%ui", *objtype, *srindex, *chconf);
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_hls_update_fragment(ngx_rtmp_session_t *s, uint64_t ts,
-    ngx_int_t boundary, ngx_uint_t flush_rate)
-{
-    ngx_rtmp_hls_ctx_t         *ctx;
-    ngx_rtmp_hls_app_conf_t    *hacf;
-    ngx_rtmp_hls_frag_t        *f;
-    ngx_msec_t                  ts_frag_len;
-    ngx_int_t                   same_frag, force,discont;
-    ngx_buf_t                  *b;
-    int64_t                     d;
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-    f = NULL;
-    force = 0;
-    discont = 1;
-
-    if (ctx->opened) {
-        f = ngx_rtmp_hls_get_frag(s, ctx->nfrags);
-        d = (int64_t) (ts - ctx->frag_ts);
-
-        if (d > (int64_t) hacf->max_fraglen * 90 || d < -90000) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "hls: force fragment split: %.3f sec, ", d / 90000.);
-            force = 1;
-
-        } else {
-            f->duration = (ts - ctx->frag_ts) / 90000.;
-            discont = 0;
-        }
-    }
-
-    switch (hacf->slicing) {
-        case NGX_RTMP_HLS_SLICING_PLAIN:
-            if (f && f->duration < hacf->fraglen / 1000.) {
-                boundary = 0;
-            }
-            break;
-
-        case NGX_RTMP_HLS_SLICING_ALIGNED:
-
-            ts_frag_len = hacf->fraglen * 90;
-            same_frag = ctx->frag_ts / ts_frag_len == ts / ts_frag_len;
-
-            if (f && same_frag) {
-                boundary = 0;
-            }
-
-            if (f == NULL && (ctx->frag_ts == 0 || same_frag)) {
-                ctx->frag_ts = ts;
-                boundary = 0;
-            }
-
-            break;
-    }
-
-    if (boundary || force) {
-        ngx_rtmp_hls_close_fragment(s);
-        ngx_rtmp_hls_open_fragment(s, ts, discont);
-    }
-
-    b = ctx->aframe;
-    if (ctx->opened && b && b->last > b->pos &&
-        ctx->aframe_pts + (uint64_t) hacf->max_audio_delay * 90 / flush_rate
-        < ts)
-    {
-        ngx_rtmp_hls_flush_audio(s);
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_flush_audio(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_hls_ctx_t             *ctx;
-    ngx_rtmp_mpegts_frame_t         frame;
-    ngx_int_t                       rc;
-    ngx_buf_t                      *b;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    if (ctx == NULL || !ctx->opened) {
-        return NGX_OK;
-    }
-
-    b = ctx->aframe;
-
-    if (b == NULL || b->pos == b->last) {
-        return NGX_OK;
-    }
-
-    ngx_memzero(&frame, sizeof(frame));
-
-    frame.dts = ctx->aframe_pts;
-    frame.pts = frame.dts;
-    frame.cc = ctx->audio_cc;
-    frame.pid = 0x101;
-    frame.sid = 0xc0;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: flush audio pts=%uL", frame.pts);
-
-    rc = ngx_rtmp_mpegts_write_frame(&ctx->file, &frame, b);
-
-    if (rc != NGX_OK) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "hls: audio flush failed");
-    }
-
-    ctx->audio_cc = frame.cc;
-    b->pos = b->last = b->start;
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_audio(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-    ngx_chain_t *in)
-{
-    ngx_rtmp_hls_app_conf_t        *hacf;
-    ngx_rtmp_hls_ctx_t             *ctx;
-    ngx_rtmp_codec_ctx_t           *codec_ctx;
-    uint64_t                        pts, est_pts;
-    int64_t                         dpts;
-    size_t                          bsize;
-    ngx_buf_t                      *b;
-    u_char                         *p;
-    ngx_uint_t                      objtype, srindex, chconf, size;
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (hacf == NULL || !hacf->hls || ctx == NULL ||
-        codec_ctx == NULL  || h->mlen < 2)
-    {
-        return NGX_OK;
-    }
-
-    if (codec_ctx->audio_codec_id != NGX_RTMP_AUDIO_AAC ||
-        codec_ctx->aac_header == NULL || ngx_rtmp_is_codec_header(in))
-    {
-        return NGX_OK;
-    }
-
-    b = ctx->aframe;
-
-    if (b == NULL) {
-
-        b = ngx_pcalloc(s->connection->pool, sizeof(ngx_buf_t));
-        if (b == NULL) {
-            return NGX_ERROR;
-        }
-
-        ctx->aframe = b;
-
-        b->start = ngx_palloc(s->connection->pool, hacf->audio_buffer_size);
-        if (b->start == NULL) {
-            return NGX_ERROR;
-        }
-
-        b->end = b->start + hacf->audio_buffer_size;
-        b->pos = b->last = b->start;
-    }
-
-    size = h->mlen - 2 + 7;
-    pts = (uint64_t) h->timestamp * 90;
-
-    if (b->start + size > b->end) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "hls: too big audio frame");
-        return NGX_OK;
-    }
-
-    /*
-     * start new fragment here if
-     * there's no video at all, otherwise
-     * do it in video handler
-     */
-
-    ngx_rtmp_hls_update_fragment(s, pts, codec_ctx->avc_header == NULL, 2);
-
-    if (b->last + size > b->end) {
-        ngx_rtmp_hls_flush_audio(s);
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: audio pts=%uL", pts);
-
-    if (b->last + 7 > b->end) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "hls: not enough buffer for audio header");
-        return NGX_OK;
-    }
-
-    p = b->last;
-    b->last += 5;
-
-    /* copy payload */
-
-    for (; in && b->last < b->end; in = in->next) {
-
-        bsize = in->buf->last - in->buf->pos;
-        if (b->last + bsize > b->end) {
-            bsize = b->end - b->last;
-        }
-
-        b->last = ngx_cpymem(b->last, in->buf->pos, bsize);
-    }
-
-    /* make up ADTS header */
-
-    if (ngx_rtmp_hls_parse_aac_header(s, &objtype, &srindex, &chconf)
-        != NGX_OK)
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "hls: aac header error");
-        return NGX_OK;
-    }
-
-    /* we have 5 free bytes + 2 bytes of RTMP frame header */
-
-    p[0] = 0xff;
-    p[1] = 0xf1;
-    p[2] = (u_char) (((objtype - 1) << 6) | (srindex << 2) |
-                     ((chconf & 0x04) >> 2));
-    p[3] = (u_char) (((chconf & 0x03) << 6) | ((size >> 11) & 0x03));
-    p[4] = (u_char) (size >> 3);
-    p[5] = (u_char) ((size << 5) | 0x1f);
-    p[6] = 0xfc;
-
-    if (p != b->start) {
-        ctx->aframe_num++;
-        return NGX_OK;
-    }
-
-    ctx->aframe_pts = pts;
-
-    if (!hacf->sync || codec_ctx->sample_rate == 0) {
-        return NGX_OK;
-    }
-
-    /* align audio frames */
-
-    /* TODO: We assume here AAC frame size is 1024
-     *       Need to handle AAC frames with frame size of 960 */
-
-    est_pts = ctx->aframe_base + ctx->aframe_num * 90000 * 1024 /
-                                 codec_ctx->sample_rate;
-    dpts = (int64_t) (est_pts - pts);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: audio sync dpts=%L (%.5fs)",
-                   dpts, dpts / 90000.);
-
-    if (dpts <= (int64_t) hacf->sync * 90 &&
-        dpts >= (int64_t) hacf->sync * -90)
-    {
-        ctx->aframe_num++;
-        ctx->aframe_pts = est_pts;
-        return NGX_OK;
-    }
-
-    ctx->aframe_base = pts;
-    ctx->aframe_num  = 1;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: audio sync gap dpts=%L (%.5fs)",
-                   dpts, dpts / 90000.);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_video(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-    ngx_chain_t *in)
-{
-    ngx_rtmp_hls_app_conf_t        *hacf;
-    ngx_rtmp_hls_ctx_t             *ctx;
-    ngx_rtmp_codec_ctx_t           *codec_ctx;
-    u_char                         *p;
-    uint8_t                         fmt, ftype, htype, nal_type, src_nal_type;
-    uint32_t                        len, rlen;
-    ngx_buf_t                       out, *b;
-    uint32_t                        cts;
-    ngx_rtmp_mpegts_frame_t         frame;
-    ngx_uint_t                      nal_bytes;
-    ngx_int_t                       aud_sent, sps_pps_sent, boundary;
-    static u_char                   buffer[NGX_RTMP_HLS_BUFSIZE];
-
-    hacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_hls_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_hls_module);
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (hacf == NULL || !hacf->hls || ctx == NULL || codec_ctx == NULL ||
-        codec_ctx->avc_header == NULL || h->mlen < 1)
-    {
-        return NGX_OK;
-    }
-
-    /* Only H264 is supported */
-    if (codec_ctx->video_codec_id != NGX_RTMP_VIDEO_H264) {
-        return NGX_OK;
-    }
-
-    p = in->buf->pos;
-    if (ngx_rtmp_hls_copy(s, &fmt, &p, 1, &in) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    /* 1: keyframe (IDR)
-     * 2: inter frame
-     * 3: disposable inter frame */
-
-    ftype = (fmt & 0xf0) >> 4;
-
-    /* H264 HDR/PICT */
-
-    if (ngx_rtmp_hls_copy(s, &htype, &p, 1, &in) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    /* proceed only with PICT */
-
-    if (htype != 1) {
-        return NGX_OK;
-    }
-
-    /* 3 bytes: decoder delay */
-
-    if (ngx_rtmp_hls_copy(s, &cts, &p, 3, &in) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    cts = ((cts & 0x00FF0000) >> 16) | ((cts & 0x000000FF) << 16) |
-          (cts & 0x0000FF00);
-
-    ngx_memzero(&out, sizeof(out));
-
-    out.start = buffer;
-    out.end = buffer + sizeof(buffer);
-    out.pos = out.start;
-    out.last = out.pos;
-
-    nal_bytes = codec_ctx->avc_nal_bytes;
-    aud_sent = 0;
-    sps_pps_sent = 0;
-
-    while (in) {
-        if (ngx_rtmp_hls_copy(s, &rlen, &p, nal_bytes, &in) != NGX_OK) {
-            return NGX_OK;
-        }
-
-        len = 0;
-        ngx_rtmp_rmemcpy(&len, &rlen, nal_bytes);
-
-        if (len == 0) {
-            continue;
-        }
-
-        if (ngx_rtmp_hls_copy(s, &src_nal_type, &p, 1, &in) != NGX_OK) {
-            return NGX_OK;
-        }
-
-        nal_type = src_nal_type & 0x1f;
-
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "hls: h264 NAL type=%ui, len=%uD",
-                       (ngx_uint_t) nal_type, len);
-
-        if (nal_type >= 7 && nal_type <= 9) {
-            if (ngx_rtmp_hls_copy(s, NULL, &p, len - 1, &in) != NGX_OK) {
-                return NGX_ERROR;
-            }
-            continue;
-        }
-
-        if (!aud_sent) {
-            switch (nal_type) {
-                case 1:
-                case 5:
-                case 6:
-                    if (ngx_rtmp_hls_append_aud(s, &out) != NGX_OK) {
-                        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                                      "hls: error appending AUD NAL");
-                    }
-                    /* fall through */
-                case 9:
-                    aud_sent = 1;
-                    break;
-            }
-        }
-
-        switch (nal_type) {
-            case 1:
-                sps_pps_sent = 0;
-                break;
-            case 5:
-                if (sps_pps_sent) {
-                    break;
-                }
-                if (ngx_rtmp_hls_append_sps_pps(s, &out) != NGX_OK) {
-                    ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                                  "hls: error appenging SPS/PPS NALs");
-                }
-                sps_pps_sent = 1;
-                break;
-        }
-
-        /* AnnexB prefix */
-
-        if (out.end - out.last < 5) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "hls: not enough buffer for AnnexB prefix");
-            return NGX_OK;
-        }
-
-        /* first AnnexB prefix is long (4 bytes) */
-
-        if (out.last == out.pos) {
-            *out.last++ = 0;
-        }
-
-        *out.last++ = 0;
-        *out.last++ = 0;
-        *out.last++ = 1;
-        *out.last++ = src_nal_type;
-
-        /* NAL body */
-
-        if (out.end - out.last < (ngx_int_t) len) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "hls: not enough buffer for NAL");
-            return NGX_OK;
-        }
-
-        if (ngx_rtmp_hls_copy(s, out.last, &p, len - 1, &in) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        out.last += (len - 1);
-    }
-
-    ngx_memzero(&frame, sizeof(frame));
-
-    frame.cc = ctx->video_cc;
-    frame.dts = (uint64_t) h->timestamp * 90;
-    frame.pts = frame.dts + cts * 90;
-    frame.pid = 0x100;
-    frame.sid = 0xe0;
-    frame.key = (ftype == 1);
-
-    /*
-     * start new fragment if
-     * - we have video key frame AND
-     * - we have audio buffered or have no audio at all or stream is closed
-     */
-
-    b = ctx->aframe;
-    boundary = frame.key && (codec_ctx->aac_header == NULL || !ctx->opened ||
-                             (b && b->last > b->pos));
-
-    ngx_rtmp_hls_update_fragment(s, frame.dts, boundary, 1);
-
-    if (!ctx->opened) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "hls: video pts=%uL, dts=%uL", frame.pts, frame.dts);
-
-    if (ngx_rtmp_mpegts_write_frame(&ctx->file, &frame, &out) != NGX_OK) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "hls: video frame failed");
-    }
-
-    ctx->video_cc = frame.cc;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
-{
-    return next_stream_begin(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_eof_t *v)
-{
-    ngx_rtmp_hls_flush_audio(s);
-
-    ngx_rtmp_hls_close_fragment(s);
-
-    return next_stream_eof(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_cleanup_dir(ngx_str_t *ppath, ngx_msec_t playlen)
-{
-    ngx_dir_t               dir;
-    time_t                  mtime, max_age;
-    ngx_err_t               err;
-    ngx_str_t               name, spath;
-    u_char                 *p;
-    ngx_int_t               nentries, nerased;
-    u_char                  path[NGX_MAX_PATH + 1];
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                   "hls: cleanup path='%V' playlen=%M",
-                   ppath, playlen);
-
-    if (ngx_open_dir(ppath, &dir) != NGX_OK) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, ngx_errno,
-                      "hls: cleanup open dir failed '%V'", ppath);
-        return NGX_ERROR;
-    }
-
-    nentries = 0;
-    nerased = 0;
-
-    for ( ;; ) {
-        ngx_set_errno(0);
-
-        if (ngx_read_dir(&dir) == NGX_ERROR) {
-            err = ngx_errno;
-
-            if (ngx_close_dir(&dir) == NGX_ERROR) {
-                ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, ngx_errno,
-                              "hls: cleanup " ngx_close_dir_n " \"%V\" failed",
-                              ppath);
-            }
-
-            if (err == NGX_ENOMOREFILES) {
-                return nentries - nerased;
-            }
-
-            ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, err,
-                          "hls: cleanup " ngx_read_dir_n
-                          " '%V' failed", ppath);
-            return NGX_ERROR;
-        }
-
-        name.data = ngx_de_name(&dir);
-        if (name.data[0] == '.') {
-            continue;
-        }
-
-        name.len = ngx_de_namelen(&dir);
-
-        p = ngx_snprintf(path, sizeof(path) - 1, "%V/%V", ppath, &name);
-        *p = 0;
-
-        spath.data = path;
-        spath.len = p - path;
-
-        nentries++;
-
-        if (!dir.valid_info && ngx_de_info(path, &dir) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, ngx_errno,
-                          "hls: cleanup " ngx_de_info_n " \"%V\" failed",
-                          &spath);
-
-            continue;
-        }
-
-        if (ngx_de_is_dir(&dir)) {
-
-            if (ngx_rtmp_hls_cleanup_dir(&spath, playlen) == 0) {
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                               "hls: cleanup dir '%V'", &name);
-
-                /*
-                 * null-termination gets spoiled in win32
-                 * version of ngx_open_dir
-                 */
-
-                *p = 0;
-
-                if (ngx_delete_dir(path) == NGX_FILE_ERROR) {
-                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                                  "hls: cleanup " ngx_delete_dir_n
-                                  " failed on '%V'", &spath);
-                } else {
-                    nerased++;
-                }
-            }
-
-            continue;
-        }
-
-        if (!ngx_de_is_file(&dir)) {
-            continue;
-        }
-
-        if (name.len >= 3 && name.data[name.len - 3] == '.' &&
-                             name.data[name.len - 2] == 't' &&
-                             name.data[name.len - 1] == 's')
-        {
-            max_age = playlen / 500;
-
-        } else if (name.len >= 5 && name.data[name.len - 5] == '.' &&
-                                    name.data[name.len - 4] == 'm' &&
-                                    name.data[name.len - 3] == '3' &&
-                                    name.data[name.len - 2] == 'u' &&
-                                    name.data[name.len - 1] == '8')
-        {
-            max_age = playlen / 1000;
-
-        } else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
-                                    name.data[name.len - 3] == 'k' &&
-                                    name.data[name.len - 2] == 'e' &&
-                                    name.data[name.len - 1] == 'y')
-        {
-            max_age = playlen / 500;
-
-        } else {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                           "hls: cleanup skip unknown file type '%V'", &name);
-            continue;
-        }
-
-        mtime = ngx_de_mtime(&dir);
-        if (mtime + max_age > ngx_cached_time->sec) {
-            continue;
-        }
-
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
-                       "hls: cleanup '%V' mtime=%T age=%T",
-                       &name, mtime, ngx_cached_time->sec - mtime);
-
-        if (ngx_delete_file(path) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
-                          "hls: cleanup " ngx_delete_file_n " failed on '%V'",
-                          &spath);
-            continue;
-        }
-
-        nerased++;
-    }
-}
-
-
-#if (nginx_version >= 1011005)
-static ngx_msec_t
-#else
-static time_t
-#endif
-ngx_rtmp_hls_cleanup(void *data)
-{
-    ngx_rtmp_hls_cleanup_t *cleanup = data;
-
-    ngx_rtmp_hls_cleanup_dir(&cleanup->path, cleanup->playlen);
-
-#if (nginx_version >= 1011005)
-    return cleanup->playlen * 2;
-#else
-    return cleanup->playlen / 500;
-#endif
-}
-
-
-static char *
-ngx_rtmp_hls_variant(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_rtmp_hls_app_conf_t  *hacf = conf;
-
-    ngx_str_t                *value, *arg;
-    ngx_uint_t                n;
-    ngx_rtmp_hls_variant_t   *var;
-
-    value = cf->args->elts;
-
-    if (hacf->variant == NULL) {
-        hacf->variant = ngx_array_create(cf->pool, 1,
-                                         sizeof(ngx_rtmp_hls_variant_t));
-        if (hacf->variant == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    var = ngx_array_push(hacf->variant);
-    if (var == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_memzero(var, sizeof(ngx_rtmp_hls_variant_t));
-
-    var->suffix = value[1];
-
-    if (cf->args->nelts == 2) {
-        return NGX_CONF_OK;
-    }
-
-    if (ngx_array_init(&var->args, cf->pool, cf->args->nelts - 2,
-                       sizeof(ngx_str_t))
-        != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
-    arg = ngx_array_push_n(&var->args, cf->args->nelts - 2);
-    if (arg == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    for (n = 2; n < cf->args->nelts; n++) {
-        *arg++ = value[n];
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static void *
-ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_hls_app_conf_t *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_hls_app_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    conf->hls = NGX_CONF_UNSET;
-    conf->fraglen = NGX_CONF_UNSET_MSEC;
-    conf->max_fraglen = NGX_CONF_UNSET_MSEC;
-    conf->muxdelay = NGX_CONF_UNSET_MSEC;
-    conf->sync = NGX_CONF_UNSET_MSEC;
-    conf->playlen = NGX_CONF_UNSET_MSEC;
-    conf->continuous = NGX_CONF_UNSET;
-    conf->nested = NGX_CONF_UNSET;
-    conf->naming = NGX_CONF_UNSET_UINT;
-    conf->slicing = NGX_CONF_UNSET_UINT;
-    conf->type = NGX_CONF_UNSET_UINT;
-    conf->max_audio_delay = NGX_CONF_UNSET_MSEC;
-    conf->audio_buffer_size = NGX_CONF_UNSET_SIZE;
-    conf->cleanup = NGX_CONF_UNSET;
-    conf->granularity = NGX_CONF_UNSET;
-    conf->keys = NGX_CONF_UNSET;
-    conf->frags_per_key = NGX_CONF_UNSET_UINT;
-
-    return conf;
-}
-
-
-static char *
-ngx_rtmp_hls_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_hls_app_conf_t    *prev = parent;
-    ngx_rtmp_hls_app_conf_t    *conf = child;
-    ngx_rtmp_hls_cleanup_t     *cleanup;
-
-    ngx_conf_merge_value(conf->hls, prev->hls, 0);
-    ngx_conf_merge_msec_value(conf->fraglen, prev->fraglen, 5000);
-    ngx_conf_merge_msec_value(conf->max_fraglen, prev->max_fraglen,
-                              conf->fraglen * 10);
-    ngx_conf_merge_msec_value(conf->muxdelay, prev->muxdelay, 700);
-    ngx_conf_merge_msec_value(conf->sync, prev->sync, 2);
-    ngx_conf_merge_msec_value(conf->playlen, prev->playlen, 30000);
-    ngx_conf_merge_value(conf->continuous, prev->continuous, 1);
-    ngx_conf_merge_value(conf->nested, prev->nested, 0);
-    ngx_conf_merge_uint_value(conf->naming, prev->naming,
-                              NGX_RTMP_HLS_NAMING_SEQUENTIAL);
-    ngx_conf_merge_uint_value(conf->slicing, prev->slicing,
-                              NGX_RTMP_HLS_SLICING_PLAIN);
-    ngx_conf_merge_uint_value(conf->type, prev->type,
-                              NGX_RTMP_HLS_TYPE_LIVE);
-    ngx_conf_merge_msec_value(conf->max_audio_delay, prev->max_audio_delay,
-                              300);
-    ngx_conf_merge_size_value(conf->audio_buffer_size, prev->audio_buffer_size,
-                              NGX_RTMP_HLS_BUFSIZE);
-    ngx_conf_merge_value(conf->cleanup, prev->cleanup, 1);
-    ngx_conf_merge_str_value(conf->base_url, prev->base_url, "");
-    ngx_conf_merge_value(conf->granularity, prev->granularity, 0);
-    ngx_conf_merge_value(conf->keys, prev->keys, 0);
-    ngx_conf_merge_str_value(conf->key_path, prev->key_path, "");
-    ngx_conf_merge_str_value(conf->key_url, prev->key_url, "");
-    ngx_conf_merge_uint_value(conf->frags_per_key, prev->frags_per_key, 0);
-
-    if (conf->fraglen) {
-        conf->winfrags = conf->playlen / conf->fraglen;
-    }
-
-    /* schedule cleanup */
-
-    if (conf->hls && conf->path.len && conf->cleanup &&
-        conf->type != NGX_RTMP_HLS_TYPE_EVENT)
-    {
-        if (conf->path.data[conf->path.len - 1] == '/') {
-            conf->path.len--;
-        }
-
-        cleanup = ngx_pcalloc(cf->pool, sizeof(*cleanup));
-        if (cleanup == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        cleanup->path = conf->path;
-        cleanup->playlen = conf->playlen;
-
-        conf->slot = ngx_pcalloc(cf->pool, sizeof(*conf->slot));
-        if (conf->slot == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        conf->slot->manager = ngx_rtmp_hls_cleanup;
-        conf->slot->name = conf->path;
-        conf->slot->data = cleanup;
-        conf->slot->conf_file = cf->conf_file->file.name.data;
-        conf->slot->line = cf->conf_file->line;
-
-        if (ngx_add_path(cf, &conf->slot) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    ngx_conf_merge_str_value(conf->path, prev->path, "");
-
-    if (conf->keys && conf->cleanup && conf->key_path.len &&
-        ngx_strcmp(conf->key_path.data, conf->path.data) != 0 &&
-        conf->type != NGX_RTMP_HLS_TYPE_EVENT)
-    {
-        if (conf->key_path.data[conf->key_path.len - 1] == '/') {
-            conf->key_path.len--;
-        }
-
-        cleanup = ngx_pcalloc(cf->pool, sizeof(*cleanup));
-        if (cleanup == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        cleanup->path = conf->key_path;
-        cleanup->playlen = conf->playlen;
-
-        conf->slot = ngx_pcalloc(cf->pool, sizeof(*conf->slot));
-        if (conf->slot == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        conf->slot->manager = ngx_rtmp_hls_cleanup;
-        conf->slot->name = conf->key_path;
-        conf->slot->data = cleanup;
-        conf->slot->conf_file = cf->conf_file->file.name.data;
-        conf->slot->line = cf->conf_file->line;
-
-        if (ngx_add_path(cf, &conf->slot) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    ngx_conf_merge_str_value(conf->key_path, prev->key_path, "");
-
-    if (conf->key_path.len == 0) {
-        conf->key_path = conf->path;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_hls_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t   *cmcf;
-    ngx_rtmp_handler_pt         *h;
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
-    *h = ngx_rtmp_hls_video;
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
-    *h = ngx_rtmp_hls_audio;
-
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_hls_publish;
-
-    next_close_stream = ngx_rtmp_close_stream;
-    ngx_rtmp_close_stream = ngx_rtmp_hls_close_stream;
-
-    next_stream_begin = ngx_rtmp_stream_begin;
-    ngx_rtmp_stream_begin = ngx_rtmp_hls_stream_begin;
-
-    next_stream_eof = ngx_rtmp_stream_eof;
-    ngx_rtmp_stream_eof = ngx_rtmp_hls_stream_eof;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/hls/ngx_rtmp_mpegts.c b/debian/modules/rtmp/hls/ngx_rtmp_mpegts.c
deleted file mode 100644
index ae66f71..0000000
--- a/debian/modules/rtmp/hls/ngx_rtmp_mpegts.c
+++ /dev/null
@@ -1,399 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_mpegts.h"
-
-
-static u_char ngx_rtmp_mpegts_header[] = {
-
-    /* TS */
-    0x47, 0x40, 0x00, 0x10, 0x00,
-    /* PSI */
-    0x00, 0xb0, 0x0d, 0x00, 0x01, 0xc1, 0x00, 0x00,
-    /* PAT */
-    0x00, 0x01, 0xf0, 0x01,
-    /* CRC */
-    0x2e, 0x70, 0x19, 0x05,
-    /* stuffing 167 bytes */
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-
-    /* TS */
-    0x47, 0x50, 0x01, 0x10, 0x00,
-    /* PSI */
-    0x02, 0xb0, 0x17, 0x00, 0x01, 0xc1, 0x00, 0x00,
-    /* PMT */
-    0xe1, 0x00,
-    0xf0, 0x00,
-    0x1b, 0xe1, 0x00, 0xf0, 0x00, /* h264 */
-    0x0f, 0xe1, 0x01, 0xf0, 0x00, /* aac */
-    /*0x03, 0xe1, 0x01, 0xf0, 0x00,*/ /* mp3 */
-    /* CRC */
-    0x2f, 0x44, 0xb9, 0x9b, /* crc for aac */
-    /*0x4e, 0x59, 0x3d, 0x1e,*/ /* crc for mp3 */
-    /* stuffing 157 bytes */
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
-
-
-/* 700 ms PCR delay */
-#define NGX_RTMP_HLS_DELAY  63000
-
-
-static ngx_int_t
-ngx_rtmp_mpegts_write_file(ngx_rtmp_mpegts_file_t *file, u_char *in,
-    size_t in_size)
-{
-    u_char   *out;
-    size_t    out_size, n;
-    ssize_t   rc;
-
-    static u_char  buf[1024];
-
-    if (!file->encrypt) {
-        ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
-                       "mpegts: write %uz bytes", in_size);
-
-        rc = ngx_write_fd(file->fd, in, in_size);
-        if (rc < 0) {
-            return NGX_ERROR;
-        }
-
-        return NGX_OK;
-    }
-
-    /* encrypt */
-
-    ngx_log_debug1(NGX_LOG_DEBUG_CORE, file->log, 0,
-                   "mpegts: write %uz encrypted bytes", in_size);
-
-    out = buf;
-    out_size = sizeof(buf);
-
-    if (file->size > 0 && file->size + in_size >= 16) {
-        ngx_memcpy(file->buf + file->size, in, 16 - file->size);
-
-        in += 16 - file->size;
-        in_size -= 16 - file->size;
-
-        AES_cbc_encrypt(file->buf, out, 16, &file->key, file->iv, AES_ENCRYPT);
-
-        out += 16;
-        out_size -= 16;
-
-        file->size = 0;
-    }
-
-    for ( ;; ) {
-        n = in_size & ~0x0f;
-
-        if (n > 0) {
-            if (n > out_size) {
-                n = out_size;
-            }
-
-            AES_cbc_encrypt(in, out, n, &file->key, file->iv, AES_ENCRYPT);
-
-            in += n;
-            in_size -= n;
-
-        } else if (out == buf) {
-            break;
-        }
-
-        rc = ngx_write_fd(file->fd, buf, out - buf + n);
-        if (rc < 0) {
-            return NGX_ERROR;
-        }
-
-        out = buf;
-        out_size = sizeof(buf);
-    }
-
-    if (in_size) {
-        ngx_memcpy(file->buf + file->size, in, in_size);
-        file->size += in_size;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mpegts_write_header(ngx_rtmp_mpegts_file_t *file)
-{
-    return ngx_rtmp_mpegts_write_file(file, ngx_rtmp_mpegts_header,
-                                      sizeof(ngx_rtmp_mpegts_header));
-}
-
-
-static u_char *
-ngx_rtmp_mpegts_write_pcr(u_char *p, uint64_t pcr)
-{
-    *p++ = (u_char) (pcr >> 25);
-    *p++ = (u_char) (pcr >> 17);
-    *p++ = (u_char) (pcr >> 9);
-    *p++ = (u_char) (pcr >> 1);
-    *p++ = (u_char) (pcr << 7 | 0x7e);
-    *p++ = 0;
-
-    return p;
-}
-
-
-static u_char *
-ngx_rtmp_mpegts_write_pts(u_char *p, ngx_uint_t fb, uint64_t pts)
-{
-    ngx_uint_t val;
-
-    val = fb << 4 | (((pts >> 30) & 0x07) << 1) | 1;
-    *p++ = (u_char) val;
-
-    val = (((pts >> 15) & 0x7fff) << 1) | 1;
-    *p++ = (u_char) (val >> 8);
-    *p++ = (u_char) val;
-
-    val = (((pts) & 0x7fff) << 1) | 1;
-    *p++ = (u_char) (val >> 8);
-    *p++ = (u_char) val;
-
-    return p;
-}
-
-
-ngx_int_t
-ngx_rtmp_mpegts_write_frame(ngx_rtmp_mpegts_file_t *file,
-    ngx_rtmp_mpegts_frame_t *f, ngx_buf_t *b)
-{
-    ngx_uint_t  pes_size, header_size, body_size, in_size, stuff_size, flags;
-    u_char      packet[188], *p, *base;
-    ngx_int_t   first, rc;
-
-    ngx_log_debug6(NGX_LOG_DEBUG_CORE, file->log, 0,
-                   "mpegts: pid=%ui, sid=%ui, pts=%uL, "
-                   "dts=%uL, key=%ui, size=%ui",
-                   f->pid, f->sid, f->pts, f->dts,
-                   (ngx_uint_t) f->key, (size_t) (b->last - b->pos));
-
-    first = 1;
-
-    while (b->pos < b->last) {
-        p = packet;
-
-        f->cc++;
-
-        *p++ = 0x47;
-        *p++ = (u_char) (f->pid >> 8);
-
-        if (first) {
-            p[-1] |= 0x40;
-        }
-
-        *p++ = (u_char) f->pid;
-        *p++ = 0x10 | (f->cc & 0x0f); /* payload */
-
-        if (first) {
-
-            if (f->key) {
-                packet[3] |= 0x20; /* adaptation */
-
-                *p++ = 7;    /* size */
-                *p++ = 0x50; /* random access + PCR */
-
-                p = ngx_rtmp_mpegts_write_pcr(p, f->dts - NGX_RTMP_HLS_DELAY);
-            }
-
-            /* PES header */
-
-            *p++ = 0x00;
-            *p++ = 0x00;
-            *p++ = 0x01;
-            *p++ = (u_char) f->sid;
-
-            header_size = 5;
-            flags = 0x80; /* PTS */
-
-            if (f->dts != f->pts) {
-                header_size += 5;
-                flags |= 0x40; /* DTS */
-            }
-
-            pes_size = (b->last - b->pos) + header_size + 3;
-            if (pes_size > 0xffff) {
-                pes_size = 0;
-            }
-
-            *p++ = (u_char) (pes_size >> 8);
-            *p++ = (u_char) pes_size;
-            *p++ = 0x80; /* H222 */
-            *p++ = (u_char) flags;
-            *p++ = (u_char) header_size;
-
-            p = ngx_rtmp_mpegts_write_pts(p, flags >> 6, f->pts +
-                                                         NGX_RTMP_HLS_DELAY);
-
-            if (f->dts != f->pts) {
-                p = ngx_rtmp_mpegts_write_pts(p, 1, f->dts +
-                                                    NGX_RTMP_HLS_DELAY);
-            }
-
-            first = 0;
-        }
-
-        body_size = (ngx_uint_t) (packet + sizeof(packet) - p);
-        in_size = (ngx_uint_t) (b->last - b->pos);
-
-        if (body_size <= in_size) {
-            ngx_memcpy(p, b->pos, body_size);
-            b->pos += body_size;
-
-        } else {
-            stuff_size = (body_size - in_size);
-
-            if (packet[3] & 0x20) {
-
-                /* has adaptation */
-
-                base = &packet[5] + packet[4];
-                p = ngx_movemem(base + stuff_size, base, p - base);
-                ngx_memset(base, 0xff, stuff_size);
-                packet[4] += (u_char) stuff_size;
-
-            } else {
-
-                /* no adaptation */
-
-                packet[3] |= 0x20;
-                p = ngx_movemem(&packet[4] + stuff_size, &packet[4],
-                                p - &packet[4]);
-
-                packet[4] = (u_char) (stuff_size - 1);
-                if (stuff_size >= 2) {
-                    packet[5] = 0;
-                    ngx_memset(&packet[6], 0xff, stuff_size - 2);
-                }
-            }
-
-            ngx_memcpy(p, b->pos, in_size);
-            b->pos = b->last;
-        }
-
-        rc = ngx_rtmp_mpegts_write_file(file, packet, sizeof(packet));
-        if (rc != NGX_OK) {
-            return rc;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file,
-    u_char *key, size_t key_len, uint64_t iv)
-{
-    if (AES_set_encrypt_key(key, key_len * 8, &file->key)) {
-        return NGX_ERROR;
-    }
-
-    ngx_memzero(file->iv, 8);
-
-    file->iv[8]  = (u_char) (iv >> 56);
-    file->iv[9]  = (u_char) (iv >> 48);
-    file->iv[10] = (u_char) (iv >> 40);
-    file->iv[11] = (u_char) (iv >> 32);
-    file->iv[12] = (u_char) (iv >> 24);
-    file->iv[13] = (u_char) (iv >> 16);
-    file->iv[14] = (u_char) (iv >> 8);
-    file->iv[15] = (u_char) (iv);
-
-    file->encrypt = 1;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
-    ngx_log_t *log)
-{
-    file->log = log;
-
-    file->fd = ngx_open_file(path, NGX_FILE_WRONLY, NGX_FILE_TRUNCATE,
-                             NGX_FILE_DEFAULT_ACCESS);
-
-    if (file->fd == NGX_INVALID_FILE) {
-        ngx_log_error(NGX_LOG_ERR, log, ngx_errno,
-                      "hls: error creating fragment file");
-        return NGX_ERROR;
-    }
-
-    file->size = 0;
-
-    if (ngx_rtmp_mpegts_write_header(file) != NGX_OK) {
-        ngx_log_error(NGX_LOG_ERR, log, ngx_errno,
-                      "hls: error writing fragment header");
-        ngx_close_file(file->fd);
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_mpegts_close_file(ngx_rtmp_mpegts_file_t *file)
-{
-    u_char   buf[16];
-    ssize_t  rc;
-
-    if (file->encrypt) {
-        ngx_memset(file->buf + file->size, 16 - file->size, 16 - file->size);
-
-        AES_cbc_encrypt(file->buf, buf, 16, &file->key, file->iv, AES_ENCRYPT);
-
-        rc = ngx_write_fd(file->fd, buf, 16);
-        if (rc < 0) {
-            return NGX_ERROR;
-        }
-    }
-
-    ngx_close_file(file->fd);
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/hls/ngx_rtmp_mpegts.h b/debian/modules/rtmp/hls/ngx_rtmp_mpegts.h
deleted file mode 100644
index c128a51..0000000
--- a/debian/modules/rtmp/hls/ngx_rtmp_mpegts.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_MPEGTS_H_INCLUDED_
-#define _NGX_RTMP_MPEGTS_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <openssl/aes.h>
-
-
-typedef struct {
-    ngx_fd_t    fd;
-    ngx_log_t  *log;
-    unsigned    encrypt:1;
-    unsigned    size:4;
-    u_char      buf[16];
-    u_char      iv[16];
-    AES_KEY     key;
-} ngx_rtmp_mpegts_file_t;
-
-
-typedef struct {
-    uint64_t    pts;
-    uint64_t    dts;
-    ngx_uint_t  pid;
-    ngx_uint_t  sid;
-    ngx_uint_t  cc;
-    unsigned    key:1;
-} ngx_rtmp_mpegts_frame_t;
-
-
-ngx_int_t ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file,
-    u_char *key, size_t key_len, uint64_t iv);
-ngx_int_t ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
-    ngx_log_t *log);
-ngx_int_t ngx_rtmp_mpegts_close_file(ngx_rtmp_mpegts_file_t *file);
-ngx_int_t ngx_rtmp_mpegts_write_frame(ngx_rtmp_mpegts_file_t *file,
-    ngx_rtmp_mpegts_frame_t *f, ngx_buf_t *b);
-
-
-#endif /* _NGX_RTMP_MPEGTS_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp.c b/debian/modules/rtmp/ngx_rtmp.c
deleted file mode 100644
index 7d504a0..0000000
--- a/debian/modules/rtmp/ngx_rtmp.c
+++ /dev/null
@@ -1,861 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_event.h>
-#include <nginx.h>
-#include "ngx_rtmp.h"
-
-
-static char *ngx_rtmp_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-static ngx_int_t ngx_rtmp_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
-    ngx_rtmp_listen_t *listen);
-static char *ngx_rtmp_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports);
-static ngx_int_t ngx_rtmp_add_addrs(ngx_conf_t *cf, ngx_rtmp_port_t *mport,
-    ngx_rtmp_conf_addr_t *addr);
-#if (NGX_HAVE_INET6)
-static ngx_int_t ngx_rtmp_add_addrs6(ngx_conf_t *cf, ngx_rtmp_port_t *mport,
-    ngx_rtmp_conf_addr_t *addr);
-#endif
-static ngx_int_t ngx_rtmp_cmp_conf_addrs(const void *one, const void *two);
-static ngx_int_t ngx_rtmp_init_events(ngx_conf_t *cf,
-        ngx_rtmp_core_main_conf_t *cmcf);
-static ngx_int_t ngx_rtmp_init_event_handlers(ngx_conf_t *cf,
-        ngx_rtmp_core_main_conf_t *cmcf);
-static char * ngx_rtmp_merge_applications(ngx_conf_t *cf,
-        ngx_array_t *applications, void **app_conf, ngx_rtmp_module_t *module,
-        ngx_uint_t ctx_index);
-static ngx_int_t ngx_rtmp_init_process(ngx_cycle_t *cycle);
-
-
-#if (nginx_version >= 1007011)
-ngx_queue_t                         ngx_rtmp_init_queue;
-#elif (nginx_version >= 1007005)
-ngx_thread_volatile ngx_queue_t     ngx_rtmp_init_queue;
-#else
-ngx_thread_volatile ngx_event_t    *ngx_rtmp_init_queue;
-#endif
-
-
-ngx_uint_t  ngx_rtmp_max_module;
-
-
-static ngx_command_t  ngx_rtmp_commands[] = {
-
-    { ngx_string("rtmp"),
-      NGX_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_rtmp_block,
-      0,
-      0,
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_core_module_t  ngx_rtmp_module_ctx = {
-    ngx_string("rtmp"),
-    NULL,
-    NULL
-};
-
-
-ngx_module_t  ngx_rtmp_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_module_ctx,                  /* module context */
-    ngx_rtmp_commands,                     /* module directives */
-    NGX_CORE_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    ngx_rtmp_init_process,                 /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static char *
-ngx_rtmp_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char                        *rv;
-    ngx_uint_t                   i, m, mi, s;
-    ngx_conf_t                   pcf;
-    ngx_array_t                  ports;
-    ngx_module_t               **modules;
-    ngx_rtmp_listen_t           *listen;
-    ngx_rtmp_module_t           *module;
-    ngx_rtmp_conf_ctx_t         *ctx;
-    ngx_rtmp_core_srv_conf_t    *cscf, **cscfp;
-    ngx_rtmp_core_main_conf_t   *cmcf;
-
-    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
-    if (ctx == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    *(ngx_rtmp_conf_ctx_t **) conf = ctx;
-
-    /* count the number of the rtmp modules and set up their indices */
-
-#if (nginx_version >= 1009011)
-
-    ngx_rtmp_max_module = ngx_count_modules(cf->cycle, NGX_RTMP_MODULE);
-
-#else
-
-    ngx_rtmp_max_module = 0;
-    for (m = 0; ngx_modules[m]; m++) {
-        if (ngx_modules[m]->type != NGX_RTMP_MODULE) {
-            continue;
-        }
-
-        ngx_modules[m]->ctx_index = ngx_rtmp_max_module++;
-    }
-
-#endif
-
-
-    /* the rtmp main_conf context, it is the same in the all rtmp contexts */
-
-    ctx->main_conf = ngx_pcalloc(cf->pool,
-                                 sizeof(void *) * ngx_rtmp_max_module);
-    if (ctx->main_conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-
-    /*
-     * the rtmp null srv_conf context, it is used to merge
-     * the server{}s' srv_conf's
-     */
-
-    ctx->srv_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
-    if (ctx->srv_conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-
-    /*
-     * the rtmp null app_conf context, it is used to merge
-     * the server{}s' app_conf's
-     */
-
-    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
-    if (ctx->app_conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-
-    /*
-     * create the main_conf's, the null srv_conf's, and the null app_conf's
-     * of the all rtmp modules
-     */
-
-#if (nginx_version >= 1009011)
-    modules = cf->cycle->modules;
-#else
-    modules = ngx_modules;
-#endif
-
-    for (m = 0; modules[m]; m++) {
-        if (modules[m]->type != NGX_RTMP_MODULE) {
-            continue;
-        }
-
-        module = modules[m]->ctx;
-        mi = modules[m]->ctx_index;
-
-        if (module->create_main_conf) {
-            ctx->main_conf[mi] = module->create_main_conf(cf);
-            if (ctx->main_conf[mi] == NULL) {
-                return NGX_CONF_ERROR;
-            }
-        }
-
-        if (module->create_srv_conf) {
-            ctx->srv_conf[mi] = module->create_srv_conf(cf);
-            if (ctx->srv_conf[mi] == NULL) {
-                return NGX_CONF_ERROR;
-            }
-        }
-
-        if (module->create_app_conf) {
-            ctx->app_conf[mi] = module->create_app_conf(cf);
-            if (ctx->app_conf[mi] == NULL) {
-                return NGX_CONF_ERROR;
-            }
-        }
-    }
-
-    pcf = *cf;
-    cf->ctx = ctx;
-
-    for (m = 0; modules[m]; m++) {
-        if (modules[m]->type != NGX_RTMP_MODULE) {
-            continue;
-        }
-
-        module = modules[m]->ctx;
-
-        if (module->preconfiguration) {
-            if (module->preconfiguration(cf) != NGX_OK) {
-                return NGX_CONF_ERROR;
-            }
-        }
-    }
-
-    /* parse inside the rtmp{} block */
-
-    cf->module_type = NGX_RTMP_MODULE;
-    cf->cmd_type = NGX_RTMP_MAIN_CONF;
-    rv = ngx_conf_parse(cf, NULL);
-
-    if (rv != NGX_CONF_OK) {
-        *cf = pcf;
-        return rv;
-    }
-
-
-    /* init rtmp{} main_conf's, merge the server{}s' srv_conf's */
-
-    cmcf = ctx->main_conf[ngx_rtmp_core_module.ctx_index];
-    cscfp = cmcf->servers.elts;
-
-    for (m = 0; modules[m]; m++) {
-        if (modules[m]->type != NGX_RTMP_MODULE) {
-            continue;
-        }
-
-        module = modules[m]->ctx;
-        mi = modules[m]->ctx_index;
-
-        /* init rtmp{} main_conf's */
-
-        cf->ctx = ctx;
-
-        if (module->init_main_conf) {
-            rv = module->init_main_conf(cf, ctx->main_conf[mi]);
-            if (rv != NGX_CONF_OK) {
-                *cf = pcf;
-                return rv;
-            }
-        }
-
-        for (s = 0; s < cmcf->servers.nelts; s++) {
-
-            /* merge the server{}s' srv_conf's */
-
-            cf->ctx = cscfp[s]->ctx;
-
-            if (module->merge_srv_conf) {
-                rv = module->merge_srv_conf(cf,
-                                            ctx->srv_conf[mi],
-                                            cscfp[s]->ctx->srv_conf[mi]);
-                if (rv != NGX_CONF_OK) {
-                    *cf = pcf;
-                    return rv;
-                }
-            }
-
-            if (module->merge_app_conf) {
-
-                /* merge the server{}'s app_conf */
-
-                /*ctx->app_conf = cscfp[s]->ctx->loc_conf;*/
-
-                rv = module->merge_app_conf(cf,
-                                            ctx->app_conf[mi],
-                                            cscfp[s]->ctx->app_conf[mi]);
-                if (rv != NGX_CONF_OK) {
-                    *cf = pcf;
-                    return rv;
-                }
-
-                /* merge the applications{}' app_conf's */
-
-                cscf = cscfp[s]->ctx->srv_conf[ngx_rtmp_core_module.ctx_index];
-
-                rv = ngx_rtmp_merge_applications(cf, &cscf->applications,
-                                            cscfp[s]->ctx->app_conf,
-                                            module, mi);
-                if (rv != NGX_CONF_OK) {
-                    *cf = pcf;
-                    return rv;
-                }
-            }
-
-        }
-    }
-
-
-    if (ngx_rtmp_init_events(cf, cmcf) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    for (m = 0; modules[m]; m++) {
-        if (modules[m]->type != NGX_RTMP_MODULE) {
-            continue;
-        }
-
-        module = modules[m]->ctx;
-
-        if (module->postconfiguration) {
-            if (module->postconfiguration(cf) != NGX_OK) {
-                return NGX_CONF_ERROR;
-            }
-        }
-    }
-
-    *cf = pcf;
-
-    if (ngx_rtmp_init_event_handlers(cf, cmcf) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (ngx_array_init(&ports, cf->temp_pool, 4, sizeof(ngx_rtmp_conf_port_t))
-        != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
-    listen = cmcf->listen.elts;
-
-    for (i = 0; i < cmcf->listen.nelts; i++) {
-        if (ngx_rtmp_add_ports(cf, &ports, &listen[i]) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    return ngx_rtmp_optimize_servers(cf, &ports);
-}
-
-
-static char *
-ngx_rtmp_merge_applications(ngx_conf_t *cf, ngx_array_t *applications,
-            void **app_conf, ngx_rtmp_module_t *module, ngx_uint_t ctx_index)
-{
-    char                           *rv;
-    ngx_rtmp_conf_ctx_t            *ctx, saved;
-    ngx_rtmp_core_app_conf_t      **cacfp;
-    ngx_uint_t                      n;
-    ngx_rtmp_core_app_conf_t       *cacf;
-
-    if (applications == NULL) {
-        return NGX_CONF_OK;
-    }
-
-    ctx = (ngx_rtmp_conf_ctx_t *) cf->ctx;
-    saved = *ctx;
-
-    cacfp = applications->elts;
-    for (n = 0; n < applications->nelts; ++n, ++cacfp) {
-
-        ctx->app_conf = (*cacfp)->app_conf;
-
-        rv = module->merge_app_conf(cf, app_conf[ctx_index],
-                (*cacfp)->app_conf[ctx_index]);
-        if (rv != NGX_CONF_OK) {
-            return rv;
-        }
-
-        cacf = (*cacfp)->app_conf[ngx_rtmp_core_module.ctx_index];
-        rv = ngx_rtmp_merge_applications(cf, &cacf->applications,
-                                         (*cacfp)->app_conf,
-                                         module, ctx_index);
-        if (rv != NGX_CONF_OK) {
-            return rv;
-        }
-    }
-
-    *ctx = saved;
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_init_events(ngx_conf_t *cf, ngx_rtmp_core_main_conf_t *cmcf)
-{
-    size_t                      n;
-
-    for(n = 0; n < NGX_RTMP_MAX_EVENT; ++n) {
-        if (ngx_array_init(&cmcf->events[n], cf->pool, 1,
-                sizeof(ngx_rtmp_handler_pt)) != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    if (ngx_array_init(&cmcf->amf, cf->pool, 1,
-                sizeof(ngx_rtmp_amf_handler_t)) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_init_event_handlers(ngx_conf_t *cf, ngx_rtmp_core_main_conf_t *cmcf)
-{
-    ngx_hash_init_t             calls_hash;
-    ngx_rtmp_handler_pt        *eh;
-    ngx_rtmp_amf_handler_t     *h;
-    ngx_hash_key_t             *ha;
-    size_t                      n, m;
-
-    static size_t               pm_events[] = {
-        NGX_RTMP_MSG_CHUNK_SIZE,
-        NGX_RTMP_MSG_ABORT,
-        NGX_RTMP_MSG_ACK,
-        NGX_RTMP_MSG_ACK_SIZE,
-        NGX_RTMP_MSG_BANDWIDTH
-    };
-
-    static size_t               amf_events[] = {
-        NGX_RTMP_MSG_AMF_CMD,
-        NGX_RTMP_MSG_AMF_META,
-        NGX_RTMP_MSG_AMF_SHARED,
-        NGX_RTMP_MSG_AMF3_CMD,
-        NGX_RTMP_MSG_AMF3_META,
-        NGX_RTMP_MSG_AMF3_SHARED
-    };
-
-    /* init standard protocol events */
-    for(n = 0; n < sizeof(pm_events) / sizeof(pm_events[0]); ++n) {
-        eh = ngx_array_push(&cmcf->events[pm_events[n]]);
-        *eh = ngx_rtmp_protocol_message_handler;
-    }
-
-    /* init amf events */
-    for(n = 0; n < sizeof(amf_events) / sizeof(amf_events[0]); ++n) {
-        eh = ngx_array_push(&cmcf->events[amf_events[n]]);
-        *eh = ngx_rtmp_amf_message_handler;
-    }
-
-    /* init user protocol events */
-    eh = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_USER]);
-    *eh = ngx_rtmp_user_message_handler;
-
-    /* aggregate to audio/video map */
-    eh = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AGGREGATE]);
-    *eh = ngx_rtmp_aggregate_message_handler;
-
-    /* init amf callbacks */
-    ngx_array_init(&cmcf->amf_arrays, cf->pool, 1, sizeof(ngx_hash_key_t));
-
-    h = cmcf->amf.elts;
-    for(n = 0; n < cmcf->amf.nelts; ++n, ++h) {
-        ha = cmcf->amf_arrays.elts;
-        for(m = 0; m < cmcf->amf_arrays.nelts; ++m, ++ha) {
-            if (h->name.len == ha->key.len
-                    && !ngx_strncmp(h->name.data, ha->key.data, ha->key.len))
-            {
-                break;
-            }
-        }
-        if (m == cmcf->amf_arrays.nelts) {
-            ha = ngx_array_push(&cmcf->amf_arrays);
-            ha->key = h->name;
-            ha->key_hash = ngx_hash_key_lc(ha->key.data, ha->key.len);
-            ha->value = ngx_array_create(cf->pool, 1,
-                    sizeof(ngx_rtmp_handler_pt));
-            if (ha->value == NULL) {
-                return NGX_ERROR;
-            }
-        }
-
-        eh = ngx_array_push((ngx_array_t*)ha->value);
-        *eh = h->handler;
-    }
-
-    calls_hash.hash = &cmcf->amf_hash;
-    calls_hash.key = ngx_hash_key_lc;
-    calls_hash.max_size = 512;
-    calls_hash.bucket_size = ngx_cacheline_size;
-    calls_hash.name = "amf_hash";
-    calls_hash.pool = cf->pool;
-    calls_hash.temp_pool = NULL;
-
-    if (ngx_hash_init(&calls_hash, cmcf->amf_arrays.elts, cmcf->amf_arrays.nelts)
-            != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
-    ngx_rtmp_listen_t *listen)
-{
-    in_port_t              p;
-    ngx_uint_t             i;
-    struct sockaddr       *sa;
-    struct sockaddr_in    *sin;
-    ngx_rtmp_conf_port_t  *port;
-    ngx_rtmp_conf_addr_t  *addr;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6   *sin6;
-#endif
-
-    sa = (struct sockaddr *) &listen->sockaddr;
-
-    switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) sa;
-        p = sin6->sin6_port;
-        break;
-#endif
-
-    default: /* AF_INET */
-        sin = (struct sockaddr_in *) sa;
-        p = sin->sin_port;
-        break;
-    }
-
-    port = ports->elts;
-    for (i = 0; i < ports->nelts; i++) {
-        if (p == port[i].port && sa->sa_family == port[i].family) {
-
-            /* a port is already in the port list */
-
-            port = &port[i];
-            goto found;
-        }
-    }
-
-    /* add a port to the port list */
-
-    port = ngx_array_push(ports);
-    if (port == NULL) {
-        return NGX_ERROR;
-    }
-
-    port->family = sa->sa_family;
-    port->port = p;
-
-    if (ngx_array_init(&port->addrs, cf->temp_pool, 2,
-                       sizeof(ngx_rtmp_conf_addr_t))
-        != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-found:
-
-    addr = ngx_array_push(&port->addrs);
-    if (addr == NULL) {
-        return NGX_ERROR;
-    }
-
-    addr->sockaddr = (struct sockaddr *) &listen->sockaddr;
-    addr->socklen = listen->socklen;
-    addr->ctx = listen->ctx;
-    addr->bind = listen->bind;
-    addr->wildcard = listen->wildcard;
-    addr->so_keepalive = listen->so_keepalive;
-    addr->proxy_protocol = listen->proxy_protocol;
-#if (NGX_HAVE_KEEPALIVE_TUNABLE)
-    addr->tcp_keepidle = listen->tcp_keepidle;
-    addr->tcp_keepintvl = listen->tcp_keepintvl;
-    addr->tcp_keepcnt = listen->tcp_keepcnt;
-#endif
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-    addr->ipv6only = listen->ipv6only;
-#endif
-
-    return NGX_OK;
-}
-
-
-static char *
-ngx_rtmp_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
-{
-    ngx_uint_t             i, p, last, bind_wildcard;
-    ngx_listening_t       *ls;
-    ngx_rtmp_port_t       *mport;
-    ngx_rtmp_conf_port_t  *port;
-    ngx_rtmp_conf_addr_t  *addr;
-
-    port = ports->elts;
-    for (p = 0; p < ports->nelts; p++) {
-
-        ngx_sort(port[p].addrs.elts, (size_t) port[p].addrs.nelts,
-                 sizeof(ngx_rtmp_conf_addr_t), ngx_rtmp_cmp_conf_addrs);
-
-        addr = port[p].addrs.elts;
-        last = port[p].addrs.nelts;
-
-        /*
-         * if there is the binding to the "*:port" then we need to bind()
-         * to the "*:port" only and ignore the other bindings
-         */
-
-        if (addr[last - 1].wildcard) {
-            addr[last - 1].bind = 1;
-            bind_wildcard = 1;
-
-        } else {
-            bind_wildcard = 0;
-        }
-
-        i = 0;
-
-        while (i < last) {
-
-            if (bind_wildcard && !addr[i].bind) {
-                i++;
-                continue;
-            }
-
-            ls = ngx_create_listening(cf, addr[i].sockaddr, addr[i].socklen);
-            if (ls == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            ls->addr_ntop = 1;
-            ls->handler = ngx_rtmp_init_connection;
-            ls->pool_size = 4096;
-
-            /* TODO: error_log directive */
-            ls->logp = &cf->cycle->new_log;
-            ls->log.data = &ls->addr_text;
-            ls->log.handler = ngx_accept_log_error;
-
-            ls->keepalive = addr[i].so_keepalive;
-#if (NGX_HAVE_KEEPALIVE_TUNABLE)
-            ls->keepidle = addr[i].tcp_keepidle;
-            ls->keepintvl = addr[i].tcp_keepintvl;
-            ls->keepcnt = addr[i].tcp_keepcnt;
-#endif
-
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-            ls->ipv6only = addr[i].ipv6only;
-#endif
-
-            mport = ngx_palloc(cf->pool, sizeof(ngx_rtmp_port_t));
-            if (mport == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            ls->servers = mport;
-
-            if (i == last - 1) {
-                mport->naddrs = last;
-
-            } else {
-                mport->naddrs = 1;
-                i = 0;
-            }
-
-            switch (ls->sockaddr->sa_family) {
-#if (NGX_HAVE_INET6)
-            case AF_INET6:
-                if (ngx_rtmp_add_addrs6(cf, mport, addr) != NGX_OK) {
-                    return NGX_CONF_ERROR;
-                }
-                break;
-#endif
-            default: /* AF_INET */
-                if (ngx_rtmp_add_addrs(cf, mport, addr) != NGX_OK) {
-                    return NGX_CONF_ERROR;
-                }
-                break;
-            }
-
-            addr++;
-            last--;
-        }
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_add_addrs(ngx_conf_t *cf, ngx_rtmp_port_t *mport,
-    ngx_rtmp_conf_addr_t *addr)
-{
-    u_char              *p;
-    size_t               len;
-    ngx_uint_t           i;
-    ngx_rtmp_in_addr_t  *addrs;
-    struct sockaddr_in  *sin;
-    u_char               buf[NGX_SOCKADDR_STRLEN];
-
-    mport->addrs = ngx_pcalloc(cf->pool,
-                               mport->naddrs * sizeof(ngx_rtmp_in_addr_t));
-    if (mport->addrs == NULL) {
-        return NGX_ERROR;
-    }
-
-    addrs = mport->addrs;
-
-    for (i = 0; i < mport->naddrs; i++) {
-
-        sin = (struct sockaddr_in *) addr[i].sockaddr;
-        addrs[i].addr = sin->sin_addr.s_addr;
-
-        addrs[i].conf.ctx = addr[i].ctx;
-
-        len = ngx_sock_ntop(addr[i].sockaddr,
-#if (nginx_version >= 1005003)
-                            addr[i].socklen,
-#endif
-                            buf, NGX_SOCKADDR_STRLEN, 1);
-
-        p = ngx_pnalloc(cf->pool, len);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(p, buf, len);
-
-        addrs[i].conf.addr_text.len = len;
-        addrs[i].conf.addr_text.data = p;
-        addrs[i].conf.proxy_protocol = addr->proxy_protocol;
-    }
-
-    return NGX_OK;
-}
-
-
-#if (NGX_HAVE_INET6)
-
-static ngx_int_t
-ngx_rtmp_add_addrs6(ngx_conf_t *cf, ngx_rtmp_port_t *mport,
-    ngx_rtmp_conf_addr_t *addr)
-{
-    u_char               *p;
-    size_t                len;
-    ngx_uint_t            i;
-    ngx_rtmp_in6_addr_t  *addrs6;
-    struct sockaddr_in6  *sin6;
-    u_char                buf[NGX_SOCKADDR_STRLEN];
-
-    mport->addrs = ngx_pcalloc(cf->pool,
-                               mport->naddrs * sizeof(ngx_rtmp_in6_addr_t));
-    if (mport->addrs == NULL) {
-        return NGX_ERROR;
-    }
-
-    addrs6 = mport->addrs;
-
-    for (i = 0; i < mport->naddrs; i++) {
-
-        sin6 = (struct sockaddr_in6 *) addr[i].sockaddr;
-        addrs6[i].addr6 = sin6->sin6_addr;
-
-        addrs6[i].conf.ctx = addr[i].ctx;
-
-        len = ngx_sock_ntop(addr[i].sockaddr,
-#if (nginx_version >= 1005003)
-                            addr[i].socklen,
-#endif
-                            buf, NGX_SOCKADDR_STRLEN, 1);
-
-        p = ngx_pnalloc(cf->pool, len);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(p, buf, len);
-
-        addrs6[i].conf.addr_text.len = len;
-        addrs6[i].conf.addr_text.data = p;
-        addrs6[i].conf.proxy_protocol = addr->proxy_protocol;
-    }
-
-    return NGX_OK;
-}
-
-#endif
-
-
-static ngx_int_t
-ngx_rtmp_cmp_conf_addrs(const void *one, const void *two)
-{
-    ngx_rtmp_conf_addr_t  *first, *second;
-
-    first = (ngx_rtmp_conf_addr_t *) one;
-    second = (ngx_rtmp_conf_addr_t *) two;
-
-    if (first->wildcard) {
-        /* a wildcard must be the last resort, shift it to the end */
-        return 1;
-    }
-
-    if (first->bind && !second->bind) {
-        /* shift explicit bind()ed addresses to the start */
-        return -1;
-    }
-
-    if (!first->bind && second->bind) {
-        /* shift explicit bind()ed addresses to the start */
-        return 1;
-    }
-
-    /* do not sort by default */
-
-    return 0;
-}
-
-
-ngx_int_t
-ngx_rtmp_fire_event(ngx_rtmp_session_t *s, ngx_uint_t evt,
-        ngx_rtmp_header_t *h, ngx_chain_t *in)
-{
-    ngx_rtmp_core_main_conf_t      *cmcf;
-    ngx_array_t                    *ch;
-    ngx_rtmp_handler_pt            *hh;
-    size_t                          n;
-
-    cmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_core_module);
-
-    ch = &cmcf->events[evt];
-    hh = ch->elts;
-    for(n = 0; n < ch->nelts; ++n, ++hh) {
-        if (*hh && (*hh)(s, h, in) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-    return NGX_OK;
-}
-
-
-void *
-ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n)
-{
-    u_char     *d, *s;
-
-    d = dst;
-    s = (u_char*)src + n - 1;
-
-    while(s >= (u_char*)src) {
-        *d++ = *s--;
-    }
-
-    return dst;
-}
-
-
-static ngx_int_t
-ngx_rtmp_init_process(ngx_cycle_t *cycle)
-{
-#if (nginx_version >= 1007005)
-    ngx_queue_init(&ngx_rtmp_init_queue);
-#endif
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp.h b/debian/modules/rtmp/ngx_rtmp.h
deleted file mode 100644
index cbe6a93..0000000
--- a/debian/modules/rtmp/ngx_rtmp.h
+++ /dev/null
@@ -1,624 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_H_INCLUDED_
-#define _NGX_RTMP_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_event.h>
-#include <ngx_event_connect.h>
-#include <nginx.h>
-
-#include "ngx_rtmp_amf.h"
-#include "ngx_rtmp_bandwidth.h"
-
-
-#if (NGX_WIN32)
-typedef __int8              int8_t;
-typedef unsigned __int8     uint8_t;
-#endif
-
-
-typedef struct {
-    void                  **main_conf;
-    void                  **srv_conf;
-    void                  **app_conf;
-} ngx_rtmp_conf_ctx_t;
-
-
-typedef struct {
-    u_char                  sockaddr[NGX_SOCKADDRLEN];
-    socklen_t               socklen;
-
-    /* server ctx */
-    ngx_rtmp_conf_ctx_t    *ctx;
-
-    unsigned                bind:1;
-    unsigned                wildcard:1;
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-    unsigned                ipv6only:2;
-#endif
-    unsigned                so_keepalive:2;
-    unsigned                proxy_protocol:1;
-#if (NGX_HAVE_KEEPALIVE_TUNABLE)
-    int                     tcp_keepidle;
-    int                     tcp_keepintvl;
-    int                     tcp_keepcnt;
-#endif
-} ngx_rtmp_listen_t;
-
-
-typedef struct {
-    ngx_rtmp_conf_ctx_t    *ctx;
-    ngx_str_t               addr_text;
-    unsigned                proxy_protocol:1;
-} ngx_rtmp_addr_conf_t;
-
-typedef struct {
-    in_addr_t               addr;
-    ngx_rtmp_addr_conf_t    conf;
-} ngx_rtmp_in_addr_t;
-
-
-#if (NGX_HAVE_INET6)
-
-typedef struct {
-    struct in6_addr         addr6;
-    ngx_rtmp_addr_conf_t    conf;
-} ngx_rtmp_in6_addr_t;
-
-#endif
-
-
-typedef struct {
-    void                   *addrs;
-    ngx_uint_t              naddrs;
-} ngx_rtmp_port_t;
-
-
-typedef struct {
-    int                     family;
-    in_port_t               port;
-    ngx_array_t             addrs;       /* array of ngx_rtmp_conf_addr_t */
-} ngx_rtmp_conf_port_t;
-
-
-typedef struct {
-    struct sockaddr        *sockaddr;
-    socklen_t               socklen;
-
-    ngx_rtmp_conf_ctx_t    *ctx;
-
-    unsigned                bind:1;
-    unsigned                wildcard:1;
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-    unsigned                ipv6only:2;
-#endif
-    unsigned                so_keepalive:2;
-    unsigned                proxy_protocol:1;
-#if (NGX_HAVE_KEEPALIVE_TUNABLE)
-    int                     tcp_keepidle;
-    int                     tcp_keepintvl;
-    int                     tcp_keepcnt;
-#endif
-} ngx_rtmp_conf_addr_t;
-
-
-#define NGX_RTMP_VERSION                3
-
-#define NGX_LOG_DEBUG_RTMP              NGX_LOG_DEBUG_CORE
-
-#define NGX_RTMP_DEFAULT_CHUNK_SIZE     128
-
-
-/* RTMP message types */
-#define NGX_RTMP_MSG_CHUNK_SIZE         1
-#define NGX_RTMP_MSG_ABORT              2
-#define NGX_RTMP_MSG_ACK                3
-#define NGX_RTMP_MSG_USER               4
-#define NGX_RTMP_MSG_ACK_SIZE           5
-#define NGX_RTMP_MSG_BANDWIDTH          6
-#define NGX_RTMP_MSG_EDGE               7
-#define NGX_RTMP_MSG_AUDIO              8
-#define NGX_RTMP_MSG_VIDEO              9
-#define NGX_RTMP_MSG_AMF3_META          15
-#define NGX_RTMP_MSG_AMF3_SHARED        16
-#define NGX_RTMP_MSG_AMF3_CMD           17
-#define NGX_RTMP_MSG_AMF_META           18
-#define NGX_RTMP_MSG_AMF_SHARED         19
-#define NGX_RTMP_MSG_AMF_CMD            20
-#define NGX_RTMP_MSG_AGGREGATE          22
-#define NGX_RTMP_MSG_MAX                22
-
-#define NGX_RTMP_MAX_CHUNK_SIZE         10485760
-
-#define NGX_RTMP_CONNECT                NGX_RTMP_MSG_MAX + 1
-#define NGX_RTMP_DISCONNECT             NGX_RTMP_MSG_MAX + 2
-#define NGX_RTMP_HANDSHAKE_DONE         NGX_RTMP_MSG_MAX + 3
-#define NGX_RTMP_MAX_EVENT              NGX_RTMP_MSG_MAX + 4
-
-
-/* RMTP control message types */
-#define NGX_RTMP_USER_STREAM_BEGIN      0
-#define NGX_RTMP_USER_STREAM_EOF        1
-#define NGX_RTMP_USER_STREAM_DRY        2
-#define NGX_RTMP_USER_SET_BUFLEN        3
-#define NGX_RTMP_USER_RECORDED          4
-#define NGX_RTMP_USER_PING_REQUEST      6
-#define NGX_RTMP_USER_PING_RESPONSE     7
-#define NGX_RTMP_USER_UNKNOWN           8
-#define NGX_RTMP_USER_BUFFER_END        31
-
-
-/* Chunk header:
- *   max 3  basic header
- * + max 11 message header
- * + max 4  extended header (timestamp) */
-#define NGX_RTMP_MAX_CHUNK_HEADER       18
-
-
-typedef struct {
-    uint32_t                csid;       /* chunk stream id */
-    uint32_t                timestamp;  /* timestamp (delta) */
-    uint32_t                mlen;       /* message length */
-    uint8_t                 type;       /* message type id */
-    uint32_t                msid;       /* message stream id */
-} ngx_rtmp_header_t;
-
-
-typedef struct {
-    ngx_rtmp_header_t       hdr;
-    uint32_t                dtime;
-    uint32_t                len;        /* current fragment length */
-    uint8_t                 ext;
-    ngx_chain_t            *in;
-} ngx_rtmp_stream_t;
-
-
-/* disable zero-sized array warning by msvc */
-
-#if (NGX_WIN32)
-#pragma warning(push)
-#pragma warning(disable:4200)
-#endif
-
-
-typedef struct {
-    uint32_t                signature;  /* "RTMP" */ /* <-- FIXME wtf */
-
-    ngx_event_t             close;
-
-    void                  **ctx;
-    void                  **main_conf;
-    void                  **srv_conf;
-    void                  **app_conf;
-
-    ngx_str_t              *addr_text;
-    int                     connected;
-
-#if (nginx_version >= 1007005)
-    ngx_queue_t             posted_dry_events;
-#else
-    ngx_event_t            *posted_dry_events;
-#endif
-
-    /* client buffer time in msec */
-    uint32_t                buflen;
-    uint32_t                ack_size;
-
-    /* connection parameters */
-    ngx_str_t               app;
-    ngx_str_t               args;
-    ngx_str_t               flashver;
-    ngx_str_t               swf_url;
-    ngx_str_t               tc_url;
-    uint32_t                acodecs;
-    uint32_t                vcodecs;
-    ngx_str_t               page_url;
-
-    /* handshake data */
-    ngx_buf_t              *hs_buf;
-    u_char                 *hs_digest;
-    unsigned                hs_old:1;
-    ngx_uint_t              hs_stage;
-
-    /* connection timestamps */
-    ngx_msec_t              epoch;
-    ngx_msec_t              peer_epoch;
-    ngx_msec_t              base_time;
-    uint32_t                current_time;
-
-    /* ping */
-    ngx_event_t             ping_evt;
-    unsigned                ping_active:1;
-    unsigned                ping_reset:1;
-
-    /* auto-pushed? */
-    unsigned                auto_pushed:1;
-    unsigned                relay:1;
-    unsigned                static_relay:1;
-
-    /* input stream 0 (reserved by RTMP spec)
-     * is used as free chain link */
-
-    ngx_rtmp_stream_t      *in_streams;
-    uint32_t                in_csid;
-    ngx_uint_t              in_chunk_size;
-    ngx_pool_t             *in_pool;
-    uint32_t                in_bytes;
-    uint32_t                in_last_ack;
-
-    ngx_pool_t             *in_old_pool;
-    ngx_int_t               in_chunk_size_changing;
-
-    ngx_connection_t       *connection;
-
-    /* circular buffer of RTMP message pointers */
-    ngx_msec_t              timeout;
-    uint32_t                out_bytes;
-    size_t                  out_pos, out_last;
-    ngx_chain_t            *out_chain;
-    u_char                 *out_bpos;
-    unsigned                out_buffer:1;
-    size_t                  out_queue;
-    size_t                  out_cork;
-    ngx_chain_t            *out[0];
-} ngx_rtmp_session_t;
-
-
-#if (NGX_WIN32)
-#pragma warning(pop)
-#endif
-
-
-/* handler result code:
- *  NGX_ERROR - error
- *  NGX_OK    - success, may continue
- *  NGX_DONE  - success, input parsed, reply sent; need no
- *      more calls on this event */
-typedef ngx_int_t (*ngx_rtmp_handler_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in);
-
-
-typedef struct {
-    ngx_str_t               name;
-    ngx_rtmp_handler_pt     handler;
-} ngx_rtmp_amf_handler_t;
-
-
-typedef struct {
-    ngx_array_t             servers;    /* ngx_rtmp_core_srv_conf_t */
-    ngx_array_t             listen;     /* ngx_rtmp_listen_t */
-
-    ngx_array_t             events[NGX_RTMP_MAX_EVENT];
-
-    ngx_hash_t              amf_hash;
-    ngx_array_t             amf_arrays;
-    ngx_array_t             amf;
-} ngx_rtmp_core_main_conf_t;
-
-
-/* global main conf for stats */
-extern ngx_rtmp_core_main_conf_t   *ngx_rtmp_core_main_conf;
-
-
-typedef struct ngx_rtmp_core_srv_conf_s {
-    ngx_array_t             applications; /* ngx_rtmp_core_app_conf_t */
-
-    ngx_msec_t              timeout;
-    ngx_msec_t              ping;
-    ngx_msec_t              ping_timeout;
-    ngx_flag_t              so_keepalive;
-    ngx_int_t               max_streams;
-
-    ngx_uint_t              ack_window;
-
-    ngx_int_t               chunk_size;
-    ngx_pool_t             *pool;
-    ngx_chain_t            *free;
-    ngx_chain_t            *free_hs;
-    size_t                  max_message;
-    ngx_flag_t              play_time_fix;
-    ngx_flag_t              publish_time_fix;
-    ngx_flag_t              busy;
-    size_t                  out_queue;
-    size_t                  out_cork;
-    ngx_msec_t              buflen;
-
-    ngx_rtmp_conf_ctx_t    *ctx;
-} ngx_rtmp_core_srv_conf_t;
-
-
-typedef struct {
-    ngx_array_t             applications; /* ngx_rtmp_core_app_conf_t */
-    ngx_str_t               name;
-    void                  **app_conf;
-} ngx_rtmp_core_app_conf_t;
-
-
-typedef struct {
-    ngx_str_t              *client;
-    ngx_rtmp_session_t     *session;
-} ngx_rtmp_error_log_ctx_t;
-
-
-typedef struct {
-    ngx_int_t             (*preconfiguration)(ngx_conf_t *cf);
-    ngx_int_t             (*postconfiguration)(ngx_conf_t *cf);
-
-    void                 *(*create_main_conf)(ngx_conf_t *cf);
-    char                 *(*init_main_conf)(ngx_conf_t *cf, void *conf);
-
-    void                 *(*create_srv_conf)(ngx_conf_t *cf);
-    char                 *(*merge_srv_conf)(ngx_conf_t *cf, void *prev,
-                                    void *conf);
-
-    void                 *(*create_app_conf)(ngx_conf_t *cf);
-    char                 *(*merge_app_conf)(ngx_conf_t *cf, void *prev,
-                                    void *conf);
-} ngx_rtmp_module_t;
-
-#define NGX_RTMP_MODULE                 0x504D5452     /* "RTMP" */
-
-#define NGX_RTMP_MAIN_CONF              0x02000000
-#define NGX_RTMP_SRV_CONF               0x04000000
-#define NGX_RTMP_APP_CONF               0x08000000
-#define NGX_RTMP_REC_CONF               0x10000000
-
-
-#define NGX_RTMP_MAIN_CONF_OFFSET  offsetof(ngx_rtmp_conf_ctx_t, main_conf)
-#define NGX_RTMP_SRV_CONF_OFFSET   offsetof(ngx_rtmp_conf_ctx_t, srv_conf)
-#define NGX_RTMP_APP_CONF_OFFSET   offsetof(ngx_rtmp_conf_ctx_t, app_conf)
-
-
-#define ngx_rtmp_get_module_ctx(s, module)     (s)->ctx[module.ctx_index]
-#define ngx_rtmp_set_ctx(s, c, module)         s->ctx[module.ctx_index] = c;
-#define ngx_rtmp_delete_ctx(s, module)         s->ctx[module.ctx_index] = NULL;
-
-
-#define ngx_rtmp_get_module_main_conf(s, module)                             \
-    (s)->main_conf[module.ctx_index]
-#define ngx_rtmp_get_module_srv_conf(s, module)  (s)->srv_conf[module.ctx_index]
-#define ngx_rtmp_get_module_app_conf(s, module)  ((s)->app_conf ? \
-    (s)->app_conf[module.ctx_index] : NULL)
-
-#define ngx_rtmp_conf_get_module_main_conf(cf, module)                       \
-    ((ngx_rtmp_conf_ctx_t *) cf->ctx)->main_conf[module.ctx_index]
-#define ngx_rtmp_conf_get_module_srv_conf(cf, module)                        \
-    ((ngx_rtmp_conf_ctx_t *) cf->ctx)->srv_conf[module.ctx_index]
-#define ngx_rtmp_conf_get_module_app_conf(cf, module)                        \
-    ((ngx_rtmp_conf_ctx_t *) cf->ctx)->app_conf[module.ctx_index]
-
-
-#ifdef NGX_DEBUG
-char* ngx_rtmp_message_type(uint8_t type);
-char* ngx_rtmp_user_message_type(uint16_t evt);
-#endif
-
-void ngx_rtmp_init_connection(ngx_connection_t *c);
-ngx_rtmp_session_t * ngx_rtmp_init_session(ngx_connection_t *c,
-     ngx_rtmp_addr_conf_t *addr_conf);
-void ngx_rtmp_finalize_session(ngx_rtmp_session_t *s);
-void ngx_rtmp_handshake(ngx_rtmp_session_t *s);
-void ngx_rtmp_client_handshake(ngx_rtmp_session_t *s, unsigned async);
-void ngx_rtmp_free_handshake_buffers(ngx_rtmp_session_t *s);
-void ngx_rtmp_cycle(ngx_rtmp_session_t *s);
-void ngx_rtmp_reset_ping(ngx_rtmp_session_t *s);
-ngx_int_t ngx_rtmp_fire_event(ngx_rtmp_session_t *s, ngx_uint_t evt,
-        ngx_rtmp_header_t *h, ngx_chain_t *in);
-
-
-ngx_int_t ngx_rtmp_set_chunk_size(ngx_rtmp_session_t *s, ngx_uint_t size);
-
-
-/* Bit reverse: we need big-endians in many places  */
-void * ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n);
-
-#define ngx_rtmp_rcpymem(dst, src, n) \
-    (((u_char*)ngx_rtmp_rmemcpy(dst, src, n)) + (n))
-
-
-static ngx_inline uint16_t
-ngx_rtmp_r16(uint16_t n)
-{
-    return (n << 8) | (n >> 8);
-}
-
-
-static ngx_inline uint32_t
-ngx_rtmp_r32(uint32_t n)
-{
-    return (n << 24) | ((n << 8) & 0xff0000) | ((n >> 8) & 0xff00) | (n >> 24);
-}
-
-
-static ngx_inline uint64_t
-ngx_rtmp_r64(uint64_t n)
-{
-    return (uint64_t) ngx_rtmp_r32((uint32_t) n) << 32 |
-                      ngx_rtmp_r32((uint32_t) (n >> 32));
-}
-
-
-/* Receiving messages */
-ngx_int_t ngx_rtmp_receive_message(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in);
-ngx_int_t ngx_rtmp_protocol_message_handler(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in);
-ngx_int_t ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in);
-ngx_int_t ngx_rtmp_aggregate_message_handler(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in);
-ngx_int_t ngx_rtmp_amf_message_handler(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in);
-ngx_int_t ngx_rtmp_amf_shared_object_handler(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in);
-
-
-/* Shared output buffers */
-
-/* Store refcount in negative bytes of shared buffer */
-
-#define NGX_RTMP_REFCOUNT_TYPE              uint32_t
-#define NGX_RTMP_REFCOUNT_BYTES             sizeof(NGX_RTMP_REFCOUNT_TYPE)
-
-#define ngx_rtmp_ref(b)                     \
-    *((NGX_RTMP_REFCOUNT_TYPE*)(b) - 1)
-
-#define ngx_rtmp_ref_set(b, v)              \
-    ngx_rtmp_ref(b) = v
-
-#define ngx_rtmp_ref_get(b)                 \
-    ++ngx_rtmp_ref(b)
-
-#define ngx_rtmp_ref_put(b)                 \
-    --ngx_rtmp_ref(b)
-
-ngx_chain_t * ngx_rtmp_alloc_shared_buf(ngx_rtmp_core_srv_conf_t *cscf);
-void ngx_rtmp_free_shared_chain(ngx_rtmp_core_srv_conf_t *cscf,
-        ngx_chain_t *in);
-ngx_chain_t * ngx_rtmp_append_shared_bufs(ngx_rtmp_core_srv_conf_t *cscf,
-        ngx_chain_t *head, ngx_chain_t *in);
-
-#define ngx_rtmp_acquire_shared_chain(in)   \
-    ngx_rtmp_ref_get(in);                   \
-
-
-/* Sending messages */
-void ngx_rtmp_prepare_message(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_rtmp_header_t *lh, ngx_chain_t *out);
-ngx_int_t ngx_rtmp_send_message(ngx_rtmp_session_t *s, ngx_chain_t *out,
-        ngx_uint_t priority);
-
-/* Note on priorities:
- * the bigger value the lower the priority.
- * priority=0 is the highest */
-
-
-#define NGX_RTMP_LIMIT_SOFT         0
-#define NGX_RTMP_LIMIT_HARD         1
-#define NGX_RTMP_LIMIT_DYNAMIC      2
-
-/* Protocol control messages */
-ngx_chain_t * ngx_rtmp_create_chunk_size(ngx_rtmp_session_t *s,
-        uint32_t chunk_size);
-ngx_chain_t * ngx_rtmp_create_abort(ngx_rtmp_session_t *s,
-        uint32_t csid);
-ngx_chain_t * ngx_rtmp_create_ack(ngx_rtmp_session_t *s,
-        uint32_t seq);
-ngx_chain_t * ngx_rtmp_create_ack_size(ngx_rtmp_session_t *s,
-        uint32_t ack_size);
-ngx_chain_t * ngx_rtmp_create_bandwidth(ngx_rtmp_session_t *s,
-        uint32_t ack_size, uint8_t limit_type);
-
-ngx_int_t ngx_rtmp_send_chunk_size(ngx_rtmp_session_t *s,
-        uint32_t chunk_size);
-ngx_int_t ngx_rtmp_send_abort(ngx_rtmp_session_t *s,
-        uint32_t csid);
-ngx_int_t ngx_rtmp_send_ack(ngx_rtmp_session_t *s,
-        uint32_t seq);
-ngx_int_t ngx_rtmp_send_ack_size(ngx_rtmp_session_t *s,
-        uint32_t ack_size);
-ngx_int_t ngx_rtmp_send_bandwidth(ngx_rtmp_session_t *s,
-        uint32_t ack_size, uint8_t limit_type);
-
-/* User control messages */
-ngx_chain_t * ngx_rtmp_create_stream_begin(ngx_rtmp_session_t *s,
-        uint32_t msid);
-ngx_chain_t * ngx_rtmp_create_stream_eof(ngx_rtmp_session_t *s,
-        uint32_t msid);
-ngx_chain_t * ngx_rtmp_create_stream_dry(ngx_rtmp_session_t *s,
-        uint32_t msid);
-ngx_chain_t * ngx_rtmp_create_set_buflen(ngx_rtmp_session_t *s,
-        uint32_t msid, uint32_t buflen_msec);
-ngx_chain_t * ngx_rtmp_create_recorded(ngx_rtmp_session_t *s,
-        uint32_t msid);
-ngx_chain_t * ngx_rtmp_create_ping_request(ngx_rtmp_session_t *s,
-        uint32_t timestamp);
-ngx_chain_t * ngx_rtmp_create_ping_response(ngx_rtmp_session_t *s,
-        uint32_t timestamp);
-
-ngx_int_t ngx_rtmp_send_stream_begin(ngx_rtmp_session_t *s,
-        uint32_t msid);
-ngx_int_t ngx_rtmp_send_stream_eof(ngx_rtmp_session_t *s,
-        uint32_t msid);
-ngx_int_t ngx_rtmp_send_stream_dry(ngx_rtmp_session_t *s,
-        uint32_t msid);
-ngx_int_t ngx_rtmp_send_set_buflen(ngx_rtmp_session_t *s,
-        uint32_t msid, uint32_t buflen_msec);
-ngx_int_t ngx_rtmp_send_recorded(ngx_rtmp_session_t *s,
-        uint32_t msid);
-ngx_int_t ngx_rtmp_send_ping_request(ngx_rtmp_session_t *s,
-        uint32_t timestamp);
-ngx_int_t ngx_rtmp_send_ping_response(ngx_rtmp_session_t *s,
-        uint32_t timestamp);
-
-/* AMF sender/receiver */
-ngx_int_t ngx_rtmp_append_amf(ngx_rtmp_session_t *s,
-        ngx_chain_t **first, ngx_chain_t **last,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts);
-ngx_int_t ngx_rtmp_receive_amf(ngx_rtmp_session_t *s, ngx_chain_t *in,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts);
-
-ngx_chain_t * ngx_rtmp_create_amf(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts);
-ngx_int_t ngx_rtmp_send_amf(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts);
-
-/* AMF status sender */
-ngx_chain_t * ngx_rtmp_create_status(ngx_rtmp_session_t *s, char *code,
-        char* level, char *desc);
-ngx_chain_t * ngx_rtmp_create_play_status(ngx_rtmp_session_t *s, char *code,
-        char* level, ngx_uint_t duration, ngx_uint_t bytes);
-ngx_chain_t * ngx_rtmp_create_sample_access(ngx_rtmp_session_t *s);
-
-ngx_int_t ngx_rtmp_send_status(ngx_rtmp_session_t *s, char *code,
-        char* level, char *desc);
-ngx_int_t ngx_rtmp_send_play_status(ngx_rtmp_session_t *s, char *code,
-        char* level, ngx_uint_t duration, ngx_uint_t bytes);
-ngx_int_t ngx_rtmp_send_sample_access(ngx_rtmp_session_t *s);
-
-
-/* Frame types */
-#define NGX_RTMP_VIDEO_KEY_FRAME            1
-#define NGX_RTMP_VIDEO_INTER_FRAME          2
-#define NGX_RTMP_VIDEO_DISPOSABLE_FRAME     3
-
-
-static ngx_inline ngx_int_t
-ngx_rtmp_get_video_frame_type(ngx_chain_t *in)
-{
-    return (in->buf->pos[0] & 0xf0) >> 4;
-}
-
-
-static ngx_inline ngx_int_t
-ngx_rtmp_is_codec_header(ngx_chain_t *in)
-{
-    return in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0;
-}
-
-
-extern ngx_rtmp_bandwidth_t                 ngx_rtmp_bw_out;
-extern ngx_rtmp_bandwidth_t                 ngx_rtmp_bw_in;
-
-
-extern ngx_uint_t                           ngx_rtmp_naccepted;
-#if (nginx_version >= 1007011)
-extern ngx_queue_t                          ngx_rtmp_init_queue;
-#elif (nginx_version >= 1007005)
-extern ngx_thread_volatile ngx_queue_t      ngx_rtmp_init_queue;
-#else
-extern ngx_thread_volatile ngx_event_t     *ngx_rtmp_init_queue;
-#endif
-
-extern ngx_uint_t                           ngx_rtmp_max_module;
-extern ngx_module_t                         ngx_rtmp_core_module;
-
-
-#endif /* _NGX_RTMP_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_access_module.c b/debian/modules/rtmp/ngx_rtmp_access_module.c
deleted file mode 100644
index c4dbb19..0000000
--- a/debian/modules/rtmp/ngx_rtmp_access_module.c
+++ /dev/null
@@ -1,471 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_cmd_module.h"
-
-
-static ngx_rtmp_publish_pt          next_publish;
-static ngx_rtmp_play_pt             next_play;
-
-
-#define NGX_RTMP_ACCESS_PUBLISH     0x01
-#define NGX_RTMP_ACCESS_PLAY        0x02
-
-
-static char * ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static ngx_int_t ngx_rtmp_access_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_access_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_access_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-
-
-typedef struct {
-    in_addr_t               mask;
-    in_addr_t               addr;
-    ngx_uint_t              deny;
-    ngx_uint_t              flags;
-} ngx_rtmp_access_rule_t;
-
-
-#if (NGX_HAVE_INET6)
-
-typedef struct {
-    struct in6_addr         addr;
-    struct in6_addr         mask;
-    ngx_uint_t              deny;
-    ngx_uint_t              flags;
-} ngx_rtmp_access_rule6_t;
-
-#endif
-
-
-typedef struct {
-    ngx_array_t             rules;     /* array of ngx_rtmp_access_rule_t */
-#if (NGX_HAVE_INET6)
-    ngx_array_t             rules6;    /* array of ngx_rtmp_access_rule6_t */
-#endif
-} ngx_rtmp_access_app_conf_t;
-
-
-static ngx_command_t  ngx_rtmp_access_commands[] = {
-
-    { ngx_string("allow"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE12,
-      ngx_rtmp_access_rule,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("deny"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE12,
-      ngx_rtmp_access_rule,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_access_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_access_postconfiguration,      /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    ngx_rtmp_access_create_app_conf,        /* create app configuration */
-    ngx_rtmp_access_merge_app_conf,         /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_access_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_access_module_ctx,            /* module context */
-    ngx_rtmp_access_commands,               /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void *
-ngx_rtmp_access_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_access_app_conf_t      *aacf;
-
-    aacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_access_app_conf_t));
-    if (aacf == NULL) {
-        return NULL;
-    }
-
-    if (ngx_array_init(&aacf->rules, cf->pool, 1,
-                       sizeof(ngx_rtmp_access_rule_t))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-#if (NGX_HAVE_INET6)
-    if (ngx_array_init(&aacf->rules6, cf->pool, 1,
-                       sizeof(ngx_rtmp_access_rule6_t))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-#endif
-
-    return aacf;
-}
-
-
-static ngx_int_t
-ngx_rtmp_access_merge_rules(ngx_array_t *prev, ngx_array_t *rules)
-{
-    void   *p;
-
-    if (prev->nelts == 0) {
-        return NGX_OK;
-    }
-
-    if (rules->nelts == 0) {
-        *rules = *prev;
-        return NGX_OK;
-    }
-
-    p = ngx_array_push_n(rules, prev->nelts);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_memcpy(p, prev->elts, prev->size * prev->nelts);
-
-    return NGX_OK;
-}
-
-
-static char *
-ngx_rtmp_access_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_access_app_conf_t *prev = parent;
-    ngx_rtmp_access_app_conf_t *conf = child;
-
-    if (ngx_rtmp_access_merge_rules(&prev->rules, &conf->rules) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-#if (NGX_HAVE_INET6)
-    if (ngx_rtmp_access_merge_rules(&prev->rules6, &conf->rules6) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-#endif
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_access_found(ngx_rtmp_session_t *s, ngx_uint_t deny)
-{
-    if (deny) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "access forbidden by rule");
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_access_inet(ngx_rtmp_session_t *s, in_addr_t addr, ngx_uint_t flag)
-{
-    ngx_uint_t                  i;
-    ngx_rtmp_access_rule_t     *rule;
-    ngx_rtmp_access_app_conf_t *ascf;
-
-    ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module);
-
-    rule = ascf->rules.elts;
-    for (i = 0; i < ascf->rules.nelts; i++) {
-
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
-                       "access: %08XD %08XD %08XD",
-                       addr, rule[i].mask, rule[i].addr);
-
-        if ((addr & rule[i].mask) == rule[i].addr && (flag & rule[i].flags)) {
-            return ngx_rtmp_access_found(s, rule[i].deny);
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-#if (NGX_HAVE_INET6)
-
-static ngx_int_t
-ngx_rtmp_access_inet6(ngx_rtmp_session_t *s, u_char *p, ngx_uint_t flag)
-{
-    ngx_uint_t                  n;
-    ngx_uint_t                  i;
-    ngx_rtmp_access_rule6_t    *rule6;
-    ngx_rtmp_access_app_conf_t *ascf;
-
-    ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module);
-
-    rule6 = ascf->rules6.elts;
-    for (i = 0; i < ascf->rules6.nelts; i++) {
-
-#if (NGX_DEBUG)
-        {
-        size_t  cl, ml, al;
-        u_char  ct[NGX_INET6_ADDRSTRLEN];
-        u_char  mt[NGX_INET6_ADDRSTRLEN];
-        u_char  at[NGX_INET6_ADDRSTRLEN];
-
-        cl = ngx_inet6_ntop(p, ct, NGX_INET6_ADDRSTRLEN);
-        ml = ngx_inet6_ntop(rule6[i].mask.s6_addr, mt, NGX_INET6_ADDRSTRLEN);
-        al = ngx_inet6_ntop(rule6[i].addr.s6_addr, at, NGX_INET6_ADDRSTRLEN);
-
-        ngx_log_debug6(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
-                       "access: %*s %*s %*s", cl, ct, ml, mt, al, at);
-        }
-#endif
-
-        for (n = 0; n < 16; n++) {
-            if ((p[n] & rule6[i].mask.s6_addr[n]) != rule6[i].addr.s6_addr[n]) {
-                goto next;
-            }
-        }
-
-        if (flag & rule6[i].flags) {
-            return ngx_rtmp_access_found(s, rule6[i].deny);
-        }
-
-    next:
-        continue;
-    }
-
-    return NGX_OK;
-}
-
-#endif
-
-
-static ngx_int_t
-ngx_rtmp_access(ngx_rtmp_session_t *s, ngx_uint_t flag)
-{
-    struct sockaddr_in             *sin;
-    ngx_rtmp_access_app_conf_t     *ascf;
-#if (NGX_HAVE_INET6)
-    u_char                         *p;
-    in_addr_t                       addr;
-    struct sockaddr_in6            *sin6;
-#endif
-
-    ascf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_access_module);
-    if (ascf == NULL) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
-                       "access: NULL app conf");
-        return NGX_ERROR;
-    }
-
-    /* relay etc */
-    if (s->connection->sockaddr == NULL) {
-        return NGX_OK;
-    }
-
-    switch (s->connection->sockaddr->sa_family) {
-
-    case AF_INET:
-        sin = (struct sockaddr_in *) s->connection->sockaddr;
-        return ngx_rtmp_access_inet(s, sin->sin_addr.s_addr, flag);
-
-#if (NGX_HAVE_INET6)
-
-    case AF_INET6:
-        sin6 = (struct sockaddr_in6 *) s->connection->sockaddr;
-        p = sin6->sin6_addr.s6_addr;
-
-        if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
-            addr  = p[12] << 24;
-            addr += p[13] << 16;
-            addr += p[14] << 8;
-            addr += p[15];
-            return ngx_rtmp_access_inet(s, htonl(addr), flag);
-        }
-
-        return ngx_rtmp_access_inet6(s, p, flag);
-
-#endif
-    }
-
-    return NGX_OK;
-}
-
-
-static char *
-ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_rtmp_access_app_conf_t         *ascf = conf;
-
-    ngx_int_t                           rc;
-    ngx_uint_t                          all;
-    ngx_str_t                          *value;
-    ngx_cidr_t                          cidr;
-    ngx_rtmp_access_rule_t             *rule;
-#if (NGX_HAVE_INET6)
-    ngx_rtmp_access_rule6_t            *rule6;
-#endif
-    size_t                              n;
-    ngx_uint_t                          flags;
-
-    ngx_memzero(&cidr, sizeof(ngx_cidr_t));
-
-    value = cf->args->elts;
-
-    n = 1;
-    flags = 0;
-
-    if (cf->args->nelts == 2) {
-
-        flags = NGX_RTMP_ACCESS_PUBLISH | NGX_RTMP_ACCESS_PLAY;
-
-    } else {
-
-        for(; n < cf->args->nelts - 1; ++n) {
-
-            if (value[n].len == sizeof("publish") - 1 &&
-                ngx_strcmp(value[1].data, "publish") == 0)
-            {
-                flags |= NGX_RTMP_ACCESS_PUBLISH;
-                continue;
-
-            }
-
-            if (value[n].len == sizeof("play") - 1 &&
-                ngx_strcmp(value[1].data, "play") == 0)
-            {
-                flags |= NGX_RTMP_ACCESS_PLAY;
-                continue;
-
-            }
-
-            ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                          "unexpected access specified: '%V'", &value[n]);
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    all = (value[n].len == 3 && ngx_strcmp(value[n].data, "all") == 0);
-
-    if (!all) {
-
-        rc = ngx_ptocidr(&value[n], &cidr);
-
-        if (rc == NGX_ERROR) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid parameter \"%V\"", &value[1]);
-            return NGX_CONF_ERROR;
-        }
-
-        if (rc == NGX_DONE) {
-            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                               "low address bits of %V are meaningless",
-                               &value[1]);
-        }
-    }
-
-    switch (cidr.family) {
-
-#if (NGX_HAVE_INET6)
-    case AF_INET6:
-    case 0: /* all */
-
-        rule6 = ngx_array_push(&ascf->rules6);
-        if (rule6 == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        rule6->mask = cidr.u.in6.mask;
-        rule6->addr = cidr.u.in6.addr;
-        rule6->deny = (value[0].data[0] == 'd') ? 1 : 0;
-        rule6->flags = flags;
-
-        if (!all) {
-            break;
-        }
-
-#endif
-        /* fall through */
-
-    default: /* AF_INET */
-
-        rule = ngx_array_push(&ascf->rules);
-        if (rule == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        rule->mask = cidr.u.in.mask;
-        rule->addr = cidr.u.in.addr;
-        rule->deny = (value[0].data[0] == 'd') ? 1 : 0;
-        rule->flags = flags;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_access_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    if (ngx_rtmp_access(s, NGX_RTMP_ACCESS_PUBLISH) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_access_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    if (ngx_rtmp_access(s, NGX_RTMP_ACCESS_PLAY) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return next_play(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_access_postconfiguration(ngx_conf_t *cf)
-{
-    /* chain handlers */
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_access_publish;
-
-    next_play = ngx_rtmp_play;
-    ngx_rtmp_play = ngx_rtmp_access_play;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_amf.c b/debian/modules/rtmp/ngx_rtmp_amf.c
deleted file mode 100644
index 3fe3ccf..0000000
--- a/debian/modules/rtmp/ngx_rtmp_amf.c
+++ /dev/null
@@ -1,648 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_amf.h"
-#include "ngx_rtmp.h"
-#include <string.h>
-
-
-static ngx_inline void*
-ngx_rtmp_amf_reverse_copy(void *dst, void* src, size_t len)
-{
-    size_t  k;
-
-    if (dst == NULL || src == NULL) {
-        return NULL;
-    }
-
-    for(k = 0; k < len; ++k) {
-        ((u_char*)dst)[k] = ((u_char*)src)[len - 1 - k];
-    }
-
-    return dst;
-}
-
-#define NGX_RTMP_AMF_DEBUG_SIZE 16
-
-#ifdef NGX_DEBUG
-static void
-ngx_rtmp_amf_debug(const char* op, ngx_log_t *log, u_char *p, size_t n)
-{
-    u_char          hstr[3 * NGX_RTMP_AMF_DEBUG_SIZE + 1];
-    u_char          str[NGX_RTMP_AMF_DEBUG_SIZE + 1];
-    u_char         *hp, *sp;
-    static u_char   hex[] = "0123456789ABCDEF";
-    size_t          i;
-
-    hp = hstr;
-    sp = str;
-
-    for(i = 0; i < n && i < NGX_RTMP_AMF_DEBUG_SIZE; ++i) {
-        *hp++ = ' ';
-        if (p) {
-            *hp++ = hex[(*p & 0xf0) >> 4];
-            *hp++ = hex[*p & 0x0f];
-            *sp++ = (*p >= 0x20 && *p <= 0x7e) ?
-                *p : (u_char)'?';
-            ++p;
-        } else {
-            *hp++ = 'X';
-            *hp++ = 'X';
-            *sp++ = '?';
-        }
-    }
-    *hp = *sp = '\0';
-
-    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, log, 0,
-            "AMF %s (%d)%s '%s'", op, n, hstr, str);
-}
-#endif
-
-static ngx_int_t
-ngx_rtmp_amf_get(ngx_rtmp_amf_ctx_t *ctx, void *p, size_t n)
-{
-    size_t          size;
-    ngx_chain_t    *l;
-    size_t          offset;
-    u_char         *pos, *last;
-#ifdef NGX_DEBUG
-    void           *op = p;
-    size_t          on = n;
-#endif
-
-    if (!n)
-        return NGX_OK;
-
-    for(l = ctx->link, offset = ctx->offset; l; l = l->next, offset = 0) {
-
-        pos  = l->buf->pos + offset;
-        last = l->buf->last;
-
-        if (last >= pos + n) {
-            if (p) {
-                p = ngx_cpymem(p, pos, n);
-            }
-            ctx->offset = offset + n;
-            ctx->link = l;
-
-#ifdef NGX_DEBUG
-            ngx_rtmp_amf_debug("read", ctx->log, (u_char*)op, on);
-#endif
-
-            return NGX_OK;
-        }
-
-        size = last - pos;
-
-        if (p) {
-            p = ngx_cpymem(p, pos, size);
-        }
-
-        n -= size;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ctx->log, 0,
-            "AMF read eof (%d)", n);
-
-    return NGX_DONE;
-}
-
-
-static ngx_int_t
-ngx_rtmp_amf_put(ngx_rtmp_amf_ctx_t *ctx, void *p, size_t n)
-{
-    ngx_buf_t       *b;
-    size_t          size;
-    ngx_chain_t    *l, *ln;
-
-#ifdef NGX_DEBUG
-    ngx_rtmp_amf_debug("write", ctx->log, (u_char*)p, n);
-#endif
-
-    l = ctx->link;
-
-    if (ctx->link && ctx->first == NULL) {
-        ctx->first = ctx->link;
-    }
-
-    while(n) {
-        b = l ? l->buf : NULL;
-
-        if (b == NULL || b->last == b->end) {
-
-            ln = ctx->alloc(ctx->arg);
-            if (ln == NULL) {
-                return NGX_ERROR;
-            }
-
-            if (ctx->first == NULL) {
-                ctx->first = ln;
-            }
-
-            if (l) {
-                l->next = ln;
-            }
-
-            l = ln;
-            ctx->link = l;
-            b = l->buf;
-        }
-
-        size = b->end - b->last;
-
-        if (size >= n) {
-            b->last = ngx_cpymem(b->last, p, n);
-            return NGX_OK;
-        }
-
-        b->last = ngx_cpymem(b->last, p, size);
-        p = (u_char*)p + size;
-        n -= size;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_amf_read_object(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
-        size_t nelts)
-{
-    uint8_t                 type;
-    uint16_t                len;
-    size_t                  n, namelen, maxlen;
-    ngx_int_t               rc;
-    u_char                  buf[2];
-
-    maxlen = 0;
-    for(n = 0; n < nelts; ++n) {
-        namelen = elts[n].name.len;
-        if (namelen > maxlen)
-            maxlen = namelen;
-    }
-
-    for( ;; ) {
-
-#if !(NGX_WIN32)
-        char    name[maxlen];
-#else
-        char    name[1024];
-        if (maxlen > sizeof(name)) {
-            return NGX_ERROR;
-        }
-#endif
-        /* read key */
-        switch (ngx_rtmp_amf_get(ctx, buf, 2)) {
-        case NGX_DONE:
-            /* Envivio sends unfinalized arrays */
-            return NGX_OK;
-        case NGX_OK:
-            break;
-        default:
-            return NGX_ERROR;
-        }
-
-        ngx_rtmp_amf_reverse_copy(&len, buf, 2);
-
-        if (!len)
-            break;
-
-        if (len <= maxlen) {
-            rc = ngx_rtmp_amf_get(ctx, name, len);
-
-        } else {
-            rc = ngx_rtmp_amf_get(ctx, name, maxlen);
-            if (rc != NGX_OK)
-                return NGX_ERROR;
-            rc = ngx_rtmp_amf_get(ctx, 0, len - maxlen);
-        }
-
-        if (rc != NGX_OK)
-            return NGX_ERROR;
-
-        /* TODO: if we require array to be sorted on name
-         * then we could be able to use binary search */
-        for(n = 0; n < nelts
-                && (len != elts[n].name.len
-                    || ngx_strncmp(name, elts[n].name.data, len));
-                ++n);
-
-        if (ngx_rtmp_amf_read(ctx, n < nelts ? &elts[n] : NULL, 1) != NGX_OK)
-            return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_amf_get(ctx, &type, 1) != NGX_OK
-        || type != NGX_RTMP_AMF_END)
-    {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_amf_read_array(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
-        size_t nelts)
-{
-    uint32_t                len;
-    size_t                  n;
-    u_char                  buf[4];
-
-    /* read length */
-    if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK)
-        return NGX_ERROR;
-
-    ngx_rtmp_amf_reverse_copy(&len, buf, 4);
-
-    for (n = 0; n < len; ++n) {
-        if (ngx_rtmp_amf_read(ctx, n < nelts ? &elts[n] : NULL, 1) != NGX_OK)
-            return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_amf_read_variant(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
-        size_t nelts)
-{
-    uint8_t                 type;
-    ngx_int_t               rc;
-    size_t                  n;
-    ngx_rtmp_amf_elt_t      elt;
-
-    rc = ngx_rtmp_amf_get(ctx, &type, 1);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    ngx_memzero(&elt, sizeof(elt));
-    for (n = 0; n < nelts; ++n, ++elts) {
-        if (type == elts->type) {
-            elt.data = elts->data;
-            elt.len  = elts->len;
-        }
-    }
-
-    elt.type = type | NGX_RTMP_AMF_TYPELESS;
-
-    return ngx_rtmp_amf_read(ctx, &elt, 1);
-}
-
-
-static ngx_int_t
-ngx_rtmp_amf_is_compatible_type(uint8_t t1, uint8_t t2)
-{
-    return t1 == t2
-        || (t1 == NGX_RTMP_AMF_OBJECT && t2 == NGX_RTMP_AMF_MIXED_ARRAY)
-        || (t2 == NGX_RTMP_AMF_OBJECT && t1 == NGX_RTMP_AMF_MIXED_ARRAY);
-}
-
-
-ngx_int_t
-ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
-        size_t nelts)
-{
-    void                       *data;
-    ngx_int_t                   type;
-    uint8_t                     type8;
-    size_t                      n;
-    uint16_t                    len;
-    ngx_int_t                   rc;
-    u_char                      buf[8];
-    uint32_t                    max_index;
-
-    for(n = 0; n < nelts; ++n) {
-
-        if (elts && elts->type & NGX_RTMP_AMF_TYPELESS) {
-            type = elts->type & ~NGX_RTMP_AMF_TYPELESS;
-            data = elts->data;
-
-        } else {
-            switch (ngx_rtmp_amf_get(ctx, &type8, 1)) {
-                case NGX_DONE:
-                    if (elts && elts->type & NGX_RTMP_AMF_OPTIONAL) {
-                        return NGX_OK;
-                    }
-                    /* fall through */
-                case NGX_ERROR:
-                    return NGX_ERROR;
-            }
-            type = type8;
-            data = (elts &&
-                    ngx_rtmp_amf_is_compatible_type(
-                                 (uint8_t) (elts->type & 0xff), (uint8_t) type))
-                ? elts->data
-                : NULL;
-
-            if (elts && (elts->type & NGX_RTMP_AMF_CONTEXT)) {
-                if (data) {
-                    *(ngx_rtmp_amf_ctx_t *) data = *ctx;
-                }
-                data = NULL;
-            }
-        }
-
-        switch (type) {
-            case NGX_RTMP_AMF_NUMBER:
-                if (ngx_rtmp_amf_get(ctx, buf, 8) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                ngx_rtmp_amf_reverse_copy(data, buf, 8);
-                break;
-
-            case NGX_RTMP_AMF_BOOLEAN:
-                if (ngx_rtmp_amf_get(ctx, data, 1) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_STRING:
-                if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                ngx_rtmp_amf_reverse_copy(&len, buf, 2);
-
-                if (data == NULL) {
-                    rc = ngx_rtmp_amf_get(ctx, data, len);
-
-                } else if (elts->len <= len) {
-                    rc = ngx_rtmp_amf_get(ctx, data, elts->len - 1);
-                    if (rc != NGX_OK)
-                        return NGX_ERROR;
-                    ((char*)data)[elts->len - 1] = 0;
-                    rc = ngx_rtmp_amf_get(ctx, NULL, len - elts->len + 1);
-
-                } else {
-                    rc = ngx_rtmp_amf_get(ctx, data, len);
-                    ((char*)data)[len] = 0;
-                }
-
-                if (rc != NGX_OK) {
-                    return NGX_ERROR;
-                }
-
-                break;
-
-            case NGX_RTMP_AMF_NULL:
-            case NGX_RTMP_AMF_ARRAY_NULL:
-                break;
-
-            case NGX_RTMP_AMF_MIXED_ARRAY:
-                if (ngx_rtmp_amf_get(ctx, &max_index, 4) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                /* fall through */
-
-            case NGX_RTMP_AMF_OBJECT:
-                if (ngx_rtmp_amf_read_object(ctx, data,
-                    data && elts ? elts->len / sizeof(ngx_rtmp_amf_elt_t) : 0
-                    ) != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_ARRAY:
-                if (ngx_rtmp_amf_read_array(ctx, data,
-                    data && elts ? elts->len / sizeof(ngx_rtmp_amf_elt_t) : 0
-                    ) != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_VARIANT_:
-                if (ngx_rtmp_amf_read_variant(ctx, data,
-                    data && elts ? elts->len / sizeof(ngx_rtmp_amf_elt_t) : 0
-                    ) != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_INT8:
-                if (ngx_rtmp_amf_get(ctx, data, 1) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_INT16:
-                if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                ngx_rtmp_amf_reverse_copy(data, buf, 2);
-                break;
-
-            case NGX_RTMP_AMF_INT32:
-                if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                ngx_rtmp_amf_reverse_copy(data, buf, 4);
-                break;
-
-            case NGX_RTMP_AMF_END:
-                return NGX_OK;
-
-            default:
-                return NGX_ERROR;
-        }
-
-        if (elts) {
-            ++elts;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_amf_write_object(ngx_rtmp_amf_ctx_t *ctx,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts)
-{
-    uint16_t                len;
-    size_t                  n;
-    u_char                  buf[2];
-
-    for(n = 0; n < nelts; ++n) {
-
-        len = (uint16_t) elts[n].name.len;
-
-        if (ngx_rtmp_amf_put(ctx,
-                    ngx_rtmp_amf_reverse_copy(buf,
-                        &len, 2), 2) != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        if (ngx_rtmp_amf_put(ctx, elts[n].name.data, len) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        if (ngx_rtmp_amf_write(ctx, &elts[n], 1) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-    if (ngx_rtmp_amf_put(ctx, "\0\0", 2) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_amf_write_array(ngx_rtmp_amf_ctx_t *ctx,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts)
-{
-    uint32_t                len;
-    size_t                  n;
-    u_char                  buf[4];
-
-    len = nelts;
-    if (ngx_rtmp_amf_put(ctx,
-                ngx_rtmp_amf_reverse_copy(buf,
-                    &len, 4), 4) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    for(n = 0; n < nelts; ++n) {
-        if (ngx_rtmp_amf_write(ctx, &elts[n], 1) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *ctx,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts)
-{
-    size_t                  n;
-    ngx_int_t               type;
-    uint8_t                 type8;
-    void                   *data;
-    uint16_t                len;
-    uint32_t                max_index;
-    u_char                  buf[8];
-
-    for(n = 0; n < nelts; ++n) {
-
-        type = elts[n].type;
-        data = elts[n].data;
-        len  = (uint16_t) elts[n].len;
-
-        if (type & NGX_RTMP_AMF_TYPELESS) {
-            type &= ~NGX_RTMP_AMF_TYPELESS;
-        } else {
-            type8 = (uint8_t)type;
-            if (ngx_rtmp_amf_put(ctx, &type8, 1) != NGX_OK)
-                return NGX_ERROR;
-        }
-
-        switch(type) {
-            case NGX_RTMP_AMF_NUMBER:
-                if (ngx_rtmp_amf_put(ctx,
-                            ngx_rtmp_amf_reverse_copy(buf,
-                                data, 8), 8) != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_BOOLEAN:
-                if (ngx_rtmp_amf_put(ctx, data, 1) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_STRING:
-                if (len == 0 && data) {
-                    len = (uint16_t) ngx_strlen((u_char*) data);
-                }
-
-                if (ngx_rtmp_amf_put(ctx,
-                            ngx_rtmp_amf_reverse_copy(buf,
-                                &len, 2), 2) != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-
-                if (ngx_rtmp_amf_put(ctx, data, len) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_NULL:
-            case NGX_RTMP_AMF_ARRAY_NULL:
-                break;
-
-            case NGX_RTMP_AMF_MIXED_ARRAY:
-                max_index = 0;
-                if (ngx_rtmp_amf_put(ctx, &max_index, 4) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                /* fall through */
-
-            case NGX_RTMP_AMF_OBJECT:
-                type8 = NGX_RTMP_AMF_END;
-                if (ngx_rtmp_amf_write_object(ctx, data,
-                        elts[n].len / sizeof(ngx_rtmp_amf_elt_t)) != NGX_OK
-                    || ngx_rtmp_amf_put(ctx, &type8, 1) != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_ARRAY:
-                if (ngx_rtmp_amf_write_array(ctx, data,
-                        elts[n].len / sizeof(ngx_rtmp_amf_elt_t)) != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_INT8:
-                if (ngx_rtmp_amf_put(ctx, data, 1) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_INT16:
-                if (ngx_rtmp_amf_put(ctx,
-                            ngx_rtmp_amf_reverse_copy(buf,
-                                data, 2), 2) != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-                break;
-
-            case NGX_RTMP_AMF_INT32:
-                if (ngx_rtmp_amf_put(ctx,
-                            ngx_rtmp_amf_reverse_copy(buf,
-                                data, 4), 4) != NGX_OK)
-                {
-                    return NGX_ERROR;
-                }
-                break;
-
-            default:
-                return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
diff --git a/debian/modules/rtmp/ngx_rtmp_amf.h b/debian/modules/rtmp/ngx_rtmp_amf.h
deleted file mode 100644
index 8f70a12..0000000
--- a/debian/modules/rtmp/ngx_rtmp_amf.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_AMF_H_INCLUDED_
-#define _NGX_RTMP_AMF_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-
-
-/* basic types */
-#define NGX_RTMP_AMF_NUMBER             0x00
-#define NGX_RTMP_AMF_BOOLEAN            0x01
-#define NGX_RTMP_AMF_STRING             0x02
-#define NGX_RTMP_AMF_OBJECT             0x03
-#define NGX_RTMP_AMF_NULL               0x05
-#define NGX_RTMP_AMF_ARRAY_NULL         0x06
-#define NGX_RTMP_AMF_MIXED_ARRAY        0x08
-#define NGX_RTMP_AMF_END                0x09
-#define NGX_RTMP_AMF_ARRAY              0x0a
-
-/* extended types */
-#define NGX_RTMP_AMF_INT8               0x0100
-#define NGX_RTMP_AMF_INT16              0x0101
-#define NGX_RTMP_AMF_INT32              0x0102
-#define NGX_RTMP_AMF_VARIANT_           0x0103
-
-/* r/w flags */
-#define NGX_RTMP_AMF_OPTIONAL           0x1000
-#define NGX_RTMP_AMF_TYPELESS           0x2000
-#define NGX_RTMP_AMF_CONTEXT            0x4000
-
-#define NGX_RTMP_AMF_VARIANT            (NGX_RTMP_AMF_VARIANT_\
-                                        |NGX_RTMP_AMF_TYPELESS)
-
-
-typedef struct {
-    ngx_int_t                           type;
-    ngx_str_t                           name;
-    void                               *data;
-    size_t                              len;
-} ngx_rtmp_amf_elt_t;
-
-
-typedef ngx_chain_t * (*ngx_rtmp_amf_alloc_pt)(void *arg);
-
-
-typedef struct {
-    ngx_chain_t                        *link, *first;
-    size_t                              offset;
-    ngx_rtmp_amf_alloc_pt               alloc;
-    void                               *arg;
-    ngx_log_t                          *log;
-} ngx_rtmp_amf_ctx_t;
-
-
-/* reading AMF */
-ngx_int_t ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts);
-
-/* writing AMF */
-ngx_int_t ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *ctx,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts);
-
-
-#endif /* _NGX_RTMP_AMF_H_INCLUDED_ */
-
diff --git a/debian/modules/rtmp/ngx_rtmp_auto_push_module.c b/debian/modules/rtmp/ngx_rtmp_auto_push_module.c
deleted file mode 100644
index 60c85d7..0000000
--- a/debian/modules/rtmp/ngx_rtmp_auto_push_module.c
+++ /dev/null
@@ -1,578 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_relay_module.h"
-
-
-static ngx_rtmp_publish_pt          next_publish;
-static ngx_rtmp_delete_stream_pt    next_delete_stream;
-
-
-static ngx_int_t ngx_rtmp_auto_push_init_process(ngx_cycle_t *cycle);
-static void ngx_rtmp_auto_push_exit_process(ngx_cycle_t *cycle);
-static void * ngx_rtmp_auto_push_create_conf(ngx_cycle_t *cf);
-static char * ngx_rtmp_auto_push_init_conf(ngx_cycle_t *cycle, void *conf);
-#if (NGX_HAVE_UNIX_DOMAIN)
-static ngx_int_t ngx_rtmp_auto_push_publish(ngx_rtmp_session_t *s,
-       ngx_rtmp_publish_t *v);
-static ngx_int_t ngx_rtmp_auto_push_delete_stream(ngx_rtmp_session_t *s,
-       ngx_rtmp_delete_stream_t *v);
-#endif
-
-
-typedef struct ngx_rtmp_auto_push_ctx_s ngx_rtmp_auto_push_ctx_t;
-
-struct ngx_rtmp_auto_push_ctx_s {
-    ngx_int_t                      *slots; /* NGX_MAX_PROCESSES */
-    u_char                          name[NGX_RTMP_MAX_NAME];
-    u_char                          args[NGX_RTMP_MAX_ARGS];
-    ngx_event_t                     push_evt;
-};
-
-
-typedef struct {
-    ngx_flag_t                      auto_push;
-    ngx_str_t                       socket_dir;
-    ngx_msec_t                      push_reconnect;
-} ngx_rtmp_auto_push_conf_t;
-
-
-static ngx_command_t  ngx_rtmp_auto_push_commands[] = {
-
-    { ngx_string("rtmp_auto_push"),
-      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      0,
-      offsetof(ngx_rtmp_auto_push_conf_t, auto_push),
-      NULL },
-
-    { ngx_string("rtmp_auto_push_reconnect"),
-      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      0,
-      offsetof(ngx_rtmp_auto_push_conf_t, push_reconnect),
-      NULL },
-
-    { ngx_string("rtmp_socket_dir"),
-      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      0,
-      offsetof(ngx_rtmp_auto_push_conf_t, socket_dir),
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_core_module_t  ngx_rtmp_auto_push_module_ctx = {
-    ngx_string("rtmp_auto_push"),
-    ngx_rtmp_auto_push_create_conf,         /* create conf */
-    ngx_rtmp_auto_push_init_conf            /* init conf */
-};
-
-
-ngx_module_t  ngx_rtmp_auto_push_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_auto_push_module_ctx,         /* module context */
-    ngx_rtmp_auto_push_commands,            /* module directives */
-    NGX_CORE_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    ngx_rtmp_auto_push_init_process,        /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    ngx_rtmp_auto_push_exit_process,        /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_auto_push_index_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    NULL,                                   /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    NULL,                                   /* create app configuration */
-    NULL                                    /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_auto_push_index_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_auto_push_index_module_ctx,   /* module context */
-    NULL,                                   /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-#define NGX_RTMP_AUTO_PUSH_SOCKNAME         "nginx-rtmp"
-
-
-static ngx_int_t
-ngx_rtmp_auto_push_init_process(ngx_cycle_t *cycle)
-{
-#if (NGX_HAVE_UNIX_DOMAIN)
-    ngx_rtmp_auto_push_conf_t  *apcf;
-    ngx_listening_t            *ls, *lss;
-    struct sockaddr_un         *saun;
-    int                         reuseaddr;
-    ngx_socket_t                s;
-    size_t                      n;
-    ngx_file_info_t             fi;
-
-    if (ngx_process != NGX_PROCESS_WORKER) {
-        return NGX_OK;
-    }
-
-    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(cycle->conf_ctx,
-                                                    ngx_rtmp_auto_push_module);
-    if (apcf->auto_push == 0) {
-        return NGX_OK;
-    }
-
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_auto_push_publish;
-
-    next_delete_stream = ngx_rtmp_delete_stream;
-    ngx_rtmp_delete_stream = ngx_rtmp_auto_push_delete_stream;
-
-    reuseaddr = 1;
-    s = (ngx_socket_t) -1;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, cycle->log, 0,
-            "auto_push: creating sockets");
-
-    /*TODO: clone all RTMP listenings? */
-    ls = cycle->listening.elts;
-    lss = NULL;
-    for (n = 0; n < cycle->listening.nelts; ++n, ++ls) {
-        if (ls->handler == ngx_rtmp_init_connection) {
-            lss = ls;
-            break;
-        }
-    }
-
-    if (lss == NULL) {
-        return NGX_OK;
-    }
-
-    ls = ngx_array_push(&cycle->listening);
-    if (ls == NULL) {
-        return NGX_ERROR;
-    }
-
-    *ls = *lss;
-
-    /* Disable unix socket client address extraction
-     * from accept call
-     * Nginx generates bad addr_text with this enabled */
-    ls->addr_ntop = 0;
-
-    ls->socklen = sizeof(struct sockaddr_un);
-    saun = ngx_pcalloc(cycle->pool, ls->socklen);
-    ls->sockaddr = (struct sockaddr *) saun;
-    if (ls->sockaddr == NULL) {
-        return NGX_ERROR;
-    }
-    saun->sun_family = AF_UNIX;
-    *ngx_snprintf((u_char *) saun->sun_path, sizeof(saun->sun_path),
-                  "%V/" NGX_RTMP_AUTO_PUSH_SOCKNAME ".%i",
-                  &apcf->socket_dir, ngx_process_slot)
-        = 0;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, cycle->log, 0,
-                   "auto_push: create socket '%s'",
-                   saun->sun_path);
-
-    if (ngx_file_info(saun->sun_path, &fi) != ENOENT) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, cycle->log, 0,
-                       "auto_push: delete existing socket '%s'",
-                       saun->sun_path);
-        ngx_delete_file(saun->sun_path);
-    }
-
-    ngx_str_set(&ls->addr_text, "worker_socket");
-
-    s = ngx_socket(AF_UNIX, SOCK_STREAM, 0);
-    if (s == -1) {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                      ngx_socket_n " worker_socket failed");
-        return NGX_ERROR;
-    }
-
-    if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
-                   (const void *) &reuseaddr, sizeof(int))
-        == -1)
-    {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                "setsockopt(SO_REUSEADDR) worker_socket failed");
-        goto sock_error;
-    }
-
-    if (!(ngx_event_flags & NGX_USE_AIO_EVENT)) {
-        if (ngx_nonblocking(s) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                          ngx_nonblocking_n " worker_socket failed");
-            return NGX_ERROR;
-        }
-    }
-
-    if (bind(s, (struct sockaddr *) saun, sizeof(*saun)) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                      ngx_nonblocking_n " worker_socket bind failed");
-        goto sock_error;
-    }
-
-    if (listen(s, NGX_LISTEN_BACKLOG) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                      "listen() to worker_socket, backlog %d failed",
-                      NGX_LISTEN_BACKLOG);
-        goto sock_error;
-    }
-
-    ls->fd = s;
-    ls->listen = 1;
-
-    return NGX_OK;
-
-sock_error:
-    if (s != (ngx_socket_t) -1 && ngx_close_socket(s) == -1) {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                ngx_close_socket_n " worker_socket failed");
-    }
-    ngx_delete_file(saun->sun_path);
-
-    return NGX_ERROR;
-
-#else  /* NGX_HAVE_UNIX_DOMAIN */
-
-    return NGX_OK;
-
-#endif /* NGX_HAVE_UNIX_DOMAIN */
-}
-
-
-static void
-ngx_rtmp_auto_push_exit_process(ngx_cycle_t *cycle)
-{
-#if (NGX_HAVE_UNIX_DOMAIN)
-    ngx_rtmp_auto_push_conf_t  *apcf;
-    u_char                      path[NGX_MAX_PATH];
-
-    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(cycle->conf_ctx,
-                                                    ngx_rtmp_auto_push_module);
-    if (apcf->auto_push == 0) {
-        return;
-    }
-    *ngx_snprintf(path, sizeof(path),
-                  "%V/" NGX_RTMP_AUTO_PUSH_SOCKNAME ".%i",
-                  &apcf->socket_dir, ngx_process_slot)
-         = 0;
-
-    ngx_delete_file(path);
-
-#endif
-}
-
-
-static void *
-ngx_rtmp_auto_push_create_conf(ngx_cycle_t *cycle)
-{
-    ngx_rtmp_auto_push_conf_t       *apcf;
-
-    apcf = ngx_pcalloc(cycle->pool, sizeof(ngx_rtmp_auto_push_conf_t));
-    if (apcf == NULL) {
-        return NULL;
-    }
-
-    apcf->auto_push = NGX_CONF_UNSET;
-    apcf->push_reconnect = NGX_CONF_UNSET_MSEC;
-
-    return apcf;
-}
-
-
-static char *
-ngx_rtmp_auto_push_init_conf(ngx_cycle_t *cycle, void *conf)
-{
-    ngx_rtmp_auto_push_conf_t      *apcf = conf;
-
-    ngx_conf_init_value(apcf->auto_push, 0);
-    ngx_conf_init_msec_value(apcf->push_reconnect, 100);
-
-    if (apcf->socket_dir.len == 0) {
-        ngx_str_set(&apcf->socket_dir, "/tmp");
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-#if (NGX_HAVE_UNIX_DOMAIN)
-static void
-ngx_rtmp_auto_push_reconnect(ngx_event_t *ev)
-{
-    ngx_rtmp_session_t             *s = ev->data;
-
-    ngx_rtmp_auto_push_conf_t      *apcf;
-    ngx_rtmp_auto_push_ctx_t       *ctx;
-    ngx_int_t                      *slot;
-    ngx_int_t                       n;
-    ngx_rtmp_relay_target_t         at;
-    u_char                          path[sizeof("unix:") + NGX_MAX_PATH];
-    u_char                          flash_ver[sizeof("APSH ,") +
-                                              NGX_INT_T_LEN * 2];
-    u_char                          play_path[NGX_RTMP_MAX_NAME];
-    ngx_str_t                       name;
-    u_char                         *p;
-    ngx_str_t                      *u;
-    ngx_pid_t                       pid;
-    ngx_int_t                       npushed;
-    ngx_core_conf_t                *ccf;
-    ngx_file_info_t                 fi;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "auto_push: reconnect");
-
-    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                                    ngx_rtmp_auto_push_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_index_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    name.data = ctx->name;
-    name.len = ngx_strlen(name.data);
-
-    ngx_memzero(&at, sizeof(at));
-    ngx_str_set(&at.page_url, "nginx-auto-push");
-    at.tag = &ngx_rtmp_auto_push_module;
-
-    if (ctx->args[0]) {
-        at.play_path.data = play_path;
-        at.play_path.len = ngx_snprintf(play_path, sizeof(play_path),
-                                        "%s?%s", ctx->name, ctx->args) -
-                           play_path;
-    }
-
-    slot = ctx->slots;
-    npushed = 0;
-
-    for (n = 0; n < NGX_MAX_PROCESSES; ++n, ++slot) {
-        if (n == ngx_process_slot) {
-            continue;
-        }
-
-        pid = ngx_processes[n].pid;
-        if (pid == 0 || pid == NGX_INVALID_PID) {
-            continue;
-        }
-
-        if (*slot) {
-            npushed++;
-            continue;
-        }
-
-        at.data = &ngx_processes[n];
-
-        ngx_memzero(&at.url, sizeof(at.url));
-        u = &at.url.url;
-        p = ngx_snprintf(path, sizeof(path) - 1,
-                         "unix:%V/" NGX_RTMP_AUTO_PUSH_SOCKNAME ".%i",
-                         &apcf->socket_dir, n);
-        *p = 0;
-
-        if (ngx_file_info(path + sizeof("unix:") - 1, &fi) != NGX_OK) {
-            ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "auto_push: " ngx_file_info_n " failed: "
-                           "slot=%i pid=%P socket='%s'" "url='%V' name='%s'",
-                           n, pid, path, u, ctx->name);
-            continue;
-        }
-
-        u->data = path;
-        u->len = p - path;
-        if (ngx_parse_url(s->connection->pool, &at.url) != NGX_OK) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "auto_push: auto-push parse_url failed "
-                          "url='%V' name='%s'",
-                          u, ctx->name);
-            continue;
-        }
-
-        p = ngx_snprintf(flash_ver, sizeof(flash_ver) - 1, "APSH %i,%i",
-                         (ngx_int_t) ngx_process_slot, (ngx_int_t) ngx_pid);
-        at.flash_ver.data = flash_ver;
-        at.flash_ver.len = p - flash_ver;
-
-        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "auto_push: connect slot=%i pid=%P socket='%s' name='%s'",
-                       n, pid, path, ctx->name);
-
-        if (ngx_rtmp_relay_push(s, &name, &at) == NGX_OK) {
-            *slot = 1;
-            npushed++;
-            continue;
-        }
-
-        ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                      "auto_push: connect failed: slot=%i pid=%P socket='%s'"
-                      "url='%V' name='%s'",
-                      n, pid, path, u, ctx->name);
-    }
-
-    ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                           ngx_core_module);
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "auto_push: pushed=%i total=%i failed=%i",
-                   npushed, ccf->worker_processes,
-                   ccf->worker_processes - 1 - npushed);
-
-    if (ccf->worker_processes == npushed + 1) {
-        return;
-    }
-
-    /* several workers failed */
-
-    slot = ctx->slots;
-
-    for (n = 0; n < NGX_MAX_PROCESSES; ++n, ++slot) {
-        pid = ngx_processes[n].pid;
-
-        if (n == ngx_process_slot || *slot == 1 ||
-            pid == 0 || pid == NGX_INVALID_PID)
-        {
-            continue;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "auto_push: connect failed: slot=%i pid=%P name='%s'",
-                      n, pid, ctx->name);
-    }
-
-    if (!ctx->push_evt.timer_set) {
-        ngx_add_timer(&ctx->push_evt, apcf->push_reconnect);
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_auto_push_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    ngx_rtmp_auto_push_conf_t      *apcf;
-    ngx_rtmp_auto_push_ctx_t       *ctx;
-
-    if (s->auto_pushed || (s->relay && !s->static_relay)) {
-        goto next;
-    }
-
-    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                                    ngx_rtmp_auto_push_module);
-    if (apcf->auto_push == 0) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_index_module);
-    if (ctx == NULL) {
-        ctx = ngx_palloc(s->connection->pool,
-                         sizeof(ngx_rtmp_auto_push_ctx_t));
-        if (ctx == NULL) {
-            goto next;
-        }
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_auto_push_index_module);
-
-    }
-    ngx_memzero(ctx, sizeof(*ctx));
-
-    ctx->push_evt.data = s;
-    ctx->push_evt.log = s->connection->log;
-    ctx->push_evt.handler = ngx_rtmp_auto_push_reconnect;
-
-    ctx->slots = ngx_pcalloc(s->connection->pool,
-                             sizeof(ngx_int_t) * NGX_MAX_PROCESSES);
-    if (ctx->slots == NULL) {
-        goto next;
-    }
-
-    ngx_memcpy(ctx->name, v->name, sizeof(ctx->name));
-    ngx_memcpy(ctx->args, v->args, sizeof(ctx->args));
-
-    ngx_rtmp_auto_push_reconnect(&ctx->push_evt);
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_auto_push_delete_stream(ngx_rtmp_session_t *s,
-    ngx_rtmp_delete_stream_t *v)
-{
-    ngx_rtmp_auto_push_conf_t      *apcf;
-    ngx_rtmp_auto_push_ctx_t       *ctx, *pctx;
-    ngx_rtmp_relay_ctx_t           *rctx;
-    ngx_int_t                       slot;
-
-    apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx,
-                                                    ngx_rtmp_auto_push_module);
-    if (apcf->auto_push == 0) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_auto_push_index_module);
-    if (ctx) {
-        if (ctx->push_evt.timer_set) {
-            ngx_del_timer(&ctx->push_evt);
-        }
-        goto next;
-    }
-
-    /* skip non-relays & publishers */
-    rctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (rctx == NULL ||
-        rctx->tag != &ngx_rtmp_auto_push_module ||
-        rctx->publish == NULL)
-    {
-        goto next;
-    }
-
-    slot = (ngx_process_t *) rctx->data - &ngx_processes[0];
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "auto_push: disconnect slot=%i app='%V' name='%V'",
-                   slot, &rctx->app, &rctx->name);
-
-    pctx = ngx_rtmp_get_module_ctx(rctx->publish->session,
-                                   ngx_rtmp_auto_push_index_module);
-    if (pctx == NULL) {
-        goto next;
-    }
-
-    pctx->slots[slot] = 0;
-
-    /* push reconnect */
-    if (!pctx->push_evt.timer_set) {
-        ngx_add_timer(&pctx->push_evt, apcf->push_reconnect);
-    }
-
-next:
-    return next_delete_stream(s, v);
-}
-#endif /* NGX_HAVE_UNIX_DOMAIN */
diff --git a/debian/modules/rtmp/ngx_rtmp_bandwidth.c b/debian/modules/rtmp/ngx_rtmp_bandwidth.c
deleted file mode 100644
index 82f9f0d..0000000
--- a/debian/modules/rtmp/ngx_rtmp_bandwidth.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_bandwidth.h"
-
-
-void
-ngx_rtmp_update_bandwidth(ngx_rtmp_bandwidth_t *bw, uint32_t bytes)
-{
-    if (ngx_cached_time->sec > bw->intl_end) {
-        bw->bandwidth = ngx_cached_time->sec >
-            bw->intl_end + NGX_RTMP_BANDWIDTH_INTERVAL
-            ? 0
-            : bw->intl_bytes / NGX_RTMP_BANDWIDTH_INTERVAL;
-        bw->intl_bytes = 0;
-        bw->intl_end = ngx_cached_time->sec + NGX_RTMP_BANDWIDTH_INTERVAL;
-    }
-
-    bw->bytes += bytes;
-    bw->intl_bytes += bytes;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_bandwidth.h b/debian/modules/rtmp/ngx_rtmp_bandwidth.h
deleted file mode 100644
index b498482..0000000
--- a/debian/modules/rtmp/ngx_rtmp_bandwidth.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_BANDWIDTH_H_INCLUDED_
-#define _NGX_RTMP_BANDWIDTH_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-
-
-/* Bandwidth update interval in seconds */
-#define NGX_RTMP_BANDWIDTH_INTERVAL     10
-
-
-typedef struct {
-    uint64_t            bytes;
-    uint64_t            bandwidth;      /* bytes/sec */
-
-    time_t              intl_end;
-    uint64_t            intl_bytes;
-} ngx_rtmp_bandwidth_t;
-
-
-void ngx_rtmp_update_bandwidth(ngx_rtmp_bandwidth_t *bw, uint32_t bytes);
-
-
-#endif /* _NGX_RTMP_BANDWIDTH_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_bitop.c b/debian/modules/rtmp/ngx_rtmp_bitop.c
deleted file mode 100644
index 855d425..0000000
--- a/debian/modules/rtmp/ngx_rtmp_bitop.c
+++ /dev/null
@@ -1,63 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_bitop.h"
-
-
-void
-ngx_rtmp_bit_init_reader(ngx_rtmp_bit_reader_t *br, u_char *pos, u_char *last)
-{
-    ngx_memzero(br, sizeof(ngx_rtmp_bit_reader_t));
-
-    br->pos = pos;
-    br->last = last;
-}
-
-
-uint64_t
-ngx_rtmp_bit_read(ngx_rtmp_bit_reader_t *br, ngx_uint_t n)
-{
-    uint64_t    v;
-    ngx_uint_t  d;
-
-    v = 0;
-
-    while (n) {
-
-        if (br->pos >= br->last) {
-            br->err = 1;
-            return 0;
-        }
-
-        d = (br->offs + n > 8 ? (ngx_uint_t) (8 - br->offs) : n);
-
-        v <<= d;
-        v += (*br->pos >> (8 - br->offs - d)) & ((u_char) 0xff >> (8 - d));
-
-        br->offs += d;
-        n -= d;
-
-        if (br->offs == 8) {
-            br->pos++;
-            br->offs = 0;
-        }
-    }
-
-    return v;
-}
-
-
-uint64_t
-ngx_rtmp_bit_read_golomb(ngx_rtmp_bit_reader_t *br)
-{
-    ngx_uint_t  n;
-
-    for (n = 0; ngx_rtmp_bit_read(br, 1) == 0 && !br->err; n++);
-
-    return ((uint64_t) 1 << n) + ngx_rtmp_bit_read(br, n) - 1;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_bitop.h b/debian/modules/rtmp/ngx_rtmp_bitop.h
deleted file mode 100644
index c954a35..0000000
--- a/debian/modules/rtmp/ngx_rtmp_bitop.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_BITOP_H_INCLUDED_
-#define _NGX_RTMP_BITOP_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-
-
-typedef struct {
-    u_char      *pos;
-    u_char      *last;
-    ngx_uint_t   offs;
-    ngx_uint_t   err;
-} ngx_rtmp_bit_reader_t;
-
-
-void ngx_rtmp_bit_init_reader(ngx_rtmp_bit_reader_t *br, u_char *pos,
-    u_char *last);
-uint64_t ngx_rtmp_bit_read(ngx_rtmp_bit_reader_t *br, ngx_uint_t n);
-uint64_t ngx_rtmp_bit_read_golomb(ngx_rtmp_bit_reader_t *br);
-
-
-#define ngx_rtmp_bit_read_err(br) ((br)->err)
-
-#define ngx_rtmp_bit_read_eof(br) ((br)->pos == (br)->last)
-
-#define ngx_rtmp_bit_read_8(br)                                               \
-    ((uint8_t) ngx_rtmp_bit_read(br, 8))
-
-#define ngx_rtmp_bit_read_16(br)                                              \
-    ((uint16_t) ngx_rtmp_bit_read(br, 16))
-
-#define ngx_rtmp_bit_read_32(br)                                              \
-    ((uint32_t) ngx_rtmp_bit_read(br, 32))
-
-#define ngx_rtmp_bit_read_64(br)                                              \
-    ((uint64_t) ngx_rtmp_read(br, 64))
-
-
-#endif /* _NGX_RTMP_BITOP_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_cmd_module.c b/debian/modules/rtmp/ngx_rtmp_cmd_module.c
deleted file mode 100644
index 13f6677..0000000
--- a/debian/modules/rtmp/ngx_rtmp_cmd_module.c
+++ /dev/null
@@ -1,856 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_streams.h"
-
-
-#define NGX_RTMP_FMS_VERSION        "FMS/3,0,1,123"
-#define NGX_RTMP_CAPABILITIES       31
-
-
-static ngx_int_t ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s,
-       ngx_rtmp_connect_t *v);
-static ngx_int_t ngx_rtmp_cmd_disconnect(ngx_rtmp_session_t *s);
-static ngx_int_t ngx_rtmp_cmd_create_stream(ngx_rtmp_session_t *s,
-       ngx_rtmp_create_stream_t *v);
-static ngx_int_t ngx_rtmp_cmd_close_stream(ngx_rtmp_session_t *s,
-       ngx_rtmp_close_stream_t *v);
-static ngx_int_t ngx_rtmp_cmd_delete_stream(ngx_rtmp_session_t *s,
-       ngx_rtmp_delete_stream_t *v);
-static ngx_int_t ngx_rtmp_cmd_publish(ngx_rtmp_session_t *s,
-       ngx_rtmp_publish_t *v);
-static ngx_int_t ngx_rtmp_cmd_play(ngx_rtmp_session_t *s,
-       ngx_rtmp_play_t *v);
-static ngx_int_t ngx_rtmp_cmd_seek(ngx_rtmp_session_t *s,
-       ngx_rtmp_seek_t *v);
-static ngx_int_t ngx_rtmp_cmd_pause(ngx_rtmp_session_t *s,
-       ngx_rtmp_pause_t *v);
-
-
-static ngx_int_t ngx_rtmp_cmd_stream_begin(ngx_rtmp_session_t *s,
-       ngx_rtmp_stream_begin_t *v);
-static ngx_int_t ngx_rtmp_cmd_stream_eof(ngx_rtmp_session_t *s,
-       ngx_rtmp_stream_eof_t *v);
-static ngx_int_t ngx_rtmp_cmd_stream_dry(ngx_rtmp_session_t *s,
-       ngx_rtmp_stream_dry_t *v);
-static ngx_int_t ngx_rtmp_cmd_recorded(ngx_rtmp_session_t *s,
-       ngx_rtmp_recorded_t *v);
-static ngx_int_t ngx_rtmp_cmd_set_buflen(ngx_rtmp_session_t *s,
-       ngx_rtmp_set_buflen_t *v);
-
-
-ngx_rtmp_connect_pt         ngx_rtmp_connect;
-ngx_rtmp_disconnect_pt      ngx_rtmp_disconnect;
-ngx_rtmp_create_stream_pt   ngx_rtmp_create_stream;
-ngx_rtmp_close_stream_pt    ngx_rtmp_close_stream;
-ngx_rtmp_delete_stream_pt   ngx_rtmp_delete_stream;
-ngx_rtmp_publish_pt         ngx_rtmp_publish;
-ngx_rtmp_play_pt            ngx_rtmp_play;
-ngx_rtmp_seek_pt            ngx_rtmp_seek;
-ngx_rtmp_pause_pt           ngx_rtmp_pause;
-
-
-ngx_rtmp_stream_begin_pt    ngx_rtmp_stream_begin;
-ngx_rtmp_stream_eof_pt      ngx_rtmp_stream_eof;
-ngx_rtmp_stream_dry_pt      ngx_rtmp_stream_dry;
-ngx_rtmp_recorded_pt        ngx_rtmp_recorded;
-ngx_rtmp_set_buflen_pt      ngx_rtmp_set_buflen;
-
-
-static ngx_int_t ngx_rtmp_cmd_postconfiguration(ngx_conf_t *cf);
-
-
-static ngx_rtmp_module_t  ngx_rtmp_cmd_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_cmd_postconfiguration,         /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    NULL,                                   /* create app configuration */
-    NULL                                    /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_cmd_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_cmd_module_ctx,               /* module context */
-    NULL,                                   /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-void
-ngx_rtmp_cmd_fill_args(u_char name[NGX_RTMP_MAX_NAME],
-        u_char args[NGX_RTMP_MAX_ARGS])
-{
-    u_char      *p;
-
-    p = (u_char *)ngx_strchr(name, '?');
-    if (p == NULL) {
-        return;
-    }
-
-    *p++ = 0;
-    ngx_cpystrn(args, p, NGX_RTMP_MAX_ARGS);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_connect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    size_t                      len;
-
-    static ngx_rtmp_connect_t   v;
-
-    static ngx_rtmp_amf_elt_t  in_cmd[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("app"),
-          v.app, sizeof(v.app) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("flashVer"),
-          v.flashver, sizeof(v.flashver) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("swfUrl"),
-          v.swf_url, sizeof(v.swf_url) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("tcUrl"),
-          v.tc_url, sizeof(v.tc_url) },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("audioCodecs"),
-          &v.acodecs, sizeof(v.acodecs) },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("videoCodecs"),
-          &v.vcodecs, sizeof(v.vcodecs) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("pageUrl"),
-          v.page_url, sizeof(v.page_url) },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("objectEncoding"),
-          &v.object_encoding, 0},
-    };
-
-    static ngx_rtmp_amf_elt_t  in_elts[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.trans, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          in_cmd, sizeof(in_cmd) },
-    };
-
-    ngx_memzero(&v, sizeof(v));
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    len = ngx_strlen(v.app);
-    if (len > 10 && !ngx_memcmp(v.app + len - 10, "/_definst_", 10)) {
-        v.app[len - 10] = 0;
-    } else if (len && v.app[len - 1] == '/') {
-        v.app[len - 1] = 0;
-    }
-
-    ngx_rtmp_cmd_fill_args(v.app, v.args);
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-            "connect: app='%s' args='%s' flashver='%s' swf_url='%s' "
-            "tc_url='%s' page_url='%s' acodecs=%uD vcodecs=%uD "
-            "object_encoding=%ui",
-            v.app, v.args, v.flashver, v.swf_url, v.tc_url, v.page_url,
-            (uint32_t)v.acodecs, (uint32_t)v.vcodecs,
-            (ngx_int_t)v.object_encoding);
-
-    return ngx_rtmp_connect(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v)
-{
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    ngx_rtmp_core_app_conf_t  **cacfp;
-    ngx_uint_t                  n;
-    ngx_rtmp_header_t           h;
-    u_char                     *p;
-
-    static double               trans;
-    static double               capabilities = NGX_RTMP_CAPABILITIES;
-    static double               object_encoding = 0;
-
-    static ngx_rtmp_amf_elt_t  out_obj[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("fmsVer"),
-          NGX_RTMP_FMS_VERSION, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("capabilities"),
-          &capabilities, 0 },
-    };
-
-    static ngx_rtmp_amf_elt_t  out_inf[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("level"),
-          "status", 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("code"),
-          "NetConnection.Connect.Success", 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("description"),
-          "Connection succeeded.", 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("objectEncoding"),
-          &object_encoding, 0 }
-    };
-
-    static ngx_rtmp_amf_elt_t  out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "_result", 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &trans, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          out_obj, sizeof(out_obj) },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          out_inf, sizeof(out_inf) },
-    };
-
-    if (s->connected) {
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                "connect: duplicate connection");
-        return NGX_ERROR;
-    }
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    trans = v->trans;
-
-    /* fill session parameters */
-    s->connected = 1;
-
-    ngx_memzero(&h, sizeof(h));
-    h.csid = NGX_RTMP_CSID_AMF_INI;
-    h.type = NGX_RTMP_MSG_AMF_CMD;
-
-
-#define NGX_RTMP_SET_STRPAR(name)                                             \
-    s->name.len = ngx_strlen(v->name);                                        \
-    s->name.data = ngx_palloc(s->connection->pool, s->name.len);              \
-    ngx_memcpy(s->name.data, v->name, s->name.len)
-
-    NGX_RTMP_SET_STRPAR(app);
-    NGX_RTMP_SET_STRPAR(args);
-    NGX_RTMP_SET_STRPAR(flashver);
-    NGX_RTMP_SET_STRPAR(swf_url);
-    NGX_RTMP_SET_STRPAR(tc_url);
-    NGX_RTMP_SET_STRPAR(page_url);
-
-#undef NGX_RTMP_SET_STRPAR
-
-    p = ngx_strlchr(s->app.data, s->app.data + s->app.len, '?');
-    if (p) {
-        s->app.len = (p - s->app.data);
-    }
-
-    s->acodecs = (uint32_t) v->acodecs;
-    s->vcodecs = (uint32_t) v->vcodecs;
-
-    /* find application & set app_conf */
-    cacfp = cscf->applications.elts;
-    for(n = 0; n < cscf->applications.nelts; ++n, ++cacfp) {
-        if ((*cacfp)->name.len == s->app.len &&
-            ngx_strncmp((*cacfp)->name.data, s->app.data, s->app.len) == 0)
-        {
-            /* found app! */
-            s->app_conf = (*cacfp)->app_conf;
-            break;
-        }
-    }
-
-    if (s->app_conf == NULL) {
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                      "connect: application not found: '%V'", &s->app);
-        return NGX_ERROR;
-    }
-
-    object_encoding = v->object_encoding;
-
-    return ngx_rtmp_send_ack_size(s, cscf->ack_window) != NGX_OK ||
-           ngx_rtmp_send_bandwidth(s, cscf->ack_window,
-                                   NGX_RTMP_LIMIT_DYNAMIC) != NGX_OK ||
-           ngx_rtmp_send_chunk_size(s, cscf->chunk_size) != NGX_OK ||
-           ngx_rtmp_send_amf(s, &h, out_elts,
-                             sizeof(out_elts) / sizeof(out_elts[0]))
-           != NGX_OK ? NGX_ERROR : NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_create_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                                ngx_chain_t *in)
-{
-    static ngx_rtmp_create_stream_t     v;
-
-    static ngx_rtmp_amf_elt_t  in_elts[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.trans, sizeof(v.trans) },
-    };
-
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, "createStream");
-
-    return ngx_rtmp_create_stream(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_create_stream(ngx_rtmp_session_t *s, ngx_rtmp_create_stream_t *v)
-{
-    /* support one message stream per connection */
-    static double               stream;
-    static double               trans;
-    ngx_rtmp_header_t           h;
-
-    static ngx_rtmp_amf_elt_t  out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "_result", 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &trans, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &stream, sizeof(stream) },
-    };
-
-    trans = v->trans;
-    stream = NGX_RTMP_MSID;
-
-    ngx_memzero(&h, sizeof(h));
-
-    h.csid = NGX_RTMP_CSID_AMF_INI;
-    h.type = NGX_RTMP_MSG_AMF_CMD;
-
-    return ngx_rtmp_send_amf(s, &h, out_elts,
-                             sizeof(out_elts) / sizeof(out_elts[0])) == NGX_OK ?
-           NGX_DONE : NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_close_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                               ngx_chain_t *in)
-{
-    static ngx_rtmp_close_stream_t     v;
-
-    static ngx_rtmp_amf_elt_t  in_elts[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.stream, 0 },
-    };
-
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                             sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, "closeStream");
-
-    return ngx_rtmp_close_stream(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
-{
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_delete_stream_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                                ngx_chain_t *in)
-{
-    static ngx_rtmp_delete_stream_t     v;
-
-    static ngx_rtmp_amf_elt_t  in_elts[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.stream, 0 },
-    };
-
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                             sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    return ngx_rtmp_delete_stream(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_delete_stream(ngx_rtmp_session_t *s, ngx_rtmp_delete_stream_t *v)
-{
-    ngx_rtmp_close_stream_t         cv;
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, "deleteStream");
-
-    cv.stream = 0;
-
-    return ngx_rtmp_close_stream(s, &cv);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_publish_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    static ngx_rtmp_publish_t       v;
-
-    static ngx_rtmp_amf_elt_t      in_elts[] = {
-
-        /* transaction is always 0 */
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          &v.name, sizeof(v.name) },
-
-        { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          &v.type, sizeof(v.type) },
-    };
-
-    ngx_memzero(&v, sizeof(v));
-
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                             sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_rtmp_cmd_fill_args(v.name, v.args);
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "publish: name='%s' args='%s' type=%s silent=%d",
-                  v.name, v.args, v.type, v.silent);
-
-    return ngx_rtmp_publish(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    return NGX_OK;
-}
-
-static ngx_int_t
-ngx_rtmp_cmd_play_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    static ngx_rtmp_play_t          v;
-
-    static ngx_rtmp_amf_elt_t       in_elts[] = {
-
-        /* transaction is always 0 */
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          &v.name, sizeof(v.name) },
-
-        { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.start, 0 },
-
-        { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.duration, 0 },
-
-        { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_BOOLEAN,
-          ngx_null_string,
-          &v.reset, 0 }
-    };
-
-    ngx_memzero(&v, sizeof(v));
-
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                             sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_rtmp_cmd_fill_args(v.name, v.args);
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "play: name='%s' args='%s' start=%i duration=%i "
-                  "reset=%i silent=%i",
-                  v.name, v.args, (ngx_int_t) v.start,
-                  (ngx_int_t) v.duration, (ngx_int_t) v.reset,
-                  (ngx_int_t) v.silent);
-
-    return ngx_rtmp_play(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_play2_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    static ngx_rtmp_play_t          v;
-    static ngx_rtmp_close_stream_t  vc;
-
-    static ngx_rtmp_amf_elt_t       in_obj[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("start"),
-          &v.start, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("streamName"),
-          &v.name, sizeof(v.name) },
-    };
-
-    static ngx_rtmp_amf_elt_t       in_elts[] = {
-
-        /* transaction is always 0 */
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          &in_obj, sizeof(in_obj) }
-    };
-
-    ngx_memzero(&v, sizeof(v));
-
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                             sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_rtmp_cmd_fill_args(v.name, v.args);
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "play2: name='%s' args='%s' start=%i",
-                  v.name, v.args, (ngx_int_t) v.start);
-
-    /* continue from current timestamp */
-
-    if (v.start < 0) {
-        v.start = s->current_time;
-    }
-
-    ngx_memzero(&vc, sizeof(vc));
-
-    /* close_stream should be synchronous */
-    ngx_rtmp_close_stream(s, &vc);
-
-    return ngx_rtmp_play(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_pause_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    static ngx_rtmp_pause_t     v;
-
-    static ngx_rtmp_amf_elt_t   in_elts[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_BOOLEAN,
-          ngx_null_string,
-          &v.pause, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.position, 0 },
-    };
-
-    ngx_memzero(&v, sizeof(v));
-
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "pause: pause=%i position=%i",
-                    (ngx_int_t) v.pause, (ngx_int_t) v.position);
-
-    return ngx_rtmp_pause(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_pause(ngx_rtmp_session_t *s, ngx_rtmp_pause_t *v)
-{
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_disconnect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                        ngx_chain_t *in)
-{
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, "disconnect");
-
-    return ngx_rtmp_disconnect(s);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_disconnect(ngx_rtmp_session_t *s)
-{
-    return ngx_rtmp_delete_stream(s, NULL);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_seek_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    static ngx_rtmp_seek_t         v;
-
-    static ngx_rtmp_amf_elt_t      in_elts[] = {
-
-        /* transaction is always 0 */
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.offset, sizeof(v.offset) },
-    };
-
-    ngx_memzero(&v, sizeof(v));
-
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                             sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "seek: offset=%i", (ngx_int_t) v.offset);
-
-    return ngx_rtmp_seek(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_seek(ngx_rtmp_session_t *s, ngx_rtmp_seek_t *v)
-{
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
-{
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_eof_t *v)
-{
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_stream_dry(ngx_rtmp_session_t *s, ngx_rtmp_stream_dry_t *v)
-{
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_recorded(ngx_rtmp_session_t *s,
-                      ngx_rtmp_recorded_t *v)
-{
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_cmd_set_buflen(ngx_rtmp_session_t *s, ngx_rtmp_set_buflen_t *v)
-{
-    return NGX_OK;
-}
-
-
-static ngx_rtmp_amf_handler_t ngx_rtmp_cmd_map[] = {
-    { ngx_string("connect"),            ngx_rtmp_cmd_connect_init           },
-    { ngx_string("createStream"),       ngx_rtmp_cmd_create_stream_init     },
-    { ngx_string("closeStream"),        ngx_rtmp_cmd_close_stream_init      },
-    { ngx_string("deleteStream"),       ngx_rtmp_cmd_delete_stream_init     },
-    { ngx_string("publish"),            ngx_rtmp_cmd_publish_init           },
-    { ngx_string("play"),               ngx_rtmp_cmd_play_init              },
-    { ngx_string("play2"),              ngx_rtmp_cmd_play2_init             },
-    { ngx_string("seek"),               ngx_rtmp_cmd_seek_init              },
-    { ngx_string("pause"),              ngx_rtmp_cmd_pause_init             },
-    { ngx_string("pauseraw"),           ngx_rtmp_cmd_pause_init             },
-};
-
-
-static ngx_int_t
-ngx_rtmp_cmd_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t          *cmcf;
-    ngx_rtmp_handler_pt                *h;
-    ngx_rtmp_amf_handler_t             *ch, *bh;
-    size_t                              n, ncalls;
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    /* redirect disconnects to deleteStream
-     * to free client modules from registering
-     * disconnect callback */
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    *h = ngx_rtmp_cmd_disconnect_init;
-
-    /* register AMF callbacks */
-
-    ncalls = sizeof(ngx_rtmp_cmd_map) / sizeof(ngx_rtmp_cmd_map[0]);
-
-    ch = ngx_array_push_n(&cmcf->amf, ncalls);
-    if (ch == NULL) {
-        return NGX_ERROR;
-    }
-
-    bh = ngx_rtmp_cmd_map;
-
-    for(n = 0; n < ncalls; ++n, ++ch, ++bh) {
-        *ch = *bh;
-    }
-
-    ngx_rtmp_connect = ngx_rtmp_cmd_connect;
-    ngx_rtmp_disconnect = ngx_rtmp_cmd_disconnect;
-    ngx_rtmp_create_stream = ngx_rtmp_cmd_create_stream;
-    ngx_rtmp_close_stream = ngx_rtmp_cmd_close_stream;
-    ngx_rtmp_delete_stream = ngx_rtmp_cmd_delete_stream;
-    ngx_rtmp_publish = ngx_rtmp_cmd_publish;
-    ngx_rtmp_play = ngx_rtmp_cmd_play;
-    ngx_rtmp_seek = ngx_rtmp_cmd_seek;
-    ngx_rtmp_pause = ngx_rtmp_cmd_pause;
-
-    ngx_rtmp_stream_begin = ngx_rtmp_cmd_stream_begin;
-    ngx_rtmp_stream_eof = ngx_rtmp_cmd_stream_eof;
-    ngx_rtmp_stream_dry = ngx_rtmp_cmd_stream_dry;
-    ngx_rtmp_recorded = ngx_rtmp_cmd_recorded;
-    ngx_rtmp_set_buflen = ngx_rtmp_cmd_set_buflen;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_cmd_module.h b/debian/modules/rtmp/ngx_rtmp_cmd_module.h
deleted file mode 100644
index 4a0b955..0000000
--- a/debian/modules/rtmp/ngx_rtmp_cmd_module.h
+++ /dev/null
@@ -1,151 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_CMD_H_INCLUDED_
-#define _NGX_RTMP_CMD_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_event.h>
-#include "ngx_rtmp.h"
-
-
-#define NGX_RTMP_MAX_NAME           256
-#define NGX_RTMP_MAX_URL            256
-#define NGX_RTMP_MAX_ARGS           NGX_RTMP_MAX_NAME
-
-
-/* Basic RTMP call support */
-
-typedef struct {
-    double                          trans;
-    u_char                          app[NGX_RTMP_MAX_NAME];
-    u_char                          args[NGX_RTMP_MAX_ARGS];
-    u_char                          flashver[32];
-    u_char                          swf_url[NGX_RTMP_MAX_URL];
-    u_char                          tc_url[NGX_RTMP_MAX_URL];
-    double                          acodecs;
-    double                          vcodecs;
-    u_char                          page_url[NGX_RTMP_MAX_URL];
-    double                          object_encoding;
-} ngx_rtmp_connect_t;
-
-
-typedef struct {
-    double                          trans;
-    double                          stream;
-} ngx_rtmp_create_stream_t;
-
-
-typedef struct {
-    double                          stream;
-} ngx_rtmp_delete_stream_t;
-
-
-typedef struct {
-    double                          stream;
-} ngx_rtmp_close_stream_t;
-
-
-typedef struct {
-    u_char                          name[NGX_RTMP_MAX_NAME];
-    u_char                          args[NGX_RTMP_MAX_ARGS];
-    u_char                          type[16];
-    int                             silent;
-} ngx_rtmp_publish_t;
-
-
-typedef struct {
-    u_char                          name[NGX_RTMP_MAX_NAME];
-    u_char                          args[NGX_RTMP_MAX_ARGS];
-    double                          start;
-    double                          duration;
-    int                             reset;
-    int                             silent;
-} ngx_rtmp_play_t;
-
-
-typedef struct {
-    double                          offset;
-} ngx_rtmp_seek_t;
-
-
-typedef struct {
-    uint8_t                         pause;
-    double                          position;
-} ngx_rtmp_pause_t;
-
-
-typedef struct {
-    uint32_t                        msid;
-} ngx_rtmp_msid_t;
-
-
-typedef ngx_rtmp_msid_t             ngx_rtmp_stream_begin_t;
-typedef ngx_rtmp_msid_t             ngx_rtmp_stream_eof_t;
-typedef ngx_rtmp_msid_t             ngx_rtmp_stream_dry_t;
-typedef ngx_rtmp_msid_t             ngx_rtmp_recorded_t;
-
-
-typedef struct {
-    uint32_t                        msid;
-    uint32_t                        buflen;
-} ngx_rtmp_set_buflen_t;
-
-
-void ngx_rtmp_cmd_fill_args(u_char name[NGX_RTMP_MAX_NAME],
-        u_char args[NGX_RTMP_MAX_ARGS]);
-
-
-typedef ngx_int_t (*ngx_rtmp_connect_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_connect_t *v);
-typedef ngx_int_t (*ngx_rtmp_disconnect_pt)(ngx_rtmp_session_t *s);
-typedef ngx_int_t (*ngx_rtmp_create_stream_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_create_stream_t *v);
-typedef ngx_int_t (*ngx_rtmp_close_stream_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_close_stream_t *v);
-typedef ngx_int_t (*ngx_rtmp_delete_stream_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_delete_stream_t *v);
-typedef ngx_int_t (*ngx_rtmp_publish_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_publish_t *v);
-typedef ngx_int_t (*ngx_rtmp_play_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_play_t *v);
-typedef ngx_int_t (*ngx_rtmp_seek_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_seek_t *v);
-typedef ngx_int_t (*ngx_rtmp_pause_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_pause_t *v);
-
-typedef ngx_int_t (*ngx_rtmp_stream_begin_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_stream_begin_t *v);
-typedef ngx_int_t (*ngx_rtmp_stream_eof_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_stream_eof_t *v);
-typedef ngx_int_t (*ngx_rtmp_stream_dry_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_stream_dry_t *v);
-typedef ngx_int_t (*ngx_rtmp_recorded_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_recorded_t *v);
-typedef ngx_int_t (*ngx_rtmp_set_buflen_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_set_buflen_t *v);
-
-
-extern ngx_rtmp_connect_pt          ngx_rtmp_connect;
-extern ngx_rtmp_disconnect_pt       ngx_rtmp_disconnect;
-extern ngx_rtmp_create_stream_pt    ngx_rtmp_create_stream;
-extern ngx_rtmp_close_stream_pt     ngx_rtmp_close_stream;
-extern ngx_rtmp_delete_stream_pt    ngx_rtmp_delete_stream;
-extern ngx_rtmp_publish_pt          ngx_rtmp_publish;
-extern ngx_rtmp_play_pt             ngx_rtmp_play;
-extern ngx_rtmp_seek_pt             ngx_rtmp_seek;
-extern ngx_rtmp_pause_pt            ngx_rtmp_pause;
-
-extern ngx_rtmp_stream_begin_pt     ngx_rtmp_stream_begin;
-extern ngx_rtmp_stream_eof_pt       ngx_rtmp_stream_eof;
-extern ngx_rtmp_stream_dry_pt       ngx_rtmp_stream_dry;
-extern ngx_rtmp_set_buflen_pt       ngx_rtmp_set_buflen;
-extern ngx_rtmp_recorded_pt         ngx_rtmp_recorded;
-
-
-#endif /*_NGX_RTMP_CMD_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_codec_module.c b/debian/modules/rtmp/ngx_rtmp_codec_module.c
deleted file mode 100644
index ddc9273..0000000
--- a/debian/modules/rtmp/ngx_rtmp_codec_module.c
+++ /dev/null
@@ -1,956 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_codec_module.h"
-#include "ngx_rtmp_live_module.h"
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_bitop.h"
-
-
-#define NGX_RTMP_CODEC_META_OFF     0
-#define NGX_RTMP_CODEC_META_ON      1
-#define NGX_RTMP_CODEC_META_COPY    2
-
-
-static void * ngx_rtmp_codec_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_codec_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-static ngx_int_t ngx_rtmp_codec_postconfiguration(ngx_conf_t *cf);
-static ngx_int_t ngx_rtmp_codec_reconstruct_meta(ngx_rtmp_session_t *s);
-static ngx_int_t ngx_rtmp_codec_copy_meta(ngx_rtmp_session_t *s,
-       ngx_rtmp_header_t *h, ngx_chain_t *in);
-static ngx_int_t ngx_rtmp_codec_prepare_meta(ngx_rtmp_session_t *s,
-       uint32_t timestamp);
-static void ngx_rtmp_codec_parse_aac_header(ngx_rtmp_session_t *s,
-       ngx_chain_t *in);
-static void ngx_rtmp_codec_parse_avc_header(ngx_rtmp_session_t *s,
-       ngx_chain_t *in);
-#if (NGX_DEBUG)
-static void ngx_rtmp_codec_dump_header(ngx_rtmp_session_t *s, const char *type,
-       ngx_chain_t *in);
-#endif
-
-
-typedef struct {
-    ngx_uint_t                      meta;
-} ngx_rtmp_codec_app_conf_t;
-
-
-static ngx_conf_enum_t ngx_rtmp_codec_meta_slots[] = {
-    { ngx_string("off"),            NGX_RTMP_CODEC_META_OFF  },
-    { ngx_string("on"),             NGX_RTMP_CODEC_META_ON   },
-    { ngx_string("copy"),           NGX_RTMP_CODEC_META_COPY },
-    { ngx_null_string,              0 }
-};
-
-
-static ngx_command_t  ngx_rtmp_codec_commands[] = {
-
-    { ngx_string("meta"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_enum_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_codec_app_conf_t, meta),
-      &ngx_rtmp_codec_meta_slots },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_codec_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_codec_postconfiguration,       /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    ngx_rtmp_codec_create_app_conf,         /* create app configuration */
-    ngx_rtmp_codec_merge_app_conf           /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_codec_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_codec_module_ctx,             /* module context */
-    ngx_rtmp_codec_commands,                /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static const char *
-audio_codecs[] = {
-    "",
-    "ADPCM",
-    "MP3",
-    "LinearLE",
-    "Nellymoser16",
-    "Nellymoser8",
-    "Nellymoser",
-    "G711A",
-    "G711U",
-    "",
-    "AAC",
-    "Speex",
-    "",
-    "",
-    "MP3-8K",
-    "DeviceSpecific",
-    "Uncompressed"
-};
-
-
-static const char *
-video_codecs[] = {
-    "",
-    "Jpeg",
-    "Sorenson-H263",
-    "ScreenVideo",
-    "On2-VP6",
-    "On2-VP6-Alpha",
-    "ScreenVideo2",
-    "H264",
-};
-
-
-u_char *
-ngx_rtmp_get_audio_codec_name(ngx_uint_t id)
-{
-    return (u_char *)(id < sizeof(audio_codecs) / sizeof(audio_codecs[0])
-        ? audio_codecs[id]
-        : "");
-}
-
-
-u_char *
-ngx_rtmp_get_video_codec_name(ngx_uint_t id)
-{
-    return (u_char *)(id < sizeof(video_codecs) / sizeof(video_codecs[0])
-        ? video_codecs[id]
-        : "");
-}
-
-
-static ngx_uint_t
-ngx_rtmp_codec_get_next_version()
-{
-    ngx_uint_t          v;
-    static ngx_uint_t   version;
-
-    do {
-        v = ++version;
-    } while (v == 0);
-
-    return v;
-}
-
-
-static ngx_int_t
-ngx_rtmp_codec_disconnect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    ngx_rtmp_codec_ctx_t               *ctx;
-    ngx_rtmp_core_srv_conf_t           *cscf;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    if (ctx->avc_header) {
-        ngx_rtmp_free_shared_chain(cscf, ctx->avc_header);
-        ctx->avc_header = NULL;
-    }
-
-    if (ctx->aac_header) {
-        ngx_rtmp_free_shared_chain(cscf, ctx->aac_header);
-        ctx->aac_header = NULL;
-    }
-
-    if (ctx->meta) {
-        ngx_rtmp_free_shared_chain(cscf, ctx->meta);
-        ctx->meta = NULL;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_codec_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    ngx_rtmp_core_srv_conf_t           *cscf;
-    ngx_rtmp_codec_ctx_t               *ctx;
-    ngx_chain_t                       **header;
-    uint8_t                             fmt;
-    static ngx_uint_t                   sample_rates[] =
-                                        { 5512, 11025, 22050, 44100 };
-
-    if (h->type != NGX_RTMP_MSG_AUDIO && h->type != NGX_RTMP_MSG_VIDEO) {
-        return NGX_OK;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-    if (ctx == NULL) {
-        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_codec_ctx_t));
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_codec_module);
-    }
-
-    /* save codec */
-    if (in->buf->last - in->buf->pos < 1) {
-        return NGX_OK;
-    }
-
-    fmt =  in->buf->pos[0];
-    if (h->type == NGX_RTMP_MSG_AUDIO) {
-        ctx->audio_codec_id = (fmt & 0xf0) >> 4;
-        ctx->audio_channels = (fmt & 0x01) + 1;
-        ctx->sample_size = (fmt & 0x02) ? 2 : 1;
-
-        if (ctx->sample_rate == 0) {
-            ctx->sample_rate = sample_rates[(fmt & 0x0c) >> 2];
-        }
-    } else {
-        ctx->video_codec_id = (fmt & 0x0f);
-    }
-
-    /* save AVC/AAC header */
-    if (in->buf->last - in->buf->pos < 3) {
-        return NGX_OK;
-    }
-
-    /* no conf */
-    if (!ngx_rtmp_is_codec_header(in)) {
-        return NGX_OK;
-    }
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-    header = NULL;
-
-    if (h->type == NGX_RTMP_MSG_AUDIO) {
-        if (ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC) {
-            header = &ctx->aac_header;
-            ngx_rtmp_codec_parse_aac_header(s, in);
-        }
-    } else {
-        if (ctx->video_codec_id == NGX_RTMP_VIDEO_H264) {
-            header = &ctx->avc_header;
-            ngx_rtmp_codec_parse_avc_header(s, in);
-        }
-    }
-
-    if (header == NULL) {
-        return NGX_OK;
-    }
-
-    if (*header) {
-        ngx_rtmp_free_shared_chain(cscf, *header);
-    }
-
-    *header = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_codec_parse_aac_header(ngx_rtmp_session_t *s, ngx_chain_t *in)
-{
-    ngx_uint_t              idx;
-    ngx_rtmp_codec_ctx_t   *ctx;
-    ngx_rtmp_bit_reader_t   br;
-
-    static ngx_uint_t      aac_sample_rates[] =
-        { 96000, 88200, 64000, 48000,
-          44100, 32000, 24000, 22050,
-          16000, 12000, 11025,  8000,
-           7350,     0,     0,     0 };
-
-#if (NGX_DEBUG)
-    ngx_rtmp_codec_dump_header(s, "aac", in);
-#endif
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    ngx_rtmp_bit_init_reader(&br, in->buf->pos, in->buf->last);
-
-    ngx_rtmp_bit_read(&br, 16);
-
-    ctx->aac_profile = (ngx_uint_t) ngx_rtmp_bit_read(&br, 5);
-    if (ctx->aac_profile == 31) {
-        ctx->aac_profile = (ngx_uint_t) ngx_rtmp_bit_read(&br, 6) + 32;
-    }
-
-    idx = (ngx_uint_t) ngx_rtmp_bit_read(&br, 4);
-    if (idx == 15) {
-        ctx->sample_rate = (ngx_uint_t) ngx_rtmp_bit_read(&br, 24);
-    } else {
-        ctx->sample_rate = aac_sample_rates[idx];
-    }
-
-    ctx->aac_chan_conf = (ngx_uint_t) ngx_rtmp_bit_read(&br, 4);
-
-    if (ctx->aac_profile == 5 || ctx->aac_profile == 29) {
-        
-        if (ctx->aac_profile == 29) {
-            ctx->aac_ps = 1;
-        }
-
-        ctx->aac_sbr = 1;
-
-        idx = (ngx_uint_t) ngx_rtmp_bit_read(&br, 4);
-        if (idx == 15) {
-            ctx->sample_rate = (ngx_uint_t) ngx_rtmp_bit_read(&br, 24);
-        } else {
-            ctx->sample_rate = aac_sample_rates[idx];
-        }
-
-        ctx->aac_profile = (ngx_uint_t) ngx_rtmp_bit_read(&br, 5);
-        if (ctx->aac_profile == 31) {
-            ctx->aac_profile = (ngx_uint_t) ngx_rtmp_bit_read(&br, 6) + 32;
-        }
-    }
-
-    /* MPEG-4 Audio Specific Config
-
-       5 bits: object type
-       if (object type == 31)
-         6 bits + 32: object type
-       4 bits: frequency index
-       if (frequency index == 15)
-         24 bits: frequency
-       4 bits: channel configuration
-
-       if (object_type == 5)
-           4 bits: frequency index
-           if (frequency index == 15)
-             24 bits: frequency
-           5 bits: object type
-           if (object type == 31)
-             6 bits + 32: object type
-             
-       var bits: AOT Specific Config
-     */
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "codec: aac header profile=%ui, "
-                   "sample_rate=%ui, chan_conf=%ui",
-                   ctx->aac_profile, ctx->sample_rate, ctx->aac_chan_conf);
-}
-
-
-static void
-ngx_rtmp_codec_parse_avc_header(ngx_rtmp_session_t *s, ngx_chain_t *in)
-{
-    ngx_uint_t              profile_idc, width, height, crop_left, crop_right,
-                            crop_top, crop_bottom, frame_mbs_only, n, cf_idc,
-                            num_ref_frames;
-    ngx_rtmp_codec_ctx_t   *ctx;
-    ngx_rtmp_bit_reader_t   br;
-
-#if (NGX_DEBUG)
-    ngx_rtmp_codec_dump_header(s, "avc", in);
-#endif
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    ngx_rtmp_bit_init_reader(&br, in->buf->pos, in->buf->last);
-
-    ngx_rtmp_bit_read(&br, 48);
-
-    ctx->avc_profile = (ngx_uint_t) ngx_rtmp_bit_read_8(&br);
-    ctx->avc_compat = (ngx_uint_t) ngx_rtmp_bit_read_8(&br);
-    ctx->avc_level = (ngx_uint_t) ngx_rtmp_bit_read_8(&br);
-
-    /* nal bytes */
-    ctx->avc_nal_bytes = (ngx_uint_t) ((ngx_rtmp_bit_read_8(&br) & 0x03) + 1);
-
-    /* nnals */
-    if ((ngx_rtmp_bit_read_8(&br) & 0x1f) == 0) {
-        return;
-    }
-
-    /* nal size */
-    ngx_rtmp_bit_read(&br, 16);
-
-    /* nal type */
-    if (ngx_rtmp_bit_read_8(&br) != 0x67) {
-        return;
-    }
-
-    /* SPS */
-
-    /* profile idc */
-    profile_idc = (ngx_uint_t) ngx_rtmp_bit_read(&br, 8);
-
-    /* flags */
-    ngx_rtmp_bit_read(&br, 8);
-
-    /* level idc */
-    ngx_rtmp_bit_read(&br, 8);
-
-    /* SPS id */
-    ngx_rtmp_bit_read_golomb(&br);
-
-    if (profile_idc == 100 || profile_idc == 110 ||
-        profile_idc == 122 || profile_idc == 244 || profile_idc == 44 ||
-        profile_idc == 83 || profile_idc == 86 || profile_idc == 118)
-    {
-        /* chroma format idc */
-        cf_idc = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
-        
-        if (cf_idc == 3) {
-
-            /* separate color plane */
-            ngx_rtmp_bit_read(&br, 1);
-        }
-
-        /* bit depth luma - 8 */
-        ngx_rtmp_bit_read_golomb(&br);
-
-        /* bit depth chroma - 8 */
-        ngx_rtmp_bit_read_golomb(&br);
-
-        /* qpprime y zero transform bypass */
-        ngx_rtmp_bit_read(&br, 1);
-
-        /* seq scaling matrix present */
-        if (ngx_rtmp_bit_read(&br, 1)) {
-
-            for (n = 0; n < (cf_idc != 3 ? 8u : 12u); n++) {
-
-                /* seq scaling list present */
-                if (ngx_rtmp_bit_read(&br, 1)) {
-
-                    /* TODO: scaling_list()
-                    if (n < 6) {
-                    } else {
-                    }
-                    */
-                }
-            }
-        }
-    }
-
-    /* log2 max frame num */
-    ngx_rtmp_bit_read_golomb(&br);
-
-    /* pic order cnt type */
-    switch (ngx_rtmp_bit_read_golomb(&br)) {
-    case 0:
-
-        /* max pic order cnt */
-        ngx_rtmp_bit_read_golomb(&br);
-        break;
-
-    case 1:
-
-        /* delta pic order alwys zero */
-        ngx_rtmp_bit_read(&br, 1);
-
-        /* offset for non-ref pic */
-        ngx_rtmp_bit_read_golomb(&br);
-
-        /* offset for top to bottom field */
-        ngx_rtmp_bit_read_golomb(&br);
-
-        /* num ref frames in pic order */
-        num_ref_frames = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
-
-        for (n = 0; n < num_ref_frames; n++) {
-
-            /* offset for ref frame */
-            ngx_rtmp_bit_read_golomb(&br);
-        }
-    }
-
-    /* num ref frames */
-    ctx->avc_ref_frames = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
-
-    /* gaps in frame num allowed */
-    ngx_rtmp_bit_read(&br, 1);
-
-    /* pic width in mbs - 1 */
-    width = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
-
-    /* pic height in map units - 1 */
-    height = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
-
-    /* frame mbs only flag */
-    frame_mbs_only = (ngx_uint_t) ngx_rtmp_bit_read(&br, 1);
-
-    if (!frame_mbs_only) {
-
-        /* mbs adaprive frame field */
-        ngx_rtmp_bit_read(&br, 1);
-    }
-
-    /* direct 8x8 inference flag */
-    ngx_rtmp_bit_read(&br, 1);
-
-    /* frame cropping */
-    if (ngx_rtmp_bit_read(&br, 1)) {
-
-        crop_left = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
-        crop_right = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
-        crop_top = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
-        crop_bottom = (ngx_uint_t) ngx_rtmp_bit_read_golomb(&br);
-
-    } else {
-
-        crop_left = 0;
-        crop_right = 0;
-        crop_top = 0;
-        crop_bottom = 0;
-    }
-
-    ctx->width = (width + 1) * 16 - (crop_left + crop_right) * 2;
-    ctx->height = (2 - frame_mbs_only) * (height + 1) * 16 -
-                  (crop_top + crop_bottom) * 2;
-
-    ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "codec: avc header "
-                   "profile=%ui, compat=%ui, level=%ui, "
-                   "nal_bytes=%ui, ref_frames=%ui, width=%ui, height=%ui",
-                   ctx->avc_profile, ctx->avc_compat, ctx->avc_level,
-                   ctx->avc_nal_bytes, ctx->avc_ref_frames,
-                   ctx->width, ctx->height);
-}
-
-
-#if (NGX_DEBUG)
-static void
-ngx_rtmp_codec_dump_header(ngx_rtmp_session_t *s, const char *type,
-    ngx_chain_t *in)
-{
-    u_char buf[256], *p, *pp;
-    u_char hex[] = "0123456789abcdef";
-
-    for (pp = buf, p = in->buf->pos;
-         p < in->buf->last && pp < buf + sizeof(buf) - 1;
-         ++p)
-    {
-        *pp++ = hex[*p >> 4];
-        *pp++ = hex[*p & 0x0f];
-    }
-
-    *pp = 0;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "codec: %s header %s", type, buf);
-}
-#endif
-
-
-static ngx_int_t
-ngx_rtmp_codec_reconstruct_meta(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_codec_ctx_t           *ctx;
-    ngx_rtmp_core_srv_conf_t       *cscf;
-    ngx_int_t                       rc;
-
-    static struct {
-        double                      width;
-        double                      height;
-        double                      duration;
-        double                      frame_rate;
-        double                      video_data_rate;
-        double                      video_codec_id;
-        double                      audio_data_rate;
-        double                      audio_codec_id;
-        u_char                      profile[32];
-        u_char                      level[32];
-    }                               v;
-
-    static ngx_rtmp_amf_elt_t       out_inf[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("Server"),
-          "NGINX RTMP (github.com/arut/nginx-rtmp-module)", 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("width"),
-          &v.width, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("height"),
-          &v.height, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("displayWidth"),
-          &v.width, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("displayHeight"),
-          &v.height, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("duration"),
-          &v.duration, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("framerate"),
-          &v.frame_rate, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("fps"),
-          &v.frame_rate, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("videodatarate"),
-          &v.video_data_rate, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("videocodecid"),
-          &v.video_codec_id, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("audiodatarate"),
-          &v.audio_data_rate, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("audiocodecid"),
-          &v.audio_codec_id, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("profile"),
-          &v.profile, sizeof(v.profile) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("level"),
-          &v.level, sizeof(v.level) },
-    };
-
-    static ngx_rtmp_amf_elt_t       out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "onMetaData", 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          out_inf, sizeof(out_inf) },
-    };
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    if (ctx->meta) {
-        ngx_rtmp_free_shared_chain(cscf, ctx->meta);
-        ctx->meta = NULL;
-    }
-
-    v.width = ctx->width;
-    v.height = ctx->height;
-    v.duration = ctx->duration;
-    v.frame_rate = ctx->frame_rate;
-    v.video_data_rate = ctx->video_data_rate;
-    v.video_codec_id = ctx->video_codec_id;
-    v.audio_data_rate = ctx->audio_data_rate;
-    v.audio_codec_id = ctx->audio_codec_id;
-    ngx_memcpy(v.profile, ctx->profile, sizeof(ctx->profile));
-    ngx_memcpy(v.level, ctx->level, sizeof(ctx->level));
-
-    rc = ngx_rtmp_append_amf(s, &ctx->meta, NULL, out_elts,
-                             sizeof(out_elts) / sizeof(out_elts[0]));
-    if (rc != NGX_OK || ctx->meta == NULL) {
-        return NGX_ERROR;
-    }
-
-    return ngx_rtmp_codec_prepare_meta(s, 0);
-}
-
-
-static ngx_int_t
-ngx_rtmp_codec_copy_meta(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    ngx_rtmp_codec_ctx_t      *ctx;
-    ngx_rtmp_core_srv_conf_t  *cscf;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    if (ctx->meta) {
-        ngx_rtmp_free_shared_chain(cscf, ctx->meta);
-    }
-
-    ctx->meta = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
-
-    if (ctx->meta == NULL) {
-        return NGX_ERROR;
-    }
-
-    return ngx_rtmp_codec_prepare_meta(s, h->timestamp);
-}
-
-
-static ngx_int_t
-ngx_rtmp_codec_prepare_meta(ngx_rtmp_session_t *s, uint32_t timestamp)
-{
-    ngx_rtmp_header_t      h;
-    ngx_rtmp_codec_ctx_t  *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    ngx_memzero(&h, sizeof(h));
-    h.csid = NGX_RTMP_CSID_AMF;
-    h.msid = NGX_RTMP_MSID;
-    h.type = NGX_RTMP_MSG_AMF_META;
-    h.timestamp = timestamp;
-    ngx_rtmp_prepare_message(s, &h, NULL, ctx->meta);
-
-    ctx->meta_version = ngx_rtmp_codec_get_next_version();
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_codec_meta_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    ngx_rtmp_codec_app_conf_t      *cacf;
-    ngx_rtmp_codec_ctx_t           *ctx;
-    ngx_uint_t                      skip;
-
-    static struct {
-        double                      width;
-        double                      height;
-        double                      duration;
-        double                      frame_rate;
-        double                      video_data_rate;
-        double                      video_codec_id_n;
-        u_char                      video_codec_id_s[32];
-        double                      audio_data_rate;
-        double                      audio_codec_id_n;
-        u_char                      audio_codec_id_s[32];
-        u_char                      profile[32];
-        u_char                      level[32];
-    }                               v;
-
-    static ngx_rtmp_amf_elt_t       in_video_codec_id[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.video_codec_id_n, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          &v.video_codec_id_s, sizeof(v.video_codec_id_s) },
-    };
-
-    static ngx_rtmp_amf_elt_t       in_audio_codec_id[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.audio_codec_id_n, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          &v.audio_codec_id_s, sizeof(v.audio_codec_id_s) },
-    };
-
-    static ngx_rtmp_amf_elt_t       in_inf[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("width"),
-          &v.width, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("height"),
-          &v.height, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("duration"),
-          &v.duration, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("framerate"),
-          &v.frame_rate, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("fps"),
-          &v.frame_rate, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("videodatarate"),
-          &v.video_data_rate, 0 },
-
-        { NGX_RTMP_AMF_VARIANT,
-          ngx_string("videocodecid"),
-          in_video_codec_id, sizeof(in_video_codec_id) },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("audiodatarate"),
-          &v.audio_data_rate, 0 },
-
-        { NGX_RTMP_AMF_VARIANT,
-          ngx_string("audiocodecid"),
-          in_audio_codec_id, sizeof(in_audio_codec_id) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("profile"),
-          &v.profile, sizeof(v.profile) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("level"),
-          &v.level, sizeof(v.level) },
-    };
-
-    static ngx_rtmp_amf_elt_t       in_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          in_inf, sizeof(in_inf) },
-    };
-
-    cacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_codec_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-    if (ctx == NULL) {
-        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_codec_ctx_t));
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_codec_module);
-    }
-
-    ngx_memzero(&v, sizeof(v));
-
-    /* use -1 as a sign of unchanged data;
-     * 0 is a valid value for uncompressed audio */
-    v.audio_codec_id_n = -1;
-
-    /* FFmpeg sends a string in front of actal metadata; ignore it */
-    skip = !(in->buf->last > in->buf->pos
-            && *in->buf->pos == NGX_RTMP_AMF_STRING);
-    if (ngx_rtmp_receive_amf(s, in, in_elts + skip,
-                sizeof(in_elts) / sizeof(in_elts[0]) - skip))
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                "codec: error parsing data frame");
-        return NGX_OK;
-    }
-
-    ctx->width = (ngx_uint_t) v.width;
-    ctx->height = (ngx_uint_t) v.height;
-    ctx->duration = (ngx_uint_t) v.duration;
-    ctx->frame_rate = (ngx_uint_t) v.frame_rate;
-    ctx->video_data_rate = (ngx_uint_t) v.video_data_rate;
-    ctx->video_codec_id = (ngx_uint_t) v.video_codec_id_n;
-    ctx->audio_data_rate = (ngx_uint_t) v.audio_data_rate;
-    ctx->audio_codec_id = (v.audio_codec_id_n == -1
-            ? 0 : v.audio_codec_id_n == 0
-            ? NGX_RTMP_AUDIO_UNCOMPRESSED : (ngx_uint_t) v.audio_codec_id_n);
-    ngx_memcpy(ctx->profile, v.profile, sizeof(v.profile));
-    ngx_memcpy(ctx->level, v.level, sizeof(v.level));
-
-    ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "codec: data frame: "
-            "width=%ui height=%ui duration=%ui frame_rate=%ui "
-            "video=%s (%ui) audio=%s (%ui)",
-            ctx->width, ctx->height, ctx->duration, ctx->frame_rate,
-            ngx_rtmp_get_video_codec_name(ctx->video_codec_id),
-            ctx->video_codec_id,
-            ngx_rtmp_get_audio_codec_name(ctx->audio_codec_id),
-            ctx->audio_codec_id);
-
-    switch (cacf->meta) {
-        case NGX_RTMP_CODEC_META_ON:
-            return ngx_rtmp_codec_reconstruct_meta(s);
-        case NGX_RTMP_CODEC_META_COPY:
-            return ngx_rtmp_codec_copy_meta(s, h, in);
-    }
-
-    /* NGX_RTMP_CODEC_META_OFF */
-
-    return NGX_OK;
-}
-
-
-static void *
-ngx_rtmp_codec_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_codec_app_conf_t  *cacf;
-
-    cacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_codec_app_conf_t));
-    if (cacf == NULL) {
-        return NULL;
-    }
-
-    cacf->meta = NGX_CONF_UNSET_UINT;
-
-    return cacf;
-}
-
-
-static char *
-ngx_rtmp_codec_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_codec_app_conf_t *prev = parent;
-    ngx_rtmp_codec_app_conf_t *conf = child;
-
-    ngx_conf_merge_uint_value(conf->meta, prev->meta, NGX_RTMP_CODEC_META_ON);
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_codec_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t          *cmcf;
-    ngx_rtmp_handler_pt                *h;
-    ngx_rtmp_amf_handler_t             *ch;
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
-    *h = ngx_rtmp_codec_av;
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
-    *h = ngx_rtmp_codec_av;
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
-    *h = ngx_rtmp_codec_disconnect;
-
-    /* register metadata handler */
-    ch = ngx_array_push(&cmcf->amf);
-    if (ch == NULL) {
-        return NGX_ERROR;
-    }
-    ngx_str_set(&ch->name, "@setDataFrame");
-    ch->handler = ngx_rtmp_codec_meta_data;
-
-    ch = ngx_array_push(&cmcf->amf);
-    if (ch == NULL) {
-        return NGX_ERROR;
-    }
-    ngx_str_set(&ch->name, "onMetaData");
-    ch->handler = ngx_rtmp_codec_meta_data;
-
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_codec_module.h b/debian/modules/rtmp/ngx_rtmp_codec_module.h
deleted file mode 100644
index ee48c1c..0000000
--- a/debian/modules/rtmp/ngx_rtmp_codec_module.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_CODEC_H_INCLUDED_
-#define _NGX_RTMP_CODEC_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-
-
-/* Audio codecs */
-enum {
-    /* Uncompressed codec id is actually 0,
-     * but we use another value for consistency */
-    NGX_RTMP_AUDIO_UNCOMPRESSED     = 16,
-    NGX_RTMP_AUDIO_ADPCM            = 1,
-    NGX_RTMP_AUDIO_MP3              = 2,
-    NGX_RTMP_AUDIO_LINEAR_LE        = 3,
-    NGX_RTMP_AUDIO_NELLY16          = 4,
-    NGX_RTMP_AUDIO_NELLY8           = 5,
-    NGX_RTMP_AUDIO_NELLY            = 6,
-    NGX_RTMP_AUDIO_G711A            = 7,
-    NGX_RTMP_AUDIO_G711U            = 8,
-    NGX_RTMP_AUDIO_AAC              = 10,
-    NGX_RTMP_AUDIO_SPEEX            = 11,
-    NGX_RTMP_AUDIO_MP3_8            = 14,
-    NGX_RTMP_AUDIO_DEVSPEC          = 15,
-};
-
-
-/* Video codecs */
-enum {
-    NGX_RTMP_VIDEO_JPEG             = 1,
-    NGX_RTMP_VIDEO_SORENSON_H263    = 2,
-    NGX_RTMP_VIDEO_SCREEN           = 3,
-    NGX_RTMP_VIDEO_ON2_VP6          = 4,
-    NGX_RTMP_VIDEO_ON2_VP6_ALPHA    = 5,
-    NGX_RTMP_VIDEO_SCREEN2          = 6,
-    NGX_RTMP_VIDEO_H264             = 7
-};
-
-
-u_char * ngx_rtmp_get_audio_codec_name(ngx_uint_t id);
-u_char * ngx_rtmp_get_video_codec_name(ngx_uint_t id);
-
-
-typedef struct {
-    ngx_uint_t                  width;
-    ngx_uint_t                  height;
-    ngx_uint_t                  duration;
-    ngx_uint_t                  frame_rate;
-    ngx_uint_t                  video_data_rate;
-    ngx_uint_t                  video_codec_id;
-    ngx_uint_t                  audio_data_rate;
-    ngx_uint_t                  audio_codec_id;
-    ngx_uint_t                  aac_profile;
-    ngx_uint_t                  aac_chan_conf;
-    ngx_uint_t                  aac_sbr;
-    ngx_uint_t                  aac_ps;
-    ngx_uint_t                  avc_profile;
-    ngx_uint_t                  avc_compat;
-    ngx_uint_t                  avc_level;
-    ngx_uint_t                  avc_nal_bytes;
-    ngx_uint_t                  avc_ref_frames;
-    ngx_uint_t                  sample_rate;    /* 5512, 11025, 22050, 44100 */
-    ngx_uint_t                  sample_size;    /* 1=8bit, 2=16bit */
-    ngx_uint_t                  audio_channels; /* 1, 2 */
-    u_char                      profile[32];
-    u_char                      level[32];
-
-    ngx_chain_t                *avc_header;
-    ngx_chain_t                *aac_header;
-
-    ngx_chain_t                *meta;
-    ngx_uint_t                  meta_version;
-} ngx_rtmp_codec_ctx_t;
-
-
-extern ngx_module_t  ngx_rtmp_codec_module;
-
-
-#endif /* _NGX_RTMP_LIVE_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_control_module.c b/debian/modules/rtmp/ngx_rtmp_control_module.c
deleted file mode 100644
index adf3ddc..0000000
--- a/debian/modules/rtmp/ngx_rtmp_control_module.c
+++ /dev/null
@@ -1,732 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_live_module.h"
-#include "ngx_rtmp_record_module.h"
-
-
-static char *ngx_rtmp_control(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-static void * ngx_rtmp_control_create_loc_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_control_merge_loc_conf(ngx_conf_t *cf,
-    void *parent, void *child);
-
-
-typedef const char * (*ngx_rtmp_control_handler_t)(ngx_http_request_t *r,
-    ngx_rtmp_session_t *);
-
-
-#define NGX_RTMP_CONTROL_ALL        0xff
-#define NGX_RTMP_CONTROL_RECORD     0x01
-#define NGX_RTMP_CONTROL_DROP       0x02
-#define NGX_RTMP_CONTROL_REDIRECT   0x04
-
-
-enum {
-    NGX_RTMP_CONTROL_FILTER_CLIENT = 0,
-    NGX_RTMP_CONTROL_FILTER_PUBLISHER,
-    NGX_RTMP_CONTROL_FILTER_SUBSCRIBER
-};
-
-
-typedef struct {
-    ngx_uint_t                      count;
-    ngx_str_t                       path;
-    ngx_uint_t                      filter;
-    ngx_str_t                       method;
-    ngx_array_t                     sessions; /* ngx_rtmp_session_t * */
-} ngx_rtmp_control_ctx_t;
-
-
-typedef struct {
-    ngx_uint_t                      control;
-} ngx_rtmp_control_loc_conf_t;
-
-
-static ngx_conf_bitmask_t           ngx_rtmp_control_masks[] = {
-    { ngx_string("all"),            NGX_RTMP_CONTROL_ALL       },
-    { ngx_string("record"),         NGX_RTMP_CONTROL_RECORD    },
-    { ngx_string("drop"),           NGX_RTMP_CONTROL_DROP      },
-    { ngx_string("redirect"),       NGX_RTMP_CONTROL_REDIRECT  },
-    { ngx_null_string,              0                          }
-};
-
-
-static ngx_command_t  ngx_rtmp_control_commands[] = {
-
-    { ngx_string("rtmp_control"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_control,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_rtmp_control_loc_conf_t, control),
-      ngx_rtmp_control_masks },
-
-    ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_rtmp_control_module_ctx = {
-    NULL,                               /* preconfiguration */
-    NULL,                               /* postconfiguration */
-
-    NULL,                               /* create main configuration */
-    NULL,                               /* init main configuration */
-
-    NULL,                               /* create server configuration */
-    NULL,                               /* merge server configuration */
-
-    ngx_rtmp_control_create_loc_conf,   /* create location configuration */
-    ngx_rtmp_control_merge_loc_conf,    /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_control_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_control_module_ctx,       /* module context */
-    ngx_rtmp_control_commands,          /* module directives */
-    NGX_HTTP_MODULE,                    /* module type */
-    NULL,                               /* init master */
-    NULL,                               /* init module */
-    NULL,                               /* init process */
-    NULL,                               /* init thread */
-    NULL,                               /* exit thread */
-    NULL,                               /* exit process */
-    NULL,                               /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static const char *
-ngx_rtmp_control_record_handler(ngx_http_request_t *r, ngx_rtmp_session_t *s)
-{
-    ngx_int_t                    rc;
-    ngx_str_t                    rec;
-    ngx_uint_t                   rn;
-    ngx_rtmp_control_ctx_t      *ctx;
-    ngx_rtmp_core_app_conf_t    *cacf;
-    ngx_rtmp_record_app_conf_t  *racf;
-
-    cacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_core_module);
-    racf = cacf->app_conf[ngx_rtmp_record_module.ctx_index];
-
-    if (ngx_http_arg(r, (u_char *) "rec", sizeof("rec") - 1, &rec) != NGX_OK) {
-        rec.len = 0;
-    }
-
-    rn = ngx_rtmp_record_find(racf, &rec);
-    if (rn == NGX_CONF_UNSET_UINT) {
-        return "Recorder not found";
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
-
-    if (ctx->method.len == sizeof("start") - 1 &&
-        ngx_strncmp(ctx->method.data, "start", ctx->method.len) == 0)
-    {
-        rc = ngx_rtmp_record_open(s, rn, &ctx->path);
-
-    } else if (ctx->method.len == sizeof("stop") - 1 &&
-               ngx_strncmp(ctx->method.data, "stop", ctx->method.len) == 0)
-    {
-        rc = ngx_rtmp_record_close(s, rn, &ctx->path);
-
-    } else {
-        return "Undefined method";
-    }
-
-    if (rc == NGX_ERROR) {
-        return "Recorder error";
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static const char *
-ngx_rtmp_control_drop_handler(ngx_http_request_t *r, ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_control_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
-
-    ngx_rtmp_finalize_session(s);
-
-    ++ctx->count;
-
-    return NGX_CONF_OK;
-}
-
-
-static const char *
-ngx_rtmp_control_redirect_handler(ngx_http_request_t *r, ngx_rtmp_session_t *s)
-{
-    ngx_str_t                 name;
-    ngx_rtmp_play_t           vplay;
-    ngx_rtmp_publish_t        vpublish;
-    ngx_rtmp_live_ctx_t      *lctx;
-    ngx_rtmp_control_ctx_t   *ctx;
-    ngx_rtmp_close_stream_t   vc;
-
-    if (ngx_http_arg(r, (u_char *) "newname", sizeof("newname") - 1, &name)
-        != NGX_OK)
-    {
-        return "newname not specified";
-    }
-
-    if (name.len >= NGX_RTMP_MAX_NAME) {
-        name.len = NGX_RTMP_MAX_NAME - 1;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
-    ctx->count++;
-
-    ngx_memzero(&vc, sizeof(ngx_rtmp_close_stream_t));
-
-    /* close_stream should be synchronous */
-    ngx_rtmp_close_stream(s, &vc);
-
-    lctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-
-    if (lctx && lctx->publishing) {
-        /* publish */
-
-        ngx_memzero(&vpublish, sizeof(ngx_rtmp_publish_t));
-
-        ngx_memcpy(vpublish.name, name.data, name.len);
-
-        ngx_rtmp_cmd_fill_args(vpublish.name, vpublish.args);
-
-        if (ngx_rtmp_publish(s, &vpublish) != NGX_OK) {
-            return "publish failed";
-        }
-
-    } else {
-        /* play */
-
-        ngx_memzero(&vplay, sizeof(ngx_rtmp_play_t));
-
-        ngx_memcpy(vplay.name, name.data, name.len);
-
-        ngx_rtmp_cmd_fill_args(vplay.name, vplay.args);
-
-        if (ngx_rtmp_play(s, &vplay) != NGX_OK) {
-            return "play failed";
-        }
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static const char *
-ngx_rtmp_control_walk_session(ngx_http_request_t *r,
-    ngx_rtmp_live_ctx_t *lctx)
-{
-    ngx_str_t                addr, *paddr, clientid;
-    ngx_rtmp_session_t      *s, **ss;
-    ngx_rtmp_control_ctx_t  *ctx;
-
-    s = lctx->session;
-
-    if (s == NULL || s->connection == NULL) {
-        return NGX_CONF_OK;
-    }
-
-    if (ngx_http_arg(r, (u_char *) "addr", sizeof("addr") - 1, &addr)
-        == NGX_OK)
-    {
-        paddr = &s->connection->addr_text;
-        if (paddr->len != addr.len ||
-            ngx_strncmp(paddr->data, addr.data, addr.len))
-        {
-            return NGX_CONF_OK;
-        }
-    }
-
-    if (ngx_http_arg(r, (u_char *) "clientid", sizeof("clientid") - 1,
-                     &clientid)
-        == NGX_OK)
-    {
-        if (s->connection->number !=
-            (ngx_uint_t) ngx_atoi(clientid.data, clientid.len))
-        {
-            return NGX_CONF_OK;
-        }
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
-
-    switch (ctx->filter) {
-        case NGX_RTMP_CONTROL_FILTER_PUBLISHER:
-            if (!lctx->publishing) {
-                return NGX_CONF_OK;
-            }
-            break;
-
-        case NGX_RTMP_CONTROL_FILTER_SUBSCRIBER:
-            if (lctx->publishing) {
-                return NGX_CONF_OK;
-            }
-            break;
-
-        case NGX_RTMP_CONTROL_FILTER_CLIENT:
-            break;
-    }
-
-    ss = ngx_array_push(&ctx->sessions);
-    if (ss == NULL) {
-        return "allocation error";
-    }
-
-    *ss = s;
-
-    return NGX_CONF_OK;
-}
-
-
-static const char *
-ngx_rtmp_control_walk_stream(ngx_http_request_t *r,
-    ngx_rtmp_live_stream_t *ls)
-{
-    const char           *s;
-    ngx_rtmp_live_ctx_t  *lctx;
-
-    for (lctx = ls->ctx; lctx; lctx = lctx->next) {
-        s = ngx_rtmp_control_walk_session(r, lctx);
-        if (s != NGX_CONF_OK) {
-            return s;
-        }
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static const char *
-ngx_rtmp_control_walk_app(ngx_http_request_t *r,
-    ngx_rtmp_core_app_conf_t *cacf)
-{
-    size_t                     len;
-    ngx_str_t                  name;
-    const char                *s;
-    ngx_uint_t                 n;
-    ngx_rtmp_live_stream_t    *ls;
-    ngx_rtmp_live_app_conf_t  *lacf;
-
-    lacf = cacf->app_conf[ngx_rtmp_live_module.ctx_index];
-
-    if (ngx_http_arg(r, (u_char *) "name", sizeof("name") - 1, &name) != NGX_OK)
-    {
-        for (n = 0; n < (ngx_uint_t) lacf->nbuckets; ++n) {
-            for (ls = lacf->streams[n]; ls; ls = ls->next) {
-                s = ngx_rtmp_control_walk_stream(r, ls);
-                if (s != NGX_CONF_OK) {
-                    return s;
-                }
-            }
-        }
-
-        return NGX_CONF_OK;
-    }
-
-    for (ls = lacf->streams[ngx_hash_key(name.data, name.len) % lacf->nbuckets];
-         ls; ls = ls->next) 
-    {
-        len = ngx_strlen(ls->name);
-        if (name.len != len || ngx_strncmp(name.data, ls->name, name.len)) {
-            continue;
-        }
-
-        s = ngx_rtmp_control_walk_stream(r, ls);
-        if (s != NGX_CONF_OK) {
-            return s;
-        }
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static const char *
-ngx_rtmp_control_walk_server(ngx_http_request_t *r,
-    ngx_rtmp_core_srv_conf_t *cscf)
-{
-    ngx_str_t                   app;
-    ngx_uint_t                  n;
-    const char                 *s;
-    ngx_rtmp_core_app_conf_t  **pcacf;
-
-    if (ngx_http_arg(r, (u_char *) "app", sizeof("app") - 1, &app) != NGX_OK) {
-        app.len = 0;
-    }
-
-    pcacf = cscf->applications.elts;
-
-    for (n = 0; n < cscf->applications.nelts; ++n, ++pcacf) {
-        if (app.len && ((*pcacf)->name.len != app.len ||
-                        ngx_strncmp((*pcacf)->name.data, app.data, app.len)))
-        {
-            continue;
-        }
-
-        s = ngx_rtmp_control_walk_app(r, *pcacf);
-        if (s != NGX_CONF_OK) {
-            return s;
-        }
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static const char *
-ngx_rtmp_control_walk(ngx_http_request_t *r, ngx_rtmp_control_handler_t h)
-{
-    ngx_rtmp_core_main_conf_t  *cmcf = ngx_rtmp_core_main_conf;
-
-    ngx_str_t                   srv;
-    ngx_uint_t                  sn, n;
-    const char                 *msg;
-    ngx_rtmp_session_t        **s;
-    ngx_rtmp_control_ctx_t     *ctx;
-    ngx_rtmp_core_srv_conf_t  **pcscf;
-
-    sn = 0;
-    if (ngx_http_arg(r, (u_char *) "srv", sizeof("srv") - 1, &srv) == NGX_OK) {
-        sn = ngx_atoi(srv.data, srv.len);
-    }
-
-    if (sn >= cmcf->servers.nelts) {
-        return "Server index out of range";
-    }
-
-    pcscf  = cmcf->servers.elts;
-    pcscf += sn;
-
-    msg = ngx_rtmp_control_walk_server(r, *pcscf);
-    if (msg != NGX_CONF_OK) {
-        return msg;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
-
-    s = ctx->sessions.elts;
-    for (n = 0; n < ctx->sessions.nelts; n++) {
-        msg = h(r, s[n]);
-        if (msg != NGX_CONF_OK) {
-            return msg;
-        }
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_control_record(ngx_http_request_t *r, ngx_str_t *method)
-{
-    ngx_buf_t               *b;
-    const char              *msg;
-    ngx_chain_t              cl;
-    ngx_rtmp_control_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
-    ctx->filter = NGX_RTMP_CONTROL_FILTER_PUBLISHER;
-
-    msg = ngx_rtmp_control_walk(r, ngx_rtmp_control_record_handler);
-    if (msg != NGX_CONF_OK) {
-        goto error;
-    }
-
-    if (ctx->path.len == 0) {
-        return NGX_HTTP_NO_CONTENT;
-    }
-
-    /* output record path */
-
-    r->headers_out.status = NGX_HTTP_OK;
-    r->headers_out.content_length_n = ctx->path.len;
-
-    b = ngx_create_temp_buf(r->pool, ctx->path.len);
-    if (b == NULL) {
-        goto error;
-    }
-
-    ngx_memzero(&cl, sizeof(cl));
-    cl.buf = b;
-
-    b->last = ngx_cpymem(b->pos, ctx->path.data, ctx->path.len);
-    b->last_buf = 1;
-
-    ngx_http_send_header(r);
-
-    return ngx_http_output_filter(r, &cl);
-
-error:
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_control_drop(ngx_http_request_t *r, ngx_str_t *method)
-{
-    size_t                   len;
-    u_char                  *p;
-    ngx_buf_t               *b;
-    ngx_chain_t              cl;
-    const char              *msg;
-    ngx_rtmp_control_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
-
-    if (ctx->method.len == sizeof("publisher") - 1 &&
-        ngx_memcmp(ctx->method.data, "publisher", ctx->method.len) == 0)
-    {
-        ctx->filter = NGX_RTMP_CONTROL_FILTER_PUBLISHER;
-
-    } else if (ctx->method.len == sizeof("subscriber") - 1 &&
-               ngx_memcmp(ctx->method.data, "subscriber", ctx->method.len)
-               == 0)
-    {
-        ctx->filter = NGX_RTMP_CONTROL_FILTER_SUBSCRIBER;
-
-    } else if (method->len == sizeof("client") - 1 &&
-               ngx_memcmp(ctx->method.data, "client", ctx->method.len) == 0)
-    {
-        ctx->filter = NGX_RTMP_CONTROL_FILTER_CLIENT;
-
-    } else {
-        msg = "Undefined filter";
-        goto error;
-    }
-
-    msg = ngx_rtmp_control_walk(r, ngx_rtmp_control_drop_handler);
-    if (msg != NGX_CONF_OK) {
-        goto error;
-    }
-
-    /* output count */
-
-    len = NGX_INT_T_LEN;
-
-    p = ngx_palloc(r->connection->pool, len);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    len = (size_t) (ngx_snprintf(p, len, "%ui", ctx->count) - p);
-
-    r->headers_out.status = NGX_HTTP_OK;
-    r->headers_out.content_length_n = len;
-
-    b = ngx_calloc_buf(r->pool);
-    if (b == NULL) {
-        goto error;
-    }
-
-    b->start = b->pos = p;
-    b->end = b->last = p + len;
-    b->temporary = 1;
-    b->last_buf = 1;
-
-    ngx_memzero(&cl, sizeof(cl));
-    cl.buf = b;
-
-    ngx_http_send_header(r);
-
-    return ngx_http_output_filter(r, &cl);
-
-error:
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_control_redirect(ngx_http_request_t *r, ngx_str_t *method)
-{
-    size_t                   len;
-    u_char                  *p;
-    ngx_buf_t               *b;
-    ngx_chain_t              cl;
-    const char              *msg;
-    ngx_rtmp_control_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_rtmp_control_module);
-
-    if (ctx->method.len == sizeof("publisher") - 1 &&
-        ngx_memcmp(ctx->method.data, "publisher", ctx->method.len) == 0)
-    {
-        ctx->filter = NGX_RTMP_CONTROL_FILTER_PUBLISHER;
-
-    } else if (ctx->method.len == sizeof("subscriber") - 1 &&
-               ngx_memcmp(ctx->method.data, "subscriber", ctx->method.len)
-               == 0)
-    {
-        ctx->filter = NGX_RTMP_CONTROL_FILTER_SUBSCRIBER;
-
-    } else if (ctx->method.len == sizeof("client") - 1 &&
-               ngx_memcmp(ctx->method.data, "client", ctx->method.len) == 0)
-    {
-        ctx->filter = NGX_RTMP_CONTROL_FILTER_CLIENT;
-
-    } else {
-        msg = "Undefined filter";
-        goto error;
-    }
-
-    msg = ngx_rtmp_control_walk(r, ngx_rtmp_control_redirect_handler);
-    if (msg != NGX_CONF_OK) {
-        goto error;
-    }
-
-    /* output count */
-
-    len = NGX_INT_T_LEN;
-
-    p = ngx_palloc(r->connection->pool, len);
-    if (p == NULL) {
-        goto error;
-    }
-
-    len = (size_t) (ngx_snprintf(p, len, "%ui", ctx->count) - p);
-
-    r->headers_out.status = NGX_HTTP_OK;
-    r->headers_out.content_length_n = len;
-
-    b = ngx_calloc_buf(r->pool);
-    if (b == NULL) {
-        goto error;
-    }
-
-    b->start = b->pos = p;
-    b->end = b->last = p + len;
-    b->temporary = 1;
-    b->last_buf = 1;
-
-    ngx_memzero(&cl, sizeof(cl));
-    cl.buf = b;
-
-    ngx_http_send_header(r);
-
-    return ngx_http_output_filter(r, &cl);
-
-error:
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_control_handler(ngx_http_request_t *r)
-{
-    u_char                       *p;
-    ngx_str_t                     section, method;
-    ngx_uint_t                    n;
-    ngx_rtmp_control_ctx_t       *ctx;
-    ngx_rtmp_control_loc_conf_t  *llcf;
-
-    llcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_control_module);
-    if (llcf->control == 0) {
-        return NGX_DECLINED;
-    }
-
-    /* uri format: .../section/method?args */
-
-    ngx_str_null(&section);
-    ngx_str_null(&method);
-
-    for (n = r->uri.len; n; --n) {
-        p = &r->uri.data[n - 1];
-
-        if (*p != '/') {
-            continue;
-        }
-
-        if (method.data) {
-            section.data = p + 1;
-            section.len  = method.data - section.data - 1;
-            break;
-        }
-
-        method.data = p + 1;
-        method.len  = r->uri.data + r->uri.len - method.data;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, r->connection->log, 0,
-                   "rtmp_control: section='%V' method='%V'",
-                   &section, &method);
-
-    ctx = ngx_pcalloc(r->pool, sizeof(ngx_rtmp_control_ctx_t));
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_http_set_ctx(r, ctx, ngx_rtmp_control_module);
-
-    if (ngx_array_init(&ctx->sessions, r->pool, 1, sizeof(void *)) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    ctx->method = method;
-
-#define NGX_RTMP_CONTROL_SECTION(flag, secname)                             \
-    if (llcf->control & NGX_RTMP_CONTROL_##flag &&                          \
-        section.len == sizeof(#secname) - 1 &&                              \
-        ngx_strncmp(section.data, #secname, sizeof(#secname) - 1) == 0)     \
-    {                                                                       \
-        return ngx_rtmp_control_##secname(r, &method);                      \
-    }
-
-    NGX_RTMP_CONTROL_SECTION(RECORD, record);
-    NGX_RTMP_CONTROL_SECTION(DROP, drop);
-    NGX_RTMP_CONTROL_SECTION(REDIRECT, redirect);
-
-#undef NGX_RTMP_CONTROL_SECTION
-
-    return NGX_DECLINED;
-}
-
-
-static void *
-ngx_rtmp_control_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_control_loc_conf_t  *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_control_loc_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    conf->control = 0;
-
-    return conf;
-}
-
-
-static char *
-ngx_rtmp_control_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_control_loc_conf_t  *prev = parent;
-    ngx_rtmp_control_loc_conf_t  *conf = child;
-
-    ngx_conf_merge_bitmask_value(conf->control, prev->control, 0);
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_rtmp_control(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_core_loc_conf_t  *clcf;
-
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-    clcf->handler = ngx_rtmp_control_handler;
-
-    return ngx_conf_set_bitmask_slot(cf, cmd, conf);
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_core_module.c b/debian/modules/rtmp/ngx_rtmp_core_module.c
deleted file mode 100644
index a33fa16..0000000
--- a/debian/modules/rtmp/ngx_rtmp_core_module.c
+++ /dev/null
@@ -1,755 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_event.h>
-#include <nginx.h>
-#include "ngx_rtmp.h"
-
-
-static void *ngx_rtmp_core_create_main_conf(ngx_conf_t *cf);
-static void *ngx_rtmp_core_create_srv_conf(ngx_conf_t *cf);
-static char *ngx_rtmp_core_merge_srv_conf(ngx_conf_t *cf, void *parent,
-    void *child);
-static void *ngx_rtmp_core_create_app_conf(ngx_conf_t *cf);
-static char *ngx_rtmp_core_merge_app_conf(ngx_conf_t *cf, void *parent,
-    void *child);
-static char *ngx_rtmp_core_server(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_rtmp_core_application(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-
-
-ngx_rtmp_core_main_conf_t      *ngx_rtmp_core_main_conf;
-
-
-static ngx_conf_deprecated_t  ngx_conf_deprecated_so_keepalive = {
-    ngx_conf_deprecated, "so_keepalive",
-    "so_keepalive\" parameter of the \"listen"
-};
-
-
-static ngx_command_t  ngx_rtmp_core_commands[] = {
-
-    { ngx_string("server"),
-      NGX_RTMP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-      ngx_rtmp_core_server,
-      0,
-      0,
-      NULL },
-
-    { ngx_string("listen"),
-      NGX_RTMP_SRV_CONF|NGX_CONF_TAKE12,
-      ngx_rtmp_core_listen,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("application"),
-      NGX_RTMP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
-      ngx_rtmp_core_application,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("so_keepalive"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, so_keepalive),
-      &ngx_conf_deprecated_so_keepalive },
-
-    { ngx_string("timeout"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, timeout),
-      NULL },
-
-    { ngx_string("ping"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, ping),
-      NULL },
-
-    { ngx_string("ping_timeout"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, ping_timeout),
-      NULL },
-
-    { ngx_string("max_streams"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, max_streams),
-      NULL },
-
-    { ngx_string("ack_window"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, ack_window),
-      NULL },
-
-    { ngx_string("chunk_size"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, chunk_size),
-      NULL },
-
-    { ngx_string("max_message"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, max_message),
-      NULL },
-
-    { ngx_string("out_queue"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, out_queue),
-      NULL },
-
-    { ngx_string("out_cork"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, out_cork),
-      NULL },
-
-    { ngx_string("busy"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, busy),
-      NULL },
-
-    /* time fixes are needed for flash clients */
-    { ngx_string("play_time_fix"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, play_time_fix),
-      NULL },
-
-    { ngx_string("publish_time_fix"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, publish_time_fix),
-      NULL },
-
-    { ngx_string("buflen"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_core_srv_conf_t, buflen),
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_core_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    NULL,                                   /* postconfiguration */
-    ngx_rtmp_core_create_main_conf,         /* create main configuration */
-    NULL,                                   /* init main configuration */
-    ngx_rtmp_core_create_srv_conf,          /* create server configuration */
-    ngx_rtmp_core_merge_srv_conf,           /* merge server configuration */
-    ngx_rtmp_core_create_app_conf,          /* create app configuration */
-    ngx_rtmp_core_merge_app_conf            /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_core_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_core_module_ctx,             /* module context */
-    ngx_rtmp_core_commands,                /* module directives */
-    NGX_RTMP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void *
-ngx_rtmp_core_create_main_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t  *cmcf;
-
-    cmcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_core_main_conf_t));
-    if (cmcf == NULL) {
-        return NULL;
-    }
-
-    ngx_rtmp_core_main_conf = cmcf;
-
-    if (ngx_array_init(&cmcf->servers, cf->pool, 4,
-                       sizeof(ngx_rtmp_core_srv_conf_t *))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-    if (ngx_array_init(&cmcf->listen, cf->pool, 4, sizeof(ngx_rtmp_listen_t))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-    return cmcf;
-}
-
-
-static void *
-ngx_rtmp_core_create_srv_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_srv_conf_t   *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_core_srv_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    if (ngx_array_init(&conf->applications, cf->pool, 4,
-                       sizeof(ngx_rtmp_core_app_conf_t *))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-    conf->timeout = NGX_CONF_UNSET_MSEC;
-    conf->ping = NGX_CONF_UNSET_MSEC;
-    conf->ping_timeout = NGX_CONF_UNSET_MSEC;
-    conf->so_keepalive = NGX_CONF_UNSET;
-    conf->max_streams = NGX_CONF_UNSET;
-    conf->chunk_size = NGX_CONF_UNSET;
-    conf->ack_window = NGX_CONF_UNSET_UINT;
-    conf->max_message = NGX_CONF_UNSET_SIZE;
-    conf->out_queue = NGX_CONF_UNSET_SIZE;
-    conf->out_cork = NGX_CONF_UNSET_SIZE;
-    conf->play_time_fix = NGX_CONF_UNSET;
-    conf->publish_time_fix = NGX_CONF_UNSET;
-    conf->buflen = NGX_CONF_UNSET_MSEC;
-    conf->busy = NGX_CONF_UNSET;
-
-    return conf;
-}
-
-
-static char *
-ngx_rtmp_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_core_srv_conf_t *prev = parent;
-    ngx_rtmp_core_srv_conf_t *conf = child;
-
-    ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000);
-    ngx_conf_merge_msec_value(conf->ping, prev->ping, 60000);
-    ngx_conf_merge_msec_value(conf->ping_timeout, prev->ping_timeout, 30000);
-
-    ngx_conf_merge_value(conf->so_keepalive, prev->so_keepalive, 0);
-    ngx_conf_merge_value(conf->max_streams, prev->max_streams, 32);
-    ngx_conf_merge_value(conf->chunk_size, prev->chunk_size, 4096);
-    ngx_conf_merge_uint_value(conf->ack_window, prev->ack_window, 5000000);
-    ngx_conf_merge_size_value(conf->max_message, prev->max_message,
-            1 * 1024 * 1024);
-    ngx_conf_merge_size_value(conf->out_queue, prev->out_queue, 256);
-    ngx_conf_merge_size_value(conf->out_cork, prev->out_cork,
-            conf->out_queue / 8);
-    ngx_conf_merge_value(conf->play_time_fix, prev->play_time_fix, 1);
-    ngx_conf_merge_value(conf->publish_time_fix, prev->publish_time_fix, 1);
-    ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 1000);
-    ngx_conf_merge_value(conf->busy, prev->busy, 0);
-
-    if (prev->pool == NULL) {
-        prev->pool = ngx_create_pool(4096, &cf->cycle->new_log);
-        if (prev->pool == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    conf->pool = prev->pool;
-
-    return NGX_CONF_OK;
-}
-
-
-static void *
-ngx_rtmp_core_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_app_conf_t   *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_core_app_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    if (ngx_array_init(&conf->applications, cf->pool, 1,
-                       sizeof(ngx_rtmp_core_app_conf_t *))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-    return conf;
-}
-
-
-static char *
-ngx_rtmp_core_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_core_app_conf_t *prev = parent;
-    ngx_rtmp_core_app_conf_t *conf = child;
-
-    (void)prev;
-    (void)conf;
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_rtmp_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char                       *rv;
-    void                       *mconf;
-    ngx_uint_t                  m;
-    ngx_conf_t                  pcf;
-    ngx_module_t              **modules;
-    ngx_rtmp_module_t          *module;
-    ngx_rtmp_conf_ctx_t        *ctx, *rtmp_ctx;
-    ngx_rtmp_core_srv_conf_t   *cscf, **cscfp;
-    ngx_rtmp_core_main_conf_t  *cmcf;
-
-    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
-    if (ctx == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    rtmp_ctx = cf->ctx;
-    ctx->main_conf = rtmp_ctx->main_conf;
-
-    /* the server{}'s srv_conf */
-
-    ctx->srv_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
-    if (ctx->srv_conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
-    if (ctx->app_conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-#if (nginx_version >= 1009011)
-    modules = cf->cycle->modules;
-#else
-    modules = ngx_modules;
-#endif
-
-    for (m = 0; modules[m]; m++) {
-        if (modules[m]->type != NGX_RTMP_MODULE) {
-            continue;
-        }
-
-        module = modules[m]->ctx;
-
-        if (module->create_srv_conf) {
-            mconf = module->create_srv_conf(cf);
-            if (mconf == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            ctx->srv_conf[modules[m]->ctx_index] = mconf;
-        }
-
-        if (module->create_app_conf) {
-            mconf = module->create_app_conf(cf);
-            if (mconf == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            ctx->app_conf[modules[m]->ctx_index] = mconf;
-        }
-    }
-
-    /* the server configuration context */
-
-    cscf = ctx->srv_conf[ngx_rtmp_core_module.ctx_index];
-    cscf->ctx = ctx;
-
-    cmcf = ctx->main_conf[ngx_rtmp_core_module.ctx_index];
-
-    cscfp = ngx_array_push(&cmcf->servers);
-    if (cscfp == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    *cscfp = cscf;
-
-
-    /* parse inside server{} */
-
-    pcf = *cf;
-    cf->ctx = ctx;
-    cf->cmd_type = NGX_RTMP_SRV_CONF;
-
-    rv = ngx_conf_parse(cf, NULL);
-
-    *cf = pcf;
-
-    return rv;
-}
-
-
-static char *
-ngx_rtmp_core_application(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char                       *rv;
-    ngx_int_t                   i;
-    ngx_str_t                  *value;
-    ngx_conf_t                  save;
-    ngx_module_t              **modules;
-    ngx_rtmp_module_t          *module;
-    ngx_rtmp_conf_ctx_t        *ctx, *pctx;
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    ngx_rtmp_core_app_conf_t   *cacf, **cacfp;
-
-    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
-    if (ctx == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    pctx = cf->ctx;
-    ctx->main_conf = pctx->main_conf;
-    ctx->srv_conf = pctx->srv_conf;
-
-    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
-    if (ctx->app_conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-#if (nginx_version >= 1009011)
-    modules = cf->cycle->modules;
-#else
-    modules = ngx_modules;
-#endif
-
-    for (i = 0; modules[i]; i++) {
-        if (modules[i]->type != NGX_RTMP_MODULE) {
-            continue;
-        }
-
-        module = modules[i]->ctx;
-
-        if (module->create_app_conf) {
-            ctx->app_conf[modules[i]->ctx_index] = module->create_app_conf(cf);
-            if (ctx->app_conf[modules[i]->ctx_index] == NULL) {
-                return NGX_CONF_ERROR;
-            }
-        }
-    }
-
-    cacf = ctx->app_conf[ngx_rtmp_core_module.ctx_index];
-    cacf->app_conf = ctx->app_conf;
-
-    value = cf->args->elts;
-
-    cacf->name = value[1];
-    cscf = pctx->srv_conf[ngx_rtmp_core_module.ctx_index];
-
-    cacfp = ngx_array_push(&cscf->applications);
-    if (cacfp == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    *cacfp = cacf;
-
-    save = *cf;
-    cf->ctx = ctx;
-    cf->cmd_type = NGX_RTMP_APP_CONF;
-
-    rv = ngx_conf_parse(cf, NULL);
-
-    *cf= save;
-
-    return rv;
-}
-
-
-static char *
-ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    size_t                      len, off;
-    in_port_t                   port;
-    ngx_str_t                  *value;
-    ngx_url_t                   u;
-    ngx_uint_t                  i, m;
-    ngx_module_t              **modules;
-    struct sockaddr            *sa;
-    ngx_rtmp_listen_t          *ls;
-    struct sockaddr_in         *sin;
-    ngx_rtmp_core_main_conf_t  *cmcf;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6        *sin6;
-#endif
-
-    value = cf->args->elts;
-
-    ngx_memzero(&u, sizeof(ngx_url_t));
-
-    u.url = value[1];
-    u.listen = 1;
-
-    if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
-        if (u.err) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "%s in \"%V\" of the \"listen\" directive",
-                               u.err, &u.url);
-        }
-
-        return NGX_CONF_ERROR;
-    }
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    ls = cmcf->listen.elts;
-
-    for (i = 0; i < cmcf->listen.nelts; i++) {
-
-        sa = (struct sockaddr *) ls[i].sockaddr;
-
-        if (sa->sa_family != u.family) {
-            continue;
-        }
-
-        switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            off = offsetof(struct sockaddr_in6, sin6_addr);
-            len = 16;
-            sin6 = (struct sockaddr_in6 *) sa;
-            port = sin6->sin6_port;
-            break;
-#endif
-
-        default: /* AF_INET */
-            off = offsetof(struct sockaddr_in, sin_addr);
-            len = 4;
-            sin = (struct sockaddr_in *) sa;
-            port = sin->sin_port;
-            break;
-        }
-
-        if (ngx_memcmp(ls[i].sockaddr + off, (u_char *) &u.sockaddr + off, len)
-            != 0)
-        {
-            continue;
-        }
-
-        if (port != u.port) {
-            continue;
-        }
-
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "duplicate \"%V\" address and port pair", &u.url);
-        return NGX_CONF_ERROR;
-    }
-
-    ls = ngx_array_push(&cmcf->listen);
-    if (ls == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_memzero(ls, sizeof(ngx_rtmp_listen_t));
-
-    ngx_memcpy(ls->sockaddr, (u_char *) &u.sockaddr, u.socklen);
-
-    ls->socklen = u.socklen;
-    ls->wildcard = u.wildcard;
-    ls->ctx = cf->ctx;
-
-#if (nginx_version >= 1009011)
-    modules = cf->cycle->modules;
-#else
-    modules = ngx_modules;
-#endif
-
-    for (m = 0; modules[m]; m++) {
-        if (modules[m]->type != NGX_RTMP_MODULE) {
-            continue;
-        }
-    }
-
-    for (i = 2; i < cf->args->nelts; i++) {
-
-        if (ngx_strcmp(value[i].data, "bind") == 0) {
-            ls->bind = 1;
-            continue;
-        }
-
-        if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-            struct sockaddr  *sa;
-            u_char            buf[NGX_SOCKADDR_STRLEN];
-
-            sa = (struct sockaddr *) ls->sockaddr;
-
-            if (sa->sa_family == AF_INET6) {
-
-                if (ngx_strcmp(&value[i].data[10], "n") == 0) {
-                    ls->ipv6only = 1;
-
-                } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
-                    ls->ipv6only = 0;
-
-                } else {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "invalid ipv6only flags \"%s\"",
-                                       &value[i].data[9]);
-                    return NGX_CONF_ERROR;
-                }
-
-                ls->bind = 1;
-
-            } else {
-                len = ngx_sock_ntop(sa,
-#if (nginx_version >= 1005003)
-                                    ls->socklen,
-#endif
-                                    buf, NGX_SOCKADDR_STRLEN, 1);
-
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "ipv6only is not supported "
-                                   "on addr \"%*s\", ignored", len, buf);
-            }
-
-            continue;
-#else
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "bind ipv6only is not supported "
-                               "on this platform");
-            return NGX_CONF_ERROR;
-#endif
-        }
-
-        if (ngx_strncmp(value[i].data, "so_keepalive=", 13) == 0) {
-
-            if (ngx_strcmp(&value[i].data[13], "on") == 0) {
-                ls->so_keepalive = 1;
-
-            } else if (ngx_strcmp(&value[i].data[13], "off") == 0) {
-                ls->so_keepalive = 2;
-
-            } else {
-
-#if (NGX_HAVE_KEEPALIVE_TUNABLE)
-                u_char     *p, *end;
-                ngx_str_t   s;
-
-                end = value[i].data + value[i].len;
-                s.data = value[i].data + 13;
-
-                p = ngx_strlchr(s.data, end, ':');
-                if (p == NULL) {
-                    p = end;
-                }
-
-                if (p > s.data) {
-                    s.len = p - s.data;
-
-                    ls->tcp_keepidle = ngx_parse_time(&s, 1);
-                    if (ls->tcp_keepidle == (time_t) NGX_ERROR) {
-                        goto invalid_so_keepalive;
-                    }
-                }
-
-                s.data = (p < end) ? (p + 1) : end;
-
-                p = ngx_strlchr(s.data, end, ':');
-                if (p == NULL) {
-                    p = end;
-                }
-
-                if (p > s.data) {
-                    s.len = p - s.data;
-
-                    ls->tcp_keepintvl = ngx_parse_time(&s, 1);
-                    if (ls->tcp_keepintvl == (time_t) NGX_ERROR) {
-                        goto invalid_so_keepalive;
-                    }
-                }
-
-                s.data = (p < end) ? (p + 1) : end;
-
-                if (s.data < end) {
-                    s.len = end - s.data;
-
-                    ls->tcp_keepcnt = ngx_atoi(s.data, s.len);
-                    if (ls->tcp_keepcnt == NGX_ERROR) {
-                        goto invalid_so_keepalive;
-                    }
-                }
-
-                if (ls->tcp_keepidle == 0 && ls->tcp_keepintvl == 0
-                    && ls->tcp_keepcnt == 0)
-                {
-                    goto invalid_so_keepalive;
-                }
-
-                ls->so_keepalive = 1;
-
-#else
-
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "the \"so_keepalive\" parameter accepts "
-                                   "only \"on\" or \"off\" on this platform");
-                return NGX_CONF_ERROR;
-
-#endif
-            }
-
-            ls->bind = 1;
-
-            continue;
-
-#if (NGX_HAVE_KEEPALIVE_TUNABLE)
-        invalid_so_keepalive:
-
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid so_keepalive value: \"%s\"",
-                               &value[i].data[13]);
-            return NGX_CONF_ERROR;
-#endif
-        }
-
-        if (ngx_strcmp(value[i].data, "proxy_protocol") == 0) {
-            ls->proxy_protocol = 1;
-            continue;
-        }
-
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "the invalid \"%V\" parameter", &value[i]);
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_eval.c b/debian/modules/rtmp/ngx_rtmp_eval.c
deleted file mode 100644
index a92a863..0000000
--- a/debian/modules/rtmp/ngx_rtmp_eval.c
+++ /dev/null
@@ -1,285 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_eval.h"
-
-
-#define NGX_RTMP_EVAL_BUFLEN    16
-
-
-static void
-ngx_rtmp_eval_session_str(void *ctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
-{
-    *ret = *(ngx_str_t *) ((u_char *) ctx + e->offset);
-}
-
-
-static void
-ngx_rtmp_eval_connection_str(void *ctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
-{
-    ngx_rtmp_session_t  *s = ctx;
-
-    *ret = *(ngx_str_t *) ((u_char *) s->connection + e->offset);
-}
-
-
-ngx_rtmp_eval_t ngx_rtmp_eval_session[] = {
-
-    { ngx_string("app"),
-      ngx_rtmp_eval_session_str,
-      offsetof(ngx_rtmp_session_t, app) },
-
-    { ngx_string("flashver"),
-      ngx_rtmp_eval_session_str,
-      offsetof(ngx_rtmp_session_t, flashver) },
-
-    { ngx_string("swfurl"),
-      ngx_rtmp_eval_session_str,
-      offsetof(ngx_rtmp_session_t, swf_url) },
-
-    { ngx_string("tcurl"),
-      ngx_rtmp_eval_session_str,
-      offsetof(ngx_rtmp_session_t, tc_url) },
-
-    { ngx_string("pageurl"),
-      ngx_rtmp_eval_session_str,
-      offsetof(ngx_rtmp_session_t, page_url) },
-
-    { ngx_string("addr"),
-      ngx_rtmp_eval_connection_str,
-      offsetof(ngx_connection_t, addr_text) },
-
-    ngx_rtmp_null_eval
-};
-
-
-static void
-ngx_rtmp_eval_append(ngx_buf_t *b, void *data, size_t len, ngx_log_t *log)
-{
-    size_t  buf_len;
-
-    if (b->last + len > b->end) {
-        buf_len = 2 * (b->last - b->pos) + len;
-
-        b->start = ngx_alloc(buf_len, log);
-        if (b->start == NULL) {
-            return;
-        }
-
-        b->last = ngx_cpymem(b->start, b->pos, b->last - b->pos);
-        b->pos = b->start;
-        b->end = b->start + buf_len;
-    }
-
-    b->last = ngx_cpymem(b->last, data, len);
-}
-
-
-static void
-ngx_rtmp_eval_append_var(void *ctx, ngx_buf_t *b, ngx_rtmp_eval_t **e,
-    ngx_str_t *name, ngx_log_t *log)
-{
-    ngx_uint_t          k;
-    ngx_str_t           v;
-    ngx_rtmp_eval_t    *ee;
-
-    for (; *e; ++e) {
-        for (k = 0, ee = *e; ee->handler; ++k, ++ee) {
-            if (ee->name.len == name->len &&
-                ngx_memcmp(ee->name.data, name->data, name->len) == 0)
-            {
-                ee->handler(ctx, ee, &v);
-                ngx_rtmp_eval_append(b, v.data, v.len, log);
-            }
-        }
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e, ngx_str_t *out,
-    ngx_log_t *log)
-{
-    u_char      c, *p;
-    ngx_str_t   name;
-    ngx_buf_t   b;
-    ngx_uint_t  n;
-
-    enum {
-        NORMAL,
-        ESCAPE,
-        NAME,
-        SNAME
-    } state = NORMAL;
-
-    b.pos = b.last = b.start = ngx_alloc(NGX_RTMP_EVAL_BUFLEN, log);
-    if (b.pos == NULL) {
-        return NGX_ERROR;
-    }
-
-    b.end = b.pos + NGX_RTMP_EVAL_BUFLEN;
-    name.data = NULL;
-
-    for (n = 0; n < in->len; ++n) {
-        p = &in->data[n];
-        c = *p;
-
-        switch (state) {
-            case SNAME:
-                if (c != '}') {
-                    continue;
-                }
-
-                name.len = p - name.data;
-                ngx_rtmp_eval_append_var(ctx, &b, e, &name, log);
-
-                state = NORMAL;
-
-                continue;
-
-            case NAME:
-                if (c == '{' && name.data == p) {
-                    ++name.data;
-                    state = SNAME;
-                    continue;
-                }
-                if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
-                    continue;
-                }
-
-                name.len = p - name.data;
-                ngx_rtmp_eval_append_var(ctx, &b, e, &name, log);
-                /* fall through */
-
-            case NORMAL:
-                switch (c) {
-                    case '$':
-                        name.data = p + 1;
-                        state = NAME;
-                        continue;
-                    case '\\':
-                        state = ESCAPE;
-                        continue;
-                }
-
-                /* fall through */
-
-            case ESCAPE:
-                ngx_rtmp_eval_append(&b, &c, 1, log);
-                state = NORMAL;
-                break;
-
-        }
-    }
-
-    if (state == NAME) {
-        p = &in->data[n];
-        name.len = p - name.data;
-        ngx_rtmp_eval_append_var(ctx, &b, e, &name, log);
-    }
-
-    c = 0;
-    ngx_rtmp_eval_append(&b, &c, 1, log);
-
-    out->data = b.pos;
-    out->len  = b.last - b.pos - 1;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_eval_streams(ngx_str_t *in)
-{
-#if !(NGX_WIN32)
-    ngx_int_t   mode, create, v, close_src;
-    ngx_fd_t    dst, src;
-    u_char     *path;
-
-    path = in->data;
-
-    while (*path >= '0' && *path <= '9') {
-        path++;
-    }
-
-    switch ((char) *path) {
-
-        case '>':
-
-            v = (path == in->data ? 1 : ngx_atoi(in->data, path - in->data));
-            if (v == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            dst = (ngx_fd_t) v;
-            mode = NGX_FILE_WRONLY;
-            create = NGX_FILE_TRUNCATE;
-            path++;
-
-            if (*path == (u_char) '>') {
-                mode = NGX_FILE_APPEND;
-                create = NGX_FILE_CREATE_OR_OPEN;
-                path++;
-            }
-
-            break;
-
-        case '<':
-
-            v = (path == in->data ? 0 : ngx_atoi(in->data, path - in->data));
-            if (v == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            dst = (ngx_fd_t) v;
-            mode = NGX_FILE_RDONLY;
-            create = NGX_FILE_OPEN;
-            path++;
-
-            break;
-
-        default:
-
-            return NGX_DONE;
-    }
-
-    if (*path == (u_char) '&') {
-
-        path++;
-        v = ngx_atoi(path, in->data + in->len - path);
-        if (v == NGX_ERROR) {
-            return NGX_ERROR;
-        }
-        src = (ngx_fd_t) v;
-        close_src = 0;
-
-    } else {
-
-        src = ngx_open_file(path, mode, create, NGX_FILE_DEFAULT_ACCESS);
-        if (src == NGX_INVALID_FILE) {
-            return NGX_ERROR;
-        }
-        close_src = 1;
-
-    }
-
-    if (src == dst) {
-        return NGX_OK;
-    }
-
-    dup2(src, dst);
-
-    if (close_src) {
-        ngx_close_file(src);
-    }
-    return NGX_OK;
-
-#else
-    return NGX_DONE;
-#endif
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_eval.h b/debian/modules/rtmp/ngx_rtmp_eval.h
deleted file mode 100644
index b05d16b..0000000
--- a/debian/modules/rtmp/ngx_rtmp_eval.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_EVAL_H_INCLUDED_
-#define _NGX_RTMP_EVAL_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-
-
-typedef struct ngx_rtmp_eval_s ngx_rtmp_eval_t;
-
-
-typedef void (* ngx_rtmp_eval_pt)(void *ctx, ngx_rtmp_eval_t *e,
-                                  ngx_str_t *ret);
-
-
-struct ngx_rtmp_eval_s {
-    ngx_str_t               name;
-    ngx_rtmp_eval_pt        handler;
-    ngx_uint_t              offset;
-};
-
-
-#define ngx_rtmp_null_eval  { ngx_null_string, NULL, 0 }
-
-
-/* standard session eval variables */
-extern ngx_rtmp_eval_t      ngx_rtmp_eval_session[];
-
-
-ngx_int_t ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e,
-    ngx_str_t *out, ngx_log_t *log);
-
-
-ngx_int_t ngx_rtmp_eval_streams(ngx_str_t *in);
-
-
-#endif /* _NGX_RTMP_EVAL_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_exec_module.c b/debian/modules/rtmp/ngx_rtmp_exec_module.c
deleted file mode 100644
index fccd4ba..0000000
--- a/debian/modules/rtmp/ngx_rtmp_exec_module.c
+++ /dev/null
@@ -1,1604 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_record_module.h"
-#include "ngx_rtmp_eval.h"
-#include <stdlib.h>
-
-#ifdef NGX_LINUX
-#include <unistd.h>
-#endif
-
-
-#if !(NGX_WIN32)
-static ngx_rtmp_publish_pt              next_publish;
-static ngx_rtmp_play_pt                 next_play;
-static ngx_rtmp_close_stream_pt         next_close_stream;
-static ngx_rtmp_record_done_pt          next_record_done;
-#endif
-
-
-static ngx_int_t ngx_rtmp_exec_init_process(ngx_cycle_t *cycle);
-static ngx_int_t ngx_rtmp_exec_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_exec_create_main_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_exec_init_main_conf(ngx_conf_t *cf, void *conf);
-static void * ngx_rtmp_exec_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_exec_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-/*static char * ngx_rtmp_exec_block(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);*/
-static char * ngx_rtmp_exec_conf(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static char *ngx_rtmp_exec_kill_signal(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-
-
-#define NGX_RTMP_EXEC_RESPAWN           0x01
-#define NGX_RTMP_EXEC_KILL              0x02
-
-
-#define NGX_RTMP_EXEC_PUBLISHING        0x01
-#define NGX_RTMP_EXEC_PLAYING           0x02
-
-
-enum {
-    NGX_RTMP_EXEC_PUSH,
-    NGX_RTMP_EXEC_PULL,
-
-    NGX_RTMP_EXEC_PUBLISH,
-    NGX_RTMP_EXEC_PUBLISH_DONE,
-    NGX_RTMP_EXEC_PLAY,
-    NGX_RTMP_EXEC_PLAY_DONE,
-    NGX_RTMP_EXEC_RECORD_DONE,
-
-    NGX_RTMP_EXEC_MAX,
-
-    NGX_RTMP_EXEC_STATIC
-};
-
-
-typedef struct {
-    ngx_str_t                           id;
-    ngx_uint_t                          type;
-    ngx_str_t                           cmd;
-    ngx_array_t                         args;       /* ngx_str_t */
-    ngx_array_t                         names;
-} ngx_rtmp_exec_conf_t;
-
-
-typedef struct {
-    ngx_rtmp_exec_conf_t               *conf;
-    ngx_log_t                          *log;
-    ngx_rtmp_eval_t                   **eval;
-    void                               *eval_ctx;
-    unsigned                            active:1;
-    unsigned                            managed:1;
-    ngx_pid_t                           pid;
-    ngx_pid_t                          *save_pid;
-    int                                 pipefd;
-    ngx_connection_t                    dummy_conn;  /*needed by ngx_xxx_event*/
-    ngx_event_t                         read_evt, write_evt;
-    ngx_event_t                         respawn_evt;
-    ngx_msec_t                          respawn_timeout;
-    ngx_int_t                           kill_signal;
-} ngx_rtmp_exec_t;
-
-
-typedef struct {
-    ngx_array_t                         static_conf; /* ngx_rtmp_exec_conf_t */
-    ngx_array_t                         static_exec; /* ngx_rtmp_exec_t */
-    ngx_msec_t                          respawn_timeout;
-    ngx_int_t                           kill_signal;
-    ngx_log_t                          *log;
-} ngx_rtmp_exec_main_conf_t;
-
-
-typedef struct ngx_rtmp_exec_pull_ctx_s  ngx_rtmp_exec_pull_ctx_t;
-
-struct ngx_rtmp_exec_pull_ctx_s {
-    ngx_pool_t                         *pool;
-    ngx_uint_t                          counter;
-    ngx_str_t                           name;
-    ngx_str_t                           app;
-    ngx_array_t                         pull_exec;   /* ngx_rtmp_exec_t */
-    ngx_rtmp_exec_pull_ctx_t           *next;
-};
-
-
-typedef struct {
-    ngx_int_t                           active;
-    ngx_array_t                         conf[NGX_RTMP_EXEC_MAX];
-                                                     /* ngx_rtmp_exec_conf_t */
-    ngx_flag_t                          respawn;
-    ngx_flag_t                          options;
-    ngx_uint_t                          nbuckets;
-    ngx_rtmp_exec_pull_ctx_t          **pull;
-} ngx_rtmp_exec_app_conf_t;
-
-
-typedef struct {
-    ngx_uint_t                          flags;
-    ngx_str_t                           path;     /* /tmp/rec/myfile-123.flv */
-    ngx_str_t                           filename; /* myfile-123.flv */
-    ngx_str_t                           basename; /* myfile-123 */
-    ngx_str_t                           dirname;  /* /tmp/rec */
-    ngx_str_t                           recorder;
-    u_char                              name[NGX_RTMP_MAX_NAME];
-    u_char                              args[NGX_RTMP_MAX_ARGS];
-    ngx_array_t                         push_exec;   /* ngx_rtmp_exec_t */
-    ngx_rtmp_exec_pull_ctx_t           *pull;
-} ngx_rtmp_exec_ctx_t;
-
-
-#if !(NGX_WIN32)
-static void ngx_rtmp_exec_respawn(ngx_event_t *ev);
-static ngx_int_t ngx_rtmp_exec_kill(ngx_rtmp_exec_t *e, ngx_int_t kill_signal);
-static ngx_int_t ngx_rtmp_exec_run(ngx_rtmp_exec_t *e);
-#endif
-
-
-static ngx_command_t  ngx_rtmp_exec_commands[] = {
-/*
-    { ngx_string("exec_block"),
-      NGX_RTMP_APP_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS|NGX_CONF_TAKE1,
-      ngx_rtmp_exec_block,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-*/
-    { ngx_string("exec"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_exec_conf,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
-      NGX_RTMP_EXEC_PUSH * sizeof(ngx_array_t),
-      NULL },
-
-    { ngx_string("exec_push"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_exec_conf,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
-      NGX_RTMP_EXEC_PUSH * sizeof(ngx_array_t),
-      NULL },
-
-    { ngx_string("exec_pull"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_exec_conf,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
-      NGX_RTMP_EXEC_PULL * sizeof(ngx_array_t),
-      NULL },
-
-    { ngx_string("exec_publish"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_exec_conf,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
-      NGX_RTMP_EXEC_PUBLISH * sizeof(ngx_array_t),
-      NULL },
-
-    { ngx_string("exec_publish_done"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_exec_conf,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
-      NGX_RTMP_EXEC_PUBLISH_DONE * sizeof(ngx_array_t),
-      NULL },
-
-    { ngx_string("exec_play"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_exec_conf,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
-      NGX_RTMP_EXEC_PLAY * sizeof(ngx_array_t),
-      NULL },
-
-    { ngx_string("exec_play_done"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_exec_conf,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
-      NGX_RTMP_EXEC_PLAY_DONE * sizeof(ngx_array_t),
-      NULL },
-
-    { ngx_string("exec_record_done"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_RTMP_REC_CONF|
-                         NGX_CONF_1MORE,
-      ngx_rtmp_exec_conf,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, conf) +
-      NGX_RTMP_EXEC_RECORD_DONE * sizeof(ngx_array_t),
-      NULL },
-
-    { ngx_string("exec_static"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_exec_conf,
-      NGX_RTMP_MAIN_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_main_conf_t, static_conf),
-      NULL },
-
-    { ngx_string("respawn"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, respawn),
-      NULL },
-
-    { ngx_string("respawn_timeout"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_MAIN_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_main_conf_t, respawn_timeout),
-      NULL },
-
-    { ngx_string("exec_kill_signal"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_exec_kill_signal,
-      NGX_RTMP_MAIN_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("exec_options"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_exec_app_conf_t, options),
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_exec_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_exec_postconfiguration,        /* postconfiguration */
-    ngx_rtmp_exec_create_main_conf,         /* create main configuration */
-    ngx_rtmp_exec_init_main_conf,           /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    ngx_rtmp_exec_create_app_conf,          /* create app configuration */
-    ngx_rtmp_exec_merge_app_conf            /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_exec_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_exec_module_ctx,              /* module context */
-    ngx_rtmp_exec_commands,                 /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    ngx_rtmp_exec_init_process,             /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void
-ngx_rtmp_exec_eval_ctx_cstr(void *sctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
-{
-    ngx_rtmp_session_t  *s = sctx;
-
-    ngx_rtmp_exec_ctx_t  *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
-    if (ctx == NULL) {
-        ret->len = 0;
-        return;
-    }
-
-    ret->data = (u_char *) ctx + e->offset;
-    ret->len = ngx_strlen(ret->data);
-}
-
-
-static void
-ngx_rtmp_exec_eval_ctx_str(void *sctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
-{
-    ngx_rtmp_session_t  *s = sctx;
-
-    ngx_rtmp_exec_ctx_t  *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
-    if (ctx == NULL) {
-        ret->len = 0;
-        return;
-    }
-
-    *ret = * (ngx_str_t *) ((u_char *) ctx + e->offset);
-}
-
-
-static void
-ngx_rtmp_exec_eval_pctx_str(void *ctx, ngx_rtmp_eval_t *e, ngx_str_t *ret)
-{
-    *ret = *(ngx_str_t *) ((u_char *) ctx + e->offset);
-}
-
-
-static ngx_rtmp_eval_t ngx_rtmp_exec_push_specific_eval[] = {
-
-    { ngx_string("name"),
-      ngx_rtmp_exec_eval_ctx_cstr,
-      offsetof(ngx_rtmp_exec_ctx_t, name) },
-
-    { ngx_string("args"),
-      ngx_rtmp_exec_eval_ctx_cstr,
-      offsetof(ngx_rtmp_exec_ctx_t, args) },
-
-    ngx_rtmp_null_eval
-};
-
-
-static ngx_rtmp_eval_t * ngx_rtmp_exec_push_eval[] = {
-    ngx_rtmp_eval_session,
-    ngx_rtmp_exec_push_specific_eval,
-    NULL
-};
-
-
-static ngx_rtmp_eval_t ngx_rtmp_exec_pull_specific_eval[] = {
-
-    { ngx_string("name"),
-      ngx_rtmp_exec_eval_pctx_str,
-      offsetof(ngx_rtmp_exec_pull_ctx_t, name) },
-
-    { ngx_string("app"),
-      ngx_rtmp_exec_eval_pctx_str,
-      offsetof(ngx_rtmp_exec_pull_ctx_t, app) },
-
-    ngx_rtmp_null_eval
-};
-
-
-static ngx_rtmp_eval_t * ngx_rtmp_exec_pull_eval[] = {
-    ngx_rtmp_exec_pull_specific_eval,
-    NULL
-};
-
-
-static ngx_rtmp_eval_t ngx_rtmp_exec_event_specific_eval[] = {
-
-    { ngx_string("name"),
-      ngx_rtmp_exec_eval_ctx_cstr,
-      offsetof(ngx_rtmp_exec_ctx_t, name) },
-
-    { ngx_string("args"),
-      ngx_rtmp_exec_eval_ctx_cstr,
-      offsetof(ngx_rtmp_exec_ctx_t, args) },
-
-    { ngx_string("path"),
-      ngx_rtmp_exec_eval_ctx_str,
-      offsetof(ngx_rtmp_exec_ctx_t, path) },
-
-    { ngx_string("filename"),
-      ngx_rtmp_exec_eval_ctx_str,
-      offsetof(ngx_rtmp_exec_ctx_t, filename) },
-
-    { ngx_string("basename"),
-      ngx_rtmp_exec_eval_ctx_str,
-      offsetof(ngx_rtmp_exec_ctx_t, basename) },
-
-    { ngx_string("dirname"),
-      ngx_rtmp_exec_eval_ctx_str,
-      offsetof(ngx_rtmp_exec_ctx_t, dirname) },
-
-    { ngx_string("recorder"),
-      ngx_rtmp_exec_eval_ctx_str,
-      offsetof(ngx_rtmp_exec_ctx_t, recorder) },
-
-    ngx_rtmp_null_eval
-};
-
-
-static ngx_rtmp_eval_t * ngx_rtmp_exec_event_eval[] = {
-    ngx_rtmp_eval_session,
-    ngx_rtmp_exec_event_specific_eval,
-    NULL
-};
-
-
-static void *
-ngx_rtmp_exec_create_main_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_exec_main_conf_t     *emcf;
-
-    emcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_exec_main_conf_t));
-    if (emcf == NULL) {
-        return NULL;
-    }
-
-    emcf->respawn_timeout = NGX_CONF_UNSET_MSEC;
-    emcf->kill_signal = NGX_CONF_UNSET;
-
-    if (ngx_array_init(&emcf->static_conf, cf->pool, 1,
-                       sizeof(ngx_rtmp_exec_conf_t)) != NGX_OK)
-    {
-        return NULL;
-    }
-
-    return emcf;
-}
-
-
-static char *
-ngx_rtmp_exec_init_main_conf(ngx_conf_t *cf, void *conf)
-{
-    ngx_rtmp_exec_main_conf_t  *emcf = conf;
-    ngx_rtmp_exec_conf_t       *ec;
-    ngx_rtmp_exec_t            *e;
-    ngx_uint_t                  n;
-
-    if (emcf->respawn_timeout == NGX_CONF_UNSET_MSEC) {
-        emcf->respawn_timeout = 5000;
-    }
-
-#if !(NGX_WIN32)
-    if (emcf->kill_signal == NGX_CONF_UNSET) {
-        emcf->kill_signal = SIGKILL;
-    }
-#endif
-
-    if (ngx_array_init(&emcf->static_exec, cf->pool,
-                       emcf->static_conf.nelts,
-                       sizeof(ngx_rtmp_exec_t)) != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
-    e = ngx_array_push_n(&emcf->static_exec, emcf->static_conf.nelts);
-    if (e == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    emcf->log = &cf->cycle->new_log;
-
-    ec = emcf->static_conf.elts;
-
-    for (n = 0; n < emcf->static_conf.nelts; n++, e++, ec++) {
-        ngx_memzero(e, sizeof(*e));
-        e->conf = ec;
-        e->managed = 1;
-        e->log = emcf->log;
-        e->respawn_timeout = emcf->respawn_timeout;
-        e->kill_signal = emcf->kill_signal;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static void *
-ngx_rtmp_exec_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_exec_app_conf_t      *eacf;
-
-    eacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_exec_app_conf_t));
-    if (eacf == NULL) {
-        return NULL;
-    }
-
-    eacf->respawn = NGX_CONF_UNSET;
-    eacf->options = NGX_CONF_UNSET;
-    eacf->nbuckets = NGX_CONF_UNSET_UINT;
-
-    return eacf;
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_merge_confs(ngx_array_t *conf, ngx_array_t *prev)
-{
-    size_t                 n;
-    ngx_rtmp_exec_conf_t  *ec, *pec;
-
-    if (prev->nelts == 0) {
-        return NGX_OK;
-    }
-
-    if (conf->nelts == 0) {
-        *conf = *prev;
-        return NGX_OK;
-    }
-
-    ec = ngx_array_push_n(conf, prev->nelts);
-    if (ec == NULL) {
-        return NGX_ERROR;
-    }
-
-    pec = prev->elts;
-    for (n = 0; n < prev->nelts; n++, ec++, pec++) {
-        *ec = *pec;
-    }
-
-    return NGX_OK;
-}
-
-
-static char *
-ngx_rtmp_exec_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_exec_app_conf_t   *prev = parent;
-    ngx_rtmp_exec_app_conf_t   *conf = child;
-
-    ngx_uint_t  n;
-
-    ngx_conf_merge_value(conf->respawn, prev->respawn, 1);
-    ngx_conf_merge_uint_value(conf->nbuckets, prev->nbuckets, 1024);
-
-    for (n = 0; n < NGX_RTMP_EXEC_MAX; n++) {
-        if (ngx_rtmp_exec_merge_confs(&conf->conf[n], &prev->conf[n]) != NGX_OK)
-        {
-            return NGX_CONF_ERROR;
-        }
-
-        if (conf->conf[n].nelts) {
-            conf->active = 1;
-            prev->active = 1;
-        }
-    }
-
-    if (conf->conf[NGX_RTMP_EXEC_PULL].nelts > 0) {
-        conf->pull = ngx_pcalloc(cf->pool, sizeof(void *) * conf->nbuckets);
-        if (conf->pull == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_init_process(ngx_cycle_t *cycle)
-{
-#if !(NGX_WIN32)
-    ngx_rtmp_core_main_conf_t  *cmcf = ngx_rtmp_core_main_conf;
-    ngx_rtmp_core_srv_conf_t  **cscf;
-    ngx_rtmp_conf_ctx_t        *cctx;
-    ngx_rtmp_exec_main_conf_t  *emcf;
-    ngx_rtmp_exec_t            *e;
-    ngx_uint_t                  n;
-
-    if (cmcf == NULL || cmcf->servers.nelts == 0) {
-        return NGX_OK;
-    }
-
-    /* execs are always started by the first worker */
-    if (ngx_process_slot) {
-        return NGX_OK;
-    }
-
-    cscf = cmcf->servers.elts;
-    cctx = (*cscf)->ctx;
-    emcf = cctx->main_conf[ngx_rtmp_exec_module.ctx_index];
-
-    /* FreeBSD note:
-     * When worker is restarted, child process (ffmpeg) will
-     * not be terminated if it's connected to another
-     * (still alive) worker. That leads to starting
-     * another instance of exec_static process.
-     * Need to kill previously started processes.
-     *
-     * On Linux "prctl" syscall is used to kill child
-     * when nginx worker is terminated.
-     */
-
-    e = emcf->static_exec.elts;
-    for (n = 0; n < emcf->static_exec.nelts; ++n, ++e) {
-        e->respawn_evt.data = e;
-        e->respawn_evt.log = e->log;
-        e->respawn_evt.handler = ngx_rtmp_exec_respawn;
-        ngx_post_event((&e->respawn_evt), &ngx_rtmp_init_queue);
-    }
-#endif
-
-    return NGX_OK;
-}
-
-
-#if !(NGX_WIN32)
-static void
-ngx_rtmp_exec_respawn(ngx_event_t *ev)
-{
-    ngx_rtmp_exec_run((ngx_rtmp_exec_t *) ev->data);
-}
-
-
-static void
-ngx_rtmp_exec_child_dead(ngx_event_t *ev)
-{
-    ngx_connection_t   *dummy_conn = ev->data;
-    ngx_rtmp_exec_t    *e;
-
-    e = dummy_conn->data;
-
-    ngx_log_error(NGX_LOG_INFO, e->log, 0,
-                  "exec: child %ui exited; %s", (ngx_int_t) e->pid,
-                  e->respawn_timeout == NGX_CONF_UNSET_MSEC ? "respawning" :
-                                                               "ignoring");
-
-    ngx_rtmp_exec_kill(e, 0);
-
-    if (e->respawn_timeout == NGX_CONF_UNSET_MSEC) {
-        return;
-    }
-
-    if (e->respawn_timeout == 0) {
-        ngx_rtmp_exec_run(e);
-        return;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, e->log, 0,
-                   "exec: shedule respawn %Mmsec", e->respawn_timeout);
-
-    e->respawn_evt.data = e;
-    e->respawn_evt.log = e->log;
-    e->respawn_evt.handler = ngx_rtmp_exec_respawn;
-
-    ngx_add_timer(&e->respawn_evt, e->respawn_timeout);
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_kill(ngx_rtmp_exec_t *e, ngx_int_t kill_signal)
-{
-    if (e->respawn_evt.timer_set) {
-        ngx_del_timer(&e->respawn_evt);
-    }
-
-    if (e->read_evt.active) {
-        ngx_del_event(&e->read_evt, NGX_READ_EVENT, 0);
-    }
-
-    if (e->active == 0) {
-        return NGX_OK;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, e->log, 0,
-                  "exec: terminating child %ui", (ngx_int_t) e->pid);
-
-    e->active = 0;
-    close(e->pipefd);
-    if (e->save_pid) {
-        *e->save_pid = NGX_INVALID_PID;
-    }
-
-    if (kill_signal == 0) {
-        return NGX_OK;
-    }
-
-    if (kill(e->pid, kill_signal) == -1) {
-        ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
-                      "exec: kill failed pid=%i", (ngx_int_t) e->pid);
-    } else {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, e->log, 0,
-                       "exec: killed pid=%i", (ngx_int_t) e->pid);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_run(ngx_rtmp_exec_t *e)
-{
-    int                     fd, ret, maxfd, pipefd[2];
-    char                  **args, **arg_out;
-    ngx_pid_t               pid;
-    ngx_str_t              *arg_in, a;
-    ngx_uint_t              n;
-    ngx_rtmp_exec_conf_t   *ec;
-
-    ec = e->conf;
-
-    ngx_log_error(NGX_LOG_INFO, e->log, 0,
-                  "exec: starting %s child '%V'",
-                  e->managed ? "managed" : "unmanaged", &ec->cmd);
-
-    pipefd[0] = -1;
-    pipefd[1] = -1;
-
-    if (e->managed) {
-
-        if (e->active) {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, e->log, 0,
-                           "exec: already active '%V'", &ec->cmd);
-            return NGX_OK;
-        }
-
-        if (pipe(pipefd) == -1) {
-            ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
-                          "exec: pipe failed");
-            return NGX_ERROR;
-        }
-
-        /* make pipe write end survive through exec */
-
-        ret = fcntl(pipefd[1], F_GETFD);
-
-        if (ret != -1) {
-            ret &= ~FD_CLOEXEC;
-            ret = fcntl(pipefd[1], F_SETFD, ret);
-        }
-
-        if (ret == -1) {
-
-            close(pipefd[0]);
-            close(pipefd[1]);
-
-            ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
-                          "exec: fcntl failed");
-
-            return NGX_ERROR;
-        }
-    }
-
-    pid = fork();
-
-    switch (pid) {
-
-        case -1:
-
-            /* failure */
-
-            if (pipefd[0] != -1) {
-                close(pipefd[0]);
-            }
-
-            if (pipefd[1] != -1) {
-                close(pipefd[1]);
-            }
-
-            ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
-                          "exec: fork failed");
-
-            return NGX_ERROR;
-
-        case 0:
-
-            /* child */
-
-#if (NGX_LINUX)
-            if (e->managed) {
-                prctl(PR_SET_PDEATHSIG, e->kill_signal, 0, 0, 0);
-            }
-#endif
-
-            /* close all descriptors but pipe write end */
-
-            maxfd = sysconf(_SC_OPEN_MAX);
-            for (fd = 0; fd < maxfd; ++fd) {
-                if (fd == pipefd[1]) {
-                    continue;
-                }
-
-                close(fd);
-            }
-
-            fd = open("/dev/null", O_RDWR);
-
-            dup2(fd, STDIN_FILENO);
-            dup2(fd, STDOUT_FILENO);
-            dup2(fd, STDERR_FILENO);
-
-            args = ngx_alloc((ec->args.nelts + 2) * sizeof(char *), e->log);
-            if (args == NULL) {
-                exit(1);
-            }
-
-            arg_in = ec->args.elts;
-            arg_out = args;
-            *arg_out++ = (char *) ec->cmd.data;
-
-            for (n = 0; n < ec->args.nelts; n++, ++arg_in) {
-
-                if (e->eval == NULL) {
-                    a = *arg_in;
-                } else {
-                    ngx_rtmp_eval(e->eval_ctx, arg_in, e->eval, &a, e->log);
-                }
-
-                if (ngx_rtmp_eval_streams(&a) != NGX_DONE) {
-                    continue;
-                }
-
-                *arg_out++ = (char *) a.data;
-            }
-
-            *arg_out = NULL;
-
-#if (NGX_DEBUG)
-            {
-                char    **p;
-
-                for (p = args; *p; p++) {
-                    ngx_write_fd(STDERR_FILENO, "'", 1);
-                    ngx_write_fd(STDERR_FILENO, *p, strlen(*p));
-                    ngx_write_fd(STDERR_FILENO, "' ", 2);
-                }
-
-                ngx_write_fd(STDERR_FILENO, "\n", 1);
-            }
-#endif
-
-            if (execvp((char *) ec->cmd.data, args) == -1) {
-                char    *msg;
-
-                msg = strerror(errno);
-
-                ngx_write_fd(STDERR_FILENO, "execvp error: ", 14);
-                ngx_write_fd(STDERR_FILENO, msg, strlen(msg));
-                ngx_write_fd(STDERR_FILENO, "\n", 1);
-
-                exit(1);
-            }
-
-            break;
-
-        default:
-
-            /* parent */
-
-            if (pipefd[1] != -1) {
-                close(pipefd[1]);
-            }
-
-            if (pipefd[0] != -1) {
-
-                e->active = 1;
-                e->pid = pid;
-                e->pipefd = pipefd[0];
-
-                if (e->save_pid) {
-                    *e->save_pid = pid;
-                }
-
-                e->dummy_conn.fd = e->pipefd;
-                e->dummy_conn.data = e;
-                e->dummy_conn.read  = &e->read_evt;
-                e->dummy_conn.write = &e->write_evt;
-                e->read_evt.data  = &e->dummy_conn;
-                e->write_evt.data = &e->dummy_conn;
-
-                e->read_evt.log = e->log;
-                e->read_evt.handler = ngx_rtmp_exec_child_dead;
-
-                if (ngx_add_event(&e->read_evt, NGX_READ_EVENT, 0) != NGX_OK) {
-                    ngx_log_error(NGX_LOG_INFO, e->log, ngx_errno,
-                                  "exec: failed to add child control event");
-                }
-            }
-
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, e->log, 0,
-                           "exec: child '%V' started pid=%i",
-                           &ec->cmd, (ngx_int_t) pid);
-            break;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_init_ctx(ngx_rtmp_session_t *s, u_char name[NGX_RTMP_MAX_NAME],
-    u_char args[NGX_RTMP_MAX_ARGS], ngx_uint_t flags)
-{
-    ngx_uint_t                  n;
-    ngx_array_t                *push_conf;
-    ngx_rtmp_exec_t            *e;
-    ngx_rtmp_exec_ctx_t        *ctx;
-    ngx_rtmp_exec_conf_t       *ec;
-    ngx_rtmp_exec_app_conf_t   *eacf;
-    ngx_rtmp_exec_main_conf_t  *emcf;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
-
-    if (ctx != NULL) {
-        goto done;
-    }
-
-    ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_exec_ctx_t));
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_exec_module);
-
-    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
-
-    emcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_exec_module);
-
-    push_conf = &eacf->conf[NGX_RTMP_EXEC_PUSH];
-
-    if (push_conf->nelts > 0) {
-
-        if (ngx_array_init(&ctx->push_exec, s->connection->pool,
-                           push_conf->nelts,
-                           sizeof(ngx_rtmp_exec_t)) != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        e = ngx_array_push_n(&ctx->push_exec, push_conf->nelts);
-
-        if (e == NULL) {
-            return NGX_ERROR;
-        }
-
-        ec = push_conf->elts;
-
-        for (n = 0; n < push_conf->nelts; n++, e++, ec++) {
-            ngx_memzero(e, sizeof(*e));
-            e->conf = ec;
-            e->managed = 1;
-            e->log = s->connection->log;
-            e->eval = ngx_rtmp_exec_push_eval;
-            e->eval_ctx = s;
-            e->kill_signal = emcf->kill_signal;
-            e->respawn_timeout = (eacf->respawn ? emcf->respawn_timeout :
-                                  NGX_CONF_UNSET_MSEC);
-        }
-    }
-
-done:
-
-    ngx_memcpy(ctx->name, name, NGX_RTMP_MAX_NAME);
-    ngx_memcpy(ctx->args, args, NGX_RTMP_MAX_ARGS);
-
-    ctx->flags |= flags;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_init_pull_ctx(ngx_rtmp_session_t *s,
-    u_char name[NGX_RTMP_MAX_NAME])
-{
-    size_t                      len;
-    ngx_uint_t                  n;
-    ngx_pool_t                 *pool;
-    ngx_array_t                *pull_conf;
-    ngx_rtmp_exec_t            *e;
-    ngx_rtmp_exec_ctx_t        *ctx;
-    ngx_rtmp_exec_conf_t       *ec;
-    ngx_rtmp_exec_pull_ctx_t   *pctx, **ppctx;
-    ngx_rtmp_exec_app_conf_t   *eacf;
-    ngx_rtmp_exec_main_conf_t  *emcf;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
-    if (ctx->pull != NULL) {
-        return NGX_OK;
-    }
-
-    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
-
-    pull_conf = &eacf->conf[NGX_RTMP_EXEC_PULL];
-
-    if (pull_conf->nelts == 0) {
-        return NGX_OK;
-    }
-
-    emcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_exec_module);
-
-    len = ngx_strlen(name);
-
-    ppctx = &eacf->pull[ngx_hash_key(name, len) % eacf->nbuckets];
-
-    for (; *ppctx; ppctx = &(*ppctx)->next) {
-        pctx = *ppctx;
-
-        if (pctx->name.len == len &&
-            ngx_strncmp(name, pctx->name.data, len) == 0)
-        {
-            goto done;
-        }
-    }
-
-    pool = ngx_create_pool(4096, emcf->log);
-    if (pool == NULL) {
-        return NGX_ERROR;
-    }
-
-    pctx = ngx_pcalloc(pool, sizeof(ngx_rtmp_exec_pull_ctx_t));
-    if (pctx == NULL) {
-        goto error;
-    }
-
-    pctx->pool = pool;
-    pctx->name.len = len;
-    pctx->name.data = ngx_palloc(pool, len);
-
-    if (pctx->name.data == NULL) {
-        goto error;
-    }
-
-    ngx_memcpy(pctx->name.data, name, len);
-
-    pctx->app.len = s->app.len;
-    pctx->app.data = ngx_palloc(pool, s->app.len);
-
-    if (pctx->app.data == NULL) {
-        goto error;
-    }
-
-    ngx_memcpy(pctx->app.data, s->app.data, s->app.len);
-
-    if (ngx_array_init(&pctx->pull_exec, pool, pull_conf->nelts,
-                       sizeof(ngx_rtmp_exec_t)) != NGX_OK)
-    {
-        goto error;
-    }
-
-    e = ngx_array_push_n(&pctx->pull_exec, pull_conf->nelts);
-    if (e == NULL) {
-        goto error;
-    }
-
-    ec = pull_conf->elts;
-    for (n = 0; n < pull_conf->nelts; n++, e++, ec++) {
-        ngx_memzero(e, sizeof(*e));
-        e->conf = ec;
-        e->managed = 1;
-        e->log = emcf->log;
-        e->eval = ngx_rtmp_exec_pull_eval;
-        e->eval_ctx = pctx;
-        e->kill_signal = emcf->kill_signal;
-        e->respawn_timeout = (eacf->respawn ? emcf->respawn_timeout :
-                                              NGX_CONF_UNSET_MSEC);
-    }
-
-    *ppctx = pctx;
-
-done:
-
-    ctx->pull = pctx;
-    ctx->pull->counter++;
-
-    return NGX_OK;
-
-error:
-
-    ngx_destroy_pool(pool);
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_filter(ngx_rtmp_session_t *s, ngx_rtmp_exec_conf_t *ec)
-{
-    size_t                len;
-    ngx_str_t            *v;
-    ngx_uint_t            n;
-    ngx_rtmp_exec_ctx_t  *ctx;
-
-    if (ec->names.nelts == 0) {
-        return NGX_OK;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
-
-    len = ngx_strlen(ctx->name);
-
-    v = ec->names.elts;
-    for (n = 0; n < ec->names.nelts; n++, s++) {
-        if (v->len == len && ngx_strncmp(v->data, ctx->name, len) == 0) {
-            return NGX_OK;
-        }
-    }
-
-    return NGX_DECLINED;
-}
-
-
-static void
-ngx_rtmp_exec_unmanaged(ngx_rtmp_session_t *s, ngx_array_t *e, const char *op)
-{
-    ngx_uint_t             n;
-    ngx_rtmp_exec_t        en;
-    ngx_rtmp_exec_conf_t  *ec;
-
-    if (e->nelts == 0) {
-        return;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "exec: %s %uz unmanaged command(s)", op, e->nelts);
-
-    ec = e->elts;
-    for (n = 0; n < e->nelts; n++, ec++) {
-        if (ngx_rtmp_exec_filter(s, ec) != NGX_OK) {
-            continue;
-        }
-
-        ngx_memzero(&en, sizeof(ngx_rtmp_exec_t));
-
-        en.conf = ec;
-        en.eval = ngx_rtmp_exec_event_eval;
-        en.eval_ctx = s;
-        en.log = s->connection->log;
-
-        ngx_rtmp_exec_run(&en);
-    }
-}
-
-
-static void
-ngx_rtmp_exec_managed(ngx_rtmp_session_t *s, ngx_array_t *e, const char *op)
-{
-    ngx_uint_t        n;
-    ngx_rtmp_exec_t  *en;
-
-    if (e->nelts == 0) {
-        return;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "exec: %s %uz managed command(s)", op, e->nelts);
-
-    en = e->elts;
-    for (n = 0; n < e->nelts; n++, en++) {
-        if (ngx_rtmp_exec_filter(s, en->conf) == NGX_OK) {
-            ngx_rtmp_exec_run(en);
-        }
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    ngx_rtmp_exec_ctx_t       *ctx;
-    ngx_rtmp_exec_app_conf_t  *eacf;
-
-    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
-
-    if (eacf == NULL || !eacf->active) {
-        goto next;
-    }
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    if (ngx_rtmp_exec_init_ctx(s, v->name, v->args, NGX_RTMP_EXEC_PUBLISHING)
-        != NGX_OK)
-    {
-        goto next;
-    }
-
-    ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_PUBLISH], "publish");
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
-
-    ngx_rtmp_exec_managed(s, &ctx->push_exec, "push");
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    ngx_rtmp_exec_ctx_t       *ctx;
-    ngx_rtmp_exec_pull_ctx_t  *pctx;
-    ngx_rtmp_exec_app_conf_t  *eacf;
-
-    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
-
-    if (eacf == NULL || !eacf->active) {
-        goto next;
-    }
-
-    if (ngx_rtmp_exec_init_ctx(s, v->name, v->args, NGX_RTMP_EXEC_PLAYING)
-        != NGX_OK)
-    {
-        goto next;
-    }
-
-    ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_PLAY], "play");
-
-    if (ngx_rtmp_exec_init_pull_ctx(s, v->name) != NGX_OK) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
-    pctx = ctx->pull;
-
-    if (pctx && pctx->counter == 1) {
-        ngx_rtmp_exec_managed(s, &pctx->pull_exec, "pull");
-    }
-
-next:
-    return next_play(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
-{
-    size_t                     n;
-    ngx_rtmp_exec_t           *e;
-    ngx_rtmp_exec_ctx_t       *ctx;
-    ngx_rtmp_exec_pull_ctx_t  *pctx, **ppctx;
-    ngx_rtmp_exec_app_conf_t  *eacf;
-
-    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
-    if (eacf == NULL) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
-    if (ctx == NULL) {
-        goto next;
-    }
-
-    if (ctx->flags & NGX_RTMP_EXEC_PUBLISHING) {
-        ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_PUBLISH_DONE],
-                                "publish_done");
-    }
-
-    if (ctx->flags & NGX_RTMP_EXEC_PLAYING) {
-        ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_PLAY_DONE],
-                                "play_done");
-    }
-
-    ctx->flags = 0;
-
-    if (ctx->push_exec.nelts > 0) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "exec: delete %uz push command(s)",
-                       ctx->push_exec.nelts);
-
-        e = ctx->push_exec.elts;
-        for (n = 0; n < ctx->push_exec.nelts; n++, e++) {
-            ngx_rtmp_exec_kill(e, e->kill_signal);
-        }
-    }
-
-    pctx = ctx->pull;
-
-    if (pctx && --pctx->counter == 0) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "exec: delete %uz pull command(s)",
-                       pctx->pull_exec.nelts);
-
-        e = pctx->pull_exec.elts;
-        for (n = 0; n < pctx->pull_exec.nelts; n++, e++) {
-            ngx_rtmp_exec_kill(e, e->kill_signal);
-        }
-
-        ppctx = &eacf->pull[ngx_hash_key(pctx->name.data, pctx->name.len) %
-                            eacf->nbuckets];
-
-        for (; *ppctx; ppctx = &(*ppctx)->next) {
-            if (pctx == *ppctx) {
-                *ppctx = pctx->next;
-                break;
-            }
-        }
-
-        ngx_destroy_pool(pctx->pool);
-    }
-
-    ctx->pull = NULL;
-
-next:
-    return next_close_stream(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_record_done(ngx_rtmp_session_t *s, ngx_rtmp_record_done_t *v)
-{
-    u_char                     c;
-    ngx_uint_t                 ext, dir;
-    ngx_rtmp_exec_ctx_t       *ctx;
-    ngx_rtmp_exec_app_conf_t  *eacf;
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
-    if (eacf == NULL || !eacf->active) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
-    if (ctx == NULL) {
-        goto next;
-    }
-
-    ctx->recorder = v->recorder;
-    ctx->path = v->path;
-
-    ctx->dirname.data = ctx->path.data;
-    ctx->dirname.len = 0;
-
-    for (dir = ctx->path.len; dir > 0; dir--) {
-        c = ctx->path.data[dir - 1];
-        if (c == '/' || c == '\\') {
-            ctx->dirname.len = dir - 1;
-            break;
-        }
-    }
-
-    ctx->filename.data = ctx->path.data + dir;
-    ctx->filename.len = ctx->path.len - dir;
-
-    ctx->basename = ctx->filename;
-
-    for (ext = ctx->filename.len; ext > 0; ext--) {
-        if (ctx->filename.data[ext - 1] == '.') {
-            ctx->basename.len = ext - 1;
-            break;
-        }
-    }
-
-    ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_RECORD_DONE],
-                            "record_done");
-
-    ngx_str_null(&v->recorder);
-    ngx_str_null(&v->path);
-
-next:
-    return next_record_done(s, v);
-}
-#endif /* NGX_WIN32 */
-
-
-static char *
-ngx_rtmp_exec_conf(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    size_t                     n, nargs;
-    ngx_str_t                 *s, *value, v;
-    ngx_array_t               *confs;
-    ngx_rtmp_exec_conf_t      *ec;
-    ngx_rtmp_exec_app_conf_t  *eacf;
-
-    confs = (ngx_array_t *) (p + cmd->offset);
-
-    eacf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_exec_module);
-
-    if (confs->nalloc == 0 && ngx_array_init(confs, cf->pool, 1,
-                                             sizeof(ngx_rtmp_exec_conf_t))
-                              != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
-    value = cf->args->elts;
-
-    ec = ngx_array_push(confs);
-    if (ec == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_memzero(ec, sizeof(ngx_rtmp_exec_conf_t));
-
-    /* type is undefined for explicit execs */
-
-    ec->type = NGX_CONF_UNSET_UINT;
-    ec->cmd = value[1];
-
-    if (ngx_array_init(&ec->names, cf->pool, 1, sizeof(ngx_str_t)) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (cf->args->nelts == 2) {
-        return NGX_CONF_OK;
-    }
-
-    nargs = cf->args->nelts - 2;
-    if (ngx_array_init(&ec->args, cf->pool, nargs, sizeof(ngx_str_t)) != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
-    for (n = 2; n < cf->args->nelts; n++) {
-
-        v = value[n];
-
-        if (eacf->options == 1) {
-
-            if (v.len >= 5 && ngx_strncmp(v.data, "name=", 5) == 0) {
-
-                s = ngx_array_push(&ec->names);
-                if (s == NULL) {
-                    return NGX_CONF_ERROR;
-                }
-
-                v.data += 5;
-                v.len -= 5;
-
-                *s = v;
-
-                continue;
-            }
-        }
-
-        s = ngx_array_push(&ec->args);
-        if (s == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        *s = v;
-    }
-
-    return NGX_CONF_OK;
-}
-
-/*
-static char *
-ngx_rtmp_exec_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char                       *rv;
-    ngx_str_t                  *value;
-    ngx_conf_t                  save;
-    ngx_array_t                *confs;
-    ngx_rtmp_conf_ctx_t        *ctx, *pctx;
-    ngx_rtmp_exec_conf_t       *ec, *eec;
-    ngx_rtmp_exec_app_conf_t   *eacf;
-    ngx_rtmp_exec_main_conf_t  *emcf;
-
-    value = cf->args->elts;
-
-    eacf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_exec_module);
-
-    emcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_exec_module);
-
-    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
-    if (ctx == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    pctx = cf->ctx;
-
-    ctx->main_conf = pctx->main_conf;
-    ctx->srv_conf  = pctx->srv_conf;
-
-    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
-    if (ctx->app_conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ec = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_exec_conf_t));
-    if (ec == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ec->id = value[1];
-    ec->type = NGX_CONF_UNSET_UINT;
-
-    ctx->app_conf[ngx_rtmp_exec_module.ctx_index] = ec;
-
-    save = *cf;
-
-    cf->ctx = ctx;
-    cf->cmd_type = NGX_RTMP_EXEC_CONF;
-
-    rv = ngx_conf_parse(cf, NULL);
-    *cf= save;
-
-    switch (ec->type) {
-
-        case NGX_RTMP_EXEC_STATIC:
-            confs = &emcf->static_conf;
-            break;
-
-        case NGX_CONF_UNSET_UINT:
-            return "unspecified exec type";
-
-        default:
-            confs = &eacf->conf[ec->type];
-    }
-
-    if (confs->nalloc == 0 && ngx_array_init(confs, cf->pool, 1,
-                                             sizeof(ngx_rtmp_exec_conf_t))
-                             != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
-    eec = ngx_array_push(confs);
-    if (eec == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    *eec = *ec;
-
-    return rv;
-}
-*/
-
-static char *
-ngx_rtmp_exec_kill_signal(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_rtmp_exec_main_conf_t  *emcf = conf;
-
-    ngx_str_t  *value;
-
-    value = cf->args->elts;
-    value++;
-
-    emcf->kill_signal = ngx_atoi(value->data, value->len);
-    if (emcf->kill_signal != NGX_ERROR) {
-        return NGX_CONF_OK;
-    }
-
-#define NGX_RMTP_EXEC_SIGNAL(name)                                          \
-    if (value->len == sizeof(#name) - 1 &&                                  \
-        ngx_strncasecmp(value->data, (u_char *) #name, value->len) == 0)    \
-    {                                                                       \
-        emcf->kill_signal = SIG##name;                                      \
-        return NGX_CONF_OK;                                                 \
-    }
-
-    /* POSIX.1-1990 signals */
-
-#if !(NGX_WIN32)
-    NGX_RMTP_EXEC_SIGNAL(HUP);
-    NGX_RMTP_EXEC_SIGNAL(INT);
-    NGX_RMTP_EXEC_SIGNAL(QUIT);
-    NGX_RMTP_EXEC_SIGNAL(ILL);
-    NGX_RMTP_EXEC_SIGNAL(ABRT);
-    NGX_RMTP_EXEC_SIGNAL(FPE);
-    NGX_RMTP_EXEC_SIGNAL(KILL);
-    NGX_RMTP_EXEC_SIGNAL(SEGV);
-    NGX_RMTP_EXEC_SIGNAL(PIPE);
-    NGX_RMTP_EXEC_SIGNAL(ALRM);
-    NGX_RMTP_EXEC_SIGNAL(TERM);
-    NGX_RMTP_EXEC_SIGNAL(USR1);
-    NGX_RMTP_EXEC_SIGNAL(USR2);
-    NGX_RMTP_EXEC_SIGNAL(CHLD);
-    NGX_RMTP_EXEC_SIGNAL(CONT);
-    NGX_RMTP_EXEC_SIGNAL(STOP);
-    NGX_RMTP_EXEC_SIGNAL(TSTP);
-    NGX_RMTP_EXEC_SIGNAL(TTIN);
-    NGX_RMTP_EXEC_SIGNAL(TTOU);
-#endif
-
-#undef NGX_RMTP_EXEC_SIGNAL
-
-    return "unknown signal";
-}
-
-
-static ngx_int_t
-ngx_rtmp_exec_postconfiguration(ngx_conf_t *cf)
-{
-#if !(NGX_WIN32)
-
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_exec_publish;
-
-    next_play = ngx_rtmp_play;
-    ngx_rtmp_play = ngx_rtmp_exec_play;
-
-    next_close_stream = ngx_rtmp_close_stream;
-    ngx_rtmp_close_stream = ngx_rtmp_exec_close_stream;
-
-    next_record_done = ngx_rtmp_record_done;
-    ngx_rtmp_record_done = ngx_rtmp_exec_record_done;
-
-#endif /* NGX_WIN32 */
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_flv_module.c b/debian/modules/rtmp/ngx_rtmp_flv_module.c
deleted file mode 100644
index 4776e54..0000000
--- a/debian/modules/rtmp/ngx_rtmp_flv_module.c
+++ /dev/null
@@ -1,675 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_play_module.h"
-#include "ngx_rtmp_codec_module.h"
-#include "ngx_rtmp_streams.h"
-
-
-static ngx_int_t ngx_rtmp_flv_postconfiguration(ngx_conf_t *cf);
-static void ngx_rtmp_flv_read_meta(ngx_rtmp_session_t *s, ngx_file_t *f);
-static ngx_int_t ngx_rtmp_flv_timestamp_to_offset(ngx_rtmp_session_t *s,
-       ngx_file_t *f, ngx_int_t timestamp);
-static ngx_int_t ngx_rtmp_flv_init(ngx_rtmp_session_t *s, ngx_file_t *f,
-       ngx_int_t aindex, ngx_int_t vindex);
-static ngx_int_t ngx_rtmp_flv_start(ngx_rtmp_session_t *s, ngx_file_t *f);
-static ngx_int_t ngx_rtmp_flv_seek(ngx_rtmp_session_t *s, ngx_file_t *f,
-       ngx_uint_t offset);
-static ngx_int_t ngx_rtmp_flv_stop(ngx_rtmp_session_t *s, ngx_file_t *f);
-static ngx_int_t ngx_rtmp_flv_send(ngx_rtmp_session_t *s, ngx_file_t *f,
-                                   ngx_uint_t *ts);
-
-
-typedef struct {
-    ngx_uint_t                          nelts;
-    ngx_uint_t                          offset;
-} ngx_rtmp_flv_index_t;
-
-
-typedef struct {
-    ngx_int_t                           offset;
-    ngx_int_t                           start_timestamp;
-    ngx_event_t                         write_evt;
-    uint32_t                            last_audio;
-    uint32_t                            last_video;
-    ngx_uint_t                          msg_mask;
-    uint32_t                            epoch;
-
-    unsigned                            meta_read:1;
-    ngx_rtmp_flv_index_t                filepositions;
-    ngx_rtmp_flv_index_t                times;
-} ngx_rtmp_flv_ctx_t;
-
-
-#define NGX_RTMP_FLV_BUFFER             (1024*1024)
-#define NGX_RTMP_FLV_BUFLEN_ADDON       1000
-#define NGX_RTMP_FLV_TAG_HEADER         11
-#define NGX_RTMP_FLV_DATA_OFFSET        13
-
-
-static u_char                           ngx_rtmp_flv_buffer[
-                                        NGX_RTMP_FLV_BUFFER];
-static u_char                           ngx_rtmp_flv_header[
-                                        NGX_RTMP_FLV_TAG_HEADER];
-
-
-static ngx_rtmp_module_t  ngx_rtmp_flv_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_flv_postconfiguration,         /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    NULL,                                   /* create app configuration */
-    NULL                                    /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_flv_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_flv_module_ctx,               /* module context */
-    NULL,                                   /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_int_t
-ngx_rtmp_flv_fill_index(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_flv_index_t *idx)
-{
-    uint32_t                        nelts;
-    ngx_buf_t                      *b;
-
-    /* we have AMF array pointed by context;
-     * need to extract its size (4 bytes) &
-     * save offset of actual array data */
-
-    b = ctx->link->buf;
-
-    if (b->last - b->pos < (ngx_int_t) ctx->offset + 4) {
-        return NGX_ERROR;
-    }
-
-    ngx_rtmp_rmemcpy(&nelts, b->pos + ctx->offset, 4);
-
-    idx->nelts = nelts;
-    idx->offset = ctx->offset + 4;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_flv_init_index(ngx_rtmp_session_t *s, ngx_chain_t *in)
-{
-    ngx_rtmp_flv_ctx_t             *ctx;
-
-    static ngx_rtmp_amf_ctx_t       filepositions_ctx;
-    static ngx_rtmp_amf_ctx_t       times_ctx;
-
-    static ngx_rtmp_amf_elt_t       in_keyframes[] = {
-
-        { NGX_RTMP_AMF_ARRAY | NGX_RTMP_AMF_CONTEXT,
-          ngx_string("filepositions"),
-          &filepositions_ctx, 0 },
-
-        { NGX_RTMP_AMF_ARRAY | NGX_RTMP_AMF_CONTEXT,
-          ngx_string("times"),
-          &times_ctx, 0 }
-    };
-
-    static ngx_rtmp_amf_elt_t       in_inf[] = {
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_string("keyframes"),
-          in_keyframes, sizeof(in_keyframes) }
-    };
-
-    static ngx_rtmp_amf_elt_t       in_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          in_inf, sizeof(in_inf) },
-    };
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
-
-    if (ctx == NULL || in == NULL) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: init index");
-
-    ngx_memzero(&filepositions_ctx, sizeof(filepositions_ctx));
-    ngx_memzero(&times_ctx, sizeof(times_ctx));
-
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                             sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: init index error");
-        return NGX_OK;
-    }
-
-    if (filepositions_ctx.link && ngx_rtmp_flv_fill_index(&filepositions_ctx,
-                                                          &ctx->filepositions)
-        != NGX_OK)
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: failed to init filepositions");
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: filepositions nelts=%ui offset=%ui",
-                   ctx->filepositions.nelts, ctx->filepositions.offset);
-
-    if (times_ctx.link && ngx_rtmp_flv_fill_index(&times_ctx,
-                                                  &ctx->times)
-        != NGX_OK)
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: failed to init times");
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: times nelts=%ui offset=%ui",
-                   ctx->times.nelts, ctx->times.offset);
-
-    return  NGX_OK;
-}
-
-
-static double
-ngx_rtmp_flv_index_value(void *src)
-{
-    double      v;
-
-    ngx_rtmp_rmemcpy(&v, src, 8);
-
-    return v;
-}
-
-
-static ngx_int_t
-ngx_rtmp_flv_timestamp_to_offset(ngx_rtmp_session_t *s, ngx_file_t *f,
-    ngx_int_t timestamp)
-{
-    ngx_rtmp_flv_ctx_t             *ctx;
-    ssize_t                         n, size;
-    ngx_uint_t                      offset, index, ret, nelts;
-    double                          v;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
-
-    if (ctx == NULL) {
-        goto rewind;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: lookup index start timestamp=%i",
-                   timestamp);
-
-    if (ctx->meta_read == 0) {
-        ngx_rtmp_flv_read_meta(s, f);
-        ctx->meta_read = 1;
-    }
-
-    if (timestamp <= 0 || ctx->filepositions.nelts == 0
-                       || ctx->times.nelts == 0)
-    {
-        goto rewind;
-    }
-
-    /* read index table from file given offset */
-    offset = NGX_RTMP_FLV_DATA_OFFSET + NGX_RTMP_FLV_TAG_HEADER +
-             ctx->times.offset;
-
-    /* index should fit in the buffer */
-    nelts = ngx_min(ctx->times.nelts, sizeof(ngx_rtmp_flv_buffer) / 9);
-    size = nelts * 9;
-
-    n = ngx_read_file(f, ngx_rtmp_flv_buffer, size, offset);
-
-    if (n != size) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: could not read times index");
-        goto rewind;
-    }
-
-    /*TODO: implement binary search */
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: lookup times nelts=%ui", nelts);
-
-    for (index = 0; index < nelts - 1; ++index) {
-        v = ngx_rtmp_flv_index_value(ngx_rtmp_flv_buffer +
-                                     index * 9 + 1) * 1000;
-
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                      "flv: lookup times index=%ui value=%ui",
-                      index, (ngx_uint_t) v);
-
-        if (timestamp < v) {
-            break;
-        }
-    }
-
-    if (index >= ctx->filepositions.nelts) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: index out of bounds: %ui>=%ui",
-                     index, ctx->filepositions.nelts);
-        goto rewind;
-    }
-
-    /* take value from filepositions */
-    offset = NGX_RTMP_FLV_DATA_OFFSET + NGX_RTMP_FLV_TAG_HEADER +
-             ctx->filepositions.offset + index * 9;
-
-    n = ngx_read_file(f, ngx_rtmp_flv_buffer, 8, offset + 1);
-
-    if (n != 8) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: could not read filepositions index");
-        goto rewind;
-    }
-
-    ret = (ngx_uint_t) ngx_rtmp_flv_index_value(ngx_rtmp_flv_buffer);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: lookup index timestamp=%i offset=%ui",
-                   timestamp, ret);
-
-    return ret;
-
-rewind:
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: lookup index timestamp=%i offset=begin",
-                   timestamp);
-
-    return NGX_RTMP_FLV_DATA_OFFSET;
-}
-
-
-static void
-ngx_rtmp_flv_read_meta(ngx_rtmp_session_t *s, ngx_file_t *f)
-{
-    ngx_rtmp_flv_ctx_t             *ctx;
-    ssize_t                         n;
-    ngx_rtmp_header_t               h;
-    ngx_chain_t                    *out, in;
-    ngx_buf_t                       in_buf;
-    ngx_rtmp_core_srv_conf_t       *cscf;
-    uint32_t                        size;
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
-
-    if (ctx == NULL) {
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: read meta");
-
-    /* read tag header */
-    n = ngx_read_file(f, ngx_rtmp_flv_header, sizeof(ngx_rtmp_flv_header),
-                      NGX_RTMP_FLV_DATA_OFFSET);
-
-    if (n != sizeof(ngx_rtmp_flv_header)) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: could not read metadata tag header");
-        return;
-    }
-
-    if (ngx_rtmp_flv_header[0] != NGX_RTMP_MSG_AMF_META) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                      "flv: first tag is not metadata, giving up");
-        return;
-    }
-
-    ngx_memzero(&h, sizeof(h));
-
-    h.type = NGX_RTMP_MSG_AMF_META;
-    h.msid = NGX_RTMP_MSID;
-    h.csid = NGX_RTMP_CSID_AMF;
-
-    size = 0;
-    ngx_rtmp_rmemcpy(&size, ngx_rtmp_flv_header + 1, 3);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: metadata size=%D", size);
-
-    if (size > sizeof(ngx_rtmp_flv_buffer)) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: too big metadata");
-        return;
-    }
-
-    /* read metadata */
-    n = ngx_read_file(f, ngx_rtmp_flv_buffer, size,
-                      sizeof(ngx_rtmp_flv_header) +
-                      NGX_RTMP_FLV_DATA_OFFSET);
-
-    if (n != (ssize_t) size) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "flv: could not read metadata");
-        return;
-    }
-
-    /* prepare input chain */
-    ngx_memzero(&in, sizeof(in));
-    ngx_memzero(&in_buf, sizeof(in_buf));
-
-    in.buf = &in_buf;
-    in_buf.pos  = ngx_rtmp_flv_buffer;
-    in_buf.last = ngx_rtmp_flv_buffer + size;
-
-    ngx_rtmp_flv_init_index(s, &in);
-
-    /* output chain */
-    out = ngx_rtmp_append_shared_bufs(cscf, NULL, &in);
-
-    ngx_rtmp_prepare_message(s, &h, NULL, out);
-    ngx_rtmp_send_message(s, out, 0);
-    ngx_rtmp_free_shared_chain(cscf, out);
-}
-
-
-static ngx_int_t
-ngx_rtmp_flv_send(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t *ts)
-{
-    ngx_rtmp_flv_ctx_t             *ctx;
-    uint32_t                        last_timestamp;
-    ngx_rtmp_header_t               h, lh;
-    ngx_rtmp_core_srv_conf_t       *cscf;
-    ngx_chain_t                    *out, in;
-    ngx_buf_t                       in_buf;
-    ngx_int_t                       rc;
-    ssize_t                         n;
-    uint32_t                        buflen, end_timestamp, size;
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (ctx->offset == -1) {
-        ctx->offset = ngx_rtmp_flv_timestamp_to_offset(s, f,
-                                                       ctx->start_timestamp);
-        ctx->start_timestamp = -1; /* set later from actual timestamp */
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: read tag at offset=%i", ctx->offset);
-
-    /* read tag header */
-    n = ngx_read_file(f, ngx_rtmp_flv_header,
-                      sizeof(ngx_rtmp_flv_header), ctx->offset);
-
-    if (n != sizeof(ngx_rtmp_flv_header)) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: could not read flv tag header");
-        return NGX_DONE;
-    }
-
-    /* parse header fields */
-    ngx_memzero(&h, sizeof(h));
-
-    h.msid = NGX_RTMP_MSID;
-    h.type = ngx_rtmp_flv_header[0];
-
-    size = 0;
-
-    ngx_rtmp_rmemcpy(&size, ngx_rtmp_flv_header + 1, 3);
-    ngx_rtmp_rmemcpy(&h.timestamp, ngx_rtmp_flv_header + 4, 3);
-
-    ((u_char *) &h.timestamp)[3] = ngx_rtmp_flv_header[7];
-
-    ctx->offset += (sizeof(ngx_rtmp_flv_header) + size + 4);
-
-    last_timestamp = 0;
-
-    switch (h.type) {
-
-        case NGX_RTMP_MSG_AUDIO:
-            h.csid = NGX_RTMP_CSID_AUDIO;
-            last_timestamp = ctx->last_audio;
-            ctx->last_audio = h.timestamp;
-            break;
-
-        case NGX_RTMP_MSG_VIDEO:
-            h.csid = NGX_RTMP_CSID_VIDEO;
-            last_timestamp = ctx->last_video;
-            ctx->last_video = h.timestamp;
-            break;
-
-        default:
-            return NGX_OK;
-    }
-
-    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: read tag type=%i size=%uD timestamp=%uD "
-                  "last_timestamp=%uD",
-                  (ngx_int_t) h.type,size, h.timestamp, last_timestamp);
-
-    lh = h;
-    lh.timestamp = last_timestamp;
-
-    if (size > sizeof(ngx_rtmp_flv_buffer)) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: too big message: %D>%uz", size,
-                      sizeof(ngx_rtmp_flv_buffer));
-        goto next;
-    }
-
-    /* read tag body */
-    n = ngx_read_file(f, ngx_rtmp_flv_buffer, size,
-                      ctx->offset - size - 4);
-
-    if (n != (ssize_t) size) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "flv: could not read flv tag");
-        return NGX_ERROR;
-    }
-
-    /* prepare input chain */
-    ngx_memzero(&in, sizeof(in));
-    ngx_memzero(&in_buf, sizeof(in_buf));
-
-    in.buf = &in_buf;
-    in_buf.pos  = ngx_rtmp_flv_buffer;
-    in_buf.last = ngx_rtmp_flv_buffer + size;
-
-    /* output chain */
-    out = ngx_rtmp_append_shared_bufs(cscf, NULL, &in);
-
-    ngx_rtmp_prepare_message(s, &h, ctx->msg_mask & (1 << h.type) ?
-                             &lh : NULL, out);
-    rc = ngx_rtmp_send_message(s, out, 0);
-    ngx_rtmp_free_shared_chain(cscf, out);
-
-    if (rc == NGX_AGAIN) {
-        return NGX_AGAIN;
-    }
-
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    ctx->msg_mask |= (1 << h.type);
-
-next:
-    if (ctx->start_timestamp == -1) {
-        ctx->start_timestamp = h.timestamp;
-        ctx->epoch = ngx_current_msec;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                      "flv: start_timestamp=%i", ctx->start_timestamp);
-        return NGX_OK;
-    }
-
-    buflen = s->buflen + NGX_RTMP_FLV_BUFLEN_ADDON;
-
-    end_timestamp = (ngx_current_msec - ctx->epoch) +
-                     ctx->start_timestamp + buflen;
-
-    ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-           "flv: %s wait=%D timestamp=%D end_timestamp=%D bufen=%i",
-            h.timestamp > end_timestamp ? "schedule" : "advance",
-            h.timestamp > end_timestamp ? h.timestamp - end_timestamp : 0,
-            h.timestamp, end_timestamp, (ngx_int_t) buflen);
-
-    s->current_time = h.timestamp;
-
-    /* too much data sent; schedule timeout */
-    if (h.timestamp > end_timestamp) {
-        return h.timestamp - end_timestamp;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_flv_init(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_int_t aindex,
-                  ngx_int_t vindex)
-{
-    ngx_rtmp_flv_ctx_t             *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
-
-    if (ctx == NULL) {
-        ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_flv_ctx_t));
-
-        if (ctx == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_flv_module);
-    }
-
-    ngx_memzero(ctx, sizeof(*ctx));
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_flv_start(ngx_rtmp_session_t *s, ngx_file_t *f)
-{
-    ngx_rtmp_flv_ctx_t             *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
-
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: start");
-
-    ctx->offset = -1;
-    ctx->msg_mask = 0;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_flv_seek(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t timestamp)
-{
-    ngx_rtmp_flv_ctx_t             *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
-
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: seek timestamp=%ui", timestamp);
-
-    ctx->start_timestamp = timestamp;
-    ctx->epoch = ngx_current_msec;
-    ctx->offset = -1;
-    ctx->msg_mask = 0;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_flv_stop(ngx_rtmp_session_t *s, ngx_file_t *f)
-{
-    ngx_rtmp_flv_ctx_t             *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_flv_module);
-
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                  "flv: stop");
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_flv_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_play_main_conf_t      *pmcf;
-    ngx_rtmp_play_fmt_t           **pfmt, *fmt;
-
-    pmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_play_module);
-
-    pfmt = ngx_array_push(&pmcf->fmts);
-
-    if (pfmt == NULL) {
-        return NGX_ERROR;
-    }
-
-    fmt = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_fmt_t));
-
-    if (fmt == NULL) {
-        return NGX_ERROR;
-    }
-
-    *pfmt = fmt;
-
-    ngx_str_set(&fmt->name, "flv-format");
-
-    ngx_str_null(&fmt->pfx); /* default fmt */
-    ngx_str_set(&fmt->sfx, ".flv");
-
-    fmt->init  = ngx_rtmp_flv_init;
-    fmt->start = ngx_rtmp_flv_start;
-    fmt->seek  = ngx_rtmp_flv_seek;
-    fmt->stop  = ngx_rtmp_flv_stop;
-    fmt->send  = ngx_rtmp_flv_send;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_handler.c b/debian/modules/rtmp/ngx_rtmp_handler.c
deleted file mode 100644
index f42a3bb..0000000
--- a/debian/modules/rtmp/ngx_rtmp_handler.c
+++ /dev/null
@@ -1,903 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_amf.h"
-
-
-static void ngx_rtmp_recv(ngx_event_t *rev);
-static void ngx_rtmp_send(ngx_event_t *rev);
-static void ngx_rtmp_ping(ngx_event_t *rev);
-static ngx_int_t ngx_rtmp_finalize_set_chunk_size(ngx_rtmp_session_t *s);
-
-
-ngx_uint_t                  ngx_rtmp_naccepted;
-
-
-ngx_rtmp_bandwidth_t        ngx_rtmp_bw_out;
-ngx_rtmp_bandwidth_t        ngx_rtmp_bw_in;
-
-
-#ifdef NGX_DEBUG
-char*
-ngx_rtmp_message_type(uint8_t type)
-{
-    static char*    types[] = {
-        "?",
-        "chunk_size",
-        "abort",
-        "ack",
-        "user",
-        "ack_size",
-        "bandwidth",
-        "edge",
-        "audio",
-        "video",
-        "?",
-        "?",
-        "?",
-        "?",
-        "?",
-        "amf3_meta",
-        "amf3_shared",
-        "amf3_cmd",
-        "amf_meta",
-        "amf_shared",
-        "amf_cmd",
-        "?",
-        "aggregate"
-    };
-
-    return type < sizeof(types) / sizeof(types[0])
-        ? types[type]
-        : "?";
-}
-
-
-char*
-ngx_rtmp_user_message_type(uint16_t evt)
-{
-    static char*    evts[] = {
-        "stream_begin",
-        "stream_eof",
-        "stream dry",
-        "set_buflen",
-        "recorded",
-        "",
-        "ping_request",
-        "ping_response",
-    };
-
-    return evt < sizeof(evts) / sizeof(evts[0])
-        ? evts[evt]
-        : "?";
-}
-#endif
-
-
-void
-ngx_rtmp_cycle(ngx_rtmp_session_t *s)
-{
-    ngx_connection_t           *c;
-
-    c = s->connection;
-    c->read->handler =  ngx_rtmp_recv;
-    c->write->handler = ngx_rtmp_send;
-
-    s->ping_evt.data = c;
-    s->ping_evt.log = c->log;
-    s->ping_evt.handler = ngx_rtmp_ping;
-    ngx_rtmp_reset_ping(s);
-
-    ngx_rtmp_recv(c->read);
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_alloc_in_buf(ngx_rtmp_session_t *s)
-{
-    ngx_chain_t        *cl;
-    ngx_buf_t          *b;
-    size_t              size;
-
-    if ((cl = ngx_alloc_chain_link(s->in_pool)) == NULL
-       || (cl->buf = ngx_calloc_buf(s->in_pool)) == NULL)
-    {
-        return NULL;
-    }
-
-    cl->next = NULL;
-    b = cl->buf;
-    size = s->in_chunk_size + NGX_RTMP_MAX_CHUNK_HEADER;
-
-    b->start = b->last = b->pos = ngx_palloc(s->in_pool, size);
-    if (b->start == NULL) {
-        return NULL;
-    }
-    b->end = b->start + size;
-
-    return cl;
-}
-
-
-void
-ngx_rtmp_reset_ping(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_core_srv_conf_t   *cscf;
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-    if (cscf->ping == 0) {
-        return;
-    }
-
-    s->ping_active = 0;
-    s->ping_reset = 0;
-    ngx_add_timer(&s->ping_evt, cscf->ping);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "ping: wait %Mms", cscf->ping);
-}
-
-
-static void
-ngx_rtmp_ping(ngx_event_t *pev)
-{
-    ngx_connection_t           *c;
-    ngx_rtmp_session_t         *s;
-    ngx_rtmp_core_srv_conf_t   *cscf;
-
-    c = pev->data;
-    s = c->data;
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    /* i/o event has happened; no need to ping */
-    if (s->ping_reset) {
-        ngx_rtmp_reset_ping(s);
-        return;
-    }
-
-    if (s->ping_active) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                "ping: unresponded");
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    if (cscf->busy) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                "ping: not busy between pings");
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "ping: schedule %Mms", cscf->ping_timeout);
-
-    if (ngx_rtmp_send_ping_request(s, (uint32_t)ngx_current_msec) != NGX_OK) {
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    s->ping_active = 1;
-    ngx_add_timer(pev, cscf->ping_timeout);
-}
-
-
-static void
-ngx_rtmp_recv(ngx_event_t *rev)
-{
-    ngx_int_t                   n;
-    ngx_connection_t           *c;
-    ngx_rtmp_session_t         *s;
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    ngx_rtmp_header_t          *h;
-    ngx_rtmp_stream_t          *st, *st0;
-    ngx_chain_t                *in, *head;
-    ngx_buf_t                  *b;
-    u_char                     *p, *pp, *old_pos;
-    size_t                      size, fsize, old_size;
-    uint8_t                     fmt, ext;
-    uint32_t                    csid, timestamp;
-
-    c = rev->data;
-    s = c->data;
-    b = NULL;
-    old_pos = NULL;
-    old_size = 0;
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    if (c->destroyed) {
-        return;
-    }
-
-    for( ;; ) {
-
-        st = &s->in_streams[s->in_csid];
-
-        /* allocate new buffer */
-        if (st->in == NULL) {
-            st->in = ngx_rtmp_alloc_in_buf(s);
-            if (st->in == NULL) {
-                ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                        "in buf alloc failed");
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-        }
-
-        h  = &st->hdr;
-        in = st->in;
-        b  = in->buf;
-
-        if (old_size) {
-
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0,
-                    "reusing formerly read data: %d", old_size);
-
-            b->pos = b->start;
-
-            size = ngx_min((size_t) (b->end - b->start), old_size);
-            b->last = ngx_movemem(b->pos, old_pos, size);
-
-            if (s->in_chunk_size_changing) {
-                ngx_rtmp_finalize_set_chunk_size(s);
-            }
-
-        } else {
-
-            if (old_pos) {
-                b->pos = b->last = b->start;
-            }
-
-            n = c->recv(c, b->last, b->end - b->last);
-
-            if (n == NGX_ERROR || n == 0) {
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-
-            if (n == NGX_AGAIN) {
-                if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-                    ngx_rtmp_finalize_session(s);
-                }
-                return;
-            }
-
-            s->ping_reset = 1;
-            ngx_rtmp_update_bandwidth(&ngx_rtmp_bw_in, n);
-            b->last += n;
-            s->in_bytes += n;
-
-            if (s->in_bytes >= 0xf0000000) {
-                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, c->log, 0,
-                               "resetting byte counter");
-                s->in_bytes = 0;
-                s->in_last_ack = 0;
-            }
-
-            if (s->ack_size && s->in_bytes - s->in_last_ack >= s->ack_size) {
-
-                s->in_last_ack = s->in_bytes;
-
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0,
-                        "sending RTMP ACK(%uD)", s->in_bytes);
-
-                if (ngx_rtmp_send_ack(s, s->in_bytes)) {
-                    ngx_rtmp_finalize_session(s);
-                    return;
-                }
-            }
-        }
-
-        old_pos = NULL;
-        old_size = 0;
-
-        /* parse headers */
-        if (b->pos == b->start) {
-            p = b->pos;
-
-            /* chunk basic header */
-            fmt  = (*p >> 6) & 0x03;
-            csid = *p++ & 0x3f;
-
-            if (csid == 0) {
-                if (b->last - p < 1)
-                    continue;
-                csid = 64;
-                csid += *(uint8_t*)p++;
-
-            } else if (csid == 1) {
-                if (b->last - p < 2)
-                    continue;
-                csid = 64;
-                csid += *(uint8_t*)p++;
-                csid += (uint32_t)256 * (*(uint8_t*)p++);
-            }
-
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, c->log, 0,
-                    "RTMP bheader fmt=%d csid=%D",
-                    (int)fmt, csid);
-
-            if (csid >= (uint32_t)cscf->max_streams) {
-                ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                    "RTMP in chunk stream too big: %D >= %D",
-                    csid, cscf->max_streams);
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-
-            /* link orphan */
-            if (s->in_csid == 0) {
-
-                /* unlink from stream #0 */
-                st->in = st->in->next;
-
-                /* link to new stream */
-                s->in_csid = csid;
-                st = &s->in_streams[csid];
-                if (st->in == NULL) {
-                    in->next = in;
-                } else {
-                    in->next = st->in->next;
-                    st->in->next = in;
-                }
-                st->in = in;
-                h = &st->hdr;
-                h->csid = csid;
-            }
-
-            ext = st->ext;
-            timestamp = st->dtime;
-            if (fmt <= 2 ) {
-                if (b->last - p < 3)
-                    continue;
-                /* timestamp:
-                 *  big-endian 3b -> little-endian 4b */
-                pp = (u_char*)&timestamp;
-                pp[2] = *p++;
-                pp[1] = *p++;
-                pp[0] = *p++;
-                pp[3] = 0;
-
-                ext = (timestamp == 0x00ffffff);
-
-                if (fmt <= 1) {
-                    if (b->last - p < 4)
-                        continue;
-                    /* size:
-                     *  big-endian 3b -> little-endian 4b
-                     * type:
-                     *  1b -> 1b*/
-                    pp = (u_char*)&h->mlen;
-                    pp[2] = *p++;
-                    pp[1] = *p++;
-                    pp[0] = *p++;
-                    pp[3] = 0;
-                    h->type = *(uint8_t*)p++;
-
-                    if (fmt == 0) {
-                        if (b->last - p < 4)
-                            continue;
-                        /* stream:
-                         *  little-endian 4b -> little-endian 4b */
-                        pp = (u_char*)&h->msid;
-                        pp[0] = *p++;
-                        pp[1] = *p++;
-                        pp[2] = *p++;
-                        pp[3] = *p++;
-                    }
-                }
-            }
-
-            /* extended header */
-            if (ext) {
-                if (b->last - p < 4)
-                    continue;
-                pp = (u_char*)&timestamp;
-                pp[3] = *p++;
-                pp[2] = *p++;
-                pp[1] = *p++;
-                pp[0] = *p++;
-            }
-
-            if (st->len == 0) {
-                /* Messages with type=3 should
-                 * never have ext timestamp field
-                 * according to standard.
-                 * However that's not always the case
-                 * in real life */
-                st->ext = (ext && cscf->publish_time_fix);
-                if (fmt) {
-                    st->dtime = timestamp;
-                } else {
-                    h->timestamp = timestamp;
-                    st->dtime = 0;
-                }
-            }
-
-            ngx_log_debug8(NGX_LOG_DEBUG_RTMP, c->log, 0,
-                    "RTMP mheader fmt=%d %s (%d) "
-                    "time=%uD+%uD mlen=%D len=%D msid=%D",
-                    (int)fmt, ngx_rtmp_message_type(h->type), (int)h->type,
-                    h->timestamp, st->dtime, h->mlen, st->len, h->msid);
-
-            /* header done */
-            b->pos = p;
-
-            if (h->mlen > cscf->max_message) {
-                ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                        "too big message: %uz", cscf->max_message);
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-        }
-
-        size = b->last - b->pos;
-        fsize = h->mlen - st->len;
-
-        if (size < ngx_min(fsize, s->in_chunk_size))
-            continue;
-
-        /* buffer is ready */
-
-        if (fsize > s->in_chunk_size) {
-            /* collect fragmented chunks */
-            st->len += s->in_chunk_size;
-            b->last = b->pos + s->in_chunk_size;
-            old_pos = b->last;
-            old_size = size - s->in_chunk_size;
-
-        } else {
-            /* handle! */
-            head = st->in->next;
-            st->in->next = NULL;
-            b->last = b->pos + fsize;
-            old_pos = b->last;
-            old_size = size - fsize;
-            st->len = 0;
-            h->timestamp += st->dtime;
-
-            if (ngx_rtmp_receive_message(s, h, head) != NGX_OK) {
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-
-            if (s->in_chunk_size_changing) {
-                /* copy old data to a new buffer */
-                if (!old_size) {
-                    ngx_rtmp_finalize_set_chunk_size(s);
-                }
-
-            } else {
-                /* add used bufs to stream #0 */
-                st0 = &s->in_streams[0];
-                st->in->next = st0->in;
-                st0->in = head;
-                st->in = NULL;
-            }
-        }
-
-        s->in_csid = 0;
-    }
-}
-
-
-static void
-ngx_rtmp_send(ngx_event_t *wev)
-{
-    ngx_connection_t           *c;
-    ngx_rtmp_session_t         *s;
-    ngx_int_t                   n;
-    ngx_rtmp_core_srv_conf_t   *cscf;
-
-    c = wev->data;
-    s = c->data;
-
-    if (c->destroyed) {
-        return;
-    }
-
-    if (wev->timedout) {
-        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
-                "client timed out");
-        c->timedout = 1;
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    if (wev->timer_set) {
-        ngx_del_timer(wev);
-    }
-
-    if (s->out_chain == NULL && s->out_pos != s->out_last) {
-        s->out_chain = s->out[s->out_pos];
-        s->out_bpos = s->out_chain->buf->pos;
-    }
-
-    while (s->out_chain) {
-        n = c->send(c, s->out_bpos, s->out_chain->buf->last - s->out_bpos);
-
-        if (n == NGX_AGAIN || n == 0) {
-            ngx_add_timer(c->write, s->timeout);
-            if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
-                ngx_rtmp_finalize_session(s);
-            }
-            return;
-        }
-
-        if (n < 0) {
-            ngx_rtmp_finalize_session(s);
-            return;
-        }
-
-        s->out_bytes += n;
-        s->ping_reset = 1;
-        ngx_rtmp_update_bandwidth(&ngx_rtmp_bw_out, n);
-        s->out_bpos += n;
-        if (s->out_bpos == s->out_chain->buf->last) {
-            s->out_chain = s->out_chain->next;
-            if (s->out_chain == NULL) {
-                cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-                ngx_rtmp_free_shared_chain(cscf, s->out[s->out_pos]);
-                ++s->out_pos;
-                s->out_pos %= s->out_queue;
-                if (s->out_pos == s->out_last) {
-                    break;
-                }
-                s->out_chain = s->out[s->out_pos];
-            }
-            s->out_bpos = s->out_chain->buf->pos;
-        }
-    }
-
-    if (wev->active) {
-        ngx_del_event(wev, NGX_WRITE_EVENT, 0);
-    }
-
-    ngx_event_process_posted((ngx_cycle_t *) ngx_cycle, &s->posted_dry_events);
-}
-
-
-void
-ngx_rtmp_prepare_message(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_rtmp_header_t *lh, ngx_chain_t *out)
-{
-    ngx_chain_t                *l;
-    u_char                     *p, *pp;
-    ngx_int_t                   hsize, thsize, nbufs;
-    uint32_t                    mlen, timestamp, ext_timestamp;
-    static uint8_t              hdrsize[] = { 12, 8, 4, 1 };
-    u_char                      th[7];
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    uint8_t                     fmt;
-    ngx_connection_t           *c;
-
-    c = s->connection;
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    if (h->csid >= (uint32_t)cscf->max_streams) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                "RTMP out chunk stream too big: %D >= %D",
-                h->csid, cscf->max_streams);
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    /* detect packet size */
-    mlen = 0;
-    nbufs = 0;
-    for(l = out; l; l = l->next) {
-        mlen += (l->buf->last - l->buf->pos);
-        ++nbufs;
-    }
-
-    fmt = 0;
-    if (lh && lh->csid && h->msid == lh->msid) {
-        ++fmt;
-        if (h->type == lh->type && mlen && mlen == lh->mlen) {
-            ++fmt;
-            if (h->timestamp == lh->timestamp) {
-                ++fmt;
-            }
-        }
-        timestamp = h->timestamp - lh->timestamp;
-    } else {
-        timestamp = h->timestamp;
-    }
-
-    /*if (lh) {
-        *lh = *h;
-        lh->mlen = mlen;
-    }*/
-
-    hsize = hdrsize[fmt];
-
-    ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "RTMP prep %s (%d) fmt=%d csid=%uD timestamp=%uD "
-            "mlen=%uD msid=%uD nbufs=%d",
-            ngx_rtmp_message_type(h->type), (int)h->type, (int)fmt,
-            h->csid, timestamp, mlen, h->msid, nbufs);
-
-    ext_timestamp = 0;
-    if (timestamp >= 0x00ffffff) {
-        ext_timestamp = timestamp;
-        timestamp = 0x00ffffff;
-        hsize += 4;
-    }
-
-    if (h->csid >= 64) {
-        ++hsize;
-        if (h->csid >= 320) {
-            ++hsize;
-        }
-    }
-
-    /* fill initial header */
-    out->buf->pos -= hsize;
-    p = out->buf->pos;
-
-    /* basic header */
-    *p = (fmt << 6);
-    if (h->csid >= 2 && h->csid <= 63) {
-        *p++ |= (((uint8_t)h->csid) & 0x3f);
-    } else if (h->csid >= 64 && h->csid < 320) {
-        ++p;
-        *p++ = (uint8_t)(h->csid - 64);
-    } else {
-        *p++ |= 1;
-        *p++ = (uint8_t)(h->csid - 64);
-        *p++ = (uint8_t)((h->csid - 64) >> 8);
-    }
-
-    /* create fmt3 header for successive fragments */
-    thsize = p - out->buf->pos;
-    ngx_memcpy(th, out->buf->pos, thsize);
-    th[0] |= 0xc0;
-
-    /* message header */
-    if (fmt <= 2) {
-        pp = (u_char*)&timestamp;
-        *p++ = pp[2];
-        *p++ = pp[1];
-        *p++ = pp[0];
-        if (fmt <= 1) {
-            pp = (u_char*)&mlen;
-            *p++ = pp[2];
-            *p++ = pp[1];
-            *p++ = pp[0];
-            *p++ = h->type;
-            if (fmt == 0) {
-                pp = (u_char*)&h->msid;
-                *p++ = pp[0];
-                *p++ = pp[1];
-                *p++ = pp[2];
-                *p++ = pp[3];
-            }
-        }
-    }
-
-    /* extended header */
-    if (ext_timestamp) {
-        pp = (u_char*)&ext_timestamp;
-        *p++ = pp[3];
-        *p++ = pp[2];
-        *p++ = pp[1];
-        *p++ = pp[0];
-
-        /* This CONTRADICTS the standard
-         * but that's the way flash client
-         * wants data to be encoded;
-         * ffmpeg complains */
-        if (cscf->play_time_fix) {
-            ngx_memcpy(&th[thsize], p - 4, 4);
-            thsize += 4;
-        }
-    }
-
-    /* append headers to successive fragments */
-    for(out = out->next; out; out = out->next) {
-        out->buf->pos -= thsize;
-        ngx_memcpy(out->buf->pos, th, thsize);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_message(ngx_rtmp_session_t *s, ngx_chain_t *out,
-        ngx_uint_t priority)
-{
-    ngx_uint_t                      nmsg;
-
-    nmsg = (s->out_last - s->out_pos) % s->out_queue + 1;
-
-    if (priority > 3) {
-        priority = 3;
-    }
-
-    /* drop packet?
-     * Note we always leave 1 slot free */
-    if (nmsg + priority * s->out_queue / 4 >= s->out_queue) {
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "RTMP drop message bufs=%ui, priority=%ui",
-                nmsg, priority);
-        return NGX_AGAIN;
-    }
-
-    s->out[s->out_last++] = out;
-    s->out_last %= s->out_queue;
-
-    ngx_rtmp_acquire_shared_chain(out);
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "RTMP send nmsg=%ui, priority=%ui #%ui",
-            nmsg, priority, s->out_last);
-
-    if (priority && s->out_buffer && nmsg < s->out_cork) {
-        return NGX_OK;
-    }
-
-    if (!s->connection->write->active) {
-        ngx_rtmp_send(s->connection->write);
-        /*return ngx_add_event(s->connection->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT);*/
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_receive_message(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in)
-{
-    ngx_rtmp_core_main_conf_t  *cmcf;
-    ngx_array_t                *evhs;
-    size_t                      n;
-    ngx_rtmp_handler_pt        *evh;
-
-    cmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_core_module);
-
-#ifdef NGX_DEBUG
-    {
-        int             nbufs;
-        ngx_chain_t    *ch;
-
-        for(nbufs = 1, ch = in;
-                ch->next;
-                ch = ch->next, ++nbufs);
-
-        ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "RTMP recv %s (%d) csid=%D timestamp=%D "
-                "mlen=%D msid=%D nbufs=%d",
-                ngx_rtmp_message_type(h->type), (int)h->type,
-                h->csid, h->timestamp, h->mlen, h->msid, nbufs);
-    }
-#endif
-
-    if (h->type > NGX_RTMP_MSG_MAX) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "unexpected RTMP message type: %d", (int)h->type);
-        return NGX_OK;
-    }
-
-    evhs = &cmcf->events[h->type];
-    evh = evhs->elts;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "nhandlers: %d", evhs->nelts);
-
-    for(n = 0; n < evhs->nelts; ++n, ++evh) {
-        if (!evh) {
-            continue;
-        }
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "calling handler %d", n);
-
-        switch ((*evh)(s, h, in)) {
-            case NGX_ERROR:
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                        "handler %d failed", n);
-                return NGX_ERROR;
-            case NGX_DONE:
-                return NGX_OK;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_set_chunk_size(ngx_rtmp_session_t *s, ngx_uint_t size)
-{
-    ngx_rtmp_core_srv_conf_t           *cscf;
-    ngx_chain_t                        *li, *fli, *lo, *flo;
-    ngx_buf_t                          *bi, *bo;
-    ngx_int_t                           n;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-        "setting chunk_size=%ui", size);
-
-    if (size > NGX_RTMP_MAX_CHUNK_SIZE) {
-        ngx_log_error(NGX_LOG_ALERT, s->connection->log, 0,
-                      "too big RTMP chunk size:%ui", size);
-        return NGX_ERROR;
-    }
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    s->in_old_pool = s->in_pool;
-    s->in_chunk_size = size;
-    s->in_pool = ngx_create_pool(4096, s->connection->log);
-
-    /* copy existing chunk data */
-    if (s->in_old_pool) {
-        s->in_chunk_size_changing = 1;
-        s->in_streams[0].in = NULL;
-
-        for(n = 1; n < cscf->max_streams; ++n) {
-            /* stream buffer is circular
-             * for all streams except for the current one
-             * (which caused this chunk size change);
-             * we can simply ignore it */
-            li = s->in_streams[n].in;
-            if (li == NULL || li->next == NULL) {
-                s->in_streams[n].in = NULL;
-                continue;
-            }
-            /* move from last to the first */
-            li = li->next;
-            fli = li;
-            lo = ngx_rtmp_alloc_in_buf(s);
-            if (lo == NULL) {
-                return NGX_ERROR;
-            }
-            flo = lo;
-            for ( ;; ) {
-                bi = li->buf;
-                bo = lo->buf;
-
-                if (bo->end - bo->last >= bi->last - bi->pos) {
-                    bo->last = ngx_cpymem(bo->last, bi->pos,
-                            bi->last - bi->pos);
-                    li = li->next;
-                    if (li == fli)  {
-                        lo->next = flo;
-                        s->in_streams[n].in = lo;
-                        break;
-                    }
-                    continue;
-                }
-
-                bi->pos += (ngx_cpymem(bo->last, bi->pos,
-                            bo->end - bo->last) - bo->last);
-                lo->next = ngx_rtmp_alloc_in_buf(s);
-                lo = lo->next;
-                if (lo == NULL) {
-                    return NGX_ERROR;
-                }
-            }
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_finalize_set_chunk_size(ngx_rtmp_session_t *s)
-{
-    if (s->in_chunk_size_changing && s->in_old_pool) {
-        ngx_destroy_pool(s->in_old_pool);
-        s->in_old_pool = NULL;
-        s->in_chunk_size_changing = 0;
-    }
-    return NGX_OK;
-}
-
-
diff --git a/debian/modules/rtmp/ngx_rtmp_handshake.c b/debian/modules/rtmp/ngx_rtmp_handshake.c
deleted file mode 100644
index 409d9a0..0000000
--- a/debian/modules/rtmp/ngx_rtmp_handshake.c
+++ /dev/null
@@ -1,631 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-
-#include <openssl/hmac.h>
-#include <openssl/sha.h>
-
-
-static void ngx_rtmp_handshake_send(ngx_event_t *wev);
-static void ngx_rtmp_handshake_recv(ngx_event_t *rev);
-static void ngx_rtmp_handshake_done(ngx_rtmp_session_t *s);
-
-
-/* RTMP handshake :
- *
- *          =peer1=                      =peer2=
- * challenge ----> (.....[digest1]......) ----> 1537 bytes
- * response  <---- (...........[digest2]) <---- 1536 bytes
- *
- *
- * - both packets contain random bytes except for digests
- * - digest1 position is calculated on random packet bytes
- * - digest2 is always at the end of the packet
- *
- * digest1: HMAC_SHA256(packet, peer1_partial_key)
- * digest2: HMAC_SHA256(packet, HMAC_SHA256(digest1, peer2_full_key))
- */
-
-
-/* Handshake keys */
-static u_char
-ngx_rtmp_server_key[] = {
-    'G', 'e', 'n', 'u', 'i', 'n', 'e', ' ', 'A', 'd', 'o', 'b', 'e', ' ',
-    'F', 'l', 'a', 's', 'h', ' ', 'M', 'e', 'd', 'i', 'a', ' ',
-    'S', 'e', 'r', 'v', 'e', 'r', ' ',
-    '0', '0', '1',
-
-    0xF0, 0xEE, 0xC2, 0x4A, 0x80, 0x68, 0xBE, 0xE8, 0x2E, 0x00, 0xD0, 0xD1,
-    0x02, 0x9E, 0x7E, 0x57, 0x6E, 0xEC, 0x5D, 0x2D, 0x29, 0x80, 0x6F, 0xAB,
-    0x93, 0xB8, 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE
-};
-
-
-static u_char
-ngx_rtmp_client_key[] = {
-    'G', 'e', 'n', 'u', 'i', 'n', 'e', ' ', 'A', 'd', 'o', 'b', 'e', ' ',
-    'F', 'l', 'a', 's', 'h', ' ', 'P', 'l', 'a', 'y', 'e', 'r', ' ',
-    '0', '0', '1',
-
-    0xF0, 0xEE, 0xC2, 0x4A, 0x80, 0x68, 0xBE, 0xE8, 0x2E, 0x00, 0xD0, 0xD1,
-    0x02, 0x9E, 0x7E, 0x57, 0x6E, 0xEC, 0x5D, 0x2D, 0x29, 0x80, 0x6F, 0xAB,
-    0x93, 0xB8, 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE
-};
-
-
-static const u_char
-ngx_rtmp_server_version[4] = {
-    0x0D, 0x0E, 0x0A, 0x0D
-};
-
-
-static const u_char
-ngx_rtmp_client_version[4] = {
-    0x0C, 0x00, 0x0D, 0x0E
-};
-
-
-#define NGX_RTMP_HANDSHAKE_KEYLEN                   SHA256_DIGEST_LENGTH
-#define NGX_RTMP_HANDSHAKE_BUFSIZE                  1537
-
-
-#define NGX_RTMP_HANDSHAKE_SERVER_RECV_CHALLENGE    1
-#define NGX_RTMP_HANDSHAKE_SERVER_SEND_CHALLENGE    2
-#define NGX_RTMP_HANDSHAKE_SERVER_SEND_RESPONSE     3
-#define NGX_RTMP_HANDSHAKE_SERVER_RECV_RESPONSE     4
-#define NGX_RTMP_HANDSHAKE_SERVER_DONE              5
-
-
-#define NGX_RTMP_HANDSHAKE_CLIENT_SEND_CHALLENGE    6
-#define NGX_RTMP_HANDSHAKE_CLIENT_RECV_CHALLENGE    7
-#define NGX_RTMP_HANDSHAKE_CLIENT_RECV_RESPONSE     8
-#define NGX_RTMP_HANDSHAKE_CLIENT_SEND_RESPONSE     9
-#define NGX_RTMP_HANDSHAKE_CLIENT_DONE              10
-
-
-static ngx_str_t            ngx_rtmp_server_full_key
-    = { sizeof(ngx_rtmp_server_key), ngx_rtmp_server_key };
-static ngx_str_t            ngx_rtmp_server_partial_key
-    = { 36, ngx_rtmp_server_key };
-
-static ngx_str_t            ngx_rtmp_client_full_key
-    = { sizeof(ngx_rtmp_client_key), ngx_rtmp_client_key };
-static ngx_str_t            ngx_rtmp_client_partial_key
-    = { 30, ngx_rtmp_client_key };
-
-
-static ngx_int_t
-ngx_rtmp_make_digest(ngx_str_t *key, ngx_buf_t *src,
-        u_char *skip, u_char *dst, ngx_log_t *log)
-{
-    static HMAC_CTX        *hmac;
-    unsigned int            len;
-
-    if (hmac == NULL) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-        static HMAC_CTX  shmac;
-        hmac = &shmac;
-        HMAC_CTX_init(hmac);
-#else
-        hmac = HMAC_CTX_new();
-        if (hmac == NULL) {
-            return NGX_ERROR;
-        }
-#endif
-    }
-
-    HMAC_Init_ex(hmac, key->data, key->len, EVP_sha256(), NULL);
-
-    if (skip && src->pos <= skip && skip <= src->last) {
-        if (skip != src->pos) {
-            HMAC_Update(hmac, src->pos, skip - src->pos);
-        }
-        if (src->last != skip + NGX_RTMP_HANDSHAKE_KEYLEN) {
-            HMAC_Update(hmac, skip + NGX_RTMP_HANDSHAKE_KEYLEN,
-                    src->last - skip - NGX_RTMP_HANDSHAKE_KEYLEN);
-        }
-    } else {
-        HMAC_Update(hmac, src->pos, src->last - src->pos);
-    }
-
-    HMAC_Final(hmac, dst, &len);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_find_digest(ngx_buf_t *b, ngx_str_t *key, size_t base, ngx_log_t *log)
-{
-    size_t                  n, offs;
-    u_char                  digest[NGX_RTMP_HANDSHAKE_KEYLEN];
-    u_char                 *p;
-
-    offs = 0;
-    for (n = 0; n < 4; ++n) {
-        offs += b->pos[base + n];
-    }
-    offs = (offs % 728) + base + 4;
-    p = b->pos + offs;
-
-    if (ngx_rtmp_make_digest(key, b, p, digest, log) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    if (ngx_memcmp(digest, p, NGX_RTMP_HANDSHAKE_KEYLEN) == 0) {
-        return offs;
-    }
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_write_digest(ngx_buf_t *b, ngx_str_t *key, size_t base,
-        ngx_log_t *log)
-{
-    size_t                  n, offs;
-    u_char                 *p;
-
-    offs = 0;
-    for (n = 8; n < 12; ++n) {
-        offs += b->pos[base + n];
-    }
-    offs = (offs % 728) + base + 12;
-    p = b->pos + offs;
-
-    if (ngx_rtmp_make_digest(key, b, p, p, log) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_fill_random_buffer(ngx_buf_t *b)
-{
-    for (; b->last != b->end; ++b->last) {
-        *b->last = (u_char) rand();
-    }
-}
-
-
-static ngx_buf_t *
-ngx_rtmp_alloc_handshake_buffer(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    ngx_chain_t                *cl;
-    ngx_buf_t                  *b;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "handshake: allocating buffer");
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    if (cscf->free_hs) {
-        cl = cscf->free_hs;
-        b = cl->buf;
-        cscf->free_hs = cl->next;
-        ngx_free_chain(cscf->pool, cl);
-
-    } else {
-        b = ngx_pcalloc(cscf->pool, sizeof(ngx_buf_t));
-        if (b == NULL) {
-            return NULL;
-        }
-        b->memory = 1;
-        b->start = ngx_pcalloc(cscf->pool, NGX_RTMP_HANDSHAKE_BUFSIZE);
-        if (b->start == NULL) {
-            return NULL;
-        }
-        b->end = b->start + NGX_RTMP_HANDSHAKE_BUFSIZE;
-    }
-
-    b->pos = b->last = b->start;
-
-    return b;
-}
-
-
-void
-ngx_rtmp_free_handshake_buffers(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    ngx_chain_t                *cl;
-
-    if (s->hs_buf == NULL) {
-        return;
-    }
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-    cl = ngx_alloc_chain_link(cscf->pool);
-    if (cl == NULL) {
-        return;
-    }
-    cl->buf = s->hs_buf;
-    cl->next = cscf->free_hs;
-    cscf->free_hs = cl;
-    s->hs_buf = NULL;
-}
-
-
-static ngx_int_t
-ngx_rtmp_handshake_create_challenge(ngx_rtmp_session_t *s,
-        const u_char version[4], ngx_str_t *key)
-{
-    ngx_buf_t          *b;
-
-    b = s->hs_buf;
-    b->last = b->pos = b->start;
-    *b->last++ = '\x03';
-    b->last = ngx_rtmp_rcpymem(b->last, &s->epoch, 4);
-    b->last = ngx_cpymem(b->last, version, 4);
-    ngx_rtmp_fill_random_buffer(b);
-    ++b->pos;
-    if (ngx_rtmp_write_digest(b, key, 0, s->connection->log) != NGX_OK) {
-        return NGX_ERROR;
-    }
-    --b->pos;
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_handshake_parse_challenge(ngx_rtmp_session_t *s,
-        ngx_str_t *peer_key, ngx_str_t *key)
-{
-    ngx_buf_t              *b;
-    u_char                 *p;
-    ngx_int_t               offs;
-
-    b = s->hs_buf;
-    if (*b->pos != '\x03') {
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                "handshake: unexpected RTMP version: %i",
-                (ngx_int_t)*b->pos);
-        return NGX_ERROR;
-    }
-    ++b->pos;
-    s->peer_epoch = 0;
-    ngx_rtmp_rmemcpy(&s->peer_epoch, b->pos, 4);
-
-    p = b->pos + 4;
-    ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "handshake: peer version=%i.%i.%i.%i epoch=%uD",
-            (ngx_int_t)p[3], (ngx_int_t)p[2],
-            (ngx_int_t)p[1], (ngx_int_t)p[0],
-            (uint32_t)s->peer_epoch);
-    if (*(uint32_t *)p == 0) {
-        s->hs_old = 1;
-        return NGX_OK;
-    }
-
-    offs = ngx_rtmp_find_digest(b, peer_key, 772, s->connection->log);
-    if (offs == NGX_ERROR) {
-        offs = ngx_rtmp_find_digest(b, peer_key, 8, s->connection->log);
-    }
-    if (offs == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                "handshake: digest not found");
-        s->hs_old = 1;
-        return NGX_OK;
-    }
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "handshake: digest found at pos=%i", offs);
-    b->pos += offs;
-    b->last = b->pos + NGX_RTMP_HANDSHAKE_KEYLEN;
-    s->hs_digest = ngx_palloc(s->connection->pool, NGX_RTMP_HANDSHAKE_KEYLEN);
-    if (ngx_rtmp_make_digest(key, b, NULL, s->hs_digest, s->connection->log)
-            != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_handshake_create_response(ngx_rtmp_session_t *s)
-{
-    ngx_buf_t          *b;
-    u_char             *p;
-    ngx_str_t           key;
-
-    b = s->hs_buf;
-    b->pos = b->last = b->start + 1;
-    ngx_rtmp_fill_random_buffer(b);
-    if (s->hs_digest) {
-        p = b->last - NGX_RTMP_HANDSHAKE_KEYLEN;
-        key.data = s->hs_digest;
-        key.len = NGX_RTMP_HANDSHAKE_KEYLEN;
-        if (ngx_rtmp_make_digest(&key, b, p, p, s->connection->log) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_handshake_done(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_free_handshake_buffers(s);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "handshake: done");
-
-    if (ngx_rtmp_fire_event(s, NGX_RTMP_HANDSHAKE_DONE,
-                NULL, NULL) != NGX_OK)
-    {
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    ngx_rtmp_cycle(s);
-}
-
-
-static void
-ngx_rtmp_handshake_recv(ngx_event_t *rev)
-{
-    ssize_t                     n;
-    ngx_connection_t           *c;
-    ngx_rtmp_session_t         *s;
-    ngx_buf_t                  *b;
-
-    c = rev->data;
-    s = c->data;
-
-    if (c->destroyed) {
-        return;
-    }
-
-    if (rev->timedout) {
-        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
-                "handshake: recv: client timed out");
-        c->timedout = 1;
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    if (rev->timer_set) {
-        ngx_del_timer(rev);
-    }
-
-    b = s->hs_buf;
-
-    while (b->last != b->end) {
-        n = c->recv(c, b->last, b->end - b->last);
-
-        if (n == NGX_ERROR || n == 0) {
-            ngx_rtmp_finalize_session(s);
-            return;
-        }
-
-        if (n == NGX_AGAIN) {
-            ngx_add_timer(rev, s->timeout);
-            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-                ngx_rtmp_finalize_session(s);
-            }
-            return;
-        }
-
-        b->last += n;
-    }
-
-    if (rev->active) {
-        ngx_del_event(rev, NGX_READ_EVENT, 0);
-    }
-
-    ++s->hs_stage;
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "handshake: stage %ui", s->hs_stage);
-
-    switch (s->hs_stage) {
-        case NGX_RTMP_HANDSHAKE_SERVER_SEND_CHALLENGE:
-            if (ngx_rtmp_handshake_parse_challenge(s,
-                    &ngx_rtmp_client_partial_key,
-                    &ngx_rtmp_server_full_key) != NGX_OK)
-            {
-                ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                        "handshake: error parsing challenge");
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-            if (s->hs_old) {
-                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                        "handshake: old-style challenge");
-                s->hs_buf->pos = s->hs_buf->start;
-                s->hs_buf->last = s->hs_buf->end;
-            } else if (ngx_rtmp_handshake_create_challenge(s,
-                        ngx_rtmp_server_version,
-                        &ngx_rtmp_server_partial_key) != NGX_OK)
-            {
-                ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                        "handshake: error creating challenge");
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-            ngx_rtmp_handshake_send(c->write);
-            break;
-
-        case NGX_RTMP_HANDSHAKE_SERVER_DONE:
-            ngx_rtmp_handshake_done(s);
-            break;
-
-        case NGX_RTMP_HANDSHAKE_CLIENT_RECV_RESPONSE:
-            if (ngx_rtmp_handshake_parse_challenge(s,
-                    &ngx_rtmp_server_partial_key,
-                    &ngx_rtmp_client_full_key) != NGX_OK)
-            {
-                ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                        "handshake: error parsing challenge");
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-            s->hs_buf->pos = s->hs_buf->last = s->hs_buf->start + 1;
-            ngx_rtmp_handshake_recv(c->read);
-            break;
-
-        case NGX_RTMP_HANDSHAKE_CLIENT_SEND_RESPONSE:
-            if (ngx_rtmp_handshake_create_response(s) != NGX_OK) {
-                ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                        "handshake: response error");
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-            ngx_rtmp_handshake_send(c->write);
-            break;
-    }
-}
-
-
-static void
-ngx_rtmp_handshake_send(ngx_event_t *wev)
-{
-    ngx_int_t                   n;
-    ngx_connection_t           *c;
-    ngx_rtmp_session_t         *s;
-    ngx_buf_t                  *b;
-
-    c = wev->data;
-    s = c->data;
-
-    if (c->destroyed) {
-        return;
-    }
-
-    if (wev->timedout) {
-        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
-                "handshake: send: client timed out");
-        c->timedout = 1;
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    if (wev->timer_set) {
-        ngx_del_timer(wev);
-    }
-
-    b = s->hs_buf;
-
-    while(b->pos != b->last) {
-        n = c->send(c, b->pos, b->last - b->pos);
-
-        if (n == NGX_ERROR) {
-            ngx_rtmp_finalize_session(s);
-            return;
-        }
-
-        if (n == NGX_AGAIN || n == 0) {
-            ngx_add_timer(c->write, s->timeout);
-            if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
-                ngx_rtmp_finalize_session(s);
-            }
-            return;
-        }
-
-        b->pos += n;
-    }
-
-    if (wev->active) {
-        ngx_del_event(wev, NGX_WRITE_EVENT, 0);
-    }
-
-    ++s->hs_stage;
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "handshake: stage %ui", s->hs_stage);
-
-    switch (s->hs_stage) {
-        case NGX_RTMP_HANDSHAKE_SERVER_SEND_RESPONSE:
-            if (s->hs_old) {
-                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                        "handshake: old-style response");
-                s->hs_buf->pos = s->hs_buf->start + 1;
-                s->hs_buf->last = s->hs_buf->end;
-            } else if (ngx_rtmp_handshake_create_response(s) != NGX_OK) {
-                ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                        "handshake: response error");
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-            ngx_rtmp_handshake_send(wev);
-            break;
-
-        case NGX_RTMP_HANDSHAKE_SERVER_RECV_RESPONSE:
-            s->hs_buf->pos = s->hs_buf->last = s->hs_buf->start + 1;
-            ngx_rtmp_handshake_recv(c->read);
-            break;
-
-        case NGX_RTMP_HANDSHAKE_CLIENT_RECV_CHALLENGE:
-            s->hs_buf->pos = s->hs_buf->last = s->hs_buf->start;
-            ngx_rtmp_handshake_recv(c->read);
-            break;
-
-        case NGX_RTMP_HANDSHAKE_CLIENT_DONE:
-            ngx_rtmp_handshake_done(s);
-            break;
-    }
-}
-
-
-void
-ngx_rtmp_handshake(ngx_rtmp_session_t *s)
-{
-    ngx_connection_t           *c;
-
-    c = s->connection;
-    c->read->handler =  ngx_rtmp_handshake_recv;
-    c->write->handler = ngx_rtmp_handshake_send;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "handshake: start server handshake");
-
-    s->hs_buf = ngx_rtmp_alloc_handshake_buffer(s);
-    s->hs_stage = NGX_RTMP_HANDSHAKE_SERVER_RECV_CHALLENGE;
-
-    ngx_rtmp_handshake_recv(c->read);
-}
-
-
-void
-ngx_rtmp_client_handshake(ngx_rtmp_session_t *s, unsigned async)
-{
-    ngx_connection_t           *c;
-
-    c = s->connection;
-    c->read->handler =  ngx_rtmp_handshake_recv;
-    c->write->handler = ngx_rtmp_handshake_send;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "handshake: start client handshake");
-
-    s->hs_buf = ngx_rtmp_alloc_handshake_buffer(s);
-    s->hs_stage = NGX_RTMP_HANDSHAKE_CLIENT_SEND_CHALLENGE;
-
-    if (ngx_rtmp_handshake_create_challenge(s,
-                ngx_rtmp_client_version,
-                &ngx_rtmp_client_partial_key) != NGX_OK)
-    {
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    if (async) {
-        ngx_add_timer(c->write, s->timeout);
-        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
-            ngx_rtmp_finalize_session(s);
-        }
-        return;
-    }
-
-    ngx_rtmp_handshake_send(c->write);
-}
-
diff --git a/debian/modules/rtmp/ngx_rtmp_init.c b/debian/modules/rtmp/ngx_rtmp_init.c
deleted file mode 100644
index 3f54169..0000000
--- a/debian/modules/rtmp/ngx_rtmp_init.c
+++ /dev/null
@@ -1,331 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_proxy_protocol.h"
-
-
-static void ngx_rtmp_close_connection(ngx_connection_t *c);
-static u_char * ngx_rtmp_log_error(ngx_log_t *log, u_char *buf, size_t len);
-
-
-void
-ngx_rtmp_init_connection(ngx_connection_t *c)
-{
-    ngx_uint_t             i;
-    ngx_rtmp_port_t       *port;
-    struct sockaddr       *sa;
-    struct sockaddr_in    *sin;
-    ngx_rtmp_in_addr_t    *addr;
-    ngx_rtmp_session_t    *s;
-    ngx_rtmp_addr_conf_t  *addr_conf;
-    ngx_int_t              unix_socket;
-#if (NGX_HAVE_INET6)
-    struct sockaddr_in6   *sin6;
-    ngx_rtmp_in6_addr_t   *addr6;
-#endif
-
-    ++ngx_rtmp_naccepted;
-
-    /* find the server configuration for the address:port */
-
-    /* AF_INET only */
-
-    port = c->listening->servers;
-    unix_socket = 0;
-
-    if (port->naddrs > 1) {
-
-        /*
-         * There are several addresses on this port and one of them
-         * is the "*:port" wildcard so getsockname() is needed to determine
-         * the server address.
-         *
-         * AcceptEx() already gave this address.
-         */
-
-        if (ngx_connection_local_sockaddr(c, NULL, 0) != NGX_OK) {
-            ngx_rtmp_close_connection(c);
-            return;
-        }
-
-        sa = c->local_sockaddr;
-
-        switch (sa->sa_family) {
-
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            sin6 = (struct sockaddr_in6 *) sa;
-
-            addr6 = port->addrs;
-
-            /* the last address is "*" */
-
-            for (i = 0; i < port->naddrs - 1; i++) {
-                if (ngx_memcmp(&addr6[i].addr6, &sin6->sin6_addr, 16) == 0) {
-                    break;
-                }
-            }
-
-            addr_conf = &addr6[i].conf;
-
-            break;
-#endif
-
-        case AF_UNIX:
-            unix_socket = 1;
-            /* fall through */
-
-        default: /* AF_INET */
-            sin = (struct sockaddr_in *) sa;
-
-            addr = port->addrs;
-
-            /* the last address is "*" */
-
-            for (i = 0; i < port->naddrs - 1; i++) {
-                if (addr[i].addr == sin->sin_addr.s_addr) {
-                    break;
-                }
-            }
-
-            addr_conf = &addr[i].conf;
-
-            break;
-        }
-
-    } else {
-        switch (c->local_sockaddr->sa_family) {
-
-#if (NGX_HAVE_INET6)
-        case AF_INET6:
-            addr6 = port->addrs;
-            addr_conf = &addr6[0].conf;
-            break;
-#endif
-
-        case AF_UNIX:
-            unix_socket = 1;
-            /* fall through */
-
-        default: /* AF_INET */
-            addr = port->addrs;
-            addr_conf = &addr[0].conf;
-            break;
-        }
-    }
-
-    ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%ui client connected '%V'",
-                  c->number, &c->addr_text);
-
-    s = ngx_rtmp_init_session(c, addr_conf);
-    if (s == NULL) {
-        return;
-    }
-
-    /* only auto-pushed connections are
-     * done through unix socket */
-
-    s->auto_pushed = unix_socket;
-
-    if (addr_conf->proxy_protocol) {
-        ngx_rtmp_proxy_protocol(s);
-
-    } else {
-        ngx_rtmp_handshake(s);
-    }
-}
-
-
-ngx_rtmp_session_t *
-ngx_rtmp_init_session(ngx_connection_t *c, ngx_rtmp_addr_conf_t *addr_conf)
-{
-    ngx_rtmp_session_t             *s;
-    ngx_rtmp_core_srv_conf_t       *cscf;
-    ngx_rtmp_error_log_ctx_t       *ctx;
-
-    s = ngx_pcalloc(c->pool, sizeof(ngx_rtmp_session_t) +
-            sizeof(ngx_chain_t *) * ((ngx_rtmp_core_srv_conf_t *)
-                addr_conf->ctx-> srv_conf[ngx_rtmp_core_module
-                    .ctx_index])->out_queue);
-    if (s == NULL) {
-        ngx_rtmp_close_connection(c);
-        return NULL;
-    }
-
-    s->main_conf = addr_conf->ctx->main_conf;
-    s->srv_conf = addr_conf->ctx->srv_conf;
-
-    s->addr_text = &addr_conf->addr_text;
-
-    c->data = s;
-    s->connection = c;
-
-    ctx = ngx_palloc(c->pool, sizeof(ngx_rtmp_error_log_ctx_t));
-    if (ctx == NULL) {
-        ngx_rtmp_close_connection(c);
-        return NULL;
-    }
-
-    ctx->client = &c->addr_text;
-    ctx->session = s;
-
-    c->log->connection = c->number;
-    c->log->handler = ngx_rtmp_log_error;
-    c->log->data = ctx;
-    c->log->action = NULL;
-
-    c->log_error = NGX_ERROR_INFO;
-
-    s->ctx = ngx_pcalloc(c->pool, sizeof(void *) * ngx_rtmp_max_module);
-    if (s->ctx == NULL) {
-        ngx_rtmp_close_connection(c);
-        return NULL;
-    }
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    s->out_queue = cscf->out_queue;
-    s->out_cork = cscf->out_cork;
-    s->in_streams = ngx_pcalloc(c->pool, sizeof(ngx_rtmp_stream_t)
-            * cscf->max_streams);
-    if (s->in_streams == NULL) {
-        ngx_rtmp_close_connection(c);
-        return NULL;
-    }
-
-#if (nginx_version >= 1007005)
-    ngx_queue_init(&s->posted_dry_events);
-#endif
-
-    s->epoch = ngx_current_msec;
-    s->timeout = cscf->timeout;
-    s->buflen = cscf->buflen;
-    ngx_rtmp_set_chunk_size(s, NGX_RTMP_DEFAULT_CHUNK_SIZE);
-
-
-    if (ngx_rtmp_fire_event(s, NGX_RTMP_CONNECT, NULL, NULL) != NGX_OK) {
-        ngx_rtmp_finalize_session(s);
-        return NULL;
-    }
-
-    return s;
-}
-
-
-static u_char *
-ngx_rtmp_log_error(ngx_log_t *log, u_char *buf, size_t len)
-{
-    u_char                     *p;
-    ngx_rtmp_session_t         *s;
-    ngx_rtmp_error_log_ctx_t   *ctx;
-
-    if (log->action) {
-        p = ngx_snprintf(buf, len, " while %s", log->action);
-        len -= p - buf;
-        buf = p;
-    }
-
-    ctx = log->data;
-
-    p = ngx_snprintf(buf, len, ", client: %V", ctx->client);
-    len -= p - buf;
-    buf = p;
-
-    s = ctx->session;
-
-    if (s == NULL) {
-        return p;
-    }
-
-    p = ngx_snprintf(buf, len, ", server: %V", s->addr_text);
-    len -= p - buf;
-    buf = p;
-
-    return p;
-}
-
-
-static void
-ngx_rtmp_close_connection(ngx_connection_t *c)
-{
-    ngx_pool_t                         *pool;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, c->log, 0, "close connection");
-
-#if (NGX_STAT_STUB)
-    (void) ngx_atomic_fetch_add(ngx_stat_active, -1);
-#endif
-
-    pool = c->pool;
-    ngx_close_connection(c);
-    ngx_destroy_pool(pool);
-}
-
-
-static void
-ngx_rtmp_close_session_handler(ngx_event_t *e)
-{
-    ngx_rtmp_session_t                 *s;
-    ngx_connection_t                   *c;
-    ngx_rtmp_core_srv_conf_t           *cscf;
-
-    s = e->data;
-    c = s->connection;
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, c->log, 0, "close session");
-
-    ngx_rtmp_fire_event(s, NGX_RTMP_DISCONNECT, NULL, NULL);
-
-    if (s->ping_evt.timer_set) {
-        ngx_del_timer(&s->ping_evt);
-    }
-
-    if (s->in_old_pool) {
-        ngx_destroy_pool(s->in_old_pool);
-    }
-
-    if (s->in_pool) {
-        ngx_destroy_pool(s->in_pool);
-    }
-
-    ngx_rtmp_free_handshake_buffers(s);
-
-    while (s->out_pos != s->out_last) {
-        ngx_rtmp_free_shared_chain(cscf, s->out[s->out_pos++]);
-        s->out_pos %= s->out_queue;
-    }
-
-    ngx_rtmp_close_connection(c);
-}
-
-
-void
-ngx_rtmp_finalize_session(ngx_rtmp_session_t *s)
-{
-    ngx_event_t        *e;
-    ngx_connection_t   *c;
-
-    c = s->connection;
-    if (c->destroyed) {
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, c->log, 0, "finalize session");
-
-    c->destroyed = 1;
-    e = &s->close;
-    e->data = s;
-    e->handler = ngx_rtmp_close_session_handler;
-    e->log = c->log;
-
-    ngx_post_event(e, &ngx_posted_events);
-}
-
diff --git a/debian/modules/rtmp/ngx_rtmp_limit_module.c b/debian/modules/rtmp/ngx_rtmp_limit_module.c
deleted file mode 100644
index 18ebc4b..0000000
--- a/debian/modules/rtmp/ngx_rtmp_limit_module.c
+++ /dev/null
@@ -1,205 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-
-
-typedef struct {
-    ngx_int_t       max_conn;
-    ngx_shm_zone_t *shm_zone;
-} ngx_rtmp_limit_main_conf_t;
-
-
-static ngx_str_t    shm_name = ngx_string("rtmp_limit");
-
-
-static ngx_int_t ngx_rtmp_limit_postconfiguration(ngx_conf_t *cf);
-static void *ngx_rtmp_limit_create_main_conf(ngx_conf_t *cf);
-
-
-static ngx_command_t  ngx_rtmp_limit_commands[] = {
-
-    { ngx_string("max_connections"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_RTMP_MAIN_CONF_OFFSET,
-      offsetof(ngx_rtmp_limit_main_conf_t, max_conn),
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_limit_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_limit_postconfiguration,       /* postconfiguration */
-    ngx_rtmp_limit_create_main_conf,        /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    NULL,                                   /* create app configuration */
-    NULL                                    /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_limit_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_limit_module_ctx,             /* module context */
-    ngx_rtmp_limit_commands,                /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void *
-ngx_rtmp_limit_create_main_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_limit_main_conf_t      *lmcf;
-
-    lmcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_limit_main_conf_t));
-    if (lmcf == NULL) {
-        return NULL;
-    }
-
-    lmcf->max_conn = NGX_CONF_UNSET;
-
-    return lmcf;
-}
-
-
-static ngx_int_t
-ngx_rtmp_limit_connect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-    ngx_chain_t *in)
-{
-    ngx_rtmp_limit_main_conf_t *lmcf;
-    ngx_slab_pool_t            *shpool;
-    ngx_shm_zone_t             *shm_zone;
-    uint32_t                   *nconn, n;
-    ngx_int_t                   rc;
-
-    lmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_limit_module);
-    if (lmcf->max_conn == NGX_CONF_UNSET) {
-        return NGX_OK;
-    }
-
-    shm_zone = lmcf->shm_zone;
-    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-    nconn = shm_zone->data;
-
-    ngx_shmtx_lock(&shpool->mutex);
-    n = ++*nconn;
-    ngx_shmtx_unlock(&shpool->mutex);
-
-    rc = n > (ngx_uint_t) lmcf->max_conn ? NGX_ERROR : NGX_OK;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "limit: inc conection counter: %uD", n);
-
-    if (rc != NGX_OK) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "limit: too many connections: %uD > %i",
-                      n, lmcf->max_conn);
-    }
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_rtmp_limit_disconnect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-    ngx_chain_t *in)
-{
-    ngx_rtmp_limit_main_conf_t *lmcf;
-    ngx_slab_pool_t            *shpool;
-    ngx_shm_zone_t             *shm_zone;
-    uint32_t                   *nconn, n;
-
-    lmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_limit_module);
-    if (lmcf->max_conn == NGX_CONF_UNSET) {
-        return NGX_OK;
-    }
-
-    shm_zone = lmcf->shm_zone;
-    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-    nconn = shm_zone->data;
-
-    ngx_shmtx_lock(&shpool->mutex);
-    n = --*nconn;
-    ngx_shmtx_unlock(&shpool->mutex);
-
-    (void) n;
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "limit: dec conection counter: %uD", n);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_limit_shm_init(ngx_shm_zone_t *shm_zone, void *data)
-{
-    ngx_slab_pool_t    *shpool;
-    uint32_t           *nconn;
-
-    if (data) {
-        shm_zone->data = data;
-        return NGX_OK;
-    }
-
-    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-
-    nconn = ngx_slab_alloc(shpool, 4);
-    if (nconn == NULL) {
-        return NGX_ERROR;
-    }
-
-    *nconn = 0;
-
-    shm_zone->data = nconn;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_limit_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t  *cmcf;
-    ngx_rtmp_limit_main_conf_t *lmcf;
-    ngx_rtmp_handler_pt        *h;
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_CONNECT]);
-    *h = ngx_rtmp_limit_connect;
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
-    *h = ngx_rtmp_limit_disconnect;
-
-    lmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_limit_module);
-    if (lmcf->max_conn == NGX_CONF_UNSET) {
-        return NGX_OK;
-    }
-
-    lmcf->shm_zone = ngx_shared_memory_add(cf, &shm_name, ngx_pagesize * 2,
-                                           &ngx_rtmp_limit_module);
-    if (lmcf->shm_zone == NULL) {
-        return NGX_ERROR;
-    }
-
-    lmcf->shm_zone->init = ngx_rtmp_limit_shm_init;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_live_module.c b/debian/modules/rtmp/ngx_rtmp_live_module.c
deleted file mode 100644
index 5bebb9e..0000000
--- a/debian/modules/rtmp/ngx_rtmp_live_module.c
+++ /dev/null
@@ -1,1153 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_live_module.h"
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_codec_module.h"
-
-
-static ngx_rtmp_publish_pt              next_publish;
-static ngx_rtmp_play_pt                 next_play;
-static ngx_rtmp_close_stream_pt         next_close_stream;
-static ngx_rtmp_pause_pt                next_pause;
-static ngx_rtmp_stream_begin_pt         next_stream_begin;
-static ngx_rtmp_stream_eof_pt           next_stream_eof;
-
-
-static ngx_int_t ngx_rtmp_live_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_live_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-static char *ngx_rtmp_live_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static void ngx_rtmp_live_start(ngx_rtmp_session_t *s);
-static void ngx_rtmp_live_stop(ngx_rtmp_session_t *s);
-
-
-static ngx_command_t  ngx_rtmp_live_commands[] = {
-
-    { ngx_string("live"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, live),
-      NULL },
-
-    { ngx_string("stream_buckets"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, nbuckets),
-      NULL },
-
-    { ngx_string("buffer"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, buflen),
-      NULL },
-
-    { ngx_string("sync"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_live_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, sync),
-      NULL },
-
-    { ngx_string("interleave"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, interleave),
-      NULL },
-
-    { ngx_string("wait_key"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, wait_key),
-      NULL },
-
-    { ngx_string("wait_video"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, wait_video),
-      NULL },
-
-    { ngx_string("publish_notify"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, publish_notify),
-      NULL },
-
-    { ngx_string("play_restart"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, play_restart),
-      NULL },
-
-    { ngx_string("idle_streams"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, idle_streams),
-      NULL },
-
-    { ngx_string("drop_idle_publisher"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_live_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_live_app_conf_t, idle_timeout),
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_live_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_live_postconfiguration,        /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    ngx_rtmp_live_create_app_conf,          /* create app configuration */
-    ngx_rtmp_live_merge_app_conf            /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_live_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_live_module_ctx,              /* module context */
-    ngx_rtmp_live_commands,                 /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void *
-ngx_rtmp_live_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_live_app_conf_t      *lacf;
-
-    lacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_live_app_conf_t));
-    if (lacf == NULL) {
-        return NULL;
-    }
-
-    lacf->live = NGX_CONF_UNSET;
-    lacf->nbuckets = NGX_CONF_UNSET;
-    lacf->buflen = NGX_CONF_UNSET_MSEC;
-    lacf->sync = NGX_CONF_UNSET_MSEC;
-    lacf->idle_timeout = NGX_CONF_UNSET_MSEC;
-    lacf->interleave = NGX_CONF_UNSET;
-    lacf->wait_key = NGX_CONF_UNSET;
-    lacf->wait_video = NGX_CONF_UNSET;
-    lacf->publish_notify = NGX_CONF_UNSET;
-    lacf->play_restart = NGX_CONF_UNSET;
-    lacf->idle_streams = NGX_CONF_UNSET;
-
-    return lacf;
-}
-
-
-static char *
-ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_live_app_conf_t *prev = parent;
-    ngx_rtmp_live_app_conf_t *conf = child;
-
-    ngx_conf_merge_value(conf->live, prev->live, 0);
-    ngx_conf_merge_value(conf->nbuckets, prev->nbuckets, 1024);
-    ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 0);
-    ngx_conf_merge_msec_value(conf->sync, prev->sync, 300);
-    ngx_conf_merge_msec_value(conf->idle_timeout, prev->idle_timeout, 0);
-    ngx_conf_merge_value(conf->interleave, prev->interleave, 0);
-    ngx_conf_merge_value(conf->wait_key, prev->wait_key, 1);
-    ngx_conf_merge_value(conf->wait_video, prev->wait_video, 0);
-    ngx_conf_merge_value(conf->publish_notify, prev->publish_notify, 0);
-    ngx_conf_merge_value(conf->play_restart, prev->play_restart, 0);
-    ngx_conf_merge_value(conf->idle_streams, prev->idle_streams, 1);
-
-    conf->pool = ngx_create_pool(4096, &cf->cycle->new_log);
-    if (conf->pool == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    conf->streams = ngx_pcalloc(cf->pool,
-            sizeof(ngx_rtmp_live_stream_t *) * conf->nbuckets);
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_rtmp_live_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char                       *p = conf;
-    ngx_str_t                  *value;
-    ngx_msec_t                 *msp;
-
-    msp = (ngx_msec_t *) (p + cmd->offset);
-
-    value = cf->args->elts;
-
-    if (value[1].len == sizeof("off") - 1 &&
-        ngx_strncasecmp(value[1].data, (u_char *) "off", value[1].len) == 0)
-    {
-        *msp = 0;
-        return NGX_CONF_OK;
-    }
-
-    return ngx_conf_set_msec_slot(cf, cmd, conf);
-}
-
-
-static ngx_rtmp_live_stream_t **
-ngx_rtmp_live_get_stream(ngx_rtmp_session_t *s, u_char *name, int create)
-{
-    ngx_rtmp_live_app_conf_t   *lacf;
-    ngx_rtmp_live_stream_t    **stream;
-    size_t                      len;
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-    if (lacf == NULL) {
-        return NULL;
-    }
-
-    len = ngx_strlen(name);
-    stream = &lacf->streams[ngx_hash_key(name, len) % lacf->nbuckets];
-
-    for (; *stream; stream = &(*stream)->next) {
-        if (ngx_strcmp(name, (*stream)->name) == 0) {
-            return stream;
-        }
-    }
-
-    if (!create) {
-        return NULL;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "live: create stream '%s'", name);
-
-    if (lacf->free_streams) {
-        *stream = lacf->free_streams;
-        lacf->free_streams = lacf->free_streams->next;
-    } else {
-        *stream = ngx_palloc(lacf->pool, sizeof(ngx_rtmp_live_stream_t));
-    }
-    ngx_memzero(*stream, sizeof(ngx_rtmp_live_stream_t));
-    ngx_memcpy((*stream)->name, name,
-            ngx_min(sizeof((*stream)->name) - 1, len));
-    (*stream)->epoch = ngx_current_msec;
-
-    return stream;
-}
-
-
-static void
-ngx_rtmp_live_idle(ngx_event_t *pev)
-{
-    ngx_connection_t           *c;
-    ngx_rtmp_session_t         *s;
-
-    c = pev->data;
-    s = c->data;
-
-    ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                  "live: drop idle publisher");
-
-    ngx_rtmp_finalize_session(s);
-}
-
-
-static void
-ngx_rtmp_live_set_status(ngx_rtmp_session_t *s, ngx_chain_t *control,
-                         ngx_chain_t **status, size_t nstatus,
-                         unsigned active)
-{
-    ngx_rtmp_live_app_conf_t   *lacf;
-    ngx_rtmp_live_ctx_t        *ctx, *pctx;
-    ngx_chain_t               **cl;
-    ngx_event_t                *e;
-    size_t                      n;
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: set active=%ui", active);
-
-    if (ctx->active == active) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "live: unchanged active=%ui", active);
-        return;
-    }
-
-    ctx->active = active;
-
-    if (ctx->publishing) {
-
-        /* publisher */
-
-        if (lacf->idle_timeout) {
-            e = &ctx->idle_evt;
-
-            if (active && !ctx->idle_evt.timer_set) {
-                e->data = s->connection;
-                e->log = s->connection->log;
-                e->handler = ngx_rtmp_live_idle;
-
-                ngx_add_timer(e, lacf->idle_timeout);
-
-            } else if (!active && ctx->idle_evt.timer_set) {
-                ngx_del_timer(e);
-            }
-        }
-
-        ctx->stream->active = active;
-
-        for (pctx = ctx->stream->ctx; pctx; pctx = pctx->next) {
-            if (pctx->publishing == 0) {
-                ngx_rtmp_live_set_status(pctx->session, control, status,
-                                         nstatus, active);
-            }
-        }
-
-        return;
-    }
-
-    /* subscriber */
-
-    if (control && ngx_rtmp_send_message(s, control, 0) != NGX_OK) {
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    if (!ctx->silent) {
-        cl = status;
-
-        for (n = 0; n < nstatus; ++n, ++cl) {
-            if (*cl && ngx_rtmp_send_message(s, *cl, 0) != NGX_OK) {
-                ngx_rtmp_finalize_session(s);
-                return;
-            }
-        }
-    }
-
-    ctx->cs[0].active = 0;
-    ctx->cs[0].dropped = 0;
-
-    ctx->cs[1].active = 0;
-    ctx->cs[1].dropped = 0;
-}
-
-
-static void
-ngx_rtmp_live_start(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    ngx_rtmp_live_app_conf_t   *lacf;
-    ngx_chain_t                *control;
-    ngx_chain_t                *status[3];
-    size_t                      n, nstatus;
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-
-    control = ngx_rtmp_create_stream_begin(s, NGX_RTMP_MSID);
-
-    nstatus = 0;
-
-    if (lacf->play_restart) {
-        status[nstatus++] = ngx_rtmp_create_status(s, "NetStream.Play.Start",
-                                                   "status", "Start live");
-        status[nstatus++] = ngx_rtmp_create_sample_access(s);
-    }
-
-    if (lacf->publish_notify) {
-        status[nstatus++] = ngx_rtmp_create_status(s,
-                                                 "NetStream.Play.PublishNotify",
-                                                 "status", "Start publishing");
-    }
-
-    ngx_rtmp_live_set_status(s, control, status, nstatus, 1);
-
-    if (control) {
-        ngx_rtmp_free_shared_chain(cscf, control);
-    }
-
-    for (n = 0; n < nstatus; ++n) {
-        ngx_rtmp_free_shared_chain(cscf, status[n]);
-    }
-}
-
-
-static void
-ngx_rtmp_live_stop(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    ngx_rtmp_live_app_conf_t   *lacf;
-    ngx_chain_t                *control;
-    ngx_chain_t                *status[3];
-    size_t                      n, nstatus;
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-
-    control = ngx_rtmp_create_stream_eof(s, NGX_RTMP_MSID);
-
-    nstatus = 0;
-
-    if (lacf->play_restart) {
-        status[nstatus++] = ngx_rtmp_create_status(s, "NetStream.Play.Stop",
-                                                   "status", "Stop live");
-    }
-
-    if (lacf->publish_notify) {
-        status[nstatus++] = ngx_rtmp_create_status(s,
-                                               "NetStream.Play.UnpublishNotify",
-                                               "status", "Stop publishing");
-    }
-
-    ngx_rtmp_live_set_status(s, control, status, nstatus, 0);
-
-    if (control) {
-        ngx_rtmp_free_shared_chain(cscf, control);
-    }
-
-    for (n = 0; n < nstatus; ++n) {
-        ngx_rtmp_free_shared_chain(cscf, status[n]);
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_live_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
-{
-    ngx_rtmp_live_ctx_t    *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-
-    if (ctx == NULL || ctx->stream == NULL || !ctx->publishing) {
-        goto next;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: stream_begin");
-
-    ngx_rtmp_live_start(s);
-
-next:
-    return next_stream_begin(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_live_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_eof_t *v)
-{
-    ngx_rtmp_live_ctx_t    *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-
-    if (ctx == NULL || ctx->stream == NULL || !ctx->publishing) {
-        goto next;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: stream_eof");
-
-    ngx_rtmp_live_stop(s);
-
-next:
-    return next_stream_eof(s, v);
-}
-
-
-static void
-ngx_rtmp_live_join(ngx_rtmp_session_t *s, u_char *name, unsigned publisher)
-{
-    ngx_rtmp_live_ctx_t            *ctx;
-    ngx_rtmp_live_stream_t        **stream;
-    ngx_rtmp_live_app_conf_t       *lacf;
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-    if (lacf == NULL) {
-        return;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-    if (ctx && ctx->stream) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "live: already joined");
-        return;
-    }
-
-    if (ctx == NULL) {
-        ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_live_ctx_t));
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_live_module);
-    }
-
-    ngx_memzero(ctx, sizeof(*ctx));
-
-    ctx->session = s;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: join '%s'", name);
-
-    stream = ngx_rtmp_live_get_stream(s, name, publisher || lacf->idle_streams);
-
-    if (stream == NULL ||
-        !(publisher || (*stream)->publishing || lacf->idle_streams))
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "live: stream not found");
-
-        ngx_rtmp_send_status(s, "NetStream.Play.StreamNotFound", "error",
-                             "No such stream");
-
-        ngx_rtmp_finalize_session(s);
-
-        return;
-    }
-
-    if (publisher) {
-        if ((*stream)->publishing) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "live: already publishing");
-
-            ngx_rtmp_send_status(s, "NetStream.Publish.BadName", "error",
-                                 "Already publishing");
-
-            return;
-        }
-
-        (*stream)->publishing = 1;
-    }
-
-    ctx->stream = *stream;
-    ctx->publishing = publisher;
-    ctx->next = (*stream)->ctx;
-
-    (*stream)->ctx = ctx;
-
-    if (lacf->buflen) {
-        s->out_buffer = 1;
-    }
-
-    ctx->cs[0].csid = NGX_RTMP_CSID_VIDEO;
-    ctx->cs[1].csid = NGX_RTMP_CSID_AUDIO;
-
-    if (!ctx->publishing && ctx->stream->active) {
-        ngx_rtmp_live_start(s);
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_live_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
-{
-    ngx_rtmp_session_t             *ss;
-    ngx_rtmp_live_ctx_t            *ctx, **cctx, *pctx;
-    ngx_rtmp_live_stream_t        **stream;
-    ngx_rtmp_live_app_conf_t       *lacf;
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-    if (lacf == NULL) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-    if (ctx == NULL) {
-        goto next;
-    }
-
-    if (ctx->stream == NULL) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "live: not joined");
-        goto next;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: leave '%s'", ctx->stream->name);
-
-    if (ctx->stream->publishing && ctx->publishing) {
-        ctx->stream->publishing = 0;
-    }
-
-    for (cctx = &ctx->stream->ctx; *cctx; cctx = &(*cctx)->next) {
-        if (*cctx == ctx) {
-            *cctx = ctx->next;
-            break;
-        }
-    }
-
-    if (ctx->publishing || ctx->stream->active) {
-        ngx_rtmp_live_stop(s);
-    }
-
-    if (ctx->publishing) {
-        ngx_rtmp_send_status(s, "NetStream.Unpublish.Success",
-                             "status", "Stop publishing");
-        if (!lacf->idle_streams) {
-            for (pctx = ctx->stream->ctx; pctx; pctx = pctx->next) {
-                if (pctx->publishing == 0) {
-                    ss = pctx->session;
-                    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                                   "live: no publisher");
-                    ngx_rtmp_finalize_session(ss);
-                }
-            }
-        }
-    }
-
-    if (ctx->stream->ctx) {
-        ctx->stream = NULL;
-        goto next;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: delete empty stream '%s'",
-                   ctx->stream->name);
-
-    stream = ngx_rtmp_live_get_stream(s, ctx->stream->name, 0);
-    if (stream == NULL) {
-        goto next;
-    }
-    *stream = (*stream)->next;
-
-    ctx->stream->next = lacf->free_streams;
-    lacf->free_streams = ctx->stream;
-    ctx->stream = NULL;
-
-    if (!ctx->silent && !ctx->publishing && !lacf->play_restart) {
-        ngx_rtmp_send_status(s, "NetStream.Play.Stop", "status", "Stop live");
-    }
-
-next:
-    return next_close_stream(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_live_pause(ngx_rtmp_session_t *s, ngx_rtmp_pause_t *v)
-{
-    ngx_rtmp_live_ctx_t            *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-
-    if (ctx == NULL || ctx->stream == NULL) {
-        goto next;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: pause=%i timestamp=%f",
-                   (ngx_int_t) v->pause, v->position);
-
-    if (v->pause) {
-        if (ngx_rtmp_send_status(s, "NetStream.Pause.Notify", "status",
-                                 "Paused live")
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        ctx->paused = 1;
-
-        ngx_rtmp_live_stop(s);
-
-    } else {
-        if (ngx_rtmp_send_status(s, "NetStream.Unpause.Notify", "status",
-                                 "Unpaused live")
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        ctx->paused = 0;
-
-        ngx_rtmp_live_start(s);
-    }
-
-next:
-    return next_pause(s, v);
-}
-
-static ngx_int_t
-ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                 ngx_chain_t *in)
-{
-    ngx_rtmp_live_ctx_t            *ctx, *pctx;
-    ngx_rtmp_codec_ctx_t           *codec_ctx;
-    ngx_chain_t                    *header, *coheader, *meta,
-                                   *apkt, *aapkt, *acopkt, *rpkt;
-    ngx_rtmp_core_srv_conf_t       *cscf;
-    ngx_rtmp_live_app_conf_t       *lacf;
-    ngx_rtmp_session_t             *ss;
-    ngx_rtmp_header_t               ch, lh, clh;
-    ngx_int_t                       rc, mandatory, dummy_audio;
-    ngx_uint_t                      prio;
-    ngx_uint_t                      peers;
-    ngx_uint_t                      meta_version;
-    ngx_uint_t                      csidx;
-    uint32_t                        delta;
-    ngx_rtmp_live_chunk_stream_t   *cs;
-#ifdef NGX_DEBUG
-    const char                     *type_s;
-
-    type_s = (h->type == NGX_RTMP_MSG_VIDEO ? "video" : "audio");
-#endif
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-    if (lacf == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (!lacf->live || in == NULL  || in->buf == NULL) {
-        return NGX_OK;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-    if (ctx == NULL || ctx->stream == NULL) {
-        return NGX_OK;
-    }
-
-    if (ctx->publishing == 0) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "live: %s from non-publisher", type_s);
-        return NGX_OK;
-    }
-
-    if (!ctx->stream->active) {
-        ngx_rtmp_live_start(s);
-    }
-
-    if (ctx->idle_evt.timer_set) {
-        ngx_add_timer(&ctx->idle_evt, lacf->idle_timeout);
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: %s packet timestamp=%uD",
-                   type_s, h->timestamp);
-
-    s->current_time = h->timestamp;
-
-    peers = 0;
-    apkt = NULL;
-    aapkt = NULL;
-    acopkt = NULL;
-    header = NULL;
-    coheader = NULL;
-    meta = NULL;
-    meta_version = 0;
-    mandatory = 0;
-
-    prio = (h->type == NGX_RTMP_MSG_VIDEO ?
-            ngx_rtmp_get_video_frame_type(in) : 0);
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    csidx = !(lacf->interleave || h->type == NGX_RTMP_MSG_VIDEO);
-
-    cs  = &ctx->cs[csidx];
-
-    ngx_memzero(&ch, sizeof(ch));
-
-    ch.timestamp = h->timestamp;
-    ch.msid = NGX_RTMP_MSID;
-    ch.csid = cs->csid;
-    ch.type = h->type;
-
-    lh = ch;
-
-    if (cs->active) {
-        lh.timestamp = cs->timestamp;
-    }
-
-    clh = lh;
-    clh.type = (h->type == NGX_RTMP_MSG_AUDIO ? NGX_RTMP_MSG_VIDEO :
-                                                NGX_RTMP_MSG_AUDIO);
-
-    cs->active = 1;
-    cs->timestamp = ch.timestamp;
-
-    delta = ch.timestamp - lh.timestamp;
-/*
-    if (delta >> 31) {
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "live: clipping non-monotonical timestamp %uD->%uD",
-                       lh.timestamp, ch.timestamp);
-
-        delta = 0;
-
-        ch.timestamp = lh.timestamp;
-    }
-*/
-    rpkt = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
-
-    ngx_rtmp_prepare_message(s, &ch, &lh, rpkt);
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-
-    if (codec_ctx) {
-
-        if (h->type == NGX_RTMP_MSG_AUDIO) {
-            header = codec_ctx->aac_header;
-
-            if (lacf->interleave) {
-                coheader = codec_ctx->avc_header;
-            }
-
-            if (codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC &&
-                ngx_rtmp_is_codec_header(in))
-            {
-                prio = 0;
-                mandatory = 1;
-            }
-
-        } else {
-            header = codec_ctx->avc_header;
-
-            if (lacf->interleave) {
-                coheader = codec_ctx->aac_header;
-            }
-
-            if (codec_ctx->video_codec_id == NGX_RTMP_VIDEO_H264 &&
-                ngx_rtmp_is_codec_header(in))
-            {
-                prio = 0;
-                mandatory = 1;
-            }
-        }
-
-        if (codec_ctx->meta) {
-            meta = codec_ctx->meta;
-            meta_version = codec_ctx->meta_version;
-        }
-    }
-
-    /* broadcast to all subscribers */
-
-    for (pctx = ctx->stream->ctx; pctx; pctx = pctx->next) {
-        if (pctx == ctx || pctx->paused) {
-            continue;
-        }
-
-        ss = pctx->session;
-        cs = &pctx->cs[csidx];
-
-        /* send metadata */
-
-        if (meta && meta_version != pctx->meta_version) {
-            ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                           "live: meta");
-
-            if (ngx_rtmp_send_message(ss, meta, 0) == NGX_OK) {
-                pctx->meta_version = meta_version;
-            }
-        }
-
-        /* sync stream */
-
-        if (cs->active && (lacf->sync && cs->dropped > lacf->sync)) {
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                           "live: sync %s dropped=%uD", type_s, cs->dropped);
-
-            cs->active = 0;
-            cs->dropped = 0;
-        }
-
-        /* absolute packet */
-
-        if (!cs->active) {
-
-            if (mandatory) {
-                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                               "live: skipping header");
-                continue;
-            }
-
-            if (lacf->wait_video && h->type == NGX_RTMP_MSG_AUDIO &&
-                !pctx->cs[0].active)
-            {
-                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                               "live: waiting for video");
-                continue;
-            }
-
-            if (lacf->wait_key && prio != NGX_RTMP_VIDEO_KEY_FRAME &&
-               (lacf->interleave || h->type == NGX_RTMP_MSG_VIDEO))
-            {
-                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                               "live: skip non-key");
-                continue;
-            }
-
-            dummy_audio = 0;
-            if (lacf->wait_video && h->type == NGX_RTMP_MSG_VIDEO &&
-                !pctx->cs[1].active)
-            {
-                dummy_audio = 1;
-                if (aapkt == NULL) {
-                    aapkt = ngx_rtmp_alloc_shared_buf(cscf);
-                    ngx_rtmp_prepare_message(s, &clh, NULL, aapkt);
-                }
-            }
-
-            if (header || coheader) {
-
-                /* send absolute codec header */
-
-                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                               "live: abs %s header timestamp=%uD",
-                               type_s, lh.timestamp);
-
-                if (header) {
-                    if (apkt == NULL) {
-                        apkt = ngx_rtmp_append_shared_bufs(cscf, NULL, header);
-                        ngx_rtmp_prepare_message(s, &lh, NULL, apkt);
-                    }
-
-                    rc = ngx_rtmp_send_message(ss, apkt, 0);
-                    if (rc != NGX_OK) {
-                        continue;
-                    }
-                }
-
-                if (coheader) {
-                    if (acopkt == NULL) {
-                        acopkt = ngx_rtmp_append_shared_bufs(cscf, NULL, coheader);
-                        ngx_rtmp_prepare_message(s, &clh, NULL, acopkt);
-                    }
-
-                    rc = ngx_rtmp_send_message(ss, acopkt, 0);
-                    if (rc != NGX_OK) {
-                        continue;
-                    }
-
-                } else if (dummy_audio) {
-                    ngx_rtmp_send_message(ss, aapkt, 0);
-                }
-
-                cs->timestamp = lh.timestamp;
-                cs->active = 1;
-                ss->current_time = cs->timestamp;
-
-            } else {
-
-                /* send absolute packet */
-
-                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                               "live: abs %s packet timestamp=%uD",
-                               type_s, ch.timestamp);
-
-                if (apkt == NULL) {
-                    apkt = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
-                    ngx_rtmp_prepare_message(s, &ch, NULL, apkt);
-                }
-
-                rc = ngx_rtmp_send_message(ss, apkt, prio);
-                if (rc != NGX_OK) {
-                    continue;
-                }
-
-                cs->timestamp = ch.timestamp;
-                cs->active = 1;
-                ss->current_time = cs->timestamp;
-
-                ++peers;
-
-                if (dummy_audio) {
-                    ngx_rtmp_send_message(ss, aapkt, 0);
-                }
-
-                continue;
-            }
-        }
-
-        /* send relative packet */
-
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                       "live: rel %s packet delta=%uD",
-                       type_s, delta);
-
-        if (ngx_rtmp_send_message(ss, rpkt, prio) != NGX_OK) {
-            ++pctx->ndropped;
-
-            cs->dropped += delta;
-
-            if (mandatory) {
-                ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
-                               "live: mandatory packet failed");
-                ngx_rtmp_finalize_session(ss);
-            }
-
-            continue;
-        }
-
-        cs->timestamp += delta;
-        ++peers;
-        ss->current_time = cs->timestamp;
-    }
-
-    if (rpkt) {
-        ngx_rtmp_free_shared_chain(cscf, rpkt);
-    }
-
-    if (apkt) {
-        ngx_rtmp_free_shared_chain(cscf, apkt);
-    }
-
-    if (aapkt) {
-        ngx_rtmp_free_shared_chain(cscf, aapkt);
-    }
-
-    if (acopkt) {
-        ngx_rtmp_free_shared_chain(cscf, acopkt);
-    }
-
-    ngx_rtmp_update_bandwidth(&ctx->stream->bw_in, h->mlen);
-    ngx_rtmp_update_bandwidth(&ctx->stream->bw_out, h->mlen * peers);
-
-    ngx_rtmp_update_bandwidth(h->type == NGX_RTMP_MSG_AUDIO ?
-                              &ctx->stream->bw_in_audio :
-                              &ctx->stream->bw_in_video,
-                              h->mlen);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_live_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    ngx_rtmp_live_app_conf_t       *lacf;
-    ngx_rtmp_live_ctx_t            *ctx;
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-
-    if (lacf == NULL || !lacf->live) {
-        goto next;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: publish: name='%s' type='%s'",
-                   v->name, v->type);
-
-    /* join stream as publisher */
-
-    ngx_rtmp_live_join(s, v->name, 1);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-    if (ctx == NULL || !ctx->publishing) {
-        goto next;
-    }
-
-    ctx->silent = v->silent;
-
-    if (!ctx->silent) {
-        ngx_rtmp_send_status(s, "NetStream.Publish.Start",
-                             "status", "Start publishing");
-    }
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_live_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    ngx_rtmp_live_app_conf_t       *lacf;
-    ngx_rtmp_live_ctx_t            *ctx;
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
-
-    if (lacf == NULL || !lacf->live) {
-        goto next;
-    }
-
-    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "live: play: name='%s' start=%uD duration=%uD reset=%d",
-                   v->name, (uint32_t) v->start,
-                   (uint32_t) v->duration, (uint32_t) v->reset);
-
-    /* join stream as subscriber */
-
-    ngx_rtmp_live_join(s, v->name, 0);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
-    if (ctx == NULL) {
-        goto next;
-    }
-
-    ctx->silent = v->silent;
-
-    if (!ctx->silent && !lacf->play_restart) {
-        ngx_rtmp_send_status(s, "NetStream.Play.Start",
-                             "status", "Start live");
-        ngx_rtmp_send_sample_access(s);
-    }
-
-next:
-    return next_play(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_live_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t          *cmcf;
-    ngx_rtmp_handler_pt                *h;
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    /* register raw event handlers */
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
-    *h = ngx_rtmp_live_av;
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
-    *h = ngx_rtmp_live_av;
-
-    /* chain handlers */
-
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_live_publish;
-
-    next_play = ngx_rtmp_play;
-    ngx_rtmp_play = ngx_rtmp_live_play;
-
-    next_close_stream = ngx_rtmp_close_stream;
-    ngx_rtmp_close_stream = ngx_rtmp_live_close_stream;
-
-    next_pause = ngx_rtmp_pause;
-    ngx_rtmp_pause = ngx_rtmp_live_pause;
-
-    next_stream_begin = ngx_rtmp_stream_begin;
-    ngx_rtmp_stream_begin = ngx_rtmp_live_stream_begin;
-
-    next_stream_eof = ngx_rtmp_stream_eof;
-    ngx_rtmp_stream_eof = ngx_rtmp_live_stream_eof;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_live_module.h b/debian/modules/rtmp/ngx_rtmp_live_module.h
deleted file mode 100644
index 71eca36..0000000
--- a/debian/modules/rtmp/ngx_rtmp_live_module.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_LIVE_H_INCLUDED_
-#define _NGX_RTMP_LIVE_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_bandwidth.h"
-#include "ngx_rtmp_streams.h"
-
-
-typedef struct ngx_rtmp_live_ctx_s ngx_rtmp_live_ctx_t;
-typedef struct ngx_rtmp_live_stream_s ngx_rtmp_live_stream_t;
-
-
-typedef struct {
-    unsigned                            active:1;
-    uint32_t                            timestamp;
-    uint32_t                            csid;
-    uint32_t                            dropped;
-} ngx_rtmp_live_chunk_stream_t;
-
-
-struct ngx_rtmp_live_ctx_s {
-    ngx_rtmp_session_t                 *session;
-    ngx_rtmp_live_stream_t             *stream;
-    ngx_rtmp_live_ctx_t                *next;
-    ngx_uint_t                          ndropped;
-    ngx_rtmp_live_chunk_stream_t        cs[2];
-    ngx_uint_t                          meta_version;
-    ngx_event_t                         idle_evt;
-    unsigned                            active:1;
-    unsigned                            publishing:1;
-    unsigned                            silent:1;
-    unsigned                            paused:1;
-};
-
-
-struct ngx_rtmp_live_stream_s {
-    u_char                              name[NGX_RTMP_MAX_NAME];
-    ngx_rtmp_live_stream_t             *next;
-    ngx_rtmp_live_ctx_t                *ctx;
-    ngx_rtmp_bandwidth_t                bw_in;
-    ngx_rtmp_bandwidth_t                bw_in_audio;
-    ngx_rtmp_bandwidth_t                bw_in_video;
-    ngx_rtmp_bandwidth_t                bw_out;
-    ngx_msec_t                          epoch;
-    unsigned                            active:1;
-    unsigned                            publishing:1;
-};
-
-
-typedef struct {
-    ngx_int_t                           nbuckets;
-    ngx_rtmp_live_stream_t            **streams;
-    ngx_flag_t                          live;
-    ngx_flag_t                          meta;
-    ngx_msec_t                          sync;
-    ngx_msec_t                          idle_timeout;
-    ngx_flag_t                          atc;
-    ngx_flag_t                          interleave;
-    ngx_flag_t                          wait_key;
-    ngx_flag_t                          wait_video;
-    ngx_flag_t                          publish_notify;
-    ngx_flag_t                          play_restart;
-    ngx_flag_t                          idle_streams;
-    ngx_msec_t                          buflen;
-    ngx_pool_t                         *pool;
-    ngx_rtmp_live_stream_t             *free_streams;
-} ngx_rtmp_live_app_conf_t;
-
-
-extern ngx_module_t  ngx_rtmp_live_module;
-
-
-#endif /* _NGX_RTMP_LIVE_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_log_module.c b/debian/modules/rtmp/ngx_rtmp_log_module.c
deleted file mode 100644
index 81016d0..0000000
--- a/debian/modules/rtmp/ngx_rtmp_log_module.c
+++ /dev/null
@@ -1,1016 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_cmd_module.h"
-
-
-static ngx_rtmp_publish_pt  next_publish;
-static ngx_rtmp_play_pt     next_play;
-
-
-static ngx_int_t ngx_rtmp_log_postconfiguration(ngx_conf_t *cf);
-static void *ngx_rtmp_log_create_main_conf(ngx_conf_t *cf);
-static void * ngx_rtmp_log_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_log_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-static char * ngx_rtmp_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static char * ngx_rtmp_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static char * ngx_rtmp_log_compile_format(ngx_conf_t *cf, ngx_array_t *ops,
-       ngx_array_t *args, ngx_uint_t s);
-
-
-typedef struct ngx_rtmp_log_op_s ngx_rtmp_log_op_t;
-
-
-typedef size_t (*ngx_rtmp_log_op_getlen_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_log_op_t *op);
-typedef u_char * (*ngx_rtmp_log_op_getdata_pt)(ngx_rtmp_session_t *s,
-        u_char *buf, ngx_rtmp_log_op_t *log);
-
-
-struct ngx_rtmp_log_op_s {
-    ngx_rtmp_log_op_getlen_pt   getlen;
-    ngx_rtmp_log_op_getdata_pt  getdata;
-    ngx_str_t                   value;
-    ngx_uint_t                  offset;
-};
-
-
-typedef struct {
-    ngx_str_t                   name;
-    ngx_rtmp_log_op_getlen_pt   getlen;
-    ngx_rtmp_log_op_getdata_pt  getdata;
-    ngx_uint_t                  offset;
-} ngx_rtmp_log_var_t;
-
-
-typedef struct {
-    ngx_str_t                   name;
-    ngx_array_t                *ops; /* ngx_rtmp_log_op_t */
-} ngx_rtmp_log_fmt_t;
-
-
-typedef struct {
-    ngx_open_file_t            *file;
-    time_t                      disk_full_time;
-    time_t                      error_log_time;
-    ngx_rtmp_log_fmt_t *format;
-} ngx_rtmp_log_t;
-
-
-typedef struct {
-    ngx_array_t                *logs; /* ngx_rtmp_log_t */
-    ngx_uint_t                  off;
-} ngx_rtmp_log_app_conf_t;
-
-
-typedef struct {
-    ngx_array_t                 formats; /* ngx_rtmp_log_fmt_t */
-    ngx_uint_t                  combined_used;
-} ngx_rtmp_log_main_conf_t;
-
-
-typedef struct {
-    unsigned                    play:1;
-    unsigned                    publish:1;
-    u_char                      name[NGX_RTMP_MAX_NAME];
-    u_char                      args[NGX_RTMP_MAX_ARGS];
-} ngx_rtmp_log_ctx_t;
-
-
-static ngx_str_t ngx_rtmp_access_log = ngx_string(NGX_HTTP_LOG_PATH);
-
-
-static ngx_command_t  ngx_rtmp_log_commands[] = {
-
-    { ngx_string("access_log"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE12,
-      ngx_rtmp_log_set_log,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("log_format"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_2MORE,
-      ngx_rtmp_log_set_format,
-      NGX_RTMP_MAIN_CONF_OFFSET,
-      0,
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_log_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_log_postconfiguration,         /* postconfiguration */
-    ngx_rtmp_log_create_main_conf,          /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    ngx_rtmp_log_create_app_conf,           /* create app configuration */
-    ngx_rtmp_log_merge_app_conf             /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_log_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_log_module_ctx,               /* module context */
-    ngx_rtmp_log_commands,                  /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_str_t ngx_rtmp_combined_fmt =
-    ngx_string("$remote_addr [$time_local] $command "
-               "\"$app\" \"$name\" \"$args\" - "
-               "$bytes_received $bytes_sent "
-               "\"$pageurl\" \"$flashver\" ($session_readable_time)");
-
-
-static size_t
-ngx_rtmp_log_var_default_getlen(ngx_rtmp_session_t *s, ngx_rtmp_log_op_t *op)
-{
-    return op->value.len;
-}
-
-
-static u_char *
-ngx_rtmp_log_var_default_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    return ngx_cpymem(buf, op->value.data, op->value.len);
-}
-
-
-static size_t
-ngx_rtmp_log_var_connection_getlen(ngx_rtmp_session_t *s, ngx_rtmp_log_op_t *op)
-{
-    return NGX_INT_T_LEN;
-}
-
-static u_char *
-ngx_rtmp_log_var_connection_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    return ngx_sprintf(buf, "%ui", (ngx_uint_t) s->connection->number);
-}
-
-
-static size_t
-ngx_rtmp_log_var_remote_addr_getlen(ngx_rtmp_session_t *s,
-    ngx_rtmp_log_op_t *op)
-{
-    return s->connection->addr_text.len;
-}
-
-
-static u_char *
-ngx_rtmp_log_var_remote_addr_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    return ngx_cpymem(buf, s->connection->addr_text.data,
-                           s->connection->addr_text.len);
-}
-
-
-static size_t
-ngx_rtmp_log_var_msec_getlen(ngx_rtmp_session_t *s,
-    ngx_rtmp_log_op_t *op)
-{
-    return NGX_TIME_T_LEN + 4;
-}
-
-
-static u_char *
-ngx_rtmp_log_var_msec_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    ngx_time_t  *tp;
-
-    tp = ngx_timeofday();
-    
-    return ngx_sprintf(buf, "%T.%03M", tp->sec, tp->msec);
-}
-
-
-static size_t
-ngx_rtmp_log_var_session_string_getlen(ngx_rtmp_session_t *s,
-    ngx_rtmp_log_op_t *op)
-{
-    return ((ngx_str_t *) ((u_char *) s + op->offset))->len;
-}
-
-
-static u_char *
-ngx_rtmp_log_var_session_string_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    ngx_str_t  *str;
-
-    str = (ngx_str_t *) ((u_char *) s + op->offset);
-
-    return ngx_cpymem(buf, str->data, str->len);
-}
-
-
-static size_t
-ngx_rtmp_log_var_command_getlen(ngx_rtmp_session_t *s,
-    ngx_rtmp_log_op_t *op)
-{
-    return sizeof("PLAY+PUBLISH") - 1;
-}
-
-
-static u_char *
-ngx_rtmp_log_var_command_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    ngx_rtmp_log_ctx_t *ctx;
-    ngx_str_t          *cmd;
-    ngx_uint_t          n;
-
-    static ngx_str_t    commands[] = {
-        ngx_string("NONE"),
-        ngx_string("PLAY"),
-        ngx_string("PUBLISH"),
-        ngx_string("PLAY+PUBLISH")
-    };
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_log_module);
-
-    n = ctx ? (ctx->play + ctx->publish * 2) : 0;
-
-    cmd = &commands[n];
-
-    return ngx_cpymem(buf, cmd->data, cmd->len);
-}
-
-
-static size_t
-ngx_rtmp_log_var_context_cstring_getlen(ngx_rtmp_session_t *s,
-    ngx_rtmp_log_op_t *op)
-{
-    return ngx_max(NGX_RTMP_MAX_NAME, NGX_RTMP_MAX_ARGS);
-}
-
-
-static u_char *
-ngx_rtmp_log_var_context_cstring_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    ngx_rtmp_log_ctx_t *ctx;
-    u_char             *p;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_log_module);
-    if (ctx == NULL) {
-        return buf;
-    }
-
-    p = (u_char *) ctx + op->offset;
-    while (*p) {
-        *buf++ = *p++;
-    }
-
-    return buf;
-}
-
-
-static size_t
-ngx_rtmp_log_var_session_uint32_getlen(ngx_rtmp_session_t *s,
-    ngx_rtmp_log_op_t *op)
-{
-    return NGX_INT32_LEN;
-}
-
-
-static u_char *
-ngx_rtmp_log_var_session_uint32_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    uint32_t   *v;
-
-    v = (uint32_t *) ((uint8_t *) s + op->offset);
-
-    return ngx_sprintf(buf, "%uD", *v);
-}
-
-
-static size_t
-ngx_rtmp_log_var_time_local_getlen(ngx_rtmp_session_t *s,
-    ngx_rtmp_log_op_t *op)
-{
-    return ngx_cached_http_log_time.len;
-}
-
-
-static u_char *
-ngx_rtmp_log_var_time_local_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    return ngx_cpymem(buf, ngx_cached_http_log_time.data,
-                      ngx_cached_http_log_time.len);
-}
-
-
-static size_t
-ngx_rtmp_log_var_session_time_getlen(ngx_rtmp_session_t *s,
-    ngx_rtmp_log_op_t *op)
-{
-    return NGX_INT64_LEN;
-}
-
-
-static u_char *
-ngx_rtmp_log_var_session_time_getdata(ngx_rtmp_session_t *s, u_char *buf,
-    ngx_rtmp_log_op_t *op)
-{
-    return ngx_sprintf(buf, "%L",
-                       (int64_t) (ngx_current_msec - s->epoch) / 1000);
-}
-
-
-static size_t
-ngx_rtmp_log_var_session_readable_time_getlen(ngx_rtmp_session_t *s,
-    ngx_rtmp_log_op_t *op)
-{
-    return NGX_INT_T_LEN + sizeof("d 23h 59m 59s") - 1;
-}
-
-
-static u_char *
-ngx_rtmp_log_var_session_readable_time_getdata(ngx_rtmp_session_t *s,
-    u_char *buf, ngx_rtmp_log_op_t *op)
-{
-    int64_t     v;
-    ngx_uint_t  days, hours, minutes, seconds;
-
-    v = (ngx_current_msec - s->epoch) / 1000;
-
-    days = (ngx_uint_t) (v / (60 * 60 * 24));
-    hours = (ngx_uint_t) (v / (60 * 60) % 24);
-    minutes = (ngx_uint_t) (v / 60 % 60);
-    seconds = (ngx_uint_t) (v % 60);
-
-    if (days) {
-        buf = ngx_sprintf(buf, "%uid ", days);
-    }
-
-    if (days || hours) {
-        buf = ngx_sprintf(buf, "%uih ", hours);
-    }
-
-    if (days || hours || minutes) {
-        buf = ngx_sprintf(buf, "%uim ", minutes);
-    }
-
-    buf = ngx_sprintf(buf, "%uis", seconds);
-
-    return buf;
-}
-
-
-static ngx_rtmp_log_var_t ngx_rtmp_log_vars[] = {
-    { ngx_string("connection"),
-      ngx_rtmp_log_var_connection_getlen,
-      ngx_rtmp_log_var_connection_getdata,
-      0 },
-
-    { ngx_string("remote_addr"),
-      ngx_rtmp_log_var_remote_addr_getlen,
-      ngx_rtmp_log_var_remote_addr_getdata,
-      0 },
-
-    { ngx_string("app"),
-      ngx_rtmp_log_var_session_string_getlen,
-      ngx_rtmp_log_var_session_string_getdata,
-      offsetof(ngx_rtmp_session_t, app) },
-
-    { ngx_string("flashver"),
-      ngx_rtmp_log_var_session_string_getlen,
-      ngx_rtmp_log_var_session_string_getdata,
-      offsetof(ngx_rtmp_session_t, flashver) },
-
-    { ngx_string("swfurl"),
-      ngx_rtmp_log_var_session_string_getlen,
-      ngx_rtmp_log_var_session_string_getdata,
-      offsetof(ngx_rtmp_session_t, swf_url) },
-
-    { ngx_string("tcurl"),
-      ngx_rtmp_log_var_session_string_getlen,
-      ngx_rtmp_log_var_session_string_getdata,
-      offsetof(ngx_rtmp_session_t, tc_url) },
-
-    { ngx_string("pageurl"),
-      ngx_rtmp_log_var_session_string_getlen,
-      ngx_rtmp_log_var_session_string_getdata,
-      offsetof(ngx_rtmp_session_t, page_url) },
-
-    { ngx_string("command"),
-      ngx_rtmp_log_var_command_getlen,
-      ngx_rtmp_log_var_command_getdata,
-      0 },
-
-    { ngx_string("name"),
-      ngx_rtmp_log_var_context_cstring_getlen,
-      ngx_rtmp_log_var_context_cstring_getdata,
-      offsetof(ngx_rtmp_log_ctx_t, name) },
-
-    { ngx_string("args"),
-      ngx_rtmp_log_var_context_cstring_getlen,
-      ngx_rtmp_log_var_context_cstring_getdata,
-      offsetof(ngx_rtmp_log_ctx_t, args) },
-
-    { ngx_string("bytes_sent"),
-      ngx_rtmp_log_var_session_uint32_getlen,
-      ngx_rtmp_log_var_session_uint32_getdata,
-      offsetof(ngx_rtmp_session_t, out_bytes) },
-
-    { ngx_string("bytes_received"),
-      ngx_rtmp_log_var_session_uint32_getlen,
-      ngx_rtmp_log_var_session_uint32_getdata,
-      offsetof(ngx_rtmp_session_t, in_bytes) },
-
-    { ngx_string("time_local"),
-      ngx_rtmp_log_var_time_local_getlen,
-      ngx_rtmp_log_var_time_local_getdata,
-      0 },
-
-    { ngx_string("msec"),
-      ngx_rtmp_log_var_msec_getlen,
-      ngx_rtmp_log_var_msec_getdata,
-      0 },
-
-    { ngx_string("session_time"),
-      ngx_rtmp_log_var_session_time_getlen,
-      ngx_rtmp_log_var_session_time_getdata,
-      0 },
-
-    { ngx_string("session_readable_time"),
-      ngx_rtmp_log_var_session_readable_time_getlen,
-      ngx_rtmp_log_var_session_readable_time_getdata,
-      0 },
-
-    { ngx_null_string, NULL, NULL, 0 }
-};
-
-
-static void *
-ngx_rtmp_log_create_main_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_log_main_conf_t   *lmcf;
-    ngx_rtmp_log_fmt_t         *fmt;
-
-    lmcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_log_main_conf_t));
-    if (lmcf == NULL) {
-        return NULL;
-    }
-
-    if (ngx_array_init(&lmcf->formats, cf->pool, 4, sizeof(ngx_rtmp_log_fmt_t))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-    fmt = ngx_array_push(&lmcf->formats);
-    if (fmt == NULL) {
-        return NULL;
-    }
-
-    ngx_str_set(&fmt->name, "combined");
-
-    fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_rtmp_log_op_t));
-    if (fmt->ops == NULL) {
-        return NULL;
-    }
-
-    return lmcf;
-
-}
-
-
-static void *
-ngx_rtmp_log_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_log_app_conf_t *lacf;
-
-    lacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_log_app_conf_t));
-    if (lacf == NULL) {
-        return NULL;
-    }
-
-    return lacf;
-}
-
-
-static char *
-ngx_rtmp_log_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_log_app_conf_t    *prev = parent;
-    ngx_rtmp_log_app_conf_t    *conf = child;
-    ngx_rtmp_log_main_conf_t   *lmcf;
-    ngx_rtmp_log_fmt_t         *fmt;
-    ngx_rtmp_log_t             *log;
-
-    if (conf->logs || conf->off) {
-        return NGX_OK;
-    }
-
-    conf->logs = prev->logs;
-    conf->off = prev->off;
-
-    if (conf->logs || conf->off) {
-        return NGX_OK;
-    }
-
-    conf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_rtmp_log_t));
-    if (conf->logs == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    log = ngx_array_push(conf->logs);
-    if (log == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    log->file = ngx_conf_open_file(cf->cycle, &ngx_rtmp_access_log);
-    if (log->file == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    log->disk_full_time = 0;
-    log->error_log_time = 0;
-
-    lmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_log_module);
-    fmt = lmcf->formats.elts;
-
-    log->format = &fmt[0];
-    lmcf->combined_used = 1;
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_rtmp_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_rtmp_log_app_conf_t    *lacf = conf;
-
-    ngx_rtmp_log_main_conf_t   *lmcf;
-    ngx_rtmp_log_fmt_t         *fmt;
-    ngx_rtmp_log_t             *log;
-    ngx_str_t                  *value, name;
-    ngx_uint_t                  n;
-
-    value = cf->args->elts;
-
-    if (ngx_strcmp(value[1].data, "off") == 0) {
-        lacf->off = 1;
-        return NGX_CONF_OK;
-    }
-
-    if (lacf->logs == NULL) {
-        lacf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_rtmp_log_t));
-        if (lacf->logs == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    log = ngx_array_push(lacf->logs);
-    if (log == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_memzero(log, sizeof(*log));
-
-    lmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_log_module);
-
-    log->file = ngx_conf_open_file(cf->cycle, &value[1]);
-    if (log->file == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (cf->args->nelts == 2) {
-        ngx_str_set(&name, "combined");
-        lmcf->combined_used = 1;
-
-    } else {
-        name = value[2];
-        if (ngx_strcmp(name.data, "combined") == 0) {
-            lmcf->combined_used = 1;
-        }
-    }
-
-    fmt = lmcf->formats.elts;
-    for (n = 0; n < lmcf->formats.nelts; ++n, ++fmt) {
-        if (fmt->name.len == name.len &&
-            ngx_strncasecmp(fmt->name.data, name.data, name.len) == 0)
-        {
-            log->format = fmt;
-            break;
-        }
-    }
-
-    if (log->format == NULL) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "unknown log format \"%V\"",
-                           &name);
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_rtmp_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_rtmp_log_main_conf_t   *lmcf = conf;
-    ngx_rtmp_log_fmt_t         *fmt;
-    ngx_str_t                  *value;
-    ngx_uint_t                  i;
-
-    value = cf->args->elts;
-
-    if (cf->cmd_type != NGX_RTMP_MAIN_CONF) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                           "\"log_format\" directive can only be used on "
-                           "\"rtmp\" level");
-    }
-
-    fmt = lmcf->formats.elts;
-    for (i = 0; i < lmcf->formats.nelts; i++) {
-        if (fmt[i].name.len == value[1].len &&
-            ngx_strcmp(fmt[i].name.data, value[1].data) == 0)
-        {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "duplicate \"log_format\" name \"%V\"",
-                               &value[1]);
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    fmt = ngx_array_push(&lmcf->formats);
-    if (fmt == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    fmt->name = value[1];
-
-    fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_rtmp_log_op_t));
-    if (fmt->ops == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    return ngx_rtmp_log_compile_format(cf, fmt->ops, cf->args, 2);
-}
-
-
-static char *
-ngx_rtmp_log_compile_format(ngx_conf_t *cf, ngx_array_t *ops, ngx_array_t *args,
-                            ngx_uint_t s)
-{
-    size_t              i, len;
-    u_char             *data, *d, c;
-    ngx_uint_t          bracket;
-    ngx_str_t          *value, var;
-    ngx_rtmp_log_op_t  *op;
-    ngx_rtmp_log_var_t *v;
-
-    value = args->elts;
-
-    for (; s < args->nelts; ++s) {
-        i = 0;
-
-        len = value[s].len;
-        d = value[s].data;
-
-        while (i < len) {
-
-            op = ngx_array_push(ops);
-            if (op == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            ngx_memzero(op, sizeof(*op));
-
-            data = &d[i];
-
-            if (d[i] == '$') {
-                if (++i == len) {
-                    goto invalid;
-                }
-
-                if (d[i] == '{') {
-                    bracket = 1;
-                    if (++i == len) {
-                        goto invalid;
-                    }
-                } else {
-                    bracket = 0;
-                }
-
-                var.data = &d[i];
-
-                for (var.len = 0; i < len; ++i, ++var.len) {
-                    c = d[i];
-
-                    if (c == '}' && bracket) {
-                        ++i;
-                        bracket = 0;
-                        break;
-                    }
-
-                    if ((c >= 'A' && c <= 'Z') ||
-                        (c >= 'a' && c <= 'z') ||
-                        (c >= '0' && c <= '9') ||
-                        (c == '_'))
-                    {
-                        continue;
-                    }
-
-                    break;
-                }
-
-                if (bracket) {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "missing closing bracket in \"%V\"",
-                                       &var);
-                    return NGX_CONF_ERROR;
-                }
-
-                if (var.len == 0) {
-                    goto invalid;
-                }
-
-                for (v = ngx_rtmp_log_vars; v->name.len; ++v) {
-                    if (v->name.len == var.len &&
-                        ngx_strncmp(v->name.data, var.data, var.len) == 0)
-                    {
-                        op->getlen = v->getlen;
-                        op->getdata = v->getdata;
-                        op->offset = v->offset;
-                        break;
-                    }
-                }
-
-                if (v->name.len == 0) {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "unknown variable \"%V\"", &var);
-                    return NGX_CONF_ERROR;
-                }
-
-                continue;
-            }
-
-            ++i;
-
-            while (i < len && d[i] != '$') {
-                ++i;
-            }
-
-            op->getlen = ngx_rtmp_log_var_default_getlen;
-            op->getdata = ngx_rtmp_log_var_default_getdata;
-
-            op->value.len = &d[i] - data;
-
-            op->value.data = ngx_pnalloc(cf->pool, op->value.len);
-            if (op->value.data == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            ngx_memcpy(op->value.data, data, op->value.len);
-        }
-    }
-
-    return NGX_CONF_OK;
-
-invalid:
-
-    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%s\"", data);
-
-    return NGX_CONF_ERROR;
-}
-
-
-static ngx_rtmp_log_ctx_t *
-ngx_rtmp_log_set_names(ngx_rtmp_session_t *s, u_char *name, u_char *args)
-{
-    ngx_rtmp_log_ctx_t *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_log_module);
-    if (ctx == NULL) {
-        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_log_ctx_t));
-        if (ctx == NULL) {
-            return NULL;
-        }
-
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_log_module);
-    }
-
-    ngx_memcpy(ctx->name, name, NGX_RTMP_MAX_NAME);
-    ngx_memcpy(ctx->args, args, NGX_RTMP_MAX_ARGS);
-
-    return ctx;
-}
-
-
-static ngx_int_t
-ngx_rtmp_log_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    ngx_rtmp_log_ctx_t *ctx;
-
-    if (s->auto_pushed || s->relay) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_log_set_names(s, v->name, v->args);
-    if (ctx == NULL) {
-        goto next;
-    }
-
-    ctx->publish = 1;
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_log_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    ngx_rtmp_log_ctx_t *ctx;
-
-    if (s->auto_pushed || s->relay) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_log_set_names(s, v->name, v->args);
-    if (ctx == NULL) {
-        goto next;
-    }
-
-    ctx->play = 1;
-
-next:
-    return next_play(s, v);
-}
-
-
-static void
-ngx_rtmp_log_write(ngx_rtmp_session_t *s, ngx_rtmp_log_t *log, u_char *buf,
-                   size_t len)
-{
-    u_char *name;
-    time_t  now;
-    ssize_t n;
-    int     err;
-
-    err = 0;
-    name = log->file->name.data;
-    n = ngx_write_fd(log->file->fd, buf, len);
-
-    if (n == (ssize_t) len) {
-        return;
-    }
-
-    now = ngx_time();
-
-    if (n == -1) {
-        err = ngx_errno;
-
-        if (err == NGX_ENOSPC) {
-            log->disk_full_time = now;
-        }
-
-        if (now - log->error_log_time > 59) {
-            ngx_log_error(NGX_LOG_ALERT, s->connection->log, err,
-                          ngx_write_fd_n " to \"%s\" failed", name);
-            log->error_log_time = now;
-        }
-    }
-
-    if (now - log->error_log_time > 59) {
-        ngx_log_error(NGX_LOG_ALERT, s->connection->log, err,
-                      ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz",
-                      name, n, len);
-        log->error_log_time = now;
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_log_disconnect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                        ngx_chain_t *in)
-{
-    ngx_rtmp_log_app_conf_t    *lacf;
-    ngx_rtmp_log_t             *log;
-    ngx_rtmp_log_op_t          *op;
-    ngx_uint_t                  n, i;
-    u_char                     *line, *p;
-    size_t                      len;
-
-    if (s->auto_pushed || s->relay) {
-        return NGX_OK;
-    }
-
-    lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_log_module);
-    if (lacf == NULL || lacf->off || lacf->logs == NULL) {
-        return NGX_OK;
-    }
-
-    log = lacf->logs->elts;
-    for (i = 0; i < lacf->logs->nelts; ++i, ++log) {
-
-        if (ngx_time() == log->disk_full_time) {
-            /* FreeBSD full disk protection;
-             * nginx http logger does the same */
-            continue;
-        }
-
-        len = 0;
-        op = log->format->ops->elts;
-        for (n = 0; n < log->format->ops->nelts; ++n, ++op) {
-            len += op->getlen(s, op);
-        }
-
-        len += NGX_LINEFEED_SIZE;
-
-        line = ngx_palloc(s->connection->pool, len);
-        if (line == NULL) {
-            return NGX_OK;
-        }
-
-        p = line;
-        op = log->format->ops->elts;
-        for (n = 0; n < log->format->ops->nelts; ++n, ++op) {
-            p = op->getdata(s, p, op);
-        }
-
-        ngx_linefeed(p);
-
-        ngx_rtmp_log_write(s, log, line, p - line);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_log_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t  *cmcf;
-    ngx_rtmp_handler_pt        *h;
-    ngx_rtmp_log_main_conf_t   *lmcf;
-    ngx_array_t                 a;
-    ngx_rtmp_log_fmt_t         *fmt;
-    ngx_str_t                  *value;
-
-    lmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_log_module);
-    if (lmcf->combined_used) {
-        if (ngx_array_init(&a, cf->pool, 1, sizeof(ngx_str_t)) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        value = ngx_array_push(&a);
-        if (value == NULL) {
-            return NGX_ERROR;
-        }
-
-        *value = ngx_rtmp_combined_fmt;
-        fmt = lmcf->formats.elts;
-
-        if (ngx_rtmp_log_compile_format(cf, fmt->ops, &a, 0)
-            != NGX_CONF_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
-    *h = ngx_rtmp_log_disconnect;
-
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_log_publish;
-
-    next_play = ngx_rtmp_play;
-    ngx_rtmp_play = ngx_rtmp_log_play;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_mp4_module.c b/debian/modules/rtmp/ngx_rtmp_mp4_module.c
deleted file mode 100644
index 0259ca2..0000000
--- a/debian/modules/rtmp/ngx_rtmp_mp4_module.c
+++ /dev/null
@@ -1,2591 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_play_module.h"
-#include "ngx_rtmp_codec_module.h"
-#include "ngx_rtmp_streams.h"
-
-
-static ngx_int_t ngx_rtmp_mp4_postconfiguration(ngx_conf_t *cf);
-static ngx_int_t ngx_rtmp_mp4_init(ngx_rtmp_session_t *s,  ngx_file_t *f,
-       ngx_int_t aindex, ngx_int_t vindex);
-static ngx_int_t ngx_rtmp_mp4_done(ngx_rtmp_session_t *s,  ngx_file_t *f);
-static ngx_int_t ngx_rtmp_mp4_start(ngx_rtmp_session_t *s, ngx_file_t *f);
-static ngx_int_t ngx_rtmp_mp4_seek(ngx_rtmp_session_t *s,  ngx_file_t *f,
-                                   ngx_uint_t offset);
-static ngx_int_t ngx_rtmp_mp4_stop(ngx_rtmp_session_t *s,  ngx_file_t *f);
-static ngx_int_t ngx_rtmp_mp4_send(ngx_rtmp_session_t *s,  ngx_file_t *f,
-                                   ngx_uint_t *ts);
-static ngx_int_t ngx_rtmp_mp4_reset(ngx_rtmp_session_t *s);
-
-
-#define NGX_RTMP_MP4_MAX_FRAMES         8
-
-
-#pragma pack(push,4)
-
-
-/* disable zero-sized array warning by msvc */
-
-#if (NGX_WIN32)
-#pragma warning(push)
-#pragma warning(disable:4200)
-#endif
-
-
-typedef struct {
-    uint32_t                            first_chunk;
-    uint32_t                            samples_per_chunk;
-    uint32_t                            sample_descrption_index;
-} ngx_rtmp_mp4_chunk_entry_t;
-
-
-typedef struct {
-    uint32_t                            version_flags;
-    uint32_t                            entry_count;
-    ngx_rtmp_mp4_chunk_entry_t          entries[0];
-} ngx_rtmp_mp4_chunks_t;
-
-
-typedef struct {
-    uint32_t                            sample_count;
-    uint32_t                            sample_delta;
-} ngx_rtmp_mp4_time_entry_t;
-
-
-typedef struct {
-    uint32_t                            version_flags;
-    uint32_t                            entry_count;
-    ngx_rtmp_mp4_time_entry_t           entries[0];
-} ngx_rtmp_mp4_times_t;
-
-
-typedef struct {
-    uint32_t                            sample_count;
-    uint32_t                            sample_offset;
-} ngx_rtmp_mp4_delay_entry_t;
-
-
-typedef struct {
-    uint32_t                            version_flags;
-    uint32_t                            entry_count;
-    ngx_rtmp_mp4_delay_entry_t          entries[0];
-} ngx_rtmp_mp4_delays_t;
-
-
-typedef struct {
-    uint32_t                            version_flags;
-    uint32_t                            entry_count;
-    uint32_t                            entries[0];
-} ngx_rtmp_mp4_keys_t;
-
-
-typedef struct {
-    uint32_t                            version_flags;
-    uint32_t                            sample_size;
-    uint32_t                            sample_count;
-    uint32_t                            entries[0];
-} ngx_rtmp_mp4_sizes_t;
-
-
-typedef struct {
-    uint32_t                            version_flags;
-    uint32_t                            field_size;
-    uint32_t                            sample_count;
-    uint32_t                            entries[0];
-} ngx_rtmp_mp4_sizes2_t;
-
-
-typedef struct {
-    uint32_t                            version_flags;
-    uint32_t                            entry_count;
-    uint32_t                            entries[0];
-} ngx_rtmp_mp4_offsets_t;
-
-
-typedef struct {
-    uint32_t                            version_flags;
-    uint32_t                            entry_count;
-    uint64_t                            entries[0];
-} ngx_rtmp_mp4_offsets64_t;
-
-
-#if (NGX_WIN32)
-#pragma warning(pop)
-#endif
-
-
-#pragma pack(pop)
-
-
-typedef struct {
-    uint32_t                            timestamp;
-    uint32_t                            last_timestamp;
-    off_t                               offset;
-    size_t                              size;
-    ngx_int_t                           key;
-    uint32_t                            delay;
-
-    unsigned                            not_first:1;
-    unsigned                            valid:1;
-
-    ngx_uint_t                          pos;
-
-    ngx_uint_t                          key_pos;
-
-    ngx_uint_t                          chunk;
-    ngx_uint_t                          chunk_pos;
-    ngx_uint_t                          chunk_count;
-
-    ngx_uint_t                          time_pos;
-    ngx_uint_t                          time_count;
-
-    ngx_uint_t                          delay_pos;
-    ngx_uint_t                          delay_count;
-
-    ngx_uint_t                          size_pos;
-} ngx_rtmp_mp4_cursor_t;
-
-
-typedef struct {
-    ngx_uint_t                          id;
-
-    ngx_int_t                           type;
-    ngx_int_t                           codec;
-    uint32_t                            csid;
-    u_char                              fhdr;
-    ngx_int_t                           time_scale;
-    uint64_t                            duration;
-
-    u_char                             *header;
-    size_t                              header_size;
-    unsigned                            header_sent:1;
-
-    ngx_rtmp_mp4_times_t               *times;
-    ngx_rtmp_mp4_delays_t              *delays;
-    ngx_rtmp_mp4_keys_t                *keys;
-    ngx_rtmp_mp4_chunks_t              *chunks;
-    ngx_rtmp_mp4_sizes_t               *sizes;
-    ngx_rtmp_mp4_sizes2_t              *sizes2;
-    ngx_rtmp_mp4_offsets_t             *offsets;
-    ngx_rtmp_mp4_offsets64_t           *offsets64;
-    ngx_rtmp_mp4_cursor_t               cursor;
-} ngx_rtmp_mp4_track_t;
-
-
-typedef struct {
-    void                               *mmaped;
-    size_t                              mmaped_size;
-    ngx_fd_t                            extra;
-
-    unsigned                            meta_sent:1;
-
-    ngx_rtmp_mp4_track_t                tracks[2];
-    ngx_rtmp_mp4_track_t               *track;
-    ngx_uint_t                          ntracks;
-
-    ngx_uint_t                          width;
-    ngx_uint_t                          height;
-    ngx_uint_t                          nchannels;
-    ngx_uint_t                          sample_size;
-    ngx_uint_t                          sample_rate;
-
-    ngx_int_t                           atracks, vtracks;
-    ngx_int_t                           aindex, vindex;
-
-    uint32_t                            start_timestamp, epoch;
-} ngx_rtmp_mp4_ctx_t;
-
-
-#define ngx_rtmp_mp4_make_tag(a, b, c, d)  \
-    ((uint32_t)d << 24 | (uint32_t)c << 16 | (uint32_t)b << 8 | (uint32_t)a)
-
-
-static ngx_inline uint32_t
-ngx_rtmp_mp4_to_rtmp_timestamp(ngx_rtmp_mp4_track_t *t, uint64_t ts)
-{
-    return (uint32_t) (ts * 1000 / t->time_scale);
-}
-
-
-static ngx_inline uint32_t
-ngx_rtmp_mp4_from_rtmp_timestamp(ngx_rtmp_mp4_track_t *t, uint32_t ts)
-{
-    return (uint64_t) ts * t->time_scale / 1000;
-}
-
-
-#define NGX_RTMP_MP4_BUFLEN_ADDON       1000
-
-
-static u_char                           ngx_rtmp_mp4_buffer[1024*1024];
-
-
-#if (NGX_WIN32)
-static void *
-ngx_rtmp_mp4_mmap(ngx_fd_t fd, size_t size, off_t offset, ngx_fd_t *extra)
-{
-    void           *data;
-
-    *extra = CreateFileMapping(fd, NULL, PAGE_READONLY,
-                               (DWORD) ((uint64_t) size >> 32),
-                               (DWORD) (size & 0xffffffff),
-                               NULL);
-    if (*extra == NULL) {
-        return NULL;
-    }
-
-    data = MapViewOfFile(*extra, FILE_MAP_READ,
-                         (DWORD) ((uint64_t) offset >> 32),
-                         (DWORD) (offset & 0xffffffff),
-                         size);
-
-    if (data == NULL) {
-        CloseHandle(*extra);
-    }
-
-    /*
-     * non-NULL result means map view handle is open
-     * and should be closed later
-     */
-
-    return data;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_munmap(void *data, size_t size, ngx_fd_t *extra)
-{
-    ngx_int_t  rc;
-
-    rc = NGX_OK;
-
-    if (UnmapViewOfFile(data) == 0) {
-        rc = NGX_ERROR;
-    }
-
-    if (CloseHandle(*extra) == 0) {
-        rc = NGX_ERROR;
-    }
-
-    return rc;
-}
-
-#else
-
-static void *
-ngx_rtmp_mp4_mmap(ngx_fd_t fd, size_t size, off_t offset, ngx_fd_t *extra)
-{
-    void  *data;
-
-    data = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, offset);
-
-    /* valid address is never NULL since there's no MAP_FIXED */
-
-    return data == MAP_FAILED ? NULL : data;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_munmap(void *data, size_t size, ngx_fd_t *extra)
-{
-    return munmap(data, size);
-}
-
-#endif
-
-
-static ngx_int_t ngx_rtmp_mp4_parse(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_trak(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_hdlr(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_stsd(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_stsc(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_stts(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_ctts(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_stss(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_stsz(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_stz2(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_stco(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_co64(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_avc1(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_avcC(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_mp4a(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_mp4v(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_esds(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_mp3(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_nmos(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_spex(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-
-
-typedef ngx_int_t (*ngx_rtmp_mp4_box_pt)(ngx_rtmp_session_t *s, u_char *pos,
-                                         u_char *last);
-
-typedef struct {
-    uint32_t                            tag;
-    ngx_rtmp_mp4_box_pt                 handler;
-} ngx_rtmp_mp4_box_t;
-
-
-static ngx_rtmp_mp4_box_t                       ngx_rtmp_mp4_boxes[] = {
-    { ngx_rtmp_mp4_make_tag('t','r','a','k'),   ngx_rtmp_mp4_parse_trak   },
-    { ngx_rtmp_mp4_make_tag('m','d','i','a'),   ngx_rtmp_mp4_parse        },
-    { ngx_rtmp_mp4_make_tag('m','d','h','d'),   ngx_rtmp_mp4_parse_mdhd   },
-    { ngx_rtmp_mp4_make_tag('h','d','l','r'),   ngx_rtmp_mp4_parse_hdlr   },
-    { ngx_rtmp_mp4_make_tag('m','i','n','f'),   ngx_rtmp_mp4_parse        },
-    { ngx_rtmp_mp4_make_tag('s','t','b','l'),   ngx_rtmp_mp4_parse        },
-    { ngx_rtmp_mp4_make_tag('s','t','s','d'),   ngx_rtmp_mp4_parse_stsd   },
-    { ngx_rtmp_mp4_make_tag('s','t','s','c'),   ngx_rtmp_mp4_parse_stsc   },
-    { ngx_rtmp_mp4_make_tag('s','t','t','s'),   ngx_rtmp_mp4_parse_stts   },
-    { ngx_rtmp_mp4_make_tag('c','t','t','s'),   ngx_rtmp_mp4_parse_ctts   },
-    { ngx_rtmp_mp4_make_tag('s','t','s','s'),   ngx_rtmp_mp4_parse_stss   },
-    { ngx_rtmp_mp4_make_tag('s','t','s','z'),   ngx_rtmp_mp4_parse_stsz   },
-    { ngx_rtmp_mp4_make_tag('s','t','z','2'),   ngx_rtmp_mp4_parse_stz2   },
-    { ngx_rtmp_mp4_make_tag('s','t','c','o'),   ngx_rtmp_mp4_parse_stco   },
-    { ngx_rtmp_mp4_make_tag('c','o','6','4'),   ngx_rtmp_mp4_parse_co64   },
-    { ngx_rtmp_mp4_make_tag('a','v','c','1'),   ngx_rtmp_mp4_parse_avc1   },
-    { ngx_rtmp_mp4_make_tag('a','v','c','C'),   ngx_rtmp_mp4_parse_avcC   },
-    { ngx_rtmp_mp4_make_tag('m','p','4','a'),   ngx_rtmp_mp4_parse_mp4a   },
-    { ngx_rtmp_mp4_make_tag('m','p','4','v'),   ngx_rtmp_mp4_parse_mp4v   },
-    { ngx_rtmp_mp4_make_tag('e','s','d','s'),   ngx_rtmp_mp4_parse_esds   },
-    { ngx_rtmp_mp4_make_tag('.','m','p','3'),   ngx_rtmp_mp4_parse_mp3    },
-    { ngx_rtmp_mp4_make_tag('n','m','o','s'),   ngx_rtmp_mp4_parse_nmos   },
-    { ngx_rtmp_mp4_make_tag('s','p','e','x'),   ngx_rtmp_mp4_parse_spex   },
-    { ngx_rtmp_mp4_make_tag('w','a','v','e'),   ngx_rtmp_mp4_parse        }
-};
-
-
-static ngx_int_t ngx_rtmp_mp4_parse_descr(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_es(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_dc(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-static ngx_int_t ngx_rtmp_mp4_parse_ds(ngx_rtmp_session_t *s, u_char *pos,
-       u_char *last);
-
-
-typedef ngx_int_t (*ngx_rtmp_mp4_descriptor_pt)(ngx_rtmp_session_t *s,
-                                                u_char *pos, u_char *last);
-
-typedef struct {
-    uint8_t                             tag;
-    ngx_rtmp_mp4_descriptor_pt          handler;
-} ngx_rtmp_mp4_descriptor_t;
-
-
-static ngx_rtmp_mp4_descriptor_t        ngx_rtmp_mp4_descriptors[] = {
-    { 0x03,   ngx_rtmp_mp4_parse_es   },    /* MPEG ES Descriptor */
-    { 0x04,   ngx_rtmp_mp4_parse_dc   },    /* MPEG DecoderConfig Descriptor */
-    { 0x05,   ngx_rtmp_mp4_parse_ds   }     /* MPEG DecoderSpec Descriptor */
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_mp4_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_mp4_postconfiguration,         /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    NULL,                                   /* create app configuration */
-    NULL                                    /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_mp4_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_mp4_module_ctx,               /* module context */
-    NULL,                                   /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_trak(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx->track) {
-        return NGX_OK;
-    }
-
-    ctx->track = (ctx->ntracks == sizeof(ctx->tracks) / sizeof(ctx->tracks[0]))
-                 ? NULL : &ctx->tracks[ctx->ntracks];
-
-    if (ctx->track) {
-        ngx_memzero(ctx->track, sizeof(*ctx->track));
-        ctx->track->id = ctx->ntracks;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: trying track %ui", ctx->ntracks);
-    }
-
-    if (ngx_rtmp_mp4_parse(s, pos, last) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    if (ctx->track && ctx->track->type &&
-        (ctx->ntracks == 0 ||
-         ctx->tracks[0].type != ctx->tracks[ctx->ntracks].type))
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: adding track %ui", ctx->ntracks);
-
-        if (ctx->track->type == NGX_RTMP_MSG_AUDIO) {
-            if (ctx->atracks++ != ctx->aindex) {
-                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "mp4: skipping audio track %ui!=%ui",
-                               ctx->atracks - 1, ctx->aindex);
-                ctx->track = NULL;
-                return NGX_OK;
-            }
-
-        } else {
-            if (ctx->vtracks++ != ctx->vindex) {
-                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "mp4: skipping video track %i!=%i",
-                               ctx->vtracks - 1, ctx->vindex);
-                ctx->track = NULL;
-                return NGX_OK;
-            }
-        }
-
-        ++ctx->ntracks;
-
-    } else {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: ignoring track %ui", ctx->ntracks);
-    }
-
-    ctx->track = NULL;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    ngx_rtmp_mp4_track_t       *t;
-    uint8_t                     version;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx->track == NULL) {
-        return NGX_OK;
-    }
-
-    t = ctx->track;
-
-    if (pos + 1 > last) {
-        return NGX_ERROR;
-    }
-
-    version = *(uint8_t *) pos;
-
-    switch (version) {
-        case 0:
-            if (pos + 20 > last) {
-                return NGX_ERROR;
-            }
-
-            pos += 12;
-            t->time_scale = ngx_rtmp_r32(*(uint32_t *) pos);
-            pos += 4;
-            t->duration = ngx_rtmp_r32(*(uint32_t *) pos);
-            break;
-
-        case 1:
-            if (pos + 28 > last) {
-                return NGX_ERROR;
-            }
-
-            pos += 20;
-            t->time_scale = ngx_rtmp_r32(*(uint32_t *) pos);
-            pos += 4;
-            t->duration = ngx_rtmp_r64(*(uint64_t *) pos);
-            break;
-
-        default:
-            return NGX_ERROR;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: duration time_scale=%ui duration=%uL",
-                   t->time_scale, t->duration);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_hdlr(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    uint32_t                    type;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx->track == NULL) {
-        return NGX_OK;
-    }
-
-    if (pos + 12 > last) {
-        return NGX_ERROR;
-    }
-
-    type = *(uint32_t *)(pos + 8);
-
-    if (type == ngx_rtmp_mp4_make_tag('v','i','d','e')) {
-        ctx->track->type = NGX_RTMP_MSG_VIDEO;
-        ctx->track->csid = NGX_RTMP_CSID_VIDEO;
-
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: video track");
-
-    } else if (type == ngx_rtmp_mp4_make_tag('s','o','u','n')) {
-        ctx->track->type = NGX_RTMP_MSG_AUDIO;
-        ctx->track->csid = NGX_RTMP_CSID_AUDIO;
-
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: audio track");
-    } else {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: unknown track");
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_video(ngx_rtmp_session_t *s, u_char *pos, u_char *last,
-                         ngx_int_t codec)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx->track == NULL) {
-        return NGX_OK;
-    }
-
-    ctx->track->codec = codec;
-
-    if (pos + 78 > last) {
-        return NGX_ERROR;
-    }
-
-    pos += 24;
-
-    ctx->width = ngx_rtmp_r16(*(uint16_t *) pos);
-
-    pos += 2;
-
-    ctx->height = ngx_rtmp_r16(*(uint16_t *) pos);
-
-    pos += 52;
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: video settings codec=%i, width=%ui, height=%ui",
-                   codec, ctx->width, ctx->height);
-
-    if (ngx_rtmp_mp4_parse(s, pos, last) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    ctx->track->fhdr = (u_char) ctx->track->codec;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_audio(ngx_rtmp_session_t *s, u_char *pos, u_char *last,
-                         ngx_int_t codec)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    u_char                     *p;
-    ngx_uint_t                  version;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx->track == NULL) {
-        return NGX_OK;
-    }
-
-    ctx->track->codec = codec;
-
-    if (pos + 28 > last) {
-        return NGX_ERROR;
-    }
-
-    pos += 8;
-
-    version = ngx_rtmp_r16(*(uint16_t *) pos);
-
-    pos += 8;
-
-    ctx->nchannels = ngx_rtmp_r16(*(uint16_t *) pos);
-
-    pos += 2;
-
-    ctx->sample_size = ngx_rtmp_r16(*(uint16_t *) pos);
-
-    pos += 6;
-
-    ctx->sample_rate = ngx_rtmp_r16(*(uint16_t *) pos);
-
-    pos += 4;
-
-    p = &ctx->track->fhdr;
-
-    *p = 0;
-
-    if (ctx->nchannels == 2) {
-        *p |= 0x01;
-    }
-
-    if (ctx->sample_size == 16) {
-        *p |= 0x02;
-    }
-
-    switch (ctx->sample_rate) {
-        case 5512:
-            break;
-
-        case 11025:
-            *p |= 0x04;
-            break;
-
-        case 22050:
-            *p |= 0x08;
-            break;
-
-        default:  /*44100 etc */
-            *p |= 0x0c;
-            break;
-    }
-
-    ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: audio settings version=%ui, codec=%i, nchannels==%ui, "
-                   "sample_size=%ui, sample_rate=%ui",
-                   version, codec, ctx->nchannels, ctx->sample_size,
-                   ctx->sample_rate);
-
-    switch (version) {
-        case 1:
-            pos += 16;
-            break;
-
-        case 2:
-            pos += 36;
-    }
-
-    if (pos > last) {
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_mp4_parse(s, pos, last) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    *p |= (ctx->track->codec << 4);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_avc1(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    return ngx_rtmp_mp4_parse_video(s, pos, last, NGX_RTMP_VIDEO_H264);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_mp4v(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    return ngx_rtmp_mp4_parse_video(s, pos, last, NGX_RTMP_VIDEO_H264);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_avcC(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-
-    if (pos == last) {
-        return NGX_OK;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx->track == NULL || ctx->track->codec != NGX_RTMP_VIDEO_H264) {
-        return NGX_OK;
-    }
-
-    ctx->track->header = pos;
-    ctx->track->header_size = (size_t) (last - pos);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: video h264 header size=%uz",
-                   ctx->track->header_size);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_mp4a(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    return ngx_rtmp_mp4_parse_audio(s, pos, last, NGX_RTMP_AUDIO_MP3);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_ds(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t     *ctx;
-    ngx_rtmp_mp4_track_t   *t;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    t = ctx->track;
-
-    if (t == NULL) {
-        return NGX_OK;
-    }
-
-    t->header = pos;
-    t->header_size = (size_t) (last - pos);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: decoder header size=%uz", t->header_size);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_dc(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    uint8_t                 id;
-    ngx_rtmp_mp4_ctx_t     *ctx;
-    ngx_int_t              *pc;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx->track == NULL) {
-        return NGX_OK;
-    }
-
-    if (pos + 13 > last) {
-        return NGX_ERROR;
-    }
-
-    id = * (uint8_t *) pos;
-    pos += 13;
-    pc = &ctx->track->codec;
-
-    switch (id) {
-        case 0x21:
-            *pc = NGX_RTMP_VIDEO_H264;
-            break;
-
-        case 0x40:
-        case 0x66:
-        case 0x67:
-        case 0x68:
-            *pc = NGX_RTMP_AUDIO_AAC;
-            break;
-
-        case 0x69:
-        case 0x6b:
-            *pc = NGX_RTMP_AUDIO_MP3;
-            break;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: decoder descriptor id=%i codec=%i",
-                   (ngx_int_t) id, *pc);
-
-    return ngx_rtmp_mp4_parse_descr(s, pos, last);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_es(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    uint16_t    id;
-    uint8_t     flags;
-
-    if (pos + 3 > last) {
-        return NGX_ERROR;
-    }
-
-    id = ngx_rtmp_r16(*(uint16_t *) pos);
-    pos += 2;
-
-    flags = *(uint8_t *) pos;
-    ++pos;
-
-    if (flags & 0x80) { /* streamDependenceFlag */
-        pos += 2;
-    }
-
-    if (flags & 0x40) { /* URL_FLag */
-        return NGX_OK;
-    }
-
-    if (flags & 0x20) { /* OCRstreamFlag */
-        pos += 2;
-    }
-
-    if (pos > last) {
-        return NGX_ERROR;
-    }
-
-    (void) id;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: es descriptor es id=%i flags=%i",
-                   (ngx_int_t) id, (ngx_int_t) flags);
-
-    return ngx_rtmp_mp4_parse_descr(s, pos, last);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_descr(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    uint8_t                     tag, v;
-    uint32_t                    size;
-    ngx_uint_t                  n, ndesc;
-    ngx_rtmp_mp4_descriptor_t   *ds;
-
-    ndesc = sizeof(ngx_rtmp_mp4_descriptors)
-          / sizeof(ngx_rtmp_mp4_descriptors[0]);
-
-    while (pos < last) {
-        tag = *(uint8_t *) pos++;
-
-        for (size = 0, n = 0; n < 4; ++n) {
-            if (pos == last) {
-                return NGX_ERROR;
-            }
-
-            v = *(uint8_t *) pos++;
-
-            size = (size << 7) | (v & 0x7f);
-
-            if (!(v & 0x80)) {
-                break;
-            }
-        }
-
-        if (pos + size > last) {
-            return NGX_ERROR;
-        }
-
-        ds = ngx_rtmp_mp4_descriptors;;
-
-        for (n = 0; n < ndesc; ++n, ++ds) {
-            if (tag == ds->tag) {
-                break;
-            }
-        }
-
-        if (n == ndesc) {
-            ds = NULL;
-        }
-
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "mp4: descriptor%s tag=%i size=%uD",
-                ds ? "" : " unhandled", (ngx_int_t) tag, size);
-
-        if (ds && ds->handler(s, pos, pos + size) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        pos += size;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_esds(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    if (pos + 4 > last) {
-        return NGX_ERROR;
-    }
-
-    pos += 4; /* version */
-
-    return ngx_rtmp_mp4_parse_descr(s, pos, last);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_mp3(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    return ngx_rtmp_mp4_parse_audio(s, pos, last, NGX_RTMP_AUDIO_MP3);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_nmos(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    return ngx_rtmp_mp4_parse_audio(s, pos, last, NGX_RTMP_AUDIO_NELLY);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_spex(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    return ngx_rtmp_mp4_parse_audio(s, pos, last, NGX_RTMP_AUDIO_SPEEX);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_stsd(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    if (pos + 8 > last) {
-        return NGX_ERROR;
-    }
-
-    pos += 8;
-
-    ngx_rtmp_mp4_parse(s, pos, last);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_stsc(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    ngx_rtmp_mp4_track_t       *t;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    t = ctx->track;
-
-    if (t == NULL) {
-        return NGX_OK;
-    }
-
-    t->chunks = (ngx_rtmp_mp4_chunks_t *) pos;
-
-    if (pos + sizeof(*t->chunks) + ngx_rtmp_r32(t->chunks->entry_count) *
-                                   sizeof(t->chunks->entries[0])
-        <= last)
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: chunks entries=%uD",
-                       ngx_rtmp_r32(t->chunks->entry_count));
-        return NGX_OK;
-    }
-
-    t->chunks = NULL;
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_stts(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    ngx_rtmp_mp4_track_t       *t;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    t = ctx->track;
-
-    if (t == NULL) {
-        return NGX_OK;
-    }
-
-    t->times = (ngx_rtmp_mp4_times_t *) pos;
-
-    if (pos + sizeof(*t->times) + ngx_rtmp_r32(t->times->entry_count) *
-                                  sizeof(t->times->entries[0])
-        <= last)
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: times entries=%uD",
-                       ngx_rtmp_r32(t->times->entry_count));
-        return NGX_OK;
-    }
-
-    t->times = NULL;
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_ctts(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    ngx_rtmp_mp4_track_t       *t;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    t = ctx->track;
-
-    if (t == NULL) {
-        return NGX_OK;
-    }
-
-    t->delays = (ngx_rtmp_mp4_delays_t *) pos;
-
-    if (pos + sizeof(*t->delays) + ngx_rtmp_r32(t->delays->entry_count) *
-                                   sizeof(t->delays->entries[0])
-        <= last)
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: delays entries=%uD",
-                       ngx_rtmp_r32(t->delays->entry_count));
-        return NGX_OK;
-    }
-
-    t->delays = NULL;
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_stss(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    ngx_rtmp_mp4_track_t       *t;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    t = ctx->track;
-
-    if (t == NULL) {
-        return NGX_OK;
-    }
-
-    t->keys = (ngx_rtmp_mp4_keys_t *) pos;
-
-    if (pos + sizeof(*t->keys) + ngx_rtmp_r32(t->keys->entry_count) *
-                                  sizeof(t->keys->entries[0])
-        <= last)
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: keys entries=%uD",
-                       ngx_rtmp_r32(t->keys->entry_count));
-        return NGX_OK;
-    }
-
-    t->keys = NULL;
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_stsz(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    ngx_rtmp_mp4_track_t       *t;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    t = ctx->track;
-
-    if (t == NULL) {
-        return NGX_OK;
-    }
-
-    t->sizes = (ngx_rtmp_mp4_sizes_t *) pos;
-
-    if (pos + sizeof(*t->sizes) <= last && t->sizes->sample_size) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: sizes size=%uD",
-                       ngx_rtmp_r32(t->sizes->sample_size));
-        return NGX_OK;
-    }
-
-    if (pos + sizeof(*t->sizes) + ngx_rtmp_r32(t->sizes->sample_count) *
-                                  sizeof(t->sizes->entries[0])
-        <= last)
-
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: sizes entries=%uD",
-                       ngx_rtmp_r32(t->sizes->sample_count));
-        return NGX_OK;
-    }
-
-    t->sizes = NULL;
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_stz2(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    ngx_rtmp_mp4_track_t       *t;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    t = ctx->track;
-
-    if (t == NULL) {
-        return NGX_OK;
-    }
-
-    t->sizes2 = (ngx_rtmp_mp4_sizes2_t *) pos;
-
-    if (pos + sizeof(*t->sizes) + ngx_rtmp_r32(t->sizes2->sample_count) *
-                                  ngx_rtmp_r32(t->sizes2->field_size) / 8
-        <= last)
-    {
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: sizes2 field_size=%uD entries=%uD",
-                       ngx_rtmp_r32(t->sizes2->field_size),
-                       ngx_rtmp_r32(t->sizes2->sample_count));
-        return NGX_OK;
-    }
-
-    t->sizes2 = NULL;
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_stco(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    ngx_rtmp_mp4_track_t       *t;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    t = ctx->track;
-
-    if (t == NULL) {
-        return NGX_OK;
-    }
-
-    t->offsets = (ngx_rtmp_mp4_offsets_t *) pos;
-
-    if (pos + sizeof(*t->offsets) + ngx_rtmp_r32(t->offsets->entry_count) *
-                                    sizeof(t->offsets->entries[0])
-        <= last)
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: offsets entries=%uD",
-                       ngx_rtmp_r32(t->offsets->entry_count));
-        return NGX_OK;
-    }
-
-    t->offsets = NULL;
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse_co64(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    ngx_rtmp_mp4_track_t       *t;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    t = ctx->track;
-
-    if (t == NULL) {
-        return NGX_OK;
-    }
-
-    t->offsets64 = (ngx_rtmp_mp4_offsets64_t *) pos;
-
-    if (pos + sizeof(*t->offsets64) + ngx_rtmp_r32(t->offsets64->entry_count) *
-                                      sizeof(t->offsets64->entries[0])
-        <= last)
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: offsets64 entries=%uD",
-                       ngx_rtmp_r32(t->offsets64->entry_count));
-        return NGX_OK;
-    }
-
-    t->offsets64 = NULL;
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_parse(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
-{
-    uint32_t                   *hdr, tag;
-    size_t                      size, nboxes;
-    ngx_uint_t                  n;
-    ngx_rtmp_mp4_box_t         *b;
-
-    while (pos != last) {
-        if (pos + 8 > last) {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: too small box: size=%i", last - pos);
-            return NGX_ERROR;
-        }
-
-        hdr = (uint32_t *) pos;
-        size = ngx_rtmp_r32(hdr[0]);
-        tag  = hdr[1];
-
-        if (pos + size > last) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                          "mp4: too big box '%*s': size=%uz",
-                          4, &tag, size);
-            return NGX_ERROR;
-        }
-
-        b = ngx_rtmp_mp4_boxes;
-        nboxes = sizeof(ngx_rtmp_mp4_boxes) / sizeof(ngx_rtmp_mp4_boxes[0]);
-
-        for (n = 0; n < nboxes && b->tag != tag; ++n, ++b);
-
-        if (n == nboxes) {
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: box unhandled '%*s'", 4, &tag);
-        } else {
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: box '%*s'", 4, &tag);
-            b->handler(s, pos + 8, pos + size);
-        }
-
-        pos += size;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_next_time(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t      *cr;
-    ngx_rtmp_mp4_time_entry_t  *te;
-
-    if (t->times == NULL) {
-        return NGX_ERROR;
-    }
-
-    cr = &t->cursor;
-
-    if (cr->time_pos >= ngx_rtmp_r32(t->times->entry_count)) {
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui time[%ui/%uD] overflow",
-                       t->id, cr->time_pos,
-                       ngx_rtmp_r32(t->times->entry_count));
-
-        return NGX_ERROR;
-    }
-
-    te = &t->times->entries[cr->time_pos];
-
-    cr->last_timestamp = cr->timestamp;
-    cr->timestamp += ngx_rtmp_r32(te->sample_delta);
-
-    cr->not_first = 1;
-
-    ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: track#%ui time[%ui] [%ui/%uD][%ui/%uD]=%uD t=%uD",
-                   t->id, cr->pos, cr->time_pos,
-                   ngx_rtmp_r32(t->times->entry_count),
-                   cr->time_count, ngx_rtmp_r32(te->sample_count),
-                   ngx_rtmp_r32(te->sample_delta),
-                   cr->timestamp);
-
-    cr->time_count++;
-    cr->pos++;
-
-    if (cr->time_count >= ngx_rtmp_r32(te->sample_count)) {
-        cr->time_pos++;
-        cr->time_count = 0;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_seek_time(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t,
-                       uint32_t timestamp)
-{
-    ngx_rtmp_mp4_cursor_t      *cr;
-    ngx_rtmp_mp4_time_entry_t  *te;
-    uint32_t                    dt;
-
-    if (t->times == NULL) {
-        return NGX_ERROR;
-    }
-
-    cr = &t->cursor;
-
-    te = t->times->entries;
-
-    while (cr->time_pos < ngx_rtmp_r32(t->times->entry_count)) {
-        dt = ngx_rtmp_r32(te->sample_delta) * ngx_rtmp_r32(te->sample_count);
-
-        if (cr->timestamp + dt >= timestamp) {
-            if (te->sample_delta == 0) {
-                return NGX_ERROR;
-            }
-
-            cr->time_count = (timestamp - cr->timestamp) /
-                             ngx_rtmp_r32(te->sample_delta);
-            cr->timestamp += ngx_rtmp_r32(te->sample_delta) * cr->time_count;
-            cr->pos += cr->time_count;
-
-            break;
-        }
-
-        cr->timestamp += dt;
-        cr->pos += ngx_rtmp_r32(te->sample_count);
-        cr->time_pos++;
-        te++;
-    }
-
-    if (cr->time_pos >= ngx_rtmp_r32(t->times->entry_count)) {
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui seek time[%ui/%uD] overflow",
-                       t->id, cr->time_pos,
-                       ngx_rtmp_r32(t->times->entry_count));
-
-        return  NGX_ERROR;
-    }
-
-    ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: track#%ui seek time[%ui] [%ui/%uD][%ui/%uD]=%uD "
-                   "t=%uD",
-                   t->id, cr->pos, cr->time_pos,
-                   ngx_rtmp_r32(t->times->entry_count),
-                   cr->time_count,
-                   ngx_rtmp_r32(te->sample_count),
-                   ngx_rtmp_r32(te->sample_delta),
-                   cr->timestamp);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_update_offset(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t          *cr;
-    ngx_uint_t                      chunk;
-
-    cr = &t->cursor;
-
-    if (cr->chunk < 1) {
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui offset[%ui] underflow",
-                       t->id, cr->chunk);
-        return NGX_ERROR;
-    }
-
-    chunk = cr->chunk - 1;
-
-    if (t->offsets) {
-        if (chunk >= ngx_rtmp_r32(t->offsets->entry_count)) {
-            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: track#%ui offset[%ui/%uD] overflow",
-                           t->id, cr->chunk,
-                           ngx_rtmp_r32(t->offsets->entry_count));
-
-            return NGX_ERROR;
-        }
-
-        cr->offset = (off_t) ngx_rtmp_r32(t->offsets->entries[chunk]);
-        cr->size = 0;
-
-        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui offset[%ui/%uD]=%O",
-                       t->id, cr->chunk,
-                       ngx_rtmp_r32(t->offsets->entry_count),
-                       cr->offset);
-
-        return NGX_OK;
-    }
-
-    if (t->offsets64) {
-        if (chunk >= ngx_rtmp_r32(t->offsets64->entry_count)) {
-            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: track#%ui offset64[%ui/%uD] overflow",
-                           t->id, cr->chunk,
-                           ngx_rtmp_r32(t->offsets->entry_count));
-
-            return NGX_ERROR;
-        }
-
-        cr->offset = (off_t) ngx_rtmp_r64(t->offsets64->entries[chunk]);
-        cr->size = 0;
-
-        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui offset64[%ui/%uD]=%O",
-                       t->id, cr->chunk,
-                       ngx_rtmp_r32(t->offsets->entry_count),
-                       cr->offset);
-
-        return NGX_OK;
-    }
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_next_chunk(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t          *cr;
-    ngx_rtmp_mp4_chunk_entry_t     *ce, *nce;
-    ngx_int_t                       new_chunk;
-
-    if (t->chunks == NULL) {
-        return NGX_OK;
-    }
-
-    cr = &t->cursor;
-
-    if (cr->chunk_pos >= ngx_rtmp_r32(t->chunks->entry_count)) {
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui chunk[%ui/%uD] overflow",
-                       t->id, cr->chunk_pos,
-                       ngx_rtmp_r32(t->chunks->entry_count));
-
-        return NGX_ERROR;
-    }
-
-    ce = &t->chunks->entries[cr->chunk_pos];
-
-    cr->chunk_count++;
-
-    if (cr->chunk_count >= ngx_rtmp_r32(ce->samples_per_chunk)) {
-        cr->chunk_count = 0;
-        cr->chunk++;
-
-        if (cr->chunk_pos + 1 < ngx_rtmp_r32(t->chunks->entry_count)) {
-            nce = ce + 1;
-            if (cr->chunk >= ngx_rtmp_r32(nce->first_chunk)) {
-                cr->chunk_pos++;
-                ce = nce;
-            }
-        }
-
-        new_chunk = 1;
-
-    } else {
-        new_chunk = 0;
-    }
-
-    ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: track#%ui chunk[%ui/%uD][%uD..%ui][%ui/%uD]",
-                   t->id, cr->chunk_pos,
-                   ngx_rtmp_r32(t->chunks->entry_count),
-                   ngx_rtmp_r32(ce->first_chunk),
-                   cr->chunk, cr->chunk_count,
-                   ngx_rtmp_r32(ce->samples_per_chunk));
-
-
-    if (new_chunk) {
-        return ngx_rtmp_mp4_update_offset(s, t);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_seek_chunk(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t          *cr;
-    ngx_rtmp_mp4_chunk_entry_t     *ce, *nce;
-    ngx_uint_t                      pos, dpos, dchunk;
-
-    cr = &t->cursor;
-
-    if (t->chunks == NULL || t->chunks->entry_count == 0) {
-        cr->chunk = 1;
-        return NGX_OK;
-    }
-
-    ce = t->chunks->entries;
-    pos = 0;
-
-    while (cr->chunk_pos + 1 < ngx_rtmp_r32(t->chunks->entry_count)) {
-        nce = ce + 1;
-
-        dpos = (ngx_rtmp_r32(nce->first_chunk) -
-                ngx_rtmp_r32(ce->first_chunk)) *
-                ngx_rtmp_r32(ce->samples_per_chunk);
-
-        if (pos + dpos > cr->pos) {
-            break;
-        }
-
-        pos += dpos;
-        ce++;
-        cr->chunk_pos++;
-    }
-
-    if (ce->samples_per_chunk == 0) {
-        return NGX_ERROR;
-    }
-
-    dchunk = (cr->pos - pos) / ngx_rtmp_r32(ce->samples_per_chunk);
-
-    cr->chunk = ngx_rtmp_r32(ce->first_chunk) + dchunk;
-    cr->chunk_pos = (ngx_uint_t) (ce - t->chunks->entries);
-    cr->chunk_count = (ngx_uint_t) (cr->pos - pos - dchunk *
-                                    ngx_rtmp_r32(ce->samples_per_chunk));
-
-    ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: track#%ui seek chunk[%ui/%uD][%uD..%ui][%ui/%uD]",
-                   t->id, cr->chunk_pos,
-                   ngx_rtmp_r32(t->chunks->entry_count),
-                   ngx_rtmp_r32(ce->first_chunk),
-                   cr->chunk, cr->chunk_count,
-                   ngx_rtmp_r32(ce->samples_per_chunk));
-
-    return ngx_rtmp_mp4_update_offset(s, t);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_next_size(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t          *cr;
-
-    cr = &t->cursor;
-
-    cr->offset += cr->size;
-
-    if (t->sizes) {
-        if (t->sizes->sample_size) {
-            cr->size = ngx_rtmp_r32(t->sizes->sample_size);
-
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: track#%ui size fix=%uz",
-                           t->id, cr->size);
-
-            return NGX_OK;
-        }
-
-        cr->size_pos++;
-
-        if (cr->size_pos >= ngx_rtmp_r32(t->sizes->sample_count)) {
-            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: track#%ui size[%ui/%uD] overflow",
-                           t->id, cr->size_pos,
-                           ngx_rtmp_r32(t->sizes->sample_count));
-
-            return NGX_ERROR;
-        }
-
-        cr->size = ngx_rtmp_r32(t->sizes->entries[cr->size_pos]);
-
-        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui size[%ui/%uD]=%uz",
-                       t->id, cr->size_pos,
-                       ngx_rtmp_r32(t->sizes->sample_count),
-                       cr->size);
-
-        return NGX_OK;
-    }
-
-    if (t->sizes2) {
-        if (cr->size_pos >= ngx_rtmp_r32(t->sizes2->sample_count)) {
-            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: track#%ui size[%ui/%uD] overflow",
-                           t->id, cr->size_pos,
-                           ngx_rtmp_r32(t->sizes2->sample_count));
-
-            return NGX_ERROR;
-        }
-
-        /*TODO*/
-
-        return NGX_OK;
-    }
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_seek_size(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t      *cr;
-    ngx_uint_t                  pos;
-
-    cr = &t->cursor;
-
-    if (cr->chunk_count > cr->pos) {
-        return NGX_ERROR;
-    }
-
-    if (t->sizes) {
-        if (t->sizes->sample_size) {
-            cr->size = ngx_rtmp_r32(t->sizes->sample_size);
-
-            cr->offset += cr->size * cr->chunk_count;
-
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: track#%ui seek size fix=%uz",
-                           t->id, cr->size);
-
-            return NGX_OK;
-        }
-
-        if (cr->pos >= ngx_rtmp_r32(t->sizes->sample_count)) {
-            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: track#%ui seek size[%ui/%uD] overflow",
-                           t->id, cr->pos,
-                           ngx_rtmp_r32(t->sizes->sample_count));
-
-            return NGX_ERROR;
-        }
-
-        for (pos = 1; pos <= cr->chunk_count; ++pos) {
-            cr->offset += ngx_rtmp_r32(t->sizes->entries[cr->pos - pos]);
-        }
-
-        cr->size_pos = cr->pos;
-        cr->size = ngx_rtmp_r32(t->sizes->entries[cr->size_pos]);
-
-        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui seek size[%ui/%uD]=%uz",
-                       t->id, cr->size_pos,
-                       ngx_rtmp_r32(t->sizes->sample_count),
-                       cr->size);
-
-        return NGX_OK;
-    }
-
-    if (t->sizes2) {
-        if (cr->size_pos >= ngx_rtmp_r32(t->sizes2->sample_count)) {
-            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: track#%ui seek size2[%ui/%uD] overflow",
-                           t->id, cr->size_pos,
-                           ngx_rtmp_r32(t->sizes->sample_count));
-
-            return NGX_ERROR;
-        }
-
-        cr->size_pos = cr->pos;
-
-        /* TODO */
-        return NGX_OK;
-    }
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_next_key(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t          *cr;
-    uint32_t                       *ke;
-
-    cr = &t->cursor;
-
-    if (t->keys == NULL) {
-        return NGX_OK;
-    }
-
-    if (cr->key) {
-        cr->key_pos++;
-    }
-
-    if (cr->key_pos >= ngx_rtmp_r32(t->keys->entry_count)) {
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "mp4: track#%ui key[%ui/%uD] overflow",
-                t->id, cr->key_pos,
-                ngx_rtmp_r32(t->keys->entry_count));
-
-        cr->key = 0;
-
-        return NGX_OK;
-    }
-
-    ke = &t->keys->entries[cr->key_pos];
-    cr->key = (cr->pos + 1 == ngx_rtmp_r32(*ke));
-
-    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: track#%ui key[%ui/%uD][%ui/%uD]=%s",
-                   t->id, cr->key_pos,
-                   ngx_rtmp_r32(t->keys->entry_count),
-                   cr->pos, ngx_rtmp_r32(*ke),
-                   cr->key ? "match" : "miss");
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_seek_key(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t      *cr;
-    uint32_t                   *ke;
-    ngx_int_t                   dpos;
-
-    cr = &t->cursor;
-
-    if (t->keys == NULL) {
-        return NGX_OK;
-    }
-
-    while (cr->key_pos < ngx_rtmp_r32(t->keys->entry_count)) {
-        if (ngx_rtmp_r32(t->keys->entries[cr->key_pos]) > cr->pos) {
-            break;
-        }
-
-        cr->key_pos++;
-    }
-
-    if (cr->key_pos >= ngx_rtmp_r32(t->keys->entry_count)) {
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "mp4: track#%ui seek key[%ui/%uD] overflow",
-                t->id, cr->key_pos,
-                ngx_rtmp_r32(t->keys->entry_count));
-        return NGX_OK;
-    }
-
-    ke = &t->keys->entries[cr->key_pos];
-    /*cr->key = (cr->pos + 1 == ngx_rtmp_r32(*ke));*/
-
-    /* distance to the next keyframe */
-    dpos = ngx_rtmp_r32(*ke) - cr->pos - 1;
-    cr->key = 1;
-
-    /* TODO: range version needed */
-    for (; dpos > 0; --dpos) {
-        ngx_rtmp_mp4_next_time(s, t);
-    }
-
-/*    cr->key = (cr->pos + 1 == ngx_rtmp_r32(*ke));*/
-
-    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: track#%ui seek key[%ui/%uD][%ui/%uD]=%s",
-                   t->id, cr->key_pos,
-                   ngx_rtmp_r32(t->keys->entry_count),
-                   cr->pos, ngx_rtmp_r32(*ke),
-                   cr->key ? "match" : "miss");
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_next_delay(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t          *cr;
-    ngx_rtmp_mp4_delay_entry_t     *de;
-
-    cr = &t->cursor;
-
-    if (t->delays == NULL) {
-        return NGX_OK;
-    }
-
-    if (cr->delay_pos >= ngx_rtmp_r32(t->delays->entry_count)) {
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "mp4: track#%ui delay[%ui/%uD] overflow",
-                t->id, cr->delay_pos,
-                ngx_rtmp_r32(t->delays->entry_count));
-
-        return NGX_OK;
-    }
-
-    cr->delay_count++;
-    de = &t->delays->entries[cr->delay_pos];
-
-    if (cr->delay_count >= ngx_rtmp_r32(de->sample_count)) {
-        cr->delay_pos++;
-        de++;
-        cr->delay_count = 0;
-    }
-
-    if (cr->delay_pos >= ngx_rtmp_r32(t->delays->entry_count)) {
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "mp4: track#%ui delay[%ui/%uD] overflow",
-                t->id, cr->delay_pos,
-                ngx_rtmp_r32(t->delays->entry_count));
-
-        return NGX_OK;
-    }
-
-    cr->delay = ngx_rtmp_r32(de->sample_offset);
-
-    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: track#%ui delay[%ui/%uD][%ui/%uD]=%ui",
-                   t->id, cr->delay_pos,
-                   ngx_rtmp_r32(t->delays->entry_count),
-                   cr->delay_count,
-                   ngx_rtmp_r32(de->sample_count), cr->delay);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_seek_delay(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    ngx_rtmp_mp4_cursor_t      *cr;
-    ngx_rtmp_mp4_delay_entry_t *de;
-    uint32_t                    pos, dpos;
-
-    cr = &t->cursor;
-
-    if (t->delays == NULL) {
-        return NGX_OK;
-    }
-
-    pos = 0;
-    de = t->delays->entries;
-
-    while (cr->delay_pos < ngx_rtmp_r32(t->delays->entry_count)) {
-        dpos = ngx_rtmp_r32(de->sample_count);
-
-        if (pos + dpos > cr->pos) {
-            cr->delay_count = cr->pos - pos;
-            cr->delay = ngx_rtmp_r32(de->sample_offset);
-            break;
-        }
-
-        cr->delay_pos++;
-        pos += dpos;
-        de++;
-    }
-
-    if (cr->delay_pos >= ngx_rtmp_r32(t->delays->entry_count)) {
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "mp4: track#%ui seek delay[%ui/%uD] overflow",
-                t->id, cr->delay_pos,
-                ngx_rtmp_r32(t->delays->entry_count));
-
-        return NGX_OK;
-    }
-
-    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: track#%ui seek delay[%ui/%uD][%ui/%uD]=%ui",
-                   t->id, cr->delay_pos,
-                   ngx_rtmp_r32(t->delays->entry_count),
-                   cr->delay_count,
-                   ngx_rtmp_r32(de->sample_count), cr->delay);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_next(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
-{
-    if (ngx_rtmp_mp4_next_time(s, t)  != NGX_OK ||
-        ngx_rtmp_mp4_next_key(s, t)   != NGX_OK ||
-        ngx_rtmp_mp4_next_chunk(s, t) != NGX_OK ||
-        ngx_rtmp_mp4_next_size(s, t)  != NGX_OK ||
-        ngx_rtmp_mp4_next_delay(s, t) != NGX_OK)
-    {
-        t->cursor.valid = 0;
-        return NGX_ERROR;
-    }
-
-    t->cursor.valid = 1;
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_send_meta(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_mp4_ctx_t             *ctx;
-    ngx_rtmp_core_srv_conf_t       *cscf;
-    ngx_int_t                       rc;
-    ngx_uint_t                      n;
-    ngx_rtmp_header_t               h;
-    ngx_chain_t                    *out;
-    ngx_rtmp_mp4_track_t           *t;
-    double                          d;
-
-    static struct {
-        double                      width;
-        double                      height;
-        double                      duration;
-        double                      video_codec_id;
-        double                      audio_codec_id;
-        double                      audio_sample_rate;
-    }                               v;
-
-    static ngx_rtmp_amf_elt_t       out_inf[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("width"),
-          &v.width, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("height"),
-          &v.height, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("displayWidth"),
-          &v.width, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("displayHeight"),
-          &v.height, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("duration"),
-          &v.duration, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("videocodecid"),
-          &v.video_codec_id, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("audiocodecid"),
-          &v.audio_codec_id, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("audiosamplerate"),
-          &v.audio_sample_rate, 0 },
-    };
-
-    static ngx_rtmp_amf_elt_t       out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "onMetaData", 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          out_inf, sizeof(out_inf) },
-    };
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    ngx_memzero(&v, sizeof(v));
-
-    v.width  = ctx->width;
-    v.height = ctx->height;
-    v.audio_sample_rate = ctx->sample_rate;
-
-    t = &ctx->tracks[0];
-    for (n = 0; n < ctx->ntracks; ++n, ++t) {
-        d = ngx_rtmp_mp4_to_rtmp_timestamp(t, t->duration) / 1000.;
-
-        if (v.duration < d) {
-            v.duration = d;
-        }
-
-        switch (t->type) {
-            case NGX_RTMP_MSG_AUDIO:
-                v.audio_codec_id = t->codec;
-                break;
-            case NGX_RTMP_MSG_VIDEO:
-                v.video_codec_id = t->codec;
-                break;
-        }
-    }
-
-    out = NULL;
-    rc = ngx_rtmp_append_amf(s, &out, NULL, out_elts,
-                             sizeof(out_elts) / sizeof(out_elts[0]));
-    if (rc != NGX_OK || out == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_memzero(&h, sizeof(h));
-
-    h.csid = NGX_RTMP_CSID_AMF;
-    h.msid = NGX_RTMP_MSID;
-    h.type = NGX_RTMP_MSG_AMF_META;
-
-    ngx_rtmp_prepare_message(s, &h, NULL, out);
-    rc = ngx_rtmp_send_message(s, out, 0);
-    ngx_rtmp_free_shared_chain(cscf, out);
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_seek_track(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t,
-                        ngx_int_t timestamp)
-{
-    ngx_rtmp_mp4_cursor_t          *cr;
-
-    cr = &t->cursor;
-    ngx_memzero(cr, sizeof(*cr));
-
-    if (ngx_rtmp_mp4_seek_time(s, t, ngx_rtmp_mp4_from_rtmp_timestamp(
-                          t, timestamp)) != NGX_OK ||
-        ngx_rtmp_mp4_seek_key(s, t)   != NGX_OK ||
-        ngx_rtmp_mp4_seek_chunk(s, t) != NGX_OK ||
-        ngx_rtmp_mp4_seek_size(s, t)  != NGX_OK ||
-        ngx_rtmp_mp4_seek_delay(s, t) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    cr->valid = 1;
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_send(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t *ts)
-{
-    ngx_rtmp_mp4_ctx_t             *ctx;
-    ngx_buf_t                       in_buf;
-    ngx_rtmp_header_t               h, lh;
-    ngx_rtmp_core_srv_conf_t       *cscf;
-    ngx_chain_t                    *out, in;
-    ngx_rtmp_mp4_track_t           *t, *cur_t;
-    ngx_rtmp_mp4_cursor_t          *cr, *cur_cr;
-    uint32_t                        buflen, end_timestamp,
-                                    timestamp, last_timestamp, rdelay,
-                                    cur_timestamp;
-    ssize_t                         ret;
-    u_char                          fhdr[5];
-    size_t                          fhdr_size;
-    ngx_int_t                       rc;
-    ngx_uint_t                      n, counter;
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    ctx  = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (!ctx->meta_sent) {
-        rc = ngx_rtmp_mp4_send_meta(s);
-
-        if (rc == NGX_OK) {
-            ctx->meta_sent = 1;
-        }
-
-        return rc;
-    }
-
-    buflen = s->buflen + NGX_RTMP_MP4_BUFLEN_ADDON;
-
-    counter = 0;
-    last_timestamp = 0;
-    end_timestamp = ctx->start_timestamp +
-                    (ngx_current_msec - ctx->epoch) + buflen;
-
-    for ( ;; ) {
-        counter++;
-        if (counter > NGX_RTMP_MP4_MAX_FRAMES) {
-            return NGX_OK;
-        }
-
-        timestamp = 0;
-        t = NULL;
-
-        for (n = 0; n < ctx->ntracks; n++) {
-            cur_t = &ctx->tracks[n];
-            cur_cr = &cur_t->cursor;
-
-            if (!cur_cr->valid) {
-                continue;
-            }
-
-            cur_timestamp = ngx_rtmp_mp4_to_rtmp_timestamp(cur_t,
-                                                           cur_cr->timestamp);
-
-            if (t == NULL || cur_timestamp < timestamp) {
-                timestamp = cur_timestamp;
-                t = cur_t;
-            }
-        }
-
-        if (t == NULL) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                    "mp4: no track");
-            return NGX_DONE;
-        }
-
-        if (timestamp > end_timestamp) {
-            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                    "mp4: track#%ui ahead %uD > %uD",
-                    t->id, timestamp, end_timestamp);
-
-            if (ts) {
-                *ts = last_timestamp;
-            }
-
-            return (uint32_t) (timestamp - end_timestamp);
-        }
-
-        cr = &t->cursor;
-
-        last_timestamp = ngx_rtmp_mp4_to_rtmp_timestamp(t, cr->last_timestamp);
-
-        ngx_memzero(&h, sizeof(h));
-
-        h.msid = NGX_RTMP_MSID;
-        h.type = (uint8_t) t->type;
-        h.csid = t->csid;
-
-        lh = h;
-
-        h.timestamp  = timestamp;
-        lh.timestamp = last_timestamp;
-
-        ngx_memzero(&in, sizeof(in));
-        ngx_memzero(&in_buf, sizeof(in_buf));
-
-        if (t->header && !t->header_sent) {
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: track#%ui sending header of size=%uz",
-                           t->id, t->header_size);
-
-            fhdr[0] = t->fhdr;
-            fhdr[1] = 0;
-
-            if (t->type == NGX_RTMP_MSG_VIDEO) {
-                fhdr[0] |= 0x10;
-                fhdr[2] = fhdr[3] = fhdr[4] = 0;
-                fhdr_size = 5;
-            } else {
-                fhdr_size = 2;
-            }
-
-            in.buf = &in_buf;
-            in_buf.pos  = fhdr;
-            in_buf.last = fhdr + fhdr_size;
-
-            out = ngx_rtmp_append_shared_bufs(cscf, NULL, &in);
-
-            in.buf = &in_buf;
-            in_buf.pos  = t->header;
-            in_buf.last = t->header + t->header_size;
-
-            ngx_rtmp_append_shared_bufs(cscf, out, &in);
-
-            ngx_rtmp_prepare_message(s, &h, NULL, out);
-            rc = ngx_rtmp_send_message(s, out, 0);
-            ngx_rtmp_free_shared_chain(cscf, out);
-
-            if (rc == NGX_AGAIN) {
-                return NGX_AGAIN;
-            }
-
-            t->header_sent = 1;
-        }
-
-        ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui read frame offset=%O, size=%uz, "
-                       "timestamp=%uD, last_timestamp=%uD",
-                       t->id, cr->offset, cr->size, timestamp,
-                       last_timestamp);
-
-        ngx_rtmp_mp4_buffer[0] = t->fhdr;
-        fhdr_size = 1;
-
-        if (t->type == NGX_RTMP_MSG_VIDEO) {
-            if (cr->key) {
-                ngx_rtmp_mp4_buffer[0] |= 0x10;
-            } else if (cr->delay) {
-                ngx_rtmp_mp4_buffer[0] |= 0x20;
-            } else {
-                ngx_rtmp_mp4_buffer[0] |= 0x30;
-            }
-
-            if (t->header) {
-                fhdr_size = 5;
-
-                rdelay = ngx_rtmp_mp4_to_rtmp_timestamp(t, cr->delay);
-
-                ngx_rtmp_mp4_buffer[1] = 1;
-                ngx_rtmp_mp4_buffer[2] = (rdelay >> 16) & 0xff;
-                ngx_rtmp_mp4_buffer[3] = (rdelay >> 8)  & 0xff;
-                ngx_rtmp_mp4_buffer[4] = rdelay & 0xff;
-            }
-
-        } else { /* NGX_RTMP_MSG_AUDIO */
-            if (t->header) {
-                fhdr_size = 2;
-                ngx_rtmp_mp4_buffer[1] = 1;
-            }
-        }
-
-        if (cr->size + fhdr_size > sizeof(ngx_rtmp_mp4_buffer)) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "mp4: track#%ui too big frame: %D>%uz",
-                          t->id, cr->size, sizeof(ngx_rtmp_mp4_buffer));
-            goto next;
-        }
-
-        ret = ngx_read_file(f, ngx_rtmp_mp4_buffer + fhdr_size,
-                            cr->size, cr->offset);
-
-        if (ret != (ssize_t) cr->size) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "mp4: track#%ui could not read frame", t->id);
-            goto next;
-        }
-
-        in.buf = &in_buf;
-        in_buf.pos  = ngx_rtmp_mp4_buffer;
-        in_buf.last = ngx_rtmp_mp4_buffer + cr->size + fhdr_size;
-
-        out = ngx_rtmp_append_shared_bufs(cscf, NULL, &in);
-
-        ngx_rtmp_prepare_message(s, &h, cr->not_first ? &lh : NULL, out);
-        rc = ngx_rtmp_send_message(s, out, 0);
-        ngx_rtmp_free_shared_chain(cscf, out);
-
-        if (rc == NGX_AGAIN) {
-            return NGX_AGAIN;
-        }
-
-        s->current_time = timestamp;
-
-next:
-        if (ngx_rtmp_mp4_next(s, t) != NGX_OK) {
-            return NGX_DONE;
-        }
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_init(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_int_t aindex,
-                  ngx_int_t vindex)
-{
-    ngx_rtmp_mp4_ctx_t         *ctx;
-    uint32_t                    hdr[2];
-    ssize_t                     n;
-    size_t                      offset, page_offset, size, shift;
-    uint64_t                    extended_size;
-    ngx_file_info_t             fi;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx == NULL) {
-        ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_mp4_ctx_t));
-
-        if (ctx == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_mp4_module);
-    }
-
-    ngx_memzero(ctx, sizeof(*ctx));
-
-    ctx->aindex = aindex;
-    ctx->vindex = vindex;
-
-    offset = 0;
-    size   = 0;
-
-    for ( ;; ) {
-        n = ngx_read_file(f, (u_char *) &hdr, sizeof(hdr), offset);
-
-        if (n != sizeof(hdr)) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                          "mp4: error reading file at offset=%uz "
-                          "while searching for moov box", offset);
-            return NGX_ERROR;
-        }
-
-        size = (size_t) ngx_rtmp_r32(hdr[0]);
-        shift = sizeof(hdr);
-
-        if (size == 1) {
-            n = ngx_read_file(f, (u_char *) &extended_size,
-                              sizeof(extended_size), offset + sizeof(hdr));
-
-            if (n != sizeof(extended_size)) {
-                ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                              "mp4: error reading file at offset=%uz "
-                              "while searching for moov box", offset + 8);
-                return NGX_ERROR;
-            }
-
-            size = (size_t) ngx_rtmp_r64(extended_size);
-            shift += sizeof(extended_size);
-
-        } else if (size == 0) {
-            if (ngx_fd_info(f->fd, &fi) == NGX_FILE_ERROR) {
-                ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                              "mp4: " ngx_fd_info_n " failed");
-                return NGX_ERROR;
-            }
-            size = ngx_file_size(&fi) - offset;
-        }
-
-        if (hdr[1] == ngx_rtmp_mp4_make_tag('m','o','o','v')) {
-            ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "mp4: found moov box");
-            break;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: skipping box '%*s'", 4, hdr + 1);
-
-        offset += size;
-    }
-
-    if (size < shift) {
-        return NGX_ERROR;
-    }
-
-    size   -= shift;
-    offset += shift;
-
-    page_offset = offset & (ngx_pagesize - 1);
-    ctx->mmaped_size = page_offset + size;
-
-    ctx->mmaped = ngx_rtmp_mp4_mmap(f->fd, ctx->mmaped_size,
-                                    offset - page_offset, &ctx->extra);
-    if (ctx->mmaped == NULL) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "mp4: mmap failed at offset=%ui, size=%uz",
-                      offset, size);
-        return NGX_ERROR;
-    }
-
-    return ngx_rtmp_mp4_parse(s, (u_char *) ctx->mmaped + page_offset,
-                                 (u_char *) ctx->mmaped + page_offset + size);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_done(ngx_rtmp_session_t *s, ngx_file_t *f)
-{
-    ngx_rtmp_mp4_ctx_t            *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx == NULL || ctx->mmaped == NULL) {
-        return NGX_OK;
-    }
-
-    if (ngx_rtmp_mp4_munmap(ctx->mmaped, ctx->mmaped_size, &ctx->extra)
-        != NGX_OK)
-    {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                      "mp4: munmap failed");
-        return NGX_ERROR;
-    }
-
-    ctx->mmaped = NULL;
-    ctx->mmaped_size = 0;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_seek(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t timestamp)
-{
-    ngx_rtmp_mp4_ctx_t     *ctx;
-    ngx_rtmp_mp4_track_t   *t;
-    ngx_uint_t              n;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: seek timestamp=%ui", timestamp);
-
-    for (n = 0; n < ctx->ntracks; ++n) {
-        t = &ctx->tracks[n];
-
-        if (t->type != NGX_RTMP_MSG_VIDEO) {
-            continue;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui seek video", n);
-
-        ngx_rtmp_mp4_seek_track(s, t, timestamp);
-
-        timestamp = ngx_rtmp_mp4_to_rtmp_timestamp(t, t->cursor.timestamp);
-
-        break;
-    }
-
-    for (n = 0; n < ctx->ntracks; ++n) {
-        t = &ctx->tracks[n];
-
-        if (t->type == NGX_RTMP_MSG_VIDEO) {
-            continue;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "mp4: track#%ui seek", n);
-
-        ngx_rtmp_mp4_seek_track(s, &ctx->tracks[n], timestamp);
-    }
-
-    ctx->start_timestamp = timestamp;
-    ctx->epoch = ngx_current_msec;
-
-    return ngx_rtmp_mp4_reset(s);
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_start(ngx_rtmp_session_t *s, ngx_file_t *f)
-{
-    ngx_rtmp_mp4_ctx_t     *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: start timestamp=%uD", ctx->start_timestamp);
-
-    ctx->epoch = ngx_current_msec;
-
-    return NGX_OK;/*ngx_rtmp_mp4_reset(s);*/
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_reset(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_mp4_ctx_t     *ctx;
-    ngx_rtmp_mp4_cursor_t  *cr;
-    ngx_rtmp_mp4_track_t   *t;
-    ngx_uint_t              n;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    t = &ctx->tracks[0];
-    for (n = 0; n < ctx->ntracks; ++n, ++t) {
-        cr = &t->cursor;
-        cr->not_first = 0;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_stop(ngx_rtmp_session_t *s, ngx_file_t *f)
-{
-    ngx_rtmp_mp4_ctx_t     *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_mp4_module);
-
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    ctx->start_timestamp += (ngx_current_msec - ctx->epoch);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "mp4: stop timestamp=%uD", ctx->start_timestamp);
-
-    return NGX_OK;/*ngx_rtmp_mp4_reset(s);*/
-}
-
-
-static ngx_int_t
-ngx_rtmp_mp4_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_play_main_conf_t      *pmcf;
-    ngx_rtmp_play_fmt_t           **pfmt, *fmt;
-
-    pmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_play_module);
-
-    pfmt = ngx_array_push(&pmcf->fmts);
-
-    if (pfmt == NULL) {
-        return NGX_ERROR;
-    }
-
-    fmt = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_fmt_t));
-
-    if (fmt == NULL) {
-        return NGX_ERROR;
-    }
-
-    *pfmt = fmt;
-
-    ngx_str_set(&fmt->name, "mp4-format");
-
-    ngx_str_set(&fmt->pfx, "mp4:");
-    ngx_str_set(&fmt->sfx, ".mp4");
-
-    fmt->init  = ngx_rtmp_mp4_init;
-    fmt->done  = ngx_rtmp_mp4_done;
-    fmt->seek  = ngx_rtmp_mp4_seek;
-    fmt->start = ngx_rtmp_mp4_start;
-    fmt->stop  = ngx_rtmp_mp4_stop;
-    fmt->send  = ngx_rtmp_mp4_send;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_netcall_module.c b/debian/modules/rtmp/ngx_rtmp_netcall_module.c
deleted file mode 100644
index f772c72..0000000
--- a/debian/modules/rtmp/ngx_rtmp_netcall_module.c
+++ /dev/null
@@ -1,725 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_netcall_module.h"
-
-
-static ngx_int_t ngx_rtmp_netcall_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_netcall_create_srv_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_netcall_merge_srv_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-
-static void ngx_rtmp_netcall_close(ngx_connection_t *cc);
-static void ngx_rtmp_netcall_detach(ngx_connection_t *cc);
-
-static void ngx_rtmp_netcall_recv(ngx_event_t *rev);
-static void ngx_rtmp_netcall_send(ngx_event_t *wev);
-
-
-typedef struct {
-    ngx_msec_t                                  timeout;
-    size_t                                      bufsize;
-    ngx_log_t                                  *log;
-} ngx_rtmp_netcall_srv_conf_t;
-
-
-typedef struct ngx_rtmp_netcall_session_s {
-    ngx_rtmp_session_t                         *session;
-    ngx_peer_connection_t                      *pc;
-    ngx_url_t                                  *url;
-    struct ngx_rtmp_netcall_session_s          *next;
-    void                                       *arg;
-    ngx_rtmp_netcall_handle_pt                  handle;
-    ngx_rtmp_netcall_filter_pt                  filter;
-    ngx_rtmp_netcall_sink_pt                    sink;
-    ngx_chain_t                                *in;
-    ngx_chain_t                                *inlast;
-    ngx_chain_t                                *out;
-    ngx_msec_t                                  timeout;
-    unsigned                                    detached:1;
-    size_t                                      bufsize;
-} ngx_rtmp_netcall_session_t;
-
-
-typedef struct {
-    ngx_rtmp_netcall_session_t                 *cs;
-} ngx_rtmp_netcall_ctx_t;
-
-
-static ngx_command_t  ngx_rtmp_netcall_commands[] = {
-
-    { ngx_string("netcall_timeout"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_netcall_srv_conf_t, timeout),
-      NULL },
-
-    { ngx_string("netcall_buffer"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      offsetof(ngx_rtmp_netcall_srv_conf_t, bufsize),
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_netcall_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_netcall_postconfiguration,     /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    ngx_rtmp_netcall_create_srv_conf,       /* create server configuration */
-    ngx_rtmp_netcall_merge_srv_conf,        /* merge server configuration */
-    NULL,                                   /* create app configuration */
-    NULL                                    /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_netcall_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_netcall_module_ctx,           /* module context */
-    ngx_rtmp_netcall_commands,              /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void *
-ngx_rtmp_netcall_create_srv_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_netcall_srv_conf_t     *nscf;
-
-    nscf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_netcall_srv_conf_t));
-    if (nscf == NULL) {
-        return NULL;
-    }
-
-    nscf->timeout = NGX_CONF_UNSET_MSEC;
-    nscf->bufsize = NGX_CONF_UNSET_SIZE;
-
-    nscf->log = &cf->cycle->new_log;
-
-    return nscf;
-}
-
-
-static char *
-ngx_rtmp_netcall_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_netcall_srv_conf_t *prev = parent;
-    ngx_rtmp_netcall_srv_conf_t *conf = child;
-
-    ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 10000);
-    ngx_conf_merge_size_value(conf->bufsize, prev->bufsize, 1024);
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_netcall_disconnect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    ngx_rtmp_netcall_ctx_t         *ctx;
-    ngx_rtmp_netcall_session_t     *cs;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_netcall_module);
-
-    if (ctx) {
-        for (cs = ctx->cs; cs; cs = cs->next) {
-            ngx_rtmp_netcall_detach(cs->pc->connection);
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_netcall_get_peer(ngx_peer_connection_t *pc, void *data)
-{
-    ngx_rtmp_netcall_session_t   *cs = data;
-
-    pc->sockaddr =(struct sockaddr *)&cs->url->sockaddr;
-    pc->socklen = cs->url->socklen;
-    pc->name = &cs->url->host;
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_netcall_free_peer(ngx_peer_connection_t *pc, void *data,
-            ngx_uint_t state)
-{
-}
-
-
-ngx_int_t
-ngx_rtmp_netcall_create(ngx_rtmp_session_t *s, ngx_rtmp_netcall_init_t *ci)
-{
-    ngx_rtmp_netcall_ctx_t         *ctx;
-    ngx_peer_connection_t          *pc;
-    ngx_rtmp_netcall_session_t     *cs;
-    ngx_rtmp_netcall_srv_conf_t    *nscf;
-    ngx_connection_t               *c, *cc;
-    ngx_pool_t                     *pool;
-    ngx_int_t                       rc;
-
-    pool = NULL;
-    c = s->connection;
-
-    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_netcall_module);
-    if (nscf == NULL) {
-        goto error;
-    }
-
-    /* get module context */
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_netcall_module);
-    if (ctx == NULL) {
-        ctx = ngx_pcalloc(c->pool,
-                sizeof(ngx_rtmp_netcall_ctx_t));
-        if (ctx == NULL) {
-            return NGX_ERROR;
-        }
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_netcall_module);
-    }
-
-    /* Create netcall pool, connection, session.
-     * Note we use shared (app-wide) log because
-     * s->connection->log might be unavailable
-     * in detached netcall when it's being closed */
-    pool = ngx_create_pool(4096, nscf->log);
-    if (pool == NULL) {
-        goto error;
-    }
-
-    pc = ngx_pcalloc(pool, sizeof(ngx_peer_connection_t));
-    if (pc == NULL) {
-        goto error;
-    }
-
-    cs = ngx_pcalloc(pool, sizeof(ngx_rtmp_netcall_session_t));
-    if (cs == NULL) {
-        goto error;
-    }
-
-    /* copy arg to connection pool */
-    if (ci->argsize) {
-        cs->arg = ngx_pcalloc(pool, ci->argsize);
-        if (cs->arg == NULL) {
-            goto error;
-        }
-        ngx_memcpy(cs->arg, ci->arg, ci->argsize);
-    }
-
-    cs->timeout = nscf->timeout;
-    cs->bufsize = nscf->bufsize;
-    cs->url = ci->url;
-    cs->session = s;
-    cs->filter = ci->filter;
-    cs->sink = ci->sink;
-    cs->handle = ci->handle;
-    if (cs->handle == NULL) {
-        cs->detached = 1;
-    }
-
-    pc->log = nscf->log;
-    pc->get = ngx_rtmp_netcall_get_peer;
-    pc->free = ngx_rtmp_netcall_free_peer;
-    pc->data = cs;
-
-    /* connect */
-    rc = ngx_event_connect_peer(pc);
-    if (rc != NGX_OK && rc != NGX_AGAIN ) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "netcall: connection failed");
-        goto error;
-    }
-
-    cc = pc->connection;
-    cc->data = cs;
-    cc->pool = pool;
-    cs->pc = pc;
-
-    cs->out = ci->create(s, ci->arg, pool);
-    if (cs->out == NULL) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "netcall: creation failed");
-        ngx_close_connection(pc->connection);
-        goto error;
-    }
-
-    cc->write->handler = ngx_rtmp_netcall_send;
-    cc->read->handler = ngx_rtmp_netcall_recv;
-
-    if (!cs->detached) {
-        cs->next = ctx->cs;
-        ctx->cs = cs;
-    }
-
-    ngx_rtmp_netcall_send(cc->write);
-
-    return c->destroyed ? NGX_ERROR : NGX_OK;
-
-error:
-    if (pool) {
-        ngx_destroy_pool(pool);
-    }
-
-    return NGX_ERROR;
-}
-
-
-static void
-ngx_rtmp_netcall_close(ngx_connection_t *cc)
-{
-    ngx_rtmp_netcall_session_t         *cs, **css;
-    ngx_pool_t                         *pool;
-    ngx_rtmp_session_t                 *s;
-    ngx_rtmp_netcall_ctx_t             *ctx;
-    ngx_buf_t                          *b;
-
-    cs = cc->data;
-
-    if (cc->destroyed) {
-        return;
-    }
-
-    cc->destroyed = 1;
-
-    if (!cs->detached) {
-        s = cs->session;
-        ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_netcall_module);
-
-        if (cs->in && cs->sink) {
-            cs->sink(cs->session, cs->in);
-
-            b = cs->in->buf;
-            b->pos = b->last = b->start;
-
-        }
-
-        for(css = &ctx->cs; *css; css = &((*css)->next)) {
-            if (*css == cs) {
-                *css = cs->next;
-                break;
-            }
-        }
-
-        if (cs->handle && cs->handle(s, cs->arg, cs->in) != NGX_OK) {
-            ngx_rtmp_finalize_session(s);
-        }
-    }
-
-    pool = cc->pool;
-    ngx_close_connection(cc);
-    ngx_destroy_pool(pool);
-}
-
-
-static void
-ngx_rtmp_netcall_detach(ngx_connection_t *cc)
-{
-    ngx_rtmp_netcall_session_t         *cs;
-
-    cs = cc->data;
-    cs->detached = 1;
-}
-
-
-static void
-ngx_rtmp_netcall_recv(ngx_event_t *rev)
-{
-    ngx_rtmp_netcall_session_t         *cs;
-    ngx_connection_t                   *cc;
-    ngx_chain_t                        *cl;
-    ngx_int_t                           n;
-    ngx_buf_t                          *b;
-
-    cc = rev->data;
-    cs = cc->data;
-
-    if (cc->destroyed) {
-        return;
-    }
-
-    if (rev->timedout) {
-        cc->timedout = 1;
-        ngx_rtmp_netcall_close(cc);
-        return;
-    }
-
-    if (rev->timer_set) {
-        ngx_del_timer(rev);
-    }
-
-    for ( ;; ) {
-
-        if (cs->inlast == NULL ||
-            cs->inlast->buf->last == cs->inlast->buf->end)
-        {
-            if (cs->in && cs->sink) {
-                if (!cs->detached) {
-                    if (cs->sink(cs->session, cs->in) != NGX_OK) {
-                        ngx_rtmp_netcall_close(cc);
-                        return;
-                    }
-                }
-
-                b = cs->in->buf;
-                b->pos = b->last = b->start;
-
-            } else {
-                cl = ngx_alloc_chain_link(cc->pool);
-                if (cl == NULL) {
-                    ngx_rtmp_netcall_close(cc);
-                    return;
-                }
-
-                cl->next = NULL;
-
-                cl->buf = ngx_create_temp_buf(cc->pool, cs->bufsize);
-                if (cl->buf == NULL) {
-                    ngx_rtmp_netcall_close(cc);
-                    return;
-                }
-
-                if (cs->in == NULL) {
-                    cs->in = cl;
-                } else {
-                    cs->inlast->next = cl;
-                }
-
-                cs->inlast = cl;
-            }
-        }
-
-        b = cs->inlast->buf;
-
-        n = cc->recv(cc, b->last, b->end - b->last);
-
-        if (n == NGX_ERROR || n == 0) {
-            ngx_rtmp_netcall_close(cc);
-            return;
-        }
-
-        if (n == NGX_AGAIN) {
-            if (cs->filter && cs->in
-                && cs->filter(cs->in) != NGX_AGAIN)
-            {
-                ngx_rtmp_netcall_close(cc);
-                return;
-            }
-
-            ngx_add_timer(rev, cs->timeout);
-            if (ngx_handle_read_event(rev, 0) != NGX_OK) {
-                ngx_rtmp_netcall_close(cc);
-            }
-            return;
-        }
-
-        b->last += n;
-    }
-}
-
-
-static void
-ngx_rtmp_netcall_send(ngx_event_t *wev)
-{
-    ngx_rtmp_netcall_session_t         *cs;
-    ngx_connection_t                   *cc;
-    ngx_chain_t                        *cl;
-
-    cc = wev->data;
-    cs = cc->data;
-
-    if (cc->destroyed) {
-        return;
-    }
-
-    if (wev->timedout) {
-        ngx_log_error(NGX_LOG_INFO, cc->log, NGX_ETIMEDOUT,
-                "netcall: client send timed out");
-        cc->timedout = 1;
-        ngx_rtmp_netcall_close(cc);
-        return;
-    }
-
-    if (wev->timer_set) {
-        ngx_del_timer(wev);
-    }
-
-    cl = cc->send_chain(cc, cs->out, 0);
-
-    if (cl == NGX_CHAIN_ERROR) {
-        ngx_rtmp_netcall_close(cc);
-        return;
-    }
-
-    cs->out = cl;
-
-    /* more data to send? */
-    if (cl) {
-        ngx_add_timer(wev, cs->timeout);
-        if (ngx_handle_write_event(wev, 0) != NGX_OK) {
-            ngx_rtmp_netcall_close(cc);
-        }
-        return;
-    }
-
-    /* we've sent everything we had.
-     * now receive reply */
-    ngx_del_event(wev, NGX_WRITE_EVENT, 0);
-
-    ngx_rtmp_netcall_recv(cc->read);
-}
-
-
-ngx_chain_t *
-ngx_rtmp_netcall_http_format_request(ngx_int_t method, ngx_str_t *host,
-                                     ngx_str_t *uri, ngx_chain_t *args,
-                                     ngx_chain_t *body, ngx_pool_t *pool,
-                                     ngx_str_t *content_type)
-{
-    ngx_chain_t                    *al, *bl, *ret;
-    ngx_buf_t                      *b;
-    size_t                          content_length;
-    static const char              *methods[2] = { "GET", "POST" };
-    static const char               rq_tmpl[] = " HTTP/1.0\r\n"
-                                                "Host: %V\r\n"
-                                                "Content-Type: %V\r\n"
-                                                "Connection: Close\r\n"
-                                                "Content-Length: %uz\r\n"
-                                                "\r\n";
-
-    content_length = 0;
-    for (al = body; al; al = al->next) {
-        b = al->buf;
-        content_length += (b->last - b->pos);
-    }
-
-    /* create first buffer */
-
-    al = ngx_alloc_chain_link(pool);
-    if (al == NULL) {
-        return NULL;
-    }
-
-    b = ngx_create_temp_buf(pool, sizeof("POST") + /* longest method + 1 */
-                                  uri->len);
-    if (b == NULL) {
-        return NULL;
-    }
-
-    b->last = ngx_snprintf(b->last, b->end - b->last, "%s %V",
-                           methods[method], uri);
-
-    al->buf = b;
-
-    ret = al;
-
-    if (args) {
-        *b->last++ = '?';
-        al->next = args;
-        for (al = args; al->next; al = al->next);
-    }
-
-    /* create second buffer */
-
-    bl = ngx_alloc_chain_link(pool);
-    if (bl == NULL) {
-        return NULL;
-    }
-
-    b = ngx_create_temp_buf(pool, sizeof(rq_tmpl) + host->len +
-                            content_type->len + NGX_SIZE_T_LEN);
-    if (b == NULL) {
-        return NULL;
-    }
-
-    bl->buf = b;
-
-    b->last = ngx_snprintf(b->last, b->end - b->last, rq_tmpl,
-                           host, content_type, content_length);
-
-    al->next = bl;
-    bl->next = body;
-
-    return ret;
-}
-
-
-ngx_chain_t *
-ngx_rtmp_netcall_http_format_session(ngx_rtmp_session_t *s, ngx_pool_t *pool)
-{
-    ngx_chain_t                    *cl;
-    ngx_buf_t                      *b;
-    ngx_str_t                      *addr_text;
-
-    addr_text = &s->connection->addr_text;
-
-    cl = ngx_alloc_chain_link(pool);
-    if (cl == NULL) {
-        return NULL;
-    }
-
-    b = ngx_create_temp_buf(pool,
-            sizeof("app=") - 1 + s->app.len * 3 +
-            sizeof("&flashver=") - 1 + s->flashver.len * 3 +
-            sizeof("&swfurl=") - 1 + s->swf_url.len * 3 +
-            sizeof("&tcurl=") - 1 + s->tc_url.len * 3 +
-            sizeof("&pageurl=") - 1 + s->page_url.len * 3 +
-            sizeof("&addr=") - 1 + addr_text->len * 3 +
-            sizeof("&clientid=") - 1 + NGX_INT_T_LEN
-        );
-
-    if (b == NULL) {
-        return NULL;
-    }
-
-    cl->buf = b;
-    cl->next = NULL;
-
-    b->last = ngx_cpymem(b->last, (u_char*) "app=", sizeof("app=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, s->app.data, s->app.len,
-                                       NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&flashver=",
-                         sizeof("&flashver=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, s->flashver.data,
-                                       s->flashver.len, NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&swfurl=",
-                         sizeof("&swfurl=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, s->swf_url.data,
-                                       s->swf_url.len, NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&tcurl=",
-                         sizeof("&tcurl=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, s->tc_url.data,
-                                       s->tc_url.len, NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&pageurl=",
-                         sizeof("&pageurl=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, s->page_url.data,
-                                       s->page_url.len, NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&addr=", sizeof("&addr=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, addr_text->data,
-                                       addr_text->len, NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&clientid=",
-                         sizeof("&clientid=") - 1);
-    b->last = ngx_sprintf(b->last, "%ui", (ngx_uint_t) s->connection->number);
-
-    return cl;
-}
-
-
-ngx_chain_t *
-ngx_rtmp_netcall_http_skip_header(ngx_chain_t *in)
-{
-    ngx_buf_t       *b;
-
-    /* find \n[\r]\n */
-    enum {
-        normal,
-        lf,
-        lfcr
-    } state = normal;
-
-    if (in == NULL) {
-        return NULL;
-    }
-
-    b = in->buf;
-
-    for ( ;; ) {
-
-        while (b->pos == b->last) {
-            in = in->next;
-            if (in == NULL) {
-                return NULL;
-            }
-            b = in->buf;
-        }
-
-        switch (*b->pos++) {
-            case '\r':
-                state = (state == lf) ? lfcr : normal;
-                break;
-
-            case '\n':
-                if (state != normal) {
-                    return in;
-                }
-                state = lf;
-                break;
-
-           default:
-                state = normal;
-        }
-    }
-}
-
-
-ngx_chain_t *
-ngx_rtmp_netcall_memcache_set(ngx_rtmp_session_t *s, ngx_pool_t *pool,
-        ngx_str_t *key, ngx_str_t *value, ngx_uint_t flags, ngx_uint_t sec)
-{
-    ngx_chain_t                    *cl;
-    ngx_buf_t                      *b;
-
-    cl = ngx_alloc_chain_link(pool);
-    if (cl == NULL) {
-        return NULL;
-    }
-
-    b = ngx_create_temp_buf(pool, sizeof("set ") - 1 + key->len +
-                            (1 + NGX_INT_T_LEN) * 3 +
-                            (sizeof("\r\n") - 1) * 2 + value->len);
-
-    if (b == NULL) {
-        return NULL;
-    }
-
-    cl->next = NULL;
-    cl->buf = b;
-
-    b->last = ngx_sprintf(b->pos, "set %V %ui %ui %ui\r\n%V\r\n",
-                          key, flags, sec, (ngx_uint_t) value->len, value);
-
-    return cl;
-}
-
-
-static ngx_int_t
-ngx_rtmp_netcall_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t          *cmcf;
-    ngx_rtmp_handler_pt                *h;
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_DISCONNECT]);
-    *h = ngx_rtmp_netcall_disconnect;
-
-    return NGX_OK;
-}
-
diff --git a/debian/modules/rtmp/ngx_rtmp_netcall_module.h b/debian/modules/rtmp/ngx_rtmp_netcall_module.h
deleted file mode 100644
index 4dfa6c0..0000000
--- a/debian/modules/rtmp/ngx_rtmp_netcall_module.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_NETCALL_H_INCLUDED_
-#define _NGX_RTMP_NETCALL_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-
-
-typedef ngx_chain_t * (*ngx_rtmp_netcall_create_pt)(ngx_rtmp_session_t *s,
-        void *arg, ngx_pool_t *pool);
-typedef ngx_int_t (*ngx_rtmp_netcall_filter_pt)(ngx_chain_t *in);
-typedef ngx_int_t (*ngx_rtmp_netcall_sink_pt)(ngx_rtmp_session_t *s,
-        ngx_chain_t *in);
-typedef ngx_int_t (*ngx_rtmp_netcall_handle_pt)(ngx_rtmp_session_t *s,
-        void *arg, ngx_chain_t *in);
-
-#define NGX_RTMP_NETCALL_HTTP_GET   0
-#define NGX_RTMP_NETCALL_HTTP_POST  1
-
-
-/* If handle is NULL then netcall is created detached
- * which means it's completely independent of RTMP
- * session and its result is never visible to anyone.
- *
- * WARNING: It's not recommended to create non-detached
- * netcalls from disconect handlers. Netcall disconnect
- * handler which detaches active netcalls is executed
- * BEFORE your handler. It leads to a crash
- * after netcall connection is closed */
-typedef struct {
-    ngx_url_t                      *url;
-    ngx_rtmp_netcall_create_pt      create;
-    ngx_rtmp_netcall_filter_pt      filter;
-    ngx_rtmp_netcall_sink_pt        sink;
-    ngx_rtmp_netcall_handle_pt      handle;
-    void                           *arg;
-    size_t                          argsize;
-} ngx_rtmp_netcall_init_t;
-
-
-ngx_int_t ngx_rtmp_netcall_create(ngx_rtmp_session_t *s,
-        ngx_rtmp_netcall_init_t *ci);
-
-
-/* HTTP handling */
-ngx_chain_t * ngx_rtmp_netcall_http_format_session(ngx_rtmp_session_t *s,
-        ngx_pool_t *pool);
-ngx_chain_t * ngx_rtmp_netcall_http_format_request(ngx_int_t method,
-        ngx_str_t *host, ngx_str_t *uri, ngx_chain_t *args, ngx_chain_t *body,
-        ngx_pool_t *pool, ngx_str_t *content_type);
-ngx_chain_t * ngx_rtmp_netcall_http_skip_header(ngx_chain_t *in);
-
-
-/* Memcache handling */
-ngx_chain_t * ngx_rtmp_netcall_memcache_set(ngx_rtmp_session_t *s,
-        ngx_pool_t *pool, ngx_str_t *key, ngx_str_t *value,
-        ngx_uint_t flags, ngx_uint_t sec);
-
-
-#endif /* _NGX_RTMP_NETCALL_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_notify_module.c b/debian/modules/rtmp/ngx_rtmp_notify_module.c
deleted file mode 100644
index dd65e49..0000000
--- a/debian/modules/rtmp/ngx_rtmp_notify_module.c
+++ /dev/null
@@ -1,1730 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_md5.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_netcall_module.h"
-#include "ngx_rtmp_record_module.h"
-#include "ngx_rtmp_relay_module.h"
-
-
-static ngx_rtmp_connect_pt                      next_connect;
-static ngx_rtmp_disconnect_pt                   next_disconnect;
-static ngx_rtmp_publish_pt                      next_publish;
-static ngx_rtmp_play_pt                         next_play;
-static ngx_rtmp_close_stream_pt                 next_close_stream;
-static ngx_rtmp_record_done_pt                  next_record_done;
-
-
-static char *ngx_rtmp_notify_on_srv_event(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static char *ngx_rtmp_notify_on_app_event(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static char *ngx_rtmp_notify_method(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static ngx_int_t ngx_rtmp_notify_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_notify_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_notify_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-static void *ngx_rtmp_notify_create_srv_conf(ngx_conf_t *cf);
-static char *ngx_rtmp_notify_merge_srv_conf(ngx_conf_t *cf, void *parent,
-       void *child);
-static ngx_int_t ngx_rtmp_notify_done(ngx_rtmp_session_t *s, char *cbname,
-       ngx_uint_t url_idx);
-
-
-ngx_str_t   ngx_rtmp_notify_urlencoded =
-            ngx_string("application/x-www-form-urlencoded");
-
-
-#define NGX_RTMP_NOTIFY_PUBLISHING              0x01
-#define NGX_RTMP_NOTIFY_PLAYING                 0x02
-
-
-enum {
-    NGX_RTMP_NOTIFY_PLAY,
-    NGX_RTMP_NOTIFY_PUBLISH,
-    NGX_RTMP_NOTIFY_PLAY_DONE,
-    NGX_RTMP_NOTIFY_PUBLISH_DONE,
-    NGX_RTMP_NOTIFY_DONE,
-    NGX_RTMP_NOTIFY_RECORD_DONE,
-    NGX_RTMP_NOTIFY_UPDATE,
-    NGX_RTMP_NOTIFY_APP_MAX
-};
-
-
-enum {
-    NGX_RTMP_NOTIFY_CONNECT,
-    NGX_RTMP_NOTIFY_DISCONNECT,
-    NGX_RTMP_NOTIFY_SRV_MAX
-};
-
-
-typedef struct {
-    ngx_url_t                                  *url[NGX_RTMP_NOTIFY_APP_MAX];
-    ngx_flag_t                                  active;
-    ngx_uint_t                                  method;
-    ngx_msec_t                                  update_timeout;
-    ngx_flag_t                                  update_strict;
-    ngx_flag_t                                  relay_redirect;
-} ngx_rtmp_notify_app_conf_t;
-
-
-typedef struct {
-    ngx_url_t                                  *url[NGX_RTMP_NOTIFY_SRV_MAX];
-    ngx_uint_t                                  method;
-} ngx_rtmp_notify_srv_conf_t;
-
-
-typedef struct {
-    ngx_uint_t                                  flags;
-    u_char                                      name[NGX_RTMP_MAX_NAME];
-    u_char                                      args[NGX_RTMP_MAX_ARGS];
-    ngx_event_t                                 update_evt;
-    time_t                                      start;
-} ngx_rtmp_notify_ctx_t;
-
-
-typedef struct {
-    u_char                                     *cbname;
-    ngx_uint_t                                  url_idx;
-} ngx_rtmp_notify_done_t;
-
-
-static ngx_command_t  ngx_rtmp_notify_commands[] = {
-
-    { ngx_string("on_connect"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_notify_on_srv_event,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("on_disconnect"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_notify_on_srv_event,
-      NGX_RTMP_SRV_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("on_publish"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_notify_on_app_event,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("on_play"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_notify_on_app_event,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("on_publish_done"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_notify_on_app_event,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("on_play_done"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_notify_on_app_event,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("on_done"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_notify_on_app_event,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("on_record_done"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_RTMP_REC_CONF|
-                         NGX_CONF_TAKE1,
-      ngx_rtmp_notify_on_app_event,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("on_update"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_notify_on_app_event,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("notify_method"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_rtmp_notify_method,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("notify_update_timeout"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_notify_app_conf_t, update_timeout),
-      NULL },
-
-    { ngx_string("notify_update_strict"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_notify_app_conf_t, update_strict),
-      NULL },
-
-    { ngx_string("notify_relay_redirect"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_notify_app_conf_t, relay_redirect),
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_notify_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_notify_postconfiguration,      /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    ngx_rtmp_notify_create_srv_conf,        /* create server configuration */
-    ngx_rtmp_notify_merge_srv_conf,         /* merge server configuration */
-    ngx_rtmp_notify_create_app_conf,        /* create app configuration */
-    ngx_rtmp_notify_merge_app_conf          /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_notify_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_notify_module_ctx,            /* module context */
-    ngx_rtmp_notify_commands,               /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void *
-ngx_rtmp_notify_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_notify_app_conf_t     *nacf;
-    ngx_uint_t                      n;
-
-    nacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_notify_app_conf_t));
-    if (nacf == NULL) {
-        return NULL;
-    }
-
-    for (n = 0; n < NGX_RTMP_NOTIFY_APP_MAX; ++n) {
-        nacf->url[n] = NGX_CONF_UNSET_PTR;
-    }
-
-    nacf->method = NGX_CONF_UNSET_UINT;
-    nacf->update_timeout = NGX_CONF_UNSET_MSEC;
-    nacf->update_strict = NGX_CONF_UNSET;
-    nacf->relay_redirect = NGX_CONF_UNSET;
-
-    return nacf;
-}
-
-
-static char *
-ngx_rtmp_notify_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_notify_app_conf_t *prev = parent;
-    ngx_rtmp_notify_app_conf_t *conf = child;
-    ngx_uint_t                  n;
-
-    for (n = 0; n < NGX_RTMP_NOTIFY_APP_MAX; ++n) {
-        ngx_conf_merge_ptr_value(conf->url[n], prev->url[n], NULL);
-        if (conf->url[n]) {
-            conf->active = 1;
-        }
-    }
-
-    if (conf->active) {
-        prev->active = 1;
-    }
-
-    ngx_conf_merge_uint_value(conf->method, prev->method,
-                              NGX_RTMP_NETCALL_HTTP_POST);
-    ngx_conf_merge_msec_value(conf->update_timeout, prev->update_timeout,
-                              30000);
-    ngx_conf_merge_value(conf->update_strict, prev->update_strict, 0);
-    ngx_conf_merge_value(conf->relay_redirect, prev->relay_redirect, 0);
-
-    return NGX_CONF_OK;
-}
-
-
-static void *
-ngx_rtmp_notify_create_srv_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_notify_srv_conf_t     *nscf;
-    ngx_uint_t                      n;
-
-    nscf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_notify_srv_conf_t));
-    if (nscf == NULL) {
-        return NULL;
-    }
-
-    for (n = 0; n < NGX_RTMP_NOTIFY_SRV_MAX; ++n) {
-        nscf->url[n] = NGX_CONF_UNSET_PTR;
-    }
-
-    nscf->method = NGX_CONF_UNSET_UINT;
-
-    return nscf;
-}
-
-
-static char *
-ngx_rtmp_notify_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_notify_srv_conf_t *prev = parent;
-    ngx_rtmp_notify_srv_conf_t *conf = child;
-    ngx_uint_t                  n;
-
-    for (n = 0; n < NGX_RTMP_NOTIFY_SRV_MAX; ++n) {
-        ngx_conf_merge_ptr_value(conf->url[n], prev->url[n], NULL);
-    }
-
-    ngx_conf_merge_uint_value(conf->method, prev->method,
-                              NGX_RTMP_NETCALL_HTTP_POST);
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_notify_create_request(ngx_rtmp_session_t *s, ngx_pool_t *pool,
-                                   ngx_uint_t url_idx, ngx_chain_t *args)
-{
-    ngx_rtmp_notify_app_conf_t *nacf;
-    ngx_chain_t                *al, *bl, *cl;
-    ngx_url_t                  *url;
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-
-    url = nacf->url[url_idx];
-
-    al = ngx_rtmp_netcall_http_format_session(s, pool);
-    if (al == NULL) {
-        return NULL;
-    }
-
-    al->next = args;
-
-    bl = NULL;
-
-    if (nacf->method == NGX_RTMP_NETCALL_HTTP_POST) {
-        cl = al;
-        al = bl;
-        bl = cl;
-    }
-
-    return ngx_rtmp_netcall_http_format_request(nacf->method, &url->host,
-                                                &url->uri, al, bl, pool,
-                                                &ngx_rtmp_notify_urlencoded);
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_notify_connect_create(ngx_rtmp_session_t *s, void *arg,
-        ngx_pool_t *pool)
-{
-    ngx_rtmp_connect_t             *v = arg;
-
-    ngx_rtmp_notify_srv_conf_t     *nscf;
-    ngx_url_t                      *url;
-    ngx_chain_t                    *al, *bl;
-    ngx_buf_t                      *b;
-    ngx_str_t                      *addr_text;
-    size_t                          app_len, args_len, flashver_len,
-                                    swf_url_len, tc_url_len, page_url_len;
-
-    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
-
-    al = ngx_alloc_chain_link(pool);
-    if (al == NULL) {
-        return NULL;
-    }
-
-    /* these values are still missing in session
-     * so we have to construct the request from
-     * connection struct */
-
-    app_len = ngx_strlen(v->app);
-    args_len = ngx_strlen(v->args);
-    flashver_len = ngx_strlen(v->flashver);
-    swf_url_len = ngx_strlen(v->swf_url);
-    tc_url_len = ngx_strlen(v->tc_url);
-    page_url_len = ngx_strlen(v->page_url);
-
-    addr_text = &s->connection->addr_text;
-
-    b = ngx_create_temp_buf(pool,
-            sizeof("call=connect") - 1 +
-            sizeof("&app=") - 1 + app_len * 3 +
-            sizeof("&flashver=") - 1 + flashver_len * 3 +
-            sizeof("&swfurl=") - 1 + swf_url_len * 3 +
-            sizeof("&tcurl=") - 1 + tc_url_len * 3 +
-            sizeof("&pageurl=") - 1 + page_url_len * 3 +
-            sizeof("&addr=") - 1 + addr_text->len * 3 +
-            sizeof("&epoch=") - 1 + NGX_INT32_LEN +
-            1 + args_len
-        );
-
-    if (b == NULL) {
-        return NULL;
-    }
-
-    al->buf = b;
-    al->next = NULL;
-
-    b->last = ngx_cpymem(b->last, (u_char*) "app=", sizeof("app=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->app, app_len,
-                                       NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&flashver=",
-                         sizeof("&flashver=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->flashver, flashver_len,
-                                       NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&swfurl=",
-                         sizeof("&swfurl=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->swf_url, swf_url_len,
-                                       NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&tcurl=",
-                         sizeof("&tcurl=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->tc_url, tc_url_len,
-                                       NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&pageurl=",
-                         sizeof("&pageurl=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->page_url, page_url_len,
-                                       NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&addr=", sizeof("&addr=") -1);
-    b->last = (u_char*) ngx_escape_uri(b->last, addr_text->data,
-                                       addr_text->len, NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&epoch=", sizeof("&epoch=") -1);
-    b->last = ngx_sprintf(b->last, "%uD", (uint32_t) s->epoch);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&call=connect",
-                         sizeof("&call=connect") - 1);
-
-    if (args_len) {
-        *b->last++ = '&';
-        b->last = (u_char *) ngx_cpymem(b->last, v->args, args_len);
-    }
-
-    url = nscf->url[NGX_RTMP_NOTIFY_CONNECT];
-
-    bl = NULL;
-
-    if (nscf->method == NGX_RTMP_NETCALL_HTTP_POST) {
-        bl = al;
-        al = NULL;
-    }
-
-    return ngx_rtmp_netcall_http_format_request(nscf->method, &url->host,
-                                                &url->uri, al, bl, pool,
-                                                &ngx_rtmp_notify_urlencoded);
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_notify_disconnect_create(ngx_rtmp_session_t *s, void *arg,
-        ngx_pool_t *pool)
-{
-    ngx_rtmp_notify_srv_conf_t     *nscf;
-    ngx_url_t                      *url;
-    ngx_chain_t                    *al, *bl, *pl;
-    ngx_buf_t                      *b;
-
-    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
-
-    pl = ngx_alloc_chain_link(pool);
-    if (pl == NULL) {
-        return NULL;
-    }
-
-    b = ngx_create_temp_buf(pool,
-                            sizeof("&call=disconnect") +
-                            sizeof("&app=") + s->app.len * 3 +
-                            1 + s->args.len);
-    if (b == NULL) {
-        return NULL;
-    }
-
-    pl->buf = b;
-    pl->next = NULL;
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&call=disconnect",
-                         sizeof("&call=disconnect") - 1);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&app=", sizeof("&app=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, s->app.data, s->app.len,
-                                       NGX_ESCAPE_ARGS);
-
-    if (s->args.len) {
-        *b->last++ = '&';
-        b->last = (u_char *) ngx_cpymem(b->last, s->args.data, s->args.len);
-    }
-
-    url = nscf->url[NGX_RTMP_NOTIFY_DISCONNECT];
-
-    al = ngx_rtmp_netcall_http_format_session(s, pool);
-    if (al == NULL) {
-        return NULL;
-    }
-
-    al->next = pl;
-
-    bl = NULL;
-
-    if (nscf->method == NGX_RTMP_NETCALL_HTTP_POST) {
-        bl = al;
-        al = NULL;
-    }
-
-    return ngx_rtmp_netcall_http_format_request(nscf->method, &url->host,
-                                                &url->uri, al, bl, pool,
-                                                &ngx_rtmp_notify_urlencoded);
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_notify_publish_create(ngx_rtmp_session_t *s, void *arg,
-        ngx_pool_t *pool)
-{
-    ngx_rtmp_publish_t             *v = arg;
-
-    ngx_chain_t                    *pl;
-    ngx_buf_t                      *b;
-    size_t                          name_len, type_len, args_len;
-
-    pl = ngx_alloc_chain_link(pool);
-    if (pl == NULL) {
-        return NULL;
-    }
-
-    name_len = ngx_strlen(v->name);
-    type_len = ngx_strlen(v->type);
-    args_len = ngx_strlen(v->args);
-
-    b = ngx_create_temp_buf(pool,
-                            sizeof("&call=publish") +
-                            sizeof("&name=") + name_len * 3 +
-                            sizeof("&type=") + type_len * 3 +
-                            1 + args_len);
-    if (b == NULL) {
-        return NULL;
-    }
-
-    pl->buf = b;
-    pl->next = NULL;
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&call=publish",
-                         sizeof("&call=publish") - 1);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->name, name_len,
-                                       NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&type=", sizeof("&type=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->type, type_len,
-                                       NGX_ESCAPE_ARGS);
-
-    if (args_len) {
-        *b->last++ = '&';
-        b->last = (u_char *) ngx_cpymem(b->last, v->args, args_len);
-    }
-
-    return ngx_rtmp_notify_create_request(s, pool, NGX_RTMP_NOTIFY_PUBLISH, pl);
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_notify_play_create(ngx_rtmp_session_t *s, void *arg,
-        ngx_pool_t *pool)
-{
-    ngx_rtmp_play_t                *v = arg;
-
-    ngx_chain_t                    *pl;
-    ngx_buf_t                      *b;
-    size_t                          name_len, args_len;
-
-    pl = ngx_alloc_chain_link(pool);
-    if (pl == NULL) {
-        return NULL;
-    }
-
-    name_len = ngx_strlen(v->name);
-    args_len = ngx_strlen(v->args);
-
-    b = ngx_create_temp_buf(pool,
-                            sizeof("&call=play") +
-                            sizeof("&name=") + name_len * 3 +
-                            sizeof("&start=&duration=&reset=") +
-                            NGX_INT32_LEN * 3 + 1 + args_len);
-    if (b == NULL) {
-        return NULL;
-    }
-
-    pl->buf = b;
-    pl->next = NULL;
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&call=play",
-                         sizeof("&call=play") - 1);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->name, name_len,
-                                       NGX_ESCAPE_ARGS);
-
-    b->last = ngx_snprintf(b->last, b->end - b->last,
-                           "&start=%uD&duration=%uD&reset=%d",
-                           (uint32_t) v->start, (uint32_t) v->duration,
-                           v->reset & 1);
-
-    if (args_len) {
-        *b->last++ = '&';
-        b->last = (u_char *) ngx_cpymem(b->last, v->args, args_len);
-    }
-
-    return ngx_rtmp_notify_create_request(s, pool, NGX_RTMP_NOTIFY_PLAY, pl);
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_notify_done_create(ngx_rtmp_session_t *s, void *arg,
-        ngx_pool_t *pool)
-{
-    ngx_rtmp_notify_done_t         *ds = arg;
-
-    ngx_chain_t                    *pl;
-    ngx_buf_t                      *b;
-    size_t                          cbname_len, name_len, args_len;
-    ngx_rtmp_notify_ctx_t          *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
-
-    pl = ngx_alloc_chain_link(pool);
-    if (pl == NULL) {
-        return NULL;
-    }
-
-    cbname_len = ngx_strlen(ds->cbname);
-    name_len = ctx ? ngx_strlen(ctx->name) : 0;
-    args_len = ctx ? ngx_strlen(ctx->args) : 0;
-
-    b = ngx_create_temp_buf(pool,
-                            sizeof("&call=") + cbname_len +
-                            sizeof("&name=") + name_len * 3 +
-                            1 + args_len);
-    if (b == NULL) {
-        return NULL;
-    }
-
-    pl->buf = b;
-    pl->next = NULL;
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&call=", sizeof("&call=") - 1);
-    b->last = ngx_cpymem(b->last, ds->cbname, cbname_len);
-
-    if (name_len) {
-        b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
-        b->last = (u_char*) ngx_escape_uri(b->last, ctx->name, name_len,
-                                           NGX_ESCAPE_ARGS);
-    }
-
-    if (args_len) {
-        *b->last++ = '&';
-        b->last = (u_char *) ngx_cpymem(b->last, ctx->args, args_len);
-    }
-
-    return ngx_rtmp_notify_create_request(s, pool, ds->url_idx, pl);
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_notify_update_create(ngx_rtmp_session_t *s, void *arg,
-        ngx_pool_t *pool)
-{
-    ngx_chain_t                    *pl;
-    ngx_buf_t                      *b;
-    size_t                          name_len, args_len;
-    ngx_rtmp_notify_ctx_t          *ctx;
-    ngx_str_t                       sfx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
-
-    pl = ngx_alloc_chain_link(pool);
-    if (pl == NULL) {
-        return NULL;
-    }
-
-    if (ctx->flags & NGX_RTMP_NOTIFY_PUBLISHING) {
-        ngx_str_set(&sfx, "_publish");
-    } else if (ctx->flags & NGX_RTMP_NOTIFY_PLAYING) {
-        ngx_str_set(&sfx, "_play");
-    } else {
-        ngx_str_null(&sfx);
-    }
-
-    name_len = ctx ? ngx_strlen(ctx->name) : 0;
-    args_len = ctx ? ngx_strlen(ctx->args) : 0;
-
-    b = ngx_create_temp_buf(pool,
-                            sizeof("&call=update") + sfx.len +
-                            sizeof("&time=") + NGX_TIME_T_LEN +
-                            sizeof("&timestamp=") + NGX_INT32_LEN +
-                            sizeof("&name=") + name_len * 3 +
-                            1 + args_len);
-    if (b == NULL) {
-        return NULL;
-    }
-
-    pl->buf = b;
-    pl->next = NULL;
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&call=update",
-                         sizeof("&call=update") - 1);
-    b->last = ngx_cpymem(b->last, sfx.data, sfx.len);
-
-    b->last = ngx_cpymem(b->last, (u_char *) "&time=",
-                         sizeof("&time=") - 1);
-    b->last = ngx_sprintf(b->last, "%T", ngx_cached_time->sec - ctx->start);
-
-    b->last = ngx_cpymem(b->last, (u_char *) "&timestamp=",
-                         sizeof("&timestamp=") - 1);
-    b->last = ngx_sprintf(b->last, "%D", s->current_time);
-
-    if (name_len) {
-        b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
-        b->last = (u_char*) ngx_escape_uri(b->last, ctx->name, name_len,
-                                           NGX_ESCAPE_ARGS);
-    }
-
-    if (args_len) {
-        *b->last++ = '&';
-        b->last = (u_char *) ngx_cpymem(b->last, ctx->args, args_len);
-    }
-
-    return ngx_rtmp_notify_create_request(s, pool, NGX_RTMP_NOTIFY_UPDATE, pl);
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_notify_record_done_create(ngx_rtmp_session_t *s, void *arg,
-                                   ngx_pool_t *pool)
-{
-    ngx_rtmp_record_done_t         *v = arg;
-
-    ngx_rtmp_notify_ctx_t          *ctx;
-    ngx_chain_t                    *pl;
-    ngx_buf_t                      *b;
-    size_t                          name_len, args_len;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
-
-    pl = ngx_alloc_chain_link(pool);
-    if (pl == NULL) {
-        return NULL;
-    }
-
-    name_len  = ngx_strlen(ctx->name);
-    args_len  = ngx_strlen(ctx->args);
-
-    b = ngx_create_temp_buf(pool,
-                            sizeof("&call=record_done") +
-                            sizeof("&recorder=") + v->recorder.len +
-                            sizeof("&name=") + name_len * 3 +
-                            sizeof("&path=") + v->path.len * 3 +
-                            1 + args_len);
-    if (b == NULL) {
-        return NULL;
-    }
-
-    pl->buf = b;
-    pl->next = NULL;
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&call=record_done",
-                         sizeof("&call=record_done") - 1);
-
-    b->last = ngx_cpymem(b->last, (u_char *) "&recorder=",
-                         sizeof("&recorder=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->recorder.data,
-                                       v->recorder.len, NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&name=", sizeof("&name=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, ctx->name, name_len,
-                                       NGX_ESCAPE_ARGS);
-
-    b->last = ngx_cpymem(b->last, (u_char*) "&path=", sizeof("&path=") - 1);
-    b->last = (u_char*) ngx_escape_uri(b->last, v->path.data, v->path.len,
-                                       NGX_ESCAPE_ARGS);
-
-    if (args_len) {
-        *b->last++ = '&';
-        b->last = (u_char *) ngx_cpymem(b->last, ctx->args, args_len);
-    }
-
-    return ngx_rtmp_notify_create_request(s, pool, NGX_RTMP_NOTIFY_RECORD_DONE,
-                                          pl);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_parse_http_retcode(ngx_rtmp_session_t *s,
-        ngx_chain_t *in)
-{
-    ngx_buf_t      *b;
-    ngx_int_t       n;
-    u_char          c;
-
-    /* find 10th character */
-
-    n = 9;
-    while (in) {
-        b = in->buf;
-        if (b->last - b->pos > n) {
-            c = b->pos[n];
-            if (c >= (u_char)'0' && c <= (u_char)'9') {
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                    "notify: HTTP retcode: %dxx", (int)(c - '0'));
-                switch (c) {
-                    case (u_char) '2':
-                        return NGX_OK;
-                    case (u_char) '3':
-                        return NGX_AGAIN;
-                    default:
-                        return NGX_ERROR;
-                }
-            }
-
-            ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                    "notify: invalid HTTP retcode: %d..", (int)c);
-
-            return NGX_ERROR;
-        }
-        n -= (b->last - b->pos);
-        in = in->next;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-            "notify: empty or broken HTTP response");
-
-    /*
-     * not enough data;
-     * it can happen in case of empty or broken reply
-     */
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_parse_http_header(ngx_rtmp_session_t *s,
-        ngx_chain_t *in, ngx_str_t *name, u_char *data, size_t len)
-{
-    ngx_buf_t      *b;
-    ngx_int_t       matched;
-    u_char         *p, c;
-    ngx_uint_t      n;
-
-    enum {
-        parse_name,
-        parse_space,
-        parse_value,
-        parse_value_newline
-    } state = parse_name;
-
-    n = 0;
-    matched = 0;
-
-    while (in) {
-        b = in->buf;
-
-        for (p = b->pos; p != b->last; ++p) {
-            c = *p;
-
-            if (c == '\r') {
-                continue;
-            }
-
-            switch (state) {
-                case parse_value_newline:
-                    if (c == ' ' || c == '\t') {
-                        state = parse_space;
-                        break;
-                    }
-
-                    if (matched) {
-                        return n;
-                    }
-
-                    if (c == '\n') {
-                        return NGX_OK;
-                    }
-
-                    n = 0;
-                    state = parse_name;
-                    /* fall through */
-
-                case parse_name:
-                    switch (c) {
-                        case ':':
-                            matched = (n == name->len);
-                            n = 0;
-                            state = parse_space;
-                            break;
-                        case '\n':
-                            n = 0;
-                            break;
-                        default:
-                            if (n < name->len &&
-                                ngx_tolower(c) == ngx_tolower(name->data[n]))
-                            {
-                                ++n;
-                                break;
-                            }
-                            n = name->len + 1;
-                    }
-                    break;
-
-                case parse_space:
-                    if (c == ' ' || c == '\t') {
-                        break;
-                    }
-                    state = parse_value;
-                    /* fall through */
-
-                case parse_value:
-                    if (c == '\n') {
-                        state = parse_value_newline;
-                        break;
-                    }
-
-                    if (matched && n + 1 < len) {
-                        data[n++] = c;
-                    }
-
-                    break;
-            }
-        }
-
-        in = in->next;
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_notify_clear_flag(ngx_rtmp_session_t *s, ngx_uint_t flag)
-{
-    ngx_rtmp_notify_ctx_t  *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
-
-    ctx->flags &= ~flag;
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_connect_handle(ngx_rtmp_session_t *s,
-        void *arg, ngx_chain_t *in)
-{
-    ngx_rtmp_connect_t *v = arg;
-    ngx_int_t           rc;
-    u_char              app[NGX_RTMP_MAX_NAME];
-
-    static ngx_str_t    location = ngx_string("location");
-
-    rc = ngx_rtmp_notify_parse_http_retcode(s, in);
-    if (rc == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    if (rc == NGX_AGAIN) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "notify: connect redirect received");
-
-        rc = ngx_rtmp_notify_parse_http_header(s, in, &location, app,
-                                               sizeof(app) - 1);
-        if (rc > 0) {
-            *ngx_cpymem(v->app, app, rc) = 0;
-            ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                          "notify: connect redirect to '%s'", v->app);
-        }
-    }
-
-    return next_connect(s, v);
-}
-
-
-static void
-ngx_rtmp_notify_set_name(u_char *dst, size_t dst_len, u_char *src,
-    size_t src_len)
-{
-    u_char     result[16], *p;
-    ngx_md5_t  md5;
-
-    ngx_md5_init(&md5);
-    ngx_md5_update(&md5, src, src_len);
-    ngx_md5_final(result, &md5);
-
-    p = ngx_hex_dump(dst, result, ngx_min((dst_len - 1) / 2, 16));
-    *p = '\0';
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_publish_handle(ngx_rtmp_session_t *s,
-        void *arg, ngx_chain_t *in)
-{
-    ngx_rtmp_publish_t         *v = arg;
-    ngx_int_t                   rc;
-    ngx_str_t                   local_name;
-    ngx_rtmp_relay_target_t     target;
-    ngx_url_t                  *u;
-    ngx_rtmp_notify_app_conf_t *nacf;
-    u_char                      name[NGX_RTMP_MAX_NAME];
-
-    static ngx_str_t    location = ngx_string("location");
-
-    rc = ngx_rtmp_notify_parse_http_retcode(s, in);
-    if (rc == NGX_ERROR) {
-        ngx_rtmp_notify_clear_flag(s, NGX_RTMP_NOTIFY_PUBLISHING);
-        return NGX_ERROR;
-    }
-
-    if (rc != NGX_AGAIN) {
-        goto next;
-    }
-
-    /* HTTP 3xx */
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "notify: publish redirect received");
-
-    rc = ngx_rtmp_notify_parse_http_header(s, in, &location, name,
-                                           sizeof(name) - 1);
-    if (rc <= 0) {
-        goto next;
-    }
-
-    if (ngx_strncasecmp(name, (u_char *) "rtmp://", 7)) {
-        *ngx_cpymem(v->name, name, rc) = 0;
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                      "notify: publish redirect to '%s'", v->name);
-        goto next;
-    }
-
-    /* push */
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-    if (nacf->relay_redirect) {
-        ngx_rtmp_notify_set_name(v->name, NGX_RTMP_MAX_NAME, name, (size_t) rc);
-    }
-
-    ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                  "notify: push '%s' to '%*s'", v->name, rc, name);
-
-    local_name.data = v->name;
-    local_name.len = ngx_strlen(v->name);
-
-    ngx_memzero(&target, sizeof(target));
-
-    u = &target.url;
-    u->url = local_name;
-    u->url.data = name + 7;
-    u->url.len = rc - 7;
-    u->default_port = 1935;
-    u->uri_part = 1;
-    u->no_resolve = 1; /* want ip here */
-
-    if (ngx_parse_url(s->connection->pool, u) != NGX_OK) {
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                      "notify: push failed '%V'", &local_name);
-        return NGX_ERROR;
-    }
-
-    ngx_rtmp_relay_push(s, &local_name, &target);
-
-next:
-
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_play_handle(ngx_rtmp_session_t *s,
-        void *arg, ngx_chain_t *in)
-{
-    ngx_rtmp_play_t            *v = arg;
-    ngx_int_t                   rc;
-    ngx_str_t                   local_name;
-    ngx_rtmp_relay_target_t     target;
-    ngx_url_t                  *u;
-    ngx_rtmp_notify_app_conf_t *nacf;
-    u_char                      name[NGX_RTMP_MAX_NAME];
-
-    static ngx_str_t            location = ngx_string("location");
-
-    rc = ngx_rtmp_notify_parse_http_retcode(s, in);
-    if (rc == NGX_ERROR) {
-        ngx_rtmp_notify_clear_flag(s, NGX_RTMP_NOTIFY_PLAYING);
-        return NGX_ERROR;
-    }
-
-    if (rc != NGX_AGAIN) {
-        goto next;
-    }
-
-    /* HTTP 3xx */
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "notify: play redirect received");
-
-    rc = ngx_rtmp_notify_parse_http_header(s, in, &location, name,
-                                           sizeof(name) - 1);
-    if (rc <= 0) {
-        goto next;
-    }
-
-    if (ngx_strncasecmp(name, (u_char *) "rtmp://", 7)) {
-        *ngx_cpymem(v->name, name, rc) = 0;
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                      "notify: play redirect to '%s'", v->name);
-        goto next;
-    }
-
-    /* pull */
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-    if (nacf->relay_redirect) {
-        ngx_rtmp_notify_set_name(v->name, NGX_RTMP_MAX_NAME, name, (size_t) rc);
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "notify: pull '%s' from '%*s'", v->name, rc, name);
-
-    local_name.data = v->name;
-    local_name.len = ngx_strlen(v->name);
-
-    ngx_memzero(&target, sizeof(target));
-
-    u = &target.url;
-    u->url = local_name;
-    u->url.data = name + 7;
-    u->url.len = rc - 7;
-    u->default_port = 1935;
-    u->uri_part = 1;
-    u->no_resolve = 1; /* want ip here */
-
-    if (ngx_parse_url(s->connection->pool, u) != NGX_OK) {
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                      "notify: pull failed '%V'", &local_name);
-        return NGX_ERROR;
-    }
-
-    ngx_rtmp_relay_pull(s, &local_name, &target);
-
-next:
-
-    return next_play(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_update_handle(ngx_rtmp_session_t *s,
-        void *arg, ngx_chain_t *in)
-{
-    ngx_rtmp_notify_app_conf_t *nacf;
-    ngx_rtmp_notify_ctx_t      *ctx;
-    ngx_int_t                   rc;
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-
-    rc = ngx_rtmp_notify_parse_http_retcode(s, in);
-
-    if ((!nacf->update_strict && rc == NGX_ERROR) ||
-         (nacf->update_strict && rc != NGX_OK))
-    {
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                      "notify: update failed");
-
-        return NGX_ERROR;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "notify: schedule update %Mms",
-                   nacf->update_timeout);
-
-    ngx_add_timer(&ctx->update_evt, nacf->update_timeout);
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_notify_update(ngx_event_t *e)
-{
-    ngx_connection_t           *c;
-    ngx_rtmp_session_t         *s;
-    ngx_rtmp_notify_app_conf_t *nacf;
-    ngx_rtmp_netcall_init_t     ci;
-    ngx_url_t                  *url;
-
-    c = e->data;
-    s = c->data;
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-
-    url = nacf->url[NGX_RTMP_NOTIFY_UPDATE];
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "notify: update '%V'", &url->url);
-
-    ngx_memzero(&ci, sizeof(ci));
-
-    ci.url = url;
-    ci.create = ngx_rtmp_notify_update_create;
-    ci.handle = ngx_rtmp_notify_update_handle;
-
-    if (ngx_rtmp_netcall_create(s, &ci) == NGX_OK) {
-        return;
-    }
-
-    /* schedule next update on connection error */
-
-    ngx_rtmp_notify_update_handle(s, NULL, NULL);
-}
-
-
-static void
-ngx_rtmp_notify_init(ngx_rtmp_session_t *s,
-        u_char name[NGX_RTMP_MAX_NAME], u_char args[NGX_RTMP_MAX_ARGS],
-        ngx_uint_t flags)
-{
-    ngx_rtmp_notify_ctx_t          *ctx;
-    ngx_rtmp_notify_app_conf_t     *nacf;
-    ngx_event_t                    *e;
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-    if (!nacf->active) {
-        return;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
-
-    if (ctx == NULL) {
-        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_notify_ctx_t));
-        if (ctx == NULL) {
-            return;
-        }
-
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_notify_module);
-    }
-
-    ngx_memcpy(ctx->name, name, NGX_RTMP_MAX_NAME);
-    ngx_memcpy(ctx->args, args, NGX_RTMP_MAX_ARGS);
-
-    ctx->flags |= flags;
-
-    if (nacf->url[NGX_RTMP_NOTIFY_UPDATE] == NULL ||
-        nacf->update_timeout == 0)
-    {
-        return;
-    }
-
-    if (ctx->update_evt.timer_set) {
-        return;
-    }
-
-    ctx->start = ngx_cached_time->sec;
-
-    e = &ctx->update_evt;
-
-    e->data = s->connection;
-    e->log = s->connection->log;
-    e->handler = ngx_rtmp_notify_update;
-
-    ngx_add_timer(e, nacf->update_timeout);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "notify: schedule initial update %Mms",
-                   nacf->update_timeout);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_connect(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v)
-{
-    ngx_rtmp_notify_srv_conf_t     *nscf;
-    ngx_rtmp_netcall_init_t         ci;
-    ngx_url_t                      *url;
-
-    if (s->auto_pushed || s->relay) {
-        goto next;
-    }
-
-    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
-
-    url = nscf->url[NGX_RTMP_NOTIFY_CONNECT];
-    if (url == NULL) {
-        goto next;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "notify: connect '%V'", &url->url);
-
-    ngx_memzero(&ci, sizeof(ci));
-
-    ci.url = url;
-    ci.create = ngx_rtmp_notify_connect_create;
-    ci.handle = ngx_rtmp_notify_connect_handle;
-    ci.arg = v;
-    ci.argsize = sizeof(*v);
-
-    return ngx_rtmp_netcall_create(s, &ci);
-
-next:
-    return next_connect(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_disconnect(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_notify_srv_conf_t     *nscf;
-    ngx_rtmp_netcall_init_t         ci;
-    ngx_url_t                      *url;
-
-    if (s->auto_pushed || s->relay) {
-        goto next;
-    }
-
-    nscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_notify_module);
-
-    url = nscf->url[NGX_RTMP_NOTIFY_DISCONNECT];
-    if (url == NULL) {
-        goto next;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "notify: disconnect '%V'", &url->url);
-
-    ngx_memzero(&ci, sizeof(ci));
-
-    ci.url = url;
-    ci.create = ngx_rtmp_notify_disconnect_create;
-
-    ngx_rtmp_netcall_create(s, &ci);
-
-next:
-    return next_disconnect(s);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    ngx_rtmp_notify_app_conf_t     *nacf;
-    ngx_rtmp_netcall_init_t         ci;
-    ngx_url_t                      *url;
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-    if (nacf == NULL) {
-        goto next;
-    }
-
-    url = nacf->url[NGX_RTMP_NOTIFY_PUBLISH];
-
-    ngx_rtmp_notify_init(s, v->name, v->args, NGX_RTMP_NOTIFY_PUBLISHING);
-
-    if (url == NULL) {
-        goto next;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "notify: publish '%V'", &url->url);
-
-    ngx_memzero(&ci, sizeof(ci));
-
-    ci.url = url;
-    ci.create = ngx_rtmp_notify_publish_create;
-    ci.handle = ngx_rtmp_notify_publish_handle;
-    ci.arg = v;
-    ci.argsize = sizeof(*v);
-
-    return ngx_rtmp_netcall_create(s, &ci);
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    ngx_rtmp_notify_app_conf_t     *nacf;
-    ngx_rtmp_netcall_init_t         ci;
-    ngx_url_t                      *url;
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-    if (nacf == NULL) {
-        goto next;
-    }
-
-    url = nacf->url[NGX_RTMP_NOTIFY_PLAY];
-
-    ngx_rtmp_notify_init(s, v->name, v->args, NGX_RTMP_NOTIFY_PLAYING);
-
-    if (url == NULL) {
-        goto next;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "notify: play '%V'", &url->url);
-
-    ngx_memzero(&ci, sizeof(ci));
-
-    ci.url = url;
-    ci.create = ngx_rtmp_notify_play_create;
-    ci.handle = ngx_rtmp_notify_play_handle;
-    ci.arg = v;
-    ci.argsize = sizeof(*v);
-
-    return ngx_rtmp_netcall_create(s, &ci);
-
-next:
-    return next_play(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_close_stream(ngx_rtmp_session_t *s,
-                             ngx_rtmp_close_stream_t *v)
-{
-    ngx_rtmp_notify_ctx_t          *ctx;
-    ngx_rtmp_notify_app_conf_t     *nacf;
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_notify_module);
-
-    if (ctx == NULL) {
-        goto next;
-    }
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-
-    if (nacf == NULL) {
-        goto next;
-    }
-
-    if (ctx->flags & NGX_RTMP_NOTIFY_PUBLISHING) {
-        ngx_rtmp_notify_done(s, "publish_done", NGX_RTMP_NOTIFY_PUBLISH_DONE);
-    }
-
-    if (ctx->flags & NGX_RTMP_NOTIFY_PLAYING) {
-        ngx_rtmp_notify_done(s, "play_done", NGX_RTMP_NOTIFY_PLAY_DONE);
-    }
-
-    if (ctx->flags) {
-        ngx_rtmp_notify_done(s, "done", NGX_RTMP_NOTIFY_DONE);
-    }
-
-    if (ctx->update_evt.timer_set) {
-        ngx_del_timer(&ctx->update_evt);
-    }
-
-    ctx->flags = 0;
-
-next:
-    return next_close_stream(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_record_done(ngx_rtmp_session_t *s, ngx_rtmp_record_done_t *v)
-{
-    ngx_rtmp_netcall_init_t         ci;
-    ngx_rtmp_notify_app_conf_t     *nacf;
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-    if (nacf == NULL || nacf->url[NGX_RTMP_NOTIFY_RECORD_DONE] == NULL) {
-        goto next;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "notify: record_done recorder=%V path='%V' url='%V'",
-                  &v->recorder, &v->path,
-                  &nacf->url[NGX_RTMP_NOTIFY_RECORD_DONE]->url);
-
-    ngx_memzero(&ci, sizeof(ci));
-
-    ci.url    = nacf->url[NGX_RTMP_NOTIFY_RECORD_DONE];
-    ci.create = ngx_rtmp_notify_record_done_create;
-    ci.arg    = v;
-
-    ngx_rtmp_netcall_create(s, &ci);
-
-next:
-    return next_record_done(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_done(ngx_rtmp_session_t *s, char *cbname, ngx_uint_t url_idx)
-{
-    ngx_rtmp_netcall_init_t         ci;
-    ngx_rtmp_notify_done_t          ds;
-    ngx_rtmp_notify_app_conf_t     *nacf;
-    ngx_url_t                      *url;
-
-    nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
-
-    url = nacf->url[url_idx];
-    if (url == NULL) {
-        return NGX_OK;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "notify: %s '%V'", cbname, &url->url);
-
-    ds.cbname = (u_char *) cbname;
-    ds.url_idx = url_idx;
-
-    ngx_memzero(&ci, sizeof(ci));
-
-    ci.url = url;
-    ci.arg = &ds;
-    ci.create = ngx_rtmp_notify_done_create;
-
-    return ngx_rtmp_netcall_create(s, &ci);
-}
-
-
-static ngx_url_t *
-ngx_rtmp_notify_parse_url(ngx_conf_t *cf, ngx_str_t *url)
-{
-    ngx_url_t  *u;
-    size_t      add;
-
-    add = 0;
-
-    u = ngx_pcalloc(cf->pool, sizeof(ngx_url_t));
-    if (u == NULL) {
-        return NULL;
-    }
-
-    if (ngx_strncasecmp(url->data, (u_char *) "http://", 7) == 0) {
-        add = 7;
-    }
-
-    u->url.len = url->len - add;
-    u->url.data = url->data + add;
-    u->default_port = 80;
-    u->uri_part = 1;
-
-    if (ngx_parse_url(cf->pool, u) != NGX_OK) {
-        if (u->err) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                    "%s in url \"%V\"", u->err, &u->url);
-        }
-        return NULL;
-    }
-
-    return u;
-}
-
-
-static char *
-ngx_rtmp_notify_on_srv_event(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_rtmp_notify_srv_conf_t     *nscf = conf;
-
-    ngx_str_t                      *name, *value;
-    ngx_url_t                      *u;
-    ngx_uint_t                      n;
-
-    value = cf->args->elts;
-
-    u = ngx_rtmp_notify_parse_url(cf, &value[1]);
-    if (u == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    name = &value[0];
-
-    n = 0;
-
-    switch (name->len) {
-        case sizeof("on_connect") - 1:
-            n = NGX_RTMP_NOTIFY_CONNECT;
-            break;
-
-        case sizeof("on_disconnect") - 1:
-            n = NGX_RTMP_NOTIFY_DISCONNECT;
-            break;
-    }
-
-    nscf->url[n] = u;
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_rtmp_notify_on_app_event(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_rtmp_notify_app_conf_t     *nacf = conf;
-
-    ngx_str_t                      *name, *value;
-    ngx_url_t                      *u;
-    ngx_uint_t                      n;
-
-    value = cf->args->elts;
-
-    u = ngx_rtmp_notify_parse_url(cf, &value[1]);
-    if (u == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    name = &value[0];
-
-    n = 0;
-
-    switch (name->len) {
-        case sizeof("on_done") - 1: /* and on_play */
-            if (name->data[3] == 'd') {
-                n = NGX_RTMP_NOTIFY_DONE;
-            } else {
-                n = NGX_RTMP_NOTIFY_PLAY;
-            }
-            break;
-
-        case sizeof("on_update") - 1:
-            n = NGX_RTMP_NOTIFY_UPDATE;
-            break;
-
-        case sizeof("on_publish") - 1:
-            n = NGX_RTMP_NOTIFY_PUBLISH;
-            break;
-
-        case sizeof("on_play_done") - 1:
-            n = NGX_RTMP_NOTIFY_PLAY_DONE;
-            break;
-
-        case sizeof("on_record_done") - 1:
-            n = NGX_RTMP_NOTIFY_RECORD_DONE;
-            break;
-
-        case sizeof("on_publish_done") - 1:
-            n = NGX_RTMP_NOTIFY_PUBLISH_DONE;
-            break;
-    }
-
-    nacf->url[n] = u;
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_rtmp_notify_method(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_rtmp_notify_app_conf_t     *nacf = conf;
-
-    ngx_rtmp_notify_srv_conf_t     *nscf;
-    ngx_str_t                      *value;
-
-    value = cf->args->elts;
-    value++;
-
-    if (value->len == sizeof("get") - 1 &&
-        ngx_strncasecmp(value->data, (u_char *) "get", value->len) == 0)
-    {
-        nacf->method = NGX_RTMP_NETCALL_HTTP_GET;
-
-    } else if (value->len == sizeof("post") - 1 &&
-               ngx_strncasecmp(value->data, (u_char *) "post", value->len) == 0)
-    {
-        nacf->method = NGX_RTMP_NETCALL_HTTP_POST;
-
-    } else {
-        return "got unexpected method";
-    }
-
-    nscf = ngx_rtmp_conf_get_module_srv_conf(cf, ngx_rtmp_notify_module);
-    nscf->method = nacf->method;
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_notify_postconfiguration(ngx_conf_t *cf)
-{
-    next_connect = ngx_rtmp_connect;
-    ngx_rtmp_connect = ngx_rtmp_notify_connect;
-
-    next_disconnect = ngx_rtmp_disconnect;
-    ngx_rtmp_disconnect = ngx_rtmp_notify_disconnect;
-
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_notify_publish;
-
-    next_play = ngx_rtmp_play;
-    ngx_rtmp_play = ngx_rtmp_notify_play;
-
-    next_close_stream = ngx_rtmp_close_stream;
-    ngx_rtmp_close_stream = ngx_rtmp_notify_close_stream;
-
-    next_record_done = ngx_rtmp_record_done;
-    ngx_rtmp_record_done = ngx_rtmp_notify_record_done;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_play_module.c b/debian/modules/rtmp/ngx_rtmp_play_module.c
deleted file mode 100644
index f6ea6c3..0000000
--- a/debian/modules/rtmp/ngx_rtmp_play_module.c
+++ /dev/null
@@ -1,1278 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <nginx.h>
-#include "ngx_rtmp_play_module.h"
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_netcall_module.h"
-#include "ngx_rtmp_streams.h"
-
-
-static ngx_rtmp_play_pt                 next_play;
-static ngx_rtmp_close_stream_pt         next_close_stream;
-static ngx_rtmp_seek_pt                 next_seek;
-static ngx_rtmp_pause_pt                next_pause;
-
-
-static char *ngx_rtmp_play_url(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static void *ngx_rtmp_play_create_main_conf(ngx_conf_t *cf);
-static ngx_int_t ngx_rtmp_play_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_play_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_play_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-
-static ngx_int_t ngx_rtmp_play_do_init(ngx_rtmp_session_t *s);
-static ngx_int_t ngx_rtmp_play_do_done(ngx_rtmp_session_t *s);
-static ngx_int_t ngx_rtmp_play_do_start(ngx_rtmp_session_t *s);
-static ngx_int_t ngx_rtmp_play_do_stop(ngx_rtmp_session_t *s);
-static ngx_int_t ngx_rtmp_play_do_seek(ngx_rtmp_session_t *s,
-                                       ngx_uint_t timestamp);
-
-static ngx_int_t ngx_rtmp_play_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v);
-static ngx_int_t ngx_rtmp_play_seek(ngx_rtmp_session_t *s, ngx_rtmp_seek_t *v);
-static ngx_int_t ngx_rtmp_play_pause(ngx_rtmp_session_t *s,
-                                     ngx_rtmp_pause_t *v);
-static void ngx_rtmp_play_send(ngx_event_t *e);
-static ngx_int_t ngx_rtmp_play_open(ngx_rtmp_session_t *s, double start);
-static ngx_int_t ngx_rtmp_play_remote_handle(ngx_rtmp_session_t *s,
-       void *arg, ngx_chain_t *in);
-static ngx_chain_t * ngx_rtmp_play_remote_create(ngx_rtmp_session_t *s,
-       void *arg, ngx_pool_t *pool);
-static ngx_int_t ngx_rtmp_play_open_remote(ngx_rtmp_session_t *s,
-       ngx_rtmp_play_t *v);
-static ngx_int_t ngx_rtmp_play_next_entry(ngx_rtmp_session_t *s,
-       ngx_rtmp_play_t *v);
-static ngx_rtmp_play_entry_t * ngx_rtmp_play_get_current_entry(
-       ngx_rtmp_session_t *s);
-static void ngx_rtmp_play_cleanup_local_file(ngx_rtmp_session_t *s);
-static void ngx_rtmp_play_copy_local_file(ngx_rtmp_session_t *s, u_char *name);
-static u_char * ngx_rtmp_play_get_local_file_path(ngx_rtmp_session_t *s);
-
-
-static ngx_command_t  ngx_rtmp_play_commands[] = {
-
-    { ngx_string("play"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_play_url,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("play_temp_path"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_play_app_conf_t, temp_path),
-      NULL },
-
-    { ngx_string("play_local_path"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_play_app_conf_t, local_path),
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_play_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_play_postconfiguration,        /* postconfiguration */
-    ngx_rtmp_play_create_main_conf,         /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    ngx_rtmp_play_create_app_conf,          /* create app configuration */
-    ngx_rtmp_play_merge_app_conf            /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_play_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_play_module_ctx,              /* module context */
-    ngx_rtmp_play_commands,                 /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-#define NGX_RTMP_PLAY_TMP_FILE              "nginx-rtmp-vod."
-
-
-static void *
-ngx_rtmp_play_create_main_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_play_main_conf_t      *pmcf;
-
-    pmcf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_main_conf_t));
-    if (pmcf == NULL) {
-        return NULL;
-    }
-
-    if (ngx_array_init(&pmcf->fmts, cf->pool, 1,
-                       sizeof(ngx_rtmp_play_fmt_t *))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-    return pmcf;
-}
-
-
-static void *
-ngx_rtmp_play_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_play_app_conf_t      *pacf;
-
-    pacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_app_conf_t));
-    if (pacf == NULL) {
-        return NULL;
-    }
-
-    pacf->nbuckets = 1024;
-
-    return pacf;
-}
-
-
-static char *
-ngx_rtmp_play_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_play_app_conf_t *prev = parent;
-    ngx_rtmp_play_app_conf_t *conf = child;
-    ngx_rtmp_play_entry_t   **ppe;
-
-    ngx_conf_merge_str_value(conf->temp_path, prev->temp_path, "/tmp");
-    ngx_conf_merge_str_value(conf->local_path, prev->local_path, "");
-
-    if (prev->entries.nelts == 0) {
-        goto done;
-    }
-
-    if (conf->entries.nelts == 0) {
-        conf->entries = prev->entries;
-        goto done;
-    }
-
-    ppe = ngx_array_push_n(&conf->entries, prev->entries.nelts);
-    if (ppe == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_memcpy(ppe, prev->entries.elts, prev->entries.nelts * sizeof(void *));
-
-done:
-
-    if (conf->entries.nelts == 0) {
-        return NGX_CONF_OK;
-    }
-
-    conf->ctx = ngx_pcalloc(cf->pool, sizeof(void *) * conf->nbuckets);
-    if (conf->ctx == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_join(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_ctx_t        *ctx, **pctx;
-    ngx_rtmp_play_app_conf_t   *pacf;
-    ngx_uint_t                  h;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: join");
-
-    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-    if (ctx == NULL || ctx->joined) {
-        return NGX_ERROR;
-    }
-
-    h = ngx_hash_key(ctx->name, ngx_strlen(ctx->name));
-    pctx = &pacf->ctx[h % pacf->nbuckets];
-
-    while (*pctx) {
-        if (!ngx_strncmp((*pctx)->name, ctx->name, NGX_RTMP_MAX_NAME)) {
-            break;
-        }
-        pctx = &(*pctx)->next;
-    }
-
-    ctx->next = *pctx;
-    *pctx = ctx;
-    ctx->joined = 1;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_leave(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_ctx_t        *ctx, **pctx;
-    ngx_rtmp_play_app_conf_t   *pacf;
-    ngx_uint_t                  h;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: leave");
-
-    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-    if (ctx == NULL || !ctx->joined) {
-        return NGX_ERROR;
-    }
-
-    h = ngx_hash_key(ctx->name, ngx_strlen(ctx->name));
-    pctx = &pacf->ctx[h % pacf->nbuckets];
-
-    while (*pctx && *pctx != ctx) {
-        pctx = &(*pctx)->next;
-    }
-
-    if (*pctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    *pctx = (*pctx)->next;
-    ctx->joined = 0;
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_play_send(ngx_event_t *e)
-{
-    ngx_rtmp_session_t     *s = e->data;
-    ngx_rtmp_play_ctx_t    *ctx;
-    ngx_int_t               rc;
-    ngx_uint_t              ts;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx == NULL || ctx->fmt == NULL || ctx->fmt->send == NULL) {
-        return;
-    }
-
-    ts = 0;
-
-    rc = ctx->fmt->send(s, &ctx->file, &ts);
-
-    if (rc > 0) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "play: send schedule %i", rc);
-
-        ngx_add_timer(e, rc);
-        return;
-    }
-
-    if (rc == NGX_AGAIN) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "play: send buffer full");
-
-        ngx_post_event(e, &s->posted_dry_events);
-        return;
-    }
-
-    if (rc == NGX_OK) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "play: send restart");
-
-        ngx_post_event(e, &ngx_posted_events);
-        return;
-    }
-
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: send done");
-
-    ngx_rtmp_send_stream_eof(s, NGX_RTMP_MSID);
-
-    ngx_rtmp_send_play_status(s, "NetStream.Play.Complete", "status", ts, 0);
-
-    ngx_rtmp_send_status(s, "NetStream.Play.Stop", "status", "Stopped");
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_do_init(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_ctx_t            *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (ctx->fmt && ctx->fmt->init &&
-        ctx->fmt->init(s, &ctx->file, ctx->aindex, ctx->vindex) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_do_done(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_ctx_t            *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (ctx->fmt && ctx->fmt->done &&
-        ctx->fmt->done(s, &ctx->file) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_do_start(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_ctx_t            *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: start");
-
-    if (ctx->fmt && ctx->fmt->start &&
-        ctx->fmt->start(s, &ctx->file) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_post_event((&ctx->send_evt), &ngx_posted_events);
-
-    ctx->playing = 1;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_do_seek(ngx_rtmp_session_t *s, ngx_uint_t timestamp)
-{
-    ngx_rtmp_play_ctx_t            *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: seek timestamp=%ui", timestamp);
-
-    if (ctx->fmt && ctx->fmt->seek &&
-        ctx->fmt->seek(s, &ctx->file, timestamp) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    if (ctx->playing) {
-        ngx_post_event((&ctx->send_evt), &ngx_posted_events);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_do_stop(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_ctx_t            *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: stop");
-
-    if (ctx->send_evt.timer_set) {
-        ngx_del_timer(&ctx->send_evt);
-    }
-
-#if (nginx_version >= 1007005)
-    if (ctx->send_evt.posted)
-#else
-    if (ctx->send_evt.prev)
-#endif
-    {
-        ngx_delete_posted_event((&ctx->send_evt));
-    }
-
-    if (ctx->fmt && ctx->fmt->stop &&
-        ctx->fmt->stop(s, &ctx->file) != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    ctx->playing = 0;
-
-    return NGX_OK;
-}
-
-
-/* This function returns pointer to a static buffer */
-
-static u_char *
-ngx_rtmp_play_get_local_file_path(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_app_conf_t       *pacf;
-    ngx_rtmp_play_ctx_t            *ctx;
-    u_char                         *p;
-    static u_char                   path[NGX_MAX_PATH + 1];
-
-    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    p = ngx_snprintf(path, NGX_MAX_PATH, "%V/" NGX_RTMP_PLAY_TMP_FILE "%ui",
-                     &pacf->temp_path, ctx->file_id);
-    *p = 0;
-
-    return path;
-}
-
-
-static void
-ngx_rtmp_play_copy_local_file(ngx_rtmp_session_t *s, u_char *name)
-{
-    ngx_rtmp_play_app_conf_t   *pacf;
-    ngx_rtmp_play_ctx_t        *ctx;
-    u_char                     *path, *p;
-    static u_char               dpath[NGX_MAX_PATH + 1];
-
-    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
-    if (pacf == NULL) {
-        return;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-    if (ctx == NULL || ctx->file_id == 0) {
-        return;
-    }
-
-    path = ngx_rtmp_play_get_local_file_path(s);
-
-    p = ngx_snprintf(dpath, NGX_MAX_PATH, "%V/%s%V", &pacf->local_path,
-                     name + ctx->pfx_size, &ctx->sfx);
-    *p = 0;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: copy local file '%s' to '%s'", path, dpath);
-
-    if (ngx_rename_file(path, dpath) == 0) {
-        ctx->file_id = 0;
-        return;
-    }
-
-    ngx_log_error(NGX_LOG_ERR, s->connection->log, ngx_errno,
-                  "play: error copying local file '%s' to '%s'",
-                  path, dpath);
-
-    ngx_rtmp_play_cleanup_local_file(s);
-}
-
-
-static void
-ngx_rtmp_play_cleanup_local_file(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_ctx_t        *ctx;
-    u_char                     *path;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-    if (ctx == NULL || ctx->file_id == 0) {
-        return;
-    }
-
-    path = ngx_rtmp_play_get_local_file_path(s);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: deleting local file '%s'", path);
-
-    ctx->file_id = 0;
-
-    ngx_delete_file(path);
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
-{
-    ngx_rtmp_play_ctx_t        *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-    if (ctx == NULL) {
-        goto next;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: close_stream");
-
-    ngx_rtmp_play_do_stop(s);
-
-    ngx_rtmp_play_do_done(s);
-
-    if (ctx->file.fd != NGX_INVALID_FILE) {
-        ngx_close_file(ctx->file.fd);
-        ctx->file.fd = NGX_INVALID_FILE;
-
-        ngx_rtmp_send_stream_eof(s, NGX_RTMP_MSID);
-
-        ngx_rtmp_send_status(s, "NetStream.Play.Stop", "status",
-                             "Stop video on demand");
-    }
-
-    if (ctx->file_id) {
-        ngx_rtmp_play_cleanup_local_file(s);
-    }
-
-    ngx_rtmp_play_leave(s);
-
-next:
-    return next_close_stream(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_seek(ngx_rtmp_session_t *s, ngx_rtmp_seek_t *v)
-{
-    ngx_rtmp_play_ctx_t            *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-    if (ctx == NULL || ctx->file.fd == NGX_INVALID_FILE) {
-        goto next;
-    }
-
-    if (!ctx->opened) {
-        ctx->post_seek = (ngx_uint_t) v->offset;
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "play: post seek=%ui", ctx->post_seek);
-        goto next;
-    }
-
-    if (ngx_rtmp_send_stream_eof(s, NGX_RTMP_MSID) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    ngx_rtmp_play_do_seek(s, (ngx_uint_t) v->offset);
-
-    if (ngx_rtmp_send_status(s, "NetStream.Seek.Notify", "status", "Seeking")
-        != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_send_stream_begin(s, NGX_RTMP_MSID) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-next:
-    return next_seek(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_pause(ngx_rtmp_session_t *s, ngx_rtmp_pause_t *v)
-{
-    ngx_rtmp_play_ctx_t            *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx == NULL || ctx->file.fd == NGX_INVALID_FILE) {
-        goto next;
-    }
-
-    if (!ctx->opened) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "play: pause ignored");
-        goto next;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: pause=%i timestamp=%f",
-                   (ngx_int_t) v->pause, v->position);
-
-    if (v->pause) {
-        if (ngx_rtmp_send_status(s, "NetStream.Pause.Notify", "status",
-                                 "Paused video on demand")
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        ngx_rtmp_play_do_stop(s);
-
-    } else {
-        if (ngx_rtmp_send_status(s, "NetStream.Unpause.Notify", "status",
-                                 "Unpaused video on demand")
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        ngx_rtmp_play_do_start(s); /*TODO: v->position? */
-    }
-
-next:
-    return next_pause(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_parse_index(char type, u_char *args)
-{
-    u_char             *p, c;
-    static u_char       name[] = "xindex=";
-
-    name[0] = (u_char) type;
-
-    for ( ;; ) {
-        p = (u_char *) ngx_strstr(args, name);
-        if (p == NULL) {
-            return 0;
-        }
-
-        if (p != args) {
-            c = *(p - 1);
-            if (c != '?' && c != '&') {
-                args = p + 1;
-                continue;
-            }
-        }
-
-        return atoi((char *) p + (sizeof(name) - 1));
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    ngx_rtmp_play_main_conf_t      *pmcf;
-    ngx_rtmp_play_app_conf_t       *pacf;
-    ngx_rtmp_play_ctx_t            *ctx;
-    u_char                         *p;
-    ngx_rtmp_play_fmt_t            *fmt, **pfmt;
-    ngx_str_t                      *pfx, *sfx;
-    ngx_str_t                       name;
-    ngx_uint_t                      n;
-
-    pmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_play_module);
-
-    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
-
-    if (pacf == NULL || pacf->entries.nelts == 0) {
-        goto next;
-    }
-
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                  "play: play name='%s' timestamp=%i",
-                  v->name, (ngx_int_t) v->start);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx && ctx->file.fd != NGX_INVALID_FILE) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                     "play: already playing");
-        goto next;
-    }
-
-    /* check for double-dot in v->name;
-     * we should not move out of play directory */
-    for (p = v->name; *p; ++p) {
-        if (ngx_path_separator(p[0]) &&
-            p[1] == '.' && p[2] == '.' &&
-            ngx_path_separator(p[3]))
-        {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                         "play: bad name '%s'", v->name);
-            return NGX_ERROR;
-        }
-    }
-
-    if (ctx == NULL) {
-        ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_play_ctx_t));
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_play_module);
-    }
-
-    ngx_memzero(ctx, sizeof(*ctx));
-
-    ctx->session = s;
-    ctx->aindex = ngx_rtmp_play_parse_index('a', v->args);
-    ctx->vindex = ngx_rtmp_play_parse_index('v', v->args);
-
-    ctx->file.log = s->connection->log;
-
-    ngx_memcpy(ctx->name, v->name, NGX_RTMP_MAX_NAME);
-
-    name.len = ngx_strlen(v->name);
-    name.data = v->name;
-
-    pfmt = pmcf->fmts.elts;
-
-    for (n = 0; n < pmcf->fmts.nelts; ++n, ++pfmt) {
-        fmt = *pfmt;
-
-        pfx = &fmt->pfx;
-        sfx = &fmt->sfx;
-
-        if (pfx->len == 0 && ctx->fmt == NULL) {
-            ctx->fmt = fmt;
-        }
-
-        if (pfx->len && name.len >= pfx->len &&
-            ngx_strncasecmp(pfx->data, name.data, pfx->len) == 0)
-        {
-            ctx->pfx_size = pfx->len;
-            ctx->fmt = fmt;
-
-            break;
-        }
-
-        if (name.len >= sfx->len &&
-            ngx_strncasecmp(sfx->data, name.data + name.len - sfx->len,
-                            sfx->len) == 0)
-        {
-            ctx->fmt = fmt;
-        }
-    }
-
-    if (ctx->fmt == NULL) {
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                      "play: fmt not found");
-        goto next;
-    }
-
-    ctx->file.fd = NGX_INVALID_FILE;
-    ctx->nentry = NGX_CONF_UNSET_UINT;
-    ctx->post_seek = NGX_CONF_UNSET_UINT;
-
-    sfx = &ctx->fmt->sfx;
-
-    if (name.len < sfx->len ||
-        ngx_strncasecmp(sfx->data, name.data + name.len - sfx->len,
-                        sfx->len))
-    {
-        ctx->sfx = *sfx;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: fmt=%V", &ctx->fmt->name);
-
-    return ngx_rtmp_play_next_entry(s, v);
-
-next:
-    return next_play(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_next_entry(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    ngx_rtmp_play_app_conf_t   *pacf;
-    ngx_rtmp_play_ctx_t        *ctx;
-    ngx_rtmp_play_entry_t      *pe;
-    u_char                     *p;
-    static u_char               path[NGX_MAX_PATH + 1];
-
-    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    for ( ;; ) {
-
-        if (ctx->file.fd != NGX_INVALID_FILE) {
-            ngx_close_file(ctx->file.fd);
-            ctx->file.fd = NGX_INVALID_FILE;
-        }
-
-        if (ctx->file_id) {
-            ngx_rtmp_play_cleanup_local_file(s);
-        }
-
-        ctx->nentry = (ctx->nentry == NGX_CONF_UNSET_UINT ?
-                       0 : ctx->nentry + 1);
-
-        if (ctx->nentry >= pacf->entries.nelts) {
-            ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "play: all entries failed");
-
-            ngx_rtmp_send_status(s, "NetStream.Play.StreamNotFound", "error",
-                                 "Video on demand stream not found");
-            break;
-        }
-
-        pe = ngx_rtmp_play_get_current_entry(s);
-
-        ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "play: trying %s entry %ui/%uz '%V'",
-                       pe->url ? "remote" : "local",
-                       ctx->nentry + 1, pacf->entries.nelts,
-                       pe->url ? &pe->url->url : pe->root);
-
-        /* open remote */
-
-        if (pe->url) {
-            return ngx_rtmp_play_open_remote(s, v);
-        }
-
-        /* open local */
-
-        p = ngx_snprintf(path, NGX_MAX_PATH, "%V/%s%V",
-                         pe->root, v->name + ctx->pfx_size, &ctx->sfx);
-        *p = 0;
-
-        ctx->file.fd = ngx_open_file(path, NGX_FILE_RDONLY, NGX_FILE_OPEN,
-                                     NGX_FILE_DEFAULT_ACCESS);
-
-        if (ctx->file.fd == NGX_INVALID_FILE) {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, ngx_errno,
-                           "play: error opening file '%s'", path);
-            continue;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "play: open local file '%s'", path);
-
-        if (ngx_rtmp_play_open(s, v->start) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        break;
-    }
-
-    return next_play(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_open(ngx_rtmp_session_t *s, double start)
-{
-    ngx_rtmp_play_ctx_t    *ctx;
-    ngx_event_t            *e;
-    ngx_uint_t              timestamp;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx->file.fd == NGX_INVALID_FILE) {
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_send_stream_begin(s, NGX_RTMP_MSID) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_send_status(s, "NetStream.Play.Start", "status",
-                             "Start video on demand")
-        != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_play_join(s) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    e = &ctx->send_evt;
-    e->data = s;
-    e->handler = ngx_rtmp_play_send;
-    e->log = s->connection->log;
-
-    ngx_rtmp_send_recorded(s, 1);
-
-    if (ngx_rtmp_send_sample_access(s) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_play_do_init(s) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    timestamp = ctx->post_seek != NGX_CONF_UNSET_UINT ? ctx->post_seek :
-                (start < 0 ? 0 : (ngx_uint_t) start);
-
-    if (ngx_rtmp_play_do_seek(s, timestamp) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    if (ngx_rtmp_play_do_start(s) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    ctx->opened = 1;
-
-    return NGX_OK;
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_play_remote_create(ngx_rtmp_session_t *s, void *arg, ngx_pool_t *pool)
-{
-    ngx_rtmp_play_t                *v = arg;
-
-    ngx_rtmp_play_ctx_t            *ctx;
-    ngx_rtmp_play_entry_t          *pe;
-    ngx_str_t                      *addr_text, uri;
-    u_char                         *p, *name;
-    size_t                          args_len, name_len, len;
-    static ngx_str_t                text_plain = ngx_string("text/plain");
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    pe = ngx_rtmp_play_get_current_entry(s);
-
-    name = v->name + ctx->pfx_size;
-
-    name_len = ngx_strlen(name);
-    args_len = ngx_strlen(v->args);
-    addr_text = &s->connection->addr_text;
-
-    len = pe->url->uri.len + 1 +
-          name_len + ctx->sfx.len +
-          sizeof("?addr=") + addr_text->len * 3 +
-          1 + args_len;
-
-    uri.data = ngx_palloc(pool, len);
-    if (uri.data == NULL) {
-        return NULL;
-    }
-
-    p = uri.data;
-
-    p = ngx_cpymem(p, pe->url->uri.data, pe->url->uri.len);
-
-    if (p == uri.data || p[-1] != '/') {
-        *p++ = '/';
-    }
-
-    p = ngx_cpymem(p, name, name_len);
-    p = ngx_cpymem(p, ctx->sfx.data, ctx->sfx.len);
-    p = ngx_cpymem(p, (u_char*)"?addr=", sizeof("&addr=") -1);
-    p = (u_char*)ngx_escape_uri(p, addr_text->data, addr_text->len,
-                                NGX_ESCAPE_ARGS);
-    if (args_len) {
-        *p++ = '&';
-        p = (u_char *) ngx_cpymem(p, v->args, args_len);
-    }
-
-    uri.len = p - uri.data;
-
-    return ngx_rtmp_netcall_http_format_request(NGX_RTMP_NETCALL_HTTP_GET,
-                                                &pe->url->host, &uri,
-                                                NULL, NULL, pool, &text_plain);
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_remote_handle(ngx_rtmp_session_t *s, void *arg, ngx_chain_t *in)
-{
-    ngx_rtmp_play_t        *v = arg;
-
-    ngx_rtmp_play_ctx_t    *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    if (ctx->nbody == 0) {
-        return ngx_rtmp_play_next_entry(s, v);
-    }
-
-    if (ctx->file_id) {
-        ngx_rtmp_play_copy_local_file(s, v->name);
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: open remote file");
-
-    if (ngx_rtmp_play_open(s, v->start) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return next_play(s, (ngx_rtmp_play_t *)arg);
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_remote_sink(ngx_rtmp_session_t *s, ngx_chain_t *in)
-{
-    ngx_rtmp_play_ctx_t    *ctx;
-    ngx_buf_t              *b;
-    ngx_int_t               rc;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    /* skip HTTP header */
-    while (in && ctx->ncrs != 2) {
-        b = in->buf;
-
-        for (; b->pos != b->last && ctx->ncrs != 2; ++b->pos) {
-            switch (*b->pos) {
-                case '\n':
-                    ++ctx->ncrs;
-                case '\r':
-                    break;
-                default:
-                    ctx->ncrs = 0;
-            }
-            /* 10th header byte is HTTP response header */
-            if (++ctx->nheader == 10 && *b->pos != (u_char) '2') {
-                ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                              "play: remote HTTP response code: %cxx",
-                              *b->pos);
-                return NGX_ERROR;
-            }
-        }
-
-        if (b->pos == b->last) {
-            in = in->next;
-        }
-    }
-
-    /* write to temp file */
-    for (; in; in = in->next) {
-        b = in->buf;
-
-        if (b->pos == b->last) {
-            continue;
-        }
-
-        rc = ngx_write_fd(ctx->file.fd, b->pos, b->last - b->pos);
-
-        if (rc == NGX_ERROR) {
-            ngx_log_error(NGX_LOG_INFO, s->connection->log, ngx_errno,
-                          "play: error writing to temp file");
-            return NGX_ERROR;
-        }
-
-        ctx->nbody += rc;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_rtmp_play_entry_t *
-ngx_rtmp_play_get_current_entry(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_app_conf_t   *pacf;
-    ngx_rtmp_play_ctx_t        *ctx;
-    ngx_rtmp_play_entry_t     **ppe;
-
-    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    ppe = pacf->entries.elts;
-
-    return ppe[ctx->nentry];
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_open_remote(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    ngx_rtmp_play_app_conf_t       *pacf;
-    ngx_rtmp_play_ctx_t            *ctx;
-    ngx_rtmp_play_entry_t          *pe;
-    ngx_rtmp_netcall_init_t         ci;
-    u_char                         *path;
-    ngx_err_t                       err;
-    static ngx_uint_t               file_id;
-
-    pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
-
-    ctx->ncrs = 0;
-    ctx->nheader = 0;
-    ctx->nbody = 0;
-
-    for ( ;; ) {
-        ctx->file_id = ++file_id;
-
-        /* no zero after overflow */
-        if (ctx->file_id == 0) {
-            continue;
-        }
-
-        path = ngx_rtmp_play_get_local_file_path(s);
-
-        ctx->file.fd = ngx_open_tempfile(path, pacf->local_path.len, 0);
-
-        if (pacf->local_path.len == 0) {
-            ctx->file_id = 0;
-        }
-
-        if (ctx->file.fd != NGX_INVALID_FILE) {
-            break;
-        }
-
-        err = ngx_errno;
-
-        if (err != NGX_EEXIST) {
-            ctx->file_id = 0;
-
-            ngx_log_error(NGX_LOG_INFO, s->connection->log, err,
-                          "play: failed to create temp file");
-
-            return NGX_ERROR;
-        }
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "play: temp file '%s' file_id=%ui",
-                   path, ctx->file_id);
-
-    pe = ngx_rtmp_play_get_current_entry(s);
-
-    ngx_memzero(&ci, sizeof(ci));
-
-    ci.url = pe->url;
-    ci.create = ngx_rtmp_play_remote_create;
-    ci.sink   = ngx_rtmp_play_remote_sink;
-    ci.handle = ngx_rtmp_play_remote_handle;
-    ci.arg = v;
-    ci.argsize = sizeof(*v);
-
-    return ngx_rtmp_netcall_create(s, &ci);
-}
-
-
-static char *
-ngx_rtmp_play_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_rtmp_play_app_conf_t       *pacf = conf;
-
-    ngx_rtmp_play_entry_t          *pe, **ppe;
-    ngx_str_t                       url;
-    ngx_url_t                      *u;
-    size_t                          add, n;
-    ngx_str_t                      *value;
-
-    if (pacf->entries.nalloc == 0 &&
-        ngx_array_init(&pacf->entries, cf->pool, 1, sizeof(void *)) != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
-    value = cf->args->elts;
-
-    for (n = 1; n < cf->args->nelts; ++n) {
-
-        ppe = ngx_array_push(&pacf->entries);
-        if (ppe == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        pe = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_entry_t));
-        if (pe == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        *ppe = pe;
-
-        if (ngx_strncasecmp(value[n].data, (u_char *) "http://", 7)) {
-
-            /* local file */
-
-            pe->root = ngx_palloc(cf->pool, sizeof(ngx_str_t));
-            if (pe->root == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            *pe->root = value[n];
-
-            continue;
-        }
-
-        /* http case */
-
-        url = value[n];
-
-        add = sizeof("http://") - 1;
-
-        url.data += add;
-        url.len  -= add;
-
-        u = ngx_pcalloc(cf->pool, sizeof(ngx_url_t));
-        if (u == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        u->url.len = url.len;
-        u->url.data = url.data;
-        u->default_port = 80;
-        u->uri_part = 1;
-
-        if (ngx_parse_url(cf->pool, u) != NGX_OK) {
-            if (u->err) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                        "%s in url \"%V\"", u->err, &u->url);
-            }
-            return NGX_CONF_ERROR;
-        }
-
-        pe->url = u;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_play_postconfiguration(ngx_conf_t *cf)
-{
-    next_play = ngx_rtmp_play;
-    ngx_rtmp_play = ngx_rtmp_play_play;
-
-    next_close_stream = ngx_rtmp_close_stream;
-    ngx_rtmp_close_stream = ngx_rtmp_play_close_stream;
-
-    next_seek = ngx_rtmp_seek;
-    ngx_rtmp_seek = ngx_rtmp_play_seek;
-
-    next_pause = ngx_rtmp_pause;
-    ngx_rtmp_pause = ngx_rtmp_play_pause;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_play_module.h b/debian/modules/rtmp/ngx_rtmp_play_module.h
deleted file mode 100644
index b0650b5..0000000
--- a/debian/modules/rtmp/ngx_rtmp_play_module.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_PLAY_H_INCLUDED_
-#define _NGX_RTMP_PLAY_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_cmd_module.h"
-
-
-typedef ngx_int_t (*ngx_rtmp_play_init_pt)  (ngx_rtmp_session_t *s,
-        ngx_file_t *f, ngx_int_t aindex, ngx_int_t vindex);
-typedef ngx_int_t (*ngx_rtmp_play_done_pt)  (ngx_rtmp_session_t *s,
-        ngx_file_t *f);
-typedef ngx_int_t (*ngx_rtmp_play_start_pt) (ngx_rtmp_session_t *s,
-        ngx_file_t *f);
-typedef ngx_int_t (*ngx_rtmp_play_seek_pt)  (ngx_rtmp_session_t *s,
-        ngx_file_t *f, ngx_uint_t offs);
-typedef ngx_int_t (*ngx_rtmp_play_stop_pt)  (ngx_rtmp_session_t *s,
-        ngx_file_t *f);
-typedef ngx_int_t (*ngx_rtmp_play_send_pt)  (ngx_rtmp_session_t *s,
-        ngx_file_t *f, ngx_uint_t *ts);
-
-
-typedef struct {
-    ngx_str_t               name;
-    ngx_str_t               pfx;
-    ngx_str_t               sfx;
-
-    ngx_rtmp_play_init_pt   init;
-    ngx_rtmp_play_done_pt   done;
-    ngx_rtmp_play_start_pt  start;
-    ngx_rtmp_play_seek_pt   seek;
-    ngx_rtmp_play_stop_pt   stop;
-    ngx_rtmp_play_send_pt   send;
-} ngx_rtmp_play_fmt_t;
-
-
-typedef struct ngx_rtmp_play_ctx_s ngx_rtmp_play_ctx_t;
-
-
-struct ngx_rtmp_play_ctx_s {
-    ngx_rtmp_session_t     *session;
-    ngx_file_t              file;
-    ngx_rtmp_play_fmt_t    *fmt;
-    ngx_event_t             send_evt;
-    unsigned                playing:1;
-    unsigned                opened:1;
-    unsigned                joined:1;
-    ngx_uint_t              ncrs;
-    ngx_uint_t              nheader;
-    ngx_uint_t              nbody;
-    size_t                  pfx_size;
-    ngx_str_t               sfx;
-    ngx_uint_t              file_id;
-    ngx_int_t               aindex, vindex;
-    ngx_uint_t              nentry;
-    ngx_uint_t              post_seek;
-    u_char                  name[NGX_RTMP_MAX_NAME];
-    ngx_rtmp_play_ctx_t    *next;
-};
-
-
-typedef struct {
-    ngx_str_t              *root;
-    ngx_url_t              *url;
-} ngx_rtmp_play_entry_t;
-
-
-typedef struct {
-    ngx_str_t               temp_path;
-    ngx_str_t               local_path;
-    ngx_array_t             entries; /* ngx_rtmp_play_entry_t * */
-    ngx_uint_t              nbuckets;
-    ngx_rtmp_play_ctx_t   **ctx;
-} ngx_rtmp_play_app_conf_t;
-
-
-typedef struct {
-    ngx_array_t             fmts; /* ngx_rtmp_play_fmt_t * */
-} ngx_rtmp_play_main_conf_t;
-
-
-extern ngx_module_t         ngx_rtmp_play_module;
-
-
-#endif /* _NGX_RTMP_PLAY_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_proxy_protocol.c b/debian/modules/rtmp/ngx_rtmp_proxy_protocol.c
deleted file mode 100644
index ffa2680..0000000
--- a/debian/modules/rtmp/ngx_rtmp_proxy_protocol.c
+++ /dev/null
@@ -1,197 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <nginx.h>
-#include "ngx_rtmp_proxy_protocol.h"
-
-
-static void ngx_rtmp_proxy_protocol_recv(ngx_event_t *rev);
-
-
-void
-ngx_rtmp_proxy_protocol(ngx_rtmp_session_t *s)
-{
-    ngx_event_t       *rev;
-    ngx_connection_t  *c;
-
-    c = s->connection;
-    rev = c->read;
-    rev->handler =  ngx_rtmp_proxy_protocol_recv;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "proxy_protocol: start");
-
-    if (rev->ready) {
-        /* the deferred accept(), rtsig, aio, iocp */
-
-        if (ngx_use_accept_mutex) {
-            ngx_post_event(rev, &ngx_posted_events);
-            return;
-        }
-
-        rev->handler(rev);
-        return;
-    }
-
-    ngx_add_timer(rev, s->timeout);
-
-    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-}
-
-
-static void
-ngx_rtmp_proxy_protocol_recv(ngx_event_t *rev)
-{
-    u_char               buf[107], *p, *pp, *text;
-    size_t               len;
-    ssize_t              n;
-    ngx_err_t            err;
-    ngx_int_t            i;
-    ngx_addr_t           addr;
-    ngx_connection_t    *c;
-    ngx_rtmp_session_t  *s;
-
-    c = rev->data;
-    s = c->data;
-
-    if (c->destroyed) {
-        return;
-    }
-
-    if (rev->timedout) {
-        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
-                "proxy_protocol: recv: client timed out");
-        c->timedout = 1;
-        ngx_rtmp_finalize_session(s);
-        return;
-    }
-
-    if (rev->timer_set) {
-        ngx_del_timer(rev);
-    }
-
-    n = recv(c->fd, (char *) buf, sizeof(buf), MSG_PEEK);
-
-    err = ngx_socket_errno;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0, "recv(): %d", n);
-
-    if (n == -1) {
-
-        if (err == NGX_EAGAIN) {
-            ngx_add_timer(rev, s->timeout);
-
-            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
-                ngx_rtmp_finalize_session(s);
-            }
-
-            return;
-        }
-
-        ngx_rtmp_finalize_session(s);
-
-        return;
-    }
-
-    p = buf;
-
-    if (n <= 8 && ngx_strncmp(p, "PROXY ", 6) != 0) {
-        goto bad_header;
-    }
-
-    n -= 6;
-    p += 6;
-
-    ngx_memzero(&addr, sizeof(ngx_addr_t));
-
-    if (n >= 7 && ngx_strncmp(p, "UNKNOWN", 7) == 0) {
-        n -= 7;
-        p += 7;
-        goto skip;
-    }
-
-    if (n < 5 || ngx_strncmp(p, "TCP", 3) != 0
-        || (p[3] != '4' && p[3] != '6') || p[4] != ' ')
-    {
-        goto bad_header;
-    }
-
-    n -= 5;
-    p += 5;
-
-    pp = ngx_strlchr(p, p + n, ' ');
-
-    if (pp == NULL) {
-        goto bad_header;
-    }
-
-    if (ngx_parse_addr(s->connection->pool, &addr, p, pp - p) != NGX_OK) {
-        goto bad_header;
-    }
-
-    n -= pp - p;
-    p = pp;
-
-skip:
-
-    for (i = 0; i + 1 < n; i++) {
-        if (p[i] == CR && p[i + 1] == LF) {
-            break;
-        }
-    }
-
-    if (i + 1 >= n) {
-        goto bad_header;
-    }
-
-    n = p - buf + i + 2;
-
-    if (c->recv(c, buf, n) != n) {
-        goto failed;
-    }
-
-    if (addr.socklen) {
-        text = ngx_palloc(s->connection->pool, NGX_SOCKADDR_STRLEN);
-
-        if (text == NULL) {
-            goto failed;
-        }
-
-        len = ngx_sock_ntop(addr.sockaddr,
-#if (nginx_version >= 1005003)
-                            addr.socklen,
-#endif
-                            text, NGX_SOCKADDR_STRLEN, 0);
-        if (len == 0) {
-            goto failed;
-        }
-
-        c->sockaddr = addr.sockaddr;
-        c->socklen = addr.socklen;
-        c->addr_text.data = text;
-        c->addr_text.len = len;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0,
-                       "proxy_protocol: remote_addr:'%V'", &c->addr_text);
-    }
-
-    ngx_rtmp_handshake(s);
-
-    return;
-
-bad_header:
-
-    ngx_log_error(NGX_LOG_INFO, c->log, 0, "proxy_protocol: bad header");
-
-failed:
-
-    ngx_rtmp_finalize_session(s);
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_proxy_protocol.h b/debian/modules/rtmp/ngx_rtmp_proxy_protocol.h
deleted file mode 100644
index e873c3c..0000000
--- a/debian/modules/rtmp/ngx_rtmp_proxy_protocol.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_PROXY_PROTOCOL_H_INCLUDED_
-#define _NGX_RTMP_PROXY_PROTOCOL_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-
-
-void ngx_rtmp_proxy_protocol(ngx_rtmp_session_t *c);
-
-
-#endif /* _NGX_RTMP_PROXY_PROTOCOL_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_receive.c b/debian/modules/rtmp/ngx_rtmp_receive.c
deleted file mode 100644
index 73d617c..0000000
--- a/debian/modules/rtmp/ngx_rtmp_receive.c
+++ /dev/null
@@ -1,464 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_amf.h"
-#include "ngx_rtmp_cmd_module.h"
-#include <string.h>
-
-
-ngx_int_t
-ngx_rtmp_protocol_message_handler(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in)
-{
-    ngx_buf_t              *b;
-    u_char                 *p;
-    uint32_t                val;
-    uint8_t                 limit;
-
-    b = in->buf;
-
-    if (b->last - b->pos < 4) {
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "too small buffer for %d message: %d",
-                (int)h->type, b->last - b->pos);
-        return NGX_OK;
-    }
-
-    p = (u_char*)&val;
-    p[0] = b->pos[3];
-    p[1] = b->pos[2];
-    p[2] = b->pos[1];
-    p[3] = b->pos[0];
-
-    switch(h->type) {
-        case NGX_RTMP_MSG_CHUNK_SIZE:
-            /* set chunk size =val */
-            ngx_rtmp_set_chunk_size(s, val);
-            break;
-
-        case NGX_RTMP_MSG_ABORT:
-            /* abort chunk stream =val */
-            break;
-
-        case NGX_RTMP_MSG_ACK:
-            /* receive ack with sequence number =val */
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "receive ack seq=%uD", val);
-            break;
-
-        case NGX_RTMP_MSG_ACK_SIZE:
-            /* receive window size =val */
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "receive ack_size=%uD", val);
-            s->ack_size = val;
-            break;
-
-        case NGX_RTMP_MSG_BANDWIDTH:
-            if (b->last - b->pos >= 5) {
-                limit = *(uint8_t*)&b->pos[4];
-
-                (void)val;
-                (void)limit;
-
-                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                    "receive bandwidth=%uD limit=%d",
-                    val, (int)limit);
-
-                /* receive window size =val
-                 * && limit */
-            }
-            break;
-
-        default:
-            return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                              ngx_chain_t *in)
-{
-    ngx_buf_t              *b;
-    u_char                 *p;
-    uint16_t                evt;
-    uint32_t                val;
-
-    b = in->buf;
-
-    if (b->last - b->pos < 6) {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "too small buffer for user message: %d",
-                       b->last - b->pos);
-        return NGX_OK;
-    }
-
-    p = (u_char*)&evt;
-
-    p[0] = b->pos[1];
-    p[1] = b->pos[0];
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "RTMP recv user evt %s (%i)",
-                   ngx_rtmp_user_message_type(evt), (ngx_int_t) evt);
-
-    p = (u_char *) &val;
-
-    p[0] = b->pos[5];
-    p[1] = b->pos[4];
-    p[2] = b->pos[3];
-    p[3] = b->pos[2];
-
-    switch(evt) {
-        case NGX_RTMP_USER_STREAM_BEGIN:
-            {
-                ngx_rtmp_stream_begin_t     v;
-
-                v.msid = val;
-
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "receive: stream_begin msid=%uD", v.msid);
-
-                return ngx_rtmp_stream_begin(s, &v);
-            }
-
-        case NGX_RTMP_USER_STREAM_EOF:
-            {
-                ngx_rtmp_stream_eof_t       v;
-
-                v.msid = val;
-
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "receive: stream_eof msid=%uD", v.msid);
-
-                return ngx_rtmp_stream_eof(s, &v);
-            }
-
-        case NGX_RTMP_USER_STREAM_DRY:
-            {
-                ngx_rtmp_stream_dry_t       v;
-
-                v.msid = val;
-
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "receive: stream_dry msid=%uD", v.msid);
-
-                return ngx_rtmp_stream_dry(s, &v);
-            }
-
-        case NGX_RTMP_USER_SET_BUFLEN:
-            {
-                ngx_rtmp_set_buflen_t       v;
-
-                v.msid = val;
-
-                if (b->last - b->pos < 10) {
-                    return NGX_OK;
-                }
-
-                p = (u_char *) &v.buflen;
-
-                p[0] = b->pos[9];
-                p[1] = b->pos[8];
-                p[2] = b->pos[7];
-                p[3] = b->pos[6];
-
-                ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "receive: set_buflen msid=%uD buflen=%uD",
-                               v.msid, v.buflen);
-
-                /*TODO: move this to play module */
-                s->buflen = v.buflen;
-
-                return ngx_rtmp_set_buflen(s, &v);
-            }
-
-        case NGX_RTMP_USER_RECORDED:
-            {
-                ngx_rtmp_recorded_t       v;
-
-                v.msid = val;
-
-                ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                               "receive: recorded msid=%uD", v.msid);
-
-                return ngx_rtmp_recorded(s, &v);
-            }
-
-        case NGX_RTMP_USER_PING_REQUEST:
-            return ngx_rtmp_send_ping_response(s, val);
-
-        case NGX_RTMP_USER_PING_RESPONSE:
-
-            /* val = incoming timestamp */
-
-            ngx_rtmp_reset_ping(s);
-
-            return NGX_OK;
-
-        default:
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "unexpected user event: %i", (ngx_int_t) evt);
-
-            return NGX_OK;
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_fetch(ngx_chain_t **in, u_char *ret)
-{
-    while (*in && (*in)->buf->pos >= (*in)->buf->last) {
-        *in = (*in)->next;
-    }
-
-    if (*in == NULL) {
-        return NGX_DONE;
-    }
-
-    *ret = *(*in)->buf->pos++;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_fetch_uint8(ngx_chain_t **in, uint8_t *ret)
-{
-    return ngx_rtmp_fetch(in, (u_char *) ret);
-}
-
-
-static ngx_int_t
-ngx_rtmp_fetch_uint32(ngx_chain_t **in, uint32_t *ret, ngx_int_t n)
-{
-    u_char     *r = (u_char *) ret;
-    ngx_int_t   rc;
-
-    *ret = 0;
-
-    while (--n >= 0) {
-        rc = ngx_rtmp_fetch(in, &r[n]);
-        if (rc != NGX_OK) {
-            return rc;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_aggregate_message_handler(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                                   ngx_chain_t *in)
-{
-    uint32_t            base_time, timestamp, prev_size;
-    size_t              len;
-    ngx_int_t           first;
-    u_char             *last;
-    ngx_int_t           rc;
-    ngx_buf_t          *b;
-    ngx_chain_t        *cl, *next;
-    ngx_rtmp_header_t   ch;
-
-    ch = *h;
-
-    first = 1;
-    base_time = 0;
-
-    while (in) {
-        if (ngx_rtmp_fetch_uint8(&in, &ch.type) != NGX_OK) {
-            return NGX_OK;
-        }
-
-        if (ngx_rtmp_fetch_uint32(&in, &ch.mlen, 3) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        if (ngx_rtmp_fetch_uint32(&in, &timestamp, 3) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        if (ngx_rtmp_fetch_uint8(&in, (uint8_t *) &timestamp + 3) != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        if (ngx_rtmp_fetch_uint32(&in, &ch.msid, 3) != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        if (first) {
-            base_time = timestamp;
-            first = 0;
-        }
-
-        ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "RTMP aggregate %s (%d) len=%uD time=%uD (+%D) msid=%uD",
-                       ngx_rtmp_message_type(ch.type),
-                       (ngx_int_t) ch.type, ch.mlen, ch.timestamp,
-                       timestamp - base_time, ch.msid);
-
-        /* limit chain */
-
-        len = 0;
-        cl = in;
-        while (cl) {
-            b = cl->buf;
-            len += (b->last - b->pos);
-            if (len > ch.mlen) {
-                break;
-            }
-            cl = cl->next;
-        }
-
-        if (cl == NULL) {
-            ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                          "RTMP error parsing aggregate");
-            return NGX_ERROR;
-        }
-
-        next = cl->next;
-        cl->next = NULL;
-        b = cl->buf;
-        last = b->last;
-        b->last -= (len - ch.mlen);
-
-        /* handle aggregated message */
-
-        ch.timestamp = h->timestamp + timestamp - base_time;
-
-        rc = ngx_rtmp_receive_message(s, &ch, in);
-
-        /* restore chain before checking the result */
-
-        in = cl;
-        in->next = next;
-        b->pos = b->last;
-        b->last = last;
-
-        if (rc != NGX_OK) {
-            return rc;
-        }
-
-        /* read 32-bit previous tag size */
-
-        if (ngx_rtmp_fetch_uint32(&in, &prev_size, 4) != NGX_OK) {
-            return NGX_OK;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "RTMP aggregate prev_size=%uD", prev_size);
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_amf_message_handler(ngx_rtmp_session_t *s,
-        ngx_rtmp_header_t *h, ngx_chain_t *in)
-{
-    ngx_rtmp_amf_ctx_t          act;
-    ngx_rtmp_core_main_conf_t  *cmcf;
-    ngx_array_t                *ch;
-    ngx_rtmp_handler_pt        *ph;
-    size_t                      len, n;
-
-    static u_char               func[128];
-
-    static ngx_rtmp_amf_elt_t   elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          func,   sizeof(func) },
-    };
-
-    /* AMF command names come with string type, but shared object names
-     * come without type */
-    if (h->type == NGX_RTMP_MSG_AMF_SHARED ||
-        h->type == NGX_RTMP_MSG_AMF3_SHARED)
-    {
-        elts[0].type |= NGX_RTMP_AMF_TYPELESS;
-    } else {
-        elts[0].type &= ~NGX_RTMP_AMF_TYPELESS;
-    }
-
-    if ((h->type == NGX_RTMP_MSG_AMF3_SHARED ||
-         h->type == NGX_RTMP_MSG_AMF3_META ||
-         h->type == NGX_RTMP_MSG_AMF3_CMD)
-         && in->buf->last > in->buf->pos)
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "AMF3 prefix: %ui", (ngx_int_t)*in->buf->pos);
-        ++in->buf->pos;
-    }
-
-    cmcf = ngx_rtmp_get_module_main_conf(s, ngx_rtmp_core_module);
-
-    /* read AMF func name & transaction id */
-    ngx_memzero(&act, sizeof(act));
-    act.link = in;
-    act.log = s->connection->log;
-    memset(func, 0, sizeof(func));
-
-    if (ngx_rtmp_amf_read(&act, elts,
-                sizeof(elts) / sizeof(elts[0])) != NGX_OK)
-    {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "AMF cmd failed");
-        return NGX_ERROR;
-    }
-
-    /* skip name */
-    in = act.link;
-    in->buf->pos += act.offset;
-
-    len = ngx_strlen(func);
-
-    ch = ngx_hash_find(&cmcf->amf_hash,
-            ngx_hash_strlow(func, func, len), func, len);
-
-    if (ch && ch->nelts) {
-        ph = ch->elts;
-        for (n = 0; n < ch->nelts; ++n, ++ph) {
-            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                "AMF func '%s' passed to handler %d/%d",
-                func, n, ch->nelts);
-            switch ((*ph)(s, h, in)) {
-                case NGX_ERROR:
-                    return NGX_ERROR;
-                case NGX_DONE:
-                    return NGX_OK;
-            }
-        }
-    } else {
-        ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "AMF cmd '%s' no handler", func);
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_receive_amf(ngx_rtmp_session_t *s, ngx_chain_t *in,
-        ngx_rtmp_amf_elt_t *elts, size_t nelts)
-{
-    ngx_rtmp_amf_ctx_t     act;
-
-    ngx_memzero(&act, sizeof(act));
-    act.link = in;
-    act.log = s->connection->log;
-
-    return ngx_rtmp_amf_read(&act, elts, nelts);
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_record_module.c b/debian/modules/rtmp/ngx_rtmp_record_module.c
deleted file mode 100644
index dc2de12..0000000
--- a/debian/modules/rtmp/ngx_rtmp_record_module.c
+++ /dev/null
@@ -1,1307 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_netcall_module.h"
-#include "ngx_rtmp_codec_module.h"
-#include "ngx_rtmp_record_module.h"
-
-
-ngx_rtmp_record_done_pt             ngx_rtmp_record_done;
-
-
-static ngx_rtmp_publish_pt          next_publish;
-static ngx_rtmp_close_stream_pt     next_close_stream;
-static ngx_rtmp_stream_begin_pt     next_stream_begin;
-static ngx_rtmp_stream_eof_pt       next_stream_eof;
-
-
-static char *ngx_rtmp_record_recorder(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static ngx_int_t ngx_rtmp_record_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_record_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_record_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-static ngx_int_t ngx_rtmp_record_write_frame(ngx_rtmp_session_t *s,
-       ngx_rtmp_record_rec_ctx_t *rctx,
-       ngx_rtmp_header_t *h, ngx_chain_t *in, ngx_int_t inc_nframes);
-static ngx_int_t ngx_rtmp_record_av(ngx_rtmp_session_t *s,
-       ngx_rtmp_header_t *h, ngx_chain_t *in);
-static ngx_int_t ngx_rtmp_record_node_av(ngx_rtmp_session_t *s,
-       ngx_rtmp_record_rec_ctx_t *rctx, ngx_rtmp_header_t *h, ngx_chain_t *in);
-static ngx_int_t ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
-       ngx_rtmp_record_rec_ctx_t *rctx);
-static ngx_int_t ngx_rtmp_record_node_close(ngx_rtmp_session_t *s,
-       ngx_rtmp_record_rec_ctx_t *rctx);
-static void  ngx_rtmp_record_make_path(ngx_rtmp_session_t *s,
-       ngx_rtmp_record_rec_ctx_t *rctx, ngx_str_t *path);
-static ngx_int_t ngx_rtmp_record_init(ngx_rtmp_session_t *s);
-
-
-static ngx_conf_bitmask_t  ngx_rtmp_record_mask[] = {
-    { ngx_string("off"),                NGX_RTMP_RECORD_OFF         },
-    { ngx_string("all"),                NGX_RTMP_RECORD_AUDIO       |
-                                        NGX_RTMP_RECORD_VIDEO       },
-    { ngx_string("audio"),              NGX_RTMP_RECORD_AUDIO       },
-    { ngx_string("video"),              NGX_RTMP_RECORD_VIDEO       },
-    { ngx_string("keyframes"),          NGX_RTMP_RECORD_KEYFRAMES   },
-    { ngx_string("manual"),             NGX_RTMP_RECORD_MANUAL      },
-    { ngx_null_string,                  0                           }
-};
-
-
-static ngx_command_t  ngx_rtmp_record_commands[] = {
-
-    { ngx_string("record"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_1MORE,
-      ngx_conf_set_bitmask_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, flags),
-      ngx_rtmp_record_mask },
-
-    { ngx_string("record_path"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, path),
-      NULL },
-
-    { ngx_string("record_suffix"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, suffix),
-      NULL },
-
-    { ngx_string("record_unique"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, unique),
-      NULL },
-
-    { ngx_string("record_append"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, append),
-      NULL },
-
-    { ngx_string("record_lock"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, lock_file),
-      NULL },
-
-    { ngx_string("record_max_size"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, max_size),
-      NULL },
-
-    { ngx_string("record_max_frames"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, max_frames),
-      NULL },
-
-    { ngx_string("record_interval"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, interval),
-      NULL },
-
-    { ngx_string("record_notify"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|
-                         NGX_RTMP_REC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_record_app_conf_t, notify),
-      NULL },
-
-    { ngx_string("recorder"),
-      NGX_RTMP_APP_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
-      ngx_rtmp_record_recorder,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_record_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_record_postconfiguration,      /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    ngx_rtmp_record_create_app_conf,        /* create app configuration */
-    ngx_rtmp_record_merge_app_conf          /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_record_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_record_module_ctx,            /* module context */
-    ngx_rtmp_record_commands,               /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    NULL,                                   /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void *
-ngx_rtmp_record_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_record_app_conf_t      *racf;
-
-    racf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_record_app_conf_t));
-
-    if (racf == NULL) {
-        return NULL;
-    }
-
-    racf->max_size = NGX_CONF_UNSET_SIZE;
-    racf->max_frames = NGX_CONF_UNSET_SIZE;
-    racf->interval = NGX_CONF_UNSET_MSEC;
-    racf->unique = NGX_CONF_UNSET;
-    racf->append = NGX_CONF_UNSET;
-    racf->lock_file = NGX_CONF_UNSET;
-    racf->notify = NGX_CONF_UNSET;
-    racf->url = NGX_CONF_UNSET_PTR;
-
-    if (ngx_array_init(&racf->rec, cf->pool, 1, sizeof(void *)) != NGX_OK) {
-        return NULL;
-    }
-
-    return racf;
-}
-
-
-static char *
-ngx_rtmp_record_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_record_app_conf_t     *prev = parent;
-    ngx_rtmp_record_app_conf_t     *conf = child;
-    ngx_rtmp_record_app_conf_t    **rracf;
-
-    ngx_conf_merge_str_value(conf->path, prev->path, "");
-    ngx_conf_merge_str_value(conf->suffix, prev->suffix, ".flv");
-    ngx_conf_merge_size_value(conf->max_size, prev->max_size, 0);
-    ngx_conf_merge_size_value(conf->max_frames, prev->max_frames, 0);
-    ngx_conf_merge_value(conf->unique, prev->unique, 0);
-    ngx_conf_merge_value(conf->append, prev->append, 0);
-    ngx_conf_merge_value(conf->lock_file, prev->lock_file, 0);
-    ngx_conf_merge_value(conf->notify, prev->notify, 0);
-    ngx_conf_merge_msec_value(conf->interval, prev->interval,
-                              (ngx_msec_t) NGX_CONF_UNSET);
-    ngx_conf_merge_bitmask_value(conf->flags, prev->flags, 0);
-    ngx_conf_merge_ptr_value(conf->url, prev->url, NULL);
-
-    if (conf->flags) {
-        rracf = ngx_array_push(&conf->rec);
-        if (rracf == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        *rracf = conf;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_write_header(ngx_file_t *file)
-{
-    static u_char       flv_header[] = {
-        0x46, /* 'F' */
-        0x4c, /* 'L' */
-        0x56, /* 'V' */
-        0x01, /* version = 1 */
-        0x05, /* 00000 1 0 1 = has audio & video */
-        0x00,
-        0x00,
-        0x00,
-        0x09, /* header size */
-        0x00,
-        0x00,
-        0x00,
-        0x00  /* PreviousTagSize0 (not actually a header) */
-    };
-
-    return ngx_write_file(file, flv_header, sizeof(flv_header), 0) == NGX_ERROR
-           ? NGX_ERROR
-           : NGX_OK;
-}
-
-
-static ngx_rtmp_record_rec_ctx_t *
-ngx_rtmp_record_get_node_ctx(ngx_rtmp_session_t *s, ngx_uint_t n)
-{
-    ngx_rtmp_record_ctx_t          *ctx;
-    ngx_rtmp_record_rec_ctx_t      *rctx;
-
-    if (ngx_rtmp_record_init(s) != NGX_OK) {
-        return NULL;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
-
-    if (n >= ctx->rec.nelts) {
-        return NULL;
-    }
-
-    rctx = ctx->rec.elts;
-
-    return &rctx[n];
-}
-
-
-ngx_int_t
-ngx_rtmp_record_open(ngx_rtmp_session_t *s, ngx_uint_t n, ngx_str_t *path)
-{
-    ngx_rtmp_record_rec_ctx_t      *rctx;
-    ngx_int_t                       rc;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: #%ui manual open", n);
-
-    rctx = ngx_rtmp_record_get_node_ctx(s, n);
-
-    if (rctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    rc = ngx_rtmp_record_node_open(s, rctx);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    if (path) {
-        ngx_rtmp_record_make_path(s, rctx, path);
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_record_close(ngx_rtmp_session_t *s, ngx_uint_t n, ngx_str_t *path)
-{
-    ngx_rtmp_record_rec_ctx_t      *rctx;
-    ngx_int_t                       rc;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: #%ui manual close", n);
-
-    rctx = ngx_rtmp_record_get_node_ctx(s, n);
-
-    if (rctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    rc = ngx_rtmp_record_node_close(s, rctx);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    if (path) {
-        ngx_rtmp_record_make_path(s, rctx, path);
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_uint_t
-ngx_rtmp_record_find(ngx_rtmp_record_app_conf_t *racf, ngx_str_t *id)
-{
-    ngx_rtmp_record_app_conf_t    **pracf, *rracf;
-    ngx_uint_t                      n;
-
-    pracf = racf->rec.elts;
-
-    for (n = 0; n < racf->rec.nelts; ++n, ++pracf) {
-        rracf = *pracf;
-
-        if (rracf->id.len == id->len &&
-            ngx_strncmp(rracf->id.data, id->data, id->len) == 0)
-        {
-            return n;
-        }
-    }
-
-    return NGX_CONF_UNSET_UINT;
-}
-
-
-/* This funcion returns pointer to a static buffer */
-static void
-ngx_rtmp_record_make_path(ngx_rtmp_session_t *s,
-                          ngx_rtmp_record_rec_ctx_t *rctx, ngx_str_t *path)
-{
-    ngx_rtmp_record_ctx_t          *ctx;
-    ngx_rtmp_record_app_conf_t     *rracf;
-    u_char                         *p, *l;
-    struct tm                       tm;
-
-    static u_char                   buf[NGX_TIME_T_LEN + 1];
-    static u_char                   pbuf[NGX_MAX_PATH + 1];
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
-
-    rracf = rctx->conf;
-
-    /* create file path */
-    p = pbuf;
-    l = pbuf + sizeof(pbuf) - 1;
-
-    p = ngx_cpymem(p, rracf->path.data,
-                ngx_min(rracf->path.len, (size_t)(l - p - 1)));
-    *p++ = '/';
-    p = (u_char *)ngx_escape_uri(p, ctx->name, ngx_min(ngx_strlen(ctx->name),
-                (size_t)(l - p)), NGX_ESCAPE_URI_COMPONENT);
-
-    /* append timestamp */
-    if (rracf->unique) {
-        p = ngx_cpymem(p, buf, ngx_min(ngx_sprintf(buf, "-%T",
-                       rctx->timestamp) - buf, l - p));
-    }
-
-    if (ngx_strchr(rracf->suffix.data, '%')) {
-        ngx_libc_localtime(rctx->timestamp, &tm);
-        p += strftime((char *) p, l - p, (char *) rracf->suffix.data, &tm);
-    } else {
-        p = ngx_cpymem(p, rracf->suffix.data,
-                ngx_min(rracf->suffix.len, (size_t)(l - p)));
-    }
-
-    *p = 0;
-    path->data = pbuf;
-    path->len  = p - pbuf;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: %V path: '%V'", &rracf->id, path);
-}
-
-
-static void
-ngx_rtmp_record_notify_error(ngx_rtmp_session_t *s,
-                             ngx_rtmp_record_rec_ctx_t *rctx)
-{
-    ngx_rtmp_record_app_conf_t *rracf = rctx->conf;
-
-    rctx->failed = 1;
-
-    if (!rracf->notify) {
-        return;
-    }
-
-    ngx_rtmp_send_status(s, "NetStream.Record.Failed", "error",
-                         rracf->id.data ? (char *) rracf->id.data : "");
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
-                          ngx_rtmp_record_rec_ctx_t *rctx)
-{
-    ngx_rtmp_record_app_conf_t *rracf;
-    ngx_err_t                   err;
-    ngx_str_t                   path;
-    ngx_int_t                   mode, create_mode;
-    u_char                      buf[8], *p;
-    off_t                       file_size;
-    uint32_t                    tag_size, mlen, timestamp;
-
-    rracf = rctx->conf;
-    tag_size = 0;
-
-    if (rctx->file.fd != NGX_INVALID_FILE) {
-        return NGX_AGAIN;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: %V opening", &rracf->id);
-
-    ngx_memzero(rctx, sizeof(*rctx));
-    rctx->conf = rracf;
-    rctx->last = *ngx_cached_time;
-    rctx->timestamp = ngx_cached_time->sec;
-
-    ngx_rtmp_record_make_path(s, rctx, &path);
-
-    mode = rracf->append ? NGX_FILE_RDWR : NGX_FILE_WRONLY;
-    create_mode = rracf->append ? NGX_FILE_CREATE_OR_OPEN : NGX_FILE_TRUNCATE;
-
-    ngx_memzero(&rctx->file, sizeof(rctx->file));
-    rctx->file.offset = 0;
-    rctx->file.log = s->connection->log;
-    rctx->file.fd = ngx_open_file(path.data, mode, create_mode,
-                                  NGX_FILE_DEFAULT_ACCESS);
-    ngx_str_set(&rctx->file.name, "recorded");
-
-    if (rctx->file.fd == NGX_INVALID_FILE) {
-        err = ngx_errno;
-
-        if (err != NGX_ENOENT) {
-            ngx_log_error(NGX_LOG_CRIT, s->connection->log, err,
-                          "record: %V failed to open file '%V'",
-                          &rracf->id, &path);
-        }
-
-        ngx_rtmp_record_notify_error(s, rctx);
-
-        return NGX_OK;
-    }
-
-#if !(NGX_WIN32)
-    if (rracf->lock_file) {
-        err = ngx_lock_fd(rctx->file.fd);
-        if (err) {
-            ngx_log_error(NGX_LOG_CRIT, s->connection->log, err,
-                          "record: %V lock failed", &rracf->id);
-        }
-    }
-#endif
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: %V opened '%V'", &rracf->id, &path);
-
-    if (rracf->notify) {
-        ngx_rtmp_send_status(s, "NetStream.Record.Start", "status",
-                             rracf->id.data ? (char *) rracf->id.data : "");
-    }
-
-    if (rracf->append) {
-
-        file_size = 0;
-        timestamp = 0;
-
-#if (NGX_WIN32)
-        {
-            LONG  lo, hi;
-
-            lo = 0;
-            hi = 0;
-            lo = SetFilePointer(rctx->file.fd, lo, &hi, FILE_END);
-            file_size = (lo == INVALID_SET_FILE_POINTER ?
-                         (off_t) -1 : (off_t) hi << 32 | (off_t) lo);
-        }
-#else
-        file_size = lseek(rctx->file.fd, 0, SEEK_END);
-#endif
-        if (file_size == (off_t) -1) {
-            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
-                          "record: %V seek failed", &rracf->id);
-            goto done;
-        }
-
-        if (file_size < 4) {
-            goto done;
-        }
-
-        if (ngx_read_file(&rctx->file, buf, 4, file_size - 4) != 4) {
-            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
-                          "record: %V tag size read failed", &rracf->id);
-            goto done;
-        }
-
-        p = (u_char *) &tag_size;
-        p[0] = buf[3];
-        p[1] = buf[2];
-        p[2] = buf[1];
-        p[3] = buf[0];
-
-        if (tag_size == 0 || tag_size + 4 > file_size) {
-            file_size = 0;
-            goto done;
-        }
-
-        if (ngx_read_file(&rctx->file, buf, 8, file_size - tag_size - 4) != 8)
-        {
-            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
-                          "record: %V tag read failed", &rracf->id);
-            goto done;
-        }
-
-        p = (u_char *) &mlen;
-        p[0] = buf[3];
-        p[1] = buf[2];
-        p[2] = buf[1];
-        p[3] = 0;
-
-        if (tag_size != mlen + 11) {
-            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
-                          "record: %V tag size mismatch: "
-                          "tag_size=%uD, mlen=%uD", &rracf->id, tag_size, mlen);
-            goto done;
-        }
-
-        p = (u_char *) &timestamp;
-        p[3] = buf[7];
-        p[0] = buf[6];
-        p[1] = buf[5];
-        p[2] = buf[4];
-
-done:
-        rctx->file.offset = file_size;
-        rctx->time_shift = timestamp;
-
-        ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "record: append offset=%O, time=%uD, tag_size=%uD",
-                       file_size, timestamp, tag_size);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_init(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_record_app_conf_t     *racf, **rracf;
-    ngx_rtmp_record_rec_ctx_t      *rctx;
-    ngx_rtmp_record_ctx_t          *ctx;
-    ngx_uint_t                      n;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
-
-    if (ctx) {
-        return NGX_OK;
-    }
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module);
-
-    if (racf == NULL || racf->rec.nelts == 0) {
-        return NGX_OK;
-    }
-
-    ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_record_ctx_t));
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_record_module);
-
-    if (ngx_array_init(&ctx->rec, s->connection->pool, racf->rec.nelts,
-                       sizeof(ngx_rtmp_record_rec_ctx_t))
-        != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    rracf = racf->rec.elts;
-
-    rctx = ngx_array_push_n(&ctx->rec, racf->rec.nelts);
-
-    if (rctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    for (n = 0; n < racf->rec.nelts; ++n, ++rracf, ++rctx) {
-        ngx_memzero(rctx, sizeof(*rctx));
-
-        rctx->conf = *rracf;
-        rctx->file.fd = NGX_INVALID_FILE;
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_record_start(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_record_app_conf_t     *racf;
-    ngx_rtmp_record_rec_ctx_t      *rctx;
-    ngx_rtmp_record_ctx_t          *ctx;
-    ngx_uint_t                      n;
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module);
-    if (racf == NULL || racf->rec.nelts == 0) {
-        return;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: start");
-
-    rctx = ctx->rec.elts;
-    for (n = 0; n < ctx->rec.nelts; ++n, ++rctx) {
-        if (rctx->conf->flags & (NGX_RTMP_RECORD_OFF|NGX_RTMP_RECORD_MANUAL)) {
-            continue;
-        }
-        ngx_rtmp_record_node_open(s, rctx);
-    }
-}
-
-
-static void
-ngx_rtmp_record_stop(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_record_app_conf_t     *racf;
-    ngx_rtmp_record_rec_ctx_t      *rctx;
-    ngx_rtmp_record_ctx_t          *ctx;
-    ngx_uint_t                      n;
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module);
-    if (racf == NULL || racf->rec.nelts == 0) {
-        return;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: stop");
-
-    rctx = ctx->rec.elts;
-    for (n = 0; n < ctx->rec.nelts; ++n, ++rctx) {
-        ngx_rtmp_record_node_close(s, rctx);
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    ngx_rtmp_record_app_conf_t     *racf;
-    ngx_rtmp_record_ctx_t          *ctx;
-    u_char                         *p;
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_record_module);
-
-    if (racf == NULL || racf->rec.nelts == 0) {
-        goto next;
-    }
-
-    if (ngx_rtmp_record_init(s) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: publish %ui nodes",
-                   racf->rec.nelts);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
-
-    ngx_memcpy(ctx->name, v->name, sizeof(ctx->name));
-    ngx_memcpy(ctx->args, v->args, sizeof(ctx->args));
-
-    /* terminate name on /../ */
-    for (p = ctx->name; *p; ++p) {
-        if (ngx_path_separator(p[0]) &&
-            p[1] == '.' && p[2] == '.' &&
-            ngx_path_separator(p[3]))
-        {
-            *p = 0;
-            break;
-        }
-    }
-
-    ngx_rtmp_record_start(s);
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_stream_begin(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
-{
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: stream_begin");
-
-    ngx_rtmp_record_start(s);
-
-next:
-    return next_stream_begin(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_stream_eof(ngx_rtmp_session_t *s, ngx_rtmp_stream_begin_t *v)
-{
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: stream_eof");
-
-    ngx_rtmp_record_stop(s);
-
-next:
-    return next_stream_eof(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_node_close(ngx_rtmp_session_t *s,
-                           ngx_rtmp_record_rec_ctx_t *rctx)
-{
-    ngx_rtmp_record_app_conf_t *rracf;
-    ngx_err_t                   err;
-    void                      **app_conf;
-    ngx_int_t                   rc;
-    ngx_rtmp_record_done_t      v;
-    u_char                      av;
-
-    rracf = rctx->conf;
-
-    if (rctx->file.fd == NGX_INVALID_FILE) {
-        return NGX_AGAIN;
-    }
-
-    if (rctx->initialized) {
-        av = 0;
-
-        if (rctx->video) {
-            av |= 0x01;
-        }
-
-        if (rctx->audio) {
-            av |= 0x04;
-        }
-
-        if (ngx_write_file(&rctx->file, &av, 1, 4) == NGX_ERROR) {
-            ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
-                          "record: %V error writing av mask", &rracf->id);
-        }
-    }
-
-    if (ngx_close_file(rctx->file.fd) == NGX_FILE_ERROR) {
-        err = ngx_errno;
-        ngx_log_error(NGX_LOG_CRIT, s->connection->log, err,
-                      "record: %V error closing file", &rracf->id);
-
-        ngx_rtmp_record_notify_error(s, rctx);
-    }
-
-    rctx->file.fd = NGX_INVALID_FILE;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: %V closed", &rracf->id);
-
-    if (rracf->notify) {
-        ngx_rtmp_send_status(s, "NetStream.Record.Stop", "status",
-                             rracf->id.data ? (char *) rracf->id.data : "");
-    }
-
-    app_conf = s->app_conf;
-
-    if (rracf->rec_conf) {
-        s->app_conf = rracf->rec_conf;
-    }
-
-    v.recorder = rracf->id;
-    ngx_rtmp_record_make_path(s, rctx, &v.path);
-
-    rc = ngx_rtmp_record_done(s, &v);
-
-    s->app_conf = app_conf;
-
-    return rc;
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_close_stream(ngx_rtmp_session_t *s,
-                             ngx_rtmp_close_stream_t *v)
-{
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: close_stream");
-
-    ngx_rtmp_record_stop(s);
-
-next:
-    return next_close_stream(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_write_frame(ngx_rtmp_session_t *s,
-                            ngx_rtmp_record_rec_ctx_t *rctx,
-                            ngx_rtmp_header_t *h, ngx_chain_t *in,
-                            ngx_int_t inc_nframes)
-{
-    u_char                      hdr[11], *p, *ph;
-    uint32_t                    timestamp, tag_size;
-    ngx_rtmp_record_app_conf_t *rracf;
-
-    rracf = rctx->conf;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "record: %V frame: mlen=%uD",
-                   &rracf->id, h->mlen);
-
-    if (h->type == NGX_RTMP_MSG_VIDEO) {
-        rctx->video = 1;
-    } else {
-        rctx->audio = 1;
-    }
-
-    timestamp = h->timestamp - rctx->epoch;
-
-    if ((int32_t) timestamp < 0) {
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                       "record: %V cut timestamp=%D", &rracf->id, timestamp);
-
-        timestamp = 0;
-    }
-
-    /* write tag header */
-    ph = hdr;
-
-    *ph++ = (u_char)h->type;
-
-    p = (u_char*)&h->mlen;
-    *ph++ = p[2];
-    *ph++ = p[1];
-    *ph++ = p[0];
-
-    p = (u_char*)&timestamp;
-    *ph++ = p[2];
-    *ph++ = p[1];
-    *ph++ = p[0];
-    *ph++ = p[3];
-
-    *ph++ = 0;
-    *ph++ = 0;
-    *ph++ = 0;
-
-    tag_size = (ph - hdr) + h->mlen;
-
-    if (ngx_write_file(&rctx->file, hdr, ph - hdr, rctx->file.offset)
-        == NGX_ERROR)
-    {
-        ngx_rtmp_record_notify_error(s, rctx);
-
-        ngx_close_file(rctx->file.fd);
-
-        return NGX_ERROR;
-    }
-
-    /* write tag body
-     * FIXME: NGINX
-     * ngx_write_chain seems to fit best
-     * but it suffers from uncontrollable
-     * allocations.
-     * we're left with plain writing */
-    for(; in; in = in->next) {
-        if (in->buf->pos == in->buf->last) {
-            continue;
-        }
-
-        if (ngx_write_file(&rctx->file, in->buf->pos, in->buf->last
-                           - in->buf->pos, rctx->file.offset)
-            == NGX_ERROR)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    /* write tag size */
-    ph = hdr;
-    p = (u_char*)&tag_size;
-
-    *ph++ = p[3];
-    *ph++ = p[2];
-    *ph++ = p[1];
-    *ph++ = p[0];
-
-    if (ngx_write_file(&rctx->file, hdr, ph - hdr,
-                       rctx->file.offset)
-        == NGX_ERROR)
-    {
-        return NGX_ERROR;
-    }
-
-    rctx->nframes += inc_nframes;
-
-    /* watch max size */
-    if ((rracf->max_size && rctx->file.offset >= (ngx_int_t) rracf->max_size) ||
-        (rracf->max_frames && rctx->nframes >= rracf->max_frames))
-    {
-        ngx_rtmp_record_node_close(s, rctx);
-    }
-
-    return NGX_OK;
-}
-
-
-static size_t
-ngx_rtmp_record_get_chain_mlen(ngx_chain_t *in)
-{
-    size_t                          ret;
-
-    for (ret = 0; in; in = in->next) {
-        ret += (in->buf->last - in->buf->pos);
-    }
-
-    return ret;
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                   ngx_chain_t *in)
-{
-    ngx_rtmp_record_ctx_t          *ctx;
-    ngx_rtmp_record_rec_ctx_t      *rctx;
-    ngx_uint_t                      n;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_record_module);
-
-    if (ctx == NULL) {
-        return NGX_OK;
-    }
-
-    rctx = ctx->rec.elts;
-
-    for (n = 0; n < ctx->rec.nelts; ++n, ++rctx) {
-        ngx_rtmp_record_node_av(s, rctx, h, in);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_node_av(ngx_rtmp_session_t *s, ngx_rtmp_record_rec_ctx_t *rctx,
-                        ngx_rtmp_header_t *h, ngx_chain_t *in)
-{
-    ngx_time_t                      next;
-    ngx_rtmp_header_t               ch;
-    ngx_rtmp_codec_ctx_t           *codec_ctx;
-    ngx_int_t                       keyframe, brkframe;
-    ngx_rtmp_record_app_conf_t     *rracf;
-
-    rracf = rctx->conf;
-
-    if (rracf->flags & NGX_RTMP_RECORD_OFF) {
-        ngx_rtmp_record_node_close(s, rctx);
-        return NGX_OK;
-    }
-
-    keyframe = (h->type == NGX_RTMP_MSG_VIDEO)
-             ? (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME)
-             : 0;
-
-    brkframe = (h->type == NGX_RTMP_MSG_VIDEO)
-             ? keyframe
-             : (rracf->flags & NGX_RTMP_RECORD_VIDEO) == 0;
-
-    if (brkframe && (rracf->flags & NGX_RTMP_RECORD_MANUAL) == 0) {
-
-        if (rracf->interval != (ngx_msec_t) NGX_CONF_UNSET) {
-
-            next = rctx->last;
-            next.msec += rracf->interval;
-            next.sec  += (next.msec / 1000);
-            next.msec %= 1000;
-
-            if (ngx_cached_time->sec  > next.sec ||
-               (ngx_cached_time->sec == next.sec &&
-                ngx_cached_time->msec > next.msec))
-            {
-                ngx_rtmp_record_node_close(s, rctx);
-                ngx_rtmp_record_node_open(s, rctx);
-            }
-
-        } else if (!rctx->failed) {
-            ngx_rtmp_record_node_open(s, rctx);
-        }
-    }
-
-    if ((rracf->flags & NGX_RTMP_RECORD_MANUAL) &&
-        !brkframe && rctx->nframes == 0)
-    {
-        return NGX_OK;
-    }
-
-    if (rctx->file.fd == NGX_INVALID_FILE) {
-        return NGX_OK;
-    }
-
-    if (h->type == NGX_RTMP_MSG_AUDIO &&
-       (rracf->flags & NGX_RTMP_RECORD_AUDIO) == 0)
-    {
-        return NGX_OK;
-    }
-
-    if (h->type == NGX_RTMP_MSG_VIDEO &&
-       (rracf->flags & NGX_RTMP_RECORD_VIDEO) == 0 &&
-       ((rracf->flags & NGX_RTMP_RECORD_KEYFRAMES) == 0 || !keyframe))
-    {
-        return NGX_OK;
-    }
-
-    if (!rctx->initialized) {
-
-        rctx->initialized = 1;
-        rctx->epoch = h->timestamp - rctx->time_shift;
-
-        if (rctx->file.offset == 0 &&
-            ngx_rtmp_record_write_header(&rctx->file) != NGX_OK)
-        {
-            ngx_rtmp_record_node_close(s, rctx);
-            return NGX_OK;
-        }
-    }
-
-    codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-    if (codec_ctx) {
-        ch = *h;
-
-        /* AAC header */
-        if (!rctx->aac_header_sent && codec_ctx->aac_header &&
-           (rracf->flags & NGX_RTMP_RECORD_AUDIO))
-        {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "record: %V writing AAC header", &rracf->id);
-
-            ch.type = NGX_RTMP_MSG_AUDIO;
-            ch.mlen = ngx_rtmp_record_get_chain_mlen(codec_ctx->aac_header);
-
-            if (ngx_rtmp_record_write_frame(s, rctx, &ch,
-                                            codec_ctx->aac_header, 0)
-                != NGX_OK)
-            {
-                return NGX_OK;
-            }
-
-            rctx->aac_header_sent = 1;
-        }
-
-        /* AVC header */
-        if (!rctx->avc_header_sent && codec_ctx->avc_header &&
-           (rracf->flags & (NGX_RTMP_RECORD_VIDEO|
-                            NGX_RTMP_RECORD_KEYFRAMES)))
-        {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "record: %V writing AVC header", &rracf->id);
-
-            ch.type = NGX_RTMP_MSG_VIDEO;
-            ch.mlen = ngx_rtmp_record_get_chain_mlen(codec_ctx->avc_header);
-
-            if (ngx_rtmp_record_write_frame(s, rctx, &ch,
-                                            codec_ctx->avc_header, 0)
-                != NGX_OK)
-            {
-                return NGX_OK;
-            }
-
-            rctx->avc_header_sent = 1;
-        }
-    }
-
-    if (h->type == NGX_RTMP_MSG_VIDEO) {
-        if (codec_ctx && codec_ctx->video_codec_id == NGX_RTMP_VIDEO_H264 &&
-            !rctx->avc_header_sent)
-        {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "record: %V skipping until H264 header", &rracf->id);
-            return NGX_OK;
-        }
-
-        if (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME &&
-            ((codec_ctx && codec_ctx->video_codec_id != NGX_RTMP_VIDEO_H264) ||
-             !ngx_rtmp_is_codec_header(in)))
-        {
-            rctx->video_key_sent = 1;
-        }
-
-        if (!rctx->video_key_sent) {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "record: %V skipping until keyframe", &rracf->id);
-            return NGX_OK;
-        }
-
-    } else {
-        if (codec_ctx && codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC &&
-            !rctx->aac_header_sent)
-        {
-            ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                           "record: %V skipping until AAC header", &rracf->id);
-            return NGX_OK;
-        }
-    }
-
-    return ngx_rtmp_record_write_frame(s, rctx, h, in, 1);
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_done_init(ngx_rtmp_session_t *s, ngx_rtmp_record_done_t *v)
-{
-    return NGX_OK;
-}
-
-
-static char *
-ngx_rtmp_record_recorder(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char                       *rv;
-    ngx_int_t                   i;
-    ngx_str_t                  *value;
-    ngx_conf_t                  save;
-    ngx_module_t              **modules;
-    ngx_rtmp_module_t          *module;
-    ngx_rtmp_core_app_conf_t   *cacf, **pcacf, *rcacf;
-    ngx_rtmp_record_app_conf_t *racf, **pracf, *rracf;
-    ngx_rtmp_conf_ctx_t        *ctx, *pctx;
-
-    value = cf->args->elts;
-
-    cacf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_core_module);
-
-    racf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_record_module);
-
-    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_conf_ctx_t));
-    if (ctx == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    pctx = cf->ctx;
-
-    ctx->main_conf = pctx->main_conf;
-    ctx->srv_conf  = pctx->srv_conf;
-
-    ctx->app_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_rtmp_max_module);
-    if (ctx->app_conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-#if (nginx_version >= 1009011)
-    modules = cf->cycle->modules;
-#else
-    modules = ngx_modules;
-#endif
-
-    for (i = 0; modules[i]; i++) {
-        if (modules[i]->type != NGX_RTMP_MODULE) {
-            continue;
-        }
-
-        module = modules[i]->ctx;
-
-        if (module->create_app_conf) {
-            ctx->app_conf[modules[i]->ctx_index] = module->create_app_conf(cf);
-            if (ctx->app_conf[modules[i]->ctx_index] == NULL) {
-                return NGX_CONF_ERROR;
-            }
-        }
-    }
-
-    /* add to sub-applications */
-    rcacf = ctx->app_conf[ngx_rtmp_core_module.ctx_index];
-    rcacf->app_conf = ctx->app_conf;
-    pcacf = ngx_array_push(&cacf->applications);
-    if (pcacf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-    *pcacf = rcacf;
-
-    /* add to recorders */
-    rracf = ctx->app_conf[ngx_rtmp_record_module.ctx_index];
-    rracf->rec_conf = ctx->app_conf;
-    pracf = ngx_array_push(&racf->rec);
-    if (pracf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-    *pracf = rracf;
-
-    rracf->id = value[1];
-
-
-    save = *cf;
-    cf->ctx = ctx;
-    cf->cmd_type = NGX_RTMP_REC_CONF;
-
-    rv = ngx_conf_parse(cf, NULL);
-    *cf= save;
-
-    return rv;
-}
-
-
-static ngx_int_t
-ngx_rtmp_record_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t          *cmcf;
-    ngx_rtmp_handler_pt                *h;
-
-    ngx_rtmp_record_done = ngx_rtmp_record_done_init;
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
-    *h = ngx_rtmp_record_av;
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
-    *h = ngx_rtmp_record_av;
-
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_record_publish;
-
-    next_close_stream = ngx_rtmp_close_stream;
-    ngx_rtmp_close_stream = ngx_rtmp_record_close_stream;
-
-    next_stream_begin = ngx_rtmp_stream_begin;
-    ngx_rtmp_stream_begin = ngx_rtmp_record_stream_begin;
-
-    next_stream_eof = ngx_rtmp_stream_eof;
-    ngx_rtmp_stream_eof = ngx_rtmp_record_stream_eof;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_record_module.h b/debian/modules/rtmp/ngx_rtmp_record_module.h
deleted file mode 100644
index 6450dcb..0000000
--- a/debian/modules/rtmp/ngx_rtmp_record_module.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_RECORD_H_INCLUDED_
-#define _NGX_RTMP_RECORD_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-
-
-#define NGX_RTMP_RECORD_OFF             0x01
-#define NGX_RTMP_RECORD_AUDIO           0x02
-#define NGX_RTMP_RECORD_VIDEO           0x04
-#define NGX_RTMP_RECORD_KEYFRAMES       0x08
-#define NGX_RTMP_RECORD_MANUAL          0x10
-
-
-typedef struct {
-    ngx_str_t                           id;
-    ngx_uint_t                          flags;
-    ngx_str_t                           path;
-    size_t                              max_size;
-    size_t                              max_frames;
-    ngx_msec_t                          interval;
-    ngx_str_t                           suffix;
-    ngx_flag_t                          unique;
-    ngx_flag_t                          append;
-    ngx_flag_t                          lock_file;
-    ngx_flag_t                          notify;
-    ngx_url_t                          *url;
-
-    void                              **rec_conf;
-    ngx_array_t                         rec; /* ngx_rtmp_record_app_conf_t * */
-} ngx_rtmp_record_app_conf_t;
-
-
-typedef struct {
-    ngx_rtmp_record_app_conf_t         *conf;
-    ngx_file_t                          file;
-    ngx_uint_t                          nframes;
-    uint32_t                            epoch, time_shift;
-    ngx_time_t                          last;
-    time_t                              timestamp;
-    unsigned                            failed:1;
-    unsigned                            initialized:1;
-    unsigned                            aac_header_sent:1;
-    unsigned                            avc_header_sent:1;
-    unsigned                            video_key_sent:1;
-    unsigned                            audio:1;
-    unsigned                            video:1;
-} ngx_rtmp_record_rec_ctx_t;
-
-
-typedef struct {
-    ngx_array_t                         rec; /* ngx_rtmp_record_rec_ctx_t */
-    u_char                              name[NGX_RTMP_MAX_NAME];
-    u_char                              args[NGX_RTMP_MAX_ARGS];
-} ngx_rtmp_record_ctx_t;
-
-
-ngx_uint_t ngx_rtmp_record_find(ngx_rtmp_record_app_conf_t *racf,
-           ngx_str_t *id);
-
-
-/* Manual recording control,
- * 'n' is record node index in config array.
- * Note: these functions allocate path in static buffer */
-
-ngx_int_t ngx_rtmp_record_open(ngx_rtmp_session_t *s, ngx_uint_t n,
-          ngx_str_t *path);
-ngx_int_t ngx_rtmp_record_close(ngx_rtmp_session_t *s, ngx_uint_t n,
-          ngx_str_t *path);
-
-
-typedef struct {
-    ngx_str_t                           recorder;
-    ngx_str_t                           path;
-} ngx_rtmp_record_done_t;
-
-
-typedef ngx_int_t (*ngx_rtmp_record_done_pt)(ngx_rtmp_session_t *s,
-        ngx_rtmp_record_done_t *v);
-
-
-extern ngx_rtmp_record_done_pt          ngx_rtmp_record_done;
-
-
-extern ngx_module_t                     ngx_rtmp_record_module;
-
-
-#endif /* _NGX_RTMP_RECORD_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_relay_module.c b/debian/modules/rtmp/ngx_rtmp_relay_module.c
deleted file mode 100644
index b0f5fec..0000000
--- a/debian/modules/rtmp/ngx_rtmp_relay_module.c
+++ /dev/null
@@ -1,1690 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_relay_module.h"
-#include "ngx_rtmp_cmd_module.h"
-
-
-static ngx_rtmp_publish_pt          next_publish;
-static ngx_rtmp_play_pt             next_play;
-static ngx_rtmp_delete_stream_pt    next_delete_stream;
-static ngx_rtmp_close_stream_pt     next_close_stream;
-
-
-static ngx_int_t ngx_rtmp_relay_init_process(ngx_cycle_t *cycle);
-static ngx_int_t ngx_rtmp_relay_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_relay_create_app_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_relay_merge_app_conf(ngx_conf_t *cf,
-       void *parent, void *child);
-static char * ngx_rtmp_relay_push_pull(ngx_conf_t *cf, ngx_command_t *cmd,
-       void *conf);
-static ngx_int_t ngx_rtmp_relay_publish(ngx_rtmp_session_t *s,
-       ngx_rtmp_publish_t *v);
-static ngx_rtmp_relay_ctx_t * ngx_rtmp_relay_create_connection(
-       ngx_rtmp_conf_ctx_t *cctx, ngx_str_t* name,
-       ngx_rtmp_relay_target_t *target);
-
-
-/*                _____
- * =push=        |     |---publish--->
- * ---publish--->|     |---publish--->
- *     (src)     |     |---publish--->
- *                -----  (next,relay)
- *                      need reconnect
- * =pull=         _____
- * -----play---->|     |
- * -----play---->|     |----play----->
- * -----play---->|     | (src,relay)
- *     (next)     -----
- */
-
-
-typedef struct {
-    ngx_array_t                 pulls;         /* ngx_rtmp_relay_target_t * */
-    ngx_array_t                 pushes;        /* ngx_rtmp_relay_target_t * */
-    ngx_array_t                 static_pulls;  /* ngx_rtmp_relay_target_t * */
-    ngx_array_t                 static_events; /* ngx_event_t * */
-    ngx_log_t                  *log;
-    ngx_uint_t                  nbuckets;
-    ngx_msec_t                  buflen;
-    ngx_flag_t                  session_relay;
-    ngx_msec_t                  push_reconnect;
-    ngx_msec_t                  pull_reconnect;
-    ngx_rtmp_relay_ctx_t        **ctx;
-} ngx_rtmp_relay_app_conf_t;
-
-
-typedef struct {
-    ngx_rtmp_conf_ctx_t         cctx;
-    ngx_rtmp_relay_target_t    *target;
-} ngx_rtmp_relay_static_t;
-
-
-#define NGX_RTMP_RELAY_CONNECT_TRANS            1
-#define NGX_RTMP_RELAY_CREATE_STREAM_TRANS      2
-
-
-#define NGX_RTMP_RELAY_CSID_AMF_INI             3
-#define NGX_RTMP_RELAY_CSID_AMF                 5
-#define NGX_RTMP_RELAY_MSID                     1
-
-
-/* default flashVer */
-#define NGX_RTMP_RELAY_FLASHVER                 "LNX.11,1,102,55"
-
-
-static ngx_command_t  ngx_rtmp_relay_commands[] = {
-
-    { ngx_string("push"),
-      NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_relay_push_pull,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("pull"),
-      NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-      ngx_rtmp_relay_push_pull,
-      NGX_RTMP_APP_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("relay_buffer"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_relay_app_conf_t, buflen),
-      NULL },
-
-    { ngx_string("push_reconnect"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_relay_app_conf_t, push_reconnect),
-      NULL },
-
-    { ngx_string("pull_reconnect"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_relay_app_conf_t, pull_reconnect),
-      NULL },
-
-    { ngx_string("session_relay"),
-      NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_flag_slot,
-      NGX_RTMP_APP_CONF_OFFSET,
-      offsetof(ngx_rtmp_relay_app_conf_t, session_relay),
-      NULL },
-
-
-      ngx_null_command
-};
-
-
-static ngx_rtmp_module_t  ngx_rtmp_relay_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_rtmp_relay_postconfiguration,       /* postconfiguration */
-    NULL,                                   /* create main configuration */
-    NULL,                                   /* init main configuration */
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-    ngx_rtmp_relay_create_app_conf,         /* create app configuration */
-    ngx_rtmp_relay_merge_app_conf           /* merge app configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_relay_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_relay_module_ctx,             /* module context */
-    ngx_rtmp_relay_commands,                /* module directives */
-    NGX_RTMP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    NULL,                                   /* init module */
-    ngx_rtmp_relay_init_process,            /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    NULL,                                   /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void *
-ngx_rtmp_relay_create_app_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_relay_app_conf_t     *racf;
-
-    racf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_relay_app_conf_t));
-    if (racf == NULL) {
-        return NULL;
-    }
-
-    if (ngx_array_init(&racf->pushes, cf->pool, 1, sizeof(void *)) != NGX_OK) {
-        return NULL;
-    }
-
-    if (ngx_array_init(&racf->pulls, cf->pool, 1, sizeof(void *)) != NGX_OK) {
-        return NULL;
-    }
-
-    if (ngx_array_init(&racf->static_pulls, cf->pool, 1, sizeof(void *))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-    if (ngx_array_init(&racf->static_events, cf->pool, 1, sizeof(void *))
-        != NGX_OK)
-    {
-        return NULL;
-    }
-
-    racf->nbuckets = 1024;
-    racf->log = &cf->cycle->new_log;
-    racf->buflen = NGX_CONF_UNSET_MSEC;
-    racf->session_relay = NGX_CONF_UNSET;
-    racf->push_reconnect = NGX_CONF_UNSET_MSEC;
-    racf->pull_reconnect = NGX_CONF_UNSET_MSEC;
-
-    return racf;
-}
-
-
-static char *
-ngx_rtmp_relay_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_relay_app_conf_t  *prev = parent;
-    ngx_rtmp_relay_app_conf_t  *conf = child;
-
-    conf->ctx = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_relay_ctx_t *)
-            * conf->nbuckets);
-
-    ngx_conf_merge_value(conf->session_relay, prev->session_relay, 0);
-    ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 5000);
-    ngx_conf_merge_msec_value(conf->push_reconnect, prev->push_reconnect,
-            3000);
-    ngx_conf_merge_msec_value(conf->pull_reconnect, prev->pull_reconnect,
-            3000);
-
-    return NGX_CONF_OK;
-}
-
-
-static void
-ngx_rtmp_relay_static_pull_reconnect(ngx_event_t *ev)
-{
-    ngx_rtmp_relay_static_t    *rs = ev->data;
-
-    ngx_rtmp_relay_ctx_t       *ctx;
-    ngx_rtmp_relay_app_conf_t  *racf;
-
-    racf = ngx_rtmp_get_module_app_conf(&rs->cctx, ngx_rtmp_relay_module);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, racf->log, 0,
-                   "relay: reconnecting static pull");
-
-    ctx = ngx_rtmp_relay_create_connection(&rs->cctx, &rs->target->name,
-                                           rs->target);
-    if (ctx) {
-        ctx->session->static_relay = 1;
-        ctx->static_evt = ev;
-        return;
-    }
-
-    ngx_add_timer(ev, racf->pull_reconnect);
-}
-
-
-static void
-ngx_rtmp_relay_push_reconnect(ngx_event_t *ev)
-{
-    ngx_rtmp_session_t             *s = ev->data;
-
-    ngx_rtmp_relay_app_conf_t      *racf;
-    ngx_rtmp_relay_ctx_t           *ctx, *pctx;
-    ngx_uint_t                      n;
-    ngx_rtmp_relay_target_t        *target, **t;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "relay: push reconnect");
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    t = racf->pushes.elts;
-    for (n = 0; n < racf->pushes.nelts; ++n, ++t) {
-        target = *t;
-
-        if (target->name.len && (ctx->name.len != target->name.len ||
-            ngx_memcmp(ctx->name.data, target->name.data, ctx->name.len)))
-        {
-            continue;
-        }
-
-        for (pctx = ctx->play; pctx; pctx = pctx->next) {
-            if (pctx->tag == &ngx_rtmp_relay_module &&
-                pctx->data == target)
-            {
-                break;
-            }
-        }
-
-        if (pctx) {
-            continue;
-        }
-
-        if (ngx_rtmp_relay_push(s, &ctx->name, target) == NGX_OK) {
-            continue;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                "relay: push reconnect failed name='%V' app='%V' "
-                "playpath='%V' url='%V'",
-                &ctx->name, &target->app, &target->play_path,
-                &target->url.url);
-
-        if (!ctx->push_evt.timer_set) {
-            ngx_add_timer(&ctx->push_evt, racf->push_reconnect);
-        }
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_get_peer(ngx_peer_connection_t *pc, void *data)
-{
-    return NGX_OK;
-}
-
-
-static void
-ngx_rtmp_relay_free_peer(ngx_peer_connection_t *pc, void *data,
-            ngx_uint_t state)
-{
-}
-
-
-typedef ngx_rtmp_relay_ctx_t * (* ngx_rtmp_relay_create_ctx_pt)
-    (ngx_rtmp_session_t *s, ngx_str_t *name, ngx_rtmp_relay_target_t *target);
-
-
-static ngx_int_t
-ngx_rtmp_relay_copy_str(ngx_pool_t *pool, ngx_str_t *dst, ngx_str_t *src)
-{
-    if (src->len == 0) {
-        return NGX_OK;
-    }
-    dst->len = src->len;
-    dst->data = ngx_palloc(pool, src->len);
-    if (dst->data == NULL) {
-        return NGX_ERROR;
-    }
-    ngx_memcpy(dst->data, src->data, src->len);
-    return NGX_OK;
-}
-
-
-static ngx_rtmp_relay_ctx_t *
-ngx_rtmp_relay_create_connection(ngx_rtmp_conf_ctx_t *cctx, ngx_str_t* name,
-        ngx_rtmp_relay_target_t *target)
-{
-    ngx_rtmp_relay_app_conf_t      *racf;
-    ngx_rtmp_relay_ctx_t           *rctx;
-    ngx_rtmp_addr_conf_t           *addr_conf;
-    ngx_rtmp_conf_ctx_t            *addr_ctx;
-    ngx_rtmp_session_t             *rs;
-    ngx_peer_connection_t          *pc;
-    ngx_connection_t               *c;
-    ngx_addr_t                     *addr;
-    ngx_pool_t                     *pool;
-    ngx_int_t                       rc;
-    ngx_str_t                       v, *uri;
-    u_char                         *first, *last, *p;
-
-    racf = ngx_rtmp_get_module_app_conf(cctx, ngx_rtmp_relay_module);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, racf->log, 0,
-                   "relay: create remote context");
-
-    pool = NULL;
-    pool = ngx_create_pool(4096, racf->log);
-    if (pool == NULL) {
-        return NULL;
-    }
-
-    rctx = ngx_pcalloc(pool, sizeof(ngx_rtmp_relay_ctx_t));
-    if (rctx == NULL) {
-        goto clear;
-    }
-
-    if (name && ngx_rtmp_relay_copy_str(pool, &rctx->name, name) != NGX_OK) {
-        goto clear;
-    }
-
-    if (ngx_rtmp_relay_copy_str(pool, &rctx->url, &target->url.url) != NGX_OK) {
-        goto clear;
-    }
-
-    rctx->tag = target->tag;
-    rctx->data = target->data;
-
-#define NGX_RTMP_RELAY_STR_COPY(to, from)                                     \
-    if (ngx_rtmp_relay_copy_str(pool, &rctx->to, &target->from) != NGX_OK) {  \
-        goto clear;                                                           \
-    }
-
-    NGX_RTMP_RELAY_STR_COPY(app,        app);
-    NGX_RTMP_RELAY_STR_COPY(tc_url,     tc_url);
-    NGX_RTMP_RELAY_STR_COPY(page_url,   page_url);
-    NGX_RTMP_RELAY_STR_COPY(swf_url,    swf_url);
-    NGX_RTMP_RELAY_STR_COPY(flash_ver,  flash_ver);
-    NGX_RTMP_RELAY_STR_COPY(play_path,  play_path);
-
-    rctx->live  = target->live;
-    rctx->start = target->start;
-    rctx->stop  = target->stop;
-
-#undef NGX_RTMP_RELAY_STR_COPY
-
-    if (rctx->app.len == 0 || rctx->play_path.len == 0) {
-        /* parse uri */
-        uri = &target->url.uri;
-        first = uri->data;
-        last  = uri->data + uri->len;
-        if (first != last && *first == '/') {
-            ++first;
-        }
-
-        if (first != last) {
-
-            /* deduce app */
-            p = ngx_strlchr(first, last, '/');
-            if (p == NULL) {
-                p = last;
-            }
-
-            if (rctx->app.len == 0 && first != p) {
-                v.data = first;
-                v.len = p - first;
-                if (ngx_rtmp_relay_copy_str(pool, &rctx->app, &v) != NGX_OK) {
-                    goto clear;
-                }
-            }
-
-            /* deduce play_path */
-            if (p != last) {
-                ++p;
-            }
-
-            if (rctx->play_path.len == 0 && p != last) {
-                v.data = p;
-                v.len = last - p;
-                if (ngx_rtmp_relay_copy_str(pool, &rctx->play_path, &v)
-                        != NGX_OK)
-                {
-                    goto clear;
-                }
-            }
-        }
-    }
-
-    pc = ngx_pcalloc(pool, sizeof(ngx_peer_connection_t));
-    if (pc == NULL) {
-        goto clear;
-    }
-
-    if (target->url.naddrs == 0) {
-        ngx_log_error(NGX_LOG_ERR, racf->log, 0,
-                      "relay: no address");
-        goto clear;
-    }
-
-    /* get address */
-    addr = &target->url.addrs[target->counter % target->url.naddrs];
-    target->counter++;
-
-    /* copy log to keep shared log unchanged */
-    rctx->log = *racf->log;
-    pc->log = &rctx->log;
-    pc->get = ngx_rtmp_relay_get_peer;
-    pc->free = ngx_rtmp_relay_free_peer;
-    pc->name = &addr->name;
-    pc->socklen = addr->socklen;
-    pc->sockaddr = (struct sockaddr *)ngx_palloc(pool, pc->socklen);
-    if (pc->sockaddr == NULL) {
-        goto clear;
-    }
-    ngx_memcpy(pc->sockaddr, addr->sockaddr, pc->socklen);
-
-    rc = ngx_event_connect_peer(pc);
-    if (rc != NGX_OK && rc != NGX_AGAIN ) {
-        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, racf->log, 0,
-                "relay: connection failed");
-        goto clear;
-    }
-    c = pc->connection;
-    c->pool = pool;
-    c->addr_text = rctx->url;
-
-    addr_conf = ngx_pcalloc(pool, sizeof(ngx_rtmp_addr_conf_t));
-    if (addr_conf == NULL) {
-        goto clear;
-    }
-    addr_ctx = ngx_pcalloc(pool, sizeof(ngx_rtmp_conf_ctx_t));
-    if (addr_ctx == NULL) {
-        goto clear;
-    }
-    addr_conf->ctx = addr_ctx;
-    addr_ctx->main_conf = cctx->main_conf;
-    addr_ctx->srv_conf  = cctx->srv_conf;
-    ngx_str_set(&addr_conf->addr_text, "ngx-relay");
-
-    rs = ngx_rtmp_init_session(c, addr_conf);
-    if (rs == NULL) {
-        /* no need to destroy pool */
-        return NULL;
-    }
-    rs->app_conf = cctx->app_conf;
-    rs->relay = 1;
-    rctx->session = rs;
-    ngx_rtmp_set_ctx(rs, rctx, ngx_rtmp_relay_module);
-    ngx_str_set(&rs->flashver, "ngx-local-relay");
-
-#if (NGX_STAT_STUB)
-    (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
-#endif
-
-    ngx_rtmp_client_handshake(rs, 1);
-    return rctx;
-
-clear:
-    if (pool) {
-        ngx_destroy_pool(pool);
-    }
-    return NULL;
-}
-
-
-static ngx_rtmp_relay_ctx_t *
-ngx_rtmp_relay_create_remote_ctx(ngx_rtmp_session_t *s, ngx_str_t* name,
-        ngx_rtmp_relay_target_t *target)
-{
-    ngx_rtmp_conf_ctx_t         cctx;
-
-    cctx.app_conf = s->app_conf;
-    cctx.srv_conf = s->srv_conf;
-    cctx.main_conf = s->main_conf;
-
-    return ngx_rtmp_relay_create_connection(&cctx, name, target);
-}
-
-
-static ngx_rtmp_relay_ctx_t *
-ngx_rtmp_relay_create_local_ctx(ngx_rtmp_session_t *s, ngx_str_t *name,
-        ngx_rtmp_relay_target_t *target)
-{
-    ngx_rtmp_relay_ctx_t           *ctx;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "relay: create local context");
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL) {
-        ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_relay_ctx_t));
-        if (ctx == NULL) {
-            return NULL;
-        }
-        ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_relay_module);
-    }
-    ctx->session = s;
-
-    ctx->push_evt.data = s;
-    ctx->push_evt.log = s->connection->log;
-    ctx->push_evt.handler = ngx_rtmp_relay_push_reconnect;
-
-    if (ctx->publish) {
-        return NULL;
-    }
-
-    if (ngx_rtmp_relay_copy_str(s->connection->pool, &ctx->name, name)
-            != NGX_OK)
-    {
-        return NULL;
-    }
-
-    return ctx;
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_create(ngx_rtmp_session_t *s, ngx_str_t *name,
-        ngx_rtmp_relay_target_t *target,
-        ngx_rtmp_relay_create_ctx_pt create_publish_ctx,
-        ngx_rtmp_relay_create_ctx_pt create_play_ctx)
-{
-    ngx_rtmp_relay_app_conf_t      *racf;
-    ngx_rtmp_relay_ctx_t           *publish_ctx, *play_ctx, **cctx;
-    ngx_uint_t                      hash;
-
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
-    if (racf == NULL) {
-        return NGX_ERROR;
-    }
-
-    play_ctx = create_play_ctx(s, name, target);
-    if (play_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    hash = ngx_hash_key(name->data, name->len);
-    cctx = &racf->ctx[hash % racf->nbuckets];
-    for (; *cctx; cctx = &(*cctx)->next) {
-        if ((*cctx)->name.len == name->len
-            && !ngx_memcmp(name->data, (*cctx)->name.data,
-                name->len))
-        {
-            break;
-        }
-    }
-
-    if (*cctx) {
-        play_ctx->publish = (*cctx)->publish;
-        play_ctx->next = (*cctx)->play;
-        (*cctx)->play = play_ctx;
-        return NGX_OK;
-    }
-
-    publish_ctx = create_publish_ctx(s, name, target);
-    if (publish_ctx == NULL) {
-        ngx_rtmp_finalize_session(play_ctx->session);
-        return NGX_ERROR;
-    }
-
-    publish_ctx->publish = publish_ctx;
-    publish_ctx->play = play_ctx;
-    play_ctx->publish = publish_ctx;
-    *cctx = publish_ctx;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_rtmp_relay_pull(ngx_rtmp_session_t *s, ngx_str_t *name,
-        ngx_rtmp_relay_target_t *target)
-{
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-            "relay: create pull name='%V' app='%V' playpath='%V' url='%V'",
-            name, &target->app, &target->play_path, &target->url.url);
-
-    return ngx_rtmp_relay_create(s, name, target,
-            ngx_rtmp_relay_create_remote_ctx,
-            ngx_rtmp_relay_create_local_ctx);
-}
-
-
-ngx_int_t
-ngx_rtmp_relay_push(ngx_rtmp_session_t *s, ngx_str_t *name,
-        ngx_rtmp_relay_target_t *target)
-{
-    ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-            "relay: create push name='%V' app='%V' playpath='%V' url='%V'",
-            name, &target->app, &target->play_path, &target->url.url);
-
-    return ngx_rtmp_relay_create(s, name, target,
-            ngx_rtmp_relay_create_local_ctx,
-            ngx_rtmp_relay_create_remote_ctx);
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
-{
-    ngx_rtmp_relay_app_conf_t      *racf;
-    ngx_rtmp_relay_target_t        *target, **t;
-    ngx_str_t                       name;
-    size_t                          n;
-    ngx_rtmp_relay_ctx_t           *ctx;
-
-    if (s->auto_pushed) {
-        goto next;
-    }
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx && s->relay) {
-        goto next;
-    }
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
-    if (racf == NULL || racf->pushes.nelts == 0) {
-        goto next;
-    }
-
-    name.len = ngx_strlen(v->name);
-    name.data = v->name;
-
-    t = racf->pushes.elts;
-    for (n = 0; n < racf->pushes.nelts; ++n, ++t) {
-        target = *t;
-
-        if (target->name.len && (name.len != target->name.len ||
-            ngx_memcmp(name.data, target->name.data, name.len)))
-        {
-            continue;
-        }
-
-        if (ngx_rtmp_relay_push(s, &name, target) == NGX_OK) {
-            continue;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                "relay: push failed name='%V' app='%V' "
-                "playpath='%V' url='%V'",
-                &name, &target->app, &target->play_path,
-                &target->url.url);
-
-        if (!ctx->push_evt.timer_set) {
-            ngx_add_timer(&ctx->push_evt, racf->push_reconnect);
-        }
-    }
-
-next:
-    return next_publish(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
-{
-    ngx_rtmp_relay_app_conf_t      *racf;
-    ngx_rtmp_relay_target_t        *target, **t;
-    ngx_str_t                       name;
-    size_t                          n;
-    ngx_rtmp_relay_ctx_t           *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx && s->relay) {
-        goto next;
-    }
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
-    if (racf == NULL || racf->pulls.nelts == 0) {
-        goto next;
-    }
-
-    name.len = ngx_strlen(v->name);
-    name.data = v->name;
-
-    t = racf->pulls.elts;
-    for (n = 0; n < racf->pulls.nelts; ++n, ++t) {
-        target = *t;
-
-        if (target->name.len && (name.len != target->name.len ||
-            ngx_memcmp(name.data, target->name.data, name.len)))
-        {
-            continue;
-        }
-
-        if (ngx_rtmp_relay_pull(s, &name, target) == NGX_OK) {
-            continue;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                "relay: pull failed name='%V' app='%V' "
-                "playpath='%V' url='%V'",
-                &name, &target->app, &target->play_path,
-                &target->url.url);
-    }
-
-next:
-    return next_play(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_play_local(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_play_t             v;
-    ngx_rtmp_relay_ctx_t       *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_memzero(&v, sizeof(ngx_rtmp_play_t));
-    v.silent = 1;
-    *(ngx_cpymem(v.name, ctx->name.data,
-            ngx_min(sizeof(v.name) - 1, ctx->name.len))) = 0;
-
-    return ngx_rtmp_play(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_publish_local(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_publish_t          v;
-    ngx_rtmp_relay_ctx_t       *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_memzero(&v, sizeof(ngx_rtmp_publish_t));
-    v.silent = 1;
-    *(ngx_cpymem(v.name, ctx->name.data,
-            ngx_min(sizeof(v.name) - 1, ctx->name.len))) = 0;
-
-    return ngx_rtmp_publish(s, &v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_send_connect(ngx_rtmp_session_t *s)
-{
-    static double               trans = NGX_RTMP_RELAY_CONNECT_TRANS;
-    static double               acodecs = 3575;
-    static double               vcodecs = 252;
-
-    static ngx_rtmp_amf_elt_t   out_cmd[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("app"),
-          NULL, 0 }, /* <-- fill */
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("tcUrl"),
-          NULL, 0 }, /* <-- fill */
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("pageUrl"),
-          NULL, 0 }, /* <-- fill */
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("swfUrl"),
-          NULL, 0 }, /* <-- fill */
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("flashVer"),
-          NULL, 0 }, /* <-- fill */
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("audioCodecs"),
-          &acodecs, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("videoCodecs"),
-          &vcodecs, 0 }
-    };
-
-    static ngx_rtmp_amf_elt_t   out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "connect", 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &trans, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          out_cmd, sizeof(out_cmd) }
-    };
-
-    ngx_rtmp_core_app_conf_t   *cacf;
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    ngx_rtmp_relay_ctx_t       *ctx;
-    ngx_rtmp_header_t           h;
-    size_t                      len, url_len;
-    u_char                     *p, *url_end;
-
-
-    cacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_core_module);
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (cacf == NULL || ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    /* app */
-    if (ctx->app.len) {
-        out_cmd[0].data = ctx->app.data;
-        out_cmd[0].len  = ctx->app.len;
-    } else {
-        out_cmd[0].data = cacf->name.data;
-        out_cmd[0].len  = cacf->name.len;
-    }
-
-    /* tcUrl */
-    if (ctx->tc_url.len) {
-        out_cmd[1].data = ctx->tc_url.data;
-        out_cmd[1].len  = ctx->tc_url.len;
-    } else {
-        len = sizeof("rtmp://") - 1 + ctx->url.len +
-            sizeof("/") - 1 + ctx->app.len;
-        p = ngx_palloc(s->connection->pool, len);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-        out_cmd[1].data = p;
-        p = ngx_cpymem(p, "rtmp://", sizeof("rtmp://") - 1);
-
-        url_len = ctx->url.len;
-        url_end = ngx_strlchr(ctx->url.data, ctx->url.data + ctx->url.len, '/');
-        if (url_end) {
-            url_len = (size_t) (url_end - ctx->url.data);
-        }
-
-        p = ngx_cpymem(p, ctx->url.data, url_len);
-        *p++ = '/';
-        p = ngx_cpymem(p, ctx->app.data, ctx->app.len);
-        out_cmd[1].len = p - (u_char *)out_cmd[1].data;
-    }
-
-    /* pageUrl */
-    out_cmd[2].data = ctx->page_url.data;
-    out_cmd[2].len  = ctx->page_url.len;
-
-    /* swfUrl */
-    out_cmd[3].data = ctx->swf_url.data;
-    out_cmd[3].len  = ctx->swf_url.len;
-
-    /* flashVer */
-    if (ctx->flash_ver.len) {
-        out_cmd[4].data = ctx->flash_ver.data;
-        out_cmd[4].len  = ctx->flash_ver.len;
-    } else {
-        out_cmd[4].data = NGX_RTMP_RELAY_FLASHVER;
-        out_cmd[4].len  = sizeof(NGX_RTMP_RELAY_FLASHVER) - 1;
-    }
-
-    ngx_memzero(&h, sizeof(h));
-    h.csid = NGX_RTMP_RELAY_CSID_AMF_INI;
-    h.type = NGX_RTMP_MSG_AMF_CMD;
-
-    return ngx_rtmp_send_chunk_size(s, cscf->chunk_size) != NGX_OK
-        || ngx_rtmp_send_ack_size(s, cscf->ack_window) != NGX_OK
-        || ngx_rtmp_send_amf(s, &h, out_elts,
-            sizeof(out_elts) / sizeof(out_elts[0])) != NGX_OK
-        ? NGX_ERROR
-        : NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_send_create_stream(ngx_rtmp_session_t *s)
-{
-    static double               trans = NGX_RTMP_RELAY_CREATE_STREAM_TRANS;
-
-    static ngx_rtmp_amf_elt_t   out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "createStream", 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &trans, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 }
-    };
-
-    ngx_rtmp_header_t           h;
-
-
-    ngx_memzero(&h, sizeof(h));
-    h.csid = NGX_RTMP_RELAY_CSID_AMF_INI;
-    h.type = NGX_RTMP_MSG_AMF_CMD;
-
-    return ngx_rtmp_send_amf(s, &h, out_elts,
-            sizeof(out_elts) / sizeof(out_elts[0]));
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_send_publish(ngx_rtmp_session_t *s)
-{
-    static double               trans;
-
-    static ngx_rtmp_amf_elt_t   out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "publish", 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &trans, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          NULL, 0 }, /* <- to fill */
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "live", 0 }
-    };
-
-    ngx_rtmp_header_t           h;
-    ngx_rtmp_relay_ctx_t       *ctx;
-
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (ctx->play_path.len) {
-        out_elts[3].data = ctx->play_path.data;
-        out_elts[3].len  = ctx->play_path.len;
-    } else {
-        out_elts[3].data = ctx->name.data;
-        out_elts[3].len  = ctx->name.len;
-    }
-
-    ngx_memzero(&h, sizeof(h));
-    h.csid = NGX_RTMP_RELAY_CSID_AMF;
-    h.msid = NGX_RTMP_RELAY_MSID;
-    h.type = NGX_RTMP_MSG_AMF_CMD;
-
-    return ngx_rtmp_send_amf(s, &h, out_elts,
-            sizeof(out_elts) / sizeof(out_elts[0]));
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_send_play(ngx_rtmp_session_t *s)
-{
-    static double               trans;
-    static double               start, duration;
-
-    static ngx_rtmp_amf_elt_t   out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "play", 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &trans, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          NULL, 0 }, /* <- fill */
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &start, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &duration, 0 },
-    };
-
-    ngx_rtmp_header_t           h;
-    ngx_rtmp_relay_ctx_t       *ctx;
-    ngx_rtmp_relay_app_conf_t  *racf;
-
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (racf == NULL || ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (ctx->play_path.len) {
-        out_elts[3].data = ctx->play_path.data;
-        out_elts[3].len  = ctx->play_path.len;
-    } else {
-        out_elts[3].data = ctx->name.data;
-        out_elts[3].len  = ctx->name.len;
-    }
-
-    if (ctx->live) {
-        start = -1000;
-        duration = -1000;
-    } else {
-        start    = (ctx->start ? ctx->start : -2000);
-        duration = (ctx->stop  ? ctx->stop - ctx->start : -1000);
-    }
-
-    ngx_memzero(&h, sizeof(h));
-    h.csid = NGX_RTMP_RELAY_CSID_AMF;
-    h.msid = NGX_RTMP_RELAY_MSID;
-    h.type = NGX_RTMP_MSG_AMF_CMD;
-
-    return ngx_rtmp_send_amf(s, &h, out_elts,
-            sizeof(out_elts) / sizeof(out_elts[0])) != NGX_OK
-           || ngx_rtmp_send_set_buflen(s, NGX_RTMP_RELAY_MSID,
-                   racf->buflen) != NGX_OK
-           ? NGX_ERROR
-           : NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_on_result(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    ngx_rtmp_relay_ctx_t       *ctx;
-    static struct {
-        double                  trans;
-        u_char                  level[32];
-        u_char                  code[128];
-        u_char                  desc[1024];
-    } v;
-
-    static ngx_rtmp_amf_elt_t   in_inf[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("level"),
-          &v.level, sizeof(v.level) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("code"),
-          &v.code, sizeof(v.code) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("description"),
-          &v.desc, sizeof(v.desc) },
-    };
-
-    static ngx_rtmp_amf_elt_t   in_elts[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.trans, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          in_inf, sizeof(in_inf) },
-    };
-
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL || !s->relay) {
-        return NGX_OK;
-    }
-
-    ngx_memzero(&v, sizeof(v));
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "relay: _result: level='%s' code='%s' description='%s'",
-            v.level, v.code, v.desc);
-
-    switch ((ngx_int_t)v.trans) {
-        case NGX_RTMP_RELAY_CONNECT_TRANS:
-            return ngx_rtmp_relay_send_create_stream(s);
-
-        case NGX_RTMP_RELAY_CREATE_STREAM_TRANS:
-            if (ctx->publish != ctx && !s->static_relay) {
-                if (ngx_rtmp_relay_send_publish(s) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                return ngx_rtmp_relay_play_local(s);
-
-            } else {
-                if (ngx_rtmp_relay_send_play(s) != NGX_OK) {
-                    return NGX_ERROR;
-                }
-                return ngx_rtmp_relay_publish_local(s);
-            }
-
-        default:
-            return NGX_OK;
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_on_error(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    ngx_rtmp_relay_ctx_t       *ctx;
-    static struct {
-        double                  trans;
-        u_char                  level[32];
-        u_char                  code[128];
-        u_char                  desc[1024];
-    } v;
-
-    static ngx_rtmp_amf_elt_t   in_inf[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("level"),
-          &v.level, sizeof(v.level) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("code"),
-          &v.code, sizeof(v.code) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("description"),
-          &v.desc, sizeof(v.desc) },
-    };
-
-    static ngx_rtmp_amf_elt_t   in_elts[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.trans, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          in_inf, sizeof(in_inf) },
-    };
-
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL || !s->relay) {
-        return NGX_OK;
-    }
-
-    ngx_memzero(&v, sizeof(v));
-    if (ngx_rtmp_receive_amf(s, in, in_elts,
-                sizeof(in_elts) / sizeof(in_elts[0])))
-    {
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "relay: _error: level='%s' code='%s' description='%s'",
-            v.level, v.code, v.desc);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_on_status(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    ngx_rtmp_relay_ctx_t       *ctx;
-    static struct {
-        double                  trans;
-        u_char                  level[32];
-        u_char                  code[128];
-        u_char                  desc[1024];
-    } v;
-
-    static ngx_rtmp_amf_elt_t   in_inf[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("level"),
-          &v.level, sizeof(v.level) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("code"),
-          &v.code, sizeof(v.code) },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("description"),
-          &v.desc, sizeof(v.desc) },
-    };
-
-    static ngx_rtmp_amf_elt_t   in_elts[] = {
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &v.trans, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          in_inf, sizeof(in_inf) },
-    };
-
-    static ngx_rtmp_amf_elt_t   in_elts_meta[] = {
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          in_inf, sizeof(in_inf) },
-    };
-
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL || !s->relay) {
-        return NGX_OK;
-    }
-
-    ngx_memzero(&v, sizeof(v));
-    if (h->type == NGX_RTMP_MSG_AMF_META) {
-        ngx_rtmp_receive_amf(s, in, in_elts_meta,
-                sizeof(in_elts_meta) / sizeof(in_elts_meta[0]));
-    } else {
-        ngx_rtmp_receive_amf(s, in, in_elts,
-                sizeof(in_elts) / sizeof(in_elts[0]));
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-            "relay: onStatus: level='%s' code='%s' description='%s'",
-            v.level, v.code, v.desc);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_handshake_done(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-        ngx_chain_t *in)
-{
-    ngx_rtmp_relay_ctx_t   *ctx;
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL || !s->relay) {
-        return NGX_OK;
-    }
-
-    return ngx_rtmp_relay_send_connect(s);
-}
-
-
-static void
-ngx_rtmp_relay_close(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_relay_app_conf_t          *racf;
-    ngx_rtmp_relay_ctx_t               *ctx, **cctx;
-    ngx_uint_t                          hash;
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
-
-    ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_relay_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    if (s->static_relay) {
-        ngx_add_timer(ctx->static_evt, racf->pull_reconnect);
-    }
-
-    if (ctx->publish == NULL) {
-        return;
-    }
-
-    /* play end disconnect? */
-    if (ctx->publish != ctx) {
-        for (cctx = &ctx->publish->play; *cctx; cctx = &(*cctx)->next) {
-            if (*cctx == ctx) {
-                *cctx = ctx->next;
-                break;
-            }
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ctx->session->connection->log, 0,
-                "relay: play disconnect app='%V' name='%V'",
-                &ctx->app, &ctx->name);
-
-        /* push reconnect */
-        if (s->relay && ctx->tag == &ngx_rtmp_relay_module &&
-            !ctx->publish->push_evt.timer_set)
-        {
-            ngx_add_timer(&ctx->publish->push_evt, racf->push_reconnect);
-        }
-
-#ifdef NGX_DEBUG
-        {
-            ngx_uint_t  n = 0;
-            for (cctx = &ctx->publish->play; *cctx; cctx = &(*cctx)->next, ++n);
-            ngx_log_debug3(NGX_LOG_DEBUG_RTMP, ctx->session->connection->log, 0,
-                "relay: play left after disconnect app='%V' name='%V': %ui",
-                &ctx->app, &ctx->name, n);
-        }
-#endif
-
-        if (ctx->publish->play == NULL && ctx->publish->session->relay) {
-            ngx_log_debug2(NGX_LOG_DEBUG_RTMP,
-                 ctx->publish->session->connection->log, 0,
-                "relay: publish disconnect empty app='%V' name='%V'",
-                &ctx->app, &ctx->name);
-            ngx_rtmp_finalize_session(ctx->publish->session);
-        }
-
-        ctx->publish = NULL;
-
-        return;
-    }
-
-    /* publish end disconnect */
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ctx->session->connection->log, 0,
-            "relay: publish disconnect app='%V' name='%V'",
-            &ctx->app, &ctx->name);
-
-    if (ctx->push_evt.timer_set) {
-        ngx_del_timer(&ctx->push_evt);
-    }
-
-    for (cctx = &ctx->play; *cctx; cctx = &(*cctx)->next) {
-        (*cctx)->publish = NULL;
-        ngx_log_debug2(NGX_LOG_DEBUG_RTMP, (*cctx)->session->connection->log,
-            0, "relay: play disconnect orphan app='%V' name='%V'",
-            &(*cctx)->app, &(*cctx)->name);
-        ngx_rtmp_finalize_session((*cctx)->session);
-    }
-    ctx->publish = NULL;
-
-    hash = ngx_hash_key(ctx->name.data, ctx->name.len);
-    cctx = &racf->ctx[hash % racf->nbuckets];
-    for (; *cctx && *cctx != ctx; cctx = &(*cctx)->next);
-    if (*cctx) {
-        *cctx = ctx->next;
-    }
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
-{
-    ngx_rtmp_relay_app_conf_t  *racf;
-
-    racf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_relay_module);
-    if (racf && !racf->session_relay) {
-        ngx_rtmp_relay_close(s);
-    }
-
-    return next_close_stream(s, v);
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_delete_stream(ngx_rtmp_session_t *s, ngx_rtmp_delete_stream_t *v)
-{
-    ngx_rtmp_relay_close(s);
-
-    return next_delete_stream(s, v);
-}
-
-
-static char *
-ngx_rtmp_relay_push_pull(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_str_t                          *value, v, n;
-    ngx_rtmp_relay_app_conf_t          *racf;
-    ngx_rtmp_relay_target_t            *target, **t;
-    ngx_url_t                          *u;
-    ngx_uint_t                          i;
-    ngx_int_t                           is_pull, is_static;
-    ngx_event_t                       **ee, *e;
-    ngx_rtmp_relay_static_t            *rs;
-    u_char                             *p;
-
-    value = cf->args->elts;
-
-    racf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_relay_module);
-
-    is_pull = (value[0].data[3] == 'l');
-    is_static = 0;
-
-    target = ngx_pcalloc(cf->pool, sizeof(*target));
-    if (target == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    target->tag = &ngx_rtmp_relay_module;
-    target->data = target;
-
-    u = &target->url;
-    u->default_port = 1935;
-    u->uri_part = 1;
-    u->url = value[1];
-
-    if (ngx_strncasecmp(u->url.data, (u_char *) "rtmp://", 7) == 0) {
-        u->url.data += 7;
-        u->url.len  -= 7;
-    }
-
-    if (ngx_parse_url(cf->pool, u) != NGX_OK) {
-        if (u->err) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                    "%s in url \"%V\"", u->err, &u->url);
-        }
-        return NGX_CONF_ERROR;
-    }
-
-    value += 2;
-    for (i = 2; i < cf->args->nelts; ++i, ++value) {
-        p = ngx_strlchr(value->data, value->data + value->len, '=');
-
-        if (p == NULL) {
-            n = *value;
-            ngx_str_set(&v, "1");
-
-        } else {
-            n.data = value->data;
-            n.len  = p - value->data;
-
-            v.data = p + 1;
-            v.len  = value->data + value->len - p - 1;
-        }
-
-#define NGX_RTMP_RELAY_STR_PAR(name, var)                                     \
-        if (n.len == sizeof(name) - 1                                         \
-            && ngx_strncasecmp(n.data, (u_char *) name, n.len) == 0)          \
-        {                                                                     \
-            target->var = v;                                                  \
-            continue;                                                         \
-        }
-
-#define NGX_RTMP_RELAY_NUM_PAR(name, var)                                     \
-        if (n.len == sizeof(name) - 1                                         \
-            && ngx_strncasecmp(n.data, (u_char *) name, n.len) == 0)          \
-        {                                                                     \
-            target->var = ngx_atoi(v.data, v.len);                            \
-            continue;                                                         \
-        }
-
-        NGX_RTMP_RELAY_STR_PAR("app",         app);
-        NGX_RTMP_RELAY_STR_PAR("name",        name);
-        NGX_RTMP_RELAY_STR_PAR("tcUrl",       tc_url);
-        NGX_RTMP_RELAY_STR_PAR("pageUrl",     page_url);
-        NGX_RTMP_RELAY_STR_PAR("swfUrl",      swf_url);
-        NGX_RTMP_RELAY_STR_PAR("flashVer",    flash_ver);
-        NGX_RTMP_RELAY_STR_PAR("playPath",    play_path);
-        NGX_RTMP_RELAY_NUM_PAR("live",        live);
-        NGX_RTMP_RELAY_NUM_PAR("start",       start);
-        NGX_RTMP_RELAY_NUM_PAR("stop",        stop);
-
-#undef NGX_RTMP_RELAY_STR_PAR
-#undef NGX_RTMP_RELAY_NUM_PAR
-
-        if (n.len == sizeof("static") - 1 &&
-            ngx_strncasecmp(n.data, (u_char *) "static", n.len) == 0 &&
-            ngx_atoi(v.data, v.len))
-        {
-            is_static = 1;
-            continue;
-        }
-
-        return "unsuppored parameter";
-    }
-
-    if (is_static) {
-
-        if (!is_pull) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "static push is not allowed");
-            return NGX_CONF_ERROR;
-        }
-
-        if (target->name.len == 0) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "stream name missing in static pull "
-                               "declaration");
-            return NGX_CONF_ERROR;
-        }
-
-        ee = ngx_array_push(&racf->static_events);
-        if (ee == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        e = ngx_pcalloc(cf->pool, sizeof(ngx_event_t));
-        if (e == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        *ee = e;
-
-        rs = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_relay_static_t));
-        if (rs == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        rs->target = target;
-
-        e->data = rs;
-        e->log = &cf->cycle->new_log;
-        e->handler = ngx_rtmp_relay_static_pull_reconnect;
-
-        t = ngx_array_push(&racf->static_pulls);
-
-    } else if (is_pull) {
-        t = ngx_array_push(&racf->pulls);
-
-    } else {
-        t = ngx_array_push(&racf->pushes);
-    }
-
-    if (t == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    *t = target;
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_init_process(ngx_cycle_t *cycle)
-{
-#if !(NGX_WIN32)
-    ngx_rtmp_core_main_conf_t  *cmcf = ngx_rtmp_core_main_conf;
-    ngx_rtmp_core_srv_conf_t  **pcscf, *cscf;
-    ngx_rtmp_core_app_conf_t  **pcacf, *cacf;
-    ngx_rtmp_relay_app_conf_t  *racf;
-    ngx_uint_t                  n, m, k;
-    ngx_rtmp_relay_static_t    *rs;
-    ngx_rtmp_listen_t          *lst;
-    ngx_event_t               **pevent, *event;
-
-    if (cmcf == NULL || cmcf->listen.nelts == 0) {
-        return NGX_OK;
-    }
-
-    /* only first worker does static pulling */
-
-    if (ngx_process_slot) {
-        return NGX_OK;
-    }
-
-    lst = cmcf->listen.elts;
-
-    pcscf = cmcf->servers.elts;
-    for (n = 0; n < cmcf->servers.nelts; ++n, ++pcscf) {
-
-        cscf = *pcscf;
-        pcacf = cscf->applications.elts;
-
-        for (m = 0; m < cscf->applications.nelts; ++m, ++pcacf) {
-
-            cacf = *pcacf;
-            racf = cacf->app_conf[ngx_rtmp_relay_module.ctx_index];
-            pevent = racf->static_events.elts;
-
-            for (k = 0; k < racf->static_events.nelts; ++k, ++pevent) {
-                event = *pevent;
-
-                rs = event->data;
-                rs->cctx = *lst->ctx;
-                rs->cctx.app_conf = cacf->app_conf;
-
-                ngx_post_event(event, &ngx_rtmp_init_queue);
-            }
-        }
-    }
-#endif
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_rtmp_relay_postconfiguration(ngx_conf_t *cf)
-{
-    ngx_rtmp_core_main_conf_t          *cmcf;
-    ngx_rtmp_handler_pt                *h;
-    ngx_rtmp_amf_handler_t             *ch;
-
-    cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
-
-
-    h = ngx_array_push(&cmcf->events[NGX_RTMP_HANDSHAKE_DONE]);
-    *h = ngx_rtmp_relay_handshake_done;
-
-
-    next_publish = ngx_rtmp_publish;
-    ngx_rtmp_publish = ngx_rtmp_relay_publish;
-
-    next_play = ngx_rtmp_play;
-    ngx_rtmp_play = ngx_rtmp_relay_play;
-
-    next_delete_stream = ngx_rtmp_delete_stream;
-    ngx_rtmp_delete_stream = ngx_rtmp_relay_delete_stream;
-
-    next_close_stream = ngx_rtmp_close_stream;
-    ngx_rtmp_close_stream = ngx_rtmp_relay_close_stream;
-
-
-    ch = ngx_array_push(&cmcf->amf);
-    ngx_str_set(&ch->name, "_result");
-    ch->handler = ngx_rtmp_relay_on_result;
-
-    ch = ngx_array_push(&cmcf->amf);
-    ngx_str_set(&ch->name, "_error");
-    ch->handler = ngx_rtmp_relay_on_error;
-
-    ch = ngx_array_push(&cmcf->amf);
-    ngx_str_set(&ch->name, "onStatus");
-    ch->handler = ngx_rtmp_relay_on_status;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_relay_module.h b/debian/modules/rtmp/ngx_rtmp_relay_module.h
deleted file mode 100644
index d1baeae..0000000
--- a/debian/modules/rtmp/ngx_rtmp_relay_module.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_RELAY_H_INCLUDED_
-#define _NGX_RTMP_RELAY_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-
-
-typedef struct {
-    ngx_url_t                       url;
-    ngx_str_t                       app;
-    ngx_str_t                       name;
-    ngx_str_t                       tc_url;
-    ngx_str_t                       page_url;
-    ngx_str_t                       swf_url;
-    ngx_str_t                       flash_ver;
-    ngx_str_t                       play_path;
-    ngx_int_t                       live;
-    ngx_int_t                       start;
-    ngx_int_t                       stop;
-
-    void                           *tag;     /* usually module reference */
-    void                           *data;    /* module-specific data */
-    ngx_uint_t                      counter; /* mutable connection counter */
-} ngx_rtmp_relay_target_t;
-
-
-typedef struct ngx_rtmp_relay_ctx_s ngx_rtmp_relay_ctx_t;
-
-struct ngx_rtmp_relay_ctx_s {
-    ngx_str_t                       name;
-    ngx_str_t                       url;
-    ngx_log_t                       log;
-    ngx_rtmp_session_t             *session;
-    ngx_rtmp_relay_ctx_t           *publish;
-    ngx_rtmp_relay_ctx_t           *play;
-    ngx_rtmp_relay_ctx_t           *next;
-
-    ngx_str_t                       app;
-    ngx_str_t                       tc_url;
-    ngx_str_t                       page_url;
-    ngx_str_t                       swf_url;
-    ngx_str_t                       flash_ver;
-    ngx_str_t                       play_path;
-    ngx_int_t                       live;
-    ngx_int_t                       start;
-    ngx_int_t                       stop;
-
-    ngx_event_t                     push_evt;
-    ngx_event_t                    *static_evt;
-    void                           *tag;
-    void                           *data;
-};
-
-
-extern ngx_module_t                 ngx_rtmp_relay_module;
-
-
-ngx_int_t ngx_rtmp_relay_pull(ngx_rtmp_session_t *s, ngx_str_t *name,
-                              ngx_rtmp_relay_target_t *target);
-ngx_int_t ngx_rtmp_relay_push(ngx_rtmp_session_t *s, ngx_str_t *name,
-                              ngx_rtmp_relay_target_t *target);
-
-
-#endif /* _NGX_RTMP_RELAY_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_send.c b/debian/modules/rtmp/ngx_rtmp_send.c
deleted file mode 100644
index c65deec..0000000
--- a/debian/modules/rtmp/ngx_rtmp_send.c
+++ /dev/null
@@ -1,635 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_amf.h"
-#include "ngx_rtmp_streams.h"
-
-
-#define NGX_RTMP_USER_START(s, tp)                                          \
-    ngx_rtmp_header_t               __h;                                    \
-    ngx_chain_t                    *__l;                                    \
-    ngx_buf_t                      *__b;                                    \
-    ngx_rtmp_core_srv_conf_t       *__cscf;                                 \
-                                                                            \
-    __cscf = ngx_rtmp_get_module_srv_conf(                                  \
-            s, ngx_rtmp_core_module);                                       \
-    memset(&__h, 0, sizeof(__h));                                           \
-    __h.type = tp;                                                          \
-    __h.csid = 2;                                                           \
-    __l = ngx_rtmp_alloc_shared_buf(__cscf);                                \
-    if (__l == NULL) {                                                      \
-        return NULL;                                                        \
-    }                                                                       \
-    __b = __l->buf;
-
-#define NGX_RTMP_UCTL_START(s, type, utype)                                 \
-    NGX_RTMP_USER_START(s, type);                                           \
-    *(__b->last++) = (u_char)((utype) >> 8);                                \
-    *(__b->last++) = (u_char)(utype);
-
-#define NGX_RTMP_USER_OUT1(v)                                               \
-    *(__b->last++) = ((u_char*)&v)[0];
-
-#define NGX_RTMP_USER_OUT4(v)                                               \
-    *(__b->last++) = ((u_char*)&v)[3];                                      \
-    *(__b->last++) = ((u_char*)&v)[2];                                      \
-    *(__b->last++) = ((u_char*)&v)[1];                                      \
-    *(__b->last++) = ((u_char*)&v)[0];
-
-#define NGX_RTMP_USER_END(s)                                                \
-    ngx_rtmp_prepare_message(s, &__h, NULL, __l);                           \
-    return __l;
-
-
-static ngx_int_t
-ngx_rtmp_send_shared_packet(ngx_rtmp_session_t *s, ngx_chain_t *cl)
-{
-    ngx_rtmp_core_srv_conf_t       *cscf;
-    ngx_int_t                       rc;
-
-    if (cl == NULL) {
-        return NGX_ERROR;
-    }
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    rc = ngx_rtmp_send_message(s, cl, 0);
-
-    ngx_rtmp_free_shared_chain(cscf, cl);
-
-    return rc;
-}
-
-
-/* Protocol control messages */
-
-ngx_chain_t *
-ngx_rtmp_create_chunk_size(ngx_rtmp_session_t *s, uint32_t chunk_size)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "chunk_size=%uD", chunk_size);
-
-    {
-        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_CHUNK_SIZE);
-
-        NGX_RTMP_USER_OUT4(chunk_size);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_chunk_size(ngx_rtmp_session_t *s, uint32_t chunk_size)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_chunk_size(s, chunk_size));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_abort(ngx_rtmp_session_t *s, uint32_t csid)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: abort csid=%uD", csid);
-
-    {
-        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_CHUNK_SIZE);
-
-        NGX_RTMP_USER_OUT4(csid);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_abort(ngx_rtmp_session_t *s, uint32_t csid)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_abort(s, csid));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_ack(ngx_rtmp_session_t *s, uint32_t seq)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: ack seq=%uD", seq);
-
-    {
-        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_ACK);
-
-        NGX_RTMP_USER_OUT4(seq);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_ack(ngx_rtmp_session_t *s, uint32_t seq)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_ack(s, seq));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_ack_size(ngx_rtmp_session_t *s, uint32_t ack_size)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: ack_size=%uD", ack_size);
-
-    {
-        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_ACK_SIZE);
-
-        NGX_RTMP_USER_OUT4(ack_size);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_ack_size(ngx_rtmp_session_t *s, uint32_t ack_size)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_ack_size(s, ack_size));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_bandwidth(ngx_rtmp_session_t *s, uint32_t ack_size,
-                          uint8_t limit_type)
-{
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: bandwidth ack_size=%uD limit=%d",
-                   ack_size, (int)limit_type);
-
-    {
-        NGX_RTMP_USER_START(s, NGX_RTMP_MSG_BANDWIDTH);
-
-        NGX_RTMP_USER_OUT4(ack_size);
-        NGX_RTMP_USER_OUT1(limit_type);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_bandwidth(ngx_rtmp_session_t *s, uint32_t ack_size,
-                        uint8_t limit_type)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_bandwidth(s, ack_size, limit_type));
-}
-
-
-/* User control messages */
-
-ngx_chain_t *
-ngx_rtmp_create_stream_begin(ngx_rtmp_session_t *s, uint32_t msid)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: stream_begin msid=%uD", msid);
-
-    {
-        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_BEGIN);
-
-        NGX_RTMP_USER_OUT4(msid);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_stream_begin(ngx_rtmp_session_t *s, uint32_t msid)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_stream_begin(s, msid));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_stream_eof(ngx_rtmp_session_t *s, uint32_t msid)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: stream_end msid=%uD", msid);
-
-    {
-        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_EOF);
-
-        NGX_RTMP_USER_OUT4(msid);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_stream_eof(ngx_rtmp_session_t *s, uint32_t msid)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_stream_eof(s, msid));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_stream_dry(ngx_rtmp_session_t *s, uint32_t msid)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: stream_dry msid=%uD", msid);
-
-    {
-        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_STREAM_DRY);
-
-        NGX_RTMP_USER_OUT4(msid);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_stream_dry(ngx_rtmp_session_t *s, uint32_t msid)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_stream_dry(s, msid));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_set_buflen(ngx_rtmp_session_t *s, uint32_t msid,
-                           uint32_t buflen_msec)
-{
-    ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: set_buflen msid=%uD buflen=%uD",
-                   msid, buflen_msec);
-
-    {
-        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_SET_BUFLEN);
-
-        NGX_RTMP_USER_OUT4(msid);
-        NGX_RTMP_USER_OUT4(buflen_msec);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_set_buflen(ngx_rtmp_session_t *s, uint32_t msid,
-        uint32_t buflen_msec)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_set_buflen(s, msid, buflen_msec));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_recorded(ngx_rtmp_session_t *s, uint32_t msid)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: recorded msid=%uD", msid);
-
-    {
-        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_RECORDED);
-
-        NGX_RTMP_USER_OUT4(msid);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_recorded(ngx_rtmp_session_t *s, uint32_t msid)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_recorded(s, msid));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_ping_request(ngx_rtmp_session_t *s, uint32_t timestamp)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: ping_request timestamp=%uD", timestamp);
-
-    {
-        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_PING_REQUEST);
-
-        NGX_RTMP_USER_OUT4(timestamp);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_ping_request(ngx_rtmp_session_t *s, uint32_t timestamp)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_ping_request(s, timestamp));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_ping_response(ngx_rtmp_session_t *s, uint32_t timestamp)
-{
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: ping_response timestamp=%uD", timestamp);
-
-    {
-        NGX_RTMP_UCTL_START(s, NGX_RTMP_MSG_USER, NGX_RTMP_USER_PING_RESPONSE);
-
-        NGX_RTMP_USER_OUT4(timestamp);
-
-        NGX_RTMP_USER_END(s);
-    }
-}
-
-
-ngx_int_t
-ngx_rtmp_send_ping_response(ngx_rtmp_session_t *s, uint32_t timestamp)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_ping_response(s, timestamp));
-}
-
-
-static ngx_chain_t *
-ngx_rtmp_alloc_amf_buf(void *arg)
-{
-    return ngx_rtmp_alloc_shared_buf((ngx_rtmp_core_srv_conf_t *)arg);
-}
-
-
-/* AMF sender */
-
-/* NOTE: this function does not free shared bufs on error */
-ngx_int_t
-ngx_rtmp_append_amf(ngx_rtmp_session_t *s,
-                    ngx_chain_t **first, ngx_chain_t **last,
-                    ngx_rtmp_amf_elt_t *elts, size_t nelts)
-{
-    ngx_rtmp_amf_ctx_t          act;
-    ngx_rtmp_core_srv_conf_t   *cscf;
-    ngx_int_t                   rc;
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    memset(&act, 0, sizeof(act));
-    act.arg = cscf;
-    act.alloc = ngx_rtmp_alloc_amf_buf;
-    act.log = s->connection->log;
-
-    if (first) {
-        act.first = *first;
-    }
-
-    if (last) {
-        act.link = *last;
-    }
-
-    rc = ngx_rtmp_amf_write(&act, elts, nelts);
-
-    if (first) {
-        *first = act.first;
-    }
-
-    if (last) {
-        *last = act.link;
-    }
-
-    return rc;
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_amf(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                    ngx_rtmp_amf_elt_t *elts, size_t nelts)
-{
-    ngx_chain_t                *first;
-    ngx_int_t                   rc;
-    ngx_rtmp_core_srv_conf_t   *cscf;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: amf nelts=%ui", nelts);
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
-    first = NULL;
-
-    rc = ngx_rtmp_append_amf(s, &first, NULL, elts, nelts);
-
-    if (rc != NGX_OK && first) {
-        ngx_rtmp_free_shared_chain(cscf, first);
-        first = NULL;
-    }
-
-    if (first) {
-        ngx_rtmp_prepare_message(s, h, NULL, first);
-    }
-
-    return first;
-}
-
-
-ngx_int_t
-ngx_rtmp_send_amf(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
-                  ngx_rtmp_amf_elt_t *elts, size_t nelts)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_amf(s, h, elts, nelts));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_status(ngx_rtmp_session_t *s, char *code, char* level,
-                       char *desc)
-{
-    ngx_rtmp_header_t               h;
-    static double                   trans;
-
-    static ngx_rtmp_amf_elt_t       out_inf[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("level"),
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("code"),
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("description"),
-          NULL, 0 },
-    };
-
-    static ngx_rtmp_amf_elt_t       out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "onStatus", 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_null_string,
-          &trans, 0 },
-
-        { NGX_RTMP_AMF_NULL,
-          ngx_null_string,
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          out_inf,
-          sizeof(out_inf) },
-    };
-
-    ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: status code='%s' level='%s' desc='%s'",
-                   code, level, desc);
-
-    out_inf[0].data = level;
-    out_inf[1].data = code;
-    out_inf[2].data = desc;
-
-    memset(&h, 0, sizeof(h));
-
-    h.type = NGX_RTMP_MSG_AMF_CMD;
-    h.csid = NGX_RTMP_CSID_AMF;
-    h.msid = NGX_RTMP_MSID;
-
-    return ngx_rtmp_create_amf(s, &h, out_elts,
-                               sizeof(out_elts) / sizeof(out_elts[0]));
-}
-
-
-ngx_int_t
-ngx_rtmp_send_status(ngx_rtmp_session_t *s, char *code, char* level, char *desc)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_status(s, code, level, desc));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_play_status(ngx_rtmp_session_t *s, char *code, char* level,
-                            ngx_uint_t duration, ngx_uint_t bytes)
-{
-    ngx_rtmp_header_t               h;
-    static double                   dduration;
-    static double                   dbytes;
-
-    static ngx_rtmp_amf_elt_t       out_inf[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("code"),
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_string("level"),
-          NULL, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("duration"),
-          &dduration, 0 },
-
-        { NGX_RTMP_AMF_NUMBER,
-          ngx_string("bytes"),
-          &dbytes, 0 },
-    };
-
-    static ngx_rtmp_amf_elt_t       out_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "onPlayStatus", 0 },
-
-        { NGX_RTMP_AMF_OBJECT,
-          ngx_null_string,
-          out_inf,
-          sizeof(out_inf) },
-    };
-
-    ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-                   "create: play_status code='%s' level='%s' "
-                   "duration=%ui bytes=%ui",
-                   code, level, duration, bytes);
-
-    out_inf[0].data = code;
-    out_inf[1].data = level;
-
-    dduration = duration;
-    dbytes = bytes;
-
-    memset(&h, 0, sizeof(h));
-
-    h.type = NGX_RTMP_MSG_AMF_META;
-    h.csid = NGX_RTMP_CSID_AMF;
-    h.msid = NGX_RTMP_MSID;
-    h.timestamp = duration;
-
-    return ngx_rtmp_create_amf(s, &h, out_elts,
-                               sizeof(out_elts) / sizeof(out_elts[0]));
-}
-
-
-ngx_int_t
-ngx_rtmp_send_play_status(ngx_rtmp_session_t *s, char *code, char* level,
-                          ngx_uint_t duration, ngx_uint_t bytes)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_play_status(s, code, level, duration, bytes));
-}
-
-
-ngx_chain_t *
-ngx_rtmp_create_sample_access(ngx_rtmp_session_t *s)
-{
-    ngx_rtmp_header_t               h;
-
-    static int                      access = 1;
-
-    static ngx_rtmp_amf_elt_t       access_elts[] = {
-
-        { NGX_RTMP_AMF_STRING,
-          ngx_null_string,
-          "|RtmpSampleAccess", 0 },
-
-        { NGX_RTMP_AMF_BOOLEAN,
-          ngx_null_string,
-          &access, 0 },
-
-        { NGX_RTMP_AMF_BOOLEAN,
-          ngx_null_string,
-          &access, 0 },
-    };
-
-    memset(&h, 0, sizeof(h));
-
-    h.type = NGX_RTMP_MSG_AMF_META;
-    h.csid = NGX_RTMP_CSID_AMF;
-    h.msid = NGX_RTMP_MSID;
-
-    return ngx_rtmp_create_amf(s, &h, access_elts,
-                               sizeof(access_elts) / sizeof(access_elts[0]));
-}
-
-
-ngx_int_t
-ngx_rtmp_send_sample_access(ngx_rtmp_session_t *s)
-{
-    return ngx_rtmp_send_shared_packet(s,
-           ngx_rtmp_create_sample_access(s));
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_shared.c b/debian/modules/rtmp/ngx_rtmp_shared.c
deleted file mode 100644
index 6f6e4e8..0000000
--- a/debian/modules/rtmp/ngx_rtmp_shared.c
+++ /dev/null
@@ -1,126 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp.h"
-
-
-ngx_chain_t *
-ngx_rtmp_alloc_shared_buf(ngx_rtmp_core_srv_conf_t *cscf)
-{
-    u_char                     *p;
-    ngx_chain_t                *out;
-    ngx_buf_t                  *b;
-    size_t                      size;
-
-    if (cscf->free) {
-        out = cscf->free;
-        cscf->free = out->next;
-
-    } else {
-
-        size = cscf->chunk_size + NGX_RTMP_MAX_CHUNK_HEADER;
-
-        p = ngx_pcalloc(cscf->pool, NGX_RTMP_REFCOUNT_BYTES
-                + sizeof(ngx_chain_t)
-                + sizeof(ngx_buf_t)
-                + size);
-        if (p == NULL) {
-            return NULL;
-        }
-
-        p += NGX_RTMP_REFCOUNT_BYTES;
-        out = (ngx_chain_t *)p;
-
-        p += sizeof(ngx_chain_t);
-        out->buf = (ngx_buf_t *)p;
-
-        p += sizeof(ngx_buf_t);
-        out->buf->start = p;
-        out->buf->end = p + size;
-    }
-
-    out->next = NULL;
-    b = out->buf;
-    b->pos = b->last = b->start + NGX_RTMP_MAX_CHUNK_HEADER;
-    b->memory = 1;
-
-    /* buffer has refcount =1 when created! */
-    ngx_rtmp_ref_set(out, 1);
-
-    return out;
-}
-
-
-void
-ngx_rtmp_free_shared_chain(ngx_rtmp_core_srv_conf_t *cscf, ngx_chain_t *in)
-{
-    ngx_chain_t        *cl;
-
-    if (ngx_rtmp_ref_put(in)) {
-        return;
-    }
-
-    for (cl = in; ; cl = cl->next) {
-        if (cl->next == NULL) {
-            cl->next = cscf->free;
-            cscf->free = in;
-            return;
-        }
-    }
-}
-
-
-ngx_chain_t *
-ngx_rtmp_append_shared_bufs(ngx_rtmp_core_srv_conf_t *cscf,
-        ngx_chain_t *head, ngx_chain_t *in)
-{
-    ngx_chain_t                    *l, **ll;
-    u_char                         *p;
-    size_t                          size;
-
-    ll = &head;
-    p = in->buf->pos;
-    l = head;
-
-    if (l) {
-        for(; l->next; l = l->next);
-        ll = &l->next;
-    }
-
-    for ( ;; ) {
-
-        if (l == NULL || l->buf->last == l->buf->end) {
-            l = ngx_rtmp_alloc_shared_buf(cscf);
-            if (l == NULL || l->buf == NULL) {
-                break;
-            }
-
-            *ll = l;
-            ll = &l->next;
-        }
-
-        while (l->buf->end - l->buf->last >= in->buf->last - p) {
-            l->buf->last = ngx_cpymem(l->buf->last, p,
-                    in->buf->last - p);
-            in = in->next;
-            if (in == NULL) {
-                goto done;
-            }
-            p = in->buf->pos;
-        }
-
-        size = l->buf->end - l->buf->last;
-        l->buf->last = ngx_cpymem(l->buf->last, p, size);
-        p += size;
-    }
-
-done:
-    *ll = NULL;
-
-    return head;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_stat_module.c b/debian/modules/rtmp/ngx_rtmp_stat_module.c
deleted file mode 100644
index 326a811..0000000
--- a/debian/modules/rtmp/ngx_rtmp_stat_module.c
+++ /dev/null
@@ -1,863 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <nginx.h>
-#include "ngx_rtmp.h"
-#include "ngx_rtmp_version.h"
-#include "ngx_rtmp_live_module.h"
-#include "ngx_rtmp_play_module.h"
-#include "ngx_rtmp_codec_module.h"
-
-
-static ngx_int_t ngx_rtmp_stat_init_process(ngx_cycle_t *cycle);
-static char *ngx_rtmp_stat(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-static ngx_int_t ngx_rtmp_stat_postconfiguration(ngx_conf_t *cf);
-static void * ngx_rtmp_stat_create_loc_conf(ngx_conf_t *cf);
-static char * ngx_rtmp_stat_merge_loc_conf(ngx_conf_t *cf,
-        void *parent, void *child);
-
-
-static time_t                       start_time;
-
-
-#define NGX_RTMP_STAT_ALL           0xff
-#define NGX_RTMP_STAT_GLOBAL        0x01
-#define NGX_RTMP_STAT_LIVE          0x02
-#define NGX_RTMP_STAT_CLIENTS       0x04
-#define NGX_RTMP_STAT_PLAY          0x08
-
-/*
- * global: stat-{bufs-{total,free,used}, total bytes in/out, bw in/out} - cscf
-*/
-
-
-typedef struct {
-    ngx_uint_t                      stat;
-    ngx_str_t                       stylesheet;
-} ngx_rtmp_stat_loc_conf_t;
-
-
-static ngx_conf_bitmask_t           ngx_rtmp_stat_masks[] = {
-    { ngx_string("all"),            NGX_RTMP_STAT_ALL           },
-    { ngx_string("global"),         NGX_RTMP_STAT_GLOBAL        },
-    { ngx_string("live"),           NGX_RTMP_STAT_LIVE          },
-    { ngx_string("clients"),        NGX_RTMP_STAT_CLIENTS       },
-    { ngx_null_string,              0 }
-};
-
-
-static ngx_command_t  ngx_rtmp_stat_commands[] = {
-
-    { ngx_string("rtmp_stat"),
-        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-        ngx_rtmp_stat,
-        NGX_HTTP_LOC_CONF_OFFSET,
-        offsetof(ngx_rtmp_stat_loc_conf_t, stat),
-        ngx_rtmp_stat_masks },
-
-    { ngx_string("rtmp_stat_stylesheet"),
-        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-        ngx_conf_set_str_slot,
-        NGX_HTTP_LOC_CONF_OFFSET,
-        offsetof(ngx_rtmp_stat_loc_conf_t, stylesheet),
-        NULL },
-
-    ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_rtmp_stat_module_ctx = {
-    NULL,                               /* preconfiguration */
-    ngx_rtmp_stat_postconfiguration,    /* postconfiguration */
-
-    NULL,                               /* create main configuration */
-    NULL,                               /* init main configuration */
-
-    NULL,                               /* create server configuration */
-    NULL,                               /* merge server configuration */
-
-    ngx_rtmp_stat_create_loc_conf,      /* create location configuration */
-    ngx_rtmp_stat_merge_loc_conf,       /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_rtmp_stat_module = {
-    NGX_MODULE_V1,
-    &ngx_rtmp_stat_module_ctx,          /* module context */
-    ngx_rtmp_stat_commands,             /* module directives */
-    NGX_HTTP_MODULE,                    /* module type */
-    NULL,                               /* init master */
-    NULL,                               /* init module */
-    ngx_rtmp_stat_init_process,         /* init process */
-    NULL,                               /* init thread */
-    NULL,                               /* exit thread */
-    NULL,                               /* exit process */
-    NULL,                               /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-#define NGX_RTMP_STAT_BUFSIZE           256
-
-
-static ngx_int_t
-ngx_rtmp_stat_init_process(ngx_cycle_t *cycle)
-{
-    /*
-     * HTTP process initializer is called
-     * after event module initializer
-     * so we can run posted events here
-     */
-
-    ngx_event_process_posted(cycle, &ngx_rtmp_init_queue);
-
-    return NGX_OK;
-}
-
-
-/* ngx_escape_html does not escape characters out of ASCII range
- * which are bad for xslt */
-
-static void *
-ngx_rtmp_stat_escape(ngx_http_request_t *r, void *data, size_t len)
-{
-    u_char *p, *np;
-    void   *new_data;
-    size_t  n;
-
-    p = data;
-
-    for (n = 0; n < len; ++n, ++p) {
-        if (*p < 0x20 || *p >= 0x7f) {
-            break;
-        }
-    }
-
-    if (n == len) {
-        return data;
-    }
-
-    new_data = ngx_palloc(r->pool, len);
-    if (new_data == NULL) {
-        return NULL;
-    }
-
-    p  = data;
-    np = new_data;
-
-    for (n = 0; n < len; ++n, ++p, ++np) {
-        *np = (*p < 0x20 || *p >= 0x7f) ? (u_char) ' ' : *p;
-    }
-
-    return new_data;
-}
-
-#if (NGX_WIN32)
-/*
- * Fix broken MSVC memcpy optimization for 4-byte data
- * when this function is inlined
- */
-__declspec(noinline)
-#endif
-
-static void
-ngx_rtmp_stat_output(ngx_http_request_t *r, ngx_chain_t ***lll,
-        void *data, size_t len, ngx_uint_t escape)
-{
-    ngx_chain_t        *cl;
-    ngx_buf_t          *b;
-    size_t              real_len;
-
-    if (len == 0) {
-        return;
-    }
-
-    if (escape) {
-        data = ngx_rtmp_stat_escape(r, data, len);
-        if (data == NULL) {
-            return;
-        }
-    }
-
-    real_len = escape
-        ? len + ngx_escape_html(NULL, data, len)
-        : len;
-
-    cl = **lll;
-    if (cl && cl->buf->last + real_len > cl->buf->end) {
-        *lll = &cl->next;
-    }
-
-    if (**lll == NULL) {
-        cl = ngx_alloc_chain_link(r->pool);
-        if (cl == NULL) {
-            return;
-        }
-        b = ngx_create_temp_buf(r->pool,
-                ngx_max(NGX_RTMP_STAT_BUFSIZE, real_len));
-        if (b == NULL || b->pos == NULL) {
-            return;
-        }
-        cl->next = NULL;
-        cl->buf = b;
-        **lll = cl;
-    }
-
-    b = (**lll)->buf;
-
-    if (escape) {
-        b->last = (u_char *)ngx_escape_html(b->last, data, len);
-    } else {
-        b->last = ngx_cpymem(b->last, data, len);
-    }
-}
-
-
-/* These shortcuts assume 2 variables exist in current context:
- *   ngx_http_request_t    *r
- *   ngx_chain_t         ***lll */
-
-/* plain data */
-#define NGX_RTMP_STAT(data, len)    ngx_rtmp_stat_output(r, lll, data, len, 0)
-
-/* escaped data */
-#define NGX_RTMP_STAT_E(data, len)  ngx_rtmp_stat_output(r, lll, data, len, 1)
-
-/* literal */
-#define NGX_RTMP_STAT_L(s)          NGX_RTMP_STAT((s), sizeof(s) - 1)
-
-/* ngx_str_t */
-#define NGX_RTMP_STAT_S(s)          NGX_RTMP_STAT((s)->data, (s)->len)
-
-/* escaped ngx_str_t */
-#define NGX_RTMP_STAT_ES(s)         NGX_RTMP_STAT_E((s)->data, (s)->len)
-
-/* C string */
-#define NGX_RTMP_STAT_CS(s)         NGX_RTMP_STAT((s), ngx_strlen(s))
-
-/* escaped C string */
-#define NGX_RTMP_STAT_ECS(s)        NGX_RTMP_STAT_E((s), ngx_strlen(s))
-
-
-#define NGX_RTMP_STAT_BW            0x01
-#define NGX_RTMP_STAT_BYTES         0x02
-#define NGX_RTMP_STAT_BW_BYTES      0x03
-
-
-static void
-ngx_rtmp_stat_bw(ngx_http_request_t *r, ngx_chain_t ***lll,
-                 ngx_rtmp_bandwidth_t *bw, char *name,
-                 ngx_uint_t flags)
-{
-    u_char  buf[NGX_INT64_LEN + 9];
-
-    ngx_rtmp_update_bandwidth(bw, 0);
-
-    if (flags & NGX_RTMP_STAT_BW) {
-        NGX_RTMP_STAT_L("<bw_");
-        NGX_RTMP_STAT_CS(name);
-        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), ">%uL</bw_",
-                                        bw->bandwidth * 8)
-                           - buf);
-        NGX_RTMP_STAT_CS(name);
-        NGX_RTMP_STAT_L(">\r\n");
-    }
-
-    if (flags & NGX_RTMP_STAT_BYTES) {
-        NGX_RTMP_STAT_L("<bytes_");
-        NGX_RTMP_STAT_CS(name);
-        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), ">%uL</bytes_",
-                                        bw->bytes)
-                           - buf);
-        NGX_RTMP_STAT_CS(name);
-        NGX_RTMP_STAT_L(">\r\n");
-    }
-}
-
-
-#ifdef NGX_RTMP_POOL_DEBUG
-static void
-ngx_rtmp_stat_get_pool_size(ngx_pool_t *pool, ngx_uint_t *nlarge,
-        ngx_uint_t *size)
-{
-    ngx_pool_large_t       *l;
-    ngx_pool_t             *p, *n;
-
-    *nlarge = 0;
-    for (l = pool->large; l; l = l->next) {
-        ++*nlarge;
-    }
-
-    *size = 0;
-    for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {
-        *size += (p->d.last - (u_char *)p);
-        if (n == NULL) {
-            break;
-        }
-    }
-}
-
-
-static void
-ngx_rtmp_stat_dump_pool(ngx_http_request_t *r, ngx_chain_t ***lll,
-        ngx_pool_t *pool)
-{
-    ngx_uint_t  nlarge, size;
-    u_char      buf[NGX_INT_T_LEN];
-
-    size = 0;
-    nlarge = 0;
-    ngx_rtmp_stat_get_pool_size(pool, &nlarge, &size);
-    NGX_RTMP_STAT_L("<pool><nlarge>");
-    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%ui", nlarge) - buf);
-    NGX_RTMP_STAT_L("</nlarge><size>");
-    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%ui", size) - buf);
-    NGX_RTMP_STAT_L("</size></pool>\r\n");
-}
-#endif
-
-
-
-static void
-ngx_rtmp_stat_client(ngx_http_request_t *r, ngx_chain_t ***lll,
-    ngx_rtmp_session_t *s)
-{
-    u_char  buf[NGX_INT_T_LEN];
-
-#ifdef NGX_RTMP_POOL_DEBUG
-    ngx_rtmp_stat_dump_pool(r, lll, s->connection->pool);
-#endif
-    NGX_RTMP_STAT_L("<id>");
-    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%ui",
-                  (ngx_uint_t) s->connection->number) - buf);
-    NGX_RTMP_STAT_L("</id>");
-
-    NGX_RTMP_STAT_L("<address>");
-    NGX_RTMP_STAT_ES(&s->connection->addr_text);
-    NGX_RTMP_STAT_L("</address>");
-
-    NGX_RTMP_STAT_L("<time>");
-    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%i",
-                  (ngx_int_t) (ngx_current_msec - s->epoch)) - buf);
-    NGX_RTMP_STAT_L("</time>");
-
-    if (s->flashver.len) {
-        NGX_RTMP_STAT_L("<flashver>");
-        NGX_RTMP_STAT_ES(&s->flashver);
-        NGX_RTMP_STAT_L("</flashver>");
-    }
-
-    if (s->page_url.len) {
-        NGX_RTMP_STAT_L("<pageurl>");
-        NGX_RTMP_STAT_ES(&s->page_url);
-        NGX_RTMP_STAT_L("</pageurl>");
-    }
-
-    if (s->swf_url.len) {
-        NGX_RTMP_STAT_L("<swfurl>");
-        NGX_RTMP_STAT_ES(&s->swf_url);
-        NGX_RTMP_STAT_L("</swfurl>");
-    }
-}
-
-
-static char *
-ngx_rtmp_stat_get_aac_profile(ngx_uint_t p, ngx_uint_t sbr, ngx_uint_t ps) {
-    switch (p) {
-        case 1:
-            return "Main";
-        case 2:
-            if (ps) {
-                return "HEv2";
-            }
-            if (sbr) {
-                return "HE";
-            }
-            return "LC";
-        case 3:
-            return "SSR";
-        case 4:
-            return "LTP";
-        case 5:
-            return "SBR";
-        default:
-            return "";
-    }
-}
-
-
-static char *
-ngx_rtmp_stat_get_avc_profile(ngx_uint_t p) {
-    switch (p) {
-        case 66:
-            return "Baseline";
-        case 77:
-            return "Main";
-        case 100:
-            return "High";
-        default:
-            return "";
-    }
-}
-
-
-static void
-ngx_rtmp_stat_live(ngx_http_request_t *r, ngx_chain_t ***lll,
-        ngx_rtmp_live_app_conf_t *lacf)
-{
-    ngx_rtmp_live_stream_t         *stream;
-    ngx_rtmp_codec_ctx_t           *codec;
-    ngx_rtmp_live_ctx_t            *ctx;
-    ngx_rtmp_session_t             *s;
-    ngx_int_t                       n;
-    ngx_uint_t                      nclients, total_nclients;
-    u_char                          buf[NGX_INT_T_LEN];
-    u_char                          bbuf[NGX_INT32_LEN];
-    ngx_rtmp_stat_loc_conf_t       *slcf;
-    u_char                         *cname;
-
-    if (!lacf->live) {
-        return;
-    }
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
-
-    NGX_RTMP_STAT_L("<live>\r\n");
-
-    total_nclients = 0;
-    for (n = 0; n < lacf->nbuckets; ++n) {
-        for (stream = lacf->streams[n]; stream; stream = stream->next) {
-            NGX_RTMP_STAT_L("<stream>\r\n");
-
-            NGX_RTMP_STAT_L("<name>");
-            NGX_RTMP_STAT_ECS(stream->name);
-            NGX_RTMP_STAT_L("</name>\r\n");
-
-            NGX_RTMP_STAT_L("<time>");
-            NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%i",
-                          (ngx_int_t) (ngx_current_msec - stream->epoch))
-                          - buf);
-            NGX_RTMP_STAT_L("</time>");
-
-            ngx_rtmp_stat_bw(r, lll, &stream->bw_in, "in",
-                             NGX_RTMP_STAT_BW_BYTES);
-            ngx_rtmp_stat_bw(r, lll, &stream->bw_out, "out",
-                             NGX_RTMP_STAT_BW_BYTES);
-            ngx_rtmp_stat_bw(r, lll, &stream->bw_in_audio, "audio",
-                             NGX_RTMP_STAT_BW);
-            ngx_rtmp_stat_bw(r, lll, &stream->bw_in_video, "video",
-                             NGX_RTMP_STAT_BW);
-
-            nclients = 0;
-            codec = NULL;
-            for (ctx = stream->ctx; ctx; ctx = ctx->next, ++nclients) {
-                s = ctx->session;
-                if (slcf->stat & NGX_RTMP_STAT_CLIENTS) {
-                    NGX_RTMP_STAT_L("<client>");
-
-                    ngx_rtmp_stat_client(r, lll, s);
-
-                    NGX_RTMP_STAT_L("<dropped>");
-                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                                  "%ui", ctx->ndropped) - buf);
-                    NGX_RTMP_STAT_L("</dropped>");
-
-                    NGX_RTMP_STAT_L("<avsync>");
-                    if (!lacf->interleave) {
-                        NGX_RTMP_STAT(bbuf, ngx_snprintf(bbuf, sizeof(bbuf),
-                                      "%D", ctx->cs[1].timestamp -
-                                      ctx->cs[0].timestamp) - bbuf);
-                    }
-                    NGX_RTMP_STAT_L("</avsync>");
-
-                    NGX_RTMP_STAT_L("<timestamp>");
-                    NGX_RTMP_STAT(bbuf, ngx_snprintf(bbuf, sizeof(bbuf),
-                                  "%D", s->current_time) - bbuf);
-                    NGX_RTMP_STAT_L("</timestamp>");
-
-                    if (ctx->publishing) {
-                        NGX_RTMP_STAT_L("<publishing/>");
-                    }
-
-                    if (ctx->active) {
-                        NGX_RTMP_STAT_L("<active/>");
-                    }
-
-                    NGX_RTMP_STAT_L("</client>\r\n");
-                }
-                if (ctx->publishing) {
-                    codec = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
-                }
-            }
-            total_nclients += nclients;
-
-            if (codec) {
-                NGX_RTMP_STAT_L("<meta>");
-
-                NGX_RTMP_STAT_L("<video>");
-                NGX_RTMP_STAT_L("<width>");
-                NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                              "%ui", codec->width) - buf);
-                NGX_RTMP_STAT_L("</width><height>");
-                NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                              "%ui", codec->height) - buf);
-                NGX_RTMP_STAT_L("</height><frame_rate>");
-                NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                              "%ui", codec->frame_rate) - buf);
-                NGX_RTMP_STAT_L("</frame_rate>");
-
-                cname = ngx_rtmp_get_video_codec_name(codec->video_codec_id);
-                if (*cname) {
-                    NGX_RTMP_STAT_L("<codec>");
-                    NGX_RTMP_STAT_ECS(cname);
-                    NGX_RTMP_STAT_L("</codec>");
-                }
-                if (codec->avc_profile) {
-                    NGX_RTMP_STAT_L("<profile>");
-                    NGX_RTMP_STAT_CS(
-                            ngx_rtmp_stat_get_avc_profile(codec->avc_profile));
-                    NGX_RTMP_STAT_L("</profile>");
-                }
-                if (codec->avc_level) {
-                    NGX_RTMP_STAT_L("<compat>");
-                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                                  "%ui", codec->avc_compat) - buf);
-                    NGX_RTMP_STAT_L("</compat>");
-                }
-                if (codec->avc_level) {
-                    NGX_RTMP_STAT_L("<level>");
-                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                                  "%.1f", codec->avc_level / 10.) - buf);
-                    NGX_RTMP_STAT_L("</level>");
-                }
-                NGX_RTMP_STAT_L("</video>");
-
-                NGX_RTMP_STAT_L("<audio>");
-                cname = ngx_rtmp_get_audio_codec_name(codec->audio_codec_id);
-                if (*cname) {
-                    NGX_RTMP_STAT_L("<codec>");
-                    NGX_RTMP_STAT_ECS(cname);
-                    NGX_RTMP_STAT_L("</codec>");
-                }
-                if (codec->aac_profile) {
-                    NGX_RTMP_STAT_L("<profile>");
-                    NGX_RTMP_STAT_CS(
-                            ngx_rtmp_stat_get_aac_profile(codec->aac_profile,
-                                                          codec->aac_sbr,
-                                                          codec->aac_ps));
-                    NGX_RTMP_STAT_L("</profile>");
-                }
-                if (codec->aac_chan_conf) {
-                    NGX_RTMP_STAT_L("<channels>");
-                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                                  "%ui", codec->aac_chan_conf) - buf);
-                    NGX_RTMP_STAT_L("</channels>");
-                } else if (codec->audio_channels) {
-                    NGX_RTMP_STAT_L("<channels>");
-                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                                  "%ui", codec->audio_channels) - buf);
-                    NGX_RTMP_STAT_L("</channels>");
-                }
-                if (codec->sample_rate) {
-                    NGX_RTMP_STAT_L("<sample_rate>");
-                    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                                  "%ui", codec->sample_rate) - buf);
-                    NGX_RTMP_STAT_L("</sample_rate>");
-                }
-                NGX_RTMP_STAT_L("</audio>");
-
-                NGX_RTMP_STAT_L("</meta>\r\n");
-            }
-
-            NGX_RTMP_STAT_L("<nclients>");
-            NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                          "%ui", nclients) - buf);
-            NGX_RTMP_STAT_L("</nclients>\r\n");
-
-            if (stream->publishing) {
-                NGX_RTMP_STAT_L("<publishing/>\r\n");
-            }
-
-            if (stream->active) {
-                NGX_RTMP_STAT_L("<active/>\r\n");
-            }
-
-            NGX_RTMP_STAT_L("</stream>\r\n");
-        }
-    }
-
-    NGX_RTMP_STAT_L("<nclients>");
-    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                  "%ui", total_nclients) - buf);
-    NGX_RTMP_STAT_L("</nclients>\r\n");
-
-    NGX_RTMP_STAT_L("</live>\r\n");
-}
-
-
-static void
-ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
-        ngx_rtmp_play_app_conf_t *pacf)
-{
-    ngx_rtmp_play_ctx_t            *ctx, *sctx;
-    ngx_rtmp_session_t             *s;
-    ngx_uint_t                      n, nclients, total_nclients;
-    u_char                          buf[NGX_INT_T_LEN];
-    u_char                          bbuf[NGX_INT32_LEN];
-    ngx_rtmp_stat_loc_conf_t       *slcf;
-
-    if (pacf->entries.nelts == 0) {
-        return;
-    }
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
-
-    NGX_RTMP_STAT_L("<play>\r\n");
-
-    total_nclients = 0;
-    for (n = 0; n < pacf->nbuckets; ++n) {
-        for (ctx = pacf->ctx[n]; ctx; ) {
-            NGX_RTMP_STAT_L("<stream>\r\n");
-
-            NGX_RTMP_STAT_L("<name>");
-            NGX_RTMP_STAT_ECS(ctx->name);
-            NGX_RTMP_STAT_L("</name>\r\n");
-
-            nclients = 0;
-            sctx = ctx;
-            for (; ctx; ctx = ctx->next) {
-                if (ngx_strcmp(ctx->name, sctx->name)) {
-                    break;
-                }
-
-                nclients++;
-
-                s = ctx->session;
-                if (slcf->stat & NGX_RTMP_STAT_CLIENTS) {
-                    NGX_RTMP_STAT_L("<client>");
-
-                    ngx_rtmp_stat_client(r, lll, s);
-
-                    NGX_RTMP_STAT_L("<timestamp>");
-                    NGX_RTMP_STAT(bbuf, ngx_snprintf(bbuf, sizeof(bbuf),
-                                  "%D", s->current_time) - bbuf);
-                    NGX_RTMP_STAT_L("</timestamp>");
-
-                    NGX_RTMP_STAT_L("</client>\r\n");
-                }
-            }
-            total_nclients += nclients;
-
-            NGX_RTMP_STAT_L("<active/>");
-            NGX_RTMP_STAT_L("<nclients>");
-            NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                          "%ui", nclients) - buf);
-            NGX_RTMP_STAT_L("</nclients>\r\n");
-
-            NGX_RTMP_STAT_L("</stream>\r\n");
-        }
-    }
-
-    NGX_RTMP_STAT_L("<nclients>");
-    NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                  "%ui", total_nclients) - buf);
-    NGX_RTMP_STAT_L("</nclients>\r\n");
-
-    NGX_RTMP_STAT_L("</play>\r\n");
-}
-
-
-static void
-ngx_rtmp_stat_application(ngx_http_request_t *r, ngx_chain_t ***lll,
-        ngx_rtmp_core_app_conf_t *cacf)
-{
-    ngx_rtmp_stat_loc_conf_t       *slcf;
-
-    NGX_RTMP_STAT_L("<application>\r\n");
-    NGX_RTMP_STAT_L("<name>");
-    NGX_RTMP_STAT_ES(&cacf->name);
-    NGX_RTMP_STAT_L("</name>\r\n");
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
-
-    if (slcf->stat & NGX_RTMP_STAT_LIVE) {
-        ngx_rtmp_stat_live(r, lll,
-                cacf->app_conf[ngx_rtmp_live_module.ctx_index]);
-    }
-
-    if (slcf->stat & NGX_RTMP_STAT_PLAY) {
-        ngx_rtmp_stat_play(r, lll,
-                cacf->app_conf[ngx_rtmp_play_module.ctx_index]);
-    }
-
-    NGX_RTMP_STAT_L("</application>\r\n");
-}
-
-
-static void
-ngx_rtmp_stat_server(ngx_http_request_t *r, ngx_chain_t ***lll,
-        ngx_rtmp_core_srv_conf_t *cscf)
-{
-    ngx_rtmp_core_app_conf_t      **cacf;
-    size_t                          n;
-
-    NGX_RTMP_STAT_L("<server>\r\n");
-
-#ifdef NGX_RTMP_POOL_DEBUG
-    ngx_rtmp_stat_dump_pool(r, lll, cscf->pool);
-#endif
-
-    cacf = cscf->applications.elts;
-    for (n = 0; n < cscf->applications.nelts; ++n, ++cacf) {
-        ngx_rtmp_stat_application(r, lll, *cacf);
-    }
-
-    NGX_RTMP_STAT_L("</server>\r\n");
-}
-
-
-static ngx_int_t
-ngx_rtmp_stat_handler(ngx_http_request_t *r)
-{
-    ngx_rtmp_stat_loc_conf_t       *slcf;
-    ngx_rtmp_core_main_conf_t      *cmcf;
-    ngx_rtmp_core_srv_conf_t      **cscf;
-    ngx_chain_t                    *cl, *l, **ll, ***lll;
-    size_t                          n;
-    off_t                           len;
-    static u_char                   tbuf[NGX_TIME_T_LEN];
-    static u_char                   nbuf[NGX_INT_T_LEN];
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
-    if (slcf->stat == 0) {
-        return NGX_DECLINED;
-    }
-
-    cmcf = ngx_rtmp_core_main_conf;
-    if (cmcf == NULL) {
-        goto error;
-    }
-
-    cl = NULL;
-    ll = &cl;
-    lll = &ll;
-
-    NGX_RTMP_STAT_L("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n");
-    if (slcf->stylesheet.len) {
-        NGX_RTMP_STAT_L("<?xml-stylesheet type=\"text/xsl\" href=\"");
-        NGX_RTMP_STAT_ES(&slcf->stylesheet);
-        NGX_RTMP_STAT_L("\" ?>\r\n");
-    }
-
-    NGX_RTMP_STAT_L("<rtmp>\r\n");
-
-#ifdef NGINX_VERSION
-    NGX_RTMP_STAT_L("<nginx_version>" NGINX_VERSION "</nginx_version>\r\n");
-#endif
-
-#ifdef NGINX_RTMP_VERSION
-    NGX_RTMP_STAT_L("<nginx_rtmp_version>" NGINX_RTMP_VERSION "</nginx_rtmp_version>\r\n");
-#endif
-
-#ifdef NGX_COMPILER
-    NGX_RTMP_STAT_L("<compiler>" NGX_COMPILER "</compiler>\r\n");
-#endif
-    NGX_RTMP_STAT_L("<built>" __DATE__ " " __TIME__ "</built>\r\n");
-
-    NGX_RTMP_STAT_L("<pid>");
-    NGX_RTMP_STAT(nbuf, ngx_snprintf(nbuf, sizeof(nbuf),
-                  "%ui", (ngx_uint_t) ngx_getpid()) - nbuf);
-    NGX_RTMP_STAT_L("</pid>\r\n");
-
-    NGX_RTMP_STAT_L("<uptime>");
-    NGX_RTMP_STAT(tbuf, ngx_snprintf(tbuf, sizeof(tbuf),
-                  "%T", ngx_cached_time->sec - start_time) - tbuf);
-    NGX_RTMP_STAT_L("</uptime>\r\n");
-
-    NGX_RTMP_STAT_L("<naccepted>");
-    NGX_RTMP_STAT(nbuf, ngx_snprintf(nbuf, sizeof(nbuf),
-                  "%ui", ngx_rtmp_naccepted) - nbuf);
-    NGX_RTMP_STAT_L("</naccepted>\r\n");
-
-    ngx_rtmp_stat_bw(r, lll, &ngx_rtmp_bw_in, "in", NGX_RTMP_STAT_BW_BYTES);
-    ngx_rtmp_stat_bw(r, lll, &ngx_rtmp_bw_out, "out", NGX_RTMP_STAT_BW_BYTES);
-
-    cscf = cmcf->servers.elts;
-    for (n = 0; n < cmcf->servers.nelts; ++n, ++cscf) {
-        ngx_rtmp_stat_server(r, lll, *cscf);
-    }
-
-    NGX_RTMP_STAT_L("</rtmp>\r\n");
-
-    len = 0;
-    for (l = cl; l; l = l->next) {
-        len += (l->buf->last - l->buf->pos);
-    }
-    ngx_str_set(&r->headers_out.content_type, "text/xml");
-    r->headers_out.content_length_n = len;
-    r->headers_out.status = NGX_HTTP_OK;
-    ngx_http_send_header(r);
-    (*ll)->buf->last_buf = 1;
-    return ngx_http_output_filter(r, cl);
-
-error:
-    r->headers_out.status = NGX_HTTP_INTERNAL_SERVER_ERROR;
-    r->headers_out.content_length_n = 0;
-    return ngx_http_send_header(r);
-}
-
-
-static void *
-ngx_rtmp_stat_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_rtmp_stat_loc_conf_t       *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_stat_loc_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    conf->stat = 0;
-
-    return conf;
-}
-
-
-static char *
-ngx_rtmp_stat_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_rtmp_stat_loc_conf_t       *prev = parent;
-    ngx_rtmp_stat_loc_conf_t       *conf = child;
-
-    ngx_conf_merge_bitmask_value(conf->stat, prev->stat, 0);
-    ngx_conf_merge_str_value(conf->stylesheet, prev->stylesheet, "");
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_rtmp_stat(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_core_loc_conf_t  *clcf;
-
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-    clcf->handler = ngx_rtmp_stat_handler;
-
-    return ngx_conf_set_bitmask_slot(cf, cmd, conf);
-}
-
-
-static ngx_int_t
-ngx_rtmp_stat_postconfiguration(ngx_conf_t *cf)
-{
-    start_time = ngx_cached_time->sec;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/rtmp/ngx_rtmp_streams.h b/debian/modules/rtmp/ngx_rtmp_streams.h
deleted file mode 100644
index d957b8e..0000000
--- a/debian/modules/rtmp/ngx_rtmp_streams.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_STREAMS_H_INCLUDED_
-#define _NGX_RTMP_STREAMS_H_INCLUDED_
-
-
-#define NGX_RTMP_MSID                   1
-
-#define NGX_RTMP_CSID_AMF_INI           3
-#define NGX_RTMP_CSID_AMF               5
-#define NGX_RTMP_CSID_AUDIO             6
-#define NGX_RTMP_CSID_VIDEO             7
-
-
-#endif /* _NGX_RTMP_STREAMS_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/ngx_rtmp_version.h b/debian/modules/rtmp/ngx_rtmp_version.h
deleted file mode 100644
index 1bdce49..0000000
--- a/debian/modules/rtmp/ngx_rtmp_version.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#ifndef _NGX_RTMP_VERSION_H_INCLUDED_
-#define _NGX_RTMP_VERSION_H_INCLUDED_
-
-
-#define nginx_rtmp_version  1001004
-#define NGINX_RTMP_VERSION  "1.1.4"
-
-
-#endif /* _NGX_RTMP_VERSION_H_INCLUDED_ */
diff --git a/debian/modules/rtmp/stat.xsl b/debian/modules/rtmp/stat.xsl
deleted file mode 100644
index 355453b..0000000
--- a/debian/modules/rtmp/stat.xsl
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-
-<!--
-   Copyright (C) Roman Arutyunyan
--->
-
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-
-<xsl:template match="/">
-    <html>
-        <head>
-            <title>RTMP statistics</title>
-        </head>
-        <body>
-            <xsl:apply-templates select="rtmp"/>
-            <hr/>
-            Generated by <a href='https://github.com/arut/nginx-rtmp-module'>
-            nginx-rtmp-module</a>&#160;<xsl:value-of select="/rtmp/nginx_rtmp_version"/>,
-            <a href="http://nginx.org">nginx</a>&#160;<xsl:value-of select="/rtmp/nginx_version"/>,
-            pid <xsl:value-of select="/rtmp/pid"/>,
-            built <xsl:value-of select="/rtmp/built"/>&#160;<xsl:value-of select="/rtmp/compiler"/>
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template match="rtmp">
-    <table cellspacing="1" cellpadding="5">
-        <tr bgcolor="#999999">
-            <th>RTMP</th>
-            <th>#clients</th>
-            <th colspan="4">Video</th>
-            <th colspan="4">Audio</th>
-            <th>In bytes</th>
-            <th>Out bytes</th>
-            <th>In bits/s</th>
-            <th>Out bits/s</th>
-            <th>State</th>
-            <th>Time</th>
-        </tr>
-        <tr>
-            <td colspan="2">Accepted: <xsl:value-of select="naccepted"/></td>
-            <th bgcolor="#999999">codec</th>
-            <th bgcolor="#999999">bits/s</th>
-            <th bgcolor="#999999">size</th>
-            <th bgcolor="#999999">fps</th>
-            <th bgcolor="#999999">codec</th>
-            <th bgcolor="#999999">bits/s</th>
-            <th bgcolor="#999999">freq</th>
-            <th bgcolor="#999999">chan</th>
-            <td>
-                <xsl:call-template name="showsize">
-                    <xsl:with-param name="size" select="bytes_in"/>
-                </xsl:call-template>
-            </td>
-            <td>
-                <xsl:call-template name="showsize">
-                    <xsl:with-param name="size" select="bytes_out"/>
-                </xsl:call-template>
-            </td>
-            <td>
-                <xsl:call-template name="showsize">
-                    <xsl:with-param name="size" select="bw_in"/>
-                    <xsl:with-param name="bits" select="1"/>
-                    <xsl:with-param name="persec" select="1"/>
-                </xsl:call-template>
-            </td>
-            <td>
-                <xsl:call-template name="showsize">
-                    <xsl:with-param name="size" select="bw_out"/>
-                    <xsl:with-param name="bits" select="1"/>
-                    <xsl:with-param name="persec" select="1"/>
-                </xsl:call-template>
-            </td>
-            <td/>
-            <td>
-                <xsl:call-template name="showtime">
-                    <xsl:with-param name="time" select="/rtmp/uptime * 1000"/>
-                </xsl:call-template>
-            </td>
-        </tr>
-        <xsl:apply-templates select="server"/>
-    </table>
-</xsl:template>
-
-<xsl:template match="server">
-    <xsl:apply-templates select="application"/>
-</xsl:template>
-
-<xsl:template match="application">
-    <tr bgcolor="#999999">
-        <td>
-            <b><xsl:value-of select="name"/></b>
-        </td>
-    </tr>
-    <xsl:apply-templates select="live"/>
-    <xsl:apply-templates select="play"/>
-</xsl:template>
-
-<xsl:template match="live">
-    <tr bgcolor="#aaaaaa">
-        <td>
-            <i>live streams</i>
-        </td>
-        <td align="middle">
-            <xsl:value-of select="nclients"/>
-        </td>
-    </tr>
-    <xsl:apply-templates select="stream"/>
-</xsl:template>
-
-<xsl:template match="play">
-    <tr bgcolor="#aaaaaa">
-        <td>
-            <i>vod streams</i>
-        </td>
-        <td align="middle">
-            <xsl:value-of select="nclients"/>
-        </td>
-    </tr>
-    <xsl:apply-templates select="stream"/>
-</xsl:template>
-
-<xsl:template match="stream">
-    <tr valign="top">
-        <xsl:attribute name="bgcolor">
-            <xsl:choose>
-                <xsl:when test="active">#cccccc</xsl:when>
-                <xsl:otherwise>#dddddd</xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-        <td>
-            <a href="">
-                <xsl:attribute name="onclick">
-                    var d=document.getElementById('<xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>');
-                    d.style.display=d.style.display=='none'?'':'none';
-                    return false
-                </xsl:attribute>
-                <xsl:value-of select="name"/>
-                <xsl:if test="string-length(name) = 0">
-                    [EMPTY]
-                </xsl:if>
-            </a>
-        </td>
-        <td align="middle"> <xsl:value-of select="nclients"/> </td>
-        <td>
-            <xsl:value-of select="meta/video/codec"/>&#160;<xsl:value-of select="meta/video/profile"/>&#160;<xsl:value-of select="meta/video/level"/>
-        </td>
-        <td>
-            <xsl:call-template name="showsize">
-                <xsl:with-param name="size" select="bw_video"/>
-                <xsl:with-param name="bits" select="1"/>
-                <xsl:with-param name="persec" select="1"/>
-            </xsl:call-template>
-        </td>
-        <td>
-            <xsl:apply-templates select="meta/video/width"/>
-        </td>
-        <td>
-            <xsl:value-of select="meta/video/frame_rate"/>
-        </td>
-        <td>
-            <xsl:value-of select="meta/audio/codec"/>&#160;<xsl:value-of select="meta/audio/profile"/>
-        </td>
-        <td>
-            <xsl:call-template name="showsize">
-                <xsl:with-param name="size" select="bw_audio"/>
-                <xsl:with-param name="bits" select="1"/>
-                <xsl:with-param name="persec" select="1"/>
-            </xsl:call-template>
-        </td>
-        <td>
-            <xsl:apply-templates select="meta/audio/sample_rate"/>
-        </td>
-        <td>
-            <xsl:value-of select="meta/audio/channels"/>
-        </td>
-        <td>
-            <xsl:call-template name="showsize">
-               <xsl:with-param name="size" select="bytes_in"/>
-           </xsl:call-template>
-        </td>
-        <td>
-            <xsl:call-template name="showsize">
-                <xsl:with-param name="size" select="bytes_out"/>
-            </xsl:call-template>
-        </td>
-        <td>
-            <xsl:call-template name="showsize">
-                <xsl:with-param name="size" select="bw_in"/>
-                <xsl:with-param name="bits" select="1"/>
-                <xsl:with-param name="persec" select="1"/>
-            </xsl:call-template>
-        </td>
-        <td>
-            <xsl:call-template name="showsize">
-                <xsl:with-param name="size" select="bw_out"/>
-                <xsl:with-param name="bits" select="1"/>
-                <xsl:with-param name="persec" select="1"/>
-            </xsl:call-template>
-        </td>
-        <td><xsl:call-template name="streamstate"/></td>
-        <td>
-            <xsl:call-template name="showtime">
-               <xsl:with-param name="time" select="time"/>
-            </xsl:call-template>
-        </td>
-    </tr>
-    <tr style="display:none">
-        <xsl:attribute name="id">
-            <xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>
-        </xsl:attribute>
-        <td colspan="16" ngcolor="#eeeeee">
-            <table cellspacing="1" cellpadding="5">
-                <tr>
-                    <th>Id</th>
-                    <th>State</th>
-                    <th>Address</th>
-                    <th>Flash version</th>
-                    <th>Page URL</th>
-                    <th>SWF URL</th>
-                    <th>Dropped</th>
-                    <th>Timestamp</th>
-                    <th>A-V</th>
-                    <th>Time</th>
-                </tr>
-                <xsl:apply-templates select="client"/>
-            </table>
-        </td>
-    </tr>
-</xsl:template>
-
-<xsl:template name="showtime">
-    <xsl:param name="time"/>
-
-    <xsl:if test="$time &gt; 0">
-        <xsl:variable name="sec">
-            <xsl:value-of select="floor($time div 1000)"/>
-        </xsl:variable>
-
-        <xsl:if test="$sec &gt;= 86400">
-            <xsl:value-of select="floor($sec div 86400)"/>d
-        </xsl:if>
-
-        <xsl:if test="$sec &gt;= 3600">
-            <xsl:value-of select="(floor($sec div 3600)) mod 24"/>h
-        </xsl:if>
-
-        <xsl:if test="$sec &gt;= 60">
-            <xsl:value-of select="(floor($sec div 60)) mod 60"/>m
-        </xsl:if>
-
-        <xsl:value-of select="$sec mod 60"/>s
-    </xsl:if>
-</xsl:template>
-
-<xsl:template name="showsize">
-    <xsl:param name="size"/>
-    <xsl:param name="bits" select="0" />
-    <xsl:param name="persec" select="0" />
-    <xsl:variable name="sizen">
-        <xsl:value-of select="floor($size div 1024)"/>
-    </xsl:variable>
-    <xsl:choose>
-        <xsl:when test="$sizen &gt;= 1073741824">
-            <xsl:value-of select="format-number($sizen div 1073741824,'#.###')"/> T</xsl:when>
-
-        <xsl:when test="$sizen &gt;= 1048576">
-            <xsl:value-of select="format-number($sizen div 1048576,'#.###')"/> G</xsl:when>
-
-        <xsl:when test="$sizen &gt;= 1024">
-            <xsl:value-of select="format-number($sizen div 1024,'#.##')"/> M</xsl:when>
-        <xsl:when test="$sizen &gt;= 0">
-            <xsl:value-of select="$sizen"/> K</xsl:when>
-    </xsl:choose>
-    <xsl:if test="string-length($size) &gt; 0">
-        <xsl:choose>
-            <xsl:when test="$bits = 1">b</xsl:when>
-            <xsl:otherwise>B</xsl:otherwise>
-        </xsl:choose>
-        <xsl:if test="$persec = 1">/s</xsl:if>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template name="streamstate">
-    <xsl:choose>
-        <xsl:when test="active">active</xsl:when>
-        <xsl:otherwise>idle</xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-
-<xsl:template name="clientstate">
-    <xsl:choose>
-        <xsl:when test="publishing">publishing</xsl:when>
-        <xsl:otherwise>playing</xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="client">
-    <tr>
-        <xsl:attribute name="bgcolor">
-            <xsl:choose>
-                <xsl:when test="publishing">#cccccc</xsl:when>
-                <xsl:otherwise>#eeeeee</xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-        <td><xsl:value-of select="id"/></td>
-        <td><xsl:call-template name="clientstate"/></td>
-        <td>
-            <a target="_blank">
-                <xsl:attribute name="href">
-                    http://apps.db.ripe.net/search/query.html&#63;searchtext=<xsl:value-of select="address"/>
-                </xsl:attribute>
-                <xsl:attribute name="title">whois</xsl:attribute>
-                <xsl:value-of select="address"/>
-            </a>
-        </td>
-        <td><xsl:value-of select="flashver"/></td>
-        <td>
-            <a target="_blank">
-                <xsl:attribute name="href">
-                    <xsl:value-of select="pageurl"/>
-                </xsl:attribute>
-                <xsl:value-of select="pageurl"/>
-            </a>
-        </td>
-        <td><xsl:value-of select="swfurl"/></td>
-        <td><xsl:value-of select="dropped"/></td>
-        <td><xsl:value-of select="timestamp"/></td>
-        <td><xsl:value-of select="avsync"/></td>
-        <td>
-            <xsl:call-template name="showtime">
-               <xsl:with-param name="time" select="time"/>
-            </xsl:call-template>
-        </td>
-    </tr>
-</xsl:template>
-
-<xsl:template match="publishing">
-    publishing
-</xsl:template>
-
-<xsl:template match="active">
-    active
-</xsl:template>
-
-<xsl:template match="width">
-    <xsl:value-of select="."/>x<xsl:value-of select="../height"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/debian/modules/watch/http-ndk b/debian/modules/watch/http-ndk
deleted file mode 100644
index f359136..0000000
--- a/debian/modules/watch/http-ndk
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-ndk-$1.tar.gz%" \
-    https://github.com/simpl/ngx_devel_kit/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-ndk
diff --git a/debian/modules/watch/nchan b/debian/modules/watch/nchan
deleted file mode 100644
index 199ab19..0000000
--- a/debian/modules/watch/nchan
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-nchan-$1.tar.gz%" \
-    https://github.com/slact/nchan/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate nchan
diff --git a/debian/modules/watch/rtmp b/debian/modules/watch/rtmp
deleted file mode 100644
index 2a95f4c..0000000
--- a/debian/modules/watch/rtmp
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-rtmp-$1.tar.gz%" \
-    https://github.com/arut/nginx-rtmp-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate rtmp

From 34bfbac550a6891b2f24b4a5cd673af7ef594326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 8 Dec 2022 14:23:55 +0100
Subject: [PATCH 457/600] release nginx 1.22.1-4, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2cc473..78577de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.22.1-4) UNRELEASED; urgency=medium
+nginx (1.22.1-4) unstable; urgency=medium
 
   * d/t/*-module-deps: updated, added curl timeout 300 seconds and
     added nginx restart before calling curl
@@ -13,7 +13,7 @@ nginx (1.22.1-4) UNRELEASED; urgency=medium
     - libnginx-mod-rtmp module
     - libnginx-mod-http-ndk module
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 08 Dec 2022 09:47:06 +0100
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 08 Dec 2022 14:15:15 +0100
 
 nginx (1.22.1-3) unstable; urgency=medium
 

From 10a2613f37460f80f787898875bf064d4e8ba53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 9 Dec 2022 16:20:40 +0100
Subject: [PATCH 458/600] remove 3th party modules

---
 debian/changelog                              |   17 +
 debian/control                                |  150 +-
 debian/copyright                              |   78 -
 debian/libnginx-mod-http-auth-pam.nginx       |   13 -
 debian/libnginx-mod-http-cache-purge.nginx    |   13 -
 debian/libnginx-mod-http-dav-ext.nginx        |   13 -
 debian/libnginx-mod-http-echo.nginx           |   13 -
 debian/libnginx-mod-http-fancyindex.nginx     |   13 -
 debian/libnginx-mod-http-geoip2.nginx         |   13 -
 ...ibnginx-mod-http-headers-more-filter.nginx |   13 -
 debian/libnginx-mod-http-subs-filter.nginx    |   13 -
 debian/libnginx-mod-http-uploadprogress.nginx |   13 -
 debian/libnginx-mod-http-upstream-fair.nginx  |   13 -
 debian/libnginx-mod-stream-geoip2.nginx       |   13 -
 .../libnginx-mod.conf/mod-http-auth-pam.conf  |    1 -
 .../mod-http-cache-purge.conf                 |    1 -
 .../libnginx-mod.conf/mod-http-dav-ext.conf   |    1 -
 debian/libnginx-mod.conf/mod-http-echo.conf   |    1 -
 .../mod-http-fancyindex.conf                  |    1 -
 debian/libnginx-mod.conf/mod-http-geoip2.conf |    1 -
 .../mod-http-headers-more-filter.conf         |    1 -
 .../mod-http-subs-filter.conf                 |    1 -
 .../mod-http-uploadprogress.conf              |    1 -
 .../mod-http-upstream-fair.conf               |    1 -
 .../libnginx-mod.conf/mod-stream-geoip2.conf  |    1 -
 debian/modules/control                        |   52 -
 debian/modules/http-auth-pam/ChangeLog        |   63 -
 debian/modules/http-auth-pam/LICENSE          |   25 -
 debian/modules/http-auth-pam/README.md        |   95 -
 debian/modules/http-auth-pam/VERSION          |    1 -
 debian/modules/http-auth-pam/config           |   17 -
 .../http-auth-pam/ngx_http_auth_pam_module.c  |  482 ----
 debian/modules/http-cache-purge/CHANGES       |   66 -
 debian/modules/http-cache-purge/LICENSE       |   26 -
 debian/modules/http-cache-purge/README.md     |  171 --
 debian/modules/http-cache-purge/TODO.md       |    7 -
 debian/modules/http-cache-purge/config        |   21 -
 .../http-cache-purge/ngx_cache_purge_module.c | 1803 --------------
 debian/modules/http-cache-purge/t/proxy1.t    |  136 -
 .../modules/http-cache-purge/t/proxy1_vars.t  |  138 --
 debian/modules/http-cache-purge/t/proxy2.t    |  349 ---
 .../modules/http-cache-purge/t/proxy2_vars.t  |  353 ---
 debian/modules/http-dav-ext/LICENSE           |   22 -
 debian/modules/http-dav-ext/README.rst        |  188 --
 debian/modules/http-dav-ext/config            |   17 -
 .../http-dav-ext/ngx_http_dav_ext_module.c    | 2181 -----------------
 debian/modules/http-dav-ext/t/dav_ext.t       |  141 --
 debian/modules/http-echo/LICENSE              |   25 -
 debian/modules/http-echo/README.markdown      | 1851 --------------
 debian/modules/http-echo/config               |   63 -
 debian/modules/http-echo/src/ddebug.h         |  114 -
 .../http-echo/src/ngx_http_echo_echo.c        |  342 ---
 .../http-echo/src/ngx_http_echo_echo.h        |   25 -
 .../http-echo/src/ngx_http_echo_filter.c      |  282 ---
 .../http-echo/src/ngx_http_echo_filter.h      |   15 -
 .../http-echo/src/ngx_http_echo_foreach.c     |  183 --
 .../http-echo/src/ngx_http_echo_foreach.h     |   16 -
 .../http-echo/src/ngx_http_echo_handler.c     |  429 ----
 .../http-echo/src/ngx_http_echo_handler.h     |   18 -
 .../http-echo/src/ngx_http_echo_location.c    |  178 --
 .../http-echo/src/ngx_http_echo_location.h    |   13 -
 .../http-echo/src/ngx_http_echo_module.c      |  682 ------
 .../http-echo/src/ngx_http_echo_module.h      |  151 --
 .../src/ngx_http_echo_request_info.c          |  522 ----
 .../src/ngx_http_echo_request_info.h          |   36 -
 .../http-echo/src/ngx_http_echo_sleep.c       |  208 --
 .../http-echo/src/ngx_http_echo_sleep.h       |   16 -
 .../http-echo/src/ngx_http_echo_subrequest.c  |  791 ------
 .../http-echo/src/ngx_http_echo_subrequest.h  |   19 -
 .../http-echo/src/ngx_http_echo_timer.c       |   95 -
 .../http-echo/src/ngx_http_echo_timer.h       |   13 -
 .../http-echo/src/ngx_http_echo_util.c        |  302 ---
 .../http-echo/src/ngx_http_echo_util.h        |   58 -
 .../modules/http-echo/src/ngx_http_echo_var.c |  110 -
 .../modules/http-echo/src/ngx_http_echo_var.h |    9 -
 debian/modules/http-echo/t/abort-parent.t     |   63 -
 debian/modules/http-echo/t/blocking-sleep.t   |  156 --
 debian/modules/http-echo/t/echo-after-body.t  |  261 --
 debian/modules/http-echo/t/echo-before-body.t |  278 ---
 debian/modules/http-echo/t/echo-duplicate.t   |   89 -
 debian/modules/http-echo/t/echo-timer.t       |  107 -
 debian/modules/http-echo/t/echo.t             |  416 ----
 debian/modules/http-echo/t/exec.t             |  228 --
 debian/modules/http-echo/t/filter-used.t      |   59 -
 debian/modules/http-echo/t/foreach-split.t    |  283 ---
 debian/modules/http-echo/t/gzip.t             |   31 -
 debian/modules/http-echo/t/if.t               |  150 --
 debian/modules/http-echo/t/incr.t             |   32 -
 debian/modules/http-echo/t/location-async.t   |  439 ----
 debian/modules/http-echo/t/location.t         |  567 -----
 debian/modules/http-echo/t/mixed.t            |   82 -
 debian/modules/http-echo/t/request-body.t     |   58 -
 debian/modules/http-echo/t/request-info.t     |  841 -------
 debian/modules/http-echo/t/sleep.t            |  200 --
 debian/modules/http-echo/t/status.t           |  142 --
 debian/modules/http-echo/t/subrequest-async.t |  604 -----
 debian/modules/http-echo/t/subrequest.t       |  725 ------
 debian/modules/http-echo/t/unused.t           |  119 -
 debian/modules/http-echo/util/build.sh        |   44 -
 debian/modules/http-echo/util/releng          |    8 -
 debian/modules/http-echo/util/wiki2pod.pl     |  131 -
 debian/modules/http-echo/valgrind.suppress    |   53 -
 .../http-fancyindex/.github/workflows/ci.yml  |   40 -
 debian/modules/http-fancyindex/CHANGELOG.md   |  199 --
 debian/modules/http-fancyindex/HACKING.md     |   29 -
 debian/modules/http-fancyindex/LICENSE        |   20 -
 debian/modules/http-fancyindex/README.rst     |  319 ---
 debian/modules/http-fancyindex/config         |   20 -
 .../ngx_http_fancyindex_module.c              | 1615 ------------
 .../http-fancyindex/t/00-build-artifacts.test |   22 -
 .../http-fancyindex/t/01-smoke-hasindex.test  |    7 -
 .../t/02-smoke-indexisfancy.test              |   11 -
 .../http-fancyindex/t/03-exact_size_off.test  |    8 -
 .../http-fancyindex/t/04-hasindex-html.test   |   24 -
 .../http-fancyindex/t/05-sort-by-size.test    |   36 -
 .../http-fancyindex/t/06-hide_parent.test     |   23 -
 .../http-fancyindex/t/07-directory-first.test |   50 -
 .../http-fancyindex/t/07-show_dotfiles.test   |   21 -
 .../http-fancyindex/t/08-local-footer.test    |   17 -
 .../http-fancyindex/t/09-local-header.test    |   17 -
 .../t/10-local-headerfooter.test              |   26 -
 .../t/11-local-footer-nested.test             |   31 -
 .../t/12-local-footer-nested.test             |   11 -
 .../t/bug61-empty-file-segfault.test          |   16 -
 .../t/bug95-square-brackets.test              |   19 -
 .../modules/http-fancyindex/t/build-and-run   |   25 -
 .../t/child-directory/empty-file.txt          |    0
 debian/modules/http-fancyindex/t/get-pup      |   81 -
 .../modules/http-fancyindex/t/has-index.test  |    7 -
 .../http-fancyindex/t/has-index/index.html    |   10 -
 debian/modules/http-fancyindex/t/nginx.conf   |   25 -
 debian/modules/http-fancyindex/t/preamble     |  111 -
 debian/modules/http-fancyindex/t/run          |   86 -
 .../http-fancyindex/t/show_dotfiles/.okay     |    0
 debian/modules/http-fancyindex/template.awk   |   52 -
 debian/modules/http-fancyindex/template.h     |   94 -
 debian/modules/http-fancyindex/template.html  |   93 -
 debian/modules/http-geoip2/LICENSE            |   23 -
 debian/modules/http-geoip2/README.md          |  133 -
 debian/modules/http-geoip2/config             |   43 -
 .../http-geoip2/ngx_http_geoip2_module.c      |  793 ------
 .../http-geoip2/ngx_stream_geoip2_module.c    |  694 ------
 .../http-headers-more-filter/README.markdown  |  549 -----
 .../modules/http-headers-more-filter/config   |   32 -
 .../http-headers-more-filter/src/ddebug.h     |  124 -
 .../src/ngx_http_headers_more_filter_module.c |  348 ---
 .../src/ngx_http_headers_more_filter_module.h |   80 -
 .../src/ngx_http_headers_more_headers_in.c    |  899 -------
 .../src/ngx_http_headers_more_headers_in.h    |   26 -
 .../src/ngx_http_headers_more_headers_out.c   |  716 ------
 .../src/ngx_http_headers_more_headers_out.h   |   26 -
 .../src/ngx_http_headers_more_util.c          |  380 ---
 .../src/ngx_http_headers_more_util.h          |   52 -
 .../modules/http-headers-more-filter/t/bug.t  |  393 ---
 .../http-headers-more-filter/t/builtin.t      |  338 ---
 .../modules/http-headers-more-filter/t/eval.t |   36 -
 .../http-headers-more-filter/t/input-conn.t   |  137 --
 .../http-headers-more-filter/t/input-cookie.t |  183 --
 .../http-headers-more-filter/t/input-ua.t     |  628 -----
 .../http-headers-more-filter/t/input.t        | 1331 ----------
 .../http-headers-more-filter/t/phase.t        |   25 -
 .../http-headers-more-filter/t/sanity.t       |  567 -----
 .../http-headers-more-filter/t/subrequest.t   |   68 -
 .../http-headers-more-filter/t/unused.t       |  174 --
 .../modules/http-headers-more-filter/t/vars.t |   58 -
 .../http-headers-more-filter/util/build.sh    |   33 -
 .../valgrind.suppress                         |  135 -
 debian/modules/http-subs-filter/CHANGES       |   37 -
 debian/modules/http-subs-filter/README        |  141 --
 debian/modules/http-subs-filter/config        |    3 -
 .../doc/README.google_code_home_page.wiki     |  120 -
 .../modules/http-subs-filter/doc/README.html  |  199 --
 .../modules/http-subs-filter/doc/README.wiki  |  123 -
 .../ngx_http_subs_filter_module.c             | 1298 ----------
 debian/modules/http-subs-filter/test/README   |  275 ---
 .../test/inc/Module/AutoInstall.pm            |  820 -------
 .../test/inc/Module/Install.pm                |  470 ----
 .../test/inc/Module/Install/AutoInstall.pm    |   82 -
 .../test/inc/Module/Install/Base.pm           |   83 -
 .../test/inc/Module/Install/Can.pm            |   81 -
 .../test/inc/Module/Install/Fetch.pm          |   93 -
 .../test/inc/Module/Install/Include.pm        |   34 -
 .../test/inc/Module/Install/Makefile.pm       |  415 ----
 .../test/inc/Module/Install/Metadata.pm       |  716 ------
 .../test/inc/Module/Install/TestBase.pm       |   29 -
 .../test/inc/Module/Install/Win32.pm          |   64 -
 .../test/inc/Module/Install/WriteAll.pm       |   63 -
 .../http-subs-filter/test/inc/Spiffy.pm       |  539 ----
 .../http-subs-filter/test/inc/Test/Base.pm    |  682 ------
 .../test/inc/Test/Base/Filter.pm              |  341 ---
 .../http-subs-filter/test/inc/Test/Builder.pm | 1413 -----------
 .../test/inc/Test/Builder/Module.pm           |   81 -
 .../http-subs-filter/test/inc/Test/More.pm    |  735 ------
 .../http-subs-filter/test/lib/Test/Nginx.pm   |  315 ---
 .../test/lib/Test/Nginx/LWP.pm                |  524 ----
 .../test/lib/Test/Nginx/Socket.pm             | 1749 -------------
 .../test/lib/Test/Nginx/Util.pm               |  874 -------
 debian/modules/http-subs-filter/test/t/subs.t |  136 -
 .../http-subs-filter/test/t/subs_capture.t    |   32 -
 .../http-subs-filter/test/t/subs_fix_string.t |   32 -
 .../http-subs-filter/test/t/subs_regex.t      |  108 -
 .../http-subs-filter/test/t/subs_types.t      |   59 -
 debian/modules/http-subs-filter/test/test.sh  |    5 -
 .../http-subs-filter/util/update-readme.sh    |    7 -
 .../util/wiki2google_code_homepage.pl         |   29 -
 .../modules/http-subs-filter/util/wiki2pod.pl |  129 -
 debian/modules/http-uploadprogress/CHANGES    |  111 -
 debian/modules/http-uploadprogress/LICENSE    |   25 -
 debian/modules/http-uploadprogress/Makefile   |    8 -
 debian/modules/http-uploadprogress/README     |  329 ---
 debian/modules/http-uploadprogress/config     |   11 -
 .../ngx_http_uploadprogress_module.c          | 1774 --------------
 .../http-uploadprogress/test/client.sh        |    8 -
 .../http-uploadprogress/test/stress.sh        |   41 -
 debian/modules/http-upstream-fair/.gdbinit    |   39 -
 debian/modules/http-upstream-fair/README      |   53 -
 debian/modules/http-upstream-fair/config      |    3 -
 .../ngx_http_upstream_fair_module.c           | 1356 ----------
 .../http-cache-purge/dynamic-module.patch     |   34 -
 .../http-cache-purge/segfault-1.11.6.patch    |   25 -
 .../modules/patches/http-cache-purge/series   |    2 -
 .../http-subs-filter/dynamic-module.patch     |   32 -
 .../patches/http-subs-filter/pcre2.patch      |   24 -
 .../modules/patches/http-subs-filter/series   |    2 -
 .../drop-default-port.patch                   |   37 -
 .../http-upstream-fair/dynamic-module.patch   |   29 -
 .../http-upstream-fair/openssl-1.1.0.patch    |   50 -
 .../modules/patches/http-upstream-fair/series |    3 -
 debian/modules/watch/http-auth-pam            |    4 -
 debian/modules/watch/http-cache-purge         |    4 -
 debian/modules/watch/http-dav-ext             |    4 -
 debian/modules/watch/http-echo                |    4 -
 debian/modules/watch/http-fancyindex          |    4 -
 debian/modules/watch/http-geoip2              |    4 -
 debian/modules/watch/http-headers-more-filter |    4 -
 debian/modules/watch/http-lua                 |    4 -
 debian/modules/watch/http-subs-filter         |    4 -
 debian/modules/watch/http-uploadprogress      |    4 -
 debian/ngxmod                                 |  222 --
 debian/rules                                  |   46 +-
 240 files changed, 33 insertions(+), 48881 deletions(-)
 delete mode 100755 debian/libnginx-mod-http-auth-pam.nginx
 delete mode 100755 debian/libnginx-mod-http-cache-purge.nginx
 delete mode 100755 debian/libnginx-mod-http-dav-ext.nginx
 delete mode 100755 debian/libnginx-mod-http-echo.nginx
 delete mode 100755 debian/libnginx-mod-http-fancyindex.nginx
 delete mode 100755 debian/libnginx-mod-http-geoip2.nginx
 delete mode 100755 debian/libnginx-mod-http-headers-more-filter.nginx
 delete mode 100755 debian/libnginx-mod-http-subs-filter.nginx
 delete mode 100755 debian/libnginx-mod-http-uploadprogress.nginx
 delete mode 100755 debian/libnginx-mod-http-upstream-fair.nginx
 delete mode 100755 debian/libnginx-mod-stream-geoip2.nginx
 delete mode 100644 debian/libnginx-mod.conf/mod-http-auth-pam.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-cache-purge.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-dav-ext.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-echo.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-fancyindex.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-geoip2.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-headers-more-filter.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-subs-filter.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-uploadprogress.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-http-upstream-fair.conf
 delete mode 100644 debian/libnginx-mod.conf/mod-stream-geoip2.conf
 delete mode 100644 debian/modules/control
 delete mode 100644 debian/modules/http-auth-pam/ChangeLog
 delete mode 100644 debian/modules/http-auth-pam/LICENSE
 delete mode 100644 debian/modules/http-auth-pam/README.md
 delete mode 100644 debian/modules/http-auth-pam/VERSION
 delete mode 100644 debian/modules/http-auth-pam/config
 delete mode 100644 debian/modules/http-auth-pam/ngx_http_auth_pam_module.c
 delete mode 100644 debian/modules/http-cache-purge/CHANGES
 delete mode 100644 debian/modules/http-cache-purge/LICENSE
 delete mode 100644 debian/modules/http-cache-purge/README.md
 delete mode 100644 debian/modules/http-cache-purge/TODO.md
 delete mode 100644 debian/modules/http-cache-purge/config
 delete mode 100644 debian/modules/http-cache-purge/ngx_cache_purge_module.c
 delete mode 100644 debian/modules/http-cache-purge/t/proxy1.t
 delete mode 100644 debian/modules/http-cache-purge/t/proxy1_vars.t
 delete mode 100644 debian/modules/http-cache-purge/t/proxy2.t
 delete mode 100644 debian/modules/http-cache-purge/t/proxy2_vars.t
 delete mode 100644 debian/modules/http-dav-ext/LICENSE
 delete mode 100644 debian/modules/http-dav-ext/README.rst
 delete mode 100644 debian/modules/http-dav-ext/config
 delete mode 100644 debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
 delete mode 100644 debian/modules/http-dav-ext/t/dav_ext.t
 delete mode 100644 debian/modules/http-echo/LICENSE
 delete mode 100644 debian/modules/http-echo/README.markdown
 delete mode 100644 debian/modules/http-echo/config
 delete mode 100644 debian/modules/http-echo/src/ddebug.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_echo.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_echo.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_filter.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_filter.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_foreach.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_foreach.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_handler.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_handler.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_location.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_location.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_module.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_module.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_request_info.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_request_info.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_sleep.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_sleep.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_subrequest.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_subrequest.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_timer.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_timer.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_util.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_util.h
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_var.c
 delete mode 100644 debian/modules/http-echo/src/ngx_http_echo_var.h
 delete mode 100644 debian/modules/http-echo/t/abort-parent.t
 delete mode 100644 debian/modules/http-echo/t/blocking-sleep.t
 delete mode 100644 debian/modules/http-echo/t/echo-after-body.t
 delete mode 100644 debian/modules/http-echo/t/echo-before-body.t
 delete mode 100644 debian/modules/http-echo/t/echo-duplicate.t
 delete mode 100644 debian/modules/http-echo/t/echo-timer.t
 delete mode 100644 debian/modules/http-echo/t/echo.t
 delete mode 100644 debian/modules/http-echo/t/exec.t
 delete mode 100644 debian/modules/http-echo/t/filter-used.t
 delete mode 100644 debian/modules/http-echo/t/foreach-split.t
 delete mode 100644 debian/modules/http-echo/t/gzip.t
 delete mode 100644 debian/modules/http-echo/t/if.t
 delete mode 100644 debian/modules/http-echo/t/incr.t
 delete mode 100644 debian/modules/http-echo/t/location-async.t
 delete mode 100644 debian/modules/http-echo/t/location.t
 delete mode 100644 debian/modules/http-echo/t/mixed.t
 delete mode 100644 debian/modules/http-echo/t/request-body.t
 delete mode 100644 debian/modules/http-echo/t/request-info.t
 delete mode 100644 debian/modules/http-echo/t/sleep.t
 delete mode 100644 debian/modules/http-echo/t/status.t
 delete mode 100644 debian/modules/http-echo/t/subrequest-async.t
 delete mode 100644 debian/modules/http-echo/t/subrequest.t
 delete mode 100644 debian/modules/http-echo/t/unused.t
 delete mode 100755 debian/modules/http-echo/util/build.sh
 delete mode 100755 debian/modules/http-echo/util/releng
 delete mode 100644 debian/modules/http-echo/util/wiki2pod.pl
 delete mode 100644 debian/modules/http-echo/valgrind.suppress
 delete mode 100644 debian/modules/http-fancyindex/.github/workflows/ci.yml
 delete mode 100644 debian/modules/http-fancyindex/CHANGELOG.md
 delete mode 100644 debian/modules/http-fancyindex/HACKING.md
 delete mode 100644 debian/modules/http-fancyindex/LICENSE
 delete mode 100644 debian/modules/http-fancyindex/README.rst
 delete mode 100644 debian/modules/http-fancyindex/config
 delete mode 100644 debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
 delete mode 100644 debian/modules/http-fancyindex/t/00-build-artifacts.test
 delete mode 100644 debian/modules/http-fancyindex/t/01-smoke-hasindex.test
 delete mode 100644 debian/modules/http-fancyindex/t/02-smoke-indexisfancy.test
 delete mode 100644 debian/modules/http-fancyindex/t/03-exact_size_off.test
 delete mode 100644 debian/modules/http-fancyindex/t/04-hasindex-html.test
 delete mode 100644 debian/modules/http-fancyindex/t/05-sort-by-size.test
 delete mode 100644 debian/modules/http-fancyindex/t/06-hide_parent.test
 delete mode 100644 debian/modules/http-fancyindex/t/07-directory-first.test
 delete mode 100644 debian/modules/http-fancyindex/t/07-show_dotfiles.test
 delete mode 100644 debian/modules/http-fancyindex/t/08-local-footer.test
 delete mode 100644 debian/modules/http-fancyindex/t/09-local-header.test
 delete mode 100644 debian/modules/http-fancyindex/t/10-local-headerfooter.test
 delete mode 100644 debian/modules/http-fancyindex/t/11-local-footer-nested.test
 delete mode 100644 debian/modules/http-fancyindex/t/12-local-footer-nested.test
 delete mode 100644 debian/modules/http-fancyindex/t/bug61-empty-file-segfault.test
 delete mode 100644 debian/modules/http-fancyindex/t/bug95-square-brackets.test
 delete mode 100755 debian/modules/http-fancyindex/t/build-and-run
 delete mode 100644 debian/modules/http-fancyindex/t/child-directory/empty-file.txt
 delete mode 100755 debian/modules/http-fancyindex/t/get-pup
 delete mode 100644 debian/modules/http-fancyindex/t/has-index.test
 delete mode 100644 debian/modules/http-fancyindex/t/has-index/index.html
 delete mode 100644 debian/modules/http-fancyindex/t/nginx.conf
 delete mode 100644 debian/modules/http-fancyindex/t/preamble
 delete mode 100755 debian/modules/http-fancyindex/t/run
 delete mode 100644 debian/modules/http-fancyindex/t/show_dotfiles/.okay
 delete mode 100755 debian/modules/http-fancyindex/template.awk
 delete mode 100644 debian/modules/http-fancyindex/template.h
 delete mode 100644 debian/modules/http-fancyindex/template.html
 delete mode 100644 debian/modules/http-geoip2/LICENSE
 delete mode 100644 debian/modules/http-geoip2/README.md
 delete mode 100644 debian/modules/http-geoip2/config
 delete mode 100644 debian/modules/http-geoip2/ngx_http_geoip2_module.c
 delete mode 100644 debian/modules/http-geoip2/ngx_stream_geoip2_module.c
 delete mode 100644 debian/modules/http-headers-more-filter/README.markdown
 delete mode 100644 debian/modules/http-headers-more-filter/config
 delete mode 100644 debian/modules/http-headers-more-filter/src/ddebug.h
 delete mode 100644 debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.c
 delete mode 100644 debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.h
 delete mode 100644 debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c
 delete mode 100644 debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.h
 delete mode 100644 debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.c
 delete mode 100644 debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.h
 delete mode 100644 debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.c
 delete mode 100644 debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.h
 delete mode 100644 debian/modules/http-headers-more-filter/t/bug.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/builtin.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/eval.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/input-conn.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/input-cookie.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/input-ua.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/input.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/phase.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/sanity.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/subrequest.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/unused.t
 delete mode 100644 debian/modules/http-headers-more-filter/t/vars.t
 delete mode 100755 debian/modules/http-headers-more-filter/util/build.sh
 delete mode 100644 debian/modules/http-headers-more-filter/valgrind.suppress
 delete mode 100644 debian/modules/http-subs-filter/CHANGES
 delete mode 100644 debian/modules/http-subs-filter/README
 delete mode 100644 debian/modules/http-subs-filter/config
 delete mode 100644 debian/modules/http-subs-filter/doc/README.google_code_home_page.wiki
 delete mode 100644 debian/modules/http-subs-filter/doc/README.html
 delete mode 100644 debian/modules/http-subs-filter/doc/README.wiki
 delete mode 100644 debian/modules/http-subs-filter/ngx_http_subs_filter_module.c
 delete mode 100644 debian/modules/http-subs-filter/test/README
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/AutoInstall.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/AutoInstall.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/Base.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/Can.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/Fetch.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/Include.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/Makefile.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/Metadata.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/TestBase.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/Win32.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Module/Install/WriteAll.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Spiffy.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Test/Base.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Test/Base/Filter.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Test/Builder.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Test/Builder/Module.pm
 delete mode 100644 debian/modules/http-subs-filter/test/inc/Test/More.pm
 delete mode 100644 debian/modules/http-subs-filter/test/lib/Test/Nginx.pm
 delete mode 100644 debian/modules/http-subs-filter/test/lib/Test/Nginx/LWP.pm
 delete mode 100644 debian/modules/http-subs-filter/test/lib/Test/Nginx/Socket.pm
 delete mode 100644 debian/modules/http-subs-filter/test/lib/Test/Nginx/Util.pm
 delete mode 100644 debian/modules/http-subs-filter/test/t/subs.t
 delete mode 100644 debian/modules/http-subs-filter/test/t/subs_capture.t
 delete mode 100644 debian/modules/http-subs-filter/test/t/subs_fix_string.t
 delete mode 100644 debian/modules/http-subs-filter/test/t/subs_regex.t
 delete mode 100644 debian/modules/http-subs-filter/test/t/subs_types.t
 delete mode 100755 debian/modules/http-subs-filter/test/test.sh
 delete mode 100755 debian/modules/http-subs-filter/util/update-readme.sh
 delete mode 100644 debian/modules/http-subs-filter/util/wiki2google_code_homepage.pl
 delete mode 100644 debian/modules/http-subs-filter/util/wiki2pod.pl
 delete mode 100644 debian/modules/http-uploadprogress/CHANGES
 delete mode 100644 debian/modules/http-uploadprogress/LICENSE
 delete mode 100644 debian/modules/http-uploadprogress/Makefile
 delete mode 100644 debian/modules/http-uploadprogress/README
 delete mode 100644 debian/modules/http-uploadprogress/config
 delete mode 100644 debian/modules/http-uploadprogress/ngx_http_uploadprogress_module.c
 delete mode 100644 debian/modules/http-uploadprogress/test/client.sh
 delete mode 100644 debian/modules/http-uploadprogress/test/stress.sh
 delete mode 100644 debian/modules/http-upstream-fair/.gdbinit
 delete mode 100644 debian/modules/http-upstream-fair/README
 delete mode 100644 debian/modules/http-upstream-fair/config
 delete mode 100644 debian/modules/http-upstream-fair/ngx_http_upstream_fair_module.c
 delete mode 100644 debian/modules/patches/http-cache-purge/dynamic-module.patch
 delete mode 100644 debian/modules/patches/http-cache-purge/segfault-1.11.6.patch
 delete mode 100644 debian/modules/patches/http-cache-purge/series
 delete mode 100644 debian/modules/patches/http-subs-filter/dynamic-module.patch
 delete mode 100644 debian/modules/patches/http-subs-filter/pcre2.patch
 delete mode 100644 debian/modules/patches/http-subs-filter/series
 delete mode 100644 debian/modules/patches/http-upstream-fair/drop-default-port.patch
 delete mode 100644 debian/modules/patches/http-upstream-fair/dynamic-module.patch
 delete mode 100644 debian/modules/patches/http-upstream-fair/openssl-1.1.0.patch
 delete mode 100644 debian/modules/patches/http-upstream-fair/series
 delete mode 100644 debian/modules/watch/http-auth-pam
 delete mode 100644 debian/modules/watch/http-cache-purge
 delete mode 100644 debian/modules/watch/http-dav-ext
 delete mode 100644 debian/modules/watch/http-echo
 delete mode 100644 debian/modules/watch/http-fancyindex
 delete mode 100644 debian/modules/watch/http-geoip2
 delete mode 100644 debian/modules/watch/http-headers-more-filter
 delete mode 100644 debian/modules/watch/http-lua
 delete mode 100644 debian/modules/watch/http-subs-filter
 delete mode 100644 debian/modules/watch/http-uploadprogress
 delete mode 100755 debian/ngxmod

diff --git a/debian/changelog b/debian/changelog
index 78577de..af4ebb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+nginx (1.22.1-5) UNRELEASED; urgency=medium
+
+  * removed 3th party modules and moved to separate packages:
+    - libnginx-mod-http-geoip2
+    - libnginx-mod-stream-geoip2
+    - libnginx-mod-http-auth-pam
+    - libnginx-mod-http-echo
+    - libnginx-mod-http-upstream-fair
+    - libnginx-mod-http-headers-more-filter
+    - libnginx-mod-http-cache-purge
+    - libnginx-mod-http-fancyindex
+    - libnginx-mod-http-uploadprogress
+    - libnginx-mod-http-subs-filter
+    - libnginx-mod-http-dav-ext
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 16:33:16 +0100
+
 nginx (1.22.1-4) unstable; urgency=medium
 
   * d/t/*-module-deps: updated, added curl timeout 300 seconds and
diff --git a/debian/control b/debian/control
index 7415b24..dced73c 100644
--- a/debian/control
+++ b/debian/control
@@ -170,7 +170,7 @@ Description: nginx web/proxy server (standard version with 3rd parties)
 
 Package: nginx-light
 Architecture: any
-Depends: libnginx-mod-http-echo (>= ${binary:Version}),
+Depends: libnginx-mod-http-echo (>= 1:0.63-3~),
          nginx-common (= ${source:Version}),
          iproute2,
          ${misc:Depends},
@@ -197,26 +197,26 @@ Description: nginx web/proxy server (basic version)
 
 Package: nginx-extras
 Architecture: any
-Depends: libnginx-mod-http-auth-pam (>= ${binary:Version}),
-         libnginx-mod-http-cache-purge (>= ${binary:Version}),
-         libnginx-mod-http-dav-ext (>= ${binary:Version}),
-         libnginx-mod-http-echo (>= ${binary:Version}),
-         libnginx-mod-http-fancyindex (>= ${binary:Version}),
+Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~),
+         libnginx-mod-http-cache-purge (>= 1:2.3-3~),
+         libnginx-mod-http-dav-ext (>= 1:3.0.0-2~),
+         libnginx-mod-http-echo (>= 1:0.63-3~),
+         libnginx-mod-http-fancyindex (>= 1:0.5.2-2~),
          libnginx-mod-http-geoip (= ${binary:Version}),
-         libnginx-mod-http-geoip2 (>= ${binary:Version}),
-         libnginx-mod-http-headers-more-filter (>= ${binary:Version}),
+         libnginx-mod-http-geoip2 (>= 1:3.4-2~),
+         libnginx-mod-http-headers-more-filter (>= 1:0.34-2~),
          libnginx-mod-http-image-filter (= ${binary:Version}),
          libnginx-mod-http-lua (>=1:0.10.22-3~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
          libnginx-mod-http-perl (= ${binary:Version}),
-         libnginx-mod-http-subs-filter (>= ${binary:Version}),
-         libnginx-mod-http-uploadprogress (>= ${binary:Version}),
-         libnginx-mod-http-upstream-fair (>= ${binary:Version}),
+         libnginx-mod-http-subs-filter (>= 1:0.6.4-2~),
+         libnginx-mod-http-uploadprogress (>= 1:0.9.2-2~),
+         libnginx-mod-http-upstream-fair (>= 1:0.0~git20120408.a18b409-2~),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-nchan (>= 1:1.3.5+dfsg-2~),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
-         libnginx-mod-stream-geoip2 (>= ${binary:Version}),
+         libnginx-mod-stream-geoip2 (>= 1:3.4-2~),
          nginx-common (= ${source:Version}),
          iproute2,
          ${misc:Depends},
@@ -261,17 +261,6 @@ Description: GeoIP HTTP module for Nginx
  Those variables include country, region, city, latitude, longitude, postal
  code, etc.
 
-Package: libnginx-mod-http-geoip2
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: GeoIP2 HTTP module for Nginx
- The ngx_http_geoip2 module creates variables with values depending on the
- client IP address, using the precompiled MaxMind GeoIP2 databases.
- .
- Those variables include country, region, city, latitude, longitude, postal
- code, etc.
-
 Package: libnginx-mod-http-image-filter
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
@@ -327,18 +316,6 @@ Description: GeoIP Stream module for Nginx
  Those variables include country, region, city, latitude, longitude, postal
  code, etc.
 
-Package: libnginx-mod-stream-geoip2
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
- libnginx-mod-stream (= ${binary:Version}),
-Recommends: nginx,
-Description: GeoIP2 Stream module for Nginx
- The ngx_stream_geoip2 module creates variables with values depending on the
- client IP address, using the precompiled MaxMind GeoIP2 databases.
- .
- Those variables include country, region, city, latitude, longitude, postal
- code, etc.
-
 Package: libnginx-mod-http-perl
 Architecture: any
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
@@ -350,106 +327,3 @@ Description: Perl module for Nginx
  in Perl and insert Perl calls into SSI.
  .
  Note that this module is marked experimental.
-
-Package: libnginx-mod-http-auth-pam
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: PAM authentication module for Nginx
- The nginx_http_auth_pam module enables authentication using PAM.
- .
- The module uses PAM as a backend for simple http authentication. It
- also allows setting the pam service name to allow more fine grained control.
-
-Package: libnginx-mod-http-echo
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: Bring echo and more shell style goodies to Nginx
- Echo module wraps lots of Nginx internal APIs for streaming input and output,
- parallel/sequential subrequests, timers and sleeping, as well as various meta
- data accessing.
- .
- Basically it provides various utilities that help testing and debugging of
- other modules by trivially emulating different kinds of faked subrequest
- locations.
- .
- People will also find it useful in real-world applications that need to:
- .
- 1. Serve static contents directly from memory.
- 2. Wrap the upstream response with custom header and footer (kinda like the
-    addition module but with contents read directly from the config file and
-    Nginx variables).
- 3. Merge contents of various "Nginx locations" (i.e., subrequests) together in
-    a single main request (using echo_location and its friends).
-
-Package: libnginx-mod-http-upstream-fair
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: Nginx Upstream Fair Proxy Load Balancer
- The Nginx fair proxy balancer enhances the standard round-robin load balancer
- provided with Nginx so that it tracks busy backend servers and adjusts
- balancing accordingly.
-
-Package: libnginx-mod-http-headers-more-filter
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: Set and clear input and output headers for Nginx
- The Headers More module allows you to add, set, or clear any output or input
- header that you specify.
- .
- This is an enhanced version of the standard headers module because it provides
- more utilities like resetting or clearing "builtin headers" like Content-Type,
- Content-Length, and Server.
-
-Package: libnginx-mod-http-cache-purge
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: Purge content from Nginx caches
- Cache Purge module adds purging capabilities to Nginx. It allows purging
- content from caches used by all of Nginx proxy modules, like FastCGI, Proxy,
- SCGI and uWSGI.
-
-Package: libnginx-mod-http-fancyindex
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Suggests: nginx,
-Description: Fancy indexes module for the Nginx
- The Fancy Index module makes possible the generation of file listings, like
- the built-in autoindex module does, but adding a touch of style by introducing
- ways to customize the result.
-
-Package: libnginx-mod-http-uploadprogress
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: Upload progress system for Nginx
- Upload progress module is an implementation of an upload progress system, that
- monitors RFC1867 POST uploads as they are transmitted to upstream servers.
- .
- It works by tracking the uploads proxied by Nginx to upstream servers without
- analysing the uploaded content and offers a web API to report upload progress
- in Javscript, Json or any other format.
-
-Package: libnginx-mod-http-subs-filter
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: Substitution filter module for Nginx
- Substitution Nginx module can do both regular expression and fixed string
- substitutions on response bodies. The module is quite different from Nginx's
- native Substitution module. It scans the output chains buffer and
- matches string line by line, just like Apache's mod_substitute.
-
-Package: libnginx-mod-http-dav-ext
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
-Description: WebDAV missing commands support for Nginx
- WebDAV Ext module complements the Nginx WebDAV module to provide a full
- WebDAV support.
- .
- WebDAV Ext provides the missing PROPFIND & OPTIONS methods.
diff --git a/debian/copyright b/debian/copyright
index 713892f..3ae2899 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,57 +51,6 @@ Files: debian/debhelper/*
 Copyright: 2022 Miao Wang
 License: Expat
 
-Files: debian/modules/http-headers-more-filter/*
-Copyright: 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
-           2010-2013, Bernd Dorn
-                      Igor Sysoev
-License: BSD-2-clause
-
-Files: debian/modules/http-geoip2/*
-Copyright: 2014, Lee Valentine <lee@leev.net>
-License: BSD-2-clause
-
-Files: debian/modules/http-auth-pam/*
-Copyright: 2008-2020, Sergio Talens Oliag
-License: BSD-2-clause
-
-Files: debian/modules/http-echo/*
-Copyright: 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>
-License: BSD-2-clause
-
-Files: debian/modules/http-upstream-fair/*
-Copyright: 2007, Grzegorz Nosek
-                 Igor Sysoev
-License: BSD-2-clause
-
-Files: debian/modules/http-uploadprogress/*
-Copyright: 2007, Brice Figureau
-           2002-2007, Igor Sysoev
-License: BSD-2-clause
-
-Files: debian/modules/http-cache-purge/*
-Copyright: 2009-2014, FRiCKLE <info@frickle.com>,
-           2009-2014, Piotr Sikora <piotr.sikora@frickle.com>
-License: BSD-2-clause
-
-Files: debian/modules/http-dav-ext/*
-Copyright: 2012-2018, Roman Arutyunyan <arut@qip.ru>
-License: BSD-2-clause
-
-Files: debian/modules/http-fancyindex/*
-Copyright: 2007-2016, Adrian Perez <aperez@igalia.com>
-License: BSD-2-clause
-
-Files: debian/modules/http-subs-filter/*
-Copyright: 2014, Weibin Yao <yaoweibin@gmail.com>
-License: BSD-2-clause
-
-Files: debian/modules/http-subs-filter/test/*
-Copyright: 2009-2011, Taobao Inc., Alibaba Group
-                      Antoine BONAVITA "<antoine.bonavita@gmail.com>"
-                      agentzh (章亦春) "<agentzh@gmail.com>"
-License: BSD-3-clause
-
 License: BSD-2-clause
  All rights reserved.
  .
@@ -127,33 +76,6 @@ License: BSD-2-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this
-    software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to
diff --git a/debian/libnginx-mod-http-auth-pam.nginx b/debian/libnginx-mod-http-auth-pam.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-auth-pam.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-cache-purge.nginx b/debian/libnginx-mod-http-cache-purge.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-cache-purge.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-dav-ext.nginx b/debian/libnginx-mod-http-dav-ext.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-dav-ext.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-echo.nginx b/debian/libnginx-mod-http-echo.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-echo.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-fancyindex.nginx b/debian/libnginx-mod-http-fancyindex.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-fancyindex.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-geoip2.nginx b/debian/libnginx-mod-http-geoip2.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-geoip2.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-headers-more-filter.nginx b/debian/libnginx-mod-http-headers-more-filter.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-headers-more-filter.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-subs-filter.nginx b/debian/libnginx-mod-http-subs-filter.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-subs-filter.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-uploadprogress.nginx b/debian/libnginx-mod-http-uploadprogress.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-uploadprogress.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-upstream-fair.nginx b/debian/libnginx-mod-http-upstream-fair.nginx
deleted file mode 100755
index 78c206f..0000000
--- a/debian/libnginx-mod-http-upstream-fair.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-stream-geoip2.nginx b/debian/libnginx-mod-stream-geoip2.nginx
deleted file mode 100755
index 9acb103..0000000
--- a/debian/libnginx-mod-stream-geoip2.nginx
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-
-# Guess module name
-$module = basename($0, '.nginx');
-$module =~ s/^libnginx-mod-//;
-
-$modulepath = $module;
-$modulepath =~ s/-/_/g;
-
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf 70\n";
diff --git a/debian/libnginx-mod.conf/mod-http-auth-pam.conf b/debian/libnginx-mod.conf/mod-http-auth-pam.conf
deleted file mode 100644
index 2eb6752..0000000
--- a/debian/libnginx-mod.conf/mod-http-auth-pam.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_auth_pam_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-cache-purge.conf b/debian/libnginx-mod.conf/mod-http-cache-purge.conf
deleted file mode 100644
index 5974b1f..0000000
--- a/debian/libnginx-mod.conf/mod-http-cache-purge.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_cache_purge_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-dav-ext.conf b/debian/libnginx-mod.conf/mod-http-dav-ext.conf
deleted file mode 100644
index e852329..0000000
--- a/debian/libnginx-mod.conf/mod-http-dav-ext.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_dav_ext_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-echo.conf b/debian/libnginx-mod.conf/mod-http-echo.conf
deleted file mode 100644
index a82ee29..0000000
--- a/debian/libnginx-mod.conf/mod-http-echo.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_echo_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-fancyindex.conf b/debian/libnginx-mod.conf/mod-http-fancyindex.conf
deleted file mode 100644
index 4aa4f2f..0000000
--- a/debian/libnginx-mod.conf/mod-http-fancyindex.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_fancyindex_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-geoip2.conf b/debian/libnginx-mod.conf/mod-http-geoip2.conf
deleted file mode 100644
index 9441b29..0000000
--- a/debian/libnginx-mod.conf/mod-http-geoip2.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_geoip2_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-headers-more-filter.conf b/debian/libnginx-mod.conf/mod-http-headers-more-filter.conf
deleted file mode 100644
index 266d84e..0000000
--- a/debian/libnginx-mod.conf/mod-http-headers-more-filter.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_headers_more_filter_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-subs-filter.conf b/debian/libnginx-mod.conf/mod-http-subs-filter.conf
deleted file mode 100644
index fe34b6c..0000000
--- a/debian/libnginx-mod.conf/mod-http-subs-filter.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_subs_filter_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-uploadprogress.conf b/debian/libnginx-mod.conf/mod-http-uploadprogress.conf
deleted file mode 100644
index edc0c0b..0000000
--- a/debian/libnginx-mod.conf/mod-http-uploadprogress.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_uploadprogress_module.so;
diff --git a/debian/libnginx-mod.conf/mod-http-upstream-fair.conf b/debian/libnginx-mod.conf/mod-http-upstream-fair.conf
deleted file mode 100644
index 62750b5..0000000
--- a/debian/libnginx-mod.conf/mod-http-upstream-fair.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_http_upstream_fair_module.so;
diff --git a/debian/libnginx-mod.conf/mod-stream-geoip2.conf b/debian/libnginx-mod.conf/mod-stream-geoip2.conf
deleted file mode 100644
index 4072597..0000000
--- a/debian/libnginx-mod.conf/mod-stream-geoip2.conf
+++ /dev/null
@@ -1 +0,0 @@
-load_module modules/ngx_stream_geoip2_module.so;
diff --git a/debian/modules/control b/debian/modules/control
deleted file mode 100644
index 7ff9851..0000000
--- a/debian/modules/control
+++ /dev/null
@@ -1,52 +0,0 @@
-Module: http-headers-more-filter
-Homepage: https://github.com/agentzh/headers-more-nginx-module
-Version: 0.33
-Files-Excluded: .gitignore .gitattributes .travis.yml
-
-Module: http-auth-pam
-Homepage: https://github.com/sto/ngx_http_auth_pam_module
-Version: 1.5.3
-
-Module: http-echo
-Homepage: https://github.com/agentzh/echo-nginx-module
-Version: 0.62
-Files-Excluded: .gitignore .gitattributes .travis.yml
-
-Module: http-geoip2
-Homepage: https://github.com/leev/ngx_http_geoip2_module
-Version: 3.3
-
-Module: http-upstream-fair
-Homepage: https://github.com/gnosek/nginx-upstream-fair
-Version: a18b409
-Patch:
-  dynamic-module.patch
-  openssl-1.1.0.patch
-  drop-default-port.patch
-
-Module: http-uploadprogress
-Homepage: https://github.com/masterzen/nginx-upload-progress-module
-Files-Excluded: test
-Version: 0.9.2
-
-Module: http-cache-purge
-Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
-Version: 2.3
-Patch:
-  dynamic-module.patch
-  segfault-1.11.6.patch
-
-Module: http-dav-ext
-Homepage: https://github.com/arut/nginx-dav-ext-module
-Version: 3.0.0
-
-Module: http-fancyindex
-Homepage: https://github.com/aperezdc/ngx-fancyindex
-Version: 0.5.2
-Files-Excluded: .gitignore .travis.yml
-
-Module: http-subs-filter
-Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
-Version: 0.6.4
-Patch: dynamic-module.patch
-
diff --git a/debian/modules/http-auth-pam/ChangeLog b/debian/modules/http-auth-pam/ChangeLog
deleted file mode 100644
index 5974d79..0000000
--- a/debian/modules/http-auth-pam/ChangeLog
+++ /dev/null
@@ -1,63 +0,0 @@
-2021-08-23  sto@mixinet.net
-
-	* Version 1.5.3.
-	* Always load after ngx_http_access_module (patch provided by khimaros, see
-	  https://github.com/sto/ngx_http_auth_pam_module/pull/26)
-
-2020-06-23  sto@mixinet.net
-
-	* Version 1.5.2.
-	* Log authentication errors as errors instead of debug (patch provided by
-	  Juha Koho, see https://github.com/sto/ngx_http_auth_pam_module/pull/11)
-	* Send client IP address to PAM (patch provided by Marcin Łojewski, see
-	  https://github.com/sto/ngx_http_auth_pam_module/pull/14)
-
-2016-04-06  sto@iti.es
-
-	* Version 1.5.1.
-	* Fix building alongside other modules in nginx 1.9.11+ (patch provided by
-	  Graham Edgecombe <grahamedgecombe@gmail.com>)
-
-2016-03-23  sto@iti.es
-
-	* Version 1.5.
-	* Added support to build module dynamically (patch provided by Sjir
-	  Bagmeijer <sbagmeijer@ulyaoth.co.kr>).
-	* Log PAM error and info messages to nginx log files (patch provided by
-	  André Caron <andre.l.caron@gmail.com>).
-
-2015-02-04  sto@iti.es
-
-	* Version 1.4.
-	* Cleanup PAM responses on error, the module was not doing it, causing
-	  memory leaks (thanks to Michael Koziarski for the report).
-
-2013-09-17  sto@iti.es
-
-	* Version 1.3.
-	* Added support to export HOST and REQUEST variables to the PAM ENVIRONMENT.
-	  Thanks to Ruben Jenster for the  initial patch, his version is available
-	  from https://github.com/r10r/ngx_http_auth_pam_module; my version uses his
-	  implementation but only if the user sets the ``pam_auth_set_pam_env``
-	  flag.
-	* Fixed bug from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=+721702
-	  (ngx_module_t commands array should end with a ngx_null_command); the bug
-	  was already fixed on the PAM_ENV patch, but I forgot about it until I went
-	  back to my svn repository to add the debian patch... better latter than
-	  never... ;)
-
-2010-11-15  sto@iti.upv.es
-
-	* Version 1.2.
-	* Fixed possible memory leak when authentication fails, pam_end has to
-	  be called to free memory (thanks to Neil Chintomby).
-
-2009-01-26  sto@iti.upv.es
-
-	* Version 1.1.
-	* Fixed ngx_log_debugX calls, no we use the correct X value on each
-	  call.
-
-2008-09-17  sto@iti.upv.es
-
-	* Initial version (1.0).
diff --git a/debian/modules/http-auth-pam/LICENSE b/debian/modules/http-auth-pam/LICENSE
deleted file mode 100644
index a9d6313..0000000
--- a/debian/modules/http-auth-pam/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 
- * Copyright (C) 2008-2020 Sergio Talens Oliag
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
diff --git a/debian/modules/http-auth-pam/README.md b/debian/modules/http-auth-pam/README.md
deleted file mode 100644
index 975bafe..0000000
--- a/debian/modules/http-auth-pam/README.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# ngx_http_auth_pam_module
-
-## Nginx module to use PAM for simple http authentication
-
-### Compilation
-
-When compiling from source build as usual adding the ``--add-module`` option:
-
-	./configure --add-module=$PATH_TO_MODULE
-
-or if you want to build the module as dynamic use the ``--add-dynamic-module``
-option.
-
-If you are using a Debian GNU/Linux distribution install the ``nginx-full``
-package; the module has been included in the debian package since version
-``1.1.6-1``, so it is available on all stable distributions since the *wheezy*
-release.
-
-### Configuration
-
-The module only has two directives:
-
-- ``auth_pam``: This is the http authentication realm. If given the value
-  ``off`` the module is disabled (needed when we want to override the value
-  set on a lower-level directive).
-
-- ``auth_pam_service_name``: this is the PAM service name and by default it is
-  set to ``nginx``.
-
-### Examples
-
-To protect everything under ``/secure`` you will add the following to the
-``nginx.conf`` file:
-
-	location /secure {
-	    auth_pam              "Secure Zone";
-	    auth_pam_service_name "nginx";
-	}
-
-Note that the module runs as the web server user, so the PAM modules used must
-be able to authenticate the users without being root; that means that if you
-want to use the ``pam_unix.so`` module to autenticate users you need to let the
-web server user to read the ``/etc/shadow`` file if that does not scare you (on
-Debian like systems you can add the ``www-data`` user to the ``shadow`` group).
-
-As an example, to authenticate users against an LDAP server (using the
-``pam_ldap.so`` module) you will use an ``/etc/pam.d/nginx`` like the
-following:
-
-	auth    required     /lib/security/pam_ldap.so
-	account required     /lib/security/pam_ldap.so
-
-If you also want to limit the users from LDAP that can authenticate you can
-use the ``pam_listfile.so`` module; to limit who can access resources under
-``/restricted`` add the following to the ``nginx.conf`` file:
-
-	location /restricted {
-	    auth_pam              "Restricted Zone";
-	    auth_pam_service_name "nginx_restricted";
-	}
-
-Use the following ``/etc/pam.d/nginx_restricted`` file:
-
-	auth    required     /lib/security/pam_listfile.so onerr=fail item=user \
-	                     sense=allow file=/etc/nginx/restricted_users
-	auth    required     /lib/security/pam_ldap.so
-	account required     /lib/security/pam_ldap.so
-
-And add the users allowed to authenticate to the ``/etc/nginx/restricted_users``
-(remember that the web server user has to be able to read this file).
-
-### PAM Environment
-
-If you want use the ``pam_exec.so`` plugin for request based authentication the
-module can add to the PAM environment the ``HOST`` and ``REQUEST`` variables if
-you set the ``auth_pam_set_pam_env`` flag::
-
-	location /pam_exec_protected {
-	  auth_pam              "Exec Zone";
-	  auth_pam_service_name "nginx_exec";
-	  auth_pam_set_pam_env  on;
-	}
-
-With this configuration if you access an URL like:
-
-	http://localhost:8000/pam_exec_protected/page?foo=yes&bar=too
-
-the PAM environment will include the following variables:
-
-	HOST=localhost:8000
-	REQUEST=GET /pam_exec_protected/page?foo=yes&bar=too HTTP/1.1
-
-You may use this information for request based authentication.
-You need a recent pam release (>= version 1.0.90) to expose environment
-variables to pam_exec.
diff --git a/debian/modules/http-auth-pam/VERSION b/debian/modules/http-auth-pam/VERSION
deleted file mode 100644
index 8af85be..0000000
--- a/debian/modules/http-auth-pam/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.5.3
diff --git a/debian/modules/http-auth-pam/config b/debian/modules/http-auth-pam/config
deleted file mode 100644
index 6965eea..0000000
--- a/debian/modules/http-auth-pam/config
+++ /dev/null
@@ -1,17 +0,0 @@
-ngx_addon_name=ngx_http_auth_pam_module
-
-if test -n "$ngx_module_link"; then
-    ngx_module_type=HTTP
-    ngx_module_name=ngx_http_auth_pam_module
-    ngx_module_incs=
-    ngx_module_deps=
-    ngx_module_srcs="$ngx_addon_dir/ngx_http_auth_pam_module.c"
-    ngx_module_libs="-lpam"
-    ngx_module_order="$ngx_module_name ngx_http_access_module"
-
-    . auto/module
-else
-   HTTP_MODULES="$HTTP_MODULES ngx_http_auth_pam_module"
-   NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_pam_module.c"
-   CORE_LIBS="$CORE_LIBS -lpam"
-fi
diff --git a/debian/modules/http-auth-pam/ngx_http_auth_pam_module.c b/debian/modules/http-auth-pam/ngx_http_auth_pam_module.c
deleted file mode 100644
index 55eeb92..0000000
--- a/debian/modules/http-auth-pam/ngx_http_auth_pam_module.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * Copyright (C) 2008-2020 Sergio Talens-Oliag <sto@mixinet.net>
- *
- * Based on nginx's 'ngx_http_auth_basic_module.c' by Igor Sysoev and apache's
- * 'mod_auth_pam.c' by Ingo Luetkebolhe.
- *
- * File: ngx_http_auth_pam_module.c
- */
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <security/pam_appl.h>
-
-#define NGX_PAM_SERVICE_NAME    "nginx"
-
-/* Module context data */
-typedef struct {
-    ngx_str_t  passwd;
-} ngx_http_auth_pam_ctx_t;
-
-/* PAM authinfo */
-typedef struct {
-    ngx_str_t  username;
-    ngx_str_t  password;
-    ngx_log_t  *log;
-} ngx_pam_authinfo;
-
-/* Module configuration struct */
-typedef struct {
-    ngx_str_t   realm;          /* http basic auth realm */
-    ngx_str_t   service_name;   /* pam service name */
-    ngx_flag_t  set_pam_env;    /* flag that indicates if we should export
-                                   variables to PAM or NOT */
-} ngx_http_auth_pam_loc_conf_t;
-
-/* Module handler */
-static ngx_int_t ngx_http_auth_pam_handler(ngx_http_request_t *r);
-
-/* Function that authenticates the user -- is the only function that uses PAM */
-static ngx_int_t ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
-                                                ngx_http_auth_pam_ctx_t *ctx,
-                                                ngx_str_t *passwd, void *conf);
-
-static ngx_int_t ngx_http_auth_pam_set_realm(ngx_http_request_t *r,
-                                             ngx_str_t *realm);
-
-static void *ngx_http_auth_pam_create_loc_conf(ngx_conf_t *cf);
-
-static char *ngx_http_auth_pam_merge_loc_conf(ngx_conf_t *cf,
-                                              void *parent, void *child);
-
-static ngx_int_t ngx_http_auth_pam_init(ngx_conf_t *cf);
-
-static char *ngx_http_auth_pam(ngx_conf_t *cf, void *post, void *data);
-
-static ngx_conf_post_handler_pt  ngx_http_auth_pam_p = ngx_http_auth_pam;
-
-static int ngx_auth_pam_talker(int num_msg, const struct pam_message ** msg,
-                               struct pam_response ** resp, void *appdata_ptr);
-
-static ngx_command_t  ngx_http_auth_pam_commands[] = {
-
-    { ngx_string("auth_pam"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LMT_CONF
-                        |NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_auth_pam_loc_conf_t, realm),
-      &ngx_http_auth_pam_p },
-
-    { ngx_string("auth_pam_service_name"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LMT_CONF
-                        |NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_auth_pam_loc_conf_t, service_name),
-      NULL },
-
-    { ngx_string("auth_pam_set_pam_env"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LMT_CONF
-                        |NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_auth_pam_loc_conf_t, set_pam_env),
-      NULL },
-
-    ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_http_auth_pam_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    ngx_http_auth_pam_init,                /* postconfiguration */
-
-    NULL,                                  /* create main configuration */
-    NULL,                                  /* init main configuration */
-
-    NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
-
-    ngx_http_auth_pam_create_loc_conf,     /* create location configuration */
-    ngx_http_auth_pam_merge_loc_conf       /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_http_auth_pam_module = {
-    NGX_MODULE_V1,
-    &ngx_http_auth_pam_module_ctx,         /* module context */
-    ngx_http_auth_pam_commands,            /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-/* 
- * Function to free PAM_CONV responses if an error is returned.
- */
-static void
-free_resp(int num_msg, struct pam_response *response)
-{
-    int i;
-    if (response == NULL)
-        return;
-    for (i = 0; i < num_msg; i++) {
-        if (response[i].resp) {
-            /* clear before freeing -- may be a password */
-            bzero(response[i].resp, strlen(response[i].resp));
-            free(response[i].resp);
-            response[i].resp = NULL;
-        }
-    }
-    free(response);
-}
-
-/*
- * ngx_auth_pam_talker: supply authentication information to PAM when asked
- *
- * Assumptions:
- *   A password is asked for by requesting input without echoing
- *   A username is asked for by requesting input _with_ echoing
- */
-static int
-ngx_auth_pam_talker(int num_msg, const struct pam_message ** msg,
-                    struct pam_response ** resp, void *appdata_ptr)
-{
-    int  i;
-    ngx_pam_authinfo  *ainfo;
-    struct pam_response  *response;
-
-    ainfo = (ngx_pam_authinfo *) appdata_ptr;
-    response = NULL;
-
-    /* parameter sanity checking */
-    if (!resp || !msg || !ainfo)
-        return PAM_CONV_ERR;
-
-    /* allocate memory to store response */
-    response = malloc(num_msg * sizeof(struct pam_response));
-    if (!response)
-        return PAM_CONV_ERR;
-
-    /* copy values */
-    for (i = 0; i < num_msg; i++) {
-        /* initialize to safe values */
-        response[i].resp_retcode = 0;
-        response[i].resp = 0;
-
-        /* select response based on requested output style */
-        switch (msg[i]->msg_style) {
-        case PAM_PROMPT_ECHO_ON:
-            /* on memory allocation failure, auth fails */
-            response[i].resp = strdup((const char *)ainfo->username.data);
-            break;
-        case PAM_PROMPT_ECHO_OFF:
-            response[i].resp = strdup((const char *)ainfo->password.data);
-            break;
-        case PAM_ERROR_MSG:
-            ngx_log_error(NGX_LOG_ERR, ainfo->log, 0,
-                          "PAM: \'%s\'.", msg[i]->msg);
-            break;
-        case PAM_TEXT_INFO:
-            ngx_log_error(NGX_LOG_INFO, ainfo->log, 0,
-                          "PAM: \'%s\'.", msg[i]->msg);
-            break;
-        default:
-            free_resp(i, response);
-            return PAM_CONV_ERR;
-        }
-    }
-    /* everything okay, set PAM response values */
-    *resp = response;
-    return PAM_SUCCESS;
-}
-
-static ngx_int_t
-ngx_http_auth_pam_handler(ngx_http_request_t *r)
-{
-    ngx_int_t  rc;
-    ngx_http_auth_pam_ctx_t  *ctx;
-    ngx_http_auth_pam_loc_conf_t  *alcf;
-
-    alcf = ngx_http_get_module_loc_conf(r, ngx_http_auth_pam_module);
-
-    if (alcf->realm.len == 0) {
-        return NGX_DECLINED;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_auth_pam_module);
-
-    if (ctx) {
-        return ngx_http_auth_pam_authenticate(r, ctx, &ctx->passwd, alcf);
-    }
-
-    /* Decode http auth user and passwd, leaving values on the request */
-    rc = ngx_http_auth_basic_user(r);
-
-    if (rc == NGX_DECLINED) {
-        return ngx_http_auth_pam_set_realm(r, &alcf->realm);
-    }
-
-    if (rc == NGX_ERROR) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    /* Check user & password using PAM */
-    return ngx_http_auth_pam_authenticate(r, ctx, &ctx->passwd, alcf);
-}
-
-/**
- * create a key value pair from the given key and value string
- */
-static void set_to_pam_env(pam_handle_t *pamh, ngx_http_request_t *r,
-                           char *key, char *value)
-{
-        if (key != NULL && value != NULL) {
-                size_t size = strlen(key) + strlen(value) + 1 * sizeof(char);
-                char *key_value_pair = ngx_palloc(r->pool, size);
-                sprintf(key_value_pair, "%s=%s", key, value);
-
-                pam_putenv(pamh, key_value_pair);
-        }
-}
-
-/**
- * creates a '\0' terminated string from the given ngx_str_t
- *
- * @param source nginx string structure with data and length
- * @param pool pool of the request used for memory allocation
- */
-static char* ngx_strncpy_s(ngx_str_t source, ngx_pool_t *pool)
-{
-        // allocate memory in pool
-        char* destination = ngx_palloc(pool, source.len + 1);
-        strncpy(destination, (char *) source.data, source.len);
-        // add null terminator
-        destination[source.len] = '\0';
-        return destination;
-}
-
-/**
- * enrich pam environment with request parameters
- */
-static void add_request_info_to_pam_env(pam_handle_t *pamh,
-                                        ngx_http_request_t *r)
-{
-        char *request_info = ngx_strncpy_s(r->request_line, r->pool);
-        char *host_info = ngx_strncpy_s(r->headers_in.host->value, r->pool);
-
-        set_to_pam_env(pamh, r, "REQUEST", request_info);
-        set_to_pam_env(pamh, r, "HOST", host_info);
-}
-
-static ngx_int_t
-ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
-                               ngx_http_auth_pam_ctx_t *ctx, ngx_str_t *passwd,
-                               void *conf)
-{
-    ngx_int_t   rc;
-    ngx_http_auth_pam_loc_conf_t  *alcf;
-
-    ngx_pam_authinfo  ainfo;
-    struct pam_conv   conv_info;        /* PAM struct */
-    pam_handle_t      *pamh;
-    u_char            *service_name;
-
-    alcf = conf;
-
-    size_t   len;
-    u_char  *uname_buf, *p;
-
-    /**
-     * Get username and password, note that r->headers_in.user contains the
-     * string 'user:pass', so we need to copy the username
-     **/
-    for (len = 0; len < r->headers_in.user.len; len++) {
-        if (r->headers_in.user.data[len] == ':') {
-            break;
-        }
-    }
-    uname_buf = ngx_palloc(r->pool, len+1);
-    if (uname_buf == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-    p = ngx_cpymem(uname_buf, r->headers_in.user.data , len);
-    *p ='\0';
-
-    ainfo.username.data = uname_buf;
-    ainfo.username.len  = len;
-
-    ainfo.password.data = r->headers_in.passwd.data;
-    ainfo.password.len  = r->headers_in.passwd.len;
-
-    ainfo.log = r->connection->log;
-
-    conv_info.conv = &ngx_auth_pam_talker;
-    conv_info.appdata_ptr = (void *) &ainfo;
-
-    pamh = NULL;
-
-    /* Initialize PAM */
-    if (alcf->service_name.data == NULL) {
-        service_name = (u_char *) NGX_PAM_SERVICE_NAME;
-    } else {
-        service_name = alcf->service_name.data;
-    }
-    if ((rc = pam_start((const char *) service_name,
-                        (const char *) ainfo.username.data,
-                        &conv_info,
-                        &pamh)) != PAM_SUCCESS) {
-        ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
-                      "PAM: Could not start pam service: %s",
-                      pam_strerror(pamh, rc));
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    /* send client IP address to PAM */
-    char *client_ip_addr = ngx_strncpy_s(r->connection->addr_text, r->pool);
-    if ((rc = pam_set_item(pamh, PAM_RHOST, client_ip_addr)) != PAM_SUCCESS) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                      "PAM: Could not set item PAM_RHOST: %s",
-                      pam_strerror(pamh, rc));
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-  }
-
-    if (alcf->set_pam_env) {
-        add_request_info_to_pam_env(pamh, r);
-    }
-
-    /* try to authenticate user, log error on failure */
-    if ((rc = pam_authenticate(pamh,
-                               PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "PAM: user '%s' - not authenticated: %s",
-                      ainfo.username.data, pam_strerror(pamh, rc));
-        pam_end(pamh, PAM_SUCCESS);
-        return ngx_http_auth_pam_set_realm(r, &alcf->realm);
-    }   /* endif authenticate */
-
-    /* check that the account is healthy */
-    if ((rc = pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "PAM: user '%s' - invalid account: %s",
-                      ainfo.username.data, pam_strerror(pamh, rc));
-        pam_end(pamh, PAM_SUCCESS);
-        return ngx_http_auth_pam_set_realm(r, &alcf->realm);
-    }
-
-    pam_end(pamh, PAM_SUCCESS);
-    return NGX_OK;
-}
-
-static ngx_int_t
-ngx_http_auth_pam_set_realm(ngx_http_request_t *r, ngx_str_t *realm)
-{
-    r->headers_out.www_authenticate = ngx_list_push(&r->headers_out.headers);
-    if (r->headers_out.www_authenticate == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    r->headers_out.www_authenticate->hash = 1;
-    r->headers_out.www_authenticate->key.len = sizeof("WWW-Authenticate") - 1;
-    r->headers_out.www_authenticate->key.data = (u_char *) "WWW-Authenticate";
-    r->headers_out.www_authenticate->value = *realm;
-
-    return NGX_HTTP_UNAUTHORIZED;
-}
-
-static void *
-ngx_http_auth_pam_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_http_auth_pam_loc_conf_t *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_auth_pam_loc_conf_t));
-    if (conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    /* Strings are already NULL, but the flags have to be marked as unset */
-    conf->set_pam_env = NGX_CONF_UNSET;
-
-    return conf;
-}
-
-static char *
-ngx_http_auth_pam_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_http_auth_pam_loc_conf_t  *prev = parent;
-    ngx_http_auth_pam_loc_conf_t  *conf = child;
-
-    if (conf->realm.data == NULL) {
-        conf->realm = prev->realm;
-    }
-
-    if (conf->service_name.data == NULL) {
-        conf->service_name = prev->service_name;
-    }
-
-    /* By default set_pam_env is off */
-    ngx_conf_merge_value(conf->set_pam_env, prev->set_pam_env, 0);
-
-    return NGX_CONF_OK;
-}
-
-static ngx_int_t
-ngx_http_auth_pam_init(ngx_conf_t *cf)
-{
-    ngx_http_handler_pt        *h;
-    ngx_http_core_main_conf_t  *cmcf;
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    h = ngx_array_push(&cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    *h = ngx_http_auth_pam_handler;
-
-    return NGX_OK;
-}
-
-static char *
-ngx_http_auth_pam(ngx_conf_t *cf, void *post, void *data)
-{
-    ngx_str_t  *realm = data;
-
-    size_t   len;
-    u_char  *basic, *p;
-
-    if (ngx_strcmp(realm->data, "off") == 0) {
-        realm->len = 0;
-        realm->data = (u_char *) "";
-
-        return NGX_CONF_OK;
-    }
-
-    len = sizeof("Basic realm=\"") - 1 + realm->len + 1;
-
-    basic = ngx_palloc(cf->pool, len);
-    if (basic == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    p = ngx_cpymem(basic, "Basic realm=\"", sizeof("Basic realm=\"") - 1);
-    p = ngx_cpymem(p, realm->data, realm->len);
-    *p = '"';
-
-    realm->len = len;
-    realm->data = basic;
-
-    return NGX_CONF_OK;
-}
-
-/* File: ngx_http_auth_pam_module.c */
diff --git a/debian/modules/http-cache-purge/CHANGES b/debian/modules/http-cache-purge/CHANGES
deleted file mode 100644
index ead3cdf..0000000
--- a/debian/modules/http-cache-purge/CHANGES
+++ /dev/null
@@ -1,66 +0,0 @@
-2014-12-23    VERSION 2.3
-    * Fix compatibility with nginx-1.7.9+.
-
-2014-12-02    VERSION 2.2
-    * Fix compatibility with nginx-1.7.8+.
-
-2014-05-19
-    * Fix build on Solaris with SunCC (Solaris Studio).
-      Reported by Jussi Sallinen.
-
-2013-03-19    VERSION 2.1
-    * When enabled, cache purge will now catch all requests with
-      PURGE (or specified) method, even if cache isn't configured.
-      Previously, it would pass such requests to the upstream.
-
-2012-12-07    VERSION 2.0
-    * Add alternative "same location" syntax.
-      From CloudFlare.
-
-2012-07-02    VERSION 1.6
-    * Fix compatibility with nginx-1.3.2+.
-      Reported by MagicBear, patch from Ruslan Ermilov.
-
-2011-12-20    VERSION 1.5
-    * Fix on-disk cache size calculation.
-      Since the initial release, recorded on-disk cache size was
-      decreased twice for purged content (once during cache purge
-      and once during subsequent cache update).
-      This resulted in recorded on-disk cache size being much
-      smaller than in reality, which could lead to on-disk cache
-      outgrowing defined "max_size" parameter.
-      Patch from Pyry Hakulinen.
-
-2011-10-05    VERSION 1.4
-    * Add AIO support.
-      Requested by Emin Hasanov.
-
-2011-05-03    VERSION 1.3
-    * Fix compatibility with nginx-1.0.1.
-      Reported by Sergey A. Osokin and Markus Linnala.
-
-2010-08-29
-    * Fix compatibility with nginx-0.8.0 and versions older than
-      nginx-0.7.60.
-
-2010-08-11    VERSION 1.2
-    * Fix various build scenarios with disabled upstream modules.
-      Reported by Johan Bergstroem.
-
-    * Add ability to purge content from SCGI's cache.
-      Requested by Johan Bergstroem.
-
-2010-06-08    VERSION 1.1
-    * Fix compatibility with nginx-0.8.40+.
-
-    * Add ability to purge content from uWSGI's cache.
-
-2010-01-10    VERSION 1.0
-    * Initial module release.
-
-2009-11-17
-    * Fix patch compatibility with nginx-0.8.11+.
-      Reported by Bing Ran.
-
-2009-08-11
-    * Initial patch release.
diff --git a/debian/modules/http-cache-purge/LICENSE b/debian/modules/http-cache-purge/LICENSE
deleted file mode 100644
index 0047538..0000000
--- a/debian/modules/http-cache-purge/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2009-2014, FRiCKLE <info@frickle.com>
-Copyright (c) 2009-2014, Piotr Sikora <piotr.sikora@frickle.com>
-All rights reserved.
-
-This project was fully funded by yo.se.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/http-cache-purge/README.md b/debian/modules/http-cache-purge/README.md
deleted file mode 100644
index 3b42e32..0000000
--- a/debian/modules/http-cache-purge/README.md
+++ /dev/null
@@ -1,171 +0,0 @@
-About
-=====
-`ngx_cache_purge` is `nginx` module which adds ability to purge content from
-`FastCGI`, `proxy`, `SCGI` and `uWSGI` caches.
-
-
-Sponsors
-========
-Work on the original patch was fully funded by [yo.se](http://yo.se).
-
-
-Status
-======
-This module is production-ready.
-
-
-Configuration directives (same location syntax)
-===============================================
-fastcgi_cache_purge
--------------------
-* **syntax**: `fastcgi_cache_purge on|off|<method> [from all|<ip> [.. <ip>]]`
-* **default**: `none`
-* **context**: `http`, `server`, `location`
-
-Allow purging of selected pages from `FastCGI`'s cache.
-
-
-proxy_cache_purge
------------------
-* **syntax**: `proxy_cache_purge on|off|<method> [from all|<ip> [.. <ip>]]`
-* **default**: `none`
-* **context**: `http`, `server`, `location`
-
-Allow purging of selected pages from `proxy`'s cache.
-
-
-scgi_cache_purge
-----------------
-* **syntax**: `scgi_cache_purge on|off|<method> [from all|<ip> [.. <ip>]]`
-* **default**: `none`
-* **context**: `http`, `server`, `location`
-
-Allow purging of selected pages from `SCGI`'s cache.
-
-
-uwsgi_cache_purge
------------------
-* **syntax**: `uwsgi_cache_purge on|off|<method> [from all|<ip> [.. <ip>]]`
-* **default**: `none`
-* **context**: `http`, `server`, `location`
-
-Allow purging of selected pages from `uWSGI`'s cache.
-
-
-Configuration directives (separate location syntax)
-===================================================
-fastcgi_cache_purge
--------------------
-* **syntax**: `fastcgi_cache_purge zone_name key`
-* **default**: `none`
-* **context**: `location`
-
-Sets area and key used for purging selected pages from `FastCGI`'s cache.
-
-
-proxy_cache_purge
------------------
-* **syntax**: `proxy_cache_purge zone_name key`
-* **default**: `none`
-* **context**: `location`
-
-Sets area and key used for purging selected pages from `proxy`'s cache.
-
-
-scgi_cache_purge
-----------------
-* **syntax**: `scgi_cache_purge zone_name key`
-* **default**: `none`
-* **context**: `location`
-
-Sets area and key used for purging selected pages from `SCGI`'s cache.
-
-
-uwsgi_cache_purge
------------------
-* **syntax**: `uwsgi_cache_purge zone_name key`
-* **default**: `none`
-* **context**: `location`
-
-Sets area and key used for purging selected pages from `uWSGI`'s cache.
-
-
-Sample configuration (same location syntax)
-===========================================
-    http {
-        proxy_cache_path  /tmp/cache  keys_zone=tmpcache:10m;
-
-        server {
-            location / {
-                proxy_pass         http://127.0.0.1:8000;
-                proxy_cache        tmpcache;
-                proxy_cache_key    $uri$is_args$args;
-                proxy_cache_purge  PURGE from 127.0.0.1;
-            }
-        }
-    }
-
-
-Sample configuration (separate location syntax)
-===============================================
-    http {
-        proxy_cache_path  /tmp/cache  keys_zone=tmpcache:10m;
-
-        server {
-            location / {
-                proxy_pass         http://127.0.0.1:8000;
-                proxy_cache        tmpcache;
-                proxy_cache_key    $uri$is_args$args;
-            }
-
-            location ~ /purge(/.*) {
-                allow              127.0.0.1;
-                deny               all;
-                proxy_cache_purge  tmpcache $1$is_args$args;
-            }
-        }
-    }
-
-
-Testing
-=======
-`ngx_cache_purge` comes with complete test suite based on [Test::Nginx](http://github.com/agentzh/test-nginx).
-
-You can test it by running:
-
-`$ prove`
-
-
-License
-=======
-    Copyright (c) 2009-2014, FRiCKLE <info@frickle.com>
-    Copyright (c) 2009-2014, Piotr Sikora <piotr.sikora@frickle.com>
-    All rights reserved.
-
-    This project was fully funded by yo.se.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-See also
-========
-- [ngx_slowfs_cache](http://github.com/FRiCKLE/ngx_slowfs_cache).
diff --git a/debian/modules/http-cache-purge/TODO.md b/debian/modules/http-cache-purge/TODO.md
deleted file mode 100644
index e279043..0000000
--- a/debian/modules/http-cache-purge/TODO.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Features that __will not__ be added to `ngx_cache_purge`:
-
-* Support for prefixed purges (`/purge/images/*`).  
-  Reason: Impossible with current cache implementation.
-
-* Support for wildcard/regex purges (`/purge/*.jpg`).  
-  Reason: Impossible with current cache implementation.
diff --git a/debian/modules/http-cache-purge/config b/debian/modules/http-cache-purge/config
deleted file mode 100644
index 34f42ec..0000000
--- a/debian/modules/http-cache-purge/config
+++ /dev/null
@@ -1,21 +0,0 @@
-if [ "$HTTP_PROXY" = "YES" ]; then
-    have=NGX_HTTP_PROXY . auto/have
-fi
-
-if [ "$HTTP_FASTCGI" = "YES" ]; then
-    have=NGX_HTTP_FASTCGI . auto/have
-fi
-
-if [ "$HTTP_SCGI" = "YES" ]; then
-    have=NGX_HTTP_SCGI . auto/have
-fi
-
-if [ "$HTTP_UWSGI" = "YES" ]; then
-    have=NGX_HTTP_UWSGI . auto/have
-fi
-
-ngx_addon_name=ngx_http_cache_purge_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_cache_purge_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_cache_purge_module.c"
-
-have=NGX_CACHE_PURGE_MODULE . auto/have
diff --git a/debian/modules/http-cache-purge/ngx_cache_purge_module.c b/debian/modules/http-cache-purge/ngx_cache_purge_module.c
deleted file mode 100644
index 62d3818..0000000
--- a/debian/modules/http-cache-purge/ngx_cache_purge_module.c
+++ /dev/null
@@ -1,1803 +0,0 @@
-/*
- * Copyright (c) 2009-2014, FRiCKLE <info@frickle.com>
- * Copyright (c) 2009-2014, Piotr Sikora <piotr.sikora@frickle.com>
- * All rights reserved.
- *
- * This project was fully funded by yo.se.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <nginx.h>
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-
-
-#ifndef nginx_version
-#error This module cannot be build against an unknown nginx version.
-#endif
-
-
-#if (NGX_HTTP_CACHE)
-
-typedef struct {
-    ngx_flag_t                    enable;
-    ngx_str_t                     method;
-    ngx_array_t                  *access;   /* array of ngx_in_cidr_t */
-    ngx_array_t                  *access6;  /* array of ngx_in6_cidr_t */
-} ngx_http_cache_purge_conf_t;
-
-typedef struct {
-# if (NGX_HTTP_FASTCGI)
-    ngx_http_cache_purge_conf_t   fastcgi;
-# endif /* NGX_HTTP_FASTCGI */
-# if (NGX_HTTP_PROXY)
-    ngx_http_cache_purge_conf_t   proxy;
-# endif /* NGX_HTTP_PROXY */
-# if (NGX_HTTP_SCGI)
-    ngx_http_cache_purge_conf_t   scgi;
-# endif /* NGX_HTTP_SCGI */
-# if (NGX_HTTP_UWSGI)
-    ngx_http_cache_purge_conf_t   uwsgi;
-# endif /* NGX_HTTP_UWSGI */
-
-    ngx_http_cache_purge_conf_t  *conf;
-    ngx_http_handler_pt           handler;
-    ngx_http_handler_pt           original_handler;
-} ngx_http_cache_purge_loc_conf_t;
-
-# if (NGX_HTTP_FASTCGI)
-char       *ngx_http_fastcgi_cache_purge_conf(ngx_conf_t *cf,
-                ngx_command_t *cmd, void *conf);
-ngx_int_t   ngx_http_fastcgi_cache_purge_handler(ngx_http_request_t *r);
-# endif /* NGX_HTTP_FASTCGI */
-
-# if (NGX_HTTP_PROXY)
-char       *ngx_http_proxy_cache_purge_conf(ngx_conf_t *cf,
-                ngx_command_t *cmd, void *conf);
-ngx_int_t   ngx_http_proxy_cache_purge_handler(ngx_http_request_t *r);
-# endif /* NGX_HTTP_PROXY */
-
-# if (NGX_HTTP_SCGI)
-char       *ngx_http_scgi_cache_purge_conf(ngx_conf_t *cf,
-                ngx_command_t *cmd, void *conf);
-ngx_int_t   ngx_http_scgi_cache_purge_handler(ngx_http_request_t *r);
-# endif /* NGX_HTTP_SCGI */
-
-# if (NGX_HTTP_UWSGI)
-char       *ngx_http_uwsgi_cache_purge_conf(ngx_conf_t *cf,
-                ngx_command_t *cmd, void *conf);
-ngx_int_t   ngx_http_uwsgi_cache_purge_handler(ngx_http_request_t *r);
-# endif /* NGX_HTTP_UWSGI */
-
-ngx_int_t   ngx_http_cache_purge_access_handler(ngx_http_request_t *r);
-ngx_int_t   ngx_http_cache_purge_access(ngx_array_t *a, ngx_array_t *a6,
-    struct sockaddr *s);
-
-ngx_int_t   ngx_http_cache_purge_send_response(ngx_http_request_t *r);
-# if (nginx_version >= 1007009)
-ngx_int_t   ngx_http_cache_purge_cache_get(ngx_http_request_t *r,
-    ngx_http_upstream_t *u, ngx_http_file_cache_t **cache);
-# endif /* nginx_version >= 1007009 */
-ngx_int_t   ngx_http_cache_purge_init(ngx_http_request_t *r,
-    ngx_http_file_cache_t *cache, ngx_http_complex_value_t *cache_key);
-void        ngx_http_cache_purge_handler(ngx_http_request_t *r);
-
-ngx_int_t   ngx_http_file_cache_purge(ngx_http_request_t *r);
-
-char       *ngx_http_cache_purge_conf(ngx_conf_t *cf,
-    ngx_http_cache_purge_conf_t *cpcf);
-
-void       *ngx_http_cache_purge_create_loc_conf(ngx_conf_t *cf);
-char       *ngx_http_cache_purge_merge_loc_conf(ngx_conf_t *cf,
-    void *parent, void *child);
-
-static ngx_command_t  ngx_http_cache_purge_module_commands[] = {
-
-# if (NGX_HTTP_FASTCGI)
-    { ngx_string("fastcgi_cache_purge"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_http_fastcgi_cache_purge_conf,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-# endif /* NGX_HTTP_FASTCGI */
-
-# if (NGX_HTTP_PROXY)
-    { ngx_string("proxy_cache_purge"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_http_proxy_cache_purge_conf,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-# endif /* NGX_HTTP_PROXY */
-
-# if (NGX_HTTP_SCGI)
-    { ngx_string("scgi_cache_purge"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_http_scgi_cache_purge_conf,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-# endif /* NGX_HTTP_SCGI */
-
-# if (NGX_HTTP_UWSGI)
-    { ngx_string("uwsgi_cache_purge"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_http_uwsgi_cache_purge_conf,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-# endif /* NGX_HTTP_UWSGI */
-
-      ngx_null_command
-};
-
-static ngx_http_module_t  ngx_http_cache_purge_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    NULL,                                  /* postconfiguration */
-
-    NULL,                                  /* create main configuration */
-    NULL,                                  /* init main configuration */
-
-    NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
-
-    ngx_http_cache_purge_create_loc_conf,  /* create location configuration */
-    ngx_http_cache_purge_merge_loc_conf    /* merge location configuration */
-};
-
-ngx_module_t  ngx_http_cache_purge_module = {
-    NGX_MODULE_V1,
-    &ngx_http_cache_purge_module_ctx,      /* module context */
-    ngx_http_cache_purge_module_commands,  /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-static char ngx_http_cache_purge_success_page_top[] =
-"<html>" CRLF
-"<head><title>Successful purge</title></head>" CRLF
-"<body bgcolor=\"white\">" CRLF
-"<center><h1>Successful purge</h1>" CRLF
-;
-
-static char ngx_http_cache_purge_success_page_tail[] =
-CRLF "</center>" CRLF
-"<hr><center>" NGINX_VER "</center>" CRLF
-"</body>" CRLF
-"</html>" CRLF
-;
-
-# if (NGX_HTTP_FASTCGI)
-extern ngx_module_t  ngx_http_fastcgi_module;
-
-#  if (nginx_version >= 1007009)
-
-typedef struct {
-    ngx_array_t                    caches;  /* ngx_http_file_cache_t * */
-} ngx_http_fastcgi_main_conf_t;
-
-#  endif /* nginx_version >= 1007009 */
-
-#  if (nginx_version >= 1007008)
-
-typedef struct {
-    ngx_array_t                   *flushes;
-    ngx_array_t                   *lengths;
-    ngx_array_t                   *values;
-    ngx_uint_t                     number;
-    ngx_hash_t                     hash;
-} ngx_http_fastcgi_params_t;
-
-#  endif /* nginx_version >= 1007008 */
-
-typedef struct {
-    ngx_http_upstream_conf_t       upstream;
-
-    ngx_str_t                      index;
-
-#  if (nginx_version >= 1007008)
-    ngx_http_fastcgi_params_t      params;
-    ngx_http_fastcgi_params_t      params_cache;
-#  else
-    ngx_array_t                   *flushes;
-    ngx_array_t                   *params_len;
-    ngx_array_t                   *params;
-#  endif /* nginx_version >= 1007008 */
-
-    ngx_array_t                   *params_source;
-    ngx_array_t                   *catch_stderr;
-
-    ngx_array_t                   *fastcgi_lengths;
-    ngx_array_t                   *fastcgi_values;
-
-#  if (nginx_version >= 8040) && (nginx_version < 1007008)
-    ngx_hash_t                     headers_hash;
-    ngx_uint_t                     header_params;
-#  endif /* nginx_version >= 8040 && nginx_version < 1007008 */
-
-#  if (nginx_version >= 1001004)
-    ngx_flag_t                     keep_conn;
-#  endif /* nginx_version >= 1001004 */
-
-    ngx_http_complex_value_t       cache_key;
-
-#  if (NGX_PCRE)
-    ngx_regex_t                   *split_regex;
-    ngx_str_t                      split_name;
-#  endif /* NGX_PCRE */
-} ngx_http_fastcgi_loc_conf_t;
-
-char *
-ngx_http_fastcgi_cache_purge_conf(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    ngx_http_compile_complex_value_t   ccv;
-    ngx_http_cache_purge_loc_conf_t   *cplcf;
-    ngx_http_core_loc_conf_t          *clcf;
-    ngx_http_fastcgi_loc_conf_t       *flcf;
-    ngx_str_t                         *value;
-#  if (nginx_version >= 1007009)
-    ngx_http_complex_value_t           cv;
-#  endif /* nginx_version >= 1007009 */
-
-    cplcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_cache_purge_module);
-
-    /* check for duplicates / collisions */
-    if (cplcf->fastcgi.enable != NGX_CONF_UNSET) {
-        return "is duplicate";
-    }
-
-    if (cf->args->nelts != 3) {
-        return ngx_http_cache_purge_conf(cf, &cplcf->fastcgi);
-    }
-
-    if (cf->cmd_type & (NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF)) {
-        return "(separate location syntax) is not allowed here";
-    }
-
-    flcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_fastcgi_module);
-
-#  if (nginx_version >= 1007009)
-    if (flcf->upstream.cache > 0)
-#  else
-    if (flcf->upstream.cache != NGX_CONF_UNSET_PTR
-        && flcf->upstream.cache != NULL)
-#  endif /* nginx_version >= 1007009 */
-    {
-        return "is incompatible with \"fastcgi_cache\"";
-    }
-
-    if (flcf->upstream.upstream || flcf->fastcgi_lengths) {
-        return "is incompatible with \"fastcgi_pass\"";
-    }
-
-    if (flcf->upstream.store > 0
-#  if (nginx_version < 1007009)
-        || flcf->upstream.store_lengths
-#  endif /* nginx_version >= 1007009 */
-       )
-    {
-        return "is incompatible with \"fastcgi_store\"";
-    }
-
-    value = cf->args->elts;
-
-    /* set fastcgi_cache part */
-#  if (nginx_version >= 1007009)
-
-    flcf->upstream.cache = 1;
-
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value[1];
-    ccv.complex_value = &cv;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (cv.lengths != NULL) {
-
-        flcf->upstream.cache_value = ngx_palloc(cf->pool,
-                                             sizeof(ngx_http_complex_value_t));
-        if (flcf->upstream.cache_value == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        *flcf->upstream.cache_value = cv;
-
-    } else {
-
-        flcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
-                                                     &ngx_http_fastcgi_module);
-        if (flcf->upstream.cache_zone == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-#  else
-
-    flcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0,
-                                                 &ngx_http_fastcgi_module);
-    if (flcf->upstream.cache == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-#  endif /* nginx_version >= 1007009 */
-
-    /* set fastcgi_cache_key part */
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value[2];
-    ccv.complex_value = &flcf->cache_key;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    /* set handler */
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-
-    cplcf->fastcgi.enable = 0;
-    clcf->handler = ngx_http_fastcgi_cache_purge_handler;
-
-    return NGX_CONF_OK;
-}
-
-ngx_int_t
-ngx_http_fastcgi_cache_purge_handler(ngx_http_request_t *r)
-{
-    ngx_http_file_cache_t         *cache;
-    ngx_http_fastcgi_loc_conf_t   *flcf;
-#  if (nginx_version >= 1007009)
-    ngx_http_fastcgi_main_conf_t  *fmcf;
-    ngx_int_t                      rc;
-#  endif /* nginx_version >= 1007009 */
-
-    if (ngx_http_upstream_create(r) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module);
-
-    r->upstream->conf = &flcf->upstream;
-
-#  if (nginx_version >= 1007009)
-
-    fmcf = ngx_http_get_module_main_conf(r, ngx_http_fastcgi_module);
-
-    r->upstream->caches = &fmcf->caches;
-
-    rc = ngx_http_cache_purge_cache_get(r, r->upstream, &cache);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-#  else
-
-    cache = flcf->upstream.cache->data;
-
-#  endif /* nginx_version >= 1007009 */
-
-    if (ngx_http_cache_purge_init(r, cache, &flcf->cache_key) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-#  if (nginx_version >= 8011)
-    r->main->count++;
-#  endif
-
-    ngx_http_cache_purge_handler(r);
-
-    return NGX_DONE;
-}
-# endif /* NGX_HTTP_FASTCGI */
-
-# if (NGX_HTTP_PROXY)
-extern ngx_module_t  ngx_http_proxy_module;
-
-typedef struct {
-    ngx_str_t                      key_start;
-    ngx_str_t                      schema;
-    ngx_str_t                      host_header;
-    ngx_str_t                      port;
-    ngx_str_t                      uri;
-} ngx_http_proxy_vars_t;
-
-#  if (nginx_version >= 1007009)
-
-typedef struct {
-    ngx_array_t                    caches;  /* ngx_http_file_cache_t * */
-} ngx_http_proxy_main_conf_t;
-
-#  endif /* nginx_version >= 1007009 */
-
-#  if (nginx_version >= 1007008)
-
-typedef struct {
-    ngx_array_t                   *flushes;
-    ngx_array_t                   *lengths;
-    ngx_array_t                   *values;
-    ngx_hash_t                     hash;
-} ngx_http_proxy_headers_t;
-
-#  endif /* nginx_version >= 1007008 */
-
-typedef struct {
-    ngx_http_upstream_conf_t       upstream;
-
-#  if (nginx_version >= 1007008)
-    ngx_array_t                   *body_flushes;
-    ngx_array_t                   *body_lengths;
-    ngx_array_t                   *body_values;
-    ngx_str_t                      body_source;
-
-    ngx_http_proxy_headers_t       headers;
-    ngx_http_proxy_headers_t       headers_cache;
-#  else
-    ngx_array_t                   *flushes;
-    ngx_array_t                   *body_set_len;
-    ngx_array_t                   *body_set;
-    ngx_array_t                   *headers_set_len;
-    ngx_array_t                   *headers_set;
-    ngx_hash_t                     headers_set_hash;
-#  endif /* nginx_version >= 1007008 */
-
-    ngx_array_t                   *headers_source;
-#  if (nginx_version < 8040)
-    ngx_array_t                   *headers_names;
-#  endif /* nginx_version < 8040 */
-
-    ngx_array_t                   *proxy_lengths;
-    ngx_array_t                   *proxy_values;
-
-    ngx_array_t                   *redirects;
-#  if (nginx_version >= 1001015)
-    ngx_array_t                   *cookie_domains;
-    ngx_array_t                   *cookie_paths;
-#  endif /* nginx_version >= 1001015 */
-
-#  if (nginx_version < 1007008)
-    ngx_str_t                      body_source;
-#  endif /* nginx_version < 1007008 */
-
-    ngx_str_t                      method;
-    ngx_str_t                      location;
-    ngx_str_t                      url;
-
-    ngx_http_complex_value_t       cache_key;
-
-    ngx_http_proxy_vars_t          vars;
-
-    ngx_flag_t                     redirect;
-
-#  if (nginx_version >= 1001004)
-    ngx_uint_t                     http_version;
-#  endif /* nginx_version >= 1001004 */
-
-    ngx_uint_t                     headers_hash_max_size;
-    ngx_uint_t                     headers_hash_bucket_size;
-
-#  if (NGX_HTTP_SSL)
-#    if (nginx_version >= 1005006)
-    ngx_uint_t                     ssl;
-    ngx_uint_t                     ssl_protocols;
-    ngx_str_t                      ssl_ciphers;
-#    endif /* nginx_version >= 1005006 */
-#    if (nginx_version >= 1007000)
-    ngx_uint_t                     ssl_verify_depth;
-    ngx_str_t                      ssl_trusted_certificate;
-    ngx_str_t                      ssl_crl;
-#    endif /* nginx_version >= 1007000 */
-#    if (nginx_version >= 1007008)
-    ngx_str_t                      ssl_certificate;
-    ngx_str_t                      ssl_certificate_key;
-    ngx_array_t                   *ssl_passwords;
-#    endif /* nginx_version >= 1007008 */
-#  endif
-} ngx_http_proxy_loc_conf_t;
-
-char *
-ngx_http_proxy_cache_purge_conf(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_compile_complex_value_t   ccv;
-    ngx_http_cache_purge_loc_conf_t   *cplcf;
-    ngx_http_core_loc_conf_t          *clcf;
-    ngx_http_proxy_loc_conf_t         *plcf;
-    ngx_str_t                         *value;
-#  if (nginx_version >= 1007009)
-    ngx_http_complex_value_t           cv;
-#  endif /* nginx_version >= 1007009 */
-
-    cplcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_cache_purge_module);
-
-    /* check for duplicates / collisions */
-    if (cplcf->proxy.enable != NGX_CONF_UNSET) {
-        return "is duplicate";
-    }
-
-    if (cf->args->nelts != 3) {
-        return ngx_http_cache_purge_conf(cf, &cplcf->proxy);
-    }
-
-    if (cf->cmd_type & (NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF)) {
-        return "(separate location syntax) is not allowed here";
-    }
-
-    plcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_proxy_module);
-
-#  if (nginx_version >= 1007009)
-    if (plcf->upstream.cache > 0)
-#  else
-    if (plcf->upstream.cache != NGX_CONF_UNSET_PTR
-        && plcf->upstream.cache != NULL)
-#  endif /* nginx_version >= 1007009 */
-    {
-        return "is incompatible with \"proxy_cache\"";
-    }
-
-    if (plcf->upstream.upstream || plcf->proxy_lengths) {
-        return "is incompatible with \"proxy_pass\"";
-    }
-
-    if (plcf->upstream.store > 0
-#  if (nginx_version < 1007009)
-        || plcf->upstream.store_lengths
-#  endif /* nginx_version >= 1007009 */
-       )
-    {
-        return "is incompatible with \"proxy_store\"";
-    }
-
-    value = cf->args->elts;
-
-    /* set proxy_cache part */
-#  if (nginx_version >= 1007009)
-
-    plcf->upstream.cache = 1;
-
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value[1];
-    ccv.complex_value = &cv;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (cv.lengths != NULL) {
-
-        plcf->upstream.cache_value = ngx_palloc(cf->pool,
-                                             sizeof(ngx_http_complex_value_t));
-        if (plcf->upstream.cache_value == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        *plcf->upstream.cache_value = cv;
-
-    } else {
-
-        plcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
-                                                       &ngx_http_proxy_module);
-        if (plcf->upstream.cache_zone == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-#  else
-
-    plcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0,
-                                                 &ngx_http_proxy_module);
-    if (plcf->upstream.cache == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-#  endif /* nginx_version >= 1007009 */
-
-    /* set proxy_cache_key part */
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value[2];
-    ccv.complex_value = &plcf->cache_key;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    /* set handler */
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-
-    cplcf->proxy.enable = 0;
-    clcf->handler = ngx_http_proxy_cache_purge_handler;
-
-    return NGX_CONF_OK;
-}
-
-ngx_int_t
-ngx_http_proxy_cache_purge_handler(ngx_http_request_t *r)
-{
-    ngx_http_file_cache_t       *cache;
-    ngx_http_proxy_loc_conf_t   *plcf;
-#  if (nginx_version >= 1007009)
-    ngx_http_proxy_main_conf_t  *pmcf;
-    ngx_int_t                    rc;
-#  endif /* nginx_version >= 1007009 */
-
-    if (ngx_http_upstream_create(r) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
-
-    r->upstream->conf = &plcf->upstream;
-
-#  if (nginx_version >= 1007009)
-
-    pmcf = ngx_http_get_module_main_conf(r, ngx_http_proxy_module);
-
-    r->upstream->caches = &pmcf->caches;
-
-    rc = ngx_http_cache_purge_cache_get(r, r->upstream, &cache);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-#  else
-
-    cache = plcf->upstream.cache->data;
-
-#  endif /* nginx_version >= 1007009 */
-
-    if (ngx_http_cache_purge_init(r, cache, &plcf->cache_key) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-#  if (nginx_version >= 8011)
-    r->main->count++;
-#  endif
-
-    ngx_http_cache_purge_handler(r);
-
-    return NGX_DONE;
-}
-# endif /* NGX_HTTP_PROXY */
-
-# if (NGX_HTTP_SCGI)
-extern ngx_module_t  ngx_http_scgi_module;
-
-#  if (nginx_version >= 1007009)
-
-typedef struct {
-    ngx_array_t                caches;  /* ngx_http_file_cache_t * */
-} ngx_http_scgi_main_conf_t;
-
-#  endif /* nginx_version >= 1007009 */
-
-#  if (nginx_version >= 1007008)
-
-typedef struct {
-    ngx_array_t               *flushes;
-    ngx_array_t               *lengths;
-    ngx_array_t               *values;
-    ngx_uint_t                 number;
-    ngx_hash_t                 hash;
-} ngx_http_scgi_params_t;
-
-#  endif /* nginx_version >= 1007008 */
-
-typedef struct {
-    ngx_http_upstream_conf_t   upstream;
-
-#  if (nginx_version >= 1007008)
-    ngx_http_scgi_params_t     params;
-    ngx_http_scgi_params_t     params_cache;
-    ngx_array_t               *params_source;
-#  else
-    ngx_array_t               *flushes;
-    ngx_array_t               *params_len;
-    ngx_array_t               *params;
-    ngx_array_t               *params_source;
-
-    ngx_hash_t                 headers_hash;
-    ngx_uint_t                 header_params;
-#  endif /* nginx_version >= 1007008 */
-
-    ngx_array_t               *scgi_lengths;
-    ngx_array_t               *scgi_values;
-
-    ngx_http_complex_value_t   cache_key;
-} ngx_http_scgi_loc_conf_t;
-
-char *
-ngx_http_scgi_cache_purge_conf(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_compile_complex_value_t   ccv;
-    ngx_http_cache_purge_loc_conf_t   *cplcf;
-    ngx_http_core_loc_conf_t          *clcf;
-    ngx_http_scgi_loc_conf_t          *slcf;
-    ngx_str_t                         *value;
-#  if (nginx_version >= 1007009)
-    ngx_http_complex_value_t           cv;
-#  endif /* nginx_version >= 1007009 */
-
-    cplcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_cache_purge_module);
-
-    /* check for duplicates / collisions */
-    if (cplcf->scgi.enable != NGX_CONF_UNSET) {
-        return "is duplicate";
-    }
-
-    if (cf->args->nelts != 3) {
-        return ngx_http_cache_purge_conf(cf, &cplcf->scgi);
-    }
-
-    if (cf->cmd_type & (NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF)) {
-        return "(separate location syntax) is not allowed here";
-    }
-
-    slcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_scgi_module);
-
-#  if (nginx_version >= 1007009)
-    if (slcf->upstream.cache > 0)
-#  else
-    if (slcf->upstream.cache != NGX_CONF_UNSET_PTR
-        && slcf->upstream.cache != NULL)
-#  endif /* nginx_version >= 1007009 */
-    {
-        return "is incompatible with \"scgi_cache\"";
-    }
-
-    if (slcf->upstream.upstream || slcf->scgi_lengths) {
-        return "is incompatible with \"scgi_pass\"";
-    }
-
-    if (slcf->upstream.store > 0
-#  if (nginx_version < 1007009)
-        || slcf->upstream.store_lengths
-#  endif /* nginx_version >= 1007009 */
-       )
-    {
-        return "is incompatible with \"scgi_store\"";
-    }
-
-    value = cf->args->elts;
-
-    /* set scgi_cache part */
-#  if (nginx_version >= 1007009)
-
-    slcf->upstream.cache = 1;
-
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value[1];
-    ccv.complex_value = &cv;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (cv.lengths != NULL) {
-
-        slcf->upstream.cache_value = ngx_palloc(cf->pool,
-                                             sizeof(ngx_http_complex_value_t));
-        if (slcf->upstream.cache_value == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        *slcf->upstream.cache_value = cv;
-
-    } else {
-
-        slcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
-                                                        &ngx_http_scgi_module);
-        if (slcf->upstream.cache_zone == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-#  else
-
-    slcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0,
-                                                 &ngx_http_scgi_module);
-    if (slcf->upstream.cache == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-#  endif /* nginx_version >= 1007009 */
-
-    /* set scgi_cache_key part */
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value[2];
-    ccv.complex_value = &slcf->cache_key;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    /* set handler */
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-
-    cplcf->scgi.enable = 0;
-    clcf->handler = ngx_http_scgi_cache_purge_handler;
-
-    return NGX_CONF_OK;
-}
-
-ngx_int_t
-ngx_http_scgi_cache_purge_handler(ngx_http_request_t *r)
-{
-    ngx_http_file_cache_t      *cache;
-    ngx_http_scgi_loc_conf_t   *slcf;
-#  if (nginx_version >= 1007009)
-    ngx_http_scgi_main_conf_t  *smcf;
-    ngx_int_t                   rc;
-#  endif /* nginx_version >= 1007009 */
-
-    if (ngx_http_upstream_create(r) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_http_scgi_module);
-
-    r->upstream->conf = &slcf->upstream;
-
-#  if (nginx_version >= 1007009)
-
-    smcf = ngx_http_get_module_main_conf(r, ngx_http_scgi_module);
-
-    r->upstream->caches = &smcf->caches;
-
-    rc = ngx_http_cache_purge_cache_get(r, r->upstream, &cache);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-#  else
-
-    cache = slcf->upstream.cache->data;
-
-#  endif /* nginx_version >= 1007009 */
-
-    if (ngx_http_cache_purge_init(r, cache, &slcf->cache_key) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-#  if (nginx_version >= 8011)
-    r->main->count++;
-#  endif
-
-    ngx_http_cache_purge_handler(r);
-
-    return NGX_DONE;
-}
-# endif /* NGX_HTTP_SCGI */
-
-# if (NGX_HTTP_UWSGI)
-extern ngx_module_t  ngx_http_uwsgi_module;
-
-#  if (nginx_version >= 1007009)
-
-typedef struct {
-    ngx_array_t                caches;  /* ngx_http_file_cache_t * */
-} ngx_http_uwsgi_main_conf_t;
-
-#  endif /* nginx_version >= 1007009 */
-
-#  if (nginx_version >= 1007008)
-
-typedef struct {
-    ngx_array_t               *flushes;
-    ngx_array_t               *lengths;
-    ngx_array_t               *values;
-    ngx_uint_t                 number;
-    ngx_hash_t                 hash;
-} ngx_http_uwsgi_params_t;
-
-#  endif /* nginx_version >= 1007008 */
-
-typedef struct {
-    ngx_http_upstream_conf_t   upstream;
-
-#  if (nginx_version >= 1007008)
-    ngx_http_uwsgi_params_t    params;
-    ngx_http_uwsgi_params_t    params_cache;
-    ngx_array_t               *params_source;
-#  else
-    ngx_array_t               *flushes;
-    ngx_array_t               *params_len;
-    ngx_array_t               *params;
-    ngx_array_t               *params_source;
-
-    ngx_hash_t                 headers_hash;
-    ngx_uint_t                 header_params;
-#  endif /* nginx_version >= 1007008 */
-
-    ngx_array_t               *uwsgi_lengths;
-    ngx_array_t               *uwsgi_values;
-
-    ngx_http_complex_value_t   cache_key;
-
-    ngx_str_t                  uwsgi_string;
-
-    ngx_uint_t                 modifier1;
-    ngx_uint_t                 modifier2;
-
-#  if (NGX_HTTP_SSL)
-#    if (nginx_version >= 1005008)
-    ngx_uint_t                 ssl;
-    ngx_uint_t                 ssl_protocols;
-    ngx_str_t                  ssl_ciphers;
-#    endif /* nginx_version >= 1005008 */
-#    if (nginx_version >= 1007000)
-    ngx_uint_t                 ssl_verify_depth;
-    ngx_str_t                  ssl_trusted_certificate;
-    ngx_str_t                  ssl_crl;
-#    endif /* nginx_version >= 1007000 */
-#    if (nginx_version >= 1007008)
-    ngx_str_t                  ssl_certificate;
-    ngx_str_t                  ssl_certificate_key;
-    ngx_array_t               *ssl_passwords;
-#    endif /* nginx_version >= 1007008 */
-#  endif
-} ngx_http_uwsgi_loc_conf_t;
-
-char *
-ngx_http_uwsgi_cache_purge_conf(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_compile_complex_value_t   ccv;
-    ngx_http_cache_purge_loc_conf_t   *cplcf;
-    ngx_http_core_loc_conf_t          *clcf;
-    ngx_http_uwsgi_loc_conf_t         *ulcf;
-    ngx_str_t                         *value;
-#  if (nginx_version >= 1007009)
-    ngx_http_complex_value_t           cv;
-#  endif /* nginx_version >= 1007009 */
-
-    cplcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_cache_purge_module);
-
-    /* check for duplicates / collisions */
-    if (cplcf->uwsgi.enable != NGX_CONF_UNSET) {
-        return "is duplicate";
-    }
-
-    if (cf->args->nelts != 3) {
-        return ngx_http_cache_purge_conf(cf, &cplcf->uwsgi);
-    }
-
-    if (cf->cmd_type & (NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF)) {
-        return "(separate location syntax) is not allowed here";
-    }
-
-    ulcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_uwsgi_module);
-
-#  if (nginx_version >= 1007009)
-    if (ulcf->upstream.cache > 0)
-#  else
-    if (ulcf->upstream.cache != NGX_CONF_UNSET_PTR
-        && ulcf->upstream.cache != NULL)
-#  endif /* nginx_version >= 1007009 */
-    {
-        return "is incompatible with \"uwsgi_cache\"";
-    }
-
-    if (ulcf->upstream.upstream || ulcf->uwsgi_lengths) {
-        return "is incompatible with \"uwsgi_pass\"";
-    }
-
-    if (ulcf->upstream.store > 0
-#  if (nginx_version < 1007009)
-        || ulcf->upstream.store_lengths
-#  endif /* nginx_version >= 1007009 */
-       )
-    {
-        return "is incompatible with \"uwsgi_store\"";
-    }
-
-    value = cf->args->elts;
-
-    /* set uwsgi_cache part */
-#  if (nginx_version >= 1007009)
-
-    ulcf->upstream.cache = 1;
-
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value[1];
-    ccv.complex_value = &cv;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (cv.lengths != NULL) {
-
-        ulcf->upstream.cache_value = ngx_palloc(cf->pool,
-                                             sizeof(ngx_http_complex_value_t));
-        if (ulcf->upstream.cache_value == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        *ulcf->upstream.cache_value = cv;
-
-    } else {
-
-        ulcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
-                                                       &ngx_http_uwsgi_module);
-        if (ulcf->upstream.cache_zone == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-#  else
-
-    ulcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0,
-                                                 &ngx_http_uwsgi_module);
-    if (ulcf->upstream.cache == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-#  endif /* nginx_version >= 1007009 */
-
-    /* set uwsgi_cache_key part */
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value[2];
-    ccv.complex_value = &ulcf->cache_key;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    /* set handler */
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-
-    cplcf->uwsgi.enable = 0;
-    clcf->handler = ngx_http_uwsgi_cache_purge_handler;
-
-    return NGX_CONF_OK;
-}
-
-ngx_int_t
-ngx_http_uwsgi_cache_purge_handler(ngx_http_request_t *r)
-{
-    ngx_http_file_cache_t       *cache;
-    ngx_http_uwsgi_loc_conf_t   *ulcf;
-#  if (nginx_version >= 1007009)
-    ngx_http_uwsgi_main_conf_t  *umcf;
-    ngx_int_t                    rc;
-#  endif /* nginx_version >= 1007009 */
-
-    if (ngx_http_upstream_create(r) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    ulcf = ngx_http_get_module_loc_conf(r, ngx_http_uwsgi_module);
-
-    r->upstream->conf = &ulcf->upstream;
-
-#  if (nginx_version >= 1007009)
-
-    umcf = ngx_http_get_module_main_conf(r, ngx_http_uwsgi_module);
-
-    r->upstream->caches = &umcf->caches;
-
-    rc = ngx_http_cache_purge_cache_get(r, r->upstream, &cache);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-#  else
-
-    cache = ulcf->upstream.cache->data;
-
-#  endif /* nginx_version >= 1007009 */
-
-    if (ngx_http_cache_purge_init(r, cache, &ulcf->cache_key) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-#  if (nginx_version >= 8011)
-    r->main->count++;
-#  endif
-
-    ngx_http_cache_purge_handler(r);
-
-    return NGX_DONE;
-}
-# endif /* NGX_HTTP_UWSGI */
-
-ngx_int_t
-ngx_http_cache_purge_access_handler(ngx_http_request_t *r)
-{
-    ngx_http_cache_purge_loc_conf_t   *cplcf;
-
-    cplcf = ngx_http_get_module_loc_conf(r, ngx_http_cache_purge_module);
-
-    if (r->method_name.len != cplcf->conf->method.len
-        || (ngx_strncmp(r->method_name.data, cplcf->conf->method.data,
-                        r->method_name.len)))
-    {
-        return cplcf->original_handler(r);
-    }
-
-    if ((cplcf->conf->access || cplcf->conf->access6)
-         && ngx_http_cache_purge_access(cplcf->conf->access,
-                                        cplcf->conf->access6,
-                                        r->connection->sockaddr) != NGX_OK)
-    {
-        return NGX_HTTP_FORBIDDEN;
-    }
-
-    if (cplcf->handler == NULL) {
-        return NGX_HTTP_NOT_FOUND;
-    }
-
-    return cplcf->handler(r);
-}
-
-ngx_int_t
-ngx_http_cache_purge_access(ngx_array_t *access, ngx_array_t *access6,
-    struct sockaddr *s)
-{
-    in_addr_t         inaddr;
-    ngx_in_cidr_t    *a;
-    ngx_uint_t        i;
-# if (NGX_HAVE_INET6)
-    struct in6_addr  *inaddr6;
-    ngx_in6_cidr_t   *a6;
-    u_char           *p;
-    ngx_uint_t        n;
-# endif /* NGX_HAVE_INET6 */
-
-    switch (s->sa_family) {
-    case AF_INET:
-        if (access == NULL) {
-            return NGX_DECLINED;
-        }
-
-        inaddr = ((struct sockaddr_in *) s)->sin_addr.s_addr;
-
-# if (NGX_HAVE_INET6)
-    ipv4:
-# endif /* NGX_HAVE_INET6 */
-
-        a = access->elts;
-        for (i = 0; i < access->nelts; i++) {
-            if ((inaddr & a[i].mask) == a[i].addr) {
-                return NGX_OK;
-            }
-        }
-
-        return NGX_DECLINED;
-
-# if (NGX_HAVE_INET6)
-    case AF_INET6:
-        inaddr6 = &((struct sockaddr_in6 *) s)->sin6_addr;
-        p = inaddr6->s6_addr;
-
-        if (access && IN6_IS_ADDR_V4MAPPED(inaddr6)) {
-            inaddr = p[12] << 24;
-            inaddr += p[13] << 16;
-            inaddr += p[14] << 8;
-            inaddr += p[15];
-            inaddr = htonl(inaddr);
-
-            goto ipv4;
-        }
-
-        if (access6 == NULL) {
-            return NGX_DECLINED;
-        }
-
-        a6 = access6->elts;
-        for (i = 0; i < access6->nelts; i++) {
-            for (n = 0; n < 16; n++) {
-                if ((p[n] & a6[i].mask.s6_addr[n]) != a6[i].addr.s6_addr[n]) {
-                    goto next;
-                }
-            }
-
-            return NGX_OK;
-
-        next:
-            continue;
-        }
-
-        return NGX_DECLINED;
-# endif /* NGX_HAVE_INET6 */
-    }
-
-    return NGX_DECLINED;
-}
-
-ngx_int_t
-ngx_http_cache_purge_send_response(ngx_http_request_t *r)
-{
-    ngx_chain_t   out;
-    ngx_buf_t    *b;
-    ngx_str_t    *key;
-    ngx_int_t     rc;
-    size_t        len;
-
-    key = r->cache->keys.elts;
-
-    len = sizeof(ngx_http_cache_purge_success_page_top) - 1
-          + sizeof(ngx_http_cache_purge_success_page_tail) - 1
-          + sizeof("<br>Key : ") - 1 + sizeof(CRLF "<br>Path: ") - 1
-          + key[0].len + r->cache->file.name.len;
-
-    r->headers_out.content_type.len = sizeof("text/html") - 1;
-    r->headers_out.content_type.data = (u_char *) "text/html";
-    r->headers_out.status = NGX_HTTP_OK;
-    r->headers_out.content_length_n = len;
-
-    if (r->method == NGX_HTTP_HEAD) {
-        rc = ngx_http_send_header(r);
-        if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-            return rc;
-        }
-    }
-
-    b = ngx_create_temp_buf(r->pool, len);
-    if (b == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    out.buf = b;
-    out.next = NULL;
-
-    b->last = ngx_cpymem(b->last, ngx_http_cache_purge_success_page_top,
-                         sizeof(ngx_http_cache_purge_success_page_top) - 1);
-    b->last = ngx_cpymem(b->last, "<br>Key : ", sizeof("<br>Key : ") - 1);
-    b->last = ngx_cpymem(b->last, key[0].data, key[0].len);
-    b->last = ngx_cpymem(b->last, CRLF "<br>Path: ",
-                         sizeof(CRLF "<br>Path: ") - 1);
-    b->last = ngx_cpymem(b->last, r->cache->file.name.data,
-                         r->cache->file.name.len);
-    b->last = ngx_cpymem(b->last, ngx_http_cache_purge_success_page_tail,
-                         sizeof(ngx_http_cache_purge_success_page_tail) - 1);
-    b->last_buf = 1;
-
-    rc = ngx_http_send_header(r);
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-       return rc;
-    }
-
-    return ngx_http_output_filter(r, &out);
-}
-
-# if (nginx_version >= 1007009)
-
-/*
- * Based on: ngx_http_upstream.c/ngx_http_upstream_cache_get
- * Copyright (C) Igor Sysoev
- * Copyright (C) Nginx, Inc.
- */
-ngx_int_t
-ngx_http_cache_purge_cache_get(ngx_http_request_t *r, ngx_http_upstream_t *u,
-    ngx_http_file_cache_t **cache)
-{
-    ngx_str_t               *name, val;
-    ngx_uint_t               i;
-    ngx_http_file_cache_t  **caches;
-
-    if (u->conf->cache_zone) {
-        *cache = u->conf->cache_zone->data;
-        return NGX_OK;
-    }
-
-    if (ngx_http_complex_value(r, u->conf->cache_value, &val) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    if (val.len == 0
-        || (val.len == 3 && ngx_strncmp(val.data, "off", 3) == 0))
-    {
-        return NGX_DECLINED;
-    }
-
-    caches = u->caches->elts;
-
-    for (i = 0; i < u->caches->nelts; i++) {
-        name = &caches[i]->shm_zone->shm.name;
-
-        if (name->len == val.len
-            && ngx_strncmp(name->data, val.data, val.len) == 0)
-        {
-            *cache = caches[i];
-            return NGX_OK;
-        }
-    }
-
-    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                  "cache \"%V\" not found", &val);
-
-    return NGX_ERROR;
-}
-
-# endif /* nginx_version >= 1007009 */
-
-ngx_int_t
-ngx_http_cache_purge_init(ngx_http_request_t *r, ngx_http_file_cache_t *cache,
-    ngx_http_complex_value_t *cache_key)
-{
-    ngx_http_cache_t  *c;
-    ngx_str_t         *key;
-    ngx_int_t          rc;
-
-    rc = ngx_http_discard_request_body(r);
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    c = ngx_pcalloc(r->pool, sizeof(ngx_http_cache_t));
-    if (c == NULL) {
-        return NGX_ERROR;
-    }
-
-    rc = ngx_array_init(&c->keys, r->pool, 1, sizeof(ngx_str_t));
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    key = ngx_array_push(&c->keys);
-    if (key == NULL) {
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_complex_value(r, cache_key, key);
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    r->cache = c;
-    c->body_start = ngx_pagesize;
-    c->file_cache = cache;
-    c->file.log = r->connection->log;
-
-    ngx_http_file_cache_create_key(r);
-
-    return NGX_OK;
-}
-
-void
-ngx_http_cache_purge_handler(ngx_http_request_t *r)
-{
-    ngx_int_t  rc;
-
-#  if (NGX_HAVE_FILE_AIO)
-    if (r->aio) {
-        return;
-    }
-#  endif
-
-    rc = ngx_http_file_cache_purge(r);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http file cache purge: %i, \"%s\"",
-                   rc, r->cache->file.name.data);
-
-    switch (rc) {
-    case NGX_OK:
-        r->write_event_handler = ngx_http_request_empty_handler;
-        ngx_http_finalize_request(r, ngx_http_cache_purge_send_response(r));
-        return;
-    case NGX_DECLINED:
-        ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND);
-        return;
-#  if (NGX_HAVE_FILE_AIO)
-    case NGX_AGAIN:
-        r->write_event_handler = ngx_http_cache_purge_handler;
-        return;
-#  endif
-    default:
-        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-    }
-}
-
-ngx_int_t
-ngx_http_file_cache_purge(ngx_http_request_t *r)
-{
-    ngx_http_file_cache_t  *cache;
-    ngx_http_cache_t       *c;
-
-    switch (ngx_http_file_cache_open(r)) {
-    case NGX_OK:
-    case NGX_HTTP_CACHE_STALE:
-#  if (nginx_version >= 8001) \
-       || ((nginx_version < 8000) && (nginx_version >= 7060))
-    case NGX_HTTP_CACHE_UPDATING:
-#  endif
-        break;
-    case NGX_DECLINED:
-        return NGX_DECLINED;
-#  if (NGX_HAVE_FILE_AIO)
-    case NGX_AGAIN:
-        return NGX_AGAIN;
-#  endif
-    default:
-        return NGX_ERROR;
-    }
-
-    c = r->cache;
-    cache = c->file_cache;
-
-    /*
-     * delete file from disk but *keep* in-memory node,
-     * because other requests might still point to it.
-     */
-
-    ngx_shmtx_lock(&cache->shpool->mutex);
-
-    if (!c->node->exists) {
-        /* race between concurrent purges, backoff */
-        ngx_shmtx_unlock(&cache->shpool->mutex);
-        return NGX_DECLINED;
-    }
-
-#  if (nginx_version >= 1000001)
-    cache->sh->size -= c->node->fs_size;
-    c->node->fs_size = 0;
-#  else
-    cache->sh->size -= (c->node->length + cache->bsize - 1) / cache->bsize;
-    c->node->length = 0;
-#  endif
-
-    c->node->exists = 0;
-#  if (nginx_version >= 8001) \
-       || ((nginx_version < 8000) && (nginx_version >= 7060))
-    c->node->updating = 0;
-#  endif
-
-    ngx_shmtx_unlock(&cache->shpool->mutex);
-
-    if (ngx_delete_file(c->file.name.data) == NGX_FILE_ERROR) {
-        /* entry in error log is enough, don't notice client */
-        ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
-                      ngx_delete_file_n " \"%s\" failed", c->file.name.data);
-    }
-
-    /* file deleted from cache */
-    return NGX_OK;
-}
-
-char *
-ngx_http_cache_purge_conf(ngx_conf_t *cf, ngx_http_cache_purge_conf_t *cpcf)
-{
-    ngx_cidr_t       cidr;
-    ngx_in_cidr_t   *access;
-# if (NGX_HAVE_INET6)
-    ngx_in6_cidr_t  *access6;
-# endif /* NGX_HAVE_INET6 */
-    ngx_str_t       *value;
-    ngx_int_t        rc;
-    ngx_uint_t       i;
-
-    value = cf->args->elts;
-
-    if (ngx_strcmp(value[1].data, "off") == 0) {
-        cpcf->enable = 0;
-        return NGX_CONF_OK;
-
-    } else if (ngx_strcmp(value[1].data, "on") == 0) {
-        ngx_str_set(&cpcf->method, "PURGE");
-
-    } else {
-        cpcf->method = value[1];
-    }
-
-    if (cf->args->nelts < 4) {
-        cpcf->enable = 1;
-        return NGX_CONF_OK;
-    }
-
-    /* sanity check */
-    if (ngx_strcmp(value[2].data, "from") != 0) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid parameter \"%V\", expected"
-                           " \"from\" keyword", &value[2]);
-        return NGX_CONF_ERROR;
-    }
-
-    if (ngx_strcmp(value[3].data, "all") == 0) {
-        cpcf->enable = 1;
-        return NGX_CONF_OK;
-    }
-
-    for (i = 3; i < cf->args->nelts; i++) {
-        rc = ngx_ptocidr(&value[i], &cidr);
-
-        if (rc == NGX_ERROR) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid parameter \"%V\"", &value[i]);
-            return NGX_CONF_ERROR;
-        }
-
-        if (rc == NGX_DONE) {
-            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                               "low address bits of %V are meaningless",
-                               &value[i]);
-        }
-
-        switch (cidr.family) {
-        case AF_INET:
-            if (cpcf->access == NULL) {
-                cpcf->access = ngx_array_create(cf->pool, cf->args->nelts - 3,
-                                                sizeof(ngx_in_cidr_t));
-                if (cpcf->access == NULL) {
-                    return NGX_CONF_ERROR;
-                }
-            }
-
-            access = ngx_array_push(cpcf->access);
-            if (access == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            access->mask = cidr.u.in.mask;
-            access->addr = cidr.u.in.addr;
-
-            break;
-
-# if (NGX_HAVE_INET6)
-        case AF_INET6:
-            if (cpcf->access6 == NULL) {
-                cpcf->access6 = ngx_array_create(cf->pool, cf->args->nelts - 3,
-                                                 sizeof(ngx_in6_cidr_t));
-                if (cpcf->access6 == NULL) {
-                    return NGX_CONF_ERROR;
-                }
-            }
-
-            access6 = ngx_array_push(cpcf->access6);
-            if (access6 == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            access6->mask = cidr.u.in6.mask;
-            access6->addr = cidr.u.in6.addr;
-
-            break;
-# endif /* NGX_HAVE_INET6 */
-        }
-    }
-
-    cpcf->enable = 1;
-
-    return NGX_CONF_OK;
-}
-
-void
-ngx_http_cache_purge_merge_conf(ngx_http_cache_purge_conf_t *conf,
-    ngx_http_cache_purge_conf_t *prev)
-{
-    if (conf->enable == NGX_CONF_UNSET) {
-        if (prev->enable == 1) {
-            conf->enable = prev->enable;
-            conf->method = prev->method;
-            conf->access = prev->access;
-            conf->access6 = prev->access6;
-
-        } else {
-            conf->enable = 0;
-        }
-    }
-}
-
-void *
-ngx_http_cache_purge_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_http_cache_purge_loc_conf_t  *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_cache_purge_loc_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    /*
-     * set by ngx_pcalloc():
-     *
-     *     conf->*.method = { 0, NULL }
-     *     conf->*.access = NULL
-     *     conf->*.access6 = NULL
-     *     conf->handler = NULL
-     *     conf->original_handler = NULL
-     */
-
-# if (NGX_HTTP_FASTCGI)
-    conf->fastcgi.enable = NGX_CONF_UNSET;
-# endif /* NGX_HTTP_FASTCGI */
-# if (NGX_HTTP_PROXY)
-    conf->proxy.enable = NGX_CONF_UNSET;
-# endif /* NGX_HTTP_PROXY */
-# if (NGX_HTTP_SCGI)
-    conf->scgi.enable = NGX_CONF_UNSET;
-# endif /* NGX_HTTP_SCGI */
-# if (NGX_HTTP_UWSGI)
-    conf->uwsgi.enable = NGX_CONF_UNSET;
-# endif /* NGX_HTTP_UWSGI */
-
-    conf->conf = NGX_CONF_UNSET_PTR;
-
-    return conf;
-}
-
-char *
-ngx_http_cache_purge_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_http_cache_purge_loc_conf_t  *prev = parent;
-    ngx_http_cache_purge_loc_conf_t  *conf = child;
-    ngx_http_core_loc_conf_t         *clcf;
-# if (NGX_HTTP_FASTCGI)
-    ngx_http_fastcgi_loc_conf_t      *flcf;
-# endif /* NGX_HTTP_FASTCGI */
-# if (NGX_HTTP_PROXY)
-    ngx_http_proxy_loc_conf_t        *plcf;
-# endif /* NGX_HTTP_PROXY */
-# if (NGX_HTTP_SCGI)
-    ngx_http_scgi_loc_conf_t         *slcf;
-# endif /* NGX_HTTP_SCGI */
-# if (NGX_HTTP_UWSGI)
-    ngx_http_uwsgi_loc_conf_t        *ulcf;
-# endif /* NGX_HTTP_UWSGI */
-
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-
-# if (NGX_HTTP_FASTCGI)
-    ngx_http_cache_purge_merge_conf(&conf->fastcgi, &prev->fastcgi);
-
-    if (conf->fastcgi.enable && clcf->handler != NULL) {
-        flcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_fastcgi_module);
-
-        if (flcf->upstream.upstream || flcf->fastcgi_lengths) {
-            conf->conf = &conf->fastcgi;
-            conf->handler = flcf->upstream.cache
-                          ? ngx_http_fastcgi_cache_purge_handler : NULL;
-            conf->original_handler = clcf->handler;
-
-            clcf->handler = ngx_http_cache_purge_access_handler;
-
-            return NGX_CONF_OK;
-        }
-    }
-# endif /* NGX_HTTP_FASTCGI */
-
-# if (NGX_HTTP_PROXY)
-    ngx_http_cache_purge_merge_conf(&conf->proxy, &prev->proxy);
-
-    if (conf->proxy.enable && clcf->handler != NULL) {
-        plcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_proxy_module);
-
-        if (plcf->upstream.upstream || plcf->proxy_lengths) {
-            conf->conf = &conf->proxy;
-            conf->handler = plcf->upstream.cache
-                          ? ngx_http_proxy_cache_purge_handler : NULL;
-            conf->original_handler = clcf->handler;
-
-            clcf->handler = ngx_http_cache_purge_access_handler;
-
-            return NGX_CONF_OK;
-        }
-    }
-# endif /* NGX_HTTP_PROXY */
-
-# if (NGX_HTTP_SCGI)
-    ngx_http_cache_purge_merge_conf(&conf->scgi, &prev->scgi);
-
-    if (conf->scgi.enable && clcf->handler != NULL) {
-        slcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_scgi_module);
-
-        if (slcf->upstream.upstream || slcf->scgi_lengths) {
-            conf->conf = &conf->scgi;
-            conf->handler = slcf->upstream.cache
-                          ? ngx_http_scgi_cache_purge_handler : NULL;
-            conf->original_handler = clcf->handler;
-            clcf->handler = ngx_http_cache_purge_access_handler;
-
-            return NGX_CONF_OK;
-        }
-    }
-# endif /* NGX_HTTP_SCGI */
-
-# if (NGX_HTTP_UWSGI)
-    ngx_http_cache_purge_merge_conf(&conf->uwsgi, &prev->uwsgi);
-
-    if (conf->uwsgi.enable && clcf->handler != NULL) {
-        ulcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_uwsgi_module);
-
-        if (ulcf->upstream.upstream || ulcf->uwsgi_lengths) {
-            conf->conf = &conf->uwsgi;
-            conf->handler = ulcf->upstream.cache
-                          ? ngx_http_uwsgi_cache_purge_handler : NULL;
-            conf->original_handler = clcf->handler;
-
-            clcf->handler = ngx_http_cache_purge_access_handler;
-
-            return NGX_CONF_OK;
-        }
-    }
-# endif /* NGX_HTTP_UWSGI */
-
-    ngx_conf_merge_ptr_value(conf->conf, prev->conf, NULL);
-
-    if (conf->handler == NULL) {
-        conf->handler = prev->handler;
-    }
-
-    if (conf->original_handler == NULL) {
-        conf->original_handler = prev->original_handler;
-    }
-
-    return NGX_CONF_OK;
-}
-
-#else /* !NGX_HTTP_CACHE */
-
-static ngx_http_module_t  ngx_http_cache_purge_module_ctx = {
-    NULL,  /* preconfiguration */
-    NULL,  /* postconfiguration */
-
-    NULL,  /* create main configuration */
-    NULL,  /* init main configuration */
-
-    NULL,  /* create server configuration */
-    NULL,  /* merge server configuration */
-
-    NULL,  /* create location configuration */
-    NULL,  /* merge location configuration */
-};
-
-ngx_module_t  ngx_http_cache_purge_module = {
-    NGX_MODULE_V1,
-    &ngx_http_cache_purge_module_ctx,  /* module context */
-    NULL,                              /* module directives */
-    NGX_HTTP_MODULE,                   /* module type */
-    NULL,                              /* init master */
-    NULL,                              /* init module */
-    NULL,                              /* init process */
-    NULL,                              /* init thread */
-    NULL,                              /* exit thread */
-    NULL,                              /* exit process */
-    NULL,                              /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-#endif /* NGX_HTTP_CACHE */
diff --git a/debian/modules/http-cache-purge/t/proxy1.t b/debian/modules/http-cache-purge/t/proxy1.t
deleted file mode 100644
index e5c0054..0000000
--- a/debian/modules/http-cache-purge/t/proxy1.t
+++ /dev/null
@@ -1,136 +0,0 @@
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 4 + 3 * 1);
-
-our $http_config = <<'_EOC_';
-    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
-    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
-_EOC_
-
-our $config = <<'_EOC_';
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        test_cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-    }
-
-    location ~ /purge(/.*) {
-        proxy_cache_purge  test_cache $1$is_args$args;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
-_EOC_
-
-worker_connections(128);
-no_shuffle();
-run_tests();
-
-no_diff();
-
-__DATA__
-
-=== TEST 1: prepare
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 2: get from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 5: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 3: purge from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-PURGE /purge/proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/html
---- response_body_like: Successful purge
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 4: purge from empty cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-PURGE /purge/proxy/passwd
---- error_code: 404
---- response_headers
-Content-Type: text/html
---- response_body_like: 404 Not Found
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 5: get from source
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: MISS
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 5: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 6: get from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 5: < 0.8.3 or < 0.7.62
diff --git a/debian/modules/http-cache-purge/t/proxy1_vars.t b/debian/modules/http-cache-purge/t/proxy1_vars.t
deleted file mode 100644
index af3553d..0000000
--- a/debian/modules/http-cache-purge/t/proxy1_vars.t
+++ /dev/null
@@ -1,138 +0,0 @@
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 4 + 3 * 1);
-
-our $http_config = <<'_EOC_';
-    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
-    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
-_EOC_
-
-our $config = <<'_EOC_';
-    set $cache  test_cache;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        $cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-    }
-
-    location ~ /purge(/.*) {
-        proxy_cache_purge  $cache $1$is_args$args;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
-_EOC_
-
-worker_connections(128);
-no_shuffle();
-run_tests();
-
-no_diff();
-
-__DATA__
-
-=== TEST 1: prepare
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 2: get from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 5: < 1.7.9
-
-
-
-=== TEST 3: purge from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-PURGE /purge/proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/html
---- response_body_like: Successful purge
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 4: purge from empty cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-PURGE /purge/proxy/passwd
---- error_code: 404
---- response_headers
-Content-Type: text/html
---- response_body_like: 404 Not Found
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 5: get from source
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: MISS
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 5: < 1.7.9
-
-
-
-=== TEST 6: get from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 5: < 1.7.9
diff --git a/debian/modules/http-cache-purge/t/proxy2.t b/debian/modules/http-cache-purge/t/proxy2.t
deleted file mode 100644
index c07b042..0000000
--- a/debian/modules/http-cache-purge/t/proxy2.t
+++ /dev/null
@@ -1,349 +0,0 @@
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 4 + 6 * 1);
-
-our $http_config = <<'_EOC_';
-    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
-    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
-_EOC_
-
-our $config = <<'_EOC_';
-    proxy_cache_purge  on;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        test_cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-
-        if ($uri)          { }
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
-_EOC_
-
-our $config_allowed = <<'_EOC_';
-    proxy_cache_purge  PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        test_cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
-_EOC_
-
-our $config_forbidden = <<'_EOC_';
-    proxy_cache_purge  PURGE from 1.0.0.0/8;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        test_cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
-_EOC_
-
-worker_connections(128);
-no_shuffle();
-run_tests();
-
-no_diff();
-
-__DATA__
-
-=== TEST 1: prepare
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 2: get from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 5: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 3: purge from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-PURGE /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/html
---- response_body_like: Successful purge
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 4: purge from empty cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-PURGE /proxy/passwd
---- error_code: 404
---- response_headers
-Content-Type: text/html
---- response_body_like: 404 Not Found
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 5: get from source
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: MISS
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 5: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 6: get from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 5: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 7: purge from cache (PURGE allowed)
---- http_config eval: $::http_config
---- config eval: $::config_allowed
---- request
-PURGE /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/html
---- response_body_like: Successful purge
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 8: purge from empty cache (PURGE allowed)
---- http_config eval: $::http_config
---- config eval: $::config_allowed
---- request
-PURGE /proxy/passwd
---- error_code: 404
---- response_headers
-Content-Type: text/html
---- response_body_like: 404 Not Found
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 9: get from source (PURGE allowed)
---- http_config eval: $::http_config
---- config eval: $::config_allowed
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: MISS
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 5: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 10: get from cache (PURGE allowed)
---- http_config eval: $::http_config
---- config eval: $::config_allowed
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 5: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 11: purge from cache (PURGE not allowed)
---- http_config eval: $::http_config
---- config eval: $::config_forbidden
---- request
-PURGE /proxy/passwd
---- error_code: 403
---- response_headers
-Content-Type: text/html
---- response_body_like: 403 Forbidden
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 12: get from cache (PURGE not allowed)
---- http_config eval: $::http_config
---- config eval: $::config_forbidden
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 5: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 13: no cache (PURGE allowed)
---- http_config eval: $::http_config
---- config
-    proxy_cache_purge  PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
---- request
-PURGE /proxy/passwd
---- error_code: 404
---- response_headers
-Content-Type: text/html
---- response_body_like: 404 Not Found
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 14: no cache (PURGE not allowed)
---- http_config eval: $::http_config
---- config
-    proxy_cache_purge  PURGE from 1.0.0.0/8;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
---- request
-PURGE /proxy/passwd
---- error_code: 403
---- response_headers
-Content-Type: text/html
---- response_body_like: 403 Forbidden
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
-
-
-
-=== TEST 15: multiple cache purge directives
---- http_config eval: $::http_config
---- config
-    fastcgi_cache_purge  on;
-    proxy_cache_purge    on;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        test_cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-
-        if ($uri)          { }
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
---- request
-PURGE /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/html
---- response_body_like: Successful purge
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx2: 4: < 0.8.3 or < 0.7.62
diff --git a/debian/modules/http-cache-purge/t/proxy2_vars.t b/debian/modules/http-cache-purge/t/proxy2_vars.t
deleted file mode 100644
index d09c08e..0000000
--- a/debian/modules/http-cache-purge/t/proxy2_vars.t
+++ /dev/null
@@ -1,353 +0,0 @@
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(1);
-
-plan tests => repeat_each() * (blocks() * 4 + 6 * 1);
-
-our $http_config = <<'_EOC_';
-    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
-    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
-_EOC_
-
-our $config = <<'_EOC_';
-    proxy_cache_purge  on;
-    set $cache         test_cache;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        $cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-
-        if ($uri)          { }
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
-_EOC_
-
-our $config_allowed = <<'_EOC_';
-    proxy_cache_purge  PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
-    set $cache         test_cache;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        $cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
-_EOC_
-
-our $config_forbidden = <<'_EOC_';
-    proxy_cache_purge  PURGE from 1.0.0.0/8;
-    set $cache         test_cache;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        $cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
-_EOC_
-
-worker_connections(128);
-no_shuffle();
-run_tests();
-
-no_diff();
-
-__DATA__
-
-=== TEST 1: prepare
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 2: get from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 5: < 1.7.9
-
-
-
-=== TEST 3: purge from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-PURGE /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/html
---- response_body_like: Successful purge
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 4: purge from empty cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-PURGE /proxy/passwd
---- error_code: 404
---- response_headers
-Content-Type: text/html
---- response_body_like: 404 Not Found
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 5: get from source
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: MISS
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 5: < 1.7.9
-
-
-
-=== TEST 6: get from cache
---- http_config eval: $::http_config
---- config eval: $::config
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 5: < 1.7.9
-
-
-
-=== TEST 7: purge from cache (PURGE allowed)
---- http_config eval: $::http_config
---- config eval: $::config_allowed
---- request
-PURGE /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/html
---- response_body_like: Successful purge
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 8: purge from empty cache (PURGE allowed)
---- http_config eval: $::http_config
---- config eval: $::config_allowed
---- request
-PURGE /proxy/passwd
---- error_code: 404
---- response_headers
-Content-Type: text/html
---- response_body_like: 404 Not Found
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 9: get from source (PURGE allowed)
---- http_config eval: $::http_config
---- config eval: $::config_allowed
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: MISS
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 5: < 1.7.9
-
-
-
-=== TEST 10: get from cache (PURGE allowed)
---- http_config eval: $::http_config
---- config eval: $::config_allowed
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 5: < 1.7.9
-
-
-
-=== TEST 11: purge from cache (PURGE not allowed)
---- http_config eval: $::http_config
---- config eval: $::config_forbidden
---- request
-PURGE /proxy/passwd
---- error_code: 403
---- response_headers
-Content-Type: text/html
---- response_body_like: 403 Forbidden
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 12: get from cache (PURGE not allowed)
---- http_config eval: $::http_config
---- config eval: $::config_forbidden
---- request
-GET /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/plain
-X-Cache-Status: HIT
---- response_body_like: root
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 5: < 1.7.9
-
-
-
-=== TEST 13: no cache (PURGE allowed)
---- http_config eval: $::http_config
---- config
-    proxy_cache_purge  PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
---- request
-PURGE /proxy/passwd
---- error_code: 404
---- response_headers
-Content-Type: text/html
---- response_body_like: 404 Not Found
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 14: no cache (PURGE not allowed)
---- http_config eval: $::http_config
---- config
-    proxy_cache_purge  PURGE from 1.0.0.0/8;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
---- request
-PURGE /proxy/passwd
---- error_code: 403
---- response_headers
-Content-Type: text/html
---- response_body_like: 403 Forbidden
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
-
-
-
-=== TEST 15: multiple cache purge directives
---- http_config eval: $::http_config
---- config
-    fastcgi_cache_purge  on;
-    proxy_cache_purge    on;
-    set $cache           test_cache;
-
-    location /proxy {
-        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
-        proxy_cache        $cache;
-        proxy_cache_key    $uri$is_args$args;
-        proxy_cache_valid  3m;
-        add_header         X-Cache-Status $upstream_cache_status;
-
-        if ($uri)          { }
-    }
-
-    location = /etc/passwd {
-        root               /;
-    }
---- request
-PURGE /proxy/passwd
---- error_code: 200
---- response_headers
-Content-Type: text/html
---- response_body_like: Successful purge
---- timeout: 10
---- no_error_log eval
-qr/\[(warn|error|crit|alert|emerg)\]/
---- skip_nginx: 4: < 1.7.9
diff --git a/debian/modules/http-dav-ext/LICENSE b/debian/modules/http-dav-ext/LICENSE
deleted file mode 100644
index c68a7d4..0000000
--- a/debian/modules/http-dav-ext/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (C) 2012-2018 Roman Arutyunyan
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/http-dav-ext/README.rst b/debian/modules/http-dav-ext/README.rst
deleted file mode 100644
index 092056e..0000000
--- a/debian/modules/http-dav-ext/README.rst
+++ /dev/null
@@ -1,188 +0,0 @@
-********************
-nginx-dav-ext-module
-********************
-
-nginx_ WebDAV_ PROPFIND,OPTIONS,LOCK,UNLOCK support.
-
-.. contents::
-
-
-About
-=====
-
-The standard ngx_http_dav_module_ provides partial WebDAV_ implementation and
-only supports GET,HEAD,PUT,DELETE,MKCOL,COPY,MOVE methods.
-
-For full WebDAV_ support in nginx_ you need to enable the standard
-ngx_http_dav_module_ as well as this module for the missing methods.
-
-
-Build
-=====
-
-Building nginx_ with the module:
-
-.. code-block:: bash
-
-    # static module
-    $ ./configure --with-http_dav_module --add-module=/path/to/nginx-dav-ext-module
-
-    # dynamic module
-    $ ./configure --with-http_dav_module --add-dynamic-module=/path/to/nginx-dav-ext-module
-
-Trying to compile nginx_ with this module but without ngx_http_dav_module_ will
-result in compilation error.
-
-
-Requirements
-============
-
-- nginx_ version >= 1.13.4
-- ``libxml2`` + ``libxslt``
-
-The ``libxslt`` library is technically redundant and is only required since this
-combination is supported by nginx_ for the xslt module.
-Using builtin nginx mechanisms for linking against third-party libraries
-brings certain compatibility benefits.
-However this redundancy can be easily eliminated in the ``config`` file.
-
-
-Testing
-=======
-
-The module tests require standard nginx-tests_ and Perl ``HTTP::DAV`` library.
-
-.. code-block:: bash
-
-    $ export PERL5LIB=/path/to/nginx-tests/lib
-    $ export TEST_NGINX_BINARY=/path/to/nginx
-    $ prove t
-
-
-Locking
-=======
-
-- Only the exclusive write locks are supported, which is the only type of locks
-  described in the WebDAV_ specification.
-
-- All currently held locks are kept in a list.
-  Checking if an object is constrained by a lock requires O(n) operations.
-  A huge number of simultaneously held locks may degrade performance.
-  Thus it is not recommended to have a large lock timeout which would increase
-  the number of locks.
-
-
-Directives
-==========
-
-dav_ext_methods
----------------
-
-========== ====
-*Syntax:*  ``dav_ext_methods [PROPFIND] [OPTIONS] [LOCK] [UNLOCK]``
-*Context:* http, server, location
-========== ====
-
-Enables support for the specified WebDAV methods in the current scope.
-
-dav_ext_lock_zone
------------------
-
-========== ====
-*Syntax:*  ``dav_ext_lock_zone zone=NAME:SIZE [timeout=TIMEOUT]``
-*Context:* http
-========== ====
-
-Defines a shared zone for WebDAV locks with specified NAME and SIZE.
-Also, defines a lock expiration TIMEOUT.
-Default lock timeout value is 1 minute.
-
-
-dav_ext_lock
-------------
-
-========== ====
-*Syntax:*  ``dav_ext_lock zone=NAME``
-*Context:* http, server, location
-========== ====
-
-Enables WebDAV locking in the specified scope.
-Locks are stored in the shared zone specified by NAME.
-This zone must be defined with the ``dav_ext_lock_zone`` directive.
-
-Note that even though this directive enables locking capabilities in the
-current scope, HTTP methods LOCK and UNLOCK should also be explicitly specified
-in the ``dav_ext_methods``.
-
-
-Example 1
-=========
-
-Simple lockless example::
-
-    location / {
-        root /data/www;
-
-        dav_methods PUT DELETE MKCOL COPY MOVE;
-        dav_ext_methods PROPFIND OPTIONS;
-    }
-
-
-Example 2
-=========
-
-WebDAV with locking::
-
-    http {
-        dav_ext_lock_zone zone=foo:10m;
-
-        ...
-
-        server {
-            ...
-
-            location / {
-                root /data/www;
-
-                dav_methods PUT DELETE MKCOL COPY MOVE;
-                dav_ext_methods PROPFIND OPTIONS LOCK UNLOCK;
-                dav_ext_lock zone=foo;
-            }
-        }
-    }
-
-
-Example 3
-=========
-
-WebDAV with locking which works with MacOS client::
-
-    http {
-        dav_ext_lock_zone zone=foo:10m;
-
-        ...
-
-        server {
-            ...
-
-            location / {
-                root /data/www;
-
-                # enable creating directories without trailing slash
-                set $x $uri$request_method;
-                if ($x ~ [^/]MKCOL$) {
-                    rewrite ^(.*)$ $1/;
-                }
-
-                dav_methods PUT DELETE MKCOL COPY MOVE;
-                dav_ext_methods PROPFIND OPTIONS LOCK UNLOCK;
-                dav_ext_lock zone=foo;
-            }
-        }
-    }
-
-.. _ngx_http_dav_module: http://nginx.org/en/docs/http/ngx_http_dav_module.html
-.. _nginx-tests: http://hg.nginx.org/nginx-tests
-.. _nginx: http://nginx.org
-.. _WebDAV: https://tools.ietf.org/html/rfc4918
-.. _`RFC4918 If Header`: https://tools.ietf.org/html/rfc4918#section-10.4
diff --git a/debian/modules/http-dav-ext/config b/debian/modules/http-dav-ext/config
deleted file mode 100644
index 91ae1b3..0000000
--- a/debian/modules/http-dav-ext/config
+++ /dev/null
@@ -1,17 +0,0 @@
-ngx_addon_name=ngx_http_dav_ext_module
-
-ngx_module_type=HTTP
-ngx_module_name=ngx_http_dav_ext_module
-
-# nginx has robust builtin support for linking against
-# libxml2+libxslt.  This is definitelty the right way to go if
-# building nginx with the xslt module, in which case libxslt will
-# be linked anyway.  In other cases libxslt is just redundant.
-# If that's a big deal, libxml2 can be linked directly:
-# ngx_module_libs=-lxml2
-
-ngx_module_libs=LIBXSLT
-
-ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
-
-. auto/module
diff --git a/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c b/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
deleted file mode 100644
index 0d6d067..0000000
--- a/debian/modules/http-dav-ext/ngx_http_dav_ext_module.c
+++ /dev/null
@@ -1,2181 +0,0 @@
-
-/*
- * Copyright (C) Roman Arutyunyan
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <libxml/parser.h>
-
-
-#define NGX_HTTP_DAV_EXT_OFF                      2
-
-#define NGX_HTTP_DAV_EXT_PREALLOCATE              50
-
-#define NGX_HTTP_DAV_EXT_NODE_PROPFIND            0x01
-#define NGX_HTTP_DAV_EXT_NODE_PROP                0x02
-#define NGX_HTTP_DAV_EXT_NODE_PROPNAME            0x04
-#define NGX_HTTP_DAV_EXT_NODE_ALLPROP             0x08
-
-#define NGX_HTTP_DAV_EXT_PROP_DISPLAYNAME         0x01
-#define NGX_HTTP_DAV_EXT_PROP_GETCONTENTLENGTH    0x02
-#define NGX_HTTP_DAV_EXT_PROP_GETLASTMODIFIED     0x04
-#define NGX_HTTP_DAV_EXT_PROP_RESOURCETYPE        0x08
-#define NGX_HTTP_DAV_EXT_PROP_LOCKDISCOVERY       0x10
-#define NGX_HTTP_DAV_EXT_PROP_SUPPORTEDLOCK       0x20
-
-#define NGX_HTTP_DAV_EXT_PROP_ALL                 0x7f
-#define NGX_HTTP_DAV_EXT_PROP_NAMES               0x80
-
-
-typedef struct {
-    ngx_str_t                    uri;
-    ngx_str_t                    name;
-    time_t                       mtime;
-    off_t                        size;
-
-    time_t                       lock_expire;
-    ngx_str_t                    lock_root;
-    uint32_t                     lock_token;
-
-    unsigned                     dir:1;
-    unsigned                     lock_supported:1;
-    unsigned                     lock_infinite:1;
-} ngx_http_dav_ext_entry_t;
-
-
-typedef struct {
-    ngx_uint_t                   nodes;
-    ngx_uint_t                   props;
-} ngx_http_dav_ext_xml_ctx_t;
-
-
-typedef struct {
-    ngx_uint_t                   methods;
-    ngx_shm_zone_t              *shm_zone;
-} ngx_http_dav_ext_loc_conf_t;
-
-
-typedef struct {
-    ngx_queue_t                  queue;
-    uint32_t                     token;
-    time_t                       expire;
-    ngx_uint_t                   infinite; /* unsigned  infinite:1; */
-    size_t                       len;
-    u_char                       data[1];
-} ngx_http_dav_ext_node_t;
-
-
-typedef struct {
-    ngx_queue_t                  queue;
-} ngx_http_dav_ext_lock_sh_t;
-
-
-typedef struct {
-    time_t                       timeout;
-    ngx_slab_pool_t             *shpool;
-    ngx_http_dav_ext_lock_sh_t  *sh;
-} ngx_http_dav_ext_lock_t;
-
-
-static ngx_int_t ngx_http_dav_ext_precontent_handler(ngx_http_request_t *r);
-static ngx_int_t ngx_http_dav_ext_strip_uri(ngx_http_request_t *r,
-    ngx_str_t *uri);
-static ngx_int_t ngx_http_dav_ext_verify_lock(ngx_http_request_t *r,
-    ngx_str_t *uri, ngx_uint_t delete_lock);
-static ngx_http_dav_ext_node_t *ngx_http_dav_ext_lock_lookup(
-    ngx_http_request_t *r, ngx_http_dav_ext_lock_t *lock, ngx_str_t *uri,
-    ngx_int_t depth);
-
-static ngx_int_t ngx_http_dav_ext_content_handler(ngx_http_request_t *r);
-static void ngx_http_dav_ext_propfind_handler(ngx_http_request_t *r);
-static void ngx_http_dav_ext_propfind_xml_start(void *data,
-    const xmlChar *localname, const xmlChar *prefix, const xmlChar *uri,
-    int nb_namespaces, const xmlChar **namespaces, int nb_attributes,
-    int nb_defaulted, const xmlChar **attributes);
-static void ngx_http_dav_ext_propfind_xml_end(void *data,
-    const xmlChar *localname, const xmlChar *prefix, const xmlChar *uri);
-static ngx_int_t ngx_http_dav_ext_propfind(ngx_http_request_t *r,
-    ngx_uint_t props);
-static ngx_int_t ngx_http_dav_ext_set_locks(ngx_http_request_t *r,
-    ngx_http_dav_ext_entry_t *entry);
-static ngx_int_t ngx_http_dav_ext_propfind_response(ngx_http_request_t *r,
-    ngx_array_t *entries, ngx_uint_t props);
-static ngx_int_t ngx_http_dav_ext_lock_handler(ngx_http_request_t *r);
-static ngx_int_t ngx_http_dav_ext_lock_response(ngx_http_request_t *r,
-    ngx_uint_t status, time_t timeout, ngx_uint_t depth, uint32_t token);
-static ngx_int_t ngx_http_dav_ext_unlock_handler(ngx_http_request_t *r);
-
-static ngx_int_t ngx_http_dav_ext_depth(ngx_http_request_t *r,
-    ngx_int_t default_depth);
-static uint32_t ngx_http_dav_ext_lock_token(ngx_http_request_t *r);
-static uint32_t ngx_http_dav_ext_if(ngx_http_request_t *r, ngx_str_t *uri);
-static uintptr_t ngx_http_dav_ext_format_propfind(ngx_http_request_t *r,
-    u_char *dst, ngx_http_dav_ext_entry_t *entry, ngx_uint_t props);
-static uintptr_t ngx_http_dav_ext_format_lockdiscovery(ngx_http_request_t *r,
-    u_char *dst, ngx_http_dav_ext_entry_t *entry);
-static uintptr_t ngx_http_dav_ext_format_token(u_char *dst, uint32_t token,
-    ngx_uint_t brackets);
-
-static ngx_int_t ngx_http_dav_ext_init_zone(ngx_shm_zone_t *shm_zone,
-    void *data);
-static void *ngx_http_dav_ext_create_loc_conf(ngx_conf_t *cf);
-static char *ngx_http_dav_ext_merge_loc_conf(ngx_conf_t *cf, void *parent,
-    void *child);
-static char *ngx_http_dav_ext_lock_zone(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_http_dav_ext_lock(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static ngx_int_t ngx_http_dav_ext_init(ngx_conf_t *cf);
-
-
-static ngx_conf_bitmask_t  ngx_http_dav_ext_methods_mask[] = {
-    { ngx_string("off"),      NGX_HTTP_DAV_EXT_OFF },
-    { ngx_string("propfind"), NGX_HTTP_PROPFIND    },
-    { ngx_string("options"),  NGX_HTTP_OPTIONS     },
-    { ngx_string("lock"),     NGX_HTTP_LOCK        },
-    { ngx_string("unlock"),   NGX_HTTP_UNLOCK      },
-    { ngx_null_string,        0                    }
-};
-
-
-static ngx_command_t  ngx_http_dav_ext_commands[] = {
-
-    { ngx_string("dav_ext_methods"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_conf_set_bitmask_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_dav_ext_loc_conf_t, methods),
-      &ngx_http_dav_ext_methods_mask },
-
-    { ngx_string("dav_ext_lock_zone"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE12,
-      ngx_http_dav_ext_lock_zone,
-      0,
-      0,
-      NULL },
-
-    { ngx_string("dav_ext_lock"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_http_dav_ext_lock,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_http_dav_ext_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    ngx_http_dav_ext_init,                 /* postconfiguration */
-
-    NULL,                                  /* create main configuration */
-    NULL,                                  /* init main configuration */
-
-    NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
-
-    ngx_http_dav_ext_create_loc_conf,      /* create location configuration */
-    ngx_http_dav_ext_merge_loc_conf,       /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_http_dav_ext_module = {
-    NGX_MODULE_V1,
-    &ngx_http_dav_ext_module_ctx,          /* module context */
-    ngx_http_dav_ext_commands,             /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_int_t
-ngx_http_dav_ext_precontent_handler(ngx_http_request_t *r)
-{
-    ngx_str_t                     uri;
-    ngx_int_t                     rc;
-    ngx_uint_t                    delete_lock;
-    ngx_table_elt_t              *dest;
-    ngx_http_dav_ext_loc_conf_t  *dlcf;
-
-    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
-
-    if (dlcf->shm_zone == NULL) {
-        return NGX_DECLINED;
-    }
-
-    if (r->method & (NGX_HTTP_PUT|NGX_HTTP_DELETE|NGX_HTTP_MKCOL|NGX_HTTP_MOVE))
-    {
-        delete_lock = (r->method & (NGX_HTTP_DELETE|NGX_HTTP_MOVE)) ? 1 : 0;
-
-        rc = ngx_http_dav_ext_verify_lock(r, &r->uri, delete_lock);
-        if (rc != NGX_OK) {
-            return rc;
-        }
-    }
-
-    if (r->method & (NGX_HTTP_MOVE|NGX_HTTP_COPY)) {
-        dest = r->headers_in.destination;
-        if (dest == NULL) {
-            return NGX_DECLINED;
-        }
-
-        uri.data = dest->value.data;
-        uri.len = dest->value.len;
-
-        if (ngx_http_dav_ext_strip_uri(r, &uri) != NGX_OK) {
-            return NGX_DECLINED;
-        }
-
-        rc = ngx_http_dav_ext_verify_lock(r, &uri, 0);
-        if (rc != NGX_OK) {
-            return rc;
-        }
-    }
-
-    return NGX_DECLINED;
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_strip_uri(ngx_http_request_t *r, ngx_str_t *uri)
-{
-    u_char  *p, *last, *host;
-    size_t   len;
-
-    if (uri->data[0] == '/') {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http dav_ext strip uri:\"%V\" unchanged", uri);
-        return NGX_OK;
-    }
-
-    len = r->headers_in.server.len;
-
-    if (len == 0) {
-        goto failed;
-    }
-
-#if (NGX_HTTP_SSL)
-
-    if (r->connection->ssl) {
-        if (ngx_strncmp(uri->data, "https://", sizeof("https://") - 1) != 0) {
-            goto failed;
-        }
-
-        host = uri->data + sizeof("https://") - 1;
-
-    } else
-#endif
-    {
-        if (ngx_strncmp(uri->data, "http://", sizeof("http://") - 1) != 0) {
-            goto failed;
-        }
-
-        host = uri->data + sizeof("http://") - 1;
-    }
-
-    if (ngx_strncmp(host, r->headers_in.server.data, len) != 0) {
-        goto failed;
-    }
-
-    last = uri->data + uri->len;
-
-    for (p = host + len; p != last; p++) {
-        if (*p == '/') {
-            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http dav_ext strip uri \"%V\" \"%*s\"",
-                           uri, last - p, p);
-
-            uri->data = p;
-            uri->len = last - p;
-
-            return NGX_OK;
-        }
-    }
-
-failed:
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext strip uri \"%V\" failed", uri);
-
-    return NGX_DECLINED;
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_verify_lock(ngx_http_request_t *r, ngx_str_t *uri,
-    ngx_uint_t delete_lock)
-{
-    uint32_t                      token;
-    ngx_http_dav_ext_node_t      *node;
-    ngx_http_dav_ext_lock_t      *lock;
-    ngx_http_dav_ext_loc_conf_t  *dlcf;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext verify lock \"%V\"", uri);
-
-    token = ngx_http_dav_ext_if(r, uri);
-
-    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
-    lock = dlcf->shm_zone->data;
-
-    ngx_shmtx_lock(&lock->shpool->mutex);
-
-    node = ngx_http_dav_ext_lock_lookup(r, lock, uri, -1);
-    if (node == NULL) {
-        ngx_shmtx_unlock(&lock->shpool->mutex);
-        return NGX_OK;
-    }
-
-    if (token == 0) {
-        ngx_shmtx_unlock(&lock->shpool->mutex);
-        return 423; /* Locked */
-    }
-
-    if (token != node->token) {
-        ngx_shmtx_unlock(&lock->shpool->mutex);
-        return NGX_HTTP_PRECONDITION_FAILED;
-    }
-
-    /*
-     * RFC4918:
-     * If a request causes the lock-root of any lock to become an
-     * unmapped URL, then the lock MUST also be deleted by that request.
-     */
-
-    if (delete_lock && node->len == uri->len) {
-        ngx_queue_remove(&node->queue);
-        ngx_slab_free_locked(lock->shpool, node);
-    }
-
-    ngx_shmtx_unlock(&lock->shpool->mutex);
-
-    return NGX_OK;
-}
-
-
-static ngx_http_dav_ext_node_t *
-ngx_http_dav_ext_lock_lookup(ngx_http_request_t *r,
-    ngx_http_dav_ext_lock_t *lock, ngx_str_t *uri, ngx_int_t depth)
-{
-    time_t                    now;
-    ngx_queue_t              *q;
-    ngx_http_dav_ext_node_t  *node;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext lock lookup \"%V\"", uri);
-
-    if (uri->len == 0) {
-        return NULL;
-    }
-
-    now = ngx_time();
-
-    while (!ngx_queue_empty(&lock->sh->queue)) {
-        q = ngx_queue_head(&lock->sh->queue);
-        node = (ngx_http_dav_ext_node_t *) q;
-
-        if (node->expire >= now) {
-            break;
-        }
-
-        ngx_queue_remove(q);
-        ngx_slab_free_locked(lock->shpool, node);
-    }
-
-    for (q = ngx_queue_head(&lock->sh->queue);
-         q != ngx_queue_sentinel(&lock->sh->queue);
-         q = ngx_queue_next(q))
-    {
-        node = (ngx_http_dav_ext_node_t *) q;
-
-        if (uri->len >= node->len) {
-            if (ngx_memcmp(uri->data, node->data, node->len)) {
-                continue;
-            }
-
-            if (uri->len > node->len) {
-                if (node->data[node->len - 1] != '/') {
-                    continue;
-                }
-
-                if (!node->infinite
-                    && ngx_strlchr(uri->data + node->len,
-                                   uri->data + uri->len - 1, '/'))
-                {
-                    continue;
-                }
-            }
-
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http dav_ext lock found \"%*s\"",
-                           node->len, node->data);
-
-            return node;
-        }
-
-        /* uri->len < node->len */
-
-        if (depth >= 0) {
-            if (ngx_memcmp(node->data, uri->data, uri->len)) {
-                continue;
-            }
-
-            if (uri->data[uri->len - 1] != '/') {
-                continue;
-            }
-
-            if (depth == 0
-                && ngx_strlchr(node->data + uri->len,
-                               node->data + node->len - 1, '/'))
-            {
-                continue;
-            }
-
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http dav_ext lock found \"%*s\"",
-                           node->len, node->data);
-
-            return node;
-        }
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext lock not found");
-
-    return NULL;
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_content_handler(ngx_http_request_t *r)
-{
-    ngx_int_t                     rc;
-    ngx_table_elt_t              *h;
-    ngx_http_dav_ext_loc_conf_t  *dlcf;
-
-    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
-
-    if (!(r->method & dlcf->methods)) {
-        return NGX_DECLINED;
-    }
-
-    switch (r->method) {
-
-    case NGX_HTTP_PROPFIND:
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http dav_ext propfind");
-
-        rc = ngx_http_read_client_request_body(r,
-                                            ngx_http_dav_ext_propfind_handler);
-        if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-            return rc;
-        }
-
-        return NGX_DONE;
-
-    case NGX_HTTP_OPTIONS:
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http dav_ext options");
-
-        rc = ngx_http_discard_request_body(r);
-
-        if (rc != NGX_OK) {
-            return rc;
-        }
-
-        h = ngx_list_push(&r->headers_out.headers);
-        if (h == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        ngx_str_set(&h->key, "DAV");
-        h->value.len = 1;
-        h->value.data = (u_char *) (dlcf->shm_zone ? "2" : "1");
-        h->hash = 1;
-
-        h = ngx_list_push(&r->headers_out.headers);
-        if (h == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        /* XXX */
-        ngx_str_set(&h->key, "Allow");
-        ngx_str_set(&h->value,
-           "GET,HEAD,PUT,DELETE,MKCOL,COPY,MOVE,PROPFIND,OPTIONS,LOCK,UNLOCK");
-        h->hash = 1;
-
-        r->headers_out.status = NGX_HTTP_OK;
-        r->headers_out.content_length_n = 0;
-
-        rc = ngx_http_send_header(r);
-
-        if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-            return rc;
-        }
-
-        return ngx_http_send_special(r, NGX_HTTP_LAST);
-
-    case NGX_HTTP_LOCK:
-
-        if (dlcf->shm_zone == NULL) {
-            return NGX_HTTP_NOT_ALLOWED;
-        }
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http dav_ext lock");
-
-        /*
-         * Body is expected to carry the requested lock type, but
-         * since we only support write/exclusive locks, we ignore it.
-         * Ideally we could throw an error if a lock of another type
-         * is requested, but the amount of work required for that is
-         * not worth it.
-         */
-
-        rc = ngx_http_discard_request_body(r);
-
-        if (rc != NGX_OK) {
-            return rc;
-        }
-
-        return ngx_http_dav_ext_lock_handler(r);
-
-    case NGX_HTTP_UNLOCK:
-
-        if (dlcf->shm_zone == NULL) {
-            return NGX_HTTP_NOT_ALLOWED;
-        }
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http dav_ext unlock");
-
-        rc = ngx_http_discard_request_body(r);
-
-        if (rc != NGX_OK) {
-            return rc;
-        }
-
-        return ngx_http_dav_ext_unlock_handler(r);
-    }
-
-    return NGX_DECLINED;
-}
-
-
-static void
-ngx_http_dav_ext_propfind_handler(ngx_http_request_t *r)
-{
-    off_t                        len;
-    ngx_buf_t                   *b;
-    ngx_chain_t                 *cl;
-    xmlSAXHandler                sax;
-    xmlParserCtxtPtr             pctx;
-    ngx_http_dav_ext_xml_ctx_t   xctx;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext propfind handler");
-
-    ngx_memzero(&xctx, sizeof(ngx_http_dav_ext_xml_ctx_t));
-    ngx_memzero(&sax, sizeof(xmlSAXHandler));
-
-    sax.initialized = XML_SAX2_MAGIC;
-    sax.startElementNs = ngx_http_dav_ext_propfind_xml_start;
-    sax.endElementNs = ngx_http_dav_ext_propfind_xml_end;
-
-    pctx = xmlCreatePushParserCtxt(&sax, &xctx, NULL, 0, NULL);
-    if (pctx == NULL) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "xmlCreatePushParserCtxt() failed");
-        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-        return;
-    }
-
-    len = 0;
-
-    for (cl = r->request_body->bufs; cl; cl = cl->next) {
-        b = cl->buf;
-
-        if (b->in_file) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "PROPFIND client body is in file, "
-                          "you may want to increase client_body_buffer_size");
-            xmlFreeParserCtxt(pctx);
-            ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-            return;
-        }
-
-        if (ngx_buf_special(b)) {
-            continue;
-        }
-
-        len += b->last - b->pos;
-
-        if (xmlParseChunk(pctx, (const char *) b->pos, b->last - b->pos,
-                          b->last_buf))
-        {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "xmlParseChunk() failed");
-            xmlFreeParserCtxt(pctx);
-            ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-            return;
-        }
-    }
-
-    xmlFreeParserCtxt(pctx);
-
-    if (len == 0) {
-
-        /*
-         * For easier debugging treat bodiless requests
-         * as if they expect all properties.
-         */
-
-        xctx.props = NGX_HTTP_DAV_EXT_PROP_ALL;
-    }
-
-    ngx_http_finalize_request(r, ngx_http_dav_ext_propfind(r, xctx.props));
-}
-
-
-static void
-ngx_http_dav_ext_propfind_xml_start(void *data, const xmlChar *localname,
-    const xmlChar *prefix, const xmlChar *uri, int nb_namespaces,
-    const xmlChar **namespaces, int nb_attributes, int nb_defaulted,
-    const xmlChar **attributes)
-{
-    ngx_http_dav_ext_xml_ctx_t *xctx = data;
-
-    if (ngx_strcmp(localname, "propfind") == 0) {
-        xctx->nodes ^= NGX_HTTP_DAV_EXT_NODE_PROPFIND;
-    }
-
-    if (ngx_strcmp(localname, "prop") == 0) {
-        xctx->nodes ^= NGX_HTTP_DAV_EXT_NODE_PROP;
-    }
-
-    if (ngx_strcmp(localname, "propname") == 0) {
-        xctx->nodes ^= NGX_HTTP_DAV_EXT_NODE_PROPNAME;
-    }
-
-    if (ngx_strcmp(localname, "allprop") == 0) {
-        xctx->nodes ^= NGX_HTTP_DAV_EXT_NODE_ALLPROP;
-    }
-}
-
-
-static void
-ngx_http_dav_ext_propfind_xml_end(void *data, const xmlChar *localname,
-    const xmlChar *prefix, const xmlChar *uri)
-{
-    ngx_http_dav_ext_xml_ctx_t *xctx = data;
-
-    if (xctx->nodes & NGX_HTTP_DAV_EXT_NODE_PROPFIND) {
-
-        if (xctx->nodes & NGX_HTTP_DAV_EXT_NODE_PROP) {
-            if (ngx_strcmp(localname, "displayname") == 0) {
-                xctx->props |= NGX_HTTP_DAV_EXT_PROP_DISPLAYNAME;
-            }
-
-            if (ngx_strcmp(localname, "getcontentlength") == 0) {
-                xctx->props |= NGX_HTTP_DAV_EXT_PROP_GETCONTENTLENGTH;
-            }
-
-            if (ngx_strcmp(localname, "getlastmodified") == 0) {
-                xctx->props |= NGX_HTTP_DAV_EXT_PROP_GETLASTMODIFIED;
-            }
-
-            if (ngx_strcmp(localname, "resourcetype") == 0) {
-                xctx->props |= NGX_HTTP_DAV_EXT_PROP_RESOURCETYPE;
-            }
-
-            if (ngx_strcmp(localname, "lockdiscovery") == 0) {
-                xctx->props |= NGX_HTTP_DAV_EXT_PROP_LOCKDISCOVERY;
-            }
-
-            if (ngx_strcmp(localname, "supportedlock") == 0) {
-                xctx->props |= NGX_HTTP_DAV_EXT_PROP_SUPPORTEDLOCK;
-            }
-        }
-
-        if (xctx->nodes & NGX_HTTP_DAV_EXT_NODE_PROPNAME) {
-            xctx->props |= NGX_HTTP_DAV_EXT_PROP_NAMES;
-        }
-
-        if (xctx->nodes & NGX_HTTP_DAV_EXT_NODE_ALLPROP) {
-            xctx->props = NGX_HTTP_DAV_EXT_PROP_ALL;
-        }
-    }
-
-    ngx_http_dav_ext_propfind_xml_start(data, localname, prefix, uri,
-                                        0, NULL, 0, 0, NULL);
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_propfind(ngx_http_request_t *r, ngx_uint_t props)
-{
-    size_t                     root, allocated;
-    u_char                    *p, *last, *filename;
-    ngx_int_t                  rc;
-    ngx_err_t                  err;
-    ngx_str_t                  path, name;
-    ngx_dir_t                  dir;
-    ngx_uint_t                 depth;
-    ngx_array_t                entries;
-    ngx_file_info_t            fi;
-    ngx_http_dav_ext_entry_t  *entry;
-
-    if (ngx_array_init(&entries, r->pool, 40, sizeof(ngx_http_dav_ext_entry_t))
-        != NGX_OK)
-    {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    rc = ngx_http_dav_ext_depth(r, 0);
-
-    if (rc == NGX_ERROR) {
-        return NGX_HTTP_BAD_REQUEST;
-    }
-
-    if (rc == NGX_MAX_INT_T_VALUE) {
-
-        /*
-         * RFC4918:
-         * 403 Forbidden -  A server MAY reject PROPFIND requests on
-         * collections with depth header of "Infinity", in which case
-         * it SHOULD use this error with the precondition code
-         * 'propfind-finite-depth' inside the error body.
-         */
-
-        return NGX_HTTP_FORBIDDEN;
-    }
-
-    depth = rc;
-
-    last = ngx_http_map_uri_to_path(r, &path, &root,
-                                    NGX_HTTP_DAV_EXT_PREALLOCATE);
-    if (last == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    allocated = path.len;
-    path.len = last - path.data;
-
-    if (path.len > 1 && path.data[path.len - 1] == '/') {
-        path.len--;
-
-    } else {
-        last++;
-    }
-
-    path.data[path.len] = '\0';
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext propfind path: \"%s\"", path.data);
-
-    if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) {
-        return NGX_HTTP_NOT_FOUND;
-    }
-
-    if (r->uri.len < 2) {
-        name = r->uri;
-
-    } else {
-        name.data = &r->uri.data[r->uri.len - 1];
-        name.len = (name.data[0] == '/') ? 0 : 1;
-
-        while (name.data != r->uri.data) {
-            p = name.data - 1;
-            if (*p == '/') {
-                break;
-            }
-
-            name.data--;
-            name.len++;
-        }
-    }
-
-    entry = ngx_array_push(&entries);
-    if (entry == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    ngx_memzero(entry, sizeof(ngx_http_dav_ext_entry_t));
-
-    entry->uri = r->uri;
-    entry->name = name;
-    entry->dir = ngx_is_dir(&fi);
-    entry->mtime = ngx_file_mtime(&fi);
-    entry->size = ngx_file_size(&fi);
-
-    if (ngx_http_dav_ext_set_locks(r, entry) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext propfind name:\"%V\", uri:\"%V\"",
-                   &entry->name, &entry->uri);
-
-    if (depth == 0 || !entry->dir) {
-        return ngx_http_dav_ext_propfind_response(r, &entries, props);
-    }
-
-    if (ngx_open_dir(&path, &dir) == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
-                      ngx_open_dir_n " \"%s\" failed", path.data);
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    rc = NGX_OK;
-
-    filename = path.data;
-    filename[path.len] = '/';
-
-    for ( ;; ) {
-        ngx_set_errno(0);
-
-        if (ngx_read_dir(&dir) == NGX_ERROR) {
-            err = ngx_errno;
-
-            if (err != NGX_ENOMOREFILES) {
-                ngx_log_error(NGX_LOG_CRIT, r->connection->log, err,
-                              ngx_read_dir_n " \"%V\" failed", &path);
-                rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-
-            break;
-        }
-
-        name.len = ngx_de_namelen(&dir);
-        name.data = ngx_de_name(&dir);
-
-        if (name.data[0] == '.') {
-            continue;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http dav_ext propfind child path: \"%s\"", name.data);
-
-        entry = ngx_array_push(&entries);
-        if (entry == NULL) {
-            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-            break;
-        }
-
-        ngx_memzero(entry, sizeof(ngx_http_dav_ext_entry_t));
-
-        if (!dir.valid_info) {
-
-            if (path.len + 1 + name.len + 1 > allocated) {
-                allocated = path.len + 1 + name.len + 1
-                            + NGX_HTTP_DAV_EXT_PREALLOCATE;
-
-                filename = ngx_pnalloc(r->pool, allocated);
-                if (filename == NULL) {
-                    rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-                    break;
-                }
-
-                last = ngx_cpystrn(filename, path.data, path.len + 1);
-                *last++ = '/';
-            }
-
-            ngx_cpystrn(last, name.data, name.len + 1);
-
-            if (ngx_de_info(filename, &dir) == NGX_FILE_ERROR) {
-                ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
-                              ngx_de_info_n " \"%s\" failed", filename);
-                rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-                break;
-            }
-        }
-
-        p = ngx_pnalloc(r->pool, name.len);
-        if (p == NULL) {
-            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-            break;
-        }
-
-        ngx_memcpy(p, name.data, name.len);
-        entry->name.data = p;
-        entry->name.len = name.len;
-
-        p = ngx_pnalloc(r->pool, r->uri.len + 1 + name.len + 1);
-        if (p == NULL) {
-            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-            break;
-        }
-
-        entry->uri.data = p;
-
-        p = ngx_cpymem(p, r->uri.data, r->uri.len);
-        if (r->uri.len && r->uri.data[r->uri.len - 1] != '/') {
-            *p++ = '/';
-        }
-
-        p = ngx_cpymem(p, name.data, name.len);
-        if (ngx_de_is_dir(&dir)) {
-            *p++ = '/';
-        }
-
-        entry->uri.len = p - entry->uri.data;
-        entry->dir = ngx_de_is_dir(&dir);
-        entry->mtime = ngx_de_mtime(&dir);
-        entry->size = ngx_de_size(&dir);
-
-        if (ngx_http_dav_ext_set_locks(r, entry) != NGX_OK) {
-            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-            break;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http dav_ext propfind child name:\"%V\", uri:\"%V\"",
-                       &entry->name, &entry->uri);
-    }
-
-    if (ngx_close_dir(&dir) == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
-                      ngx_close_dir_n " \"%V\" failed", &path);
-    }
-
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    return ngx_http_dav_ext_propfind_response(r, &entries, props);
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_set_locks(ngx_http_request_t *r,
-    ngx_http_dav_ext_entry_t *entry)
-{
-    ngx_http_dav_ext_node_t      *node;
-    ngx_http_dav_ext_lock_t      *lock;
-    ngx_http_dav_ext_loc_conf_t  *dlcf;
-
-    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
-
-    if (dlcf->shm_zone == NULL) {
-        entry->lock_supported = 0;
-        return NGX_OK;
-    }
-
-    entry->lock_supported = 1;
-
-    lock = dlcf->shm_zone->data;
-
-    ngx_shmtx_lock(&lock->shpool->mutex);
-
-    node = ngx_http_dav_ext_lock_lookup(r, lock, &entry->uri, -1);
-    if (node == NULL) {
-        ngx_shmtx_unlock(&lock->shpool->mutex);
-        return NGX_OK;
-    }
-
-    entry->lock_infinite = node->infinite ? 1 : 0;
-    entry->lock_expire = node->expire;
-    entry->lock_token = node->token;
-
-    entry->lock_root.data = ngx_pnalloc(r->pool, node->len);
-    if (entry->lock_root.data == NULL) {
-        ngx_shmtx_unlock(&lock->shpool->mutex);
-        return NGX_ERROR;
-    }
-
-    ngx_memcpy(entry->lock_root.data, node->data, node->len);
-    entry->lock_root.len = node->len;
-
-    ngx_shmtx_unlock(&lock->shpool->mutex);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_propfind_response(ngx_http_request_t *r, ngx_array_t *entries,
-    ngx_uint_t props)
-{
-    size_t                     len;
-    u_char                    *p;
-    uintptr_t                  escape;
-    ngx_buf_t                 *b;
-    ngx_int_t                  rc;
-    ngx_uint_t                 n;
-    ngx_chain_t                cl;
-    ngx_http_dav_ext_entry_t  *entry;
-
-    static u_char head[] = 
-        "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
-        "<D:multistatus xmlns:D=\"DAV:\">\n";
-
-    static u_char tail[] = 
-        "</D:multistatus>\n";
-
-    entry = entries->elts;
-
-    for (n = 0; n < entries->nelts; n++) {
-        escape = 2 * ngx_escape_uri(NULL, entry[n].uri.data, entry[n].uri.len,
-                                    NGX_ESCAPE_URI);
-        if (escape == 0) {
-            continue;
-        }
-
-        p = ngx_pnalloc(r->pool, entry[n].uri.len + escape);
-        if (p == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        entry[n].uri.len = (u_char *) ngx_escape_uri(p, entry[n].uri.data,
-                                                     entry[n].uri.len,
-                                                     NGX_ESCAPE_URI)
-                           - p;
-        entry[n].uri.data = p;
-    }
-
-    len = sizeof(head) - 1 + sizeof(tail) - 1;
-
-    for (n = 0; n < entries->nelts; n++) {
-        len += ngx_http_dav_ext_format_propfind(r, NULL, &entry[n], props);
-    }
-
-    b = ngx_create_temp_buf(r->pool, len);
-    if (b == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    b->last = ngx_cpymem(b->last, head, sizeof(head) - 1);
-
-    for (n = 0; n < entries->nelts; n++) {
-        b->last = (u_char *) ngx_http_dav_ext_format_propfind(r, b->last,
-                                                              &entry[n], props);
-    }
-
-    b->last = ngx_cpymem(b->last, tail, sizeof(tail) - 1);
-
-    b->last_buf = (r == r->main) ? 1 : 0;
-    b->last_in_chain = 1;
-
-    cl.buf = b;
-    cl.next = NULL;
-
-    r->headers_out.status = 207;
-    ngx_str_set(&r->headers_out.status_line, "207 Multi-Status");
-
-    r->headers_out.content_length_n = b->last - b->pos;
-
-    r->headers_out.content_type_len = sizeof("text/xml") - 1;
-    ngx_str_set(&r->headers_out.content_type, "text/xml");
-    r->headers_out.content_type_lowcase = NULL;
-
-    ngx_str_set(&r->headers_out.charset, "utf-8");
-
-    rc = ngx_http_send_header(r);
-
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-        return rc;
-    }
-
-    return ngx_http_output_filter(r, &cl);
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_lock_handler(ngx_http_request_t *r)
-{
-    u_char                       *last;
-    size_t                        n, root;
-    time_t                        now;
-    uint32_t                      token, new_token;
-    ngx_fd_t                      fd;
-    ngx_int_t                     rc, depth;
-    ngx_str_t                     path;
-    ngx_uint_t                    status;
-    ngx_file_info_t               fi;
-    ngx_http_dav_ext_lock_t      *lock;
-    ngx_http_dav_ext_node_t      *node;
-    ngx_http_dav_ext_loc_conf_t  *dlcf;
-
-    if (r->uri.len == 0) {
-        return NGX_HTTP_BAD_REQUEST;
-    }
-
-    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
-    lock = dlcf->shm_zone->data;
-
-    /*
-     * RFC4918:
-     * If no Depth header is submitted on a LOCK request, then the request
-     * MUST act as if a "Depth:infinity" had been submitted.
-     */
-
-    rc = ngx_http_dav_ext_depth(r, NGX_MAX_INT_T_VALUE);
-
-    if (rc == NGX_ERROR || rc == 1) {
-
-        /*
-         * RFC4918:
-         * Values other than 0 or infinity MUST NOT be used with the Depth
-         * header on a LOCK method.
-         */
-
-        return NGX_HTTP_BAD_REQUEST;
-    }
-
-    depth = rc;
-
-    token = ngx_http_dav_ext_if(r, &r->uri);
-
-    do {
-        new_token = ngx_random();
-    } while (new_token == 0);
-
-    now = ngx_time();
-
-    ngx_shmtx_lock(&lock->shpool->mutex);
-
-    node = ngx_http_dav_ext_lock_lookup(r, lock, &r->uri, depth);
-
-    if (node) {
-        if (token == 0) {
-            ngx_shmtx_unlock(&lock->shpool->mutex);
-            return 423; /* Locked */
-        }
-
-        if (node->token != token) {
-            ngx_shmtx_unlock(&lock->shpool->mutex);
-            return NGX_HTTP_PRECONDITION_FAILED;
-        }
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http dav_ext refresh lock");
-
-        node->expire = now + lock->timeout;
-
-        ngx_queue_remove(&node->queue);
-        ngx_queue_insert_tail(&lock->sh->queue, &node->queue);
-
-        ngx_shmtx_unlock(&lock->shpool->mutex);
-
-        return ngx_http_dav_ext_lock_response(r, NGX_HTTP_OK, lock->timeout,
-                                              depth, token);
-    }
-
-    n = sizeof(ngx_http_dav_ext_node_t) + r->uri.len - 1;
-
-    node = ngx_slab_alloc_locked(lock->shpool, n);
-    if (node == NULL) {
-        ngx_shmtx_unlock(&lock->shpool->mutex);
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    ngx_memzero(node, sizeof(ngx_http_dav_ext_node_t));
-
-    ngx_memcpy(&node->data, r->uri.data, r->uri.len);
-
-    node->len = r->uri.len;
-    node->token = new_token;
-    node->expire = now + lock->timeout;
-    node->infinite = (depth ? 1 : 0);
-
-    ngx_queue_insert_tail(&lock->sh->queue, &node->queue);
-
-    ngx_shmtx_unlock(&lock->shpool->mutex);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext add lock");
-
-    last = ngx_http_map_uri_to_path(r, &path, &root, 0);
-    if (last == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    *last = '\0';
-
-    status = NGX_HTTP_OK;
-
-    if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) {
-
-        /*
-         * RFC4918:
-         * A successful lock request to an unmapped URL MUST result in the
-         * creation of a locked (non-collection) resource with empty content.
-         */
-
-        fd = ngx_open_file(path.data, NGX_FILE_RDONLY, NGX_FILE_CREATE_OR_OPEN,
-                           NGX_FILE_DEFAULT_ACCESS);
-
-        if (fd == NGX_INVALID_FILE) {
-
-            /*
-             * RFC4918:
-             * 409 (Conflict) - A resource cannot be created at the destination
-             * until one or more intermediate collections have been created.
-             * The server MUST NOT create those intermediate collections
-             * automatically.
-             */
-
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno,
-                          ngx_open_file_n " \"%s\" failed", path.data);
-            return NGX_HTTP_CONFLICT;
-        }
-
-        if (ngx_close_file(fd) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
-                          ngx_close_file_n " \"%s\" failed", path.data);
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        status = NGX_HTTP_CREATED;
-    }
-
-    return ngx_http_dav_ext_lock_response(r, status, lock->timeout, depth,
-                                          new_token);
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_lock_response(ngx_http_request_t *r, ngx_uint_t status,
-    time_t timeout, ngx_uint_t depth, uint32_t token)
-{
-    size_t                     len;
-    time_t                     now;
-    u_char                    *p;
-    ngx_int_t                  rc;
-    ngx_buf_t                 *b;
-    ngx_chain_t                cl;
-    ngx_table_elt_t           *h;
-    ngx_http_dav_ext_entry_t   entry;
-
-    static u_char head[] =
-        "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
-        "<D:prop xmlns:D=\"DAV:\">\n";
-
-    static u_char tail[] =
-        "</D:prop>\n";
-
-    now = ngx_time();
-
-    ngx_memzero(&entry, sizeof(ngx_http_dav_ext_entry_t));
-
-    entry.lock_expire = now + timeout;
-    entry.lock_root = r->uri;
-    entry.lock_infinite = depth ? 1 : 0;
-    entry.lock_token = token;
-
-    len = sizeof(head) - 1
-          + ngx_http_dav_ext_format_lockdiscovery(r, NULL, &entry)
-          + sizeof(tail) - 1;
-
-    b = ngx_create_temp_buf(r->pool, len);
-    if (b == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    b->last = ngx_cpymem(b->last, head, sizeof(head) - 1);
-    b->last = (u_char *) ngx_http_dav_ext_format_lockdiscovery(r, b->last,
-                                                               &entry);
-    b->last = ngx_cpymem(b->last, tail, sizeof(tail) - 1);
-
-    b->last_buf = (r == r->main) ? 1 : 0;
-    b->last_in_chain = 1;
-
-    cl.buf = b;
-    cl.next = NULL;
-
-    r->headers_out.status = status;
-    r->headers_out.content_length_n = b->last - b->pos;
-
-    r->headers_out.content_type_len = sizeof("text/xml") - 1;
-    ngx_str_set(&r->headers_out.content_type, "text/xml");
-    r->headers_out.content_type_lowcase = NULL;
-
-    ngx_str_set(&r->headers_out.charset, "utf-8");
-
-    h = ngx_list_push(&r->headers_out.headers);
-    if (h == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    ngx_str_set(&h->key, "Lock-Token");
-
-    p = ngx_pnalloc(r->pool, ngx_http_dav_ext_format_token(NULL, token, 1));
-    if (p == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    h->value.data = p;
-    h->value.len = (u_char *) ngx_http_dav_ext_format_token(p, token, 1) - p;
-    h->hash = 1;
-
-    rc = ngx_http_send_header(r);
-
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-        return rc;
-    }
-
-    return ngx_http_output_filter(r, &cl);
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_unlock_handler(ngx_http_request_t *r)
-{
-    uint32_t                      token;
-    ngx_http_dav_ext_lock_t      *lock;
-    ngx_http_dav_ext_node_t      *node;
-    ngx_http_dav_ext_loc_conf_t  *dlcf;
-
-    token = ngx_http_dav_ext_lock_token(r);
-
-    dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_ext_module);
-    lock = dlcf->shm_zone->data;
-
-    ngx_shmtx_lock(&lock->shpool->mutex);
-
-    node = ngx_http_dav_ext_lock_lookup(r, lock, &r->uri, -1);
-
-    if (node == NULL || node->token != token) {
-        ngx_shmtx_unlock(&lock->shpool->mutex);
-        return NGX_HTTP_NO_CONTENT;
-    }
-
-    ngx_queue_remove(&node->queue);
-    ngx_slab_free_locked(lock->shpool, node);
-
-    ngx_shmtx_unlock(&lock->shpool->mutex);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext delete lock");
-
-    return NGX_HTTP_NO_CONTENT;
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_depth(ngx_http_request_t *r, ngx_int_t default_depth)
-{
-    ngx_table_elt_t  *depth;
-
-    depth = r->headers_in.depth;
-
-    if (depth == NULL) {
-        return default_depth;
-    }
-
-    if (depth->value.len == 1) {
-
-        if (depth->value.data[0] == '0') {
-            return 0;
-        }
-
-        if (depth->value.data[0] == '1') {
-            return 1;
-        }
-
-    } else {
-
-        if (depth->value.len == sizeof("infinity") - 1
-            && ngx_strcmp(depth->value.data, "infinity") == 0)
-        {
-            return NGX_MAX_INT_T_VALUE;
-        }
-    }
-
-    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                  "client sent invalid \"Depth\" header: \"%V\"",
-                  &depth->value);
-
-    return NGX_ERROR;
-}
-
-
-static uint32_t
-ngx_http_dav_ext_lock_token(ngx_http_request_t *r)
-{
-    u_char           *p, ch;
-    uint32_t          token;
-    ngx_uint_t        i, n;
-    ngx_list_part_t  *part;
-    ngx_table_elt_t  *header;
-
-    static u_char name[] = "lock-token";
-
-    part = &r->headers_in.headers.part;
-    header = part->elts;
-
-    for (i = 0; /* void */ ; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        for (n = 0; n < sizeof(name) - 1 && n < header[i].key.len; n++) {
-            ch = header[i].key.data[n];
-
-            if (ch >= 'A' && ch <= 'Z') {
-                ch |= 0x20;
-            }
-
-            if (name[n] != ch) {
-                break;
-            }
-        }
-
-        if (n == sizeof(name) - 1 && n == header[i].key.len) {
-            p = header[i].value.data;
-
-            if (ngx_strncmp(p, "<urn:", 5)) {
-                return 0;
-            }
-
-            p += 5;
-            token = 0;
-
-            for (n = 0; n < 8; n++) {
-                ch = *p++;
-
-                if (ch >= '0' && ch <= '9') {
-                    token = token * 16 + (ch - '0');
-                    continue;
-                }
-
-                ch = (u_char) (ch | 0x20);
-
-                if (ch >= 'a' && ch <= 'f') {
-                    token = token * 16 + (ch - 'a' + 10);
-                    continue;
-                }
-
-                return 0;
-            }
-
-            if (*p != '>') {
-                return 0;
-            }
-
-            return token;
-        }
-    }
-
-    return 0;
-}
-
-
-static uint32_t
-ngx_http_dav_ext_if(ngx_http_request_t *r, ngx_str_t *uri)
-{
-    u_char           *p, ch;
-    uint32_t          token;
-    ngx_str_t         tag;
-    ngx_uint_t        i, n;
-    ngx_list_part_t  *part;
-    ngx_table_elt_t  *header;
-
-    static u_char name[] = "if";
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http dav_ext if \"%V\"", uri);
-
-    part = &r->headers_in.headers.part;
-    header = part->elts;
-
-    for (i = 0; /* void */ ; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        for (n = 0; n < sizeof(name) - 1 && n < header[i].key.len; n++) {
-            ch = header[i].key.data[n];
-
-            if (ch >= 'A' && ch <= 'Z') {
-                ch |= 0x20;
-            }
-
-            if (name[n] != ch) {
-                break;
-            }
-        }
-
-        if (n == sizeof(name) - 1 && n == header[i].key.len) {
-            p = header[i].value.data;
-            tag = r->uri;
-
-            while (*p != '\0') {
-                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "http dav_ext if list \"%s\"", p);
-
-                while (*p == ' ') { p++; }
-
-                if (*p == '<') {
-                    tag.data = ++p;
-
-                    while (*p != '\0' && *p != '>') { p++; }
-
-                    if (*p == '\0') {
-                        break;
-                    }
-
-                    tag.len = p++ - tag.data;
-
-                    (void) ngx_http_dav_ext_strip_uri(r, &tag);
-
-                    while (*p == ' ') { p++; }
-                }
-
-                if (*p != '(') {
-                    break;
-                }
-
-                p++;
-
-                if (tag.len == 0
-                    || tag.len > uri->len
-                    || (tag.len < uri->len && tag.data[tag.len - 1] != '/')
-                    || ngx_memcmp(tag.data, uri->data, tag.len))
-                {
-                    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                                   "http dav_ext if tag mismatch \"%V\"", &tag);
-
-                    while (*p != '\0' && *p != ')') { p++; }
-
-                    if (*p == ')') {
-                        p++;
-                    }
-
-                    continue;
-                }
-
-                while (*p != '\0') {
-                    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                                   "http dav_ext if condition \"%s\"", p);
-
-                    while (*p == ' ') { p++; }
-
-                    if (ngx_strncmp(p, "Not", 3) == 0) {
-                        p += 3;
-                        while (*p == ' ') { p++; }
-                        goto next;
-                    }
-
-                    if (*p == '[') {
-                        p++;
-                        while (*p != '\0' && *p != ']') { p++; }
-                        goto next;
-                    }
-
-                    if (ngx_strncmp(p, "<urn:", 5)) {
-                        goto next;
-                    }
-
-                    p += 5;
-                    token = 0;
-
-                    for (n = 0; n < 8; n++) {
-                        ch = *p++;
-
-                        if (ch >= '0' && ch <= '9') {
-                            token = token * 16 + (ch - '0');
-                            continue;
-                        }
-
-                        ch = (u_char) (ch | 0x20);
-
-                        if (ch >= 'a' && ch <= 'f') {
-                            token = token * 16 + (ch - 'a' + 10);
-                            continue;
-                        }
-
-                        goto next;
-                    }
-
-                    if (*p != '>') {
-                        goto next;
-                    }
-
-                    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                                   "http dav_ext if token: %uxD", token);
-
-                    return token;
-
-                next:
-
-                    while (*p != '\0' && *p != ' ' && *p != ')') { p++; }
-
-                    if (*p == ')') {
-                        p++;
-                        break;
-                    }
-                }
-            }
-
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http dav_ext if header mismatch");
-        }
-    }
-
-    return 0;
-}
-
-
-static uintptr_t
-ngx_http_dav_ext_format_propfind(ngx_http_request_t *r, u_char *dst,
-    ngx_http_dav_ext_entry_t *entry, ngx_uint_t props)
-{
-    size_t  len;
-
-    static u_char head[] =
-        "<D:response>\n"
-        "<D:href>";
-
-    /* uri */
-
-    static u_char prop[] =
-        "</D:href>\n"
-        "<D:propstat>\n"
-        "<D:prop>\n";
-
-    /* properties */
-
-    static u_char tail[] =
-        "</D:prop>\n"
-        "<D:status>HTTP/1.1 200 OK</D:status>\n"
-        "</D:propstat>\n"
-        "</D:response>\n";
-
-    static u_char names[] =
-        "<D:displayname/>\n"
-        "<D:getcontentlength/>\n"
-        "<D:getlastmodified/>\n"
-        "<D:resourcetype/>\n"
-        "<D:lockdiscovery/>\n"
-        "<D:supportedlock/>\n";
-
-    static u_char supportedlock[] =
-        "<D:lockentry>\n"
-        "<D:lockscope><D:exclusive/></D:lockscope>\n"
-        "<D:locktype><D:write/></D:locktype>\n"
-        "</D:lockentry>\n";
-
-    if (dst == NULL) {
-        len = sizeof(head) - 1
-              + sizeof(prop) - 1
-              + sizeof(tail) - 1;
-
-        len += entry->uri.len + ngx_escape_html(NULL, entry->uri.data,
-                                                entry->uri.len);
-
-        if (props & NGX_HTTP_DAV_EXT_PROP_NAMES) {
-            len += sizeof(names) - 1;
-
-        } else {
-            len += sizeof("<D:displayname>"
-                          "</D:displayname>\n"
-
-                          "<D:getcontentlength>"
-                          "</D:getcontentlength>\n"
-
-                          "<D:getlastmodified>"
-                          "Mon, 28 Sep 1970 06:00:00 GMT"
-                          "</D:getlastmodified>\n"
-
-                          "<D:resourcetype>"
-                          "<D:collection/>"
-                          "</D:resourcetype>\n"
-
-                          "<D:supportedlock>\n"
-                          "</D:supportedlock>\n") - 1;
-
-            /* displayname */
-            len += entry->name.len
-                   + ngx_escape_html(NULL, entry->name.data, entry->name.len);
-
-            /* getcontentlength */
-            len += NGX_OFF_T_LEN;
-
-            /* lockdiscovery */
-            len += ngx_http_dav_ext_format_lockdiscovery(r, NULL, entry);
-
-            /* supportedlock */
-            if (entry->lock_supported) {
-                len += sizeof(supportedlock) - 1;
-            }
-        }
-
-        return len;
-    }
-
-    dst = ngx_cpymem(dst, head, sizeof(head) - 1);
-    dst = (u_char *) ngx_escape_html(dst, entry->uri.data, entry->uri.len);
-    dst = ngx_cpymem(dst, prop, sizeof(prop) - 1);
-
-    if (props & NGX_HTTP_DAV_EXT_PROP_NAMES) {
-        dst = ngx_cpymem(dst, names, sizeof(names) - 1);
-
-    } else {
-        if (props & NGX_HTTP_DAV_EXT_PROP_DISPLAYNAME) {
-            dst = ngx_cpymem(dst, "<D:displayname>",
-                             sizeof("<D:displayname>") - 1);
-            dst = (u_char *) ngx_escape_html(dst, entry->name.data,
-                                             entry->name.len);
-            dst = ngx_cpymem(dst, "</D:displayname>\n",
-                             sizeof("</D:displayname>\n") - 1);
-        }
-
-        if (props & NGX_HTTP_DAV_EXT_PROP_GETCONTENTLENGTH) {
-            if (!entry->dir) {
-                dst = ngx_sprintf(dst, "<D:getcontentlength>%O"
-                                       "</D:getcontentlength>\n", entry->size);
-            }
-        }
-
-        if (props & NGX_HTTP_DAV_EXT_PROP_GETLASTMODIFIED) {
-            dst = ngx_cpymem(dst, "<D:getlastmodified>",
-                             sizeof("<D:getlastmodified>") - 1);
-            dst = ngx_http_time(dst, entry->mtime);
-            dst = ngx_cpymem(dst, "</D:getlastmodified>\n",
-                             sizeof("</D:getlastmodified>\n") - 1);
-        }
-
-        if (props & NGX_HTTP_DAV_EXT_PROP_RESOURCETYPE) {
-            dst = ngx_cpymem(dst, "<D:resourcetype>",
-                             sizeof("<D:resourcetype>") - 1);
-
-            if (entry->dir) {
-                dst = ngx_cpymem(dst, "<D:collection/>",
-                                 sizeof("<D:collection/>") - 1);
-            }
-
-            dst = ngx_cpymem(dst, "</D:resourcetype>\n",
-                             sizeof("</D:resourcetype>\n") - 1);
-        }
-
-        if (props & NGX_HTTP_DAV_EXT_PROP_LOCKDISCOVERY) {
-            dst = (u_char *) ngx_http_dav_ext_format_lockdiscovery(r, dst,
-                                                                   entry);
-        }
-
-        if (props & NGX_HTTP_DAV_EXT_PROP_SUPPORTEDLOCK) {
-            dst = ngx_cpymem(dst, "<D:supportedlock>\n",
-                             sizeof("<D:supportedlock>\n") - 1);
-
-            if (entry->lock_supported) {
-                dst = ngx_cpymem(dst, supportedlock, sizeof(supportedlock) - 1);
-            }
-
-            dst = ngx_cpymem(dst, "</D:supportedlock>\n",
-                             sizeof("</D:supportedlock>\n") - 1);
-        }
-    }
-
-    dst = ngx_cpymem(dst, tail, sizeof(tail) - 1);
-
-    return (uintptr_t) dst;
-}
-
-
-static uintptr_t
-ngx_http_dav_ext_format_lockdiscovery(ngx_http_request_t *r, u_char *dst,
-    ngx_http_dav_ext_entry_t *entry)
-{
-    size_t  len;
-    time_t  now;
-
-    if (dst == NULL) {
-        if (entry->lock_token == 0) {
-            return sizeof("<D:lockdiscovery/>\n") - 1;
-        }
-
-        len = sizeof("<D:lockdiscovery>\n"
-                     "<D:activelock>\n"
-                     "<D:locktype><D:write/></D:locktype>\n"
-                     "<D:lockscope><D:exclusive/></D:lockscope>\n"
-                     "<D:depth>infinity</D:depth>\n"
-                     "<D:timeout>Second-</D:timeout>\n"
-                     "<D:locktoken><D:href></D:href></D:locktoken>\n"
-                     "<D:lockroot><D:href></D:href></D:lockroot>\n"
-                     "</D:activelock>\n"
-                     "</D:lockdiscovery>\n") - 1;
-
-        /* timeout */
-        len += NGX_TIME_T_LEN;
-
-        /* token */
-        len += ngx_http_dav_ext_format_token(NULL, entry->lock_token, 0);
-
-        /* lockroot */
-        len += entry->lock_root.len + ngx_escape_html(NULL,
-                                                      entry->lock_root.data,
-                                                      entry->lock_root.len);
-        return len;
-    }
-
-    if (entry->lock_token == 0) {
-        dst = ngx_cpymem(dst, "<D:lockdiscovery/>\n",
-                         sizeof("<D:lockdiscovery/>\n") - 1);
-        return (uintptr_t) dst;
-    }
-
-    now = ngx_time();
-
-    dst = ngx_cpymem(dst, "<D:lockdiscovery>\n",
-                     sizeof("<D:lockdiscovery>\n") - 1);
-
-    dst = ngx_cpymem(dst, "<D:activelock>\n",
-                     sizeof("<D:activelock>\n") - 1);
-
-    dst = ngx_cpymem(dst, "<D:locktype><D:write/></D:locktype>\n",
-                     sizeof("<D:locktype><D:write/></D:locktype>\n") - 1);
-
-    dst = ngx_cpymem(dst, "<D:lockscope><D:exclusive/></D:lockscope>\n",
-                     sizeof("<D:lockscope><D:exclusive/></D:lockscope>\n") - 1);
-
-    dst = ngx_sprintf(dst, "<D:depth>%s</D:depth>\n",
-                      entry->lock_infinite ? "infinity" : "0");
-
-    dst = ngx_sprintf(dst, "<D:timeout>Second-%T</D:timeout>\n",
-                      entry->lock_expire - now);
-
-    dst = ngx_cpymem(dst, "<D:locktoken><D:href>",
-                     sizeof("<D:locktoken><D:href>") - 1);
-    dst = (u_char *) ngx_http_dav_ext_format_token(dst, entry->lock_token, 0);
-    dst = ngx_cpymem(dst, "</D:href></D:locktoken>\n",
-                     sizeof("</D:href></D:locktoken>\n") - 1);
-
-    dst = ngx_cpymem(dst, "<D:lockroot><D:href>",
-                     sizeof("<D:lockroot><D:href>") - 1);
-    dst = (u_char *) ngx_escape_html(dst, entry->lock_root.data,
-                                     entry->lock_root.len);
-    dst = ngx_cpymem(dst, "</D:href></D:lockroot>\n",
-                     sizeof("</D:href></D:lockroot>\n") - 1);
-
-    dst = ngx_cpymem(dst, "</D:activelock>\n",
-                     sizeof("</D:activelock>\n") - 1);
-
-    dst = ngx_cpymem(dst, "</D:lockdiscovery>\n",
-                     sizeof("</D:lockdiscovery>\n") - 1);
-
-    return (uintptr_t) dst;
-}
-
-
-static uintptr_t
-ngx_http_dav_ext_format_token(u_char *dst, uint32_t token, ngx_uint_t brackets)
-{
-    ngx_uint_t  n;
-
-    static u_char  hex[] = "0123456789abcdef";
-
-    if (dst == NULL) {
-        return sizeof("<urn:deadbeef>") - 1 + (brackets ? 2 : 0);
-    }
-
-    if (brackets) {
-        *dst++ = '<';
-    }
-
-    dst = ngx_cpymem(dst, "urn:", 4);
-
-    for (n = 0; n < 4; n++) {
-        *dst++ = hex[token >> 28];
-        *dst++ = hex[(token >> 24) & 0xf];
-        token <<= 8;
-    }
-
-    if (brackets) {
-        *dst++ = '>';
-    }
-
-    return (uintptr_t) dst;
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_init_zone(ngx_shm_zone_t *shm_zone, void *data)
-{
-    ngx_http_dav_ext_lock_t *olock = data;
-
-    size_t                    len;
-    ngx_http_dav_ext_lock_t  *lock;
-
-    lock = shm_zone->data;
-
-    if (olock) {
-        lock->sh = olock->sh;
-        lock->shpool = olock->shpool;
-        return NGX_OK;
-    }
-
-    lock->shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-
-    if (shm_zone->shm.exists) {
-        lock->sh = lock->shpool->data;
-        return NGX_OK;
-    }
-
-    lock->sh = ngx_slab_alloc(lock->shpool, sizeof(ngx_http_dav_ext_lock_sh_t));
-    if (lock->sh == NULL) {
-        return NGX_ERROR;
-    }
-
-    lock->shpool->data = lock->sh;
-
-    ngx_queue_init(&lock->sh->queue);
-
-    len = sizeof(" in dav_ext zone \"\"") + shm_zone->shm.name.len;
-
-    lock->shpool->log_ctx = ngx_slab_alloc(lock->shpool, len);
-    if (lock->shpool->log_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_sprintf(lock->shpool->log_ctx, " in dav_ext zone \"%V\"%Z",
-                &shm_zone->shm.name);
-
-    return NGX_OK;
-}
-
-
-static void *
-ngx_http_dav_ext_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_http_dav_ext_loc_conf_t  *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_dav_ext_loc_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    /*
-     * set by ngx_pcalloc():
-     *
-     *     conf->shm_zone = NULL;
-     */
-
-    return conf;
-}
-
-
-static char *
-ngx_http_dav_ext_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_http_dav_ext_loc_conf_t  *prev = parent;
-    ngx_http_dav_ext_loc_conf_t  *conf = child;
-
-    ngx_conf_merge_bitmask_value(conf->methods, prev->methods,
-                         (NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_EXT_OFF));
-
-    if (conf->shm_zone == NULL) {
-        conf->shm_zone = prev->shm_zone;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_dav_ext_lock_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    u_char                   *p;
-    time_t                    timeout;
-    ssize_t                   size;
-    ngx_str_t                *value, name, s;
-    ngx_uint_t                i;
-    ngx_shm_zone_t           *shm_zone;
-    ngx_http_dav_ext_lock_t  *lock;
-
-    value = cf->args->elts;
-
-    name.len = 0;
-    size = 0;
-    timeout = 60;
-
-    for (i = 1; i < cf->args->nelts; i++) {
-
-        if (ngx_strncmp(value[i].data, "zone=", 5) == 0) {
-
-            name.data = value[i].data + 5;
-
-            p = (u_char *) ngx_strchr(name.data, ':');
-
-            if (p == NULL) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "invalid zone size \"%V\"", &value[i]);
-                return NGX_CONF_ERROR;
-            }
-
-            name.len = p - name.data;
-
-            s.data = p + 1;
-            s.len = value[i].data + value[i].len - s.data;
-
-            size = ngx_parse_size(&s);
-
-            if (size == NGX_ERROR) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "invalid zone size \"%V\"", &value[i]);
-                return NGX_CONF_ERROR;
-            }
-
-            if (size < (ssize_t) (8 * ngx_pagesize)) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "zone \"%V\" is too small", &value[i]);
-                return NGX_CONF_ERROR;
-            }
-
-            continue;
-        }
-
-        if (ngx_strncmp(value[i].data, "timeout=", 8) == 0) {
-
-            s.len = value[i].len - 8;
-            s.data = value[i].data + 8;
-
-            timeout = ngx_parse_time(&s, 1);
-            if (timeout == (time_t) NGX_ERROR || timeout == 0) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "invalid timeout value \"%V\"", &value[i]);
-                return NGX_CONF_ERROR;
-            }
-
-            continue;
-        }
-
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid parameter \"%V\"", &value[i]);
-        return NGX_CONF_ERROR;
-    }
-
-    if (name.len == 0) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"%V\" must have \"zone\" parameter",
-                           &cmd->name);
-        return NGX_CONF_ERROR;
-    }
-
-    lock = ngx_pcalloc(cf->pool, sizeof(ngx_http_dav_ext_lock_t));
-    if (lock == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    lock->timeout = timeout;
-
-    shm_zone = ngx_shared_memory_add(cf, &name, size,
-                                     &ngx_http_dav_ext_module);
-    if (shm_zone == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (shm_zone->data) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "duplicate zone \"%V\"", &name);
-        return NGX_CONF_ERROR;
-    }
-
-    shm_zone->init = ngx_http_dav_ext_init_zone;
-    shm_zone->data = lock;
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_dav_ext_lock(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_dav_ext_loc_conf_t *dlcf = conf;
-
-    ngx_str_t       *value, s;
-    ngx_uint_t       i;
-    ngx_shm_zone_t  *shm_zone;
-
-    if (dlcf->shm_zone) {
-        return "is duplicate";
-    }
-
-    value = cf->args->elts;
-
-    shm_zone = NULL;
-
-    for (i = 1; i < cf->args->nelts; i++) {
-
-        if (ngx_strncmp(value[i].data, "zone=", 5) == 0) {
-
-            s.len = value[i].len - 5;
-            s.data = value[i].data + 5;
-
-            shm_zone = ngx_shared_memory_add(cf, &s, 0,
-                                             &ngx_http_dav_ext_module);
-            if (shm_zone == NULL) {
-                return NGX_CONF_ERROR;
-            }
-
-            continue;
-        }
-
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid parameter \"%V\"", &value[i]);
-        return NGX_CONF_ERROR;
-    }
-
-    if (shm_zone == NULL) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"%V\" must have \"zone\" parameter", &cmd->name);
-        return NGX_CONF_ERROR;
-    }
-
-    dlcf->shm_zone = shm_zone;
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_http_dav_ext_init(ngx_conf_t *cf)
-{
-    ngx_http_handler_pt        *h;
-    ngx_http_core_main_conf_t  *cmcf;
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    h = ngx_array_push(&cmcf->phases[NGX_HTTP_PRECONTENT_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    *h = ngx_http_dav_ext_precontent_handler;
-
-    h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    *h = ngx_http_dav_ext_content_handler;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-dav-ext/t/dav_ext.t b/debian/modules/http-dav-ext/t/dav_ext.t
deleted file mode 100644
index 00327e2..0000000
--- a/debian/modules/http-dav-ext/t/dav_ext.t
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/perl
-
-# (C) Roman Arutyunyan
-
-# Tests for nginx-dav-ext-module.
-
-###############################################################################
-
-use warnings;
-use strict;
-
-use Test::More;
-
-BEGIN { use FindBin; chdir($FindBin::Bin); }
-
-use lib 'lib';
-use Test::Nginx;
-use HTTP::DAV
-
-###############################################################################
-
-select STDERR; $| = 1;
-select STDOUT; $| = 1;
-
-my $t = Test::Nginx->new()->has(qw/http dav/)->plan(20);
-
-$t->write_file_expand('nginx.conf', <<'EOF');
-
-%%TEST_GLOBALS%%
-
-daemon off;
-
-events {
-}
-
-http {
-    %%TEST_GLOBALS_HTTP%%
-
-    dav_ext_lock_zone zone=foo:10m timeout=10s;
-
-    server {
-        listen       127.0.0.1:8080;
-        server_name  localhost;
-
-        location / {
-            dav_methods PUT DELETE MKCOL COPY MOVE;
-            dav_ext_methods PROPFIND OPTIONS LOCK UNLOCK;
-            dav_ext_lock zone=foo;
-        }
-    }
-}
-
-EOF
-
-$t->write_file('foo', 'foo');
-
-$t->run();
-
-###############################################################################
-
-my $url = "http://127.0.0.1:8080";
-
-my $content;
-
-my $d = HTTP::DAV->new();
-$d->open($url);
-
-my $d2 = HTTP::DAV->new();
-$d2->open($url);
-
-#debug:
-#$d->DebugLevel(3);
-#see /tmp/perldav_debug.txt.
-
-my $p = $d->propfind('/', 1);
-is($p->is_collection, 1, 'propfind dir collection');
-is($p->get_property('displayname'), '/', 'propfind dir displayname');
-is($p->get_uri(), 'http://127.0.0.1:8080/', 'propfind dir uri');
-
-$p = $d->propfind('/foo');
-is($p->is_collection, 0, 'propfind file collection');
-is($p->get_property('displayname'), 'foo', 'propfind file displayname');
-is($p->get_uri(), 'http://127.0.0.1:8080/foo', 'propfind file uri');
-is($p->get_property('getcontentlength'), '3', 'propfind file size');
-
-$d->lock('/foo');
-is($d->lock('/foo'), 0, 'prevent double lock');
-
-$d->unlock('/foo');
-is($d->lock('/foo'), 1, 'relock');
-
-$d->lock('/bar');
-$p = $d->propfind('/bar');
-is($p->get_property('displayname'), 'bar', 'lock creates a file');
-
-$d->get('/bar', \$content) or $content = 'none';
-is($content, '', 'lock creates an empty file');
-
-$content = "bar";
-$d->put(\$content, '/bar');
-$d->get('/bar', \$content) or $content = '';
-is($content, 'bar', 'put lock');
-
-$content = "qux";
-$d2->put(\$content, '/bar');
-$d2->get('/bar', \$content) or $content = '';
-isnt($content, 'qux', 'prevent put lock');
-
-$d->mkcol('/d/');
-$d->lock('/d/');
-$d->copy('/bar', '/d/bar');
-$d->get('/d/bar', \$content) or $content = '';
-is($content, 'bar', 'copy lock');
-
-$d2->copy('/bar', '/d/qux');
-$d2->get('/d/qux', \$content) or $content = '';
-isnt($content, 'bar', 'prevent copy lock');
-
-$d2->delete('/d/bar');
-$d2->get('/d/bar', \$content) or $content = '';
-is($content, 'bar', 'prevent delete lock');
-
-$d->delete('/d/bar');
-$d->get('/d/bar', \$content) or $content = '';
-is($content, '', 'delete lock');
-
-$d->mkcol('/d/c/');
-$p = $d->propfind('/d/c/');
-is($p->is_collection, 1, 'mkcol lock');
-
-$d2->mkcol('/d/e/');
-is($d2->propfind('/d/e/'), 0, 'prevent mkcol lock');
-
-$d->unlock('/d/');
-$d->lock('/d/', -depth=>"0");
-$content = 'qux';
-$d2->put(\$content, '/d/c/qux');
-$d2->get('/d/c/qux', \$content) or $content = '';
-is($content, 'qux', 'put to a depth-0-locked subdirectory');
-
-###############################################################################
diff --git a/debian/modules/http-echo/LICENSE b/debian/modules/http-echo/LICENSE
deleted file mode 100644
index 6feffbf..0000000
--- a/debian/modules/http-echo/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (C) 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/http-echo/README.markdown b/debian/modules/http-echo/README.markdown
deleted file mode 100644
index 02d4608..0000000
--- a/debian/modules/http-echo/README.markdown
+++ /dev/null
@@ -1,1851 +0,0 @@
-Name
-====
-
-**ngx_echo** - Brings "echo", "sleep", "time", "exec" and more shell-style goodies to Nginx config file.
-
-*This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
-
-Table of Contents
-=================
-
-* [Name](#name)
-* [Status](#status)
-* [Version](#version)
-* [Synopsis](#synopsis)
-* [Description](#description)
-* [Content Handler Directives](#content-handler-directives)
-    * [echo](#echo)
-    * [echo_duplicate](#echo_duplicate)
-    * [echo_flush](#echo_flush)
-    * [echo_sleep](#echo_sleep)
-    * [echo_blocking_sleep](#echo_blocking_sleep)
-    * [echo_reset_timer](#echo_reset_timer)
-    * [echo_read_request_body](#echo_read_request_body)
-    * [echo_location_async](#echo_location_async)
-    * [echo_location](#echo_location)
-    * [echo_subrequest_async](#echo_subrequest_async)
-    * [echo_subrequest](#echo_subrequest)
-    * [echo_foreach_split](#echo_foreach_split)
-    * [echo_end](#echo_end)
-    * [echo_request_body](#echo_request_body)
-    * [echo_exec](#echo_exec)
-    * [echo_status](#echo_status)
-* [Filter Directives](#filter-directives)
-    * [echo_before_body](#echo_before_body)
-    * [echo_after_body](#echo_after_body)
-* [Variables](#variables)
-    * [$echo_it](#echo_it)
-    * [$echo_timer_elapsed](#echo_timer_elapsed)
-    * [$echo_request_body](#echo_request_body)
-    * [$echo_request_method](#echo_request_method)
-    * [$echo_client_request_method](#echo_client_request_method)
-    * [$echo_client_request_headers](#echo_client_request_headers)
-    * [$echo_cacheable_request_uri](#echo_cacheable_request_uri)
-    * [$echo_request_uri](#echo_request_uri)
-    * [$echo_incr](#echo_incr)
-    * [$echo_response_status](#echo_response_status)
-* [Installation](#installation)
-* [Compatibility](#compatibility)
-* [Modules that use this module for testing](#modules-that-use-this-module-for-testing)
-* [Community](#community)
-    * [English Mailing List](#english-mailing-list)
-    * [Chinese Mailing List](#chinese-mailing-list)
-* [Report Bugs](#report-bugs)
-* [Source Repository](#source-repository)
-* [Changes](#changes)
-* [Test Suite](#test-suite)
-* [TODO](#todo)
-* [Getting involved](#getting-involved)
-* [Author](#author)
-* [Copyright & License](#copyright--license)
-* [See Also](#see-also)
-
-Status
-======
-
-This module is production ready.
-
-Version
-=======
-
-This document describes ngx_echo [v0.61](https://github.com/openresty/echo-nginx-module/tags) released on 8 August 2017.
-
-Synopsis
-========
-
-```nginx
-
-   location /hello {
-     echo "hello, world!";
-   }
-```
-
-```nginx
-
-   location /hello {
-     echo -n "hello, ";
-     echo "world!";
-   }
-```
-
-```nginx
-
-   location /timed_hello {
-     echo_reset_timer;
-     echo hello world;
-     echo "'hello world' takes about $echo_timer_elapsed sec.";
-     echo hiya igor;
-     echo "'hiya igor' takes about $echo_timer_elapsed sec.";
-   }
-```
-
-```nginx
-
-   location /echo_with_sleep {
-     echo hello;
-     echo_flush;  # ensure the client can see previous output immediately
-     echo_sleep   2.5;  # in sec
-     echo world;
-   }
-```
-
-```nginx
-
-   # in the following example, accessing /echo yields
-   #   hello
-   #   world
-   #   blah
-   #   hiya
-   #   igor
-   location /echo {
-       echo_before_body hello;
-       echo_before_body world;
-       proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
-       echo_after_body hiya;
-       echo_after_body igor;
-   }
-   location /echo/more {
-       echo blah;
-   }
-```
-
-```nginx
-
-   # the output of /main might be
-   #   hello
-   #   world
-   #   took 0.000 sec for total.
-   # and the whole request would take about 2 sec to complete.
-   location /main {
-       echo_reset_timer;
-
-       # subrequests in parallel
-       echo_location_async /sub1;
-       echo_location_async /sub2;
-
-       echo "took $echo_timer_elapsed sec for total.";
-   }
-   location /sub1 {
-       echo_sleep 2;
-       echo hello;
-   }
-   location /sub2 {
-       echo_sleep 1;
-       echo world;
-   }
-```
-
-```nginx
-
-   # the output of /main might be
-   #   hello
-   #   world
-   #   took 3.003 sec for total.
-   # and the whole request would take about 3 sec to complete.
-   location /main {
-       echo_reset_timer;
-
-       # subrequests in series (chained by CPS)
-       echo_location /sub1;
-       echo_location /sub2;
-
-       echo "took $echo_timer_elapsed sec for total.";
-   }
-   location /sub1 {
-       echo_sleep 2;
-       echo hello;
-   }
-   location /sub2 {
-       echo_sleep 1;
-       echo world;
-   }
-```
-
-```nginx
-
-   # Accessing /dup gives
-   #   ------ END ------
-   location /dup {
-     echo_duplicate 3 "--";
-     echo_duplicate 1 " END ";
-     echo_duplicate 3 "--";
-     echo;
-   }
-```
-
-```nginx
-
-   # /bighello will generate 1000,000,000 hello's.
-   location /bighello {
-     echo_duplicate 1000_000_000 'hello';
-   }
-```
-
-```nginx
-
-   # echo back the client request
-   location /echoback {
-     echo_duplicate 1 $echo_client_request_headers;
-     echo "\r";
-
-     echo_read_request_body;
-
-     echo_request_body;
-   }
-```
-
-```nginx
-
-   # GET /multi will yields
-   #   querystring: foo=Foo
-   #   method: POST
-   #   body: hi
-   #   content length: 2
-   #   ///
-   #   querystring: bar=Bar
-   #   method: PUT
-   #   body: hello
-   #   content length: 5
-   #   ///
-   location /multi {
-       echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
-       echo_subrequest_async PUT '/sub' -q 'bar=Bar' -b 'hello';
-   }
-   location /sub {
-       echo "querystring: $query_string";
-       echo "method: $echo_request_method";
-       echo "body: $echo_request_body";
-       echo "content length: $http_content_length";
-       echo '///';
-   }
-```
-
-```nginx
-
-   # GET /merge?/foo.js&/bar/blah.js&/yui/baz.js will merge the .js resources together
-   location /merge {
-       default_type 'text/javascript';
-       echo_foreach_split '&' $query_string;
-           echo "/* JS File $echo_it */";
-           echo_location_async $echo_it;
-           echo;
-       echo_end;
-   }
-```
-
-```nginx
-
-   # accessing /if?val=abc yields the "hit" output
-   # while /if?val=bcd yields "miss":
-   location ^~ /if {
-       set $res miss;
-       if ($arg_val ~* '^a') {
-           set $res hit;
-           echo $res;
-       }
-       echo $res;
-   }
-```
-
-[Back to TOC](#table-of-contents)
-
-Description
-===========
-
-This module wraps lots of Nginx internal APIs for streaming input and output, parallel/sequential subrequests, timers and sleeping, as well as various meta data accessing.
-
-Basically it provides various utilities that help testing and debugging of other modules by trivially emulating different kinds of faked subrequest locations.
-
-People will also find it useful in real-world applications that need to
-
-1. serve static contents directly from memory (loading from the Nginx config file).
-1. wrap the upstream response with custom header and footer (kinda like the [addition module](http://nginx.org/en/docs/http/ngx_http_addition_module.html) but with contents read directly from the config file and Nginx variables).
-1. merge contents of various "Nginx locations" (i.e., subrequests) together in a single main request (using [echo_location](#echo_location) and its friends).
-
-This is a special dual-role module that can *lazily* serve as a content handler or register itself as an output filter only upon demand. By default, this module does not do anything at all.
-
-Technically, this module has also demonstrated the following techniques that might be helpful for module writers:
-
-1. Issue parallel subrequests directly from content handler.
-1. Issue chained subrequests directly from content handler, by passing continuation along the subrequest chain.
-1. Issue subrequests with all HTTP 1.1 methods and even an optional faked HTTP request body.
-1. Interact with the Nginx event model directly from content handler using custom events and timers, and resume the content handler back if necessary.
-1. Dual-role module that can (lazily) serve as a content handler or an output filter or both.
-1. Nginx config file variable creation and interpolation.
-1. Streaming output control using output_chain, flush and its friends.
-1. Read client request body from the content handler, and returns back (asynchronously) to the content handler after completion.
-1. Use Perl-based declarative [test suite](#test-suite) to drive the development of Nginx C modules.
-
-[Back to TOC](#table-of-contents)
-
-Content Handler Directives
-==========================
-
-Use of the following directives register this module to the current Nginx location as a content handler. If you want to use another module, like the [standard proxy module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), as the content handler, use the [filter directives](#filter-directives) provided by this module.
-
-All the content handler directives can be mixed together in a single Nginx location and they're supposed to run sequentially just as in the Bash scripting language.
-
-Every content handler directive supports variable interpolation in its arguments (if any).
-
-The MIME type set by the [standard default_type directive](http://nginx.org/en/docs/http/ngx_http_core_module.html#default_type) is respected by this module, as in:
-
-```nginx
-
-   location /hello {
-     default_type text/plain;
-     echo hello;
-   }
-```
-
-Then on the client side:
-
-```bash
-
-   $ curl -I 'http://localhost/echo'
-   HTTP/1.1 200 OK
-   Server: nginx/0.8.20
-   Date: Sat, 17 Oct 2009 03:40:19 GMT
-   Content-Type: text/plain
-   Connection: keep-alive
-```
-
-Since the [v0.22](#v022) release, all of the directives are allowed in the [rewrite module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)'s [if](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#if) directive block, for instance:
-
-```nginx
-
- location ^~ /if {
-     set $res miss;
-     if ($arg_val ~* '^a') {
-         set $res hit;
-         echo $res;
-     }
-     echo $res;
- }
-```
-
-[Back to TOC](#table-of-contents)
-
-echo
-----
-**syntax:** *echo \[options\] &lt;string&gt;...*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Sends arguments joined by spaces, along with a trailing newline, out to the client.
-
-Note that the data might be buffered by Nginx's underlying buffer. To force the output data flushed immediately, use the [echo_flush](#echo_flush) command just after `echo`, as in
-
-```nginx
-
-    echo hello world;
-    echo_flush;
-```
-
-When no argument is specified, *echo* emits the trailing newline alone, just like the *echo* command in shell.
-
-Variables may appear in the arguments. An example is
-
-```nginx
-
-    echo The current request uri is $request_uri;
-```
-
-where [$request_uri](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_uri) is a variable exposed by the [ngx_http_core_module](http://nginx.org/en/docs/http/ngx_http_core_module.html).
-
-This command can be used multiple times in a single location configuration, as in
-
-```nginx
-
- location /echo {
-     echo hello;
-     echo world;
- }
-```
-
-The output on the client side looks like this
-
-```bash
-
- $ curl 'http://localhost/echo'
- hello
- world
-```
-
-Special characters like newlines (`\n`) and tabs (`\t`) can be escaped using C-style escaping sequences. But a notable exception is the dollar sign (`$`). As of Nginx 0.8.20, there's still no clean way to escape this character. (A work-around might be to use a `$echo_dollor` variable that is always evaluated to the constant `$` character. This feature will possibly be introduced in a future version of this module.)
-
-As of the echo [v0.28](#v028) release, one can suppress the trailing newline character in the output by using the `-n` option, as in
-
-```nginx
-
- location /echo {
-     echo -n "hello, ";
-     echo "world";
- }
-```
-
-Accessing `/echo` gives
-
-```bash
-
- $ curl 'http://localhost/echo'
- hello, world
-```
-
-Leading `-n` in variable values won't take effect and will be emitted literally, as in
-
-```nginx
-
- location /echo {
-     set $opt -n;
-     echo $opt "hello,";
-     echo "world";
- }
-```
-
-This gives the following output
-
-```bash
-
- $ curl 'http://localhost/echo'
- -n hello,
- world
-```
-
-One can output leading `-n` literals and other options using the special `--` option like this
-
-```nginx
-
- location /echo {
-     echo -- -n is an option;
- }
-```
-
-which yields
-
-```bash
-
- $ curl 'http://localhost/echo'
- -n is an option
-```
-
-Use this form when you want to output anything leading with a dash (`-`).
-
-[Back to TOC](#table-of-contents)
-
-echo_duplicate
---------------
-**syntax:** *echo_duplicate &lt;count&gt; &lt;string&gt;*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Outputs duplication of a string indicated by the second argument, using the count specified in the first argument.
-
-For instance,
-
-```nginx
-
-   location /dup {
-       echo_duplicate 3 "abc";
-   }
-```
-
-will lead to the output of `"abcabcabc"`.
-
-Underscores are allowed in the count number, just like in Perl. For example, to emit 1000,000,000 instances of `"hello, world"`:
-
-```nginx
-
-   location /many_hellos {
-       echo_duplicate 1000_000_000 "hello, world";
-   }
-```
-
-The `count` argument could be zero, but not negative. The second `string` argument could be an empty string ("") likewise.
-
-Unlike the [echo](#echo) directive, no trailing newline is appended to the result. So it's possible to "abuse" this directive as a no-trailing-newline version of [echo](#echo) by using "count" 1, as in
-
-```nginx
-
-   location /echo_art {
-       echo_duplicate 2 '---';
-       echo_duplicate 1 ' END ';  # we don't want a trailing newline here
-       echo_duplicate 2 '---';
-       echo;  # we want a trailing newline here...
-   }
-```
-
-You get
-
-```bash
-   ------ END ------
-```
-
-But use of the `-n` option in [echo](#echo) is more appropriate for this purpose.
-
-This directive was first introduced in [version 0.11](#v011).
-
-[Back to TOC](#table-of-contents)
-
-echo_flush
-----------
-**syntax:** *echo_flush*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Forces the data potentially buffered by underlying Nginx output filters to send immediately to the client side via socket.
-
-Note that techically the command just emits a ngx_buf_t object with `flush` slot set to 1, so certain weird third-party output filter module could still block it before it reaches Nginx's (last) write filter.
-
-This directive does not take any argument.
-
-Consider the following example:
-
-```nginx
-
-   location /flush {
-      echo hello;
-
-      echo_flush;
-
-      echo_sleep 1;
-      echo world;
-   }
-```
-
-Then on the client side, using curl to access `/flush`, you'll see the "hello" line immediately, but only after 1 second, the last "world" line. Without calling `echo_flush` in the example above, you'll most likely see no output until 1 second is elapsed due to the internal buffering of Nginx.
-
-This directive will fail to flush the output buffer in case of subrequests get involved. Consider the following example:
-
-```nginx
-
-   location /main {
-       echo_location_async /sub;
-       echo hello;
-       echo_flush;
-   }
-   location /sub {
-       echo_sleep 1;
-   }
-```
-
-Then the client won't see "hello" appear even if `echo_flush` has been executed before the subrequest to `/sub` has actually started executing. The outputs of `/main` that are sent *after* [echo_location_async](#echo_location_async) will be postponed and buffered firmly.
-
-This does *not* apply to outputs sent before the subrequest initiated. For a modified version of the example given above:
-
-```nginx
-
-   location /main {
-       echo hello;
-       echo_flush;
-       echo_location_async /sub;
-   }
-   location /sub {
-       echo_sleep 1;
-   }
-```
-
-The client will immediately see "hello" before `/sub` enters sleeping.
-
-See also [echo](#echo), [echo_sleep](#echo_sleep), and [echo_location_async](#echo_location_async).
-
-[Back to TOC](#table-of-contents)
-
-echo_sleep
-----------
-**syntax:** *echo_sleep &lt;seconds&gt;*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Sleeps for the time period specified by the argument, which is in seconds.
-
-This operation is non-blocking on server side, so unlike the [echo_blocking_sleep](#echo_blocking_sleep) directive, it won't block the whole Nginx worker process.
-
-The period might takes three digits after the decimal point and must be greater than 0.001.
-
-An example is
-
-```nginx
-
-    location /echo_after_sleep {
-        echo_sleep 1.234;
-        echo resumed!;
-    }
-```
-
-Behind the scene, it sets up a per-request "sleep" ngx_event_t object, and adds a timer using that custom event to the Nginx event model and just waits for a timeout on that event. Because the "sleep" event is per-request, this directive can work in parallel subrequests.
-
-[Back to TOC](#table-of-contents)
-
-echo_blocking_sleep
--------------------
-**syntax:** *echo_blocking_sleep &lt;seconds&gt;*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-This is a blocking version of the [echo_sleep](#echo_sleep) directive.
-
-See the documentation of [echo_sleep](#echo_sleep) for more detail.
-
-Behind the curtain, it calls the ngx_msleep macro provided by the Nginx core which maps to usleep on POSIX-compliant systems.
-
-Note that this directive will block the current Nginx worker process completely while being executed, so never use it in production environment.
-
-[Back to TOC](#table-of-contents)
-
-echo_reset_timer
-----------------
-**syntax:** *echo_reset_timer*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Reset the timer begin time to *now*, i.e., the time when this command is executed during request.
-
-The timer begin time is default to the starting time of the current request and can be overridden by this directive, potentially multiple times in a single location. For example:
-
-```nginx
-
-   location /timed_sleep {
-       echo_sleep 0.03;
-       echo "$echo_timer_elapsed sec elapsed.";
-
-       echo_reset_timer;
-
-       echo_sleep 0.02;
-       echo "$echo_timer_elapsed sec elapsed.";
-   }
-```
-
-The output on the client side might be
-
-```bash
-
- $ curl 'http://localhost/timed_sleep'
- 0.032 sec elapsed.
- 0.020 sec elapsed.
-```
-
-The actual figures you get on your side may vary a bit due to your system's current activities.
-
-Invocation of this directive will force the underlying Nginx timer to get updated to the current system time (regardless the timer resolution specified elsewhere in the config file). Furthermore, references of the [$echo_timer_elapsed](#echo_timer_elapsed) variable will also trigger timer update forcibly.
-
-See also [echo_sleep](#echo_sleep) and [$echo_timer_elapsed](#echo_timer_elapsed).
-
-[Back to TOC](#table-of-contents)
-
-echo_read_request_body
-----------------------
-**syntax:** *echo_read_request_body*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Explicitly reads request body so that the [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) variable will always have non-empty values (unless the body is so big that it has been saved by Nginx to a local temporary file).
-
-Note that this might not be the original client request body because the current request might be a subrequest with a "artificial" body specified by its parent.
-
-This directive does not generate any output itself, just like [echo_sleep](#echo_sleep).
-
-Here's an example for echo'ing back the original HTTP client request (both headers and body are included):
-
-```nginx
-
-   location /echoback {
-     echo_duplicate 1 $echo_client_request_headers;
-     echo "\r";
-     echo_read_request_body;
-     echo $request_body;
-   }
-```
-
-The content of `/echoback` looks like this on my side (I was using Perl's LWP utility to access this location on the server):
-
-```bash
-
-   $ (echo hello; echo world) | lwp-request -m POST 'http://localhost/echoback'
-   POST /echoback HTTP/1.1
-   TE: deflate,gzip;q=0.3
-   Connection: TE, close
-   Host: localhost
-   User-Agent: lwp-request/5.818 libwww-perl/5.820
-   Content-Length: 12
-   Content-Type: application/x-www-form-urlencoded
-
-   hello
-   world
-```
-
-Because `/echoback` is the main request, [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) holds the original client request body.
-
-Before Nginx 0.7.56, it makes no sense to use this directive because [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) was first introduced in Nginx 0.7.58.
-
-This directive itself was first introduced in the echo module's [v0.14 release](#v014).
-
-[Back to TOC](#table-of-contents)
-
-echo_location_async
--------------------
-**syntax:** *echo_location_async &lt;location&gt; [&lt;url_args&gt;]*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Issue GET subrequest to the location specified (first argument) with optional url arguments specified in the second argument.
-
-As of Nginx 0.8.20, the `location` argument does *not* support named location, due to a limitation in the `ngx_http_subrequest` function. The same is true for its brother, the [echo_location](#echo_location) directive.
-
-A very simple example is
-
-```nginx
-
- location /main {
-     echo_location_async /sub;
-     echo world;
- }
- location /sub {
-     echo hello;
- }
-```
-
-Accessing `/main` gets
-
-```bash
-
-   hello
-   world
-```
-
-Calling multiple locations in parallel is also possible:
-
-```nginx
-
- location /main {
-     echo_reset_timer;
-     echo_location_async /sub1;
-     echo_location_async /sub2;
-     echo "took $echo_timer_elapsed sec for total.";
- }
- location /sub1 {
-     echo_sleep 2; # sleeps 2 sec
-     echo hello;
- }
- location /sub2 {
-     echo_sleep 1; # sleeps 1 sec
-     echo world;
- }
-```
-
-Accessing `/main` yields
-
-```bash
-
-   $ time curl 'http://localhost/main'
-   hello
-   world
-   took 0.000 sec for total.
-
-   real  0m2.006s
-   user  0m0.000s
-   sys   0m0.004s
-```
-
-You can see that the main handler `/main` does *not* wait the subrequests `/sub1` and `/sub2` to complete and quickly goes on, hence the "0.000 sec" timing result. The whole request, however takes approximately 2 sec in total to complete because `/sub1` and `/sub2` run in parallel (or "concurrently" to be more accurate).
-
-If you use [echo_blocking_sleep](#echo_blocking_sleep) in the previous example instead, then you'll get the same output, but with 3 sec total response time, because "blocking sleep" blocks the whole Nginx worker process.
-
-Locations can also take an optional querystring argument, for instance
-
-```nginx
-
- location /main {
-     echo_location_async /sub 'foo=Foo&bar=Bar';
- }
- location /sub {
-     echo $arg_foo $arg_bar;
- }
-```
-
-Accessing `/main` yields
-
-```bash
-
-   $ curl 'http://localhost/main'
-   Foo Bar
-```
-
-Querystrings is *not* allowed to be concatenated onto the `location` argument with "?" directly, for example, `/sub?foo=Foo&bar=Bar` is an invalid location, and shouldn't be fed as the first argument to this directive.
-
-Technically speaking, this directive is an example that Nginx content handler issues one or more subrequests directly. AFAIK, the [fancyindex module](https://connectical.com/projects/ngx-fancyindex/wiki) also does such kind of things ;)
-
-Nginx named locations like `@foo` is *not* supported here.
-
-This directive is logically equivalent to the GET version of [echo_subrequest_async](#echo_subrequest_async). For example,
-
-```nginx
-
-   echo_location_async /foo 'bar=Bar';
-```
-
-is logically equivalent to
-
-```nginx
-
-   echo_subrequest_async GET /foo -q 'bar=Bar';
-```
-
-But calling this directive is slightly faster than calling [echo_subrequest_async](#echo_subrequest_async) using `GET` because we don't have to parse the HTTP method names like `GET` and options like `-q`.
-
-This directive is first introduced in [version 0.09](#v009) of this module and requires at least Nginx 0.7.46.
-
-[Back to TOC](#table-of-contents)
-
-echo_location
--------------
-**syntax:** *echo_location &lt;location&gt; [&lt;url_args&gt;]*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Just like the [echo_location_async](#echo_location_async) directive, but `echo_location` issues subrequests *in series* rather than in parallel. That is, the content handler directives following this directive won't be executed until the subrequest issued by this directive completes.
-
-The final response body is almost always equivalent to the case when [echo_location_async](#echo_location_async) is used instead, only if timing variables is used in the outputs.
-
-Consider the following example:
-
-```nginx
-
- location /main {
-     echo_reset_timer;
-     echo_location /sub1;
-     echo_location /sub2;
-     echo "took $echo_timer_elapsed sec for total.";
- }
- location /sub1 {
-     echo_sleep 2;
-     echo hello;
- }
- location /sub2 {
-     echo_sleep 1;
-     echo world;
- }
-```
-
-The location `/main` above will take for total 3 sec to complete (compared to 2 sec if [echo_location_async](#echo_location_async) is used instead here). Here's the result in action on my machine:
-
-```bash
-
-   $ curl 'http://localhost/main'
-   hello
-   world
-   took 3.003 sec for total.
-
-   real  0m3.027s
-   user  0m0.020s
-   sys   0m0.004s
-```
-
-This directive is logically equivalent to the GET version of [echo_subrequest](#echo_subrequest). For example,
-
-```nginx
-
-   echo_location /foo 'bar=Bar';
-```
-
-is logically equivalent to
-
-```nginx
-
-   echo_subrequest GET /foo -q 'bar=Bar';
-```
-
-But calling this directive is slightly faster than calling [echo_subrequest](#echo_subrequest) using `GET` because we don't have to parse the HTTP method names like `GET` and options like `-q`.
-
-Behind the scene, it creates an `ngx_http_post_subrequest_t` object as a *continuation* and passes it into the `ngx_http_subrequest` function call. Nginx will later reopen this "continuation" in the subrequest's `ngx_http_finalize_request` function call. We resumes the execution of the parent-request's content handler and starts to run the next directive (command) if any.
-
-Nginx named locations like `@foo` is *not* supported here.
-
-This directive was first introduced in the [release v0.12](#v012).
-
-See also [echo_location_async](#echo_location_async) for more details about the meaning of the arguments.
-
-[Back to TOC](#table-of-contents)
-
-echo_subrequest_async
----------------------
-**syntax:** *echo_subrequest_async &lt;HTTP_method&gt; &lt;location&gt; [-q &lt;url_args&gt;] [-b &lt;request_body&gt;] [-f &lt;request_body_path&gt;]*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Initiate an asynchronous subrequest using HTTP method, an optional url arguments (or querystring) and an optional request body which can be defined as a string or as a path to a file which contains the body.
-
-This directive is very much like a generalized version of the [echo_location_async](#echo_location_async) directive.
-
-Here's a small example demonstrating its usage:
-
-```nginx
-
- location /multi {
-     # body defined as string
-     echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
-     # body defined as path to a file, relative to nginx prefix path if not absolute
-     echo_subrequest_async PUT '/sub' -q 'bar=Bar' -f '/tmp/hello.txt';
- }
- location /sub {
-     echo "querystring: $query_string";
-     echo "method: $echo_request_method";
-     echo "body: $echo_request_body";
-     echo "content length: $http_content_length";
-     echo '///';
- }
-```
-
-Then on the client side:
-
-```bash
-
-   $ echo -n hello > /tmp/hello.txt
-   $ curl 'http://localhost/multi'
-   querystring: foo=Foo
-   method: POST
-   body: hi
-   content length: 2
-   ///
-   querystring: bar=Bar
-   method: PUT
-   body: hello
-   content length: 5
-   ///
-```
-
-Here's more funny example using the standard [proxy module](#httpproxymodule) to handle the subrequest:
-
-```nginx
-
- location /main {
-     echo_subrequest_async POST /sub -b 'hello, world';
- }
- location /sub {
-     proxy_pass $scheme://127.0.0.1:$server_port/proxied;
- }
- location /proxied {
-     echo "method: $echo_request_method.";
-
-     # we need to read body explicitly here...or $echo_request_body
-     #   will evaluate to empty ("")
-     echo_read_request_body;
-
-     echo "body: $echo_request_body.";
- }
-```
-
-Then on the client side, we can see that
-
-```bash
-
-   $ curl 'http://localhost/main'
-   method: POST.
-   body: hello, world.
-```
-
-Nginx named locations like `@foo` is *not* supported here.
-
-This directive takes several options:
-
-
-    -q <url_args>        Specify the URL arguments (or URL querystring) for the subrequest.
-
-    -f <path>            Specify the path for the file whose content will be serve as the
-                         subrequest's request body.
-
-    -b <data>            Specify the request body data
-
-
-This directive was first introduced in the [release v0.15](#v015).
-
-The `-f` option to define a file path for the body was introduced in the [release v0.35](#v035).
-
-See also the [echo_subrequest](#echo_subrequest) and [echo_location_async](#echo_location_async) directives.
-
-[Back to TOC](#table-of-contents)
-
-echo_subrequest
----------------
-**syntax:** *echo_subrequest &lt;HTTP_method&gt; &lt;location&gt; [-q &lt;url_args&gt;] [-b &lt;request_body&gt;] [-f &lt;request_body_path&gt;]*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-This is the synchronous version of the [echo_subrequest_async](#echo_subrequest_async) directive. And just like [echo_location](#echo_location), it does not block the Nginx worker process (while [echo_blocking_sleep](#echo_blocking_sleep) does), rather, it uses continuation to pass control along the subrequest chain.
-
-See [echo_subrequest_async](#echo_subrequest_async) for more details.
-
-Nginx named locations like `@foo` is *not* supported here.
-
-This directive was first introduced in the [release v0.15](#v015).
-
-[Back to TOC](#table-of-contents)
-
-echo_foreach_split
-------------------
-**syntax:** *echo_foreach_split &lt;delimiter&gt; &lt;string&gt;*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Split the second argument `string` using the delimiter specified in the first argument, and then iterate through the resulting items. For instance:
-
-```nginx
-
-   location /loop {
-     echo_foreach_split ',' $arg_list;
-       echo "item: $echo_it";
-     echo_end;
-   }
-```
-
-Accessing /main yields
-
-```bash
-
-   $ curl 'http://localhost/loop?list=cat,dog,mouse'
-   item: cat
-   item: dog
-   item: mouse
-```
-
-As seen in the previous example, this directive should always be accompanied by an [echo_end](#echo_end) directive.
-
-Parallel `echo_foreach_split` loops are allowed, but nested ones are currently forbidden.
-
-The `delimiter` argument could contain *multiple* arbitrary characters, like
-
-```nginx
-
-   # this outputs "cat\ndog\nmouse\n"
-   echo_foreach_split -- '-a-' 'cat-a-dog-a-mouse';
-     echo $echo_it;
-   echo_end;
-```
-
-Logically speaking, this looping structure is just the `foreach` loop combined with a `split` function call in Perl (using the previous example):
-
-```perl
-
-    foreach (split ',', $arg_list) {
-        print "item $_\n";
-    }
-```
-
-People will also find it useful in merging multiple `.js` or `.css` resources into a whole. Here's an example:
-
-```nginx
-
-   location /merge {
-       default_type 'text/javascript';
-
-       echo_foreach_split '&' $query_string;
-           echo "/* JS File $echo_it */";
-           echo_location_async $echo_it;
-           echo;
-       echo_end;
-   }
-```
-
-Then accessing /merge to merge the `.js` resources specified in the query string:
-
-```bash
-
-   $ curl 'http://localhost/merge?/foo/bar.js&/yui/blah.js&/baz.js'
-```
-
-One can also use third-party Nginx cache module to cache the merged response generated by the `/merge` location in the previous example.
-
-This directive was first introduced in the [release v0.17](#v017).
-
-[Back to TOC](#table-of-contents)
-
-echo_end
---------
-**syntax:** *echo_end*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-This directive is used to terminate the body of looping and conditional control structures like [echo_foreach_split](#echo_foreach_split).
-
-This directive was first introduced in the [release v0.17](#v017).
-
-[Back to TOC](#table-of-contents)
-
-echo_request_body
------------------
-**syntax:** *echo_request_body*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Outputs the contents of the request body previous read.
-
-Behind the scene, it's implemented roughly like this:
-
-```C
-
-   if (r->request_body && r->request_body->bufs) {
-       return ngx_http_output_filter(r, r->request_body->bufs);
-   }
-```
-
-Unlike the [$echo_request_body](#echo_request_body) and $request_body variables, this directive will show the whole request body even if some parts or all parts of it are saved in temporary files on the disk.
-
-It is a "no-op" if no request body has been read yet.
-
-This directive was first introduced in the [release v0.18](#v018).
-
-See also [echo_read_request_body](#echo_read_request_body) and the [chunkin module](http://github.com/agentzh/chunkin-nginx-module).
-
-[Back to TOC](#table-of-contents)
-
-echo_exec
----------
-**syntax:** *echo_exec &lt;location&gt; [&lt;query_string&gt;]*
-
-**syntax:** *echo_exec &lt;named_location&gt;*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Does an internal redirect to the location specified. An optional query string can be specified for normal locations, as in
-
-```nginx
-
-   location /foo {
-       echo_exec /bar weight=5;
-   }
-   location /bar {
-       echo $arg_weight;
-   }
-```
-
-Or equivalently
-
-```nginx
-
-   location /foo {
-       echo_exec /bar?weight=5;
-   }
-   location /bar {
-       echo $arg_weight;
-   }
-```
-
-Named locations are also supported. Here's an example:
-
-```nginx
-
-   location /foo {
-       echo_exec @bar;
-   }
-   location @bar {
-       # you'll get /foo rather than @bar
-       #  due to a potential bug in nginx.
-       echo $echo_request_uri;
-   }
-```
-
-But query string (if any) will always be ignored for named location redirects due to a limitation in the `ngx_http_named_location` function.
-
-Never try to echo things before the `echo_exec` directive or you won't see the proper response of the location you want to redirect to. Because any echoing will cause the original location handler to send HTTP headers before the redirection happens.
-
-Technically speaking, this directive exposes the Nginx internal API functions `ngx_http_internal_redirect` and `ngx_http_named_location`.
-
-This directive was first introduced in the [v0.21 release](#v021).
-
-[Back to TOC](#table-of-contents)
-
-echo_status
------------
-**syntax:** *echo_status &lt;status-num&gt;*
-
-**default:** *echo_status 200*
-
-**context:** *location, location if*
-
-**phase:** *content*
-
-Specify the default response status code. Default to `200`. This directive is declarative and the relative order with other echo-like directives is not important.
-
-Here is an example,
-
-```nginx
-
- location = /bad {
-     echo_status 404;
-     echo "Something is missing...";
- }
-```
-
-then we get a response like this:
-
-
-    HTTP/1.1 404 Not Found
-    Server: nginx/1.2.1
-    Date: Sun, 24 Jun 2012 03:58:18 GMT
-    Content-Type: text/plain
-    Transfer-Encoding: chunked
-    Connection: keep-alive
-
-    Something is missing...
-
-
-This directive was first introduced in the `v0.40` release.
-
-[Back to TOC](#table-of-contents)
-
-Filter Directives
-=================
-
-Use of the following directives trigger the filter registration of this module. By default, no filter will be registered by this module.
-
-Every filter directive supports variable interpolation in its arguments (if any).
-
-[Back to TOC](#table-of-contents)
-
-echo_before_body
-----------------
-**syntax:** *echo_before_body \[options\] \[argument\]...*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *output filter*
-
-It's the filter version of the [echo](#echo) directive, and prepends its output to the beginning of the original outputs generated by the underlying content handler.
-
-An example is
-
-```nginx
-
- location /echo {
-     echo_before_body hello;
-     proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
- }
- location /echo/more {
-     echo world
- }
-```
-
-Accessing `/echo` from the client side yields
-
-```bash
-
-   hello
-   world
-```
-
-In the previous sample, we borrow the [standard proxy module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) to serve as the underlying content handler that generates the "main contents".
-
-Multiple instances of this filter directive are also allowed, as in:
-
-```nginx
-
- location /echo {
-     echo_before_body hello;
-     echo_before_body world;
-     echo !;
- }
-```
-
-On the client side, the output is like
-
-```bash
-
-   $ curl 'http://localhost/echo'
-   hello
-   world
-   !
-```
-
-In this example, we also use the [content handler directives](#content-handler-directives) provided by this module as the underlying content handler.
-
-This directive also supports the `-n` and `--` options like the [echo](#echo) directive.
-
-This directive can be mixed with its brother directive [echo_after_body](#echo_after_body).
-
-[Back to TOC](#table-of-contents)
-
-echo_after_body
----------------
-**syntax:** *echo_after_body \[argument\]...*
-
-**default:** *no*
-
-**context:** *location, location if*
-
-**phase:** *output filter*
-
-It's very much like the [echo_before_body](#echo_before_body) directive, but *appends* its output to the end of the original outputs generated by the underlying content handler.
-
-Here's a simple example:
-
-```nginx
-
- location /echo {
-     echo_after_body hello;
-     proxy_pass http://127.0.0.1:$server_port$request_uri/more;
- }
- location /echo/more {
-     echo world
- }
-```
-
-Accessing `/echo` from the client side yields
-
-
-      world
-      hello
-
-
-Multiple instances are allowed, as in:
-
-```nginx
-
- location /echo {
-     echo_after_body hello;
-     echo_after_body world;
-     echo i;
-     echo say;
- }
-```
-
-The output on the client side while accessing the `/echo` location looks like
-
-
-      i
-      say
-      hello
-      world
-
-
-This directive also supports the `-n` and `--` options like the [echo](#echo) directive.
-
-This directive can be mixed with its brother directive [echo_before_body](#echo_before_body).
-
-[Back to TOC](#table-of-contents)
-
-Variables
-=========
-
-[Back to TOC](#table-of-contents)
-
-$echo_it
---------
-
-This is a "topic variable" used by [echo_foreach_split](#echo_foreach_split), just like the `$_` variable in Perl.
-
-[Back to TOC](#table-of-contents)
-
-$echo_timer_elapsed
--------------------
-
-This variable holds the seconds elapsed since the start of the current request (might be a subrequest though) or the last invocation of the [echo_reset_timer](#echo_reset_timer) command.
-
-The timing result takes three digits after the decimal point.
-
-References of this variable will force the underlying Nginx timer to update to the current system time, regardless the timer resolution settings elsewhere in the config file, just like the [echo_reset_timer](#echo_reset_timer) directive.
-
-[Back to TOC](#table-of-contents)
-
-$echo_request_body
-------------------
-
-Evaluates to the current (sub)request's request body previously read if no part of the body has been saved to a temporary file. To always show the request body even if it's very large, use the [echo_request_body](#echo_request_body) directive.
-
-[Back to TOC](#table-of-contents)
-
-$echo_request_method
---------------------
-
-Evaluates to the HTTP request method of the current request (it can be a subrequest).
-
-Behind the scene, it just takes the string data stored in `r->method_name`.
-
-Compare it to the [$echo_client_request_method](#echo_client_request_method) variable.
-
-At least for Nginx 0.8.20 and older, the [$request_method](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_method) variable provided by the [http core module](http://nginx.org/en/docs/http/ngx_http_core_module.html) is actually doing what our [$echo_client_request_method](#echo_client_request_method) is doing.
-
-This variable was first introduced in our [v0.15 release](#v015).
-
-[Back to TOC](#table-of-contents)
-
-$echo_client_request_method
----------------------------
-
-Always evaluates to the main request's HTTP method even if the current request is a subrequest.
-
-Behind the scene, it just takes the string data stored in `r->main->method_name`.
-
-Compare it to the [$echo_request_method](#echo_request_method) variable.
-
-This variable was first introduced in our [v0.15 release](#v015).
-
-[Back to TOC](#table-of-contents)
-
-$echo_client_request_headers
-----------------------------
-
-Evaluates to the original client request's headers.
-
-Just as the name suggests, it will always take the main request (or the client request) even if it's currently executed in a subrequest.
-
-A simple example is below:
-
-```nginx
-
-   location /echoback {
-      echo "headers are:"
-      echo $echo_client_request_headers;
-   }
-```
-
-Accessing `/echoback` yields
-
-```bash
-
-   $ curl 'http://localhost/echoback'
-   headers are
-   GET /echoback HTTP/1.1
-   User-Agent: curl/7.18.2 (i486-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.8g
-   Host: localhost:1984
-   Accept: */*
-```
-
-Behind the scene, it recovers `r->main->header_in` (or the large header buffers, if any) on the C level and does not construct the headers itself by traversing parsed results in the request object.
-
-This varible is always evaluated to an empty value in HTTP/2 requests for now due to the current implementation.
-
-This variable was first introduced in [version 0.15](#v015).
-
-[Back to TOC](#table-of-contents)
-
-$echo_cacheable_request_uri
----------------------------
-
-Evaluates to the parsed form of the URI (usually led by `/`) of the current (sub-)request. Unlike the [$echo_request_uri](#echo_request_uri) variable, it is cacheable.
-
-See [$echo_request_uri](#echo_request_uri) for more details.
-
-This variable was first introduced in [version 0.17](#v017).
-
-[Back to TOC](#table-of-contents)
-
-$echo_request_uri
------------------
-
-Evaluates to the parsed form of the URI (usually led by `/`) of the current (sub-)request. Unlike the [$echo_cacheable_request_uri](#echo_cacheable_request_uri) variable, it is *not* cacheable.
-
-This is quite different from the [$request_uri](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_uri) variable exported by the [ngx_http_core_module](http://nginx.org/en/docs/http/ngx_http_core_module.html), because `$request_uri` is the *unparsed* form of the current request's URI.
-
-This variable was first introduced in [version 0.17](#v017).
-
-[Back to TOC](#table-of-contents)
-
-$echo_incr
-----------
-
-It is a counter that always generate the current counting number, starting from 1. The counter is always associated with the main request even if it is accessed within a subrequest.
-
-Consider the following example
-
-```Nginx
-
- location /main {
-     echo "main pre: $echo_incr";
-     echo_location_async /sub;
-     echo_location_async /sub;
-     echo "main post: $echo_incr";
- }
- location /sub {
-     echo "sub: $echo_incr";
- }
-```
-
-Accessing `/main` yields
-
-    main pre: 1
-    sub: 3
-    sub: 4
-    main post: 2
-
-This directive was first introduced in the [v0.18 release](#v018).
-
-[Back to TOC](#table-of-contents)
-
-$echo_response_status
----------------------
-
-Evaluates to the status code of the current (sub)request, null if not any.
-
-Behind the scene, it's just the textual representation of `r->headers_out->status`.
-
-This directive was first introduced in the [v0.23 release](#v023).
-
-[Back to TOC](#table-of-contents)
-
-Installation
-============
-
-You're recommended to install this module (as well as the Nginx core and many other goodies) via the [OpenResty bundle](http://openresty.org). See [the detailed instructions](http://openresty.org/#Installation) for downloading and installing OpenResty into your system. This is the easiest and most safe way to set things up.
-
-Alternatively, you can install this module manually with the Nginx source:
-
-Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
-the version 1.11.2 (see [nginx compatibility](#compatibility)), and then build the source with this module:
-
-```bash
-
- $ wget 'http://nginx.org/download/nginx-1.11.2.tar.gz'
- $ tar -xzvf nginx-1.11.2.tar.gz
- $ cd nginx-1.11.2/
-
- # Here we assume you would install you nginx under /opt/nginx/.
- $ ./configure --prefix=/opt/nginx \
-     --add-module=/path/to/echo-nginx-module
-
- $ make -j2
- $ make install
-```
-
-Download the latest version of the release tarball of this module from [echo-nginx-module file list](https://github.com/openresty/echo-nginx-module/tags).
-
-Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
-`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
-directive, for example,
-
-```nginx
-load_module /path/to/modules/ngx_http_echo_module.so;
-```
-
-Also, this module is included and enabled by default in the [OpenResty bundle](http://openresty.org).
-
-[Back to TOC](#table-of-contents)
-
-Compatibility
-=============
-
-The following versions of Nginx should work with this module:
-
-* **1.16.x**
-* **1.15.x**                      (last tested: 1.15.8)
-* **1.14.x**
-* **1.13.x**                      (last tested: 1.13.6)
-* **1.12.x**
-* **1.11.x**                      (last tested: 1.11.2)
-* **1.10.x**
-* **1.9.x**                       (last tested: 1.9.15)
-* **1.8.x**
-* **1.7.x**                       (last tested: 1.7.10)
-* **1.6.x**
-* **1.5.x**                       (last tested: 1.5.12)
-* **1.4.x**                       (last tested: 1.4.4)
-* **1.3.x**                       (last tested: 1.3.7)
-* **1.2.x**                       (last tested: 1.2.9)
-* **1.1.x**                       (last tested: 1.1.5)
-* **1.0.x**                       (last tested: 1.0.11)
-* **0.9.x**                       (last tested: 0.9.4)
-* **0.8.x**                       (last tested: 0.8.54)
-* **0.7.x >= 0.7.21**             (last tested: 0.7.68)
-
-In particular,
-
-* the directive [echo_location_async](#echo_location_async) and its brother [echo_subrequest_async](#echo_subrequest_async) do *not* work with **0.7.x < 0.7.46**.
-* the [echo_after_body](#echo_after_body) directive does *not* work at all with nginx **< 0.8.7**.
-* the [echo_sleep](#echo_sleep) directive cannot be used after [echo_location](#echo_location) or [echo_subrequest](#echo_subrequest) for nginx **< 0.8.11**.
-
-Earlier versions of Nginx like 0.6.x and 0.5.x will *not* work at all.
-
-If you find that any particular version of Nginx above 0.7.21 does not work with this module, please consider [reporting a bug](#report-bugs).
-
-[Back to TOC](#table-of-contents)
-
-Modules that use this module for testing
-========================================
-
-The following modules take advantage of this `echo` module in their test suite:
-
-* The [memc](http://github.com/openresty/memc-nginx-module) module that supports almost the whole memcached TCP protocol.
-* The [chunkin](http://github.com/agentzh/chunkin-nginx-module) module that adds HTTP 1.1 chunked input support to Nginx.
-* The [headers_more](http://github.com/openresty/headers-more-nginx-module) module that allows you to add, set, and clear input and output headers under the conditions that you specify.
-* The `echo` module itself.
-
-Please mail me other modules that use `echo` in any form and I'll add them to the list above :)
-
-[Back to TOC](#table-of-contents)
-
-Community
-=========
-
-[Back to TOC](#table-of-contents)
-
-English Mailing List
---------------------
-
-The [openresty-en](https://groups.google.com/group/openresty-en) mailing list is for English speakers.
-
-[Back to TOC](#table-of-contents)
-
-Chinese Mailing List
---------------------
-
-The [openresty](https://groups.google.com/group/openresty) mailing list is for Chinese speakers.
-
-[Back to TOC](#table-of-contents)
-
-Report Bugs
-===========
-
-Although a lot of effort has been put into testing and code tuning, there must be some serious bugs lurking somewhere in this module. So whenever you are bitten by any quirks, please don't hesitate to
-
-1. create a ticket on the [issue tracking interface](https://github.com/openresty/echo-nginx-module/issues) provided by GitHub,
-1. or send a bug report, questions, or even patches to the [OpenResty Community](#community).
-
-[Back to TOC](#table-of-contents)
-
-Source Repository
-=================
-
-Available on github at [openresty/echo-nginx-module](https://github.com/openresty/echo-nginx-module).
-
-[Back to TOC](#table-of-contents)
-
-Changes
-=======
-
-The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
-
-<http://openresty.org/#Changes>
-
-[Back to TOC](#table-of-contents)
-
-Test Suite
-==========
-
-This module comes with a Perl-driven test suite. The [test cases](https://github.com/openresty/echo-nginx-module/tree/master/t/) are
-[declarative](https://github.com/openresty/echo-nginx-module/blob/master/t/echo.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Nginx) module in the Perl world.
-
-To run it on your side:
-
-```bash
-
- $ PATH=/path/to/your/nginx-with-echo-module:$PATH prove -r t
-```
-
-You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
-
-Because a single nginx server (by default, `localhost:1984`) is used across all the test scripts (`.t` files), it's meaningless to run the test suite in parallel by specifying `-jN` when invoking the `prove` utility.
-
-Some parts of the test suite requires standard modules [proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html) and [SSI](http://nginx.org/en/docs/http/ngx_http_ssi_module.html) to be enabled as well when building Nginx.
-
-[Back to TOC](#table-of-contents)
-
-TODO
-====
-
-* Fix the [echo_after_body](#echo_after_body) directive in subrequests.
-* Add directives *echo_read_client_request_body* and *echo_request_headers*.
-* Add new directive *echo_log* to use Nginx's logging facility directly from the config file and specific loglevel can be specified, as in
-
-```nginx
-
-   echo_log debug "I am being called.";
-```
-
-* Add support for options `-h` and `-t` to [echo_subrequest_async](#echo_subrequest_async) and [echo_subrequest](#echo_subrequest). For example
-
-```nginx
-
-   echo_subrequest POST /sub -q 'foo=Foo&bar=Bar' -b 'hello' -t 'text/plan' -h 'X-My-Header: blah blah'
-```
-
-* Add options to control whether a subrequest should inherit cached variables from its parent request (i.e. the current request that is calling the subrequest in question). Currently none of the subrequests issued by this module inherit the cached variables from the parent request.
-* Add new variable *$echo_active_subrequests* to show `r->main->count - 1`.
-* Add the *echo_file* and *echo_cached_file* directives.
-* Add new varaible *$echo_request_headers* to accompany the existing [$echo_client_request_headers](#echo_client_request_headers) variable.
-* Add new directive *echo_foreach*, as in
-
-```nginx
-
-   echo_foreach 'cat' 'dog' 'mouse';
-     echo_location_async "/animals/$echo_it";
-   echo_end;
-```
-
-* Add new directive *echo_foreach_range*, as in
-
-```nginx
-
-   echo_foreach_range '[1..100]' '[a-zA-z0-9]';
-     echo_location_async "/item/$echo_it";
-   echo_end;
-```
-
-* Add new directive *echo_repeat*, as in
-
-```nginx
-
-   echo_repeat 10 $i {
-       echo "Page $i";
-       echo_location "/path/to/page/$i";
-   }
-```
-
-This is just another way of saying
-
-```nginx
-
-   echo_foreach_range $i [1..10];
-       echo "Page $i";
-       echo_location "/path/to/page/$i";
-   echo_end;
-```
-
-Thanks Marcus Clyne for providing this idea.
-
-* Add new variable $echo_random which always returns a random non-negative integer with the lower/upper limit specified by the new directives `echo_random_min` and `echo_random_max`. For example,
-
-```nginx
-
-   echo_random_min  10
-   echo_random_max  200
-   echo "random number: $echo_random";
-```
-
-Thanks Marcus Clyne for providing this idea.
-
-[Back to TOC](#table-of-contents)
-
-Getting involved
-================
-
-You'll be very welcomed to submit patches to the [author](#author) or just ask for a commit bit to the [source repository](#source-repository) on GitHub.
-
-[Back to TOC](#table-of-contents)
-
-Author
-======
-
-Yichun "agentzh" Zhang (章亦春) *&lt;agentzh@gmail.com&gt;*, OpenResty Inc.
-
-This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
-
-[Back to TOC](#table-of-contents)
-
-Copyright & License
-===================
-
-Copyright (c) 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
-
-This module is licensed under the terms of the BSD license.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-[Back to TOC](#table-of-contents)
-
-See Also
-========
-
-* The original [blog post](http://agentzh.blogspot.com/2009/10/hacking-on-nginx-echo-module.html) about this module's initial development.
-* The standard [addition filter module](http://nginx.org/en/docs/http/ngx_http_addition_module.html).
-* The standard [proxy module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html).
-* The [OpenResty](http://openresty.org) bundle.
-
-[Back to TOC](#table-of-contents)
-
diff --git a/debian/modules/http-echo/config b/debian/modules/http-echo/config
deleted file mode 100644
index 4bf0f00..0000000
--- a/debian/modules/http-echo/config
+++ /dev/null
@@ -1,63 +0,0 @@
-ngx_addon_name=ngx_http_echo_module
-
-ECHO_SRCS="                                                                 \
-        $ngx_addon_dir/src/ngx_http_echo_module.c                           \
-        $ngx_addon_dir/src/ngx_http_echo_util.c                             \
-        $ngx_addon_dir/src/ngx_http_echo_timer.c                            \
-        $ngx_addon_dir/src/ngx_http_echo_var.c                              \
-        $ngx_addon_dir/src/ngx_http_echo_handler.c                          \
-        $ngx_addon_dir/src/ngx_http_echo_filter.c                           \
-        $ngx_addon_dir/src/ngx_http_echo_sleep.c                            \
-        $ngx_addon_dir/src/ngx_http_echo_location.c                         \
-        $ngx_addon_dir/src/ngx_http_echo_echo.c                             \
-        $ngx_addon_dir/src/ngx_http_echo_request_info.c                     \
-        $ngx_addon_dir/src/ngx_http_echo_subrequest.c                       \
-        $ngx_addon_dir/src/ngx_http_echo_foreach.c                          \
-        "
-
-ECHO_DEPS="                                                                 \
-        $ngx_addon_dir/src/ddebug.h                                         \
-        $ngx_addon_dir/src/ngx_http_echo_module.h                           \
-        $ngx_addon_dir/src/ngx_http_echo_handler.h                          \
-        $ngx_addon_dir/src/ngx_http_echo_util.h                             \
-        $ngx_addon_dir/src/ngx_http_echo_sleep.h                            \
-        $ngx_addon_dir/src/ngx_http_echo_filter.h                           \
-        $ngx_addon_dir/src/ngx_http_echo_var.h                              \
-        $ngx_addon_dir/src/ngx_http_echo_location.h                         \
-        $ngx_addon_dir/src/ngx_http_echo_echo.h                             \
-        $ngx_addon_dir/src/ngx_http_echo_request_info.h                     \
-        $ngx_addon_dir/src/ngx_http_echo_subrequest.h                       \
-        $ngx_addon_dir/src/ngx_http_echo_foreach.h                          \
-        "
-
-# nginx 1.17.0+ unconditionally enables the postpone filter
-if [ ! -z "$HTTP_POSTPONE" ]; then
-    # nginx won't have HTTP_POSTPONE_FILTER_MODULE & HTTP_POSTPONE_FILTER_SRCS
-    # defined since 1.9.11
-    if [ -z "$HTTP_POSTPONE_FILTER_MODULE" ]; then
-        HTTP_POSTPONE_FILTER_MODULE=ngx_http_postpone_filter_module
-        HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
-    fi
-
-    # This module depends upon the postpone filter being activated
-    if [ "$HTTP_POSTPONE" != YES ]; then
-        HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
-        HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
-        HTTP_POSTPONE=YES
-    fi
-fi
-
-if [ -n "$ngx_module_link" ]; then
-    ngx_module_type=HTTP_AUX_FILTER
-    ngx_module_name=$ngx_addon_name
-    ngx_module_incs=
-    ngx_module_deps="$ECHO_DEPS"
-    ngx_module_srcs="$ECHO_SRCS"
-    ngx_module_libs=
-
-    . auto/module
-else
-    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ECHO_SRCS"
-    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ECHO_DEPS"
-fi
diff --git a/debian/modules/http-echo/src/ddebug.h b/debian/modules/http-echo/src/ddebug.h
deleted file mode 100644
index a92d7a7..0000000
--- a/debian/modules/http-echo/src/ddebug.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifndef DDEBUG_H
-#define DDEBUG_H
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-
-#if defined(DDEBUG) && (DDEBUG)
-
-#   if (NGX_HAVE_VARIADIC_MACROS)
-
-#       define dd(...) fprintf(stderr, "echo *** %s: ", __func__); \
-            fprintf(stderr, __VA_ARGS__); \
-            fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
-
-#   else
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include <stdarg.h>
-
-static ngx_inline void
-dd(const char * fmt, ...) {
-}
-
-#    endif
-
-#   if DDEBUG > 1
-
-#       define dd_enter() dd_enter_helper(r, __func__)
-
-static ngx_inline void
-dd_enter_helper(ngx_http_request_t *r, const char *func) {
-    ngx_http_posted_request_t       *pr;
-
-    fprintf(stderr, ">enter %s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
-            func,
-            (int) r->method_name.len, r->method_name.data,
-            (int) r->uri.len, r->uri.data,
-            (int) r->args.len, r->args.data,
-            0/*(int) r->main->count*/, r->main,
-            r, r->connection->data, r->parent);
-
-    if (r->posted_requests) {
-        fprintf(stderr, " posted:");
-
-        for (pr = r->posted_requests; pr; pr = pr->next) {
-            fprintf(stderr, "%p,", pr);
-        }
-    }
-
-    fprintf(stderr, "\n");
-}
-
-#   else
-
-#       define dd_enter()
-
-#   endif
-
-#else
-
-#   if (NGX_HAVE_VARIADIC_MACROS)
-
-#       define dd(...)
-
-#       define dd_enter()
-
-#   else
-
-#include <stdarg.h>
-
-static ngx_inline void
-dd(const char * fmt, ...) {
-}
-
-static ngx_inline void
-dd_enter() {
-}
-
-#   endif
-
-#endif
-
-#if defined(DDEBUG) && (DDEBUG)
-
-#define dd_check_read_event_handler(r)   \
-    dd("r->read_event_handler = %s", \
-        r->read_event_handler == ngx_http_block_reading ? \
-            "ngx_http_block_reading" : \
-        r->read_event_handler == ngx_http_test_reading ? \
-            "ngx_http_test_reading" : \
-        r->read_event_handler == ngx_http_request_empty_handler ? \
-            "ngx_http_request_empty_handler" : "UNKNOWN")
-
-#define dd_check_write_event_handler(r)   \
-    dd("r->write_event_handler = %s", \
-        r->write_event_handler == ngx_http_handler ? \
-            "ngx_http_handler" : \
-        r->write_event_handler == ngx_http_core_run_phases ? \
-            "ngx_http_core_run_phases" : \
-        r->write_event_handler == ngx_http_request_empty_handler ? \
-            "ngx_http_request_empty_handler" : "UNKNOWN")
-
-#else
-
-#define dd_check_read_event_handler(r)
-#define dd_check_write_event_handler(r)
-
-#endif
-
-#endif /* DDEBUG_H */
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_echo.c b/debian/modules/http-echo/src/ngx_http_echo_echo.c
deleted file mode 100644
index f5789f5..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_echo.c
+++ /dev/null
@@ -1,342 +0,0 @@
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include "ngx_http_echo_echo.h"
-#include "ngx_http_echo_util.h"
-#include "ngx_http_echo_filter.h"
-
-#include <nginx.h>
-
-static ngx_buf_t ngx_http_echo_space_buf;
-
-static ngx_buf_t ngx_http_echo_newline_buf;
-
-
-ngx_int_t
-ngx_http_echo_echo_init(ngx_conf_t *cf)
-{
-    static u_char space_str[]   = " ";
-    static u_char newline_str[] = "\n";
-
-    dd("global init...");
-
-    ngx_memzero(&ngx_http_echo_space_buf, sizeof(ngx_buf_t));
-
-    ngx_http_echo_space_buf.memory = 1;
-
-    ngx_http_echo_space_buf.start =
-        ngx_http_echo_space_buf.pos =
-            space_str;
-
-    ngx_http_echo_space_buf.end =
-        ngx_http_echo_space_buf.last =
-            space_str + sizeof(space_str) - 1;
-
-    ngx_memzero(&ngx_http_echo_newline_buf, sizeof(ngx_buf_t));
-
-    ngx_http_echo_newline_buf.memory = 1;
-
-    ngx_http_echo_newline_buf.start =
-        ngx_http_echo_newline_buf.pos =
-            newline_str;
-
-    ngx_http_echo_newline_buf.end =
-        ngx_http_echo_newline_buf.last =
-            newline_str + sizeof(newline_str) - 1;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_sync(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx)
-{
-    ngx_buf_t                   *buf;
-    ngx_chain_t                 *cl = NULL; /* the head of the chain link */
-
-    buf = ngx_calloc_buf(r->pool);
-    if (buf == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    buf->sync = 1;
-
-    cl = ngx_alloc_chain_link(r->pool);
-    if (cl == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    cl->buf  = buf;
-    cl->next = NULL;
-
-    return ngx_http_echo_send_chain_link(r, ctx, cl);
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args,
-    ngx_flag_t in_filter, ngx_array_t *opts)
-{
-    ngx_uint_t                  i;
-
-    ngx_buf_t                   *space_buf;
-    ngx_buf_t                   *newline_buf;
-    ngx_buf_t                   *buf;
-
-    ngx_str_t                   *computed_arg;
-    ngx_str_t                   *computed_arg_elts;
-    ngx_str_t                   *opt;
-
-    ngx_chain_t *cl  = NULL; /* the head of the chain link */
-    ngx_chain_t **ll = &cl;  /* always point to the address of the last link */
-
-    dd_enter();
-
-    if (computed_args == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    computed_arg_elts = computed_args->elts;
-    for (i = 0; i < computed_args->nelts; i++) {
-        computed_arg = &computed_arg_elts[i];
-
-        if (computed_arg->len == 0) {
-            buf = NULL;
-
-        } else {
-            buf = ngx_calloc_buf(r->pool);
-            if (buf == NULL) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-
-            buf->start = buf->pos = computed_arg->data;
-            buf->last = buf->end = computed_arg->data +
-                computed_arg->len;
-
-            buf->memory = 1;
-        }
-
-        if (cl == NULL) {
-            cl = ngx_alloc_chain_link(r->pool);
-            if (cl == NULL) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-            cl->buf  = buf;
-            cl->next = NULL;
-            ll = &cl->next;
-
-        } else {
-            /* append a space first */
-            *ll = ngx_alloc_chain_link(r->pool);
-
-            if (*ll == NULL) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-
-            space_buf = ngx_calloc_buf(r->pool);
-
-            if (space_buf == NULL) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-
-            /* nginx clears buf flags at the end of each request handling,
-             * so we have to make a clone here. */
-            *space_buf = ngx_http_echo_space_buf;
-
-            (*ll)->buf = space_buf;
-            (*ll)->next = NULL;
-
-            ll = &(*ll)->next;
-
-            /* then append the buf only if it's non-empty */
-            if (buf) {
-                *ll = ngx_alloc_chain_link(r->pool);
-                if (*ll == NULL) {
-                    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-                }
-                (*ll)->buf  = buf;
-                (*ll)->next = NULL;
-
-                ll = &(*ll)->next;
-            }
-        }
-    } /* end for */
-
-    if (cl && cl->buf == NULL) {
-        cl = cl->next;
-    }
-
-    if (opts && opts->nelts > 0) {
-        opt = opts->elts;
-        /* FIXME handle other unrecognized options here */
-        if (opt[0].len == 1 && opt[0].data[0] == 'n') {
-            goto done;
-        }
-    }
-
-    /* append the newline character */
-
-    newline_buf = ngx_calloc_buf(r->pool);
-
-    if (newline_buf == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    *newline_buf = ngx_http_echo_newline_buf;
-
-    if (cl == NULL) {
-        cl = ngx_alloc_chain_link(r->pool);
-
-        if (cl == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        cl->buf = newline_buf;
-        cl->next = NULL;
-        /* ll = &cl->next; */
-
-    } else {
-        *ll = ngx_alloc_chain_link(r->pool);
-
-        if (*ll == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        (*ll)->buf  = newline_buf;
-        (*ll)->next = NULL;
-        /* ll = &(*ll)->next; */
-    }
-
-done:
-
-    if (cl == NULL || cl->buf == NULL) {
-        return NGX_OK;
-    }
-
-    if (in_filter) {
-        return ngx_http_echo_next_body_filter(r, cl);
-    }
-
-    return ngx_http_echo_send_chain_link(r, ctx, cl);
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_flush(ngx_http_request_t *r, ngx_http_echo_ctx_t *ctx)
-{
-    return ngx_http_send_special(r, NGX_HTTP_FLUSH);
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_request_body(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx)
-{
-    ngx_buf_t       *b;
-    ngx_chain_t     *out, *cl, **ll;
-
-    if (r->request_body == NULL || r->request_body->bufs == NULL) {
-        return NGX_OK;
-    }
-
-    out = NULL;
-    ll = &out;
-
-    for (cl = r->request_body->bufs; cl; cl = cl->next) {
-        if (ngx_buf_special(cl->buf)) {
-            /* we do not want to create zero-size bufs */
-            continue;
-        }
-
-        *ll = ngx_alloc_chain_link(r->pool);
-        if (*ll == NULL) {
-            return NGX_ERROR;
-        }
-
-        b = ngx_alloc_buf(r->pool);
-        if (b == NULL) {
-            return NGX_ERROR;
-        }
-
-        (*ll)->buf = b;
-        (*ll)->next = NULL;
-
-        ngx_memcpy(b, cl->buf, sizeof(ngx_buf_t));
-        b->tag = (ngx_buf_tag_t) &ngx_http_echo_exec_echo_request_body;
-        b->last_buf = 0;
-        b->last_in_chain = 0;
-
-        ll = &(*ll)->next;
-    }
-
-    if (out == NULL) {
-        return NGX_OK;
-    }
-
-    return ngx_http_echo_send_chain_link(r, ctx, out);
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_duplicate(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
-{
-    ngx_str_t                   *computed_arg;
-    ngx_str_t                   *computed_arg_elts;
-    ssize_t                      i, count;
-    ngx_str_t                   *str;
-    u_char                      *p;
-    ngx_int_t                    rc;
-    ngx_buf_t                   *buf;
-    ngx_chain_t                 *cl;
-
-    dd_enter();
-
-    computed_arg_elts = computed_args->elts;
-
-    computed_arg = &computed_arg_elts[0];
-
-    count = ngx_http_echo_atosz(computed_arg->data, computed_arg->len);
-
-    if (count == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "invalid size specified: \"%V\"", computed_arg);
-
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    str = &computed_arg_elts[1];
-
-    if (count == 0 || str->len == 0) {
-        rc = ngx_http_echo_send_header_if_needed(r, ctx);
-        if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-            return rc;
-        }
-
-        return NGX_OK;
-    }
-
-    buf = ngx_create_temp_buf(r->pool, count * str->len);
-    if (buf == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    p = buf->pos;
-    for (i = 0; i < count; i++) {
-        p = ngx_copy(p, str->data, str->len);
-    }
-    buf->last = p;
-
-    cl = ngx_alloc_chain_link(r->pool);
-    if (cl == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-    cl->next = NULL;
-    cl->buf = buf;
-
-    return ngx_http_echo_send_chain_link(r, ctx, cl);
-}
diff --git a/debian/modules/http-echo/src/ngx_http_echo_echo.h b/debian/modules/http-echo/src/ngx_http_echo_echo.h
deleted file mode 100644
index 896f1ed..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_echo.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef ECHO_ECHO_H
-#define ECHO_ECHO_H
-
-#include "ngx_http_echo_module.h"
-
-ngx_int_t ngx_http_echo_echo_init(ngx_conf_t *cf);
-
-ngx_int_t ngx_http_echo_exec_echo_sync(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx);
-
-ngx_int_t ngx_http_echo_exec_echo(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args,
-        ngx_flag_t in_filter, ngx_array_t *opts);
-
-ngx_int_t ngx_http_echo_exec_echo_request_body(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx);
-
-ngx_int_t ngx_http_echo_exec_echo_flush(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx);
-
-ngx_int_t ngx_http_echo_exec_echo_duplicate(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
-
-#endif /* ECHO_ECHO_H */
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_filter.c b/debian/modules/http-echo/src/ngx_http_echo_filter.c
deleted file mode 100644
index 689b52e..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_filter.c
+++ /dev/null
@@ -1,282 +0,0 @@
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include "ngx_http_echo_filter.h"
-#include "ngx_http_echo_util.h"
-#include "ngx_http_echo_echo.h"
-
-#include <ngx_log.h>
-
-
-
-ngx_http_output_header_filter_pt ngx_http_echo_next_header_filter;
-
-ngx_http_output_body_filter_pt ngx_http_echo_next_body_filter;
-
-static ngx_int_t ngx_http_echo_header_filter(ngx_http_request_t *r);
-
-static ngx_int_t ngx_http_echo_body_filter(ngx_http_request_t *r,
-        ngx_chain_t *in);
-
-/* filter handlers */
-static ngx_int_t ngx_http_echo_exec_filter_cmds(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *cmds, ngx_uint_t *iterator);
-
-
-static volatile ngx_cycle_t  *ngx_http_echo_prev_cycle = NULL;
-
-
-ngx_int_t
-ngx_http_echo_filter_init(ngx_conf_t *cf)
-{
-    int                              multi_http_blocks;
-    ngx_http_echo_main_conf_t       *emcf;
-
-    emcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_echo_module);
-
-    if (ngx_http_echo_prev_cycle != ngx_cycle) {
-        ngx_http_echo_prev_cycle = ngx_cycle;
-        multi_http_blocks = 0;
-
-    } else {
-        multi_http_blocks = 1;
-    }
-
-    if (multi_http_blocks || emcf->requires_filter) {
-        dd("top header filter: %ld",
-           (unsigned long) ngx_http_top_header_filter);
-
-        ngx_http_echo_next_header_filter = ngx_http_top_header_filter;
-        ngx_http_top_header_filter = ngx_http_echo_header_filter;
-
-        dd("top body filter: %ld", (unsigned long) ngx_http_top_body_filter);
-
-        ngx_http_echo_next_body_filter = ngx_http_top_body_filter;
-        ngx_http_top_body_filter  = ngx_http_echo_body_filter;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_echo_header_filter(ngx_http_request_t *r)
-{
-    ngx_http_echo_loc_conf_t    *conf;
-    ngx_http_echo_ctx_t         *ctx;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "echo header filter, uri \"%V?%V\"", &r->uri, &r->args);
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-
-    /* XXX we should add option to insert contents for responses
-     * of non-200 status code here... */
-    /*
-    if (r->headers_out.status != NGX_HTTP_OK) {
-        if (ctx != NULL) {
-            ctx->skip_filter = 1;
-        }
-        return ngx_http_echo_next_header_filter(r);
-    }
-    */
-
-    conf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
-    if (conf->before_body_cmds == NULL && conf->after_body_cmds == NULL) {
-        if (ctx != NULL) {
-            ctx->skip_filter = 1;
-        }
-        return ngx_http_echo_next_header_filter(r);
-    }
-
-    if (ctx == NULL) {
-        ctx = ngx_http_echo_create_ctx(r);
-        if (ctx == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_http_set_ctx(r, ctx, ngx_http_echo_module);
-    }
-
-    /* enable streaming here (use chunked encoding) */
-    ngx_http_clear_content_length(r);
-    ngx_http_clear_accept_ranges(r);
-
-    return ngx_http_echo_next_header_filter(r);
-}
-
-
-static ngx_int_t
-ngx_http_echo_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
-{
-    ngx_http_echo_ctx_t         *ctx;
-    ngx_int_t                    rc;
-    ngx_http_echo_loc_conf_t    *conf;
-    unsigned                     last;
-    ngx_chain_t                 *cl;
-    ngx_buf_t                   *b;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "echo body filter, uri \"%V?%V\"", &r->uri, &r->args);
-
-    if (in == NULL || r->header_only) {
-        return ngx_http_echo_next_body_filter(r, in);
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-
-    if (ctx == NULL || ctx->skip_filter) {
-        return ngx_http_echo_next_body_filter(r, in);
-    }
-
-    conf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
-
-    if (!ctx->before_body_sent) {
-        ctx->before_body_sent = 1;
-
-        if (conf->before_body_cmds != NULL) {
-            rc = ngx_http_echo_exec_filter_cmds(r, ctx, conf->before_body_cmds,
-                                                &ctx->next_before_body_cmd);
-            if (rc != NGX_OK) {
-                return NGX_ERROR;
-            }
-        }
-    }
-
-    if (conf->after_body_cmds == NULL) {
-        ctx->skip_filter = 1;
-        return ngx_http_echo_next_body_filter(r, in);
-    }
-
-    last = 0;
-
-    for (cl = in; cl; cl = cl->next) {
-        dd("cl %p, special %d", cl, ngx_buf_special(cl->buf));
-
-        if (cl->buf->last_buf || cl->buf->last_in_chain) {
-            cl->buf->last_buf = 0;
-            cl->buf->last_in_chain = 0;
-            cl->buf->sync = 1;
-            last = 1;
-        }
-    }
-
-    dd("in %p, last %d", in, (int) last);
-
-    if (in) {
-        rc = ngx_http_echo_next_body_filter(r, in);
-
-#if 0
-        if (rc == NGX_AGAIN) {
-            return NGX_ERROR;
-        }
-#endif
-
-        dd("next filter returns %d, last %d", (int) rc, (int) last);
-
-        if (rc == NGX_ERROR || rc > NGX_OK || !last) {
-            return rc;
-        }
-    }
-
-    dd("exec filter cmds for after body cmds");
-
-    rc = ngx_http_echo_exec_filter_cmds(r, ctx, conf->after_body_cmds,
-                                        &ctx->next_after_body_cmd);
-    if (rc == NGX_ERROR || rc > NGX_OK) {
-        dd("FAILED: exec filter cmds for after body cmds");
-        return NGX_ERROR;
-    }
-
-    ctx->skip_filter = 1;
-
-    dd("after body cmds executed...terminating...");
-
-    /* XXX we can NOT use
-     * ngx_http_send_special(r, NGX_HTTP_LAST) here
-     * because we should bypass the upstream filters. */
-
-    b = ngx_calloc_buf(r->pool);
-    if (b == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (r == r->main && !r->post_action) {
-        b->last_buf = 1;
-
-    } else {
-        b->sync = 1;
-        b->last_in_chain = 1;
-    }
-
-    cl = ngx_alloc_chain_link(r->pool);
-    if (cl == NULL) {
-        return NGX_ERROR;
-    }
-
-    cl->next = NULL;
-    cl->buf = b;
-
-    return ngx_http_echo_next_body_filter(r, cl);
-}
-
-
-static ngx_int_t
-ngx_http_echo_exec_filter_cmds(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *cmds, ngx_uint_t *iterator)
-{
-    ngx_int_t                    rc;
-    ngx_array_t                 *opts = NULL;
-    ngx_array_t                 *computed_args = NULL;
-    ngx_http_echo_cmd_t         *cmd;
-    ngx_http_echo_cmd_t         *cmd_elts;
-
-    for (cmd_elts = cmds->elts; *iterator < cmds->nelts; (*iterator)++) {
-        cmd = &cmd_elts[*iterator];
-
-        /* evaluate arguments for the current cmd (if any) */
-        if (cmd->args) {
-            computed_args = ngx_array_create(r->pool, cmd->args->nelts,
-                                             sizeof(ngx_str_t));
-            if (computed_args == NULL) {
-                return NGX_ERROR;
-            }
-
-            opts = ngx_array_create(r->pool, 1, sizeof(ngx_str_t));
-            if (opts == NULL) {
-                return NGX_ERROR;
-            }
-
-            rc = ngx_http_echo_eval_cmd_args(r, cmd, computed_args, opts);
-
-            if (rc != NGX_OK) {
-                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                              "Failed to evaluate arguments for "
-                              "the directive.");
-                return rc;
-            }
-        }
-
-        /* do command dispatch based on the opcode */
-        switch (cmd->opcode) {
-        case echo_opcode_echo_before_body:
-        case echo_opcode_echo_after_body:
-            dd("exec echo_before_body or echo_after_body...");
-
-            rc = ngx_http_echo_exec_echo(r, ctx, computed_args,
-                                         1 /* in filter */, opts);
-
-            if (rc == NGX_ERROR || rc > NGX_OK) {
-                return rc;
-            }
-
-            break;
-        default:
-            break;
-        }
-    }
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-echo/src/ngx_http_echo_filter.h b/debian/modules/http-echo/src/ngx_http_echo_filter.h
deleted file mode 100644
index ea5115d..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_filter.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef ECHO_FILTER_H
-#define ECHO_FILTER_H
-
-#include "ngx_http_echo_module.h"
-
-
-extern ngx_http_output_header_filter_pt ngx_http_echo_next_header_filter;
-
-extern ngx_http_output_body_filter_pt ngx_http_echo_next_body_filter;
-
-
-ngx_int_t ngx_http_echo_filter_init (ngx_conf_t *cf);
-
-#endif /* ECHO_FILTER_H */
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_foreach.c b/debian/modules/http-echo/src/ngx_http_echo_foreach.c
deleted file mode 100644
index a4a2b54..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_foreach.c
+++ /dev/null
@@ -1,183 +0,0 @@
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include "ngx_http_echo_foreach.h"
-#include "ngx_http_echo_util.h"
-
-#include <nginx.h>
-
-
-ngx_int_t
-ngx_http_echo_it_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    ngx_http_echo_ctx_t         *ctx;
-    ngx_uint_t                   i;
-    ngx_array_t                 *choices;
-    ngx_str_t                   *choice_elts, *choice;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-
-    if (ctx && ctx->foreach != NULL) {
-
-        choices = ctx->foreach->choices;
-        i = ctx->foreach->next_choice;
-
-        if (i < choices->nelts) {
-            choice_elts = choices->elts;
-            choice = &choice_elts[i];
-
-            v->len = choice->len;
-            v->data = choice->data;
-            v->valid = 1;
-            v->no_cacheable = 1;
-            v->not_found = 0;
-
-            return NGX_OK;
-        }
-    }
-
-    v->not_found = 1;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_foreach_split(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
-{
-    ngx_http_echo_loc_conf_t    *elcf;
-    ngx_str_t                   *delimiter, *compound;
-    u_char                      *pos, *last, *end;
-    ngx_str_t                   *choice;
-    ngx_str_t                   *computed_arg_elts;
-    ngx_array_t                 *cmds;
-    ngx_http_echo_cmd_t         *cmd;
-    ngx_http_echo_cmd_t         *cmd_elts;
-
-    if (ctx->foreach != NULL) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "Nested echo_foreach not supported yet.");
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    if (computed_args->nelts < 2) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "echo_foreach should take at least two arguments. "
-                      "(if your delimiter starts with \"-\", preceding it "
-                      "with a \"--\".)");
-
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    computed_arg_elts = computed_args->elts;
-
-    compound  = &computed_arg_elts[1];
-
-    dd("HEY coumpound len: %u", (int) compound->len);
-
-    ctx->foreach = ngx_palloc(r->pool, sizeof(ngx_http_echo_foreach_ctx_t));
-
-    if (ctx->foreach == NULL) {
-        return NGX_ERROR;
-    }
-
-    ctx->foreach->cmd_index = ctx->next_handler_cmd;
-
-    ctx->foreach->next_choice = 0;
-
-    ctx->foreach->choices = ngx_array_create(r->pool, 10, sizeof(ngx_str_t));
-    if (ctx->foreach->choices == NULL) {
-        return NGX_ERROR;
-    }
-
-    delimiter = &computed_arg_elts[0];
-
-    pos = compound->data;
-    end = compound->data + compound->len;
-
-    while ((last = ngx_http_echo_strlstrn(pos, end, delimiter->data,
-                                          delimiter->len - 1)) != NULL)
-    {
-        dd("entered the loop");
-
-        if (last == pos) {
-            dd("!!! len == 0");
-            pos = last + delimiter->len;
-            continue;
-        }
-
-        choice = ngx_array_push(ctx->foreach->choices);
-        if (choice == NULL) {
-            return NGX_ERROR;
-        }
-
-        choice->data = pos;
-        choice->len  = last - pos;
-        pos = last + delimiter->len;
-    }
-
-    if (pos < end) {
-        choice = ngx_array_push(ctx->foreach->choices);
-        if (choice == NULL) {
-            return NGX_ERROR;
-        }
-
-        choice->data = pos;
-        choice->len  = end - pos;
-    }
-
-    if (ctx->foreach->choices->nelts == 0) {
-        /* skip the foreach body entirely */
-        elcf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
-        cmds = elcf->handler_cmds;
-        cmd_elts = cmds->elts;
-        for (/* void */; ctx->next_handler_cmd < cmds->nelts;
-             ctx->next_handler_cmd++)
-        {
-            cmd = &cmd_elts[ctx->next_handler_cmd + 1];
-            if (cmd->opcode == echo_opcode_echo_end) {
-                return NGX_OK;
-            }
-        }
-
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_end(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx)
-{
-    if (ctx->foreach == NULL) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "Found a echo_end that has no corresponding echo_foreach "
-                      "before it.");
-        return NGX_ERROR;
-    }
-
-    ctx->foreach->next_choice++;
-
-    if (ctx->foreach->next_choice >= ctx->foreach->choices->nelts) {
-        /* TODO We need to explicitly free the foreach ctx from
-         * the pool */
-        ctx->foreach = NULL;
-
-        return NGX_OK;
-    }
-
-    dd("echo_end: ++ next_choice (total: %u): %u",
-       (unsigned) ctx->foreach->choices->nelts,
-       (unsigned) ctx->foreach->next_choice);
-
-    /* the main handler dispatcher loop will increment
-     *   ctx->next_handler_cmd for us anyway. */
-    ctx->next_handler_cmd = ctx->foreach->cmd_index;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-echo/src/ngx_http_echo_foreach.h b/debian/modules/http-echo/src/ngx_http_echo_foreach.h
deleted file mode 100644
index 49592f4..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_foreach.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef ECHO_FOREACH_H
-#define ECHO_FOREACH_H
-
-#include "ngx_http_echo_module.h"
-
-ngx_int_t ngx_http_echo_exec_echo_foreach_split(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
-
-ngx_int_t ngx_http_echo_exec_echo_end(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx);
-
-ngx_int_t ngx_http_echo_it_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
-
-#endif /* ECHO_FOREACH_H */
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_handler.c b/debian/modules/http-echo/src/ngx_http_echo_handler.c
deleted file mode 100644
index 00933a4..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_handler.c
+++ /dev/null
@@ -1,429 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_echo_filter.h"
-#include "ngx_http_echo_handler.h"
-#include "ngx_http_echo_echo.h"
-#include "ngx_http_echo_util.h"
-#include "ngx_http_echo_sleep.h"
-#include "ngx_http_echo_var.h"
-#include "ngx_http_echo_timer.h"
-#include "ngx_http_echo_location.h"
-#include "ngx_http_echo_subrequest.h"
-#include "ngx_http_echo_request_info.h"
-#include "ngx_http_echo_foreach.h"
-
-#include <nginx.h>
-#include <ngx_log.h>
-
-
-void
-ngx_http_echo_wev_handler(ngx_http_request_t *r)
-{
-    ngx_int_t                    rc;
-    ngx_http_echo_ctx_t         *ctx;
-
-    dd("wev handler");
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-
-    if (ctx == NULL) {
-        ngx_http_finalize_request(r, NGX_ERROR);
-        return;
-    }
-
-    dd("waiting: %d, done: %d", (int) ctx->waiting, (int) ctx->done);
-
-    if (ctx->waiting && ! ctx->done) {
-
-        if (r == r->connection->data && r->postponed) {
-
-            if (r->postponed->request) {
-                r->connection->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_http_echo_flush_postponed_outputs(r);
-            }
-        }
-
-        return;
-    }
-
-    ctx->done = 0;
-
-    ctx->next_handler_cmd++;
-
-    rc = ngx_http_echo_run_cmds(r);
-
-    dd("rc: %d", (int) rc);
-
-    if (rc == NGX_ERROR || rc == NGX_DONE) {
-        ngx_http_finalize_request(r, rc);
-        return;
-    }
-
-    if (rc == NGX_AGAIN) {
-        dd("mark busy %d for %.*s", (int) ctx->next_handler_cmd,
-           (int) r->uri.len,
-           r->uri.data);
-
-        ctx->waiting = 1;
-        ctx->done = 0;
-
-    } else {
-        dd("mark ready %d", (int) ctx->next_handler_cmd);
-        ctx->waiting = 0;
-        ctx->done = 1;
-
-        dd("finalizing with rc %d", (int) rc);
-
-        dd("finalize request %.*s with %d", (int) r->uri.len, r->uri.data,
-           (int) rc);
-
-        ngx_http_finalize_request(r, rc);
-    }
-}
-
-
-ngx_int_t
-ngx_http_echo_handler(ngx_http_request_t *r)
-{
-    ngx_int_t                    rc;
-    ngx_http_echo_ctx_t         *ctx;
-
-    dd("subrequest in memory: %d", (int) r->subrequest_in_memory);
-
-    rc = ngx_http_echo_run_cmds(r);
-
-    dd("run cmds returned %d", (int) rc);
-
-    if (rc == NGX_ERROR
-        || rc == NGX_OK
-        || rc == NGX_DONE
-        || rc == NGX_DECLINED)
-    {
-        return rc;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-
-    if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-        if (ctx && r->header_sent) {
-            return NGX_ERROR;
-        }
-
-        return rc;
-    }
-
-    /* rc == NGX_AGAIN */
-
-#if defined(nginx_version) && nginx_version >= 8011
-    r->main->count++;
-#endif
-
-    dd("%d", r->connection->destroyed);
-    dd("%d", r->done);
-
-    if (ctx) {
-        dd("mark busy %d for %.*s", (int) ctx->next_handler_cmd,
-           (int) r->uri.len,
-           r->uri.data);
-
-        ctx->waiting = 1;
-        ctx->done = 0;
-    }
-
-    return NGX_DONE;
-}
-
-
-ngx_int_t
-ngx_http_echo_run_cmds(ngx_http_request_t *r)
-{
-    ngx_http_echo_loc_conf_t    *elcf;
-    ngx_http_echo_ctx_t         *ctx;
-    ngx_int_t                    rc;
-    ngx_array_t                 *cmds;
-    ngx_array_t                 *computed_args = NULL;
-    ngx_http_echo_cmd_t         *cmd;
-    ngx_http_echo_cmd_t         *cmd_elts;
-    ngx_array_t                 *opts = NULL;
-
-    elcf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
-    cmds = elcf->handler_cmds;
-    if (cmds == NULL) {
-        return NGX_DECLINED;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-    if (ctx == NULL) {
-        ctx = ngx_http_echo_create_ctx(r);
-        if (ctx == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        ngx_http_set_ctx(r, ctx, ngx_http_echo_module);
-    }
-
-    dd("exec handler: %.*s: %i", (int) r->uri.len, r->uri.data,
-       (int) ctx->next_handler_cmd);
-
-    cmd_elts = cmds->elts;
-
-    for (; ctx->next_handler_cmd < cmds->nelts; ctx->next_handler_cmd++) {
-
-        cmd = &cmd_elts[ctx->next_handler_cmd];
-
-        /* evaluate arguments for the current cmd (if any) */
-        if (cmd->args) {
-            computed_args = ngx_array_create(r->pool, cmd->args->nelts,
-                                             sizeof(ngx_str_t));
-
-            if (computed_args == NULL) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-
-            opts = ngx_array_create(r->pool, 1, sizeof(ngx_str_t));
-
-            if (opts == NULL) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-
-            rc = ngx_http_echo_eval_cmd_args(r, cmd, computed_args, opts);
-            if (rc != NGX_OK) {
-                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                              "Failed to evaluate arguments for "
-                              "the directive.");
-                return rc;
-            }
-        }
-
-        /* do command dispatch based on the opcode */
-
-        switch (cmd->opcode) {
-
-        case echo_opcode_echo_sync:
-            rc = ngx_http_echo_exec_echo_sync(r, ctx);
-            break;
-
-        case echo_opcode_echo:
-            /* XXX moved the following code to a separate
-             * function */
-            dd("found echo opcode");
-            rc = ngx_http_echo_exec_echo(r, ctx, computed_args,
-                                         0 /* in filter */, opts);
-            break;
-
-        case echo_opcode_echo_request_body:
-            rc = ngx_http_echo_exec_echo_request_body(r, ctx);
-            break;
-
-        case echo_opcode_echo_location_async:
-            if (!r->request_body) {
-                /* we require reading the request body before doing
-                 * subrequests */
-
-                ctx->next_handler_cmd--; /* re-run the current cmd */
-                goto read_request_body;
-            }
-
-            dd("found opcode echo location async...");
-            rc = ngx_http_echo_exec_echo_location_async(r, ctx,
-                                                        computed_args);
-            break;
-
-        case echo_opcode_echo_location:
-            if (!r->request_body) {
-                /* we require reading the request body before doing
-                 * subrequests */
-
-                ctx->next_handler_cmd--; /* re-run the current cmd */
-                goto read_request_body;
-            }
-
-            return ngx_http_echo_exec_echo_location(r, ctx, computed_args);
-
-        case echo_opcode_echo_subrequest_async:
-            if (!r->request_body) {
-                /* we require reading the request body before doing
-                 * subrequests */
-
-                ctx->next_handler_cmd--; /* re-run the current cmd */
-                goto read_request_body;
-            }
-
-            dd("found opcode echo subrequest async...");
-            rc = ngx_http_echo_exec_echo_subrequest_async(r, ctx,
-                                                          computed_args);
-            break;
-
-        case echo_opcode_echo_subrequest:
-            if (!r->request_body) {
-                /* we require reading the request body before doing
-                 * subrequests */
-
-                ctx->next_handler_cmd--; /* re-run the current cmd */
-                goto read_request_body;
-            }
-
-            return ngx_http_echo_exec_echo_subrequest(r, ctx, computed_args);
-
-        case echo_opcode_echo_sleep:
-            return ngx_http_echo_exec_echo_sleep(r, ctx, computed_args);
-
-        case echo_opcode_echo_flush:
-            rc = ngx_http_echo_exec_echo_flush(r, ctx);
-            break;
-
-        case echo_opcode_echo_blocking_sleep:
-            rc = ngx_http_echo_exec_echo_blocking_sleep(r, ctx,
-                                                        computed_args);
-            break;
-
-        case echo_opcode_echo_reset_timer:
-            rc = ngx_http_echo_exec_echo_reset_timer(r, ctx);
-            break;
-
-        case echo_opcode_echo_duplicate:
-            rc = ngx_http_echo_exec_echo_duplicate(r, ctx, computed_args);
-            break;
-
-        case echo_opcode_echo_read_request_body:
-
-read_request_body:
-
-            ctx->wait_read_request_body = 0;
-
-            rc = ngx_http_echo_exec_echo_read_request_body(r, ctx);
-
-            if (rc == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-#if (nginx_version >= 8011 && nginx_version < 1002006)                       \
-    || (nginx_version >= 1003000 && nginx_version < 1003009)
-                r->main->count--;
-#endif
-                return rc;
-            }
-
-#if nginx_version >= 8011
-            r->main->count--;
-#endif
-            dd("read request body: %d", (int) rc);
-
-            if (rc == NGX_OK) {
-                continue;
-            }
-
-            /* rc == NGX_AGAIN */
-            ctx->wait_read_request_body = 1;
-            return NGX_AGAIN;
-
-        case echo_opcode_echo_foreach_split:
-            rc = ngx_http_echo_exec_echo_foreach_split(r, ctx, computed_args);
-            break;
-
-        case echo_opcode_echo_end:
-            rc = ngx_http_echo_exec_echo_end(r, ctx);
-            break;
-
-        case echo_opcode_echo_exec:
-            dd("echo_exec");
-            return ngx_http_echo_exec_exec(r, ctx, computed_args);
-
-        default:
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "unknown opcode: %d", cmd->opcode);
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-            return rc;
-        }
-    }
-
-    rc = ngx_http_echo_send_chain_link(r, ctx, NULL /* indicate LAST */);
-
-    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-        return rc;
-    }
-
-    if (!r->request_body) {
-        if (ngx_http_discard_request_body(r) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_post_subrequest(ngx_http_request_t *r,
-    void *data, ngx_int_t rc)
-{
-    ngx_http_echo_ctx_t         *ctx = data;
-    ngx_http_request_t          *pr;
-    ngx_http_echo_ctx_t         *pr_ctx;
-
-    dd("echo post_subrequest: %.*s", (int) r->uri.len, r->uri.data);
-
-    if (ctx->run_post_subrequest) {
-        dd("already run post_subrequest: %p: %.*s", ctx,
-           (int) r->uri.len, r->uri.data);
-
-        return rc;
-    }
-
-    dd("setting run_post_subrequest to 1 for %p for %.*s", ctx,
-       (int) r->uri.len, r->uri.data);
-
-    ctx->run_post_subrequest = 1;
-
-    pr = r->parent;
-
-    pr_ctx = ngx_http_get_module_ctx(pr, ngx_http_echo_module);
-    if (pr_ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    dd("mark ready %d", (int) pr_ctx->next_handler_cmd);
-
-    pr_ctx->waiting = 0;
-    pr_ctx->done = 1;
-
-    pr->write_event_handler = ngx_http_echo_wev_handler;
-
-    /* work-around issues in nginx's event module */
-
-    if (r != r->connection->data
-        && r->postponed
-        && (r->main->posted_requests == NULL
-            || r->main->posted_requests->request != pr))
-    {
-#if defined(nginx_version) && nginx_version >= 8012
-        ngx_http_post_request(pr, NULL);
-#else
-        ngx_http_post_request(pr);
-#endif
-    }
-
-    return rc;
-}
diff --git a/debian/modules/http-echo/src/ngx_http_echo_handler.h b/debian/modules/http-echo/src/ngx_http_echo_handler.h
deleted file mode 100644
index afc0666..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_handler.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef ECHO_HANDLER_H
-#define ECHO_HANDLER_H
-
-#include "ngx_http_echo_module.h"
-
-
-void ngx_http_echo_wev_handler(ngx_http_request_t *r);
-
-ngx_int_t ngx_http_echo_handler(ngx_http_request_t *r);
-
-ngx_int_t ngx_http_echo_run_cmds(ngx_http_request_t *r);
-
-ngx_int_t ngx_http_echo_post_subrequest(ngx_http_request_t *r,
-        void *data, ngx_int_t rc);
-
-
-#endif /* ECHO_HANDLER_H */
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_location.c b/debian/modules/http-echo/src/ngx_http_echo_location.c
deleted file mode 100644
index bfabb5e..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_location.c
+++ /dev/null
@@ -1,178 +0,0 @@
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include "ngx_http_echo_util.h"
-#include "ngx_http_echo_location.h"
-#include "ngx_http_echo_handler.h"
-
-#include <nginx.h>
-
-
-static ngx_int_t ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr);
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_location_async(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
-{
-    ngx_int_t                    rc;
-    ngx_http_request_t          *sr; /* subrequest object */
-    ngx_str_t                   *computed_arg_elts;
-    ngx_str_t                    location;
-    ngx_str_t                   *url_args;
-    ngx_str_t                    args;
-    ngx_uint_t                   flags = 0;
-
-    dd_enter();
-
-    computed_arg_elts = computed_args->elts;
-
-    location = computed_arg_elts[0];
-
-    if (location.len == 0) {
-        return NGX_ERROR;
-    }
-
-    if (computed_args->nelts > 1) {
-        url_args = &computed_arg_elts[1];
-    } else {
-        url_args = NULL;
-    }
-
-    args.data = NULL;
-    args.len = 0;
-
-    if (ngx_http_parse_unsafe_uri(r, &location, &args, &flags) != NGX_OK) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "echo_location_async sees unsafe uri: \"%V\"",
-                       &location);
-        return NGX_ERROR;
-    }
-
-    if (args.len > 0 && url_args == NULL) {
-        url_args = &args;
-    }
-
-    rc = ngx_http_echo_send_header_if_needed(r, ctx);
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-        return rc;
-    }
-
-    rc = ngx_http_subrequest(r, &location, url_args, &sr, NULL, 0);
-
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_echo_adjust_subrequest(sr);
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_location(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
-{
-    ngx_int_t                            rc;
-    ngx_http_request_t                  *sr; /* subrequest object */
-    ngx_str_t                           *computed_arg_elts;
-    ngx_str_t                            location;
-    ngx_str_t                           *url_args;
-    ngx_http_post_subrequest_t          *psr;
-    ngx_str_t                            args;
-    ngx_uint_t                           flags = 0;
-    ngx_http_echo_ctx_t                 *sr_ctx;
-
-    computed_arg_elts = computed_args->elts;
-
-    location = computed_arg_elts[0];
-
-    if (location.len == 0) {
-        return NGX_ERROR;
-    }
-
-    if (computed_args->nelts > 1) {
-        url_args = &computed_arg_elts[1];
-
-    } else {
-        url_args = NULL;
-    }
-
-    args.data = NULL;
-    args.len = 0;
-
-    if (ngx_http_parse_unsafe_uri(r, &location, &args, &flags) != NGX_OK) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "echo_location sees unsafe uri: \"%V\"",
-                       &location);
-        return NGX_ERROR;
-    }
-
-    if (args.len > 0 && url_args == NULL) {
-        url_args = &args;
-    }
-
-    rc = ngx_http_echo_send_header_if_needed(r, ctx);
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-        return rc;
-    }
-
-    sr_ctx = ngx_http_echo_create_ctx(r);
-
-    psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
-    if (psr == NULL) {
-        return NGX_ERROR;
-    }
-
-    psr->handler = ngx_http_echo_post_subrequest;
-    psr->data = sr_ctx;
-
-    rc = ngx_http_subrequest(r, &location, url_args, &sr, psr, 0);
-
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_echo_adjust_subrequest(sr);
-
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_AGAIN;
-}
-
-
-static ngx_int_t
-ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr)
-{
-    ngx_http_core_main_conf_t   *cmcf;
-    ngx_http_request_t          *r;
-
-    /* we do not inherit the parent request's variables */
-    cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
-
-    r = sr->parent;
-
-    sr->header_in = r->header_in;
-
-    /* XXX work-around a bug in ngx_http_subrequest */
-    if (r->headers_in.headers.last == &r->headers_in.headers.part) {
-        sr->headers_in.headers.last = &sr->headers_in.headers.part;
-    }
-
-    sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts
-                                * sizeof(ngx_http_variable_value_t));
-
-    if (sr->variables == NULL) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-echo/src/ngx_http_echo_location.h b/debian/modules/http-echo/src/ngx_http_echo_location.h
deleted file mode 100644
index 6bc0e03..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_location.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ECHO_LOCATION_H
-#define ECHO_LOCATION_H
-
-#include "ngx_http_echo_module.h"
-
-ngx_int_t ngx_http_echo_exec_echo_location_async(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
-
-ngx_int_t ngx_http_echo_exec_echo_location(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
-
-#endif /* ECHO_LOCATION_H */
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_module.c b/debian/modules/http-echo/src/ngx_http_echo_module.c
deleted file mode 100644
index 8d736d7..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_module.c
+++ /dev/null
@@ -1,682 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_echo_handler.h"
-#include "ngx_http_echo_filter.h"
-#include "ngx_http_echo_echo.h"
-#include "ngx_http_echo_request_info.h"
-#include "ngx_http_echo_var.h"
-#include "ngx_http_echo_util.h"
-
-
-#include <nginx.h>
-#include <ngx_config.h>
-#include <ngx_log.h>
-
-
-/* config init handler */
-static void *ngx_http_echo_create_loc_conf(ngx_conf_t *cf);
-static char *ngx_http_echo_merge_loc_conf(ngx_conf_t *cf, void *parent,
-    void *child);
-static void *ngx_http_echo_create_main_conf(ngx_conf_t *cf);
-static ngx_int_t ngx_http_echo_post_config(ngx_conf_t *cf);
-
-/* config directive handlers */
-static char *ngx_http_echo_echo(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_http_echo_echo_request_body(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_sleep(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_http_echo_echo_flush(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_http_echo_echo_blocking_sleep(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_reset_timer(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_before_body(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_after_body(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_location_async(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_location(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_subrequest_async(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_subrequest(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_duplicate(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_read_request_body(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_foreach_split(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_end(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_abort_parent(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_echo_exec(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static char *ngx_http_echo_helper(ngx_http_echo_opcode_t opcode,
-    ngx_http_echo_cmd_category_t cat,
-    ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-
-
-static ngx_http_module_t ngx_http_echo_module_ctx = {
-    NULL,                           /* preconfiguration */
-    ngx_http_echo_post_config,      /* postconfiguration */
-
-    ngx_http_echo_create_main_conf, /* create main configuration */
-    NULL,                           /* init main configuration */
-
-    NULL,                           /* create server configuration */
-    NULL,                           /* merge server configuration */
-
-    ngx_http_echo_create_loc_conf,  /* create location configuration */
-    ngx_http_echo_merge_loc_conf    /* merge location configuration */
-};
-
-
-static ngx_command_t  ngx_http_echo_commands[] = {
-
-    { ngx_string("echo"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_ANY,
-      ngx_http_echo_echo,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_request_body"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
-      ngx_http_echo_echo_request_body,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_sleep"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_http_echo_echo_sleep,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_flush"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
-      ngx_http_echo_echo_flush,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_blocking_sleep"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_http_echo_echo_blocking_sleep,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_reset_timer"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
-      ngx_http_echo_echo_reset_timer,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_before_body"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_ANY,
-      ngx_http_echo_echo_before_body,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, before_body_cmds),
-      NULL },
-
-    { ngx_string("echo_after_body"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_ANY,
-      ngx_http_echo_echo_after_body,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, after_body_cmds),
-      NULL },
-
-    { ngx_string("echo_location_async"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
-      ngx_http_echo_echo_location_async,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_location"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
-      ngx_http_echo_echo_location,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_subrequest_async"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
-      ngx_http_echo_echo_subrequest_async,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_subrequest"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
-      ngx_http_echo_echo_subrequest,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_duplicate"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
-      ngx_http_echo_echo_duplicate,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_read_request_body"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
-      ngx_http_echo_echo_read_request_body,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_foreach_split"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
-      ngx_http_echo_echo_foreach_split,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_end"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
-      ngx_http_echo_echo_end,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_abort_parent"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
-      ngx_http_echo_echo_abort_parent,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_exec"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
-      ngx_http_echo_echo_exec,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
-      NULL },
-
-    { ngx_string("echo_status"),
-      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_echo_loc_conf_t, status),
-      NULL },
-
-      ngx_null_command
-};
-
-
-ngx_module_t ngx_http_echo_module = {
-    NGX_MODULE_V1,
-    &ngx_http_echo_module_ctx,     /* module context */
-    ngx_http_echo_commands,        /* module directives */
-    NGX_HTTP_MODULE,               /* module type */
-    NULL,                          /* init master */
-    NULL,                          /* init module */
-    NULL,                          /* init process */
-    NULL,                          /* init thread */
-    NULL,                          /* exit thread */
-    NULL,                          /* exit process */
-    NULL,                          /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static void *
-ngx_http_echo_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_http_echo_loc_conf_t        *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_echo_loc_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    /* set by ngx_pcalloc
-     *  conf->handler_cmds = NULL
-     *  conf->before_body_cmds = NULL
-     *  conf->after_body_cmds = NULL
-     *  conf->seen_leading_output = 0
-     *  conf->seen_trailing_output = 0
-     */
-
-    conf->status = NGX_CONF_UNSET;
-
-    return conf;
-}
-
-
-static char *
-ngx_http_echo_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_http_echo_loc_conf_t    *prev = parent;
-    ngx_http_echo_loc_conf_t    *conf = child;
-
-    if (conf->handler_cmds == NULL) {
-        conf->handler_cmds = prev->handler_cmds;
-        conf->seen_leading_output = prev->seen_leading_output;
-    }
-
-    if (conf->before_body_cmds == NULL) {
-        conf->before_body_cmds = prev->before_body_cmds;
-    }
-
-    if (conf->after_body_cmds == NULL) {
-        conf->after_body_cmds = prev->after_body_cmds;
-    }
-
-    ngx_conf_merge_value(conf->status, prev->status, 200);
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_echo_helper(ngx_http_echo_opcode_t opcode,
-    ngx_http_echo_cmd_category_t cat,
-    ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_str_t                       *raw_args;
-    ngx_uint_t                       i, n;
-    ngx_array_t                    **args_ptr;
-    ngx_array_t                    **cmds_ptr;
-    ngx_http_echo_cmd_t             *echo_cmd;
-    ngx_http_core_loc_conf_t        *clcf;
-    ngx_http_script_compile_t        sc;
-    ngx_http_echo_main_conf_t       *emcf;
-    ngx_http_echo_arg_template_t    *arg;
-
-    emcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_echo_module);
-
-    /* cmds_ptr points to ngx_http_echo_loc_conf_t's
-     * handler_cmds, before_body_cmds, or after_body_cmds
-     * array, depending on the actual offset */
-    cmds_ptr = (ngx_array_t **) (((u_char *) conf) + cmd->offset);
-
-    if (*cmds_ptr == NULL) {
-        *cmds_ptr = ngx_array_create(cf->pool, 1,
-                                     sizeof(ngx_http_echo_cmd_t));
-
-        if (*cmds_ptr == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        if (cat == echo_handler_cmd) {
-            dd("registering the content handler");
-            /* register the content handler */
-            clcf = ngx_http_conf_get_module_loc_conf(cf,
-                                                     ngx_http_core_module);
-
-            dd("registering the content handler (2)");
-            clcf->handler = ngx_http_echo_handler;
-
-        } else {
-            dd("filter used = 1");
-            emcf->requires_filter = 1;
-        }
-    }
-
-    echo_cmd = ngx_array_push(*cmds_ptr);
-
-    if (echo_cmd == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    echo_cmd->opcode = opcode;
-
-    args_ptr = &echo_cmd->args;
-    *args_ptr = ngx_array_create(cf->pool, 1,
-                                 sizeof(ngx_http_echo_arg_template_t));
-
-    if (*args_ptr == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    raw_args = cf->args->elts;
-
-    /* we skip the first arg and start from the second */
-
-    for (i = 1 ; i < cf->args->nelts; i++) {
-        arg = ngx_array_push(*args_ptr);
-
-        if (arg == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        arg->raw_value = raw_args[i];
-
-        dd("found raw arg %s", raw_args[i].data);
-
-        arg->lengths = NULL;
-        arg->values  = NULL;
-
-        n = ngx_http_script_variables_count(&arg->raw_value);
-
-        if (n > 0) {
-            ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
-
-            sc.cf = cf;
-            sc.source = &arg->raw_value;
-            sc.lengths = &arg->lengths;
-            sc.values = &arg->values;
-            sc.variables = n;
-            sc.complete_lengths = 1;
-            sc.complete_values = 1;
-
-            if (ngx_http_script_compile(&sc) != NGX_OK) {
-                return NGX_CONF_ERROR;
-            }
-        }
-    } /* end for */
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_echo_echo(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_echo_loc_conf_t        *elcf = conf;
-
-    if (!elcf->seen_leading_output) {
-        elcf->seen_leading_output = 1;
-    }
-
-    dd("in echo_echo...");
-    return ngx_http_echo_helper(echo_opcode_echo, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_request_body(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    ngx_http_echo_loc_conf_t        *elcf = conf;
-
-    if (!elcf->seen_leading_output) {
-        elcf->seen_leading_output = 1;
-    }
-
-    dd("in echo_echo_request_body...");
-    return ngx_http_echo_helper(echo_opcode_echo_request_body, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_sleep(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    dd("in echo_sleep...");
-    return ngx_http_echo_helper(echo_opcode_echo_sleep, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_flush(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_echo_loc_conf_t        *elcf = conf;
-
-    if (!elcf->seen_leading_output) {
-        elcf->seen_leading_output = 1;
-    }
-
-    dd("in echo_flush...");
-    return ngx_http_echo_helper(echo_opcode_echo_flush, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_blocking_sleep(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    dd("in echo_blocking_sleep...");
-    return ngx_http_echo_helper(echo_opcode_echo_blocking_sleep,
-                                echo_handler_cmd, cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_reset_timer(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_echo_helper(echo_opcode_echo_reset_timer, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_before_body(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    dd("processing echo_before_body directive...");
-    return ngx_http_echo_helper(echo_opcode_echo_before_body, echo_filter_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_after_body(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_echo_helper(echo_opcode_echo_after_body, echo_filter_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_location_async(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    ngx_http_echo_loc_conf_t        *elcf = conf;
-    char                            *ret;
-
-    if (!elcf->seen_leading_output) {
-        elcf->seen_leading_output = 1;
-
-        ret = ngx_http_echo_helper(echo_opcode_echo_sync, echo_handler_cmd,
-                                   cf, cmd, conf);
-
-        if (ret != NGX_CONF_OK) {
-            return ret;
-        }
-    }
-
-    return ngx_http_echo_helper(echo_opcode_echo_location_async,
-                                echo_handler_cmd, cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_location(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_echo_loc_conf_t        *elcf = conf;
-    char                            *ret;
-
-    if (!elcf->seen_leading_output) {
-        elcf->seen_leading_output = 1;
-
-        ret = ngx_http_echo_helper(echo_opcode_echo_sync, echo_handler_cmd,
-                                   cf, cmd, conf);
-
-        if (ret != NGX_CONF_OK) {
-            return ret;
-        }
-    }
-
-    return ngx_http_echo_helper(echo_opcode_echo_location, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_subrequest_async(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    char                            *ret;
-    ngx_http_echo_loc_conf_t        *elcf = conf;
-
-    if (!elcf->seen_leading_output) {
-        elcf->seen_leading_output = 1;
-
-        ret = ngx_http_echo_helper(echo_opcode_echo_sync, echo_handler_cmd,
-                                   cf, cmd, conf);
-
-        if (ret != NGX_CONF_OK) {
-            return ret;
-        }
-    }
-
-    return ngx_http_echo_helper(echo_opcode_echo_subrequest_async,
-                                echo_handler_cmd, cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_subrequest(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    ngx_http_echo_loc_conf_t        *elcf = conf;
-    char                            *ret;
-
-    if (!elcf->seen_leading_output) {
-        elcf->seen_leading_output = 1;
-
-        ret = ngx_http_echo_helper(echo_opcode_echo_sync, echo_handler_cmd,
-                                   cf, cmd, conf);
-
-        if (ret != NGX_CONF_OK) {
-            return ret;
-        }
-    }
-
-    return ngx_http_echo_helper(echo_opcode_echo_subrequest, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_duplicate(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_echo_loc_conf_t        *elcf = conf;
-
-    if (!elcf->seen_leading_output) {
-        elcf->seen_leading_output = 1;
-    }
-
-    return ngx_http_echo_helper(echo_opcode_echo_duplicate, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_read_request_body(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf)
-{
-    return ngx_http_echo_helper(echo_opcode_echo_read_request_body,
-                                echo_handler_cmd, cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_foreach_split(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_echo_helper(echo_opcode_echo_foreach_split,
-                                echo_handler_cmd, cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_end(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_echo_helper(echo_opcode_echo_end, echo_handler_cmd, cf,
-                                cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_abort_parent(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_echo_helper(echo_opcode_echo_abort_parent, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static char *
-ngx_http_echo_echo_exec(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_echo_helper(echo_opcode_echo_exec, echo_handler_cmd,
-                                cf, cmd, conf);
-}
-
-
-static void *
-ngx_http_echo_create_main_conf(ngx_conf_t *cf)
-{
-#if nginx_version >= 1011011
-    ngx_pool_cleanup_t           *cln;
-#endif
-    ngx_http_echo_main_conf_t    *emcf;
-
-    emcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_echo_main_conf_t));
-    if (emcf == NULL) {
-        return NULL;
-    }
-
-    /* set by ngx_pcalloc:
-     *      hmcf->requires_filter = 0;
-     */
-
-#if nginx_version >= 1011011
-    cln = ngx_pool_cleanup_add(cf->pool, 0);
-    if (cln == NULL) {
-        return NULL;
-    }
-
-    cln->data = emcf;
-    cln->handler = ngx_http_echo_request_headers_cleanup;
-#endif
-
-    return emcf;
-}
-
-
-static ngx_int_t
-ngx_http_echo_post_config(ngx_conf_t *cf)
-{
-    ngx_int_t         rc;
-
-    rc = ngx_http_echo_filter_init(cf);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    rc = ngx_http_echo_echo_init(cf);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    ngx_http_echo_content_length_hash =
-                                  ngx_http_echo_hash_literal("content-length");
-
-    return ngx_http_echo_add_variables(cf);
-}
diff --git a/debian/modules/http-echo/src/ngx_http_echo_module.h b/debian/modules/http-echo/src/ngx_http_echo_module.h
deleted file mode 100644
index ce0a305..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_module.h
+++ /dev/null
@@ -1,151 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef NGX_HTTP_ECHO_MODULE_H
-#define NGX_HTTP_ECHO_MODULE_H
-
-
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <nginx.h>
-
-
-extern ngx_module_t  ngx_http_echo_module;
-
-
-/* config directive's opcode */
-typedef enum {
-    echo_opcode_echo_sync,
-    echo_opcode_echo,
-    echo_opcode_echo_request_body,
-    echo_opcode_echo_sleep,
-    echo_opcode_echo_flush,
-    echo_opcode_echo_blocking_sleep,
-    echo_opcode_echo_reset_timer,
-    echo_opcode_echo_before_body,
-    echo_opcode_echo_after_body,
-    echo_opcode_echo_location_async,
-    echo_opcode_echo_location,
-    echo_opcode_echo_subrequest_async,
-    echo_opcode_echo_subrequest,
-    echo_opcode_echo_duplicate,
-    echo_opcode_echo_read_request_body,
-    echo_opcode_echo_foreach_split,
-    echo_opcode_echo_end,
-    echo_opcode_echo_abort_parent,
-    echo_opcode_echo_exec
-} ngx_http_echo_opcode_t;
-
-
-/* all the various config directives (or commands) are
- * divided into two categories: "handler commands",
- * and "filter commands". For instance, the "echo"
- * directive is a handler command while
- * "echo_before_body" is a filter one. */
-typedef enum {
-    echo_handler_cmd,
-    echo_filter_cmd
-
-} ngx_http_echo_cmd_category_t;
-
-
-/* compiled form of a config directive argument's value */
-typedef struct {
-    /* holds the raw string of the argument value */
-    ngx_str_t       raw_value;
-
-    /* fields "lengths" and "values" are set by
-     * the function ngx_http_script_compile,
-     * iff the argument value indeed contains
-     * nginx variables like "$foo" */
-    ngx_array_t     *lengths;
-    ngx_array_t     *values;
-
-} ngx_http_echo_arg_template_t;
-
-
-/* represent a config directive (or command) like "echo". */
-typedef struct {
-    ngx_http_echo_opcode_t      opcode;
-
-    /* each argument is of type echo_arg_template_t: */
-    ngx_array_t                 *args;
-} ngx_http_echo_cmd_t;
-
-
-/* location config struct */
-typedef struct {
-    /* elements of the following arrays are of type
-     * ngx_http_echo_cmd_t */
-    ngx_array_t     *handler_cmds;
-    ngx_array_t     *before_body_cmds;
-    ngx_array_t     *after_body_cmds;
-
-    unsigned         seen_leading_output;
-
-    ngx_int_t        status;
-} ngx_http_echo_loc_conf_t;
-
-
-typedef struct {
-    ngx_int_t       requires_filter;
-#if nginx_version >= 1011011
-    ngx_buf_t     **busy_buf_ptrs;
-    ngx_int_t       busy_buf_ptr_count;
-#endif
-} ngx_http_echo_main_conf_t;
-
-
-typedef struct {
-    ngx_array_t     *choices; /* items after splitting */
-    ngx_uint_t      next_choice;  /* current item index */
-    ngx_uint_t      cmd_index; /* cmd index for the echo_foreach direcitve */
-} ngx_http_echo_foreach_ctx_t;
-
-
-/* context struct in the request handling cycle, holding
- * the current states of the command evaluator */
-typedef struct {
-    /* index of the next handler command in
-     * ngx_http_echo_loc_conf_t's "handler_cmds" array. */
-    ngx_uint_t       next_handler_cmd;
-
-    /* index of the next before-body filter command in
-     * ngx_http_echo_loc_conf_t's "before_body_cmds" array. */
-    ngx_uint_t       next_before_body_cmd;
-
-    /* index of the next after-body filter command in
-     * ngx_http_echo_loc_conf_t's "after_body_cmds" array. */
-    ngx_uint_t       next_after_body_cmd;
-
-    ngx_http_echo_foreach_ctx_t   *foreach;
-
-    ngx_time_t       timer_begin;
-
-    ngx_event_t      sleep;
-
-    ngx_uint_t       counter;
-
-    unsigned         before_body_sent:1;
-    unsigned         skip_filter:1;
-
-    unsigned         wait_read_request_body:1;
-
-    unsigned         waiting:1;
-    unsigned         done:1;
-
-    unsigned         run_post_subrequest:1;
-    unsigned         header_sent:1; /* r->header_sent is not sufficient
-                                     * because special header filters like
-                                     * ngx_http_image_filter_module's may
-                                     * intercept the whole header filter chain
-                                     * leaving r->header_sent unset. So we
-                                     * should always test both flags. */
-
-} ngx_http_echo_ctx_t;
-
-
-#endif /* NGX_HTTP_ECHO_MODULE_H */
diff --git a/debian/modules/http-echo/src/ngx_http_echo_request_info.c b/debian/modules/http-echo/src/ngx_http_echo_request_info.c
deleted file mode 100644
index 7dd3683..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_request_info.c
+++ /dev/null
@@ -1,522 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include "ngx_http_echo_request_info.h"
-#include "ngx_http_echo_util.h"
-#include "ngx_http_echo_handler.h"
-
-#include <nginx.h>
-
-
-static void ngx_http_echo_post_read_request_body(ngx_http_request_t *r);
-#if nginx_version >= 1011011
-void ngx_http_echo_request_headers_cleanup(void *data);
-#endif
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_read_request_body(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx)
-{
-    return ngx_http_read_client_request_body(r,
-                                        ngx_http_echo_post_read_request_body);
-}
-
-
-static void
-ngx_http_echo_post_read_request_body(ngx_http_request_t *r)
-{
-    ngx_http_echo_ctx_t         *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-
-    dd("wait read request body %d", (int) ctx->wait_read_request_body);
-
-    if (ctx->wait_read_request_body) {
-        ctx->waiting = 0;
-        ctx->done = 1;
-
-        r->write_event_handler = ngx_http_echo_wev_handler;
-
-        ngx_http_echo_wev_handler(r);
-    }
-}
-
-
-/* this function's implementation is borrowed from nginx 0.8.20
- * and modified a bit to work with subrequests.
- * Copyrighted (C) by Igor Sysoev */
-ngx_int_t
-ngx_http_echo_request_method_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    if (r->method_name.data) {
-        v->len = r->method_name.len;
-        v->valid = 1;
-        v->no_cacheable = 0;
-        v->not_found = 0;
-        v->data = r->method_name.data;
-
-    } else {
-        v->not_found = 1;
-    }
-
-    return NGX_OK;
-}
-
-
-/* this function's implementation is borrowed from nginx 0.8.20
- * and modified a bit to work with subrequests.
- * Copyrighted (C) by Igor Sysoev */
-ngx_int_t
-ngx_http_echo_client_request_method_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    if (r->main->method_name.data) {
-        v->len = r->main->method_name.len;
-        v->valid = 1;
-        v->no_cacheable = 0;
-        v->not_found = 0;
-        v->data = r->main->method_name.data;
-
-    } else {
-        v->not_found = 1;
-    }
-
-    return NGX_OK;
-}
-
-
-/* this function's implementation is borrowed from nginx 0.8.20
- * and modified a bit to work with subrequests.
- * Copyrighted (C) by Igor Sysoev */
-ngx_int_t
-ngx_http_echo_request_body_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    u_char       *p;
-    size_t        len;
-    ngx_buf_t    *b;
-    ngx_chain_t  *cl;
-    ngx_chain_t  *in;
-
-    if (r->request_body == NULL
-        || r->request_body->bufs == NULL
-        || r->request_body->temp_file)
-    {
-        v->not_found = 1;
-
-        return NGX_OK;
-    }
-
-    in = r->request_body->bufs;
-
-    len = 0;
-    for (cl = in; cl; cl = cl->next) {
-        b = cl->buf;
-
-        if (!ngx_buf_in_memory(b)) {
-            if (b->in_file) {
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "variable echo_request_body sees in-file only "
-                               "buffers and discard the whole body data");
-
-                v->not_found = 1;
-
-                return NGX_OK;
-            }
-
-        } else {
-            len += b->last - b->pos;
-        }
-    }
-
-    p = ngx_pnalloc(r->pool, len);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    v->data = p;
-
-    for (cl = in; cl; cl = cl->next) {
-        b = cl->buf;
-
-        if (ngx_buf_in_memory(b)) {
-            p = ngx_copy(p, b->pos, b->last - b->pos);
-        }
-    }
-
-    if (p - v->data != (ssize_t) len) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "variable echo_request_body: buffer error");
-
-        v->not_found = 1;
-
-        return NGX_OK;
-    }
-
-    v->len = len;
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    int                          line_break_len;
-    size_t                       size;
-    u_char                      *p, *last, *pos;
-    ngx_int_t                    i, j;
-    ngx_buf_t                   *b, *first = NULL;
-    unsigned                     found;
-#if nginx_version >= 1011011
-    ngx_buf_t                  **bb;
-    ngx_chain_t                 *cl;
-    ngx_http_echo_main_conf_t   *emcf;
-#endif
-    ngx_connection_t            *c;
-    ngx_http_request_t          *mr;
-    ngx_http_connection_t       *hc;
-
-    mr = r->main;
-    hc = r->main->http_connection;
-    c = mr->connection;
-
-#if (NGX_HTTP_V2)
-    /* TODO */
-    if (mr->stream) {
-        v->not_found = 1;
-        return NGX_OK;
-    }
-#endif
-
-#if nginx_version >= 1011011
-    emcf = ngx_http_get_module_main_conf(r, ngx_http_echo_module);
-#endif
-
-    size = 0;
-    b = c->buffer;
-
-    if (mr->request_line.data[mr->request_line.len] == CR) {
-        line_break_len = 2;
-
-    } else {
-        line_break_len = 1;
-    }
-
-    if (mr->request_line.data >= b->start
-        && mr->request_line.data + mr->request_line.len + line_break_len
-           <= b->pos)
-    {
-        first = b;
-        size += b->pos - mr->request_line.data;
-    }
-
-    if (hc->nbusy) {
-        b = NULL;
-
-#if nginx_version >= 1011011
-        if (hc->nbusy > emcf->busy_buf_ptr_count) {
-            if (emcf->busy_buf_ptrs) {
-                ngx_free(emcf->busy_buf_ptrs);
-            }
-
-            emcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
-                                            r->connection->log);
-
-            if (emcf->busy_buf_ptrs == NULL) {
-                return NGX_ERROR;
-            }
-
-            emcf->busy_buf_ptr_count = hc->nbusy;
-        }
-
-        bb = emcf->busy_buf_ptrs;
-        for (cl = hc->busy; cl; cl = cl->next) {
-            *bb++ = cl->buf;
-        }
-
-        bb = emcf->busy_buf_ptrs;
-        for (i = hc->nbusy; i > 0; i--) {
-            b = bb[i - 1];
-#else
-        for (i = 0; i < hc->nbusy; i++) {
-            b = hc->busy[i];
-#endif
-
-            if (first == NULL) {
-                if (mr->request_line.data >= b->pos
-                    || mr->request_line.data + mr->request_line.len
-                       + line_break_len <= b->start)
-                {
-                    continue;
-                }
-
-                dd("found first at %d", (int) i);
-                first = b;
-            }
-
-            size += b->pos - b->start;
-        }
-    }
-
-
-    size++;  /* plus the null terminator, as required by the later
-                ngx_strstr() call */
-
-    v->data = ngx_palloc(r->pool, size);
-    if (v->data == NULL) {
-        return NGX_ERROR;
-    }
-
-    last = v->data;
-
-    b = c->buffer;
-    found = 0;
-
-    if (first == b) {
-        found = 1;
-        pos = b->pos;
-
-        last = ngx_copy(v->data, mr->request_line.data,
-                        pos - mr->request_line.data);
-
-        if (b != mr->header_in) {
-            /* skip truncated header entries (if any) */
-            while (last > v->data && last[-1] != LF) {
-                last--;
-            }
-        }
-
-        i = 0;
-        for (p = v->data; p != last; p++) {
-            if (*p == '\0') {
-                i++;
-                if (p + 1 != last && *(p + 1) == LF) {
-                    *p = CR;
-
-                } else if (i % 2 == 1) {
-                    *p = ':';
-
-                } else {
-                    *p = LF;
-                }
-            }
-        }
-    }
-
-    if (hc->nbusy) {
-
-#if nginx_version >= 1011011
-        bb = emcf->busy_buf_ptrs;
-        for (i = hc->nbusy; i > 0; i--) {
-            b = bb[i - 1];
-#else
-        for (i = 0; i < hc->nbusy; i++) {
-            b = hc->busy[i];
-#endif
-
-            if (!found) {
-                if (b != first) {
-                    continue;
-                }
-
-                dd("found first");
-                found = 1;
-            }
-
-            p = last;
-
-            pos = b->pos;
-
-            if (b == first) {
-                dd("request line: %.*s", (int) mr->request_line.len,
-                   mr->request_line.data);
-
-                last = ngx_copy(last,
-                                mr->request_line.data,
-                                pos - mr->request_line.data);
-
-            } else {
-                last = ngx_copy(last, b->start, pos - b->start);
-            }
-
-#if 1
-            /* skip truncated header entries (if any) */
-            while (last > p && last[-1] != LF) {
-                last--;
-            }
-#endif
-
-            j = 0;
-            for (; p != last; p++) {
-                if (*p == '\0') {
-                    j++;
-                    if (p + 1 == last) {
-                        /* XXX this should not happen */
-                        dd("found string end!!");
-
-                    } else if (*(p + 1) == LF) {
-                        *p = CR;
-
-                    } else if (j % 2 == 1) {
-                        *p = ':';
-
-                    } else {
-                        *p = LF;
-                    }
-                }
-            }
-
-            if (b == mr->header_in) {
-                break;
-            }
-        }
-    }
-
-    *last++ = '\0';
-
-    if (last - v->data > (ssize_t) size) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "buffer error when evaluating "
-                      "$echo_client__request_headers: \"%V\"",
-                      (ngx_int_t) (last - v->data - size));
-
-        return NGX_ERROR;
-    }
-
-    /* strip the leading part (if any) of the request body in our header.
-     * the first part of the request body could slip in because nginx core's
-     * ngx_http_request_body_length_filter and etc can move r->header_in->pos
-     * in case that some of the body data has been preread into r->header_in.
-     */
-
-    if ((p = (u_char *) ngx_strstr(v->data, CRLF CRLF)) != NULL) {
-        last = p + sizeof(CRLF CRLF) - 1;
-
-    } else if ((p = (u_char *) ngx_strstr(v->data, CRLF "\n")) != NULL) {
-        last = p + sizeof(CRLF "\n") - 1;
-
-    } else if ((p = (u_char *) ngx_strstr(v->data, "\n" CRLF)) != NULL) {
-        last = p + sizeof("\n" CRLF) - 1;
-
-    } else {
-        for (p = last - 1; p - v->data >= 2; p--) {
-            if (p[0] == LF && p[-1] == CR) {
-                p[-1] = LF;
-                last = p + 1;
-                break;
-            }
-
-            if (p[0] == LF && p[-1] == LF) {
-                last = p + 1;
-                break;
-            }
-        }
-    }
-
-    v->len = last - v->data;
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_cacheable_request_uri_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    if (r->uri.len) {
-        v->len = r->uri.len;
-        v->valid = 1;
-        v->no_cacheable = 0;
-        v->not_found = 0;
-        v->data = r->uri.data;
-
-    } else {
-        v->not_found = 1;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_request_uri_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    if (r->uri.len) {
-        v->len = r->uri.len;
-        v->valid = 1;
-        v->no_cacheable = 1;
-        v->not_found = 0;
-        v->data = r->uri.data;
-
-    } else {
-        v->not_found = 1;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_response_status_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    u_char                      *p;
-
-    if (r->headers_out.status) {
-        dd("headers out status: %d", (int) r->headers_out.status);
-
-        p = ngx_palloc(r->pool, NGX_INT_T_LEN);
-        if (p == NULL) {
-            return NGX_ERROR;
-        }
-
-        v->len = ngx_sprintf(p, "%ui", r->headers_out.status) - p;
-        v->data = p;
-
-        v->valid = 1;
-        v->no_cacheable = 1;
-        v->not_found = 0;
-
-    } else {
-        v->not_found = 1;
-    }
-
-    return NGX_OK;
-}
-
-
-#if nginx_version >= 1011011
-void
-ngx_http_echo_request_headers_cleanup(void *data)
-{
-    ngx_http_echo_main_conf_t  *emcf;
-
-    emcf = (ngx_http_echo_main_conf_t *) data;
-
-    if (emcf->busy_buf_ptrs) {
-        ngx_free(emcf->busy_buf_ptrs);
-        emcf->busy_buf_ptrs = NULL;
-    }
-}
-#endif
-
-/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/debian/modules/http-echo/src/ngx_http_echo_request_info.h b/debian/modules/http-echo/src/ngx_http_echo_request_info.h
deleted file mode 100644
index aa5730b..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_request_info.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef ECHO_REQUEST_INFO_H
-#define ECHO_REQUEST_INFO_H
-
-
-#include "ngx_http_echo_module.h"
-
-
-ngx_int_t ngx_http_echo_exec_echo_read_request_body(
-    ngx_http_request_t *r, ngx_http_echo_ctx_t *ctx);
-
-ngx_int_t ngx_http_echo_request_method_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-
-ngx_int_t ngx_http_echo_client_request_method_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-
-ngx_int_t ngx_http_echo_request_body_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-
-ngx_int_t ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-
-ngx_int_t ngx_http_echo_cacheable_request_uri_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-
-ngx_int_t ngx_http_echo_request_uri_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-
-ngx_int_t ngx_http_echo_response_status_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-
-#if nginx_version >= 1011011
-void ngx_http_echo_request_headers_cleanup(void *data);
-#endif
-
-#endif /* ECHO_REQUEST_INFO_H */
diff --git a/debian/modules/http-echo/src/ngx_http_echo_sleep.c b/debian/modules/http-echo/src/ngx_http_echo_sleep.c
deleted file mode 100644
index c96fa5a..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_sleep.c
+++ /dev/null
@@ -1,208 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_echo_sleep.h"
-#include "ngx_http_echo_handler.h"
-
-#include <nginx.h>
-#include <ngx_log.h>
-
-
-/* event handler for echo_sleep */
-
-static void ngx_http_echo_post_sleep(ngx_http_request_t *r);
-static void ngx_http_echo_sleep_cleanup(void *data);
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_sleep(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
-{
-    ngx_str_t                   *computed_arg;
-    ngx_str_t                   *computed_arg_elts;
-    ngx_int_t                    delay; /* in msec */
-    ngx_http_cleanup_t          *cln;
-
-    computed_arg_elts = computed_args->elts;
-    computed_arg = &computed_arg_elts[0];
-
-    delay = ngx_atofp(computed_arg->data, computed_arg->len, 3);
-
-    if (delay == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "invalid sleep duration \"%V\"", &computed_arg_elts[0]);
-
-        return NGX_HTTP_BAD_REQUEST;
-    }
-
-    dd("adding timer with delay %lu ms, r:%.*s", (unsigned long) delay,
-       (int) r->uri.len, r->uri.data);
-
-    ngx_add_timer(&ctx->sleep, (ngx_msec_t) delay);
-
-    /* we don't check broken downstream connections
-     * ourselves so even if the client shuts down
-     * the connection prematurely, nginx will still
-     * go on waiting for our timers to get properly
-     * expired. However, we'd still register a
-     * cleanup handler for completeness. */
-
-    cln = ngx_http_cleanup_add(r, 0);
-    if (cln == NULL) {
-        return NGX_ERROR;
-    }
-
-    cln->handler = ngx_http_echo_sleep_cleanup;
-    cln->data = r;
-
-    return NGX_AGAIN;
-}
-
-
-static void
-ngx_http_echo_post_sleep(ngx_http_request_t *r)
-{
-    ngx_http_echo_ctx_t         *ctx;
-    /* ngx_int_t                    rc; */
-
-    dd("post sleep, r:%.*s", (int) r->uri.len, r->uri.data);
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-
-    if (ctx == NULL) {
-        return;
-    }
-
-    ctx->waiting = 0;
-    ctx->done = 1;
-
-    dd("sleep: after get module ctx");
-
-    dd("timed out? %d", ctx->sleep.timedout);
-    dd("timer set? %d", ctx->sleep.timer_set);
-
-    if (!ctx->sleep.timedout) {
-        dd("HERE reached!");
-        return;
-    }
-
-    ctx->sleep.timedout = 0;
-
-    if (ctx->sleep.timer_set) {
-        dd("deleting timer for echo_sleep");
-
-        ngx_del_timer(&ctx->sleep);
-    }
-
-    /* r->write_event_handler = ngx_http_request_empty_handler; */
-
-    ngx_http_echo_wev_handler(r);
-}
-
-
-void
-ngx_http_echo_sleep_event_handler(ngx_event_t *ev)
-{
-    ngx_connection_t        *c;
-    ngx_http_request_t      *r;
-    ngx_http_log_ctx_t      *ctx;
-
-    r = ev->data;
-    c = r->connection;
-
-    if (c->destroyed) {
-        return;
-    }
-
-    if (c->error) {
-        ngx_http_finalize_request(r, NGX_ERROR);
-        return;
-    }
-
-    ctx = c->log->data;
-    ctx->current_request = r;
-
-    /* XXX when r->done == 1 we should do cleaning immediately
-     * and delete our timer and then quit. */
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "echo sleep event handler: \"%V?%V\"", &r->uri, &r->args);
-
-    /*
-    if (r->done) {
-        return;
-    }
-    */
-
-    ngx_http_echo_post_sleep(r);
-
-#if defined(nginx_version)
-
-    dd("before run posted requests");
-
-    ngx_http_run_posted_requests(c);
-
-    dd("after run posted requests");
-
-#endif
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_blocking_sleep(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
-{
-    ngx_str_t                   *computed_arg;
-    ngx_str_t                   *computed_arg_elts;
-    ngx_int_t                    delay; /* in msec */
-
-    computed_arg_elts = computed_args->elts;
-    computed_arg = &computed_arg_elts[0];
-
-    delay = ngx_atofp(computed_arg->data, computed_arg->len, 3);
-
-    if (delay == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "invalid sleep duration \"%V\"", &computed_arg_elts[0]);
-        return NGX_HTTP_BAD_REQUEST;
-    }
-
-    dd("blocking delay: %lu ms", (unsigned long) delay);
-
-    ngx_msleep((ngx_msec_t) delay);
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_echo_sleep_cleanup(void *data)
-{
-    ngx_http_request_t      *r = data;
-    ngx_http_echo_ctx_t     *ctx;
-
-    dd("echo sleep cleanup");
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-    if (ctx == NULL) {
-        return;
-    }
-
-    if (ctx->sleep.timer_set) {
-        dd("cleanup: deleting timer for echo_sleep");
-
-        ngx_del_timer(&ctx->sleep);
-        return;
-    }
-
-    dd("cleanup: timer not set");
-}
diff --git a/debian/modules/http-echo/src/ngx_http_echo_sleep.h b/debian/modules/http-echo/src/ngx_http_echo_sleep.h
deleted file mode 100644
index 8bb70c3..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_sleep.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef ECHO_SLEEP_H
-#define ECHO_SLEEP_H
-
-#include "ngx_http_echo_module.h"
-
-ngx_int_t ngx_http_echo_exec_echo_sleep(
-        ngx_http_request_t *r, ngx_http_echo_ctx_t *ctx,
-        ngx_array_t *computed_args);
-
-ngx_int_t ngx_http_echo_exec_echo_blocking_sleep(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
-
-void ngx_http_echo_sleep_event_handler(ngx_event_t *ev);
-
-#endif /* ECHO_SLEEP_H */
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_subrequest.c b/debian/modules/http-echo/src/ngx_http_echo_subrequest.c
deleted file mode 100644
index 8644d7f..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_subrequest.c
+++ /dev/null
@@ -1,791 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_echo_util.h"
-#include "ngx_http_echo_subrequest.h"
-#include "ngx_http_echo_handler.h"
-#include <nginx.h>
-
-
-#define ngx_http_echo_method_name(m) { sizeof(m) - 1, (u_char *) m " " }
-
-
-ngx_str_t  ngx_http_echo_content_length_header_key =
-        ngx_string("Content-Length");
-
-ngx_str_t  ngx_http_echo_get_method = ngx_http_echo_method_name("GET");
-ngx_str_t  ngx_http_echo_put_method = ngx_http_echo_method_name("PUT");
-ngx_str_t  ngx_http_echo_post_method = ngx_http_echo_method_name("POST");
-ngx_str_t  ngx_http_echo_head_method = ngx_http_echo_method_name("HEAD");
-ngx_str_t  ngx_http_echo_copy_method = ngx_http_echo_method_name("COPY");
-ngx_str_t  ngx_http_echo_move_method = ngx_http_echo_method_name("MOVE");
-ngx_str_t  ngx_http_echo_lock_method = ngx_http_echo_method_name("LOCK");
-ngx_str_t  ngx_http_echo_mkcol_method = ngx_http_echo_method_name("MKCOL");
-ngx_str_t  ngx_http_echo_trace_method = ngx_http_echo_method_name("TRACE");
-ngx_str_t  ngx_http_echo_delete_method = ngx_http_echo_method_name("DELETE");
-ngx_str_t  ngx_http_echo_unlock_method = ngx_http_echo_method_name("UNLOCK");
-ngx_str_t  ngx_http_echo_options_method = ngx_http_echo_method_name("OPTIONS");
-ngx_str_t  ngx_http_echo_propfind_method =
-        ngx_http_echo_method_name("PROPFIND");
-ngx_str_t  ngx_http_echo_proppatch_method =
-        ngx_http_echo_method_name("PROPPATCH");
-
-
-typedef struct ngx_http_echo_subrequest_s {
-    ngx_uint_t                   method;
-    ngx_str_t                   *method_name;
-    ngx_str_t                   *location;
-    ngx_str_t                   *query_string;
-    ssize_t                      content_length_n;
-    ngx_http_request_body_t     *request_body;
-} ngx_http_echo_subrequest_t;
-
-
-static ngx_int_t ngx_http_echo_parse_method_name(ngx_str_t **method_name_ptr);
-static ngx_int_t ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr,
-    ngx_http_echo_subrequest_t *parsed_sr);
-static ngx_int_t ngx_http_echo_parse_subrequest_spec(ngx_http_request_t *r,
-    ngx_array_t *computed_args, ngx_http_echo_subrequest_t **parsed_sr_ptr);
-static ngx_int_t ngx_http_echo_set_content_length_header(ngx_http_request_t *r,
-    off_t len);
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_subrequest_async(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
-{
-    ngx_int_t                        rc;
-    ngx_http_echo_subrequest_t      *parsed_sr;
-    ngx_http_request_t              *sr; /* subrequest object */
-    ngx_str_t                        args;
-    ngx_uint_t                       flags = 0;
-
-    dd_enter();
-
-    rc = ngx_http_echo_parse_subrequest_spec(r, computed_args, &parsed_sr);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    dd("location: %.*s",
-        (int) parsed_sr->location->len,
-        parsed_sr->location->data);
-
-    args.data = NULL;
-    args.len = 0;
-
-    if (ngx_http_parse_unsafe_uri(r, parsed_sr->location, &args, &flags)
-        != NGX_OK)
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "echo_subrequest_async sees unsafe uri: \"%V\"",
-                       parsed_sr->location);
-        return NGX_ERROR;
-    }
-
-    if (args.len > 0 && parsed_sr->query_string == NULL) {
-        parsed_sr->query_string = &args;
-    }
-
-    rc = ngx_http_echo_send_header_if_needed(r, ctx);
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-        return rc;
-    }
-
-    rc = ngx_http_subrequest(r, parsed_sr->location, parsed_sr->query_string,
-                             &sr, NULL, 0);
-
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    rc = ngx_http_echo_adjust_subrequest(sr, parsed_sr);
-
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_subrequest(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
-{
-    ngx_int_t                            rc;
-    ngx_http_request_t                  *sr; /* subrequest object */
-    ngx_http_post_subrequest_t          *psr;
-    ngx_http_echo_subrequest_t          *parsed_sr;
-    ngx_str_t                            args;
-    ngx_uint_t                           flags = 0;
-    ngx_http_echo_ctx_t                 *sr_ctx;
-
-    dd_enter();
-
-    rc = ngx_http_echo_parse_subrequest_spec(r, computed_args, &parsed_sr);
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    args.data = NULL;
-    args.len = 0;
-
-    if (ngx_http_parse_unsafe_uri(r, parsed_sr->location, &args, &flags)
-        != NGX_OK)
-    {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "echo_subrequest sees unsafe uri: \"%V\"",
-                       parsed_sr->location);
-        return NGX_ERROR;
-    }
-
-    if (args.len > 0 && parsed_sr->query_string == NULL) {
-        parsed_sr->query_string = &args;
-    }
-
-    rc = ngx_http_echo_send_header_if_needed(r, ctx);
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-        return rc;
-    }
-
-    sr_ctx = ngx_http_echo_create_ctx(r);
-
-    /* set by ngx_http_echo_create_ctx
-     *  sr_ctx->run_post_subrequest = 0
-     */
-
-    dd("creating sr ctx for %.*s: %p", (int) parsed_sr->location->len,
-       parsed_sr->location->data, sr_ctx);
-
-    psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
-
-    if (psr == NULL) {
-        return NGX_ERROR;
-    }
-
-    psr->handler = ngx_http_echo_post_subrequest;
-    psr->data = sr_ctx;
-
-    rc = ngx_http_subrequest(r, parsed_sr->location, parsed_sr->query_string,
-                             &sr, psr, 0);
-
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    sr_ctx->sleep.data = sr;
-
-    ngx_http_set_ctx(sr, sr_ctx, ngx_http_echo_module);
-
-    rc = ngx_http_echo_adjust_subrequest(sr, parsed_sr);
-
-    if (rc != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_AGAIN;
-}
-
-
-static ngx_int_t
-ngx_http_echo_parse_subrequest_spec(ngx_http_request_t *r,
-    ngx_array_t *computed_args, ngx_http_echo_subrequest_t **parsed_sr_ptr)
-{
-    ngx_str_t                   *computed_arg_elts, *arg;
-    ngx_str_t                  **to_write = NULL;
-    ngx_str_t                   *method_name;
-    ngx_str_t                   *body_str = NULL;
-    ngx_str_t                   *body_file = NULL;
-    ngx_uint_t                   i;
-    ngx_flag_t                   expecting_opt;
-    ngx_http_request_body_t     *rb = NULL;
-    ngx_buf_t                   *b;
-    ngx_http_echo_subrequest_t  *parsed_sr;
-    ngx_open_file_info_t         of;
-    ngx_http_core_loc_conf_t    *clcf;
-    size_t                       len;
-
-    *parsed_sr_ptr = ngx_pcalloc(r->pool, sizeof(ngx_http_echo_subrequest_t));
-    if (*parsed_sr_ptr == NULL) {
-        return NGX_ERROR;
-    }
-
-    parsed_sr = *parsed_sr_ptr;
-    computed_arg_elts = computed_args->elts;
-    method_name = &computed_arg_elts[0];
-    parsed_sr->location = &computed_arg_elts[1];
-
-    if (parsed_sr->location->len == 0) {
-        return NGX_ERROR;
-    }
-
-    expecting_opt = 1;
-
-    for (i = 2; i < computed_args->nelts; i++) {
-        arg = &computed_arg_elts[i];
-
-        if (!expecting_opt) {
-            if (to_write == NULL) {
-                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                        "echo_subrequest_async: to_write should NOT be NULL");
-                return NGX_ERROR;
-            }
-
-            *to_write = arg;
-            to_write = NULL;
-
-            expecting_opt = 1;
-
-            continue;
-        }
-
-        if (arg->len == 2) {
-            if (ngx_strncmp("-q", arg->data, arg->len) == 0) {
-                to_write = &parsed_sr->query_string;
-                expecting_opt = 0;
-                continue;
-            }
-
-            if (ngx_strncmp("-b", arg->data, arg->len) == 0) {
-                to_write = &body_str;
-                expecting_opt = 0;
-                continue;
-            }
-
-            if (ngx_strncmp("-f", arg->data, arg->len) == 0) {
-                dd("found option -f");
-                to_write = &body_file;
-                expecting_opt = 0;
-                continue;
-            }
-        }
-
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                      "unknown option for echo_subrequest*: %V", arg);
-
-        return NGX_ERROR;
-    }
-
-    if (body_str != NULL && body_str->len) {
-        rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
-
-        if (rb == NULL) {
-            return NGX_ERROR;
-        }
-
-        parsed_sr->content_length_n = body_str->len;
-
-        b = ngx_calloc_buf(r->pool);
-        if (b == NULL) {
-            return NGX_ERROR;
-        }
-
-        b->temporary = 1;
-        /* b->memory = 1; */
-        b->start = b->pos = body_str->data;
-        b->end = b->last = body_str->data + body_str->len;
-
-        rb->bufs = ngx_alloc_chain_link(r->pool);
-        if (rb->bufs == NULL) {
-            return NGX_ERROR;
-        }
-
-        rb->bufs->buf = b;
-        rb->bufs->next = NULL;
-
-        rb->buf = b;
-
-    } else if (body_file != NULL && body_file->len) {
-
-        dd("body_file defined %.*s", (int) body_file->len, body_file->data);
-
-        body_file->data = ngx_http_echo_rebase_path(r->pool, body_file->data,
-                                                    body_file->len, &len);
-
-        if (body_file->data == NULL) {
-            return NGX_ERROR;
-        }
-
-        body_file->len = len;
-
-        dd("after rebase, the path becomes %.*s", (int) body_file->len,
-           body_file->data);
-
-        rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
-        if (rb == NULL) {
-            return NGX_ERROR;
-        }
-
-        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-        ngx_memzero(&of, sizeof(ngx_open_file_info_t));
-
-#if defined(nginx_version) && nginx_version >= 8018
-        of.read_ahead = clcf->read_ahead;
-#endif
-
-        of.directio = clcf->directio;
-        of.valid = clcf->open_file_cache_valid;
-        of.min_uses = clcf->open_file_cache_min_uses;
-        of.errors = clcf->open_file_cache_errors;
-        of.events = clcf->open_file_cache_events;
-
-        if (ngx_open_cached_file(clcf->open_file_cache, body_file, &of, r->pool)
-            != NGX_OK)
-        {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, of.err,
-                          "%s \"%V\" failed",
-                          of.failed, body_file);
-
-            return NGX_ERROR;
-        }
-
-        dd("file content size: %d", (int) of.size);
-
-        parsed_sr->content_length_n = (ssize_t) of.size;
-
-        b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
-        if (b == NULL) {
-            return NGX_ERROR;
-        }
-
-        b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t));
-        if (b->file == NULL) {
-            return NGX_ERROR;
-        }
-
-        b->file_pos = 0;
-        b->file_last = of.size;
-
-        b->in_file = b->file_last ? 1: 0;
-
-#if 0
-        b->last_buf = (r == r->main) ? 1: 0;
-        b->last_in_chain = 1;
-#endif
-
-        b->file->fd = of.fd;
-        b->file->name = *body_file;
-        b->file->log = r->connection->log;
-        b->file->directio = of.is_directio;
-
-        rb->bufs = ngx_alloc_chain_link(r->pool);
-        if (rb->bufs == NULL) {
-            return NGX_ERROR;
-        }
-
-        rb->bufs->buf = b;
-        rb->bufs->next = NULL;
-        rb->buf = b;
-    }
-
-    parsed_sr->request_body = rb;
-
-    parsed_sr->method = ngx_http_echo_parse_method_name(&method_name);
-    parsed_sr->method_name  = method_name;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr,
-    ngx_http_echo_subrequest_t *parsed_sr)
-{
-    ngx_http_core_main_conf_t  *cmcf;
-    ngx_http_request_t         *r;
-    ngx_http_request_body_t    *body;
-    ngx_int_t                   rc;
-
-    sr->method = parsed_sr->method;
-    sr->method_name = *(parsed_sr->method_name);
-
-    if (sr->method == NGX_HTTP_HEAD) {
-        sr->header_only = 1;
-    }
-
-    r = sr->parent;
-
-    sr->header_in = r->header_in;
-
-    /* XXX work-around a bug in ngx_http_subrequest */
-    if (r->headers_in.headers.last == &r->headers_in.headers.part) {
-        sr->headers_in.headers.last = &sr->headers_in.headers.part;
-    }
-
-    /* we do not inherit the parent request's variables */
-    cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
-    sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts
-                                * sizeof(ngx_http_variable_value_t));
-
-    if (sr->variables == NULL) {
-        return NGX_ERROR;
-    }
-
-    body = parsed_sr->request_body;
-    if (body) {
-        sr->request_body = body;
-
-        rc = ngx_http_echo_set_content_length_header(sr, body->buf ?
-                                                     ngx_buf_size(body->buf)
-                                                     : 0);
-
-        if (rc != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-    dd("subrequest body: %p", sr->request_body);
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_echo_parse_method_name(ngx_str_t **method_name_ptr)
-{
-    const ngx_str_t     *method_name = *method_name_ptr;
-
-    switch (method_name->len) {
-    case 3:
-        if (ngx_http_echo_strcmp_const(method_name->data, "GET") == 0) {
-            *method_name_ptr = &ngx_http_echo_get_method;
-            return NGX_HTTP_GET;
-        }
-
-        if (ngx_http_echo_strcmp_const(method_name->data, "PUT") == 0) {
-            *method_name_ptr = &ngx_http_echo_put_method;
-            return NGX_HTTP_PUT;
-        }
-
-        return NGX_HTTP_UNKNOWN;
-
-    case 4:
-        if (ngx_http_echo_strcmp_const(method_name->data, "POST") == 0) {
-            *method_name_ptr = &ngx_http_echo_post_method;
-            return NGX_HTTP_POST;
-        }
-
-        if (ngx_http_echo_strcmp_const(method_name->data, "HEAD") == 0) {
-            *method_name_ptr = &ngx_http_echo_head_method;
-            return NGX_HTTP_HEAD;
-        }
-
-        if (ngx_http_echo_strcmp_const(method_name->data, "COPY") == 0) {
-            *method_name_ptr = &ngx_http_echo_copy_method;
-            return NGX_HTTP_COPY;
-        }
-
-        if (ngx_http_echo_strcmp_const(method_name->data, "MOVE") == 0) {
-            *method_name_ptr = &ngx_http_echo_move_method;
-            return NGX_HTTP_MOVE;
-        }
-
-        if (ngx_http_echo_strcmp_const(method_name->data, "LOCK") == 0) {
-            *method_name_ptr = &ngx_http_echo_lock_method;
-            return NGX_HTTP_LOCK;
-        }
-
-        return NGX_HTTP_UNKNOWN;
-
-    case 5:
-        if (ngx_http_echo_strcmp_const(method_name->data, "MKCOL") == 0) {
-            *method_name_ptr = &ngx_http_echo_mkcol_method;
-            return NGX_HTTP_MKCOL;
-        }
-
-        if (ngx_http_echo_strcmp_const(method_name->data, "TRACE") == 0) {
-            *method_name_ptr = &ngx_http_echo_trace_method;
-            return NGX_HTTP_TRACE;
-        }
-
-        return NGX_HTTP_UNKNOWN;
-
-    case 6:
-        if (ngx_http_echo_strcmp_const(method_name->data, "DELETE") == 0) {
-            *method_name_ptr = &ngx_http_echo_delete_method;
-            return NGX_HTTP_DELETE;
-        }
-
-        if (ngx_http_echo_strcmp_const(method_name->data, "UNLOCK") == 0) {
-            *method_name_ptr = &ngx_http_echo_unlock_method;
-            return NGX_HTTP_UNLOCK;
-        }
-
-        return NGX_HTTP_UNKNOWN;
-
-    case 7:
-        if (ngx_http_echo_strcmp_const(method_name->data, "OPTIONS") == 0) {
-            *method_name_ptr = &ngx_http_echo_options_method;
-            return NGX_HTTP_OPTIONS;
-        }
-
-        return NGX_HTTP_UNKNOWN;
-
-    case 8:
-        if (ngx_http_echo_strcmp_const(method_name->data, "PROPFIND") == 0) {
-            *method_name_ptr = &ngx_http_echo_propfind_method;
-            return NGX_HTTP_PROPFIND;
-        }
-
-        return NGX_HTTP_UNKNOWN;
-
-    case 9:
-        if (ngx_http_echo_strcmp_const(method_name->data, "PROPPATCH") == 0) {
-            *method_name_ptr = &ngx_http_echo_proppatch_method;
-            return NGX_HTTP_PROPPATCH;
-        }
-
-        return NGX_HTTP_UNKNOWN;
-
-    default:
-        return NGX_HTTP_UNKNOWN;
-    }
-}
-
-
-/* XXX extermely evil and not working yet */
-ngx_int_t
-ngx_http_echo_exec_abort_parent(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx)
-{
-#if 0
-    ngx_http_postponed_request_t    *pr, *ppr;
-    ngx_http_request_t              *saved_data = NULL;
-    ngx_chain_t                     *out = NULL;
-    /* ngx_int_t                       rc; */
-
-    dd("aborting parent...");
-
-    if (r == r->main || r->parent == NULL) {
-        return NGX_OK;
-    }
-
-    if (r->parent->postponed) {
-        dd("Found parent->postponed...");
-
-        saved_data = r->connection->data;
-        ppr = NULL;
-        for (pr = r->parent->postponed; pr->next; pr = pr->next) {
-            if (pr->request == NULL) {
-                continue;
-            }
-
-            if (pr->request == r) {
-                /* r->parent->postponed->next = pr; */
-                dd("found the current subrequest");
-                out = pr->out;
-                continue;
-            }
-
-            /* r->connection->data = pr->request; */
-            dd("finalizing the subrequest...");
-            ngx_http_upstream_create(pr->request);
-            pr->request->upstream = NULL;
-
-            if (ppr == NULL) {
-                r->parent->postponed = pr->next;
-                ppr = pr->next;
-            } else {
-                ppr->next = pr->next;
-                ppr = pr->next;
-            }
-        }
-    }
-
-    r->parent->postponed->next = NULL;
-
-    /*
-    r->connection->data = r->parent;
-    r->connection->buffered = 0;
-
-    if (out != NULL) {
-        dd("trying to send more stuffs for the parent");
-        ngx_http_output_filter(r->parent, out);
-    }
-    */
-
-    /* ngx_http_send_special(r->parent, NGX_HTTP_LAST); */
-
-    if (saved_data) {
-        r->connection->data = saved_data;
-    }
-
-    dd("terminating the parent request");
-
-    return ngx_http_echo_send_chain_link(r, ctx, NULL /* indicate LAST */);
-
-    /* ngx_http_upstream_create(r); */
-
-    /* ngx_http_finalize_request(r->parent, NGX_ERROR); */
-#endif
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_exec(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
-{
-    ngx_str_t                       *uri;
-    ngx_str_t                       *user_args;
-    ngx_str_t                        args;
-    ngx_uint_t                       flags;
-    ngx_str_t                       *computed_arg;
-
-    computed_arg = computed_args->elts;
-
-    uri = &computed_arg[0];
-
-    if (uri->len == 0) {
-        return NGX_HTTP_BAD_REQUEST;
-    }
-
-    if (computed_args->nelts > 1) {
-        user_args = &computed_arg[1];
-
-    } else {
-        user_args = NULL;
-    }
-
-    args.data = NULL;
-    args.len = 0;
-
-    if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "echo_exec sees unsafe uri: \"%V\"",
-                       uri);
-        return NGX_ERROR;
-    }
-
-    if (args.len > 0 && user_args == NULL) {
-        user_args = &args;
-    }
-
-    r->write_event_handler = ngx_http_request_empty_handler;
-
-    if (uri->data[0] == '@') {
-
-        if (user_args && user_args->len > 0) {
-            ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                          "querystring %V ignored when exec'ing named "
-                          "location %V", user_args, uri);
-        }
-
-#if 1
-        /* clear the modules contexts */
-        ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
-#endif
-
-        dd("named location: %.*s, c:%d", (int) uri->len, uri->data,
-           (int) r->main->count);
-
-        return ngx_http_named_location(r, uri);
-    }
-
-    return ngx_http_internal_redirect(r, uri, user_args);
-}
-
-
-static ngx_int_t
-ngx_http_echo_set_content_length_header(ngx_http_request_t *r, off_t len)
-{
-    ngx_table_elt_t                 *h, *header;
-    u_char                          *p;
-    ngx_list_part_t                 *part;
-    ngx_http_request_t              *pr;
-    ngx_uint_t                       i;
-
-    r->headers_in.content_length_n = len;
-
-    if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
-                      sizeof(ngx_table_elt_t))
-        != NGX_OK)
-    {
-        return NGX_ERROR;
-    }
-
-    h = ngx_list_push(&r->headers_in.headers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    h->key = ngx_http_echo_content_length_header_key;
-    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
-    if (h->lowcase_key == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
-
-    r->headers_in.content_length = h;
-
-    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    h->value.data = p;
-
-    h->value.len = ngx_sprintf(h->value.data, "%O", len) - h->value.data;
-
-    h->hash = ngx_http_echo_content_length_hash;
-
-    dd("r content length: %.*s",
-       (int) r->headers_in.content_length->value.len,
-            r->headers_in.content_length->value.data);
-
-    pr = r->parent;
-
-    if (pr == NULL) {
-        return NGX_OK;
-    }
-
-    /* forward the parent request's all other request headers */
-
-    part = &pr->headers_in.headers.part;
-    header = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        if (header[i].key.len == sizeof("Content-Length") - 1
-            && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length",
-                               sizeof("Content-Length") - 1)
-               == 0)
-        {
-            continue;
-        }
-
-        h = ngx_list_push(&r->headers_in.headers);
-        if (h == NULL) {
-            return NGX_ERROR;
-        }
-
-        *h = header[i];
-    }
-
-    /* XXX maybe we should set those built-in header slot in
-     * ngx_http_headers_in_t too? */
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-echo/src/ngx_http_echo_subrequest.h b/debian/modules/http-echo/src/ngx_http_echo_subrequest.h
deleted file mode 100644
index 61c0a04..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_subrequest.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef ECHO_SUBREQUEST_H
-#define ECHO_SUBREQUEST_H
-
-#include "ngx_http_echo_module.h"
-
-ngx_int_t ngx_http_echo_exec_echo_subrequest(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
-
-ngx_int_t ngx_http_echo_exec_echo_subrequest_async(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
-
-ngx_int_t ngx_http_echo_exec_abort_parent(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx);
-
-ngx_int_t ngx_http_echo_exec_exec(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
-
-#endif /* ECHO_SUBREQUEST_H */
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_timer.c b/debian/modules/http-echo/src/ngx_http_echo_timer.c
deleted file mode 100644
index e2777ee..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_timer.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-
-#include "ddebug.h"
-
-#include "ngx_http_echo_timer.h"
-#include "ngx_http_echo_util.h"
-
-#include <stdlib.h>
-#include <ngx_log.h>
-#include <nginx.h>
-
-
-ngx_int_t
-ngx_http_echo_timer_elapsed_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    ngx_http_echo_ctx_t     *ctx;
-    ngx_msec_int_t           ms;
-    u_char                  *p;
-    ngx_time_t              *tp;
-    size_t                   size;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
-    if (ctx == NULL) {
-        ctx = ngx_http_echo_create_ctx(r);
-        if (ctx == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_http_set_ctx(r, ctx, ngx_http_echo_module);
-    }
-
-    if (ctx->timer_begin.sec == 0) {
-        ctx->timer_begin.sec  = r->start_sec;
-        ctx->timer_begin.msec = (ngx_msec_t) r->start_msec;
-    }
-
-    /* force the ngx timer to update */
-
-#if (nginx_version >= 8035) || (nginx_version < 8000 && nginx_version >= 7066)
-    ngx_time_update();
-#else
-    ngx_time_update(0, 0);
-#endif
-
-    tp = ngx_timeofday();
-
-    dd("old sec msec: %ld %d\n", (long) ctx->timer_begin.sec,
-       (int) ctx->timer_begin.msec);
-
-    dd("new sec msec: %ld %d\n", (long) tp->sec, (int) tp->msec);
-
-    ms = (ngx_msec_int_t)
-             ((tp->sec - ctx->timer_begin.sec) * 1000 +
-              (tp->msec - ctx->timer_begin.msec));
-    ms = (ms >= 0) ? ms : 0;
-
-    size = sizeof("-9223372036854775808.000") - 1;
-
-    p = ngx_palloc(r->pool, size);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    v->len = ngx_snprintf(p, size, "%T.%03M", ms / 1000, ms % 1000) - p;
-    v->data = p;
-
-    v->valid = 1;
-    v->no_cacheable = 1;
-    v->not_found = 0;
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_exec_echo_reset_timer(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx)
-{
-    dd("Exec timer...");
-
-    /* force the ngx timer to update */
-
-#if (nginx_version >= 8035) || (nginx_version < 8000 && nginx_version >= 7066)
-    ngx_time_update();
-#else
-    ngx_time_update(0, 0);
-#endif
-
-    ctx->timer_begin = *ngx_timeofday();
-    return NGX_OK;
-}
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_timer.h b/debian/modules/http-echo/src/ngx_http_echo_timer.h
deleted file mode 100644
index b6e7ff3..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_timer.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ECHO_TIMER_H
-#define ECHO_TIMER_H
-
-#include "ngx_http_echo_module.h"
-
-ngx_int_t ngx_http_echo_timer_elapsed_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
-
-ngx_int_t ngx_http_echo_exec_echo_reset_timer(ngx_http_request_t *r,
-        ngx_http_echo_ctx_t *ctx);
-
-#endif /* ECHO_TIMER_H */
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_util.c b/debian/modules/http-echo/src/ngx_http_echo_util.c
deleted file mode 100644
index fed0587..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_util.c
+++ /dev/null
@@ -1,302 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_echo_util.h"
-#include "ngx_http_echo_sleep.h"
-
-
-ngx_uint_t  ngx_http_echo_content_length_hash = 0;
-
-
-ngx_http_echo_ctx_t *
-ngx_http_echo_create_ctx(ngx_http_request_t *r)
-{
-    ngx_http_echo_ctx_t         *ctx;
-
-    ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_echo_ctx_t));
-    if (ctx == NULL) {
-        return NULL;
-    }
-
-    ctx->sleep.handler   = ngx_http_echo_sleep_event_handler;
-    ctx->sleep.data      = r;
-    ctx->sleep.log       = r->connection->log;
-
-    return ctx;
-}
-
-
-ngx_int_t
-ngx_http_echo_eval_cmd_args(ngx_http_request_t *r,
-    ngx_http_echo_cmd_t *cmd, ngx_array_t *computed_args,
-    ngx_array_t *opts)
-{
-    unsigned                         expecting_opts = 1;
-    ngx_uint_t                       i;
-    ngx_array_t                     *args = cmd->args;
-    ngx_str_t                       *arg, *raw, *opt;
-    ngx_http_echo_arg_template_t    *value;
-
-    value = args->elts;
-
-    for (i = 0; i < args->nelts; i++) {
-        raw = &value[i].raw_value;
-
-        if (value[i].lengths == NULL && raw->len > 0) {
-            if (expecting_opts) {
-                if (raw->len == 1 || raw->data[0] != '-') {
-                    expecting_opts = 0;
-
-                } else if (raw->data[1] == '-') {
-                    expecting_opts = 0;
-                    continue;
-
-                } else {
-                    opt = ngx_array_push(opts);
-                    if (opt == NULL) {
-                        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-                    }
-
-                    opt->len = raw->len - 1;
-                    opt->data = raw->data + 1;
-
-                    dd("pushing opt: %.*s", (int) opt->len, opt->data);
-
-                    continue;
-                }
-            }
-
-        } else {
-            expecting_opts = 0;
-        }
-
-        arg = ngx_array_push(computed_args);
-        if (arg == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        if (value[i].lengths == NULL) { /* does not contain vars */
-            dd("Using raw value \"%.*s\"", (int) raw->len, raw->data);
-            *arg = *raw;
-
-        } else {
-            if (ngx_http_script_run(r, arg, value[i].lengths->elts,
-                                    0, value[i].values->elts)
-                == NULL)
-            {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-        }
-
-        dd("pushed arg: %.*s", (int) arg->len, arg->data);
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_echo_send_chain_link(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_chain_t *in)
-{
-    ngx_int_t        rc;
-
-    rc = ngx_http_echo_send_header_if_needed(r, ctx);
-
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-        return rc;
-    }
-
-    if (in == NULL) {
-
-#if defined(nginx_version) && nginx_version <= 8004
-
-        /* earlier versions of nginx does not allow subrequests
-            to send last_buf themselves */
-        if (r != r->main) {
-            return NGX_OK;
-        }
-
-#endif
-
-        rc = ngx_http_send_special(r, NGX_HTTP_LAST);
-        if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-            return rc;
-        }
-
-        return NGX_OK;
-    }
-
-    /* FIXME we should udpate chains to recycle chain links and bufs */
-    return ngx_http_output_filter(r, in);
-}
-
-
-ngx_int_t
-ngx_http_echo_send_header_if_needed(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx)
-{
-    ngx_int_t                    rc;
-    ngx_http_echo_loc_conf_t    *elcf;
-
-    if (!r->header_sent && !ctx->header_sent) {
-        elcf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
-
-        r->headers_out.status = (ngx_uint_t) elcf->status;
-
-        if (ngx_http_set_content_type(r) != NGX_OK) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        ngx_http_clear_content_length(r);
-        ngx_http_clear_accept_ranges(r);
-
-        rc = ngx_http_send_header(r);
-        ctx->header_sent = 1;
-        return rc;
-    }
-
-    return NGX_OK;
-}
-
-
-ssize_t
-ngx_http_echo_atosz(u_char *line, size_t n)
-{
-    ssize_t  value;
-
-    if (n == 0) {
-        return NGX_ERROR;
-    }
-
-    for (value = 0; n--; line++) {
-        if (*line == '_') { /* we ignore undercores */
-            continue;
-        }
-
-        if (*line < '0' || *line > '9') {
-            return NGX_ERROR;
-        }
-
-        value = value * 10 + (*line - '0');
-    }
-
-    if (value < 0) {
-        return NGX_ERROR;
-    }
-
-    return value;
-}
-
-
-/* Modified from the ngx_strlcasestrn function in ngx_string.h
- * Copyright (C) by Igor Sysoev */
-u_char *
-ngx_http_echo_strlstrn(u_char *s1, u_char *last, u_char *s2, size_t n)
-{
-    ngx_uint_t  c1, c2;
-
-    c2 = (ngx_uint_t) *s2++;
-    last -= n;
-
-    do {
-        do {
-            if (s1 >= last) {
-                return NULL;
-            }
-
-            c1 = (ngx_uint_t) *s1++;
-
-        } while (c1 != c2);
-
-    } while (ngx_strncmp(s1, s2, n) != 0);
-
-    return --s1;
-}
-
-
-ngx_int_t
-ngx_http_echo_post_request_at_head(ngx_http_request_t *r,
-    ngx_http_posted_request_t *pr)
-{
-    dd_enter();
-
-    if (pr == NULL) {
-        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;
-}
-
-
-u_char *
-ngx_http_echo_rebase_path(ngx_pool_t *pool, u_char *src, size_t osize,
-    size_t *nsize)
-{
-    u_char            *p, *dst;
-
-    if (osize == 0) {
-        return NULL;
-    }
-
-    if (src[0] == '/') {
-        /* being an absolute path already, just add a trailing '\0' */
-        *nsize = osize;
-
-        dst = ngx_palloc(pool, *nsize + 1);
-        if (dst == NULL) {
-            *nsize = 0;
-            return NULL;
-        }
-
-        p = ngx_copy(dst, src, osize);
-        *p = '\0';
-
-        return dst;
-    }
-
-    *nsize = ngx_cycle->prefix.len + osize;
-
-    dst = ngx_palloc(pool, *nsize + 1);
-    if (dst == NULL) {
-        *nsize = 0;
-        return NULL;
-    }
-
-    p = ngx_copy(dst, ngx_cycle->prefix.data, ngx_cycle->prefix.len);
-    p = ngx_copy(p, src, osize);
-
-    *p = '\0';
-
-    return dst;
-}
-
-
-ngx_int_t
-ngx_http_echo_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_output_filter(r, NULL);
-    }
-
-    /* do nothing */
-    return NGX_OK;
-}
diff --git a/debian/modules/http-echo/src/ngx_http_echo_util.h b/debian/modules/http-echo/src/ngx_http_echo_util.h
deleted file mode 100644
index d620d09..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_util.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef NGX_HTTP_ECHO_UTIL_H
-#define NGX_HTTP_ECHO_UTIL_H
-
-
-#include "ngx_http_echo_module.h"
-
-
-#define ngx_http_echo_strcmp_const(a, b)                                     \
-    ngx_strncmp(a, b, sizeof(b) - 1)
-
-
-#define ngx_http_echo_hash_literal(s)                                        \
-    ngx_http_echo_hash_str((u_char *) s, sizeof(s) - 1)
-
-
-static ngx_inline ngx_uint_t
-ngx_http_echo_hash_str(u_char *src, size_t n)
-{
-    ngx_uint_t  key;
-
-    key = 0;
-
-    while (n--) {
-        key = ngx_hash(key, *src);
-        src++;
-    }
-
-    return key;
-}
-
-
-extern ngx_uint_t  ngx_http_echo_content_length_hash;
-
-
-ngx_http_echo_ctx_t *ngx_http_echo_create_ctx(ngx_http_request_t *r);
-ngx_int_t ngx_http_echo_eval_cmd_args(ngx_http_request_t *r,
-    ngx_http_echo_cmd_t *cmd, ngx_array_t *computed_args,
-    ngx_array_t *opts);
-ngx_int_t ngx_http_echo_send_header_if_needed(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx);
-ngx_int_t ngx_http_echo_send_chain_link(ngx_http_request_t *r,
-    ngx_http_echo_ctx_t *ctx, ngx_chain_t *cl);
-ssize_t ngx_http_echo_atosz(u_char *line, size_t n);
-u_char *ngx_http_echo_strlstrn(u_char *s1, u_char *last, u_char *s2, size_t n);
-ngx_int_t ngx_http_echo_post_request_at_head(ngx_http_request_t *r,
-    ngx_http_posted_request_t *pr);
-u_char *ngx_http_echo_rebase_path(ngx_pool_t *pool, u_char *src, size_t osize,
-    size_t *nsize);
-ngx_int_t ngx_http_echo_flush_postponed_outputs(ngx_http_request_t *r);
-
-
-#endif /* NGX_HTTP_ECHO_UTIL_H */
diff --git a/debian/modules/http-echo/src/ngx_http_echo_var.c b/debian/modules/http-echo/src/ngx_http_echo_var.c
deleted file mode 100644
index 138a510..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_var.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-#include "ngx_http_echo_var.h"
-#include "ngx_http_echo_timer.h"
-#include "ngx_http_echo_request_info.h"
-#include "ngx_http_echo_foreach.h"
-
-
-static ngx_int_t ngx_http_echo_incr_variable(ngx_http_request_t *r,
-        ngx_http_variable_value_t *v, uintptr_t data);
-
-
-static ngx_http_variable_t ngx_http_echo_variables[] = {
-
-    { ngx_string("echo_timer_elapsed"), NULL,
-      ngx_http_echo_timer_elapsed_variable, 0,
-      NGX_HTTP_VAR_NOCACHEABLE, 0 },
-
-    { ngx_string("echo_request_method"), NULL,
-      ngx_http_echo_request_method_variable, 0,
-      NGX_HTTP_VAR_NOCACHEABLE, 0 },
-
-    { ngx_string("echo_cacheable_request_uri"), NULL,
-      ngx_http_echo_cacheable_request_uri_variable, 0,
-      0, 0 },
-
-    { ngx_string("echo_request_uri"), NULL,
-      ngx_http_echo_request_uri_variable, 0,
-      0, 0 },
-
-    { ngx_string("echo_client_request_method"), NULL,
-      ngx_http_echo_client_request_method_variable, 0,
-      NGX_HTTP_VAR_NOCACHEABLE, 0 },
-
-    { ngx_string("echo_request_body"), NULL,
-      ngx_http_echo_request_body_variable, 0,
-      NGX_HTTP_VAR_NOCACHEABLE, 0 },
-
-    { ngx_string("echo_client_request_headers"), NULL,
-      ngx_http_echo_client_request_headers_variable, 0,
-      NGX_HTTP_VAR_NOCACHEABLE, 0 },
-
-    { ngx_string("echo_it"), NULL,
-      ngx_http_echo_it_variable, 0,
-      NGX_HTTP_VAR_NOCACHEABLE, 0 },
-
-    { ngx_string("echo_incr"), NULL,
-      ngx_http_echo_incr_variable, 0,
-      NGX_HTTP_VAR_NOCACHEABLE, 0 },
-
-    { ngx_string("echo_response_status"), NULL,
-      ngx_http_echo_response_status_variable, 0,
-      NGX_HTTP_VAR_NOCACHEABLE, 0 },
-
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
-};
-
-
-ngx_int_t
-ngx_http_echo_add_variables(ngx_conf_t *cf)
-{
-    ngx_http_variable_t *var, *v;
-
-    for (v = ngx_http_echo_variables; v->name.len; v++) {
-        var = ngx_http_add_variable(cf, &v->name, v->flags);
-        if (var == NULL) {
-            return NGX_ERROR;
-        }
-
-        var->get_handler = v->get_handler;
-        var->data = v->data;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_echo_incr_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    ngx_http_echo_ctx_t         *ctx;
-    u_char                      *p;
-
-    ctx = ngx_http_get_module_ctx(r->main, ngx_http_echo_module);
-
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ctx->counter++;
-
-    p = ngx_palloc(r->pool, NGX_INT_T_LEN);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    v->len = ngx_sprintf(p, "%ui", ctx->counter) - p;
-    v->data = p;
-
-    v->valid = 1;
-    v->not_found = 0;
-    v->no_cacheable = 1;
-
-    return NGX_OK;
-}
-
diff --git a/debian/modules/http-echo/src/ngx_http_echo_var.h b/debian/modules/http-echo/src/ngx_http_echo_var.h
deleted file mode 100644
index 8b24e02..0000000
--- a/debian/modules/http-echo/src/ngx_http_echo_var.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef ECHO_VAR_H
-#define ECHO_VAR_H
-
-#include "ngx_http_echo_module.h"
-
-ngx_int_t ngx_http_echo_add_variables(ngx_conf_t *cf);
-
-#endif /* ECHO_VAR_H */
-
diff --git a/debian/modules/http-echo/t/abort-parent.t b/debian/modules/http-echo/t/abort-parent.t
deleted file mode 100644
index 6137607..0000000
--- a/debian/modules/http-echo/t/abort-parent.t
+++ /dev/null
@@ -1,63 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::LWP skip_all =>
-    'not working at all';
-
-plan tests => 2 * blocks();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /abort {
-        echo hello;
-        echo_flush;
-        echo_location_async '/foo';
-        echo_location_async '/bar';
-        echo_location_async '/baz';
-        echo world;
-        echo_flush;
-    }
-
-    location /proxy {
-        proxy_pass "http://127.0.0.1:$server_port/sleep?$query_string";
-    }
-
-    location /sleep {
-        echo_sleep $arg_sleep;
-        echo $arg_echo;
-        echo_flush;
-    }
-
-    location /foo {
-        echo_location '/proxy?sleep=1&echo=foo';
-        #echo_flush;
-        echo_abort_parent;
-    }
-
-    location /bar {
-        proxy_pass 'http://127.0.0.1:$server_port/sleep_bar';
-    }
-
-    location /baz {
-        proxy_pass 'http://127.0.0.1:$server_port/sleep_baz';
-    }
-
-    location /sleep_bar {
-        echo_sleep 2;
-        echo bar;
-    }
-
-    location /sleep_baz {
-        echo_sleep 3;
-        echo baz;
-    }
---- request
-    GET /abort
---- response_body
-hello
-bar
-
diff --git a/debian/modules/http-echo/t/blocking-sleep.t b/debian/modules/http-echo/t/blocking-sleep.t
deleted file mode 100644
index 0bdc6cc..0000000
--- a/debian/modules/http-echo/t/blocking-sleep.t
+++ /dev/null
@@ -1,156 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-plan tests => 2 * blocks();
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /echo {
-        echo_blocking_sleep 1;
-    }
---- request
-    GET /echo
---- response_body
-
-
-
-=== TEST 2: fractional delay
---- config
-    location /echo {
-        echo_blocking_sleep 0.01;
-    }
---- request
-    GET /echo
---- response_body
-
-
-
-=== TEST 3: leading echo
---- config
-    location /echo {
-        echo before...;
-        echo_blocking_sleep 0.01;
-    }
---- request
-    GET /echo
---- response_body
-before...
-
-
-
-=== TEST 4: trailing echo
---- config
-    location /echo {
-        echo_blocking_sleep 0.01;
-        echo after...;
-    }
---- request
-    GET /echo
---- response_body
-after...
-
-
-
-=== TEST 5: two echos around sleep
---- config
-    location /echo {
-        echo before...;
-        echo_blocking_sleep 0.01;
-        echo after...;
-    }
---- request
-    GET /echo
---- response_body
-before...
-after...
-
-
-
-=== TEST 6: interleaving sleep and echo
---- config
-    location /echo {
-        echo 1;
-        echo_blocking_sleep 0.01;
-        echo 2;
-        echo_blocking_sleep 0.01;
-    }
---- request
-    GET /echo
---- response_body
-1
-2
-
-
-
-=== TEST 7: interleaving sleep and echo with echo at the end...
---- config
-    location /echo {
-        echo 1;
-        echo_blocking_sleep 0.01;
-        echo 2;
-        echo_blocking_sleep 0.01;
-        echo 3;
-    }
---- request
-    GET /echo
---- response_body
-1
-2
-3
-
-
-
-=== TEST 8: flush before sleep
-we didn't really test the actual effect of "echo_flush" here...
-merely checks if it croaks if appears.
---- config
-    location /flush {
-        echo hi;
-        echo_flush;
-        echo_blocking_sleep 0.01;
-        echo trees;
-    }
---- request
-    GET /flush
---- response_body
-hi
-trees
-
-
-
-=== TEST 9: flush does not increment opcode pointer itself
---- config
-    location /flush {
-        echo hi;
-        echo_flush;
-        echo trees;
-    }
---- request
-    GET /flush
---- response_body
-hi
-trees
-
-
-
-=== TEST 10: blocking sleep by variable
---- config
-    location ~ ^/sleep/(.+) {
-        echo before...;
-        echo_blocking_sleep $1;
-        echo after...;
-    }
---- request
-    GET /sleep/0.01
---- response_body
-before...
-after...
-
diff --git a/debian/modules/http-echo/t/echo-after-body.t b/debian/modules/http-echo/t/echo-after-body.t
deleted file mode 100644
index 44c4c72..0000000
--- a/debian/modules/http-echo/t/echo-after-body.t
+++ /dev/null
@@ -1,261 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (2 * blocks() + 1);
-
-no_long_string();
-log_level('warn');
-
-#master_on();
-#workers(1);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- http_config
-    postpone_output 1;
---- config
-    location /echo {
-        echo_after_body hello;
-        echo world;
-    }
---- request
-    GET /echo
---- response_body
-world
-hello
-
-
-
-=== TEST 2: echo after proxy
---- config
-    location /echo {
-        echo_after_body hello;
-        proxy_pass http://127.0.0.1:$server_port$request_uri/more;
-    }
-    location /echo/more {
-        echo world;
-    }
---- request
-    GET /echo
---- response_body
-world
-hello
-
-
-
-=== TEST 3: with variables
---- config
-    location /echo {
-        echo_after_body $request_method;
-        echo world;
-    }
---- request
-    GET /echo
---- response_body
-world
-GET
-
-
-
-=== TEST 4: w/o args
---- config
-    location /echo {
-        echo_after_body;
-        echo world;
-    }
---- request
-    GET /echo
---- response_body eval
-"world\n\n"
-
-
-
-=== TEST 5: order is not important
---- config
-    location /reversed {
-        echo world;
-        echo_after_body hello;
-    }
---- request
-    GET /reversed
---- response_body
-world
-hello
-
-
-
-=== TEST 6: multiple echo_after_body instances
---- config
-    location /echo {
-        echo_after_body hello;
-        echo_after_body world;
-        echo !;
-    }
---- request
-    GET /echo
---- response_body
-!
-hello
-world
-
-
-
-=== TEST 7: multiple echo_after_body instances with multiple echo cmds
---- config
-    location /echo {
-        echo_after_body hello;
-        echo_after_body world;
-        echo i;
-        echo say;
-    }
---- request
-    GET /echo
---- response_body
-i
-say
-hello
-world
-
-
-
-=== TEST 8: echo-after-body & echo-before-body
---- config
-    location /mixed {
-        echo_before_body hello;
-        echo_after_body world;
-        echo_before_body hiya;
-        echo_after_body igor;
-        echo ////////;
-    }
---- request
-    GET /mixed
---- response_body
-hello
-hiya
-////////
-world
-igor
-
-
-
-=== TEST 9: echo around proxy
---- config
-    location /echo {
-        echo_before_body hello;
-        echo_before_body world;
-        #echo $scheme://$host:$server_port$request_uri/more;
-        proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
-        echo_after_body hiya;
-        echo_after_body igor;
-    }
-    location /echo/more {
-        echo blah;
-    }
---- request
-    GET /echo
---- response_body
-hello
-world
-blah
-hiya
-igor
-
-
-
-=== TEST 10: with $echo_response_status
---- config
-    location /status {
-        echo_after_body "status: $echo_response_status";
-        return 404;
-    }
---- request
-    GET /status
---- response_body_like
-.*404 Not Found.*
-status: 404$
---- error_code: 404
-
-
-
-=== TEST 11: in subrequests
---- config
-    location /main {
-        echo_location_async /hello;
-    }
-    location /hello {
-        echo_after_body 'world!';
-        echo 'hello';
-    }
---- request
-    GET /main
---- response_body
-hello
-world!
-
-
-
-=== TEST 12: echo_after_body + gzip
---- config
-    gzip             on;
-    gzip_min_length  1;
-    location /main {
-        echo_after_body 'world!';
-        echo_duplicate 1024 'hello';
-    }
---- request
-    GET /main
---- response_body_like
-hello
---- SKIP
-
-
-
-=== TEST 13: echo_after_body + proxy output
---- config
-    #gzip             on;
-    #gzip_min_length  1;
-    location /main {
-        echo_after_body 'world';
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
-    location /foo {
-        echo_duplicate 10 hello;
-    }
---- request
-    GET /main
---- response_body_like
-^(?:hello){10}world$
-
-
-
-=== TEST 14: in subrequests (we get last_in_chain set properly)
---- config
-    location /main {
-        echo_location_async /hello;
-    }
-    location /hello {
-        echo 'hello';
-        echo_after_body 'world!';
-        body_filter_by_lua '
-            local eof = ngx.arg[2]
-            if eof then
-                print("lua: eof found in body")
-            end
-        ';
-    }
---- request
-    GET /main
---- response_body
-hello
-world!
---- log_level: notice
---- error_log
-lua: eof found in body
-
diff --git a/debian/modules/http-echo/t/echo-before-body.t b/debian/modules/http-echo/t/echo-before-body.t
deleted file mode 100644
index 1513184..0000000
--- a/debian/modules/http-echo/t/echo-before-body.t
+++ /dev/null
@@ -1,278 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-plan tests => 2 * blocks();
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /echo {
-        echo_before_body hello;
-        echo world;
-    }
---- request
-    GET /echo
---- response_body
-hello
-world
-
-
-
-=== TEST 2: echo before proxy
---- config
-    location /echo {
-        echo_before_body hello;
-        proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
-    }
-    location /echo/more {
-        echo world;
-    }
---- request
-    GET /echo
---- response_body
-hello
-world
-
-
-
-=== TEST 3: with variables
---- config
-    location /echo {
-        echo_before_body $request_method;
-        echo world;
-    }
---- request
-    GET /echo
---- response_body
-GET
-world
-
-
-
-=== TEST 4: w/o args
---- config
-    location /echo {
-        echo_before_body;
-        echo world;
-    }
---- request
-    GET /echo
---- response_body eval
-"\nworld\n"
-
-
-
-=== TEST 5: order is not important
---- config
-    location /reversed {
-        echo world;
-        echo_before_body hello;
-    }
---- request
-    GET /reversed
---- response_body
-hello
-world
-
-
-
-=== TEST 6: multiple echo_before_body instances
---- config
-    location /echo {
-        echo_before_body hello;
-        echo_before_body world;
-        echo !;
-    }
---- request
-    GET /echo
---- response_body
-hello
-world
-!
-
-
-
-=== TEST 7: multiple echo_before_body instances with multiple echo cmds
---- config
-    location /echo {
-        echo_before_body hello;
-        echo_before_body world;
-        echo i;
-        echo say;
-    }
---- request
-    GET /echo
---- response_body
-hello
-world
-i
-say
-
-
-
-=== TEST 8: with $echo_response_status
---- config
-    location /status {
-        echo_before_body "status: $echo_response_status";
-        return 404;
-    }
---- request
-    GET /status
---- response_body_like
-status: 404
-<html>.*404 Not Found.*$
---- error_code: 404
-
-
-
-=== TEST 9: $echo_response_status in echo_before_body in subrequests
---- config
-    location /main {
-        echo_location '/status?val=403';
-        echo_location '/status?val=500';
-    }
-    location /status {
-        if ($arg_val = 500) {
-            echo_before_body "status: $echo_response_status";
-            return 500;
-            break;
-        }
-        if ($arg_val = 403) {
-            echo_before_body "status: $echo_response_status";
-            return 403;
-            break;
-        }
-        return 200;
-    }
---- request
-    GET /main
---- response_body_like
-^status: 403.*?status: 500.*$
-
-
-
-=== TEST 10: echo -n
---- config
-    location /echo {
-        echo_before_body -n hello;
-        echo_before_body -n world;
-        echo ==;
-    }
---- request
-    GET /echo
---- response_body
-helloworld==
-
-
-
-=== TEST 11: echo a -n
---- config
-    location /echo {
-        echo_before_body a -n hello;
-        echo_before_body b -n world;
-        echo ==;
-    }
---- request
-    GET /echo
---- response_body
-a -n hello
-b -n world
-==
-
-
-
-=== TEST 12: -n in a var
---- config
-    location /echo {
-        set $opt -n;
-        echo_before_body $opt hello;
-        echo_before_body $opt world;
-        echo ==;
-    }
---- request
-    GET /echo
---- response_body
--n hello
--n world
-==
-
-
-
-=== TEST 13: -n only
---- config
-    location /echo {
-        echo_before_body -n;
-        echo_before_body -n;
-        echo ==;
-    }
---- request
-    GET /echo
---- response_body
-==
-
-
-
-=== TEST 14: -n with an empty string
---- config
-    location /echo {
-        echo_before_body -n "";
-        set $empty "";
-        echo_before_body -n $empty;
-        echo ==;
-    }
---- request
-    GET /echo
---- response_body
-==
-
-
-
-=== TEST 15: -- -n
---- config
-    location /echo {
-        echo_before_body -- -n hello;
-        echo_before_body -- -n world;
-        echo ==;
-    }
---- request
-    GET /echo
---- response_body
--n hello
--n world
-==
-
-
-
-=== TEST 16: -n -n
---- config
-    location /echo {
-        echo_before_body -n -n hello;
-        echo_before_body -n -n world;
-        echo ==;
-    }
---- request
-    GET /echo
---- response_body
-helloworld==
-
-
-
-=== TEST 17: -n -- -n
---- config
-    location /echo {
-        echo_before_body -n -- -n hello;
-        echo_before_body -n -- -n world;
-        echo ==;
-    }
---- request
-    GET /echo
---- response_body
--n hello-n world==
-
diff --git a/debian/modules/http-echo/t/echo-duplicate.t b/debian/modules/http-echo/t/echo-duplicate.t
deleted file mode 100644
index 82b6725..0000000
--- a/debian/modules/http-echo/t/echo-duplicate.t
+++ /dev/null
@@ -1,89 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-plan tests => 2 * blocks();
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /dup {
-        echo_duplicate 3 a;
-    }
---- request
-    GET /dup
---- response_body: aaa
-
-
-
-=== TEST 2: abc abc
---- config
-    location /dup {
-        echo_duplicate 2 abc;
-    }
---- request
-    GET /dup
---- response_body: abcabc
-
-
-
-=== TEST 3: big size with underscores
---- config
-    location /dup {
-        echo_duplicate 10_000 A;
-    }
---- request
-    GET /dup
---- response_body eval
-'A' x 10_000
-
-
-
-=== TEST 4: 0 duplicate 0 empty strings
---- config
-    location /dup {
-        echo_duplicate 0 "";
-    }
---- request
-    GET /dup
---- response_body
-
-
-
-=== TEST 5: 0 duplicate non-empty strings
---- config
-    location /dup {
-        echo_duplicate 0 "abc";
-    }
---- request
-    GET /dup
---- response_body
-
-
-
-=== TEST 6: duplication of empty strings
---- config
-    location /dup {
-        echo_duplicate 2 "";
-    }
---- request
-    GET /dup
---- response_body
-
-
-
-=== TEST 7: sanity (HEAD)
---- config
-    location /dup {
-        echo_duplicate 3 a;
-    }
---- request
-    HEAD /dup
---- response_body
-
diff --git a/debian/modules/http-echo/t/echo-timer.t b/debian/modules/http-echo/t/echo-timer.t
deleted file mode 100644
index 712524d..0000000
--- a/debian/modules/http-echo/t/echo-timer.t
+++ /dev/null
@@ -1,107 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-plan tests => 2 * blocks();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: timer without explicit reset
---- config
-    location /timer {
-        echo_sleep 0.03;
-        echo "elapsed $echo_timer_elapsed sec.";
-    }
---- request
-    GET /timer
---- response_body_like
-^elapsed 0\.0(2[6-9]|3[0-6]) sec\.$
-
-
-
-=== TEST 2: timer without explicit reset and sleep
---- config
-    location /timer {
-        echo "elapsed $echo_timer_elapsed sec.";
-    }
---- request
-    GET /timer
---- response_body_like
-^elapsed 0\.00[0-5] sec\.$
-
-
-
-=== TEST 3: timing accumulated sleeps
---- config
-    location /timer {
-        echo_sleep 0.03;
-        echo_sleep 0.02;
-        echo "elapsed $echo_timer_elapsed sec.";
-    }
---- request
-    GET /timer
---- response_body_like
-^elapsed 0\.0(4[6-9]|5[0-6]) sec\.$
-
-
-
-=== TEST 4: timer with explicit reset but without sleep
---- config
-    location /timer {
-        echo_reset_timer;
-        echo "elapsed $echo_timer_elapsed sec.";
-    }
---- request
-    GET /timer
---- response_body_like
-^elapsed 0\.00[0-5] sec\.$
-
-
-
-=== TEST 5: reset timer between sleeps
---- config
-    location /timer {
-        echo_sleep 0.02;
-        echo "elapsed $echo_timer_elapsed sec.";
-        echo_reset_timer;
-        echo_sleep 0.03;
-        echo "elapsed $echo_timer_elapsed sec.";
-    }
---- request
-    GET /timer
---- response_body_like
-^elapsed 0\.0(1[6-9]|2[0-6]) sec\.
-elapsed 0\.0(2[6-9]|3[0-6]) sec\.$
-
-
-
-=== TEST 6: reset timer between blocking sleeps
---- config
-    location /timer {
-        echo_blocking_sleep 0.02;
-        echo "elapsed $echo_timer_elapsed sec.";
-        echo_reset_timer;
-        echo_blocking_sleep 0.03;
-        echo "elapsed $echo_timer_elapsed sec.";
-    }
---- request
-    GET /timer
---- response_body_like
-^elapsed 0\.0(1[6-9]|2[0-9]) sec\.
-elapsed 0\.0(2[6-9]|3[0-6]) sec\.$
-
-
-
-=== TEST 7: timer without explicit reset
---- config
-    location = /timer {
-        return 200 "$echo_timer_elapsed";
-    }
---- request
-    GET /timer
---- response_body_like chop
-^0(\.0\d*)$
-
diff --git a/debian/modules/http-echo/t/echo.t b/debian/modules/http-echo/t/echo.t
deleted file mode 100644
index b181259..0000000
--- a/debian/modules/http-echo/t/echo.t
+++ /dev/null
@@ -1,416 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (2 * blocks() + 6);
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /echo {
-        echo hello;
-    }
---- request
-    GET /echo
---- response_body
-hello
-
-
-
-=== TEST 2: multiple args
---- config
-    location /echo {
-        echo say hello world;
-    }
---- request
-    GET /echo
---- response_body
-say hello world
-
-
-
-=== TEST 3: multiple directive instances
---- config
-    location /echo {
-        echo say that;
-        echo hello;
-        echo world !;
-    }
---- request
-    GET /echo
---- response_body
-say that
-hello
-world !
-
-
-
-=== TEST 4: echo without arguments
---- config
-    location /echo {
-        echo;
-        echo;
-    }
---- request
-    GET /echo
---- response_body eval
-"\n\n"
-
-
-
-=== TEST 5: escaped newline
---- config
-    location /echo {
-        echo "hello\nworld";
-    }
---- request
-    GET /echo
---- response_body
-hello
-world
-
-
-
-=== TEST 6: escaped tabs and \r and " wihtin "..."
---- config
-    location /echo {
-        echo "i say \"hello\tworld\"\r";
-    }
---- request
-    GET /echo
---- response_body eval: "i say \"hello\tworld\"\r\n"
-
-
-
-=== TEST 7: escaped tabs and \r and " in single quotes
---- config
-    location /echo {
-        echo 'i say \"hello\tworld\"\r';
-    }
---- request
-    GET /echo
---- response_body eval: "i say \"hello\tworld\"\r\n"
-
-
-
-=== TEST 8: escaped tabs and \r and " w/o any quotes
---- config
-    location /echo {
-        echo i say \"hello\tworld\"\r;
-    }
---- request
-    GET /echo
---- response_body eval: "i say \"hello\tworld\"\r\n"
-
-
-
-=== TEST 9: escaping $
-As of Nginx 0.8.20, there's still no way to escape the '$' character.
---- config
-    location /echo {
-        echo \$;
-    }
---- request
-    GET /echo
---- response_body
-$
---- SKIP
-
-
-
-=== TEST 10: XSS
---- config
-    location /blah {
-        echo_duplicate 1 "$arg_callback(";
-        echo_location_async "/data?$uri";
-        echo_duplicate 1 ")";
-    }
-    location /data {
-        echo_duplicate 1 '{"dog":"$query_string"}';
-    }
---- request
-    GET /blah/9999999.json?callback=ding1111111
---- response_body chomp
-ding1111111({"dog":"/blah/9999999.json"})
-
-
-
-=== TEST 11: XSS - filter version
---- config
-    location /blah {
-        echo_before_body "$arg_callback(";
-
-        echo_duplicate 1 '{"dog":"$uri"}';
-
-        echo_after_body ")";
-    }
---- request
-    GET /blah/9999999.json?callback=ding1111111
---- response_body
-ding1111111(
-{"dog":"/blah/9999999.json"})
-
-
-
-=== TEST 12: if
---- config
-location /first {
- echo "before";
- echo_location_async /second $request_uri;
- echo "after";
-}
-
-location = /second {
- if ($query_string ~ '([^?]+)') {
-     set $memcached_key $1;  # needing this to be keyed on the request_path, not the entire uri
-     echo $memcached_key;
- }
-}
---- request
-    GET /first/9999999.json?callback=ding1111111
---- response_body
-before
-/first/9999999.json
-after
-
-
-
-=== TEST 13: echo -n
---- config
-    location /echo {
-        echo -n hello;
-        echo -n world;
-    }
---- request
-    GET /echo
---- response_body chop
-helloworld
-
-
-
-=== TEST 14: echo a -n
---- config
-    location /echo {
-        echo a -n hello;
-        echo b -n world;
-    }
---- request
-    GET /echo
---- response_body
-a -n hello
-b -n world
-
-
-
-=== TEST 15: -n in a var
---- config
-    location /echo {
-        set $opt -n;
-        echo $opt hello;
-        echo $opt world;
-    }
---- request
-    GET /echo
---- response_body
--n hello
--n world
-
-
-
-=== TEST 16: -n only
---- config
-    location /echo {
-        echo -n;
-        echo -n;
-    }
---- request
-    GET /echo
---- response_body chop
-
-
-
-=== TEST 17: -n with an empty string
---- config
-    location /echo {
-        echo -n "";
-        set $empty "";
-        echo -n $empty;
-    }
---- request
-    GET /echo
---- response_body chop
-
-
-
-=== TEST 18: -- -n
---- config
-    location /echo {
-        echo -- -n hello;
-        echo -- -n world;
-    }
---- request
-    GET /echo
---- response_body
--n hello
--n world
-
-
-
-=== TEST 19: -n -n
---- config
-    location /echo {
-        echo -n -n hello;
-        echo -n -n world;
-    }
---- request
-    GET /echo
---- response_body chop
-helloworld
-
-
-
-=== TEST 20: -n -- -n
---- config
-    location /echo {
-        echo -n -- -n hello;
-        echo -n -- -n world;
-    }
---- request
-    GET /echo
---- response_body chop
--n hello-n world
-
-
-
-=== TEST 21: proxy
---- config
-    location /main {
-        proxy_pass http://127.0.0.1:$server_port/echo;
-    }
-    location /echo {
-        echo hello;
-        echo world;
-    }
---- request
-    GET /main
---- response_headers
-!Content-Length
---- response_body
-hello
-world
-
-
-
-=== TEST 22: if is evil
---- config
-    location /test {
-        set $a 3;
-        set_by_lua $a '
-            if ngx.var.a == "3" then
-                return 4
-            end
-        ';
-        echo $a;
-    }
---- request
-    GET /test
---- response_body
-4
---- SKIP
-
-
-
-=== TEST 23: HEAD
---- config
-    location /echo {
-        echo hello;
-        echo world;
-    }
---- request
-    HEAD /echo
---- response_body
-
-
-
-=== TEST 24: POST
---- config
-    location /echo {
-        echo hello;
-        echo world;
-    }
---- pipelined_requests eval
-["POST /echo
-blah blah", "POST /echo
-foo bar baz"]
---- response_body eval
-["hello\nworld\n","hello\nworld\n"]
-
-
-
-=== TEST 25: POST
---- config
-    location /echo {
-        echo_sleep 0.001;
-        echo hello;
-        echo world;
-    }
---- pipelined_requests eval
-["POST /echo
-blah blah", "POST /echo
-foo bar baz"]
---- response_body eval
-["hello\nworld\n","hello\nworld\n"]
-
-
-
-=== TEST 26: empty arg after -n (github issue #33)
---- config
-    location = /t {
-        set $empty "";
-        echo -n $empty hello world;
-    }
---- request
-    GET /t
---- response_body chop
- hello world
-
-
-
-=== TEST 27: image filter
---- config
-    location = /gif {
-        empty_gif;
-    }
-
-    location = /t {
-        default_type image/gif;
-        image_filter resize 10 10;
-        set $gif1 '';
-        set $gif2 '';
-        rewrite_by_lua '
-            local res = ngx.location.capture("/gif")
-            local data = res.body
-            ngx.var.gif1 = string.sub(data, 1, #data - 1)
-            ngx.var.gif2 = string.sub(data, #data)
-        ';
-        echo -n $gif1;
-        echo -n $gif2;
-    }
---- request
-    GET /t
---- stap
-F(ngx_http_image_header_filter) {
-    println("image header filter")
-}
---- stap_out
-image header filter
---- response_body_like: .
-
diff --git a/debian/modules/http-echo/t/exec.t b/debian/modules/http-echo/t/exec.t
deleted file mode 100644
index b7c1308..0000000
--- a/debian/modules/http-echo/t/exec.t
+++ /dev/null
@@ -1,228 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (2 * blocks() + 1);
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: exec normal location
---- config
-    location /main {
-        echo_exec /bar;
-        echo end;
-    }
-    location = /bar {
-        echo "$echo_request_uri:";
-        echo bar;
-    }
---- request
-    GET /main
---- response_body
-/bar:
-bar
-
-
-
-=== TEST 2: location with args (inlined in uri)
---- config
-    location /main {
-        echo_exec /bar?a=32;
-        echo end;
-    }
-    location /bar {
-        echo "a: [$arg_a]";
-    }
---- request
-    GET /main
---- response_body
-a: [32]
-
-
-
-=== TEST 3: location with args (in separate arg)
---- config
-    location /main {
-        echo_exec /bar a=56;
-        echo end;
-    }
-    location /bar {
-        echo "a: [$arg_a]";
-    }
---- request
-    GET /main
---- response_body
-a: [56]
-
-
-
-=== TEST 4: exec named location
---- config
-    location /main {
-        echo_exec @bar;
-        echo end;
-    }
-    location @bar {
-        echo bar;
-    }
---- request
-    GET /main
---- response_body
-bar
-
-
-
-=== TEST 5: query string ignored for named locations
---- config
-    location /main {
-        echo_exec @bar?a=32;
-        echo end;
-    }
-    location @bar {
-        echo "a: [$arg_a]";
-    }
---- request
-    GET /main
---- response_body
-a: []
---- error_log
-querystring a=32 ignored when exec'ing named location @bar
-
-
-
-=== TEST 6: query string ignored for named locations
---- config
-  location /foo {
-      echo_exec @bar;
-  }
-  location @bar {
-      echo "uri: [$echo_request_uri]";
-  }
---- request
-    GET /foo
---- response_body
-uri: [/foo]
-
-
-
-=== TEST 7: exec(named location) in subrequests
---- config
-    location /entry {
-        echo_location /foo;
-        echo_sleep 0.001;
-        echo_location /foo2;
-    }
-  location /foo {
-      echo_exec @bar;
-  }
-  location /foo2 {
-      echo_exec @bar;
-  }
-
-  location @bar {
-    proxy_pass http://127.0.0.1:$server_port/bar;
-  }
-  location /bar {
-    echo_sleep 0.01;
-    echo hello;
-  }
---- request
-    GET /entry
---- response_body
-hello
-hello
-
-
-
-=== TEST 8: exec(normal loctions) in subrequests
---- config
-    location /entry {
-        echo_location /foo;
-        echo_sleep 0.001;
-        echo_location /foo2;
-    }
-  location /foo {
-      echo_exec /baz;
-  }
-  location /foo2 {
-      echo_exec /baz;
-  }
-
-  location /baz {
-    proxy_pass http://127.0.0.1:$server_port/bar;
-  }
-  location /bar {
-    echo_sleep 0.01;
-    echo hello;
-  }
---- request
-    GET /entry
---- response_body
-hello
-hello
-
-
-
-=== TEST 9: exec should clear ctx
---- config
-    location @bar {
-        echo hello;
-        echo world;
-        echo heh;
-    }
-  location /foo {
-      #echo_sleep 0.001;
-      echo_reset_timer;
-      echo_exec @bar;
-  }
---- request
-    GET /foo
---- response_body
-hello
-world
-heh
-
-
-
-=== TEST 10: reset ctx
---- config
-    location @proxy {
-        rewrite_by_lua return;
-        echo hello;
-    }
-    location /main {
-        rewrite_by_lua return;
-        echo_exec @proxy;
-    }
---- request
-    GET /main
---- response_body
-hello
-
-
-
-=== TEST 11: yield before exec
---- config
-    location @bar {
-        echo hello;
-        echo world;
-        echo heh;
-    }
-  location /foo {
-      echo_sleep 0.001;
-      echo_exec @bar;
-  }
---- request
-    GET /foo
---- response_body
-hello
-world
-heh
-
diff --git a/debian/modules/http-echo/t/filter-used.t b/debian/modules/http-echo/t/filter-used.t
deleted file mode 100644
index 2835270..0000000
--- a/debian/modules/http-echo/t/filter-used.t
+++ /dev/null
@@ -1,59 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (3 * blocks());
-
-no_long_string();
-log_level('warn');
-
-#master_on();
-#workers(1);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: filter indeed used
---- http_config
-    postpone_output 1;
---- config
-    location /echo {
-        echo_after_body hello;
-        echo world;
-    }
---- request
-    GET /echo
---- stap
-F(ngx_http_echo_header_filter) {
-    println("echo header filter called")
-}
---- stap_out
-echo header filter called
---- response_body
-world
-hello
-
-
-
-=== TEST 2: filter not used
---- http_config
-    postpone_output 1;
---- config
-    location /echo {
-        #echo_after_body hello;
-        echo world;
-    }
---- request
-    GET /echo
---- stap
-F(ngx_http_echo_header_filter) {
-    println("echo header filter called")
-}
---- stap_out
---- response_body
-world
-
diff --git a/debian/modules/http-echo/t/foreach-split.t b/debian/modules/http-echo/t/foreach-split.t
deleted file mode 100644
index 266a701..0000000
--- a/debian/modules/http-echo/t/foreach-split.t
+++ /dev/null
@@ -1,283 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * 2 * blocks();
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /main {
-        echo_foreach_split '&' $query_string;
-            echo_location_async $echo_it;
-            echo '/* end */';
-        echo_end;
-    }
-    location /sub/1.css {
-        echo "body { font-size: 12pt; }";
-    }
-    location /sub/2.css {
-        echo "table { color: 'red'; }";
-    }
---- request
-    GET /main?/sub/1.css&/sub/2.css
---- response_body
-body { font-size: 12pt; }
-/* end */
-table { color: 'red'; }
-/* end */
-
-
-
-=== TEST 2: split in a url argument (echo_location_async)
---- config
-    location /main_async {
-        echo_foreach_split ',' $arg_cssfiles;
-            echo_location_async $echo_it;
-        echo_end;
-    }
-    location /foo.css {
-        echo foo;
-    }
-    location /bar.css {
-        echo bar;
-    }
-    location /baz.css {
-        echo baz;
-    }
---- request
-    GET /main_async?cssfiles=/foo.css,/bar.css,/baz.css
---- response_body
-foo
-bar
-baz
-
-
-
-=== TEST 3: split in a url argument (echo_location)
---- config
-    location /main_sync {
-        echo_foreach_split ',' $arg_cssfiles;
-            echo_location $echo_it;
-        echo_end;
-    }
-    location /foo.css {
-        echo foo;
-    }
-    location /bar.css {
-        echo bar;
-    }
-    location /baz.css {
-        echo baz;
-    }
---- request
-    GET /main_sync?cssfiles=/foo.css,/bar.css,/baz.css
---- response_body
-foo
-bar
-baz
---- SKIP
-
-
-
-=== TEST 4: empty loop
---- config
-    location /main {
-        echo "start";
-        echo_foreach_split ',' $arg_cssfiles;
-        echo_end;
-        echo "end";
-    }
---- request
-    GET /main?cssfiles=/foo.css,/bar.css,/baz.css
---- response_body
-start
-end
-
-
-
-=== TEST 5: trailing delimiter
---- config
-    location /main_t {
-        echo_foreach_split ',' $arg_cssfiles;
-            echo_location_async $echo_it;
-        echo_end;
-    }
-    location /foo.css {
-        echo foo;
-    }
---- request
-    GET /main_t?cssfiles=/foo.css,
---- response_body
-foo
-
-
-
-=== TEST 6: multi-char delimiter
---- config
-    location /main_sleep {
-        echo_foreach_split '-a-' $arg_list;
-            echo $echo_it;
-        echo_end;
-    }
---- request
-    GET /main_sleep?list=foo-a-bar-a-baz
---- error_code: 500
---- response_body_like: 500 Internal Server Error
-
-
-
-=== TEST 7: multi-char delimiter (the right way)
---- config
-    location /main_sleep {
-        echo_foreach_split -- '-a-' $arg_list;
-            echo $echo_it;
-        echo_end;
-    }
---- request
-    GET /main_sleep?list=foo-a-bar-a-baz
---- response_body
-foo
-bar
-baz
-
-
-
-=== TEST 8: loop with sleep
---- config
-    location /main_sleep {
-        echo_foreach_split '-' $arg_list;
-            echo_sleep 0.001;
-            echo $echo_it;
-        echo_end;
-    }
---- request
-    GET /main_sleep?list=foo-a-bar-A-baz
---- response_body
-foo
-a
-bar
-A
-baz
-
-
-
-=== TEST 9: empty
---- config
-  location /merge {
-      default_type 'text/javascript';
-      echo_foreach_split '&' $query_string;
-          echo "/* JS File $echo_it */";
-          echo_location_async $echo_it;
-          echo;
-      echo_end;
-  }
---- request
-    GET /merge
---- response_body
-
-
-
-=== TEST 10: single &
---- config
-  location /merge {
-      default_type 'text/javascript';
-      echo_foreach_split '&' $query_string;
-          echo "/* JS File $echo_it */";
-          echo_location_async $echo_it;
-          echo;
-      echo_end;
-  }
---- request
-    GET /merge?&
---- response_body
-
-
-
-=== TEST 11: pure &'s
---- config
-  location /merge {
-      default_type 'text/javascript';
-      echo_foreach_split '&' $query_string;
-          echo "/* JS File $echo_it */";
-          echo_location_async $echo_it;
-          echo;
-      echo_end;
-  }
---- request
-    GET /merge?&&&
---- response_body
-
-
-
-=== TEST 12: pure & and spaces
-TODO: needs to uri_decode $echo_it...
---- config
-  location /merge {
-      default_type 'text/javascript';
-      echo_foreach_split '&' $query_string;
-          echo "/* JS File $echo_it */";
-          echo_location_async $echo_it;
-          echo;
-      echo_end;
-  }
---- request
-    GET /merge?&%20&%20&
---- response_body
---- SKIP
-
-
-
-=== TEST 13: multiple foreach_split
---- config
-    location /multi {
-        echo_foreach_split '&' $query_string;
-            echo [$echo_it];
-        echo_end;
-
-        echo '...';
-
-        echo_foreach_split '-' $query_string;
-            echo [$echo_it];
-        echo_end;
-    }
---- request
-    GET /multi?a-b&c-d
---- response_body
-[a-b]
-[c-d]
-...
-[a]
-[b&c]
-[d]
-
-
-
-=== TEST 14: github issue #2: setting a variable from $echo_it results to crashing
---- config
-location = /getFile {
-    set $filelist "a,b,c";
-    echo_foreach_split ',' $filelist;
-    set $file $echo_it;
-    echo_subrequest GET '/getFile2' -q 'sha256=$file';
-    echo_end;
-}
-
-location = /getFile2 {
-    echo "sha256: $arg_sha256";
-}
---- request
-    GET /getFile
---- response_body
-sha256: 
-sha256: 
-sha256: 
-
diff --git a/debian/modules/http-echo/t/gzip.t b/debian/modules/http-echo/t/gzip.t
deleted file mode 100644
index 61eb4f6..0000000
--- a/debian/modules/http-echo/t/gzip.t
+++ /dev/null
@@ -1,31 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(1);
-
-plan tests => repeat_each() * 2 * blocks();
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /gzip {
-      gzip             on;
-      gzip_min_length  10;
-      gzip_types       text/plain;
-
-      echo_duplicate   1000 hello;
-    }
---- request
-    GET /gzip
---- more_headers
-Accept-Encoding: gzip
---- response_headers
-Content-Encoding: gzip
---- timeout: 20
diff --git a/debian/modules/http-echo/t/if.t b/debian/modules/http-echo/t/if.t
deleted file mode 100644
index 054ec43..0000000
--- a/debian/modules/http-echo/t/if.t
+++ /dev/null
@@ -1,150 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-plan tests => 2 * blocks();
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity (hit)
---- config
-    location ^~ /if {
-        set $res miss;
-        if ($arg_val ~* '^a') {
-            set $res hit;
-            echo $res;
-        }
-        echo $res;
-    }
---- request
-    GET /if?val=abc
---- response_body
-hit
-
-
-
-=== TEST 2: sanity (miss)
---- config
-    location ^~ /if {
-        set $res miss;
-        if ($arg_val ~* '^a') {
-            set $res hit;
-            echo $res;
-        }
-        echo $res;
-    }
---- request
-    GET /if?val=bcd
---- response_body
-miss
-
-
-
-=== TEST 3: proxy in if (hit)
---- config
-    location ^~ /if {
-        set $res miss;
-        if ($arg_val ~* '^a') {
-            set $res hit;
-            proxy_pass $scheme://127.0.0.1:$server_port/foo?res=$res;
-        }
-        proxy_pass $scheme://127.0.0.1:$server_port/foo?res=$res;
-    }
-    location /foo {
-        echo "res = $arg_res";
-    }
---- request
-    GET /if?val=abc
---- response_body
-res = hit
-
-
-
-=== TEST 4: proxy in if (miss)
---- config
-    location ^~ /if {
-        set $res miss;
-        if ($arg_val ~* '^a') {
-            set $res hit;
-            proxy_pass $scheme://127.0.0.1:$server_port/foo?res=$res;
-        }
-        proxy_pass $scheme://127.0.0.1:$server_port/foo?res=$res;
-    }
-    location /foo {
-        echo "res = $arg_res";
-    }
---- request
-    GET /if?val=bcd
---- response_body
-res = miss
-
-
-
-=== TEST 5: if too long url (hit)
---- config
-    location /foo {
-        if ($request_uri ~ '.{20,}') {
-            echo too long;
-        }
-        echo ok;
-    }
---- request
-    GET /foo?a=12345678901234567890
---- response_body
-too long
-
-
-
-=== TEST 6: if too long url (miss)
---- config
-    location /foo {
-        if ($request_uri ~ '.{20,}') {
-            echo too long;
-        }
-        echo ok;
-    }
---- request
-    GET /foo?a=1234567890
---- response_body
-ok
-
-
-
-=== TEST 7: echo should be inherited by if blocks
---- config
-    location /foo {
-        if ($uri ~ 'foo') {
-        }
-        echo ok;
-    }
---- request
-    GET /foo
---- response_body
-ok
-
-
-
-=== TEST 8: echo_after_body and echo_before_body should be inherited by if blocks
---- config
-    location /foo {
-        if ($uri ~ 'foo') {
-        }
-        echo_before_body -n 'hello';
-        echo_location /comma;
-        echo_after_body 'world';
-    }
-
-    location = /comma {
-        internal;
-        echo -n ', ';
-    }
---- request
-    GET /foo
---- response_body
-hello, world
-
diff --git a/debian/modules/http-echo/t/incr.t b/debian/modules/http-echo/t/incr.t
deleted file mode 100644
index 8ad6d98..0000000
--- a/debian/modules/http-echo/t/incr.t
+++ /dev/null
@@ -1,32 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-plan tests => 2 * blocks();
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /main {
-        echo "main pre: $echo_incr";
-        echo_location_async /sub;
-        echo_location_async /sub;
-        echo "main post: $echo_incr";
-    }
-    location /sub {
-        echo "sub: $echo_incr";
-    }
---- request
-    GET /main
---- response_body
-main pre: 1
-sub: 3
-sub: 4
-main post: 2
-
diff --git a/debian/modules/http-echo/t/location-async.t b/debian/modules/http-echo/t/location-async.t
deleted file mode 100644
index 3494516..0000000
--- a/debian/modules/http-echo/t/location-async.t
+++ /dev/null
@@ -1,439 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (2 * blocks() + 1);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /main {
-        echo_location_async /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-hello
-
-
-
-=== TEST 2: trailing echo
---- config
-    location /main {
-        echo_location_async /sub;
-        echo after subrequest;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-hello
-after subrequest
-
-
-
-=== TEST 3: leading echo
---- config
-    location /main {
-        echo before subrequest;
-        echo_location_async /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before subrequest
-hello
-
-
-
-=== TEST 4: leading & trailing echo
---- config
-    location /main {
-        echo before subrequest;
-        echo_location_async /sub;
-        echo after subrequest;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before subrequest
-hello
-after subrequest
-
-
-
-=== TEST 5: multiple subrequests
---- config
-    location /main {
-        echo before sr 1;
-        echo_location_async /sub;
-        echo after sr 1;
-        echo before sr 2;
-        echo_location_async /sub;
-        echo after sr 2;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before sr 1
-hello
-after sr 1
-before sr 2
-hello
-after sr 2
-
-
-
-=== TEST 6: timed multiple subrequests (blocking sleep)
---- config
-    location /main {
-        echo_reset_timer;
-        echo_location_async /sub1;
-        echo_location_async /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_blocking_sleep 0.02;
-        echo hello;
-    }
-    location /sub2 {
-        echo_blocking_sleep 0.01;
-        echo world;
-    }
-
---- request
-    GET /main
---- response_body_like
-^hello
-world
-took 0\.00[0-5] sec for total\.$
-
-
-
-=== TEST 7: timed multiple subrequests (non-blocking sleep)
---- config
-    location /main {
-        echo_reset_timer;
-        echo_location_async /sub1;
-        echo_location_async /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_sleep 0.02;
-        echo hello;
-    }
-    location /sub2 {
-        echo_sleep 0.01;
-        echo world;
-    }
-
---- request
-    GET /main
---- response_body_like
-^hello
-world
-took 0\.00[0-5] sec for total\.$
-
-
-
-=== TEST 8: location with args
---- config
-    location /main {
-        echo_location_async /sub 'foo=Foo&bar=Bar';
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-Foo Bar
-
-
-
-=== TEST 9: encoded chars in query strings
---- config
-    location /main {
-        echo_location_async /sub 'foo=a%20b&bar=Bar';
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-a%20b Bar
-
-
-
-=== TEST 10: UTF-8 chars in query strings
---- config
-    location /main {
-        echo_location_async /sub 'foo=你好';
-    }
-    location /sub {
-        echo $arg_foo;
-    }
---- request
-    GET /main
---- response_body
-你好
-
-
-
-=== TEST 11: encoded chars in location url
---- config
-    location /main {
-        echo_location_async /sub%31 'foo=Foo&bar=Bar';
-    }
-    location /sub%31 {
-        echo 'sub%31';
-    }
-    location /sub1 {
-        echo 'sub1';
-    }
---- request
-    GET /main
---- response_body
-sub1
-
-
-
-=== TEST 12: querystring in url
---- config
-    location /main {
-        echo_location_async /sub?foo=Foo&bar=Bar;
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-Foo Bar
-
-
-
-=== TEST 13: querystring in url *AND* an explicit querystring
---- config
-    location /main {
-        echo_location_async /sub?foo=Foo&bar=Bar blah=Blah;
-    }
-    location /sub {
-        echo $arg_foo $arg_bar $arg_blah;
-    }
---- request
-    GET /main
---- response_body
-  Blah
-
-
-
-=== TEST 14: explicit flush in main request
-flush won't really flush the buffer...
---- config
-    location /main_flush {
-        echo 'pre main';
-        echo_location_async /sub;
-        echo 'post main';
-        echo_flush;
-    }
-
-    location /sub {
-        echo_sleep 0.02;
-        echo 'sub';
-    }
---- request
-    GET /main_flush
---- response_body
-pre main
-sub
-post main
-
-
-
-=== TEST 15: no varaiable inheritance
---- config
-    location /main {
-        echo $echo_cacheable_request_uri;
-        echo_location_async /sub;
-        echo_location_async /sub2;
-    }
-    location /sub {
-        echo $echo_cacheable_request_uri;
-    }
-    location /sub2 {
-        echo $echo_cacheable_request_uri;
-    }
-
---- request
-    GET /main
---- response_body
-/main
-/sub
-/sub2
-
-
-
-=== TEST 16: unsafe uri
---- config
-    location /unsafe {
-        echo_location_async '/../foo';
-    }
---- request
-    GET /unsafe
---- stap2
-F(ngx_http_send_header) {
-    printf("send header on req %p (header sent: %d)\n", $r, $r->header_sent)
-    print_ubacktrace()
-}
---- ignore_response
---- error_log
-echo_location_async sees unsafe uri: "/../foo"
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 17: access/deny (access phase handlers skipped in subrequests)
---- config
-    location /main {
-        echo_location_async /denied;
-    }
-    location /denied {
-        deny all;
-        echo No no no;
-    }
---- request
-    GET /main
---- error_code: 200
---- response_body
-No no no
-
-
-
-=== TEST 18: rewrite is honored.
---- config
-    location /main {
-        echo_location_async /rewrite;
-    }
-    location /rewrite {
-        rewrite ^ /foo break;
-        echo $uri;
-    }
---- request
-    GET /main
---- response_body
-/foo
-
-
-
-=== TEST 19: let subrequest to read the main request's request body
---- SKIP
---- config
-    location /main {
-        echo_location_async /sub;
-    }
-    location /sub {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /main
-hello, body!
---- response_body chomp
-hello, body!
-
-
-
-=== TEST 20: leading subrequest & echo_before_body
---- config
-    location /main {
-        echo_before_body hello;
-        echo_location_async /foo;
-    }
-    location /foo {
-        echo world;
-    }
---- request
-    GET /main
---- response_body
-hello
-world
-
-
-
-=== TEST 21: leading subrequest & xss
---- config
-    location /main {
-        default_type 'application/json';
-        xss_get on;
-        xss_callback_arg c;
-        echo_location_async /foo;
-    }
-    location /foo {
-        echo -n world;
-    }
---- request
-    GET /main?c=hi
---- response_body chop
-hi(world);
-
-
-
-=== TEST 22: multiple leading subrequest & xss
---- config
-    location /main {
-        default_type 'application/json';
-        xss_get on;
-        xss_callback_arg c;
-        echo_location_async /foo;
-        echo_location_async /bar;
-    }
-    location /foo {
-        echo -n world;
-    }
-    location /bar {
-        echo -n ' people';
-    }
---- request
-    GET /main?c=hi
---- response_body chop
-hi(world people);
-
-
-
-=== TEST 23: sanity (HEAD)
---- config
-    location /main {
-        echo_location_async /sub;
-        echo_location_async /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    HEAD /main
---- response_body
-
diff --git a/debian/modules/http-echo/t/location.t b/debian/modules/http-echo/t/location.t
deleted file mode 100644
index 48c851e..0000000
--- a/debian/modules/http-echo/t/location.t
+++ /dev/null
@@ -1,567 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (2 * blocks() + 2);
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-#no_diff();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /main {
-        echo_location /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-hello
-
-
-
-=== TEST 2: sanity with proxy in the middle
---- config
-    location /main {
-        echo_location /proxy;
-    }
-    location /proxy {
-        proxy_pass $scheme://127.0.0.1:$server_port/sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-hello
-
-
-
-=== TEST 3: trailing echo
---- config
-    location /main {
-        echo_location /sub;
-        echo after subrequest;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-hello
-after subrequest
-
-
-
-=== TEST 4: leading echo
---- config
-    location /main {
-        echo before subrequest;
-        echo_location /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before subrequest
-hello
-
-
-
-=== TEST 5: leading & trailing echo
---- config
-    location /main {
-        echo before subrequest;
-        echo_location /sub;
-        echo after subrequest;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before subrequest
-hello
-after subrequest
-
-
-
-=== TEST 6: multiple subrequests
---- config
-    location /main {
-        echo before sr 1;
-        echo_location /sub;
-        echo after sr 1;
-        echo before sr 2;
-        echo_location /sub;
-        echo after sr 2;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before sr 1
-hello
-after sr 1
-before sr 2
-hello
-after sr 2
-
-
-
-=== TEST 7: timed multiple subrequests (blocking sleep)
---- config
-    location /main {
-        echo_reset_timer;
-        echo_location /sub1;
-        echo_location /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_blocking_sleep 0.02;
-        echo hello;
-    }
-    location /sub2 {
-        echo_blocking_sleep 0.01;
-        echo world;
-    }
-
---- request
-    GET /main
---- response_body_like
-^hello
-world
-took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
-
-
-
-=== TEST 8: timed multiple subrequests (non-blocking sleep)
---- config
-    location /main {
-        echo_reset_timer;
-        echo_location /sub1;
-        echo_location /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_sleep 0.02;
-        echo hello;
-    }
-    location /sub2 {
-        echo_sleep 0.01;
-        echo world;
-    }
-
---- request
-    GET /main
---- response_body_like
-^hello
-world
-took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
-
-
-
-=== TEST 9: location with args
---- config
-    location /main {
-        echo_location /sub 'foo=Foo&bar=Bar';
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-Foo Bar
-
-
-
-=== TEST 10: chained subrequests
---- config
-    location /main {
-        echo 'pre main';
-        echo_location /sub;
-        echo 'post main';
-    }
-
-    location /sub {
-        echo 'pre sub';
-        echo_location /subsub;
-        echo 'post sub';
-    }
-
-    location /subsub {
-        echo 'subsub';
-    }
---- request
-    GET /main
---- response_body
-pre main
-pre sub
-subsub
-post sub
-post main
-
-
-
-=== TEST 11: chained subrequests using named locations
-as of 0.8.20, ngx_http_subrequest still does not support
-named location. sigh. this case is a TODO.
---- config
-    location /main {
-        echo 'pre main';
-        echo_location @sub;
-        echo 'post main';
-    }
-
-    location @sub {
-        echo 'pre sub';
-        echo_location @subsub;
-        echo 'post sub';
-    }
-
-    location @subsub {
-        echo 'subsub';
-    }
---- request
-    GET /main
---- response_body
-pre main
-pre sub
-subsub
-post sub
-post main
---- SKIP
-
-
-
-=== TEST 12: explicit flush in main request
---- config
-    location /main {
-        echo 'pre main';
-        echo_location /sub;
-        echo 'post main';
-        echo_flush;
-    }
-
-    location /sub {
-        echo_sleep 0.02;
-        echo 'sub';
-    }
---- request
-    GET /main
---- response_body
-pre main
-sub
-post main
-
-
-
-=== TEST 13: no varaiable inheritance
---- config
-    location /main {
-        echo $echo_cacheable_request_uri;
-        echo_location /sub;
-        echo_location /sub2;
-    }
-    location /sub {
-        echo $echo_cacheable_request_uri;
-    }
-    location /sub2 {
-        echo $echo_cacheable_request_uri;
-    }
-
---- request
-    GET /main
---- response_body
-/main
-/sub
-/sub2
-
-
-
-=== TEST 14: unsafe uri
---- config
-    location /unsafe {
-        echo_location '/../foo';
-    }
---- request
-    GET /unsafe
---- ignore_response
---- error_log
-echo_location sees unsafe uri: "/../foo"
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 15: querystring in url
---- config
-    location /main {
-        echo_location /sub?foo=Foo&bar=Bar;
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-Foo Bar
-
-
-
-=== TEST 16: querystring in url *AND* an explicit querystring
---- config
-    location /main {
-        echo_location /sub?foo=Foo&bar=Bar blah=Blah;
-    }
-    location /sub {
-        echo $arg_foo $arg_bar $arg_blah;
-    }
---- request
-    GET /main
---- response_body
-  Blah
-
-
-
-=== TEST 17: let subrequest to read the main request's request body
---- SKIP
---- config
-    location /main {
-        echo_location /sub;
-    }
-    location /sub {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /main
-hello, body!
---- response_body chomp
-hello, body!
-
-
-
-=== TEST 18: sleep after location
---- config
-    location /main {
-        echo_location /sub;
-        echo_sleep 0.001;
-        echo_location /sub;
-    }
-    location /sub {
-        echo_sleep 0.001;
-        echo sub;
-    }
---- request
-    GET /main
---- response_body
-sub
-sub
---- skip_nginx: 2: < 0.8.11
-
-
-
-=== TEST 19: deep nested echo_location/echo_location_async
---- config
-    location /main {
-        echo_location /bar;
-        echo_location_async /bar;
-        echo_location_async /bar;
-        echo_location /group;
-        echo_location_async /group;
-    }
-
-    location /group {
-        echo_location /bar;
-        echo_location_async /bar;
-    }
-
-    location /bar {
-        #echo_sleep 0.001;
-        echo $echo_incr;
-    }
---- request
-GET /main
---- response_body
-1
-2
-3
-4
-5
-6
-7
---- timeout: 2
-
-
-
-=== TEST 20: deep nested echo_location/echo_location_async (with sleep)
---- config
-    location /main {
-        echo_location /bar;
-        echo_location_async /bar;
-        echo_location_async /bar;
-        echo_location /group;
-        echo_location_async /group;
-    }
-
-    location /group {
-        echo_location /baz;
-        echo_location_async /bah;
-    }
-
-    location ~ '^/ba[rzh]' {
-        echo_sleep 0.001;
-        echo $echo_incr;
-    }
---- request
-GET /main
---- response_body
-1
-2
-3
-4
-5
-6
-7
---- timeout: 2
-
-
-
-=== TEST 21: deep nested echo_location (with sleep)
---- config
-    location /main {
-        echo_location /bar;
-        echo_location /bar;
-        echo_location /bar;
-        echo_location /group;
-        echo_location /group;
-    }
-
-    location /group {
-        echo_location /bar;
-        echo_location /bar;
-    }
-
-    location /incr {
-        echo_sleep 0.001;
-        echo $echo_incr;
-    }
-
-    location /bar {
-        proxy_pass $scheme://127.0.0.1:$server_port/incr;
-    }
---- request
-GET /main
---- response_body
-1
-1
-1
-1
-1
-1
-1
---- timeout: 5
---- no_error_log
-[error]
-
-
-
-=== TEST 22: leading subrequest & echo_before_body
---- config
-    location /main {
-        echo_before_body hello;
-        echo_location /foo;
-    }
-    location /foo {
-        echo world;
-    }
---- request
-    GET /main
---- response_body
-hello
-world
-
-
-
-=== TEST 23: leading subrequest & xss
---- config
-    location /main {
-        default_type 'application/json';
-        xss_get on;
-        xss_callback_arg c;
-        echo_location /foo;
-    }
-    location /foo {
-        echo -n world;
-    }
---- request
-    GET /main?c=hi
---- response_body chop
-hi(world);
-
-
-
-=== TEST 24: multiple leading subrequest & xss
---- config
-    location /main {
-        default_type 'application/json';
-        xss_get on;
-        xss_callback_arg c;
-        echo_location /foo;
-        echo_location /bar;
-    }
-    location /main2 {
-        content_by_lua '
-            local res = ngx.location.capture("/foo")
-            local res2 = ngx.location.capture("/bar")
-            ngx.say(res.body)
-            ngx.say(res2.body)
-        ';
-    }
-    location /foo {
-        echo -n world;
-    }
-    location /bar {
-        echo -n ' people';
-    }
---- request
-    GET /main?c=hi
---- response_body chop
-hi(world people);
-
-
-
-=== TEST 25: sanity (HEAD)
---- config
-    location /main {
-        echo_location /sub;
-        echo_location /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    HEAD /main
---- response_body
-
diff --git a/debian/modules/http-echo/t/mixed.t b/debian/modules/http-echo/t/mixed.t
deleted file mode 100644
index abf2599..0000000
--- a/debian/modules/http-echo/t/mixed.t
+++ /dev/null
@@ -1,82 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-plan tests => 2 * blocks();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: echo before echo_client_request_headers
---- config
-    location /echo {
-        echo "headers:";
-        echo -n $echo_client_request_headers;
-    }
---- request
-    GET /echo
---- response_body eval
-"headers:
-GET /echo HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-"
-
-
-
-=== TEST 2: echo_client_request_headers before echo
---- config
-    location /echo {
-        echo -n $echo_client_request_headers;
-        echo "...these are the headers";
-    }
---- request
-    GET /echo
---- response_body eval
-"GET /echo HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-...these are the headers
-"
-
-
-
-=== TEST 3: echo & headers & echo
---- config
-    location /echo {
-        echo "headers are";
-        echo -n $echo_client_request_headers;
-        echo "...these are the headers";
-    }
---- request
-    GET /echo
---- response_body eval
-"headers are
-GET /echo HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-...these are the headers
-"
-
-
-
-=== TEST 4: mixed with echo_duplicate
---- config
-    location /mixed {
-        echo hello;
-        echo_duplicate 2 ---;
-        echo_duplicate 1 ' END ';
-        echo_duplicate 2 ---;
-        echo;
-    }
---- request
-    GET /mixed
---- response_body
-hello
------- END ------
-
diff --git a/debian/modules/http-echo/t/request-body.t b/debian/modules/http-echo/t/request-body.t
deleted file mode 100644
index d467b2e..0000000
--- a/debian/modules/http-echo/t/request-body.t
+++ /dev/null
@@ -1,58 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * 2 * blocks();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: big client body buffered into temp files
---- config
-    location /echo {
-        client_body_buffer_size 1k;
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request eval
-"POST /echo
-" . 'a' x 4096 . 'end';
---- response_body eval
-'a' x 4096 . 'end'
-
-
-
-=== TEST 2: in memory request body (trailing echo)
---- config
-    location /echo {
-        client_body_buffer_size 1k;
-        echo_read_request_body;
-        echo_request_body;
-        echo done;
-    }
---- request
-POST /echo
-hello world
---- response_body
-hello worlddone
-
-
-
-=== TEST 3: big client body buffered into temp files (trailing echo)
---- config
-    location /echo {
-        client_body_buffer_size 1k;
-        echo_read_request_body;
-        echo_request_body;
-        echo done;
-    }
---- request eval
-"POST /echo
-" . 'a' x 4096 . "end\n";
---- response_body eval
-'a' x 4096 . "enddone\n"
-
diff --git a/debian/modules/http-echo/t/request-info.t b/debian/modules/http-echo/t/request-info.t
deleted file mode 100644
index 8fd015e..0000000
--- a/debian/modules/http-echo/t/request-info.t
+++ /dev/null
@@ -1,841 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (3 * blocks() + 15);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: standalone directive
---- config
-    location /echo {
-        echo -n $echo_client_request_headers;
-    }
---- request
-    GET /echo
---- response_body eval
-"GET /echo HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 2: multiple instances
---- config
-    location /echo {
-        echo -n $echo_client_request_headers;
-        echo -n $echo_client_request_headers;
-    }
---- request
-    GET /echo
---- response_body eval
-"GET /echo HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-GET /echo HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 3: does not explicitly request_body
---- config
-    location /echo {
-        echo [$echo_request_body];
-    }
---- request
-POST /echo
-body here
-heh
---- response_body
-[]
---- no_error_log
-[error]
-
-
-
-=== TEST 4: let proxy read request_body
---- config
-    location /echo {
-        echo_before_body [$echo_request_body];
-        proxy_pass $scheme://127.0.0.1:$server_port/blah;
-    }
-    location /blah { echo_duplicate 0 ''; }
---- request
-POST /echo
-body here
-heh
---- response_body
-[body here
-heh]
---- no_error_log
-[error]
-
-
-
-=== TEST 5: use echo_read_request_body to read it!
---- config
-    location /echo {
-        echo_read_request_body;
-        echo [$echo_request_body];
-    }
---- request
-POST /echo
-body here
-heh
---- response_body
-[body here
-heh]
---- no_error_log
-[error]
-
-
-
-=== TEST 6: how about sleep after that?
---- config
-    location /echo {
-        echo_read_request_body;
-        echo_sleep 0.002;
-        echo [$echo_request_body];
-    }
---- request
-POST /echo
-body here
-heh
---- response_body
-[body here
-heh]
---- no_error_log
-[error]
-
-
-
-=== TEST 7: echo back the whole client request
---- config
-  # echo back the client request
-  location /echoback {
-    echo -n $echo_client_request_headers;
-    echo_read_request_body;
-    echo $echo_request_body;
-  }
---- request
-POST /echoback
-body here
-haha
---- response_body eval
-"POST /echoback HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Content-Length: 14\r
-\r
-body here
-haha
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 8: echo_request_body
---- config
-    location /body {
-      client_body_buffer_size    5;
-      echo_read_request_body;
-      echo "[$echo_request_body]";
-      echo_request_body;
-    }
---- request eval
-"POST /body
-" . ('a' x 2048) . "b"
---- response_body eval
-"[]\n" .
-('a' x 2048) . "b"
---- no_error_log
-[error]
-
-
-
-=== TEST 9: $echo_response_status in content handler
---- config
-    location /status {
-        echo "status: $echo_response_status";
-    }
---- request
-    GET /status
---- response_body
-status: 
---- no_error_log
-[error]
-
-
-
-=== TEST 10: echo_request_body (empty body)
---- config
-    location /body {
-      echo_read_request_body;
-      echo_request_body;
-    }
-    location /main {
-        proxy_pass http://127.0.0.1:$server_port/body;
-    }
---- request eval
-"POST /main"
---- response_body eval
-""
---- no_error_log
-[error]
-
-
-
-=== TEST 11: small header
---- config
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
---- request
-GET /t
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-}
---- no_error_log
-[error]
---- no_error_log
-[error]
-
-
-
-=== TEST 12: large header
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
---- request
-GET /t
---- more_headers eval
-CORE::join "\n", map { "Header$_: value-$_" } 1..512
-
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- no_error_log
-[error]
-
-
-
-=== TEST 13: small header, with leading CRLF
---- config
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
---- raw_request eval
-"\r\nGET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-"
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 14: large header, with leading CRLF
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
-
---- raw_request eval
-"\r\nGET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-".
-(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
-
---- no_error_log
-[error]
-
-
-
-=== TEST 15: small header, pipelined
---- config
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
---- pipelined_requests eval
-["GET /t", "GET /th"]
-
---- more_headers
-Foo: bar
-
---- response_body eval
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-Foo: bar\r
-\r
-}, qq{GET /th HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar\r
-\r
-}]
---- no_error_log
-[error]
-
-
-
-=== TEST 16: large header, pipelined
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
---- pipelined_requests eval
-["GET /t", "GET /t"]
-
---- more_headers eval
-CORE::join "\n", map { "Header$_: value-$_" } 1..512
-
---- response_body eval
-my $headers = (CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n";
-
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-$headers},
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-$headers}]
-
---- no_error_log
-[error]
-
-
-
-=== TEST 17: small header, multi-line header
---- config
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar baz\r
-  blah\r
-\r
-"
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar baz\r
-  blah\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 18: large header, multi-line header
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 50 567;
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
-
---- raw_request eval
-my $headers = (CORE::join "\r\n", map { "Header$_: value-$_\r\n hello $_ world blah blah" } 1..512) . "\r\n\r\n";
-
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-$headers}
-
---- response_body eval
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_\r\n hello $_ world blah blah" } 1..512) . "\r\n\r\n"
-
---- no_error_log
-[error]
-
-
-
-=== TEST 19: small header (POST body)
---- config
-    location /t {
-        echo_read_request_body;
-        echo -n $echo_client_request_headers;
-    }
---- request
-POST /t
-hello
---- response_body eval
-qq{POST /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Content-Length: 5\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 20: small header (POST body) - in subrequests (location)
---- config
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
-    location /main {
-        echo_location /t;
-    }
-
---- request
-POST /main
-hello
---- response_body eval
-qq{POST /main HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Content-Length: 5\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 21: large header (POST body)
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        echo_read_request_body;
-        echo -n $echo_client_request_headers;
-    }
---- request
-POST /t
-hello
-
---- more_headers eval
-CORE::join"\n", map { "Header$_: value-$_" } 1..512
-
---- response_body eval
-qq{POST /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\nContent-Length: 5\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 22: large header (POST body) - in subrequests
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 30 561;
-    location /t {
-        echo_read_request_body;
-        echo -n $echo_client_request_headers;
-    }
-
-    location /main {
-        echo_location /t;
-    }
---- request
-POST /main
-hello
---- more_headers eval
-CORE::join"\n", map { "Header$_: value-$_" } 1..512
-
---- response_body eval
-qq{POST /main HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\nContent-Length: 5\r\n\r\n"
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 23: raw headers - the default header buffer can hold the request line, but not the header entries
---- config
-    location /t {
-        echo_read_request_body;
-        echo -n $echo_client_request_headers;
-    }
---- request
-GET /t
---- more_headers eval
-my $s = "User-Agent: curl\nBah: bah\n";
-$s .= "Accept: */*\n";
-$s .= "Cookie: " . "C" x 1200 . "\n";
-$s
---- response_body eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-User-Agent: curl\r
-Bah: bah\r
-Accept: */*\r
-Cookie: " . ("C" x 1200) . "\r\n\r\n"
---- no_error_log
-[error]
-
-
-
-=== TEST 24: small header (POST body) - in subrequests (location_async)
---- config
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
-    location /main {
-        echo_location_async /t;
-    }
-
---- request
-POST /main
-hello
---- response_body eval
-qq{POST /main HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Content-Length: 5\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 25: small header (POST body) - in subrequests (subrequest)
---- config
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
-    location /main {
-        echo_subrequest GET /t;
-    }
-
---- request
-POST /main
-hello
---- response_body eval
-qq{POST /main HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Content-Length: 5\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 26: small header (POST body) - in subrequests (subrequest_async)
---- config
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
-    location /main {
-        echo_subrequest_async GET /t;
-    }
-
---- request
-POST /main
-hello
---- response_body eval
-qq{POST /main HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Content-Length: 5\r
-\r
-}
---- no_error_log
-[error]
-
-
-
-=== TEST 27: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers
---- config
-    location = /t {
-        proxy_buffering off;
-        proxy_pass http://127.0.0.1:$server_port/bad;
-        proxy_intercept_errors on;
-        error_page 500 = /500;
-    }
-
-    location = /bad {
-        return 500;
-    }
-
-    location = /500 {
-        echo -n $echo_client_request_headers;
-    }
---- request
-GET /t
---- response_body eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-\r
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 28: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (exclusive LF in the request data)
---- config
-    location = /t {
-        proxy_buffering off;
-        proxy_pass http://127.0.0.1:$server_port/bad;
-        proxy_intercept_errors on;
-        error_page 500 = /500;
-    }
-
-    location = /bad {
-        return 500;
-    }
-
-    location = /500 {
-        internal;
-        echo -n $echo_client_request_headers;
-    }
---- raw_request eval
-"GET /t HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 5
-
-hello"
---- response_body eval
-"GET /t HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 5
-
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 29: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (mixed LF and CRLF in the request data)
---- config
-    location = /t {
-        proxy_buffering off;
-        proxy_pass http://127.0.0.1:$server_port/bad;
-        proxy_intercept_errors on;
-        error_page 500 = /500;
-    }
-
-    location = /bad {
-        return 500;
-    }
-
-    location = /500 {
-        internal;
-        echo -n $echo_client_request_headers;
-    }
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost
-Connection: close\r
-Content-Length: 5\r
-
-hello"
---- response_body eval
-"GET /t HTTP/1.1\r
-Host: localhost
-Connection: close\r
-Content-Length: 5\r
-
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 30: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (another way of mixing LF and CRLF in the request data)
---- config
-    location = /t {
-        proxy_buffering off;
-        proxy_pass http://127.0.0.1:$server_port/bad;
-        proxy_intercept_errors on;
-        error_page 500 = /500;
-    }
-
-    location = /bad {
-        return 500;
-    }
-
-    location = /500 {
-        internal;
-        echo -n $echo_client_request_headers;
-    }
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost
-Connection: close\r
-Content-Length: 5
-\r
-hello"
---- response_body eval
-"GET /t HTTP/1.1\r
-Host: localhost
-Connection: close\r
-Content-Length: 5
-\r
-"
---- no_error_log
-[error]
-
-
-
-=== TEST 31: two pipelined requests with large headers
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 3 5610;
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
---- pipelined_requests eval
-["GET /t", "GET /t"]
---- more_headers eval
-CORE::join "\n", map { "Header$_: value-$_" } 1..585
-
---- response_body eval
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..585) . "\r\n\r\n",
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..585) . "\r\n\r\n",
-,
-]
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 32: a request with large header and a smaller pipelined request following
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 2 1921;
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
---- pipelined_requests eval
-["GET /t", "GET /t"]
---- more_headers eval
-[CORE::join("\n", map { "Header$_: value-$_" } 1..170), "Foo: bar\n"]
-
---- response_body eval
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..170) . "\r\n\r\n",
-qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar\r
-\r
-},
-]
-
---- no_error_log
-[error]
---- timeout: 5
-
-
-
-=== TEST 33: a request with large header and a smaller pipelined request following
---- config
-    client_header_buffer_size 10;
-    large_client_header_buffers 2 1921;
-    location /t {
-        echo -n $echo_client_request_headers;
-    }
---- pipelined_requests eval
-["GET /t", "GET /t" . ("a" x 512)]
---- more_headers eval
-[CORE::join("\n", map { "Header$_: value-$_" } 1..170), "Foo: bar\n"]
-
---- response_body eval
-[qq{GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: keep-alive\r
-}
-.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..170) . "\r\n\r\n",
-qq{GET /t} . ("a" x 512) . qq{ HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Foo: bar\r
-\r
-},
-]
-
---- no_error_log
-[error]
---- timeout: 5
-
diff --git a/debian/modules/http-echo/t/sleep.t b/debian/modules/http-echo/t/sleep.t
deleted file mode 100644
index f8e741e..0000000
--- a/debian/modules/http-echo/t/sleep.t
+++ /dev/null
@@ -1,200 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-plan tests => 2 * blocks();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /echo {
-        echo_sleep 1;
-    }
---- request
-    GET /echo
---- response_body
-
-
-
-=== TEST 2: fractional delay
---- config
-    location /echo {
-        echo_sleep 0.01;
-    }
---- request
-    GET /echo
---- response_body
-
-
-
-=== TEST 3: leading echo
---- config
-    location /echo {
-        echo before...;
-        echo_sleep 0.01;
-    }
---- request
-    GET /echo
---- response_body
-before...
-
-
-
-=== TEST 4: trailing echo
---- config
-    location /echo {
-        echo_sleep 0.01;
-        echo after...;
-    }
---- request
-    GET /echo
---- response_body
-after...
-
-
-
-=== TEST 5: two echos around sleep
---- config
-    location /echo {
-        echo before...;
-        echo_sleep 0.01;
-        echo after...;
-    }
---- request
-    GET /echo
---- response_body
-before...
-after...
-
-
-
-=== TEST 6: interleaving sleep and echo
---- config
-    location /echo {
-        echo 1;
-        echo_sleep 0.01;
-        echo 2;
-        echo_sleep 0.01;
-    }
---- request
-    GET /echo
---- response_body
-1
-2
-
-
-
-=== TEST 7: interleaving sleep and echo with echo at the end...
---- config
-    location /echo {
-        echo 1;
-        echo_sleep 0.01;
-        echo 2;
-        echo_sleep 0.01;
-        echo 3;
-    }
---- request
-    GET /echo
---- response_body
-1
-2
-3
-
-
-
-=== TEST 8: flush before sleep
-we didn't really test the actual effect of "echo_flush" here...
-merely checks if it croaks if appears.
---- config
-    location /flush {
-        echo hi;
-        echo_flush;
-        echo_sleep 0.01;
-        echo trees;
-    }
---- request
-    GET /flush
---- response_body
-hi
-trees
-
-
-
-=== TEST 9: flush does not increment opcode pointer itself
---- config
-    location /flush {
-        echo hi;
-        echo_flush;
-        echo trees;
-    }
---- request
-    GET /flush
---- response_body
-hi
-trees
-
-
-
-=== TEST 10: sleep through a proxy
-this reveals a bug in v0.19 and the bug is fixed in v0.20.
---- config
-    location /proxy {
-        proxy_pass $scheme://127.0.0.1:$server_port/entry';
-    }
-    location /entry {
-        echo_sleep 0.001;
-        echo done;
-    }
---- request
-    GET /proxy
---- response_body_like
-done
-
-
-
-=== TEST 11: abnormally quit
---- config
-    location /quit {
-        echo before;
-        echo_flush;
-        echo_sleep 1;
-        echo after;
-    }
---- request
-    GET /quit
---- response_body
-before
-after
-
-
-
-=== TEST 12: two echos around sleep (HEAD)
---- config
-    location /echo {
-        echo before...;
-        echo_sleep 0.01;
-        echo after...;
-    }
---- request
-    HEAD /echo
---- response_body
-
-
-
-=== TEST 13: sleep by variable
---- config
-    location ~ ^/sleep/(.+) {
-        echo before...;
-        echo_sleep $1;
-        echo after...;
-    }
---- request
-    GET /sleep/0.01
---- response_body
-before...
-after...
-
diff --git a/debian/modules/http-echo/t/status.t b/debian/modules/http-echo/t/status.t
deleted file mode 100644
index d97b084..0000000
--- a/debian/modules/http-echo/t/status.t
+++ /dev/null
@@ -1,142 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(1);
-
-plan tests => repeat_each() * (2 * blocks());
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: 200
---- config
-    location /echo {
-        echo_status 200;
-        echo hello;
-    }
---- request
-    GET /echo
---- response_body
-hello
---- error_code: 200
-
-
-
-=== TEST 2: if location (200)
---- config
-    location /echo {
-        set $true 1;
-        if ($true) {
-        }
-        echo_status 200;
-        echo hello;
-    }
---- request
-    GET /echo
---- response_body
-hello
---- error_code: 200
-
-
-
-=== TEST 3: 404
---- config
-    location /echo {
-        echo_status 404;
-        echo hello;
-    }
---- request
-    GET /echo
---- response_body
-hello
---- error_code: 404
-
-
-
-=== TEST 4: if location (404)
---- config
-    location /echo {
-        set $true 1;
-        if ($true) {
-        }
-        echo_status 404;
-        echo hello;
-    }
---- request
-    GET /echo
---- response_body
-hello
---- error_code: 404
-
-
-
-=== TEST 5: 500
---- config
-    location /echo {
-        echo_status 500;
-        echo hello;
-    }
---- request
-    GET /echo
---- response_body
-hello
---- error_code: 500
-
-
-
-=== TEST 6: if location (500)
---- config
-    location /echo {
-        set $true 1;
-        if ($true) {
-        }
-        echo_status 500;
-        echo hello;
-    }
---- request
-    GET /echo
---- response_body
-hello
---- error_code: 500
-
-
-
-=== TEST 7: if location (500) no inherit
---- config
-    location /echo {
-        set $true 1;
-        if ($true) {
-            echo_status 503;
-        }
-        echo_status 500;
-        echo hello;
-    }
---- request
-    GET /echo
---- response_body
-hello
---- error_code: 503
-
-
-
-=== TEST 8: subrequest
---- config
-    location /echo {
-        echo_location /sub;
-        echo_status 503;
-    }
-
-    location /sub {
-        echo blah blah;
-    }
---- request
-    GET /echo
---- response_body
-blah blah
---- error_code: 503
-
diff --git a/debian/modules/http-echo/t/subrequest-async.t b/debian/modules/http-echo/t/subrequest-async.t
deleted file mode 100644
index 882b368..0000000
--- a/debian/modules/http-echo/t/subrequest-async.t
+++ /dev/null
@@ -1,604 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 2 + 1);
-
-#$Test::Nginx::LWP::LogLevel = 'debug';
-
-$ENV{TEST_NGINX_HTML_DIR} = html_dir;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity - GET
---- config
-    location /main {
-        echo_subrequest_async GET /sub;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        echo "main method: $echo_client_request_method";
-    }
---- request
-    GET /main
---- response_body
-sub method: GET
-main method: GET
-
-
-
-=== TEST 2: sanity - DELETE
---- config
-    location /main {
-        echo_subrequest_async DELETE /sub;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        echo "main method: $echo_client_request_method";
-    }
---- request
-    GET /main
---- response_body
-sub method: DELETE
-main method: GET
-
-
-
-=== TEST 3: trailing echo
---- config
-    location /main {
-        echo_subrequest_async GET /sub;
-        echo after subrequest;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-hello
-after subrequest
-
-
-
-=== TEST 4: leading echo
---- config
-    location /main {
-        echo before subrequest;
-        echo_subrequest_async GET /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before subrequest
-hello
-
-
-
-=== TEST 5: leading & trailing echo
---- config
-    location /main {
-        echo before subrequest;
-        echo_subrequest_async GET /sub;
-        echo after subrequest;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before subrequest
-hello
-after subrequest
-
-
-
-=== TEST 6: multiple subrequests
---- config
-    location /main {
-        echo before sr 1;
-        echo_subrequest_async GET /sub;
-        echo after sr 1;
-        echo before sr 2;
-        echo_subrequest_async GET /sub;
-        echo after sr 2;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before sr 1
-hello
-after sr 1
-before sr 2
-hello
-after sr 2
-
-
-
-=== TEST 7: timed multiple subrequests (blocking sleep)
---- config
-    location /main {
-        echo_reset_timer;
-        echo_subrequest_async GET /sub1;
-        echo_subrequest_async GET /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_blocking_sleep 0.02;
-        echo hello;
-    }
-    location /sub2 {
-        echo_blocking_sleep 0.01;
-        echo world;
-    }
-
---- request
-    GET /main
---- response_body_like
-^hello
-world
-took 0\.00[0-5] sec for total\.$
-
-
-
-=== TEST 8: timed multiple subrequests (non-blocking sleep)
---- config
-    location /main {
-        echo_reset_timer;
-        echo_subrequest_async GET /sub1;
-        echo_subrequest_async GET /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_sleep 0.02;
-        echo hello;
-    }
-    location /sub2 {
-        echo_sleep 0.01;
-        echo world;
-    }
-
---- request
-    GET /main
---- response_body_like
-^hello
-world
-took 0\.00[0-5] sec for total\.$
-
-
-
-=== TEST 9: location with args
---- config
-    location /main {
-        echo_subrequest_async GET /sub -q 'foo=Foo&bar=Bar';
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-Foo Bar
-
-
-
-=== TEST 10: encoded chars in query strings
---- config
-    location /main {
-        echo_subrequest_async GET /sub -q 'foo=a%20b&bar=Bar';
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-a%20b Bar
-
-
-
-=== TEST 11: UTF-8 chars in query strings
---- config
-    location /main {
-        echo_subrequest_async GET /sub -q 'foo=你好';
-    }
-    location /sub {
-        echo $arg_foo;
-    }
---- request
-    GET /main
---- response_body
-你好
-
-
-
-=== TEST 12: encoded chars in location url
---- config
-    location /main {
-        echo_subrequest_async GET /sub%31 -q 'foo=Foo&bar=Bar';
-    }
-    location /sub%31 {
-        echo 'sub%31';
-    }
-    location /sub1 {
-        echo 'sub1';
-    }
---- request
-    GET /main
---- response_body
-sub1
-
-
-
-=== TEST 13: querystring in url
---- config
-    location /main {
-        echo_subrequest_async GET /sub?foo=Foo&bar=Bar;
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-Foo Bar
-
-
-
-=== TEST 14: querystring in url *AND* an explicit querystring
---- config
-    location /main {
-        echo_subrequest_async GET /sub?foo=Foo&bar=Bar -q blah=Blah;
-    }
-    location /sub {
-        echo $arg_foo $arg_bar $arg_blah;
-    }
---- request
-    GET /main
---- response_body
-  Blah
-
-
-
-=== TEST 15: explicit flush in main request
-flush won't really flush the buffer...
---- config
-    location /main_flush {
-        echo 'pre main';
-        echo_subrequest_async GET /sub;
-        echo 'post main';
-        echo_flush;
-    }
-
-    location /sub {
-        echo_sleep 0.02;
-        echo 'sub';
-    }
---- request
-    GET /main_flush
---- response_body
-pre main
-sub
-post main
-
-
-
-=== TEST 16: POST subrequest with body (with proxy in the middle) and without read body explicitly
---- config
-    location /main {
-        echo_subrequest_async POST /proxy -b 'hello, world';
-    }
-    location /proxy {
-        proxy_pass $scheme://127.0.0.1:$server_port/sub;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method.";
-        # we need to read body explicitly here...or $echo_request_body
-        #   will evaluate to empty ("")
-        echo "sub body: $echo_request_body.";
-    }
---- request
-    GET /main
---- response_body
-sub method: POST.
-sub body: .
-
-
-
-=== TEST 17: POST subrequest with body (with proxy in the middle) and read body explicitly
---- config
-    location /main {
-        echo_subrequest_async POST /proxy -b 'hello, world';
-    }
-    location /proxy {
-        proxy_pass $scheme://127.0.0.1:$server_port/sub;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method.";
-        # we need to read body explicitly here...or $echo_request_body
-        #   will evaluate to empty ("")
-        echo_read_request_body;
-        echo "sub body: $echo_request_body.";
-    }
---- request
-    GET /main
---- response_body
-sub method: POST.
-sub body: hello, world.
-
-
-
-=== TEST 18: multiple subrequests
---- config
-    location /multi {
-        echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
-        echo_subrequest_async PUT '/sub' -q 'bar=Bar' -b 'hello';
-    }
-    location /sub {
-        echo "querystring: $query_string";
-        echo "method: $echo_request_method";
-        echo "body: $echo_request_body";
-        echo "content length: $http_content_length";
-        echo '///';
-    }
---- request
-    GET /multi
---- response_body
-querystring: foo=Foo
-method: POST
-body: hi
-content length: 2
-///
-querystring: bar=Bar
-method: PUT
-body: hello
-content length: 5
-///
-
-
-
-=== TEST 19: no varaiable inheritance
---- config
-    location /main {
-        echo $echo_cacheable_request_uri;
-        echo_subrequest_async GET /sub;
-        echo_subrequest_async GET /sub2;
-    }
-    location /sub {
-        echo $echo_cacheable_request_uri;
-    }
-    location /sub2 {
-        echo $echo_cacheable_request_uri;
-    }
-
---- request
-    GET /main
---- response_body
-/main
-/sub
-/sub2
-
-
-
-=== TEST 20: unsafe uri
---- config
-    location /unsafe {
-        echo_subrequest_async GET '/../foo';
-    }
---- request
-    GET /unsafe
---- ignore_response
---- error_log
-echo_subrequest_async sees unsafe uri: "/../foo"
---- no_error_log
-[error]
-[alert]
-
-
-
-=== TEST 21: let subrequest to read the main request's request body
---- SKIP
---- config
-    location /main {
-        echo_subrequest_async POST /sub;
-    }
-    location /sub {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /main
-hello, body!
---- response_body chomp
-hello, body!
-
-
-
-=== TEST 22: POST subrequest with file body (relative paths)
---- config
-    location /main {
-        echo_subrequest_async POST /sub -f html/blah.txt;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        # we don't need to call echo_read_client_body explicitly here
-        echo_request_body;
-    }
---- user_files
->>> blah.txt
-Hello, world
---- request
-    GET /main
---- response_body
-sub method: POST
-Hello, world
-
-
-
-=== TEST 23: POST subrequest with file body (absolute paths)
---- config
-    location /main {
-        echo_subrequest_async POST /sub -f $TEST_NGINX_HTML_DIR/blah.txt;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        # we don't need to call echo_read_client_body explicitly here
-        echo_request_body;
-    }
---- user_files
->>> blah.txt
-Hello, world!
-Haha
---- request
-    GET /main
---- response_body
-sub method: POST
-Hello, world!
-Haha
-
-
-
-=== TEST 24: POST subrequest with file body (file not found)
---- config
-    location /main {
-        echo_subrequest_async POST /sub -f html/blah/blah.txt;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        # we don't need to call echo_read_client_body explicitly here
-        echo_request_body;
-    }
---- user_files
->>> blah.txt
-Hello, world
---- request
-    GET /main
---- ignore_response
---- error_log eval
-qr/open\(\) ".*?" failed/
---- no_error_log
-[alert]
-
-
-
-=== TEST 25: POST subrequest with file body (absolute paths in vars)
---- config
-    location /main {
-        set $path $TEST_NGINX_HTML_DIR/blah.txt;
-        echo_subrequest_async POST /sub -f $path;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        # we don't need to call echo_read_client_body explicitly here
-        echo_request_body;
-    }
---- user_files
->>> blah.txt
-Hello, world!
-Haha
---- request
-    GET /main
---- response_body
-sub method: POST
-Hello, world!
-Haha
-
-
-
-=== TEST 26: leading subrequest & echo_before_body
---- config
-    location /main {
-        echo_before_body hello;
-        echo_subrequest_async GET /foo;
-    }
-    location /foo {
-        echo world;
-    }
---- request
-    GET /main
---- response_body
-hello
-world
-
-
-
-=== TEST 27: leading subrequest & xss
---- config
-    location /main {
-        default_type 'application/json';
-        xss_get on;
-        xss_callback_arg c;
-        echo_subrequest_async GET /foo;
-    }
-    location /foo {
-        echo -n world;
-    }
---- request
-    GET /main?c=hi
---- response_body chop
-hi(world);
-
-
-
-=== TEST 28: multiple leading subrequest & xss
---- config
-    location /main {
-        default_type 'application/json';
-        xss_get on;
-        xss_callback_arg c;
-        echo_subrequest_async GET /foo;
-        echo_subrequest_async GET /bar;
-    }
-    location /foo {
-        echo -n world;
-    }
-    location /bar {
-        echo -n ' people';
-    }
---- request
-    GET /main?c=hi
---- response_body chop
-hi(world people);
-
-
-
-=== TEST 29: sanity (HEAD)
---- config
-    location /main {
-        echo_subrequest_async GET /sub;
-        echo_subrequest_async GET /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    HEAD /main
---- response_body
-
-
-
-=== TEST 30: HEAD subrequest
---- config
-    location /main {
-        echo_subrequest_async HEAD /sub;
-        echo_subrequest_async HEAD /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-
diff --git a/debian/modules/http-echo/t/subrequest.t b/debian/modules/http-echo/t/subrequest.t
deleted file mode 100644
index 6d965d0..0000000
--- a/debian/modules/http-echo/t/subrequest.t
+++ /dev/null
@@ -1,725 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (2 * blocks() + 1);
-
-$ENV{TEST_NGINX_HTML_DIR} = html_dir;
-$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: sanity
---- config
-    location /main {
-        echo_subrequest GET /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-hello
-
-
-
-=== TEST 2: trailing echo
---- config
-    location /main {
-        echo_subrequest GET /sub;
-        echo after subrequest;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-hello
-after subrequest
-
-
-
-=== TEST 3: leading echo
---- config
-    location /main {
-        echo before subrequest;
-        echo_subrequest GET /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before subrequest
-hello
-
-
-
-=== TEST 4: leading & trailing echo
---- config
-    location /main {
-        echo before subrequest;
-        echo_subrequest GET /sub;
-        echo after subrequest;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before subrequest
-hello
-after subrequest
-
-
-
-=== TEST 5: multiple subrequests
---- config
-    location /main {
-        echo before sr 1;
-        echo_subrequest GET /sub;
-        echo after sr 1;
-        echo before sr 2;
-        echo_subrequest GET /sub;
-        echo after sr 2;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-before sr 1
-hello
-after sr 1
-before sr 2
-hello
-after sr 2
-
-
-
-=== TEST 6: timed multiple subrequests (blocking sleep)
---- config
-    location /main {
-        echo_reset_timer;
-        echo_subrequest GET /sub1;
-        echo_subrequest GET /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_blocking_sleep 0.02;
-        echo hello;
-    }
-    location /sub2 {
-        echo_blocking_sleep 0.01;
-        echo world;
-    }
-
---- request
-    GET /main
---- response_body_like
-^hello
-world
-took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
-
-
-
-=== TEST 7: timed multiple subrequests (non-blocking sleep)
---- config
-    location /main {
-        echo_reset_timer;
-        echo_subrequest GET /sub1;
-        echo_subrequest GET /sub2;
-        echo "took $echo_timer_elapsed sec for total.";
-    }
-    location /sub1 {
-        echo_sleep 0.02;
-        echo hello;
-    }
-    location /sub2 {
-        echo_sleep 0.01;
-        echo world;
-    }
-
---- request
-    GET /main
---- response_body_like
-^hello
-world
-took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
-
-
-
-=== TEST 8: location with args
---- config
-    location /main {
-        echo_subrequest GET /sub -q 'foo=Foo&bar=Bar';
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-Foo Bar
-
-
-
-=== TEST 9: chained subrequests
---- config
-    location /main {
-        echo 'pre main';
-        echo_subrequest GET /sub;
-        echo 'post main';
-    }
-
-    location /sub {
-        echo 'pre sub';
-        echo_subrequest GET /subsub;
-        echo 'post sub';
-    }
-
-    location /subsub {
-        echo 'subsub';
-    }
---- request
-    GET /main
---- response_body
-pre main
-pre sub
-subsub
-post sub
-post main
-
-
-
-=== TEST 10: chained subrequests using named locations
-as of 0.8.20, ngx_http_subrequest still does not support
-named location. sigh. this case is a TODO.
---- config
-    location /main {
-        echo 'pre main';
-        echo_subrequest GET @sub;
-        echo 'post main';
-    }
-
-    location @sub {
-        echo 'pre sub';
-        echo_subrequest GET @subsub;
-        echo 'post sub';
-    }
-
-    location @subsub {
-        echo 'subsub';
-    }
---- request
-    GET /main
---- response_body
-pre main
-pre sub
-subsub
-post sub
-post main
---- SKIP
-
-
-
-=== TEST 11: explicit flush in main request
---- config
-    location /main {
-        echo 'pre main';
-        echo_subrequest GET /sub;
-        echo 'post main';
-        echo_flush;
-    }
-
-    location /sub {
-        echo_sleep 0.02;
-        echo 'sub';
-    }
---- request
-    GET /main
---- response_body
-pre main
-sub
-post main
-
-
-
-=== TEST 12: DELETE subrequest
---- config
-    location /main {
-        echo_subrequest DELETE /sub;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        echo "main method: $echo_client_request_method";
-    }
---- request
-    GET /main
---- response_body
-sub method: DELETE
-main method: GET
-
-
-
-=== TEST 13: DELETE subrequest
---- config
-    location /main {
-        echo "main method: $echo_client_request_method";
-        echo_subrequest GET /proxy;
-        echo_subrequest DELETE /proxy;
-    }
-    location /proxy {
-        proxy_pass $scheme://127.0.0.1:$server_port/sub;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-    }
---- request
-    GET /main
---- response_body
-main method: GET
-sub method: GET
-sub method: DELETE
-
-
-
-=== TEST 14: POST subrequest with body
---- config
-    location /main {
-        echo_subrequest POST /sub -b 'hello, world';
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        # we don't need to call echo_read_client_body explicitly here
-        echo "sub body: $echo_request_body";
-    }
---- request
-    GET /main
---- response_body
-sub method: POST
-sub body: hello, world
-
-
-
-=== TEST 15: POST subrequest with body (explicitly read the body)
---- config
-    location /main {
-        echo_subrequest POST /sub -b 'hello, world';
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        # we call echo_read_client_body explicitly here even
-        #   though it's not necessary.
-        echo_read_request_body;
-        echo "sub body: $echo_request_body";
-    }
---- request
-    GET /main
---- response_body
-sub method: POST
-sub body: hello, world
-
-
-
-=== TEST 16: POST subrequest with body (with proxy in the middle) and without read body explicitly
---- config
-    location /main {
-        echo_subrequest POST /proxy -b 'hello, world';
-    }
-    location /proxy {
-        proxy_pass $scheme://127.0.0.1:$server_port/sub;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method.";
-        # we need to read body explicitly here...or $echo_request_body
-        #   will evaluate to empty ("")
-        echo "sub body: $echo_request_body.";
-    }
---- request
-    GET /main
---- response_body
-sub method: POST.
-sub body: .
-
-
-
-=== TEST 17: POST subrequest with body (with proxy in the middle) and read body explicitly
---- config
-    location /main {
-        echo_subrequest POST /proxy -b 'hello, world';
-    }
-    location /proxy {
-        proxy_pass $scheme://127.0.0.1:$server_port/sub;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method.";
-        # we need to read body explicitly here...or $echo_request_body
-        #   will evaluate to empty ("")
-        echo_read_request_body;
-        echo "sub body: $echo_request_body.";
-    }
---- request
-    GET /main
---- response_body
-sub method: POST.
-sub body: hello, world.
-
-
-
-=== TEST 18: multiple subrequests
---- config
-    location /multi {
-        echo_subrequest POST '/sub' -q 'foo=Foo' -b 'hi';
-        echo_subrequest PUT '/sub' -q 'bar=Bar' -b 'hello';
-    }
-    location /sub {
-        echo "querystring: $query_string";
-        echo "method: $echo_request_method";
-        echo "body: $echo_request_body";
-        echo "content length: $http_content_length";
-        echo '///';
-    }
---- request
-    GET /multi
---- response_body
-querystring: foo=Foo
-method: POST
-body: hi
-content length: 2
-///
-querystring: bar=Bar
-method: PUT
-body: hello
-content length: 5
-///
-
-
-
-=== TEST 19: unsafe uri
---- config
-    location /unsafe {
-        echo_subrequest GET '/../foo';
-    }
---- request
-    GET /unsafe
---- ignore_response
---- error_log
-echo_subrequest sees unsafe uri: "/../foo"
---- no_error_log
-[error]
-
-
-
-=== TEST 20: querystring in url
---- config
-    location /main {
-        echo_subrequest GET /sub?foo=Foo&bar=Bar;
-    }
-    location /sub {
-        echo $arg_foo $arg_bar;
-    }
---- request
-    GET /main
---- response_body
-Foo Bar
-
-
-
-=== TEST 21: querystring in url *AND* an explicit querystring
---- config
-    location /main {
-        echo_subrequest GET /sub?foo=Foo&bar=Bar -q blah=Blah;
-    }
-    location /sub {
-        echo $arg_foo $arg_bar $arg_blah;
-    }
---- request
-    GET /main
---- response_body
-  Blah
-
-
-
-=== TEST 22: let subrequest to read the main request's request body
---- SKIP
---- config
-    location /main {
-        echo_subrequest POST /sub;
-    }
-    location /sub {
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request
-POST /main
-hello, body!
---- response_body chomp
-hello, body!
-
-
-
-=== TEST 23: deep nested echo_subrequest/echo_subrequest_async
---- config
-    location /main {
-        echo_subrequest GET /bar;
-        echo_subrequest_async GET /bar;
-        echo_subrequest_async GET /bar;
-        echo_subrequest GET /group;
-        echo_subrequest_async GET /group;
-    }
-
-    location /group {
-        echo_subrequest GET /bar;
-        echo_subrequest_async GET /bar;
-    }
-
-    location /bar {
-        echo $echo_incr;
-    }
---- request
-GET /main
---- response_body
-1
-2
-3
-4
-5
-6
-7
-
-
-
-=== TEST 24: deep nested echo_subrequest/echo_subrequest_async
---- config
-    location /main {
-        echo_subrequest GET /bar?a;
-        echo_subrequest_async GET /bar?b;
-        echo_subrequest_async GET /bar?c;
-        echo_subrequest GET /group?a=d&b=e;
-        echo_subrequest_async GET /group?a=f&b=g;
-    }
-
-    location /group {
-        echo_subrequest GET /bar?$arg_a;
-        echo_subrequest_async GET /bar?$arg_b;
-    }
-
-    location /bar {
-        echo -n $query_string;
-    }
---- request
-GET /main
---- response_body: abcdefg
---- timeout: 2
-
-
-
-=== TEST 25: POST subrequest with file body (relative paths)
---- config
-    location /main {
-        echo_subrequest POST /sub -f html/blah.txt;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        # we don't need to call echo_read_client_body explicitly here
-        echo_request_body;
-    }
---- user_files
->>> blah.txt
-Hello, world
---- request
-    GET /main
---- response_body
-sub method: POST
-Hello, world
-
-
-
-=== TEST 26: POST subrequest with file body (absolute paths)
---- config
-    location /main {
-        echo_subrequest POST /sub -f $TEST_NGINX_HTML_DIR/blah.txt;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        # we don't need to call echo_read_client_body explicitly here
-        echo_request_body;
-    }
---- user_files
->>> blah.txt
-Hello, world!
-Haha
---- request
-    GET /main
---- response_body
-sub method: POST
-Hello, world!
-Haha
-
-
-
-=== TEST 27: POST subrequest with file body (file not found)
---- config
-    location /main {
-        echo_subrequest POST /sub -f html/blah/blah.txt;
-    }
-    location /sub {
-        echo "sub method: $echo_request_method";
-        # we don't need to call echo_read_client_body explicitly here
-        echo_request_body;
-    }
---- user_files
->>> blah.txt
-Hello, world
---- request
-    GET /main
---- ignore_response
---- error_log eval
-qr/open\(\) ".*?" failed/
---- no_error_log
-[alert]
-
-
-
-=== TEST 28: leading subrequest & echo_before_body
---- config
-    location /main {
-        echo_before_body hello;
-        echo_subrequest GET /foo;
-    }
-    location /foo {
-        echo world;
-    }
---- request
-    GET /main
---- response_body
-hello
-world
-
-
-
-=== TEST 29: leading subrequest & xss
---- config
-    location /main {
-        default_type 'application/json';
-        xss_get on;
-        xss_callback_arg c;
-        echo_subrequest GET /foo;
-    }
-    location /foo {
-        echo -n world;
-    }
---- request
-    GET /main?c=hi
---- response_body chop
-hi(world);
-
-
-
-=== TEST 30: multiple leading subrequest & xss
---- config
-    location /main {
-        default_type 'application/json';
-        xss_get on;
-        xss_callback_arg c;
-        echo_subrequest GET /foo;
-        echo_subrequest GET /bar;
-    }
-    location /foo {
-        echo -n world;
-    }
-    location /bar {
-        echo -n ' people';
-    }
---- request
-    GET /main?c=hi
---- response_body chop
-hi(world people);
-
-
-
-=== TEST 31: sanity (HEAD)
---- config
-    location /main {
-        echo_subrequest GET /sub;
-        echo_subrequest GET /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    HEAD /main
---- response_body
-
-
-
-=== TEST 32: POST subrequest to ngx_proxy
---- config
-    location /hello {
-       default_type text/plain;
-       echo_subrequest POST '/proxy' -q 'foo=Foo&bar=baz' -b 'request_body=test&test=3';
-    }
-
-    location /proxy {
-        proxy_pass http://127.0.0.1:$TEST_NGINX_CLIENT_PORT/sub;
-        #proxy_pass http://127.0.0.1:1113/sub;
-    }
-
-    location /sub {
-        echo_read_request_body;
-        echo "sub method: $echo_request_method";
-        # we don't need to call echo_read_client_body explicitly here
-        echo "sub body: $echo_request_body";
-    }
---- request
-    GET /hello
---- response_body
-sub method: POST
-sub body: request_body=test&test=3
-
-
-
-=== TEST 33: HEAD subrequest
---- config
-    location /main {
-        echo_subrequest HEAD /sub;
-        echo_subrequest HEAD /sub;
-    }
-    location /sub {
-        echo hello;
-    }
---- request
-    GET /main
---- response_body
-
-
-
-=== TEST 34: method name as an nginx variable (github issue #34)
---- config
-  location ~ ^/delay/(?<delay>[0-9.]+)/(?<originalURL>.*)$ {
-      # echo_blocking_sleep $delay;
-      echo_subrequest '$echo_request_method' '/$originalURL' -q '$args';
-  }
-
-  location /api {
-      echo "args: $args";
-  }
---- request
-    GET /delay/0.343/api/?a=b
---- response_body
-args: a=b
---- no_error_log
-[error]
-
diff --git a/debian/modules/http-echo/t/unused.t b/debian/modules/http-echo/t/unused.t
deleted file mode 100644
index f3c6e9e..0000000
--- a/debian/modules/http-echo/t/unused.t
+++ /dev/null
@@ -1,119 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (5 * blocks());
-
-no_long_string();
-log_level('warn');
-
-#master_on();
-#workers(1);
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: filters used
---- http_config
-    postpone_output 1;
---- config
-    location /echo {
-        echo world;
-        echo_after_body hello;
-    }
---- request
-    GET /echo?blah
---- response_body
-world
-hello
---- error_log
-echo header filter, uri "/echo?blah"
-echo body filter, uri "/echo?blah"
---- no_error_log
-[error]
---- log_level: debug
-
-
-
-=== TEST 2: filters not used
---- http_config
-    postpone_output 1;
---- config
-    location /echo {
-        echo world;
-        #echo_after_body hello;
-    }
---- request
-    GET /echo?blah
---- response_body
-world
---- no_error_log
-echo header filter, uri "/echo?blah"
-echo body filter, uri "/echo?blah"
-[error]
---- log_level: debug
-
-
-
-=== TEST 3: (after) filters used (multiple http {} blocks)
-This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
-have been prohibited since then.
---- SKIP
---- http_config
-    postpone_output 1;
---- config
-    location /echo {
-        echo world;
-        echo_after_body hello;
-    }
-
---- post_main_config
-    http {
-    }
-
---- request
-    GET /echo?blah
---- response_body
-world
-hello
---- error_log
-echo header filter, uri "/echo?blah"
-echo body filter, uri "/echo?blah"
---- no_error_log
-[error]
---- log_level: debug
-
-
-
-=== TEST 4: (before) filters used (multiple http {} blocks)
-This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
-have been prohibited since then.
---- SKIP
---- http_config
-    postpone_output 1;
---- config
-    location /echo {
-        echo world;
-        echo_before_body hello;
-    }
-
---- post_main_config
-    http {
-    }
-
---- request
-    GET /echo?blah
---- response_body
-hello
-world
---- error_log
-echo header filter, uri "/echo?blah"
-echo body filter, uri "/echo?blah"
---- no_error_log
-[error]
---- log_level: debug
-
diff --git a/debian/modules/http-echo/util/build.sh b/debian/modules/http-echo/util/build.sh
deleted file mode 100755
index 45949bb..0000000
--- a/debian/modules/http-echo/util/build.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-# this file is mostly meant to be used by the author himself.
-
-root=`pwd`
-version=$1
-force=$2
-home=~
-
-            #--with-cc=gcc46 \
-
-ngx-build $force $version \
-            --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:/usr/local/lib" \
-            --with-cc-opt="-DDEBUG_MALLOC" \
-            --with-http_stub_status_module \
-            --with-http_image_filter_module \
-            --without-mail_pop3_module \
-            --without-mail_imap_module \
-            --without-mail_smtp_module \
-            --without-http_upstream_ip_hash_module \
-            --without-http_memcached_module \
-            --without-http_referer_module \
-            --without-http_autoindex_module \
-            --without-http_auth_basic_module \
-            --without-http_userid_module \
-          --add-module=$root/../ndk-nginx-module \
-          --add-module=$root/../set-misc-nginx-module \
-          --add-module=$root/../eval-nginx-module \
-          --add-module=$root/../xss-nginx-module \
-          --add-module=$root/../rds-json-nginx-module \
-          --add-module=$root/../headers-more-nginx-module \
-          --add-module=$root/../lua-nginx-module \
-          --add-module=$root $opts \
-          --with-http_v2_module \
-          --with-select_module \
-          --with-poll_module \
-          --without-http_ssi_module \
-          --with-debug || exit 1
-          #--add-module=$root/../lz-session-nginx-module \
-          #--add-module=$home/work/ndk \
-          #--add-module=$home/work/ndk/examples/http/set_var \
-          #--add-module=$root/../eval-nginx-module \
-          #--add-module=/home/agentz/work/nginx_eval_module-1.0.1 \
-
diff --git a/debian/modules/http-echo/util/releng b/debian/modules/http-echo/util/releng
deleted file mode 100755
index b3ad9f2..0000000
--- a/debian/modules/http-echo/util/releng
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-./update-readme
-ack '.{81}' src/ngx_http_*.[ch]
-ack '(?<=\#define)\s*DDEBUG\s*[12]' src
-echo =======================================
-ack '(?<=This document describes echo-nginx-module v)\d+\.\d+' README
-
diff --git a/debian/modules/http-echo/util/wiki2pod.pl b/debian/modules/http-echo/util/wiki2pod.pl
deleted file mode 100644
index cdd33a2..0000000
--- a/debian/modules/http-echo/util/wiki2pod.pl
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-use bytes;
-
-my @nl_counts;
-my $last_nl_count_level;
-
-my @bl_counts;
-my $last_bl_count_level;
-
-sub fmt_pos ($) {
-    (my $s = $_[0]) =~ s{\#(.*)}{/"$1"};
-    $s;
-}
-
-sub fmt_mark ($$) {
-    my ($tag, $s) = @_;
-    my $max_level = 0;
-    while ($s =~ /([<>])\1*/g) {
-        my $level = length $&;
-        if ($level > $max_level) {
-            $max_level = $level;
-        }
-    }
-
-    my $times = $max_level + 1;
-    if ($times > 1) {
-        $s = " $s ";
-    }
-    return $tag . ('<' x $times) . $s . ('>' x $times);
-}
-
-print "=encoding utf-8\n\n";
-
-while (<>) {
-    if ($. == 1) {
-        # strip the leading U+FEFF byte in MS-DOS text files
-        my $first = ord(substr($_, 0, 1));
-        #printf STDERR "0x%x", $first;
-        #my $second = ord(substr($_, 2, 1));
-        #printf STDERR "0x%x", $second;
-        if ($first == 0xEF) {
-            substr($_, 0, 1, '');
-            #warn "Hit!";
-        }
-    }
-    s{\[(http[^ \]]+) ([^\]]*)\]}{$2 (L<$1>)}gi;
-    s{ \[\[ ( [^\]\|]+ ) \| ([^\]]*) \]\] }{"L<$2|" . fmt_pos($1) . ">"}gixe;
-    s{<code>(.*?)</code>}{fmt_mark('C', $1)}gie;
-    s{'''(.*?)'''}{fmt_mark('B', $1)}ge;
-    s{''(.*?)''}{fmt_mark('I', $1)}ge;
-    if (s{^\s*<[^>]+>\s*$}{}) {
-        next;
-    }
-
-    if (/^\s*$/) {
-        print "\n";
-        next;
-    }
-
-=begin cmt
-
-    if ($. == 1) {
-        warn $_;
-        for my $i (0..length($_) - 1) {
-            my $chr = substr($_, $i, 1);
-            warn "chr ord($i): ".ord($chr)." \"$chr\"\n";
-        }
-    }
-
-=end cmt
-=cut
-
-    if (/(=+) (.*) \1$/) {
-        #warn "HERE! $_" if $. == 1;
-        my ($level, $title) = (length $1, $2);
-        collapse_lists();
-
-        print "\n=head$level $title\n\n";
-    } elsif (/^(\#+) (.*)/) {
-        my ($level, $txt) = (length($1) - 1, $2);
-        if (defined $last_nl_count_level && $level != $last_nl_count_level) {
-            print "\n=back\n\n";
-        }
-        $last_nl_count_level = $level;
-        $nl_counts[$level] ||= 0;
-        if ($nl_counts[$level] == 0) {
-            print "\n=over\n\n";
-        }
-        $nl_counts[$level]++;
-        print "\n=item $nl_counts[$level].\n\n";
-        print "$txt\n";
-    } elsif (/^(\*+) (.*)/) {
-        my ($level, $txt) = (length($1) - 1, $2);
-        if (defined $last_bl_count_level && $level != $last_bl_count_level) {
-            print "\n=back\n\n";
-        }
-        $last_bl_count_level = $level;
-        $bl_counts[$level] ||= 0;
-        if ($bl_counts[$level] == 0) {
-            print "\n=over\n\n";
-        }
-        $bl_counts[$level]++;
-        print "\n=item *\n\n";
-        print "$txt\n";
-    } else {
-        collapse_lists();
-        print;
-    }
-}
-
-collapse_lists();
-
-sub collapse_lists {
-    while (defined $last_nl_count_level && $last_nl_count_level >= 0) {
-        print "\n=back\n\n";
-        $last_nl_count_level--;
-    }
-    undef $last_nl_count_level;
-    undef @nl_counts;
-
-    while (defined $last_bl_count_level && $last_bl_count_level >= 0) {
-        print "\n=back\n\n";
-        $last_bl_count_level--;
-    }
-    undef $last_bl_count_level;
-    undef @bl_counts;
-}
-
diff --git a/debian/modules/http-echo/valgrind.suppress b/debian/modules/http-echo/valgrind.suppress
deleted file mode 100644
index 975415e..0000000
--- a/debian/modules/http-echo/valgrind.suppress
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_ctl(event)
-   fun:epoll_ctl
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_event_process_init
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:index
-   fun:expand_dynamic_string_token
-   fun:_dl_map_object
-   fun:map_doit
-   fun:_dl_catch_error
-   fun:do_preload
-   fun:dl_main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_set_environment
-   fun:ngx_single_process_cycle
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_set_environment
-   fun:ngx_single_process_cycle
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_set_environment
-   fun:ngx_worker_process_init
-   fun:ngx_worker_process_cycle
-}
diff --git a/debian/modules/http-fancyindex/.github/workflows/ci.yml b/debian/modules/http-fancyindex/.github/workflows/ci.yml
deleted file mode 100644
index a7bb1f8..0000000
--- a/debian/modules/http-fancyindex/.github/workflows/ci.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: Build
-on: [pull_request]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler: [gcc, clang]
-        dynamic: [0, 1]
-        nginx:
-          # Mainline
-          - 1.21.3
-          # Stable.
-          - 1.20.1
-          # First version with loadable module support.
-          - 1.9.15
-          # Oldest supported version.
-          - 0.8.55
-        exclude:
-          - nginx: 0.8.55
-            dynamic: 1
-    runs-on: ubuntu-18.04
-    env:
-      CFLAGS: "-Wno-error"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Packages
-        run: |
-          sudo apt update
-          sudo apt install -y libpcre3-dev libssl-dev
-          t/get-pup || echo 'Tests needing pup will be skipped'
-      - name: Test
-        env:
-          CC: ${{ matrix.compiler }}
-        run: |
-          CC=${{ matrix.compiler }}
-          t/build-and-run ${{ matrix.nginx }} ${{ matrix.dynamic }}
diff --git a/debian/modules/http-fancyindex/CHANGELOG.md b/debian/modules/http-fancyindex/CHANGELOG.md
deleted file mode 100644
index ebeb379..0000000
--- a/debian/modules/http-fancyindex/CHANGELOG.md
+++ /dev/null
@@ -1,199 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-
-## [Unreleased]
-
-## [0.5.2] - 2021-10-28
-### Fixed
-- Properly escape file names to ensure that file names are never renreded
-  as HTML. (Patch by Anthony Ryan <<anthonyryan1@gmail.com>>,
-  [#128](https://github.com/aperezdc/ngx-fancyindex/pull/128).)
-
-## [0.5.1] - 2020-10-26
-### Fixed
-- Properly handle optional second argument to `fancyindex_header` and
-  `fancyindex_footer`
-  ([#117](https://github.com/aperezdc/ngx-fancyindex/issues/117)).
-
-## [0.5.0] - 2020-10-24
-### Added
-- New option `fancyindex_show_dotfiles`. (Path by Joshua Shaffer
-  <<joshua.shaffer@icmrl.net>>.)
-- The `fancyindex_header` and `fancyindex_footer` options now support local
-  files properly, by means of a `local` flag. (Patches by JoungKyun Kim
-  <<joungkyun@gmail.com>> and Adrián Pérez <<aperez@igalia.com>>.)
-
-### Changed
-- Improved performance of directory entry sorting, which should be quite
-  noticeable for directories with thousands of files. (Patch by
-  [Yuxiang Zhang](https://github.com/z4yx).)
-- The minimum Nginx version supported by the module is now 0.8.x.
-
-### Fixed
-- Properly escape square brackets in directory entry names when the module
-  is built with older versions of Nginx. (Patch by Adrián Pérez
-  <<aperez@igalia.com>>.)
-- Fix directory entry listing not being shown when using the
-  [nginx-auth-ldap](https://github.com/kvspb/nginx-auth-ldap) module. (Patch
-  by JoungKyun Kim <<joungkyun@gmail.com>>.)
-
-## [0.4.4] - 2020-02-19
-### Added
-- New option `fancyindex_hide_parent_dir`, which disables generating
-  links to parent directories in listings. (Patch by Kawai Ryota
-  <<admin@mail.kr-kp.com>>.)
-
-### Changed
-- Each table row is now separated by a new line (as a matter of fact,
-  a `CRLF` sequence), which makes it easier to parse output using simple
-  text tools. (Patch by Anders Trier <<anders.trier.olesen@gmail.com>>.)
-- Some corrections and additions to the README file. (Patches by Nicolas
-  Carpi <<nicolas.carpi@curie.fr>> and David Beitey <<david@davidjb.com>>.)
-
-### Fixed
-- Use correct character references for `&` characters in table sorter URLs
-  within the template (Patch by David Beitey <<david@davidjb.com>>.)
-- Properly encode filenames when used as URI components.
-
-## [0.4.3] - 2018-07-03
-### Added
-- Table cells now have class names, which allows for better CSS styling.
-  (Patch by qjqqyy <<gyula@nyirfalvi.hu>>.)
-- The test suite now can parse and check elements from the HTML returned
-  by the module, thanks to the [pup](https://github.com/EricChiang/pup)
-  tool.
-
-### Fixed
-- Sorting by file size now works correctly.
-  (Patch by qjqqyy <<gyula@nyirfalvi.hu>>.)
-
-## [0.4.2] - 2017-08-19
-### Changed
-- Generated HTML from the default template is now proper HTML5, and it should
-  pass validation (#52).
-- File sizes now have decimal positions when using `fancyindex_exact_size off`.
-  (Patch by Anders Trier <<anders.trier.olesen@gmail.com>>.)
-- Multiple updates to `README.rst` (Patches by Danila Vershinin
-  <<ciapnz@gmail.com>>, Iulian Onofrei, Lilian Besson, and Nick Geoghegan
-  <<nick@nickgeoghegan.net>>.)
-
-### Fixed
-- Sorting by file size now also works correctly for directories which contain
-  files of sizes bigger than `INT_MAX`. (#74, fix suggestion by Chris Young.)
-- Custom headers which fail to declare an UTF-8 encoding no longer cause table
-  header arrows to be rendered incorrectly by browsers (#50).
-- Fix segmentation fault when opening directories with empty files (#61, patch
-  by Catgirl <<cat@wolfgirl.org>>.)
-
-## [0.4.1] - 2016-08-18
-### Added
-- New `fancyindex_directories_first` configuration directive (enabled by
-  default), which allows setting whether directories are sorted before other
-  files. (Patch by Luke Zapart <<luke@zapart.org>>.)
-
-### Fixed
-- Fix index files not working when the fancyindex module is in use (#46).
-
-
-## [0.4.0] - 2016-06-08
-### Added
-- The module can now be built as a [dynamic
-  module](https://www.nginx.com/resources/wiki/extending/converting/).
-  (Patch by Róbert Nagy <<vrnagy@gmail.com>>.)
-- New configuration directive `fancyindex_show_path`, which allows hiding the
-  `<h1>` header which contains the current path.
-  (Patch by Thomas P.  <<tpxp@live.fr>>.)
-
-### Changed
-- Directory and file links in listings now have a title="..." attribute.
-  (Patch by `@janglapuk` <<trusdi.agus@gmail.com>>.)
-
-### Fixed
-- Fix for hung requests when the module is used along with `ngx_pagespeed`.
-  (Patch by Otto van der Schaaf <<oschaaf@we-amp.com>>.)
-
-
-## [0.3.6] - 2016-01-26
-### Added
-- New feature: Allow filtering out symbolic links using the
-  `fancyindex_hide_symlinks` configuration directive. (Idea and prototype
-  patch by Thomas Wemm.)
-- New feature: Allow specifying the format of timestamps using the
-  `fancyindex_time_format` configuration directive. (Idea suggested by Xiao
-  Meng <<novoreorx@gmail.com>>).
-
-### Changed
-- Listings in top-level directories will not generate a "Parent Directory"
-  link as first element of the listing. (Patch by Thomas P.)
-
-### Fixed
-- Fix propagation and overriding of the `fancyindex_css_href` setting inside
-  nested locations.
-- Minor changes in the code to allow building cleanly under Windows with
-  Visual Studio 2013. (Patch by Y. Yuan <<yzwduck@gmail.com>>).
-
-
-## [0.3.5] - 2015-02-19
-### Added
-- New feature: Allow setting the default sort criterion using the
-  `fancyindex_default_sort` configuration directive. (Patch by
-  Алексей Урбанский).
-- New feature: Allow changing the maximum length of file names, using
-  the `fancyindex_name_length` configuration directive. (Patch by
-  Martin Herkt).
-
-### Changed
-- Renames `NEWS.rst` to `CHANGELOG.md`, which follows the recommendations
-	from [Keep a Change Log](http://keepachangelog.com/).
-- Configuring Nginx without the `http_addition_module` will generate a
-  warning during configuration, as it is needed for the `fancyindex_footer`
-  and `fancyindex_header` directives.
-
-
-## [0.3.4] - 2014-09-03
-
-### Added
-- Viewport is now defined in the generated HTML, which works better
-  for mobile devices.
-
-### Changed
-- Even-odd row styling moved to the CSS using :nth-child(). This
-  makes the HTML served to clients smaller.
-
-
-## [0.3.3] - 2013-10-25
-
-### Added
-- New feature: table headers in the default template are now clickable
-  to set the sorting criteria and direction of the index entries.
-  (https://github.com/aperezdc/ngx-fancyindex/issues/7)
-
-
-## [0.3.2] - 2013-06-05
-
-### Fixed
-- Solved a bug that would leave certain clients stalled forever.
-- Improved handling of subrequests for non-builtin headers/footers.
-
-
-## [0.3.1] - 2011-04-04
-
-### Added
-- `NEWS.rst` file, to act as change log.
-
-
-[Unreleased]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.5.2...HEAD
-[0.5.2]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.5.1...v0.5.2
-[0.5.1]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.5.0...v0.5.1
-[0.5.0]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.4...v0.5.0
-[0.4.4]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.3...v0.4.4
-[0.4.3]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.2...v0.4.3
-[0.4.2]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.1...v0.4.2
-[0.4.1]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.4.0...v0.4.1
-[0.4.0]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.6...v0.4.0
-[0.3.6]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.5...v0.3.6
-[0.3.5]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.4...v0.3.5
-[0.3.4]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.3...v0.3.4
-[0.3.3]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.2...v0.3.3
-[0.3.2]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3.1...v0.3.2
-[0.3.1]: https://github.com/aperezdc/ngx-fancyindex/compare/v0.3...v0.3.1
diff --git a/debian/modules/http-fancyindex/HACKING.md b/debian/modules/http-fancyindex/HACKING.md
deleted file mode 100644
index 4c8608a..0000000
--- a/debian/modules/http-fancyindex/HACKING.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Fancy Index module Hacking HOW-TO
-
-## How to modify the template
-
-The template is in the `template.html` file. Note that comment markers are
-used to control how the `template.awk` Awk script generates the C header
-which gets ultimately included in the compiled object code. Comment markers
-have the `<!-- var identifier -->` format. Here `identifier` must be
-a valid C identifier. All the text following the marker until the next
-marker will be flattened into a C string.
-
-If the identifier is `NONE` (capitalized) the text from that marker up to
-the next marker will be discarded.
-
-
-## Regenerating the C header
-
-You will need Awk. I hope any decent implementation will do, but the GNU one
-is known to work flawlessly. Just do:
-
-    $ awk -f template.awk template.html > template.h
-
-If your copy of `awk` is not the GNU implementation, you will need to
-install it and use `gawk` instead in the command line above. 
-
-This includes macOS where the current built-in `awk` (currently version
-20070501 at time of testing on 10.13.6) doesn't apply correctly and causes
-characters to be omitted from the output. `gawk` can be installed with a 
-package manager such as [Homebrew](https://brew.sh).
diff --git a/debian/modules/http-fancyindex/LICENSE b/debian/modules/http-fancyindex/LICENSE
deleted file mode 100644
index 9fd66ee..0000000
--- a/debian/modules/http-fancyindex/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/debian/modules/http-fancyindex/README.rst b/debian/modules/http-fancyindex/README.rst
deleted file mode 100644
index c61a6a4..0000000
--- a/debian/modules/http-fancyindex/README.rst
+++ /dev/null
@@ -1,319 +0,0 @@
-========================
-Nginx Fancy Index module
-========================
-
-.. image:: https://travis-ci.com/aperezdc/ngx-fancyindex.svg?branch=master
-   :target: https://travis-ci.com/aperezdc/ngx-fancyindex
-   :alt: Build Status
-
-.. contents::
-
-The Fancy Index module makes possible the generation of file listings, like
-the built-in `autoindex <http://wiki.nginx.org/NginxHttpAutoindexModule>`__
-module does, but adding a touch of style. This is possible because the module
-allows a certain degree of customization of the generated content:
-
-* Custom headers. Either local or stored remotely.
-* Custom footers. Either local or stored remotely.
-* Add you own CSS style rules.
-* Allow choosing to sort elements by name (default), modification time, or
-  size; both ascending (default), or descending.
-
-This module is designed to work with Nginx_, a high performance open source web
-server written by `Igor Sysoev <http://sysoev.ru>`__.
-
-
-Requirements
-============
-
-CentOS 7
-~~~~~~~~
-
-For users of the  `official stable <https://www.nginx.com/resources/wiki/start/topics/tutorials/install/>`__  Nginx repository, `extra packages repository with dynamic modules <https://www.getpagespeed.com/redhat>`__ is available and fancyindex is included.
-
-Install directly:: 
-
-    yum install https://extras.getpagespeed.com/redhat/7/x86_64/RPMS/nginx-module-fancyindex-1.12.0.0.4.1-1.el7.gps.x86_64.rpm
-
-Alternatively, add extras repository first (for future updates) and install the module::
-
-    yum install nginx-module-fancyindex
-    
-Then load the module in `/etc/nginx/nginx.conf` using::
-
-   load_module "modules/ngx_http_fancyindex_module.so";
-
-Other platforms
-~~~~~~~~~~~~~~~
-
-In most other cases you will need the sources for Nginx_. Any version starting
-from the 0.8 series should work.
-
-In order to use the ``fancyindex_header_`` and ``fancyindex_footer_`` directives
-you will also need the `ngx_http_addition_module <https://nginx.org/en/docs/http/ngx_http_addition_module.html>`_
-built into Nginx.
-
-
-Building
-========
-
-1. Unpack the Nginx_ sources::
-
-    $ gunzip -c nginx-?.?.?.tar.gz | tar -xvf -
-
-2. Unpack the sources for the fancy indexing module::
-
-    $ gunzip -c nginx-fancyindex-?.?.?.tar.gz | tar -xvf -
-
-3. Change to the directory which contains the Nginx_ sources, run the
-   configuration script with the desired options and be sure to put an
-   ``--add-module`` flag pointing to the directory which contains the source
-   of the fancy indexing module::
-
-    $ cd nginx-?.?.?
-    $ ./configure --add-module=../nginx-fancyindex-?.?.? \
-       [--with-http_addition_module] [extra desired options]
-
-   Since version 0.4.0, the module can also be built as a
-   `dynamic module <https://www.nginx.com/resources/wiki/extending/converting/>`_,
-   using ``--add-dynamic-module=…`` instead and
-   ``load_module "modules/ngx_http_fancyindex_module.so";``
-   in the configuration file
-
-4. Build and install the software::
-
-    $ make
-
-   And then, as ``root``::
-
-    # make install
-
-5. Configure Nginx_ by using the modules' configuration directives_.
-
-
-Example
-=======
-
-You can test the default built-in style by adding the following lines into
-a ``server`` section in your Nginx_ configuration file::
-
-  location / {
-    fancyindex on;              # Enable fancy indexes.
-    fancyindex_exact_size off;  # Output human-readable file sizes.
-  }
-
-
-Themes
-~~~~~~
-
-The following themes demonstrate the level of customization which can be
-achieved using the module:
-
-* `Theme <https://github.com/TheInsomniac/Nginx-Fancyindex-Theme>`__ by
-  `@TheInsomniac <https://github.com/TheInsomniac>`__. Uses custom header and
-  footer.
-* `Theme <https://github.com/Naereen/Nginx-Fancyindex-Theme>`__ by
-  `@Naereen <https://github.com/Naereen/>`__. Uses custom header and footer, the
-  header includes search field to filter by filename using JavaScript.
-* `Theme <https://github.com/fraoustin/Nginx-Fancyindex-Theme>`__ by
-  `@fraoustin <https://github.com/fraoustin>`__. Responsive theme using
-  Material Design elements.
-* `Theme <https://github.com/alehaa/nginx-fancyindex-flat-theme>`__ by
-  `@alehaa <https://github.com/alehaa>`__. Simple, flat theme based on
-  Bootstrap 4 and FontAwesome.
-
-
-Directives
-==========
-
-fancyindex
-~~~~~~~~~~
-:Syntax: *fancyindex* [*on* | *off*]
-:Default: fancyindex off
-:Context: http, server, location
-:Description:
-  Enables or disables fancy directory indexes.
-
-fancyindex_default_sort
-~~~~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_default_sort* [*name* | *size* | *date* | *name_desc* | *size_desc* | *date_desc*]
-:Default: fancyindex_default_sort name
-:Context: http, server, location
-:Description:
-  Defines sorting criterion by default.
-
-fancyindex_directories_first
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_directories_first* [*on* | *off*]
-:Default: fancyindex_directories_first on
-:Context: http, server, location
-:Description:
-  If enabled (default setting), groups directories together and sorts them
-  before all regular files. If disabled, directories are sorted together with files.
-
-fancyindex_css_href
-~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_css_href uri*
-:Default: fancyindex_css_href ""
-:Context: http, server, location
-:Description:
-  Allows inserting a link to a CSS style sheet in generated listings. The
-  provided *uri* parameter will be inserted as-is in a ``<link>`` HTML tag.
-  The link is inserted after the built-in CSS rules, so you can override the
-  default styles.
-
-fancyindex_exact_size
-~~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_exact_size* [*on* | *off*]
-:Default: fancyindex_exact_size on
-:Context: http, server, location
-:Description:
-  Defines how to represent file sizes in the directory listing; either
-  accurately, or rounding off to the kilobyte, the megabyte and the
-  gigabyte.
-
-fancyindex_name_length
-~~~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_name_length length*
-:Default: fancyindex_name_length 50
-:Context: http, server, location
-:Description:
-  Defines the maximum file name length limit in bytes.
-
-fancyindex_footer
-~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_footer path* [*subrequest* | *local*]
-:Default: fancyindex_footer ""
-:Context: http, server, location
-:Description:
-  Specifies which file should be inserted at the foot of directory listings.
-  If set to an empty string, the default footer supplied by the module will
-  be sent. The optional parameter indicates whether the *path* is to be
-  treated as an URI to load using a *subrequest* (the default), or whether
-  it refers to a *local* file.
-
-.. note:: Using this directive needs the ngx_http_addition_module_ built
-   into Nginx.
-
-.. warning:: When inserting custom header/footer a subrequest will be
-   issued so potentially any URL can be used as source for them. Although it
-   will work with external URLs, only using internal ones is supported.
-   External URLs are totally untested and using them will make Nginx_ block
-   while waiting for the subrequest to complete. If you feel like external
-   header/footer is a must-have for you, please
-   `let me know <mailto:aperez@igalia.com>`__.
-
-fancyindex_header
-~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_header path* [*subrequest* | *local*]
-:Default: fancyindex_header ""
-:Context: http, server, location
-:Description:
-  Specifies which file should be inserted at the head of directory listings.
-  If set to an empty string, the default header supplied by the module will
-  be sent. The optional parameter indicates whether the *path* is to be
-  treated as an URI to load using a *subrequest* (the default), or whether
-  it refers to a *local* file.
-
-.. note:: Using this directive needs the ngx_http_addition_module_ built
-   into Nginx.
-
-fancyindex_show_path
-~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_show_path* [*on* | *off*]
-:Default: fancyindex_show_path on
-:Context: http, server, location
-:Description:
-  Whether to output or not the path and the closing </h1> tag after the header.
-  This is useful when you want to handle the path displaying with a PHP script
-  for example.
-
-.. warning:: This directive can be turned off only if a custom header is provided
-   using fancyindex_header.
-
-fancyindex_show_dotfiles
-~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_show_dotfiles* [*on* | *off*]
-:Default: fancyindex_show_dotfiles off
-:Context: http, server, location
-:Description:
-  Whether to list files that are proceeded with a dot. Normal convention is to
-  hide these. 
-
-fancyindex_ignore
-~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_ignore string1 [string2 [... stringN]]*
-:Default: No default.
-:Context: http, server, location
-:Description:
-  Specifies a list of file names which will be not be shown in generated
-  listings. If Nginx was built with PCRE support strings are interpreted as
-  regular expressions.
-
-fancyindex_hide_symlinks
-~~~~~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_hide_symlinks* [*on* | *off*]
-:Default: fancyindex_hide_symlinks off
-:Context: http, server, location
-:Description:
-  When enabled, generated listings will not contain symbolic links.
-
-fancyindex_hide_parent_dir
-~~~~~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_hide_parent_dir* [*on* | *off*]
-:Default: fancyindex_hide_parent_dir off
-:Context: http, server, location
-:Description:
-  When enabled, it will not show parent directory.
-
-fancyindex_localtime
-~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_localtime* [*on* | *off*]
-:Default: fancyindex_localtime off
-:Context: http, server, location
-:Description:
-  Enables showing file times as local time. Default is “off” (GMT time).
-
-fancyindex_time_format
-~~~~~~~~~~~~~~~~~~~~~~
-:Syntax: *fancyindex_time_format* string
-:Default: fancyindex_time_format "%Y-%b-%d %H:%M"
-:Context: http, server, location
-:Description:
-  Format string used for timestamps. The format specifiers are a subset of
-  those supported by the `strftime <https://linux.die.net/man/3/strftime>`_
-  function, and the behavior is locale-independent (for example, day and month
-  names are always in English). The supported formats are:
-
-  * ``%a``: Abbreviated name of the day of the week.
-  * ``%A``: Full name of the day of the week.
-  * ``%b``: Abbreviated month name.
-  * ``%B``: Full month name.
-  * ``%d``: Day of the month as a decimal number (range 01 to 31).
-  * ``%e``: Like ``%d``, the day of the month as a decimal number, but a
-    leading zero is replaced by a space.
-  * ``%F``: Equivalent to ``%Y-%m-%d`` (the ISO 8601 date format).
-  * ``%H``: Hour as a decimal number using a 24-hour clock (range 00
-    to 23).
-  * ``%I``: Hour as a decimal number using a 12-hour clock (range 01 to 12).
-  * ``%k``: Hour (24-hour clock) as a decimal number (range 0 to 23);
-    single digits are preceded by a blank.
-  * ``%l``: Hour (12-hour clock) as a decimal number (range 1 to 12); single
-    digits are preceded by a blank.
-  * ``%m``: Month as a decimal number (range 01 to 12).
-  * ``%M``: Minute as a decimal number (range 00 to 59).
-  * ``%p``: Either "AM" or "PM" according to the given time value.
-  * ``%P``: Like ``%p`` but in lowercase: "am" or "pm".
-  * ``%r``: Time in a.m. or p.m. notation. Equivalent to ``%I:%M:%S %p``.
-  * ``%R``: Time in 24-hour notation (``%H:%M``).
-  * ``%S``: Second as a decimal number (range 00 to 60).
-  * ``%T``: Time in 24-hour notation (``%H:%M:%S``).
-  * ``%u``: Day of the week as a decimal, range 1 to 7, Monday being 1.
-  * ``%w``: Day of the week as a decimal, range 0 to 6, Monday being 0.
-  * ``%y``: Year as a decimal number without a century (range 00 to 99).
-  * ``%Y``: Year as a decimal number including the century.
-
-
-.. _nginx: https://nginx.org
-
-.. vim:ft=rst:spell:spelllang=en:
diff --git a/debian/modules/http-fancyindex/config b/debian/modules/http-fancyindex/config
deleted file mode 100644
index 4ef3809..0000000
--- a/debian/modules/http-fancyindex/config
+++ /dev/null
@@ -1,20 +0,0 @@
-# vim:ft=sh:
-ngx_addon_name=ngx_http_fancyindex_module
-
-if [ "$ngx_module_link" = DYNAMIC ] ; then
-    ngx_module_type=HTTP
-    ngx_module_name=ngx_http_fancyindex_module
-    ngx_module_srcs="$ngx_addon_dir/ngx_http_fancyindex_module.c"
-    ngx_module_deps="$ngx_addon_dir/template.h"
-    ngx_module_order="$ngx_module_name ngx_http_autoindex_module"
-    . auto/module
-else
-    # XXX: Insert fancyindex module *after* index module!
-    #
-    HTTP_MODULES=`echo "${HTTP_MODULES}" | sed -e \
-	's/ngx_http_index_module/ngx_http_fancyindex_module ngx_http_index_module/'`
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fancyindex_module.c"
-    if [ $HTTP_ADDITION != YES ] ; then
-        echo " - The 'addition' filter is needed for fancyindex_{header,footer}, but it was disabled"
-    fi
-fi
diff --git a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c b/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
deleted file mode 100644
index d5f1722..0000000
--- a/debian/modules/http-fancyindex/ngx_http_fancyindex_module.c
+++ /dev/null
@@ -1,1615 +0,0 @@
-/*
- * ngx_http_fancyindex_module.c
- * Copyright © 2007-2016 Adrian Perez <aperez@igalia.com>
- *
- * Module used for fancy indexing of directories. Features and differences
- * with the stock nginx autoindex module:
- *
- *  - Output is a table instead of a <pre> element with embedded <a> links.
- *  - Header and footer may be added to every generated directory listing.
- *  - Default header and/or footer are generated if custom ones are not
- *    configured. Files used for header and footer can only be local path
- *    names (i.e. you cannot insert the result of a subrequest.)
- *  - Proper HTML is generated: it should validate both as XHTML 1.0 Strict
- *    and HTML 4.01.
- *
- * Base functionality heavy based upon the stock nginx autoindex module,
- * which in turn was made by Igor Sysoev, like the majority of nginx.
- *
- * Distributed under terms of the BSD license.
- */
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <ngx_log.h>
-
-#include "template.h"
-
-#if defined(__GNUC__) && (__GNUC__ >= 3)
-# define ngx_force_inline __attribute__((__always_inline__))
-#else /* !__GNUC__ */
-# define ngx_force_inline
-#endif /* __GNUC__ */
-
-
-static const char *short_weekday[] = {
-    "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun",
-};
-static const char *long_weekday[] = {
-    "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Sunday",
-};
-static const char *short_month[] = {
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
-};
-static const char *long_month[] = {
-    "January", "February", "March", "April", "May", "June", "July",
-    "August", "September", "October", "November", "December",
-};
-
-
-#define DATETIME_FORMATS(F_, t) \
-    F_ ('a',  3, "%3s",  short_weekday[((t)->ngx_tm_wday + 6) % 7]) \
-    F_ ('A',  9, "%s",   long_weekday [((t)->ngx_tm_wday + 6) % 7]) \
-    F_ ('b',  3, "%3s",  short_month[(t)->ngx_tm_mon - 1]         ) \
-    F_ ('B',  9, "%s",   long_month [(t)->ngx_tm_mon - 1]         ) \
-    F_ ('d',  2, "%02d", (t)->ngx_tm_mday                         ) \
-    F_ ('e',  2, "%2d",  (t)->ngx_tm_mday                         ) \
-    F_ ('F', 10, "%d-%02d-%02d",                                    \
-                  (t)->ngx_tm_year,                                 \
-                  (t)->ngx_tm_mon,                                  \
-                  (t)->ngx_tm_mday                                ) \
-    F_ ('H',  2, "%02d", (t)->ngx_tm_hour                         ) \
-    F_ ('I',  2, "%02d", ((t)->ngx_tm_hour % 12) + 1              ) \
-    F_ ('k',  2, "%2d",  (t)->ngx_tm_hour                         ) \
-    F_ ('l',  2, "%2d",  ((t)->ngx_tm_hour % 12) + 1              ) \
-    F_ ('m',  2, "%02d", (t)->ngx_tm_mon                          ) \
-    F_ ('M',  2, "%02d", (t)->ngx_tm_min                          ) \
-    F_ ('p',  2, "%2s",  (((t)->ngx_tm_hour < 12) ? "AM" : "PM")  ) \
-    F_ ('P',  2, "%2s",  (((t)->ngx_tm_hour < 12) ? "am" : "pm")  ) \
-    F_ ('r', 11, "%02d:%02d:%02d %2s",                              \
-                 ((t)->ngx_tm_hour % 12) + 1,                       \
-                 (t)->ngx_tm_min,                                   \
-                 (t)->ngx_tm_sec,                                   \
-                 (((t)->ngx_tm_hour < 12) ? "AM" : "PM")          ) \
-    F_ ('R',  5, "%02d:%02d", (t)->ngx_tm_hour, (t)->ngx_tm_min   ) \
-    F_ ('S',  2, "%02d", (t)->ngx_tm_sec                          ) \
-    F_ ('T',  8, "%02d:%02d:%02d",                                  \
-                 (t)->ngx_tm_hour,                                  \
-                 (t)->ngx_tm_min,                                   \
-                 (t)->ngx_tm_sec                                  ) \
-    F_ ('u',  1, "%1d", (((t)->ngx_tm_wday + 6) % 7) + 1          ) \
-    F_ ('w',  1, "%1d", ((t)->ngx_tm_wday + 6) % 7                ) \
-    F_ ('y',  2, "%02d", (t)->ngx_tm_year % 100                   ) \
-    F_ ('Y',  4, "%04d", (t)->ngx_tm_year                         )
-
-
-static size_t
-ngx_fancyindex_timefmt_calc_size (const ngx_str_t *fmt)
-{
-#define DATETIME_CASE(letter, fmtlen, fmt, ...) \
-        case letter: result += (fmtlen); break;
-
-    size_t i, result = 0;
-    for (i = 0; i < fmt->len; i++) {
-        if (fmt->data[i] == '%') {
-            if (++i >= fmt->len) {
-                result++;
-                break;
-            }
-            switch (fmt->data[i]) {
-                DATETIME_FORMATS(DATETIME_CASE,)
-                default:
-                    result++;
-            }
-        } else {
-            result++;
-        }
-    }
-    return result;
-
-#undef DATETIME_CASE
-}
-
-
-static u_char*
-ngx_fancyindex_timefmt (u_char *buffer, const ngx_str_t *fmt, const ngx_tm_t *tm)
-{
-#define DATETIME_CASE(letter, fmtlen, fmt, ...) \
-        case letter: buffer = ngx_snprintf(buffer, fmtlen, fmt, ##__VA_ARGS__); break;
-
-    size_t i;
-    for (i = 0; i < fmt->len; i++) {
-        if (fmt->data[i] == '%') {
-            if (++i >= fmt->len) {
-                *buffer++ = '%';
-                break;
-            }
-            switch (fmt->data[i]) {
-                DATETIME_FORMATS(DATETIME_CASE, tm)
-                default:
-                    *buffer++ = fmt->data[i];
-            }
-        } else {
-            *buffer++ = fmt->data[i];
-        }
-    }
-    return buffer;
-
-#undef DATETIME_CASE
-}
-
-typedef struct {
-    ngx_str_t path;
-    ngx_str_t local;
-} ngx_fancyindex_headerfooter_conf_t;
-
-/**
- * Configuration structure for the fancyindex module. The configuration
- * commands defined in the module do fill in the members of this structure.
- */
-typedef struct {
-    ngx_flag_t enable;         /**< Module is enabled. */
-    ngx_uint_t default_sort;   /**< Default sort criterion. */
-    ngx_flag_t dirs_first;     /**< Group directories together first when sorting */
-    ngx_flag_t localtime;      /**< File mtime dates are sent in local time. */
-    ngx_flag_t exact_size;     /**< Sizes are sent always in bytes. */
-    ngx_uint_t name_length;    /**< Maximum length of file names in bytes. */
-    ngx_flag_t hide_symlinks;  /**< Hide symbolic links in listings. */
-    ngx_flag_t show_path;      /**< Whether to display or not the path + '</h1>' after the header */
-    ngx_flag_t hide_parent;    /**< Hide parent directory. */
-    ngx_flag_t show_dot_files; /**< Show files that start with a dot.*/
-
-    ngx_str_t  css_href;       /**< Link to a CSS stylesheet, or empty if none. */
-    ngx_str_t  time_format;    /**< Format used for file timestamps. */
-
-    ngx_array_t *ignore;       /**< List of files to ignore in listings. */
-
-    ngx_fancyindex_headerfooter_conf_t header;
-    ngx_fancyindex_headerfooter_conf_t footer;
-} ngx_http_fancyindex_loc_conf_t;
-
-#define NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME       0
-#define NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE       1
-#define NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE       2
-#define NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME_DESC  3
-#define NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE_DESC  4
-#define NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE_DESC  5
-
-static ngx_conf_enum_t ngx_http_fancyindex_sort_criteria[] = {
-    { ngx_string("name"), NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME },
-    { ngx_string("size"), NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE },
-    { ngx_string("date"), NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE },
-    { ngx_string("name_desc"), NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME_DESC },
-    { ngx_string("size_desc"), NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE_DESC },
-    { ngx_string("date_desc"), NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE_DESC },
-    { ngx_null_string, 0 }
-};
-
-enum {
-    NGX_HTTP_FANCYINDEX_HEADERFOOTER_SUBREQUEST,
-    NGX_HTTP_FANCYINDEX_HEADERFOOTER_LOCAL,
-};
-
-static ngx_uint_t
-headerfooter_kind(const ngx_str_t *value)
-{
-    static const struct {
-        ngx_str_t name;
-        ngx_uint_t value;
-    } values[] = {
-        { ngx_string("subrequest"), NGX_HTTP_FANCYINDEX_HEADERFOOTER_SUBREQUEST },
-        { ngx_string("local"), NGX_HTTP_FANCYINDEX_HEADERFOOTER_LOCAL },
-    };
-
-    unsigned i;
-
-    for (i = 0; i < sizeof(values) / sizeof(values[0]); i++) {
-        if (value->len == values[i].name.len &&
-            ngx_strcasecmp(value->data, values[i].name.data) == 0)
-        {
-            return values[i].value;
-        }
-    }
-
-    return NGX_CONF_UNSET_UINT;
-}
-
-static char*
-ngx_fancyindex_conf_set_headerfooter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_fancyindex_headerfooter_conf_t *item =
-        (void*) (((char*) conf) + cmd->offset);
-    ngx_str_t *values = cf->args->elts;
-
-    if (item->path.data)
-        return "is duplicate";
-
-    item->path = values[1];
-
-    /* Kind of path. Default is "subrequest". */
-    ngx_uint_t kind = NGX_HTTP_FANCYINDEX_HEADERFOOTER_SUBREQUEST;
-    if (cf->args->nelts == 3) {
-        kind = headerfooter_kind(&values[2]);
-        if (kind == NGX_CONF_UNSET_UINT) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "unknown header/footer kind \"%V\"", &values[2]);
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    if (kind == NGX_HTTP_FANCYINDEX_HEADERFOOTER_LOCAL) {
-        ngx_file_t file;
-        ngx_file_info_t fi;
-        ssize_t n;
-
-        ngx_memzero(&file, sizeof(ngx_file_t));
-        file.log = cf->log;
-        file.fd = ngx_open_file(item->path.data, NGX_FILE_RDONLY, 0, 0);
-        if (file.fd == NGX_INVALID_FILE) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
-                               "cannot open file \"%V\"", &values[1]);
-            return NGX_CONF_ERROR;
-        }
-
-        if (ngx_fd_info(file.fd, &fi) == NGX_FILE_ERROR) {
-            ngx_close_file(file.fd);
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
-                               "cannot get info for file \"%V\"", &values[1]);
-            return NGX_CONF_ERROR;
-        }
-
-        item->local.len = ngx_file_size(&fi);
-        item->local.data = ngx_pcalloc(cf->pool, item->local.len + 1);
-        if (item->local.data == NULL) {
-            ngx_close_file(file.fd);
-            return NGX_CONF_ERROR;
-        }
-
-        n = item->local.len;
-        while (n > 0) {
-            ssize_t r = ngx_read_file(&file,
-                                      item->local.data + file.offset,
-                                      n,
-                                      file.offset);
-            if (r == NGX_ERROR) {
-                ngx_close_file(file.fd);
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
-                                   "cannot read file \"%V\"", &values[1]);
-                return NGX_CONF_ERROR;
-            }
-
-            n -= r;
-        }
-        item->local.data[item->local.len] = '\0';
-    }
-
-    return NGX_CONF_OK;
-}
-
-#define NGX_HTTP_FANCYINDEX_PREALLOCATE  50
-
-
-/**
- * Calculates the length of a NULL-terminated string. It is ugly having to
- * remember to substract 1 from the sizeof result.
- */
-#define ngx_sizeof_ssz(_s)  (sizeof(_s) - 1)
-
-/**
- * Compute the length of a statically allocated array
- */
-#define DIM(x) (sizeof(x)/sizeof(*(x)))
-
-/**
- * Copy a static zero-terminated string. Useful to output template
- * string pieces into a temporary buffer.
- */
-#define ngx_cpymem_ssz(_p, _t) \
-	(ngx_cpymem((_p), (_t), sizeof(_t) - 1))
-
-/**
- * Copy a ngx_str_t.
- */
-#define ngx_cpymem_str(_p, _s) \
-	(ngx_cpymem((_p), (_s).data, (_s).len))
-
-/**
- * Check whether a particular bit is set in a particular value.
- */
-#define ngx_has_flag(_where, _what) \
-	(((_where) & (_what)) == (_what))
-
-
-
-
-typedef struct {
-    ngx_str_t      name;
-    size_t         utf_len;
-    ngx_uint_t     escape;
-    ngx_uint_t     escape_html;
-    ngx_uint_t     dir;
-    time_t         mtime;
-    off_t          size;
-} ngx_http_fancyindex_entry_t;
-
-
-
-static int ngx_libc_cdecl
-    ngx_http_fancyindex_cmp_entries_name_desc(const void *one, const void *two);
-static int ngx_libc_cdecl
-    ngx_http_fancyindex_cmp_entries_size_desc(const void *one, const void *two);
-static int ngx_libc_cdecl
-    ngx_http_fancyindex_cmp_entries_mtime_desc(const void *one, const void *two);
-static int ngx_libc_cdecl
-    ngx_http_fancyindex_cmp_entries_name_asc(const void *one, const void *two);
-static int ngx_libc_cdecl
-    ngx_http_fancyindex_cmp_entries_size_asc(const void *one, const void *two);
-static int ngx_libc_cdecl
-    ngx_http_fancyindex_cmp_entries_mtime_asc(const void *one, const void *two);
-
-static ngx_int_t ngx_http_fancyindex_error(ngx_http_request_t *r,
-    ngx_dir_t *dir, ngx_str_t *name);
-
-static ngx_int_t ngx_http_fancyindex_init(ngx_conf_t *cf);
-
-static void *ngx_http_fancyindex_create_loc_conf(ngx_conf_t *cf);
-
-static char *ngx_http_fancyindex_merge_loc_conf(ngx_conf_t *cf,
-    void *parent, void *child);
-
-static char *ngx_http_fancyindex_ignore(ngx_conf_t    *cf,
-                                        ngx_command_t *cmd,
-                                        void          *conf);
-
-static uintptr_t
-    ngx_fancyindex_escape_filename(u_char *dst, u_char*src, size_t size);
-
-/*
- * These are used only once per handler invocation. We can tell GCC to
- * inline them always, if possible (see how ngx_force_inline is defined
- * above).
- */
-static ngx_inline ngx_buf_t*
-    make_header_buf(ngx_http_request_t *r, const ngx_str_t css_href)
-    ngx_force_inline;
-
-
-static ngx_command_t  ngx_http_fancyindex_commands[] = {
-
-    { ngx_string("fancyindex"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, enable),
-      NULL },
-
-    { ngx_string("fancyindex_default_sort"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_enum_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, default_sort),
-      &ngx_http_fancyindex_sort_criteria },
-
-    { ngx_string("fancyindex_directories_first"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, dirs_first),
-      NULL },
-
-    { ngx_string("fancyindex_localtime"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, localtime),
-      NULL },
-
-    { ngx_string("fancyindex_exact_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, exact_size),
-      NULL },
-
-    { ngx_string("fancyindex_name_length"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, name_length),
-      NULL },
-
-    { ngx_string("fancyindex_header"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
-      ngx_fancyindex_conf_set_headerfooter,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, header),
-      NULL },
-
-    { ngx_string("fancyindex_footer"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
-      ngx_fancyindex_conf_set_headerfooter,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, footer),
-      NULL },
-
-    { ngx_string("fancyindex_css_href"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, css_href),
-      NULL },
-
-    { ngx_string("fancyindex_ignore"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_http_fancyindex_ignore,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("fancyindex_hide_symlinks"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, hide_symlinks),
-      NULL },
-
-    { ngx_string("fancyindex_show_path"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, show_path),
-      NULL },
-
-    { ngx_string("fancyindex_show_dotfiles"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, show_dot_files),
-      NULL },
-
-    { ngx_string("fancyindex_hide_parent_dir"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, hide_parent),
-      NULL },
-
-    { ngx_string("fancyindex_time_format"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_fancyindex_loc_conf_t, time_format),
-      NULL },
-
-    ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_http_fancyindex_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    ngx_http_fancyindex_init,              /* postconfiguration */
-
-    NULL,                                  /* create main configuration */
-    NULL,                                  /* init main configuration */
-
-    NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
-
-    ngx_http_fancyindex_create_loc_conf,   /* create location configuration */
-    ngx_http_fancyindex_merge_loc_conf     /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_http_fancyindex_module = {
-    NGX_MODULE_V1,
-    &ngx_http_fancyindex_module_ctx,       /* module context */
-    ngx_http_fancyindex_commands,          /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-
-static const ngx_str_t css_href_pre =
-    ngx_string("<link rel=\"stylesheet\" href=\"");
-static const ngx_str_t css_href_post =
-    ngx_string("\" type=\"text/css\"/>\n");
-
-
-#ifdef NGX_ESCAPE_URI_COMPONENT
-static inline uintptr_t
-ngx_fancyindex_escape_filename(u_char *dst, u_char *src, size_t size)
-{
-    return ngx_escape_uri(dst, src, size, NGX_ESCAPE_URI_COMPONENT);
-}
-#else /* !NGX_ESCAPE_URI_COMPONENT */
-static uintptr_t
-ngx_fancyindex_escape_filename(u_char *dst, u_char *src, size_t size)
-{
-    /*
-     * The ngx_escape_uri() function will not escape colons or the
-     * ? character, which signals the beginning of the query string.
-     * So we handle those characters ourselves.
-     *
-     * TODO: Get rid of this once ngx_escape_uri() works as expected!
-     */
-
-    u_int escapes = 0;
-    u_char *psrc = src;
-    size_t psize = size;
-
-    while (psize--) {
-        switch (*psrc++) {
-            case ':':
-            case '?':
-            case '[':
-            case ']':
-                escapes++;
-                break;
-        }
-    }
-
-    if (dst == NULL) {
-        return escapes + ngx_escape_uri(NULL, src, size, NGX_ESCAPE_HTML);
-    }
-    else if (escapes == 0) {
-        /* No need to do extra escaping, avoid the temporary buffer */
-        return ngx_escape_uri(dst, src, size, NGX_ESCAPE_HTML);
-    }
-    else {
-        uintptr_t uescapes = ngx_escape_uri(NULL, src, size, NGX_ESCAPE_HTML);
-        size_t bufsz = size + 2 * uescapes;
-
-        /*
-         * GCC and CLANG both support stack-allocated variable length
-         * arrays. Take advantage of that to avoid a malloc-free cycle.
-         */
-#if defined(__GNUC__) || defined(__clang__)
-        u_char cbuf[bufsz];
-        u_char *buf = cbuf;
-#else  /* __GNUC__ || __clang__ */
-        u_char *buf = (u_char*) malloc(sizeof(u_char) * bufsz);
-#endif /* __GNUC__ || __clang__ */
-
-        ngx_escape_uri(buf, src, size, NGX_ESCAPE_HTML);
-
-        while (bufsz--) {
-            switch (*buf) {
-                case ':':
-                    *dst++ = '%';
-                    *dst++ = '3';
-                    *dst++ = 'A';
-                    break;
-                case '?':
-                    *dst++ = '%';
-                    *dst++ = '3';
-                    *dst++ = 'F';
-                    break;
-                case '[':
-                    *dst++ = '%';
-                    *dst++ = '5';
-                    *dst++ = 'B';
-                    break;
-                case ']':
-                    *dst++ = '%';
-                    *dst++ = '5';
-                    *dst++ = 'D';
-                    break;
-                default:
-                    *dst++ = *buf;
-            }
-            buf++;
-        }
-
-#if !defined(__GNUC__) && !defined(__clang__)
-        free(buf);
-#endif /* !__GNUC__ && !__clang__ */
-
-        return escapes + uescapes;
-    }
-}
-#endif /* NGX_ESCAPE_URI_COMPONENT */
-
-
-static ngx_inline ngx_buf_t*
-make_header_buf(ngx_http_request_t *r, const ngx_str_t css_href)
-{
-    ngx_buf_t *b;
-    size_t blen = r->uri.len
-        + ngx_sizeof_ssz(t01_head1)
-        + ngx_sizeof_ssz(t02_head2)
-        + ngx_sizeof_ssz(t03_head3)
-        + ngx_sizeof_ssz(t04_body1)
-        ;
-
-    if (css_href.len) {
-        blen += css_href_pre.len \
-              + css_href.len \
-              + css_href_post.len
-              ;
-    }
-
-    if ((b = ngx_create_temp_buf(r->pool, blen)) == NULL)
-        return NULL;
-
-    b->last = ngx_cpymem_ssz(b->last, t01_head1);
-
-    if (css_href.len) {
-        b->last = ngx_cpymem_str(b->last, css_href_pre);
-        b->last = ngx_cpymem_str(b->last, css_href);
-        b->last = ngx_cpymem_str(b->last, css_href_post);
-    }
-
-    b->last = ngx_cpymem_ssz(b->last, t02_head2);
-    b->last = ngx_cpymem_str(b->last, r->uri);
-    b->last = ngx_cpymem_ssz(b->last, t03_head3);
-    b->last = ngx_cpymem_ssz(b->last, t04_body1);
-
-    return b;
-}
-
-
-static ngx_inline ngx_int_t
-make_content_buf(
-        ngx_http_request_t *r, ngx_buf_t **pb,
-        ngx_http_fancyindex_loc_conf_t *alcf)
-{
-    ngx_http_fancyindex_entry_t *entry;
-
-    int (*sort_cmp_func)(const void *, const void *);
-    const char  *sort_url_args = "";
-
-    off_t        length;
-    size_t       len, root, copy, allocated, escape_html;
-    int64_t      multiplier;
-    u_char      *filename, *last;
-    ngx_tm_t     tm;
-    ngx_array_t  entries;
-    ngx_time_t  *tp;
-    ngx_uint_t   i, j;
-    ngx_str_t    path;
-    ngx_dir_t    dir;
-    ngx_buf_t   *b;
-
-    static const char    *sizes[]  = { "EiB", "PiB", "TiB", "GiB", "MiB", "KiB", "B" };
-    static const int64_t  exbibyte = 1024LL * 1024LL * 1024LL *
-                                     1024LL * 1024LL * 1024LL;
-
-    /*
-     * NGX_DIR_MASK_LEN is lesser than NGX_HTTP_FANCYINDEX_PREALLOCATE
-     */
-    if ((last = ngx_http_map_uri_to_path(r, &path, &root,
-                    NGX_HTTP_FANCYINDEX_PREALLOCATE)) == NULL)
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-
-    allocated = path.len;
-    path.len  = last - path.data - 1;
-    path.data[path.len] = '\0';
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http fancyindex: \"%s\"", path.data);
-
-    if (ngx_open_dir(&path, &dir) == NGX_ERROR) {
-        ngx_int_t rc, err = ngx_errno;
-        ngx_uint_t level;
-
-        if (err == NGX_ENOENT || err == NGX_ENOTDIR || err == NGX_ENAMETOOLONG) {
-            level = NGX_LOG_ERR;
-            rc = NGX_HTTP_NOT_FOUND;
-        } else if (err == NGX_EACCES) {
-            level = NGX_LOG_ERR;
-            rc = NGX_HTTP_FORBIDDEN;
-        } else {
-            level = NGX_LOG_CRIT;
-            rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        ngx_log_error(level, r->connection->log, err,
-                ngx_open_dir_n " \"%s\" failed", path.data);
-
-        return rc;
-    }
-
-#if (NGX_SUPPRESS_WARN)
-    /* MSVC thinks 'entries' may be used without having been initialized */
-    ngx_memzero(&entries, sizeof(ngx_array_t));
-#endif /* NGX_SUPPRESS_WARN */
-
-
-    if (ngx_array_init(&entries, r->pool, 40,
-                sizeof(ngx_http_fancyindex_entry_t)) != NGX_OK)
-        return ngx_http_fancyindex_error(r, &dir, &path);
-
-    filename = path.data;
-    filename[path.len] = '/';
-
-    /* Read directory entries and their associated information. */
-    for (;;) {
-        ngx_set_errno(0);
-
-        if (ngx_read_dir(&dir) == NGX_ERROR) {
-            ngx_int_t err = ngx_errno;
-
-            if (err != NGX_ENOMOREFILES) {
-                ngx_log_error(NGX_LOG_CRIT, r->connection->log, err,
-                        ngx_read_dir_n " \"%V\" failed", &path);
-                return ngx_http_fancyindex_error(r, &dir, &path);
-            }
-            break;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http fancyindex file: \"%s\"", ngx_de_name(&dir));
-
-        len = ngx_de_namelen(&dir);
-
-        if (!alcf->show_dot_files && ngx_de_name(&dir)[0] == '.')
-            continue;
-
-        if (alcf->hide_symlinks && ngx_de_is_link (&dir))
-            continue;
-
-#if NGX_PCRE
-        {
-            ngx_str_t str;
-            str.len = len;
-            str.data = ngx_de_name(&dir);
-
-            if (alcf->ignore && ngx_regex_exec_array(alcf->ignore, &str,
-                                                     r->connection->log)
-                != NGX_DECLINED)
-            {
-                continue;
-            }
-        }
-#else /* !NGX_PCRE */
-        if (alcf->ignore) {
-            u_int match_found = 0;
-            ngx_str_t *s = alcf->ignore->elts;
-
-            for (i = 0; i < alcf->ignore->nelts; i++, s++) {
-                if (ngx_strcmp(ngx_de_name(&dir), s->data) == 0) {
-                    match_found = 1;
-                    break;
-                }
-            }
-
-            if (match_found) {
-                continue;
-            }
-        }
-#endif /* NGX_PCRE */
-
-        if (!dir.valid_info) {
-            /* 1 byte for '/' and 1 byte for terminating '\0' */
-            if (path.len + 1 + len + 1 > allocated) {
-                allocated = path.len + 1 + len + 1
-                          + NGX_HTTP_FANCYINDEX_PREALLOCATE;
-
-                if ((filename = ngx_palloc(r->pool, allocated)) == NULL)
-                    return ngx_http_fancyindex_error(r, &dir, &path);
-
-                last = ngx_cpystrn(filename, path.data, path.len + 1);
-                *last++ = '/';
-            }
-
-            ngx_cpystrn(last, ngx_de_name(&dir), len + 1);
-
-            if (ngx_de_info(filename, &dir) == NGX_FILE_ERROR) {
-                ngx_int_t err = ngx_errno;
-
-                if (err != NGX_ENOENT) {
-                    ngx_log_error(NGX_LOG_ERR, r->connection->log, err,
-                            ngx_de_info_n " \"%s\" failed", filename);
-                    continue;
-                }
-
-                if (ngx_de_link_info(filename, &dir) == NGX_FILE_ERROR) {
-                    ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
-                            ngx_de_link_info_n " \"%s\" failed", filename);
-                    return ngx_http_fancyindex_error(r, &dir, &path);
-                }
-            }
-        }
-
-        if ((entry = ngx_array_push(&entries)) == NULL)
-            return ngx_http_fancyindex_error(r, &dir, &path);
-
-        entry->name.len  = len;
-        entry->name.data = ngx_palloc(r->pool, len + 1);
-        if (entry->name.data == NULL)
-            return ngx_http_fancyindex_error(r, &dir, &path);
-
-        ngx_cpystrn(entry->name.data, ngx_de_name(&dir), len + 1);
-        entry->escape = 2 * ngx_fancyindex_escape_filename(NULL,
-                                                           ngx_de_name(&dir),
-                                                           len);
-        entry->escape_html = ngx_escape_html(NULL,
-                                             entry->name.data,
-                                             entry->name.len);
-
-        entry->dir     = ngx_de_is_dir(&dir);
-        entry->mtime   = ngx_de_mtime(&dir);
-        entry->size    = ngx_de_size(&dir);
-        entry->utf_len = (r->headers_out.charset.len == 5 &&
-                ngx_strncasecmp(r->headers_out.charset.data, (u_char*) "utf-8", 5) == 0)
-            ?  ngx_utf8_length(entry->name.data, entry->name.len)
-            : len;
-    }
-
-    if (ngx_close_dir(&dir) == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
-                ngx_close_dir_n " \"%s\" failed", &path);
-    }
-
-    /*
-     * Calculate needed buffer length.
-     */
-
-    escape_html = ngx_escape_html(NULL, r->uri.data, r->uri.len);
-
-    if (alcf->show_path)
-        len = r->uri.len + escape_html
-          + ngx_sizeof_ssz(t05_body2)
-          + ngx_sizeof_ssz(t06_list1)
-          + ngx_sizeof_ssz(t_parentdir_entry)
-          + ngx_sizeof_ssz(t07_list2)
-          + ngx_fancyindex_timefmt_calc_size (&alcf->time_format) * entries.nelts
-          ;
-   else
-        len = r->uri.len + escape_html
-          + ngx_sizeof_ssz(t06_list1)
-          + ngx_sizeof_ssz(t_parentdir_entry)
-          + ngx_sizeof_ssz(t07_list2)
-          + ngx_fancyindex_timefmt_calc_size (&alcf->time_format) * entries.nelts
-          ;
-
-    /*
-     * If we are a the root of the webserver (URI =  "/" --> length of 1),
-     * do not display the "Parent Directory" link.
-     */
-    if (r->uri.len == 1) {
-        len -= ngx_sizeof_ssz(t_parentdir_entry);
-    }
-
-    entry = entries.elts;
-    for (i = 0; i < entries.nelts; i++) {
-        /*
-         * Genearated table rows are as follows, unneeded whitespace
-         * is stripped out:
-         *
-         *   <tr>
-         *     <td><a href="U[?sort]">fname</a></td>
-         *     <td>size</td><td>date</td>
-         *   </tr>
-         */
-        len += ngx_sizeof_ssz("<tr><td class=\"link\"><a href=\"")
-            + entry[i].name.len + entry[i].escape /* Escaped URL */
-            + ngx_sizeof_ssz("?C=x&amp;O=y") /* URL sorting arguments */
-            + ngx_sizeof_ssz("\" title=\"")
-            + entry[i].name.len + entry[i].utf_len + entry[i].escape_html
-            + ngx_sizeof_ssz("\">")
-            + entry[i].name.len + entry[i].utf_len + entry[i].escape_html
-            + alcf->name_length + ngx_sizeof_ssz("&gt;")
-            + ngx_sizeof_ssz("</a></td><td class=\"size\">")
-            + 20 /* File size */
-            + ngx_sizeof_ssz("</td><td class=\"date\">")    /* Date prefix */
-            + ngx_sizeof_ssz("</td></tr>\n") /* Date suffix */
-            + 2 /* CR LF */
-            ;
-    }
-
-    if ((b = ngx_create_temp_buf(r->pool, len)) == NULL)
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-
-    /*
-     * Determine the sorting criteria. URL arguments look like:
-     *
-     *    C=x[&O=y]
-     *
-     * Where x={M,S,N} and y={A,D}
-     */
-    if ((r->args.len == 3 || (r->args.len == 7 && r->args.data[3] == '&')) &&
-        r->args.data[0] == 'C' && r->args.data[1] == '=')
-    {
-        /* Determine whether the direction of the sorting */
-        ngx_int_t sort_descending = r->args.len == 7
-                                 && r->args.data[4] == 'O'
-                                 && r->args.data[5] == '='
-                                 && r->args.data[6] == 'D';
-
-        /* Pick the sorting criteria */
-        switch (r->args.data[2]) {
-            case 'M': /* Sort by mtime */
-                if (sort_descending) {
-                    sort_cmp_func = ngx_http_fancyindex_cmp_entries_mtime_desc;
-                    if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE_DESC)
-                        sort_url_args = "?C=M&amp;O=D";
-                }
-                else {
-                    sort_cmp_func = ngx_http_fancyindex_cmp_entries_mtime_asc;
-                    if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE)
-                        sort_url_args = "?C=M&amp;O=A";
-                }
-                break;
-            case 'S': /* Sort by size */
-                if (sort_descending) {
-                    sort_cmp_func = ngx_http_fancyindex_cmp_entries_size_desc;
-                    if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE_DESC)
-                        sort_url_args = "?C=S&amp;O=D";
-                }
-                else {
-                    sort_cmp_func = ngx_http_fancyindex_cmp_entries_size_asc;
-                        if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE)
-                    sort_url_args = "?C=S&amp;O=A";
-                }
-                break;
-            case 'N': /* Sort by name */
-            default:
-                if (sort_descending) {
-                    sort_cmp_func = ngx_http_fancyindex_cmp_entries_name_desc;
-                    if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME_DESC)
-                        sort_url_args = "?C=N&amp;O=D";
-                }
-                else {
-                    sort_cmp_func = ngx_http_fancyindex_cmp_entries_name_asc;
-                    if (alcf->default_sort != NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME)
-                        sort_url_args = "?C=N&amp;O=A";
-                }
-                break;
-        }
-    }
-    else {
-        switch (alcf->default_sort) {
-            case NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE_DESC:
-                sort_cmp_func = ngx_http_fancyindex_cmp_entries_mtime_desc;
-                break;
-            case NGX_HTTP_FANCYINDEX_SORT_CRITERION_DATE:
-                sort_cmp_func = ngx_http_fancyindex_cmp_entries_mtime_asc;
-                break;
-            case NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE_DESC:
-                sort_cmp_func = ngx_http_fancyindex_cmp_entries_size_desc;
-                break;
-            case NGX_HTTP_FANCYINDEX_SORT_CRITERION_SIZE:
-                sort_cmp_func = ngx_http_fancyindex_cmp_entries_size_asc;
-                break;
-            case NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME_DESC:
-                sort_cmp_func = ngx_http_fancyindex_cmp_entries_name_desc;
-                break;
-            case NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME:
-            default:
-                sort_cmp_func = ngx_http_fancyindex_cmp_entries_name_asc;
-                break;
-        }
-    }
-
-    /* Sort entries, if needed */
-    if (entries.nelts > 1) {
-        if (alcf->dirs_first)
-        {
-            ngx_http_fancyindex_entry_t *l, *r;
-
-            l = entry;
-            r = entry + entries.nelts - 1;
-            while (l < r)
-            {
-                while (l < r && l->dir)
-                    l++;
-                while (l < r && !r->dir)
-                    r--;
-                if (l < r) {
-                    /* Now l points a file while r points a directory */
-                    ngx_http_fancyindex_entry_t tmp;
-                    tmp = *l;
-                    *l = *r;
-                    *r = tmp;
-                }
-            }
-            if (r->dir)
-                r++;
-
-            if (r > entry)
-                /* Sort directories */
-                ngx_qsort(entry, (size_t)(r - entry),
-                        sizeof(ngx_http_fancyindex_entry_t), sort_cmp_func);
-            if (r < entry + entries.nelts)
-                /* Sort files */
-                ngx_qsort(r, (size_t)(entry + entries.nelts - r),
-                        sizeof(ngx_http_fancyindex_entry_t), sort_cmp_func);
-        } else {
-            ngx_qsort(entry, (size_t)entries.nelts,
-                    sizeof(ngx_http_fancyindex_entry_t), sort_cmp_func);
-        }
-    }
-
-    /* Display the path, if needed */
-    if (alcf->show_path){
-        b->last = last = (u_char *) ngx_escape_html(b->last, r->uri.data, r->uri.len);
-        b->last = ngx_cpymem_ssz(b->last, t05_body2);
-    }
-
-    /* Open the <table> tag */
-    b->last = ngx_cpymem_ssz(b->last, t06_list1);
-
-    tp = ngx_timeofday();
-
-    /* "Parent dir" entry, always first if displayed */
-    if (r->uri.len > 1 && alcf->hide_parent == 0) {
-        b->last = ngx_cpymem_ssz(b->last,
-                                 "<tr>"
-                                 "<td class=\"link\"><a href=\"../");
-        if (*sort_url_args) {
-            b->last = ngx_cpymem(b->last,
-                                 sort_url_args,
-                                 ngx_sizeof_ssz("?C=N&amp;O=A"));
-        }
-        b->last = ngx_cpymem_ssz(b->last,
-                                 "\">Parent directory/</a></td>"
-                                 "<td class=\"size\">-</td>"
-                                 "<td class=\"date\">-</td>"
-                                 "</tr>"
-                                 CRLF);
-    }
-
-    /* Entries for directories and files */
-    for (i = 0; i < entries.nelts; i++) {
-        b->last = ngx_cpymem_ssz(b->last, "<tr><td class=\"link\"><a href=\"");
-
-        if (entry[i].escape) {
-            ngx_fancyindex_escape_filename(b->last,
-                                           entry[i].name.data,
-                                           entry[i].name.len);
-
-            b->last += entry[i].name.len + entry[i].escape;
-
-        } else {
-            b->last = ngx_cpymem_str(b->last, entry[i].name);
-        }
-
-        if (entry[i].dir) {
-            *b->last++ = '/';
-            if (*sort_url_args) {
-                b->last = ngx_cpymem(b->last,
-                                     sort_url_args,
-                                     ngx_sizeof_ssz("?C=x&amp;O=y"));
-            }
-        }
-
-        *b->last++ = '"';
-        b->last = ngx_cpymem_ssz(b->last, " title=\"");
-        b->last = (u_char *) ngx_escape_html(b->last, entry[i].name.data, entry[i].name.len);
-        *b->last++ = '"';
-        *b->last++ = '>';
-
-        len = entry[i].utf_len;
-
-        if (entry[i].name.len != len) {
-            if (len > alcf->name_length) {
-                copy = alcf->name_length - 3 + 1;
-            } else {
-                copy = alcf->name_length + 1;
-            }
-
-            last = b->last;
-            b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
-                copy, entry[i].name.len);
-
-            b->last = (u_char *) ngx_escape_html(last, entry[i].name.data, b->last - last);
-            last = b->last;
-
-        } else {
-            if (len > alcf->name_length) {
-                b->last = (u_char *) ngx_escape_html(b->last, entry[i].name.data, alcf->name_length + 1);
-            } else {
-                b->last = (u_char *) ngx_escape_html(b->last, entry[i].name.data, entry[i].name.len);
-            }
-            last = b->last - 3;
-        }
-
-        if (len > alcf->name_length) {
-            b->last = ngx_cpymem_ssz(last, "..&gt;</a></td><td class=\"size\">");
-
-        } else {
-            if (entry[i].dir && alcf->name_length - len > 0) {
-                *b->last++ = '/';
-                len++;
-            }
-
-            b->last = ngx_cpymem_ssz(b->last, "</a></td><td class=\"size\">");
-        }
-
-        if (alcf->exact_size) {
-            if (entry[i].dir) {
-                *b->last++ = '-';
-            } else {
-                b->last = ngx_sprintf(b->last, "%19O", entry[i].size);
-            }
-
-        } else {
-            if (entry[i].dir) {
-                *b->last++ = '-';
-            } else {
-                length = entry[i].size;
-                multiplier = exbibyte;
-
-                for (j = 0; j < DIM(sizes) - 1 && length < multiplier; j++)
-                    multiplier /= 1024;
-
-                /* If we are showing the filesize in bytes, do not show a decimal */
-                if (j == DIM(sizes) - 1)
-                    b->last = ngx_sprintf(b->last, "%O %s", length, sizes[j]);
-                else
-                    b->last = ngx_sprintf(b->last, "%.1f %s",
-                                          (float) length / multiplier, sizes[j]);
-            }
-        }
-
-        ngx_gmtime(entry[i].mtime + tp->gmtoff * 60 * alcf->localtime, &tm);
-        b->last = ngx_cpymem_ssz(b->last, "</td><td class=\"date\">");
-        b->last = ngx_fancyindex_timefmt(b->last, &alcf->time_format, &tm);
-        b->last = ngx_cpymem_ssz(b->last, "</td></tr>");
-
-        *b->last++ = CR;
-        *b->last++ = LF;
-    }
-
-    /* Output table bottom */
-    b->last = ngx_cpymem_ssz(b->last, t07_list2);
-
-    *pb = b;
-    return NGX_OK;
-}
-
-
-
-static ngx_int_t
-ngx_http_fancyindex_handler(ngx_http_request_t *r)
-{
-    ngx_http_request_t             *sr;
-    ngx_str_t                      *sr_uri;
-    ngx_str_t                       rel_uri;
-    ngx_int_t                       rc;
-    ngx_http_fancyindex_loc_conf_t *alcf;
-    ngx_chain_t                     out[3] = {
-        { NULL, NULL }, { NULL, NULL}, { NULL, NULL }};
-
-
-    if (r->uri.data[r->uri.len - 1] != '/') {
-        return NGX_DECLINED;
-    }
-
-    /* TODO: Win32 */
-#if defined(nginx_version) \
-    && ((nginx_version < 7066) \
-        || ((nginx_version > 8000) && (nginx_version < 8038)))
-    if (r->zero_in_uri) {
-        return NGX_DECLINED;
-    }
-#endif
-
-    if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) {
-        return NGX_DECLINED;
-    }
-
-    alcf = ngx_http_get_module_loc_conf(r, ngx_http_fancyindex_module);
-
-    if (!alcf->enable) {
-        return NGX_DECLINED;
-    }
-
-    if ((rc = make_content_buf(r, &out[0].buf, alcf)) != NGX_OK)
-        return rc;
-
-    out[0].buf->last_in_chain = 1;
-
-    r->headers_out.status = NGX_HTTP_OK;
-    r->headers_out.content_type_len  = ngx_sizeof_ssz("text/html");
-    r->headers_out.content_type.len  = ngx_sizeof_ssz("text/html");
-    r->headers_out.content_type.data = (u_char *) "text/html";
-
-    rc = ngx_http_send_header(r);
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only)
-        return rc;
-
-    if (alcf->header.path.len > 0 && alcf->header.local.len == 0) {
-        /* URI is configured, make Nginx take care of with a subrequest. */
-        sr_uri = &alcf->header.path;
-
-        if (*sr_uri->data != '/') {
-            /* Relative path */
-            rel_uri.len  = r->uri.len + alcf->header.path.len;
-            rel_uri.data = ngx_palloc(r->pool, rel_uri.len);
-            if (rel_uri.data == NULL) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
-            ngx_memcpy(ngx_cpymem(rel_uri.data, r->uri.data, r->uri.len),
-                    alcf->header.path.data, alcf->header.path.len);
-            sr_uri = &rel_uri;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "http fancyindex: header subrequest \"%V\"", sr_uri);
-
-        rc = ngx_http_subrequest(r, sr_uri, NULL, &sr, NULL, 0);
-        if (rc == NGX_ERROR || rc == NGX_DONE) {
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                    "http fancyindex: header subrequest for \"%V\" failed", sr_uri);
-            return rc;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "http fancyindex: header subrequest status = %i",
-                sr->headers_out.status);
-        /* ngx_http_subrequest returns NGX_OK(0), not NGX_HTTP_OK(200) */
-        if (sr->headers_out.status != NGX_OK) {
-            /*
-             * XXX: Should we write a message to the error log just in case
-             * we get something different from a 404?
-             */
-            goto add_builtin_header;
-        }
-    }
-    else {
-add_builtin_header:
-        /* Make space before */
-        out[1].next = out[0].next;
-        out[1].buf  = out[0].buf;
-        /* Chain header buffer */
-        out[0].next = &out[1];
-        if (alcf->header.local.len > 0) {
-            /* Header buffer is local, make a buffer pointing to the data. */
-            out[0].buf = ngx_calloc_buf(r->pool);
-            if (out[0].buf == NULL)
-                return NGX_ERROR;
-            out[0].buf->memory = 1;
-            out[0].buf->pos = alcf->header.local.data;
-            out[0].buf->last = alcf->header.local.data + alcf->header.local.len;
-        } else {
-            /* Prepare a buffer with the contents of the builtin header. */
-            out[0].buf = make_header_buf(r, alcf->css_href);
-        }
-    }
-
-    /* If footer is disabled, chain up footer buffer. */
-    if (alcf->footer.path.len == 0 || alcf->footer.local.len > 0) {
-        ngx_uint_t last = (alcf->header.path.len == 0) ? 2 : 1;
-
-        out[last-1].next = &out[last];
-        out[last].buf = ngx_calloc_buf(r->pool);
-        if (out[last].buf == NULL)
-            return NGX_ERROR;
-
-        out[last].buf->memory = 1;
-        if (alcf->footer.local.len > 0) {
-            out[last].buf->pos = alcf->footer.local.data;
-            out[last].buf->last = alcf->footer.local.data + alcf->footer.local.len;
-        } else {
-            out[last].buf->pos = (u_char*) t08_foot1;
-            out[last].buf->last = (u_char*) t08_foot1 + sizeof(t08_foot1) - 1;
-        }
-
-        out[last-1].buf->last_in_chain = 0;
-        out[last].buf->last_in_chain   = 1;
-        out[last].buf->last_buf        = 1;
-        /* Send everything with a single call :D */
-        return ngx_http_output_filter(r, &out[0]);
-    }
-
-    /*
-     * If we reach here, we were asked to send a custom footer. We need to:
-     * partially send whatever is referenced from out[0] and then send the
-     * footer as a subrequest. If the subrequest fails, we should send the
-     * standard footer as well.
-     */
-    rc = ngx_http_output_filter(r, &out[0]);
-
-    if (rc != NGX_OK && rc != NGX_AGAIN)
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-
-    /* URI is configured, make Nginx take care of with a subrequest. */
-    sr_uri = &alcf->footer.path;
-
-    if (*sr_uri->data != '/') {
-        /* Relative path */
-        rel_uri.len  = r->uri.len + alcf->footer.path.len;
-        rel_uri.data = ngx_palloc(r->pool, rel_uri.len);
-        if (rel_uri.data == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-        ngx_memcpy(ngx_cpymem(rel_uri.data, r->uri.data, r->uri.len),
-                alcf->footer.path.data, alcf->footer.path.len);
-        sr_uri = &rel_uri;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "http fancyindex: footer subrequest \"%V\"", sr_uri);
-
-    rc = ngx_http_subrequest(r, sr_uri, NULL, &sr, NULL, 0);
-    if (rc == NGX_ERROR || rc == NGX_DONE) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                "http fancyindex: footer subrequest for \"%V\" failed", sr_uri);
-        return rc;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-            "http fancyindex: header subrequest status = %i",
-            sr->headers_out.status);
-
-    /* see above: ngx_http_subrequest resturns NGX_OK (0) not NGX_HTTP_OK (200) */
-    if (sr->headers_out.status != NGX_OK) {
-        /*
-         * XXX: Should we write a message to the error log just in case
-         * we get something different from a 404?
-         */
-        out[0].next = NULL;
-        out[0].buf = ngx_calloc_buf(r->pool);
-        if (out[0].buf == NULL)
-            return NGX_ERROR;
-        out[0].buf->memory = 1;
-        out[0].buf->pos = (u_char*) t08_foot1;
-        out[0].buf->last = (u_char*) t08_foot1 + sizeof(t08_foot1) - 1;
-        out[0].buf->last_in_chain = 1;
-        out[0].buf->last_buf = 1;
-        /* Directly send out the builtin footer */
-        return ngx_http_output_filter(r, &out[0]);
-    }
-
-    return (r != r->main) ? rc : ngx_http_send_special(r, NGX_HTTP_LAST);
-}
-
-
-static int ngx_libc_cdecl
-ngx_http_fancyindex_cmp_entries_name_desc(const void *one, const void *two)
-{
-    ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
-    ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
-
-    return (int) ngx_strcmp(second->name.data, first->name.data);
-}
-
-
-static int ngx_libc_cdecl
-ngx_http_fancyindex_cmp_entries_size_desc(const void *one, const void *two)
-{
-    ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
-    ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
-
-    return (first->size < second->size) - (first->size > second->size);
-}
-
-
-static int ngx_libc_cdecl
-ngx_http_fancyindex_cmp_entries_mtime_desc(const void *one, const void *two)
-{
-    ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
-    ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
-
-    return (int) (second->mtime - first->mtime);
-}
-
-
-static int ngx_libc_cdecl
-ngx_http_fancyindex_cmp_entries_name_asc(const void *one, const void *two)
-{
-    ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
-    ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
-
-    return (int) ngx_strcmp(first->name.data, second->name.data);
-}
-
-
-static int ngx_libc_cdecl
-ngx_http_fancyindex_cmp_entries_size_asc(const void *one, const void *two)
-{
-    ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
-    ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
-
-    return (first->size > second->size) - (first->size < second->size);
-}
-
-
-static int ngx_libc_cdecl
-ngx_http_fancyindex_cmp_entries_mtime_asc(const void *one, const void *two)
-{
-    ngx_http_fancyindex_entry_t *first = (ngx_http_fancyindex_entry_t *) one;
-    ngx_http_fancyindex_entry_t *second = (ngx_http_fancyindex_entry_t *) two;
-
-    return (int) (first->mtime - second->mtime);
-}
-
-
-static ngx_int_t
-ngx_http_fancyindex_error(ngx_http_request_t *r, ngx_dir_t *dir, ngx_str_t *name)
-{
-    if (ngx_close_dir(dir) == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
-                      ngx_close_dir_n " \"%V\" failed", name);
-    }
-
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-}
-
-
-static void *
-ngx_http_fancyindex_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_http_fancyindex_loc_conf_t  *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_fancyindex_loc_conf_t));
-    if (conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    /*
-     * Set by ngx_pcalloc:
-     *    conf->header.*.len     = 0
-     *    conf->header.*.data    = NULL
-     *    conf->footer.*.len     = 0
-     *    conf->footer.*.data    = NULL
-     *    conf->css_href.len     = 0
-     *    conf->css_href.data    = NULL
-     *    conf->time_format.len  = 0
-     *    conf->time_format.data = NULL
-     */
-    conf->enable         = NGX_CONF_UNSET;
-    conf->default_sort   = NGX_CONF_UNSET_UINT;
-    conf->dirs_first     = NGX_CONF_UNSET;
-    conf->localtime      = NGX_CONF_UNSET;
-    conf->name_length    = NGX_CONF_UNSET_UINT;
-    conf->exact_size     = NGX_CONF_UNSET;
-    conf->ignore         = NGX_CONF_UNSET_PTR;
-    conf->hide_symlinks  = NGX_CONF_UNSET;
-    conf->show_path      = NGX_CONF_UNSET;
-    conf->hide_parent    = NGX_CONF_UNSET;
-    conf->show_dot_files = NGX_CONF_UNSET;
-
-    return conf;
-}
-
-
-static char *
-ngx_http_fancyindex_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_http_fancyindex_loc_conf_t *prev = parent;
-    ngx_http_fancyindex_loc_conf_t *conf = child;
-
-    (void) cf; /* unused */
-
-    ngx_conf_merge_value(conf->enable, prev->enable, 0);
-    ngx_conf_merge_uint_value(conf->default_sort, prev->default_sort, NGX_HTTP_FANCYINDEX_SORT_CRITERION_NAME);
-    ngx_conf_merge_value(conf->dirs_first, prev->dirs_first, 1);
-    ngx_conf_merge_value(conf->localtime, prev->localtime, 0);
-    ngx_conf_merge_value(conf->exact_size, prev->exact_size, 1);
-    ngx_conf_merge_value(conf->show_path, prev->show_path, 1);
-    ngx_conf_merge_value(conf->show_dot_files, prev->show_dot_files, 0);
-    ngx_conf_merge_uint_value(conf->name_length, prev->name_length, 50);
-
-    ngx_conf_merge_str_value(conf->header.path, prev->header.path, "");
-    ngx_conf_merge_str_value(conf->header.path, prev->header.local, "");
-    ngx_conf_merge_str_value(conf->footer.path, prev->footer.path, "");
-    ngx_conf_merge_str_value(conf->footer.path, prev->footer.local, "");
-
-    ngx_conf_merge_str_value(conf->css_href, prev->css_href, "");
-    ngx_conf_merge_str_value(conf->time_format, prev->time_format, "%Y-%b-%d %H:%M");
-
-    ngx_conf_merge_ptr_value(conf->ignore, prev->ignore, NULL);
-    ngx_conf_merge_value(conf->hide_symlinks, prev->hide_symlinks, 0);
-    ngx_conf_merge_value(conf->hide_parent, prev->hide_parent, 0);
-
-    /* Just make sure we haven't disabled the show_path directive without providing a custom header */
-    if (conf->show_path == 0 && conf->header.path.len == 0)
-    {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "FancyIndex : cannot set show_path to off without providing a custom header !");
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static char*
-ngx_http_fancyindex_ignore(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_fancyindex_loc_conf_t *alcf = conf;
-    ngx_str_t *value;
-
-    (void) cmd; /* unused */
-
-#if (NGX_PCRE)
-    ngx_uint_t          i;
-    ngx_regex_elt_t    *re;
-    ngx_regex_compile_t rc;
-    u_char              errstr[NGX_MAX_CONF_ERRSTR];
-
-    if (alcf->ignore == NGX_CONF_UNSET_PTR) {
-        alcf->ignore = ngx_array_create(cf->pool, 2, sizeof(ngx_regex_elt_t));
-        if (alcf->ignore == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    value = cf->args->elts;
-
-    ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
-
-    rc.err.data = errstr;
-    rc.err.len  = NGX_MAX_CONF_ERRSTR;
-    rc.pool     = cf->pool;
-
-    for (i = 1; i < cf->args->nelts; i++) {
-        re = ngx_array_push(alcf->ignore);
-        if (re == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        rc.pattern = value[i];
-        rc.options = NGX_REGEX_CASELESS;
-
-        if (ngx_regex_compile(&rc) != NGX_OK) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
-            return NGX_CONF_ERROR;
-        }
-
-        re->name  = value[i].data;
-        re->regex = rc.regex;
-    }
-
-    return NGX_CONF_OK;
-#else /* !NGX_PCRE */
-    ngx_uint_t i;
-    ngx_str_t *str;
-
-    if (alcf->ignore == NGX_CONF_UNSET_PTR) {
-        alcf->ignore = ngx_array_create(cf->pool, 2, sizeof(ngx_str_t));
-        if (alcf->ignore == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    value = cf->args->elts;
-
-    for (i = 1; i < cf->args->nelts; i++) {
-        str = ngx_array_push(alcf->ignore);
-        if (str == NULL) {
-            return NGX_CONF_ERROR;
-        }
-
-        str->data = value[i].data;
-        str->len  = value[i].len;
-    }
-
-    return NGX_CONF_OK;
-#endif /* NGX_PCRE */
-
-}
-
-
-static ngx_int_t
-ngx_http_fancyindex_init(ngx_conf_t *cf)
-{
-    ngx_http_handler_pt        *h;
-    ngx_http_core_main_conf_t  *cmcf;
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    *h = ngx_http_fancyindex_handler;
-
-    return NGX_OK;
-}
-
-/* vim:et:sw=4:ts=4:
- */
diff --git a/debian/modules/http-fancyindex/t/00-build-artifacts.test b/debian/modules/http-fancyindex/t/00-build-artifacts.test
deleted file mode 100644
index b9bc1ac..0000000
--- a/debian/modules/http-fancyindex/t/00-build-artifacts.test
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/bash
-cat <<---
-This test checks that the built Nginx either has the dynamic fancyindex
-module available, or that it's not there (for static builds).
---
-
-readonly nginx_path="${PREFIX}/sbin/nginx"
-readonly so_path="${PREFIX}/modules/ngx_http_fancyindex_module.so"
-
-if [[ ! -x ${nginx_path} ]] ; then
-	fail "executable binary not found at '%s'\n" "${nginx_path}"
-fi
-
-if ${DYNAMIC} ; then
-	if [[ ! -r ${so_path} ]] ; then
-		fail "module not found at '%s'\n" "${so_path}"
-	fi
-else
-	if [[ -r ${so_path} ]] ; then
-		fail "module should not exist at '%s'\n" "${so_path}"
-	fi
-fi
diff --git a/debian/modules/http-fancyindex/t/01-smoke-hasindex.test b/debian/modules/http-fancyindex/t/01-smoke-hasindex.test
deleted file mode 100644
index 19706a4..0000000
--- a/debian/modules/http-fancyindex/t/01-smoke-hasindex.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/bash
-cat <<---
-This test fetches the root directory served by Nginx, which has no index file,
-and checks that the output contains something that resembles a directory index.
---
-nginx_start
-grep 'Index of' <( fetch )
diff --git a/debian/modules/http-fancyindex/t/02-smoke-indexisfancy.test b/debian/modules/http-fancyindex/t/02-smoke-indexisfancy.test
deleted file mode 100644
index 10cc403..0000000
--- a/debian/modules/http-fancyindex/t/02-smoke-indexisfancy.test
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash
-cat <<---
-This test fetches the root directory served by Nginx, which has no index file,
-and checks that the output contains something that resembles the output from
-the fancyindex module.
---
-nginx_start
-content=$(fetch --with-headers)
-grep 'Index of /' <<< "${content}"  # It is an index
-grep '\<table\>'  <<< "${content}"  # It contains a table
-grep '^  Content-Type:[[:space:]]*text/html' <<< "${content}"
diff --git a/debian/modules/http-fancyindex/t/03-exact_size_off.test b/debian/modules/http-fancyindex/t/03-exact_size_off.test
deleted file mode 100644
index cdc61ec..0000000
--- a/debian/modules/http-fancyindex/t/03-exact_size_off.test
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/bash
-cat <<---
-We test if the output from using "fancyindex_exact_size off" looks sane
---
-nginx_start 'fancyindex_exact_size off;'
-content=$(fetch)
-grep -e '[1-9]\.[0-9] KiB'  <<< "${content}"
-grep -E '[0-9]+ B'  <<< "${content}"
diff --git a/debian/modules/http-fancyindex/t/04-hasindex-html.test b/debian/modules/http-fancyindex/t/04-hasindex-html.test
deleted file mode 100644
index 69ac222..0000000
--- a/debian/modules/http-fancyindex/t/04-hasindex-html.test
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-cat <<---
-This test fetches the root directory served by Nginx, which has no index
-file, and checks the output contains a few HTML elements know to exist in
-a directory index.
---
-use pup
-nginx_start
-
-content=$( fetch )
-
-# Check page title
-[[ $(pup -p title text{} <<< "${content}") = 'Index of /' ]]
-
-# Check table headers
-[[ $(pup -n body table thead th a:first-child <<< "${content}") -eq 3 ]]
-{
-	read -r name_label
-	read -r size_label
-	read -r date_label
-} < <(  pup -p body table thead th a:first-child text{} <<< "${content}" )
-[[ ${name_label} = File\ Name ]]
-[[ ${size_label} = File\ Size ]]
-[[ ${date_label} = Date ]]
diff --git a/debian/modules/http-fancyindex/t/05-sort-by-size.test b/debian/modules/http-fancyindex/t/05-sort-by-size.test
deleted file mode 100644
index 23fade9..0000000
--- a/debian/modules/http-fancyindex/t/05-sort-by-size.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/bash
-cat <<---
-This test validates that the sorting by file size works.
---
-use pup
-nginx_start
-
-# Ascending sort.
-previous=''
-while read -r size ; do
-	if [[ ${size} = - ]] ; then
-		continue
-	fi
-	if [[ -z ${previous} ]] ; then
-		previous=${size}
-		continue
-	fi
-	[[ ${previous} -le ${size} ]] || fail \
-		'Size %d should be smaller than %d\n' "${previous}" "${size}"
-done < <( fetch '/?C=S&O=A' \
-	    | pup -p body table tbody 'td:nth-child(2)' text{} )
-
-# Descending sort.
-previous=''
-while read -r size ; do
-	if [[ ${size} = - ]] ; then
-		continue
-	fi
-	if [[ -z ${previous} ]] ; then
-		previous=${size}
-		continue
-	fi
-	[[ ${previous} -ge ${size} ]] || fail \
-		'Size %d should be greater than %d\n' "${previous}" "${size}"
-done < <( fetch '/?C=S&O=D' \
-	    | pup -p body table tbody 'td:nth-child(2)' text{} )
diff --git a/debian/modules/http-fancyindex/t/06-hide_parent.test b/debian/modules/http-fancyindex/t/06-hide_parent.test
deleted file mode 100644
index 494c958..0000000
--- a/debian/modules/http-fancyindex/t/06-hide_parent.test
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/bash
-cat <<---
-This test check the output using "fancyindex_hide_parent_dir on"
---
-use pup
-nginx_start 'fancyindex_hide_parent_dir on;'
-
-content=$( fetch /child-directory/ )
-
-# Check page title
-[[ $(pup -p title text{} <<< "${content}") = "Index of /child-directory/" ]]
-
-# Check table headers
-[[ $(pup -n body table tbody tr:first-child td <<< "${content}") -eq 3 ]]
-{
-	read -r name_label
-	read -r size_label
-	read -r date_label
-} < <(  pup -p body table tbody tr:first-child td text{} <<< "${content}" )
-[[ ${name_label} != Parent\ Directory/ ]]
-[[ ${name_label} = empty-file.txt ]]
-[[ ${size_label} != - ]]
-[[ ${date_label} != - ]]
diff --git a/debian/modules/http-fancyindex/t/07-directory-first.test b/debian/modules/http-fancyindex/t/07-directory-first.test
deleted file mode 100644
index 82c37cc..0000000
--- a/debian/modules/http-fancyindex/t/07-directory-first.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/bash
-cat <<---
-This test check the output using "fancyindex_directories_first on"
---
-use pup
-
-for d in "008d" "000d" "004d" ; do
-	mkdir -p "${TESTDIR}/dir_first/${d}"
-done
-for f in "005f" "001f" "003f"; do
-	touch "${TESTDIR}/dir_first/${f}"
-done
-for d in "006d" "002d" ; do
-	mkdir -p "${TESTDIR}/dir_first/${d}"
-done
-
-nginx_start 'fancyindex_directories_first on;'
-previous=''
-cur_type=''
-while read -r name ; do
-	case "$name" in
-	*Parent*)
-		;;
-	*d*)
-		echo "dir $name"
-		[[ "$cur_type" = f ]] && fail 'Directories should come before Files'
-		cur_type=d
-		if [[ -z ${previous} ]] ; then
-			previous=${name}
-		else
-			[[ ${previous} < ${name} ]] || fail \
-				'Name %s should come before %s\n' "${previous}" "${name}"
-		fi
-		;;
-	*f*)
-		echo "file $name"
-		[[ -z "$cur_type" ]] && fail 'Directories should come before Files'
-		if [[ "$cur_type" = d ]] ; then
-			cur_type=f
-			previous=${name}
-		else
-			[[ ${previous} < ${name} ]] || fail \
-				'Name %s should come before %s\n' "${previous}" "${name}"
-		fi
-		;;
-	esac
-done < <( fetch '/dir_first/' \
-		| pup -p body table tbody 'td:nth-child(1)' text{} )
-
-nginx_is_running || fail "Nginx died"
diff --git a/debian/modules/http-fancyindex/t/07-show_dotfiles.test b/debian/modules/http-fancyindex/t/07-show_dotfiles.test
deleted file mode 100644
index 6b56410..0000000
--- a/debian/modules/http-fancyindex/t/07-show_dotfiles.test
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/bash
-cat <<---
-Test the option to show dotfiles.
---
-# Turn it on.
-nginx_start 'fancyindex_show_dotfiles on;'
-on_content=$(fetch /show_dotfiles/)
-nginx_stop
-if [ $(grep '.okay'  <<< "${on_content}") -ne 0 ] ; then
-    exit 1
-fi
-
-# Turn it off.
-nginx_start
-off_content=$(fetch /show_dotfiles/)
-nginx_stop
-if [ $(grep '.okay'  <<< "${on_content}") -eq 0] ; then
-    exit 1
-fi
-
-exit 0
diff --git a/debian/modules/http-fancyindex/t/08-local-footer.test b/debian/modules/http-fancyindex/t/08-local-footer.test
deleted file mode 100644
index 6d6318b..0000000
--- a/debian/modules/http-fancyindex/t/08-local-footer.test
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/bash
-cat <<---
-This test checks that a local footer can be included with
-"fancyindex_header ... local"
---
-use pup
-
-cat > "${TESTDIR}/footer" <<EOF
-<div id="customfooter">yes</div>
-EOF
-
-nginx_start "fancyindex_footer \"${TESTDIR}/footer\" local;"
-
-T=$(fetch / | pup -p body 'div#customfooter' text{})
-[[ $T == yes ]] ||  fail 'Custom header missing'
-
-nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/09-local-header.test b/debian/modules/http-fancyindex/t/09-local-header.test
deleted file mode 100644
index 455b966..0000000
--- a/debian/modules/http-fancyindex/t/09-local-header.test
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/bash
-cat <<---
-This test checks that a local header can be included with
-"fancyindex_header ... local"
---
-use pup
-
-cat > "${TESTDIR}/header" <<EOF
-<div id="customheader">yes</div>
-EOF
-
-nginx_start "fancyindex_header \"${TESTDIR}/header\" local;"
-
-T=$(fetch / | pup -p body 'div#customheader' text{})
-[[ $T == yes ]] ||  fail 'Custom header missing'
-
-nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/10-local-headerfooter.test b/debian/modules/http-fancyindex/t/10-local-headerfooter.test
deleted file mode 100644
index 6adfb45..0000000
--- a/debian/modules/http-fancyindex/t/10-local-headerfooter.test
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/bash
-cat <<---
-This test checks that both a local header and footer can be included with
-"fancyindex_{header,footer} ... local"
---
-use pup
-
-cat > "${TESTDIR}/header" <<EOF
-<div id="customheader">yes</div>
-EOF
-cat > "${TESTDIR}/footer" <<EOF
-<div id="customfooter">yes</div>
-EOF
-
-nginx_start "fancyindex_header \"${TESTDIR}/header\" local;
-             fancyindex_footer \"${TESTDIR}/footer\" local;"
-
-P=$(fetch /)
-
-H=$(pup -p body 'div#customheader' text{} <<< "$P")
-[[ $H == yes ]] ||  fail 'Custom header missing'
-
-F=$(pup -p body 'div#customfooter' text{} <<< "$P")
-[[ $F == yes ]] || fail 'Custom footer missing'
-
-nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/11-local-footer-nested.test b/debian/modules/http-fancyindex/t/11-local-footer-nested.test
deleted file mode 100644
index 0530853..0000000
--- a/debian/modules/http-fancyindex/t/11-local-footer-nested.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/bash
-cat <<---
-This test checks that local footers are correctly included in presence of
-directives in nested locations:
-
-	fancyindex_footer <one> local;
-	location /sub {
-		fancyindex_footer <another> local;
-	}
-
---
-use pup
-
-echo '<div id="topfooter">yes</div>' > "${TESTDIR}/top-footer"
-echo '<div id="subfooter">yes</div>' > "${TESTDIR}/sub-footer"
-
-nginx_start "fancyindex_footer \"${TESTDIR}/top-footer\" local;
-             location /child-directory {
-			    fancyindex_footer \"${TESTDIR}/sub-footer\" local;
-			 }"
-
-T=$(fetch /)
-echo "$T" > "$TESTDIR/top.html"
-[[ $(pup -p body 'div#topfooter' text{} <<< "$T") = yes ]] || fail 'Custom header missing at /'
-[[ -z $(pup -p body 'div#subfooter' text{} <<< "$T") ]] || fail 'Wrong header at /'
-
-T=$(fetch /child-directory/)
-[[ $(pup -p body 'div#subfooter' text{} <<< "$T") = yes ]] || fail 'Custom header missing at /sub/'
-[[ -z $(pup -p body 'div#topfooter' text{} <<< "$T") ]] || fail 'Wrong header at /sub/'
-
-nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/12-local-footer-nested.test b/debian/modules/http-fancyindex/t/12-local-footer-nested.test
deleted file mode 100644
index 7c0aef7..0000000
--- a/debian/modules/http-fancyindex/t/12-local-footer-nested.test
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash
-cat <<---
-This test checks that the configuration file is properly parsed if there
-is only one parameter passed to the fancyndex_header and fancyindex_footer
-configuration directives.
---
-
-nginx_start 'fancyindex_header "/header";
-	         fancyindex_footer "/footer";'
-
-nginx_is_running || fail 'Nginx died'
diff --git a/debian/modules/http-fancyindex/t/bug61-empty-file-segfault.test b/debian/modules/http-fancyindex/t/bug61-empty-file-segfault.test
deleted file mode 100644
index d9c5a40..0000000
--- a/debian/modules/http-fancyindex/t/bug61-empty-file-segfault.test
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/bash
-cat <<---
-Bug #61: Listing a directory with an empty file crashes Nginx
-https://github.com/aperezdc/ngx-fancyindex/issues/61
---
-
-# Prepare an empty directory with an empty file
-mkdir -p "${TESTDIR}/bug61"
-touch "${TESTDIR}/bug61/bug61.txt"
-
-nginx_start 'fancyindex_exact_size off;'
-content=$(fetch /bug61/)
-test -n "${content}" || fail "Empty response"
-echo "Response:"
-echo "${content}"
-nginx_is_running || fail "Nginx died"
diff --git a/debian/modules/http-fancyindex/t/bug95-square-brackets.test b/debian/modules/http-fancyindex/t/bug95-square-brackets.test
deleted file mode 100644
index 16e1ddc..0000000
--- a/debian/modules/http-fancyindex/t/bug95-square-brackets.test
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/bash
-cat <<---
-Bug #95: FancyIndex does not encode square brackets
-https://github.com/aperezdc/ngx-fancyindex/issues/95
---
-use pup
-
-# Prepare a directory with a file that contains square brackets in the name.
-mkdir -p "${TESTDIR}/bug95"
-touch "${TESTDIR}"/bug95/'bug[95].txt'
-
-nginx_start
-content=$(fetch /bug95/)
-test -n "${content}" || fail 'Empty response'
-
-expected_href='bug%5B95%5D.txt'
-obtained_href=$(pup -p body tbody 'tr:nth-child(2)' a 'attr{href}' <<< "${content}")
-test "${expected_href}" = "${obtained_href}" || \
-	fail 'Expected: %s - Obtained: %s' "${expected_href}" "${obtained_href}"
diff --git a/debian/modules/http-fancyindex/t/build-and-run b/debian/modules/http-fancyindex/t/build-and-run
deleted file mode 100755
index 68584b7..0000000
--- a/debian/modules/http-fancyindex/t/build-and-run
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-set -e
-
-if [[ $# -lt 1 || $# -gt 2 ]] ; then
-	echo "Usage: $0 <nginx-version> [1]" 1>&2
-	exit 1
-fi
-
-readonly NGINX=$1
-
-if [[ $2 -eq 1 ]] ; then
-	readonly DYNAMIC=$2
-fi
-
-cd "$(dirname "$0")/.."
-wget -O - http://nginx.org/download/nginx-${NGINX}.tar.gz | tar -xzf -
-rm -rf prefix/
-cd nginx-${NGINX}
-./configure \
-	--add-${DYNAMIC:+dynamic-}module=.. \
-	--with-http_addition_module \
-	--prefix="$(pwd)/../prefix"
-make install
-cd ..
-exec ./t/run prefix ${DYNAMIC}
diff --git a/debian/modules/http-fancyindex/t/child-directory/empty-file.txt b/debian/modules/http-fancyindex/t/child-directory/empty-file.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/modules/http-fancyindex/t/get-pup b/debian/modules/http-fancyindex/t/get-pup
deleted file mode 100755
index 613dac7..0000000
--- a/debian/modules/http-fancyindex/t/get-pup
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/bash
-set -e
-
-declare -r VERSION='0.4.0'
-declare -r SHASUMS='\
-75c27caa0008a9cc639beb7506077ad9f32facbffcc4e815e999eaf9588a527e  pup_v0.4.0_darwin_386.zip
-c539a697efee2f8e56614a54cb3b215338e00de1f6a7c2fa93144ab6e1db8ebe  pup_v0.4.0_darwin_amd64.zip
-259eee82c7d7d766f1b8f93a382be21dcfefebc855a9ce8124fd78717f9df439  pup_v0.4.0_dragonfly_amd64.zip
-ba0fe5e87a24cab818e5d2efdd7540714ddfb1b7246600135915c666fdf1a601  pup_v0.4.0_freebsd_386.zip
-1838ef84ec1f961e8009d19a4d1e6a23b926ee315da3d60c08878f3d69af5692  pup_v0.4.0_freebsd_amd64.zip
-6886a9c60a912a810d012610bc3f784f0417999ff7d7df833a0695b9af60395b  pup_v0.4.0_freebsd_arm.zip
-e486b32ca07552cd3aa713cbf2f9d1b6e210ddb51d34b3090c7643f465828057  pup_v0.4.0_linux_386.zip
-ec3d29e9fb375b87ac492c8b546ad6be84b0c0b49dab7ff4c6b582eac71ba01c  pup_v0.4.0_linux_amd64.zip
-c09b669fa8240f4f869dee7d34ee3c7ea620a0280cee1ea7d559593bcdd062c9  pup_v0.4.0_linux_arm64.zip
-ebf70b3c76c02e0202c94af7ef06dcb3ecc866d1b9b84453d43fe01fa5dd5870  pup_v0.4.0_linux_arm.zip
-a98a4d1f3c3a103e8ebe1a7aba9cb9d3cb045003208ca6f5f3d54889a225f267  pup_v0.4.0_linux_mips64le.zip
-8e471cf6cfa118b2497bb3f42a7a48c52d0096107f748f37216855c8ab94f8e5  pup_v0.4.0_linux_mips64.zip
-cfda9375eba65f710e052b1b59893c228c3fc92b0510756bb3f02c25938eee30  pup_v0.4.0_linux_ppc64le.zip
-91a1e07ffb2c373d6053252e4de732f5db78c8eace49c6e1a0ef52402ecdf56c  pup_v0.4.0_linux_ppc64.zip
-fdc9b28a3daac5ad096023e1647292a7eccea6d9b1686f871307dae9f3bd064f  pup_v0.4.0_nacl_386.zip
-c8d3c9b56783bd5a55446f4580e1835606b2b945da2d1417ed509c5927a5f8bc  pup_v0.4.0_nacl_amd64p32.zip
-48c068c4353672528c8c3447a536208b0719f1e6d0f8fab8416b38b63ad0c1d9  pup_v0.4.0_nacl_arm.zip
-7a27497b2f0be95c51bb2cbc25da12efba682c4f766bc5abc5742e9fc8d1eeb0  pup_v0.4.0_netbsd_386.zip
-71a1808eb1b6442aa45d1de9e1c4fca543b2754c1aff5ba3d62b3456f9519691  pup_v0.4.0_netbsd_amd64.zip
-928e6691b11c68ae3f28826848a13dc5c1c9673848fe7cf7f80dd76c9fb6e8a6  pup_v0.4.0_netbsd_arm.zip
-5aca20a9b3264d2fde5a8d32f213c434edf9570ee6fae18953b8fff09d2976e2  pup_v0.4.0_openbsd_386.zip
-e965c6f04b897240d84c60e2c18226deb231a657c5583680f58a61051ff5a100  pup_v0.4.0_openbsd_amd64.zip
-30bc88a1e06606f4f3449af9fbf586f97c2e958677460a72bb1a168f67c4911c  pup_v0.4.0_openbsd_arm.zip
-9d50decf4572292f187cfec84660648d648336bc6109e1f032b1699ba1d28549  pup_v0.4.0_plan9_386.zip
-1b2a6bd2388ddd691ca429497d88b2b047ec8dfb7bce9436925cb2f30632bf8e  pup_v0.4.0_plan9_amd64.zip
-0835de9c10a9e2b3b958b82d148da49eaafc695fe4a018cbaf7bb861b455583f  pup_v0.4.0_solaris_amd64.zip
-01acae220b69fb1ba8477d0e7f4d7669ef5de147966dc819cf75a845af74c5f3  pup_v0.4.0_windows_386.zip
-6755cbd43e94eaf173689e93e914c7056a2249c2977e5b90024fb397f9b45ba4  pup_v0.4.0_windows_amd64.zip
-'
-
-declare -r BASEURL="https://github.com/ericchiang/pup/releases/download/v${VERSION}"
-declare -r TDIR=$(dirname "$0")
-ARCH=''
-OS=''
-
-case $(uname -m) in
-	x86_64 | amd64 ) ARCH=amd64 ;;
-	i[3456]86 ) ARCH=386 ;;
-esac
-
-OS=$(uname -s | tr 'A-Z' 'a-z')
-case ${OS} in
-	linux | freebsd | openbsd | netbsd | darwin ) ;;
-	* ) OS=''
-esac
-
-if [[ -z ${ARCH} || -z ${OS} ]] ; then
-	echo "pup ${VERSION} is not available for $(uname -s) on $(uname -m)" 1>&2
-	exit 1
-fi
-
-declare -r ZIPFILE="pup_v${VERSION}_${OS}_${ARCH}.zip"
-EXPECT_SHA=''
-
-while read sum fname ; do
-	if [[ ${fname} = ${ZIPFILE} ]] ; then
-		EXPECT_SHA=${sum}
-		break
-	fi
-done <<< "${SHASUMS}"
-
-wget -cO "${TDIR}/${ZIPFILE}" "${BASEURL}/${ZIPFILE}"
-
-read -r GOT_SHA _ < <( sha256sum "${TDIR}/${ZIPFILE}" )
-if [[ ${EXPECT_SHA} = ${GOT_SHA} ]] ; then
-	echo "Checksum for ${ZIPFILE} verified :-)"
-else
-	rm -f "${TDIR}/${ZIPFILE}" "${TDIR}/pup"
-	echo "Checksum for ${ZIPFILE} does not match :-("
-	echo "   Expected: ${EXPECT_SHA}"
-	echo "        Got: ${GOT_SHA}"
-	exit 2
-fi 1>&2
-
-rm -f "${TDIR}/pup"
-unzip "${TDIR}/${ZIPFILE}" pup -d "${TDIR}"
diff --git a/debian/modules/http-fancyindex/t/has-index.test b/debian/modules/http-fancyindex/t/has-index.test
deleted file mode 100644
index cf34207..0000000
--- a/debian/modules/http-fancyindex/t/has-index.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/bash
-cat <<---
-This test ensures that the "index.html" is returned instead of a directory
-listing when fetching a directory which contains an index file.
---
-nginx_start
-diff -u "${TESTDIR}/has-index/index.html" <( fetch /has-index/ ) 1>&2
diff --git a/debian/modules/http-fancyindex/t/has-index/index.html b/debian/modules/http-fancyindex/t/has-index/index.html
deleted file mode 100644
index 419ae86..0000000
--- a/debian/modules/http-fancyindex/t/has-index/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-        <meta charset="utf-8" />
-		<title>Index file test</title>
-	</head>
-	<body>
-		This is <code>index.html</code>.
-	</body>
-</html>
diff --git a/debian/modules/http-fancyindex/t/nginx.conf b/debian/modules/http-fancyindex/t/nginx.conf
deleted file mode 100644
index 2b99a3d..0000000
--- a/debian/modules/http-fancyindex/t/nginx.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-worker_processes  1;
-
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-    sendfile        on;
-    keepalive_timeout  65;
-    server {
-        listen       80;
-        server_name  localhost;
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-    }
-}
diff --git a/debian/modules/http-fancyindex/t/preamble b/debian/modules/http-fancyindex/t/preamble
deleted file mode 100644
index 26f2819..0000000
--- a/debian/modules/http-fancyindex/t/preamble
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/bash
-#
-# preamble
-# Copyright (C) 2016 Adrian Perez <aperez@igalia.com>
-#
-# Distributed under terms of the MIT license.
-#
-
-function nginx_conf_generate () {
-	if ${DYNAMIC} ; then
-		echo 'load_module modules/ngx_http_fancyindex_module.so;'
-	fi
-	cat <<-EOF
-	worker_processes 1;
-	events { worker_connections 1024; }
-	http {
-		include mime.types;
-		default_type application/octet-stream;
-		sendfile on;
-		keepalive_timeout 65;
-		server {
-			server_name localhost;
-			listen 127.0.0.1:${NGINX_PORT};
-			root ${TESTDIR};
-			error_page 500 502 503 504 /50x.html;
-			location = /50x.html { root html; }
-			location / {
-				index index.html;
-				fancyindex on;
-				$*
-			}
-		}
-	}
-	EOF
-}
-
-readonly NGINX_CONF="${PREFIX}/conf/nginx.conf"
-readonly NGINX_PID="${PREFIX}/logs/nginx.pid"
-
-NGINX_PORT=$(ss -4Htnl | awk '{ sub("[^:]+:", "", $4) ; seen[$4]=1 }
-END { p=1025 ; while (seen[p]) p++; print p}')
-readonly NGINX_PORT
-
-rm -f "${NGINX_CONF}" "${NGINX_PID}"
-mkdir -p "${PREFIX}/logs"
-
-function pup () {
-	if [[ -x ${TESTDIR}/pup ]] ; then
-		"${TESTDIR}/pup" "$@"
-	else
-		skip 'Test uses "pup", which is not available'
-	fi
-}
-
-function use () {
-	case $1 in
-		pup ) [[ -x ${TESTDIR}/pup ]] \
-			|| skip 'Test uses "pup", which is unavailable\n' ;;
-		* ) warn "Invalid 'use' flag: '%s'\n'" "$1" ;;
-	esac
-}
-
-function nginx () {
-	env - PATH="${PATH}" "${PREFIX}/sbin/nginx" "$@"
-}
-
-function nginx_conf () {
-	nginx_conf_generate "$@" > "${NGINX_CONF}"
-}
-
-function nginx_is_running () {
-	[[ -r ${NGINX_PID} ]] && kill -0 $(< "${NGINX_PID}")
-}
-
-function nginx_stop () {
-	if nginx_is_running ; then nginx -s stop ; fi
-	rm -f "${NGINX_PID}"
-}
-trap nginx_stop EXIT
-
-function nginx_start () {
-	if [[ $# -gt 0 || ! -r ${NGINX_CONF} ]] ; then nginx_conf "$@" ; fi
-	nginx_stop  # Ensure that it is not running.
-	nginx
-}
-
-function fetch () {
-	local -a opts=( -q )
-	if [[ $1 = --with-headers ]] ; then
-		opts+=( -S )
-		shift
-	fi
-	wget "${opts[@]}" -O- "http://localhost:${NGINX_PORT}${1:-/}" 2>&1
-}
-
-function skip () {
-	printf '(--) '
-	printf "$@"
-	exit 111
-} 1>&2
-
-function fail () {
-	printf '(FF) '
-	printf "$@"
-	exit 1
-} 1>&2
-
-function warn () {
-	printf '(WW) '
-	printf "$@"
-} 1>&2
diff --git a/debian/modules/http-fancyindex/t/run b/debian/modules/http-fancyindex/t/run
deleted file mode 100755
index 9988fa2..0000000
--- a/debian/modules/http-fancyindex/t/run
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-set -e
-
-if [[ $# -lt 1 || $# -gt 2 ]] ; then
-	echo "Usage: $0 <prefix-path> [1]" 1>&2
-	exit 1
-fi
-
-# Obtain the absolute path to the tests directory
-pushd "$(dirname "$0")" &> /dev/null
-readonly T=$(pwd)
-popd &> /dev/null
-export T
-
-# Same for the nginx prefix directory
-pushd "$1" &> /dev/null
-readonly prefix=$(pwd)
-popd &> /dev/null
-
-dynamic=false
-if [[ $# -gt 1 && $2 -eq 1 ]] ; then
-	dynamic=true
-fi
-readonly dynamic
-
-declare -a t_pass=( )
-declare -a t_fail=( )
-declare -a t_skip=( )
-
-for t in `ls "$T"/*.test | sort -R` ; do
-	name="t/${t##*/}"
-	name=${name%.test}
-	printf "${name} ... "
-	errfile="${name}.err"
-	outfile="${name}.out"
-	shfile="${name}.sh"
-	cat > "${shfile}" <<-EOF
-	readonly DYNAMIC=${dynamic}
-	readonly TESTDIR='$T'
-	readonly PREFIX='${prefix}'
-	$(< "$T/preamble")
-	$(< "$t")
-	EOF
-	if bash -e "${shfile}" > "${outfile}" 2> "${errfile}" ; then
-		t_pass+=( "${name}" )
-		printf 'passed\n'
-	elif [[ $? -eq 111 ]] ; then
-		t_skip+=( "${name}" )
-		printf 'skipped\n'
-	else
-		t_fail+=( "${name}" )
-		printf 'failed\n'
-	fi
-done
-
-for name in "${t_fail[@]}" ; do
-	echo
-	printf '=== %s.out\n' "${name}"
-	cat "${name}.out"
-	echo
-	printf '=== %s.err\n' "${name}"
-	cat "${name}.err"
-	echo
-done
-
-if [[ ${#t_skip[@]} -gt 0 ]] ; then
-	echo
-	printf 'Skipped tests:\n'
-	for name in "${t_skip[@]}" ; do
-		reason=$(grep '^(\-\-) ' "${name}.err" | head -1)
-		if [[ -z ${reason} ]] ; then
-			reason='No reason given'
-		else
-			reason=${reason:5}
-		fi
-		printf ' - %s: %s\n' "${name}" "${reason:-No reason given}"
-	done
-	echo
-fi
-
-printf '=== passed/skipped/failed/total: %d/%d/%d/%d\n' \
-	${#t_pass[@]} ${#t_skip[@]} ${#t_fail[@]} $(( ${#t_pass[@]} + ${#t_fail[@]} ))
-
-if [[ ${#t_fail[@]} -gt 0 ]] ; then
-	exit 1
-fi
diff --git a/debian/modules/http-fancyindex/t/show_dotfiles/.okay b/debian/modules/http-fancyindex/t/show_dotfiles/.okay
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/modules/http-fancyindex/template.awk b/debian/modules/http-fancyindex/template.awk
deleted file mode 100755
index f9ec4a6..0000000
--- a/debian/modules/http-fancyindex/template.awk
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /usr/bin/awk -f
-#
-# Copyright © Adrian Perez <aperez@igalia.com>
-#
-# Converts an HTML template into a C header suitable for inclusion.
-# Take a look at the HACKING.rst file to know how to use it :-)
-#
-# This code is placed in the public domain.
-
-BEGIN {
-	varname = 0;
-	print "/* Automagically generated, do not edit! */"
-	vars_count = 0;
-}
-
-/^<!--[[:space:]]*var[[:space:]]+[^[:space:]]+[[:space:]]*-->$/ {
-	if (varname) print ";";
-	if ($3 == "NONE") {
-		varname = 0;
-		next;
-	}
-	varname = $3;
-	vars[vars_count++] = varname;
-	print "static const u_char " varname "[] = \"\"";
-	next;
-}
-
-/^$/ {
-	if (!varname) next;
-	print "\"\\n\"";
-	next;
-}
-
-{
-	if (!varname) next;
-	# Order matters
-	gsub(/[\t\v\n\r\f]+/, "");
-	gsub(/\\/, "\\\\");
-	gsub(/"/, "\\\"");
-	print "\"" $0 "\""
-}
-
-
-END {
-	if (varname) print ";";
-	print "#define NFI_TEMPLATE_SIZE (0 \\";
-	for (var in vars) {
-		print "\t+ nfi_sizeof_ssz(" vars[var] ") \\";
-	}
-	print "\t)"
-}
-
diff --git a/debian/modules/http-fancyindex/template.h b/debian/modules/http-fancyindex/template.h
deleted file mode 100644
index 2d6604b..0000000
--- a/debian/modules/http-fancyindex/template.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Automagically generated, do not edit! */
-static const u_char t01_head1[] = ""
-"<!DOCTYPE html>"
-"<html>"
-"<head>"
-"<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">"
-"<meta name=\"viewport\" content=\"width=device-width\">"
-"<style type=\"text/css\">"
-"body,html {"
-"background:#fff;"
-"font-family:\"Bitstream Vera Sans\",\"Lucida Grande\","
-"\"Lucida Sans Unicode\",Lucidux,Verdana,Lucida,sans-serif;"
-"}"
-"tr:nth-child(even) {"
-"background:#f4f4f4;"
-"}"
-"th,td {"
-"padding:0.1em 0.5em;"
-"}"
-"th {"
-"text-align:left;"
-"font-weight:bold;"
-"background:#eee;"
-"border-bottom:1px solid #aaa;"
-"}"
-"#list {"
-"border:1px solid #aaa;"
-"width:100%;"
-"}"
-"a {"
-"color:#a33;"
-"}"
-"a:hover {"
-"color:#e33;"
-"}"
-"</style>"
-"\n"
-;
-static const u_char t02_head2[] = ""
-"\n"
-"<title>Index of "
-;
-static const u_char t03_head3[] = ""
-"</title>"
-"\n"
-"</head>"
-;
-static const u_char t04_body1[] = ""
-"<body>"
-"<h1>Index of "
-;
-static const u_char t05_body2[] = ""
-"</h1>"
-"\n"
-;
-static const u_char t06_list1[] = ""
-"<table id=\"list\">"
-"<thead>"
-"<tr>"
-"<th style=\"width:55%\"><a href=\"?C=N&amp;O=A\">File Name</a>&nbsp;<a href=\"?C=N&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
-"<th style=\"width:20%\"><a href=\"?C=S&amp;O=A\">File Size</a>&nbsp;<a href=\"?C=S&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
-"<th style=\"width:25%\"><a href=\"?C=M&amp;O=A\">Date</a>&nbsp;<a href=\"?C=M&amp;O=D\">&nbsp;&darr;&nbsp;</a></th>"
-"</tr>"
-"</thead>"
-"\n"
-"<tbody>"
-;
-static const u_char t_parentdir_entry[] = ""
-"<tr>"
-"<td class=\"link\"><a href=\"../?C=N&amp;O=A\">Parent directory/</a></td>"
-"<td class=\"size\">-</td>"
-"<td class=\"date\">-</td>"
-"</tr>"
-"\n"
-;
-static const u_char t07_list2[] = ""
-"</tbody>"
-"</table>"
-;
-static const u_char t08_foot1[] = ""
-"</body>"
-"</html>"
-;
-#define NFI_TEMPLATE_SIZE (0 \
-	+ nfi_sizeof_ssz(t01_head1) \
-	+ nfi_sizeof_ssz(t02_head2) \
-	+ nfi_sizeof_ssz(t03_head3) \
-	+ nfi_sizeof_ssz(t04_body1) \
-	+ nfi_sizeof_ssz(t05_body2) \
-	+ nfi_sizeof_ssz(t06_list1) \
-	+ nfi_sizeof_ssz(t_parentdir_entry) \
-	+ nfi_sizeof_ssz(t07_list2) \
-	+ nfi_sizeof_ssz(t08_foot1) \
-	)
diff --git a/debian/modules/http-fancyindex/template.html b/debian/modules/http-fancyindex/template.html
deleted file mode 100644
index b2a3174..0000000
--- a/debian/modules/http-fancyindex/template.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- var t01_head1 -->
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8">
-		<meta name="viewport" content="width=device-width">
-		<style type="text/css">
-			body,html {
-				background:#fff;
-				font-family:"Bitstream Vera Sans","Lucida Grande",
-					"Lucida Sans Unicode",Lucidux,Verdana,Lucida,sans-serif;
-			}
-			tr:nth-child(even) {
-				background:#f4f4f4;
-			}
-			th,td {
-				padding:0.1em 0.5em;
-			}
-			th {
-				text-align:left;
-				font-weight:bold;
-				background:#eee;
-				border-bottom:1px solid #aaa;
-			}
-			#list {
-				border:1px solid #aaa;
-				width:100%;
-			}
-			a {
-				color:#a33;
-			}
-			a:hover {
-				color:#e33;
-			}
-		</style>
-
-<!-- var t02_head2 -->
-
-		<title>Index of 
-<!-- var NONE -->
-			/path/to/somewhere
-<!-- var t03_head3 -->
-		</title>
-
-	</head>
-<!-- var t04_body1 -->
-	<body>
-		<h1>Index of 
-<!-- var NONE -->
-			/path/to/somewhere
-<!-- var t05_body2 -->
-		</h1>
-
-<!-- var t06_list1 -->
-		<table id="list">
-			<thead>
-				<tr>
-					<th style="width:55%"><a href="?C=N&amp;O=A">File Name</a>&nbsp;<a href="?C=N&amp;O=D">&nbsp;&darr;&nbsp;</a></th>
-					<th style="width:20%"><a href="?C=S&amp;O=A">File Size</a>&nbsp;<a href="?C=S&amp;O=D">&nbsp;&darr;&nbsp;</a></th>
-					<th style="width:25%"><a href="?C=M&amp;O=A">Date</a>&nbsp;<a href="?C=M&amp;O=D">&nbsp;&darr;&nbsp;</a></th>
-				</tr>
-			</thead>
-
-			<tbody>
-<!-- var t_parentdir_entry -->
-				<tr>
-					<td class="link"><a href="../?C=N&amp;O=A">Parent directory/</a></td>
-					<td class="size">-</td>
-					<td class="date">-</td>
-				</tr>
-
-<!-- var NONE -->
-				<tr>
-					<td>test file 1</td>
-					<td>123kB</td>
-					<td>date</td>
-				</tr>
-				<tr>
-					<td>test file 2</td>
-					<td>321MB</td>
-					<td>date</td>
-				</tr>
-				<tr>
-					<td>test file 3</td>
-					<td>666</td>
-					<td>date</td>
-				</tr>
-<!-- var t07_list2 -->
-			</tbody>
-		</table>
-<!-- var t08_foot1 -->
-	</body>
-</html>
diff --git a/debian/modules/http-geoip2/LICENSE b/debian/modules/http-geoip2/LICENSE
deleted file mode 100644
index fdc13a7..0000000
--- a/debian/modules/http-geoip2/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2014, Lee Valentine <lee@leev.net>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/modules/http-geoip2/README.md b/debian/modules/http-geoip2/README.md
deleted file mode 100644
index a5aec97..0000000
--- a/debian/modules/http-geoip2/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-Description
-===========
-
-**ngx_http_geoip2_module** - creates variables with values from the maxmind geoip2 databases based on the client IP (default) or from a specific variable (supports both IPv4 and IPv6)
-
-The module now supports nginx streams and can be used in the same way the http module can be used.
-
-## Installing
-First install [libmaxminddb](https://github.com/maxmind/libmaxminddb) as described in its [README.md
-file](https://github.com/maxmind/libmaxminddb/blob/master/README.md#installing-from-a-tarball).
-
-#### Download nginx source
-```
-wget http://nginx.org/download/nginx-VERSION.tar.gz
-tar zxvf nginx-VERSION.tar.gz
-cd nginx-VERSION
-```
-
-##### To build as a dynamic module (nginx 1.9.11+):
-```
-./configure --add-dynamic-module=/path/to/ngx_http_geoip2_module
-make
-make install
-```
-
-This will produce ```objs/ngx_http_geoip2_module.so```. It can be copied to your nginx module path manually if you wish.
-
-Add the following line to your nginx.conf:
-```
-load_module modules/ngx_http_geoip2_module.so;
-```
-
-##### To build as a static module:
-```
-./configure --add-module=/path/to/ngx_http_geoip2_module
-make
-make install
-```
-
-## Download Maxmind GeoLite2 Database (optional)
-The free GeoLite2 databases are available from [Maxminds website](http://dev.maxmind.com/geoip/geoip2/geolite2/)
-
-[GeoLite2 City](http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz)
-[GeoLite2 Country](http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz)
-
-## Example Usage:
-```
-http {
-    ...
-    geoip2 /etc/maxmind-country.mmdb {
-        auto_reload 5m;
-        $geoip2_metadata_country_build metadata build_epoch;
-        $geoip2_data_country_code default=US source=$variable_with_ip country iso_code;
-        $geoip2_data_country_name country names en;
-    }
-
-    geoip2 /etc/maxmind-city.mmdb {
-        $geoip2_data_city_name default=London city names en;
-    }
-    ....
-
-    fastcgi_param COUNTRY_CODE $geoip2_data_country_code;
-    fastcgi_param COUNTRY_NAME $geoip2_data_country_name;
-    fastcgi_param CITY_NAME    $geoip2_data_city_name;
-    ....
-}
-
-stream {
-    ...
-    geoip2 /etc/maxmind-country.mmdb {
-        $geoip2_data_country_code default=US source=$remote_addr country iso_code;
-    }
-    ...
-}
-```
-
-##### Metadata:
-Retrieve metadata regarding the geoip database.
-```
-$variable_name metadata <field>
-```
-Available fields:
-  - build_epoch: the build timestamp of the maxmind database.
-  - last_check: the last time the database was checked for changes (when using auto_reload)
-  - last_change: the last time the database was reloaded (when using auto_reload)
-
-##### Autoreload (default: disabled):
-Enabling auto reload will have nginx check the modification time of the database at the specified
-interval and reload it if it has changed.
-```
-auto_reload <interval>
-```
-
-##### GeoIP:
-```
-$variable_name [default=<value] [source=$variable_with_ip] path ...
-```
-If default is not specified, the variable will be empty if not found.
-
-If source is not specified, $remote_addr will be used to perform the lookup.
-
-To find the path of the data you want (eg: country names en), use the [mmdblookup tool](https://maxmind.github.io/libmaxminddb/mmdblookup.html):
-
-```
-$ mmdblookup --file /usr/share/GeoIP/GeoIP2-Country.mmdb --ip 8.8.8.8
-
-  {
-    "country":
-      {
-        "geoname_id":
-          6252001 <uint32>
-        "iso_code":
-          "US" <utf8_string>
-        "names":
-          {
-            "de":
-              "USA" <utf8_string>
-            "en":
-              "United States" <utf8_string>
-          }
-      }
-  }
-
-$ mmdblookup --file /usr/share/GeoIP/GeoIP2-Country.mmdb --ip 8.8.8.8 country names en
-
-  "United States" <utf8_string>
-```
-
-This translates to:
-
-```
-$country_name "default=United States" source=$remote_addr country names en
-```
diff --git a/debian/modules/http-geoip2/config b/debian/modules/http-geoip2/config
deleted file mode 100644
index 48bf15d..0000000
--- a/debian/modules/http-geoip2/config
+++ /dev/null
@@ -1,43 +0,0 @@
-ngx_feature="MaxmindDB library"
-ngx_feature_name=
-ngx_feature_run=no
-ngx_feature_incs="#include <maxminddb.h>"
-ngx_feature_libs=-lmaxminddb
-ngx_feature_test="MMDB_s mmdb"
-. auto/feature
-
-ngx_addon_name="ngx_geoip2_module"
-
-if [ $ngx_found = yes ]; then
-	if test -n "$ngx_module_link"; then
-		if [ $HTTP != NO ]; then
-			ngx_module_type=HTTP
-			ngx_module_name="ngx_http_geoip2_module"
-			ngx_module_incs=
-			ngx_module_deps=
-			ngx_module_srcs="$ngx_addon_dir/ngx_http_geoip2_module.c"
-			ngx_module_libs="$ngx_feature_libs"
-			. auto/module
-		fi
-
-		nginx_version=`awk '/^#define nginx_version / {print $3}' src/core/nginx.h`
-		if [ $STREAM != NO -a $nginx_version -gt 1011001 ]; then
-			ngx_module_type=STREAM
-			ngx_module_name="ngx_stream_geoip2_module"
-			ngx_module_incs=
-			ngx_module_deps=
-			ngx_module_srcs="$ngx_addon_dir/ngx_stream_geoip2_module.c"
-			ngx_module_libs="$ngx_feature_libs"
-			. auto/module
-		fi
-	else
-		HTTP_MODULES="$HTTP_MODULES ngx_http_geoip2_module"
-		NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_geoip2_module.c"
-		CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-	fi
-else   
-	cat << END
-$0: error: the geoip2 module requires the maxminddb library.
-END
-	exit 1
-fi
diff --git a/debian/modules/http-geoip2/ngx_http_geoip2_module.c b/debian/modules/http-geoip2/ngx_http_geoip2_module.c
deleted file mode 100644
index d27c94d..0000000
--- a/debian/modules/http-geoip2/ngx_http_geoip2_module.c
+++ /dev/null
@@ -1,793 +0,0 @@
-/*
- * Copyright (C) Lee Valentine <lee@leev.net>
- *
- * Based on nginx's 'ngx_http_geoip_module.c' by Igor Sysoev
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-
-#include <maxminddb.h>
-
-
-typedef struct {
-    MMDB_s                   mmdb;
-    MMDB_lookup_result_s     result;
-    time_t                   last_check;
-    time_t                   last_change;
-    time_t                   check_interval;
-#if (NGX_HAVE_INET6)
-    uint8_t                  address[16];
-#else
-    unsigned long            address;
-#endif
-    ngx_queue_t              queue;
-} ngx_http_geoip2_db_t;
-
-typedef struct {
-    ngx_queue_t              databases;
-    ngx_array_t              *proxies;
-    ngx_flag_t               proxy_recursive;
-} ngx_http_geoip2_conf_t;
-
-typedef struct {
-    ngx_http_geoip2_db_t     *database;
-    const char               **lookup;
-    ngx_str_t                default_value;
-    ngx_http_complex_value_t source;
-} ngx_http_geoip2_ctx_t;
-
-typedef struct {
-    ngx_http_geoip2_db_t     *database;
-    ngx_str_t                metavalue;
-} ngx_http_geoip2_metadata_t;
-
-
-static ngx_int_t ngx_http_geoip2_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-static ngx_int_t ngx_http_geoip2_metadata(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-static void *ngx_http_geoip2_create_conf(ngx_conf_t *cf);
-static char *ngx_http_geoip2_init_conf(ngx_conf_t *cf, void *conf);
-static char *ngx_http_geoip2(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_http_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy,
-    void *conf);
-static char *ngx_http_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy,
-    void *conf);
-static char *ngx_http_geoip2_add_variable_geodata(ngx_conf_t *cf,
-    ngx_http_geoip2_db_t *database);
-static char *ngx_http_geoip2_add_variable_metadata(ngx_conf_t *cf,
-    ngx_http_geoip2_db_t *database);
-static char *ngx_http_geoip2_proxy(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static ngx_int_t ngx_http_geoip2_cidr_value(ngx_conf_t *cf, ngx_str_t *net,
-    ngx_cidr_t *cidr);
-static void ngx_http_geoip2_cleanup(void *data);
-static ngx_int_t ngx_http_geoip2_init(ngx_conf_t *cf);
-
-
-#define FORMAT(fmt, ...) do {                           \
-        p = ngx_palloc(r->pool, NGX_OFF_T_LEN);         \
-        if (p == NULL) {                                \
-            return NGX_ERROR;                           \
-        }                                               \
-        v->len = ngx_sprintf(p, fmt, __VA_ARGS__) - p;  \
-        v->data = p;                                    \
-} while (0)
-
-static ngx_command_t  ngx_http_geoip2_commands[] = {
-
-    { ngx_string("geoip2"),
-        NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
-        ngx_http_geoip2,
-        NGX_HTTP_MAIN_CONF_OFFSET,
-        0,
-        NULL },
-
-    { ngx_string("geoip2_proxy"),
-        NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-        ngx_http_geoip2_proxy,
-        NGX_HTTP_MAIN_CONF_OFFSET,
-        0,
-        NULL },
-
-    { ngx_string("geoip2_proxy_recursive"),
-        NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
-        ngx_conf_set_flag_slot,
-        NGX_HTTP_MAIN_CONF_OFFSET,
-        offsetof(ngx_http_geoip2_conf_t, proxy_recursive),
-        NULL },
-
-    ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_http_geoip2_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    ngx_http_geoip2_init,                  /* postconfiguration */
-
-    ngx_http_geoip2_create_conf,           /* create main configuration */
-    ngx_http_geoip2_init_conf,             /* init main configuration */
-
-    NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
-
-    NULL,                                  /* create location configuration */
-    NULL                                   /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_http_geoip2_module = {
-    NGX_MODULE_V1,
-    &ngx_http_geoip2_module_ctx,           /* module context */
-    ngx_http_geoip2_commands,              /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_int_t
-ngx_http_geoip2_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
-    uintptr_t data)
-{
-    ngx_http_geoip2_ctx_t   *geoip2 = (ngx_http_geoip2_ctx_t *) data;
-    ngx_http_geoip2_db_t    *database = geoip2->database;
-    int                     mmdb_error;
-    MMDB_entry_data_s       entry_data;
-    ngx_http_geoip2_conf_t  *gcf;
-    ngx_addr_t              addr;
-    ngx_array_t             *xfwd;
-    u_char                  *p;
-    ngx_str_t               val;
-
-#if (NGX_HAVE_INET6)
-    uint8_t address[16], *addressp = address;
-#else
-    unsigned long address;
-#endif
-
-    if (geoip2->source.value.len > 0) {
-         if (ngx_http_complex_value(r, &geoip2->source, &val) != NGX_OK) {
-             goto not_found;
-         }
-
-        if (ngx_parse_addr(r->pool, &addr, val.data, val.len) != NGX_OK) {
-            goto not_found;
-        }
-    } else {
-        gcf = ngx_http_get_module_main_conf(r, ngx_http_geoip2_module);
-        addr.sockaddr = r->connection->sockaddr;
-        addr.socklen = r->connection->socklen;
-
-        xfwd = &r->headers_in.x_forwarded_for;
-
-        if (xfwd->nelts > 0 && gcf->proxies != NULL) {
-            (void) ngx_http_get_forwarded_addr(r, &addr, xfwd, NULL,
-                                               gcf->proxies, gcf->proxy_recursive);
-        }
-    }
-
-    switch (addr.sockaddr->sa_family) {
-        case AF_INET:
-#if (NGX_HAVE_INET6)
-            ngx_memset(addressp, 0, 12);
-            ngx_memcpy(addressp + 12, &((struct sockaddr_in *)
-                                        addr.sockaddr)->sin_addr.s_addr, 4);
-            break;
-
-        case AF_INET6:
-            ngx_memcpy(addressp, &((struct sockaddr_in6 *)
-                                   addr.sockaddr)->sin6_addr.s6_addr, 16);
-#else
-            address = ((struct sockaddr_in *)addr.sockaddr)->sin_addr.s_addr;
-#endif
-            break;
-
-        default:
-            goto not_found;
-    }
-
-#if (NGX_HAVE_INET6)
-    if (ngx_memcmp(&address, &database->address, sizeof(address))
-        != 0) {
-#else
-    if (address != database->address) {
-#endif
-        memcpy(&database->address, &address, sizeof(address));
-        database->result = MMDB_lookup_sockaddr(&database->mmdb,
-                                           addr.sockaddr, &mmdb_error);
-
-        if (mmdb_error != MMDB_SUCCESS) {
-            goto not_found;
-        }
-    }
-
-    if (!database->result.found_entry
-            || MMDB_aget_value(&database->result.entry, &entry_data,
-                               geoip2->lookup) != MMDB_SUCCESS) {
-        goto not_found;
-    }
-
-    if (!entry_data.has_data) {
-        goto not_found;
-    }
-
-    switch (entry_data.type) {
-        case MMDB_DATA_TYPE_BOOLEAN:
-            FORMAT("%d", entry_data.boolean);
-            break;
-        case MMDB_DATA_TYPE_UTF8_STRING:
-            v->len = entry_data.data_size;
-            v->data = ngx_pnalloc(r->pool, v->len);
-            if (v->data == NULL) {
-                return NGX_ERROR;
-            }
-            ngx_memcpy(v->data, (u_char *) entry_data.utf8_string, v->len);
-            break;
-        case MMDB_DATA_TYPE_BYTES:
-            v->len = entry_data.data_size;
-            v->data = ngx_pnalloc(r->pool, v->len);
-            if (v->data == NULL) {
-                return NGX_ERROR;
-            }
-            ngx_memcpy(v->data, (u_char *) entry_data.bytes, v->len);
-            break;
-        case MMDB_DATA_TYPE_FLOAT:
-            FORMAT("%.5f", entry_data.float_value);
-            break;
-        case MMDB_DATA_TYPE_DOUBLE:
-            FORMAT("%.5f", entry_data.double_value);
-            break;
-        case MMDB_DATA_TYPE_UINT16:
-            FORMAT("%uD", entry_data.uint16);
-            break;
-        case MMDB_DATA_TYPE_UINT32:
-            FORMAT("%uD", entry_data.uint32);
-            break;
-        case MMDB_DATA_TYPE_INT32:
-            FORMAT("%D", entry_data.int32);
-            break;
-        case MMDB_DATA_TYPE_UINT64:
-            FORMAT("%uL", entry_data.uint64);
-            break;
-        case MMDB_DATA_TYPE_UINT128: ;
-#if MMDB_UINT128_IS_BYTE_ARRAY
-            uint8_t *val = (uint8_t *)entry_data.uint128;
-            FORMAT( "0x%02x%02x%02x%02x%02x%02x%02x%02x"
-                      "%02x%02x%02x%02x%02x%02x%02x%02x",
-                    val[0], val[1], val[2], val[3],
-                    val[4], val[5], val[6], val[7],
-                    val[8], val[9], val[10], val[11],
-                    val[12], val[13], val[14], val[15]);
-#else
-            mmdb_uint128_t val = entry_data.uint128;
-            FORMAT("0x%016uxL%016uxL",
-                    (uint64_t) (val >> 64), (uint64_t) val);
-#endif
-            break;
-        default:
-            goto not_found;
-    }
-
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-
-    return NGX_OK;
-
-not_found:
-    if (geoip2->default_value.len > 0) {
-        v->data = geoip2->default_value.data;
-        v->len = geoip2->default_value.len;
-
-        v->valid = 1;
-        v->no_cacheable = 0;
-        v->not_found = 0;
-    } else {
-        v->not_found = 1;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_geoip2_metadata(ngx_http_request_t *r, ngx_http_variable_value_t *v,
-    uintptr_t data)
-{
-    ngx_http_geoip2_metadata_t  *metadata = (ngx_http_geoip2_metadata_t *) data;
-    ngx_http_geoip2_db_t        *database = metadata->database;
-    u_char                      *p;
-
-    if (ngx_strncmp(metadata->metavalue.data, "build_epoch", 11) == 0) {
-        FORMAT("%uL", database->mmdb.metadata.build_epoch);
-    } else if (ngx_strncmp(metadata->metavalue.data, "last_check", 10) == 0) {
-        FORMAT("%T", database->last_check);
-    } else if (ngx_strncmp(metadata->metavalue.data, "last_change", 11) == 0) {
-        FORMAT("%T", database->last_change);
-    } else {
-        v->not_found = 1;
-        return NGX_OK;
-    }
-
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-
-    return NGX_OK;
-}
-
-
-static void *
-ngx_http_geoip2_create_conf(ngx_conf_t *cf)
-{
-    ngx_pool_cleanup_t      *cln;
-    ngx_http_geoip2_conf_t  *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    conf->proxy_recursive = NGX_CONF_UNSET;
-
-    cln = ngx_pool_cleanup_add(cf->pool, 0);
-    if (cln == NULL) {
-        return NULL;
-    }
-
-    ngx_queue_init(&conf->databases);
-
-    cln->handler = ngx_http_geoip2_cleanup;
-    cln->data = conf;
-
-    return conf;
-}
-
-
-static char *
-ngx_http_geoip2(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_geoip2_conf_t  *gcf = conf;
-    ngx_str_t               *value;
-    int                     status;
-    ngx_http_geoip2_db_t    *database;
-    char                    *rv;
-    ngx_conf_t              save;
-    ngx_queue_t             *q;
-
-    value = cf->args->elts;
-
-    if (value[1].data && value[1].data[0] != '/') {
-        if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    if (!ngx_queue_empty(&gcf->databases)) {
-        for (q = ngx_queue_head(&gcf->databases);
-             q != ngx_queue_sentinel(&gcf->databases);
-             q = ngx_queue_next(q))
-        {
-            database = ngx_queue_data(q, ngx_http_geoip2_db_t, queue);
-            if (ngx_strcmp(value[1].data, database->mmdb.filename) == 0) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "Duplicate GeoIP2 mmdb - %V", &value[1]);
-                return NGX_CONF_ERROR;
-            }
-        }
-    }
-
-    database = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_db_t));
-    if (database == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_queue_insert_tail(&gcf->databases, &database->queue);
-    database->last_check = database->last_change = ngx_time();
-
-    status = MMDB_open((char *) value[1].data, MMDB_MODE_MMAP, &database->mmdb);
-
-    if (status != MMDB_SUCCESS) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "MMDB_open(\"%V\") failed - %s", &value[1],
-                           MMDB_strerror(status));
-        return NGX_CONF_ERROR;
-    }
-
-    save = *cf;
-    cf->handler = ngx_http_geoip2_parse_config;
-    cf->handler_conf = (void *) database;
-
-    rv = ngx_conf_parse(cf, NULL);
-    *cf = save;
-    return rv;
-}
-
-
-static char *
-ngx_http_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
-{
-    ngx_http_geoip2_db_t  *database;
-    ngx_str_t             *value;
-    time_t                interval;
-
-    value = cf->args->elts;
-
-    if (value[0].data[0] == '$') {
-        return ngx_http_geoip2_add_variable(cf, dummy, conf);
-    }
-
-    if (value[0].len == 11
-            && ngx_strncmp(value[0].data, "auto_reload", 11) == 0) {
-        if ((int) cf->args->nelts != 2) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid number of arguments for auto_reload");
-            return NGX_CONF_ERROR;
-        }
-
-        interval = ngx_parse_time(&value[1], true);
-
-        if (interval == (time_t) NGX_ERROR) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid interval for auto_reload \"%V\"",
-                               value[1]);
-            return NGX_CONF_ERROR;
-        }
-
-
-        database = (ngx_http_geoip2_db_t *) conf;
-        database->check_interval = interval;
-        return NGX_CONF_OK;
-    }
-
-    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                       "invalid setting \"%V\"", &value[0]);
-    return NGX_CONF_ERROR;
-}
-
-
-static char *
-ngx_http_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
-{
-    ngx_http_geoip2_db_t  *database;
-    ngx_str_t             *value;
-    int                   nelts;
-
-    value = cf->args->elts;
-
-    if (value[0].data[0] != '$') {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid variable name \"%V\"", &value[0]);
-        return NGX_CONF_ERROR;
-    }
-
-    value[0].len--;
-    value[0].data++;
-
-    nelts = (int) cf->args->nelts;
-    database = (ngx_http_geoip2_db_t *) conf;
-
-    if (nelts > 0 && value[1].len == 8 && ngx_strncmp(value[1].data, "metadata", 8) == 0) {
-        return ngx_http_geoip2_add_variable_metadata(cf, database);
-    }
-
-    return ngx_http_geoip2_add_variable_geodata(cf, database);
-}
-
-
-static char *
-ngx_http_geoip2_add_variable_metadata(ngx_conf_t *cf, ngx_http_geoip2_db_t *database)
-{
-    ngx_http_geoip2_metadata_t  *metadata;
-    ngx_str_t                   *value, name;
-    ngx_http_variable_t         *var;
-
-    metadata = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_metadata_t));
-    if (metadata == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    value = cf->args->elts;
-    name = value[0];
-
-    metadata->database = database;
-    metadata->metavalue = value[2];
-
-    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
-    if (var == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    var->get_handler = ngx_http_geoip2_metadata;
-    var->data = (uintptr_t) metadata;
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_geoip2_add_variable_geodata(ngx_conf_t *cf, ngx_http_geoip2_db_t *database)
-{
-    ngx_http_geoip2_ctx_t             *geoip2;
-    ngx_http_compile_complex_value_t  ccv;
-    ngx_str_t                         *value, name, source;
-    ngx_http_variable_t               *var;
-    int                               i, nelts, idx;
-
-    geoip2 = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_ctx_t));
-    if (geoip2 == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    geoip2->database = database;
-    ngx_str_null(&source);
-
-    value = cf->args->elts;
-    name = value[0];
-
-    nelts = (int) cf->args->nelts;
-    idx = 1;
-
-    if (nelts > idx) {
-        for (i = idx; i < nelts; i++) {
-            if (ngx_strnstr(value[idx].data, "=", value[idx].len) == NULL) {
-                break;
-            }
-
-            if (value[idx].len > 8 && ngx_strncmp(value[idx].data, "default=", 8) == 0) {
-                if (geoip2->default_value.len > 0) {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "default has already been declared for  \"$%V\"", &name);
-                    return NGX_CONF_ERROR;
-                }
-
-                geoip2->default_value.len  = value[idx].len - 8;
-                geoip2->default_value.data = value[idx].data + 8;
-            } else if (value[idx].len > 7 && ngx_strncmp(value[idx].data, "source=", 7) == 0) {
-                if (source.len > 0) {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "source has already been declared for  \"$%V\"", &name);
-                    return NGX_CONF_ERROR;
-                }
-
-                source.len  = value[idx].len - 7;
-                source.data = value[idx].data + 7;
-
-                if (source.data[0] != '$') {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "invalid source variable name \"%V\"", &source);
-                    return NGX_CONF_ERROR;
-                }
-
-                ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-                ccv.cf = cf;
-                ccv.value = &source;
-                ccv.complex_value = &geoip2->source;
-
-                if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "unable to compile \"%V\" for \"$%V\"", &source, &name);
-                    return NGX_CONF_ERROR;
-                }
-            } else {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "invalid setting \"%V\" for \"$%V\"", &value[idx], &name);
-                    return NGX_CONF_ERROR;
-            }
-
-            idx++;
-        }
-    }
-
-    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
-    if (var == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    geoip2->lookup = ngx_pcalloc(cf->pool, sizeof(const char *) *
-                                 (cf->args->nelts - (idx - 1)));
-
-    if (geoip2->lookup == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    for (i = idx; i < nelts; i++) {
-        geoip2->lookup[i - idx] = (char *) value[i].data;
-    }
-    geoip2->lookup[i - idx] = NULL;
-
-    var->get_handler = ngx_http_geoip2_variable;
-    var->data = (uintptr_t) geoip2;
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_geoip2_init_conf(ngx_conf_t *cf, void *conf)
-{
-    ngx_http_geoip2_conf_t  *gcf = conf;
-    ngx_conf_init_value(gcf->proxy_recursive, 0);
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_geoip2_proxy(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_geoip2_conf_t  *gcf = conf;
-    ngx_str_t               *value;
-    ngx_cidr_t              cidr, *c;
-
-    value = cf->args->elts;
-
-    if (ngx_http_geoip2_cidr_value(cf, &value[1], &cidr) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    if (gcf->proxies == NULL) {
-        gcf->proxies = ngx_array_create(cf->pool, 4, sizeof(ngx_cidr_t));
-        if (gcf->proxies == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    c = ngx_array_push(gcf->proxies);
-    if (c == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    *c = cidr;
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_http_geoip2_cidr_value(ngx_conf_t *cf, ngx_str_t *net, ngx_cidr_t *cidr)
-{
-    ngx_int_t  rc;
-
-    if (ngx_strcmp(net->data, "255.255.255.255") == 0) {
-        cidr->family = AF_INET;
-        cidr->u.in.addr = 0xffffffff;
-        cidr->u.in.mask = 0xffffffff;
-
-        return NGX_OK;
-    }
-
-    rc = ngx_ptocidr(net, cidr);
-
-    if (rc == NGX_ERROR) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid network \"%V\"", net);
-        return NGX_ERROR;
-    }
-
-    if (rc == NGX_DONE) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                           "low address bits of %V are meaningless", net);
-    }
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_geoip2_cleanup(void *data)
-{
-    ngx_http_geoip2_conf_t  *gcf = data;
-    ngx_queue_t             *q;
-    ngx_http_geoip2_db_t    *database;
-
-    while (!ngx_queue_empty(&gcf->databases)) {
-        q = ngx_queue_head(&gcf->databases);
-        ngx_queue_remove(q);
-        database = ngx_queue_data(q, ngx_http_geoip2_db_t, queue);
-        MMDB_close(&database->mmdb);
-    }
-}
-
-
-static ngx_int_t
-ngx_http_geoip2_log_handler(ngx_http_request_t *r)
-{
-    int                      status;
-    MMDB_s                   tmpdb;
-    ngx_queue_t              *q;
-    ngx_file_info_t          fi;
-    ngx_http_geoip2_db_t    *database;
-    ngx_http_geoip2_conf_t  *gcf;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "geoip2 http log handler");
-
-    gcf = ngx_http_get_module_main_conf(r, ngx_http_geoip2_module);
-
-    if (ngx_queue_empty(&gcf->databases)) {
-        return NGX_OK;
-    }
-
-    for (q = ngx_queue_head(&gcf->databases);
-         q != ngx_queue_sentinel(&gcf->databases);
-         q = ngx_queue_next(q))
-    {
-        database = ngx_queue_data(q, ngx_http_geoip2_db_t, queue);
-        if (database->check_interval == 0) {
-            continue;
-        }
-
-        if ((database->last_check + database->check_interval)
-            > ngx_time())
-        {
-            continue;
-        }
-
-        database->last_check = ngx_time();
-
-        if (ngx_file_info(database->mmdb.filename, &fi) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_EMERG, r->connection->log, ngx_errno,
-                          ngx_file_info_n " \"%s\" failed",
-                          database->mmdb.filename);
-
-            continue;
-        }
-
-        if (ngx_file_mtime(&fi) <= database->last_change) {
-            continue;
-        }
-
-        /* do the reload */
-
-        ngx_memzero(&tmpdb, sizeof(MMDB_s));
-        status = MMDB_open(database->mmdb.filename, MMDB_MODE_MMAP, &tmpdb);
-
-        if (status != MMDB_SUCCESS) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "MMDB_open(\"%s\") failed to reload - %s",
-                          database->mmdb.filename, MMDB_strerror(status));
-
-            continue;
-        }
-
-        database->last_change = ngx_file_mtime(&fi);
-        MMDB_close(&database->mmdb);
-        database->mmdb = tmpdb;
-
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "Reload MMDB \"%s\"",
-                      database->mmdb.filename);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_geoip2_init(ngx_conf_t *cf)
-{
-    ngx_http_handler_pt        *h;
-    ngx_http_core_main_conf_t  *cmcf;
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    h = ngx_array_push(&cmcf->phases[NGX_HTTP_LOG_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    *h = ngx_http_geoip2_log_handler;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-geoip2/ngx_stream_geoip2_module.c b/debian/modules/http-geoip2/ngx_stream_geoip2_module.c
deleted file mode 100644
index eb59082..0000000
--- a/debian/modules/http-geoip2/ngx_stream_geoip2_module.c
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
- * Copyright (C) Lee Valentine <lee@leev.net>
- * Copyright (C) Andrei Belov <defanator@gmail.com>
- *
- * Based on nginx's 'ngx_stream_geoip_module.c' by Igor Sysoev
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_stream.h>
-
-#include <maxminddb.h>
-
-
-typedef struct {
-    MMDB_s                   mmdb;
-    MMDB_lookup_result_s     result;
-    time_t                   last_check;
-    time_t                   last_change;
-    time_t                   check_interval;
-#if (NGX_HAVE_INET6)
-    uint8_t                  address[16];
-#else
-    unsigned long            address;
-#endif
-    ngx_queue_t              queue;
-} ngx_stream_geoip2_db_t;
-
-typedef struct {
-    ngx_queue_t              databases;
-} ngx_stream_geoip2_conf_t;
-
-typedef struct {
-    ngx_stream_geoip2_db_t   *database;
-    const char               **lookup;
-    ngx_str_t                default_value;
-    ngx_stream_complex_value_t source;
-} ngx_stream_geoip2_ctx_t;
-
-typedef struct {
-    ngx_stream_geoip2_db_t   *database;
-    ngx_str_t                metavalue;
-} ngx_stream_geoip2_metadata_t;
-
-
-static ngx_int_t ngx_stream_geoip2_variable(ngx_stream_session_t *s,
-    ngx_stream_variable_value_t *v, uintptr_t data);
-static ngx_int_t ngx_stream_geoip2_metadata(ngx_stream_session_t *s,
-    ngx_stream_variable_value_t *v, uintptr_t data);
-static void *ngx_stream_geoip2_create_conf(ngx_conf_t *cf);
-static char *ngx_stream_geoip2(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_stream_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy,
-    void *conf);
-static char *ngx_stream_geoip2(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_stream_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy,
-    void *conf);
-static char *ngx_stream_geoip2_add_variable_geodata(ngx_conf_t *cf,
-    ngx_stream_geoip2_db_t *database);
-static char *ngx_stream_geoip2_add_variable_metadata(ngx_conf_t *cf,
-    ngx_stream_geoip2_db_t *database);
-static void ngx_stream_geoip2_cleanup(void *data);
-static ngx_int_t ngx_stream_geoip2_init(ngx_conf_t *cf);
-
-
-#define FORMAT(fmt, ...) do {                               \
-        p = ngx_palloc(s->connection->pool, NGX_OFF_T_LEN); \
-        if (p == NULL) {                                    \
-            return NGX_ERROR;                               \
-        }                                                   \
-        v->len = ngx_sprintf(p, fmt, __VA_ARGS__) - p;      \
-        v->data = p;                                        \
-} while (0)
-
-static ngx_command_t  ngx_stream_geoip2_commands[] = {
-
-    { ngx_string("geoip2"),
-        NGX_STREAM_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
-        ngx_stream_geoip2,
-        NGX_STREAM_MAIN_CONF_OFFSET,
-        0,
-        NULL },
-
-    ngx_null_command
-};
-
-
-static ngx_stream_module_t  ngx_stream_geoip2_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    ngx_stream_geoip2_init,                /* postconfiguration */
-
-    ngx_stream_geoip2_create_conf,         /* create main configuration */
-    NULL,                                  /* init main configuration */
-
-    NULL,                                  /* create server configuration */
-    NULL                                   /* merge server configuration */
-};
-
-
-ngx_module_t  ngx_stream_geoip2_module = {
-    NGX_MODULE_V1,
-    &ngx_stream_geoip2_module_ctx,         /* module context */
-    ngx_stream_geoip2_commands,            /* module directives */
-    NGX_STREAM_MODULE,                     /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_int_t
-ngx_stream_geoip2_variable(ngx_stream_session_t *s, ngx_stream_variable_value_t *v,
-    uintptr_t data)
-{
-    int                       mmdb_error;
-    u_char                   *p;
-    ngx_str_t                 val;
-    ngx_addr_t                addr;
-    MMDB_entry_data_s         entry_data;
-    ngx_stream_geoip2_ctx_t  *geoip2 = (ngx_stream_geoip2_ctx_t *) data;
-    ngx_stream_geoip2_db_t   *database = geoip2->database;
-
-#if (NGX_HAVE_INET6)
-    uint8_t address[16], *addressp = address;
-#else
-    unsigned long address;
-#endif
-
-    if (geoip2->source.value.len > 0) {
-         if (ngx_stream_complex_value(s, &geoip2->source, &val) != NGX_OK) {
-             goto not_found;
-         }
-
-        if (ngx_parse_addr(s->connection->pool, &addr, val.data, val.len) != NGX_OK) {
-            goto not_found;
-        }
-    } else {
-        addr.sockaddr = s->connection->sockaddr;
-        addr.socklen = s->connection->socklen;
-    }
-
-    switch (addr.sockaddr->sa_family) {
-        case AF_INET:
-#if (NGX_HAVE_INET6)
-            ngx_memset(addressp, 0, 12);
-            ngx_memcpy(addressp + 12, &((struct sockaddr_in *)
-                                        addr.sockaddr)->sin_addr.s_addr, 4);
-            break;
-
-        case AF_INET6:
-            ngx_memcpy(addressp, &((struct sockaddr_in6 *)
-                                   addr.sockaddr)->sin6_addr.s6_addr, 16);
-#else
-            address = ((struct sockaddr_in *)addr.sockaddr)->sin_addr.s_addr;
-#endif
-            break;
-
-        default:
-            goto not_found;
-    }
-
-#if (NGX_HAVE_INET6)
-    if (ngx_memcmp(&address, &database->address, sizeof(address)) != 0) {
-#else
-    if (address != database->address) {
-#endif
-        memcpy(&database->address, &address, sizeof(address));
-        database->result = MMDB_lookup_sockaddr(&database->mmdb,
-                                                addr.sockaddr, &mmdb_error);
-
-        if (mmdb_error != MMDB_SUCCESS) {
-            goto not_found;
-        }
-    }
-
-    if (!database->result.found_entry
-        || MMDB_aget_value(&database->result.entry, &entry_data, geoip2->lookup)
-        != MMDB_SUCCESS)
-    {
-        goto not_found;
-    }
-
-    if (!entry_data.has_data) {
-        goto not_found;
-    }
-
-    switch (entry_data.type) {
-        case MMDB_DATA_TYPE_BOOLEAN:
-            FORMAT("%d", entry_data.boolean);
-            break;
-        case MMDB_DATA_TYPE_UTF8_STRING:
-            v->len = entry_data.data_size;
-            v->data = ngx_pnalloc(s->connection->pool, v->len);
-            if (v->data == NULL) {
-                return NGX_ERROR;
-            }
-            ngx_memcpy(v->data, (u_char *) entry_data.utf8_string, v->len);
-            break;
-        case MMDB_DATA_TYPE_BYTES:
-            v->len = entry_data.data_size;
-            v->data = ngx_pnalloc(s->connection->pool, v->len);
-            if (v->data == NULL) {
-                return NGX_ERROR;
-            }
-            ngx_memcpy(v->data, (u_char *) entry_data.bytes, v->len);
-            break;
-        case MMDB_DATA_TYPE_FLOAT:
-            FORMAT("%.5f", entry_data.float_value);
-            break;
-        case MMDB_DATA_TYPE_DOUBLE:
-            FORMAT("%.5f", entry_data.double_value);
-            break;
-        case MMDB_DATA_TYPE_UINT16:
-            FORMAT("%uD", entry_data.uint16);
-            break;
-        case MMDB_DATA_TYPE_UINT32:
-            FORMAT("%uD", entry_data.uint32);
-            break;
-        case MMDB_DATA_TYPE_INT32:
-            FORMAT("%D", entry_data.int32);
-            break;
-        case MMDB_DATA_TYPE_UINT64:
-            FORMAT("%uL", entry_data.uint64);
-            break;
-        case MMDB_DATA_TYPE_UINT128: ;
-#if MMDB_UINT128_IS_BYTE_ARRAY
-            uint8_t *val = (uint8_t *) entry_data.uint128;
-            FORMAT("0x%02x%02x%02x%02x%02x%02x%02x%02x"
-                   "%02x%02x%02x%02x%02x%02x%02x%02x",
-                   val[0], val[1], val[2], val[3],
-                   val[4], val[5], val[6], val[7],
-                   val[8], val[9], val[10], val[11],
-                   val[12], val[13], val[14], val[15]);
-#else
-            mmdb_uint128_t val = entry_data.uint128;
-            FORMAT("0x%016uxL%016uxL",
-                   (uint64_t) (val >> 64), (uint64_t) val);
-#endif
-            break;
-        default:
-            goto not_found;
-    }
-
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-
-    return NGX_OK;
-
-not_found:
-    if (geoip2->default_value.len > 0) {
-        v->data = geoip2->default_value.data;
-        v->len = geoip2->default_value.len;
-
-        v->valid = 1;
-        v->no_cacheable = 0;
-        v->not_found = 0;
-
-        return NGX_OK;
-    }
-
-    v->not_found = 1;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_stream_geoip2_metadata(ngx_stream_session_t *s, ngx_stream_variable_value_t *v,
-    uintptr_t data)
-{
-    ngx_stream_geoip2_metadata_t  *metadata = (ngx_stream_geoip2_metadata_t *) data;
-    ngx_stream_geoip2_db_t        *database = metadata->database;
-    u_char                        *p;
-
-    if (ngx_strncmp(metadata->metavalue.data, "build_epoch", 11) == 0) {
-        FORMAT("%uL", database->mmdb.metadata.build_epoch);
-    } else if (ngx_strncmp(metadata->metavalue.data, "last_check", 10) == 0) {
-        FORMAT("%T", database->last_check);
-    } else if (ngx_strncmp(metadata->metavalue.data, "last_change", 11) == 0) {
-        FORMAT("%T", database->last_change);
-    } else {
-        v->not_found = 1;
-        return NGX_OK;
-    }
-
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-
-    return NGX_OK;
-}
-
-
-static void *
-ngx_stream_geoip2_create_conf(ngx_conf_t *cf)
-{
-    ngx_pool_cleanup_t        *cln;
-    ngx_stream_geoip2_conf_t  *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    cln = ngx_pool_cleanup_add(cf->pool, 0);
-    if (cln == NULL) {
-        return NULL;
-    }
-
-    ngx_queue_init(&conf->databases);
-
-    cln->handler = ngx_stream_geoip2_cleanup;
-    cln->data = conf;
-
-    return conf;
-}
-
-
-static char *
-ngx_stream_geoip2(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    int                       status;
-    char                      *rv;
-    ngx_str_t                 *value;
-    ngx_conf_t                save;
-    ngx_stream_geoip2_db_t    *database;
-    ngx_stream_geoip2_conf_t  *gcf = conf;
-    ngx_queue_t               *q;
-
-    value = cf->args->elts;
-
-    if (value[1].data && value[1].data[0] != '/') {
-        if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    if (!ngx_queue_empty(&gcf->databases)) {
-        for (q = ngx_queue_head(&gcf->databases);
-             q != ngx_queue_sentinel(&gcf->databases);
-             q = ngx_queue_next(q))
-        {
-            database = ngx_queue_data(q, ngx_stream_geoip2_db_t, queue);
-            if (ngx_strcmp(value[1].data, database->mmdb.filename) == 0) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                   "Duplicate GeoIP2 mmdb - %V", &value[1]);
-                return NGX_CONF_ERROR;
-            }
-        }
-    }
-
-    database = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_db_t));
-    if (database == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_queue_insert_tail(&gcf->databases, &database->queue);
-    database->last_check = database->last_change = ngx_time();
-
-    status = MMDB_open((char *) value[1].data, MMDB_MODE_MMAP, &database->mmdb);
-
-    if (status != MMDB_SUCCESS) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "MMDB_open(\"%V\") failed - %s", &value[1],
-                           MMDB_strerror(status));
-        return NGX_CONF_ERROR;
-    }
-
-    save = *cf;
-    cf->handler = ngx_stream_geoip2_parse_config;
-    cf->handler_conf = (void *) database;
-
-    rv = ngx_conf_parse(cf, NULL);
-    *cf = save;
-    return rv;
-}
-
-
-static char *
-ngx_stream_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
-{
-    ngx_stream_geoip2_db_t  *database;
-    ngx_str_t             *value;
-    time_t                interval;
-
-    value = cf->args->elts;
-
-    if (value[0].data[0] == '$') {
-        return ngx_stream_geoip2_add_variable(cf, dummy, conf);
-    }
-
-    if (value[0].len == 11
-            && ngx_strncmp(value[0].data, "auto_reload", 11) == 0) {
-        if ((int) cf->args->nelts != 2) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid number of arguments for auto_reload");
-            return NGX_CONF_ERROR;
-        }
-
-        interval = ngx_parse_time(&value[1], true);
-
-        if (interval == (time_t) NGX_ERROR) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "invalid interval for auto_reload \"%V\"",
-                               value[1]);
-            return NGX_CONF_ERROR;
-        }
-
-
-        database = (ngx_stream_geoip2_db_t *) conf;
-        database->check_interval = interval;
-        return NGX_CONF_OK;
-    }
-
-    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                       "invalid setting \"%V\"", &value[0]);
-    return NGX_CONF_ERROR;
-}
-
-
-static char *
-ngx_stream_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
-{
-    ngx_stream_geoip2_db_t  *database;
-    ngx_str_t               *value;
-    int                     nelts;
-
-    value = cf->args->elts;
-
-    if (value[0].data[0] != '$') {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid variable name \"%V\"", &value[0]);
-        return NGX_CONF_ERROR;
-    }
-
-    value[0].len--;
-    value[0].data++;
-
-    nelts = (int) cf->args->nelts;
-    database = (ngx_stream_geoip2_db_t *) conf;
-
-    if (nelts > 0 && value[1].len == 8 && ngx_strncmp(value[1].data, "metadata", 8) == 0) {
-        return ngx_stream_geoip2_add_variable_metadata(cf, database);
-    }
-
-    return ngx_stream_geoip2_add_variable_geodata(cf, database);
-}
-
-
-static char *
-ngx_stream_geoip2_add_variable_metadata(ngx_conf_t *cf, ngx_stream_geoip2_db_t *database)
-{
-    ngx_stream_geoip2_metadata_t  *metadata;
-    ngx_str_t                     *value, name;
-    ngx_stream_variable_t         *var;
-
-    metadata = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_metadata_t));
-    if (metadata == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    value = cf->args->elts;
-    name = value[0];
-
-    metadata->database = database;
-    metadata->metavalue = value[2];
-
-    var = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
-    if (var == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    var->get_handler = ngx_stream_geoip2_metadata;
-    var->data = (uintptr_t) metadata;
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_stream_geoip2_add_variable_geodata(ngx_conf_t *cf, ngx_stream_geoip2_db_t *database)
-{
-    ngx_stream_geoip2_ctx_t             *geoip2;
-    ngx_stream_compile_complex_value_t  ccv;
-    ngx_str_t                           *value, name, source;
-    ngx_stream_variable_t               *var;
-    int                                 i, nelts, idx;
-
-    geoip2 = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_ctx_t));
-    if (geoip2 == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    geoip2->database = database;
-    ngx_str_null(&source);
-
-    value = cf->args->elts;
-    name = value[0];
-
-    nelts = (int) cf->args->nelts;
-    idx = 1;
-
-    if (nelts > idx) {
-        for (i = idx; i < nelts; i++) {
-            if (ngx_strnstr(value[idx].data, "=", value[idx].len) == NULL) {
-                break;
-            }
-
-            if (value[idx].len > 8 && ngx_strncmp(value[idx].data, "default=", 8) == 0) {
-                if (geoip2->default_value.len > 0) {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "default has already been declared for  \"$%V\"", &name);
-                    return NGX_CONF_ERROR;
-                }
-
-                geoip2->default_value.len  = value[idx].len - 8;
-                geoip2->default_value.data = value[idx].data + 8;
-
-            } else if (value[idx].len > 7 && ngx_strncmp(value[idx].data, "source=", 7) == 0) {
-                if (source.len > 0) {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "source has already been declared for  \"$%V\"", &name);
-                    return NGX_CONF_ERROR;
-                }
-
-                source.len  = value[idx].len - 7;
-                source.data = value[idx].data + 7;
-
-                if (source.data[0] != '$') {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "invalid source variable name \"%V\"", &source);
-                    return NGX_CONF_ERROR;
-                }
-
-                ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
-                ccv.cf = cf;
-                ccv.value = &source;
-                ccv.complex_value = &geoip2->source;
-
-                if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "unable to compile \"%V\" for \"$%V\"", &source, &name);
-                    return NGX_CONF_ERROR;
-                }
-
-            } else {
-                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                       "invalid setting \"%V\" for \"$%V\"", &value[idx], &name);
-                    return NGX_CONF_ERROR;
-            }
-
-            idx++;
-        }
-    }
-
-    var = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
-    if (var == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    geoip2->lookup = ngx_pcalloc(cf->pool,
-                         sizeof(const char *) * (cf->args->nelts - (idx - 1)));
-
-    if (geoip2->lookup == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    for (i = idx; i < nelts; i++) {
-        geoip2->lookup[i - idx] = (char *) value[i].data;
-    }
-    geoip2->lookup[i - idx] = NULL;
-
-    var->get_handler = ngx_stream_geoip2_variable;
-    var->data = (uintptr_t) geoip2;
-
-    return NGX_CONF_OK;
-}
-
-
-static void
-ngx_stream_geoip2_cleanup(void *data)
-{
-    ngx_queue_t               *q;
-    ngx_stream_geoip2_db_t    *database;
-    ngx_stream_geoip2_conf_t  *gcf = data;
-
-    while (!ngx_queue_empty(&gcf->databases)) {
-        q = ngx_queue_head(&gcf->databases);
-        ngx_queue_remove(q);
-        database = ngx_queue_data(q, ngx_stream_geoip2_db_t, queue);
-        MMDB_close(&database->mmdb);
-    }
-}
-
-
-static ngx_int_t
-ngx_stream_geoip2_log_handler(ngx_stream_session_t *s)
-{
-    int                        status;
-    MMDB_s                     tmpdb;
-    ngx_queue_t                *q;
-    ngx_file_info_t            fi;
-    ngx_stream_geoip2_db_t    *database;
-    ngx_stream_geoip2_conf_t  *gcf;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
-                   "geoip2 stream log handler");
-
-    gcf = ngx_stream_get_module_main_conf(s, ngx_stream_geoip2_module);
-
-    if (ngx_queue_empty(&gcf->databases)) {
-        return NGX_OK;
-    }
-
-    for (q = ngx_queue_head(&gcf->databases);
-         q != ngx_queue_sentinel(&gcf->databases);
-         q = ngx_queue_next(q))
-    {
-        database = ngx_queue_data(q, ngx_stream_geoip2_db_t, queue);
-        if (database->check_interval == 0) {
-            continue;
-        }
-
-        if ((database->last_check + database->check_interval)
-            > ngx_time())
-        {
-            continue;
-        }
-
-        database->last_check = ngx_time();
-
-        if (ngx_file_info(database->mmdb.filename, &fi) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_EMERG, s->connection->log, ngx_errno,
-                          ngx_file_info_n " \"%s\" failed",
-                          database->mmdb.filename);
-
-            continue;
-        }
-
-        if (ngx_file_mtime(&fi) <= database->last_change) {
-            continue;
-        }
-
-        /* do the reload */
-
-        ngx_memzero(&tmpdb, sizeof(MMDB_s));
-        status = MMDB_open(database->mmdb.filename, MMDB_MODE_MMAP, &tmpdb);
-
-        if (status != MMDB_SUCCESS) {
-            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
-                          "MMDB_open(\"%s\") failed to reload - %s",
-                          database->mmdb.filename, MMDB_strerror(status));
-
-            continue;
-        }
-
-        database->last_change = ngx_file_mtime(&fi);
-        MMDB_close(&database->mmdb);
-        database->mmdb = tmpdb;
-
-        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
-                      "Reload MMDB \"%s\"",
-                      database->mmdb.filename);
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_stream_geoip2_init(ngx_conf_t *cf)
-{
-    ngx_stream_handler_pt        *h;
-    ngx_stream_core_main_conf_t  *cmcf;
-
-    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
-
-    h = ngx_array_push(&cmcf->phases[NGX_STREAM_LOG_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    *h = ngx_stream_geoip2_log_handler;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-headers-more-filter/README.markdown b/debian/modules/http-headers-more-filter/README.markdown
deleted file mode 100644
index 452ef1f..0000000
--- a/debian/modules/http-headers-more-filter/README.markdown
+++ /dev/null
@@ -1,549 +0,0 @@
-Name
-====
-
-**ngx_headers_more** - Set and clear input and output headers...more than "add"!
-
-*This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
-
-Table of Contents
-=================
-
-* [Name](#name)
-* [Version](#version)
-* [Synopsis](#synopsis)
-* [Description](#description)
-* [Directives](#directives)
-    * [more_set_headers](#more_set_headers)
-    * [more_clear_headers](#more_clear_headers)
-    * [more_set_input_headers](#more_set_input_headers)
-    * [more_clear_input_headers](#more_clear_input_headers)
-* [Limitations](#limitations)
-* [Installation](#installation)
-* [Compatibility](#compatibility)
-* [Community](#community)
-    * [English Mailing List](#english-mailing-list)
-    * [Chinese Mailing List](#chinese-mailing-list)
-* [Bugs and Patches](#bugs-and-patches)
-* [Source Repository](#source-repository)
-* [Changes](#changes)
-* [Test Suite](#test-suite)
-* [TODO](#todo)
-* [Getting involved](#getting-involved)
-* [Authors](#authors)
-* [Copyright & License](#copyright--license)
-* [See Also](#see-also)
-
-Version
-=======
-
-This document describes headers-more-nginx-module [v0.33](https://github.com/openresty/headers-more-nginx-module/tags) released on 3 November 2017.
-
-Synopsis
-========
-
-```nginx
-
- # set the Server output header
- more_set_headers 'Server: my-server';
-
- # set and clear output headers
- location /bar {
-     more_set_headers 'X-MyHeader: blah' 'X-MyHeader2: foo';
-     more_set_headers -t 'text/plain text/css' 'Content-Type: text/foo';
-     more_set_headers -s '400 404 500 503' -s 413 'Foo: Bar';
-     more_clear_headers 'Content-Type';
-
-     # your proxy_pass/memcached_pass/or any other config goes here...
- }
-
- # set output headers
- location /type {
-     more_set_headers 'Content-Type: text/plain';
-     # ...
- }
-
- # set input headers
- location /foo {
-     set $my_host 'my dog';
-     more_set_input_headers 'Host: $my_host';
-     more_set_input_headers -t 'text/plain' 'X-Foo: bah';
-
-     # now $host and $http_host have their new values...
-     # ...
- }
-
- # replace input header X-Foo *only* if it already exists
- more_set_input_headers -r 'X-Foo: howdy';
-```
-
-Description
-===========
-
-This module allows you to add, set, or clear any output
-or input header that you specify.
-
-This is an enhanced version of the standard
-[headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module because it provides more utilities like
-resetting or clearing "builtin headers" like `Content-Type`,
-`Content-Length`, and `Server`.
-
-It also allows you to specify an optional HTTP status code
-criteria using the `-s` option and an optional content
-type criteria using the `-t` option while modifying the
-output headers with the [more_set_headers](#more_set_headers) and
-[more_clear_headers](#more_clear_headers) directives. For example,
-
-```nginx
- more_set_headers -s 404 -t 'text/html' 'X-Foo: Bar';
-```
-
-You can also specify multiple MIME types to filter out in a single `-t` option.
-For example,
-
-```nginx
-more_set_headers -t 'text/html text/plain' 'X-Foo: Bar';
-```
-
-Never use other paramemters like `charset=utf-8` in the `-t` option values; they will not
-work as you would expect.
-
-Input headers can be modified as well. For example
-
-```nginx
- location /foo {
-     more_set_input_headers 'Host: foo' 'User-Agent: faked';
-     # now $host, $http_host, $user_agent, and
-     #   $http_user_agent all have their new values.
- }
-```
-
-The option `-t` is also available in the
-[more_set_input_headers](#more_set_input_headers) and
-[more_clear_input_headers](#more_clear_input_headers) directives (for request header filtering) while the `-s` option
-is not allowed.
-
-Unlike the standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module, this module's directives will by
-default apply to all the status codes, including `4xx` and `5xx`.
-
-[Back to TOC](#table-of-contents)
-
-Directives
-==========
-
-[Back to TOC](#table-of-contents)
-
-more_set_headers
-----------------
-**syntax:** *more_set_headers [-t &lt;content-type list&gt;]... [-s &lt;status-code list&gt;]... &lt;new-header&gt;...*
-
-**default:** *no*
-
-**context:** *http, server, location, location if*
-
-**phase:** *output-header-filter*
-
-Replaces (if any) or adds (if not any) the specified output headers when the response status code matches the codes specified by the `-s` option *AND* the response content type matches the types specified by the `-t` option.
-
-If either `-s` or `-t` is not specified or has an empty list value, then no match is required. Therefore, the following directive set the `Server` output header to the custom value for *any* status code and *any* content type:
-
-```nginx
-
-   more_set_headers    "Server: my_server";
-```
-
-Existing response headers with the same name are always overridden. If you want to add headers incrementally, use the standard [add_header](http://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header) directive instead.
-
-A single directive can set/add multiple output headers. For example
-
-```nginx
-
-   more_set_headers 'Foo: bar' 'Baz: bah';
-```
-
-Multiple occurrences of the options are allowed in a single directive. Their values will be merged together. For instance
-
-```nginx
-
-   more_set_headers -s 404 -s '500 503' 'Foo: bar';
-```
-
-is equivalent to
-
-```nginx
-
-   more_set_headers -s '404 500 503' 'Foo: bar';
-```
-
-The new header should be the one of the forms:
-
-1. `Name: Value`
-1. `Name: `
-1. `Name`
-
-The last two effectively clear the value of the header `Name`.
-
-Nginx variables are allowed in header values. For example:
-
-```nginx
-
-    set $my_var "dog";
-    more_set_headers "Server: $my_var";
-```
-
-But variables won't work in header keys due to performance considerations.
-
-Multiple set/clear header directives are allowed in a single location, and they're executed sequentially.
-
-Directives inherited from an upper level scope (say, http block or server blocks) are executed before the directives in the location block.
-
-Note that although `more_set_headers` is allowed in *location* if blocks, it is *not* allowed in the *server* if blocks, as in
-
-```nginx
-
-   ?  # This is NOT allowed!
-   ?  server {
-   ?      if ($args ~ 'download') {
-   ?          more_set_headers 'Foo: Bar';
-   ?      }
-   ?      ...
-   ?  }
-```
-
-Behind the scene, use of this directive and its friend [more_clear_headers](#more_clear_headers) will (lazily) register an ouput header filter that modifies `r->headers_out` the way you specify.
-
-[Back to TOC](#table-of-contents)
-
-more_clear_headers
-------------------
-**syntax:** *more_clear_headers [-t &lt;content-type list&gt;]... [-s &lt;status-code list&gt;]... &lt;new-header&gt;...*
-
-**default:** *no*
-
-**context:** *http, server, location, location if*
-
-**phase:** *output-header-filter*
-
-Clears the specified output headers.
-
-In fact,
-
-```nginx
-
-    more_clear_headers -s 404 -t 'text/plain' Foo Baz;
-```
-
-is exactly equivalent to
-
-```nginx
-
-    more_set_headers -s 404 -t 'text/plain' "Foo: " "Baz: ";
-```
-
-or
-
-```nginx
-
-    more_set_headers -s 404 -t 'text/plain' Foo Baz
-```
-
-See [more_set_headers](#more_set_headers) for more details.
-
-The wildcard character, `*`, can also be used at the end of the header name to specify a pattern. For example, the following directive
-effectively clears *any* output headers starting by "`X-Hidden-`":
-
-```nginx
-
- more_clear_headers 'X-Hidden-*';
-```
-
-The `*` wildcard support was first introduced in [v0.09](#v009).
-
-[Back to TOC](#table-of-contents)
-
-more_set_input_headers
-----------------------
-**syntax:** *more_set_input_headers [-r] [-t &lt;content-type list&gt;]... &lt;new-header&gt;...*
-
-**default:** *no*
-
-**context:** *http, server, location, location if*
-
-**phase:** *rewrite tail*
-
-Very much like [more_set_headers](#more_set_headers) except that it operates on input headers (or request headers) and it only supports the `-t` option.
-
-Note that using the `-t` option in this directive means filtering by the `Content-Type` *request* header, rather than the response header.
-
-Behind the scene, use of this directive and its friend [more_clear_input_headers](#more_clear_input_headers) will (lazily)
-register a `rewrite phase` handler that modifies `r->headers_in` the way you specify. Note that it always run at the *end* of
-the `rewrite` phase so that it runs *after* the standard [rewrite module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)
-and works in subrequests as well.
-
-If the `-r` option is specified, then the headers will be replaced to the new values *only if* they already exist.
-
-[Back to TOC](#table-of-contents)
-
-more_clear_input_headers
-------------------------
-**syntax:** *more_clear_input_headers [-t &lt;content-type list&gt;]... &lt;new-header&gt;...*
-
-**default:** *no*
-
-**context:** *http, server, location, location if*
-
-**phase:** *rewrite tail*
-
-Clears the specified input headers.
-
-In fact,
-
-```nginx
-
-    more_clear_input_headers -t 'text/plain' Foo Baz;
-```
-
-is exactly equivalent to
-
-```nginx
-
-    more_set_input_headers -t 'text/plain' "Foo: " "Baz: ";
-```
-
-or
-
-```nginx
-
-    more_set_input_headers -t 'text/plain' Foo Baz
-```
-
-To remove request headers "Foo" and "Baz" for all incoming requests regardless of the content type, we can write
-
-```nginx
-
-    more_clear_input_headers "Foo" "Baz";
-```
-
-See [more_set_input_headers](#more_set_input_headers) for more details.
-
-The wildcard character, `*`, can also be used at the end of the header name to specify a pattern. For example, the following directive
-effectively clears *any* input headers starting by "`X-Hidden-`":
-
-```nginx
-
-     more_clear_input_headers 'X-Hidden-*';
-```
-
-[Back to TOC](#table-of-contents)
-
-Limitations
-===========
-
-* Unlike the standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module, this module does not automatically take care of the constraint among the `Expires`, `Cache-Control`, and `Last-Modified` headers. You have to get them right yourself or use the [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module together with this module.
-* You cannot remove the `Connection` response header using this module because the `Connection` response header is generated by the standard `ngx_http_header_filter_module` in the Nginx core, whose output header filter runs always *after* the filter of this module. The only way to actually remove the `Connection` header is to patch the Nginx core, that is, editing the C function `ngx_http_header_filter` in the `src/http/ngx_http_header_filter_module.c` file.
-
-[Back to TOC](#table-of-contents)
-
-Installation
-============
-
-Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
-the version 1.13.6 (see [nginx compatibility](#compatibility)), and then build the source with this module:
-
-```bash
-
- wget 'http://nginx.org/download/nginx-1.13.6.tar.gz'
- tar -xzvf nginx-1.13.6.tar.gz
- cd nginx-1.13.6/
-
- # Here we assume you would install you nginx under /opt/nginx/.
- ./configure --prefix=/opt/nginx \
-     --add-module=/path/to/headers-more-nginx-module
-
- make
- make install
-```
-
-Download the latest version of the release tarball of this module from [headers-more-nginx-module file list](https://github.com/openresty/headers-more-nginx-module/tags).
-
-Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
-`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
-directive, for example,
-
-```nginx
-load_module /path/to/modules/ngx_http_headers_more_filter_module.so;
-```
-
-Also, this module is included and enabled by default in the [OpenResty bundle](http://openresty.org).
-
-[Back to TOC](#table-of-contents)
-
-Compatibility
-=============
-
-The following versions of Nginx should work with this module:
-
-* **1.13.x**                      (last tested: 1.13.6)
-* **1.12.x**
-* **1.11.x**                      (last tested: 1.11.2)
-* **1.10.x**
-* **1.9.x**                       (last tested: 1.9.15)
-* **1.8.x**
-* **1.7.x**                       (last tested: 1.7.10)
-* **1.6.x**                       (last tested: 1.6.2)
-* **1.5.x**                       (last tested: 1.5.8)
-* **1.4.x**                       (last tested: 1.4.4)
-* **1.3.x**                       (last tested: 1.3.7)
-* **1.2.x**                       (last tested: 1.2.9)
-* **1.1.x**                       (last tested: 1.1.5)
-* **1.0.x**                       (last tested: 1.0.11)
-* **0.9.x**                       (last tested: 0.9.4)
-* **0.8.x**                       (last tested: 0.8.54)
-* **0.7.x >= 0.7.44**             (last tested: 0.7.68)
-
-Earlier versions of Nginx like 0.6.x and 0.5.x will *not* work.
-
-If you find that any particular version of Nginx above 0.7.44 does not work with this module, please consider [reporting a bug](#report-bugs).
-
-[Back to TOC](#table-of-contents)
-
-Community
-=========
-
-[Back to TOC](#table-of-contents)
-
-English Mailing List
---------------------
-
-The [openresty-en](https://groups.google.com/group/openresty-en) mailing list is for English speakers.
-
-[Back to TOC](#table-of-contents)
-
-Chinese Mailing List
---------------------
-
-The [openresty](https://groups.google.com/group/openresty) mailing list is for Chinese speakers.
-
-[Back to TOC](#table-of-contents)
-
-Bugs and Patches
-================
-
-Please submit bug reports, wishlists, or patches by
-
-1. creating a ticket on the [GitHub Issue Tracker](https://github.com/chaoslawful/lua-nginx-module/issues),
-1. or posting to the [OpenResty community](#community).
-
-[Back to TOC](#table-of-contents)
-
-Source Repository
-=================
-
-Available on github at [openresty/headers-more-nginx-module](https://github.com/openresty/headers-more-nginx-module).
-
-[Back to TOC](#table-of-contents)
-
-Changes
-=======
-
-The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
-
-<http://openresty.org/#Changes>
-
-[Back to TOC](#table-of-contents)
-
-Test Suite
-==========
-
-This module comes with a Perl-driven test suite. The [test cases](https://github.com/openresty/headers-more-nginx-module/tree/master/t/) are
-[declarative](https://github.com/openresty/headers-more-nginx-module/blob/master/t/sanity.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Nginx) module in the Perl world.
-
-To run it on your side:
-
-```bash
-
- $ PATH=/path/to/your/nginx-with-headers-more-module:$PATH prove -r t
-```
-
-To run the test suite with valgrind's memcheck, use the following commands:
-
-```bash
-
- $ export PATH=/path/to/your/nginx-with-headers-more-module:$PATH
- $ TEST_NGINX_USE_VALGRIND=1 prove -r t
-```
-
-You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
-
-Because a single nginx server (by default, `localhost:1984`) is used across all the test scripts (`.t` files), it's meaningless to run the test suite in parallel by specifying `-jN` when invoking the `prove` utility.
-
-Some parts of the test suite requires modules [proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html), and [echo](https://github.com/openresty/echo-nginx-module) to be enabled as well when building Nginx.
-
-[Back to TOC](#table-of-contents)
-
-TODO
-====
-
-* Support variables in new headers' keys.
-
-[Back to TOC](#table-of-contents)
-
-Getting involved
-================
-
-You'll be very welcomed to submit patches to the [author](#author) or just ask for a commit bit to the [source repository](#source-repository) on GitHub.
-
-[Back to TOC](#table-of-contents)
-
-Authors
-=======
-
-* Yichun "agentzh" Zhang (章亦春) *&lt;agentzh@gmail.com&gt;*, OpenResty Inc.
-* Bernd Dorn ( <http://www.lovelysystems.com/> )
-
-This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
-
-[Back to TOC](#table-of-contents)
-
-Copyright & License
-===================
-
-The code base is borrowed directly from the standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module in Nginx 0.8.24. This part of code is copyrighted by Igor Sysoev.
-
-Copyright (c) 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
-
-Copyright (c) 2010-2013, Bernd Dorn.
-
-This module is licensed under the terms of the BSD license.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-[Back to TOC](#table-of-contents)
-
-See Also
-========
-
-* The original thread on the Nginx mailing list that inspires this module's development: ["A question about add_header replication"](http://forum.nginx.org/read.php?2,11206,11738).
-* The orginal announcement thread on the Nginx mailing list: ["The "headers_more" module: Set and clear output headers...more than 'add'!"](http://forum.nginx.org/read.php?2,23460).
-* The original [blog post](http://agentzh.blogspot.com/2009/11/headers-more-module-scripting-input-and.html) about this module's initial development.
-* The [echo module](https://github.com/openresty/echo-nginx-module) for Nginx module's automated testing.
-* The standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module.
-
-[Back to TOC](#table-of-contents)
-
diff --git a/debian/modules/http-headers-more-filter/config b/debian/modules/http-headers-more-filter/config
deleted file mode 100644
index 5707cc4..0000000
--- a/debian/modules/http-headers-more-filter/config
+++ /dev/null
@@ -1,32 +0,0 @@
-ngx_addon_name=ngx_http_headers_more_filter_module
-
-HEADERS_MORE_SRCS="                                                         \
-                $ngx_addon_dir/src/ngx_http_headers_more_filter_module.c    \
-                $ngx_addon_dir/src/ngx_http_headers_more_headers_out.c      \
-                $ngx_addon_dir/src/ngx_http_headers_more_headers_in.c       \
-                $ngx_addon_dir/src/ngx_http_headers_more_util.c             \
-                "
-
-HEADERS_MORE_DEPS="                                                         \
-                $ngx_addon_dir/src/ddebug.h                                 \
-                $ngx_addon_dir/src/ngx_http_headers_more_filter_module.h    \
-                $ngx_addon_dir/src/ngx_http_headers_more_headers_in.h       \
-                $ngx_addon_dir/src/ngx_http_headers_more_headers_out.h      \
-                $ngx_addon_dir/src/ngx_http_headers_more_headers_in.h       \
-                $ngx_addon_dir/src/ngx_http_headers_more_util.h             \
-                "
-
-if test -n "$ngx_module_link"; then
-    ngx_module_type=HTTP_AUX_FILTER
-    ngx_module_name=$ngx_addon_name
-    ngx_module_incs=
-    ngx_module_deps="$HEADERS_MORE_DEPS"
-    ngx_module_srcs="$HEADERS_MORE_SRCS"
-    ngx_module_libs=
-
-    . auto/module
-else
-    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $HEADERS_MORE_SRCS"
-    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $HEADERS_MORE_DEPS"
-fi
diff --git a/debian/modules/http-headers-more-filter/src/ddebug.h b/debian/modules/http-headers-more-filter/src/ddebug.h
deleted file mode 100644
index 13879af..0000000
--- a/debian/modules/http-headers-more-filter/src/ddebug.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef DDEBUG_H
-#define DDEBUG_H
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <nginx.h>
-
-
-#if defined(DDEBUG) && (DDEBUG)
-
-#   if (NGX_HAVE_VARIADIC_MACROS)
-
-#       define dd(...) fprintf(stderr, "headers-more *** %s: ", __func__); \
-            fprintf(stderr, __VA_ARGS__); \
-            fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
-
-#   else
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include <stdarg.h>
-
-static ngx_inline void
-dd(const char * fmt, ...) {
-}
-
-#    endif
-
-#   if DDEBUG > 1
-
-#       define dd_enter() dd_enter_helper(r, __func__)
-
-#       if defined(nginx_version) && nginx_version >= 8011
-#           define dd_main_req_count r->main->count
-#       else
-#           define dd_main_req_count 0
-#       endif
-
-static ngx_inline void
-dd_enter_helper(ngx_http_request_t *r, const char *func)
-{
-    ngx_http_posted_request_t       *pr;
-
-    fprintf(stderr, "headers-more *** enter %s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
-            func,
-            (int) r->method_name.len, r->method_name.data,
-            (int) r->uri.len, r->uri.data,
-            (int) r->args.len, r->args.data,
-            (int) dd_main_req_count, r->main,
-            r, r->connection->data, r->parent);
-
-    if (r->posted_requests) {
-        fprintf(stderr, " posted:");
-
-        for (pr = r->posted_requests; pr; pr = pr->next) {
-            fprintf(stderr, "%p,", pr);
-        }
-    }
-
-    fprintf(stderr, "\n");
-}
-
-#   else
-
-#       define dd_enter()
-
-#   endif
-
-#else
-
-#   if (NGX_HAVE_VARIADIC_MACROS)
-
-#       define dd(...)
-
-#       define dd_enter()
-
-#   else
-
-#include <stdarg.h>
-
-static ngx_inline void
-dd(const char * fmt, ...) {
-}
-
-static ngx_inline void
-dd_enter() {
-}
-
-#   endif
-
-#endif
-
-#if defined(DDEBUG) && (DDEBUG)
-
-#define dd_check_read_event_handler(r)   \
-    dd("r->read_event_handler = %s", \
-        r->read_event_handler == ngx_http_block_reading ? \
-            "ngx_http_block_reading" : \
-        r->read_event_handler == ngx_http_test_reading ? \
-            "ngx_http_test_reading" : \
-        r->read_event_handler == ngx_http_request_empty_handler ? \
-            "ngx_http_request_empty_handler" : "UNKNOWN")
-
-#define dd_check_write_event_handler(r)   \
-    dd("r->write_event_handler = %s", \
-        r->write_event_handler == ngx_http_handler ? \
-            "ngx_http_handler" : \
-        r->write_event_handler == ngx_http_core_run_phases ? \
-            "ngx_http_core_run_phases" : \
-        r->write_event_handler == ngx_http_request_empty_handler ? \
-            "ngx_http_request_empty_handler" : "UNKNOWN")
-
-#else
-
-#define dd_check_read_event_handler(r)
-#define dd_check_write_event_handler(r)
-
-#endif
-
-#endif /* DDEBUG_H */
-
diff --git a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.c b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.c
deleted file mode 100644
index 0bb6fec..0000000
--- a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.c
+++ /dev/null
@@ -1,348 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_headers_more_filter_module.h"
-#include "ngx_http_headers_more_headers_out.h"
-#include "ngx_http_headers_more_headers_in.h"
-#include "ngx_http_headers_more_util.h"
-#include <ngx_config.h>
-
-
-/* config handlers */
-
-static void *ngx_http_headers_more_create_loc_conf(ngx_conf_t *cf);
-static char *ngx_http_headers_more_merge_loc_conf(ngx_conf_t *cf,
-    void *parent, void *child);
-static void *ngx_http_headers_more_create_main_conf(ngx_conf_t *cf);
-static ngx_int_t ngx_http_headers_more_post_config(ngx_conf_t *cf);
-
-/* post-read-phase handler */
-
-static ngx_int_t ngx_http_headers_more_handler(ngx_http_request_t *r);
-
-/* filter handlers */
-
-static ngx_int_t ngx_http_headers_more_filter_init(ngx_conf_t *cf);
-
-ngx_uint_t  ngx_http_headers_more_location_hash = 0;
-
-
-static ngx_command_t  ngx_http_headers_more_filter_commands[] = {
-
-    { ngx_string("more_set_headers"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_1MORE,
-      ngx_http_headers_more_set_headers,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL},
-
-    { ngx_string("more_clear_headers"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_1MORE,
-      ngx_http_headers_more_clear_headers,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL},
-
-    { ngx_string("more_set_input_headers"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_1MORE,
-      ngx_http_headers_more_set_input_headers,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL},
-
-    { ngx_string("more_clear_input_headers"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                        |NGX_CONF_1MORE,
-      ngx_http_headers_more_clear_input_headers,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL},
-
-      ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_http_headers_more_filter_module_ctx = {
-    NULL,                                   /* preconfiguration */
-    ngx_http_headers_more_post_config,      /* postconfiguration */
-
-    ngx_http_headers_more_create_main_conf, /* create main configuration */
-    NULL,                                   /* init main configuration */
-
-    NULL,                                   /* create server configuration */
-    NULL,                                   /* merge server configuration */
-
-    ngx_http_headers_more_create_loc_conf,  /* create location configuration */
-    ngx_http_headers_more_merge_loc_conf    /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_http_headers_more_filter_module = {
-    NGX_MODULE_V1,
-    &ngx_http_headers_more_filter_module_ctx,   /* module context */
-    ngx_http_headers_more_filter_commands,      /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
-
-
-static volatile ngx_cycle_t  *ngx_http_headers_more_prev_cycle = NULL;
-
-
-static ngx_int_t
-ngx_http_headers_more_filter(ngx_http_request_t *r)
-{
-    ngx_int_t                            rc;
-    ngx_uint_t                           i;
-    ngx_http_headers_more_loc_conf_t    *conf;
-    ngx_http_headers_more_cmd_t         *cmd;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "headers more header filter, uri \"%V\"", &r->uri);
-
-    conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_more_filter_module);
-
-    if (conf->cmds) {
-        cmd = conf->cmds->elts;
-        for (i = 0; i < conf->cmds->nelts; i++) {
-            if (cmd[i].is_input) {
-                continue;
-            }
-
-            rc = ngx_http_headers_more_exec_cmd(r, &cmd[i]);
-
-            if (rc != NGX_OK) {
-                return rc;
-            }
-        }
-    }
-
-    return ngx_http_next_header_filter(r);
-}
-
-
-static ngx_int_t
-ngx_http_headers_more_filter_init(ngx_conf_t *cf)
-{
-    ngx_http_next_header_filter = ngx_http_top_header_filter;
-    ngx_http_top_header_filter = ngx_http_headers_more_filter;
-
-    return NGX_OK;
-}
-
-
-static void *
-ngx_http_headers_more_create_loc_conf(ngx_conf_t *cf)
-{
-    ngx_http_headers_more_loc_conf_t    *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_headers_more_loc_conf_t));
-    if (conf == NULL) {
-        return NULL;
-    }
-
-    /*
-     * set by ngx_pcalloc():
-     *
-     *     conf->cmds = NULL;
-     */
-
-    return conf;
-}
-
-
-static char *
-ngx_http_headers_more_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_uint_t                           i;
-    ngx_uint_t                           orig_len;
-    ngx_http_headers_more_cmd_t         *prev_cmd, *cmd;
-    ngx_http_headers_more_loc_conf_t    *prev = parent;
-    ngx_http_headers_more_loc_conf_t    *conf = child;
-
-    if (conf->cmds == NULL || conf->cmds->nelts == 0) {
-        conf->cmds = prev->cmds;
-
-    } else if (prev->cmds && prev->cmds->nelts) {
-        orig_len = conf->cmds->nelts;
-
-        (void) ngx_array_push_n(conf->cmds, prev->cmds->nelts);
-
-        cmd = conf->cmds->elts;
-
-        for (i = 0; i < orig_len; i++) {
-            cmd[conf->cmds->nelts - 1 - i] = cmd[orig_len - 1 - i];
-        }
-
-        prev_cmd = prev->cmds->elts;
-
-        for (i = 0; i < prev->cmds->nelts; i++) {
-            cmd[i] = prev_cmd[i];
-        }
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_http_headers_more_post_config(ngx_conf_t *cf)
-{
-    int                              multi_http_blocks;
-    ngx_int_t                        rc;
-    ngx_http_handler_pt             *h;
-    ngx_http_core_main_conf_t       *cmcf;
-
-    ngx_http_headers_more_main_conf_t       *hmcf;
-
-    ngx_http_headers_more_location_hash =
-                               ngx_http_headers_more_hash_literal("location");
-
-    hmcf = ngx_http_conf_get_module_main_conf(cf,
-                                         ngx_http_headers_more_filter_module);
-
-    if (ngx_http_headers_more_prev_cycle != ngx_cycle) {
-        ngx_http_headers_more_prev_cycle = ngx_cycle;
-        multi_http_blocks = 0;
-
-    } else {
-        multi_http_blocks = 1;
-    }
-
-    if (multi_http_blocks || hmcf->requires_filter) {
-        rc = ngx_http_headers_more_filter_init(cf);
-        if (rc != NGX_OK) {
-            return rc;
-        }
-    }
-
-    if (!hmcf->requires_handler) {
-        return NGX_OK;
-    }
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    h = ngx_array_push(&cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    *h = ngx_http_headers_more_handler;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_headers_more_handler(ngx_http_request_t *r)
-{
-    ngx_int_t                            rc;
-    ngx_uint_t                           i;
-    ngx_http_headers_more_loc_conf_t    *conf;
-    ngx_http_headers_more_main_conf_t   *hmcf;
-    ngx_http_headers_more_cmd_t         *cmd;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "headers more rewrite handler, uri \"%V\"", &r->uri);
-
-    hmcf = ngx_http_get_module_main_conf(r,
-                                         ngx_http_headers_more_filter_module);
-
-    if (!hmcf->postponed_to_phase_end) {
-        ngx_http_core_main_conf_t       *cmcf;
-        ngx_http_phase_handler_t         tmp;
-        ngx_http_phase_handler_t        *ph;
-        ngx_http_phase_handler_t        *cur_ph;
-        ngx_http_phase_handler_t        *last_ph;
-
-        hmcf->postponed_to_phase_end = 1;
-
-        cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-        ph = cmcf->phase_engine.handlers;
-        cur_ph = &ph[r->phase_handler];
-        last_ph = &ph[cur_ph->next - 1];
-
-        if (cur_ph < last_ph) {
-            dd("swaping the contents of cur_ph and last_ph...");
-
-            tmp = *cur_ph;
-
-            memmove(cur_ph, cur_ph + 1,
-                    (last_ph - cur_ph) * sizeof (ngx_http_phase_handler_t));
-
-            *last_ph = tmp;
-
-            r->phase_handler--; /* redo the current ph */
-
-            return NGX_DECLINED;
-        }
-    }
-
-    dd("running phase handler...");
-
-    conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_more_filter_module);
-
-    if (conf->cmds) {
-        if (r->http_version < NGX_HTTP_VERSION_10) {
-            return NGX_DECLINED;
-        }
-
-        cmd = conf->cmds->elts;
-        for (i = 0; i < conf->cmds->nelts; i++) {
-            if (!cmd[i].is_input) {
-                continue;
-            }
-
-            rc = ngx_http_headers_more_exec_input_cmd(r, &cmd[i]);
-
-            if (rc != NGX_OK) {
-                return rc;
-            }
-        }
-    }
-
-    return NGX_DECLINED;
-}
-
-
-static void *
-ngx_http_headers_more_create_main_conf(ngx_conf_t *cf)
-{
-    ngx_http_headers_more_main_conf_t    *hmcf;
-
-    hmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_headers_more_main_conf_t));
-    if (hmcf == NULL) {
-        return NULL;
-    }
-
-    /* set by ngx_pcalloc:
-     *      hmcf->postponed_to_phase_end = 0;
-     *      hmcf->requires_filter        = 0;
-     *      hmcf->requires_handler       = 0;
-     */
-
-    return hmcf;
-}
diff --git a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.h b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.h
deleted file mode 100644
index 72a5317..0000000
--- a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_filter_module.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-/*
- * Copyright (c) Yichun Zhang (agentzh)
- */
-
-
-#ifndef NGX_HTTP_HEADERS_MORE_FILTER_MODULE_H
-#define NGX_HTTP_HEADERS_MORE_FILTER_MODULE_H
-
-
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <assert.h>
-
-
-typedef enum {
-    ngx_http_headers_more_opcode_set,
-    ngx_http_headers_more_opcode_clear
-} ngx_http_headers_more_opcode_t;
-
-
-typedef struct {
-    ngx_array_t                       *types; /* of ngx_str_t */
-    ngx_array_t                       *statuses; /* of ngx_uint_t */
-    ngx_array_t                       *headers; /* of ngx_http_header_val_t */
-    ngx_flag_t                         is_input;
-} ngx_http_headers_more_cmd_t;
-
-
-typedef struct {
-    ngx_array_t             *cmds; /* of ngx_http_headers_more_cmd_t */
-} ngx_http_headers_more_loc_conf_t;
-
-
-typedef struct {
-    ngx_int_t              postponed_to_phase_end;
-    ngx_int_t              requires_filter;
-    ngx_int_t              requires_handler;
-} ngx_http_headers_more_main_conf_t;
-
-
-typedef struct ngx_http_headers_more_header_val_s
-    ngx_http_headers_more_header_val_t;
-
-
-typedef ngx_int_t (*ngx_http_headers_more_set_header_pt)(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-
-
-typedef struct {
-    ngx_str_t                               name;
-    ngx_uint_t                              offset;
-    ngx_http_headers_more_set_header_pt     handler;
-} ngx_http_headers_more_set_header_t;
-
-
-struct ngx_http_headers_more_header_val_s {
-    ngx_http_complex_value_t                value;
-    ngx_uint_t                              hash;
-    ngx_str_t                               key;
-    ngx_http_headers_more_set_header_pt     handler;
-    ngx_uint_t                              offset;
-    ngx_flag_t                              replace;
-    ngx_flag_t                              wildcard;
-};
-
-
-extern ngx_module_t  ngx_http_headers_more_filter_module;
-
-
-#ifndef ngx_str_set
-#define ngx_str_set(str, text)                                               \
-        (str)->len = sizeof(text) - 1; (str)->data = (u_char *) text
-#endif
-
-
-#define ngx_http_headers_more_assert(a)  assert(a)
-
-
-#endif /* NGX_HTTP_HEADERS_MORE_FILTER_MODULE_H */
diff --git a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c
deleted file mode 100644
index c3eb8f7..0000000
--- a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.c
+++ /dev/null
@@ -1,899 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_headers_more_headers_in.h"
-#include "ngx_http_headers_more_util.h"
-#include <ctype.h>
-
-
-static char *ngx_http_headers_more_parse_directive(ngx_conf_t *cf,
-    ngx_command_t *ngx_cmd, void *conf,
-    ngx_http_headers_more_opcode_t opcode);
-static int ngx_http_headers_more_check_type(ngx_http_request_t *r,
-    ngx_array_t *types);
-static ngx_int_t ngx_http_set_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_header_helper(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value,
-    ngx_table_elt_t **output_header);
-static ngx_int_t ngx_http_set_builtin_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_user_agent_header(ngx_http_request_t *r,
-    ngx_http_headers_more_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_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_clear_builtin_header(ngx_http_request_t *r,
-    ngx_http_headers_more_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_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_host_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_connection_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_headers_more_validate_host(ngx_str_t *host,
-    ngx_pool_t *pool, ngx_uint_t alloc);
-
-
-static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
-        = {
-
-    { ngx_string("Host"),
-                 offsetof(ngx_http_headers_in_t, host),
-                 ngx_http_set_host_header },
-
-    { ngx_string("Connection"),
-                 offsetof(ngx_http_headers_in_t, connection),
-                 ngx_http_set_connection_header },
-
-    { ngx_string("If-Modified-Since"),
-                 offsetof(ngx_http_headers_in_t, if_modified_since),
-                 ngx_http_set_builtin_header },
-
-#if defined(nginx_version) && nginx_version >= 9002
-    { ngx_string("If-Unmodified-Since"),
-                 offsetof(ngx_http_headers_in_t, if_unmodified_since),
-                 ngx_http_set_builtin_header },
-#endif
-
-#if defined(nginx_version) && nginx_version >= 1003003
-    { ngx_string("If-Match"),
-                 offsetof(ngx_http_headers_in_t, if_match),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("If-None-Match"),
-                 offsetof(ngx_http_headers_in_t, if_none_match),
-                 ngx_http_set_builtin_header },
-#endif
-
-    { ngx_string("User-Agent"),
-                 offsetof(ngx_http_headers_in_t, user_agent),
-                 ngx_http_set_user_agent_header },
-
-    { ngx_string("Referer"),
-                 offsetof(ngx_http_headers_in_t, referer),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Content-Length"),
-                 offsetof(ngx_http_headers_in_t, content_length),
-                 ngx_http_set_content_length_header },
-
-    { ngx_string("Content-Type"),
-                 offsetof(ngx_http_headers_in_t, content_type),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Range"),
-                 offsetof(ngx_http_headers_in_t, range),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("If-Range"),
-                 offsetof(ngx_http_headers_in_t, if_range),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Transfer-Encoding"),
-                 offsetof(ngx_http_headers_in_t, transfer_encoding),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Expect"),
-                 offsetof(ngx_http_headers_in_t, expect),
-                 ngx_http_set_builtin_header },
-
-#if defined(nginx_version) && nginx_version >= 1003013
-    { ngx_string("Upgrade"),
-                 offsetof(ngx_http_headers_in_t, upgrade),
-                 ngx_http_set_builtin_header },
-#endif
-
-#if (NGX_HTTP_GZIP)
-    { ngx_string("Accept-Encoding"),
-                 offsetof(ngx_http_headers_in_t, accept_encoding),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Via"), offsetof(ngx_http_headers_in_t, via),
-                 ngx_http_set_builtin_header },
-#endif
-
-    { ngx_string("Authorization"),
-                 offsetof(ngx_http_headers_in_t, authorization),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Keep-Alive"),
-                 offsetof(ngx_http_headers_in_t, keep_alive),
-                 ngx_http_set_builtin_header },
-
-#if (NGX_HTTP_X_FORWARDED_FOR)
-    { ngx_string("X-Forwarded-For"),
-                 offsetof(ngx_http_headers_in_t, x_forwarded_for),
-                 ngx_http_set_builtin_multi_header },
-
-#endif
-
-#if (NGX_HTTP_REALIP)
-    { ngx_string("X-Real-IP"),
-                 offsetof(ngx_http_headers_in_t, x_real_ip),
-                 ngx_http_set_builtin_header },
-#endif
-
-#if (NGX_HTTP_DAV)
-    { ngx_string("Depth"), offsetof(ngx_http_headers_in_t, depth),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Destination"), offsetof(ngx_http_headers_in_t, destination),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Overwrite"), offsetof(ngx_http_headers_in_t, overwrite),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Date"), offsetof(ngx_http_headers_in_t, date),
-                 ngx_http_set_builtin_header },
-#endif
-
-    { ngx_string("Cookie"),
-                 offsetof(ngx_http_headers_in_t, cookies),
-                 ngx_http_set_builtin_multi_header },
-
-    { ngx_null_string, 0, ngx_http_set_header }
-};
-
-
-ngx_int_t
-ngx_http_headers_more_exec_input_cmd(ngx_http_request_t *r,
-    ngx_http_headers_more_cmd_t *cmd)
-{
-    ngx_str_t                                    value;
-    ngx_http_headers_more_header_val_t          *h;
-    ngx_uint_t                                   i;
-
-    if (!cmd->headers) {
-        return NGX_OK;
-    }
-
-    if (cmd->types && !ngx_http_headers_more_check_type(r, cmd->types)) {
-        return NGX_OK;
-    }
-
-    h = cmd->headers->elts;
-    for (i = 0; i < cmd->headers->nelts; i++) {
-
-        if (ngx_http_complex_value(r, &h[i].value, &value) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        if (value.len) {
-            value.len--;  /* remove the trailing '\0' added by
-                             ngx_http_headers_more_parse_header */
-        }
-
-        if (h[i].handler(r, &h[i], &value) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    return ngx_http_set_header_helper(r, hv, value, NULL);
-}
-
-
-static ngx_int_t
-ngx_http_set_header_helper(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value,
-    ngx_table_elt_t **output_header)
-{
-    ngx_table_elt_t             *h, *matched;
-    ngx_list_part_t             *part;
-    ngx_uint_t                   i;
-    ngx_uint_t                   rc;
-
-    dd_enter();
-
-    matched = NULL;
-
-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;
-            }
-
-            part = part->next;
-            h = part->elts;
-            i = 0;
-        }
-
-        if (!hv->wildcard
-            && h[i].key.len == hv->key.len
-            && ngx_strncasecmp(h[i].key.data, hv->key.data,
-                               h[i].key.len) == 0)
-        {
-            goto matched;
-        }
-
-        if (hv->wildcard
-            && value->len == 0
-            && h[i].key.len >= hv->key.len - 1
-            && ngx_strncasecmp(h[i].key.data, hv->key.data,
-                               hv->key.len - 1) == 0)
-        {
-            goto matched;
-        }
-
-        /* not matched */
-        continue;
-
-matched:
-
-        if (value->len == 0 || (matched && matched != &h[i])) {
-            h[i].hash = 0;
-
-            rc = ngx_http_headers_more_rm_header_helper(
-                                        &r->headers_in.headers, part, i);
-
-            ngx_http_headers_more_assert(
-                !(r->headers_in.headers.part.next == NULL
-                  && r->headers_in.headers.last
-                     != &r->headers_in.headers.part));
-
-            if (rc == NGX_OK) {
-                if (output_header) {
-                    *output_header = NULL;
-                }
-
-                goto retry;
-            }
-
-            return NGX_ERROR;
-        }
-
-        h[i].value = *value;
-
-        if (output_header) {
-            *output_header = &h[i];
-            dd("setting existing builtin input header");
-        }
-
-        if (matched == NULL) {
-            matched = &h[i];
-        }
-    }
-
-    if (matched) {
-        return NGX_OK;
-    }
-
-    if (value->len == 0 || hv->replace) {
-        return NGX_OK;
-    }
-
-    if (r->headers_in.headers.last == NULL) {
-        /* must be 400 bad request */
-        return NGX_OK;
-    }
-
-    h = ngx_list_push(&r->headers_in.headers);
-
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    dd("created new header for %.*s", (int) hv->key.len, hv->key.data);
-
-    if (value->len == 0) {
-        h->hash = 0;
-
-    } else {
-        h->hash = hv->hash;
-    }
-
-    h->key = hv->key;
-    h->value = *value;
-
-    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
-    if (h->lowcase_key == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
-
-    if (output_header) {
-        *output_header = h;
-
-        while (r != r->main) {
-            r->parent->headers_in = r->headers_in;
-            r = r->parent;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_builtin_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    ngx_table_elt_t             *h, **old;
-
-    dd("entered set_builtin_header (input)");
-
-    if (hv->offset) {
-        old = (ngx_table_elt_t **) ((char *) &r->headers_in + hv->offset);
-
-    } else {
-        old = NULL;
-    }
-
-    dd("old builtin ptr ptr: %p", old);
-    if (old) {
-        dd("old builtin ptr: %p", *old);
-    }
-
-    if (old == NULL || *old == NULL) {
-        dd("set normal header");
-        return ngx_http_set_header_helper(r, hv, value, old);
-    }
-
-    h = *old;
-
-    if (value->len == 0) {
-        h->hash = 0;
-        h->value = *value;
-
-        return ngx_http_set_header_helper(r, hv, value, old);
-    }
-
-    h->hash = hv->hash;
-    h->value = *value;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_host_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    ngx_str_t host;
-
-    if (value->len) {
-        host= *value;
-
-        if (ngx_http_headers_more_validate_host(&host, r->pool, 0) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        r->headers_in.server = host;
-
-    } else {
-        r->headers_in.server = *value;
-    }
-
-    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_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    off_t           len;
-
-    if (value->len == 0) {
-        return ngx_http_clear_content_length_header(r, hv, value);
-    }
-
-    len = ngx_atosz(value->data, value->len);
-    if (len == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    dd("reset headers_in.content_length_n to %d", (int) len);
-
-    r->headers_in.content_length_n = len;
-
-    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_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    r->headers_in.content_length_n = -1;
-
-    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_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    value->len = 0;
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-char *
-ngx_http_headers_more_set_input_headers(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_headers_more_parse_directive(cf, cmd, conf,
-                                         ngx_http_headers_more_opcode_set);
-}
-
-
-char *
-ngx_http_headers_more_clear_input_headers(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_headers_more_parse_directive(cf, cmd, conf,
-                                        ngx_http_headers_more_opcode_clear);
-}
-
-
-static int
-ngx_http_headers_more_check_type(ngx_http_request_t *r, ngx_array_t *types)
-{
-    ngx_uint_t           i;
-    ngx_str_t           *t;
-    ngx_str_t            actual_type;
-
-    if (r->headers_in.content_type == NULL) {
-        return 0;
-    }
-
-    actual_type = r->headers_in.content_type->value;
-    if (actual_type.len == 0) {
-        return 0;
-    }
-
-    dd("headers_in->content_type: %.*s",
-       (int) actual_type.len,
-       actual_type.data);
-
-    t = types->elts;
-    for (i = 0; i < types->nelts; i++) {
-        dd("...comparing with type [%.*s]", (int) t[i].len, t[i].data);
-
-        if (actual_type.len == t[i].len
-            && ngx_strncmp(actual_type.data, t[i].data, t[i].len) == 0)
-        {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-
-static char *
-ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
-    void *conf, ngx_http_headers_more_opcode_t opcode)
-{
-    ngx_http_headers_more_loc_conf_t   *hlcf = conf;
-
-    ngx_uint_t                          i;
-    ngx_http_headers_more_cmd_t        *cmd;
-    ngx_str_t                          *arg;
-    ngx_flag_t                          ignore_next_arg;
-    ngx_str_t                          *cmd_name;
-    ngx_int_t                           rc;
-    ngx_flag_t                          replace = 0;
-    ngx_http_headers_more_header_val_t *h;
-
-    ngx_http_headers_more_main_conf_t  *hmcf;
-
-    if (hlcf->cmds == NULL) {
-        hlcf->cmds = ngx_array_create(cf->pool, 1,
-                                      sizeof(ngx_http_headers_more_cmd_t));
-
-        if (hlcf->cmds == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    cmd = ngx_array_push(hlcf->cmds);
-
-    if (cmd == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    cmd->headers = ngx_array_create(cf->pool, 1,
-                                    sizeof(ngx_http_headers_more_header_val_t));
-
-    if (cmd->headers == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    cmd->types = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t));
-    if (cmd->types == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    cmd->statuses = NULL;
-
-    arg = cf->args->elts;
-
-    cmd_name = &arg[0];
-
-    ignore_next_arg = 0;
-
-    for (i = 1; i < cf->args->nelts; i++) {
-        if (ignore_next_arg) {
-            ignore_next_arg = 0;
-            continue;
-        }
-
-        if (arg[i].len == 0) {
-            continue;
-        }
-
-        if (arg[i].data[0] != '-') {
-            rc = ngx_http_headers_more_parse_header(cf, cmd_name,
-                                                    &arg[i], cmd->headers,
-                                                    opcode,
-                                        ngx_http_headers_more_set_handlers);
-
-            if (rc != NGX_OK) {
-                return NGX_CONF_ERROR;
-            }
-
-            continue;
-        }
-
-        if (arg[i].len == 2) {
-            if (arg[i].data[1] == 't') {
-                if (i == cf->args->nelts - 1) {
-                    ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                                  "%V: option -t takes an argument.",
-                                  cmd_name);
-
-                    return NGX_CONF_ERROR;
-                }
-
-                rc = ngx_http_headers_more_parse_types(cf->log, cmd_name,
-                                                       &arg[i + 1],
-                                                       cmd->types);
-
-                if (rc != NGX_OK) {
-                    return NGX_CONF_ERROR;
-                }
-
-                ignore_next_arg = 1;
-
-                continue;
-            }
-
-            if (arg[i].data[1] == 'r') {
-                dd("Found replace flag");
-                replace = 1;
-                continue;
-            }
-        }
-
-        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                      "%V: invalid option name: \"%V\"", cmd_name, &arg[i]);
-
-        return NGX_CONF_ERROR;
-    }
-
-    dd("Found %d types, and %d headers",
-       (int) cmd->types->nelts,
-       (int) cmd->headers->nelts);
-
-    if (cmd->headers->nelts == 0) {
-        ngx_pfree(cf->pool, cmd->headers);
-        cmd->headers = NULL;
-
-    } else {
-        h = cmd->headers->elts;
-        for (i = 0; i < cmd->headers->nelts; i++) {
-            h[i].replace = replace;
-        }
-    }
-
-    if (cmd->types->nelts == 0) {
-        ngx_pfree(cf->pool, cmd->types);
-        cmd->types = NULL;
-    }
-
-    cmd->is_input = 1;
-
-    hmcf = ngx_http_conf_get_module_main_conf(cf,
-                                         ngx_http_headers_more_filter_module);
-
-    hmcf->requires_handler = 1;
-
-    return NGX_CONF_OK;
-}
-
-
-/* borrowed the code from ngx_http_request.c:ngx_http_process_user_agent */
-static ngx_int_t
-ngx_http_set_user_agent_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    u_char  *user_agent, *msie;
-
-    /* clear existing settings */
-
-    r->headers_in.msie = 0;
-    r->headers_in.msie6 = 0;
-    r->headers_in.opera = 0;
-    r->headers_in.gecko = 0;
-    r->headers_in.chrome = 0;
-    r->headers_in.safari = 0;
-    r->headers_in.konqueror = 0;
-
-    if (value->len == 0) {
-        return ngx_http_set_builtin_header(r, hv, value);
-    }
-
-    /* check some widespread browsers */
-
-    user_agent = value->data;
-
-    msie = ngx_strstrn(user_agent, "MSIE ", 5 - 1);
-
-    if (msie && msie + 7 < user_agent + value->len) {
-
-        r->headers_in.msie = 1;
-
-        if (msie[6] == '.') {
-
-            switch (msie[5]) {
-            case '4':
-            case '5':
-                r->headers_in.msie6 = 1;
-                break;
-            case '6':
-                if (ngx_strstrn(msie + 8, "SV1", 3 - 1) == NULL) {
-                    r->headers_in.msie6 = 1;
-                }
-                break;
-            }
-        }
-    }
-
-    if (ngx_strstrn(user_agent, "Opera", 5 - 1)) {
-        r->headers_in.opera = 1;
-        r->headers_in.msie = 0;
-        r->headers_in.msie6 = 0;
-    }
-
-    if (!r->headers_in.msie && !r->headers_in.opera) {
-
-        if (ngx_strstrn(user_agent, "Gecko/", 6 - 1)) {
-            r->headers_in.gecko = 1;
-
-        } else if (ngx_strstrn(user_agent, "Chrome/", 7 - 1)) {
-            r->headers_in.chrome = 1;
-
-        } else if (ngx_strstrn(user_agent, "Safari/", 7 - 1)
-                   && ngx_strstrn(user_agent, "Mac OS X", 8 - 1))
-        {
-            r->headers_in.safari = 1;
-
-        } else if (ngx_strstrn(user_agent, "Konqueror", 9 - 1)) {
-            r->headers_in.konqueror = 1;
-        }
-    }
-
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-static ngx_int_t
-ngx_http_set_connection_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    r->headers_in.connection_type = 0;
-
-    if (value->len == 0) {
-        return ngx_http_set_builtin_header(r, hv, value);
-    }
-
-    if (ngx_strcasestrn(value->data, "close", 5 - 1)) {
-        r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE;
-        r->headers_in.keep_alive_n = -1;
-
-    } else if (ngx_strcasestrn(value->data, "keep-alive", 10 - 1)) {
-        r->headers_in.connection_type = NGX_HTTP_CONNECTION_KEEP_ALIVE;
-    }
-
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-static ngx_int_t
-ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    ngx_array_t       *headers;
-    ngx_table_elt_t  **v, *h;
-
-    if (r->headers_out.status == 400 || r->headers_in.headers.last == NULL) {
-        /* must be a 400 Bad Request */
-        return NGX_OK;
-    }
-
-    headers = (ngx_array_t *) ((char *) &r->headers_in + hv->offset);
-
-    if (headers->nelts > 0) {
-        ngx_array_destroy(headers);
-
-        if (ngx_array_init(headers, r->pool, 2,
-                           sizeof(ngx_table_elt_t *))
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
-        dd("clear multi-value headers: %d", (int) headers->nelts);
-    }
-
-#if 1
-    if (headers->nalloc == 0) {
-        if (ngx_array_init(headers, r->pool, 2,
-                           sizeof(ngx_table_elt_t *))
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-#endif
-
-    h = NULL;
-    if (ngx_http_set_header_helper(r, hv, value, &h) == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    if (value->len == 0) {
-        return NGX_OK;
-    }
-
-    dd("new cookie header: %p", h);
-
-    v = ngx_array_push(headers);
-    if (v == NULL) {
-        return NGX_ERROR;
-    }
-
-    *v = h;
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_headers_more_validate_host(ngx_str_t *host, ngx_pool_t *pool,
-    ngx_uint_t alloc)
-{
-    u_char  *h, ch;
-    size_t   i, dot_pos, host_len;
-
-    enum {
-        sw_usual = 0,
-        sw_literal,
-        sw_rest
-    } state;
-
-    dot_pos = host->len;
-    host_len = host->len;
-
-    h = host->data;
-
-    state = sw_usual;
-
-    for (i = 0; i < host->len; i++) {
-        ch = h[i];
-
-        switch (ch) {
-
-        case '.':
-            if (dot_pos == i - 1) {
-                return NGX_DECLINED;
-            }
-            dot_pos = i;
-            break;
-
-        case ':':
-            if (state == sw_usual) {
-                host_len = i;
-                state = sw_rest;
-            }
-            break;
-
-        case '[':
-            if (i == 0) {
-                state = sw_literal;
-            }
-            break;
-
-        case ']':
-            if (state == sw_literal) {
-                host_len = i + 1;
-                state = sw_rest;
-            }
-            break;
-
-        case '\0':
-            return NGX_DECLINED;
-
-        default:
-
-            if (ngx_path_separator(ch)) {
-                return NGX_DECLINED;
-            }
-
-            if (ch >= 'A' && ch <= 'Z') {
-                alloc = 1;
-            }
-
-            break;
-        }
-    }
-
-    if (dot_pos == host_len - 1) {
-        host_len--;
-    }
-
-    if (host_len == 0) {
-        return NGX_DECLINED;
-    }
-
-    if (alloc) {
-        host->data = ngx_pnalloc(pool, host_len);
-        if (host->data == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_strlow(host->data, h, host_len);
-    }
-
-    host->len = host_len;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.h b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.h
deleted file mode 100644
index d2251da..0000000
--- a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_in.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright (c) Yichun Zhang (agentzh)
- */
-
-
-#ifndef NGX_HTTP_HEADERS_MORE_INPUT_HEADERS_H
-#define NGX_HTTP_HEADERS_MORE_INPUT_HEADERS_H
-
-
-#include "ngx_http_headers_more_filter_module.h"
-
-
-/* output header setters and clearers */
-
-ngx_int_t ngx_http_headers_more_exec_input_cmd(ngx_http_request_t *r,
-    ngx_http_headers_more_cmd_t *cmd);
-
-char *ngx_http_headers_more_set_input_headers(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-
-char *ngx_http_headers_more_clear_input_headers(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-
-
-#endif /* NGX_HTTP_HEADERS_MORE_INPUT_HEADERS_H */
diff --git a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.c b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.c
deleted file mode 100644
index 0f9bc87..0000000
--- a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.c
+++ /dev/null
@@ -1,716 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_headers_more_headers_out.h"
-#include "ngx_http_headers_more_util.h"
-#include <ctype.h>
-
-
-static char *
-ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
-        void *conf, ngx_http_headers_more_opcode_t opcode);
-static ngx_flag_t ngx_http_headers_more_check_type(ngx_http_request_t *r,
-        ngx_array_t *types);
-static ngx_flag_t ngx_http_headers_more_check_status(ngx_http_request_t *r,
-        ngx_array_t *statuses);
-static ngx_int_t ngx_http_set_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_header_helper(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value,
-    ngx_table_elt_t **output_header, ngx_flag_t no_create);
-static ngx_int_t ngx_http_set_builtin_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_accept_ranges_header(ngx_http_request_t *r,
-    ngx_http_headers_more_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_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_content_type_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_clear_builtin_header(ngx_http_request_t *r,
-    ngx_http_headers_more_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_headers_more_header_val_t *hv, ngx_str_t *value);
-static ngx_int_t ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
-
-
-static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
-    = {
-
-    { ngx_string("Server"),
-                 offsetof(ngx_http_headers_out_t, server),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Date"),
-                 offsetof(ngx_http_headers_out_t, date),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Content-Encoding"),
-                 offsetof(ngx_http_headers_out_t, content_encoding),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Location"),
-                 offsetof(ngx_http_headers_out_t, location),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Refresh"),
-                 offsetof(ngx_http_headers_out_t, refresh),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Last-Modified"),
-                 offsetof(ngx_http_headers_out_t, last_modified),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Content-Range"),
-                 offsetof(ngx_http_headers_out_t, content_range),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Accept-Ranges"),
-                 offsetof(ngx_http_headers_out_t, accept_ranges),
-                 ngx_http_set_accept_ranges_header },
-
-    { ngx_string("WWW-Authenticate"),
-                 offsetof(ngx_http_headers_out_t, www_authenticate),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Expires"),
-                 offsetof(ngx_http_headers_out_t, expires),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("E-Tag"),
-                 offsetof(ngx_http_headers_out_t, etag),
-                 ngx_http_set_builtin_header },
-
-    { ngx_string("Content-Length"),
-                 offsetof(ngx_http_headers_out_t, content_length),
-                 ngx_http_set_content_length_header },
-
-    { ngx_string("Content-Type"),
-                 0,
-                 ngx_http_set_content_type_header },
-
-    { ngx_string("Cache-Control"),
-                 offsetof(ngx_http_headers_out_t, cache_control),
-                 ngx_http_set_builtin_multi_header },
-
-    { ngx_null_string, 0, ngx_http_set_header }
-};
-
-
-ngx_int_t
-ngx_http_headers_more_exec_cmd(ngx_http_request_t *r,
-    ngx_http_headers_more_cmd_t *cmd)
-{
-    ngx_str_t                                   value;
-    ngx_http_headers_more_header_val_t         *h;
-    ngx_uint_t                                  i;
-
-    if (!cmd->headers) {
-        return NGX_OK;
-    }
-
-    if (cmd->types && !ngx_http_headers_more_check_type(r, cmd->types)) {
-        return NGX_OK;
-    }
-
-    if (cmd->statuses
-        && !ngx_http_headers_more_check_status(r, cmd->statuses))
-    {
-        return NGX_OK;
-    }
-
-    h = cmd->headers->elts;
-    for (i = 0; i < cmd->headers->nelts; i++) {
-
-        if (ngx_http_complex_value(r, &h[i].value, &value) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        if (value.len) {
-            value.len--;  /* remove the trailing '\0' added by
-                             ngx_http_headers_more_parse_header */
-        }
-
-        if (h[i].handler(r, &h[i], &value) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    return ngx_http_set_header_helper(r, hv, value, NULL, 0);
-}
-
-
-static ngx_int_t
-ngx_http_set_header_helper(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value,
-    ngx_table_elt_t **output_header, ngx_flag_t no_create)
-{
-    ngx_table_elt_t             *h;
-    ngx_list_part_t             *part;
-    ngx_uint_t                   i;
-    ngx_flag_t                   matched = 0;
-
-    dd_enter();
-
-#if 1
-    if (r->headers_out.location
-        && r->headers_out.location->value.len
-        && r->headers_out.location->value.data[0] == '/')
-    {
-        /* XXX ngx_http_core_find_config_phase, for example,
-         * may not initialize the "key" and "hash" fields
-         * for a nasty optimization purpose, and
-         * we have to work-around it here */
-
-        r->headers_out.location->hash = ngx_http_headers_more_location_hash;
-        ngx_str_set(&r->headers_out.location->key, "Location");
-    }
-#endif
-
-    part = &r->headers_out.headers.part;
-    h = part->elts;
-
-    for (i = 0; /* void */; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            h = part->elts;
-            i = 0;
-        }
-
-        if (h[i].hash == 0) {
-            continue;
-        }
-
-        if (!hv->wildcard
-            && h[i].key.len == hv->key.len
-            && ngx_strncasecmp(h[i].key.data, hv->key.data,
-                               h[i].key.len) == 0)
-        {
-            goto matched;
-        }
-
-        if (hv->wildcard
-            && h[i].key.len >= hv->key.len - 1
-            && ngx_strncasecmp(h[i].key.data, hv->key.data,
-                               hv->key.len - 1) == 0)
-        {
-            goto matched;
-        }
-
-        /* not matched */
-        continue;
-
-matched:
-
-        if (value->len == 0 || matched) {
-            dd("clearing normal header for %.*s", (int) hv->key.len,
-               hv->key.data);
-
-            h[i].value.len = 0;
-            h[i].hash = 0;
-
-        } else {
-            h[i].value = *value;
-            h[i].hash = hv->hash;
-        }
-
-        if (output_header) {
-            *output_header = &h[i];
-        }
-
-        matched = 1;
-    }
-
-    if (matched){
-        return NGX_OK;
-    }
-
-    if ((hv->wildcard || no_create) && value->len == 0) {
-        return NGX_OK;
-    }
-
-    /* XXX we still need to create header slot even if the value
-     * is empty because some builtin headers like Last-Modified
-     * relies on this to get cleared */
-
-    h = ngx_list_push(&r->headers_out.headers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    if (value->len == 0) {
-        h->hash = 0;
-
-    } else {
-        h->hash = hv->hash;
-    }
-
-    h->key = hv->key;
-    h->value = *value;
-
-    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
-    if (h->lowcase_key == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
-
-    if (output_header) {
-        *output_header = h;
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_builtin_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    ngx_table_elt_t  *h, **old;
-
-    dd_enter();
-
-    if (hv->offset) {
-        old = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
-
-    } else {
-        old = NULL;
-    }
-
-    if (old == NULL || *old == NULL) {
-        return ngx_http_set_header_helper(r, hv, value, old, 0);
-    }
-
-    h = *old;
-
-    if (value->len == 0) {
-        dd("clearing the builtin header");
-
-        h->hash = 0;
-        h->value = *value;
-
-        return NGX_OK;
-    }
-
-    h->hash = hv->hash;
-    h->key = hv->key;
-    h->value = *value;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    ngx_array_t      *pa;
-    ngx_table_elt_t  *ho, **ph;
-    ngx_uint_t        i;
-
-    pa = (ngx_array_t *) ((char *) &r->headers_out + hv->offset);
-
-    if (pa->elts == NULL) {
-        if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *))
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    /* override old values (if any) */
-
-    if (pa->nelts > 0) {
-        ph = pa->elts;
-        for (i = 1; i < pa->nelts; i++) {
-            ph[i]->hash = 0;
-            ph[i]->value.len = 0;
-        }
-
-        ph[0]->value = *value;
-
-        if (value->len == 0) {
-            ph[0]->hash = 0;
-
-        } else {
-            ph[0]->hash = hv->hash;
-        }
-
-        return NGX_OK;
-    }
-
-    ph = ngx_array_push(pa);
-    if (ph == NULL) {
-        return NGX_ERROR;
-    }
-
-    ho = ngx_list_push(&r->headers_out.headers);
-    if (ho == NULL) {
-        return NGX_ERROR;
-    }
-
-    ho->value = *value;
-    ho->hash = hv->hash;
-    ngx_str_set(&ho->key, "Cache-Control");
-    *ph = ho;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_set_content_type_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    u_char          *p, *last, *end;
-
-    r->headers_out.content_type_len = value->len;
-    r->headers_out.content_type = *value;
-    r->headers_out.content_type_hash = hv->hash;
-    r->headers_out.content_type_lowcase = NULL;
-
-    p = value->data;
-    end = p + value->len;
-
-    for (; p != end; p++) {
-
-        if (*p != ';') {
-            continue;
-        }
-
-        last = p;
-
-        while (*++p == ' ') { /* void */ }
-
-        if (p == end) {
-            break;
-        }
-
-        if (ngx_strncasecmp(p, (u_char *) "charset=", 8) != 0) {
-            continue;
-        }
-
-        p += 8;
-
-        r->headers_out.content_type_len = last - value->data;
-
-        if (*p == '"') {
-            p++;
-        }
-
-        last = end;
-
-        if (*(last - 1) == '"') {
-            last--;
-        }
-
-        r->headers_out.charset.len = last - p;
-        r->headers_out.charset.data = p;
-
-        break;
-    }
-
-    value->len = 0;
-
-    return ngx_http_set_header_helper(r, hv, value, NULL, 1);
-}
-
-
-static ngx_int_t
-ngx_http_set_content_length_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    off_t           len;
-
-    if (value->len == 0) {
-        return ngx_http_clear_content_length_header(r, hv, value);
-    }
-
-    len = ngx_atosz(value->data, value->len);
-    if (len == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    r->headers_out.content_length_n = len;
-
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-static ngx_int_t
-ngx_http_set_accept_ranges_header(ngx_http_request_t *r,
-    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    if (value->len == 0) {
-        r->allow_ranges = 0;
-    }
-
-    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_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    r->headers_out.content_length_n = -1;
-
-    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_headers_more_header_val_t *hv, ngx_str_t *value)
-{
-    dd_enter();
-
-    value->len = 0;
-
-    return ngx_http_set_builtin_header(r, hv, value);
-}
-
-
-char *
-ngx_http_headers_more_set_headers(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_headers_more_parse_directive(cf, cmd, conf,
-                                         ngx_http_headers_more_opcode_set);
-}
-
-
-char *
-ngx_http_headers_more_clear_headers(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf)
-{
-    return ngx_http_headers_more_parse_directive(cf, cmd, conf,
-                                        ngx_http_headers_more_opcode_clear);
-}
-
-
-static ngx_flag_t
-ngx_http_headers_more_check_type(ngx_http_request_t *r, ngx_array_t *types)
-{
-    ngx_uint_t          i;
-    ngx_str_t          *t;
-
-    dd("headers_out->content_type: %.*s (len %d)",
-       (int) r->headers_out.content_type.len,
-       r->headers_out.content_type.data,
-       (int) r->headers_out.content_type.len);
-
-    t = types->elts;
-
-    for (i = 0; i < types->nelts; i++) {
-        dd("...comparing with type [%.*s]", (int) t[i].len, t[i].data);
-
-        if (r->headers_out.content_type_len == t[i].len
-            && ngx_strncmp(r->headers_out.content_type.data,
-                           t[i].data, t[i].len) == 0)
-        {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-
-static ngx_flag_t
-ngx_http_headers_more_check_status(ngx_http_request_t *r, ngx_array_t *statuses)
-{
-    ngx_uint_t          i;
-    ngx_uint_t         *status;
-
-    dd("headers_out.status = %d", (int) r->headers_out.status);
-
-    status = statuses->elts;
-    for (i = 0; i < statuses->nelts; i++) {
-        dd("...comparing with specified status %d", (int) status[i]);
-
-        if (r->headers_out.status == status[i]) {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-
-static char *
-ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
-    void *conf, ngx_http_headers_more_opcode_t opcode)
-{
-    ngx_http_headers_more_loc_conf_t  *hlcf = conf;
-
-    ngx_uint_t                         i;
-    ngx_http_headers_more_cmd_t       *cmd;
-    ngx_str_t                         *arg;
-    ngx_flag_t                         ignore_next_arg;
-    ngx_str_t                         *cmd_name;
-    ngx_int_t                          rc;
-
-    ngx_http_headers_more_main_conf_t  *hmcf;
-
-    if (hlcf->cmds == NULL) {
-        hlcf->cmds = ngx_array_create(cf->pool, 1,
-                                      sizeof(ngx_http_headers_more_cmd_t));
-
-        if (hlcf->cmds == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    cmd = ngx_array_push(hlcf->cmds);
-    if (cmd == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    cmd->headers =
-        ngx_array_create(cf->pool, 1,
-                         sizeof(ngx_http_headers_more_header_val_t));
-    if (cmd->headers == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    cmd->types = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t));
-    if (cmd->types == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    cmd->statuses = ngx_array_create(cf->pool, 1, sizeof(ngx_uint_t));
-    if (cmd->statuses == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    arg = cf->args->elts;
-
-    cmd_name = &arg[0];
-
-    ignore_next_arg = 0;
-
-    for (i = 1; i < cf->args->nelts; i++) {
-
-        if (ignore_next_arg) {
-            ignore_next_arg = 0;
-            continue;
-        }
-
-        if (arg[i].len == 0) {
-            continue;
-        }
-
-        if (arg[i].data[0] != '-') {
-            rc = ngx_http_headers_more_parse_header(cf, cmd_name,
-                                                    &arg[i], cmd->headers,
-                                                    opcode,
-                                        ngx_http_headers_more_set_handlers);
-
-            if (rc != NGX_OK) {
-                return NGX_CONF_ERROR;
-            }
-
-            continue;
-        }
-
-        if (arg[i].len == 2) {
-            if (arg[i].data[1] == 't') {
-                if (i == cf->args->nelts - 1) {
-                    ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                                  "%V: option -t takes an argument.",
-                                  cmd_name);
-
-                    return NGX_CONF_ERROR;
-                }
-
-                rc = ngx_http_headers_more_parse_types(cf->log, cmd_name,
-                                                       &arg[i + 1],
-                                                       cmd->types);
-
-                if (rc != NGX_OK) {
-                    return NGX_CONF_ERROR;
-                }
-
-                ignore_next_arg = 1;
-
-                continue;
-
-            } else if (arg[i].data[1] == 's') {
-
-                if (i == cf->args->nelts - 1) {
-                    ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                                  "%V: option -s takes an argument.",
-                                  cmd_name);
-
-                    return NGX_CONF_ERROR;
-                }
-
-                rc = ngx_http_headers_more_parse_statuses(cf->log, cmd_name,
-                                                          &arg[i + 1],
-                                                          cmd->statuses);
-
-                if (rc != NGX_OK) {
-                    return NGX_CONF_ERROR;
-                }
-
-                ignore_next_arg = 1;
-
-                continue;
-            }
-        }
-
-        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                      "%V: invalid option name: \"%V\"", cmd_name, &arg[i]);
-
-        return NGX_CONF_ERROR;
-    }
-
-    dd("Found %d statuses, %d types, and %d headers",
-       (int) cmd->statuses->nelts, (int) cmd->types->nelts,
-       (int) cmd->headers->nelts);
-
-    if (cmd->headers->nelts == 0) {
-        cmd->headers = NULL;
-    }
-
-    if (cmd->types->nelts == 0) {
-        cmd->types = NULL;
-    }
-
-    if (cmd->statuses->nelts == 0) {
-        cmd->statuses = NULL;
-    }
-
-    cmd->is_input = 0;
-
-    hmcf = ngx_http_conf_get_module_main_conf(cf,
-                                         ngx_http_headers_more_filter_module);
-
-    hmcf->requires_filter = 1;
-
-    return NGX_CONF_OK;
-}
diff --git a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.h b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.h
deleted file mode 100644
index c939507..0000000
--- a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_headers_out.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright (c) Yichun Zhang (agentzh)
- */
-
-
-#ifndef NGX_HTTP_HEADERS_MORE_OUTPUT_HEADERS_H
-#define NGX_HTTP_HEADERS_MORE_OUTPUT_HEADERS_H
-
-
-#include "ngx_http_headers_more_filter_module.h"
-
-
-/* output header setters and clearers */
-
-ngx_int_t ngx_http_headers_more_exec_cmd(ngx_http_request_t *r,
-    ngx_http_headers_more_cmd_t *cmd);
-
-char *ngx_http_headers_more_set_headers(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-
-char *ngx_http_headers_more_clear_headers(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-
-
-#endif /* NGX_HTTP_HEADERS_MORE_OUTPUT_HEADERS_H */
diff --git a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.c b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.c
deleted file mode 100644
index caf372e..0000000
--- a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.c
+++ /dev/null
@@ -1,380 +0,0 @@
-
-/*
- * Copyright (C) Yichun Zhang (agentzh)
- */
-
-
-#ifndef DDEBUG
-#define DDEBUG 0
-#endif
-#include "ddebug.h"
-
-
-#include "ngx_http_headers_more_util.h"
-#include <ctype.h>
-
-
-ngx_int_t
-ngx_http_headers_more_parse_header(ngx_conf_t *cf, ngx_str_t *cmd_name,
-    ngx_str_t *raw_header, ngx_array_t *headers,
-    ngx_http_headers_more_opcode_t opcode,
-    ngx_http_headers_more_set_header_t *handlers)
-{
-    ngx_http_headers_more_header_val_t             *hv;
-
-    ngx_uint_t                           i;
-    ngx_str_t                            key = ngx_null_string;
-    ngx_str_t                            value = ngx_null_string;
-    ngx_flag_t                           seen_end_of_key;
-    ngx_http_compile_complex_value_t     ccv;
-    u_char                              *p;
-
-    hv = ngx_array_push(headers);
-    if (hv == NULL) {
-        return NGX_ERROR;
-    }
-
-    seen_end_of_key = 0;
-    for (i = 0; i < raw_header->len; i++) {
-        if (key.len == 0) {
-            if (isspace(raw_header->data[i])) {
-                continue;
-            }
-
-            key.data = raw_header->data;
-            key.len  = 1;
-
-            continue;
-        }
-
-        if (!seen_end_of_key) {
-            if (raw_header->data[i] == ':'
-                || isspace(raw_header->data[i]))
-            {
-                seen_end_of_key = 1;
-                continue;
-            }
-
-            key.len++;
-
-            continue;
-        }
-
-        if (value.len == 0) {
-            if (raw_header->data[i] == ':'
-                || isspace(raw_header->data[i]))
-            {
-                continue;
-            }
-
-            value.data = &raw_header->data[i];
-            value.len  = 1;
-
-            continue;
-        }
-
-        value.len++;
-    }
-
-    if (key.len == 0) {
-        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                      "%V: no key found in the header argument: %V",
-                      cmd_name, raw_header);
-
-        return NGX_ERROR;
-    }
-
-    hv->wildcard = (key.data[key.len - 1] == '*');
-    if (hv->wildcard && key.len<2){
-        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
-                      "%V: wildcard key too short: %V",
-                      cmd_name, raw_header);
-        return NGX_ERROR;
-    }
-
-    hv->hash = ngx_hash_key_lc(key.data, key.len);
-    hv->key = key;
-
-    hv->offset = 0;
-
-    for (i = 0; handlers[i].name.len; i++) {
-        if (hv->key.len != handlers[i].name.len
-            || ngx_strncasecmp(hv->key.data, handlers[i].name.data,
-                               handlers[i].name.len) != 0)
-        {
-            dd("hv key comparison: %s <> %s", handlers[i].name.data,
-               hv->key.data);
-
-            continue;
-        }
-
-        hv->offset = handlers[i].offset;
-        hv->handler = handlers[i].handler;
-
-        break;
-    }
-
-    if (handlers[i].name.len == 0 && handlers[i].handler) {
-        hv->offset = handlers[i].offset;
-        hv->handler = handlers[i].handler;
-    }
-
-    if (opcode == ngx_http_headers_more_opcode_clear) {
-        value.len = 0;
-    }
-
-    if (value.len == 0) {
-        ngx_memzero(&hv->value, sizeof(ngx_http_complex_value_t));
-        return NGX_OK;
-
-    }
-
-    /* Nginx request header value requires to be a null-terminated
-     * C string */
-
-    p = ngx_palloc(cf->pool, value.len + 1);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_memcpy(p, value.data, value.len);
-    p[value.len] = '\0';
-    value.data = p;
-    value.len++; /* we should also compile the trailing '\0' */
-
-    /* compile the header value as a complex value */
-
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value;
-    ccv.complex_value = &hv->value;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_headers_more_parse_statuses(ngx_log_t *log, ngx_str_t *cmd_name,
-    ngx_str_t *value, ngx_array_t *statuses)
-{
-    u_char          *p, *last;
-    ngx_uint_t      *s = NULL;
-
-    p = value->data;
-    last = p + value->len;
-
-    for (; p != last; p++) {
-        if (s == NULL) {
-            if (isspace(*p)) {
-                continue;
-            }
-
-            s = ngx_array_push(statuses);
-            if (s == NULL) {
-                return NGX_ERROR;
-            }
-
-            if (*p >= '0' && *p <= '9') {
-                *s = *p - '0';
-
-            } else {
-                ngx_log_error(NGX_LOG_ERR, log, 0,
-                              "%V: invalid digit \"%c\" found in "
-                              "the status code list \"%V\"",
-                              cmd_name, *p, value);
-
-                return NGX_ERROR;
-            }
-
-            continue;
-        }
-
-        if (isspace(*p)) {
-            dd("Parsed status %d", (int) *s);
-
-            s = NULL;
-            continue;
-        }
-
-        if (*p >= '0' && *p <= '9') {
-            *s *= 10;
-            *s += *p - '0';
-
-        } else {
-            ngx_log_error(NGX_LOG_ERR, log, 0,
-                          "%V: invalid digit \"%c\" found in "
-                          "the status code list \"%V\"",
-                          cmd_name, *p, value);
-
-            return NGX_ERROR;
-        }
-    }
-
-    if (s) {
-        dd("Parsed status %d", (int) *s);
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_headers_more_parse_types(ngx_log_t *log, ngx_str_t *cmd_name,
-    ngx_str_t *value, ngx_array_t *types)
-{
-    u_char          *p, *last;
-    ngx_str_t       *t = NULL;
-
-    p = value->data;
-    last = p + value->len;
-
-    for (; p != last; p++) {
-        if (t == NULL) {
-            if (isspace(*p) || *p == ';') {
-                continue;
-            }
-
-            t = ngx_array_push(types);
-            if (t == NULL) {
-                return NGX_ERROR;
-            }
-
-            t->len = 1;
-            t->data = p;
-
-            continue;
-        }
-
-        if (isspace(*p) || *p == ';') {
-            t = NULL;
-            continue;
-        }
-
-        t->len++;
-    }
-
-    return NGX_OK;
-}
-
-
-ngx_int_t
-ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
-    ngx_uint_t i)
-{
-    ngx_table_elt_t             *data;
-    ngx_list_part_t             *new, *part;
-
-    dd("list rm item: part %p, i %d, nalloc %d", cur, (int) i,
-       (int) l->nalloc);
-
-    data = cur->elts;
-
-    dd("cur: nelts %d, nalloc %d", (int) cur->nelts,
-       (int) l->nalloc);
-
-    if (i == 0) {
-        cur->elts = (char *) cur->elts + l->size;
-        cur->nelts--;
-
-        if (cur == l->last) {
-            if (cur->nelts == 0) {
-#if 1
-                part = &l->part;
-
-                if (part == cur) {
-                    cur->elts = (char *) cur->elts - l->size;
-                    /* do nothing */
-
-                } else {
-                    while (part->next != cur) {
-                        if (part->next == NULL) {
-                            return NGX_ERROR;
-                        }
-                        part = part->next;
-                    }
-
-                    l->last = part;
-                    part->next = NULL;
-                    dd("part nelts: %d", (int) part->nelts);
-                    l->nalloc = part->nelts;
-                }
-#endif
-
-            } else {
-                l->nalloc--;
-            }
-
-            return NGX_OK;
-        }
-
-        if (cur->nelts == 0) {
-            part = &l->part;
-
-            if (part == cur) {
-                ngx_http_headers_more_assert(cur->next != NULL);
-
-                dd("remove 'cur' from the list by rewriting 'cur': "
-                   "l->last: %p, cur: %p, cur->next: %p, part: %p",
-                   l->last, cur, cur->next, part);
-
-                if (l->last == cur->next) {
-                    dd("last is cur->next");
-                    l->part = *(cur->next);
-                    l->last = part;
-                    l->nalloc = part->nelts;
-
-                } else {
-                    l->part = *(cur->next);
-                }
-
-            } else {
-                dd("remove 'cur' from the list");
-                while (part->next != cur) {
-                    if (part->next == NULL) {
-                        return NGX_ERROR;
-                    }
-                    part = part->next;
-                }
-
-                part->next = cur->next;
-            }
-
-            return NGX_OK;
-        }
-
-        return NGX_OK;
-    }
-
-    if (i == cur->nelts - 1) {
-        cur->nelts--;
-
-        if (cur == l->last) {
-            l->nalloc = cur->nelts;
-        }
-
-        return NGX_OK;
-    }
-
-    new = ngx_palloc(l->pool, sizeof(ngx_list_part_t));
-    if (new == NULL) {
-        return NGX_ERROR;
-    }
-
-    new->elts = &data[i + 1];
-    new->nelts = cur->nelts - i - 1;
-    new->next = cur->next;
-
-    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/http-headers-more-filter/src/ngx_http_headers_more_util.h b/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.h
deleted file mode 100644
index 6c4614b..0000000
--- a/debian/modules/http-headers-more-filter/src/ngx_http_headers_more_util.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/*
- * Copyright (c) Yichun Zhang (agentzh)
- */
-
-
-#ifndef NGX_HTTP_HEADERS_MORE_UTIL_H
-#define NGX_HTTP_HEADERS_MORE_UTIL_H
-
-
-#include "ngx_http_headers_more_filter_module.h"
-
-
-#define ngx_http_headers_more_hash_literal(s)                                \
-    ngx_http_headers_more_hash_str((u_char *) s, sizeof(s) - 1)
-
-
-static ngx_inline ngx_uint_t
-ngx_http_headers_more_hash_str(u_char *src, size_t n)
-{
-    ngx_uint_t  key;
-
-    key = 0;
-
-    while (n--) {
-        key = ngx_hash(key, *src);
-        src++;
-    }
-
-    return key;
-}
-
-
-extern ngx_uint_t  ngx_http_headers_more_location_hash;
-
-
-ngx_int_t ngx_http_headers_more_parse_header(ngx_conf_t *cf,
-    ngx_str_t *cmd_name, ngx_str_t *raw_header, ngx_array_t *headers,
-    ngx_http_headers_more_opcode_t opcode,
-    ngx_http_headers_more_set_header_t *handlers);
-
-ngx_int_t ngx_http_headers_more_parse_statuses(ngx_log_t *log,
-    ngx_str_t *cmd_name, ngx_str_t *value, ngx_array_t *statuses);
-
-ngx_int_t ngx_http_headers_more_parse_types(ngx_log_t *log,
-    ngx_str_t *cmd_name, ngx_str_t *value, ngx_array_t *types);
-
-ngx_int_t ngx_http_headers_more_rm_header_helper(ngx_list_t *l,
-    ngx_list_part_t *cur, ngx_uint_t i);
-
-
-#endif /* NGX_HTTP_HEADERS_MORE_UTIL_H */
diff --git a/debian/modules/http-headers-more-filter/t/bug.t b/debian/modules/http-headers-more-filter/t/bug.t
deleted file mode 100644
index 88cfa09..0000000
--- a/debian/modules/http-headers-more-filter/t/bug.t
+++ /dev/null
@@ -1,393 +0,0 @@
-# vi:filetype=
-
-use Test::Nginx::Socket; # 'no_plan';
-
-repeat_each(2);
-
-plan tests => 53 * repeat_each();
-
-no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set Server
---- config
-    #more_set_headers 'Last-Modified: x';
-    more_clear_headers 'Last-Modified';
---- request
-    GET /index.html
---- response_headers
-! Last-Modified
---- response_body_like: It works!
-
-
-
-=== TEST 2: variables in the Ranges header
---- config
-    location /index.html {
-        set $rfrom 1;
-        set $rto 3;
-        more_set_input_headers 'Range: bytes=$rfrom - $rto';
-        #more_set_input_headers 'Range: bytes=1 - 3';
-        #echo $http_range;
-    }
---- request
-GET /index.html
---- error_code: 206
---- response_body chomp
-htm
-
-
-
-=== TEST 3: mime type overriding (inlined types)
---- config
-    more_clear_headers 'X-Powered-By' 'X-Runtime' 'ETag';
-
-    types {
-        text/html                             html htm shtml;
-        text/css                              css;
-    }
---- user_files
->>> a.css
-hello
---- request
-GET /a.css
---- error_code: 200
---- response_headers
-Content-Type: text/css
---- response_body
-hello
-
-
-
-=== TEST 4: mime type overriding (included types file)
---- config
-    more_clear_headers 'X-Powered-By' 'X-Runtime' 'ETag';
-    include mime.types;
---- user_files
->>> a.css
-hello
->>> ../conf/mime.types
-types {
-    text/html                             html htm shtml;
-    text/css                              css;
-}
---- request
-GET /a.css
---- error_code: 200
---- response_headers
-Content-Type: text/css
---- response_body
-hello
-
-
-
-=== TEST 5: empty variable as the header value
---- config
-    location /foo {
-        more_set_headers 'X-Foo: $arg_foo';
-        echo hi;
-    }
---- request
-    GET /foo
---- response_headers
-! X-Foo
---- response_body
-hi
-
-
-
-=== TEST 6: range bug
---- config
-    location /index.html {
-        more_clear_input_headers "Range*" ;
-        more_clear_input_headers "Content-Range*" ;
-
-        more_set_input_headers 'Range: bytes=1-5';
-        more_set_headers  'Content-Range: bytes 1-5/1000';
-    }
---- request
-    GET /index.html
---- more_headers
-Range: bytes=1-3
---- raw_response_headers_like: Content-Range: bytes 1-5/1000$
---- response_body chop
-html>
---- error_code: 206
---- SKIP
-
-
-
-=== TEST 7: Allow-Ranges
---- config
-    location /index.html {
-        more_clear_headers 'Accept-Ranges';
-    }
---- request
-    GET /index.html
---- response_headers
-! Accept-Ranges
---- response_body_like: It works
-
-
-
-=== TEST 8: clear hand-written Allow-Ranges headers
---- config
-    location /index.html {
-        more_set_headers 'Accept-Ranges: bytes';
-        more_clear_headers 'Accept-Ranges';
-    }
---- request
-    GET /index.html
---- response_headers
-! Accept-Ranges
---- response_body_like: It works
-
-
-
-=== TEST 9: clear first, then add
---- config
-    location /bug {
-        more_clear_headers 'Foo';
-        more_set_headers 'Foo: a';
-        echo hello;
-    }
---- request
-    GET /bug
---- raw_response_headers_like eval
-".*Foo: a.*"
---- response_body
-hello
-
-
-
-=== TEST 10: first add, then clear, then add again
---- config
-    location /bug {
-        more_set_headers 'Foo: a';
-        more_clear_headers 'Foo';
-        more_set_headers 'Foo: b';
-        echo hello;
-    }
---- request
-    GET /bug
---- raw_response_headers_like eval
-".*Foo: b.*"
---- response_body
-hello
-
-
-
-=== TEST 11: override charset
---- config
-    location /foo {
-        charset iso-8859-1;
-        default_type "text/html";
-        echo hiya;
-    }
-
-    location /bug {
-        more_set_headers "Content-Type: text/html; charset=UTF-8";
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
---- request
-    GET /bug
---- response_body
-hiya
---- response_headers
-Content-Type: text/html; charset=UTF-8
-
-
-
-=== TEST 12: set multi-value header to a single value
---- config
-    location /main {
-        set $footer '';
-        proxy_pass http://127.0.0.1:$server_port/foo;
-        more_set_headers 'Foo: b';
-        header_filter_by_lua '
-            ngx.var.footer = ngx.header.Foo
-        ';
-        echo_after_body $footer;
-    }
-    location /foo {
-        echo foo;
-        add_header Foo a;
-        add_header Foo c;
-    }
---- request
-    GET /main
---- response_headers
-Foo: b
---- response_body
-foo
-b
-
-
-
-=== TEST 13: set multi values to cache-control and override it with multiple values (to reproduce a bug)
---- config
-    location /lua {
-        content_by_lua '
-            ngx.header.cache_control = { "private", "no-store", "foo", "bar", "baz" }
-            ngx.send_headers()
-            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
-        ';
-        more_clear_headers Cache-Control;
-        add_header Cache-Control "blah";
-    }
---- request
-    GET /lua
---- response_headers
-Cache-Control: blah
---- response_body
-Cache-Control: blah
-
-
-
-=== TEST 14: set 20+ headers
---- config
-    location /test {
-        more_clear_input_headers "Authorization";
-        echo $http_a1;
-        echo $http_authorization;
-        echo $http_a2;
-        echo $http_a3;
-        echo $http_a23;
-        echo $http_a24;
-        echo $http_a25;
-    }
---- request
-    GET /test
---- more_headers eval
-my $i = 1;
-my $s;
-while ($i <= 25) {
-    $s .= "A$i: $i\n";
-    if ($i == 22) {
-        $s .= "Authorization: blah\n";
-    }
-    $i++;
-}
-#warn $s;
-$s
---- response_body
-1
-
-2
-3
-23
-24
-25
-
-
-
-=== TEST 15: github #20: segfault caused by the nasty optimization in the nginx core (set)
---- config
-    location = /t/ {
-        more_set_headers "Foo: 1";
-        proxy_pass http://127.0.0.1:$server_port;
-    }
---- request
-GET /t
---- more_headers
-Foo: bar
-Bah: baz
---- response_body_like: 301 Moved Permanently
---- error_code: 301
---- no_error_log
-[error]
-
-
-
-=== TEST 16: github #20: segfault caused by the nasty optimization in the nginx core (clear)
---- config
-    location = /t/ {
-        more_clear_headers Foo;
-        proxy_pass http://127.0.0.1:$server_port;
-    }
---- request
-GET /t
---- more_headers
-Foo: bar
-Bah: baz
---- response_body_like: 301 Moved Permanently
---- error_code: 301
---- no_error_log
-[error]
-
-
-
-=== TEST 17: Content-Type response headers with a charset param (correct -t values)
---- config
-    location = /t {
-        more_set_headers -t 'text/html' 'X-Foo: Bar';
-        proxy_pass http://127.0.0.1:$server_port/fake;
-    }
-
-    location = /fake {
-        default_type text/html;
-        charset utf-8;
-        echo ok;
-    }
---- request
-GET /t
---- response_headers
-X-Foo: Bar
---- response_body
-ok
-
-
-
-=== TEST 18: Content-Type response headers with a charset param (WRONG -t values)
---- config
-    location = /t {
-        more_set_headers -t 'text/html; charset=utf-8' 'X-Foo: Bar';
-        proxy_pass http://127.0.0.1:$server_port/fake;
-    }
-
-    location = /fake {
-        default_type text/html;
-        charset utf-8;
-        echo ok;
-    }
---- request
-GET /t
---- response_headers
-X-Foo: Bar
---- response_body
-ok
-
-
-
-=== TEST 19: for bad requests (bad request method letter case)
---- config
-    error_page 400 = /err;
-
-    location = /err {
-        more_set_input_headers "Foo: bar";
-        echo ok;
-    }
---- raw_request
-GeT / HTTP/1.1
---- response_body
-ok
---- no_check_leak
-
-
-
-=== TEST 20: for bad requests (bad request method names)
---- config
-    error_page 400 = /err;
-
-    location = /err {
-        more_set_input_headers "Foo: bar";
-        echo ok;
-    }
---- raw_request
-GET x HTTP/1.1
---- response_body
-ok
---- no_check_leak
diff --git a/debian/modules/http-headers-more-filter/t/builtin.t b/debian/modules/http-headers-more-filter/t/builtin.t
deleted file mode 100644
index 27b20af..0000000
--- a/debian/modules/http-headers-more-filter/t/builtin.t
+++ /dev/null
@@ -1,338 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket; # 'no_plan';
-
-plan tests => 60;
-
-no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set Server
---- config
-    location /foo {
-        echo hi;
-        more_set_headers 'Server: Foo';
-    }
---- request
-    GET /foo
---- response_headers
-Server: Foo
---- response_body
-hi
-
-
-
-=== TEST 2: clear Server
---- config
-    location /foo {
-        echo hi;
-        more_clear_headers 'Server: ';
-    }
---- request
-    GET /foo
---- response_headers
-! Server
---- response_body
-hi
-
-
-
-=== TEST 3: set Content-Type
---- config
-    location /foo {
-        default_type 'text/plan';
-        more_set_headers 'Content-Type: text/css';
-        echo hi;
-    }
---- request
-    GET /foo
---- response_headers
-Content-Type: text/css
---- response_body
-hi
-
-
-
-=== TEST 4: set Content-Type
---- config
-    location /foo {
-        default_type 'text/plan';
-        more_set_headers 'Content-Type: text/css';
-        return 404;
-    }
---- request
-    GET /foo
---- response_headers
-Content-Type: text/css
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 5: clear Content-Type
---- config
-    location /foo {
-        default_type 'text/plain';
-        more_clear_headers 'Content-Type: ';
-        return 404;
-    }
---- request
-    GET /foo
---- response_headers
-! Content-Type
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 6: clear Content-Type (colon not required)
---- config
-    location /foo {
-        default_type 'text/plain';
-        more_set_headers 'Content-Type: Hello';
-        more_clear_headers 'Content-Type';
-        return 404;
-    }
---- request
-    GET /foo
---- response_headers
-! Content-Type
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 7: clear Content-Type (value ignored)
---- config
-    location /foo {
-        default_type 'text/plain';
-        more_set_headers 'Content-Type: Hello';
-        more_clear_headers 'Content-Type: blah';
-        return 404;
-    }
---- request
-    GET /foo
---- response_headers
-! Content-Type
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 8: clear Content-Type (case insensitive)
---- config
-    location /foo {
-        default_type 'text/plain';
-        more_set_headers 'Content-Type: Hello';
-        more_clear_headers 'content-type: blah';
-        return 404;
-    }
---- request
-    GET /foo
---- response_headers
-! Content-Type
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 9: clear Content-Type using set empty
---- config
-    location /foo {
-        default_type 'text/plain';
-        more_set_headers 'Content-Type: Hello';
-        more_set_headers 'content-type:';
-        return 404;
-    }
---- request
-    GET /foo
---- response_headers
-! Content-Type
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 10: clear Content-Type using setting key only
---- config
-    location /foo {
-        default_type 'text/plain';
-        more_set_headers 'Content-Type: Hello';
-        more_set_headers 'content-type';
-        return 404;
-    }
---- request
-    GET /foo
---- response_headers
-! Content-Type
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 11: set content-length
---- config
-    location /len {
-        more_set_headers 'Content-Length: 2';
-        echo hello;
-    }
---- request
-    GET /len
---- response_headers
-Content-Length: 2
---- response_body chop
-he
-
-
-
-=== TEST 12: set content-length multiple times
---- config
-    location /len {
-        more_set_headers 'Content-Length: 2';
-        more_set_headers 'Content-Length: 4';
-        echo hello;
-    }
---- request
-    GET /len
---- response_headers
-Content-Length: 4
---- response_body chop
-hell
-
-
-
-=== TEST 13: clear content-length
---- config
-    location /len {
-        more_set_headers 'Content-Length: 4';
-        more_set_headers 'Content-Length:';
-        echo hello;
-    }
---- request
-    GET /len
---- response_headers
-! Content-Length
---- response_body
-hello
-
-
-
-=== TEST 14: clear content-length (another way)
---- config
-    location /len {
-        more_set_headers 'Content-Length: 4';
-        more_clear_headers 'Content-Length';
-        echo hello;
-    }
---- request
-    GET /len
---- response_headers
-! Content-Length
---- response_body
-hello
-
-
-
-=== TEST 15: clear content-type
---- config
-    location /len {
-        default_type 'text/plain';
-        more_set_headers 'Content-Type:';
-        echo hello;
-    }
---- request
-    GET /len
---- response_headers
-! Content-Type
---- response_body
-hello
-
-
-
-=== TEST 16: clear content-type (the other way)
---- config
-    location /len {
-        default_type 'text/plain';
-        more_clear_headers 'Content-Type:';
-        echo hello;
-    }
---- request
-    GET /len
---- response_headers
-! Content-Type
---- response_body
-hello
-
-
-
-=== TEST 17: set Charset
---- config
-    location /len {
-        default_type 'text/plain';
-        more_set_headers 'Charset: gbk';
-        echo hello;
-    }
---- request
-    GET /len
---- response_headers
-Charset: gbk
---- response_body
-hello
-
-
-
-=== TEST 18: clear Charset
---- config
-    location /len {
-        default_type 'text/plain';
-        more_set_headers 'Charset: gbk';
-        more_clear_headers 'Charset';
-        echo hello;
-    }
---- request
-    GET /len
---- response_headers
-! Charset
---- response_body
-hello
-
-
-
-=== TEST 19: clear Charset (the other way: using set)
---- config
-    location /len {
-        default_type 'text/plain';
-        more_set_headers 'Charset: gbk';
-        more_set_headers 'Charset: ';
-        echo hello;
-    }
---- request
-    GET /len
---- response_headers
-! Charset
---- response_body
-hello
-
-
-
-=== TEST 20: set Vary
---- config
-    location /foo {
-        more_set_headers 'Vary: gbk';
-        echo hello;
-    }
-    location /len {
-        default_type 'text/plain';
-        more_set_headers 'Vary: hello';
-        proxy_pass http://127.0.0.1:$server_port/foo;
-    }
---- request
-    GET /len
---- response_headers
-Vary: hello
---- response_body
-hello
diff --git a/debian/modules/http-headers-more-filter/t/eval.t b/debian/modules/http-headers-more-filter/t/eval.t
deleted file mode 100644
index febd306..0000000
--- a/debian/modules/http-headers-more-filter/t/eval.t
+++ /dev/null
@@ -1,36 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket; # 'no_plan';
-
-repeat_each(3);
-
-plan tests => repeat_each() * 2 * blocks();
-
-#no_long_string();
-#no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set request header at client side
---- config
-    location /foo {
-        eval_subrequest_in_memory off;
-        eval_override_content_type text/plain;
-        eval $res {
-            echo -n 1;
-        }
-        #echo "[$res]";
-        if ($res = '1') {
-            more_set_input_headers 'Foo: Bar';
-            echo "OK";
-            break;
-        }
-        echo "NOT OK";
-    }
---- request
-    GET /foo
---- response_body
-OK
diff --git a/debian/modules/http-headers-more-filter/t/input-conn.t b/debian/modules/http-headers-more-filter/t/input-conn.t
deleted file mode 100644
index f53e80f..0000000
--- a/debian/modules/http-headers-more-filter/t/input-conn.t
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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() * (4 * blocks());
-
-#no_diff();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: clear the Connection req header
---- config
-    location /req-header {
-        more_clear_input_headers Connection;
-        echo "connection: $http_connection";
-    }
---- request
-GET /req-header
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: conn type: %d\n", $r->headers_in->connection_type)
-}
-
---- stap_out
-rewrite: conn type: 1
-content: conn type: 0
-
---- response_body
-connection: 
---- no_error_log
-[error]
-
-
-
-=== TEST 2: set custom Connection req header (close)
---- config
-    location /req-header {
-        more_set_input_headers "Connection: CLOSE";
-        echo "connection: $http_connection";
-    }
---- request
-GET /req-header
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: conn type: %d\n", $r->headers_in->connection_type)
-}
-
---- stap_out
-rewrite: conn type: 1
-content: conn type: 1
-
---- response_body
-connection: CLOSE
---- no_error_log
-[error]
-
-
-
-=== TEST 3: set custom Connection req header (keep-alive)
---- config
-    location /req-header {
-        more_set_input_headers "Connection: keep-alive";
-        echo "connection: $http_connection";
-    }
---- request
-GET /req-header
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: conn type: %d\n", $r->headers_in->connection_type)
-}
-
---- stap_out
-rewrite: conn type: 1
-content: conn type: 2
-
---- response_body
-connection: keep-alive
---- no_error_log
-[error]
-
-
-
-=== TEST 4: set custom Connection req header (bad)
---- config
-    location /req-header {
-        more_set_input_headers "Connection: bad";
-        echo "connection: $http_connection";
-    }
---- request
-GET /req-header
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: conn type: %d\n", $r->headers_in->connection_type)
-}
-
---- stap_out
-rewrite: conn type: 1
-content: conn type: 0
-
---- response_body
-connection: bad
---- no_error_log
-[error]
diff --git a/debian/modules/http-headers-more-filter/t/input-cookie.t b/debian/modules/http-headers-more-filter/t/input-cookie.t
deleted file mode 100644
index 68db4d0..0000000
--- a/debian/modules/http-headers-more-filter/t/input-cookie.t
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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() * (4 * blocks());
-
-#no_diff();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: clear cookie (with existing cookies)
---- config
-    location /t {
-        more_clear_input_headers Cookie;
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
---- more_headers
-Cookie: foo=bar
-Cookie: baz=blah
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 2
-content: cookies: 0
-
---- response_body
-Cookie foo: 
-Cookie baz: 
-Cookie: 
-
---- no_error_log
-[error]
-
-
-
-=== TEST 2: clear cookie (without existing cookies)
---- config
-    location /t {
-        more_clear_input_headers Cookie;
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 0
-content: cookies: 0
-
---- response_body
-Cookie foo: 
-Cookie baz: 
-Cookie: 
-
---- no_error_log
-[error]
-
-
-
-=== TEST 3: set one custom cookie (with existing cookies)
---- config
-    location /t {
-        more_set_input_headers "Cookie: boo=123";
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie boo: $cookie_boo";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
---- more_headers
-Cookie: foo=bar
-Cookie: baz=blah
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 2
-content: cookies: 1
-
---- response_body
-Cookie foo: 
-Cookie baz: 
-Cookie boo: 123
-Cookie: boo=123
-
---- no_error_log
-[error]
-
-
-
-=== TEST 4: set one custom cookie (without existing cookies)
---- config
-    location /t {
-        more_set_input_headers "Cookie: boo=123";
-        echo "Cookie foo: $cookie_foo";
-        echo "Cookie baz: $cookie_baz";
-        echo "Cookie boo: $cookie_boo";
-        echo "Cookie: $http_cookie";
-    }
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
-}
-
---- stap_out
-rewrite: cookies: 0
-content: cookies: 1
-
---- response_body
-Cookie foo: 
-Cookie baz: 
-Cookie boo: 123
-Cookie: boo=123
-
---- no_error_log
-[error]
-
-
-
-=== TEST 5: for bad requests causing segfaults when setting & getting multi-value headers
---- config
-    error_page 400 = /err;
-
-    location = /err {
-        more_set_input_headers "Cookie: foo=bar";
-        echo -n $cookie_foo;
-        echo ok;
-    }
---- raw_request
-GeT / HTTP/1.1
---- response_body
-ok
---- no_error_log
-[error]
-[alert]
---- no_check_leak
diff --git a/debian/modules/http-headers-more-filter/t/input-ua.t b/debian/modules/http-headers-more-filter/t/input-ua.t
deleted file mode 100644
index da9a60d..0000000
--- a/debian/modules/http-headers-more-filter/t/input-ua.t
+++ /dev/null
@@ -1,628 +0,0 @@
-# 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() * (4 * blocks());
-
-#no_diff();
-no_long_string();
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: clear Opera user-agent
---- config
-    location /t {
-        more_clear_input_headers User-Agent;
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Opera/9.80 (Macintosh; Intel Mac OS X 10.7.4; U; en) Presto/2.10.229 Version/11.62
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: opera: %d\n", $r->headers_in->opera)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: opera: %d\n", $r->headers_in->opera)
-}
-
---- stap_out
-rewrite: opera: 1
-content: opera: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 2: clear MSIE 4 user-agent
---- config
-    location /t {
-        more_clear_input_headers User-Agent;
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=1 msie6=1
-content: msie=0 msie6=0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 3: set custom MSIE 4 user-agent
---- config
-    location /t {
-        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)";
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=1
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)
---- no_error_log
-[error]
-
-
-
-=== TEST 4: clear MSIE 5 user-agent
---- config
-    location /t {
-        more_clear_input_headers User-Agent;
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/4.0 (compatible; MSIE 5.01; Windows 95; MSIECrawler)
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=1 msie6=1
-content: msie=0 msie6=0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 5: set custom MSIE 5 user-agent
---- config
-    location /t {
-        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 5.01; Windows 95; MSIECrawler)";
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=1
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 5.01; Windows 95; MSIECrawler)
---- no_error_log
-[error]
-
-
-
-=== TEST 6: clear MSIE 6 (without SV1) user-agent
---- config
-    location /t {
-        more_clear_input_headers User-Agent;
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=1 msie6=1
-content: msie=0 msie6=0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 7: set custom MSIE 6 (without SV1) user-agent
---- config
-    location /t {
-        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)";
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=1
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)
---- no_error_log
-[error]
-
-
-
-=== TEST 8: clear MSIE 6 (with SV1) user-agent
---- config
-    location /t {
-        more_clear_input_headers User-Agent;
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=1 msie6=0
-content: msie=0 msie6=0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 9: set custom MSIE 6 (with SV1) user-agent
---- config
-    location /t {
-        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)";
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=0
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)
---- no_error_log
-[error]
-
-
-
-=== TEST 10: set custom MSIE 7 user-agent
---- config
-    location /t {
-        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; winfx; .NET CLR 1.1.4322; .NET CLR 2.0.50727; Zune 2.0)";
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
-F(ngx_http_core_content_phase) {
-    printf("content: msie=%d msie6=%d\n",
-           $r->headers_in->msie,
-           $r->headers_in->msie6)
-}
-
---- stap_out
-rewrite: msie=0 msie6=0
-content: msie=1 msie6=0
-
---- response_body
-User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; winfx; .NET CLR 1.1.4322; .NET CLR 2.0.50727; Zune 2.0)
---- no_error_log
-[error]
-
-
-
-=== TEST 11: clear Gecko user-agent
---- config
-    location /t {
-        more_clear_input_headers User-Agent;
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: gecko: %d\n", $r->headers_in->gecko)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: gecko: %d\n", $r->headers_in->gecko)
-}
-
---- stap_out
-rewrite: gecko: 1
-content: gecko: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 12: set custom Gecko user-agent
---- config
-    location /t {
-        more_set_input_headers "User-Agent: Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0";
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: gecko: %d\n", $r->headers_in->gecko)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: gecko: %d\n", $r->headers_in->gecko)
-}
-
---- stap_out
-rewrite: gecko: 0
-content: gecko: 1
-
---- response_body
-User-Agent: Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0
---- no_error_log
-[error]
-
-
-
-=== TEST 13: clear Chrome user-agent
---- config
-    location /t {
-        more_clear_input_headers User-Agent;
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.151 Safari/535.19
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: chrome: %d\n", $r->headers_in->chrome)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: chrome: %d\n", $r->headers_in->chrome)
-}
-
---- stap_out
-rewrite: chrome: 1
-content: chrome: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 14: set custom Chrome user-agent
---- config
-    location /t {
-        more_set_input_headers "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.151 Safari/535.19";
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: chrome: %d\n", $r->headers_in->chrome)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: chrome: %d\n", $r->headers_in->chrome)
-}
-
---- stap_out
-rewrite: chrome: 0
-content: chrome: 1
-
---- response_body
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.151 Safari/535.19
---- no_error_log
-[error]
-
-
-
-=== TEST 15: clear Safari (Mac OS X) user-agent
---- config
-    location /t {
-        more_clear_input_headers User-Agent;
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: safari: %d\n", $r->headers_in->safari)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: safari: %d\n", $r->headers_in->safari)
-}
-
---- stap_out
-rewrite: safari: 1
-content: safari: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 16: set custom Safari user-agent
---- config
-    location /t {
-        more_set_input_headers "User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8";
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: safari: %d\n", $r->headers_in->safari)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: safari: %d\n", $r->headers_in->safari)
-}
-
---- stap_out
-rewrite: safari: 0
-content: safari: 1
-
---- response_body
-User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8
---- no_error_log
-[error]
-
-
-
-=== TEST 17: clear Konqueror user-agent
---- config
-    location /t {
-        more_clear_input_headers User-Agent;
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- more_headers
-User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: konqueror: %d\n", $r->headers_in->konqueror)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: konqueror: %d\n", $r->headers_in->konqueror)
-}
-
---- stap_out
-rewrite: konqueror: 1
-content: konqueror: 0
-
---- response_body
-User-Agent: 
---- no_error_log
-[error]
-
-
-
-=== TEST 18: set custom Konqueror user-agent
---- config
-    location /t {
-        more_set_input_headers "User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)";
-        echo "User-Agent: $http_user_agent";
-    }
-
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    printf("rewrite: konqueror: %d\n", $r->headers_in->konqueror)
-}
-
-
-F(ngx_http_core_content_phase) {
-    printf("content: konqueror: %d\n", $r->headers_in->konqueror)
-}
-
---- stap_out
-rewrite: konqueror: 0
-content: konqueror: 1
-
---- response_body
-User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)
---- no_error_log
-[error]
diff --git a/debian/modules/http-headers-more-filter/t/input.t b/debian/modules/http-headers-more-filter/t/input.t
deleted file mode 100644
index 01ae73f..0000000
--- a/debian/modules/http-headers-more-filter/t/input.t
+++ /dev/null
@@ -1,1331 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket; # 'no_plan';
-
-repeat_each(2);
-
-plan tests => repeat_each() * 128;
-
-no_long_string();
-#no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: set request header at client side
---- config
-    location /foo {
-        #more_set_input_headers 'X-Foo: howdy';
-        echo $http_x_foo;
-    }
---- request
-    GET /foo
---- more_headers
-X-Foo: blah
---- response_headers
-! X-Foo
---- response_body
-blah
-
-
-
-=== TEST 2: set request header at client side and rewrite it
---- config
-    location /foo {
-        more_set_input_headers 'X-Foo: howdy';
-        echo $http_x_foo;
-    }
---- request
-    GET /foo
---- more_headers
-X-Foo: blah
---- response_headers
-! X-Foo
---- response_body
-howdy
-
-
-
-=== TEST 3: rewrite content length
---- config
-    location /bar {
-        more_set_input_headers 'Content-Length: 2048';
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request eval
-"POST /bar\n" .
-"a" x 4096
---- response_body eval
-"a" x 2048
---- timeout: 15
-
-
-
-=== TEST 4: try to rewrite content length using the rewrite module
-Thisshould not take effect ;)
---- config
-    location /bar {
-        set $http_content_length 2048;
-        echo_read_request_body;
-        echo_request_body;
-    }
---- request eval
-"POST /bar\n" .
-"a" x 4096
---- response_body eval
-"a" x 4096
-
-
-
-=== TEST 5: rewrite host and user-agent
---- config
-    location /bar {
-        more_set_input_headers 'Host: foo' 'User-Agent: blah';
-        echo "Host: $host";
-        echo "User-Agent: $http_user_agent";
-    }
---- request
-GET /bar
---- response_body
-Host: foo
-User-Agent: blah
-
-
-
-=== TEST 6: clear host and user-agent
-$host always has a default value and cannot be really cleared.
---- config
-    location /bar {
-        more_clear_input_headers 'Host: foo' 'User-Agent: blah';
-        echo "Host: $host";
-        echo "Host (2): $http_host";
-        echo "User-Agent: $http_user_agent";
-    }
---- request
-GET /bar
---- response_body
-Host: localhost
-Host (2): 
-User-Agent: 
-
-
-
-=== TEST 7: clear host and user-agent (the other way)
---- config
-    location /bar {
-        more_set_input_headers 'Host:' 'User-Agent:' 'X-Foo:';
-        echo "Host: $host";
-        echo "User-Agent: $http_user_agent";
-        echo "X-Foo: $http_x_foo";
-    }
---- request
-GET /bar
---- more_headers
-X-Foo: bar
---- response_body
-Host: localhost
-User-Agent: 
-X-Foo: 
-
-
-
-=== TEST 8: clear content-length
---- config
-    location /bar {
-        more_set_input_headers 'Content-Length: ';
-        echo "Content-Length: $http_content_length";
-    }
---- request
-POST /bar
-hello
---- more_headers
---- response_body
-Content-Length: 
-
-
-
-=== TEST 9: clear content-length (the other way)
---- config
-    location /bar {
-        more_clear_input_headers 'Content-Length: ';
-        echo "Content-Length: $http_content_length";
-    }
---- request
-POST /bar
-hello
---- more_headers
---- response_body
-Content-Length: 
-
-
-
-=== TEST 10: rewrite type
---- config
-    location /bar {
-        more_set_input_headers 'Content-Type: text/css';
-        echo "Content-Type: $content_type";
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/plain
---- response_body
-Content-Type: text/css
-
-
-
-=== TEST 11: clear type
---- config
-    location /bar {
-        more_set_input_headers 'Content-Type:';
-        echo "Content-Type: $content_type";
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/plain
---- response_body
-Content-Type: 
-
-
-
-=== TEST 12: clear type (the other way)
---- config
-    location /bar {
-        more_clear_input_headers 'Content-Type:foo';
-        echo "Content-Type: $content_type";
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/plain
---- response_body
-Content-Type: 
-
-
-
-=== TEST 13: add type constraints
---- config
-    location /bar {
-        more_set_input_headers -t 'text/plain' 'X-Blah:yay';
-        echo $http_x_blah;
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/plain
---- response_body
-yay
-
-
-
-=== TEST 14: add type constraints (not matched)
---- config
-    location /bar {
-        more_set_input_headers -t 'text/plain' 'X-Blah:yay';
-        echo $http_x_blah;
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/css
---- response_body eval: "\n"
-
-
-
-=== TEST 15: add type constraints (OR'd)
---- config
-    location /bar {
-        more_set_input_headers -t 'text/plain text/css' 'X-Blah:yay';
-        echo $http_x_blah;
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/css
---- response_body
-yay
-
-
-
-=== TEST 16: add type constraints (OR'd)
---- config
-    location /bar {
-        more_set_input_headers -t 'text/plain text/css' 'X-Blah:yay';
-        echo $http_x_blah;
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/plain
---- response_body
-yay
-
-
-
-=== TEST 17: add type constraints (OR'd) (not matched)
---- config
-    location /bar {
-        more_set_input_headers -t 'text/plain text/css' 'X-Blah:yay';
-        echo $http_x_blah;
-    }
---- request
-POST /bar
-hello
---- more_headers
-Content-Type: text/html
---- response_body eval: "\n"
-
-
-
-=== TEST 18: mix input and output cmds
---- config
-    location /bar {
-        more_set_input_headers 'X-Blah:yay';
-        more_set_headers 'X-Blah:hiya';
-        echo $http_x_blah;
-    }
---- request
-GET /bar
---- response_headers
-X-Blah: hiya
---- response
-yay
-
-
-
-=== TEST 19: set request header at client side and replace
---- config
-    location /foo {
-        more_set_input_headers -r 'X-Foo: howdy';
-        echo $http_x_foo;
-    }
---- request
-    GET /foo
---- more_headers
-X-Foo: blah
---- response_headers
-! X-Foo
---- response_body
-howdy
-
-
-
-=== TEST 20: do no set request header at client, so no replace with -r option
---- config
-    location /foo {
-        more_set_input_headers -r 'X-Foo: howdy';
-        echo "empty_header:" $http_x_foo;
-    }
---- request
-    GET /foo
---- response_headers
-! X-Foo
---- response_body
-empty_header: 
-
-
-
-=== TEST 21: clear input headers
---- config
-    location /foo {
-        set $val 'dog';
-
-        more_clear_input_headers 'User-Agent';
-
-        proxy_pass http://127.0.0.1:$server_port/proxy;
-    }
-    location /proxy {
-        echo -n $echo_client_request_headers;
-    }
---- request
-    GET /foo
---- more_headers
-User-Agent: my-sock
---- response_body eval
-"GET /proxy HTTP/1.0\r
-Host: 127.0.0.1:\$ServerPort\r
-Connection: close\r
-\r
-"
---- skip_nginx: 3: < 0.7.46
-
-
-
-=== TEST 22: clear input headers
---- config
-    location /foo {
-        more_clear_input_headers 'User-Agent';
-
-        proxy_pass http://127.0.0.1:$server_port/proxy;
-    }
-    location /proxy {
-        echo -n $echo_client_request_headers;
-    }
---- request
-    GET /foo
---- response_body eval
-"GET /proxy HTTP/1.0\r
-Host: 127.0.0.1:\$ServerPort\r
-Connection: close\r
-\r
-"
---- skip_nginx: 3: < 0.7.46
-
-
-
-=== TEST 23: clear input headers
---- config
-    location /foo {
-        more_clear_input_headers 'X-Foo19';
-        more_clear_input_headers 'X-Foo20';
-        more_clear_input_headers 'X-Foo21';
-
-        proxy_pass http://127.0.0.1:$server_port/proxy;
-    }
-    location /proxy {
-        echo -n $echo_client_request_headers;
-    }
---- request
-    GET /foo
---- more_headers eval
-my $s;
-for my $i (3..21) {
-    $s .= "X-Foo$i: $i\n";
-}
-$s;
---- response_body eval
-"GET /proxy HTTP/1.0\r
-Host: 127.0.0.1:\$ServerPort\r
-Connection: close\r
-X-Foo3: 3\r
-X-Foo4: 4\r
-X-Foo5: 5\r
-X-Foo6: 6\r
-X-Foo7: 7\r
-X-Foo8: 8\r
-X-Foo9: 9\r
-X-Foo10: 10\r
-X-Foo11: 11\r
-X-Foo12: 12\r
-X-Foo13: 13\r
-X-Foo14: 14\r
-X-Foo15: 15\r
-X-Foo16: 16\r
-X-Foo17: 17\r
-X-Foo18: 18\r
-\r
-"
---- skip_nginx: 3: < 0.7.46
-
-
-
-=== TEST 24: Accept-Encoding
---- config
-    location /bar {
-        default_type 'text/plain';
-        more_set_input_headers 'Accept-Encoding: gzip';
-        gzip on;
-        gzip_min_length  1;
-        gzip_buffers     4 8k;
-        gzip_types       text/plain;
-    }
---- user_files
-">>> bar
-" . ("hello" x 512)
---- request
-GET /bar
---- response_headers
-Content-Encoding: gzip
---- response_body_like: .
-
-
-
-=== TEST 25: rewrite + set request header
---- config
-    location /t {
-        rewrite ^ /foo last;
-    }
-
-    location /foo {
-        more_set_input_headers 'X-Foo: howdy';
-        proxy_pass http://127.0.0.1:$server_port/echo;
-    }
-
-    location /echo {
-        echo "X-Foo: $http_x_foo";
-    }
---- request
-    GET /foo
---- response_headers
-! X-Foo
---- response_body
-X-Foo: howdy
-
-
-
-=== TEST 26: clear_header should clear all the instances of the user custom header
---- config
-    location = /t {
-        more_clear_input_headers 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 27: clear_header should clear all the instances of the builtin header
---- config
-    location = /t {
-        more_clear_input_headers 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 28: Converting POST to GET - clearing headers (bug found by Matthieu Tourne, 411 error page)
---- config
-    location /t {
-        more_clear_input_headers Content-Type;
-        more_clear_input_headers 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
-\r
-$/
---- no_error_log
-[error]
-
-
-
-=== TEST 29: clear_header() does not duplicate subsequent headers (old bug)
---- config
-    location = /t {
-        more_clear_input_headers 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 30: clear input header (just more than 20 headers)
---- config
-    location = /t {
-        more_clear_input_headers "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 -n $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
-\r
-"
-
-
-
-=== TEST 31: clear input header (just more than 20 headers, and add more)
---- config
-    location = /t {
-        more_clear_input_headers R;
-        more_set_input_headers "foo-1: 1" "foo-2: 2" "foo-3: 3" "foo-4: 4"
-            "foo-5: 5" "foo-6: 6" "foo-7: 7" "foo-8: 8" "foo-9: 9"
-            "foo-10: 10" "foo-11: 11" "foo-12: 12" "foo-13: 13"
-            "foo-14: 14" "foo-15: 15" "foo-16: 16" "foo-17: 17" "foo-18: 18"
-            "foo-19: 19" "foo-20: 20" "foo-21: 21";
-
-        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 -n $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
-\r
-"
-
-
-
-=== TEST 32: clear input header (just more than 21 headers)
---- config
-    location = /t {
-        more_clear_input_headers R 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 -n $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
-\r
-"
-
-
-
-=== TEST 33: clear input header (just more than 21 headers)
---- config
-    location = /t {
-        more_clear_input_headers R Q;
-        more_set_input_headers "foo-1: 1" "foo-2: 2" "foo-3: 3" "foo-4: 4"
-            "foo-5: 5" "foo-6: 6" "foo-7: 7" "foo-8: 8" "foo-9: 9"
-            "foo-10: 10" "foo-11: 11" "foo-12: 12" "foo-13: 13"
-            "foo-14: 14" "foo-15: 15" "foo-16: 16" "foo-17: 17" "foo-18: 18"
-            "foo-19: 19" "foo-20: 20" "foo-21: 21";
-
-        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 -n $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
-\r
-"
-
-
-
-=== TEST 34: clear X-Real-IP
---- config
-    location /t {
-        more_clear_input_headers X-Real-IP;
-        echo "X-Real-IP: $http_x_real_ip";
-    }
---- request
-GET /t
---- more_headers
-X-Real-IP: 8.8.8.8
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
-        printf("rewrite: x-real-ip: %s\n",
-               user_string_n($r->headers_in->x_real_ip->value->data,
-                             $r->headers_in->x_real_ip->value->len))
-    } else {
-        println("rewrite: no x-real-ip")
-    }
-}
-
-F(ngx_http_core_content_phase) {
-    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
-        printf("content: x-real-ip: %s\n",
-               user_string_n($r->headers_in->x_real_ip->value->data,
-                             $r->headers_in->x_real_ip->value->len))
-    } else {
-        println("content: no x-real-ip")
-    }
-}
-
---- stap_out
-rewrite: x-real-ip: 8.8.8.8
-content: no x-real-ip
-
---- response_body
-X-Real-IP: 
-
---- no_error_log
-[error]
-
-
-
-=== TEST 35: set custom X-Real-IP
---- config
-    location /t {
-        more_set_input_headers "X-Real-IP: 8.8.4.4";
-        echo "X-Real-IP: $http_x_real_ip";
-    }
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
-        printf("rewrite: x-real-ip: %s\n",
-               user_string_n($r->headers_in->x_real_ip->value->data,
-                             $r->headers_in->x_real_ip->value->len))
-    } else {
-        println("rewrite: no x-real-ip")
-    }
-
-}
-
-F(ngx_http_core_content_phase) {
-    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
-        printf("content: x-real-ip: %s\n",
-               user_string_n($r->headers_in->x_real_ip->value->data,
-                             $r->headers_in->x_real_ip->value->len))
-    } else {
-        println("content: no x-real-ip")
-    }
-}
-
---- stap_out
-rewrite: no x-real-ip
-content: x-real-ip: 8.8.4.4
-
---- response_body
-X-Real-IP: 8.8.4.4
-
---- no_error_log
-[error]
-
-
-
-=== TEST 36: clear Via
---- config
-    location /t {
-        more_clear_input_headers Via;
-        echo "Via: $http_via";
-    }
---- request
-GET /t
---- more_headers
-Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    if (@defined($r->headers_in->via) && $r->headers_in->via) {
-        printf("rewrite: via: %s\n",
-               user_string_n($r->headers_in->via->value->data,
-                             $r->headers_in->via->value->len))
-    } else {
-        println("rewrite: no via")
-    }
-}
-
-F(ngx_http_core_content_phase) {
-    if (@defined($r->headers_in->via) && $r->headers_in->via) {
-        printf("content: via: %s\n",
-               user_string_n($r->headers_in->via->value->data,
-                             $r->headers_in->via->value->len))
-    } else {
-        println("content: no via")
-    }
-}
-
---- stap_out
-rewrite: via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
-content: no via
-
---- response_body
-Via: 
-
---- no_error_log
-[error]
-
-
-
-=== TEST 37: set custom Via
---- config
-    location /t {
-        more_set_input_headers "Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)";
-        echo "Via: $http_via";
-    }
---- request
-GET /t
-
---- stap
-F(ngx_http_headers_more_exec_input_cmd) {
-    if (@defined($r->headers_in->via) && $r->headers_in->via) {
-        printf("rewrite: via: %s\n",
-               user_string_n($r->headers_in->via->value->data,
-                             $r->headers_in->via->value->len))
-    } else {
-        println("rewrite: no via")
-    }
-
-}
-
-F(ngx_http_core_content_phase) {
-    if (@defined($r->headers_in->via) && $r->headers_in->via) {
-        printf("content: via: %s\n",
-               user_string_n($r->headers_in->via->value->data,
-                             $r->headers_in->via->value->len))
-    } else {
-        println("content: no via")
-    }
-}
-
---- stap_out
-rewrite: no via
-content: via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
-
---- response_body
-Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
-
---- no_error_log
-[error]
-
-
-
-=== TEST 38: HTTP 0.9 (set)
---- config
-    location /foo {
-        more_set_input_headers 'X-Foo: howdy';
-        echo "x-foo: $http_x_foo";
-    }
---- raw_request eval
-"GET /foo\r\n"
---- response_headers
-! X-Foo
---- response_body
-x-foo: 
---- http09
-
-
-
-=== TEST 39: HTTP 0.9 (clear)
---- config
-    location /foo {
-        more_clear_input_headers 'X-Foo';
-        echo "x-foo: $http_x_foo";
-    }
---- raw_request eval
-"GET /foo\r\n"
---- response_headers
-! X-Foo
---- response_body
-x-foo: 
---- http09
-
-
-
-=== TEST 40: Host header with port and $host
---- config
-    location /bar {
-        more_set_input_headers 'Host: agentzh.org:1984';
-        echo "host var: $host";
-        echo "http_host var: $http_host";
-    }
---- request
-GET /bar
---- response_body
-host var: agentzh.org
-http_host var: agentzh.org:1984
-
-
-
-=== TEST 41: Host header with upper case letters and $host
---- config
-    location /bar {
-        more_set_input_headers 'Host: agentZH.org:1984';
-        echo "host var: $host";
-        echo "http_host var: $http_host";
-    }
---- request
-GET /bar
---- response_body
-host var: agentzh.org
-http_host var: agentZH.org:1984
-
-
-
-=== TEST 42: clear all and re-insert
---- config
-    location = /t {
-        more_clear_input_headers Host Connection Cache-Control Accept
-                                 User-Agent Accept-Encoding Accept-Language
-                                 Cookie;
-
-        more_set_input_headers "Host: a" "Connection: b" "Cache-Control: c"
-                               "Accept: d" "User-Agent: e" "Accept-Encoding: f"
-                               "Accept-Language: g" "Cookie: h";
-
-        more_clear_input_headers Host Connection Cache-Control Accept
-                                 User-Agent Accept-Encoding Accept-Language
-                                 Cookie;
-
-        more_set_input_headers "Host: a" "Connection: b" "Cache-Control: c"
-                               "Accept: d" "User-Agent: e" "Accept-Encoding: f"
-                               "Accept-Language: g" "Cookie: h";
-
-        echo ok;
-    }
-
---- raw_request eval
-"GET /t HTTP/1.1\r
-Host: localhost\r
-Connection: close\r
-Cache-Control: max-age=0\r
-Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36\r
-Accept-Encoding: gzip,deflate,sdch\r
-Accept-Language: en-US,en;q=0.8\r
-Cookie: test=cookie;\r
-\r
-"
---- response_body
-ok
---- no_error_log
-[error]
-
-
-
-=== TEST 43: more_set_input_header does not override request headers with multiple values
---- config
-    #lua_code_cache off;
-    location = /t {
-        more_set_input_headers "AAA: 111";
-
-        content_by_lua '
-            local headers = ngx.req.get_headers()
-            ngx.say(headers["AAA"])
-        ';
-    }
---- request
-GET /t
---- more_headers
-AAA: 123
-AAA: 456
-AAA: 678
-
---- response_body
-111
---- no_error_log
-[error]
-
-
-
-=== TEST 44: clear If-Unmodified-Since req header
---- config
-    location = /t {
-        more_clear_input_headers 'If-Unmodified-Since';
-        content_by_lua '
-            ngx.header["Last-Modified"] = "Tue, 30 Jun 2011 12:16:36 GMT"
-            ngx.say("If-Unmodified-Since: ", ngx.var.http_if_unmodified_since)
-        ';
-    }
---- request
-GET /t
---- more_headers
-If-Unmodified-Since: Tue, 28 Jun 2011 12:16:36 GMT
---- response_body
-If-Unmodified-Since: nil
---- no_error_log
-[error]
-
-
-
-=== TEST 45: clear If-Match req header
---- config
-    location = /t {
-        more_clear_input_headers 'If-Match';
-        echo "If-Match: $http_if_match";
-    }
---- request
-GET /t
---- more_headers
-If-Match: abc
---- response_body
-If-Match: 
---- no_error_log
-[error]
-
-
-
-=== TEST 46: clear If-None-Match req header
---- config
-    location = /t {
-        more_clear_input_headers 'If-None-Match';
-        echo "If-None-Match: $http_if_none_match";
-    }
---- request
-GET /t
---- more_headers
-If-None-Match: *
---- response_body
-If-None-Match: 
---- no_error_log
-[error]
-
-
-
-=== TEST 47: set the Destination request header for WebDav
---- config
-    location = /a.txt {
-        more_set_input_headers "Destination: /b.txt";
-        dav_methods MOVE;
-        dav_access            all:rw;
-        root                  html;
-    }
-
---- user_files
->>> a.txt
-hello, world!
-
---- request
-MOVE /a.txt
-
---- response_body
---- no_error_log
-client sent no "Destination" header
-[error]
---- error_code: 204
-
-
-
-=== TEST 48: more_set_input_headers + X-Forwarded-For
---- config
-    location = /t {
-        more_set_input_headers "X-Forwarded-For: 8.8.8.8";
-        proxy_pass http://127.0.0.1:$server_port/back;
-        proxy_set_header Foo $proxy_add_x_forwarded_for;
-    }
-
-    location = /back {
-        echo "Foo: $http_foo";
-    }
-
---- request
-GET /t
-
---- response_body
-Foo: 8.8.8.8, 127.0.0.1
---- no_error_log
-[error]
-
-
-
-=== TEST 49: more_clear_input_headers + X-Forwarded-For
---- config
-    location = /t {
-        more_clear_input_headers "X-Forwarded-For";
-        proxy_pass http://127.0.0.1:$server_port/back;
-        proxy_set_header Foo $proxy_add_x_forwarded_for;
-    }
-
-    location = /back {
-        echo "Foo: $http_foo";
-    }
-
---- request
-GET /t
-
---- more_headers
-X-Forwarded-For: 8.8.8.8
---- response_body
-Foo: 127.0.0.1
---- no_error_log
-[error]
-
-
-
-=== TEST 50: clear input headers with wildcard
---- config
-    location /hello {
-        more_clear_input_headers 'X-Hidden-*';
-        content_by_lua '
-            ngx.say("X-Hidden-One: ", ngx.var.http_x_hidden_one)
-            ngx.say("X-Hidden-Two: ", ngx.var.http_x_hidden_two)
-        ';
-    }
---- request
-    GET /hello
---- more_headers
-X-Hidden-One: i am hidden
-X-Hidden-Two: me 2
---- response_body
-X-Hidden-One: nil
-X-Hidden-Two: nil
-
-
-
-=== TEST 51: make sure wildcard doesn't affect more_set_input_headers
---- config
-    location /hello {
-        more_set_input_headers 'X-Hidden-*: lol';
-        content_by_lua '
-            ngx.say("X-Hidden-One: ", ngx.var.http_x_hidden_one)
-            ngx.say("X-Hidden-Two: ", ngx.var.http_x_hidden_two)
-        ';
-    }
---- request
-    GET /hello
---- more_headers
-X-Hidden-One: i am hidden
-X-Hidden-Two: me 2
---- response_body
-X-Hidden-One: i am hidden
-X-Hidden-Two: me 2
diff --git a/debian/modules/http-headers-more-filter/t/phase.t b/debian/modules/http-headers-more-filter/t/phase.t
deleted file mode 100644
index 11183db..0000000
--- a/debian/modules/http-headers-more-filter/t/phase.t
+++ /dev/null
@@ -1,25 +0,0 @@
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-plan tests => 3;
-
-no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple set (1 arg)
---- config
-    location /foo {
-        deny all;
-        more_set_headers 'X-Foo: Blah';
-    }
---- request
-    GET /foo
---- response_headers
-X-Foo: Blah
---- response_body_like: 403 Forbidden
---- error_code: 403
diff --git a/debian/modules/http-headers-more-filter/t/sanity.t b/debian/modules/http-headers-more-filter/t/sanity.t
deleted file mode 100644
index d06f5dc..0000000
--- a/debian/modules/http-headers-more-filter/t/sanity.t
+++ /dev/null
@@ -1,567 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * 113;
-
-#master_on();
-#workers(2);
-log_level("warn");
-no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: simple set (1 arg)
---- config
-    location /foo {
-        echo hi;
-        more_set_headers 'X-Foo: Blah';
-    }
---- request
-    GET /foo
---- response_headers
-X-Foo: Blah
---- response_body
-hi
-
-
-
-=== TEST 2: simple set (2 args)
---- config
-    location /foo {
-        echo hi;
-        more_set_headers 'X-Foo: Blah' 'X-Bar: hi';
-    }
---- request
-    GET /foo
---- response_headers
-X-Foo: Blah
-X-Bar: hi
---- response_body
-hi
-
-
-
-=== TEST 3: two sets in a single location
---- config
-    location /two {
-        echo hi;
-        more_set_headers 'X-Foo: Blah'
-        more_set_headers 'X-Bar: hi';
-    }
---- request
-    GET /two
---- response_headers
-X-Foo: Blah
-X-Bar: hi
---- response_body
-hi
-
-
-
-=== TEST 4: two sets in a single location (for 404 too)
---- config
-    location /two {
-        more_set_headers 'X-Foo: Blah'
-        more_set_headers 'X-Bar: hi';
-        return 404;
-    }
---- request
-    GET /two
---- response_headers
-X-Foo: Blah
-X-Bar: hi
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 5: set a header then clears it (500)
---- config
-    location /two {
-        more_set_headers 'X-Foo: Blah';
-        more_set_headers 'X-Foo:';
-        return 500;
-    }
---- request
-    GET /two
---- response_headers
-! X-Foo
-! X-Bar
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 6: set a header only when 500 (matched)
---- config
-    location /bad {
-        more_set_headers -s 500 'X-Mine: Hiya';
-        more_set_headers -s 404 'X-Yours: Blah';
-        return 500;
-    }
---- request
-    GET /bad
---- response_headers
-X-Mine: Hiya
-! X-Yours
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 7: set a header only when 500 (not matched with 200)
---- config
-    location /bad {
-        more_set_headers -s 500 'X-Mine: Hiya';
-        more_set_headers -s 404 'X-Yours: Blah';
-        echo hello;
-    }
---- request
-    GET /bad
---- response_headers
-! X-Mine
-! X-Yours
---- response_body
-hello
---- error_code: 200
-
-
-
-=== TEST 8: set a header only when 500 (not matched with 404)
---- config
-    location /bad {
-        more_set_headers -s 500 'X-Mine: Hiya';
-        more_set_headers -s 404 'X-Yours: Blah';
-        return 404;
-    }
---- request
-    GET /bad
---- response_headers
-! X-Mine
-X-Yours: Blah
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 9: more conditions
---- config
-    location /bad {
-        more_set_headers -s '503 404' 'X-Mine: Hiya';
-        more_set_headers -s ' 404  413 ' 'X-Yours: Blah';
-        return 503;
-    }
---- request
-    GET /bad
---- response_headers
-X-Mine: Hiya
-! X-Yours
---- response_body_like: 503 Service
---- error_code: 503
-
-
-
-=== TEST 10: more conditions
---- config
-    location /bad {
-        more_set_headers -s '503 404' 'X-Mine: Hiya';
-        more_set_headers -s ' 404   413 ' 'X-Yours: Blah';
-        return 404;
-    }
---- request
-    GET /bad
---- response_headers
-X-Mine: Hiya
-X-Yours: Blah
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 11: more conditions
---- config
-    location /bad {
-        more_set_headers -s '503 404' 'X-Mine: Hiya';
-        more_set_headers -s ' 404   413  ' 'X-Yours: Blah';
-        return 413;
-    }
---- request
-    GET /bad
---- response_headers
-! X-Mine
-X-Yours: Blah
---- response_body_like: 413 Request Entity Too Large
---- error_code: 413
-
-
-
-=== TEST 12: simple -t
---- config
-    location /bad {
-        default_type 'text/css';
-        more_set_headers -t 'text/css' 'X-CSS: yes';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-X-CSS: yes
---- response_body
-hi
-
-
-
-=== TEST 13: simple -t (not matched)
---- config
-    location /bad {
-        default_type 'text/plain';
-        more_set_headers -t 'text/css' 'X-CSS: yes';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-! X-CSS
---- response_body
-hi
-
-
-
-=== TEST 14: multiple -t (not matched)
---- config
-    location /bad {
-        default_type 'text/plain';
-        more_set_headers -t 'text/javascript' -t 'text/css' 'X-CSS: yes';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-! X-CSS
---- response_body
-hi
-
-
-
-=== TEST 15: multiple -t (matched)
---- config
-    location /bad {
-        default_type 'text/plain';
-        more_set_headers -t 'text/javascript' -t 'text/plain' 'X-CSS: yes';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-X-CSS: yes
---- response_body
-hi
-
-
-
-=== TEST 16: multiple -t (matched)
---- config
-    location /bad {
-        default_type 'text/javascript';
-        more_set_headers -t 'text/javascript' -t 'text/plain' 'X-CSS: yes';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-X-CSS: yes
---- response_body
-hi
-
-
-
-=== TEST 17: multiple -t (matched) with extra spaces
---- config
-    location /bad {
-        default_type 'text/javascript';
-        more_set_headers -t ' text/javascript  ' -t 'text/plain' 'X-CSS: yes';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-X-CSS: yes
---- response_body
-hi
-
-
-
-=== TEST 18: multiple -t merged
---- config
-    location /bad {
-        default_type 'text/javascript';
-        more_set_headers -t ' text/javascript  text/plain' 'X-CSS: yes';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-X-CSS: yes
---- response_body
-hi
-
-
-
-=== TEST 19: multiple -t merged (2)
---- config
-    location /bad {
-        default_type 'text/plain';
-        more_set_headers -t ' text/javascript  text/plain' 'X-CSS: yes';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-X-CSS: yes
---- response_body
-hi
-
-
-
-=== TEST 20: multiple -s option in a directive (not matched)
---- config
-    location /bad {
-        more_set_headers -s 404 -s 500 'X-status: howdy';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-! X-status
---- response_body
-hi
-
-
-
-=== TEST 21: multiple -s option in a directive (matched 404)
---- config
-    location /bad {
-        more_set_headers -s 404 -s 500 'X-status: howdy';
-        return 404;
-    }
---- request
-    GET /bad
---- response_headers
-X-status: howdy
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 22: multiple -s option in a directive (matched 500)
---- config
-    location /bad {
-        more_set_headers -s 404 -s 500 'X-status: howdy';
-        return 500;
-    }
---- request
-    GET /bad
---- response_headers
-X-status: howdy
---- response_body_like: 500 Internal Server Error
---- error_code: 500
-
-
-
-=== TEST 23: -s mixed with -t
---- config
-    location /bad {
-        default_type 'text/html';
-        more_set_headers -s 404 -s 200 -t 'text/html' 'X-status: howdy2';
-        return 404;
-    }
---- request
-    GET /bad
---- response_headers
-X-status: howdy2
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 24: -s mixed with -t
---- config
-    location /bad {
-        default_type 'text/html';
-        more_set_headers -s 404 -s 200 -t 'text/plain' 'X-status: howdy2';
-        return 404;
-    }
---- request
-    GET /bad
---- response_headers
-! X-status
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 25: -s mixed with -t
---- config
-    location /bad {
-        default_type 'text/html';
-        more_set_headers -s 404 -s 200 -t 'text/html' 'X-status: howdy2';
-        echo hi;
-    }
---- request
-    GET /bad
---- response_headers
-X-status: howdy2
---- response_body
-hi
---- error_code: 200
-
-
-
-=== TEST 26: -s mixed with -t
---- config
-    location /bad {
-        default_type 'text/html';
-        more_set_headers -s 500 -s 200 -t 'text/html' 'X-status: howdy2';
-        return 404;
-    }
---- request
-    GET /bad
---- response_headers
-! X-status
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 27: merge from the upper level
---- config
-    more_set_headers -s 404 -t 'text/html' 'X-status2: howdy3';
-    location /bad {
-        default_type 'text/html';
-        more_set_headers -s 500 -s 200 -t 'text/html' 'X-status: howdy2';
-        return 404;
-    }
---- request
-    GET /bad
---- response_headers
-X-status2: howdy3
-! X-status
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 28: merge from the upper level
---- config
-    more_set_headers -s 404 -t 'text/html' 'X-status2: howdy3';
-    location /bad {
-        default_type 'text/html';
-        more_set_headers -s 500 -s 200 -t 'text/html' 'X-status: howdy2';
-        echo yeah;
-    }
---- request
-    GET /bad
---- response_headers
-! X-status2
-X-status: howdy2
---- response_body
-yeah
---- error_code: 200
-
-
-
-=== TEST 29: override settings by inheritance
---- config
-    more_set_headers -s 404 -t 'text/html' 'X-status: yeah';
-    location /bad {
-        default_type 'text/html';
-        more_set_headers -s 404 -t 'text/html' 'X-status: nope';
-        return 404;
-    }
---- request
-    GET /bad
---- response_headers
-X-status: nope
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 30: append settings by inheritance
---- config
-    more_set_headers -s 404 -t 'text/html' 'X-status: yeah';
-    location /bad {
-        default_type 'text/html';
-        more_set_headers -s 404 -t 'text/html' 'X-status2: nope';
-        return 404;
-    }
---- request
-    GET /bad
---- response_headers
-X-status: yeah
-X-status2: nope
---- response_body_like: 404 Not Found
---- error_code: 404
-
-
-
-=== TEST 31: clear headers with wildcard
---- config
-    location = /backend {
-        add_header X-Hidden-One "i am hidden";
-        add_header X-Hidden-Two "me 2";
-        echo hi;
-    }
-    location /hello {
-        more_clear_headers 'X-Hidden-*';
-        proxy_pass http://127.0.0.1:$server_port/backend;
-    }
---- request
-    GET /hello
---- response_headers
-! X-Hidden-One
-! X-Hidden-Two
---- response_body
-hi
-
-
-
-=== TEST 32: clear duplicate headers
---- config
-    location = /backend {
-        add_header pragma no-cache;
-        add_header pragma no-cache;
-        echo hi;
-    }
-    location /hello {
-        more_clear_headers 'pragma';
-        proxy_pass http://127.0.0.1:$server_port/backend;
-    }
---- request
-    GET /hello
---- response_headers
-!pragma
---- response_body
-hi
-
-
-
-=== TEST 33: HTTP 0.9 (set)
---- config
-    location /foo {
-        more_set_headers 'X-Foo: howdy';
-        echo ok;
-    }
---- raw_request eval
-"GET /foo\r\n"
---- response_headers
-! X-Foo
---- response_body
-ok
---- http09
diff --git a/debian/modules/http-headers-more-filter/t/subrequest.t b/debian/modules/http-headers-more-filter/t/subrequest.t
deleted file mode 100644
index 9443eca..0000000
--- a/debian/modules/http-headers-more-filter/t/subrequest.t
+++ /dev/null
@@ -1,68 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket; # 'no_plan';
-
-plan tests => blocks() * 3;
-
-no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: vars in input header directives
---- config
-    location /main {
-        echo_location /foo;
-        echo "main: $http_user_agent";
-    }
-    location /foo {
-        set $val 'dog';
-
-        more_set_input_headers 'User-Agent: $val';
-
-        proxy_pass http://127.0.0.1:$server_port/proxy;
-    }
-    location /proxy {
-        echo "sub: $http_user_agent";
-    }
---- request
-    GET /main
---- more_headers
-User-Agent: my-sock
---- response_body
-sub: dog
-main: dog
---- response_headers
-! Host
---- skip_nginx: 3: < 0.7.46
-
-
-
-=== TEST 2: vars in input header directives
---- config
-    location /main {
-        #more_set_input_headers 'User-Agent: cat';
-        echo_location /foo;
-        echo "main: $http_user_agent";
-    }
-    location /foo {
-        set $val 'dog';
-
-        more_set_input_headers 'User-Agent: $val';
-
-        proxy_pass http://127.0.0.1:$server_port/proxy;
-        #echo $http_user_agent;
-    }
-    location /proxy {
-        echo "sub: $http_user_agent";
-    }
---- request
-    GET /main
---- response_body
-sub: dog
-main: dog
---- response_headers
-! Host
---- skip_nginx: 3: < 0.7.46
diff --git a/debian/modules/http-headers-more-filter/t/unused.t b/debian/modules/http-headers-more-filter/t/unused.t
deleted file mode 100644
index c51f91c..0000000
--- a/debian/modules/http-headers-more-filter/t/unused.t
+++ /dev/null
@@ -1,174 +0,0 @@
-# vi:filetype=
-
-use lib 'lib';
-use Test::Nginx::Socket;
-
-repeat_each(2);
-
-plan tests => repeat_each() * (blocks() * 4 + 2);
-
-#master_on();
-#workers(2);
-log_level("warn");
-no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: used output filter
---- config
-    location /foo {
-        echo hi;
-        more_set_headers "Foo: bar";
-    }
---- request
-    GET /foo
---- response_headers
-Foo: bar
---- response_body
-hi
---- error_log
-headers more header filter
---- no_error_log
-[error]
---- log_level: debug
-
-
-
-=== TEST 2: unused output filter (none)
---- config
-    location /foo {
-        echo hi;
-    }
---- request
-    GET /foo
---- response_body
-hi
---- no_error_log
-headers more header filter
-[error]
---- log_level: debug
-
-
-
-=== TEST 3: unused output filter (with more_set_input_headers only)
---- config
-    location /foo {
-        more_set_input_headers "Foo: bar";
-        echo hi;
-    }
---- request
-    GET /foo
---- response_body
-hi
---- no_error_log
-headers more header filter
-[error]
---- log_level: debug
-
-
-
-=== TEST 4: used rewrite handler
---- config
-    location /foo {
-        more_set_input_headers "Foo: bar";
-        echo hi;
-    }
---- request
-    GET /foo
---- response_body
-hi
---- error_log
-headers more rewrite handler
---- no_error_log
-[error]
---- log_level: debug
-
-
-
-=== TEST 5: unused rewrite handler (none)
---- config
-    location /foo {
-        #more_set_input_headers "Foo: bar";
-        echo hi;
-    }
---- request
-    GET /foo
---- response_body
-hi
---- no_error_log
-headers more rewrite handler
-[error]
---- log_level: debug
-
-
-
-=== TEST 6: unused rewrite handler (with output header filters)
---- config
-    location /foo {
-        #more_set_input_headers "Foo: bar";
-        echo hi;
-        more_set_headers "Foo: bar";
-    }
---- request
-    GET /foo
---- response_headers
-Foo: bar
---- response_body
-hi
---- no_error_log
-headers more rewrite handler
-[error]
---- log_level: debug
-
-
-
-=== TEST 7: multiple http {} blocks (filter)
-This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
-have been prohibited since then.
---- SKIP
---- config
-    location /foo {
-        echo hi;
-        more_set_headers 'Foo: bar';
-    }
---- post_main_config
-    http {
-    }
-
---- request
-    GET /foo
---- response_body
-hi
---- response_headers
-Foo: bar
---- no_error_log
-[error]
---- error_log
-headers more header filter
---- log_level: debug
-
-
-
-=== TEST 8: multiple http {} blocks (handler)
-This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
-have been prohibited since then.
---- SKIP
---- config
-    location /foo {
-        more_set_input_headers 'Foo: bar';
-        echo $http_foo;
-    }
---- post_main_config
-    http {
-    }
-
---- request
-    GET /foo
---- response_body
-bar
---- no_error_log
-headers more header handler
-[error]
---- log_level: debug
diff --git a/debian/modules/http-headers-more-filter/t/vars.t b/debian/modules/http-headers-more-filter/t/vars.t
deleted file mode 100644
index 04c75c3..0000000
--- a/debian/modules/http-headers-more-filter/t/vars.t
+++ /dev/null
@@ -1,58 +0,0 @@
-# vi:ft=
-
-use lib 'lib';
-use Test::Nginx::Socket; # 'no_plan';
-
-plan tests => 9;
-
-no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: vars
---- config
-    location /foo {
-        echo hi;
-        set $val 'hello, world';
-        more_set_headers 'X-Foo: $val';
-    }
---- request
-    GET /foo
---- response_headers
-X-Foo: hello, world
---- response_body
-hi
-
-
-
-=== TEST 2: vars in both key and val
---- config
-    location /foo {
-        echo hi;
-        set $val 'hello, world';
-        more_set_headers '$val: $val';
-    }
---- request
-    GET /foo
---- response_headers
-$val: hello, world
---- response_body
-hi
-
-
-
-=== TEST 3: vars in input header directives
---- config
-    location /foo {
-        set $val 'dog';
-        more_set_input_headers 'Host: $val';
-        echo $host;
-    }
---- request
-    GET /foo
---- response_body
-dog
---- response_headers
-Host:
diff --git a/debian/modules/http-headers-more-filter/util/build.sh b/debian/modules/http-headers-more-filter/util/build.sh
deleted file mode 100755
index 007194d..0000000
--- a/debian/modules/http-headers-more-filter/util/build.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# this file is mostly meant to be used by the author himself.
-
-root=`pwd`
-version=$1
-home=~
-force=$2
-
-        #--with-cc=gcc46 \
-
-ngx-build $force $version \
-        --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB" \
-        --without-mail_pop3_module \
-        --without-mail_imap_module \
-        --without-mail_smtp_module \
-        --without-http_upstream_ip_hash_module \
-        --without-http_empty_gif_module \
-        --without-http_memcached_module \
-        --without-http_referer_module \
-        --without-http_autoindex_module \
-        --without-http_auth_basic_module \
-        --without-http_userid_module \
-        --with-http_realip_module \
-        --with-http_dav_module \
-      --add-module=$root/../eval-nginx-module \
-      --add-module=$root/../lua-nginx-module \
-      --add-module=$root/../echo-nginx-module \
-      --add-module=$root $opts \
-      --with-debug
-      #--add-module=$root/../ndk-nginx-module \
-  #--without-http_ssi_module  # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
-
diff --git a/debian/modules/http-headers-more-filter/valgrind.suppress b/debian/modules/http-headers-more-filter/valgrind.suppress
deleted file mode 100644
index d51de70..0000000
--- a/debian/modules/http-headers-more-filter/valgrind.suppress
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   obj:*
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_calloc
-   fun:ngx_event_process_init
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_event_process_init
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_ctl(event)
-   fun:epoll_ctl
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:memcpy
-   fun:ngx_vslprintf
-   fun:ngx_log_error_core
-   fun:ngx_http_charset_header_filter
-}
-{
-   nginx-core-process-init
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_event_process_init
-}
-{
-   nginx-core-crc32-init
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_crc32_table_init
-   fun:main
-}
-{
-   palloc_large_for_init_request
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_palloc_large
-   fun:ngx_palloc
-   fun:ngx_pcalloc
-   fun:ngx_http_init_request
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-}
-{
-   palloc_large_for_create_temp_buf
-   Memcheck:Leak
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_palloc_large
-   fun:ngx_palloc
-   fun:ngx_create_temp_buf
-   fun:ngx_http_init_request
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-}
-{
-   accept_create_pool
-   Memcheck:Leak
-   fun:memalign
-   fun:posix_memalign
-   fun:ngx_memalign
-   fun:ngx_create_pool
-   fun:ngx_event_accept
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-}
-{
-   create_pool_for_init_req
-   Memcheck:Leak
-   fun:memalign
-   fun:posix_memalign
-   fun:ngx_memalign
-   fun:ngx_create_pool
-   fun:ngx_http_init_request
-   fun:ngx_epoll_process_events
-   fun:ngx_process_events_and_timers
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr8
-   fun:getenv
-   fun:gcov_exit
-   fun:exit
-   fun:ngx_master_process_exit
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Cond
-   fun:index
-   fun:expand_dynamic_string_token
-   fun:_dl_map_object
-   fun:map_doit
-   fun:_dl_catch_error
-   fun:do_preload
-   fun:dl_main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_set_environment
-   fun:ngx_single_process_cycle
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:ngx_alloc
-   fun:ngx_set_environment
-   fun:ngx_worker_process_init
-   fun:ngx_worker_process_cycle
-}
diff --git a/debian/modules/http-subs-filter/CHANGES b/debian/modules/http-subs-filter/CHANGES
deleted file mode 100644
index b8a7ef1..0000000
--- a/debian/modules/http-subs-filter/CHANGES
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Changes with nginx_substitutions_filter 0.6.4                                     2014-02-15
-
-    *) Now non-200 response will work
-    *) added the subs_filter_bypass directive
-
-Changes with nginx_substitutions_filter 0.6.2                                     2012-08-26
-
-    *) fixed a bug of buffer overlap
-    *) fixed a bug with last zero buffer
-
-Changes with nginx_substitutions_filter 0.6.0                                     2012-06-30
-
-    *) refactor this module
-
-Changes with nginx_substitutions_filter 0.5.2                                     2010-08-11
-
-    *) do many optimizing for this module
-    *) fix a bug of buffer overlap
-    *) fix a segment fault bug when output chain return NGX_AGAIN.
-    *) fix a bug about last buffer with no linefeed. This may cause segment fault. Thanks for Josef Fröhle 
-
-Changes with nginx_substitutions_filter 0.5                                       2010-04-15
-
-    *) refactor the source structure, create branches of dev
-    *) fix a bug of small chunk of buffers causing lose content
-    *) fix the bug of last_buf and the nginx's compatibility above 0.8.25
-    *) fix a bug with unwanted capture config error in fix string substitution
-    *) add feature of regex captures
-
-Changes with nginx_substitutions_filter 0.4                                       2009-12-23
-
-    *) fix many bugs
-
-Changes with nginx_substitutions_filter 0.3                                       2009-02-04
-
-    *) Initial public release
diff --git a/debian/modules/http-subs-filter/README b/debian/modules/http-subs-filter/README
deleted file mode 100644
index 1d32e05..0000000
--- a/debian/modules/http-subs-filter/README
+++ /dev/null
@@ -1,141 +0,0 @@
-nginx_substitutions_filter
-    *Note: this module is not distributed with the Nginx source.
-    Installation instructions can be found below.*
-
-  Description
-    nginx_substitutions_filter is a filter module which can do both regular
-    expression and fixed string substitutions on response bodies. This
-    module is quite different from the Nginx's native Substitution Module.
-    It scans the output chains buffer and matches string line by line, just
-    like Apache's mod_substitute
-    (<http://httpd.apache.org/docs/trunk/mod/mod_substitute.html>).
-
-  Example
-    location / {
-
-        subs_filter_types text/html text/css text/xml;
-        subs_filter st(\d*).example.com $1.example.com ir;
-        subs_filter a.example.com s.example.com;
-
-    }
-
-  Directives
-    *   subs_filter_types
-
-    *   subs_filter
-
-   subs_filter_types
-    syntax: *subs_filter_types mime-type [mime-types] *
-
-    default: *subs_filter_types text/html*
-
-    context: *http, server, location*
-
-    *subs_filter_types* is used to specify which content types should be
-    checked for *subs_filter*. The default is only *text/html*.
-
-    This module just works with plain text. If the response is compressed,
-    it can't uncompress the response and will ignore this response. This
-    module can be compatible with gzip filter module. But it will not work
-    with proxy compressed response. You can disable the compressed response
-    like this:
-
-    proxy_set_header Accept-Encoding "";
-
-   subs_filter
-    syntax: *subs_filter source_str destination_str [gior] *
-
-    default: *none*
-
-    context: *http, server, location*
-
-    *subs_filter* allows replacing source string(regular expression or
-    fixed) in the nginx response with destination string. Substitution text
-    may contain variables. More than one substitution rules per location is
-    supported. The meaning of the third flags are:
-
-    *   *g*(default): Replace all the match strings.
-
-    *   *i*: Perform a case-insensitive match.
-
-    *   *o*: Just replace the first one.
-
-    *   *r*: The pattern is treated as a regular expression, default is
-        fixed string.
-
-   subs_filter_bypass
-    syntax: *subs_filter_bypass $variable1 ...*
-
-    default: *none*
-
-    context: *http, server, location*
-
-    You can sepcify several variables with this directive. If at least one
-    of the variable is not empty and is not equal to '0', this substitution
-    filter will be disabled.
-
-  Installation
-    To install, get the source with subversion:
-
-    git clone
-    git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git
-
-    and then compile nginx with the following option:
-
-    ./configure --add-module=/path/to/module
-
-  Known issue
-    *   Can't substitute the response header.
-
-  CHANGES
-    Changes with nginx_substitutions_filter 0.6.4 2014-02-15
-
-    *   Now non-200 response will work
-
-    *   added the subs_filter_bypass directive
-
-    Changes with nginx_substitutions_filter 0.6.2 2012-08-26
-
-    *   fixed a bug of buffer overlap
-
-    *   fixed a bug with last zero buffer
-
-    Changes with nginx_substitutions_filter 0.6.0 2012-06-30
-
-    *   refactor this module
-
-    Changes with nginx_substitutions_filter 0.5.2 2010-08-11
-
-    *   do many optimizing for this module
-
-    *   fix a bug of buffer overlap
-
-    *   fix a segment fault bug when output chain return NGX_AGAIN.
-
-    *   fix a bug about last buffer with no linefeed. This may cause segment
-        fault. Thanks for Josef Fröhle
-
-    Changes with nginx_substitutions_filter 0.5 2010-04-15
-
-    *   refactor the source structure, create branches of dev
-
-    *   fix a bug of small chunk of buffers causing lose content
-
-    *   fix the bug of last_buf and the nginx's compatibility above 0.8.25
-
-    *   fix a bug with unwanted capture config error in fix string
-        substitution
-
-    *   add feature of regex captures
-
-    Changes with nginx_substitutions_filter 0.4 2009-12-23
-
-    *   fix many bugs
-
-    Changes with nginx_substitutions_filter 0.3 2009-02-04
-
-    *   Initial public release
-
-  Reporting a bug
-    Questions/patches may be directed to Weibin Yao, yaoweibin@gmail.com.
-
diff --git a/debian/modules/http-subs-filter/config b/debian/modules/http-subs-filter/config
deleted file mode 100644
index fdb016c..0000000
--- a/debian/modules/http-subs-filter/config
+++ /dev/null
@@ -1,3 +0,0 @@
-ngx_addon_name=ngx_http_subs_filter_module
-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
diff --git a/debian/modules/http-subs-filter/doc/README.google_code_home_page.wiki b/debian/modules/http-subs-filter/doc/README.google_code_home_page.wiki
deleted file mode 100644
index 6a158a2..0000000
--- a/debian/modules/http-subs-filter/doc/README.google_code_home_page.wiki
+++ /dev/null
@@ -1,120 +0,0 @@
-= nginx_substitutions_filter =
-
-_Note: this module is not distributed with the Nginx source. Installation instructions can be found [#Installation below]._
-
-== Description ==
-
-`nginx_substitutions_filter` is a filter module which can do both regular expression and fixed string substitutions on response bodies. This module is quite different from the Nginx's native Substitution Module. It scans the output chains buffer and matches string line by line, just like Apache's [http://httpd.apache.org/docs/trunk/mod/mod_substitute.html mod_substitute].
-
-== Example ==
-
-{{{
-location / {
-
-    subs_filter_types text/html text/css text/xml;
-    subs_filter st(\d*).example.com $1.example.com ir;
-    subs_filter a.example.com s.example.com;
-
-}
-}}}
-== Directives ==
-
- * [#subs_filter_types subs_filter_types]
- * [#subs_filter subs_filter]
-
-=== subs_filter_types ===
-
-`syntax:` _subs_filter_types mime-type `[`mime-types`]` _
-
-`default:` _subs_filter_types text/html_
-
-`context:` _http, server, location_
-
-_subs_filter_types_ is used to specify which content types should be checked for _subs_filter_. The default is only _text/html_.
-
-This module just works with plain text. If the response is compressed, it can't uncompress the response and will ignore this response. This module can be compatible with gzip filter module. But it will not work with proxy compressed response. You can disable the compressed response like this:
-
-proxy_set_header Accept-Encoding "";
-
-=== subs_filter ===
-
-`syntax:` _subs_filter source_str destination_str `[`gior`]` _
-
-`default:` _none_
-
-`context:` _http, server, location_
-
-_subs_filter_ allows replacing source string(regular expression or fixed) in the nginx response with destination string. Substitution text may contain variables. More than one substitution rules per location is supported. The meaning of the third flags are:
- * _g_(default): Replace all the match strings.
- * _i_: Perform a case-insensitive match.
- * _o_: Just replace the first one.
- * _r_: The pattern is treated as a regular expression, default is fixed string.
-
-=== subs_filter_bypass ===
-
-`syntax:` _subs_filter_bypass $variable1 ..._
-
-`default:` _none_
-
-`context:` _http, server, location_
-
-You can sepcify several variables with this directive. If at least one of the variable is not empty and is not equal to '0', this substitution filter will be disabled.
-
-== Installation ==
-
-To install, get the source with subversion:
-
-{{{
-git clone git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git
-}}}
-and then compile nginx with the following option:
-
-{{{
-./configure --add-module=/path/to/module
-}}}
-== Known issue ==
- * Can't substitute the response header.
-
-== CHANGES ==
-
-Changes with nginx_substitutions_filter 0.6.4                                     2014-02-15
-
- * Now non-200 response will work
- * added the subs_filter_bypass directive
-
-Changes with nginx_substitutions_filter 0.6.2                                     2012-08-26
-
- * fixed a bug of buffer overlap
- * fixed a bug with last zero buffer
-
-Changes with nginx_substitutions_filter 0.6.0                                     2012-06-30
-
- * refactor this module
-
-Changes with nginx_substitutions_filter 0.5.2                                     2010-08-11
-
- * do many optimizing for this module
- * fix a bug of buffer overlap
- * fix a segment fault bug when output chain return NGX_AGAIN.
- * fix a bug about last buffer with no linefeed. This may cause segment fault. Thanks for Josef Fröhle
-
-Changes with nginx_substitutions_filter 0.5                                       2010-04-15
-
- * refactor the source structure, create branches of dev
- * fix a bug of small chunk of buffers causing lose content
- * fix the bug of last_buf and the nginx's compatibility above 0.8.25
- * fix a bug with unwanted capture config error in fix string substitution
- * add feature of regex captures
-
-Changes with nginx_substitutions_filter 0.4                                       2009-12-23
-
- * fix many bugs
-
-Changes with nginx_substitutions_filter 0.3                                       2009-02-04
-
- * Initial public release
-
-== Reporting a bug ==
-
-Questions/patches may be directed to Weibin Yao, yaoweibin@gmail.com.
-
diff --git a/debian/modules/http-subs-filter/doc/README.html b/debian/modules/http-subs-filter/doc/README.html
deleted file mode 100644
index 28c6810..0000000
--- a/debian/modules/http-subs-filter/doc/README.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>nginx_substitutions_filter</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
-</head>
-
-<body style="background-color: white">
-
-<p><a name="__index__"></a></p>
-<!-- INDEX BEGIN -->
-
-<ul>
-
-	<li><a href="#nginx_substitutions_filter">nginx_substitutions_filter</a></li>
-	<ul>
-
-		<li><a href="#description">Description</a></li>
-		<li><a href="#example">Example</a></li>
-		<li><a href="#directives">Directives</a></li>
-		<ul>
-
-			<li><a href="#subs_filter_types">subs_filter_types</a></li>
-			<li><a href="#subs_filter">subs_filter</a></li>
-			<li><a href="#subs_filter_bypass">subs_filter_bypass</a></li>
-		</ul>
-
-		<li><a href="#installation">Installation</a></li>
-		<li><a href="#known_issue">Known issue</a></li>
-		<li><a href="#changes">CHANGES</a></li>
-		<li><a href="#reporting_a_bug">Reporting a bug</a></li>
-	</ul>
-
-</ul>
-<!-- INDEX END -->
-
-<hr />
-<p>
-</p>
-<h1><a name="nginx_substitutions_filter">nginx_substitutions_filter</a></h1>
-<p><em>Note: this module is not distributed with the Nginx source. Installation instructions can be found <a href="#installation">below</a>. </em>&gt;</p>
-<p>
-</p>
-<h2><a name="description">Description</a></h2>
-<p><strong>nginx_substitutions_filter</strong> is a filter module which can do both regular expression and fixed string substitutions on response bodies. This module is quite different from the Nginx's native Substitution Module. It scans the output chains buffer and matches string line by line, just like Apache's mod_substitute (<a href="http://httpd.apache.org/docs/trunk/mod/mod_substitute.html">http://httpd.apache.org/docs/trunk/mod/mod_substitute.html</a>).</p>
-<p>
-</p>
-<h2><a name="example">Example</a></h2>
-<p>location / {</p>
-<pre>
-    subs_filter_types text/html text/css text/xml;
-    subs_filter st(\d*).example.com $1.example.com ir;
-    subs_filter a.example.com s.example.com;</pre>
-<p>}</p>
-<p>
-</p>
-<h2><a name="directives">Directives</a></h2>
-<ul>
-<li>
-<p><a href="#subs_filter_types">subs_filter_types</a></p>
-</li>
-<li>
-<p><a href="#subs_filter">subs_filter</a></p>
-</li>
-</ul>
-<p>
-</p>
-<h3><a name="subs_filter_types">subs_filter_types</a></h3>
-<p><strong>syntax:</strong> <em>subs_filter_types mime-type [mime-types] </em></p>
-<p><strong>default:</strong> <em>subs_filter_types text/html</em></p>
-<p><strong>context:</strong> <em>http, server, location</em></p>
-<p><em>subs_filter_types</em> is used to specify which content types should be checked for <em>subs_filter</em>. The default is only <em>text/html</em>.</p>
-<p>This module just works with plain text. If the response is compressed, it can't uncompress the response and will ignore this response. This module can be compatible with gzip filter module. But it will not work with proxy compressed response. You can disable the compressed response like this:</p>
-<p>proxy_set_header Accept-Encoding ``'';</p>
-<p>
-</p>
-<h3><a name="subs_filter">subs_filter</a></h3>
-<p><strong>syntax:</strong> <em>subs_filter source_str destination_str [gior] </em></p>
-<p><strong>default:</strong> <em>none</em></p>
-<p><strong>context:</strong> <em>http, server, location</em></p>
-<p><em>subs_filter</em> allows replacing source string(regular expression or fixed) in the nginx response with destination string. Substitution text may contain variables. More than one substitution rules per location is supported. The meaning of the third flags are:</p>
-<ul>
-<li>
-<p><em>g</em>(default): Replace all the match strings.</p>
-</li>
-<li>
-<p><em>i</em>: Perform a case-insensitive match.</p>
-</li>
-<li>
-<p><em>o</em>: Just replace the first one.</p>
-</li>
-<li>
-<p><em>r</em>: The pattern is treated as a regular expression, default is fixed string.</p>
-</li>
-</ul>
-<p>
-</p>
-<h3><a name="subs_filter_bypass">subs_filter_bypass</a></h3>
-<p><strong>syntax:</strong> <em>subs_filter_bypass $variable1 ...</em></p>
-<p><strong>default:</strong> <em>none</em></p>
-<p><strong>context:</strong> <em>http, server, location</em></p>
-<p>You can sepcify several variables with this directive. If at least one of the variable is not empty and is not equal to '0', this substitution filter will be disabled.</p>
-<p>
-</p>
-<h2><a name="installation">Installation</a></h2>
-<p>To install, get the source with subversion:</p>
-<p>git clone <a href="git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git">git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git</a></p>
-<p>and then compile nginx with the following option:</p>
-<p>./configure --add-module=/path/to/module</p>
-<p>
-</p>
-<h2><a name="known_issue">Known issue</a></h2>
-<ul>
-<li>
-<p>Can't substitute the response header.</p>
-</li>
-</ul>
-<p>
-</p>
-<h2><a name="changes">CHANGES</a></h2>
-<p>Changes with nginx_substitutions_filter 0.6.4                                     2014-02-15</p>
-<ul>
-<li>
-<p>Now non-200 response will work</p>
-</li>
-<li>
-<p>added the subs_filter_bypass directive</p>
-</li>
-</ul>
-<p>Changes with nginx_substitutions_filter 0.6.2                                     2012-08-26</p>
-<ul>
-<li>
-<p>fixed a bug of buffer overlap</p>
-</li>
-<li>
-<p>fixed a bug with last zero buffer</p>
-</li>
-</ul>
-<p>Changes with nginx_substitutions_filter 0.6.0                                     2012-06-30</p>
-<ul>
-<li>
-<p>refactor this module</p>
-</li>
-</ul>
-<p>Changes with nginx_substitutions_filter 0.5.2                                     2010-08-11</p>
-<ul>
-<li>
-<p>do many optimizing for this module</p>
-</li>
-<li>
-<p>fix a bug of buffer overlap</p>
-</li>
-<li>
-<p>fix a segment fault bug when output chain return NGX_AGAIN.</p>
-</li>
-<li>
-<p>fix a bug about last buffer with no linefeed. This may cause segment fault. Thanks for Josef Fröhle</p>
-</li>
-</ul>
-<p>Changes with nginx_substitutions_filter 0.5                                       2010-04-15</p>
-<ul>
-<li>
-<p>refactor the source structure, create branches of dev</p>
-</li>
-<li>
-<p>fix a bug of small chunk of buffers causing lose content</p>
-</li>
-<li>
-<p>fix the bug of last_buf and the nginx's compatibility above 0.8.25</p>
-</li>
-<li>
-<p>fix a bug with unwanted capture config error in fix string substitution</p>
-</li>
-<li>
-<p>add feature of regex captures</p>
-</li>
-</ul>
-<p>Changes with nginx_substitutions_filter 0.4                                       2009-12-23</p>
-<ul>
-<li>
-<p>fix many bugs</p>
-</li>
-</ul>
-<p>Changes with nginx_substitutions_filter 0.3                                       2009-02-04</p>
-<ul>
-<li>
-<p>Initial public release</p>
-</li>
-</ul>
-<p>
-</p>
-<h2><a name="reporting_a_bug">Reporting a bug</a></h2>
-<p>Questions/patches may be directed to Weibin Yao, <a href="mailto:yaoweibin@gmail.com.">yaoweibin@gmail.com.</a></p>
-
-</body>
-
-</html>
diff --git a/debian/modules/http-subs-filter/doc/README.wiki b/debian/modules/http-subs-filter/doc/README.wiki
deleted file mode 100644
index b707f45..0000000
--- a/debian/modules/http-subs-filter/doc/README.wiki
+++ /dev/null
@@ -1,123 +0,0 @@
-= nginx_substitutions_filter =
-
-''Note: this module is not distributed with the Nginx source. Installation instructions can be found [[#Installation|below]].''
-
-== Description ==
-
-'''nginx_substitutions_filter''' is a filter module which can do both regular expression and fixed string substitutions on response bodies. This module is quite different from the Nginx's native Substitution Module. It scans the output chains buffer and matches string line by line, just like Apache's [http://httpd.apache.org/docs/trunk/mod/mod_substitute.html mod_substitute].
-
-== Example ==
-
-<geshi lang="nginx">
-location / {
-
-    subs_filter_types text/html text/css text/xml;
-    subs_filter st(\d*).example.com $1.example.com ir;
-    subs_filter a.example.com s.example.com;
-
-}
-</geshi>
-
-== Directives ==
-
-* [[#subs_filter_types|subs_filter_types]]
-* [[#subs_filter|subs_filter]]
-
-=== subs_filter_types ===
-
-'''syntax:''' ''subs_filter_types mime-type [mime-types] ''
-
-'''default:''' ''subs_filter_types text/html''
-
-'''context:''' ''http, server, location''
-
-''subs_filter_types'' is used to specify which content types should be checked for ''subs_filter''. The default is only ''text/html''.
-
-This module just works with plain text. If the response is compressed, it can't uncompress the response and will ignore this response. This module can be compatible with gzip filter module. But it will not work with proxy compressed response. You can disable the compressed response like this:
-
-proxy_set_header Accept-Encoding "";
-
-=== subs_filter ===
-
-'''syntax:''' ''subs_filter source_str destination_str [gior] ''
-
-'''default:''' ''none''
-
-'''context:''' ''http, server, location''
-
-''subs_filter'' allows replacing source string(regular expression or fixed) in the nginx response with destination string. Substitution text may contain variables. More than one substitution rules per location is supported. The meaning of the third flags are:
-* ''g''(default): Replace all the match strings.
-* ''i'': Perform a case-insensitive match.
-* ''o'': Just replace the first one.
-* ''r'': The pattern is treated as a regular expression, default is fixed string.
-
-=== subs_filter_bypass ===
-
-'''syntax:''' ''subs_filter_bypass $variable1 ...''
-
-'''default:''' ''none''
-
-'''context:''' ''http, server, location''
-
-You can sepcify several variables with this directive. If at least one of the variable is not empty and is not equal to '0', this substitution filter will be disabled.
-
-== Installation ==
-
-To install, get the source with subversion:
-
-<code>
-git clone git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git
-</code>
-
-and then compile nginx with the following option:
-
-<code>
-./configure --add-module=/path/to/module
-</code>
-
-== Known issue ==
-* Can't substitute the response header.
-
-== CHANGES ==
-
-Changes with nginx_substitutions_filter 0.6.4                                     2014-02-15
-
-* Now non-200 response will work
-* added the subs_filter_bypass directive
-
-Changes with nginx_substitutions_filter 0.6.2                                     2012-08-26
-
-* fixed a bug of buffer overlap
-* fixed a bug with last zero buffer
-
-Changes with nginx_substitutions_filter 0.6.0                                     2012-06-30
-
-* refactor this module
-
-Changes with nginx_substitutions_filter 0.5.2                                     2010-08-11
-
-* do many optimizing for this module
-* fix a bug of buffer overlap
-* fix a segment fault bug when output chain return NGX_AGAIN.
-* fix a bug about last buffer with no linefeed. This may cause segment fault. Thanks for Josef Fröhle
-
-Changes with nginx_substitutions_filter 0.5                                       2010-04-15
-
-* refactor the source structure, create branches of dev
-* fix a bug of small chunk of buffers causing lose content
-* fix the bug of last_buf and the nginx's compatibility above 0.8.25
-* fix a bug with unwanted capture config error in fix string substitution
-* add feature of regex captures
-
-Changes with nginx_substitutions_filter 0.4                                       2009-12-23
-
-* fix many bugs
-
-Changes with nginx_substitutions_filter 0.3                                       2009-02-04
-
-* Initial public release
-
-== Reporting a bug ==
-
-Questions/patches may be directed to Weibin Yao, yaoweibin@gmail.com.
-
diff --git a/debian/modules/http-subs-filter/ngx_http_subs_filter_module.c b/debian/modules/http-subs-filter/ngx_http_subs_filter_module.c
deleted file mode 100644
index 483c9c3..0000000
--- a/debian/modules/http-subs-filter/ngx_http_subs_filter_module.c
+++ /dev/null
@@ -1,1298 +0,0 @@
-/*
- * Author: Weibin Yao(yaoweibin@gmail.com)
- *
- * Licence: This module could be distributed under the
- * same terms as Nginx itself.
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-#include <nginx.h>
-
-
-#if (NGX_DEBUG)
-#define SUBS_DEBUG 1
-#else
-#define SUBS_DEBUG 0
-#endif
-
-
-#ifndef NGX_HTTP_MAX_CAPTURES
-#define NGX_HTTP_MAX_CAPTURES 9
-#endif
-
-
-#define ngx_buffer_init(b) b->pos = b->last = b->start;
-
-
-typedef struct {
-    ngx_flag_t     once;
-    ngx_flag_t     regex;
-    ngx_flag_t     insensitive;
-
-    /* If it has captured variables? */
-    ngx_flag_t     has_captured;
-
-    ngx_str_t      match;
-#if (NGX_PCRE)
-    ngx_regex_t   *match_regex;
-    int           *captures;
-    ngx_int_t      ncaptures;
-#endif
-
-    ngx_str_t      sub;
-    ngx_array_t   *sub_lengths;
-    ngx_array_t   *sub_values;
-
-    unsigned       matched;
-} sub_pair_t;
-
-
-typedef struct {
-    ngx_hash_t     types;
-    ngx_array_t   *sub_pairs;   /* array of sub_pair_t     */
-    ngx_array_t   *types_keys;  /* array of ngx_hash_key_t */
-    ngx_array_t   *bypass;      /* array of ngx_http_complex_value_t */
-    size_t         line_buffer_size;
-    ngx_bufs_t     bufs;
-} ngx_http_subs_loc_conf_t;
-
-
-typedef struct {
-    ngx_array_t   *sub_pairs;  /* array of sub_pair_t */
-
-    ngx_chain_t   *in;
-
-    /* the line input buffer before substitution */
-    ngx_buf_t     *line_in;
-    /* the line destination buffer after substitution */
-    ngx_buf_t     *line_dst;
-
-    /* the last output buffer */
-    ngx_buf_t     *out_buf;
-    /* point to the last output chain's next chain */
-    ngx_chain_t  **last_out;
-    ngx_chain_t   *out;
-
-    ngx_chain_t   *busy;
-
-    /* the freed chain buffers. */
-    ngx_chain_t   *free;
-
-    ngx_int_t      bufs;
-
-    unsigned       last;
-
-} ngx_http_subs_ctx_t;
-
-
-static ngx_int_t ngx_http_subs_header_filter(ngx_http_request_t *r);
-static ngx_int_t ngx_http_subs_init_context(ngx_http_request_t *r);
-
-static ngx_int_t ngx_http_subs_body_filter(ngx_http_request_t *r,
-    ngx_chain_t *in);
-static ngx_int_t ngx_http_subs_body_filter_init_context(ngx_http_request_t *r,
-    ngx_chain_t *in);
-static ngx_int_t ngx_http_subs_body_filter_process_buffer(ngx_http_request_t *r,
-    ngx_buf_t *b);
-static ngx_int_t  ngx_http_subs_match(ngx_http_request_t *r,
-    ngx_http_subs_ctx_t *ctx);
-#if (NGX_PCRE)
-static ngx_int_t ngx_http_subs_match_regex_substituion(ngx_http_request_t *r,
-    sub_pair_t *pair, ngx_buf_t *b, ngx_buf_t *dst);
-#endif
-static ngx_int_t ngx_http_subs_match_fix_substituion(ngx_http_request_t *r,
-    sub_pair_t *pair, ngx_buf_t *b, ngx_buf_t *dst);
-static ngx_buf_t * buffer_append_string(ngx_buf_t *b, u_char *s, size_t len,
-    ngx_pool_t *pool);
-static ngx_int_t  ngx_http_subs_out_chain_append(ngx_http_request_t *r,
-    ngx_http_subs_ctx_t *ctx, ngx_buf_t *b);
-static ngx_int_t  ngx_http_subs_get_chain_buf(ngx_http_request_t *r,
-    ngx_http_subs_ctx_t *ctx);
-static ngx_int_t ngx_http_subs_output(ngx_http_request_t *r,
-    ngx_http_subs_ctx_t *ctx, ngx_chain_t *in);
-
-static char * ngx_http_subs_filter(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static ngx_int_t ngx_http_subs_filter_regex_compile(sub_pair_t *pair,
-    ngx_http_script_compile_t *sc, ngx_conf_t *cf);
-
-
-static void *ngx_http_subs_create_conf(ngx_conf_t *cf);
-static char *ngx_http_subs_merge_conf(ngx_conf_t *cf, void *parent,
-    void *child);
-
-static ngx_int_t ngx_http_subs_filter_init(ngx_conf_t *cf);
-
-#if (NGX_PCRE)
-static ngx_int_t ngx_http_subs_regex_capture_count(ngx_regex_t *re);
-#endif
-
-
-static ngx_command_t  ngx_http_subs_filter_commands[] = {
-
-    { ngx_string("subs_filter"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE,
-      ngx_http_subs_filter,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      0,
-      NULL },
-
-    { ngx_string("subs_filter_bypass"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_http_set_predicate_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_subs_loc_conf_t, bypass),
-      NULL },
-
-    { ngx_string("subs_filter_types"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-      ngx_http_types_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_subs_loc_conf_t, types_keys),
-      &ngx_http_html_default_types[0] },
-
-    { ngx_string("subs_line_buffer_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_subs_loc_conf_t, line_buffer_size),
-      NULL },
-
-    { ngx_string("subs_buffers"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
-      ngx_conf_set_bufs_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_subs_loc_conf_t, bufs),
-      NULL },
-
-    ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_http_subs_filter_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    ngx_http_subs_filter_init,             /* postconfiguration */
-
-    NULL,                                  /* create main configuration */
-    NULL,                                  /* init main configuration */
-
-    NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
-
-    ngx_http_subs_create_conf,             /* create location configuration */
-    ngx_http_subs_merge_conf               /* merge location configuration */
-};
-
-
-ngx_module_t  ngx_http_subs_filter_module = {
-    NGX_MODULE_V1,
-    &ngx_http_subs_filter_module_ctx,      /* module context */
-    ngx_http_subs_filter_commands,         /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    NULL,                                  /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
-static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
-
-extern volatile ngx_cycle_t  *ngx_cycle;
-
-
-static ngx_int_t
-ngx_http_subs_header_filter(ngx_http_request_t *r)
-{
-    ngx_http_subs_loc_conf_t  *slcf;
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_http_subs_filter_module);
-
-    if (slcf->sub_pairs->nelts == 0
-        || r->header_only
-        || r->headers_out.content_type.len == 0
-        || r->headers_out.content_length_n == 0)
-    {
-        return ngx_http_next_header_filter(r);
-    }
-
-    if (ngx_http_test_content_type(r, &slcf->types) == NULL) {
-        return ngx_http_next_header_filter(r);
-    }
-
-    switch (ngx_http_test_predicates(r, slcf->bypass)) {
-
-    case NGX_ERROR:
-        /*pass through*/
-
-    case NGX_DECLINED:
-
-        return ngx_http_next_header_filter(r);
-
-    default: /* NGX_OK */
-        break;
-    }
-
-    /* Don't do substitution with the compressed content */
-    if (r->headers_out.content_encoding
-        && r->headers_out.content_encoding->value.len) {
-
-        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                      "http subs filter header ignored, this may be a "
-                      "compressed response.");
-
-        return ngx_http_next_header_filter(r);
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http subs filter header \"%V\"", &r->uri);
-
-    if (ngx_http_subs_init_context(r) == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-    r->filter_need_in_memory = 1;
-
-    if (r == r->main) {
-        ngx_http_clear_content_length(r);
-        ngx_http_clear_last_modified(r);
-    }
-
-    return ngx_http_next_header_filter(r);
-}
-
-
-static ngx_int_t
-ngx_http_subs_init_context(ngx_http_request_t *r)
-{
-    ngx_uint_t                 i;
-    sub_pair_t                *src_pair, *dst_pair;
-    ngx_http_subs_ctx_t       *ctx;
-    ngx_http_subs_loc_conf_t  *slcf;
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_http_subs_filter_module);
-
-    /* Everything in ctx is NULL or 0. */
-    ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_subs_ctx_t));
-    if (ctx == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_http_set_ctx(r, ctx, ngx_http_subs_filter_module);
-
-    ctx->sub_pairs = ngx_array_create(r->pool, slcf->sub_pairs->nelts,
-                                      sizeof(sub_pair_t));
-    if (slcf->sub_pairs == NULL) {
-        return NGX_ERROR;
-    }
-
-    /* Deep copy sub_pairs from slcf to ctx, matched and captures need it */
-    src_pair = (sub_pair_t *) slcf->sub_pairs->elts;
-
-    for (i = 0; i < slcf->sub_pairs->nelts; i++) {
-
-        dst_pair = ngx_array_push(ctx->sub_pairs);
-        if (dst_pair == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_memcpy(dst_pair, src_pair + i, sizeof(sub_pair_t));
-    }
-
-    if (ctx->line_in == NULL) {
-
-        ctx->line_in = ngx_create_temp_buf(r->pool, slcf->line_buffer_size);
-        if (ctx->line_in == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    if (ctx->line_dst == NULL) {
-
-        ctx->line_dst = ngx_create_temp_buf(r->pool, slcf->line_buffer_size);
-        if (ctx->line_dst == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_subs_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
-{
-    ngx_int_t    	           rc;
-    ngx_log_t                 *log;
-    ngx_chain_t               *cl, *temp;
-    ngx_http_subs_ctx_t       *ctx;
-    ngx_http_subs_loc_conf_t  *slcf;
-
-    log = r->connection->log;
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_http_subs_filter_module);
-    if (slcf == NULL) {
-        return ngx_http_next_body_filter(r, in);
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_subs_filter_module);
-    if (ctx == NULL) {
-        return ngx_http_next_body_filter(r, in);
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                   "http subs filter \"%V\"", &r->uri);
-
-    if (in == NULL && ctx->busy == NULL) {
-        return ngx_http_next_body_filter(r, in);
-    }
-
-    if (ngx_http_subs_body_filter_init_context(r, in) != NGX_OK){
-        goto failed;
-    }
-
-    for (cl = ctx->in; cl; cl = cl->next) {
-
-        if (cl->buf->last_buf || cl->buf->last_in_chain){
-            ctx->last = 1;
-        }
-
-        /* TODO: check the flush flag */
-        rc = ngx_http_subs_body_filter_process_buffer(r, cl->buf);
-
-        if (rc == NGX_DECLINED) {
-            continue;
-        } else if (rc == NGX_ERROR) {
-            goto failed;
-        }
-
-        if (cl->next != NULL) {
-            continue;
-        }
-
-        if (ctx->last) {
-
-            /* copy line_in to ctx->out. */
-            if (ngx_buf_size(ctx->line_in) > 0) {
-
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
-                    "[subs_filter] Lost last linefeed, output anyway.");
-
-                if (ngx_http_subs_out_chain_append(r, ctx, ctx->line_in)
-                    != NGX_OK) {
-                    goto failed;
-                }
-            }
-
-            if (ctx->out_buf == NULL) {
-
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
-                               "[subs_filter] The last buffer is zero size.");
-
-                /*
-                 * This is a zero buffer, it should not be set the temporary
-                 * or memory flag
-                 * */
-                ctx->out_buf = ngx_calloc_buf(r->pool);
-                if (ctx->out_buf == NULL) {
-                    goto failed;
-                }
-
-                ctx->out_buf->sync = 1;
-
-                temp = ngx_alloc_chain_link(r->pool);
-                if (temp == NULL) {
-                    goto failed;
-                }
-
-                temp->buf = ctx->out_buf;
-                temp->next = NULL;
-
-                *ctx->last_out = temp;
-                ctx->last_out = &temp->next;
-            }
-
-            ctx->out_buf->last_buf = (r == r->main) ? 1 : 0;
-            ctx->out_buf->last_in_chain = cl->buf->last_in_chain;
-
-            break;
-        }
-    }
-
-    /* It doesn't output anything, return */
-    if ((ctx->out == NULL) && (ctx->busy == NULL)) {
-        return NGX_OK;
-    }
-
-    return ngx_http_subs_output(r, ctx, in);
-
-failed:
-
-    ngx_log_error(NGX_LOG_ERR, log, 0,
-                  "[subs_filter] ngx_http_subs_body_filter error.");
-
-    return NGX_ERROR;
-}
-
-
-static ngx_int_t
-ngx_http_subs_body_filter_init_context(ngx_http_request_t *r, ngx_chain_t *in)
-{
-    ngx_http_subs_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_subs_filter_module);
-
-    r->connection->buffered |= NGX_HTTP_SUB_BUFFERED;
-
-    ctx->in = NULL;
-
-    if (in) {
-        if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-#if SUBS_DEBUG
-    if (ngx_buf_size(ctx->line_in) > 0) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "subs line in buffer: %p, size:%uz",
-                       ctx->line_in, ngx_buf_size(ctx->line_in));
-    }
-#endif
-
-#if SUBS_DEBUG
-    ngx_chain_t               *cl;
-
-    for (cl = ctx->in; cl; cl = cl->next) {
-        if (cl->buf) {
-            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "subs in buffer:%p, size:%uz, "
-                           "flush:%d, last_buf:%d",
-                           cl->buf, ngx_buf_size(cl->buf),
-                           cl->buf->flush, cl->buf->last_buf);
-        }
-    }
-#endif
-
-    ctx->last_out = &ctx->out;
-    ctx->out_buf  = NULL;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_subs_body_filter_process_buffer(ngx_http_request_t *r, ngx_buf_t *b)
-{
-    u_char               *p, *last, *linefeed;
-    ngx_int_t             len, rc;
-    ngx_http_subs_ctx_t  *ctx;
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_subs_filter_module);
-
-    if (b == NULL) {
-        return NGX_DECLINED;
-    }
-
-    p = b->pos;
-    last = b->last;
-    b->pos = b->last;
-
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "subs process in buffer: %p %uz, line_in buffer: %p %uz",
-                   b, last - p,
-                   ctx->line_in, ngx_buf_size(ctx->line_in));
-
-    if ((last - p) == 0 && ngx_buf_size(ctx->line_in) == 0){
-        return NGX_OK;
-    }
-
-    if ((last - p) == 0 && ngx_buf_size(ctx->line_in) && ctx->last) {
-
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "the last zero buffer, try to do substitution");
-
-        rc = ngx_http_subs_match(r, ctx);
-        if (rc < 0) {
-            return NGX_ERROR;
-        }
-
-        return NGX_OK;
-    }
-
-    while (p < last) {
-
-        linefeed = memchr(p, LF, last - p);
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "find linefeed: %p",
-                       linefeed);
-
-        if (linefeed == NULL) {
-
-            if (ctx->last) {
-                linefeed = last - 1;
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "the last buffer, not find linefeed");
-            }
-        }
-
-        if (linefeed) {
-
-            len = linefeed - p + 1;
-
-            if (buffer_append_string(ctx->line_in, p, len, r->pool) == NULL) {
-                return NGX_ERROR;
-            }
-
-            p += len;
-
-            rc = ngx_http_subs_match(r, ctx);
-            if (rc < 0) {
-                return NGX_ERROR;
-            }
-
-        } else {
-
-            /* Not find linefeed in this chain, save the left data to line_in */
-            if (buffer_append_string(ctx->line_in, p, last - p, r->pool)
-                == NULL) {
-                return NGX_ERROR;
-            }
-
-            break;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-/*
- * Do the substitutions from ctx->line_in
- * and output the chain buffers to ctx->out
- * */
-static ngx_int_t
-ngx_http_subs_match(ngx_http_request_t *r, ngx_http_subs_ctx_t *ctx)
-{
-    ngx_buf_t   *src, *dst, *temp;
-    ngx_log_t   *log;
-    ngx_int_t    count, match_count;
-    sub_pair_t  *pairs, *pair;
-    ngx_uint_t   i;
-
-    count = 0;
-    match_count = 0;
-
-    log = r->connection->log;
-
-    src = ctx->line_in;
-    dst = ctx->line_dst;
-
-    pairs = (sub_pair_t *) ctx->sub_pairs->elts;
-    for (i = 0; i < ctx->sub_pairs->nelts; i++) {
-
-        pair = &pairs[i];
-
-        if (!pair->has_captured) {
-            if (pair->sub.data == NULL) {
-                if (ngx_http_script_run(r, &pair->sub, pair->sub_lengths->elts,
-                                        0, pair->sub_values->elts) == NULL)
-                {
-                    goto failed;
-                }
-            }
-
-        } else {
-            pair->sub.data = NULL;
-            pair->sub.len = 0;
-        }
-
-        /* exchange the src and dst buffer */
-        if (dst->pos != dst->last) {
-
-            temp = src;
-            src = dst;
-            dst = temp;
-
-            ngx_buffer_init(dst);
-        }
-
-        if ((!pair->regex)
-             && ((ngx_uint_t)(src->last - src->pos) < pair->match.len)) {
-            continue;
-        }
-
-        if (pair->once && pair->matched) {
-            continue;
-        }
-
-        if (pair->sub.data == NULL && !pair->has_captured) {
-
-            if (ngx_http_script_run(r, &pair->sub, pair->sub_lengths->elts, 0,
-                                    pair->sub_values->elts) == NULL)
-            {
-                goto failed;
-            }
-        }
-
-        /* regex substitution */
-        if (pair->regex || pair->insensitive) {
-#if (NGX_PCRE)
-            count = ngx_http_subs_match_regex_substituion(r, pair, src, dst);
-            if (count == NGX_ERROR) {
-                goto failed;
-            }
-#endif
-        } else {
-            /* fixed string substituion */
-            count = ngx_http_subs_match_fix_substituion(r, pair, src, dst);
-            if (count == NGX_ERROR) {
-                goto failed;
-            }
-        }
-
-        /* no match. */
-        if (count == 0){
-            continue;
-        }
-
-        if (src->pos < src->last) {
-
-            if (buffer_append_string(dst, src->pos, src->last - src->pos,
-                                     r->pool) == NULL) {
-                goto failed;
-            }
-
-            src->pos = src->last;
-        }
-
-        /* match */
-        match_count += count;
-    }
-
-    /* no match last time */
-    if (dst->pos == dst->last){
-        dst = src;
-    }
-
-    if (ngx_http_subs_out_chain_append(r, ctx, dst) != NGX_OK) {
-        goto failed;
-    }
-
-    ngx_buffer_init(ctx->line_in);
-    ngx_buffer_init(ctx->line_dst);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "match counts: %i", match_count);
-
-    return match_count;
-
-failed:
-
-    ngx_log_error(NGX_LOG_ERR, log, 0,
-                  "[subs_filter] ngx_http_subs_match error.");
-
-    return -1;
-}
-
-
-#if (NGX_PCRE)
-static ngx_int_t
-ngx_http_subs_match_regex_substituion(ngx_http_request_t *r, sub_pair_t *pair,
-                                      ngx_buf_t *b, ngx_buf_t *dst)
-{
-    ngx_str_t  line;
-    ngx_log_t *log;
-    ngx_int_t  rc, count = 0;
-
-    log = r->connection->log;
-
-    if (pair->captures == NULL || pair->ncaptures == 0) {
-        pair->ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3;
-        pair->captures = ngx_palloc(r->pool, pair->ncaptures * sizeof(int));
-        if (pair->captures == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    while (b->pos < b->last) {
-
-        if (pair->once && pair->matched) {
-            break;
-        }
-
-        line.data = b->pos;
-        line.len = b->last - b->pos;
-
-        rc = ngx_regex_exec(pair->match_regex, &line,
-                            (int *) pair->captures, pair->ncaptures);
-
-        if (rc == NGX_REGEX_NO_MATCHED) {
-            break;
-
-        } else if(rc < 0) {
-            ngx_log_error(NGX_LOG_ERR, log, 0,
-                          ngx_regex_exec_n " failed: %i on \"%V\" using \"%V\"",
-                          rc, &line, &pair->match);
-
-            return NGX_ERROR;
-        }
-
-        pair->matched++;
-        count++;
-
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, log, 0,
-                       "regex match:%i, start:%d, end:%d ",
-                       rc, pair->captures[0], pair->captures[1]);
-
-        if (pair->has_captured) {
-            r->captures = pair->captures;
-            r->ncaptures = pair->ncaptures;
-            r->captures_data = line.data;
-
-            if (ngx_http_script_run(r, &pair->sub, pair->sub_lengths->elts, 0,
-                                    pair->sub_values->elts) == NULL)
-            {
-                ngx_log_error(NGX_LOG_ALERT, log, 0,
-                              "[subs_filter] ngx_http_script_run error.");
-                return NGX_ERROR;
-            }
-        }
-
-        if (buffer_append_string(dst, b->pos, pair->captures[0],
-                                 r->pool) == NULL) {
-            return NGX_ERROR;
-        }
-
-        if (buffer_append_string(dst, pair->sub.data, pair->sub.len,
-                                 r->pool) == NULL) {
-            return NGX_ERROR;
-        }
-
-        b->pos =  b->pos + pair->captures[1];
-    }
-
-    return count;
-}
-#endif
-
-
-/*
- * Thanks to Laurent Ghigonis
- * Taken from FreeBSD
- * Find the first occurrence of the byte string s in byte string l.
- */
-static void *
-subs_memmem(const void *l, size_t l_len, const void *s, size_t s_len)
-{
-    register char *cur, *last;
-    const char *cl = (const char *)l;
-    const char *cs = (const char *)s;
-
-    /* we need something to compare */
-    if (l_len == 0 || s_len == 0) {
-        return NULL;
-    }
-
-    /* "s" must be smaller or equal to "l" */
-    if (l_len < s_len) {
-        return NULL;
-    }
-
-    /* special case where s_len == 1 */
-    if (s_len == 1) {
-        return memchr(l, (int)*cs, l_len);
-    }
-
-    /* the last position where its possible to find "s" in "l" */
-    last = (char *)cl + l_len - s_len;
-
-    for (cur = (char *)cl; cur <= last; cur++) {
-        if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0) {
-            return cur;
-        }
-    }
-
-    return NULL;
-}
-
-
-static ngx_int_t
-ngx_http_subs_match_fix_substituion(ngx_http_request_t *r,
-    sub_pair_t *pair, ngx_buf_t *b, ngx_buf_t *dst)
-{
-    u_char      *sub_start;
-    ngx_int_t    count = 0;
-
-    while(b->pos < b->last) {
-        if (pair->once && pair->matched) {
-            break;
-        }
-
-        sub_start = subs_memmem(b->pos, b->last - b->pos,
-                                pair->match.data, pair->match.len);
-        if (sub_start == NULL) {
-            break;
-        }
-
-        pair->matched++;
-        count++;
-
-        if (buffer_append_string(dst, b->pos, sub_start - b->pos,
-                                 r->pool) == NULL) {
-            return NGX_ERROR;
-        }
-
-        if (buffer_append_string(dst, pair->sub.data, pair->sub.len,
-                                 r->pool) == NULL) {
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "fixed string match: %p", sub_start);
-
-        b->pos = sub_start + pair->match.len;
-
-        if ((ngx_uint_t)(b->last - b->pos) < pair->match.len)
-            break;
-    }
-
-    return count;
-}
-
-
-static ngx_buf_t *
-buffer_append_string(ngx_buf_t *b, u_char *s, size_t len, ngx_pool_t *pool)
-{
-    u_char     *p;
-    ngx_uint_t capacity, size;
-
-    if (len > (size_t) (b->end - b->last)) {
-
-        size = b->last - b->pos;
-
-        capacity = b->end - b->start;
-        capacity <<= 1;
-
-        if (capacity < (size + len)) {
-            capacity = size + len;
-        }
-
-        p = ngx_palloc(pool, capacity);
-        if (p == NULL) {
-            return NULL;
-        }
-
-        b->last = ngx_copy(p, b->pos, size);
-
-        b->start = b->pos = p;
-        b->end = p + capacity;
-    }
-
-    b->last = ngx_copy(b->last, s, len);
-
-    return b;
-}
-
-
-static ngx_int_t
-ngx_http_subs_out_chain_append(ngx_http_request_t *r,
-    ngx_http_subs_ctx_t *ctx, ngx_buf_t *b)
-{
-    size_t       len, capcity;
-
-    if (b == NULL || ngx_buf_size(b) == 0) {
-        return NGX_OK;
-    }
-
-    if (ctx->out_buf == NULL) {
-       if (ngx_http_subs_get_chain_buf(r, ctx) != NGX_OK) {
-           return NGX_ERROR;
-       }
-    }
-
-    while (1) {
-
-        len = (size_t) ngx_buf_size(b);
-        if (len == 0) {
-            break;
-        }
-
-        capcity = ctx->out_buf->end - ctx->out_buf->last;
-
-        if (len <= capcity) {
-            ctx->out_buf->last = ngx_copy(ctx->out_buf->last, b->pos, len);
-            b->pos += len;
-            break;
-
-        } else {
-            ctx->out_buf->last = ngx_copy(ctx->out_buf->last,
-                                          b->pos, capcity);
-        }
-
-        b->pos += capcity;
-
-        /* get more buffers */
-        if (ngx_http_subs_get_chain_buf(r, ctx) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_subs_get_chain_buf(ngx_http_request_t *r,
-    ngx_http_subs_ctx_t *ctx)
-{
-    ngx_chain_t               *temp;
-    ngx_http_subs_loc_conf_t  *slcf;
-
-    slcf = ngx_http_get_module_loc_conf(r, ngx_http_subs_filter_module);
-
-    if (ctx->free) {
-        temp = ctx->free;
-        ctx->free = ctx->free->next;
-
-    } else {
-        temp = ngx_alloc_chain_link(r->pool);
-        if (temp == NULL) {
-            return NGX_ERROR;
-        }
-
-        temp->buf = ngx_create_temp_buf(r->pool, slcf->bufs.size);
-        if (temp->buf == NULL) {
-            return NGX_ERROR;
-        }
-
-        temp->buf->tag = (ngx_buf_tag_t) &ngx_http_subs_filter_module;
-        temp->buf->recycled = 1;
-
-        /* TODO: limit the buffer number */
-        ctx->bufs++;
-    }
-
-    temp->next = NULL;
-
-    ctx->out_buf = temp->buf;
-    *ctx->last_out = temp;
-    ctx->last_out = &temp->next;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_subs_output(ngx_http_request_t *r, ngx_http_subs_ctx_t *ctx,
-                     ngx_chain_t *in)
-{
-    ngx_int_t     rc;
-
-#if SUBS_DEBUG
-    ngx_buf_t    *b;
-    ngx_chain_t  *cl;
-
-    for (cl = ctx->out; cl; cl = cl->next) {
-
-        b = cl->buf;
-
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "subs out buffer:%p, size:%uz, t:%d, l:%d",
-                       b, ngx_buf_size(b), b->temporary, b->last_buf);
-    }
-#endif
-
-    /* ctx->out may not output all the data */
-    rc = ngx_http_next_body_filter(r, ctx->out);
-    if (rc == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
-#if SUBS_DEBUG
-    for (cl = ctx->out; cl; cl = cl->next) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "subs out end: %p %uz", cl->buf, ngx_buf_size(cl->buf));
-    }
-#endif
-
-#if defined(nginx_version) && (nginx_version >= 1001004)
-    ngx_chain_update_chains(r->pool, &ctx->free, &ctx->busy, &ctx->out,
-                            (ngx_buf_tag_t) &ngx_http_subs_filter_module);
-#else
-    ngx_chain_update_chains(&ctx->free, &ctx->busy, &ctx->out,
-                            (ngx_buf_tag_t) &ngx_http_subs_filter_module);
-#endif
-
-    if (ctx->last) {
-        r->connection->buffered &= ~NGX_HTTP_SUB_BUFFERED;
-    }
-
-    return rc;
-}
-
-
-static char *
-ngx_http_subs_filter( ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_int_t                   n;
-    ngx_uint_t                  i;
-    ngx_str_t                  *value;
-    ngx_str_t                  *option;
-    sub_pair_t                 *pair;
-    ngx_http_subs_loc_conf_t   *slcf = conf;
-    ngx_http_script_compile_t   sc;
-
-    value = cf->args->elts;
-
-    if (slcf->sub_pairs == NULL) {
-        slcf->sub_pairs = ngx_array_create(cf->pool, 4, sizeof(sub_pair_t));
-        if (slcf->sub_pairs == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    pair = ngx_array_push(slcf->sub_pairs);
-    if (pair == NULL) {
-        return NGX_CONF_ERROR;
-    }
-    ngx_memzero(pair, sizeof(sub_pair_t));
-
-    pair->match = value[1];
-
-    n = ngx_http_script_variables_count(&value[2]);
-    if (n != 0) {
-        ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
-
-        sc.cf = cf;
-        sc.source = &value[2];
-        sc.lengths = &pair->sub_lengths;
-        sc.values = &pair->sub_values;
-        sc.variables = n;
-        sc.complete_lengths = 1;
-        sc.complete_values = 1;
-
-        if (ngx_http_script_compile(&sc) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-
-        /* Dirty hack, if it has captured variables */
-        if (sc.captures_mask) {
-            pair->has_captured = 1;
-        }
-
-    } else {
-        pair->sub = value[2];
-    }
-
-    if (cf->args->nelts > 3) {
-        option = &value[3];
-        for(i = 0; i < option->len; i++) {
-
-            switch (option->data[i]){
-            case 'i':
-                pair->insensitive = 1;
-                break;
-
-            case 'o':
-                pair->once = 1;
-                break;
-
-            case 'r':
-                pair->regex = 1;
-                break;
-
-            case 'g':
-            default:
-                continue;
-            }
-        }
-    }
-
-    if (pair->regex || pair->insensitive) {
-        if (ngx_http_subs_filter_regex_compile(pair, &sc, cf) == NGX_ERROR) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_http_subs_filter_regex_compile(sub_pair_t *pair,
-    ngx_http_script_compile_t *sc, ngx_conf_t *cf)
-{
-    /* Caseless match can only be implemented in regex. */
-#if (NGX_PCRE)
-    u_char            errstr[NGX_MAX_CONF_ERRSTR];
-    ngx_int_t         n, options;
-    ngx_str_t         err, *value;
-    ngx_uint_t        mask;
-
-    value = cf->args->elts;
-
-    err.len = NGX_MAX_CONF_ERRSTR;
-    err.data = errstr;
-
-    options = (pair->insensitive ? NGX_REGEX_CASELESS : 0);
-
-    /* make nginx-0.8.25+ happy */
-#if defined(nginx_version) && nginx_version >= 8025
-    ngx_regex_compile_t   rc;
-
-    rc.pattern = pair->match;
-    rc.pool = cf->pool;
-    rc.err = err;
-    rc.options = options;
-
-    if (ngx_regex_compile(&rc) != NGX_OK) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
-        return NGX_ERROR;
-    }
-
-    pair->match_regex = rc.regex;
-
-#else
-    pair->match_regex = ngx_regex_compile(&pair->match, options,
-                                          cf->pool, &err);
-#endif
-
-    if (pair->match_regex == NULL) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &err);
-        return NGX_ERROR;
-    }
-
-    n = ngx_http_subs_regex_capture_count(pair->match_regex);
-
-    if (pair->has_captured) {
-        mask = ((1 << (n + 1)) - 1);
-        if ( mask < sc->captures_mask ) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "You want to capture too many regex substrings, "
-                               "more than %i in \"%V\"",
-                               n, &value[2]);
-
-            return NGX_ERROR;
-        }
-    }
-#else
-    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                       "the using of the regex \"%V\" requires PCRE library",
-                       &pair->match);
-
-    return NGX_ERROR;
-#endif
-
-    return NGX_OK;
-}
-
-
-#if (NGX_PCRE)
-static ngx_int_t
-ngx_http_subs_regex_capture_count(ngx_regex_t *re)
-{
-    int rc, n;
-
-    n = 0;
-
-#if defined(nginx_version) && nginx_version >= 1002002
-    rc = pcre_fullinfo(re->code, NULL, PCRE_INFO_CAPTURECOUNT, &n);
-#elif defined(nginx_version) && nginx_version >= 1001012
-    rc = pcre_fullinfo(re->pcre, NULL, PCRE_INFO_CAPTURECOUNT, &n);
-#else
-    rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
-#endif
-
-    if (rc < 0) {
-        return (ngx_int_t) rc;
-    }
-
-    return (ngx_int_t) n;
-}
-#endif
-
-
-static void *
-ngx_http_subs_create_conf(ngx_conf_t *cf)
-{
-    ngx_http_subs_loc_conf_t  *conf;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_subs_loc_conf_t));
-    if (conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    /*
-     * set by ngx_pcalloc():
-     *
-     *     conf->sub_pairs = NULL;
-     *     conf->types = {NULL, 0};
-     *     conf->types_keys = NULL;
-     *     conf->bufs.num = 0;
-     */
-
-    conf->line_buffer_size = NGX_CONF_UNSET_SIZE;
-    conf->bypass = NGX_CONF_UNSET_PTR;
-
-    return conf;
-}
-
-
-static char *
-ngx_http_subs_merge_conf(ngx_conf_t *cf, void *parent, void *child)
-{
-    ngx_http_subs_loc_conf_t *prev = parent;
-    ngx_http_subs_loc_conf_t *conf = child;
-
-    if (conf->sub_pairs == NULL) {
-        if (prev->sub_pairs == NULL) {
-            conf->sub_pairs = ngx_array_create(cf->pool, 4, sizeof(sub_pair_t));
-            if (conf->sub_pairs == NULL) {
-                return NGX_CONF_ERROR;
-            }
-        } else {
-            conf->sub_pairs = prev->sub_pairs;
-        }
-    }
-
-    ngx_conf_merge_ptr_value(conf->bypass,
-                             prev->bypass, NULL);
-
-    if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
-                             &prev->types_keys, &prev->types,
-                             ngx_http_html_default_types)
-        != NGX_OK)
-    {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_conf_merge_size_value(conf->line_buffer_size,
-                              prev->line_buffer_size, 8 * ngx_pagesize);
-
-    /* Default total buffer size is 128k */
-    ngx_conf_merge_bufs_value(conf->bufs, prev->bufs,
-                              (128 * 1024) / ngx_pagesize, ngx_pagesize);
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_http_subs_filter_init(ngx_conf_t *cf)
-{
-    ngx_http_next_header_filter = ngx_http_top_header_filter;
-    ngx_http_top_header_filter = ngx_http_subs_header_filter;
-
-    ngx_http_next_body_filter = ngx_http_top_body_filter;
-    ngx_http_top_body_filter = ngx_http_subs_body_filter;
-
-    return NGX_OK;
-}
diff --git a/debian/modules/http-subs-filter/test/README b/debian/modules/http-subs-filter/test/README
deleted file mode 100644
index b9ff21b..0000000
--- a/debian/modules/http-subs-filter/test/README
+++ /dev/null
@@ -1,275 +0,0 @@
-NAME
-    Test::Nginx - Testing modules for Nginx C module development
-
-DESCRIPTION
-    This distribution provides two testing modules for Nginx C module
-    development:
-
-    *   Test::Nginx::LWP
-
-    *   Test::Nginx::Socket
-
-    All of them are based on Test::Base.
-
-    Usually, Test::Nginx::Socket is preferred because it works on a much
-    lower level and not that fault tolerant like Test::Nginx::LWP.
-
-    Also, a lot of connection hang issues (like wrong "r->main->count" value
-    in nginx 0.8.x) can only be captured by Test::Nginx::Socket because
-    Perl's LWP::UserAgent client will close the connection itself which will
-    conceal such issues from the testers.
-
-    Test::Nginx automatically starts an nginx instance (from the "PATH" env)
-    rooted at t/servroot/ and the default config template makes this nginx
-    instance listen on the port 1984 by default. One can specify a different
-    port number by setting his port number to the "TEST_NGINX_PORT"
-    environment, as in
-
-        export TEST_NGINX_PORT=1989
-
-  etcproxy integration
-    The default settings in etcproxy
-    (https://github.com/chaoslawful/etcproxy) makes this small TCP proxy
-    split the TCP packets into bytes and introduce 1 ms latency among them.
-
-    There's usually various TCP chains that we can put etcproxy into, for
-    example
-
-   Test::Nginx <=> nginx
-      $ ./etcproxy 1234 1984
-
-    Here we tell etcproxy to listen on port 1234 and to delegate all the TCP
-    traffic to the port 1984, the default port that Test::Nginx makes nginx
-    listen to.
-
-    And then we tell Test::Nginx to test against the port 1234, where
-    etcproxy listens on, rather than the port 1984 that nginx directly
-    listens on:
-
-      $ TEST_NGINX_CLIENT_PORT=1234 prove -r t/
-
-    Then the TCP chain now looks like this:
-
-      Test::Nginx <=> etcproxy (1234) <=> nginx (1984)
-
-    So etcproxy can effectively emulate extreme network conditions and
-    exercise "unusual" code paths in your nginx server by your tests.
-
-    In practice, *tons* of weird bugs can be captured by this setting. Even
-    ourselves didn't expect that this simple approach is so effective.
-
-   nginx <=> memcached
-    We first start the memcached server daemon on port 11211:
-
-       memcached -p 11211 -vv
-
-    and then we another etcproxy instance to listen on port 11984 like this
-
-       $ ./etcproxy 11984 11211
-
-    Then we tell our t/foo.t test script to connect to 11984 rather than
-    11211:
-
-      # foo.t
-      use Test::Nginx::Socket;
-      repeat_each(1);
-      plan tests => 2 * repeat_each() * blocks();
-      $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;  # make this env take a default value
-      run_tests();
-
-      __DATA__
-
-      === TEST 1: sanity
-      --- config
-      location /foo {
-           set $memc_cmd set;
-           set $memc_key foo;
-           set $memc_value bar;
-           memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-      }
-      --- request
-          GET /foo
-      --- response_body_like: STORED
-
-    The Test::Nginx library will automatically expand the special macro
-    $TEST_NGINX_MEMCACHED_PORT to the environment with the same name. You
-    can define your own $TEST_NGINX_BLAH_BLAH_PORT macros as long as its
-    prefix is "TEST_NGINX_" and all in upper case letters.
-
-    And now we can run your test script against the etcproxy port 11984:
-
-       TEST_NGINX_MEMCACHED_PORT=11984 prove t/foo.t
-
-    Then the TCP chains look like this:
-
-       Test::Nginx <=> nginx (1984) <=> etcproxy (11984) <=> memcached (11211)
-
-    If "TEST_NGINX_MEMCACHED_PORT" is not set, then it will take the default
-    value 11211, which is what we want when there's no etcproxy configured:
-
-       Test::Nginx <=> nginx (1984) <=> memcached (11211)
-
-    This approach also works for proxied mysql and postgres traffic. Please
-    see the live test suite of ngx_drizzle and ngx_postgres for more
-    details.
-
-    Usually we set both "TEST_NGINX_CLIENT_PORT" and
-    "TEST_NGINX_MEMCACHED_PORT" (and etc) at the same time, effectively
-    yielding the following chain:
-
-       Test::Nginx <=> etcproxy (1234) <=> nginx (1984) <=> etcproxy (11984) <=> memcached (11211)
-
-    as long as you run two separate etcproxy instances in two separate
-    terminals.
-
-    It's easy to verify if the traffic actually goes through your etcproxy
-    server. Just check if the terminal running etcproxy emits outputs. By
-    default, etcproxy always dump out the incoming and outgoing data to
-    stdout/stderr.
-
-  valgrind integration
-    Test::Nginx has integrated support for valgrind (<http://valgrind.org>)
-    even though by default it does not bother running it with the tests
-    because valgrind will significantly slow down the test sutie.
-
-    First ensure that your valgrind executable visible in your PATH env. And
-    then run your test suite with the "TEST_NGINX_USE_VALGRIND" env set to
-    true:
-
-       TEST_NGINX_USE_VALGRIND=1 prove -r t
-
-    If you see false alarms, you do have a chance to skip them by defining a
-    ./valgrind.suppress file at the root of your module source tree, as in
-
-    <https://github.com/chaoslawful/drizzle-nginx-module/blob/master/valgrin
-    d.suppress>
-
-    This is the suppression file for ngx_drizzle. Test::Nginx will
-    automatically use it to start nginx with valgrind memcheck if this file
-    does exist at the expected location.
-
-    If you do see a lot of "Connection refused" errors while running the
-    tests this way, then you probably have a slow machine (or a very busy
-    one) that the default waiting time is not sufficient for valgrind to
-    start. You can define the sleep time to a larger value by setting the
-    "TEST_NGINX_SLEEP" env:
-
-       TEST_NGINX_SLEEP=1 prove -r t
-
-    The time unit used here is "second". The default sleep setting just fits
-    my ThinkPad ("Core2Duo T9600").
-
-    Applying the no-pool patch to your nginx core is recommended while
-    running nginx with valgrind:
-
-    <https://github.com/shrimp/no-pool-nginx>
-
-    The nginx memory pool can prevent valgrind from spotting lots of invalid
-    memory reads/writes as well as certain double-free errors. We did find a
-    lot more memory issues in many of our modules when we first introduced
-    the no-pool patch in practice ;)
-
-    There's also more advanced features in Test::Nginx that have never
-    documented. I'd like to write more about them in the near future ;)
-
-Nginx C modules that use Test::Nginx to drive their test suites
-    ngx_echo
-        <http://github.com/agentzh/echo-nginx-module>
-
-    ngx_headers_more
-        <http://github.com/agentzh/headers-more-nginx-module>
-
-    ngx_chunkin
-        <http://wiki.nginx.org/NginxHttpChunkinModule>
-
-    ngx_memc
-        <http://wiki.nginx.org/NginxHttpMemcModule>
-
-    ngx_drizzle
-        <http://github.com/chaoslawful/drizzle-nginx-module>
-
-    ngx_rds_json
-        <http://github.com/agentzh/rds-json-nginx-module>
-
-    ngx_xss
-        <http://github.com/agentzh/xss-nginx-module>
-
-    ngx_srcache
-        <http://github.com/agentzh/srcache-nginx-module>
-
-    ngx_lua
-        <http://github.com/chaoslawful/lua-nginx-module>
-
-    ngx_set_misc
-        <http://github.com/agentzh/set-misc-nginx-module>
-
-    ngx_array_var
-        <http://github.com/agentzh/array-var-nginx-module>
-
-    ngx_form_input
-        <http://github.com/calio/form-input-nginx-module>
-
-    ngx_iconv
-        <http://github.com/calio/iconv-nginx-module>
-
-    ngx_set_cconv
-        <http://github.com/liseen/set-cconv-nginx-module>
-
-    ngx_postgres
-        <http://github.com/FRiCKLE/ngx_postgres>
-
-    ngx_coolkit
-        <http://github.com/FRiCKLE/ngx_coolkit>
-
-SOURCE REPOSITORY
-    This module has a Git repository on Github, which has access for all.
-
-        http://github.com/agentzh/test-nginx
-
-    If you want a commit bit, feel free to drop me a line.
-
-AUTHORS
-    agentzh (章亦春) "<agentzh@gmail.com>"
-
-    Antoine BONAVITA "<antoine.bonavita@gmail.com>"
-
-COPYRIGHT & LICENSE
-    Copyright (c) 2009-2011, Taobao Inc., Alibaba Group
-    (<http://www.taobao.com>).
-
-    Copyright (c) 2009-2011, agentzh "<agentzh@gmail.com>".
-
-    Copyright (c) 2011, Antoine Bonavita "<antoine.bonavita@gmail.com>".
-
-    This module is licensed under the terms of the BSD license.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-    *   Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of the Taobao Inc. nor the names of its
-        contributors may be used to endorse or promote products derived from
-        this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-SEE ALSO
-    Test::Nginx::LWP, Test::Nginx::Socket, Test::Base.
-
diff --git a/debian/modules/http-subs-filter/test/inc/Module/AutoInstall.pm b/debian/modules/http-subs-filter/test/inc/Module/AutoInstall.pm
deleted file mode 100644
index 60b90ea..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/AutoInstall.pm
+++ /dev/null
@@ -1,820 +0,0 @@
-#line 1
-package Module::AutoInstall;
-
-use strict;
-use Cwd                 ();
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION};
-BEGIN {
-	$VERSION = '1.03';
-}
-
-# special map on pre-defined feature sets
-my %FeatureMap = (
-    ''      => 'Core Features',    # XXX: deprecated
-    '-core' => 'Core Features',
-);
-
-# various lexical flags
-my ( @Missing, @Existing,  %DisabledTests, $UnderCPAN,     $HasCPANPLUS );
-my (
-    $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
-);
-my ( $PostambleActions, $PostambleUsed );
-
-# See if it's a testing or non-interactive session
-_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN ); 
-_init();
-
-sub _accept_default {
-    $AcceptDefault = shift;
-}
-
-sub missing_modules {
-    return @Missing;
-}
-
-sub do_install {
-    __PACKAGE__->install(
-        [
-            $Config
-            ? ( UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
-            : ()
-        ],
-        @Missing,
-    );
-}
-
-# initialize various flags, and/or perform install
-sub _init {
-    foreach my $arg (
-        @ARGV,
-        split(
-            /[\s\t]+/,
-            $ENV{PERL_AUTOINSTALL} || $ENV{PERL_EXTUTILS_AUTOINSTALL} || ''
-        )
-      )
-    {
-        if ( $arg =~ /^--config=(.*)$/ ) {
-            $Config = [ split( ',', $1 ) ];
-        }
-        elsif ( $arg =~ /^--installdeps=(.*)$/ ) {
-            __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
-            exit 0;
-        }
-        elsif ( $arg =~ /^--default(?:deps)?$/ ) {
-            $AcceptDefault = 1;
-        }
-        elsif ( $arg =~ /^--check(?:deps)?$/ ) {
-            $CheckOnly = 1;
-        }
-        elsif ( $arg =~ /^--skip(?:deps)?$/ ) {
-            $SkipInstall = 1;
-        }
-        elsif ( $arg =~ /^--test(?:only)?$/ ) {
-            $TestOnly = 1;
-        }
-        elsif ( $arg =~ /^--all(?:deps)?$/ ) {
-            $AllDeps = 1;
-        }
-    }
-}
-
-# overrides MakeMaker's prompt() to automatically accept the default choice
-sub _prompt {
-    goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault;
-
-    my ( $prompt, $default ) = @_;
-    my $y = ( $default =~ /^[Yy]/ );
-
-    print $prompt, ' [', ( $y ? 'Y' : 'y' ), '/', ( $y ? 'n' : 'N' ), '] ';
-    print "$default\n";
-    return $default;
-}
-
-# the workhorse
-sub import {
-    my $class = shift;
-    my @args  = @_ or return;
-    my $core_all;
-
-    print "*** $class version " . $class->VERSION . "\n";
-    print "*** Checking for Perl dependencies...\n";
-
-    my $cwd = Cwd::cwd();
-
-    $Config = [];
-
-    my $maxlen = length(
-        (
-            sort   { length($b) <=> length($a) }
-              grep { /^[^\-]/ }
-              map  {
-                ref($_)
-                  ? ( ( ref($_) eq 'HASH' ) ? keys(%$_) : @{$_} )
-                  : ''
-              }
-              map { +{@args}->{$_} }
-              grep { /^[^\-]/ or /^-core$/i } keys %{ +{@args} }
-        )[0]
-    );
-
-    # We want to know if we're under CPAN early to avoid prompting, but
-    # if we aren't going to try and install anything anyway then skip the
-    # check entirely since we don't want to have to load (and configure)
-    # an old CPAN just for a cosmetic message
-
-    $UnderCPAN = _check_lock(1) unless $SkipInstall;
-
-    while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
-        my ( @required, @tests, @skiptests );
-        my $default  = 1;
-        my $conflict = 0;
-
-        if ( $feature =~ m/^-(\w+)$/ ) {
-            my $option = lc($1);
-
-            # check for a newer version of myself
-            _update_to( $modules, @_ ) and return if $option eq 'version';
-
-            # sets CPAN configuration options
-            $Config = $modules if $option eq 'config';
-
-            # promote every features to core status
-            $core_all = ( $modules =~ /^all$/i ) and next
-              if $option eq 'core';
-
-            next unless $option eq 'core';
-        }
-
-        print "[" . ( $FeatureMap{ lc($feature) } || $feature ) . "]\n";
-
-        $modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' );
-
-        unshift @$modules, -default => &{ shift(@$modules) }
-          if ( ref( $modules->[0] ) eq 'CODE' );    # XXX: bugward combatability
-
-        while ( my ( $mod, $arg ) = splice( @$modules, 0, 2 ) ) {
-            if ( $mod =~ m/^-(\w+)$/ ) {
-                my $option = lc($1);
-
-                $default   = $arg    if ( $option eq 'default' );
-                $conflict  = $arg    if ( $option eq 'conflict' );
-                @tests     = @{$arg} if ( $option eq 'tests' );
-                @skiptests = @{$arg} if ( $option eq 'skiptests' );
-
-                next;
-            }
-
-            printf( "- %-${maxlen}s ...", $mod );
-
-            if ( $arg and $arg =~ /^\D/ ) {
-                unshift @$modules, $arg;
-                $arg = 0;
-            }
-
-            # XXX: check for conflicts and uninstalls(!) them.
-            my $cur = _load($mod);
-            if (_version_cmp ($cur, $arg) >= 0)
-            {
-                print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
-                push @Existing, $mod => $arg;
-                $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
-            }
-            else {
-                if (not defined $cur)   # indeed missing
-                {
-                    print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
-                }
-                else
-                {
-                    # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above
-                    print "too old. ($cur < $arg)\n";
-                }
-
-                push @required, $mod => $arg;
-            }
-        }
-
-        next unless @required;
-
-        my $mandatory = ( $feature eq '-core' or $core_all );
-
-        if (
-            !$SkipInstall
-            and (
-                $CheckOnly
-                or ($mandatory and $UnderCPAN)
-                or $AllDeps
-                or _prompt(
-                    qq{==> Auto-install the }
-                      . ( @required / 2 )
-                      . ( $mandatory ? ' mandatory' : ' optional' )
-                      . qq{ module(s) from CPAN?},
-                    $default ? 'y' : 'n',
-                ) =~ /^[Yy]/
-            )
-          )
-        {
-            push( @Missing, @required );
-            $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
-        }
-
-        elsif ( !$SkipInstall
-            and $default
-            and $mandatory
-            and
-            _prompt( qq{==> The module(s) are mandatory! Really skip?}, 'n', )
-            =~ /^[Nn]/ )
-        {
-            push( @Missing, @required );
-            $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
-        }
-
-        else {
-            $DisabledTests{$_} = 1 for map { glob($_) } @tests;
-        }
-    }
-
-    if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
-        require Config;
-        print
-"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n";
-
-        # make an educated guess of whether we'll need root permission.
-        print "    (You may need to do that as the 'root' user.)\n"
-          if eval '$>';
-    }
-    print "*** $class configuration finished.\n";
-
-    chdir $cwd;
-
-    # import to main::
-    no strict 'refs';
-    *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
-
-    return (@Existing, @Missing);
-}
-
-sub _running_under {
-    my $thing = shift;
-    print <<"END_MESSAGE";
-*** Since we're running under ${thing}, I'll just let it take care
-    of the dependency's installation later.
-END_MESSAGE
-    return 1;
-}
-
-# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
-# if we are, then we simply let it taking care of our dependencies
-sub _check_lock {
-    return unless @Missing or @_;
-
-    my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
-
-    if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
-        return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS');
-    }
-
-    require CPAN;
-
-    if ($CPAN::VERSION > '1.89') {
-        if ($cpan_env) {
-            return _running_under('CPAN');
-        }
-        return; # CPAN.pm new enough, don't need to check further
-    }
-
-    # last ditch attempt, this -will- configure CPAN, very sorry
-
-    _load_cpan(1); # force initialize even though it's already loaded
-
-    # Find the CPAN lock-file
-    my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
-    return unless -f $lock;
-
-    # Check the lock
-    local *LOCK;
-    return unless open(LOCK, $lock);
-
-    if (
-            ( $^O eq 'MSWin32' ? _under_cpan() : <LOCK> == getppid() )
-        and ( $CPAN::Config->{prerequisites_policy} || '' ) ne 'ignore'
-    ) {
-        print <<'END_MESSAGE';
-
-*** Since we're running under CPAN, I'll just let it take care
-    of the dependency's installation later.
-END_MESSAGE
-        return 1;
-    }
-
-    close LOCK;
-    return;
-}
-
-sub install {
-    my $class = shift;
-
-    my $i;    # used below to strip leading '-' from config keys
-    my @config = ( map { s/^-// if ++$i; $_ } @{ +shift } );
-
-    my ( @modules, @installed );
-    while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
-
-        # grep out those already installed
-        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
-            push @installed, $pkg;
-        }
-        else {
-            push @modules, $pkg, $ver;
-        }
-    }
-
-    return @installed unless @modules;  # nothing to do
-    return @installed if _check_lock(); # defer to the CPAN shell
-
-    print "*** Installing dependencies...\n";
-
-    return unless _connected_to('cpan.org');
-
-    my %args = @config;
-    my %failed;
-    local *FAILED;
-    if ( $args{do_once} and open( FAILED, '.#autoinstall.failed' ) ) {
-        while (<FAILED>) { chomp; $failed{$_}++ }
-        close FAILED;
-
-        my @newmod;
-        while ( my ( $k, $v ) = splice( @modules, 0, 2 ) ) {
-            push @newmod, ( $k => $v ) unless $failed{$k};
-        }
-        @modules = @newmod;
-    }
-
-    if ( _has_cpanplus() and not $ENV{PERL_AUTOINSTALL_PREFER_CPAN} ) {
-        _install_cpanplus( \@modules, \@config );
-    } else {
-        _install_cpan( \@modules, \@config );
-    }
-
-    print "*** $class installation finished.\n";
-
-    # see if we have successfully installed them
-    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
-        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
-            push @installed, $pkg;
-        }
-        elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
-            print FAILED "$pkg\n";
-        }
-    }
-
-    close FAILED if $args{do_once};
-
-    return @installed;
-}
-
-sub _install_cpanplus {
-    my @modules   = @{ +shift };
-    my @config    = _cpanplus_config( @{ +shift } );
-    my $installed = 0;
-
-    require CPANPLUS::Backend;
-    my $cp   = CPANPLUS::Backend->new;
-    my $conf = $cp->configure_object;
-
-    return unless $conf->can('conf') # 0.05x+ with "sudo" support
-               or _can_write($conf->_get_build('base'));  # 0.04x
-
-    # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
-    my $makeflags = $conf->get_conf('makeflags') || '';
-    if ( UNIVERSAL::isa( $makeflags, 'HASH' ) ) {
-        # 0.03+ uses a hashref here
-        $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST};
-
-    } else {
-        # 0.02 and below uses a scalar
-        $makeflags = join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
-          if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
-
-    }
-    $conf->set_conf( makeflags => $makeflags );
-    $conf->set_conf( prereqs   => 1 );
-
-    
-
-    while ( my ( $key, $val ) = splice( @config, 0, 2 ) ) {
-        $conf->set_conf( $key, $val );
-    }
-
-    my $modtree = $cp->module_tree;
-    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
-        print "*** Installing $pkg...\n";
-
-        MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
-
-        my $success;
-        my $obj = $modtree->{$pkg};
-
-        if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) {
-            my $pathname = $pkg;
-            $pathname =~ s/::/\\W/;
-
-            foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
-                delete $INC{$inc};
-            }
-
-            my $rv = $cp->install( modules => [ $obj->{module} ] );
-
-            if ( $rv and ( $rv->{ $obj->{module} } or $rv->{ok} ) ) {
-                print "*** $pkg successfully installed.\n";
-                $success = 1;
-            } else {
-                print "*** $pkg installation cancelled.\n";
-                $success = 0;
-            }
-
-            $installed += $success;
-        } else {
-            print << ".";
-*** Could not find a version $ver or above for $pkg; skipping.
-.
-        }
-
-        MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
-    }
-
-    return $installed;
-}
-
-sub _cpanplus_config {
-	my @config = ();
-	while ( @_ ) {
-		my ($key, $value) = (shift(), shift());
-		if ( $key eq 'prerequisites_policy' ) {
-			if ( $value eq 'follow' ) {
-				$value = CPANPLUS::Internals::Constants::PREREQ_INSTALL();
-			} elsif ( $value eq 'ask' ) {
-				$value = CPANPLUS::Internals::Constants::PREREQ_ASK();
-			} elsif ( $value eq 'ignore' ) {
-				$value = CPANPLUS::Internals::Constants::PREREQ_IGNORE();
-			} else {
-				die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n";
-			}
-		} else {
-			die "*** Cannot convert option $key to CPANPLUS version.\n";
-		}
-	}
-	return @config;
-}
-
-sub _install_cpan {
-    my @modules   = @{ +shift };
-    my @config    = @{ +shift };
-    my $installed = 0;
-    my %args;
-
-    _load_cpan();
-    require Config;
-
-    if (CPAN->VERSION < 1.80) {
-        # no "sudo" support, probe for writableness
-        return unless _can_write( MM->catfile( $CPAN::Config->{cpan_home}, 'sources' ) )
-                  and _can_write( $Config::Config{sitelib} );
-    }
-
-    # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
-    my $makeflags = $CPAN::Config->{make_install_arg} || '';
-    $CPAN::Config->{make_install_arg} =
-      join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
-      if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
-
-    # don't show start-up info
-    $CPAN::Config->{inhibit_startup_message} = 1;
-
-    # set additional options
-    while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) {
-        ( $args{$opt} = $arg, next )
-          if $opt =~ /^force$/;    # pseudo-option
-        $CPAN::Config->{$opt} = $arg;
-    }
-
-    local $CPAN::Config->{prerequisites_policy} = 'follow';
-
-    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
-        MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
-
-        print "*** Installing $pkg...\n";
-
-        my $obj     = CPAN::Shell->expand( Module => $pkg );
-        my $success = 0;
-
-        if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) {
-            my $pathname = $pkg;
-            $pathname =~ s/::/\\W/;
-
-            foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
-                delete $INC{$inc};
-            }
-
-            my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
-                                  : CPAN::Shell->install($pkg);
-            $rv ||= eval {
-                $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
-                  ->{install}
-                  if $CPAN::META;
-            };
-
-            if ( $rv eq 'YES' ) {
-                print "*** $pkg successfully installed.\n";
-                $success = 1;
-            }
-            else {
-                print "*** $pkg installation failed.\n";
-                $success = 0;
-            }
-
-            $installed += $success;
-        }
-        else {
-            print << ".";
-*** Could not find a version $ver or above for $pkg; skipping.
-.
-        }
-
-        MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
-    }
-
-    return $installed;
-}
-
-sub _has_cpanplus {
-    return (
-        $HasCPANPLUS = (
-            $INC{'CPANPLUS/Config.pm'}
-              or _load('CPANPLUS::Shell::Default')
-        )
-    );
-}
-
-# make guesses on whether we're under the CPAN installation directory
-sub _under_cpan {
-    require Cwd;
-    require File::Spec;
-
-    my $cwd  = File::Spec->canonpath( Cwd::cwd() );
-    my $cpan = File::Spec->canonpath( $CPAN::Config->{cpan_home} );
-
-    return ( index( $cwd, $cpan ) > -1 );
-}
-
-sub _update_to {
-    my $class = __PACKAGE__;
-    my $ver   = shift;
-
-    return
-      if _version_cmp( _load($class), $ver ) >= 0;  # no need to upgrade
-
-    if (
-        _prompt( "==> A newer version of $class ($ver) is required. Install?",
-            'y' ) =~ /^[Nn]/
-      )
-    {
-        die "*** Please install $class $ver manually.\n";
-    }
-
-    print << ".";
-*** Trying to fetch it from CPAN...
-.
-
-    # install ourselves
-    _load($class) and return $class->import(@_)
-      if $class->install( [], $class, $ver );
-
-    print << '.'; exit 1;
-
-*** Cannot bootstrap myself. :-( Installation terminated.
-.
-}
-
-# check if we're connected to some host, using inet_aton
-sub _connected_to {
-    my $site = shift;
-
-    return (
-        ( _load('Socket') and Socket::inet_aton($site) ) or _prompt(
-            qq(
-*** Your host cannot resolve the domain name '$site', which
-    probably means the Internet connections are unavailable.
-==> Should we try to install the required module(s) anyway?), 'n'
-          ) =~ /^[Yy]/
-    );
-}
-
-# check if a directory is writable; may create it on demand
-sub _can_write {
-    my $path = shift;
-    mkdir( $path, 0755 ) unless -e $path;
-
-    return 1 if -w $path;
-
-    print << ".";
-*** You are not allowed to write to the directory '$path';
-    the installation may fail due to insufficient permissions.
-.
-
-    if (
-        eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt(
-            qq(
-==> Should we try to re-execute the autoinstall process with 'sudo'?),
-            ((-t STDIN) ? 'y' : 'n')
-        ) =~ /^[Yy]/
-      )
-    {
-
-        # try to bootstrap ourselves from sudo
-        print << ".";
-*** Trying to re-execute the autoinstall process with 'sudo'...
-.
-        my $missing = join( ',', @Missing );
-        my $config = join( ',',
-            UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
-          if $Config;
-
-        return
-          unless system( 'sudo', $^X, $0, "--config=$config",
-            "--installdeps=$missing" );
-
-        print << ".";
-*** The 'sudo' command exited with error!  Resuming...
-.
-    }
-
-    return _prompt(
-        qq(
-==> Should we try to install the required module(s) anyway?), 'n'
-    ) =~ /^[Yy]/;
-}
-
-# load a module and return the version it reports
-sub _load {
-    my $mod  = pop;    # class/instance doesn't matter
-    my $file = $mod;
-
-    $file =~ s|::|/|g;
-    $file .= '.pm';
-
-    local $@;
-    return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 );
-}
-
-# Load CPAN.pm and it's configuration
-sub _load_cpan {
-    return if $CPAN::VERSION and $CPAN::Config and not @_;
-    require CPAN;
-
-    # CPAN-1.82+ adds CPAN::Config::AUTOLOAD to redirect to
-    #    CPAN::HandleConfig->load. CPAN reports that the redirection
-    #    is deprecated in a warning printed at the user.
-
-    # CPAN-1.81 expects CPAN::HandleConfig->load, does not have
-    #   $CPAN::HandleConfig::VERSION but cannot handle
-    #   CPAN::Config->load
-
-    # Which "versions expect CPAN::Config->load?
-
-    if ( $CPAN::HandleConfig::VERSION
-        || CPAN::HandleConfig->can('load')
-    ) {
-        # Newer versions of CPAN have a HandleConfig module
-        CPAN::HandleConfig->load;
-    } else {
-    	# Older versions had the load method in Config directly
-        CPAN::Config->load;
-    }
-}
-
-# compare two versions, either use Sort::Versions or plain comparison
-# return values same as <=>
-sub _version_cmp {
-    my ( $cur, $min ) = @_;
-    return -1 unless defined $cur;  # if 0 keep comparing
-    return 1 unless $min;
-
-    $cur =~ s/\s+$//;
-
-    # check for version numbers that are not in decimal format
-    if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) {
-        if ( ( $version::VERSION or defined( _load('version') )) and
-             version->can('new') 
-            ) {
-
-            # use version.pm if it is installed.
-            return version->new($cur) <=> version->new($min);
-        }
-        elsif ( $Sort::Versions::VERSION or defined( _load('Sort::Versions') ) )
-        {
-
-            # use Sort::Versions as the sorting algorithm for a.b.c versions
-            return Sort::Versions::versioncmp( $cur, $min );
-        }
-
-        warn "Cannot reliably compare non-decimal formatted versions.\n"
-          . "Please install version.pm or Sort::Versions.\n";
-    }
-
-    # plain comparison
-    local $^W = 0;    # shuts off 'not numeric' bugs
-    return $cur <=> $min;
-}
-
-# nothing; this usage is deprecated.
-sub main::PREREQ_PM { return {}; }
-
-sub _make_args {
-    my %args = @_;
-
-    $args{PREREQ_PM} = { %{ $args{PREREQ_PM} || {} }, @Existing, @Missing }
-      if $UnderCPAN or $TestOnly;
-
-    if ( $args{EXE_FILES} and -e 'MANIFEST' ) {
-        require ExtUtils::Manifest;
-        my $manifest = ExtUtils::Manifest::maniread('MANIFEST');
-
-        $args{EXE_FILES} =
-          [ grep { exists $manifest->{$_} } @{ $args{EXE_FILES} } ];
-    }
-
-    $args{test}{TESTS} ||= 't/*.t';
-    $args{test}{TESTS} = join( ' ',
-        grep { !exists( $DisabledTests{$_} ) }
-          map { glob($_) } split( /\s+/, $args{test}{TESTS} ) );
-
-    my $missing = join( ',', @Missing );
-    my $config =
-      join( ',', UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
-      if $Config;
-
-    $PostambleActions = (
-        ($missing and not $UnderCPAN)
-        ? "\$(PERL) $0 --config=$config --installdeps=$missing"
-        : "\$(NOECHO) \$(NOOP)"
-    );
-
-    return %args;
-}
-
-# a wrapper to ExtUtils::MakeMaker::WriteMakefile
-sub Write {
-    require Carp;
-    Carp::croak "WriteMakefile: Need even number of args" if @_ % 2;
-
-    if ($CheckOnly) {
-        print << ".";
-*** Makefile not written in check-only mode.
-.
-        return;
-    }
-
-    my %args = _make_args(@_);
-
-    no strict 'refs';
-
-    $PostambleUsed = 0;
-    local *MY::postamble = \&postamble unless defined &MY::postamble;
-    ExtUtils::MakeMaker::WriteMakefile(%args);
-
-    print << "." unless $PostambleUsed;
-*** WARNING: Makefile written with customized MY::postamble() without
-    including contents from Module::AutoInstall::postamble() --
-    auto installation features disabled.  Please contact the author.
-.
-
-    return 1;
-}
-
-sub postamble {
-    $PostambleUsed = 1;
-
-    return <<"END_MAKE";
-
-config :: installdeps
-\t\$(NOECHO) \$(NOOP)
-
-checkdeps ::
-\t\$(PERL) $0 --checkdeps
-
-installdeps ::
-\t$PostambleActions
-
-END_MAKE
-
-}
-
-1;
-
-__END__
-
-#line 1071
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install.pm b/debian/modules/http-subs-filter/test/inc/Module/Install.pm
deleted file mode 100644
index 74caf9c..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install.pm
+++ /dev/null
@@ -1,470 +0,0 @@
-#line 1
-package Module::Install;
-
-# For any maintainers:
-# The load order for Module::Install is a bit magic.
-# It goes something like this...
-#
-# IF ( host has Module::Install installed, creating author mode ) {
-#     1. Makefile.PL calls "use inc::Module::Install"
-#     2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install
-#     3. The installed version of inc::Module::Install loads
-#     4. inc::Module::Install calls "require Module::Install"
-#     5. The ./inc/ version of Module::Install loads
-# } ELSE {
-#     1. Makefile.PL calls "use inc::Module::Install"
-#     2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install
-#     3. The ./inc/ version of Module::Install loads
-# }
-
-use 5.005;
-use strict 'vars';
-use Cwd        ();
-use File::Find ();
-use File::Path ();
-
-use vars qw{$VERSION $MAIN};
-BEGIN {
-	# All Module::Install core packages now require synchronised versions.
-	# This will be used to ensure we don't accidentally load old or
-	# different versions of modules.
-	# This is not enforced yet, but will be some time in the next few
-	# releases once we can make sure it won't clash with custom
-	# Module::Install extensions.
-	$VERSION = '1.01';
-
-	# Storage for the pseudo-singleton
-	$MAIN    = undef;
-
-	*inc::Module::Install::VERSION = *VERSION;
-	@inc::Module::Install::ISA     = __PACKAGE__;
-
-}
-
-sub import {
-	my $class = shift;
-	my $self  = $class->new(@_);
-	my $who   = $self->_caller;
-
-	#-------------------------------------------------------------
-	# all of the following checks should be included in import(),
-	# to allow "eval 'require Module::Install; 1' to test
-	# installation of Module::Install. (RT #51267)
-	#-------------------------------------------------------------
-
-	# Whether or not inc::Module::Install is actually loaded, the
-	# $INC{inc/Module/Install.pm} is what will still get set as long as
-	# the caller loaded module this in the documented manner.
-	# If not set, the caller may NOT have loaded the bundled version, and thus
-	# they may not have a MI version that works with the Makefile.PL. This would
-	# result in false errors or unexpected behaviour. And we don't want that.
-	my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
-	unless ( $INC{$file} ) { die <<"END_DIE" }
-
-Please invoke ${\__PACKAGE__} with:
-
-	use inc::${\__PACKAGE__};
-
-not:
-
-	use ${\__PACKAGE__};
-
-END_DIE
-
-	# This reportedly fixes a rare Win32 UTC file time issue, but
-	# as this is a non-cross-platform XS module not in the core,
-	# we shouldn't really depend on it. See RT #24194 for detail.
-	# (Also, this module only supports Perl 5.6 and above).
-	eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006;
-
-	# If the script that is loading Module::Install is from the future,
-	# then make will detect this and cause it to re-run over and over
-	# again. This is bad. Rather than taking action to touch it (which
-	# is unreliable on some platforms and requires write permissions)
-	# for now we should catch this and refuse to run.
-	if ( -f $0 ) {
-		my $s = (stat($0))[9];
-
-		# If the modification time is only slightly in the future,
-		# sleep briefly to remove the problem.
-		my $a = $s - time;
-		if ( $a > 0 and $a < 5 ) { sleep 5 }
-
-		# Too far in the future, throw an error.
-		my $t = time;
-		if ( $s > $t ) { die <<"END_DIE" }
-
-Your installer $0 has a modification time in the future ($s > $t).
-
-This is known to create infinite loops in make.
-
-Please correct this, then run $0 again.
-
-END_DIE
-	}
-
-
-	# Build.PL was formerly supported, but no longer is due to excessive
-	# difficulty in implementing every single feature twice.
-	if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
-
-Module::Install no longer supports Build.PL.
-
-It was impossible to maintain duel backends, and has been deprecated.
-
-Please remove all Build.PL files and only use the Makefile.PL installer.
-
-END_DIE
-
-	#-------------------------------------------------------------
-
-	# To save some more typing in Module::Install installers, every...
-	# use inc::Module::Install
-	# ...also acts as an implicit use strict.
-	$^H |= strict::bits(qw(refs subs vars));
-
-	#-------------------------------------------------------------
-
-	unless ( -f $self->{file} ) {
-		foreach my $key (keys %INC) {
-			delete $INC{$key} if $key =~ /Module\/Install/;
-		}
-
-		local $^W;
-		require "$self->{path}/$self->{dispatch}.pm";
-		File::Path::mkpath("$self->{prefix}/$self->{author}");
-		$self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
-		$self->{admin}->init;
-		@_ = ($class, _self => $self);
-		goto &{"$self->{name}::import"};
-	}
-
-	local $^W;
-	*{"${who}::AUTOLOAD"} = $self->autoload;
-	$self->preload;
-
-	# Unregister loader and worker packages so subdirs can use them again
-	delete $INC{'inc/Module/Install.pm'};
-	delete $INC{'Module/Install.pm'};
-
-	# Save to the singleton
-	$MAIN = $self;
-
-	return 1;
-}
-
-sub autoload {
-	my $self = shift;
-	my $who  = $self->_caller;
-	my $cwd  = Cwd::cwd();
-	my $sym  = "${who}::AUTOLOAD";
-	$sym->{$cwd} = sub {
-		my $pwd = Cwd::cwd();
-		if ( my $code = $sym->{$pwd} ) {
-			# Delegate back to parent dirs
-			goto &$code unless $cwd eq $pwd;
-		}
-		unless ($$sym =~ s/([^:]+)$//) {
-			# XXX: it looks like we can't retrieve the missing function
-			# via $$sym (usually $main::AUTOLOAD) in this case.
-			# I'm still wondering if we should slurp Makefile.PL to
-			# get some context or not ...
-			my ($package, $file, $line) = caller;
-			die <<"EOT";
-Unknown function is found at $file line $line.
-Execution of $file aborted due to runtime errors.
-
-If you're a contributor to a project, you may need to install
-some Module::Install extensions from CPAN (or other repository).
-If you're a user of a module, please contact the author.
-EOT
-		}
-		my $method = $1;
-		if ( uc($method) eq $method ) {
-			# Do nothing
-			return;
-		} elsif ( $method =~ /^_/ and $self->can($method) ) {
-			# Dispatch to the root M:I class
-			return $self->$method(@_);
-		}
-
-		# Dispatch to the appropriate plugin
-		unshift @_, ( $self, $1 );
-		goto &{$self->can('call')};
-	};
-}
-
-sub preload {
-	my $self = shift;
-	unless ( $self->{extensions} ) {
-		$self->load_extensions(
-			"$self->{prefix}/$self->{path}", $self
-		);
-	}
-
-	my @exts = @{$self->{extensions}};
-	unless ( @exts ) {
-		@exts = $self->{admin}->load_all_extensions;
-	}
-
-	my %seen;
-	foreach my $obj ( @exts ) {
-		while (my ($method, $glob) = each %{ref($obj) . '::'}) {
-			next unless $obj->can($method);
-			next if $method =~ /^_/;
-			next if $method eq uc($method);
-			$seen{$method}++;
-		}
-	}
-
-	my $who = $self->_caller;
-	foreach my $name ( sort keys %seen ) {
-		local $^W;
-		*{"${who}::$name"} = sub {
-			${"${who}::AUTOLOAD"} = "${who}::$name";
-			goto &{"${who}::AUTOLOAD"};
-		};
-	}
-}
-
-sub new {
-	my ($class, %args) = @_;
-
-	delete $INC{'FindBin.pm'};
-	{
-		# to suppress the redefine warning
-		local $SIG{__WARN__} = sub {};
-		require FindBin;
-	}
-
-	# ignore the prefix on extension modules built from top level.
-	my $base_path = Cwd::abs_path($FindBin::Bin);
-	unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
-		delete $args{prefix};
-	}
-	return $args{_self} if $args{_self};
-
-	$args{dispatch} ||= 'Admin';
-	$args{prefix}   ||= 'inc';
-	$args{author}   ||= ($^O eq 'VMS' ? '_author' : '.author');
-	$args{bundle}   ||= 'inc/BUNDLES';
-	$args{base}     ||= $base_path;
-	$class =~ s/^\Q$args{prefix}\E:://;
-	$args{name}     ||= $class;
-	$args{version}  ||= $class->VERSION;
-	unless ( $args{path} ) {
-		$args{path}  = $args{name};
-		$args{path}  =~ s!::!/!g;
-	}
-	$args{file}     ||= "$args{base}/$args{prefix}/$args{path}.pm";
-	$args{wrote}      = 0;
-
-	bless( \%args, $class );
-}
-
-sub call {
-	my ($self, $method) = @_;
-	my $obj = $self->load($method) or return;
-        splice(@_, 0, 2, $obj);
-	goto &{$obj->can($method)};
-}
-
-sub load {
-	my ($self, $method) = @_;
-
-	$self->load_extensions(
-		"$self->{prefix}/$self->{path}", $self
-	) unless $self->{extensions};
-
-	foreach my $obj (@{$self->{extensions}}) {
-		return $obj if $obj->can($method);
-	}
-
-	my $admin = $self->{admin} or die <<"END_DIE";
-The '$method' method does not exist in the '$self->{prefix}' path!
-Please remove the '$self->{prefix}' directory and run $0 again to load it.
-END_DIE
-
-	my $obj = $admin->load($method, 1);
-	push @{$self->{extensions}}, $obj;
-
-	$obj;
-}
-
-sub load_extensions {
-	my ($self, $path, $top) = @_;
-
-	my $should_reload = 0;
-	unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
-		unshift @INC, $self->{prefix};
-		$should_reload = 1;
-	}
-
-	foreach my $rv ( $self->find_extensions($path) ) {
-		my ($file, $pkg) = @{$rv};
-		next if $self->{pathnames}{$pkg};
-
-		local $@;
-		my $new = eval { local $^W; require $file; $pkg->can('new') };
-		unless ( $new ) {
-			warn $@ if $@;
-			next;
-		}
-		$self->{pathnames}{$pkg} =
-			$should_reload ? delete $INC{$file} : $INC{$file};
-		push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
-	}
-
-	$self->{extensions} ||= [];
-}
-
-sub find_extensions {
-	my ($self, $path) = @_;
-
-	my @found;
-	File::Find::find( sub {
-		my $file = $File::Find::name;
-		return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
-		my $subpath = $1;
-		return if lc($subpath) eq lc($self->{dispatch});
-
-		$file = "$self->{path}/$subpath.pm";
-		my $pkg = "$self->{name}::$subpath";
-		$pkg =~ s!/!::!g;
-
-		# If we have a mixed-case package name, assume case has been preserved
-		# correctly.  Otherwise, root through the file to locate the case-preserved
-		# version of the package name.
-		if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
-			my $content = Module::Install::_read($subpath . '.pm');
-			my $in_pod  = 0;
-			foreach ( split //, $content ) {
-				$in_pod = 1 if /^=\w/;
-				$in_pod = 0 if /^=cut/;
-				next if ($in_pod || /^=cut/);  # skip pod text
-				next if /^\s*#/;               # and comments
-				if ( m/^\s*package\s+($pkg)\s*;/i ) {
-					$pkg = $1;
-					last;
-				}
-			}
-		}
-
-		push @found, [ $file, $pkg ];
-	}, $path ) if -d $path;
-
-	@found;
-}
-
-
-
-
-
-#####################################################################
-# Common Utility Functions
-
-sub _caller {
-	my $depth = 0;
-	my $call  = caller($depth);
-	while ( $call eq __PACKAGE__ ) {
-		$depth++;
-		$call = caller($depth);
-	}
-	return $call;
-}
-
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
-sub _read {
-	local *FH;
-	open( FH, '<', $_[0] ) or die "open($_[0]): $!";
-	my $string = do { local $/; <FH> };
-	close FH or die "close($_[0]): $!";
-	return $string;
-}
-END_NEW
-sub _read {
-	local *FH;
-	open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
-	my $string = do { local $/; <FH> };
-	close FH or die "close($_[0]): $!";
-	return $string;
-}
-END_OLD
-
-sub _readperl {
-	my $string = Module::Install::_read($_[0]);
-	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
-	$string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s;
-	$string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg;
-	return $string;
-}
-
-sub _readpod {
-	my $string = Module::Install::_read($_[0]);
-	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
-	return $string if $_[0] =~ /\.pod\z/;
-	$string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg;
-	$string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg;
-	$string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg;
-	$string =~ s/^\n+//s;
-	return $string;
-}
-
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
-sub _write {
-	local *FH;
-	open( FH, '>', $_[0] ) or die "open($_[0]): $!";
-	foreach ( 1 .. $#_ ) {
-		print FH $_[$_] or die "print($_[0]): $!";
-	}
-	close FH or die "close($_[0]): $!";
-}
-END_NEW
-sub _write {
-	local *FH;
-	open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
-	foreach ( 1 .. $#_ ) {
-		print FH $_[$_] or die "print($_[0]): $!";
-	}
-	close FH or die "close($_[0]): $!";
-}
-END_OLD
-
-# _version is for processing module versions (eg, 1.03_05) not
-# Perl versions (eg, 5.8.1).
-sub _version ($) {
-	my $s = shift || 0;
-	my $d =()= $s =~ /(\.)/g;
-	if ( $d >= 2 ) {
-		# Normalise multipart versions
-		$s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg;
-	}
-	$s =~ s/^(\d+)\.?//;
-	my $l = $1 || 0;
-	my @v = map {
-		$_ . '0' x (3 - length $_)
-	} $s =~ /(\d{1,3})\D?/g;
-	$l = $l . '.' . join '', @v if @v;
-	return $l + 0;
-}
-
-sub _cmp ($$) {
-	_version($_[0]) <=> _version($_[1]);
-}
-
-# Cloned from Params::Util::_CLASS
-sub _CLASS ($) {
-	(
-		defined $_[0]
-		and
-		! ref $_[0]
-		and
-		$_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s
-	) ? $_[0] : undef;
-}
-
-1;
-
-# Copyright 2008 - 2011 Adam Kennedy.
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/AutoInstall.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/AutoInstall.pm
deleted file mode 100644
index bc3d172..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/AutoInstall.pm
+++ /dev/null
@@ -1,82 +0,0 @@
-#line 1
-package Module::Install::AutoInstall;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.01';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub AutoInstall { $_[0] }
-
-sub run {
-    my $self = shift;
-    $self->auto_install_now(@_);
-}
-
-sub write {
-    my $self = shift;
-    $self->auto_install(@_);
-}
-
-sub auto_install {
-    my $self = shift;
-    return if $self->{done}++;
-
-    # Flatten array of arrays into a single array
-    my @core = map @$_, map @$_, grep ref,
-               $self->build_requires, $self->requires;
-
-    my @config = @_;
-
-    # We'll need Module::AutoInstall
-    $self->include('Module::AutoInstall');
-    require Module::AutoInstall;
-
-    my @features_require = Module::AutoInstall->import(
-        (@config ? (-config => \@config) : ()),
-        (@core   ? (-core   => \@core)   : ()),
-        $self->features,
-    );
-
-    my %seen;
-    my @requires = map @$_, map @$_, grep ref, $self->requires;
-    while (my ($mod, $ver) = splice(@requires, 0, 2)) {
-        $seen{$mod}{$ver}++;
-    }
-    my @build_requires = map @$_, map @$_, grep ref, $self->build_requires;
-    while (my ($mod, $ver) = splice(@build_requires, 0, 2)) {
-        $seen{$mod}{$ver}++;
-    }
-    my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires;
-    while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) {
-        $seen{$mod}{$ver}++;
-    }
-
-    my @deduped;
-    while (my ($mod, $ver) = splice(@features_require, 0, 2)) {
-        push @deduped, $mod => $ver unless $seen{$mod}{$ver}++;
-    }
-
-    $self->requires(@deduped);
-
-    $self->makemaker_args( Module::AutoInstall::_make_args() );
-
-    my $class = ref($self);
-    $self->postamble(
-        "# --- $class section:\n" .
-        Module::AutoInstall::postamble()
-    );
-}
-
-sub auto_install_now {
-    my $self = shift;
-    $self->auto_install(@_);
-    Module::AutoInstall::do_install();
-}
-
-1;
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/Base.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Base.pm
deleted file mode 100644
index d3662c9..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/Base.pm
+++ /dev/null
@@ -1,83 +0,0 @@
-#line 1
-package Module::Install::Base;
-
-use strict 'vars';
-use vars qw{$VERSION};
-BEGIN {
-	$VERSION = '1.01';
-}
-
-# Suspend handler for "redefined" warnings
-BEGIN {
-	my $w = $SIG{__WARN__};
-	$SIG{__WARN__} = sub { $w };
-}
-
-#line 42
-
-sub new {
-	my $class = shift;
-	unless ( defined &{"${class}::call"} ) {
-		*{"${class}::call"} = sub { shift->_top->call(@_) };
-	}
-	unless ( defined &{"${class}::load"} ) {
-		*{"${class}::load"} = sub { shift->_top->load(@_) };
-	}
-	bless { @_ }, $class;
-}
-
-#line 61
-
-sub AUTOLOAD {
-	local $@;
-	my $func = eval { shift->_top->autoload } or return;
-	goto &$func;
-}
-
-#line 75
-
-sub _top {
-	$_[0]->{_top};
-}
-
-#line 90
-
-sub admin {
-	$_[0]->_top->{admin}
-	or
-	Module::Install::Base::FakeAdmin->new;
-}
-
-#line 106
-
-sub is_admin {
-	! $_[0]->admin->isa('Module::Install::Base::FakeAdmin');
-}
-
-sub DESTROY {}
-
-package Module::Install::Base::FakeAdmin;
-
-use vars qw{$VERSION};
-BEGIN {
-	$VERSION = $Module::Install::Base::VERSION;
-}
-
-my $fake;
-
-sub new {
-	$fake ||= bless(\@_, $_[0]);
-}
-
-sub AUTOLOAD {}
-
-sub DESTROY {}
-
-# Restore warning handler
-BEGIN {
-	$SIG{__WARN__} = $SIG{__WARN__}->();
-}
-
-1;
-
-#line 159
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/Can.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Can.pm
deleted file mode 100644
index 276409a..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/Can.pm
+++ /dev/null
@@ -1,81 +0,0 @@
-#line 1
-package Module::Install::Can;
-
-use strict;
-use Config                ();
-use File::Spec            ();
-use ExtUtils::MakeMaker   ();
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.01';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-# check if we can load some module
-### Upgrade this to not have to load the module if possible
-sub can_use {
-	my ($self, $mod, $ver) = @_;
-	$mod =~ s{::|\\}{/}g;
-	$mod .= '.pm' unless $mod =~ /\.pm$/i;
-
-	my $pkg = $mod;
-	$pkg =~ s{/}{::}g;
-	$pkg =~ s{\.pm$}{}i;
-
-	local $@;
-	eval { require $mod; $pkg->VERSION($ver || 0); 1 };
-}
-
-# check if we can run some command
-sub can_run {
-	my ($self, $cmd) = @_;
-
-	my $_cmd = $cmd;
-	return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
-
-	for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
-		next if $dir eq '';
-		my $abs = File::Spec->catfile($dir, $_[1]);
-		return $abs if (-x $abs or $abs = MM->maybe_command($abs));
-	}
-
-	return;
-}
-
-# can we locate a (the) C compiler
-sub can_cc {
-	my $self   = shift;
-	my @chunks = split(/ /, $Config::Config{cc}) or return;
-
-	# $Config{cc} may contain args; try to find out the program part
-	while (@chunks) {
-		return $self->can_run("@chunks") || (pop(@chunks), next);
-	}
-
-	return;
-}
-
-# Fix Cygwin bug on maybe_command();
-if ( $^O eq 'cygwin' ) {
-	require ExtUtils::MM_Cygwin;
-	require ExtUtils::MM_Win32;
-	if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
-		*ExtUtils::MM_Cygwin::maybe_command = sub {
-			my ($self, $file) = @_;
-			if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
-				ExtUtils::MM_Win32->maybe_command($file);
-			} else {
-				ExtUtils::MM_Unix->maybe_command($file);
-			}
-		}
-	}
-}
-
-1;
-
-__END__
-
-#line 156
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/Fetch.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Fetch.pm
deleted file mode 100644
index 093cb7a..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/Fetch.pm
+++ /dev/null
@@ -1,93 +0,0 @@
-#line 1
-package Module::Install::Fetch;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.01';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub get_file {
-    my ($self, %args) = @_;
-    my ($scheme, $host, $path, $file) =
-        $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
-
-    if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
-        $args{url} = $args{ftp_url}
-            or (warn("LWP support unavailable!\n"), return);
-        ($scheme, $host, $path, $file) =
-            $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
-    }
-
-    $|++;
-    print "Fetching '$file' from $host... ";
-
-    unless (eval { require Socket; Socket::inet_aton($host) }) {
-        warn "'$host' resolve failed!\n";
-        return;
-    }
-
-    return unless $scheme eq 'ftp' or $scheme eq 'http';
-
-    require Cwd;
-    my $dir = Cwd::getcwd();
-    chdir $args{local_dir} or return if exists $args{local_dir};
-
-    if (eval { require LWP::Simple; 1 }) {
-        LWP::Simple::mirror($args{url}, $file);
-    }
-    elsif (eval { require Net::FTP; 1 }) { eval {
-        # use Net::FTP to get past firewall
-        my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600);
-        $ftp->login("anonymous", 'anonymous@example.com');
-        $ftp->cwd($path);
-        $ftp->binary;
-        $ftp->get($file) or (warn("$!\n"), return);
-        $ftp->quit;
-    } }
-    elsif (my $ftp = $self->can_run('ftp')) { eval {
-        # no Net::FTP, fallback to ftp.exe
-        require FileHandle;
-        my $fh = FileHandle->new;
-
-        local $SIG{CHLD} = 'IGNORE';
-        unless ($fh->open("|$ftp -n")) {
-            warn "Couldn't open ftp: $!\n";
-            chdir $dir; return;
-        }
-
-        my @dialog = split(/\n/, <<"END_FTP");
-open $host
-user anonymous anonymous\@example.com
-cd $path
-binary
-get $file $file
-quit
-END_FTP
-        foreach (@dialog) { $fh->print("$_\n") }
-        $fh->close;
-    } }
-    else {
-        warn "No working 'ftp' program available!\n";
-        chdir $dir; return;
-    }
-
-    unless (-f $file) {
-        warn "Fetching failed: $@\n";
-        chdir $dir; return;
-    }
-
-    return if exists $args{size} and -s $file != $args{size};
-    system($args{run}) if exists $args{run};
-    unlink($file) if $args{remove};
-
-    print(((!exists $args{check_for} or -e $args{check_for})
-        ? "done!" : "failed! ($!)"), "\n");
-    chdir $dir; return !$?;
-}
-
-1;
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/Include.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Include.pm
deleted file mode 100644
index 90cc979..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/Include.pm
+++ /dev/null
@@ -1,34 +0,0 @@
-#line 1
-package Module::Install::Include;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.01';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub include {
-	shift()->admin->include(@_);
-}
-
-sub include_deps {
-	shift()->admin->include_deps(@_);
-}
-
-sub auto_include {
-	shift()->admin->auto_include(@_);
-}
-
-sub auto_include_deps {
-	shift()->admin->auto_include_deps(@_);
-}
-
-sub auto_include_dependent_dists {
-	shift()->admin->auto_include_dependent_dists(@_);
-}
-
-1;
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/Makefile.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Makefile.pm
deleted file mode 100644
index 4c71003..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/Makefile.pm
+++ /dev/null
@@ -1,415 +0,0 @@
-#line 1
-package Module::Install::Makefile;
-
-use strict 'vars';
-use ExtUtils::MakeMaker   ();
-use Module::Install::Base ();
-use Fcntl qw/:flock :seek/;
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.01';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub Makefile { $_[0] }
-
-my %seen = ();
-
-sub prompt {
-	shift;
-
-	# Infinite loop protection
-	my @c = caller();
-	if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
-		die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
-	}
-
-	# In automated testing or non-interactive session, always use defaults
-	if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) {
-		local $ENV{PERL_MM_USE_DEFAULT} = 1;
-		goto &ExtUtils::MakeMaker::prompt;
-	} else {
-		goto &ExtUtils::MakeMaker::prompt;
-	}
-}
-
-# Store a cleaned up version of the MakeMaker version,
-# since we need to behave differently in a variety of
-# ways based on the MM version.
-my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
-
-# If we are passed a param, do a "newer than" comparison.
-# Otherwise, just return the MakeMaker version.
-sub makemaker {
-	( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
-}
-
-# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified
-# as we only need to know here whether the attribute is an array
-# or a hash or something else (which may or may not be appendable).
-my %makemaker_argtype = (
- C                  => 'ARRAY',
- CONFIG             => 'ARRAY',
-# CONFIGURE          => 'CODE', # ignore
- DIR                => 'ARRAY',
- DL_FUNCS           => 'HASH',
- DL_VARS            => 'ARRAY',
- EXCLUDE_EXT        => 'ARRAY',
- EXE_FILES          => 'ARRAY',
- FUNCLIST           => 'ARRAY',
- H                  => 'ARRAY',
- IMPORTS            => 'HASH',
- INCLUDE_EXT        => 'ARRAY',
- LIBS               => 'ARRAY', # ignore ''
- MAN1PODS           => 'HASH',
- MAN3PODS           => 'HASH',
- META_ADD           => 'HASH',
- META_MERGE         => 'HASH',
- PL_FILES           => 'HASH',
- PM                 => 'HASH',
- PMLIBDIRS          => 'ARRAY',
- PMLIBPARENTDIRS    => 'ARRAY',
- PREREQ_PM          => 'HASH',
- CONFIGURE_REQUIRES => 'HASH',
- SKIP               => 'ARRAY',
- TYPEMAPS           => 'ARRAY',
- XS                 => 'HASH',
-# VERSION            => ['version',''],  # ignore
-# _KEEP_AFTER_FLUSH  => '',
-
- clean      => 'HASH',
- depend     => 'HASH',
- dist       => 'HASH',
- dynamic_lib=> 'HASH',
- linkext    => 'HASH',
- macro      => 'HASH',
- postamble  => 'HASH',
- realclean  => 'HASH',
- test       => 'HASH',
- tool_autosplit => 'HASH',
-
- # special cases where you can use makemaker_append
- CCFLAGS   => 'APPENDABLE',
- DEFINE    => 'APPENDABLE',
- INC       => 'APPENDABLE',
- LDDLFLAGS => 'APPENDABLE',
- LDFROM    => 'APPENDABLE',
-);
-
-sub makemaker_args {
-	my ($self, %new_args) = @_;
-	my $args = ( $self->{makemaker_args} ||= {} );
-	foreach my $key (keys %new_args) {
-		if ($makemaker_argtype{$key}) {
-			if ($makemaker_argtype{$key} eq 'ARRAY') {
-				$args->{$key} = [] unless defined $args->{$key};
-				unless (ref $args->{$key} eq 'ARRAY') {
-					$args->{$key} = [$args->{$key}]
-				}
-				push @{$args->{$key}},
-					ref $new_args{$key} eq 'ARRAY'
-						? @{$new_args{$key}}
-						: $new_args{$key};
-			}
-			elsif ($makemaker_argtype{$key} eq 'HASH') {
-				$args->{$key} = {} unless defined $args->{$key};
-				foreach my $skey (keys %{ $new_args{$key} }) {
-					$args->{$key}{$skey} = $new_args{$key}{$skey};
-				}
-			}
-			elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
-				$self->makemaker_append($key => $new_args{$key});
-			}
-		}
-		else {
-			if (defined $args->{$key}) {
-				warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n};
-			}
-			$args->{$key} = $new_args{$key};
-		}
-	}
-	return $args;
-}
-
-# For mm args that take multiple space-seperated args,
-# append an argument to the current list.
-sub makemaker_append {
-	my $self = shift;
-	my $name = shift;
-	my $args = $self->makemaker_args;
-	$args->{$name} = defined $args->{$name}
-		? join( ' ', $args->{$name}, @_ )
-		: join( ' ', @_ );
-}
-
-sub build_subdirs {
-	my $self    = shift;
-	my $subdirs = $self->makemaker_args->{DIR} ||= [];
-	for my $subdir (@_) {
-		push @$subdirs, $subdir;
-	}
-}
-
-sub clean_files {
-	my $self  = shift;
-	my $clean = $self->makemaker_args->{clean} ||= {};
-	  %$clean = (
-		%$clean,
-		FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_),
-	);
-}
-
-sub realclean_files {
-	my $self      = shift;
-	my $realclean = $self->makemaker_args->{realclean} ||= {};
-	  %$realclean = (
-		%$realclean,
-		FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_),
-	);
-}
-
-sub libs {
-	my $self = shift;
-	my $libs = ref $_[0] ? shift : [ shift ];
-	$self->makemaker_args( LIBS => $libs );
-}
-
-sub inc {
-	my $self = shift;
-	$self->makemaker_args( INC => shift );
-}
-
-sub _wanted_t {
-}
-
-sub tests_recursive {
-	my $self = shift;
-	my $dir = shift || 't';
-	unless ( -d $dir ) {
-		die "tests_recursive dir '$dir' does not exist";
-	}
-	my %tests = map { $_ => 1 } split / /, ($self->tests || '');
-	require File::Find;
-	File::Find::find(
-        sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 },
-        $dir
-    );
-	$self->tests( join ' ', sort keys %tests );
-}
-
-sub write {
-	my $self = shift;
-	die "&Makefile->write() takes no arguments\n" if @_;
-
-	# Check the current Perl version
-	my $perl_version = $self->perl_version;
-	if ( $perl_version ) {
-		eval "use $perl_version; 1"
-			or die "ERROR: perl: Version $] is installed, "
-			. "but we need version >= $perl_version";
-	}
-
-	# Make sure we have a new enough MakeMaker
-	require ExtUtils::MakeMaker;
-
-	if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
-		# MakeMaker can complain about module versions that include
-		# an underscore, even though its own version may contain one!
-		# Hence the funny regexp to get rid of it.  See RT #35800
-		# for details.
-		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
-		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
-	} else {
-		# Allow legacy-compatibility with 5.005 by depending on the
-		# most recent EU:MM that supported 5.005.
-		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
-	}
-
-	# Generate the MakeMaker params
-	my $args = $self->makemaker_args;
-	$args->{DISTNAME} = $self->name;
-	$args->{NAME}     = $self->module_name || $self->name;
-	$args->{NAME}     =~ s/-/::/g;
-	$args->{VERSION}  = $self->version or die <<'EOT';
-ERROR: Can't determine distribution version. Please specify it
-explicitly via 'version' in Makefile.PL, or set a valid $VERSION
-in a module, and provide its file path via 'version_from' (or
-'all_from' if you prefer) in Makefile.PL.
-EOT
-
-	$DB::single = 1;
-	if ( $self->tests ) {
-		my @tests = split ' ', $self->tests;
-		my %seen;
-		$args->{test} = {
-			TESTS => (join ' ', grep {!$seen{$_}++} @tests),
-		};
-    } elsif ( $Module::Install::ExtraTests::use_extratests ) {
-        # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness.
-        # So, just ignore our xt tests here.
-	} elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
-		$args->{test} = {
-			TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
-		};
-	}
-	if ( $] >= 5.005 ) {
-		$args->{ABSTRACT} = $self->abstract;
-		$args->{AUTHOR}   = join ', ', @{$self->author || []};
-	}
-	if ( $self->makemaker(6.10) ) {
-		$args->{NO_META}   = 1;
-		#$args->{NO_MYMETA} = 1;
-	}
-	if ( $self->makemaker(6.17) and $self->sign ) {
-		$args->{SIGN} = 1;
-	}
-	unless ( $self->is_admin ) {
-		delete $args->{SIGN};
-	}
-	if ( $self->makemaker(6.31) and $self->license ) {
-		$args->{LICENSE} = $self->license;
-	}
-
-	my $prereq = ($args->{PREREQ_PM} ||= {});
-	%$prereq = ( %$prereq,
-		map { @$_ } # flatten [module => version]
-		map { @$_ }
-		grep $_,
-		($self->requires)
-	);
-
-	# Remove any reference to perl, PREREQ_PM doesn't support it
-	delete $args->{PREREQ_PM}->{perl};
-
-	# Merge both kinds of requires into BUILD_REQUIRES
-	my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
-	%$build_prereq = ( %$build_prereq,
-		map { @$_ } # flatten [module => version]
-		map { @$_ }
-		grep $_,
-		($self->configure_requires, $self->build_requires)
-	);
-
-	# Remove any reference to perl, BUILD_REQUIRES doesn't support it
-	delete $args->{BUILD_REQUIRES}->{perl};
-
-	# Delete bundled dists from prereq_pm, add it to Makefile DIR
-	my $subdirs = ($args->{DIR} || []);
-	if ($self->bundles) {
-		my %processed;
-		foreach my $bundle (@{ $self->bundles }) {
-			my ($mod_name, $dist_dir) = @$bundle;
-			delete $prereq->{$mod_name};
-			$dist_dir = File::Basename::basename($dist_dir); # dir for building this module
-			if (not exists $processed{$dist_dir}) {
-				if (-d $dist_dir) {
-					# List as sub-directory to be processed by make
-					push @$subdirs, $dist_dir;
-				}
-				# Else do nothing: the module is already present on the system
-				$processed{$dist_dir} = undef;
-			}
-		}
-	}
-
-	unless ( $self->makemaker('6.55_03') ) {
-		%$prereq = (%$prereq,%$build_prereq);
-		delete $args->{BUILD_REQUIRES};
-	}
-
-	if ( my $perl_version = $self->perl_version ) {
-		eval "use $perl_version; 1"
-			or die "ERROR: perl: Version $] is installed, "
-			. "but we need version >= $perl_version";
-
-		if ( $self->makemaker(6.48) ) {
-			$args->{MIN_PERL_VERSION} = $perl_version;
-		}
-	}
-
-	if ($self->installdirs) {
-		warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS};
-		$args->{INSTALLDIRS} = $self->installdirs;
-	}
-
-	my %args = map {
-		( $_ => $args->{$_} ) } grep {defined($args->{$_} )
-	} keys %$args;
-
-	my $user_preop = delete $args{dist}->{PREOP};
-	if ( my $preop = $self->admin->preop($user_preop) ) {
-		foreach my $key ( keys %$preop ) {
-			$args{dist}->{$key} = $preop->{$key};
-		}
-	}
-
-	my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
-	$self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
-}
-
-sub fix_up_makefile {
-	my $self          = shift;
-	my $makefile_name = shift;
-	my $top_class     = ref($self->_top) || '';
-	my $top_version   = $self->_top->VERSION || '';
-
-	my $preamble = $self->preamble
-		? "# Preamble by $top_class $top_version\n"
-			. $self->preamble
-		: '';
-	my $postamble = "# Postamble by $top_class $top_version\n"
-		. ($self->postamble || '');
-
-	local *MAKEFILE;
-	open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
-	eval { flock MAKEFILE, LOCK_EX };
-	my $makefile = do { local $/; <MAKEFILE> };
-
-	$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
-	$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
-	$makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
-	$makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
-	$makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
-
-	# Module::Install will never be used to build the Core Perl
-	# Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
-	# PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
-	$makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
-	#$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
-
-	# Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
-	$makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g;
-
-	# XXX - This is currently unused; not sure if it breaks other MM-users
-	# $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
-
-	seek MAKEFILE, 0, SEEK_SET;
-	truncate MAKEFILE, 0;
-	print MAKEFILE  "$preamble$makefile$postamble" or die $!;
-	close MAKEFILE  or die $!;
-
-	1;
-}
-
-sub preamble {
-	my ($self, $text) = @_;
-	$self->{preamble} = $text . $self->{preamble} if defined $text;
-	$self->{preamble};
-}
-
-sub postamble {
-	my ($self, $text) = @_;
-	$self->{postamble} ||= $self->admin->postamble;
-	$self->{postamble} .= $text if defined $text;
-	$self->{postamble}
-}
-
-1;
-
-__END__
-
-#line 541
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/Metadata.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Metadata.pm
deleted file mode 100644
index 3b01e09..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/Metadata.pm
+++ /dev/null
@@ -1,716 +0,0 @@
-#line 1
-package Module::Install::Metadata;
-
-use strict 'vars';
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.01';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-my @boolean_keys = qw{
-	sign
-};
-
-my @scalar_keys = qw{
-	name
-	module_name
-	abstract
-	version
-	distribution_type
-	tests
-	installdirs
-};
-
-my @tuple_keys = qw{
-	configure_requires
-	build_requires
-	requires
-	recommends
-	bundles
-	resources
-};
-
-my @resource_keys = qw{
-	homepage
-	bugtracker
-	repository
-};
-
-my @array_keys = qw{
-	keywords
-	author
-};
-
-*authors = \&author;
-
-sub Meta              { shift          }
-sub Meta_BooleanKeys  { @boolean_keys  }
-sub Meta_ScalarKeys   { @scalar_keys   }
-sub Meta_TupleKeys    { @tuple_keys    }
-sub Meta_ResourceKeys { @resource_keys }
-sub Meta_ArrayKeys    { @array_keys    }
-
-foreach my $key ( @boolean_keys ) {
-	*$key = sub {
-		my $self = shift;
-		if ( defined wantarray and not @_ ) {
-			return $self->{values}->{$key};
-		}
-		$self->{values}->{$key} = ( @_ ? $_[0] : 1 );
-		return $self;
-	};
-}
-
-foreach my $key ( @scalar_keys ) {
-	*$key = sub {
-		my $self = shift;
-		return $self->{values}->{$key} if defined wantarray and !@_;
-		$self->{values}->{$key} = shift;
-		return $self;
-	};
-}
-
-foreach my $key ( @array_keys ) {
-	*$key = sub {
-		my $self = shift;
-		return $self->{values}->{$key} if defined wantarray and !@_;
-		$self->{values}->{$key} ||= [];
-		push @{$self->{values}->{$key}}, @_;
-		return $self;
-	};
-}
-
-foreach my $key ( @resource_keys ) {
-	*$key = sub {
-		my $self = shift;
-		unless ( @_ ) {
-			return () unless $self->{values}->{resources};
-			return map  { $_->[1] }
-			       grep { $_->[0] eq $key }
-			       @{ $self->{values}->{resources} };
-		}
-		return $self->{values}->{resources}->{$key} unless @_;
-		my $uri = shift or die(
-			"Did not provide a value to $key()"
-		);
-		$self->resources( $key => $uri );
-		return 1;
-	};
-}
-
-foreach my $key ( grep { $_ ne "resources" } @tuple_keys) {
-	*$key = sub {
-		my $self = shift;
-		return $self->{values}->{$key} unless @_;
-		my @added;
-		while ( @_ ) {
-			my $module  = shift or last;
-			my $version = shift || 0;
-			push @added, [ $module, $version ];
-		}
-		push @{ $self->{values}->{$key} }, @added;
-		return map {@$_} @added;
-	};
-}
-
-# Resource handling
-my %lc_resource = map { $_ => 1 } qw{
-	homepage
-	license
-	bugtracker
-	repository
-};
-
-sub resources {
-	my $self = shift;
-	while ( @_ ) {
-		my $name  = shift or last;
-		my $value = shift or next;
-		if ( $name eq lc $name and ! $lc_resource{$name} ) {
-			die("Unsupported reserved lowercase resource '$name'");
-		}
-		$self->{values}->{resources} ||= [];
-		push @{ $self->{values}->{resources} }, [ $name, $value ];
-	}
-	$self->{values}->{resources};
-}
-
-# Aliases for build_requires that will have alternative
-# meanings in some future version of META.yml.
-sub test_requires     { shift->build_requires(@_) }
-sub install_requires  { shift->build_requires(@_) }
-
-# Aliases for installdirs options
-sub install_as_core   { $_[0]->installdirs('perl')   }
-sub install_as_cpan   { $_[0]->installdirs('site')   }
-sub install_as_site   { $_[0]->installdirs('site')   }
-sub install_as_vendor { $_[0]->installdirs('vendor') }
-
-sub dynamic_config {
-	my $self = shift;
-	unless ( @_ ) {
-		warn "You MUST provide an explicit true/false value to dynamic_config\n";
-		return $self;
-	}
-	$self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
-	return 1;
-}
-
-sub perl_version {
-	my $self = shift;
-	return $self->{values}->{perl_version} unless @_;
-	my $version = shift or die(
-		"Did not provide a value to perl_version()"
-	);
-
-	# Normalize the version
-	$version = $self->_perl_version($version);
-
-	# We don't support the reall old versions
-	unless ( $version >= 5.005 ) {
-		die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
-	}
-
-	$self->{values}->{perl_version} = $version;
-}
-
-sub all_from {
-	my ( $self, $file ) = @_;
-
-	unless ( defined($file) ) {
-		my $name = $self->name or die(
-			"all_from called with no args without setting name() first"
-		);
-		$file = join('/', 'lib', split(/-/, $name)) . '.pm';
-		$file =~ s{.*/}{} unless -e $file;
-		unless ( -e $file ) {
-			die("all_from cannot find $file from $name");
-		}
-	}
-	unless ( -f $file ) {
-		die("The path '$file' does not exist, or is not a file");
-	}
-
-	$self->{values}{all_from} = $file;
-
-	# Some methods pull from POD instead of code.
-	# If there is a matching .pod, use that instead
-	my $pod = $file;
-	$pod =~ s/\.pm$/.pod/i;
-	$pod = $file unless -e $pod;
-
-	# Pull the different values
-	$self->name_from($file)         unless $self->name;
-	$self->version_from($file)      unless $self->version;
-	$self->perl_version_from($file) unless $self->perl_version;
-	$self->author_from($pod)        unless @{$self->author || []};
-	$self->license_from($pod)       unless $self->license;
-	$self->abstract_from($pod)      unless $self->abstract;
-
-	return 1;
-}
-
-sub provides {
-	my $self     = shift;
-	my $provides = ( $self->{values}->{provides} ||= {} );
-	%$provides = (%$provides, @_) if @_;
-	return $provides;
-}
-
-sub auto_provides {
-	my $self = shift;
-	return $self unless $self->is_admin;
-	unless (-e 'MANIFEST') {
-		warn "Cannot deduce auto_provides without a MANIFEST, skipping\n";
-		return $self;
-	}
-	# Avoid spurious warnings as we are not checking manifest here.
-	local $SIG{__WARN__} = sub {1};
-	require ExtUtils::Manifest;
-	local *ExtUtils::Manifest::manicheck = sub { return };
-
-	require Module::Build;
-	my $build = Module::Build->new(
-		dist_name    => $self->name,
-		dist_version => $self->version,
-		license      => $self->license,
-	);
-	$self->provides( %{ $build->find_dist_packages || {} } );
-}
-
-sub feature {
-	my $self     = shift;
-	my $name     = shift;
-	my $features = ( $self->{values}->{features} ||= [] );
-	my $mods;
-
-	if ( @_ == 1 and ref( $_[0] ) ) {
-		# The user used ->feature like ->features by passing in the second
-		# argument as a reference.  Accomodate for that.
-		$mods = $_[0];
-	} else {
-		$mods = \@_;
-	}
-
-	my $count = 0;
-	push @$features, (
-		$name => [
-			map {
-				ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_
-			} @$mods
-		]
-	);
-
-	return @$features;
-}
-
-sub features {
-	my $self = shift;
-	while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
-		$self->feature( $name, @$mods );
-	}
-	return $self->{values}->{features}
-		? @{ $self->{values}->{features} }
-		: ();
-}
-
-sub no_index {
-	my $self = shift;
-	my $type = shift;
-	push @{ $self->{values}->{no_index}->{$type} }, @_ if $type;
-	return $self->{values}->{no_index};
-}
-
-sub read {
-	my $self = shift;
-	$self->include_deps( 'YAML::Tiny', 0 );
-
-	require YAML::Tiny;
-	my $data = YAML::Tiny::LoadFile('META.yml');
-
-	# Call methods explicitly in case user has already set some values.
-	while ( my ( $key, $value ) = each %$data ) {
-		next unless $self->can($key);
-		if ( ref $value eq 'HASH' ) {
-			while ( my ( $module, $version ) = each %$value ) {
-				$self->can($key)->($self, $module => $version );
-			}
-		} else {
-			$self->can($key)->($self, $value);
-		}
-	}
-	return $self;
-}
-
-sub write {
-	my $self = shift;
-	return $self unless $self->is_admin;
-	$self->admin->write_meta;
-	return $self;
-}
-
-sub version_from {
-	require ExtUtils::MM_Unix;
-	my ( $self, $file ) = @_;
-	$self->version( ExtUtils::MM_Unix->parse_version($file) );
-
-	# for version integrity check
-	$self->makemaker_args( VERSION_FROM => $file );
-}
-
-sub abstract_from {
-	require ExtUtils::MM_Unix;
-	my ( $self, $file ) = @_;
-	$self->abstract(
-		bless(
-			{ DISTNAME => $self->name },
-			'ExtUtils::MM_Unix'
-		)->parse_abstract($file)
-	);
-}
-
-# Add both distribution and module name
-sub name_from {
-	my ($self, $file) = @_;
-	if (
-		Module::Install::_read($file) =~ m/
-		^ \s*
-		package \s*
-		([\w:]+)
-		\s* ;
-		/ixms
-	) {
-		my ($name, $module_name) = ($1, $1);
-		$name =~ s{::}{-}g;
-		$self->name($name);
-		unless ( $self->module_name ) {
-			$self->module_name($module_name);
-		}
-	} else {
-		die("Cannot determine name from $file\n");
-	}
-}
-
-sub _extract_perl_version {
-	if (
-		$_[0] =~ m/
-		^\s*
-		(?:use|require) \s*
-		v?
-		([\d_\.]+)
-		\s* ;
-		/ixms
-	) {
-		my $perl_version = $1;
-		$perl_version =~ s{_}{}g;
-		return $perl_version;
-	} else {
-		return;
-	}
-}
-
-sub perl_version_from {
-	my $self = shift;
-	my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
-	if ($perl_version) {
-		$self->perl_version($perl_version);
-	} else {
-		warn "Cannot determine perl version info from $_[0]\n";
-		return;
-	}
-}
-
-sub author_from {
-	my $self    = shift;
-	my $content = Module::Install::_read($_[0]);
-	if ($content =~ m/
-		=head \d \s+ (?:authors?)\b \s*
-		([^\n]*)
-		|
-		=head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s*
-		.*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s*
-		([^\n]*)
-	/ixms) {
-		my $author = $1 || $2;
-
-		# XXX: ugly but should work anyway...
-		if (eval "require Pod::Escapes; 1") {
-			# Pod::Escapes has a mapping table.
-			# It's in core of perl >= 5.9.3, and should be installed
-			# as one of the Pod::Simple's prereqs, which is a prereq
-			# of Pod::Text 3.x (see also below).
-			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
-			{
-				defined $2
-				? chr($2)
-				: defined $Pod::Escapes::Name2character_number{$1}
-				? chr($Pod::Escapes::Name2character_number{$1})
-				: do {
-					warn "Unknown escape: E<$1>";
-					"E<$1>";
-				};
-			}gex;
-		}
-		elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) {
-			# Pod::Text < 3.0 has yet another mapping table,
-			# though the table name of 2.x and 1.x are different.
-			# (1.x is in core of Perl < 5.6, 2.x is in core of
-			# Perl < 5.9.3)
-			my $mapping = ($Pod::Text::VERSION < 2)
-				? \%Pod::Text::HTML_Escapes
-				: \%Pod::Text::ESCAPES;
-			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
-			{
-				defined $2
-				? chr($2)
-				: defined $mapping->{$1}
-				? $mapping->{$1}
-				: do {
-					warn "Unknown escape: E<$1>";
-					"E<$1>";
-				};
-			}gex;
-		}
-		else {
-			$author =~ s{E<lt>}{<}g;
-			$author =~ s{E<gt>}{>}g;
-		}
-		$self->author($author);
-	} else {
-		warn "Cannot determine author info from $_[0]\n";
-	}
-}
-
-#Stolen from M::B
-my %license_urls = (
-    perl         => 'http://dev.perl.org/licenses/',
-    apache       => 'http://apache.org/licenses/LICENSE-2.0',
-    apache_1_1   => 'http://apache.org/licenses/LICENSE-1.1',
-    artistic     => 'http://opensource.org/licenses/artistic-license.php',
-    artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
-    lgpl         => 'http://opensource.org/licenses/lgpl-license.php',
-    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
-    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
-    bsd          => 'http://opensource.org/licenses/bsd-license.php',
-    gpl          => 'http://opensource.org/licenses/gpl-license.php',
-    gpl2         => 'http://opensource.org/licenses/gpl-2.0.php',
-    gpl3         => 'http://opensource.org/licenses/gpl-3.0.html',
-    mit          => 'http://opensource.org/licenses/mit-license.php',
-    mozilla      => 'http://opensource.org/licenses/mozilla1.1.php',
-    open_source  => undef,
-    unrestricted => undef,
-    restrictive  => undef,
-    unknown      => undef,
-);
-
-sub license {
-	my $self = shift;
-	return $self->{values}->{license} unless @_;
-	my $license = shift or die(
-		'Did not provide a value to license()'
-	);
-	$license = __extract_license($license) || lc $license;
-	$self->{values}->{license} = $license;
-
-	# Automatically fill in license URLs
-	if ( $license_urls{$license} ) {
-		$self->resources( license => $license_urls{$license} );
-	}
-
-	return 1;
-}
-
-sub _extract_license {
-	my $pod = shift;
-	my $matched;
-	return __extract_license(
-		($matched) = $pod =~ m/
-			(=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?)
-			(=head \d.*|=cut.*|)\z
-		/xms
-	) || __extract_license(
-		($matched) = $pod =~ m/
-			(=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?)
-			(=head \d.*|=cut.*|)\z
-		/xms
-	);
-}
-
-sub __extract_license {
-	my $license_text = shift or return;
-	my @phrases      = (
-		'(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1,
-		'(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
-		'Artistic and GPL'                   => 'perl',         1,
-		'GNU general public license'         => 'gpl',          1,
-		'GNU public license'                 => 'gpl',          1,
-		'GNU lesser general public license'  => 'lgpl',         1,
-		'GNU lesser public license'          => 'lgpl',         1,
-		'GNU library general public license' => 'lgpl',         1,
-		'GNU library public license'         => 'lgpl',         1,
-		'GNU Free Documentation license'     => 'unrestricted', 1,
-		'GNU Affero General Public License'  => 'open_source',  1,
-		'(?:Free)?BSD license'               => 'bsd',          1,
-		'Artistic license 2\.0'              => 'artistic_2',   1,
-		'Artistic license'                   => 'artistic',     1,
-		'Apache (?:Software )?license'       => 'apache',       1,
-		'GPL'                                => 'gpl',          1,
-		'LGPL'                               => 'lgpl',         1,
-		'BSD'                                => 'bsd',          1,
-		'Artistic'                           => 'artistic',     1,
-		'MIT'                                => 'mit',          1,
-		'Mozilla Public License'             => 'mozilla',      1,
-		'Q Public License'                   => 'open_source',  1,
-		'OpenSSL License'                    => 'unrestricted', 1,
-		'SSLeay License'                     => 'unrestricted', 1,
-		'zlib License'                       => 'open_source',  1,
-		'proprietary'                        => 'proprietary',  0,
-	);
-	while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
-		$pattern =~ s#\s+#\\s+#gs;
-		if ( $license_text =~ /\b$pattern\b/i ) {
-			return $license;
-		}
-	}
-	return '';
-}
-
-sub license_from {
-	my $self = shift;
-	if (my $license=_extract_license(Module::Install::_read($_[0]))) {
-		$self->license($license);
-	} else {
-		warn "Cannot determine license info from $_[0]\n";
-		return 'unknown';
-	}
-}
-
-sub _extract_bugtracker {
-	my @links   = $_[0] =~ m#L<(
-	 https?\Q://rt.cpan.org/\E[^>]+|
-	 https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
-	 https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
-	 )>#gx;
-	my %links;
-	@links{@links}=();
-	@links=keys %links;
-	return @links;
-}
-
-sub bugtracker_from {
-	my $self    = shift;
-	my $content = Module::Install::_read($_[0]);
-	my @links   = _extract_bugtracker($content);
-	unless ( @links ) {
-		warn "Cannot determine bugtracker info from $_[0]\n";
-		return 0;
-	}
-	if ( @links > 1 ) {
-		warn "Found more than one bugtracker link in $_[0]\n";
-		return 0;
-	}
-
-	# Set the bugtracker
-	bugtracker( $links[0] );
-	return 1;
-}
-
-sub requires_from {
-	my $self     = shift;
-	my $content  = Module::Install::_readperl($_[0]);
-	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
-	while ( @requires ) {
-		my $module  = shift @requires;
-		my $version = shift @requires;
-		$self->requires( $module => $version );
-	}
-}
-
-sub test_requires_from {
-	my $self     = shift;
-	my $content  = Module::Install::_readperl($_[0]);
-	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
-	while ( @requires ) {
-		my $module  = shift @requires;
-		my $version = shift @requires;
-		$self->test_requires( $module => $version );
-	}
-}
-
-# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
-# numbers (eg, 5.006001 or 5.008009).
-# Also, convert double-part versions (eg, 5.8)
-sub _perl_version {
-	my $v = $_[-1];
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
-	$v =~ s/(\.\d\d\d)000$/$1/;
-	$v =~ s/_.+$//;
-	if ( ref($v) ) {
-		# Numify
-		$v = $v + 0;
-	}
-	return $v;
-}
-
-sub add_metadata {
-    my $self = shift;
-    my %hash = @_;
-    for my $key (keys %hash) {
-        warn "add_metadata: $key is not prefixed with 'x_'.\n" .
-             "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/;
-        $self->{values}->{$key} = $hash{$key};
-    }
-}
-
-
-######################################################################
-# MYMETA Support
-
-sub WriteMyMeta {
-	die "WriteMyMeta has been deprecated";
-}
-
-sub write_mymeta_yaml {
-	my $self = shift;
-
-	# We need YAML::Tiny to write the MYMETA.yml file
-	unless ( eval { require YAML::Tiny; 1; } ) {
-		return 1;
-	}
-
-	# Generate the data
-	my $meta = $self->_write_mymeta_data or return 1;
-
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.yml\n";
-	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
-}
-
-sub write_mymeta_json {
-	my $self = shift;
-
-	# We need JSON to write the MYMETA.json file
-	unless ( eval { require JSON; 1; } ) {
-		return 1;
-	}
-
-	# Generate the data
-	my $meta = $self->_write_mymeta_data or return 1;
-
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.json\n";
-	Module::Install::_write(
-		'MYMETA.json',
-		JSON->new->pretty(1)->canonical->encode($meta),
-	);
-}
-
-sub _write_mymeta_data {
-	my $self = shift;
-
-	# If there's no existing META.yml there is nothing we can do
-	return undef unless -f 'META.yml';
-
-	# We need Parse::CPAN::Meta to load the file
-	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
-		return undef;
-	}
-
-	# Merge the perl version into the dependencies
-	my $val  = $self->Meta->{values};
-	my $perl = delete $val->{perl_version};
-	if ( $perl ) {
-		$val->{requires} ||= [];
-		my $requires = $val->{requires};
-
-		# Canonize to three-dot version after Perl 5.6
-		if ( $perl >= 5.006 ) {
-			$perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e
-		}
-		unshift @$requires, [ perl => $perl ];
-	}
-
-	# Load the advisory META.yml file
-	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
-	my $meta = $yaml[0];
-
-	# Overwrite the non-configure dependency hashs
-	delete $meta->{requires};
-	delete $meta->{build_requires};
-	delete $meta->{recommends};
-	if ( exists $val->{requires} ) {
-		$meta->{requires} = { map { @$_ } @{ $val->{requires} } };
-	}
-	if ( exists $val->{build_requires} ) {
-		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
-	}
-
-	return $meta;
-}
-
-1;
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/TestBase.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/TestBase.pm
deleted file mode 100644
index e222ac1..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/TestBase.pm
+++ /dev/null
@@ -1,29 +0,0 @@
-#line 1
-package Module::Install::TestBase;
-use strict;
-use warnings;
-
-use Module::Install::Base;
-
-use vars qw($VERSION @ISA);
-BEGIN {
-    $VERSION = '0.60';
-    @ISA     = 'Module::Install::Base';
-}
-
-sub use_test_base {
-    my $self = shift;
-    $self->include('Test::Base');
-    $self->include('Test::Base::Filter');
-    $self->include('Spiffy');
-    $self->include('Test::More');
-    $self->include('Test::Builder');
-    $self->include('Test::Builder::Module');
-    $self->requires('Filter::Util::Call');
-}
-
-1;
-
-=encoding utf8
-
-#line 70
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/Win32.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/Win32.pm
deleted file mode 100644
index 3139a63..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/Win32.pm
+++ /dev/null
@@ -1,64 +0,0 @@
-#line 1
-package Module::Install::Win32;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.01';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-# determine if the user needs nmake, and download it if needed
-sub check_nmake {
-	my $self = shift;
-	$self->load('can_run');
-	$self->load('get_file');
-
-	require Config;
-	return unless (
-		$^O eq 'MSWin32'                     and
-		$Config::Config{make}                and
-		$Config::Config{make} =~ /^nmake\b/i and
-		! $self->can_run('nmake')
-	);
-
-	print "The required 'nmake' executable not found, fetching it...\n";
-
-	require File::Basename;
-	my $rv = $self->get_file(
-		url       => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
-		ftp_url   => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
-		local_dir => File::Basename::dirname($^X),
-		size      => 51928,
-		run       => 'Nmake15.exe /o > nul',
-		check_for => 'Nmake.exe',
-		remove    => 1,
-	);
-
-	die <<'END_MESSAGE' unless $rv;
-
--------------------------------------------------------------------------------
-
-Since you are using Microsoft Windows, you will need the 'nmake' utility
-before installation. It's available at:
-
-  http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe
-      or
-  ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe
-
-Please download the file manually, save it to a directory in %PATH% (e.g.
-C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to
-that directory, and run "Nmake15.exe" from there; that will create the
-'nmake.exe' file needed by this module.
-
-You may then resume the installation process described in README.
-
--------------------------------------------------------------------------------
-END_MESSAGE
-
-}
-
-1;
diff --git a/debian/modules/http-subs-filter/test/inc/Module/Install/WriteAll.pm b/debian/modules/http-subs-filter/test/inc/Module/Install/WriteAll.pm
deleted file mode 100644
index 1f724a7..0000000
--- a/debian/modules/http-subs-filter/test/inc/Module/Install/WriteAll.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-#line 1
-package Module::Install::WriteAll;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '1.01';
-	@ISA     = qw{Module::Install::Base};
-	$ISCORE  = 1;
-}
-
-sub WriteAll {
-	my $self = shift;
-	my %args = (
-		meta        => 1,
-		sign        => 0,
-		inline      => 0,
-		check_nmake => 1,
-		@_,
-	);
-
-	$self->sign(1)                if $args{sign};
-	$self->admin->WriteAll(%args) if $self->is_admin;
-
-	$self->check_nmake if $args{check_nmake};
-	unless ( $self->makemaker_args->{PL_FILES} ) {
-		# XXX: This still may be a bit over-defensive...
-		unless ($self->makemaker(6.25)) {
-			$self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL';
-		}
-	}
-
-	# Until ExtUtils::MakeMaker support MYMETA.yml, make sure
-	# we clean it up properly ourself.
-	$self->realclean_files('MYMETA.yml');
-
-	if ( $args{inline} ) {
-		$self->Inline->write;
-	} else {
-		$self->Makefile->write;
-	}
-
-	# The Makefile write process adds a couple of dependencies,
-	# so write the META.yml files after the Makefile.
-	if ( $args{meta} ) {
-		$self->Meta->write;
-	}
-
-	# Experimental support for MYMETA
-	if ( $ENV{X_MYMETA} ) {
-		if ( $ENV{X_MYMETA} eq 'JSON' ) {
-			$self->Meta->write_mymeta_json;
-		} else {
-			$self->Meta->write_mymeta_yaml;
-		}
-	}
-
-	return 1;
-}
-
-1;
diff --git a/debian/modules/http-subs-filter/test/inc/Spiffy.pm b/debian/modules/http-subs-filter/test/inc/Spiffy.pm
deleted file mode 100644
index 7b10f7a..0000000
--- a/debian/modules/http-subs-filter/test/inc/Spiffy.pm
+++ /dev/null
@@ -1,539 +0,0 @@
-#line 1
-package Spiffy;
-use strict;
-use 5.006001;
-use warnings;
-use Carp;
-require Exporter;
-our $VERSION = '0.30';
-our @EXPORT = ();
-our @EXPORT_BASE = qw(field const stub super);
-our @EXPORT_OK = (@EXPORT_BASE, qw(id WWW XXX YYY ZZZ));
-our %EXPORT_TAGS = (XXX => [qw(WWW XXX YYY ZZZ)]);
-
-my $stack_frame = 0; 
-my $dump = 'yaml';
-my $bases_map = {};
-
-sub WWW; sub XXX; sub YYY; sub ZZZ;
-
-# This line is here to convince "autouse" into believing we are autousable.
-sub can {
-    ($_[1] eq 'import' and caller()->isa('autouse'))
-        ? \&Exporter::import        # pacify autouse's equality test
-        : $_[0]->SUPER::can($_[1])  # normal case
-}
-
-# TODO
-#
-# Exported functions like field and super should be hidden so as not to
-# be confused with methods that can be inherited.
-#
-
-sub new {
-    my $class = shift;
-    $class = ref($class) || $class;
-    my $self = bless {}, $class;
-    while (@_) {
-        my $method = shift;
-        $self->$method(shift);
-    }
-    return $self;    
-}
-
-my $filtered_files = {};
-my $filter_dump = 0;
-my $filter_save = 0;
-our $filter_result = '';
-sub import {
-    no strict 'refs'; 
-    no warnings;
-    my $self_package = shift;
-
-    # XXX Using parse_arguments here might cause confusion, because the
-    # subclass's boolean_arguments and paired_arguments can conflict, causing
-    # difficult debugging. Consider using something truly local.
-    my ($args, @export_list) = do {
-        local *boolean_arguments = sub { 
-            qw(
-                -base -Base -mixin -selfless 
-                -XXX -dumper -yaml 
-                -filter_dump -filter_save
-            ) 
-        };
-        local *paired_arguments = sub { qw(-package) };
-        $self_package->parse_arguments(@_);
-    };
-    return spiffy_mixin_import(scalar(caller(0)), $self_package, @export_list)
-      if $args->{-mixin};
-
-    $filter_dump = 1 if $args->{-filter_dump};
-    $filter_save = 1 if $args->{-filter_save};
-    $dump = 'yaml' if $args->{-yaml};
-    $dump = 'dumper' if $args->{-dumper};
-
-    local @EXPORT_BASE = @EXPORT_BASE;
-
-    if ($args->{-XXX}) {
-        push @EXPORT_BASE, @{$EXPORT_TAGS{XXX}}
-          unless grep /^XXX$/, @EXPORT_BASE;
-    }
-
-    spiffy_filter() 
-      if ($args->{-selfless} or $args->{-Base}) and 
-         not $filtered_files->{(caller($stack_frame))[1]}++;
-
-    my $caller_package = $args->{-package} || caller($stack_frame);
-    push @{"$caller_package\::ISA"}, $self_package
-      if $args->{-Base} or $args->{-base};
-
-    for my $class (@{all_my_bases($self_package)}) {
-        next unless $class->isa('Spiffy');
-        my @export = grep {
-            not defined &{"$caller_package\::$_"};
-        } ( @{"$class\::EXPORT"}, 
-            ($args->{-Base} or $args->{-base})
-              ? @{"$class\::EXPORT_BASE"} : (),
-          );
-        my @export_ok = grep {
-            not defined &{"$caller_package\::$_"};
-        } @{"$class\::EXPORT_OK"};
-
-        # Avoid calling the expensive Exporter::export 
-        # if there is nothing to do (optimization)
-        my %exportable = map { ($_, 1) } @export, @export_ok;
-        next unless keys %exportable;
-
-        my @export_save = @{"$class\::EXPORT"};
-        my @export_ok_save = @{"$class\::EXPORT_OK"};
-        @{"$class\::EXPORT"} = @export;
-        @{"$class\::EXPORT_OK"} = @export_ok;
-        my @list = grep {
-            (my $v = $_) =~ s/^[\!\:]//;
-            $exportable{$v} or ${"$class\::EXPORT_TAGS"}{$v};
-        } @export_list;
-        Exporter::export($class, $caller_package, @list);
-        @{"$class\::EXPORT"} = @export_save;
-        @{"$class\::EXPORT_OK"} = @export_ok_save;
-    }
-}
-
-sub spiffy_filter {
-    require Filter::Util::Call;
-    my $done = 0;
-    Filter::Util::Call::filter_add(
-        sub {
-            return 0 if $done;
-            my ($data, $end) = ('', '');
-            while (my $status = Filter::Util::Call::filter_read()) {
-                return $status if $status < 0;
-                if (/^__(?:END|DATA)__\r?$/) {
-                    $end = $_;
-                    last;
-                }
-                $data .= $_;
-                $_ = '';
-            }
-            $_ = $data;
-            my @my_subs;
-            s[^(sub\s+\w+\s+\{)(.*\n)]
-             [${1}my \$self = shift;$2]gm;
-            s[^(sub\s+\w+)\s*\(\s*\)(\s+\{.*\n)]
-             [${1}${2}]gm;
-            s[^my\s+sub\s+(\w+)(\s+\{)(.*)((?s:.*?\n))\}\n]
-             [push @my_subs, $1; "\$$1 = sub$2my \$self = shift;$3$4\};\n"]gem;
-            my $preclare = '';
-            if (@my_subs) {
-                $preclare = join ',', map "\$$_", @my_subs;
-                $preclare = "my($preclare);";
-            }
-            $_ = "use strict;use warnings;$preclare${_};1;\n$end";
-            if ($filter_dump) { print; exit }
-            if ($filter_save) { $filter_result = $_; $_ = $filter_result; }
-            $done = 1;
-        }
-    );
-}
-
-sub base {
-    push @_, -base;
-    goto &import;
-}
-
-sub all_my_bases {
-    my $class = shift;
-
-    return $bases_map->{$class} 
-      if defined $bases_map->{$class};
-
-    my @bases = ($class);
-    no strict 'refs';
-    for my $base_class (@{"${class}::ISA"}) {
-        push @bases, @{all_my_bases($base_class)};
-    }
-    my $used = {};
-    $bases_map->{$class} = [grep {not $used->{$_}++} @bases];
-}
-
-my %code = ( 
-    sub_start => 
-      "sub {\n",
-    set_default => 
-      "  \$_[0]->{%s} = %s\n    unless exists \$_[0]->{%s};\n",
-    init =>
-      "  return \$_[0]->{%s} = do { my \$self = \$_[0]; %s }\n" .
-      "    unless \$#_ > 0 or defined \$_[0]->{%s};\n",
-    weak_init =>
-      "  return do {\n" .
-      "    \$_[0]->{%s} = do { my \$self = \$_[0]; %s };\n" .
-      "    Scalar::Util::weaken(\$_[0]->{%s}) if ref \$_[0]->{%s};\n" .
-      "    \$_[0]->{%s};\n" .
-      "  } unless \$#_ > 0 or defined \$_[0]->{%s};\n",
-    return_if_get => 
-      "  return \$_[0]->{%s} unless \$#_ > 0;\n",
-    set => 
-      "  \$_[0]->{%s} = \$_[1];\n",
-    weaken => 
-      "  Scalar::Util::weaken(\$_[0]->{%s}) if ref \$_[0]->{%s};\n",
-    sub_end => 
-      "  return \$_[0]->{%s};\n}\n",
-);
-
-sub field {
-    my $package = caller;
-    my ($args, @values) = do {
-        no warnings;
-        local *boolean_arguments = sub { (qw(-weak)) };
-        local *paired_arguments = sub { (qw(-package -init)) };
-        Spiffy->parse_arguments(@_);
-    };
-    my ($field, $default) = @values;
-    $package = $args->{-package} if defined $args->{-package};
-    die "Cannot have a default for a weakened field ($field)"
-        if defined $default && $args->{-weak};
-    return if defined &{"${package}::$field"};
-    require Scalar::Util if $args->{-weak};
-    my $default_string =
-        ( ref($default) eq 'ARRAY' and not @$default )
-        ? '[]'
-        : (ref($default) eq 'HASH' and not keys %$default )
-          ? '{}'
-          : default_as_code($default);
-
-    my $code = $code{sub_start};
-    if ($args->{-init}) {
-        my $fragment = $args->{-weak} ? $code{weak_init} : $code{init};
-        $code .= sprintf $fragment, $field, $args->{-init}, ($field) x 4;
-    }
-    $code .= sprintf $code{set_default}, $field, $default_string, $field
-      if defined $default;
-    $code .= sprintf $code{return_if_get}, $field;
-    $code .= sprintf $code{set}, $field;
-    $code .= sprintf $code{weaken}, $field, $field 
-      if $args->{-weak};
-    $code .= sprintf $code{sub_end}, $field;
-
-    my $sub = eval $code;
-    die $@ if $@;
-    no strict 'refs';
-    *{"${package}::$field"} = $sub;
-    return $code if defined wantarray;
-}
-
-sub default_as_code {
-    require Data::Dumper;
-    local $Data::Dumper::Sortkeys = 1;
-    my $code = Data::Dumper::Dumper(shift);
-    $code =~ s/^\$VAR1 = //;
-    $code =~ s/;$//;
-    return $code;
-}
-
-sub const {
-    my $package = caller;
-    my ($args, @values) = do {
-        no warnings;
-        local *paired_arguments = sub { (qw(-package)) };
-        Spiffy->parse_arguments(@_);
-    };
-    my ($field, $default) = @values;
-    $package = $args->{-package} if defined $args->{-package};
-    no strict 'refs';
-    return if defined &{"${package}::$field"};
-    *{"${package}::$field"} = sub { $default }
-}
-
-sub stub {
-    my $package = caller;
-    my ($args, @values) = do {
-        no warnings;
-        local *paired_arguments = sub { (qw(-package)) };
-        Spiffy->parse_arguments(@_);
-    };
-    my ($field, $default) = @values;
-    $package = $args->{-package} if defined $args->{-package};
-    no strict 'refs';
-    return if defined &{"${package}::$field"};
-    *{"${package}::$field"} = 
-    sub { 
-        require Carp;
-        Carp::confess 
-          "Method $field in package $package must be subclassed";
-    }
-}
-
-sub parse_arguments {
-    my $class = shift;
-    my ($args, @values) = ({}, ());
-    my %booleans = map { ($_, 1) } $class->boolean_arguments;
-    my %pairs = map { ($_, 1) } $class->paired_arguments;
-    while (@_) {
-        my $elem = shift;
-        if (defined $elem and defined $booleans{$elem}) {
-            $args->{$elem} = (@_ and $_[0] =~ /^[01]$/)
-            ? shift
-            : 1;
-        }
-        elsif (defined $elem and defined $pairs{$elem} and @_) {
-            $args->{$elem} = shift;
-        }
-        else {
-            push @values, $elem;
-        }
-    }
-    return wantarray ? ($args, @values) : $args;        
-}
-
-sub boolean_arguments { () }
-sub paired_arguments { () }
-
-# get a unique id for any node
-sub id {
-    if (not ref $_[0]) {
-        return 'undef' if not defined $_[0];
-        \$_[0] =~ /\((\w+)\)$/o or die;
-        return "$1-S";
-    }
-    require overload;
-    overload::StrVal($_[0]) =~ /\((\w+)\)$/o or die;
-    return $1;
-}
-
-#===============================================================================
-# It's super, man.
-#===============================================================================
-package DB;
-{
-    no warnings 'redefine';
-    sub super_args { 
-        my @dummy = caller(@_ ? $_[0] : 2); 
-        return @DB::args;
-    }
-}
-
-package Spiffy;
-sub super {
-    my $method;
-    my $frame = 1;
-    while ($method = (caller($frame++))[3]) {
-        $method =~ s/.*::// and last;
-    }
-    my @args = DB::super_args($frame);
-    @_ = @_ ? ($args[0], @_) : @args;
-    my $class = ref $_[0] ? ref $_[0] : $_[0];
-    my $caller_class = caller;
-    my $seen = 0;
-    my @super_classes = reverse grep {
-        ($seen or $seen = ($_ eq $caller_class)) ? 0 : 1;
-    } reverse @{all_my_bases($class)};
-    for my $super_class (@super_classes) {
-        no strict 'refs';
-        next if $super_class eq $class;
-        if (defined &{"${super_class}::$method"}) {
-            ${"$super_class\::AUTOLOAD"} = ${"$class\::AUTOLOAD"}
-              if $method eq 'AUTOLOAD';
-            return &{"${super_class}::$method"};
-        }
-    }
-    return;
-}
-
-#===============================================================================
-# This code deserves a spanking, because it is being very naughty.
-# It is exchanging base.pm's import() for its own, so that people
-# can use base.pm with Spiffy modules, without being the wiser.
-#===============================================================================
-my $real_base_import;
-my $real_mixin_import;
-
-BEGIN {
-    require base unless defined $INC{'base.pm'};
-    $INC{'mixin.pm'} ||= 'Spiffy/mixin.pm';
-    $real_base_import = \&base::import;
-    $real_mixin_import = \&mixin::import;
-    no warnings;
-    *base::import = \&spiffy_base_import;
-    *mixin::import = \&spiffy_mixin_import;
-}
-
-# my $i = 0;
-# while (my $caller = caller($i++)) {
-#     next unless $caller eq 'base' or $caller eq 'mixin';
-#     croak <<END;
-# Spiffy.pm must be loaded before calling 'use base' or 'use mixin' with a
-# Spiffy module. See the documentation of Spiffy.pm for details.
-# END
-# }
-
-sub spiffy_base_import {
-    my @base_classes = @_;
-    shift @base_classes;
-    no strict 'refs';
-    goto &$real_base_import
-      unless grep {
-          eval "require $_" unless %{"$_\::"};
-          $_->isa('Spiffy');
-      } @base_classes;
-    my $inheritor = caller(0);
-    for my $base_class (@base_classes) {
-        next if $inheritor->isa($base_class);
-        croak "Can't mix Spiffy and non-Spiffy classes in 'use base'.\n", 
-              "See the documentation of Spiffy.pm for details\n  "
-          unless $base_class->isa('Spiffy');
-        $stack_frame = 1; # tell import to use different caller
-        import($base_class, '-base');
-        $stack_frame = 0;
-    }
-}
-
-sub mixin {
-    my $self = shift;
-    my $target_class = ref($self);
-    spiffy_mixin_import($target_class, @_)
-}
-
-sub spiffy_mixin_import {
-    my $target_class = shift;
-    $target_class = caller(0)
-      if $target_class eq 'mixin';
-    my $mixin_class = shift
-      or die "Nothing to mixin";
-    eval "require $mixin_class";
-    my @roles = @_;
-    my $pseudo_class = join '-', $target_class, $mixin_class, @roles;
-    my %methods = spiffy_mixin_methods($mixin_class, @roles);
-    no strict 'refs';
-    no warnings;
-    @{"$pseudo_class\::ISA"} = @{"$target_class\::ISA"};
-    @{"$target_class\::ISA"} = ($pseudo_class);
-    for (keys %methods) {
-        *{"$pseudo_class\::$_"} = $methods{$_};
-    }
-}
-
-sub spiffy_mixin_methods {
-    my $mixin_class = shift;
-    no strict 'refs';
-    my %methods = spiffy_all_methods($mixin_class);
-    map {
-        $methods{$_}
-          ? ($_, \ &{"$methods{$_}\::$_"})
-          : ($_, \ &{"$mixin_class\::$_"})
-    } @_ 
-      ? (get_roles($mixin_class, @_))
-      : (keys %methods);
-}
-
-sub get_roles {
-    my $mixin_class = shift;
-    my @roles = @_;
-    while (grep /^!*:/, @roles) {
-        @roles = map {
-            s/!!//g;
-            /^!:(.*)/ ? do { 
-                my $m = "_role_$1"; 
-                map("!$_", $mixin_class->$m);
-            } :
-            /^:(.*)/ ? do {
-                my $m = "_role_$1"; 
-                ($mixin_class->$m);
-            } :
-            ($_)
-        } @roles;
-    }
-    if (@roles and $roles[0] =~ /^!/) {
-        my %methods = spiffy_all_methods($mixin_class);
-        unshift @roles, keys(%methods);
-    }
-    my %roles;
-    for (@roles) {
-        s/!!//g;
-        delete $roles{$1}, next
-          if /^!(.*)/;
-        $roles{$_} = 1;
-    }
-    keys %roles;
-}
-
-sub spiffy_all_methods {
-    no strict 'refs';
-    my $class = shift;
-    return if $class eq 'Spiffy';
-    my %methods = map {
-        ($_, $class)
-    } grep {
-        defined &{"$class\::$_"} and not /^_/
-    } keys %{"$class\::"};
-    my %super_methods;
-    %super_methods = spiffy_all_methods(${"$class\::ISA"}[0])
-      if @{"$class\::ISA"};
-    %{{%super_methods, %methods}};
-}
-
-
-# END of naughty code.
-#===============================================================================
-# Debugging support
-#===============================================================================
-sub spiffy_dump {
-    no warnings;
-    if ($dump eq 'dumper') {
-        require Data::Dumper;
-        $Data::Dumper::Sortkeys = 1;
-        $Data::Dumper::Indent = 1;
-        return Data::Dumper::Dumper(@_);
-    }
-    require YAML;
-    $YAML::UseVersion = 0;
-    return YAML::Dump(@_) . "...\n";
-}
-
-sub at_line_number {
-    my ($file_path, $line_number) = (caller(1))[1,2];
-    "  at $file_path line $line_number\n";
-}
-
-sub WWW {
-    warn spiffy_dump(@_) . at_line_number;
-    return wantarray ? @_ : $_[0];
-}
-
-sub XXX {
-    die spiffy_dump(@_) . at_line_number;
-}
-
-sub YYY {
-    print spiffy_dump(@_) . at_line_number;
-    return wantarray ? @_ : $_[0];
-}
-
-sub ZZZ {
-    require Carp;
-    Carp::confess spiffy_dump(@_);
-}
-
-1;
-
-__END__
-
-#line 1066
diff --git a/debian/modules/http-subs-filter/test/inc/Test/Base.pm b/debian/modules/http-subs-filter/test/inc/Test/Base.pm
deleted file mode 100644
index 8609584..0000000
--- a/debian/modules/http-subs-filter/test/inc/Test/Base.pm
+++ /dev/null
@@ -1,682 +0,0 @@
-#line 1
-package Test::Base;
-use 5.006001;
-use Spiffy 0.30 -Base;
-use Spiffy ':XXX';
-our $VERSION = '0.60';
-
-my @test_more_exports;
-BEGIN {
-    @test_more_exports = qw(
-        ok isnt like unlike is_deeply cmp_ok
-        skip todo_skip pass fail
-        eq_array eq_hash eq_set
-        plan can_ok isa_ok diag
-        use_ok
-        $TODO
-    );
-}
-
-use Test::More import => \@test_more_exports;
-use Carp;
-
-our @EXPORT = (@test_more_exports, qw(
-    is no_diff
-
-    blocks next_block first_block
-    delimiters spec_file spec_string 
-    filters filters_delay filter_arguments
-    run run_compare run_is run_is_deeply run_like run_unlike 
-    skip_all_unless_require is_deep run_is_deep
-    WWW XXX YYY ZZZ
-    tie_output no_diag_on_only
-
-    find_my_self default_object
-
-    croak carp cluck confess
-));
-
-field '_spec_file';
-field '_spec_string';
-field _filters => [qw(norm trim)];
-field _filters_map => {};
-field spec =>
-      -init => '$self->_spec_init';
-field block_list =>
-      -init => '$self->_block_list_init';
-field _next_list => [];
-field block_delim =>
-      -init => '$self->block_delim_default';
-field data_delim =>
-      -init => '$self->data_delim_default';
-field _filters_delay => 0;
-field _no_diag_on_only => 0;
-
-field block_delim_default => '===';
-field data_delim_default => '---';
-
-my $default_class;
-my $default_object;
-my $reserved_section_names = {};
-
-sub default_object { 
-    $default_object ||= $default_class->new;
-    return $default_object;
-}
-
-my $import_called = 0;
-sub import() {
-    $import_called = 1;
-    my $class = (grep /^-base$/i, @_) 
-    ? scalar(caller)
-    : $_[0];
-    if (not defined $default_class) {
-        $default_class = $class;
-    }
-#     else {
-#         croak "Can't use $class after using $default_class"
-#           unless $default_class->isa($class);
-#     }
-
-    unless (grep /^-base$/i, @_) {
-        my @args;
-        for (my $ii = 1; $ii <= $#_; ++$ii) {
-            if ($_[$ii] eq '-package') {
-                ++$ii;
-            } else {
-                push @args, $_[$ii];
-            }
-        }
-        Test::More->import(import => \@test_more_exports, @args)
-            if @args;
-     }
-    
-    _strict_warnings();
-    goto &Spiffy::import;
-}
-
-# Wrap Test::Builder::plan
-my $plan_code = \&Test::Builder::plan;
-my $Have_Plan = 0;
-{
-    no warnings 'redefine';
-    *Test::Builder::plan = sub {
-        $Have_Plan = 1;
-        goto &$plan_code;
-    };
-}
-
-my $DIED = 0;
-$SIG{__DIE__} = sub { $DIED = 1; die @_ };
-
-sub block_class  { $self->find_class('Block') }
-sub filter_class { $self->find_class('Filter') }
-
-sub find_class {
-    my $suffix = shift;
-    my $class = ref($self) . "::$suffix";
-    return $class if $class->can('new');
-    $class = __PACKAGE__ . "::$suffix";
-    return $class if $class->can('new');
-    eval "require $class";
-    return $class if $class->can('new');
-    die "Can't find a class for $suffix";
-}
-
-sub check_late {
-    if ($self->{block_list}) {
-        my $caller = (caller(1))[3];
-        $caller =~ s/.*:://;
-        croak "Too late to call $caller()"
-    }
-}
-
-sub find_my_self() {
-    my $self = ref($_[0]) eq $default_class
-    ? splice(@_, 0, 1)
-    : default_object();
-    return $self, @_;
-}
-
-sub blocks() {
-    (my ($self), @_) = find_my_self(@_);
-
-    croak "Invalid arguments passed to 'blocks'"
-      if @_ > 1;
-    croak sprintf("'%s' is invalid argument to blocks()", shift(@_))
-      if @_ && $_[0] !~ /^[a-zA-Z]\w*$/;
-
-    my $blocks = $self->block_list;
-    
-    my $section_name = shift || '';
-    my @blocks = $section_name
-    ? (grep { exists $_->{$section_name} } @$blocks)
-    : (@$blocks);
-
-    return scalar(@blocks) unless wantarray;
-    
-    return (@blocks) if $self->_filters_delay;
-
-    for my $block (@blocks) {
-        $block->run_filters
-          unless $block->is_filtered;
-    }
-
-    return (@blocks);
-}
-
-sub next_block() {
-    (my ($self), @_) = find_my_self(@_);
-    my $list = $self->_next_list;
-    if (@$list == 0) {
-        $list = [@{$self->block_list}, undef];
-        $self->_next_list($list);
-    }
-    my $block = shift @$list;
-    if (defined $block and not $block->is_filtered) {
-        $block->run_filters;
-    }
-    return $block;
-}
-
-sub first_block() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->_next_list([]);
-    $self->next_block;
-}
-
-sub filters_delay() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->_filters_delay(defined $_[0] ? shift : 1);
-}
-
-sub no_diag_on_only() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->_no_diag_on_only(defined $_[0] ? shift : 1);
-}
-
-sub delimiters() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->check_late;
-    my ($block_delimiter, $data_delimiter) = @_;
-    $block_delimiter ||= $self->block_delim_default;
-    $data_delimiter ||= $self->data_delim_default;
-    $self->block_delim($block_delimiter);
-    $self->data_delim($data_delimiter);
-    return $self;
-}
-
-sub spec_file() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->check_late;
-    $self->_spec_file(shift);
-    return $self;
-}
-
-sub spec_string() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->check_late;
-    $self->_spec_string(shift);
-    return $self;
-}
-
-sub filters() {
-    (my ($self), @_) = find_my_self(@_);
-    if (ref($_[0]) eq 'HASH') {
-        $self->_filters_map(shift);
-    }
-    else {    
-        my $filters = $self->_filters;
-        push @$filters, @_;
-    }
-    return $self;
-}
-
-sub filter_arguments() {
-    $Test::Base::Filter::arguments;
-}
-
-sub have_text_diff {
-    eval { require Text::Diff; 1 } &&
-        $Text::Diff::VERSION >= 0.35 &&
-        $Algorithm::Diff::VERSION >= 1.15;
-}
-
-sub is($$;$) {
-    (my ($self), @_) = find_my_self(@_);
-    my ($actual, $expected, $name) = @_;
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-    if ($ENV{TEST_SHOW_NO_DIFFS} or
-         not defined $actual or
-         not defined $expected or
-         $actual eq $expected or 
-         not($self->have_text_diff) or 
-         $expected !~ /\n./s
-    ) {
-        Test::More::is($actual, $expected, $name);
-    }
-    else {
-        $name = '' unless defined $name;
-        ok $actual eq $expected,
-           $name . "\n" . Text::Diff::diff(\$expected, \$actual);
-    }
-}
-
-sub run(&;$) {
-    (my ($self), @_) = find_my_self(@_);
-    my $callback = shift;
-    for my $block (@{$self->block_list}) {
-        $block->run_filters unless $block->is_filtered;
-        &{$callback}($block);
-    }
-}
-
-my $name_error = "Can't determine section names";
-sub _section_names {
-    return @_ if @_ == 2;
-    my $block = $self->first_block
-      or croak $name_error;
-    my @names = grep {
-        $_ !~ /^(ONLY|LAST|SKIP)$/;
-    } @{$block->{_section_order}[0] || []};
-    croak "$name_error. Need two sections in first block"
-      unless @names == 2;
-    return @names;
-}
-
-sub _assert_plan {
-    plan('no_plan') unless $Have_Plan;
-}
-
-sub END {
-    run_compare() unless $Have_Plan or $DIED or not $import_called;
-}
-
-sub run_compare() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->_assert_plan;
-    my ($x, $y) = $self->_section_names(@_);
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-    for my $block (@{$self->block_list}) {
-        next unless exists($block->{$x}) and exists($block->{$y});
-        $block->run_filters unless $block->is_filtered;
-        if (ref $block->$x) {
-            is_deeply($block->$x, $block->$y,
-                $block->name ? $block->name : ());
-        }
-        elsif (ref $block->$y eq 'Regexp') {
-            my $regexp = ref $y ? $y : $block->$y;
-            like($block->$x, $regexp, $block->name ? $block->name : ());
-        }
-        else {
-            is($block->$x, $block->$y, $block->name ? $block->name : ());
-        }
-    }
-}
-
-sub run_is() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->_assert_plan;
-    my ($x, $y) = $self->_section_names(@_);
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-    for my $block (@{$self->block_list}) {
-        next unless exists($block->{$x}) and exists($block->{$y});
-        $block->run_filters unless $block->is_filtered;
-        is($block->$x, $block->$y, 
-           $block->name ? $block->name : ()
-          );
-    }
-}
-
-sub run_is_deeply() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->_assert_plan;
-    my ($x, $y) = $self->_section_names(@_);
-    for my $block (@{$self->block_list}) {
-        next unless exists($block->{$x}) and exists($block->{$y});
-        $block->run_filters unless $block->is_filtered;
-        is_deeply($block->$x, $block->$y, 
-           $block->name ? $block->name : ()
-          );
-    }
-}
-
-sub run_like() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->_assert_plan;
-    my ($x, $y) = $self->_section_names(@_);
-    for my $block (@{$self->block_list}) {
-        next unless exists($block->{$x}) and defined($y);
-        $block->run_filters unless $block->is_filtered;
-        my $regexp = ref $y ? $y : $block->$y;
-        like($block->$x, $regexp,
-             $block->name ? $block->name : ()
-            );
-    }
-}
-
-sub run_unlike() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->_assert_plan;
-    my ($x, $y) = $self->_section_names(@_);
-    for my $block (@{$self->block_list}) {
-        next unless exists($block->{$x}) and defined($y);
-        $block->run_filters unless $block->is_filtered;
-        my $regexp = ref $y ? $y : $block->$y;
-        unlike($block->$x, $regexp,
-               $block->name ? $block->name : ()
-              );
-    }
-}
-
-sub skip_all_unless_require() {
-    (my ($self), @_) = find_my_self(@_);
-    my $module = shift;
-    eval "require $module; 1"
-        or Test::More::plan(
-            skip_all => "$module failed to load"
-        );
-}
-
-sub is_deep() {
-    (my ($self), @_) = find_my_self(@_);
-    require Test::Deep;
-    Test::Deep::cmp_deeply(@_);
-}
-
-sub run_is_deep() {
-    (my ($self), @_) = find_my_self(@_);
-    $self->_assert_plan;
-    my ($x, $y) = $self->_section_names(@_);
-    for my $block (@{$self->block_list}) {
-        next unless exists($block->{$x}) and exists($block->{$y});
-        $block->run_filters unless $block->is_filtered;
-        is_deep($block->$x, $block->$y, 
-           $block->name ? $block->name : ()
-          );
-    }
-}
-
-sub _pre_eval {
-    my $spec = shift;
-    return $spec unless $spec =~
-      s/\A\s*<<<(.*?)>>>\s*$//sm;
-    my $eval_code = $1;
-    eval "package main; $eval_code";
-    croak $@ if $@;
-    return $spec;
-}
-
-sub _block_list_init {
-    my $spec = $self->spec;
-    $spec = $self->_pre_eval($spec);
-    my $cd = $self->block_delim;
-    my @hunks = ($spec =~ /^(\Q${cd}\E.*?(?=^\Q${cd}\E|\z))/msg);
-    my $blocks = $self->_choose_blocks(@hunks);
-    $self->block_list($blocks); # Need to set early for possible filter use
-    my $seq = 1;
-    for my $block (@$blocks) {
-        $block->blocks_object($self);
-        $block->seq_num($seq++);
-    }
-    return $blocks;
-}
-
-sub _choose_blocks {
-    my $blocks = [];
-    for my $hunk (@_) {
-        my $block = $self->_make_block($hunk);
-        if (exists $block->{ONLY}) {
-            diag "I found ONLY: maybe you're debugging?"
-                unless $self->_no_diag_on_only;
-            return [$block];
-        }
-        next if exists $block->{SKIP};
-        push @$blocks, $block;
-        if (exists $block->{LAST}) {
-            return $blocks;
-        }
-    }
-    return $blocks;
-}
-
-sub _check_reserved {
-    my $id = shift;
-    croak "'$id' is a reserved name. Use something else.\n"
-      if $reserved_section_names->{$id} or
-         $id =~ /^_/;
-}
-
-sub _make_block {
-    my $hunk = shift;
-    my $cd = $self->block_delim;
-    my $dd = $self->data_delim;
-    my $block = $self->block_class->new;
-    $hunk =~ s/\A\Q${cd}\E[ \t]*(.*)\s+// or die;
-    my $name = $1;
-    my @parts = split /^\Q${dd}\E +\(?(\w+)\)? *(.*)?\n/m, $hunk;
-    my $description = shift @parts;
-    $description ||= '';
-    unless ($description =~ /\S/) {
-        $description = $name;
-    }
-    $description =~ s/\s*\z//;
-    $block->set_value(description => $description);
-    
-    my $section_map = {};
-    my $section_order = [];
-    while (@parts) {
-        my ($type, $filters, $value) = splice(@parts, 0, 3);
-        $self->_check_reserved($type);
-        $value = '' unless defined $value;
-        $filters = '' unless defined $filters;
-        if ($filters =~ /:(\s|\z)/) {
-            croak "Extra lines not allowed in '$type' section"
-              if $value =~ /\S/;
-            ($filters, $value) = split /\s*:(?:\s+|\z)/, $filters, 2;
-            $value = '' unless defined $value;
-            $value =~ s/^\s*(.*?)\s*$/$1/;
-        }
-        $section_map->{$type} = {
-            filters => $filters,
-        };
-        push @$section_order, $type;
-        $block->set_value($type, $value);
-    }
-    $block->set_value(name => $name);
-    $block->set_value(_section_map => $section_map);
-    $block->set_value(_section_order => $section_order);
-    return $block;
-}
-
-sub _spec_init {
-    return $self->_spec_string
-      if $self->_spec_string;
-    local $/;
-    my $spec;
-    if (my $spec_file = $self->_spec_file) {
-        open FILE, $spec_file or die $!;
-        $spec = <FILE>;
-        close FILE;
-    }
-    else {    
-        $spec = do { 
-            package main; 
-            no warnings 'once';
-            <DATA>;
-        };
-    }
-    return $spec;
-}
-
-sub _strict_warnings() {
-    require Filter::Util::Call;
-    my $done = 0;
-    Filter::Util::Call::filter_add(
-        sub {
-            return 0 if $done;
-            my ($data, $end) = ('', '');
-            while (my $status = Filter::Util::Call::filter_read()) {
-                return $status if $status < 0;
-                if (/^__(?:END|DATA)__\r?$/) {
-                    $end = $_;
-                    last;
-                }
-                $data .= $_;
-                $_ = '';
-            }
-            $_ = "use strict;use warnings;$data$end";
-            $done = 1;
-        }
-    );
-}
-
-sub tie_output() {
-    my $handle = shift;
-    die "No buffer to tie" unless @_;
-    tie *$handle, 'Test::Base::Handle', $_[0];
-}
-
-sub no_diff {
-    $ENV{TEST_SHOW_NO_DIFFS} = 1;
-}
-
-package Test::Base::Handle;
-
-sub TIEHANDLE() {
-    my $class = shift;
-    bless \ $_[0], $class;
-}
-
-sub PRINT {
-    $$self .= $_ for @_;
-}
-
-#===============================================================================
-# Test::Base::Block
-#
-# This is the default class for accessing a Test::Base block object.
-#===============================================================================
-package Test::Base::Block;
-our @ISA = qw(Spiffy);
-
-our @EXPORT = qw(block_accessor);
-
-sub AUTOLOAD {
-    return;
-}
-
-sub block_accessor() {
-    my $accessor = shift;
-    no strict 'refs';
-    return if defined &$accessor;
-    *$accessor = sub {
-        my $self = shift;
-        if (@_) {
-            Carp::croak "Not allowed to set values for '$accessor'";
-        }
-        my @list = @{$self->{$accessor} || []};
-        return wantarray
-        ? (@list)
-        : $list[0];
-    };
-}
-
-block_accessor 'name';
-block_accessor 'description';
-Spiffy::field 'seq_num';
-Spiffy::field 'is_filtered';
-Spiffy::field 'blocks_object';
-Spiffy::field 'original_values' => {};
-
-sub set_value {
-    no strict 'refs';
-    my $accessor = shift;
-    block_accessor $accessor
-      unless defined &$accessor;
-    $self->{$accessor} = [@_];
-}
-
-sub run_filters {
-    my $map = $self->_section_map;
-    my $order = $self->_section_order;
-    Carp::croak "Attempt to filter a block twice"
-      if $self->is_filtered;
-    for my $type (@$order) {
-        my $filters = $map->{$type}{filters};
-        my @value = $self->$type;
-        $self->original_values->{$type} = $value[0];
-        for my $filter ($self->_get_filters($type, $filters)) {
-            $Test::Base::Filter::arguments =
-              $filter =~ s/=(.*)$// ? $1 : undef;
-            my $function = "main::$filter";
-            no strict 'refs';
-            if (defined &$function) {
-                local $_ =
-                    (@value == 1 and not defined($value[0])) ? undef :
-                        join '', @value;
-                my $old = $_;
-                @value = &$function(@value);
-                if (not(@value) or 
-                    @value == 1 and defined($value[0]) and $value[0] =~ /\A(\d+|)\z/
-                ) {
-                    if ($value[0] && $_ eq $old) {
-                        Test::Base::diag("Filters returning numbers are supposed to do munging \$_: your filter '$function' apparently doesn't.");
-                    }
-                    @value = ($_);
-                }
-            }
-            else {
-                my $filter_object = $self->blocks_object->filter_class->new;
-                die "Can't find a function or method for '$filter' filter\n"
-                  unless $filter_object->can($filter);
-                $filter_object->current_block($self);
-                @value = $filter_object->$filter(@value);
-            }
-            # Set the value after each filter since other filters may be
-            # introspecting.
-            $self->set_value($type, @value);
-        }
-    }
-    $self->is_filtered(1);
-}
-
-sub _get_filters {
-    my $type = shift;
-    my $string = shift || '';
-    $string =~ s/\s*(.*?)\s*/$1/;
-    my @filters = ();
-    my $map_filters = $self->blocks_object->_filters_map->{$type} || [];
-    $map_filters = [ $map_filters ] unless ref $map_filters;
-    my @append = ();
-    for (
-        @{$self->blocks_object->_filters}, 
-        @$map_filters,
-        split(/\s+/, $string),
-    ) {
-        my $filter = $_;
-        last unless length $filter;
-        if ($filter =~ s/^-//) {
-            @filters = grep { $_ ne $filter } @filters;
-        }
-        elsif ($filter =~ s/^\+//) {
-            push @append, $filter;
-        }
-        else {
-            push @filters, $filter;
-        }
-    }
-    return @filters, @append;
-}
-
-{
-    %$reserved_section_names = map {
-        ($_, 1);
-    } keys(%Test::Base::Block::), qw( new DESTROY );
-}
-
-__DATA__
-
-=encoding utf8
-
-#line 1374
diff --git a/debian/modules/http-subs-filter/test/inc/Test/Base/Filter.pm b/debian/modules/http-subs-filter/test/inc/Test/Base/Filter.pm
deleted file mode 100644
index d7b116b..0000000
--- a/debian/modules/http-subs-filter/test/inc/Test/Base/Filter.pm
+++ /dev/null
@@ -1,341 +0,0 @@
-#line 1
-#===============================================================================
-# This is the default class for handling Test::Base data filtering.
-#===============================================================================
-package Test::Base::Filter;
-use Spiffy -Base;
-use Spiffy ':XXX';
-
-field 'current_block';
-
-our $arguments;
-sub current_arguments {
-    return undef unless defined $arguments;
-    my $args = $arguments;
-    $args =~ s/(\\s)/ /g;
-    $args =~ s/(\\[a-z])/'"' . $1 . '"'/gee;
-    return $args;
-}
-
-sub assert_scalar {
-    return if @_ == 1;
-    require Carp;
-    my $filter = (caller(1))[3];
-    $filter =~ s/.*:://;
-    Carp::croak "Input to the '$filter' filter must be a scalar, not a list";
-}
-
-sub _apply_deepest {
-    my $method = shift;
-    return () unless @_;
-    if (ref $_[0] eq 'ARRAY') {
-        for my $aref (@_) {
-            @$aref = $self->_apply_deepest($method, @$aref);
-        }
-        return @_;
-    }
-    $self->$method(@_);
-}
-
-sub _split_array {
-    map {
-        [$self->split($_)];
-    } @_;
-}
-
-sub _peel_deepest {
-    return () unless @_;
-    if (ref $_[0] eq 'ARRAY') {
-        if (ref $_[0]->[0] eq 'ARRAY') {
-            for my $aref (@_) {
-                @$aref = $self->_peel_deepest(@$aref);
-            }
-            return @_;
-        }
-        return map { $_->[0] } @_;
-    }
-    return @_;
-}
-
-#===============================================================================
-# these filters work on the leaves of nested arrays
-#===============================================================================
-sub Join { $self->_peel_deepest($self->_apply_deepest(join => @_)) }
-sub Reverse { $self->_apply_deepest(reverse => @_) }
-sub Split { $self->_apply_deepest(_split_array => @_) }
-sub Sort { $self->_apply_deepest(sort => @_) }
-
-
-sub append {
-    my $suffix = $self->current_arguments;
-    map { $_ . $suffix } @_;
-}
-
-sub array {
-    return [@_];
-}
-
-sub base64_decode {
-    $self->assert_scalar(@_);
-    require MIME::Base64;
-    MIME::Base64::decode_base64(shift);
-}
-
-sub base64_encode {
-    $self->assert_scalar(@_);
-    require MIME::Base64;
-    MIME::Base64::encode_base64(shift);
-}
-
-sub chomp {
-    map { CORE::chomp; $_ } @_;
-}
-
-sub chop {
-    map { CORE::chop; $_ } @_;
-}
-
-sub dumper {
-    no warnings 'once';
-    require Data::Dumper;
-    local $Data::Dumper::Sortkeys = 1;
-    local $Data::Dumper::Indent = 1;
-    local $Data::Dumper::Terse = 1;
-    Data::Dumper::Dumper(@_);
-}
-
-sub escape {
-    $self->assert_scalar(@_);
-    my $text = shift;
-    $text =~ s/(\\.)/eval "qq{$1}"/ge;
-    return $text;
-}
-
-sub eval {
-    $self->assert_scalar(@_);
-    my @return = CORE::eval(shift);
-    return $@ if $@;
-    return @return;
-}
-
-sub eval_all {
-    $self->assert_scalar(@_);
-    my $out = '';
-    my $err = '';
-    Test::Base::tie_output(*STDOUT, $out);
-    Test::Base::tie_output(*STDERR, $err);
-    my $return = CORE::eval(shift);
-    no warnings;
-    untie *STDOUT;
-    untie *STDERR;
-    return $return, $@, $out, $err;
-}
-
-sub eval_stderr {
-    $self->assert_scalar(@_);
-    my $output = '';
-    Test::Base::tie_output(*STDERR, $output);
-    CORE::eval(shift);
-    no warnings;
-    untie *STDERR;
-    return $output;
-}
-
-sub eval_stdout {
-    $self->assert_scalar(@_);
-    my $output = '';
-    Test::Base::tie_output(*STDOUT, $output);
-    CORE::eval(shift);
-    no warnings;
-    untie *STDOUT;
-    return $output;
-}
-
-sub exec_perl_stdout {
-    my $tmpfile = "/tmp/test-blocks-$$";
-    $self->_write_to($tmpfile, @_);
-    open my $execution, "$^X $tmpfile 2>&1 |"
-      or die "Couldn't open subprocess: $!\n";
-    local $/;
-    my $output = <$execution>;
-    close $execution;
-    unlink($tmpfile)
-      or die "Couldn't unlink $tmpfile: $!\n";
-    return $output;
-}
-
-sub flatten {
-    $self->assert_scalar(@_);
-    my $ref = shift;
-    if (ref($ref) eq 'HASH') {
-        return map {
-            ($_, $ref->{$_});
-        } sort keys %$ref;
-    }
-    if (ref($ref) eq 'ARRAY') {
-        return @$ref;
-    }
-    die "Can only flatten a hash or array ref";
-}
-
-sub get_url {
-    $self->assert_scalar(@_);
-    my $url = shift;
-    CORE::chomp($url);
-    require LWP::Simple;
-    LWP::Simple::get($url);
-}
-
-sub hash {
-    return +{ @_ };
-}
-
-sub head {
-    my $size = $self->current_arguments || 1;
-    return splice(@_, 0, $size);
-}
-
-sub join {
-    my $string = $self->current_arguments;
-    $string = '' unless defined $string;
-    CORE::join $string, @_;
-}
-
-sub lines {
-    $self->assert_scalar(@_);
-    my $text = shift;
-    return () unless length $text;
-    my @lines = ($text =~ /^(.*\n?)/gm);
-    return @lines;
-}
-
-sub norm {
-    $self->assert_scalar(@_);
-    my $text = shift;
-    $text = '' unless defined $text;
-    $text =~ s/\015\012/\n/g;
-    $text =~ s/\r/\n/g;
-    return $text;
-}
-
-sub prepend {
-    my $prefix = $self->current_arguments;
-    map { $prefix . $_ } @_;
-}
-
-sub read_file {
-    $self->assert_scalar(@_);
-    my $file = shift;
-    CORE::chomp $file;
-    open my $fh, $file
-      or die "Can't open '$file' for input:\n$!";
-    CORE::join '', <$fh>;
-}
-
-sub regexp {
-    $self->assert_scalar(@_);
-    my $text = shift;
-    my $flags = $self->current_arguments;
-    if ($text =~ /\n.*?\n/s) {
-        $flags = 'xism'
-          unless defined $flags;
-    }
-    else {
-        CORE::chomp($text);
-    }
-    $flags ||= '';
-    my $regexp = eval "qr{$text}$flags";
-    die $@ if $@;
-    return $regexp;
-}
-
-sub reverse {
-    CORE::reverse(@_);
-}
-
-sub slice {
-    die "Invalid args for slice"
-      unless $self->current_arguments =~ /^(\d+)(?:,(\d))?$/;
-    my ($x, $y) = ($1, $2);
-    $y = $x if not defined $y;
-    die "Invalid args for slice"
-      if $x > $y;
-    return splice(@_, $x, 1 + $y - $x);
-}
-
-sub sort {
-    CORE::sort(@_);
-}
-
-sub split {
-    $self->assert_scalar(@_);
-    my $separator = $self->current_arguments;
-    if (defined $separator and $separator =~ s{^/(.*)/$}{$1}) {
-        my $regexp = $1;
-        $separator = qr{$regexp};
-    }
-    $separator = qr/\s+/ unless $separator;
-    CORE::split $separator, shift;
-}
-
-sub strict {
-    $self->assert_scalar(@_);
-    <<'...' . shift;
-use strict;
-use warnings;
-...
-}
-
-sub tail {
-    my $size = $self->current_arguments || 1;
-    return splice(@_, @_ - $size, $size);
-}
-
-sub trim {
-    map {
-        s/\A([ \t]*\n)+//;
-        s/(?<=\n)\s*\z//g;
-        $_;
-    } @_;
-}
-
-sub unchomp {
-    map { $_ . "\n" } @_;
-}
-
-sub write_file {
-    my $file = $self->current_arguments
-      or die "No file specified for write_file filter";
-    if ($file =~ /(.*)[\\\/]/) {
-        my $dir = $1;
-        if (not -e $dir) {
-            require File::Path;
-            File::Path::mkpath($dir)
-              or die "Can't create $dir";
-        }
-    }
-    open my $fh, ">$file"
-      or die "Can't open '$file' for output\n:$!";
-    print $fh @_;
-    close $fh;
-    return $file;
-}
-
-sub yaml {
-    $self->assert_scalar(@_);
-    require YAML;
-    return YAML::Load(shift);
-}
-
-sub _write_to {
-    my $filename = shift;
-    open my $script, ">$filename"
-      or die "Couldn't open $filename: $!\n";
-    print $script @_;
-    close $script
-      or die "Couldn't close $filename: $!\n";
-}
-
-__DATA__
-
-#line 636
diff --git a/debian/modules/http-subs-filter/test/inc/Test/Builder.pm b/debian/modules/http-subs-filter/test/inc/Test/Builder.pm
deleted file mode 100644
index 14961dc..0000000
--- a/debian/modules/http-subs-filter/test/inc/Test/Builder.pm
+++ /dev/null
@@ -1,1413 +0,0 @@
-#line 1
-package Test::Builder;
-
-use 5.006;
-use strict;
-use warnings;
-
-our $VERSION = '0.92';
-$VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
-
-BEGIN {
-    if( $] < 5.008 ) {
-        require Test::Builder::IO::Scalar;
-    }
-}
-
-
-# Make Test::Builder thread-safe for ithreads.
-BEGIN {
-    use Config;
-    # Load threads::shared when threads are turned on.
-    # 5.8.0's threads are so busted we no longer support them.
-    if( $] >= 5.008001 && $Config{useithreads} && $INC{'threads.pm'} ) {
-        require threads::shared;
-
-        # Hack around YET ANOTHER threads::shared bug.  It would
-        # occassionally forget the contents of the variable when sharing it.
-        # So we first copy the data, then share, then put our copy back.
-        *share = sub (\[$@%]) {
-            my $type = ref $_[0];
-            my $data;
-
-            if( $type eq 'HASH' ) {
-                %$data = %{ $_[0] };
-            }
-            elsif( $type eq 'ARRAY' ) {
-                @$data = @{ $_[0] };
-            }
-            elsif( $type eq 'SCALAR' ) {
-                $$data = ${ $_[0] };
-            }
-            else {
-                die( "Unknown type: " . $type );
-            }
-
-            $_[0] = &threads::shared::share( $_[0] );
-
-            if( $type eq 'HASH' ) {
-                %{ $_[0] } = %$data;
-            }
-            elsif( $type eq 'ARRAY' ) {
-                @{ $_[0] } = @$data;
-            }
-            elsif( $type eq 'SCALAR' ) {
-                ${ $_[0] } = $$data;
-            }
-            else {
-                die( "Unknown type: " . $type );
-            }
-
-            return $_[0];
-        };
-    }
-    # 5.8.0's threads::shared is busted when threads are off
-    # and earlier Perls just don't have that module at all.
-    else {
-        *share = sub { return $_[0] };
-        *lock  = sub { 0 };
-    }
-}
-
-#line 117
-
-my $Test = Test::Builder->new;
-
-sub new {
-    my($class) = shift;
-    $Test ||= $class->create;
-    return $Test;
-}
-
-#line 139
-
-sub create {
-    my $class = shift;
-
-    my $self = bless {}, $class;
-    $self->reset;
-
-    return $self;
-}
-
-#line 158
-
-our $Level;
-
-sub reset {    ## no critic (Subroutines::ProhibitBuiltinHomonyms)
-    my($self) = @_;
-
-    # We leave this a global because it has to be localized and localizing
-    # hash keys is just asking for pain.  Also, it was documented.
-    $Level = 1;
-
-    $self->{Have_Plan}    = 0;
-    $self->{No_Plan}      = 0;
-    $self->{Have_Output_Plan} = 0;
-
-    $self->{Original_Pid} = $$;
-
-    share( $self->{Curr_Test} );
-    $self->{Curr_Test} = 0;
-    $self->{Test_Results} = &share( [] );
-
-    $self->{Exported_To}    = undef;
-    $self->{Expected_Tests} = 0;
-
-    $self->{Skip_All} = 0;
-
-    $self->{Use_Nums} = 1;
-
-    $self->{No_Header} = 0;
-    $self->{No_Ending} = 0;
-
-    $self->{Todo}       = undef;
-    $self->{Todo_Stack} = [];
-    $self->{Start_Todo} = 0;
-    $self->{Opened_Testhandles} = 0;
-
-    $self->_dup_stdhandles;
-
-    return;
-}
-
-#line 219
-
-my %plan_cmds = (
-    no_plan     => \&no_plan,
-    skip_all    => \&skip_all,
-    tests       => \&_plan_tests,
-);
-
-sub plan {
-    my( $self, $cmd, $arg ) = @_;
-
-    return unless $cmd;
-
-    local $Level = $Level + 1;
-
-    $self->croak("You tried to plan twice") if $self->{Have_Plan};
-
-    if( my $method = $plan_cmds{$cmd} ) {
-        local $Level = $Level + 1;
-        $self->$method($arg);
-    }
-    else {
-        my @args = grep { defined } ( $cmd, $arg );
-        $self->croak("plan() doesn't understand @args");
-    }
-
-    return 1;
-}
-
-
-sub _plan_tests {
-    my($self, $arg) = @_;
-
-    if($arg) {
-        local $Level = $Level + 1;
-        return $self->expected_tests($arg);
-    }
-    elsif( !defined $arg ) {
-        $self->croak("Got an undefined number of tests");
-    }
-    else {
-        $self->croak("You said to run 0 tests");
-    }
-
-    return;
-}
-
-
-#line 275
-
-sub expected_tests {
-    my $self = shift;
-    my($max) = @_;
-
-    if(@_) {
-        $self->croak("Number of tests must be a positive integer.  You gave it '$max'")
-          unless $max =~ /^\+?\d+$/;
-
-        $self->{Expected_Tests} = $max;
-        $self->{Have_Plan}      = 1;
-
-        $self->_output_plan($max) unless $self->no_header;
-    }
-    return $self->{Expected_Tests};
-}
-
-#line 299
-
-sub no_plan {
-    my($self, $arg) = @_;
-
-    $self->carp("no_plan takes no arguments") if $arg;
-
-    $self->{No_Plan}   = 1;
-    $self->{Have_Plan} = 1;
-
-    return 1;
-}
-
-
-#line 333
-
-sub _output_plan {
-    my($self, $max, $directive, $reason) = @_;
-
-    $self->carp("The plan was already output") if $self->{Have_Output_Plan};
-
-    my $plan = "1..$max";
-    $plan .= " # $directive" if defined $directive;
-    $plan .= " $reason"      if defined $reason;
-
-    $self->_print("$plan\n");
-
-    $self->{Have_Output_Plan} = 1;
-
-    return;
-}
-
-#line 384
-
-sub done_testing {
-    my($self, $num_tests) = @_;
-
-    # If done_testing() specified the number of tests, shut off no_plan.
-    if( defined $num_tests ) {
-        $self->{No_Plan} = 0;
-    }
-    else {
-        $num_tests = $self->current_test;
-    }
-
-    if( $self->{Done_Testing} ) {
-        my($file, $line) = @{$self->{Done_Testing}}[1,2];
-        $self->ok(0, "done_testing() was already called at $file line $line");
-        return;
-    }
-
-    $self->{Done_Testing} = [caller];
-
-    if( $self->expected_tests && $num_tests != $self->expected_tests ) {
-        $self->ok(0, "planned to run @{[ $self->expected_tests ]} ".
-                     "but done_testing() expects $num_tests");
-    }
-    else {
-        $self->{Expected_Tests} = $num_tests;
-    }
-
-    $self->_output_plan($num_tests) unless $self->{Have_Output_Plan};
-
-    $self->{Have_Plan} = 1;
-
-    return 1;
-}
-
-
-#line 429
-
-sub has_plan {
-    my $self = shift;
-
-    return( $self->{Expected_Tests} ) if $self->{Expected_Tests};
-    return('no_plan') if $self->{No_Plan};
-    return(undef);
-}
-
-#line 446
-
-sub skip_all {
-    my( $self, $reason ) = @_;
-
-    $self->{Skip_All} = 1;
-
-    $self->_output_plan(0, "SKIP", $reason) unless $self->no_header;
-    exit(0);
-}
-
-#line 468
-
-sub exported_to {
-    my( $self, $pack ) = @_;
-
-    if( defined $pack ) {
-        $self->{Exported_To} = $pack;
-    }
-    return $self->{Exported_To};
-}
-
-#line 498
-
-sub ok {
-    my( $self, $test, $name ) = @_;
-
-    # $test might contain an object which we don't want to accidentally
-    # store, so we turn it into a boolean.
-    $test = $test ? 1 : 0;
-
-    lock $self->{Curr_Test};
-    $self->{Curr_Test}++;
-
-    # In case $name is a string overloaded object, force it to stringify.
-    $self->_unoverload_str( \$name );
-
-    $self->diag(<<"ERR") if defined $name and $name =~ /^[\d\s]+$/;
-    You named your test '$name'.  You shouldn't use numbers for your test names.
-    Very confusing.
-ERR
-
-    # Capture the value of $TODO for the rest of this ok() call
-    # so it can more easily be found by other routines.
-    my $todo    = $self->todo();
-    my $in_todo = $self->in_todo;
-    local $self->{Todo} = $todo if $in_todo;
-
-    $self->_unoverload_str( \$todo );
-
-    my $out;
-    my $result = &share( {} );
-
-    unless($test) {
-        $out .= "not ";
-        @$result{ 'ok', 'actual_ok' } = ( ( $self->in_todo ? 1 : 0 ), 0 );
-    }
-    else {
-        @$result{ 'ok', 'actual_ok' } = ( 1, $test );
-    }
-
-    $out .= "ok";
-    $out .= " $self->{Curr_Test}" if $self->use_numbers;
-
-    if( defined $name ) {
-        $name =~ s|#|\\#|g;    # # in a name can confuse Test::Harness.
-        $out .= " - $name";
-        $result->{name} = $name;
-    }
-    else {
-        $result->{name} = '';
-    }
-
-    if( $self->in_todo ) {
-        $out .= " # TODO $todo";
-        $result->{reason} = $todo;
-        $result->{type}   = 'todo';
-    }
-    else {
-        $result->{reason} = '';
-        $result->{type}   = '';
-    }
-
-    $self->{Test_Results}[ $self->{Curr_Test} - 1 ] = $result;
-    $out .= "\n";
-
-    $self->_print($out);
-
-    unless($test) {
-        my $msg = $self->in_todo ? "Failed (TODO)" : "Failed";
-        $self->_print_to_fh( $self->_diag_fh, "\n" ) if $ENV{HARNESS_ACTIVE};
-
-        my( undef, $file, $line ) = $self->caller;
-        if( defined $name ) {
-            $self->diag(qq[  $msg test '$name'\n]);
-            $self->diag(qq[  at $file line $line.\n]);
-        }
-        else {
-            $self->diag(qq[  $msg test at $file line $line.\n]);
-        }
-    }
-
-    return $test ? 1 : 0;
-}
-
-sub _unoverload {
-    my $self = shift;
-    my $type = shift;
-
-    $self->_try(sub { require overload; }, die_on_fail => 1);
-
-    foreach my $thing (@_) {
-        if( $self->_is_object($$thing) ) {
-            if( my $string_meth = overload::Method( $$thing, $type ) ) {
-                $$thing = $$thing->$string_meth();
-            }
-        }
-    }
-
-    return;
-}
-
-sub _is_object {
-    my( $self, $thing ) = @_;
-
-    return $self->_try( sub { ref $thing && $thing->isa('UNIVERSAL') } ) ? 1 : 0;
-}
-
-sub _unoverload_str {
-    my $self = shift;
-
-    return $self->_unoverload( q[""], @_ );
-}
-
-sub _unoverload_num {
-    my $self = shift;
-
-    $self->_unoverload( '0+', @_ );
-
-    for my $val (@_) {
-        next unless $self->_is_dualvar($$val);
-        $$val = $$val + 0;
-    }
-
-    return;
-}
-
-# This is a hack to detect a dualvar such as $!
-sub _is_dualvar {
-    my( $self, $val ) = @_;
-
-    # Objects are not dualvars.
-    return 0 if ref $val;
-
-    no warnings 'numeric';
-    my $numval = $val + 0;
-    return $numval != 0 and $numval ne $val ? 1 : 0;
-}
-
-#line 649
-
-sub is_eq {
-    my( $self, $got, $expect, $name ) = @_;
-    local $Level = $Level + 1;
-
-    $self->_unoverload_str( \$got, \$expect );
-
-    if( !defined $got || !defined $expect ) {
-        # undef only matches undef and nothing else
-        my $test = !defined $got && !defined $expect;
-
-        $self->ok( $test, $name );
-        $self->_is_diag( $got, 'eq', $expect ) unless $test;
-        return $test;
-    }
-
-    return $self->cmp_ok( $got, 'eq', $expect, $name );
-}
-
-sub is_num {
-    my( $self, $got, $expect, $name ) = @_;
-    local $Level = $Level + 1;
-
-    $self->_unoverload_num( \$got, \$expect );
-
-    if( !defined $got || !defined $expect ) {
-        # undef only matches undef and nothing else
-        my $test = !defined $got && !defined $expect;
-
-        $self->ok( $test, $name );
-        $self->_is_diag( $got, '==', $expect ) unless $test;
-        return $test;
-    }
-
-    return $self->cmp_ok( $got, '==', $expect, $name );
-}
-
-sub _diag_fmt {
-    my( $self, $type, $val ) = @_;
-
-    if( defined $$val ) {
-        if( $type eq 'eq' or $type eq 'ne' ) {
-            # quote and force string context
-            $$val = "'$$val'";
-        }
-        else {
-            # force numeric context
-            $self->_unoverload_num($val);
-        }
-    }
-    else {
-        $$val = 'undef';
-    }
-
-    return;
-}
-
-sub _is_diag {
-    my( $self, $got, $type, $expect ) = @_;
-
-    $self->_diag_fmt( $type, $_ ) for \$got, \$expect;
-
-    local $Level = $Level + 1;
-    return $self->diag(<<"DIAGNOSTIC");
-         got: $got
-    expected: $expect
-DIAGNOSTIC
-
-}
-
-sub _isnt_diag {
-    my( $self, $got, $type ) = @_;
-
-    $self->_diag_fmt( $type, \$got );
-
-    local $Level = $Level + 1;
-    return $self->diag(<<"DIAGNOSTIC");
-         got: $got
-    expected: anything else
-DIAGNOSTIC
-}
-
-#line 746
-
-sub isnt_eq {
-    my( $self, $got, $dont_expect, $name ) = @_;
-    local $Level = $Level + 1;
-
-    if( !defined $got || !defined $dont_expect ) {
-        # undef only matches undef and nothing else
-        my $test = defined $got || defined $dont_expect;
-
-        $self->ok( $test, $name );
-        $self->_isnt_diag( $got, 'ne' ) unless $test;
-        return $test;
-    }
-
-    return $self->cmp_ok( $got, 'ne', $dont_expect, $name );
-}
-
-sub isnt_num {
-    my( $self, $got, $dont_expect, $name ) = @_;
-    local $Level = $Level + 1;
-
-    if( !defined $got || !defined $dont_expect ) {
-        # undef only matches undef and nothing else
-        my $test = defined $got || defined $dont_expect;
-
-        $self->ok( $test, $name );
-        $self->_isnt_diag( $got, '!=' ) unless $test;
-        return $test;
-    }
-
-    return $self->cmp_ok( $got, '!=', $dont_expect, $name );
-}
-
-#line 797
-
-sub like {
-    my( $self, $this, $regex, $name ) = @_;
-
-    local $Level = $Level + 1;
-    return $self->_regex_ok( $this, $regex, '=~', $name );
-}
-
-sub unlike {
-    my( $self, $this, $regex, $name ) = @_;
-
-    local $Level = $Level + 1;
-    return $self->_regex_ok( $this, $regex, '!~', $name );
-}
-
-#line 821
-
-my %numeric_cmps = map { ( $_, 1 ) } ( "<", "<=", ">", ">=", "==", "!=", "<=>" );
-
-sub cmp_ok {
-    my( $self, $got, $type, $expect, $name ) = @_;
-
-    my $test;
-    my $error;
-    {
-        ## no critic (BuiltinFunctions::ProhibitStringyEval)
-
-        local( $@, $!, $SIG{__DIE__} );    # isolate eval
-
-        my($pack, $file, $line) = $self->caller();
-
-        $test = eval qq[
-#line 1 "cmp_ok [from $file line $line]"
-\$got $type \$expect;
-];
-        $error = $@;
-    }
-    local $Level = $Level + 1;
-    my $ok = $self->ok( $test, $name );
-
-    # Treat overloaded objects as numbers if we're asked to do a
-    # numeric comparison.
-    my $unoverload
-      = $numeric_cmps{$type}
-      ? '_unoverload_num'
-      : '_unoverload_str';
-
-    $self->diag(<<"END") if $error;
-An error occurred while using $type:
-------------------------------------
-$error
-------------------------------------
-END
-
-    unless($ok) {
-        $self->$unoverload( \$got, \$expect );
-
-        if( $type =~ /^(eq|==)$/ ) {
-            $self->_is_diag( $got, $type, $expect );
-        }
-        elsif( $type =~ /^(ne|!=)$/ ) {
-            $self->_isnt_diag( $got, $type );
-        }
-        else {
-            $self->_cmp_diag( $got, $type, $expect );
-        }
-    }
-    return $ok;
-}
-
-sub _cmp_diag {
-    my( $self, $got, $type, $expect ) = @_;
-
-    $got    = defined $got    ? "'$got'"    : 'undef';
-    $expect = defined $expect ? "'$expect'" : 'undef';
-
-    local $Level = $Level + 1;
-    return $self->diag(<<"DIAGNOSTIC");
-    $got
-        $type
-    $expect
-DIAGNOSTIC
-}
-
-sub _caller_context {
-    my $self = shift;
-
-    my( $pack, $file, $line ) = $self->caller(1);
-
-    my $code = '';
-    $code .= "#line $line $file\n" if defined $file and defined $line;
-
-    return $code;
-}
-
-#line 920
-
-sub BAIL_OUT {
-    my( $self, $reason ) = @_;
-
-    $self->{Bailed_Out} = 1;
-    $self->_print("Bail out!  $reason");
-    exit 255;
-}
-
-#line 933
-
-*BAILOUT = \&BAIL_OUT;
-
-#line 944
-
-sub skip {
-    my( $self, $why ) = @_;
-    $why ||= '';
-    $self->_unoverload_str( \$why );
-
-    lock( $self->{Curr_Test} );
-    $self->{Curr_Test}++;
-
-    $self->{Test_Results}[ $self->{Curr_Test} - 1 ] = &share(
-        {
-            'ok'      => 1,
-            actual_ok => 1,
-            name      => '',
-            type      => 'skip',
-            reason    => $why,
-        }
-    );
-
-    my $out = "ok";
-    $out .= " $self->{Curr_Test}" if $self->use_numbers;
-    $out .= " # skip";
-    $out .= " $why"               if length $why;
-    $out .= "\n";
-
-    $self->_print($out);
-
-    return 1;
-}
-
-#line 985
-
-sub todo_skip {
-    my( $self, $why ) = @_;
-    $why ||= '';
-
-    lock( $self->{Curr_Test} );
-    $self->{Curr_Test}++;
-
-    $self->{Test_Results}[ $self->{Curr_Test} - 1 ] = &share(
-        {
-            'ok'      => 1,
-            actual_ok => 0,
-            name      => '',
-            type      => 'todo_skip',
-            reason    => $why,
-        }
-    );
-
-    my $out = "not ok";
-    $out .= " $self->{Curr_Test}" if $self->use_numbers;
-    $out .= " # TODO & SKIP $why\n";
-
-    $self->_print($out);
-
-    return 1;
-}
-
-#line 1062
-
-sub maybe_regex {
-    my( $self, $regex ) = @_;
-    my $usable_regex = undef;
-
-    return $usable_regex unless defined $regex;
-
-    my( $re, $opts );
-
-    # Check for qr/foo/
-    if( _is_qr($regex) ) {
-        $usable_regex = $regex;
-    }
-    # Check for '/foo/' or 'm,foo,'
-    elsif(( $re, $opts )        = $regex =~ m{^ /(.*)/ (\w*) $ }sx              or
-          ( undef, $re, $opts ) = $regex =~ m,^ m([^\w\s]) (.+) \1 (\w*) $,sx
-    )
-    {
-        $usable_regex = length $opts ? "(?$opts)$re" : $re;
-    }
-
-    return $usable_regex;
-}
-
-sub _is_qr {
-    my $regex = shift;
-
-    # is_regexp() checks for regexes in a robust manner, say if they're
-    # blessed.
-    return re::is_regexp($regex) if defined &re::is_regexp;
-    return ref $regex eq 'Regexp';
-}
-
-sub _regex_ok {
-    my( $self, $this, $regex, $cmp, $name ) = @_;
-
-    my $ok           = 0;
-    my $usable_regex = $self->maybe_regex($regex);
-    unless( defined $usable_regex ) {
-        local $Level = $Level + 1;
-        $ok = $self->ok( 0, $name );
-        $self->diag("    '$regex' doesn't look much like a regex to me.");
-        return $ok;
-    }
-
-    {
-        ## no critic (BuiltinFunctions::ProhibitStringyEval)
-
-        my $test;
-        my $code = $self->_caller_context;
-
-        local( $@, $!, $SIG{__DIE__} );    # isolate eval
-
-        # Yes, it has to look like this or 5.4.5 won't see the #line
-        # directive.
-        # Don't ask me, man, I just work here.
-        $test = eval "
-$code" . q{$test = $this =~ /$usable_regex/ ? 1 : 0};
-
-        $test = !$test if $cmp eq '!~';
-
-        local $Level = $Level + 1;
-        $ok = $self->ok( $test, $name );
-    }
-
-    unless($ok) {
-        $this = defined $this ? "'$this'" : 'undef';
-        my $match = $cmp eq '=~' ? "doesn't match" : "matches";
-
-        local $Level = $Level + 1;
-        $self->diag( sprintf <<'DIAGNOSTIC', $this, $match, $regex );
-                  %s
-    %13s '%s'
-DIAGNOSTIC
-
-    }
-
-    return $ok;
-}
-
-# I'm not ready to publish this.  It doesn't deal with array return
-# values from the code or context.
-
-#line 1162
-
-sub _try {
-    my( $self, $code, %opts ) = @_;
-
-    my $error;
-    my $return;
-    {
-        local $!;               # eval can mess up $!
-        local $@;               # don't set $@ in the test
-        local $SIG{__DIE__};    # don't trip an outside DIE handler.
-        $return = eval { $code->() };
-        $error = $@;
-    }
-
-    die $error if $error and $opts{die_on_fail};
-
-    return wantarray ? ( $return, $error ) : $return;
-}
-
-#line 1191
-
-sub is_fh {
-    my $self     = shift;
-    my $maybe_fh = shift;
-    return 0 unless defined $maybe_fh;
-
-    return 1 if ref $maybe_fh  eq 'GLOB';    # its a glob ref
-    return 1 if ref \$maybe_fh eq 'GLOB';    # its a glob
-
-    return eval { $maybe_fh->isa("IO::Handle") } ||
-           # 5.5.4's tied() and can() doesn't like getting undef
-           eval { ( tied($maybe_fh) || '' )->can('TIEHANDLE') };
-}
-
-#line 1235
-
-sub level {
-    my( $self, $level ) = @_;
-
-    if( defined $level ) {
-        $Level = $level;
-    }
-    return $Level;
-}
-
-#line 1267
-
-sub use_numbers {
-    my( $self, $use_nums ) = @_;
-
-    if( defined $use_nums ) {
-        $self->{Use_Nums} = $use_nums;
-    }
-    return $self->{Use_Nums};
-}
-
-#line 1300
-
-foreach my $attribute (qw(No_Header No_Ending No_Diag)) {
-    my $method = lc $attribute;
-
-    my $code = sub {
-        my( $self, $no ) = @_;
-
-        if( defined $no ) {
-            $self->{$attribute} = $no;
-        }
-        return $self->{$attribute};
-    };
-
-    no strict 'refs';    ## no critic
-    *{ __PACKAGE__ . '::' . $method } = $code;
-}
-
-#line 1353
-
-sub diag {
-    my $self = shift;
-
-    $self->_print_comment( $self->_diag_fh, @_ );
-}
-
-#line 1368
-
-sub note {
-    my $self = shift;
-
-    $self->_print_comment( $self->output, @_ );
-}
-
-sub _diag_fh {
-    my $self = shift;
-
-    local $Level = $Level + 1;
-    return $self->in_todo ? $self->todo_output : $self->failure_output;
-}
-
-sub _print_comment {
-    my( $self, $fh, @msgs ) = @_;
-
-    return if $self->no_diag;
-    return unless @msgs;
-
-    # Prevent printing headers when compiling (i.e. -c)
-    return if $^C;
-
-    # Smash args together like print does.
-    # Convert undef to 'undef' so its readable.
-    my $msg = join '', map { defined($_) ? $_ : 'undef' } @msgs;
-
-    # Escape the beginning, _print will take care of the rest.
-    $msg =~ s/^/# /;
-
-    local $Level = $Level + 1;
-    $self->_print_to_fh( $fh, $msg );
-
-    return 0;
-}
-
-#line 1418
-
-sub explain {
-    my $self = shift;
-
-    return map {
-        ref $_
-          ? do {
-            $self->_try(sub { require Data::Dumper }, die_on_fail => 1);
-
-            my $dumper = Data::Dumper->new( [$_] );
-            $dumper->Indent(1)->Terse(1);
-            $dumper->Sortkeys(1) if $dumper->can("Sortkeys");
-            $dumper->Dump;
-          }
-          : $_
-    } @_;
-}
-
-#line 1447
-
-sub _print {
-    my $self = shift;
-    return $self->_print_to_fh( $self->output, @_ );
-}
-
-sub _print_to_fh {
-    my( $self, $fh, @msgs ) = @_;
-
-    # Prevent printing headers when only compiling.  Mostly for when
-    # tests are deparsed with B::Deparse
-    return if $^C;
-
-    my $msg = join '', @msgs;
-
-    local( $\, $", $, ) = ( undef, ' ', '' );
-
-    # Escape each line after the first with a # so we don't
-    # confuse Test::Harness.
-    $msg =~ s{\n(?!\z)}{\n# }sg;
-
-    # Stick a newline on the end if it needs it.
-    $msg .= "\n" unless $msg =~ /\n\z/;
-
-    return print $fh $msg;
-}
-
-#line 1506
-
-sub output {
-    my( $self, $fh ) = @_;
-
-    if( defined $fh ) {
-        $self->{Out_FH} = $self->_new_fh($fh);
-    }
-    return $self->{Out_FH};
-}
-
-sub failure_output {
-    my( $self, $fh ) = @_;
-
-    if( defined $fh ) {
-        $self->{Fail_FH} = $self->_new_fh($fh);
-    }
-    return $self->{Fail_FH};
-}
-
-sub todo_output {
-    my( $self, $fh ) = @_;
-
-    if( defined $fh ) {
-        $self->{Todo_FH} = $self->_new_fh($fh);
-    }
-    return $self->{Todo_FH};
-}
-
-sub _new_fh {
-    my $self = shift;
-    my($file_or_fh) = shift;
-
-    my $fh;
-    if( $self->is_fh($file_or_fh) ) {
-        $fh = $file_or_fh;
-    }
-    elsif( ref $file_or_fh eq 'SCALAR' ) {
-        # Scalar refs as filehandles was added in 5.8.
-        if( $] >= 5.008 ) {
-            open $fh, ">>", $file_or_fh
-              or $self->croak("Can't open scalar ref $file_or_fh: $!");
-        }
-        # Emulate scalar ref filehandles with a tie.
-        else {
-            $fh = Test::Builder::IO::Scalar->new($file_or_fh)
-              or $self->croak("Can't tie scalar ref $file_or_fh");
-        }
-    }
-    else {
-        open $fh, ">", $file_or_fh
-          or $self->croak("Can't open test output log $file_or_fh: $!");
-        _autoflush($fh);
-    }
-
-    return $fh;
-}
-
-sub _autoflush {
-    my($fh) = shift;
-    my $old_fh = select $fh;
-    $| = 1;
-    select $old_fh;
-
-    return;
-}
-
-my( $Testout, $Testerr );
-
-sub _dup_stdhandles {
-    my $self = shift;
-
-    $self->_open_testhandles;
-
-    # Set everything to unbuffered else plain prints to STDOUT will
-    # come out in the wrong order from our own prints.
-    _autoflush($Testout);
-    _autoflush( \*STDOUT );
-    _autoflush($Testerr);
-    _autoflush( \*STDERR );
-
-    $self->reset_outputs;
-
-    return;
-}
-
-sub _open_testhandles {
-    my $self = shift;
-
-    return if $self->{Opened_Testhandles};
-
-    # We dup STDOUT and STDERR so people can change them in their
-    # test suites while still getting normal test output.
-    open( $Testout, ">&STDOUT" ) or die "Can't dup STDOUT:  $!";
-    open( $Testerr, ">&STDERR" ) or die "Can't dup STDERR:  $!";
-
-    #    $self->_copy_io_layers( \*STDOUT, $Testout );
-    #    $self->_copy_io_layers( \*STDERR, $Testerr );
-
-    $self->{Opened_Testhandles} = 1;
-
-    return;
-}
-
-sub _copy_io_layers {
-    my( $self, $src, $dst ) = @_;
-
-    $self->_try(
-        sub {
-            require PerlIO;
-            my @src_layers = PerlIO::get_layers($src);
-
-            binmode $dst, join " ", map ":$_", @src_layers if @src_layers;
-        }
-    );
-
-    return;
-}
-
-#line 1631
-
-sub reset_outputs {
-    my $self = shift;
-
-    $self->output        ($Testout);
-    $self->failure_output($Testerr);
-    $self->todo_output   ($Testout);
-
-    return;
-}
-
-#line 1657
-
-sub _message_at_caller {
-    my $self = shift;
-
-    local $Level = $Level + 1;
-    my( $pack, $file, $line ) = $self->caller;
-    return join( "", @_ ) . " at $file line $line.\n";
-}
-
-sub carp {
-    my $self = shift;
-    return warn $self->_message_at_caller(@_);
-}
-
-sub croak {
-    my $self = shift;
-    return die $self->_message_at_caller(@_);
-}
-
-
-#line 1697
-
-sub current_test {
-    my( $self, $num ) = @_;
-
-    lock( $self->{Curr_Test} );
-    if( defined $num ) {
-        $self->{Curr_Test} = $num;
-
-        # If the test counter is being pushed forward fill in the details.
-        my $test_results = $self->{Test_Results};
-        if( $num > @$test_results ) {
-            my $start = @$test_results ? @$test_results : 0;
-            for( $start .. $num - 1 ) {
-                $test_results->[$_] = &share(
-                    {
-                        'ok'      => 1,
-                        actual_ok => undef,
-                        reason    => 'incrementing test number',
-                        type      => 'unknown',
-                        name      => undef
-                    }
-                );
-            }
-        }
-        # If backward, wipe history.  Its their funeral.
-        elsif( $num < @$test_results ) {
-            $#{$test_results} = $num - 1;
-        }
-    }
-    return $self->{Curr_Test};
-}
-
-#line 1739
-
-sub summary {
-    my($self) = shift;
-
-    return map { $_->{'ok'} } @{ $self->{Test_Results} };
-}
-
-#line 1794
-
-sub details {
-    my $self = shift;
-    return @{ $self->{Test_Results} };
-}
-
-#line 1823
-
-sub todo {
-    my( $self, $pack ) = @_;
-
-    return $self->{Todo} if defined $self->{Todo};
-
-    local $Level = $Level + 1;
-    my $todo = $self->find_TODO($pack);
-    return $todo if defined $todo;
-
-    return '';
-}
-
-#line 1845
-
-sub find_TODO {
-    my( $self, $pack ) = @_;
-
-    $pack = $pack || $self->caller(1) || $self->exported_to;
-    return unless $pack;
-
-    no strict 'refs';    ## no critic
-    return ${ $pack . '::TODO' };
-}
-
-#line 1863
-
-sub in_todo {
-    my $self = shift;
-
-    local $Level = $Level + 1;
-    return( defined $self->{Todo} || $self->find_TODO ) ? 1 : 0;
-}
-
-#line 1913
-
-sub todo_start {
-    my $self = shift;
-    my $message = @_ ? shift : '';
-
-    $self->{Start_Todo}++;
-    if( $self->in_todo ) {
-        push @{ $self->{Todo_Stack} } => $self->todo;
-    }
-    $self->{Todo} = $message;
-
-    return;
-}
-
-#line 1935
-
-sub todo_end {
-    my $self = shift;
-
-    if( !$self->{Start_Todo} ) {
-        $self->croak('todo_end() called without todo_start()');
-    }
-
-    $self->{Start_Todo}--;
-
-    if( $self->{Start_Todo} && @{ $self->{Todo_Stack} } ) {
-        $self->{Todo} = pop @{ $self->{Todo_Stack} };
-    }
-    else {
-        delete $self->{Todo};
-    }
-
-    return;
-}
-
-#line 1968
-
-sub caller {    ## no critic (Subroutines::ProhibitBuiltinHomonyms)
-    my( $self, $height ) = @_;
-    $height ||= 0;
-
-    my $level = $self->level + $height + 1;
-    my @caller;
-    do {
-        @caller = CORE::caller( $level );
-        $level--;
-    } until @caller;
-    return wantarray ? @caller : $caller[0];
-}
-
-#line 1985
-
-#line 1999
-
-#'#
-sub _sanity_check {
-    my $self = shift;
-
-    $self->_whoa( $self->{Curr_Test} < 0, 'Says here you ran a negative number of tests!' );
-    $self->_whoa( $self->{Curr_Test} != @{ $self->{Test_Results} },
-        'Somehow you got a different number of results than tests ran!' );
-
-    return;
-}
-
-#line 2020
-
-sub _whoa {
-    my( $self, $check, $desc ) = @_;
-    if($check) {
-        local $Level = $Level + 1;
-        $self->croak(<<"WHOA");
-WHOA!  $desc
-This should never happen!  Please contact the author immediately!
-WHOA
-    }
-
-    return;
-}
-
-#line 2044
-
-sub _my_exit {
-    $? = $_[0];    ## no critic (Variables::RequireLocalizedPunctuationVars)
-
-    return 1;
-}
-
-#line 2056
-
-sub _ending {
-    my $self = shift;
-
-    my $real_exit_code = $?;
-
-    # Don't bother with an ending if this is a forked copy.  Only the parent
-    # should do the ending.
-    if( $self->{Original_Pid} != $$ ) {
-        return;
-    }
-
-    # Ran tests but never declared a plan or hit done_testing
-    if( !$self->{Have_Plan} and $self->{Curr_Test} ) {
-        $self->diag("Tests were run but no plan was declared and done_testing() was not seen.");
-    }
-
-    # Exit if plan() was never called.  This is so "require Test::Simple"
-    # doesn't puke.
-    if( !$self->{Have_Plan} ) {
-        return;
-    }
-
-    # Don't do an ending if we bailed out.
-    if( $self->{Bailed_Out} ) {
-        return;
-    }
-
-    # Figure out if we passed or failed and print helpful messages.
-    my $test_results = $self->{Test_Results};
-    if(@$test_results) {
-        # The plan?  We have no plan.
-        if( $self->{No_Plan} ) {
-            $self->_output_plan($self->{Curr_Test}) unless $self->no_header;
-            $self->{Expected_Tests} = $self->{Curr_Test};
-        }
-
-        # Auto-extended arrays and elements which aren't explicitly
-        # filled in with a shared reference will puke under 5.8.0
-        # ithreads.  So we have to fill them in by hand. :(
-        my $empty_result = &share( {} );
-        for my $idx ( 0 .. $self->{Expected_Tests} - 1 ) {
-            $test_results->[$idx] = $empty_result
-              unless defined $test_results->[$idx];
-        }
-
-        my $num_failed = grep !$_->{'ok'}, @{$test_results}[ 0 .. $self->{Curr_Test} - 1 ];
-
-        my $num_extra = $self->{Curr_Test} - $self->{Expected_Tests};
-
-        if( $num_extra != 0 ) {
-            my $s = $self->{Expected_Tests} == 1 ? '' : 's';
-            $self->diag(<<"FAIL");
-Looks like you planned $self->{Expected_Tests} test$s but ran $self->{Curr_Test}.
-FAIL
-        }
-
-        if($num_failed) {
-            my $num_tests = $self->{Curr_Test};
-            my $s = $num_failed == 1 ? '' : 's';
-
-            my $qualifier = $num_extra == 0 ? '' : ' run';
-
-            $self->diag(<<"FAIL");
-Looks like you failed $num_failed test$s of $num_tests$qualifier.
-FAIL
-        }
-
-        if($real_exit_code) {
-            $self->diag(<<"FAIL");
-Looks like your test exited with $real_exit_code just after $self->{Curr_Test}.
-FAIL
-
-            _my_exit($real_exit_code) && return;
-        }
-
-        my $exit_code;
-        if($num_failed) {
-            $exit_code = $num_failed <= 254 ? $num_failed : 254;
-        }
-        elsif( $num_extra != 0 ) {
-            $exit_code = 255;
-        }
-        else {
-            $exit_code = 0;
-        }
-
-        _my_exit($exit_code) && return;
-    }
-    elsif( $self->{Skip_All} ) {
-        _my_exit(0) && return;
-    }
-    elsif($real_exit_code) {
-        $self->diag(<<"FAIL");
-Looks like your test exited with $real_exit_code before it could output anything.
-FAIL
-        _my_exit($real_exit_code) && return;
-    }
-    else {
-        $self->diag("No tests run!\n");
-        _my_exit(255) && return;
-    }
-
-    $self->_whoa( 1, "We fell off the end of _ending()" );
-}
-
-END {
-    $Test->_ending if defined $Test and !$Test->no_ending;
-}
-
-#line 2236
-
-1;
-
diff --git a/debian/modules/http-subs-filter/test/inc/Test/Builder/Module.pm b/debian/modules/http-subs-filter/test/inc/Test/Builder/Module.pm
deleted file mode 100644
index de793c1..0000000
--- a/debian/modules/http-subs-filter/test/inc/Test/Builder/Module.pm
+++ /dev/null
@@ -1,81 +0,0 @@
-#line 1
-package Test::Builder::Module;
-
-use strict;
-
-use Test::Builder;
-
-require Exporter;
-our @ISA = qw(Exporter);
-
-our $VERSION = '0.92';
-$VERSION = eval $VERSION;      ## no critic (BuiltinFunctions::ProhibitStringyEval)
-
-# 5.004's Exporter doesn't have export_to_level.
-my $_export_to_level = sub {
-    my $pkg   = shift;
-    my $level = shift;
-    (undef) = shift;    # redundant arg
-    my $callpkg = caller($level);
-    $pkg->export( $callpkg, @_ );
-};
-
-#line 82
-
-sub import {
-    my($class) = shift;
-
-    # Don't run all this when loading ourself.
-    return 1 if $class eq 'Test::Builder::Module';
-
-    my $test = $class->builder;
-
-    my $caller = caller;
-
-    $test->exported_to($caller);
-
-    $class->import_extra( \@_ );
-    my(@imports) = $class->_strip_imports( \@_ );
-
-    $test->plan(@_);
-
-    $class->$_export_to_level( 1, $class, @imports );
-}
-
-sub _strip_imports {
-    my $class = shift;
-    my $list  = shift;
-
-    my @imports = ();
-    my @other   = ();
-    my $idx     = 0;
-    while( $idx <= $#{$list} ) {
-        my $item = $list->[$idx];
-
-        if( defined $item and $item eq 'import' ) {
-            push @imports, @{ $list->[ $idx + 1 ] };
-            $idx++;
-        }
-        else {
-            push @other, $item;
-        }
-
-        $idx++;
-    }
-
-    @$list = @other;
-
-    return @imports;
-}
-
-#line 145
-
-sub import_extra { }
-
-#line 175
-
-sub builder {
-    return Test::Builder->new;
-}
-
-1;
diff --git a/debian/modules/http-subs-filter/test/inc/Test/More.pm b/debian/modules/http-subs-filter/test/inc/Test/More.pm
deleted file mode 100644
index 9e98a6a..0000000
--- a/debian/modules/http-subs-filter/test/inc/Test/More.pm
+++ /dev/null
@@ -1,735 +0,0 @@
-#line 1
-package Test::More;
-
-use 5.006;
-use strict;
-use warnings;
-
-#---- perlcritic exemptions. ----#
-
-# We use a lot of subroutine prototypes
-## no critic (Subroutines::ProhibitSubroutinePrototypes)
-
-# Can't use Carp because it might cause use_ok() to accidentally succeed
-# even though the module being used forgot to use Carp.  Yes, this
-# actually happened.
-sub _carp {
-    my( $file, $line ) = ( caller(1) )[ 1, 2 ];
-    return warn @_, " at $file line $line\n";
-}
-
-our $VERSION = '0.92';
-$VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
-
-use Test::Builder::Module;
-our @ISA    = qw(Test::Builder::Module);
-our @EXPORT = qw(ok use_ok require_ok
-  is isnt like unlike is_deeply
-  cmp_ok
-  skip todo todo_skip
-  pass fail
-  eq_array eq_hash eq_set
-  $TODO
-  plan
-  done_testing
-  can_ok isa_ok new_ok
-  diag note explain
-  BAIL_OUT
-);
-
-#line 163
-
-sub plan {
-    my $tb = Test::More->builder;
-
-    return $tb->plan(@_);
-}
-
-# This implements "use Test::More 'no_diag'" but the behavior is
-# deprecated.
-sub import_extra {
-    my $class = shift;
-    my $list  = shift;
-
-    my @other = ();
-    my $idx   = 0;
-    while( $idx <= $#{$list} ) {
-        my $item = $list->[$idx];
-
-        if( defined $item and $item eq 'no_diag' ) {
-            $class->builder->no_diag(1);
-        }
-        else {
-            push @other, $item;
-        }
-
-        $idx++;
-    }
-
-    @$list = @other;
-
-    return;
-}
-
-#line 216
-
-sub done_testing {
-    my $tb = Test::More->builder;
-    $tb->done_testing(@_);
-}
-
-#line 289
-
-sub ok ($;$) {
-    my( $test, $name ) = @_;
-    my $tb = Test::More->builder;
-
-    return $tb->ok( $test, $name );
-}
-
-#line 367
-
-sub is ($$;$) {
-    my $tb = Test::More->builder;
-
-    return $tb->is_eq(@_);
-}
-
-sub isnt ($$;$) {
-    my $tb = Test::More->builder;
-
-    return $tb->isnt_eq(@_);
-}
-
-*isn't = \&isnt;
-
-#line 411
-
-sub like ($$;$) {
-    my $tb = Test::More->builder;
-
-    return $tb->like(@_);
-}
-
-#line 426
-
-sub unlike ($$;$) {
-    my $tb = Test::More->builder;
-
-    return $tb->unlike(@_);
-}
-
-#line 471
-
-sub cmp_ok($$$;$) {
-    my $tb = Test::More->builder;
-
-    return $tb->cmp_ok(@_);
-}
-
-#line 506
-
-sub can_ok ($@) {
-    my( $proto, @methods ) = @_;
-    my $class = ref $proto || $proto;
-    my $tb = Test::More->builder;
-
-    unless($class) {
-        my $ok = $tb->ok( 0, "->can(...)" );
-        $tb->diag('    can_ok() called with empty class or reference');
-        return $ok;
-    }
-
-    unless(@methods) {
-        my $ok = $tb->ok( 0, "$class->can(...)" );
-        $tb->diag('    can_ok() called with no methods');
-        return $ok;
-    }
-
-    my @nok = ();
-    foreach my $method (@methods) {
-        $tb->_try( sub { $proto->can($method) } ) or push @nok, $method;
-    }
-
-    my $name = (@methods == 1) ? "$class->can('$methods[0]')" :
-                                 "$class->can(...)"           ;
-
-    my $ok = $tb->ok( !@nok, $name );
-
-    $tb->diag( map "    $class->can('$_') failed\n", @nok );
-
-    return $ok;
-}
-
-#line 572
-
-sub isa_ok ($$;$) {
-    my( $object, $class, $obj_name ) = @_;
-    my $tb = Test::More->builder;
-
-    my $diag;
-
-    if( !defined $object ) {
-        $obj_name = 'The thing' unless defined $obj_name;
-        $diag = "$obj_name isn't defined";
-    }
-    else {
-        my $whatami = ref $object ? 'object' : 'class';
-        # We can't use UNIVERSAL::isa because we want to honor isa() overrides
-        my( $rslt, $error ) = $tb->_try( sub { $object->isa($class) } );
-        if($error) {
-            if( $error =~ /^Can't call method "isa" on unblessed reference/ ) {
-                # Its an unblessed reference
-                $obj_name = 'The reference' unless defined $obj_name;
-                if( !UNIVERSAL::isa( $object, $class ) ) {
-                    my $ref = ref $object;
-                    $diag = "$obj_name isn't a '$class' it's a '$ref'";
-                }
-            }
-            elsif( $error =~ /Can't call method "isa" without a package/ ) {
-                # It's something that can't even be a class
-                $diag = "$obj_name isn't a class or reference";
-            }
-            else {
-                die <<WHOA;
-WHOA! I tried to call ->isa on your $whatami and got some weird error.
-Here's the error.
-$error
-WHOA
-            }
-        }
-        else {
-            $obj_name = "The $whatami" unless defined $obj_name;
-            if( !$rslt ) {
-                my $ref = ref $object;
-                $diag = "$obj_name isn't a '$class' it's a '$ref'";
-            }
-        }
-    }
-
-    my $name = "$obj_name isa $class";
-    my $ok;
-    if($diag) {
-        $ok = $tb->ok( 0, $name );
-        $tb->diag("    $diag\n");
-    }
-    else {
-        $ok = $tb->ok( 1, $name );
-    }
-
-    return $ok;
-}
-
-#line 650
-
-sub new_ok {
-    my $tb = Test::More->builder;
-    $tb->croak("new_ok() must be given at least a class") unless @_;
-
-    my( $class, $args, $object_name ) = @_;
-
-    $args ||= [];
-    $object_name = "The object" unless defined $object_name;
-
-    my $obj;
-    my( $success, $error ) = $tb->_try( sub { $obj = $class->new(@$args); 1 } );
-    if($success) {
-        local $Test::Builder::Level = $Test::Builder::Level + 1;
-        isa_ok $obj, $class, $object_name;
-    }
-    else {
-        $tb->ok( 0, "new() died" );
-        $tb->diag("    Error was:  $error");
-    }
-
-    return $obj;
-}
-
-#line 690
-
-sub pass (;$) {
-    my $tb = Test::More->builder;
-
-    return $tb->ok( 1, @_ );
-}
-
-sub fail (;$) {
-    my $tb = Test::More->builder;
-
-    return $tb->ok( 0, @_ );
-}
-
-#line 753
-
-sub use_ok ($;@) {
-    my( $module, @imports ) = @_;
-    @imports = () unless @imports;
-    my $tb = Test::More->builder;
-
-    my( $pack, $filename, $line ) = caller;
-
-    my $code;
-    if( @imports == 1 and $imports[0] =~ /^\d+(?:\.\d+)?$/ ) {
-        # probably a version check.  Perl needs to see the bare number
-        # for it to work with non-Exporter based modules.
-        $code = <<USE;
-package $pack;
-use $module $imports[0];
-1;
-USE
-    }
-    else {
-        $code = <<USE;
-package $pack;
-use $module \@{\$args[0]};
-1;
-USE
-    }
-
-    my( $eval_result, $eval_error ) = _eval( $code, \@imports );
-    my $ok = $tb->ok( $eval_result, "use $module;" );
-
-    unless($ok) {
-        chomp $eval_error;
-        $@ =~ s{^BEGIN failed--compilation aborted at .*$}
-                {BEGIN failed--compilation aborted at $filename line $line.}m;
-        $tb->diag(<<DIAGNOSTIC);
-    Tried to use '$module'.
-    Error:  $eval_error
-DIAGNOSTIC
-
-    }
-
-    return $ok;
-}
-
-sub _eval {
-    my( $code, @args ) = @_;
-
-    # Work around oddities surrounding resetting of $@ by immediately
-    # storing it.
-    my( $sigdie, $eval_result, $eval_error );
-    {
-        local( $@, $!, $SIG{__DIE__} );    # isolate eval
-        $eval_result = eval $code;              ## no critic (BuiltinFunctions::ProhibitStringyEval)
-        $eval_error  = $@;
-        $sigdie      = $SIG{__DIE__} || undef;
-    }
-    # make sure that $code got a chance to set $SIG{__DIE__}
-    $SIG{__DIE__} = $sigdie if defined $sigdie;
-
-    return( $eval_result, $eval_error );
-}
-
-#line 822
-
-sub require_ok ($) {
-    my($module) = shift;
-    my $tb = Test::More->builder;
-
-    my $pack = caller;
-
-    # Try to deterine if we've been given a module name or file.
-    # Module names must be barewords, files not.
-    $module = qq['$module'] unless _is_module_name($module);
-
-    my $code = <<REQUIRE;
-package $pack;
-require $module;
-1;
-REQUIRE
-
-    my( $eval_result, $eval_error ) = _eval($code);
-    my $ok = $tb->ok( $eval_result, "require $module;" );
-
-    unless($ok) {
-        chomp $eval_error;
-        $tb->diag(<<DIAGNOSTIC);
-    Tried to require '$module'.
-    Error:  $eval_error
-DIAGNOSTIC
-
-    }
-
-    return $ok;
-}
-
-sub _is_module_name {
-    my $module = shift;
-
-    # Module names start with a letter.
-    # End with an alphanumeric.
-    # The rest is an alphanumeric or ::
-    $module =~ s/\b::\b//g;
-
-    return $module =~ /^[a-zA-Z]\w*$/ ? 1 : 0;
-}
-
-#line 899
-
-our( @Data_Stack, %Refs_Seen );
-my $DNE = bless [], 'Does::Not::Exist';
-
-sub _dne {
-    return ref $_[0] eq ref $DNE;
-}
-
-## no critic (Subroutines::RequireArgUnpacking)
-sub is_deeply {
-    my $tb = Test::More->builder;
-
-    unless( @_ == 2 or @_ == 3 ) {
-        my $msg = <<'WARNING';
-is_deeply() takes two or three args, you gave %d.
-This usually means you passed an array or hash instead 
-of a reference to it
-WARNING
-        chop $msg;    # clip off newline so carp() will put in line/file
-
-        _carp sprintf $msg, scalar @_;
-
-        return $tb->ok(0);
-    }
-
-    my( $got, $expected, $name ) = @_;
-
-    $tb->_unoverload_str( \$expected, \$got );
-
-    my $ok;
-    if( !ref $got and !ref $expected ) {    # neither is a reference
-        $ok = $tb->is_eq( $got, $expected, $name );
-    }
-    elsif( !ref $got xor !ref $expected ) {    # one's a reference, one isn't
-        $ok = $tb->ok( 0, $name );
-        $tb->diag( _format_stack({ vals => [ $got, $expected ] }) );
-    }
-    else {                                     # both references
-        local @Data_Stack = ();
-        if( _deep_check( $got, $expected ) ) {
-            $ok = $tb->ok( 1, $name );
-        }
-        else {
-            $ok = $tb->ok( 0, $name );
-            $tb->diag( _format_stack(@Data_Stack) );
-        }
-    }
-
-    return $ok;
-}
-
-sub _format_stack {
-    my(@Stack) = @_;
-
-    my $var       = '$FOO';
-    my $did_arrow = 0;
-    foreach my $entry (@Stack) {
-        my $type = $entry->{type} || '';
-        my $idx = $entry->{'idx'};
-        if( $type eq 'HASH' ) {
-            $var .= "->" unless $did_arrow++;
-            $var .= "{$idx}";
-        }
-        elsif( $type eq 'ARRAY' ) {
-            $var .= "->" unless $did_arrow++;
-            $var .= "[$idx]";
-        }
-        elsif( $type eq 'REF' ) {
-            $var = "\${$var}";
-        }
-    }
-
-    my @vals = @{ $Stack[-1]{vals} }[ 0, 1 ];
-    my @vars = ();
-    ( $vars[0] = $var ) =~ s/\$FOO/     \$got/;
-    ( $vars[1] = $var ) =~ s/\$FOO/\$expected/;
-
-    my $out = "Structures begin differing at:\n";
-    foreach my $idx ( 0 .. $#vals ) {
-        my $val = $vals[$idx];
-        $vals[$idx]
-          = !defined $val ? 'undef'
-          : _dne($val)    ? "Does not exist"
-          : ref $val      ? "$val"
-          :                 "'$val'";
-    }
-
-    $out .= "$vars[0] = $vals[0]\n";
-    $out .= "$vars[1] = $vals[1]\n";
-
-    $out =~ s/^/    /msg;
-    return $out;
-}
-
-sub _type {
-    my $thing = shift;
-
-    return '' if !ref $thing;
-
-    for my $type (qw(ARRAY HASH REF SCALAR GLOB CODE Regexp)) {
-        return $type if UNIVERSAL::isa( $thing, $type );
-    }
-
-    return '';
-}
-
-#line 1059
-
-sub diag {
-    return Test::More->builder->diag(@_);
-}
-
-sub note {
-    return Test::More->builder->note(@_);
-}
-
-#line 1085
-
-sub explain {
-    return Test::More->builder->explain(@_);
-}
-
-#line 1151
-
-## no critic (Subroutines::RequireFinalReturn)
-sub skip {
-    my( $why, $how_many ) = @_;
-    my $tb = Test::More->builder;
-
-    unless( defined $how_many ) {
-        # $how_many can only be avoided when no_plan is in use.
-        _carp "skip() needs to know \$how_many tests are in the block"
-          unless $tb->has_plan eq 'no_plan';
-        $how_many = 1;
-    }
-
-    if( defined $how_many and $how_many =~ /\D/ ) {
-        _carp
-          "skip() was passed a non-numeric number of tests.  Did you get the arguments backwards?";
-        $how_many = 1;
-    }
-
-    for( 1 .. $how_many ) {
-        $tb->skip($why);
-    }
-
-    no warnings 'exiting';
-    last SKIP;
-}
-
-#line 1238
-
-sub todo_skip {
-    my( $why, $how_many ) = @_;
-    my $tb = Test::More->builder;
-
-    unless( defined $how_many ) {
-        # $how_many can only be avoided when no_plan is in use.
-        _carp "todo_skip() needs to know \$how_many tests are in the block"
-          unless $tb->has_plan eq 'no_plan';
-        $how_many = 1;
-    }
-
-    for( 1 .. $how_many ) {
-        $tb->todo_skip($why);
-    }
-
-    no warnings 'exiting';
-    last TODO;
-}
-
-#line 1293
-
-sub BAIL_OUT {
-    my $reason = shift;
-    my $tb     = Test::More->builder;
-
-    $tb->BAIL_OUT($reason);
-}
-
-#line 1332
-
-#'#
-sub eq_array {
-    local @Data_Stack = ();
-    _deep_check(@_);
-}
-
-sub _eq_array {
-    my( $a1, $a2 ) = @_;
-
-    if( grep _type($_) ne 'ARRAY', $a1, $a2 ) {
-        warn "eq_array passed a non-array ref";
-        return 0;
-    }
-
-    return 1 if $a1 eq $a2;
-
-    my $ok = 1;
-    my $max = $#$a1 > $#$a2 ? $#$a1 : $#$a2;
-    for( 0 .. $max ) {
-        my $e1 = $_ > $#$a1 ? $DNE : $a1->[$_];
-        my $e2 = $_ > $#$a2 ? $DNE : $a2->[$_];
-
-        push @Data_Stack, { type => 'ARRAY', idx => $_, vals => [ $e1, $e2 ] };
-        $ok = _deep_check( $e1, $e2 );
-        pop @Data_Stack if $ok;
-
-        last unless $ok;
-    }
-
-    return $ok;
-}
-
-sub _deep_check {
-    my( $e1, $e2 ) = @_;
-    my $tb = Test::More->builder;
-
-    my $ok = 0;
-
-    # Effectively turn %Refs_Seen into a stack.  This avoids picking up
-    # the same referenced used twice (such as [\$a, \$a]) to be considered
-    # circular.
-    local %Refs_Seen = %Refs_Seen;
-
-    {
-        # Quiet uninitialized value warnings when comparing undefs.
-        no warnings 'uninitialized';
-
-        $tb->_unoverload_str( \$e1, \$e2 );
-
-        # Either they're both references or both not.
-        my $same_ref = !( !ref $e1 xor !ref $e2 );
-        my $not_ref = ( !ref $e1 and !ref $e2 );
-
-        if( defined $e1 xor defined $e2 ) {
-            $ok = 0;
-        }
-        elsif( !defined $e1 and !defined $e2 ) {
-            # Shortcut if they're both defined.
-            $ok = 1;
-        }
-        elsif( _dne($e1) xor _dne($e2) ) {
-            $ok = 0;
-        }
-        elsif( $same_ref and( $e1 eq $e2 ) ) {
-            $ok = 1;
-        }
-        elsif($not_ref) {
-            push @Data_Stack, { type => '', vals => [ $e1, $e2 ] };
-            $ok = 0;
-        }
-        else {
-            if( $Refs_Seen{$e1} ) {
-                return $Refs_Seen{$e1} eq $e2;
-            }
-            else {
-                $Refs_Seen{$e1} = "$e2";
-            }
-
-            my $type = _type($e1);
-            $type = 'DIFFERENT' unless _type($e2) eq $type;
-
-            if( $type eq 'DIFFERENT' ) {
-                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
-                $ok = 0;
-            }
-            elsif( $type eq 'ARRAY' ) {
-                $ok = _eq_array( $e1, $e2 );
-            }
-            elsif( $type eq 'HASH' ) {
-                $ok = _eq_hash( $e1, $e2 );
-            }
-            elsif( $type eq 'REF' ) {
-                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
-                $ok = _deep_check( $$e1, $$e2 );
-                pop @Data_Stack if $ok;
-            }
-            elsif( $type eq 'SCALAR' ) {
-                push @Data_Stack, { type => 'REF', vals => [ $e1, $e2 ] };
-                $ok = _deep_check( $$e1, $$e2 );
-                pop @Data_Stack if $ok;
-            }
-            elsif($type) {
-                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
-                $ok = 0;
-            }
-            else {
-                _whoa( 1, "No type in _deep_check" );
-            }
-        }
-    }
-
-    return $ok;
-}
-
-sub _whoa {
-    my( $check, $desc ) = @_;
-    if($check) {
-        die <<"WHOA";
-WHOA!  $desc
-This should never happen!  Please contact the author immediately!
-WHOA
-    }
-}
-
-#line 1465
-
-sub eq_hash {
-    local @Data_Stack = ();
-    return _deep_check(@_);
-}
-
-sub _eq_hash {
-    my( $a1, $a2 ) = @_;
-
-    if( grep _type($_) ne 'HASH', $a1, $a2 ) {
-        warn "eq_hash passed a non-hash ref";
-        return 0;
-    }
-
-    return 1 if $a1 eq $a2;
-
-    my $ok = 1;
-    my $bigger = keys %$a1 > keys %$a2 ? $a1 : $a2;
-    foreach my $k ( keys %$bigger ) {
-        my $e1 = exists $a1->{$k} ? $a1->{$k} : $DNE;
-        my $e2 = exists $a2->{$k} ? $a2->{$k} : $DNE;
-
-        push @Data_Stack, { type => 'HASH', idx => $k, vals => [ $e1, $e2 ] };
-        $ok = _deep_check( $e1, $e2 );
-        pop @Data_Stack if $ok;
-
-        last unless $ok;
-    }
-
-    return $ok;
-}
-
-#line 1522
-
-sub eq_set {
-    my( $a1, $a2 ) = @_;
-    return 0 unless @$a1 == @$a2;
-
-    no warnings 'uninitialized';
-
-    # It really doesn't matter how we sort them, as long as both arrays are
-    # sorted with the same algorithm.
-    #
-    # Ensure that references are not accidentally treated the same as a
-    # string containing the reference.
-    #
-    # Have to inline the sort routine due to a threading/sort bug.
-    # See [rt.cpan.org 6782]
-    #
-    # I don't know how references would be sorted so we just don't sort
-    # them.  This means eq_set doesn't really work with refs.
-    return eq_array(
-        [ grep( ref, @$a1 ), sort( grep( !ref, @$a1 ) ) ],
-        [ grep( ref, @$a2 ), sort( grep( !ref, @$a2 ) ) ],
-    );
-}
-
-#line 1735
-
-1;
diff --git a/debian/modules/http-subs-filter/test/lib/Test/Nginx.pm b/debian/modules/http-subs-filter/test/lib/Test/Nginx.pm
deleted file mode 100644
index 0a1408e..0000000
--- a/debian/modules/http-subs-filter/test/lib/Test/Nginx.pm
+++ /dev/null
@@ -1,315 +0,0 @@
-package Test::Nginx;
-
-use strict;
-use warnings;
-
-our $VERSION = '0.17';
-
-__END__
-
-=encoding utf-8
-
-=head1 NAME
-
-Test::Nginx - Testing modules for Nginx C module development
-
-=head1 DESCRIPTION
-
-This distribution provides two testing modules for Nginx C module development:
-
-=over
-
-=item *
-
-L<Test::Nginx::LWP>
-
-=item *
-
-L<Test::Nginx::Socket>
-
-=back
-
-All of them are based on L<Test::Base>.
-
-Usually, L<Test::Nginx::Socket> is preferred because it works on a much lower
-level and not that fault tolerant like L<Test::Nginx::LWP>.
-
-Also, a lot of connection hang issues (like wrong C<< r->main->count >> value in nginx
-0.8.x) can only be captured by L<Test::Nginx::Socket> because Perl's L<LWP::UserAgent> client
-will close the connection itself which will conceal such issues from
-the testers.
-
-Test::Nginx automatically starts an nginx instance (from the C<PATH> env)
-rooted at t/servroot/ and the default config template makes this nginx
-instance listen on the port C<1984> by default. One can specify a different
-port number by setting his port number to the C<TEST_NGINX_PORT> environment,
-as in
-
-    export TEST_NGINX_PORT=1989
-
-=head2 etcproxy integration
-
-The default settings in etcproxy (https://github.com/chaoslawful/etcproxy)
-makes this small TCP proxy split the TCP packets into bytes and introduce 1 ms latency among them.
-
-There's usually various TCP chains that we can put etcproxy into, for example
-
-=head3 Test::Nginx <=> nginx
-
-  $ ./etcproxy 1234 1984
-
-Here we tell etcproxy to listen on port 1234 and to delegate all the
-TCP traffic to the port 1984, the default port that Test::Nginx makes
-nginx listen to.
-
-And then we tell Test::Nginx to test against the port 1234, where
-etcproxy listens on, rather than the port 1984 that nginx directly
-listens on:
-
-  $ TEST_NGINX_CLIENT_PORT=1234 prove -r t/
-
-Then the TCP chain now looks like this:
-
-  Test::Nginx <=> etcproxy (1234) <=> nginx (1984)
-
-So etcproxy can effectively emulate extreme network conditions and
-exercise "unusual" code paths in your nginx server by your tests.
-
-In practice, *tons* of weird bugs can be captured by this setting.
-Even ourselves didn't expect that this simple approach is so
-effective.
-
-=head3 nginx <=> memcached
-
-We first start the memcached server daemon on port 11211:
-
-   memcached -p 11211 -vv
-
-and then we another etcproxy instance to listen on port 11984 like this
-
-   $ ./etcproxy 11984 11211
-
-Then we tell our t/foo.t test script to connect to 11984 rather than 11211:
-
-  # foo.t
-  use Test::Nginx::Socket;
-  repeat_each(1);
-  plan tests => 2 * repeat_each() * blocks();
-  $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;  # make this env take a default value
-  run_tests();
-
-  __DATA__
-
-  === TEST 1: sanity
-  --- config
-  location /foo {
-       set $memc_cmd set;
-       set $memc_key foo;
-       set $memc_value bar;
-       memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
-  }
-  --- request
-      GET /foo
-  --- response_body_like: STORED
-
-The Test::Nginx library will automatically expand the special macro
-C<$TEST_NGINX_MEMCACHED_PORT> to the environment with the same name.
-You can define your own C<$TEST_NGINX_BLAH_BLAH_PORT> macros as long as
-its prefix is C<TEST_NGINX_> and all in upper case letters.
-
-And now we can run your test script against the etcproxy port 11984:
-
-   TEST_NGINX_MEMCACHED_PORT=11984 prove t/foo.t
-
-Then the TCP chains look like this:
-
-   Test::Nginx <=> nginx (1984) <=> etcproxy (11984) <=> memcached (11211)
-
-If C<TEST_NGINX_MEMCACHED_PORT> is not set, then it will take the default
-value 11211, which is what we want when there's no etcproxy
-configured:
-
-   Test::Nginx <=> nginx (1984) <=> memcached (11211)
-
-This approach also works for proxied mysql and postgres traffic.
-Please see the live test suite of ngx_drizzle and ngx_postgres for
-more details.
-
-Usually we set both C<TEST_NGINX_CLIENT_PORT> and
-C<TEST_NGINX_MEMCACHED_PORT> (and etc) at the same time, effectively
-yielding the following chain:
-
-   Test::Nginx <=> etcproxy (1234) <=> nginx (1984) <=> etcproxy (11984) <=> memcached (11211)
-
-as long as you run two separate etcproxy instances in two separate terminals.
-
-It's easy to verify if the traffic actually goes through your etcproxy
-server. Just check if the terminal running etcproxy emits outputs. By
-default, etcproxy always dump out the incoming and outgoing data to
-stdout/stderr.
-
-=head2 valgrind integration
-
-Test::Nginx has integrated support for valgrind (L<http://valgrind.org>) even though by
-default it does not bother running it with the tests because valgrind
-will significantly slow down the test sutie.
-
-First ensure that your valgrind executable visible in your PATH env.
-And then run your test suite with the C<TEST_NGINX_USE_VALGRIND> env set
-to true:
-
-   TEST_NGINX_USE_VALGRIND=1 prove -r t
-
-If you see false alarms, you do have a chance to skip them by defining
-a ./valgrind.suppress file at the root of your module source tree, as
-in
-
-L<https://github.com/chaoslawful/drizzle-nginx-module/blob/master/valgrind.suppress>
-
-This is the suppression file for ngx_drizzle. Test::Nginx will
-automatically use it to start nginx with valgrind memcheck if this
-file does exist at the expected location.
-
-If you do see a lot of "Connection refused" errors while running the
-tests this way, then you probably have a slow machine (or a very busy
-one) that the default waiting time is not sufficient for valgrind to
-start. You can define the sleep time to a larger value by setting the
-C<TEST_NGINX_SLEEP> env:
-
-   TEST_NGINX_SLEEP=1 prove -r t
-
-The time unit used here is "second". The default sleep setting just
-fits my ThinkPad (C<Core2Duo T9600>).
-
-Applying the no-pool patch to your nginx core is recommended while
-running nginx with valgrind:
-
-L<https://github.com/shrimp/no-pool-nginx>
-
-The nginx memory pool can prevent valgrind from spotting lots of
-invalid memory reads/writes as well as certain double-free errors. We
-did find a lot more memory issues in many of our modules when we first
-introduced the no-pool patch in practice ;)
-
-There's also more advanced features in Test::Nginx that have never
-documented. I'd like to write more about them in the near future ;)
-
-
-=head1 Nginx C modules that use Test::Nginx to drive their test suites
-
-=over
-
-=item ngx_echo
-
-L<http://github.com/agentzh/echo-nginx-module>
-
-=item ngx_headers_more
-
-L<http://github.com/agentzh/headers-more-nginx-module>
-
-=item ngx_chunkin
-
-L<http://wiki.nginx.org/NginxHttpChunkinModule>
-
-=item ngx_memc
-
-L<http://wiki.nginx.org/NginxHttpMemcModule>
-
-=item ngx_drizzle
-
-L<http://github.com/chaoslawful/drizzle-nginx-module>
-
-=item ngx_rds_json
-
-L<http://github.com/agentzh/rds-json-nginx-module>
-
-=item ngx_xss
-
-L<http://github.com/agentzh/xss-nginx-module>
-
-=item ngx_srcache
-
-L<http://github.com/agentzh/srcache-nginx-module>
-
-=item ngx_lua
-
-L<http://github.com/chaoslawful/lua-nginx-module>
-
-=item ngx_set_misc
-
-L<http://github.com/agentzh/set-misc-nginx-module>
-
-=item ngx_array_var
-
-L<http://github.com/agentzh/array-var-nginx-module>
-
-=item ngx_form_input
-
-L<http://github.com/calio/form-input-nginx-module>
-
-=item ngx_iconv
-
-L<http://github.com/calio/iconv-nginx-module>
-
-=item ngx_set_cconv
-
-L<http://github.com/liseen/set-cconv-nginx-module>
-
-=item ngx_postgres
-
-L<http://github.com/FRiCKLE/ngx_postgres>
-
-=item ngx_coolkit
-
-L<http://github.com/FRiCKLE/ngx_coolkit>
-
-=back
-
-=head1 SOURCE REPOSITORY
-
-This module has a Git repository on Github, which has access for all.
-
-    http://github.com/agentzh/test-nginx
-
-If you want a commit bit, feel free to drop me a line.
-
-=head1 AUTHORS
-
-agentzh (章亦春) C<< <agentzh@gmail.com> >>
-
-Antoine BONAVITA C<< <antoine.bonavita@gmail.com> >>
-
-=head1 COPYRIGHT & LICENSE
-
-Copyright (c) 2009-2011, Taobao Inc., Alibaba Group (L<http://www.taobao.com>).
-
-Copyright (c) 2009-2011, agentzh C<< <agentzh@gmail.com> >>.
-
-Copyright (c) 2011, Antoine Bonavita C<< <antoine.bonavita@gmail.com> >>.
-
-This module is licensed under the terms of the BSD license.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-=over
-
-=item *
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-=item *
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-=item *
-
-Neither the name of the Taobao Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
-
-=back
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-=head1 SEE ALSO
-
-L<Test::Nginx::LWP>, L<Test::Nginx::Socket>, L<Test::Base>.
-
diff --git a/debian/modules/http-subs-filter/test/lib/Test/Nginx/LWP.pm b/debian/modules/http-subs-filter/test/lib/Test/Nginx/LWP.pm
deleted file mode 100644
index 53f6c85..0000000
--- a/debian/modules/http-subs-filter/test/lib/Test/Nginx/LWP.pm
+++ /dev/null
@@ -1,524 +0,0 @@
-package Test::Nginx::LWP;
-
-use lib 'lib';
-use lib 'inc';
-use Test::Base -Base;
-
-our $VERSION = '0.17';
-
-our $NoLongString;
-
-use LWP::UserAgent;
-use Time::HiRes qw(sleep);
-use Test::LongString;
-use Test::Nginx::Util qw(
-    setup_server_root
-    write_config_file
-    get_canon_version
-    get_nginx_version
-    trim
-    show_all_chars
-    parse_headers
-    run_tests
-    $ServerPortForClient
-    $PidFile
-    $ServRoot
-    $ConfFile
-    $ServerPort
-    $RunTestHelper
-    $NoNginxManager
-    $RepeatEach
-    worker_connections
-    master_process_enabled
-    config_preamble
-    repeat_each
-    no_shuffle
-    no_root_location
-);
-
-our $UserAgent = LWP::UserAgent->new;
-$UserAgent->agent(__PACKAGE__);
-#$UserAgent->default_headers(HTTP::Headers->new);
-
-#use Smart::Comments::JSON '##';
-
-our @EXPORT = qw( plan run_tests run_test
-    repeat_each config_preamble worker_connections
-    master_process_enabled
-    no_long_string no_shuffle no_root_location);
-
-sub no_long_string () {
-    $NoLongString = 1;
-}
-
-sub run_test_helper ($$);
-
-$RunTestHelper = \&run_test_helper;
-
-sub parse_request ($$) {
-    my ($name, $rrequest) = @_;
-    open my $in, '<', $rrequest;
-    my $first = <$in>;
-    if (!$first) {
-        Test::More::BAIL_OUT("$name - Request line should be non-empty");
-        die;
-    }
-    $first =~ s/^\s+|\s+$//g;
-    my ($meth, $rel_url) = split /\s+/, $first, 2;
-    my $url = "http://localhost:$ServerPortForClient" . $rel_url;
-
-    my $content = do { local $/; <$in> };
-    if ($content) {
-        $content =~ s/^\s+|\s+$//s;
-    }
-
-    close $in;
-
-    return {
-        method  => $meth,
-        url     => $url,
-        content => $content,
-    };
-}
-
-sub chunk_it ($$$) {
-    my ($chunks, $start_delay, $middle_delay) = @_;
-    my $i = 0;
-    return sub {
-        if ($i == 0) {
-            if ($start_delay) {
-                sleep($start_delay);
-            }
-        } elsif ($middle_delay) {
-            sleep($middle_delay);
-        }
-        return $chunks->[$i++];
-    }
-}
-
-sub run_test_helper ($$) {
-    my ($block, $dry_run) = @_;
-
-    my $request = $block->request;
-
-    my $name = $block->name;
-    #if (defined $TODO) {
-    #$name .= "# $TODO";
-    #}
-
-    my $req_spec = parse_request($name, \$request);
-    ## $req_spec
-    my $method = $req_spec->{method};
-    my $req = HTTP::Request->new($method);
-    my $content = $req_spec->{content};
-
-    if (defined ($block->request_headers)) {
-        my $headers = parse_headers($block->request_headers);
-        while (my ($key, $val) = each %$headers) {
-            $req->header($key => $val);
-        }
-    }
-
-    #$req->header('Accept', '*/*');
-    $req->url($req_spec->{url});
-    if ($content) {
-        if ($method eq 'GET' or $method eq 'HEAD') {
-            croak "HTTP 1.0/1.1 $method request should not have content: $content";
-        }
-        $req->content($content);
-    } elsif ($method eq 'POST' or $method eq 'PUT') {
-        my $chunks = $block->chunked_body;
-        if (defined $chunks) {
-            if (!ref $chunks or ref $chunks ne 'ARRAY') {
-
-                Test::More::BAIL_OUT("$name - --- chunked_body should takes a Perl array ref as its value");
-            }
-
-            my $start_delay = $block->start_chunk_delay || 0;
-            my $middle_delay = $block->middle_chunk_delay || 0;
-            $req->content(chunk_it($chunks, $start_delay, $middle_delay));
-            if (!defined $req->header('Content-Type')) {
-                $req->header('Content-Type' => 'text/plain');
-            }
-        } else {
-            if (!defined $req->header('Content-Type')) {
-                $req->header('Content-Type' => 'text/plain');
-            }
-
-            $req->header('Content-Length' => 0);
-        }
-    }
-
-    if ($block->more_headers) {
-        my @headers = split /\n+/, $block->more_headers;
-        for my $header (@headers) {
-            next if $header =~ /^\s*\#/;
-            my ($key, $val) = split /:\s*/, $header, 2;
-            #warn "[$key, $val]\n";
-            $req->header($key => $val);
-        }
-    }
-
-    #warn "req: ", $req->as_string, "\n";
-    #warn "DONE!!!!!!!!!!!!!!!!!!!!";
-
-    my $res = HTTP::Response->new;
-    unless ($dry_run) {
-        $res = $UserAgent->request($req);
-    }
-
-    #warn "res returned!!!";
-
-    if ($dry_run) {
-        SKIP: {
-            Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
-        }
-    } else {
-        if (defined $block->error_code) {
-            is($res->code, $block->error_code, "$name - status code ok");
-        } else {
-            is($res->code, 200, "$name - status code ok");
-        }
-    }
-
-    if (defined $block->response_headers) {
-        my $headers = parse_headers($block->response_headers);
-        while (my ($key, $val) = each %$headers) {
-            my $expected_val = $res->header($key);
-            if (!defined $expected_val) {
-                $expected_val = '';
-            }
-            if ($dry_run) {
-                SKIP: {
-                    Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
-                }
-            } else {
-                is $expected_val, $val,
-                    "$name - header $key ok";
-            }
-        }
-    } elsif (defined $block->response_headers_like) {
-        my $headers = parse_headers($block->response_headers_like);
-        while (my ($key, $val) = each %$headers) {
-            my $expected_val = $res->header($key);
-            if (!defined $expected_val) {
-                $expected_val = '';
-            }
-            if ($dry_run) {
-                SKIP: {
-                    Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
-                }
-            } else {
-                like $expected_val, qr/^$val$/,
-                    "$name - header $key like ok";
-            }
-        }
-    }
-
-    if (defined $block->response_body) {
-        my $content = $res->content;
-        if (defined $content) {
-            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
-        }
-
-        $content =~ s/^Connection: TE, close\r\n//gms;
-        my $expected = $block->response_body;
-        $expected =~ s/\$ServerPort\b/$ServerPort/g;
-        $expected =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
-        #warn show_all_chars($content);
-
-        if ($dry_run) {
-            SKIP: {
-                Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
-            }
-        } else {
-            if ($NoLongString) {
-                is($content, $expected, "$name - response_body - response is expected");
-            } else {
-                is_string($content, $expected, "$name - response_body - response is expected");
-            }
-            #is($content, $expected, "$name - response_body - response is expected");
-        }
-
-    } elsif (defined $block->response_body_like) {
-        my $content = $res->content;
-        if (defined $content) {
-            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
-        }
-        $content =~ s/^Connection: TE, close\r\n//gms;
-        my $expected_pat = $block->response_body_like;
-        $expected_pat =~ s/\$ServerPort\b/$ServerPort/g;
-        $expected_pat =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
-        my $summary = trim($content);
-
-        if ($dry_run) {
-            SKIP: {
-                Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
-            }
-        } else {
-            like($content, qr/$expected_pat/s, "$name - response_body_like - response is expected ($summary)");
-        }
-    } elsif (defined $block->response_body_unlike) {
-        my $content = $res->content;
-        if (defined $content) {
-            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
-        }
-        $content =~ s/^Connection: TE, close\r\n//gms;
-        my $expected_pat = $block->response_body_unlike;
-        $expected_pat =~ s/\$ServerPort\b/$ServerPort/g;
-        $expected_pat =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
-        my $summary = trim($content);
-
-        if ($dry_run) {
-            SKIP: {
-                Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
-            }
-        } else {
-           unlike($content, qr/$expected_pat/s, "$name - response_body_like - response is expected ($summary)");
-        }
-    }
-}
-
-1;
-__END__
-
-=encoding utf-8
-
-=head1 NAME
-
-Test::Nginx::LWP - LWP-backed test scaffold for the Nginx C modules
-
-=head1 SYNOPSIS
-
-    use Test::Nginx::LWP;
-
-    plan tests => $Test::Nginx::LWP::RepeatEach * 2 * blocks();
-
-    run_tests();
-
-    __DATA__
-
-    === TEST 1: sanity
-    --- config
-        location /echo {
-            echo_before_body hello;
-            echo world;
-        }
-    --- request
-        GET /echo
-    --- response_body
-    hello
-    world
-    --- error_code: 200
-
-
-    === TEST 2: set Server
-    --- config
-        location /foo {
-            echo hi;
-            more_set_headers 'Server: Foo';
-        }
-    --- request
-        GET /foo
-    --- response_headers
-    Server: Foo
-    --- response_body
-    hi
-
-
-    === TEST 3: clear Server
-    --- config
-        location /foo {
-            echo hi;
-            more_clear_headers 'Server: ';
-        }
-    --- request
-        GET /foo
-    --- response_headers_like
-    Server: nginx.*
-    --- response_body
-    hi
-
-
-    === TEST 4: set request header at client side and rewrite it
-    --- config
-        location /foo {
-            more_set_input_headers 'X-Foo: howdy';
-            echo $http_x_foo;
-        }
-    --- request
-        GET /foo
-    --- request_headers
-    X-Foo: blah
-    --- response_headers
-    X-Foo:
-    --- response_body
-    howdy
-
-
-    === TEST 3: rewrite content length
-    --- config
-        location /bar {
-            more_set_input_headers 'Content-Length: 2048';
-            echo_read_request_body;
-            echo_request_body;
-        }
-    --- request eval
-    "POST /bar\n" .
-    "a" x 4096
-    --- response_body eval
-    "a" x 2048
-
-
-    === TEST 4: timer without explicit reset
-    --- config
-        location /timer {
-            echo_sleep 0.03;
-            echo "elapsed $echo_timer_elapsed sec.";
-        }
-    --- request
-        GET /timer
-    --- response_body_like
-    ^elapsed 0\.0(2[6-9]|3[0-6]) sec\.$
-
-
-    === TEST 5: small buf (using 2-byte buf)
-    --- config
-        chunkin on;
-        location /main {
-            client_body_buffer_size    2;
-            echo "body:";
-            echo $echo_request_body;
-            echo_request_body;
-        }
-    --- request
-    POST /main
-    --- start_chunk_delay: 0.01
-    --- middle_chunk_delay: 0.01
-    --- chunked_body eval
-    ["hello", "world"]
-    --- error_code: 200
-    --- response_body eval
-    "body:
-
-    helloworld"
-
-=head1 DESCRIPTION
-
-This module provides a test scaffold based on L<LWP::UserAgent> for automated testing in Nginx C module development.
-
-This class inherits from L<Test::Base>, thus bringing all its
-declarative power to the Nginx C module testing practices.
-
-You need to terminate or kill any Nginx processes before running the test suite if you have changed the Nginx server binary. Normally it's as simple as
-
-  killall nginx
-  PATH=/path/to/your/nginx-with-memc-module:$PATH prove -r t
-
-This module will create a temporary server root under t/servroot/ of the current working directory and starts and uses the nginx executable in the PATH environment.
-
-You will often want to look into F<t/servroot/logs/error.log>
-when things go wrong ;)
-
-=head1 Sections supported
-
-The following sections are supported:
-
-=over
-
-=item config
-
-=item http_config
-
-=item request
-
-=item request_headers
-
-=item more_headers
-
-=item response_body
-
-=item response_body_like
-
-=item response_headers
-
-=item response_headers_like
-
-=item error_code
-
-=item chunked_body
-
-=item middle_chunk_delay
-
-=item start_chunk_delay
-
-=back
-
-=head1 Samples
-
-You'll find live samples in the following Nginx 3rd-party modules:
-
-=over
-
-=item ngx_echo
-
-L<http://wiki.nginx.org/NginxHttpEchoModule>
-
-=item ngx_headers_more
-
-L<http://wiki.nginx.org/NginxHttpHeadersMoreModule>
-
-=item ngx_chunkin
-
-L<http://wiki.nginx.org/NginxHttpChunkinModule>
-
-=item ngx_memc
-
-L<http://wiki.nginx.org/NginxHttpMemcModule>
-
-=back
-
-=head1 SOURCE REPOSITORY
-
-This module has a Git repository on Github, which has access for all.
-
-    http://github.com/agentzh/test-nginx
-
-If you want a commit bit, feel free to drop me a line.
-
-=head1 AUTHOR
-
-agentzh (章亦春) C<< <agentzh@gmail.com> >>
-
-=head1 COPYRIGHT & LICENSE
-
-Copyright (c) 2009-2011, Taobao Inc., Alibaba Group (L<http://www.taobao.com>).
-
-Copyright (c) 2009-2011, agentzh C<< <agentzh@gmail.com> >>.
-
-This module is licensed under the terms of the BSD license.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-=over
-
-=item *
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-=item *
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-=item *
-
-Neither the name of the Taobao Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
-
-=back
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-=head1 SEE ALSO
-
-L<Test::Nginx::Socket>, L<Test::Base>.
-
diff --git a/debian/modules/http-subs-filter/test/lib/Test/Nginx/Socket.pm b/debian/modules/http-subs-filter/test/lib/Test/Nginx/Socket.pm
deleted file mode 100644
index 833c00a..0000000
--- a/debian/modules/http-subs-filter/test/lib/Test/Nginx/Socket.pm
+++ /dev/null
@@ -1,1749 +0,0 @@
-package Test::Nginx::Socket;
-
-use lib 'lib';
-use lib 'inc';
-
-use Test::Base -Base;
-
-our $VERSION = '0.17';
-
-use Encode;
-use Data::Dumper;
-use Time::HiRes qw(sleep time);
-use Test::LongString;
-use List::MoreUtils qw( any );
-use IO::Select ();
-
-our $ServerAddr = 'localhost';
-our $Timeout = $ENV{TEST_NGINX_TIMEOUT} || 2;
-
-use Test::Nginx::Util qw(
-  setup_server_root
-  write_config_file
-  get_canon_version
-  get_nginx_version
-  trim
-  show_all_chars
-  parse_headers
-  run_tests
-  $ServerPortForClient
-  $ServerPort
-  $PidFile
-  $ServRoot
-  $ConfFile
-  $RunTestHelper
-  $RepeatEach
-  worker_connections
-  master_process_enabled
-  config_preamble
-  repeat_each
-  workers
-  master_on
-  log_level
-  no_shuffle
-  no_root_location
-  server_root
-  html_dir
-  server_port
-  no_nginx_manager
-);
-
-#use Smart::Comments::JSON '###';
-use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
-use POSIX qw(EAGAIN);
-use IO::Socket;
-
-#our ($PrevRequest, $PrevConfig);
-
-our $NoLongString = undef;
-
-our @EXPORT = qw( plan run_tests run_test
-  repeat_each config_preamble worker_connections
-  master_process_enabled
-  no_long_string workers master_on
-  log_level no_shuffle no_root_location
-  server_addr server_root html_dir server_port
-  timeout no_nginx_manager
-);
-
-sub send_request ($$$$@);
-
-sub run_test_helper ($$);
-
-sub error_event_handler ($);
-sub read_event_handler ($);
-sub write_event_handler ($);
-
-sub no_long_string () {
-    $NoLongString = 1;
-}
-
-sub server_addr (@) {
-    if (@_) {
-
-        #warn "setting server addr to $_[0]\n";
-        $ServerAddr = shift;
-    }
-    else {
-        return $ServerAddr;
-    }
-}
-
-sub timeout (@) {
-    if (@_) {
-        $Timeout = shift;
-    }
-    else {
-        $Timeout;
-    }
-}
-
-$RunTestHelper = \&run_test_helper;
-
-#  This will parse a "request"" string. The expected format is:
-# - One line for the HTTP verb (POST, GET, etc.) plus optional relative URL
-#   (default is /) plus optional HTTP version (default is HTTP/1.1).
-# - More lines considered as the body of the request.
-# Most people don't care about headers and this is enough.
-#
-#  This function will return a reference to a hash with the parsed elements
-# plus information on the parsing itself like "how many white spaces were
-# skipped before the VERB" (skipped_before_method), "was the version provided"
-# (http_ver_size = 0).
-sub parse_request ($$) {
-    my ( $name, $rrequest ) = @_;
-    open my $in, '<', $rrequest;
-    my $first = <$in>;
-    if ( !$first ) {
-        Test::More::BAIL_OUT("$name - Request line should be non-empty");
-        die;
-    }
-    #$first =~ s/^\s+|\s+$//gs;
-    my ($before_meth, $meth, $after_meth);
-    my ($rel_url, $rel_url_size, $after_rel_url);
-    my ($http_ver, $http_ver_size, $after_http_ver);
-    my $end_line_size;
-    if ($first =~ /^(\s*)(\S+)( *)((\S+)( *))?((\S+)( *))?(\s*)/) {
-        $before_meth = defined $1 ? length($1) : undef;
-        $meth = $2;
-        $after_meth = defined $3 ? length($3) : undef;
-        $rel_url = $5;
-        $rel_url_size = defined $5 ? length($5) : undef;
-        $after_rel_url = defined $6 ? length($6) : undef;
-        $http_ver = $8;
-        if (!defined $8) {
-            $http_ver_size = undef;
-        } else {
-            $http_ver_size = defined $8 ? length($8) : undef;
-        }
-        if (!defined $9) {
-            $after_http_ver = undef;
-        } else {
-            $after_http_ver = defined $9 ? length($9) : undef;
-        }
-        $end_line_size = defined $10 ? length($10) : undef;
-    } else {
-        Test::More::BAIL_OUT("$name - Request line is not valid. Should be 'meth [url [version]]'");
-        die;
-    }
-    if ( !defined $rel_url ) {
-        $rel_url = '/';
-        $rel_url_size = 0;
-        $after_rel_url = 0;
-    }
-    if ( !defined $http_ver ) {
-        $http_ver = 'HTTP/1.1';
-        $http_ver_size = 0;
-        $after_http_ver = 0;
-    }
-
-    #my $url = "http://localhost:$ServerPortForClient" . $rel_url;
-
-    my $content = do { local $/; <$in> };
-    my $content_size;
-    if ( !defined $content ) {
-        $content = "";
-        $content_size = 0;
-    } else {
-        $content_size = length($content);
-    }
-
-    #warn Dumper($content);
-
-    close $in;
-
-    return {
-        method  => $meth,
-        url     => $rel_url,
-        content => $content,
-        http_ver => $http_ver,
-        skipped_before_method => $before_meth,
-        method_size => length($meth),
-        skipped_after_method => $after_meth,
-        url_size => $rel_url_size,
-        skipped_after_url => $after_rel_url,
-        http_ver_size => $http_ver_size,
-        skipped_after_http_ver => $after_http_ver + $end_line_size,
-        content_size => $content_size,
-    };
-}
-
-# From a parsed request, builds the "moves" to apply to the original request
-# to transform it (e.g. add missing version). Elements of the returned array
-# are of 2 types:
-# - d : number of characters to remove.
-# - s_* : number of characters (s_s) to replace by value (s_v).
-sub get_moves($) {
-    my ($parsed_req) = @_;
-    return ({d => $parsed_req->{skipped_before_method}},
-                          {s_s => $parsed_req->{method_size},
-                           s_v => $parsed_req->{method}},
-                          {d => $parsed_req->{skipped_after_method}},
-                          {s_s => $parsed_req->{url_size},
-                           s_v => $parsed_req->{url}},
-                          {d => $parsed_req->{skipped_after_url}},
-                          {s_s => $parsed_req->{http_ver_size},
-                           s_v => $parsed_req->{http_ver}},
-                          {d => $parsed_req->{skipped_after_http_ver}},
-                          {s_s => 0,
-                           s_v => $parsed_req->{headers}},
-                          {s_s => $parsed_req->{content_size},
-                           s_v => $parsed_req->{content}}
-                         );
-}
-
-#  Apply moves (see above) to an array of packets that correspond to a request.
-# The use of this function is explained in the build_request_from_packets
-# function.
-sub apply_moves($$) {
-    my ($r_packet, $r_move) = @_;
-    my $current_packet = shift @$r_packet;
-    my $current_move = shift @$r_move;
-    my $in_packet_cursor = 0;
-    my @result = ();
-    while (defined $current_packet) {
-        if (!defined $current_move) {
-            push @result, $current_packet;
-            $current_packet = shift @$r_packet;
-            $in_packet_cursor = 0;
-        } elsif (defined $current_move->{d}) {
-            # Remove stuff from packet
-            if ($current_move->{d} > length($current_packet) - $in_packet_cursor) {
-                # Eat up what is left of packet.
-                $current_move->{d} -= length($current_packet) - $in_packet_cursor;
-                if ($in_packet_cursor > 0) {
-                    # Something in packet from previous iteration.
-                    push @result, $current_packet;
-                }
-                $current_packet = shift @$r_packet;
-                $in_packet_cursor = 0;
-            } else {
-                # Remove from current point in current packet
-                substr($current_packet, $in_packet_cursor, $current_move->{d}) = '';
-                $current_move = shift @$r_move;
-            }
-        } else {
-            # Substitute stuff
-            if ($current_move->{s_s} > length($current_packet) - $in_packet_cursor) {
-                #   {s_s=>3, s_v=>GET} on ['GE', 'T /foo']
-                $current_move->{s_s} -= length($current_packet) - $in_packet_cursor;
-                substr($current_packet, $in_packet_cursor) = substr($current_move->{s_v}, 0, length($current_packet) - $in_packet_cursor);
-                push @result, $current_packet;
-                $current_move->{s_v} = substr($current_move->{s_v}, length($current_packet) - $in_packet_cursor);
-                $current_packet = shift @$r_packet;
-                $in_packet_cursor = 0;
-            } else {
-                substr($current_packet, $in_packet_cursor, $current_move->{s_s}) = $current_move->{s_v};
-                $in_packet_cursor += length($current_move->{s_v});
-                $current_move = shift @$r_move;
-            }
-        }
-    }
-    return \@result;
-}
-#  Given a request as an array of packets, will parse it, append the appropriate
-# headers and return another array of packets.
-#  The function implemented here can be high-level summarized as:
-#   1 - Concatenate all packets to obtain a string representation of request.
-#   2 - Parse the string representation
-#   3 - Get the "moves" from the parsing
-#   4 - Apply the "moves" to the packets.
-sub build_request_from_packets($$$$$) {
-    my ( $name, $more_headers, $is_chunked, $conn_header, $request_packets ) = @_;
-    # Concatenate packets as a string
-    my $parsable_request = '';
-    my @packet_length;
-    for my $one_packet (@$request_packets) {
-        $parsable_request .= $one_packet;
-        push @packet_length, length($one_packet);
-    }
-    #  Parse the string representation.
-    my $parsed_req = parse_request( $name, \$parsable_request );
-
-    # Append headers
-    my $len_header = '';
-    if (   !$is_chunked
-        && defined $parsed_req->{content}
-        && $parsed_req->{content} ne ''
-        && $more_headers !~ /\bContent-Length:/ )
-    {
-        $parsed_req->{content} =~ s/^\s+|\s+$//gs;
-
-        $len_header .=
-          "Content-Length: " . length( $parsed_req->{content} ) . "\r\n";
-    }
-    $parsed_req->{method} .= ' ';
-    $parsed_req->{url} .= ' ';
-    $parsed_req->{http_ver} .= "\r\n";
-    $parsed_req->{headers} = "Host: localhost\r\nConnection: $conn_header\r\n$more_headers$len_header\r\n";
-
-    #  Get the moves from parsing
-    my @elements_moves = get_moves($parsed_req);
-    # Apply them to the packets.
-    return apply_moves($request_packets, \@elements_moves);
-}
-
-#  Returns an array of array of hashes from the block. Each element of
-# the first-level array is a request.
-#  Each request is an array of the "packets" to be sent. Each packet is a
-# string to send, with an (optionnal) delay before sending it.
-#  This function parses (and therefore defines the syntax) of "request*"
-# sections. See documentation for supported syntax.
-sub get_req_from_block ($) {
-    my ($block) = @_;
-    my $name = $block->name;
-
-    my @req_list = ();
-
-    if ( defined $block->raw_request ) {
-
-        # Should be deprecated.
-        if ( ref $block->raw_request && ref $block->raw_request eq 'ARRAY' ) {
-
-            #  User already provided an array. So, he/she specified where the
-            # data should be split. This allows for backward compatibility but
-            # should use request with arrays as it provides the same functionnality.
-            my @rr_list = ();
-            for my $elt ( @{ $block->raw_request } ) {
-                push @rr_list, {value => $elt};
-            }
-            push @req_list, \@rr_list;
-        }
-        else {
-            push @req_list, [{value => $block->raw_request}];
-        }
-    }
-    else {
-        my $request;
-        if ( defined $block->request_eval ) {
-
-            diag "$name - request_eval DEPRECATED. Use request eval instead.";
-            $request = eval $block->request_eval;
-            if ($@) {
-                warn $@;
-            }
-        }
-        else {
-            $request = $block->request;
-        }
-
-        my $is_chunked   = 0;
-        my $more_headers = '';
-        if ( $block->more_headers ) {
-            my @headers = split /\n+/, $block->more_headers;
-            for my $header (@headers) {
-                next if $header =~ /^\s*\#/;
-                my ( $key, $val ) = split /:\s*/, $header, 2;
-                if ( lc($key) eq 'transfer-encoding' and $val eq 'chunked' ) {
-                    $is_chunked = 1;
-                }
-
-                #warn "[$key, $val]\n";
-                $more_headers .= "$key: $val\r\n";
-            }
-        }
-
-        if ( $block->pipelined_requests ) {
-            my $reqs = $block->pipelined_requests;
-            if ( !ref $reqs || ref $reqs ne 'ARRAY' ) {
-                Test::More::BAIL_OUT(
-                    "$name - invalid entries in --- pipelined_requests");
-            }
-            my $i = 0;
-            my $prq = "";
-            for my $request (@$reqs) {
-                my $conn_type;
-                if ( $i++ == @$reqs - 1 ) {
-                    $conn_type = 'close';
-                }
-                else {
-                    $conn_type = 'keep-alive';
-                }
-                my $r_br = build_request_from_packets($name, $more_headers,
-                                      $is_chunked, $conn_type,
-                                      [$request] );
-                $prq .= $$r_br[0];
-            }
-            push @req_list, [{value =>$prq}];
-        }
-        else {
-            # request section.
-            if (!ref $request) {
-                # One request and it is a good old string.
-                my $r_br = build_request_from_packets($name, $more_headers,
-                                                      $is_chunked, 'Close',
-                                                      [$request] );
-                push @req_list, [{value => $$r_br[0]}];
-            } elsif (ref $request eq 'ARRAY') {
-                # A bunch of requests...
-                for my $one_req (@$request) {
-                    if (!ref $one_req) {
-                        # This request is a good old string.
-                        my $r_br = build_request_from_packets($name, $more_headers,
-                                                      $is_chunked, 'Close',
-                                                      [$one_req] );
-                        push @req_list, [{value => $$r_br[0]}];
-                    } elsif (ref $one_req eq 'ARRAY') {
-                        # Request expressed as a serie of packets
-                        my @packet_array = ();
-                        for my $one_packet (@$one_req) {
-                            if (!ref $one_packet) {
-                                # Packet is a string.
-                                push @packet_array, $one_packet;
-                            } elsif (ref $one_packet eq 'HASH'){
-                                # Packet is a hash with a value...
-                                push @packet_array, $one_packet->{value};
-                            } else {
-                                Test::More::BAIL_OUT "$name - Invalid syntax. $one_packet should be a string or hash with value.";
-                            }
-                        }
-                        my $transformed_packet_array = build_request_from_packets($name, $more_headers,
-                                                   $is_chunked, 'Close',
-                                                   \@packet_array);
-                        my @transformed_req = ();
-                        my $idx = 0;
-                        for my $one_transformed_packet (@$transformed_packet_array) {
-                            if (!ref $$one_req[$idx]) {
-                                push @transformed_req, {value => $one_transformed_packet};
-                            } else {
-                                # Is a HASH (checked above as $one_packet)
-                                $$one_req[$idx]->{value} = $one_transformed_packet;
-                                push @transformed_req, $$one_req[$idx];
-                            }
-                            $idx++;
-                        }
-                        push @req_list, \@transformed_req;
-                    } else {
-                        Test::More::BAIL_OUT "$name - Invalid syntax. $one_req should be a string or an array of packets.";
-                    }
-                }
-            } else {
-                Test::More::BAIL_OUT(
-                    "$name - invalid ---request : MUST be string or array of requests");
-            }
-        }
-
-    }
-    return \@req_list;
-}
-
-sub run_test_helper ($$) {
-    my ( $block, $dry_run ) = @_;
-
-    my $name = $block->name;
-
-    my $r_req_list = get_req_from_block($block);
-
-    if ( $#$r_req_list < 0 ) {
-        Test::More::BAIL_OUT("$name - request empty");
-    }
-
-    #warn "request: $req\n";
-
-    my $timeout = $block->timeout;
-    if ( !defined $timeout ) {
-        $timeout = $Timeout;
-    }
-
-    my $req_idx = 0;
-    for my $one_req (@$r_req_list) {
-        my $raw_resp;
-
-        if ($dry_run) {
-            $raw_resp = "200 OK HTTP/1.0\r\nContent-Length: 0\r\n\r\n";
-        }
-        else {
-            $raw_resp = send_request( $one_req, $block->raw_request_middle_delay,
-                $timeout, $block->name );
-        }
-
-        #warn "raw resonse: [$raw_resp]\n";
-
-        my ($n, $need_array);
-
-        if ($block->pipelined_requests) {
-            $n = @{ $block->pipelined_requests };
-            $need_array = 1;
-
-        } else {
-            $need_array = $#$r_req_list > 0;
-        }
-
-again:
-        #warn "!!! resp: [$raw_resp]";
-        if (!defined $raw_resp) {
-            $raw_resp = '';
-        }
-
-        my ( $res, $raw_headers, $left ) = parse_response( $name, $raw_resp );
-
-        if (!$n) {
-            if ($left) {
-                my $name = $block->name;
-                $left =~ s/([\0-\037\200-\377])/sprintf('\x{%02x}',ord $1)/eg;
-                warn "WARNING: $name - unexpected extra bytes after last chunk in ",
-                    "response: \"$left\"\n";
-            }
-
-        } else {
-            $raw_resp = $left;
-            $n--;
-        }
-
-        check_error_code($block, $res, $dry_run, $req_idx, $need_array);
-        check_raw_response_headers($block, $raw_headers, $dry_run, $req_idx, $need_array);
-        check_response_headers($block, $res, $raw_headers, $dry_run, $req_idx, $need_array);
-        check_response_body($block, $res, $dry_run, $req_idx, $need_array);
-        $req_idx++;
-
-        if ($n) {
-            goto again;
-        }
-    }
-}
-
-#  Helper function to retrieve a "check" (e.g. error_code) section. This also
-# checks that tests with arrays of requests are arrays themselves.
-sub get_indexed_value($$$$) {
-    my ($name, $value, $req_idx, $need_array) = @_;
-    if ($need_array) {
-        if (ref $value && ref $value eq 'ARRAY') {
-            return $$value[$req_idx];
-        } else {
-            Test::More::BAIL_OUT("$name - You asked for many requests, the expected results should be arrays as well.");
-        }
-    } else {
-        # One element but still provided as an array.
-        if (ref $value && ref $value eq 'ARRAY') {
-            if ($req_idx != 0) {
-                Test::More::BAIL_OUT("$name - SHOULD NOT HAPPEN: idx != 0 and don't need array.");
-            } else {
-                return $$value[0];
-            }
-        } else {
-            return $value;
-        }
-    }
-}
-sub check_error_code($$$$$) {
-    my ($block, $res, $dry_run, $req_idx, $need_array) = @_;
-    my $name = $block->name;
-    SKIP: {
-        skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
-        if ( defined $block->error_code ) {
-            is( $res->code || '',
-                get_indexed_value($name, $block->error_code, $req_idx, $need_array),
-                "$name - status code ok" );
-        } else {
-            is( $res->code || '', 200, "$name - status code ok" );
-        }
-    }
-}
-sub check_raw_response_headers($$$$$) {
-    my ($block, $raw_headers, $dry_run, $req_idx, $need_array) = @_;
-    my $name = $block->name;
-    if ( defined $block->raw_response_headers_like ) {
-        SKIP: {
-            skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
-            my $expected = get_indexed_value($name,
-                                             $block->raw_response_headers_like,
-                                             $req_idx,
-                                             $need_array);
-            like $raw_headers, qr/$expected/s, "$name - raw resp headers like";
-        }
-    }
-}
-sub check_response_headers($$$$$) {
-    my ($block, $res, $raw_headers, $dry_run, $req_idx, $need_array) = @_;
-    my $name = $block->name;
-    if ( defined $block->response_headers ) {
-        my $headers = parse_headers( get_indexed_value($name,
-                                                       $block->response_headers,
-                                                       $req_idx,
-                                                       $need_array));
-        while ( my ( $key, $val ) = each %$headers ) {
-            if ( !defined $val ) {
-
-                #warn "HIT";
-                SKIP: {
-                    skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
-                    unlike $raw_headers, qr/^\s*\Q$key\E\s*:/ms,
-                      "$name - header $key not present in the raw headers";
-                }
-                next;
-            }
-
-            my $actual_val = $res->header($key);
-            if ( !defined $actual_val ) {
-                $actual_val = '';
-            }
-
-            SKIP: {
-                skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
-                is $actual_val, $val, "$name - header $key ok";
-            }
-        }
-    }
-    elsif ( defined $block->response_headers_like ) {
-        my $headers = parse_headers( get_indexed_value($name,
-                                                       $block->response_headers_like,
-                                                       $req_idx,
-                                                       $need_array) );
-        while ( my ( $key, $val ) = each %$headers ) {
-            my $expected_val = $res->header($key);
-            if ( !defined $expected_val ) {
-                $expected_val = '';
-            }
-            SKIP: {
-                skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
-                like $expected_val, qr/^$val$/, "$name - header $key like ok";
-            }
-        }
-    }
-}
-
-sub check_response_body() {
-    my ($block, $res, $dry_run, $req_idx, $need_array) = @_;
-    my $name = $block->name;
-    if (   defined $block->response_body
-        || defined $block->response_body_eval )
-    {
-        my $content = $res->content;
-        if ( defined $content ) {
-            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
-            $content =~ s/^Connection: TE, close\r\n//gms;
-        }
-
-        my $expected;
-        if ( $block->response_body_eval ) {
-            diag "$name - response_body_eval is DEPRECATED. Use response_body eval instead.";
-            $expected = eval get_indexed_value($name,
-                                               $block->response_body_eval,
-                                               $req_idx,
-                                               $need_array);
-            if ($@) {
-                warn $@;
-            }
-        }
-        else {
-            $expected = get_indexed_value($name,
-                                          $block->response_body,
-                                          $req_idx,
-                                          $need_array);
-        }
-
-        if ( $block->charset ) {
-            Encode::from_to( $expected, 'UTF-8', $block->charset );
-        }
-
-        unless (ref $expected) {
-            $expected =~ s/\$ServerPort\b/$ServerPort/g;
-            $expected =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
-        }
-
-        #warn show_all_chars($content);
-
-        #warn "no long string: $NoLongString";
-        SKIP: {
-            skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
-            if (ref $expected) {
-                like $content, $expected, "$name - response_body - like";
-
-            } else {
-                if ($NoLongString) {
-                    is( $content, $expected,
-                        "$name - response_body - response is expected" );
-                }
-                else {
-                    is_string( $content, $expected,
-                        "$name - response_body - response is expected" );
-                }
-            }
-        }
-
-    }
-    elsif ( defined $block->response_body_like ) {
-        my $content = $res->content;
-        if ( defined $content ) {
-            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
-        }
-        $content =~ s/^Connection: TE, close\r\n//gms;
-        my $expected_pat = get_indexed_value($name,
-                                             $block->response_body_like,
-                                             $req_idx,
-                                             $need_array);
-        $expected_pat =~ s/\$ServerPort\b/$ServerPort/g;
-        $expected_pat =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
-        my $summary = trim($content);
-
-        SKIP: {
-            skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
-            like( $content, qr/$expected_pat/s,
-                "$name - response_body_like - response is expected ($summary)"
-            );
-        }
-    } elsif ( defined $block->response_body_unlike ) {
-        my $content = $res->content;
-        if ( defined $content ) {
-            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
-        }
-        $content =~ s/^Connection: TE, close\r\n//gms;
-        my $expected_pat = get_indexed_value($name,
-                                             $block->response_body_unlike,
-                                             $req_idx,
-                                             $need_array);
-        $expected_pat =~ s/\$ServerPort\b/$ServerPort/g;
-        $expected_pat =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
-        my $summary = trim($content);
-
-        SKIP: {
-            skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
-            unlike( $content, qr/$expected_pat/s,
-                "$name - response_body_like - response is expected ($summary)"
-            );
-        }
-}
-
-sub parse_response($$) {
-    my ( $name, $raw_resp ) = @_;
-
-    my $left;
-
-    my $raw_headers = '';
-    if ( $raw_resp =~ /(.*?\r\n)\r\n/s ) {
-
-        #warn "\$1: $1";
-        $raw_headers = $1;
-    }
-
-    #warn "raw headers: $raw_headers\n";
-
-    my $res = HTTP::Response->parse($raw_resp);
-    my $enc = $res->header('Transfer-Encoding');
-
-    my $len = $res->header('Content-Length');
-
-    if ( defined $enc && $enc eq 'chunked' ) {
-
-        #warn "Found chunked!";
-        my $raw = $res->content;
-        if ( !defined $raw ) {
-            $raw = '';
-        }
-
-        my $decoded = '';
-        while (1) {
-            if ( $raw =~ /\G 0 [\ \t]* \r\n \r\n /gcsx ) {
-                if ( $raw =~ /\G (.+) /gcsx ) {
-                    $left = $1;
-                }
-
-                last;
-            }
-            if ( $raw =~ m{ \G [\ \t]* ( [A-Fa-f0-9]+ ) [\ \t]* \r\n }gcsx ) {
-                my $rest = hex($1);
-
-                #warn "chunk size: $rest\n";
-                my $bit_sz = 32765;
-                while ( $rest > 0 ) {
-                    my $bit = $rest < $bit_sz ? $rest : $bit_sz;
-
-                    #warn "bit: $bit\n";
-                    if ( $raw =~ /\G(.{$bit})/gcs ) {
-                        $decoded .= $1;
-
-                        #warn "decoded: [$1]\n";
-                    }
-                    else {
-                        fail(
-"$name - invalid chunked data received (not enought octets for the data section)"
-                        );
-                        return;
-                    }
-
-                    $rest -= $bit;
-                }
-                if ( $raw !~ /\G\r\n/gcs ) {
-                    fail(
-                        "$name - invalid chunked data received (expected CRLF)."
-                    );
-                    return;
-                }
-            }
-            elsif ( $raw =~ /\G.+/gcs ) {
-                fail "$name - invalid chunked body received: $&";
-                return;
-            }
-            else {
-                fail "$name - no last chunk found - $raw";
-                return;
-            }
-        }
-
-        #warn "decoded: $decoded\n";
-        $res->content($decoded);
-
-    } elsif (defined $len && $len ne '' && $len >= 0) {
-        my $raw = $res->content;
-        if (length $raw < $len) {
-            warn "WARNING: $name - response body truncated: ",
-                "$len expected, but got ", length $raw, "\n";
-
-        } elsif (length $raw > $len) {
-            my $content = substr $raw, 0, $len;
-            $left = substr $raw, $len;
-            $res->content($content);
-            #warn "parsed body: [", $res->content, "]\n";
-        }
-    }
-
-    return ( $res, $raw_headers, $left );
-}
-
-sub send_request ($$$$@) {
-    my ( $req, $middle_delay, $timeout, $name, $tries ) = @_;
-
-    my $sock = IO::Socket::INET->new(
-        PeerAddr => $ServerAddr,
-        PeerPort => $ServerPortForClient,
-        Proto    => 'tcp'
-    );
-
-    if (! defined $sock) {
-        $tries ||= 0;
-        if ($tries < 3) {
-            warn "Can't connect to $ServerAddr:$ServerPortForClient: $!\n";
-            sleep 1;
-            return send_request($req, $middle_delay, $timeout, $name, $tries + 1);
-        } else {
-            die "Can't connect to $ServerAddr:$ServerPortForClient: $!\n";
-        }
-    }
-
-    my @req_bits = ref $req ? @$req : ($req);
-
-    my $flags = fcntl $sock, F_GETFL, 0
-      or die "Failed to get flags: $!\n";
-
-    fcntl $sock, F_SETFL, $flags | O_NONBLOCK
-      or die "Failed to set flags: $!\n";
-
-    my $ctx = {
-        resp         => '',
-        write_offset => 0,
-        buf_size     => 1024,
-        req_bits     => \@req_bits,
-        write_buf    => (shift @req_bits)->{"value"},
-        middle_delay => $middle_delay,
-        sock         => $sock,
-        name         => $name,
-    };
-
-    my $readable_hdls = IO::Select->new($sock);
-    my $writable_hdls = IO::Select->new($sock);
-    my $err_hdls      = IO::Select->new($sock);
-
-    while (1) {
-        if (   $readable_hdls->count == 0
-            && $writable_hdls->count == 0
-            && $err_hdls->count == 0 )
-        {
-            last;
-        }
-
-        my ( $new_readable, $new_writable, $new_err ) =
-          IO::Select->select( $readable_hdls, $writable_hdls, $err_hdls,
-            $timeout );
-
-        if (   !defined $new_err
-            && !defined $new_readable
-            && !defined $new_writable )
-        {
-
-            # timed out
-            timeout_event_handler($ctx);
-            last;
-        }
-
-        for my $hdl (@$new_err) {
-            next if !defined $hdl;
-
-            error_event_handler($ctx);
-
-            if ( $err_hdls->exists($hdl) ) {
-                $err_hdls->remove($hdl);
-            }
-
-            if ( $readable_hdls->exists($hdl) ) {
-                $readable_hdls->remove($hdl);
-            }
-
-            if ( $writable_hdls->exists($hdl) ) {
-                $writable_hdls->remove($hdl);
-            }
-
-            for my $h (@$readable_hdls) {
-                next if !defined $h;
-                if ( $h eq $hdl ) {
-                    undef $h;
-                    last;
-                }
-            }
-
-            for my $h (@$writable_hdls) {
-                next if !defined $h;
-                if ( $h eq $hdl ) {
-                    undef $h;
-                    last;
-                }
-            }
-
-            close $hdl;
-        }
-
-        for my $hdl (@$new_readable) {
-            next if !defined $hdl;
-
-            my $res = read_event_handler($ctx);
-            if ( !$res ) {
-
-                # error occured
-                if ( $err_hdls->exists($hdl) ) {
-                    $err_hdls->remove($hdl);
-                }
-
-                if ( $readable_hdls->exists($hdl) ) {
-                    $readable_hdls->remove($hdl);
-                }
-
-                if ( $writable_hdls->exists($hdl) ) {
-                    $writable_hdls->remove($hdl);
-                }
-
-                for my $h (@$writable_hdls) {
-                    next if !defined $h;
-                    if ( $h eq $hdl ) {
-                        undef $h;
-                        last;
-                    }
-                }
-
-                close $hdl;
-            }
-        }
-
-        for my $hdl (@$new_writable) {
-            next if !defined $hdl;
-
-            my $res = write_event_handler($ctx);
-            if ( !$res ) {
-
-                # error occured
-                if ( $err_hdls->exists($hdl) ) {
-                    $err_hdls->remove($hdl);
-                }
-
-                if ( $readable_hdls->exists($hdl) ) {
-                    $readable_hdls->remove($hdl);
-                }
-
-                if ( $writable_hdls->exists($hdl) ) {
-                    $writable_hdls->remove($hdl);
-                }
-
-                close $hdl;
-
-            } elsif ( $res == 2 ) {
-                if ( $writable_hdls->exists($hdl) ) {
-                    $writable_hdls->remove($hdl);
-                }
-            }
-        }
-    }
-
-    return $ctx->{resp};
-}
-
-sub timeout_event_handler ($) {
-    my $ctx = shift;
-    warn "ERROR: socket client: timed out - $ctx->{name}\n";
-}
-
-sub error_event_handler ($) {
-    warn "exception occurs on the socket: $!\n";
-}
-
-sub write_event_handler ($) {
-    my ($ctx) = @_;
-
-    while (1) {
-        return undef if !defined $ctx->{write_buf};
-
-        my $rest = length( $ctx->{write_buf} ) - $ctx->{write_offset};
-
-  #warn "offset: $write_offset, rest: $rest, length ", length($write_buf), "\n";
-  #die;
-
-        if ( $rest > 0 ) {
-            my $bytes;
-            eval {
-                $bytes = syswrite(
-                    $ctx->{sock}, $ctx->{write_buf},
-                    $rest,        $ctx->{write_offset}
-                );
-            };
-
-            if ($@) {
-                my $errmsg = "write failed: $@";
-                warn "$errmsg\n";
-                $ctx->{resp} =  $errmsg;
-                return undef;
-            }
-
-            if ( !defined $bytes ) {
-                if ( $! == EAGAIN ) {
-
-                    #warn "write again...";
-                    #sleep 0.002;
-                    return 1;
-                }
-                my $errmsg = "write failed: $!";
-                warn "$errmsg\n";
-                if ( !$ctx->{resp} ) {
-                    $ctx->{resp} = "$errmsg";
-                }
-                return undef;
-            }
-
-            #warn "wrote $bytes bytes.\n";
-            $ctx->{write_offset} += $bytes;
-        }
-        else {
-            my $next_send = shift @{ $ctx->{req_bits} } or return 2;
-            $ctx->{write_buf} = $next_send->{'value'};
-            $ctx->{write_offset} = 0;
-            my $wait_time;
-            if (!defined $next_send->{'delay_before'}) {
-                if (defined $ctx->{middle_delay}) {
-                    $wait_time = $ctx->{middle_delay};
-                }
-            } else {
-                $wait_time = $next_send->{'delay_before'};
-            }
-            if ($wait_time) {
-                #warn "sleeping..";
-                sleep $wait_time;
-            }
-        }
-    }
-
-    # impossible to reach here...
-    return undef;
-}
-
-sub read_event_handler ($) {
-    my ($ctx) = @_;
-    while (1) {
-        my $read_buf;
-        my $bytes = sysread( $ctx->{sock}, $read_buf, $ctx->{buf_size} );
-
-        if ( !defined $bytes ) {
-            if ( $! == EAGAIN ) {
-
-                #warn "read again...";
-                #sleep 0.002;
-                return 1;
-            }
-            $ctx->{resp} = "500 read failed: $!";
-            return undef;
-        }
-
-        if ( $bytes == 0 ) {
-            return undef;    # connection closed
-        }
-
-        $ctx->{resp} .= $read_buf;
-
-        #warn "read $bytes ($read_buf) bytes.\n";
-    }
-
-    # impossible to reach here...
-    return undef;
-}
-
-1;
-__END__
-
-=encoding utf-8
-
-=head1 NAME
-
-Test::Nginx::Socket - Socket-backed test scaffold for the Nginx C modules
-
-=head1 SYNOPSIS
-
-    use Test::Nginx::Socket;
-
-    plan tests => $Test::Nginx::Socket::RepeatEach * 2 * blocks();
-
-    run_tests();
-
-    __DATA__
-
-    === TEST 1: sanity
-    --- config
-        location /echo {
-            echo_before_body hello;
-            echo world;
-        }
-    --- request
-        GET /echo
-    --- response_body
-    hello
-    world
-    --- error_code: 200
-
-
-    === TEST 2: set Server
-    --- config
-        location /foo {
-            echo hi;
-            more_set_headers 'Server: Foo';
-        }
-    --- request
-        GET /foo
-    --- response_headers
-    Server: Foo
-    --- response_body
-    hi
-
-
-    === TEST 3: clear Server
-    --- config
-        location /foo {
-            echo hi;
-            more_clear_headers 'Server: ';
-        }
-    --- request
-        GET /foo
-    --- response_headers_like
-    Server: nginx.*
-    --- response_body
-    hi
-
-
-    === TEST 3: chunk size too small
-    --- config
-        chunkin on;
-        location /main {
-            echo_request_body;
-        }
-    --- more_headers
-    Transfer-Encoding: chunked
-    --- request eval
-    "POST /main
-    4\r
-    hello\r
-    0\r
-    \r
-    "
-    --- error_code: 400
-    --- response_body_like: 400 Bad Request
-
-=head1 DESCRIPTION
-
-This module provides a test scaffold based on non-blocking L<IO::Socket> for automated testing in Nginx C module development.
-
-This class inherits from L<Test::Base>, thus bringing all its
-declarative power to the Nginx C module testing practices.
-
-You need to terminate or kill any Nginx processes before running the test suite if you have changed the Nginx server binary. Normally it's as simple as
-
-  killall nginx
-  PATH=/path/to/your/nginx-with-memc-module:$PATH prove -r t
-
-This module will create a temporary server root under t/servroot/ of the current working directory and starts and uses the nginx executable in the PATH environment.
-
-You will often want to look into F<t/servroot/logs/error.log>
-when things go wrong ;)
-
-=head1 Sections supported
-
-The following sections are supported:
-
-=head2 config
-
-Content of this section will be included in the "server" part of the generated
-config file. This is the place where you want to put the "location" directive
-enabling the module you want to test. Example:
-
-        location /echo {
-            echo_before_body hello;
-            echo world;
-        }
-
-Sometimes you simply don't want to bother copying ten times the same
-configuration for the ten tests you want to run against your module. One way
-to do this is to write a config section only for the first test in your C<.t>
-file. All subsequent tests will re-use the same config. Please note that this
-depends on the order of test, so you should run C<prove> with variable
-C<TEST_NGINX_NO_SHUFFLE=1> (see below for more on this variable).
-
-Please note that config section goes through environment variable expansion
-provided the variables to expand start with TEST_NGINX.
-So, the following is a perfectly legal (provided C<TEST_NGINX_HTML_DIR> is
-set correctly):
-
-    location /main {
-        echo_subrequest POST /sub -f $TEST_NGINX_HTML_DIR/blah.txt;
-    }
-
-=head2 http_config
-
-Content of this section will be included in the "http" part of the generated
-config file. This is the place where you want to put the "upstream" directive
-you might want to test. Example:
-
-    upstream database {
-        postgres_server     127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT
-                            dbname=ngx_test user=ngx_test
-                            password=wrong_pass;
-    }
-
-As you guessed from the example above, this section goes through environment
-variable expansion (variables have to start with TEST_NGINX).
-
-=head2 main_config
-
-Content of this section will be included in the "main" part of the generated
-config file. This is very rarely used, except if you are testing nginx core
-itself.
-
-This section goes through environment
-variable expansion (variables have to start with TEST_NGINX).
-
-=head2 request
-
-This is probably the most important section. It defines the request(s) you
-are going to send to the nginx server. It offers a pretty powerful grammar
-which we are going to walk through one example at a time.
-
-In its most basic form, this section looks like that:
-
-    --- request
-    GET
-
-This will just do a GET request on the root (i.e. /) of the server using
-HTTP/1.1.
-
-Of course, you might want to test something else than the root of your
-web server and even use a different version of HTTP. This is possible:
-
-    --- request
-    GET /foo HTTP/1.0
-
-Please note that specifying HTTP/1.0 will not prevent Test::Nginx from
-sending the C<Host> header. Actually Test::Nginx always sends 2 headers:
-C<Host> (with value localhost) and C<Connection> (with value Close for
-simple requests and keep-alive for all but the last pipelined_requests).
-
-You can also add a content to your request:
-
-    --- request
-    POST /foo
-    Hello world
-
-Test::Nginx will automatically calculate the content length and add the
-corresponding header for you.
-
-This being said, as soon as you want to POST real data, you will be interested
-in using the more_headers section and using the power of Test::Base filters
-to urlencode the content you are sending. Which gives us a
-slightly more realistic example:
-
-    --- more_headers
-    Content-type: application/x-www-form-urlencoded
-    --- request eval
-    use URI::Escape;
-    "POST /rrd/foo
-    value=".uri_escape("N:12345")
-
-Sometimes a test is more than one request. Typically you want to POST some
-data and make sure the data has been taken into account with a GET. You can
-do it using arrays:
-
-    --- request eval
-    ["POST /users
-    name=foo", "GET /users/foo"]
-
-This way, REST-like interfaces are pretty easy to test.
-
-When you develop nifty nginx modules you will eventually want to test things
-with buffers and "weird" network conditions. This is where you split
-your request into network packets:
-
-    --- request eval
-    [["POST /users\nna", "me=foo"]]
-
-Here, Test::Nginx will first send the request line, the headers it
-automatically added for you and the first two letters of the body ("na" in
-our example) in ONE network packet. Then, it will send the next packet (here
-it's "me=foo"). When we talk about packets here, this is nto exactly correct
-as there is no way to guarantee the behavior of the TCP/IP stack. What
-Test::Nginx can guarantee is that this will result in two calls to
-C<syswrite>.
-
-A good way to make I<almost> sure the two calls result in two packets is to
-introduce a delay (let's say 2 seconds)before sending the second packet:
-
-    --- request eval
-    [["POST /users\nna", {value => "me=foo", delay_before => 2}]]
-
-Of course, everything can be combined till your brain starts boiling ;) :
-
-    --- request eval
-    use URI::Escape;
-    my $val="value=".uri_escape("N:12346");
-    [["POST /rrd/foo
-    ".substr($val, 0, 6),
-    {value => substr($val, 6, 5), delay_before=>5},
-    substr($val, 11)],  "GET /rrd/foo"]
-
-=head2 request_eval
-
-Use of this section is deprecated and tests using it should replace it with
-a C<request> section with an C<eval> filter. More explicitly:
-
-    --- request_eval
-    "POST /echo_body
-    hello\x00\x01\x02
-    world\x03\x04\xff"
-
-should be replaced by:
-
-    --- request eval
-    "POST /echo_body
-    hello\x00\x01\x02
-    world\x03\x04\xff"
-
-=head2 pipelined_requests
-
-Specify pipelined requests that use a single keep-alive connection to the server.
-
-Here is an example from ngx_lua's test suite:
-
-    === TEST 7: discard body
-    --- config
-        location = /foo {
-            content_by_lua '
-                ngx.req.discard_body()
-                ngx.say("body: ", ngx.var.request_body)
-            ';
-        }
-        location = /bar {
-            content_by_lua '
-                ngx.req.read_body()
-                ngx.say("body: ", ngx.var.request_body)
-            ';
-        }
-    --- pipelined_requests eval
-    ["POST /foo
-    hello, world",
-    "POST /bar
-    hiya, world"]
-    --- response_body eval
-    ["body: nil\n",
-    "body: hiya, world\n"]
-
-=head2 more_headers
-
-Adds the content of this section as headers to the request being sent. Example:
-
-    --- more_headers
-    X-Foo: blah
-
-This will add C<X-Foo: blah> to the request (on top of the automatically
-generated headers like C<Host>, C<Connection> and potentially
-C<Content-Length>).
-
-=head2 response_body
-
-The expected value for the body of the submitted request.
-
-    --- response_body
-    hello
-
-If the test is made of multiple requests, then the response_body B<MUST>
-be an array and each request B<MUST> return the corresponding expected
-body:
-
-    --- request eval
-    ["GET /hello", "GET /world"]
-    --- response_body eval
-    ["hello", "world"]
-
-=head2 response_body_eval
-
-Use of this section is deprecated and tests using it should replace it
-with a C<request> section with an C<eval> filter. Therefore:
-
-    --- response_body_eval
-    "hello\x00\x01\x02
-    world\x03\x04\xff"
-
-should be replaced by:
-
-    --- response_body eval
-    "hello\x00\x01\x02
-    world\x03\x04\xff"
-
-=head2 response_body_like
-
-The body returned by the request MUST match the pattern provided by this
-section. Example:
-
-    --- response_body_like
-    ^elapsed 0\.00[0-5] sec\.$
-
-If the test is made of multiple requests, then response_body_like B<MUST>
-be an array and each request B<MUST> match the corresponding pattern.
-
-=head2 response_headers
-
-The headers specified in this section are in the response sent by nginx.
-
-    --- response_headers
-    Content-Type: application/x-resty-dbd-stream
-
-Of course, you can specify many headers in this section:
-
-    --- response_headers
-    X-Resty-DBD-Module:
-    Content-Type: application/x-resty-dbd-stream
-
-The test will be successful only if all headers are found in the response with
-the appropriate values.
-
-If the test is made of multiple requests, then response_headers B<MUST>
-be an array and each element of the array is checked against the
-response to the corresponding request.
-
-=head2 response_headers_like
-
-The value of the headers returned by nginx match the patterns.
-
-    --- response_headers_like
-    X-Resty-DBD-Module: ngx_drizzle \d+\.\d+\.\d+
-    Content-Type: application/x-resty-dbd-stream
-
-This will check that the response's C<Content-Type> is
-application/x-resty-dbd-stream and that the C<X-Resty-DBD-Module> matches
-C<ngx_drizzle \d+\.\d+\.\d+>.
-
-The test will be successful only if all headers are found in the response and
-if the values match the patterns.
-
-If the test is made of multiple requests, then response_headers_like B<MUST>
-be an array and each element of the array is checked against the
-response to the corresponding request.
-
-=head2 raw_response_headers_like
-
-Checks the headers part of the response against this pattern. This is
-particularly useful when you want to write tests of redirect functions
-that are not bound to the value of the port your nginx server (under
-test) is listening to:
-
-    --- raw_response_headers_like: Location: http://localhost(?::\d+)?/foo\r\n
-
-As usual, if the test is made of multiple requests, then
-raw_response_headers_like B<MUST> be an array.
-
-=head2 error_code
-
-The expected value of the HTTP response code. If not set, this is assumed
-to be 200. But you can expect other things such as a redirect:
-
-    --- error_code: 302
-
-If the test is made of multiple requests, then
-error_code B<MUST> be an array with the expected value for the response status
-of each request in the test.
-
-=head2 raw_request
-
-The exact request to send to nginx. This is useful when you want to test
-soem behaviors that are not available with "request" such as an erroneous
-C<Content-Length> header or splitting packets right in the middle of headers:
-
-    --- raw_request eval
-    ["POST /rrd/taratata HTTP/1.1\r
-    Host: localhost\r
-    Connection: Close\r
-    Content-Type: application/",
-    "x-www-form-urlencoded\r
-    Content-Length:15\r\n\r\nvalue=N%3A12345"]
-
-This can also be useful to tests "invalid" request lines:
-
-    --- raw_request
-    GET /foo HTTP/2.0 THE_FUTURE_IS_NOW
-
-=head2 user_files
-
-With this section you can create a file that will be copied in the
-html directory of the nginx server under test. For example:
-
-    --- user_files
-    >>> blah.txt
-    Hello, world
-
-will create a file named C<blah.txt> in the html directory of the nginx
-server tested. The file will contain the text "Hello, world".
-
-=head2 skip_nginx
-
-=head2 skip_nginx2
-
-Both string scalar and string arrays are supported as values.
-
-=head2 raw_request_middle_delay
-
-Delay in sec between sending successive packets in the "raw_request" array
-value. Also used when a request is split in packets.
-
-=head1 Environment variables
-
-All environment variables starting with C<TEST_NGINX_> are expanded in the
-sections used to build the configuration of the server that tests automatically
-starts. The following environment variables are supported by this module:
-
-=head2 TEST_NGINX_NO_NGINX_MANAGER
-
-Defaults to 0. If set to 1, Test::Nginx module will not manage
-(configure/start/stop) the C<nginx> process. Can be useful to run tests
-against an already configured (and running) nginx server.
-
-=head2 TEST_NGINX_NO_SHUFFLE
-
-Dafaults to 0. If set to 1, will make sure the tests are run in the order
-they appear in the test file (and not in random order).
-
-=head2 TEST_NGINX_USE_VALGRIND
-
-If set to 1, will start nginx with valgrind. nginx is actually started with
-C<valgrind -q --leak-check=full --gen-suppressions=all --suppressions=valgrind.suppress>,
-the suppressions option being used only if there is actually
-a valgrind.suppress file.
-
-=head2 TEST_NGINX_BINARY
-
-The command to start nginx. Defaults to C<nginx>. Can be used as an alternative
-to setting C<PATH> to run a specific nginx instance.
-
-=head2 TEST_NGINX_LOG_LEVEL
-
-Value of the last argument of the C<error_log> configuration directive.
-Defaults to C<debug>.
-
-=head2 TEST_NGINX_MASTER_PROCESS
-
-Value of the C<master_process> configuration directive. Defaults to C<off>.
-
-=head2 TEST_NGINX_SERVER_PORT
-
-Value of the port the server started by Test::Nginx will listen to. If not
-set, C<TEST_NGINX_PORT> is used. If C<TEST_NGINX_PORT> is not set,
-then C<1984> is used. See below for typical use.
-
-=head2 TEST_NGINX_CLIENT_PORT
-
-Value of the port Test::Nginx will diirect requests to. If not
-set, C<TEST_NGINX_PORT> is used. If C<TEST_NGINX_PORT> is not set,
-then C<1984> is used. A typical use of this feature is to test extreme
-network conditions by adding a "proxy" between Test::Nginx and nginx
-itself. This is described in the C<etcproxy integration> section of this
-module README.
-
-=head2 TEST_NGINX_PORT
-
-A shortcut for setting both C<TEST_NGINX_CLIENT_PORT> and
-C<TEST_NGINX_SERVER_PORT>.
-
-=head2 TEST_NGINX_SLEEP
-
-How much time (in seconds) should Test::Nginx sleep between two calls to C<syswrite> when
-sending request data. Defaults to 0.
-
-=head2 TEST_NGINX_FORCE_RESTART_ON_TEST
-
-Defaults to 1. If set to 0, Test::Nginx will not restart the nginx
-server when the config does not change between two tests.
-
-=head2 TEST_NGINX_SERVROOT
-
-The root of the nginx "hierarchy" (where you find the conf, *_tmp and logs
-directories). This value will be used with the C<-p> option of C<nginx>.
-Defaults to appending C<t/servroot> to the current directory.
-
-=head2 TEST_NGINX_IGNORE_MISSING_DIRECTIVES
-
-If set to 1 will SKIP all tests which C<config> sections resulted in a
-C<unknown directive> when trying to start C<nginx>. Useful when you want to
-run tests on a build of nginx that does not include all modules it should.
-By default, these tests will FAIL.
-
-=head2 TEST_NGINX_EVENT_TYPE
-
-This environment can be used to specify a event API type to be used by Nginx. Possible values are C<epoll>, C<kqueue>, C<select>, C<rtsig>, C<poll>, and others.
-
-For example,
-
-    $ TEST_NGINX_EVENT_TYPE=select prove -r t
-
-=head2 TEST_NGINX_ERROR_LOG
-
-Error log files from all tests will be appended to the file specified with
-this variable. There is no default value which disables the feature. This
-is very useful when debugging. By default, each test triggers a start/stop
-cycle for C<nginx>. All logs are removed before each restart, so you can
-only see the logs for the last test run (which you usually do not control
-except if you set C<TEST_NGINX_NO_SHUFFLE=1>). With this, you accumulate
-all logs into a single file that is never cleaned up by Test::Nginx.
-
-=head1 Samples
-
-You'll find live samples in the following Nginx 3rd-party modules:
-
-=over
-
-=item ngx_echo
-
-L<http://github.com/agentzh/echo-nginx-module>
-
-=item ngx_chunkin
-
-L<http://wiki.nginx.org/NginxHttpChunkinModule>
-
-=item ngx_memc
-
-L<http://wiki.nginx.org/NginxHttpMemcModule>
-
-=item ngx_drizzle
-
-L<http://github.com/chaoslawful/drizzle-nginx-module>
-
-=item ngx_rds_json
-
-L<http://github.com/agentzh/rds-json-nginx-module>
-
-=item ngx_xss
-
-L<http://github.com/agentzh/xss-nginx-module>
-
-=item ngx_srcache
-
-L<http://github.com/agentzh/srcache-nginx-module>
-
-=item ngx_lua
-
-L<http://github.com/chaoslawful/lua-nginx-module>
-
-=item ngx_set_misc
-
-L<http://github.com/agentzh/set-misc-nginx-module>
-
-=item ngx_array_var
-
-L<http://github.com/agentzh/array-var-nginx-module>
-
-=item ngx_form_input
-
-L<http://github.com/calio/form-input-nginx-module>
-
-=item ngx_iconv
-
-L<http://github.com/calio/iconv-nginx-module>
-
-=item ngx_set_cconv
-
-L<http://github.com/liseen/set-cconv-nginx-module>
-
-=item ngx_postgres
-
-L<http://github.com/FRiCKLE/ngx_postgres>
-
-=item ngx_coolkit
-
-L<http://github.com/FRiCKLE/ngx_coolkit>
-
-=back
-
-=head1 SOURCE REPOSITORY
-
-This module has a Git repository on Github, which has access for all.
-
-    http://github.com/agentzh/test-nginx
-
-If you want a commit bit, feel free to drop me a line.
-
-=head1 AUTHORS
-
-agentzh (章亦春) C<< <agentzh@gmail.com> >>
-
-Antoine BONAVITA C<< <antoine.bonavita@gmail.com> >>
-
-=head1 COPYRIGHT & LICENSE
-
-Copyright (c) 2009-2011, Taobao Inc., Alibaba Group (L<http://www.taobao.com>).
-
-Copyright (c) 2009-2011, agentzh C<< <agentzh@gmail.com> >>.
-
-Copyright (c) 2011, Antoine BONAVITA C<< <antoine.bonavita@gmail.com> >>.
-
-This module is licensed under the terms of the BSD license.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-=over
-
-=item *
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-=item *
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-=item *
-
-Neither the name of the Taobao Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-=back
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=head1 SEE ALSO
-
-L<Test::Nginx::LWP>, L<Test::Base>.
-
diff --git a/debian/modules/http-subs-filter/test/lib/Test/Nginx/Util.pm b/debian/modules/http-subs-filter/test/lib/Test/Nginx/Util.pm
deleted file mode 100644
index bcfcf19..0000000
--- a/debian/modules/http-subs-filter/test/lib/Test/Nginx/Util.pm
+++ /dev/null
@@ -1,874 +0,0 @@
-package Test::Nginx::Util;
-
-use strict;
-use warnings;
-
-our $VERSION = '0.17';
-
-use base 'Exporter';
-
-use POSIX qw( SIGQUIT SIGKILL SIGTERM );
-use File::Spec ();
-use HTTP::Response;
-use Cwd qw( cwd );
-use List::Util qw( shuffle );
-use Time::HiRes qw( sleep );
-use ExtUtils::MakeMaker ();
-
-our $LatestNginxVersion = 0.008039;
-
-our $NoNginxManager = $ENV{TEST_NGINX_NO_NGINX_MANAGER} || 0;
-our $Profiling = 0;
-
-our $RepeatEach = 1;
-our $MAX_PROCESSES = 10;
-
-our $NoShuffle = $ENV{TEST_NGINX_NO_SHUFFLE} || 0;
-
-our $UseValgrind = $ENV{TEST_NGINX_USE_VALGRIND};
-
-our $EventType = $ENV{TEST_NGINX_EVENT_TYPE};
-
-sub no_shuffle () {
-    $NoShuffle = 1;
-}
-
-sub no_nginx_manager () {
-    $NoNginxManager = 1;
-}
-
-our $ForkManager;
-
-if ($Profiling || $UseValgrind) {
-    eval "use Parallel::ForkManager";
-    if ($@) {
-        die "Failed to load Parallel::ForkManager: $@\n";
-    }
-    $ForkManager = new Parallel::ForkManager($MAX_PROCESSES);
-}
-
-our $NginxBinary            = $ENV{TEST_NGINX_BINARY} || 'nginx';
-our $Workers                = 1;
-our $WorkerConnections      = 64;
-our $LogLevel               = $ENV{TEST_NGINX_LOG_LEVEL} || 'debug';
-our $MasterProcessEnabled   = $ENV{TEST_NGINX_MASTER_PROCESS} || 'off';
-our $DaemonEnabled          = 'on';
-our $ServerPort             = $ENV{TEST_NGINX_SERVER_PORT} || $ENV{TEST_NGINX_PORT} || 1984;
-our $ServerPortForClient    = $ENV{TEST_NGINX_CLIENT_PORT} || $ENV{TEST_NGINX_PORT} || 1984;
-our $NoRootLocation         = 0;
-our $TestNginxSleep         = $ENV{TEST_NGINX_SLEEP} || 0;
-our $BuildSlaveName         = $ENV{TEST_NGINX_BUILDSLAVE};
-our $ForceRestartOnTest     = (defined $ENV{TEST_NGINX_FORCE_RESTART_ON_TEST})
-                               ? $ENV{TEST_NGINX_FORCE_RESTART_ON_TEST} : 1;
-
-sub server_port (@) {
-    if (@_) {
-        $ServerPort = shift;
-    } else {
-        $ServerPort;
-    }
-}
-
-sub repeat_each (@) {
-    if (@_) {
-        $RepeatEach = shift;
-    } else {
-        return $RepeatEach;
-    }
-}
-
-sub worker_connections (@) {
-    if (@_) {
-        $WorkerConnections = shift;
-    } else {
-        return $WorkerConnections;
-    }
-}
-
-sub no_root_location () {
-    $NoRootLocation = 1;
-}
-
-sub workers (@) {
-    if (@_) {
-        #warn "setting workers to $_[0]";
-        $Workers = shift;
-    } else {
-        return $Workers;
-    }
-}
-
-sub log_level (@) {
-    if (@_) {
-        $LogLevel = shift;
-    } else {
-        return $LogLevel;
-    }
-}
-
-sub master_on () {
-    $MasterProcessEnabled = 'on';
-}
-
-sub master_process_enabled (@) {
-    if (@_) {
-        $MasterProcessEnabled = shift() ? 'on' : 'off';
-    } else {
-        return $MasterProcessEnabled;
-    }
-}
-
-our @EXPORT_OK = qw(
-    setup_server_root
-    write_config_file
-    get_canon_version
-    get_nginx_version
-    trim
-    show_all_chars
-    parse_headers
-    run_tests
-    $ServerPortForClient
-    $ServerPort
-    $NginxVersion
-    $PidFile
-    $ServRoot
-    $ConfFile
-    $RunTestHelper
-    $NoNginxManager
-    $RepeatEach
-    worker_connections
-    workers
-    master_on
-    config_preamble
-    repeat_each
-    master_process_enabled
-    log_level
-    no_shuffle
-    no_root_location
-    html_dir
-    server_root
-    server_port
-    no_nginx_manager
-);
-
-
-if ($Profiling || $UseValgrind) {
-    $DaemonEnabled          = 'off';
-    $MasterProcessEnabled   = 'off';
-}
-
-our $ConfigPreamble = '';
-
-sub config_preamble ($) {
-    $ConfigPreamble = shift;
-}
-
-our $RunTestHelper;
-
-our $NginxVersion;
-our $NginxRawVersion;
-our $TODO;
-
-#our ($PrevRequest)
-our $PrevConfig;
-
-our $ServRoot   = $ENV{TEST_NGINX_SERVROOT} || File::Spec->catfile(cwd() || '.', 't/servroot');
-our $LogDir     = File::Spec->catfile($ServRoot, 'logs');
-our $ErrLogFile = File::Spec->catfile($LogDir, 'error.log');
-our $AccLogFile = File::Spec->catfile($LogDir, 'access.log');
-our $HtmlDir    = File::Spec->catfile($ServRoot, 'html');
-our $ConfDir    = File::Spec->catfile($ServRoot, 'conf');
-our $ConfFile   = File::Spec->catfile($ConfDir, 'nginx.conf');
-our $PidFile    = File::Spec->catfile($LogDir, 'nginx.pid');
-
-sub html_dir () {
-    return $HtmlDir;
-}
-
-sub server_root () {
-    return $ServRoot;
-}
-
-sub bail_out ($) {
-    Test::More::BAIL_OUT(@_);
-}
-
-sub run_tests () {
-    $NginxVersion = get_nginx_version();
-
-    if (defined $NginxVersion) {
-        #warn "[INFO] Using nginx version $NginxVersion ($NginxRawVersion)\n";
-    }
-
-    for my $block ($NoShuffle ? Test::Base::blocks() : shuffle Test::Base::blocks()) {
-        #for (1..3) {
-            run_test($block);
-        #}
-    }
-
-    if ($Profiling || $UseValgrind) {
-        $ForkManager->wait_all_children;
-    }
-}
-
-sub setup_server_root () {
-    if (-d $ServRoot) {
-        # Take special care, so we won't accidentally remove
-        # real user data when TEST_NGINX_SERVROOT is mis-used.
-        system("rm -rf $ConfDir > /dev/null") == 0 or
-            die "Can't remove $ConfDir";
-        system("rm -rf $HtmlDir > /dev/null") == 0 or
-            die "Can't remove $HtmlDir";
-        system("rm -rf $LogDir > /dev/null") == 0 or
-            die "Can't remove $LogDir";
-        system("rm -rf $ServRoot/*_temp > /dev/null") == 0 or
-            die "Can't remove $ServRoot/*_temp";
-        system("rmdir $ServRoot > /dev/null") == 0 or
-            die "Can't remove $ServRoot (not empty?)";
-    }
-    mkdir $ServRoot or
-        die "Failed to do mkdir $ServRoot\n";
-    mkdir $LogDir or
-        die "Failed to do mkdir $LogDir\n";
-    mkdir $HtmlDir or
-        die "Failed to do mkdir $HtmlDir\n";
-
-    my $index_file = "$HtmlDir/index.html";
-
-    open my $out, ">$index_file" or
-        die "Can't open $index_file for writing: $!\n";
-
-    print $out '<html><head><title>It works!</title></head><body>It works!</body></html>';
-
-    close $out;
-
-    mkdir $ConfDir or
-        die "Failed to do mkdir $ConfDir\n";
-}
-
-sub write_user_files ($) {
-    my $block = shift;
-
-    my $name = $block->name;
-
-    if ($block->user_files) {
-        my $raw = $block->user_files;
-
-        open my $in, '<', \$raw;
-
-        my @files;
-        my ($fname, $body, $date);
-        while (<$in>) {
-            if (/>>> (\S+)(?:\s+(.+))?/) {
-                if ($fname) {
-                    push @files, [$fname, $body, $date];
-                }
-
-                $fname = $1;
-                $date = $2;
-                undef $body;
-            } else {
-                $body .= $_;
-            }
-        }
-
-        if ($fname) {
-            push @files, [$fname, $body, $date];
-        }
-
-        for my $file (@files) {
-            my ($fname, $body, $date) = @$file;
-            #warn "write file $fname with content [$body]\n";
-
-            if (!defined $body) {
-                $body = '';
-            }
-
-            if ($fname =~ /(.*)\//) {
-                my $dir = "$HtmlDir/$1";
-                if (! -d $dir) {
-                    mkdir $dir or die "$name - Cannot create directory ", $dir;
-                }
-            }
-
-            open my $out, ">$HtmlDir/$fname" or
-                die "$name - Cannot open $HtmlDir/$fname for writing: $!\n";
-            print $out $body;
-            close $out;
-
-            if ($date) {
-                my $cmd = "touch -t '$date' $HtmlDir/$fname";
-                system($cmd) == 0 or
-                    die "Failed to run shell command: $cmd\n";
-            }
-        }
-    }
-}
-
-sub write_config_file ($$$) {
-    my ($config, $http_config, $main_config) = @_;
-
-    $http_config = expand_env_in_config($http_config);
-
-    if (!defined $config) {
-        $config = '';
-    }
-
-    if (!defined $http_config) {
-        $http_config = '';
-    }
-
-    if (!defined $main_config) {
-        $main_config = '';
-    }
-
-    open my $out, ">$ConfFile" or
-        die "Can't open $ConfFile for writing: $!\n";
-    print $out <<_EOC_;
-worker_processes  $Workers;
-daemon $DaemonEnabled;
-master_process $MasterProcessEnabled;
-error_log $ErrLogFile $LogLevel;
-pid       $PidFile;
-
-$main_config
-
-http {
-    access_log $AccLogFile;
-
-    default_type text/plain;
-    keepalive_timeout  68;
-
-$http_config
-
-    server {
-        listen          $ServerPort;
-        server_name     'localhost';
-
-        client_max_body_size 30M;
-        #client_body_buffer_size 4k;
-
-        # Begin preamble config...
-$ConfigPreamble
-        # End preamble config...
-
-        # Begin test case config...
-$config
-        # End test case config.
-
-_EOC_
-
-    if (! $NoRootLocation) {
-        print $out <<_EOC_;
-        location / {
-            root $HtmlDir;
-            index index.html index.htm;
-        }
-_EOC_
-    }
-
-    print $out <<_EOC_;
-    }
-}
-
-events {
-    worker_connections  $WorkerConnections;
-_EOC_
-
-    if ($EventType) {
-        print $out <<_EOC_;
-    use $EventType;
-_EOC_
-    }
-
-    print $out "}\n";
-
-    close $out;
-}
-
-sub get_canon_version (@) {
-    sprintf "%d.%03d%03d", $_[0], $_[1], $_[2];
-}
-
-sub get_nginx_version () {
-    my $out = `$NginxBinary -V 2>&1`;
-    if (!defined $out || $? != 0) {
-        warn "Failed to get the version of the Nginx in PATH.\n";
-    }
-    if ($out =~ m{(?:nginx|ngx_openresty)/(\d+)\.(\d+)\.(\d+)}s) {
-        $NginxRawVersion = "$1.$2.$3";
-        return get_canon_version($1, $2, $3);
-    }
-    warn "Failed to parse the output of \"nginx -V\": $out\n";
-    return undef;
-}
-
-sub get_pid_from_pidfile ($) {
-    my ($name) = @_;
-    open my $in, $PidFile or
-        bail_out("$name - Failed to open the pid file $PidFile for reading: $!");
-    my $pid = do { local $/; <$in> };
-    chomp $pid;
-    #warn "Pid: $pid\n";
-    close $in;
-    return $pid;
-}
-
-sub trim ($) {
-    (my $s = shift) =~ s/^\s+|\s+$//g;
-    $s =~ s/\n/ /gs;
-    $s =~ s/\s{2,}/ /gs;
-    $s;
-}
-
-sub show_all_chars ($) {
-    my $s = shift;
-    $s =~ s/\n/\\n/gs;
-    $s =~ s/\r/\\r/gs;
-    $s =~ s/\t/\\t/gs;
-    $s;
-}
-
-sub parse_headers ($) {
-    my $s = shift;
-    my %headers;
-    open my $in, '<', \$s;
-    while (<$in>) {
-        s/^\s+|\s+$//g;
-        my $neg = ($_ =~ s/^!\s*//);
-        #warn "neg: $neg ($_)";
-        if ($neg) {
-            $headers{$_} = undef;
-        } else {
-            my ($key, $val) = split /\s*:\s*/, $_, 2;
-            $headers{$key} = $val;
-        }
-    }
-    close $in;
-    return \%headers;
-}
-
-sub expand_env_in_config ($) {
-    my $config = shift;
-
-    if (!defined $config) {
-        return;
-    }
-
-    $config =~ s/\$(TEST_NGINX_[_A-Z0-9]+)/
-        if (!defined $ENV{$1}) {
-            bail_out "No environment $1 defined.\n";
-        }
-        $ENV{$1}/eg;
-
-    $config;
-}
-
-sub check_if_missing_directives () {
-    open my $in, $ErrLogFile or
-        bail_out "check_if_missing_directives: Cannot open $ErrLogFile for reading: $!\n";
-
-    while (<$in>) {
-        #warn $_;
-        if (/\[emerg\] \S+?: unknown directive "([^"]+)"/) {
-            #warn "MATCHED!!! $1";
-            return $1;
-        }
-    }
-
-    close $in;
-
-    #warn "NOT MATCHED!!!";
-
-    return 0;
-}
-
-sub run_test ($) {
-    my $block = shift;
-    my $name = $block->name;
-
-    my $config = $block->config;
-
-    $config = expand_env_in_config($config);
-
-    my $dry_run = 0;
-    my $should_restart = 1;
-    my $should_reconfig = 1;
-
-    if (!defined $config) {
-        if (!$NoNginxManager) {
-            # Manager without config.
-            if (!defined $PrevConfig) {
-                bail_out("$name - No '--- config' section specified and could not get previous one. Use TEST_NGINX_NO_NGINX_MANAGER ?");
-                die;
-            }
-            $should_reconfig = 0; # There is nothing to reconfig to.
-            $should_restart = $ForceRestartOnTest;
-        }
-        # else: not manager without a config. This is not a problem at all.
-        # setting these values to something meaningful but should not be used
-        $should_restart = 0;
-        $should_reconfig = 0;
-    } elsif ($NoNginxManager) {
-        # One config but not manager: it's worth a warning.
-        Test::Base::diag("NO_NGINX_MANAGER activated: config for $name ignored");
-        # Like above: setting them to something meaningful just in case.
-        $should_restart = 0;
-        $should_reconfig = 0;
-    } else {
-        # One config and manager. Restart only if forced to or if config
-        # changed.
-        if ((!defined $PrevConfig) || ($config ne $PrevConfig)) {
-            $should_reconfig = 1;
-        } else {
-            $should_reconfig = 0;
-        }
-        if ($should_reconfig || $ForceRestartOnTest) {
-            $should_restart = 1;
-        } else {
-            $should_restart = 0;
-        }
-    }
-
-    my $skip_nginx = $block->skip_nginx;
-    my $skip_nginx2 = $block->skip_nginx2;
-    my $skip_slave = $block->skip_slave;
-    my ($tests_to_skip, $should_skip, $skip_reason);
-    if (defined $skip_nginx) {
-        if ($skip_nginx =~ m{
-                ^ \s* (\d+) \s* : \s*
-                    ([<>]=?) \s* (\d+)\.(\d+)\.(\d+)
-                    (?: \s* : \s* (.*) )?
-                \s*$}x) {
-            $tests_to_skip = $1;
-            my ($op, $ver1, $ver2, $ver3) = ($2, $3, $4, $5);
-            $skip_reason = $6;
-            #warn "$ver1 $ver2 $ver3";
-            my $ver = get_canon_version($ver1, $ver2, $ver3);
-            if ((!defined $NginxVersion and $op =~ /^</)
-                    or eval "$NginxVersion $op $ver")
-            {
-                $should_skip = 1;
-            }
-        } else {
-            bail_out("$name - Invalid --- skip_nginx spec: " .
-                $skip_nginx);
-            die;
-        }
-    } elsif (defined $skip_nginx2) {
-        if ($skip_nginx2 =~ m{
-                ^ \s* (\d+) \s* : \s*
-                    ([<>]=?) \s* (\d+)\.(\d+)\.(\d+)
-                    \s* (or|and) \s*
-                    ([<>]=?) \s* (\d+)\.(\d+)\.(\d+)
-                    (?: \s* : \s* (.*) )?
-                \s*$}x) {
-            $tests_to_skip = $1;
-            my ($opa, $ver1a, $ver2a, $ver3a) = ($2, $3, $4, $5);
-            my $opx = $6;
-            my ($opb, $ver1b, $ver2b, $ver3b) = ($7, $8, $9, $10);
-            $skip_reason = $11;
-            my $vera = get_canon_version($ver1a, $ver2a, $ver3a);
-            my $verb = get_canon_version($ver1b, $ver2b, $ver3b);
-
-            if ((!defined $NginxVersion)
-                or (($opx eq "or") and (eval "$NginxVersion $opa $vera"
-                                        or eval "$NginxVersion $opb $verb"))
-                or (($opx eq "and") and (eval "$NginxVersion $opa $vera"
-                                        and eval "$NginxVersion $opb $verb")))
-            {
-                $should_skip = 1;
-            }
-        } else {
-            bail_out("$name - Invalid --- skip_nginx2 spec: " .
-                $skip_nginx2);
-            die;
-        }
-    } elsif (defined $skip_slave and defined $BuildSlaveName) {
-        if ($skip_slave =~ m{
-              ^ \s* (\d+) \s* : \s*
-                (\w+) \s* (?: (\w+) \s* )?  (?: (\w+) \s* )?
-                (?: \s* : \s* (.*) )? \s*$}x)
-        {
-            $tests_to_skip = $1;
-            my ($slave1, $slave2, $slave3) = ($2, $3, $4);
-            $skip_reason = $5;
-            if ((defined $slave1 and $slave1 eq "all")
-                or (defined $slave1 and $slave1 eq $BuildSlaveName)
-                or (defined $slave2 and $slave2 eq $BuildSlaveName)
-                or (defined $slave3 and $slave3 eq $BuildSlaveName)
-                )
-            {
-                $should_skip = 1;
-            }
-        } else {
-            bail_out("$name - Invalid --- skip_slave spec: " .
-                $skip_slave);
-            die;
-        }
-    }
-
-    if (!defined $skip_reason) {
-        $skip_reason = "various reasons";
-    }
-
-    my $todo_nginx = $block->todo_nginx;
-    my ($should_todo, $todo_reason);
-    if (defined $todo_nginx) {
-        if ($todo_nginx =~ m{
-                ^ \s*
-                    ([<>]=?) \s* (\d+)\.(\d+)\.(\d+)
-                    (?: \s* : \s* (.*) )?
-                \s*$}x) {
-            my ($op, $ver1, $ver2, $ver3) = ($1, $2, $3, $4);
-            $todo_reason = $5;
-            my $ver = get_canon_version($ver1, $ver2, $ver3);
-            if ((!defined $NginxVersion and $op =~ /^</)
-                    or eval "$NginxVersion $op $ver")
-            {
-                $should_todo = 1;
-            }
-        } else {
-            bail_out("$name - Invalid --- todo_nginx spec: " .
-                $todo_nginx);
-            die;
-        }
-    }
-
-    if (!defined $todo_reason) {
-        $todo_reason = "various reasons";
-    }
-
-    if (!$NoNginxManager && !$should_skip && $should_restart) {
-        if ($should_reconfig) {
-            $PrevConfig = $config;
-        }
-        my $nginx_is_running = 1;
-        if (-f $PidFile) {
-            my $pid = get_pid_from_pidfile($name);
-            if (!defined $pid or $pid eq '') {
-                undef $nginx_is_running;
-                goto start_nginx;
-            }
-
-            if (system("ps $pid > /dev/null") == 0) {
-                #warn "found running nginx...";
-                write_config_file($config, $block->http_config, $block->main_config);
-                if (kill(SIGQUIT, $pid) == 0) { # send quit signal
-                    #warn("$name - Failed to send quit signal to the nginx process with PID $pid");
-                }
-                sleep 0.02;
-                if (system("ps $pid > /dev/null") == 0) {
-                    #warn "killing with force...\n";
-                    kill(SIGKILL, $pid);
-                    sleep 0.02;
-                }
-                undef $nginx_is_running;
-            } else {
-                unlink $PidFile or
-                    die "Failed to remove pid file $PidFile\n";
-                undef $nginx_is_running;
-            }
-        } else {
-            undef $nginx_is_running;
-        }
-
-start_nginx:
-
-        unless ($nginx_is_running) {
-            #system("killall -9 nginx");
-
-            #warn "*** Restarting the nginx server...\n";
-            setup_server_root();
-            write_user_files($block);
-            write_config_file($config, $block->http_config, $block->main_config);
-            #warn "nginx binary: $NginxBinary";
-            if ( ! can_run($NginxBinary) ) {
-                bail_out("$name - Cannot find the nginx executable in the PATH environment");
-                die;
-            }
-        #if (system("nginx -p $ServRoot -c $ConfFile -t") != 0) {
-        #Test::More::BAIL_OUT("$name - Invalid config file");
-        #}
-        #my $cmd = "nginx -p $ServRoot -c $ConfFile > /dev/null";
-            if (!defined $NginxVersion) {
-                $NginxVersion = $LatestNginxVersion;
-            }
-
-            my $cmd;
-            if ($NginxVersion >= 0.007053) {
-                $cmd = "$NginxBinary -p $ServRoot/ -c $ConfFile > /dev/null";
-            } else {
-                $cmd = "$NginxBinary -c $ConfFile > /dev/null";
-            }
-
-            if ($UseValgrind) {
-                if (-f 'valgrind.suppress') {
-                    $cmd = "valgrind -q --leak-check=full --gen-suppressions=all --suppressions=valgrind.suppress $cmd";
-                } else {
-                    $cmd = "valgrind -q --leak-check=full --gen-suppressions=all $cmd";
-                }
-
-                warn "$name\n";
-                #warn "$cmd\n";
-            }
-
-            if ($Profiling || $UseValgrind) {
-                my $pid = $ForkManager->start;
-                if (!$pid) {
-                    # child process
-                    exec $cmd;
-
-=begin cmt
-
-                    if (system($cmd) != 0) {
-                        Test::More::BAIL_OUT("$name - Cannot start nginx using command \"$cmd\".");
-                    }
-
-                    $ForkManager->finish; # terminate the child process
-
-=end cmt
-
-=cut
-
-                }
-                #warn "sleeping";
-                if ($TestNginxSleep) {
-                    sleep $TestNginxSleep;
-                } else {
-                    sleep 1;
-                }
-            } else {
-                if (system($cmd) != 0) {
-                    if ($ENV{TEST_NGINX_IGNORE_MISSING_DIRECTIVES} and
-                            my $directive = check_if_missing_directives())
-                    {
-                        $dry_run = $directive;
-
-                    } else {
-                        bail_out("$name - Cannot start nginx using command \"$cmd\".");
-                    }
-                }
-            }
-
-            sleep 0.1;
-        }
-    }
-
-    if ($block->init) {
-        eval $block->init;
-        if ($@) {
-            bail_out("$name - init failed: $@");
-        }
-    }
-
-    my $i = 0;
-    while ($i++ < $RepeatEach) {
-        if ($should_skip) {
-            SKIP: {
-                Test::More::skip("$name - $skip_reason", $tests_to_skip);
-
-                $RunTestHelper->($block, $dry_run);
-            }
-        } elsif ($should_todo) {
-            TODO: {
-                local $TODO = "$name - $todo_reason";
-
-                $RunTestHelper->($block, $dry_run);
-            }
-        } else {
-            $RunTestHelper->($block, $dry_run);
-        }
-    }
-
-    if (my $total_errlog = $ENV{TEST_NGINX_ERROR_LOG}) {
-        my $errlog = "$LogDir/error.log";
-        if (-s $errlog) {
-            open my $out, ">>$total_errlog" or
-                die "Failed to append test case title to $total_errlog: $!\n";
-            print $out "\n=== $0 $name\n";
-            close $out;
-            system("cat $errlog >> $total_errlog") == 0 or
-                die "Failed to append $errlog to $total_errlog. Abort.\n";
-        }
-    }
-
-    if ($Profiling || $UseValgrind) {
-        #warn "Found quit...";
-        if (-f $PidFile) {
-            #warn "found pid file...";
-            my $pid = get_pid_from_pidfile($name);
-            if (system("ps $pid > /dev/null") == 0) {
-                write_config_file($config, $block->http_config, $block->main_config);
-                if (kill(SIGQUIT, $pid) == 0) { # send quit signal
-                    warn("$name - Failed to send quit signal to the nginx process with PID $pid");
-                }
-                if ($TestNginxSleep) {
-                    sleep $TestNginxSleep;
-                } else {
-                    sleep 0.1;
-                }
-                if (-f $PidFile) {
-                    #warn "killing with force (valgrind or profile)...\n";
-                    kill(SIGKILL, $pid);
-                    sleep 0.02;
-                } else {
-                    #warn "nginx killed";
-                }
-            } else {
-                unlink $PidFile or
-                    die "Failed to remove pid file $PidFile\n";
-            }
-        } else {
-            #warn "pid file not found";
-        }
-    }
-}
-
-END {
-    if ($UseValgrind || !$ENV{TEST_NGINX_NO_CLEAN}) {
-        local $?; # to avoid confusing Test::Builder::_ending
-        if (-f $PidFile) {
-            my $pid = get_pid_from_pidfile('');
-            if (!$pid) {
-                die "No pid found.";
-            }
-            if (system("ps $pid > /dev/null") == 0) {
-                if (kill(SIGQUIT, $pid) == 0) { # send quit signal
-                    #warn("Failed to send quit signal to the nginx process with PID $pid");
-                }
-                if ($TestNginxSleep) {
-                    sleep $TestNginxSleep;
-                } else {
-                    sleep 0.02;
-                }
-                if (system("ps $pid > /dev/null") == 0) {
-                    #warn "killing with force...\n";
-                    kill(SIGKILL, $pid);
-                    sleep 0.02;
-                }
-            } else {
-                unlink $PidFile;
-            }
-        }
-    }
-}
-
-# check if we can run some command
-sub can_run {
-	my ($cmd) = @_;
-
-        #warn "can run: @_\n";
-	my $_cmd = $cmd;
-	return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
-
-	for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
-		next if $dir eq '';
-		my $abs = File::Spec->catfile($dir, $_[0]);
-		return $abs if (-x $abs or $abs = MM->maybe_command($abs));
-	}
-
-	return;
-}
-
-1;
diff --git a/debian/modules/http-subs-filter/test/t/subs.t b/debian/modules/http-subs-filter/test/t/subs.t
deleted file mode 100644
index ad26c5d..0000000
--- a/debian/modules/http-subs-filter/test/t/subs.t
+++ /dev/null
@@ -1,136 +0,0 @@
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::LWP;
-
-plan tests => repeat_each() * 2 * blocks();
-$ENV{TEST_NGINX_BACKENDS_PORT} ||= "www.taobao.com:80";
-no_root_location();
-
-#no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: the "substitution" command
-
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    location / {
-        subs_filter 'taobao\.com' 'yaoweibin' ir;
-        proxy_set_header Host 'www.taobao.com';
-        proxy_pass http://backends;
-    }
---- request
-    GET /
---- response_body_unlike: ^(.*)taobao\.com(.*)$
-
-=== TEST 2: the "substitution" command with gzip
-
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    location / {
-        gzip on;
-        gzip_http_version 1.0;
-        proxy_set_header Accept-Encoding "";
-        proxy_pass http://yaoweibin.cn/test/subs/index.htm;
-        subs_filter 'taobao\.com' 'yaoweibin' ir;
-    }
---- request
-    GET /
---- more_headers
-Accept-Encoding:gzip;
---- response_body_like: ^(.*)$
-
-=== TEST 3: the "substitution" command with large line
-
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    location / {
-        subs_filter_types text/plain;
-        subs_filter 'a' 'b' ir;
-    }
---- user_files
->>> foo.txt
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
---- request
-    GET /foo.txt
---- response_body_like: ^[b ]+$
-
-=== TEST 4: the "substitution" command with large line
-
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    location / {
-        subs_filter_types text/plain;
-        subs_filter 'a' 'b' iro;
-    }
---- user_files
->>> foo.txt
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
---- request
-    GET /foo.txt
---- response_body_like: ^b[a ]+$
-
-=== TEST 5: the "substitution" command with large line
-
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    
-    location / {
-        subs_filter_types text/plain;
-        subs_filter 'a' 'b';
-    }
---- user_files
->>> foo.txt
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
---- request
-    GET /foo.txt
---- response_body_like: ^[b ]+$
-
-=== TEST 6: the "substitution" command with large line
-
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    
-    location / {
-        subs_filter_types text/plain;
-        subs_filter 'a' 'b' o;
-    }
---- user_files
->>> foo.txt
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
---- request
-    GET /foo.txt
---- response_body_like: ^b[a ]+$
diff --git a/debian/modules/http-subs-filter/test/t/subs_capture.t b/debian/modules/http-subs-filter/test/t/subs_capture.t
deleted file mode 100644
index 7ae6d29..0000000
--- a/debian/modules/http-subs-filter/test/t/subs_capture.t
+++ /dev/null
@@ -1,32 +0,0 @@
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::LWP;
-
-plan tests => repeat_each() * 2 * blocks();
-$ENV{TEST_NGINX_BACKENDS_PORT} ||= "www.taobao.com:80";
-no_root_location();
-
-#no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: the "regex with captures substitution" command
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-
-    location / {
-        subs_filter 'taobao.(com)' 'yaoweibin.$1' ir;
-        proxy_set_header Host 'www.taobao.com';
-        proxy_pass http://backends;
-    }
---- request
-    GET /
---- response_body_unlike: ^(.*)taobao.com(.*)$
diff --git a/debian/modules/http-subs-filter/test/t/subs_fix_string.t b/debian/modules/http-subs-filter/test/t/subs_fix_string.t
deleted file mode 100644
index 725125c..0000000
--- a/debian/modules/http-subs-filter/test/t/subs_fix_string.t
+++ /dev/null
@@ -1,32 +0,0 @@
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::LWP;
-
-plan tests => repeat_each() * 2 * blocks();
-$ENV{TEST_NGINX_BACKENDS_PORT} ||= "www.taobao.com:80";
-no_root_location();
-
-#no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: the "fix string substitution" command
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-
-    location / {
-        subs_filter 'taobao.com' 'yaoweibin';
-        proxy_set_header Host 'www.taobao.com';
-        proxy_pass http://backends;
-    }
---- request
-    GET /
---- response_body_unlike: ^(.*)taobao\.com(.*)$
diff --git a/debian/modules/http-subs-filter/test/t/subs_regex.t b/debian/modules/http-subs-filter/test/t/subs_regex.t
deleted file mode 100644
index 4e39a11..0000000
--- a/debian/modules/http-subs-filter/test/t/subs_regex.t
+++ /dev/null
@@ -1,108 +0,0 @@
-
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::LWP;
-
-plan tests => repeat_each() * 2 * blocks();
-$ENV{TEST_NGINX_BACKENDS_PORT} ||= "www.taobao.com:80";
-no_root_location();
-
-#no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: the "regex substitution" command
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-
-    location / {
-        subs_filter 'taobao.com' 'yaoweibin' ir;
-        proxy_set_header Host 'www.taobao.com';
-        proxy_pass http://backends;
-    }
---- request
-    GET /
---- response_body_unlike: ^(.*)taobao.com(.*)$
-
-=== TEST 2: the "subs_filter_bypass" directive, one variable
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    set $bypass "1";
-    location / {
-        subs_filter 'taobao.com' 'yaoweibin' ir;
-        subs_filter_bypass $bypass;
-        proxy_set_header Host 'www.taobao.com';
-        proxy_pass http://backends;
-    }
---- request
-    GET /
---- response_body_like: ^(.*)taobao.com(.*)$
-
-=== TEST 3: the "subs_filter_bypass" directive, two variables
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    set $foo "0";
-    set $bypass "1";
-    location / {
-        subs_filter 'taobao.com' 'yaoweibin' ir;
-        subs_filter_bypass $foo $bypass;
-        proxy_set_header Host 'www.taobao.com';
-        proxy_pass http://backends;
-    }
---- request
-    GET /
---- response_body_like: ^(.*)taobao.com(.*)$
-
-=== TEST 4: the "subs_filter_bypass" directive, raw string
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    location / {
-        subs_filter 'taobao.com' 'yaoweibin' ir;
-        subs_filter_bypass "1";
-        proxy_set_header Host 'www.taobao.com';
-        proxy_pass http://backends;
-    }
---- request
-    GET /
---- response_body_like: ^(.*)taobao.com(.*)$
-
-=== TEST 5: the "subs_filter_bypass" directive, raw string
---- http_config
-
-    upstream backends {
-        server $TEST_NGINX_BACKENDS_PORT;
-    }
-
---- config
-    location / {
-        subs_filter 'taobao.com' 'yaoweibin' ir;
-        subs_filter_bypass "0";
-        proxy_set_header Host 'www.taobao.com';
-        proxy_pass http://backends;
-    }
---- request
-    GET /
---- response_body_unlike: ^(.*)taobao.com(.*)$
diff --git a/debian/modules/http-subs-filter/test/t/subs_types.t b/debian/modules/http-subs-filter/test/t/subs_types.t
deleted file mode 100644
index 32e1d88..0000000
--- a/debian/modules/http-subs-filter/test/t/subs_types.t
+++ /dev/null
@@ -1,59 +0,0 @@
-# vi:filetype=perl
-
-use lib 'lib';
-use Test::Nginx::LWP;
-
-plan tests => repeat_each() * 2 * blocks();
-no_root_location();
-
-#no_diff;
-
-run_tests();
-
-__DATA__
-
-=== TEST 1: the "substitution" command with default types
---- config
-    location / {
-        subs_filter 'tom' 'yaoweibin' ir;
-        root html;
-    }
---- user_files
->>> a.html
-tom and jerry
---- request
-    GET /a.html
---- response_body_unlike: ^(.*)tom(.*)$
-
-=== TEST 2: the "substitution" command with css types
---- config
-    location / {
-        subs_filter_types text/css;
-        subs_filter 'tom' 'yaoweibin' ir;
-        root html;
-    }
---- user_files
->>> a.xml
-tom and jerry
---- request
-    GET /a.xml
---- response_body_like: ^(.*)tom(.*)$
-
-=== TEST 3: the "substitution" command with xml types
---- config
-    types {
-        text/html html;
-        text/xml xml;
-        text/css  css;
-    }
-    location / {
-        subs_filter_types text/xml;
-        subs_filter 'tom' 'yaoweibin' ir;
-        root html;
-    }
---- user_files
->>> a.xml
-tom and jerry
---- request
-    GET /a.xml
---- response_body_unlike: ^(.*)tom(.*)$
diff --git a/debian/modules/http-subs-filter/test/test.sh b/debian/modules/http-subs-filter/test/test.sh
deleted file mode 100755
index 3716b92..0000000
--- a/debian/modules/http-subs-filter/test/test.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-#TEST_NGINX_BACKENDS_PORT=127.0.0.1:1234 PATH=/home/yaoweibin/nginx/sbin:$PATH prove -r t
-
-PATH=/home/yaoweibin/nginx/sbin:$PATH prove -r t
diff --git a/debian/modules/http-subs-filter/util/update-readme.sh b/debian/modules/http-subs-filter/util/update-readme.sh
deleted file mode 100755
index 81498d5..0000000
--- a/debian/modules/http-subs-filter/util/update-readme.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-perl util/wiki2pod.pl doc/README.wiki > /tmp/a.pod && pod2text /tmp/a.pod > README
-
-perl util/wiki2pod.pl doc/README.wiki > /tmp/a.pod && pod2html /tmp/a.pod > doc/README.html
-
-perl util/wiki2google_code_homepage.pl doc/README.wiki > doc/README.google_code_home_page.wiki
diff --git a/debian/modules/http-subs-filter/util/wiki2google_code_homepage.pl b/debian/modules/http-subs-filter/util/wiki2google_code_homepage.pl
deleted file mode 100644
index 88970a6..0000000
--- a/debian/modules/http-subs-filter/util/wiki2google_code_homepage.pl
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-use bytes;
-
-while (<>) {
-
-    s{\s\[ ( [^\[\s]+ ) \]\s }{" `[`$1`]` "}gixe;
-
-    s{ \[\[ ( [^\]\|]+ ) \| ([^\]]*) \]\] }{"[$1 $2]"}gixe;
-
-    s{'''(.*?)'''}{"`$1`"}ge;
-    s{''(.*?)''}{"_$1_"}ge;
-
-    s{^\s*<[^/>]+>\s*$}{\{\{\{\n};
-    s{^\s*</[^/]+>\s*$}{\}\}\}};
-
-    if (/^\s*$/) {
-        print "\n";
-        next;
-    }
-
-    s{^\*}{ \*};
-    s{^\#}{ \#};
-
-    print $_;
-}
-
diff --git a/debian/modules/http-subs-filter/util/wiki2pod.pl b/debian/modules/http-subs-filter/util/wiki2pod.pl
deleted file mode 100644
index 34904fc..0000000
--- a/debian/modules/http-subs-filter/util/wiki2pod.pl
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-use bytes;
-
-my @nl_counts;
-my $last_nl_count_level;
-
-my @bl_counts;
-my $last_bl_count_level;
-
-sub fmt_pos ($) {
-    (my $s = $_[0]) =~ s{\#(.*)}{/"$1"};
-    $s;
-}
-
-sub fmt_mark ($$) {
-    my ($tag, $s) = @_;
-    my $max_level = 0;
-    while ($s =~ /([<>])\1*/g) {
-        my $level = length $&;
-        if ($level > $max_level) {
-            $max_level = $level;
-        }
-    }
-
-    my $times = $max_level + 1;
-    if ($times > 1) {
-        $s = " $s ";
-    }
-    return $tag . ('<' x $times) . $s . ('>' x $times);
-}
-
-while (<>) {
-    if ($. == 1) {
-        # strip the leading U+FEFF byte in MS-DOS text files
-        my $first = ord(substr($_, 0, 1));
-        #printf STDERR "0x%x", $first;
-        #my $second = ord(substr($_, 2, 1));
-        #printf STDERR "0x%x", $second;
-        if ($first == 0xEF) {
-            substr($_, 0, 1, '');
-            #warn "Hit!";
-        }
-    }
-    s{\[(http[^ \]]+) ([^\]]*)\]}{$2 (L<$1>)}gi;
-    s{ \[\[ ( [^\]\|]+ ) \| ([^\]]*) \]\] }{"L<$2|" . fmt_pos($1) . ">"}gixe;
-    s{<code>(.*?)</code>}{fmt_mark('C', $1)}gie;
-    s{'''(.*?)'''}{fmt_mark('B', $1)}ge;
-    s{''(.*?)''}{fmt_mark('I', $1)}ge;
-    if (s{^\s*<[^>]+>\s*$}{}) {
-        next;
-    }
-
-    if (/^\s*$/) {
-        print "\n";
-        next;
-    }
-
-=begin cmt
-
-    if ($. == 1) {
-        warn $_;
-        for my $i (0..length($_) - 1) {
-            my $chr = substr($_, $i, 1);
-            warn "chr ord($i): ".ord($chr)." \"$chr\"\n";
-        }
-    }
-
-=end cmt
-=cut
-
-    if (/(=+) (.*) \1$/) {
-        #warn "HERE! $_" if $. == 1;
-        my ($level, $title) = (length $1, $2);
-        collapse_lists();
-
-        print "\n=head$level $title\n\n";
-    } elsif (/^(\#+) (.*)/) {
-        my ($level, $txt) = (length($1) - 1, $2);
-        if (defined $last_nl_count_level && $level != $last_nl_count_level) {
-            print "\n=back\n\n";
-        }
-        $last_nl_count_level = $level;
-        $nl_counts[$level] ||= 0;
-        if ($nl_counts[$level] == 0) {
-            print "\n=over\n\n";
-        }
-        $nl_counts[$level]++;
-        print "\n=item $nl_counts[$level].\n\n";
-        print "$txt\n";
-    } elsif (/^(\*+) (.*)/) {
-        my ($level, $txt) = (length($1) - 1, $2);
-        if (defined $last_bl_count_level && $level != $last_bl_count_level) {
-            print "\n=back\n\n";
-        }
-        $last_bl_count_level = $level;
-        $bl_counts[$level] ||= 0;
-        if ($bl_counts[$level] == 0) {
-            print "\n=over\n\n";
-        }
-        $bl_counts[$level]++;
-        print "\n=item *\n\n";
-        print "$txt\n";
-    } else {
-        collapse_lists();
-        print;
-    }
-}
-
-collapse_lists();
-
-sub collapse_lists {
-    while (defined $last_nl_count_level && $last_nl_count_level >= 0) {
-        print "\n=back\n\n";
-        $last_nl_count_level--;
-    }
-    undef $last_nl_count_level;
-    undef @nl_counts;
-
-    while (defined $last_bl_count_level && $last_bl_count_level >= 0) {
-        print "\n=back\n\n";
-        $last_bl_count_level--;
-    }
-    undef $last_bl_count_level;
-    undef @bl_counts;
-}
-
diff --git a/debian/modules/http-uploadprogress/CHANGES b/debian/modules/http-uploadprogress/CHANGES
deleted file mode 100644
index 1de19aa..0000000
--- a/debian/modules/http-uploadprogress/CHANGES
+++ /dev/null
@@ -1,111 +0,0 @@
-nginx_upload_progress release 0.9.2                              03 Aug 2016
-
- * Allow to build as an externally loadable module (thanks to Peter Tonoli).
-
-nginx_upload_progress release 0.9.0                              06 Apr 2012
-
- * INCOMPATIBLE CHANGE: JSONP is now the default output for nginx upload
- progress module. To restore the old behavior, add:
-    upload_progress_java_output
- to your nginx configuration (thanks to drewbuschhorn for this work).
- 
- * Add instructions in the README on how to use this module with JQuery
- AJAX.
-
-nginx_upload_progress release 0.8.4                              24 Feb 2012
-
- * Fix compatibility with nginx 1.1.15
-
-nginx_upload_progress release 0.8.3                              11 Sep 2011
-
- * HTTP redirects (ie 3xx range) shouldn't be reported as an error (thanks to 
- Pierre-Yves Kerembellec)
- 
- * Fix a double remove in the rb tree due to an uninitialized flag (thanks to 
- Theo Cushion)
-
-nginx_upload_progress release 0.8.2                              07 Nov 2010
-
- * Session ID query string parameter name is now configurable (thanks to 
- Pierre-Yves Kerembellec)
- 
-nginx_upload_progress release 0.8.1                              27 Feb 2010
-
- * Fixed find_node so that it can find correctly nodes when there is an
- hash collision (thanks to Markus Doppelbauer for his detailed bug report
- and test case).
- 
-nginx_upload_progress release 0.8                                  19 Dec 2009
-
- * fixed segfault at start on some platforms (reported by Vladimir 
- Getmanshchuk and Denis Denisenko)
- 
- * implemented JSONP output (thanks to Bruno Deferrari)
- 
- * X-Progress-ID can now be the last parameter in the request (thanks to
- Bruno Deferrari)
- 
-nginx_upload_progress release 0.7                                  21 Nov 2009
-
- * fixed segfault when uploads are aborted (thanks to Markus Doppelbauer for
-   his bug report)
-
- * session ID header name is now configurable (thanks to Valery Kholodkov)
-
- * Added directive to format output as pure json (thanks to Valery Kholodkov)
-
- * Added directive to format output with configurable template (thanks to 
-   Valery Kholodkov)
-
- * Added directive to set a probe response content-type (thanks to Valery 
-   Kholodkov)
-
- * Added upload status variables (needs a status patch) (thanks to Valery 
-   Kholodkov)
-
-nginx_upload_progress release 0.6                                  12 Sep 2009
-
- * fixed node corruption when cleaning uploads (thanks to Vladimir 
-   Getmanshchuk for his detailed report)
-
-nginx_upload_progress release 0.5                                  28 Jun 2008
-
- * fixed progress probes returning "done" when upload was still in progress
-   (thanks to Alexandr Kutuzov for his detailed report)
-
- * fixed stuck worker process because of rescheduled timer when issuing a 
-   reload or graceful quit (thanks to Alexandr Kutuzov for his detailed
-   report)
-
-nginx_upload_progress release 0.4                                  18 May 2008
-
- * Incompatible change: track_uploads MUST be the last directive of a location
-   it also must be in a proxy_pass or fastcgi_pass location.
-
- * fixed multiple worker_process issue
-
- * fixed several crash conditions
-
-nginx_upload_progress release 0.3                                  06 May 2008
-
- * fixed crash if the upload was denied by nginx because of any error
-   condition (thanks to Michal Drapiewski for his detailed report)
-	 
- * report original upload error condition to client in the upload progress 
-   probe
- 
- * case-insensitive checking of the X-Progress-ID header to overcome Internet
-   Explorer XMLHttpRequest issue.
-
-nginx_upload_progress release 0.2                                  10 Oct 2007
-
- * the system now remembers old active uploads for 1 minute to be
-   able to send back either error status or done status to upload 
-	 progress probes.
-	 
- * track of HTTP error 413 (request entity too large) is implemented
-   and the error status '413' is returned.
-
-nginx_upload_progress release 0.1                                   3 Oct 2007
-
- * public release
diff --git a/debian/modules/http-uploadprogress/LICENSE b/debian/modules/http-uploadprogress/LICENSE
deleted file mode 100644
index 9dd8c0d..0000000
--- a/debian/modules/http-uploadprogress/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 
- * Copyright (C) 2007 Brice FIGUREAU
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
diff --git a/debian/modules/http-uploadprogress/Makefile b/debian/modules/http-uploadprogress/Makefile
deleted file mode 100644
index 96730d9..0000000
--- a/debian/modules/http-uploadprogress/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-dist: CHANGES README LICENSE config ngx_http_uploadprogress_module.c
-	tar czvf ../nginx_uploadprogress_module-0.7.tar.gz  \
-		 ../nginx_uploadprogress_module/CHANGES \
-		 ../nginx_uploadprogress_module/README \
-		 ../nginx_uploadprogress_module/LICENSE \
- 		 ../nginx_uploadprogress_module/config \
- 		 ../nginx_uploadprogress_module/ngx_http_uploadprogress_module.c
-		 		 
diff --git a/debian/modules/http-uploadprogress/README b/debian/modules/http-uploadprogress/README
deleted file mode 100644
index addd6cc..0000000
--- a/debian/modules/http-uploadprogress/README
+++ /dev/null
@@ -1,329 +0,0 @@
-Nginx Upload Progress Module
-============================
-
-Introduction
-============
-
-nginx_uploadprogress_module is an implementation of an upload progress system, that monitors
-RFC1867 POST upload as they are transmitted to upstream servers.
-
-It works by tracking the uploads proxied by Nginx to upstream servers without 
-analysing the uploaded content and offers a web API to report upload progress in Javscript, Json or any
-other format (through the help of templates).
-
-It works because Nginx acts as an accelerator of an upstream server, storing uploaded POST content
-on disk, before transmitting it to the upstream server. Each individual POST upload request
-should contain a progress unique identifier.
-
-This module is Copyright (c) 2007-2012 Brice Figureau, and is licensed under the BSD license (see LICENSE).
- * rbtree and shm_zone code is based on Igor Sysoev limit_zone Nginx module.
- * expire header code is based on Igor Sysoev header_filter Nginx module.
-
-The JSON idea and the mechanism idea are based on Lighttpd mod_uploadprogress:
-http://blog.lighttpd.net/articles/2006/08/01/mod_uploadprogress-is-back
-
-
-WARNING: 
- * when compiled with --with-debug, this module will produce high number of log messages.
-
-INCOMPATIBLE CHANGES
-====================
-
-v0.9.0:
-
-JSONP is now the default output of the progress probes. If you rely on this module serving
-the deprecated java output use:
-     upload_progress_java_output
-in the progress probe location.
-
-
-Installation
-============
-
-nginx_uploadprogress_module has been tested with Nginx 0.6.x, 0.7.x, 0.8.x and 1.0.x.
-
-Download the Nginx sources from http://nginx.net/ and unpack it.
-
-To build Nginx, change to the directory which contains the Nginx
-sources, and run the configuration script making sure to add the path
-to the nginx_uploadprogress_module sources using the --add-module option: ::
-
- $ ./configure --add-module=/path/to/nginx_uploadprogress_module/
-
-Now you can build and install the software:
-
- $ make
-
-and as root:
-
- $ make install 
- 
- 
-Configuration
-=============
-
-Each upload request should be assigned a unique identifier. This unique identifier will be used
-to store the request and reference it to report.
-This identifier can be transmitted either as a GET argument or as an HTTP header whose name is X-Progress-ID.
-
-upload_progress
-+++++++++++++++
-    :Syntax: upload_progress <zone_name> <zone_size>
-    :Default: none
-    :Context: http
-    :Description:
-    This directive enables the upload progress module and reserve <zone_size> bytes to the <zone_name> which
-    will be used to store the per-connection tracking information.
-    
-track_uploads
-+++++++++++++
-    :Syntax: track_uploads <zone_name> <timeout>
-    :Default: none
-    :Context: location
-    :Description:
-    This directive enables tracking uploads for the current location. Each POST landing in this location will register
-    the request in the <zone_name> upload progress tracker.
-    Since Nginx doesn't support yet RFC 1867 upload, the location must be a proxy_pass or fastcgi location.
-    The POST _must_ have a query parameter called X-Progress-ID (or an HTTP header of the same name) whose value is the
-    unique identifier used to get progress information. If the POST has no such information, the upload will not be tracked.
-    The tracked connections are kept at most <timeout> seconds after they have been finished to be able to serve 
-    useful information to upload progress probes.
-    WARNING: this directive must be the last directive of the location. It must be in a proxy_pass or 
-    fastcgi_pass location.
-    
-report_uploads
-++++++++++++++
-    :Syntax: report_uploads <zone_name>
-    :Default: none
-    :Context: location
-    :Description:
-    This directive allows a location to report the upload progress that is tracked by track_uploads for <zone_name>.
-    The returned document is a Javascript text with the possible 4 results by default:
-      * the upload request hasn't been registered yet or is unknown:             
-                new Object({ 'state' : 'starting' })
-                
-        * the upload request has ended:
-                new Object({ 'state' : 'done' })
-        
-        * the upload request generated an HTTP error
-                new Object({ 'state' : 'error', 'status' : <error code> })
-            one error code that can be of use to track for the client is 413 (request entity too large).
-        
-        * the upload request is in progress:
-                new Object({ 'state' : 'uploading', 'received' : <size_received>, 'size' : <total_size>})
-    
-    It is possible to return pure json instead of this javascript (see upload_progress_json_output).
-    It is also possible to configure completely the response format with the directive:
-            upload_progress_template
-
-    The HTTP request to this location must have a X-Progress-ID parameter or HTTP header containing a valid
-    unique identifier of an in progress upload.
-
-upload_progress_content_type
-++++++++++++++++++++++++++++
-    :Syntax: upload_progress_content_type <content_type>
-    :Default: text/javascript
-    :Context: location
-    :Description:
-    This directive allows to change the upload progress probe response content-type.
-
-upload_progress_header
-++++++++++++++++++++++
-    :Syntax: upload_progress_header <progress-id>
-    :Default: X-Progress-ID
-    :Context: location
-    :Description:
-    This directive allows to change the header name of the progress ID.
-
-upload_progress_jsonp_parameter
-++++++++++++++++++++++
-    :Syntax: upload_progress_jsonp_parameter <callback_parameter>
-    :Default: callback
-    :Context: location
-    :Description:
-    This directive allows to change the name of the GET parameter with the jsonp callback name.
-
-upload_progress_java_output
-+++++++++++++++++++++++++++
-    :Syntax: upload_progress_java_output
-    :Default: N/A
-    :Context: location
-    :Description:
-    This directive sets everything to output as eval() javascript compatible code.
-
-upload_progress_json_output
-+++++++++++++++++++++++++++
-    :Syntax: upload_progress_json_output
-    :Default: N/A
-    :Context: location
-    :Description:
-    This directive sets everything to output as pure json.
-
-upload_progress_jsonp_output
-++++++++++++++++++++++++++++
-    :Syntax: upload_progress_jsonp_output
-    :Default: N/A
-    :Context: location
-    :Description:
-    This directive sets everything to output as jsonp (like json output, but with callback).
-
-upload_progress_template
-++++++++++++++++++++++++
-    :Syntax: upload_progress_template <state> <template>
-    :Default: none
-    :Context: location
-    :Description:
-    This directive can be used to install a progress response template.
-    The available list of state is:
-        * starting
-        * uploading
-        * error
-        * done
-
-    Nginx will replace the value of the following variables with their respective
-    value for the upload:
-        * $uploadprogress_length: total size of the upload
-        * $uploadprogress_received: what the server has received so far
-        * $uploadprogress_status: error code in case of HTTP error
-        * $uploadprogress_callback: jsonp callback name if provided as a GET query parameter with name 'callback'
-    
-    For instance to return XML (instead of the default Javascript or json):
-
-    upload_progress_content_type 'text/xml';
-    upload_progress_template starting '<upload><state>starting</state></upload>';
-    upload_progress_template uploading '<upload><state>uploading</state><size>$uploadprogress_length</size><uploaded>$uploadprogress_received</uploaded></upload>';
-    upload_progress_template done '<upload><state>done</state></upload>';
-    upload_progress_template error '<upload><state>error</state><code>$uploadprogress_status</code></upload>';
-
-    Example of jsonp response:
-
-    upload_progress_template starting "$uploadprogress_callback({ \"state\" : \"starting\"});";
-    upload_progress_template error "$uploadprogress_callback({ \"state\" : \"error\", \"status\" : $uploadprogress_status });";
-    upload_progress_template done "$uploadprogress_callback({ \"state\" : \"done\"});";
-    upload_progress_template uploading "$uploadprogress_callback({ \"state\" : \"uploading\", \"received\" : $uploadprogress_received, \"size\" : $uploadprogress_length });";
-
-Configuration Example:
-+++++++++++++++++++++
-
-http {
-    
-    # reserve 1MB under the name 'proxied' to track uploads
-    upload_progress proxied 1m;
-
-  server {
-        listen       127.0.0.1 default;
-        server_name  _ *;
-        
-        root /path/to/root;
-        
-        location / {
-            # proxy to upstream server
-            proxy_pass http://127.0.0.1;
-            proxy_redirect default;
-            
-            # track uploads in the 'proxied' zone
-            # remember connections for 30s after they finished
-            track_uploads proxied 30s;
-        }
-        
-        location ^~ /progress {
-            # report uploads tracked in the 'proxied' zone
-            report_uploads proxied;
-        }
-}
-    
-
-Usage Example
-=============
-
-(based on Lighttd mod_uploadprogress module example):
-
-First we need a upload form:
-
-  <form id="upload" enctype="multipart/form-data" 
-    action="/upload.php" method="post" 
-    onsubmit="openProgressBar(); return true;">
-  <input type="hidden" name="MAX_FILE_SIZE" value="30000000"  />
-  <input name="userfile" type="file" label="fileupload" />
-  <input type="submit" value="Send File" />
-  </form>
-
-And a progress bar to visualize the progress:
-
-  <div>
-   <div id="progress" style="width: 400px; border: 1px solid black">
-    <div id="progressbar" 
-       style="width: 1px; background-color: black; border: 1px solid white">
-     &nbsp;
-    </div>
-   </div>
-   <div id="tp">(progress)</div>
-  </div>
-
-Then we need to generate the Unique Identifier and launch the upload on submit
-action. This also will start the ajax progress report mechanism.
-
- interval = null;
-
-function openProgressBar() {
- /* generate random progress-id */
- uuid = "";
- for (i = 0; i < 32; i++) {
-  uuid += Math.floor(Math.random() * 16).toString(16);
- }
- /* patch the form-action tag to include the progress-id */
- document.getElementById("upload").action="/upload.php?X-Progress-ID=" + uuid;
-
- /* call the progress-updater every 1000ms */
- interval = window.setInterval(
-   function () {
-     fetch(uuid);
-   },
-   1000
- );
-}
-
-function fetch(uuid) {
- req = new XMLHttpRequest();
- req.open("GET", "/progress", 1);
- req.setRequestHeader("X-Progress-ID", uuid);
- req.onreadystatechange = function () {
-  if (req.readyState == 4) {
-   if (req.status == 200) {
-    /* poor-man JSON parser */
-    var upload = eval(req.responseText);
-
-    document.getElementById('tp').innerHTML = upload.state;
-
-    /* change the width if the inner progress-bar */
-    if (upload.state == 'done' || upload.state == 'uploading') {
-     bar = document.getElementById('progressbar');
-     w = 400 * upload.received / upload.size;
-     bar.style.width = w + 'px';
-    }
-    /* we are done, stop the interval */
-    if (upload.state == 'done') {
-     window.clearTimeout(interval);
-    }
-   }
-  }
- }
- req.send(null);
-}
-
-Companion Software
-==================
-
-This software can also work with Valery Kholodkov' Nginx Upload Module:
-http://www.grid.net.ru/nginx/upload.en.html
-
-You can also use the following javascript libraries client side:
-http://drogomir.com/blog/2008/6/30/upload-progress-script-with-safari-support
-
-Note that when using jQuery AJAX for progress monitoring, such as:
-https://github.com/drogus/jquery-upload-progress
-you should be sure to set a upload_progress template parameter:
-upload_progress_json_output
-or
-upload_progress_jsonp_output
-depending on your jQuery AJAX dataType setting.
diff --git a/debian/modules/http-uploadprogress/config b/debian/modules/http-uploadprogress/config
deleted file mode 100644
index 364af8c..0000000
--- a/debian/modules/http-uploadprogress/config
+++ /dev/null
@@ -1,11 +0,0 @@
-ngx_addon_name=ngx_http_uploadprogress_module
-if test -n "$ngx_module_link"; then
-    ngx_module_type=FILTER
-    ngx_module_name=ngx_http_uploadprogress_module
-    ngx_module_srcs="$ngx_addon_dir/ngx_http_uploadprogress_module.c"
-
-    . auto/module
-else
-    HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES ngx_http_uploadprogress_module"
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_uploadprogress_module.c"
-fi
diff --git a/debian/modules/http-uploadprogress/ngx_http_uploadprogress_module.c b/debian/modules/http-uploadprogress/ngx_http_uploadprogress_module.c
deleted file mode 100644
index 9d7e4ce..0000000
--- a/debian/modules/http-uploadprogress/ngx_http_uploadprogress_module.c
+++ /dev/null
@@ -1,1774 +0,0 @@
-
-/*
- * Copyright (C) 2007 Brice Figureau
- * shm_zone and rbtree code Copyright (c) 2002-2007 Igor Sysoev
- */
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-
-#define TIMER_FREQUENCY 15 * 1000
-
-typedef enum {
-    uploadprogress_state_starting = 0,
-    uploadprogress_state_error = 1, 
-    uploadprogress_state_done = 2, 
-    uploadprogress_state_uploading = 3, 
-    uploadprogress_state_none
-} ngx_http_uploadprogress_state_t; 
-
-typedef struct {
-    ngx_str_t                           name;
-    ngx_http_uploadprogress_state_t     idx;
-} ngx_http_uploadprogress_state_map_t;
-
-typedef struct ngx_http_uploadprogress_node_s ngx_http_uploadprogress_node_t;
-
-struct ngx_http_uploadprogress_node_s {
-    ngx_rbtree_node_t                node;
-    ngx_uint_t                       err_status;
-    off_t                            rest;
-    off_t                            length;
-    ngx_uint_t                       done;
-    time_t                           timeout;
-    struct ngx_http_uploadprogress_node_s *prev;
-    struct ngx_http_uploadprogress_node_s *next;
-    u_char                           len;
-    u_char                           data[1];
-};
-
-typedef struct {
-    ngx_shm_zone_t                  *shm_zone;
-    ngx_rbtree_node_t               *node;
-    ngx_http_request_t              *r;
-    time_t                           timeout;
-} ngx_http_uploadprogress_cleanup_t;
-
-typedef struct {
-    ngx_rbtree_t                    *rbtree;
-    ngx_http_uploadprogress_node_t   list_head;
-    ngx_http_uploadprogress_node_t   list_tail;
-} ngx_http_uploadprogress_ctx_t;
-
-typedef struct {
-    ngx_array_t                     *values;
-    ngx_array_t                     *lengths;
-} ngx_http_uploadprogress_template_t;
-
-typedef struct {
-    ngx_shm_zone_t                  *shm_zone;
-    time_t                           timeout;
-    ngx_event_t                      cleanup;
-    ngx_http_handler_pt              handler;
-    u_char                           track;
-    ngx_str_t                        content_type;
-    ngx_array_t                      templates;
-    ngx_str_t                        header;
-    ngx_str_t                        jsonp_parameter;
-} ngx_http_uploadprogress_conf_t;
-
-typedef struct {
-    ngx_http_event_handler_pt        read_event_handler;
-} ngx_http_uploadprogress_module_ctx_t;
-
-static ngx_int_t ngx_http_reportuploads_handler(ngx_http_request_t *r);
-static void ngx_http_uploadprogress_cleanup(void *data);
-static char *ngx_http_report_uploads(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
-static ngx_int_t ngx_http_uploadprogress_init_zone(ngx_shm_zone_t * shm_zone, void *data);
-static ngx_int_t ngx_http_uploadprogress_init(ngx_conf_t * cf);
-static void *ngx_http_uploadprogress_create_loc_conf(ngx_conf_t *cf);
-static char *ngx_http_uploadprogress_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child);
-static ngx_int_t ngx_http_uploadprogress_init_variables_and_templates(ngx_conf_t *cf);
-
-static ngx_int_t ngx_http_uploadprogress_received_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-static ngx_int_t ngx_http_uploadprogress_offset_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-static ngx_int_t ngx_http_uploadprogress_status_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-static ngx_int_t ngx_http_uploadprogress_callback_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
-static char* ngx_http_upload_progress_set_template(ngx_conf_t * cf, ngx_http_uploadprogress_template_t *t, ngx_str_t *source);
-static char *ngx_http_track_uploads(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
-static char *ngx_http_report_uploads(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
-static char *ngx_http_upload_progress(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
-static char* ngx_http_upload_progress_template(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
-static char* ngx_http_upload_progress_java_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
-static char* ngx_http_upload_progress_json_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
-static char* ngx_http_upload_progress_jsonp_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
-static void ngx_clean_old_connections(ngx_event_t * ev);
-static ngx_int_t ngx_http_uploadprogress_content_handler(ngx_http_request_t *r);
-
-static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
-
-static ngx_command_t ngx_http_uploadprogress_commands[] = {
-
-    {ngx_string("upload_progress"),
-     NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE2,
-     ngx_http_upload_progress,
-     0,
-     0,
-     NULL},
-
-    {ngx_string("track_uploads"),
-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE2,
-     ngx_http_track_uploads,
-     NGX_HTTP_LOC_CONF_OFFSET,
-     0,
-     NULL},
-
-    {ngx_string("report_uploads"),
-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
-     ngx_http_report_uploads,
-     NGX_HTTP_LOC_CONF_OFFSET,
-     0,
-     NULL},
-
-    {ngx_string("upload_progress_content_type"),
-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
-     ngx_conf_set_str_slot,
-     NGX_HTTP_LOC_CONF_OFFSET,
-     offsetof(ngx_http_uploadprogress_conf_t, content_type),
-     NULL},
-
-    {ngx_string("upload_progress_template"),
-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE2,
-     ngx_http_upload_progress_template,
-     NGX_HTTP_LOC_CONF_OFFSET,
-     offsetof(ngx_http_uploadprogress_conf_t, templates),
-     NULL},
-
-    {ngx_string("upload_progress_java_output"),
-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_NOARGS,
-     ngx_http_upload_progress_java_output,
-     NGX_HTTP_LOC_CONF_OFFSET,
-     0,
-     NULL},
-
-    {ngx_string("upload_progress_json_output"),
-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_NOARGS,
-     ngx_http_upload_progress_json_output,
-     NGX_HTTP_LOC_CONF_OFFSET,
-     0,
-     NULL},
-
-    {ngx_string("upload_progress_jsonp_output"),
-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_NOARGS,
-     ngx_http_upload_progress_jsonp_output,
-     NGX_HTTP_LOC_CONF_OFFSET,
-     0,
-     NULL},
-
-    {ngx_string("upload_progress_header"),
-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
-     ngx_conf_set_str_slot,
-     NGX_HTTP_LOC_CONF_OFFSET,
-     offsetof(ngx_http_uploadprogress_conf_t, header),
-     NULL},
-
-    {ngx_string("upload_progress_jsonp_parameter"),
-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
-     ngx_conf_set_str_slot,
-     NGX_HTTP_LOC_CONF_OFFSET,
-     offsetof(ngx_http_uploadprogress_conf_t, jsonp_parameter),
-     NULL},
-
-    ngx_null_command
-};
-
-static ngx_http_variable_t  ngx_http_uploadprogress_variables[] = {
-
-    { ngx_string("uploadprogress_received"), NULL, ngx_http_uploadprogress_received_variable,
-      (uintptr_t) offsetof(ngx_http_uploadprogress_node_t, rest),
-      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
-
-    { ngx_string("uploadprogress_remaining"), NULL, ngx_http_uploadprogress_offset_variable,
-      (uintptr_t) offsetof(ngx_http_uploadprogress_node_t, rest),
-      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
-
-    { ngx_string("uploadprogress_length"), NULL, ngx_http_uploadprogress_offset_variable,
-      (uintptr_t) offsetof(ngx_http_uploadprogress_node_t, length),
-      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
-
-    { ngx_string("uploadprogress_status"), NULL, ngx_http_uploadprogress_status_variable,
-      (uintptr_t) offsetof(ngx_http_uploadprogress_node_t, err_status),
-      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
-
-    { ngx_string("uploadprogress_callback"), NULL, ngx_http_uploadprogress_callback_variable,
-      (uintptr_t) NULL,
-      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
-
-    { ngx_null_string, NULL, NULL, 0, 0, 0 }
-};
-
-static ngx_http_module_t         ngx_http_uploadprogress_module_ctx = {
-    ngx_http_uploadprogress_init_variables_and_templates,      /* preconfiguration */
-    ngx_http_uploadprogress_init,       /* postconfiguration */
-
-    NULL,                       /* create main configuration */
-    NULL,                       /* init main configuration */
-
-    NULL,                       /* create server configuration */
-    NULL,                       /* merge server configuration */
-
-    ngx_http_uploadprogress_create_loc_conf,    /* create location configuration */
-    ngx_http_uploadprogress_merge_loc_conf      /* merge location configuration */
-};
-
-
-ngx_module_t                     ngx_http_uploadprogress_module = {
-    NGX_MODULE_V1,
-    &ngx_http_uploadprogress_module_ctx,        /* module context */
-    ngx_http_uploadprogress_commands,   /* module directives */
-    NGX_HTTP_MODULE,            /* module type */
-    NULL,                       /* init master */
-    NULL,                       /* init module */
-    NULL,                       /* init process */
-    NULL,                       /* init thread */
-    NULL,                       /* exit thread */
-    NULL,                       /* exit process */
-    NULL,                       /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-static ngx_http_uploadprogress_state_map_t ngx_http_uploadprogress_state_map[] = {
-    {ngx_string("starting"),  uploadprogress_state_starting},
-    {ngx_string("error"),     uploadprogress_state_error},
-    {ngx_string("done"),      uploadprogress_state_done},
-    {ngx_string("uploading"), uploadprogress_state_uploading},
-    {ngx_null_string,         uploadprogress_state_none},
-};
-
-static ngx_str_t ngx_http_uploadprogress_java_defaults[] = {
-    ngx_string("new Object({ 'state' : 'starting' })\r\n"),
-    ngx_string("new Object({ 'state' : 'error', 'status' : $uploadprogress_status })\r\n"),
-    ngx_string("new Object({ 'state' : 'done' })\r\n"),
-    ngx_string("new Object({ 'state' : 'uploading', 'received' : $uploadprogress_received, 'size' : $uploadprogress_length })\r\n")
-};
-
-static ngx_str_t ngx_http_uploadprogress_json_defaults[] = {
-    ngx_string("{ \"state\" : \"starting\" }\r\n"),
-    ngx_string("{ \"state\" : \"error\", \"status\" : $uploadprogress_status }\r\n"),
-    ngx_string("{ \"state\" : \"done\" }\r\n"),
-    ngx_string("{ \"state\" : \"uploading\", \"received\" : $uploadprogress_received, \"size\" : $uploadprogress_length }\r\n")
-};
-
-static ngx_str_t ngx_http_uploadprogress_jsonp_defaults[] = {
-    ngx_string("$uploadprogress_callback({ \"state\" : \"starting\" });\r\n"),
-    ngx_string("$uploadprogress_callback({ \"state\" : \"error\", \"status\" : $uploadprogress_status });\r\n"),
-    ngx_string("$uploadprogress_callback({ \"state\" : \"done\" });\r\n"),
-    ngx_string("$uploadprogress_callback({ \"state\" : \"uploading\", \"received\" : $uploadprogress_received, \"size\" : $uploadprogress_length });\r\n")
-};
-
-
-static ngx_array_t ngx_http_uploadprogress_global_templates;
-
-static ngx_str_t*
-get_tracking_id(ngx_http_request_t * r)
-{
-    u_char                          *p, *start_p;
-    ngx_uint_t                       i;
-    ngx_list_part_t                 *part;
-    ngx_table_elt_t                 *header;
-    ngx_str_t                       *ret, args;
-    ngx_http_uploadprogress_conf_t  *upcf;
-
-    upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "upload-progress: get_tracking_id");
-
-    part = &r->headers_in.headers.part;
-    header = part->elts;
-
-    for (i = 0; /* void */ ; i++) {
-
-        if (i >= part->nelts) {
-            if (part->next == NULL) {
-                break;
-            }
-
-            part = part->next;
-            header = part->elts;
-            i = 0;
-        }
-
-        if (header[i].key.len == upcf->header.len
-            && ngx_strncasecmp(header[i].key.data, upcf->header.data,
-                           header[i].key.len) == 0) {
-            ret = ngx_calloc(sizeof(ngx_str_t), r->connection->log );
-            ret->data = header[i].value.data;
-            ret->len = header[i].value.len;
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 
-                            "upload-progress: get_tracking_id found header: %V", ret);
-            return ret;
-        }
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 
-                    "upload-progress: get_tracking_id no header found");
-
-    /* not found, check as a request arg */
-    /* it is possible the request args have not been yet created (or already released) */
-    /* so let's try harder first from the request line */
-    args.len =  r->args.len;
-    args.data = r->args.data;
-    
-    if (args.len && args.data) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 
-                       "upload-progress: get_tracking_id no header found, args found");
-        i = 0;
-        p = args.data;
-        do {
-            ngx_uint_t len = args.len - (p - args.data);
-            if (len >= (upcf->header.len + 1) && ngx_strncasecmp(p, upcf->header.data, upcf->header.len) == 0
-                && p[upcf->header.len] == '=') {
-              ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 
-                             "upload-progress: get_tracking_id found args: %s",p);
-                i = 1;
-                break;
-            }
-            if (len<=0)
-                break;
-        } 
-        while(p++);
-
-        if (i) {
-            start_p = p += upcf->header.len + 1;
-            while (p < args.data + args.len) {
-                if (*((p++) + 1) == '&') {
-                    break;
-                }
-            }
-
-            ret = ngx_calloc(sizeof(ngx_str_t), r->connection->log);
-            ret->data = start_p;
-            ret->len = p - start_p;
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 
-                           "upload-progress: get_tracking_id found args: %V",ret);
-            return ret;
-        }
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 
-                   "upload-progress: get_tracking_id no id found");
-    return NULL;
-}
-
-static ngx_http_uploadprogress_node_t *
-find_node(ngx_str_t * id, ngx_http_uploadprogress_ctx_t * ctx, ngx_log_t * log)
-{
-    uint32_t                         hash;
-    ngx_rbtree_node_t               *node, *sentinel;
-    ngx_int_t                        rc;
-    ngx_http_uploadprogress_node_t  *up;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "upload-progress: find_node %V", id);
-
-    hash = ngx_crc32_short(id->data, id->len);
-
-    node = ctx->rbtree->root;
-    sentinel = ctx->rbtree->sentinel;
-
-    while (node != sentinel) {
-
-        if (hash < node->key) {
-            node = node->left;
-            continue;
-        }
-
-        if (hash > node->key) {
-            node = node->right;
-            continue;
-        }
-
-        /* hash == node->key */
-
-        do {
-            up = (ngx_http_uploadprogress_node_t *) node;
-
-            rc = ngx_memn2cmp(id->data, up->data, id->len, (size_t) up->len);
-
-            if (rc == 0) {
-                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
-                               "upload-progress: found node");
-                return up;
-            }
-
-            node = (rc < 0) ? node->left : node->right;
-
-        } while (node != sentinel && hash == node->key);
-
-        /* found a key with unmatching hash (and value), let's keep comparing hashes then */
-    }
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "upload-progress: can't find node");
-    return NULL;
-}
-
-static void ngx_http_uploadprogress_event_handler(ngx_http_request_t *r);
-
-static ngx_int_t
-ngx_http_uploadprogress_content_handler(ngx_http_request_t *r)
-{
-    ngx_int_t                                    rc;
-    ngx_http_uploadprogress_module_ctx_t        *ctx;
-    ngx_http_uploadprogress_conf_t              *upcf;
-    
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "upload-progress: ngx_http_uploadprogress_content_handler");
-    upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
-
-    /* call the original request handler */
-    rc = upcf->handler(r);
-
-    /* bail out if error */
-    if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-      return rc;
-    }
-    
-    /* request is OK, hijack the read_event_handler if the request has to be tracked*/
-    ctx = ngx_http_get_module_ctx(r, ngx_http_uploadprogress_module);
-    if (ctx != NULL) {
-        ctx->read_event_handler = r->read_event_handler;
-        r->read_event_handler = ngx_http_uploadprogress_event_handler;
-    }
-    return rc;
-}
-
-static ngx_str_t* ngx_http_uploadprogress_strdup(ngx_str_t *src,  ngx_log_t * log)
-{
-    ngx_str_t *dst;
-    dst = ngx_alloc(src->len + sizeof(ngx_str_t), log);
-    if (dst == NULL) {
-        return NULL;
-    }
-
-    dst->len = src->len;
-    ngx_memcpy(((char*)dst + sizeof(ngx_str_t)) , src->data, src->len);
-    dst->data = ((u_char*)dst + sizeof(ngx_str_t));
-    return dst;
-}
-
-static void ngx_http_uploadprogress_strdupfree(ngx_str_t *str)
-{
-    ngx_free(str);
-}
-
-static void ngx_http_uploadprogress_event_handler(ngx_http_request_t *r)
-{
-    ngx_str_t                                   *id, *oldid;
-    ngx_slab_pool_t                             *shpool;
-    ngx_shm_zone_t                              *shm_zone;
-    ngx_http_uploadprogress_ctx_t               *ctx;
-    ngx_http_uploadprogress_node_t              *up;
-    ngx_http_uploadprogress_conf_t              *upcf;
-    ngx_http_uploadprogress_module_ctx_t        *module_ctx;
-    size_t                                       size;
-    off_t                                        rest;
-    
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "upload-progress: ngx_http_uploadprogress_event_handler");
-    
-    /* find node, update rest */
-    oldid = id = get_tracking_id(r);
-
-    if (id == NULL) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "upload-progress: read_event_handler cant find id");
-        return;
-    }
-
-    /* perform a deep copy of id */
-    id = ngx_http_uploadprogress_strdup(id, r->connection->log);
-    ngx_free(oldid);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "upload-progress: read_event_handler found id: %V", id);
-    upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
-    shm_zone = upcf->shm_zone;
-    
-    /* call the original read event handler */
-    module_ctx = ngx_http_get_module_ctx(r, ngx_http_uploadprogress_module);
-    if (module_ctx != NULL ) {
-        module_ctx->read_event_handler(r);
-    }
-
-    /* at this stage, r is not anymore safe to use */
-    /* the request could have been closed/freed behind our back */
-    /* and thats the same issue with any other material that was allocated in the request pool */
-    /* that's why we duplicate id afterward */
-
-    /* it's also possible that the id was null if we got a spurious (like abort) read */
-    /* event. In this case we still have called the original read event handler */
-    /* but we have to bail out, because we won't ever be able to find our upload node */
-
-
-    if (shm_zone == NULL) {
-        ngx_http_uploadprogress_strdupfree(id);
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "upload-progress: read_event_handler no shm_zone for id: %V", id);
-        return;
-    }
-
-    ctx = shm_zone->data;
-
-    /* get the original connection of the upload */
-    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-
-    ngx_shmtx_lock(&shpool->mutex);
-
-    up = find_node(id, ctx, ngx_cycle->log);
-    if (up != NULL && !up->done) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "upload-progress: read_event_handler found node: %V", id);
-        rest = r->request_body->rest;
-        size = r->request_body->buf->last - r->request_body->buf->pos;
-        if ((off_t) size < rest) {
-            rest -= size;
-        } else {
-            rest = 0;
-        }
-        
-        up->rest = rest;
-        if(up->length == 0)
-            up->length = r->headers_in.content_length_n;
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "upload-progress: read_event_handler storing rest %uO/%uO for %V", up->rest, up->length, id);
-    } else {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
-                       "upload-progress: read_event_handler not found: %V", id);
-    }
-    ngx_shmtx_unlock(&shpool->mutex);
-    ngx_http_uploadprogress_strdupfree(id);
-}
-
-/* This generates the response for the report */
-static ngx_int_t
-ngx_http_reportuploads_handler(ngx_http_request_t * r)
-{
-    ngx_str_t                       *id, response;
-    ngx_buf_t                       *b;
-    ngx_chain_t                      out;
-    ngx_int_t                        rc, found=0, done=0, err_status=0;
-    off_t                            rest=0, length=0;
-    ngx_uint_t                       len, i;
-    ngx_slab_pool_t                 *shpool;
-    ngx_http_uploadprogress_conf_t  *upcf;
-    ngx_http_uploadprogress_ctx_t   *ctx;
-    ngx_http_uploadprogress_node_t  *up;
-    ngx_table_elt_t                 *expires, *cc, **ccp;
-    ngx_http_uploadprogress_state_t  state;
-    ngx_http_uploadprogress_template_t  *t;
-
-    if (r->method != NGX_HTTP_GET && r->method != NGX_HTTP_HEAD) {
-        return NGX_HTTP_NOT_ALLOWED;
-    }
-
-    rc = ngx_http_discard_request_body(r);
-
-    if (rc != NGX_OK) {
-        return rc;
-    }
-
-    /* get the tracking id if any */
-    id = get_tracking_id(r);
-
-
-    if (id == NULL) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "reportuploads handler cant find id");
-        return NGX_DECLINED;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "reportuploads handler found id: %V", id);
-
-    upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
-
-    if (upcf->shm_zone == NULL) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "reportuploads no shm_zone for id: %V", id);
-        ngx_free(id);
-        return NGX_DECLINED;
-    }
-
-    ctx = upcf->shm_zone->data;
-
-    /* get the original connection of the upload */
-    shpool = (ngx_slab_pool_t *) upcf->shm_zone->shm.addr;
-
-    ngx_shmtx_lock(&shpool->mutex);
-
-    up = find_node(id, ctx, r->connection->log);
-    if (up != NULL) {
-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "reportuploads found node: %V (rest: %uO, length: %uO, done: %ui, err_status: %ui)", id, up->rest, up->length, up->done, up->err_status);
-        rest = up->rest;
-        length = up->length;
-        done = up->done;
-        err_status = up->err_status;
-        found = 1;
-    } else {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "reportuploads not found: %V", id);
-    }
-    ngx_shmtx_unlock(&shpool->mutex);
-	ngx_free(id);
-
-    /* send the output */
-    r->headers_out.content_type = upcf->content_type;
-
-    /* force no-cache */
-    expires = r->headers_out.expires;
-
-    if (expires == NULL) {
-
-        expires = ngx_list_push(&r->headers_out.headers);
-        if (expires == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        r->headers_out.expires = expires;
-
-        expires->hash = 1;
-        expires->key.len = sizeof("Expires") - 1;
-        expires->key.data = (u_char *) "Expires";
-    }
-
-    len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
-    expires->value.len = len - 1;
-
-    ccp = r->headers_out.cache_control.elts;
-    if (ccp == NULL) {
-
-        if (ngx_array_init(&r->headers_out.cache_control, r->pool,
-                           1, sizeof(ngx_table_elt_t *))
-            != NGX_OK) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        ccp = ngx_array_push(&r->headers_out.cache_control);
-        if (ccp == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        cc = ngx_list_push(&r->headers_out.headers);
-        if (cc == NULL) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
-        }
-
-        cc->hash = 1;
-        cc->key.len = sizeof("Cache-Control") - 1;
-        cc->key.data = (u_char *) "Cache-Control";
-
-        *ccp = cc;
-
-    } else {
-        for (i = 1; i < r->headers_out.cache_control.nelts; i++) {
-            ccp[i]->hash = 0;
-        }
-
-        cc = ccp[0];
-    }
-
-    expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT";
-
-    cc->value.len = sizeof("no-cache") - 1;
-    cc->value.data = (u_char *) "no-cache";
-
-
-    if (r->method == NGX_HTTP_HEAD) {
-        r->headers_out.status = NGX_HTTP_OK;
-
-        rc = ngx_http_send_header(r);
-
-        if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-            return rc;
-        }
-    }
-
-    ngx_http_set_ctx(r, up, ngx_http_uploadprogress_module);
-
-/*
- There are 4 possibilities
-   * request not yet started: found = false
-   * request in error:        err_status >= NGX_HTTP_BAD_REQUEST
-   * request finished:        done = true
-   * request not yet started but registered:        length==0 && rest ==0
-   * reauest in progress:     rest > 0 
- */
-
-    if (!found) {
-        state = uploadprogress_state_starting;
-    } else if (err_status >= NGX_HTTP_BAD_REQUEST) {
-        state = uploadprogress_state_error;
-    } else if (done) {
-        state = uploadprogress_state_done;
-    } else if ( length == 0 && rest == 0 ) {
-        state = uploadprogress_state_starting;
-    } else {
-        state = uploadprogress_state_uploading;
-    }
-
-    t = upcf->templates.elts;
-
-    if (ngx_http_script_run(r, &response, t[(ngx_uint_t)state].lengths->elts, 0,
-        t[(ngx_uint_t)state].values->elts) == NULL)
-    {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-        "upload progress: state=%d, err_status=%ui, remaining=%uO, length=%uO",
-        state, err_status, (length - rest), length);
-
-    b = ngx_calloc_buf(r->pool);
-    if (b == NULL) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    b->pos = b->start = response.data;
-    b->last = b->end = response.data + response.len;
-
-    b->temporary = 1;
-    b->memory = 1;
-
-    out.buf = b;
-    out.next = NULL;
-
-    r->headers_out.status = NGX_HTTP_OK;
-    r->headers_out.content_length_n = b->last - b->pos;
-
-    b->last_buf = 1;
-    rc = ngx_http_send_header(r);
-
-    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
-        return rc;
-    }
-
-    return ngx_http_output_filter(r, &out);
-}
-
-/* 
-Let's register the upload connection in our connections rb-tree
-*/
-static ngx_int_t
-ngx_http_uploadprogress_handler(ngx_http_request_t * r)
-{
-    size_t                           n;
-    ngx_str_t                       *id;
-    uint32_t                         hash;
-    ngx_slab_pool_t                 *shpool;
-    ngx_rbtree_node_t               *node;
-    ngx_http_uploadprogress_conf_t  *upcf;
-    ngx_http_uploadprogress_ctx_t   *ctx;
-    ngx_http_uploadprogress_node_t  *up;
-    ngx_http_uploadprogress_cleanup_t *upcln;
-    ngx_pool_cleanup_t              *cln;
-
-    /* Is it a POST connection */
-    if (r->method != NGX_HTTP_POST) {
-        return NGX_DECLINED;
-    }
-
-    id = get_tracking_id(r);
-    if (id == NULL) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "trackuploads no id found in POST upload req");
-        return NGX_DECLINED;
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "trackuploads id found: %V", id);
-
-    upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
-
-    if (!upcf->track) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "trackuploads not tracking in this location for id: %V", id);
-        ngx_free(id);
-        return NGX_DECLINED;
-    }
-
-    if (upcf->shm_zone == NULL) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "trackuploads no shm_zone for id: %V", id);
-        ngx_free(id);
-        return NGX_DECLINED;
-    }
-
-    ctx = upcf->shm_zone->data;
-
-    hash = ngx_crc32_short(id->data, id->len);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "trackuploads hash %08XD for id: %V", hash, id);
-
-    shpool = (ngx_slab_pool_t *) upcf->shm_zone->shm.addr;
-
-    ngx_shmtx_lock(&shpool->mutex);
-
-    if (find_node(id, ctx, r->connection->log) != NULL) {
-        ngx_shmtx_unlock(&shpool->mutex);
-        /* already found a node with matching progress ID */
-        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                      "upload_progress: tracking already registered id: %V", id);
-
-        ngx_free(id);
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    cln = ngx_pool_cleanup_add(r->pool, sizeof(ngx_http_uploadprogress_cleanup_t));
-    if (cln == NULL) {
-        ngx_shmtx_unlock(&shpool->mutex);
-        ngx_free(id);
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    n = sizeof(ngx_http_uploadprogress_node_t)
-        + id->len;
-
-    node = ngx_slab_alloc_locked(shpool, n);
-    if (node == NULL) {
-        ngx_shmtx_unlock(&shpool->mutex);
-        ngx_free(id);
-        return NGX_HTTP_SERVICE_UNAVAILABLE;
-    }
-
-    up = (ngx_http_uploadprogress_node_t *) node;
-
-    node->key = hash;
-    up->len = (u_char) id->len;
-    up->err_status = r->err_status;
-    up->done = 0;
-    up->rest = 0;
-    up->length = 0;
-    up->timeout = 0;
-
-    /* Properly handles small files where no read events happen after the */
-    /* request is first handled (apparently this can happen on linux with epoll) */
-    if (r->headers_in.content_length_n) {
-        up->length = r->headers_in.content_length_n;
-        if (r->request_body) {
-            up->rest = r->request_body->rest;
-        }
-    }
-
-    up->next = ctx->list_head.next;
-    up->next->prev = up;
-    up->prev = &ctx->list_head;
-    ctx->list_head.next = up;
-
-    ngx_memcpy(up->data, id->data, id->len);
-
-    ngx_rbtree_insert(ctx->rbtree, node);
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "trackuploads: %08XD inserted in rbtree", node->key);
-
-    if (!upcf->cleanup.timer_set) {
-        upcf->cleanup.data = upcf->shm_zone;
-        upcf->cleanup.handler = ngx_clean_old_connections;
-        upcf->cleanup.log = upcf->shm_zone->shm.log;
-        ngx_add_timer(&upcf->cleanup, TIMER_FREQUENCY);
-    }
-
-    ngx_shmtx_unlock(&shpool->mutex);
-
-    cln->handler = ngx_http_uploadprogress_cleanup;
-    upcln = cln->data;
-
-    upcln->shm_zone = upcf->shm_zone;
-    upcln->node = node;
-    upcln->timeout = upcf->timeout;
-    upcln->r = r;
-
-    ngx_free(id);
-
-    ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_uploadprogress_module_ctx_t));
-    if (ctx == NULL) {
-      return NGX_ERROR;
-    }
-
-    ngx_http_set_ctx(r, ctx, ngx_http_uploadprogress_module);
-
-    /* finally says to the core we don't handle anything */
-    return NGX_DECLINED;
-}
-
-static void
-ngx_http_uploadprogress_rbtree_insert_value(ngx_rbtree_node_t * temp,
-                                            ngx_rbtree_node_t * node,
-                                            ngx_rbtree_node_t * sentinel)
-{
-    ngx_http_uploadprogress_node_t  *upn, *upnt;
-
-    for (;;) {
-
-        if (node->key < temp->key) {
-
-            if (temp->left == sentinel) {
-                temp->left = node;
-                break;
-            }
-
-            temp = temp->left;
-
-        } else if (node->key > temp->key) {
-
-            if (temp->right == sentinel) {
-                temp->right = node;
-                break;
-            }
-
-            temp = temp->right;
-
-        } else {                /* node->key == temp->key */
-
-            upn = (ngx_http_uploadprogress_node_t *) node;
-            upnt = (ngx_http_uploadprogress_node_t *) temp;
-
-            if (ngx_memn2cmp(upn->data, upnt->data, upn->len, upnt->len) < 0) {
-
-                if (temp->left == sentinel) {
-                    temp->left = node;
-                    break;
-                }
-
-                temp = temp->left;
-
-            } else {
-
-                if (temp->right == sentinel) {
-                    temp->right = node;
-                    break;
-                }
-
-                temp = temp->right;
-            }
-        }
-    }
-
-    node->parent = temp;
-    node->left = sentinel;
-    node->right = sentinel;
-    ngx_rbt_red(node);
-}
-
-
-static void
-ngx_clean_old_connections(ngx_event_t * ev)
-{
-    ngx_shm_zone_t                  *shm_zone;
-    ngx_http_uploadprogress_ctx_t   *ctx;
-    ngx_slab_pool_t                 *shpool;
-    ngx_rbtree_node_t               *node;
-    ngx_http_uploadprogress_node_t  *up, *upprev;
-    time_t                           now = ngx_time();
-    int                              count = 0;
-
-
-    /* scan the rbtree */
-    shm_zone = ev->data;
-    ctx = shm_zone->data;
-    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0,
-                   "uploadprogress clean old connections at %T", now);
-
-    ngx_shmtx_lock(&shpool->mutex);
-    node = (ngx_rbtree_node_t *) ctx->list_tail.prev;
-    for (;;) {
-
-
-        if (node == &ctx->list_head.node) {
-            break;
-        }
-
-        up = (ngx_http_uploadprogress_node_t *) node;
-        upprev = up->prev;
-
-        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0,
-                       "uploadprogress clean: scanning %08XD (req done %ui) timeout at %T",
-                       node->key, up->done, up->timeout);
-
-        if ( (up->done && up->timeout < now) || (ngx_quit || ngx_terminate || ngx_exiting) ) {
-            up->next->prev = up->prev;
-            up->prev->next = up->next;
-
-            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0,
-                           "uploadprogress clean: removing %08XD (req %ui) ",
-                           node->key, up->done, up->timeout);
-
-            ngx_rbtree_delete(ctx->rbtree, node);
-            ngx_slab_free_locked(shpool, node);
-        }
-        else
-            count++;
-        node = (ngx_rbtree_node_t *) upprev;
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0,
-               "uploadprogress clean old connections: quit: %ui term: %ui count: %ui", ngx_quit, ngx_terminate, count);
-
-    /* don't reschedule timer if ngx_quit or ngx_terminate && nodes emtpy */
-    if ( count > 0 || !(ngx_quit || ngx_terminate || ngx_exiting)) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0,
-                   "uploadprogress clean old connections restarting timer");
-        ngx_add_timer(ev, TIMER_FREQUENCY);       /* trigger again in 60s */
-    } else if (ngx_quit || ngx_terminate || ngx_exiting) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0,
-                   "uploadprogress clean old connections quitting , no more active connections: not restarting timer");
-    }
-    ngx_shmtx_unlock(&shpool->mutex);
-}
-
-
-
-/*
-removes the expired node from the upload rbtree
-*/
-static void
-ngx_http_uploadprogress_cleanup(void *data)
-{
-    ngx_http_uploadprogress_cleanup_t *upcln = data;
-    ngx_slab_pool_t                 *shpool;
-    ngx_rbtree_node_t               *node;
-    ngx_http_uploadprogress_node_t  *up;
-    ngx_http_request_t              *r;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, upcln->shm_zone->shm.log, 0,
-                   "uploadprogress cleanup called");
-
-    shpool = (ngx_slab_pool_t *) upcln->shm_zone->shm.addr;
-    node = upcln->node;
-    r = upcln->r;
-    up = (ngx_http_uploadprogress_node_t *) node;
-
-    ngx_shmtx_lock(&shpool->mutex);
-    
-    up->done = 1;               /* mark the original request as done */
-    up->timeout = ngx_time() + upcln->timeout;      /* keep tracking for 60s */
-    
-    if (r != NULL ) {
-        ngx_uint_t rc = r->err_status ? r->err_status : r->headers_out.status;
-        if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
-            up->err_status = rc;
-        }
-    }
-    
-    ngx_shmtx_unlock(&shpool->mutex);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, upcln->shm_zone->shm.log, 0,
-                   "uploadprogress cleanup: connection %08XD to be deleted at %T",
-                   node->key, up->timeout);
-
-}
-
-static ngx_int_t
-ngx_http_uploadprogress_init_zone(ngx_shm_zone_t * shm_zone, void *data)
-{
-    ngx_http_uploadprogress_ctx_t   *octx = data;
-
-    ngx_slab_pool_t                 *shpool;
-    ngx_rbtree_node_t               *sentinel;
-    ngx_http_uploadprogress_ctx_t   *ctx;
-
-    ctx = shm_zone->data;
-
-    if (octx) {
-        ctx->rbtree = octx->rbtree;
-        return NGX_OK;
-    }
-
-    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-
-    ctx->rbtree = ngx_slab_alloc(shpool, sizeof(ngx_rbtree_t));
-    if (ctx->rbtree == NULL) {
-        return NGX_ERROR;
-    }
-
-    sentinel = ngx_slab_alloc(shpool, sizeof(ngx_rbtree_node_t));
-    if (sentinel == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_rbtree_sentinel_init(sentinel);
-
-    ctx->rbtree->root = sentinel;
-    ctx->rbtree->sentinel = sentinel;
-    ctx->rbtree->insert = ngx_http_uploadprogress_rbtree_insert_value;
-
-    return NGX_OK;
-}
-
-static ngx_int_t
-ngx_http_uploadprogress_errortracker(ngx_http_request_t * r)
-{
-    size_t                           n;
-    ngx_str_t                       *id;
-    ngx_slab_pool_t                 *shpool;
-    ngx_rbtree_node_t               *node;
-    ngx_http_uploadprogress_ctx_t   *ctx;
-    ngx_http_uploadprogress_node_t  *up;
-    ngx_http_uploadprogress_conf_t  *upcf;
-    uint32_t                         hash;
-    ngx_http_uploadprogress_cleanup_t *upcln;
-    ngx_pool_cleanup_t              *cln;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "uploadprogress error-tracker error: %D", r->err_status);
-    if (r->err_status >= NGX_HTTP_SPECIAL_RESPONSE) {
-
-        upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
-
-        if (!upcf->track) {
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "uploadprogress error-tracker not tracking in this location");
-            goto finish;
-        }
-
-        id = get_tracking_id(r);
-        if (id == NULL) {
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "trackuploads error-tracker no id found in POST upload req");
-            goto finish;
-        }
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "trackuploads error-tracker id found: %V", id);
-
-
-        if (upcf->shm_zone == NULL) {
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "trackuploads no shm_zone for id: %V", id);
-            ngx_free(id);
-            goto finish;
-        }
-
-        ctx = upcf->shm_zone->data;
-
-        hash = ngx_crc32_short(id->data, id->len);
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "trackuploads error-tracking hash %08XD for id: %V", hash,
-                       id);
-
-        shpool = (ngx_slab_pool_t *) upcf->shm_zone->shm.addr;
-
-        ngx_shmtx_lock(&shpool->mutex);
-
-        if ((up = find_node(id, ctx, r->connection->log)) != NULL) {
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "trackuploads error-tracking found node for id: %V", id);
-            up->err_status = r->err_status;
-            ngx_shmtx_unlock(&shpool->mutex);
-            ngx_free(id);
-            goto finish;
-        }
-
-        /* no lz found for this tracking id */
-        n = sizeof(ngx_http_uploadprogress_node_t) + id->len;
-
-        cln = ngx_pool_cleanup_add(r->pool, sizeof(ngx_http_uploadprogress_cleanup_t));
-        if (cln == NULL) {
-            ngx_shmtx_unlock(&shpool->mutex);
-            ngx_free(id);
-            goto finish;
-        }
-
-
-        node = ngx_slab_alloc_locked(shpool, n);
-        if (node == NULL) {
-            ngx_shmtx_unlock(&shpool->mutex);
-            ngx_free(id);							 
-            goto finish;
-        }
-
-        up = (ngx_http_uploadprogress_node_t *) node;
-
-        node->key = hash;
-        up->len = (u_char) id->len;
-        up->err_status = r->err_status;
-        up->done = 0;
-        up->rest = 0;
-        up->length = 0;
-        up->timeout = 0;
-
-        ngx_memcpy(up->data, id->data, id->len);
-
-        up->next = ctx->list_head.next;
-        up->next->prev = up;
-        up->prev = &ctx->list_head;
-        ctx->list_head.next = up;
-
-        ngx_rbtree_insert(ctx->rbtree, node);
-
-        /* start the timer if needed */
-        if (!upcf->cleanup.timer_set) {
-            upcf->cleanup.data = upcf->shm_zone;
-            upcf->cleanup.handler = ngx_clean_old_connections;
-            upcf->cleanup.log = upcf->shm_zone->shm.log;
-            ngx_add_timer(&upcf->cleanup, TIMER_FREQUENCY);
-        }
-
-        ngx_shmtx_unlock(&shpool->mutex);
-
-        cln->handler = ngx_http_uploadprogress_cleanup;
-        upcln = cln->data;
-        upcln->shm_zone = upcf->shm_zone;
-        upcln->node = node;
-        upcln->timeout = upcf->timeout;
-        upcln->r = r;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "trackuploads error-tracking adding: %08XD", node->key);
-        ngx_free(id);
-    }
-
-  finish:
-    /* call the filter chain as usual */
-    return ngx_http_next_header_filter(r);
-}
-
-
-static ngx_int_t
-ngx_http_uploadprogress_init(ngx_conf_t * cf)
-{
-    ngx_http_handler_pt             *h;
-    ngx_http_core_main_conf_t       *cmcf;
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    /* install the tracking handler */
-    h = ngx_array_push(&cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-
-    *h = ngx_http_uploadprogress_handler;
-
-    /* 
-       we also need to track HTTP errors 
-       unfortunately, the above handler is not called in case of 
-       errors.
-       we have to register a header output filter that will be
-       called in any case to track those errors
-     */
-    ngx_http_next_header_filter = ngx_http_top_header_filter;
-    ngx_http_top_header_filter = ngx_http_uploadprogress_errortracker;
-
-    return NGX_OK;
-}
-
-static void*
-ngx_http_uploadprogress_create_loc_conf(ngx_conf_t * cf)
-{
-    ngx_http_uploadprogress_conf_t  *conf;
-    ngx_uint_t                            i;
-
-    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_uploadprogress_conf_t));
-    if (conf == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    if(ngx_array_init(&conf->templates, cf->pool, 4, sizeof(ngx_http_uploadprogress_template_t)) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    for(i = 0;i < conf->templates.nalloc; i++) {
-        ngx_http_uploadprogress_template_t *elt = ngx_array_push(&conf->templates);
-        if (elt == NULL) {
-            return NGX_CONF_ERROR;
-        }
-        
-        elt->values = NULL;
-        elt->lengths = NULL;
-    } 
-
-    return conf;
-}
-
-
-static char*
-ngx_http_uploadprogress_merge_loc_conf(ngx_conf_t * cf, void *parent, void *child)
-{
-    ngx_http_uploadprogress_conf_t  *prev = parent;
-    ngx_http_uploadprogress_conf_t  *conf = child;
-    ngx_http_uploadprogress_template_t   *t, *pt, *gt;
-    ngx_uint_t                            i;
-
-    if (conf->shm_zone == NULL) {
-        conf->shm_zone = prev->shm_zone;
-        conf->timeout = prev->timeout;
-        conf->cleanup = prev->cleanup;
-        conf->handler = prev->handler;
-        conf->track = prev->track;
-    }
-
-    ngx_conf_merge_str_value(conf->content_type, prev->content_type, "text/javascript");
-
-    t = conf->templates.elts;
-    pt = prev->templates.elts;
-    gt = ngx_http_uploadprogress_global_templates.elts;
-
-    for(i = 0;i < conf->templates.nelts; i++) {
-        if(t[i].values == NULL) {
-            if(pt[i].values == NULL && gt != NULL) {
-                t[i].values = gt[i].values;
-                t[i].lengths = gt[i].lengths;
-            }
-            else {
-                t[i].values = pt[i].values;
-                t[i].lengths = pt[i].lengths;
-            }
-        }
-    } 
-
-    ngx_conf_merge_str_value(conf->header, prev->header, "X-Progress-ID");
-    ngx_conf_merge_str_value(conf->jsonp_parameter, prev->jsonp_parameter, "callback");
-
-    return NGX_CONF_OK;
-}
-
-static ngx_int_t
-ngx_http_uploadprogress_init_variables_and_templates(ngx_conf_t *cf)
-{
-    ngx_http_variable_t  *var, *v;
-    ngx_http_uploadprogress_state_map_t  *m;
-    ngx_uint_t                            i;
-
-    /* Add variables */
-    for (v = ngx_http_uploadprogress_variables; v->name.len; v++) {
-        var = ngx_http_add_variable(cf, &v->name, v->flags);
-        if (var == NULL) {
-            return NGX_ERROR;
-        }
-
-        var->get_handler = v->get_handler;
-        var->data = v->data;
-    }
-
-    /* Compile global templates (containing Javascript output) */
-    if(ngx_array_init(&ngx_http_uploadprogress_global_templates, cf->pool, 4,
-        sizeof(ngx_http_uploadprogress_template_t)) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    m = ngx_http_uploadprogress_state_map;
-    i = 0;
-
-    while(m->name.data != NULL) {
-        ngx_http_uploadprogress_template_t *elt = ngx_array_push(&ngx_http_uploadprogress_global_templates);
-        ngx_http_script_variables_count(ngx_http_uploadprogress_jsonp_defaults + i);
-
-        if (ngx_http_upload_progress_set_template(cf, elt, ngx_http_uploadprogress_jsonp_defaults + i) != NGX_CONF_OK) {
-            return NGX_ERROR;
-        }
-        
-        m++;
-        i++;
-    }
-
-
-    return NGX_OK;
-}
-
-static char*
-ngx_http_upload_progress(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
-{
-    ssize_t                          n;
-    ngx_str_t                       *value;
-    ngx_shm_zone_t                  *shm_zone;
-    ngx_http_uploadprogress_ctx_t   *ctx;
-
-    value = cf->args->elts;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-                   "ngx_upload_progress name: %V", &value[1]);
-
-    ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_uploadprogress_ctx_t));
-    if (ctx == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ctx->list_head.prev = NULL;
-    ctx->list_head.next = &ctx->list_tail;
-
-    ctx->list_tail.prev = &ctx->list_head;
-    ctx->list_tail.next = NULL;
-
-    n = ngx_parse_size(&value[2]);
-
-    if (n == NGX_ERROR) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid size of track_uploads \"%V\"", &value[2]);
-        return NGX_CONF_ERROR;
-    }
-
-    if (n < (ngx_int_t) (8 * ngx_pagesize)) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "track_uploads \"%V\" is too small", &value[1]);
-        return NGX_CONF_ERROR;
-    }
-
-    shm_zone = ngx_shared_memory_add(cf, &value[1], n,
-                                     &ngx_http_uploadprogress_module);
-    if (shm_zone == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-                   "ngx_upload_progress name: %V, szhm_zone: %p", &value[1],
-                   shm_zone);
-
-    if (shm_zone->data) {
-        ctx = shm_zone->data;
-
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "track_uploads \"%V\" is already created", &value[1]);
-        return NGX_CONF_ERROR;
-    }
-
-    shm_zone->init = ngx_http_uploadprogress_init_zone;
-    shm_zone->data = ctx;
-
-    return NGX_CONF_OK;
-}
-
-
-
-static char*
-ngx_http_track_uploads(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
-{
-    ngx_http_core_loc_conf_t        *clcf;
-    ngx_http_uploadprogress_conf_t  *lzcf = conf;
-    ngx_str_t                       *value;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "ngx_track_uploads in");
-
-    value = cf->args->elts;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-                   "ngx_track_uploads name: %V", &value[1]);
-
-    lzcf->shm_zone = ngx_shared_memory_add(cf, &value[1], 0,
-                                           &ngx_http_uploadprogress_module);
-    if (lzcf->shm_zone == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    lzcf->track = (u_char) 1;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-                   "ngx_track_uploads name: %V,szhm_zone: %p", &value[1],
-                   lzcf->shm_zone);
-
-
-    lzcf->timeout = ngx_parse_time(&value[2], 1);
-    if (lzcf->timeout == NGX_ERROR) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "track_uploads \"%V\" timeout value invalid", &value[1]);
-        return NGX_CONF_ERROR;
-    }
-
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-    lzcf->handler = clcf->handler;
-    if ( lzcf->handler == NULL )
-    {
-        return "track_upload should be the last directive in the location, after either proxy_pass or fastcgi_pass";
-    }
-    clcf->handler = ngx_http_uploadprogress_content_handler;
-    return NGX_CONF_OK;
-}
-
-
-static char*
-ngx_http_report_uploads(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
-{
-    ngx_http_uploadprogress_conf_t  *lzcf = conf;
-    ngx_http_core_loc_conf_t        *clcf;
-    ngx_str_t                       *value;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "ngx_report_uploads in");
-
-    value = cf->args->elts;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-                   "ngx_report_uploads name: %V", &value[1]);
-
-    lzcf->shm_zone = ngx_shared_memory_add(cf, &value[1], 0,
-                                           &ngx_http_uploadprogress_module);
-    if (lzcf->shm_zone == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, cf->log, 0,
-                   "ngx_report_uploads name: %V, szhm_zone: %p", &value[1],
-                   lzcf->shm_zone);
-
-    lzcf->track = (u_char) 0;
-
-    /* install our report handler */
-    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
-    clcf->handler = ngx_http_reportuploads_handler;
-
-    return NGX_CONF_OK;
-}
-
-static char*
-ngx_http_upload_progress_set_template(ngx_conf_t * cf, ngx_http_uploadprogress_template_t *t, ngx_str_t *source)
-{
-    ssize_t                               n;
-    ngx_http_script_compile_t             sc;
-
-    n = ngx_http_script_variables_count(source);
-
-    ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
-
-		t->lengths = NULL;
-		t->values = NULL;
-
-    sc.cf = cf;
-    sc.source = source;
-    sc.lengths = &t->lengths;
-    sc.values = &t->values;
-    sc.variables = n;
-    sc.complete_lengths = 1;
-    sc.complete_values = 1;
-
-    if (ngx_http_script_compile(&sc) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-static char*
-ngx_http_upload_progress_template(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
-{
-    ngx_http_uploadprogress_conf_t       *upcf = conf;
-    ngx_str_t                            *value;
-    ngx_http_uploadprogress_state_map_t  *m = ngx_http_uploadprogress_state_map;
-    ngx_http_uploadprogress_template_t   *t;
-
-    value = cf->args->elts;
-
-    while(m->name.data != NULL) {
-        if((value[1].len == m->name.len && !ngx_strncmp(value[1].data, m->name.data, m->name.len))
-           || (value[1].len == 2 && !ngx_strncmp(value[1].data, m->name.data, 2))) {
-            break;
-        }
-        m++;
-    }
-
-    if (m->name.data == NULL) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "unknown state \"%V\"", &value[1]);
-        return NGX_CONF_ERROR;
-    }
-
-    t = (ngx_http_uploadprogress_template_t*)upcf->templates.elts + (ngx_uint_t)m->idx;
-
-    return ngx_http_upload_progress_set_template(cf, t, &value[2]);
-}
-
-static char*
-ngx_http_upload_progress_java_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
-{
-    ngx_http_uploadprogress_conf_t       *upcf = conf;
-    ngx_http_uploadprogress_template_t   *t;
-    ngx_uint_t                            i;
-    char*                                 rc;
-
-    t = (ngx_http_uploadprogress_template_t*)upcf->templates.elts;
-
-    for(i = 0;i < upcf->templates.nelts;i++) {
-        rc = ngx_http_upload_progress_set_template(cf, t + i, ngx_http_uploadprogress_java_defaults + i);
-
-        if(rc != NGX_CONF_OK) {
-            return rc;
-        }
-    }
-
-    upcf->content_type.data = (u_char*)"text/javascript";
-    upcf->content_type.len = sizeof("text/javascript") - 1;
-
-    return NGX_CONF_OK;
-}
-
-static char*
-ngx_http_upload_progress_json_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
-{
-    ngx_http_uploadprogress_conf_t       *upcf = conf;
-    ngx_http_uploadprogress_template_t   *t;
-    ngx_uint_t                            i;
-    char*                                 rc;
-
-    t = (ngx_http_uploadprogress_template_t*)upcf->templates.elts;
-
-    for(i = 0;i < upcf->templates.nelts;i++) {
-        rc = ngx_http_upload_progress_set_template(cf, t + i, ngx_http_uploadprogress_json_defaults + i);
-
-        if(rc != NGX_CONF_OK) {
-            return rc;
-        }
-    }
-
-    upcf->content_type.data = (u_char*)"application/json";
-    upcf->content_type.len = sizeof("application/json") - 1;
-
-    return NGX_CONF_OK;
-}
-
-static char*
-ngx_http_upload_progress_jsonp_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
-{
-    ngx_http_uploadprogress_conf_t       *upcf = conf;
-    ngx_http_uploadprogress_template_t   *t;
-    ngx_uint_t                            i;
-    char*                                 rc;
-
-    t = (ngx_http_uploadprogress_template_t*)upcf->templates.elts;
-
-    for(i = 0;i < upcf->templates.nelts;i++) {
-        rc = ngx_http_upload_progress_set_template(cf, t + i, ngx_http_uploadprogress_jsonp_defaults + i);
-
-        if(rc != NGX_CONF_OK) {
-            return rc;
-        }
-    }
-
-    upcf->content_type.data = (u_char*)"application/javascript";
-    upcf->content_type.len = sizeof("application/javascript") - 1;
-
-    return NGX_CONF_OK;
-}
-
-static ngx_int_t ngx_http_uploadprogress_received_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    ngx_http_uploadprogress_node_t  *up;
-    u_char                          *p;
-    off_t                           *value;
-
-    up = ngx_http_get_module_ctx(r, ngx_http_uploadprogress_module);
-
-    value = (off_t *) ((char *) up + data);
-
-    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    v->len = ngx_sprintf(p, "%O", up->length - *value) - p;
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-    v->data = p;
-
-    return NGX_OK;
-}
-
-static ngx_int_t ngx_http_uploadprogress_offset_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    ngx_http_uploadprogress_node_t  *up;
-    u_char                          *p;
-    off_t                           *value;
-
-    up = ngx_http_get_module_ctx(r, ngx_http_uploadprogress_module);
-
-    value = (off_t *) ((char *) up + data);
-
-    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    v->len = ngx_sprintf(p, "%O", *value) - p;
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-    v->data = p;
-
-    return NGX_OK;
-}
-
-static ngx_int_t
-ngx_http_uploadprogress_status_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v,  uintptr_t data)
-{
-    ngx_http_uploadprogress_node_t  *up;
-    u_char                          *p;
-    off_t                           *value;
-
-    up = ngx_http_get_module_ctx(r, ngx_http_uploadprogress_module);
-
-    value = (off_t *) ((char *) up + data);
-
-    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
-    if (p == NULL) {
-        return NGX_ERROR;
-    }
-
-    v->len = ngx_sprintf(p, "%O", *value) - p;
-    v->valid = 1;
-    v->no_cacheable = 0;
-    v->not_found = 0;
-    v->data = p;
-
-    return NGX_OK;
-}
-
-static ngx_int_t
-ngx_http_uploadprogress_callback_variable(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v,  uintptr_t data)
-{
-    u_char                          *p, *start_p, *val, prefix[1024];
-    ngx_http_uploadprogress_conf_t  *upcf;
-    u_int                            len;
-
-    upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
-
-    if (r->args.len) {
-        /* '=' has to be appended to avoid matching parameters that have the */
-        /* configured name as a prefix but are longer */
-        ngx_snprintf(prefix, sizeof(prefix) - 1, "%s=", upcf->jsonp_parameter.data);
-        len = upcf->jsonp_parameter.len + 1;
-        prefix[len] = '\0'; /* Force termination of string */
-
-        p = (u_char *) ngx_strstr(r->args.data, prefix);
-
-        if (p) {
-            p += len;
-            start_p = p;
-            while (p < r->args.data + r->args.len) {
-                if (*((p++) + 1) == '&') {
-                    break;
-                }
-            }
-
-            v->len = p - start_p;
-
-            val = ngx_palloc(r->pool, v->len + 1);
-            if (val == NULL) {
-                return NGX_ERROR;
-            }
-
-            ngx_memcpy(val, start_p, v->len);
-            val[v->len] = '\0';
-
-            v->valid = 1;
-            v->no_cacheable = 0;
-            v->not_found = 0;
-            v->data = val;
-        } else {
-            return NGX_ERROR;
-        }
-    } else {
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-
diff --git a/debian/modules/http-uploadprogress/test/client.sh b/debian/modules/http-uploadprogress/test/client.sh
deleted file mode 100644
index f636c8f..0000000
--- a/debian/modules/http-uploadprogress/test/client.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# usage: client.sh UPLOAD_ID PROGRESS_URL
-cont=""
-while [ "$cont" != "new Object({ 'state' : 'done' })" ]
-do
-	cont=`curl -s -H "x-progress-id: $1" $2 | sed -e 's/[\n\r]//'`
-	echo "[$1] '$cont'"
-done
diff --git a/debian/modules/http-uploadprogress/test/stress.sh b/debian/modules/http-uploadprogress/test/stress.sh
deleted file mode 100644
index e150dd5..0000000
--- a/debian/modules/http-uploadprogress/test/stress.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# Usage: stress.sh UPLOAD_URL PROGRESS_URL
-#
-
-i=0
-LIMIT="10k"
-FILE="100"
-#trap 'kill_all' SIGINT SIGTERM
-
-while [ "1" == "1" ]
-do
-for j in $(seq 5)
-do
-i=`expr $i + 1`
-echo "Upload $i"
-curl --limit-rate $LIMIT -F pouet=@$FILE $1?X-Progress-ID=$i &
-sh client.sh $i $2 &
-i=`expr $i + 1`
-echo "Upload $i"
-curl --limit-rate $LIMIT -F pouet=@$FILE $1?X-Progress-ID=$i &
-sh client.sh $i $2 &
-i=`expr $i + 1`
-echo "Upload $i"
-curl --limit-rate $LIMIT -F pouet=@$FILE $1?X-Progress-ID=$i &
-sh client.sh $i $2 &
-i=`expr $i + 1`
-echo "Upload $i"
-curl --limit-rate $LIMIT -F pouet=@$FILE $1?X-Progress-ID=$i &
-sh client.sh $i $2 &
-i=`expr $i + 1`
-echo "Upload $i"
-curl --limit-rate $LIMIT -F pouet=@$FILE $1?X-Progress-ID=$i &
-sh client.sh $i $2 &
-i=`expr $i + 1`
-echo "Upload $i"
-curl --limit-rate $LIMIT -F pouet=@$FILE $1?X-Progress-ID=$i &
-sh client.sh $i $2 &
-done
-
-wait
-done
diff --git a/debian/modules/http-upstream-fair/.gdbinit b/debian/modules/http-upstream-fair/.gdbinit
deleted file mode 100644
index 775ba29..0000000
--- a/debian/modules/http-upstream-fair/.gdbinit
+++ /dev/null
@@ -1,39 +0,0 @@
-define show_fair_peer
-	set $n = (ngx_http_upstream_fair_shm_block_t *)$arg0
-	set $peers = $n->peers
-	printf "upstream id: 0x%08x (%s), current peer: %d/%d\n", $n->node.key, $peers->name.data, $peers->current, $peers->number
-	set $i = 0
-	while $i < $peers->number
-		set $peer = &$peers->peer[$i]
-		printf "peer %d: %s weight: %d/%d fails: %d/%d acc: %d down: %d nreq: %u last_req_id: %u\n", $i, $peer->name.data,\
-			$peer->shared->current_weight, $peer->weight,\
-			$peer->shared->fails, $peer->max_fails,\
-			$peer->accessed, $peer->down,\
-			$peer->shared->nreq, $peer->shared->last_req_id
-		set $i = $i + 1
-	end
-	printf "-----------------\n"
-	if ($n->node.left != $arg1)
-		show_fair_peer $n->node.left $arg1
-	end
-	if ($n->node.right != $arg1)
-		show_fair_peer $n->node.right $arg1
-	end
-end
-
-define show_fair_peers
-	set $tree = ngx_http_upstream_fair_rbtree
-	if (!$tree)
-		printf "Cannot find the upstream_fair peer information tree\n"
-	else
-		set $root = (ngx_http_upstream_fair_shm_block_t *)($tree->root)
-		if ($root != $tree->sentinel)
-			show_fair_peer $root $tree->sentinel
-		else
-			printf "No upstream_fair peer information\n"
-		end
-	end
-end
-document show_fair_peers
-Dump upstream_fair peer infromation
-end
diff --git a/debian/modules/http-upstream-fair/README b/debian/modules/http-upstream-fair/README
deleted file mode 100644
index 18802e1..0000000
--- a/debian/modules/http-upstream-fair/README
+++ /dev/null
@@ -1,53 +0,0 @@
-Nginx Upstream Fair Proxy Load Balancer
---
-
-Description:
---
-
-The Nginx fair proxy balancer enhances the standard round-robin load balancer provided
-with Nginx so that it will track busy back end servers (e.g. Thin, Ebb, Mongrel)
-and balance the load to non-busy server processes.
-
-Further information can be found on http://nginx.localdomain.pl/
-
-Ezra Zygmuntowicz has a good writeup of the fair proxy load balancer and how to use it here:
-http://brainspl.at/articles/2007/11/09/a-fair-proxy-balancer-for-nginx-and-mongrel
-
-
-Installation:
---
-
-You'll need to re-compile Nginx from source to include this module.
-Modify your compile of Nginx by adding the following directive
-(modified to suit your path of course):
-
-./configure --with-http_ssl_module --add-module=/absolute/path/to/nginx-upstream-fair
-make
-make install
-
-
-Usage:
---
-
-Change your Nginx config file's upstream block to include the 'fair' directive:
-
-upstream mongrel {
-    fair;
-    server 127.0.0.1:5000;
-    server 127.0.0.1:5001;
-    server 127.0.0.1:5002;
-  }
-
-
-If you encounter any issues, please report them using the bugtracker at
-http://nginx.localdomain.pl/
-
-Contributing:
---
-
-Git source repositories:
-http://github.com/gnosek/nginx-upstream-fair/tree/master
-http://git.localdomain.pl/?p=nginx-upstream-fair.git;a=summary
-
-Please feel free to fork the project at GitHub and submit pull requests or patches.
-
diff --git a/debian/modules/http-upstream-fair/config b/debian/modules/http-upstream-fair/config
deleted file mode 100644
index ff351b7..0000000
--- a/debian/modules/http-upstream-fair/config
+++ /dev/null
@@ -1,3 +0,0 @@
-ngx_addon_name=ngx_http_upstream_fair_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
diff --git a/debian/modules/http-upstream-fair/ngx_http_upstream_fair_module.c b/debian/modules/http-upstream-fair/ngx_http_upstream_fair_module.c
deleted file mode 100644
index a4419ca..0000000
--- a/debian/modules/http-upstream-fair/ngx_http_upstream_fair_module.c
+++ /dev/null
@@ -1,1356 +0,0 @@
-/*
- * Copyright (C) 2007 Grzegorz Nosek
- * Work sponsored by Ezra Zygmuntowicz & EngineYard.com
- *
- * Based on nginx source (C) Igor Sysoev
- */
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
-
-typedef struct {
-    ngx_uint_t                          nreq;
-    ngx_uint_t                          total_req;
-    ngx_uint_t                          last_req_id;
-    ngx_uint_t                          fails;
-    ngx_uint_t                          current_weight;
-} ngx_http_upstream_fair_shared_t;
-
-typedef struct ngx_http_upstream_fair_peers_s ngx_http_upstream_fair_peers_t;
-
-typedef struct {
-    ngx_rbtree_node_t                   node;
-    ngx_uint_t                          generation;
-    uintptr_t                           peers;      /* forms a unique cookie together with generation */
-    ngx_uint_t                          total_nreq;
-    ngx_uint_t                          total_requests;
-    ngx_atomic_t                        lock;
-    ngx_http_upstream_fair_shared_t     stats[1];
-} ngx_http_upstream_fair_shm_block_t;
-
-/* ngx_spinlock is defined without a matching unlock primitive */
-#define ngx_spinlock_unlock(lock)       (void) ngx_atomic_cmp_set(lock, ngx_pid, 0)
-
-typedef struct {
-    ngx_http_upstream_fair_shared_t    *shared;
-    struct sockaddr                    *sockaddr;
-    socklen_t                           socklen;
-    ngx_str_t                           name;
-
-    ngx_uint_t                          weight;
-    ngx_uint_t                          max_fails;
-    time_t                              fail_timeout;
-
-    time_t                              accessed;
-    ngx_uint_t                          down:1;
-
-#if (NGX_HTTP_SSL)
-    ngx_ssl_session_t                  *ssl_session;    /* local to a process */
-#endif
-
-} ngx_http_upstream_fair_peer_t;
-
-#define NGX_HTTP_UPSTREAM_FAIR_NO_RR            (1<<26)
-#define NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_IDLE (1<<27)
-#define NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_PEAK (1<<28)
-#define NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_MASK ((1<<27) | (1<<28))
-
-enum { WM_DEFAULT = 0, WM_IDLE, WM_PEAK };
-
-struct ngx_http_upstream_fair_peers_s {
-    ngx_http_upstream_fair_shm_block_t *shared;
-    ngx_uint_t                          current;
-    ngx_uint_t                          size_err:1;
-    ngx_uint_t                          no_rr:1;
-    ngx_uint_t                          weight_mode:2;
-    ngx_uint_t                          number;
-    ngx_str_t                          *name;
-    ngx_http_upstream_fair_peers_t     *next;           /* for backup peers support, not really used yet */
-    ngx_http_upstream_fair_peer_t       peer[1];
-};
-
-
-#define NGX_PEER_INVALID (~0UL)
-
-typedef struct {
-    ngx_http_upstream_fair_peers_t     *peers;
-    ngx_uint_t                          current;
-    uintptr_t                          *tried;
-    uintptr_t                          *done;
-    uintptr_t                           data;
-    uintptr_t                           data2;
-} ngx_http_upstream_fair_peer_data_t;
-
-
-static ngx_int_t ngx_http_upstream_init_fair(ngx_conf_t *cf,
-    ngx_http_upstream_srv_conf_t *us);
-static ngx_int_t ngx_http_upstream_get_fair_peer(ngx_peer_connection_t *pc,
-    void *data);
-static void ngx_http_upstream_free_fair_peer(ngx_peer_connection_t *pc,
-    void *data, ngx_uint_t state);
-static ngx_int_t ngx_http_upstream_init_fair_peer(ngx_http_request_t *r,
-    ngx_http_upstream_srv_conf_t *us);
-static char *ngx_http_upstream_fair(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
-static char *ngx_http_upstream_fair_set_shm_size(ngx_conf_t *cf,
-    ngx_command_t *cmd, void *conf);
-static ngx_int_t ngx_http_upstream_fair_init_module(ngx_cycle_t *cycle);
-
-#if (NGX_HTTP_EXTENDED_STATUS)
-static ngx_chain_t *ngx_http_upstream_fair_report_status(ngx_http_request_t *r,
-    ngx_int_t *length);
-#endif
-
-#if (NGX_HTTP_SSL)
-static ngx_int_t ngx_http_upstream_fair_set_session(ngx_peer_connection_t *pc,
-    void *data);
-static void ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc,
-    void *data);
-#endif
-
-static ngx_command_t  ngx_http_upstream_fair_commands[] = {
-
-    { ngx_string("fair"),
-      NGX_HTTP_UPS_CONF|NGX_CONF_ANY,
-      ngx_http_upstream_fair,
-      0,
-      0,
-      NULL },
-
-    { ngx_string("upstream_fair_shm_size"),
-      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-      ngx_http_upstream_fair_set_shm_size,
-      0,
-      0,
-      NULL },
-
-      ngx_null_command
-};
-
-
-static ngx_http_module_t  ngx_http_upstream_fair_module_ctx = {
-    NULL,                                  /* preconfiguration */
-    NULL,                                  /* postconfiguration */
-
-    NULL,                                  /* create main configuration */
-    NULL,                                  /* init main configuration */
-
-    NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
-
-    NULL,                                  /* create location configuration */
-    NULL,                                  /* merge location configuration */
-
-#if (NGX_HTTP_EXTENDED_STATUS)
-    ngx_http_upstream_fair_report_status,
-#endif
-};
-
-
-ngx_module_t  ngx_http_upstream_fair_module = {
-    NGX_MODULE_V1,
-    &ngx_http_upstream_fair_module_ctx, /* module context */
-    ngx_http_upstream_fair_commands,    /* module directives */
-    NGX_HTTP_MODULE,                       /* module type */
-    NULL,                                  /* init master */
-    ngx_http_upstream_fair_init_module,    /* init module */
-    NULL,                                  /* init process */
-    NULL,                                  /* init thread */
-    NULL,                                  /* exit thread */
-    NULL,                                  /* exit process */
-    NULL,                                  /* exit master */
-    NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_uint_t ngx_http_upstream_fair_shm_size;
-static ngx_shm_zone_t * ngx_http_upstream_fair_shm_zone;
-static ngx_rbtree_t * ngx_http_upstream_fair_rbtree;
-static ngx_uint_t ngx_http_upstream_fair_generation;
-
-static int
-ngx_http_upstream_fair_compare_rbtree_node(const ngx_rbtree_node_t *v_left,
-    const ngx_rbtree_node_t *v_right)
-{
-    ngx_http_upstream_fair_shm_block_t *left, *right;
-
-    left = (ngx_http_upstream_fair_shm_block_t *) v_left;
-    right = (ngx_http_upstream_fair_shm_block_t *) v_right;
-
-    if (left->generation < right->generation) {
-        return -1;
-    } else if (left->generation > right->generation) {
-        return 1;
-    } else { /* left->generation == right->generation */
-        if (left->peers < right->peers) {
-            return -1;
-        } else if (left->peers > right->peers) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-}
-
-/*
- * generic functions start here
- */
-static void
-ngx_rbtree_generic_insert(ngx_rbtree_node_t *temp,
-    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel,
-    int (*compare)(const ngx_rbtree_node_t *left, const ngx_rbtree_node_t *right))
-{
-    for ( ;; ) {
-        if (node->key < temp->key) {
-
-            if (temp->left == sentinel) {
-                temp->left = node;
-                break;
-            }
-
-            temp = temp->left;
-
-        } else if (node->key > temp->key) {
-
-            if (temp->right == sentinel) {
-                temp->right = node;
-                break;
-            }
-
-            temp = temp->right;
-
-        } else { /* node->key == temp->key */
-            if (compare(node, temp) < 0) {
-
-                if (temp->left == sentinel) {
-                    temp->left = node;
-                    break;
-                }
-
-                temp = temp->left;
-
-            } else {
-
-                if (temp->right == sentinel) {
-                    temp->right = node;
-                    break;
-                }
-
-                temp = temp->right;
-            }
-        }
-    }
-
-    node->parent = temp;
-    node->left = sentinel;
-    node->right = sentinel;
-    ngx_rbt_red(node);
-}
-
-#define NGX_BITVECTOR_ELT_SIZE (sizeof(uintptr_t) * 8)
-
-static uintptr_t *
-ngx_bitvector_alloc(ngx_pool_t *pool, ngx_uint_t size, uintptr_t *small)
-{
-    ngx_uint_t nelts = (size + NGX_BITVECTOR_ELT_SIZE - 1) / NGX_BITVECTOR_ELT_SIZE;
-
-    if (small && nelts == 1) {
-        *small = 0;
-        return small;
-    }
-
-    return ngx_pcalloc(pool, nelts * NGX_BITVECTOR_ELT_SIZE);
-}
-
-static ngx_int_t
-ngx_bitvector_test(uintptr_t *bv, ngx_uint_t bit)
-{
-    ngx_uint_t                      n, m;
-
-    n = bit / NGX_BITVECTOR_ELT_SIZE;
-    m = 1 << (bit % NGX_BITVECTOR_ELT_SIZE);
-
-    return bv[n] & m;
-}
-
-static void
-ngx_bitvector_set(uintptr_t *bv, ngx_uint_t bit)
-{
-    ngx_uint_t                      n, m;
-
-    n = bit / NGX_BITVECTOR_ELT_SIZE;
-    m = 1 << (bit % NGX_BITVECTOR_ELT_SIZE);
-
-    bv[n] |= m;
-}
-
-/*
- * generic functions end here
- */
-
-static ngx_int_t
-ngx_http_upstream_fair_init_module(ngx_cycle_t *cycle)
-{
-    ngx_http_upstream_fair_generation++;
-    return NGX_OK;
-}
-
-static void
-ngx_http_upstream_fair_rbtree_insert(ngx_rbtree_node_t *temp,
-    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) {
-
-    ngx_rbtree_generic_insert(temp, node, sentinel,
-        ngx_http_upstream_fair_compare_rbtree_node);
-}
-
-
-static ngx_int_t
-ngx_http_upstream_fair_init_shm_zone(ngx_shm_zone_t *shm_zone, void *data)
-{
-    ngx_slab_pool_t                *shpool;
-    ngx_rbtree_t                   *tree;
-    ngx_rbtree_node_t              *sentinel;
-
-    if (data) {
-        shm_zone->data = data;
-        return NGX_OK;
-    }
-
-    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
-    tree = ngx_slab_alloc(shpool, sizeof *tree);
-    if (tree == NULL) {
-        return NGX_ERROR;
-    }
-
-    sentinel = ngx_slab_alloc(shpool, sizeof *sentinel);
-    if (sentinel == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_rbtree_sentinel_init(sentinel);
-    tree->root = sentinel;
-    tree->sentinel = sentinel;
-    tree->insert = ngx_http_upstream_fair_rbtree_insert;
-    shm_zone->data = tree;
-    ngx_http_upstream_fair_rbtree = tree;
-
-    return NGX_OK;
-}
-
-
-static char *
-ngx_http_upstream_fair_set_shm_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ssize_t                         new_shm_size;
-    ngx_str_t                      *value;
-
-    value = cf->args->elts;
-
-    new_shm_size = ngx_parse_size(&value[1]);
-    if (new_shm_size == NGX_ERROR) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "Invalid memory area size `%V'", &value[1]);
-        return NGX_CONF_ERROR;
-    }
-
-    new_shm_size = ngx_align(new_shm_size, ngx_pagesize);
-
-    if (new_shm_size < 8 * (ssize_t) ngx_pagesize) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "The upstream_fair_shm_size value must be at least %udKiB", (8 * ngx_pagesize) >> 10);
-        new_shm_size = 8 * ngx_pagesize;
-    }
-
-    if (ngx_http_upstream_fair_shm_size &&
-        ngx_http_upstream_fair_shm_size != (ngx_uint_t) new_shm_size) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Cannot change memory area size without restart, ignoring change");
-    } else {
-        ngx_http_upstream_fair_shm_size = new_shm_size;
-    }
-    ngx_conf_log_error(NGX_LOG_DEBUG, cf, 0, "Using %udKiB of shared memory for upstream_fair", new_shm_size >> 10);
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_upstream_fair(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_upstream_srv_conf_t  *uscf;
-    ngx_uint_t i;
-    ngx_uint_t extra_peer_flags = 0;
-
-    for (i = 1; i < cf->args->nelts; i++) {
-        ngx_str_t *value = cf->args->elts;
-        if (ngx_strcmp(value[i].data, "no_rr") == 0) {
-            extra_peer_flags |= NGX_HTTP_UPSTREAM_FAIR_NO_RR;
-        } else if (ngx_strcmp(value[i].data, "weight_mode=peak") == 0) {
-            if (extra_peer_flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_MASK) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "weight_mode= options are mutually exclusive");
-                return NGX_CONF_ERROR;
-            }
-            extra_peer_flags |= NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_PEAK;
-        } else if (ngx_strcmp(value[i].data, "weight_mode=idle") == 0) {
-            if (extra_peer_flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_MASK) {
-                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "weight_mode= options are mutually exclusive");
-                return NGX_CONF_ERROR;
-            }
-            extra_peer_flags |= NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_IDLE;
-        } else {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "Invalid `fair' parameter `%V'", &value[i]);
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);
-
-    uscf->peer.init_upstream = ngx_http_upstream_init_fair;
-
-    uscf->flags = NGX_HTTP_UPSTREAM_CREATE
-                  |NGX_HTTP_UPSTREAM_WEIGHT
-                  |NGX_HTTP_UPSTREAM_MAX_FAILS
-                  |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
-                  |NGX_HTTP_UPSTREAM_DOWN
-                  |extra_peer_flags;
-
-    return NGX_CONF_OK;
-}
-
-
-static ngx_int_t
-ngx_http_upstream_cmp_servers(const void *one, const void *two)
-{
-    const ngx_http_upstream_fair_peer_t  *first, *second;
-
-    first = one;
-    second = two;
-
-    return (first->weight < second->weight);
-}
-
-
-/* TODO: Actually support backup servers */
-static ngx_int_t
-ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
-{
-    ngx_url_t                      u;
-    ngx_uint_t                     i, j, n;
-    ngx_http_upstream_server_t    *server;
-    ngx_http_upstream_fair_peers_t  *peers, *backup;
-
-    if (us->servers) {
-        server = us->servers->elts;
-
-        n = 0;
-
-        for (i = 0; i < us->servers->nelts; i++) {
-            if (server[i].backup) {
-                continue;
-            }
-
-            n += server[i].naddrs;
-        }
-
-        peers = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_fair_peers_t)
-                              + sizeof(ngx_http_upstream_fair_peer_t) * (n - 1));
-        if (peers == NULL) {
-            return NGX_ERROR;
-        }
-
-        peers->number = n;
-        peers->name = &us->host;
-
-        n = 0;
-
-        for (i = 0; i < us->servers->nelts; i++) {
-            for (j = 0; j < server[i].naddrs; j++) {
-                if (server[i].backup) {
-                    continue;
-                }
-
-                peers->peer[n].sockaddr = server[i].addrs[j].sockaddr;
-                peers->peer[n].socklen = server[i].addrs[j].socklen;
-                peers->peer[n].name = server[i].addrs[j].name;
-                peers->peer[n].max_fails = server[i].max_fails;
-                peers->peer[n].fail_timeout = server[i].fail_timeout;
-                peers->peer[n].down = server[i].down;
-                peers->peer[n].weight = server[i].down ? 0 : server[i].weight;
-                n++;
-            }
-        }
-
-        us->peer.data = peers;
-
-        ngx_sort(&peers->peer[0], (size_t) n,
-                 sizeof(ngx_http_upstream_fair_peer_t),
-                 ngx_http_upstream_cmp_servers);
-
-        /* backup servers */
-
-        n = 0;
-
-        for (i = 0; i < us->servers->nelts; i++) {
-            if (!server[i].backup) {
-                continue;
-            }
-
-            n += server[i].naddrs;
-        }
-
-        if (n == 0) {
-            return NGX_OK;
-        }
-
-        backup = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_fair_peers_t)
-                              + sizeof(ngx_http_upstream_fair_peer_t) * (n - 1));
-        if (backup == NULL) {
-            return NGX_ERROR;
-        }
-
-        backup->number = n;
-        backup->name = &us->host;
-
-        n = 0;
-
-        for (i = 0; i < us->servers->nelts; i++) {
-            for (j = 0; j < server[i].naddrs; j++) {
-                if (!server[i].backup) {
-                    continue;
-                }
-
-                backup->peer[n].sockaddr = server[i].addrs[j].sockaddr;
-                backup->peer[n].socklen = server[i].addrs[j].socklen;
-                backup->peer[n].name = server[i].addrs[j].name;
-                backup->peer[n].weight = server[i].weight;
-                backup->peer[n].max_fails = server[i].max_fails;
-                backup->peer[n].fail_timeout = server[i].fail_timeout;
-                backup->peer[n].down = server[i].down;
-                n++;
-            }
-        }
-
-        peers->next = backup;
-
-        ngx_sort(&backup->peer[0], (size_t) n,
-                 sizeof(ngx_http_upstream_fair_peer_t),
-                 ngx_http_upstream_cmp_servers);
-
-        return NGX_OK;
-    }
-
-
-    /* an upstream implicitly defined by proxy_pass, etc. */
-
-    if (us->port == 0 && us->default_port == 0) {
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "no port in upstream \"%V\" in %s:%ui",
-                      &us->host, us->file_name, us->line);
-        return NGX_ERROR;
-    }
-
-    ngx_memzero(&u, sizeof(ngx_url_t));
-
-    u.host = us->host;
-    u.port = (in_port_t) (us->port ? us->port : us->default_port);
-
-    if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
-        if (u.err) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "%s in upstream \"%V\" in %s:%ui",
-                          u.err, &us->host, us->file_name, us->line);
-        }
-
-        return NGX_ERROR;
-    }
-
-    n = u.naddrs;
-
-    peers = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_fair_peers_t)
-                              + sizeof(ngx_http_upstream_fair_peer_t) * (n - 1));
-    if (peers == NULL) {
-        return NGX_ERROR;
-    }
-
-    peers->number = n;
-    peers->name = &us->host;
-
-    for (i = 0; i < u.naddrs; i++) {
-        peers->peer[i].sockaddr = u.addrs[i].sockaddr;
-        peers->peer[i].socklen = u.addrs[i].socklen;
-        peers->peer[i].name = u.addrs[i].name;
-        peers->peer[i].weight = 1;
-        peers->peer[i].max_fails = 1;
-        peers->peer[i].fail_timeout = 10;
-    }
-
-    us->peer.data = peers;
-
-    /* implicitly defined upstream has no backup servers */
-
-    return NGX_OK;
-}
-
-static ngx_int_t
-ngx_http_upstream_init_fair(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
-{
-    ngx_http_upstream_fair_peers_t     *peers;
-    ngx_uint_t                          n;
-    ngx_str_t                          *shm_name;
-
-    /* do the dirty work using rr module */
-    if (ngx_http_upstream_init_fair_rr(cf, us) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    /* setup our wrapper around rr */
-    peers = ngx_palloc(cf->pool, sizeof *peers);
-    if (peers == NULL) {
-        return NGX_ERROR;
-    }
-    peers = us->peer.data;
-    n = peers->number;
-
-    shm_name = ngx_palloc(cf->pool, sizeof *shm_name);
-    shm_name->len = sizeof("upstream_fair") - 1;
-    shm_name->data = (unsigned char *) "upstream_fair";
-
-    if (ngx_http_upstream_fair_shm_size == 0) {
-        ngx_http_upstream_fair_shm_size = 8 * ngx_pagesize;
-    }
-
-    ngx_http_upstream_fair_shm_zone = ngx_shared_memory_add(
-        cf, shm_name, ngx_http_upstream_fair_shm_size, &ngx_http_upstream_fair_module);
-    if (ngx_http_upstream_fair_shm_zone == NULL) {
-        return NGX_ERROR;
-    }
-    ngx_http_upstream_fair_shm_zone->init = ngx_http_upstream_fair_init_shm_zone;
-
-    peers->shared = NULL;
-    peers->current = n - 1;
-    if (us->flags & NGX_HTTP_UPSTREAM_FAIR_NO_RR) {
-        peers->no_rr = 1;
-    }
-    if (us->flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_IDLE) {
-        peers->weight_mode = WM_IDLE;
-    } else if (us->flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_PEAK) {
-        peers->weight_mode = WM_PEAK;
-    }
-    peers->size_err = 0;
-
-    us->peer.init = ngx_http_upstream_init_fair_peer;
-
-    return NGX_OK;
-}
-
-
-static void
-ngx_http_upstream_fair_update_nreq(ngx_http_upstream_fair_peer_data_t *fp, int delta, ngx_log_t *log)
-{
-#if (NGX_DEBUG)
-    ngx_uint_t                          nreq;
-    ngx_uint_t                          total_nreq;
-
-    nreq = (fp->peers->peer[fp->current].shared->nreq += delta);
-    total_nreq = (fp->peers->shared->total_nreq += delta);
-
-    ngx_log_debug6(NGX_LOG_DEBUG_HTTP, log, 0,
-        "[upstream_fair] nreq for peer %ui @ %p/%p now %d, total %d, delta %d",
-        fp->current, fp->peers, fp->peers->peer[fp->current].shared, nreq,
-        total_nreq, delta);
-#endif
-}
-
-/*
- * SCHED_COUNTER_BITS is the portion of an ngx_uint_t which represents
- * the req_delta part (number of requests serviced on _other_
- * backends). The rest (top bits) represents the number of currently
- * processed requests.
- *
- * The value is not too critical because overflow is handled via
- * saturation. With the default value of 20, scheduling is exact for
- * fewer than 4k concurrent requests per backend (on 32-bit
- * architectures) and fewer than 1M concurrent requests to all backends
- * together. Beyond these limits, the algorithm essentially falls back
- * to pure weighted round-robin.
- *
- * A higher score means less suitable.
- *
- * The `delta' parameter is bit-negated so that high values yield low
- * scores and get chosen more often.
- */
-
-#define SCHED_COUNTER_BITS 20
-#define SCHED_NREQ_MAX ((~0UL) >> SCHED_COUNTER_BITS)
-#define SCHED_COUNTER_MAX ((1 << SCHED_COUNTER_BITS) - 1)
-#define SCHED_SCORE(nreq,delta) (((nreq) << SCHED_COUNTER_BITS) | (~(delta) & SCHED_COUNTER_MAX))
-#define ngx_upstream_fair_min(a,b) (((a) < (b)) ? (a) : (b))
-
-static ngx_uint_t
-ngx_http_upstream_fair_sched_score(ngx_peer_connection_t *pc,
-    ngx_http_upstream_fair_peer_data_t *fp,
-    ngx_uint_t n)
-{
-    ngx_http_upstream_fair_peer_t      *peer = &fp->peers->peer[n];
-    ngx_http_upstream_fair_shared_t    *fs = peer->shared;
-    ngx_uint_t req_delta = fp->peers->shared->total_requests - fs->last_req_id;
-
-    /* sanity check */
-    if ((ngx_int_t)fs->nreq < 0) {
-        ngx_log_error(NGX_LOG_WARN, pc->log, 0, "[upstream_fair] upstream %ui has negative nreq (%i)", n, fs->nreq);
-        return SCHED_SCORE(0, req_delta);
-    }
-
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] peer %ui: nreq = %i, req_delta = %ui", n, fs->nreq, req_delta);
-
-    return SCHED_SCORE(
-        ngx_upstream_fair_min(fs->nreq, SCHED_NREQ_MAX),
-        ngx_upstream_fair_min(req_delta, SCHED_COUNTER_MAX));
-}
-
-/*
- * the core of load balancing logic
- */
-
-static ngx_int_t
-ngx_http_upstream_fair_try_peer(ngx_peer_connection_t *pc,
-    ngx_http_upstream_fair_peer_data_t *fp,
-    ngx_uint_t peer_id)
-{
-    ngx_http_upstream_fair_peer_t        *peer;
-
-    if (ngx_bitvector_test(fp->tried, peer_id))
-        return NGX_BUSY;
-
-    peer = &fp->peers->peer[peer_id];
-
-    if (!peer->down) {
-        if (peer->max_fails == 0 || peer->shared->fails < peer->max_fails) {
-            return NGX_OK;
-        }
-
-        if (ngx_time() - peer->accessed > peer->fail_timeout) {
-            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] resetting fail count for peer %d, time delta %d > %d",
-                peer_id, ngx_time() - peer->accessed, peer->fail_timeout);
-            peer->shared->fails = 0;
-            return NGX_OK;
-        }
-    }
-
-    return NGX_BUSY;
-}
-
-static ngx_uint_t
-ngx_http_upstream_choose_fair_peer_idle(ngx_peer_connection_t *pc,
-    ngx_http_upstream_fair_peer_data_t *fp)
-{
-    ngx_uint_t                          i, n;
-    ngx_uint_t                          npeers = fp->peers->number;
-    ngx_uint_t                          weight_mode = fp->peers->weight_mode;
-    ngx_uint_t                          best_idx = NGX_PEER_INVALID;
-    ngx_uint_t                          best_nreq = ~0U;
-
-    for (i = 0, n = fp->current; i < npeers; i++, n = (n + 1) % npeers) {
-        ngx_uint_t nreq = fp->peers->peer[n].shared->nreq;
-        ngx_uint_t weight = fp->peers->peer[n].weight;
-
-        if (fp->peers->peer[n].shared->fails > 0)
-            continue;
-
-        if (nreq >= weight || (nreq > 0 && weight_mode != WM_IDLE)) {
-            continue;
-        }
-
-        if (ngx_http_upstream_fair_try_peer(pc, fp, n) != NGX_OK) {
-            continue;
-        }
-
-        /* not in WM_IDLE+no_rr mode: the first completely idle backend gets chosen */
-        if (weight_mode != WM_IDLE || !fp->peers->no_rr) {
-            best_idx = n;
-            break;
-        }
-
-        /* in WM_IDLE+no_rr mode we actually prefer slightly loaded backends
-         * to totally idle ones, under the assumption that they're spawned
-         * on demand and can handle up to 'weight' concurrent requests
-         */
-        if (best_idx == NGX_PEER_INVALID || nreq) {
-            if (best_nreq <= nreq) {
-                continue;
-            }
-            best_idx = n;
-            best_nreq = nreq;
-        }
-    }
-
-    return best_idx;
-}
-
-static ngx_int_t
-ngx_http_upstream_choose_fair_peer_busy(ngx_peer_connection_t *pc,
-    ngx_http_upstream_fair_peer_data_t *fp)
-{
-    ngx_uint_t                          i, n;
-    ngx_uint_t                          npeers = fp->peers->number;
-    ngx_uint_t                          weight_mode = fp->peers->weight_mode;
-    ngx_uint_t                          best_idx = NGX_PEER_INVALID;
-    ngx_uint_t                          sched_score;
-    ngx_uint_t                          best_sched_score = ~0UL;
-
-    /*
-     * calculate sched scores for all the peers, choosing the lowest one
-     */
-    for (i = 0, n = fp->current; i < npeers; i++, n = (n + 1) % npeers) {
-        ngx_http_upstream_fair_peer_t      *peer;
-        ngx_uint_t                          nreq;
-        ngx_uint_t                          weight;
-
-        peer = &fp->peers->peer[n];
-        nreq = fp->peers->peer[n].shared->nreq;
-
-        if (weight_mode == WM_PEAK && nreq >= peer->weight) {
-            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] backend %d has nreq %ui >= weight %ui in WM_PEAK mode", n, nreq, peer->weight);
-            continue;
-        }
-
-        if (ngx_http_upstream_fair_try_peer(pc, fp, n) != NGX_OK) {
-            if (!pc->tries) {
-                ngx_log_debug(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] all backends exhausted");
-                return NGX_PEER_INVALID;
-            }
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] backend %d already tried", n);
-            continue;
-        }
-
-        sched_score = ngx_http_upstream_fair_sched_score(pc, fp, n);
-
-        if (weight_mode == WM_DEFAULT) {
-            /*
-             * take peer weight into account
-             */
-            weight = peer->shared->current_weight;
-            if (peer->max_fails) {
-                ngx_uint_t mf = peer->max_fails;
-                weight = peer->shared->current_weight * (mf - peer->shared->fails) / mf;
-            }
-            if (weight > 0) {
-                sched_score /= weight;
-            }
-            ngx_log_debug8(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] bss = %ui, ss = %ui (n = %d, w = %d/%d, f = %d/%d, weight = %d)",
-                best_sched_score, sched_score, n, peer->shared->current_weight, peer->weight, peer->shared->fails, peer->max_fails, weight);
-        }
-
-        if (sched_score <= best_sched_score) {
-            best_idx = n;
-            best_sched_score = sched_score;
-        }
-    }
-
-    return best_idx;
-}
-
-static ngx_int_t
-ngx_http_upstream_choose_fair_peer(ngx_peer_connection_t *pc,
-    ngx_http_upstream_fair_peer_data_t *fp, ngx_uint_t *peer_id)
-{
-    ngx_uint_t                          npeers;
-    ngx_uint_t                          best_idx = NGX_PEER_INVALID;
-    ngx_uint_t                          weight_mode;
-
-    npeers = fp->peers->number;
-    weight_mode = fp->peers->weight_mode;
-
-    /* just a single backend */
-    if (npeers == 1) {
-        *peer_id = 0;
-        return NGX_OK;
-    }
-
-    /* any idle backends? */
-    best_idx = ngx_http_upstream_choose_fair_peer_idle(pc, fp);
-    if (best_idx != NGX_PEER_INVALID) {
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] peer %i is idle", best_idx);
-        goto chosen;
-    }
-
-    /* no idle backends, choose the least loaded one */
-    best_idx = ngx_http_upstream_choose_fair_peer_busy(pc, fp);
-    if (best_idx != NGX_PEER_INVALID) {
-        goto chosen;
-    }
-
-    return NGX_BUSY;
-
-chosen:
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] chose peer %i", best_idx);
-    *peer_id = best_idx;
-    ngx_bitvector_set(fp->tried, best_idx);
-
-    if (weight_mode == WM_DEFAULT) {
-        ngx_http_upstream_fair_peer_t      *peer = &fp->peers->peer[best_idx];
-
-        if (peer->shared->current_weight-- == 0) {
-            peer->shared->current_weight = peer->weight;
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] peer %d expired weight, reset to %d", best_idx, peer->weight);
-        }
-    }
-    return NGX_OK;
-}
-
-ngx_int_t
-ngx_http_upstream_get_fair_peer(ngx_peer_connection_t *pc, void *data)
-{
-    ngx_int_t                           ret;
-    ngx_uint_t                          peer_id, i;
-    ngx_http_upstream_fair_peer_data_t *fp = data;
-    ngx_http_upstream_fair_peer_t      *peer;
-    ngx_atomic_t                       *lock;
-
-    peer_id = fp->current;
-    fp->current = (fp->current + 1) % fp->peers->number;
-
-    lock = &fp->peers->shared->lock;
-    ngx_spinlock(lock, ngx_pid, 1024);
-    ret = ngx_http_upstream_choose_fair_peer(pc, fp, &peer_id);
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] fp->current = %d, peer_id = %d, ret = %d",
-        fp->current, peer_id, ret);
-
-    if (pc)
-        pc->tries--;
-
-    if (ret == NGX_BUSY) {
-        for (i = 0; i < fp->peers->number; i++) {
-            fp->peers->peer[i].shared->fails = 0;
-        }
-
-        pc->name = fp->peers->name;
-        fp->current = NGX_PEER_INVALID;
-        ngx_spinlock_unlock(lock);
-        return NGX_BUSY;
-    }
-
-    /* assert(ret == NGX_OK); */
-    peer = &fp->peers->peer[peer_id];
-    fp->current = peer_id;
-    if (!fp->peers->no_rr) {
-        fp->peers->current = peer_id;
-    }
-    pc->sockaddr = peer->sockaddr;
-    pc->socklen = peer->socklen;
-    pc->name = &peer->name;
-
-    peer->shared->last_req_id = fp->peers->shared->total_requests;
-    ngx_http_upstream_fair_update_nreq(fp, 1, pc->log);
-    peer->shared->total_req++;
-    ngx_spinlock_unlock(lock);
-    return ret;
-}
-
-
-void
-ngx_http_upstream_free_fair_peer(ngx_peer_connection_t *pc, void *data,
-    ngx_uint_t state)
-{
-    ngx_http_upstream_fair_peer_data_t     *fp = data;
-    ngx_http_upstream_fair_peer_t          *peer;
-    ngx_atomic_t                           *lock;
-
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] fp->current = %d, state = %ui, pc->tries = %d, pc->data = %p",
-        fp->current, state, pc->tries, pc->data);
-
-    if (fp->current == NGX_PEER_INVALID) {
-        return;
-    }
-
-    lock = &fp->peers->shared->lock;
-    ngx_spinlock(lock, ngx_pid, 1024);
-    if (!ngx_bitvector_test(fp->done, fp->current)) {
-        ngx_bitvector_set(fp->done, fp->current);
-        ngx_http_upstream_fair_update_nreq(fp, -1, pc->log);
-    }
-
-    if (fp->peers->number == 1) {
-        pc->tries = 0;
-    }
-
-    if (state & NGX_PEER_FAILED) {
-        peer = &fp->peers->peer[fp->current];
-
-        peer->shared->fails++;
-        peer->accessed = ngx_time();
-    }
-    ngx_spinlock_unlock(lock);
-}
-
-/*
- * walk through the rbtree, removing old entries and looking for
- * a matching one -- compared by (cycle, peers) pair
- *
- * no attempt at optimisation is made, for two reasons:
- *  - the tree will be quite small, anyway
- *  - being called once per worker startup per upstream block,
- *    this code isn't really the hot path
- */
-static ngx_http_upstream_fair_shm_block_t *
-ngx_http_upstream_fair_walk_shm(
-    ngx_slab_pool_t *shpool,
-    ngx_rbtree_node_t *node,
-    ngx_rbtree_node_t *sentinel,
-    ngx_http_upstream_fair_peers_t *peers)
-{
-    ngx_http_upstream_fair_shm_block_t     *uf_node;
-    ngx_http_upstream_fair_shm_block_t     *found_node = NULL;
-    ngx_http_upstream_fair_shm_block_t     *tmp_node;
-
-    if (node == sentinel) {
-        return NULL;
-    }
-
-    /* visit left node */
-    if (node->left != sentinel) {
-        tmp_node = ngx_http_upstream_fair_walk_shm(shpool, node->left,
-            sentinel, peers);
-        if (tmp_node) {
-            found_node = tmp_node;
-        }
-    }
-
-    /* visit right node */
-    if (node->right != sentinel) {
-        tmp_node = ngx_http_upstream_fair_walk_shm(shpool, node->right,
-            sentinel, peers);
-        if (tmp_node) {
-            found_node = tmp_node;
-        }
-    }
-
-    /* visit current node */
-    uf_node = (ngx_http_upstream_fair_shm_block_t *) node;
-    if (uf_node->generation != ngx_http_upstream_fair_generation) {
-        ngx_spinlock(&uf_node->lock, ngx_pid, 1024);
-        if (uf_node->total_nreq == 0) {
-            /* don't bother unlocking */
-            ngx_rbtree_delete(ngx_http_upstream_fair_rbtree, node);
-            ngx_slab_free_locked(shpool, node);
-        }
-        ngx_spinlock_unlock(&uf_node->lock);
-    } else if (uf_node->peers == (uintptr_t) peers) {
-        found_node = uf_node;
-    }
-
-    return found_node;
-}
-
-static ngx_int_t
-ngx_http_upstream_fair_shm_alloc(ngx_http_upstream_fair_peers_t *usfp, ngx_log_t *log)
-{
-    ngx_slab_pool_t                        *shpool;
-    ngx_uint_t                              i;
-
-    if (usfp->shared) {
-        return NGX_OK;
-    }
-
-    shpool = (ngx_slab_pool_t *)ngx_http_upstream_fair_shm_zone->shm.addr;
-
-    ngx_shmtx_lock(&shpool->mutex);
-
-    usfp->shared = ngx_http_upstream_fair_walk_shm(shpool,
-        ngx_http_upstream_fair_rbtree->root,
-        ngx_http_upstream_fair_rbtree->sentinel,
-        usfp);
-
-    if (usfp->shared) {
-        ngx_shmtx_unlock(&shpool->mutex);
-        return NGX_OK;
-    }
-
-    usfp->shared = ngx_slab_alloc_locked(shpool,
-        sizeof(ngx_http_upstream_fair_shm_block_t) +
-        (usfp->number - 1) * sizeof(ngx_http_upstream_fair_shared_t));
-
-    if (!usfp->shared) {
-        ngx_shmtx_unlock(&shpool->mutex);
-        if (!usfp->size_err) {
-            ngx_log_error(NGX_LOG_EMERG, log, 0,
-                "upstream_fair_shm_size too small (current value is %udKiB)",
-                ngx_http_upstream_fair_shm_size >> 10);
-            usfp->size_err = 1;
-        }
-        return NGX_ERROR;
-    }
-
-    usfp->shared->node.key = ngx_crc32_short((u_char *) &ngx_cycle, sizeof ngx_cycle) ^
-        ngx_crc32_short((u_char *) &usfp, sizeof(usfp));
-
-    usfp->shared->generation = ngx_http_upstream_fair_generation;
-    usfp->shared->peers = (uintptr_t) usfp;
-    usfp->shared->total_nreq = 0;
-    usfp->shared->total_requests = 0;
-
-    for (i = 0; i < usfp->number; i++) {
-            usfp->shared->stats[i].nreq = 0;
-            usfp->shared->stats[i].last_req_id = 0;
-            usfp->shared->stats[i].total_req = 0;
-    }
-
-    ngx_rbtree_insert(ngx_http_upstream_fair_rbtree, &usfp->shared->node);
-
-    ngx_shmtx_unlock(&shpool->mutex);
-    return NGX_OK;
-}
-
-ngx_int_t
-ngx_http_upstream_init_fair_peer(ngx_http_request_t *r,
-    ngx_http_upstream_srv_conf_t *us)
-{
-    ngx_http_upstream_fair_peer_data_t     *fp;
-    ngx_http_upstream_fair_peers_t         *usfp;
-    ngx_uint_t                              n;
-
-    fp = r->upstream->peer.data;
-
-    if (fp == NULL) {
-        fp = ngx_palloc(r->pool, sizeof(ngx_http_upstream_fair_peer_data_t));
-        if (fp == NULL) {
-            return NGX_ERROR;
-        }
-
-        r->upstream->peer.data = fp;
-    }
-
-    usfp = us->peer.data;
-
-    fp->tried = ngx_bitvector_alloc(r->pool, usfp->number, &fp->data);
-    fp->done = ngx_bitvector_alloc(r->pool, usfp->number, &fp->data2);
-
-    if (fp->tried == NULL || fp->done == NULL) {
-        return NGX_ERROR;
-    }
-
-    /* set up shared memory area */
-    ngx_http_upstream_fair_shm_alloc(usfp, r->connection->log);
-
-    fp->current = usfp->current;
-    fp->peers = usfp;
-    usfp->shared->total_requests++;
-
-    for (n = 0; n < usfp->number; n++) {
-        usfp->peer[n].shared = &usfp->shared->stats[n];
-    }
-
-    r->upstream->peer.get = ngx_http_upstream_get_fair_peer;
-    r->upstream->peer.free = ngx_http_upstream_free_fair_peer;
-    r->upstream->peer.tries = usfp->number;
-#if (NGX_HTTP_SSL)
-    r->upstream->peer.set_session =
-                               ngx_http_upstream_fair_set_session;
-    r->upstream->peer.save_session =
-                               ngx_http_upstream_fair_save_session;
-#endif
-
-    return NGX_OK;
-}
-
-#if (NGX_HTTP_SSL)
-static ngx_int_t
-ngx_http_upstream_fair_set_session(ngx_peer_connection_t *pc, void *data)
-{
-    ngx_http_upstream_fair_peer_data_t  *fp = data;
-
-    ngx_int_t                      rc;
-    ngx_ssl_session_t             *ssl_session;
-    ngx_http_upstream_fair_peer_t *peer;
-
-    if (fp->current == NGX_PEER_INVALID)
-        return NGX_OK;
-
-    peer = &fp->peers->peer[fp->current];
-
-    /* TODO: threads only mutex */
-    /* ngx_lock_mutex(fp->peers->mutex); */
-
-    ssl_session = peer->ssl_session;
-
-    rc = ngx_ssl_set_session(pc->connection, ssl_session);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "set session: %p:%d",
-                   ssl_session, ssl_session ? ssl_session->references : 0);
-
-    /* ngx_unlock_mutex(fp->peers->mutex); */
-
-    return rc;
-}
-
-static void
-ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc, void *data)
-{
-    ngx_http_upstream_fair_peer_data_t  *fp = data;
-
-    ngx_ssl_session_t             *old_ssl_session, *ssl_session;
-    ngx_http_upstream_fair_peer_t *peer;
-
-    if (fp->current == NGX_PEER_INVALID)
-        return;
-
-    ssl_session = ngx_ssl_get_session(pc->connection);
-
-    if (ssl_session == NULL) {
-        return;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                   "save session: %p:%d", ssl_session, ssl_session->references);
-
-    peer = &fp->peers->peer[fp->current];
-
-    /* TODO: threads only mutex */
-    /* ngx_lock_mutex(fp->peers->mutex); */
-
-    old_ssl_session = peer->ssl_session;
-    peer->ssl_session = ssl_session;
-
-    /* ngx_unlock_mutex(fp->peers->mutex); */
-
-    if (old_ssl_session) {
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-                       "old session: %p:%d",
-                       old_ssl_session, old_ssl_session->references);
-
-        /* TODO: may block */
-
-        ngx_ssl_free_session(old_ssl_session);
-    }
-}
-
-#endif
-
-#if (NGX_HTTP_EXTENDED_STATUS)
-static void
-ngx_http_upstream_fair_walk_status(ngx_pool_t *pool, ngx_chain_t *cl, ngx_int_t *length,
-    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel)
-{
-    ngx_http_upstream_fair_shm_block_t     *s_node = (ngx_http_upstream_fair_shm_block_t *) node;
-    ngx_http_upstream_fair_peers_t         *peers;
-    ngx_chain_t                            *new_cl;
-    ngx_buf_t                              *b;
-    ngx_uint_t                              size, i;
-
-    if (node == sentinel) {
-        return;
-    }
-
-    if (node->left != sentinel) {
-        ngx_http_upstream_fair_walk_status(pool, cl, length, node->left, sentinel);
-    }
-
-    if (s_node->generation != ngx_http_upstream_fair_generation) {
-        size = 100;
-        peers = NULL;
-    } else {
-        /* this is rather ugly (casting an uintptr_t back into a pointer
-         * but as long as the generation is still the same (verified above),
-         * it should be still safe
-         */
-        peers = (ngx_http_upstream_fair_peers_t *) s_node->peers;
-        if (!peers->shared) {
-            goto next;
-        }
-
-        size = 200 + peers->number * 120; /* LOTS of slack */
-    }
-
-    b = ngx_create_temp_buf(pool, size);
-    if (!b) {
-        goto next;
-    }
-
-    new_cl = ngx_alloc_chain_link(pool);
-    if (!new_cl) {
-        goto next;
-    }
-
-    new_cl->buf = b;
-    new_cl->next = NULL;
-
-    while (cl->next) {
-        cl = cl->next;
-    }
-    cl->next = new_cl;
-
-    if (peers) {
-        b->last = ngx_sprintf(b->last, "upstream %V (%p): current peer %d/%d, total requests: %ui\n", peers->name, (void*) node, peers->current, peers->number, s_node->total_requests);
-        for (i = 0; i < peers->number; i++) {
-            ngx_http_upstream_fair_peer_t *peer = &peers->peer[i];
-            ngx_http_upstream_fair_shared_t *sh = peer->shared;
-            b->last = ngx_sprintf(b->last, " peer %d: %V weight: %d/%d, fails: %d/%d, acc: %d, down: %d, nreq: %d, total_req: %ui, last_req: %ui\n",
-                i, &peer->name, sh->current_weight, peer->weight, sh->fails, peer->max_fails, peer->accessed, peer->down,
-                sh->nreq, sh->total_req, sh->last_req_id);
-        }
-    } else {
-        b->last = ngx_sprintf(b->last, "upstream %p: gen %ui != %ui, total_nreq = %ui", (void*) node, s_node->generation, ngx_http_upstream_fair_generation, s_node->total_nreq);
-    }
-    b->last = ngx_sprintf(b->last, "\n");
-    b->last_buf = 1;
-
-    *length += b->last - b->pos;
-
-    if (cl->buf) {
-        cl->buf->last_buf = 0;
-    }
-
-    cl = cl->next;
-next:
-
-    if (node->right != sentinel) {
-        ngx_http_upstream_fair_walk_status(pool, cl, length, node->right, sentinel);
-    }
-}
-
-static ngx_chain_t*
-ngx_http_upstream_fair_report_status(ngx_http_request_t *r, ngx_int_t *length)
-{
-    ngx_buf_t              *b;
-    ngx_chain_t            *cl;
-    ngx_slab_pool_t        *shpool;
-
-    b = ngx_create_temp_buf(r->pool, sizeof("\nupstream_fair status report:\n"));
-    if (!b) {
-        return NULL;
-    }
-
-    cl = ngx_alloc_chain_link(r->pool);
-    if (!cl) {
-        return NULL;
-    }
-    cl->next = NULL;
-    cl->buf = b;
-
-    b->last = ngx_cpymem(b->last, "\nupstream_fair status report:\n",
-        sizeof("\nupstream_fair status report:\n") - 1);
-
-    *length = b->last - b->pos;
-
-    shpool = (ngx_slab_pool_t *)ngx_http_upstream_fair_shm_zone->shm.addr;
-
-    ngx_shmtx_lock(&shpool->mutex);
-
-    ngx_http_upstream_fair_walk_status(r->pool, cl,
-        length,
-        ngx_http_upstream_fair_rbtree->root,
-        ngx_http_upstream_fair_rbtree->sentinel);
-
-    ngx_shmtx_unlock(&shpool->mutex);
-
-    if (!cl->next || !cl->next->buf) {
-        /* no upstream_fair status to report */
-        return NULL;
-    }
-
-    return cl;
-}
-#endif
-
-/* vim: set et ts=4 sw=4: */
diff --git a/debian/modules/patches/http-cache-purge/dynamic-module.patch b/debian/modules/patches/http-cache-purge/dynamic-module.patch
deleted file mode 100644
index 58dc77c..0000000
--- a/debian/modules/patches/http-cache-purge/dynamic-module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 26d7114ac82195cd4f7db606d7762a6cff9132ad Mon Sep 17 00:00:00 2001
-From: Hiroaki Nakamura <hnakamur@gmail.com>
-Date: Fri, 12 Feb 2016 09:03:35 +0900
-Subject: [PATCH] Convert a config file to build a dynamic module
-Origin: other, https://github.com/FRiCKLE/ngx_cache_purge/pull/45
-
----
- config | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/config b/config
-index 34f42ec..b900680 100644
---- a/config
-+++ b/config
-@@ -15,7 +15,17 @@ if [ "$HTTP_UWSGI" = "YES" ]; then
- fi
- 
- ngx_addon_name=ngx_http_cache_purge_module
--HTTP_MODULES="$HTTP_MODULES ngx_http_cache_purge_module"
--NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_cache_purge_module.c"
-+CACHE_PURGE_SRCS="$ngx_addon_dir/ngx_cache_purge_module.c"
-+
-+if [ -n "$ngx_module_link" ]; then
-+    ngx_module_type=HTTP
-+    ngx_module_name="$ngx_addon_name"
-+    ngx_module_srcs="$CACHE_PURGE_SRCS"
-+
-+    . auto/module
-+else
-+    HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
-+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $CACHE_PURGE_SRCS"
-+fi
- 
- have=NGX_CACHE_PURGE_MODULE . auto/have
diff --git a/debian/modules/patches/http-cache-purge/segfault-1.11.6.patch b/debian/modules/patches/http-cache-purge/segfault-1.11.6.patch
deleted file mode 100644
index 11972c8..0000000
--- a/debian/modules/patches/http-cache-purge/segfault-1.11.6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Pawel Sulowicz <Pawel.Sulowicz@grupaonet.pl>
-Date: Thu, 2 Feb 2017 09:39:37 +0100
-Subject: [PATCH] Fix compatibility with nginx-1.11.6+
-Origin: other, https://github.com/FRiCKLE/ngx_cache_purge/pull/51
-
----
- ngx_cache_purge_module.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ngx_cache_purge_module.c b/ngx_cache_purge_module.c
-index 62d3818..fd1ebde 100644
---- a/ngx_cache_purge_module.c
-+++ b/ngx_cache_purge_module.c
-@@ -492,7 +492,11 @@ typedef struct {
-     ngx_str_t                      body_source;
- #  endif /* nginx_version < 1007008 */
- 
-+#  if (nginx_version >= 1011006)
-+    ngx_http_complex_value_t      *method;
-+#  else
-     ngx_str_t                      method;
-+#  endif /* nginx_version >= 1011006 */
-     ngx_str_t                      location;
-     ngx_str_t                      url;
- 
diff --git a/debian/modules/patches/http-cache-purge/series b/debian/modules/patches/http-cache-purge/series
deleted file mode 100644
index 2876b35..0000000
--- a/debian/modules/patches/http-cache-purge/series
+++ /dev/null
@@ -1,2 +0,0 @@
-dynamic-module.patch
-segfault-1.11.6.patch
diff --git a/debian/modules/patches/http-subs-filter/dynamic-module.patch b/debian/modules/patches/http-subs-filter/dynamic-module.patch
deleted file mode 100644
index 2001ff7..0000000
--- a/debian/modules/patches/http-subs-filter/dynamic-module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b157ed379c3c9c5c1846caa594d6733e88406863 Mon Sep 17 00:00:00 2001
-From: Jeffrey Kriegsman <jeffrey@kriegsman.eu>
-Date: Mon, 15 Feb 2016 15:36:21 +0100
-Subject: [PATCH] Feature: nginx dynamic module support
-Origin: other, https://github.com/yaoweibin/ngx_http_substitutions_filter_module/pull/19
-
----
- config | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/config b/config
-index fdb016c..f1de029 100644
---- a/config
-+++ b/config
-@@ -1,3 +1,15 @@
- ngx_addon_name=ngx_http_subs_filter_module
--HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
--NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
-+
-+if test -n "$ngx_module_link"; then
-+    ngx_module_type=HTTP_FILTER
-+    ngx_module_name=ngx_http_subs_filter_module
-+    ngx_module_incs=
-+    ngx_module_deps=
-+    ngx_module_srcs="$ngx_addon_dir/ngx_http_subs_filter_module.c"
-+    ngx_module_libs=""
-+
-+    . auto/module
-+else
-+    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
-+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
-+fi
diff --git a/debian/modules/patches/http-subs-filter/pcre2.patch b/debian/modules/patches/http-subs-filter/pcre2.patch
deleted file mode 100644
index 692257c..0000000
--- a/debian/modules/patches/http-subs-filter/pcre2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: shmux8 <75251845+shmux8@users.noreply.github.com>
-Date:   Tue Dec 28 11:15:00 2021 +0300
-Subject: [PATCH] pcre2 support
-Origin: https://github.com/yaoweibin/ngx_http_substitutions_filter_module/commit/cc494d7f5c5273a7a8ae503faebf1101689d75c0
-
-    PCRE2 support added
-
-    Use pcre2_pattern_info call if nginx built with PCRE2.
-
-diff --git a/debian/modules/http-subs-filter/ngx_http_subs_filter_module.c b/debian/modules/http-subs-filter/ngx_http_subs_filter_module.c
-index 483c9c3..11a5b79 100644
---- a/ngx_http_subs_filter_module.c
-+++ b/ngx_http_subs_filter_module.c
-@@ -1203,7 +1203,9 @@ ngx_http_subs_regex_capture_count(ngx_regex_t *re)
- 
-     n = 0;
- 
--#if defined(nginx_version) && nginx_version >= 1002002
-+#if (NGX_PCRE2)
-+     rc = pcre2_pattern_info(re, PCRE2_INFO_CAPTURECOUNT, &n);
-+#elif defined(nginx_version) && nginx_version >= 1002002
-     rc = pcre_fullinfo(re->code, NULL, PCRE_INFO_CAPTURECOUNT, &n);
- #elif defined(nginx_version) && nginx_version >= 1001012
-     rc = pcre_fullinfo(re->pcre, NULL, PCRE_INFO_CAPTURECOUNT, &n);
diff --git a/debian/modules/patches/http-subs-filter/series b/debian/modules/patches/http-subs-filter/series
deleted file mode 100644
index 4344c0b..0000000
--- a/debian/modules/patches/http-subs-filter/series
+++ /dev/null
@@ -1,2 +0,0 @@
-dynamic-module.patch
-pcre2.patch
diff --git a/debian/modules/patches/http-upstream-fair/drop-default-port.patch b/debian/modules/patches/http-upstream-fair/drop-default-port.patch
deleted file mode 100644
index 708caa0..0000000
--- a/debian/modules/patches/http-upstream-fair/drop-default-port.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d754c97abc103f6cb3c4d9385daa8547245a07e6 Mon Sep 17 00:00:00 2001
-From: Christos Trochalakis <yatiohi@ideopolis.gr>
-Date: Wed, 16 Nov 2016 10:52:08 +0200
-Subject: [PATCH] Don't use default_port (dropped in nginx 1.11.6)
-
-See:
-4dea01cf49e8 Upstream: removed ngx_http_upstream_srv_conf_t.default_port.
-3fa5983b6b44 Upstream: don't consider default_port when matching upstreams.
----
- ngx_http_upstream_fair_module.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c
-index a4419ca..5d76bb4 100644
---- a/ngx_http_upstream_fair_module.c
-+++ b/ngx_http_upstream_fair_module.c
-@@ -540,7 +540,7 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
- 
-     /* an upstream implicitly defined by proxy_pass, etc. */
- 
--    if (us->port == 0 && us->default_port == 0) {
-+    if (us->port == 0) {
-         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                       "no port in upstream \"%V\" in %s:%ui",
-                       &us->host, us->file_name, us->line);
-@@ -550,7 +550,7 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
-     ngx_memzero(&u, sizeof(ngx_url_t));
- 
-     u.host = us->host;
--    u.port = (in_port_t) (us->port ? us->port : us->default_port);
-+    u.port = (in_port_t) us->port;
- 
-     if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
-         if (u.err) {
--- 
-2.10.2
-
diff --git a/debian/modules/patches/http-upstream-fair/dynamic-module.patch b/debian/modules/patches/http-upstream-fair/dynamic-module.patch
deleted file mode 100644
index 0e00466..0000000
--- a/debian/modules/patches/http-upstream-fair/dynamic-module.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 725c58638f5d1921ad5d4a39274edb81bc5b47e6 Mon Sep 17 00:00:00 2001
-From: 99999 <PeterTonoli@users.noreply.github.com>
-Date: Sat, 30 Apr 2016 23:56:19 +1000
-Subject: [PATCH] nginx-upstream-fair can now be compiled as a dynamic module
-Origin: other, https://github.com/gnosek/nginx-upstream-fair/pull/21
-
----
- config | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/config b/config
-index ff351b7..d8d478b 100644
---- a/config
-+++ b/config
-@@ -1,3 +1,12 @@
- ngx_addon_name=ngx_http_upstream_fair_module
--HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
--NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
-+
-+if test -n "$ngx_module_link"; then
-+    ngx_module_type=HTTP
-+    ngx_module_name=ngx_http_upstream_fair_module
-+    ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_fair_module.c"
-+
-+    . auto/module
-+else
-+    HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
-+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
-+fi
diff --git a/debian/modules/patches/http-upstream-fair/openssl-1.1.0.patch b/debian/modules/patches/http-upstream-fair/openssl-1.1.0.patch
deleted file mode 100644
index c154daa..0000000
--- a/debian/modules/patches/http-upstream-fair/openssl-1.1.0.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cfdf4ffa18e812cbbff3872c1026c3c072d22c09 Mon Sep 17 00:00:00 2001
-From: Kurt Roeckx <kurt@roeckx.be>
-Date: Fri, 2 Sep 2016 23:04:36 +0200
-Subject: [PATCH] Make it build using OpenSSL 1.1.0
-Origin: other, https://github.com/gnosek/nginx-upstream-fair/pull/22
-
-The reference counter is now internal in OpenSSL and not accessible any more.
----
- ngx_http_upstream_fair_module.c | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c
-index a4419ca..6353f1b 100644
---- a/ngx_http_upstream_fair_module.c
-+++ b/ngx_http_upstream_fair_module.c
-@@ -1174,9 +1174,8 @@ ngx_http_upstream_fair_set_session(ngx_peer_connection_t *pc, void *data)
- 
-     rc = ngx_ssl_set_session(pc->connection, ssl_session);
- 
--    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
--                   "set session: %p:%d",
--                   ssl_session, ssl_session ? ssl_session->references : 0);
-+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+                   "set session: %p", ssl_session);
- 
-     /* ngx_unlock_mutex(fp->peers->mutex); */
- 
-@@ -1200,8 +1199,8 @@ ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc, void *data)
-         return;
-     }
- 
--    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
--                   "save session: %p:%d", ssl_session, ssl_session->references);
-+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+                   "save session: %p", ssl_session);
- 
-     peer = &fp->peers->peer[fp->current];
- 
-@@ -1215,9 +1214,8 @@ ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc, void *data)
- 
-     if (old_ssl_session) {
- 
--        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
--                       "old session: %p:%d",
--                       old_ssl_session, old_ssl_session->references);
-+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+                       "old session: %p", old_ssl_session);
- 
-         /* TODO: may block */
- 
diff --git a/debian/modules/patches/http-upstream-fair/series b/debian/modules/patches/http-upstream-fair/series
deleted file mode 100644
index f8e5439..0000000
--- a/debian/modules/patches/http-upstream-fair/series
+++ /dev/null
@@ -1,3 +0,0 @@
-dynamic-module.patch
-openssl-1.1.0.patch
-drop-default-port.patch
diff --git a/debian/modules/watch/http-auth-pam b/debian/modules/watch/http-auth-pam
deleted file mode 100644
index 8c0a5c0..0000000
--- a/debian/modules/watch/http-auth-pam
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-auth-pam-$1.tar.gz%" \
-    https://github.com/sto/ngx_http_auth_pam_module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-auth-pam
diff --git a/debian/modules/watch/http-cache-purge b/debian/modules/watch/http-cache-purge
deleted file mode 100644
index e2458f2..0000000
--- a/debian/modules/watch/http-cache-purge
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-cache-purge-$1.tar.gz%" \
-    https://github.com/FRiCKLE/ngx_cache_purge/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-cache-purge
diff --git a/debian/modules/watch/http-dav-ext b/debian/modules/watch/http-dav-ext
deleted file mode 100644
index 064766a..0000000
--- a/debian/modules/watch/http-dav-ext
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-dav-ext-$1.tar.gz%" \
-    https://github.com/arut/nginx-dav-ext-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-dav-ext
diff --git a/debian/modules/watch/http-echo b/debian/modules/watch/http-echo
deleted file mode 100644
index 3d44f5d..0000000
--- a/debian/modules/watch/http-echo
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-echo-$1.tar.gz%" \
-    https://github.com/agentzh/echo-nginx-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-echo
diff --git a/debian/modules/watch/http-fancyindex b/debian/modules/watch/http-fancyindex
deleted file mode 100644
index 5833ccd..0000000
--- a/debian/modules/watch/http-fancyindex
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-fancyindex-$1.tar.gz%" \
-    https://github.com/aperezdc/ngx-fancyindex/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-fancyindex
diff --git a/debian/modules/watch/http-geoip2 b/debian/modules/watch/http-geoip2
deleted file mode 100644
index da23145..0000000
--- a/debian/modules/watch/http-geoip2
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-geoip2-$1.tar.gz%" \
-    https://github.com/leev/ngx_http_geoip2_module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-geoip2
diff --git a/debian/modules/watch/http-headers-more-filter b/debian/modules/watch/http-headers-more-filter
deleted file mode 100644
index b0cae5c..0000000
--- a/debian/modules/watch/http-headers-more-filter
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="uversionmangle=s/0.261/0.26.1/,dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-headers-more-filter-$1.tar.gz%" \
-    https://github.com/agentzh/headers-more-nginx-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-headers-more-filter
diff --git a/debian/modules/watch/http-lua b/debian/modules/watch/http-lua
deleted file mode 100644
index 193d824..0000000
--- a/debian/modules/watch/http-lua
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-lua-$1.tar.gz%" \
-    https://github.com/openresty/lua-nginx-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-lua
diff --git a/debian/modules/watch/http-subs-filter b/debian/modules/watch/http-subs-filter
deleted file mode 100644
index 2d37540..0000000
--- a/debian/modules/watch/http-subs-filter
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-subs-filter-$1.tar.gz%" \
-    https://github.com/yaoweibin/ngx_http_substitutions_filter_module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-subs-filter
diff --git a/debian/modules/watch/http-uploadprogress b/debian/modules/watch/http-uploadprogress
deleted file mode 100644
index cccba98..0000000
--- a/debian/modules/watch/http-uploadprogress
+++ /dev/null
@@ -1,4 +0,0 @@
-version=4
-opts="dversionmangle=s/v//,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libnginx-mod-http-uploadprogress-$1.tar.gz%" \
-    https://github.com/masterzen/nginx-upload-progress-module/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian debian/ngxmod uupdate http-uploadprogress
diff --git a/debian/ngxmod b/debian/ngxmod
deleted file mode 100755
index 0ceb399..0000000
--- a/debian/ngxmod
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env python3
-"""
-Handy Debian nginx module management helper
-"""
-
-import argparse
-import os
-import re
-import shutil
-import sys
-import tarfile
-import tempfile
-
-from subprocess import call
-
-import debian.deb822 as deb822
-
-DEBIAN_PATH = os.path.dirname(os.path.realpath(__file__))
-MODULES_PATH = os.path.join(DEBIAN_PATH, 'modules')
-CTRL_PATH = os.path.join(MODULES_PATH, 'control')
-CTRL = [p for p in deb822.Deb822.iter_paragraphs(open(CTRL_PATH))]
-
-
-def ctrl(name):
-    "Return deb822 paragraph for the selected module"
-    global CTRL
-
-    for m in CTRL:
-        if m['Module'] == name:
-            return m
-
-
-def update_ctrl():
-    "Save current control to disk"
-    global CTRL
-
-    new_ctrl = CTRL_PATH + '.new'
-    with open(new_ctrl, 'w') as c:
-        for m in CTRL:
-            c.write(m.dump() + '\n')
-
-    os.rename(new_ctrl, CTRL_PATH)
-
-
-def prompt(query):
-    """
-    Ask the given query and wait for an y/N answer.
-
-    :query: The query
-    :returns: The yes (True) or no (False) answer
-    """
-    sys.stdout.write('%s [y/N]: ' % query)
-    choice = input().lower()
-
-    return choice == 'y'
-
-
-def commit(module, version):
-    """
-    Git-commit the given module's upgraded source.
-
-    :param module: module name
-    :param version: The updated module version
-    """
-    module_path = os.path.join(MODULES_PATH, module)
-
-    git_add_cmd = ['git', 'add', '--all', module_path, CTRL_PATH]
-    call(git_add_cmd)
-
-    commit_msg = '%s: Upgrade to %s' % (module, version)
-    git_commit_cmd = [
-        'git', 'commit', '-m', commit_msg,
-        '--', module_path, CTRL_PATH]
-    call(git_commit_cmd)
-
-
-def unpack(module, version, exclude):
-    "Unpack upstream tar file into module path"
-
-    tar_gz = os.path.join(
-        "..", "libnginx-mod-%s-%s.tar.gz" % (module, version))
-    if not os.path.exists(tar_gz):
-        print("%s doesn't exist!" % tar_gz)
-        exit(1)
-
-    module_path = os.path.join(MODULES_PATH, module)
-    tmpdir = tempfile.mkdtemp(prefix="libnginx-mod-%s-%s." % (module, version))
-    with tarfile.open(tar_gz) as tar:
-        members = tar.getmembers()
-
-        # stip top-level directory from tar
-        topdir = members[0]
-        if not topdir or not topdir.isdir():
-            print("No top directory found!")
-            exit(1)
-
-        topdir = members[0].path
-        if any(topdir not in ti.path for ti in members):
-            print("Not all files are under the top directory '%s'" % topdir)
-            exit(1)
-
-        def remove_topdir_prefix(tarinfo):
-            "Strip top directory"
-            tarinfo.path = os.path.relpath(tarinfo.path, topdir)
-            return tarinfo
-        members = [remove_topdir_prefix(tarinfo) for tarinfo in members]
-        tar.extractall(path=tmpdir, members=members)
-
-    shutil.rmtree(module_path)
-    shutil.move(tmpdir, module_path)
-
-    for e in exclude:
-        print("Removing %s..." % e)
-        abspath = os.path.join(module_path, e)
-        if os.path.isdir(abspath):
-            shutil.rmtree(abspath)
-        else:
-            try:
-                os.remove(abspath)
-            except FileNotFoundError as e:
-                # if it not exists, ignore it
-                pass
-
-
-def cmd_uupdate(args):
-    "Internal uupdate helper, upgrades & commits the given module"
-    c = ctrl(args.module)
-
-    exclude = []
-    if 'Files-Excluded' in c:
-        exclude = c['Files-Excluded'].split()
-
-    unpack(args.module, args.upstream_version, exclude)
-
-    # change ctrl version
-    c['Version'] = args.upstream_version
-    update_ctrl()
-
-    commit(args.module, args.upstream_version)
-
-
-def cmd_uscan(args):
-    """
-    Run uscan for each nginx module listed in debian/modules/control.
-
-    If a new version is found, it will be downloaded & unpacked to the proper
-    debian/modules/MODULE path.
-
-    After the upgrade, all files listed in the Files-Excluded: control field
-    will be removed, debian/modules/control version will be updated and all
-    changes will be commited to git.
-    """
-    global CTRL
-
-    # For every module that has watchfile...
-    for mi in CTRL:
-        sys.stdout.write('Uscanning %s: ' % mi['Module'])
-        sys.stdout.flush()
-
-        watchfile = os.path.join(MODULES_PATH, 'watch', mi['Module'])
-
-        if not os.path.isfile(watchfile):
-            print('no watchfile available.')
-            continue
-
-        # Check
-        uscan_check_cmd = [
-            'uscan', '--upstream-version', mi['Version'],
-            '--watchfile', watchfile, '--package',
-            mi['Module']
-        ]
-        if call(uscan_check_cmd) != 0:
-            print('up-to-date')
-            continue
-
-        # Ask
-        if not prompt('Do you want to upgrade %s?' % mi['Module']):
-            continue
-
-        # Upgrade
-        uscan_upgrade_cmd = [
-            'uscan', '--upstream-version', mi['Version'],
-            '--watchfile', watchfile, '--no-symlink'
-        ]
-        if call(uscan_upgrade_cmd, stdout=open(os.devnull, 'w')) != 0:
-            print("Uscan for %s failed!" % mi['Module'])
-            exit(1)
-
-
-def main():
-    """ngxmod main"""
-
-    parser = argparse.ArgumentParser(
-        description=__doc__)
-    cmds = parser.add_subparsers(title="Commands")
-
-    import textwrap
-    uscan_cmd = cmds.add_parser(
-        "uscan",
-        help="scan/watch upstream nginx module sources for new releases",
-        description=textwrap.dedent(cmd_uscan.__doc__),
-        formatter_class=argparse.RawDescriptionHelpFormatter)
-    uscan_cmd.set_defaults(func=cmd_uscan)
-
-    uupdate_cmd = cmds.add_parser(
-        "uupdate",
-        help=cmd_uupdate.__doc__,
-        description=cmd_uupdate.__doc__)
-    uupdate_cmd.add_argument("module", metavar="MODULE", help="Module name")
-    uupdate_cmd.add_argument(
-        "--upstream-version",
-        required=True,
-        metavar="VERSION",
-        help="Upstream version")
-    uupdate_cmd.set_defaults(func=cmd_uupdate)
-
-    args = parser.parse_args()
-    args.func(args)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/debian/rules b/debian/rules
index 5369e83..a0a1fc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,26 +7,14 @@ debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC
 
 FLAVOURS := core light extras
 DYN_MODS := \
-	http-auth-pam \
-	http-cache-purge \
-	http-dav-ext \
-	http-echo \
-	http-fancyindex \
 	http-geoip \
-	http-geoip2 \
-	http-headers-more-filter \
 	http-image-filter \
 	http-perl \
-	http-subs-filter \
-	http-uploadprogress \
-	http-upstream-fair \
 	http-xslt-filter \
 	mail \
 	stream \
-	stream-geoip \
-	stream-geoip2
+	stream-geoip
 
-MODULESDIR = $(CURDIR)/debian/modules
 BASEDIR = $(CURDIR)
 $(foreach flavour,$(FLAVOURS) src ,$(eval BUILDDIR_$(flavour) = $(CURDIR)/debian/build-$(flavour)))
 
@@ -40,9 +28,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-MODULESPATCHDIR = $(CURDIR)/debian/modules/patches
-modules_with_patches := $(notdir $(wildcard $(CURDIR)/debian/modules/patches/*))
-
 # configure flags
 basic_configure_flags := \
 			--prefix=/usr/share/nginx \
@@ -112,25 +97,15 @@ extras_configure_flags := \
 			--with-stream=dynamic \
 			--with-stream_geoip_module=dynamic \
 			--with-stream_ssl_module \
-			--with-stream_ssl_preread_module \
-			--add-dynamic-module=$(MODULESDIR)/http-headers-more-filter \
-			--add-dynamic-module=$(MODULESDIR)/http-auth-pam \
-			--add-dynamic-module=$(MODULESDIR)/http-cache-purge \
-			--add-dynamic-module=$(MODULESDIR)/http-dav-ext \
-			--add-dynamic-module=$(MODULESDIR)/http-echo \
-			--add-dynamic-module=$(MODULESDIR)/http-fancyindex \
-			--add-dynamic-module=$(MODULESDIR)/http-geoip2 \
-			--add-dynamic-module=$(MODULESDIR)/http-uploadprogress \
-			--add-dynamic-module=$(MODULESDIR)/http-upstream-fair \
-			--add-dynamic-module=$(MODULESDIR)/http-subs-filter
+			--with-stream_ssl_preread_module
 
 %:
 	dh $@ --without autoreconf
 
-override_dh_auto_configure: config_patch_modules $(foreach flavour,$(FLAVOURS),config.arch.$(flavour)) config.src
+override_dh_auto_configure: $(foreach flavour,$(FLAVOURS),config.arch.$(flavour)) config.src
 override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour)) build.src
 override_dh_strip:          $(foreach flavour,$(FLAVOURS),strip.arch.$(flavour)) $(foreach mod,$(DYN_MODS),strip.mods.$(mod))
-override_dh_clean:          clean_patch_modules $(foreach flavour,$(FLAVOURS),clean.$(flavour)) clean.src
+override_dh_clean:          $(foreach flavour,$(FLAVOURS),clean.$(flavour)) clean.src
 	dh_clean
 
 override_dh_install:
@@ -163,17 +138,6 @@ strip.arch.%:
 strip.mods.%:
 	dh_strip --package=libnginx-mod-$(*) -O--automatic-dbgsym
 
-config_patch_modules: $(foreach mod,$(modules_with_patches),config.patch.$(mod))
-config.patch.%:
-	cd $(MODULESDIR)/$* && QUILT_PATCHES=$(MODULESPATCHDIR)/$* quilt push -a
-
-clean_patch_modules: $(foreach mod,$(modules_with_patches),clean.patch.$(mod))
-clean.patch.%:
-	if [ -s $(MODULESDIR)/$*/.pc/applied-patches ]; then \
-		cd $(MODULESDIR)/$* && QUILT_PATCHES=$(MODULESPATCHDIR)/$* quilt pop -q -a; \
-		rm -rf $(MODULESDIR)/$*/.pc; \
-	fi
-
 config.arch.%:
 	dh_testdir
 	mkdir -p $(BUILDDIR_$*)
@@ -191,5 +155,3 @@ config.src:
 
 clean.%:
 	rm -rf $(BUILDDIR_$*)
-
-.PHONY: config_patch_modules clean_patch_modules

From 7d7692e5fdb58bdc4c03b3b5dc9154720d30d775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 11 Dec 2022 14:00:47 +0100
Subject: [PATCH 459/600] Default error-log-path is stderr (Closes: #1025858)

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index a0a1fc9..6d560f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ basic_configure_flags := \
 			--prefix=/usr/share/nginx \
 			--conf-path=/etc/nginx/nginx.conf \
 			--http-log-path=/var/log/nginx/access.log \
-			--error-log-path=/var/log/nginx/error.log \
+			--error-log-path=stderr \
 			--lock-path=/var/lock/nginx.lock \
 			--pid-path=/run/nginx.pid \
 			--modules-path=/usr/lib/nginx/modules \

From 4a172ade6fe19380fc296da7c33bd905d97db85d Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Sun, 11 Dec 2022 14:24:55 +0000
Subject: [PATCH 460/600] Enable stream_realip_module

---
 debian/rules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index a0a1fc9..bd9ede6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,7 +97,8 @@ extras_configure_flags := \
 			--with-stream=dynamic \
 			--with-stream_geoip_module=dynamic \
 			--with-stream_ssl_module \
-			--with-stream_ssl_preread_module
+			--with-stream_ssl_preread_module \
+			--with-stream_realip_module
 
 %:
 	dh $@ --without autoreconf

From b975df6df94895efa4a1c433ef9f062ee0b6b52b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 11 Dec 2022 16:30:30 +0100
Subject: [PATCH 461/600] d/changelog update

---
 debian/changelog | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af4ebb8..f98e69d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,19 @@
 nginx (1.22.1-5) UNRELEASED; urgency=medium
 
-  * removed 3th party modules and moved to separate packages:
-    - libnginx-mod-http-geoip2
-    - libnginx-mod-stream-geoip2
-    - libnginx-mod-http-auth-pam
-    - libnginx-mod-http-echo
-    - libnginx-mod-http-upstream-fair
-    - libnginx-mod-http-headers-more-filter
-    - libnginx-mod-http-cache-purge
-    - libnginx-mod-http-fancyindex
-    - libnginx-mod-http-uploadprogress
-    - libnginx-mod-http-subs-filter
-    - libnginx-mod-http-dav-ext
+  * Since version 1.22.1-5 all third party modules are removed from Debian NGINX
+    package and all these modules are maintained in separate external packages.
+    Removed namely these remaining modules:
+      - libnginx-mod-http-geoip2
+      - libnginx-mod-stream-geoip2
+      - libnginx-mod-http-auth-pam
+      - libnginx-mod-http-echo
+      - libnginx-mod-http-upstream-fair
+      - libnginx-mod-http-headers-more-filter
+      - libnginx-mod-http-cache-purge
+      - libnginx-mod-http-fancyindex
+      - libnginx-mod-http-uploadprogress
+      - libnginx-mod-http-subs-filter
+      - libnginx-mod-http-dav-ext
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 16:33:16 +0100
 

From 4eef3437c09a7b38b091061ff33843d918cace71 Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Mon, 12 Dec 2022 13:45:29 +0800
Subject: [PATCH 462/600] Remove unnecessary dependencies after removing 3rd
 party modules

---
 debian/control | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index dced73c..40a5738 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,6 @@ Build-Depends: debhelper-compat (= 13),
                libexpat-dev,
                libgd-dev,
                libgeoip-dev,
-               libhiredis-dev,
-               libmaxminddb-dev,
-               libmhash-dev,
-               libpam0g-dev,
                libpcre3-dev,
                libperl-dev,
                libssl-dev,
@@ -65,18 +61,7 @@ Description: small, powerful, scalable web/proxy server - common files
 Package: nginx-dev
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends},
-         debhelper-compat (= 13),
-         dpkg-dev,
-         libgd-dev,
-         libgeoip-dev,
-         libpcre3-dev,
-         libperl-dev,
-         libssl-dev,
-         libxslt1-dev,
-         po-debconf,
-         quilt,
-         zlib1g-dev,
+Depends: ${misc:Depends}, ${S:Build-Depends},
          nginx-core (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
          nginx-core (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version})
 Provides: dh-sequence-nginx

From 096c5669454ed03513af3b4f8c865aa67be9dbdf Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Mon, 12 Dec 2022 15:23:32 +0800
Subject: [PATCH 463/600] Explicitly disable pcre2

Our intention is to to build nginx with pcre3. However, nginx by default
prefers pcre2. As a result, when libpcre2-dev is installed, nginx will
be built with pcre2, which is not intended.

Furthermore, users of nginx-dev will also meet test failures when they
try to compile module related to pcre because of this. To reproduce,
simply:

```
apt-get install nginx-dev devscripts libpcre2-dev
apt-get source libnginx-mod-http-subs-filter
cd libnginx-mod-http-subs-filter-*/ && debuild -us -uc
```
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index a0a1fc9..fb26d98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@ basic_configure_flags := \
 			--with-compat \
 			--with-debug \
 			--with-pcre-jit \
+			--without-pcre2 \
 			--with-http_ssl_module \
 			--with-http_stub_status_module \
 			--with-http_realip_module \

From 8273ea9b0ea62e8efe52085338961f18a4388e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 12 Dec 2022 17:58:43 +0100
Subject: [PATCH 464/600] d/changelog update

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f98e69d..52b739f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 nginx (1.22.1-5) UNRELEASED; urgency=medium
 
+  [ Jan Mojžíš ]
   * Since version 1.22.1-5 all third party modules are removed from Debian NGINX
     package and all these modules are maintained in separate external packages.
     Removed namely these remaining modules:
@@ -15,6 +16,15 @@ nginx (1.22.1-5) UNRELEASED; urgency=medium
       - libnginx-mod-http-subs-filter
       - libnginx-mod-http-dav-ext
 
+  [ Jérémy Lal ]
+  * d/rules: default error-log-path is stderr (--error-log-path=stderr)
+    instead of hardcoded /var/log/nginx/error.log (Closes: 1025858)
+
+  [ Miao Wang ]
+  * d/control: removed unnecessary dependencies after removing 3rd party modules
+  * d/rules: enabled stream_realip_module (--with-stream_realip_module)
+  * d/rules: explicitly disabled pcre2 (--without-pcre2)
+
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 16:33:16 +0100
 
 nginx (1.22.1-4) unstable; urgency=medium

From dbb13b38d7b3ebab2c6d9922cfdd1804435ad130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 4 Dec 2022 16:01:53 +0100
Subject: [PATCH 465/600] Format tabs in nginx_mod.pm

---
 debian/debhelper/nginx_mod.pm | 80 +++++++++++++++++------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/debian/debhelper/nginx_mod.pm b/debian/debhelper/nginx_mod.pm
index af37fda..0d9e249 100644
--- a/debian/debhelper/nginx_mod.pm
+++ b/debian/debhelper/nginx_mod.pm
@@ -23,7 +23,7 @@ sub check_auto_buildable {
 }
 
 sub _NGINX_SRC_DIR {
-    "/usr/share/nginx/src"
+	"/usr/share/nginx/src"
 }
 
 sub new {
@@ -36,61 +36,61 @@ sub new {
 sub configure {
 	my $this=shift;
 
-    doit({
-        "chdir" => $this->_NGINX_SRC_DIR,
-        "update_env" => {
-            "src_dir" => $this->get_sourcedir,
-            "bld_dir" => $this->get_builddir,
-            "pwd_dir" => $this->{cwd},
-        },
-    }, "bash", "-c", '. ./conf_flags
-    ./configure \\
-        --with-cc-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CFLAGS) -fPIC $(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CPPFLAGS)" \\
-        --with-ld-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get LDFLAGS) -fPIC" \\
-        "${NGX_CONF_FLAGS[@]}" \\
-        --add-dynamic-module="$pwd_dir/$src_dir" \\
-        --builddir="$pwd_dir/$bld_dir" \\
-        "$@"', "dummy", @_);
+	doit({
+		"chdir" => $this->_NGINX_SRC_DIR,
+		"update_env" => {
+			"src_dir" => $this->get_sourcedir,
+			"bld_dir" => $this->get_builddir,
+			"pwd_dir" => $this->{cwd},
+		},
+	}, "bash", "-c", '. ./conf_flags
+		./configure \\
+		--with-cc-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CFLAGS) -fPIC $(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CPPFLAGS)" \\
+		--with-ld-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get LDFLAGS) -fPIC" \\
+		"${NGX_CONF_FLAGS[@]}" \\
+		--add-dynamic-module="$pwd_dir/$src_dir" \\
+		--builddir="$pwd_dir/$bld_dir" \\
+		"$@"', "dummy", @_);
 }
 
 sub build {
 	my $this=shift;
-    
-    $this->do_make("-f", File::Spec->catfile($this->{cwd}, $this->get_buildpath("Makefile")), "-C", $this->_NGINX_SRC_DIR, "modules");
+
+	$this->do_make("-f", File::Spec->catfile($this->{cwd}, $this->get_buildpath("Makefile")), "-C", $this->_NGINX_SRC_DIR, "modules");
 }
 
 sub test {
-    my $this=shift;
-    $this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
-        tmp_conf=$(mktemp -p .)
-        for pre_dep in "$@"; do
-          echo "load_module modules/$pre_dep;" >> "$tmp_conf"
-        done
-        for i in *.so; do
-          echo "load_module $PWD/$i;" >> "$tmp_conf"
-        done
-        echo "events{}" >> "$tmp_conf"
-        nginx -g "error_log /dev/null; pid /dev/null;"  -t -q -c "$PWD/$tmp_conf"
-        rm -f "$tmp_conf"
-    ', "dummy", @_);
+	my $this=shift;
+	$this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
+		tmp_conf=$(mktemp -p .)
+		for pre_dep in "$@"; do
+			echo "load_module modules/$pre_dep;" >> "$tmp_conf"
+		done
+		for i in *.so; do
+			echo "load_module $PWD/$i;" >> "$tmp_conf"
+		done
+		echo "events{}" >> "$tmp_conf"
+		nginx -g "error_log /dev/null; pid /dev/null;" -t -q -c "$PWD/$tmp_conf"
+		rm -f "$tmp_conf"
+	', "dummy", @_);
 }
 
 sub install {
 	my $this=shift;
 	my $destdir=shift;
 
-    $this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
-        destdir=$1
-        mkdir -p "$destdir/usr/lib/nginx/modules"
-        for i in *.so; do
-          cp "$i" "$destdir/usr/lib/nginx/modules/"
-        done
-    ', "dummy", $destdir);
+	$this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
+		destdir=$1
+		mkdir -p "$destdir/usr/lib/nginx/modules"
+		for i in *.so; do
+			cp "$i" "$destdir/usr/lib/nginx/modules/"
+		done
+	', "dummy", $destdir);
 }
 
 sub clean {
-    my $this=shift;
-    $this->rmdir_builddir();
+	my $this=shift;
+	$this->rmdir_builddir();
 }
 
 1

From 8e50af0215c136dbd5018343bb79361b5598b8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 4 Dec 2022 16:02:54 +0100
Subject: [PATCH 466/600] nginx_mod: detect libnginx-mod-http-ndk-dev

---
 debian/debhelper/nginx_mod.pm | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/debian/debhelper/nginx_mod.pm b/debian/debhelper/nginx_mod.pm
index 0d9e249..388efac 100644
--- a/debian/debhelper/nginx_mod.pm
+++ b/debian/debhelper/nginx_mod.pm
@@ -7,7 +7,9 @@ package Debian::Debhelper::Buildsystem::nginx_mod;
 
 use strict;
 use warnings;
-use Debian::Debhelper::Dh_Lib qw(error doit);
+use Dpkg::Deps qw(deps_parse);
+use Dpkg::Control::Info;
+use Debian::Debhelper::Dh_Lib qw(error doit getpackages addsubstvar);
 use File::Spec;
 use parent qw(Debian::Debhelper::Buildsystem::makefile);
 use Config;
@@ -26,10 +28,20 @@ sub _NGINX_SRC_DIR {
 	"/usr/share/nginx/src"
 }
 
+sub _NDK_SRC_DIR {
+	"/usr/share/nginx-ndk/src"
+}
+
 sub new {
 	my $class=shift;
 	my $this= $class->SUPER::new(@_);
 	$this->prefer_out_of_source_building(@_);
+	$this->{has_ndk} = $this->has_build_dep("libnginx-mod-http-ndk-dev");
+	if ($this->{has_ndk} == 1){
+		foreach my $cur (getpackages('arch')) {
+			addsubstvar($cur, "misc:Depends", "libnginx-mod-http-ndk");
+		}
+	}
 	return $this;
 }
 
@@ -50,6 +62,7 @@ sub configure {
 		"${NGX_CONF_FLAGS[@]}" \\
 		--add-dynamic-module="$pwd_dir/$src_dir" \\
 		--builddir="$pwd_dir/$bld_dir" \\
+		' . ($this->{has_ndk} ? '--add-module=' . $this->_NDK_SRC_DIR : '') . ' \\
 		"$@"', "dummy", @_);
 }
 
@@ -61,6 +74,11 @@ sub build {
 
 sub test {
 	my $this=shift;
+
+	if ( $this->{has_ndk} and !grep( /^ndk_http_module.so$/, @_ ) ) {
+		unshift @_, "ndk_http_module.so";
+	}
+
 	$this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
 		tmp_conf=$(mktemp -p .)
 		for pre_dep in "$@"; do
@@ -93,4 +111,17 @@ sub clean {
 	$this->rmdir_builddir();
 }
 
+sub has_build_dep {
+	my $this=shift;
+	my $bd=shift;
+	my $control = Dpkg::Control::Info->new()->get_source();
+	my $depends = deps_parse($control->{'Build-Depends'});
+	foreach (split /,\s+/,$depends) {
+		if ($_ =~ /$bd/) {
+		return 1;
+	}
+	}
+	return 0;
+}
+
 1

From 804090a0ffc6af4d79c40d408ec12fe49381a0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 13 Dec 2022 06:07:58 +0100
Subject: [PATCH 467/600] d/changelog update

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 52b739f..2d707e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ nginx (1.22.1-5) UNRELEASED; urgency=medium
   [ Jérémy Lal ]
   * d/rules: default error-log-path is stderr (--error-log-path=stderr)
     instead of hardcoded /var/log/nginx/error.log (Closes: 1025858)
+  * dh nginx: auto-detect build-dependency on ndk-dev
 
   [ Miao Wang ]
   * d/control: removed unnecessary dependencies after removing 3rd party modules

From 9090d6f143284e9b921e4ae1b2baccd123b507c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Thu, 15 Dec 2022 12:11:45 +0100
Subject: [PATCH 468/600] Refresh patches

---
 debian/patches/nginx-fix-pidfile.patch       | 10 +++-------
 debian/patches/nginx-ssl_cert_cb_yield.patch |  7 +++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/patches/nginx-fix-pidfile.patch b/debian/patches/nginx-fix-pidfile.patch
index 47a16ff..43c6e2f 100644
--- a/debian/patches/nginx-fix-pidfile.patch
+++ b/debian/patches/nginx-fix-pidfile.patch
@@ -5,11 +5,9 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876365
 Last-Update: 2020-06-24
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/src/core/nginx.c b/src/core/nginx.c
-index 9fcb0eb2..083eba1d 100644
 --- a/src/core/nginx.c
 +++ b/src/core/nginx.c
-@@ -338,14 +338,21 @@ main(int argc, char *const *argv)
+@@ -339,14 +339,21 @@
          ngx_process = NGX_PROCESS_MASTER;
      }
  
@@ -32,7 +30,7 @@ index 9fcb0eb2..083eba1d 100644
              return 1;
          }
  
-@@ -358,8 +365,19 @@ main(int argc, char *const *argv)
+@@ -359,8 +366,19 @@
  
  #endif
  
@@ -54,8 +52,6 @@ index 9fcb0eb2..083eba1d 100644
      }
  
      if (ngx_log_redirect_stderr(cycle) != NGX_OK) {
-diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
-index 385c49b6..3719854c 100644
 --- a/src/os/unix/ngx_daemon.c
 +++ b/src/os/unix/ngx_daemon.c
 @@ -7,14 +7,17 @@
@@ -77,7 +73,7 @@ index 385c49b6..3719854c 100644
      case -1:
          ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed");
          return NGX_ERROR;
-@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log)
+@@ -23,7 +26,8 @@
          break;
  
      default:
diff --git a/debian/patches/nginx-ssl_cert_cb_yield.patch b/debian/patches/nginx-ssl_cert_cb_yield.patch
index 96e06e1..df21b02 100644
--- a/debian/patches/nginx-ssl_cert_cb_yield.patch
+++ b/debian/patches/nginx-ssl_cert_cb_yield.patch
@@ -11,10 +11,9 @@ Here we added support for such usage in NGINX 3rd-party modules
 (like ngx_lua) in NGINX's event handlers for downstream SSL
 connections.
 
-diff -r 78b4e10b4367 -r 449f0461859c src/event/ngx_event_openssl.c
---- a/src/event/ngx_event_openssl.c	Thu Dec 17 16:39:15 2015 +0300
-+++ b/src/event/ngx_event_openssl.c	Sat Jan 02 11:14:44 2016 -0800
-@@ -1210,6 +1210,23 @@
+--- a/src/event/ngx_event_openssl.c
++++ b/src/event/ngx_event_openssl.c
+@@ -1832,6 +1832,23 @@
          return NGX_AGAIN;
      }
  

From edf2683169fb4c4c5a3fb563579a59ee2b0bf941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Thu, 15 Dec 2022 12:09:27 +0100
Subject: [PATCH 469/600] SSL_CTX_set_cert_cb() callback yielding patch update

---
 debian/patches/nginx-ssl_cert_cb_yield.patch | 35 +++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/debian/patches/nginx-ssl_cert_cb_yield.patch b/debian/patches/nginx-ssl_cert_cb_yield.patch
index df21b02..adb1ba5 100644
--- a/debian/patches/nginx-ssl_cert_cb_yield.patch
+++ b/debian/patches/nginx-ssl_cert_cb_yield.patch
@@ -1,8 +1,11 @@
-Description: SSL: handled SSL_CTX_set_cert_cb() callback yielding.
-Author: Yichun Zhang <agentzh@openresty.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884434
-Origin: https://raw.githubusercontent.com/openresty/openresty/v1.11.2.2/patches/nginx-1.11.2-ssl_cert_cb_yield.patch
-Last-Update: 2016-01-02
+Origin: https://github.com/openresty/openresty/blob/master/patches/nginx-1.21.4-ssl_cert_cb_yield.patch
+# HG changeset patch
+# User Yichun Zhang <agentzh@openresty.org>
+# Date 1451762084 28800
+#      Sat Jan 02 11:14:44 2016 -0800
+# Node ID 449f0461859c16e95bdb18e8be6b94401545d3dd
+# Parent  78b4e10b4367b31367aad3c83c9c3acdd42397c4
+SSL: handled SSL_CTX_set_cert_cb() callback yielding.
 
 OpenSSL 1.0.2+ introduces SSL_CTX_set_cert_cb() to allow custom
 callbacks to serve the SSL certificiates and private keys dynamically
@@ -37,3 +40,25 @@ connections.
      err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
  
      c->ssl->no_wait_shutdown = 1;
+@@ -1968,6 +1985,21 @@
+         c->read->handler = ngx_ssl_handshake_handler;
+         c->write->handler = ngx_ssl_handshake_handler;
+ 
++        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
++            return NGX_ERROR;
++        }
++
++        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
++            return NGX_ERROR;
++        }
++
++        return NGX_AGAIN;
++    }
++
++    if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
++        c->read->handler = ngx_ssl_handshake_handler;
++        c->write->handler = ngx_ssl_handshake_handler;
++
+         if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+             return NGX_ERROR;
+         }

From df50b0282890dcc80a09b59e1f17e32552aece76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Thu, 15 Dec 2022 11:35:26 +0100
Subject: [PATCH 470/600] Use absolute path for nginx tests

---
 debian/debhelper/nginx_mod.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/debhelper/nginx_mod.pm b/debian/debhelper/nginx_mod.pm
index 388efac..4b19403 100644
--- a/debian/debhelper/nginx_mod.pm
+++ b/debian/debhelper/nginx_mod.pm
@@ -88,7 +88,7 @@ sub test {
 			echo "load_module $PWD/$i;" >> "$tmp_conf"
 		done
 		echo "events{}" >> "$tmp_conf"
-		nginx -g "error_log /dev/null; pid /dev/null;" -t -q -c "$PWD/$tmp_conf"
+		/usr/sbin/nginx -g "error_log /dev/null; pid /dev/null;" -t -q -c "$PWD/$tmp_conf"
 		rm -f "$tmp_conf"
 	', "dummy", @_);
 }

From bfb15ce42601dea1449676357f890111732552a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Thu, 15 Dec 2022 15:00:22 +0100
Subject: [PATCH 471/600] Set global error_log to /var/log/error.log

Now that error_log default value is stderr, it is possible
to override that config using nginx -g 'error_log stderr;'
---
 debian/conf/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index 136753e..f52668a 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -1,6 +1,7 @@
 user www-data;
 worker_processes auto;
 pid /run/nginx.pid;
+error_log /var/log/nginx/error.log;
 include /etc/nginx/modules-enabled/*.conf;
 
 events {
@@ -37,7 +38,6 @@ http {
 	##
 
 	access_log /var/log/nginx/access.log;
-	error_log /var/log/nginx/error.log;
 
 	##
 	# Gzip Settings

From 50a7f05bb523985e370f57d2e47a668cb3ae6ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 15 Dec 2022 16:57:52 +0100
Subject: [PATCH 472/600] d/changelog update

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2d707e8..b09432e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,12 @@ nginx (1.22.1-5) UNRELEASED; urgency=medium
   * d/rules: default error-log-path is stderr (--error-log-path=stderr)
     instead of hardcoded /var/log/nginx/error.log (Closes: 1025858)
   * dh nginx: auto-detect build-dependency on ndk-dev
+  * dh nginx: absolute /usr/sbin/nginx path for nginx tests
+  * d/p/nginx-ssl_cert_cb_yield.patch SSL_CTX_set_cert_cb() callback yielding
+    patch update
+  * d/conf/nginx.conf: Set global error_log to /var/log/error.log
+    Now that error_log default value is stderr, it is possible
+    to override that config using nginx -g 'error_log stderr;'
 
   [ Miao Wang ]
   * d/control: removed unnecessary dependencies after removing 3rd party modules

From f313b00cf3f0a49c7d1a083ba1bbbc0911e32846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 18 Dec 2022 19:29:11 +0100
Subject: [PATCH 473/600] README.Packaging -> README.source

---
 debian/{README.Packaging => README.source} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename debian/{README.Packaging => README.source} (100%)

diff --git a/debian/README.Packaging b/debian/README.source
similarity index 100%
rename from debian/README.Packaging
rename to debian/README.source

From 280d76fff32dccd71053f3d2d024dc27480c270b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 18 Dec 2022 19:33:21 +0100
Subject: [PATCH 474/600] README.source: update

---
 debian/README.source | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 47a582f..dc71efa 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,8 +1,7 @@
 Debian Packaging
 ================
 
-We use git-buildpackage for packaging. Our repository can be found at
-git.debian.org:/git/collab-maint/nginx.git.
+We use git-buildpackage for packaging.
 
 Workflow for Unstable
 =====================
@@ -14,15 +13,9 @@ Dynamic Modules
 
 Since v1.9.11 Nginx added dynamic module support. This will sanitize the
 nginx packaging flow in the long term, but there is a lot work to be done
-in order to get there. We will gradually convert all modules to dynamic
+in order to get there. We gradually convert all modules to dynamic
 as they add support for it.
 
-Currently nginx modules need to be build together with nginx, but this
-will be fixed upstream [0]. Since we already ship 3rd party modules under
-debian/modules/ we will start shipping module packages (libnginx-mod) from
-the same source. Once upstream implements separated building we will
-split each module to a separate source.
-
 [0] https://www.nginx.com/blog/dynamic-modules-nginx-1-9-11/
 
 Workflow for Experimental
@@ -34,7 +27,7 @@ as they lack security support.
 The workflow we use is based on the assumption that packaging work happens on
 origin/master and experimental builds are a trivial patch away from that.
 
-The direct consequense of treating experimental as a patchset for origin/master
+The direct consequence of treating experimental as a patchset for origin/master
 is that the relevant branches are forced-pushed whenever we release a new
 1.11.x version. In other words, **it is not safe to base your work on the
 experimental branch**.
@@ -67,11 +60,4 @@ them.
 Older 1.11.x releases are not referenced by any branch, but they can be found
 by the relevant debian/* tag.
 
-3rd party experimental workflow
-===============================
-
-As we described, it is better not base you work on our forced-pushed
-experimental branch. A better approach would be to maintain a custom-build
-branch that is rebased to our latest experimental branch (basically git rebase
---onto the relevant commits should work).
 

From ef3bb5343637b666193c49276a925287669d1a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 19 Dec 2022 08:53:37 +0100
Subject: [PATCH 475/600] d/tests: all *-simple and *-deps tests updated to
 check if nginx works after installation/reload/restart for all flavours

---
 debian/changelog                |  2 +
 debian/tests/control            |  8 ++--
 debian/tests/core-module-deps   |  8 +---
 debian/tests/core-simple        |  4 +-
 debian/tests/extras-module-deps |  2 +-
 debian/tests/extras-simple      |  4 +-
 debian/tests/full-module-deps   |  2 +-
 debian/tests/full-simple        |  4 +-
 debian/tests/generic            | 73 +++++++++++++++++++++++++++++++++
 debian/tests/light-module-deps  |  2 +-
 debian/tests/light-simple       |  4 +-
 11 files changed, 87 insertions(+), 26 deletions(-)
 mode change 100644 => 120000 debian/tests/core-module-deps
 mode change 100644 => 120000 debian/tests/core-simple
 mode change 100644 => 120000 debian/tests/extras-simple
 mode change 100644 => 120000 debian/tests/full-simple
 create mode 100644 debian/tests/generic
 mode change 100644 => 120000 debian/tests/light-simple

diff --git a/debian/changelog b/debian/changelog
index b09432e..dd2fbac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ nginx (1.22.1-5) UNRELEASED; urgency=medium
       - libnginx-mod-http-uploadprogress
       - libnginx-mod-http-subs-filter
       - libnginx-mod-http-dav-ext
+  * d/tests: all *-simple and *-deps tests updated to check if nginx works
+    after installation/reload/restart for all flavours
 
   [ Jérémy Lal ]
   * d/rules: default error-log-path is stderr (--error-log-path=stderr)
diff --git a/debian/tests/control b/debian/tests/control
index 1de8b0c..880cc6d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: light-simple
-Restrictions: allow-stderr isolation-container
+Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-light, curl
 
 Tests: ec-x25519
@@ -7,15 +7,15 @@ Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-light, ssl-cert, curl
 
 Tests: core-simple
-Restrictions: allow-stderr isolation-container
+Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-core, curl
 
 Tests: full-simple
-Restrictions: allow-stderr isolation-container
+Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-full, curl
 
 Tests: extras-simple
-Restrictions: allow-stderr isolation-container
+Restrictions: allow-stderr isolation-container needs-root
 Depends: nginx-extras, curl
 
 Tests: core-module-deps
diff --git a/debian/tests/core-module-deps b/debian/tests/core-module-deps
deleted file mode 100644
index 8978b2a..0000000
--- a/debian/tests/core-module-deps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# restart nginx before the test
-invoke-rc.d nginx restart || :
-sleep 30
-
-curl --max-time 300 --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/core-module-deps b/debian/tests/core-module-deps
new file mode 120000
index 0000000..df999dd
--- /dev/null
+++ b/debian/tests/core-module-deps
@@ -0,0 +1 @@
+generic
\ No newline at end of file
diff --git a/debian/tests/core-simple b/debian/tests/core-simple
deleted file mode 100644
index cefed50..0000000
--- a/debian/tests/core-simple
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/core-simple b/debian/tests/core-simple
new file mode 120000
index 0000000..df999dd
--- /dev/null
+++ b/debian/tests/core-simple
@@ -0,0 +1 @@
+generic
\ No newline at end of file
diff --git a/debian/tests/extras-module-deps b/debian/tests/extras-module-deps
index ef5f1bc..df999dd 120000
--- a/debian/tests/extras-module-deps
+++ b/debian/tests/extras-module-deps
@@ -1 +1 @@
-core-module-deps
\ No newline at end of file
+generic
\ No newline at end of file
diff --git a/debian/tests/extras-simple b/debian/tests/extras-simple
deleted file mode 100644
index cefed50..0000000
--- a/debian/tests/extras-simple
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/extras-simple b/debian/tests/extras-simple
new file mode 120000
index 0000000..df999dd
--- /dev/null
+++ b/debian/tests/extras-simple
@@ -0,0 +1 @@
+generic
\ No newline at end of file
diff --git a/debian/tests/full-module-deps b/debian/tests/full-module-deps
index ef5f1bc..df999dd 120000
--- a/debian/tests/full-module-deps
+++ b/debian/tests/full-module-deps
@@ -1 +1 @@
-core-module-deps
\ No newline at end of file
+generic
\ No newline at end of file
diff --git a/debian/tests/full-simple b/debian/tests/full-simple
deleted file mode 100644
index cefed50..0000000
--- a/debian/tests/full-simple
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/full-simple b/debian/tests/full-simple
new file mode 120000
index 0000000..df999dd
--- /dev/null
+++ b/debian/tests/full-simple
@@ -0,0 +1 @@
+generic
\ No newline at end of file
diff --git a/debian/tests/generic b/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/debian/tests/light-module-deps b/debian/tests/light-module-deps
index ef5f1bc..df999dd 120000
--- a/debian/tests/light-module-deps
+++ b/debian/tests/light-module-deps
@@ -1 +1 @@
-core-module-deps
\ No newline at end of file
+generic
\ No newline at end of file
diff --git a/debian/tests/light-simple b/debian/tests/light-simple
deleted file mode 100644
index cefed50..0000000
--- a/debian/tests/light-simple
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl --silent --fail -o /dev/null -w "response_code: %{http_code}\n" http://127.0.0.1/
diff --git a/debian/tests/light-simple b/debian/tests/light-simple
new file mode 120000
index 0000000..df999dd
--- /dev/null
+++ b/debian/tests/light-simple
@@ -0,0 +1 @@
+generic
\ No newline at end of file

From e5c631271d99b08cc8d973cb319d5b012965901d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 20 Dec 2022 08:19:48 +0100
Subject: [PATCH 476/600] d/control bump libnginx-mod-nchan version (>=
 1:1.3.5+dfsg-3~)

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 40a5738..07bfa5c 100644
--- a/debian/control
+++ b/debian/control
@@ -198,7 +198,7 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~),
          libnginx-mod-http-upstream-fair (>= 1:0.0~git20120408.a18b409-2~),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
-         libnginx-mod-nchan (>= 1:1.3.5+dfsg-2~),
+         libnginx-mod-nchan (>= 1:1.3.5+dfsg-3~),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
          libnginx-mod-stream-geoip2 (>= 1:3.4-2~),

From 32e7cc8921831c37ff6bac64769ea72a79fdc5cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 20 Dec 2022 08:56:12 +0100
Subject: [PATCH 477/600] d/control: update nginx-common dependency, fixes
 lintian warning maybe-not-arch-all-binnmuable

---
 debian/changelog | 2 ++
 debian/control   | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd2fbac..db15f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ nginx (1.22.1-5) UNRELEASED; urgency=medium
       - libnginx-mod-http-dav-ext
   * d/tests: all *-simple and *-deps tests updated to check if nginx works
     after installation/reload/restart for all flavours
+  * d/control: updated nginx-common dependency, fixes lintian warning
+    maybe-not-arch-all-binnmuable
 
   [ Jérémy Lal ]
   * d/rules: default error-log-path is stderr (--error-log-path=stderr)
diff --git a/debian/control b/debian/control
index 07bfa5c..ec51b4a 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,8 @@ Depends: libnginx-mod-http-geoip (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
-         nginx-common (= ${source:Version}),
+         nginx-common (<< ${source:Version}.1~),
+         nginx-common (>= ${source:Version}),
          iproute2,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -156,7 +157,8 @@ Description: nginx web/proxy server (standard version with 3rd parties)
 Package: nginx-light
 Architecture: any
 Depends: libnginx-mod-http-echo (>= 1:0.63-3~),
-         nginx-common (= ${source:Version}),
+         nginx-common (<< ${source:Version}.1~),
+         nginx-common (>= ${source:Version}),
          iproute2,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -202,7 +204,8 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
          libnginx-mod-stream-geoip2 (>= 1:3.4-2~),
-         nginx-common (= ${source:Version}),
+         nginx-common (<< ${source:Version}.1~),
+         nginx-common (>= ${source:Version}),
          iproute2,
          ${misc:Depends},
          ${shlibs:Depends}

From c412740e4e03a51e247975d6b09ce6a421902677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 20 Dec 2022 10:36:40 +0100
Subject: [PATCH 478/600] release nginx 1.22.1-5, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db15f2a..6ef0298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.22.1-5) UNRELEASED; urgency=medium
+nginx (1.22.1-5) unstable; urgency=medium
 
   [ Jan Mojžíš ]
   * Since version 1.22.1-5 all third party modules are removed from Debian NGINX
@@ -36,7 +36,7 @@ nginx (1.22.1-5) UNRELEASED; urgency=medium
   * d/rules: enabled stream_realip_module (--with-stream_realip_module)
   * d/rules: explicitly disabled pcre2 (--without-pcre2)
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 16:33:16 +0100
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 20 Dec 2022 10:36:19 +0100
 
 nginx (1.22.1-4) unstable; urgency=medium
 

From 7e238bfad98f1bdd1cfd05f169a0f52bb2e82809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 12 Jan 2023 16:23:24 +0000
Subject: [PATCH 479/600] add nginx-bin package and replace core/light/extras
 by a dependency package and fix dependencies for safe binNMU

---
 debian/changelog                              | 13 +++
 debian/control                                | 99 ++++++++++++-------
 debian/libnginx-mod-http-geoip.nginx          |  2 +-
 debian/libnginx-mod-http-image-filter.nginx   |  2 +-
 debian/libnginx-mod-http-perl.install         |  4 +-
 debian/libnginx-mod-http-perl.nginx           |  2 +-
 debian/libnginx-mod-http-xslt-filter.nginx    |  2 +-
 debian/libnginx-mod-mail.nginx                |  2 +-
 debian/libnginx-mod-stream-geoip.nginx        |  2 +-
 debian/libnginx-mod-stream.nginx              |  2 +-
 debian/{nginx-core.dirs => nginx-bin.dirs}    |  0
 debian/nginx-bin.install                      |  1 +
 debian/nginx-bin.manpages                     |  1 +
 debian/nginx-bin.postinst                     | 33 +++++++
 debian/{nginx-core.prerm => nginx-bin.prerm}  |  0
 ...nginx-core.triggers => nginx-bin.triggers} |  0
 debian/nginx-core.NEWS                        |  9 ++
 debian/nginx-core.install                     |  1 -
 debian/nginx-core.manpages                    |  1 -
 debian/nginx-core.postinst                    | 36 +++----
 debian/nginx-extras.NEWS                      | 11 ++-
 debian/nginx-extras.install                   |  1 -
 debian/nginx-extras.manpages                  |  1 -
 debian/nginx-extras.postinst                  | 34 +------
 debian/nginx-extras.prerm                     | 22 -----
 debian/nginx-extras.triggers                  |  1 -
 debian/nginx-full.NEWS                        |  9 ++
 debian/nginx-full.postinst                    |  1 +
 debian/nginx-light.NEWS                       |  9 ++
 debian/nginx-light.dirs                       |  1 -
 debian/nginx-light.install                    |  1 -
 debian/nginx-light.manpages                   |  1 -
 debian/nginx-light.postinst                   | 34 +------
 debian/nginx-light.prerm                      | 22 -----
 debian/nginx-light.triggers                   |  1 -
 debian/rules                                  | 39 ++------
 36 files changed, 180 insertions(+), 220 deletions(-)
 rename debian/{nginx-core.dirs => nginx-bin.dirs} (100%)
 create mode 100644 debian/nginx-bin.install
 create mode 100644 debian/nginx-bin.manpages
 create mode 100644 debian/nginx-bin.postinst
 rename debian/{nginx-core.prerm => nginx-bin.prerm} (100%)
 rename debian/{nginx-core.triggers => nginx-bin.triggers} (100%)
 create mode 100644 debian/nginx-core.NEWS
 delete mode 100644 debian/nginx-core.install
 delete mode 100644 debian/nginx-core.manpages
 delete mode 100644 debian/nginx-extras.install
 delete mode 100644 debian/nginx-extras.manpages
 mode change 100644 => 120000 debian/nginx-extras.postinst
 delete mode 100644 debian/nginx-extras.prerm
 delete mode 100644 debian/nginx-extras.triggers
 create mode 100644 debian/nginx-full.NEWS
 create mode 120000 debian/nginx-full.postinst
 create mode 100644 debian/nginx-light.NEWS
 delete mode 100644 debian/nginx-light.dirs
 delete mode 100644 debian/nginx-light.install
 delete mode 100644 debian/nginx-light.manpages
 mode change 100644 => 120000 debian/nginx-light.postinst
 delete mode 100644 debian/nginx-light.prerm
 delete mode 100644 debian/nginx-light.triggers

diff --git a/debian/changelog b/debian/changelog
index 6ef0298..e5a6a7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+nginx (1.22.1-6) UNRELEASED; urgency=medium
+
+  * d/{control,rules}: moved nginx binary to a new package nginx-bin.
+    The packages nginx-{light,core,extras} are replaced by a metapackage
+    and marked as deprecated. (Closes: 1025763)
+    Users should simply install 'nginx' and 'libnginx-mod-...'
+    instead of these packages.
+  * d/nginx-{light,core,extras,full}.{postinst,NEWS}: added warning that
+    nginx-{light,core,extras,full} are deprecated
+  * d/control: fixed dependencies for safe binNMU
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
+
 nginx (1.22.1-5) unstable; urgency=medium
 
   [ Jan Mojžíš ]
diff --git a/debian/control b/debian/control
index ec51b4a..1a56d8a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Rules-Requires-Root: no
 
 Package: nginx
 Architecture: all
-Depends: nginx-core (<< ${source:Version}.1~) | nginx-full (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
-         nginx-core (>= ${source:Version}) | nginx-full (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version}),
+Depends: nginx-bin (<< ${source:Version}.1~),
+         nginx-bin (>= ${source:Version}),
          ${misc:Depends}
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -33,6 +33,28 @@ Description: small, powerful, scalable web/proxy server
  This is a dependency package to install either nginx-core (by default),
  nginx-full, nginx-light or nginx-extras.
 
+Package: nginx-bin
+Architecture: any
+Depends: iproute2,
+         nginx-common (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Provides: httpd, httpd-cgi, nginx
+Suggests: nginx-doc (= ${source:Version})
+Description: nginx web/proxy server (standard version)
+ Nginx ("engine X") is a high-performance web and reverse proxy server
+ created by Igor Sysoev. It can be used both as a standalone web server
+ and as a proxy to reduce the load on back-end HTTP or mail servers.
+ .
+ This package contains nginx binary with the complete set of standard modules
+ included.
+ .
+ STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty
+ GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy,
+ Referer, Rewrite, SCGI, Split Clients, UWSGI.
+
 Package: nginx-doc
 Architecture: all
 Multi-Arch: foreign
@@ -62,8 +84,8 @@ Package: nginx-dev
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${S:Build-Depends},
-         nginx-core (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
-         nginx-core (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version})
+         nginx-bin (<< ${source:Version}.1~),
+         nginx-bin (>= ${source:Version}),
 Provides: dh-sequence-nginx
 Description: nginx web/proxy server - development headers
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -75,29 +97,35 @@ Description: nginx web/proxy server - development headers
  additions to the Debian nginx web/proxy server packages.
 
 Package: nginx-core
-Architecture: any
-Depends: libnginx-mod-http-geoip (= ${binary:Version}),
-         libnginx-mod-http-image-filter (= ${binary:Version}),
-         libnginx-mod-http-xslt-filter (= ${binary:Version}),
-         libnginx-mod-mail (= ${binary:Version}),
-         libnginx-mod-stream (= ${binary:Version}),
-         libnginx-mod-stream-geoip (= ${binary:Version}),
+Architecture: all
+Depends: libnginx-mod-http-geoip (>= ${source:Version}),
+         libnginx-mod-http-geoip (<< ${source:Version}.1~),
+         libnginx-mod-http-image-filter (>= ${source:Version}),
+         libnginx-mod-http-image-filter (<< ${source:Version}.1~),
+         libnginx-mod-http-xslt-filter (>= ${source:Version}),
+         libnginx-mod-http-xslt-filter (<< ${source:Version}.1~),
+         libnginx-mod-mail (>= ${source:Version}),
+         libnginx-mod-mail (<< ${source:Version}.1~),
+         libnginx-mod-stream (>= ${source:Version}),
+         libnginx-mod-stream (<< ${source:Version}.1~),
+         libnginx-mod-stream-geoip (>= ${source:Version}),
+         libnginx-mod-stream-geoip (<< ${source:Version}.1~),
          nginx-common (<< ${source:Version}.1~),
          nginx-common (>= ${source:Version}),
-         iproute2,
+         nginx-bin (>= ${source:Version}),
+         nginx-bin (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx-full (<< 1.18.0-1),
 Replaces: nginx-full (<< 1.18.0-1),
 Provides: httpd, httpd-cgi, nginx
-Conflicts: nginx-extras, nginx-light
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (standard version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This package provides a version of nginx identical to that of nginx-full,
+ This metapackage provides a version of nginx identical to that of nginx-full,
  but without any third-party modules, and only modules in the original
  nginx code base.
  .
@@ -123,8 +151,8 @@ Depends: libnginx-mod-http-auth-pam,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-upstream-fair,
          libnginx-mod-stream-geoip2,
-         nginx-core (>= ${source:Version}),
-         nginx-core (<< ${source:Version}.1~),
+         nginx-bin (>= ${source:Version}),
+         nginx-bin (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: httpd, httpd-cgi, nginx
@@ -155,22 +183,20 @@ Description: nginx web/proxy server (standard version with 3rd parties)
  Upstream Fair Queue.
 
 Package: nginx-light
-Architecture: any
+Architecture: all
 Depends: libnginx-mod-http-echo (>= 1:0.63-3~),
-         nginx-common (<< ${source:Version}.1~),
-         nginx-common (>= ${source:Version}),
-         iproute2,
+         nginx-bin (>= ${source:Version}),
+         nginx-bin (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: httpd, httpd-cgi, nginx
-Conflicts: nginx-extras, nginx-core
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (basic version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This package provides a very light version of nginx with only the
+ This metapackage provides a very light version of nginx with only the
  minimal set of features and modules.
  .
  STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Empty GIF,
@@ -189,35 +215,40 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~),
          libnginx-mod-http-dav-ext (>= 1:3.0.0-2~),
          libnginx-mod-http-echo (>= 1:0.63-3~),
          libnginx-mod-http-fancyindex (>= 1:0.5.2-2~),
-         libnginx-mod-http-geoip (= ${binary:Version}),
+         libnginx-mod-http-geoip (>= ${source:Version}),
+         libnginx-mod-http-geoip (<< ${source:Version}.1~),
          libnginx-mod-http-geoip2 (>= 1:3.4-2~),
          libnginx-mod-http-headers-more-filter (>= 1:0.34-2~),
-         libnginx-mod-http-image-filter (= ${binary:Version}),
+         libnginx-mod-http-image-filter (>= ${source:Version}),
+         libnginx-mod-http-image-filter (<< ${source:Version}.1~),
          libnginx-mod-http-lua (>=1:0.10.22-3~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
-         libnginx-mod-http-perl (= ${binary:Version}),
+         libnginx-mod-http-perl (>= ${source:Version}),
+         libnginx-mod-http-perl (<< ${source:Version}.1~),
          libnginx-mod-http-subs-filter (>= 1:0.6.4-2~),
          libnginx-mod-http-uploadprogress (>= 1:0.9.2-2~),
          libnginx-mod-http-upstream-fair (>= 1:0.0~git20120408.a18b409-2~),
-         libnginx-mod-http-xslt-filter (= ${binary:Version}),
-         libnginx-mod-mail (= ${binary:Version}),
+         libnginx-mod-http-xslt-filter (>= ${source:Version}),
+         libnginx-mod-http-xslt-filter (<< ${source:Version}.1~),
+         libnginx-mod-mail (>= ${source:Version}),
+         libnginx-mod-mail (<< ${source:Version}.1~),
          libnginx-mod-nchan (>= 1:1.3.5+dfsg-3~),
-         libnginx-mod-stream (= ${binary:Version}),
-         libnginx-mod-stream-geoip (= ${binary:Version}),
+         libnginx-mod-stream (>= ${source:Version}),
+         libnginx-mod-stream (<< ${source:Version}.1~),
+         libnginx-mod-stream-geoip (>= ${source:Version}),
+         libnginx-mod-stream-geoip (<< ${source:Version}.1~),
          libnginx-mod-stream-geoip2 (>= 1:3.4-2~),
-         nginx-common (<< ${source:Version}.1~),
-         nginx-common (>= ${source:Version}),
-         iproute2,
+         nginx-bin (>= ${source:Version}),
+         nginx-bin (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: httpd, httpd-cgi, nginx
-Conflicts: nginx-core, nginx-light
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (extended version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This package provides a version of nginx with the standard modules, plus
+ This metapackage provides a version of nginx with the standard modules, plus
  extra features and modules such as the Perl module, which allows the
  addition of Perl in configuration files.
  .
diff --git a/debian/libnginx-mod-http-geoip.nginx b/debian/libnginx-mod-http-geoip.nginx
index 78c206f..0ca730a 100755
--- a/debian/libnginx-mod-http-geoip.nginx
+++ b/debian/libnginx-mod-http-geoip.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-image-filter.nginx b/debian/libnginx-mod-http-image-filter.nginx
index 78c206f..0ca730a 100755
--- a/debian/libnginx-mod-http-image-filter.nginx
+++ b/debian/libnginx-mod-http-image-filter.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-perl.install b/debian/libnginx-mod-http-perl.install
index 14ca692..7382eca 100755
--- a/debian/libnginx-mod-http-perl.install
+++ b/debian/libnginx-mod-http-perl.install
@@ -3,5 +3,5 @@
 use Config;
 
 my $vendorarch = substr($Config{vendorarch}, 1);
-print "debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n";
-print "debian/build-extras/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n";
+print "debian/build-bin/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n";
+print "debian/build-bin/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n";
diff --git a/debian/libnginx-mod-http-perl.nginx b/debian/libnginx-mod-http-perl.nginx
index 78c206f..0ca730a 100755
--- a/debian/libnginx-mod-http-perl.nginx
+++ b/debian/libnginx-mod-http-perl.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-http-xslt-filter.nginx b/debian/libnginx-mod-http-xslt-filter.nginx
index 78c206f..0ca730a 100755
--- a/debian/libnginx-mod-http-xslt-filter.nginx
+++ b/debian/libnginx-mod-http-xslt-filter.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-mail.nginx b/debian/libnginx-mod-mail.nginx
index 78c206f..0ca730a 100755
--- a/debian/libnginx-mod-mail.nginx
+++ b/debian/libnginx-mod-mail.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/libnginx-mod-stream-geoip.nginx b/debian/libnginx-mod-stream-geoip.nginx
index 9acb103..438ee46 100755
--- a/debian/libnginx-mod-stream-geoip.nginx
+++ b/debian/libnginx-mod-stream-geoip.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf 70\n";
diff --git a/debian/libnginx-mod-stream.nginx b/debian/libnginx-mod-stream.nginx
index 78c206f..0ca730a 100755
--- a/debian/libnginx-mod-stream.nginx
+++ b/debian/libnginx-mod-stream.nginx
@@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;
 
-print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
diff --git a/debian/nginx-core.dirs b/debian/nginx-bin.dirs
similarity index 100%
rename from debian/nginx-core.dirs
rename to debian/nginx-bin.dirs
diff --git a/debian/nginx-bin.install b/debian/nginx-bin.install
new file mode 100644
index 0000000..f268f7f
--- /dev/null
+++ b/debian/nginx-bin.install
@@ -0,0 +1 @@
+debian/build-bin/objs/nginx usr/sbin
diff --git a/debian/nginx-bin.manpages b/debian/nginx-bin.manpages
new file mode 100644
index 0000000..b62c815
--- /dev/null
+++ b/debian/nginx-bin.manpages
@@ -0,0 +1 @@
+debian/build-bin/objs/nginx.8
diff --git a/debian/nginx-bin.postinst b/debian/nginx-bin.postinst
new file mode 100644
index 0000000..80be4de
--- /dev/null
+++ b/debian/nginx-bin.postinst
@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+  abort-upgrade|abort-remove|abort-deconfigure|configure)
+    ;;
+  triggered)
+    if invoke-rc.d --quiet nginx status >/dev/null; then
+      echo "Triggering nginx reload ..."
+      invoke-rc.d nginx reload || true
+    fi
+    exit 0
+    ;;
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
+esac
+
+if invoke-rc.d --quiet nginx status >/dev/null; then
+  invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
+  exit $?
+else
+  if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
+    invoke-rc.d nginx start || exit $?
+    echo "Not attempting to start NGINX, port 80 is already in use."
+    exit 0
+  fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/nginx-core.prerm b/debian/nginx-bin.prerm
similarity index 100%
rename from debian/nginx-core.prerm
rename to debian/nginx-bin.prerm
diff --git a/debian/nginx-core.triggers b/debian/nginx-bin.triggers
similarity index 100%
rename from debian/nginx-core.triggers
rename to debian/nginx-bin.triggers
diff --git a/debian/nginx-core.NEWS b/debian/nginx-core.NEWS
new file mode 100644
index 0000000..0c7f7de
--- /dev/null
+++ b/debian/nginx-core.NEWS
@@ -0,0 +1,9 @@
+nginx-core (1.22.1-6) unstable; urgency=medium
+
+  The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated.
+  Packages no longer distribute the nginx binary and are replaced 
+  by a metapackage to keep upgrades smooth.
+  Please simply install 'nginx' and 'libnginx-mod-...' modules You need
+  instead of these packages.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Jan 2023 20:23:22 +0100
diff --git a/debian/nginx-core.install b/debian/nginx-core.install
deleted file mode 100644
index a82f702..0000000
--- a/debian/nginx-core.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/build-core/objs/nginx usr/sbin
diff --git a/debian/nginx-core.manpages b/debian/nginx-core.manpages
deleted file mode 100644
index 3b6d0bd..0000000
--- a/debian/nginx-core.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/build-core/objs/nginx.8
diff --git a/debian/nginx-core.postinst b/debian/nginx-core.postinst
index 80be4de..08c8fb5 100644
--- a/debian/nginx-core.postinst
+++ b/debian/nginx-core.postinst
@@ -1,32 +1,18 @@
 #!/bin/sh
 set -e
 
-case "$1" in
-  abort-upgrade|abort-remove|abort-deconfigure|configure)
-    ;;
-  triggered)
-    if invoke-rc.d --quiet nginx status >/dev/null; then
-      echo "Triggering nginx reload ..."
-      invoke-rc.d nginx reload || true
-    fi
-    exit 0
-    ;;
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
+(
+  exec >&2
+  echo
+  echo "!!! ${DPKG_MAINTSCRIPT_PACKAGE} warning !!!"
 
-if invoke-rc.d --quiet nginx status >/dev/null; then
-  invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
-  exit $?
-else
-  if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
-    invoke-rc.d nginx start || exit $?
-    echo "Not attempting to start NGINX, port 80 is already in use."
-    exit 0
-  fi
-fi
+  echo "The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated."
+  echo "Packages no longer distribute the nginx binary and are replaced"
+  echo "by a metapackage to keep upgrades smooth."
+  echo "Please simply install 'nginx' and 'libnginx-mod-...' modules You need"
+  echo "instead of these packages."
+
+)
 
 #DEBHELPER#
 
diff --git a/debian/nginx-extras.NEWS b/debian/nginx-extras.NEWS
index d4fff37..d5919af 100644
--- a/debian/nginx-extras.NEWS
+++ b/debian/nginx-extras.NEWS
@@ -1,6 +1,9 @@
-nginx-extras (1.10.1-2) unstable; urgency=medium
+nginx-extras (1.22.1-6) unstable; urgency=medium
 
-  Starting with this release the HTTP Push module has been replaced by Nchan.
-  More info for the upgrade can be found at https://nchan.slact.net/upgrade.
+  The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated.
+  Packages no longer distribute the nginx binary and are replaced 
+  by a metapackage to keep upgrades smooth.
+  Please simply install 'nginx' and 'libnginx-mod-...' modules You need
+  instead of these packages.
 
- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Wed, 31 Aug 2016 15:07:20 +0300
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Jan 2023 20:23:22 +0100
diff --git a/debian/nginx-extras.install b/debian/nginx-extras.install
deleted file mode 100644
index 833c24b..0000000
--- a/debian/nginx-extras.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/build-extras/objs/nginx usr/sbin
diff --git a/debian/nginx-extras.manpages b/debian/nginx-extras.manpages
deleted file mode 100644
index 6dd6a30..0000000
--- a/debian/nginx-extras.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/build-extras/objs/nginx.8
diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst
deleted file mode 100644
index 80be4de..0000000
--- a/debian/nginx-extras.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-  abort-upgrade|abort-remove|abort-deconfigure|configure)
-    ;;
-  triggered)
-    if invoke-rc.d --quiet nginx status >/dev/null; then
-      echo "Triggering nginx reload ..."
-      invoke-rc.d nginx reload || true
-    fi
-    exit 0
-    ;;
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-if invoke-rc.d --quiet nginx status >/dev/null; then
-  invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
-  exit $?
-else
-  if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
-    invoke-rc.d nginx start || exit $?
-    echo "Not attempting to start NGINX, port 80 is already in use."
-    exit 0
-  fi
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst
new file mode 120000
index 0000000..a5bb65c
--- /dev/null
+++ b/debian/nginx-extras.postinst
@@ -0,0 +1 @@
+nginx-core.postinst
\ No newline at end of file
diff --git a/debian/nginx-extras.prerm b/debian/nginx-extras.prerm
deleted file mode 100644
index a2e3838..0000000
--- a/debian/nginx-extras.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-  remove|remove-in-favour|deconfigure|deconfigure-in-favour)
-    if [ -x /etc/init.d/nginx ]; then
-      invoke-rc.d nginx stop || exit $?
-    fi
-    ;;
-
-  upgrade|failed-upgrade)
-    ;;
-
-  *)
-    echo "prerm called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/nginx-extras.triggers b/debian/nginx-extras.triggers
deleted file mode 100644
index efb0515..0000000
--- a/debian/nginx-extras.triggers
+++ /dev/null
@@ -1 +0,0 @@
-interest-noawait nginx-reload
diff --git a/debian/nginx-full.NEWS b/debian/nginx-full.NEWS
new file mode 100644
index 0000000..10e4bff
--- /dev/null
+++ b/debian/nginx-full.NEWS
@@ -0,0 +1,9 @@
+nginx-full (1.22.1-6) unstable; urgency=medium
+
+  The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated.
+  Packages no longer distribute the nginx binary and are replaced 
+  by a metapackage to keep upgrades smooth.
+  Please simply install 'nginx' and 'libnginx-mod-...' modules You need
+  instead of these packages.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Jan 2023 20:23:22 +0100
diff --git a/debian/nginx-full.postinst b/debian/nginx-full.postinst
new file mode 120000
index 0000000..a5bb65c
--- /dev/null
+++ b/debian/nginx-full.postinst
@@ -0,0 +1 @@
+nginx-core.postinst
\ No newline at end of file
diff --git a/debian/nginx-light.NEWS b/debian/nginx-light.NEWS
new file mode 100644
index 0000000..e5c1da8
--- /dev/null
+++ b/debian/nginx-light.NEWS
@@ -0,0 +1,9 @@
+nginx-light (1.22.1-6) unstable; urgency=medium
+
+  The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated.
+  Packages no longer distribute the nginx binary and are replaced 
+  by a metapackage to keep upgrades smooth.
+  Please simply install 'nginx' and 'libnginx-mod-...' modules You need
+  instead of these packages.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Jan 2023 20:23:22 +0100
diff --git a/debian/nginx-light.dirs b/debian/nginx-light.dirs
deleted file mode 100644
index 236670a..0000000
--- a/debian/nginx-light.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/sbin
diff --git a/debian/nginx-light.install b/debian/nginx-light.install
deleted file mode 100644
index 8c2d90f..0000000
--- a/debian/nginx-light.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/build-light/objs/nginx usr/sbin
diff --git a/debian/nginx-light.manpages b/debian/nginx-light.manpages
deleted file mode 100644
index 06143d4..0000000
--- a/debian/nginx-light.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/build-light/objs/nginx.8
diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst
deleted file mode 100644
index 80be4de..0000000
--- a/debian/nginx-light.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-  abort-upgrade|abort-remove|abort-deconfigure|configure)
-    ;;
-  triggered)
-    if invoke-rc.d --quiet nginx status >/dev/null; then
-      echo "Triggering nginx reload ..."
-      invoke-rc.d nginx reload || true
-    fi
-    exit 0
-    ;;
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-if invoke-rc.d --quiet nginx status >/dev/null; then
-  invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
-  exit $?
-else
-  if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
-    invoke-rc.d nginx start || exit $?
-    echo "Not attempting to start NGINX, port 80 is already in use."
-    exit 0
-  fi
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst
new file mode 120000
index 0000000..a5bb65c
--- /dev/null
+++ b/debian/nginx-light.postinst
@@ -0,0 +1 @@
+nginx-core.postinst
\ No newline at end of file
diff --git a/debian/nginx-light.prerm b/debian/nginx-light.prerm
deleted file mode 100644
index a2e3838..0000000
--- a/debian/nginx-light.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-  remove|remove-in-favour|deconfigure|deconfigure-in-favour)
-    if [ -x /etc/init.d/nginx ]; then
-      invoke-rc.d nginx stop || exit $?
-    fi
-    ;;
-
-  upgrade|failed-upgrade)
-    ;;
-
-  *)
-    echo "prerm called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/nginx-light.triggers b/debian/nginx-light.triggers
deleted file mode 100644
index efb0515..0000000
--- a/debian/nginx-light.triggers
+++ /dev/null
@@ -1 +0,0 @@
-interest-noawait nginx-reload
diff --git a/debian/rules b/debian/rules
index c852729..5ecb8e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) -fPIC $(shell dpkg-buildflags --get CPPFLAGS)
 debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC
 
-FLAVOURS := core light extras
+FLAVOURS := bin
 DYN_MODS := \
 	http-geoip \
 	http-image-filter \
@@ -60,46 +60,27 @@ common_configure_flags := \
 			--with-ld-opt="$(debian_ldflags)" \
 			$(basic_configure_flags)
 
-light_configure_flags := \
-			$(common_configure_flags) \
-			--with-http_gzip_static_module \
-			--without-http_browser_module \
-			--without-http_geo_module \
-			--without-http_limit_req_module \
-			--without-http_limit_conn_module \
-			--without-http_memcached_module \
-			--without-http_referer_module \
-			--without-http_split_clients_module \
-			--without-http_userid_module
-
-core_configure_flags := \
-			$(common_configure_flags) \
-			--with-http_addition_module \
-			--with-http_gunzip_module \
-			--with-http_gzip_static_module \
-			--with-http_sub_module \
-
-extras_configure_flags := \
+bin_configure_flags := \
 			$(common_configure_flags) \
 			--with-http_addition_module \
 			--with-http_flv_module \
-			--with-http_geoip_module=dynamic \
 			--with-http_gunzip_module \
 			--with-http_gzip_static_module \
-			--with-http_image_filter_module=dynamic \
 			--with-http_mp4_module \
-			--with-http_perl_module=dynamic \
 			--with-http_random_index_module \
 			--with-http_secure_link_module \
 			--with-http_sub_module \
-			--with-http_xslt_module=dynamic \
-			--with-mail=dynamic \
 			--with-mail_ssl_module \
-			--with-stream=dynamic \
-			--with-stream_geoip_module=dynamic \
 			--with-stream_ssl_module \
 			--with-stream_ssl_preread_module \
-			--with-stream_realip_module
+			--with-stream_realip_module \
+			--with-http_geoip_module=dynamic \
+			--with-http_image_filter_module=dynamic \
+			--with-http_perl_module=dynamic \
+			--with-http_xslt_module=dynamic \
+			--with-mail=dynamic \
+			--with-stream=dynamic \
+			--with-stream_geoip_module=dynamic
 
 %:
 	dh $@ --without autoreconf

From 9cb0e1d9ee0adfd5ec69e352ace644764d3822d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 12 Jan 2023 17:36:18 +0100
Subject: [PATCH 480/600] d/copyright: update debian/* copyright

---
 debian/changelog |  1 +
 debian/copyright | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5a6a7a..8ea67a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
   * d/nginx-{light,core,extras,full}.{postinst,NEWS}: added warning that
     nginx-{light,core,extras,full} are deprecated
   * d/control: fixed dependencies for safe binNMU
+  * d/copyright: updated debian/* copyright
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 3ae2899..7234768 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -36,15 +36,16 @@ Copyright: 2005, Andrei Nigmatulin
 License: BSD-2-clause
 
 Files: debian/*
-Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
-           2008,      Jose Parrella <joseparrella@cantv.net>
-           2009-2014, Kartik Mistry <kartik@debian.org>
-           2010-2014, Michael Lustfield <michael@lustfield.net>
-           2011       Dmitry E. Oboukhov <unera@debian.org>
-           2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
-           2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
-           2019-2022, Thomas Ward <teward@ubuntu.com>
-           2020-2022, Ondřej Nový <onovy@debian.org>
+Copyright: 2022, 2023, Jan Mojžíš <jan.mojzis@gmail.com>
+  2020-2022, Ondřej Nový <onovy@debian.org>
+  2019-2022, Thomas Ward <teward@ubuntu.com>
+  2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
+  2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
+  2011, Dmitry E. Oboukhov <unera@debian.org>
+  2010-2014, Michael Lustfield <michael@lustfield.net>
+  2009-2014, Kartik Mistry <kartik@debian.org>
+  2008, Jose Parrella <joseparrella@cantv.net>
+  2007-2009, Fabio Tranchitella <kobold@debian.org>
 License: BSD-2-clause
 
 Files: debian/debhelper/*

From a71d85a87f09fefdc6df2a0e04c123793e88a281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 12 Jan 2023 17:42:09 +0100
Subject: [PATCH 481/600] d/copyright: add missing copyright for
 debian/apport/*

---
 debian/changelog | 1 +
 debian/copyright | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8ea67a1..80298d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
     nginx-{light,core,extras,full} are deprecated
   * d/control: fixed dependencies for safe binNMU
   * d/copyright: updated debian/* copyright
+  * d/copyright: added missing copyright for debian/apport/* 
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 7234768..867ce05 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -48,6 +48,10 @@ Copyright: 2022, 2023, Jan Mojžíš <jan.mojzis@gmail.com>
   2007-2009, Fabio Tranchitella <kobold@debian.org>
 License: BSD-2-clause
 
+Files: debian/apport/*
+Copyright: 2015, Thomas Ward <teward@ubuntu.com>
+License: BSD-2-clause
+
 Files: debian/debhelper/*
 Copyright: 2022 Miao Wang
 License: Expat

From 8fefc3d77b6144dd642ddba19baf377ead222681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 12 Jan 2023 17:46:39 +0100
Subject: [PATCH 482/600] d/copyright: add missing GPL-2+ copyright for
 debian/debhelper/dh_nginx

---
 debian/changelog |  1 +
 debian/copyright | 28 +++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 80298d0..131ebe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
   * d/control: fixed dependencies for safe binNMU
   * d/copyright: updated debian/* copyright
   * d/copyright: added missing copyright for debian/apport/* 
+  * d/copyright: added missing GPL-2+ copyright for debian/debhelper/dh_nginx
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 867ce05..81acf2a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -53,9 +53,17 @@ Copyright: 2015, Thomas Ward <teward@ubuntu.com>
 License: BSD-2-clause
 
 Files: debian/debhelper/*
-Copyright: 2022 Miao Wang
+Copyright: 2022, Miao Wang
 License: Expat
 
+Files: debian/debhelper/dh_nginx
+Copyright: 2016, Christos Trochalakis <ctrochalakis@debian.org>
+License: GPL-2+
+
+Files: debian/debhelper/nginx_mod.pm
+Copyright: © 2022, Miao Wang
+License: BSD-2-clause
+
 License: BSD-2-clause
  All rights reserved.
  .
@@ -99,3 +107,21 @@ License: Expat
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  IN THE SOFTWARE.
+
+License: GPL-2+
+ This program is licensed under the terms of the GNU General
+ Public License veserion 2+
+ .
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

From 94f4fc97bb4d388d6e5d900f19bc01708330e998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 12 Jan 2023 17:53:39 +0100
Subject: [PATCH 483/600] d/copyright: add missing copyright for
 debian/help/examples/nginx_modsite

---
 debian/changelog | 1 +
 debian/copyright | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 131ebe9..d414762 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
   * d/copyright: updated debian/* copyright
   * d/copyright: added missing copyright for debian/apport/* 
   * d/copyright: added missing GPL-2+ copyright for debian/debhelper/dh_nginx
+  * d/copyright: added missing copyright for debian/help/examples/nginx_modsite
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 81acf2a..9a9e6a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -64,6 +64,10 @@ Files: debian/debhelper/nginx_mod.pm
 Copyright: © 2022, Miao Wang
 License: BSD-2-clause
 
+Files: debian/help/examples/nginx_modsite
+Copyright: 2010, Michael Lustfield <mtecknology@ubuntu.com>
+License: BSD-2-clause
+
 License: BSD-2-clause
  All rights reserved.
  .

From 6bab81e56d5dfbcd9633a11135de7a1d68e8beb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 12 Jan 2023 18:05:11 +0100
Subject: [PATCH 484/600] d/changelog fix whitespace

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d414762..89ee17c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
     nginx-{light,core,extras,full} are deprecated
   * d/control: fixed dependencies for safe binNMU
   * d/copyright: updated debian/* copyright
-  * d/copyright: added missing copyright for debian/apport/* 
+  * d/copyright: added missing copyright for debian/apport/*
   * d/copyright: added missing GPL-2+ copyright for debian/debhelper/dh_nginx
   * d/copyright: added missing copyright for debian/help/examples/nginx_modsite
 

From 93739358832968a240786a00f295849c6f662954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 12 Jan 2023 18:17:16 +0100
Subject: [PATCH 485/600] d/control fix nginx-common dependency

---
 debian/control | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 1a56d8a..1163505 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,8 @@ Description: small, powerful, scalable web/proxy server
 Package: nginx-bin
 Architecture: any
 Depends: iproute2,
-         nginx-common (= ${source:Version}),
+         nginx-common (<< ${source:Version}.1~),
+         nginx-common (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
@@ -110,8 +111,6 @@ Depends: libnginx-mod-http-geoip (>= ${source:Version}),
          libnginx-mod-stream (<< ${source:Version}.1~),
          libnginx-mod-stream-geoip (>= ${source:Version}),
          libnginx-mod-stream-geoip (<< ${source:Version}.1~),
-         nginx-common (<< ${source:Version}.1~),
-         nginx-common (>= ${source:Version}),
          nginx-bin (>= ${source:Version}),
          nginx-bin (<< ${source:Version}.1~),
          ${misc:Depends},

From 1088db1699d898097dbadd7ed64aee53a4e78471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 12 Jan 2023 18:19:26 +0100
Subject: [PATCH 486/600] d/control: fix dependencies for safe binNMU

---
 debian/control | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 1163505..68793c8 100644
--- a/debian/control
+++ b/debian/control
@@ -214,30 +214,22 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~),
          libnginx-mod-http-dav-ext (>= 1:3.0.0-2~),
          libnginx-mod-http-echo (>= 1:0.63-3~),
          libnginx-mod-http-fancyindex (>= 1:0.5.2-2~),
-         libnginx-mod-http-geoip (>= ${source:Version}),
-         libnginx-mod-http-geoip (<< ${source:Version}.1~),
+         libnginx-mod-http-geoip (= ${binary:Version}),
          libnginx-mod-http-geoip2 (>= 1:3.4-2~),
          libnginx-mod-http-headers-more-filter (>= 1:0.34-2~),
-         libnginx-mod-http-image-filter (>= ${source:Version}),
-         libnginx-mod-http-image-filter (<< ${source:Version}.1~),
+         libnginx-mod-http-image-filter (= ${binary:Version}),
          libnginx-mod-http-lua (>=1:0.10.22-3~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
-         libnginx-mod-http-perl (>= ${source:Version}),
-         libnginx-mod-http-perl (<< ${source:Version}.1~),
+         libnginx-mod-http-perl (= ${binary:Version}),
          libnginx-mod-http-subs-filter (>= 1:0.6.4-2~),
          libnginx-mod-http-uploadprogress (>= 1:0.9.2-2~),
          libnginx-mod-http-upstream-fair (>= 1:0.0~git20120408.a18b409-2~),
-         libnginx-mod-http-xslt-filter (>= ${source:Version}),
-         libnginx-mod-http-xslt-filter (<< ${source:Version}.1~),
-         libnginx-mod-mail (>= ${source:Version}),
-         libnginx-mod-mail (<< ${source:Version}.1~),
+         libnginx-mod-http-xslt-filter (= ${binary:Version}),
+         libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-nchan (>= 1:1.3.5+dfsg-3~),
-         libnginx-mod-stream (>= ${source:Version}),
-         libnginx-mod-stream (<< ${source:Version}.1~),
-         libnginx-mod-stream-geoip (>= ${source:Version}),
-         libnginx-mod-stream-geoip (<< ${source:Version}.1~),
+         libnginx-mod-stream (= ${binary:Version}),
+         libnginx-mod-stream-geoip (= ${binary:Version}),
          libnginx-mod-stream-geoip2 (>= 1:3.4-2~),
-         nginx-bin (>= ${source:Version}),
-         nginx-bin (<< ${source:Version}.1~),
+         nginx-bin (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: httpd, httpd-cgi, nginx

From d720b646a52523ddcb276c3802dcd359dbe1552f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 12 Jan 2023 18:50:32 +0100
Subject: [PATCH 487/600] d/copyright fix GPL2

---
 debian/copyright | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9a9e6a8..51702bc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -113,19 +113,13 @@ License: Expat
  IN THE SOFTWARE.
 
 License: GPL-2+
- This program is licensed under the terms of the GNU General
- Public License veserion 2+
+ This is free software, licensed under:
  .
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
+   The GNU General Public License, Version 2, June 1991
  .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991, or (at
+ your option) any later version.
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in '/usr/share/common-licenses/GPL-2'.

From 980bcea7f631d9eb27ccfbafb7dfc9cbfc3eafcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 13 Jan 2023 17:30:14 +0100
Subject: [PATCH 488/600] d/po/it.po: add

---
 debian/changelog |  1 +
 debian/po/it.po  | 56 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 debian/po/it.po

diff --git a/debian/changelog b/debian/changelog
index 89ee17c..6a976e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
   * d/copyright: added missing copyright for debian/apport/*
   * d/copyright: added missing GPL-2+ copyright for debian/debhelper/dh_nginx
   * d/copyright: added missing copyright for debian/help/examples/nginx_modsite
+  * d/po/it.po: added Italian debconf translation. (Closes: 1019160)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
 
diff --git a/debian/po/it.po b/debian/po/it.po
new file mode 100644
index 0000000..245dc1b
--- /dev/null
+++ b/debian/po/it.po
@@ -0,0 +1,56 @@
+# Nginx debconf translations
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2022-08-25 00:00+0000\n"
+"Last-Translator: Ceppo <ceppo@oziosi.org>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Documenti di log di nginx potenzialmente non sicuri"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"I seguenti documenti di log nel percorso /var/log/nginx sono collegamenti "
+"simbolici (symlink) posseduti da www-data:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Da nginx 1.4.4-4 /var/log/nginx era posseduto da www-data. Di conseguenza "
+"www-data poteva creare collegamenti simbolici (symlink) a documenti di log "
+"in percorsi sensibili, il che a sua volta poteva portare ad attacchi di "
+"usurpazione di privilegi. Sebbene i permessi di /var/log/nginx siano adesso "
+"corretti è possibile che questi link non sicuri esistano già. Quindi, "
+"controllare i percorsi indicati sopra."

From b0a64680b596e5280e2c9fb1b349a716a9b12ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 21 Jan 2023 16:30:49 +0100
Subject: [PATCH 489/600] d/control: remove dependency on obsolete package
 lsb-base

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6a976e8..af8c376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
   * d/copyright: added missing GPL-2+ copyright for debian/debhelper/dh_nginx
   * d/copyright: added missing copyright for debian/help/examples/nginx_modsite
   * d/po/it.po: added Italian debconf translation. (Closes: 1019160)
+  * d/control: removed dependency on obsolete package lsb-base
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
 
diff --git a/debian/control b/debian/control
index 68793c8..18b1765 100644
--- a/debian/control
+++ b/debian/control
@@ -71,7 +71,7 @@ Description: small, powerful, scalable web/proxy server - documentation
 Package: nginx-common
 Architecture: all
 Multi-Arch: foreign
-Depends: lsb-base, ${misc:Depends}
+Depends: ${misc:Depends}
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server

From 7ceb830e66c96ea65205c4fe2b54ab02651d67cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 22 Jan 2023 13:09:10 +0100
Subject: [PATCH 490/600] B-D: remove quilt, no longer needed

---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 18b1765..d4d9ac9 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper-compat (= 13),
                libssl-dev,
                libxslt1-dev,
                po-debconf,
-               quilt,
                zlib1g-dev
 Standards-Version: 4.6.1
 Homepage: https://nginx.org

From f7740951fbc9cbbeed40b5d242c35be906bddbe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 22 Jan 2023 13:16:21 +0100
Subject: [PATCH 491/600] Remove very old README.Debian

---
 debian/nginx-common.README.Debian | 45 -------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 debian/nginx-common.README.Debian

diff --git a/debian/nginx-common.README.Debian b/debian/nginx-common.README.Debian
deleted file mode 100644
index 41a7006..0000000
--- a/debian/nginx-common.README.Debian
+++ /dev/null
@@ -1,45 +0,0 @@
-Noteworthy Changes Wheezy => Jessie
-===================================
-
-* Disabled SSLv3 by default
-
-  After POODLE we followed suit and disabled SSLv3 by default.
-
-* /var/log/nginx permissions
-
-  /var/log/nginx/ is now not readable by default (www-data:adm 750),
-  If you depend on that you can add a manual override with dpkg-statoverride.
-
-* New upgrade & rotate initscript commands
-
-  You can now upgrade the nginx binary on the fly with /etc/init.d/nginx upgrade
-  (Read more on http://nginx.org/en/docs/control.html#upgrade)
-
-* Synced configuration files are with upstream
-
-  Unfortunately that might break existing configuration for some users, especially
-  fastcgi scripts. /usr/share/doc/nginx-common/NEWS.Debian.gz contains some
-  more information about the changes made.
-
-* Changed document root to /var/www/html
-
-  The default document root has now changed to /var/www/html/.
-
-* Added a snippets directory
-
-  A /etc/nginx/snippets has been added, it contains common configuration
-  stangas. For now we ship a snakeoil.conf (self-signed ssl) and a simple
-  fastcgi-php.conf.
-
-* Switched to graceful stop
-
-  Both systemd and the initscript's stop function try to graceful stop
-  nginx (SIGQUIT) before stopping it fast (SIGTERM). That allows nginx to
-  serve connected clients before shutting down.
-
-* Dropped nginx-naxsi
-
-  Packaging naxsi was not trivial and, unfortunately, none of the
-  maintainers uses it. That's the reason nginx-naxsi was not in a good
-  shape and we are not feeling comfortable to release and support it.
-

From 820fb1eaabf258509568bffd34d1111df8ca8fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 23 Jan 2023 08:13:48 +0100
Subject: [PATCH 492/600] revert warnings
 d/nginx-{light,core,extras,full}.postinst

---
 debian/changelog             |  2 +-
 debian/nginx-core.postinst   | 19 -------------------
 debian/nginx-extras.postinst |  1 -
 debian/nginx-full.postinst   |  1 -
 debian/nginx-light.postinst  |  1 -
 5 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 debian/nginx-core.postinst
 delete mode 120000 debian/nginx-extras.postinst
 delete mode 120000 debian/nginx-full.postinst
 delete mode 120000 debian/nginx-light.postinst

diff --git a/debian/changelog b/debian/changelog
index af8c376..ebe0947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
     and marked as deprecated. (Closes: 1025763)
     Users should simply install 'nginx' and 'libnginx-mod-...'
     instead of these packages.
-  * d/nginx-{light,core,extras,full}.{postinst,NEWS}: added warning that
+  * d/nginx-{light,core,extras,full}.NEWS: added warning that
     nginx-{light,core,extras,full} are deprecated
   * d/control: fixed dependencies for safe binNMU
   * d/copyright: updated debian/* copyright
diff --git a/debian/nginx-core.postinst b/debian/nginx-core.postinst
deleted file mode 100644
index 08c8fb5..0000000
--- a/debian/nginx-core.postinst
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-(
-  exec >&2
-  echo
-  echo "!!! ${DPKG_MAINTSCRIPT_PACKAGE} warning !!!"
-
-  echo "The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated."
-  echo "Packages no longer distribute the nginx binary and are replaced"
-  echo "by a metapackage to keep upgrades smooth."
-  echo "Please simply install 'nginx' and 'libnginx-mod-...' modules You need"
-  echo "instead of these packages."
-
-)
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst
deleted file mode 120000
index a5bb65c..0000000
--- a/debian/nginx-extras.postinst
+++ /dev/null
@@ -1 +0,0 @@
-nginx-core.postinst
\ No newline at end of file
diff --git a/debian/nginx-full.postinst b/debian/nginx-full.postinst
deleted file mode 120000
index a5bb65c..0000000
--- a/debian/nginx-full.postinst
+++ /dev/null
@@ -1 +0,0 @@
-nginx-core.postinst
\ No newline at end of file
diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst
deleted file mode 120000
index a5bb65c..0000000
--- a/debian/nginx-light.postinst
+++ /dev/null
@@ -1 +0,0 @@
-nginx-core.postinst
\ No newline at end of file

From 5f65c2c1828f7b0742b54aa3b1e066cf74676dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 4 Feb 2023 09:25:35 +0100
Subject: [PATCH 493/600] move binaries to nginx package instead nginx-bin

---
 debian/changelog                              |  2 +-
 debian/control                                | 61 ++++++-------------
 debian/{nginx-bin.dirs => nginx.dirs}         |  0
 debian/{nginx-bin.install => nginx.install}   |  0
 debian/{nginx-bin.manpages => nginx.manpages} |  0
 debian/{nginx-bin.postinst => nginx.postinst} |  0
 debian/{nginx-bin.prerm => nginx.prerm}       |  0
 debian/{nginx-bin.triggers => nginx.triggers} |  0
 debian/rules                                  |  3 +-
 9 files changed, 21 insertions(+), 45 deletions(-)
 rename debian/{nginx-bin.dirs => nginx.dirs} (100%)
 rename debian/{nginx-bin.install => nginx.install} (100%)
 rename debian/{nginx-bin.manpages => nginx.manpages} (100%)
 rename debian/{nginx-bin.postinst => nginx.postinst} (100%)
 rename debian/{nginx-bin.prerm => nginx.prerm} (100%)
 rename debian/{nginx-bin.triggers => nginx.triggers} (100%)

diff --git a/debian/changelog b/debian/changelog
index ebe0947..75544f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 nginx (1.22.1-6) UNRELEASED; urgency=medium
 
-  * d/{control,rules}: moved nginx binary to a new package nginx-bin.
+  * d/{control,rules}: moved nginx binary to package nginx.
     The packages nginx-{light,core,extras} are replaced by a metapackage
     and marked as deprecated. (Closes: 1025763)
     Users should simply install 'nginx' and 'libnginx-mod-...'
diff --git a/debian/control b/debian/control
index d4d9ac9..706a9e2 100644
--- a/debian/control
+++ b/debian/control
@@ -20,40 +20,19 @@ Vcs-Browser: https://salsa.debian.org/nginx-team/nginx
 Rules-Requires-Root: no
 
 Package: nginx
-Architecture: all
-Depends: nginx-bin (<< ${source:Version}.1~),
-         nginx-bin (>= ${source:Version}),
-         ${misc:Depends}
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         iproute2,
+         nginx-common (<< ${source:Version}.1~),
+         nginx-common (>= ${source:Version}),
+Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Provides: httpd, httpd-cgi, nginx
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
- .
- This is a dependency package to install either nginx-core (by default),
- nginx-full, nginx-light or nginx-extras.
-
-Package: nginx-bin
-Architecture: any
-Depends: iproute2,
-         nginx-common (<< ${source:Version}.1~),
-         nginx-common (>= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
-Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
-Provides: httpd, httpd-cgi, nginx
-Suggests: nginx-doc (= ${source:Version})
-Description: nginx web/proxy server (standard version)
- Nginx ("engine X") is a high-performance web and reverse proxy server
- created by Igor Sysoev. It can be used both as a standalone web server
- and as a proxy to reduce the load on back-end HTTP or mail servers.
- .
- This package contains nginx binary with the complete set of standard modules
- included.
- .
- STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty
- GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy,
- Referer, Rewrite, SCGI, Split Clients, UWSGI.
 
 Package: nginx-doc
 Architecture: all
@@ -84,8 +63,8 @@ Package: nginx-dev
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${S:Build-Depends},
-         nginx-bin (<< ${source:Version}.1~),
-         nginx-bin (>= ${source:Version}),
+         nginx (<< ${source:Version}.1~),
+         nginx (>= ${source:Version}),
 Provides: dh-sequence-nginx
 Description: nginx web/proxy server - development headers
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -110,13 +89,12 @@ Depends: libnginx-mod-http-geoip (>= ${source:Version}),
          libnginx-mod-stream (<< ${source:Version}.1~),
          libnginx-mod-stream-geoip (>= ${source:Version}),
          libnginx-mod-stream-geoip (<< ${source:Version}.1~),
-         nginx-bin (>= ${source:Version}),
-         nginx-bin (<< ${source:Version}.1~),
+         nginx (>= ${source:Version}),
+         nginx (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: nginx-full (<< 1.18.0-1),
 Replaces: nginx-full (<< 1.18.0-1),
-Provides: httpd, httpd-cgi, nginx
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (standard version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -149,11 +127,10 @@ Depends: libnginx-mod-http-auth-pam,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-upstream-fair,
          libnginx-mod-stream-geoip2,
-         nginx-bin (>= ${source:Version}),
-         nginx-bin (<< ${source:Version}.1~),
+         nginx (>= ${source:Version}),
+         nginx (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: httpd, httpd-cgi, nginx
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (standard version with 3rd parties)
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -183,11 +160,10 @@ Description: nginx web/proxy server (standard version with 3rd parties)
 Package: nginx-light
 Architecture: all
 Depends: libnginx-mod-http-echo (>= 1:0.63-3~),
-         nginx-bin (>= ${source:Version}),
-         nginx-bin (<< ${source:Version}.1~),
+         nginx (>= ${source:Version}),
+         nginx (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: httpd, httpd-cgi, nginx
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (basic version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -228,10 +204,9 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
          libnginx-mod-stream-geoip2 (>= 1:3.4-2~),
-         nginx-bin (= ${binary:Version}),
+         nginx (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: httpd, httpd-cgi, nginx
 Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (extended version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
diff --git a/debian/nginx-bin.dirs b/debian/nginx.dirs
similarity index 100%
rename from debian/nginx-bin.dirs
rename to debian/nginx.dirs
diff --git a/debian/nginx-bin.install b/debian/nginx.install
similarity index 100%
rename from debian/nginx-bin.install
rename to debian/nginx.install
diff --git a/debian/nginx-bin.manpages b/debian/nginx.manpages
similarity index 100%
rename from debian/nginx-bin.manpages
rename to debian/nginx.manpages
diff --git a/debian/nginx-bin.postinst b/debian/nginx.postinst
similarity index 100%
rename from debian/nginx-bin.postinst
rename to debian/nginx.postinst
diff --git a/debian/nginx-bin.prerm b/debian/nginx.prerm
similarity index 100%
rename from debian/nginx-bin.prerm
rename to debian/nginx.prerm
diff --git a/debian/nginx-bin.triggers b/debian/nginx.triggers
similarity index 100%
rename from debian/nginx-bin.triggers
rename to debian/nginx.triggers
diff --git a/debian/rules b/debian/rules
index 5ecb8e2..0375d47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,8 @@ build.src:
 	pod2man debian/debhelper/dh_nginx > $(BUILDDIR_src)/dh_nginx.1
 
 strip.arch.%:
-	dh_strip --package=nginx-$(*) -O--dbgsym-migration='nginx-$(*)-dbg (<< 1.10.1-3~)'
+	#dh_strip --package=nginx-$(*) -O--dbgsym-migration='nginx-$(*)-dbg (<< 1.10.1-3~)'
+	dh_strip --package=nginx -O--dbgsym-migration='nginx-dbg (<< 1.10.1-3~)'
 
 strip.mods.%:
 	dh_strip --package=libnginx-mod-$(*) -O--automatic-dbgsym

From 473f36a7d18b55f4cde49dcecdc4ac115fe5611d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 4 Feb 2023 22:27:05 +0100
Subject: [PATCH 494/600] move common files from nginx-common to nginx

---
 debian/changelog                              | 11 ++--
 debian/control                                | 15 ++---
 debian/nginx-common.NEWS                      | 10 ++++
 debian/nginx-common.dirs                      | 12 ----
 debian/nginx-common.install                   |  6 --
 debian/nginx-common.postinst                  | 59 -------------------
 debian/{nginx-common.config => nginx.config}  |  0
 ...inx-common.nginx.default => nginx.default} |  0
 debian/nginx.dirs                             | 12 ++++
 .../{nginx-common.nginx.init => nginx.init}   |  0
 debian/nginx.install                          |  6 ++
 debian/{nginx-common.links => nginx.links}    |  0
 ...common.nginx.logrotate => nginx.logrotate} |  0
 debian/nginx.postinst                         | 47 ++++++++++++++-
 debian/{nginx-common.postrm => nginx.postrm}  |  0
 .../{nginx-common.preinst => nginx.preinst}   |  0
 ...inx-common.nginx.service => nginx.service} |  0
 ...nginx-common.templates => nginx.templates} |  0
 debian/po/POTFILES.in                         |  2 +-
 debian/po/ca.po                               |  8 +--
 debian/po/da.po                               |  8 +--
 debian/po/de.po                               |  8 +--
 debian/po/es.po                               |  8 +--
 debian/po/fr.po                               |  8 +--
 debian/po/it.po                               |  8 +--
 debian/po/nl.po                               |  8 +--
 debian/po/pt.po                               |  8 +--
 debian/po/pt_BR.po                            |  8 +--
 debian/po/ru.po                               |  8 +--
 debian/po/templates.pot                       |  8 +--
 debian/po/tr.po                               |  8 +--
 debian/rules                                  | 12 ++--
 32 files changed, 143 insertions(+), 145 deletions(-)
 delete mode 100644 debian/nginx-common.dirs
 delete mode 100644 debian/nginx-common.install
 delete mode 100644 debian/nginx-common.postinst
 rename debian/{nginx-common.config => nginx.config} (100%)
 rename debian/{nginx-common.nginx.default => nginx.default} (100%)
 rename debian/{nginx-common.nginx.init => nginx.init} (100%)
 rename debian/{nginx-common.links => nginx.links} (100%)
 rename debian/{nginx-common.nginx.logrotate => nginx.logrotate} (100%)
 rename debian/{nginx-common.postrm => nginx.postrm} (100%)
 rename debian/{nginx-common.preinst => nginx.preinst} (100%)
 rename debian/{nginx-common.nginx.service => nginx.service} (100%)
 rename debian/{nginx-common.templates => nginx.templates} (100%)

diff --git a/debian/changelog b/debian/changelog
index 75544f7..be28453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
 nginx (1.22.1-6) UNRELEASED; urgency=medium
 
-  * d/{control,rules}: moved nginx binary to package nginx.
-    The packages nginx-{light,core,extras} are replaced by a metapackage
-    and marked as deprecated. (Closes: 1025763)
+  * d/{control,rules}: nginx binary moved to package nginx, also moved basic
+    configuration files from nginx-common back to package nginx.
+    The packages nginx-{light,core,extras,common} are replaced
+    by a metapackage and marked as deprecated. (Closes: 1025763)
     Users should simply install 'nginx' and 'libnginx-mod-...'
     instead of these packages.
-  * d/nginx-{light,core,extras,full}.NEWS: added warning that
-    nginx-{light,core,extras,full} are deprecated
+  * d/nginx-{light,core,extras,full,common}.NEWS: added warning that
+    nginx-{light,core,extras,full,common} are deprecated
   * d/control: fixed dependencies for safe binNMU
   * d/copyright: updated debian/* copyright
   * d/copyright: added missing copyright for debian/apport/*
diff --git a/debian/control b/debian/control
index 706a9e2..1458297 100644
--- a/debian/control
+++ b/debian/control
@@ -24,10 +24,9 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          iproute2,
-         nginx-common (<< ${source:Version}.1~),
-         nginx-common (>= ${source:Version}),
-Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
-Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
+Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
+Suggests: fcgiwrap, nginx-doc, ssl-cert
 Provides: httpd, httpd-cgi, nginx
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -49,15 +48,17 @@ Description: small, powerful, scalable web/proxy server - documentation
 Package: nginx-common
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+         nginx (<< ${source:Version}.1~),
+         nginx (>= ${source:Version}),
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- This package contains base configuration files used by all versions of
- nginx.
+ From nginx version 1.22.1-6 changed to dependency metapackage,
+ can be safely removed.
 
 Package: nginx-dev
 Architecture: all
diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index d361983..9fef753 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,3 +1,13 @@
+nginx-common (1.22.1-6) unstable; urgency=medium
+
+  The packages nginx-common deprecated.
+  Package no longer distribute the configuration files and is replaced
+  by a metapackage to keep upgrades smooth.
+  Please simply install 'nginx' and 'libnginx-mod-...' modules You need
+  instead of these packages.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Jan 2023 20:23:22 +0100
+
 nginx-common (1.10.2-4) unstable; urgency=medium
 
   Since nginx 1.9.14 Debian has gradually switched to dynamic loadable modules
diff --git a/debian/nginx-common.dirs b/debian/nginx-common.dirs
deleted file mode 100644
index 8e5d7bf..0000000
--- a/debian/nginx-common.dirs
+++ /dev/null
@@ -1,12 +0,0 @@
-etc/nginx
-etc/nginx/conf.d
-etc/nginx/modules-available
-etc/nginx/modules-enabled
-etc/nginx/sites-available
-etc/nginx/sites-enabled
-etc/ufw/applications.d
-usr/share/nginx
-usr/share/vim/addons
-usr/share/vim/registry
-var/lib/nginx
-var/log/nginx
diff --git a/debian/nginx-common.install b/debian/nginx-common.install
deleted file mode 100644
index 20109fa..0000000
--- a/debian/nginx-common.install
+++ /dev/null
@@ -1,6 +0,0 @@
-contrib/vim/* usr/share/vim/addons
-debian/conf/* etc/nginx
-debian/apport/source_nginx.py usr/share/apport/package-hooks
-debian/ufw/nginx etc/ufw/applications.d
-debian/vim/nginx.yaml usr/share/vim/registry
-html/index.html usr/share/nginx/html/
diff --git a/debian/nginx-common.postinst b/debian/nginx-common.postinst
deleted file mode 100644
index 0d44608..0000000
--- a/debian/nginx-common.postinst
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-
-case "$1" in
-  configure)
-    logdir="/var/log/nginx"
-
-    # Allow local admin to override
-    if ! dpkg-statoverride --list "$logdir" >/dev/null; then
-      chown root:adm $logdir
-      chmod 0755 $logdir
-    fi
-
-    # Secure default logfiles on fresh installations
-    if [ -z "$2" ]; then
-      access_log="$logdir/access.log"
-      error_log="$logdir/error.log"
-
-      if [ ! -e "$access_log" ]; then
-        touch "$access_log"
-        chmod 640 "$access_log"
-        chown www-data:adm "$access_log"
-      fi
-
-      if [ ! -e "$error_log" ]; then
-        touch "$error_log"
-        chmod 640 "$error_log"
-        chown www-data:adm "$error_log"
-      fi
-    fi
-
-    # If a symlink doesn't exist and can be created, then create it.
-    if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
-       [ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
-      ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
-    fi
-
-    # Create a default index page when not already present.
-    if [ ! -e /var/www/html/index.nginx-debian.html ]; then
-      mkdir -p /var/www/html
-      cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
-    fi
-
-    ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/nginx-common.config b/debian/nginx.config
similarity index 100%
rename from debian/nginx-common.config
rename to debian/nginx.config
diff --git a/debian/nginx-common.nginx.default b/debian/nginx.default
similarity index 100%
rename from debian/nginx-common.nginx.default
rename to debian/nginx.default
diff --git a/debian/nginx.dirs b/debian/nginx.dirs
index 236670a..69bccbc 100644
--- a/debian/nginx.dirs
+++ b/debian/nginx.dirs
@@ -1 +1,13 @@
 usr/sbin
+etc/nginx
+etc/nginx/conf.d
+etc/nginx/modules-available
+etc/nginx/modules-enabled
+etc/nginx/sites-available
+etc/nginx/sites-enabled
+etc/ufw/applications.d
+usr/share/nginx
+usr/share/vim/addons
+usr/share/vim/registry
+var/lib/nginx
+var/log/nginx
diff --git a/debian/nginx-common.nginx.init b/debian/nginx.init
similarity index 100%
rename from debian/nginx-common.nginx.init
rename to debian/nginx.init
diff --git a/debian/nginx.install b/debian/nginx.install
index f268f7f..4a91b45 100644
--- a/debian/nginx.install
+++ b/debian/nginx.install
@@ -1 +1,7 @@
 debian/build-bin/objs/nginx usr/sbin
+contrib/vim/* usr/share/vim/addons
+debian/conf/* etc/nginx
+debian/apport/source_nginx.py usr/share/apport/package-hooks
+debian/ufw/nginx etc/ufw/applications.d
+debian/vim/nginx.yaml usr/share/vim/registry
+html/index.html usr/share/nginx/html/
diff --git a/debian/nginx-common.links b/debian/nginx.links
similarity index 100%
rename from debian/nginx-common.links
rename to debian/nginx.links
diff --git a/debian/nginx-common.nginx.logrotate b/debian/nginx.logrotate
similarity index 100%
rename from debian/nginx-common.nginx.logrotate
rename to debian/nginx.logrotate
diff --git a/debian/nginx.postinst b/debian/nginx.postinst
index 80be4de..a86ac95 100644
--- a/debian/nginx.postinst
+++ b/debian/nginx.postinst
@@ -1,9 +1,49 @@
 #!/bin/sh
 set -e
 
+. /usr/share/debconf/confmodule
+
 case "$1" in
-  abort-upgrade|abort-remove|abort-deconfigure|configure)
+  configure)
+    logdir="/var/log/nginx"
+
+    # Allow local admin to override
+    if ! dpkg-statoverride --list "$logdir" >/dev/null; then
+      chown root:adm $logdir
+      chmod 0755 $logdir
+    fi
+
+    # Secure default logfiles on fresh installations
+    if [ -z "$2" ]; then
+      access_log="$logdir/access.log"
+      error_log="$logdir/error.log"
+
+      if [ ! -e "$access_log" ]; then
+        touch "$access_log"
+        chmod 640 "$access_log"
+        chown www-data:adm "$access_log"
+      fi
+
+      if [ ! -e "$error_log" ]; then
+        touch "$error_log"
+        chmod 640 "$error_log"
+        chown www-data:adm "$error_log"
+      fi
+    fi
+
+    # If a symlink doesn't exist and can be created, then create it.
+    if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
+       [ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
+      ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
+    fi
+
+    # Create a default index page when not already present.
+    if [ ! -e /var/www/html/index.nginx-debian.html ]; then
+      mkdir -p /var/www/html
+      cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
+    fi
     ;;
+
   triggered)
     if invoke-rc.d --quiet nginx status >/dev/null; then
       echo "Triggering nginx reload ..."
@@ -11,6 +51,10 @@ case "$1" in
     fi
     exit 0
     ;;
+
+  abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
   *)
     echo "postinst called with unknown argument \`$1'" >&2
     exit 1
@@ -23,6 +67,7 @@ if invoke-rc.d --quiet nginx status >/dev/null; then
 else
   if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
     invoke-rc.d nginx start || exit $?
+  else
     echo "Not attempting to start NGINX, port 80 is already in use."
     exit 0
   fi
diff --git a/debian/nginx-common.postrm b/debian/nginx.postrm
similarity index 100%
rename from debian/nginx-common.postrm
rename to debian/nginx.postrm
diff --git a/debian/nginx-common.preinst b/debian/nginx.preinst
similarity index 100%
rename from debian/nginx-common.preinst
rename to debian/nginx.preinst
diff --git a/debian/nginx-common.nginx.service b/debian/nginx.service
similarity index 100%
rename from debian/nginx-common.nginx.service
rename to debian/nginx.service
diff --git a/debian/nginx-common.templates b/debian/nginx.templates
similarity index 100%
rename from debian/nginx-common.templates
rename to debian/nginx.templates
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index dcbe15b..dab87b2 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] nginx-common.templates
+[type: gettext/rfc822deb] nginx.templates
diff --git a/debian/po/ca.po b/debian/po/ca.po
index d9ce72d..35f306a 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "És possible que els fitxers de registre nginx siguin insegurs"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/da.po b/debian/po/da.po
index fcc5115..a486426 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Nginx-logfilerne er muligvis usikre"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/de.po b/debian/po/de.po
index d33bf66..7624322 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Möglicherweise unsichere Nginx-Protokolldateien"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/es.po b/debian/po/es.po
index 552ab2f..6124eb4 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -40,13 +40,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Posibles archivos de registro inseguros de nginx"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -56,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 0a937cf..f9bfedf 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Certains fichiers de journaux semblent non sécurisés"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/it.po b/debian/po/it.po
index 245dc1b..30dc669 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Documenti di log di nginx potenzialmente non sicuri"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 0fd1c5a..1cf7d0c 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Wellicht onveilige nginx logbestanden"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index c552ab3..6870a72 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Ficheiros de eventos (log) do nginx possivelmente inseguros"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 92d3a6a..fe71d61 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Possíveis arquivos de log do nginx inseguros"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -36,13 +36,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index fdaa738..23711ec 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Возможно небезопасные файлы журналов nginx"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 9260ff1..5090c43 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -33,13 +33,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 3e9d40b..dfe0b4d 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Güvenliği sağlanmamış nginx günlük dosyaları olabilir"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx-common.templates:1001
+#: ../nginx.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/rules b/debian/rules
index 0375d47..70ee6ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,13 +96,13 @@ override_dh_install:
 	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/autoscripts debian/debhelper/dh_nginx --in-nginx-tree
 
 override_dh_installinit:
-	dh_installinit --no-stop-on-upgrade --no-start --name=nginx
+	dh_installinit --package nginx --no-stop-on-upgrade --no-start --name=nginx
 
-override_dh_installsystemd:
-	dh_installsystemd --name=nginx
-
-override_dh_installlogrotate:
-	dh_installlogrotate --package nginx-common --name=nginx
+#override_dh_installsystemd:
+#	dh_installsystemd --package nginx --name=nginx
+#
+#override_dh_installlogrotate:
+#	dh_installlogrotate --package nginx --name=nginx
 
 build.arch.%:
 	$(MAKE) -C $(BUILDDIR_$*) build

From 0a2666b12c21ac45146747edd37e4576f2172dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 6 Feb 2023 18:19:43 +0100
Subject: [PATCH 495/600] fixes - d/control: remove unnecesary 'Suggests' -
 d/control: remove Provides: nginx for nginx package -
 debian/apport/source_nginx.py: nginx-common -> nginx

---
 debian/apport/source_nginx.py | 2 +-
 debian/control                | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/apport/source_nginx.py b/debian/apport/source_nginx.py
index aec6e8e..ae808bb 100644
--- a/debian/apport/source_nginx.py
+++ b/debian/apport/source_nginx.py
@@ -9,7 +9,7 @@ import os
 import subprocess
 
 def add_info(report, ui):
-    if (report['Package'].split()[0] != 'nginx-common'
+    if (report['Package'].split()[0] != 'nginx'
         and report['ProblemType'] == 'Package'
         and os.path.isdir('/run/systemd/system')):
         report['Journalctl_Nginx.txt'] = apport.hookutils.command_output(
diff --git a/debian/control b/debian/control
index 1458297..be641c7 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Depends: ${misc:Depends},
 Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
 Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
 Suggests: fcgiwrap, nginx-doc, ssl-cert
-Provides: httpd, httpd-cgi, nginx
+Provides: httpd, httpd-cgi
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
@@ -51,7 +51,6 @@ Multi-Arch: foreign
 Depends: ${misc:Depends},
          nginx (<< ${source:Version}.1~),
          nginx (>= ${source:Version}),
-Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
@@ -96,7 +95,6 @@ Depends: libnginx-mod-http-geoip (>= ${source:Version}),
          ${shlibs:Depends}
 Breaks: nginx-full (<< 1.18.0-1),
 Replaces: nginx-full (<< 1.18.0-1),
-Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (standard version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
@@ -132,7 +130,6 @@ Depends: libnginx-mod-http-auth-pam,
          nginx (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (standard version with 3rd parties)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
@@ -165,7 +162,6 @@ Depends: libnginx-mod-http-echo (>= 1:0.63-3~),
          nginx (<< ${source:Version}.1~),
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (basic version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
@@ -208,7 +204,6 @@ Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~),
          nginx (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (extended version)
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server

From 4ce2e9f8f54b40a39f66667012fa9976d6312719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 8 Feb 2023 11:20:09 +0100
Subject: [PATCH 496/600] d/changelog update

---
 debian/changelog | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be28453..e6023f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,22 @@
 nginx (1.22.1-6) UNRELEASED; urgency=medium
 
-  * d/{control,rules}: nginx binary moved to package nginx, also moved basic
+  * Main change:
+    Nginx binary moved to package nginx, also moved basic
     configuration files from nginx-common back to package nginx.
     The packages nginx-{light,core,extras,common} are replaced
-    by a metapackage and marked as deprecated. (Closes: 1025763)
+    by a metapackage. (Closes: 1025763)
     Users should simply install 'nginx' and 'libnginx-mod-...'
     instead of these packages.
-  * d/nginx-{light,core,extras,full,common}.NEWS: added warning that
-    nginx-{light,core,extras,full,common} are deprecated
-  * d/control: fixed dependencies for safe binNMU
-  * d/copyright: updated debian/* copyright
-  * d/copyright: added missing copyright for debian/apport/*
-  * d/copyright: added missing GPL-2+ copyright for debian/debhelper/dh_nginx
-  * d/copyright: added missing copyright for debian/help/examples/nginx_modsite
-  * d/po/it.po: added Italian debconf translation. (Closes: 1019160)
-  * d/control: removed dependency on obsolete package lsb-base
+  * Additional changes:
+    * d/nginx-{light,core,extras,full,common}.NEWS: added warning that
+      nginx-{light,core,extras,full,common} are deprecated
+    * d/control: fixed dependencies for safe binNMU
+    * d/copyright: updated debian/* copyright
+    * d/copyright: added missing copyright for d/apport/*
+    * d/copyright: added missing GPL-2+ copyright for d/debhelper/dh_nginx
+    * d/copyright: added missing copyright for d/help/examples/nginx_modsite
+    * d/po/it.po: added Italian debconf translation. (Closes: 1019160)
+    * d/control: removed dependency on obsolete package lsb-base
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
 

From 40664a0df5089ac2122aa21405bf597e2501820f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 8 Feb 2023 11:12:59 +0100
Subject: [PATCH 497/600] d/control: bump Standards-Version: 4.6.2, no changes

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e6023f4..99535f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
     * d/copyright: added missing copyright for d/help/examples/nginx_modsite
     * d/po/it.po: added Italian debconf translation. (Closes: 1019160)
     * d/control: removed dependency on obsolete package lsb-base
+    * d/control: bump Standards-Version: 4.6.2, no changes
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
 
diff --git a/debian/control b/debian/control
index be641c7..8e298d5 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 13),
                libxslt1-dev,
                po-debconf,
                zlib1g-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Homepage: https://nginx.org
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx

From cd33a3034dc9ed1ba3475424d1be6651c4f3ba4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 8 Feb 2023 17:23:54 +0100
Subject: [PATCH 498/600] release nginx 1.22.1-6, upload to unstable

---
 debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99535f2..405633e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-nginx (1.22.1-6) UNRELEASED; urgency=medium
+nginx (1.22.1-6) unstable; urgency=medium
 
   * Main change:
     Nginx binary moved to package nginx, also moved basic
-    configuration files from nginx-common back to package nginx.
+    configuration files from nginx-common to package nginx.
     The packages nginx-{light,core,extras,common} are replaced
     by a metapackage. (Closes: 1025763)
     Users should simply install 'nginx' and 'libnginx-mod-...'
@@ -19,7 +19,7 @@ nginx (1.22.1-6) UNRELEASED; urgency=medium
     * d/control: removed dependency on obsolete package lsb-base
     * d/control: bump Standards-Version: 4.6.2, no changes
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 05 Jan 2023 19:10:50 +0100
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 08 Feb 2023 17:20:27 +0100
 
 nginx (1.22.1-5) unstable; urgency=medium
 

From 309c257646a7bb8f772d890738742ca27166371f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 5 Feb 2023 13:12:48 +0100
Subject: [PATCH 499/600] nginx: provide nginx-abi-<VERSION>

---
 debian/changelog                 |  8 +++++
 debian/control                   | 32 +++++++++----------
 debian/debhelper/dh_nginx        | 55 +++++++++++++++++---------------
 debian/debhelper/nginx_mod.pm    |  4 +--
 debian/libnginx-mod.abisubstvars | 23 +++++++++++++
 debian/nginx-dev.install         |  1 +
 debian/rules                     |  3 ++
 7 files changed, 82 insertions(+), 44 deletions(-)
 create mode 100644 debian/libnginx-mod.abisubstvars

diff --git a/debian/changelog b/debian/changelog
index 405633e..f742c55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.22.1-7) UNRELEASED; urgency=medium
+
+  * nginx ABI release: nginx-abi-1.22.1-7
+  * nginx ABI: Nginx now provides nginx-abi-<VERSION> to better manage
+    dependencies between nginx and 3rd party modules. Credit to Jérémy Lal.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 10 Feb 2023 17:28:46 +0100
+
 nginx (1.22.1-6) unstable; urgency=medium
 
   * Main change:
diff --git a/debian/control b/debian/control
index 8e298d5..2f49044 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Depends: ${misc:Depends},
 Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
 Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
 Suggests: fcgiwrap, nginx-doc, ssl-cert
-Provides: httpd, httpd-cgi
+Provides: httpd, httpd-cgi, ${nginx:abi}
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
@@ -157,7 +157,7 @@ Description: nginx web/proxy server (standard version with 3rd parties)
 
 Package: nginx-light
 Architecture: all
-Depends: libnginx-mod-http-echo (>= 1:0.63-3~),
+Depends: libnginx-mod-http-echo (>= ${libnginx-mod-http-echo:Version}~),
          nginx (>= ${source:Version}),
          nginx (<< ${source:Version}.1~),
          ${misc:Depends},
@@ -181,27 +181,27 @@ Description: nginx web/proxy server (basic version)
 
 Package: nginx-extras
 Architecture: any
-Depends: libnginx-mod-http-auth-pam (>= 1:1.5.3-2~),
-         libnginx-mod-http-cache-purge (>= 1:2.3-3~),
-         libnginx-mod-http-dav-ext (>= 1:3.0.0-2~),
-         libnginx-mod-http-echo (>= 1:0.63-3~),
-         libnginx-mod-http-fancyindex (>= 1:0.5.2-2~),
+Depends: nginx (= ${binary:Version}),
          libnginx-mod-http-geoip (= ${binary:Version}),
-         libnginx-mod-http-geoip2 (>= 1:3.4-2~),
-         libnginx-mod-http-headers-more-filter (>= 1:0.34-2~),
          libnginx-mod-http-image-filter (= ${binary:Version}),
-         libnginx-mod-http-lua (>=1:0.10.22-3~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
          libnginx-mod-http-perl (= ${binary:Version}),
-         libnginx-mod-http-subs-filter (>= 1:0.6.4-2~),
-         libnginx-mod-http-uploadprogress (>= 1:0.9.2-2~),
-         libnginx-mod-http-upstream-fair (>= 1:0.0~git20120408.a18b409-2~),
          libnginx-mod-http-xslt-filter (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
-         libnginx-mod-nchan (>= 1:1.3.5+dfsg-3~),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
-         libnginx-mod-stream-geoip2 (>= 1:3.4-2~),
-         nginx (= ${binary:Version}),
+         libnginx-mod-http-auth-pam (>= ${libnginx-mod-http-auth-pam:Version}~),
+         libnginx-mod-http-cache-purge (>= ${libnginx-mod-http-cache-purge:Version}~),
+         libnginx-mod-http-dav-ext (>= ${libnginx-mod-http-dav-ext:Version}~),
+         libnginx-mod-http-echo (>= ${libnginx-mod-http-echo:Version}~),
+         libnginx-mod-http-fancyindex (>= ${libnginx-mod-http-fancyindex:Version}~),
+         libnginx-mod-http-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
+         libnginx-mod-http-headers-more-filter (>= ${libnginx-mod-http-headers-more-filter:Version}~),
+         libnginx-mod-http-lua (>=${libnginx-mod-http-lua:Version}~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
+         libnginx-mod-http-subs-filter (>= ${libnginx-mod-http-subs-filter:Version}~),
+         libnginx-mod-http-uploadprogress (>= ${libnginx-mod-http-uploadprogress:Version}~),
+         libnginx-mod-http-upstream-fair (>= ${libnginx-mod-http-upstream-fair:Version}~),
+         libnginx-mod-nchan (>= ${libnginx-mod-nchan:Version}~),
+         libnginx-mod-stream-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: nginx web/proxy server (extended version)
diff --git a/debian/debhelper/dh_nginx b/debian/debhelper/dh_nginx
index f2b9bb5..9100220 100755
--- a/debian/debhelper/dh_nginx
+++ b/debian/debhelper/dh_nginx
@@ -23,17 +23,28 @@
 use strict;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
-
+use Dpkg::Substvars;
 
 =head1 NAME
 
 dh_nginx - register configuration snippets to the nginx web server
 
 =cut
-
+my $nginx_in_tree;
+my $abi;
 sub nginx_depends
 {
-	return 'nginx-common (= ${source:Version})'
+	if (!$abi) {
+		my $sv = Dpkg::Substvars->new();
+		if ($nginx_in_tree) {
+			$sv->load("debian/libnginx-mod.abisubstvars");
+		}
+		else {
+			$sv->load("/usr/share/nginx/src/debian/libnginx-mod.abisubstvars");
+		}
+		$abi = $sv->get("nginx:abi");
+	}
+	return "$abi";
 }
 
 sub nginx_api_installdir
@@ -161,8 +172,6 @@ dh_nginx is heavily influnced by dh_apache2 written by Arno Toell
 ## main code starts here
 ##
 
-my $nginx_in_tree;
-
 init(options => {
 	"e|noenable" => \$dh{NOENABLE},
 	"in-nginx-tree" => \$nginx_in_tree,
@@ -268,30 +277,24 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 		}
 	}
 
-        my @postinst_autoscripts;
+	my @postinst_autoscripts;
 
-        if ($#{$PACKAGE_TYPE{'has_a_module'}} >= 0)
-        {
-                if ($package !~ m/libnginx-mod-\w+?/)
-                {
-                        warning("Package $package appears to be an Nginx module. It should comply to the package naming scheme libnginx-mod-<modulename>\n");
-                }
-                if ($nginx_in_tree){
-                            addsubstvar($package, "misc:Depends", nginx_depends());
-                } else {
-                            my $ngx_ver = `grep 'define NGINX_VERSION' /usr/share/nginx/src/src/core/nginx.h | sed -e 's/^.*"\\(.*\\)".*/\\1/'`;
-                            chomp($ngx_ver);
-                            addsubstvar($package, "misc:Depends", "nginx-common (>= $ngx_ver), nginx-common (<< $ngx_ver.1~)");
-                }
+	if ($#{$PACKAGE_TYPE{'has_a_module'}} >= 0)
+	{
+		if ($package !~ m/libnginx-mod-\w+?/)
+		{
+			warning("Package $package appears to be an Nginx module. It should comply to the package naming scheme libnginx-mod-<modulename>\n");
+		}
+		addsubstvar($package, "misc:Depends", nginx_depends());
 
-                my $modules = "";
-                foreach my $module (@{$PACKAGE_TYPE{'has_a_module'}})
-                {
-                        $modules .= "$module ";
-                }
+		my $modules = "";
+		foreach my $module (@{$PACKAGE_TYPE{'has_a_module'}})
+		{
+			$modules .= "$module ";
+		}
 
-                push @postinst_autoscripts, ["module", $modules];
-        }
+		push @postinst_autoscripts, ["module", $modules];
+	}
 
 	if (! $dh{NOSCRIPTS})
 	{
diff --git a/debian/debhelper/nginx_mod.pm b/debian/debhelper/nginx_mod.pm
index 4b19403..7df00d4 100644
--- a/debian/debhelper/nginx_mod.pm
+++ b/debian/debhelper/nginx_mod.pm
@@ -37,8 +37,8 @@ sub new {
 	my $this= $class->SUPER::new(@_);
 	$this->prefer_out_of_source_building(@_);
 	$this->{has_ndk} = $this->has_build_dep("libnginx-mod-http-ndk-dev");
-	if ($this->{has_ndk} == 1){
-		foreach my $cur (getpackages('arch')) {
+	foreach my $cur (getpackages('arch')) {
+		if ($this->{has_ndk} == 1) {
 			addsubstvar($cur, "misc:Depends", "libnginx-mod-http-ndk");
 		}
 	}
diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
new file mode 100644
index 0000000..4d6adf1
--- /dev/null
+++ b/debian/libnginx-mod.abisubstvars
@@ -0,0 +1,23 @@
+# update the ABI version when:
+# - nginx upstream has changed
+# - a patch might change the ABI
+# - a build-dependency has changed
+# note that debian revision can increase without breaking ABI
+#
+# TODO: use $(DEB_VERSION_UPSTREAM)
+nginx:abi=nginx-abi-1.22.1-7
+
+# ABI-compatible versions of third-party modules
+libnginx-mod-http-auth-pam:Version=1:1.5.3-3
+libnginx-mod-http-cache-purge:Version=1:2.3-4
+libnginx-mod-http-dav-ext:Version=1:3.0.0-3
+libnginx-mod-http-echo:Version=1:0.63-4
+libnginx-mod-http-fancyindex:Version=1:0.5.2-3
+libnginx-mod-http-geoip2:Version=1:3.4-3
+libnginx-mod-http-headers-more-filter:Version=1:0.34-3
+libnginx-mod-http-lua:Version=1:0.10.23~rc2-1
+libnginx-mod-http-subs-filter:Version=1:0.6.4-4
+libnginx-mod-http-uploadprogress:Version=1:0.9.2-3
+libnginx-mod-http-upstream-fair:Version=1:0.0~git20120408.a18b409-3
+libnginx-mod-nchan:Version=1:1.3.6+dfsg-2
+libnginx-mod-geoip2:Version=1:3.4-3
diff --git a/debian/nginx-dev.install b/debian/nginx-dev.install
index efc1578..d8ae406 100644
--- a/debian/nginx-dev.install
+++ b/debian/nginx-dev.install
@@ -2,6 +2,7 @@ debian/build-src/auto usr/share/nginx/src/
 debian/build-src/src usr/share/nginx/src/
 debian/build-src/conf_flags usr/share/nginx/src/
 debian/build-src/configure usr/share/nginx/src/
+debian/libnginx-mod.abisubstvars usr/share/nginx/src/debian/
 debian/debhelper/nginx.pm usr/share/perl5/Debian/Debhelper/Sequence/
 debian/debhelper/dh_nginx usr/bin/
 debian/debhelper/nginx_mod.pm usr/share/perl5/Debian/Debhelper/Buildsystem/
diff --git a/debian/rules b/debian/rules
index 70ee6ec..e090b06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,9 @@ override_dh_installinit:
 #override_dh_installlogrotate:
 #	dh_installlogrotate --package nginx --name=nginx
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Tdebian/substvars -Tdebian/libnginx-mod.abisubstvars
+
 build.arch.%:
 	$(MAKE) -C $(BUILDDIR_$*) build
 

From 3a3786f1d45d08dab90b20591b8313a0b48c6fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Fri, 6 Jan 2023 21:40:26 +0100
Subject: [PATCH 500/600] Switch to pcre2.

---
 debian/control | 2 +-
 debian/rules   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 2f49044..6981083 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13),
                libexpat-dev,
                libgd-dev,
                libgeoip-dev,
-               libpcre3-dev,
+               libpcre2-dev,
                libperl-dev,
                libssl-dev,
                libxslt1-dev,
diff --git a/debian/rules b/debian/rules
index e090b06..2932ef5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,6 @@ basic_configure_flags := \
 			--with-compat \
 			--with-debug \
 			--with-pcre-jit \
-			--without-pcre2 \
 			--with-http_ssl_module \
 			--with-http_stub_status_module \
 			--with-http_realip_module \

From c7f0bac49b64eb01926c2a0a7fe9da8265726de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 10 Feb 2023 17:33:09 +0100
Subject: [PATCH 501/600] d/changelog update

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index f742c55..cf08d21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nginx (1.22.1-7) UNRELEASED; urgency=medium
   * nginx ABI release: nginx-abi-1.22.1-7
   * nginx ABI: Nginx now provides nginx-abi-<VERSION> to better manage
     dependencies between nginx and 3rd party modules. Credit to Jérémy Lal.
+  * switched to libpcre2 (Closes: 1000013)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 10 Feb 2023 17:28:46 +0100
 

From ed087b074ee44ed51963b63c4953d53c421ceafa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 4 Feb 2023 03:46:50 +0100
Subject: [PATCH 502/600] d/p/bug-973861: add, lingering close for connections
 with pipelined requests

---
 debian/changelog                |  2 +
 debian/patches/bug-973861.patch | 66 +++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 69 insertions(+)
 create mode 100644 debian/patches/bug-973861.patch

diff --git a/debian/changelog b/debian/changelog
index cf08d21..f5ca4b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ nginx (1.22.1-7) UNRELEASED; urgency=medium
   * nginx ABI: Nginx now provides nginx-abi-<VERSION> to better manage
     dependencies between nginx and 3rd party modules. Credit to Jérémy Lal.
   * switched to libpcre2 (Closes: 1000013)
+  * d/p/bug-973861: added, lingering close for connections with pipelined
+    requests. The patch is backported from the upstream. (Closes: 973861)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 10 Feb 2023 17:28:46 +0100
 
diff --git a/debian/patches/bug-973861.patch b/debian/patches/bug-973861.patch
new file mode 100644
index 0000000..221eb8d
--- /dev/null
+++ b/debian/patches/bug-973861.patch
@@ -0,0 +1,66 @@
+From 2485681308bd8d3108da31546cb91bb97813a3fb Mon Sep 17 00:00:00 2001
+From: Maxim Dounin <mdounin@mdounin.ru>
+Date: Thu, 2 Feb 2023 23:38:48 +0300
+Subject: [PATCH] Lingering close for connections with pipelined requests.
+Origin: https://hg.nginx.org/nginx/rev/cffaf3f2eec8
+Forwarded: not-needed
+
+This is expected to help with clients using pipelining with some constant
+depth, such as apt[1][2].
+
+When downloading many resources, apt uses pipelining with some constant
+depth, a number of requests in flight.  This essentially means that after
+receiving a response it sends an additional request to the server, and
+this can result in requests arriving to the server at any time.  Further,
+additional requests are sent one-by-one, and can be easily seen as such
+(neither as pipelined, nor followed by pipelined requests).
+
+The only safe approach to close such connections (for example, when
+keepalive_requests is reached) is with lingering.  To do so, now nginx
+monitors if pipelining was used on the connection, and if it was, closes
+the connection with lingering.
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973861#10
+[2] https://mailman.nginx.org/pipermail/nginx-devel/2023-January/ZA2SP5SJU55LHEBCJMFDB2AZVELRLTHI.html
+---
+ src/core/ngx_connection.h   | 1 +
+ src/http/ngx_http_request.c | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
+index 6d3348d9..36e1be27 100644
+--- a/src/core/ngx_connection.h
++++ b/src/core/ngx_connection.h
+@@ -172,6 +172,7 @@ struct ngx_connection_s {
+     unsigned            timedout:1;
+     unsigned            error:1;
+     unsigned            destroyed:1;
++    unsigned            pipeline:1;
+ 
+     unsigned            idle:1;
+     unsigned            reusable:1;
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+index 131a2c83..5e0340b2 100644
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -2753,7 +2753,8 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
+         || (clcf->lingering_close == NGX_HTTP_LINGERING_ON
+             && (r->lingering_close
+                 || r->header_in->pos < r->header_in->last
+-                || r->connection->read->ready)))
++                || r->connection->read->ready
++                || r->connection->pipeline)))
+     {
+         ngx_http_set_lingering_close(r->connection);
+         return;
+@@ -3123,6 +3124,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
+ 
+         c->sent = 0;
+         c->destroyed = 0;
++        c->pipeline = 1;
+ 
+         if (rev->timer_set) {
+             ngx_del_timer(rev);
+-- 
+2.30.2
+
diff --git a/debian/patches/series b/debian/patches/series
index da26839..21a2a69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 nginx-fix-pidfile.patch
 nginx-ssl_cert_cb_yield.patch
 bug-1024605.patch
+bug-973861.patch

From d298d6b51b1fab3ed244fc06de5acb59e49c26d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 10 Feb 2023 17:53:36 +0100
Subject: [PATCH 503/600] d/gbb.conf: switched to debian branch main
 (debian-branch = main)

---
 debian/changelog | 1 +
 debian/gbp.conf  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f5ca4b6..957d877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ nginx (1.22.1-7) UNRELEASED; urgency=medium
   * switched to libpcre2 (Closes: 1000013)
   * d/p/bug-973861: added, lingering close for connections with pipelined
     requests. The patch is backported from the upstream. (Closes: 973861)
+  * d/gbb.conf: switched to debian branch main (debian-branch = main)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 10 Feb 2023 17:28:46 +0100
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index a14a699..49473cf 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,5 @@
 [DEFAULT]
+debian-branch = main
 pristine-tar = True
 upstream-branch = upstream
 upstream-tag = upstream/%(version)s

From bb65ab50f4ecaca69fdb98d9f1da95b3e39107e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 12 Feb 2023 15:20:52 +0100
Subject: [PATCH 504/600] d/libnginx-mod.abisubstvars update lua version to
 1:0.10.23~rc2-2

---
 debian/libnginx-mod.abisubstvars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index 4d6adf1..cfe7b47 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -15,7 +15,7 @@ libnginx-mod-http-echo:Version=1:0.63-4
 libnginx-mod-http-fancyindex:Version=1:0.5.2-3
 libnginx-mod-http-geoip2:Version=1:3.4-3
 libnginx-mod-http-headers-more-filter:Version=1:0.34-3
-libnginx-mod-http-lua:Version=1:0.10.23~rc2-1
+libnginx-mod-http-lua:Version=1:0.10.23~rc2-2
 libnginx-mod-http-subs-filter:Version=1:0.6.4-4
 libnginx-mod-http-uploadprogress:Version=1:0.9.2-3
 libnginx-mod-http-upstream-fair:Version=1:0.0~git20120408.a18b409-3

From bfcd4002706fd8d22987557b908ec6f559b7d201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 12 Feb 2023 15:59:12 +0100
Subject: [PATCH 505/600] d/copyright: updated to be compatible with 'cme
 update dpkg-copyright'

---
 debian/changelog |   1 +
 debian/copyright | 310 ++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 280 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 957d877..795a053 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ nginx (1.22.1-7) UNRELEASED; urgency=medium
   * d/p/bug-973861: added, lingering close for connections with pipelined
     requests. The patch is backported from the upstream. (Closes: 973861)
   * d/gbb.conf: switched to debian branch main (debian-branch = main)
+  * d/copyright: updated to be compatible with 'cme update dpkg-copyright'
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 10 Feb 2023 17:28:46 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 51702bc..5738011 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,32 +3,65 @@ Upstream-Name: nginx
 Source: https://nginx.org/en/download.html
 
 Files: *
-Copyright: 2002-2021, Igor Sysoev
-           2011-2022, Nginx, Inc.
-                      Maxim Dounin
-                      Valentin V. Bartenev
-                      Roman Arutyunyan
-                      Ruslan Ermilov
+Copyright: Valentin V. Bartenev
+ Ruslan Ermilov
+ Roman Arutyunyan
+ Maxim Dounin
+ 2011-2022, Nginx, Inc.
+ 2002-2021, Igor Sysoev
+ 2011-2022, Nginx, Inc.
+ 2002-2021, Igor Sysoev
 License: BSD-2-clause
 
-Files: src/core/ngx_murmurhash.c
-Copyright: Copyright (C) Austin Appleby
-License: public-domain
- All MurmurHash versions are public domain software, and the author 
- disclaims all copyright to their code.
- 
-
-Files: src/stream/ngx_stream_set_module.c
-Copyright: Copyright (C) Pavel Pautov
-           Copyright (C) Nginx, Inc.
+Files: CHANGES
+  README
+Copyright: Valentin V. Bartenev
+ Ruslan Ermilov
+ Roman Arutyunyan
+ Maxim Dounin
+ 2011-2022, Nginx, Inc.
+ 2002-2021, Igor Sysoev
 License: BSD-2-clause
 
-Files: src/http/modules/ngx_http_scgi_module.c
-       src/http/modules/ngx_http_uwsgi_module.c
-Copyright: 2009-2010, Unbit S.a.s.
-           2008,      Manlio Perillo (manlio.perillo@gmail.com)
-                      Igor Sysoev
-                      Nginx, Inc.
+Files: auto/*
+Copyright: Nginx, Inc.
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: auto/cc/clang
+Copyright: Nginx, Inc.
+License: BSD-2-clause
+
+Files: auto/module
+Copyright: Ruslan Ermilov
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: auto/threads
+Copyright: Nginx, Inc.
+License: BSD-2-clause
+
+Files: conf/*
+Copyright: Valentin V. Bartenev
+ Ruslan Ermilov
+ Roman Arutyunyan
+ Maxim Dounin
+ 2011-2022, Nginx, Inc.
+ 2002-2021, Igor Sysoev
+License: BSD-2-clause
+
+Files: configure
+Copyright: Nginx, Inc.
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: contrib/*
+Copyright: Valentin V. Bartenev
+ Ruslan Ermilov
+ Roman Arutyunyan
+ Maxim Dounin
+ 2011-2022, Nginx, Inc.
+ 2002-2021, Igor Sysoev
 License: BSD-2-clause
 
 Files: contrib/geo2nginx.pl
@@ -37,15 +70,15 @@ License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2022, 2023, Jan Mojžíš <jan.mojzis@gmail.com>
-  2020-2022, Ondřej Nový <onovy@debian.org>
-  2019-2022, Thomas Ward <teward@ubuntu.com>
-  2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
-  2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
-  2011, Dmitry E. Oboukhov <unera@debian.org>
-  2010-2014, Michael Lustfield <michael@lustfield.net>
-  2009-2014, Kartik Mistry <kartik@debian.org>
-  2008, Jose Parrella <joseparrella@cantv.net>
-  2007-2009, Fabio Tranchitella <kobold@debian.org>
+ 2020-2022, Ondřej Nový <onovy@debian.org>
+ 2019-2022, Thomas Ward <teward@ubuntu.com>
+ 2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
+ 2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
+ 2011, Dmitry E. Oboukhov <unera@debian.org>
+ 2010-2014, Michael Lustfield <michael@lustfield.net>
+ 2009-2014, Kartik Mistry <kartik@debian.org>
+ 2008, Jose Parrella <joseparrella@cantv.net>
+ 2007-2009, Fabio Tranchitella <kobold@debian.org>
 License: BSD-2-clause
 
 Files: debian/apport/*
@@ -68,6 +101,221 @@ Files: debian/help/examples/nginx_modsite
 Copyright: 2010, Michael Lustfield <mtecknology@ubuntu.com>
 License: BSD-2-clause
 
+Files: man/*
+Copyright: Nginx, Inc.
+ 2010, 2019, Sergey A. Osokin
+License: BSD-2-clause
+
+Files: src/*
+Copyright: Nginx, Inc.
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: src/core/ngx_crypt.c
+Copyright: Maxim Dounin
+License: BSD-2-clause
+
+Files: src/core/ngx_md5.c
+Copyright: Valentin V. Bartenev
+ Ruslan Ermilov
+ Roman Arutyunyan
+ Maxim Dounin
+ 2011-2022, Nginx, Inc.
+ 2002-2021, Igor Sysoev
+License: BSD-2-clause
+
+Files: src/core/ngx_module.c
+  src/core/ngx_module.h
+Copyright: Nginx, Inc.
+ Maxim Dounin
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: src/core/ngx_murmurhash.c
+Copyright: Austin Appleby
+License: public-domain
+ All MurmurHash versions are public domain software, and the author
+ disclaims all copyright to their code.
+
+Files: src/core/ngx_proxy_protocol.c
+  src/core/ngx_proxy_protocol.h
+Copyright: Roman Arutyunyan
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/core/ngx_rwlock.c
+  src/core/ngx_rwlock.h
+Copyright: Ruslan Ermilov
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/core/ngx_sha1.c
+Copyright: Nginx, Inc.
+ Maxim Dounin
+License: BSD-2-clause
+
+Files: src/core/ngx_syslog.c
+  src/core/ngx_syslog.h
+Copyright: Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/core/ngx_thread_pool.c
+Copyright: Valentin V. Bartenev
+ Ruslan Ermilov
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/core/ngx_thread_pool.h
+Copyright: Valentin V. Bartenev
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/event/modules/ngx_win32_poll_module.c
+Copyright: Nginx, Inc.
+ Maxim Dounin
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: src/event/ngx_event_openssl_stapling.c
+Copyright: Nginx, Inc.
+ Maxim Dounin
+License: BSD-2-clause
+
+Files: src/event/ngx_event_udp.c
+Copyright: Roman Arutyunyan
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/http/modules/ngx_http_auth_request_module.c
+  src/http/modules/ngx_http_grpc_module.c
+  src/http/modules/ngx_http_upstream_keepalive_module.c
+  src/http/modules/ngx_http_upstream_least_conn_module.c
+Copyright: Nginx, Inc.
+ Maxim Dounin
+License: BSD-2-clause
+
+Files: src/http/modules/ngx_http_gunzip_filter_module.c
+Copyright: Nginx, Inc.
+ Maxim Dounin
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: src/http/modules/ngx_http_mirror_module.c
+  src/http/modules/ngx_http_slice_filter_module.c
+  src/http/modules/ngx_http_upstream_hash_module.c
+Copyright: Roman Arutyunyan
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/http/modules/ngx_http_scgi_module.c
+Copyright: Nginx, Inc.
+ Manlio Perillo (manlio.perillo@gmail.com)
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: src/http/modules/ngx_http_upstream_random_module.c
+Copyright: Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/http/modules/ngx_http_upstream_zone_module.c
+Copyright: Ruslan Ermilov
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/http/modules/ngx_http_uwsgi_module.c
+Copyright: Nginx, Inc.
+ Igor Sysoev
+ 2009, 2010, Unbit S.a.s.
+ 2008, Manlio Perillo (manlio.perillo@gmail.com)
+License: BSD-2-clause
+
+Files: src/http/modules/perl/typemap
+Copyright: Valentin V. Bartenev
+ Ruslan Ermilov
+ Roman Arutyunyan
+ Maxim Dounin
+ 2011-2022, Nginx, Inc.
+ 2002-2021, Igor Sysoev
+License: BSD-2-clause
+
+Files: src/http/ngx_http_huff_decode.c
+Copyright: Valentin V. Bartenev
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/http/ngx_http_huff_encode.c
+Copyright: Valentin V. Bartenev
+ Nginx, Inc.
+ 2015, Vlad Krasnov
+License: BSD-2-clause
+
+Files: src/http/v2/*
+Copyright: Valentin V. Bartenev
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/http/v2/ngx_http_v2_filter_module.c
+Copyright: Valentin V. Bartenev
+ Ruslan Ermilov
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/misc/*
+Copyright: Valentin V. Bartenev
+ Ruslan Ermilov
+ Roman Arutyunyan
+ Maxim Dounin
+ 2011-2022, Nginx, Inc.
+ 2002-2021, Igor Sysoev
+License: BSD-2-clause
+
+Files: src/misc/ngx_google_perftools_module.c
+Copyright: Nginx, Inc.
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: src/os/unix/ngx_dlopen.c
+  src/os/unix/ngx_dlopen.h
+Copyright: Nginx, Inc.
+ Maxim Dounin
+License: BSD-2-clause
+
+Files: src/os/unix/ngx_setaffinity.c
+  src/os/unix/ngx_setaffinity.h
+Copyright: Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/stream/ngx_stream.c
+  src/stream/ngx_stream.h
+  src/stream/ngx_stream_core_module.c
+  src/stream/ngx_stream_handler.c
+  src/stream/ngx_stream_proxy_module.c
+  src/stream/ngx_stream_return_module.c
+  src/stream/ngx_stream_upstream_hash_module.c
+Copyright: Roman Arutyunyan
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/stream/ngx_stream_set_module.c
+Copyright: Pavel Pautov
+ Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/stream/ngx_stream_ssl_preread_module.c
+  src/stream/ngx_stream_upstream_random_module.c
+Copyright: Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/stream/ngx_stream_upstream_least_conn_module.c
+Copyright: Nginx, Inc.
+ Maxim Dounin
+License: BSD-2-clause
+
+Files: src/stream/ngx_stream_upstream_zone_module.c
+Copyright: Ruslan Ermilov
+ Nginx, Inc.
+License: BSD-2-clause
+
 License: BSD-2-clause
  All rights reserved.
  .

From 834bbcee5bc25b337875ca7d4e53edd5f7d3190f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 13 Feb 2023 13:04:39 +0100
Subject: [PATCH 506/600] release nginx 1.22.1-7, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 795a053..c8f695b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.22.1-7) UNRELEASED; urgency=medium
+nginx (1.22.1-7) unstable; urgency=medium
 
   * nginx ABI release: nginx-abi-1.22.1-7
   * nginx ABI: Nginx now provides nginx-abi-<VERSION> to better manage
@@ -9,7 +9,7 @@ nginx (1.22.1-7) UNRELEASED; urgency=medium
   * d/gbb.conf: switched to debian branch main (debian-branch = main)
   * d/copyright: updated to be compatible with 'cme update dpkg-copyright'
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 10 Feb 2023 17:28:46 +0100
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 13:04:16 +0100
 
 nginx (1.22.1-6) unstable; urgency=medium
 

From f215469ef5250c93c30afb410fbfb0294f7fe50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 13 Feb 2023 20:18:20 +0100
Subject: [PATCH 507/600] d/control fix nginx-full dependencies

---
 debian/control | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 6981083..08644c7 100644
--- a/debian/control
+++ b/debian/control
@@ -119,13 +119,13 @@ Description: nginx web/proxy server (standard version)
 
 Package: nginx-full
 Architecture: all
-Depends: libnginx-mod-http-auth-pam,
-         libnginx-mod-http-dav-ext,
-         libnginx-mod-http-echo,
-         libnginx-mod-http-geoip2,
-         libnginx-mod-http-subs-filter,
-         libnginx-mod-http-upstream-fair,
-         libnginx-mod-stream-geoip2,
+Depends: libnginx-mod-http-auth-pam (>= ${libnginx-mod-http-auth-pam:Version}~),
+         libnginx-mod-http-dav-ext (>= ${libnginx-mod-http-dav-ext:Version}~),
+         libnginx-mod-http-echo (>= ${libnginx-mod-http-echo:Version}~),
+         libnginx-mod-http-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
+         libnginx-mod-http-subs-filter (>= ${libnginx-mod-http-subs-filter:Version}~),
+         libnginx-mod-http-upstream-fair (>= ${libnginx-mod-http-upstream-fair:Version}~),
+         libnginx-mod-stream-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
          nginx (>= ${source:Version}),
          nginx (<< ${source:Version}.1~),
          ${misc:Depends},

From 57e87d08df48c1ed17b1105bbc8bc47c8f232244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 8 Mar 2023 21:44:28 +0100
Subject: [PATCH 508/600] d/changelog: fix nginx-full dependencies

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c8f695b..2a7402b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.22.1-8) UNRELEASED; urgency=medium
+
+  * d/control: fix nginx-full dependencies
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 08 Mar 2023 21:43:50 +0100
+
 nginx (1.22.1-7) unstable; urgency=medium
 
   * nginx ABI release: nginx-abi-1.22.1-7

From bd50f6ef76b50107a8c877e977659c6401840f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 8 Mar 2023 21:48:08 +0100
Subject: [PATCH 509/600] d/libnginx-mod.abisubstvars: update
 libnginx-mod-http-lua version

---
 debian/changelog                 | 1 +
 debian/libnginx-mod.abisubstvars | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2a7402b..1ef45e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nginx (1.22.1-8) UNRELEASED; urgency=medium
 
   * d/control: fix nginx-full dependencies
+  * d/libnginx-mod.abisubstvars: update libnginx-mod-http-lua version
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 08 Mar 2023 21:43:50 +0100
 
diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index cfe7b47..7cd29eb 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -15,7 +15,7 @@ libnginx-mod-http-echo:Version=1:0.63-4
 libnginx-mod-http-fancyindex:Version=1:0.5.2-3
 libnginx-mod-http-geoip2:Version=1:3.4-3
 libnginx-mod-http-headers-more-filter:Version=1:0.34-3
-libnginx-mod-http-lua:Version=1:0.10.23~rc2-2
+libnginx-mod-http-lua:Version=1:0.10.23-1
 libnginx-mod-http-subs-filter:Version=1:0.6.4-4
 libnginx-mod-http-uploadprogress:Version=1:0.9.2-3
 libnginx-mod-http-upstream-fair:Version=1:0.0~git20120408.a18b409-3

From c1f58a85e1e793164e00984d1d6438b2176c747e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 12 Mar 2023 22:07:35 +0100
Subject: [PATCH 510/600] Revert "move common files from nginx-common to nginx"

This reverts commit 473f36a7d18b55f4cde49dcecdc4ac115fe5611d.
---
 debian/apport/source_nginx.py                 |  2 +-
 debian/changelog                              |  4 ++
 debian/control                                | 16 ++---
 debian/nginx-common.NEWS                      | 10 ----
 debian/{nginx.config => nginx-common.config}  |  0
 debian/nginx-common.dirs                      | 12 ++++
 debian/nginx-common.install                   |  6 ++
 debian/{nginx.links => nginx-common.links}    |  0
 ...inx.default => nginx-common.nginx.default} |  0
 .../{nginx.init => nginx-common.nginx.init}   |  0
 ...logrotate => nginx-common.nginx.logrotate} |  0
 ...inx.service => nginx-common.nginx.service} |  0
 debian/nginx-common.postinst                  | 59 +++++++++++++++++++
 debian/{nginx.postrm => nginx-common.postrm}  |  0
 .../{nginx.preinst => nginx-common.preinst}   |  0
 ...nginx.templates => nginx-common.templates} |  0
 debian/nginx.dirs                             | 12 ----
 debian/nginx.install                          |  6 --
 debian/nginx.postinst                         | 46 +--------------
 debian/po/POTFILES.in                         |  2 +-
 debian/po/ca.po                               |  8 +--
 debian/po/da.po                               |  8 +--
 debian/po/de.po                               |  8 +--
 debian/po/es.po                               |  8 +--
 debian/po/fr.po                               |  8 +--
 debian/po/it.po                               |  8 +--
 debian/po/nl.po                               |  8 +--
 debian/po/pt.po                               |  8 +--
 debian/po/pt_BR.po                            |  8 +--
 debian/po/ru.po                               |  8 +--
 debian/po/templates.pot                       |  8 +--
 debian/po/tr.po                               |  8 +--
 debian/rules                                  | 12 ++--
 33 files changed, 146 insertions(+), 137 deletions(-)
 rename debian/{nginx.config => nginx-common.config} (100%)
 create mode 100644 debian/nginx-common.dirs
 create mode 100644 debian/nginx-common.install
 rename debian/{nginx.links => nginx-common.links} (100%)
 rename debian/{nginx.default => nginx-common.nginx.default} (100%)
 rename debian/{nginx.init => nginx-common.nginx.init} (100%)
 rename debian/{nginx.logrotate => nginx-common.nginx.logrotate} (100%)
 rename debian/{nginx.service => nginx-common.nginx.service} (100%)
 create mode 100644 debian/nginx-common.postinst
 rename debian/{nginx.postrm => nginx-common.postrm} (100%)
 rename debian/{nginx.preinst => nginx-common.preinst} (100%)
 rename debian/{nginx.templates => nginx-common.templates} (100%)

diff --git a/debian/apport/source_nginx.py b/debian/apport/source_nginx.py
index ae808bb..aec6e8e 100644
--- a/debian/apport/source_nginx.py
+++ b/debian/apport/source_nginx.py
@@ -9,7 +9,7 @@ import os
 import subprocess
 
 def add_info(report, ui):
-    if (report['Package'].split()[0] != 'nginx'
+    if (report['Package'].split()[0] != 'nginx-common'
         and report['ProblemType'] == 'Package'
         and os.path.isdir('/run/systemd/system')):
         report['Journalctl_Nginx.txt'] = apport.hookutils.command_output(
diff --git a/debian/changelog b/debian/changelog
index 1ef45e5..1648c32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 nginx (1.22.1-8) UNRELEASED; urgency=medium
 
+  * Main change:
+    Configuration files returned to nginx-common package. This fixes
+    the serious problem of losing configuration files during upgrade.
+    This is a rollback of a change made in 1.22.1-6 (Closes: 1032517)
   * d/control: fix nginx-full dependencies
   * d/libnginx-mod.abisubstvars: update libnginx-mod-http-lua version
 
diff --git a/debian/control b/debian/control
index 08644c7..d2bea17 100644
--- a/debian/control
+++ b/debian/control
@@ -24,9 +24,10 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          iproute2,
-Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
-Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~), nginx-common (<< 1.22.1-6~)
-Suggests: fcgiwrap, nginx-doc, ssl-cert
+         nginx-common (<< ${source:Version}.1~),
+         nginx-common (>= ${source:Version}),
+Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
+Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
 Provides: httpd, httpd-cgi, ${nginx:abi}
 Description: small, powerful, scalable web/proxy server
  Nginx ("engine X") is a high-performance web and reverse proxy server
@@ -48,16 +49,15 @@ Description: small, powerful, scalable web/proxy server - documentation
 Package: nginx-common
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends},
-         nginx (<< ${source:Version}.1~),
-         nginx (>= ${source:Version}),
+Depends: ${misc:Depends}
+Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server
  created by Igor Sysoev. It can be used both as a standalone web server
  and as a proxy to reduce the load on back-end HTTP or mail servers.
  .
- From nginx version 1.22.1-6 changed to dependency metapackage,
- can be safely removed.
+ This package contains base configuration files used by all versions of
+ nginx.
 
 Package: nginx-dev
 Architecture: all
diff --git a/debian/nginx-common.NEWS b/debian/nginx-common.NEWS
index 9fef753..d361983 100644
--- a/debian/nginx-common.NEWS
+++ b/debian/nginx-common.NEWS
@@ -1,13 +1,3 @@
-nginx-common (1.22.1-6) unstable; urgency=medium
-
-  The packages nginx-common deprecated.
-  Package no longer distribute the configuration files and is replaced
-  by a metapackage to keep upgrades smooth.
-  Please simply install 'nginx' and 'libnginx-mod-...' modules You need
-  instead of these packages.
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Jan 2023 20:23:22 +0100
-
 nginx-common (1.10.2-4) unstable; urgency=medium
 
   Since nginx 1.9.14 Debian has gradually switched to dynamic loadable modules
diff --git a/debian/nginx.config b/debian/nginx-common.config
similarity index 100%
rename from debian/nginx.config
rename to debian/nginx-common.config
diff --git a/debian/nginx-common.dirs b/debian/nginx-common.dirs
new file mode 100644
index 0000000..8e5d7bf
--- /dev/null
+++ b/debian/nginx-common.dirs
@@ -0,0 +1,12 @@
+etc/nginx
+etc/nginx/conf.d
+etc/nginx/modules-available
+etc/nginx/modules-enabled
+etc/nginx/sites-available
+etc/nginx/sites-enabled
+etc/ufw/applications.d
+usr/share/nginx
+usr/share/vim/addons
+usr/share/vim/registry
+var/lib/nginx
+var/log/nginx
diff --git a/debian/nginx-common.install b/debian/nginx-common.install
new file mode 100644
index 0000000..20109fa
--- /dev/null
+++ b/debian/nginx-common.install
@@ -0,0 +1,6 @@
+contrib/vim/* usr/share/vim/addons
+debian/conf/* etc/nginx
+debian/apport/source_nginx.py usr/share/apport/package-hooks
+debian/ufw/nginx etc/ufw/applications.d
+debian/vim/nginx.yaml usr/share/vim/registry
+html/index.html usr/share/nginx/html/
diff --git a/debian/nginx.links b/debian/nginx-common.links
similarity index 100%
rename from debian/nginx.links
rename to debian/nginx-common.links
diff --git a/debian/nginx.default b/debian/nginx-common.nginx.default
similarity index 100%
rename from debian/nginx.default
rename to debian/nginx-common.nginx.default
diff --git a/debian/nginx.init b/debian/nginx-common.nginx.init
similarity index 100%
rename from debian/nginx.init
rename to debian/nginx-common.nginx.init
diff --git a/debian/nginx.logrotate b/debian/nginx-common.nginx.logrotate
similarity index 100%
rename from debian/nginx.logrotate
rename to debian/nginx-common.nginx.logrotate
diff --git a/debian/nginx.service b/debian/nginx-common.nginx.service
similarity index 100%
rename from debian/nginx.service
rename to debian/nginx-common.nginx.service
diff --git a/debian/nginx-common.postinst b/debian/nginx-common.postinst
new file mode 100644
index 0000000..0d44608
--- /dev/null
+++ b/debian/nginx-common.postinst
@@ -0,0 +1,59 @@
+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+  configure)
+    logdir="/var/log/nginx"
+
+    # Allow local admin to override
+    if ! dpkg-statoverride --list "$logdir" >/dev/null; then
+      chown root:adm $logdir
+      chmod 0755 $logdir
+    fi
+
+    # Secure default logfiles on fresh installations
+    if [ -z "$2" ]; then
+      access_log="$logdir/access.log"
+      error_log="$logdir/error.log"
+
+      if [ ! -e "$access_log" ]; then
+        touch "$access_log"
+        chmod 640 "$access_log"
+        chown www-data:adm "$access_log"
+      fi
+
+      if [ ! -e "$error_log" ]; then
+        touch "$error_log"
+        chmod 640 "$error_log"
+        chown www-data:adm "$error_log"
+      fi
+    fi
+
+    # If a symlink doesn't exist and can be created, then create it.
+    if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
+       [ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
+      ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
+    fi
+
+    # Create a default index page when not already present.
+    if [ ! -e /var/www/html/index.nginx-debian.html ]; then
+      mkdir -p /var/www/html
+      cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
+    fi
+
+    ;;
+
+  abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/nginx.postrm b/debian/nginx-common.postrm
similarity index 100%
rename from debian/nginx.postrm
rename to debian/nginx-common.postrm
diff --git a/debian/nginx.preinst b/debian/nginx-common.preinst
similarity index 100%
rename from debian/nginx.preinst
rename to debian/nginx-common.preinst
diff --git a/debian/nginx.templates b/debian/nginx-common.templates
similarity index 100%
rename from debian/nginx.templates
rename to debian/nginx-common.templates
diff --git a/debian/nginx.dirs b/debian/nginx.dirs
index 69bccbc..236670a 100644
--- a/debian/nginx.dirs
+++ b/debian/nginx.dirs
@@ -1,13 +1 @@
 usr/sbin
-etc/nginx
-etc/nginx/conf.d
-etc/nginx/modules-available
-etc/nginx/modules-enabled
-etc/nginx/sites-available
-etc/nginx/sites-enabled
-etc/ufw/applications.d
-usr/share/nginx
-usr/share/vim/addons
-usr/share/vim/registry
-var/lib/nginx
-var/log/nginx
diff --git a/debian/nginx.install b/debian/nginx.install
index 4a91b45..f268f7f 100644
--- a/debian/nginx.install
+++ b/debian/nginx.install
@@ -1,7 +1 @@
 debian/build-bin/objs/nginx usr/sbin
-contrib/vim/* usr/share/vim/addons
-debian/conf/* etc/nginx
-debian/apport/source_nginx.py usr/share/apport/package-hooks
-debian/ufw/nginx etc/ufw/applications.d
-debian/vim/nginx.yaml usr/share/vim/registry
-html/index.html usr/share/nginx/html/
diff --git a/debian/nginx.postinst b/debian/nginx.postinst
index a86ac95..888d952 100644
--- a/debian/nginx.postinst
+++ b/debian/nginx.postinst
@@ -1,49 +1,9 @@
 #!/bin/sh
 set -e
 
-. /usr/share/debconf/confmodule
-
 case "$1" in
-  configure)
-    logdir="/var/log/nginx"
-
-    # Allow local admin to override
-    if ! dpkg-statoverride --list "$logdir" >/dev/null; then
-      chown root:adm $logdir
-      chmod 0755 $logdir
-    fi
-
-    # Secure default logfiles on fresh installations
-    if [ -z "$2" ]; then
-      access_log="$logdir/access.log"
-      error_log="$logdir/error.log"
-
-      if [ ! -e "$access_log" ]; then
-        touch "$access_log"
-        chmod 640 "$access_log"
-        chown www-data:adm "$access_log"
-      fi
-
-      if [ ! -e "$error_log" ]; then
-        touch "$error_log"
-        chmod 640 "$error_log"
-        chown www-data:adm "$error_log"
-      fi
-    fi
-
-    # If a symlink doesn't exist and can be created, then create it.
-    if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
-       [ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
-      ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
-    fi
-
-    # Create a default index page when not already present.
-    if [ ! -e /var/www/html/index.nginx-debian.html ]; then
-      mkdir -p /var/www/html
-      cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
-    fi
+  abort-upgrade|abort-remove|abort-deconfigure|configure)
     ;;
-
   triggered)
     if invoke-rc.d --quiet nginx status >/dev/null; then
       echo "Triggering nginx reload ..."
@@ -51,10 +11,6 @@ case "$1" in
     fi
     exit 0
     ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
   *)
     echo "postinst called with unknown argument \`$1'" >&2
     exit 1
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index dab87b2..dcbe15b 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] nginx.templates
+[type: gettext/rfc822deb] nginx-common.templates
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 35f306a..d9ce72d 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "És possible que els fitxers de registre nginx siguin insegurs"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/da.po b/debian/po/da.po
index a486426..fcc5115 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Nginx-logfilerne er muligvis usikre"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/de.po b/debian/po/de.po
index 7624322..d33bf66 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Möglicherweise unsichere Nginx-Protokolldateien"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/es.po b/debian/po/es.po
index 6124eb4..552ab2f 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -40,13 +40,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Posibles archivos de registro inseguros de nginx"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -56,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index f9bfedf..0a937cf 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Certains fichiers de journaux semblent non sécurisés"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/it.po b/debian/po/it.po
index 30dc669..245dc1b 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Documenti di log di nginx potenzialmente non sicuri"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 1cf7d0c..0fd1c5a 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Wellicht onveilige nginx logbestanden"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 6870a72..c552ab3 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Ficheiros de eventos (log) do nginx possivelmente inseguros"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index fe71d61..92d3a6a 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Possíveis arquivos de log do nginx inseguros"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -36,13 +36,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 23711ec..fdaa738 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Возможно небезопасные файлы журналов nginx"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 5090c43..9260ff1 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -33,13 +33,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/po/tr.po b/debian/po/tr.po
index dfe0b4d..3e9d40b 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "Possible insecure nginx log files"
 msgstr "Güvenliği sağlanmamış nginx günlük dosyaları olabilir"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "The following log files under /var/log/nginx directory are symlinks owned by "
 "www-data:"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid "${logfiles}"
 msgstr "${logfiles}"
 
 #. Type: note
 #. Description
-#: ../nginx.templates:1001
+#: ../nginx-common.templates:1001
 msgid ""
 "Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
 "data could symlink log files to sensitive locations, which in turn could "
diff --git a/debian/rules b/debian/rules
index 2932ef5..da5f06e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,13 +95,13 @@ override_dh_install:
 	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/autoscripts debian/debhelper/dh_nginx --in-nginx-tree
 
 override_dh_installinit:
-	dh_installinit --package nginx --no-stop-on-upgrade --no-start --name=nginx
+	dh_installinit --no-stop-on-upgrade --no-start --name=nginx
 
-#override_dh_installsystemd:
-#	dh_installsystemd --package nginx --name=nginx
-#
-#override_dh_installlogrotate:
-#	dh_installlogrotate --package nginx --name=nginx
+override_dh_installsystemd:
+	dh_installsystemd --name=nginx
+
+override_dh_installlogrotate:
+	dh_installlogrotate --package nginx-common --name=nginx
 
 override_dh_gencontrol:
 	dh_gencontrol -- -Tdebian/substvars -Tdebian/libnginx-mod.abisubstvars

From c8b4d1401bbac4916562a71d9f08a24b3e92251d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 14 Mar 2023 06:53:39 +0100
Subject: [PATCH 511/600] release nginx 1.22.1-8, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1648c32..7e2383f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.22.1-8) UNRELEASED; urgency=medium
+nginx (1.22.1-8) unstable; urgency=medium
 
   * Main change:
     Configuration files returned to nginx-common package. This fixes
@@ -7,7 +7,7 @@ nginx (1.22.1-8) UNRELEASED; urgency=medium
   * d/control: fix nginx-full dependencies
   * d/libnginx-mod.abisubstvars: update libnginx-mod-http-lua version
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 08 Mar 2023 21:43:50 +0100
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 06:53:32 +0100
 
 nginx (1.22.1-7) unstable; urgency=medium
 

From 9a5dedf46153549655713f6b6b1fb2672f52364e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 14 Mar 2023 12:53:14 +0100
Subject: [PATCH 512/600] d/control: nginx-common Breaks+Replaces: nginx (<<
 1.22.1-8)

---
 debian/changelog | 7 +++++++
 debian/control   | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7e2383f..a7c499b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.22.1-9) UNRELEASED; urgency=medium
+
+  * d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8)
+    (Closes: 1032929)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 12:50:06 +0100
+
 nginx (1.22.1-8) unstable; urgency=medium
 
   * Main change:
diff --git a/debian/control b/debian/control
index d2bea17..7c37ce9 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,8 @@ Description: small, powerful, scalable web/proxy server - documentation
  This package provides extra documentation to help unleash the power of Nginx.
 
 Package: nginx-common
+Breaks: nginx (<< 1.22.1-8)
+Replaces: nginx (<< 1.22.1-8)
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}

From 3fdf9b9553f1efe56c24a6dd1be0e1452afe5911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 14 Mar 2023 16:19:37 +0100
Subject: [PATCH 513/600] release nginx 1.22.1-9, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7c499b..3bf98db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-nginx (1.22.1-9) UNRELEASED; urgency=medium
+nginx (1.22.1-9) unstable; urgency=medium
 
   * d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8)
     (Closes: 1032929)
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 12:50:06 +0100
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 16:19:32 +0100
 
 nginx (1.22.1-8) unstable; urgency=medium
 

From 8094197df9eb5095582095edb9147142ae59c387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 25 Apr 2023 22:36:23 +0200
Subject: [PATCH 514/600] New upstream version 1.24.0

---
 CHANGES                                       |  148 +-
 CHANGES.ru                                    |  150 +-
 auto/cc/conf                                  |    2 +-
 auto/cc/msvc                                  |   19 +-
 auto/lib/openssl/make                         |   15 +-
 auto/lib/openssl/makefile.msvc                |    2 +-
 auto/os/conf                                  |    2 +-
 auto/os/linux                                 |   15 +
 auto/sources                                  |    3 +-
 configure                                     |    1 +
 contrib/vim/syntax/nginx.vim                  | 1004 +++---------
 src/core/nginx.h                              |    4 +-
 src/core/ngx_conf_file.c                      |    4 +-
 src/core/ngx_connection.c                     |    2 +-
 src/core/ngx_connection.h                     |    2 +
 src/core/ngx_hash.h                           |    7 +-
 src/core/ngx_proxy_protocol.c                 |  212 ++-
 src/core/ngx_proxy_protocol.h                 |    6 +-
 src/core/ngx_resolver.c                       |   61 +-
 src/core/ngx_resolver.h                       |    4 +-
 src/core/ngx_string.c                         |    7 +-
 src/core/ngx_string.h                         |    6 +-
 src/core/ngx_syslog.c                         |   52 +-
 src/core/ngx_syslog.h                         |   20 +-
 src/event/modules/ngx_iocp_module.c           |  379 +++++
 src/event/modules/ngx_iocp_module.h           |   22 +
 src/event/ngx_event.c                         |    9 +-
 src/event/ngx_event.h                         |    7 +-
 src/event/ngx_event_acceptex.c                |  229 +++
 src/event/ngx_event_connect.c                 |    2 +
 src/event/ngx_event_connectex.c               |  206 +++
 src/event/ngx_event_openssl.c                 |  539 ++++--
 src/event/ngx_event_openssl.h                 |   37 +-
 src/event/ngx_event_udp.c                     |   92 +-
 src/event/ngx_event_udp.h                     |   58 +
 src/http/modules/ngx_http_auth_basic_module.c |    1 +
 .../modules/ngx_http_auth_request_module.c    |   12 +-
 src/http/modules/ngx_http_dav_module.c        |    1 +
 src/http/modules/ngx_http_fastcgi_module.c    |   78 +-
 src/http/modules/ngx_http_flv_module.c        |    3 +-
 src/http/modules/ngx_http_geo_module.c        |    6 +-
 src/http/modules/ngx_http_geoip_module.c      |   12 +-
 src/http/modules/ngx_http_grpc_module.c       |   84 +-
 .../modules/ngx_http_gzip_filter_module.c     |   19 +-
 .../modules/ngx_http_gzip_static_module.c     |    4 +
 .../modules/ngx_http_headers_filter_module.c  |   55 +-
 src/http/modules/ngx_http_memcached_module.c  |    1 +
 src/http/modules/ngx_http_mp4_module.c        |    3 +-
 src/http/modules/ngx_http_proxy_module.c      |  104 +-
 .../modules/ngx_http_range_filter_module.c    |   16 +
 src/http/modules/ngx_http_realip_module.c     |    7 +-
 src/http/modules/ngx_http_scgi_module.c       |   58 +-
 src/http/modules/ngx_http_ssi_filter_module.c |   29 +-
 src/http/modules/ngx_http_ssi_filter_module.h |    1 +
 src/http/modules/ngx_http_ssl_module.c        |    9 +-
 src/http/modules/ngx_http_static_module.c     |   10 +-
 .../modules/ngx_http_userid_filter_module.c   |   19 +-
 src/http/modules/ngx_http_uwsgi_module.c      |  141 +-
 src/http/modules/perl/nginx.xs                |  116 +-
 src/http/ngx_http.c                           |   65 +-
 src/http/ngx_http.h                           |    8 +-
 src/http/ngx_http_core_module.c               |  154 +-
 src/http/ngx_http_core_module.h               |   10 +-
 src/http/ngx_http_file_cache.c                |   14 +-
 src/http/ngx_http_parse.c                     |   60 +-
 src/http/ngx_http_request.c                   |   60 +-
 src/http/ngx_http_request.h                   |   14 +-
 src/http/ngx_http_script.c                    |    1 +
 src/http/ngx_http_special_response.c          |    1 +
 src/http/ngx_http_upstream.c                  |  410 +++--
 src/http/ngx_http_upstream.h                  |   12 +-
 src/http/ngx_http_variables.c                 |  199 ++-
 src/http/ngx_http_variables.h                 |    5 +-
 src/http/ngx_http_write_filter_module.c       |    3 +-
 src/http/v2/ngx_http_v2.c                     |   13 +-
 src/http/v2/ngx_http_v2.h                     |    2 +-
 src/http/v2/ngx_http_v2_filter_module.c       |   33 +-
 src/mail/ngx_mail_core_module.c               |   47 +-
 src/mail/ngx_mail_proxy_module.c              |   16 +-
 src/mail/ngx_mail_ssl_module.c                |    7 +-
 src/os/unix/ngx_linux_config.h                |    4 +
 src/os/unix/ngx_process_cycle.c               |   11 +-
 src/os/unix/ngx_readv_chain.c                 |    6 +-
 src/os/unix/ngx_recv.c                        |    4 +-
 src/os/unix/ngx_udp_sendmsg_chain.c           |  240 ++-
 src/os/win32/nginx.ico                        |  Bin 0 -> 1350 bytes
 src/os/win32/nginx.rc                         |    6 +
 src/os/win32/nginx_icon16.xpm                 |   24 +
 src/os/win32/nginx_icon32.xpm                 |   39 +
 src/os/win32/nginx_icon48.xpm                 |   55 +
 src/os/win32/ngx_alloc.c                      |   44 +
 src/os/win32/ngx_alloc.h                      |   27 +
 src/os/win32/ngx_atomic.h                     |   69 +
 src/os/win32/ngx_dlopen.c                     |   22 +
 src/os/win32/ngx_dlopen.h                     |   32 +
 src/os/win32/ngx_errno.c                      |   60 +
 src/os/win32/ngx_errno.h                      |   71 +
 src/os/win32/ngx_event_log.c                  |   99 ++
 src/os/win32/ngx_files.c                      | 1459 +++++++++++++++++
 src/os/win32/ngx_files.h                      |  271 +++
 src/os/win32/ngx_os.h                         |   68 +
 src/os/win32/ngx_process.c                    |  238 +++
 src/os/win32/ngx_process.h                    |   80 +
 src/os/win32/ngx_process_cycle.c              | 1044 ++++++++++++
 src/os/win32/ngx_process_cycle.h              |   44 +
 src/os/win32/ngx_service.c                    |  134 ++
 src/os/win32/ngx_shmem.c                      |  161 ++
 src/os/win32/ngx_shmem.h                      |   33 +
 src/os/win32/ngx_socket.c                     |   49 +
 src/os/win32/ngx_socket.h                     |  253 +++
 src/os/win32/ngx_stat.c                       |   34 +
 src/os/win32/ngx_thread.c                     |   30 +
 src/os/win32/ngx_thread.h                     |   27 +
 src/os/win32/ngx_time.c                       |   83 +
 src/os/win32/ngx_time.h                       |   51 +
 src/os/win32/ngx_udp_wsarecv.c                |  149 ++
 src/os/win32/ngx_user.c                       |   23 +
 src/os/win32/ngx_user.h                       |   25 +
 src/os/win32/ngx_win32_config.h               |  287 ++++
 src/os/win32/ngx_win32_init.c                 |  329 ++++
 src/os/win32/ngx_wsarecv.c                    |  215 +++
 src/os/win32/ngx_wsarecv_chain.c              |  147 ++
 src/os/win32/ngx_wsasend.c                    |  185 +++
 src/os/win32/ngx_wsasend_chain.c              |  296 ++++
 src/stream/ngx_stream_core_module.c           |   49 +-
 src/stream/ngx_stream_proxy_module.c          |   97 +-
 src/stream/ngx_stream_ssl_module.c            |    7 +-
 src/stream/ngx_stream_variables.c             |   39 +
 src/stream/ngx_stream_write_filter_module.c   |    2 +-
 129 files changed, 10228 insertions(+), 1745 deletions(-)
 create mode 100644 src/event/modules/ngx_iocp_module.c
 create mode 100644 src/event/modules/ngx_iocp_module.h
 create mode 100644 src/event/ngx_event_acceptex.c
 create mode 100644 src/event/ngx_event_connectex.c
 create mode 100644 src/event/ngx_event_udp.h
 create mode 100644 src/os/win32/nginx.ico
 create mode 100644 src/os/win32/nginx.rc
 create mode 100644 src/os/win32/nginx_icon16.xpm
 create mode 100644 src/os/win32/nginx_icon32.xpm
 create mode 100644 src/os/win32/nginx_icon48.xpm
 create mode 100644 src/os/win32/ngx_alloc.c
 create mode 100644 src/os/win32/ngx_alloc.h
 create mode 100644 src/os/win32/ngx_atomic.h
 create mode 100644 src/os/win32/ngx_dlopen.c
 create mode 100644 src/os/win32/ngx_dlopen.h
 create mode 100644 src/os/win32/ngx_errno.c
 create mode 100644 src/os/win32/ngx_errno.h
 create mode 100644 src/os/win32/ngx_event_log.c
 create mode 100644 src/os/win32/ngx_files.c
 create mode 100644 src/os/win32/ngx_files.h
 create mode 100644 src/os/win32/ngx_os.h
 create mode 100644 src/os/win32/ngx_process.c
 create mode 100644 src/os/win32/ngx_process.h
 create mode 100644 src/os/win32/ngx_process_cycle.c
 create mode 100644 src/os/win32/ngx_process_cycle.h
 create mode 100644 src/os/win32/ngx_service.c
 create mode 100644 src/os/win32/ngx_shmem.c
 create mode 100644 src/os/win32/ngx_shmem.h
 create mode 100644 src/os/win32/ngx_socket.c
 create mode 100644 src/os/win32/ngx_socket.h
 create mode 100644 src/os/win32/ngx_stat.c
 create mode 100644 src/os/win32/ngx_thread.c
 create mode 100644 src/os/win32/ngx_thread.h
 create mode 100644 src/os/win32/ngx_time.c
 create mode 100644 src/os/win32/ngx_time.h
 create mode 100644 src/os/win32/ngx_udp_wsarecv.c
 create mode 100644 src/os/win32/ngx_user.c
 create mode 100644 src/os/win32/ngx_user.h
 create mode 100644 src/os/win32/ngx_win32_config.h
 create mode 100644 src/os/win32/ngx_win32_init.c
 create mode 100644 src/os/win32/ngx_wsarecv.c
 create mode 100644 src/os/win32/ngx_wsarecv_chain.c
 create mode 100644 src/os/win32/ngx_wsasend.c
 create mode 100644 src/os/win32/ngx_wsasend_chain.c

diff --git a/CHANGES b/CHANGES
index c356ba7..6774b29 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,15 +1,157 @@
 
-Changes with nginx 1.22.1                                        19 Oct 2022
+Changes with nginx 1.24.0                                        11 Apr 2023
+
+    *) 1.24.x stable branch.
+
+
+Changes with nginx 1.23.4                                        28 Mar 2023
+
+    *) Change: now TLSv1.3 protocol is enabled by default.
+
+    *) Change: now nginx issues a warning if protocol parameters of a
+       listening socket are redefined.
+
+    *) Change: now nginx closes connections with lingering if pipelining was
+       used by the client.
+
+    *) Feature: byte ranges support in the ngx_http_gzip_static_module.
+
+    *) Bugfix: port ranges in the "listen" directive did not work; the bug
+       had appeared in 1.23.3.
+       Thanks to Valentin Bartenev.
+
+    *) Bugfix: incorrect location might be chosen to process a request if a
+       prefix location longer than 255 characters was used in the
+       configuration.
+
+    *) Bugfix: non-ASCII characters in file names on Windows were not
+       supported by the ngx_http_autoindex_module, the ngx_http_dav_module,
+       and the "include" directive.
+
+    *) Change: the logging level of the "data length too long", "length too
+       short", "bad legacy version", "no shared signature algorithms", "bad
+       digest length", "missing sigalgs extension", "encrypted length too
+       long", "bad length", "bad key update", "mixed handshake and non
+       handshake data", "ccs received early", "data between ccs and
+       finished", "packet length too long", "too many warn alerts", "record
+       too small", and "got a fin before a ccs" SSL errors has been lowered
+       from "crit" to "info".
+
+    *) Bugfix: a socket leak might occur when using HTTP/2 and the
+       "error_page" directive to redirect errors with code 400.
+
+    *) Bugfix: messages about logging to syslog errors did not contain
+       information that the errors happened while logging to syslog.
+       Thanks to Safar Safarly.
+
+    *) Workaround: "gzip filter failed to use preallocated memory" alerts
+       appeared in logs when using zlib-ng.
+
+    *) Bugfix: in the mail proxy server.
+
+
+Changes with nginx 1.23.3                                        13 Dec 2022
+
+    *) Bugfix: an error might occur when reading PROXY protocol version 2
+       header with large number of TLVs.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if SSI
+       was used to process subrequests created by other modules.
+       Thanks to Ciel Zhao.
+
+    *) Workaround: when a hostname used in the "listen" directive resolves
+       to multiple addresses, nginx now ignores duplicates within these
+       addresses.
+
+    *) Bugfix: nginx might hog CPU during unbuffered proxying if SSL
+       connections to backends were used.
+
+
+Changes with nginx 1.23.2                                        19 Oct 2022
 
     *) Security: processing of a specially crafted mp4 file by the
        ngx_http_mp4_module might cause a worker process crash, worker
        process memory disclosure, or might have potential other impact
        (CVE-2022-41741, CVE-2022-41742).
 
+    *) Feature: the "$proxy_protocol_tlv_..." variables.
 
-Changes with nginx 1.22.0                                        24 May 2022
+    *) Feature: TLS session tickets encryption keys are now automatically
+       rotated when using shared memory in the "ssl_session_cache"
+       directive.
 
-    *) 1.22.x stable branch.
+    *) Change: the logging level of the "bad record type" SSL errors has
+       been lowered from "crit" to "info".
+       Thanks to Murilo Andrade.
+
+    *) Change: now when using shared memory in the "ssl_session_cache"
+       directive the "could not allocate new session" errors are logged at
+       the "warn" level instead of "alert" and not more often than once per
+       second.
+
+    *) Bugfix: nginx/Windows could not be built with OpenSSL 3.0.x.
+
+    *) Bugfix: in logging of the PROXY protocol errors.
+       Thanks to Sergey Brester.
+
+    *) Workaround: shared memory from the "ssl_session_cache" directive was
+       spent on sessions using TLS session tickets when using TLSv1.3 with
+       OpenSSL.
+
+    *) Workaround: timeout specified with the "ssl_session_timeout"
+       directive did not work when using TLSv1.3 with OpenSSL or BoringSSL.
+
+
+Changes with nginx 1.23.1                                        19 Jul 2022
+
+    *) Feature: memory usage optimization in configurations with SSL
+       proxying.
+
+    *) Feature: looking up of IPv4 addresses while resolving now can be
+       disabled with the "ipv4=off" parameter of the "resolver" directive.
+
+    *) Change: the logging level of the "bad key share", "bad extension",
+       "bad cipher", and "bad ecpoint" SSL errors has been lowered from
+       "crit" to "info".
+
+    *) Bugfix: while returning byte ranges nginx did not remove the
+       "Content-Range" header line if it was present in the original backend
+       response.
+
+    *) Bugfix: a proxied response might be truncated during reconfiguration
+       on Linux; the bug had appeared in 1.17.5.
+
+
+Changes with nginx 1.23.0                                        21 Jun 2022
+
+    *) Change in internal API: now header lines are represented as linked
+       lists.
+
+    *) Change: now nginx combines arbitrary header lines with identical
+       names when sending to FastCGI, SCGI, and uwsgi backends, in the
+       $r->header_in() method of the ngx_http_perl_module, and during lookup
+       of the "$http_...", "$sent_http_...", "$sent_trailer_...",
+       "$upstream_http_...", and "$upstream_trailer_..." variables.
+
+    *) Bugfix: if there were multiple "Vary" header lines in the backend
+       response, nginx only used the last of them when caching.
+
+    *) Bugfix: if there were multiple "WWW-Authenticate" header lines in the
+       backend response and errors with code 401 were intercepted or the
+       "auth_request" directive was used, nginx only sent the first of the
+       header lines to the client.
+
+    *) Change: the logging level of the "application data after close
+       notify" SSL errors has been lowered from "crit" to "info".
+
+    *) Bugfix: connections might hang if nginx was built on Linux 2.6.17 or
+       newer, but was used on systems without EPOLLRDHUP support, notably
+       with epoll emulation layers; the bug had appeared in 1.17.5.
+       Thanks to Marcus Ball.
+
+    *) Bugfix: nginx did not cache the response if the "Expires" response
+       header line disabled caching, but following "Cache-Control" header
+       line enabled caching.
 
 
 Changes with nginx 1.21.6                                        25 Jan 2022
diff --git a/CHANGES.ru b/CHANGES.ru
index 9ee9e11..544f15b 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,5 +1,75 @@
 
-Изменения в nginx 1.22.1                                          19.10.2022
+Изменения в nginx 1.24.0                                          11.04.2023
+
+    *) Стабильная ветка 1.24.x.
+
+
+Изменения в nginx 1.23.4                                          28.03.2023
+
+    *) Изменение: теперь протокол TLSv1.3 разрешён по умолчанию.
+
+    *) Изменение: теперь nginx выдаёт предупреждение при переопределении
+       параметров listen-сокета, задающих используемые протоколы.
+
+    *) Изменение: теперь, если клиент использует pipelining, nginx закрывает
+       соединения с ожиданием дополнительных данных (lingering close).
+
+    *) Добавление: поддержка byte ranges для ответов модуля
+       ngx_http_gzip_static_module.
+
+    *) Исправление: диапазоны портов в директиве listen не работали; ошибка
+       появилась в 1.23.3.
+       Спасибо Валентину Бартеневу.
+
+    *) Исправление: для обработки запроса мог быть выбран неверный location,
+       если в конфигурации использовался префиксный location длиннее 255
+       символов.
+
+    *) Исправление: не-ASCII символы в именах файлов на Windows не
+       поддерживались модулями ngx_http_autoindex_module и
+       ngx_http_dav_module, а также директивой include.
+
+    *) Изменение: уровень логгирования ошибок SSL "data length too long",
+       "length too short", "bad legacy version", "no shared signature
+       algorithms", "bad digest length", "missing sigalgs extension",
+       "encrypted length too long", "bad length", "bad key update", "mixed
+       handshake and non handshake data", "ccs received early", "data
+       between ccs and finished", "packet length too long", "too many warn
+       alerts", "record too small", и "got a fin before a ccs" понижен с
+       уровня crit до info.
+
+    *) Исправление: при использовании HTTP/2 и директивы error_page для
+       перенаправления ошибок с кодом 400 могла происходить утечка сокетов.
+
+    *) Исправление: сообщения об ошибках записи в syslog не содержали
+       информации о том, что ошибки происходили в процессе записи в syslog.
+       Спасибо Safar Safarly.
+
+    *) Изменение: при использовании zlib-ng в логах появлялись сообщения
+       "gzip filter failed to use preallocated memory".
+
+    *) Исправление: в почтовом прокси-сервере.
+
+
+Изменения в nginx 1.23.3                                          13.12.2022
+
+    *) Исправление: при чтении заголовка протокола PROXY версии 2,
+       содержащего большое количество TLV, могла возникать ошибка.
+
+    *) Исправление: при использовании SSI для обработки подзапросов,
+       созданных другими модулями, в рабочем процессе мог произойти
+       segmentation fault.
+       Спасибо Ciel Zhao.
+
+    *) Изменение: теперь, если при преобразовании в адреса имени хоста,
+       указанного в директиве listen, возвращается несколько адресов, nginx
+       игнорирует дубликаты среди этих адресов.
+
+    *) Исправление: nginx мог нагружать процессор при небуферизированном
+       проксировании, если использовались SSL-соединения с бэкендами.
+
+
+Изменения в nginx 1.23.2                                          19.10.2022
 
     *) Безопасность: обработка специально созданного mp4-файла модулем
        ngx_http_mp4_module могла приводить к падению рабочего процесса,
@@ -7,10 +77,84 @@
        потенциально могла иметь другие последствия (CVE-2022-41741,
        CVE-2022-41742).
 
+    *) Добавление: переменные "$proxy_protocol_tlv_...".
 
-Изменения в nginx 1.22.0                                          24.05.2022
+    *) Добавление: ключи шифрования TLS session tickets теперь автоматически
+       меняются при использовании разделяемой памяти в ssl_session_cache.
 
-    *) Стабильная ветка 1.22.x.
+    *) Изменение: уровень логгирования ошибок SSL "bad record type" понижен
+       с уровня crit до info.
+       Спасибо Murilo Andrade.
+
+    *) Изменение: теперь при использовании разделяемой памяти в
+       ssl_session_cache сообщения "could not allocate new session"
+       логгируются на уровне warn вместо alert и не чаще одного раза в
+       секунду.
+
+    *) Исправление: nginx/Windows не собирался с OpenSSL 3.0.x.
+
+    *) Исправление: в логгировании ошибок протокола PROXY.
+       Спасибо Сергею Брестеру.
+
+    *) Изменение: при использовании TLSv1.3 с OpenSSL разделяемая память из
+       ssl_session_cache расходовалась в том числе на сессии, использующие
+       TLS session tickets.
+
+    *) Изменение: таймаут, заданный с помощью директивы ssl_session_timeout,
+       не работал при использовании TLSv1.3 с OpenSSL или BoringSSL.
+
+
+Изменения в nginx 1.23.1                                          19.07.2022
+
+    *) Добавление: оптимизация использования памяти в конфигурациях с
+       SSL-проксированием.
+
+    *) Добавление: теперь с помощью параметра "ipv4=off" директивы
+       "resolver" можно запретить поиск IPv4-адресов при преобразовании имён
+       в адреса.
+
+    *) Изменение: уровень логгирования ошибок SSL "bad key share", "bad
+       extension", "bad cipher" и "bad ecpoint" понижен с уровня crit до
+       info.
+
+    *) Исправление: при возврате диапазонов nginx не удалял строку заголовка
+       "Content-Range", если она присутствовала в исходном ответе бэкенда.
+
+    *) Исправление: проксированный ответ мог быть отправлен не полностью при
+       переконфигурации на Linux; ошибка появилась в 1.17.5.
+
+
+Изменения в nginx 1.23.0                                          21.06.2022
+
+    *) Изменение во внутреннем API: теперь строки заголовков представлены
+       связными списками.
+
+    *) Изменение: теперь nginx объединяет произвольные строки заголовков с
+       одинаковыми именами при отправке на FastCGI-, SCGI- и uwsgi-бэкенды,
+       в методе $r->header_in() модуля ngx_http_perl_module, и при доступе
+       через переменные "$http_...", "$sent_http_...", "$sent_trailer_...",
+       "$upstream_http_..." и "$upstream_trailer_...".
+
+    *) Исправление: если в заголовке ответа бэкенда было несколько строк
+       "Vary", при кэшировании nginx учитывал только последнюю из них.
+
+    *) Исправление: если в заголовке ответа бэкенда было несколько строк
+       "WWW-Authenticate" и использовался перехват ошибок с кодом 401 от
+       бэкенда или директива auth_request, nginx пересылал клиенту только
+       первую из этих строк.
+
+    *) Изменение: уровень логгирования ошибок SSL "application data after
+       close notify" понижен с уровня crit до info.
+
+    *) Исправление: соединения могли зависать, если nginx был собран на
+       Linux 2.6.17 и новее, а использовался на системах без поддержки
+       EPOLLRDHUP, в частности, на системах с эмуляцией epoll; ошибка
+       появилась в 1.17.5.
+       Спасибо Marcus Ball.
+
+    *) Исправление: nginx не кэшировал ответ, если строка заголовка ответа
+       "Expires" запрещала кэширование, а последующая строка заголовка
+       "Cache-Control" разрешала кэширование.
 
 
 Изменения в nginx 1.21.6                                          25.01.2022
diff --git a/auto/cc/conf b/auto/cc/conf
index afbca62..ba31cb8 100644
--- a/auto/cc/conf
+++ b/auto/cc/conf
@@ -117,7 +117,7 @@ else
             . auto/cc/acc
         ;;
 
-        msvc*)
+        msvc)
             # MSVC++ 6.0 SP2, MSVC++ Toolkit 2003
 
             . auto/cc/msvc
diff --git a/auto/cc/msvc b/auto/cc/msvc
index 68435ff..567bac7 100644
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -11,8 +11,8 @@
 # MSVC 2015 (14.0)                        cl 19.00
 
 
-NGX_MSVC_VER=`$NGX_WINE $CC 2>&1 | grep 'Compiler Version' 2>&1 \
-                                 | sed -e 's/^.* Version \(.*\)/\1/'`
+NGX_MSVC_VER=`$NGX_WINE $CC 2>&1 | grep 'C/C++.* [0-9][0-9]*\.[0-9]' 2>&1 \
+                                 | sed -e 's/^.* \([0-9][0-9]*\.[0-9].*\)/\1/'`
 
 echo " + cl version: $NGX_MSVC_VER"
 
@@ -22,6 +22,21 @@ have=NGX_COMPILER value="\"cl $NGX_MSVC_VER\"" . auto/define
 ngx_msvc_ver=`echo $NGX_MSVC_VER | sed -e 's/^\([0-9]*\).*/\1/'`
 
 
+# detect x64 builds
+
+case "$NGX_MSVC_VER" in
+
+    *x64)
+        NGX_MACHINE=amd64
+    ;;
+
+    *)
+        NGX_MACHINE=i386
+    ;;
+
+esac
+
+
 # optimizations
 
 # maximize speed, equivalent to -Og -Oi -Ot -Oy -Ob2 -Gs -GF -Gy
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index 126a238..a7e9369 100644
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -7,11 +7,24 @@ case "$CC" in
 
     cl)
 
+        case "$NGX_MACHINE" in
+
+            amd64)
+                OPENSSL_TARGET=VC-WIN64A
+            ;;
+
+            *)
+                OPENSSL_TARGET=VC-WIN32
+            ;;
+
+        esac
+
         cat << END                                            >> $NGX_MAKEFILE
 
 $OPENSSL/openssl/include/openssl/ssl.h:	$NGX_MAKEFILE
 	\$(MAKE) -f auto/lib/openssl/makefile.msvc			\
-		OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT"
+		OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT"		\
+		OPENSSL_TARGET="$OPENSSL_TARGET"
 
 END
 
diff --git a/auto/lib/openssl/makefile.msvc b/auto/lib/openssl/makefile.msvc
index 5b90dcb..ed17cde 100644
--- a/auto/lib/openssl/makefile.msvc
+++ b/auto/lib/openssl/makefile.msvc
@@ -6,7 +6,7 @@
 all:
 	cd $(OPENSSL)
 
-	perl Configure VC-WIN32 no-shared				\
+	perl Configure $(OPENSSL_TARGET) no-shared no-threads		\
 		--prefix="%cd%/openssl" 				\
 		--openssldir="%cd%/openssl/ssl" 			\
 		$(OPENSSL_OPT)
diff --git a/auto/os/conf b/auto/os/conf
index 7c6cb69..d7f6e03 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -110,7 +110,7 @@ case "$NGX_MACHINE" in
         NGX_MACH_CACHE_LINE=64
     ;;
 
-    aarch64 )
+    aarch64 | arm64)
         have=NGX_ALIGNMENT value=16 . auto/define
         NGX_MACH_CACHE_LINE=64
     ;;
diff --git a/auto/os/linux b/auto/os/linux
index 74b5870..eb67026 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -232,4 +232,19 @@ ngx_feature_test="struct crypt_data  cd;
 ngx_include="sys/vfs.h";     . auto/include
 
 
+# UDP segmentation offloading
+
+ngx_feature="UDP_SEGMENT"
+ngx_feature_name="NGX_HAVE_UDP_SEGMENT"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/udp.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="socklen_t optlen = sizeof(int);
+                  int val;
+                  getsockopt(0, SOL_UDP, UDP_SEGMENT, &val, &optlen)"
+. auto/feature
+
+
 CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
diff --git a/auto/sources b/auto/sources
index 156f797..a539093 100644
--- a/auto/sources
+++ b/auto/sources
@@ -89,7 +89,8 @@ EVENT_DEPS="src/event/ngx_event.h \
             src/event/ngx_event_timer.h \
             src/event/ngx_event_posted.h \
             src/event/ngx_event_connect.h \
-            src/event/ngx_event_pipe.h"
+            src/event/ngx_event_pipe.h \
+            src/event/ngx_event_udp.h"
 
 EVENT_SRCS="src/event/ngx_event.c \
             src/event/ngx_event_timer.c \
diff --git a/configure b/configure
index 474d69e..5b88ebb 100755
--- a/configure
+++ b/configure
@@ -44,6 +44,7 @@ if test -z "$NGX_PLATFORM"; then
 else
     echo "building for $NGX_PLATFORM"
     NGX_SYSTEM=$NGX_PLATFORM
+    NGX_MACHINE=i386
 fi
 
 . auto/cc/conf
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 6828cd3..7d587fc 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -111,19 +111,14 @@ syn keyword ngxDirectiveControl contained set
 syn keyword ngxDirectiveError contained error_page
 syn keyword ngxDirectiveError contained post_action
 
-syn keyword ngxDirectiveDeprecated contained limit_zone
 syn keyword ngxDirectiveDeprecated contained proxy_downstream_buffer
 syn keyword ngxDirectiveDeprecated contained proxy_upstream_buffer
-syn keyword ngxDirectiveDeprecated contained spdy_chunk_size
-syn keyword ngxDirectiveDeprecated contained spdy_headers_comp
-syn keyword ngxDirectiveDeprecated contained spdy_keepalive_timeout
-syn keyword ngxDirectiveDeprecated contained spdy_max_concurrent_streams
-syn keyword ngxDirectiveDeprecated contained spdy_pool_size
-syn keyword ngxDirectiveDeprecated contained spdy_recv_buffer_size
-syn keyword ngxDirectiveDeprecated contained spdy_recv_timeout
-syn keyword ngxDirectiveDeprecated contained spdy_streams_index_size
 syn keyword ngxDirectiveDeprecated contained ssl
-syn keyword ngxDirectiveDeprecated contained upstream_conf
+syn keyword ngxDirectiveDeprecated contained http2_idle_timeout
+syn keyword ngxDirectiveDeprecated contained http2_max_field_size
+syn keyword ngxDirectiveDeprecated contained http2_max_header_size
+syn keyword ngxDirectiveDeprecated contained http2_max_requests
+syn keyword ngxDirectiveDeprecated contained http2_recv_timeout
 
 syn keyword ngxDirective contained absolute_redirect
 syn keyword ngxDirective contained accept_mutex
@@ -152,6 +147,7 @@ syn keyword ngxDirective contained auth_http_timeout
 syn keyword ngxDirective contained auth_jwt
 syn keyword ngxDirective contained auth_jwt_claim_set
 syn keyword ngxDirective contained auth_jwt_header_set
+syn keyword ngxDirective contained auth_jwt_key_cache
 syn keyword ngxDirective contained auth_jwt_key_file
 syn keyword ngxDirective contained auth_jwt_key_request
 syn keyword ngxDirective contained auth_jwt_leeway
@@ -309,17 +305,12 @@ syn keyword ngxDirective contained hls_mp4_buffer_size
 syn keyword ngxDirective contained hls_mp4_max_buffer_size
 syn keyword ngxDirective contained http2_body_preread_size
 syn keyword ngxDirective contained http2_chunk_size
-syn keyword ngxDirective contained http2_idle_timeout
 syn keyword ngxDirective contained http2_max_concurrent_pushes
 syn keyword ngxDirective contained http2_max_concurrent_streams
-syn keyword ngxDirective contained http2_max_field_size
-syn keyword ngxDirective contained http2_max_header_size
-syn keyword ngxDirective contained http2_max_requests
 syn keyword ngxDirective contained http2_pool_size
 syn keyword ngxDirective contained http2_push
 syn keyword ngxDirective contained http2_push_preload
 syn keyword ngxDirective contained http2_recv_buffer_size
-syn keyword ngxDirective contained http2_recv_timeout
 syn keyword ngxDirective contained http2_streams_index_size
 syn keyword ngxDirective contained if_modified_since
 syn keyword ngxDirective contained ignore_invalid_headers
@@ -339,14 +330,17 @@ syn keyword ngxDirective contained ip_hash
 syn keyword ngxDirective contained js_access
 syn keyword ngxDirective contained js_body_filter
 syn keyword ngxDirective contained js_content
+syn keyword ngxDirective contained js_fetch_buffer_size
 syn keyword ngxDirective contained js_fetch_ciphers
+syn keyword ngxDirective contained js_fetch_max_response_buffer_size
 syn keyword ngxDirective contained js_fetch_protocols
+syn keyword ngxDirective contained js_fetch_timeout
 syn keyword ngxDirective contained js_fetch_trusted_certificate
+syn keyword ngxDirective contained js_fetch_verify
 syn keyword ngxDirective contained js_fetch_verify_depth
 syn keyword ngxDirective contained js_filter
 syn keyword ngxDirective contained js_header_filter
 syn keyword ngxDirective contained js_import
-syn keyword ngxDirective contained js_include
 syn keyword ngxDirective contained js_path
 syn keyword ngxDirective contained js_preread
 syn keyword ngxDirective contained js_set
@@ -391,7 +385,6 @@ syn keyword ngxDirective contained max_ranges
 syn keyword ngxDirective contained memcached_bind
 syn keyword ngxDirective contained memcached_buffer_size
 syn keyword ngxDirective contained memcached_connect_timeout
-syn keyword ngxDirective contained memcached_force_ranges
 syn keyword ngxDirective contained memcached_gzip_flag
 syn keyword ngxDirective contained memcached_next_upstream
 syn keyword ngxDirective contained memcached_next_upstream_timeout
@@ -645,7 +638,6 @@ syn keyword ngxDirective contained status
 syn keyword ngxDirective contained status_format
 syn keyword ngxDirective contained status_zone
 syn keyword ngxDirective contained sticky
-syn keyword ngxDirective contained sticky_cookie_insert
 syn keyword ngxDirective contained stub_status
 syn keyword ngxDirective contained sub_filter
 syn keyword ngxDirective contained sub_filter_last_modified
@@ -774,62 +766,14 @@ syn keyword ngxDirective contained zone_sync_ssl_verify
 syn keyword ngxDirective contained zone_sync_ssl_verify_depth
 syn keyword ngxDirective contained zone_sync_timeout
 
+
 " 3rd party modules list taken from
-" https://github.com/freebsd/freebsd-ports/blob/master/www/nginx-devel/Makefile
-" -----------------------------------------------------------------------------
+" https://github.com/freebsd/freebsd-ports/blob/main/www/nginx-devel/Makefile.extmod
+" ----------------------------------------------------------------------------------
 
-" Accept Language
-" https://github.com/giom/nginx_accept_language_module
-syn keyword ngxDirectiveThirdParty contained set_from_accept_language
-
-" Digest Authentication
-" https://github.com/atomx/nginx-http-auth-digest
-syn keyword ngxDirectiveThirdParty contained auth_digest
-syn keyword ngxDirectiveThirdParty contained auth_digest_drop_time
-syn keyword ngxDirectiveThirdParty contained auth_digest_evasion_time
-syn keyword ngxDirectiveThirdParty contained auth_digest_expires
-syn keyword ngxDirectiveThirdParty contained auth_digest_maxtries
-syn keyword ngxDirectiveThirdParty contained auth_digest_replays
-syn keyword ngxDirectiveThirdParty contained auth_digest_shm_size
-syn keyword ngxDirectiveThirdParty contained auth_digest_timeout
-syn keyword ngxDirectiveThirdParty contained auth_digest_user_file
-
-" SPNEGO Authentication
-" https://github.com/stnoonan/spnego-http-auth-nginx-module
-syn keyword ngxDirectiveThirdParty contained auth_gss
-syn keyword ngxDirectiveThirdParty contained auth_gss_allow_basic_fallback
-syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal
-syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal_regex
-syn keyword ngxDirectiveThirdParty contained auth_gss_constrained_delegation
-syn keyword ngxDirectiveThirdParty contained auth_gss_delegate_credentials
-syn keyword ngxDirectiveThirdParty contained auth_gss_force_realm
-syn keyword ngxDirectiveThirdParty contained auth_gss_format_full
-syn keyword ngxDirectiveThirdParty contained auth_gss_keytab
-syn keyword ngxDirectiveThirdParty contained auth_gss_map_to_local
-syn keyword ngxDirectiveThirdParty contained auth_gss_realm
-syn keyword ngxDirectiveThirdParty contained auth_gss_service_ccache
-syn keyword ngxDirectiveThirdParty contained auth_gss_service_name
-
-" LDAP Authentication
-" https://github.com/kvspb/nginx-auth-ldap
-syn keyword ngxDirectiveThirdParty contained auth_ldap
-syn keyword ngxDirectiveThirdParty contained auth_ldap_cache_enabled
-syn keyword ngxDirectiveThirdParty contained auth_ldap_cache_expiration_time
-syn keyword ngxDirectiveThirdParty contained auth_ldap_cache_size
-syn keyword ngxDirectiveThirdParty contained auth_ldap_servers
-syn keyword ngxDirectiveThirdParty contained auth_ldap_servers_size
-syn keyword ngxDirectiveThirdParty contained ldap_server
-
-" PAM Authentication
-" https://github.com/sto/ngx_http_auth_pam_module
-syn keyword ngxDirectiveThirdParty contained auth_pam
-syn keyword ngxDirectiveThirdParty contained auth_pam_service_name
-syn keyword ngxDirectiveThirdParty contained auth_pam_set_pam_env
-
-" AJP protocol proxy
-" https://github.com/yaoweibin/nginx_ajp_module
-syn keyword ngxDirectiveThirdParty contained ajp_buffers
+" https://github.com/msva/nginx_ajp_module
 syn keyword ngxDirectiveThirdParty contained ajp_buffer_size
+syn keyword ngxDirectiveThirdParty contained ajp_buffers
 syn keyword ngxDirectiveThirdParty contained ajp_busy_buffers_size
 syn keyword ngxDirectiveThirdParty contained ajp_cache
 syn keyword ngxDirectiveThirdParty contained ajp_cache_key
@@ -850,11 +794,13 @@ syn keyword ngxDirectiveThirdParty contained ajp_keep_conn
 syn keyword ngxDirectiveThirdParty contained ajp_max_data_packet_size
 syn keyword ngxDirectiveThirdParty contained ajp_max_temp_file_size
 syn keyword ngxDirectiveThirdParty contained ajp_next_upstream
+syn keyword ngxDirectiveThirdParty contained ajp_param
 syn keyword ngxDirectiveThirdParty contained ajp_pass
 syn keyword ngxDirectiveThirdParty contained ajp_pass_header
 syn keyword ngxDirectiveThirdParty contained ajp_pass_request_body
 syn keyword ngxDirectiveThirdParty contained ajp_pass_request_headers
 syn keyword ngxDirectiveThirdParty contained ajp_read_timeout
+syn keyword ngxDirectiveThirdParty contained ajp_script_url
 syn keyword ngxDirectiveThirdParty contained ajp_secret
 syn keyword ngxDirectiveThirdParty contained ajp_send_lowat
 syn keyword ngxDirectiveThirdParty contained ajp_send_timeout
@@ -865,7 +811,12 @@ syn keyword ngxDirectiveThirdParty contained ajp_temp_path
 syn keyword ngxDirectiveThirdParty contained ajp_upstream_fail_timeout
 syn keyword ngxDirectiveThirdParty contained ajp_upstream_max_fails
 
-" AWS proxy
+" https://github.com/openresty/array-var-nginx-module
+syn keyword ngxDirectiveThirdParty contained array_join
+syn keyword ngxDirectiveThirdParty contained array_map
+syn keyword ngxDirectiveThirdParty contained array_map_op
+syn keyword ngxDirectiveThirdParty contained array_split
+
 " https://github.com/anomalizer/ngx_aws_auth
 syn keyword ngxDirectiveThirdParty contained aws_access_key
 syn keyword ngxDirectiveThirdParty contained aws_endpoint
@@ -874,7 +825,18 @@ syn keyword ngxDirectiveThirdParty contained aws_s3_bucket
 syn keyword ngxDirectiveThirdParty contained aws_sign
 syn keyword ngxDirectiveThirdParty contained aws_signing_key
 
-" embedding Clojure or Java or Groovy programs
+" https://github.com/google/ngx_brotli
+syn keyword ngxDirectiveThirdParty contained brotli
+syn keyword ngxDirectiveThirdParty contained brotli_buffers
+syn keyword ngxDirectiveThirdParty contained brotli_comp_level
+syn keyword ngxDirectiveThirdParty contained brotli_min_length
+syn keyword ngxDirectiveThirdParty contained brotli_static
+syn keyword ngxDirectiveThirdParty contained brotli_types
+syn keyword ngxDirectiveThirdParty contained brotli_window
+
+" https://github.com/torden/ngx_cache_purge
+syn keyword ngxDirectiveThirdParty contained cache_purge_response_type
+
 " https://github.com/nginx-clojure/nginx-clojure
 syn keyword ngxDirectiveThirdParty contained access_handler_code
 syn keyword ngxDirectiveThirdParty contained access_handler_name
@@ -892,8 +854,8 @@ syn keyword ngxDirectiveThirdParty contained content_handler_property
 syn keyword ngxDirectiveThirdParty contained content_handler_type
 syn keyword ngxDirectiveThirdParty contained handler_code
 syn keyword ngxDirectiveThirdParty contained handler_name
-syn keyword ngxDirectiveThirdParty contained handlers_lazy_init
 syn keyword ngxDirectiveThirdParty contained handler_type
+syn keyword ngxDirectiveThirdParty contained handlers_lazy_init
 syn keyword ngxDirectiveThirdParty contained header_filter_code
 syn keyword ngxDirectiveThirdParty contained header_filter_name
 syn keyword ngxDirectiveThirdParty contained header_filter_property
@@ -921,18 +883,20 @@ syn keyword ngxDirectiveThirdParty contained rewrite_handler_type
 syn keyword ngxDirectiveThirdParty contained shared_map
 syn keyword ngxDirectiveThirdParty contained write_page_size
 
+" https://github.com/AirisX/nginx_cookie_flag_module
+syn keyword ngxDirectiveThirdParty contained set_cookie_flag
 
-" Certificate Transparency
 " https://github.com/grahamedgecombe/nginx-ct
 syn keyword ngxDirectiveThirdParty contained ssl_ct
 syn keyword ngxDirectiveThirdParty contained ssl_ct_static_scts
 
-" ngx_echo
 " https://github.com/openresty/echo-nginx-module
+syn keyword ngxDirectiveThirdParty contained echo
 syn keyword ngxDirectiveThirdParty contained echo_abort_parent
 syn keyword ngxDirectiveThirdParty contained echo_after_body
 syn keyword ngxDirectiveThirdParty contained echo_before_body
 syn keyword ngxDirectiveThirdParty contained echo_blocking_sleep
+syn keyword ngxDirectiveThirdParty contained echo_duplicate
 syn keyword ngxDirectiveThirdParty contained echo_end
 syn keyword ngxDirectiveThirdParty contained echo_exec
 syn keyword ngxDirectiveThirdParty contained echo_flush
@@ -942,28 +906,124 @@ syn keyword ngxDirectiveThirdParty contained echo_location_async
 syn keyword ngxDirectiveThirdParty contained echo_read_request_body
 syn keyword ngxDirectiveThirdParty contained echo_request_body
 syn keyword ngxDirectiveThirdParty contained echo_reset_timer
+syn keyword ngxDirectiveThirdParty contained echo_sleep
 syn keyword ngxDirectiveThirdParty contained echo_status
 syn keyword ngxDirectiveThirdParty contained echo_subrequest
 syn keyword ngxDirectiveThirdParty contained echo_subrequest_async
 
-" FastDFS
-" https://github.com/happyfish100/fastdfs-nginx-module
-syn keyword ngxDirectiveThirdParty contained ngx_fastdfs_module
+" https://github.com/openresty/drizzle-nginx-module
+syn keyword ngxDirectiveThirdParty contained drizzle_buffer_size
+syn keyword ngxDirectiveThirdParty contained drizzle_connect_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_dbname
+syn keyword ngxDirectiveThirdParty contained drizzle_keepalive
+syn keyword ngxDirectiveThirdParty contained drizzle_module_header
+syn keyword ngxDirectiveThirdParty contained drizzle_pass
+syn keyword ngxDirectiveThirdParty contained drizzle_query
+syn keyword ngxDirectiveThirdParty contained drizzle_recv_cols_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_recv_rows_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_send_query_timeout
+syn keyword ngxDirectiveThirdParty contained drizzle_server
+syn keyword ngxDirectiveThirdParty contained drizzle_status
+
+" https://github.com/ZigzagAK/ngx_dynamic_upstream
+syn keyword ngxDirectiveThirdParty contained dns_add_down
+syn keyword ngxDirectiveThirdParty contained dns_ipv6
+syn keyword ngxDirectiveThirdParty contained dns_update
+syn keyword ngxDirectiveThirdParty contained dynamic_state_file
+syn keyword ngxDirectiveThirdParty contained dynamic_upstream
+
+" https://github.com/ZigzagAK/ngx_dynamic_healthcheck
+syn keyword ngxDirectiveThirdParty contained check
+syn keyword ngxDirectiveThirdParty contained check_disable_host
+syn keyword ngxDirectiveThirdParty contained check_exclude_host
+syn keyword ngxDirectiveThirdParty contained check_persistent
+syn keyword ngxDirectiveThirdParty contained check_request_body
+syn keyword ngxDirectiveThirdParty contained check_request_headers
+syn keyword ngxDirectiveThirdParty contained check_request_uri
+syn keyword ngxDirectiveThirdParty contained check_response_body
+syn keyword ngxDirectiveThirdParty contained check_response_codes
+syn keyword ngxDirectiveThirdParty contained healthcheck
+syn keyword ngxDirectiveThirdParty contained healthcheck_buffer_size
+syn keyword ngxDirectiveThirdParty contained healthcheck_disable_host
+syn keyword ngxDirectiveThirdParty contained healthcheck_get
+syn keyword ngxDirectiveThirdParty contained healthcheck_persistent
+syn keyword ngxDirectiveThirdParty contained healthcheck_request_body
+syn keyword ngxDirectiveThirdParty contained healthcheck_request_headers
+syn keyword ngxDirectiveThirdParty contained healthcheck_request_uri
+syn keyword ngxDirectiveThirdParty contained healthcheck_response_body
+syn keyword ngxDirectiveThirdParty contained healthcheck_response_codes
+syn keyword ngxDirectiveThirdParty contained healthcheck_status
+syn keyword ngxDirectiveThirdParty contained healthcheck_update
+
+" https://github.com/openresty/encrypted-session-nginx-module
+syn keyword ngxDirectiveThirdParty contained encrypted_session_expires
+syn keyword ngxDirectiveThirdParty contained encrypted_session_iv
+syn keyword ngxDirectiveThirdParty contained encrypted_session_key
+syn keyword ngxDirectiveThirdParty contained set_decrypt_session
+syn keyword ngxDirectiveThirdParty contained set_encrypt_session
+
+" https://github.com/calio/form-input-nginx-module
+syn keyword ngxDirectiveThirdParty contained set_form_input
+syn keyword ngxDirectiveThirdParty contained set_form_input_multi
+
+" https://github.com/nieoding/nginx-gridfs
+syn keyword ngxDirectiveThirdParty contained gridfs
+syn keyword ngxDirectiveThirdParty contained mongo
 
-" ngx_headers_more
 " https://github.com/openresty/headers-more-nginx-module
 syn keyword ngxDirectiveThirdParty contained more_clear_headers
 syn keyword ngxDirectiveThirdParty contained more_clear_input_headers
 syn keyword ngxDirectiveThirdParty contained more_set_headers
 syn keyword ngxDirectiveThirdParty contained more_set_input_headers
 
-" NGINX WebDAV missing commands support (PROPFIND & OPTIONS)
+" https://github.com/dvershinin/nginx_accept_language_module
+syn keyword ngxDirectiveThirdParty contained set_from_accept_language
+
+" https://github.com/atomx/nginx-http-auth-digest
+syn keyword ngxDirectiveThirdParty contained auth_digest
+syn keyword ngxDirectiveThirdParty contained auth_digest_drop_time
+syn keyword ngxDirectiveThirdParty contained auth_digest_evasion_time
+syn keyword ngxDirectiveThirdParty contained auth_digest_expires
+syn keyword ngxDirectiveThirdParty contained auth_digest_maxtries
+syn keyword ngxDirectiveThirdParty contained auth_digest_replays
+syn keyword ngxDirectiveThirdParty contained auth_digest_shm_size
+syn keyword ngxDirectiveThirdParty contained auth_digest_timeout
+syn keyword ngxDirectiveThirdParty contained auth_digest_user_file
+
+" https://github.com/stnoonan/spnego-http-auth-nginx-module
+syn keyword ngxDirectiveThirdParty contained auth_gss
+syn keyword ngxDirectiveThirdParty contained auth_gss_allow_basic_fallback
+syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal
+syn keyword ngxDirectiveThirdParty contained auth_gss_authorized_principal_regex
+syn keyword ngxDirectiveThirdParty contained auth_gss_constrained_delegation
+syn keyword ngxDirectiveThirdParty contained auth_gss_delegate_credentials
+syn keyword ngxDirectiveThirdParty contained auth_gss_force_realm
+syn keyword ngxDirectiveThirdParty contained auth_gss_format_full
+syn keyword ngxDirectiveThirdParty contained auth_gss_keytab
+syn keyword ngxDirectiveThirdParty contained auth_gss_map_to_local
+syn keyword ngxDirectiveThirdParty contained auth_gss_realm
+syn keyword ngxDirectiveThirdParty contained auth_gss_service_ccache
+syn keyword ngxDirectiveThirdParty contained auth_gss_service_name
+
+" https://github.com/kvspb/nginx-auth-ldap
+syn keyword ngxDirectiveThirdParty contained auth_ldap
+syn keyword ngxDirectiveThirdParty contained auth_ldap_cache_enabled
+syn keyword ngxDirectiveThirdParty contained auth_ldap_cache_expiration_time
+syn keyword ngxDirectiveThirdParty contained auth_ldap_cache_size
+syn keyword ngxDirectiveThirdParty contained auth_ldap_servers
+syn keyword ngxDirectiveThirdParty contained auth_ldap_servers_size
+syn keyword ngxDirectiveThirdParty contained ldap_server
+
+" https://github.com/sto/ngx_http_auth_pam_module
+syn keyword ngxDirectiveThirdParty contained auth_pam
+syn keyword ngxDirectiveThirdParty contained auth_pam_service_name
+syn keyword ngxDirectiveThirdParty contained auth_pam_set_pam_env
+
 " https://github.com/arut/nginx-dav-ext-module
 syn keyword ngxDirectiveThirdParty contained dav_ext_lock
 syn keyword ngxDirectiveThirdParty contained dav_ext_lock_zone
 syn keyword ngxDirectiveThirdParty contained dav_ext_methods
 
-" ngx_eval
 " https://github.com/openresty/nginx-eval-module
 syn keyword ngxDirectiveThirdParty contained eval
 syn keyword ngxDirectiveThirdParty contained eval_buffer_size
@@ -971,7 +1031,6 @@ syn keyword ngxDirectiveThirdParty contained eval_escalate
 syn keyword ngxDirectiveThirdParty contained eval_override_content_type
 syn keyword ngxDirectiveThirdParty contained eval_subrequest_in_memory
 
-" Fancy Index
 " https://github.com/aperezdc/ngx-fancyindex
 syn keyword ngxDirectiveThirdParty contained fancyindex
 syn keyword ngxDirectiveThirdParty contained fancyindex_css_href
@@ -988,40 +1047,29 @@ syn keyword ngxDirectiveThirdParty contained fancyindex_show_dotfiles
 syn keyword ngxDirectiveThirdParty contained fancyindex_show_path
 syn keyword ngxDirectiveThirdParty contained fancyindex_time_format
 
-" Footer filter
 " https://github.com/alibaba/nginx-http-footer-filter
 syn keyword ngxDirectiveThirdParty contained footer
 syn keyword ngxDirectiveThirdParty contained footer_types
 
-" ngx_http_geoip2_module
 " https://github.com/leev/ngx_http_geoip2_module
 syn keyword ngxDirectiveThirdParty contained geoip2
 syn keyword ngxDirectiveThirdParty contained geoip2_proxy
 syn keyword ngxDirectiveThirdParty contained geoip2_proxy_recursive
 
-" A version of the Nginx HTTP stub status module that outputs in JSON format
-" https://github.com/nginx-modules/nginx-json-status-module
-syn keyword ngxDirectiveThirdParty contained json_status
-syn keyword ngxDirectiveThirdParty contained json_status_type
+" https://github.com/ip2location/ip2location-nginx
+syn keyword ngxDirectiveThirdParty contained ip2location_database
+syn keyword ngxDirectiveThirdParty contained ip2location_proxy
+syn keyword ngxDirectiveThirdParty contained ip2location_proxy_recursive
 
-" MogileFS client for nginx
-" https://github.com/vkholodkov/nginx-mogilefs-module
-syn keyword ngxDirectiveThirdParty contained mogilefs_class
-syn keyword ngxDirectiveThirdParty contained mogilefs_connect_timeout
-syn keyword ngxDirectiveThirdParty contained mogilefs_domain
-syn keyword ngxDirectiveThirdParty contained mogilefs_methods
-syn keyword ngxDirectiveThirdParty contained mogilefs_noverify
-syn keyword ngxDirectiveThirdParty contained mogilefs_pass
-syn keyword ngxDirectiveThirdParty contained mogilefs_read_timeout
-syn keyword ngxDirectiveThirdParty contained mogilefs_send_timeout
-syn keyword ngxDirectiveThirdParty contained mogilefs_tracker
+" https://github.com/ip2location/ip2proxy-nginx
+syn keyword ngxDirectiveThirdParty contained ip2proxy_database
+syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy
+syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy_recursive
 
-" Ancient nginx plugin; probably not useful to anyone
 " https://github.com/kr/nginx-notice
 syn keyword ngxDirectiveThirdParty contained notice
 syn keyword ngxDirectiveThirdParty contained notice_type
 
-" nchan
 " https://github.com/slact/nchan
 syn keyword ngxDirectiveThirdParty contained nchan_access_control_allow_credentials
 syn keyword ngxDirectiveThirdParty contained nchan_access_control_allow_origin
@@ -1034,8 +1082,8 @@ syn keyword ngxDirectiveThirdParty contained nchan_benchmark_publisher_distribut
 syn keyword ngxDirectiveThirdParty contained nchan_benchmark_subscriber_distribution
 syn keyword ngxDirectiveThirdParty contained nchan_benchmark_subscribers_per_channel
 syn keyword ngxDirectiveThirdParty contained nchan_benchmark_time
-syn keyword ngxDirectiveThirdParty contained nchan_channel_events_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_channel_event_string
+syn keyword ngxDirectiveThirdParty contained nchan_channel_events_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_channel_group
 syn keyword ngxDirectiveThirdParty contained nchan_channel_group_accounting
 syn keyword ngxDirectiveThirdParty contained nchan_channel_id
@@ -1074,11 +1122,25 @@ syn keyword ngxDirectiveThirdParty contained nchan_pubsub
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_location
 syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval_backoff
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval_jitter
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval_max
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval_min
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_connect_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_max_failing_time
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_recovery_delay
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_recovery_delay_backoff
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_recovery_delay_jitter
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_recovery_delay_max
+syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_recovery_delay_min
+syn keyword ngxDirectiveThirdParty contained nchan_redis_command_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_redis_connect_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_redis_discovered_ip_range_blacklist
 syn keyword ngxDirectiveThirdParty contained nchan_redis_fakesub_timer_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_cache_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_redis_load_scripts_unconditionally
 syn keyword ngxDirectiveThirdParty contained nchan_redis_namespace
+syn keyword ngxDirectiveThirdParty contained nchan_redis_node_connect_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_redis_nostore_fastpublish
 syn keyword ngxDirectiveThirdParty contained nchan_redis_optimize_target
 syn keyword ngxDirectiveThirdParty contained nchan_redis_pass
@@ -1086,6 +1148,13 @@ syn keyword ngxDirectiveThirdParty contained nchan_redis_pass_inheritable
 syn keyword ngxDirectiveThirdParty contained nchan_redis_password
 syn keyword ngxDirectiveThirdParty contained nchan_redis_ping_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_publish_msgpacked_max_size
+syn keyword ngxDirectiveThirdParty contained nchan_redis_reconnect_delay
+syn keyword ngxDirectiveThirdParty contained nchan_redis_reconnect_delay_backoff
+syn keyword ngxDirectiveThirdParty contained nchan_redis_reconnect_delay_jitter
+syn keyword ngxDirectiveThirdParty contained nchan_redis_reconnect_delay_max
+syn keyword ngxDirectiveThirdParty contained nchan_redis_reconnect_delay_min
+syn keyword ngxDirectiveThirdParty contained nchan_redis_retry_commands
+syn keyword ngxDirectiveThirdParty contained nchan_redis_retry_commands_max_wait
 syn keyword ngxDirectiveThirdParty contained nchan_redis_server
 syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl
 syn keyword ngxDirectiveThirdParty contained nchan_redis_ssl_ciphers
@@ -1113,10 +1182,10 @@ syn keyword ngxDirectiveThirdParty contained nchan_store_messages
 syn keyword ngxDirectiveThirdParty contained nchan_stub_status
 syn keyword ngxDirectiveThirdParty contained nchan_sub_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_subscribe_existing_channels_only
+syn keyword ngxDirectiveThirdParty contained nchan_subscribe_request
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_compound_etag_message_id
-syn keyword ngxDirectiveThirdParty contained nchan_subscribe_request
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_first_message
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_http_raw_stream_separator
 syn keyword ngxDirectiveThirdParty contained nchan_subscriber_info
@@ -1145,7 +1214,6 @@ syn keyword ngxDirectiveThirdParty contained push_subscriber
 syn keyword ngxDirectiveThirdParty contained push_subscriber_concurrency
 syn keyword ngxDirectiveThirdParty contained push_subscriber_timeout
 
-" Push Stream
 " https://github.com/wandenberg/nginx-push-stream-module
 syn keyword ngxDirectiveThirdParty contained push_stream_allow_connections_to_events_channel
 syn keyword ngxDirectiveThirdParty contained push_stream_allowed_origins
@@ -1184,23 +1252,6 @@ syn keyword ngxDirectiveThirdParty contained push_stream_websocket_allow_publish
 syn keyword ngxDirectiveThirdParty contained push_stream_wildcard_channel_max_qtd
 syn keyword ngxDirectiveThirdParty contained push_stream_wildcard_channel_prefix
 
-" redis module
-" https://www.nginx.com/resources/wiki/modules/redis/
-syn keyword ngxDirectiveThirdParty contained redis_bind
-syn keyword ngxDirectiveThirdParty contained redis_buffer_size
-syn keyword ngxDirectiveThirdParty contained redis_connect_timeout
-syn keyword ngxDirectiveThirdParty contained redis_gzip_flag
-syn keyword ngxDirectiveThirdParty contained redis_next_upstream
-syn keyword ngxDirectiveThirdParty contained redis_pass
-syn keyword ngxDirectiveThirdParty contained redis_read_timeout
-syn keyword ngxDirectiveThirdParty contained redis_send_timeout
-
-" ngx_http_response
-" http://catap.ru/downloads/nginx/
-syn keyword ngxDirectiveThirdParty contained response
-syn keyword ngxDirectiveThirdParty contained response_type
-
-" nginx_substitutions_filter
 " https://github.com/yaoweibin/ngx_http_substitutions_filter_module
 syn keyword ngxDirectiveThirdParty contained subs_buffers
 syn keyword ngxDirectiveThirdParty contained subs_filter
@@ -1208,7 +1259,6 @@ syn keyword ngxDirectiveThirdParty contained subs_filter_bypass
 syn keyword ngxDirectiveThirdParty contained subs_filter_types
 syn keyword ngxDirectiveThirdParty contained subs_line_buffer_size
 
-" Tarantool nginx upstream module
 " https://github.com/tarantool/nginx_upstream_module
 syn keyword ngxDirectiveThirdParty contained tnt_allowed_indexes
 syn keyword ngxDirectiveThirdParty contained tnt_allowed_spaces
@@ -1238,44 +1288,28 @@ syn keyword ngxDirectiveThirdParty contained tnt_set_header
 syn keyword ngxDirectiveThirdParty contained tnt_update
 syn keyword ngxDirectiveThirdParty contained tnt_upsert
 
-" A module for nginx web server for handling file uploads using multipart/form-data encoding (RFC 1867)
-" https://github.com/Austinb/nginx-upload-module
+" https://github.com/fdintino/nginx-upload-module
+syn keyword ngxDirectiveThirdParty contained upload_add_header
 syn keyword ngxDirectiveThirdParty contained upload_aggregate_form_field
-syn keyword ngxDirectiveThirdParty contained upload_archive_elm
-syn keyword ngxDirectiveThirdParty contained upload_archive_elm_separator
-syn keyword ngxDirectiveThirdParty contained upload_archive_path
-syn keyword ngxDirectiveThirdParty contained upload_archive_path_separator
 syn keyword ngxDirectiveThirdParty contained upload_buffer_size
 syn keyword ngxDirectiveThirdParty contained upload_cleanup
-syn keyword ngxDirectiveThirdParty contained upload_content_type
-syn keyword ngxDirectiveThirdParty contained upload_discard
-syn keyword ngxDirectiveThirdParty contained upload_field_name
-syn keyword ngxDirectiveThirdParty contained upload_file_crc32
-syn keyword ngxDirectiveThirdParty contained upload_file_md5
-syn keyword ngxDirectiveThirdParty contained upload_file_md5_uc
-syn keyword ngxDirectiveThirdParty contained upload_file_name
-syn keyword ngxDirectiveThirdParty contained upload_file_sha1
-syn keyword ngxDirectiveThirdParty contained upload_file_sha1_uc
-syn keyword ngxDirectiveThirdParty contained upload_file_size
-syn keyword ngxDirectiveThirdParty contained upload_filter
+syn keyword ngxDirectiveThirdParty contained upload_empty_fiels_names
+syn keyword ngxDirectiveThirdParty contained upload_limit_rate
 syn keyword ngxDirectiveThirdParty contained upload_max_file_size
 syn keyword ngxDirectiveThirdParty contained upload_max_output_body_len
 syn keyword ngxDirectiveThirdParty contained upload_max_part_header_len
+syn keyword ngxDirectiveThirdParty contained upload_merge_buffer_size
 syn keyword ngxDirectiveThirdParty contained upload_pass
 syn keyword ngxDirectiveThirdParty contained upload_pass_args
 syn keyword ngxDirectiveThirdParty contained upload_pass_form_field
+syn keyword ngxDirectiveThirdParty contained upload_range_header_buffer_size
+syn keyword ngxDirectiveThirdParty contained upload_resumable
 syn keyword ngxDirectiveThirdParty contained upload_set_form_field
+syn keyword ngxDirectiveThirdParty contained upload_state_store
 syn keyword ngxDirectiveThirdParty contained upload_store
 syn keyword ngxDirectiveThirdParty contained upload_store_access
-syn keyword ngxDirectiveThirdParty contained upload_tmp_path
-syn keyword ngxDirectiveThirdParty contained upload_unzip
-syn keyword ngxDirectiveThirdParty contained upload_unzip_buffers
-syn keyword ngxDirectiveThirdParty contained upload_unzip_hash
-syn keyword ngxDirectiveThirdParty contained upload_unzip_max_file_name_len
-syn keyword ngxDirectiveThirdParty contained upload_unzip_window
-syn keyword ngxDirectiveThirdParty contained upload_void_content_type
+syn keyword ngxDirectiveThirdParty contained upload_tame_arrays
 
-" nginx-upload-progress-module
 " https://github.com/masterzen/nginx-upload-progress-module
 syn keyword ngxDirectiveThirdParty contained report_uploads
 syn keyword ngxDirectiveThirdParty contained track_uploads
@@ -1288,9 +1322,7 @@ syn keyword ngxDirectiveThirdParty contained upload_progress_jsonp_output
 syn keyword ngxDirectiveThirdParty contained upload_progress_jsonp_parameter
 syn keyword ngxDirectiveThirdParty contained upload_progress_template
 
-" Health checks upstreams for nginx
 " https://github.com/yaoweibin/nginx_upstream_check_module
-syn keyword ngxDirectiveThirdParty contained check
 syn keyword ngxDirectiveThirdParty contained check_fastcgi_param
 syn keyword ngxDirectiveThirdParty contained check_http_expect_alive
 syn keyword ngxDirectiveThirdParty contained check_http_send
@@ -1298,13 +1330,14 @@ syn keyword ngxDirectiveThirdParty contained check_keepalive_requests
 syn keyword ngxDirectiveThirdParty contained check_shm_size
 syn keyword ngxDirectiveThirdParty contained check_status
 
-" The fair load balancer module for nginx
-" https://github.com/cryptofuture/nginx-upstream-fair
+" https://github.com/jaygooby/nginx-upstream-fair
 syn keyword ngxDirectiveThirdParty contained fair
 syn keyword ngxDirectiveThirdParty contained upstream_fair_shm_size
 
-" Nginx Video Thumb Extractor Module
-" https://github.com/wandenberg/nginx-video-thumbextractor-module
+" https://github.com/ayty-adrianomartins/nginx-sticky-module-ng
+syn keyword ngxDirectiveThirdParty contained sticky_no_fallback
+
+" https://github.com/Novetta/nginx-video-thumbextractor-module
 syn keyword ngxDirectiveThirdParty contained video_thumbextractor
 syn keyword ngxDirectiveThirdParty contained video_thumbextractor_image_height
 syn keyword ngxDirectiveThirdParty contained video_thumbextractor_image_width
@@ -1329,43 +1362,14 @@ syn keyword ngxDirectiveThirdParty contained video_thumbextractor_tile_sample_in
 syn keyword ngxDirectiveThirdParty contained video_thumbextractor_video_filename
 syn keyword ngxDirectiveThirdParty contained video_thumbextractor_video_second
 
-" drizzle-nginx-module - Upstream module for talking to MySQL and Drizzle directly
-" https://github.com/openresty/drizzle-nginx-module
-syn keyword ngxDirectiveThirdParty contained drizzle_buffer_size
-syn keyword ngxDirectiveThirdParty contained drizzle_connect_timeout
-syn keyword ngxDirectiveThirdParty contained drizzle_dbname
-syn keyword ngxDirectiveThirdParty contained drizzle_keepalive
-syn keyword ngxDirectiveThirdParty contained drizzle_module_header
-syn keyword ngxDirectiveThirdParty contained drizzle_pass
-syn keyword ngxDirectiveThirdParty contained drizzle_query
-syn keyword ngxDirectiveThirdParty contained drizzle_recv_cols_timeout
-syn keyword ngxDirectiveThirdParty contained drizzle_recv_rows_timeout
-syn keyword ngxDirectiveThirdParty contained drizzle_send_query_timeout
-syn keyword ngxDirectiveThirdParty contained drizzle_server
-syn keyword ngxDirectiveThirdParty contained drizzle_status
+" https://github.com/calio/iconv-nginx-module
+syn keyword ngxDirectiveThirdParty contained iconv_buffer_size
+syn keyword ngxDirectiveThirdParty contained iconv_filter
+syn keyword ngxDirectiveThirdParty contained set_iconv
 
-" ngx_dynamic_upstream
-" https://github.com/cubicdaiya/ngx_dynamic_upstream
-syn keyword ngxDirectiveThirdParty contained dynamic_upstream
-
-" encrypt and decrypt nginx variable values
-" https://github.com/openresty/encrypted-session-nginx-module
-syn keyword ngxDirectiveThirdParty contained encrypted_session_expires
-syn keyword ngxDirectiveThirdParty contained encrypted_session_iv
-syn keyword ngxDirectiveThirdParty contained encrypted_session_key
-syn keyword ngxDirectiveThirdParty contained set_decrypt_session
-syn keyword ngxDirectiveThirdParty contained set_encrypt_session
-
-" serve content directly from MongoDB's GridFS
-" https://github.com/mdirolf/nginx-gridfs
-syn keyword ngxDirectiveThirdParty contained gridfs
-syn keyword ngxDirectiveThirdParty contained mongo
-
-" Adds support for arithmetic operations to NGINX config
-" https://github.com/arut/nginx-let-module
+" https://github.com/baysao/nginx-let-module
 syn keyword ngxDirectiveThirdParty contained let
 
-" ngx_http_lua_module - Embed the power of Lua into Nginx HTTP Servers
 " https://github.com/openresty/lua-nginx-module
 syn keyword ngxDirectiveThirdParty contained access_by_lua
 syn keyword ngxDirectiveThirdParty contained access_by_lua_block
@@ -1431,6 +1435,8 @@ syn keyword ngxDirectiveThirdParty contained rewrite_by_lua
 syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_block
 syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_file
 syn keyword ngxDirectiveThirdParty contained rewrite_by_lua_no_postpone
+syn keyword ngxDirectiveThirdParty contained server_rewrite_by_lua_block
+syn keyword ngxDirectiveThirdParty contained server_rewrite_by_lua_file
 syn keyword ngxDirectiveThirdParty contained set_by_lua
 syn keyword ngxDirectiveThirdParty contained set_by_lua_block
 syn keyword ngxDirectiveThirdParty contained set_by_lua_file
@@ -1443,7 +1449,16 @@ syn keyword ngxDirectiveThirdParty contained ssl_session_fetch_by_lua_file
 syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_block
 syn keyword ngxDirectiveThirdParty contained ssl_session_store_by_lua_file
 
-" ngx_memc - An extended version of the standard memcached module
+" https://github.com/Taymindis/nginx-link-function
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_add_prop
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_add_req_header
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_ca_cert
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_call
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_download_link_lib
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_lib
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_shm_size
+syn keyword ngxDirectiveThirdParty contained ngx_link_func_subrequest
+
 " https://github.com/openresty/memc-nginx-module
 syn keyword ngxDirectiveThirdParty contained memc_buffer_size
 syn keyword ngxDirectiveThirdParty contained memc_cmds_allowed
@@ -1457,21 +1472,24 @@ syn keyword ngxDirectiveThirdParty contained memc_send_timeout
 syn keyword ngxDirectiveThirdParty contained memc_upstream_fail_timeout
 syn keyword ngxDirectiveThirdParty contained memc_upstream_max_fails
 
-" ModSecurity web application firewall
-" https://github.com/SpiderLabs/ModSecurity/tree/master
-syn keyword ngxDirectiveThirdParty contained ModSecurityConfig
-syn keyword ngxDirectiveThirdParty contained ModSecurityEnabled
-syn keyword ngxDirectiveThirdParty contained pool_context_hash_size
+" https://github.com/SpiderLabs/ModSecurity-nginx
+syn keyword ngxDirectiveThirdParty contained modsecurity
+syn keyword ngxDirectiveThirdParty contained modsecurity_rules
+syn keyword ngxDirectiveThirdParty contained modsecurity_rules_file
+syn keyword ngxDirectiveThirdParty contained modsecurity_rules_remote
+syn keyword ngxDirectiveThirdParty contained modsecurity_transaction_id
 
-" NAXSI is an open-source, high performance, low rules maintenance WAF for NGINX
 " https://github.com/nbs-system/naxsi
 syn keyword ngxDirectiveThirdParty contained BasicRule
 syn keyword ngxDirectiveThirdParty contained CheckRule
 syn keyword ngxDirectiveThirdParty contained DeniedUrl
+syn keyword ngxDirectiveThirdParty contained IgnoreCIDR
+syn keyword ngxDirectiveThirdParty contained IgnoreIP
 syn keyword ngxDirectiveThirdParty contained LearningMode
 syn keyword ngxDirectiveThirdParty contained LibInjectionSql
 syn keyword ngxDirectiveThirdParty contained LibInjectionXss
 syn keyword ngxDirectiveThirdParty contained MainRule
+syn keyword ngxDirectiveThirdParty contained NaxsiLogFile
 syn keyword ngxDirectiveThirdParty contained SecRulesDisabled
 syn keyword ngxDirectiveThirdParty contained SecRulesEnabled
 syn keyword ngxDirectiveThirdParty contained basic_rule
@@ -1481,17 +1499,31 @@ syn keyword ngxDirectiveThirdParty contained learning_mode
 syn keyword ngxDirectiveThirdParty contained libinjection_sql
 syn keyword ngxDirectiveThirdParty contained libinjection_xss
 syn keyword ngxDirectiveThirdParty contained main_rule
+syn keyword ngxDirectiveThirdParty contained naxsi_log
 syn keyword ngxDirectiveThirdParty contained rules_disabled
 syn keyword ngxDirectiveThirdParty contained rules_enabled
 
-" Phusion Passenger
-" https://www.phusionpassenger.com/library/config/nginx/reference/
+" https://github.com/opentracing-contrib/nginx-opentracing
+syn keyword ngxDirectiveThirdParty contained opentracing
+syn keyword ngxDirectiveThirdParty contained opentracing_fastcgi_propagate_context
+syn keyword ngxDirectiveThirdParty contained opentracing_grpc_propagate_context
+syn keyword ngxDirectiveThirdParty contained opentracing_load_tracer
+syn keyword ngxDirectiveThirdParty contained opentracing_location_operation_name
+syn keyword ngxDirectiveThirdParty contained opentracing_operation_name
+syn keyword ngxDirectiveThirdParty contained opentracing_propagate_context
+syn keyword ngxDirectiveThirdParty contained opentracing_tag
+syn keyword ngxDirectiveThirdParty contained opentracing_trace_locations
+syn keyword ngxDirectiveThirdParty contained opentracing_trust_incoming_span
+
+" https://github.com/phusion/passenger
 syn keyword ngxDirectiveThirdParty contained passenger_abort_on_startup_error
 syn keyword ngxDirectiveThirdParty contained passenger_abort_websockets_on_process_shutdown
 syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_auth_type
 syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_password
 syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_url
 syn keyword ngxDirectiveThirdParty contained passenger_admin_panel_username
+syn keyword ngxDirectiveThirdParty contained passenger_analytics_log_group
+syn keyword ngxDirectiveThirdParty contained passenger_analytics_log_user
 syn keyword ngxDirectiveThirdParty contained passenger_anonymous_telemetry_proxy
 syn keyword ngxDirectiveThirdParty contained passenger_app_env
 syn keyword ngxDirectiveThirdParty contained passenger_app_file_descriptor_ulimit
@@ -1499,20 +1531,25 @@ syn keyword ngxDirectiveThirdParty contained passenger_app_group_name
 syn keyword ngxDirectiveThirdParty contained passenger_app_log_file
 syn keyword ngxDirectiveThirdParty contained passenger_app_rights
 syn keyword ngxDirectiveThirdParty contained passenger_app_root
+syn keyword ngxDirectiveThirdParty contained passenger_app_start_command
 syn keyword ngxDirectiveThirdParty contained passenger_app_type
 syn keyword ngxDirectiveThirdParty contained passenger_base_uri
 syn keyword ngxDirectiveThirdParty contained passenger_buffer_response
 syn keyword ngxDirectiveThirdParty contained passenger_buffer_size
+syn keyword ngxDirectiveThirdParty contained passenger_buffer_upload
 syn keyword ngxDirectiveThirdParty contained passenger_buffers
 syn keyword ngxDirectiveThirdParty contained passenger_busy_buffers_size
 syn keyword ngxDirectiveThirdParty contained passenger_concurrency_model
 syn keyword ngxDirectiveThirdParty contained passenger_core_file_descriptor_ulimit
 syn keyword ngxDirectiveThirdParty contained passenger_ctl
 syn keyword ngxDirectiveThirdParty contained passenger_data_buffer_dir
+syn keyword ngxDirectiveThirdParty contained passenger_debug_log_file
 syn keyword ngxDirectiveThirdParty contained passenger_debugger
 syn keyword ngxDirectiveThirdParty contained passenger_default_group
 syn keyword ngxDirectiveThirdParty contained passenger_default_user
+syn keyword ngxDirectiveThirdParty contained passenger_direct_instance_request_address
 syn keyword ngxDirectiveThirdParty contained passenger_disable_anonymous_telemetry
+syn keyword ngxDirectiveThirdParty contained passenger_disable_log_prefix
 syn keyword ngxDirectiveThirdParty contained passenger_disable_security_update_check
 syn keyword ngxDirectiveThirdParty contained passenger_document_root
 syn keyword ngxDirectiveThirdParty contained passenger_dump_config_manifest
@@ -1548,8 +1585,10 @@ syn keyword ngxDirectiveThirdParty contained passenger_nodejs
 syn keyword ngxDirectiveThirdParty contained passenger_pass_header
 syn keyword ngxDirectiveThirdParty contained passenger_pool_idle_time
 syn keyword ngxDirectiveThirdParty contained passenger_pre_start
+syn keyword ngxDirectiveThirdParty contained passenger_preload_bundler
 syn keyword ngxDirectiveThirdParty contained passenger_python
 syn keyword ngxDirectiveThirdParty contained passenger_read_timeout
+syn keyword ngxDirectiveThirdParty contained passenger_request_buffering
 syn keyword ngxDirectiveThirdParty contained passenger_request_queue_overflow_status_code
 syn keyword ngxDirectiveThirdParty contained passenger_resist_deployment_errors
 syn keyword ngxDirectiveThirdParty contained passenger_response_buffer_high_watermark
@@ -1561,36 +1600,36 @@ syn keyword ngxDirectiveThirdParty contained passenger_security_update_check_pro
 syn keyword ngxDirectiveThirdParty contained passenger_set_header
 syn keyword ngxDirectiveThirdParty contained passenger_show_version_in_header
 syn keyword ngxDirectiveThirdParty contained passenger_socket_backlog
+syn keyword ngxDirectiveThirdParty contained passenger_spawn_dir
+syn keyword ngxDirectiveThirdParty contained passenger_spawn_exception_status_code
 syn keyword ngxDirectiveThirdParty contained passenger_spawn_method
 syn keyword ngxDirectiveThirdParty contained passenger_start_timeout
 syn keyword ngxDirectiveThirdParty contained passenger_startup_file
 syn keyword ngxDirectiveThirdParty contained passenger_stat_throttle_rate
 syn keyword ngxDirectiveThirdParty contained passenger_sticky_sessions
+syn keyword ngxDirectiveThirdParty contained passenger_sticky_sessions_cookie_attributes
 syn keyword ngxDirectiveThirdParty contained passenger_sticky_sessions_cookie_name
+syn keyword ngxDirectiveThirdParty contained passenger_temp_path
 syn keyword ngxDirectiveThirdParty contained passenger_thread_count
 syn keyword ngxDirectiveThirdParty contained passenger_turbocaching
+syn keyword ngxDirectiveThirdParty contained passenger_use_global_queue
 syn keyword ngxDirectiveThirdParty contained passenger_user
 syn keyword ngxDirectiveThirdParty contained passenger_user_switching
 syn keyword ngxDirectiveThirdParty contained passenger_vary_turbocache_by_cookie
-syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_analytics_log_group
-syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_analytics_log_user
-syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_debug_log_file
-syn keyword ngxDirectiveThirdPartyDeprecated contained passenger_use_global_queue
-syn keyword ngxDirectiveThirdPartyDeprecated contained rack_env
-syn keyword ngxDirectiveThirdPartyDeprecated contained rails_app_spawner_idle_time
-syn keyword ngxDirectiveThirdPartyDeprecated contained rails_env
-syn keyword ngxDirectiveThirdPartyDeprecated contained rails_framework_spawner_idle_time
-syn keyword ngxDirectiveThirdPartyDeprecated contained rails_spawn_method
-syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_filter
-syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_gateway_address
-syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_gateway_cert
-syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_gateway_port
-syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_key
-syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_proxy_address
-syn keyword ngxDirectiveThirdPartyDeprecated contained union_station_support
+syn keyword ngxDirectiveThirdParty contained rack_env
+syn keyword ngxDirectiveThirdParty contained rails_app_spawner_idle_time
+syn keyword ngxDirectiveThirdParty contained rails_env
+syn keyword ngxDirectiveThirdParty contained rails_framework_spawner_idle_time
+syn keyword ngxDirectiveThirdParty contained rails_spawn_method
+syn keyword ngxDirectiveThirdParty contained union_station_filter
+syn keyword ngxDirectiveThirdParty contained union_station_gateway_address
+syn keyword ngxDirectiveThirdParty contained union_station_gateway_cert
+syn keyword ngxDirectiveThirdParty contained union_station_gateway_port
+syn keyword ngxDirectiveThirdParty contained union_station_key
+syn keyword ngxDirectiveThirdParty contained union_station_proxy_address
+syn keyword ngxDirectiveThirdParty contained union_station_support
 
-" ngx_postgres is an upstream module that allows nginx to communicate directly with PostgreSQL database
-" https://github.com/FRiCKLE/ngx_postgres
+" https://github.com/konstruxi/ngx_postgres
 syn keyword ngxDirectiveThirdParty contained postgres_connect_timeout
 syn keyword ngxDirectiveThirdParty contained postgres_escape
 syn keyword ngxDirectiveThirdParty contained postgres_keepalive
@@ -1602,7 +1641,6 @@ syn keyword ngxDirectiveThirdParty contained postgres_rewrite
 syn keyword ngxDirectiveThirdParty contained postgres_server
 syn keyword ngxDirectiveThirdParty contained postgres_set
 
-" ngx_rds_csv - Nginx output filter module to convert Resty-DBD-Streams (RDS) to Comma-Separated Values (CSV)
 " https://github.com/openresty/rds-csv-nginx-module
 syn keyword ngxDirectiveThirdParty contained rds_csv
 syn keyword ngxDirectiveThirdParty contained rds_csv_buffer_size
@@ -1611,7 +1649,6 @@ syn keyword ngxDirectiveThirdParty contained rds_csv_field_name_header
 syn keyword ngxDirectiveThirdParty contained rds_csv_field_separator
 syn keyword ngxDirectiveThirdParty contained rds_csv_row_terminator
 
-" ngx_rds_json - an output filter that formats Resty DBD Streams generated by ngx_drizzle and others to JSON
 " https://github.com/openresty/rds-json-nginx-module
 syn keyword ngxDirectiveThirdParty contained rds_json
 syn keyword ngxDirectiveThirdParty contained rds_json_buffer_size
@@ -1624,7 +1661,6 @@ syn keyword ngxDirectiveThirdParty contained rds_json_root
 syn keyword ngxDirectiveThirdParty contained rds_json_success_property
 syn keyword ngxDirectiveThirdParty contained rds_json_user_property
 
-" ngx_redis2 - Nginx upstream module for the Redis 2.0 protocol
 " https://github.com/openresty/redis2-nginx-module
 syn keyword ngxDirectiveThirdParty contained redis2_bind
 syn keyword ngxDirectiveThirdParty contained redis2_buffer_size
@@ -1638,7 +1674,6 @@ syn keyword ngxDirectiveThirdParty contained redis2_raw_query
 syn keyword ngxDirectiveThirdParty contained redis2_read_timeout
 syn keyword ngxDirectiveThirdParty contained redis2_send_timeout
 
-" NGINX-based Media Streaming Server
 " https://github.com/arut/nginx-rtmp-module
 syn keyword ngxDirectiveThirdParty contained ack_window
 syn keyword ngxDirectiveThirdParty contained application
@@ -1750,7 +1785,6 @@ syn keyword ngxDirectiveThirdParty contained sync
 syn keyword ngxDirectiveThirdParty contained wait_key
 syn keyword ngxDirectiveThirdParty contained wait_video
 
-" ngx_set_misc - Various set_xxx directives added to nginx's rewrite module (md5/sha1, sql/json quoting, and many more)
 " https://github.com/openresty/set-misc-nginx-module
 syn keyword ngxDirectiveThirdParty contained set_base32_alphabet
 syn keyword ngxDirectiveThirdParty contained set_base32_padding
@@ -1770,6 +1804,7 @@ syn keyword ngxDirectiveThirdParty contained set_hmac_sha1
 syn keyword ngxDirectiveThirdParty contained set_hmac_sha256
 syn keyword ngxDirectiveThirdParty contained set_if_empty
 syn keyword ngxDirectiveThirdParty contained set_local_today
+syn keyword ngxDirectiveThirdParty contained set_md5
 syn keyword ngxDirectiveThirdParty contained set_misc_base32_padding
 syn keyword ngxDirectiveThirdParty contained set_quote_json_str
 syn keyword ngxDirectiveThirdParty contained set_quote_pgsql_str
@@ -1778,20 +1813,18 @@ syn keyword ngxDirectiveThirdParty contained set_random
 syn keyword ngxDirectiveThirdParty contained set_rotate
 syn keyword ngxDirectiveThirdParty contained set_secure_random_alphanum
 syn keyword ngxDirectiveThirdParty contained set_secure_random_lcalpha
+syn keyword ngxDirectiveThirdParty contained set_sha1
 syn keyword ngxDirectiveThirdParty contained set_unescape_uri
 
-" nginx-sflow-module
 " https://github.com/sflow/nginx-sflow-module
 syn keyword ngxDirectiveThirdParty contained sflow
 
-" Shibboleth auth request module for Nginx
 " https://github.com/nginx-shib/nginx-http-shibboleth
 syn keyword ngxDirectiveThirdParty contained shib_request
 syn keyword ngxDirectiveThirdParty contained shib_request_set
 syn keyword ngxDirectiveThirdParty contained shib_request_use_headers
 
-" nginx module which adds ability to cache static files
-" https://github.com/FRiCKLE/ngx_slowfs_cache
+" https://github.com/baysao/ngx_slowfs_cache
 syn keyword ngxDirectiveThirdParty contained slowfs_big_file_size
 syn keyword ngxDirectiveThirdParty contained slowfs_cache
 syn keyword ngxDirectiveThirdParty contained slowfs_cache_key
@@ -1801,8 +1834,7 @@ syn keyword ngxDirectiveThirdParty contained slowfs_cache_purge
 syn keyword ngxDirectiveThirdParty contained slowfs_cache_valid
 syn keyword ngxDirectiveThirdParty contained slowfs_temp_path
 
-" Dynamic Image Transformation Module For nginx
-" https://github.com/cubicdaiya/ngx_small_light
+" https://github.com/kawakibi/ngx_small_light
 syn keyword ngxDirectiveThirdParty contained small_light
 syn keyword ngxDirectiveThirdParty contained small_light_buffer
 syn keyword ngxDirectiveThirdParty contained small_light_getparam_mode
@@ -1812,7 +1844,6 @@ syn keyword ngxDirectiveThirdParty contained small_light_pattern_define
 syn keyword ngxDirectiveThirdParty contained small_light_radius_max
 syn keyword ngxDirectiveThirdParty contained small_light_sigma_max
 
-" ngx_srcache - Transparent subrequest-based caching layout for arbitrary nginx locations
 " https://github.com/openresty/srcache-nginx-module
 syn keyword ngxDirectiveThirdParty contained srcache_buffer
 syn keyword ngxDirectiveThirdParty contained srcache_default_expire
@@ -1835,7 +1866,6 @@ syn keyword ngxDirectiveThirdParty contained srcache_store_ranges
 syn keyword ngxDirectiveThirdParty contained srcache_store_skip
 syn keyword ngxDirectiveThirdParty contained srcache_store_statuses
 
-" NGINX-based VOD Packager
 " https://github.com/kaltura/nginx-vod-module
 syn keyword ngxDirectiveThirdParty contained vod
 syn keyword ngxDirectiveThirdParty contained vod_align_segments_to_key_frames
@@ -1875,6 +1905,7 @@ syn keyword ngxDirectiveThirdParty contained vod_live_window_duration
 syn keyword ngxDirectiveThirdParty contained vod_manifest_duration_policy
 syn keyword ngxDirectiveThirdParty contained vod_manifest_segment_durations_mode
 syn keyword ngxDirectiveThirdParty contained vod_mapping_cache
+syn keyword ngxDirectiveThirdParty contained vod_max_frame_count
 syn keyword ngxDirectiveThirdParty contained vod_max_frames_size
 syn keyword ngxDirectiveThirdParty contained vod_max_mapping_response_size
 syn keyword ngxDirectiveThirdParty contained vod_max_metadata_size
@@ -1901,6 +1932,7 @@ syn keyword ngxDirectiveThirdParty contained vod_response_cache
 syn keyword ngxDirectiveThirdParty contained vod_secret_key
 syn keyword ngxDirectiveThirdParty contained vod_segment_count_policy
 syn keyword ngxDirectiveThirdParty contained vod_segment_duration
+syn keyword ngxDirectiveThirdParty contained vod_segment_max_frame_count
 syn keyword ngxDirectiveThirdParty contained vod_segments_base_url
 syn keyword ngxDirectiveThirdParty contained vod_source_clip_map_uri
 syn keyword ngxDirectiveThirdParty contained vod_speed_param_name
@@ -1910,7 +1942,6 @@ syn keyword ngxDirectiveThirdParty contained vod_tracks_param_name
 syn keyword ngxDirectiveThirdParty contained vod_upstream_extra_args
 syn keyword ngxDirectiveThirdParty contained vod_upstream_location
 
-" Nginx virtual host traffic status module
 " https://github.com/vozlt/nginx-module-vts
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_average_method
@@ -1934,7 +1965,6 @@ syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_limit_traffic_
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_set_by_filter
 syn keyword ngxDirectiveThirdParty contained vhost_traffic_status_zone
 
-" xss-nginx-module - Native cross-site scripting support in nginx
 " https://github.com/openresty/xss-nginx-module
 syn keyword ngxDirectiveThirdParty contained xss_callback_arg
 syn keyword ngxDirectiveThirdParty contained xss_check_status
@@ -1943,471 +1973,6 @@ syn keyword ngxDirectiveThirdParty contained xss_input_types
 syn keyword ngxDirectiveThirdParty contained xss_output_type
 syn keyword ngxDirectiveThirdParty contained xss_override_status
 
-" Add support for array-typed variables to nginx config files
-" https://github.com/openresty/array-var-nginx-module
-syn keyword ngxDirectiveThirdParty contained array_join
-syn keyword ngxDirectiveThirdParty contained array_map
-syn keyword ngxDirectiveThirdParty contained array_map_op
-syn keyword ngxDirectiveThirdParty contained array_split
-
-" NGINX module for Brotli compression
-" https://github.com/eustas/ngx_brotli
-syn keyword ngxDirectiveThirdParty contained brotli
-syn keyword ngxDirectiveThirdParty contained brotli_buffers
-syn keyword ngxDirectiveThirdParty contained brotli_comp_level
-syn keyword ngxDirectiveThirdParty contained brotli_min_length
-syn keyword ngxDirectiveThirdParty contained brotli_static
-syn keyword ngxDirectiveThirdParty contained brotli_types
-syn keyword ngxDirectiveThirdParty contained brotli_window
-
-" form-input-nginx-module
-" https://github.com/calio/form-input-nginx-module
-syn keyword ngxDirectiveThirdParty contained set_form_input
-syn keyword ngxDirectiveThirdParty contained set_form_input_multi
-
-" character conversion nginx module using libiconv
-" https://github.com/calio/iconv-nginx-module
-syn keyword ngxDirectiveThirdParty contained iconv_buffer_size
-syn keyword ngxDirectiveThirdParty contained iconv_filter
-syn keyword ngxDirectiveThirdParty contained set_iconv
-
-" 3rd party modules list taken from
-" https://www.nginx.com/resources/wiki/modules/
-" ---------------------------------------------
-
-" Nginx Module for Authenticating Akamai G2O requests
-" https://github.com/kaltura/nginx_mod_akamai_g2o
-syn keyword ngxDirectiveThirdParty contained g2o
-syn keyword ngxDirectiveThirdParty contained g2o_data_header
-syn keyword ngxDirectiveThirdParty contained g2o_hash_function
-syn keyword ngxDirectiveThirdParty contained g2o_key
-syn keyword ngxDirectiveThirdParty contained g2o_log_level
-syn keyword ngxDirectiveThirdParty contained g2o_nonce
-syn keyword ngxDirectiveThirdParty contained g2o_sign_header
-syn keyword ngxDirectiveThirdParty contained g2o_time_window
-syn keyword ngxDirectiveThirdParty contained g2o_version
-
-" nginx_lua_module
-" https://github.com/alacner/nginx_lua_module
-syn keyword ngxDirectiveThirdParty contained lua_file
-
-" Nginx Audio Track for HTTP Live Streaming
-" https://github.com/flavioribeiro/nginx-audio-track-for-hls-module
-syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track
-syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_output_format
-syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_output_header
-syn keyword ngxDirectiveThirdParty contained ngx_hls_audio_track_rootpath
-
-" A Nginx module to dump backtrace when a worker process exits abnormally
-" https://github.com/alibaba/nginx-backtrace
-syn keyword ngxDirectiveThirdParty contained backtrace_log
-syn keyword ngxDirectiveThirdParty contained backtrace_max_stack_size
-
-" circle_gif module
-" https://github.com/evanmiller/nginx_circle_gif
-syn keyword ngxDirectiveThirdParty contained circle_gif
-syn keyword ngxDirectiveThirdParty contained circle_gif_max_radius
-syn keyword ngxDirectiveThirdParty contained circle_gif_min_radius
-syn keyword ngxDirectiveThirdParty contained circle_gif_step_radius
-
-" Upstream Consistent Hash
-" https://github.com/replay/ngx_http_consistent_hash
-syn keyword ngxDirectiveThirdParty contained consistent_hash
-
-" Nginx module for etags on dynamic content
-" https://github.com/kali/nginx-dynamic-etags
-syn keyword ngxDirectiveThirdParty contained dynamic_etags
-
-" Enhanced Nginx Memcached Module
-" https://github.com/bpaquet/ngx_http_enhanced_memcached_module
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_allow_delete
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_allow_put
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_bind
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_buffer_size
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_connect_timeout
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_flush
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_flush_namespace
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_hash_keys_with_md5
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_pass
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_read_timeout
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_send_timeout
-syn keyword ngxDirectiveThirdParty contained enhanced_memcached_stats
-
-" nginx max connections queue
-" https://github.com/ezmobius/nginx-ey-balancer
-syn keyword ngxDirectiveThirdParty contained max_connections_max_queue_length
-syn keyword ngxDirectiveThirdParty contained max_connections_queue_timeout
-
-" Nginx module for POST authentication and authorization
-" https://github.com/veruu/ngx_form_auth
-syn keyword ngxDirectiveThirdParty contained form_auth
-syn keyword ngxDirectiveThirdParty contained form_auth_login
-syn keyword ngxDirectiveThirdParty contained form_auth_pam_service
-syn keyword ngxDirectiveThirdParty contained form_auth_password
-syn keyword ngxDirectiveThirdParty contained form_auth_remote_user
-
-" ngx_http_accounting_module
-" https://github.com/Lax/ngx_http_accounting_module
-syn keyword ngxDirectiveThirdParty contained accounting
-syn keyword ngxDirectiveThirdParty contained accounting_id
-syn keyword ngxDirectiveThirdParty contained accounting_interval
-syn keyword ngxDirectiveThirdParty contained accounting_log
-syn keyword ngxDirectiveThirdParty contained accounting_perturb
-
-" concatenating files in a given context: CSS and JS files usually
-" https://github.com/alibaba/nginx-http-concat
-syn keyword ngxDirectiveThirdParty contained concat
-syn keyword ngxDirectiveThirdParty contained concat_delimiter
-syn keyword ngxDirectiveThirdParty contained concat_ignore_file_error
-syn keyword ngxDirectiveThirdParty contained concat_max_files
-syn keyword ngxDirectiveThirdParty contained concat_types
-syn keyword ngxDirectiveThirdParty contained concat_unique
-
-" update upstreams' config by restful interface
-" https://github.com/yzprofile/ngx_http_dyups_module
-syn keyword ngxDirectiveThirdParty contained dyups_interface
-syn keyword ngxDirectiveThirdParty contained dyups_shm_zone_size
-
-" add given content to the end of the response according to the condition specified
-" https://github.com/flygoast/ngx_http_footer_if_filter
-syn keyword ngxDirectiveThirdParty contained footer_if
-
-" NGINX HTTP Internal Redirect Module
-" https://github.com/flygoast/ngx_http_internal_redirect
-syn keyword ngxDirectiveThirdParty contained internal_redirect_if
-syn keyword ngxDirectiveThirdParty contained internal_redirect_if_no_postpone
-
-" nginx-ip-blocker
-" https://github.com/tmthrgd/nginx-ip-blocker
-syn keyword ngxDirectiveThirdParty contained ip_blocker
-
-" IP2Location Nginx
-" https://github.com/chrislim2888/ip2location-nginx
-syn keyword ngxDirectiveThirdParty contained ip2location_database
-
-" Limit upload rate
-" https://github.com/cfsego/limit_upload_rate
-syn keyword ngxDirectiveThirdParty contained limit_upload_rate
-syn keyword ngxDirectiveThirdParty contained limit_upload_rate_after
-syn keyword ngxDirectiveThirdParty contained limit_upload_rate_log_level
-
-" limit the number of connections to upstream
-" https://github.com/cfsego/nginx-limit-upstream
-syn keyword ngxDirectiveThirdParty contained limit_upstream_conn
-syn keyword ngxDirectiveThirdParty contained limit_upstream_log_level
-syn keyword ngxDirectiveThirdParty contained limit_upstream_zone
-
-" conditional accesslog for nginx
-" https://github.com/cfsego/ngx_log_if
-syn keyword ngxDirectiveThirdParty contained access_log_bypass_if
-
-" log messages over ZeroMQ
-" https://github.com/alticelabs/nginx-log-zmq
-syn keyword ngxDirectiveThirdParty contained log_zmq_endpoint
-syn keyword ngxDirectiveThirdParty contained log_zmq_format
-syn keyword ngxDirectiveThirdParty contained log_zmq_off
-syn keyword ngxDirectiveThirdParty contained log_zmq_server
-
-" simple module to uppercase/lowercase strings in the nginx config
-" https://github.com/replay/ngx_http_lower_upper_case
-syn keyword ngxDirectiveThirdParty contained lower
-syn keyword ngxDirectiveThirdParty contained upper
-
-" content filter for nginx, which returns the md5 hash of the content otherwise returned
-" https://github.com/kainswor/nginx_md5_filter
-syn keyword ngxDirectiveThirdParty contained md5_filter
-
-" Non-blocking upstream module for Nginx to connect to MongoDB
-" https://github.com/simpl/ngx_mongo
-syn keyword ngxDirectiveThirdParty contained mongo_auth
-syn keyword ngxDirectiveThirdParty contained mongo_bind
-syn keyword ngxDirectiveThirdParty contained mongo_buffer_size
-syn keyword ngxDirectiveThirdParty contained mongo_buffering
-syn keyword ngxDirectiveThirdParty contained mongo_buffers
-syn keyword ngxDirectiveThirdParty contained mongo_busy_buffers_size
-syn keyword ngxDirectiveThirdParty contained mongo_connect_timeout
-syn keyword ngxDirectiveThirdParty contained mongo_json
-syn keyword ngxDirectiveThirdParty contained mongo_next_upstream
-syn keyword ngxDirectiveThirdParty contained mongo_pass
-syn keyword ngxDirectiveThirdParty contained mongo_query
-syn keyword ngxDirectiveThirdParty contained mongo_read_timeout
-syn keyword ngxDirectiveThirdParty contained mongo_send_timeout
-
-" Nginx OCSP processing module designed for response caching
-" https://github.com/kyprizel/nginx_ocsp_proxy-module
-syn keyword ngxDirectiveThirdParty contained ocsp_cache_timeout
-syn keyword ngxDirectiveThirdParty contained ocsp_proxy
-
-" Nginx OpenSSL version check at startup
-" https://github.com/apcera/nginx-openssl-version
-syn keyword ngxDirectiveThirdParty contained openssl_builddate_minimum
-syn keyword ngxDirectiveThirdParty contained openssl_version_minimum
-
-" Automatic PageSpeed optimization module for Nginx
-" https://github.com/pagespeed/ngx_pagespeed
-syn keyword ngxDirectiveThirdParty contained pagespeed
-
-" PECL Memcache standard hashing compatible loadbalancer for Nginx
-" https://github.com/replay/ngx_http_php_memcache_standard_balancer
-syn keyword ngxDirectiveThirdParty contained hash_key
-
-" nginx module to parse php sessions
-" https://github.com/replay/ngx_http_php_session
-syn keyword ngxDirectiveThirdParty contained php_session_parse
-syn keyword ngxDirectiveThirdParty contained php_session_strip_formatting
-
-" Nginx HTTP rDNS module
-" https://github.com/flant/nginx-http-rdns
-syn keyword ngxDirectiveThirdParty contained rdns
-syn keyword ngxDirectiveThirdParty contained rdns_allow
-syn keyword ngxDirectiveThirdParty contained rdns_deny
-
-" Streaming regular expression replacement in response bodies
-" https://github.com/openresty/replace-filter-nginx-module
-syn keyword ngxDirectiveThirdParty contained replace_filter
-syn keyword ngxDirectiveThirdParty contained replace_filter_last_modified
-syn keyword ngxDirectiveThirdParty contained replace_filter_max_buffered_size
-syn keyword ngxDirectiveThirdParty contained replace_filter_skip
-syn keyword ngxDirectiveThirdParty contained replace_filter_types
-
-" Link RRDtool's graphing facilities directly into nginx
-" https://github.com/evanmiller/mod_rrd_graph
-syn keyword ngxDirectiveThirdParty contained rrd_graph
-syn keyword ngxDirectiveThirdParty contained rrd_graph_root
-
-" Module for nginx to proxy rtmp using http protocol
-" https://github.com/kwojtek/nginx-rtmpt-proxy-module
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_http_timeout
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_rtmp_timeout
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_stat
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_stylesheet
-syn keyword ngxDirectiveThirdParty contained rtmpt_proxy_target
-
-" Syntactically Awesome NGINX Module
-" https://github.com/mneudert/sass-nginx-module
-syn keyword ngxDirectiveThirdParty contained sass_compile
-syn keyword ngxDirectiveThirdParty contained sass_error_log
-syn keyword ngxDirectiveThirdParty contained sass_include_path
-syn keyword ngxDirectiveThirdParty contained sass_indent
-syn keyword ngxDirectiveThirdParty contained sass_is_indented_syntax
-syn keyword ngxDirectiveThirdParty contained sass_linefeed
-syn keyword ngxDirectiveThirdParty contained sass_output_style
-syn keyword ngxDirectiveThirdParty contained sass_precision
-syn keyword ngxDirectiveThirdParty contained sass_source_comments
-syn keyword ngxDirectiveThirdParty contained sass_source_map_embed
-
-" Nginx Selective Cache Purge Module
-" https://github.com/wandenberg/nginx-selective-cache-purge-module
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_query
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_database
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_host
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_password
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_port
-syn keyword ngxDirectiveThirdParty contained selective_cache_purge_redis_unix_socket
-
-" cconv nginx module
-" https://github.com/liseen/set-cconv-nginx-module
-syn keyword ngxDirectiveThirdParty contained set_cconv_to_simp
-syn keyword ngxDirectiveThirdParty contained set_cconv_to_trad
-syn keyword ngxDirectiveThirdParty contained set_pinyin_to_normal
-
-" Nginx module that allows the setting of variables to the value of a variety of hashes
-" https://github.com/simpl/ngx_http_set_hash
-syn keyword ngxDirectiveThirdParty contained set_md5
-syn keyword ngxDirectiveThirdParty contained set_md5_upper
-syn keyword ngxDirectiveThirdParty contained set_murmur2
-syn keyword ngxDirectiveThirdParty contained set_murmur2_upper
-syn keyword ngxDirectiveThirdParty contained set_sha1
-syn keyword ngxDirectiveThirdParty contained set_sha1_upper
-
-" Nginx module to set the language of a request based on a number of options
-" https://github.com/simpl/ngx_http_set_lang
-syn keyword ngxDirectiveThirdParty contained lang_cookie
-syn keyword ngxDirectiveThirdParty contained lang_get_var
-syn keyword ngxDirectiveThirdParty contained lang_host
-syn keyword ngxDirectiveThirdParty contained lang_list
-syn keyword ngxDirectiveThirdParty contained lang_post_var
-syn keyword ngxDirectiveThirdParty contained lang_referer
-syn keyword ngxDirectiveThirdParty contained set_lang
-syn keyword ngxDirectiveThirdParty contained set_lang_method
-
-" Nginx Sorted Querystring Module
-" https://github.com/wandenberg/nginx-sorted-querystring-module
-syn keyword ngxDirectiveThirdParty contained sorted_querysting_filter_parameter
-
-" Nginx upstream module for Sphinx 2.x search daemon
-" https://github.com/reeteshranjan/sphinx2-nginx-module
-syn keyword ngxDirectiveThirdParty contained sphinx2_bind
-syn keyword ngxDirectiveThirdParty contained sphinx2_buffer_size
-syn keyword ngxDirectiveThirdParty contained sphinx2_connect_timeout
-syn keyword ngxDirectiveThirdParty contained sphinx2_next_upstream
-syn keyword ngxDirectiveThirdParty contained sphinx2_pass
-syn keyword ngxDirectiveThirdParty contained sphinx2_read_timeout
-syn keyword ngxDirectiveThirdParty contained sphinx2_send_timeout
-
-" Nginx module for retrieving user attributes and groups from SSSD
-" https://github.com/veruu/ngx_sssd_info
-syn keyword ngxDirectiveThirdParty contained sssd_info
-syn keyword ngxDirectiveThirdParty contained sssd_info_attribute
-syn keyword ngxDirectiveThirdParty contained sssd_info_attribute_separator
-syn keyword ngxDirectiveThirdParty contained sssd_info_attributes
-syn keyword ngxDirectiveThirdParty contained sssd_info_group
-syn keyword ngxDirectiveThirdParty contained sssd_info_group_separator
-syn keyword ngxDirectiveThirdParty contained sssd_info_groups
-syn keyword ngxDirectiveThirdParty contained sssd_info_output_to
-
-" An nginx module for sending statistics to statsd
-" https://github.com/zebrafishlabs/nginx-statsd
-syn keyword ngxDirectiveThirdParty contained statsd_count
-syn keyword ngxDirectiveThirdParty contained statsd_sample_rate
-syn keyword ngxDirectiveThirdParty contained statsd_server
-syn keyword ngxDirectiveThirdParty contained statsd_timing
-
-" ngx_stream_echo - TCP/stream echo module for NGINX (a port of the ngx_http_echo module)
-" https://github.com/openresty/stream-echo-nginx-module
-syn keyword ngxDirectiveThirdParty contained echo
-syn keyword ngxDirectiveThirdParty contained echo_client_error_log_level
-syn keyword ngxDirectiveThirdParty contained echo_discard_request
-syn keyword ngxDirectiveThirdParty contained echo_duplicate
-syn keyword ngxDirectiveThirdParty contained echo_flush_wait
-syn keyword ngxDirectiveThirdParty contained echo_lingering_close
-syn keyword ngxDirectiveThirdParty contained echo_lingering_time
-syn keyword ngxDirectiveThirdParty contained echo_lingering_timeout
-syn keyword ngxDirectiveThirdParty contained echo_read_buffer_size
-syn keyword ngxDirectiveThirdParty contained echo_read_bytes
-syn keyword ngxDirectiveThirdParty contained echo_read_line
-syn keyword ngxDirectiveThirdParty contained echo_read_timeout
-syn keyword ngxDirectiveThirdParty contained echo_request_data
-syn keyword ngxDirectiveThirdParty contained echo_send_timeout
-syn keyword ngxDirectiveThirdParty contained echo_sleep
-
-" Embed the power of Lua into NGINX TCP/UDP servers
-" https://github.com/openresty/stream-lua-nginx-module
-syn keyword ngxDirectiveThirdParty contained lua_add_variable
-syn keyword ngxDirectiveThirdParty contained preread_by_lua_block
-syn keyword ngxDirectiveThirdParty contained preread_by_lua_file
-syn keyword ngxDirectiveThirdParty contained preread_by_lua_no_postpone
-
-" nginx-upsync-module
-" https://github.com/weibocom/nginx-upsync-module
-syn keyword ngxDirectiveThirdParty contained upstream_show
-syn keyword ngxDirectiveThirdParty contained upsync
-syn keyword ngxDirectiveThirdParty contained upsync_dump_path
-syn keyword ngxDirectiveThirdParty contained upsync_lb
-
-" Whitespace stripper for nginx
-" https://github.com/evanmiller/mod_strip
-syn keyword ngxDirectiveThirdParty contained strip
-
-" Split one big HTTP/Range request to multiple subrange requesets
-" https://github.com/Qihoo360/ngx_http_subrange_module
-syn keyword ngxDirectiveThirdParty contained subrange
-
-" summarizer-nginx-module
-" https://github.com/reeteshranjan/summarizer-nginx-module
-syn keyword ngxDirectiveThirdParty contained summarizer_bind
-syn keyword ngxDirectiveThirdParty contained summarizer_buffer_size
-syn keyword ngxDirectiveThirdParty contained summarizer_connect_timeout
-syn keyword ngxDirectiveThirdParty contained summarizer_next_upstream
-syn keyword ngxDirectiveThirdParty contained summarizer_pass
-syn keyword ngxDirectiveThirdParty contained summarizer_read_timeout
-syn keyword ngxDirectiveThirdParty contained summarizer_send_timeout
-
-" nginx module providing API to communicate with supervisord and manage (start/stop) backends on-demand
-" https://github.com/FRiCKLE/ngx_supervisord
-syn keyword ngxDirectiveThirdParty contained supervisord
-syn keyword ngxDirectiveThirdParty contained supervisord_inherit_backend_status
-syn keyword ngxDirectiveThirdParty contained supervisord_name
-syn keyword ngxDirectiveThirdParty contained supervisord_start
-syn keyword ngxDirectiveThirdParty contained supervisord_stop
-
-" simple robot mitigation module using cookie based challenge/response technique. Not supported any more.
-" https://github.com/kyprizel/testcookie-nginx-module
-syn keyword ngxDirectiveThirdParty contained testcookie
-syn keyword ngxDirectiveThirdParty contained testcookie_arg
-syn keyword ngxDirectiveThirdParty contained testcookie_deny_keepalive
-syn keyword ngxDirectiveThirdParty contained testcookie_domain
-syn keyword ngxDirectiveThirdParty contained testcookie_expires
-syn keyword ngxDirectiveThirdParty contained testcookie_fallback
-syn keyword ngxDirectiveThirdParty contained testcookie_get_only
-syn keyword ngxDirectiveThirdParty contained testcookie_httponly_flag
-syn keyword ngxDirectiveThirdParty contained testcookie_https_location
-syn keyword ngxDirectiveThirdParty contained testcookie_internal
-syn keyword ngxDirectiveThirdParty contained testcookie_max_attempts
-syn keyword ngxDirectiveThirdParty contained testcookie_name
-syn keyword ngxDirectiveThirdParty contained testcookie_p3p
-syn keyword ngxDirectiveThirdParty contained testcookie_pass
-syn keyword ngxDirectiveThirdParty contained testcookie_path
-syn keyword ngxDirectiveThirdParty contained testcookie_port_in_redirect
-syn keyword ngxDirectiveThirdParty contained testcookie_redirect_via_refresh
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie_iv
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_encrypt_cookie_key
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_status
-syn keyword ngxDirectiveThirdParty contained testcookie_refresh_template
-syn keyword ngxDirectiveThirdParty contained testcookie_samesite
-syn keyword ngxDirectiveThirdParty contained testcookie_secret
-syn keyword ngxDirectiveThirdParty contained testcookie_secure_flag
-syn keyword ngxDirectiveThirdParty contained testcookie_session
-syn keyword ngxDirectiveThirdParty contained testcookie_whitelist
-
-" ngx_http_types_filter_module
-" https://github.com/flygoast/ngx_http_types_filter
-syn keyword ngxDirectiveThirdParty contained types_filter
-syn keyword ngxDirectiveThirdParty contained types_filter_use_default
-
-" A module allowing the nginx to use files embedded in a zip file
-" https://github.com/youzee/nginx-unzip-module
-syn keyword ngxDirectiveThirdParty contained file_in_unzip
-syn keyword ngxDirectiveThirdParty contained file_in_unzip_archivefile
-syn keyword ngxDirectiveThirdParty contained file_in_unzip_extract
-
-" An asynchronous domain name resolve module for nginx upstream
-" https://github.com/wdaike/ngx_upstream_jdomain
-syn keyword ngxDirectiveThirdParty contained jdomain
-
-" Nginx url encoding converting module
-" https://github.com/vozlt/nginx-module-url
-syn keyword ngxDirectiveThirdParty contained url_encoding_convert
-syn keyword ngxDirectiveThirdParty contained url_encoding_convert_alloc_size
-syn keyword ngxDirectiveThirdParty contained url_encoding_convert_alloc_size_x
-syn keyword ngxDirectiveThirdParty contained url_encoding_convert_from
-syn keyword ngxDirectiveThirdParty contained url_encoding_convert_phase
-syn keyword ngxDirectiveThirdParty contained url_encoding_convert_to
-
-" A nginx module to match browsers and crawlers
-" https://github.com/alibaba/nginx-http-user-agent
-syn keyword ngxDirectiveThirdParty contained user_agent
-
-" nginx load-balancer module implementing ketama consistent hashing
-" https://github.com/flygoast/ngx_http_upstream_ketama_chash
-syn keyword ngxDirectiveThirdParty contained ketama_chash
-
-" nginx-sticky-module-ng
-" https://github.com/ayty-adrianomartins/nginx-sticky-module-ng
-syn keyword ngxDirectiveThirdParty contained sticky_no_fallback
-
-" dynamic linking and call the function of your application
-" https://github.com/Taymindis/nginx-link-function
-syn keyword ngxDirectiveThirdParty contained ngx_link_func_add_prop
-syn keyword ngxDirectiveThirdParty contained ngx_link_func_add_req_header
-syn keyword ngxDirectiveThirdParty contained ngx_link_func_ca_cert
-syn keyword ngxDirectiveThirdParty contained ngx_link_func_call
-syn keyword ngxDirectiveThirdParty contained ngx_link_func_download_link_lib
-syn keyword ngxDirectiveThirdParty contained ngx_link_func_lib
-syn keyword ngxDirectiveThirdParty contained ngx_link_func_shm_size
-syn keyword ngxDirectiveThirdParty contained ngx_link_func_subrequest
-
-" purge content from FastCGI, proxy, SCGI and uWSGI caches
-" https://github.com/torden/ngx_cache_purge
-syn keyword ngxDirectiveThirdParty contained cache_purge_response_type
-
-" set the flags "HttpOnly", "secure" and "SameSite" for cookies
-" https://github.com/AirisX/nginx_cookie_flag_module
-syn keyword ngxDirectiveThirdParty contained set_cookie_flag
-
-" Embed websockify into Nginx (convert any tcp connection into websocket)
 " https://github.com/tg123/websockify-nginx-module
 syn keyword ngxDirectiveThirdParty contained websockify_buffer_size
 syn keyword ngxDirectiveThirdParty contained websockify_connect_timeout
@@ -2415,55 +1980,6 @@ syn keyword ngxDirectiveThirdParty contained websockify_pass
 syn keyword ngxDirectiveThirdParty contained websockify_read_timeout
 syn keyword ngxDirectiveThirdParty contained websockify_send_timeout
 
-" IP2Location Nginx
-" https://github.com/ip2location/ip2location-nginx
-syn keyword ngxDirectiveThirdParty contained ip2location_addresstype
-syn keyword ngxDirectiveThirdParty contained ip2location_areacode
-syn keyword ngxDirectiveThirdParty contained ip2location_category
-syn keyword ngxDirectiveThirdParty contained ip2location_city
-syn keyword ngxDirectiveThirdParty contained ip2location_country_long
-syn keyword ngxDirectiveThirdParty contained ip2location_country_short
-syn keyword ngxDirectiveThirdParty contained ip2location_domain
-syn keyword ngxDirectiveThirdParty contained ip2location_elevation
-syn keyword ngxDirectiveThirdParty contained ip2location_iddcode
-syn keyword ngxDirectiveThirdParty contained ip2location_isp
-syn keyword ngxDirectiveThirdParty contained ip2location_latitude
-syn keyword ngxDirectiveThirdParty contained ip2location_longitude
-syn keyword ngxDirectiveThirdParty contained ip2location_mcc
-syn keyword ngxDirectiveThirdParty contained ip2location_mnc
-syn keyword ngxDirectiveThirdParty contained ip2location_mobilebrand
-syn keyword ngxDirectiveThirdParty contained ip2location_netspeed
-syn keyword ngxDirectiveThirdParty contained ip2location_proxy
-syn keyword ngxDirectiveThirdParty contained ip2location_proxy_recursive
-syn keyword ngxDirectiveThirdParty contained ip2location_region
-syn keyword ngxDirectiveThirdParty contained ip2location_timezone
-syn keyword ngxDirectiveThirdParty contained ip2location_usagetype
-syn keyword ngxDirectiveThirdParty contained ip2location_weatherstationcode
-syn keyword ngxDirectiveThirdParty contained ip2location_weatherstationname
-syn keyword ngxDirectiveThirdParty contained ip2location_zipcode
-
-" IP2Proxy module for Nginx
-" https://github.com/ip2location/ip2proxy-nginx
-syn keyword ngxDirectiveThirdParty contained ip2proxy_as
-syn keyword ngxDirectiveThirdParty contained ip2proxy_asn
-syn keyword ngxDirectiveThirdParty contained ip2proxy_city
-syn keyword ngxDirectiveThirdParty contained ip2proxy_country_long
-syn keyword ngxDirectiveThirdParty contained ip2proxy_country_short
-syn keyword ngxDirectiveThirdParty contained ip2proxy_database
-syn keyword ngxDirectiveThirdParty contained ip2proxy_domain
-syn keyword ngxDirectiveThirdParty contained ip2proxy_isp
-syn keyword ngxDirectiveThirdParty contained ip2proxy_is_proxy
-syn keyword ngxDirectiveThirdParty contained ip2proxy_last_seen
-syn keyword ngxDirectiveThirdParty contained ip2proxy_provider
-syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy
-syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy_recursive
-syn keyword ngxDirectiveThirdParty contained ip2proxy_proxy_type
-syn keyword ngxDirectiveThirdParty contained ip2proxy_region
-syn keyword ngxDirectiveThirdParty contained ip2proxy_threat
-syn keyword ngxDirectiveThirdParty contained ip2proxy_usage_type
-
-
-
 " highlight
 
 hi def link ngxComment Comment
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 9f8756b..832baaa 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1022001
-#define NGINX_VERSION      "1.22.1"
+#define nginx_version      1024000
+#define NGINX_VERSION      "1.24.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index fec7bb8..197704b 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -544,8 +544,8 @@ ngx_conf_read_token(ngx_conf_t *cf)
                     }
 
                     ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                                  "unexpected end of file, "
-                                  "expecting \";\" or \"}\"");
+                                       "unexpected end of file, "
+                                       "expecting \";\" or \"}\"");
                     return NGX_ERROR;
                 }
 
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index fe729a7..3682345 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -660,7 +660,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
                 /*
                  * on OpenVZ after suspend/resume EADDRINUSE
                  * may be returned by listen() instead of bind(), see
-                 * https://bugzilla.openvz.org/show_bug.cgi?id=2470
+                 * https://bugs.openvz.org/browse/OVZ-5587
                  */
 
                 if (err != NGX_EADDRINUSE || !ngx_test_config) {
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 8cc1475..36e1be2 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -172,6 +172,7 @@ struct ngx_connection_s {
     unsigned            timedout:1;
     unsigned            error:1;
     unsigned            destroyed:1;
+    unsigned            pipeline:1;
 
     unsigned            idle:1;
     unsigned            reusable:1;
@@ -184,6 +185,7 @@ struct ngx_connection_s {
     unsigned            tcp_nopush:2;    /* ngx_connection_tcp_nopush_e */
 
     unsigned            need_last_buf:1;
+    unsigned            need_flush_buf:1;
 
 #if (NGX_HAVE_SENDFILE_NODISKIO || NGX_COMPAT)
     unsigned            busy_count:2;
diff --git a/src/core/ngx_hash.h b/src/core/ngx_hash.h
index abc3cbe..3b57099 100644
--- a/src/core/ngx_hash.h
+++ b/src/core/ngx_hash.h
@@ -89,12 +89,15 @@ typedef struct {
 } ngx_hash_keys_arrays_t;
 
 
-typedef struct {
+typedef struct ngx_table_elt_s  ngx_table_elt_t;
+
+struct ngx_table_elt_s {
     ngx_uint_t        hash;
     ngx_str_t         key;
     ngx_str_t         value;
     u_char           *lowcase_key;
-} ngx_table_elt_t;
+    ngx_table_elt_t  *next;
+};
 
 
 void *ngx_hash_find(ngx_hash_t *hash, ngx_uint_t key, u_char *name, size_t len);
diff --git a/src/core/ngx_proxy_protocol.c b/src/core/ngx_proxy_protocol.c
index 7a9e7f9..49888b9 100644
--- a/src/core/ngx_proxy_protocol.c
+++ b/src/core/ngx_proxy_protocol.c
@@ -13,7 +13,15 @@
 #define NGX_PROXY_PROTOCOL_AF_INET6         2
 
 
-#define ngx_proxy_protocol_parse_uint16(p)  ((p)[0] << 8 | (p)[1])
+#define ngx_proxy_protocol_parse_uint16(p)                                    \
+    ( ((uint16_t) (p)[0] << 8)                                                \
+    + (           (p)[1]) )
+
+#define ngx_proxy_protocol_parse_uint32(p)                                    \
+    ( ((uint32_t) (p)[0] << 24)                                               \
+    + (           (p)[1] << 16)                                               \
+    + (           (p)[2] << 8)                                                \
+    + (           (p)[3]) )
 
 
 typedef struct {
@@ -40,12 +48,52 @@ typedef struct {
 } ngx_proxy_protocol_inet6_addrs_t;
 
 
+typedef struct {
+    u_char                                  type;
+    u_char                                  len[2];
+} ngx_proxy_protocol_tlv_t;
+
+
+typedef struct {
+    u_char                                  client;
+    u_char                                  verify[4];
+} ngx_proxy_protocol_tlv_ssl_t;
+
+
+typedef struct {
+    ngx_str_t                               name;
+    ngx_uint_t                              type;
+} ngx_proxy_protocol_tlv_entry_t;
+
+
 static u_char *ngx_proxy_protocol_read_addr(ngx_connection_t *c, u_char *p,
     u_char *last, ngx_str_t *addr);
 static u_char *ngx_proxy_protocol_read_port(u_char *p, u_char *last,
     in_port_t *port, u_char sep);
 static u_char *ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf,
     u_char *last);
+static ngx_int_t ngx_proxy_protocol_lookup_tlv(ngx_connection_t *c,
+    ngx_str_t *tlvs, ngx_uint_t type, ngx_str_t *value);
+
+
+static ngx_proxy_protocol_tlv_entry_t  ngx_proxy_protocol_tlv_entries[] = {
+    { ngx_string("alpn"),       0x01 },
+    { ngx_string("authority"),  0x02 },
+    { ngx_string("unique_id"),  0x05 },
+    { ngx_string("ssl"),        0x20 },
+    { ngx_string("netns"),      0x30 },
+    { ngx_null_string,          0x00 }
+};
+
+
+static ngx_proxy_protocol_tlv_entry_t  ngx_proxy_protocol_tlv_ssl_entries[] = {
+    { ngx_string("version"),    0x21 },
+    { ngx_string("cn"),         0x22 },
+    { ngx_string("cipher"),     0x23 },
+    { ngx_string("sig_alg"),    0x24 },
+    { ngx_string("key_alg"),    0x25 },
+    { ngx_null_string,          0x00 }
+};
 
 
 u_char *
@@ -61,7 +109,7 @@ ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last)
     len = last - buf;
 
     if (len >= sizeof(ngx_proxy_protocol_header_t)
-        && memcmp(p, signature, sizeof(signature) - 1) == 0)
+        && ngx_memcmp(p, signature, sizeof(signature) - 1) == 0)
     {
         return ngx_proxy_protocol_v2_read(c, buf, last);
     }
@@ -139,8 +187,14 @@ skip:
 
 invalid:
 
+    for (p = buf; p < last; p++) {
+        if (*p == CR || *p == LF) {
+            break;
+        }
+    }
+
     ngx_log_error(NGX_LOG_ERR, c->log, 0,
-                  "broken header: \"%*s\"", (size_t) (last - buf), buf);
+                  "broken header: \"%*s\"", (size_t) (p - buf), buf);
 
     return NULL;
 }
@@ -227,7 +281,9 @@ ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last)
 {
     ngx_uint_t  port, lport;
 
-    if (last - buf < NGX_PROXY_PROTOCOL_MAX_HEADER) {
+    if (last - buf < NGX_PROXY_PROTOCOL_V1_MAX_HEADER) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "too small buffer for PROXY protocol");
         return NULL;
     }
 
@@ -340,11 +396,11 @@ ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last)
 
         src_sockaddr.sockaddr_in.sin_family = AF_INET;
         src_sockaddr.sockaddr_in.sin_port = 0;
-        memcpy(&src_sockaddr.sockaddr_in.sin_addr, in->src_addr, 4);
+        ngx_memcpy(&src_sockaddr.sockaddr_in.sin_addr, in->src_addr, 4);
 
         dst_sockaddr.sockaddr_in.sin_family = AF_INET;
         dst_sockaddr.sockaddr_in.sin_port = 0;
-        memcpy(&dst_sockaddr.sockaddr_in.sin_addr, in->dst_addr, 4);
+        ngx_memcpy(&dst_sockaddr.sockaddr_in.sin_addr, in->dst_addr, 4);
 
         pp->src_port = ngx_proxy_protocol_parse_uint16(in->src_port);
         pp->dst_port = ngx_proxy_protocol_parse_uint16(in->dst_port);
@@ -367,11 +423,11 @@ ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last)
 
         src_sockaddr.sockaddr_in6.sin6_family = AF_INET6;
         src_sockaddr.sockaddr_in6.sin6_port = 0;
-        memcpy(&src_sockaddr.sockaddr_in6.sin6_addr, in6->src_addr, 16);
+        ngx_memcpy(&src_sockaddr.sockaddr_in6.sin6_addr, in6->src_addr, 16);
 
         dst_sockaddr.sockaddr_in6.sin6_family = AF_INET6;
         dst_sockaddr.sockaddr_in6.sin6_port = 0;
-        memcpy(&dst_sockaddr.sockaddr_in6.sin6_addr, in6->dst_addr, 16);
+        ngx_memcpy(&dst_sockaddr.sockaddr_in6.sin6_addr, in6->dst_addr, 16);
 
         pp->src_port = ngx_proxy_protocol_parse_uint16(in6->src_port);
         pp->dst_port = ngx_proxy_protocol_parse_uint16(in6->dst_port);
@@ -412,11 +468,147 @@ ngx_proxy_protocol_v2_read(ngx_connection_t *c, u_char *buf, u_char *last)
                    &pp->src_addr, pp->src_port, &pp->dst_addr, pp->dst_port);
 
     if (buf < end) {
-        ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
-                       "PROXY protocol v2 %z bytes of tlv ignored", end - buf);
+        pp->tlvs.data = ngx_pnalloc(c->pool, end - buf);
+        if (pp->tlvs.data == NULL) {
+            return NULL;
+        }
+
+        ngx_memcpy(pp->tlvs.data, buf, end - buf);
+        pp->tlvs.len = end - buf;
     }
 
     c->proxy_protocol = pp;
 
     return end;
 }
+
+
+ngx_int_t
+ngx_proxy_protocol_get_tlv(ngx_connection_t *c, ngx_str_t *name,
+    ngx_str_t *value)
+{
+    u_char                          *p;
+    size_t                           n;
+    uint32_t                         verify;
+    ngx_str_t                        ssl, *tlvs;
+    ngx_int_t                        rc, type;
+    ngx_proxy_protocol_tlv_ssl_t    *tlv_ssl;
+    ngx_proxy_protocol_tlv_entry_t  *te;
+
+    if (c->proxy_protocol == NULL) {
+        return NGX_DECLINED;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
+                   "PROXY protocol v2 get tlv \"%V\"", name);
+
+    te = ngx_proxy_protocol_tlv_entries;
+    tlvs = &c->proxy_protocol->tlvs;
+
+    p = name->data;
+    n = name->len;
+
+    if (n >= 4 && p[0] == 's' && p[1] == 's' && p[2] == 'l' && p[3] == '_') {
+
+        rc = ngx_proxy_protocol_lookup_tlv(c, tlvs, 0x20, &ssl);
+        if (rc != NGX_OK) {
+            return rc;
+        }
+
+        if (ssl.len < sizeof(ngx_proxy_protocol_tlv_ssl_t)) {
+            return NGX_ERROR;
+        }
+
+        p += 4;
+        n -= 4;
+
+        if (n == 6 && ngx_strncmp(p, "verify", 6) == 0) {
+
+            tlv_ssl = (ngx_proxy_protocol_tlv_ssl_t *) ssl.data;
+            verify = ngx_proxy_protocol_parse_uint32(tlv_ssl->verify);
+
+            value->data = ngx_pnalloc(c->pool, NGX_INT32_LEN);
+            if (value->data == NULL) {
+                return NGX_ERROR;
+            }
+
+            value->len = ngx_sprintf(value->data, "%uD", verify)
+                         - value->data;
+            return NGX_OK;
+        }
+
+        ssl.data += sizeof(ngx_proxy_protocol_tlv_ssl_t);
+        ssl.len -= sizeof(ngx_proxy_protocol_tlv_ssl_t);
+
+        te = ngx_proxy_protocol_tlv_ssl_entries;
+        tlvs = &ssl;
+    }
+
+    if (n >= 2 && p[0] == '0' && p[1] == 'x') {
+
+        type = ngx_hextoi(p + 2, n - 2);
+        if (type == NGX_ERROR) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                          "invalid PROXY protocol TLV \"%V\"", name);
+            return NGX_ERROR;
+        }
+
+        return ngx_proxy_protocol_lookup_tlv(c, tlvs, type, value);
+    }
+
+    for ( /* void */ ; te->type; te++) {
+        if (te->name.len == n && ngx_strncmp(te->name.data, p, n) == 0) {
+            return ngx_proxy_protocol_lookup_tlv(c, tlvs, te->type, value);
+        }
+    }
+
+    ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                  "unknown PROXY protocol TLV \"%V\"", name);
+
+    return NGX_DECLINED;
+}
+
+
+static ngx_int_t
+ngx_proxy_protocol_lookup_tlv(ngx_connection_t *c, ngx_str_t *tlvs,
+    ngx_uint_t type, ngx_str_t *value)
+{
+    u_char                    *p;
+    size_t                     n, len;
+    ngx_proxy_protocol_tlv_t  *tlv;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
+                   "PROXY protocol v2 lookup tlv:%02xi", type);
+
+    p = tlvs->data;
+    n = tlvs->len;
+
+    while (n) {
+        if (n < sizeof(ngx_proxy_protocol_tlv_t)) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0, "broken PROXY protocol TLV");
+            return NGX_ERROR;
+        }
+
+        tlv = (ngx_proxy_protocol_tlv_t *) p;
+        len = ngx_proxy_protocol_parse_uint16(tlv->len);
+
+        p += sizeof(ngx_proxy_protocol_tlv_t);
+        n -= sizeof(ngx_proxy_protocol_tlv_t);
+
+        if (n < len) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0, "broken PROXY protocol TLV");
+            return NGX_ERROR;
+        }
+
+        if (tlv->type == type) {
+            value->data = p;
+            value->len = len;
+            return NGX_OK;
+        }
+
+        p += len;
+        n -= len;
+    }
+
+    return NGX_DECLINED;
+}
diff --git a/src/core/ngx_proxy_protocol.h b/src/core/ngx_proxy_protocol.h
index b716220..d1749f5 100644
--- a/src/core/ngx_proxy_protocol.h
+++ b/src/core/ngx_proxy_protocol.h
@@ -13,7 +13,8 @@
 #include <ngx_core.h>
 
 
-#define NGX_PROXY_PROTOCOL_MAX_HEADER  107
+#define NGX_PROXY_PROTOCOL_V1_MAX_HEADER  107
+#define NGX_PROXY_PROTOCOL_MAX_HEADER     4096
 
 
 struct ngx_proxy_protocol_s {
@@ -21,6 +22,7 @@ struct ngx_proxy_protocol_s {
     ngx_str_t           dst_addr;
     in_port_t           src_port;
     in_port_t           dst_port;
+    ngx_str_t           tlvs;
 };
 
 
@@ -28,6 +30,8 @@ u_char *ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf,
     u_char *last);
 u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf,
     u_char *last);
+ngx_int_t ngx_proxy_protocol_get_tlv(ngx_connection_t *c, ngx_str_t *name,
+    ngx_str_t *value);
 
 
 #endif /* _NGX_PROXY_PROTOCOL_H_INCLUDED_ */
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 6d129e5..c76c178 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -157,6 +157,8 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
     cln->handler = ngx_resolver_cleanup;
     cln->data = r;
 
+    r->ipv4 = 1;
+
     ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel,
                     ngx_resolver_rbtree_insert_value);
 
@@ -225,6 +227,23 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
         }
 
 #if (NGX_HAVE_INET6)
+        if (ngx_strncmp(names[i].data, "ipv4=", 5) == 0) {
+
+            if (ngx_strcmp(&names[i].data[5], "on") == 0) {
+                r->ipv4 = 1;
+
+            } else if (ngx_strcmp(&names[i].data[5], "off") == 0) {
+                r->ipv4 = 0;
+
+            } else {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid parameter: %V", &names[i]);
+                return NULL;
+            }
+
+            continue;
+        }
+
         if (ngx_strncmp(names[i].data, "ipv6=", 5) == 0) {
 
             if (ngx_strcmp(&names[i].data[5], "on") == 0) {
@@ -273,6 +292,14 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
         }
     }
 
+#if (NGX_HAVE_INET6)
+    if (r->ipv4 + r->ipv6 == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "\"ipv4\" and \"ipv6\" cannot both be \"off\"");
+        return NULL;
+    }
+#endif
+
     if (n && r->connections.nelts == 0) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "no name servers defined");
         return NULL;
@@ -836,7 +863,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
         r->last_connection = 0;
     }
 
-    rn->naddrs = (u_short) -1;
+    rn->naddrs = r->ipv4 ? (u_short) -1 : 0;
     rn->tcp = 0;
 #if (NGX_HAVE_INET6)
     rn->naddrs6 = r->ipv6 ? (u_short) -1 : 0;
@@ -1263,7 +1290,7 @@ ngx_resolver_send_query(ngx_resolver_t *r, ngx_resolver_node_t *rn)
         rec->log.action = "resolving";
     }
 
-    if (rn->naddrs == (u_short) -1) {
+    if (rn->query && rn->naddrs == (u_short) -1) {
         rc = rn->tcp ? ngx_resolver_send_tcp_query(r, rec, rn->query, rn->qlen)
                      : ngx_resolver_send_udp_query(r, rec, rn->query, rn->qlen);
 
@@ -1389,6 +1416,7 @@ ngx_resolver_send_tcp_query(ngx_resolver_t *r, ngx_resolver_connection_t *rec,
 
         rec->tcp->data = rec;
         rec->tcp->write->handler = ngx_resolver_tcp_write;
+        rec->tcp->write->cancelable = 1;
         rec->tcp->read->handler = ngx_resolver_tcp_read;
         rec->tcp->read->resolver = 1;
 
@@ -1764,10 +1792,13 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n,
              q = ngx_queue_next(q))
         {
             rn = ngx_queue_data(q, ngx_resolver_node_t, queue);
-            qident = (rn->query[0] << 8) + rn->query[1];
 
-            if (qident == ident) {
-                goto dns_error_name;
+            if (rn->query) {
+                qident = (rn->query[0] << 8) + rn->query[1];
+
+                if (qident == ident) {
+                    goto dns_error_name;
+                }
             }
 
 #if (NGX_HAVE_INET6)
@@ -3644,7 +3675,7 @@ ngx_resolver_create_name_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
     len = sizeof(ngx_resolver_hdr_t) + nlen + sizeof(ngx_resolver_qs_t);
 
 #if (NGX_HAVE_INET6)
-    p = ngx_resolver_alloc(r, r->ipv6 ? len * 2 : len);
+    p = ngx_resolver_alloc(r, len * (r->ipv4 + r->ipv6));
 #else
     p = ngx_resolver_alloc(r, len);
 #endif
@@ -3657,19 +3688,21 @@ ngx_resolver_create_name_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
 
 #if (NGX_HAVE_INET6)
     if (r->ipv6) {
-        rn->query6 = p + len;
+        rn->query6 = r->ipv4 ? (p + len) : p;
     }
 #endif
 
     query = (ngx_resolver_hdr_t *) p;
 
-    ident = ngx_random();
+    if (r->ipv4) {
+        ident = ngx_random();
 
-    ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
-                   "resolve: \"%V\" A %i", name, ident & 0xffff);
+        ngx_log_debug2(NGX_LOG_DEBUG_CORE, r->log, 0,
+                       "resolve: \"%V\" A %i", name, ident & 0xffff);
 
-    query->ident_hi = (u_char) ((ident >> 8) & 0xff);
-    query->ident_lo = (u_char) (ident & 0xff);
+        query->ident_hi = (u_char) ((ident >> 8) & 0xff);
+        query->ident_lo = (u_char) (ident & 0xff);
+    }
 
     /* recursion query */
     query->flags_hi = 1; query->flags_lo = 0;
@@ -3730,7 +3763,9 @@ ngx_resolver_create_name_query(ngx_resolver_t *r, ngx_resolver_node_t *rn,
 
     p = rn->query6;
 
-    ngx_memcpy(p, rn->query, rn->qlen);
+    if (r->ipv4) {
+        ngx_memcpy(p, rn->query, rn->qlen);
+    }
 
     query = (ngx_resolver_hdr_t *) p;
 
diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h
index 0bd3921..06026b7 100644
--- a/src/core/ngx_resolver.h
+++ b/src/core/ngx_resolver.h
@@ -175,8 +175,10 @@ struct ngx_resolver_s {
     ngx_queue_t               srv_expire_queue;
     ngx_queue_t               addr_expire_queue;
 
+    unsigned                  ipv4:1;
+
 #if (NGX_HAVE_INET6)
-    ngx_uint_t                ipv6;                 /* unsigned  ipv6:1; */
+    unsigned                  ipv6:1;
     ngx_rbtree_t              addr6_rbtree;
     ngx_rbtree_node_t         addr6_sentinel;
     ngx_queue_t               addr6_resend_queue;
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 98f270a..f8f7384 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -1364,7 +1364,12 @@ ngx_utf8_decode(u_char **p, size_t n)
 
     u = **p;
 
-    if (u >= 0xf0) {
+    if (u >= 0xf8) {
+
+        (*p)++;
+        return 0xffffffff;
+
+    } else if (u >= 0xf0) {
 
         u &= 0x07;
         valid = 0xffff;
diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 0fb9be7..713eb42 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -140,12 +140,12 @@ ngx_copy(u_char *dst, u_char *src, size_t len)
 #endif
 
 
-#define ngx_memmove(dst, src, n)   (void) memmove(dst, src, n)
-#define ngx_movemem(dst, src, n)   (((u_char *) memmove(dst, src, n)) + (n))
+#define ngx_memmove(dst, src, n)  (void) memmove(dst, src, n)
+#define ngx_movemem(dst, src, n)  (((u_char *) memmove(dst, src, n)) + (n))
 
 
 /* msvc and icc7 compile memcmp() to the inline loop */
-#define ngx_memcmp(s1, s2, n)  memcmp((const char *) s1, (const char *) s2, n)
+#define ngx_memcmp(s1, s2, n)     memcmp(s1, s2, n)
 
 
 u_char *ngx_cpystrn(u_char *dst, u_char *src, size_t n);
diff --git a/src/core/ngx_syslog.c b/src/core/ngx_syslog.c
index 3c7b63a..bad45bd 100644
--- a/src/core/ngx_syslog.c
+++ b/src/core/ngx_syslog.c
@@ -18,6 +18,7 @@
 static char *ngx_syslog_parse_args(ngx_conf_t *cf, ngx_syslog_peer_t *peer);
 static ngx_int_t ngx_syslog_init_peer(ngx_syslog_peer_t *peer);
 static void ngx_syslog_cleanup(void *data);
+static u_char *ngx_syslog_log_error(ngx_log_t *log, u_char *buf, size_t len);
 
 
 static char  *facilities[] = {
@@ -66,6 +67,9 @@ ngx_syslog_process_conf(ngx_conf_t *cf, ngx_syslog_peer_t *peer)
         ngx_str_set(&peer->tag, "nginx");
     }
 
+    peer->hostname = &cf->cycle->hostname;
+    peer->logp = &cf->cycle->new_log;
+
     peer->conn.fd = (ngx_socket_t) -1;
 
     peer->conn.read = &ngx_syslog_dummy_event;
@@ -243,7 +247,7 @@ ngx_syslog_add_header(ngx_syslog_peer_t *peer, u_char *buf)
     }
 
     return ngx_sprintf(buf, "<%ui>%V %V %V: ", pri, &ngx_cached_syslog_time,
-                       &ngx_cycle->hostname, &peer->tag);
+                       peer->hostname, &peer->tag);
 }
 
 
@@ -286,15 +290,19 @@ ngx_syslog_send(ngx_syslog_peer_t *peer, u_char *buf, size_t len)
 {
     ssize_t  n;
 
+    if (peer->log.handler == NULL) {
+        peer->log = *peer->logp;
+        peer->log.handler = ngx_syslog_log_error;
+        peer->log.data = peer;
+        peer->log.action = "logging to syslog";
+    }
+
     if (peer->conn.fd == (ngx_socket_t) -1) {
         if (ngx_syslog_init_peer(peer) != NGX_OK) {
             return NGX_ERROR;
         }
     }
 
-    /* log syslog socket events with valid log */
-    peer->conn.log = ngx_cycle->log;
-
     if (ngx_send) {
         n = ngx_send(&peer->conn, buf, len);
 
@@ -306,7 +314,7 @@ ngx_syslog_send(ngx_syslog_peer_t *peer, u_char *buf, size_t len)
     if (n == NGX_ERROR) {
 
         if (ngx_close_socket(peer->conn.fd) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
+            ngx_log_error(NGX_LOG_ALERT, &peer->log, ngx_socket_errno,
                           ngx_close_socket_n " failed");
         }
 
@@ -324,24 +332,25 @@ ngx_syslog_init_peer(ngx_syslog_peer_t *peer)
 
     fd = ngx_socket(peer->server.sockaddr->sa_family, SOCK_DGRAM, 0);
     if (fd == (ngx_socket_t) -1) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_ALERT, &peer->log, ngx_socket_errno,
                       ngx_socket_n " failed");
         return NGX_ERROR;
     }
 
     if (ngx_nonblocking(fd) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_ALERT, &peer->log, ngx_socket_errno,
                       ngx_nonblocking_n " failed");
         goto failed;
     }
 
     if (connect(fd, peer->server.sockaddr, peer->server.socklen) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_ALERT, &peer->log, ngx_socket_errno,
                       "connect() failed");
         goto failed;
     }
 
     peer->conn.fd = fd;
+    peer->conn.log = &peer->log;
 
     /* UDP sockets are always ready to write */
     peer->conn.write->ready = 1;
@@ -351,7 +360,7 @@ ngx_syslog_init_peer(ngx_syslog_peer_t *peer)
 failed:
 
     if (ngx_close_socket(fd) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_ALERT, &peer->log, ngx_socket_errno,
                       ngx_close_socket_n " failed");
     }
 
@@ -372,7 +381,30 @@ ngx_syslog_cleanup(void *data)
     }
 
     if (ngx_close_socket(peer->conn.fd) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_ALERT, &peer->log, ngx_socket_errno,
                       ngx_close_socket_n " failed");
     }
 }
+
+
+static u_char *
+ngx_syslog_log_error(ngx_log_t *log, u_char *buf, size_t len)
+{
+    u_char             *p;
+    ngx_syslog_peer_t  *peer;
+
+    p = buf;
+
+    if (log->action) {
+        p = ngx_snprintf(buf, len, " while %s", log->action);
+        len -= p - buf;
+    }
+
+    peer = log->data;
+
+    if (peer) {
+        p = ngx_snprintf(p, len, ", server: %V", &peer->server.name);
+    }
+
+    return p;
+}
diff --git a/src/core/ngx_syslog.h b/src/core/ngx_syslog.h
index 50dcd35..e2d54ac 100644
--- a/src/core/ngx_syslog.h
+++ b/src/core/ngx_syslog.h
@@ -9,14 +9,20 @@
 
 
 typedef struct {
-    ngx_uint_t        facility;
-    ngx_uint_t        severity;
-    ngx_str_t         tag;
+    ngx_uint_t         facility;
+    ngx_uint_t         severity;
+    ngx_str_t          tag;
 
-    ngx_addr_t        server;
-    ngx_connection_t  conn;
-    unsigned          busy:1;
-    unsigned          nohostname:1;
+    ngx_str_t         *hostname;
+
+    ngx_addr_t         server;
+    ngx_connection_t   conn;
+
+    ngx_log_t          log;
+    ngx_log_t         *logp;
+
+    unsigned           busy:1;
+    unsigned           nohostname:1;
 } ngx_syslog_peer_t;
 
 
diff --git a/src/event/modules/ngx_iocp_module.c b/src/event/modules/ngx_iocp_module.c
new file mode 100644
index 0000000..dca5ced
--- /dev/null
+++ b/src/event/modules/ngx_iocp_module.c
@@ -0,0 +1,379 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_iocp_module.h>
+
+
+static ngx_int_t ngx_iocp_init(ngx_cycle_t *cycle, ngx_msec_t timer);
+static ngx_thread_value_t __stdcall ngx_iocp_timer(void *data);
+static void ngx_iocp_done(ngx_cycle_t *cycle);
+static ngx_int_t ngx_iocp_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t key);
+static ngx_int_t ngx_iocp_del_connection(ngx_connection_t *c, ngx_uint_t flags);
+static ngx_int_t ngx_iocp_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
+    ngx_uint_t flags);
+static void *ngx_iocp_create_conf(ngx_cycle_t *cycle);
+static char *ngx_iocp_init_conf(ngx_cycle_t *cycle, void *conf);
+
+
+static ngx_str_t      iocp_name = ngx_string("iocp");
+
+static ngx_command_t  ngx_iocp_commands[] = {
+
+    { ngx_string("iocp_threads"),
+      NGX_EVENT_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      0,
+      offsetof(ngx_iocp_conf_t, threads),
+      NULL },
+
+    { ngx_string("post_acceptex"),
+      NGX_EVENT_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      0,
+      offsetof(ngx_iocp_conf_t, post_acceptex),
+      NULL },
+
+    { ngx_string("acceptex_read"),
+      NGX_EVENT_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      0,
+      offsetof(ngx_iocp_conf_t, acceptex_read),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_event_module_t  ngx_iocp_module_ctx = {
+    &iocp_name,
+    ngx_iocp_create_conf,                  /* create configuration */
+    ngx_iocp_init_conf,                    /* init configuration */
+
+    {
+        ngx_iocp_add_event,                /* add an event */
+        NULL,                              /* delete an event */
+        NULL,                              /* enable an event */
+        NULL,                              /* disable an event */
+        NULL,                              /* add an connection */
+        ngx_iocp_del_connection,           /* delete an connection */
+        NULL,                              /* trigger a notify */
+        ngx_iocp_process_events,           /* process the events */
+        ngx_iocp_init,                     /* init the events */
+        ngx_iocp_done                      /* done the events */
+    }
+
+};
+
+ngx_module_t  ngx_iocp_module = {
+    NGX_MODULE_V1,
+    &ngx_iocp_module_ctx,                  /* module context */
+    ngx_iocp_commands,                     /* module directives */
+    NGX_EVENT_MODULE,                      /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+ngx_os_io_t ngx_iocp_io = {
+    ngx_overlapped_wsarecv,
+    NULL,
+    ngx_udp_overlapped_wsarecv,
+    NULL,
+    NULL,
+    NULL,
+    ngx_overlapped_wsasend_chain,
+    0
+};
+
+
+static HANDLE      iocp;
+static ngx_tid_t   timer_thread;
+static ngx_msec_t  msec;
+
+
+static ngx_int_t
+ngx_iocp_init(ngx_cycle_t *cycle, ngx_msec_t timer)
+{
+    ngx_iocp_conf_t  *cf;
+
+    cf = ngx_event_get_conf(cycle->conf_ctx, ngx_iocp_module);
+
+    if (iocp == NULL) {
+        iocp = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0,
+                                      cf->threads);
+    }
+
+    if (iocp == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "CreateIoCompletionPort() failed");
+        return NGX_ERROR;
+    }
+
+    ngx_io = ngx_iocp_io;
+
+    ngx_event_actions = ngx_iocp_module_ctx.actions;
+
+    ngx_event_flags = NGX_USE_IOCP_EVENT;
+
+    if (timer == 0) {
+        return NGX_OK;
+    }
+
+    /*
+     * The waitable timer could not be used, because
+     * GetQueuedCompletionStatus() does not set a thread to alertable state
+     */
+
+    if (timer_thread == NULL) {
+
+        msec = timer;
+
+        if (ngx_create_thread(&timer_thread, ngx_iocp_timer, &msec, cycle->log)
+            != 0)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_event_flags |= NGX_USE_TIMER_EVENT;
+
+    return NGX_OK;
+}
+
+
+static ngx_thread_value_t __stdcall
+ngx_iocp_timer(void *data)
+{
+    ngx_msec_t  timer = *(ngx_msec_t *) data;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
+                   "THREAD %p %p", &msec, data);
+
+    for ( ;; ) {
+        Sleep(timer);
+
+        ngx_time_update();
+#if 1
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0, "timer");
+#endif
+    }
+
+#if defined(__WATCOMC__) || defined(__GNUC__)
+    return 0;
+#endif
+}
+
+
+static void
+ngx_iocp_done(ngx_cycle_t *cycle)
+{
+    if (CloseHandle(iocp) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "iocp CloseHandle() failed");
+    }
+
+    iocp = NULL;
+}
+
+
+static ngx_int_t
+ngx_iocp_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t key)
+{
+    ngx_connection_t  *c;
+
+    c = (ngx_connection_t *) ev->data;
+
+    c->read->active = 1;
+    c->write->active = 1;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                   "iocp add: fd:%d k:%ui ov:%p", c->fd, key, &ev->ovlp);
+
+    if (CreateIoCompletionPort((HANDLE) c->fd, iocp, key, 0) == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
+                      "CreateIoCompletionPort() failed");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_iocp_del_connection(ngx_connection_t *c, ngx_uint_t flags)
+{
+#if 0
+    if (flags & NGX_CLOSE_EVENT) {
+        return NGX_OK;
+    }
+
+    if (CancelIo((HANDLE) c->fd) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno, "CancelIo() failed");
+        return NGX_ERROR;
+    }
+#endif
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_iocp_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
+{
+    int                rc;
+    u_int              key;
+    u_long             bytes;
+    ngx_err_t          err;
+    ngx_msec_t         delta;
+    ngx_event_t       *ev;
+    ngx_event_ovlp_t  *ovlp;
+
+    if (timer == NGX_TIMER_INFINITE) {
+        timer = INFINITE;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "iocp timer: %M", timer);
+
+    rc = GetQueuedCompletionStatus(iocp, &bytes, (PULONG_PTR) &key,
+                                   (LPOVERLAPPED *) &ovlp, (u_long) timer);
+
+    if (rc == 0) {
+        err = ngx_errno;
+    } else {
+        err = 0;
+    }
+
+    delta = ngx_current_msec;
+
+    if (flags & NGX_UPDATE_TIME) {
+        ngx_time_update();
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                   "iocp: %d b:%d k:%d ov:%p", rc, bytes, key, ovlp);
+
+    if (timer != INFINITE) {
+        delta = ngx_current_msec - delta;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                       "iocp timer: %M, delta: %M", timer, delta);
+    }
+
+    if (err) {
+        if (ovlp == NULL) {
+            if (err != WAIT_TIMEOUT) {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, err,
+                              "GetQueuedCompletionStatus() failed");
+
+                return NGX_ERROR;
+            }
+
+            return NGX_OK;
+        }
+
+        ovlp->error = err;
+    }
+
+    if (ovlp == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                      "GetQueuedCompletionStatus() returned no operation");
+        return NGX_ERROR;
+    }
+
+
+    ev = ovlp->event;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, err, "iocp event:%p", ev);
+
+
+    if (err == ERROR_NETNAME_DELETED /* the socket was closed */
+        || err == ERROR_OPERATION_ABORTED /* the operation was canceled */)
+    {
+
+        /*
+         * the WSA_OPERATION_ABORTED completion notification
+         * for a file descriptor that was closed
+         */
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, err,
+                       "iocp: aborted event %p", ev);
+
+        return NGX_OK;
+    }
+
+    if (err) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, err,
+                      "GetQueuedCompletionStatus() returned operation error");
+    }
+
+    switch (key) {
+
+    case NGX_IOCP_ACCEPT:
+        if (bytes) {
+            ev->ready = 1;
+        }
+        break;
+
+    case NGX_IOCP_IO:
+        ev->complete = 1;
+        ev->ready = 1;
+        break;
+
+    case NGX_IOCP_CONNECT:
+        ev->ready = 1;
+    }
+
+    ev->available = bytes;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                   "iocp event handler: %p", ev->handler);
+
+    ev->handler(ev);
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_iocp_create_conf(ngx_cycle_t *cycle)
+{
+    ngx_iocp_conf_t  *cf;
+
+    cf = ngx_palloc(cycle->pool, sizeof(ngx_iocp_conf_t));
+    if (cf == NULL) {
+        return NULL;
+    }
+
+    cf->threads = NGX_CONF_UNSET;
+    cf->post_acceptex = NGX_CONF_UNSET;
+    cf->acceptex_read = NGX_CONF_UNSET;
+
+    return cf;
+}
+
+
+static char *
+ngx_iocp_init_conf(ngx_cycle_t *cycle, void *conf)
+{
+    ngx_iocp_conf_t *cf = conf;
+
+    ngx_conf_init_value(cf->threads, 0);
+    ngx_conf_init_value(cf->post_acceptex, 10);
+    ngx_conf_init_value(cf->acceptex_read, 1);
+
+    return NGX_CONF_OK;
+}
diff --git a/src/event/modules/ngx_iocp_module.h b/src/event/modules/ngx_iocp_module.h
new file mode 100644
index 0000000..dc73983
--- /dev/null
+++ b/src/event/modules/ngx_iocp_module.h
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_IOCP_MODULE_H_INCLUDED_
+#define _NGX_IOCP_MODULE_H_INCLUDED_
+
+
+typedef struct {
+    int  threads;
+    int  post_acceptex;
+    int  acceptex_read;
+} ngx_iocp_conf_t;
+
+
+extern ngx_module_t  ngx_iocp_module;
+
+
+#endif /* _NGX_IOCP_MODULE_H_INCLUDED_ */
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 47229b5..d81547a 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -416,6 +416,7 @@ ngx_event_init_conf(ngx_cycle_t *cycle, void *conf)
 {
 #if (NGX_HAVE_REUSEPORT)
     ngx_uint_t        i;
+    ngx_core_conf_t  *ccf;
     ngx_listening_t  *ls;
 #endif
 
@@ -442,7 +443,9 @@ ngx_event_init_conf(ngx_cycle_t *cycle, void *conf)
 
 #if (NGX_HAVE_REUSEPORT)
 
-    if (!ngx_test_config) {
+    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+
+    if (!ngx_test_config && ccf->master) {
 
         ls = cycle->listening.elts;
         for (i = 0; i < cycle->listening.nelts; i++) {
@@ -810,7 +813,9 @@ ngx_event_process_init(ngx_cycle_t *cycle)
         rev->deferred_accept = ls[i].deferred_accept;
 #endif
 
-        if (!(ngx_event_flags & NGX_USE_IOCP_EVENT)) {
+        if (!(ngx_event_flags & NGX_USE_IOCP_EVENT)
+            && cycle->old_cycle)
+        {
             if (ls[i].previous) {
 
                 /*
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 548c906..deac04e 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -494,12 +494,6 @@ extern ngx_module_t           ngx_event_core_module;
 
 
 void ngx_event_accept(ngx_event_t *ev);
-#if !(NGX_WIN32)
-void ngx_event_recvmsg(ngx_event_t *ev);
-void ngx_udp_rbtree_insert_value(ngx_rbtree_node_t *temp,
-    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
-#endif
-void ngx_delete_udp_connection(void *data);
 ngx_int_t ngx_trylock_accept_mutex(ngx_cycle_t *cycle);
 ngx_int_t ngx_enable_accept_events(ngx_cycle_t *cycle);
 u_char *ngx_accept_log_error(ngx_log_t *log, u_char *buf, size_t len);
@@ -529,6 +523,7 @@ ngx_int_t ngx_send_lowat(ngx_connection_t *c, size_t lowat);
 
 #include <ngx_event_timer.h>
 #include <ngx_event_posted.h>
+#include <ngx_event_udp.h>
 
 #if (NGX_WIN32)
 #include <ngx_iocp_module.h>
diff --git a/src/event/ngx_event_acceptex.c b/src/event/ngx_event_acceptex.c
new file mode 100644
index 0000000..f4a1c4b
--- /dev/null
+++ b/src/event/ngx_event_acceptex.c
@@ -0,0 +1,229 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+static void ngx_close_posted_connection(ngx_connection_t *c);
+
+
+void
+ngx_event_acceptex(ngx_event_t *rev)
+{
+    ngx_listening_t   *ls;
+    ngx_connection_t  *c;
+
+    c = rev->data;
+    ls = c->listening;
+
+    c->log->handler = ngx_accept_log_error;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "AcceptEx: %d", c->fd);
+
+    if (rev->ovlp.error) {
+        ngx_log_error(NGX_LOG_CRIT, c->log, rev->ovlp.error,
+                      "AcceptEx() %V failed", &ls->addr_text);
+        return;
+    }
+
+    /* SO_UPDATE_ACCEPT_CONTEXT is required for shutdown() to work */
+
+    if (setsockopt(c->fd, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT,
+                   (char *) &ls->fd, sizeof(ngx_socket_t))
+        == -1)
+    {
+        ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
+                      "setsockopt(SO_UPDATE_ACCEPT_CONTEXT) failed for %V",
+                      &c->addr_text);
+        /* TODO: close socket */
+        return;
+    }
+
+    ngx_getacceptexsockaddrs(c->buffer->pos,
+                             ls->post_accept_buffer_size,
+                             ls->socklen + 16,
+                             ls->socklen + 16,
+                             &c->local_sockaddr, &c->local_socklen,
+                             &c->sockaddr, &c->socklen);
+
+    if (ls->post_accept_buffer_size) {
+        c->buffer->last += rev->available;
+        c->buffer->end = c->buffer->start + ls->post_accept_buffer_size;
+
+    } else {
+        c->buffer = NULL;
+    }
+
+    if (ls->addr_ntop) {
+        c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
+        if (c->addr_text.data == NULL) {
+            /* TODO: close socket */
+            return;
+        }
+
+        c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->socklen,
+                                         c->addr_text.data,
+                                         ls->addr_text_max_len, 0);
+        if (c->addr_text.len == 0) {
+            /* TODO: close socket */
+            return;
+        }
+    }
+
+    ngx_event_post_acceptex(ls, 1);
+
+    c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+
+    c->start_time = ngx_current_msec;
+
+    ls->handler(c);
+
+    return;
+
+}
+
+
+ngx_int_t
+ngx_event_post_acceptex(ngx_listening_t *ls, ngx_uint_t n)
+{
+    u_long             rcvd;
+    ngx_err_t          err;
+    ngx_log_t         *log;
+    ngx_uint_t         i;
+    ngx_event_t       *rev, *wev;
+    ngx_socket_t       s;
+    ngx_connection_t  *c;
+
+    for (i = 0; i < n; i++) {
+
+        /* TODO: look up reused sockets */
+
+        s = ngx_socket(ls->sockaddr->sa_family, ls->type, 0);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &ls->log, 0,
+                       ngx_socket_n " s:%d", s);
+
+        if (s == (ngx_socket_t) -1) {
+            ngx_log_error(NGX_LOG_ALERT, &ls->log, ngx_socket_errno,
+                          ngx_socket_n " failed");
+
+            return NGX_ERROR;
+        }
+
+        c = ngx_get_connection(s, &ls->log);
+
+        if (c == NULL) {
+            return NGX_ERROR;
+        }
+
+        c->pool = ngx_create_pool(ls->pool_size, &ls->log);
+        if (c->pool == NULL) {
+            ngx_close_posted_connection(c);
+            return NGX_ERROR;
+        }
+
+        log = ngx_palloc(c->pool, sizeof(ngx_log_t));
+        if (log == NULL) {
+            ngx_close_posted_connection(c);
+            return NGX_ERROR;
+        }
+
+        c->buffer = ngx_create_temp_buf(c->pool, ls->post_accept_buffer_size
+                                                 + 2 * (ls->socklen + 16));
+        if (c->buffer == NULL) {
+            ngx_close_posted_connection(c);
+            return NGX_ERROR;
+        }
+
+        c->local_sockaddr = ngx_palloc(c->pool, ls->socklen);
+        if (c->local_sockaddr == NULL) {
+            ngx_close_posted_connection(c);
+            return NGX_ERROR;
+        }
+
+        c->sockaddr = ngx_palloc(c->pool, ls->socklen);
+        if (c->sockaddr == NULL) {
+            ngx_close_posted_connection(c);
+            return NGX_ERROR;
+        }
+
+        *log = ls->log;
+        c->log = log;
+
+        c->recv = ngx_recv;
+        c->send = ngx_send;
+        c->recv_chain = ngx_recv_chain;
+        c->send_chain = ngx_send_chain;
+
+        c->listening = ls;
+
+        rev = c->read;
+        wev = c->write;
+
+        rev->ovlp.event = rev;
+        wev->ovlp.event = wev;
+        rev->handler = ngx_event_acceptex;
+
+        rev->ready = 1;
+        wev->ready = 1;
+
+        rev->log = c->log;
+        wev->log = c->log;
+
+        if (ngx_add_event(rev, 0, NGX_IOCP_IO) == NGX_ERROR) {
+            ngx_close_posted_connection(c);
+            return NGX_ERROR;
+        }
+
+        if (ngx_acceptex(ls->fd, s, c->buffer->pos, ls->post_accept_buffer_size,
+                         ls->socklen + 16, ls->socklen + 16,
+                         &rcvd, (LPOVERLAPPED) &rev->ovlp)
+            == 0)
+        {
+            err = ngx_socket_errno;
+            if (err != WSA_IO_PENDING) {
+                ngx_log_error(NGX_LOG_ALERT, &ls->log, err,
+                              "AcceptEx() %V failed", &ls->addr_text);
+
+                ngx_close_posted_connection(c);
+                return NGX_ERROR;
+            }
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_close_posted_connection(ngx_connection_t *c)
+{
+    ngx_socket_t  fd;
+
+    ngx_free_connection(c);
+
+    fd = c->fd;
+    c->fd = (ngx_socket_t) -1;
+
+    if (ngx_close_socket(fd) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, ngx_socket_errno,
+                      ngx_close_socket_n " failed");
+    }
+
+    if (c->pool) {
+        ngx_destroy_pool(c->pool);
+    }
+}
+
+
+u_char *
+ngx_acceptex_log_error(ngx_log_t *log, u_char *buf, size_t len)
+{
+    return ngx_snprintf(buf, len, " while posting AcceptEx() on %V", log->data);
+}
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index adbbde6..668084a 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -179,6 +179,8 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
         c->recv = ngx_udp_recv;
         c->send = ngx_send;
         c->send_chain = ngx_udp_send_chain;
+
+        c->need_flush_buf = 1;
     }
 
     c->log_error = pc->log_error;
diff --git a/src/event/ngx_event_connectex.c b/src/event/ngx_event_connectex.c
new file mode 100644
index 0000000..36b1514
--- /dev/null
+++ b/src/event/ngx_event_connectex.c
@@ -0,0 +1,206 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+#define NGX_MAX_PENDING_CONN  10
+
+
+static CRITICAL_SECTION  connect_lock;
+static int               nconnects;
+static ngx_connection_t  pending_connects[NGX_MAX_PENDING_CONN];
+
+static HANDLE            pending_connect_event;
+
+__declspec(thread) int                nevents = 0;
+__declspec(thread) WSAEVENT           events[WSA_MAXIMUM_WAIT_EVENTS + 1];
+__declspec(thread) ngx_connection_t  *conn[WSA_MAXIMUM_WAIT_EVENTS + 1];
+
+
+
+int ngx_iocp_wait_connect(ngx_connection_t *c)
+{
+    for ( ;; ) {
+        EnterCriticalSection(&connect_lock);
+
+        if (nconnects < NGX_MAX_PENDING_CONN) {
+            pending_connects[--nconnects] = c;
+            LeaveCriticalSection(&connect_lock);
+
+            if (SetEvent(pending_connect_event) == 0) {
+                ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
+                              "SetEvent() failed");
+                return NGX_ERROR;
+
+            break;
+        }
+
+        LeaveCriticalSection(&connect_lock);
+        ngx_log_error(NGX_LOG_NOTICE, c->log, 0,
+                      "max number of pending connect()s is %d",
+                      NGX_MAX_PENDING_CONN);
+        msleep(100);
+    }
+
+    if (!started) {
+        if (ngx_iocp_new_thread(1) == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+        started = 1;
+    }
+
+    return NGX_OK;
+}
+
+
+int ngx_iocp_new_thread(int main)
+{
+    u_int  id;
+
+    if (main) {
+        pending_connect_event = CreateEvent(NULL, 0, 1, NULL);
+        if (pending_connect_event == INVALID_HANDLE_VALUE) {
+            ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
+                          "CreateThread() failed");
+            return NGX_ERROR;
+        }
+    }
+
+    if (CreateThread(NULL, 0, ngx_iocp_wait_events, main, 0, &id)
+                                                       == INVALID_HANDLE_VALUE)
+    {
+        ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
+                      "CreateThread() failed");
+        return NGX_ERROR;
+    }
+
+    SetEvent(event) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
+                      "SetEvent() failed");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+int ngx_iocp_new_connect()
+{
+    EnterCriticalSection(&connect_lock);
+    c = pending_connects[--nconnects];
+    LeaveCriticalSection(&connect_lock);
+
+    conn[nevents] = c;
+
+    events[nevents] = WSACreateEvent();
+    if (events[nevents] == INVALID_HANDLE_VALUE) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, ngx_socket_errno,
+                      "WSACreateEvent() failed");
+        return NGX_ERROR;
+    }
+
+    if (WSAEventSelect(c->fd, events[nevents], FD_CONNECT) == -1)
+        ngx_log_error(NGX_LOG_ALERT, c->log, ngx_socket_errno,
+                      "WSAEventSelect() failed");
+        return NGX_ERROR;
+    }
+
+    nevents++;
+
+    return NGX_OK;
+}
+
+
+void ngx_iocp_wait_events(int main)
+{
+    WSANETWORKEVENTS  ne;
+
+    nevents = 1;
+    events[0] = pending_connect_event;
+    conn[0] = NULL;
+
+    for ( ;; ) {
+        offset = (nevents == WSA_MAXIMUM_WAIT_EVENTS + 1) ? 1 : 0;
+        timeout = (nevents == 1 && !first) ? 60000 : INFINITE;
+
+        n = WSAWaitForMultipleEvents(nevents - offset, events[offset],
+                                     0, timeout, 0);
+        if (n == WAIT_FAILED) {
+            ngx_log_error(NGX_LOG_ALERT, log, ngx_socket_errno,
+                          "WSAWaitForMultipleEvents() failed");
+            continue;
+        }
+
+        if (n == WAIT_TIMEOUT) {
+            if (nevents == 2 && !main) {
+                ExitThread(0);
+            }
+
+            ngx_log_error(NGX_LOG_ALERT, log, 0,
+                          "WSAWaitForMultipleEvents() "
+                          "returned unexpected WAIT_TIMEOUT");
+            continue;
+        }
+
+        n -= WSA_WAIT_EVENT_0;
+
+        if (events[n] == NULL) {
+
+            /* the pending_connect_event */
+
+            if (nevents == WSA_MAXIMUM_WAIT_EVENTS) {
+                ngx_iocp_new_thread(0);
+            } else {
+                ngx_iocp_new_connect();
+            }
+
+            continue;
+        }
+
+        if (WSAEnumNetworkEvents(c[n].fd, events[n], &ne) == -1) {
+            ngx_log_error(NGX_LOG_ALERT, log, ngx_socket_errno,
+                          "WSAEnumNetworkEvents() failed");
+            continue;
+        }
+
+        if (ne.lNetworkEvents & FD_CONNECT) {
+            conn[n].write->ovlp.error = ne.iErrorCode[FD_CONNECT_BIT];
+
+            if (PostQueuedCompletionStatus(iocp, 0, NGX_IOCP_CONNECT,
+                                           &conn[n].write->ovlp) == 0)
+            {
+                ngx_log_error(NGX_LOG_ALERT, log, ngx_socket_errno,
+                              "PostQueuedCompletionStatus() failed");
+                continue;
+            }
+
+            if (n < nevents) {
+                conn[n] = conn[nevents];
+                events[n] = events[nevents];
+            }
+
+            nevents--;
+            continue;
+        }
+
+        if (ne.lNetworkEvents & FD_ACCEPT) {
+
+            /* CHECK ERROR ??? */
+
+            ngx_event_post_acceptex(conn[n].listening, 1);
+            continue;
+        }
+
+        ngx_log_error(NGX_LOG_ALERT, c[n].log, 0,
+                      "WSAWaitForMultipleEvents() "
+                      "returned unexpected network event %ul",
+                      ne.lNetworkEvents);
+    }
+}
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 1e6fc96..104e8da 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -71,10 +71,11 @@ static void ngx_ssl_session_rbtree_insert_value(ngx_rbtree_node_t *temp,
     ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
 
 #ifdef SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB
-static int ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
+static int ngx_ssl_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     unsigned char *name, unsigned char *iv, EVP_CIPHER_CTX *ectx,
     HMAC_CTX *hctx, int enc);
-static void ngx_ssl_session_ticket_keys_cleanup(void *data);
+static ngx_int_t ngx_ssl_rotate_ticket_keys(SSL_CTX *ssl_ctx, ngx_log_t *log);
+static void ngx_ssl_ticket_keys_cleanup(void *data);
 #endif
 
 #ifndef X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT
@@ -131,7 +132,7 @@ ngx_module_t  ngx_openssl_module = {
 int  ngx_ssl_connection_index;
 int  ngx_ssl_server_conf_index;
 int  ngx_ssl_session_cache_index;
-int  ngx_ssl_session_ticket_keys_index;
+int  ngx_ssl_ticket_keys_index;
 int  ngx_ssl_ocsp_index;
 int  ngx_ssl_certificate_index;
 int  ngx_ssl_next_certificate_index;
@@ -208,9 +209,9 @@ ngx_ssl_init(ngx_log_t *log)
         return NGX_ERROR;
     }
 
-    ngx_ssl_session_ticket_keys_index = SSL_CTX_get_ex_new_index(0, NULL, NULL,
-                                                                 NULL, NULL);
-    if (ngx_ssl_session_ticket_keys_index == -1) {
+    ngx_ssl_ticket_keys_index = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL,
+                                                         NULL);
+    if (ngx_ssl_ticket_keys_index == -1) {
         ngx_ssl_error(NGX_LOG_ALERT, log, 0,
                       "SSL_CTX_get_ex_new_index() failed");
         return NGX_ERROR;
@@ -1083,6 +1084,53 @@ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
         }
     }
 
+#endif
+
+#ifdef TLS1_3_VERSION
+
+    if ((where & SSL_CB_ACCEPT_LOOP) == SSL_CB_ACCEPT_LOOP
+        && SSL_version(ssl_conn) == TLS1_3_VERSION)
+    {
+        time_t        now, time, timeout, conf_timeout;
+        SSL_SESSION  *sess;
+
+        /*
+         * OpenSSL with TLSv1.3 updates the session creation time on
+         * session resumption and keeps the session timeout unmodified,
+         * making it possible to maintain the session forever, bypassing
+         * client certificate expiration and revocation.  To make sure
+         * session timeouts are actually used, we now update the session
+         * creation time and reduce the session timeout accordingly.
+         *
+         * BoringSSL with TLSv1.3 ignores configured session timeouts
+         * and uses a hardcoded timeout instead, 7 days.  So we update
+         * session timeout to the configured value as soon as a session
+         * is created.
+         */
+
+        c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
+        sess = SSL_get0_session(ssl_conn);
+
+        if (!c->ssl->session_timeout_set && sess) {
+            c->ssl->session_timeout_set = 1;
+
+            now = ngx_time();
+            time = SSL_SESSION_get_time(sess);
+            timeout = SSL_SESSION_get_timeout(sess);
+            conf_timeout = SSL_CTX_get_timeout(c->ssl->session_ctx);
+
+            timeout = ngx_min(timeout, conf_timeout);
+
+            if (now - time >= timeout) {
+                SSL_SESSION_set1_id_context(sess, (unsigned char *) "", 0);
+
+            } else {
+                SSL_SESSION_set_time(sess, now);
+                SSL_SESSION_set_timeout(sess, timeout - (now - time));
+            }
+        }
+    }
+
 #endif
 
     if ((where & SSL_CB_ACCEPT_LOOP) == SSL_CB_ACCEPT_LOOP) {
@@ -1426,9 +1474,9 @@ ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
 
     SSL_CTX_set_options(ssl->ctx, SSL_OP_SINGLE_ECDH_USE);
 
-#if SSL_CTRL_SET_ECDH_AUTO
+#ifdef SSL_CTRL_SET_ECDH_AUTO
     /* not needed in OpenSSL 1.1.0+ */
-    SSL_CTX_set_ecdh_auto(ssl->ctx, 1);
+    (void) SSL_CTX_set_ecdh_auto(ssl->ctx, 1);
 #endif
 
     if (ngx_strcmp(name->data, "auto") == 0) {
@@ -1769,7 +1817,7 @@ ngx_ssl_handshake(ngx_connection_t *c)
 #endif
 #endif
 
-#ifdef BIO_get_ktls_send
+#if (defined BIO_get_ktls_send && !NGX_WIN32)
 
         if (BIO_get_ktls_send(SSL_get_wbio(c->ssl->connection)) == 1) {
             ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
@@ -1914,7 +1962,7 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
         c->read->ready = 1;
         c->write->ready = 1;
 
-#ifdef BIO_get_ktls_send
+#if (defined BIO_get_ktls_send && !NGX_WIN32)
 
         if (BIO_get_ktls_send(SSL_get_wbio(c->ssl->connection)) == 1) {
             ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
@@ -2156,6 +2204,7 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
 #endif
 
     if (c->ssl->last == NGX_ERROR) {
+        c->read->ready = 0;
         c->read->error = 1;
         return NGX_ERROR;
     }
@@ -2222,6 +2271,7 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
 #if (NGX_HAVE_FIONREAD)
 
                     if (ngx_socket_nread(c->fd, &c->read->available) == -1) {
+                        c->read->ready = 0;
                         c->read->error = 1;
                         ngx_connection_error(c, ngx_socket_errno,
                                              ngx_socket_nread_n " failed");
@@ -2258,6 +2308,7 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
             return 0;
 
         case NGX_ERROR:
+            c->read->ready = 0;
             c->read->error = 1;
 
             /* fall through */
@@ -2278,6 +2329,7 @@ ngx_ssl_recv_early(ngx_connection_t *c, u_char *buf, size_t size)
     size_t     readbytes;
 
     if (c->ssl->last == NGX_ERROR) {
+        c->read->ready = 0;
         c->read->error = 1;
         return NGX_ERROR;
     }
@@ -2377,6 +2429,7 @@ ngx_ssl_recv_early(ngx_connection_t *c, u_char *buf, size_t size)
             return 0;
 
         case NGX_ERROR:
+            c->read->ready = 0;
             c->read->error = 1;
 
             /* fall through */
@@ -2943,7 +2996,7 @@ ngx_ssl_write_early(ngx_connection_t *c, u_char *data, size_t size)
 static ssize_t
 ngx_ssl_sendfile(ngx_connection_t *c, ngx_buf_t *file, size_t size)
 {
-#ifdef BIO_get_ktls_send
+#if (defined BIO_get_ktls_send && !NGX_WIN32)
 
     int        sslerr, flags;
     ssize_t    n;
@@ -2972,7 +3025,7 @@ ngx_ssl_sendfile(ngx_connection_t *c, ngx_buf_t *file, size_t size)
     n = SSL_sendfile(c->ssl->connection, file->file->fd, file->file_pos,
                      size, flags);
 
-    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_sendfile: %d", n);
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_sendfile: %z", n);
 
     if (n > 0) {
 
@@ -3336,30 +3389,74 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
 
     } else if (sslerr == SSL_ERROR_SSL) {
 
-        n = ERR_GET_REASON(ERR_peek_error());
+        n = ERR_GET_REASON(ERR_peek_last_error());
 
             /* handshake failures */
         if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC                        /*  103 */
 #ifdef SSL_R_NO_SUITABLE_KEY_SHARE
             || n == SSL_R_NO_SUITABLE_KEY_SHARE                      /*  101 */
 #endif
+#ifdef SSL_R_BAD_ALERT
+            || n == SSL_R_BAD_ALERT                                  /*  102 */
+#endif
+#ifdef SSL_R_BAD_KEY_SHARE
+            || n == SSL_R_BAD_KEY_SHARE                              /*  108 */
+#endif
+#ifdef SSL_R_BAD_EXTENSION
+            || n == SSL_R_BAD_EXTENSION                              /*  110 */
+#endif
+            || n == SSL_R_BAD_DIGEST_LENGTH                          /*  111 */
+#ifdef SSL_R_MISSING_SIGALGS_EXTENSION
+            || n == SSL_R_MISSING_SIGALGS_EXTENSION                  /*  112 */
+#endif
+            || n == SSL_R_BAD_PACKET_LENGTH                          /*  115 */
 #ifdef SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM
             || n == SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM            /*  118 */
+#endif
+#ifdef SSL_R_BAD_KEY_UPDATE
+            || n == SSL_R_BAD_KEY_UPDATE                             /*  122 */
 #endif
             || n == SSL_R_BLOCK_CIPHER_PAD_IS_WRONG                  /*  129 */
+            || n == SSL_R_CCS_RECEIVED_EARLY                         /*  133 */
+#ifdef SSL_R_DECODE_ERROR
+            || n == SSL_R_DECODE_ERROR                               /*  137 */
+#endif
+#ifdef SSL_R_DATA_BETWEEN_CCS_AND_FINISHED
+            || n == SSL_R_DATA_BETWEEN_CCS_AND_FINISHED              /*  145 */
+#endif
+            || n == SSL_R_DATA_LENGTH_TOO_LONG                       /*  146 */
             || n == SSL_R_DIGEST_CHECK_FAILED                        /*  149 */
+            || n == SSL_R_ENCRYPTED_LENGTH_TOO_LONG                  /*  150 */
             || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              /*  151 */
             || n == SSL_R_EXCESSIVE_MESSAGE_SIZE                     /*  152 */
+#ifdef SSL_R_GOT_A_FIN_BEFORE_A_CCS
+            || n == SSL_R_GOT_A_FIN_BEFORE_A_CCS                     /*  154 */
+#endif
             || n == SSL_R_HTTPS_PROXY_REQUEST                        /*  155 */
             || n == SSL_R_HTTP_REQUEST                               /*  156 */
             || n == SSL_R_LENGTH_MISMATCH                            /*  159 */
+#ifdef SSL_R_LENGTH_TOO_SHORT
+            || n == SSL_R_LENGTH_TOO_SHORT                           /*  160 */
+#endif
+#ifdef SSL_R_NO_RENEGOTIATION
+            || n == SSL_R_NO_RENEGOTIATION                           /*  182 */
+#endif
 #ifdef SSL_R_NO_CIPHERS_PASSED
             || n == SSL_R_NO_CIPHERS_PASSED                          /*  182 */
 #endif
             || n == SSL_R_NO_CIPHERS_SPECIFIED                       /*  183 */
+#ifdef SSL_R_BAD_CIPHER
+            || n == SSL_R_BAD_CIPHER                                 /*  186 */
+#endif
             || n == SSL_R_NO_COMPRESSION_SPECIFIED                   /*  187 */
             || n == SSL_R_NO_SHARED_CIPHER                           /*  193 */
+#ifdef SSL_R_PACKET_LENGTH_TOO_LONG
+            || n == SSL_R_PACKET_LENGTH_TOO_LONG                     /*  198 */
+#endif
             || n == SSL_R_RECORD_LENGTH_MISMATCH                     /*  213 */
+#ifdef SSL_R_TOO_MANY_WARNING_ALERTS
+            || n == SSL_R_TOO_MANY_WARNING_ALERTS                    /*  220 */
+#endif
 #ifdef SSL_R_CLIENTHELLO_TLSEXT
             || n == SSL_R_CLIENTHELLO_TLSEXT                         /*  226 */
 #endif
@@ -3369,6 +3466,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
 #ifdef SSL_R_CALLBACK_FAILED
             || n == SSL_R_CALLBACK_FAILED                            /*  234 */
 #endif
+#ifdef SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG
+            || n == SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG    /*  234 */
+#endif
 #ifdef SSL_R_NO_APPLICATION_PROTOCOL
             || n == SSL_R_NO_APPLICATION_PROTOCOL                    /*  235 */
 #endif
@@ -3378,13 +3478,44 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
             || n == SSL_R_UNKNOWN_PROTOCOL                           /*  252 */
 #ifdef SSL_R_NO_COMMON_SIGNATURE_ALGORITHMS
             || n == SSL_R_NO_COMMON_SIGNATURE_ALGORITHMS             /*  253 */
+#endif
+#ifdef SSL_R_INVALID_COMPRESSION_LIST
+            || n == SSL_R_INVALID_COMPRESSION_LIST                   /*  256 */
+#endif
+#ifdef SSL_R_MISSING_KEY_SHARE
+            || n == SSL_R_MISSING_KEY_SHARE                          /*  258 */
 #endif
             || n == SSL_R_UNSUPPORTED_PROTOCOL                       /*  258 */
 #ifdef SSL_R_NO_SHARED_GROUP
             || n == SSL_R_NO_SHARED_GROUP                            /*  266 */
 #endif
             || n == SSL_R_WRONG_VERSION_NUMBER                       /*  267 */
+#ifdef SSL_R_TOO_MUCH_SKIPPED_EARLY_DATA
+            || n == SSL_R_TOO_MUCH_SKIPPED_EARLY_DATA                /*  270 */
+#endif
+            || n == SSL_R_BAD_LENGTH                                 /*  271 */
             || n == SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC        /*  281 */
+#ifdef SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY
+            || n == SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY        /*  291 */
+#endif
+#ifdef SSL_R_APPLICATION_DATA_ON_SHUTDOWN
+            || n == SSL_R_APPLICATION_DATA_ON_SHUTDOWN               /*  291 */
+#endif
+#ifdef SSL_R_BAD_LEGACY_VERSION
+            || n == SSL_R_BAD_LEGACY_VERSION                         /*  292 */
+#endif
+#ifdef SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA
+            || n == SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA     /*  293 */
+#endif
+#ifdef SSL_R_RECORD_TOO_SMALL
+            || n == SSL_R_RECORD_TOO_SMALL                           /*  298 */
+#endif
+#ifdef SSL_R_SSL3_SESSION_ID_TOO_LONG
+            || n == SSL_R_SSL3_SESSION_ID_TOO_LONG                   /*  300 */
+#endif
+#ifdef SSL_R_BAD_ECPOINT
+            || n == SSL_R_BAD_ECPOINT                                /*  306 */
+#endif
 #ifdef SSL_R_RENEGOTIATE_EXT_TOO_LONG
             || n == SSL_R_RENEGOTIATE_EXT_TOO_LONG                   /*  335 */
             || n == SSL_R_RENEGOTIATION_ENCODING_ERR                 /*  336 */
@@ -3399,11 +3530,23 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
 #ifdef SSL_R_INAPPROPRIATE_FALLBACK
             || n == SSL_R_INAPPROPRIATE_FALLBACK                     /*  373 */
 #endif
+#ifdef SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS
+            || n == SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS             /*  376 */
+#endif
+#ifdef SSL_R_NO_SHARED_SIGATURE_ALGORITHMS
+            || n == SSL_R_NO_SHARED_SIGATURE_ALGORITHMS              /*  376 */
+#endif
 #ifdef SSL_R_CERT_CB_ERROR
             || n == SSL_R_CERT_CB_ERROR                              /*  377 */
 #endif
 #ifdef SSL_R_VERSION_TOO_LOW
             || n == SSL_R_VERSION_TOO_LOW                            /*  396 */
+#endif
+#ifdef SSL_R_TOO_MANY_WARN_ALERTS
+            || n == SSL_R_TOO_MANY_WARN_ALERTS                       /*  409 */
+#endif
+#ifdef SSL_R_BAD_RECORD_TYPE
+            || n == SSL_R_BAD_RECORD_TYPE                            /*  443 */
 #endif
             || n == 1000 /* SSL_R_SSLV3_ALERT_CLOSE_NOTIFY */
 #ifdef SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE
@@ -3749,6 +3892,12 @@ ngx_ssl_session_cache_init(ngx_shm_zone_t *shm_zone, void *data)
 
     ngx_queue_init(&cache->expire_queue);
 
+    cache->ticket_keys[0].expire = 0;
+    cache->ticket_keys[1].expire = 0;
+    cache->ticket_keys[2].expire = 0;
+
+    cache->fail_time = 0;
+
     len = sizeof(" in SSL session shared cache \"\"") + shm_zone->shm.name.len;
 
     shpool->log_ctx = ngx_slab_alloc(shpool, len);
@@ -3767,16 +3916,16 @@ ngx_ssl_session_cache_init(ngx_shm_zone_t *shm_zone, void *data)
 
 /*
  * The length of the session id is 16 bytes for SSLv2 sessions and
- * between 1 and 32 bytes for SSLv3/TLSv1, typically 32 bytes.
- * It seems that the typical length of the external ASN1 representation
- * of a session is 118 or 119 bytes for SSLv3/TSLv1.
+ * between 1 and 32 bytes for SSLv3 and TLS, typically 32 bytes.
+ * Typical length of the external ASN1 representation of a session
+ * is about 150 bytes plus SNI server name.
  *
- * Thus on 32-bit platforms we allocate separately an rbtree node,
- * a session id, and an ASN1 representation, they take accordingly
- * 64, 32, and 128 bytes.
+ * On 32-bit platforms we allocate an rbtree node, a session id, and
+ * an ASN1 representation in a single allocation, it typically takes
+ * 256 bytes.
  *
  * On 64-bit platforms we allocate separately an rbtree node + session_id,
- * and an ASN1 representation, they take accordingly 128 and 128 bytes.
+ * and an ASN1 representation, they take accordingly 128 and 256 bytes.
  *
  * OpenSSL's i2d_SSL_SESSION() and d2i_SSL_SESSION are slow,
  * so they are outside the code locked by shared pool mutex
@@ -3786,7 +3935,8 @@ static int
 ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
 {
     int                       len;
-    u_char                   *p, *id, *cached_sess, *session_id;
+    u_char                   *p, *session_id;
+    size_t                    n;
     uint32_t                  hash;
     SSL_CTX                  *ssl_ctx;
     unsigned int              session_id_length;
@@ -3797,17 +3947,42 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
     ngx_ssl_session_cache_t  *cache;
     u_char                    buf[NGX_SSL_MAX_SESSION_SIZE];
 
+#ifdef TLS1_3_VERSION
+
+    /*
+     * OpenSSL tries to save TLSv1.3 sessions into session cache
+     * even when using tickets for stateless session resumption,
+     * "because some applications just want to know about the creation
+     * of a session"; do not cache such sessions
+     */
+
+    if (SSL_version(ssl_conn) == TLS1_3_VERSION
+        && (SSL_get_options(ssl_conn) & SSL_OP_NO_TICKET) == 0)
+    {
+        return 0;
+    }
+
+#endif
+
     len = i2d_SSL_SESSION(sess, NULL);
 
     /* do not cache too big session */
 
-    if (len > (int) NGX_SSL_MAX_SESSION_SIZE) {
+    if (len > NGX_SSL_MAX_SESSION_SIZE) {
         return 0;
     }
 
     p = buf;
     i2d_SSL_SESSION(sess, &p);
 
+    session_id = (u_char *) SSL_SESSION_get_id(sess, &session_id_length);
+
+    /* do not cache sessions with too long session id */
+
+    if (session_id_length > 32) {
+        return 0;
+    }
+
     c = ngx_ssl_get_connection(ssl_conn);
 
     ssl_ctx = c->ssl->session_ctx;
@@ -3821,23 +3996,13 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
     /* drop one or two expired sessions */
     ngx_ssl_expire_sessions(cache, shpool, 1);
 
-    cached_sess = ngx_slab_alloc_locked(shpool, len);
+#if (NGX_PTR_SIZE == 8)
+    n = sizeof(ngx_ssl_sess_id_t);
+#else
+    n = offsetof(ngx_ssl_sess_id_t, session) + len;
+#endif
 
-    if (cached_sess == NULL) {
-
-        /* drop the oldest non-expired session and try once more */
-
-        ngx_ssl_expire_sessions(cache, shpool, 0);
-
-        cached_sess = ngx_slab_alloc_locked(shpool, len);
-
-        if (cached_sess == NULL) {
-            sess_id = NULL;
-            goto failed;
-        }
-    }
-
-    sess_id = ngx_slab_alloc_locked(shpool, sizeof(ngx_ssl_sess_id_t));
+    sess_id = ngx_slab_alloc_locked(shpool, n);
 
     if (sess_id == NULL) {
 
@@ -3845,41 +4010,34 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
 
         ngx_ssl_expire_sessions(cache, shpool, 0);
 
-        sess_id = ngx_slab_alloc_locked(shpool, sizeof(ngx_ssl_sess_id_t));
+        sess_id = ngx_slab_alloc_locked(shpool, n);
 
         if (sess_id == NULL) {
             goto failed;
         }
     }
 
-    session_id = (u_char *) SSL_SESSION_get_id(sess, &session_id_length);
-
 #if (NGX_PTR_SIZE == 8)
 
-    id = sess_id->sess_id;
+    sess_id->session = ngx_slab_alloc_locked(shpool, len);
 
-#else
-
-    id = ngx_slab_alloc_locked(shpool, session_id_length);
-
-    if (id == NULL) {
+    if (sess_id->session == NULL) {
 
         /* drop the oldest non-expired session and try once more */
 
         ngx_ssl_expire_sessions(cache, shpool, 0);
 
-        id = ngx_slab_alloc_locked(shpool, session_id_length);
+        sess_id->session = ngx_slab_alloc_locked(shpool, len);
 
-        if (id == NULL) {
+        if (sess_id->session == NULL) {
             goto failed;
         }
     }
 
 #endif
 
-    ngx_memcpy(cached_sess, buf, len);
-
-    ngx_memcpy(id, session_id, session_id_length);
+    ngx_memcpy(sess_id->session, buf, len);
+    ngx_memcpy(sess_id->id, session_id, session_id_length);
 
     hash = ngx_crc32_short(session_id, session_id_length);
 
@@ -3889,9 +4047,7 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
 
     sess_id->node.key = hash;
     sess_id->node.data = (u_char) session_id_length;
-    sess_id->id = id;
     sess_id->len = len;
-    sess_id->session = cached_sess;
 
     sess_id->expire = ngx_time() + SSL_CTX_get_timeout(ssl_ctx);
 
@@ -3905,18 +4061,17 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
 
 failed:
 
-    if (cached_sess) {
-        ngx_slab_free_locked(shpool, cached_sess);
-    }
-
     if (sess_id) {
         ngx_slab_free_locked(shpool, sess_id);
     }
 
     ngx_shmtx_unlock(&shpool->mutex);
 
-    ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                  "could not allocate new session%s", shpool->log_ctx);
+    if (cache->fail_time != ngx_time()) {
+        cache->fail_time = ngx_time();
+        ngx_log_error(NGX_LOG_WARN, c->log, 0,
+                      "could not allocate new session%s", shpool->log_ctx);
+    }
 
     return 0;
 }
@@ -4002,9 +4157,10 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_t *ssl_conn,
 
             ngx_rbtree_delete(&cache->session_rbtree, node);
 
+            ngx_explicit_memzero(sess_id->session, sess_id->len);
+
+#if (NGX_PTR_SIZE == 8)
             ngx_slab_free_locked(shpool, sess_id->session);
-#if (NGX_PTR_SIZE == 4)
-            ngx_slab_free_locked(shpool, sess_id->id);
 #endif
             ngx_slab_free_locked(shpool, sess_id);
 
@@ -4092,9 +4248,10 @@ ngx_ssl_remove_session(SSL_CTX *ssl, ngx_ssl_session_t *sess)
 
             ngx_rbtree_delete(&cache->session_rbtree, node);
 
+            ngx_explicit_memzero(sess_id->session, sess_id->len);
+
+#if (NGX_PTR_SIZE == 8)
             ngx_slab_free_locked(shpool, sess_id->session);
-#if (NGX_PTR_SIZE == 4)
-            ngx_slab_free_locked(shpool, sess_id->id);
 #endif
             ngx_slab_free_locked(shpool, sess_id);
 
@@ -4141,9 +4298,10 @@ ngx_ssl_expire_sessions(ngx_ssl_session_cache_t *cache,
 
         ngx_rbtree_delete(&cache->session_rbtree, &sess_id->node);
 
+        ngx_explicit_memzero(sess_id->session, sess_id->len);
+
+#if (NGX_PTR_SIZE == 8)
         ngx_slab_free_locked(shpool, sess_id->session);
-#if (NGX_PTR_SIZE == 4)
-        ngx_slab_free_locked(shpool, sess_id->id);
 #endif
         ngx_slab_free_locked(shpool, sess_id);
     }
@@ -4197,23 +4355,25 @@ ngx_ssl_session_rbtree_insert_value(ngx_rbtree_node_t *temp,
 ngx_int_t
 ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
 {
-    u_char                         buf[80];
-    size_t                         size;
-    ssize_t                        n;
-    ngx_str_t                     *path;
-    ngx_file_t                     file;
-    ngx_uint_t                     i;
-    ngx_array_t                   *keys;
-    ngx_file_info_t                fi;
-    ngx_pool_cleanup_t            *cln;
-    ngx_ssl_session_ticket_key_t  *key;
+    u_char                 buf[80];
+    size_t                 size;
+    ssize_t                n;
+    ngx_str_t             *path;
+    ngx_file_t             file;
+    ngx_uint_t             i;
+    ngx_array_t           *keys;
+    ngx_file_info_t        fi;
+    ngx_pool_cleanup_t    *cln;
+    ngx_ssl_ticket_key_t  *key;
 
-    if (paths == NULL) {
+    if (paths == NULL
+        && SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_session_cache_index) == NULL)
+    {
         return NGX_OK;
     }
 
-    keys = ngx_array_create(cf->pool, paths->nelts,
-                            sizeof(ngx_ssl_session_ticket_key_t));
+    keys = ngx_array_create(cf->pool, paths ? paths->nelts : 3,
+                            sizeof(ngx_ssl_ticket_key_t));
     if (keys == NULL) {
         return NGX_ERROR;
     }
@@ -4223,9 +4383,41 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
         return NGX_ERROR;
     }
 
-    cln->handler = ngx_ssl_session_ticket_keys_cleanup;
+    cln->handler = ngx_ssl_ticket_keys_cleanup;
     cln->data = keys;
 
+    if (SSL_CTX_set_ex_data(ssl->ctx, ngx_ssl_ticket_keys_index, keys) == 0) {
+        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
+                      "SSL_CTX_set_ex_data() failed");
+        return NGX_ERROR;
+    }
+
+    if (SSL_CTX_set_tlsext_ticket_key_cb(ssl->ctx, ngx_ssl_ticket_key_callback)
+        == 0)
+    {
+        ngx_log_error(NGX_LOG_WARN, cf->log, 0,
+                      "nginx was built with Session Tickets support, however, "
+                      "now it is linked dynamically to an OpenSSL library "
+                      "which has no tlsext support, therefore Session Tickets "
+                      "are not available");
+        return NGX_OK;
+    }
+
+    if (paths == NULL) {
+
+        /* placeholder for keys in shared memory */
+
+        key = ngx_array_push_n(keys, 3);
+        key[0].shared = 1;
+        key[0].expire = 0;
+        key[1].shared = 1;
+        key[1].expire = 0;
+        key[2].shared = 1;
+        key[2].expire = 0;
+
+        return NGX_OK;
+    }
+
     path = paths->elts;
     for (i = 0; i < paths->nelts; i++) {
 
@@ -4280,6 +4472,9 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
             goto failed;
         }
 
+        key->shared = 0;
+        key->expire = 1;
+
         if (size == 48) {
             key->size = 48;
             ngx_memcpy(key->name, buf, 16);
@@ -4301,25 +4496,6 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *paths)
         ngx_explicit_memzero(&buf, 80);
     }
 
-    if (SSL_CTX_set_ex_data(ssl->ctx, ngx_ssl_session_ticket_keys_index, keys)
-        == 0)
-    {
-        ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
-                      "SSL_CTX_set_ex_data() failed");
-        return NGX_ERROR;
-    }
-
-    if (SSL_CTX_set_tlsext_ticket_key_cb(ssl->ctx,
-                                         ngx_ssl_session_ticket_key_callback)
-        == 0)
-    {
-        ngx_log_error(NGX_LOG_WARN, cf->log, 0,
-                      "nginx was built with Session Tickets support, however, "
-                      "now it is linked dynamically to an OpenSSL library "
-                      "which has no tlsext support, therefore Session Tickets "
-                      "are not available");
-    }
-
     return NGX_OK;
 
 failed:
@@ -4336,29 +4512,33 @@ failed:
 
 
 static int
-ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
+ngx_ssl_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     unsigned char *name, unsigned char *iv, EVP_CIPHER_CTX *ectx,
     HMAC_CTX *hctx, int enc)
 {
-    size_t                         size;
-    SSL_CTX                       *ssl_ctx;
-    ngx_uint_t                     i;
-    ngx_array_t                   *keys;
-    ngx_connection_t              *c;
-    ngx_ssl_session_ticket_key_t  *key;
-    const EVP_MD                  *digest;
-    const EVP_CIPHER              *cipher;
+    size_t                 size;
+    SSL_CTX               *ssl_ctx;
+    ngx_uint_t             i;
+    ngx_array_t           *keys;
+    ngx_connection_t      *c;
+    ngx_ssl_ticket_key_t  *key;
+    const EVP_MD          *digest;
+    const EVP_CIPHER      *cipher;
 
     c = ngx_ssl_get_connection(ssl_conn);
     ssl_ctx = c->ssl->session_ctx;
 
+    if (ngx_ssl_rotate_ticket_keys(ssl_ctx, c->log) != NGX_OK) {
+        return -1;
+    }
+
 #ifdef OPENSSL_NO_SHA256
     digest = EVP_sha1();
 #else
     digest = EVP_sha256();
 #endif
 
-    keys = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_session_ticket_keys_index);
+    keys = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_ticket_keys_index);
     if (keys == NULL) {
         return -1;
     }
@@ -4369,7 +4549,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
         /* encrypt session ticket */
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "ssl session ticket encrypt, key: \"%*xs\" (%s session)",
+                       "ssl ticket encrypt, key: \"%*xs\" (%s session)",
                        (size_t) 16, key[0].name,
                        SSL_session_reused(ssl_conn) ? "reused" : "new");
 
@@ -4416,7 +4596,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "ssl session ticket decrypt, key: \"%*xs\" not found",
+                       "ssl ticket decrypt, key: \"%*xs\" not found",
                        (size_t) 16, name);
 
         return 0;
@@ -4424,7 +4604,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
     found:
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                       "ssl session ticket decrypt, key: \"%*xs\"%s",
+                       "ssl ticket decrypt, key: \"%*xs\"%s",
                        (size_t) 16, key[i].name, (i == 0) ? " (default)" : "");
 
         if (key[i].size == 48) {
@@ -4461,7 +4641,7 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
 
         /* renew if non-default key */
 
-        if (i != 0) {
+        if (i != 0 && key[i].expire) {
             return 2;
         }
 
@@ -4470,13 +4650,142 @@ ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn,
 }
 
 
+static ngx_int_t
+ngx_ssl_rotate_ticket_keys(SSL_CTX *ssl_ctx, ngx_log_t *log)
+{
+    time_t                    now, expire;
+    ngx_array_t              *keys;
+    ngx_shm_zone_t           *shm_zone;
+    ngx_slab_pool_t          *shpool;
+    ngx_ssl_ticket_key_t     *key;
+    ngx_ssl_session_cache_t  *cache;
+    u_char                    buf[80];
+
+    keys = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_ticket_keys_index);
+    if (keys == NULL) {
+        return NGX_OK;
+    }
+
+    key = keys->elts;
+
+    if (!key[0].shared) {
+        return NGX_OK;
+    }
+
+    /*
+     * if we don't need to update expiration of the current key
+     * and the previous key is still needed, don't sync with shared
+     * memory to save some work; in the worst case other worker process
+     * will switch to the next key, but this process will still be able
+     * to decrypt tickets encrypted with it
+     */
+
+    now = ngx_time();
+    expire = now + SSL_CTX_get_timeout(ssl_ctx);
+
+    if (key[0].expire >= expire && key[1].expire >= now) {
+        return NGX_OK;
+    }
+
+    shm_zone = SSL_CTX_get_ex_data(ssl_ctx, ngx_ssl_session_cache_index);
+
+    cache = shm_zone->data;
+    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+
+    ngx_shmtx_lock(&shpool->mutex);
+
+    key = cache->ticket_keys;
+
+    if (key[0].expire == 0) {
+
+        /* initialize the current key */
+
+        if (RAND_bytes(buf, 80) != 1) {
+            ngx_ssl_error(NGX_LOG_ALERT, log, 0, "RAND_bytes() failed");
+            ngx_shmtx_unlock(&shpool->mutex);
+            return NGX_ERROR;
+        }
+
+        key[0].shared = 1;
+        key[0].expire = expire;
+        key[0].size = 80;
+        ngx_memcpy(key[0].name, buf, 16);
+        ngx_memcpy(key[0].hmac_key, buf + 16, 32);
+        ngx_memcpy(key[0].aes_key, buf + 48, 32);
+
+        ngx_explicit_memzero(&buf, 80);
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
+                       "ssl ticket key: \"%*xs\"",
+                       (size_t) 16, key[0].name);
+
+        /*
+         * copy the current key to the next key, as initialization of
+         * the previous key will replace the current key with the next
+         * key
+         */
+
+        key[2] = key[0];
+    }
+
+    if (key[1].expire < now) {
+
+        /*
+         * if the previous key is no longer needed (or not initialized),
+         * replace it with the current key, replace the current key with
+         * the next key, and generate new next key
+         */
+
+        key[1] = key[0];
+        key[0] = key[2];
+
+        if (RAND_bytes(buf, 80) != 1) {
+            ngx_ssl_error(NGX_LOG_ALERT, log, 0, "RAND_bytes() failed");
+            ngx_shmtx_unlock(&shpool->mutex);
+            return NGX_ERROR;
+        }
+
+        key[2].shared = 1;
+        key[2].expire = 0;
+        key[2].size = 80;
+        ngx_memcpy(key[2].name, buf, 16);
+        ngx_memcpy(key[2].hmac_key, buf + 16, 32);
+        ngx_memcpy(key[2].aes_key, buf + 48, 32);
+
+        ngx_explicit_memzero(&buf, 80);
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
+                       "ssl ticket key: \"%*xs\"",
+                       (size_t) 16, key[2].name);
+    }
+
+    /*
+     * update expiration of the current key: it is going to be needed
+     * at least till the session being created expires
+     */
+
+    if (expire > key[0].expire) {
+        key[0].expire = expire;
+    }
+
+    /* sync keys to the worker process memory */
+
+    ngx_memcpy(keys->elts, cache->ticket_keys,
+               2 * sizeof(ngx_ssl_ticket_key_t));
+
+    ngx_shmtx_unlock(&shpool->mutex);
+
+    return NGX_OK;
+}
+
+
 static void
-ngx_ssl_session_ticket_keys_cleanup(void *data)
+ngx_ssl_ticket_keys_cleanup(void *data)
 {
     ngx_array_t  *keys = data;
 
     ngx_explicit_memzero(keys->elts,
-                         keys->nelts * sizeof(ngx_ssl_session_ticket_key_t));
+                         keys->nelts * sizeof(ngx_ssl_ticket_key_t));
 }
 
 #else
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index c9e86d9..860ea26 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -114,6 +114,7 @@ struct ngx_ssl_connection_s {
     unsigned                    no_send_shutdown:1;
     unsigned                    shutdown_without_free:1;
     unsigned                    handshake_buffer_set:1;
+    unsigned                    session_timeout_set:1;
     unsigned                    try_early_data:1;
     unsigned                    in_early:1;
     unsigned                    in_ocsp:1;
@@ -134,37 +135,37 @@ typedef struct ngx_ssl_sess_id_s  ngx_ssl_sess_id_t;
 
 struct ngx_ssl_sess_id_s {
     ngx_rbtree_node_t           node;
-    u_char                     *id;
     size_t                      len;
-    u_char                     *session;
     ngx_queue_t                 queue;
     time_t                      expire;
+    u_char                      id[32];
 #if (NGX_PTR_SIZE == 8)
-    void                       *stub;
-    u_char                      sess_id[32];
+    u_char                     *session;
+#else
+    u_char                      session[1];
 #endif
 };
 
 
+typedef struct {
+    u_char                      name[16];
+    u_char                      hmac_key[32];
+    u_char                      aes_key[32];
+    time_t                      expire;
+    unsigned                    size:8;
+    unsigned                    shared:1;
+} ngx_ssl_ticket_key_t;
+
+
 typedef struct {
     ngx_rbtree_t                session_rbtree;
     ngx_rbtree_node_t           sentinel;
     ngx_queue_t                 expire_queue;
+    ngx_ssl_ticket_key_t        ticket_keys[3];
+    time_t                      fail_time;
 } ngx_ssl_session_cache_t;
 
 
-#ifdef SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB
-
-typedef struct {
-    size_t                      size;
-    u_char                      name[16];
-    u_char                      hmac_key[32];
-    u_char                      aes_key[32];
-} ngx_ssl_session_ticket_key_t;
-
-#endif
-
-
 #define NGX_SSL_SSLv2    0x0002
 #define NGX_SSL_SSLv3    0x0004
 #define NGX_SSL_TLSv1    0x0008
@@ -204,10 +205,12 @@ ngx_int_t ngx_ssl_ocsp(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *responder,
     ngx_uint_t depth, ngx_shm_zone_t *shm_zone);
 ngx_int_t ngx_ssl_ocsp_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
     ngx_resolver_t *resolver, ngx_msec_t resolver_timeout);
+
 ngx_int_t ngx_ssl_ocsp_validate(ngx_connection_t *c);
 ngx_int_t ngx_ssl_ocsp_get_status(ngx_connection_t *c, const char **s);
 void ngx_ssl_ocsp_cleanup(ngx_connection_t *c);
 ngx_int_t ngx_ssl_ocsp_cache_init(ngx_shm_zone_t *shm_zone, void *data);
+
 ngx_array_t *ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file);
 ngx_array_t *ngx_ssl_preserve_passwords(ngx_conf_t *cf,
     ngx_array_t *passwords);
@@ -314,7 +317,7 @@ void ngx_ssl_cleanup_ctx(void *data);
 extern int  ngx_ssl_connection_index;
 extern int  ngx_ssl_server_conf_index;
 extern int  ngx_ssl_session_cache_index;
-extern int  ngx_ssl_session_ticket_keys_index;
+extern int  ngx_ssl_ticket_keys_index;
 extern int  ngx_ssl_ocsp_index;
 extern int  ngx_ssl_certificate_index;
 extern int  ngx_ssl_next_certificate_index;
diff --git a/src/event/ngx_event_udp.c b/src/event/ngx_event_udp.c
index a524ae0..d7a94c7 100644
--- a/src/event/ngx_event_udp.c
+++ b/src/event/ngx_event_udp.c
@@ -46,18 +46,8 @@ ngx_event_recvmsg(ngx_event_t *ev)
     ngx_connection_t  *c, *lc;
     static u_char      buffer[65535];
 
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
-
-#if (NGX_HAVE_IP_RECVDSTADDR)
-    u_char             msg_control[CMSG_SPACE(sizeof(struct in_addr))];
-#elif (NGX_HAVE_IP_PKTINFO)
-    u_char             msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))];
-#endif
-
-#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
-    u_char             msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
-#endif
-
+#if (NGX_HAVE_ADDRINFO_CMSG)
+    u_char             msg_control[CMSG_SPACE(sizeof(ngx_addrinfo_t))];
 #endif
 
     if (ev->timedout) {
@@ -92,25 +82,13 @@ ngx_event_recvmsg(ngx_event_t *ev)
         msg.msg_iov = iov;
         msg.msg_iovlen = 1;
 
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
-
+#if (NGX_HAVE_ADDRINFO_CMSG)
         if (ls->wildcard) {
+            msg.msg_control = &msg_control;
+            msg.msg_controllen = sizeof(msg_control);
 
-#if (NGX_HAVE_IP_RECVDSTADDR || NGX_HAVE_IP_PKTINFO)
-            if (ls->sockaddr->sa_family == AF_INET) {
-                msg.msg_control = &msg_control;
-                msg.msg_controllen = sizeof(msg_control);
-            }
-#endif
-
-#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
-            if (ls->sockaddr->sa_family == AF_INET6) {
-                msg.msg_control = &msg_control6;
-                msg.msg_controllen = sizeof(msg_control6);
-            }
-#endif
+            ngx_memzero(&msg_control, sizeof(msg_control));
         }
-
 #endif
 
         n = recvmsg(lc->fd, &msg, 0);
@@ -129,7 +107,7 @@ ngx_event_recvmsg(ngx_event_t *ev)
             return;
         }
 
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+#if (NGX_HAVE_ADDRINFO_CMSG)
         if (msg.msg_flags & (MSG_TRUNC|MSG_CTRUNC)) {
             ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
                           "recvmsg() truncated data");
@@ -159,7 +137,7 @@ ngx_event_recvmsg(ngx_event_t *ev)
         local_sockaddr = ls->sockaddr;
         local_socklen = ls->socklen;
 
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
+#if (NGX_HAVE_ADDRINFO_CMSG)
 
         if (ls->wildcard) {
             struct cmsghdr  *cmsg;
@@ -171,59 +149,9 @@ ngx_event_recvmsg(ngx_event_t *ev)
                  cmsg != NULL;
                  cmsg = CMSG_NXTHDR(&msg, cmsg))
             {
-
-#if (NGX_HAVE_IP_RECVDSTADDR)
-
-                if (cmsg->cmsg_level == IPPROTO_IP
-                    && cmsg->cmsg_type == IP_RECVDSTADDR
-                    && local_sockaddr->sa_family == AF_INET)
-                {
-                    struct in_addr      *addr;
-                    struct sockaddr_in  *sin;
-
-                    addr = (struct in_addr *) CMSG_DATA(cmsg);
-                    sin = (struct sockaddr_in *) local_sockaddr;
-                    sin->sin_addr = *addr;
-
+                if (ngx_get_srcaddr_cmsg(cmsg, local_sockaddr) == NGX_OK) {
                     break;
                 }
-
-#elif (NGX_HAVE_IP_PKTINFO)
-
-                if (cmsg->cmsg_level == IPPROTO_IP
-                    && cmsg->cmsg_type == IP_PKTINFO
-                    && local_sockaddr->sa_family == AF_INET)
-                {
-                    struct in_pktinfo   *pkt;
-                    struct sockaddr_in  *sin;
-
-                    pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
-                    sin = (struct sockaddr_in *) local_sockaddr;
-                    sin->sin_addr = pkt->ipi_addr;
-
-                    break;
-                }
-
-#endif
-
-#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
-
-                if (cmsg->cmsg_level == IPPROTO_IPV6
-                    && cmsg->cmsg_type == IPV6_PKTINFO
-                    && local_sockaddr->sa_family == AF_INET6)
-                {
-                    struct in6_pktinfo   *pkt6;
-                    struct sockaddr_in6  *sin6;
-
-                    pkt6 = (struct in6_pktinfo *) CMSG_DATA(cmsg);
-                    sin6 = (struct sockaddr_in6 *) local_sockaddr;
-                    sin6->sin6_addr = pkt6->ipi6_addr;
-
-                    break;
-                }
-
-#endif
-
             }
         }
 
@@ -318,6 +246,8 @@ ngx_event_recvmsg(ngx_event_t *ev)
         c->send = ngx_udp_send;
         c->send_chain = ngx_udp_send_chain;
 
+        c->need_flush_buf = 1;
+
         c->log = log;
         c->pool->log = log;
         c->listening = ls;
diff --git a/src/event/ngx_event_udp.h b/src/event/ngx_event_udp.h
new file mode 100644
index 0000000..51ca665
--- /dev/null
+++ b/src/event/ngx_event_udp.h
@@ -0,0 +1,58 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_UDP_H_INCLUDED_
+#define _NGX_EVENT_UDP_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#if !(NGX_WIN32)
+
+#if ((NGX_HAVE_MSGHDR_MSG_CONTROL)                                            \
+     && (NGX_HAVE_IP_SENDSRCADDR || NGX_HAVE_IP_RECVDSTADDR                   \
+         || NGX_HAVE_IP_PKTINFO                                               \
+         || (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)))
+#define NGX_HAVE_ADDRINFO_CMSG  1
+
+#endif
+
+
+#if (NGX_HAVE_ADDRINFO_CMSG)
+
+typedef union {
+#if (NGX_HAVE_IP_SENDSRCADDR || NGX_HAVE_IP_RECVDSTADDR)
+    struct in_addr        addr;
+#endif
+
+#if (NGX_HAVE_IP_PKTINFO)
+    struct in_pktinfo     pkt;
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+    struct in6_pktinfo    pkt6;
+#endif
+} ngx_addrinfo_t;
+
+size_t ngx_set_srcaddr_cmsg(struct cmsghdr *cmsg,
+    struct sockaddr *local_sockaddr);
+ngx_int_t ngx_get_srcaddr_cmsg(struct cmsghdr *cmsg,
+    struct sockaddr *local_sockaddr);
+
+#endif
+
+void ngx_event_recvmsg(ngx_event_t *ev);
+ssize_t ngx_sendmsg(ngx_connection_t *c, struct msghdr *msg, int flags);
+void ngx_udp_rbtree_insert_value(ngx_rbtree_node_t *temp,
+    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
+#endif
+
+void ngx_delete_udp_connection(void *data);
+
+
+#endif /* _NGX_EVENT_UDP_H_INCLUDED_ */
diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c
index 0693319..02d41e8 100644
--- a/src/http/modules/ngx_http_auth_basic_module.c
+++ b/src/http/modules/ngx_http_auth_basic_module.c
@@ -339,6 +339,7 @@ ngx_http_auth_basic_set_realm(ngx_http_request_t *r, ngx_str_t *realm)
     *p = '"';
 
     r->headers_out.www_authenticate->hash = 1;
+    r->headers_out.www_authenticate->next = NULL;
     ngx_str_set(&r->headers_out.www_authenticate->key, "WWW-Authenticate");
     r->headers_out.www_authenticate->value.data = basic;
     r->headers_out.www_authenticate->value.len = len;
diff --git a/src/http/modules/ngx_http_auth_request_module.c b/src/http/modules/ngx_http_auth_request_module.c
index bab79e4..8bc98aa 100644
--- a/src/http/modules/ngx_http_auth_request_module.c
+++ b/src/http/modules/ngx_http_auth_request_module.c
@@ -101,7 +101,7 @@ ngx_module_t  ngx_http_auth_request_module = {
 static ngx_int_t
 ngx_http_auth_request_handler(ngx_http_request_t *r)
 {
-    ngx_table_elt_t               *h, *ho;
+    ngx_table_elt_t               *h, *ho, **ph;
     ngx_http_request_t            *sr;
     ngx_http_post_subrequest_t    *ps;
     ngx_http_auth_request_ctx_t   *ctx;
@@ -147,15 +147,21 @@ ngx_http_auth_request_handler(ngx_http_request_t *r)
                 h = sr->upstream->headers_in.www_authenticate;
             }
 
-            if (h) {
+            ph = &r->headers_out.www_authenticate;
+
+            while (h) {
                 ho = ngx_list_push(&r->headers_out.headers);
                 if (ho == NULL) {
                     return NGX_ERROR;
                 }
 
                 *ho = *h;
+                ho->next = NULL;
 
-                r->headers_out.www_authenticate = ho;
+                *ph = ho;
+                ph = &ho->next;
+
+                h = h->next;
             }
 
             return ctx->status;
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index 0cc9ae1..cfb9892 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -1082,6 +1082,7 @@ ngx_http_dav_location(ngx_http_request_t *r)
     }
 
     r->headers_out.location->hash = 1;
+    r->headers_out.location->next = NULL;
     ngx_str_set(&r->headers_out.location->key, "Location");
 
     escape = 2 * ngx_escape_uri(NULL, r->uri.data, r->uri.len, NGX_ESCAPE_URI);
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 4a8dc33..2d9a18f 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -835,14 +835,14 @@ static ngx_int_t
 ngx_http_fastcgi_create_request(ngx_http_request_t *r)
 {
     off_t                         file_pos;
-    u_char                        ch, *pos, *lowcase_key;
+    u_char                        ch, sep, *pos, *lowcase_key;
     size_t                        size, len, key_len, val_len, padding,
                                   allocated;
     ngx_uint_t                    i, n, next, hash, skip_empty, header_params;
     ngx_buf_t                    *b;
     ngx_chain_t                  *cl, *body;
     ngx_list_part_t              *part;
-    ngx_table_elt_t              *header, **ignored;
+    ngx_table_elt_t              *header, *hn, **ignored;
     ngx_http_upstream_t          *u;
     ngx_http_script_code_pt       code;
     ngx_http_script_engine_t      e, le;
@@ -900,7 +900,11 @@ ngx_http_fastcgi_create_request(ngx_http_request_t *r)
         allocated = 0;
         lowcase_key = NULL;
 
-        if (params->number) {
+        if (ngx_http_link_multi_headers(r) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (params->number || r->headers_in.multi) {
             n = 0;
             part = &r->headers_in.headers.part;
 
@@ -930,6 +934,12 @@ ngx_http_fastcgi_create_request(ngx_http_request_t *r)
                 i = 0;
             }
 
+            for (n = 0; n < header_params; n++) {
+                if (&header[i] == ignored[n]) {
+                    goto next_length;
+                }
+            }
+
             if (params->number) {
                 if (allocated < header[i].key.len) {
                     allocated = header[i].key.len + 16;
@@ -959,15 +969,23 @@ ngx_http_fastcgi_create_request(ngx_http_request_t *r)
                     ignored[header_params++] = &header[i];
                     continue;
                 }
-
-                n += sizeof("HTTP_") - 1;
-
-            } else {
-                n = sizeof("HTTP_") - 1 + header[i].key.len;
             }
 
-            len += ((n > 127) ? 4 : 1) + ((header[i].value.len > 127) ? 4 : 1)
-                + n + header[i].value.len;
+            key_len = sizeof("HTTP_") - 1 + header[i].key.len;
+
+            val_len = header[i].value.len;
+
+            for (hn = header[i].next; hn; hn = hn->next) {
+                val_len += hn->value.len + 2;
+                ignored[header_params++] = hn;
+            }
+
+            len += ((key_len > 127) ? 4 : 1) + key_len
+                   + ((val_len > 127) ? 4 : 1) + val_len;
+
+        next_length:
+
+            continue;
         }
     }
 
@@ -1109,7 +1127,7 @@ ngx_http_fastcgi_create_request(ngx_http_request_t *r)
 
             for (n = 0; n < header_params; n++) {
                 if (&header[i] == ignored[n]) {
-                    goto next;
+                    goto next_value;
                 }
             }
 
@@ -1125,6 +1143,11 @@ ngx_http_fastcgi_create_request(ngx_http_request_t *r)
             }
 
             val_len = header[i].value.len;
+
+            for (hn = header[i].next; hn; hn = hn->next) {
+                val_len += hn->value.len + 2;
+            }
+
             if (val_len > 127) {
                 *b->last++ = (u_char) (((val_len >> 24) & 0x7f) | 0x80);
                 *b->last++ = (u_char) ((val_len >> 16) & 0xff);
@@ -1150,13 +1173,34 @@ ngx_http_fastcgi_create_request(ngx_http_request_t *r)
                 *b->last++ = ch;
             }
 
-            b->last = ngx_copy(b->last, header[i].value.data, val_len);
+            b->last = ngx_copy(b->last, header[i].value.data,
+                               header[i].value.len);
+
+            if (header[i].next) {
+
+                if (header[i].key.len == sizeof("Cookie") - 1
+                    && ngx_strncasecmp(header[i].key.data, (u_char *) "Cookie",
+                                       sizeof("Cookie") - 1)
+                       == 0)
+                {
+                    sep = ';';
+
+                } else {
+                    sep = ',';
+                }
+
+                for (hn = header[i].next; hn; hn = hn->next) {
+                    *b->last++ = sep;
+                    *b->last++ = ' ';
+                    b->last = ngx_copy(b->last, hn->value.data, hn->value.len);
+                }
+            }
 
             ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                            "fastcgi param: \"%*s: %*s\"",
                            key_len, b->last - (key_len + val_len),
                            val_len, b->last - val_len);
-        next:
+        next_value:
 
             continue;
         }
@@ -1963,8 +2007,12 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
                 hh = ngx_hash_find(&umcf->headers_in_hash, h->hash,
                                    h->lowcase_key, h->key.len);
 
-                if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
-                    return NGX_ERROR;
+                if (hh) {
+                    rc = hh->handler(r, h, hh->offset);
+
+                    if (rc != NGX_OK) {
+                        return rc;
+                    }
                 }
 
                 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c
index cc06d53..ef2bff4 100644
--- a/src/http/modules/ngx_http_flv_module.c
+++ b/src/http/modules/ngx_http_flv_module.c
@@ -232,9 +232,10 @@ ngx_http_flv_handler(ngx_http_request_t *r)
     b->file_pos = start;
     b->file_last = of.size;
 
-    b->in_file = b->file_last ? 1: 0;
+    b->in_file = b->file_last ? 1 : 0;
     b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
+    b->sync = (b->last_buf || b->in_file) ? 0 : 1;
 
     b->file->fd = of.fd;
     b->file->name = path;
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 153b6aa..ef4e9b8 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -327,15 +327,15 @@ static ngx_int_t
 ngx_http_geo_addr(ngx_http_request_t *r, ngx_http_geo_ctx_t *ctx,
     ngx_addr_t *addr)
 {
-    ngx_array_t  *xfwd;
+    ngx_table_elt_t  *xfwd;
 
     if (ngx_http_geo_real_addr(r, ctx, addr) != NGX_OK) {
         return NGX_ERROR;
     }
 
-    xfwd = &r->headers_in.x_forwarded_for;
+    xfwd = r->headers_in.x_forwarded_for;
 
-    if (xfwd->nelts > 0 && ctx->proxies != NULL) {
+    if (xfwd != NULL && ctx->proxies != NULL) {
         (void) ngx_http_get_forwarded_addr(r, addr, xfwd, NULL,
                                            ctx->proxies, ctx->proxy_recursive);
     }
diff --git a/src/http/modules/ngx_http_geoip_module.c b/src/http/modules/ngx_http_geoip_module.c
index 5ea4f5f..eaf9876 100644
--- a/src/http/modules/ngx_http_geoip_module.c
+++ b/src/http/modules/ngx_http_geoip_module.c
@@ -240,16 +240,16 @@ static u_long
 ngx_http_geoip_addr(ngx_http_request_t *r, ngx_http_geoip_conf_t *gcf)
 {
     ngx_addr_t           addr;
-    ngx_array_t         *xfwd;
+    ngx_table_elt_t     *xfwd;
     struct sockaddr_in  *sin;
 
     addr.sockaddr = r->connection->sockaddr;
     addr.socklen = r->connection->socklen;
     /* addr.name = r->connection->addr_text; */
 
-    xfwd = &r->headers_in.x_forwarded_for;
+    xfwd = r->headers_in.x_forwarded_for;
 
-    if (xfwd->nelts > 0 && gcf->proxies != NULL) {
+    if (xfwd != NULL && gcf->proxies != NULL) {
         (void) ngx_http_get_forwarded_addr(r, &addr, xfwd, NULL,
                                            gcf->proxies, gcf->proxy_recursive);
     }
@@ -292,7 +292,7 @@ static geoipv6_t
 ngx_http_geoip_addr_v6(ngx_http_request_t *r, ngx_http_geoip_conf_t *gcf)
 {
     ngx_addr_t            addr;
-    ngx_array_t          *xfwd;
+    ngx_table_elt_t      *xfwd;
     in_addr_t             addr4;
     struct in6_addr       addr6;
     struct sockaddr_in   *sin;
@@ -302,9 +302,9 @@ ngx_http_geoip_addr_v6(ngx_http_request_t *r, ngx_http_geoip_conf_t *gcf)
     addr.socklen = r->connection->socklen;
     /* addr.name = r->connection->addr_text; */
 
-    xfwd = &r->headers_in.x_forwarded_for;
+    xfwd = r->headers_in.x_forwarded_for;
 
-    if (xfwd->nelts > 0 && gcf->proxies != NULL) {
+    if (xfwd != NULL && gcf->proxies != NULL) {
         (void) ngx_http_get_forwarded_addr(r, &addr, xfwd, NULL,
                                            gcf->proxies, gcf->proxy_recursive);
     }
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
index 864fc4f..dfe49c5 100644
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -209,6 +209,8 @@ static char *ngx_http_grpc_ssl_password_file(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
 static char *ngx_http_grpc_ssl_conf_command_check(ngx_conf_t *cf, void *post,
     void *data);
+static ngx_int_t ngx_http_grpc_merge_ssl(ngx_conf_t *cf,
+    ngx_http_grpc_loc_conf_t *conf, ngx_http_grpc_loc_conf_t *prev);
 static ngx_int_t ngx_http_grpc_set_ssl(ngx_conf_t *cf,
     ngx_http_grpc_loc_conf_t *glcf);
 #endif
@@ -562,7 +564,7 @@ ngx_http_grpc_handler(ngx_http_request_t *r)
         ctx->host = glcf->host;
 
 #if (NGX_HTTP_SSL)
-        u->ssl = (glcf->upstream.ssl != NULL);
+        u->ssl = glcf->ssl;
 
         if (u->ssl) {
             ngx_str_set(&u->schema, "grpcs://");
@@ -1891,8 +1893,12 @@ ngx_http_grpc_process_header(ngx_http_request_t *r)
                 hh = ngx_hash_find(&umcf->headers_in_hash, h->hash,
                                    h->lowcase_key, h->key.len);
 
-                if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
-                    return NGX_ERROR;
+                if (hh) {
+                    rc = hh->handler(r, h, hh->offset);
+
+                    if (rc != NGX_OK) {
+                        return rc;
+                    }
                 }
 
                 continue;
@@ -4459,12 +4465,17 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #if (NGX_HTTP_SSL)
 
+    if (ngx_http_grpc_merge_ssl(cf, conf, prev) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
                               prev->upstream.ssl_session_reuse, 1);
 
     ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
-                                 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
-                                  |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
+                                 (NGX_CONF_BITMASK_SET
+                                  |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
+                                  |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
 
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
                              "DEFAULT");
@@ -4520,7 +4531,7 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->grpc_values = prev->grpc_values;
 
 #if (NGX_HTTP_SSL)
-        conf->upstream.ssl = prev->upstream.ssl;
+        conf->ssl = prev->ssl;
 #endif
     }
 
@@ -4869,18 +4880,64 @@ ngx_http_grpc_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
 }
 
 
+static ngx_int_t
+ngx_http_grpc_merge_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *conf,
+    ngx_http_grpc_loc_conf_t *prev)
+{
+    ngx_uint_t  preserve;
+
+    if (conf->ssl_protocols == 0
+        && conf->ssl_ciphers.data == NULL
+        && conf->upstream.ssl_certificate == NGX_CONF_UNSET_PTR
+        && conf->upstream.ssl_certificate_key == NGX_CONF_UNSET_PTR
+        && conf->upstream.ssl_passwords == NGX_CONF_UNSET_PTR
+        && conf->upstream.ssl_verify == NGX_CONF_UNSET
+        && conf->ssl_verify_depth == NGX_CONF_UNSET_UINT
+        && conf->ssl_trusted_certificate.data == NULL
+        && conf->ssl_crl.data == NULL
+        && conf->upstream.ssl_session_reuse == NGX_CONF_UNSET
+        && conf->ssl_conf_commands == NGX_CONF_UNSET_PTR)
+    {
+        if (prev->upstream.ssl) {
+            conf->upstream.ssl = prev->upstream.ssl;
+            return NGX_OK;
+        }
+
+        preserve = 1;
+
+    } else {
+        preserve = 0;
+    }
+
+    conf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
+    if (conf->upstream.ssl == NULL) {
+        return NGX_ERROR;
+    }
+
+    conf->upstream.ssl->log = cf->log;
+
+    /*
+     * special handling to preserve conf->upstream.ssl
+     * in the "http" section to inherit it to all servers
+     */
+
+    if (preserve) {
+        prev->upstream.ssl = conf->upstream.ssl;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
 {
     ngx_pool_cleanup_t  *cln;
 
-    glcf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
-    if (glcf->upstream.ssl == NULL) {
-        return NGX_ERROR;
+    if (glcf->upstream.ssl->ctx) {
+        return NGX_OK;
     }
 
-    glcf->upstream.ssl->log = cf->log;
-
     if (ngx_ssl_create(glcf->upstream.ssl, glcf->ssl_protocols, NULL)
         != NGX_OK)
     {
@@ -4902,8 +4959,9 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
         return NGX_ERROR;
     }
 
-    if (glcf->upstream.ssl_certificate) {
-
+    if (glcf->upstream.ssl_certificate
+        && glcf->upstream.ssl_certificate->value.len)
+    {
         if (glcf->upstream.ssl_certificate_key == NULL) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"grpc_ssl_certificate_key\" is defined "
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index b8c5ccc..ed0de60 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -57,6 +57,7 @@ typedef struct {
     unsigned             nomem:1;
     unsigned             buffering:1;
     unsigned             zlib_ng:1;
+    unsigned             state_allocated:1;
 
     size_t               zin;
     size_t               zout;
@@ -280,6 +281,7 @@ ngx_http_gzip_header_filter(ngx_http_request_t *r)
     }
 
     h->hash = 1;
+    h->next = NULL;
     ngx_str_set(&h->key, "Content-Encoding");
     ngx_str_set(&h->value, "gzip");
     r->headers_out.content_encoding = h;
@@ -513,9 +515,10 @@ ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
     } else {
         /*
          * Another zlib variant, https://github.com/zlib-ng/zlib-ng.
-         * It forces window bits to 13 for fast compression level,
-         * uses 16-byte padding in one of window-sized buffers, and
-         * uses 128K hash.
+         * It used to force window bits to 13 for fast compression level,
+         * uses (64 + sizeof(void*)) additional space on all allocations
+         * for alignment, 16-byte padding in one of window-sized buffers,
+         * and 128K hash.
          */
 
         if (conf->level == 1) {
@@ -523,7 +526,8 @@ ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
         }
 
         ctx->allocated = 8192 + 16 + (1 << (wbits + 2))
-                         + 131072 + (1 << (memlevel + 8));
+                         + 131072 + (1 << (memlevel + 8))
+                         + 4 * (64 + sizeof(void*));
         ctx->zlib_ng = 1;
     }
 }
@@ -925,13 +929,16 @@ ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
 
     alloc = items * size;
 
-    if (items == 1 && alloc % 512 != 0 && alloc < 8192) {
-
+    if (items == 1 && alloc % 512 != 0 && alloc < 8192
+        && !ctx->state_allocated)
+    {
         /*
          * The zlib deflate_state allocation, it takes about 6K,
          * we allocate 8K.  Other allocations are divisible by 512.
          */
 
+        ctx->state_allocated = 1;
+
         alloc = 8192;
     }
 
diff --git a/src/http/modules/ngx_http_gzip_static_module.c b/src/http/modules/ngx_http_gzip_static_module.c
index 7652a9a..91b38d1 100644
--- a/src/http/modules/ngx_http_gzip_static_module.c
+++ b/src/http/modules/ngx_http_gzip_static_module.c
@@ -242,10 +242,13 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
     }
 
     h->hash = 1;
+    h->next = NULL;
     ngx_str_set(&h->key, "Content-Encoding");
     ngx_str_set(&h->value, "gzip");
     r->headers_out.content_encoding = h;
 
+    r->allow_ranges = 1;
+
     /* we need to allocate all before the header would be sent */
 
     b = ngx_calloc_buf(r->pool);
@@ -270,6 +273,7 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
     b->in_file = b->file_last ? 1 : 0;
     b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
+    b->sync = (b->last_buf || b->in_file) ? 0 : 1;
 
     b->file->fd = of.fd;
     b->file->name = path;
diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index a4c8cc2..90e6da8 100644
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -329,8 +329,7 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
     time_t               now, expires_time, max_age;
     ngx_str_t            value;
     ngx_int_t            rc;
-    ngx_uint_t           i;
-    ngx_table_elt_t     *e, *cc, **ccp;
+    ngx_table_elt_t     *e, *cc;
     ngx_http_expires_t   expires;
 
     expires = conf->expires;
@@ -363,6 +362,7 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
         }
 
         r->headers_out.expires = e;
+        e->next = NULL;
 
         e->hash = 1;
         ngx_str_set(&e->key, "Expires");
@@ -371,38 +371,29 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
     len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
     e->value.len = len - 1;
 
-    ccp = r->headers_out.cache_control.elts;
+    cc = r->headers_out.cache_control;
 
-    if (ccp == NULL) {
-
-        if (ngx_array_init(&r->headers_out.cache_control, r->pool,
-                           1, sizeof(ngx_table_elt_t *))
-            != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
+    if (cc == NULL) {
 
         cc = ngx_list_push(&r->headers_out.headers);
         if (cc == NULL) {
+            e->hash = 0;
             return NGX_ERROR;
         }
 
+        r->headers_out.cache_control = cc;
+        cc->next = NULL;
+
         cc->hash = 1;
         ngx_str_set(&cc->key, "Cache-Control");
 
-        ccp = ngx_array_push(&r->headers_out.cache_control);
-        if (ccp == NULL) {
-            return NGX_ERROR;
-        }
-
-        *ccp = cc;
-
     } else {
-        for (i = 1; i < r->headers_out.cache_control.nelts; i++) {
-            ccp[i]->hash = 0;
+        for (cc = cc->next; cc; cc = cc->next) {
+            cc->hash = 0;
         }
 
-        cc = ccp[0];
+        cc = r->headers_out.cache_control;
+        cc->next = NULL;
     }
 
     if (expires == NGX_HTTP_EXPIRES_EPOCH) {
@@ -420,6 +411,8 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
 
     e->value.data = ngx_pnalloc(r->pool, len);
     if (e->value.data == NULL) {
+        e->hash = 0;
+        cc->hash = 0;
         return NGX_ERROR;
     }
 
@@ -457,6 +450,7 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
     cc->value.data = ngx_pnalloc(r->pool,
                                  sizeof("max-age=") + NGX_TIME_T_LEN + 1);
     if (cc->value.data == NULL) {
+        cc->hash = 0;
         return NGX_ERROR;
     }
 
@@ -564,22 +558,12 @@ static ngx_int_t
 ngx_http_add_multi_header_lines(ngx_http_request_t *r,
     ngx_http_header_val_t *hv, ngx_str_t *value)
 {
-    ngx_array_t      *pa;
     ngx_table_elt_t  *h, **ph;
 
     if (value->len == 0) {
         return NGX_OK;
     }
 
-    pa = (ngx_array_t *) ((char *) &r->headers_out + hv->offset);
-
-    if (pa->elts == NULL) {
-        if (ngx_array_init(pa, r->pool, 1, sizeof(ngx_table_elt_t *)) != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
     h = ngx_list_push(&r->headers_out.headers);
     if (h == NULL) {
         return NGX_ERROR;
@@ -589,12 +573,12 @@ ngx_http_add_multi_header_lines(ngx_http_request_t *r,
     h->key = hv->key;
     h->value = *value;
 
-    ph = ngx_array_push(pa);
-    if (ph == NULL) {
-        return NGX_ERROR;
-    }
+    ph = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
+
+    while (*ph) { ph = &(*ph)->next; }
 
     *ph = h;
+    h->next = NULL;
 
     return NGX_OK;
 }
@@ -642,6 +626,7 @@ ngx_http_set_response_header(ngx_http_request_t *r, ngx_http_header_val_t *hv,
         }
 
         *old = h;
+        h->next = NULL;
     }
 
     h->hash = 1;
diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
index c82df6e..11bbd91 100644
--- a/src/http/modules/ngx_http_memcached_module.c
+++ b/src/http/modules/ngx_http_memcached_module.c
@@ -401,6 +401,7 @@ found:
             }
 
             h->hash = 1;
+            h->next = NULL;
             ngx_str_set(&h->key, "Content-Encoding");
             ngx_str_set(&h->value, "gzip");
             r->headers_out.content_encoding = h;
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 4eff01e..03175de 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -714,6 +714,7 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
     b->in_file = b->file_last ? 1 : 0;
     b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
+    b->sync = (b->last_buf || b->in_file) ? 0 : 1;
 
     b->file->fd = of.fd;
     b->file->name = path;
@@ -2430,7 +2431,7 @@ ngx_http_mp4_crop_stts_data(ngx_http_mp4_file_t *mp4,
         }
 
         start_sample += count;
-        start_time -= count * duration;
+        start_time -= (uint64_t) count * duration;
         entries--;
         entry++;
     }
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 7c4061c..9cc202c 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -236,6 +236,8 @@ static ngx_int_t ngx_http_proxy_rewrite_regex(ngx_conf_t *cf,
     ngx_http_proxy_rewrite_t *pr, ngx_str_t *regex, ngx_uint_t caseless);
 
 #if (NGX_HTTP_SSL)
+static ngx_int_t ngx_http_proxy_merge_ssl(ngx_conf_t *cf,
+    ngx_http_proxy_loc_conf_t *conf, ngx_http_proxy_loc_conf_t *prev);
 static ngx_int_t ngx_http_proxy_set_ssl(ngx_conf_t *cf,
     ngx_http_proxy_loc_conf_t *plcf);
 #endif
@@ -959,7 +961,7 @@ ngx_http_proxy_handler(ngx_http_request_t *r)
         ctx->vars = plcf->vars;
         u->schema = plcf->vars.schema;
 #if (NGX_HTTP_SSL)
-        u->ssl = (plcf->upstream.ssl != NULL);
+        u->ssl = plcf->ssl;
 #endif
 
     } else {
@@ -1930,8 +1932,12 @@ ngx_http_proxy_process_header(ngx_http_request_t *r)
             hh = ngx_hash_find(&umcf->headers_in_hash, h->hash,
                                h->lowcase_key, h->key.len);
 
-            if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
-                return NGX_ERROR;
+            if (hh) {
+                rc = hh->handler(r, h, hh->offset);
+
+                if (rc != NGX_OK) {
+                    return rc;
+                }
             }
 
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -1965,6 +1971,7 @@ ngx_http_proxy_process_header(ngx_http_request_t *r)
                 ngx_str_set(&h->key, "Server");
                 ngx_str_null(&h->value);
                 h->lowcase_key = (u_char *) "server";
+                h->next = NULL;
             }
 
             if (r->upstream->headers_in.date == NULL) {
@@ -1978,6 +1985,7 @@ ngx_http_proxy_process_header(ngx_http_request_t *r)
                 ngx_str_set(&h->key, "Date");
                 ngx_str_null(&h->value);
                 h->lowcase_key = (u_char *) "date";
+                h->next = NULL;
             }
 
             /* clear content length if response is chunked */
@@ -2559,22 +2567,20 @@ static ngx_int_t
 ngx_http_proxy_add_x_forwarded_for_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
-    size_t             len;
-    u_char            *p;
-    ngx_uint_t         i, n;
-    ngx_table_elt_t  **h;
+    size_t            len;
+    u_char           *p;
+    ngx_table_elt_t  *h, *xfwd;
 
     v->valid = 1;
     v->no_cacheable = 0;
     v->not_found = 0;
 
-    n = r->headers_in.x_forwarded_for.nelts;
-    h = r->headers_in.x_forwarded_for.elts;
+    xfwd = r->headers_in.x_forwarded_for;
 
     len = 0;
 
-    for (i = 0; i < n; i++) {
-        len += h[i]->value.len + sizeof(", ") - 1;
+    for (h = xfwd; h; h = h->next) {
+        len += h->value.len + sizeof(", ") - 1;
     }
 
     if (len == 0) {
@@ -2593,8 +2599,8 @@ ngx_http_proxy_add_x_forwarded_for_variable(ngx_http_request_t *r,
     v->len = len;
     v->data = p;
 
-    for (i = 0; i < n; i++) {
-        p = ngx_copy(p, h[i]->value.data, h[i]->value.len);
+    for (h = xfwd; h; h = h->next) {
+        p = ngx_copy(p, h->value.data, h->value.len);
         *p++ = ','; *p++ = ' ';
     }
 
@@ -3720,12 +3726,17 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #if (NGX_HTTP_SSL)
 
+    if (ngx_http_proxy_merge_ssl(cf, conf, prev) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
                               prev->upstream.ssl_session_reuse, 1);
 
     ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
-                                 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
-                                  |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
+                                 (NGX_CONF_BITMASK_SET
+                                  |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
+                                  |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
 
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
                              "DEFAULT");
@@ -3853,7 +3864,7 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->proxy_values = prev->proxy_values;
 
 #if (NGX_HTTP_SSL)
-        conf->upstream.ssl = prev->upstream.ssl;
+        conf->ssl = prev->ssl;
 #endif
     }
 
@@ -4918,18 +4929,64 @@ ngx_http_proxy_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
 }
 
 
+static ngx_int_t
+ngx_http_proxy_merge_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
+    ngx_http_proxy_loc_conf_t *prev)
+{
+    ngx_uint_t  preserve;
+
+    if (conf->ssl_protocols == 0
+        && conf->ssl_ciphers.data == NULL
+        && conf->upstream.ssl_certificate == NGX_CONF_UNSET_PTR
+        && conf->upstream.ssl_certificate_key == NGX_CONF_UNSET_PTR
+        && conf->upstream.ssl_passwords == NGX_CONF_UNSET_PTR
+        && conf->upstream.ssl_verify == NGX_CONF_UNSET
+        && conf->ssl_verify_depth == NGX_CONF_UNSET_UINT
+        && conf->ssl_trusted_certificate.data == NULL
+        && conf->ssl_crl.data == NULL
+        && conf->upstream.ssl_session_reuse == NGX_CONF_UNSET
+        && conf->ssl_conf_commands == NGX_CONF_UNSET_PTR)
+    {
+        if (prev->upstream.ssl) {
+            conf->upstream.ssl = prev->upstream.ssl;
+            return NGX_OK;
+        }
+
+        preserve = 1;
+
+    } else {
+        preserve = 0;
+    }
+
+    conf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
+    if (conf->upstream.ssl == NULL) {
+        return NGX_ERROR;
+    }
+
+    conf->upstream.ssl->log = cf->log;
+
+    /*
+     * special handling to preserve conf->upstream.ssl
+     * in the "http" section to inherit it to all servers
+     */
+
+    if (preserve) {
+        prev->upstream.ssl = conf->upstream.ssl;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
 {
     ngx_pool_cleanup_t  *cln;
 
-    plcf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
-    if (plcf->upstream.ssl == NULL) {
-        return NGX_ERROR;
+    if (plcf->upstream.ssl->ctx) {
+        return NGX_OK;
     }
 
-    plcf->upstream.ssl->log = cf->log;
-
     if (ngx_ssl_create(plcf->upstream.ssl, plcf->ssl_protocols, NULL)
         != NGX_OK)
     {
@@ -4951,8 +5008,9 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
         return NGX_ERROR;
     }
 
-    if (plcf->upstream.ssl_certificate) {
-
+    if (plcf->upstream.ssl_certificate
+        && plcf->upstream.ssl_certificate->value.len)
+    {
         if (plcf->upstream.ssl_certificate_key == NULL) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"proxy_ssl_certificate_key\" is defined "
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index ae08ebb..27d1875 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -258,6 +258,7 @@ next_filter:
     }
 
     r->headers_out.accept_ranges->hash = 1;
+    r->headers_out.accept_ranges->next = NULL;
     ngx_str_set(&r->headers_out.accept_ranges->key, "Accept-Ranges");
     ngx_str_set(&r->headers_out.accept_ranges->value, "bytes");
 
@@ -424,9 +425,14 @@ ngx_http_range_singlepart_header(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
+    if (r->headers_out.content_range) {
+        r->headers_out.content_range->hash = 0;
+    }
+
     r->headers_out.content_range = content_range;
 
     content_range->hash = 1;
+    content_range->next = NULL;
     ngx_str_set(&content_range->key, "Content-Range");
 
     content_range->value.data = ngx_pnalloc(r->pool,
@@ -580,6 +586,11 @@ ngx_http_range_multipart_header(ngx_http_request_t *r,
         r->headers_out.content_length = NULL;
     }
 
+    if (r->headers_out.content_range) {
+        r->headers_out.content_range->hash = 0;
+        r->headers_out.content_range = NULL;
+    }
+
     return ngx_http_next_header_filter(r);
 }
 
@@ -596,9 +607,14 @@ ngx_http_range_not_satisfiable(ngx_http_request_t *r)
         return NGX_ERROR;
     }
 
+    if (r->headers_out.content_range) {
+        r->headers_out.content_range->hash = 0;
+    }
+
     r->headers_out.content_range = content_range;
 
     content_range->hash = 1;
+    content_range->next = NULL;
     ngx_str_set(&content_range->key, "Content-Range");
 
     content_range->value.data = ngx_pnalloc(r->pool,
diff --git a/src/http/modules/ngx_http_realip_module.c b/src/http/modules/ngx_http_realip_module.c
index 9586ebe..f6731e7 100644
--- a/src/http/modules/ngx_http_realip_module.c
+++ b/src/http/modules/ngx_http_realip_module.c
@@ -134,9 +134,8 @@ ngx_http_realip_handler(ngx_http_request_t *r)
     ngx_str_t                   *value;
     ngx_uint_t                   i, hash;
     ngx_addr_t                   addr;
-    ngx_array_t                 *xfwd;
     ngx_list_part_t             *part;
-    ngx_table_elt_t             *header;
+    ngx_table_elt_t             *header, *xfwd;
     ngx_connection_t            *c;
     ngx_http_realip_ctx_t       *ctx;
     ngx_http_realip_loc_conf_t  *rlcf;
@@ -168,9 +167,9 @@ ngx_http_realip_handler(ngx_http_request_t *r)
 
     case NGX_HTTP_REALIP_XFWD:
 
-        xfwd = &r->headers_in.x_forwarded_for;
+        xfwd = r->headers_in.x_forwarded_for;
 
-        if (xfwd->elts == NULL) {
+        if (xfwd == NULL) {
             return NGX_DECLINED;
         }
 
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index e5d31ae..9fc18dc 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -633,14 +633,14 @@ static ngx_int_t
 ngx_http_scgi_create_request(ngx_http_request_t *r)
 {
     off_t                         content_length_n;
-    u_char                        ch, *key, *val, *lowcase_key;
+    u_char                        ch, sep, *key, *val, *lowcase_key;
     size_t                        len, key_len, val_len, allocated;
     ngx_buf_t                    *b;
     ngx_str_t                     content_length;
     ngx_uint_t                    i, n, hash, skip_empty, header_params;
     ngx_chain_t                  *cl, *body;
     ngx_list_part_t              *part;
-    ngx_table_elt_t              *header, **ignored;
+    ngx_table_elt_t              *header, *hn, **ignored;
     ngx_http_scgi_params_t       *params;
     ngx_http_script_code_pt       code;
     ngx_http_script_engine_t      e, le;
@@ -707,7 +707,11 @@ ngx_http_scgi_create_request(ngx_http_request_t *r)
         allocated = 0;
         lowcase_key = NULL;
 
-        if (params->number) {
+        if (ngx_http_link_multi_headers(r) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (params->number || r->headers_in.multi) {
             n = 0;
             part = &r->headers_in.headers.part;
 
@@ -737,6 +741,12 @@ ngx_http_scgi_create_request(ngx_http_request_t *r)
                 i = 0;
             }
 
+            for (n = 0; n < header_params; n++) {
+                if (&header[i] == ignored[n]) {
+                    goto next_length;
+                }
+            }
+
             if (params->number) {
                 if (allocated < header[i].key.len) {
                     allocated = header[i].key.len + 16;
@@ -770,6 +780,15 @@ ngx_http_scgi_create_request(ngx_http_request_t *r)
 
             len += sizeof("HTTP_") - 1 + header[i].key.len + 1
                 + header[i].value.len + 1;
+
+            for (hn = header[i].next; hn; hn = hn->next) {
+                len += hn->value.len + 2;
+                ignored[header_params++] = hn;
+            }
+
+        next_length:
+
+            continue;
         }
     }
 
@@ -869,7 +888,7 @@ ngx_http_scgi_create_request(ngx_http_request_t *r)
 
             for (n = 0; n < header_params; n++) {
                 if (&header[i] == ignored[n]) {
-                    goto next;
+                    goto next_value;
                 }
             }
 
@@ -893,12 +912,33 @@ ngx_http_scgi_create_request(ngx_http_request_t *r)
 
             val = b->last;
             b->last = ngx_copy(val, header[i].value.data, header[i].value.len);
+
+            if (header[i].next) {
+
+                if (header[i].key.len == sizeof("Cookie") - 1
+                    && ngx_strncasecmp(header[i].key.data, (u_char *) "Cookie",
+                                       sizeof("Cookie") - 1)
+                       == 0)
+                {
+                    sep = ';';
+
+                } else {
+                    sep = ',';
+                }
+
+                for (hn = header[i].next; hn; hn = hn->next) {
+                    *b->last++ = sep;
+                    *b->last++ = ' ';
+                    b->last = ngx_copy(b->last, hn->value.data, hn->value.len);
+                }
+            }
+
             *b->last++ = (u_char) 0;
 
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                            "scgi param: \"%s: %s\"", key, val);
 
-        next:
+        next_value:
 
             continue;
         }
@@ -1074,8 +1114,12 @@ ngx_http_scgi_process_header(ngx_http_request_t *r)
             hh = ngx_hash_find(&umcf->headers_in_hash, h->hash,
                                h->lowcase_key, h->key.len);
 
-            if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
-                return NGX_ERROR;
+            if (hh) {
+                rc = hh->handler(r, h, hh->offset);
+
+                if (rc != NGX_OK) {
+                    return rc;
+                }
             }
 
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index 6737965..e7601b8 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -329,7 +329,7 @@ static ngx_http_variable_t  ngx_http_ssi_vars[] = {
 static ngx_int_t
 ngx_http_ssi_header_filter(ngx_http_request_t *r)
 {
-    ngx_http_ssi_ctx_t       *ctx;
+    ngx_http_ssi_ctx_t       *ctx, *mctx;
     ngx_http_ssi_loc_conf_t  *slcf;
 
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_ssi_filter_module);
@@ -341,6 +341,8 @@ ngx_http_ssi_header_filter(ngx_http_request_t *r)
         return ngx_http_next_header_filter(r);
     }
 
+    mctx = ngx_http_get_module_ctx(r->main, ngx_http_ssi_filter_module);
+
     ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_ssi_ctx_t));
     if (ctx == NULL) {
         return NGX_ERROR;
@@ -367,6 +369,26 @@ ngx_http_ssi_header_filter(ngx_http_request_t *r)
     r->filter_need_in_memory = 1;
 
     if (r == r->main) {
+
+        if (mctx) {
+
+            /*
+             * if there was a shared context previously used as main,
+             * copy variables and blocks
+             */
+
+            ctx->variables = mctx->variables;
+            ctx->blocks = mctx->blocks;
+
+#if (NGX_PCRE)
+            ctx->ncaptures = mctx->ncaptures;
+            ctx->captures = mctx->captures;
+            ctx->captures_data = mctx->captures_data;
+#endif
+
+            mctx->shared = 0;
+        }
+
         ngx_http_clear_content_length(r);
         ngx_http_clear_accept_ranges(r);
 
@@ -379,6 +401,10 @@ ngx_http_ssi_header_filter(ngx_http_request_t *r)
         } else {
             ngx_http_weak_etag(r);
         }
+
+    } else if (mctx == NULL) {
+        ngx_http_set_ctx(r->main, ctx, ngx_http_ssi_filter_module);
+        ctx->shared = 1;
     }
 
     return ngx_http_next_header_filter(r);
@@ -405,6 +431,7 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module);
 
     if (ctx == NULL
+        || (ctx->shared && r == r->main)
         || (in == NULL
             && ctx->buf == NULL
             && ctx->in == NULL
diff --git a/src/http/modules/ngx_http_ssi_filter_module.h b/src/http/modules/ngx_http_ssi_filter_module.h
index 0bd01a0..419bf97 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.h
+++ b/src/http/modules/ngx_http_ssi_filter_module.h
@@ -71,6 +71,7 @@ typedef struct {
     u_char                   *captures_data;
 #endif
 
+    unsigned                  shared:1;
     unsigned                  conditional:2;
     unsigned                  encoding:2;
     unsigned                  block:1;
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index d74d460..4c4a598 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -632,8 +632,9 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->reject_handshake, prev->reject_handshake, 0);
 
     ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
-                         (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
-                          |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
+                         (NGX_CONF_BITMASK_SET
+                          |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
+                          |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
 
     ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size,
                          NGX_SSL_BUFSIZE);
@@ -1093,7 +1094,7 @@ ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 len++;
             }
 
-            if (len == 0) {
+            if (len == 0 || j == value[i].len) {
                 goto invalid;
             }
 
@@ -1183,7 +1184,7 @@ ngx_http_ssl_ocsp_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         len++;
     }
 
-    if (len == 0) {
+    if (len == 0 || j == value[1].len) {
         goto invalid;
     }
 
diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
index cf29d5a..8b0bb14 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -195,6 +195,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
         }
 
         r->headers_out.location->hash = 1;
+        r->headers_out.location->next = NULL;
         ngx_str_set(&r->headers_out.location->key, "Location");
         r->headers_out.location->value.len = len;
         r->headers_out.location->value.data = location;
@@ -237,10 +238,6 @@ ngx_http_static_handler(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    if (r != r->main && of.size == 0) {
-        return ngx_http_send_header(r);
-    }
-
     r->allow_ranges = 1;
 
     /* we need to allocate all before the header would be sent */
@@ -264,9 +261,10 @@ ngx_http_static_handler(ngx_http_request_t *r)
     b->file_pos = 0;
     b->file_last = of.size;
 
-    b->in_file = b->file_last ? 1: 0;
-    b->last_buf = (r == r->main) ? 1: 0;
+    b->in_file = b->file_last ? 1 : 0;
+    b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
+    b->sync = (b->last_buf || b->in_file) ? 0 : 1;
 
     b->file->fd = of.fd;
     b->file->name = path;
diff --git a/src/http/modules/ngx_http_userid_filter_module.c b/src/http/modules/ngx_http_userid_filter_module.c
index 1e33c5c..e528444 100644
--- a/src/http/modules/ngx_http_userid_filter_module.c
+++ b/src/http/modules/ngx_http_userid_filter_module.c
@@ -319,10 +319,9 @@ ngx_http_userid_set_variable(ngx_http_request_t *r,
 static ngx_http_userid_ctx_t *
 ngx_http_userid_get_uid(ngx_http_request_t *r, ngx_http_userid_conf_t *conf)
 {
-    ngx_int_t                n;
-    ngx_str_t                src, dst;
-    ngx_table_elt_t        **cookies;
-    ngx_http_userid_ctx_t   *ctx;
+    ngx_str_t               src, dst;
+    ngx_table_elt_t        *cookie;
+    ngx_http_userid_ctx_t  *ctx;
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_userid_filter_module);
 
@@ -339,9 +338,9 @@ ngx_http_userid_get_uid(ngx_http_request_t *r, ngx_http_userid_conf_t *conf)
         ngx_http_set_ctx(r, ctx, ngx_http_userid_filter_module);
     }
 
-    n = ngx_http_parse_multi_header_lines(&r->headers_in.cookies, &conf->name,
-                                          &ctx->cookie);
-    if (n == NGX_DECLINED) {
+    cookie = ngx_http_parse_multi_header_lines(r, r->headers_in.cookie,
+                                               &conf->name, &ctx->cookie);
+    if (cookie == NULL) {
         return ctx;
     }
 
@@ -349,10 +348,9 @@ ngx_http_userid_get_uid(ngx_http_request_t *r, ngx_http_userid_conf_t *conf)
                    "uid cookie: \"%V\"", &ctx->cookie);
 
     if (ctx->cookie.len < 22) {
-        cookies = r->headers_in.cookies.elts;
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "client sent too short userid cookie \"%V\"",
-                      &cookies[n]->value);
+                      &cookie->value);
         return ctx;
     }
 
@@ -370,10 +368,9 @@ ngx_http_userid_get_uid(ngx_http_request_t *r, ngx_http_userid_conf_t *conf)
     dst.data = (u_char *) ctx->uid_got;
 
     if (ngx_decode_base64(&dst, &src) == NGX_ERROR) {
-        cookies = r->headers_in.cookies.elts;
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "client sent invalid userid cookie \"%V\"",
-                      &cookies[n]->value);
+                      &cookie->value);
         return ctx;
     }
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index d46741a..e4f721b 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -96,6 +96,8 @@ static char *ngx_http_uwsgi_ssl_password_file(ngx_conf_t *cf,
     ngx_command_t *cmd, void *conf);
 static char *ngx_http_uwsgi_ssl_conf_command_check(ngx_conf_t *cf, void *post,
     void *data);
+static ngx_int_t ngx_http_uwsgi_merge_ssl(ngx_conf_t *cf,
+    ngx_http_uwsgi_loc_conf_t *conf, ngx_http_uwsgi_loc_conf_t *prev);
 static ngx_int_t ngx_http_uwsgi_set_ssl(ngx_conf_t *cf,
     ngx_http_uwsgi_loc_conf_t *uwcf);
 #endif
@@ -668,7 +670,7 @@ ngx_http_uwsgi_handler(ngx_http_request_t *r)
     if (uwcf->uwsgi_lengths == NULL) {
 
 #if (NGX_HTTP_SSL)
-        u->ssl = (uwcf->upstream.ssl != NULL);
+        u->ssl = uwcf->ssl;
 
         if (u->ssl) {
             ngx_str_set(&u->schema, "suwsgi://");
@@ -845,13 +847,13 @@ ngx_http_uwsgi_create_key(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_uwsgi_create_request(ngx_http_request_t *r)
 {
-    u_char                        ch, *lowcase_key;
+    u_char                        ch, sep, *lowcase_key;
     size_t                        key_len, val_len, len, allocated;
     ngx_uint_t                    i, n, hash, skip_empty, header_params;
     ngx_buf_t                    *b;
     ngx_chain_t                  *cl, *body;
     ngx_list_part_t              *part;
-    ngx_table_elt_t              *header, **ignored;
+    ngx_table_elt_t              *header, *hn, **ignored;
     ngx_http_uwsgi_params_t      *params;
     ngx_http_script_code_pt       code;
     ngx_http_script_engine_t      e, le;
@@ -905,7 +907,11 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
         allocated = 0;
         lowcase_key = NULL;
 
-        if (params->number) {
+        if (ngx_http_link_multi_headers(r) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (params->number || r->headers_in.multi) {
             n = 0;
             part = &r->headers_in.headers.part;
 
@@ -935,6 +941,12 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
                 i = 0;
             }
 
+            for (n = 0; n < header_params; n++) {
+                if (&header[i] == ignored[n]) {
+                    goto next_length;
+                }
+            }
+
             if (params->number) {
                 if (allocated < header[i].key.len) {
                     allocated = header[i].key.len + 16;
@@ -968,6 +980,15 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
 
             len += 2 + sizeof("HTTP_") - 1 + header[i].key.len
                  + 2 + header[i].value.len;
+
+            for (hn = header[i].next; hn; hn = hn->next) {
+                len += hn->value.len + 2;
+                ignored[header_params++] = hn;
+            }
+
+        next_length:
+
+            continue;
         }
     }
 
@@ -1086,7 +1107,7 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
 
             for (n = 0; n < header_params; n++) {
                 if (&header[i] == ignored[n]) {
-                    goto next;
+                    goto next_value;
                 }
             }
 
@@ -1109,15 +1130,41 @@ ngx_http_uwsgi_create_request(ngx_http_request_t *r)
             }
 
             val_len = header[i].value.len;
+
+            for (hn = header[i].next; hn; hn = hn->next) {
+                val_len += hn->value.len + 2;
+            }
+
             *b->last++ = (u_char) (val_len & 0xff);
             *b->last++ = (u_char) ((val_len >> 8) & 0xff);
-            b->last = ngx_copy(b->last, header[i].value.data, val_len);
+            b->last = ngx_copy(b->last, header[i].value.data,
+                               header[i].value.len);
+
+            if (header[i].next) {
+
+                if (header[i].key.len == sizeof("Cookie") - 1
+                    && ngx_strncasecmp(header[i].key.data, (u_char *) "Cookie",
+                                       sizeof("Cookie") - 1)
+                       == 0)
+                {
+                    sep = ';';
+
+                } else {
+                    sep = ',';
+                }
+
+                for (hn = header[i].next; hn; hn = hn->next) {
+                    *b->last++ = sep;
+                    *b->last++ = ' ';
+                    b->last = ngx_copy(b->last, hn->value.data, hn->value.len);
+                }
+            }
 
             ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                            "uwsgi param: \"%*s: %*s\"",
                            key_len, b->last - (key_len + 2 + val_len),
                            val_len, b->last - val_len);
-        next:
+        next_value:
 
             continue;
         }
@@ -1295,8 +1342,12 @@ ngx_http_uwsgi_process_header(ngx_http_request_t *r)
             hh = ngx_hash_find(&umcf->headers_in_hash, h->hash,
                                h->lowcase_key, h->key.len);
 
-            if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
-                return NGX_ERROR;
+            if (hh) {
+                rc = hh->handler(r, h, hh->offset);
+
+                if (rc != NGX_OK) {
+                    return rc;
+                }
             }
 
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -1816,12 +1867,17 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #if (NGX_HTTP_SSL)
 
+    if (ngx_http_uwsgi_merge_ssl(cf, conf, prev) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
                               prev->upstream.ssl_session_reuse, 1);
 
     ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
-                                 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
-                                  |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
+                                 (NGX_CONF_BITMASK_SET
+                                  |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
+                                  |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
 
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
                              "DEFAULT");
@@ -1878,7 +1934,7 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->uwsgi_values = prev->uwsgi_values;
 
 #if (NGX_HTTP_SSL)
-        conf->upstream.ssl = prev->upstream.ssl;
+        conf->ssl = prev->ssl;
 #endif
     }
 
@@ -2405,18 +2461,64 @@ ngx_http_uwsgi_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
 }
 
 
+static ngx_int_t
+ngx_http_uwsgi_merge_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *conf,
+    ngx_http_uwsgi_loc_conf_t *prev)
+{
+    ngx_uint_t  preserve;
+
+    if (conf->ssl_protocols == 0
+        && conf->ssl_ciphers.data == NULL
+        && conf->upstream.ssl_certificate == NGX_CONF_UNSET_PTR
+        && conf->upstream.ssl_certificate_key == NGX_CONF_UNSET_PTR
+        && conf->upstream.ssl_passwords == NGX_CONF_UNSET_PTR
+        && conf->upstream.ssl_verify == NGX_CONF_UNSET
+        && conf->ssl_verify_depth == NGX_CONF_UNSET_UINT
+        && conf->ssl_trusted_certificate.data == NULL
+        && conf->ssl_crl.data == NULL
+        && conf->upstream.ssl_session_reuse == NGX_CONF_UNSET
+        && conf->ssl_conf_commands == NGX_CONF_UNSET_PTR)
+    {
+        if (prev->upstream.ssl) {
+            conf->upstream.ssl = prev->upstream.ssl;
+            return NGX_OK;
+        }
+
+        preserve = 1;
+
+    } else {
+        preserve = 0;
+    }
+
+    conf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
+    if (conf->upstream.ssl == NULL) {
+        return NGX_ERROR;
+    }
+
+    conf->upstream.ssl->log = cf->log;
+
+    /*
+     * special handling to preserve conf->upstream.ssl
+     * in the "http" section to inherit it to all servers
+     */
+
+    if (preserve) {
+        prev->upstream.ssl = conf->upstream.ssl;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
 {
     ngx_pool_cleanup_t  *cln;
 
-    uwcf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
-    if (uwcf->upstream.ssl == NULL) {
-        return NGX_ERROR;
+    if (uwcf->upstream.ssl->ctx) {
+        return NGX_OK;
     }
 
-    uwcf->upstream.ssl->log = cf->log;
-
     if (ngx_ssl_create(uwcf->upstream.ssl, uwcf->ssl_protocols, NULL)
         != NGX_OK)
     {
@@ -2438,8 +2540,9 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
         return NGX_ERROR;
     }
 
-    if (uwcf->upstream.ssl_certificate) {
-
+    if (uwcf->upstream.ssl_certificate
+        && uwcf->upstream.ssl_certificate->value.len)
+    {
         if (uwcf->upstream.ssl_certificate_key == NULL) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"uwsgi_ssl_certificate_key\" is defined "
diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs
index caf7c08..fd59e29 100644
--- a/src/http/modules/perl/nginx.xs
+++ b/src/http/modules/perl/nginx.xs
@@ -269,10 +269,9 @@ header_in(r, key)
     u_char                     *p, *lowcase_key, *value, sep;
     STRLEN                      len;
     ssize_t                     size;
-    ngx_uint_t                  i, n, hash;
-    ngx_array_t                *a;
+    ngx_uint_t                  i, hash;
     ngx_list_part_t            *part;
-    ngx_table_elt_t            *h, **ph;
+    ngx_table_elt_t            *h, *header, **ph;
     ngx_http_header_t          *hh;
     ngx_http_core_main_conf_t  *cmcf;
 
@@ -302,78 +301,23 @@ header_in(r, key)
 
     if (hh) {
 
-        if (hh->offset == offsetof(ngx_http_headers_in_t, cookies)) {
+        if (hh->offset == offsetof(ngx_http_headers_in_t, cookie)) {
             sep = ';';
-            goto multi;
-        }
-#if (NGX_HTTP_X_FORWARDED_FOR)
-        if (hh->offset == offsetof(ngx_http_headers_in_t, x_forwarded_for)) {
+
+        } else {
             sep = ',';
-            goto multi;
         }
-#endif
 
         ph = (ngx_table_elt_t **) ((char *) &r->headers_in + hh->offset);
 
-        if (*ph) {
-            ngx_http_perl_set_targ((*ph)->value.data, (*ph)->value.len);
-
-            goto done;
-        }
-
-        XSRETURN_UNDEF;
-
-    multi:
-
-        /* Cookie, X-Forwarded-For */
-
-        a = (ngx_array_t *) ((char *) &r->headers_in + hh->offset);
-
-        n = a->nelts;
-
-        if (n == 0) {
-            XSRETURN_UNDEF;
-        }
-
-        ph = a->elts;
-
-        if (n == 1) {
-            ngx_http_perl_set_targ((*ph)->value.data, (*ph)->value.len);
-
-            goto done;
-        }
-
-        size = - (ssize_t) (sizeof("; ") - 1);
-
-        for (i = 0; i < n; i++) {
-            size += ph[i]->value.len + sizeof("; ") - 1;
-        }
-
-        value = ngx_pnalloc(r->pool, size);
-        if (value == NULL) {
-            ctx->error = 1;
-            croak("ngx_pnalloc() failed");
-        }
-
-        p = value;
-
-        for (i = 0; /* void */ ; i++) {
-            p = ngx_copy(p, ph[i]->value.data, ph[i]->value.len);
-
-            if (i == n - 1) {
-                break;
-            }
-
-            *p++ = sep; *p++ = ' ';
-        }
-
-        ngx_http_perl_set_targ(value, size);
-
-        goto done;
+        goto found;
     }
 
     /* iterate over all headers */
 
+    sep = ',';
+    ph = &header;
+
     part = &r->headers_in.headers.part;
     h = part->elts;
 
@@ -395,12 +339,49 @@ header_in(r, key)
             continue;
         }
 
-        ngx_http_perl_set_targ(h[i].value.data, h[i].value.len);
+        *ph = &h[i];
+        ph = &h[i].next;
+    }
 
+    *ph = NULL;
+    ph = &header;
+
+    found:
+
+    if (*ph == NULL) {
+        XSRETURN_UNDEF;
+    }
+
+    if ((*ph)->next == NULL) {
+        ngx_http_perl_set_targ((*ph)->value.data, (*ph)->value.len);
         goto done;
     }
 
-    XSRETURN_UNDEF;
+    size = - (ssize_t) (sizeof("; ") - 1);
+
+    for (h = *ph; h; h = h->next) {
+        size += h->value.len + sizeof("; ") - 1;
+    }
+
+    value = ngx_pnalloc(r->pool, size);
+    if (value == NULL) {
+        ctx->error = 1;
+        croak("ngx_pnalloc() failed");
+    }
+
+    p = value;
+
+    for (h = *ph; h; h = h->next) {
+        p = ngx_copy(p, h->value.data, h->value.len);
+
+        if (h->next == NULL) {
+            break;
+        }
+
+        *p++ = sep; *p++ = ' ';
+    }
+
+    ngx_http_perl_set_targ(value, size);
 
     done:
 
@@ -591,6 +572,7 @@ header_out(r, key, value)
     }
 
     header->hash = 1;
+    header->next = NULL;
 
     if (ngx_http_perl_sv2str(aTHX_ r, &header->key, key) != NGX_OK) {
         header->hash = 0;
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 73c08d5..93e1cd4 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1130,7 +1130,7 @@ ngx_http_create_locations_tree(ngx_conf_t *cf, ngx_queue_t *locations,
     node->auto_redirect = (u_char) ((lq->exact && lq->exact->auto_redirect)
                            || (lq->inclusive && lq->inclusive->auto_redirect));
 
-    node->len = (u_char) len;
+    node->len = (u_short) len;
     ngx_memcpy(node->name, &lq->name->data[prefix], len);
 
     ngx_queue_split(locations, q, &tail);
@@ -1228,7 +1228,8 @@ static ngx_int_t
 ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
     ngx_http_conf_port_t *port, ngx_http_listen_opt_t *lsopt)
 {
-    ngx_uint_t             i, default_server, proxy_protocol;
+    ngx_uint_t             i, default_server, proxy_protocol,
+                           protocols, protocols_prev;
     ngx_http_conf_addr_t  *addr;
 #if (NGX_HTTP_SSL)
     ngx_uint_t             ssl;
@@ -1264,12 +1265,18 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
         default_server = addr[i].opt.default_server;
 
         proxy_protocol = lsopt->proxy_protocol || addr[i].opt.proxy_protocol;
+        protocols = lsopt->proxy_protocol;
+        protocols_prev = addr[i].opt.proxy_protocol;
 
 #if (NGX_HTTP_SSL)
         ssl = lsopt->ssl || addr[i].opt.ssl;
+        protocols |= lsopt->ssl << 1;
+        protocols_prev |= addr[i].opt.ssl << 1;
 #endif
 #if (NGX_HTTP_V2)
         http2 = lsopt->http2 || addr[i].opt.http2;
+        protocols |= lsopt->http2 << 2;
+        protocols_prev |= addr[i].opt.http2 << 2;
 #endif
 
         if (lsopt->set) {
@@ -1299,6 +1306,57 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
             addr[i].default_server = cscf;
         }
 
+        /* check for conflicting protocol options */
+
+        if ((protocols | protocols_prev) != protocols_prev) {
+
+            /* options added */
+
+            if ((addr[i].opt.set && !lsopt->set)
+                || addr[i].protocols_changed
+                || (protocols | protocols_prev) != protocols)
+            {
+                ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                                   "protocol options redefined for %V",
+                                   &addr[i].opt.addr_text);
+            }
+
+            addr[i].protocols = protocols_prev;
+            addr[i].protocols_set = 1;
+            addr[i].protocols_changed = 1;
+
+        } else if ((protocols_prev | protocols) != protocols) {
+
+            /* options removed */
+
+            if (lsopt->set
+                || (addr[i].protocols_set && protocols != addr[i].protocols))
+            {
+                ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                                   "protocol options redefined for %V",
+                                   &addr[i].opt.addr_text);
+            }
+
+            addr[i].protocols = protocols;
+            addr[i].protocols_set = 1;
+            addr[i].protocols_changed = 1;
+
+        } else {
+
+            /* the same options */
+
+            if ((lsopt->set && addr[i].protocols_changed)
+                || (addr[i].protocols_set && protocols != addr[i].protocols))
+            {
+                ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                                   "protocol options redefined for %V",
+                                   &addr[i].opt.addr_text);
+            }
+
+            addr[i].protocols = protocols;
+            addr[i].protocols_set = 1;
+        }
+
         addr[i].opt.default_server = default_server;
         addr[i].opt.proxy_protocol = proxy_protocol;
 #if (NGX_HTTP_SSL)
@@ -1355,6 +1413,9 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
     }
 
     addr->opt = *lsopt;
+    addr->protocols = 0;
+    addr->protocols_set = 0;
+    addr->protocols_changed = 0;
     addr->hash.buckets = NULL;
     addr->hash.size = 0;
     addr->wc_head = NULL;
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index be8b7cd..a7f312f 100644
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -103,10 +103,10 @@ ngx_int_t ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri,
     ngx_str_t *args, ngx_uint_t *flags);
 ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b,
     ngx_uint_t allow_underscores);
-ngx_int_t ngx_http_parse_multi_header_lines(ngx_array_t *headers,
-    ngx_str_t *name, ngx_str_t *value);
-ngx_int_t ngx_http_parse_set_cookie_lines(ngx_array_t *headers,
-    ngx_str_t *name, ngx_str_t *value);
+ngx_table_elt_t *ngx_http_parse_multi_header_lines(ngx_http_request_t *r,
+    ngx_table_elt_t *headers, ngx_str_t *name, ngx_str_t *value);
+ngx_table_elt_t *ngx_http_parse_set_cookie_lines(ngx_http_request_t *r,
+    ngx_table_elt_t *headers, ngx_str_t *name, ngx_str_t *value);
 ngx_int_t ngx_http_arg(ngx_http_request_t *r, u_char *name, size_t len,
     ngx_str_t *value);
 void ngx_http_split_args(ngx_http_request_t *r, ngx_str_t *uri,
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index c7463dc..2140e06 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1007,6 +1007,7 @@ ngx_http_core_find_config_phase(ngx_http_request_t *r,
         }
 
         r->headers_out.location->hash = 1;
+        r->headers_out.location->next = NULL;
         ngx_str_set(&r->headers_out.location->key, "Location");
 
         if (r->args.len == 0) {
@@ -1087,6 +1088,7 @@ ngx_int_t
 ngx_http_core_access_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph)
 {
     ngx_int_t                  rc;
+    ngx_table_elt_t           *h;
     ngx_http_core_loc_conf_t  *clcf;
 
     if (r != r->main) {
@@ -1121,8 +1123,8 @@ ngx_http_core_access_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph)
         if (rc == NGX_OK) {
             r->access_code = 0;
 
-            if (r->headers_out.www_authenticate) {
-                r->headers_out.www_authenticate->hash = 0;
+            for (h = r->headers_out.www_authenticate; h; h = h->next) {
+                h->hash = 0;
             }
 
             r->phase_handler = ph->next;
@@ -1687,6 +1689,7 @@ ngx_http_set_etag(ngx_http_request_t *r)
     }
 
     etag->hash = 1;
+    etag->next = NULL;
     ngx_str_set(&etag->key, "ETag");
 
     etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3);
@@ -1781,6 +1784,7 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
         }
 
         r->headers_out.location->hash = 1;
+        r->headers_out.location->next = NULL;
         ngx_str_set(&r->headers_out.location->key, "Location");
         r->headers_out.location->value = val;
 
@@ -1799,10 +1803,6 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
         }
     }
 
-    if (r != r->main && val.len == 0) {
-        return ngx_http_send_header(r);
-    }
-
     b = ngx_calloc_buf(r->pool);
     if (b == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
@@ -1813,6 +1813,7 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
     b->memory = val.len ? 1 : 0;
     b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
+    b->sync = (b->last_buf || b->memory) ? 0 : 1;
 
     out.buf = b;
     out.next = NULL;
@@ -2024,8 +2025,7 @@ ngx_http_gzip_ok(ngx_http_request_t *r)
 {
     time_t                     date, expires;
     ngx_uint_t                 p;
-    ngx_array_t               *cc;
-    ngx_table_elt_t           *e, *d, *ae;
+    ngx_table_elt_t           *e, *d, *ae, *cc;
     ngx_http_core_loc_conf_t  *clcf;
 
     r->gzip_tested = 1;
@@ -2118,30 +2118,30 @@ ngx_http_gzip_ok(ngx_http_request_t *r)
         return NGX_DECLINED;
     }
 
-    cc = &r->headers_out.cache_control;
+    cc = r->headers_out.cache_control;
 
-    if (cc->elts) {
+    if (cc) {
 
         if ((p & NGX_HTTP_GZIP_PROXIED_NO_CACHE)
-            && ngx_http_parse_multi_header_lines(cc, &ngx_http_gzip_no_cache,
+            && ngx_http_parse_multi_header_lines(r, cc, &ngx_http_gzip_no_cache,
                                                  NULL)
-               >= 0)
+               != NULL)
         {
             goto ok;
         }
 
         if ((p & NGX_HTTP_GZIP_PROXIED_NO_STORE)
-            && ngx_http_parse_multi_header_lines(cc, &ngx_http_gzip_no_store,
+            && ngx_http_parse_multi_header_lines(r, cc, &ngx_http_gzip_no_store,
                                                  NULL)
-               >= 0)
+               != NULL)
         {
             goto ok;
         }
 
         if ((p & NGX_HTTP_GZIP_PROXIED_PRIVATE)
-            && ngx_http_parse_multi_header_lines(cc, &ngx_http_gzip_private,
+            && ngx_http_parse_multi_header_lines(r, cc, &ngx_http_gzip_private,
                                                  NULL)
-               >= 0)
+               != NULL)
         {
             goto ok;
         }
@@ -2712,12 +2712,12 @@ ngx_http_set_disable_symlinks(ngx_http_request_t *r,
 
 ngx_int_t
 ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
-    ngx_array_t *headers, ngx_str_t *value, ngx_array_t *proxies,
+    ngx_table_elt_t *headers, ngx_str_t *value, ngx_array_t *proxies,
     int recursive)
 {
-    ngx_int_t          rc;
-    ngx_uint_t         i, found;
-    ngx_table_elt_t  **h;
+    ngx_int_t         rc;
+    ngx_uint_t        found;
+    ngx_table_elt_t  *h, *next;
 
     if (headers == NULL) {
         return ngx_http_get_forwarded_addr_internal(r, addr, value->data,
@@ -2725,16 +2725,23 @@ ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
                                                     recursive);
     }
 
-    i = headers->nelts;
-    h = headers->elts;
+    /* revert headers order */
+
+    for (h = headers, headers = NULL; h; h = next) {
+        next = h->next;
+        h->next = headers;
+        headers = h;
+    }
+
+    /* iterate over all headers in reverse order */
 
     rc = NGX_DECLINED;
 
     found = 0;
 
-    while (i-- > 0) {
-        rc = ngx_http_get_forwarded_addr_internal(r, addr, h[i]->value.data,
-                                                  h[i]->value.len, proxies,
+    for (h = headers; h; h = h->next) {
+        rc = ngx_http_get_forwarded_addr_internal(r, addr, h->value.data,
+                                                  h->value.len, proxies,
                                                   recursive);
 
         if (!recursive) {
@@ -2753,6 +2760,14 @@ ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
         found = 1;
     }
 
+    /* restore headers order */
+
+    for (h = headers, headers = NULL; h; h = next) {
+        next = h->next;
+        h->next = headers;
+        headers = h;
+    }
+
     return rc;
 }
 
@@ -2802,6 +2817,80 @@ ngx_http_get_forwarded_addr_internal(ngx_http_request_t *r, ngx_addr_t *addr,
 }
 
 
+ngx_int_t
+ngx_http_link_multi_headers(ngx_http_request_t *r)
+{
+    ngx_uint_t        i, j;
+    ngx_list_part_t  *part, *ppart;
+    ngx_table_elt_t  *header, *pheader, **ph;
+
+    if (r->headers_in.multi_linked) {
+        return NGX_OK;
+    }
+
+    r->headers_in.multi_linked = 1;
+
+    part = &r->headers_in.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        header[i].next = NULL;
+
+        /*
+         * search for previous headers with the same name;
+         * if there are any, link to them
+         */
+
+        ppart = &r->headers_in.headers.part;
+        pheader = ppart->elts;
+
+        for (j = 0; /* void */; j++) {
+
+            if (j >= ppart->nelts) {
+                if (ppart->next == NULL) {
+                    break;
+                }
+
+                ppart = ppart->next;
+                pheader = ppart->elts;
+                j = 0;
+            }
+
+            if (part == ppart && i == j) {
+                break;
+            }
+
+            if (header[i].key.len == pheader[j].key.len
+                && ngx_strncasecmp(header[i].key.data, pheader[j].key.data,
+                                   header[i].key.len)
+                   == 0)
+            {
+                ph = &pheader[j].next;
+                while (*ph) { ph = &(*ph)->next; }
+                *ph = &header[i];
+
+                r->headers_in.multi = 1;
+
+                break;
+            }
+        }
+    }
+
+    return NGX_OK;
+}
+
+
 static char *
 ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
 {
@@ -3871,7 +3960,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_str_t              *value, size;
     ngx_url_t               u;
-    ngx_uint_t              n;
+    ngx_uint_t              n, i;
     ngx_http_listen_opt_t   lsopt;
 
     cscf->listen = 1;
@@ -4197,6 +4286,16 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
     for (n = 0; n < u.naddrs; n++) {
+
+        for (i = 0; i < n; i++) {
+            if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen,
+                                 u.addrs[i].sockaddr, u.addrs[i].socklen, 1)
+                == NGX_OK)
+            {
+                goto next;
+            }
+        }
+
         lsopt.sockaddr = u.addrs[n].sockaddr;
         lsopt.socklen = u.addrs[n].socklen;
         lsopt.addr_text = u.addrs[n].name;
@@ -4205,6 +4304,9 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         if (ngx_http_add_listen(cf, cscf, &lsopt) != NGX_OK) {
             return NGX_CONF_ERROR;
         }
+
+    next:
+        continue;
     }
 
     return NGX_CONF_OK;
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 004a98e..e41bc68 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -274,6 +274,10 @@ typedef struct {
 typedef struct {
     ngx_http_listen_opt_t      opt;
 
+    unsigned                   protocols:3;
+    unsigned                   protocols_set:1;
+    unsigned                   protocols_changed:1;
+
     ngx_hash_t                 hash;
     ngx_hash_wildcard_t       *wc_head;
     ngx_hash_wildcard_t       *wc_tail;
@@ -463,8 +467,8 @@ struct ngx_http_location_tree_node_s {
     ngx_http_core_loc_conf_t        *exact;
     ngx_http_core_loc_conf_t        *inclusive;
 
+    u_short                          len;
     u_char                           auto_redirect;
-    u_char                           len;
     u_char                           name[1];
 };
 
@@ -529,9 +533,11 @@ ngx_int_t ngx_http_set_disable_symlinks(ngx_http_request_t *r,
     ngx_http_core_loc_conf_t *clcf, ngx_str_t *path, ngx_open_file_info_t *of);
 
 ngx_int_t ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
-    ngx_array_t *headers, ngx_str_t *value, ngx_array_t *proxies,
+    ngx_table_elt_t *headers, ngx_str_t *value, ngx_array_t *proxies,
     int recursive);
 
+ngx_int_t ngx_http_link_multi_headers(ngx_http_request_t *r);
+
 
 extern ngx_module_t  ngx_http_core_module;
 
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index c40093b..aa5fd19 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1575,10 +1575,6 @@ ngx_http_cache_send(ngx_http_request_t *r)
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http file cache send: %s", c->file.name.data);
 
-    if (r != r->main && c->length - c->body_start == 0) {
-        return ngx_http_send_header(r);
-    }
-
     /* we need to allocate all before the header would be sent */
 
     b = ngx_calloc_buf(r->pool);
@@ -1600,9 +1596,10 @@ ngx_http_cache_send(ngx_http_request_t *r)
     b->file_pos = c->body_start;
     b->file_last = c->length;
 
-    b->in_file = (c->length - c->body_start) ? 1: 0;
-    b->last_buf = (r == r->main) ? 1: 0;
+    b->in_file = (c->length - c->body_start) ? 1 : 0;
+    b->last_buf = (r == r->main) ? 1 : 0;
     b->last_in_chain = 1;
+    b->sync = (b->last_buf || b->in_file) ? 0 : 1;
 
     b->file->fd = c->file.fd;
     b->file->name = c->file.name;
@@ -1756,6 +1753,11 @@ ngx_http_file_cache_forced_expire(ngx_http_file_cache_t *cache)
             break;
         }
 
+        if (fcn->deleting) {
+            wait = 1;
+            break;
+        }
+
         p = ngx_hex_dump(key, (u_char *) &fcn->node.key,
                          sizeof(ngx_rbtree_key_t));
         len = NGX_HTTP_CACHE_KEY_LEN - sizeof(ngx_rbtree_key_t);
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index 6460da2..d4f2dae 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -1960,27 +1960,24 @@ unsafe:
 }
 
 
-ngx_int_t
-ngx_http_parse_multi_header_lines(ngx_array_t *headers, ngx_str_t *name,
-    ngx_str_t *value)
+ngx_table_elt_t *
+ngx_http_parse_multi_header_lines(ngx_http_request_t *r,
+    ngx_table_elt_t *headers, ngx_str_t *name, ngx_str_t *value)
 {
-    ngx_uint_t         i;
-    u_char            *start, *last, *end, ch;
-    ngx_table_elt_t  **h;
+    u_char           *start, *last, *end, ch;
+    ngx_table_elt_t  *h;
 
-    h = headers->elts;
+    for (h = headers; h; h = h->next) {
 
-    for (i = 0; i < headers->nelts; i++) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "parse header: \"%V: %V\"", &h->key, &h->value);
 
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, headers->pool->log, 0,
-                       "parse header: \"%V: %V\"", &h[i]->key, &h[i]->value);
-
-        if (name->len > h[i]->value.len) {
+        if (name->len > h->value.len) {
             continue;
         }
 
-        start = h[i]->value.data;
-        end = h[i]->value.data + h[i]->value.len;
+        start = h->value.data;
+        end = h->value.data + h->value.len;
 
         while (start < end) {
 
@@ -1994,7 +1991,7 @@ ngx_http_parse_multi_header_lines(ngx_array_t *headers, ngx_str_t *name,
 
             if (value == NULL) {
                 if (start == end || *start == ',') {
-                    return i;
+                    return h;
                 }
 
                 goto skip;
@@ -2014,7 +2011,7 @@ ngx_http_parse_multi_header_lines(ngx_array_t *headers, ngx_str_t *name,
             value->len = last - start;
             value->data = start;
 
-            return i;
+            return h;
 
         skip:
 
@@ -2029,31 +2026,28 @@ ngx_http_parse_multi_header_lines(ngx_array_t *headers, ngx_str_t *name,
         }
     }
 
-    return NGX_DECLINED;
+    return NULL;
 }
 
 
-ngx_int_t
-ngx_http_parse_set_cookie_lines(ngx_array_t *headers, ngx_str_t *name,
-    ngx_str_t *value)
+ngx_table_elt_t *
+ngx_http_parse_set_cookie_lines(ngx_http_request_t *r,
+    ngx_table_elt_t *headers, ngx_str_t *name, ngx_str_t *value)
 {
-    ngx_uint_t         i;
-    u_char            *start, *last, *end;
-    ngx_table_elt_t  **h;
+    u_char           *start, *last, *end;
+    ngx_table_elt_t  *h;
 
-    h = headers->elts;
+    for (h = headers; h; h = h->next) {
 
-    for (i = 0; i < headers->nelts; i++) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "parse header: \"%V: %V\"", &h->key, &h->value);
 
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, headers->pool->log, 0,
-                       "parse header: \"%V: %V\"", &h[i]->key, &h[i]->value);
-
-        if (name->len >= h[i]->value.len) {
+        if (name->len >= h->value.len) {
             continue;
         }
 
-        start = h[i]->value.data;
-        end = h[i]->value.data + h[i]->value.len;
+        start = h->value.data;
+        end = h->value.data + h->value.len;
 
         if (ngx_strncasecmp(start, name->data, name->len) != 0) {
             continue;
@@ -2077,10 +2071,10 @@ ngx_http_parse_set_cookie_lines(ngx_array_t *headers, ngx_str_t *name,
         value->len = last - start;
         value->data = start;
 
-        return i;
+        return h;
     }
 
-    return NGX_DECLINED;
+    return NULL;
 }
 
 
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 013b715..5e0340b 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -22,8 +22,6 @@ static ngx_int_t ngx_http_process_header_line(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset);
 static ngx_int_t ngx_http_process_unique_header_line(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset);
-static ngx_int_t ngx_http_process_multi_header_lines(ngx_http_request_t *r,
-    ngx_table_elt_t *h, ngx_uint_t offset);
 static ngx_int_t ngx_http_process_host(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset);
 static ngx_int_t ngx_http_process_connection(ngx_http_request_t *r,
@@ -164,7 +162,7 @@ ngx_http_header_t  ngx_http_headers_in[] = {
 #if (NGX_HTTP_X_FORWARDED_FOR)
     { ngx_string("X-Forwarded-For"),
                  offsetof(ngx_http_headers_in_t, x_forwarded_for),
-                 ngx_http_process_multi_header_lines },
+                 ngx_http_process_header_line },
 #endif
 
 #if (NGX_HTTP_REALIP)
@@ -196,8 +194,8 @@ ngx_http_header_t  ngx_http_headers_in[] = {
                  ngx_http_process_header_line },
 #endif
 
-    { ngx_string("Cookie"), offsetof(ngx_http_headers_in_t, cookies),
-                 ngx_http_process_multi_header_lines },
+    { ngx_string("Cookie"), offsetof(ngx_http_headers_in_t, cookie),
+                 ngx_http_process_header_line },
 
     { ngx_null_string, 0, NULL }
 };
@@ -1742,9 +1740,10 @@ ngx_http_process_header_line(ngx_http_request_t *r, ngx_table_elt_t *h,
 
     ph = (ngx_table_elt_t **) ((char *) &r->headers_in + offset);
 
-    if (*ph == NULL) {
-        *ph = h;
-    }
+    while (*ph) { ph = &(*ph)->next; }
+
+    *ph = h;
+    h->next = NULL;
 
     return NGX_OK;
 }
@@ -1760,6 +1759,7 @@ ngx_http_process_unique_header_line(ngx_http_request_t *r, ngx_table_elt_t *h,
 
     if (*ph == NULL) {
         *ph = h;
+        h->next = NULL;
         return NGX_OK;
     }
 
@@ -1792,6 +1792,7 @@ ngx_http_process_host(ngx_http_request_t *r, ngx_table_elt_t *h,
     }
 
     r->headers_in.host = h;
+    h->next = NULL;
 
     host = h->value;
 
@@ -1827,6 +1828,10 @@ static ngx_int_t
 ngx_http_process_connection(ngx_http_request_t *r, ngx_table_elt_t *h,
     ngx_uint_t offset)
 {
+    if (ngx_http_process_header_line(r, h, offset) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
     if (ngx_strcasestrn(h->value.data, "close", 5 - 1)) {
         r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE;
 
@@ -1844,12 +1849,10 @@ ngx_http_process_user_agent(ngx_http_request_t *r, ngx_table_elt_t *h,
 {
     u_char  *user_agent, *msie;
 
-    if (r->headers_in.user_agent) {
-        return NGX_OK;
+    if (ngx_http_process_header_line(r, h, offset) != NGX_OK) {
+        return NGX_ERROR;
     }
 
-    r->headers_in.user_agent = h;
-
     /* check some widespread browsers while the header is in CPU cache */
 
     user_agent = h->value.data;
@@ -1911,35 +1914,6 @@ ngx_http_process_user_agent(ngx_http_request_t *r, ngx_table_elt_t *h,
 }
 
 
-static ngx_int_t
-ngx_http_process_multi_header_lines(ngx_http_request_t *r, ngx_table_elt_t *h,
-    ngx_uint_t offset)
-{
-    ngx_array_t       *headers;
-    ngx_table_elt_t  **ph;
-
-    headers = (ngx_array_t *) ((char *) &r->headers_in + offset);
-
-    if (headers->elts == NULL) {
-        if (ngx_array_init(headers, r->pool, 1, sizeof(ngx_table_elt_t *))
-            != NGX_OK)
-        {
-            ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-            return NGX_ERROR;
-        }
-    }
-
-    ph = ngx_array_push(headers);
-    if (ph == NULL) {
-        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-        return NGX_ERROR;
-    }
-
-    *ph = h;
-    return NGX_OK;
-}
-
-
 ngx_int_t
 ngx_http_process_request_header(ngx_http_request_t *r)
 {
@@ -2779,7 +2753,8 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
         || (clcf->lingering_close == NGX_HTTP_LINGERING_ON
             && (r->lingering_close
                 || r->header_in->pos < r->header_in->last
-                || r->connection->read->ready)))
+                || r->connection->read->ready
+                || r->connection->pipeline)))
     {
         ngx_http_set_lingering_close(r->connection);
         return;
@@ -3149,6 +3124,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
 
         c->sent = 0;
         c->destroyed = 0;
+        c->pipeline = 1;
 
         if (rev->timer_set) {
             ngx_del_timer(rev);
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index b1269d2..8c9eed2 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -212,7 +212,7 @@ typedef struct {
     ngx_table_elt_t                  *keep_alive;
 
 #if (NGX_HTTP_X_FORWARDED_FOR)
-    ngx_array_t                       x_forwarded_for;
+    ngx_table_elt_t                  *x_forwarded_for;
 #endif
 
 #if (NGX_HTTP_REALIP)
@@ -231,17 +231,19 @@ typedef struct {
     ngx_table_elt_t                  *date;
 #endif
 
+    ngx_table_elt_t                  *cookie;
+
     ngx_str_t                         user;
     ngx_str_t                         passwd;
 
-    ngx_array_t                       cookies;
-
     ngx_str_t                         server;
     off_t                             content_length_n;
     time_t                            keep_alive_n;
 
     unsigned                          connection_type:2;
     unsigned                          chunked:1;
+    unsigned                          multi:1;
+    unsigned                          multi_linked:1;
     unsigned                          msie:1;
     unsigned                          msie6:1;
     unsigned                          opera:1;
@@ -272,6 +274,9 @@ typedef struct {
     ngx_table_elt_t                  *expires;
     ngx_table_elt_t                  *etag;
 
+    ngx_table_elt_t                  *cache_control;
+    ngx_table_elt_t                  *link;
+
     ngx_str_t                        *override_charset;
 
     size_t                            content_type_len;
@@ -280,9 +285,6 @@ typedef struct {
     u_char                           *content_type_lowcase;
     ngx_uint_t                        content_type_hash;
 
-    ngx_array_t                       cache_control;
-    ngx_array_t                       link;
-
     off_t                             content_length_n;
     off_t                             content_offset;
     time_t                            date_time;
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index bebdbd9..a2b9f1b 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -1243,6 +1243,7 @@ ngx_http_script_regex_end_code(ngx_http_script_engine_t *e)
         }
 
         r->headers_out.location->hash = 1;
+        r->headers_out.location->next = NULL;
         ngx_str_set(&r->headers_out.location->key, "Location");
         r->headers_out.location->value = e->buf;
 
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 72f56fd..eaf42e3 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -649,6 +649,7 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
     }
 
     location->hash = 1;
+    location->next = NULL;
     ngx_str_set(&location->key, "Location");
     location->value = uri;
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index ded833c..3ae822b 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -101,6 +101,9 @@ static void ngx_http_upstream_finalize_request(ngx_http_request_t *r,
 
 static ngx_int_t ngx_http_upstream_process_header_line(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t
+    ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
 static ngx_int_t ngx_http_upstream_process_content_length(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset);
 static ngx_int_t ngx_http_upstream_process_last_modified(ngx_http_request_t *r,
@@ -147,11 +150,6 @@ static ngx_int_t ngx_http_upstream_rewrite_set_cookie(ngx_http_request_t *r,
 static ngx_int_t ngx_http_upstream_copy_allow_ranges(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset);
 
-#if (NGX_HTTP_GZIP)
-static ngx_int_t ngx_http_upstream_copy_content_encoding(ngx_http_request_t *r,
-    ngx_table_elt_t *h, ngx_uint_t offset);
-#endif
-
 static ngx_int_t ngx_http_upstream_add_variables(ngx_conf_t *cf);
 static ngx_int_t ngx_http_upstream_addr_variable(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
@@ -231,7 +229,7 @@ static ngx_http_upstream_header_t  ngx_http_upstream_headers_in[] = {
                  offsetof(ngx_http_headers_out_t, server), 0 },
 
     { ngx_string("WWW-Authenticate"),
-                 ngx_http_upstream_process_header_line,
+                 ngx_http_upstream_process_multi_header_lines,
                  offsetof(ngx_http_upstream_headers_in_t, www_authenticate),
                  ngx_http_upstream_copy_header_line, 0, 0 },
 
@@ -241,12 +239,13 @@ static ngx_http_upstream_header_t  ngx_http_upstream_headers_in[] = {
                  ngx_http_upstream_rewrite_location, 0, 0 },
 
     { ngx_string("Refresh"),
-                 ngx_http_upstream_ignore_header_line, 0,
+                 ngx_http_upstream_process_header_line,
+                 offsetof(ngx_http_upstream_headers_in_t, refresh),
                  ngx_http_upstream_rewrite_refresh, 0, 0 },
 
     { ngx_string("Set-Cookie"),
                  ngx_http_upstream_process_set_cookie,
-                 offsetof(ngx_http_upstream_headers_in_t, cookies),
+                 offsetof(ngx_http_upstream_headers_in_t, set_cookie),
                  ngx_http_upstream_rewrite_set_cookie, 0, 1 },
 
     { ngx_string("Content-Disposition"),
@@ -264,8 +263,7 @@ static ngx_http_upstream_header_t  ngx_http_upstream_headers_in[] = {
                  offsetof(ngx_http_headers_out_t, expires), 1 },
 
     { ngx_string("Accept-Ranges"),
-                 ngx_http_upstream_process_header_line,
-                 offsetof(ngx_http_upstream_headers_in_t, accept_ranges),
+                 ngx_http_upstream_ignore_header_line, 0,
                  ngx_http_upstream_copy_allow_ranges,
                  offsetof(ngx_http_headers_out_t, accept_ranges), 1 },
 
@@ -316,12 +314,10 @@ static ngx_http_upstream_header_t  ngx_http_upstream_headers_in[] = {
                  ngx_http_upstream_process_transfer_encoding, 0,
                  ngx_http_upstream_ignore_header_line, 0, 0 },
 
-#if (NGX_HTTP_GZIP)
     { ngx_string("Content-Encoding"),
-                 ngx_http_upstream_process_header_line,
-                 offsetof(ngx_http_upstream_headers_in_t, content_encoding),
-                 ngx_http_upstream_copy_content_encoding, 0, 0 },
-#endif
+                 ngx_http_upstream_ignore_header_line, 0,
+                 ngx_http_upstream_copy_header_line,
+                 offsetof(ngx_http_headers_out_t, content_encoding), 0 },
 
     { ngx_null_string, NULL, 0, NULL, 0, 0 }
 };
@@ -1694,8 +1690,10 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
         }
     }
 
-    if (u->conf->ssl_certificate && (u->conf->ssl_certificate->lengths
-                                     || u->conf->ssl_certificate_key->lengths))
+    if (u->conf->ssl_certificate
+        && u->conf->ssl_certificate->value.len
+        && (u->conf->ssl_certificate->lengths
+            || u->conf->ssl_certificate_key->lengths))
     {
         if (ngx_http_upstream_ssl_certificate(r, u, c) != NGX_OK) {
             ngx_http_upstream_finalize_request(r, u,
@@ -2651,7 +2649,7 @@ ngx_http_upstream_intercept_errors(ngx_http_request_t *r,
 {
     ngx_int_t                  status;
     ngx_uint_t                 i;
-    ngx_table_elt_t           *h;
+    ngx_table_elt_t           *h, *ho, **ph;
     ngx_http_err_page_t       *err_page;
     ngx_http_core_loc_conf_t  *clcf;
 
@@ -2680,23 +2678,36 @@ ngx_http_upstream_intercept_errors(ngx_http_request_t *r,
             if (status == NGX_HTTP_UNAUTHORIZED
                 && u->headers_in.www_authenticate)
             {
-                h = ngx_list_push(&r->headers_out.headers);
+                h = u->headers_in.www_authenticate;
+                ph = &r->headers_out.www_authenticate;
 
-                if (h == NULL) {
-                    ngx_http_upstream_finalize_request(r, u,
+                while (h) {
+                    ho = ngx_list_push(&r->headers_out.headers);
+
+                    if (ho == NULL) {
+                        ngx_http_upstream_finalize_request(r, u,
                                                NGX_HTTP_INTERNAL_SERVER_ERROR);
-                    return NGX_OK;
+                        return NGX_OK;
+                    }
+
+                    *ho = *h;
+                    ho->next = NULL;
+
+                    *ph = ho;
+                    ph = &ho->next;
+
+                    h = h->next;
                 }
-
-                *h = *u->headers_in.www_authenticate;
-
-                r->headers_out.www_authenticate = h;
             }
 
 #if (NGX_HTTP_CACHE)
 
             if (r->cache) {
 
+                if (u->headers_in.no_cache || u->headers_in.expired) {
+                    u->cacheable = 0;
+                }
+
                 if (u->cacheable) {
                     time_t  valid;
 
@@ -2791,6 +2802,10 @@ ngx_http_upstream_process_headers(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
     umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
 
+    if (u->headers_in.no_cache || u->headers_in.expired) {
+        u->cacheable = 0;
+    }
+
     if (u->headers_in.x_accel_redirect
         && !(u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT))
     {
@@ -2811,6 +2826,10 @@ ngx_http_upstream_process_headers(ngx_http_request_t *r, ngx_http_upstream_t *u)
                 i = 0;
             }
 
+            if (h[i].hash == 0) {
+                continue;
+            }
+
             hh = ngx_hash_find(&umcf->headers_in_hash, h[i].hash,
                                h[i].lowcase_key, h[i].key.len);
 
@@ -2864,6 +2883,10 @@ ngx_http_upstream_process_headers(ngx_http_request_t *r, ngx_http_upstream_t *u)
             i = 0;
         }
 
+        if (h[i].hash == 0) {
+            continue;
+        }
+
         if (ngx_hash_find(&u->conf->hide_headers_hash, h[i].hash,
                           h[i].lowcase_key, h[i].key.len))
         {
@@ -4615,10 +4638,36 @@ ngx_http_upstream_process_header_line(ngx_http_request_t *r, ngx_table_elt_t *h,
 
     ph = (ngx_table_elt_t **) ((char *) &r->upstream->headers_in + offset);
 
-    if (*ph == NULL) {
-        *ph = h;
+    if (*ph) {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "upstream sent duplicate header line: \"%V: %V\", "
+                      "previous value: \"%V: %V\", ignored",
+                      &h->key, &h->value,
+                      &(*ph)->key, &(*ph)->value);
+        h->hash = 0;
+        return NGX_OK;
     }
 
+    *ph = h;
+    h->next = NULL;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset)
+{
+    ngx_table_elt_t  **ph;
+
+    ph = (ngx_table_elt_t **) ((char *) &r->upstream->headers_in + offset);
+
+    while (*ph) { ph = &(*ph)->next; }
+
+    *ph = h;
+    h->next = NULL;
+
     return NGX_OK;
 }
 
@@ -4639,9 +4688,34 @@ ngx_http_upstream_process_content_length(ngx_http_request_t *r,
 
     u = r->upstream;
 
+    if (u->headers_in.content_length) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "upstream sent duplicate header line: \"%V: %V\", "
+                      "previous value: \"%V: %V\"",
+                      &h->key, &h->value,
+                      &u->headers_in.content_length->key,
+                      &u->headers_in.content_length->value);
+        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+    }
+
+    if (u->headers_in.transfer_encoding) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "upstream sent \"Content-Length\" and "
+                      "\"Transfer-Encoding\" headers at the same time");
+        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+    }
+
+    h->next = NULL;
     u->headers_in.content_length = h;
     u->headers_in.content_length_n = ngx_atoof(h->value.data, h->value.len);
 
+    if (u->headers_in.content_length_n == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "upstream sent invalid \"Content-Length\" header: "
+                      "\"%V: %V\"", &h->key, &h->value);
+        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+    }
+
     return NGX_OK;
 }
 
@@ -4654,6 +4728,18 @@ ngx_http_upstream_process_last_modified(ngx_http_request_t *r,
 
     u = r->upstream;
 
+    if (u->headers_in.last_modified) {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "upstream sent duplicate header line: \"%V: %V\", "
+                      "previous value: \"%V: %V\", ignored",
+                      &h->key, &h->value,
+                      &u->headers_in.last_modified->key,
+                      &u->headers_in.last_modified->value);
+        h->hash = 0;
+        return NGX_OK;
+    }
+
+    h->next = NULL;
     u->headers_in.last_modified = h;
     u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data,
                                                            h->value.len);
@@ -4666,26 +4752,16 @@ static ngx_int_t
 ngx_http_upstream_process_set_cookie(ngx_http_request_t *r, ngx_table_elt_t *h,
     ngx_uint_t offset)
 {
-    ngx_array_t           *pa;
     ngx_table_elt_t      **ph;
     ngx_http_upstream_t   *u;
 
     u = r->upstream;
-    pa = &u->headers_in.cookies;
+    ph = &u->headers_in.set_cookie;
 
-    if (pa->elts == NULL) {
-        if (ngx_array_init(pa, r->pool, 1, sizeof(ngx_table_elt_t *)) != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    ph = ngx_array_push(pa);
-    if (ph == NULL) {
-        return NGX_ERROR;
-    }
+    while (*ph) { ph = &(*ph)->next; }
 
     *ph = h;
+    h->next = NULL;
 
 #if (NGX_HTTP_CACHE)
     if (!(u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_SET_COOKIE)) {
@@ -4701,26 +4777,16 @@ static ngx_int_t
 ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset)
 {
-    ngx_array_t          *pa;
-    ngx_table_elt_t     **ph;
-    ngx_http_upstream_t  *u;
+    ngx_table_elt_t      **ph;
+    ngx_http_upstream_t   *u;
 
     u = r->upstream;
-    pa = &u->headers_in.cache_control;
+    ph = &u->headers_in.cache_control;
 
-    if (pa->elts == NULL) {
-        if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
-    ph = ngx_array_push(pa);
-    if (ph == NULL) {
-        return NGX_ERROR;
-    }
+    while (*ph) { ph = &(*ph)->next; }
 
     *ph = h;
+    h->next = NULL;
 
 #if (NGX_HTTP_CACHE)
     {
@@ -4735,18 +4801,18 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
         return NGX_OK;
     }
 
-    if (r->cache->valid_sec != 0 && u->headers_in.x_accel_expires != NULL) {
-        return NGX_OK;
-    }
-
     start = h->value.data;
     last = start + h->value.len;
 
+    if (r->cache->valid_sec != 0 && u->headers_in.x_accel_expires != NULL) {
+        goto extensions;
+    }
+
     if (ngx_strlcasestrn(start, last, (u_char *) "no-cache", 8 - 1) != NULL
         || ngx_strlcasestrn(start, last, (u_char *) "no-store", 8 - 1) != NULL
         || ngx_strlcasestrn(start, last, (u_char *) "private", 7 - 1) != NULL)
     {
-        u->cacheable = 0;
+        u->headers_in.no_cache = 1;
         return NGX_OK;
     }
 
@@ -4776,13 +4842,16 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
         }
 
         if (n == 0) {
-            u->cacheable = 0;
+            u->headers_in.no_cache = 1;
             return NGX_OK;
         }
 
         r->cache->valid_sec = ngx_time() + n;
+        u->headers_in.expired = 0;
     }
 
+extensions:
+
     p = ngx_strlcasestrn(start, last, (u_char *) "stale-while-revalidate=",
                          23 - 1);
 
@@ -4842,7 +4911,20 @@ ngx_http_upstream_process_expires(ngx_http_request_t *r, ngx_table_elt_t *h,
     ngx_http_upstream_t  *u;
 
     u = r->upstream;
+
+    if (u->headers_in.expires) {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "upstream sent duplicate header line: \"%V: %V\", "
+                      "previous value: \"%V: %V\", ignored",
+                      &h->key, &h->value,
+                      &u->headers_in.expires->key,
+                      &u->headers_in.expires->value);
+        h->hash = 0;
+        return NGX_OK;
+    }
+
     u->headers_in.expires = h;
+    h->next = NULL;
 
 #if (NGX_HTTP_CACHE)
     {
@@ -4863,7 +4945,7 @@ ngx_http_upstream_process_expires(ngx_http_request_t *r, ngx_table_elt_t *h,
     expires = ngx_parse_http_time(h->value.data, h->value.len);
 
     if (expires == NGX_ERROR || expires < ngx_time()) {
-        u->cacheable = 0;
+        u->headers_in.expired = 1;
         return NGX_OK;
     }
 
@@ -4882,7 +4964,20 @@ ngx_http_upstream_process_accel_expires(ngx_http_request_t *r,
     ngx_http_upstream_t  *u;
 
     u = r->upstream;
+
+    if (u->headers_in.x_accel_expires) {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "upstream sent duplicate header line: \"%V: %V\", "
+                      "previous value: \"%V: %V\", ignored",
+                      &h->key, &h->value,
+                      &u->headers_in.x_accel_expires->key,
+                      &u->headers_in.x_accel_expires->value);
+        h->hash = 0;
+        return NGX_OK;
+    }
+
     u->headers_in.x_accel_expires = h;
+    h->next = NULL;
 
 #if (NGX_HTTP_CACHE)
     {
@@ -4914,6 +5009,8 @@ ngx_http_upstream_process_accel_expires(ngx_http_request_t *r,
 
         default:
             r->cache->valid_sec = ngx_time() + n;
+            u->headers_in.no_cache = 0;
+            u->headers_in.expired = 0;
             return NGX_OK;
         }
     }
@@ -4925,6 +5022,8 @@ ngx_http_upstream_process_accel_expires(ngx_http_request_t *r,
 
     if (n != NGX_ERROR) {
         r->cache->valid_sec = n;
+        u->headers_in.no_cache = 0;
+        u->headers_in.expired = 0;
     }
     }
 #endif
@@ -4941,7 +5040,20 @@ ngx_http_upstream_process_limit_rate(ngx_http_request_t *r, ngx_table_elt_t *h,
     ngx_http_upstream_t  *u;
 
     u = r->upstream;
+
+    if (u->headers_in.x_accel_limit_rate) {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "upstream sent duplicate header line: \"%V: %V\", "
+                      "previous value: \"%V: %V\", ignored",
+                      &h->key, &h->value,
+                      &u->headers_in.x_accel_limit_rate->key,
+                      &u->headers_in.x_accel_limit_rate->value);
+        h->hash = 0;
+        return NGX_OK;
+    }
+
     u->headers_in.x_accel_limit_rate = h;
+    h->next = NULL;
 
     if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_LIMIT_RATE) {
         return NGX_OK;
@@ -5000,7 +5112,11 @@ static ngx_int_t
 ngx_http_upstream_process_charset(ngx_http_request_t *r, ngx_table_elt_t *h,
     ngx_uint_t offset)
 {
-    if (r->upstream->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_CHARSET) {
+    ngx_http_upstream_t  *u;
+
+    u = r->upstream;
+
+    if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_CHARSET) {
         return NGX_OK;
     }
 
@@ -5014,13 +5130,22 @@ static ngx_int_t
 ngx_http_upstream_process_connection(ngx_http_request_t *r, ngx_table_elt_t *h,
     ngx_uint_t offset)
 {
-    r->upstream->headers_in.connection = h;
+    ngx_table_elt_t      **ph;
+    ngx_http_upstream_t   *u;
+
+    u = r->upstream;
+    ph = &u->headers_in.connection;
+
+    while (*ph) { ph = &(*ph)->next; }
+
+    *ph = h;
+    h->next = NULL;
 
     if (ngx_strlcasestrn(h->value.data, h->value.data + h->value.len,
                          (u_char *) "close", 5 - 1)
         != NULL)
     {
-        r->upstream->headers_in.connection_close = 1;
+        u->headers_in.connection_close = 1;
     }
 
     return NGX_OK;
@@ -5031,13 +5156,40 @@ static ngx_int_t
 ngx_http_upstream_process_transfer_encoding(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset)
 {
-    r->upstream->headers_in.transfer_encoding = h;
+    ngx_http_upstream_t  *u;
 
-    if (ngx_strlcasestrn(h->value.data, h->value.data + h->value.len,
-                         (u_char *) "chunked", 7 - 1)
-        != NULL)
+    u = r->upstream;
+
+    if (u->headers_in.transfer_encoding) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "upstream sent duplicate header line: \"%V: %V\", "
+                      "previous value: \"%V: %V\"",
+                      &h->key, &h->value,
+                      &u->headers_in.transfer_encoding->key,
+                      &u->headers_in.transfer_encoding->value);
+        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+    }
+
+    if (u->headers_in.content_length) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "upstream sent \"Content-Length\" and "
+                      "\"Transfer-Encoding\" headers at the same time");
+        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+    }
+
+    u->headers_in.transfer_encoding = h;
+    h->next = NULL;
+
+    if (h->value.len == 7
+        && ngx_strncasecmp(h->value.data, (u_char *) "chunked", 7) == 0)
     {
-        r->upstream->headers_in.chunked = 1;
+        u->headers_in.chunked = 1;
+
+    } else {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "upstream sent unknown \"Transfer-Encoding\": \"%V\"",
+                      &h->value);
+        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
     }
 
     return NGX_OK;
@@ -5048,29 +5200,74 @@ static ngx_int_t
 ngx_http_upstream_process_vary(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset)
 {
-    ngx_http_upstream_t  *u;
+    ngx_table_elt_t      **ph;
+    ngx_http_upstream_t   *u;
 
     u = r->upstream;
-    u->headers_in.vary = h;
+    ph = &u->headers_in.vary;
+
+    while (*ph) { ph = &(*ph)->next; }
+
+    *ph = h;
+    h->next = NULL;
 
 #if (NGX_HTTP_CACHE)
+    {
+    u_char     *p;
+    size_t      len;
+    ngx_str_t   vary;
 
     if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_VARY) {
         return NGX_OK;
     }
 
-    if (r->cache == NULL) {
+    if (r->cache == NULL || !u->cacheable) {
         return NGX_OK;
     }
 
-    if (h->value.len > NGX_HTTP_CACHE_VARY_LEN
-        || (h->value.len == 1 && h->value.data[0] == '*'))
-    {
+    if (h->value.len == 1 && h->value.data[0] == '*') {
+        u->cacheable = 0;
+        return NGX_OK;
+    }
+
+    if (u->headers_in.vary->next) {
+
+        len = 0;
+
+        for (h = u->headers_in.vary; h; h = h->next) {
+            len += h->value.len + 2;
+        }
+
+        len -= 2;
+
+        p = ngx_pnalloc(r->pool, len);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        vary.len = len;
+        vary.data = p;
+
+        for (h = u->headers_in.vary; h; h = h->next) {
+            p = ngx_copy(p, h->value.data, h->value.len);
+
+            if (h->next == NULL) {
+                break;
+            }
+
+            *p++ = ','; *p++ = ' ';
+        }
+
+    } else {
+        vary = h->value;
+    }
+
+    if (vary.len > NGX_HTTP_CACHE_VARY_LEN) {
         u->cacheable = 0;
     }
 
-    r->cache->vary = h->value;
-
+    r->cache->vary = vary;
+    }
 #endif
 
     return NGX_OK;
@@ -5093,6 +5290,7 @@ ngx_http_upstream_copy_header_line(ngx_http_request_t *r, ngx_table_elt_t *h,
     if (offset) {
         ph = (ngx_table_elt_t **) ((char *) &r->headers_out + offset);
         *ph = ho;
+        ho->next = NULL;
     }
 
     return NGX_OK;
@@ -5103,18 +5301,8 @@ static ngx_int_t
 ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset)
 {
-    ngx_array_t      *pa;
     ngx_table_elt_t  *ho, **ph;
 
-    pa = (ngx_array_t *) ((char *) &r->headers_out + offset);
-
-    if (pa->elts == NULL) {
-        if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-    }
-
     ho = ngx_list_push(&r->headers_out.headers);
     if (ho == NULL) {
         return NGX_ERROR;
@@ -5122,12 +5310,12 @@ ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r,
 
     *ho = *h;
 
-    ph = ngx_array_push(pa);
-    if (ph == NULL) {
-        return NGX_ERROR;
-    }
+    ph = (ngx_table_elt_t **) ((char *) &r->headers_out + offset);
+
+    while (*ph) { ph = &(*ph)->next; }
 
     *ph = ho;
+    ho->next = NULL;
 
     return NGX_OK;
 }
@@ -5197,6 +5385,7 @@ ngx_http_upstream_copy_last_modified(ngx_http_request_t *r, ngx_table_elt_t *h,
     }
 
     *ho = *h;
+    ho->next = NULL;
 
     r->headers_out.last_modified = ho;
     r->headers_out.last_modified_time =
@@ -5219,6 +5408,7 @@ ngx_http_upstream_rewrite_location(ngx_http_request_t *r, ngx_table_elt_t *h,
     }
 
     *ho = *h;
+    ho->next = NULL;
 
     if (r->upstream->rewrite_redirect) {
         rc = r->upstream->rewrite_redirect(r, ho, 0);
@@ -5264,6 +5454,7 @@ ngx_http_upstream_rewrite_refresh(ngx_http_request_t *r, ngx_table_elt_t *h,
     }
 
     *ho = *h;
+    ho->next = NULL;
 
     if (r->upstream->rewrite_redirect) {
 
@@ -5309,6 +5500,7 @@ ngx_http_upstream_rewrite_set_cookie(ngx_http_request_t *r, ngx_table_elt_t *h,
     }
 
     *ho = *h;
+    ho->next = NULL;
 
     if (r->upstream->rewrite_cookie) {
         rc = r->upstream->rewrite_cookie(r, ho);
@@ -5362,6 +5554,7 @@ ngx_http_upstream_copy_allow_ranges(ngx_http_request_t *r,
     }
 
     *ho = *h;
+    ho->next = NULL;
 
     r->headers_out.accept_ranges = ho;
 
@@ -5369,29 +5562,6 @@ ngx_http_upstream_copy_allow_ranges(ngx_http_request_t *r,
 }
 
 
-#if (NGX_HTTP_GZIP)
-
-static ngx_int_t
-ngx_http_upstream_copy_content_encoding(ngx_http_request_t *r,
-    ngx_table_elt_t *h, ngx_uint_t offset)
-{
-    ngx_table_elt_t  *ho;
-
-    ho = ngx_list_push(&r->headers_out.headers);
-    if (ho == NULL) {
-        return NGX_ERROR;
-    }
-
-    *ho = *h;
-
-    r->headers_out.content_encoding = ho;
-
-    return NGX_OK;
-}
-
-#endif
-
-
 static ngx_int_t
 ngx_http_upstream_add_variables(ngx_conf_t *cf)
 {
@@ -5703,7 +5873,7 @@ ngx_http_upstream_header_variable(ngx_http_request_t *r,
         return NGX_OK;
     }
 
-    return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
+    return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data,
                                          &r->upstream->headers_in.headers.part,
                                          sizeof("upstream_http_") - 1);
 }
@@ -5718,7 +5888,7 @@ ngx_http_upstream_trailer_variable(ngx_http_request_t *r,
         return NGX_OK;
     }
 
-    return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
+    return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data,
                                         &r->upstream->headers_in.trailers.part,
                                         sizeof("upstream_trailer_") - 1);
 }
@@ -5740,9 +5910,9 @@ ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
     s.len = name->len - (sizeof("upstream_cookie_") - 1);
     s.data = name->data + sizeof("upstream_cookie_") - 1;
 
-    if (ngx_http_parse_set_cookie_lines(&r->upstream->headers_in.cookies,
+    if (ngx_http_parse_set_cookie_lines(r, r->upstream->headers_in.set_cookie,
                                         &s, &cookie)
-        == NGX_DECLINED)
+        == NULL)
     {
         v->not_found = 1;
         return NGX_OK;
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 3db7b06..9a17a03 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -280,23 +280,21 @@ typedef struct {
 
     ngx_table_elt_t                 *last_modified;
     ngx_table_elt_t                 *location;
-    ngx_table_elt_t                 *accept_ranges;
+    ngx_table_elt_t                 *refresh;
     ngx_table_elt_t                 *www_authenticate;
     ngx_table_elt_t                 *transfer_encoding;
     ngx_table_elt_t                 *vary;
 
-#if (NGX_HTTP_GZIP)
-    ngx_table_elt_t                 *content_encoding;
-#endif
-
-    ngx_array_t                      cache_control;
-    ngx_array_t                      cookies;
+    ngx_table_elt_t                 *cache_control;
+    ngx_table_elt_t                 *set_cookie;
 
     off_t                            content_length_n;
     time_t                           last_modified_time;
 
     unsigned                         connection_close:1;
     unsigned                         chunked:1;
+    unsigned                         no_cache:1;
+    unsigned                         expired:1;
 } ngx_http_upstream_headers_in_t;
 
 
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 942dacd..16ffda3 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -27,8 +27,6 @@ static ngx_int_t ngx_http_variable_header(ngx_http_request_t *r,
 
 static ngx_int_t ngx_http_variable_cookies(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
-static ngx_int_t ngx_http_variable_headers(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_headers_internal(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data, u_char sep);
 
@@ -63,6 +61,8 @@ static ngx_int_t ngx_http_variable_proxy_protocol_addr(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_proxy_protocol_port(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_variable_proxy_protocol_tlv(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_server_addr(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_server_port(ngx_http_request_t *r,
@@ -178,12 +178,12 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
 #endif
 
 #if (NGX_HTTP_X_FORWARDED_FOR)
-    { ngx_string("http_x_forwarded_for"), NULL, ngx_http_variable_headers,
+    { ngx_string("http_x_forwarded_for"), NULL, ngx_http_variable_header,
       offsetof(ngx_http_request_t, headers_in.x_forwarded_for), 0, 0 },
 #endif
 
     { ngx_string("http_cookie"), NULL, ngx_http_variable_cookies,
-      offsetof(ngx_http_request_t, headers_in.cookies), 0, 0 },
+      offsetof(ngx_http_request_t, headers_in.cookie), 0, 0 },
 
     { ngx_string("content_length"), NULL, ngx_http_variable_content_length,
       0, 0, 0 },
@@ -216,6 +216,10 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
       ngx_http_variable_proxy_protocol_port,
       offsetof(ngx_proxy_protocol_t, dst_port), 0, 0 },
 
+    { ngx_string("proxy_protocol_tlv_"), NULL,
+      ngx_http_variable_proxy_protocol_tlv,
+      0, NGX_HTTP_VAR_PREFIX, 0 },
+
     { ngx_string("server_addr"), NULL, ngx_http_variable_server_addr, 0, 0, 0 },
 
     { ngx_string("server_port"), NULL, ngx_http_variable_server_port, 0, 0, 0 },
@@ -327,10 +331,10 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("sent_http_transfer_encoding"), NULL,
       ngx_http_variable_sent_transfer_encoding, 0, 0, 0 },
 
-    { ngx_string("sent_http_cache_control"), NULL, ngx_http_variable_headers,
+    { ngx_string("sent_http_cache_control"), NULL, ngx_http_variable_header,
       offsetof(ngx_http_request_t, headers_out.cache_control), 0, 0 },
 
-    { ngx_string("sent_http_link"), NULL, ngx_http_variable_headers,
+    { ngx_string("sent_http_link"), NULL, ngx_http_variable_header,
       offsetof(ngx_http_request_t, headers_out.link), 0, 0 },
 
     { ngx_string("limit_rate"), ngx_http_variable_set_limit_rate,
@@ -807,22 +811,7 @@ static ngx_int_t
 ngx_http_variable_header(ngx_http_request_t *r, ngx_http_variable_value_t *v,
     uintptr_t data)
 {
-    ngx_table_elt_t  *h;
-
-    h = *(ngx_table_elt_t **) ((char *) r + data);
-
-    if (h) {
-        v->len = h->value.len;
-        v->valid = 1;
-        v->no_cacheable = 0;
-        v->not_found = 0;
-        v->data = h->value.data;
-
-    } else {
-        v->not_found = 1;
-    }
-
-    return NGX_OK;
+    return ngx_http_variable_headers_internal(r, v, data, ',');
 }
 
 
@@ -834,38 +823,25 @@ ngx_http_variable_cookies(ngx_http_request_t *r,
 }
 
 
-static ngx_int_t
-ngx_http_variable_headers(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data)
-{
-    return ngx_http_variable_headers_internal(r, v, data, ',');
-}
-
-
 static ngx_int_t
 ngx_http_variable_headers_internal(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data, u_char sep)
 {
-    size_t             len;
-    u_char            *p, *end;
-    ngx_uint_t         i, n;
-    ngx_array_t       *a;
-    ngx_table_elt_t  **h;
+    size_t            len;
+    u_char           *p;
+    ngx_table_elt_t  *h, *th;
 
-    a = (ngx_array_t *) ((char *) r + data);
-
-    n = a->nelts;
-    h = a->elts;
+    h = *(ngx_table_elt_t **) ((char *) r + data);
 
     len = 0;
 
-    for (i = 0; i < n; i++) {
+    for (th = h; th; th = th->next) {
 
-        if (h[i]->hash == 0) {
+        if (th->hash == 0) {
             continue;
         }
 
-        len += h[i]->value.len + 2;
+        len += th->value.len + 2;
     }
 
     if (len == 0) {
@@ -879,9 +855,9 @@ ngx_http_variable_headers_internal(ngx_http_request_t *r,
     v->no_cacheable = 0;
     v->not_found = 0;
 
-    if (n == 1) {
-        v->len = (*h)->value.len;
-        v->data = (*h)->value.data;
+    if (h->next == NULL) {
+        v->len = h->value.len;
+        v->data = h->value.data;
 
         return NGX_OK;
     }
@@ -894,17 +870,15 @@ ngx_http_variable_headers_internal(ngx_http_request_t *r,
     v->len = len;
     v->data = p;
 
-    end = p + len;
+    for (th = h; th; th = th->next) {
 
-    for (i = 0; /* void */ ; i++) {
-
-        if (h[i]->hash == 0) {
+        if (th->hash == 0) {
             continue;
         }
 
-        p = ngx_copy(p, h[i]->value.data, h[i]->value.len);
+        p = ngx_copy(p, th->value.data, th->value.len);
 
-        if (p == end) {
+        if (th->next == NULL) {
             break;
         }
 
@@ -919,7 +893,7 @@ static ngx_int_t
 ngx_http_variable_unknown_header_in(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
-    return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
+    return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data,
                                             &r->headers_in.headers.part,
                                             sizeof("http_") - 1);
 }
@@ -929,7 +903,7 @@ static ngx_int_t
 ngx_http_variable_unknown_header_out(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
-    return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
+    return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data,
                                             &r->headers_out.headers.part,
                                             sizeof("sent_http_") - 1);
 }
@@ -939,19 +913,26 @@ static ngx_int_t
 ngx_http_variable_unknown_trailer_out(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
-    return ngx_http_variable_unknown_header(v, (ngx_str_t *) data,
+    return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data,
                                             &r->headers_out.trailers.part,
                                             sizeof("sent_trailer_") - 1);
 }
 
 
 ngx_int_t
-ngx_http_variable_unknown_header(ngx_http_variable_value_t *v, ngx_str_t *var,
+ngx_http_variable_unknown_header(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, ngx_str_t *var,
     ngx_list_part_t *part, size_t prefix)
 {
-    u_char            ch;
+    u_char           *p, ch;
+    size_t            len;
     ngx_uint_t        i, n;
-    ngx_table_elt_t  *header;
+    ngx_table_elt_t  *header, *h, **ph;
+
+    ph = &h;
+#if (NGX_SUPPRESS_WARN)
+    len = 0;
+#endif
 
     header = part->elts;
 
@@ -971,7 +952,11 @@ ngx_http_variable_unknown_header(ngx_http_variable_value_t *v, ngx_str_t *var,
             continue;
         }
 
-        for (n = 0; n + prefix < var->len && n < header[i].key.len; n++) {
+        if (header[i].key.len != var->len - prefix) {
+            continue;
+        }
+
+        for (n = 0; n < var->len - prefix; n++) {
             ch = header[i].key.data[n];
 
             if (ch >= 'A' && ch <= 'Z') {
@@ -986,18 +971,59 @@ ngx_http_variable_unknown_header(ngx_http_variable_value_t *v, ngx_str_t *var,
             }
         }
 
-        if (n + prefix == var->len && n == header[i].key.len) {
-            v->len = header[i].value.len;
-            v->valid = 1;
-            v->no_cacheable = 0;
-            v->not_found = 0;
-            v->data = header[i].value.data;
-
-            return NGX_OK;
+        if (n != var->len - prefix) {
+            continue;
         }
+
+        len += header[i].value.len + 2;
+
+        *ph = &header[i];
+        ph = &header[i].next;
     }
 
-    v->not_found = 1;
+    *ph = NULL;
+
+    if (h == NULL) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    len -= 2;
+
+    if (h->next == NULL) {
+
+        v->len = h->value.len;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = h->value.data;
+
+        return NGX_OK;
+    }
+
+    p = ngx_pnalloc(r->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->len = len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = p;
+
+    for ( ;; ) {
+
+        p = ngx_copy(p, h->value.data, h->value.len);
+
+        if (h->next == NULL) {
+            break;
+        }
+
+        *p++ = ','; *p++ = ' ';
+
+        h = h->next;
+    }
 
     return NGX_OK;
 }
@@ -1050,8 +1076,8 @@ ngx_http_variable_cookie(ngx_http_request_t *r, ngx_http_variable_value_t *v,
     s.len = name->len - (sizeof("cookie_") - 1);
     s.data = name->data + sizeof("cookie_") - 1;
 
-    if (ngx_http_parse_multi_header_lines(&r->headers_in.cookies, &s, &cookie)
-        == NGX_DECLINED)
+    if (ngx_http_parse_multi_header_lines(r, r->headers_in.cookie, &s, &cookie)
+        == NULL)
     {
         v->not_found = 1;
         return NGX_OK;
@@ -1366,6 +1392,39 @@ ngx_http_variable_proxy_protocol_port(ngx_http_request_t *r,
 }
 
 
+static ngx_int_t
+ngx_http_variable_proxy_protocol_tlv(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_str_t *name = (ngx_str_t *) data;
+
+    ngx_int_t  rc;
+    ngx_str_t  tlv, value;
+
+    tlv.len = name->len - (sizeof("proxy_protocol_tlv_") - 1);
+    tlv.data = name->data + sizeof("proxy_protocol_tlv_") - 1;
+
+    rc = ngx_proxy_protocol_get_tlv(r->connection, &tlv, &value);
+
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_DECLINED) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->len = value.len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = value.data;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_http_variable_server_addr(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
@@ -1879,7 +1938,7 @@ ngx_http_variable_sent_location(ngx_http_request_t *r,
 
     ngx_str_set(&name, "sent_http_location");
 
-    return ngx_http_variable_unknown_header(v, &name,
+    return ngx_http_variable_unknown_header(r, v, &name,
                                             &r->headers_out.headers.part,
                                             sizeof("sent_http_") - 1);
 }
diff --git a/src/http/ngx_http_variables.h b/src/http/ngx_http_variables.h
index f3f7f3c..6a661a2 100644
--- a/src/http/ngx_http_variables.h
+++ b/src/http/ngx_http_variables.h
@@ -57,8 +57,9 @@ ngx_http_variable_value_t *ngx_http_get_flushed_variable(ngx_http_request_t *r,
 ngx_http_variable_value_t *ngx_http_get_variable(ngx_http_request_t *r,
     ngx_str_t *name, ngx_uint_t key);
 
-ngx_int_t ngx_http_variable_unknown_header(ngx_http_variable_value_t *v,
-    ngx_str_t *var, ngx_list_part_t *part, size_t prefix);
+ngx_int_t ngx_http_variable_unknown_header(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, ngx_str_t *var, ngx_list_part_t *part,
+    size_t prefix);
 
 
 #if (NGX_PCRE)
diff --git a/src/http/ngx_http_write_filter_module.c b/src/http/ngx_http_write_filter_module.c
index 932f26d..89ab49e 100644
--- a/src/http/ngx_http_write_filter_module.c
+++ b/src/http/ngx_http_write_filter_module.c
@@ -227,7 +227,8 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     if (size == 0
         && !(c->buffered & NGX_LOWLEVEL_BUFFERED)
-        && !(last && c->need_last_buf))
+        && !(last && c->need_last_buf)
+        && !(flush && c->need_flush_buf))
     {
         if (last || flush || sync) {
             for (cl = r->out; cl; /* void */) {
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 0e45a7b..ea3f27c 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -1730,6 +1730,7 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
     size_t                      len;
     ngx_int_t                   rc;
     ngx_table_elt_t            *h;
+    ngx_connection_t           *fc;
     ngx_http_header_t          *hh;
     ngx_http_request_t         *r;
     ngx_http_v2_header_t       *header;
@@ -1789,17 +1790,11 @@ ngx_http_v2_state_process_header(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     r = h2c->state.stream->request;
+    fc = r->connection;
 
     /* TODO Optimization: validate headers while parsing. */
     if (ngx_http_v2_validate_header(r, header) != NGX_OK) {
-        if (ngx_http_v2_terminate_stream(h2c, h2c->state.stream,
-                                         NGX_HTTP_V2_PROTOCOL_ERROR)
-            == NGX_ERROR)
-        {
-            return ngx_http_v2_connection_error(h2c,
-                                                NGX_HTTP_V2_INTERNAL_ERROR);
-        }
-
+        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
         goto error;
     }
 
@@ -1886,6 +1881,8 @@ error:
 
     h2c->state.stream = NULL;
 
+    ngx_http_run_posted_requests(fc);
+
     return ngx_http_v2_state_header_complete(h2c, pos, end);
 }
 
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 70ee287..4e25293 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -153,12 +153,12 @@ struct ngx_http_v2_connection_s {
     ngx_queue_t                      dependencies;
     ngx_queue_t                      closed;
 
+    ngx_uint_t                       closed_nodes;
     ngx_uint_t                       last_sid;
     ngx_uint_t                       last_push;
 
     time_t                           lingering_time;
 
-    unsigned                         closed_nodes:8;
     unsigned                         settings_ack:1;
     unsigned                         table_update:1;
     unsigned                         blocked:1;
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 9ffb155..5f8626a 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -665,6 +665,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 
     fc->send_chain = ngx_http_v2_send_chain;
     fc->need_last_buf = 1;
+    fc->need_flush_buf = 1;
 
     return ngx_http_v2_filter_send(fc, stream);
 }
@@ -673,14 +674,14 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 static ngx_int_t
 ngx_http_v2_push_resources(ngx_http_request_t *r)
 {
-    u_char                     *start, *end, *last;
-    ngx_int_t                   rc;
-    ngx_str_t                   path;
-    ngx_uint_t                  i, push;
-    ngx_table_elt_t           **h;
-    ngx_http_v2_loc_conf_t     *h2lcf;
-    ngx_http_complex_value_t   *pushes;
-    ngx_str_t                   binary[NGX_HTTP_V2_PUSH_HEADERS];
+    u_char                    *start, *end, *last;
+    ngx_int_t                  rc;
+    ngx_str_t                  path;
+    ngx_uint_t                 i, push;
+    ngx_table_elt_t           *h;
+    ngx_http_v2_loc_conf_t    *h2lcf;
+    ngx_http_complex_value_t  *pushes;
+    ngx_str_t                  binary[NGX_HTTP_V2_PUSH_HEADERS];
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http2 push resources");
@@ -724,15 +725,13 @@ ngx_http_v2_push_resources(ngx_http_request_t *r)
         return NGX_OK;
     }
 
-    h = r->headers_out.link.elts;
-
-    for (i = 0; i < r->headers_out.link.nelts; i++) {
+    for (h = r->headers_out.link; h; h = h->next) {
 
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http2 parse link: \"%V\"", &h[i]->value);
+                       "http2 parse link: \"%V\"", &h->value);
 
-        start = h[i]->value.data;
-        end = h[i]->value.data + h[i]->value.len;
+        start = h->value.data;
+        end = h->value.data + h->value.len;
 
     next_link:
 
@@ -1815,7 +1814,11 @@ ngx_http_v2_waiting_queue(ngx_http_v2_connection_t *h2c,
 static ngx_inline ngx_int_t
 ngx_http_v2_filter_send(ngx_connection_t *fc, ngx_http_v2_stream_t *stream)
 {
-    if (stream->queued == 0) {
+    ngx_connection_t  *c;
+
+    c = stream->connection->connection;
+
+    if (stream->queued == 0 && !c->buffered) {
         fc->buffered &= ~NGX_HTTP_V2_BUFFERED;
         return NGX_OK;
     }
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 115671c..487c5de 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -308,7 +308,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_str_t                  *value, size;
     ngx_url_t                   u;
     ngx_uint_t                  i, n, m;
-    ngx_mail_listen_t          *ls, *als;
+    ngx_mail_listen_t          *ls, *als, *nls;
     ngx_mail_module_t          *module;
     ngx_mail_core_main_conf_t  *cmcf;
 
@@ -333,7 +333,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     cmcf = ngx_mail_conf_get_module_main_conf(cf, ngx_mail_core_module);
 
-    ls = ngx_array_push_n(&cmcf->listen, u.naddrs);
+    ls = ngx_array_push(&cmcf->listen);
     if (ls == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -568,20 +568,40 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    als = cmcf->listen.elts;
-
     for (n = 0; n < u.naddrs; n++) {
-        ls[n] = ls[0];
 
-        ls[n].sockaddr = u.addrs[n].sockaddr;
-        ls[n].socklen = u.addrs[n].socklen;
-        ls[n].addr_text = u.addrs[n].name;
-        ls[n].wildcard = ngx_inet_wildcard(ls[n].sockaddr);
+        for (i = 0; i < n; i++) {
+            if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen,
+                                 u.addrs[i].sockaddr, u.addrs[i].socklen, 1)
+                == NGX_OK)
+            {
+                goto next;
+            }
+        }
 
-        for (i = 0; i < cmcf->listen.nelts - u.naddrs + n; i++) {
+        if (n != 0) {
+            nls = ngx_array_push(&cmcf->listen);
+            if (nls == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            *nls = *ls;
+
+        } else {
+            nls = ls;
+        }
+
+        nls->sockaddr = u.addrs[n].sockaddr;
+        nls->socklen = u.addrs[n].socklen;
+        nls->addr_text = u.addrs[n].name;
+        nls->wildcard = ngx_inet_wildcard(nls->sockaddr);
+
+        als = cmcf->listen.elts;
+
+        for (i = 0; i < cmcf->listen.nelts - 1; i++) {
 
             if (ngx_cmp_sockaddr(als[i].sockaddr, als[i].socklen,
-                                 ls[n].sockaddr, ls[n].socklen, 1)
+                                 nls->sockaddr, nls->socklen, 1)
                 != NGX_OK)
             {
                 continue;
@@ -589,9 +609,12 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "duplicate \"%V\" address and port pair",
-                               &ls[n].addr_text);
+                               &nls->addr_text);
             return NGX_CONF_ERROR;
         }
+
+    next:
+        continue;
     }
 
     return NGX_CONF_OK;
diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c
index a7ab077..efed9ab 100644
--- a/src/mail/ngx_mail_proxy_module.c
+++ b/src/mail/ngx_mail_proxy_module.c
@@ -327,7 +327,9 @@ ngx_mail_proxy_pop3_handler(ngx_event_t *rev)
         c->log->action = NULL;
         ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in");
 
-        if (s->buffer->pos < s->buffer->last) {
+        if (s->buffer->pos < s->buffer->last
+            || s->connection->read->ready)
+        {
             ngx_post_event(c->write, &ngx_posted_events);
         }
 
@@ -486,7 +488,9 @@ ngx_mail_proxy_imap_handler(ngx_event_t *rev)
         c->log->action = NULL;
         ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in");
 
-        if (s->buffer->pos < s->buffer->last) {
+        if (s->buffer->pos < s->buffer->last
+            || s->connection->read->ready)
+        {
             ngx_post_event(c->write, &ngx_posted_events);
         }
 
@@ -821,7 +825,9 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
         c->log->action = NULL;
         ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in");
 
-        if (s->buffer->pos < s->buffer->last) {
+        if (s->buffer->pos < s->buffer->last
+            || s->connection->read->ready)
+        {
             ngx_post_event(c->write, &ngx_posted_events);
         }
 
@@ -890,7 +896,7 @@ ngx_mail_proxy_send_proxy_protocol(ngx_mail_session_t *s)
     u_char            *p;
     ssize_t            n, size;
     ngx_connection_t  *c;
-    u_char             buf[NGX_PROXY_PROTOCOL_MAX_HEADER];
+    u_char             buf[NGX_PROXY_PROTOCOL_V1_MAX_HEADER];
 
     s->connection->log->action = "sending PROXY protocol header to upstream";
 
@@ -898,7 +904,7 @@ ngx_mail_proxy_send_proxy_protocol(ngx_mail_session_t *s)
                    "mail proxy send PROXY protocol header");
 
     p = ngx_proxy_protocol_write(s->connection, buf,
-                                 buf + NGX_PROXY_PROTOCOL_MAX_HEADER);
+                                 buf + NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
     if (p == NULL) {
         ngx_mail_proxy_internal_server_error(s);
         return NGX_ERROR;
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index 2a1043e..28737ac 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -360,8 +360,9 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
                          prev->prefer_server_ciphers, 0);
 
     ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
-                         (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
-                          |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
+                         (NGX_CONF_BITMASK_SET
+                          |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
+                          |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
 
     ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
     ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
@@ -682,7 +683,7 @@ ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 len++;
             }
 
-            if (len == 0) {
+            if (len == 0 || j == value[i].len) {
                 goto invalid;
             }
 
diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
index 3036cae..88fef47 100644
--- a/src/os/unix/ngx_linux_config.h
+++ b/src/os/unix/ngx_linux_config.h
@@ -103,6 +103,10 @@ typedef struct iocb  ngx_aiocb_t;
 #include <linux/capability.h>
 #endif
 
+#if (NGX_HAVE_UDP_SEGMENT)
+#include <netinet/udp.h>
+#endif
+
 
 #define NGX_LISTEN_BACKLOG        511
 
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 07cd05e..98d2dd2 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -736,6 +736,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
                 ngx_set_shutdown_timer(cycle);
                 ngx_close_listening_sockets(cycle);
                 ngx_close_idle_connections(cycle);
+                ngx_event_process_posted(cycle, &ngx_posted_events);
             }
         }
 
@@ -758,7 +759,6 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
     ngx_cpuset_t     *cpu_affinity;
     struct rlimit     rlmt;
     ngx_core_conf_t  *ccf;
-    ngx_listening_t  *ls;
 
     if (ngx_set_environment(cycle, NULL) == NULL) {
         /* fatal */
@@ -888,15 +888,6 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
     tp = ngx_timeofday();
     srandom(((unsigned) ngx_pid << 16) ^ tp->sec ^ tp->msec);
 
-    /*
-     * disable deleting previous events for the listening sockets because
-     * in the worker processes there are no events at all at this point
-     */
-    ls = cycle->listening.elts;
-    for (i = 0; i < cycle->listening.nelts; i++) {
-        ls[i].previous = NULL;
-    }
-
     for (i = 0; cycle->modules[i]; i++) {
         if (cycle->modules[i]->init_process) {
             if (cycle->modules[i]->init_process(cycle) == NGX_ERROR) {
diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c
index b1ae4b5..48fa0a7 100644
--- a/src/os/unix/ngx_readv_chain.c
+++ b/src/os/unix/ngx_readv_chain.c
@@ -46,6 +46,7 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
                 return 0;
 
             } else {
+                rev->ready = 0;
                 return NGX_AGAIN;
             }
         }
@@ -55,12 +56,15 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
 
 #if (NGX_HAVE_EPOLLRDHUP)
 
-    if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
+    if ((ngx_event_flags & NGX_USE_EPOLL_EVENT)
+        && ngx_use_epoll_rdhup)
+    {
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
                        "readv: eof:%d, avail:%d",
                        rev->pending_eof, rev->available);
 
         if (rev->available == 0 && !rev->pending_eof) {
+            rev->ready = 0;
             return NGX_AGAIN;
         }
     }
diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index ddfae4d..cc04a5f 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -52,7 +52,9 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 
 #if (NGX_HAVE_EPOLLRDHUP)
 
-    if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
+    if ((ngx_event_flags & NGX_USE_EPOLL_EVENT)
+        && ngx_use_epoll_rdhup)
+    {
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
                        "recv: eof:%d, avail:%d",
                        rev->pending_eof, rev->available);
diff --git a/src/os/unix/ngx_udp_sendmsg_chain.c b/src/os/unix/ngx_udp_sendmsg_chain.c
index 3d1d6dd..fa917b5 100644
--- a/src/os/unix/ngx_udp_sendmsg_chain.c
+++ b/src/os/unix/ngx_udp_sendmsg_chain.c
@@ -12,7 +12,7 @@
 
 static ngx_chain_t *ngx_udp_output_chain_to_iovec(ngx_iovec_t *vec,
     ngx_chain_t *in, ngx_log_t *log);
-static ssize_t ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec);
+static ssize_t ngx_sendmsg_vec(ngx_connection_t *c, ngx_iovec_t *vec);
 
 
 ngx_chain_t *
@@ -88,7 +88,7 @@ ngx_udp_unix_sendmsg_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
         send += vec.size;
 
-        n = ngx_sendmsg(c, &vec);
+        n = ngx_sendmsg_vec(c, &vec);
 
         if (n == NGX_ERROR) {
             return NGX_CHAIN_ERROR;
@@ -204,24 +204,13 @@ ngx_udp_output_chain_to_iovec(ngx_iovec_t *vec, ngx_chain_t *in, ngx_log_t *log)
 
 
 static ssize_t
-ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec)
+ngx_sendmsg_vec(ngx_connection_t *c, ngx_iovec_t *vec)
 {
-    ssize_t        n;
-    ngx_err_t      err;
-    struct msghdr  msg;
-
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
-
-#if (NGX_HAVE_IP_SENDSRCADDR)
-    u_char         msg_control[CMSG_SPACE(sizeof(struct in_addr))];
-#elif (NGX_HAVE_IP_PKTINFO)
-    u_char         msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))];
-#endif
-
-#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
-    u_char         msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
-#endif
+    struct msghdr    msg;
 
+#if (NGX_HAVE_ADDRINFO_CMSG)
+    struct cmsghdr  *cmsg;
+    u_char           msg_control[CMSG_SPACE(sizeof(ngx_addrinfo_t))];
 #endif
 
     ngx_memzero(&msg, sizeof(struct msghdr));
@@ -234,88 +223,180 @@ ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec)
     msg.msg_iov = vec->iovs;
     msg.msg_iovlen = vec->count;
 
-#if (NGX_HAVE_MSGHDR_MSG_CONTROL)
-
+#if (NGX_HAVE_ADDRINFO_CMSG)
     if (c->listening && c->listening->wildcard && c->local_sockaddr) {
 
+        msg.msg_control = msg_control;
+        msg.msg_controllen = sizeof(msg_control);
+        ngx_memzero(msg_control, sizeof(msg_control));
+
+        cmsg = CMSG_FIRSTHDR(&msg);
+
+        msg.msg_controllen = ngx_set_srcaddr_cmsg(cmsg, c->local_sockaddr);
+    }
+#endif
+
+    return ngx_sendmsg(c, &msg, 0);
+}
+
+
+#if (NGX_HAVE_ADDRINFO_CMSG)
+
+size_t
+ngx_set_srcaddr_cmsg(struct cmsghdr *cmsg, struct sockaddr *local_sockaddr)
+{
+    size_t                len;
+#if (NGX_HAVE_IP_SENDSRCADDR)
+    struct in_addr       *addr;
+    struct sockaddr_in   *sin;
+#elif (NGX_HAVE_IP_PKTINFO)
+    struct in_pktinfo    *pkt;
+    struct sockaddr_in   *sin;
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+    struct in6_pktinfo   *pkt6;
+    struct sockaddr_in6  *sin6;
+#endif
+
+
+#if (NGX_HAVE_IP_SENDSRCADDR) || (NGX_HAVE_IP_PKTINFO)
+
+    if (local_sockaddr->sa_family == AF_INET) {
+
+        cmsg->cmsg_level = IPPROTO_IP;
+
 #if (NGX_HAVE_IP_SENDSRCADDR)
 
-        if (c->local_sockaddr->sa_family == AF_INET) {
-            struct cmsghdr      *cmsg;
-            struct in_addr      *addr;
-            struct sockaddr_in  *sin;
+        cmsg->cmsg_type = IP_SENDSRCADDR;
+        cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
+        len = CMSG_SPACE(sizeof(struct in_addr));
 
-            msg.msg_control = &msg_control;
-            msg.msg_controllen = sizeof(msg_control);
+        sin = (struct sockaddr_in *) local_sockaddr;
 
-            cmsg = CMSG_FIRSTHDR(&msg);
-            cmsg->cmsg_level = IPPROTO_IP;
-            cmsg->cmsg_type = IP_SENDSRCADDR;
-            cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
-
-            sin = (struct sockaddr_in *) c->local_sockaddr;
-
-            addr = (struct in_addr *) CMSG_DATA(cmsg);
-            *addr = sin->sin_addr;
-        }
+        addr = (struct in_addr *) CMSG_DATA(cmsg);
+        *addr = sin->sin_addr;
 
 #elif (NGX_HAVE_IP_PKTINFO)
 
-        if (c->local_sockaddr->sa_family == AF_INET) {
-            struct cmsghdr      *cmsg;
-            struct in_pktinfo   *pkt;
-            struct sockaddr_in  *sin;
+        cmsg->cmsg_type = IP_PKTINFO;
+        cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
+        len = CMSG_SPACE(sizeof(struct in_pktinfo));
 
-            msg.msg_control = &msg_control;
-            msg.msg_controllen = sizeof(msg_control);
+        sin = (struct sockaddr_in *) local_sockaddr;
 
-            cmsg = CMSG_FIRSTHDR(&msg);
-            cmsg->cmsg_level = IPPROTO_IP;
-            cmsg->cmsg_type = IP_PKTINFO;
-            cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
+        pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
+        ngx_memzero(pkt, sizeof(struct in_pktinfo));
+        pkt->ipi_spec_dst = sin->sin_addr;
 
-            sin = (struct sockaddr_in *) c->local_sockaddr;
+#endif
+        return len;
+    }
 
-            pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
-            ngx_memzero(pkt, sizeof(struct in_pktinfo));
-            pkt->ipi_spec_dst = sin->sin_addr;
-        }
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+    if (local_sockaddr->sa_family == AF_INET6) {
+
+        cmsg->cmsg_level = IPPROTO_IPV6;
+        cmsg->cmsg_type = IPV6_PKTINFO;
+        cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
+        len = CMSG_SPACE(sizeof(struct in6_pktinfo));
+
+        sin6 = (struct sockaddr_in6 *) local_sockaddr;
+
+        pkt6 = (struct in6_pktinfo *) CMSG_DATA(cmsg);
+        ngx_memzero(pkt6, sizeof(struct in6_pktinfo));
+        pkt6->ipi6_addr = sin6->sin6_addr;
+
+        return len;
+    }
+#endif
+
+    return 0;
+}
+
+
+ngx_int_t
+ngx_get_srcaddr_cmsg(struct cmsghdr *cmsg, struct sockaddr *local_sockaddr)
+{
+
+#if (NGX_HAVE_IP_RECVDSTADDR)
+    struct in_addr       *addr;
+    struct sockaddr_in   *sin;
+#elif (NGX_HAVE_IP_PKTINFO)
+    struct in_pktinfo    *pkt;
+    struct sockaddr_in   *sin;
+#endif
+
+#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
+    struct in6_pktinfo   *pkt6;
+    struct sockaddr_in6  *sin6;
+#endif
+
+
+#if (NGX_HAVE_IP_RECVDSTADDR)
+
+    if (cmsg->cmsg_level == IPPROTO_IP
+        && cmsg->cmsg_type == IP_RECVDSTADDR
+        && local_sockaddr->sa_family == AF_INET)
+    {
+        addr = (struct in_addr *) CMSG_DATA(cmsg);
+        sin = (struct sockaddr_in *) local_sockaddr;
+        sin->sin_addr = *addr;
+
+        return NGX_OK;
+    }
+
+#elif (NGX_HAVE_IP_PKTINFO)
+
+    if (cmsg->cmsg_level == IPPROTO_IP
+        && cmsg->cmsg_type == IP_PKTINFO
+        && local_sockaddr->sa_family == AF_INET)
+    {
+        pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
+        sin = (struct sockaddr_in *) local_sockaddr;
+        sin->sin_addr = pkt->ipi_addr;
+
+        return NGX_OK;
+    }
 
 #endif
 
 #if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
 
-        if (c->local_sockaddr->sa_family == AF_INET6) {
-            struct cmsghdr       *cmsg;
-            struct in6_pktinfo   *pkt6;
-            struct sockaddr_in6  *sin6;
+    if (cmsg->cmsg_level == IPPROTO_IPV6
+        && cmsg->cmsg_type == IPV6_PKTINFO
+        && local_sockaddr->sa_family == AF_INET6)
+    {
+        pkt6 = (struct in6_pktinfo *) CMSG_DATA(cmsg);
+        sin6 = (struct sockaddr_in6 *) local_sockaddr;
+        sin6->sin6_addr = pkt6->ipi6_addr;
 
-            msg.msg_control = &msg_control6;
-            msg.msg_controllen = sizeof(msg_control6);
-
-            cmsg = CMSG_FIRSTHDR(&msg);
-            cmsg->cmsg_level = IPPROTO_IPV6;
-            cmsg->cmsg_type = IPV6_PKTINFO;
-            cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
-
-            sin6 = (struct sockaddr_in6 *) c->local_sockaddr;
-
-            pkt6 = (struct in6_pktinfo *) CMSG_DATA(cmsg);
-            ngx_memzero(pkt6, sizeof(struct in6_pktinfo));
-            pkt6->ipi6_addr = sin6->sin6_addr;
-        }
-
-#endif
+        return NGX_OK;
     }
 
 #endif
 
+    return NGX_DECLINED;
+}
+
+#endif
+
+
+ssize_t
+ngx_sendmsg(ngx_connection_t *c, struct msghdr *msg, int flags)
+{
+    ssize_t    n;
+    ngx_err_t  err;
+#if (NGX_DEBUG)
+    size_t      size;
+    ngx_uint_t  i;
+#endif
+
 eintr:
 
-    n = sendmsg(c->fd, &msg, 0);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "sendmsg: %z of %uz", n, vec->size);
+    n = sendmsg(c->fd, msg, flags);
 
     if (n == -1) {
         err = ngx_errno;
@@ -338,5 +419,14 @@ eintr:
         }
     }
 
+#if (NGX_DEBUG)
+    for (i = 0, size = 0; i < (size_t) msg->msg_iovlen; i++) {
+        size += msg->msg_iov[i].iov_len;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "sendmsg: %z of %uz", n, size);
+#endif
+
     return n;
 }
diff --git a/src/os/win32/nginx.ico b/src/os/win32/nginx.ico
new file mode 100644
index 0000000000000000000000000000000000000000..70f79db1c631c154f1d5002e0f5fc7139a0358bc
GIT binary patch
literal 1350
zcma)+ziJ~f5XL`80i|0%KtL|9bQN+C*emZbQl$@RuG{Ud2`K}4i#&qiAbt%&USP{D
zmQ21+@~j<moKIx*+mS}|FOq=;0@mv@a)EUKt^ll7JADD%ac#M*`YZRI&w+2`nsQ6g
zxiWrMXg=G20xyTkiSNd2kcl&yjnbX1*(BZBnSDs_`bD7u{40~F#jf8o@Nl~U!W7NO
zI5JQcQ(-fZOu(5k_nAP-v?rUA+@7%{r}MIrU-w^m9AC*D<~Qf<b+kwIF`W{^>3wnH
z|Av*p*r%x4m7`O=k?!2EM(NI;y_Mc~ABBuiYpmoVw*co9*!C8f0;?j&$UsTVg+oI&
zfHNoVM<6HKlLPCf=b0n_Ez-qIKYRZ*j>mN}xi9(6d3zn3qxzW6m-@XgPK9Uuf`3r&
zWkvZxncs^RcH`uG>3ETAAokmONyu>{Df1u8&2JkdDcYEVjZM#1QmR$RZtv&aALRRJ
z)OrqPMcieeCncHE*h<QLgEai&^PuDrF;9p?$EQT8R#S3&KkxoZH3y;eseUafE6Uuj
z3o5(uw|?nuN_15&uYv1J;5*;r0|VYuxK!4(CmXkyOBFYid&j%Rd-lEsw(r0jfBPQ!
R^Y%p9(nf3Ala1T!>?gSO#Y_MI

literal 0
HcmV?d00001

diff --git a/src/os/win32/nginx.rc b/src/os/win32/nginx.rc
new file mode 100644
index 0000000..dc8b7ab
--- /dev/null
+++ b/src/os/win32/nginx.rc
@@ -0,0 +1,6 @@
+
+// Copyright (C) Igor Sysoev
+// Copyright (C) Nginx, Inc.
+
+
+nginx   icon  discardable  "src\\os\\win32\\nginx.ico"
diff --git a/src/os/win32/nginx_icon16.xpm b/src/os/win32/nginx_icon16.xpm
new file mode 100644
index 0000000..45e4bad
--- /dev/null
+++ b/src/os/win32/nginx_icon16.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char * nginx_xpm[] = {
+"16 16 2 2",
+/* colors */
+"   c none",
+"GG c #009900",
+/* pixels */
+"                                ",
+"        GGGGGGGGGGGGGGGG        ",
+"        GGGGGGGGGGGGGGGG        ",
+"      GGGGGGGGGGGGGGGGGGGG      ",
+"      GGGGGG        GGGGGG      ",
+"    GGGGGG            GGGGGG    ",
+"    GGGGGG                      ",
+"  GGGGGG      GGGGGGGGGGGGGGGG  ",
+"  GGGGGG    GGGGGGGGGGGGGGGGGG  ",
+"    GGGGGG    GGGGGGGGGGGGGG    ",
+"    GGGGGG            GGGGGG    ",
+"      GGGGGG        GGGGGG      ",
+"      GGGGGGGGGGGGGGGGGGGG      ",
+"        GGGGGGGGGGGGGGGG        ",
+"        GGGGGGGGGGGGGGGG        ",
+"                                "
+};
diff --git a/src/os/win32/nginx_icon32.xpm b/src/os/win32/nginx_icon32.xpm
new file mode 100644
index 0000000..eb26638
--- /dev/null
+++ b/src/os/win32/nginx_icon32.xpm
@@ -0,0 +1,39 @@
+/* XPM */
+static char * nginx_xpm[] = {
+"32 32 2 2",
+/* colors */
+"   c none",
+"GG c #009900",
+/* pixels */
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                  GGGGGGGGGGGGGGGGGGGGGGGGGGGG                  ",
+"                GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                ",
+"                GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                ",
+"              GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG              ",
+"              GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG              ",
+"            GGGGGGGGGG                    GGGGGGGGGG            ",
+"            GGGGGGGGGG                    GGGGGGGGGG            ",
+"          GGGGGGGGGG                        GGGGGGGGGG          ",
+"          GGGGGGGGGG                        GGGGGGGGGG          ",
+"        GGGGGGGGGG                                              ",
+"        GGGGGGGGGG                                              ",
+"      GGGGGGGGGG            GGGGGGGGGGGGGGGGGGGGGGGGGGGGGG      ",
+"      GGGGGGGGGG          GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG      ",
+"        GGGGGGGGGG        GGGGGGGGGGGGGGGGGGGGGGGGGGGGGG        ",
+"        GGGGGGGGGG        GGGGGGGGGGGGGGGGGGGGGGGGGGGGGG        ",
+"          GGGGGGGGGG        GGGGGGGGGGGGGGGGGGGGGGGGGG          ",
+"          GGGGGGGGGG                        GGGGGGGGGG          ",
+"            GGGGGGGGGG                    GGGGGGGGGG            ",
+"            GGGGGGGGGG                    GGGGGGGGGG            ",
+"              GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG              ",
+"              GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG              ",
+"                GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                ",
+"                GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                ",
+"                  GGGGGGGGGGGGGGGGGGGGGGGGGGGG                  ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "
diff --git a/src/os/win32/nginx_icon48.xpm b/src/os/win32/nginx_icon48.xpm
new file mode 100644
index 0000000..c25ba0f
--- /dev/null
+++ b/src/os/win32/nginx_icon48.xpm
@@ -0,0 +1,55 @@
+/* XPM */
+static char * nginx_xpm[] = {
+"48 48 2 2",
+/* colors */
+"   c none",
+"GG c #009900",
+/* pixels */
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                        GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                        ",
+"                        GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                        ",
+"                      GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                      ",
+"                      GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                      ",
+"                    GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                    ",
+"                    GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                    ",
+"                  GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                  ",
+"                  GGGGGGGGGGGGGGGG                            GGGGGGGGGGGGGGGG                  ",
+"                GGGGGGGGGGGGGGGG                                GGGGGGGGGGGGGGGG                ",
+"                GGGGGGGGGGGGGGGG                                GGGGGGGGGGGGGGGG                ",
+"              GGGGGGGGGGGGGGGG                                    GGGGGGGGGGGGGGGG              ",
+"              GGGGGGGGGGGGGGGG                                    GGGGGGGGGGGGGGGG              ",
+"            GGGGGGGGGGGGGGGG                                        GGGGGGGGGGGGGGGG            ",
+"            GGGGGGGGGGGGGGGG                                        GGGGGGGGGGGGGGGG            ",
+"          GGGGGGGGGGGGGGGG                                            GGGGGGGGGGGGGGGG          ",
+"          GGGGGGGGGGGGGGGG                                                                      ",
+"        GGGGGGGGGGGGGGGG                                                                        ",
+"        GGGGGGGGGGGGGGGG                                                                        ",
+"      GGGGGGGGGGGGGGGG                    GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG      ",
+"      GGGGGGGGGGGGGGGG                  GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG      ",
+"        GGGGGGGGGGGGGGGG              GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG        ",
+"        GGGGGGGGGGGGGGGG              GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG        ",
+"          GGGGGGGGGGGGGGGG            GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG          ",
+"          GGGGGGGGGGGGGGGG              GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG          ",
+"            GGGGGGGGGGGGGGGG              GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG            ",
+"            GGGGGGGGGGGGGGGG                                        GGGGGGGGGGGGGGGG            ",
+"              GGGGGGGGGGGGGGGG                                    GGGGGGGGGGGGGGGG              ",
+"              GGGGGGGGGGGGGGGG                                    GGGGGGGGGGGGGGGG              ",
+"                GGGGGGGGGGGGGGGG                                GGGGGGGGGGGGGGGG                ",
+"                GGGGGGGGGGGGGGGG                                GGGGGGGGGGGGGGGG                ",
+"                  GGGGGGGGGGGGGGGG                            GGGGGGGGGGGGGGGG                  ",
+"                  GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                  ",
+"                    GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                    ",
+"                    GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                    ",
+"                      GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                      ",
+"                      GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                      ",
+"                        GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                        ",
+"                        GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG                        ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
diff --git a/src/os/win32/ngx_alloc.c b/src/os/win32/ngx_alloc.c
new file mode 100644
index 0000000..0c0ef30
--- /dev/null
+++ b/src/os/win32/ngx_alloc.c
@@ -0,0 +1,44 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+ngx_uint_t  ngx_pagesize;
+ngx_uint_t  ngx_pagesize_shift;
+ngx_uint_t  ngx_cacheline_size;
+
+
+void *ngx_alloc(size_t size, ngx_log_t *log)
+{
+    void  *p;
+
+    p = malloc(size);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                      "malloc(%uz) failed", size);
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, "malloc: %p:%uz", p, size);
+
+    return p;
+}
+
+
+void *ngx_calloc(size_t size, ngx_log_t *log)
+{
+    void  *p;
+
+    p = ngx_alloc(size, log);
+
+    if (p) {
+        ngx_memzero(p, size);
+    }
+
+    return p;
+}
diff --git a/src/os/win32/ngx_alloc.h b/src/os/win32/ngx_alloc.h
new file mode 100644
index 0000000..5a0fa3f
--- /dev/null
+++ b/src/os/win32/ngx_alloc.h
@@ -0,0 +1,27 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_ALLOC_H_INCLUDED_
+#define _NGX_ALLOC_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+void *ngx_alloc(size_t size, ngx_log_t *log);
+void *ngx_calloc(size_t size, ngx_log_t *log);
+
+#define ngx_free          free
+#define ngx_memalign(alignment, size, log)  ngx_alloc(size, log)
+
+extern ngx_uint_t  ngx_pagesize;
+extern ngx_uint_t  ngx_pagesize_shift;
+extern ngx_uint_t  ngx_cacheline_size;
+
+
+#endif /* _NGX_ALLOC_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_atomic.h b/src/os/win32/ngx_atomic.h
new file mode 100644
index 0000000..113f561
--- /dev/null
+++ b/src/os/win32/ngx_atomic.h
@@ -0,0 +1,69 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_ATOMIC_H_INCLUDED_
+#define _NGX_ATOMIC_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_HAVE_ATOMIC_OPS   1
+
+typedef int32_t                     ngx_atomic_int_t;
+typedef uint32_t                    ngx_atomic_uint_t;
+typedef volatile ngx_atomic_uint_t  ngx_atomic_t;
+#define NGX_ATOMIC_T_LEN            (sizeof("-2147483648") - 1)
+
+
+#if defined( __WATCOMC__ ) || defined( __BORLANDC__ ) || defined(__GNUC__)    \
+    || ( _MSC_VER >= 1300 )
+
+/* the new SDK headers */
+
+#define ngx_atomic_cmp_set(lock, old, set)                                    \
+    ((ngx_atomic_uint_t) InterlockedCompareExchange((long *) lock, set, old)  \
+                         == old)
+
+#else
+
+/* the old MS VC6.0SP2 SDK headers */
+
+#define ngx_atomic_cmp_set(lock, old, set)                                    \
+    (InterlockedCompareExchange((void **) lock, (void *) set, (void *) old)   \
+     == (void *) old)
+
+#endif
+
+
+#define ngx_atomic_fetch_add(p, add) InterlockedExchangeAdd((long *) p, add)
+
+
+#define ngx_memory_barrier()
+
+
+#if defined( __BORLANDC__ ) || ( __WATCOMC__ < 1230 )
+
+/*
+ * Borland C++ 5.5 (tasm32) and Open Watcom C prior to 1.3
+ * do not understand the "pause" instruction
+ */
+
+#define ngx_cpu_pause()
+#else
+#define ngx_cpu_pause()       __asm { pause }
+#endif
+
+
+void ngx_spinlock(ngx_atomic_t *lock, ngx_atomic_int_t value, ngx_uint_t spin);
+
+#define ngx_trylock(lock)  (*(lock) == 0 && ngx_atomic_cmp_set(lock, 0, 1))
+#define ngx_unlock(lock)    *(lock) = 0
+
+
+#endif /* _NGX_ATOMIC_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_dlopen.c b/src/os/win32/ngx_dlopen.c
new file mode 100644
index 0000000..804f49d
--- /dev/null
+++ b/src/os/win32/ngx_dlopen.c
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright (C) Maxim Dounin
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+char *
+ngx_dlerror(void)
+{
+    u_char         *p;
+    static u_char   errstr[NGX_MAX_ERROR_STR];
+
+    p = ngx_strerror(ngx_errno, errstr, NGX_MAX_ERROR_STR);
+    *p = '\0';
+
+    return (char *) errstr;
+}
diff --git a/src/os/win32/ngx_dlopen.h b/src/os/win32/ngx_dlopen.h
new file mode 100644
index 0000000..0d6b405
--- /dev/null
+++ b/src/os/win32/ngx_dlopen.h
@@ -0,0 +1,32 @@
+
+/*
+ * Copyright (C) Maxim Dounin
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_DLOPEN_H_INCLUDED_
+#define _NGX_DLOPEN_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_HAVE_DLOPEN  1
+
+
+#define ngx_dlopen(path)           LoadLibrary((char *) path)
+#define ngx_dlopen_n               "LoadLibrary()"
+
+#define ngx_dlsym(handle, symbol)  (void *) GetProcAddress(handle, symbol)
+#define ngx_dlsym_n                "GetProcAddress()"
+
+#define ngx_dlclose(handle)        (FreeLibrary(handle) ? 0 : -1)
+#define ngx_dlclose_n              "FreeLibrary()"
+
+
+char *ngx_dlerror(void);
+
+
+#endif /* _NGX_DLOPEN_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_errno.c b/src/os/win32/ngx_errno.c
new file mode 100644
index 0000000..966d3de
--- /dev/null
+++ b/src/os/win32/ngx_errno.c
@@ -0,0 +1,60 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+u_char *
+ngx_strerror(ngx_err_t err, u_char *errstr, size_t size)
+{
+    u_int          len;
+    static u_long  lang = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US);
+
+    if (size == 0) {
+        return errstr;
+    }
+
+    len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+                        NULL, err, lang, (char *) errstr, size, NULL);
+
+    if (len == 0 && lang) {
+
+        /*
+         * Try to use English messages first and fallback to a language,
+         * based on locale: non-English Windows have no English messages
+         * at all.  This way allows to use English messages at least on
+         * Windows with MUI.
+         */
+
+        lang = 0;
+
+        len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+                            NULL, err, lang, (char *) errstr, size, NULL);
+    }
+
+    if (len == 0) {
+        return ngx_snprintf(errstr, size,
+                            "FormatMessage() error:(%d)", GetLastError());
+    }
+
+    /* remove ".\r\n\0" */
+    while (errstr[len] == '\0' || errstr[len] == CR
+           || errstr[len] == LF || errstr[len] == '.')
+    {
+        --len;
+    }
+
+    return &errstr[++len];
+}
+
+
+ngx_int_t
+ngx_strerror_init(void)
+{
+    return NGX_OK;
+}
diff --git a/src/os/win32/ngx_errno.h b/src/os/win32/ngx_errno.h
new file mode 100644
index 0000000..255a39d
--- /dev/null
+++ b/src/os/win32/ngx_errno.h
@@ -0,0 +1,71 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_ERRNO_H_INCLUDED_
+#define _NGX_ERRNO_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+typedef DWORD                      ngx_err_t;
+
+#define ngx_errno                  GetLastError()
+#define ngx_set_errno(err)         SetLastError(err)
+#define ngx_socket_errno           WSAGetLastError()
+#define ngx_set_socket_errno(err)  WSASetLastError(err)
+
+#define NGX_EPERM                  ERROR_ACCESS_DENIED
+#define NGX_ENOENT                 ERROR_FILE_NOT_FOUND
+#define NGX_ENOPATH                ERROR_PATH_NOT_FOUND
+#define NGX_ENOMEM                 ERROR_NOT_ENOUGH_MEMORY
+#define NGX_EACCES                 ERROR_ACCESS_DENIED
+/*
+ * there are two EEXIST error codes:
+ * ERROR_FILE_EXISTS used by CreateFile(CREATE_NEW),
+ * and ERROR_ALREADY_EXISTS used by CreateDirectory();
+ * MoveFile() uses both
+ */
+#define NGX_EEXIST                 ERROR_ALREADY_EXISTS
+#define NGX_EEXIST_FILE            ERROR_FILE_EXISTS
+#define NGX_EXDEV                  ERROR_NOT_SAME_DEVICE
+#define NGX_ENOTDIR                ERROR_PATH_NOT_FOUND
+#define NGX_EISDIR                 ERROR_CANNOT_MAKE
+#define NGX_ENOSPC                 ERROR_DISK_FULL
+#define NGX_EPIPE                  EPIPE
+#define NGX_EAGAIN                 WSAEWOULDBLOCK
+#define NGX_EINPROGRESS            WSAEINPROGRESS
+#define NGX_ENOPROTOOPT            WSAENOPROTOOPT
+#define NGX_EOPNOTSUPP             WSAEOPNOTSUPP
+#define NGX_EADDRINUSE             WSAEADDRINUSE
+#define NGX_ECONNABORTED           WSAECONNABORTED
+#define NGX_ECONNRESET             WSAECONNRESET
+#define NGX_ENOTCONN               WSAENOTCONN
+#define NGX_ETIMEDOUT              WSAETIMEDOUT
+#define NGX_ECONNREFUSED           WSAECONNREFUSED
+#define NGX_ENAMETOOLONG           ERROR_BAD_PATHNAME
+#define NGX_ENETDOWN               WSAENETDOWN
+#define NGX_ENETUNREACH            WSAENETUNREACH
+#define NGX_EHOSTDOWN              WSAEHOSTDOWN
+#define NGX_EHOSTUNREACH           WSAEHOSTUNREACH
+#define NGX_ENOMOREFILES           ERROR_NO_MORE_FILES
+#define NGX_EILSEQ                 ERROR_NO_UNICODE_TRANSLATION
+#define NGX_ELOOP                  0
+#define NGX_EBADF                  WSAEBADF
+
+#define NGX_EALREADY               WSAEALREADY
+#define NGX_EINVAL                 WSAEINVAL
+#define NGX_EMFILE                 WSAEMFILE
+#define NGX_ENFILE                 WSAEMFILE
+
+
+u_char *ngx_strerror(ngx_err_t err, u_char *errstr, size_t size);
+ngx_int_t ngx_strerror_init(void);
+
+
+#endif /* _NGX_ERRNO_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_event_log.c b/src/os/win32/ngx_event_log.c
new file mode 100644
index 0000000..e11ed1e
--- /dev/null
+++ b/src/os/win32/ngx_event_log.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_MAX_ERROR_STR   2048
+
+
+void ngx_cdecl
+ngx_event_log(ngx_err_t err, const char *fmt, ...)
+{
+    u_char         *p, *last;
+    long            types;
+    HKEY            key;
+    HANDLE          ev;
+    va_list         args;
+    u_char          text[NGX_MAX_ERROR_STR];
+    const char     *msgarg[9];
+    static u_char   netmsg[] = "%SystemRoot%\\System32\\netmsg.dll";
+
+    last = text + NGX_MAX_ERROR_STR;
+    p = text + GetModuleFileName(NULL, (char *) text, NGX_MAX_ERROR_STR - 50);
+
+    *p++ = ':';
+    ngx_linefeed(p);
+
+    va_start(args, fmt);
+    p = ngx_vslprintf(p, last, fmt, args);
+    va_end(args);
+
+    if (err) {
+        p = ngx_log_errno(p, last, err);
+    }
+
+    if (p > last - NGX_LINEFEED_SIZE - 1) {
+        p = last - NGX_LINEFEED_SIZE - 1;
+    }
+
+    ngx_linefeed(p);
+
+    *p = '\0';
+
+    /*
+     * we do not log errors here since we use
+     * Event Log only to log our own logs open errors
+     */
+
+    if (RegCreateKeyEx(HKEY_LOCAL_MACHINE,
+           "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\nginx",
+           0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &key, NULL)
+        != 0)
+    {
+        return;
+    }
+
+    if (RegSetValueEx(key, "EventMessageFile", 0, REG_EXPAND_SZ,
+                      netmsg, sizeof(netmsg) - 1)
+        != 0)
+    {
+        return;
+    }
+
+    types = EVENTLOG_ERROR_TYPE;
+
+    if (RegSetValueEx(key, "TypesSupported", 0, REG_DWORD,
+                      (u_char *) &types, sizeof(long))
+        != 0)
+    {
+        return;
+    }
+
+    RegCloseKey(key);
+
+    ev = RegisterEventSource(NULL, "nginx");
+
+    msgarg[0] = (char *) text;
+    msgarg[1] = NULL;
+    msgarg[2] = NULL;
+    msgarg[3] = NULL;
+    msgarg[4] = NULL;
+    msgarg[5] = NULL;
+    msgarg[6] = NULL;
+    msgarg[7] = NULL;
+    msgarg[8] = NULL;
+
+    /*
+     * the 3299 event id in netmsg.dll has the generic message format:
+     *     "%1 %2 %3 %4 %5 %6 %7 %8 %9"
+     */
+
+    ReportEvent(ev, EVENTLOG_ERROR_TYPE, 0, 3299, NULL, 9, 0, msgarg, NULL);
+
+    DeregisterEventSource(ev);
+}
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
new file mode 100644
index 0000000..90644ad
--- /dev/null
+++ b/src/os/win32/ngx_files.c
@@ -0,0 +1,1459 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_UTF16_BUFLEN  256
+#define NGX_UTF8_BUFLEN   512
+
+static ngx_int_t ngx_win32_check_filename(u_short *u, size_t len,
+    ngx_uint_t dirname);
+static u_short *ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len,
+    size_t reserved);
+static u_char *ngx_utf16_to_utf8(u_char *utf8, u_short *utf16, size_t *len,
+    size_t *allocated);
+uint32_t ngx_utf16_decode(u_short **u, size_t n);
+
+
+/* FILE_FLAG_BACKUP_SEMANTICS allows to obtain a handle to a directory */
+
+ngx_fd_t
+ngx_open_file(u_char *name, u_long mode, u_long create, u_long access)
+{
+    size_t      len;
+    u_short    *u;
+    ngx_fd_t    fd;
+    ngx_err_t   err;
+    u_short     utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+    u = ngx_utf8_to_utf16(utf16, name, &len, 0);
+
+    if (u == NULL) {
+        return INVALID_HANDLE_VALUE;
+    }
+
+    fd = INVALID_HANDLE_VALUE;
+
+    if (create == NGX_FILE_OPEN
+        && ngx_win32_check_filename(u, len, 0) != NGX_OK)
+    {
+        goto failed;
+    }
+
+    fd = CreateFileW(u, mode,
+                     FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                     NULL, create, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+
+failed:
+
+    if (u != utf16) {
+        err = ngx_errno;
+        ngx_free(u);
+        ngx_set_errno(err);
+    }
+
+    return fd;
+}
+
+
+ngx_fd_t
+ngx_open_tempfile(u_char *name, ngx_uint_t persistent, ngx_uint_t access)
+{
+    size_t      len;
+    u_short    *u;
+    ngx_fd_t    fd;
+    ngx_err_t   err;
+    u_short     utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+    u = ngx_utf8_to_utf16(utf16, name, &len, 0);
+
+    if (u == NULL) {
+        return INVALID_HANDLE_VALUE;
+    }
+
+    fd = CreateFileW(u,
+                     GENERIC_READ|GENERIC_WRITE,
+                     FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                     NULL,
+                     CREATE_NEW,
+                     persistent ? 0:
+                         FILE_ATTRIBUTE_TEMPORARY|FILE_FLAG_DELETE_ON_CLOSE,
+                     NULL);
+
+    if (u != utf16) {
+        err = ngx_errno;
+        ngx_free(u);
+        ngx_set_errno(err);
+    }
+
+    return fd;
+}
+
+
+ssize_t
+ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
+{
+    u_long      n;
+    ngx_err_t   err;
+    OVERLAPPED  ovlp, *povlp;
+
+    ovlp.Internal = 0;
+    ovlp.InternalHigh = 0;
+    ovlp.Offset = (u_long) offset;
+    ovlp.OffsetHigh = (u_long) (offset >> 32);
+    ovlp.hEvent = NULL;
+
+    povlp = &ovlp;
+
+    if (ReadFile(file->fd, buf, size, &n, povlp) == 0) {
+        err = ngx_errno;
+
+        if (err == ERROR_HANDLE_EOF) {
+            return 0;
+        }
+
+        ngx_log_error(NGX_LOG_ERR, file->log, err,
+                      "ReadFile() \"%s\" failed", file->name.data);
+        return NGX_ERROR;
+    }
+
+    file->offset += n;
+
+    return n;
+}
+
+
+ssize_t
+ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
+{
+    u_long      n;
+    OVERLAPPED  ovlp, *povlp;
+
+    ovlp.Internal = 0;
+    ovlp.InternalHigh = 0;
+    ovlp.Offset = (u_long) offset;
+    ovlp.OffsetHigh = (u_long) (offset >> 32);
+    ovlp.hEvent = NULL;
+
+    povlp = &ovlp;
+
+    if (WriteFile(file->fd, buf, size, &n, povlp) == 0) {
+        ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno,
+                      "WriteFile() \"%s\" failed", file->name.data);
+        return NGX_ERROR;
+    }
+
+    if (n != size) {
+        ngx_log_error(NGX_LOG_CRIT, file->log, 0,
+                      "WriteFile() \"%s\" has written only %ul of %uz",
+                      file->name.data, n, size);
+        return NGX_ERROR;
+    }
+
+    file->offset += n;
+
+    return n;
+}
+
+
+ssize_t
+ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
+    ngx_pool_t *pool)
+{
+    u_char   *buf, *prev;
+    size_t    size;
+    ssize_t   total, n;
+
+    total = 0;
+
+    while (cl) {
+        buf = cl->buf->pos;
+        prev = buf;
+        size = 0;
+
+        /* coalesce the neighbouring bufs */
+
+        while (cl && prev == cl->buf->pos) {
+            size += cl->buf->last - cl->buf->pos;
+            prev = cl->buf->last;
+            cl = cl->next;
+        }
+
+        n = ngx_write_file(file, buf, size, offset);
+
+        if (n == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        total += n;
+        offset += n;
+    }
+
+    return total;
+}
+
+
+ssize_t
+ngx_read_fd(ngx_fd_t fd, void *buf, size_t size)
+{
+    u_long  n;
+
+    if (ReadFile(fd, buf, size, &n, NULL) != 0) {
+        return (size_t) n;
+    }
+
+    return -1;
+}
+
+
+ssize_t
+ngx_write_fd(ngx_fd_t fd, void *buf, size_t size)
+{
+    u_long  n;
+
+    if (WriteFile(fd, buf, size, &n, NULL) != 0) {
+        return (size_t) n;
+    }
+
+    return -1;
+}
+
+
+ssize_t
+ngx_write_console(ngx_fd_t fd, void *buf, size_t size)
+{
+    u_long  n;
+
+    (void) CharToOemBuff(buf, buf, size);
+
+    if (WriteFile(fd, buf, size, &n, NULL) != 0) {
+        return (size_t) n;
+    }
+
+    return -1;
+}
+
+
+ngx_int_t
+ngx_delete_file(u_char *name)
+{
+    long        rc;
+    size_t      len;
+    u_short    *u;
+    ngx_err_t   err;
+    u_short     utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+    u = ngx_utf8_to_utf16(utf16, name, &len, 0);
+
+    if (u == NULL) {
+        return NGX_FILE_ERROR;
+    }
+
+    rc = NGX_FILE_ERROR;
+
+    if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
+        goto failed;
+    }
+
+    rc = DeleteFileW(u);
+
+failed:
+
+    if (u != utf16) {
+        err = ngx_errno;
+        ngx_free(u);
+        ngx_set_errno(err);
+    }
+
+    return rc;
+}
+
+
+ngx_int_t
+ngx_rename_file(u_char *from, u_char *to)
+{
+    long        rc;
+    size_t      len;
+    u_short    *fu, *tu;
+    ngx_err_t   err;
+    u_short     utf16f[NGX_UTF16_BUFLEN];
+    u_short     utf16t[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+    fu = ngx_utf8_to_utf16(utf16f, from, &len, 0);
+
+    if (fu == NULL) {
+        return NGX_FILE_ERROR;
+    }
+
+    rc = NGX_FILE_ERROR;
+    tu = NULL;
+
+    if (ngx_win32_check_filename(fu, len, 0) != NGX_OK) {
+        goto failed;
+    }
+
+    len = NGX_UTF16_BUFLEN;
+    tu = ngx_utf8_to_utf16(utf16t, to, &len, 0);
+
+    if (tu == NULL) {
+        goto failed;
+    }
+
+    if (ngx_win32_check_filename(tu, len, 1) != NGX_OK) {
+        goto failed;
+    }
+
+    rc = MoveFileW(fu, tu);
+
+failed:
+
+    if (fu != utf16f) {
+        err = ngx_errno;
+        ngx_free(fu);
+        ngx_set_errno(err);
+    }
+
+    if (tu && tu != utf16t) {
+        err = ngx_errno;
+        ngx_free(tu);
+        ngx_set_errno(err);
+    }
+
+    return rc;
+}
+
+
+ngx_err_t
+ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log)
+{
+    u_char             *name;
+    ngx_err_t           err;
+    ngx_uint_t          collision;
+    ngx_atomic_uint_t   num;
+
+    name = ngx_alloc(to->len + 1 + NGX_ATOMIC_T_LEN + 1 + sizeof("DELETE"),
+                     log);
+    if (name == NULL) {
+        return NGX_ENOMEM;
+    }
+
+    ngx_memcpy(name, to->data, to->len);
+
+    collision = 0;
+
+    /* mutex_lock() (per cache or single ?) */
+
+    for ( ;; ) {
+        num = ngx_next_temp_number(collision);
+
+        ngx_sprintf(name + to->len, ".%0muA.DELETE%Z", num);
+
+        if (ngx_rename_file(to->data, name) != NGX_FILE_ERROR) {
+            break;
+        }
+
+        err = ngx_errno;
+
+        if (err == NGX_EEXIST || err == NGX_EEXIST_FILE) {
+            collision = 1;
+            continue;
+        }
+
+        ngx_log_error(NGX_LOG_CRIT, log, err,
+                      "MoveFile() \"%s\" to \"%s\" failed", to->data, name);
+        goto failed;
+    }
+
+    if (ngx_rename_file(from->data, to->data) == NGX_FILE_ERROR) {
+        err = ngx_errno;
+
+    } else {
+        err = 0;
+    }
+
+    if (ngx_delete_file(name) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,
+                      "DeleteFile() \"%s\" failed", name);
+    }
+
+failed:
+
+    /* mutex_unlock() */
+
+    ngx_free(name);
+
+    return err;
+}
+
+
+ngx_int_t
+ngx_file_info(u_char *file, ngx_file_info_t *sb)
+{
+    size_t                      len;
+    long                        rc;
+    u_short                    *u;
+    ngx_err_t                   err;
+    WIN32_FILE_ATTRIBUTE_DATA   fa;
+    u_short                     utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+
+    u = ngx_utf8_to_utf16(utf16, file, &len, 0);
+
+    if (u == NULL) {
+        return NGX_FILE_ERROR;
+    }
+
+    rc = NGX_FILE_ERROR;
+
+    if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
+        goto failed;
+    }
+
+    rc = GetFileAttributesExW(u, GetFileExInfoStandard, &fa);
+
+    sb->dwFileAttributes = fa.dwFileAttributes;
+    sb->ftCreationTime = fa.ftCreationTime;
+    sb->ftLastAccessTime = fa.ftLastAccessTime;
+    sb->ftLastWriteTime = fa.ftLastWriteTime;
+    sb->nFileSizeHigh = fa.nFileSizeHigh;
+    sb->nFileSizeLow = fa.nFileSizeLow;
+
+failed:
+
+    if (u != utf16) {
+        err = ngx_errno;
+        ngx_free(u);
+        ngx_set_errno(err);
+    }
+
+    return rc;
+}
+
+
+ngx_int_t
+ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s)
+{
+    uint64_t  intervals;
+    FILETIME  ft;
+
+    /* 116444736000000000 is commented in src/os/win32/ngx_time.c */
+
+    intervals = s * 10000000 + 116444736000000000;
+
+    ft.dwLowDateTime = (DWORD) intervals;
+    ft.dwHighDateTime = (DWORD) (intervals >> 32);
+
+    if (SetFileTime(fd, NULL, NULL, &ft) != 0) {
+        return NGX_OK;
+    }
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_create_file_mapping(ngx_file_mapping_t *fm)
+{
+    LARGE_INTEGER  size;
+
+    fm->fd = ngx_open_file(fm->name, NGX_FILE_RDWR, NGX_FILE_TRUNCATE,
+                           NGX_FILE_DEFAULT_ACCESS);
+
+    if (fm->fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
+                      ngx_open_file_n " \"%s\" failed", fm->name);
+        return NGX_ERROR;
+    }
+
+    fm->handle = NULL;
+
+    size.QuadPart = fm->size;
+
+    if (SetFilePointerEx(fm->fd, size, NULL, FILE_BEGIN) == 0) {
+        ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
+                      "SetFilePointerEx(\"%s\", %uz) failed",
+                      fm->name, fm->size);
+        goto failed;
+    }
+
+    if (SetEndOfFile(fm->fd) == 0) {
+        ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
+                      "SetEndOfFile() \"%s\" failed", fm->name);
+        goto failed;
+    }
+
+    fm->handle = CreateFileMapping(fm->fd, NULL, PAGE_READWRITE,
+                                   (u_long) ((off_t) fm->size >> 32),
+                                   (u_long) ((off_t) fm->size & 0xffffffff),
+                                   NULL);
+    if (fm->handle == NULL) {
+        ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
+                      "CreateFileMapping(%s, %uz) failed",
+                      fm->name, fm->size);
+        goto failed;
+    }
+
+    fm->addr = MapViewOfFile(fm->handle, FILE_MAP_WRITE, 0, 0, 0);
+
+    if (fm->addr != NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
+                  "MapViewOfFile(%uz) of file mapping \"%s\" failed",
+                  fm->size, fm->name);
+
+failed:
+
+    if (fm->handle) {
+        if (CloseHandle(fm->handle) == 0) {
+            ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
+                          "CloseHandle() of file mapping \"%s\" failed",
+                          fm->name);
+        }
+    }
+
+    if (ngx_close_file(fm->fd) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
+                      ngx_close_file_n " \"%s\" failed", fm->name);
+    }
+
+    return NGX_ERROR;
+}
+
+
+void
+ngx_close_file_mapping(ngx_file_mapping_t *fm)
+{
+    if (UnmapViewOfFile(fm->addr) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
+                      "UnmapViewOfFile(%p) of file mapping \"%s\" failed",
+                      fm->addr, &fm->name);
+    }
+
+    if (CloseHandle(fm->handle) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
+                      "CloseHandle() of file mapping \"%s\" failed",
+                      &fm->name);
+    }
+
+    if (ngx_close_file(fm->fd) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, fm->log, ngx_errno,
+                      ngx_close_file_n " \"%s\" failed", fm->name);
+    }
+}
+
+
+u_char *
+ngx_realpath(u_char *path, u_char *resolved)
+{
+    /* STUB */
+    return path;
+}
+
+
+size_t
+ngx_getcwd(u_char *buf, size_t size)
+{
+    u_char   *p;
+    size_t    n;
+    u_short   utf16[NGX_MAX_PATH];
+
+    n = GetCurrentDirectoryW(NGX_MAX_PATH, utf16);
+
+    if (n == 0) {
+        return 0;
+    }
+
+    if (n > NGX_MAX_PATH) {
+        ngx_set_errno(ERROR_INSUFFICIENT_BUFFER);
+        return 0;
+    }
+
+    p = ngx_utf16_to_utf8(buf, utf16, &size, NULL);
+
+    if (p == NULL) {
+        return 0;
+    }
+
+    if (p != buf) {
+        ngx_free(p);
+        ngx_set_errno(ERROR_INSUFFICIENT_BUFFER);
+        return 0;
+    }
+
+    return size - 1;
+}
+
+
+ngx_int_t
+ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
+{
+    size_t      len;
+    u_short    *u, *p;
+    ngx_err_t   err;
+    u_short     utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN - 2;
+    u = ngx_utf8_to_utf16(utf16, name->data, &len, 2);
+
+    if (u == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
+        goto failed;
+    }
+
+    p = &u[len - 1];
+
+    *p++ = '/';
+    *p++ = '*';
+    *p = '\0';
+
+    dir->dir = FindFirstFileW(u, &dir->finddata);
+
+    if (dir->dir == INVALID_HANDLE_VALUE) {
+        goto failed;
+    }
+
+    if (u != utf16) {
+        ngx_free(u);
+    }
+
+    dir->valid_info = 1;
+    dir->ready = 1;
+    dir->name = NULL;
+    dir->allocated = 0;
+
+    return NGX_OK;
+
+failed:
+
+    if (u != utf16) {
+        err = ngx_errno;
+        ngx_free(u);
+        ngx_set_errno(err);
+    }
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_read_dir(ngx_dir_t *dir)
+{
+    u_char  *name;
+    size_t   len, allocated;
+
+    if (dir->ready) {
+        dir->ready = 0;
+        goto convert;
+    }
+
+    if (FindNextFileW(dir->dir, &dir->finddata) != 0) {
+        dir->type = 1;
+        goto convert;
+    }
+
+    return NGX_ERROR;
+
+convert:
+
+    name = dir->name;
+    len = dir->allocated;
+
+    name = ngx_utf16_to_utf8(name, dir->finddata.cFileName, &len, &allocated);
+
+    if (name == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (name != dir->name) {
+
+        if (dir->name) {
+            ngx_free(dir->name);
+        }
+
+        dir->name = name;
+        dir->allocated = allocated;
+    }
+
+    dir->namelen = len - 1;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_close_dir(ngx_dir_t *dir)
+{
+    if (dir->name) {
+        ngx_free(dir->name);
+    }
+
+    if (FindClose(dir->dir) == 0) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_create_dir(u_char *name, ngx_uint_t access)
+{
+    long        rc;
+    size_t      len;
+    u_short    *u;
+    ngx_err_t   err;
+    u_short     utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+    u = ngx_utf8_to_utf16(utf16, name, &len, 0);
+
+    if (u == NULL) {
+        return NGX_FILE_ERROR;
+    }
+
+    rc = NGX_FILE_ERROR;
+
+    if (ngx_win32_check_filename(u, len, 1) != NGX_OK) {
+        goto failed;
+    }
+
+    rc = CreateDirectoryW(u, NULL);
+
+failed:
+
+    if (u != utf16) {
+        err = ngx_errno;
+        ngx_free(u);
+        ngx_set_errno(err);
+    }
+
+    return rc;
+}
+
+
+ngx_int_t
+ngx_delete_dir(u_char *name)
+{
+    long        rc;
+    size_t      len;
+    u_short    *u;
+    ngx_err_t   err;
+    u_short     utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+    u = ngx_utf8_to_utf16(utf16, name, &len, 0);
+
+    if (u == NULL) {
+        return NGX_FILE_ERROR;
+    }
+
+    rc = NGX_FILE_ERROR;
+
+    if (ngx_win32_check_filename(u, len, 0) != NGX_OK) {
+        goto failed;
+    }
+
+    rc = RemoveDirectoryW(u);
+
+failed:
+
+    if (u != utf16) {
+        err = ngx_errno;
+        ngx_free(u);
+        ngx_set_errno(err);
+    }
+
+    return rc;
+}
+
+
+ngx_int_t
+ngx_open_glob(ngx_glob_t *gl)
+{
+    u_char     *p;
+    size_t      len;
+    u_short    *u;
+    ngx_err_t   err;
+    u_short     utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+    u = ngx_utf8_to_utf16(utf16, gl->pattern, &len, 0);
+
+    if (u == NULL) {
+        return NGX_ERROR;
+    }
+
+    gl->dir = FindFirstFileW(u, &gl->finddata);
+
+    if (gl->dir == INVALID_HANDLE_VALUE) {
+
+        err = ngx_errno;
+
+        if (u != utf16) {
+            ngx_free(u);
+        }
+
+        if ((err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND)
+             && gl->test)
+        {
+            gl->no_match = 1;
+            return NGX_OK;
+        }
+
+        ngx_set_errno(err);
+
+        return NGX_ERROR;
+    }
+
+    for (p = gl->pattern; *p; p++) {
+        if (*p == '/') {
+            gl->last = p + 1 - gl->pattern;
+        }
+    }
+
+    if (u != utf16) {
+        ngx_free(u);
+    }
+
+    gl->ready = 1;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
+{
+    u_char     *p;
+    size_t      len;
+    ngx_err_t   err;
+    u_char      utf8[NGX_UTF8_BUFLEN];
+
+    if (gl->no_match) {
+        return NGX_DONE;
+    }
+
+    if (gl->ready) {
+        gl->ready = 0;
+        goto convert;
+    }
+
+    ngx_free(gl->name.data);
+    gl->name.data = NULL;
+
+    if (FindNextFileW(gl->dir, &gl->finddata) != 0) {
+        goto convert;
+    }
+
+    err = ngx_errno;
+
+    if (err == NGX_ENOMOREFILES) {
+        return NGX_DONE;
+    }
+
+    ngx_log_error(NGX_LOG_ALERT, gl->log, err,
+                  "FindNextFile(%s) failed", gl->pattern);
+
+    return NGX_ERROR;
+
+convert:
+
+    len = NGX_UTF8_BUFLEN;
+    p = ngx_utf16_to_utf8(utf8, gl->finddata.cFileName, &len, NULL);
+
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    gl->name.len = gl->last + len - 1;
+
+    gl->name.data = ngx_alloc(gl->name.len + 1, gl->log);
+    if (gl->name.data == NULL) {
+        goto failed;
+    }
+
+    ngx_memcpy(gl->name.data, gl->pattern, gl->last);
+    ngx_cpystrn(gl->name.data + gl->last, p, len);
+
+    if (p != utf8) {
+        ngx_free(p);
+    }
+
+    *name = gl->name;
+
+    return NGX_OK;
+
+failed:
+
+    if (p != utf8) {
+        err = ngx_errno;
+        ngx_free(p);
+        ngx_set_errno(err);
+    }
+
+    return NGX_ERROR;
+}
+
+
+void
+ngx_close_glob(ngx_glob_t *gl)
+{
+    if (gl->name.data) {
+        ngx_free(gl->name.data);
+    }
+
+    if (gl->dir == INVALID_HANDLE_VALUE) {
+        return;
+    }
+
+    if (FindClose(gl->dir) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, gl->log, ngx_errno,
+                      "FindClose(%s) failed", gl->pattern);
+    }
+}
+
+
+ngx_int_t
+ngx_de_info(u_char *name, ngx_dir_t *dir)
+{
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_de_link_info(u_char *name, ngx_dir_t *dir)
+{
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_read_ahead(ngx_fd_t fd, size_t n)
+{
+    return ~NGX_FILE_ERROR;
+}
+
+
+ngx_int_t
+ngx_directio_on(ngx_fd_t fd)
+{
+    return ~NGX_FILE_ERROR;
+}
+
+
+ngx_int_t
+ngx_directio_off(ngx_fd_t fd)
+{
+    return ~NGX_FILE_ERROR;
+}
+
+
+size_t
+ngx_fs_bsize(u_char *name)
+{
+    u_long    sc, bs, nfree, ncl;
+    size_t    len;
+    u_short  *u;
+    u_short   utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+    u = ngx_utf8_to_utf16(utf16, name, &len, 0);
+
+    if (u == NULL) {
+        return 512;
+    }
+
+    if (GetDiskFreeSpaceW(u, &sc, &bs, &nfree, &ncl) == 0) {
+
+        if (u != utf16) {
+            ngx_free(u);
+        }
+
+        return 512;
+    }
+
+    if (u != utf16) {
+        ngx_free(u);
+    }
+
+    return sc * bs;
+}
+
+
+off_t
+ngx_fs_available(u_char *name)
+{
+    size_t           len;
+    u_short         *u;
+    ULARGE_INTEGER   navail;
+    u_short          utf16[NGX_UTF16_BUFLEN];
+
+    len = NGX_UTF16_BUFLEN;
+    u = ngx_utf8_to_utf16(utf16, name, &len, 0);
+
+    if (u == NULL) {
+        return NGX_MAX_OFF_T_VALUE;
+    }
+
+    if (GetDiskFreeSpaceExW(u, &navail, NULL, NULL) == 0) {
+
+        if (u != utf16) {
+            ngx_free(u);
+        }
+
+        return NGX_MAX_OFF_T_VALUE;
+    }
+
+    if (u != utf16) {
+        ngx_free(u);
+    }
+
+    return (off_t) navail.QuadPart;
+}
+
+
+static ngx_int_t
+ngx_win32_check_filename(u_short *u, size_t len, ngx_uint_t dirname)
+{
+    u_long      n;
+    u_short    *lu, *p, *slash, ch;
+    ngx_err_t   err;
+    enum {
+        sw_start = 0,
+        sw_normal,
+        sw_after_slash,
+        sw_after_colon,
+        sw_after_dot
+    } state;
+
+    /* check for NTFS streams (":"), trailing dots and spaces */
+
+    lu = NULL;
+    slash = NULL;
+    state = sw_start;
+
+#if (NGX_SUPPRESS_WARN)
+    ch = 0;
+#endif
+
+    for (p = u; *p; p++) {
+        ch = *p;
+
+        switch (state) {
+
+        case sw_start:
+
+            /*
+             * skip till first "/" to allow paths starting with drive and
+             * relative path, like "c:html/"
+             */
+
+            if (ch == '/' || ch == '\\') {
+                state = sw_after_slash;
+                slash = p;
+            }
+
+            break;
+
+        case sw_normal:
+
+            if (ch == ':') {
+                state = sw_after_colon;
+                break;
+            }
+
+            if (ch == '.' || ch == ' ') {
+                state = sw_after_dot;
+                break;
+            }
+
+            if (ch == '/' || ch == '\\') {
+                state = sw_after_slash;
+                slash = p;
+                break;
+            }
+
+            break;
+
+        case sw_after_slash:
+
+            if (ch == '/' || ch == '\\') {
+                break;
+            }
+
+            if (ch == '.') {
+                break;
+            }
+
+            if (ch == ':') {
+                state = sw_after_colon;
+                break;
+            }
+
+            state = sw_normal;
+            break;
+
+        case sw_after_colon:
+
+            if (ch == '/' || ch == '\\') {
+                state = sw_after_slash;
+                slash = p;
+                break;
+            }
+
+            goto invalid;
+
+        case sw_after_dot:
+
+            if (ch == '/' || ch == '\\') {
+                goto invalid;
+            }
+
+            if (ch == ':') {
+                goto invalid;
+            }
+
+            if (ch == '.' || ch == ' ') {
+                break;
+            }
+
+            state = sw_normal;
+            break;
+        }
+    }
+
+    if (state == sw_after_dot) {
+        goto invalid;
+    }
+
+    if (dirname && slash) {
+        ch = *slash;
+        *slash = '\0';
+        len = slash - u + 1;
+    }
+
+    /* check if long name match */
+
+    lu = malloc(len * 2);
+    if (lu == NULL) {
+        return NGX_ERROR;
+    }
+
+    n = GetLongPathNameW(u, lu, len);
+
+    if (n == 0) {
+
+        if (dirname && slash && ngx_errno == NGX_ENOENT) {
+            ngx_set_errno(NGX_ENOPATH);
+        }
+
+        goto failed;
+    }
+
+    if (n != len - 1 || _wcsicmp(u, lu) != 0) {
+        goto invalid;
+    }
+
+    if (dirname && slash) {
+        *slash = ch;
+    }
+
+    ngx_free(lu);
+
+    return NGX_OK;
+
+invalid:
+
+    ngx_set_errno(NGX_ENOENT);
+
+failed:
+
+    if (dirname && slash) {
+        *slash = ch;
+    }
+
+    if (lu) {
+        err = ngx_errno;
+        ngx_free(lu);
+        ngx_set_errno(err);
+    }
+
+    return NGX_ERROR;
+}
+
+
+static u_short *
+ngx_utf8_to_utf16(u_short *utf16, u_char *utf8, size_t *len, size_t reserved)
+{
+    u_char    *p;
+    u_short   *u, *last;
+    uint32_t   n;
+
+    p = utf8;
+    u = utf16;
+    last = utf16 + *len;
+
+    while (u < last) {
+
+        if (*p < 0x80) {
+            *u++ = (u_short) *p;
+
+            if (*p == 0) {
+                *len = u - utf16;
+                return utf16;
+            }
+
+            p++;
+
+            continue;
+        }
+
+        if (u + 1 == last) {
+            *len = u - utf16;
+            break;
+        }
+
+        n = ngx_utf8_decode(&p, 4);
+
+        if (n > 0x10ffff) {
+            ngx_set_errno(NGX_EILSEQ);
+            return NULL;
+        }
+
+        if (n > 0xffff) {
+            n -= 0x10000;
+            *u++ = (u_short) (0xd800 + (n >> 10));
+            *u++ = (u_short) (0xdc00 + (n & 0x03ff));
+            continue;
+        }
+
+        *u++ = (u_short) n;
+    }
+
+    /* the given buffer is not enough, allocate a new one */
+
+    u = malloc(((p - utf8) + ngx_strlen(p) + 1 + reserved) * sizeof(u_short));
+    if (u == NULL) {
+        return NULL;
+    }
+
+    ngx_memcpy(u, utf16, *len * 2);
+
+    utf16 = u;
+    u += *len;
+
+    for ( ;; ) {
+
+        if (*p < 0x80) {
+            *u++ = (u_short) *p;
+
+            if (*p == 0) {
+                *len = u - utf16;
+                return utf16;
+            }
+
+            p++;
+
+            continue;
+        }
+
+        n = ngx_utf8_decode(&p, 4);
+
+        if (n > 0x10ffff) {
+            ngx_free(utf16);
+            ngx_set_errno(NGX_EILSEQ);
+            return NULL;
+        }
+
+        if (n > 0xffff) {
+            n -= 0x10000;
+            *u++ = (u_short) (0xd800 + (n >> 10));
+            *u++ = (u_short) (0xdc00 + (n & 0x03ff));
+            continue;
+        }
+
+        *u++ = (u_short) n;
+    }
+
+    /* unreachable */
+}
+
+
+static u_char *
+ngx_utf16_to_utf8(u_char *utf8, u_short *utf16, size_t *len, size_t *allocated)
+{
+    u_char    *p, *last;
+    u_short   *u, *j;
+    uint32_t   n;
+
+    u = utf16;
+    p = utf8;
+    last = utf8 + *len;
+
+    while (p < last) {
+
+        if (*u < 0x80) {
+            *p++ = (u_char) *u;
+
+            if (*u == 0) {
+                *len = p - utf8;
+                return utf8;
+            }
+
+            u++;
+
+            continue;
+        }
+
+        if (p >= last - 4) {
+            *len = p - utf8;
+            break;
+        }
+
+        n = ngx_utf16_decode(&u, 2);
+
+        if (n > 0x10ffff) {
+            ngx_set_errno(NGX_EILSEQ);
+            return NULL;
+        }
+
+        if (n >= 0x10000) {
+            *p++ = (u_char) (0xf0 + (n >> 18));
+            *p++ = (u_char) (0x80 + ((n >> 12) & 0x3f));
+            *p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
+            *p++ = (u_char) (0x80 + (n & 0x3f));
+            continue;
+        }
+
+        if (n >= 0x0800) {
+            *p++ = (u_char) (0xe0 + (n >> 12));
+            *p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
+            *p++ = (u_char) (0x80 + (n & 0x3f));
+            continue;
+        }
+
+        *p++ = (u_char) (0xc0 + (n >> 6));
+        *p++ = (u_char) (0x80 + (n & 0x3f));
+    }
+
+    /* the given buffer is not enough, allocate a new one */
+
+    for (j = u; *j; j++) { /* void */ }
+
+    p = malloc((j - utf16) * 4 + 1);
+    if (p == NULL) {
+        return NULL;
+    }
+
+    if (allocated) {
+        *allocated = (j - utf16) * 4 + 1;
+    }
+
+    ngx_memcpy(p, utf8, *len);
+
+    utf8 = p;
+    p += *len;
+
+    for ( ;; ) {
+
+        if (*u < 0x80) {
+            *p++ = (u_char) *u;
+
+            if (*u == 0) {
+                *len = p - utf8;
+                return utf8;
+            }
+
+            u++;
+
+            continue;
+        }
+
+        n = ngx_utf16_decode(&u, 2);
+
+        if (n > 0x10ffff) {
+            ngx_free(utf8);
+            ngx_set_errno(NGX_EILSEQ);
+            return NULL;
+        }
+
+        if (n >= 0x10000) {
+            *p++ = (u_char) (0xf0 + (n >> 18));
+            *p++ = (u_char) (0x80 + ((n >> 12) & 0x3f));
+            *p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
+            *p++ = (u_char) (0x80 + (n & 0x3f));
+            continue;
+        }
+
+        if (n >= 0x0800) {
+            *p++ = (u_char) (0xe0 + (n >> 12));
+            *p++ = (u_char) (0x80 + ((n >> 6) & 0x3f));
+            *p++ = (u_char) (0x80 + (n & 0x3f));
+            continue;
+        }
+
+        *p++ = (u_char) (0xc0 + (n >> 6));
+        *p++ = (u_char) (0x80 + (n & 0x3f));
+    }
+
+    /* unreachable */
+}
+
+
+/*
+ * ngx_utf16_decode() decodes one or two UTF-16 code units
+ * the return values:
+ *    0x80 - 0x10ffff         valid character
+ *    0x110000 - 0xfffffffd   invalid sequence
+ *    0xfffffffe              incomplete sequence
+ *    0xffffffff              error
+ */
+
+uint32_t
+ngx_utf16_decode(u_short **u, size_t n)
+{
+    uint32_t  k, m;
+
+    k = **u;
+
+    if (k < 0xd800 || k > 0xdfff) {
+        (*u)++;
+        return k;
+    }
+
+    if (k > 0xdbff) {
+        (*u)++;
+        return 0xffffffff;
+    }
+
+    if (n < 2) {
+        return 0xfffffffe;
+    }
+
+    (*u)++;
+
+    m = *(*u)++;
+
+    if (m < 0xdc00 || m > 0xdfff) {
+        return 0xffffffff;
+
+    }
+
+    return 0x10000 + ((k - 0xd800) << 10) + (m - 0xdc00);
+}
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
new file mode 100644
index 0000000..6e59a6f
--- /dev/null
+++ b/src/os/win32/ngx_files.h
@@ -0,0 +1,271 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_FILES_H_INCLUDED_
+#define _NGX_FILES_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+typedef HANDLE                      ngx_fd_t;
+typedef BY_HANDLE_FILE_INFORMATION  ngx_file_info_t;
+typedef uint64_t                    ngx_file_uniq_t;
+
+
+typedef struct {
+    u_char                         *name;
+    size_t                          size;
+    void                           *addr;
+    ngx_fd_t                        fd;
+    HANDLE                          handle;
+    ngx_log_t                      *log;
+} ngx_file_mapping_t;
+
+
+typedef struct {
+    HANDLE                          dir;
+    WIN32_FIND_DATAW                finddata;
+
+    u_char                         *name;
+    size_t                          namelen;
+    size_t                          allocated;
+
+    unsigned                        valid_info:1;
+    unsigned                        type:1;
+    unsigned                        ready:1;
+} ngx_dir_t;
+
+
+typedef struct {
+    HANDLE                          dir;
+    WIN32_FIND_DATAW                finddata;
+
+    unsigned                        ready:1;
+    unsigned                        test:1;
+    unsigned                        no_match:1;
+
+    u_char                         *pattern;
+    ngx_str_t                       name;
+    size_t                          last;
+    ngx_log_t                      *log;
+} ngx_glob_t;
+
+
+
+/* INVALID_FILE_ATTRIBUTES is specified but not defined at least in MSVC6SP2 */
+#ifndef INVALID_FILE_ATTRIBUTES
+#define INVALID_FILE_ATTRIBUTES     0xffffffff
+#endif
+
+/* INVALID_SET_FILE_POINTER is not defined at least in MSVC6SP2 */
+#ifndef INVALID_SET_FILE_POINTER
+#define INVALID_SET_FILE_POINTER    0xffffffff
+#endif
+
+
+#define NGX_INVALID_FILE            INVALID_HANDLE_VALUE
+#define NGX_FILE_ERROR              0
+
+
+ngx_fd_t ngx_open_file(u_char *name, u_long mode, u_long create, u_long access);
+#define ngx_open_file_n             "CreateFile()"
+
+#define NGX_FILE_RDONLY             GENERIC_READ
+#define NGX_FILE_WRONLY             GENERIC_WRITE
+#define NGX_FILE_RDWR               GENERIC_READ|GENERIC_WRITE
+#define NGX_FILE_APPEND             FILE_APPEND_DATA|SYNCHRONIZE
+#define NGX_FILE_NONBLOCK           0
+
+#define NGX_FILE_CREATE_OR_OPEN     OPEN_ALWAYS
+#define NGX_FILE_OPEN               OPEN_EXISTING
+#define NGX_FILE_TRUNCATE           CREATE_ALWAYS
+
+#define NGX_FILE_DEFAULT_ACCESS     0
+#define NGX_FILE_OWNER_ACCESS       0
+
+
+ngx_fd_t ngx_open_tempfile(u_char *name, ngx_uint_t persistent,
+    ngx_uint_t access);
+#define ngx_open_tempfile_n         "CreateFile()"
+
+
+#define ngx_close_file              CloseHandle
+#define ngx_close_file_n            "CloseHandle()"
+
+
+ssize_t ngx_read_fd(ngx_fd_t fd, void *buf, size_t size);
+#define ngx_read_fd_n               "ReadFile()"
+
+
+ssize_t ngx_write_fd(ngx_fd_t fd, void *buf, size_t size);
+#define ngx_write_fd_n              "WriteFile()"
+
+
+ssize_t ngx_write_console(ngx_fd_t fd, void *buf, size_t size);
+
+
+#define ngx_linefeed(p)             *p++ = CR; *p++ = LF;
+#define NGX_LINEFEED_SIZE           2
+#define NGX_LINEFEED                CRLF
+
+
+ngx_int_t ngx_delete_file(u_char *name);
+#define ngx_delete_file_n           "DeleteFile()"
+
+
+ngx_int_t ngx_rename_file(u_char *from, u_char *to);
+#define ngx_rename_file_n           "MoveFile()"
+ngx_err_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log);
+
+
+
+ngx_int_t ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s);
+#define ngx_set_file_time_n         "SetFileTime()"
+
+
+ngx_int_t ngx_file_info(u_char *filename, ngx_file_info_t *fi);
+#define ngx_file_info_n             "GetFileAttributesEx()"
+
+
+#define ngx_fd_info(fd, fi)         GetFileInformationByHandle(fd, fi)
+#define ngx_fd_info_n               "GetFileInformationByHandle()"
+
+
+#define ngx_link_info(name, fi)     ngx_file_info(name, fi)
+#define ngx_link_info_n             "GetFileAttributesEx()"
+
+
+#define ngx_is_dir(fi)                                                       \
+    (((fi)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0)
+#define ngx_is_file(fi)                                                      \
+    (((fi)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+#define ngx_is_link(fi)     0
+#define ngx_is_exec(fi)     0
+
+#define ngx_file_access(fi) 0
+
+#define ngx_file_size(fi)                                                    \
+    (((off_t) (fi)->nFileSizeHigh << 32) | (fi)->nFileSizeLow)
+#define ngx_file_fs_size(fi)        ngx_file_size(fi)
+
+#define ngx_file_uniq(fi)   (*(ngx_file_uniq_t *) &(fi)->nFileIndexHigh)
+
+
+/* 116444736000000000 is commented in src/os/win32/ngx_time.c */
+
+#define ngx_file_mtime(fi)                                                   \
+ (time_t) (((((unsigned __int64) (fi)->ftLastWriteTime.dwHighDateTime << 32) \
+                               | (fi)->ftLastWriteTime.dwLowDateTime)        \
+                                          - 116444736000000000) / 10000000)
+
+ngx_int_t ngx_create_file_mapping(ngx_file_mapping_t *fm);
+void ngx_close_file_mapping(ngx_file_mapping_t *fm);
+
+
+u_char *ngx_realpath(u_char *path, u_char *resolved);
+#define ngx_realpath_n              ""
+
+
+size_t ngx_getcwd(u_char *buf, size_t size);
+#define ngx_getcwd_n                "GetCurrentDirectory()"
+
+
+#define ngx_path_separator(c)       ((c) == '/' || (c) == '\\')
+
+#define NGX_HAVE_MAX_PATH           1
+#define NGX_MAX_PATH                MAX_PATH
+
+
+ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
+#define ngx_open_dir_n              "FindFirstFile()"
+
+
+ngx_int_t ngx_read_dir(ngx_dir_t *dir);
+#define ngx_read_dir_n              "FindNextFile()"
+
+
+ngx_int_t ngx_close_dir(ngx_dir_t *dir);
+#define ngx_close_dir_n             "FindClose()"
+
+
+ngx_int_t ngx_create_dir(u_char *name, ngx_uint_t access);
+#define ngx_create_dir_n            "CreateDirectory()"
+
+
+ngx_int_t ngx_delete_dir(u_char *name);
+#define ngx_delete_dir_n            "RemoveDirectory()"
+
+
+#define ngx_dir_access(a)           (a)
+
+
+#define ngx_de_name(dir)            (dir)->name
+#define ngx_de_namelen(dir)         (dir)->namelen
+
+ngx_int_t ngx_de_info(u_char *name, ngx_dir_t *dir);
+#define ngx_de_info_n               "dummy()"
+
+ngx_int_t ngx_de_link_info(u_char *name, ngx_dir_t *dir);
+#define ngx_de_link_info_n          "dummy()"
+
+#define ngx_de_is_dir(dir)                                                   \
+    (((dir)->finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0)
+#define ngx_de_is_file(dir)                                                  \
+    (((dir)->finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+#define ngx_de_is_link(dir)         0
+#define ngx_de_access(dir)          0
+#define ngx_de_size(dir)                                                     \
+  (((off_t) (dir)->finddata.nFileSizeHigh << 32) | (dir)->finddata.nFileSizeLow)
+#define ngx_de_fs_size(dir)         ngx_de_size(dir)
+
+/* 116444736000000000 is commented in src/os/win32/ngx_time.c */
+
+#define ngx_de_mtime(dir)                                                    \
+    (time_t) (((((unsigned __int64)                                          \
+                     (dir)->finddata.ftLastWriteTime.dwHighDateTime << 32)   \
+                      | (dir)->finddata.ftLastWriteTime.dwLowDateTime)       \
+                                          - 116444736000000000) / 10000000)
+
+
+ngx_int_t ngx_open_glob(ngx_glob_t *gl);
+#define ngx_open_glob_n             "FindFirstFile()"
+
+ngx_int_t ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name);
+void ngx_close_glob(ngx_glob_t *gl);
+
+
+ssize_t ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset);
+#define ngx_read_file_n             "ReadFile()"
+
+ssize_t ngx_write_file(ngx_file_t *file, u_char *buf, size_t size,
+    off_t offset);
+
+ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *ce,
+    off_t offset, ngx_pool_t *pool);
+
+ngx_int_t ngx_read_ahead(ngx_fd_t fd, size_t n);
+#define ngx_read_ahead_n            "ngx_read_ahead_n"
+
+ngx_int_t ngx_directio_on(ngx_fd_t fd);
+#define ngx_directio_on_n           "ngx_directio_on_n"
+
+ngx_int_t ngx_directio_off(ngx_fd_t fd);
+#define ngx_directio_off_n          "ngx_directio_off_n"
+
+size_t ngx_fs_bsize(u_char *name);
+off_t ngx_fs_available(u_char *name);
+
+
+#define ngx_stdout               GetStdHandle(STD_OUTPUT_HANDLE)
+#define ngx_stderr               GetStdHandle(STD_ERROR_HANDLE)
+#define ngx_set_stderr(fd)       SetStdHandle(STD_ERROR_HANDLE, fd)
+#define ngx_set_stderr_n         "SetStdHandle(STD_ERROR_HANDLE)"
+
+
+#endif /* _NGX_FILES_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_os.h b/src/os/win32/ngx_os.h
new file mode 100644
index 0000000..15f5aa0
--- /dev/null
+++ b/src/os/win32/ngx_os.h
@@ -0,0 +1,68 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_OS_H_INCLUDED_
+#define _NGX_OS_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_IO_SENDFILE    1
+
+
+typedef ssize_t (*ngx_recv_pt)(ngx_connection_t *c, u_char *buf, size_t size);
+typedef ssize_t (*ngx_recv_chain_pt)(ngx_connection_t *c, ngx_chain_t *in,
+    off_t limit);
+typedef ssize_t (*ngx_send_pt)(ngx_connection_t *c, u_char *buf, size_t size);
+typedef ngx_chain_t *(*ngx_send_chain_pt)(ngx_connection_t *c, ngx_chain_t *in,
+    off_t limit);
+
+typedef struct {
+    ngx_recv_pt        recv;
+    ngx_recv_chain_pt  recv_chain;
+    ngx_recv_pt        udp_recv;
+    ngx_send_pt        send;
+    ngx_send_pt        udp_send;
+    ngx_send_chain_pt  udp_send_chain;
+    ngx_send_chain_pt  send_chain;
+    ngx_uint_t         flags;
+} ngx_os_io_t;
+
+
+ngx_int_t ngx_os_init(ngx_log_t *log);
+void ngx_os_status(ngx_log_t *log);
+ngx_int_t ngx_os_signal_process(ngx_cycle_t *cycle, char *sig, ngx_pid_t pid);
+
+ssize_t ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size);
+ssize_t ngx_overlapped_wsarecv(ngx_connection_t *c, u_char *buf, size_t size);
+ssize_t ngx_udp_wsarecv(ngx_connection_t *c, u_char *buf, size_t size);
+ssize_t ngx_udp_overlapped_wsarecv(ngx_connection_t *c, u_char *buf,
+    size_t size);
+ssize_t ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit);
+ssize_t ngx_wsasend(ngx_connection_t *c, u_char *buf, size_t size);
+ssize_t ngx_overlapped_wsasend(ngx_connection_t *c, u_char *buf, size_t size);
+ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in,
+    off_t limit);
+ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in,
+    off_t limit);
+
+void ngx_cdecl ngx_event_log(ngx_err_t err, const char *fmt, ...);
+
+
+extern ngx_os_io_t  ngx_os_io;
+extern ngx_uint_t   ngx_ncpu;
+extern ngx_uint_t   ngx_max_wsabufs;
+extern ngx_int_t    ngx_max_sockets;
+extern ngx_uint_t   ngx_inherited_nonblocking;
+extern ngx_uint_t   ngx_tcp_nodelay_and_tcp_nopush;
+extern ngx_uint_t   ngx_win32_version;
+extern char         ngx_unique[];
+
+
+#endif /* _NGX_OS_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_process.c b/src/os/win32/ngx_process.c
new file mode 100644
index 0000000..57b1ae9
--- /dev/null
+++ b/src/os/win32/ngx_process.c
@@ -0,0 +1,238 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+int              ngx_argc;
+char           **ngx_argv;
+char           **ngx_os_argv;
+
+ngx_int_t        ngx_last_process;
+ngx_process_t    ngx_processes[NGX_MAX_PROCESSES];
+
+
+ngx_pid_t
+ngx_spawn_process(ngx_cycle_t *cycle, char *name, ngx_int_t respawn)
+{
+    u_long          rc, n, code;
+    ngx_int_t       s;
+    ngx_pid_t       pid;
+    ngx_exec_ctx_t  ctx;
+    HANDLE          events[2];
+    char            file[MAX_PATH + 1];
+
+    if (respawn >= 0) {
+        s = respawn;
+
+    } else {
+        for (s = 0; s < ngx_last_process; s++) {
+            if (ngx_processes[s].handle == NULL) {
+                break;
+            }
+        }
+
+        if (s == NGX_MAX_PROCESSES) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                          "no more than %d processes can be spawned",
+                          NGX_MAX_PROCESSES);
+            return NGX_INVALID_PID;
+        }
+    }
+
+    n = GetModuleFileName(NULL, file, MAX_PATH);
+
+    if (n == 0) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "GetModuleFileName() failed");
+        return NGX_INVALID_PID;
+    }
+
+    file[n] = '\0';
+
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0,
+                   "GetModuleFileName: \"%s\"", file);
+
+    ctx.path = file;
+    ctx.name = name;
+    ctx.args = GetCommandLine();
+    ctx.argv = NULL;
+    ctx.envp = NULL;
+
+    pid = ngx_execute(cycle, &ctx);
+
+    if (pid == NGX_INVALID_PID) {
+        return pid;
+    }
+
+    ngx_memzero(&ngx_processes[s], sizeof(ngx_process_t));
+
+    ngx_processes[s].handle = ctx.child;
+    ngx_processes[s].pid = pid;
+    ngx_processes[s].name = name;
+
+    ngx_sprintf(ngx_processes[s].term_event, "ngx_%s_term_%P%Z", name, pid);
+    ngx_sprintf(ngx_processes[s].quit_event, "ngx_%s_quit_%P%Z", name, pid);
+    ngx_sprintf(ngx_processes[s].reopen_event, "ngx_%s_reopen_%P%Z",
+                name, pid);
+
+    events[0] = ngx_master_process_event;
+    events[1] = ctx.child;
+
+    rc = WaitForMultipleObjects(2, events, 0, 5000);
+
+    ngx_time_update();
+
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0,
+                   "WaitForMultipleObjects: %ul", rc);
+
+    switch (rc) {
+
+    case WAIT_OBJECT_0:
+
+        ngx_processes[s].term = OpenEvent(EVENT_MODIFY_STATE, 0,
+                                          (char *) ngx_processes[s].term_event);
+        if (ngx_processes[s].term == NULL) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "OpenEvent(\"%s\") failed",
+                          ngx_processes[s].term_event);
+            goto failed;
+        }
+
+        ngx_processes[s].quit = OpenEvent(EVENT_MODIFY_STATE, 0,
+                                          (char *) ngx_processes[s].quit_event);
+        if (ngx_processes[s].quit == NULL) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "OpenEvent(\"%s\") failed",
+                          ngx_processes[s].quit_event);
+            goto failed;
+        }
+
+        ngx_processes[s].reopen = OpenEvent(EVENT_MODIFY_STATE, 0,
+                                       (char *) ngx_processes[s].reopen_event);
+        if (ngx_processes[s].reopen == NULL) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "OpenEvent(\"%s\") failed",
+                          ngx_processes[s].reopen_event);
+            goto failed;
+        }
+
+        if (ResetEvent(ngx_master_process_event) == 0) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                          "ResetEvent(\"%s\") failed",
+                          ngx_master_process_event_name);
+            goto failed;
+        }
+
+        break;
+
+    case WAIT_OBJECT_0 + 1:
+        if (GetExitCodeProcess(ctx.child, &code) == 0) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "GetExitCodeProcess(%P) failed", pid);
+        }
+
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                      "%s process %P exited with code %Xl",
+                      name, pid, code);
+
+        goto failed;
+
+    case WAIT_TIMEOUT:
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                      "the event \"%s\" was not signaled for 5s",
+                      ngx_master_process_event_name);
+        goto failed;
+
+    case WAIT_FAILED:
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "WaitForSingleObject(\"%s\") failed",
+                      ngx_master_process_event_name);
+
+        goto failed;
+    }
+
+    if (respawn >= 0) {
+        return pid;
+    }
+
+    switch (respawn) {
+
+    case NGX_PROCESS_RESPAWN:
+        ngx_processes[s].just_spawn = 0;
+        break;
+
+    case NGX_PROCESS_JUST_RESPAWN:
+        ngx_processes[s].just_spawn = 1;
+        break;
+    }
+
+    if (s == ngx_last_process) {
+        ngx_last_process++;
+    }
+
+    return pid;
+
+failed:
+
+    if (ngx_processes[s].reopen) {
+        ngx_close_handle(ngx_processes[s].reopen);
+    }
+
+    if (ngx_processes[s].quit) {
+        ngx_close_handle(ngx_processes[s].quit);
+    }
+
+    if (ngx_processes[s].term) {
+        ngx_close_handle(ngx_processes[s].term);
+    }
+
+    TerminateProcess(ngx_processes[s].handle, 2);
+
+    if (ngx_processes[s].handle) {
+        ngx_close_handle(ngx_processes[s].handle);
+        ngx_processes[s].handle = NULL;
+    }
+
+    return NGX_INVALID_PID;
+}
+
+
+ngx_pid_t
+ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx)
+{
+    STARTUPINFO          si;
+    PROCESS_INFORMATION  pi;
+
+    ngx_memzero(&si, sizeof(STARTUPINFO));
+    si.cb = sizeof(STARTUPINFO);
+
+    ngx_memzero(&pi, sizeof(PROCESS_INFORMATION));
+
+    if (CreateProcess(ctx->path, ctx->args,
+                      NULL, NULL, 0, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)
+        == 0)
+    {
+        ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_errno,
+                      "CreateProcess(\"%s\") failed", ngx_argv[0]);
+
+        return 0;
+    }
+
+    ctx->child = pi.hProcess;
+
+    if (CloseHandle(pi.hThread) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "CloseHandle(pi.hThread) failed");
+    }
+
+    ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0,
+                  "start %s process %P", ctx->name, pi.dwProcessId);
+
+    return pi.dwProcessId;
+}
diff --git a/src/os/win32/ngx_process.h b/src/os/win32/ngx_process.h
new file mode 100644
index 0000000..7ec4cd9
--- /dev/null
+++ b/src/os/win32/ngx_process.h
@@ -0,0 +1,80 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_PROCESS_H_INCLUDED_
+#define _NGX_PROCESS_H_INCLUDED_
+
+
+typedef DWORD               ngx_pid_t;
+#define NGX_INVALID_PID     0
+
+
+#define ngx_getpid          GetCurrentProcessId
+#define ngx_getppid()       0
+#define ngx_log_pid         ngx_pid
+
+
+#define NGX_PROCESS_SYNC_NAME                                                 \
+    (sizeof("ngx_cache_manager_mutex_") + NGX_INT32_LEN)
+
+
+typedef uint64_t            ngx_cpuset_t;
+
+
+typedef struct {
+    HANDLE                  handle;
+    ngx_pid_t               pid;
+    char                   *name;
+
+    HANDLE                  term;
+    HANDLE                  quit;
+    HANDLE                  reopen;
+
+    u_char                  term_event[NGX_PROCESS_SYNC_NAME];
+    u_char                  quit_event[NGX_PROCESS_SYNC_NAME];
+    u_char                  reopen_event[NGX_PROCESS_SYNC_NAME];
+
+    unsigned                just_spawn:1;
+    unsigned                exiting:1;
+} ngx_process_t;
+
+
+typedef struct {
+    char                   *path;
+    char                   *name;
+    char                   *args;
+    char *const            *argv;
+    char *const            *envp;
+    HANDLE                  child;
+} ngx_exec_ctx_t;
+
+
+ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle, char *name, ngx_int_t respawn);
+ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
+
+#define ngx_debug_point()
+#define ngx_sched_yield()   SwitchToThread()
+
+
+#define NGX_MAX_PROCESSES         (MAXIMUM_WAIT_OBJECTS - 4)
+
+#define NGX_PROCESS_RESPAWN       -2
+#define NGX_PROCESS_JUST_RESPAWN  -3
+
+
+extern int                  ngx_argc;
+extern char               **ngx_argv;
+extern char               **ngx_os_argv;
+
+extern ngx_int_t            ngx_last_process;
+extern ngx_process_t        ngx_processes[NGX_MAX_PROCESSES];
+
+extern ngx_pid_t            ngx_pid;
+extern ngx_pid_t            ngx_parent;
+
+
+#endif /* _NGX_PROCESS_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c
new file mode 100644
index 0000000..0c848ef
--- /dev/null
+++ b/src/os/win32/ngx_process_cycle.c
@@ -0,0 +1,1044 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <nginx.h>
+
+
+static void ngx_console_init(ngx_cycle_t *cycle);
+static int __stdcall ngx_console_handler(u_long type);
+static ngx_int_t ngx_create_signal_events(ngx_cycle_t *cycle);
+static ngx_int_t ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t type);
+static void ngx_reopen_worker_processes(ngx_cycle_t *cycle);
+static void ngx_quit_worker_processes(ngx_cycle_t *cycle, ngx_uint_t old);
+static void ngx_terminate_worker_processes(ngx_cycle_t *cycle);
+static ngx_uint_t ngx_reap_worker(ngx_cycle_t *cycle, HANDLE h);
+static void ngx_master_process_exit(ngx_cycle_t *cycle);
+static void ngx_worker_process_cycle(ngx_cycle_t *cycle, char *mevn);
+static void ngx_worker_process_exit(ngx_cycle_t *cycle);
+static ngx_thread_value_t __stdcall ngx_worker_thread(void *data);
+static ngx_thread_value_t __stdcall ngx_cache_manager_thread(void *data);
+static void ngx_cache_manager_process_handler(void);
+static ngx_thread_value_t __stdcall ngx_cache_loader_thread(void *data);
+
+
+ngx_uint_t     ngx_process;
+ngx_uint_t     ngx_worker;
+ngx_pid_t      ngx_pid;
+ngx_pid_t      ngx_parent;
+
+ngx_uint_t     ngx_inherited;
+ngx_pid_t      ngx_new_binary;
+
+sig_atomic_t   ngx_terminate;
+sig_atomic_t   ngx_quit;
+sig_atomic_t   ngx_reopen;
+sig_atomic_t   ngx_reconfigure;
+ngx_uint_t     ngx_exiting;
+
+
+HANDLE         ngx_master_process_event;
+char           ngx_master_process_event_name[NGX_PROCESS_SYNC_NAME];
+
+static HANDLE  ngx_stop_event;
+static char    ngx_stop_event_name[NGX_PROCESS_SYNC_NAME];
+static HANDLE  ngx_quit_event;
+static char    ngx_quit_event_name[NGX_PROCESS_SYNC_NAME];
+static HANDLE  ngx_reopen_event;
+static char    ngx_reopen_event_name[NGX_PROCESS_SYNC_NAME];
+static HANDLE  ngx_reload_event;
+static char    ngx_reload_event_name[NGX_PROCESS_SYNC_NAME];
+
+HANDLE         ngx_cache_manager_mutex;
+char           ngx_cache_manager_mutex_name[NGX_PROCESS_SYNC_NAME];
+HANDLE         ngx_cache_manager_event;
+
+
+void
+ngx_master_process_cycle(ngx_cycle_t *cycle)
+{
+    u_long      nev, ev, timeout;
+    ngx_err_t   err;
+    ngx_int_t   n;
+    ngx_msec_t  timer;
+    ngx_uint_t  live;
+    HANDLE      events[MAXIMUM_WAIT_OBJECTS];
+
+    ngx_sprintf((u_char *) ngx_master_process_event_name,
+                "ngx_master_%s%Z", ngx_unique);
+
+    if (ngx_process == NGX_PROCESS_WORKER) {
+        ngx_worker_process_cycle(cycle, ngx_master_process_event_name);
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_CORE, cycle->log, 0, "master started");
+
+    ngx_console_init(cycle);
+
+    SetEnvironmentVariable("ngx_unique", ngx_unique);
+
+    ngx_master_process_event = CreateEvent(NULL, 1, 0,
+                                           ngx_master_process_event_name);
+    if (ngx_master_process_event == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "CreateEvent(\"%s\") failed",
+                      ngx_master_process_event_name);
+        exit(2);
+    }
+
+    if (ngx_create_signal_events(cycle) != NGX_OK) {
+        exit(2);
+    }
+
+    ngx_sprintf((u_char *) ngx_cache_manager_mutex_name,
+                "ngx_cache_manager_mutex_%s%Z", ngx_unique);
+
+    ngx_cache_manager_mutex = CreateMutex(NULL, 0,
+                                          ngx_cache_manager_mutex_name);
+    if (ngx_cache_manager_mutex == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                   "CreateMutex(\"%s\") failed", ngx_cache_manager_mutex_name);
+        exit(2);
+    }
+
+
+    events[0] = ngx_stop_event;
+    events[1] = ngx_quit_event;
+    events[2] = ngx_reopen_event;
+    events[3] = ngx_reload_event;
+
+    ngx_close_listening_sockets(cycle);
+
+    if (ngx_start_worker_processes(cycle, NGX_PROCESS_RESPAWN) == 0) {
+        exit(2);
+    }
+
+    timer = 0;
+    timeout = INFINITE;
+
+    for ( ;; ) {
+
+        nev = 4;
+        for (n = 0; n < ngx_last_process; n++) {
+            if (ngx_processes[n].handle) {
+                events[nev++] = ngx_processes[n].handle;
+            }
+        }
+
+        if (timer) {
+            timeout = timer > ngx_current_msec ? timer - ngx_current_msec : 0;
+        }
+
+        ev = WaitForMultipleObjects(nev, events, 0, timeout);
+
+        err = ngx_errno;
+        ngx_time_update();
+
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0,
+                       "master WaitForMultipleObjects: %ul", ev);
+
+        if (ev == WAIT_OBJECT_0) {
+            ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
+
+            if (ResetEvent(ngx_stop_event) == 0) {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                              "ResetEvent(\"%s\") failed", ngx_stop_event_name);
+            }
+
+            if (timer == 0) {
+                timer = ngx_current_msec + 5000;
+            }
+
+            ngx_terminate = 1;
+            ngx_quit_worker_processes(cycle, 0);
+
+            continue;
+        }
+
+        if (ev == WAIT_OBJECT_0 + 1) {
+            ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "shutting down");
+
+            if (ResetEvent(ngx_quit_event) == 0) {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                              "ResetEvent(\"%s\") failed", ngx_quit_event_name);
+            }
+
+            ngx_quit = 1;
+            ngx_quit_worker_processes(cycle, 0);
+
+            continue;
+        }
+
+        if (ev == WAIT_OBJECT_0 + 2) {
+            ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "reopening logs");
+
+            if (ResetEvent(ngx_reopen_event) == 0) {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                              "ResetEvent(\"%s\") failed",
+                              ngx_reopen_event_name);
+            }
+
+            ngx_reopen_files(cycle, -1);
+            ngx_reopen_worker_processes(cycle);
+
+            continue;
+        }
+
+        if (ev == WAIT_OBJECT_0 + 3) {
+            ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "reconfiguring");
+
+            if (ResetEvent(ngx_reload_event) == 0) {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                              "ResetEvent(\"%s\") failed",
+                              ngx_reload_event_name);
+            }
+
+            cycle = ngx_init_cycle(cycle);
+            if (cycle == NULL) {
+                cycle = (ngx_cycle_t *) ngx_cycle;
+                continue;
+            }
+
+            ngx_cycle = cycle;
+
+            ngx_close_listening_sockets(cycle);
+
+            if (ngx_start_worker_processes(cycle, NGX_PROCESS_JUST_RESPAWN)) {
+                ngx_quit_worker_processes(cycle, 1);
+            }
+
+            continue;
+        }
+
+        if (ev > WAIT_OBJECT_0 + 3 && ev < WAIT_OBJECT_0 + nev) {
+
+            ngx_log_debug0(NGX_LOG_DEBUG_CORE, cycle->log, 0, "reap worker");
+
+            live = ngx_reap_worker(cycle, events[ev]);
+
+            if (!live && (ngx_terminate || ngx_quit)) {
+                ngx_master_process_exit(cycle);
+            }
+
+            continue;
+        }
+
+        if (ev == WAIT_TIMEOUT) {
+            ngx_terminate_worker_processes(cycle);
+
+            ngx_master_process_exit(cycle);
+        }
+
+        if (ev == WAIT_FAILED) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, err,
+                          "WaitForMultipleObjects() failed");
+
+            continue;
+        }
+
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+            "WaitForMultipleObjects() returned unexpected value %ul", ev);
+    }
+}
+
+
+static void
+ngx_console_init(ngx_cycle_t *cycle)
+{
+    ngx_core_conf_t  *ccf;
+
+    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+
+    if (ccf->daemon) {
+        if (FreeConsole() == 0) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "FreeConsole() failed");
+        }
+
+        return;
+    }
+
+    if (SetConsoleCtrlHandler(ngx_console_handler, 1) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "SetConsoleCtrlHandler() failed");
+    }
+}
+
+
+static int __stdcall
+ngx_console_handler(u_long type)
+{
+    char  *msg;
+
+    switch (type) {
+
+    case CTRL_C_EVENT:
+        msg = "Ctrl-C pressed, exiting";
+        break;
+
+    case CTRL_BREAK_EVENT:
+        msg = "Ctrl-Break pressed, exiting";
+        break;
+
+    case CTRL_CLOSE_EVENT:
+        msg = "console closing, exiting";
+        break;
+
+    case CTRL_LOGOFF_EVENT:
+        msg = "user logs off, exiting";
+        break;
+
+    default:
+        return 0;
+    }
+
+    ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0, msg);
+
+    if (ngx_stop_event == NULL) {
+        return 1;
+    }
+
+    if (SetEvent(ngx_stop_event) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
+                      "SetEvent(\"%s\") failed", ngx_stop_event_name);
+    }
+
+    return 1;
+}
+
+
+static ngx_int_t
+ngx_create_signal_events(ngx_cycle_t *cycle)
+{
+    ngx_sprintf((u_char *) ngx_stop_event_name,
+                "Global\\ngx_stop_%s%Z", ngx_unique);
+
+    ngx_stop_event = CreateEvent(NULL, 1, 0, ngx_stop_event_name);
+    if (ngx_stop_event == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "CreateEvent(\"%s\") failed", ngx_stop_event_name);
+        return NGX_ERROR;
+    }
+
+
+    ngx_sprintf((u_char *) ngx_quit_event_name,
+                "Global\\ngx_quit_%s%Z", ngx_unique);
+
+    ngx_quit_event = CreateEvent(NULL, 1, 0, ngx_quit_event_name);
+    if (ngx_quit_event == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "CreateEvent(\"%s\") failed", ngx_quit_event_name);
+        return NGX_ERROR;
+    }
+
+
+    ngx_sprintf((u_char *) ngx_reopen_event_name,
+                "Global\\ngx_reopen_%s%Z", ngx_unique);
+
+    ngx_reopen_event = CreateEvent(NULL, 1, 0, ngx_reopen_event_name);
+    if (ngx_reopen_event == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "CreateEvent(\"%s\") failed", ngx_reopen_event_name);
+        return NGX_ERROR;
+    }
+
+
+    ngx_sprintf((u_char *) ngx_reload_event_name,
+                "Global\\ngx_reload_%s%Z", ngx_unique);
+
+    ngx_reload_event = CreateEvent(NULL, 1, 0, ngx_reload_event_name);
+    if (ngx_reload_event == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "CreateEvent(\"%s\") failed", ngx_reload_event_name);
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t type)
+{
+    ngx_int_t         n;
+    ngx_core_conf_t  *ccf;
+
+    ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "start worker processes");
+
+    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+
+    for (n = 0; n < ccf->worker_processes; n++) {
+        if (ngx_spawn_process(cycle, "worker", type) == NGX_INVALID_PID) {
+            break;
+        }
+    }
+
+    return n;
+}
+
+
+static void
+ngx_reopen_worker_processes(ngx_cycle_t *cycle)
+{
+    ngx_int_t  n;
+
+    for (n = 0; n < ngx_last_process; n++) {
+
+        if (ngx_processes[n].handle == NULL) {
+            continue;
+        }
+
+        if (SetEvent(ngx_processes[n].reopen) == 0) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "SetEvent(\"%s\") failed",
+                          ngx_processes[n].reopen_event);
+        }
+    }
+}
+
+
+static void
+ngx_quit_worker_processes(ngx_cycle_t *cycle, ngx_uint_t old)
+{
+    ngx_int_t  n;
+
+    for (n = 0; n < ngx_last_process; n++) {
+
+        ngx_log_debug5(NGX_LOG_DEBUG_CORE, cycle->log, 0,
+                       "process: %d %P %p e:%d j:%d",
+                       n,
+                       ngx_processes[n].pid,
+                       ngx_processes[n].handle,
+                       ngx_processes[n].exiting,
+                       ngx_processes[n].just_spawn);
+
+        if (old && ngx_processes[n].just_spawn) {
+            ngx_processes[n].just_spawn = 0;
+            continue;
+        }
+
+        if (ngx_processes[n].handle == NULL) {
+            continue;
+        }
+
+        if (SetEvent(ngx_processes[n].quit) == 0) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "SetEvent(\"%s\") failed",
+                          ngx_processes[n].quit_event);
+        }
+
+        ngx_processes[n].exiting = 1;
+    }
+}
+
+
+static void
+ngx_terminate_worker_processes(ngx_cycle_t *cycle)
+{
+    ngx_int_t  n;
+
+    for (n = 0; n < ngx_last_process; n++) {
+
+        if (ngx_processes[n].handle == NULL) {
+            continue;
+        }
+
+        if (TerminateProcess(ngx_processes[n].handle, 0) == 0) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "TerminateProcess(\"%p\") failed",
+                          ngx_processes[n].handle);
+        }
+
+        ngx_processes[n].exiting = 1;
+
+        ngx_close_handle(ngx_processes[n].reopen);
+        ngx_close_handle(ngx_processes[n].quit);
+        ngx_close_handle(ngx_processes[n].term);
+        ngx_close_handle(ngx_processes[n].handle);
+    }
+}
+
+
+static ngx_uint_t
+ngx_reap_worker(ngx_cycle_t *cycle, HANDLE h)
+{
+    u_long     code;
+    ngx_int_t  n;
+
+    for (n = 0; n < ngx_last_process; n++) {
+
+        if (ngx_processes[n].handle != h) {
+            continue;
+        }
+
+        if (GetExitCodeProcess(h, &code) == 0) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "GetExitCodeProcess(%P) failed",
+                          ngx_processes[n].pid);
+        }
+
+        ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0,
+                      "%s process %P exited with code %Xl",
+                      ngx_processes[n].name, ngx_processes[n].pid, code);
+
+        ngx_close_handle(ngx_processes[n].reopen);
+        ngx_close_handle(ngx_processes[n].quit);
+        ngx_close_handle(ngx_processes[n].term);
+        ngx_close_handle(h);
+
+        ngx_processes[n].handle = NULL;
+        ngx_processes[n].term = NULL;
+        ngx_processes[n].quit = NULL;
+        ngx_processes[n].reopen = NULL;
+
+        if (!ngx_processes[n].exiting && !ngx_terminate && !ngx_quit) {
+
+            if (ngx_spawn_process(cycle, ngx_processes[n].name, n)
+                == NGX_INVALID_PID)
+            {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                              "could not respawn %s", ngx_processes[n].name);
+
+                if (n == ngx_last_process - 1) {
+                    ngx_last_process--;
+                }
+            }
+        }
+
+        goto found;
+    }
+
+    ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "unknown process handle %p", h);
+
+found:
+
+    for (n = 0; n < ngx_last_process; n++) {
+
+        ngx_log_debug5(NGX_LOG_DEBUG_CORE, cycle->log, 0,
+                       "process: %d %P %p e:%d j:%d",
+                       n,
+                       ngx_processes[n].pid,
+                       ngx_processes[n].handle,
+                       ngx_processes[n].exiting,
+                       ngx_processes[n].just_spawn);
+
+        if (ngx_processes[n].handle) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+
+static void
+ngx_master_process_exit(ngx_cycle_t *cycle)
+{
+    ngx_uint_t  i;
+
+    ngx_delete_pidfile(cycle);
+
+    ngx_close_handle(ngx_cache_manager_mutex);
+    ngx_close_handle(ngx_stop_event);
+    ngx_close_handle(ngx_quit_event);
+    ngx_close_handle(ngx_reopen_event);
+    ngx_close_handle(ngx_reload_event);
+    ngx_close_handle(ngx_master_process_event);
+
+    ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exit");
+
+    for (i = 0; cycle->modules[i]; i++) {
+        if (cycle->modules[i]->exit_master) {
+            cycle->modules[i]->exit_master(cycle);
+        }
+    }
+
+    ngx_destroy_pool(cycle->pool);
+
+    exit(0);
+}
+
+
+static void
+ngx_worker_process_cycle(ngx_cycle_t *cycle, char *mevn)
+{
+    char        wtevn[NGX_PROCESS_SYNC_NAME];
+    char        wqevn[NGX_PROCESS_SYNC_NAME];
+    char        wroevn[NGX_PROCESS_SYNC_NAME];
+    HANDLE      mev, events[3];
+    u_long      nev, ev;
+    ngx_err_t   err;
+    ngx_tid_t   wtid, cmtid, cltid;
+    ngx_log_t  *log;
+
+    log = cycle->log;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0, "worker started");
+
+    ngx_sprintf((u_char *) wtevn, "ngx_worker_term_%P%Z", ngx_pid);
+    events[0] = CreateEvent(NULL, 1, 0, wtevn);
+    if (events[0] == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      "CreateEvent(\"%s\") failed", wtevn);
+        goto failed;
+    }
+
+    ngx_sprintf((u_char *) wqevn, "ngx_worker_quit_%P%Z", ngx_pid);
+    events[1] = CreateEvent(NULL, 1, 0, wqevn);
+    if (events[1] == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      "CreateEvent(\"%s\") failed", wqevn);
+        goto failed;
+    }
+
+    ngx_sprintf((u_char *) wroevn, "ngx_worker_reopen_%P%Z", ngx_pid);
+    events[2] = CreateEvent(NULL, 1, 0, wroevn);
+    if (events[2] == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      "CreateEvent(\"%s\") failed", wroevn);
+        goto failed;
+    }
+
+    mev = OpenEvent(EVENT_MODIFY_STATE, 0, mevn);
+    if (mev == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      "OpenEvent(\"%s\") failed", mevn);
+        goto failed;
+    }
+
+    if (SetEvent(mev) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      "SetEvent(\"%s\") failed", mevn);
+        goto failed;
+    }
+
+
+    ngx_sprintf((u_char *) ngx_cache_manager_mutex_name,
+                "ngx_cache_manager_mutex_%s%Z", ngx_unique);
+
+    ngx_cache_manager_mutex = OpenMutex(SYNCHRONIZE, 0,
+                                        ngx_cache_manager_mutex_name);
+    if (ngx_cache_manager_mutex == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      "OpenMutex(\"%s\") failed", ngx_cache_manager_mutex_name);
+        goto failed;
+    }
+
+    ngx_cache_manager_event = CreateEvent(NULL, 1, 0, NULL);
+    if (ngx_cache_manager_event == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "CreateEvent(\"ngx_cache_manager_event\") failed");
+        goto failed;
+    }
+
+
+    if (ngx_create_thread(&wtid, ngx_worker_thread, NULL, log) != 0) {
+        goto failed;
+    }
+
+    if (ngx_create_thread(&cmtid, ngx_cache_manager_thread, NULL, log) != 0) {
+        goto failed;
+    }
+
+    if (ngx_create_thread(&cltid, ngx_cache_loader_thread, NULL, log) != 0) {
+        goto failed;
+    }
+
+    for ( ;; ) {
+        ev = WaitForMultipleObjects(3, events, 0, INFINITE);
+
+        err = ngx_errno;
+        ngx_time_update();
+
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
+                       "worker WaitForMultipleObjects: %ul", ev);
+
+        if (ev == WAIT_OBJECT_0) {
+            ngx_terminate = 1;
+            ngx_log_error(NGX_LOG_NOTICE, log, 0, "exiting");
+
+            if (ResetEvent(events[0]) == 0) {
+                ngx_log_error(NGX_LOG_ALERT, log, 0,
+                              "ResetEvent(\"%s\") failed", wtevn);
+            }
+
+            break;
+        }
+
+        if (ev == WAIT_OBJECT_0 + 1) {
+            ngx_quit = 1;
+            ngx_log_error(NGX_LOG_NOTICE, log, 0, "gracefully shutting down");
+            break;
+        }
+
+        if (ev == WAIT_OBJECT_0 + 2) {
+            ngx_reopen = 1;
+            ngx_log_error(NGX_LOG_NOTICE, log, 0, "reopening logs");
+
+            if (ResetEvent(events[2]) == 0) {
+                ngx_log_error(NGX_LOG_ALERT, log, 0,
+                              "ResetEvent(\"%s\") failed", wroevn);
+            }
+
+            continue;
+        }
+
+        if (ev == WAIT_FAILED) {
+            ngx_log_error(NGX_LOG_ALERT, log, err,
+                          "WaitForMultipleObjects() failed");
+
+            goto failed;
+        }
+    }
+
+    /* wait threads */
+
+    if (SetEvent(ngx_cache_manager_event) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      "SetEvent(\"ngx_cache_manager_event\") failed");
+    }
+
+    events[1] = wtid;
+    events[2] = cmtid;
+
+    nev = 3;
+
+    for ( ;; ) {
+        ev = WaitForMultipleObjects(nev, events, 0, INFINITE);
+
+        err = ngx_errno;
+        ngx_time_update();
+
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
+                       "worker exit WaitForMultipleObjects: %ul", ev);
+
+        if (ev == WAIT_OBJECT_0) {
+            break;
+        }
+
+        if (ev == WAIT_OBJECT_0 + 1) {
+            if (nev == 2) {
+                break;
+            }
+
+            events[1] = events[2];
+            nev = 2;
+            continue;
+        }
+
+        if (ev == WAIT_OBJECT_0 + 2) {
+            nev = 2;
+            continue;
+        }
+
+        if (ev == WAIT_FAILED) {
+            ngx_log_error(NGX_LOG_ALERT, log, err,
+                          "WaitForMultipleObjects() failed");
+            break;
+        }
+    }
+
+    ngx_close_handle(ngx_cache_manager_event);
+    ngx_close_handle(events[0]);
+    ngx_close_handle(events[1]);
+    ngx_close_handle(events[2]);
+    ngx_close_handle(mev);
+
+    ngx_worker_process_exit(cycle);
+
+failed:
+
+    exit(2);
+}
+
+
+static ngx_thread_value_t __stdcall
+ngx_worker_thread(void *data)
+{
+    ngx_int_t     n;
+    ngx_time_t   *tp;
+    ngx_cycle_t  *cycle;
+
+    tp = ngx_timeofday();
+    srand((ngx_pid << 16) ^ (unsigned) tp->sec ^ tp->msec);
+
+    cycle = (ngx_cycle_t *) ngx_cycle;
+
+    for (n = 0; cycle->modules[n]; n++) {
+        if (cycle->modules[n]->init_process) {
+            if (cycle->modules[n]->init_process(cycle) == NGX_ERROR) {
+                /* fatal */
+                exit(2);
+            }
+        }
+    }
+
+    while (!ngx_quit) {
+
+        if (ngx_exiting) {
+            if (ngx_event_no_timers_left() == NGX_OK) {
+                break;
+            }
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_CORE, cycle->log, 0, "worker cycle");
+
+        ngx_process_events_and_timers(cycle);
+
+        if (ngx_terminate) {
+            return 0;
+        }
+
+        if (ngx_quit) {
+            ngx_quit = 0;
+
+            if (!ngx_exiting) {
+                ngx_exiting = 1;
+                ngx_set_shutdown_timer(cycle);
+                ngx_close_listening_sockets(cycle);
+                ngx_close_idle_connections(cycle);
+                ngx_event_process_posted(cycle, &ngx_posted_events);
+            }
+        }
+
+        if (ngx_reopen) {
+            ngx_reopen = 0;
+            ngx_reopen_files(cycle, -1);
+        }
+    }
+
+    ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
+
+    return 0;
+}
+
+
+static void
+ngx_worker_process_exit(ngx_cycle_t *cycle)
+{
+    ngx_uint_t         i;
+    ngx_connection_t  *c;
+
+    ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exit");
+
+    for (i = 0; cycle->modules[i]; i++) {
+        if (cycle->modules[i]->exit_process) {
+            cycle->modules[i]->exit_process(cycle);
+        }
+    }
+
+    if (ngx_exiting) {
+        c = cycle->connections;
+        for (i = 0; i < cycle->connection_n; i++) {
+            if (c[i].fd != (ngx_socket_t) -1
+                && c[i].read
+                && !c[i].read->accept
+                && !c[i].read->channel
+                && !c[i].read->resolver)
+            {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
+                              "*%uA open socket #%d left in connection %ui",
+                              c[i].number, c[i].fd, i);
+            }
+        }
+    }
+
+    ngx_destroy_pool(cycle->pool);
+
+    exit(0);
+}
+
+
+static ngx_thread_value_t __stdcall
+ngx_cache_manager_thread(void *data)
+{
+    u_long        ev;
+    HANDLE        events[2];
+    ngx_err_t     err;
+    ngx_cycle_t  *cycle;
+
+    cycle = (ngx_cycle_t *) ngx_cycle;
+
+    events[0] = ngx_cache_manager_event;
+    events[1] = ngx_cache_manager_mutex;
+
+    for ( ;; ) {
+        ev = WaitForMultipleObjects(2, events, 0, INFINITE);
+
+        err = ngx_errno;
+        ngx_time_update();
+
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0,
+                       "cache manager WaitForMultipleObjects: %ul", ev);
+
+        if (ev == WAIT_FAILED) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, err,
+                          "WaitForMultipleObjects() failed");
+        }
+
+        /*
+         * ev == WAIT_OBJECT_0
+         * ev == WAIT_OBJECT_0 + 1
+         * ev == WAIT_ABANDONED_0 + 1
+         */
+
+        if (ngx_terminate || ngx_quit || ngx_exiting) {
+            ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
+            return 0;
+        }
+
+        break;
+    }
+
+    for ( ;; ) {
+
+        if (ngx_terminate || ngx_quit || ngx_exiting) {
+            ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
+            break;
+        }
+
+        ngx_cache_manager_process_handler();
+    }
+
+    if (ReleaseMutex(ngx_cache_manager_mutex) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "ReleaseMutex() failed");
+    }
+
+    return 0;
+}
+
+
+static void
+ngx_cache_manager_process_handler(void)
+{
+    u_long        ev;
+    ngx_uint_t    i;
+    ngx_msec_t    next, n;
+    ngx_path_t  **path;
+
+    next = 60 * 60 * 1000;
+
+    path = ngx_cycle->paths.elts;
+    for (i = 0; i < ngx_cycle->paths.nelts; i++) {
+
+        if (path[i]->manager) {
+            n = path[i]->manager(path[i]->data);
+
+            next = (n <= next) ? n : next;
+
+            ngx_time_update();
+        }
+    }
+
+    if (next == 0) {
+        next = 1;
+    }
+
+    ev = WaitForSingleObject(ngx_cache_manager_event, (u_long) next);
+
+    if (ev != WAIT_TIMEOUT) {
+
+        ngx_time_update();
+
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,
+                       "cache manager WaitForSingleObject: %ul", ev);
+    }
+}
+
+
+static ngx_thread_value_t __stdcall
+ngx_cache_loader_thread(void *data)
+{
+    ngx_uint_t     i;
+    ngx_path_t   **path;
+    ngx_cycle_t   *cycle;
+
+    ngx_msleep(60000);
+
+    cycle = (ngx_cycle_t *) ngx_cycle;
+
+    path = cycle->paths.elts;
+    for (i = 0; i < cycle->paths.nelts; i++) {
+
+        if (ngx_terminate || ngx_quit || ngx_exiting) {
+            break;
+        }
+
+        if (path[i]->loader) {
+            path[i]->loader(path[i]->data);
+            ngx_time_update();
+        }
+    }
+
+    return 0;
+}
+
+
+void
+ngx_single_process_cycle(ngx_cycle_t *cycle)
+{
+    ngx_tid_t  tid;
+
+    ngx_console_init(cycle);
+
+    if (ngx_create_signal_events(cycle) != NGX_OK) {
+        exit(2);
+    }
+
+    if (ngx_create_thread(&tid, ngx_worker_thread, NULL, cycle->log) != 0) {
+        /* fatal */
+        exit(2);
+    }
+
+    /* STUB */
+    WaitForSingleObject(ngx_stop_event, INFINITE);
+}
+
+
+ngx_int_t
+ngx_os_signal_process(ngx_cycle_t *cycle, char *sig, ngx_pid_t pid)
+{
+    HANDLE     ev;
+    ngx_int_t  rc;
+    char       evn[NGX_PROCESS_SYNC_NAME];
+
+    ngx_sprintf((u_char *) evn, "Global\\ngx_%s_%P%Z", sig, pid);
+
+    ev = OpenEvent(EVENT_MODIFY_STATE, 0, evn);
+    if (ev == NULL) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "OpenEvent(\"%s\") failed", evn);
+        return 1;
+    }
+
+    if (SetEvent(ev) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                      "SetEvent(\"%s\") failed", evn);
+        rc = 1;
+
+    } else {
+        rc = 0;
+    }
+
+    ngx_close_handle(ev);
+
+    return rc;
+}
+
+
+void
+ngx_close_handle(HANDLE h)
+{
+    if (CloseHandle(h) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_errno,
+                      "CloseHandle(%p) failed", h);
+    }
+}
diff --git a/src/os/win32/ngx_process_cycle.h b/src/os/win32/ngx_process_cycle.h
new file mode 100644
index 0000000..95d2743
--- /dev/null
+++ b/src/os/win32/ngx_process_cycle.h
@@ -0,0 +1,44 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_PROCESS_CYCLE_H_INCLUDED_
+#define _NGX_PROCESS_CYCLE_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_PROCESS_SINGLE     0
+#define NGX_PROCESS_MASTER     1
+#define NGX_PROCESS_SIGNALLER  2
+#define NGX_PROCESS_WORKER     3
+
+
+void ngx_master_process_cycle(ngx_cycle_t *cycle);
+void ngx_single_process_cycle(ngx_cycle_t *cycle);
+void ngx_close_handle(HANDLE h);
+
+
+extern ngx_uint_t      ngx_process;
+extern ngx_uint_t      ngx_worker;
+extern ngx_pid_t       ngx_pid;
+extern ngx_uint_t      ngx_exiting;
+
+extern sig_atomic_t    ngx_quit;
+extern sig_atomic_t    ngx_terminate;
+extern sig_atomic_t    ngx_reopen;
+
+extern ngx_uint_t      ngx_inherited;
+extern ngx_pid_t       ngx_new_binary;
+
+
+extern HANDLE          ngx_master_process_event;
+extern char            ngx_master_process_event_name[];
+
+
+#endif /* _NGX_PROCESS_CYCLE_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_service.c b/src/os/win32/ngx_service.c
new file mode 100644
index 0000000..835d9cf
--- /dev/null
+++ b/src/os/win32/ngx_service.c
@@ -0,0 +1,134 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+
+#define NGX_SERVICE_CONTROL_SHUTDOWN   128
+#define NGX_SERVICE_CONTROL_REOPEN     129
+
+
+SERVICE_TABLE_ENTRY st[] = {
+    { "nginx", service_main },
+    { NULL, NULL }
+};
+
+
+ngx_int_t
+ngx_service(ngx_log_t *log)
+{
+    /* primary thread */
+
+    /* StartServiceCtrlDispatcher() should be called within 30 seconds */
+
+    if (StartServiceCtrlDispatcher(st) == 0) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                      "StartServiceCtrlDispatcher() failed");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+void
+service_main(u_int argc, char **argv)
+{
+    SERVICE_STATUS         status;
+    SERVICE_STATUS_HANDLE  service;
+
+    /* thread spawned by SCM */
+
+    service = RegisterServiceCtrlHandlerEx("nginx", service_handler, ctx);
+    if (service == INVALID_HANDLE_VALUE) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                      "RegisterServiceCtrlHandlerEx() failed");
+        return;
+    }
+
+    status.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
+    status.dwCurrentState = SERVICE_START_PENDING;
+    status.dwControlsAccepted = SERVICE_ACCEPT_STOP
+                                |SERVICE_ACCEPT_PARAMCHANGE;
+    status.dwWin32ExitCode = NO_ERROR;
+    status.dwServiceSpecificExitCode = 0;
+    status.dwCheckPoint = 1;
+    status.dwWaitHint = 2000;
+
+    /* SetServiceStatus() should be called within 80 seconds */
+
+    if (SetServiceStatus(service, &status) == 0) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                      "SetServiceStatus() failed");
+        return;
+    }
+
+    /* init */
+
+    status.dwCurrentState = SERVICE_RUNNING;
+    status.dwCheckPoint = 0;
+    status.dwWaitHint = 0;
+
+    if (SetServiceStatus(service, &status) == 0) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                      "SetServiceStatus() failed");
+        return;
+    }
+
+    /* call master or worker loop */
+
+    /*
+     * master should use event notification and look status
+     * single should use iocp to get notifications from service handler
+     */
+
+}
+
+
+u_int
+service_handler(u_int control, u_int type, void *data, void *ctx)
+{
+    /* primary thread */
+
+    switch (control) {
+
+    case SERVICE_CONTROL_INTERROGATE:
+        status = NGX_IOCP_INTERROGATE;
+        break;
+
+    case SERVICE_CONTROL_STOP:
+        status = NGX_IOCP_STOP;
+        break;
+
+    case SERVICE_CONTROL_PARAMCHANGE:
+        status = NGX_IOCP_RECONFIGURE;
+        break;
+
+    case NGX_SERVICE_CONTROL_SHUTDOWN:
+        status = NGX_IOCP_REOPEN;
+        break;
+
+    case NGX_SERVICE_CONTROL_REOPEN:
+        status = NGX_IOCP_REOPEN;
+        break;
+
+    default:
+        return ERROR_CALL_NOT_IMPLEMENTED;
+    }
+
+    if (ngx_single) {
+        if (PostQueuedCompletionStatus(iocp, ... status, ...) == 0) {
+            err = ngx_errno;
+            ngx_log_error(NGX_LOG_ALERT, log, err,
+                          "PostQueuedCompletionStatus() failed");
+            return err;
+        }
+
+    } else {
+        Event
+    }
+
+    return NO_ERROR;
+}
diff --git a/src/os/win32/ngx_shmem.c b/src/os/win32/ngx_shmem.c
new file mode 100644
index 0000000..c3ed699
--- /dev/null
+++ b/src/os/win32/ngx_shmem.c
@@ -0,0 +1,161 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+/*
+ * Base addresses selected by system for shared memory mappings are likely
+ * to be different on Windows Vista and later versions due to address space
+ * layout randomization.  This is however incompatible with storing absolute
+ * addresses within the shared memory.
+ *
+ * To make it possible to store absolute addresses we create mappings
+ * at the same address in all processes by starting mappings at predefined
+ * addresses.  The addresses were selected somewhat randomly in order to
+ * minimize the probability that some other library doing something similar
+ * conflicts with us.  The addresses are from the following typically free
+ * blocks:
+ *
+ * - 0x10000000 .. 0x70000000 (about 1.5 GB in total) on 32-bit platforms
+ * - 0x000000007fff0000 .. 0x000007f68e8b0000 (about 8 TB) on 64-bit platforms
+ *
+ * Additionally, we allow to change the mapping address once it was detected
+ * to be different from one originally used.  This is needed to support
+ * reconfiguration.
+ */
+
+
+#ifdef _WIN64
+#define NGX_SHMEM_BASE  0x0000047047e00000
+#else
+#define NGX_SHMEM_BASE  0x2efe0000
+#endif
+
+
+ngx_uint_t  ngx_allocation_granularity;
+
+
+ngx_int_t
+ngx_shm_alloc(ngx_shm_t *shm)
+{
+    u_char         *name;
+    uint64_t        size;
+    static u_char  *base = (u_char *) NGX_SHMEM_BASE;
+
+    name = ngx_alloc(shm->name.len + 2 + NGX_INT32_LEN, shm->log);
+    if (name == NULL) {
+        return NGX_ERROR;
+    }
+
+    (void) ngx_sprintf(name, "%V_%s%Z", &shm->name, ngx_unique);
+
+    ngx_set_errno(0);
+
+    size = shm->size;
+
+    shm->handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
+                                    (u_long) (size >> 32),
+                                    (u_long) (size & 0xffffffff),
+                                    (char *) name);
+
+    if (shm->handle == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "CreateFileMapping(%uz, %s) failed",
+                      shm->size, name);
+        ngx_free(name);
+
+        return NGX_ERROR;
+    }
+
+    ngx_free(name);
+
+    if (ngx_errno == ERROR_ALREADY_EXISTS) {
+        shm->exists = 1;
+    }
+
+    shm->addr = MapViewOfFileEx(shm->handle, FILE_MAP_WRITE, 0, 0, 0, base);
+
+    if (shm->addr != NULL) {
+        base += ngx_align(size, ngx_allocation_granularity);
+        return NGX_OK;
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_CORE, shm->log, ngx_errno,
+                   "MapViewOfFileEx(%uz, %p) of file mapping \"%V\" failed, "
+                   "retry without a base address",
+                   shm->size, base, &shm->name);
+
+    /*
+     * Order of shared memory zones may be different in the master process
+     * and worker processes after reconfiguration.  As a result, the above
+     * may fail due to a conflict with a previously created mapping remapped
+     * to a different address.  Additionally, there may be a conflict with
+     * some other uses of the memory.  In this case we retry without a base
+     * address to let the system assign the address itself.
+     */
+
+    shm->addr = MapViewOfFile(shm->handle, FILE_MAP_WRITE, 0, 0, 0);
+
+    if (shm->addr != NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                  "MapViewOfFile(%uz) of file mapping \"%V\" failed",
+                  shm->size, &shm->name);
+
+    if (CloseHandle(shm->handle) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "CloseHandle() of file mapping \"%V\" failed",
+                      &shm->name);
+    }
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_shm_remap(ngx_shm_t *shm, u_char *addr)
+{
+    if (UnmapViewOfFile(shm->addr) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "UnmapViewOfFile(%p) of file mapping \"%V\" failed",
+                      shm->addr, &shm->name);
+        return NGX_ERROR;
+    }
+
+    shm->addr = MapViewOfFileEx(shm->handle, FILE_MAP_WRITE, 0, 0, 0, addr);
+
+    if (shm->addr != NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                  "MapViewOfFileEx(%uz, %p) of file mapping \"%V\" failed",
+                  shm->size, addr, &shm->name);
+
+    return NGX_ERROR;
+}
+
+
+void
+ngx_shm_free(ngx_shm_t *shm)
+{
+    if (UnmapViewOfFile(shm->addr) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "UnmapViewOfFile(%p) of file mapping \"%V\" failed",
+                      shm->addr, &shm->name);
+    }
+
+    if (CloseHandle(shm->handle) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "CloseHandle() of file mapping \"%V\" failed",
+                      &shm->name);
+    }
+}
diff --git a/src/os/win32/ngx_shmem.h b/src/os/win32/ngx_shmem.h
new file mode 100644
index 0000000..ee47429
--- /dev/null
+++ b/src/os/win32/ngx_shmem.h
@@ -0,0 +1,33 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_SHMEM_H_INCLUDED_
+#define _NGX_SHMEM_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+typedef struct {
+    u_char      *addr;
+    size_t       size;
+    ngx_str_t    name;
+    HANDLE       handle;
+    ngx_log_t   *log;
+    ngx_uint_t   exists;   /* unsigned  exists:1;  */
+} ngx_shm_t;
+
+
+ngx_int_t ngx_shm_alloc(ngx_shm_t *shm);
+ngx_int_t ngx_shm_remap(ngx_shm_t *shm, u_char *addr);
+void ngx_shm_free(ngx_shm_t *shm);
+
+extern ngx_uint_t  ngx_allocation_granularity;
+
+
+#endif /* _NGX_SHMEM_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_socket.c b/src/os/win32/ngx_socket.c
new file mode 100644
index 0000000..b1b4afb
--- /dev/null
+++ b/src/os/win32/ngx_socket.c
@@ -0,0 +1,49 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+int
+ngx_nonblocking(ngx_socket_t s)
+{
+    unsigned long  nb = 1;
+
+    return ioctlsocket(s, FIONBIO, &nb);
+}
+
+
+int
+ngx_blocking(ngx_socket_t s)
+{
+    unsigned long  nb = 0;
+
+    return ioctlsocket(s, FIONBIO, &nb);
+}
+
+
+int
+ngx_socket_nread(ngx_socket_t s, int *n)
+{
+    unsigned long  nread;
+
+    if (ioctlsocket(s, FIONREAD, &nread) == -1) {
+        return -1;
+    }
+
+    *n = nread;
+
+    return 0;
+}
+
+
+int
+ngx_tcp_push(ngx_socket_t s)
+{
+    return 0;
+}
diff --git a/src/os/win32/ngx_socket.h b/src/os/win32/ngx_socket.h
new file mode 100644
index 0000000..ab56bc8
--- /dev/null
+++ b/src/os/win32/ngx_socket.h
@@ -0,0 +1,253 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_SOCKET_H_INCLUDED_
+#define _NGX_SOCKET_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_WRITE_SHUTDOWN SD_SEND
+
+
+typedef SOCKET  ngx_socket_t;
+typedef int     socklen_t;
+
+
+#define ngx_socket(af, type, proto)                                          \
+    WSASocketW(af, type, proto, NULL, 0, WSA_FLAG_OVERLAPPED)
+
+#define ngx_socket_n        "WSASocketW()"
+
+int ngx_nonblocking(ngx_socket_t s);
+int ngx_blocking(ngx_socket_t s);
+
+#define ngx_nonblocking_n   "ioctlsocket(FIONBIO)"
+#define ngx_blocking_n      "ioctlsocket(!FIONBIO)"
+
+int ngx_socket_nread(ngx_socket_t s, int *n);
+#define ngx_socket_nread_n  "ioctlsocket(FIONREAD)"
+
+#define ngx_shutdown_socket    shutdown
+#define ngx_shutdown_socket_n  "shutdown()"
+
+#define ngx_close_socket    closesocket
+#define ngx_close_socket_n  "closesocket()"
+
+
+#ifndef WSAID_ACCEPTEX
+
+typedef BOOL (PASCAL FAR * LPFN_ACCEPTEX)(
+    IN SOCKET sListenSocket,
+    IN SOCKET sAcceptSocket,
+    IN PVOID lpOutputBuffer,
+    IN DWORD dwReceiveDataLength,
+    IN DWORD dwLocalAddressLength,
+    IN DWORD dwRemoteAddressLength,
+    OUT LPDWORD lpdwBytesReceived,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+#define WSAID_ACCEPTEX                                                       \
+    {0xb5367df1,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
+
+#endif
+
+
+#ifndef WSAID_GETACCEPTEXSOCKADDRS
+
+typedef VOID (PASCAL FAR * LPFN_GETACCEPTEXSOCKADDRS)(
+    IN PVOID lpOutputBuffer,
+    IN DWORD dwReceiveDataLength,
+    IN DWORD dwLocalAddressLength,
+    IN DWORD dwRemoteAddressLength,
+    OUT struct sockaddr **LocalSockaddr,
+    OUT LPINT LocalSockaddrLength,
+    OUT struct sockaddr **RemoteSockaddr,
+    OUT LPINT RemoteSockaddrLength
+    );
+
+#define WSAID_GETACCEPTEXSOCKADDRS                                           \
+        {0xb5367df2,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
+
+#endif
+
+
+#ifndef WSAID_TRANSMITFILE
+
+#ifndef TF_DISCONNECT
+
+#define TF_DISCONNECT           1
+#define TF_REUSE_SOCKET         2
+#define TF_WRITE_BEHIND         4
+#define TF_USE_DEFAULT_WORKER   0
+#define TF_USE_SYSTEM_THREAD    16
+#define TF_USE_KERNEL_APC       32
+
+typedef struct _TRANSMIT_FILE_BUFFERS {
+    LPVOID Head;
+    DWORD HeadLength;
+    LPVOID Tail;
+    DWORD TailLength;
+} TRANSMIT_FILE_BUFFERS, *PTRANSMIT_FILE_BUFFERS, FAR *LPTRANSMIT_FILE_BUFFERS;
+
+#endif
+
+typedef BOOL (PASCAL FAR * LPFN_TRANSMITFILE)(
+    IN SOCKET hSocket,
+    IN HANDLE hFile,
+    IN DWORD nNumberOfBytesToWrite,
+    IN DWORD nNumberOfBytesPerSend,
+    IN LPOVERLAPPED lpOverlapped,
+    IN LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,
+    IN DWORD dwReserved
+    );
+
+#define WSAID_TRANSMITFILE                                                   \
+    {0xb5367df0,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
+
+#endif
+
+
+#ifndef WSAID_TRANSMITPACKETS
+
+/* OpenWatcom has a swapped TP_ELEMENT_FILE and TP_ELEMENT_MEMORY definition */
+
+#ifndef TP_ELEMENT_FILE
+
+#ifdef _MSC_VER
+#pragma warning(disable:4201) /* Nonstandard extension, nameless struct/union */
+#endif
+
+typedef struct _TRANSMIT_PACKETS_ELEMENT {
+    ULONG dwElFlags;
+#define TP_ELEMENT_MEMORY   1
+#define TP_ELEMENT_FILE     2
+#define TP_ELEMENT_EOP      4
+    ULONG cLength;
+    union {
+        struct {
+            LARGE_INTEGER nFileOffset;
+            HANDLE        hFile;
+        };
+        PVOID             pBuffer;
+    };
+} TRANSMIT_PACKETS_ELEMENT, *PTRANSMIT_PACKETS_ELEMENT,
+    FAR *LPTRANSMIT_PACKETS_ELEMENT;
+
+#ifdef _MSC_VER
+#pragma warning(default:4201)
+#endif
+
+#endif
+
+typedef BOOL (PASCAL FAR * LPFN_TRANSMITPACKETS) (
+    SOCKET hSocket,
+    TRANSMIT_PACKETS_ELEMENT *lpPacketArray,
+    DWORD nElementCount,
+    DWORD nSendSize,
+    LPOVERLAPPED lpOverlapped,
+    DWORD dwFlags
+    );
+
+#define WSAID_TRANSMITPACKETS                                                \
+    {0xd9689da0,0x1f90,0x11d3,{0x99,0x71,0x00,0xc0,0x4f,0x68,0xc8,0x76}}
+
+#endif
+
+
+#ifndef WSAID_CONNECTEX
+
+typedef BOOL (PASCAL FAR * LPFN_CONNECTEX) (
+    IN SOCKET s,
+    IN const struct sockaddr FAR *name,
+    IN int namelen,
+    IN PVOID lpSendBuffer OPTIONAL,
+    IN DWORD dwSendDataLength,
+    OUT LPDWORD lpdwBytesSent,
+    IN LPOVERLAPPED lpOverlapped
+    );
+
+#define WSAID_CONNECTEX \
+    {0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}}
+
+#endif
+
+
+#ifndef WSAID_DISCONNECTEX
+
+typedef BOOL (PASCAL FAR * LPFN_DISCONNECTEX) (
+    IN SOCKET s,
+    IN LPOVERLAPPED lpOverlapped,
+    IN DWORD  dwFlags,
+    IN DWORD  dwReserved
+    );
+
+#define WSAID_DISCONNECTEX                                                   \
+    {0x7fda2e11,0x8630,0x436f,{0xa0,0x31,0xf5,0x36,0xa6,0xee,0xc1,0x57}}
+
+#endif
+
+
+extern LPFN_ACCEPTEX              ngx_acceptex;
+extern LPFN_GETACCEPTEXSOCKADDRS  ngx_getacceptexsockaddrs;
+extern LPFN_TRANSMITFILE          ngx_transmitfile;
+extern LPFN_TRANSMITPACKETS       ngx_transmitpackets;
+extern LPFN_CONNECTEX             ngx_connectex;
+extern LPFN_DISCONNECTEX          ngx_disconnectex;
+
+
+#if (NGX_HAVE_POLL && !defined POLLIN)
+
+/*
+ * WSAPoll() is only available if _WIN32_WINNT >= 0x0600.
+ * If it is not available during compilation, we try to
+ * load it dynamically at runtime.
+ */
+
+#define NGX_LOAD_WSAPOLL 1
+
+#define POLLRDNORM  0x0100
+#define POLLRDBAND  0x0200
+#define POLLIN      (POLLRDNORM | POLLRDBAND)
+#define POLLPRI     0x0400
+
+#define POLLWRNORM  0x0010
+#define POLLOUT     (POLLWRNORM)
+#define POLLWRBAND  0x0020
+
+#define POLLERR     0x0001
+#define POLLHUP     0x0002
+#define POLLNVAL    0x0004
+
+typedef struct pollfd {
+
+    SOCKET  fd;
+    SHORT   events;
+    SHORT   revents;
+
+} WSAPOLLFD, *PWSAPOLLFD, FAR *LPWSAPOLLFD;
+
+typedef int (WSAAPI *ngx_wsapoll_pt)(
+    LPWSAPOLLFD fdArray,
+    ULONG fds,
+    INT timeout
+    );
+
+extern ngx_wsapoll_pt             WSAPoll;
+extern ngx_uint_t                 ngx_have_wsapoll;
+
+#endif
+
+
+int ngx_tcp_push(ngx_socket_t s);
+#define ngx_tcp_push_n            "tcp_push()"
+
+
+#endif /* _NGX_SOCKET_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_stat.c b/src/os/win32/ngx_stat.c
new file mode 100644
index 0000000..51bcd96
--- /dev/null
+++ b/src/os/win32/ngx_stat.c
@@ -0,0 +1,34 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+int ngx_file_type(char *file, ngx_file_info_t *sb)
+{
+    sb->dwFileAttributes = GetFileAttributes(file);
+
+    if (sb->dwFileAttributes == INVALID_FILE_ATTRIBUTES) {
+        return -1;
+    }
+
+    return 0;
+}
+
+/*
+int ngx_stat(char *file, ngx_stat_t *sb)
+{
+    *sb = GetFileAttributes(file);
+
+    if (*sb == INVALID_FILE_ATTRIBUTES) {
+        return -1;
+    }
+
+    return 0;
+}
+*/
diff --git a/src/os/win32/ngx_thread.c b/src/os/win32/ngx_thread.c
new file mode 100644
index 0000000..a13de2d
--- /dev/null
+++ b/src/os/win32/ngx_thread.c
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+ngx_err_t
+ngx_create_thread(ngx_tid_t *tid,
+    ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log)
+{
+    u_long     id;
+    ngx_err_t  err;
+
+    *tid = CreateThread(NULL, 0, func, arg, 0, &id);
+
+    if (*tid != NULL) {
+        ngx_log_error(NGX_LOG_NOTICE, log, 0,
+                      "create thread " NGX_TID_T_FMT, id);
+        return 0;
+    }
+
+    err = ngx_errno;
+    ngx_log_error(NGX_LOG_ALERT, log, err, "CreateThread() failed");
+    return err;
+}
diff --git a/src/os/win32/ngx_thread.h b/src/os/win32/ngx_thread.h
new file mode 100644
index 0000000..4012276
--- /dev/null
+++ b/src/os/win32/ngx_thread.h
@@ -0,0 +1,27 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_THREAD_H_INCLUDED_
+#define _NGX_THREAD_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+typedef HANDLE  ngx_tid_t;
+typedef DWORD   ngx_thread_value_t;
+
+
+ngx_err_t ngx_create_thread(ngx_tid_t *tid,
+    ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log);
+
+#define ngx_log_tid                 GetCurrentThreadId()
+#define NGX_TID_T_FMT               "%ud"
+
+
+#endif /* _NGX_THREAD_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_time.c b/src/os/win32/ngx_time.c
new file mode 100644
index 0000000..79149b2
--- /dev/null
+++ b/src/os/win32/ngx_time.c
@@ -0,0 +1,83 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+void
+ngx_gettimeofday(struct timeval *tp)
+{
+    uint64_t  intervals;
+    FILETIME  ft;
+
+    GetSystemTimeAsFileTime(&ft);
+
+    /*
+     * A file time is a 64-bit value that represents the number
+     * of 100-nanosecond intervals that have elapsed since
+     * January 1, 1601 12:00 A.M. UTC.
+     *
+     * Between January 1, 1970 (Epoch) and January 1, 1601 there were
+     * 134774 days,
+     * 11644473600 seconds or
+     * 11644473600,000,000,0 100-nanosecond intervals.
+     *
+     * See also MSKB Q167296.
+     */
+
+    intervals = ((uint64_t) ft.dwHighDateTime << 32) | ft.dwLowDateTime;
+    intervals -= 116444736000000000;
+
+    tp->tv_sec = (long) (intervals / 10000000);
+    tp->tv_usec = (long) ((intervals % 10000000) / 10);
+}
+
+
+void
+ngx_libc_localtime(time_t s, struct tm *tm)
+{
+    struct tm  *t;
+
+    t = localtime(&s);
+    *tm = *t;
+}
+
+
+void
+ngx_libc_gmtime(time_t s, struct tm *tm)
+{
+    struct tm  *t;
+
+    t = gmtime(&s);
+    *tm = *t;
+}
+
+
+ngx_int_t
+ngx_gettimezone(void)
+{
+    u_long                 n;
+    TIME_ZONE_INFORMATION  tz;
+
+    n = GetTimeZoneInformation(&tz);
+
+    switch (n) {
+
+    case TIME_ZONE_ID_UNKNOWN:
+        return -tz.Bias;
+
+    case TIME_ZONE_ID_STANDARD:
+        return -(tz.Bias + tz.StandardBias);
+
+    case TIME_ZONE_ID_DAYLIGHT:
+        return -(tz.Bias + tz.DaylightBias);
+
+    default: /* TIME_ZONE_ID_INVALID */
+        return 0;
+    }
+}
diff --git a/src/os/win32/ngx_time.h b/src/os/win32/ngx_time.h
new file mode 100644
index 0000000..6c2f806
--- /dev/null
+++ b/src/os/win32/ngx_time.h
@@ -0,0 +1,51 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_TIME_H_INCLUDED_
+#define _NGX_TIME_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+typedef ngx_rbtree_key_t      ngx_msec_t;
+typedef ngx_rbtree_key_int_t  ngx_msec_int_t;
+
+typedef SYSTEMTIME            ngx_tm_t;
+typedef FILETIME              ngx_mtime_t;
+
+#define ngx_tm_sec            wSecond
+#define ngx_tm_min            wMinute
+#define ngx_tm_hour           wHour
+#define ngx_tm_mday           wDay
+#define ngx_tm_mon            wMonth
+#define ngx_tm_year           wYear
+#define ngx_tm_wday           wDayOfWeek
+
+#define ngx_tm_sec_t          u_short
+#define ngx_tm_min_t          u_short
+#define ngx_tm_hour_t         u_short
+#define ngx_tm_mday_t         u_short
+#define ngx_tm_mon_t          u_short
+#define ngx_tm_year_t         u_short
+#define ngx_tm_wday_t         u_short
+
+
+#define ngx_msleep            Sleep
+
+#define NGX_HAVE_GETTIMEZONE  1
+
+#define  ngx_timezone_update()
+
+ngx_int_t ngx_gettimezone(void);
+void ngx_libc_localtime(time_t s, struct tm *tm);
+void ngx_libc_gmtime(time_t s, struct tm *tm);
+void ngx_gettimeofday(struct timeval *tp);
+
+
+#endif /* _NGX_TIME_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_udp_wsarecv.c b/src/os/win32/ngx_udp_wsarecv.c
new file mode 100644
index 0000000..5424375
--- /dev/null
+++ b/src/os/win32/ngx_udp_wsarecv.c
@@ -0,0 +1,149 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+ssize_t
+ngx_udp_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    int           rc;
+    u_long        bytes, flags;
+    WSABUF        wsabuf[1];
+    ngx_err_t     err;
+    ngx_event_t  *rev;
+
+    wsabuf[0].buf = (char *) buf;
+    wsabuf[0].len = size;
+    flags = 0;
+    bytes = 0;
+
+    rc = WSARecv(c->fd, wsabuf, 1, &bytes, &flags, NULL, NULL);
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "WSARecv: fd:%d rc:%d %ul of %z", c->fd, rc, bytes, size);
+
+    rev = c->read;
+
+    if (rc == -1) {
+        rev->ready = 0;
+        err = ngx_socket_errno;
+
+        if (err == WSAEWOULDBLOCK) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "WSARecv() not ready");
+            return NGX_AGAIN;
+        }
+
+        rev->error = 1;
+        ngx_connection_error(c, err, "WSARecv() failed");
+
+        return NGX_ERROR;
+    }
+
+    return bytes;
+}
+
+
+ssize_t
+ngx_udp_overlapped_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    int               rc;
+    u_long            bytes, flags;
+    WSABUF            wsabuf[1];
+    ngx_err_t         err;
+    ngx_event_t      *rev;
+    LPWSAOVERLAPPED   ovlp;
+
+    rev = c->read;
+
+    if (!rev->ready) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0, "second wsa post");
+        return NGX_AGAIN;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "rev->complete: %d", rev->complete);
+
+    if (rev->complete) {
+        rev->complete = 0;
+
+        if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
+            if (rev->ovlp.error) {
+                ngx_connection_error(c, rev->ovlp.error, "WSARecv() failed");
+                return NGX_ERROR;
+            }
+
+            ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "WSARecv ovlp: fd:%d %ul of %z",
+                           c->fd, rev->available, size);
+
+            return rev->available;
+        }
+
+        if (WSAGetOverlappedResult(c->fd, (LPWSAOVERLAPPED) &rev->ovlp,
+                                   &bytes, 0, NULL)
+            == 0)
+        {
+            ngx_connection_error(c, ngx_socket_errno,
+                               "WSARecv() or WSAGetOverlappedResult() failed");
+            return NGX_ERROR;
+        }
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "WSARecv: fd:%d %ul of %z", c->fd, bytes, size);
+
+        return bytes;
+    }
+
+    ovlp = (LPWSAOVERLAPPED) &rev->ovlp;
+    ngx_memzero(ovlp, sizeof(WSAOVERLAPPED));
+    wsabuf[0].buf = (char *) buf;
+    wsabuf[0].len = size;
+    flags = 0;
+    bytes = 0;
+
+    rc = WSARecv(c->fd, wsabuf, 1, &bytes, &flags, ovlp, NULL);
+
+    rev->complete = 0;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "WSARecv ovlp: fd:%d rc:%d %ul of %z",
+                   c->fd, rc, bytes, size);
+
+    if (rc == -1) {
+        err = ngx_socket_errno;
+        if (err == WSA_IO_PENDING) {
+            rev->active = 1;
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "WSARecv() posted");
+            return NGX_AGAIN;
+        }
+
+        rev->error = 1;
+        ngx_connection_error(c, err, "WSARecv() failed");
+        return NGX_ERROR;
+    }
+
+    if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
+
+        /*
+         * if a socket was bound with I/O completion port
+         * then GetQueuedCompletionStatus() would anyway return its status
+         * despite that WSARecv() was already complete
+         */
+
+        rev->active = 1;
+        return NGX_AGAIN;
+    }
+
+    rev->active = 0;
+
+    return bytes;
+}
diff --git a/src/os/win32/ngx_user.c b/src/os/win32/ngx_user.c
new file mode 100644
index 0000000..ea6da5a
--- /dev/null
+++ b/src/os/win32/ngx_user.c
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#if (NGX_CRYPT)
+
+ngx_int_t
+ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
+{
+    /* STUB: a plain text password */
+
+    *encrypted = key;
+
+    return NGX_OK;
+}
+
+#endif /* NGX_CRYPT */
diff --git a/src/os/win32/ngx_user.h b/src/os/win32/ngx_user.h
new file mode 100644
index 0000000..61408e4
--- /dev/null
+++ b/src/os/win32/ngx_user.h
@@ -0,0 +1,25 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_USER_H_INCLUDED_
+#define _NGX_USER_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+/* STUB */
+#define ngx_uid_t  ngx_int_t
+#define ngx_gid_t  ngx_int_t
+
+
+ngx_int_t ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt,
+    u_char **encrypted);
+
+
+#endif /* _NGX_USER_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
new file mode 100644
index 0000000..406003a
--- /dev/null
+++ b/src/os/win32/ngx_win32_config.h
@@ -0,0 +1,287 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_WIN32_CONFIG_H_INCLUDED_
+#define _NGX_WIN32_CONFIG_H_INCLUDED_
+
+
+#undef  WIN32
+#define WIN32         0x0400
+#define _WIN32_WINNT  0x0501
+
+
+#define STRICT
+#define WIN32_LEAN_AND_MEAN
+
+/* enable getenv() and gmtime() in msvc8 */
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_DEPRECATE
+
+/* enable gethostbyname() in msvc2015 */
+#if !(NGX_HAVE_INET6)
+#define _WINSOCK_DEPRECATED_NO_WARNINGS
+#endif
+
+/*
+ * we need to include <windows.h> explicitly before <winsock2.h> because
+ * the warning 4201 is enabled in <windows.h>
+ */
+#include <windows.h>
+
+#ifdef _MSC_VER
+#pragma warning(disable:4201)
+#endif
+
+#include <winsock2.h>
+#include <ws2tcpip.h>  /* ipv6 */
+#include <mswsock.h>
+#include <shellapi.h>
+#include <stddef.h>    /* offsetof() */
+
+#ifdef __MINGW64_VERSION_MAJOR
+
+/* GCC MinGW-w64 supports _FILE_OFFSET_BITS */
+#define _FILE_OFFSET_BITS 64
+
+#elif defined __GNUC__
+
+/* GCC MinGW's stdio.h includes sys/types.h */
+#define _OFF_T_
+#define __have_typedef_off_t
+
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#ifdef __GNUC__
+#include <stdint.h>
+#endif
+#include <ctype.h>
+#include <locale.h>
+
+#ifdef __WATCOMC__
+#define _TIME_T_DEFINED
+typedef long  time_t;
+/* OpenWatcom defines time_t as "unsigned long" */
+#endif
+
+#include <time.h>      /* localtime(), strftime() */
+
+
+#ifdef _MSC_VER
+
+/* the end of the precompiled headers */
+#pragma hdrstop
+
+#pragma warning(default:4201)
+
+/* 'type cast': from function pointer to data pointer */
+#pragma warning(disable:4054)
+
+/* 'type cast': from data pointer to function pointer */
+#pragma warning(disable:4055)
+
+/* 'function' : different 'const' qualifiers */
+#pragma warning(disable:4090)
+
+/* unreferenced formal parameter */
+#pragma warning(disable:4100)
+
+/* FD_SET() and FD_CLR(): conditional expression is constant */
+#pragma warning(disable:4127)
+
+/* conversion from 'type1' to 'type2', possible loss of data */
+#pragma warning(disable:4244)
+
+/* conversion from 'size_t' to 'type', possible loss of data */
+#pragma warning(disable:4267)
+
+/* array is too small to include a terminating null character */
+#pragma warning(disable:4295)
+
+/* conversion from 'type1' to 'type2' of greater size */
+#pragma warning(disable:4306)
+
+#endif
+
+
+#ifdef __WATCOMC__
+
+/* symbol 'ngx_rbtree_min' has been defined, but not referenced */
+#pragma disable_message(202)
+
+#endif
+
+
+#ifdef __BORLANDC__
+
+/* the end of the precompiled headers */
+#pragma hdrstop
+
+/* functions containing (for|while|some if) are not expanded inline */
+#pragma warn -8027
+
+/* unreferenced formal parameter */
+#pragma warn -8057
+
+/* suspicious pointer arithmetic */
+#pragma warn -8072
+
+#endif
+
+
+#include <ngx_auto_config.h>
+
+
+#define ngx_inline          __inline
+#define ngx_cdecl           __cdecl
+
+
+#ifdef _MSC_VER
+typedef unsigned __int32    uint32_t;
+typedef __int32             int32_t;
+typedef unsigned __int16    uint16_t;
+#define ngx_libc_cdecl      __cdecl
+
+#elif defined __BORLANDC__
+typedef unsigned __int32    uint32_t;
+typedef __int32             int32_t;
+typedef unsigned __int16    uint16_t;
+#define ngx_libc_cdecl      __cdecl
+
+#else /* __WATCOMC__ */
+typedef unsigned int        uint32_t;
+typedef int                 int32_t;
+typedef unsigned short int  uint16_t;
+#define ngx_libc_cdecl
+
+#endif
+
+typedef __int64             int64_t;
+typedef unsigned __int64    uint64_t;
+
+#if __BORLANDC__
+typedef int                 intptr_t;
+typedef u_int               uintptr_t;
+#endif
+
+
+#ifndef __MINGW64_VERSION_MAJOR
+
+/* Windows defines off_t as long, which is 32-bit */
+typedef __int64             off_t;
+#define _OFF_T_DEFINED
+
+#endif
+
+
+#ifdef __WATCOMC__
+
+/* off_t is redefined by sys/types.h used by zlib.h */
+#define __TYPES_H_INCLUDED
+typedef int                 dev_t;
+typedef unsigned int        ino_t;
+
+#elif __BORLANDC__
+
+/* off_t is redefined by sys/types.h used by zlib.h */
+#define __TYPES_H
+
+typedef int                 dev_t;
+typedef unsigned int        ino_t;
+
+#endif
+
+
+#ifndef __GNUC__
+#ifdef _WIN64
+typedef __int64             ssize_t;
+#else
+typedef int                 ssize_t;
+#endif
+#endif
+
+
+typedef uint32_t            in_addr_t;
+typedef u_short             in_port_t;
+typedef int                 sig_atomic_t;
+
+
+#ifdef _WIN64
+
+#define NGX_PTR_SIZE            8
+#define NGX_SIZE_T_LEN          (sizeof("-9223372036854775808") - 1)
+#define NGX_MAX_SIZE_T_VALUE    9223372036854775807
+#define NGX_TIME_T_LEN          (sizeof("-9223372036854775808") - 1)
+#define NGX_TIME_T_SIZE         8
+#define NGX_MAX_TIME_T_VALUE    9223372036854775807
+
+#else
+
+#define NGX_PTR_SIZE            4
+#define NGX_SIZE_T_LEN          (sizeof("-2147483648") - 1)
+#define NGX_MAX_SIZE_T_VALUE    2147483647
+#define NGX_TIME_T_LEN          (sizeof("-2147483648") - 1)
+#define NGX_TIME_T_SIZE         4
+#define NGX_MAX_TIME_T_VALUE    2147483647
+
+#endif
+
+
+#define NGX_OFF_T_LEN           (sizeof("-9223372036854775807") - 1)
+#define NGX_MAX_OFF_T_VALUE     9223372036854775807
+#define NGX_SIG_ATOMIC_T_SIZE   4
+
+
+#define NGX_HAVE_LITTLE_ENDIAN  1
+#define NGX_HAVE_NONALIGNED     1
+
+
+#define NGX_WIN_NT        200000
+
+
+#define NGX_LISTEN_BACKLOG           511
+
+
+#ifndef NGX_HAVE_INHERITED_NONBLOCK
+#define NGX_HAVE_INHERITED_NONBLOCK  1
+#endif
+
+#ifndef NGX_HAVE_CASELESS_FILESYSTEM
+#define NGX_HAVE_CASELESS_FILESYSTEM  1
+#endif
+
+#ifndef NGX_HAVE_WIN32_TRANSMITPACKETS
+#define NGX_HAVE_WIN32_TRANSMITPACKETS  1
+#define NGX_HAVE_WIN32_TRANSMITFILE     0
+#endif
+
+#ifndef NGX_HAVE_WIN32_TRANSMITFILE
+#define NGX_HAVE_WIN32_TRANSMITFILE  1
+#endif
+
+#if (NGX_HAVE_WIN32_TRANSMITPACKETS) || (NGX_HAVE_WIN32_TRANSMITFILE)
+#define NGX_HAVE_SENDFILE  1
+#endif
+
+#ifndef NGX_HAVE_SO_SNDLOWAT
+/* setsockopt(SO_SNDLOWAT) returns error WSAENOPROTOOPT */
+#define NGX_HAVE_SO_SNDLOWAT         0
+#endif
+
+#ifndef NGX_HAVE_FIONREAD
+#define NGX_HAVE_FIONREAD            1
+#endif
+
+#define NGX_HAVE_GETADDRINFO         1
+
+#define ngx_random               rand
+#define ngx_debug_init()
+
+
+#endif /* _NGX_WIN32_CONFIG_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c
new file mode 100644
index 0000000..de66a44
--- /dev/null
+++ b/src/os/win32/ngx_win32_init.c
@@ -0,0 +1,329 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <nginx.h>
+
+
+ngx_uint_t  ngx_win32_version;
+ngx_uint_t  ngx_ncpu;
+ngx_uint_t  ngx_max_wsabufs;
+ngx_int_t   ngx_max_sockets;
+ngx_uint_t  ngx_inherited_nonblocking = 1;
+ngx_uint_t  ngx_tcp_nodelay_and_tcp_nopush;
+
+char        ngx_unique[NGX_INT32_LEN + 1];
+
+
+ngx_os_io_t ngx_os_io = {
+    ngx_wsarecv,
+    ngx_wsarecv_chain,
+    ngx_udp_wsarecv,
+    ngx_wsasend,
+    NULL,
+    NULL,
+    ngx_wsasend_chain,
+    0
+};
+
+
+typedef struct {
+    WORD  wServicePackMinor;
+    WORD  wSuiteMask;
+    BYTE  wProductType;
+} ngx_osviex_stub_t;
+
+
+static u_int               osviex;
+static OSVERSIONINFOEX     osvi;
+
+/* Should these pointers be per protocol ? */
+LPFN_ACCEPTEX              ngx_acceptex;
+LPFN_GETACCEPTEXSOCKADDRS  ngx_getacceptexsockaddrs;
+LPFN_TRANSMITFILE          ngx_transmitfile;
+LPFN_TRANSMITPACKETS       ngx_transmitpackets;
+LPFN_CONNECTEX             ngx_connectex;
+LPFN_DISCONNECTEX          ngx_disconnectex;
+
+static GUID ax_guid = WSAID_ACCEPTEX;
+static GUID as_guid = WSAID_GETACCEPTEXSOCKADDRS;
+static GUID tf_guid = WSAID_TRANSMITFILE;
+static GUID tp_guid = WSAID_TRANSMITPACKETS;
+static GUID cx_guid = WSAID_CONNECTEX;
+static GUID dx_guid = WSAID_DISCONNECTEX;
+
+
+#if (NGX_LOAD_WSAPOLL)
+ngx_wsapoll_pt             WSAPoll;
+ngx_uint_t                 ngx_have_wsapoll;
+#endif
+
+
+ngx_int_t
+ngx_os_init(ngx_log_t *log)
+{
+    DWORD         bytes;
+    SOCKET        s;
+    WSADATA       wsd;
+    ngx_err_t     err;
+    ngx_time_t   *tp;
+    ngx_uint_t    n;
+    SYSTEM_INFO   si;
+
+    /* get Windows version */
+
+    ngx_memzero(&osvi, sizeof(OSVERSIONINFOEX));
+    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+#ifdef _MSC_VER
+#pragma warning(disable:4996)
+#endif
+
+    osviex = GetVersionEx((OSVERSIONINFO *) &osvi);
+
+    if (osviex == 0) {
+        osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+        if (GetVersionEx((OSVERSIONINFO *) &osvi) == 0) {
+            ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                          "GetVersionEx() failed");
+            return NGX_ERROR;
+        }
+    }
+
+#ifdef _MSC_VER
+#pragma warning(default:4996)
+#endif
+
+    /*
+     *  Windows 3.1 Win32s   0xxxxx
+     *
+     *  Windows 95           140000
+     *  Windows 98           141000
+     *  Windows ME           149000
+     *  Windows NT 3.51      235100
+     *  Windows NT 4.0       240000
+     *  Windows NT 4.0 SP5   240050
+     *  Windows 2000         250000
+     *  Windows XP           250100
+     *  Windows 2003         250200
+     *  Windows Vista/2008   260000
+     *
+     *  Windows CE x.x       3xxxxx
+     */
+
+    ngx_win32_version = osvi.dwPlatformId * 100000
+                        + osvi.dwMajorVersion * 10000
+                        + osvi.dwMinorVersion * 100;
+
+    if (osviex) {
+        ngx_win32_version += osvi.wServicePackMajor * 10
+                             + osvi.wServicePackMinor;
+    }
+
+    GetSystemInfo(&si);
+    ngx_pagesize = si.dwPageSize;
+    ngx_allocation_granularity = si.dwAllocationGranularity;
+    ngx_ncpu = si.dwNumberOfProcessors;
+    ngx_cacheline_size = NGX_CPU_CACHE_LINE;
+
+    for (n = ngx_pagesize; n >>= 1; ngx_pagesize_shift++) { /* void */ }
+
+    /* delete default "C" locale for _wcsicmp() */
+    setlocale(LC_ALL, "");
+
+
+    /* init Winsock */
+
+    if (WSAStartup(MAKEWORD(2,2), &wsd) != 0) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
+                      "WSAStartup() failed");
+        return NGX_ERROR;
+    }
+
+    if (ngx_win32_version < NGX_WIN_NT) {
+        ngx_max_wsabufs = 16;
+        return NGX_OK;
+    }
+
+    /* STUB: ngx_uint_t max */
+    ngx_max_wsabufs = 1024 * 1024;
+
+    /*
+     * get AcceptEx(), GetAcceptExSockAddrs(), TransmitFile(),
+     * TransmitPackets(), ConnectEx(), and DisconnectEx() addresses
+     */
+
+    s = ngx_socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+    if (s == (ngx_socket_t) -1) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
+                      ngx_socket_n " failed");
+        return NGX_ERROR;
+    }
+
+    if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &ax_guid, sizeof(GUID),
+                 &ngx_acceptex, sizeof(LPFN_ACCEPTEX), &bytes, NULL, NULL)
+        == -1)
+    {
+        ngx_log_error(NGX_LOG_NOTICE, log, ngx_socket_errno,
+                      "WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER, "
+                               "WSAID_ACCEPTEX) failed");
+    }
+
+    if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &as_guid, sizeof(GUID),
+                 &ngx_getacceptexsockaddrs, sizeof(LPFN_GETACCEPTEXSOCKADDRS),
+                 &bytes, NULL, NULL)
+        == -1)
+    {
+        ngx_log_error(NGX_LOG_NOTICE, log, ngx_socket_errno,
+                      "WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER, "
+                               "WSAID_GETACCEPTEXSOCKADDRS) failed");
+    }
+
+    if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &tf_guid, sizeof(GUID),
+                 &ngx_transmitfile, sizeof(LPFN_TRANSMITFILE), &bytes,
+                 NULL, NULL)
+        == -1)
+    {
+        ngx_log_error(NGX_LOG_NOTICE, log, ngx_socket_errno,
+                      "WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER, "
+                               "WSAID_TRANSMITFILE) failed");
+    }
+
+    if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &tp_guid, sizeof(GUID),
+                 &ngx_transmitpackets, sizeof(LPFN_TRANSMITPACKETS), &bytes,
+                 NULL, NULL)
+        == -1)
+    {
+        ngx_log_error(NGX_LOG_NOTICE, log, ngx_socket_errno,
+                      "WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER, "
+                               "WSAID_TRANSMITPACKETS) failed");
+    }
+
+    if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &cx_guid, sizeof(GUID),
+                 &ngx_connectex, sizeof(LPFN_CONNECTEX), &bytes,
+                 NULL, NULL)
+        == -1)
+    {
+        ngx_log_error(NGX_LOG_NOTICE, log, ngx_socket_errno,
+                      "WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER, "
+                               "WSAID_CONNECTEX) failed");
+    }
+
+    if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &dx_guid, sizeof(GUID),
+                 &ngx_disconnectex, sizeof(LPFN_DISCONNECTEX), &bytes,
+                 NULL, NULL)
+        == -1)
+    {
+        ngx_log_error(NGX_LOG_NOTICE, log, ngx_socket_errno,
+                      "WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER, "
+                               "WSAID_DISCONNECTEX) failed");
+    }
+
+    if (ngx_close_socket(s) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_socket_errno,
+                      ngx_close_socket_n " failed");
+    }
+
+#if (NGX_LOAD_WSAPOLL)
+    {
+    HMODULE  hmod;
+
+    hmod = GetModuleHandle("ws2_32.dll");
+    if (hmod == NULL) {
+        ngx_log_error(NGX_LOG_NOTICE, log, ngx_errno,
+                      "GetModuleHandle(\"ws2_32.dll\") failed");
+        goto nopoll;
+    }
+
+    WSAPoll = (ngx_wsapoll_pt) (void *) GetProcAddress(hmod, "WSAPoll");
+    if (WSAPoll == NULL) {
+        ngx_log_error(NGX_LOG_NOTICE, log, ngx_errno,
+                      "GetProcAddress(\"WSAPoll\") failed");
+        goto nopoll;
+    }
+
+    ngx_have_wsapoll = 1;
+
+    }
+
+nopoll:
+
+#endif
+
+    if (GetEnvironmentVariable("ngx_unique", ngx_unique, NGX_INT32_LEN + 1)
+        != 0)
+    {
+        ngx_process = NGX_PROCESS_WORKER;
+
+    } else {
+        err = ngx_errno;
+
+        if (err != ERROR_ENVVAR_NOT_FOUND) {
+            ngx_log_error(NGX_LOG_EMERG, log, err,
+                          "GetEnvironmentVariable(\"ngx_unique\") failed");
+            return NGX_ERROR;
+        }
+
+        ngx_sprintf((u_char *) ngx_unique, "%P%Z", ngx_pid);
+    }
+
+    tp = ngx_timeofday();
+    srand((ngx_pid << 16) ^ (unsigned) tp->sec ^ tp->msec);
+
+    return NGX_OK;
+}
+
+
+void
+ngx_os_status(ngx_log_t *log)
+{
+    ngx_osviex_stub_t  *osviex_stub;
+
+    ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER_BUILD);
+
+    if (osviex) {
+
+        /*
+         * the MSVC 6.0 SP2 defines wSuiteMask and wProductType
+         * as WORD wReserved[2]
+         */
+        osviex_stub = (ngx_osviex_stub_t *) &osvi.wServicePackMinor;
+
+        ngx_log_error(NGX_LOG_INFO, log, 0,
+                      "OS: %ui build:%ud, \"%s\", suite:%Xd, type:%ud",
+                      ngx_win32_version, osvi.dwBuildNumber, osvi.szCSDVersion,
+                      osviex_stub->wSuiteMask, osviex_stub->wProductType);
+
+    } else {
+        if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
+
+            /* Win9x build */
+
+            ngx_log_error(NGX_LOG_INFO, log, 0,
+                          "OS: %ui build:%ud.%ud.%ud, \"%s\"",
+                          ngx_win32_version,
+                          osvi.dwBuildNumber >> 24,
+                          (osvi.dwBuildNumber >> 16) & 0xff,
+                          osvi.dwBuildNumber & 0xffff,
+                          osvi.szCSDVersion);
+
+        } else {
+
+            /*
+             * VER_PLATFORM_WIN32_NT
+             *
+             * we do not currently support VER_PLATFORM_WIN32_CE
+             * and we do not support VER_PLATFORM_WIN32s at all
+             */
+
+            ngx_log_error(NGX_LOG_INFO, log, 0, "OS: %ui build:%ud, \"%s\"",
+                          ngx_win32_version, osvi.dwBuildNumber,
+                          osvi.szCSDVersion);
+        }
+    }
+}
diff --git a/src/os/win32/ngx_wsarecv.c b/src/os/win32/ngx_wsarecv.c
new file mode 100644
index 0000000..b01405e
--- /dev/null
+++ b/src/os/win32/ngx_wsarecv.c
@@ -0,0 +1,215 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+ssize_t
+ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    int           rc;
+    u_long        bytes, flags;
+    WSABUF        wsabuf[1];
+    ngx_err_t     err;
+    ngx_int_t     n;
+    ngx_event_t  *rev;
+
+    wsabuf[0].buf = (char *) buf;
+    wsabuf[0].len = size;
+    flags = 0;
+    bytes = 0;
+
+    rc = WSARecv(c->fd, wsabuf, 1, &bytes, &flags, NULL, NULL);
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "WSARecv: fd:%d rc:%d %ul of %z", c->fd, rc, bytes, size);
+
+    rev = c->read;
+
+    if (rc == -1) {
+        rev->ready = 0;
+        err = ngx_socket_errno;
+
+        if (err == WSAEWOULDBLOCK) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "WSARecv() not ready");
+            return NGX_AGAIN;
+        }
+
+        n = ngx_connection_error(c, err, "WSARecv() failed");
+
+        if (n == NGX_ERROR) {
+            rev->error = 1;
+        }
+
+        return n;
+    }
+
+#if (NGX_HAVE_FIONREAD)
+
+    if (rev->available >= 0 && bytes > 0) {
+        rev->available -= bytes;
+
+        /*
+         * negative rev->available means some additional bytes
+         * were received between kernel notification and WSARecv(),
+         * and therefore ev->ready can be safely reset even for
+         * edge-triggered event methods
+         */
+
+        if (rev->available < 0) {
+            rev->available = 0;
+            rev->ready = 0;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "WSARecv: avail:%d", rev->available);
+
+    } else if (bytes == size) {
+
+        if (ngx_socket_nread(c->fd, &rev->available) == -1) {
+            n = ngx_connection_error(c, ngx_socket_errno,
+                                     ngx_socket_nread_n " failed");
+
+            if (n == NGX_ERROR) {
+                rev->ready = 0;
+                rev->error = 1;
+            }
+
+            return n;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "WSARecv: avail:%d", rev->available);
+    }
+
+#endif
+
+    if (bytes < size) {
+        rev->ready = 0;
+    }
+
+    if (bytes == 0) {
+        rev->ready = 0;
+        rev->eof = 1;
+    }
+
+    return bytes;
+}
+
+
+ssize_t
+ngx_overlapped_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    int               rc;
+    u_long            bytes, flags;
+    WSABUF            wsabuf[1];
+    ngx_err_t         err;
+    ngx_int_t         n;
+    ngx_event_t      *rev;
+    LPWSAOVERLAPPED   ovlp;
+
+    rev = c->read;
+
+    if (!rev->ready) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0, "second wsa post");
+        return NGX_AGAIN;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "rev->complete: %d", rev->complete);
+
+    if (rev->complete) {
+        rev->complete = 0;
+
+        if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
+            if (rev->ovlp.error) {
+                ngx_connection_error(c, rev->ovlp.error, "WSARecv() failed");
+                return NGX_ERROR;
+            }
+
+            ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "WSARecv ovlp: fd:%d %ul of %z",
+                           c->fd, rev->available, size);
+
+            return rev->available;
+        }
+
+        if (WSAGetOverlappedResult(c->fd, (LPWSAOVERLAPPED) &rev->ovlp,
+                                   &bytes, 0, NULL)
+            == 0)
+        {
+            ngx_connection_error(c, ngx_socket_errno,
+                               "WSARecv() or WSAGetOverlappedResult() failed");
+            return NGX_ERROR;
+        }
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "WSARecv: fd:%d %ul of %z", c->fd, bytes, size);
+
+        return bytes;
+    }
+
+    ovlp = (LPWSAOVERLAPPED) &rev->ovlp;
+    ngx_memzero(ovlp, sizeof(WSAOVERLAPPED));
+    wsabuf[0].buf = (char *) buf;
+    wsabuf[0].len = size;
+    flags = 0;
+    bytes = 0;
+
+    rc = WSARecv(c->fd, wsabuf, 1, &bytes, &flags, ovlp, NULL);
+
+    rev->complete = 0;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "WSARecv ovlp: fd:%d rc:%d %ul of %z",
+                   c->fd, rc, bytes, size);
+
+    if (rc == -1) {
+        err = ngx_socket_errno;
+        if (err == WSA_IO_PENDING) {
+            rev->active = 1;
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "WSARecv() posted");
+            return NGX_AGAIN;
+        }
+
+        n = ngx_connection_error(c, err, "WSARecv() failed");
+
+        if (n == NGX_ERROR) {
+            rev->error = 1;
+        }
+
+        return n;
+    }
+
+    if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
+
+        /*
+         * if a socket was bound with I/O completion port
+         * then GetQueuedCompletionStatus() would anyway return its status
+         * despite that WSARecv() was already complete
+         */
+
+        rev->active = 1;
+        return NGX_AGAIN;
+    }
+
+    if (bytes == 0) {
+        rev->eof = 1;
+        rev->ready = 0;
+
+    } else {
+        rev->ready = 1;
+    }
+
+    rev->active = 0;
+
+    return bytes;
+}
diff --git a/src/os/win32/ngx_wsarecv_chain.c b/src/os/win32/ngx_wsarecv_chain.c
new file mode 100644
index 0000000..e60389b
--- /dev/null
+++ b/src/os/win32/ngx_wsarecv_chain.c
@@ -0,0 +1,147 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+#define NGX_WSABUFS  64
+
+
+ssize_t
+ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
+{
+    int           rc;
+    u_char       *prev;
+    u_long        bytes, flags;
+    size_t        n, size;
+    ngx_err_t     err;
+    ngx_array_t   vec;
+    ngx_event_t  *rev;
+    LPWSABUF      wsabuf;
+    WSABUF        wsabufs[NGX_WSABUFS];
+
+    prev = NULL;
+    wsabuf = NULL;
+    flags = 0;
+    size = 0;
+    bytes = 0;
+
+    vec.elts = wsabufs;
+    vec.nelts = 0;
+    vec.size = sizeof(WSABUF);
+    vec.nalloc = NGX_WSABUFS;
+    vec.pool = c->pool;
+
+    /* coalesce the neighbouring bufs */
+
+    while (chain) {
+        n = chain->buf->end - chain->buf->last;
+
+        if (limit) {
+            if (size >= (size_t) limit) {
+                break;
+            }
+
+            if (size + n > (size_t) limit) {
+                n = (size_t) limit - size;
+            }
+        }
+
+        if (prev == chain->buf->last) {
+            wsabuf->len += n;
+
+        } else {
+            if (vec.nelts == vec.nalloc) {
+                break;
+            }
+
+            wsabuf = ngx_array_push(&vec);
+            if (wsabuf == NULL) {
+                return NGX_ERROR;
+            }
+
+            wsabuf->buf = (char *) chain->buf->last;
+            wsabuf->len = n;
+        }
+
+        size += n;
+        prev = chain->buf->end;
+        chain = chain->next;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "WSARecv: %d:%d", vec.nelts, wsabuf->len);
+
+
+    rc = WSARecv(c->fd, vec.elts, vec.nelts, &bytes, &flags, NULL, NULL);
+
+    rev = c->read;
+
+    if (rc == -1) {
+        rev->ready = 0;
+        err = ngx_socket_errno;
+
+        if (err == WSAEWOULDBLOCK) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "WSARecv() not ready");
+            return NGX_AGAIN;
+        }
+
+        rev->error = 1;
+        ngx_connection_error(c, err, "WSARecv() failed");
+        return NGX_ERROR;
+    }
+
+#if (NGX_HAVE_FIONREAD)
+
+    if (rev->available >= 0 && bytes > 0) {
+        rev->available -= bytes;
+
+        /*
+         * negative rev->available means some additional bytes
+         * were received between kernel notification and WSARecv(),
+         * and therefore ev->ready can be safely reset even for
+         * edge-triggered event methods
+         */
+
+        if (rev->available < 0) {
+            rev->available = 0;
+            rev->ready = 0;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "WSARecv: avail:%d", rev->available);
+
+    } else if (bytes == size) {
+
+        if (ngx_socket_nread(c->fd, &rev->available) == -1) {
+            rev->ready = 0;
+            rev->error = 1;
+            ngx_connection_error(c, ngx_socket_errno,
+                                 ngx_socket_nread_n " failed");
+            return NGX_ERROR;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "WSARecv: avail:%d", rev->available);
+    }
+
+#endif
+
+    if (bytes < size) {
+        rev->ready = 0;
+    }
+
+    if (bytes == 0) {
+        rev->ready = 0;
+        rev->eof = 1;
+    }
+
+    return bytes;
+}
diff --git a/src/os/win32/ngx_wsasend.c b/src/os/win32/ngx_wsasend.c
new file mode 100644
index 0000000..d6a23d1
--- /dev/null
+++ b/src/os/win32/ngx_wsasend.c
@@ -0,0 +1,185 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+ssize_t
+ngx_wsasend(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    int           n;
+    u_long        sent;
+    ngx_err_t     err;
+    ngx_event_t  *wev;
+    WSABUF        wsabuf;
+
+    wev = c->write;
+
+    if (!wev->ready) {
+        return NGX_AGAIN;
+    }
+
+    /*
+     * WSABUF must be 4-byte aligned otherwise
+     * WSASend() will return undocumented WSAEINVAL error.
+     */
+
+    wsabuf.buf = (char *) buf;
+    wsabuf.len = size;
+
+    sent = 0;
+
+    n = WSASend(c->fd, &wsabuf, 1, &sent, 0, NULL, NULL);
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "WSASend: fd:%d, %d, %ul of %uz", c->fd, n, sent, size);
+
+    if (n == 0) {
+        if (sent < size) {
+            wev->ready = 0;
+        }
+
+        c->sent += sent;
+
+        return sent;
+    }
+
+    err = ngx_socket_errno;
+
+    if (err == WSAEWOULDBLOCK) {
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err, "WSASend() not ready");
+        wev->ready = 0;
+        return NGX_AGAIN;
+    }
+
+    wev->error = 1;
+    ngx_connection_error(c, err, "WSASend() failed");
+
+    return NGX_ERROR;
+}
+
+
+ssize_t
+ngx_overlapped_wsasend(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    int               n;
+    u_long            sent;
+    ngx_err_t         err;
+    ngx_event_t      *wev;
+    LPWSAOVERLAPPED   ovlp;
+    WSABUF            wsabuf;
+
+    wev = c->write;
+
+    if (!wev->ready) {
+        return NGX_AGAIN;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "wev->complete: %d", wev->complete);
+
+    if (!wev->complete) {
+
+        /* post the overlapped WSASend() */
+
+        /*
+         * WSABUFs must be 4-byte aligned otherwise
+         * WSASend() will return undocumented WSAEINVAL error.
+         */
+
+        wsabuf.buf = (char *) buf;
+        wsabuf.len = size;
+
+        sent = 0;
+
+        ovlp = (LPWSAOVERLAPPED) &c->write->ovlp;
+        ngx_memzero(ovlp, sizeof(WSAOVERLAPPED));
+
+        n = WSASend(c->fd, &wsabuf, 1, &sent, 0, ovlp, NULL);
+
+        ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "WSASend: fd:%d, %d, %ul of %uz", c->fd, n, sent, size);
+
+        wev->complete = 0;
+
+        if (n == 0) {
+            if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
+
+                /*
+                 * if a socket was bound with I/O completion port then
+                 * GetQueuedCompletionStatus() would anyway return its status
+                 * despite that WSASend() was already complete
+                 */
+
+                wev->active = 1;
+                return NGX_AGAIN;
+            }
+
+            if (sent < size) {
+                wev->ready = 0;
+            }
+
+            c->sent += sent;
+
+            return sent;
+        }
+
+        err = ngx_socket_errno;
+
+        if (err == WSA_IO_PENDING) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "WSASend() posted");
+            wev->active = 1;
+            return NGX_AGAIN;
+        }
+
+        wev->error = 1;
+        ngx_connection_error(c, err, "WSASend() failed");
+
+        return NGX_ERROR;
+    }
+
+    /* the overlapped WSASend() complete */
+
+    wev->complete = 0;
+    wev->active = 0;
+
+    if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
+
+        if (wev->ovlp.error) {
+            ngx_connection_error(c, wev->ovlp.error, "WSASend() failed");
+            return NGX_ERROR;
+        }
+
+        sent = wev->available;
+
+    } else {
+        if (WSAGetOverlappedResult(c->fd, (LPWSAOVERLAPPED) &wev->ovlp,
+                                   &sent, 0, NULL)
+            == 0)
+        {
+            ngx_connection_error(c, ngx_socket_errno,
+                           "WSASend() or WSAGetOverlappedResult() failed");
+
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "WSAGetOverlappedResult: fd:%d, %ul of %uz",
+                   c->fd, sent, size);
+
+    if (sent < size) {
+        wev->ready = 0;
+    }
+
+    c->sent += sent;
+
+    return sent;
+}
diff --git a/src/os/win32/ngx_wsasend_chain.c b/src/os/win32/ngx_wsasend_chain.c
new file mode 100644
index 0000000..cd50e71
--- /dev/null
+++ b/src/os/win32/ngx_wsasend_chain.c
@@ -0,0 +1,296 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+#define NGX_WSABUFS  64
+
+
+ngx_chain_t *
+ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+{
+    int           rc;
+    u_char       *prev;
+    u_long        size, sent, send, prev_send;
+    ngx_err_t     err;
+    ngx_event_t  *wev;
+    ngx_array_t   vec;
+    ngx_chain_t  *cl;
+    LPWSABUF      wsabuf;
+    WSABUF        wsabufs[NGX_WSABUFS];
+
+    wev = c->write;
+
+    if (!wev->ready) {
+        return in;
+    }
+
+    /* the maximum limit size is the maximum u_long value - the page size */
+
+    if (limit == 0 || limit > (off_t) (NGX_MAX_UINT32_VALUE - ngx_pagesize)) {
+        limit = NGX_MAX_UINT32_VALUE - ngx_pagesize;
+    }
+
+    send = 0;
+
+    /*
+     * WSABUFs must be 4-byte aligned otherwise
+     * WSASend() will return undocumented WSAEINVAL error.
+     */
+
+    vec.elts = wsabufs;
+    vec.size = sizeof(WSABUF);
+    vec.nalloc = ngx_min(NGX_WSABUFS, ngx_max_wsabufs);
+    vec.pool = c->pool;
+
+    for ( ;; ) {
+        prev = NULL;
+        wsabuf = NULL;
+        prev_send = send;
+
+        vec.nelts = 0;
+
+        /* create the WSABUF and coalesce the neighbouring bufs */
+
+        for (cl = in; cl && send < limit; cl = cl->next) {
+
+            if (ngx_buf_special(cl->buf)) {
+                continue;
+            }
+
+            size = cl->buf->last - cl->buf->pos;
+
+            if (send + size > limit) {
+                size = (u_long) (limit - send);
+            }
+
+            if (prev == cl->buf->pos) {
+                wsabuf->len += cl->buf->last - cl->buf->pos;
+
+            } else {
+                if (vec.nelts == vec.nalloc) {
+                    break;
+                }
+
+                wsabuf = ngx_array_push(&vec);
+                if (wsabuf == NULL) {
+                    return NGX_CHAIN_ERROR;
+                }
+
+                wsabuf->buf = (char *) cl->buf->pos;
+                wsabuf->len = cl->buf->last - cl->buf->pos;
+            }
+
+            prev = cl->buf->last;
+            send += size;
+        }
+
+        sent = 0;
+
+        rc = WSASend(c->fd, vec.elts, vec.nelts, &sent, 0, NULL, NULL);
+
+        if (rc == -1) {
+            err = ngx_errno;
+
+            if (err == WSAEWOULDBLOCK) {
+                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                               "WSASend() not ready");
+
+            } else {
+                wev->error = 1;
+                ngx_connection_error(c, err, "WSASend() failed");
+                return NGX_CHAIN_ERROR;
+            }
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "WSASend: fd:%d, s:%ul", c->fd, sent);
+
+        c->sent += sent;
+
+        in = ngx_chain_update_sent(in, sent);
+
+        if (send - prev_send != sent) {
+            wev->ready = 0;
+            return in;
+        }
+
+        if (send >= limit || in == NULL) {
+            return in;
+        }
+    }
+}
+
+
+ngx_chain_t *
+ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+{
+    int               rc;
+    u_char           *prev;
+    u_long            size, send, sent;
+    ngx_err_t         err;
+    ngx_event_t      *wev;
+    ngx_array_t       vec;
+    ngx_chain_t      *cl;
+    LPWSAOVERLAPPED   ovlp;
+    LPWSABUF          wsabuf;
+    WSABUF            wsabufs[NGX_WSABUFS];
+
+    wev = c->write;
+
+    if (!wev->ready) {
+        return in;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "wev->complete: %d", wev->complete);
+
+    if (!wev->complete) {
+
+        /* post the overlapped WSASend() */
+
+        /* the maximum limit size is the maximum u_long value - the page size */
+
+        if (limit == 0 || limit > (off_t) (NGX_MAX_UINT32_VALUE - ngx_pagesize))
+        {
+            limit = NGX_MAX_UINT32_VALUE - ngx_pagesize;
+        }
+
+        /*
+         * WSABUFs must be 4-byte aligned otherwise
+         * WSASend() will return undocumented WSAEINVAL error.
+         */
+
+        vec.elts = wsabufs;
+        vec.nelts = 0;
+        vec.size = sizeof(WSABUF);
+        vec.nalloc = ngx_min(NGX_WSABUFS, ngx_max_wsabufs);
+        vec.pool = c->pool;
+
+        send = 0;
+        prev = NULL;
+        wsabuf = NULL;
+
+        /* create the WSABUF and coalesce the neighbouring bufs */
+
+        for (cl = in; cl && send < limit; cl = cl->next) {
+
+            if (ngx_buf_special(cl->buf)) {
+                continue;
+            }
+
+            size = cl->buf->last - cl->buf->pos;
+
+            if (send + size > limit) {
+                size = (u_long) (limit - send);
+            }
+
+            if (prev == cl->buf->pos) {
+                wsabuf->len += cl->buf->last - cl->buf->pos;
+
+            } else {
+                if (vec.nelts == vec.nalloc) {
+                    break;
+                }
+
+                wsabuf = ngx_array_push(&vec);
+                if (wsabuf == NULL) {
+                    return NGX_CHAIN_ERROR;
+                }
+
+                wsabuf->buf = (char *) cl->buf->pos;
+                wsabuf->len = cl->buf->last - cl->buf->pos;
+            }
+
+            prev = cl->buf->last;
+            send += size;
+        }
+
+        ovlp = (LPWSAOVERLAPPED) &c->write->ovlp;
+        ngx_memzero(ovlp, sizeof(WSAOVERLAPPED));
+
+        rc = WSASend(c->fd, vec.elts, vec.nelts, &sent, 0, ovlp, NULL);
+
+        wev->complete = 0;
+
+        if (rc == -1) {
+            err = ngx_errno;
+
+            if (err == WSA_IO_PENDING) {
+                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                               "WSASend() posted");
+                wev->active = 1;
+                return in;
+
+            } else {
+                wev->error = 1;
+                ngx_connection_error(c, err, "WSASend() failed");
+                return NGX_CHAIN_ERROR;
+            }
+
+        } else if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
+
+            /*
+             * if a socket was bound with I/O completion port then
+             * GetQueuedCompletionStatus() would anyway return its status
+             * despite that WSASend() was already complete
+             */
+
+            wev->active = 1;
+            return in;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "WSASend: fd:%d, s:%ul", c->fd, sent);
+
+    } else {
+
+        /* the overlapped WSASend() complete */
+
+        wev->complete = 0;
+        wev->active = 0;
+
+        if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
+            if (wev->ovlp.error) {
+                ngx_connection_error(c, wev->ovlp.error, "WSASend() failed");
+                return NGX_CHAIN_ERROR;
+            }
+
+            sent = wev->available;
+
+        } else {
+            if (WSAGetOverlappedResult(c->fd, (LPWSAOVERLAPPED) &wev->ovlp,
+                                       &sent, 0, NULL)
+                == 0)
+            {
+                ngx_connection_error(c, ngx_socket_errno,
+                               "WSASend() or WSAGetOverlappedResult() failed");
+
+                return NGX_CHAIN_ERROR;
+            }
+        }
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "WSASend ovlp: fd:%d, s:%ul", c->fd, sent);
+
+    c->sent += sent;
+
+    in = ngx_chain_update_sent(in, sent);
+
+    if (in) {
+        wev->ready = 0;
+
+    } else {
+        wev->ready = 1;
+    }
+
+    return in;
+}
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index d96d27a..f0b7934 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -578,7 +578,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_str_t                    *value, size;
     ngx_url_t                     u;
     ngx_uint_t                    i, n, backlog;
-    ngx_stream_listen_t          *ls, *als;
+    ngx_stream_listen_t          *ls, *als, *nls;
     ngx_stream_core_main_conf_t  *cmcf;
 
     cscf->listen = 1;
@@ -602,7 +602,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
-    ls = ngx_array_push_n(&cmcf->listen, u.naddrs);
+    ls = ngx_array_push(&cmcf->listen);
     if (ls == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -886,23 +886,43 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
     }
 
-    als = cmcf->listen.elts;
-
     for (n = 0; n < u.naddrs; n++) {
-        ls[n] = ls[0];
 
-        ls[n].sockaddr = u.addrs[n].sockaddr;
-        ls[n].socklen = u.addrs[n].socklen;
-        ls[n].addr_text = u.addrs[n].name;
-        ls[n].wildcard = ngx_inet_wildcard(ls[n].sockaddr);
+        for (i = 0; i < n; i++) {
+            if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen,
+                                 u.addrs[i].sockaddr, u.addrs[i].socklen, 1)
+                == NGX_OK)
+            {
+                goto next;
+            }
+        }
 
-        for (i = 0; i < cmcf->listen.nelts - u.naddrs + n; i++) {
-            if (ls[n].type != als[i].type) {
+        if (n != 0) {
+            nls = ngx_array_push(&cmcf->listen);
+            if (nls == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            *nls = *ls;
+
+        } else {
+            nls = ls;
+        }
+
+        nls->sockaddr = u.addrs[n].sockaddr;
+        nls->socklen = u.addrs[n].socklen;
+        nls->addr_text = u.addrs[n].name;
+        nls->wildcard = ngx_inet_wildcard(nls->sockaddr);
+
+        als = cmcf->listen.elts;
+
+        for (i = 0; i < cmcf->listen.nelts - 1; i++) {
+            if (nls->type != als[i].type) {
                 continue;
             }
 
             if (ngx_cmp_sockaddr(als[i].sockaddr, als[i].socklen,
-                                 ls[n].sockaddr, ls[n].socklen, 1)
+                                 nls->sockaddr, nls->socklen, 1)
                 != NGX_OK)
             {
                 continue;
@@ -910,9 +930,12 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "duplicate \"%V\" address and port pair",
-                               &ls[n].addr_text);
+                               &nls->addr_text);
             return NGX_CONF_ERROR;
         }
+
+    next:
+        continue;
     }
 
     return NGX_CONF_OK;
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 934e7d8..ed275c0 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -103,6 +103,8 @@ static void ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc);
 static void ngx_stream_proxy_ssl_save_session(ngx_connection_t *c);
 static ngx_int_t ngx_stream_proxy_ssl_name(ngx_stream_session_t *s);
 static ngx_int_t ngx_stream_proxy_ssl_certificate(ngx_stream_session_t *s);
+static ngx_int_t ngx_stream_proxy_merge_ssl(ngx_conf_t *cf,
+    ngx_stream_proxy_srv_conf_t *conf, ngx_stream_proxy_srv_conf_t *prev);
 static ngx_int_t ngx_stream_proxy_set_ssl(ngx_conf_t *cf,
     ngx_stream_proxy_srv_conf_t *pscf);
 
@@ -801,7 +803,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 
 #if (NGX_STREAM_SSL)
 
-    if (pc->type == SOCK_STREAM && pscf->ssl) {
+    if (pc->type == SOCK_STREAM && pscf->ssl_enable) {
 
         if (u->proxy_protocol) {
             if (ngx_stream_proxy_send_proxy_protocol(s) != NGX_OK) {
@@ -892,7 +894,7 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
             return;
         }
 
-        p = ngx_pnalloc(c->pool, NGX_PROXY_PROTOCOL_MAX_HEADER);
+        p = ngx_pnalloc(c->pool, NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
         if (p == NULL) {
             ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
@@ -900,7 +902,8 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
 
         cl->buf->pos = p;
 
-        p = ngx_proxy_protocol_write(c, p, p + NGX_PROXY_PROTOCOL_MAX_HEADER);
+        p = ngx_proxy_protocol_write(c, p,
+                                     p + NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
         if (p == NULL) {
             ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
             return;
@@ -944,14 +947,15 @@ ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
     ngx_connection_t             *c, *pc;
     ngx_stream_upstream_t        *u;
     ngx_stream_proxy_srv_conf_t  *pscf;
-    u_char                        buf[NGX_PROXY_PROTOCOL_MAX_HEADER];
+    u_char                        buf[NGX_PROXY_PROTOCOL_V1_MAX_HEADER];
 
     c = s->connection;
 
     ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
                    "stream proxy send PROXY protocol header");
 
-    p = ngx_proxy_protocol_write(c, buf, buf + NGX_PROXY_PROTOCOL_MAX_HEADER);
+    p = ngx_proxy_protocol_write(c, buf,
+                                 buf + NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
     if (p == NULL) {
         ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
         return NGX_ERROR;
@@ -1069,8 +1073,10 @@ ngx_stream_proxy_ssl_init_connection(ngx_stream_session_t *s)
         }
     }
 
-    if (pscf->ssl_certificate && (pscf->ssl_certificate->lengths
-                                  || pscf->ssl_certificate_key->lengths))
+    if (pscf->ssl_certificate
+        && pscf->ssl_certificate->value.len
+        && (pscf->ssl_certificate->lengths
+            || pscf->ssl_certificate_key->lengths))
     {
         if (ngx_stream_proxy_ssl_certificate(s) != NGX_OK) {
             ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
@@ -1669,9 +1675,8 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 
         size = b->end - b->last;
 
-        if (size && src->read->ready && !src->read->delayed
-            && !src->read->error)
-        {
+        if (size && src->read->ready && !src->read->delayed) {
+
             if (limit_rate) {
                 limit = (off_t) limit_rate * (ngx_time() - u->start_sec + 1)
                         - *received;
@@ -1735,7 +1740,7 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 
                 cl->buf->temporary = (n ? 1 : 0);
                 cl->buf->last_buf = src->read->eof;
-                cl->buf->flush = 1;
+                cl->buf->flush = !src->read->eof;
 
                 (*packets)++;
                 *received += n;
@@ -2148,14 +2153,19 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #if (NGX_STREAM_SSL)
 
+    if (ngx_stream_proxy_merge_ssl(cf, conf, prev) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
     ngx_conf_merge_value(conf->ssl_enable, prev->ssl_enable, 0);
 
     ngx_conf_merge_value(conf->ssl_session_reuse,
                               prev->ssl_session_reuse, 1);
 
     ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
-                              (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
-                               |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
+                              (NGX_CONF_BITMASK_SET
+                               |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
+                               |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
 
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT");
 
@@ -2196,18 +2206,64 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #if (NGX_STREAM_SSL)
 
+static ngx_int_t
+ngx_stream_proxy_merge_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *conf,
+    ngx_stream_proxy_srv_conf_t *prev)
+{
+    ngx_uint_t  preserve;
+
+    if (conf->ssl_protocols == 0
+        && conf->ssl_ciphers.data == NULL
+        && conf->ssl_certificate == NGX_CONF_UNSET_PTR
+        && conf->ssl_certificate_key == NGX_CONF_UNSET_PTR
+        && conf->ssl_passwords == NGX_CONF_UNSET_PTR
+        && conf->ssl_verify == NGX_CONF_UNSET
+        && conf->ssl_verify_depth == NGX_CONF_UNSET_UINT
+        && conf->ssl_trusted_certificate.data == NULL
+        && conf->ssl_crl.data == NULL
+        && conf->ssl_session_reuse == NGX_CONF_UNSET
+        && conf->ssl_conf_commands == NGX_CONF_UNSET_PTR)
+    {
+        if (prev->ssl) {
+            conf->ssl = prev->ssl;
+            return NGX_OK;
+        }
+
+        preserve = 1;
+
+    } else {
+        preserve = 0;
+    }
+
+    conf->ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
+    if (conf->ssl == NULL) {
+        return NGX_ERROR;
+    }
+
+    conf->ssl->log = cf->log;
+
+    /*
+     * special handling to preserve conf->ssl
+     * in the "stream" section to inherit it to all servers
+     */
+
+    if (preserve) {
+        prev->ssl = conf->ssl;
+    }
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
 {
     ngx_pool_cleanup_t  *cln;
 
-    pscf->ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
-    if (pscf->ssl == NULL) {
-        return NGX_ERROR;
+    if (pscf->ssl->ctx) {
+        return NGX_OK;
     }
 
-    pscf->ssl->log = cf->log;
-
     if (ngx_ssl_create(pscf->ssl, pscf->ssl_protocols, NULL) != NGX_OK) {
         return NGX_ERROR;
     }
@@ -2225,8 +2281,9 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
         return NGX_ERROR;
     }
 
-    if (pscf->ssl_certificate) {
-
+    if (pscf->ssl_certificate
+        && pscf->ssl_certificate->value.len)
+    {
         if (pscf->ssl_certificate_key == NULL) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"proxy_ssl_certificate_key\" is defined "
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index c530832..1ba1825 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -703,8 +703,9 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
                          prev->prefer_server_ciphers, 0);
 
     ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
-                         (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
-                          |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
+                         (NGX_CONF_BITMASK_SET
+                          |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
+                          |NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
 
     ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
     ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
@@ -1073,7 +1074,7 @@ ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 len++;
             }
 
-            if (len == 0) {
+            if (len == 0 || j == value[i].len) {
                 goto invalid;
             }
 
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
index 8b59668..8126890 100644
--- a/src/stream/ngx_stream_variables.c
+++ b/src/stream/ngx_stream_variables.c
@@ -23,6 +23,8 @@ static ngx_int_t ngx_stream_variable_proxy_protocol_addr(
     ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_proxy_protocol_port(
     ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_proxy_protocol_tlv(
+    ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_server_addr(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_server_port(ngx_stream_session_t *s,
@@ -79,6 +81,10 @@ static ngx_stream_variable_t  ngx_stream_core_variables[] = {
       ngx_stream_variable_proxy_protocol_port,
       offsetof(ngx_proxy_protocol_t, dst_port), 0, 0 },
 
+    { ngx_string("proxy_protocol_tlv_"), NULL,
+      ngx_stream_variable_proxy_protocol_tlv,
+      0, NGX_STREAM_VAR_PREFIX, 0 },
+
     { ngx_string("server_addr"), NULL,
       ngx_stream_variable_server_addr, 0, 0, 0 },
 
@@ -621,6 +627,39 @@ ngx_stream_variable_proxy_protocol_port(ngx_stream_session_t *s,
 }
 
 
+static ngx_int_t
+ngx_stream_variable_proxy_protocol_tlv(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_str_t *name = (ngx_str_t *) data;
+
+    ngx_int_t  rc;
+    ngx_str_t  tlv, value;
+
+    tlv.len = name->len - (sizeof("proxy_protocol_tlv_") - 1);
+    tlv.data = name->data + sizeof("proxy_protocol_tlv_") - 1;
+
+    rc = ngx_proxy_protocol_get_tlv(s->connection, &tlv, &value);
+
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_DECLINED) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->len = value.len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = value.data;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_variable_server_addr(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data)
diff --git a/src/stream/ngx_stream_write_filter_module.c b/src/stream/ngx_stream_write_filter_module.c
index 156a61c..07dc7b5 100644
--- a/src/stream/ngx_stream_write_filter_module.c
+++ b/src/stream/ngx_stream_write_filter_module.c
@@ -235,7 +235,7 @@ ngx_stream_write_filter(ngx_stream_session_t *s, ngx_chain_t *in,
     if (size == 0
         && !(c->buffered & NGX_LOWLEVEL_BUFFERED)
         && !(last && c->need_last_buf)
-        && !(c->type == SOCK_DGRAM && flush))
+        && !(flush && c->need_flush_buf))
     {
         if (last || flush || sync) {
             for (cl = *out; cl; /* void */) {

From 557d6885777f1f99dc38324d49c7e0fcd20bb255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 25 Apr 2023 22:37:22 +0200
Subject: [PATCH 515/600] d/changelog New version 1.24.0-1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3bf98db..17a3a54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.24.0-1) UNRELEASED; urgency=medium
+
+  * New upstream version 1.24.0 
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Apr 2023 22:36:57 +0200
+
 nginx (1.22.1-9) unstable; urgency=medium
 
   * d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8)

From 7478c72e84c7acd460e54d579b2d639fef0e88cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 25 Apr 2023 22:38:33 +0200
Subject: [PATCH 516/600] nginx ABI release: nginx-abi-1.24.0-1

---
 debian/changelog                 | 1 +
 debian/libnginx-mod.abisubstvars | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 17a3a54..a471f46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nginx (1.24.0-1) UNRELEASED; urgency=medium
 
   * New upstream version 1.24.0 
+  * nginx ABI release: nginx-abi-1.24.0-1
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Apr 2023 22:36:57 +0200
 
diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index 7cd29eb..e07fe78 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -5,7 +5,7 @@
 # note that debian revision can increase without breaking ABI
 #
 # TODO: use $(DEB_VERSION_UPSTREAM)
-nginx:abi=nginx-abi-1.22.1-7
+nginx:abi=nginx-abi-1.24.0-1
 
 # ABI-compatible versions of third-party modules
 libnginx-mod-http-auth-pam:Version=1:1.5.3-3

From 9fe5d1ba9345791756dccb0bcaeb357b241c7b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 25 Apr 2023 22:39:28 +0200
Subject: [PATCH 517/600] d/p/bug-{1024605,973861}.patch removed, fixed in
 upstream

---
 debian/changelog                 |   1 +
 debian/patches/bug-1024605.patch | 102 -------------------------------
 debian/patches/bug-973861.patch  |  66 --------------------
 debian/patches/series            |   2 -
 4 files changed, 1 insertion(+), 170 deletions(-)
 delete mode 100644 debian/patches/bug-1024605.patch
 delete mode 100644 debian/patches/bug-973861.patch

diff --git a/debian/changelog b/debian/changelog
index a471f46..32fcc6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nginx (1.24.0-1) UNRELEASED; urgency=medium
 
   * New upstream version 1.24.0 
   * nginx ABI release: nginx-abi-1.24.0-1
+  * d/p/bug-{1024605,973861}.patch removed, fixed in upstream
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Apr 2023 22:36:57 +0200
 
diff --git a/debian/patches/bug-1024605.patch b/debian/patches/bug-1024605.patch
deleted file mode 100644
index 28b7d18..0000000
--- a/debian/patches/bug-1024605.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Description: SSI: handling of subrequests from other modules
-Author: User Ciel Zhao <i@ciel.dev>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024605
-Last-Update: 2022-11-21
-Origin: https://hg.nginx.org/nginx/raw-rev/49e7db44b57c
-Forwarded: not-needed
----
-# HG changeset patch
-# User Ciel Zhao <i@ciel.dev>
-# Date 1669039294 -10800
-# Node ID 49e7db44b57c9f4d54b87d19a696178b913aec5c
-# Parent  42bc158a47ecb3c2bd0396c723c307c757f2770e
-SSI: handling of subrequests from other modules (ticket #1263).
-
-As the SSI parser always uses the context from the main request for storing
-variables and blocks, that context should always exist for subrequests using
-SSI, even though the main request does not necessarily have SSI enabled.
-
-However, `ngx_http_get_module_ctx(r->main, ...)` is getting NULL in such cases,
-resulting in the worker crashing SIGSEGV when accessing its attributes.
-
-This patch links the first initialized context to the main request, and
-upgrades it only when main context is initialized.
-
-diff -r 42bc158a47ec -r 49e7db44b57c src/http/modules/ngx_http_ssi_filter_module.c
---- a/src/http/modules/ngx_http_ssi_filter_module.c	Tue Nov 08 12:48:21 2022 +0300
-+++ b/src/http/modules/ngx_http_ssi_filter_module.c	Mon Nov 21 17:01:34 2022 +0300
-@@ -329,7 +329,7 @@
- static ngx_int_t
- ngx_http_ssi_header_filter(ngx_http_request_t *r)
- {
--    ngx_http_ssi_ctx_t       *ctx;
-+    ngx_http_ssi_ctx_t       *ctx, *mctx;
-     ngx_http_ssi_loc_conf_t  *slcf;
- 
-     slcf = ngx_http_get_module_loc_conf(r, ngx_http_ssi_filter_module);
-@@ -341,6 +341,8 @@
-         return ngx_http_next_header_filter(r);
-     }
- 
-+    mctx = ngx_http_get_module_ctx(r->main, ngx_http_ssi_filter_module);
-+
-     ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_ssi_ctx_t));
-     if (ctx == NULL) {
-         return NGX_ERROR;
-@@ -367,6 +369,26 @@
-     r->filter_need_in_memory = 1;
- 
-     if (r == r->main) {
-+
-+        if (mctx) {
-+
-+            /*
-+             * if there was a shared context previously used as main,
-+             * copy variables and blocks
-+             */
-+
-+            ctx->variables = mctx->variables;
-+            ctx->blocks = mctx->blocks;
-+
-+#if (NGX_PCRE)
-+            ctx->ncaptures = mctx->ncaptures;
-+            ctx->captures = mctx->captures;
-+            ctx->captures_data = mctx->captures_data;
-+#endif
-+
-+            mctx->shared = 0;
-+        }
-+
-         ngx_http_clear_content_length(r);
-         ngx_http_clear_accept_ranges(r);
- 
-@@ -379,6 +401,10 @@
-         } else {
-             ngx_http_weak_etag(r);
-         }
-+
-+    } else if (mctx == NULL) {
-+        ngx_http_set_ctx(r->main, ctx, ngx_http_ssi_filter_module);
-+        ctx->shared = 1;
-     }
- 
-     return ngx_http_next_header_filter(r);
-@@ -405,6 +431,7 @@
-     ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module);
- 
-     if (ctx == NULL
-+        || (ctx->shared && r == r->main)
-         || (in == NULL
-             && ctx->buf == NULL
-             && ctx->in == NULL
-diff -r 42bc158a47ec -r 49e7db44b57c src/http/modules/ngx_http_ssi_filter_module.h
---- a/src/http/modules/ngx_http_ssi_filter_module.h	Tue Nov 08 12:48:21 2022 +0300
-+++ b/src/http/modules/ngx_http_ssi_filter_module.h	Mon Nov 21 17:01:34 2022 +0300
-@@ -71,6 +71,7 @@
-     u_char                   *captures_data;
- #endif
- 
-+    unsigned                  shared:1;
-     unsigned                  conditional:2;
-     unsigned                  encoding:2;
-     unsigned                  block:1;
diff --git a/debian/patches/bug-973861.patch b/debian/patches/bug-973861.patch
deleted file mode 100644
index 221eb8d..0000000
--- a/debian/patches/bug-973861.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 2485681308bd8d3108da31546cb91bb97813a3fb Mon Sep 17 00:00:00 2001
-From: Maxim Dounin <mdounin@mdounin.ru>
-Date: Thu, 2 Feb 2023 23:38:48 +0300
-Subject: [PATCH] Lingering close for connections with pipelined requests.
-Origin: https://hg.nginx.org/nginx/rev/cffaf3f2eec8
-Forwarded: not-needed
-
-This is expected to help with clients using pipelining with some constant
-depth, such as apt[1][2].
-
-When downloading many resources, apt uses pipelining with some constant
-depth, a number of requests in flight.  This essentially means that after
-receiving a response it sends an additional request to the server, and
-this can result in requests arriving to the server at any time.  Further,
-additional requests are sent one-by-one, and can be easily seen as such
-(neither as pipelined, nor followed by pipelined requests).
-
-The only safe approach to close such connections (for example, when
-keepalive_requests is reached) is with lingering.  To do so, now nginx
-monitors if pipelining was used on the connection, and if it was, closes
-the connection with lingering.
-
-[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973861#10
-[2] https://mailman.nginx.org/pipermail/nginx-devel/2023-January/ZA2SP5SJU55LHEBCJMFDB2AZVELRLTHI.html
----
- src/core/ngx_connection.h   | 1 +
- src/http/ngx_http_request.c | 4 +++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
-index 6d3348d9..36e1be27 100644
---- a/src/core/ngx_connection.h
-+++ b/src/core/ngx_connection.h
-@@ -172,6 +172,7 @@ struct ngx_connection_s {
-     unsigned            timedout:1;
-     unsigned            error:1;
-     unsigned            destroyed:1;
-+    unsigned            pipeline:1;
- 
-     unsigned            idle:1;
-     unsigned            reusable:1;
-diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
-index 131a2c83..5e0340b2 100644
---- a/src/http/ngx_http_request.c
-+++ b/src/http/ngx_http_request.c
-@@ -2753,7 +2753,8 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
-         || (clcf->lingering_close == NGX_HTTP_LINGERING_ON
-             && (r->lingering_close
-                 || r->header_in->pos < r->header_in->last
--                || r->connection->read->ready)))
-+                || r->connection->read->ready
-+                || r->connection->pipeline)))
-     {
-         ngx_http_set_lingering_close(r->connection);
-         return;
-@@ -3123,6 +3124,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
- 
-         c->sent = 0;
-         c->destroyed = 0;
-+        c->pipeline = 1;
- 
-         if (rev->timer_set) {
-             ngx_del_timer(rev);
--- 
-2.30.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 21a2a69..52e1dc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 nginx-fix-pidfile.patch
 nginx-ssl_cert_cb_yield.patch
-bug-1024605.patch
-bug-973861.patch

From bb973756e23158b90aacedcc936cae114eeed96c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 25 Apr 2023 22:40:28 +0200
Subject: [PATCH 518/600] d/copyright: updated copyright

---
 debian/changelog |  2 ++
 debian/copyright | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 32fcc6e..b53cfd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ nginx (1.24.0-1) UNRELEASED; urgency=medium
   * New upstream version 1.24.0 
   * nginx ABI release: nginx-abi-1.24.0-1
   * d/p/bug-{1024605,973861}.patch removed, fixed in upstream
+  * d/copyright: updated copyright for files src/event/ngx_event_udp.h,
+    src/os/win32/ngx_dlopen
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Apr 2023 22:36:57 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 5738011..7fc2b36 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -186,6 +186,10 @@ Copyright: Roman Arutyunyan
  Nginx, Inc.
 License: BSD-2-clause
 
+Files: src/event/ngx_event_udp.h
+Copyright: Nginx, Inc.
+License: BSD-2-clause
+
 Files: src/http/modules/ngx_http_auth_request_module.c
   src/http/modules/ngx_http_grpc_module.c
   src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -285,6 +289,12 @@ Files: src/os/unix/ngx_setaffinity.c
 Copyright: Nginx, Inc.
 License: BSD-2-clause
 
+Files: src/os/win32/ngx_dlopen.c
+  src/os/win32/ngx_dlopen.h
+Copyright: Nginx, Inc.
+ Maxim Dounin
+License: BSD-2-clause
+
 Files: src/stream/ngx_stream.c
   src/stream/ngx_stream.h
   src/stream/ngx_stream_core_module.c

From b4078d94d481778cf4b142b68aa2b203d0ce4a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 26 Jun 2023 14:48:05 +0200
Subject: [PATCH 519/600] d/libnginx-mod.abisubstvars update version
 constraints of the 3rd party modules

---
 debian/changelog                 |  2 ++
 debian/libnginx-mod.abisubstvars | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b53cfd5..8ade4e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ nginx (1.24.0-1) UNRELEASED; urgency=medium
 
   * New upstream version 1.24.0 
   * nginx ABI release: nginx-abi-1.24.0-1
+  * d/libnginx-mod.abisubstvars update version constraints of the 3rd party
+    modules
   * d/p/bug-{1024605,973861}.patch removed, fixed in upstream
   * d/copyright: updated copyright for files src/event/ngx_event_udp.h,
     src/os/win32/ngx_dlopen
diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index e07fe78..556875b 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -8,16 +8,16 @@
 nginx:abi=nginx-abi-1.24.0-1
 
 # ABI-compatible versions of third-party modules
-libnginx-mod-http-auth-pam:Version=1:1.5.3-3
-libnginx-mod-http-cache-purge:Version=1:2.3-4
-libnginx-mod-http-dav-ext:Version=1:3.0.0-3
-libnginx-mod-http-echo:Version=1:0.63-4
-libnginx-mod-http-fancyindex:Version=1:0.5.2-3
-libnginx-mod-http-geoip2:Version=1:3.4-3
-libnginx-mod-http-headers-more-filter:Version=1:0.34-3
-libnginx-mod-http-lua:Version=1:0.10.23-1
-libnginx-mod-http-subs-filter:Version=1:0.6.4-4
-libnginx-mod-http-uploadprogress:Version=1:0.9.2-3
-libnginx-mod-http-upstream-fair:Version=1:0.0~git20120408.a18b409-3
-libnginx-mod-nchan:Version=1:1.3.6+dfsg-2
-libnginx-mod-geoip2:Version=1:3.4-3
+libnginx-mod-http-auth-pam:Version=1:1.5.3-4
+libnginx-mod-http-cache-purge:Version=1:2.3-5
+libnginx-mod-http-dav-ext:Version=1:3.0.0-4
+libnginx-mod-http-echo:Version=1:0.63-5
+libnginx-mod-http-fancyindex:Version=1:0.5.2-4
+libnginx-mod-http-geoip2:Version=1:3.4-4
+libnginx-mod-http-headers-more-filter:Version=1:0.34-4
+libnginx-mod-http-lua:Version=1:0.10.23-2
+libnginx-mod-http-subs-filter:Version=1:0.6.4-5
+libnginx-mod-http-uploadprogress:Version=1:0.9.2-4
+libnginx-mod-http-upstream-fair:Version=1:0.0~git20120408.a18b409-4
+libnginx-mod-nchan:Version=1:1.3.6+dfsg-3
+libnginx-mod-geoip2:Version=1:3.4-4

From d6229b0698bb014efefbc0b13a41e4eb629bee2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 26 Jun 2023 15:20:12 +0200
Subject: [PATCH 520/600] d/changelog fix whitespace

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8ade4e0..c249bfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 nginx (1.24.0-1) UNRELEASED; urgency=medium
 
-  * New upstream version 1.24.0 
+  * New upstream version 1.24.0
   * nginx ABI release: nginx-abi-1.24.0-1
   * d/libnginx-mod.abisubstvars update version constraints of the 3rd party
     modules

From 54146b604bee2c7db53349477e9e293780df41b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 27 Jun 2023 23:19:52 +0200
Subject: [PATCH 521/600] release nginx 1.24.0-1, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c249bfe..d060a12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.24.0-1) UNRELEASED; urgency=medium
+nginx (1.24.0-1) unstable; urgency=medium
 
   * New upstream version 1.24.0
   * nginx ABI release: nginx-abi-1.24.0-1
@@ -8,7 +8,7 @@ nginx (1.24.0-1) UNRELEASED; urgency=medium
   * d/copyright: updated copyright for files src/event/ngx_event_udp.h,
     src/os/win32/ngx_dlopen
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 25 Apr 2023 22:36:57 +0200
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:19:31 +0200
 
 nginx (1.22.1-9) unstable; urgency=medium
 

From 2d48a8c8ece57bd74eb1539f6a8b0fbea37dabc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Fri, 30 Jun 2023 11:54:17 +0200
Subject: [PATCH 522/600] d/control add dependency nginx-common to nginx

---
 debian/changelog | 12 ++++++++++++
 debian/control   |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d060a12..40bbef8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nginx (1.24.0-2) UNRELEASED; urgency=medium
+
+  * d/control added dependency nginx-common to nginx (Closes: 1039905)
+    After nginx installation, the nginx-common package is installed
+    automatically due to its dependencies. The nginx-common package includes
+    the systemd unit, which becomes enabled and activated upon installation.
+    When the nginx is removed, nginx-common package and the systemd unit will
+    remain in the system. Adding a dependency nginx-common to nginx solves
+    this problem.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
+
 nginx (1.24.0-1) unstable; urgency=medium
 
   * New upstream version 1.24.0
diff --git a/debian/control b/debian/control
index 7c37ce9..42833a8 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,9 @@ Breaks: nginx (<< 1.22.1-8)
 Replaces: nginx (<< 1.22.1-8)
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+         nginx (>= ${source:Version}),
+         nginx (<< ${source:Version}.1~),
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server

From 3f8de1c0866b174a505deade1fb172bd6300f92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 13 Jul 2023 20:35:28 +0200
Subject: [PATCH 523/600] d/control fixed binNMU safe dependency declaration
 nginx to nginx-common

---
 debian/changelog | 2 ++
 debian/control   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40bbef8..c9e0031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
     When the nginx is removed, nginx-common package and the systemd unit will
     remain in the system. Adding a dependency nginx-common to nginx solves
     this problem.
+  * d/control fixed binNMU safe dependency declaration nginx to nginx-common,
+    nginx is 'any', nginx-common is 'all' -> dependency '= ${source:Version}'
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
 
diff --git a/debian/control b/debian/control
index 42833a8..8d2d93f 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,7 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          iproute2,
-         nginx-common (<< ${source:Version}.1~),
-         nginx-common (>= ${source:Version}),
+         nginx-common (= ${source:Version}),
 Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
 Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
 Provides: httpd, httpd-cgi, ${nginx:abi}

From b8d9144432ae3f0f07f01f8da6c89b66526be8b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 15 Jul 2023 20:24:35 +0200
Subject: [PATCH 524/600] * d/rules fixed
 debug-symbol-migration-possibly-complete lintian warning

---
 debian/changelog | 3 +++
 debian/rules     | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9e0031..9e666d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
     this problem.
   * d/control fixed binNMU safe dependency declaration nginx to nginx-common,
     nginx is 'any', nginx-common is 'all' -> dependency '= ${source:Version}'
+  * d/rules replaced '--dbgsym-migration='nginx-dbg (<< 1.10.1-3~)' by
+    -O--automatic-dbgsym, and fixed debug-symbol-migration-possibly-complete
+    lintian warning
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
 
diff --git a/debian/rules b/debian/rules
index da5f06e..76c7576 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,8 +118,7 @@ build.src:
 	pod2man debian/debhelper/dh_nginx > $(BUILDDIR_src)/dh_nginx.1
 
 strip.arch.%:
-	#dh_strip --package=nginx-$(*) -O--dbgsym-migration='nginx-$(*)-dbg (<< 1.10.1-3~)'
-	dh_strip --package=nginx -O--dbgsym-migration='nginx-dbg (<< 1.10.1-3~)'
+	dh_strip --package=nginx -O--automatic-dbgsym
 
 strip.mods.%:
 	dh_strip --package=libnginx-mod-$(*) -O--automatic-dbgsym

From 9d8220a199606811a7fc530df9d98d6f661b395e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sat, 15 Jul 2023 21:24:09 +0200
Subject: [PATCH 525/600] d/po/ro.po add Romanian debconf translation

---
 debian/changelog |  2 ++
 debian/po/ro.po  | 81 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 debian/po/ro.po

diff --git a/debian/changelog b/debian/changelog
index 9e666d8..ae17e79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
   * d/rules replaced '--dbgsym-migration='nginx-dbg (<< 1.10.1-3~)' by
     -O--automatic-dbgsym, and fixed debug-symbol-migration-possibly-complete
     lintian warning
+  * d/po/ro.po added Romanian debconf translation. (Closes: 1033084),
+    Thanks to Remus-Gabriel Chelu
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
 
diff --git a/debian/po/ro.po b/debian/po/ro.po
new file mode 100644
index 0000000..9877cb1
--- /dev/null
+++ b/debian/po/ro.po
@@ -0,0 +1,81 @@
+# Mesajele în limba română pentru pachetul nginx.
+# Romanian translation of nginx.
+# Copyright © 2023 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
+#
+# Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2023.
+#
+# Cronologia traducerii fișierului „nginx”:
+# Traducerea inițială, făcută de R-GC, pentru versiunea nginx 1.22.1-7(2016-10-04).
+# Actualizare a traducerii pentru versiunea Y, făcută de X, Y(anul).
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx 1.22.1-7\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2023-03-13 12:29+0100\n"
+"Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n"
+"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && "
+"n%100<=19) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 3.2.2\n"
+
+# R-GC, scrie:
+# după revzarea fișierului, RA spune:
+# „Unele fișiere jurnal de «nginx» parsă fie nesecurizate” → „... par să ...”
+# ****
+# Corecție aplicată!
+#. Type: note
+#. Description
+#: ../nginx.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Unele fișiere jurnal de «nginx» par să fie nesecurizate"
+
+#. Type: note
+#. Description
+#: ../nginx.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"Următoarele fișiere jurnal din directorul „/var/log/nginx” sunt legături "
+"simbolice deținute de „www-data”:"
+
+#. Type: note
+#. Description
+#: ../nginx.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+# R-GC, scrie:
+# după revzarea fișierului, RA spune:
+# „Deoarece până la nginx 1.4.4-4 directorul „/var/log/nginx” a fost deținut de „www-data”. Ca rezultat, „www-data” ar putea crea legături simbolice ...”
+# → aici avem o fraza incompleta. Acel "deoarece" are nevoie de un efect, de exemplu:
+# „Deoarece până la nginx 1.4.4-4 directorul ... a fost deținut de „www-data”, ca rezultat, ...”
+# *****
+# Corecție aplicată, cu o corecție ;)  →
+# „... deținut de „www-data”; ca rezultat, ...”
+# adică: , → ;
+#. Type: note
+#. Description
+#: ../nginx.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-data "
+"could symlink log files to sensitive locations, which in turn could lead to "
+"privilege escalation attacks. Although /var/log/nginx permissions are now fixed "
+"it is possible that such insecure links already exist. So, please make sure to "
+"check the above locations."
+msgstr ""
+"Deoarece până la nginx 1.4.4-4 directorul „/var/log/nginx” a fost deținut de "
+"„www-data”; ca rezultat, „www-data” ar putea crea legături simbolice a "
+"fișierelor jurnal către locații sensibile, ceea ce, la rândul său, ar putea "
+"duce la atacuri de escaladare a privilegiilor. Deși permisiunile directorului „/"
+"var/log/nginx” sunt acum remediate, este posibil ca astfel de legături nesigure "
+"să existe deja. Prin urmare, asigurați-vă că verificați locațiile de mai sus."

From 7b0bfbb9f32a1a1d173edd43c29e26a104054d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 17 Jul 2023 05:24:19 +0200
Subject: [PATCH 526/600] d/rules removed override_dh_strip

---
 debian/changelog |  5 ++---
 debian/rules     | 15 ---------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae17e79..f959d41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,9 +9,8 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
     this problem.
   * d/control fixed binNMU safe dependency declaration nginx to nginx-common,
     nginx is 'any', nginx-common is 'all' -> dependency '= ${source:Version}'
-  * d/rules replaced '--dbgsym-migration='nginx-dbg (<< 1.10.1-3~)' by
-    -O--automatic-dbgsym, and fixed debug-symbol-migration-possibly-complete
-    lintian warning
+  * d/rules removed override_dh_strip, migration to automatic debug symbols is
+    already done, fixes debug-symbol-migration-possibly-complete lint. warning
   * d/po/ro.po added Romanian debconf translation. (Closes: 1033084),
     Thanks to Remus-Gabriel Chelu
 
diff --git a/debian/rules b/debian/rules
index 76c7576..1d037dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,14 +6,6 @@ debian_cflags:=$(shell dpkg-buildflags --get CFLAGS) -fPIC $(shell dpkg-buildfla
 debian_ldflags:=$(shell dpkg-buildflags --get LDFLAGS) -fPIC
 
 FLAVOURS := bin
-DYN_MODS := \
-	http-geoip \
-	http-image-filter \
-	http-perl \
-	http-xslt-filter \
-	mail \
-	stream \
-	stream-geoip
 
 BASEDIR = $(CURDIR)
 $(foreach flavour,$(FLAVOURS) src ,$(eval BUILDDIR_$(flavour) = $(CURDIR)/debian/build-$(flavour)))
@@ -86,7 +78,6 @@ bin_configure_flags := \
 
 override_dh_auto_configure: $(foreach flavour,$(FLAVOURS),config.arch.$(flavour)) config.src
 override_dh_auto_build:     $(foreach flavour,$(FLAVOURS),build.arch.$(flavour)) build.src
-override_dh_strip:          $(foreach flavour,$(FLAVOURS),strip.arch.$(flavour)) $(foreach mod,$(DYN_MODS),strip.mods.$(mod))
 override_dh_clean:          $(foreach flavour,$(FLAVOURS),clean.$(flavour)) clean.src
 	dh_clean
 
@@ -117,12 +108,6 @@ build.src:
 	echo "NGX_CONF_FLAGS=(" $(basic_configure_flags) ")" > $(BUILDDIR_src)/conf_flags
 	pod2man debian/debhelper/dh_nginx > $(BUILDDIR_src)/dh_nginx.1
 
-strip.arch.%:
-	dh_strip --package=nginx -O--automatic-dbgsym
-
-strip.mods.%:
-	dh_strip --package=libnginx-mod-$(*) -O--automatic-dbgsym
-
 config.arch.%:
 	dh_testdir
 	mkdir -p $(BUILDDIR_$*)

From d99a0ddc0bd902aa0756942b9ac8fcc5cad59282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 17 Jul 2023 06:25:07 +0200
Subject: [PATCH 527/600] d/conf/mime.types copy mime.types from upstream
 nginx, no big changes, just reformat the text

---
 debian/conf/mime.types | 175 +++++++++++++++++++++--------------------
 1 file changed, 89 insertions(+), 86 deletions(-)

diff --git a/debian/conf/mime.types b/debian/conf/mime.types
index 692b16c..1c00d70 100644
--- a/debian/conf/mime.types
+++ b/debian/conf/mime.types
@@ -1,96 +1,99 @@
 
 types {
-    text/html                             html htm shtml;
-    text/css                              css;
-    text/xml                              xml;
-    image/gif                             gif;
-    image/jpeg                            jpeg jpg;
-    application/javascript                js;
-    application/atom+xml                  atom;
-    application/rss+xml                   rss;
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
 
-    text/mathml                           mml;
-    text/plain                            txt;
-    text/vnd.sun.j2me.app-descriptor      jad;
-    text/vnd.wap.wml                      wml;
-    text/x-component                      htc;
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
 
-    image/avif                            avif;
-    image/png                             png;
-    image/svg+xml                         svg svgz;
-    image/tiff                            tif tiff;
-    image/vnd.wap.wbmp                    wbmp;
-    image/webp                            webp;
-    image/x-icon                          ico;
-    image/x-jng                           jng;
-    image/x-ms-bmp                        bmp;
+    image/avif                                       avif;
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
 
-    font/woff                             woff;
-    font/woff2                            woff2;
+    font/woff                                        woff;
+    font/woff2                                       woff2;
 
-    application/java-archive              jar war ear;
-    application/json                      json;
-    application/mac-binhex40              hqx;
-    application/msword                    doc;
-    application/pdf                       pdf;
-    application/postscript                ps eps ai;
-    application/rtf                       rtf;
-    application/vnd.apple.mpegurl         m3u8;
-    application/vnd.google-earth.kml+xml  kml;
-    application/vnd.google-earth.kmz      kmz;
-    application/vnd.ms-excel              xls;
-    application/vnd.ms-fontobject         eot;
-    application/vnd.ms-powerpoint         ppt;
-    application/vnd.oasis.opendocument.graphics        odg;
-    application/vnd.oasis.opendocument.presentation    odp;
-    application/vnd.oasis.opendocument.spreadsheet     ods;
-    application/vnd.oasis.opendocument.text            odt;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation    pptx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet    xlsx;
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
-    application/vnd.wap.wmlc              wmlc;
-    application/wasm                      wasm;
-    application/x-7z-compressed           7z;
-    application/x-cocoa                   cco;
-    application/x-java-archive-diff       jardiff;
-    application/x-java-jnlp-file          jnlp;
-    application/x-makeself                run;
-    application/x-perl                    pl pm;
-    application/x-pilot                   prc pdb;
-    application/x-rar-compressed          rar;
-    application/x-redhat-package-manager  rpm;
-    application/x-sea                     sea;
-    application/x-shockwave-flash         swf;
-    application/x-stuffit                 sit;
-    application/x-tcl                     tcl tk;
-    application/x-x509-ca-cert            der pem crt;
-    application/x-xpinstall               xpi;
-    application/xhtml+xml                 xhtml;
-    application/xspf+xml                  xspf;
-    application/zip                       zip;
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/wasm                                 wasm;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
 
-    application/octet-stream              bin exe dll;
-    application/octet-stream              deb;
-    application/octet-stream              dmg;
-    application/octet-stream              iso img;
-    application/octet-stream              msi msp msm;
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
 
-    audio/midi                            mid midi kar;
-    audio/mpeg                            mp3;
-    audio/ogg                             ogg;
-    audio/x-m4a                           m4a;
-    audio/x-realaudio                     ra;
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
 
-    video/3gpp                            3gpp 3gp;
-    video/mp2t                            ts;
-    video/mp4                             mp4;
-    video/mpeg                            mpeg mpg;
-    video/quicktime                       mov;
-    video/webm                            webm;
-    video/x-flv                           flv;
-    video/x-m4v                           m4v;
-    video/x-mng                           mng;
-    video/x-ms-asf                        asx asf;
-    video/x-ms-wmv                        wmv;
-    video/x-msvideo                       avi;
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
 }

From 1669ce81fafde1e06508bbcc46c67f90a867c385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 17 Jul 2023 06:25:37 +0200
Subject: [PATCH 528/600] d/conf/mime.types add video/ogg, video/x-matroska

---
 debian/changelog       | 1 +
 debian/conf/mime.types | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f959d41..3a7ae65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
     already done, fixes debug-symbol-migration-possibly-complete lint. warning
   * d/po/ro.po added Romanian debconf translation. (Closes: 1033084),
     Thanks to Remus-Gabriel Chelu
+  * d/conf/mime.types added video/ogg, video/x-matroska (Closes: 1028144)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
 
diff --git a/debian/conf/mime.types b/debian/conf/mime.types
index 1c00d70..479781b 100644
--- a/debian/conf/mime.types
+++ b/debian/conf/mime.types
@@ -88,10 +88,12 @@ types {
     video/mp2t                                       ts;
     video/mp4                                        mp4;
     video/mpeg                                       mpeg mpg;
+    video/ogg                                        ogv;
     video/quicktime                                  mov;
     video/webm                                       webm;
     video/x-flv                                      flv;
     video/x-m4v                                      m4v;
+    video/x-matroska                                 mkv;
     video/x-mng                                      mng;
     video/x-ms-asf                                   asx asf;
     video/x-ms-wmv                                   wmv;

From f72db03173285ea75bea1af58a21449c932787e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 30 Aug 2023 15:50:18 +0200
Subject: [PATCH 529/600] d/po/sv.po added Swedish debconf translation

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3a7ae65..dcaf09e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
     already done, fixes debug-symbol-migration-possibly-complete lint. warning
   * d/po/ro.po added Romanian debconf translation. (Closes: 1033084),
     Thanks to Remus-Gabriel Chelu
+  * d/po/sv.po added Swedish debconf translation. (Closes: 1050443),
+    Thanks to Peter Kvillegård
   * d/conf/mime.types added video/ogg, video/x-matroska (Closes: 1028144)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200

From dbecf37340289e32b3e0141e7c08e9c178cf24e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 30 Aug 2023 15:52:01 +0200
Subject: [PATCH 530/600] d/po/sv.po added Swedish debconf translation

---
 debian/po/sv.po | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 debian/po/sv.po

diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644
index 0000000..152e111
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,58 @@
+# Swedish translation of nginx debconf messages
+# Copyright (C) 2016 Christos Trochalakis
+# This file is distributed under the same license as the nginx package.
+# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
+# Peter Kvillegård <peterkvillegard@posteo.net>, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nginx 1.24.0-1\n"
+"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
+"POT-Creation-Date: 2016-10-04 20:03+0300\n"
+"PO-Revision-Date: 2023-08-21 19:01+0200\n"
+"Last-Translator: Peter Kvillegård <peterkvillegard@posteo.net>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.2.2\n"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "Possible insecure nginx log files"
+msgstr "Möjligen osäkra loggfiler för nginx"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"The following log files under /var/log/nginx directory are symlinks owned by "
+"www-data:"
+msgstr ""
+"Följande loggfiler i katalogen /var/log/nginx är symboliska länkar som ägs "
+"av www-data:"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid "${logfiles}"
+msgstr "${logfiles}"
+
+#. Type: note
+#. Description
+#: ../nginx-common.templates:1001
+msgid ""
+"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
+"data could symlink log files to sensitive locations, which in turn could "
+"lead to privilege escalation attacks. Although /var/log/nginx permissions "
+"are now fixed it is possible that such insecure links already exist. So, "
+"please make sure to check the above locations."
+msgstr ""
+"Före nginx 1.4.4-4 ägdes /var/log/nginx av www-data, vilket innebar att www-"
+"data kunde skapa loggfiler som var symboliska länkar till känsliga platser, "
+"vilket i sin tur kunde leda till behörighetsintrång. Även om rättigheterna "
+"för /var/log/nginx är fixade nu så är det möjligt att sådana osäkra länkar "
+"finns kvar. Se till att kontrollera ovan nämnda platser."

From 1c1713f7479092121dc0408dac3dccad1e53b4e4 Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@devalps.eu>
Date: Mon, 25 Sep 2023 12:41:08 +0000
Subject: [PATCH 531/600] Add QUIC UFW app

---
 debian/ufw/nginx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/ufw/nginx b/debian/ufw/nginx
index 0cb0449..ad886ba 100644
--- a/debian/ufw/nginx
+++ b/debian/ufw/nginx
@@ -12,3 +12,8 @@ ports=443/tcp
 title=Web Server (Nginx, HTTP + HTTPS)
 description=Small, but very powerful and efficient web server
 ports=80,443/tcp
+
+[Nginx QUIC]
+title=Web Server (Nginx, HTTP + HTTPS + QUIC)
+description=Small, but very powerful and efficient web server
+ports=80,443/tcp|443/udp

From f3ce71ad918201dcc04ee1193037dc93c9ee9aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 9 Oct 2023 15:27:38 +0200
Subject: [PATCH 532/600] d/control add nginx-dev dependency on ${nginx:abi}

---
 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dcaf09e..434e48d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
   * d/po/sv.po added Swedish debconf translation. (Closes: 1050443),
     Thanks to Peter Kvillegård
   * d/conf/mime.types added video/ogg, video/x-matroska (Closes: 1028144)
+  * d/control added nginx-dev dependency on ${nginx:abi}
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
 
diff --git a/debian/control b/debian/control
index 8d2d93f..a1fcbe9 100644
--- a/debian/control
+++ b/debian/control
@@ -66,6 +66,7 @@ Package: nginx-dev
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${S:Build-Depends},
+         ${nginx:abi},
          nginx (<< ${source:Version}.1~),
          nginx (>= ${source:Version}),
 Provides: dh-sequence-nginx

From 60b5a28e2db8e097f523594b1b540e5ef9254f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 10 Oct 2023 20:22:50 +0000
Subject: [PATCH 533/600] CVE-2023-44487 fix

---
 debian/changelog                    |  2 +
 debian/patches/CVE-2023-44487.patch | 75 +++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 78 insertions(+)
 create mode 100644 debian/patches/CVE-2023-44487.patch

diff --git a/debian/changelog b/debian/changelog
index dcaf09e..71d97fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
   * d/po/sv.po added Swedish debconf translation. (Closes: 1050443),
     Thanks to Peter Kvillegård
   * d/conf/mime.types added video/ogg, video/x-matroska (Closes: 1028144)
+  * d/p/CVE-2023-44487.patch fixes CVE-2023-44487 denial of service (server
+    resource consumption)  (Closes: 1053770)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
 
diff --git a/debian/patches/CVE-2023-44487.patch b/debian/patches/CVE-2023-44487.patch
new file mode 100644
index 0000000..401f30b
--- /dev/null
+++ b/debian/patches/CVE-2023-44487.patch
@@ -0,0 +1,75 @@
+From 6ceef192e7af1c507826ac38a2d43f08bf265fb9 Mon Sep 17 00:00:00 2001
+From: Maxim Dounin <mdounin@mdounin.ru>
+Date: Tue, 10 Oct 2023 15:13:39 +0300
+Subject: [PATCH] HTTP/2: per-iteration stream handling limit.
+Origin: https://github.com/nginx/nginx/commit/6ceef192e7af1c507826ac38a2d43f08bf265fb9
+Forwarded: not-needed
+
+To ensure that attempts to flood servers with many streams are detected
+early, a limit of no more than 2 * max_concurrent_streams new streams per one
+event loop iteration was introduced.  This limit is applied even if
+max_concurrent_streams is not yet reached - for example, if corresponding
+streams are handled synchronously or reset.
+
+Further, refused streams are now limited to maximum of max_concurrent_streams
+and 100, similarly to priority_limit initial value, providing some tolerance
+to clients trying to open several streams at the connection start, yet
+low tolerance to flooding attempts.
+---
+ src/http/v2/ngx_http_v2.c | 15 +++++++++++++++
+ src/http/v2/ngx_http_v2.h |  2 ++
+ 2 files changed, 17 insertions(+)
+
+Index: nginx/src/http/v2/ngx_http_v2.c
+===================================================================
+--- nginx.orig/src/http/v2/ngx_http_v2.c
++++ nginx/src/http/v2/ngx_http_v2.c
+@@ -361,6 +361,7 @@ ngx_http_v2_read_handler(ngx_event_t *re
+     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");
+ 
+     h2c->blocked = 1;
++    h2c->new_streams = 0;
+ 
+     if (c->close) {
+         c->close = 0;
+@@ -1321,6 +1322,14 @@ ngx_http_v2_state_headers(ngx_http_v2_co
+         goto rst_stream;
+     }
+ 
++    if (h2c->new_streams++ >= 2 * h2scf->concurrent_streams) {
++        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
++                      "client sent too many streams at once");
++
++        status = NGX_HTTP_V2_REFUSED_STREAM;
++        goto rst_stream;
++    }
++
+     if (!h2c->settings_ack
+         && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
+         && h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
+@@ -1386,6 +1395,12 @@ ngx_http_v2_state_headers(ngx_http_v2_co
+ 
+ rst_stream:
+ 
++    if (h2c->refused_streams++ > ngx_max(h2scf->concurrent_streams, 100)) {
++        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
++                      "client sent too many refused streams");
++        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_NO_ERROR);
++    }
++
+     if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
+         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+     }
+Index: nginx/src/http/v2/ngx_http_v2.h
+===================================================================
+--- nginx.orig/src/http/v2/ngx_http_v2.h
++++ nginx/src/http/v2/ngx_http_v2.h
+@@ -124,6 +124,8 @@ struct ngx_http_v2_connection_s {
+     ngx_uint_t                       processing;
+     ngx_uint_t                       frames;
+     ngx_uint_t                       idle;
++    ngx_uint_t                       new_streams;
++    ngx_uint_t                       refused_streams;
+     ngx_uint_t                       priority_limit;
+ 
+     ngx_uint_t                       pushing;
diff --git a/debian/patches/series b/debian/patches/series
index 52e1dc4..48dd724 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 nginx-fix-pidfile.patch
 nginx-ssl_cert_cb_yield.patch
+CVE-2023-44487.patch

From 81aeb5321d43de4dfecff4cea720da2568384414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 10 Oct 2023 21:50:39 +0000
Subject: [PATCH 534/600] dh-sequence-nginx: automatic libnginx-mod-stream
 dependencies

---
 debian/debhelper/nginx_mod.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/debhelper/nginx_mod.pm b/debian/debhelper/nginx_mod.pm
index 7df00d4..1b1ecaf 100644
--- a/debian/debhelper/nginx_mod.pm
+++ b/debian/debhelper/nginx_mod.pm
@@ -35,12 +35,18 @@ sub _NDK_SRC_DIR {
 sub new {
 	my $class=shift;
 	my $this= $class->SUPER::new(@_);
+	my $ngx_ver = `grep 'define NGINX_VERSION' /usr/share/nginx/src/src/core/nginx.h | sed -e 's/^.*"\\(.*\\)".*/\\1/'`;
+	chomp($ngx_ver);
 	$this->prefer_out_of_source_building(@_);
 	$this->{has_ndk} = $this->has_build_dep("libnginx-mod-http-ndk-dev");
+	$this->{has_stream} = $this->has_build_dep("libnginx-mod-stream");
 	foreach my $cur (getpackages('arch')) {
 		if ($this->{has_ndk} == 1) {
 			addsubstvar($cur, "misc:Depends", "libnginx-mod-http-ndk");
 		}
+		if ($this->{has_stream} == 1) {
+			addsubstvar($cur, "misc:Depends", "libnginx-mod-stream (>= $ngx_ver), libnginx-mod-stream (<< $ngx_ver.1~)");
+		}
 	}
 	return $this;
 }
@@ -63,6 +69,7 @@ sub configure {
 		--add-dynamic-module="$pwd_dir/$src_dir" \\
 		--builddir="$pwd_dir/$bld_dir" \\
 		' . ($this->{has_ndk} ? '--add-module=' . $this->_NDK_SRC_DIR : '') . ' \\
+		' . ($this->{has_stream} ? '--with-stream' : '') . ' \\
 		"$@"', "dummy", @_);
 }
 
@@ -79,6 +86,10 @@ sub test {
 		unshift @_, "ndk_http_module.so";
 	}
 
+	if ( $this->{has_stream} and !grep( /^ngx_stream_module.so$/, @_ ) ) {
+		unshift @_, "ngx_stream_module.so";
+	}
+
 	$this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
 		tmp_conf=$(mktemp -p .)
 		for pre_dep in "$@"; do

From 9515e05cd08ed2fc4e582875fdf495bd09dc4bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 10 Oct 2023 23:54:50 +0200
Subject: [PATCH 535/600] d/debhelper/nginx_mod.pm automatic
 libnginx-mod-stream dependencies

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 39b11d1..583563e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
   * d/p/CVE-2023-44487.patch fixes CVE-2023-44487 denial of service (server
     resource consumption)  (Closes: 1053770)
   * d/control added nginx-dev dependency on ${nginx:abi}
+  * d/debhelper/nginx_mod.pm automatic libnginx-mod-stream dependencies
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
 

From 192281805a7f51013fa880bcfee393dec37d132d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 11 Oct 2023 00:39:21 +0200
Subject: [PATCH 536/600] release nginx 1.24.0-2, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 583563e..8ae5cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.24.0-2) UNRELEASED; urgency=medium
+nginx (1.24.0-2) unstable; urgency=medium
 
   * d/control added dependency nginx-common to nginx (Closes: 1039905)
     After nginx installation, the nginx-common package is installed
@@ -21,7 +21,7 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
   * d/control added nginx-dev dependency on ${nginx:abi}
   * d/debhelper/nginx_mod.pm automatic libnginx-mod-stream dependencies
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Oct 2023 00:39:04 +0200
 
 nginx (1.24.0-1) unstable; urgency=medium
 

From 5953afe398bd9d93e8faecff1f8902461737573a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 11 Oct 2023 01:13:28 +0200
Subject: [PATCH 537/600] Revert "release nginx 1.24.0-2, upload to unstable"

This reverts commit 192281805a7f51013fa880bcfee393dec37d132d.
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ae5cba..583563e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.24.0-2) unstable; urgency=medium
+nginx (1.24.0-2) UNRELEASED; urgency=medium
 
   * d/control added dependency nginx-common to nginx (Closes: 1039905)
     After nginx installation, the nginx-common package is installed
@@ -21,7 +21,7 @@ nginx (1.24.0-2) unstable; urgency=medium
   * d/control added nginx-dev dependency on ${nginx:abi}
   * d/debhelper/nginx_mod.pm automatic libnginx-mod-stream dependencies
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Oct 2023 00:39:04 +0200
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
 
 nginx (1.24.0-1) unstable; urgency=medium
 

From 14846e923db103c3f03e26ef1a0ed145e59c6474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 11 Oct 2023 01:14:14 +0200
Subject: [PATCH 538/600] d/changelog update CVE-2023-44487 description

---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 583563e..9e22cd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
   * d/po/sv.po added Swedish debconf translation. (Closes: 1050443),
     Thanks to Peter Kvillegård
   * d/conf/mime.types added video/ogg, video/x-matroska (Closes: 1028144)
-  * d/p/CVE-2023-44487.patch fixes CVE-2023-44487 denial of service (server
-    resource consumption)  (Closes: 1053770)
+  * d/p/CVE-2023-44487.patch adds additional mitigations for CVE-2023-44487
+    that according to NGINX developers on nginx-devel are already suitably
+    mitigated with the default config options for keepalive. (Closes: 1053770)
   * d/control added nginx-dev dependency on ${nginx:abi}
   * d/debhelper/nginx_mod.pm automatic libnginx-mod-stream dependencies
 

From ea0383bdb1adb9eb9bd555e4a90547dac6baeafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 11 Oct 2023 01:18:04 +0200
Subject: [PATCH 539/600] release nginx 1.24.0-2, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e22cd0..a03601e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.24.0-2) UNRELEASED; urgency=medium
+nginx (1.24.0-2) unstable; urgency=medium
 
   * d/control added dependency nginx-common to nginx (Closes: 1039905)
     After nginx installation, the nginx-common package is installed
@@ -22,7 +22,7 @@ nginx (1.24.0-2) UNRELEASED; urgency=medium
   * d/control added nginx-dev dependency on ${nginx:abi}
   * d/debhelper/nginx_mod.pm automatic libnginx-mod-stream dependencies
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 30 Jun 2023 09:52:25 +0200
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Oct 2023 01:17:51 +0200
 
 nginx (1.24.0-1) unstable; urgency=medium
 

From fbe69d2fe0c4f32afd7687e86684529b67c5cc58 Mon Sep 17 00:00:00 2001
From: K Widholm <help@theapotek.com>
Date: Fri, 27 Oct 2023 02:06:46 +0000
Subject: [PATCH 540/600] Update file mime.types

---
 debian/conf/mime.types | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/conf/mime.types b/debian/conf/mime.types
index 479781b..b6a3aa5 100644
--- a/debian/conf/mime.types
+++ b/debian/conf/mime.types
@@ -1,4 +1,3 @@
-
 types {
     text/html                                        html htm shtml;
     text/css                                         css;
@@ -70,6 +69,7 @@ types {
     application/x-xpinstall                          xpi;
     application/xhtml+xml                            xhtml;
     application/xspf+xml                             xspf;
+    application/xslt+xml                             xsl xslt;
     application/zip                                  zip;
 
     application/octet-stream                         bin exe dll;

From 0b33ebb4a36e9784849f78bfb13a693de650e45d Mon Sep 17 00:00:00 2001
From: K Widholm <help@theapotek.com>
Date: Fri, 27 Oct 2023 02:15:04 +0000
Subject: [PATCH 541/600] Update file mime.types

---
 debian/conf/mime.types | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/conf/mime.types b/debian/conf/mime.types
index b6a3aa5..cf968c0 100644
--- a/debian/conf/mime.types
+++ b/debian/conf/mime.types
@@ -68,8 +68,8 @@ types {
     application/x-x509-ca-cert                       der pem crt;
     application/x-xpinstall                          xpi;
     application/xhtml+xml                            xhtml;
-    application/xspf+xml                             xspf;
     application/xslt+xml                             xsl xslt;
+    application/xspf+xml                             xspf;
     application/zip                                  zip;
 
     application/octet-stream                         bin exe dll;

From 488a716b96b45579fdfe787bdaaee8be96c6d336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 17:41:25 +0200
Subject: [PATCH 542/600] =?UTF-8?q?d/u/signing-key.asc=20add=20Roman=20Aru?=
 =?UTF-8?q?tyunyan=E2=80=99s=20PGP=20public=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog                |   7 ++
 debian/upstream/signing-key.asc | 118 ++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a03601e..15fb8e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.24.0-3) UNRELEASED; urgency=medium
+
+  * d/u/signing-key.asc add Roman Arutyunyan’s PGP public key,
+    the key is used to sign the 1.26.0 release
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200
+
 nginx (1.24.0-2) unstable; urgency=medium
 
   * d/control added dependency nginx-common to nginx (Closes: 1039905)
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 5e36f56..4b7818c 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -92,3 +92,121 @@ KSAulWi9OoqLyDWlsm3WccPIcJfbm71P+I/ha7ESVQfOxC92fQ7HQAboj7NhecJ4
 RLqjzrWSHmPGClI=
 =J2qy
 -----END PGP PUBLIC KEY BLOCK-----
+
+# Roman Arutyunyan’s PGP public key,
+# the key is used to sign the 1.26.0 release
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGYXyiQBEAC4jm1y+ODV4+YDGj9vp2BgHB4FJeQdgrBiVX+Mb2qCrEqJgeKV
+fVwKjkVYqnb76TTybdOKqCP5wdQrncKAKlXsMq6sdsiwPSrdRcjkeiE29WWrtbB4
+i+VObnoWklMblMxFQ1XQIkjs2wviidKjJw2VV3i4XnLSrHhWaWqviTLZCMQymoPs
+F+Tfu1WX9OUfOquekZ5KjkyBxB4ep6+NPeuIkPnW0SiTUhU8tbi8v0aBZEHSZLqE
+mq8KLROVuYSPvtU+NtaXAM09BHEVCfb409aDps9p6AFT+IN8yoOegGdEZjp6hJvS
+HxbhuwqNEtg4dTEV515YUCgKabqU1QaqI/Y0+Pdkpep1KRFc9YUYttDkCw7Ybu2u
+fwTGzwAbD+ThAIOdzmMDodzZaEMf+9fQG4bnO1PdNbXzyP7Kv9qzGa65+9oGCPOS
+qTpISR8pvzoI8w/Z/vG71ob/nQ6Xm0L986ksErdGhu16ZI7lW2eDYqy2IoFfbeSz
+HHxk484/pEibrlCRbP2Id+zULfxo1HGOGg+PAY9Q2uNzABsGDMnOhIvXHS+hP7oB
+sO9A4Prqu6K6cMp3QI219tmmOUegJpmGGPzoNgxR7H30wNcjZPv4PWr/c0fP70Ny
+ilgbdcEMDSHks30AmiuIvcUxo3A21p2nnpxsKAKYx42UJkyEK0HILMzcqwARAQAB
+tCZSb21hbiBBcnV0eXVueWFuIDxyLmFydXR5dW55YW5AZjUuY29tPokCTgQTAQgA
+OBYhBEM4eCXdsbuX7Da6XQB8jXwV2HNpBQJmF8pXAhsDBQsJCAcCBhUKCQgLAgQW
+AgMBAh4BAheAAAoJEAB8jXwV2HNppvQP/AjzdPKkGRzJkb1ioto/IEP1YhA/Eayk
+hvejJ0vyWVHXXH7FLW9fIZoApcsD1J8/7zIANm+62IfT3QNbL2R44IyhJB3AY22l
+t0ToLxodfugegF3NPYYyFOSRUoPD4g2T/dMCPOBX4MNEAnAlCmxAMaJNmQUO76IY
+GwELa3CH3Aqf7bthKy8P36G11hu7NgH6V9mVIRIpfnfpXFQIztj+vsWtswu4M5t7
+BNJwx4a2KTCVQpTdff5/0dO/5drQDxLbIg681WZk3Oe8Eu6nSc0Ud02NIkg1TQH/
+MryAp7o/ua3LRem+W/cktnT60p4uXPVZ3Rvg3zOmJSNJ+eIXY2+sDeZEPaROKldA
+IbnBacTsZjdswIlrbzinY8ZVRosaFlvHg/ESTBRItALHWCRdzOR1Wv1qy/PQfEEL
+qftDsCTQhssP1MHJWlejeqPlND3iT2vBDeOxqd6WhKuAc+L04iyBB6p867pwrgDF
+ecg82DPehsAnO2XBAFuIE/SLewkYm0B9HK7/J4LZqPwTAksPf/dnbMAmHWoBDqsu
+4U4U4SsJKsZ87R9ao8qO7IWCzHrXavHFmnbqweFfHToeKF/L4PB+tYoW3YmUOged
+CglpJv13bNWmRwL7+x8b7BwpVwClxHBHteDX4RIN5iPH9h20J4jIpzRa1kNJsTu1
+v4ZkqLWJlkiiiQEzBBABCAAdFiEEcziXMGntP0Q/TTffpk/VsXrbOagFAmYdpjsA
+CgkQpk/VsXrbOahISgf/U7ZO0yK0PsOcAFTB0TQBCNsAhxtJAEJoVoweuYiLk8jR
+0OeDRCy0BC//qWDLFT7NKuP50SM2u0Csbg+n6b0bdy+vXbbGVzIAYzG09rPYe2Q5
+qwqyAx+MMzyICXul9lGNU2qN2qjUXMb0mCWUhxwMvzRUeS7shT1CBhGrnpoYkY56
+NhWj7iG1BbLwYVQzDZC/Rp6rvwJQgZo7+DjaMjryGAEI0ujpUp8ywrPaJpwIuXDI
+D5BhcyUaEd3XOondHQNedlgERXHT4pN+oNMPWwN3+DeQYLS3FHiqyz05ZvoeWnao
+A2/fWNA+BqIdjilp/TDDI4Ef7c9hp13weaZggYB3M4kBMwQQAQgAHRYhBFc7/Ws9
+j7xkEHmmq6v1vYJ72b9iBQJmHabkAAoJEKv1vYJ72b9iDgoIAP1QJjl4ynLAV9Bo
+Ol4AAzxZ3x/2NEgLSnjLfhb/OduDxQlL9oPulWoLDG41xiZJkepEnQWmSsIYF6Xe
+RsAB+eREU2uCxqCvBXpyIs5npXvVDV2/PQuVEop7HByx6Hjr9XK8hugihnEi1p+9
+Ecbu+89fi93m3C/5uIIil46cHByjRZ+5Yy1UFUB/wsYud1qMcYmvDaqEo5AqWNcM
+gWUFhUfgGTtBbyvIWTeX0NHnrbzHP7lhmPfWsfOjAtO8PpM8Gz5RdNRq44DdRKdG
+uWVby/kni868H+8/tHalDR0I9/Mmg2Uax0eggTVpECv/4+xBduqSB2iPwgRnSzhZ
+6SVKJvKJAjMEEAEIAB0WIQT5TVS8DF1qZBfIzz/oLBEYr5TfbgUCZh5KVgAKCRDo
+LBEYr5TfbitgD/wMamMFfFZnPS7JS1NWEMb5fbhHob1EkmedIpbpRDXUtj0ksehW
+ZAEpmVF9btqS4B+B9tSK1VS2sy4XwEGodNVSGxdtF9W8+iAHAb6Hq1Z7ifWyb991
+Kt/pVk/8adxlU4G8h1fq0idhpnI8KvkAlPJR7+PoJOEN1+VdHS6tkE5LMTf6dF9F
+iVxKQczOS1b/GmfL3kYfu6UvI07ZuaP+90mOt/TZTwkzsWjRY2vofCIPSDY94rLj
+m6PmVFoU3PHLKW7yDz1YXkVE6SgQYGZ2bqB6OHJZnDXUTSHncHTbDVzZQekIs1lP
+V6e5N8Xo/VOpv28feKAsBqQ8ML53djmGUL0azjEz1g2kgPmTuZdKzZ5kcUsULdQV
+aRKcfyYD1oRpwwlw9GJAxliJHck1IdGGaCslrHtzkh3RMULlloAYitzD9jtKsrOj
+R19s+JK/tIfFZZ5gR5qhzgOL8WgkSrIaq2o9R4sigBz1IxnXXC573RDA2F5FAeE/
+K6EmAO+BqVkImZcmP1JsLtr+OM+jihXIILACEJwhOKPtZth9zrLYkXWB1nCaDxHp
+XEUpp6UPCQNgNX8NCghnJr5gis/SmYppgFlO9R9yZ7/LtP0tUX0CmhOeqGMnHt4R
+F8n8D7EBwMWvWjlUbsDkMKX4JORgojguHJZciWQC1gVRwJ0iTH/ImtzDnbQhUm9t
+YW4gQXJ1dHl1bnlhbiA8YXJ1dEBuZ2lueC5jb20+iQJOBBMBCAA4FiEEQzh4Jd2x
+u5fsNrpdAHyNfBXYc2kFAmYXyiQCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AA
+CgkQAHyNfBXYc2kRFw//VFuCnW3EwoLCWWgWCikgI9kbVDr0/Qiyf2Gb9sfOyzBN
+q/+ZGjTs7EqTHbYUiCTgjy8t0SNKizoCXjSWLToTAXhOeTY3wDuHkdc3C2OPMPgm
+HPGmdnfplmsZjj689sy0MTnlLmU/87texR/f3REAKtchVjo5AojuZxXJi+ryBvoz
+KXi82M1JaYlIr15T+OiRtfZ3cgfTkb5CRa0YRV7QQ1zhOiF0AFKVVikFwRuquphT
+y2cSLILLzOpwG/CjMJzO4VOASmGJmdicIfYSsZSzz37RrcfeYwR6quJ55Y9QF9IU
+fg5AHWufpXaf6FbMsW1U1mOq0tMvwvdcO+u5I5SBj6IkqO4zavmW/i5zkxaq96wF
+Qn6+oRkqHnNNn0hl/B4MWdEjDJsaDXfkQ3Snn4Bfl1JPT6cH2NDVYQn1siIOim/W
+G5lhGLNB1TOAVLHblQ2xILadK0T33y6lfRUV3BOW01BDoF0ndyd7LjG5Di/cjfSo
+1hvhTkW7QJGfzVV4IAAxEyHKlmgONfggZoplqukuPsq7eNNRPhvlZq632QXIqt6Y
+xE43Nk0O41rX/tWtB7eNcPvfNOc+sGljnCSwpRWyx9xO7plELVD9KdtcyHrIgora
+Flh7KsSbppSQ/iUKRNP+lfCQsMa1yrnQyxazss8OGlB7YpUJL4trQW35f/jXFD+J
+ATMEEAEIAB0WIQRzOJcwae0/RD9NN9+mT9Wxets5qAUCZh2mQQAKCRCmT9Wxets5
+qPBjB/0SDkET7h/Vw2PJKxuYujsL+tn3SKXshgyCM2u00njJM9TqpZbZV681unKM
+l8uHtj9b0Z4U0nHoNEC37wI5FJlxy1hLBw5f2fd/yi8LsD1KP2htjMUW+I2xjcdo
+FusQsIF0s8SyW1DZ3vvN2WcZpKHwub1sY9ZFBfxRc6w+33N4dJwXVXP57kj3Ci8j
+LDLfkaKyiuYgMtFYZiKKX0tfvaM5pXxLvLOzma9vwfjIMIllooZHDSI65jrbmMv0
+rfDKOX9Ws5Xi8n85jq6Oyq28QPLZUsmymCbhvBwq4FcdiyTl9sxCY4HLq0MzmJJ5
+DMhlFd2Ds3BopFTWCB2fvYyVoXRaiQEzBBABCAAdFiEEVzv9az2PvGQQeaarq/W9
+gnvZv2IFAmYdpugACgkQq/W9gnvZv2Jk4Qf+N0P/7FIHowlO01XmBB5KaztBmVb2
+Tj+jtYgPDHRf86O0kW40Rjx++zMlIRNWK4Ue5PKAi82Yue5uvZcVlpWpx/sMvL+N
+C4Xds3Q3qnkxkoemoIMqUKGvePjBpyUWArBkBQ3FrvZtywnzyFWNrvOpeM+5HIuz
+WBri/SHBHzQm1/Jl2r5pHcbUdSxB2o1v3f+SaS2vGxwigIf8v44pRfyeWgkoxYgN
++2zR0Ing6URZCYkAbwILsmmWGxJIuq+N9Xs1CQ1WZd5S78p/JBMDQ1prUDLCLFMc
+AvlZpQ0HvzEbKGiIVNa1LEQRF4ZWjQOHaPJhg/D3r/Q7VaFlgsOqrwtQaYkCMwQQ
+AQgAHRYhBPlNVLwMXWpkF8jPP+gsERivlN9uBQJmHkpZAAoJEOgsERivlN9u8fYQ
+AK0s0CvQNTXrg/Oe92Ajj+CpFIGhEUgXsufpg3OF+4doXOoRrVcv6y/0dGC+u899
+Qiz5rzP8JkgT3Bvs/oFbQnESX7zob/GuBiRAnaanQQGjQsc8tXUcIgIB8vZI6Hxr
+BZYyjXMrc1fAp1zy6F3YfVtjntp6Zt740zlcFSHPL6pKeNC8lCas7f7EPGm9ERlf
+XvPOsMyKVDRTrtYVrQ17pgmWzMFl9eYzAV81X/cK7O9BmTvLb9HB9THl9QM6iKWd
+UPNNhMseMA55i1y1trvv2rQSP2tm7xAijlffNu/LHyVjOJA+63rk9JqpQi2O/sI6
+naCZ5kLky3+OisbzJLtsIv3KWGF4jnpZJwPI97UbRAxrBCPd8BDXW06qQ0xfF9GA
+sW46IDnf5uNV5Fj9T1IhZUUCU6XwwhcTENwcaJ2hubPzW19gvxieRpxdvnXhjUxR
+UgqgFjtlpyBSABYr2REiaBTHkR1qVMa8tThpSyzfmfBNe9chBGQBdDMzTTUDf4dU
+cw4UGGPXqrBEapleoZBszXLrZxQxCNmLGFBW3vcJDfRRTvg/OMCIwD72kfd8KY1t
+SRRi5vQ3CvV8E0EEXshjxVk0fwS+5muM1thWZM4xCSgyH6Ka/5biMeUv1VNcKJne
+J51xs9jfS/JltrT/ahWG4J9msJFtmYyrLh/nMxccXK75uQINBGYXyiQBEAC5tT5O
+uysy75BcwAg8jIK+Cw6hNy+riOoCIzsMen8ps4tyDFLmRdpJmVOpmtvESaix2MHf
+Hc/t9hOsQ8LmF3kDG/JisDXcB/v28EOiDpp5Ug/5UOFBnbu4DkxbakJF8KF/rQ9t
+i29lt03saGCf2XbqzTLI6FvZ2TT8hDwAZF5aOtDEHV3ChBPn6gplnJADiZ9DioMZ
+ji1HnL8Zu4IYHMNOgpxULi6TMhBH/MkHbyycOdt/EsQFamnLGeV8KR2fubYjrpbH
+pLZzSRepQyvKIhHAFj6DUeDyEt2XAitxI8YI40IVO75Zu8ZZq0qYGML8Am+t6ZjJ
+3ZR8/DWjxRUYeo+YVEe5f+oRl5GRNkLtGvTAD38Nb2/7SUYdSXA3y3Ocfo/bySwa
+qggeFpDqK5eHXmrO4hvRqYoEyNyW4VQlGyvYq4s2cLeCF/S2w6dV8OFsksIoq8uq
+R1/IQ8Bonsf7iAYpsMAZZOGKiJzr01W3GA4Ka3B/MmZP5CysUhFlFxMsDr3/TWfg
+p3CHd5yGAnuWWWkjqVQzx0tcub3gyDsHCPuws8P2OKJ2lzNPqpp08MjYMMRZb4Y6
+9REXkKw7kXU8zM5+1IpW2U+z83NU86QR08PTpjATz05ltdGqF82Z+Ygl2nav8oqV
+RqNd/k+WE60e1eJmgykjmz6nPbm0S2jt1C7QLQARAQABiQI2BBgBCAAgFiEEQzh4
+Jd2xu5fsNrpdAHyNfBXYc2kFAmYXyiQCGwwACgkQAHyNfBXYc2mTihAAqB+sv9lw
+kRorE6iXwvvj2Dt2iIy7jc1AhZQOH/j7B4GHpV3Ej/ptdUwuzj/aX5EnEeDPZ2JU
+sSKy2q0RpKGKdKOvgy5yVfd8xqujkawXv26QU53mgyfgQCZLhFFhq0MIAqnxPb8h
+SCQeol18Wqs++LjeDMwkgMrHJeNhW2U2llqTS37YfRMOo0Vr022ZHlMlkyMz1sQH
++C2/nzmmtkI4+vlPeccoN+3239YzndW1+XM8S3dXNcsGTyLAbkCowfpuqQdIP0MY
+lBwx/Xj9fxBNAuqGVCjrjGMg7mozMkeCDzrAoZiaD3Kud8zSs9VpAyAymrPQJSSS
+96b+vr2mDKbV11QJeJZv/d02n4JMjK7Ai//3j/TqkJF4UoYH45g5hvGSrym1UKrf
+n8TqHdtTFjcxAMXLbWICHdDk7/0ole8Bl8csiSHyKy/sGJ0b/7zcB88CS8OfsR3C
+OanK13emeD6rHOp8wEWA1/PA1JoAC5suS/uIgPWa5ujLaViJ9pW6ohfzMqOtLABF
+BB/FgD/qgPF+uTPPLQZw3XO8Q61kFq6x0RJGNgBEOpseounx+T6FCxZqrvjWm/WK
+VQUiRBtJIvD7Z8UCP+NUzdj3hwLAXpXrPz0gkcbI+hdlTJHCC6i61Qf5OIWnhtw6
+kZv2zEcTtzlAYNEumy8KrJzICmPLS7BEC8w=
+=ilJ3
+-----END PGP PUBLIC KEY BLOCK-----

From cd2d231dd0a2a37834604ebd7830570742f2fbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 17:41:57 +0200
Subject: [PATCH 543/600] New upstream version 1.26.0

---
 CHANGES                                       |  106 +-
 CHANGES.ru                                    |  111 +-
 LICENSE                                       |    2 +-
 auto/install                                  |    2 +-
 auto/lib/geoip/conf                           |   17 +
 auto/lib/google-perftools/conf                |   16 +
 auto/lib/libgd/conf                           |   17 +
 auto/lib/openssl/conf                         |   63 +-
 auto/lib/pcre/conf                            |   16 +
 auto/make                                     |    5 +-
 auto/modules                                  |  109 +-
 auto/options                                  |   15 +
 auto/os/conf                                  |   15 +
 auto/os/linux                                 |   48 +
 auto/os/win32                                 |    2 +-
 auto/sources                                  |    2 +-
 auto/unix                                     |   48 +
 contrib/vim/syntax/nginx.vim                  |  217 +-
 src/core/nginx.c                              |   56 +-
 src/core/nginx.h                              |    4 +-
 src/core/ngx_bpf.c                            |  143 ++
 src/core/ngx_bpf.h                            |   43 +
 src/core/ngx_connection.c                     |   83 +
 src/core/ngx_connection.h                     |    8 +-
 src/core/ngx_core.h                           |    7 +
 src/core/ngx_inet.c                           |    2 +-
 src/core/ngx_module.h                         |    5 +
 src/core/ngx_queue.c                          |   52 +-
 src/core/ngx_queue.h                          |    3 +
 src/core/ngx_regex.c                          |   13 +-
 src/event/ngx_event.c                         |   34 +-
 src/event/ngx_event_openssl.c                 |   73 +-
 src/event/ngx_event_openssl.h                 |   13 +-
 src/event/ngx_event_openssl_stapling.c        |    2 +-
 src/event/ngx_event_pipe.c                    |    8 +-
 src/event/ngx_event_udp.c                     |   13 +-
 src/event/ngx_event_udp.h                     |    8 +
 src/event/quic/bpf/bpfgen.sh                  |  113 +
 src/event/quic/bpf/makefile                   |   30 +
 .../quic/bpf/ngx_quic_reuseport_helper.c      |  140 ++
 src/event/quic/ngx_event_quic.c               | 1452 +++++++++++
 src/event/quic/ngx_event_quic.h               |  129 +
 src/event/quic/ngx_event_quic_ack.c           | 1188 +++++++++
 src/event/quic/ngx_event_quic_ack.h           |   30 +
 src/event/quic/ngx_event_quic_bpf.c           |  657 +++++
 src/event/quic/ngx_event_quic_bpf_code.c      |   88 +
 src/event/quic/ngx_event_quic_connection.h    |  305 +++
 src/event/quic/ngx_event_quic_connid.c        |  502 ++++
 src/event/quic/ngx_event_quic_connid.h        |   29 +
 src/event/quic/ngx_event_quic_frames.c        |  894 +++++++
 src/event/quic/ngx_event_quic_frames.h        |   45 +
 src/event/quic/ngx_event_quic_migration.c     | 1003 ++++++++
 src/event/quic/ngx_event_quic_migration.h     |   45 +
 .../quic/ngx_event_quic_openssl_compat.c      |  651 +++++
 .../quic/ngx_event_quic_openssl_compat.h      |   59 +
 src/event/quic/ngx_event_quic_output.c        | 1319 ++++++++++
 src/event/quic/ngx_event_quic_output.h        |   40 +
 src/event/quic/ngx_event_quic_protection.c    | 1243 ++++++++++
 src/event/quic/ngx_event_quic_protection.h    |  120 +
 src/event/quic/ngx_event_quic_socket.c        |  237 ++
 src/event/quic/ngx_event_quic_socket.h        |   28 +
 src/event/quic/ngx_event_quic_ssl.c           |  590 +++++
 src/event/quic/ngx_event_quic_ssl.h           |   19 +
 src/event/quic/ngx_event_quic_streams.c       | 1820 ++++++++++++++
 src/event/quic/ngx_event_quic_streams.h       |   44 +
 src/event/quic/ngx_event_quic_tokens.c        |  309 +++
 src/event/quic/ngx_event_quic_tokens.h        |   34 +
 src/event/quic/ngx_event_quic_transport.c     | 2202 +++++++++++++++++
 src/event/quic/ngx_event_quic_transport.h     |  397 +++
 src/event/quic/ngx_event_quic_udp.c           |  420 ++++
 src/http/modules/ngx_http_access_module.c     |    2 +-
 src/http/modules/ngx_http_fastcgi_module.c    |    5 +-
 src/http/modules/ngx_http_geo_module.c        |    8 +-
 src/http/modules/ngx_http_geoip_module.c      |    2 +-
 src/http/modules/ngx_http_referer_module.c    |    2 +-
 src/http/modules/ngx_http_rewrite_module.c    |    1 +
 src/http/modules/ngx_http_scgi_module.c       |    5 +-
 src/http/modules/ngx_http_ssi_filter_module.c |    2 +-
 src/http/modules/ngx_http_ssl_module.c        |  209 +-
 src/http/modules/ngx_http_ssl_module.h        |    5 -
 src/http/modules/ngx_http_uwsgi_module.c      |    5 +-
 src/http/ngx_http.c                           |   28 +-
 src/http/ngx_http.h                           |   12 +-
 src/http/ngx_http_copy_filter_module.c        |   45 +-
 src/http/ngx_http_core_module.c               |   70 +-
 src/http/ngx_http_core_module.h               |    4 +
 src/http/ngx_http_file_cache.c                |   89 +-
 src/http/ngx_http_huff_decode.c               |    6 +-
 src/http/ngx_http_parse.c                     |    3 -
 src/http/ngx_http_request.c                   |  163 +-
 src/http/ngx_http_request.h                   |    6 +-
 src/http/ngx_http_request_body.c              |   28 +
 src/http/ngx_http_upstream.c                  |   43 +-
 src/http/ngx_http_variables.c                 |    6 +-
 src/http/ngx_http_write_filter_module.c       |    8 +
 src/http/v2/ngx_http_v2.c                     |  399 +--
 src/http/v2/ngx_http_v2.h                     |   32 +-
 src/http/v2/ngx_http_v2_filter_module.c       |  622 +----
 src/http/v2/ngx_http_v2_module.c              |  124 +-
 src/http/v2/ngx_http_v2_module.h              |   17 -
 src/http/v3/ngx_http_v3.c                     |  111 +
 src/http/v3/ngx_http_v3.h                     |  160 ++
 src/http/v3/ngx_http_v3_encode.c              |  304 +++
 src/http/v3/ngx_http_v3_encode.h              |   34 +
 src/http/v3/ngx_http_v3_filter_module.c       |  852 +++++++
 src/http/v3/ngx_http_v3_module.c              |  393 +++
 src/http/v3/ngx_http_v3_parse.c               | 1933 +++++++++++++++
 src/http/v3/ngx_http_v3_parse.h               |  146 ++
 src/http/v3/ngx_http_v3_request.c             | 1710 +++++++++++++
 src/http/v3/ngx_http_v3_table.c               |  715 ++++++
 src/http/v3/ngx_http_v3_table.h               |   58 +
 src/http/v3/ngx_http_v3_uni.c                 |  624 +++++
 src/http/v3/ngx_http_v3_uni.h                 |   32 +
 src/mail/ngx_mail_core_module.c               |    4 +-
 src/mail/ngx_mail_handler.c                   |    6 +-
 src/mail/ngx_mail_ssl_module.c                |   53 -
 src/mail/ngx_mail_ssl_module.h                |    1 -
 src/os/unix/ngx_darwin_init.c                 |   16 +-
 src/os/unix/ngx_errno.h                       |    1 +
 src/os/unix/ngx_files.c                       |    4 +
 src/os/unix/ngx_linux_sendfile_chain.c        |    1 +
 src/os/unix/ngx_posix_init.c                  |    5 +-
 src/os/unix/ngx_process_cycle.c               |   10 +-
 src/os/unix/ngx_socket.h                      |    2 +
 src/os/win32/ngx_errno.h                      |    1 +
 src/os/win32/ngx_files.h                      |    3 +-
 src/os/win32/ngx_process_cycle.c              |    2 +-
 src/os/win32/ngx_socket.h                     |    2 +
 src/os/win32/ngx_win32_config.h               |    6 +-
 src/stream/ngx_stream.c                       |  904 +++++--
 src/stream/ngx_stream.h                       |  181 +-
 src/stream/ngx_stream_access_module.c         |    2 +-
 src/stream/ngx_stream_core_module.c           |  765 ++++--
 src/stream/ngx_stream_geo_module.c            |    8 +-
 src/stream/ngx_stream_geoip_module.c          |    2 +-
 src/stream/ngx_stream_handler.c               |   10 +-
 src/stream/ngx_stream_pass_module.c           |  327 +++
 src/stream/ngx_stream_ssl_module.c            |  410 ++-
 src/stream/ngx_stream_ssl_module.h            |    7 +-
 src/stream/ngx_stream_ssl_preread_module.c    |   57 +-
 src/stream/ngx_stream_variables.c             |   23 +
 141 files changed, 27334 insertions(+), 2065 deletions(-)
 create mode 100644 src/core/ngx_bpf.c
 create mode 100644 src/core/ngx_bpf.h
 create mode 100644 src/event/quic/bpf/bpfgen.sh
 create mode 100644 src/event/quic/bpf/makefile
 create mode 100644 src/event/quic/bpf/ngx_quic_reuseport_helper.c
 create mode 100644 src/event/quic/ngx_event_quic.c
 create mode 100644 src/event/quic/ngx_event_quic.h
 create mode 100644 src/event/quic/ngx_event_quic_ack.c
 create mode 100644 src/event/quic/ngx_event_quic_ack.h
 create mode 100644 src/event/quic/ngx_event_quic_bpf.c
 create mode 100644 src/event/quic/ngx_event_quic_bpf_code.c
 create mode 100644 src/event/quic/ngx_event_quic_connection.h
 create mode 100644 src/event/quic/ngx_event_quic_connid.c
 create mode 100644 src/event/quic/ngx_event_quic_connid.h
 create mode 100644 src/event/quic/ngx_event_quic_frames.c
 create mode 100644 src/event/quic/ngx_event_quic_frames.h
 create mode 100644 src/event/quic/ngx_event_quic_migration.c
 create mode 100644 src/event/quic/ngx_event_quic_migration.h
 create mode 100644 src/event/quic/ngx_event_quic_openssl_compat.c
 create mode 100644 src/event/quic/ngx_event_quic_openssl_compat.h
 create mode 100644 src/event/quic/ngx_event_quic_output.c
 create mode 100644 src/event/quic/ngx_event_quic_output.h
 create mode 100644 src/event/quic/ngx_event_quic_protection.c
 create mode 100644 src/event/quic/ngx_event_quic_protection.h
 create mode 100644 src/event/quic/ngx_event_quic_socket.c
 create mode 100644 src/event/quic/ngx_event_quic_socket.h
 create mode 100644 src/event/quic/ngx_event_quic_ssl.c
 create mode 100644 src/event/quic/ngx_event_quic_ssl.h
 create mode 100644 src/event/quic/ngx_event_quic_streams.c
 create mode 100644 src/event/quic/ngx_event_quic_streams.h
 create mode 100644 src/event/quic/ngx_event_quic_tokens.c
 create mode 100644 src/event/quic/ngx_event_quic_tokens.h
 create mode 100644 src/event/quic/ngx_event_quic_transport.c
 create mode 100644 src/event/quic/ngx_event_quic_transport.h
 create mode 100644 src/event/quic/ngx_event_quic_udp.c
 create mode 100644 src/http/v3/ngx_http_v3.c
 create mode 100644 src/http/v3/ngx_http_v3.h
 create mode 100644 src/http/v3/ngx_http_v3_encode.c
 create mode 100644 src/http/v3/ngx_http_v3_encode.h
 create mode 100644 src/http/v3/ngx_http_v3_filter_module.c
 create mode 100644 src/http/v3/ngx_http_v3_module.c
 create mode 100644 src/http/v3/ngx_http_v3_parse.c
 create mode 100644 src/http/v3/ngx_http_v3_parse.h
 create mode 100644 src/http/v3/ngx_http_v3_request.c
 create mode 100644 src/http/v3/ngx_http_v3_table.c
 create mode 100644 src/http/v3/ngx_http_v3_table.h
 create mode 100644 src/http/v3/ngx_http_v3_uni.c
 create mode 100644 src/http/v3/ngx_http_v3_uni.h
 create mode 100644 src/stream/ngx_stream_pass_module.c

diff --git a/CHANGES b/CHANGES
index 6774b29..f60c885 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,109 @@
 
-Changes with nginx 1.24.0                                        11 Apr 2023
+Changes with nginx 1.26.0                                        23 Apr 2024
 
-    *) 1.24.x stable branch.
+    *) 1.26.x stable branch.
+
+
+Changes with nginx 1.25.5                                        16 Apr 2024
+
+    *) Feature: virtual servers in the stream module.
+
+    *) Feature: the ngx_stream_pass_module.
+
+    *) Feature: the "deferred", "accept_filter", and "setfib" parameters of
+       the "listen" directive in the stream module.
+
+    *) Feature: cache line size detection for some architectures.
+       Thanks to Piotr Sikora.
+
+    *) Feature: support for Homebrew on Apple Silicon.
+       Thanks to Piotr Sikora.
+
+    *) Bugfix: Windows cross-compilation bugfixes and improvements.
+       Thanks to Piotr Sikora.
+
+    *) Bugfix: unexpected connection closure while using 0-RTT in QUIC.
+       Thanks to Vladimir Khomutov.
+
+
+Changes with nginx 1.25.4                                        14 Feb 2024
+
+    *) Security: when using HTTP/3 a segmentation fault might occur in a
+       worker process while processing a specially crafted QUIC session
+       (CVE-2024-24989, CVE-2024-24990).
+
+    *) Bugfix: connections with pending AIO operations might be closed
+       prematurely during graceful shutdown of old worker processes.
+
+    *) Bugfix: socket leak alerts no longer logged when fast shutdown was
+       requested after graceful shutdown of old worker processes.
+
+    *) Bugfix: a socket descriptor error, a socket leak, or a segmentation
+       fault in a worker process (for SSL proxying) might occur if AIO was
+       used in a subrequest.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if SSL
+       proxying was used along with the "image_filter" directive and errors
+       with code 415 were redirected with the "error_page" directive.
+
+    *) Bugfixes and improvements in HTTP/3.
+
+
+Changes with nginx 1.25.3                                        24 Oct 2023
+
+    *) Change: improved detection of misbehaving clients when using HTTP/2.
+
+    *) Feature: startup speedup when using a large number of locations.
+       Thanks to Yusuke Nojima.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2 without SSL; the bug had appeared in 1.25.1.
+
+    *) Bugfix: the "Status" backend response header line with an empty
+       reason phrase was handled incorrectly.
+
+    *) Bugfix: memory leak during reconfiguration when using the PCRE2
+       library.
+       Thanks to ZhenZhong Wu.
+
+    *) Bugfixes and improvements in HTTP/3.
+
+
+Changes with nginx 1.25.2                                        15 Aug 2023
+
+    *) Feature: path MTU discovery when using HTTP/3.
+
+    *) Feature: TLS_AES_128_CCM_SHA256 cipher suite support when using
+       HTTP/3.
+
+    *) Change: now nginx uses appname "nginx" when loading OpenSSL
+       configuration.
+
+    *) Change: now nginx does not try to load OpenSSL configuration if the
+       --with-openssl option was used to built OpenSSL and the OPENSSL_CONF
+       environment variable is not set.
+
+    *) Bugfix: in the $body_bytes_sent variable when using HTTP/3.
+
+    *) Bugfix: in HTTP/3.
+
+
+Changes with nginx 1.25.1                                        13 Jun 2023
+
+    *) Feature: the "http2" directive, which enables HTTP/2 on a per-server
+       basis; the "http2" parameter of the "listen" directive is now
+       deprecated.
+
+    *) Change: HTTP/2 server push support has been removed.
+
+    *) Change: the deprecated "ssl" directive is not supported anymore.
+
+    *) Bugfix: in HTTP/3 when using OpenSSL.
+
+
+Changes with nginx 1.25.0                                        23 May 2023
+
+    *) Feature: experimental HTTP/3 support.
 
 
 Changes with nginx 1.23.4                                        28 Mar 2023
diff --git a/CHANGES.ru b/CHANGES.ru
index 544f15b..7e42b52 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,7 +1,114 @@
 
-Изменения в nginx 1.24.0                                          11.04.2023
+Изменения в nginx 1.26.0                                          23.04.2024
 
-    *) Стабильная ветка 1.24.x.
+    *) Стабильная ветка 1.26.x.
+
+
+Изменения в nginx 1.25.5                                          16.04.2024
+
+    *) Добавление: виртуальные сервера в модуле stream.
+
+    *) Добавление: модуль ngx_stream_pass_module.
+
+    *) Добавление: параметры deferred, accept_filter и setfib директивы
+       listen в модуле stream.
+
+    *) Добавление: определение размера строки кеша процессора для некоторых
+       архитектур.
+       Спасибо Piotr Sikora.
+
+    *) Добавление: поддержка Homebrew на Apple Silicon.
+       Спасибо Piotr Sikora.
+
+    *) Исправление: улучшения и исправления кросс-компиляции для Windows.
+       Спасибо Piotr Sikora.
+
+    *) Исправление: неожиданное закрытие соединения при использовании 0-RTT
+       в QUIC.
+       Спасибо Владимиру Хомутову.
+
+
+Изменения в nginx 1.25.4                                          14.02.2024
+
+    *) Безопасность: при использовании HTTP/3 в рабочем процессе мог
+       произойти segmentation fault во время обработки специально созданной
+       QUIC-сессии (CVE-2024-24989, CVE-2024-24990).
+
+    *) Исправление: соединения с незавершенными AIO-операциями могли
+       закрываться преждевременно во время плавного завершения старых
+       рабочих процессов.
+
+    *) Исправление: теперь nginx не пишет в лог сообщения об утечке сокетов,
+       если во время плавного завершения старых рабочих процессов было
+       запрошено быстрое завершение.
+
+    *) Исправление: при использовании AIO в подзапросе могла происходить
+       ошибка на сокете, утечка сокетов, либо segmentation fault в рабочем
+       процессе (при SSL-проксировании).
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если использовалось SSL-проксирование и директива image_filter, а
+       ошибки с кодом 415 перенаправлялись с помощью директивы error_page.
+
+    *) Исправления и улучшения в HTTP/3.
+
+
+Изменения в nginx 1.25.3                                          24.10.2023
+
+    *) Изменение: улучшено детектирование некорректного поведения клиентов
+       при использовании HTTP/2.
+
+    *) Добавление: уменьшение времени запуска при использовании большого
+       количества location'ов.
+       Спасибо Yusuke Nojima.
+
+    *) Исправление: при использовании HTTP/2 без SSL в рабочем процессе мог
+       произойти segmentation fault; ошибка появилась в 1.25.1.
+
+    *) Исправление: строка "Status" в заголовке ответа бэкенда с пустой
+       поясняющей фразой обрабатывалась некорректно.
+
+    *) Исправление: утечки памяти во время переконфигурации при
+       использовании библиотеки PCRE2.
+       Спасибо ZhenZhong Wu.
+
+    *) Исправления и улучшения в HTTP/3.
+
+
+Изменения в nginx 1.25.2                                          15.08.2023
+
+    *) Добавление: path MTU discovery при использовании HTTP/3.
+
+    *) Добавление: поддержка шифра TLS_AES_128_CCM_SHA256 при использовании
+       HTTP/3.
+
+    *) Изменение: теперь при загрузке конфигурации OpenSSL nginx использует
+       appname "nginx".
+
+    *) Изменение: теперь nginx не пытается загружать конфигурацию OpenSSL,
+       если для сборки OpenSSL использовался параметр --with-openssl и
+       переменная окружения OPENSSL_CONF не установлена.
+
+    *) Исправление: в переменной $body_bytes_sent при использовании HTTP/3.
+
+    *) Исправление: в HTTP/3.
+
+
+Изменения в nginx 1.25.1                                          13.06.2023
+
+    *) Добавление: директива http2, позволяющая включать HTTP/2 в отдельных
+       блоках server; параметр http2 директивы listen объявлен устаревшим.
+
+    *) Изменение: поддержка HTTP/2 server push упразднена.
+
+    *) Изменение: устаревшая директива ssl больше не поддерживается.
+
+    *) Исправление: в HTTP/3 при использовании OpenSSL.
+
+
+Изменения в nginx 1.25.0                                          23.05.2023
+
+    *) Добавление: экспериментальная поддержка HTTP/3.
 
 
 Изменения в nginx 1.23.4                                          28.03.2023
diff --git a/LICENSE b/LICENSE
index fdedcb7..985470e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 /* 
  * Copyright (C) 2002-2021 Igor Sysoev
- * Copyright (C) 2011-2022 Nginx, Inc.
+ * Copyright (C) 2011-2024 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/auto/install b/auto/install
index c764fdd..7f73e4b 100644
--- a/auto/install
+++ b/auto/install
@@ -112,7 +112,7 @@ install:	build $NGX_INSTALL_PERL_MODULES
 	test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \\
 		|| mv '\$(DESTDIR)$NGX_SBIN_PATH' \\
 			'\$(DESTDIR)$NGX_SBIN_PATH.old'
-	cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'
+	cp $NGX_OBJS/nginx$ngx_binext '\$(DESTDIR)$NGX_SBIN_PATH'
 
 	test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \\
 		|| mkdir -p '\$(DESTDIR)$NGX_CONF_PREFIX'
diff --git a/auto/lib/geoip/conf b/auto/lib/geoip/conf
index 8302aae..47165b1 100644
--- a/auto/lib/geoip/conf
+++ b/auto/lib/geoip/conf
@@ -64,6 +64,23 @@ if [ $ngx_found = no ]; then
 fi
 
 
+if [ $ngx_found = no ]; then
+
+    # Homebrew on Apple Silicon
+
+    ngx_feature="GeoIP library in /opt/homebrew/"
+    ngx_feature_path="/opt/homebrew/include"
+
+    if [ $NGX_RPATH = YES ]; then
+        ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lGeoIP"
+    else
+        ngx_feature_libs="-L/opt/homebrew/lib -lGeoIP"
+    fi
+
+    . auto/feature
+fi
+
+
 if [ $ngx_found = yes ]; then
 
     CORE_INCS="$CORE_INCS $ngx_feature_path"
diff --git a/auto/lib/google-perftools/conf b/auto/lib/google-perftools/conf
index 7f1a911..94dadac 100644
--- a/auto/lib/google-perftools/conf
+++ b/auto/lib/google-perftools/conf
@@ -46,6 +46,22 @@ if [ $ngx_found = no ]; then
 fi
 
 
+if [ $ngx_found = no ]; then
+
+    # Homebrew on Apple Silicon
+
+    ngx_feature="Google perftools in /opt/homebrew/"
+
+    if [ $NGX_RPATH = YES ]; then
+        ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lprofiler"
+    else
+        ngx_feature_libs="-L/opt/homebrew/lib -lprofiler"
+    fi
+
+    . auto/feature
+fi
+
+
 if [ $ngx_found = yes ]; then
     CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
 
diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf
index 6786397..07f5656 100644
--- a/auto/lib/libgd/conf
+++ b/auto/lib/libgd/conf
@@ -65,6 +65,23 @@ if [ $ngx_found = no ]; then
 fi
 
 
+if [ $ngx_found = no ]; then
+
+    # Homebrew on Apple Silicon
+
+    ngx_feature="GD library in /opt/homebrew/"
+    ngx_feature_path="/opt/homebrew/include"
+
+    if [ $NGX_RPATH = YES ]; then
+        ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lgd"
+    else
+        ngx_feature_libs="-L/opt/homebrew/lib -lgd"
+    fi
+
+    . auto/feature
+fi
+
+
 if [ $ngx_found = yes ]; then
 
     CORE_INCS="$CORE_INCS $ngx_feature_path"
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index 4fb52df..fdf430d 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -5,12 +5,19 @@
 
 if [ $OPENSSL != NONE ]; then
 
+    have=NGX_OPENSSL . auto/have
+    have=NGX_SSL . auto/have
+
+    have=NGX_OPENSSL_NO_CONFIG . auto/have
+
+    if [ $USE_OPENSSL_QUIC = YES ]; then
+        have=NGX_QUIC . auto/have
+        have=NGX_QUIC_OPENSSL_COMPAT . auto/have
+    fi
+
     case "$CC" in
 
         cl | bcc32)
-            have=NGX_OPENSSL . auto/have
-            have=NGX_SSL . auto/have
-
             CFLAGS="$CFLAGS -DNO_SYS_TYPES_H"
 
             CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
@@ -33,9 +40,6 @@ if [ $OPENSSL != NONE ]; then
         ;;
 
         *)
-            have=NGX_OPENSSL . auto/have
-            have=NGX_SSL . auto/have
-
             CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include"
             CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
             CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
@@ -118,11 +122,58 @@ else
             . auto/feature
         fi
 
+        if [ $ngx_found = no ]; then
+
+            # Homebrew on Apple Silicon
+
+            ngx_feature="OpenSSL library in /opt/homebrew/"
+            ngx_feature_path="/opt/homebrew/include"
+
+            if [ $NGX_RPATH = YES ]; then
+                ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lssl -lcrypto"
+            else
+                ngx_feature_libs="-L/opt/homebrew/lib -lssl -lcrypto"
+            fi
+
+            ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
+
+            . auto/feature
+        fi
+
         if [ $ngx_found = yes ]; then
             have=NGX_SSL . auto/have
             CORE_INCS="$CORE_INCS $ngx_feature_path"
             CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
             OPENSSL=YES
+
+            if [ $USE_OPENSSL_QUIC = YES ]; then
+
+                ngx_feature="OpenSSL QUIC support"
+                ngx_feature_name="NGX_QUIC"
+                ngx_feature_test="SSL_set_quic_method(NULL, NULL)"
+                . auto/feature
+
+                if [ $ngx_found = no ]; then
+                    have=NGX_QUIC_OPENSSL_COMPAT . auto/have
+
+                    ngx_feature="OpenSSL QUIC compatibility"
+                    ngx_feature_test="SSL_CTX_add_custom_ext(NULL, 0, 0,
+                                                 NULL, NULL, NULL, NULL, NULL)"
+                    . auto/feature
+                fi
+
+                if [ $ngx_found = no ]; then
+cat << END
+
+$0: error: certain modules require OpenSSL QUIC support.
+You can either do not enable the modules, or install the OpenSSL library with
+QUIC support into the system, or build the OpenSSL library with QUIC support
+statically from the source with nginx by using --with-openssl=<path> option.
+
+END
+                        exit 1
+                fi
+            fi
         fi
     fi
 
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 20c1caf..cdf1809 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -182,6 +182,22 @@ else
             . auto/feature
         fi
 
+        if [ $ngx_found = no ]; then
+
+            # Homebrew on Apple Silicon
+
+            ngx_feature="PCRE library in /opt/homebrew/"
+            ngx_feature_path="/opt/homebrew/include"
+
+            if [ $NGX_RPATH = YES ]; then
+                ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lpcre"
+            else
+                ngx_feature_libs="-L/opt/homebrew/lib -lpcre"
+            fi
+
+            . auto/feature
+        fi
+
         if [ $ngx_found = yes ]; then
             CORE_INCS="$CORE_INCS $ngx_feature_path"
             CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
diff --git a/auto/make b/auto/make
index ef7c9f6..25ee3fb 100644
--- a/auto/make
+++ b/auto/make
@@ -6,9 +6,10 @@
 echo "creating $NGX_MAKEFILE"
 
 mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \
+         $NGX_OBJS/src/event/quic \
          $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \
-         $NGX_OBJS/src/http $NGX_OBJS/src/http/v2 $NGX_OBJS/src/http/modules \
-         $NGX_OBJS/src/http/modules/perl \
+         $NGX_OBJS/src/http $NGX_OBJS/src/http/v2 $NGX_OBJS/src/http/v3 \
+         $NGX_OBJS/src/http/modules $NGX_OBJS/src/http/modules/perl \
          $NGX_OBJS/src/mail \
          $NGX_OBJS/src/stream \
          $NGX_OBJS/src/misc
diff --git a/auto/modules b/auto/modules
index 94867bf..1a5e421 100644
--- a/auto/modules
+++ b/auto/modules
@@ -102,7 +102,7 @@ if [ $HTTP = YES ]; then
     fi
 
 
-    if [ $HTTP_V2 = YES ]; then
+    if [ $HTTP_V2 = YES -o $HTTP_V3 = YES ]; then
         HTTP_SRCS="$HTTP_SRCS $HTTP_HUFF_SRCS"
     fi
 
@@ -124,6 +124,7 @@ if [ $HTTP = YES ]; then
     #     ngx_http_header_filter
     #     ngx_http_chunked_filter
     #     ngx_http_v2_filter
+    #     ngx_http_v3_filter
     #     ngx_http_range_header_filter
     #     ngx_http_gzip_filter
     #     ngx_http_postpone_filter
@@ -156,6 +157,7 @@ if [ $HTTP = YES ]; then
                       ngx_http_header_filter_module \
                       ngx_http_chunked_filter_module \
                       ngx_http_v2_filter_module \
+                      ngx_http_v3_filter_module \
                       ngx_http_range_header_filter_module \
                       ngx_http_gzip_filter_module \
                       ngx_http_postpone_filter_module \
@@ -217,6 +219,17 @@ if [ $HTTP = YES ]; then
         . auto/module
     fi
 
+    if [ $HTTP_V3 = YES ]; then
+        ngx_module_name=ngx_http_v3_filter_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs=src/http/v3/ngx_http_v3_filter_module.c
+        ngx_module_libs=
+        ngx_module_link=$HTTP_V3
+
+        . auto/module
+    fi
+
     if :; then
         ngx_module_name=ngx_http_range_header_filter_module
         ngx_module_incs=
@@ -410,7 +423,6 @@ if [ $HTTP = YES ]; then
 
     if [ $HTTP_V2 = YES ]; then
         have=NGX_HTTP_V2 . auto/have
-        have=NGX_HTTP_HEADERS . auto/have
 
         ngx_module_name=ngx_http_v2_module
         ngx_module_incs=src/http/v2
@@ -426,6 +438,32 @@ if [ $HTTP = YES ]; then
         . auto/module
     fi
 
+    if [ $HTTP_V3 = YES ]; then
+        USE_OPENSSL_QUIC=YES
+        HTTP_SSL=YES
+
+        have=NGX_HTTP_V3 . auto/have
+
+        ngx_module_name=ngx_http_v3_module
+        ngx_module_incs=src/http/v3
+        ngx_module_deps="src/http/v3/ngx_http_v3.h \
+                         src/http/v3/ngx_http_v3_encode.h \
+                         src/http/v3/ngx_http_v3_parse.h \
+                         src/http/v3/ngx_http_v3_table.h \
+                         src/http/v3/ngx_http_v3_uni.h"
+        ngx_module_srcs="src/http/v3/ngx_http_v3.c \
+                         src/http/v3/ngx_http_v3_encode.c \
+                         src/http/v3/ngx_http_v3_parse.c \
+                         src/http/v3/ngx_http_v3_table.c \
+                         src/http/v3/ngx_http_v3_uni.c \
+                         src/http/v3/ngx_http_v3_request.c \
+                         src/http/v3/ngx_http_v3_module.c"
+        ngx_module_libs=
+        ngx_module_link=$HTTP_V3
+
+        . auto/module
+    fi
+
     if :; then
         ngx_module_name=ngx_http_static_module
         ngx_module_incs=
@@ -1128,6 +1166,16 @@ if [ $STREAM != NO ]; then
         . auto/module
     fi
 
+    if [ $STREAM_PASS = YES ]; then
+        ngx_module_name=ngx_stream_pass_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_pass_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_PASS
+
+        . auto/module
+    fi
+
     if [ $STREAM_SET = YES ]; then
         ngx_module_name=ngx_stream_set_module
         ngx_module_deps=
@@ -1272,6 +1320,63 @@ if [ $USE_OPENSSL = YES ]; then
 fi
 
 
+if [ $USE_OPENSSL_QUIC = YES ]; then
+    ngx_module_type=CORE
+    ngx_module_name=ngx_quic_module
+    ngx_module_incs=
+    ngx_module_deps="src/event/quic/ngx_event_quic.h \
+                     src/event/quic/ngx_event_quic_transport.h \
+                     src/event/quic/ngx_event_quic_protection.h \
+                     src/event/quic/ngx_event_quic_connection.h \
+                     src/event/quic/ngx_event_quic_frames.h \
+                     src/event/quic/ngx_event_quic_connid.h \
+                     src/event/quic/ngx_event_quic_migration.h \
+                     src/event/quic/ngx_event_quic_streams.h \
+                     src/event/quic/ngx_event_quic_ssl.h \
+                     src/event/quic/ngx_event_quic_tokens.h \
+                     src/event/quic/ngx_event_quic_ack.h \
+                     src/event/quic/ngx_event_quic_output.h \
+                     src/event/quic/ngx_event_quic_socket.h \
+                     src/event/quic/ngx_event_quic_openssl_compat.h"
+    ngx_module_srcs="src/event/quic/ngx_event_quic.c \
+                     src/event/quic/ngx_event_quic_udp.c \
+                     src/event/quic/ngx_event_quic_transport.c \
+                     src/event/quic/ngx_event_quic_protection.c \
+                     src/event/quic/ngx_event_quic_frames.c \
+                     src/event/quic/ngx_event_quic_connid.c \
+                     src/event/quic/ngx_event_quic_migration.c \
+                     src/event/quic/ngx_event_quic_streams.c \
+                     src/event/quic/ngx_event_quic_ssl.c \
+                     src/event/quic/ngx_event_quic_tokens.c \
+                     src/event/quic/ngx_event_quic_ack.c \
+                     src/event/quic/ngx_event_quic_output.c \
+                     src/event/quic/ngx_event_quic_socket.c \
+                     src/event/quic/ngx_event_quic_openssl_compat.c"
+
+    ngx_module_libs=
+    ngx_module_link=YES
+    ngx_module_order=
+
+    . auto/module
+
+    if [ $QUIC_BPF = YES -a $SO_COOKIE_FOUND = YES ]; then
+        ngx_module_type=CORE
+        ngx_module_name=ngx_quic_bpf_module
+        ngx_module_incs=
+        ngx_module_deps=
+        ngx_module_srcs="src/event/quic/ngx_event_quic_bpf.c \
+                         src/event/quic/ngx_event_quic_bpf_code.c"
+        ngx_module_libs=
+        ngx_module_link=YES
+        ngx_module_order=
+
+        . auto/module
+
+        have=NGX_QUIC_BPF . auto/have
+    fi
+fi
+
+
 if [ $USE_PCRE = YES ]; then
     ngx_module_type=CORE
     ngx_module_name=ngx_regex_module
diff --git a/auto/options b/auto/options
index 48f3a1a..6a6e990 100644
--- a/auto/options
+++ b/auto/options
@@ -45,6 +45,8 @@ USE_THREADS=NO
 
 NGX_FILE_AIO=NO
 
+QUIC_BPF=NO
+
 HTTP=YES
 
 NGX_HTTP_LOG_PATH=
@@ -59,6 +61,7 @@ HTTP_CHARSET=YES
 HTTP_GZIP=YES
 HTTP_SSL=NO
 HTTP_V2=NO
+HTTP_V3=NO
 HTTP_SSI=YES
 HTTP_REALIP=NO
 HTTP_XSLT=NO
@@ -124,6 +127,7 @@ STREAM_GEOIP=NO
 STREAM_MAP=YES
 STREAM_SPLIT_CLIENTS=YES
 STREAM_RETURN=YES
+STREAM_PASS=YES
 STREAM_SET=YES
 STREAM_UPSTREAM_HASH=YES
 STREAM_UPSTREAM_LEAST_CONN=YES
@@ -149,6 +153,7 @@ PCRE_JIT=NO
 PCRE2=YES
 
 USE_OPENSSL=NO
+USE_OPENSSL_QUIC=NO
 OPENSSL=NONE
 
 USE_ZLIB=NO
@@ -166,6 +171,8 @@ USE_GEOIP=NO
 NGX_GOOGLE_PERFTOOLS=NO
 NGX_CPP_TEST=NO
 
+SO_COOKIE_FOUND=NO
+
 NGX_LIBATOMIC=NO
 
 NGX_CPU_CACHE_LINE=
@@ -211,6 +218,8 @@ do
 
         --with-file-aio)                 NGX_FILE_AIO=YES           ;;
 
+        --without-quic_bpf_module)       QUIC_BPF=NONE              ;;
+
         --with-ipv6)
             NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
 $0: warning: the \"--with-ipv6\" option is deprecated"
@@ -228,6 +237,7 @@ $0: warning: the \"--with-ipv6\" option is deprecated"
 
         --with-http_ssl_module)          HTTP_SSL=YES               ;;
         --with-http_v2_module)           HTTP_V2=YES                ;;
+        --with-http_v3_module)           HTTP_V3=YES                ;;
         --with-http_realip_module)       HTTP_REALIP=YES            ;;
         --with-http_addition_module)     HTTP_ADDITION=YES          ;;
         --with-http_xslt_module)         HTTP_XSLT=YES              ;;
@@ -328,6 +338,7 @@ use the \"--with-mail_ssl_module\" option instead"
         --without-stream_split_clients_module)
                                          STREAM_SPLIT_CLIENTS=NO    ;;
         --without-stream_return_module)  STREAM_RETURN=NO           ;;
+        --without-stream_pass_module)    STREAM_PASS=NO             ;;
         --without-stream_set_module)     STREAM_SET=NO              ;;
         --without-stream_upstream_hash_module)
                                          STREAM_UPSTREAM_HASH=NO    ;;
@@ -443,8 +454,11 @@ cat << END
 
   --with-file-aio                    enable file AIO support
 
+  --without-quic_bpf_module          disable ngx_quic_bpf_module
+
   --with-http_ssl_module             enable ngx_http_ssl_module
   --with-http_v2_module              enable ngx_http_v2_module
+  --with-http_v3_module              enable ngx_http_v3_module
   --with-http_realip_module          enable ngx_http_realip_module
   --with-http_addition_module        enable ngx_http_addition_module
   --with-http_xslt_module            enable ngx_http_xslt_module
@@ -544,6 +558,7 @@ cat << END
   --without-stream_split_clients_module
                                      disable ngx_stream_split_clients_module
   --without-stream_return_module     disable ngx_stream_return_module
+  --without-stream_pass_module       disable ngx_stream_pass_module
   --without-stream_set_module        disable ngx_stream_set_module
   --without-stream_upstream_hash_module
                                      disable ngx_stream_upstream_hash_module
diff --git a/auto/os/conf b/auto/os/conf
index d7f6e03..bb0ce4e 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -115,6 +115,21 @@ case "$NGX_MACHINE" in
         NGX_MACH_CACHE_LINE=64
     ;;
 
+    ppc64* | powerpc64*)
+        have=NGX_ALIGNMENT value=16 . auto/define
+        NGX_MACH_CACHE_LINE=128
+    ;;
+
+    riscv64)
+        have=NGX_ALIGNMENT value=16 . auto/define
+        NGX_MACH_CACHE_LINE=64
+    ;;
+
+    s390x)
+        have=NGX_ALIGNMENT value=16 . auto/define
+        NGX_MACH_CACHE_LINE=256
+    ;;
+
     *)
         have=NGX_ALIGNMENT value=16 . auto/define
         NGX_MACH_CACHE_LINE=32
diff --git a/auto/os/linux b/auto/os/linux
index eb67026..bc0556b 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -228,10 +228,58 @@ ngx_feature_test="struct crypt_data  cd;
                   crypt_r(\"key\", \"salt\", &cd);"
 . auto/feature
 
+if [ $ngx_found = yes ]; then
+    CRYPT_LIB="-lcrypt"
+fi
+
 
 ngx_include="sys/vfs.h";     . auto/include
 
 
+# BPF sockhash
+
+ngx_feature="BPF sockhash"
+ngx_feature_name="NGX_HAVE_BPF"
+ngx_feature_run=no
+ngx_feature_incs="#include <linux/bpf.h>
+                  #include <sys/syscall.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="union bpf_attr attr = { 0 };
+
+                  attr.map_flags = 0;
+                  attr.map_type = BPF_MAP_TYPE_SOCKHASH;
+
+                  syscall(__NR_bpf, 0, &attr, 0);"
+. auto/feature
+
+if [ $ngx_found = yes ]; then
+    CORE_SRCS="$CORE_SRCS src/core/ngx_bpf.c"
+    CORE_DEPS="$CORE_DEPS src/core/ngx_bpf.h"
+
+    if [ $QUIC_BPF != NONE ]; then
+        QUIC_BPF=YES
+    fi
+fi
+
+
+ngx_feature="SO_COOKIE"
+ngx_feature_name="NGX_HAVE_SO_COOKIE"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  $NGX_INCLUDE_INTTYPES_H"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="socklen_t optlen = sizeof(uint64_t);
+                  uint64_t cookie;
+                  getsockopt(0, SOL_SOCKET, SO_COOKIE, &cookie, &optlen)"
+. auto/feature
+
+if [ $ngx_found = yes ]; then
+    SO_COOKIE_FOUND=YES
+fi
+
+
 # UDP segmentation offloading
 
 ngx_feature="UDP_SEGMENT"
diff --git a/auto/os/win32 b/auto/os/win32
index b821ae6..bce764b 100644
--- a/auto/os/win32
+++ b/auto/os/win32
@@ -18,7 +18,7 @@ ngx_binext=".exe"
 
 case "$NGX_CC_NAME" in
 
-    gcc)
+    clang | gcc)
         CORE_LIBS="$CORE_LIBS -ladvapi32 -lws2_32"
         MAIN_LINK="$MAIN_LINK -Wl,--export-all-symbols"
         MAIN_LINK="$MAIN_LINK -Wl,--out-implib=$NGX_OBJS/libnginx.a"
diff --git a/auto/sources b/auto/sources
index a539093..46408ee 100644
--- a/auto/sources
+++ b/auto/sources
@@ -83,7 +83,7 @@ CORE_SRCS="src/core/nginx.c \
 
 EVENT_MODULES="ngx_events_module ngx_event_core_module"
 
-EVENT_INCS="src/event src/event/modules"
+EVENT_INCS="src/event src/event/modules src/event/quic"
 
 EVENT_DEPS="src/event/ngx_event.h \
             src/event/ngx_event_timer.h \
diff --git a/auto/unix b/auto/unix
index 8671019..f29e69c 100644
--- a/auto/unix
+++ b/auto/unix
@@ -448,6 +448,54 @@ ngx_feature_test="setsockopt(0, IPPROTO_IPV6, IPV6_RECVPKTINFO, NULL, 0)"
 . auto/feature
 
 
+# IP packet fragmentation
+
+ngx_feature="IP_MTU_DISCOVER"
+ngx_feature_name="NGX_HAVE_IP_MTU_DISCOVER"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="(void) IP_PMTUDISC_DO;
+                  setsockopt(0, IPPROTO_IP, IP_MTU_DISCOVER, NULL, 0)"
+. auto/feature
+
+
+ngx_feature="IPV6_MTU_DISCOVER"
+ngx_feature_name="NGX_HAVE_IPV6_MTU_DISCOVER"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="(void) IPV6_PMTUDISC_DO;
+                  setsockopt(0, IPPROTO_IPV6, IPV6_MTU_DISCOVER, NULL, 0)"
+. auto/feature
+
+
+ngx_feature="IP_DONTFRAG"
+ngx_feature_name="NGX_HAVE_IP_DONTFRAG"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_DONTFRAG, NULL, 0)"
+. auto/feature
+
+
+ngx_feature="IPV6_DONTFRAG"
+ngx_feature_name="NGX_HAVE_IPV6_DONTFRAG"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/socket.h>
+                  #include <netinet/in.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IPV6_DONTFRAG, NULL, 0)"
+. auto/feature
+
+
 ngx_feature="TCP_DEFER_ACCEPT"
 ngx_feature_name="NGX_HAVE_DEFERRED_ACCEPT"
 ngx_feature_run=no
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 7d587fc..29eef7a 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -65,12 +65,12 @@ syn match ngxListenComment '#.*$'
     \ contained
     \ nextgroup=@ngxListenParams skipwhite skipempty
 syn keyword ngxListenOptions contained
-    \ default_server ssl http2 proxy_protocol
+    \ default_server ssl quic proxy_protocol
     \ setfib fastopen backlog rcvbuf sndbuf accept_filter deferred bind
     \ ipv6only reuseport so_keepalive
     \ nextgroup=@ngxListenParams skipwhite skipempty
 syn keyword ngxListenOptionsDeprecated contained
-    \ spdy
+    \ http2
     \ nextgroup=@ngxListenParams skipwhite skipempty
 syn cluster ngxListenParams
     \ contains=ngxListenParam,ngxListenString,ngxListenComment
@@ -90,7 +90,6 @@ syn keyword ngxDirectiveBlock contained if
 syn keyword ngxDirectiveBlock contained geo
 syn keyword ngxDirectiveBlock contained map
 syn keyword ngxDirectiveBlock contained split_clients
-syn keyword ngxDirectiveBlock contained match
 
 syn keyword ngxDirectiveImportant contained include
 syn keyword ngxDirectiveImportant contained root
@@ -113,7 +112,6 @@ syn keyword ngxDirectiveError contained post_action
 
 syn keyword ngxDirectiveDeprecated contained proxy_downstream_buffer
 syn keyword ngxDirectiveDeprecated contained proxy_upstream_buffer
-syn keyword ngxDirectiveDeprecated contained ssl
 syn keyword ngxDirectiveDeprecated contained http2_idle_timeout
 syn keyword ngxDirectiveDeprecated contained http2_max_field_size
 syn keyword ngxDirectiveDeprecated contained http2_max_header_size
@@ -136,7 +134,6 @@ syn keyword ngxDirective contained alias
 syn keyword ngxDirective contained allow
 syn keyword ngxDirective contained ancient_browser
 syn keyword ngxDirective contained ancient_browser_value
-syn keyword ngxDirective contained api
 syn keyword ngxDirective contained auth_basic
 syn keyword ngxDirective contained auth_basic_user_file
 syn keyword ngxDirective contained auth_delay
@@ -144,15 +141,6 @@ syn keyword ngxDirective contained auth_http
 syn keyword ngxDirective contained auth_http_header
 syn keyword ngxDirective contained auth_http_pass_client_cert
 syn keyword ngxDirective contained auth_http_timeout
-syn keyword ngxDirective contained auth_jwt
-syn keyword ngxDirective contained auth_jwt_claim_set
-syn keyword ngxDirective contained auth_jwt_header_set
-syn keyword ngxDirective contained auth_jwt_key_cache
-syn keyword ngxDirective contained auth_jwt_key_file
-syn keyword ngxDirective contained auth_jwt_key_request
-syn keyword ngxDirective contained auth_jwt_leeway
-syn keyword ngxDirective contained auth_jwt_require
-syn keyword ngxDirective contained auth_jwt_type
 syn keyword ngxDirective contained auth_request
 syn keyword ngxDirective contained auth_request_set
 syn keyword ngxDirective contained autoindex
@@ -193,8 +181,6 @@ syn keyword ngxDirective contained error_log
 syn keyword ngxDirective contained etag
 syn keyword ngxDirective contained eventport_events
 syn keyword ngxDirective contained expires
-syn keyword ngxDirective contained f4f
-syn keyword ngxDirective contained f4f_buffer_size
 syn keyword ngxDirective contained fastcgi_bind
 syn keyword ngxDirective contained fastcgi_buffer_size
 syn keyword ngxDirective contained fastcgi_buffering
@@ -211,7 +197,6 @@ syn keyword ngxDirective contained fastcgi_cache_max_range_offset
 syn keyword ngxDirective contained fastcgi_cache_methods
 syn keyword ngxDirective contained fastcgi_cache_min_uses
 syn keyword ngxDirective contained fastcgi_cache_path
-syn keyword ngxDirective contained fastcgi_cache_purge
 syn keyword ngxDirective contained fastcgi_cache_revalidate
 syn keyword ngxDirective contained fastcgi_cache_use_stale
 syn keyword ngxDirective contained fastcgi_cache_valid
@@ -295,14 +280,7 @@ syn keyword ngxDirective contained gzip_types
 syn keyword ngxDirective contained gzip_vary
 syn keyword ngxDirective contained gzip_window
 syn keyword ngxDirective contained hash
-syn keyword ngxDirective contained health_check
-syn keyword ngxDirective contained health_check_timeout
-syn keyword ngxDirective contained hls
-syn keyword ngxDirective contained hls_buffers
-syn keyword ngxDirective contained hls_forward_args
-syn keyword ngxDirective contained hls_fragment
-syn keyword ngxDirective contained hls_mp4_buffer_size
-syn keyword ngxDirective contained hls_mp4_max_buffer_size
+syn keyword ngxDirective contained http2
 syn keyword ngxDirective contained http2_body_preread_size
 syn keyword ngxDirective contained http2_chunk_size
 syn keyword ngxDirective contained http2_max_concurrent_pushes
@@ -312,6 +290,10 @@ syn keyword ngxDirective contained http2_push
 syn keyword ngxDirective contained http2_push_preload
 syn keyword ngxDirective contained http2_recv_buffer_size
 syn keyword ngxDirective contained http2_streams_index_size
+syn keyword ngxDirective contained http3
+syn keyword ngxDirective contained http3_hq
+syn keyword ngxDirective contained http3_max_concurrent_streams
+syn keyword ngxDirective contained http3_stream_buffer_size
 syn keyword ngxDirective contained if_modified_since
 syn keyword ngxDirective contained ignore_invalid_headers
 syn keyword ngxDirective contained image_filter
@@ -342,21 +324,20 @@ syn keyword ngxDirective contained js_filter
 syn keyword ngxDirective contained js_header_filter
 syn keyword ngxDirective contained js_import
 syn keyword ngxDirective contained js_path
+syn keyword ngxDirective contained js_preload_object
 syn keyword ngxDirective contained js_preread
 syn keyword ngxDirective contained js_set
+syn keyword ngxDirective contained js_shared_dict_zone
 syn keyword ngxDirective contained js_var
 syn keyword ngxDirective contained keepalive
 syn keyword ngxDirective contained keepalive_disable
 syn keyword ngxDirective contained keepalive_requests
 syn keyword ngxDirective contained keepalive_time
 syn keyword ngxDirective contained keepalive_timeout
-syn keyword ngxDirective contained keyval
-syn keyword ngxDirective contained keyval_zone
 syn keyword ngxDirective contained kqueue_changes
 syn keyword ngxDirective contained kqueue_events
 syn keyword ngxDirective contained large_client_header_buffers
 syn keyword ngxDirective contained least_conn
-syn keyword ngxDirective contained least_time
 syn keyword ngxDirective contained limit_conn
 syn keyword ngxDirective contained limit_conn_dry_run
 syn keyword ngxDirective contained limit_conn_log_level
@@ -400,14 +381,11 @@ syn keyword ngxDirective contained modern_browser
 syn keyword ngxDirective contained modern_browser_value
 syn keyword ngxDirective contained mp4
 syn keyword ngxDirective contained mp4_buffer_size
-syn keyword ngxDirective contained mp4_limit_rate
-syn keyword ngxDirective contained mp4_limit_rate_after
 syn keyword ngxDirective contained mp4_max_buffer_size
 syn keyword ngxDirective contained mp4_start_key_frame
 syn keyword ngxDirective contained msie_padding
 syn keyword ngxDirective contained msie_refresh
 syn keyword ngxDirective contained multi_accept
-syn keyword ngxDirective contained ntlm
 syn keyword ngxDirective contained open_file_cache
 syn keyword ngxDirective contained open_file_cache_errors
 syn keyword ngxDirective contained open_file_cache_events
@@ -450,7 +428,6 @@ syn keyword ngxDirective contained proxy_cache_max_range_offset
 syn keyword ngxDirective contained proxy_cache_methods
 syn keyword ngxDirective contained proxy_cache_min_uses
 syn keyword ngxDirective contained proxy_cache_path
-syn keyword ngxDirective contained proxy_cache_purge
 syn keyword ngxDirective contained proxy_cache_revalidate
 syn keyword ngxDirective contained proxy_cache_use_stale
 syn keyword ngxDirective contained proxy_cache_valid
@@ -488,7 +465,6 @@ syn keyword ngxDirective contained proxy_requests
 syn keyword ngxDirective contained proxy_responses
 syn keyword ngxDirective contained proxy_send_lowat
 syn keyword ngxDirective contained proxy_send_timeout
-syn keyword ngxDirective contained proxy_session_drop
 syn keyword ngxDirective contained proxy_set_body
 syn keyword ngxDirective contained proxy_set_header
 syn keyword ngxDirective contained proxy_smtp_auth
@@ -513,7 +489,11 @@ syn keyword ngxDirective contained proxy_temp_file_write_size
 syn keyword ngxDirective contained proxy_temp_path
 syn keyword ngxDirective contained proxy_timeout
 syn keyword ngxDirective contained proxy_upload_rate
-syn keyword ngxDirective contained queue
+syn keyword ngxDirective contained quic_active_connection_id_limit
+syn keyword ngxDirective contained quic_bpf
+syn keyword ngxDirective contained quic_gso
+syn keyword ngxDirective contained quic_host_key
+syn keyword ngxDirective contained quic_retry
 syn keyword ngxDirective contained random
 syn keyword ngxDirective contained random_index
 syn keyword ngxDirective contained read_ahead
@@ -544,7 +524,6 @@ syn keyword ngxDirective contained scgi_cache_max_range_offset
 syn keyword ngxDirective contained scgi_cache_methods
 syn keyword ngxDirective contained scgi_cache_min_uses
 syn keyword ngxDirective contained scgi_cache_path
-syn keyword ngxDirective contained scgi_cache_purge
 syn keyword ngxDirective contained scgi_cache_revalidate
 syn keyword ngxDirective contained scgi_cache_use_stale
 syn keyword ngxDirective contained scgi_cache_valid
@@ -583,9 +562,6 @@ syn keyword ngxDirective contained server_name_in_redirect
 syn keyword ngxDirective contained server_names_hash_bucket_size
 syn keyword ngxDirective contained server_names_hash_max_size
 syn keyword ngxDirective contained server_tokens
-syn keyword ngxDirective contained session_log
-syn keyword ngxDirective contained session_log_format
-syn keyword ngxDirective contained session_log_zone
 syn keyword ngxDirective contained set_real_ip_from
 syn keyword ngxDirective contained slice
 syn keyword ngxDirective contained smtp_auth
@@ -633,11 +609,6 @@ syn keyword ngxDirective contained ssl_trusted_certificate
 syn keyword ngxDirective contained ssl_verify_client
 syn keyword ngxDirective contained ssl_verify_depth
 syn keyword ngxDirective contained starttls
-syn keyword ngxDirective contained state
-syn keyword ngxDirective contained status
-syn keyword ngxDirective contained status_format
-syn keyword ngxDirective contained status_zone
-syn keyword ngxDirective contained sticky
 syn keyword ngxDirective contained stub_status
 syn keyword ngxDirective contained sub_filter
 syn keyword ngxDirective contained sub_filter_last_modified
@@ -680,7 +651,6 @@ syn keyword ngxDirective contained uwsgi_cache_max_range_offset
 syn keyword ngxDirective contained uwsgi_cache_methods
 syn keyword ngxDirective contained uwsgi_cache_min_uses
 syn keyword ngxDirective contained uwsgi_cache_path
-syn keyword ngxDirective contained uwsgi_cache_purge
 syn keyword ngxDirective contained uwsgi_cache_revalidate
 syn keyword ngxDirective contained uwsgi_cache_use_stale
 syn keyword ngxDirective contained uwsgi_cache_valid
@@ -744,6 +714,62 @@ syn keyword ngxDirective contained xslt_string_param
 syn keyword ngxDirective contained xslt_stylesheet
 syn keyword ngxDirective contained xslt_types
 syn keyword ngxDirective contained zone
+
+" nginx-plus commercial extensions directives
+
+syn keyword ngxDirectiveBlock contained match
+syn keyword ngxDirectiveBlock contained otel_exporter
+
+syn keyword ngxDirective contained api
+syn keyword ngxDirective contained auth_jwt
+syn keyword ngxDirective contained auth_jwt_claim_set
+syn keyword ngxDirective contained auth_jwt_header_set
+syn keyword ngxDirective contained auth_jwt_key_cache
+syn keyword ngxDirective contained auth_jwt_key_file
+syn keyword ngxDirective contained auth_jwt_key_request
+syn keyword ngxDirective contained auth_jwt_leeway
+syn keyword ngxDirective contained auth_jwt_require
+syn keyword ngxDirective contained auth_jwt_type
+syn keyword ngxDirective contained f4f
+syn keyword ngxDirective contained f4f_buffer_size
+syn keyword ngxDirective contained fastcgi_cache_purge
+syn keyword ngxDirective contained health_check
+syn keyword ngxDirective contained health_check_timeout
+syn keyword ngxDirective contained hls
+syn keyword ngxDirective contained hls_buffers
+syn keyword ngxDirective contained hls_forward_args
+syn keyword ngxDirective contained hls_fragment
+syn keyword ngxDirective contained hls_mp4_buffer_size
+syn keyword ngxDirective contained hls_mp4_max_buffer_size
+syn keyword ngxDirective contained internal_redirect
+syn keyword ngxDirective contained keyval
+syn keyword ngxDirective contained keyval_zone
+syn keyword ngxDirective contained least_time
+syn keyword ngxDirective contained mp4_limit_rate
+syn keyword ngxDirective contained mp4_limit_rate_after
+syn keyword ngxDirective contained mqtt
+syn keyword ngxDirective contained mqtt_preread
+syn keyword ngxDirective contained mqtt_rewrite_buffer_size
+syn keyword ngxDirective contained mqtt_set_connect
+syn keyword ngxDirective contained ntlm
+syn keyword ngxDirective contained otel_service_name
+syn keyword ngxDirective contained otel_span_attr
+syn keyword ngxDirective contained otel_span_name
+syn keyword ngxDirective contained otel_trace
+syn keyword ngxDirective contained otel_trace_context
+syn keyword ngxDirective contained proxy_cache_purge
+syn keyword ngxDirective contained proxy_session_drop
+syn keyword ngxDirective contained queue
+syn keyword ngxDirective contained scgi_cache_purge
+syn keyword ngxDirective contained session_log
+syn keyword ngxDirective contained session_log_format
+syn keyword ngxDirective contained session_log_zone
+syn keyword ngxDirective contained state
+syn keyword ngxDirective contained status
+syn keyword ngxDirective contained status_format
+syn keyword ngxDirective contained status_zone
+syn keyword ngxDirective contained sticky
+syn keyword ngxDirective contained uwsgi_cache_purge
 syn keyword ngxDirective contained zone_sync
 syn keyword ngxDirective contained zone_sync_buffers
 syn keyword ngxDirective contained zone_sync_connect_retry_interval
@@ -766,7 +792,6 @@ syn keyword ngxDirective contained zone_sync_ssl_verify
 syn keyword ngxDirective contained zone_sync_ssl_verify_depth
 syn keyword ngxDirective contained zone_sync_timeout
 
-
 " 3rd party modules list taken from
 " https://github.com/freebsd/freebsd-ports/blob/main/www/nginx-devel/Makefile.extmod
 " ----------------------------------------------------------------------------------
@@ -837,52 +862,6 @@ syn keyword ngxDirectiveThirdParty contained brotli_window
 " https://github.com/torden/ngx_cache_purge
 syn keyword ngxDirectiveThirdParty contained cache_purge_response_type
 
-" https://github.com/nginx-clojure/nginx-clojure
-syn keyword ngxDirectiveThirdParty contained access_handler_code
-syn keyword ngxDirectiveThirdParty contained access_handler_name
-syn keyword ngxDirectiveThirdParty contained access_handler_property
-syn keyword ngxDirectiveThirdParty contained access_handler_type
-syn keyword ngxDirectiveThirdParty contained always_read_body
-syn keyword ngxDirectiveThirdParty contained auto_upgrade_ws
-syn keyword ngxDirectiveThirdParty contained body_filter_code
-syn keyword ngxDirectiveThirdParty contained body_filter_name
-syn keyword ngxDirectiveThirdParty contained body_filter_property
-syn keyword ngxDirectiveThirdParty contained body_filter_type
-syn keyword ngxDirectiveThirdParty contained content_handler_code
-syn keyword ngxDirectiveThirdParty contained content_handler_name
-syn keyword ngxDirectiveThirdParty contained content_handler_property
-syn keyword ngxDirectiveThirdParty contained content_handler_type
-syn keyword ngxDirectiveThirdParty contained handler_code
-syn keyword ngxDirectiveThirdParty contained handler_name
-syn keyword ngxDirectiveThirdParty contained handler_type
-syn keyword ngxDirectiveThirdParty contained handlers_lazy_init
-syn keyword ngxDirectiveThirdParty contained header_filter_code
-syn keyword ngxDirectiveThirdParty contained header_filter_name
-syn keyword ngxDirectiveThirdParty contained header_filter_property
-syn keyword ngxDirectiveThirdParty contained header_filter_type
-syn keyword ngxDirectiveThirdParty contained jvm_classpath
-syn keyword ngxDirectiveThirdParty contained jvm_classpath_check
-syn keyword ngxDirectiveThirdParty contained jvm_exit_handler_code
-syn keyword ngxDirectiveThirdParty contained jvm_exit_handler_name
-syn keyword ngxDirectiveThirdParty contained jvm_handler_type
-syn keyword ngxDirectiveThirdParty contained jvm_init_handler_code
-syn keyword ngxDirectiveThirdParty contained jvm_init_handler_name
-syn keyword ngxDirectiveThirdParty contained jvm_options
-syn keyword ngxDirectiveThirdParty contained jvm_path
-syn keyword ngxDirectiveThirdParty contained jvm_var
-syn keyword ngxDirectiveThirdParty contained jvm_workers
-syn keyword ngxDirectiveThirdParty contained log_handler_code
-syn keyword ngxDirectiveThirdParty contained log_handler_name
-syn keyword ngxDirectiveThirdParty contained log_handler_property
-syn keyword ngxDirectiveThirdParty contained log_handler_type
-syn keyword ngxDirectiveThirdParty contained max_balanced_tcp_connections
-syn keyword ngxDirectiveThirdParty contained rewrite_handler_code
-syn keyword ngxDirectiveThirdParty contained rewrite_handler_name
-syn keyword ngxDirectiveThirdParty contained rewrite_handler_property
-syn keyword ngxDirectiveThirdParty contained rewrite_handler_type
-syn keyword ngxDirectiveThirdParty contained shared_map
-syn keyword ngxDirectiveThirdParty contained write_page_size
-
 " https://github.com/AirisX/nginx_cookie_flag_module
 syn keyword ngxDirectiveThirdParty contained set_cookie_flag
 
@@ -932,29 +911,6 @@ syn keyword ngxDirectiveThirdParty contained dns_update
 syn keyword ngxDirectiveThirdParty contained dynamic_state_file
 syn keyword ngxDirectiveThirdParty contained dynamic_upstream
 
-" https://github.com/ZigzagAK/ngx_dynamic_healthcheck
-syn keyword ngxDirectiveThirdParty contained check
-syn keyword ngxDirectiveThirdParty contained check_disable_host
-syn keyword ngxDirectiveThirdParty contained check_exclude_host
-syn keyword ngxDirectiveThirdParty contained check_persistent
-syn keyword ngxDirectiveThirdParty contained check_request_body
-syn keyword ngxDirectiveThirdParty contained check_request_headers
-syn keyword ngxDirectiveThirdParty contained check_request_uri
-syn keyword ngxDirectiveThirdParty contained check_response_body
-syn keyword ngxDirectiveThirdParty contained check_response_codes
-syn keyword ngxDirectiveThirdParty contained healthcheck
-syn keyword ngxDirectiveThirdParty contained healthcheck_buffer_size
-syn keyword ngxDirectiveThirdParty contained healthcheck_disable_host
-syn keyword ngxDirectiveThirdParty contained healthcheck_get
-syn keyword ngxDirectiveThirdParty contained healthcheck_persistent
-syn keyword ngxDirectiveThirdParty contained healthcheck_request_body
-syn keyword ngxDirectiveThirdParty contained healthcheck_request_headers
-syn keyword ngxDirectiveThirdParty contained healthcheck_request_uri
-syn keyword ngxDirectiveThirdParty contained healthcheck_response_body
-syn keyword ngxDirectiveThirdParty contained healthcheck_response_codes
-syn keyword ngxDirectiveThirdParty contained healthcheck_status
-syn keyword ngxDirectiveThirdParty contained healthcheck_update
-
 " https://github.com/openresty/encrypted-session-nginx-module
 syn keyword ngxDirectiveThirdParty contained encrypted_session_expires
 syn keyword ngxDirectiveThirdParty contained encrypted_session_iv
@@ -1004,6 +960,7 @@ syn keyword ngxDirectiveThirdParty contained auth_gss_map_to_local
 syn keyword ngxDirectiveThirdParty contained auth_gss_realm
 syn keyword ngxDirectiveThirdParty contained auth_gss_service_ccache
 syn keyword ngxDirectiveThirdParty contained auth_gss_service_name
+syn keyword ngxDirectiveThirdParty contained auth_gss_zone_name
 
 " https://github.com/kvspb/nginx-auth-ldap
 syn keyword ngxDirectiveThirdParty contained auth_ldap
@@ -1033,6 +990,7 @@ syn keyword ngxDirectiveThirdParty contained eval_subrequest_in_memory
 
 " https://github.com/aperezdc/ngx-fancyindex
 syn keyword ngxDirectiveThirdParty contained fancyindex
+syn keyword ngxDirectiveThirdParty contained fancyindex_case_sensitive
 syn keyword ngxDirectiveThirdParty contained fancyindex_css_href
 syn keyword ngxDirectiveThirdParty contained fancyindex_default_sort
 syn keyword ngxDirectiveThirdParty contained fancyindex_directories_first
@@ -1121,6 +1079,7 @@ syn keyword ngxDirectiveThirdParty contained nchan_publisher_upstream_request
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_channel_id
 syn keyword ngxDirectiveThirdParty contained nchan_pubsub_location
+syn keyword ngxDirectiveThirdParty contained nchan_redis_accurate_subscriber_count
 syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval_backoff
 syn keyword ngxDirectiveThirdParty contained nchan_redis_cluster_check_interval_jitter
@@ -1138,6 +1097,11 @@ syn keyword ngxDirectiveThirdParty contained nchan_redis_connect_timeout
 syn keyword ngxDirectiveThirdParty contained nchan_redis_discovered_ip_range_blacklist
 syn keyword ngxDirectiveThirdParty contained nchan_redis_fakesub_timer_interval
 syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_cache_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_keepalive_backoff
+syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_keepalive_jitter
+syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_keepalive_max
+syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_keepalive_min
+syn keyword ngxDirectiveThirdParty contained nchan_redis_idle_channel_keepalive_safety_margin
 syn keyword ngxDirectiveThirdParty contained nchan_redis_load_scripts_unconditionally
 syn keyword ngxDirectiveThirdParty contained nchan_redis_namespace
 syn keyword ngxDirectiveThirdParty contained nchan_redis_node_connect_timeout
@@ -1173,6 +1137,9 @@ syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_server_name
 syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_trusted_certificate
 syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_trusted_certificate_path
 syn keyword ngxDirectiveThirdParty contained nchan_redis_tls_verify_certificate
+syn keyword ngxDirectiveThirdParty contained nchan_redis_upstream_stats
+syn keyword ngxDirectiveThirdParty contained nchan_redis_upstream_stats_disconnected_timeout
+syn keyword ngxDirectiveThirdParty contained nchan_redis_upstream_stats_enabled
 syn keyword ngxDirectiveThirdParty contained nchan_redis_url
 syn keyword ngxDirectiveThirdParty contained nchan_redis_username
 syn keyword ngxDirectiveThirdParty contained nchan_redis_wait_after_connecting
@@ -1323,6 +1290,7 @@ syn keyword ngxDirectiveThirdParty contained upload_progress_jsonp_parameter
 syn keyword ngxDirectiveThirdParty contained upload_progress_template
 
 " https://github.com/yaoweibin/nginx_upstream_check_module
+syn keyword ngxDirectiveThirdParty contained check
 syn keyword ngxDirectiveThirdParty contained check_fastcgi_param
 syn keyword ngxDirectiveThirdParty contained check_http_expect_alive
 syn keyword ngxDirectiveThirdParty contained check_http_send
@@ -1335,6 +1303,7 @@ syn keyword ngxDirectiveThirdParty contained fair
 syn keyword ngxDirectiveThirdParty contained upstream_fair_shm_size
 
 " https://github.com/ayty-adrianomartins/nginx-sticky-module-ng
+syn keyword ngxDirectiveThirdParty contained sticky_hide_cookie
 syn keyword ngxDirectiveThirdParty contained sticky_no_fallback
 
 " https://github.com/Novetta/nginx-video-thumbextractor-module
@@ -1421,6 +1390,8 @@ syn keyword ngxDirectiveThirdParty contained lua_socket_pool_size
 syn keyword ngxDirectiveThirdParty contained lua_socket_read_timeout
 syn keyword ngxDirectiveThirdParty contained lua_socket_send_lowat
 syn keyword ngxDirectiveThirdParty contained lua_socket_send_timeout
+syn keyword ngxDirectiveThirdParty contained lua_ssl_certificate
+syn keyword ngxDirectiveThirdParty contained lua_ssl_certificate_key
 syn keyword ngxDirectiveThirdParty contained lua_ssl_ciphers
 syn keyword ngxDirectiveThirdParty contained lua_ssl_conf_command
 syn keyword ngxDirectiveThirdParty contained lua_ssl_crl
@@ -1834,16 +1805,6 @@ syn keyword ngxDirectiveThirdParty contained slowfs_cache_purge
 syn keyword ngxDirectiveThirdParty contained slowfs_cache_valid
 syn keyword ngxDirectiveThirdParty contained slowfs_temp_path
 
-" https://github.com/kawakibi/ngx_small_light
-syn keyword ngxDirectiveThirdParty contained small_light
-syn keyword ngxDirectiveThirdParty contained small_light_buffer
-syn keyword ngxDirectiveThirdParty contained small_light_getparam_mode
-syn keyword ngxDirectiveThirdParty contained small_light_imlib2_temp_dir
-syn keyword ngxDirectiveThirdParty contained small_light_material_dir
-syn keyword ngxDirectiveThirdParty contained small_light_pattern_define
-syn keyword ngxDirectiveThirdParty contained small_light_radius_max
-syn keyword ngxDirectiveThirdParty contained small_light_sigma_max
-
 " https://github.com/openresty/srcache-nginx-module
 syn keyword ngxDirectiveThirdParty contained srcache_buffer
 syn keyword ngxDirectiveThirdParty contained srcache_default_expire
@@ -1980,6 +1941,14 @@ syn keyword ngxDirectiveThirdParty contained websockify_pass
 syn keyword ngxDirectiveThirdParty contained websockify_read_timeout
 syn keyword ngxDirectiveThirdParty contained websockify_send_timeout
 
+" https://github.com/vozlt/nginx-module-sts
+syn keyword ngxDirectiveThirdParty contained stream_server_traffic_status
+syn keyword ngxDirectiveThirdParty contained stream_server_traffic_status_average_method
+syn keyword ngxDirectiveThirdParty contained stream_server_traffic_status_display
+syn keyword ngxDirectiveThirdParty contained stream_server_traffic_status_display_format
+syn keyword ngxDirectiveThirdParty contained stream_server_traffic_status_display_jsonp
+syn keyword ngxDirectiveThirdParty contained stream_server_traffic_status_zone
+
 " highlight
 
 hi def link ngxComment Comment
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 48a20e9..0deb27b 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -13,6 +13,7 @@
 static void ngx_show_version_info(void);
 static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle);
 static void ngx_cleanup_environment(void *data);
+static void ngx_cleanup_environment_variable(void *data);
 static ngx_int_t ngx_get_options(int argc, char *const *argv);
 static ngx_int_t ngx_process_options(ngx_cycle_t *cycle);
 static ngx_int_t ngx_save_argv(ngx_cycle_t *cycle, int argc, char *const *argv);
@@ -518,7 +519,8 @@ ngx_add_inherited_sockets(ngx_cycle_t *cycle)
 char **
 ngx_set_environment(ngx_cycle_t *cycle, ngx_uint_t *last)
 {
-    char                **p, **env;
+    char                **p, **env, *str;
+    size_t                len;
     ngx_str_t            *var;
     ngx_uint_t            i, n;
     ngx_core_conf_t      *ccf;
@@ -600,7 +602,31 @@ tz_found:
     for (i = 0; i < ccf->env.nelts; i++) {
 
         if (var[i].data[var[i].len] == '=') {
-            env[n++] = (char *) var[i].data;
+
+            if (last) {
+                env[n++] = (char *) var[i].data;
+                continue;
+            }
+
+            cln = ngx_pool_cleanup_add(cycle->pool, 0);
+            if (cln == NULL) {
+                return NULL;
+            }
+
+            len = ngx_strlen(var[i].data) + 1;
+
+            str = ngx_alloc(len, cycle->log);
+            if (str == NULL) {
+                return NULL;
+            }
+
+            ngx_memcpy(str, var[i].data, len);
+
+            cln->handler = ngx_cleanup_environment_variable;
+            cln->data = str;
+
+            env[n++] = str;
+
             continue;
         }
 
@@ -645,6 +671,29 @@ ngx_cleanup_environment(void *data)
 }
 
 
+static void
+ngx_cleanup_environment_variable(void *data)
+{
+    char  *var = data;
+
+    char  **p;
+
+    for (p = environ; *p; p++) {
+
+        /*
+         * if an environment variable is still used, as it happens on exit,
+         * the only option is to leak it
+         */
+
+        if (*p == var) {
+            return;
+        }
+    }
+
+    ngx_free(var);
+}
+
+
 ngx_pid_t
 ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv)
 {
@@ -680,6 +729,9 @@ ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv)
 
     ls = cycle->listening.elts;
     for (i = 0; i < cycle->listening.nelts; i++) {
+        if (ls[i].ignore) {
+            continue;
+        }
         p = ngx_sprintf(p, "%ud;", ls[i].fd);
     }
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 832baaa..7ef5cfb 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1024000
-#define NGINX_VERSION      "1.24.0"
+#define nginx_version      1026000
+#define NGINX_VERSION      "1.26.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_bpf.c b/src/core/ngx_bpf.c
new file mode 100644
index 0000000..363a02c
--- /dev/null
+++ b/src/core/ngx_bpf.c
@@ -0,0 +1,143 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+#define NGX_BPF_LOGBUF_SIZE  (16 * 1024)
+
+
+static ngx_inline int
+ngx_bpf(enum bpf_cmd cmd, union bpf_attr *attr, unsigned int size)
+{
+    return syscall(__NR_bpf, cmd, attr, size);
+}
+
+
+void
+ngx_bpf_program_link(ngx_bpf_program_t *program, const char *symbol, int fd)
+{
+    ngx_uint_t        i;
+    ngx_bpf_reloc_t  *rl;
+
+    rl = program->relocs;
+
+    for (i = 0; i < program->nrelocs; i++) {
+        if (ngx_strcmp(rl[i].name, symbol) == 0) {
+            program->ins[rl[i].offset].src_reg = 1;
+            program->ins[rl[i].offset].imm = fd;
+        }
+    }
+}
+
+
+int
+ngx_bpf_load_program(ngx_log_t *log, ngx_bpf_program_t *program)
+{
+    int             fd;
+    union bpf_attr  attr;
+#if (NGX_DEBUG)
+    char            buf[NGX_BPF_LOGBUF_SIZE];
+#endif
+
+    ngx_memzero(&attr, sizeof(union bpf_attr));
+
+    attr.license = (uintptr_t) program->license;
+    attr.prog_type = program->type;
+    attr.insns = (uintptr_t) program->ins;
+    attr.insn_cnt = program->nins;
+
+#if (NGX_DEBUG)
+    /* for verifier errors */
+    attr.log_buf = (uintptr_t) buf;
+    attr.log_size = NGX_BPF_LOGBUF_SIZE;
+    attr.log_level = 1;
+#endif
+
+    fd = ngx_bpf(BPF_PROG_LOAD, &attr, sizeof(attr));
+    if (fd < 0) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      "failed to load BPF program");
+
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0,
+                       "bpf verifier: %s", buf);
+
+        return -1;
+    }
+
+    return fd;
+}
+
+
+int
+ngx_bpf_map_create(ngx_log_t *log, enum bpf_map_type type, int key_size,
+    int value_size, int max_entries, uint32_t map_flags)
+{
+    int             fd;
+    union bpf_attr  attr;
+
+    ngx_memzero(&attr, sizeof(union bpf_attr));
+
+    attr.map_type = type;
+    attr.key_size = key_size;
+    attr.value_size = value_size;
+    attr.max_entries = max_entries;
+    attr.map_flags = map_flags;
+
+    fd = ngx_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
+    if (fd < 0) {
+        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+                      "failed to create BPF map");
+        return NGX_ERROR;
+    }
+
+    return fd;
+}
+
+
+int
+ngx_bpf_map_update(int fd, const void *key, const void *value, uint64_t flags)
+{
+    union bpf_attr attr;
+
+    ngx_memzero(&attr, sizeof(union bpf_attr));
+
+    attr.map_fd = fd;
+    attr.key = (uintptr_t) key;
+    attr.value = (uintptr_t) value;
+    attr.flags = flags;
+
+    return ngx_bpf(BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr));
+}
+
+
+int
+ngx_bpf_map_delete(int fd, const void *key)
+{
+    union bpf_attr attr;
+
+    ngx_memzero(&attr, sizeof(union bpf_attr));
+
+    attr.map_fd = fd;
+    attr.key = (uintptr_t) key;
+
+    return ngx_bpf(BPF_MAP_DELETE_ELEM, &attr, sizeof(attr));
+}
+
+
+int
+ngx_bpf_map_lookup(int fd, const void *key, void *value)
+{
+    union bpf_attr attr;
+
+    ngx_memzero(&attr, sizeof(union bpf_attr));
+
+    attr.map_fd = fd;
+    attr.key = (uintptr_t) key;
+    attr.value = (uintptr_t) value;
+
+    return ngx_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));
+}
diff --git a/src/core/ngx_bpf.h b/src/core/ngx_bpf.h
new file mode 100644
index 0000000..f62a36e
--- /dev/null
+++ b/src/core/ngx_bpf.h
@@ -0,0 +1,43 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_BPF_H_INCLUDED_
+#define _NGX_BPF_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+#include <linux/bpf.h>
+
+
+typedef struct {
+    char                *name;
+    int                  offset;
+} ngx_bpf_reloc_t;
+
+typedef struct {
+    char                *license;
+    enum bpf_prog_type   type;
+    struct bpf_insn     *ins;
+    size_t               nins;
+    ngx_bpf_reloc_t     *relocs;
+    size_t               nrelocs;
+} ngx_bpf_program_t;
+
+
+void ngx_bpf_program_link(ngx_bpf_program_t *program, const char *symbol,
+    int fd);
+int ngx_bpf_load_program(ngx_log_t *log, ngx_bpf_program_t *program);
+
+int ngx_bpf_map_create(ngx_log_t *log, enum bpf_map_type type, int key_size,
+    int value_size, int max_entries, uint32_t map_flags);
+int ngx_bpf_map_update(int fd, const void *key, const void *value,
+    uint64_t flags);
+int ngx_bpf_map_delete(int fd, const void *key);
+int ngx_bpf_map_lookup(int fd, const void *key, void *value);
+
+#endif /* _NGX_BPF_H_INCLUDED_ */
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 3682345..75809d9 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -1013,6 +1013,78 @@ ngx_configure_listening_sockets(ngx_cycle_t *cycle)
             }
         }
 
+#endif
+
+#if (NGX_HAVE_IP_MTU_DISCOVER)
+
+        if (ls[i].quic && ls[i].sockaddr->sa_family == AF_INET) {
+            value = IP_PMTUDISC_DO;
+
+            if (setsockopt(ls[i].fd, IPPROTO_IP, IP_MTU_DISCOVER,
+                           (const void *) &value, sizeof(int))
+                == -1)
+            {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
+                              "setsockopt(IP_MTU_DISCOVER) "
+                              "for %V failed, ignored",
+                              &ls[i].addr_text);
+            }
+        }
+
+#elif (NGX_HAVE_IP_DONTFRAG)
+
+        if (ls[i].quic && ls[i].sockaddr->sa_family == AF_INET) {
+            value = 1;
+
+            if (setsockopt(ls[i].fd, IPPROTO_IP, IP_DONTFRAG,
+                           (const void *) &value, sizeof(int))
+                == -1)
+            {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
+                              "setsockopt(IP_DONTFRAG) "
+                              "for %V failed, ignored",
+                              &ls[i].addr_text);
+            }
+        }
+
+#endif
+
+#if (NGX_HAVE_INET6)
+
+#if (NGX_HAVE_IPV6_MTU_DISCOVER)
+
+        if (ls[i].quic && ls[i].sockaddr->sa_family == AF_INET6) {
+            value = IPV6_PMTUDISC_DO;
+
+            if (setsockopt(ls[i].fd, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
+                           (const void *) &value, sizeof(int))
+                == -1)
+            {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
+                              "setsockopt(IPV6_MTU_DISCOVER) "
+                              "for %V failed, ignored",
+                              &ls[i].addr_text);
+            }
+        }
+
+#elif (NGX_HAVE_IP_DONTFRAG)
+
+        if (ls[i].quic && ls[i].sockaddr->sa_family == AF_INET6) {
+            value = 1;
+
+            if (setsockopt(ls[i].fd, IPPROTO_IPV6, IPV6_DONTFRAG,
+                           (const void *) &value, sizeof(int))
+                == -1)
+            {
+                ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
+                              "setsockopt(IPV6_DONTFRAG) "
+                              "for %V failed, ignored",
+                              &ls[i].addr_text);
+            }
+        }
+
+#endif
+
 #endif
     }
 
@@ -1037,6 +1109,12 @@ ngx_close_listening_sockets(ngx_cycle_t *cycle)
     ls = cycle->listening.elts;
     for (i = 0; i < cycle->listening.nelts; i++) {
 
+#if (NGX_QUIC)
+        if (ls[i].quic) {
+            continue;
+        }
+#endif
+
         c = ls[i].connection;
 
         if (c) {
@@ -1505,6 +1583,10 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text)
     }
 #endif
 
+    if (err == NGX_EMSGSIZE && c->log_error == NGX_ERROR_IGNORE_EMSGSIZE) {
+        return 0;
+    }
+
     if (err == 0
         || err == NGX_ECONNRESET
 #if (NGX_WIN32)
@@ -1522,6 +1604,7 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text)
     {
         switch (c->log_error) {
 
+        case NGX_ERROR_IGNORE_EMSGSIZE:
         case NGX_ERROR_IGNORE_EINVAL:
         case NGX_ERROR_IGNORE_ECONNRESET:
         case NGX_ERROR_INFO:
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 36e1be2..84dd804 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -73,6 +73,7 @@ struct ngx_listening_s {
     unsigned            reuseport:1;
     unsigned            add_reuseport:1;
     unsigned            keepalive:2;
+    unsigned            quic:1;
 
     unsigned            deferred_accept:1;
     unsigned            delete_deferred:1;
@@ -96,7 +97,8 @@ typedef enum {
     NGX_ERROR_ERR,
     NGX_ERROR_INFO,
     NGX_ERROR_IGNORE_ECONNRESET,
-    NGX_ERROR_IGNORE_EINVAL
+    NGX_ERROR_IGNORE_EINVAL,
+    NGX_ERROR_IGNORE_EMSGSIZE
 } ngx_connection_log_error_e;
 
 
@@ -147,6 +149,10 @@ struct ngx_connection_s {
 
     ngx_proxy_protocol_t  *proxy_protocol;
 
+#if (NGX_QUIC || NGX_COMPAT)
+    ngx_quic_stream_t     *quic;
+#endif
+
 #if (NGX_SSL || NGX_COMPAT)
     ngx_ssl_connection_t  *ssl;
 #endif
diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index 7ecdca0..88db7dc 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -27,6 +27,7 @@ typedef struct ngx_connection_s      ngx_connection_t;
 typedef struct ngx_thread_task_s     ngx_thread_task_t;
 typedef struct ngx_ssl_s             ngx_ssl_t;
 typedef struct ngx_proxy_protocol_s  ngx_proxy_protocol_t;
+typedef struct ngx_quic_stream_s     ngx_quic_stream_t;
 typedef struct ngx_ssl_connection_s  ngx_ssl_connection_t;
 typedef struct ngx_udp_connection_s  ngx_udp_connection_t;
 
@@ -82,6 +83,9 @@ typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
 #include <ngx_resolver.h>
 #if (NGX_OPENSSL)
 #include <ngx_event_openssl.h>
+#if (NGX_QUIC)
+#include <ngx_event_quic.h>
+#endif
 #endif
 #include <ngx_process_cycle.h>
 #include <ngx_conf_file.h>
@@ -91,6 +95,9 @@ typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
 #include <ngx_connection.h>
 #include <ngx_syslog.h>
 #include <ngx_proxy_protocol.h>
+#if (NGX_HAVE_BPF)
+#include <ngx_bpf.h>
+#endif
 
 
 #define LF     (u_char) '\n'
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 4228504..acb2ef4 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -507,7 +507,7 @@ ngx_cidr_match(struct sockaddr *sa, ngx_array_t *cidrs)
 
             p = inaddr6->s6_addr;
 
-            inaddr = p[12] << 24;
+            inaddr = (in_addr_t) p[12] << 24;
             inaddr += p[13] << 16;
             inaddr += p[14] << 8;
             inaddr += p[15];
diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h
index 6fb4554..a415cd6 100644
--- a/src/core/ngx_module.h
+++ b/src/core/ngx_module.h
@@ -107,7 +107,12 @@
 #endif
 
 #define NGX_MODULE_SIGNATURE_17  "0"
+
+#if (NGX_QUIC || NGX_COMPAT)
+#define NGX_MODULE_SIGNATURE_18  "1"
+#else
 #define NGX_MODULE_SIGNATURE_18  "0"
+#endif
 
 #if (NGX_HAVE_OPENAT)
 #define NGX_MODULE_SIGNATURE_19  "1"
diff --git a/src/core/ngx_queue.c b/src/core/ngx_queue.c
index 3cacaf3..3d1d589 100644
--- a/src/core/ngx_queue.c
+++ b/src/core/ngx_queue.c
@@ -9,6 +9,10 @@
 #include <ngx_core.h>
 
 
+static void ngx_queue_merge(ngx_queue_t *queue, ngx_queue_t *tail,
+    ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *));
+
+
 /*
  * find the middle queue element if the queue has odd number of elements
  * or the first element of the queue's second part otherwise
@@ -45,13 +49,13 @@ ngx_queue_middle(ngx_queue_t *queue)
 }
 
 
-/* the stable insertion sort */
+/* the stable merge sort */
 
 void
 ngx_queue_sort(ngx_queue_t *queue,
     ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *))
 {
-    ngx_queue_t  *q, *prev, *next;
+    ngx_queue_t  *q, tail;
 
     q = ngx_queue_head(queue);
 
@@ -59,22 +63,44 @@ ngx_queue_sort(ngx_queue_t *queue,
         return;
     }
 
-    for (q = ngx_queue_next(q); q != ngx_queue_sentinel(queue); q = next) {
+    q = ngx_queue_middle(queue);
 
-        prev = ngx_queue_prev(q);
-        next = ngx_queue_next(q);
+    ngx_queue_split(queue, q, &tail);
 
-        ngx_queue_remove(q);
+    ngx_queue_sort(queue, cmp);
+    ngx_queue_sort(&tail, cmp);
 
-        do {
-            if (cmp(prev, q) <= 0) {
-                break;
-            }
+    ngx_queue_merge(queue, &tail, cmp);
+}
 
-            prev = ngx_queue_prev(prev);
 
-        } while (prev != ngx_queue_sentinel(queue));
+static void
+ngx_queue_merge(ngx_queue_t *queue, ngx_queue_t *tail,
+    ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *))
+{
+    ngx_queue_t  *q1, *q2;
 
-        ngx_queue_insert_after(prev, q);
+    q1 = ngx_queue_head(queue);
+    q2 = ngx_queue_head(tail);
+
+    for ( ;; ) {
+        if (q1 == ngx_queue_sentinel(queue)) {
+            ngx_queue_add(queue, tail);
+            break;
+        }
+
+        if (q2 == ngx_queue_sentinel(tail)) {
+            break;
+        }
+
+        if (cmp(q1, q2) <= 0) {
+            q1 = ngx_queue_next(q1);
+            continue;
+        }
+
+        ngx_queue_remove(q2);
+        ngx_queue_insert_before(q1, q2);
+
+        q2 = ngx_queue_head(tail);
     }
 }
diff --git a/src/core/ngx_queue.h b/src/core/ngx_queue.h
index 038bf12..0f82f17 100644
--- a/src/core/ngx_queue.h
+++ b/src/core/ngx_queue.h
@@ -47,6 +47,9 @@ struct ngx_queue_s {
     (h)->prev = x
 
 
+#define ngx_queue_insert_before   ngx_queue_insert_tail
+
+
 #define ngx_queue_head(h)                                                     \
     (h)->next
 
diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c
index bebf3b6..5b13c5d 100644
--- a/src/core/ngx_regex.c
+++ b/src/core/ngx_regex.c
@@ -600,6 +600,8 @@ ngx_regex_cleanup(void *data)
      * the new cycle, these will be re-allocated.
      */
 
+    ngx_regex_malloc_init(NULL);
+
     if (ngx_regex_compile_context) {
         pcre2_compile_context_free(ngx_regex_compile_context);
         ngx_regex_compile_context = NULL;
@@ -611,6 +613,8 @@ ngx_regex_cleanup(void *data)
         ngx_regex_match_data_size = 0;
     }
 
+    ngx_regex_malloc_done();
+
 #endif
 }
 
@@ -706,9 +710,6 @@ ngx_regex_module_init(ngx_cycle_t *cycle)
     ngx_regex_malloc_done();
 
     ngx_regex_studies = NULL;
-#if (NGX_PCRE2)
-    ngx_regex_compile_context = NULL;
-#endif
 
     return NGX_OK;
 }
@@ -732,14 +733,14 @@ ngx_regex_create_conf(ngx_cycle_t *cycle)
         return NULL;
     }
 
-    cln->handler = ngx_regex_cleanup;
-    cln->data = rcf;
-
     rcf->studies = ngx_list_create(cycle->pool, 8, sizeof(ngx_regex_elt_t));
     if (rcf->studies == NULL) {
         return NULL;
     }
 
+    cln->handler = ngx_regex_cleanup;
+    cln->data = rcf;
+
     ngx_regex_studies = rcf->studies;
 
     return rcf;
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index d81547a..ef525d9 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -267,6 +267,18 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
 ngx_int_t
 ngx_handle_read_event(ngx_event_t *rev, ngx_uint_t flags)
 {
+#if (NGX_QUIC)
+
+    ngx_connection_t  *c;
+
+    c = rev->data;
+
+    if (c->quic) {
+        return NGX_OK;
+    }
+
+#endif
+
     if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
 
         /* kqueue, epoll */
@@ -337,9 +349,15 @@ ngx_handle_write_event(ngx_event_t *wev, size_t lowat)
 {
     ngx_connection_t  *c;
 
-    if (lowat) {
-        c = wev->data;
+    c = wev->data;
 
+#if (NGX_QUIC)
+    if (c->quic) {
+        return NGX_OK;
+    }
+#endif
+
+    if (lowat) {
         if (ngx_send_lowat(c, lowat) == NGX_ERROR) {
             return NGX_ERROR;
         }
@@ -873,8 +891,16 @@ ngx_event_process_init(ngx_cycle_t *cycle)
 
 #else
 
-        rev->handler = (c->type == SOCK_STREAM) ? ngx_event_accept
-                                                : ngx_event_recvmsg;
+        if (c->type == SOCK_STREAM) {
+            rev->handler = ngx_event_accept;
+
+#if (NGX_QUIC)
+        } else if (ls[i].quic) {
+            rev->handler = ngx_quic_recvmsg;
+#endif
+        } else {
+            rev->handler = ngx_event_recvmsg;
+        }
 
 #if (NGX_HAVE_REUSEPORT)
 
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 104e8da..89f277f 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -33,9 +33,6 @@ static int ngx_ssl_new_client_session(ngx_ssl_conn_t *ssl_conn,
 #ifdef SSL_READ_EARLY_DATA_SUCCESS
 static ngx_int_t ngx_ssl_try_early_data(ngx_connection_t *c);
 #endif
-#if (NGX_DEBUG)
-static void ngx_ssl_handshake_log(ngx_connection_t *c);
-#endif
 static void ngx_ssl_handshake_handler(ngx_event_t *ev);
 #ifdef SSL_READ_EARLY_DATA_SUCCESS
 static ssize_t ngx_ssl_recv_early(ngx_connection_t *c, u_char *buf,
@@ -143,13 +140,42 @@ int  ngx_ssl_stapling_index;
 ngx_int_t
 ngx_ssl_init(ngx_log_t *log)
 {
-#if OPENSSL_VERSION_NUMBER >= 0x10100003L
+#if (OPENSSL_INIT_LOAD_CONFIG && !defined LIBRESSL_VERSION_NUMBER)
 
-    if (OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL) == 0) {
+    uint64_t                opts;
+    OPENSSL_INIT_SETTINGS  *init;
+
+    opts = OPENSSL_INIT_LOAD_CONFIG;
+
+#if (NGX_OPENSSL_NO_CONFIG)
+
+    if (getenv("OPENSSL_CONF") == NULL) {
+        opts = OPENSSL_INIT_NO_LOAD_CONFIG;
+    }
+
+#endif
+
+    init = OPENSSL_INIT_new();
+    if (init == NULL) {
+        ngx_ssl_error(NGX_LOG_ALERT, log, 0, "OPENSSL_INIT_new() failed");
+        return NGX_ERROR;
+    }
+
+#ifndef OPENSSL_NO_STDIO
+    if (OPENSSL_INIT_set_config_appname(init, "nginx") == 0) {
+        ngx_ssl_error(NGX_LOG_ALERT, log, 0,
+                      "OPENSSL_INIT_set_config_appname() failed");
+        return NGX_ERROR;
+    }
+#endif
+
+    if (OPENSSL_init_ssl(opts, init) == 0) {
         ngx_ssl_error(NGX_LOG_ALERT, log, 0, "OPENSSL_init_ssl() failed");
         return NGX_ERROR;
     }
 
+    OPENSSL_INIT_free(init);
+
     /*
      * OPENSSL_init_ssl() may leave errors in the error queue
      * while returning success
@@ -159,7 +185,15 @@ ngx_ssl_init(ngx_log_t *log)
 
 #else
 
-    OPENSSL_config(NULL);
+#if (NGX_OPENSSL_NO_CONFIG)
+
+    if (getenv("OPENSSL_CONF") == NULL) {
+        OPENSSL_no_config();
+    }
+
+#endif
+
+    OPENSSL_config("nginx");
 
     SSL_library_init();
     SSL_load_error_strings();
@@ -1071,7 +1105,8 @@ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
     BIO               *rbio, *wbio;
     ngx_connection_t  *c;
 
-#ifndef SSL_OP_NO_RENEGOTIATION
+#if (!defined SSL_OP_NO_RENEGOTIATION                                         \
+     && !defined SSL_OP_NO_CLIENT_RENEGOTIATION)
 
     if ((where & SSL_CB_HANDSHAKE_START)
         && SSL_is_server((ngx_ssl_conn_t *) ssl_conn))
@@ -1804,9 +1839,10 @@ ngx_ssl_handshake(ngx_connection_t *c)
         c->read->ready = 1;
         c->write->ready = 1;
 
-#ifndef SSL_OP_NO_RENEGOTIATION
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-#ifdef SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
+#if (!defined SSL_OP_NO_RENEGOTIATION                                         \
+     && !defined SSL_OP_NO_CLIENT_RENEGOTIATION                               \
+     && defined SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS                             \
+     && OPENSSL_VERSION_NUMBER < 0x10100000L)
 
         /* initial handshake done, disable renegotiation (CVE-2009-3555) */
         if (c->ssl->connection->s3 && SSL_is_server(c->ssl->connection)) {
@@ -1814,8 +1850,6 @@ ngx_ssl_handshake(ngx_connection_t *c)
         }
 
 #endif
-#endif
-#endif
 
 #if (defined BIO_get_ktls_send && !NGX_WIN32)
 
@@ -2052,7 +2086,7 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
 
 #if (NGX_DEBUG)
 
-static void
+void
 ngx_ssl_handshake_log(ngx_connection_t *c)
 {
     char         buf[129], *s, *d;
@@ -2449,7 +2483,8 @@ ngx_ssl_handle_recv(ngx_connection_t *c, int n)
     int        sslerr;
     ngx_err_t  err;
 
-#ifndef SSL_OP_NO_RENEGOTIATION
+#if (!defined SSL_OP_NO_RENEGOTIATION                                         \
+     && !defined SSL_OP_NO_CLIENT_RENEGOTIATION)
 
     if (c->ssl->renegotiation) {
         /*
@@ -3202,6 +3237,13 @@ ngx_ssl_shutdown(ngx_connection_t *c)
     ngx_err_t   err;
     ngx_uint_t  tries;
 
+#if (NGX_QUIC)
+    if (c->quic) {
+        /* QUIC streams inherit SSL object */
+        return NGX_OK;
+    }
+#endif
+
     rc = NGX_OK;
 
     ngx_ssl_ocsp_cleanup(c);
@@ -5145,6 +5187,9 @@ ngx_ssl_get_curves(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
     }
 
     curves = ngx_palloc(pool, n * sizeof(int));
+    if (curves == NULL) {
+        return NGX_ERROR;
+    }
 
     n = SSL_get1_curves(c->ssl->connection, curves);
     len = 0;
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index 860ea26..ebb2c35 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -24,6 +24,14 @@
 #include <openssl/engine.h>
 #endif
 #include <openssl/evp.h>
+#if (NGX_QUIC)
+#ifdef OPENSSL_IS_BORINGSSL
+#include <openssl/hkdf.h>
+#include <openssl/chacha.h>
+#else
+#include <openssl/kdf.h>
+#endif
+#endif
 #include <openssl/hmac.h>
 #ifndef OPENSSL_NO_OCSP
 #include <openssl/ocsp.h>
@@ -37,7 +45,7 @@
 
 #if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
 #undef OPENSSL_VERSION_NUMBER
-#if (LIBRESSL_VERSION_NUMBER >= 0x2080000fL)
+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL)
 #define OPENSSL_VERSION_NUMBER  0x1010000fL
 #else
 #define OPENSSL_VERSION_NUMBER  0x1000107fL
@@ -302,6 +310,9 @@ ngx_int_t ngx_ssl_get_client_v_remain(ngx_connection_t *c, ngx_pool_t *pool,
 
 
 ngx_int_t ngx_ssl_handshake(ngx_connection_t *c);
+#if (NGX_DEBUG)
+void ngx_ssl_handshake_log(ngx_connection_t *c);
+#endif
 ssize_t ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size);
 ssize_t ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size);
 ssize_t ngx_ssl_recv_chain(ngx_connection_t *c, ngx_chain_t *cl, off_t limit);
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index e3fa8c4..e9bb835 100644
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -893,7 +893,7 @@ ngx_ssl_ocsp_validate(ngx_connection_t *c)
     ocsp->cert_status = V_OCSP_CERTSTATUS_GOOD;
     ocsp->conf = ocf;
 
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 
     ocsp->certs = SSL_get0_verified_chain(c->ssl->connection);
 
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index 54412e1..d774903 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -57,7 +57,9 @@ ngx_event_pipe(ngx_event_pipe_t *p, ngx_int_t do_write)
         do_write = 1;
     }
 
-    if (p->upstream->fd != (ngx_socket_t) -1) {
+    if (p->upstream
+        && p->upstream->fd != (ngx_socket_t) -1)
+    {
         rev = p->upstream->read;
 
         flags = (rev->eof || rev->error) ? NGX_CLOSE_EVENT : 0;
@@ -108,7 +110,9 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
     ngx_msec_t    delay;
     ngx_chain_t  *chain, *cl, *ln;
 
-    if (p->upstream_eof || p->upstream_error || p->upstream_done) {
+    if (p->upstream_eof || p->upstream_error || p->upstream_done
+        || p->upstream == NULL)
+    {
         return NGX_OK;
     }
 
diff --git a/src/event/ngx_event_udp.c b/src/event/ngx_event_udp.c
index d7a94c7..43fa621 100644
--- a/src/event/ngx_event_udp.c
+++ b/src/event/ngx_event_udp.c
@@ -12,13 +12,6 @@
 
 #if !(NGX_WIN32)
 
-struct ngx_udp_connection_s {
-    ngx_rbtree_node_t   node;
-    ngx_connection_t   *connection;
-    ngx_buf_t          *buffer;
-};
-
-
 static void ngx_close_accepted_udp_connection(ngx_connection_t *c);
 static ssize_t ngx_udp_shared_recv(ngx_connection_t *c, u_char *buf,
     size_t size);
@@ -424,8 +417,8 @@ ngx_udp_rbtree_insert_value(ngx_rbtree_node_t *temp,
             udpt = (ngx_udp_connection_t *) temp;
             ct = udpt->connection;
 
-            rc = ngx_cmp_sockaddr(c->sockaddr, c->socklen,
-                                  ct->sockaddr, ct->socklen, 1);
+            rc = ngx_memn2cmp(udp->key.data, udpt->key.data,
+                              udp->key.len, udpt->key.len);
 
             if (rc == 0 && c->listening->wildcard) {
                 rc = ngx_cmp_sockaddr(c->local_sockaddr, c->local_socklen,
@@ -478,6 +471,8 @@ ngx_insert_udp_connection(ngx_connection_t *c)
     ngx_crc32_final(hash);
 
     udp->node.key = hash;
+    udp->key.data = (u_char *) c->sockaddr;
+    udp->key.len = c->socklen;
 
     cln = ngx_pool_cleanup_add(c->pool, 0);
     if (cln == NULL) {
diff --git a/src/event/ngx_event_udp.h b/src/event/ngx_event_udp.h
index 51ca665..e5ddf1b 100644
--- a/src/event/ngx_event_udp.h
+++ b/src/event/ngx_event_udp.h
@@ -23,6 +23,14 @@
 #endif
 
 
+struct ngx_udp_connection_s {
+    ngx_rbtree_node_t   node;
+    ngx_connection_t   *connection;
+    ngx_buf_t          *buffer;
+    ngx_str_t           key;
+};
+
+
 #if (NGX_HAVE_ADDRINFO_CMSG)
 
 typedef union {
diff --git a/src/event/quic/bpf/bpfgen.sh b/src/event/quic/bpf/bpfgen.sh
new file mode 100644
index 0000000..78cbdac
--- /dev/null
+++ b/src/event/quic/bpf/bpfgen.sh
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+export LANG=C
+
+set -e
+
+if [ $# -lt 1 ]; then
+    echo "Usage: PROGNAME=foo LICENSE=bar $0 <bpf object file>"
+    exit 1
+fi
+
+
+self=$0
+filename=$1
+funcname=$PROGNAME
+
+generate_head()
+{
+    cat << END
+/* AUTO-GENERATED, DO NOT EDIT. */
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "ngx_bpf.h"
+
+
+END
+}
+
+generate_tail()
+{
+    cat << END
+
+ngx_bpf_program_t $PROGNAME = {
+    .relocs = bpf_reloc_prog_$funcname,
+    .nrelocs = sizeof(bpf_reloc_prog_$funcname)
+               / sizeof(bpf_reloc_prog_$funcname[0]),
+    .ins = bpf_insn_prog_$funcname,
+    .nins = sizeof(bpf_insn_prog_$funcname)
+            / sizeof(bpf_insn_prog_$funcname[0]),
+    .license = "$LICENSE",
+    .type = BPF_PROG_TYPE_SK_REUSEPORT,
+};
+
+END
+}
+
+process_relocations()
+{
+    echo "static ngx_bpf_reloc_t bpf_reloc_prog_$funcname[] = {"
+
+    objdump -r $filename | awk '{
+
+    if (enabled && $NF > 0) {
+        off = strtonum(sprintf("0x%s", $1));
+        name = $3;
+
+        printf("    { \"%s\", %d },\n", name, off/8);
+    }
+
+    if ($1 == "OFFSET") {
+        enabled=1;
+    }
+}'
+    echo "};"
+    echo
+}
+
+process_section()
+{
+    echo "static struct bpf_insn bpf_insn_prog_$funcname[] = {"
+    echo "    /* opcode dst          src         offset imm */"
+
+    section_info=$(objdump -h $filename --section=$funcname | grep "1 $funcname")
+
+    # dd doesn't know hex
+    length=$(printf "%d" 0x$(echo $section_info | cut -d ' ' -f3))
+    offset=$(printf "%d" 0x$(echo $section_info | cut -d ' ' -f6))
+
+    for ins in $(dd if="$filename" bs=1 count=$length skip=$offset status=none | xxd -p -c 8)
+    do
+        opcode=0x${ins:0:2}
+        srcdst=0x${ins:2:2}
+
+        # bytes are dumped in LE order
+        offset=0x${ins:6:2}${ins:4:2}                        # short
+        immedi=0x${ins:14:2}${ins:12:2}${ins:10:2}${ins:8:2} # int
+
+        dst="$(($srcdst & 0xF))"
+        src="$(($srcdst & 0xF0))"
+        src="$(($src >> 4))"
+
+        opcode=$(printf "0x%x" $opcode)
+        dst=$(printf "BPF_REG_%d" $dst)
+        src=$(printf "BPF_REG_%d" $src)
+        offset=$(printf "%d" $offset)
+        immedi=$(printf "0x%x" $immedi)
+
+        printf "    { %4s, %11s, %11s, (int16_t) %6s, %10s },\n" $opcode $dst $src $offset $immedi
+    done
+
+cat << END
+};
+
+END
+}
+
+generate_head
+process_relocations
+process_section
+generate_tail
+
diff --git a/src/event/quic/bpf/makefile b/src/event/quic/bpf/makefile
new file mode 100644
index 0000000..b4d758f
--- /dev/null
+++ b/src/event/quic/bpf/makefile
@@ -0,0 +1,30 @@
+CFLAGS=-O2 -Wall
+
+LICENSE=BSD
+
+PROGNAME=ngx_quic_reuseport_helper
+RESULT=ngx_event_quic_bpf_code
+DEST=../$(RESULT).c
+
+all: $(RESULT)
+
+$(RESULT): $(PROGNAME).o
+	LICENSE=$(LICENSE) PROGNAME=$(PROGNAME) bash ./bpfgen.sh $< > $@
+
+DEFS=-DPROGNAME=\"$(PROGNAME)\"                                               \
+     -DLICENSE_$(LICENSE)                                                     \
+     -DLICENSE=\"$(LICENSE)\"                                                 \
+
+$(PROGNAME).o: $(PROGNAME).c
+	clang $(CFLAGS) $(DEFS) -target bpf -c $< -o $@
+
+install: $(RESULT)
+	cp $(RESULT) $(DEST)
+
+clean:
+	@rm -f $(RESULT) *.o
+
+debug: $(PROGNAME).o
+	llvm-objdump -S -no-show-raw-insn $<
+
+.DELETE_ON_ERROR:
diff --git a/src/event/quic/bpf/ngx_quic_reuseport_helper.c b/src/event/quic/bpf/ngx_quic_reuseport_helper.c
new file mode 100644
index 0000000..999e760
--- /dev/null
+++ b/src/event/quic/bpf/ngx_quic_reuseport_helper.c
@@ -0,0 +1,140 @@
+#include <errno.h>
+#include <linux/string.h>
+#include <linux/udp.h>
+#include <linux/bpf.h>
+/*
+ * the bpf_helpers.h is not included into linux-headers, only available
+ * with kernel sources in "tools/lib/bpf/bpf_helpers.h" or in libbpf.
+ */
+#include <bpf/bpf_helpers.h>
+
+
+#if !defined(SEC)
+#define SEC(NAME)  __attribute__((section(NAME), used))
+#endif
+
+
+#if defined(LICENSE_GPL)
+
+/*
+ * To see debug:
+ *
+ *  echo 1 > /sys/kernel/debug/tracing/events/bpf_trace/enable
+ *  cat /sys/kernel/debug/tracing/trace_pipe
+ *  echo 0 > /sys/kernel/debug/tracing/events/bpf_trace/enable
+ */
+
+#define debugmsg(fmt, ...)                                                    \
+do {                                                                          \
+    char __buf[] = fmt;                                                       \
+    bpf_trace_printk(__buf, sizeof(__buf), ##__VA_ARGS__);                    \
+} while (0)
+
+#else
+
+#define debugmsg(fmt, ...)
+
+#endif
+
+char _license[] SEC("license") = LICENSE;
+
+/*****************************************************************************/
+
+#define NGX_QUIC_PKT_LONG        0x80  /* header form */
+#define NGX_QUIC_SERVER_CID_LEN  20
+
+
+#define advance_data(nbytes)                                                  \
+    offset += nbytes;                                                         \
+    if (start + offset > end) {                                               \
+        debugmsg("cannot read %ld bytes at offset %ld", nbytes, offset);      \
+        goto failed;                                                          \
+    }                                                                         \
+    data = start + offset - 1;
+
+
+#define ngx_quic_parse_uint64(p)                                              \
+    (((__u64)(p)[0] << 56) |                                                  \
+     ((__u64)(p)[1] << 48) |                                                  \
+     ((__u64)(p)[2] << 40) |                                                  \
+     ((__u64)(p)[3] << 32) |                                                  \
+     ((__u64)(p)[4] << 24) |                                                  \
+     ((__u64)(p)[5] << 16) |                                                  \
+     ((__u64)(p)[6] << 8)  |                                                  \
+     ((__u64)(p)[7]))
+
+/*
+ * actual map object is created by the "bpf" system call,
+ * all pointers to this variable are replaced by the bpf loader
+ */
+struct bpf_map_def SEC("maps") ngx_quic_sockmap;
+
+
+SEC(PROGNAME)
+int ngx_quic_select_socket_by_dcid(struct sk_reuseport_md *ctx)
+{
+    int             rc;
+    __u64           key;
+    size_t          len, offset;
+    unsigned char  *start, *end, *data, *dcid;
+
+    start = ctx->data;
+    end = (unsigned char *) ctx->data_end;
+    offset = 0;
+
+    advance_data(sizeof(struct udphdr)); /* data at UDP header */
+    advance_data(1); /* data at QUIC flags */
+
+    if (data[0] & NGX_QUIC_PKT_LONG) {
+
+        advance_data(4); /* data at QUIC version */
+        advance_data(1); /* data at DCID len */
+
+        len = data[0];   /* read DCID length */
+
+        if (len < 8) {
+            /* it's useless to search for key in such short DCID */
+            return SK_PASS;
+        }
+
+    } else {
+        len = NGX_QUIC_SERVER_CID_LEN;
+    }
+
+    dcid = &data[1];
+    advance_data(len); /* we expect the packet to have full DCID */
+
+    /* make verifier happy */
+    if (dcid + sizeof(__u64) > end) {
+        goto failed;
+    }
+
+    key = ngx_quic_parse_uint64(dcid);
+
+    rc = bpf_sk_select_reuseport(ctx, &ngx_quic_sockmap, &key, 0);
+
+    switch (rc) {
+    case 0:
+        debugmsg("nginx quic socket selected by key 0x%llx", key);
+        return SK_PASS;
+
+    /* kernel returns positive error numbers, errno.h defines positive */
+    case -ENOENT:
+        debugmsg("nginx quic default route for key 0x%llx", key);
+        /* let the default reuseport logic decide which socket to choose */
+        return SK_PASS;
+
+    default:
+        debugmsg("nginx quic bpf_sk_select_reuseport err: %d key 0x%llx",
+                 rc, key);
+        goto failed;
+    }
+
+failed:
+    /*
+     * SK_DROP will generate ICMP, but we may want to process "invalid" packet
+     * in userspace quic to investigate further and finally react properly
+     * (maybe ignore, maybe send something in response or close connection)
+     */
+    return SK_PASS;
+}
diff --git a/src/event/quic/ngx_event_quic.c b/src/event/quic/ngx_event_quic.c
new file mode 100644
index 0000000..e4690f7
--- /dev/null
+++ b/src/event/quic/ngx_event_quic.c
@@ -0,0 +1,1452 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+static ngx_quic_connection_t *ngx_quic_new_connection(ngx_connection_t *c,
+    ngx_quic_conf_t *conf, ngx_quic_header_t *pkt);
+static ngx_int_t ngx_quic_handle_stateless_reset(ngx_connection_t *c,
+    ngx_quic_header_t *pkt);
+static void ngx_quic_input_handler(ngx_event_t *rev);
+static void ngx_quic_close_handler(ngx_event_t *ev);
+
+static ngx_int_t ngx_quic_handle_datagram(ngx_connection_t *c, ngx_buf_t *b,
+    ngx_quic_conf_t *conf);
+static ngx_int_t ngx_quic_handle_packet(ngx_connection_t *c,
+    ngx_quic_conf_t *conf, ngx_quic_header_t *pkt);
+static ngx_int_t ngx_quic_handle_payload(ngx_connection_t *c,
+    ngx_quic_header_t *pkt);
+static ngx_int_t ngx_quic_check_csid(ngx_quic_connection_t *qc,
+    ngx_quic_header_t *pkt);
+static ngx_int_t ngx_quic_handle_frames(ngx_connection_t *c,
+    ngx_quic_header_t *pkt);
+
+static void ngx_quic_push_handler(ngx_event_t *ev);
+
+
+static ngx_core_module_t  ngx_quic_module_ctx = {
+    ngx_string("quic"),
+    NULL,
+    NULL
+};
+
+
+ngx_module_t  ngx_quic_module = {
+    NGX_MODULE_V1,
+    &ngx_quic_module_ctx,                  /* module context */
+    NULL,                                  /* module directives */
+    NGX_CORE_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+#if (NGX_DEBUG)
+
+void
+ngx_quic_connstate_dbg(ngx_connection_t *c)
+{
+    u_char                 *p, *last;
+    ngx_quic_connection_t  *qc;
+    u_char                  buf[NGX_MAX_ERROR_STR];
+
+    p = buf;
+    last = p + sizeof(buf);
+
+    qc = ngx_quic_get_connection(c);
+
+    p = ngx_slprintf(p, last, "state:");
+
+    if (qc) {
+
+        if (qc->error != (ngx_uint_t) -1) {
+            p = ngx_slprintf(p, last, "%s", qc->error_app ? " app" : "");
+            p = ngx_slprintf(p, last, " error:%ui", qc->error);
+
+            if (qc->error_reason) {
+                p = ngx_slprintf(p, last, " \"%s\"", qc->error_reason);
+            }
+        }
+
+        p = ngx_slprintf(p, last, "%s", qc->shutdown ? " shutdown" : "");
+        p = ngx_slprintf(p, last, "%s", qc->closing ? " closing" : "");
+        p = ngx_slprintf(p, last, "%s", qc->draining ? " draining" : "");
+        p = ngx_slprintf(p, last, "%s", qc->key_phase ? " kp" : "");
+
+    } else {
+        p = ngx_slprintf(p, last, " early");
+    }
+
+    if (c->read->timer_set) {
+        p = ngx_slprintf(p, last,
+                         qc && qc->send_timer_set ? " send:%M" : " read:%M",
+                         c->read->timer.key - ngx_current_msec);
+    }
+
+    if (qc) {
+
+        if (qc->push.timer_set) {
+            p = ngx_slprintf(p, last, " push:%M",
+                             qc->push.timer.key - ngx_current_msec);
+        }
+
+        if (qc->pto.timer_set) {
+            p = ngx_slprintf(p, last, " pto:%M",
+                             qc->pto.timer.key - ngx_current_msec);
+        }
+
+        if (qc->close.timer_set) {
+            p = ngx_slprintf(p, last, " close:%M",
+                             qc->close.timer.key - ngx_current_msec);
+        }
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic %*s", p - buf, buf);
+}
+
+#endif
+
+
+ngx_int_t
+ngx_quic_apply_transport_params(ngx_connection_t *c, ngx_quic_tp_t *ctp)
+{
+    ngx_str_t               scid;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    scid.data = qc->path->cid->id;
+    scid.len = qc->path->cid->len;
+
+    if (scid.len != ctp->initial_scid.len
+        || ngx_memcmp(scid.data, ctp->initial_scid.data, scid.len) != 0)
+    {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic client initial_source_connection_id mismatch");
+        return NGX_ERROR;
+    }
+
+    if (ctp->max_udp_payload_size < NGX_QUIC_MIN_INITIAL_SIZE
+        || ctp->max_udp_payload_size > NGX_QUIC_MAX_UDP_PAYLOAD_SIZE)
+    {
+        qc->error = NGX_QUIC_ERR_TRANSPORT_PARAMETER_ERROR;
+        qc->error_reason = "invalid maximum packet size";
+
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic maximum packet size is invalid");
+        return NGX_ERROR;
+    }
+
+    if (ctp->active_connection_id_limit < 2) {
+        qc->error = NGX_QUIC_ERR_TRANSPORT_PARAMETER_ERROR;
+        qc->error_reason = "invalid active_connection_id_limit";
+
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic active_connection_id_limit is invalid");
+        return NGX_ERROR;
+    }
+
+    if (ctp->ack_delay_exponent > 20) {
+        qc->error = NGX_QUIC_ERR_TRANSPORT_PARAMETER_ERROR;
+        qc->error_reason = "invalid ack_delay_exponent";
+
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic ack_delay_exponent is invalid");
+        return NGX_ERROR;
+    }
+
+    if (ctp->max_ack_delay >= 16384) {
+        qc->error = NGX_QUIC_ERR_TRANSPORT_PARAMETER_ERROR;
+        qc->error_reason = "invalid max_ack_delay";
+
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic max_ack_delay is invalid");
+        return NGX_ERROR;
+    }
+
+    if (ctp->max_idle_timeout > 0
+        && ctp->max_idle_timeout < qc->tp.max_idle_timeout)
+    {
+        qc->tp.max_idle_timeout = ctp->max_idle_timeout;
+    }
+
+    qc->streams.server_max_streams_bidi = ctp->initial_max_streams_bidi;
+    qc->streams.server_max_streams_uni = ctp->initial_max_streams_uni;
+
+    ngx_memcpy(&qc->ctp, ctp, sizeof(ngx_quic_tp_t));
+
+    return NGX_OK;
+}
+
+
+void
+ngx_quic_run(ngx_connection_t *c, ngx_quic_conf_t *conf)
+{
+    ngx_int_t               rc;
+    ngx_quic_connection_t  *qc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic run");
+
+    rc = ngx_quic_handle_datagram(c, c->buffer, conf);
+    if (rc != NGX_OK) {
+        ngx_quic_close_connection(c, rc);
+        return;
+    }
+
+    /* quic connection is now created */
+    qc = ngx_quic_get_connection(c);
+
+    ngx_add_timer(c->read, qc->tp.max_idle_timeout);
+
+    if (!qc->streams.initialized) {
+        ngx_add_timer(&qc->close, qc->conf->handshake_timeout);
+    }
+
+    ngx_quic_connstate_dbg(c);
+
+    c->read->handler = ngx_quic_input_handler;
+
+    return;
+}
+
+
+static ngx_quic_connection_t *
+ngx_quic_new_connection(ngx_connection_t *c, ngx_quic_conf_t *conf,
+    ngx_quic_header_t *pkt)
+{
+    ngx_uint_t              i;
+    ngx_quic_tp_t          *ctp;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_pcalloc(c->pool, sizeof(ngx_quic_connection_t));
+    if (qc == NULL) {
+        return NULL;
+    }
+
+    qc->keys = ngx_pcalloc(c->pool, sizeof(ngx_quic_keys_t));
+    if (qc->keys == NULL) {
+        return NULL;
+    }
+
+    qc->version = pkt->version;
+
+    ngx_rbtree_init(&qc->streams.tree, &qc->streams.sentinel,
+                    ngx_quic_rbtree_insert_stream);
+
+    for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+        ngx_queue_init(&qc->send_ctx[i].frames);
+        ngx_queue_init(&qc->send_ctx[i].sending);
+        ngx_queue_init(&qc->send_ctx[i].sent);
+        qc->send_ctx[i].largest_pn = NGX_QUIC_UNSET_PN;
+        qc->send_ctx[i].largest_ack = NGX_QUIC_UNSET_PN;
+        qc->send_ctx[i].largest_range = NGX_QUIC_UNSET_PN;
+        qc->send_ctx[i].pending_ack = NGX_QUIC_UNSET_PN;
+    }
+
+    qc->send_ctx[0].level = ssl_encryption_initial;
+    qc->send_ctx[1].level = ssl_encryption_handshake;
+    qc->send_ctx[2].level = ssl_encryption_application;
+
+    ngx_queue_init(&qc->free_frames);
+
+    ngx_quic_init_rtt(qc);
+
+    qc->pto.log = c->log;
+    qc->pto.data = c;
+    qc->pto.handler = ngx_quic_pto_handler;
+
+    qc->push.log = c->log;
+    qc->push.data = c;
+    qc->push.handler = ngx_quic_push_handler;
+
+    qc->close.log = c->log;
+    qc->close.data = c;
+    qc->close.handler = ngx_quic_close_handler;
+
+    qc->path_validation.log = c->log;
+    qc->path_validation.data = c;
+    qc->path_validation.handler = ngx_quic_path_handler;
+
+    qc->key_update.log = c->log;
+    qc->key_update.data = c;
+    qc->key_update.handler = ngx_quic_keys_update;
+
+    qc->conf = conf;
+
+    if (ngx_quic_init_transport_params(&qc->tp, conf) != NGX_OK) {
+        return NULL;
+    }
+
+    ctp = &qc->ctp;
+
+    /* defaults to be used before actual client parameters are received */
+    ctp->max_udp_payload_size = NGX_QUIC_MAX_UDP_PAYLOAD_SIZE;
+    ctp->ack_delay_exponent = NGX_QUIC_DEFAULT_ACK_DELAY_EXPONENT;
+    ctp->max_ack_delay = NGX_QUIC_DEFAULT_MAX_ACK_DELAY;
+    ctp->active_connection_id_limit = 2;
+
+    ngx_queue_init(&qc->streams.uninitialized);
+    ngx_queue_init(&qc->streams.free);
+
+    qc->streams.recv_max_data = qc->tp.initial_max_data;
+    qc->streams.recv_window = qc->streams.recv_max_data;
+
+    qc->streams.client_max_streams_uni = qc->tp.initial_max_streams_uni;
+    qc->streams.client_max_streams_bidi = qc->tp.initial_max_streams_bidi;
+
+    qc->congestion.window = ngx_min(10 * qc->tp.max_udp_payload_size,
+                                    ngx_max(2 * qc->tp.max_udp_payload_size,
+                                            14720));
+    qc->congestion.ssthresh = (size_t) -1;
+    qc->congestion.recovery_start = ngx_current_msec;
+
+    if (pkt->validated && pkt->retried) {
+        qc->tp.retry_scid.len = pkt->dcid.len;
+        qc->tp.retry_scid.data = ngx_pstrdup(c->pool, &pkt->dcid);
+        if (qc->tp.retry_scid.data == NULL) {
+            return NULL;
+        }
+    }
+
+    if (ngx_quic_keys_set_initial_secret(qc->keys, &pkt->dcid, c->log)
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
+    qc->validated = pkt->validated;
+
+    if (ngx_quic_open_sockets(c, qc, pkt) != NGX_OK) {
+        ngx_quic_keys_cleanup(qc->keys);
+        return NULL;
+    }
+
+    c->idle = 1;
+    ngx_reusable_connection(c, 1);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic connection created");
+
+    return qc;
+}
+
+
+static ngx_int_t
+ngx_quic_handle_stateless_reset(ngx_connection_t *c, ngx_quic_header_t *pkt)
+{
+    u_char                 *tail, ch;
+    ngx_uint_t              i;
+    ngx_queue_t            *q;
+    ngx_quic_client_id_t   *cid;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    /* A stateless reset uses an entire UDP datagram */
+    if (!pkt->first) {
+        return NGX_DECLINED;
+    }
+
+    tail = pkt->raw->last - NGX_QUIC_SR_TOKEN_LEN;
+
+    for (q = ngx_queue_head(&qc->client_ids);
+         q != ngx_queue_sentinel(&qc->client_ids);
+         q = ngx_queue_next(q))
+    {
+        cid = ngx_queue_data(q, ngx_quic_client_id_t, queue);
+
+        if (cid->seqnum == 0 || !cid->used) {
+            /*
+             * No stateless reset token in initial connection id.
+             * Don't accept a token from an unused connection id.
+             */
+            continue;
+        }
+
+        /* constant time comparison */
+
+        for (ch = 0, i = 0; i < NGX_QUIC_SR_TOKEN_LEN; i++) {
+            ch |= tail[i] ^ cid->sr_token[i];
+        }
+
+        if (ch == 0) {
+            return NGX_OK;
+        }
+    }
+
+    return NGX_DECLINED;
+}
+
+
+static void
+ngx_quic_input_handler(ngx_event_t *rev)
+{
+    ngx_int_t               rc;
+    ngx_buf_t              *b;
+    ngx_connection_t       *c;
+    ngx_quic_connection_t  *qc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, rev->log, 0, "quic input handler");
+
+    c = rev->data;
+    qc = ngx_quic_get_connection(c);
+
+    c->log->action = "handling quic input";
+
+    if (rev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
+                      "quic client timed out");
+        ngx_quic_close_connection(c, NGX_DONE);
+        return;
+    }
+
+    if (c->close) {
+        c->close = 0;
+
+        if (!ngx_exiting || !qc->streams.initialized) {
+            qc->error = NGX_QUIC_ERR_NO_ERROR;
+            qc->error_reason = "graceful shutdown";
+            ngx_quic_close_connection(c, NGX_ERROR);
+            return;
+        }
+
+        if (!qc->closing && qc->conf->shutdown) {
+            qc->conf->shutdown(c);
+        }
+
+        return;
+    }
+
+    b = c->udp->buffer;
+    if (b == NULL) {
+        return;
+    }
+
+    rc = ngx_quic_handle_datagram(c, b, NULL);
+
+    if (rc == NGX_ERROR) {
+        ngx_quic_close_connection(c, NGX_ERROR);
+        return;
+    }
+
+    if (rc == NGX_DONE) {
+        return;
+    }
+
+    /* rc == NGX_OK */
+
+    qc->send_timer_set = 0;
+    ngx_add_timer(rev, qc->tp.max_idle_timeout);
+
+    ngx_quic_connstate_dbg(c);
+}
+
+
+void
+ngx_quic_close_connection(ngx_connection_t *c, ngx_int_t rc)
+{
+    ngx_uint_t              i;
+    ngx_pool_t             *pool;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (qc == NULL) {
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic packet rejected rc:%i, cleanup connection", rc);
+        goto quic_done;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic close %s rc:%i",
+                   qc->closing ? "resumed": "initiated", rc);
+
+    if (!qc->closing) {
+
+        /* drop packets from retransmit queues, no ack is expected */
+        for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+            ngx_quic_free_frames(c, &qc->send_ctx[i].frames);
+            ngx_quic_free_frames(c, &qc->send_ctx[i].sent);
+        }
+
+        if (qc->close.timer_set) {
+            ngx_del_timer(&qc->close);
+        }
+
+        if (rc == NGX_DONE) {
+
+            /*
+             * RFC 9000, 10.1.  Idle Timeout
+             *
+             *  If a max_idle_timeout is specified by either endpoint in its
+             *  transport parameters (Section 18.2), the connection is silently
+             *  closed and its state is discarded when it remains idle
+             */
+
+            /* this case also handles some errors from ngx_quic_run() */
+
+            ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic close silent drain:%d timedout:%d",
+                           qc->draining, c->read->timedout);
+        } else {
+
+            /*
+             * RFC 9000, 10.2.  Immediate Close
+             *
+             *  An endpoint sends a CONNECTION_CLOSE frame (Section 19.19)
+             *  to terminate the connection immediately.
+             */
+
+            if (qc->error == (ngx_uint_t) -1) {
+                qc->error = NGX_QUIC_ERR_INTERNAL_ERROR;
+                qc->error_app = 0;
+            }
+
+            ngx_log_debug5(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic close immediate term:%d drain:%d "
+                           "%serror:%ui \"%s\"",
+                           rc == NGX_ERROR ? 1 : 0, qc->draining,
+                           qc->error_app ? "app " : "", qc->error,
+                           qc->error_reason ? qc->error_reason : "");
+
+            for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+                ctx = &qc->send_ctx[i];
+
+                if (!ngx_quic_keys_available(qc->keys, ctx->level, 1)) {
+                    continue;
+                }
+
+                qc->error_level = ctx->level;
+                (void) ngx_quic_send_cc(c);
+
+                if (rc == NGX_OK) {
+                    ngx_add_timer(&qc->close, 3 * ngx_quic_pto(c, ctx));
+                }
+            }
+        }
+
+        qc->closing = 1;
+    }
+
+    if (rc == NGX_ERROR && qc->close.timer_set) {
+        /* do not wait for timer in case of fatal error */
+        ngx_del_timer(&qc->close);
+    }
+
+    if (ngx_quic_close_streams(c, qc) == NGX_AGAIN) {
+        return;
+    }
+
+    if (qc->push.timer_set) {
+        ngx_del_timer(&qc->push);
+    }
+
+    if (qc->pto.timer_set) {
+        ngx_del_timer(&qc->pto);
+    }
+
+    if (qc->path_validation.timer_set) {
+        ngx_del_timer(&qc->path_validation);
+    }
+
+    if (qc->push.posted) {
+        ngx_delete_posted_event(&qc->push);
+    }
+
+    if (qc->key_update.posted) {
+        ngx_delete_posted_event(&qc->key_update);
+    }
+
+    if (qc->close.timer_set) {
+        return;
+    }
+
+    if (qc->close.posted) {
+        ngx_delete_posted_event(&qc->close);
+    }
+
+    ngx_quic_close_sockets(c);
+
+    ngx_quic_keys_cleanup(qc->keys);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic close completed");
+
+    /* may be tested from SSL callback during SSL shutdown */
+    c->udp = NULL;
+
+quic_done:
+
+    if (c->ssl) {
+        (void) ngx_ssl_shutdown(c);
+    }
+
+    if (c->read->timer_set) {
+        ngx_del_timer(c->read);
+    }
+
+#if (NGX_STAT_STUB)
+    (void) ngx_atomic_fetch_add(ngx_stat_active, -1);
+#endif
+
+    c->destroyed = 1;
+
+    pool = c->pool;
+
+    ngx_close_connection(c);
+
+    ngx_destroy_pool(pool);
+}
+
+
+void
+ngx_quic_finalize_connection(ngx_connection_t *c, ngx_uint_t err,
+    const char *reason)
+{
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (qc->closing) {
+        return;
+    }
+
+    qc->error = err;
+    qc->error_reason = reason;
+    qc->error_app = 1;
+    qc->error_ftype = 0;
+
+    ngx_post_event(&qc->close, &ngx_posted_events);
+}
+
+
+void
+ngx_quic_shutdown_connection(ngx_connection_t *c, ngx_uint_t err,
+    const char *reason)
+{
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    qc->shutdown = 1;
+    qc->shutdown_code = err;
+    qc->shutdown_reason = reason;
+
+    ngx_quic_shutdown_quic(c);
+}
+
+
+static void
+ngx_quic_close_handler(ngx_event_t *ev)
+{
+    ngx_connection_t  *c;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0, "quic close handler");
+
+    c = ev->data;
+
+    ngx_quic_close_connection(c, NGX_OK);
+}
+
+
+static ngx_int_t
+ngx_quic_handle_datagram(ngx_connection_t *c, ngx_buf_t *b,
+    ngx_quic_conf_t *conf)
+{
+    size_t                  size;
+    u_char                 *p, *start;
+    ngx_int_t               rc;
+    ngx_uint_t              good;
+    ngx_quic_path_t        *path;
+    ngx_quic_header_t       pkt;
+    ngx_quic_connection_t  *qc;
+
+    good = 0;
+    path = NULL;
+
+    size = b->last - b->pos;
+
+    p = start = b->pos;
+
+    while (p < b->last) {
+
+        ngx_memzero(&pkt, sizeof(ngx_quic_header_t));
+        pkt.raw = b;
+        pkt.data = p;
+        pkt.len = b->last - p;
+        pkt.log = c->log;
+        pkt.first = (p == start) ? 1 : 0;
+        pkt.path = path;
+        pkt.flags = p[0];
+        pkt.raw->pos++;
+
+        rc = ngx_quic_handle_packet(c, conf, &pkt);
+
+#if (NGX_DEBUG)
+        if (pkt.parsed) {
+            ngx_log_debug5(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic packet done rc:%i level:%s"
+                           " decr:%d pn:%L perr:%ui",
+                           rc, ngx_quic_level_name(pkt.level),
+                           pkt.decrypted, pkt.pn, pkt.error);
+        } else {
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic packet done rc:%i parse failed", rc);
+        }
+#endif
+
+        if (rc == NGX_ERROR || rc == NGX_DONE) {
+            return rc;
+        }
+
+        if (rc == NGX_OK) {
+            good = 1;
+        }
+
+        path = pkt.path; /* preserve packet path from 1st packet */
+
+        /* NGX_OK || NGX_DECLINED */
+
+        /*
+         * we get NGX_DECLINED when there are no keys [yet] available
+         * to decrypt packet.
+         * Instead of queueing it, we ignore it and rely on the sender's
+         * retransmission:
+         *
+         * RFC 9000, 12.2.  Coalescing Packets
+         *
+         * For example, if decryption fails (because the keys are
+         * not available or for any other reason), the receiver MAY either
+         * discard or buffer the packet for later processing and MUST
+         * attempt to process the remaining packets.
+         *
+         * We also skip packets that don't match connection state
+         * or cannot be parsed properly.
+         */
+
+        /* b->pos is at header end, adjust by actual packet length */
+        b->pos = pkt.data + pkt.len;
+
+        p = b->pos;
+    }
+
+    if (!good) {
+        return NGX_DONE;
+    }
+
+    qc = ngx_quic_get_connection(c);
+
+    if (qc) {
+        qc->received += size;
+
+        if ((uint64_t) (c->sent + qc->received) / 8 >
+            (qc->streams.sent + qc->streams.recv_last) + 1048576)
+        {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0, "quic flood detected");
+
+            qc->error = NGX_QUIC_ERR_NO_ERROR;
+            qc->error_reason = "QUIC flood detected";
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_handle_packet(ngx_connection_t *c, ngx_quic_conf_t *conf,
+    ngx_quic_header_t *pkt)
+{
+    ngx_int_t               rc;
+    ngx_quic_socket_t      *qsock;
+    ngx_quic_connection_t  *qc;
+
+    c->log->action = "parsing quic packet";
+
+    rc = ngx_quic_parse_packet(pkt);
+
+    if (rc == NGX_ERROR) {
+        return NGX_DECLINED;
+    }
+
+    pkt->parsed = 1;
+
+    c->log->action = "handling quic packet";
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic packet rx dcid len:%uz %xV",
+                   pkt->dcid.len, &pkt->dcid);
+
+#if (NGX_DEBUG)
+    if (pkt->level != ssl_encryption_application) {
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic packet rx scid len:%uz %xV",
+                       pkt->scid.len, &pkt->scid);
+    }
+
+    if (pkt->level == ssl_encryption_initial) {
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic address validation token len:%uz %xV",
+                       pkt->token.len, &pkt->token);
+    }
+#endif
+
+    qc = ngx_quic_get_connection(c);
+
+    if (qc) {
+
+        if (rc == NGX_ABORT) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "quic unsupported version: 0x%xD", pkt->version);
+            return NGX_DECLINED;
+        }
+
+        if (pkt->level != ssl_encryption_application) {
+
+            if (pkt->version != qc->version) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                              "quic version mismatch: 0x%xD", pkt->version);
+                return NGX_DECLINED;
+            }
+
+            if (pkt->first) {
+                qsock = ngx_quic_get_socket(c);
+
+                if (ngx_cmp_sockaddr(&qsock->sockaddr.sockaddr, qsock->socklen,
+                                     qc->path->sockaddr, qc->path->socklen, 1)
+                    != NGX_OK)
+                {
+                    /* packet comes from unknown path, possibly migration */
+                    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                                   "quic too early migration attempt");
+                    return NGX_DONE;
+                }
+            }
+
+            if (ngx_quic_check_csid(qc, pkt) != NGX_OK) {
+                return NGX_DECLINED;
+            }
+
+        }
+
+        rc = ngx_quic_handle_payload(c, pkt);
+
+        if (rc == NGX_DECLINED && pkt->level == ssl_encryption_application) {
+            if (ngx_quic_handle_stateless_reset(c, pkt) == NGX_OK) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                              "quic stateless reset packet detected");
+
+                qc->draining = 1;
+                ngx_post_event(&qc->close, &ngx_posted_events);
+
+                return NGX_OK;
+            }
+        }
+
+        return rc;
+    }
+
+    /* packet does not belong to a connection */
+
+    if (rc == NGX_ABORT) {
+        return ngx_quic_negotiate_version(c, pkt);
+    }
+
+    if (pkt->level == ssl_encryption_application) {
+        return ngx_quic_send_stateless_reset(c, conf, pkt);
+    }
+
+    if (pkt->level != ssl_encryption_initial) {
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic expected initial, got handshake");
+        return NGX_ERROR;
+    }
+
+    c->log->action = "handling initial packet";
+
+    if (pkt->dcid.len < NGX_QUIC_CID_LEN_MIN) {
+        /* RFC 9000, 7.2.  Negotiating Connection IDs */
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic too short dcid in initial"
+                      " packet: len:%i", pkt->dcid.len);
+        return NGX_ERROR;
+    }
+
+    /* process retry and initialize connection IDs */
+
+    if (pkt->token.len) {
+
+        rc = ngx_quic_validate_token(c, conf->av_token_key, pkt);
+
+        if (rc == NGX_ERROR) {
+            /* internal error */
+            return NGX_ERROR;
+
+        } else if (rc == NGX_ABORT) {
+            /* token cannot be decrypted */
+            return ngx_quic_send_early_cc(c, pkt,
+                                          NGX_QUIC_ERR_INVALID_TOKEN,
+                                          "cannot decrypt token");
+        } else if (rc == NGX_DECLINED) {
+            /* token is invalid */
+
+            if (pkt->retried) {
+                /* invalid address validation token */
+                return ngx_quic_send_early_cc(c, pkt,
+                                          NGX_QUIC_ERR_INVALID_TOKEN,
+                                          "invalid address validation token");
+            } else if (conf->retry) {
+                /* invalid NEW_TOKEN */
+                return ngx_quic_send_retry(c, conf, pkt);
+            }
+        }
+
+        /* NGX_OK */
+
+    } else if (conf->retry) {
+        return ngx_quic_send_retry(c, conf, pkt);
+
+    } else {
+        pkt->odcid = pkt->dcid;
+    }
+
+    if (ngx_terminate || ngx_exiting) {
+        if (conf->retry) {
+            return ngx_quic_send_retry(c, conf, pkt);
+        }
+
+        return NGX_ERROR;
+    }
+
+    c->log->action = "creating quic connection";
+
+    qc = ngx_quic_new_connection(c, conf, pkt);
+    if (qc == NULL) {
+        return NGX_ERROR;
+    }
+
+    return ngx_quic_handle_payload(c, pkt);
+}
+
+
+static ngx_int_t
+ngx_quic_handle_payload(ngx_connection_t *c, ngx_quic_header_t *pkt)
+{
+    ngx_int_t               rc;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+    static u_char           buf[NGX_QUIC_MAX_UDP_PAYLOAD_SIZE];
+
+    qc = ngx_quic_get_connection(c);
+
+    qc->error = (ngx_uint_t) -1;
+    qc->error_reason = 0;
+
+    c->log->action = "decrypting packet";
+
+    if (!ngx_quic_keys_available(qc->keys, pkt->level, 0)) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic no %s keys, ignoring packet",
+                      ngx_quic_level_name(pkt->level));
+        return NGX_DECLINED;
+    }
+
+#if !defined (OPENSSL_IS_BORINGSSL)
+    /* OpenSSL provides read keys for an application level before it's ready */
+
+    if (pkt->level == ssl_encryption_application && !c->ssl->handshaked) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic no %s keys ready, ignoring packet",
+                      ngx_quic_level_name(pkt->level));
+        return NGX_DECLINED;
+    }
+#endif
+
+    pkt->keys = qc->keys;
+    pkt->key_phase = qc->key_phase;
+    pkt->plaintext = buf;
+
+    ctx = ngx_quic_get_send_ctx(qc, pkt->level);
+
+    rc = ngx_quic_decrypt(pkt, &ctx->largest_pn);
+    if (rc != NGX_OK) {
+        qc->error = pkt->error;
+        qc->error_reason = "failed to decrypt packet";
+        return rc;
+    }
+
+    pkt->decrypted = 1;
+
+    c->log->action = "handling decrypted packet";
+
+    if (pkt->path == NULL) {
+        rc = ngx_quic_set_path(c, pkt);
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
+
+    if (c->ssl == NULL) {
+        if (ngx_quic_init_connection(c) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (pkt->level == ssl_encryption_handshake) {
+        /*
+         * RFC 9001, 4.9.1.  Discarding Initial Keys
+         *
+         * The successful use of Handshake packets indicates
+         * that no more Initial packets need to be exchanged
+         */
+        ngx_quic_discard_ctx(c, ssl_encryption_initial);
+
+        if (!qc->path->validated) {
+            qc->path->validated = 1;
+            ngx_quic_path_dbg(c, "in handshake", qc->path);
+            ngx_post_event(&qc->push, &ngx_posted_events);
+        }
+    }
+
+    if (qc->closing) {
+        /*
+         * RFC 9000, 10.2.  Immediate Close
+         *
+         * ... delayed or reordered packets are properly discarded.
+         *
+         *  In the closing state, an endpoint retains only enough information
+         *  to generate a packet containing a CONNECTION_CLOSE frame and to
+         *  identify packets as belonging to the connection.
+         */
+
+        qc->error_level = pkt->level;
+        qc->error = NGX_QUIC_ERR_NO_ERROR;
+        qc->error_reason = "connection is closing, packet discarded";
+        qc->error_ftype = 0;
+        qc->error_app = 0;
+
+        return ngx_quic_send_cc(c);
+    }
+
+    pkt->received = ngx_current_msec;
+
+    c->log->action = "handling payload";
+
+    if (pkt->level != ssl_encryption_application) {
+        return ngx_quic_handle_frames(c, pkt);
+    }
+
+    if (!pkt->key_update) {
+        return ngx_quic_handle_frames(c, pkt);
+    }
+
+    /* switch keys and generate next on Key Phase change */
+
+    qc->key_phase ^= 1;
+    ngx_quic_keys_switch(c, qc->keys);
+
+    rc = ngx_quic_handle_frames(c, pkt);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_post_event(&qc->key_update, &ngx_posted_events);
+
+    return NGX_OK;
+}
+
+
+void
+ngx_quic_discard_ctx(ngx_connection_t *c, enum ssl_encryption_level_t level)
+{
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *f;
+    ngx_quic_socket_t      *qsock;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (!ngx_quic_keys_available(qc->keys, level, 0)
+        && !ngx_quic_keys_available(qc->keys, level, 1))
+    {
+        return;
+    }
+
+    ngx_quic_keys_discard(qc->keys, level);
+
+    qc->pto_count = 0;
+
+    ctx = ngx_quic_get_send_ctx(qc, level);
+
+    ngx_quic_free_buffer(c, &ctx->crypto);
+
+    while (!ngx_queue_empty(&ctx->sent)) {
+        q = ngx_queue_head(&ctx->sent);
+        ngx_queue_remove(q);
+
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+        ngx_quic_congestion_ack(c, f);
+        ngx_quic_free_frame(c, f);
+    }
+
+    while (!ngx_queue_empty(&ctx->frames)) {
+        q = ngx_queue_head(&ctx->frames);
+        ngx_queue_remove(q);
+
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+        ngx_quic_free_frame(c, f);
+    }
+
+    if (level == ssl_encryption_initial) {
+        /* close temporary listener with initial dcid */
+        qsock = ngx_quic_find_socket(c, NGX_QUIC_UNSET_PN);
+        if (qsock) {
+            ngx_quic_close_socket(c, qsock);
+        }
+    }
+
+    ctx->send_ack = 0;
+
+    ngx_quic_set_lost_timer(c);
+}
+
+
+static ngx_int_t
+ngx_quic_check_csid(ngx_quic_connection_t *qc, ngx_quic_header_t *pkt)
+{
+    ngx_queue_t           *q;
+    ngx_quic_client_id_t  *cid;
+
+    for (q = ngx_queue_head(&qc->client_ids);
+         q != ngx_queue_sentinel(&qc->client_ids);
+         q = ngx_queue_next(q))
+    {
+        cid = ngx_queue_data(q, ngx_quic_client_id_t, queue);
+
+        if (pkt->scid.len == cid->len
+            && ngx_memcmp(pkt->scid.data, cid->id, cid->len) == 0)
+        {
+            return NGX_OK;
+        }
+    }
+
+    ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic unexpected quic scid");
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_quic_handle_frames(ngx_connection_t *c, ngx_quic_header_t *pkt)
+{
+    u_char                 *end, *p;
+    ssize_t                 len;
+    ngx_buf_t               buf;
+    ngx_uint_t              do_close, nonprobing;
+    ngx_chain_t             chain;
+    ngx_quic_frame_t        frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    p = pkt->payload.data;
+    end = p + pkt->payload.len;
+
+    do_close = 0;
+    nonprobing = 0;
+
+    while (p < end) {
+
+        c->log->action = "parsing frames";
+
+        ngx_memzero(&frame, sizeof(ngx_quic_frame_t));
+        ngx_memzero(&buf, sizeof(ngx_buf_t));
+        buf.temporary = 1;
+
+        chain.buf = &buf;
+        chain.next = NULL;
+        frame.data = &chain;
+
+        len = ngx_quic_parse_frame(pkt, p, end, &frame);
+
+        if (len < 0) {
+            qc->error = pkt->error;
+            return NGX_ERROR;
+        }
+
+        ngx_quic_log_frame(c->log, &frame, 0);
+
+        c->log->action = "handling frames";
+
+        p += len;
+
+        switch (frame.type) {
+        /* probing frames */
+        case NGX_QUIC_FT_PADDING:
+        case NGX_QUIC_FT_PATH_CHALLENGE:
+        case NGX_QUIC_FT_PATH_RESPONSE:
+        case NGX_QUIC_FT_NEW_CONNECTION_ID:
+            break;
+
+        /* non-probing frames */
+        default:
+            nonprobing = 1;
+            break;
+        }
+
+        switch (frame.type) {
+
+        case NGX_QUIC_FT_ACK:
+            if (ngx_quic_handle_ack_frame(c, pkt, &frame) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            continue;
+
+        case NGX_QUIC_FT_PADDING:
+            /* no action required */
+            continue;
+
+        case NGX_QUIC_FT_CONNECTION_CLOSE:
+        case NGX_QUIC_FT_CONNECTION_CLOSE_APP:
+            do_close = 1;
+            continue;
+        }
+
+        /* got there with ack-eliciting packet */
+        pkt->need_ack = 1;
+
+        switch (frame.type) {
+
+        case NGX_QUIC_FT_CRYPTO:
+
+            if (ngx_quic_handle_crypto_frame(c, pkt, &frame) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_PING:
+            break;
+
+        case NGX_QUIC_FT_STREAM:
+
+            if (ngx_quic_handle_stream_frame(c, pkt, &frame) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_MAX_DATA:
+
+            if (ngx_quic_handle_max_data_frame(c, &frame.u.max_data) != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_STREAMS_BLOCKED:
+        case NGX_QUIC_FT_STREAMS_BLOCKED2:
+
+            if (ngx_quic_handle_streams_blocked_frame(c, pkt,
+                                                      &frame.u.streams_blocked)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_DATA_BLOCKED:
+
+            if (ngx_quic_handle_data_blocked_frame(c, pkt,
+                                                   &frame.u.data_blocked)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_STREAM_DATA_BLOCKED:
+
+            if (ngx_quic_handle_stream_data_blocked_frame(c, pkt,
+                                                  &frame.u.stream_data_blocked)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_MAX_STREAM_DATA:
+
+            if (ngx_quic_handle_max_stream_data_frame(c, pkt,
+                                                      &frame.u.max_stream_data)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_RESET_STREAM:
+
+            if (ngx_quic_handle_reset_stream_frame(c, pkt,
+                                                   &frame.u.reset_stream)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_STOP_SENDING:
+
+            if (ngx_quic_handle_stop_sending_frame(c, pkt,
+                                                   &frame.u.stop_sending)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_MAX_STREAMS:
+        case NGX_QUIC_FT_MAX_STREAMS2:
+
+            if (ngx_quic_handle_max_streams_frame(c, pkt, &frame.u.max_streams)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_PATH_CHALLENGE:
+
+            if (ngx_quic_handle_path_challenge_frame(c, pkt,
+                                                     &frame.u.path_challenge)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_PATH_RESPONSE:
+
+            if (ngx_quic_handle_path_response_frame(c, &frame.u.path_response)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_NEW_CONNECTION_ID:
+
+            if (ngx_quic_handle_new_connection_id_frame(c, &frame.u.ncid)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        case NGX_QUIC_FT_RETIRE_CONNECTION_ID:
+
+            if (ngx_quic_handle_retire_connection_id_frame(c,
+                                                           &frame.u.retire_cid)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+            break;
+
+        default:
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic missing frame handler");
+            return NGX_ERROR;
+        }
+    }
+
+    if (p != end) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic trailing garbage in payload:%ui bytes", end - p);
+
+        qc->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
+        return NGX_ERROR;
+    }
+
+    if (do_close) {
+        qc->draining = 1;
+        ngx_post_event(&qc->close, &ngx_posted_events);
+    }
+
+    if (pkt->path != qc->path && nonprobing) {
+
+        /*
+         * RFC 9000, 9.2.  Initiating Connection Migration
+         *
+         * An endpoint can migrate a connection to a new local
+         * address by sending packets containing non-probing frames
+         * from that address.
+         */
+        if (ngx_quic_handle_migration(c, pkt) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (ngx_quic_ack_packet(c, pkt) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_push_handler(ngx_event_t *ev)
+{
+    ngx_connection_t  *c;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0, "quic push handler");
+
+    c = ev->data;
+
+    if (ngx_quic_output(c) != NGX_OK) {
+        ngx_quic_close_connection(c, NGX_ERROR);
+        return;
+    }
+
+    ngx_quic_connstate_dbg(c);
+}
+
+
+void
+ngx_quic_shutdown_quic(ngx_connection_t *c)
+{
+    ngx_quic_connection_t  *qc;
+
+    if (c->reusable) {
+        qc = ngx_quic_get_connection(c);
+        ngx_quic_finalize_connection(c, qc->shutdown_code, qc->shutdown_reason);
+    }
+}
diff --git a/src/event/quic/ngx_event_quic.h b/src/event/quic/ngx_event_quic.h
new file mode 100644
index 0000000..1520167
--- /dev/null
+++ b/src/event/quic/ngx_event_quic.h
@@ -0,0 +1,129 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_H_INCLUDED_
+#define _NGX_EVENT_QUIC_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_QUIC_MAX_UDP_PAYLOAD_SIZE        65527
+
+#define NGX_QUIC_DEFAULT_ACK_DELAY_EXPONENT  3
+#define NGX_QUIC_DEFAULT_MAX_ACK_DELAY       25
+#define NGX_QUIC_DEFAULT_HOST_KEY_LEN        32
+#define NGX_QUIC_SR_KEY_LEN                  32
+#define NGX_QUIC_AV_KEY_LEN                  32
+
+#define NGX_QUIC_SR_TOKEN_LEN                16
+
+#define NGX_QUIC_MIN_INITIAL_SIZE            1200
+
+#define NGX_QUIC_STREAM_SERVER_INITIATED     0x01
+#define NGX_QUIC_STREAM_UNIDIRECTIONAL       0x02
+
+
+typedef ngx_int_t (*ngx_quic_init_pt)(ngx_connection_t *c);
+typedef void (*ngx_quic_shutdown_pt)(ngx_connection_t *c);
+
+
+typedef enum {
+    NGX_QUIC_STREAM_SEND_READY = 0,
+    NGX_QUIC_STREAM_SEND_SEND,
+    NGX_QUIC_STREAM_SEND_DATA_SENT,
+    NGX_QUIC_STREAM_SEND_DATA_RECVD,
+    NGX_QUIC_STREAM_SEND_RESET_SENT,
+    NGX_QUIC_STREAM_SEND_RESET_RECVD
+} ngx_quic_stream_send_state_e;
+
+
+typedef enum {
+    NGX_QUIC_STREAM_RECV_RECV = 0,
+    NGX_QUIC_STREAM_RECV_SIZE_KNOWN,
+    NGX_QUIC_STREAM_RECV_DATA_RECVD,
+    NGX_QUIC_STREAM_RECV_DATA_READ,
+    NGX_QUIC_STREAM_RECV_RESET_RECVD,
+    NGX_QUIC_STREAM_RECV_RESET_READ
+} ngx_quic_stream_recv_state_e;
+
+
+typedef struct {
+    uint64_t                       size;
+    uint64_t                       offset;
+    uint64_t                       last_offset;
+    ngx_chain_t                   *chain;
+    ngx_chain_t                   *last_chain;
+} ngx_quic_buffer_t;
+
+
+typedef struct {
+    ngx_ssl_t                     *ssl;
+
+    ngx_flag_t                     retry;
+    ngx_flag_t                     gso_enabled;
+    ngx_flag_t                     disable_active_migration;
+    ngx_msec_t                     handshake_timeout;
+    ngx_msec_t                     idle_timeout;
+    ngx_str_t                      host_key;
+    size_t                         stream_buffer_size;
+    ngx_uint_t                     max_concurrent_streams_bidi;
+    ngx_uint_t                     max_concurrent_streams_uni;
+    ngx_uint_t                     active_connection_id_limit;
+    ngx_int_t                      stream_close_code;
+    ngx_int_t                      stream_reject_code_uni;
+    ngx_int_t                      stream_reject_code_bidi;
+
+    ngx_quic_init_pt               init;
+    ngx_quic_shutdown_pt           shutdown;
+
+    u_char                         av_token_key[NGX_QUIC_AV_KEY_LEN];
+    u_char                         sr_token_key[NGX_QUIC_SR_KEY_LEN];
+} ngx_quic_conf_t;
+
+
+struct ngx_quic_stream_s {
+    ngx_rbtree_node_t              node;
+    ngx_queue_t                    queue;
+    ngx_connection_t              *parent;
+    ngx_connection_t              *connection;
+    uint64_t                       id;
+    uint64_t                       sent;
+    uint64_t                       acked;
+    uint64_t                       send_max_data;
+    uint64_t                       send_offset;
+    uint64_t                       send_final_size;
+    uint64_t                       recv_max_data;
+    uint64_t                       recv_offset;
+    uint64_t                       recv_window;
+    uint64_t                       recv_last;
+    uint64_t                       recv_final_size;
+    ngx_quic_buffer_t              send;
+    ngx_quic_buffer_t              recv;
+    ngx_quic_stream_send_state_e   send_state;
+    ngx_quic_stream_recv_state_e   recv_state;
+    unsigned                       cancelable:1;
+    unsigned                       fin_acked:1;
+};
+
+
+void ngx_quic_recvmsg(ngx_event_t *ev);
+void ngx_quic_run(ngx_connection_t *c, ngx_quic_conf_t *conf);
+ngx_connection_t *ngx_quic_open_stream(ngx_connection_t *c, ngx_uint_t bidi);
+void ngx_quic_finalize_connection(ngx_connection_t *c, ngx_uint_t err,
+    const char *reason);
+void ngx_quic_shutdown_connection(ngx_connection_t *c, ngx_uint_t err,
+    const char *reason);
+ngx_int_t ngx_quic_reset_stream(ngx_connection_t *c, ngx_uint_t err);
+ngx_int_t ngx_quic_shutdown_stream(ngx_connection_t *c, int how);
+void ngx_quic_cancelable_stream(ngx_connection_t *c);
+ngx_int_t ngx_quic_get_packet_dcid(ngx_log_t *log, u_char *data, size_t len,
+    ngx_str_t *dcid);
+ngx_int_t ngx_quic_derive_key(ngx_log_t *log, const char *label,
+    ngx_str_t *secret, ngx_str_t *salt, u_char *out, size_t len);
+
+#endif /* _NGX_EVENT_QUIC_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_ack.c b/src/event/quic/ngx_event_quic_ack.c
new file mode 100644
index 0000000..c7ffd44
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_ack.c
@@ -0,0 +1,1188 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+#define NGX_QUIC_MAX_ACK_GAP                 2
+
+/* RFC 9002, 6.1.1. Packet Threshold: kPacketThreshold */
+#define NGX_QUIC_PKT_THR                     3 /* packets */
+/* RFC 9002, 6.1.2. Time Threshold: kGranularity */
+#define NGX_QUIC_TIME_GRANULARITY            1 /* ms */
+
+/* RFC 9002, 7.6.1. Duration: kPersistentCongestionThreshold */
+#define NGX_QUIC_PERSISTENT_CONGESTION_THR   3
+
+
+/* send time of ACK'ed packets */
+typedef struct {
+    ngx_msec_t                               max_pn;
+    ngx_msec_t                               oldest;
+    ngx_msec_t                               newest;
+} ngx_quic_ack_stat_t;
+
+
+static ngx_inline ngx_msec_t ngx_quic_lost_threshold(ngx_quic_connection_t *qc);
+static void ngx_quic_rtt_sample(ngx_connection_t *c, ngx_quic_ack_frame_t *ack,
+    enum ssl_encryption_level_t level, ngx_msec_t send_time);
+static ngx_int_t ngx_quic_handle_ack_frame_range(ngx_connection_t *c,
+    ngx_quic_send_ctx_t *ctx, uint64_t min, uint64_t max,
+    ngx_quic_ack_stat_t *st);
+static void ngx_quic_drop_ack_ranges(ngx_connection_t *c,
+    ngx_quic_send_ctx_t *ctx, uint64_t pn);
+static ngx_int_t ngx_quic_detect_lost(ngx_connection_t *c,
+    ngx_quic_ack_stat_t *st);
+static ngx_msec_t ngx_quic_pcg_duration(ngx_connection_t *c);
+static void ngx_quic_persistent_congestion(ngx_connection_t *c);
+static void ngx_quic_congestion_lost(ngx_connection_t *c,
+    ngx_quic_frame_t *frame);
+static void ngx_quic_lost_handler(ngx_event_t *ev);
+
+
+/* RFC 9002, 6.1.2. Time Threshold: kTimeThreshold, kGranularity */
+static ngx_inline ngx_msec_t
+ngx_quic_lost_threshold(ngx_quic_connection_t *qc)
+{
+    ngx_msec_t  thr;
+
+    thr = ngx_max(qc->latest_rtt, qc->avg_rtt);
+    thr += thr >> 3;
+
+    return ngx_max(thr, NGX_QUIC_TIME_GRANULARITY);
+}
+
+
+ngx_int_t
+ngx_quic_handle_ack_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
+    ngx_quic_frame_t *f)
+{
+    ssize_t                 n;
+    u_char                 *pos, *end;
+    uint64_t                min, max, gap, range;
+    ngx_uint_t              i;
+    ngx_quic_ack_stat_t     send_time;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_ack_frame_t   *ack;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    ctx = ngx_quic_get_send_ctx(qc, pkt->level);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic ngx_quic_handle_ack_frame level:%d", pkt->level);
+
+    ack = &f->u.ack;
+
+    /*
+     * RFC 9000, 19.3.1.  ACK Ranges
+     *
+     *  If any computed packet number is negative, an endpoint MUST
+     *  generate a connection error of type FRAME_ENCODING_ERROR.
+     */
+
+    if (ack->first_range > ack->largest) {
+        qc->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic invalid first range in ack frame");
+        return NGX_ERROR;
+    }
+
+    min = ack->largest - ack->first_range;
+    max = ack->largest;
+
+    send_time.oldest = NGX_TIMER_INFINITE;
+    send_time.newest = NGX_TIMER_INFINITE;
+
+    if (ngx_quic_handle_ack_frame_range(c, ctx, min, max, &send_time)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    /* RFC 9000, 13.2.4.  Limiting Ranges by Tracking ACK Frames */
+    if (ctx->largest_ack < max || ctx->largest_ack == NGX_QUIC_UNSET_PN) {
+        ctx->largest_ack = max;
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic updated largest received ack:%uL", max);
+
+        /*
+         * RFC 9002, 5.1.  Generating RTT Samples
+         *
+         *  An endpoint generates an RTT sample on receiving an
+         *  ACK frame that meets the following two conditions:
+         *
+         *  - the largest acknowledged packet number is newly acknowledged
+         *  - at least one of the newly acknowledged packets was ack-eliciting.
+         */
+
+        if (send_time.max_pn != NGX_TIMER_INFINITE) {
+            ngx_quic_rtt_sample(c, ack, pkt->level, send_time.max_pn);
+        }
+    }
+
+    if (f->data) {
+        pos = f->data->buf->pos;
+        end = f->data->buf->last;
+
+    } else {
+        pos = NULL;
+        end = NULL;
+    }
+
+    for (i = 0; i < ack->range_count; i++) {
+
+        n = ngx_quic_parse_ack_range(pkt->log, pos, end, &gap, &range);
+        if (n == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+        pos += n;
+
+        if (gap + 2 > min) {
+            qc->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "quic invalid range:%ui in ack frame", i);
+            return NGX_ERROR;
+        }
+
+        max = min - gap - 2;
+
+        if (range > max) {
+            qc->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "quic invalid range:%ui in ack frame", i);
+            return NGX_ERROR;
+        }
+
+        min = max - range;
+
+        if (ngx_quic_handle_ack_frame_range(c, ctx, min, max, &send_time)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    return ngx_quic_detect_lost(c, &send_time);
+}
+
+
+static void
+ngx_quic_rtt_sample(ngx_connection_t *c, ngx_quic_ack_frame_t *ack,
+    enum ssl_encryption_level_t level, ngx_msec_t send_time)
+{
+    ngx_msec_t              latest_rtt, ack_delay, adjusted_rtt, rttvar_sample;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    latest_rtt = ngx_current_msec - send_time;
+    qc->latest_rtt = latest_rtt;
+
+    if (qc->min_rtt == NGX_TIMER_INFINITE) {
+        qc->min_rtt = latest_rtt;
+        qc->avg_rtt = latest_rtt;
+        qc->rttvar = latest_rtt / 2;
+        qc->first_rtt = ngx_current_msec;
+
+    } else {
+        qc->min_rtt = ngx_min(qc->min_rtt, latest_rtt);
+
+        ack_delay = (ack->delay << qc->ctp.ack_delay_exponent) / 1000;
+
+        if (c->ssl->handshaked) {
+            ack_delay = ngx_min(ack_delay, qc->ctp.max_ack_delay);
+        }
+
+        adjusted_rtt = latest_rtt;
+
+        if (qc->min_rtt + ack_delay < latest_rtt) {
+            adjusted_rtt -= ack_delay;
+        }
+
+        rttvar_sample = ngx_abs((ngx_msec_int_t) (qc->avg_rtt - adjusted_rtt));
+        qc->rttvar += (rttvar_sample >> 2) - (qc->rttvar >> 2);
+        qc->avg_rtt += (adjusted_rtt >> 3) - (qc->avg_rtt >> 3);
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic rtt sample latest:%M min:%M avg:%M var:%M",
+                   latest_rtt, qc->min_rtt, qc->avg_rtt, qc->rttvar);
+}
+
+
+static ngx_int_t
+ngx_quic_handle_ack_frame_range(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
+    uint64_t min, uint64_t max, ngx_quic_ack_stat_t *st)
+{
+    ngx_uint_t              found;
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *f;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (ctx->level == ssl_encryption_application) {
+        if (ngx_quic_handle_path_mtu(c, qc->path, min, max) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    st->max_pn = NGX_TIMER_INFINITE;
+    found = 0;
+
+    q = ngx_queue_head(&ctx->sent);
+
+    while (q != ngx_queue_sentinel(&ctx->sent)) {
+
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+        q = ngx_queue_next(q);
+
+        if (f->pnum > max) {
+            break;
+        }
+
+        if (f->pnum >= min) {
+            ngx_quic_congestion_ack(c, f);
+
+            switch (f->type) {
+            case NGX_QUIC_FT_ACK:
+            case NGX_QUIC_FT_ACK_ECN:
+                ngx_quic_drop_ack_ranges(c, ctx, f->u.ack.largest);
+                break;
+
+            case NGX_QUIC_FT_STREAM:
+            case NGX_QUIC_FT_RESET_STREAM:
+                ngx_quic_handle_stream_ack(c, f);
+                break;
+            }
+
+            if (f->pnum == max) {
+                st->max_pn = f->send_time;
+            }
+
+            /* save earliest and latest send times of frames ack'ed */
+            if (st->oldest == NGX_TIMER_INFINITE || f->send_time < st->oldest) {
+                st->oldest = f->send_time;
+            }
+
+            if (st->newest == NGX_TIMER_INFINITE || f->send_time > st->newest) {
+                st->newest = f->send_time;
+            }
+
+            ngx_queue_remove(&f->queue);
+            ngx_quic_free_frame(c, f);
+            found = 1;
+        }
+    }
+
+    if (!found) {
+
+        if (max < ctx->pnum) {
+            /* duplicate ACK or ACK for non-ack-eliciting frame */
+            return NGX_OK;
+        }
+
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic ACK for the packet not sent");
+
+        qc->error = NGX_QUIC_ERR_PROTOCOL_VIOLATION;
+        qc->error_ftype = NGX_QUIC_FT_ACK;
+        qc->error_reason = "unknown packet number";
+
+        return NGX_ERROR;
+    }
+
+    if (!qc->push.timer_set) {
+        ngx_post_event(&qc->push, &ngx_posted_events);
+    }
+
+    qc->pto_count = 0;
+
+    return NGX_OK;
+}
+
+
+void
+ngx_quic_congestion_ack(ngx_connection_t *c, ngx_quic_frame_t *f)
+{
+    ngx_uint_t              blocked;
+    ngx_msec_t              timer;
+    ngx_quic_congestion_t  *cg;
+    ngx_quic_connection_t  *qc;
+
+    if (f->plen == 0) {
+        return;
+    }
+
+    qc = ngx_quic_get_connection(c);
+    cg = &qc->congestion;
+
+    if (f->pnum < qc->rst_pnum) {
+        return;
+    }
+
+    blocked = (cg->in_flight >= cg->window) ? 1 : 0;
+
+    cg->in_flight -= f->plen;
+
+    timer = f->send_time - cg->recovery_start;
+
+    if ((ngx_msec_int_t) timer <= 0) {
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic congestion ack recovery win:%uz ss:%z if:%uz",
+                       cg->window, cg->ssthresh, cg->in_flight);
+
+        goto done;
+    }
+
+    if (cg->window < cg->ssthresh) {
+        cg->window += f->plen;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic congestion slow start win:%uz ss:%z if:%uz",
+                       cg->window, cg->ssthresh, cg->in_flight);
+
+    } else {
+        cg->window += qc->tp.max_udp_payload_size * f->plen / cg->window;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic congestion avoidance win:%uz ss:%z if:%uz",
+                       cg->window, cg->ssthresh, cg->in_flight);
+    }
+
+    /* prevent recovery_start from wrapping */
+
+    timer = cg->recovery_start - ngx_current_msec + qc->tp.max_idle_timeout * 2;
+
+    if ((ngx_msec_int_t) timer < 0) {
+        cg->recovery_start = ngx_current_msec - qc->tp.max_idle_timeout * 2;
+    }
+
+done:
+
+    if (blocked && cg->in_flight < cg->window) {
+        ngx_post_event(&qc->push, &ngx_posted_events);
+    }
+}
+
+
+static void
+ngx_quic_drop_ack_ranges(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
+    uint64_t pn)
+{
+    uint64_t               base;
+    ngx_uint_t             i, smallest, largest;
+    ngx_quic_ack_range_t  *r;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic ngx_quic_drop_ack_ranges pn:%uL largest:%uL"
+                   " fr:%uL nranges:%ui", pn, ctx->largest_range,
+                   ctx->first_range, ctx->nranges);
+
+    base = ctx->largest_range;
+
+    if (base == NGX_QUIC_UNSET_PN) {
+        return;
+    }
+
+    if (ctx->pending_ack != NGX_QUIC_UNSET_PN && pn >= ctx->pending_ack) {
+        ctx->pending_ack = NGX_QUIC_UNSET_PN;
+    }
+
+    largest = base;
+    smallest = largest - ctx->first_range;
+
+    if (pn >= largest) {
+        ctx->largest_range = NGX_QUIC_UNSET_PN;
+        ctx->first_range = 0;
+        ctx->nranges = 0;
+        return;
+    }
+
+    if (pn >= smallest) {
+        ctx->first_range = largest - pn - 1;
+        ctx->nranges = 0;
+        return;
+    }
+
+    for (i = 0; i < ctx->nranges; i++) {
+        r = &ctx->ranges[i];
+
+        largest = smallest - r->gap - 2;
+        smallest = largest - r->range;
+
+        if (pn >= largest) {
+            ctx->nranges = i;
+            return;
+        }
+        if (pn >= smallest) {
+            r->range = largest - pn - 1;
+            ctx->nranges = i + 1;
+            return;
+        }
+    }
+}
+
+
+static ngx_int_t
+ngx_quic_detect_lost(ngx_connection_t *c, ngx_quic_ack_stat_t *st)
+{
+    ngx_uint_t              i, nlost;
+    ngx_msec_t              now, wait, thr, oldest, newest;
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *start;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    now = ngx_current_msec;
+    thr = ngx_quic_lost_threshold(qc);
+
+    /* send time of lost packets across all send contexts */
+    oldest = NGX_TIMER_INFINITE;
+    newest = NGX_TIMER_INFINITE;
+
+    nlost = 0;
+
+    for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+
+        ctx = &qc->send_ctx[i];
+
+        if (ctx->largest_ack == NGX_QUIC_UNSET_PN) {
+            continue;
+        }
+
+        while (!ngx_queue_empty(&ctx->sent)) {
+
+            q = ngx_queue_head(&ctx->sent);
+            start = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+            if (start->pnum > ctx->largest_ack) {
+                break;
+            }
+
+            wait = start->send_time + thr - now;
+
+            ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic detect_lost pnum:%uL thr:%M wait:%i level:%d",
+                           start->pnum, thr, (ngx_int_t) wait, start->level);
+
+            if ((ngx_msec_int_t) wait > 0
+                && ctx->largest_ack - start->pnum < NGX_QUIC_PKT_THR)
+            {
+                break;
+            }
+
+            if (start->send_time > qc->first_rtt) {
+
+                if (oldest == NGX_TIMER_INFINITE || start->send_time < oldest) {
+                    oldest = start->send_time;
+                }
+
+                if (newest == NGX_TIMER_INFINITE || start->send_time > newest) {
+                    newest = start->send_time;
+                }
+
+                nlost++;
+            }
+
+            ngx_quic_resend_frames(c, ctx);
+        }
+    }
+
+
+    /* RFC 9002, 7.6.2.  Establishing Persistent Congestion */
+
+    /*
+     * Once acknowledged, packets are no longer tracked. Thus no send time
+     * information is available for such packets. This limits persistent
+     * congestion algorithm to packets mentioned within ACK ranges of the
+     * latest ACK frame.
+     */
+
+    if (st && nlost >= 2 && (st->newest < oldest || st->oldest > newest)) {
+
+        if (newest - oldest > ngx_quic_pcg_duration(c)) {
+            ngx_quic_persistent_congestion(c);
+        }
+    }
+
+    ngx_quic_set_lost_timer(c);
+
+    return NGX_OK;
+}
+
+
+static ngx_msec_t
+ngx_quic_pcg_duration(ngx_connection_t *c)
+{
+    ngx_msec_t              duration;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    duration = qc->avg_rtt;
+    duration += ngx_max(4 * qc->rttvar, NGX_QUIC_TIME_GRANULARITY);
+    duration += qc->ctp.max_ack_delay;
+    duration *= NGX_QUIC_PERSISTENT_CONGESTION_THR;
+
+    return duration;
+}
+
+
+static void
+ngx_quic_persistent_congestion(ngx_connection_t *c)
+{
+    ngx_quic_congestion_t  *cg;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    cg = &qc->congestion;
+
+    cg->recovery_start = ngx_current_msec;
+    cg->window = qc->tp.max_udp_payload_size * 2;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic persistent congestion win:%uz", cg->window);
+}
+
+
+void
+ngx_quic_resend_frames(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx)
+{
+    uint64_t                pnum;
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *f, *start;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    q = ngx_queue_head(&ctx->sent);
+    start = ngx_queue_data(q, ngx_quic_frame_t, queue);
+    pnum = start->pnum;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic resend packet pnum:%uL", start->pnum);
+
+    ngx_quic_congestion_lost(c, start);
+
+    do {
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        if (f->pnum != pnum) {
+            break;
+        }
+
+        q = ngx_queue_next(q);
+
+        ngx_queue_remove(&f->queue);
+
+        switch (f->type) {
+        case NGX_QUIC_FT_ACK:
+        case NGX_QUIC_FT_ACK_ECN:
+            if (ctx->level == ssl_encryption_application) {
+                /* force generation of most recent acknowledgment */
+                ctx->send_ack = NGX_QUIC_MAX_ACK_GAP;
+            }
+
+            ngx_quic_free_frame(c, f);
+            break;
+
+        case NGX_QUIC_FT_PING:
+        case NGX_QUIC_FT_PATH_CHALLENGE:
+        case NGX_QUIC_FT_PATH_RESPONSE:
+        case NGX_QUIC_FT_CONNECTION_CLOSE:
+            ngx_quic_free_frame(c, f);
+            break;
+
+        case NGX_QUIC_FT_MAX_DATA:
+            f->u.max_data.max_data = qc->streams.recv_max_data;
+            ngx_quic_queue_frame(qc, f);
+            break;
+
+        case NGX_QUIC_FT_MAX_STREAMS:
+        case NGX_QUIC_FT_MAX_STREAMS2:
+            f->u.max_streams.limit = f->u.max_streams.bidi
+                                     ? qc->streams.client_max_streams_bidi
+                                     : qc->streams.client_max_streams_uni;
+            ngx_quic_queue_frame(qc, f);
+            break;
+
+        case NGX_QUIC_FT_MAX_STREAM_DATA:
+            qs = ngx_quic_find_stream(&qc->streams.tree,
+                                      f->u.max_stream_data.id);
+            if (qs == NULL) {
+                ngx_quic_free_frame(c, f);
+                break;
+            }
+
+            f->u.max_stream_data.limit = qs->recv_max_data;
+            ngx_quic_queue_frame(qc, f);
+            break;
+
+        case NGX_QUIC_FT_STREAM:
+            qs = ngx_quic_find_stream(&qc->streams.tree, f->u.stream.stream_id);
+
+            if (qs) {
+                if (qs->send_state == NGX_QUIC_STREAM_SEND_RESET_SENT
+                    || qs->send_state == NGX_QUIC_STREAM_SEND_RESET_RECVD)
+                {
+                    ngx_quic_free_frame(c, f);
+                    break;
+                }
+            }
+
+            /* fall through */
+
+        default:
+            ngx_queue_insert_tail(&ctx->frames, &f->queue);
+        }
+
+    } while (q != ngx_queue_sentinel(&ctx->sent));
+
+    if (qc->closing) {
+        return;
+    }
+
+    ngx_post_event(&qc->push, &ngx_posted_events);
+}
+
+
+static void
+ngx_quic_congestion_lost(ngx_connection_t *c, ngx_quic_frame_t *f)
+{
+    ngx_uint_t              blocked;
+    ngx_msec_t              timer;
+    ngx_quic_congestion_t  *cg;
+    ngx_quic_connection_t  *qc;
+
+    if (f->plen == 0) {
+        return;
+    }
+
+    qc = ngx_quic_get_connection(c);
+    cg = &qc->congestion;
+
+    if (f->pnum < qc->rst_pnum) {
+        return;
+    }
+
+    blocked = (cg->in_flight >= cg->window) ? 1 : 0;
+
+    cg->in_flight -= f->plen;
+    f->plen = 0;
+
+    timer = f->send_time - cg->recovery_start;
+
+    if ((ngx_msec_int_t) timer <= 0) {
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic congestion lost recovery win:%uz ss:%z if:%uz",
+                       cg->window, cg->ssthresh, cg->in_flight);
+
+        goto done;
+    }
+
+    cg->recovery_start = ngx_current_msec;
+    cg->window /= 2;
+
+    if (cg->window < qc->tp.max_udp_payload_size * 2) {
+        cg->window = qc->tp.max_udp_payload_size * 2;
+    }
+
+    cg->ssthresh = cg->window;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic congestion lost win:%uz ss:%z if:%uz",
+                   cg->window, cg->ssthresh, cg->in_flight);
+
+done:
+
+    if (blocked && cg->in_flight < cg->window) {
+        ngx_post_event(&qc->push, &ngx_posted_events);
+    }
+}
+
+
+void
+ngx_quic_set_lost_timer(ngx_connection_t *c)
+{
+    ngx_uint_t              i;
+    ngx_msec_t              now;
+    ngx_queue_t            *q;
+    ngx_msec_int_t          lost, pto, w;
+    ngx_quic_frame_t       *f;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    now = ngx_current_msec;
+
+    lost = -1;
+    pto = -1;
+
+    for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+        ctx = &qc->send_ctx[i];
+
+        if (ngx_queue_empty(&ctx->sent)) {
+            continue;
+        }
+
+        if (ctx->largest_ack != NGX_QUIC_UNSET_PN) {
+            q = ngx_queue_head(&ctx->sent);
+            f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+            w = (ngx_msec_int_t)
+                            (f->send_time + ngx_quic_lost_threshold(qc) - now);
+
+            if (f->pnum <= ctx->largest_ack) {
+                if (w < 0 || ctx->largest_ack - f->pnum >= NGX_QUIC_PKT_THR) {
+                    w = 0;
+                }
+
+                if (lost == -1 || w < lost) {
+                    lost = w;
+                }
+            }
+        }
+
+        q = ngx_queue_last(&ctx->sent);
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+        w = (ngx_msec_int_t)
+                (f->send_time + (ngx_quic_pto(c, ctx) << qc->pto_count) - now);
+
+        if (w < 0) {
+            w = 0;
+        }
+
+        if (pto == -1 || w < pto) {
+            pto = w;
+        }
+    }
+
+    if (qc->pto.timer_set) {
+        ngx_del_timer(&qc->pto);
+    }
+
+    if (lost != -1) {
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic lost timer lost:%M", lost);
+
+        qc->pto.handler = ngx_quic_lost_handler;
+        ngx_add_timer(&qc->pto, lost);
+        return;
+    }
+
+    if (pto != -1) {
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic lost timer pto:%M", pto);
+
+        qc->pto.handler = ngx_quic_pto_handler;
+        ngx_add_timer(&qc->pto, pto);
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic lost timer unset");
+}
+
+
+ngx_msec_t
+ngx_quic_pto(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx)
+{
+    ngx_msec_t              duration;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    /* RFC 9002, Appendix A.8.  Setting the Loss Detection Timer */
+
+    duration = qc->avg_rtt;
+    duration += ngx_max(4 * qc->rttvar, NGX_QUIC_TIME_GRANULARITY);
+
+    if (ctx->level == ssl_encryption_application && c->ssl->handshaked) {
+        duration += qc->ctp.max_ack_delay;
+    }
+
+    return duration;
+}
+
+
+static
+void ngx_quic_lost_handler(ngx_event_t *ev)
+{
+    ngx_connection_t  *c;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0, "quic lost timer");
+
+    c = ev->data;
+
+    if (ngx_quic_detect_lost(c, NULL) != NGX_OK) {
+        ngx_quic_close_connection(c, NGX_ERROR);
+        return;
+    }
+
+    ngx_quic_connstate_dbg(c);
+}
+
+
+void
+ngx_quic_pto_handler(ngx_event_t *ev)
+{
+    ngx_uint_t              i, n;
+    ngx_msec_t              now;
+    ngx_queue_t            *q;
+    ngx_msec_int_t          w;
+    ngx_connection_t       *c;
+    ngx_quic_frame_t       *f;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0, "quic pto timer");
+
+    c = ev->data;
+    qc = ngx_quic_get_connection(c);
+    now = ngx_current_msec;
+
+    for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+
+        ctx = &qc->send_ctx[i];
+
+        if (ngx_queue_empty(&ctx->sent)) {
+            continue;
+        }
+
+        q = ngx_queue_last(&ctx->sent);
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+        w = (ngx_msec_int_t)
+                (f->send_time + (ngx_quic_pto(c, ctx) << qc->pto_count) - now);
+
+        if (f->pnum <= ctx->largest_ack
+            && ctx->largest_ack != NGX_QUIC_UNSET_PN)
+        {
+            continue;
+        }
+
+        if (w > 0) {
+            continue;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic pto %s pto_count:%ui",
+                       ngx_quic_level_name(ctx->level), qc->pto_count);
+
+        for (n = 0; n < 2; n++) {
+
+            f = ngx_quic_alloc_frame(c);
+            if (f == NULL) {
+                goto failed;
+            }
+
+            f->level = ctx->level;
+            f->type = NGX_QUIC_FT_PING;
+            f->ignore_congestion = 1;
+
+            if (ngx_quic_frame_sendto(c, f, 0, qc->path) == NGX_ERROR) {
+                goto failed;
+            }
+        }
+    }
+
+    qc->pto_count++;
+
+    ngx_quic_set_lost_timer(c);
+
+    ngx_quic_connstate_dbg(c);
+
+    return;
+
+failed:
+
+    ngx_quic_close_connection(c, NGX_ERROR);
+    return;
+}
+
+
+ngx_int_t
+ngx_quic_ack_packet(ngx_connection_t *c, ngx_quic_header_t *pkt)
+{
+    uint64_t                base, largest, smallest, gs, ge, gap, range, pn;
+    uint64_t                prev_pending;
+    ngx_uint_t              i, nr;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_ack_range_t   *r;
+    ngx_quic_connection_t  *qc;
+
+    c->log->action = "preparing ack";
+
+    qc = ngx_quic_get_connection(c);
+
+    ctx = ngx_quic_get_send_ctx(qc, pkt->level);
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic ngx_quic_ack_packet pn:%uL largest %L fr:%uL"
+                   " nranges:%ui", pkt->pn, (int64_t) ctx->largest_range,
+                   ctx->first_range, ctx->nranges);
+
+    if (!ngx_quic_keys_available(qc->keys, ctx->level, 1)) {
+        return NGX_OK;
+    }
+
+    prev_pending = ctx->pending_ack;
+
+    if (pkt->need_ack) {
+
+        ngx_post_event(&qc->push, &ngx_posted_events);
+
+        if (ctx->send_ack == 0) {
+            ctx->ack_delay_start = ngx_current_msec;
+        }
+
+        ctx->send_ack++;
+
+        if (ctx->pending_ack == NGX_QUIC_UNSET_PN
+            || ctx->pending_ack < pkt->pn)
+        {
+            ctx->pending_ack = pkt->pn;
+        }
+    }
+
+    base = ctx->largest_range;
+    pn = pkt->pn;
+
+    if (base == NGX_QUIC_UNSET_PN) {
+        ctx->largest_range = pn;
+        ctx->largest_received = pkt->received;
+        return NGX_OK;
+    }
+
+    if (base == pn) {
+        return NGX_OK;
+    }
+
+    largest = base;
+    smallest = largest - ctx->first_range;
+
+    if (pn > base) {
+
+        if (pn - base == 1) {
+            ctx->first_range++;
+            ctx->largest_range = pn;
+            ctx->largest_received = pkt->received;
+
+            return NGX_OK;
+
+        } else {
+            /* new gap in front of current largest */
+
+            /* no place for new range, send current range as is */
+            if (ctx->nranges == NGX_QUIC_MAX_RANGES) {
+
+                if (prev_pending != NGX_QUIC_UNSET_PN) {
+                    if (ngx_quic_send_ack(c, ctx) != NGX_OK) {
+                        return NGX_ERROR;
+                    }
+                }
+
+                if (prev_pending == ctx->pending_ack || !pkt->need_ack) {
+                    ctx->pending_ack = NGX_QUIC_UNSET_PN;
+                }
+            }
+
+            gap = pn - base - 2;
+            range = ctx->first_range;
+
+            ctx->first_range = 0;
+            ctx->largest_range = pn;
+            ctx->largest_received = pkt->received;
+
+            /* packet is out of order, force send */
+            if (pkt->need_ack) {
+                ctx->send_ack = NGX_QUIC_MAX_ACK_GAP;
+            }
+
+            i = 0;
+
+            goto insert;
+        }
+    }
+
+    /*  pn < base, perform lookup in existing ranges */
+
+    /* packet is out of order */
+    if (pkt->need_ack) {
+        ctx->send_ack = NGX_QUIC_MAX_ACK_GAP;
+    }
+
+    if (pn >= smallest && pn <= largest) {
+        return NGX_OK;
+    }
+
+#if (NGX_SUPPRESS_WARN)
+    r = NULL;
+#endif
+
+    for (i = 0; i < ctx->nranges; i++) {
+        r = &ctx->ranges[i];
+
+        ge = smallest - 1;
+        gs = ge - r->gap;
+
+        if (pn >= gs && pn <= ge) {
+
+            if (gs == ge) {
+                /* gap size is exactly one packet, now filled */
+
+                /* data moves to previous range, current is removed */
+
+                if (i == 0) {
+                    ctx->first_range += r->range + 2;
+
+                } else {
+                    ctx->ranges[i - 1].range += r->range + 2;
+                }
+
+                nr = ctx->nranges - i - 1;
+                if (nr) {
+                    ngx_memmove(&ctx->ranges[i], &ctx->ranges[i + 1],
+                                sizeof(ngx_quic_ack_range_t) * nr);
+                }
+
+                ctx->nranges--;
+
+            } else if (pn == gs) {
+                /* current gap shrinks from tail (current range grows) */
+                r->gap--;
+                r->range++;
+
+            } else if (pn == ge) {
+                /* current gap shrinks from head (previous range grows) */
+                r->gap--;
+
+                if (i == 0) {
+                    ctx->first_range++;
+
+                } else {
+                    ctx->ranges[i - 1].range++;
+                }
+
+            } else {
+                /* current gap is split into two parts */
+
+                gap = ge - pn - 1;
+                range = 0;
+
+                if (ctx->nranges == NGX_QUIC_MAX_RANGES) {
+                    if (prev_pending != NGX_QUIC_UNSET_PN) {
+                        if (ngx_quic_send_ack(c, ctx) != NGX_OK) {
+                            return NGX_ERROR;
+                        }
+                    }
+
+                    if (prev_pending == ctx->pending_ack || !pkt->need_ack) {
+                        ctx->pending_ack = NGX_QUIC_UNSET_PN;
+                    }
+                }
+
+                r->gap = pn - gs - 1;
+                goto insert;
+            }
+
+            return NGX_OK;
+        }
+
+        largest = smallest - r->gap - 2;
+        smallest = largest - r->range;
+
+        if (pn >= smallest && pn <= largest) {
+            /* this packet number is already known */
+            return NGX_OK;
+        }
+
+    }
+
+    if (pn == smallest - 1) {
+        /* extend first or last range */
+
+        if (i == 0) {
+            ctx->first_range++;
+
+        } else {
+            r->range++;
+        }
+
+        return NGX_OK;
+    }
+
+    /* nothing found, add new range at the tail  */
+
+    if (ctx->nranges == NGX_QUIC_MAX_RANGES) {
+        /* packet is too old to keep it */
+
+        if (pkt->need_ack) {
+            return ngx_quic_send_ack_range(c, ctx, pn, pn);
+        }
+
+        return NGX_OK;
+    }
+
+    gap = smallest - 2 - pn;
+    range = 0;
+
+insert:
+
+    if (ctx->nranges < NGX_QUIC_MAX_RANGES) {
+        ctx->nranges++;
+    }
+
+    ngx_memmove(&ctx->ranges[i + 1], &ctx->ranges[i],
+                sizeof(ngx_quic_ack_range_t) * (ctx->nranges - i - 1));
+
+    ctx->ranges[i].gap = gap;
+    ctx->ranges[i].range = range;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_generate_ack(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx)
+{
+    ngx_msec_t              delay;
+    ngx_quic_connection_t  *qc;
+
+    if (!ctx->send_ack) {
+        return NGX_OK;
+    }
+
+    if (ctx->level == ssl_encryption_application) {
+
+        delay = ngx_current_msec - ctx->ack_delay_start;
+        qc = ngx_quic_get_connection(c);
+
+        if (ngx_queue_empty(&ctx->frames)
+            && ctx->send_ack < NGX_QUIC_MAX_ACK_GAP
+            && delay < qc->tp.max_ack_delay)
+        {
+            if (!qc->push.timer_set && !qc->closing) {
+                ngx_add_timer(&qc->push,
+                              qc->tp.max_ack_delay - delay);
+            }
+
+            return NGX_OK;
+        }
+    }
+
+    if (ngx_quic_send_ack(c, ctx) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ctx->send_ack = 0;
+
+    return NGX_OK;
+}
diff --git a/src/event/quic/ngx_event_quic_ack.h b/src/event/quic/ngx_event_quic_ack.h
new file mode 100644
index 0000000..56920c2
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_ack.h
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_ACK_H_INCLUDED_
+#define _NGX_EVENT_QUIC_ACK_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+ngx_int_t ngx_quic_handle_ack_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_frame_t *f);
+
+void ngx_quic_congestion_ack(ngx_connection_t *c,
+    ngx_quic_frame_t *frame);
+void ngx_quic_resend_frames(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx);
+void ngx_quic_set_lost_timer(ngx_connection_t *c);
+void ngx_quic_pto_handler(ngx_event_t *ev);
+ngx_msec_t ngx_quic_pto(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx);
+
+ngx_int_t ngx_quic_ack_packet(ngx_connection_t *c,
+    ngx_quic_header_t *pkt);
+ngx_int_t ngx_quic_generate_ack(ngx_connection_t *c,
+    ngx_quic_send_ctx_t *ctx);
+
+#endif /* _NGX_EVENT_QUIC_ACK_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_bpf.c b/src/event/quic/ngx_event_quic_bpf.c
new file mode 100644
index 0000000..ab024ad
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_bpf.c
@@ -0,0 +1,657 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_QUIC_BPF_VARNAME  "NGINX_BPF_MAPS"
+#define NGX_QUIC_BPF_VARSEP    ';'
+#define NGX_QUIC_BPF_ADDRSEP   '#'
+
+
+#define ngx_quic_bpf_get_conf(cycle)                                          \
+    (ngx_quic_bpf_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_quic_bpf_module)
+
+#define ngx_quic_bpf_get_old_conf(cycle)                                      \
+    cycle->old_cycle->conf_ctx ? ngx_quic_bpf_get_conf(cycle->old_cycle)      \
+                               : NULL
+
+#define ngx_core_get_conf(cycle)                                              \
+    (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module)
+
+
+typedef struct {
+    ngx_queue_t           queue;
+    int                   map_fd;
+
+    struct sockaddr      *sockaddr;
+    socklen_t             socklen;
+    ngx_uint_t            unused;     /* unsigned  unused:1; */
+} ngx_quic_sock_group_t;
+
+
+typedef struct {
+    ngx_flag_t            enabled;
+    ngx_uint_t            map_size;
+    ngx_queue_t           groups;     /* of ngx_quic_sock_group_t */
+} ngx_quic_bpf_conf_t;
+
+
+static void *ngx_quic_bpf_create_conf(ngx_cycle_t *cycle);
+static ngx_int_t ngx_quic_bpf_module_init(ngx_cycle_t *cycle);
+
+static void ngx_quic_bpf_cleanup(void *data);
+static ngx_inline void ngx_quic_bpf_close(ngx_log_t *log, int fd,
+    const char *name);
+
+static ngx_quic_sock_group_t *ngx_quic_bpf_find_group(ngx_quic_bpf_conf_t *bcf,
+    ngx_listening_t *ls);
+static ngx_quic_sock_group_t *ngx_quic_bpf_alloc_group(ngx_cycle_t *cycle,
+    struct sockaddr *sa, socklen_t socklen);
+static ngx_quic_sock_group_t *ngx_quic_bpf_create_group(ngx_cycle_t *cycle,
+    ngx_listening_t *ls);
+static ngx_quic_sock_group_t *ngx_quic_bpf_get_group(ngx_cycle_t *cycle,
+    ngx_listening_t *ls);
+static ngx_int_t ngx_quic_bpf_group_add_socket(ngx_cycle_t *cycle,
+    ngx_listening_t *ls);
+static uint64_t ngx_quic_bpf_socket_key(ngx_fd_t fd, ngx_log_t *log);
+
+static ngx_int_t ngx_quic_bpf_export_maps(ngx_cycle_t *cycle);
+static ngx_int_t ngx_quic_bpf_import_maps(ngx_cycle_t *cycle);
+
+extern ngx_bpf_program_t  ngx_quic_reuseport_helper;
+
+
+static ngx_command_t  ngx_quic_bpf_commands[] = {
+
+    { ngx_string("quic_bpf"),
+      NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      0,
+      offsetof(ngx_quic_bpf_conf_t, enabled),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_core_module_t  ngx_quic_bpf_module_ctx = {
+    ngx_string("quic_bpf"),
+    ngx_quic_bpf_create_conf,
+    NULL
+};
+
+
+ngx_module_t  ngx_quic_bpf_module = {
+    NGX_MODULE_V1,
+    &ngx_quic_bpf_module_ctx,              /* module context */
+    ngx_quic_bpf_commands,                 /* module directives */
+    NGX_CORE_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    ngx_quic_bpf_module_init,              /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_quic_bpf_create_conf(ngx_cycle_t *cycle)
+{
+    ngx_quic_bpf_conf_t  *bcf;
+
+    bcf = ngx_pcalloc(cycle->pool, sizeof(ngx_quic_bpf_conf_t));
+    if (bcf == NULL) {
+        return NULL;
+    }
+
+    bcf->enabled = NGX_CONF_UNSET;
+    bcf->map_size = NGX_CONF_UNSET_UINT;
+
+    ngx_queue_init(&bcf->groups);
+
+    return bcf;
+}
+
+
+static ngx_int_t
+ngx_quic_bpf_module_init(ngx_cycle_t *cycle)
+{
+    ngx_uint_t            i;
+    ngx_listening_t      *ls;
+    ngx_core_conf_t      *ccf;
+    ngx_pool_cleanup_t   *cln;
+    ngx_quic_bpf_conf_t  *bcf;
+
+    if (ngx_test_config) {
+        /*
+         * during config test, SO_REUSEPORT socket option is
+         * not set, thus making further processing meaningless
+         */
+        return NGX_OK;
+    }
+
+    ccf = ngx_core_get_conf(cycle);
+    bcf = ngx_quic_bpf_get_conf(cycle);
+
+    ngx_conf_init_value(bcf->enabled, 0);
+
+    bcf->map_size = ccf->worker_processes * 4;
+
+    cln = ngx_pool_cleanup_add(cycle->pool, 0);
+    if (cln == NULL) {
+        goto failed;
+    }
+
+    cln->data = bcf;
+    cln->handler = ngx_quic_bpf_cleanup;
+
+    if (ngx_inherited && ngx_is_init_cycle(cycle->old_cycle)) {
+        if (ngx_quic_bpf_import_maps(cycle) != NGX_OK) {
+            goto failed;
+        }
+    }
+
+    ls = cycle->listening.elts;
+
+    for (i = 0; i < cycle->listening.nelts; i++) {
+        if (ls[i].quic && ls[i].reuseport) {
+            if (ngx_quic_bpf_group_add_socket(cycle, &ls[i]) != NGX_OK) {
+                goto failed;
+            }
+        }
+    }
+
+    if (ngx_quic_bpf_export_maps(cycle) != NGX_OK) {
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    if (ngx_is_init_cycle(cycle->old_cycle)) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+                      "ngx_quic_bpf_module failed to initialize, check limits");
+
+        /* refuse to start */
+        return NGX_ERROR;
+    }
+
+    /*
+     * returning error now will lead to master process exiting immediately
+     * leaving worker processes orphaned, what is really unexpected.
+     * Instead, just issue a not about failed initialization and try
+     * to cleanup a bit. Still program can be already loaded to kernel
+     * for some reuseport groups, and there is no way to revert, so
+     * behaviour may be inconsistent.
+     */
+
+    ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+                  "ngx_quic_bpf_module failed to initialize properly, ignored."
+                  "please check limits and note that nginx state now "
+                  "can be inconsistent and restart may be required");
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_bpf_cleanup(void *data)
+{
+    ngx_quic_bpf_conf_t  *bcf = (ngx_quic_bpf_conf_t *) data;
+
+    ngx_queue_t            *q;
+    ngx_quic_sock_group_t  *grp;
+
+    for (q = ngx_queue_head(&bcf->groups);
+         q != ngx_queue_sentinel(&bcf->groups);
+         q = ngx_queue_next(q))
+    {
+        grp = ngx_queue_data(q, ngx_quic_sock_group_t, queue);
+
+        ngx_quic_bpf_close(ngx_cycle->log, grp->map_fd, "map");
+    }
+}
+
+
+static ngx_inline void
+ngx_quic_bpf_close(ngx_log_t *log, int fd, const char *name)
+{
+    if (close(fd) != -1) {
+        return;
+    }
+
+    ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                  "quic bpf close %s fd:%d failed", name, fd);
+}
+
+
+static ngx_quic_sock_group_t *
+ngx_quic_bpf_find_group(ngx_quic_bpf_conf_t *bcf, ngx_listening_t *ls)
+{
+    ngx_queue_t            *q;
+    ngx_quic_sock_group_t  *grp;
+
+    for (q = ngx_queue_head(&bcf->groups);
+         q != ngx_queue_sentinel(&bcf->groups);
+         q = ngx_queue_next(q))
+    {
+        grp = ngx_queue_data(q, ngx_quic_sock_group_t, queue);
+
+        if (ngx_cmp_sockaddr(ls->sockaddr, ls->socklen,
+                             grp->sockaddr, grp->socklen, 1)
+            == NGX_OK)
+        {
+            return grp;
+        }
+    }
+
+    return NULL;
+}
+
+
+static ngx_quic_sock_group_t *
+ngx_quic_bpf_alloc_group(ngx_cycle_t *cycle, struct sockaddr *sa,
+    socklen_t socklen)
+{
+    ngx_quic_bpf_conf_t    *bcf;
+    ngx_quic_sock_group_t  *grp;
+
+    bcf = ngx_quic_bpf_get_conf(cycle);
+
+    grp = ngx_pcalloc(cycle->pool, sizeof(ngx_quic_sock_group_t));
+    if (grp == NULL) {
+        return NULL;
+    }
+
+    grp->socklen = socklen;
+    grp->sockaddr = ngx_palloc(cycle->pool, socklen);
+    if (grp->sockaddr == NULL) {
+        return NULL;
+    }
+    ngx_memcpy(grp->sockaddr, sa, socklen);
+
+    ngx_queue_insert_tail(&bcf->groups, &grp->queue);
+
+    return grp;
+}
+
+
+static ngx_quic_sock_group_t *
+ngx_quic_bpf_create_group(ngx_cycle_t *cycle, ngx_listening_t *ls)
+{
+    int                     progfd, failed, flags, rc;
+    ngx_quic_bpf_conf_t    *bcf;
+    ngx_quic_sock_group_t  *grp;
+
+    bcf = ngx_quic_bpf_get_conf(cycle);
+
+    if (!bcf->enabled) {
+        return NULL;
+    }
+
+    grp = ngx_quic_bpf_alloc_group(cycle, ls->sockaddr, ls->socklen);
+    if (grp == NULL) {
+        return NULL;
+    }
+
+    grp->map_fd = ngx_bpf_map_create(cycle->log, BPF_MAP_TYPE_SOCKHASH,
+                                     sizeof(uint64_t), sizeof(uint64_t),
+                                     bcf->map_size, 0);
+    if (grp->map_fd == -1) {
+        goto failed;
+    }
+
+    flags = fcntl(grp->map_fd, F_GETFD);
+    if (flags == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, errno,
+                      "quic bpf getfd failed");
+        goto failed;
+    }
+
+    /* need to inherit map during binary upgrade after exec */
+    flags &= ~FD_CLOEXEC;
+
+    rc = fcntl(grp->map_fd, F_SETFD, flags);
+    if (rc == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, errno,
+                      "quic bpf setfd failed");
+        goto failed;
+    }
+
+    ngx_bpf_program_link(&ngx_quic_reuseport_helper,
+                         "ngx_quic_sockmap", grp->map_fd);
+
+    progfd = ngx_bpf_load_program(cycle->log, &ngx_quic_reuseport_helper);
+    if (progfd < 0) {
+        goto failed;
+    }
+
+    failed = 0;
+
+    if (setsockopt(ls->fd, SOL_SOCKET, SO_ATTACH_REUSEPORT_EBPF,
+                   &progfd, sizeof(int))
+        == -1)
+    {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
+                      "quic bpf setsockopt(SO_ATTACH_REUSEPORT_EBPF) failed");
+        failed = 1;
+    }
+
+    ngx_quic_bpf_close(cycle->log, progfd, "program");
+
+    if (failed) {
+        goto failed;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                   "quic bpf sockmap created fd:%d", grp->map_fd);
+    return grp;
+
+failed:
+
+    if (grp->map_fd != -1) {
+        ngx_quic_bpf_close(cycle->log, grp->map_fd, "map");
+    }
+
+    ngx_queue_remove(&grp->queue);
+
+    return NULL;
+}
+
+
+static ngx_quic_sock_group_t *
+ngx_quic_bpf_get_group(ngx_cycle_t *cycle, ngx_listening_t *ls)
+{
+    ngx_quic_bpf_conf_t    *bcf, *old_bcf;
+    ngx_quic_sock_group_t  *grp, *ogrp;
+
+    bcf = ngx_quic_bpf_get_conf(cycle);
+
+    grp = ngx_quic_bpf_find_group(bcf, ls);
+    if (grp) {
+        return grp;
+    }
+
+    old_bcf = ngx_quic_bpf_get_old_conf(cycle);
+
+    if (old_bcf == NULL) {
+        return ngx_quic_bpf_create_group(cycle, ls);
+    }
+
+    ogrp = ngx_quic_bpf_find_group(old_bcf, ls);
+    if (ogrp == NULL) {
+        return ngx_quic_bpf_create_group(cycle, ls);
+    }
+
+    grp = ngx_quic_bpf_alloc_group(cycle, ls->sockaddr, ls->socklen);
+    if (grp == NULL) {
+        return NULL;
+    }
+
+    grp->map_fd = dup(ogrp->map_fd);
+    if (grp->map_fd == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                      "quic bpf failed to duplicate bpf map descriptor");
+
+        ngx_queue_remove(&grp->queue);
+
+        return NULL;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                   "quic bpf sockmap fd duplicated old:%d new:%d",
+                   ogrp->map_fd, grp->map_fd);
+
+    return grp;
+}
+
+
+static ngx_int_t
+ngx_quic_bpf_group_add_socket(ngx_cycle_t *cycle,  ngx_listening_t *ls)
+{
+    uint64_t                cookie;
+    ngx_quic_bpf_conf_t    *bcf;
+    ngx_quic_sock_group_t  *grp;
+
+    bcf = ngx_quic_bpf_get_conf(cycle);
+
+    grp = ngx_quic_bpf_get_group(cycle, ls);
+
+    if (grp == NULL) {
+        if (!bcf->enabled) {
+            return NGX_OK;
+        }
+
+        return NGX_ERROR;
+    }
+
+    grp->unused = 0;
+
+    cookie = ngx_quic_bpf_socket_key(ls->fd, cycle->log);
+    if (cookie == (uint64_t) NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    /* map[cookie] = socket; for use in kernel helper */
+    if (ngx_bpf_map_update(grp->map_fd, &cookie, &ls->fd, BPF_ANY) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                      "quic bpf failed to update socket map key=%xL", cookie);
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                 "quic bpf sockmap fd:%d add socket:%d cookie:0x%xL worker:%ui",
+                 grp->map_fd, ls->fd, cookie, ls->worker);
+
+    /* do not inherit this socket */
+    ls->ignore = 1;
+
+    return NGX_OK;
+}
+
+
+static uint64_t
+ngx_quic_bpf_socket_key(ngx_fd_t fd, ngx_log_t *log)
+{
+    uint64_t   cookie;
+    socklen_t  optlen;
+
+    optlen = sizeof(cookie);
+
+    if (getsockopt(fd, SOL_SOCKET, SO_COOKIE, &cookie, &optlen) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
+                      "quic bpf getsockopt(SO_COOKIE) failed");
+
+        return (ngx_uint_t) NGX_ERROR;
+    }
+
+    return cookie;
+}
+
+
+static ngx_int_t
+ngx_quic_bpf_export_maps(ngx_cycle_t *cycle)
+{
+    u_char                 *p, *buf;
+    size_t                  len;
+    ngx_str_t              *var;
+    ngx_queue_t            *q;
+    ngx_core_conf_t        *ccf;
+    ngx_quic_bpf_conf_t    *bcf;
+    ngx_quic_sock_group_t  *grp;
+
+    ccf = ngx_core_get_conf(cycle);
+    bcf = ngx_quic_bpf_get_conf(cycle);
+
+    len = sizeof(NGX_QUIC_BPF_VARNAME) + 1;
+
+    q = ngx_queue_head(&bcf->groups);
+
+    while (q != ngx_queue_sentinel(&bcf->groups)) {
+
+        grp = ngx_queue_data(q, ngx_quic_sock_group_t, queue);
+
+        q = ngx_queue_next(q);
+
+        if (grp->unused) {
+            /*
+             * map was inherited, but it is not used in this configuration;
+             * do not pass such map further and drop the group to prevent
+             * interference with changes during reload
+             */
+
+            ngx_quic_bpf_close(cycle->log, grp->map_fd, "map");
+            ngx_queue_remove(&grp->queue);
+
+            continue;
+        }
+
+        len += NGX_INT32_LEN + 1 + NGX_SOCKADDR_STRLEN + 1;
+    }
+
+    len++;
+
+    buf = ngx_palloc(cycle->pool, len);
+    if (buf == NULL) {
+        return NGX_ERROR;
+    }
+
+    p = ngx_cpymem(buf, NGX_QUIC_BPF_VARNAME "=",
+                   sizeof(NGX_QUIC_BPF_VARNAME));
+
+    for (q = ngx_queue_head(&bcf->groups);
+         q != ngx_queue_sentinel(&bcf->groups);
+         q = ngx_queue_next(q))
+    {
+        grp = ngx_queue_data(q, ngx_quic_sock_group_t, queue);
+
+        p = ngx_sprintf(p, "%ud", grp->map_fd);
+
+        *p++ = NGX_QUIC_BPF_ADDRSEP;
+
+        p += ngx_sock_ntop(grp->sockaddr, grp->socklen, p,
+                           NGX_SOCKADDR_STRLEN, 1);
+
+        *p++ = NGX_QUIC_BPF_VARSEP;
+    }
+
+    *p = '\0';
+
+    var = ngx_array_push(&ccf->env);
+    if (var == NULL) {
+        return NGX_ERROR;
+    }
+
+    var->data = buf;
+    var->len = sizeof(NGX_QUIC_BPF_VARNAME) - 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_bpf_import_maps(ngx_cycle_t *cycle)
+{
+    int                     s;
+    u_char                 *inherited, *p, *v;
+    ngx_uint_t              in_fd;
+    ngx_addr_t              tmp;
+    ngx_quic_bpf_conf_t    *bcf;
+    ngx_quic_sock_group_t  *grp;
+
+    inherited = (u_char *) getenv(NGX_QUIC_BPF_VARNAME);
+
+    if (inherited == NULL) {
+        return NGX_OK;
+    }
+
+    bcf = ngx_quic_bpf_get_conf(cycle);
+
+#if (NGX_SUPPRESS_WARN)
+    s = -1;
+#endif
+
+    in_fd = 1;
+
+    for (p = inherited, v = p; *p; p++) {
+
+        switch (*p) {
+
+        case NGX_QUIC_BPF_ADDRSEP:
+
+            if (!in_fd) {
+                ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+                              "quic bpf failed to parse inherited env");
+                return NGX_ERROR;
+            }
+            in_fd = 0;
+
+            s = ngx_atoi(v, p - v);
+            if (s == NGX_ERROR) {
+                ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+                              "quic bpf failed to parse inherited map fd");
+                return NGX_ERROR;
+            }
+
+            v = p + 1;
+            break;
+
+        case NGX_QUIC_BPF_VARSEP:
+
+            if (in_fd) {
+                ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+                              "quic bpf failed to parse inherited env");
+                return NGX_ERROR;
+            }
+            in_fd = 1;
+
+            grp = ngx_pcalloc(cycle->pool,
+                              sizeof(ngx_quic_sock_group_t));
+            if (grp == NULL) {
+                return NGX_ERROR;
+            }
+
+            grp->map_fd = s;
+
+            if (ngx_parse_addr_port(cycle->pool, &tmp, v, p - v)
+                != NGX_OK)
+            {
+                ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+                              "quic bpf failed to parse inherited"
+                              " address '%*s'", p - v , v);
+
+                ngx_quic_bpf_close(cycle->log, s, "inherited map");
+
+                return NGX_ERROR;
+            }
+
+            grp->sockaddr = tmp.sockaddr;
+            grp->socklen = tmp.socklen;
+
+            grp->unused = 1;
+
+            ngx_queue_insert_tail(&bcf->groups, &grp->queue);
+
+            ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                           "quic bpf sockmap inherited with "
+                           "fd:%d address:%*s",
+                           grp->map_fd, p - v, v);
+            v = p + 1;
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    return NGX_OK;
+}
diff --git a/src/event/quic/ngx_event_quic_bpf_code.c b/src/event/quic/ngx_event_quic_bpf_code.c
new file mode 100644
index 0000000..5c9dea1
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_bpf_code.c
@@ -0,0 +1,88 @@
+/* AUTO-GENERATED, DO NOT EDIT. */
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "ngx_bpf.h"
+
+
+static ngx_bpf_reloc_t bpf_reloc_prog_ngx_quic_reuseport_helper[] = {
+    { "ngx_quic_sockmap", 55 },
+};
+
+static struct bpf_insn bpf_insn_prog_ngx_quic_reuseport_helper[] = {
+    /* opcode dst          src         offset imm */
+    { 0x79,   BPF_REG_4,   BPF_REG_1, (int16_t)      0,        0x0 },
+    { 0x79,   BPF_REG_3,   BPF_REG_1, (int16_t)      8,        0x0 },
+    { 0xbf,   BPF_REG_2,   BPF_REG_4, (int16_t)      0,        0x0 },
+    {  0x7,   BPF_REG_2,   BPF_REG_0, (int16_t)      0,        0x8 },
+    { 0x2d,   BPF_REG_2,   BPF_REG_3, (int16_t)     54,        0x0 },
+    { 0xbf,   BPF_REG_5,   BPF_REG_4, (int16_t)      0,        0x0 },
+    {  0x7,   BPF_REG_5,   BPF_REG_0, (int16_t)      0,        0x9 },
+    { 0x2d,   BPF_REG_5,   BPF_REG_3, (int16_t)     51,        0x0 },
+    { 0xb7,   BPF_REG_5,   BPF_REG_0, (int16_t)      0,       0x14 },
+    { 0xb7,   BPF_REG_0,   BPF_REG_0, (int16_t)      0,        0x9 },
+    { 0x71,   BPF_REG_6,   BPF_REG_2, (int16_t)      0,        0x0 },
+    { 0x67,   BPF_REG_6,   BPF_REG_0, (int16_t)      0,       0x38 },
+    { 0xc7,   BPF_REG_6,   BPF_REG_0, (int16_t)      0,       0x38 },
+    { 0x65,   BPF_REG_6,   BPF_REG_0, (int16_t)     10, 0xffffffff },
+    { 0xbf,   BPF_REG_2,   BPF_REG_4, (int16_t)      0,        0x0 },
+    {  0x7,   BPF_REG_2,   BPF_REG_0, (int16_t)      0,        0xd },
+    { 0x2d,   BPF_REG_2,   BPF_REG_3, (int16_t)     42,        0x0 },
+    { 0xbf,   BPF_REG_5,   BPF_REG_4, (int16_t)      0,        0x0 },
+    {  0x7,   BPF_REG_5,   BPF_REG_0, (int16_t)      0,        0xe },
+    { 0x2d,   BPF_REG_5,   BPF_REG_3, (int16_t)     39,        0x0 },
+    { 0xb7,   BPF_REG_0,   BPF_REG_0, (int16_t)      0,        0xe },
+    { 0x71,   BPF_REG_5,   BPF_REG_2, (int16_t)      0,        0x0 },
+    { 0xb7,   BPF_REG_6,   BPF_REG_0, (int16_t)      0,        0x8 },
+    { 0x2d,   BPF_REG_6,   BPF_REG_5, (int16_t)     35,        0x0 },
+    {  0xf,   BPF_REG_5,   BPF_REG_0, (int16_t)      0,        0x0 },
+    {  0xf,   BPF_REG_4,   BPF_REG_5, (int16_t)      0,        0x0 },
+    { 0x2d,   BPF_REG_4,   BPF_REG_3, (int16_t)     32,        0x0 },
+    { 0xbf,   BPF_REG_4,   BPF_REG_2, (int16_t)      0,        0x0 },
+    {  0x7,   BPF_REG_4,   BPF_REG_0, (int16_t)      0,        0x9 },
+    { 0x2d,   BPF_REG_4,   BPF_REG_3, (int16_t)     29,        0x0 },
+    { 0x71,   BPF_REG_4,   BPF_REG_2, (int16_t)      1,        0x0 },
+    { 0x67,   BPF_REG_4,   BPF_REG_0, (int16_t)      0,       0x38 },
+    { 0x71,   BPF_REG_3,   BPF_REG_2, (int16_t)      2,        0x0 },
+    { 0x67,   BPF_REG_3,   BPF_REG_0, (int16_t)      0,       0x30 },
+    { 0x4f,   BPF_REG_3,   BPF_REG_4, (int16_t)      0,        0x0 },
+    { 0x71,   BPF_REG_4,   BPF_REG_2, (int16_t)      3,        0x0 },
+    { 0x67,   BPF_REG_4,   BPF_REG_0, (int16_t)      0,       0x28 },
+    { 0x4f,   BPF_REG_3,   BPF_REG_4, (int16_t)      0,        0x0 },
+    { 0x71,   BPF_REG_4,   BPF_REG_2, (int16_t)      4,        0x0 },
+    { 0x67,   BPF_REG_4,   BPF_REG_0, (int16_t)      0,       0x20 },
+    { 0x4f,   BPF_REG_3,   BPF_REG_4, (int16_t)      0,        0x0 },
+    { 0x71,   BPF_REG_4,   BPF_REG_2, (int16_t)      5,        0x0 },
+    { 0x67,   BPF_REG_4,   BPF_REG_0, (int16_t)      0,       0x18 },
+    { 0x4f,   BPF_REG_3,   BPF_REG_4, (int16_t)      0,        0x0 },
+    { 0x71,   BPF_REG_4,   BPF_REG_2, (int16_t)      6,        0x0 },
+    { 0x67,   BPF_REG_4,   BPF_REG_0, (int16_t)      0,       0x10 },
+    { 0x4f,   BPF_REG_3,   BPF_REG_4, (int16_t)      0,        0x0 },
+    { 0x71,   BPF_REG_4,   BPF_REG_2, (int16_t)      7,        0x0 },
+    { 0x67,   BPF_REG_4,   BPF_REG_0, (int16_t)      0,        0x8 },
+    { 0x4f,   BPF_REG_3,   BPF_REG_4, (int16_t)      0,        0x0 },
+    { 0x71,   BPF_REG_2,   BPF_REG_2, (int16_t)      8,        0x0 },
+    { 0x4f,   BPF_REG_3,   BPF_REG_2, (int16_t)      0,        0x0 },
+    { 0x7b,  BPF_REG_10,   BPF_REG_3, (int16_t)  65528,        0x0 },
+    { 0xbf,   BPF_REG_3,  BPF_REG_10, (int16_t)      0,        0x0 },
+    {  0x7,   BPF_REG_3,   BPF_REG_0, (int16_t)      0, 0xfffffff8 },
+    { 0x18,   BPF_REG_2,   BPF_REG_0, (int16_t)      0,        0x0 },
+    {  0x0,   BPF_REG_0,   BPF_REG_0, (int16_t)      0,        0x0 },
+    { 0xb7,   BPF_REG_4,   BPF_REG_0, (int16_t)      0,        0x0 },
+    { 0x85,   BPF_REG_0,   BPF_REG_0, (int16_t)      0,       0x52 },
+    { 0xb7,   BPF_REG_0,   BPF_REG_0, (int16_t)      0,        0x1 },
+    { 0x95,   BPF_REG_0,   BPF_REG_0, (int16_t)      0,        0x0 },
+};
+
+
+ngx_bpf_program_t ngx_quic_reuseport_helper = {
+    .relocs = bpf_reloc_prog_ngx_quic_reuseport_helper,
+    .nrelocs = sizeof(bpf_reloc_prog_ngx_quic_reuseport_helper)
+               / sizeof(bpf_reloc_prog_ngx_quic_reuseport_helper[0]),
+    .ins = bpf_insn_prog_ngx_quic_reuseport_helper,
+    .nins = sizeof(bpf_insn_prog_ngx_quic_reuseport_helper)
+            / sizeof(bpf_insn_prog_ngx_quic_reuseport_helper[0]),
+    .license = "BSD",
+    .type = BPF_PROG_TYPE_SK_REUSEPORT,
+};
diff --git a/src/event/quic/ngx_event_quic_connection.h b/src/event/quic/ngx_event_quic_connection.h
new file mode 100644
index 0000000..824c92b
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_connection.h
@@ -0,0 +1,305 @@
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_CONNECTION_H_INCLUDED_
+#define _NGX_EVENT_QUIC_CONNECTION_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+/* #define NGX_QUIC_DEBUG_PACKETS */  /* dump packet contents */
+/* #define NGX_QUIC_DEBUG_FRAMES */   /* dump frames contents */
+/* #define NGX_QUIC_DEBUG_ALLOC */    /* log frames and bufs alloc */
+/* #define NGX_QUIC_DEBUG_CRYPTO */
+
+typedef struct ngx_quic_connection_s  ngx_quic_connection_t;
+typedef struct ngx_quic_server_id_s   ngx_quic_server_id_t;
+typedef struct ngx_quic_client_id_s   ngx_quic_client_id_t;
+typedef struct ngx_quic_send_ctx_s    ngx_quic_send_ctx_t;
+typedef struct ngx_quic_socket_s      ngx_quic_socket_t;
+typedef struct ngx_quic_path_s        ngx_quic_path_t;
+typedef struct ngx_quic_keys_s        ngx_quic_keys_t;
+
+#if (NGX_QUIC_OPENSSL_COMPAT)
+#include <ngx_event_quic_openssl_compat.h>
+#endif
+#include <ngx_event_quic_transport.h>
+#include <ngx_event_quic_protection.h>
+#include <ngx_event_quic_frames.h>
+#include <ngx_event_quic_migration.h>
+#include <ngx_event_quic_connid.h>
+#include <ngx_event_quic_streams.h>
+#include <ngx_event_quic_ssl.h>
+#include <ngx_event_quic_tokens.h>
+#include <ngx_event_quic_ack.h>
+#include <ngx_event_quic_output.h>
+#include <ngx_event_quic_socket.h>
+
+
+/* RFC 9002, 6.2.2.  Handshakes and New Paths: kInitialRtt */
+#define NGX_QUIC_INITIAL_RTT                 333 /* ms */
+
+#define NGX_QUIC_UNSET_PN                    (uint64_t) -1
+
+#define NGX_QUIC_SEND_CTX_LAST               (NGX_QUIC_ENCRYPTION_LAST - 1)
+
+/*  0-RTT and 1-RTT data exist in the same packet number space,
+ *  so we have 3 packet number spaces:
+ *
+ *  0 - Initial
+ *  1 - Handshake
+ *  2 - 0-RTT and 1-RTT
+ */
+#define ngx_quic_get_send_ctx(qc, level)                                      \
+    ((level) == ssl_encryption_initial) ? &((qc)->send_ctx[0])                \
+        : (((level) == ssl_encryption_handshake) ? &((qc)->send_ctx[1])       \
+                                                 : &((qc)->send_ctx[2]))
+
+#define ngx_quic_get_connection(c)                                            \
+    (((c)->udp) ? (((ngx_quic_socket_t *)((c)->udp))->quic) : NULL)
+
+#define ngx_quic_get_socket(c)               ((ngx_quic_socket_t *)((c)->udp))
+
+#define ngx_quic_init_rtt(qc)                                                 \
+    (qc)->avg_rtt = NGX_QUIC_INITIAL_RTT;                                     \
+    (qc)->rttvar = NGX_QUIC_INITIAL_RTT / 2;                                  \
+    (qc)->min_rtt = NGX_TIMER_INFINITE;                                       \
+    (qc)->first_rtt = NGX_TIMER_INFINITE;                                     \
+    (qc)->latest_rtt = 0;
+
+
+typedef enum {
+    NGX_QUIC_PATH_IDLE = 0,
+    NGX_QUIC_PATH_VALIDATING,
+    NGX_QUIC_PATH_WAITING,
+    NGX_QUIC_PATH_MTUD
+} ngx_quic_path_state_e;
+
+
+struct ngx_quic_client_id_s {
+    ngx_queue_t                       queue;
+    uint64_t                          seqnum;
+    size_t                            len;
+    u_char                            id[NGX_QUIC_CID_LEN_MAX];
+    u_char                            sr_token[NGX_QUIC_SR_TOKEN_LEN];
+    ngx_uint_t                        used;  /* unsigned  used:1; */
+};
+
+
+struct ngx_quic_server_id_s {
+    uint64_t                          seqnum;
+    size_t                            len;
+    u_char                            id[NGX_QUIC_CID_LEN_MAX];
+};
+
+
+struct ngx_quic_path_s {
+    ngx_queue_t                       queue;
+    struct sockaddr                  *sockaddr;
+    ngx_sockaddr_t                    sa;
+    socklen_t                         socklen;
+    ngx_quic_client_id_t             *cid;
+    ngx_quic_path_state_e             state;
+    ngx_msec_t                        expires;
+    ngx_uint_t                        tries;
+    ngx_uint_t                        tag;
+    size_t                            mtu;
+    size_t                            mtud;
+    size_t                            max_mtu;
+    off_t                             sent;
+    off_t                             received;
+    u_char                            challenge[2][8];
+    uint64_t                          seqnum;
+    uint64_t                          mtu_pnum[NGX_QUIC_PATH_RETRIES];
+    ngx_str_t                         addr_text;
+    u_char                            text[NGX_SOCKADDR_STRLEN];
+    unsigned                          validated:1;
+    unsigned                          mtu_unvalidated:1;
+};
+
+
+struct ngx_quic_socket_s {
+    ngx_udp_connection_t              udp;
+    ngx_quic_connection_t            *quic;
+    ngx_queue_t                       queue;
+    ngx_quic_server_id_t              sid;
+    ngx_sockaddr_t                    sockaddr;
+    socklen_t                         socklen;
+    ngx_uint_t                        used; /* unsigned  used:1; */
+};
+
+
+typedef struct {
+    ngx_rbtree_t                      tree;
+    ngx_rbtree_node_t                 sentinel;
+
+    ngx_queue_t                       uninitialized;
+    ngx_queue_t                       free;
+
+    uint64_t                          sent;
+    uint64_t                          recv_offset;
+    uint64_t                          recv_window;
+    uint64_t                          recv_last;
+    uint64_t                          recv_max_data;
+    uint64_t                          send_offset;
+    uint64_t                          send_max_data;
+
+    uint64_t                          server_max_streams_uni;
+    uint64_t                          server_max_streams_bidi;
+    uint64_t                          server_streams_uni;
+    uint64_t                          server_streams_bidi;
+
+    uint64_t                          client_max_streams_uni;
+    uint64_t                          client_max_streams_bidi;
+    uint64_t                          client_streams_uni;
+    uint64_t                          client_streams_bidi;
+
+    ngx_uint_t                        initialized;
+                                                 /* unsigned  initialized:1; */
+} ngx_quic_streams_t;
+
+
+typedef struct {
+    size_t                            in_flight;
+    size_t                            window;
+    size_t                            ssthresh;
+    ngx_msec_t                        recovery_start;
+} ngx_quic_congestion_t;
+
+
+/*
+ * RFC 9000, 12.3.  Packet Numbers
+ *
+ *  Conceptually, a packet number space is the context in which a packet
+ *  can be processed and acknowledged.  Initial packets can only be sent
+ *  with Initial packet protection keys and acknowledged in packets that
+ *  are also Initial packets.
+ */
+struct ngx_quic_send_ctx_s {
+    enum ssl_encryption_level_t       level;
+
+    ngx_quic_buffer_t                 crypto;
+    uint64_t                          crypto_sent;
+
+    uint64_t                          pnum;        /* to be sent */
+    uint64_t                          largest_ack; /* received from peer */
+    uint64_t                          largest_pn;  /* received from peer */
+
+    ngx_queue_t                       frames;      /* generated frames */
+    ngx_queue_t                       sending;     /* frames assigned to pkt */
+    ngx_queue_t                       sent;        /* frames waiting ACK */
+
+    uint64_t                          pending_ack; /* non sent ack-eliciting */
+    uint64_t                          largest_range;
+    uint64_t                          first_range;
+    ngx_msec_t                        largest_received;
+    ngx_msec_t                        ack_delay_start;
+    ngx_uint_t                        nranges;
+    ngx_quic_ack_range_t              ranges[NGX_QUIC_MAX_RANGES];
+    ngx_uint_t                        send_ack;
+};
+
+
+struct ngx_quic_connection_s {
+    uint32_t                          version;
+
+    ngx_quic_path_t                  *path;
+
+    ngx_queue_t                       sockets;
+    ngx_queue_t                       paths;
+    ngx_queue_t                       client_ids;
+    ngx_queue_t                       free_sockets;
+    ngx_queue_t                       free_paths;
+    ngx_queue_t                       free_client_ids;
+
+    ngx_uint_t                        nsockets;
+    ngx_uint_t                        nclient_ids;
+    uint64_t                          max_retired_seqnum;
+    uint64_t                          client_seqnum;
+    uint64_t                          server_seqnum;
+    uint64_t                          path_seqnum;
+
+    ngx_quic_tp_t                     tp;
+    ngx_quic_tp_t                     ctp;
+
+    ngx_quic_send_ctx_t               send_ctx[NGX_QUIC_SEND_CTX_LAST];
+
+    ngx_quic_keys_t                  *keys;
+
+    ngx_quic_conf_t                  *conf;
+
+    ngx_event_t                       push;
+    ngx_event_t                       pto;
+    ngx_event_t                       close;
+    ngx_event_t                       path_validation;
+    ngx_event_t                       key_update;
+
+    ngx_msec_t                        last_cc;
+
+    ngx_msec_t                        first_rtt;
+    ngx_msec_t                        latest_rtt;
+    ngx_msec_t                        avg_rtt;
+    ngx_msec_t                        min_rtt;
+    ngx_msec_t                        rttvar;
+
+    ngx_uint_t                        pto_count;
+
+    ngx_queue_t                       free_frames;
+    ngx_buf_t                        *free_bufs;
+    ngx_buf_t                        *free_shadow_bufs;
+
+    ngx_uint_t                        nframes;
+#ifdef NGX_QUIC_DEBUG_ALLOC
+    ngx_uint_t                        nbufs;
+    ngx_uint_t                        nshadowbufs;
+#endif
+
+#if (NGX_QUIC_OPENSSL_COMPAT)
+    ngx_quic_compat_t                *compat;
+#endif
+
+    ngx_quic_streams_t                streams;
+    ngx_quic_congestion_t             congestion;
+
+    uint64_t                          rst_pnum;    /* first on validated path */
+
+    off_t                             received;
+
+    ngx_uint_t                        error;
+    enum ssl_encryption_level_t       error_level;
+    ngx_uint_t                        error_ftype;
+    const char                       *error_reason;
+
+    ngx_uint_t                        shutdown_code;
+    const char                       *shutdown_reason;
+
+    unsigned                          error_app:1;
+    unsigned                          send_timer_set:1;
+    unsigned                          closing:1;
+    unsigned                          shutdown:1;
+    unsigned                          draining:1;
+    unsigned                          key_phase:1;
+    unsigned                          validated:1;
+    unsigned                          client_tp_done:1;
+};
+
+
+ngx_int_t ngx_quic_apply_transport_params(ngx_connection_t *c,
+    ngx_quic_tp_t *ctp);
+void ngx_quic_discard_ctx(ngx_connection_t *c,
+    enum ssl_encryption_level_t level);
+void ngx_quic_close_connection(ngx_connection_t *c, ngx_int_t rc);
+void ngx_quic_shutdown_quic(ngx_connection_t *c);
+
+#if (NGX_DEBUG)
+void ngx_quic_connstate_dbg(ngx_connection_t *c);
+#else
+#define ngx_quic_connstate_dbg(c)
+#endif
+
+#endif /* _NGX_EVENT_QUIC_CONNECTION_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_connid.c b/src/event/quic/ngx_event_quic_connid.c
new file mode 100644
index 0000000..f508682
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_connid.c
@@ -0,0 +1,502 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+#define NGX_QUIC_MAX_SERVER_IDS   8
+
+
+#if (NGX_QUIC_BPF)
+static ngx_int_t ngx_quic_bpf_attach_id(ngx_connection_t *c, u_char *id);
+#endif
+static ngx_int_t ngx_quic_retire_client_id(ngx_connection_t *c,
+    ngx_quic_client_id_t *cid);
+static ngx_quic_client_id_t *ngx_quic_alloc_client_id(ngx_connection_t *c,
+    ngx_quic_connection_t *qc);
+static ngx_int_t ngx_quic_send_server_id(ngx_connection_t *c,
+    ngx_quic_server_id_t *sid);
+
+
+ngx_int_t
+ngx_quic_create_server_id(ngx_connection_t *c, u_char *id)
+{
+    if (RAND_bytes(id, NGX_QUIC_SERVER_CID_LEN) != 1) {
+        return NGX_ERROR;
+    }
+
+#if (NGX_QUIC_BPF)
+    if (ngx_quic_bpf_attach_id(c, id) != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                      "quic bpf failed to generate socket key");
+        /* ignore error, things still may work */
+    }
+#endif
+
+    return NGX_OK;
+}
+
+
+#if (NGX_QUIC_BPF)
+
+static ngx_int_t
+ngx_quic_bpf_attach_id(ngx_connection_t *c, u_char *id)
+{
+    int        fd;
+    uint64_t   cookie;
+    socklen_t  optlen;
+
+    fd = c->listening->fd;
+
+    optlen = sizeof(cookie);
+
+    if (getsockopt(fd, SOL_SOCKET, SO_COOKIE, &cookie, &optlen) == -1) {
+        ngx_log_error(NGX_LOG_ERR, c->log, ngx_socket_errno,
+                      "quic getsockopt(SO_COOKIE) failed");
+
+        return NGX_ERROR;
+    }
+
+    ngx_quic_dcid_encode_key(id, cookie);
+
+    return NGX_OK;
+}
+
+#endif
+
+
+ngx_int_t
+ngx_quic_handle_new_connection_id_frame(ngx_connection_t *c,
+    ngx_quic_new_conn_id_frame_t *f)
+{
+    ngx_str_t               id;
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_client_id_t   *cid, *item;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (f->seqnum < qc->max_retired_seqnum) {
+        /*
+         * RFC 9000, 19.15.  NEW_CONNECTION_ID Frame
+         *
+         *  An endpoint that receives a NEW_CONNECTION_ID frame with
+         *  a sequence number smaller than the Retire Prior To field
+         *  of a previously received NEW_CONNECTION_ID frame MUST send
+         *  a corresponding RETIRE_CONNECTION_ID frame that retires
+         *  the newly received connection ID, unless it has already
+         *  done so for that sequence number.
+         */
+
+        frame = ngx_quic_alloc_frame(c);
+        if (frame == NULL) {
+            return NGX_ERROR;
+        }
+
+        frame->level = ssl_encryption_application;
+        frame->type = NGX_QUIC_FT_RETIRE_CONNECTION_ID;
+        frame->u.retire_cid.sequence_number = f->seqnum;
+
+        ngx_quic_queue_frame(qc, frame);
+
+        goto retire;
+    }
+
+    cid = NULL;
+
+    for (q = ngx_queue_head(&qc->client_ids);
+         q != ngx_queue_sentinel(&qc->client_ids);
+         q = ngx_queue_next(q))
+    {
+        item = ngx_queue_data(q, ngx_quic_client_id_t, queue);
+
+        if (item->seqnum == f->seqnum) {
+            cid = item;
+            break;
+        }
+    }
+
+    if (cid) {
+        /*
+         * Transmission errors, timeouts, and retransmissions might cause the
+         * same NEW_CONNECTION_ID frame to be received multiple times.
+         */
+
+        if (cid->len != f->len
+            || ngx_strncmp(cid->id, f->cid, f->len) != 0
+            || ngx_strncmp(cid->sr_token, f->srt, NGX_QUIC_SR_TOKEN_LEN) != 0)
+        {
+            /*
+             * ..if a sequence number is used for different connection IDs,
+             * the endpoint MAY treat that receipt as a connection error
+             * of type PROTOCOL_VIOLATION.
+             */
+            qc->error = NGX_QUIC_ERR_PROTOCOL_VIOLATION;
+            qc->error_reason = "seqnum refers to different connection id/token";
+            return NGX_ERROR;
+        }
+
+    } else {
+
+        id.data = f->cid;
+        id.len = f->len;
+
+        if (ngx_quic_create_client_id(c, &id, f->seqnum, f->srt) == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+retire:
+
+    if (qc->max_retired_seqnum && f->retire <= qc->max_retired_seqnum) {
+        /*
+         * Once a sender indicates a Retire Prior To value, smaller values sent
+         * in subsequent NEW_CONNECTION_ID frames have no effect.  A receiver
+         * MUST ignore any Retire Prior To fields that do not increase the
+         * largest received Retire Prior To value.
+         */
+        goto done;
+    }
+
+    qc->max_retired_seqnum = f->retire;
+
+    q = ngx_queue_head(&qc->client_ids);
+
+    while (q != ngx_queue_sentinel(&qc->client_ids)) {
+
+        cid = ngx_queue_data(q, ngx_quic_client_id_t, queue);
+        q = ngx_queue_next(q);
+
+        if (cid->seqnum >= f->retire) {
+            continue;
+        }
+
+        if (ngx_quic_retire_client_id(c, cid) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+done:
+
+    if (qc->nclient_ids > qc->tp.active_connection_id_limit) {
+        /*
+         * RFC 9000, 5.1.1.  Issuing Connection IDs
+         *
+         * After processing a NEW_CONNECTION_ID frame and
+         * adding and retiring active connection IDs, if the number of active
+         * connection IDs exceeds the value advertised in its
+         * active_connection_id_limit transport parameter, an endpoint MUST
+         * close the connection with an error of type CONNECTION_ID_LIMIT_ERROR.
+         */
+        qc->error = NGX_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR;
+        qc->error_reason = "too many connection ids received";
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_retire_client_id(ngx_connection_t *c, ngx_quic_client_id_t *cid)
+{
+    ngx_queue_t            *q;
+    ngx_quic_path_t        *path;
+    ngx_quic_client_id_t   *new_cid;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (!cid->used) {
+        return ngx_quic_free_client_id(c, cid);
+    }
+
+    /* we are going to retire client id which is in use */
+
+    q = ngx_queue_head(&qc->paths);
+
+    while (q != ngx_queue_sentinel(&qc->paths)) {
+
+        path = ngx_queue_data(q, ngx_quic_path_t, queue);
+        q = ngx_queue_next(q);
+
+        if (path->cid != cid) {
+            continue;
+        }
+
+        if (path == qc->path) {
+            /* this is the active path: update it with new CID */
+            new_cid = ngx_quic_next_client_id(c);
+            if (new_cid == NULL) {
+                return NGX_ERROR;
+            }
+
+            qc->path->cid = new_cid;
+            new_cid->used = 1;
+
+            return ngx_quic_free_client_id(c, cid);
+        }
+
+        return ngx_quic_free_path(c, path);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_quic_client_id_t *
+ngx_quic_alloc_client_id(ngx_connection_t *c, ngx_quic_connection_t *qc)
+{
+    ngx_queue_t           *q;
+    ngx_quic_client_id_t  *cid;
+
+    if (!ngx_queue_empty(&qc->free_client_ids)) {
+
+        q = ngx_queue_head(&qc->free_client_ids);
+        cid = ngx_queue_data(q, ngx_quic_client_id_t, queue);
+
+        ngx_queue_remove(&cid->queue);
+
+        ngx_memzero(cid, sizeof(ngx_quic_client_id_t));
+
+    } else {
+
+        cid = ngx_pcalloc(c->pool, sizeof(ngx_quic_client_id_t));
+        if (cid == NULL) {
+            return NULL;
+        }
+    }
+
+    return cid;
+}
+
+
+ngx_quic_client_id_t *
+ngx_quic_create_client_id(ngx_connection_t *c, ngx_str_t *id,
+    uint64_t seqnum, u_char *token)
+{
+    ngx_quic_client_id_t   *cid;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    cid = ngx_quic_alloc_client_id(c, qc);
+    if (cid == NULL) {
+        return NULL;
+    }
+
+    cid->seqnum = seqnum;
+
+    cid->len = id->len;
+    ngx_memcpy(cid->id, id->data, id->len);
+
+    if (token) {
+        ngx_memcpy(cid->sr_token, token, NGX_QUIC_SR_TOKEN_LEN);
+    }
+
+    ngx_queue_insert_tail(&qc->client_ids, &cid->queue);
+    qc->nclient_ids++;
+
+    if (seqnum > qc->client_seqnum) {
+        qc->client_seqnum = seqnum;
+    }
+
+    ngx_log_debug5(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic cid seq:%uL received id:%uz:%xV:%*xs",
+                    cid->seqnum, id->len, id,
+                    (size_t) NGX_QUIC_SR_TOKEN_LEN, cid->sr_token);
+
+    return cid;
+}
+
+
+ngx_quic_client_id_t *
+ngx_quic_next_client_id(ngx_connection_t *c)
+{
+    ngx_queue_t            *q;
+    ngx_quic_client_id_t   *cid;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    for (q = ngx_queue_head(&qc->client_ids);
+         q != ngx_queue_sentinel(&qc->client_ids);
+         q = ngx_queue_next(q))
+    {
+        cid = ngx_queue_data(q, ngx_quic_client_id_t, queue);
+
+        if (!cid->used) {
+            return cid;
+        }
+    }
+
+    return NULL;
+}
+
+
+ngx_int_t
+ngx_quic_handle_retire_connection_id_frame(ngx_connection_t *c,
+    ngx_quic_retire_cid_frame_t *f)
+{
+    ngx_quic_socket_t      *qsock;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (f->sequence_number >= qc->server_seqnum) {
+        /*
+         * RFC 9000, 19.16.
+         *
+         *  Receipt of a RETIRE_CONNECTION_ID frame containing a sequence
+         *  number greater than any previously sent to the peer MUST be
+         *  treated as a connection error of type PROTOCOL_VIOLATION.
+         */
+        qc->error = NGX_QUIC_ERR_PROTOCOL_VIOLATION;
+        qc->error_reason = "sequence number of id to retire was never issued";
+
+        return NGX_ERROR;
+    }
+
+    qsock = ngx_quic_get_socket(c);
+
+    if (qsock->sid.seqnum == f->sequence_number) {
+
+        /*
+         * RFC 9000, 19.16.
+         *
+         * The sequence number specified in a RETIRE_CONNECTION_ID frame MUST
+         * NOT refer to the Destination Connection ID field of the packet in
+         * which the frame is contained.  The peer MAY treat this as a
+         * connection error of type PROTOCOL_VIOLATION.
+         */
+
+        qc->error = NGX_QUIC_ERR_PROTOCOL_VIOLATION;
+        qc->error_reason = "sequence number of id to retire refers DCID";
+
+        return NGX_ERROR;
+    }
+
+    qsock = ngx_quic_find_socket(c, f->sequence_number);
+    if (qsock == NULL) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic socket seq:%uL is retired", qsock->sid.seqnum);
+
+    ngx_quic_close_socket(c, qsock);
+
+    /* restore socket count up to a limit after deletion */
+    if (ngx_quic_create_sockets(c) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_create_sockets(ngx_connection_t *c)
+{
+    ngx_uint_t              n;
+    ngx_quic_socket_t      *qsock;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    n = ngx_min(NGX_QUIC_MAX_SERVER_IDS, qc->ctp.active_connection_id_limit);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic create sockets has:%ui max:%ui", qc->nsockets, n);
+
+    while (qc->nsockets < n) {
+
+        qsock = ngx_quic_create_socket(c, qc);
+        if (qsock == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_quic_listen(c, qc, qsock) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_quic_send_server_id(c, &qsock->sid) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_send_server_id(ngx_connection_t *c, ngx_quic_server_id_t *sid)
+{
+    ngx_str_t               dcid;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    dcid.len = sid->len;
+    dcid.data = sid->id;
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_NEW_CONNECTION_ID;
+    frame->u.ncid.seqnum = sid->seqnum;
+    frame->u.ncid.retire = 0;
+    frame->u.ncid.len = NGX_QUIC_SERVER_CID_LEN;
+    ngx_memcpy(frame->u.ncid.cid, sid->id, NGX_QUIC_SERVER_CID_LEN);
+
+    if (ngx_quic_new_sr_token(c, &dcid, qc->conf->sr_token_key,
+                              frame->u.ncid.srt)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_quic_queue_frame(qc, frame);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_free_client_id(ngx_connection_t *c, ngx_quic_client_id_t *cid)
+{
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_RETIRE_CONNECTION_ID;
+    frame->u.retire_cid.sequence_number = cid->seqnum;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    /* we are no longer going to use this client id */
+
+    ngx_queue_remove(&cid->queue);
+    ngx_queue_insert_head(&qc->free_client_ids, &cid->queue);
+
+    qc->nclient_ids--;
+
+    return NGX_OK;
+}
diff --git a/src/event/quic/ngx_event_quic_connid.h b/src/event/quic/ngx_event_quic_connid.h
new file mode 100644
index 0000000..33e9c65
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_connid.h
@@ -0,0 +1,29 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_CONNID_H_INCLUDED_
+#define _NGX_EVENT_QUIC_CONNID_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+ngx_int_t ngx_quic_handle_retire_connection_id_frame(ngx_connection_t *c,
+    ngx_quic_retire_cid_frame_t *f);
+ngx_int_t ngx_quic_handle_new_connection_id_frame(ngx_connection_t *c,
+    ngx_quic_new_conn_id_frame_t *f);
+
+ngx_int_t ngx_quic_create_sockets(ngx_connection_t *c);
+ngx_int_t ngx_quic_create_server_id(ngx_connection_t *c, u_char *id);
+
+ngx_quic_client_id_t *ngx_quic_create_client_id(ngx_connection_t *c,
+    ngx_str_t *id, uint64_t seqnum, u_char *token);
+ngx_quic_client_id_t *ngx_quic_next_client_id(ngx_connection_t *c);
+ngx_int_t ngx_quic_free_client_id(ngx_connection_t *c,
+    ngx_quic_client_id_t *cid);
+
+#endif /* _NGX_EVENT_QUIC_CONNID_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_frames.c b/src/event/quic/ngx_event_quic_frames.c
new file mode 100644
index 0000000..42b7d9f
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_frames.c
@@ -0,0 +1,894 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+#define NGX_QUIC_BUFFER_SIZE  4096
+
+#define ngx_quic_buf_refs(b)         (b)->shadow->num
+#define ngx_quic_buf_inc_refs(b)     ngx_quic_buf_refs(b)++
+#define ngx_quic_buf_dec_refs(b)     ngx_quic_buf_refs(b)--
+#define ngx_quic_buf_set_refs(b, v)  ngx_quic_buf_refs(b) = v
+
+
+static ngx_buf_t *ngx_quic_alloc_buf(ngx_connection_t *c);
+static void ngx_quic_free_buf(ngx_connection_t *c, ngx_buf_t *b);
+static ngx_buf_t *ngx_quic_clone_buf(ngx_connection_t *c, ngx_buf_t *b);
+static ngx_int_t ngx_quic_split_chain(ngx_connection_t *c, ngx_chain_t *cl,
+    off_t offset);
+
+
+static ngx_buf_t *
+ngx_quic_alloc_buf(ngx_connection_t *c)
+{
+    u_char                 *p;
+    ngx_buf_t              *b;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    b = qc->free_bufs;
+
+    if (b) {
+        qc->free_bufs = b->shadow;
+        p = b->start;
+
+    } else {
+        b = qc->free_shadow_bufs;
+
+        if (b) {
+            qc->free_shadow_bufs = b->shadow;
+
+#ifdef NGX_QUIC_DEBUG_ALLOC
+            ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic use shadow buffer n:%ui %ui",
+                           ++qc->nbufs, --qc->nshadowbufs);
+#endif
+
+        } else {
+            b = ngx_palloc(c->pool, sizeof(ngx_buf_t));
+            if (b == NULL) {
+                return NULL;
+            }
+
+#ifdef NGX_QUIC_DEBUG_ALLOC
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic new buffer n:%ui", ++qc->nbufs);
+#endif
+        }
+
+        p = ngx_pnalloc(c->pool, NGX_QUIC_BUFFER_SIZE);
+        if (p == NULL) {
+            return NULL;
+        }
+    }
+
+#ifdef NGX_QUIC_DEBUG_ALLOC
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic alloc buffer %p", b);
+#endif
+
+    ngx_memzero(b, sizeof(ngx_buf_t));
+
+    b->tag = (ngx_buf_tag_t) &ngx_quic_alloc_buf;
+    b->temporary = 1;
+    b->shadow = b;
+
+    b->start = p;
+    b->pos = p;
+    b->last = p;
+    b->end = p + NGX_QUIC_BUFFER_SIZE;
+
+    ngx_quic_buf_set_refs(b, 1);
+
+    return b;
+}
+
+
+static void
+ngx_quic_free_buf(ngx_connection_t *c, ngx_buf_t *b)
+{
+    ngx_buf_t              *shadow;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    ngx_quic_buf_dec_refs(b);
+
+#ifdef NGX_QUIC_DEBUG_ALLOC
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic free buffer %p r:%ui",
+                   b, (ngx_uint_t) ngx_quic_buf_refs(b));
+#endif
+
+    shadow = b->shadow;
+
+    if (ngx_quic_buf_refs(b) == 0) {
+        shadow->shadow = qc->free_bufs;
+        qc->free_bufs = shadow;
+    }
+
+    if (b != shadow) {
+        b->shadow = qc->free_shadow_bufs;
+        qc->free_shadow_bufs = b;
+    }
+
+}
+
+
+static ngx_buf_t *
+ngx_quic_clone_buf(ngx_connection_t *c, ngx_buf_t *b)
+{
+    ngx_buf_t              *nb;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    nb = qc->free_shadow_bufs;
+
+    if (nb) {
+        qc->free_shadow_bufs = nb->shadow;
+
+    } else {
+        nb = ngx_palloc(c->pool, sizeof(ngx_buf_t));
+        if (nb == NULL) {
+            return NULL;
+        }
+
+#ifdef NGX_QUIC_DEBUG_ALLOC
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic new shadow buffer n:%ui", ++qc->nshadowbufs);
+#endif
+    }
+
+    *nb = *b;
+
+    ngx_quic_buf_inc_refs(b);
+
+#ifdef NGX_QUIC_DEBUG_ALLOC
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic clone buffer %p %p r:%ui",
+                   b, nb, (ngx_uint_t) ngx_quic_buf_refs(b));
+#endif
+
+    return nb;
+}
+
+
+static ngx_int_t
+ngx_quic_split_chain(ngx_connection_t *c, ngx_chain_t *cl, off_t offset)
+{
+    ngx_buf_t    *b, *tb;
+    ngx_chain_t  *tail;
+
+    b = cl->buf;
+
+    tail = ngx_alloc_chain_link(c->pool);
+    if (tail == NULL) {
+        return NGX_ERROR;
+    }
+
+    tb = ngx_quic_clone_buf(c, b);
+    if (tb == NULL) {
+        return NGX_ERROR;
+    }
+
+    tail->buf = tb;
+
+    tb->pos += offset;
+
+    b->last = tb->pos;
+    b->last_buf = 0;
+
+    tail->next = cl->next;
+    cl->next = tail;
+
+    return NGX_OK;
+}
+
+
+ngx_quic_frame_t *
+ngx_quic_alloc_frame(ngx_connection_t *c)
+{
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (!ngx_queue_empty(&qc->free_frames)) {
+
+        q = ngx_queue_head(&qc->free_frames);
+        frame = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        ngx_queue_remove(&frame->queue);
+
+#ifdef NGX_QUIC_DEBUG_ALLOC
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic reuse frame n:%ui", qc->nframes);
+#endif
+
+    } else if (qc->nframes < 10000) {
+        frame = ngx_palloc(c->pool, sizeof(ngx_quic_frame_t));
+        if (frame == NULL) {
+            return NULL;
+        }
+
+        ++qc->nframes;
+
+#ifdef NGX_QUIC_DEBUG_ALLOC
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic alloc frame n:%ui", qc->nframes);
+#endif
+
+    } else {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0, "quic flood detected");
+        return NULL;
+    }
+
+    ngx_memzero(frame, sizeof(ngx_quic_frame_t));
+
+    return frame;
+}
+
+
+void
+ngx_quic_free_frame(ngx_connection_t *c, ngx_quic_frame_t *frame)
+{
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (frame->data) {
+        ngx_quic_free_chain(c, frame->data);
+    }
+
+    ngx_queue_insert_head(&qc->free_frames, &frame->queue);
+
+#ifdef NGX_QUIC_DEBUG_ALLOC
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic free frame n:%ui", qc->nframes);
+#endif
+}
+
+
+void
+ngx_quic_free_chain(ngx_connection_t *c, ngx_chain_t *in)
+{
+    ngx_chain_t  *cl;
+
+    while (in) {
+        cl = in;
+        in = in->next;
+
+        ngx_quic_free_buf(c, cl->buf);
+        ngx_free_chain(c->pool, cl);
+    }
+}
+
+
+void
+ngx_quic_free_frames(ngx_connection_t *c, ngx_queue_t *frames)
+{
+    ngx_queue_t       *q;
+    ngx_quic_frame_t  *f;
+
+    do {
+        q = ngx_queue_head(frames);
+
+        if (q == ngx_queue_sentinel(frames)) {
+            break;
+        }
+
+        ngx_queue_remove(q);
+
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        ngx_quic_free_frame(c, f);
+    } while (1);
+}
+
+
+void
+ngx_quic_queue_frame(ngx_quic_connection_t *qc, ngx_quic_frame_t *frame)
+{
+    ngx_quic_send_ctx_t  *ctx;
+
+    ctx = ngx_quic_get_send_ctx(qc, frame->level);
+
+    ngx_queue_insert_tail(&ctx->frames, &frame->queue);
+
+    frame->len = ngx_quic_create_frame(NULL, frame);
+    /* always succeeds */
+
+    if (qc->closing) {
+        return;
+    }
+
+    ngx_post_event(&qc->push, &ngx_posted_events);
+}
+
+
+ngx_int_t
+ngx_quic_split_frame(ngx_connection_t *c, ngx_quic_frame_t *f, size_t len)
+{
+    size_t                     shrink;
+    ngx_chain_t               *out;
+    ngx_quic_frame_t          *nf;
+    ngx_quic_buffer_t          qb;
+    ngx_quic_ordered_frame_t  *of, *onf;
+
+    switch (f->type) {
+    case NGX_QUIC_FT_CRYPTO:
+    case NGX_QUIC_FT_STREAM:
+        break;
+
+    default:
+        return NGX_DECLINED;
+    }
+
+    if ((size_t) f->len <= len) {
+        return NGX_OK;
+    }
+
+    shrink = f->len - len;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic split frame now:%uz need:%uz shrink:%uz",
+                   f->len, len, shrink);
+
+    of = &f->u.ord;
+
+    if (of->length <= shrink) {
+        return NGX_DECLINED;
+    }
+
+    of->length -= shrink;
+    f->len = ngx_quic_create_frame(NULL, f);
+
+    if ((size_t) f->len > len) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0, "could not split QUIC frame");
+        return NGX_ERROR;
+    }
+
+    ngx_memzero(&qb, sizeof(ngx_quic_buffer_t));
+    qb.chain = f->data;
+
+    out = ngx_quic_read_buffer(c, &qb, of->length);
+    if (out == NGX_CHAIN_ERROR) {
+        return NGX_ERROR;
+    }
+
+    f->data = out;
+
+    nf = ngx_quic_alloc_frame(c);
+    if (nf == NULL) {
+        return NGX_ERROR;
+    }
+
+    *nf = *f;
+    onf = &nf->u.ord;
+    onf->offset += of->length;
+    onf->length = shrink;
+    nf->len = ngx_quic_create_frame(NULL, nf);
+    nf->data = qb.chain;
+
+    if (f->type == NGX_QUIC_FT_STREAM) {
+        f->u.stream.fin = 0;
+    }
+
+    ngx_queue_insert_after(&f->queue, &nf->queue);
+
+    return NGX_OK;
+}
+
+
+ngx_chain_t *
+ngx_quic_copy_buffer(ngx_connection_t *c, u_char *data, size_t len)
+{
+    ngx_buf_t          buf;
+    ngx_chain_t        cl, *out;
+    ngx_quic_buffer_t  qb;
+
+    ngx_memzero(&buf, sizeof(ngx_buf_t));
+
+    buf.pos = data;
+    buf.last = buf.pos + len;
+    buf.temporary = 1;
+
+    cl.buf = &buf;
+    cl.next = NULL;
+
+    ngx_memzero(&qb, sizeof(ngx_quic_buffer_t));
+
+    if (ngx_quic_write_buffer(c, &qb, &cl, len, 0) == NGX_CHAIN_ERROR) {
+        return NGX_CHAIN_ERROR;
+    }
+
+    out = ngx_quic_read_buffer(c, &qb, len);
+    if (out == NGX_CHAIN_ERROR) {
+        return NGX_CHAIN_ERROR;
+    }
+
+    ngx_quic_free_buffer(c, &qb);
+
+    return out;
+}
+
+
+ngx_chain_t *
+ngx_quic_read_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb, uint64_t limit)
+{
+    uint64_t      n;
+    ngx_buf_t    *b;
+    ngx_chain_t  *out, **ll;
+
+    out = qb->chain;
+
+    for (ll = &out; *ll; ll = &(*ll)->next) {
+        b = (*ll)->buf;
+
+        if (b->sync) {
+            /* hole */
+            break;
+        }
+
+        if (limit == 0) {
+            break;
+        }
+
+        n = b->last - b->pos;
+
+        if (n > limit) {
+            if (ngx_quic_split_chain(c, *ll, limit) != NGX_OK) {
+                return NGX_CHAIN_ERROR;
+            }
+
+            n = limit;
+        }
+
+        limit -= n;
+        qb->offset += n;
+    }
+
+    if (qb->offset >= qb->last_offset) {
+        qb->last_chain = NULL;
+    }
+
+    qb->chain = *ll;
+    *ll = NULL;
+
+    return out;
+}
+
+
+void
+ngx_quic_skip_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb,
+    uint64_t offset)
+{
+    size_t        n;
+    ngx_buf_t    *b;
+    ngx_chain_t  *cl;
+
+    while (qb->chain) {
+        if (qb->offset >= offset) {
+            break;
+        }
+
+        cl = qb->chain;
+        b = cl->buf;
+        n = b->last - b->pos;
+
+        if (qb->offset + n > offset) {
+            n = offset - qb->offset;
+            b->pos += n;
+            qb->offset += n;
+            break;
+        }
+
+        qb->offset += n;
+        qb->chain = cl->next;
+
+        cl->next = NULL;
+        ngx_quic_free_chain(c, cl);
+    }
+
+    if (qb->chain == NULL) {
+        qb->offset = offset;
+    }
+
+    if (qb->offset >= qb->last_offset) {
+        qb->last_chain = NULL;
+    }
+}
+
+
+ngx_chain_t *
+ngx_quic_alloc_chain(ngx_connection_t *c)
+{
+    ngx_chain_t  *cl;
+
+    cl = ngx_alloc_chain_link(c->pool);
+    if (cl == NULL) {
+        return NULL;
+    }
+
+    cl->buf = ngx_quic_alloc_buf(c);
+    if (cl->buf == NULL) {
+        return NULL;
+    }
+
+    return cl;
+}
+
+
+ngx_chain_t *
+ngx_quic_write_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb,
+    ngx_chain_t *in, uint64_t limit, uint64_t offset)
+{
+    u_char       *p;
+    uint64_t      n, base;
+    ngx_buf_t    *b;
+    ngx_chain_t  *cl, **chain;
+
+    if (qb->last_chain && offset >= qb->last_offset) {
+        base = qb->last_offset;
+        chain = &qb->last_chain;
+
+    } else {
+        base = qb->offset;
+        chain = &qb->chain;
+    }
+
+    while (in && limit) {
+
+        if (offset < base) {
+            n = ngx_min((uint64_t) (in->buf->last - in->buf->pos),
+                        ngx_min(base - offset, limit));
+
+            in->buf->pos += n;
+            offset += n;
+            limit -= n;
+
+            if (in->buf->pos == in->buf->last) {
+                in = in->next;
+            }
+
+            continue;
+        }
+
+        cl = *chain;
+
+        if (cl == NULL) {
+            cl = ngx_quic_alloc_chain(c);
+            if (cl == NULL) {
+                return NGX_CHAIN_ERROR;
+            }
+
+            cl->buf->last = cl->buf->end;
+            cl->buf->sync = 1; /* hole */
+            cl->next = NULL;
+            *chain = cl;
+        }
+
+        b = cl->buf;
+        n = b->last - b->pos;
+
+        if (base + n <= offset) {
+            base += n;
+            chain = &cl->next;
+            continue;
+        }
+
+        if (b->sync && offset > base) {
+            if (ngx_quic_split_chain(c, cl, offset - base) != NGX_OK) {
+                return NGX_CHAIN_ERROR;
+            }
+
+            continue;
+        }
+
+        p = b->pos + (offset - base);
+
+        while (in) {
+
+            if (!ngx_buf_in_memory(in->buf) || in->buf->pos == in->buf->last) {
+                in = in->next;
+                continue;
+            }
+
+            if (p == b->last || limit == 0) {
+                break;
+            }
+
+            n = ngx_min(b->last - p, in->buf->last - in->buf->pos);
+            n = ngx_min(n, limit);
+
+            if (b->sync) {
+                ngx_memcpy(p, in->buf->pos, n);
+                qb->size += n;
+            }
+
+            p += n;
+            in->buf->pos += n;
+            offset += n;
+            limit -= n;
+        }
+
+        if (b->sync && p == b->last) {
+            b->sync = 0;
+            continue;
+        }
+
+        if (b->sync && p != b->pos) {
+            if (ngx_quic_split_chain(c, cl, p - b->pos) != NGX_OK) {
+                return NGX_CHAIN_ERROR;
+            }
+
+            b->sync = 0;
+        }
+    }
+
+    qb->last_offset = base;
+    qb->last_chain = *chain;
+
+    return in;
+}
+
+
+void
+ngx_quic_free_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb)
+{
+    ngx_quic_free_chain(c, qb->chain);
+
+    qb->chain = NULL;
+}
+
+
+#if (NGX_DEBUG)
+
+void
+ngx_quic_log_frame(ngx_log_t *log, ngx_quic_frame_t *f, ngx_uint_t tx)
+{
+    u_char      *p, *last, *pos, *end;
+    ssize_t      n;
+    uint64_t     gap, range, largest, smallest;
+    ngx_uint_t   i;
+    u_char       buf[NGX_MAX_ERROR_STR];
+
+    p = buf;
+    last = buf + sizeof(buf);
+
+    switch (f->type) {
+
+    case NGX_QUIC_FT_CRYPTO:
+        p = ngx_slprintf(p, last, "CRYPTO len:%uL off:%uL",
+                         f->u.crypto.length, f->u.crypto.offset);
+
+#ifdef NGX_QUIC_DEBUG_FRAMES
+        {
+            ngx_chain_t  *cl;
+
+            p = ngx_slprintf(p, last, " data:");
+
+            for (cl = f->data; cl; cl = cl->next) {
+                p = ngx_slprintf(p, last, "%*xs",
+                                 cl->buf->last - cl->buf->pos, cl->buf->pos);
+            }
+        }
+#endif
+
+        break;
+
+    case NGX_QUIC_FT_PADDING:
+        p = ngx_slprintf(p, last, "PADDING");
+        break;
+
+    case NGX_QUIC_FT_ACK:
+    case NGX_QUIC_FT_ACK_ECN:
+
+        p = ngx_slprintf(p, last, "ACK n:%ui delay:%uL ",
+                         f->u.ack.range_count, f->u.ack.delay);
+
+        if (f->data) {
+            pos = f->data->buf->pos;
+            end = f->data->buf->last;
+
+        } else {
+            pos = NULL;
+            end = NULL;
+        }
+
+        largest = f->u.ack.largest;
+        smallest = f->u.ack.largest - f->u.ack.first_range;
+
+        if (largest == smallest) {
+            p = ngx_slprintf(p, last, "%uL", largest);
+
+        } else {
+            p = ngx_slprintf(p, last, "%uL-%uL", largest, smallest);
+        }
+
+        for (i = 0; i < f->u.ack.range_count; i++) {
+            n = ngx_quic_parse_ack_range(log, pos, end, &gap, &range);
+            if (n == NGX_ERROR) {
+                break;
+            }
+
+            pos += n;
+
+            largest = smallest - gap - 2;
+            smallest = largest - range;
+
+            if (largest == smallest) {
+                p = ngx_slprintf(p, last, " %uL", largest);
+
+            } else {
+                p = ngx_slprintf(p, last, " %uL-%uL", largest, smallest);
+            }
+        }
+
+        if (f->type == NGX_QUIC_FT_ACK_ECN) {
+            p = ngx_slprintf(p, last, " ECN counters ect0:%uL ect1:%uL ce:%uL",
+                             f->u.ack.ect0, f->u.ack.ect1, f->u.ack.ce);
+        }
+        break;
+
+    case NGX_QUIC_FT_PING:
+        p = ngx_slprintf(p, last, "PING");
+        break;
+
+    case NGX_QUIC_FT_NEW_CONNECTION_ID:
+        p = ngx_slprintf(p, last,
+                         "NEW_CONNECTION_ID seq:%uL retire:%uL len:%ud",
+                         f->u.ncid.seqnum, f->u.ncid.retire, f->u.ncid.len);
+        break;
+
+    case NGX_QUIC_FT_RETIRE_CONNECTION_ID:
+        p = ngx_slprintf(p, last, "RETIRE_CONNECTION_ID seqnum:%uL",
+                         f->u.retire_cid.sequence_number);
+        break;
+
+    case NGX_QUIC_FT_CONNECTION_CLOSE:
+    case NGX_QUIC_FT_CONNECTION_CLOSE_APP:
+        p = ngx_slprintf(p, last, "CONNECTION_CLOSE%s err:%ui",
+                         f->type == NGX_QUIC_FT_CONNECTION_CLOSE ? "" : "_APP",
+                         f->u.close.error_code);
+
+        if (f->u.close.reason.len) {
+            p = ngx_slprintf(p, last, " %V", &f->u.close.reason);
+        }
+
+        if (f->type == NGX_QUIC_FT_CONNECTION_CLOSE) {
+            p = ngx_slprintf(p, last, " ft:%ui", f->u.close.frame_type);
+        }
+
+        break;
+
+    case NGX_QUIC_FT_STREAM:
+        p = ngx_slprintf(p, last, "STREAM id:0x%xL", f->u.stream.stream_id);
+
+        if (f->u.stream.off) {
+            p = ngx_slprintf(p, last, " off:%uL", f->u.stream.offset);
+        }
+
+        if (f->u.stream.len) {
+            p = ngx_slprintf(p, last, " len:%uL", f->u.stream.length);
+        }
+
+        if (f->u.stream.fin) {
+            p = ngx_slprintf(p, last, " fin:1");
+        }
+
+#ifdef NGX_QUIC_DEBUG_FRAMES
+        {
+            ngx_chain_t  *cl;
+
+            p = ngx_slprintf(p, last, " data:");
+
+            for (cl = f->data; cl; cl = cl->next) {
+                p = ngx_slprintf(p, last, "%*xs",
+                                 cl->buf->last - cl->buf->pos, cl->buf->pos);
+            }
+        }
+#endif
+
+        break;
+
+    case NGX_QUIC_FT_MAX_DATA:
+        p = ngx_slprintf(p, last, "MAX_DATA max_data:%uL on recv",
+                         f->u.max_data.max_data);
+        break;
+
+    case NGX_QUIC_FT_RESET_STREAM:
+        p = ngx_slprintf(p, last, "RESET_STREAM"
+                        " id:0x%xL error_code:0x%xL final_size:0x%xL",
+                        f->u.reset_stream.id, f->u.reset_stream.error_code,
+                        f->u.reset_stream.final_size);
+        break;
+
+    case NGX_QUIC_FT_STOP_SENDING:
+        p = ngx_slprintf(p, last, "STOP_SENDING id:0x%xL err:0x%xL",
+                         f->u.stop_sending.id, f->u.stop_sending.error_code);
+        break;
+
+    case NGX_QUIC_FT_STREAMS_BLOCKED:
+    case NGX_QUIC_FT_STREAMS_BLOCKED2:
+        p = ngx_slprintf(p, last, "STREAMS_BLOCKED limit:%uL bidi:%ui",
+                         f->u.streams_blocked.limit, f->u.streams_blocked.bidi);
+        break;
+
+    case NGX_QUIC_FT_MAX_STREAMS:
+    case NGX_QUIC_FT_MAX_STREAMS2:
+        p = ngx_slprintf(p, last, "MAX_STREAMS limit:%uL bidi:%ui",
+                         f->u.max_streams.limit, f->u.max_streams.bidi);
+        break;
+
+    case NGX_QUIC_FT_MAX_STREAM_DATA:
+        p = ngx_slprintf(p, last, "MAX_STREAM_DATA id:0x%xL limit:%uL",
+                         f->u.max_stream_data.id, f->u.max_stream_data.limit);
+        break;
+
+
+    case NGX_QUIC_FT_DATA_BLOCKED:
+        p = ngx_slprintf(p, last, "DATA_BLOCKED limit:%uL",
+                         f->u.data_blocked.limit);
+        break;
+
+    case NGX_QUIC_FT_STREAM_DATA_BLOCKED:
+        p = ngx_slprintf(p, last, "STREAM_DATA_BLOCKED id:0x%xL limit:%uL",
+                         f->u.stream_data_blocked.id,
+                         f->u.stream_data_blocked.limit);
+        break;
+
+    case NGX_QUIC_FT_PATH_CHALLENGE:
+        p = ngx_slprintf(p, last, "PATH_CHALLENGE data:0x%*xs",
+                         sizeof(f->u.path_challenge.data),
+                         f->u.path_challenge.data);
+        break;
+
+    case NGX_QUIC_FT_PATH_RESPONSE:
+        p = ngx_slprintf(p, last, "PATH_RESPONSE data:0x%*xs",
+                         sizeof(f->u.path_challenge.data),
+                         f->u.path_challenge.data);
+        break;
+
+    case NGX_QUIC_FT_NEW_TOKEN:
+        p = ngx_slprintf(p, last, "NEW_TOKEN");
+
+#ifdef NGX_QUIC_DEBUG_FRAMES
+        {
+            ngx_chain_t  *cl;
+
+            p = ngx_slprintf(p, last, " token:");
+
+            for (cl = f->data; cl; cl = cl->next) {
+                p = ngx_slprintf(p, last, "%*xs",
+                                 cl->buf->last - cl->buf->pos, cl->buf->pos);
+            }
+        }
+#endif
+
+        break;
+
+    case NGX_QUIC_FT_HANDSHAKE_DONE:
+        p = ngx_slprintf(p, last, "HANDSHAKE DONE");
+        break;
+
+    default:
+        p = ngx_slprintf(p, last, "unknown type 0x%xi", f->type);
+        break;
+    }
+
+    ngx_log_debug5(NGX_LOG_DEBUG_EVENT, log, 0, "quic frame %s %s:%uL %*s",
+                   tx ? "tx" : "rx", ngx_quic_level_name(f->level), f->pnum,
+                   p - buf, buf);
+}
+
+#endif
diff --git a/src/event/quic/ngx_event_quic_frames.h b/src/event/quic/ngx_event_quic_frames.h
new file mode 100644
index 0000000..2d55af9
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_frames.h
@@ -0,0 +1,45 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_FRAMES_H_INCLUDED_
+#define _NGX_EVENT_QUIC_FRAMES_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+typedef ngx_int_t (*ngx_quic_frame_handler_pt)(ngx_connection_t *c,
+    ngx_quic_frame_t *frame, void *data);
+
+
+ngx_quic_frame_t *ngx_quic_alloc_frame(ngx_connection_t *c);
+void ngx_quic_free_frame(ngx_connection_t *c, ngx_quic_frame_t *frame);
+void ngx_quic_free_frames(ngx_connection_t *c, ngx_queue_t *frames);
+void ngx_quic_queue_frame(ngx_quic_connection_t *qc, ngx_quic_frame_t *frame);
+ngx_int_t ngx_quic_split_frame(ngx_connection_t *c, ngx_quic_frame_t *f,
+    size_t len);
+
+ngx_chain_t *ngx_quic_alloc_chain(ngx_connection_t *c);
+void ngx_quic_free_chain(ngx_connection_t *c, ngx_chain_t *in);
+
+ngx_chain_t *ngx_quic_copy_buffer(ngx_connection_t *c, u_char *data,
+    size_t len);
+ngx_chain_t *ngx_quic_read_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb,
+    uint64_t limit);
+ngx_chain_t *ngx_quic_write_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb,
+    ngx_chain_t *in, uint64_t limit, uint64_t offset);
+void ngx_quic_skip_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb,
+    uint64_t offset);
+void ngx_quic_free_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb);
+
+#if (NGX_DEBUG)
+void ngx_quic_log_frame(ngx_log_t *log, ngx_quic_frame_t *f, ngx_uint_t tx);
+#else
+#define ngx_quic_log_frame(log, f, tx)
+#endif
+
+#endif /* _NGX_EVENT_QUIC_FRAMES_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_migration.c b/src/event/quic/ngx_event_quic_migration.c
new file mode 100644
index 0000000..2d1467e
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_migration.c
@@ -0,0 +1,1003 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+#define NGX_QUIC_PATH_MTU_DELAY       100
+#define NGX_QUIC_PATH_MTU_PRECISION   16
+
+
+static void ngx_quic_set_connection_path(ngx_connection_t *c,
+    ngx_quic_path_t *path);
+static ngx_int_t ngx_quic_validate_path(ngx_connection_t *c,
+    ngx_quic_path_t *path);
+static ngx_int_t ngx_quic_send_path_challenge(ngx_connection_t *c,
+    ngx_quic_path_t *path);
+static void ngx_quic_set_path_timer(ngx_connection_t *c);
+static ngx_int_t ngx_quic_expire_path_validation(ngx_connection_t *c,
+    ngx_quic_path_t *path);
+static ngx_int_t ngx_quic_expire_path_mtu_delay(ngx_connection_t *c,
+    ngx_quic_path_t *path);
+static ngx_int_t ngx_quic_expire_path_mtu_discovery(ngx_connection_t *c,
+    ngx_quic_path_t *path);
+static ngx_quic_path_t *ngx_quic_get_path(ngx_connection_t *c, ngx_uint_t tag);
+static ngx_int_t ngx_quic_send_path_mtu_probe(ngx_connection_t *c,
+    ngx_quic_path_t *path);
+
+
+ngx_int_t
+ngx_quic_handle_path_challenge_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_path_challenge_frame_t *f)
+{
+    size_t                  min;
+    ngx_quic_frame_t       *fp;
+    ngx_quic_connection_t  *qc;
+
+    if (pkt->level != ssl_encryption_application || pkt->path_challenged) {
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic ignoring PATH_CHALLENGE");
+        return NGX_OK;
+    }
+
+    pkt->path_challenged = 1;
+
+    qc = ngx_quic_get_connection(c);
+
+    fp = ngx_quic_alloc_frame(c);
+    if (fp == NULL) {
+        return NGX_ERROR;
+    }
+
+    fp->level = ssl_encryption_application;
+    fp->type = NGX_QUIC_FT_PATH_RESPONSE;
+    fp->u.path_response = *f;
+
+    /*
+     * RFC 9000, 8.2.2.  Path Validation Responses
+     *
+     * A PATH_RESPONSE frame MUST be sent on the network path where the
+     * PATH_CHALLENGE frame was received.
+     */
+
+    /*
+     * An endpoint MUST expand datagrams that contain a PATH_RESPONSE frame
+     * to at least the smallest allowed maximum datagram size of 1200 bytes.
+     * ...
+     * However, an endpoint MUST NOT expand the datagram containing the
+     * PATH_RESPONSE if the resulting data exceeds the anti-amplification limit.
+     */
+
+    min = (ngx_quic_path_limit(c, pkt->path, 1200) < 1200) ? 0 : 1200;
+
+    if (ngx_quic_frame_sendto(c, fp, min, pkt->path) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (pkt->path == qc->path) {
+        /*
+         * RFC 9000, 9.3.3.  Off-Path Packet Forwarding
+         *
+         * An endpoint that receives a PATH_CHALLENGE on an active path SHOULD
+         * send a non-probing packet in response.
+         */
+
+        fp = ngx_quic_alloc_frame(c);
+        if (fp == NULL) {
+            return NGX_ERROR;
+        }
+
+        fp->level = ssl_encryption_application;
+        fp->type = NGX_QUIC_FT_PING;
+
+        ngx_quic_queue_frame(qc, fp);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_handle_path_response_frame(ngx_connection_t *c,
+    ngx_quic_path_challenge_frame_t *f)
+{
+    ngx_uint_t              rst;
+    ngx_queue_t            *q;
+    ngx_quic_path_t        *path, *prev;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    /*
+     * RFC 9000, 8.2.3.  Successful Path Validation
+     *
+     * A PATH_RESPONSE frame received on any network path validates the path
+     * on which the PATH_CHALLENGE was sent.
+     */
+
+    for (q = ngx_queue_head(&qc->paths);
+         q != ngx_queue_sentinel(&qc->paths);
+         q = ngx_queue_next(q))
+    {
+        path = ngx_queue_data(q, ngx_quic_path_t, queue);
+
+        if (path->state != NGX_QUIC_PATH_VALIDATING) {
+            continue;
+        }
+
+        if (ngx_memcmp(path->challenge[0], f->data, sizeof(f->data)) == 0
+            || ngx_memcmp(path->challenge[1], f->data, sizeof(f->data)) == 0)
+        {
+            goto valid;
+        }
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic stale PATH_RESPONSE ignored");
+
+    return NGX_OK;
+
+valid:
+
+    /*
+     * RFC 9000, 9.4.  Loss Detection and Congestion Control
+     *
+     * On confirming a peer's ownership of its new address,
+     * an endpoint MUST immediately reset the congestion controller
+     * and round-trip time estimator for the new path to initial values
+     * unless the only change in the peer's address is its port number.
+     */
+
+    rst = 1;
+
+    prev = ngx_quic_get_path(c, NGX_QUIC_PATH_BACKUP);
+
+    if (prev != NULL) {
+
+        if (ngx_cmp_sockaddr(prev->sockaddr, prev->socklen,
+                             path->sockaddr, path->socklen, 0)
+            == NGX_OK)
+        {
+            /* address did not change */
+            rst = 0;
+
+            path->mtu = prev->mtu;
+            path->max_mtu = prev->max_mtu;
+            path->mtu_unvalidated = 0;
+        }
+    }
+
+    if (rst) {
+        /* prevent old path packets contribution to congestion control */
+
+        ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_application);
+        qc->rst_pnum = ctx->pnum;
+
+        ngx_memzero(&qc->congestion, sizeof(ngx_quic_congestion_t));
+
+        qc->congestion.window = ngx_min(10 * qc->tp.max_udp_payload_size,
+                                   ngx_max(2 * qc->tp.max_udp_payload_size,
+                                           14720));
+        qc->congestion.ssthresh = (size_t) -1;
+        qc->congestion.recovery_start = ngx_current_msec;
+
+        ngx_quic_init_rtt(qc);
+    }
+
+    path->validated = 1;
+
+    if (path->mtu_unvalidated) {
+        path->mtu_unvalidated = 0;
+        return ngx_quic_validate_path(c, path);
+    }
+
+    /*
+     * RFC 9000, 9.3.  Responding to Connection Migration
+     *
+     *  After verifying a new client address, the server SHOULD
+     *  send new address validation tokens (Section 8) to the client.
+     */
+
+    if (ngx_quic_send_new_token(c, path) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                  "quic path seq:%uL addr:%V successfully validated",
+                  path->seqnum, &path->addr_text);
+
+    ngx_quic_path_dbg(c, "is validated", path);
+
+    ngx_quic_discover_path_mtu(c, path);
+
+    return NGX_OK;
+}
+
+
+ngx_quic_path_t *
+ngx_quic_new_path(ngx_connection_t *c,
+    struct sockaddr *sockaddr, socklen_t socklen, ngx_quic_client_id_t *cid)
+{
+    ngx_queue_t            *q;
+    ngx_quic_path_t        *path;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (!ngx_queue_empty(&qc->free_paths)) {
+
+        q = ngx_queue_head(&qc->free_paths);
+        path = ngx_queue_data(q, ngx_quic_path_t, queue);
+
+        ngx_queue_remove(&path->queue);
+
+        ngx_memzero(path, sizeof(ngx_quic_path_t));
+
+    } else {
+
+        path = ngx_pcalloc(c->pool, sizeof(ngx_quic_path_t));
+        if (path == NULL) {
+            return NULL;
+        }
+    }
+
+    ngx_queue_insert_tail(&qc->paths, &path->queue);
+
+    path->cid = cid;
+    cid->used = 1;
+
+    path->seqnum = qc->path_seqnum++;
+
+    path->sockaddr = &path->sa.sockaddr;
+    path->socklen = socklen;
+    ngx_memcpy(path->sockaddr, sockaddr, socklen);
+
+    path->addr_text.data = path->text;
+    path->addr_text.len = ngx_sock_ntop(sockaddr, socklen, path->text,
+                                        NGX_SOCKADDR_STRLEN, 1);
+
+    path->mtu = NGX_QUIC_MIN_INITIAL_SIZE;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic path seq:%uL created addr:%V",
+                   path->seqnum, &path->addr_text);
+    return path;
+}
+
+
+static ngx_quic_path_t *
+ngx_quic_get_path(ngx_connection_t *c, ngx_uint_t tag)
+{
+    ngx_queue_t            *q;
+    ngx_quic_path_t        *path;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    for (q = ngx_queue_head(&qc->paths);
+         q != ngx_queue_sentinel(&qc->paths);
+         q = ngx_queue_next(q))
+    {
+        path = ngx_queue_data(q, ngx_quic_path_t, queue);
+
+        if (path->tag == tag) {
+            return path;
+        }
+    }
+
+    return NULL;
+}
+
+
+ngx_int_t
+ngx_quic_set_path(ngx_connection_t *c, ngx_quic_header_t *pkt)
+{
+    off_t                   len;
+    ngx_queue_t            *q;
+    ngx_quic_path_t        *path, *probe;
+    ngx_quic_socket_t      *qsock;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_client_id_t   *cid;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    qsock = ngx_quic_get_socket(c);
+
+    len = pkt->raw->last - pkt->raw->start;
+
+    if (c->udp->buffer == NULL) {
+        /* first ever packet in connection, path already exists  */
+        path = qc->path;
+        goto update;
+    }
+
+    probe = NULL;
+
+    for (q = ngx_queue_head(&qc->paths);
+         q != ngx_queue_sentinel(&qc->paths);
+         q = ngx_queue_next(q))
+    {
+        path = ngx_queue_data(q, ngx_quic_path_t, queue);
+
+        if (ngx_cmp_sockaddr(&qsock->sockaddr.sockaddr, qsock->socklen,
+                             path->sockaddr, path->socklen, 1)
+            == NGX_OK)
+        {
+            goto update;
+        }
+
+        if (path->tag == NGX_QUIC_PATH_PROBE) {
+            probe = path;
+        }
+    }
+
+    /* packet from new path, drop current probe, if any */
+
+    ctx = ngx_quic_get_send_ctx(qc, pkt->level);
+
+    /*
+     * only accept highest-numbered packets to prevent connection id
+     * exhaustion by excessive probing packets from unknown paths
+     */
+    if (pkt->pn != ctx->largest_pn) {
+        return NGX_DONE;
+    }
+
+    if (probe && ngx_quic_free_path(c, probe) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    /* new path requires new client id */
+    cid = ngx_quic_next_client_id(c);
+    if (cid == NULL) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic no available client ids for new path");
+        /* stop processing of this datagram */
+        return NGX_DONE;
+    }
+
+    path = ngx_quic_new_path(c, &qsock->sockaddr.sockaddr, qsock->socklen, cid);
+    if (path == NULL) {
+        return NGX_ERROR;
+    }
+
+    path->tag = NGX_QUIC_PATH_PROBE;
+
+    /*
+     * client arrived using new path and previously seen DCID,
+     * this indicates NAT rebinding (or bad client)
+     */
+    if (qsock->used) {
+        pkt->rebound = 1;
+    }
+
+update:
+
+    qsock->used = 1;
+    pkt->path = path;
+
+    /* TODO: this may be too late in some cases;
+     *       for example, if error happens during decrypt(), we cannot
+     *       send CC, if error happens in 1st packet, due to amplification
+     *       limit, because path->received = 0
+     *
+     *       should we account garbage as received or only decrypting packets?
+     */
+    path->received += len;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic packet len:%O via sock seq:%L path seq:%uL",
+                   len, (int64_t) qsock->sid.seqnum, path->seqnum);
+    ngx_quic_path_dbg(c, "status", path);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_free_path(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    ngx_queue_remove(&path->queue);
+    ngx_queue_insert_head(&qc->free_paths, &path->queue);
+
+    /*
+     * invalidate CID that is no longer usable for any other path;
+     * this also requests new CIDs from client
+     */
+    if (path->cid) {
+        if (ngx_quic_free_client_id(c, path->cid) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic path seq:%uL addr:%V retired",
+                   path->seqnum, &path->addr_text);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_set_connection_path(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    ngx_memcpy(c->sockaddr, path->sockaddr, path->socklen);
+    c->socklen = path->socklen;
+
+    if (c->addr_text.data) {
+        c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->socklen,
+                                         c->addr_text.data,
+                                         c->listening->addr_text_max_len, 0);
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic send path set to seq:%uL addr:%V",
+                   path->seqnum, &path->addr_text);
+}
+
+
+ngx_int_t
+ngx_quic_handle_migration(ngx_connection_t *c, ngx_quic_header_t *pkt)
+{
+    ngx_quic_path_t        *next, *bkp;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    /* got non-probing packet via non-active path */
+
+    qc = ngx_quic_get_connection(c);
+
+    ctx = ngx_quic_get_send_ctx(qc, pkt->level);
+
+    /*
+     * RFC 9000, 9.3.  Responding to Connection Migration
+     *
+     * An endpoint only changes the address to which it sends packets in
+     * response to the highest-numbered non-probing packet.
+     */
+    if (pkt->pn != ctx->largest_pn) {
+        return NGX_OK;
+    }
+
+    next = pkt->path;
+
+    /*
+     * RFC 9000, 9.3.3:
+     *
+     * In response to an apparent migration, endpoints MUST validate the
+     * previously active path using a PATH_CHALLENGE frame.
+     */
+    if (pkt->rebound) {
+
+        /* NAT rebinding: client uses new path with old SID */
+        if (ngx_quic_validate_path(c, qc->path) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (qc->path->validated) {
+
+        if (next->tag != NGX_QUIC_PATH_BACKUP) {
+            /* can delete backup path, if any */
+            bkp = ngx_quic_get_path(c, NGX_QUIC_PATH_BACKUP);
+
+            if (bkp && ngx_quic_free_path(c, bkp) != NGX_OK) {
+                return NGX_ERROR;
+            }
+        }
+
+        qc->path->tag = NGX_QUIC_PATH_BACKUP;
+        ngx_quic_path_dbg(c, "is now backup", qc->path);
+
+    } else {
+        if (ngx_quic_free_path(c, qc->path) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    /* switch active path to migrated */
+    qc->path = next;
+    qc->path->tag = NGX_QUIC_PATH_ACTIVE;
+
+    ngx_quic_set_connection_path(c, next);
+
+    if (!next->validated && next->state != NGX_QUIC_PATH_VALIDATING) {
+        if (ngx_quic_validate_path(c, next) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                  "quic migrated to path seq:%uL addr:%V",
+                  qc->path->seqnum, &qc->path->addr_text);
+
+    ngx_quic_path_dbg(c, "is now active", qc->path);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_validate_path(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    ngx_msec_t              pto;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic initiated validation of path seq:%uL", path->seqnum);
+
+    path->tries = 0;
+
+    if (RAND_bytes((u_char *) path->challenge, sizeof(path->challenge)) != 1) {
+        return NGX_ERROR;
+    }
+
+    (void) ngx_quic_send_path_challenge(c, path);
+
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_application);
+    pto = ngx_max(ngx_quic_pto(c, ctx), 1000);
+
+    path->expires = ngx_current_msec + pto;
+    path->state = NGX_QUIC_PATH_VALIDATING;
+
+    ngx_quic_set_path_timer(c);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_send_path_challenge(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    size_t             min;
+    ngx_uint_t         n;
+    ngx_quic_frame_t  *frame;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic path seq:%uL send path_challenge tries:%ui",
+                   path->seqnum, path->tries);
+
+    for (n = 0; n < 2; n++) {
+
+        frame = ngx_quic_alloc_frame(c);
+        if (frame == NULL) {
+            return NGX_ERROR;
+        }
+
+        frame->level = ssl_encryption_application;
+        frame->type = NGX_QUIC_FT_PATH_CHALLENGE;
+
+        ngx_memcpy(frame->u.path_challenge.data, path->challenge[n], 8);
+
+        /*
+         * RFC 9000, 8.2.1.  Initiating Path Validation
+         *
+         * An endpoint MUST expand datagrams that contain a PATH_CHALLENGE frame
+         * to at least the smallest allowed maximum datagram size of 1200 bytes,
+         * unless the anti-amplification limit for the path does not permit
+         * sending a datagram of this size.
+         */
+
+        if (path->mtu_unvalidated
+            || ngx_quic_path_limit(c, path, 1200) < 1200)
+        {
+            min = 0;
+            path->mtu_unvalidated = 1;
+
+        } else {
+            min = 1200;
+        }
+
+        if (ngx_quic_frame_sendto(c, frame, min, path) == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+void
+ngx_quic_discover_path_mtu(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (path->max_mtu) {
+        if (path->max_mtu - path->mtu <= NGX_QUIC_PATH_MTU_PRECISION) {
+            path->state = NGX_QUIC_PATH_IDLE;
+            ngx_quic_set_path_timer(c);
+            return;
+        }
+
+        path->mtud = (path->mtu + path->max_mtu) / 2;
+
+    } else {
+        path->mtud = path->mtu * 2;
+
+        if (path->mtud >= qc->ctp.max_udp_payload_size) {
+            path->mtud = qc->ctp.max_udp_payload_size;
+            path->max_mtu = qc->ctp.max_udp_payload_size;
+        }
+    }
+
+    path->state = NGX_QUIC_PATH_WAITING;
+    path->expires = ngx_current_msec + NGX_QUIC_PATH_MTU_DELAY;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic path seq:%uL schedule mtu:%uz",
+                   path->seqnum, path->mtud);
+
+    ngx_quic_set_path_timer(c);
+}
+
+
+static void
+ngx_quic_set_path_timer(ngx_connection_t *c)
+{
+    ngx_msec_t              now;
+    ngx_queue_t            *q;
+    ngx_msec_int_t          left, next;
+    ngx_quic_path_t        *path;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    now = ngx_current_msec;
+    next = -1;
+
+    for (q = ngx_queue_head(&qc->paths);
+         q != ngx_queue_sentinel(&qc->paths);
+         q = ngx_queue_next(q))
+    {
+        path = ngx_queue_data(q, ngx_quic_path_t, queue);
+
+        if (path->state == NGX_QUIC_PATH_IDLE) {
+            continue;
+        }
+
+        left = path->expires - now;
+        left = ngx_max(left, 1);
+
+        if (next == -1 || left < next) {
+            next = left;
+        }
+    }
+
+    if (next != -1) {
+        ngx_add_timer(&qc->path_validation, next);
+
+    } else if (qc->path_validation.timer_set) {
+        ngx_del_timer(&qc->path_validation);
+    }
+}
+
+
+void
+ngx_quic_path_handler(ngx_event_t *ev)
+{
+    ngx_msec_t              now;
+    ngx_queue_t            *q;
+    ngx_msec_int_t          left;
+    ngx_quic_path_t        *path;
+    ngx_connection_t       *c;
+    ngx_quic_connection_t  *qc;
+
+    c = ev->data;
+    qc = ngx_quic_get_connection(c);
+
+    now = ngx_current_msec;
+
+    q = ngx_queue_head(&qc->paths);
+
+    while (q != ngx_queue_sentinel(&qc->paths)) {
+
+        path = ngx_queue_data(q, ngx_quic_path_t, queue);
+        q = ngx_queue_next(q);
+
+        if (path->state == NGX_QUIC_PATH_IDLE) {
+            continue;
+        }
+
+        left = path->expires - now;
+
+        if (left > 0) {
+            continue;
+        }
+
+        switch (path->state) {
+        case NGX_QUIC_PATH_VALIDATING:
+            if (ngx_quic_expire_path_validation(c, path) != NGX_OK) {
+                goto failed;
+            }
+
+            break;
+
+        case NGX_QUIC_PATH_WAITING:
+            if (ngx_quic_expire_path_mtu_delay(c, path) != NGX_OK) {
+                goto failed;
+            }
+
+            break;
+
+        case NGX_QUIC_PATH_MTUD:
+            if (ngx_quic_expire_path_mtu_discovery(c, path) != NGX_OK) {
+                goto failed;
+            }
+
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    ngx_quic_set_path_timer(c);
+
+    return;
+
+failed:
+
+    ngx_quic_close_connection(c, NGX_ERROR);
+}
+
+
+static ngx_int_t
+ngx_quic_expire_path_validation(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    ngx_msec_int_t          pto;
+    ngx_quic_path_t        *bkp;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_application);
+
+    if (++path->tries < NGX_QUIC_PATH_RETRIES) {
+        pto = ngx_max(ngx_quic_pto(c, ctx), 1000) << path->tries;
+        path->expires = ngx_current_msec + pto;
+
+        (void) ngx_quic_send_path_challenge(c, path);
+
+        return NGX_OK;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic path seq:%uL validation failed", path->seqnum);
+
+    /* found expired path */
+
+    path->validated = 0;
+
+
+    /* RFC 9000, 9.3.2.  On-Path Address Spoofing
+     *
+     * To protect the connection from failing due to such a spurious
+     * migration, an endpoint MUST revert to using the last validated
+     * peer address when validation of a new peer address fails.
+     */
+
+    if (qc->path == path) {
+        /* active path validation failed */
+
+        bkp = ngx_quic_get_path(c, NGX_QUIC_PATH_BACKUP);
+
+        if (bkp == NULL) {
+            qc->error = NGX_QUIC_ERR_NO_VIABLE_PATH;
+            qc->error_reason = "no viable path";
+            return NGX_ERROR;
+        }
+
+        qc->path = bkp;
+        qc->path->tag = NGX_QUIC_PATH_ACTIVE;
+
+        ngx_quic_set_connection_path(c, qc->path);
+
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic path seq:%uL addr:%V is restored from backup",
+                      qc->path->seqnum, &qc->path->addr_text);
+
+        ngx_quic_path_dbg(c, "is active", qc->path);
+    }
+
+    return ngx_quic_free_path(c, path);
+}
+
+
+static ngx_int_t
+ngx_quic_expire_path_mtu_delay(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    ngx_int_t               rc;
+    ngx_uint_t              i;
+    ngx_msec_t              pto;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_application);
+
+    path->tries = 0;
+
+    for ( ;; ) {
+
+        for (i = 0; i < NGX_QUIC_PATH_RETRIES; i++) {
+            path->mtu_pnum[i] = NGX_QUIC_UNSET_PN;
+        }
+
+        rc = ngx_quic_send_path_mtu_probe(c, path);
+
+        if (rc == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        if (rc == NGX_OK) {
+            pto = ngx_quic_pto(c, ctx);
+            path->expires = ngx_current_msec + pto;
+            path->state = NGX_QUIC_PATH_MTUD;
+            return NGX_OK;
+        }
+
+        /* rc == NGX_DECLINED */
+
+        path->max_mtu = path->mtud;
+
+        if (path->max_mtu - path->mtu <= NGX_QUIC_PATH_MTU_PRECISION) {
+            path->state = NGX_QUIC_PATH_IDLE;
+            return NGX_OK;
+        }
+
+        path->mtud = (path->mtu + path->max_mtu) / 2;
+    }
+}
+
+
+static ngx_int_t
+ngx_quic_expire_path_mtu_discovery(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    ngx_int_t               rc;
+    ngx_msec_int_t          pto;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_application);
+
+    if (++path->tries < NGX_QUIC_PATH_RETRIES) {
+        rc = ngx_quic_send_path_mtu_probe(c, path);
+
+        if (rc == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        if (rc == NGX_OK) {
+            pto = ngx_quic_pto(c, ctx) << path->tries;
+            path->expires = ngx_current_msec + pto;
+            return NGX_OK;
+        }
+
+        /* rc == NGX_DECLINED */
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic path seq:%uL expired mtu:%uz",
+                   path->seqnum, path->mtud);
+
+    path->max_mtu = path->mtud;
+
+    ngx_quic_discover_path_mtu(c, path);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_send_path_mtu_probe(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    size_t                  mtu;
+    uint64_t                pnum;
+    ngx_int_t               rc;
+    ngx_uint_t              log_error;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_PING;
+
+    qc = ngx_quic_get_connection(c);
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_application);
+    pnum = ctx->pnum;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic path seq:%uL send probe "
+                   "mtu:%uz pnum:%uL tries:%ui",
+                   path->seqnum, path->mtud, ctx->pnum, path->tries);
+
+    log_error = c->log_error;
+    c->log_error = NGX_ERROR_IGNORE_EMSGSIZE;
+
+    mtu = path->mtu;
+    path->mtu = path->mtud;
+
+    rc = ngx_quic_frame_sendto(c, frame, path->mtud, path);
+
+    path->mtu = mtu;
+    c->log_error = log_error;
+
+    if (rc == NGX_OK) {
+        path->mtu_pnum[path->tries] = pnum;
+        return NGX_OK;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic path seq:%uL rejected mtu:%uz",
+                   path->seqnum, path->mtud);
+
+    if (rc == NGX_ERROR) {
+        if (c->write->error) {
+            c->write->error = 0;
+            return NGX_DECLINED;
+        }
+
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_handle_path_mtu(ngx_connection_t *c, ngx_quic_path_t *path,
+    uint64_t min, uint64_t max)
+{
+    uint64_t    pnum;
+    ngx_uint_t  i;
+
+    if (path->state != NGX_QUIC_PATH_MTUD) {
+        return NGX_OK;
+    }
+
+    for (i = 0; i < NGX_QUIC_PATH_RETRIES; i++) {
+        pnum = path->mtu_pnum[i];
+
+        if (pnum == NGX_QUIC_UNSET_PN) {
+            continue;
+        }
+
+        if (pnum < min || pnum > max) {
+            continue;
+        }
+
+        path->mtu = path->mtud;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic path seq:%uL ack mtu:%uz",
+                       path->seqnum, path->mtu);
+
+        ngx_quic_discover_path_mtu(c, path);
+
+        break;
+    }
+
+    return NGX_OK;
+}
diff --git a/src/event/quic/ngx_event_quic_migration.h b/src/event/quic/ngx_event_quic_migration.h
new file mode 100644
index 0000000..270c572
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_migration.h
@@ -0,0 +1,45 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_MIGRATION_H_INCLUDED_
+#define _NGX_EVENT_QUIC_MIGRATION_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+#define NGX_QUIC_PATH_RETRIES   3
+
+#define NGX_QUIC_PATH_PROBE     0
+#define NGX_QUIC_PATH_ACTIVE    1
+#define NGX_QUIC_PATH_BACKUP    2
+
+#define ngx_quic_path_dbg(c, msg, path)                                       \
+    ngx_log_debug7(NGX_LOG_DEBUG_EVENT, c->log, 0,                            \
+                   "quic path seq:%uL %s tx:%O rx:%O valid:%d st:%d mtu:%uz", \
+                   path->seqnum, msg, path->sent, path->received,             \
+                   path->validated, path->state, path->mtu);
+
+ngx_int_t ngx_quic_handle_path_challenge_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_path_challenge_frame_t *f);
+ngx_int_t ngx_quic_handle_path_response_frame(ngx_connection_t *c,
+    ngx_quic_path_challenge_frame_t *f);
+
+ngx_quic_path_t *ngx_quic_new_path(ngx_connection_t *c,
+    struct sockaddr *sockaddr, socklen_t socklen, ngx_quic_client_id_t *cid);
+ngx_int_t ngx_quic_free_path(ngx_connection_t *c, ngx_quic_path_t *path);
+
+ngx_int_t ngx_quic_set_path(ngx_connection_t *c, ngx_quic_header_t *pkt);
+ngx_int_t ngx_quic_handle_migration(ngx_connection_t *c,
+    ngx_quic_header_t *pkt);
+
+void ngx_quic_path_handler(ngx_event_t *ev);
+
+void ngx_quic_discover_path_mtu(ngx_connection_t *c, ngx_quic_path_t *path);
+ngx_int_t ngx_quic_handle_path_mtu(ngx_connection_t *c,
+    ngx_quic_path_t *path, uint64_t min, uint64_t max);
+
+#endif /* _NGX_EVENT_QUIC_MIGRATION_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_openssl_compat.c b/src/event/quic/ngx_event_quic_openssl_compat.c
new file mode 100644
index 0000000..c7412e8
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_openssl_compat.c
@@ -0,0 +1,651 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+#if (NGX_QUIC_OPENSSL_COMPAT)
+
+#define NGX_QUIC_COMPAT_RECORD_SIZE          1024
+
+#define NGX_QUIC_COMPAT_SSL_TP_EXT           0x39
+
+#define NGX_QUIC_COMPAT_CLIENT_HANDSHAKE     "CLIENT_HANDSHAKE_TRAFFIC_SECRET"
+#define NGX_QUIC_COMPAT_SERVER_HANDSHAKE     "SERVER_HANDSHAKE_TRAFFIC_SECRET"
+#define NGX_QUIC_COMPAT_CLIENT_APPLICATION   "CLIENT_TRAFFIC_SECRET_0"
+#define NGX_QUIC_COMPAT_SERVER_APPLICATION   "SERVER_TRAFFIC_SECRET_0"
+
+
+typedef struct {
+    ngx_quic_secret_t             secret;
+    ngx_uint_t                    cipher;
+} ngx_quic_compat_keys_t;
+
+
+typedef struct {
+    ngx_log_t                    *log;
+
+    u_char                        type;
+    ngx_str_t                     payload;
+    uint64_t                      number;
+    ngx_quic_compat_keys_t       *keys;
+
+    enum ssl_encryption_level_t   level;
+} ngx_quic_compat_record_t;
+
+
+struct ngx_quic_compat_s {
+    const SSL_QUIC_METHOD        *method;
+
+    enum ssl_encryption_level_t   write_level;
+
+    uint64_t                      read_record;
+    ngx_quic_compat_keys_t        keys;
+
+    ngx_str_t                     tp;
+    ngx_str_t                     ctp;
+};
+
+
+static void ngx_quic_compat_keylog_callback(const SSL *ssl, const char *line);
+static ngx_int_t ngx_quic_compat_set_encryption_secret(ngx_connection_t *c,
+    ngx_quic_compat_keys_t *keys, enum ssl_encryption_level_t level,
+    const SSL_CIPHER *cipher, const uint8_t *secret, size_t secret_len);
+static void ngx_quic_compat_cleanup_encryption_secret(void *data);
+static int ngx_quic_compat_add_transport_params_callback(SSL *ssl,
+    unsigned int ext_type, unsigned int context, const unsigned char **out,
+    size_t *outlen, X509 *x, size_t chainidx, int *al, void *add_arg);
+static int ngx_quic_compat_parse_transport_params_callback(SSL *ssl,
+    unsigned int ext_type, unsigned int context, const unsigned char *in,
+    size_t inlen, X509 *x, size_t chainidx, int *al, void *parse_arg);
+static void ngx_quic_compat_message_callback(int write_p, int version,
+    int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
+static size_t ngx_quic_compat_create_header(ngx_quic_compat_record_t *rec,
+    u_char *out, ngx_uint_t plain);
+static ngx_int_t ngx_quic_compat_create_record(ngx_quic_compat_record_t *rec,
+    ngx_str_t *res);
+
+
+ngx_int_t
+ngx_quic_compat_init(ngx_conf_t *cf, SSL_CTX *ctx)
+{
+    SSL_CTX_set_keylog_callback(ctx, ngx_quic_compat_keylog_callback);
+
+    if (SSL_CTX_has_client_custom_ext(ctx, NGX_QUIC_COMPAT_SSL_TP_EXT)) {
+        return NGX_OK;
+    }
+
+    if (SSL_CTX_add_custom_ext(ctx, NGX_QUIC_COMPAT_SSL_TP_EXT,
+                               SSL_EXT_CLIENT_HELLO
+                               |SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
+                               ngx_quic_compat_add_transport_params_callback,
+                               NULL,
+                               NULL,
+                               ngx_quic_compat_parse_transport_params_callback,
+                               NULL)
+        == 0)
+    {
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "SSL_CTX_add_custom_ext() failed");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_compat_keylog_callback(const SSL *ssl, const char *line)
+{
+    u_char                        ch, *p, *start, value;
+    size_t                        n;
+    ngx_uint_t                    write;
+    const SSL_CIPHER             *cipher;
+    ngx_quic_compat_t            *com;
+    ngx_connection_t             *c;
+    ngx_quic_connection_t        *qc;
+    enum ssl_encryption_level_t   level;
+    u_char                        secret[EVP_MAX_MD_SIZE];
+
+    c = ngx_ssl_get_connection(ssl);
+    if (c->type != SOCK_DGRAM) {
+        return;
+    }
+
+    p = (u_char *) line;
+
+    for (start = p; *p && *p != ' '; p++);
+
+    n = p - start;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic compat secret %*s", n, start);
+
+    if (n == sizeof(NGX_QUIC_COMPAT_CLIENT_HANDSHAKE) - 1
+        && ngx_strncmp(start, NGX_QUIC_COMPAT_CLIENT_HANDSHAKE, n) == 0)
+    {
+        level = ssl_encryption_handshake;
+        write = 0;
+
+    } else if (n == sizeof(NGX_QUIC_COMPAT_SERVER_HANDSHAKE) - 1
+               && ngx_strncmp(start, NGX_QUIC_COMPAT_SERVER_HANDSHAKE, n) == 0)
+    {
+        level = ssl_encryption_handshake;
+        write = 1;
+
+    } else if (n == sizeof(NGX_QUIC_COMPAT_CLIENT_APPLICATION) - 1
+               && ngx_strncmp(start, NGX_QUIC_COMPAT_CLIENT_APPLICATION, n)
+                  == 0)
+    {
+        level = ssl_encryption_application;
+        write = 0;
+
+    } else if (n == sizeof(NGX_QUIC_COMPAT_SERVER_APPLICATION) - 1
+               && ngx_strncmp(start, NGX_QUIC_COMPAT_SERVER_APPLICATION, n)
+                   == 0)
+    {
+        level = ssl_encryption_application;
+        write = 1;
+
+    } else {
+        return;
+    }
+
+    if (*p++ == '\0') {
+        return;
+    }
+
+    for ( /* void */ ; *p && *p != ' '; p++);
+
+    if (*p++ == '\0') {
+        return;
+    }
+
+    for (n = 0, start = p; *p; p++) {
+        ch = *p;
+
+        if (ch >= '0' && ch <= '9') {
+            value = ch - '0';
+            goto next;
+        }
+
+        ch = (u_char) (ch | 0x20);
+
+        if (ch >= 'a' && ch <= 'f') {
+            value = ch - 'a' + 10;
+            goto next;
+        }
+
+        ngx_log_error(NGX_LOG_EMERG, c->log, 0,
+                      "invalid OpenSSL QUIC secret format");
+
+        return;
+
+    next:
+
+        if ((p - start) % 2) {
+            secret[n++] += value;
+
+        } else {
+            if (n >= EVP_MAX_MD_SIZE) {
+                ngx_log_error(NGX_LOG_EMERG, c->log, 0,
+                              "too big OpenSSL QUIC secret");
+                return;
+            }
+
+            secret[n] = (value << 4);
+        }
+    }
+
+    qc = ngx_quic_get_connection(c);
+    com = qc->compat;
+    cipher = SSL_get_current_cipher(ssl);
+
+    if (write) {
+        com->method->set_write_secret((SSL *) ssl, level, cipher, secret, n);
+        com->write_level = level;
+
+    } else {
+        com->method->set_read_secret((SSL *) ssl, level, cipher, secret, n);
+        com->read_record = 0;
+
+        (void) ngx_quic_compat_set_encryption_secret(c, &com->keys, level,
+                                                     cipher, secret, n);
+    }
+
+    ngx_explicit_memzero(secret, n);
+}
+
+
+static ngx_int_t
+ngx_quic_compat_set_encryption_secret(ngx_connection_t *c,
+    ngx_quic_compat_keys_t *keys, enum ssl_encryption_level_t level,
+    const SSL_CIPHER *cipher, const uint8_t *secret, size_t secret_len)
+{
+    ngx_int_t            key_len;
+    ngx_str_t            secret_str;
+    ngx_uint_t           i;
+    ngx_quic_md_t        key;
+    ngx_quic_hkdf_t      seq[2];
+    ngx_quic_secret_t   *peer_secret;
+    ngx_quic_ciphers_t   ciphers;
+    ngx_pool_cleanup_t  *cln;
+
+    peer_secret = &keys->secret;
+
+    keys->cipher = SSL_CIPHER_get_id(cipher);
+
+    key_len = ngx_quic_ciphers(keys->cipher, &ciphers);
+
+    if (key_len == NGX_ERROR) {
+        ngx_ssl_error(NGX_LOG_INFO, c->log, 0, "unexpected cipher");
+        return NGX_ERROR;
+    }
+
+    key.len = key_len;
+
+    peer_secret->iv.len = NGX_QUIC_IV_LEN;
+
+    secret_str.len = secret_len;
+    secret_str.data = (u_char *) secret;
+
+    ngx_quic_hkdf_set(&seq[0], "tls13 key", &key, &secret_str);
+    ngx_quic_hkdf_set(&seq[1], "tls13 iv", &peer_secret->iv, &secret_str);
+
+    for (i = 0; i < (sizeof(seq) / sizeof(seq[0])); i++) {
+        if (ngx_quic_hkdf_expand(&seq[i], ciphers.d, c->log) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    /* register cleanup handler once */
+
+    if (peer_secret->ctx) {
+        ngx_quic_crypto_cleanup(peer_secret);
+
+    } else {
+        cln = ngx_pool_cleanup_add(c->pool, 0);
+        if (cln == NULL) {
+            return NGX_ERROR;
+        }
+
+        cln->handler = ngx_quic_compat_cleanup_encryption_secret;
+        cln->data = peer_secret;
+    }
+
+    if (ngx_quic_crypto_init(ciphers.c, peer_secret, &key, 1, c->log)
+        == NGX_ERROR)
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_explicit_memzero(key.data, key.len);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_compat_cleanup_encryption_secret(void *data)
+{
+    ngx_quic_secret_t *secret = data;
+
+    ngx_quic_crypto_cleanup(secret);
+}
+
+
+static int
+ngx_quic_compat_add_transport_params_callback(SSL *ssl, unsigned int ext_type,
+    unsigned int context, const unsigned char **out, size_t *outlen, X509 *x,
+    size_t chainidx, int *al, void *add_arg)
+{
+    ngx_connection_t       *c;
+    ngx_quic_compat_t      *com;
+    ngx_quic_connection_t  *qc;
+
+    c = ngx_ssl_get_connection(ssl);
+    if (c->type != SOCK_DGRAM) {
+        return 0;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic compat add transport params");
+
+    qc = ngx_quic_get_connection(c);
+    com = qc->compat;
+
+    *out = com->tp.data;
+    *outlen = com->tp.len;
+
+    return 1;
+}
+
+
+static int
+ngx_quic_compat_parse_transport_params_callback(SSL *ssl, unsigned int ext_type,
+    unsigned int context, const unsigned char *in, size_t inlen, X509 *x,
+    size_t chainidx, int *al, void *parse_arg)
+{
+    u_char                 *p;
+    ngx_connection_t       *c;
+    ngx_quic_compat_t      *com;
+    ngx_quic_connection_t  *qc;
+
+    c = ngx_ssl_get_connection(ssl);
+    if (c->type != SOCK_DGRAM) {
+        return 0;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic compat parse transport params");
+
+    qc = ngx_quic_get_connection(c);
+    com = qc->compat;
+
+    p = ngx_pnalloc(c->pool, inlen);
+    if (p == NULL) {
+        return 0;
+    }
+
+    ngx_memcpy(p, in, inlen);
+
+    com->ctp.data = p;
+    com->ctp.len = inlen;
+
+    return 1;
+}
+
+
+int
+SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method)
+{
+    BIO                    *rbio, *wbio;
+    ngx_connection_t       *c;
+    ngx_quic_compat_t      *com;
+    ngx_quic_connection_t  *qc;
+
+    c = ngx_ssl_get_connection(ssl);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic compat set method");
+
+    qc = ngx_quic_get_connection(c);
+
+    qc->compat = ngx_pcalloc(c->pool, sizeof(ngx_quic_compat_t));
+    if (qc->compat == NULL) {
+        return 0;
+    }
+
+    com = qc->compat;
+    com->method = quic_method;
+
+    rbio = BIO_new(BIO_s_mem());
+    if (rbio == NULL) {
+        return 0;
+    }
+
+    wbio = BIO_new(BIO_s_null());
+    if (wbio == NULL) {
+        return 0;
+    }
+
+    SSL_set_bio(ssl, rbio, wbio);
+
+    SSL_set_msg_callback(ssl, ngx_quic_compat_message_callback);
+
+    /* early data is not supported */
+    SSL_set_max_early_data(ssl, 0);
+
+    return 1;
+}
+
+
+static void
+ngx_quic_compat_message_callback(int write_p, int version, int content_type,
+    const void *buf, size_t len, SSL *ssl, void *arg)
+{
+    ngx_uint_t                    alert;
+    ngx_connection_t             *c;
+    ngx_quic_compat_t            *com;
+    ngx_quic_connection_t        *qc;
+    enum ssl_encryption_level_t   level;
+
+    if (!write_p) {
+        return;
+    }
+
+    c = ngx_ssl_get_connection(ssl);
+    qc = ngx_quic_get_connection(c);
+
+    if (qc == NULL) {
+        /* closing */
+        return;
+    }
+
+    com = qc->compat;
+    level = com->write_level;
+
+    switch (content_type) {
+
+    case SSL3_RT_HANDSHAKE:
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic compat tx %s len:%uz ",
+                       ngx_quic_level_name(level), len);
+
+        if (com->method->add_handshake_data(ssl, level, buf, len) != 1) {
+            goto failed;
+        }
+
+        break;
+
+    case SSL3_RT_ALERT:
+        if (len >= 2) {
+            alert = ((u_char *) buf)[1];
+
+            ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic compat %s alert:%ui len:%uz ",
+                           ngx_quic_level_name(level), alert, len);
+
+            if (com->method->send_alert(ssl, level, alert) != 1) {
+                goto failed;
+            }
+        }
+
+        break;
+    }
+
+    return;
+
+failed:
+
+    ngx_post_event(&qc->close, &ngx_posted_events);
+}
+
+
+int
+SSL_provide_quic_data(SSL *ssl, enum ssl_encryption_level_t level,
+    const uint8_t *data, size_t len)
+{
+    BIO                       *rbio;
+    size_t                     n;
+    u_char                    *p;
+    ngx_str_t                  res;
+    ngx_connection_t          *c;
+    ngx_quic_compat_t         *com;
+    ngx_quic_connection_t     *qc;
+    ngx_quic_compat_record_t   rec;
+    u_char                     in[NGX_QUIC_COMPAT_RECORD_SIZE + 1];
+    u_char                     out[NGX_QUIC_COMPAT_RECORD_SIZE + 1
+                                   + SSL3_RT_HEADER_LENGTH
+                                   + NGX_QUIC_TAG_LEN];
+
+    c = ngx_ssl_get_connection(ssl);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic compat rx %s len:%uz",
+                   ngx_quic_level_name(level), len);
+
+    qc = ngx_quic_get_connection(c);
+    com = qc->compat;
+    rbio = SSL_get_rbio(ssl);
+
+    while (len) {
+        ngx_memzero(&rec, sizeof(ngx_quic_compat_record_t));
+
+        rec.type = SSL3_RT_HANDSHAKE;
+        rec.log = c->log;
+        rec.number = com->read_record++;
+        rec.keys = &com->keys;
+        rec.level = level;
+
+        if (level == ssl_encryption_initial) {
+            n = ngx_min(len, 65535);
+
+            rec.payload.len = n;
+            rec.payload.data = (u_char *) data;
+
+            ngx_quic_compat_create_header(&rec, out, 1);
+
+            BIO_write(rbio, out, SSL3_RT_HEADER_LENGTH);
+            BIO_write(rbio, data, n);
+
+#if defined(NGX_QUIC_DEBUG_CRYPTO) && defined(NGX_QUIC_DEBUG_PACKETS)
+            ngx_log_debug5(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic compat record len:%uz %*xs%*xs",
+                           n + SSL3_RT_HEADER_LENGTH,
+                           (size_t) SSL3_RT_HEADER_LENGTH, out, n, data);
+#endif
+
+        } else {
+            n = ngx_min(len, NGX_QUIC_COMPAT_RECORD_SIZE);
+
+            p = ngx_cpymem(in, data, n);
+            *p++ = SSL3_RT_HANDSHAKE;
+
+            rec.payload.len = p - in;
+            rec.payload.data = in;
+
+            res.data = out;
+
+            if (ngx_quic_compat_create_record(&rec, &res) != NGX_OK) {
+                return 0;
+            }
+
+#if defined(NGX_QUIC_DEBUG_CRYPTO) && defined(NGX_QUIC_DEBUG_PACKETS)
+            ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic compat record len:%uz %xV", res.len, &res);
+#endif
+
+            BIO_write(rbio, res.data, res.len);
+        }
+
+        data += n;
+        len -= n;
+    }
+
+    return 1;
+}
+
+
+static size_t
+ngx_quic_compat_create_header(ngx_quic_compat_record_t *rec, u_char *out,
+    ngx_uint_t plain)
+{
+    u_char  type;
+    size_t  len;
+
+    len = rec->payload.len;
+
+    if (plain) {
+        type = rec->type;
+
+    } else {
+        type = SSL3_RT_APPLICATION_DATA;
+        len += NGX_QUIC_TAG_LEN;
+    }
+
+    out[0] = type;
+    out[1] = 0x03;
+    out[2] = 0x03;
+    out[3] = (len >> 8);
+    out[4] = len;
+
+    return 5;
+}
+
+
+static ngx_int_t
+ngx_quic_compat_create_record(ngx_quic_compat_record_t *rec, ngx_str_t *res)
+{
+    ngx_str_t           ad, out;
+    ngx_quic_secret_t  *secret;
+    u_char              nonce[NGX_QUIC_IV_LEN];
+
+    ad.data = res->data;
+    ad.len = ngx_quic_compat_create_header(rec, ad.data, 0);
+
+    out.len = rec->payload.len + NGX_QUIC_TAG_LEN;
+    out.data = res->data + ad.len;
+
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, rec->log, 0,
+                   "quic compat ad len:%uz %xV", ad.len, &ad);
+#endif
+
+    secret = &rec->keys->secret;
+
+    ngx_memcpy(nonce, secret->iv.data, secret->iv.len);
+    ngx_quic_compute_nonce(nonce, sizeof(nonce), rec->number);
+
+    if (ngx_quic_crypto_seal(secret, &out, nonce, &rec->payload, &ad, rec->log)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    res->len = ad.len + out.len;
+
+    return NGX_OK;
+}
+
+
+int
+SSL_set_quic_transport_params(SSL *ssl, const uint8_t *params,
+    size_t params_len)
+{
+    ngx_connection_t       *c;
+    ngx_quic_compat_t      *com;
+    ngx_quic_connection_t  *qc;
+
+    c = ngx_ssl_get_connection(ssl);
+    qc = ngx_quic_get_connection(c);
+    com = qc->compat;
+
+    com->tp.len = params_len;
+    com->tp.data = (u_char *) params;
+
+    return 1;
+}
+
+
+void
+SSL_get_peer_quic_transport_params(const SSL *ssl, const uint8_t **out_params,
+    size_t *out_params_len)
+{
+    ngx_connection_t       *c;
+    ngx_quic_compat_t      *com;
+    ngx_quic_connection_t  *qc;
+
+    c = ngx_ssl_get_connection(ssl);
+    qc = ngx_quic_get_connection(c);
+    com = qc->compat;
+
+    *out_params = com->ctp.data;
+    *out_params_len = com->ctp.len;
+}
+
+#endif /* NGX_QUIC_OPENSSL_COMPAT */
diff --git a/src/event/quic/ngx_event_quic_openssl_compat.h b/src/event/quic/ngx_event_quic_openssl_compat.h
new file mode 100644
index 0000000..77cc3cb
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_openssl_compat.h
@@ -0,0 +1,59 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_OPENSSL_COMPAT_H_INCLUDED_
+#define _NGX_EVENT_QUIC_OPENSSL_COMPAT_H_INCLUDED_
+
+#if defined SSL_R_MISSING_QUIC_TRANSPORT_PARAMETERS_EXTENSION                 \
+    || defined LIBRESSL_VERSION_NUMBER
+#undef NGX_QUIC_OPENSSL_COMPAT
+#else
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+typedef struct ngx_quic_compat_s  ngx_quic_compat_t;
+
+
+enum ssl_encryption_level_t {
+    ssl_encryption_initial = 0,
+    ssl_encryption_early_data,
+    ssl_encryption_handshake,
+    ssl_encryption_application
+};
+
+
+typedef struct ssl_quic_method_st {
+    int (*set_read_secret)(SSL *ssl, enum ssl_encryption_level_t level,
+                           const SSL_CIPHER *cipher,
+                           const uint8_t *rsecret, size_t secret_len);
+    int (*set_write_secret)(SSL *ssl, enum ssl_encryption_level_t level,
+                            const SSL_CIPHER *cipher,
+                            const uint8_t *wsecret, size_t secret_len);
+    int (*add_handshake_data)(SSL *ssl, enum ssl_encryption_level_t level,
+                              const uint8_t *data, size_t len);
+    int (*flush_flight)(SSL *ssl);
+    int (*send_alert)(SSL *ssl, enum ssl_encryption_level_t level,
+                      uint8_t alert);
+} SSL_QUIC_METHOD;
+
+
+ngx_int_t ngx_quic_compat_init(ngx_conf_t *cf, SSL_CTX *ctx);
+
+int SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method);
+int SSL_provide_quic_data(SSL *ssl, enum ssl_encryption_level_t level,
+    const uint8_t *data, size_t len);
+int SSL_set_quic_transport_params(SSL *ssl, const uint8_t *params,
+    size_t params_len);
+void SSL_get_peer_quic_transport_params(const SSL *ssl,
+    const uint8_t **out_params, size_t *out_params_len);
+
+
+#endif /* TLSEXT_TYPE_quic_transport_parameters */
+
+#endif /* _NGX_EVENT_QUIC_OPENSSL_COMPAT_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_output.c b/src/event/quic/ngx_event_quic_output.c
new file mode 100644
index 0000000..ce6aaab
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_output.c
@@ -0,0 +1,1319 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+#define NGX_QUIC_MAX_UDP_SEGMENT_BUF  65487 /* 65K - IPv6 header */
+#define NGX_QUIC_MAX_SEGMENTS            64 /* UDP_MAX_SEGMENTS */
+
+#define NGX_QUIC_RETRY_TOKEN_LIFETIME     3 /* seconds */
+#define NGX_QUIC_NEW_TOKEN_LIFETIME     600 /* seconds */
+#define NGX_QUIC_RETRY_BUFFER_SIZE      256
+    /* 1 flags + 4 version + 3 x (1 + 20) s/o/dcid + itag + token(64) */
+
+/*
+ * RFC 9000, 10.3.  Stateless Reset
+ *
+ * Endpoints MUST discard packets that are too small to be valid QUIC
+ * packets.  With the set of AEAD functions defined in [QUIC-TLS],
+ * short header packets that are smaller than 21 bytes are never valid.
+ */
+#define NGX_QUIC_MIN_PKT_LEN             21
+
+#define NGX_QUIC_MIN_SR_PACKET           43 /* 5 rand + 16 srt + 22 padding */
+#define NGX_QUIC_MAX_SR_PACKET         1200
+
+#define NGX_QUIC_CC_MIN_INTERVAL       1000 /* 1s */
+
+#define NGX_QUIC_SOCKET_RETRY_DELAY      10 /* ms, for NGX_AGAIN on write */
+
+
+#define ngx_quic_log_packet(log, pkt)                                         \
+    ngx_log_debug6(NGX_LOG_DEBUG_EVENT, log, 0,                               \
+                   "quic packet tx %s bytes:%ui need_ack:%d"                  \
+                   " number:%L encoded nl:%d trunc:0x%xD",                    \
+                   ngx_quic_level_name((pkt)->level), (pkt)->payload.len,     \
+                   (pkt)->need_ack, (pkt)->number, (pkt)->num_len,            \
+                    (pkt)->trunc);
+
+
+static ngx_int_t ngx_quic_create_datagrams(ngx_connection_t *c);
+static void ngx_quic_commit_send(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx);
+static void ngx_quic_revert_send(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
+    uint64_t pnum);
+#if ((NGX_HAVE_UDP_SEGMENT) && (NGX_HAVE_MSGHDR_MSG_CONTROL))
+static ngx_uint_t ngx_quic_allow_segmentation(ngx_connection_t *c);
+static ngx_int_t ngx_quic_create_segments(ngx_connection_t *c);
+static ssize_t ngx_quic_send_segments(ngx_connection_t *c, u_char *buf,
+    size_t len, struct sockaddr *sockaddr, socklen_t socklen, size_t segment);
+#endif
+static ssize_t ngx_quic_output_packet(ngx_connection_t *c,
+    ngx_quic_send_ctx_t *ctx, u_char *data, size_t max, size_t min);
+static void ngx_quic_init_packet(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
+    ngx_quic_header_t *pkt, ngx_quic_path_t *path);
+static ngx_uint_t ngx_quic_get_padding_level(ngx_connection_t *c);
+static ssize_t ngx_quic_send(ngx_connection_t *c, u_char *buf, size_t len,
+    struct sockaddr *sockaddr, socklen_t socklen);
+static void ngx_quic_set_packet_number(ngx_quic_header_t *pkt,
+    ngx_quic_send_ctx_t *ctx);
+
+
+ngx_int_t
+ngx_quic_output(ngx_connection_t *c)
+{
+    size_t                  in_flight;
+    ngx_int_t               rc;
+    ngx_quic_congestion_t  *cg;
+    ngx_quic_connection_t  *qc;
+
+    c->log->action = "sending frames";
+
+    qc = ngx_quic_get_connection(c);
+    cg = &qc->congestion;
+
+    in_flight = cg->in_flight;
+
+#if ((NGX_HAVE_UDP_SEGMENT) && (NGX_HAVE_MSGHDR_MSG_CONTROL))
+    if (ngx_quic_allow_segmentation(c)) {
+        rc = ngx_quic_create_segments(c);
+    } else
+#endif
+    {
+        rc = ngx_quic_create_datagrams(c);
+    }
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (in_flight == cg->in_flight || qc->closing) {
+        /* no ack-eliciting data was sent or we are done */
+        return NGX_OK;
+    }
+
+    if (!qc->send_timer_set) {
+        qc->send_timer_set = 1;
+        ngx_add_timer(c->read, qc->tp.max_idle_timeout);
+    }
+
+    ngx_quic_set_lost_timer(c);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_create_datagrams(ngx_connection_t *c)
+{
+    size_t                  len, min;
+    ssize_t                 n;
+    u_char                 *p;
+    uint64_t                preserved_pnum[NGX_QUIC_SEND_CTX_LAST];
+    ngx_uint_t              i, pad;
+    ngx_quic_path_t        *path;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_congestion_t  *cg;
+    ngx_quic_connection_t  *qc;
+    static u_char           dst[NGX_QUIC_MAX_UDP_PAYLOAD_SIZE];
+
+    qc = ngx_quic_get_connection(c);
+    cg = &qc->congestion;
+    path = qc->path;
+
+    while (cg->in_flight < cg->window) {
+
+        p = dst;
+
+        len = ngx_quic_path_limit(c, path, path->mtu);
+
+        pad = ngx_quic_get_padding_level(c);
+
+        for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+
+            ctx = &qc->send_ctx[i];
+
+            preserved_pnum[i] = ctx->pnum;
+
+            if (ngx_quic_generate_ack(c, ctx) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            min = (i == pad && p - dst < NGX_QUIC_MIN_INITIAL_SIZE)
+                  ? NGX_QUIC_MIN_INITIAL_SIZE - (p - dst) : 0;
+
+            if (min > len) {
+                /* padding can't be applied - avoid sending the packet */
+
+                while (i-- > 0) {
+                    ctx = &qc->send_ctx[i];
+                    ngx_quic_revert_send(c, ctx, preserved_pnum[i]);
+                }
+
+                return NGX_OK;
+            }
+
+            n = ngx_quic_output_packet(c, ctx, p, len, min);
+            if (n == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            p += n;
+            len -= n;
+        }
+
+        len = p - dst;
+        if (len == 0) {
+            break;
+        }
+
+        n = ngx_quic_send(c, dst, len, path->sockaddr, path->socklen);
+
+        if (n == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        if (n == NGX_AGAIN) {
+            for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+                ngx_quic_revert_send(c, &qc->send_ctx[i], preserved_pnum[i]);
+            }
+
+            ngx_add_timer(&qc->push, NGX_QUIC_SOCKET_RETRY_DELAY);
+            break;
+        }
+
+        for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+            ngx_quic_commit_send(c, &qc->send_ctx[i]);
+        }
+
+        path->sent += len;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_commit_send(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx)
+{
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *f;
+    ngx_quic_congestion_t  *cg;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    cg = &qc->congestion;
+
+    while (!ngx_queue_empty(&ctx->sending)) {
+
+        q = ngx_queue_head(&ctx->sending);
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        ngx_queue_remove(q);
+
+        if (f->pkt_need_ack && !qc->closing) {
+            ngx_queue_insert_tail(&ctx->sent, q);
+
+            cg->in_flight += f->plen;
+
+        } else {
+            ngx_quic_free_frame(c, f);
+        }
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic congestion send if:%uz", cg->in_flight);
+}
+
+
+static void
+ngx_quic_revert_send(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
+    uint64_t pnum)
+{
+    ngx_queue_t  *q;
+
+    while (!ngx_queue_empty(&ctx->sending)) {
+
+        q = ngx_queue_last(&ctx->sending);
+        ngx_queue_remove(q);
+        ngx_queue_insert_head(&ctx->frames, q);
+    }
+
+    ctx->pnum = pnum;
+}
+
+
+#if ((NGX_HAVE_UDP_SEGMENT) && (NGX_HAVE_MSGHDR_MSG_CONTROL))
+
+static ngx_uint_t
+ngx_quic_allow_segmentation(ngx_connection_t *c)
+{
+    size_t                  bytes, len;
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *f;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (!qc->conf->gso_enabled) {
+        return 0;
+    }
+
+    if (!qc->path->validated) {
+        /* don't even try to be faster on non-validated paths */
+        return 0;
+    }
+
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_initial);
+    if (!ngx_queue_empty(&ctx->frames)) {
+        return 0;
+    }
+
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_handshake);
+    if (!ngx_queue_empty(&ctx->frames)) {
+        return 0;
+    }
+
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_application);
+
+    bytes = 0;
+    len = ngx_min(qc->path->mtu, NGX_QUIC_MAX_UDP_SEGMENT_BUF);
+
+    for (q = ngx_queue_head(&ctx->frames);
+         q != ngx_queue_sentinel(&ctx->frames);
+         q = ngx_queue_next(q))
+    {
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        bytes += f->len;
+
+        if (bytes > len * 3) {
+            /* require at least ~3 full packets to batch */
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+
+static ngx_int_t
+ngx_quic_create_segments(ngx_connection_t *c)
+{
+    size_t                  len, segsize;
+    ssize_t                 n;
+    u_char                 *p, *end;
+    uint64_t                preserved_pnum;
+    ngx_uint_t              nseg;
+    ngx_quic_path_t        *path;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_congestion_t  *cg;
+    ngx_quic_connection_t  *qc;
+    static u_char           dst[NGX_QUIC_MAX_UDP_SEGMENT_BUF];
+
+    qc = ngx_quic_get_connection(c);
+    cg = &qc->congestion;
+    path = qc->path;
+
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_application);
+
+    if (ngx_quic_generate_ack(c, ctx) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    segsize = ngx_min(path->mtu, NGX_QUIC_MAX_UDP_SEGMENT_BUF);
+    p = dst;
+    end = dst + sizeof(dst);
+
+    nseg = 0;
+
+    preserved_pnum = ctx->pnum;
+
+    for ( ;; ) {
+
+        len = ngx_min(segsize, (size_t) (end - p));
+
+        if (len && cg->in_flight + (p - dst) < cg->window) {
+
+            n = ngx_quic_output_packet(c, ctx, p, len, len);
+            if (n == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (n) {
+                p += n;
+                nseg++;
+            }
+
+        } else {
+            n = 0;
+        }
+
+        if (p == dst) {
+            break;
+        }
+
+        if (n == 0 || nseg == NGX_QUIC_MAX_SEGMENTS) {
+            n = ngx_quic_send_segments(c, dst, p - dst, path->sockaddr,
+                                       path->socklen, segsize);
+            if (n == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (n == NGX_AGAIN) {
+                ngx_quic_revert_send(c, ctx, preserved_pnum);
+
+                ngx_add_timer(&qc->push, NGX_QUIC_SOCKET_RETRY_DELAY);
+                break;
+            }
+
+            ngx_quic_commit_send(c, ctx);
+
+            path->sent += n;
+
+            p = dst;
+            nseg = 0;
+            preserved_pnum = ctx->pnum;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ssize_t
+ngx_quic_send_segments(ngx_connection_t *c, u_char *buf, size_t len,
+    struct sockaddr *sockaddr, socklen_t socklen, size_t segment)
+{
+    size_t           clen;
+    ssize_t          n;
+    uint16_t        *valp;
+    struct iovec     iov;
+    struct msghdr    msg;
+    struct cmsghdr  *cmsg;
+
+#if (NGX_HAVE_ADDRINFO_CMSG)
+    char             msg_control[CMSG_SPACE(sizeof(uint16_t))
+                             + CMSG_SPACE(sizeof(ngx_addrinfo_t))];
+#else
+    char             msg_control[CMSG_SPACE(sizeof(uint16_t))];
+#endif
+
+    ngx_memzero(&msg, sizeof(struct msghdr));
+    ngx_memzero(msg_control, sizeof(msg_control));
+
+    iov.iov_len = len;
+    iov.iov_base = buf;
+
+    msg.msg_iov = &iov;
+    msg.msg_iovlen = 1;
+
+    msg.msg_name = sockaddr;
+    msg.msg_namelen = socklen;
+
+    msg.msg_control = msg_control;
+    msg.msg_controllen = sizeof(msg_control);
+
+    cmsg = CMSG_FIRSTHDR(&msg);
+
+    cmsg->cmsg_level = SOL_UDP;
+    cmsg->cmsg_type = UDP_SEGMENT;
+    cmsg->cmsg_len = CMSG_LEN(sizeof(uint16_t));
+
+    clen = CMSG_SPACE(sizeof(uint16_t));
+
+    valp = (void *) CMSG_DATA(cmsg);
+    *valp = segment;
+
+#if (NGX_HAVE_ADDRINFO_CMSG)
+    if (c->listening && c->listening->wildcard && c->local_sockaddr) {
+        cmsg = CMSG_NXTHDR(&msg, cmsg);
+        clen += ngx_set_srcaddr_cmsg(cmsg, c->local_sockaddr);
+    }
+#endif
+
+    msg.msg_controllen = clen;
+
+    n = ngx_sendmsg(c, &msg, 0);
+    if (n < 0) {
+        return n;
+    }
+
+    c->sent += n;
+
+    return n;
+}
+
+#endif
+
+
+
+static ngx_uint_t
+ngx_quic_get_padding_level(ngx_connection_t *c)
+{
+    ngx_uint_t              i;
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *f;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+
+    /*
+     * RFC 9000, 14.1.  Initial Datagram Size
+     *
+     * Similarly, a server MUST expand the payload of all UDP datagrams
+     * carrying ack-eliciting Initial packets to at least the smallest
+     * allowed maximum datagram size of 1200 bytes.
+     */
+
+    qc = ngx_quic_get_connection(c);
+    ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_initial);
+
+    for (q = ngx_queue_head(&ctx->frames);
+         q != ngx_queue_sentinel(&ctx->frames);
+         q = ngx_queue_next(q))
+    {
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        if (f->need_ack) {
+            for (i = 0; i + 1 < NGX_QUIC_SEND_CTX_LAST; i++) {
+                ctx = &qc->send_ctx[i + 1];
+
+                if (ngx_queue_empty(&ctx->frames)) {
+                    break;
+                }
+            }
+
+            return i;
+        }
+    }
+
+    return NGX_QUIC_SEND_CTX_LAST;
+}
+
+
+static ssize_t
+ngx_quic_output_packet(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
+    u_char *data, size_t max, size_t min)
+{
+    size_t                  len, pad, min_payload, max_payload;
+    u_char                 *p;
+    ssize_t                 flen;
+    ngx_str_t               res;
+    ngx_int_t               rc;
+    ngx_uint_t              nframes;
+    ngx_msec_t              now;
+    ngx_queue_t            *q;
+    ngx_quic_frame_t       *f;
+    ngx_quic_header_t       pkt;
+    ngx_quic_connection_t  *qc;
+    static u_char           src[NGX_QUIC_MAX_UDP_PAYLOAD_SIZE];
+
+    if (ngx_queue_empty(&ctx->frames)) {
+        return 0;
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic output %s packet max:%uz min:%uz",
+                   ngx_quic_level_name(ctx->level), max, min);
+
+    qc = ngx_quic_get_connection(c);
+
+    if (!ngx_quic_keys_available(qc->keys, ctx->level, 1)) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0, "quic %s write keys discarded",
+                      ngx_quic_level_name(ctx->level));
+
+        while (!ngx_queue_empty(&ctx->frames)) {
+            q = ngx_queue_head(&ctx->frames);
+            ngx_queue_remove(q);
+
+            f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+            ngx_quic_free_frame(c, f);
+        }
+
+        return 0;
+    }
+
+    ngx_quic_init_packet(c, ctx, &pkt, qc->path);
+
+    min_payload = ngx_quic_payload_size(&pkt, min);
+    max_payload = ngx_quic_payload_size(&pkt, max);
+
+    /* RFC 9001, 5.4.2.  Header Protection Sample */
+    pad = 4 - pkt.num_len;
+    min_payload = ngx_max(min_payload, pad);
+
+    if (min_payload > max_payload) {
+        return 0;
+    }
+
+    now = ngx_current_msec;
+    nframes = 0;
+    p = src;
+    len = 0;
+
+    for (q = ngx_queue_head(&ctx->frames);
+         q != ngx_queue_sentinel(&ctx->frames);
+         q = ngx_queue_next(q))
+    {
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        if (len >= max_payload) {
+            break;
+        }
+
+        if (len + f->len > max_payload) {
+            rc = ngx_quic_split_frame(c, f, max_payload - len);
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (rc == NGX_DECLINED) {
+                break;
+            }
+        }
+
+        if (f->need_ack) {
+            pkt.need_ack = 1;
+        }
+
+        f->pnum = ctx->pnum;
+        f->send_time = now;
+        f->plen = 0;
+
+        ngx_quic_log_frame(c->log, f, 1);
+
+        flen = ngx_quic_create_frame(p, f);
+        if (flen == -1) {
+            return NGX_ERROR;
+        }
+
+        len += flen;
+        p += flen;
+
+        nframes++;
+    }
+
+    if (nframes == 0) {
+        return 0;
+    }
+
+    if (len < min_payload) {
+        ngx_memset(p, NGX_QUIC_FT_PADDING, min_payload - len);
+        len = min_payload;
+    }
+
+    pkt.payload.data = src;
+    pkt.payload.len = len;
+
+    res.data = data;
+
+    ngx_quic_log_packet(c->log, &pkt);
+
+    if (ngx_quic_encrypt(&pkt, &res) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ctx->pnum++;
+
+    if (pkt.need_ack) {
+        q = ngx_queue_head(&ctx->frames);
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        f->plen = res.len;
+    }
+
+    while (nframes--) {
+        q = ngx_queue_head(&ctx->frames);
+        f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        f->pkt_need_ack = pkt.need_ack;
+
+        ngx_queue_remove(q);
+        ngx_queue_insert_tail(&ctx->sending, q);
+    }
+
+    return res.len;
+}
+
+
+static void
+ngx_quic_init_packet(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
+    ngx_quic_header_t *pkt, ngx_quic_path_t *path)
+{
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    ngx_memzero(pkt, sizeof(ngx_quic_header_t));
+
+    pkt->flags = NGX_QUIC_PKT_FIXED_BIT;
+
+    if (ctx->level == ssl_encryption_initial) {
+        pkt->flags |= NGX_QUIC_PKT_LONG | NGX_QUIC_PKT_INITIAL;
+
+    } else if (ctx->level == ssl_encryption_handshake) {
+        pkt->flags |= NGX_QUIC_PKT_LONG | NGX_QUIC_PKT_HANDSHAKE;
+
+    } else {
+        if (qc->key_phase) {
+            pkt->flags |= NGX_QUIC_PKT_KPHASE;
+        }
+    }
+
+    pkt->dcid.data = path->cid->id;
+    pkt->dcid.len = path->cid->len;
+
+    pkt->scid = qc->tp.initial_scid;
+
+    pkt->version = qc->version;
+    pkt->log = c->log;
+    pkt->level = ctx->level;
+
+    pkt->keys = qc->keys;
+
+    ngx_quic_set_packet_number(pkt, ctx);
+}
+
+
+static ssize_t
+ngx_quic_send(ngx_connection_t *c, u_char *buf, size_t len,
+    struct sockaddr *sockaddr, socklen_t socklen)
+{
+    ssize_t          n;
+    struct iovec     iov;
+    struct msghdr    msg;
+#if (NGX_HAVE_ADDRINFO_CMSG)
+    struct cmsghdr  *cmsg;
+    char             msg_control[CMSG_SPACE(sizeof(ngx_addrinfo_t))];
+#endif
+
+    ngx_memzero(&msg, sizeof(struct msghdr));
+
+    iov.iov_len = len;
+    iov.iov_base = buf;
+
+    msg.msg_iov = &iov;
+    msg.msg_iovlen = 1;
+
+    msg.msg_name = sockaddr;
+    msg.msg_namelen = socklen;
+
+#if (NGX_HAVE_ADDRINFO_CMSG)
+    if (c->listening && c->listening->wildcard && c->local_sockaddr) {
+
+        msg.msg_control = msg_control;
+        msg.msg_controllen = sizeof(msg_control);
+        ngx_memzero(msg_control, sizeof(msg_control));
+
+        cmsg = CMSG_FIRSTHDR(&msg);
+
+        msg.msg_controllen = ngx_set_srcaddr_cmsg(cmsg, c->local_sockaddr);
+    }
+#endif
+
+    n = ngx_sendmsg(c, &msg, 0);
+    if (n < 0) {
+        return n;
+    }
+
+    c->sent += n;
+
+    return n;
+}
+
+
+static void
+ngx_quic_set_packet_number(ngx_quic_header_t *pkt, ngx_quic_send_ctx_t *ctx)
+{
+    uint64_t  delta;
+
+    delta = ctx->pnum - ctx->largest_ack;
+    pkt->number = ctx->pnum;
+
+    if (delta <= 0x7F) {
+        pkt->num_len = 1;
+        pkt->trunc = ctx->pnum & 0xff;
+
+    } else if (delta <= 0x7FFF) {
+        pkt->num_len = 2;
+        pkt->flags |= 0x1;
+        pkt->trunc = ctx->pnum & 0xffff;
+
+    } else if (delta <= 0x7FFFFF) {
+        pkt->num_len = 3;
+        pkt->flags |= 0x2;
+        pkt->trunc = ctx->pnum & 0xffffff;
+
+    } else {
+        pkt->num_len = 4;
+        pkt->flags |= 0x3;
+        pkt->trunc = ctx->pnum & 0xffffffff;
+    }
+}
+
+
+ngx_int_t
+ngx_quic_negotiate_version(ngx_connection_t *c, ngx_quic_header_t *inpkt)
+{
+    size_t             len;
+    ngx_quic_header_t  pkt;
+    static u_char      buf[NGX_QUIC_MAX_UDP_PAYLOAD_SIZE];
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "sending version negotiation packet");
+
+    pkt.log = c->log;
+    pkt.flags = NGX_QUIC_PKT_LONG | NGX_QUIC_PKT_FIXED_BIT;
+    pkt.dcid = inpkt->scid;
+    pkt.scid = inpkt->dcid;
+
+    len = ngx_quic_create_version_negotiation(&pkt, buf);
+
+#ifdef NGX_QUIC_DEBUG_PACKETS
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic vnego packet to send len:%uz %*xs", len, len, buf);
+#endif
+
+    (void) ngx_quic_send(c, buf, len, c->sockaddr, c->socklen);
+
+    return NGX_DONE;
+}
+
+
+ngx_int_t
+ngx_quic_send_stateless_reset(ngx_connection_t *c, ngx_quic_conf_t *conf,
+    ngx_quic_header_t *pkt)
+{
+    u_char    *token;
+    size_t     len, max;
+    uint16_t   rndbytes;
+    u_char     buf[NGX_QUIC_MAX_SR_PACKET];
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic handle stateless reset output");
+
+    if (pkt->len <= NGX_QUIC_MIN_PKT_LEN) {
+        return NGX_DECLINED;
+    }
+
+    if (pkt->len <= NGX_QUIC_MIN_SR_PACKET) {
+        len = pkt->len - 1;
+
+    } else {
+        max = ngx_min(NGX_QUIC_MAX_SR_PACKET, pkt->len * 3);
+
+        if (RAND_bytes((u_char *) &rndbytes, sizeof(rndbytes)) != 1) {
+            return NGX_ERROR;
+        }
+
+        len = (rndbytes % (max - NGX_QUIC_MIN_SR_PACKET + 1))
+              + NGX_QUIC_MIN_SR_PACKET;
+    }
+
+    if (RAND_bytes(buf, len - NGX_QUIC_SR_TOKEN_LEN) != 1) {
+        return NGX_ERROR;
+    }
+
+    buf[0] &= ~NGX_QUIC_PKT_LONG;
+    buf[0] |= NGX_QUIC_PKT_FIXED_BIT;
+
+    token = &buf[len - NGX_QUIC_SR_TOKEN_LEN];
+
+    if (ngx_quic_new_sr_token(c, &pkt->dcid, conf->sr_token_key, token)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    (void) ngx_quic_send(c, buf, len, c->sockaddr, c->socklen);
+
+    return NGX_DECLINED;
+}
+
+
+ngx_int_t
+ngx_quic_send_cc(ngx_connection_t *c)
+{
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (qc->draining) {
+        return NGX_OK;
+    }
+
+    if (qc->closing
+        && ngx_current_msec - qc->last_cc < NGX_QUIC_CC_MIN_INTERVAL)
+    {
+        /* dot not send CC too often */
+        return NGX_OK;
+    }
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = qc->error_level;
+    frame->type = qc->error_app ? NGX_QUIC_FT_CONNECTION_CLOSE_APP
+                                : NGX_QUIC_FT_CONNECTION_CLOSE;
+    frame->u.close.error_code = qc->error;
+    frame->u.close.frame_type = qc->error_ftype;
+
+    if (qc->error_reason) {
+        frame->u.close.reason.len = ngx_strlen(qc->error_reason);
+        frame->u.close.reason.data = (u_char *) qc->error_reason;
+    }
+
+    frame->ignore_congestion = 1;
+
+    qc->last_cc = ngx_current_msec;
+
+    return ngx_quic_frame_sendto(c, frame, 0, qc->path);
+}
+
+
+ngx_int_t
+ngx_quic_send_early_cc(ngx_connection_t *c, ngx_quic_header_t *inpkt,
+    ngx_uint_t err, const char *reason)
+{
+    ssize_t            len;
+    ngx_str_t          res;
+    ngx_quic_keys_t    keys;
+    ngx_quic_frame_t   frame;
+    ngx_quic_header_t  pkt;
+
+    static u_char       src[NGX_QUIC_MAX_UDP_PAYLOAD_SIZE];
+    static u_char       dst[NGX_QUIC_MAX_UDP_PAYLOAD_SIZE];
+
+    ngx_memzero(&frame, sizeof(ngx_quic_frame_t));
+    ngx_memzero(&pkt, sizeof(ngx_quic_header_t));
+
+    frame.level = inpkt->level;
+    frame.type = NGX_QUIC_FT_CONNECTION_CLOSE;
+    frame.u.close.error_code = err;
+
+    frame.u.close.reason.data = (u_char *) reason;
+    frame.u.close.reason.len = ngx_strlen(reason);
+
+    ngx_quic_log_frame(c->log, &frame, 1);
+
+    len = ngx_quic_create_frame(NULL, &frame);
+    if (len > NGX_QUIC_MAX_UDP_PAYLOAD_SIZE) {
+        return NGX_ERROR;
+    }
+
+    len = ngx_quic_create_frame(src, &frame);
+    if (len == -1) {
+        return NGX_ERROR;
+    }
+
+    ngx_memzero(&keys, sizeof(ngx_quic_keys_t));
+
+    pkt.keys = &keys;
+
+    if (ngx_quic_keys_set_initial_secret(pkt.keys, &inpkt->dcid, c->log)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    pkt.flags = NGX_QUIC_PKT_FIXED_BIT | NGX_QUIC_PKT_LONG
+                | NGX_QUIC_PKT_INITIAL;
+
+    pkt.num_len = 1;
+    /*
+     * pkt.num = 0;
+     * pkt.trunc = 0;
+     */
+
+    pkt.version = inpkt->version;
+    pkt.log = c->log;
+    pkt.level = inpkt->level;
+    pkt.dcid = inpkt->scid;
+    pkt.scid = inpkt->dcid;
+    pkt.payload.data = src;
+    pkt.payload.len = len;
+
+    res.data = dst;
+
+    ngx_quic_log_packet(c->log, &pkt);
+
+    if (ngx_quic_encrypt(&pkt, &res) != NGX_OK) {
+        ngx_quic_keys_cleanup(pkt.keys);
+        return NGX_ERROR;
+    }
+
+    if (ngx_quic_send(c, res.data, res.len, c->sockaddr, c->socklen) < 0) {
+        ngx_quic_keys_cleanup(pkt.keys);
+        return NGX_ERROR;
+    }
+
+    ngx_quic_keys_cleanup(pkt.keys);
+
+    return NGX_DONE;
+}
+
+
+ngx_int_t
+ngx_quic_send_retry(ngx_connection_t *c, ngx_quic_conf_t *conf,
+    ngx_quic_header_t *inpkt)
+{
+    time_t             expires;
+    ssize_t            len;
+    ngx_str_t          res, token;
+    ngx_quic_header_t  pkt;
+
+    u_char             buf[NGX_QUIC_RETRY_BUFFER_SIZE];
+    u_char             dcid[NGX_QUIC_SERVER_CID_LEN];
+    u_char             tbuf[NGX_QUIC_TOKEN_BUF_SIZE];
+
+    expires = ngx_time() + NGX_QUIC_RETRY_TOKEN_LIFETIME;
+
+    token.data = tbuf;
+    token.len = NGX_QUIC_TOKEN_BUF_SIZE;
+
+    if (ngx_quic_new_token(c->log, c->sockaddr, c->socklen, conf->av_token_key,
+                           &token, &inpkt->dcid, expires, 1)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_memzero(&pkt, sizeof(ngx_quic_header_t));
+    pkt.flags = NGX_QUIC_PKT_FIXED_BIT | NGX_QUIC_PKT_LONG | NGX_QUIC_PKT_RETRY;
+    pkt.version = inpkt->version;
+    pkt.log = c->log;
+
+    pkt.odcid = inpkt->dcid;
+    pkt.dcid = inpkt->scid;
+
+    /* TODO: generate routable dcid */
+    if (RAND_bytes(dcid, NGX_QUIC_SERVER_CID_LEN) != 1) {
+        return NGX_ERROR;
+    }
+
+    pkt.scid.len = NGX_QUIC_SERVER_CID_LEN;
+    pkt.scid.data = dcid;
+
+    pkt.token = token;
+
+    res.data = buf;
+
+    if (ngx_quic_encrypt(&pkt, &res) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+#ifdef NGX_QUIC_DEBUG_PACKETS
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic packet to send len:%uz %xV", res.len, &res);
+#endif
+
+    len = ngx_quic_send(c, res.data, res.len, c->sockaddr, c->socklen);
+    if (len < 0) {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic retry packet sent to %xV", &pkt.dcid);
+
+    /*
+     * RFC 9000, 17.2.5.1.  Sending a Retry Packet
+     *
+     * A server MUST NOT send more than one Retry
+     * packet in response to a single UDP datagram.
+     * NGX_DONE will stop quic_input() from processing further
+     */
+    return NGX_DONE;
+}
+
+
+ngx_int_t
+ngx_quic_send_new_token(ngx_connection_t *c, ngx_quic_path_t *path)
+{
+    time_t                  expires;
+    ngx_str_t               token;
+    ngx_chain_t            *out;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    u_char                  tbuf[NGX_QUIC_TOKEN_BUF_SIZE];
+
+    qc = ngx_quic_get_connection(c);
+
+    expires = ngx_time() + NGX_QUIC_NEW_TOKEN_LIFETIME;
+
+    token.data = tbuf;
+    token.len = NGX_QUIC_TOKEN_BUF_SIZE;
+
+    if (ngx_quic_new_token(c->log, path->sockaddr, path->socklen,
+                           qc->conf->av_token_key, &token, NULL, expires, 0)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    out = ngx_quic_copy_buffer(c, token.data, token.len);
+    if (out == NGX_CHAIN_ERROR) {
+        return NGX_ERROR;
+    }
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_NEW_TOKEN;
+    frame->data = out;
+    frame->u.token.length = token.len;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_send_ack(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx)
+{
+    size_t                  len, left;
+    uint64_t                ack_delay;
+    ngx_buf_t              *b;
+    ngx_uint_t              i;
+    ngx_chain_t            *cl, **ll;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    ack_delay = ngx_current_msec - ctx->largest_received;
+    ack_delay *= 1000;
+    ack_delay >>= qc->tp.ack_delay_exponent;
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    ll = &frame->data;
+    b = NULL;
+
+    for (i = 0; i < ctx->nranges; i++) {
+        len = ngx_quic_create_ack_range(NULL, ctx->ranges[i].gap,
+                                        ctx->ranges[i].range);
+
+        left = b ? b->end - b->last : 0;
+
+        if (left < len) {
+            cl = ngx_quic_alloc_chain(c);
+            if (cl == NULL) {
+                return NGX_ERROR;
+            }
+
+            *ll = cl;
+            ll = &cl->next;
+
+            b = cl->buf;
+            left = b->end - b->last;
+
+            if (left < len) {
+                return NGX_ERROR;
+            }
+        }
+
+        b->last += ngx_quic_create_ack_range(b->last, ctx->ranges[i].gap,
+                                             ctx->ranges[i].range);
+
+        frame->u.ack.ranges_length += len;
+    }
+
+    *ll = NULL;
+
+    frame->level = ctx->level;
+    frame->type = NGX_QUIC_FT_ACK;
+    frame->u.ack.largest = ctx->largest_range;
+    frame->u.ack.delay = ack_delay;
+    frame->u.ack.range_count = ctx->nranges;
+    frame->u.ack.first_range = ctx->first_range;
+    frame->len = ngx_quic_create_frame(NULL, frame);
+
+    ngx_queue_insert_head(&ctx->frames, &frame->queue);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_send_ack_range(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
+    uint64_t smallest, uint64_t largest)
+{
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ctx->level;
+    frame->type = NGX_QUIC_FT_ACK;
+    frame->u.ack.largest = largest;
+    frame->u.ack.delay = 0;
+    frame->u.ack.range_count = 0;
+    frame->u.ack.first_range = largest - smallest;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_frame_sendto(ngx_connection_t *c, ngx_quic_frame_t *frame,
+    size_t min, ngx_quic_path_t *path)
+{
+    size_t                  max, max_payload, min_payload, pad;
+    ssize_t                 len, sent;
+    ngx_str_t               res;
+    ngx_msec_t              now;
+    ngx_quic_header_t       pkt;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_congestion_t  *cg;
+    ngx_quic_connection_t  *qc;
+
+    static u_char           src[NGX_QUIC_MAX_UDP_PAYLOAD_SIZE];
+    static u_char           dst[NGX_QUIC_MAX_UDP_PAYLOAD_SIZE];
+
+    qc = ngx_quic_get_connection(c);
+    cg = &qc->congestion;
+    ctx = ngx_quic_get_send_ctx(qc, frame->level);
+
+    now = ngx_current_msec;
+
+    max = ngx_quic_path_limit(c, path, path->mtu);
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic sendto %s packet max:%uz min:%uz",
+                   ngx_quic_level_name(ctx->level), max, min);
+
+    if (cg->in_flight >= cg->window && !frame->ignore_congestion) {
+        ngx_quic_free_frame(c, frame);
+        return NGX_AGAIN;
+    }
+
+    ngx_quic_init_packet(c, ctx, &pkt, path);
+
+    min_payload = ngx_quic_payload_size(&pkt, min);
+    max_payload = ngx_quic_payload_size(&pkt, max);
+
+    /* RFC 9001, 5.4.2.  Header Protection Sample */
+    pad = 4 - pkt.num_len;
+    min_payload = ngx_max(min_payload, pad);
+
+    if (min_payload > max_payload) {
+        ngx_quic_free_frame(c, frame);
+        return NGX_AGAIN;
+    }
+
+#if (NGX_DEBUG)
+    frame->pnum = pkt.number;
+#endif
+
+    ngx_quic_log_frame(c->log, frame, 1);
+
+    len = ngx_quic_create_frame(NULL, frame);
+    if ((size_t) len > max_payload) {
+        ngx_quic_free_frame(c, frame);
+        return NGX_AGAIN;
+    }
+
+    len = ngx_quic_create_frame(src, frame);
+    if (len == -1) {
+        ngx_quic_free_frame(c, frame);
+        return NGX_ERROR;
+    }
+
+    if (len < (ssize_t) min_payload) {
+        ngx_memset(src + len, NGX_QUIC_FT_PADDING, min_payload - len);
+        len = min_payload;
+    }
+
+    pkt.payload.data = src;
+    pkt.payload.len = len;
+
+    res.data = dst;
+
+    ngx_quic_log_packet(c->log, &pkt);
+
+    if (ngx_quic_encrypt(&pkt, &res) != NGX_OK) {
+        ngx_quic_free_frame(c, frame);
+        return NGX_ERROR;
+    }
+
+    frame->pnum = ctx->pnum;
+    frame->send_time = now;
+    frame->plen = res.len;
+
+    ctx->pnum++;
+
+    sent = ngx_quic_send(c, res.data, res.len, path->sockaddr, path->socklen);
+    if (sent < 0) {
+        ngx_quic_free_frame(c, frame);
+        return sent;
+    }
+
+    path->sent += sent;
+
+    if (frame->need_ack && !qc->closing) {
+        ngx_queue_insert_tail(&ctx->sent, &frame->queue);
+
+        cg->in_flight += frame->plen;
+
+    } else {
+        ngx_quic_free_frame(c, frame);
+        return NGX_OK;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic congestion send if:%uz", cg->in_flight);
+
+    if (!qc->send_timer_set) {
+        qc->send_timer_set = 1;
+        ngx_add_timer(c->read, qc->tp.max_idle_timeout);
+    }
+
+    ngx_quic_set_lost_timer(c);
+
+    return NGX_OK;
+}
+
+
+size_t
+ngx_quic_path_limit(ngx_connection_t *c, ngx_quic_path_t *path, size_t size)
+{
+    off_t  max;
+
+    if (!path->validated) {
+        max = path->received * 3;
+        max = (path->sent >= max) ? 0 : max - path->sent;
+
+        if ((off_t) size > max) {
+            return max;
+        }
+    }
+
+    return size;
+}
diff --git a/src/event/quic/ngx_event_quic_output.h b/src/event/quic/ngx_event_quic_output.h
new file mode 100644
index 0000000..52d8a37
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_output.h
@@ -0,0 +1,40 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_OUTPUT_H_INCLUDED_
+#define _NGX_EVENT_QUIC_OUTPUT_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+ngx_int_t ngx_quic_output(ngx_connection_t *c);
+
+ngx_int_t ngx_quic_negotiate_version(ngx_connection_t *c,
+    ngx_quic_header_t *inpkt);
+
+ngx_int_t ngx_quic_send_stateless_reset(ngx_connection_t *c,
+    ngx_quic_conf_t *conf, ngx_quic_header_t *pkt);
+ngx_int_t ngx_quic_send_cc(ngx_connection_t *c);
+ngx_int_t ngx_quic_send_early_cc(ngx_connection_t *c,
+    ngx_quic_header_t *inpkt, ngx_uint_t err, const char *reason);
+
+ngx_int_t ngx_quic_send_retry(ngx_connection_t *c,
+    ngx_quic_conf_t *conf, ngx_quic_header_t *pkt);
+ngx_int_t ngx_quic_send_new_token(ngx_connection_t *c, ngx_quic_path_t *path);
+
+ngx_int_t ngx_quic_send_ack(ngx_connection_t *c,
+    ngx_quic_send_ctx_t *ctx);
+ngx_int_t ngx_quic_send_ack_range(ngx_connection_t *c,
+    ngx_quic_send_ctx_t *ctx, uint64_t smallest, uint64_t largest);
+
+ngx_int_t ngx_quic_frame_sendto(ngx_connection_t *c, ngx_quic_frame_t *frame,
+    size_t min, ngx_quic_path_t *path);
+size_t ngx_quic_path_limit(ngx_connection_t *c, ngx_quic_path_t *path,
+    size_t size);
+
+#endif /* _NGX_EVENT_QUIC_OUTPUT_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_protection.c b/src/event/quic/ngx_event_quic_protection.c
new file mode 100644
index 0000000..8223626
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_protection.c
@@ -0,0 +1,1243 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+/* RFC 9001, 5.4.1.  Header Protection Application: 5-byte mask */
+#define NGX_QUIC_HP_LEN               5
+
+#define NGX_QUIC_AES_128_KEY_LEN      16
+
+#define NGX_QUIC_INITIAL_CIPHER       TLS1_3_CK_AES_128_GCM_SHA256
+
+
+static ngx_int_t ngx_hkdf_expand(u_char *out_key, size_t out_len,
+    const EVP_MD *digest, const u_char *prk, size_t prk_len,
+    const u_char *info, size_t info_len);
+static ngx_int_t ngx_hkdf_extract(u_char *out_key, size_t *out_len,
+    const EVP_MD *digest, const u_char *secret, size_t secret_len,
+    const u_char *salt, size_t salt_len);
+
+static uint64_t ngx_quic_parse_pn(u_char **pos, ngx_int_t len, u_char *mask,
+    uint64_t *largest_pn);
+
+static ngx_int_t ngx_quic_crypto_open(ngx_quic_secret_t *s, ngx_str_t *out,
+    u_char *nonce, ngx_str_t *in, ngx_str_t *ad, ngx_log_t *log);
+#ifndef OPENSSL_IS_BORINGSSL
+static ngx_int_t ngx_quic_crypto_common(ngx_quic_secret_t *s, ngx_str_t *out,
+    u_char *nonce, ngx_str_t *in, ngx_str_t *ad, ngx_log_t *log);
+#endif
+
+static ngx_int_t ngx_quic_crypto_hp_init(const EVP_CIPHER *cipher,
+    ngx_quic_secret_t *s, ngx_log_t *log);
+static ngx_int_t ngx_quic_crypto_hp(ngx_quic_secret_t *s,
+    u_char *out, u_char *in, ngx_log_t *log);
+static void ngx_quic_crypto_hp_cleanup(ngx_quic_secret_t *s);
+
+static ngx_int_t ngx_quic_create_packet(ngx_quic_header_t *pkt,
+    ngx_str_t *res);
+static ngx_int_t ngx_quic_create_retry_packet(ngx_quic_header_t *pkt,
+    ngx_str_t *res);
+
+
+ngx_int_t
+ngx_quic_ciphers(ngx_uint_t id, ngx_quic_ciphers_t *ciphers)
+{
+    ngx_int_t  len;
+
+    switch (id) {
+
+    case TLS1_3_CK_AES_128_GCM_SHA256:
+#ifdef OPENSSL_IS_BORINGSSL
+        ciphers->c = EVP_aead_aes_128_gcm();
+#else
+        ciphers->c = EVP_aes_128_gcm();
+#endif
+        ciphers->hp = EVP_aes_128_ctr();
+        ciphers->d = EVP_sha256();
+        len = 16;
+        break;
+
+    case TLS1_3_CK_AES_256_GCM_SHA384:
+#ifdef OPENSSL_IS_BORINGSSL
+        ciphers->c = EVP_aead_aes_256_gcm();
+#else
+        ciphers->c = EVP_aes_256_gcm();
+#endif
+        ciphers->hp = EVP_aes_256_ctr();
+        ciphers->d = EVP_sha384();
+        len = 32;
+        break;
+
+    case TLS1_3_CK_CHACHA20_POLY1305_SHA256:
+#ifdef OPENSSL_IS_BORINGSSL
+        ciphers->c = EVP_aead_chacha20_poly1305();
+#else
+        ciphers->c = EVP_chacha20_poly1305();
+#endif
+#ifdef OPENSSL_IS_BORINGSSL
+        ciphers->hp = (const EVP_CIPHER *) EVP_aead_chacha20_poly1305();
+#else
+        ciphers->hp = EVP_chacha20();
+#endif
+        ciphers->d = EVP_sha256();
+        len = 32;
+        break;
+
+#ifndef OPENSSL_IS_BORINGSSL
+    case TLS1_3_CK_AES_128_CCM_SHA256:
+        ciphers->c = EVP_aes_128_ccm();
+        ciphers->hp = EVP_aes_128_ctr();
+        ciphers->d = EVP_sha256();
+        len = 16;
+        break;
+#endif
+
+    default:
+        return NGX_ERROR;
+    }
+
+    return len;
+}
+
+
+ngx_int_t
+ngx_quic_keys_set_initial_secret(ngx_quic_keys_t *keys, ngx_str_t *secret,
+    ngx_log_t *log)
+{
+    size_t               is_len;
+    uint8_t              is[SHA256_DIGEST_LENGTH];
+    ngx_str_t            iss;
+    ngx_uint_t           i;
+    const EVP_MD        *digest;
+    ngx_quic_md_t        client_key, server_key;
+    ngx_quic_hkdf_t      seq[8];
+    ngx_quic_secret_t   *client, *server;
+    ngx_quic_ciphers_t   ciphers;
+
+    static const uint8_t salt[20] =
+        "\x38\x76\x2c\xf7\xf5\x59\x34\xb3\x4d\x17"
+        "\x9a\xe6\xa4\xc8\x0c\xad\xcc\xbb\x7f\x0a";
+
+    client = &keys->secrets[ssl_encryption_initial].client;
+    server = &keys->secrets[ssl_encryption_initial].server;
+
+    /*
+     * RFC 9001, section 5.  Packet Protection
+     *
+     * Initial packets use AEAD_AES_128_GCM.  The hash function
+     * for HKDF when deriving initial secrets and keys is SHA-256.
+     */
+
+    digest = EVP_sha256();
+    is_len = SHA256_DIGEST_LENGTH;
+
+    if (ngx_hkdf_extract(is, &is_len, digest, secret->data, secret->len,
+                         salt, sizeof(salt))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    iss.len = is_len;
+    iss.data = is;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic ngx_quic_set_initial_secret");
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic salt len:%uz %*xs", sizeof(salt), sizeof(salt), salt);
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic initial secret len:%uz %*xs", is_len, is_len, is);
+#endif
+
+    client->secret.len = SHA256_DIGEST_LENGTH;
+    server->secret.len = SHA256_DIGEST_LENGTH;
+
+    client_key.len = NGX_QUIC_AES_128_KEY_LEN;
+    server_key.len = NGX_QUIC_AES_128_KEY_LEN;
+
+    client->hp.len = NGX_QUIC_AES_128_KEY_LEN;
+    server->hp.len = NGX_QUIC_AES_128_KEY_LEN;
+
+    client->iv.len = NGX_QUIC_IV_LEN;
+    server->iv.len = NGX_QUIC_IV_LEN;
+
+    /* labels per RFC 9001, 5.1. Packet Protection Keys */
+    ngx_quic_hkdf_set(&seq[0], "tls13 client in", &client->secret, &iss);
+    ngx_quic_hkdf_set(&seq[1], "tls13 quic key", &client_key, &client->secret);
+    ngx_quic_hkdf_set(&seq[2], "tls13 quic iv", &client->iv, &client->secret);
+    ngx_quic_hkdf_set(&seq[3], "tls13 quic hp", &client->hp, &client->secret);
+    ngx_quic_hkdf_set(&seq[4], "tls13 server in", &server->secret, &iss);
+    ngx_quic_hkdf_set(&seq[5], "tls13 quic key", &server_key, &server->secret);
+    ngx_quic_hkdf_set(&seq[6], "tls13 quic iv", &server->iv, &server->secret);
+    ngx_quic_hkdf_set(&seq[7], "tls13 quic hp", &server->hp, &server->secret);
+
+    for (i = 0; i < (sizeof(seq) / sizeof(seq[0])); i++) {
+        if (ngx_quic_hkdf_expand(&seq[i], digest, log) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (ngx_quic_ciphers(NGX_QUIC_INITIAL_CIPHER, &ciphers) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_quic_crypto_init(ciphers.c, client, &client_key, 0, log)
+        == NGX_ERROR)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_quic_crypto_init(ciphers.c, server, &server_key, 1, log)
+        == NGX_ERROR)
+    {
+        goto failed;
+    }
+
+    if (ngx_quic_crypto_hp_init(ciphers.hp, client, log) == NGX_ERROR) {
+        goto failed;
+    }
+
+    if (ngx_quic_crypto_hp_init(ciphers.hp, server, log) == NGX_ERROR) {
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ngx_quic_keys_cleanup(keys);
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_quic_hkdf_expand(ngx_quic_hkdf_t *h, const EVP_MD *digest, ngx_log_t *log)
+{
+    size_t    info_len;
+    uint8_t  *p;
+    uint8_t   info[20];
+
+    info_len = 2 + 1 + h->label_len + 1;
+
+    info[0] = 0;
+    info[1] = h->out_len;
+    info[2] = h->label_len;
+
+    p = ngx_cpymem(&info[3], h->label, h->label_len);
+    *p = '\0';
+
+    if (ngx_hkdf_expand(h->out, h->out_len, digest,
+                        h->prk, h->prk_len, info, info_len)
+        != NGX_OK)
+    {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0,
+                      "ngx_hkdf_expand(%*s) failed", h->label_len, h->label);
+        return NGX_ERROR;
+    }
+
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug5(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic expand \"%*s\" len:%uz %*xs",
+                   h->label_len, h->label, h->out_len, h->out_len, h->out);
+#endif
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_hkdf_expand(u_char *out_key, size_t out_len, const EVP_MD *digest,
+    const uint8_t *prk, size_t prk_len, const u_char *info, size_t info_len)
+{
+#ifdef OPENSSL_IS_BORINGSSL
+
+    if (HKDF_expand(out_key, out_len, digest, prk, prk_len, info, info_len)
+        == 0)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+
+#else
+
+    EVP_PKEY_CTX  *pctx;
+
+    pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
+    if (pctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (EVP_PKEY_derive_init(pctx) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_CTX_hkdf_mode(pctx, EVP_PKEY_HKDEF_MODE_EXPAND_ONLY) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_CTX_set_hkdf_md(pctx, digest) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_CTX_set1_hkdf_key(pctx, prk, prk_len) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_CTX_add1_hkdf_info(pctx, info, info_len) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_derive(pctx, out_key, &out_len) <= 0) {
+        goto failed;
+    }
+
+    EVP_PKEY_CTX_free(pctx);
+
+    return NGX_OK;
+
+failed:
+
+    EVP_PKEY_CTX_free(pctx);
+
+    return NGX_ERROR;
+
+#endif
+}
+
+
+static ngx_int_t
+ngx_hkdf_extract(u_char *out_key, size_t *out_len, const EVP_MD *digest,
+    const u_char *secret, size_t secret_len, const u_char *salt,
+    size_t salt_len)
+{
+#ifdef OPENSSL_IS_BORINGSSL
+
+    if (HKDF_extract(out_key, out_len, digest, secret, secret_len, salt,
+                     salt_len)
+        == 0)
+    {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+
+#else
+
+    EVP_PKEY_CTX  *pctx;
+
+    pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
+    if (pctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (EVP_PKEY_derive_init(pctx) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_CTX_hkdf_mode(pctx, EVP_PKEY_HKDEF_MODE_EXTRACT_ONLY) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_CTX_set_hkdf_md(pctx, digest) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_CTX_set1_hkdf_key(pctx, secret, secret_len) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt, salt_len) <= 0) {
+        goto failed;
+    }
+
+    if (EVP_PKEY_derive(pctx, out_key, out_len) <= 0) {
+        goto failed;
+    }
+
+    EVP_PKEY_CTX_free(pctx);
+
+    return NGX_OK;
+
+failed:
+
+    EVP_PKEY_CTX_free(pctx);
+
+    return NGX_ERROR;
+
+#endif
+}
+
+
+ngx_int_t
+ngx_quic_crypto_init(const ngx_quic_cipher_t *cipher, ngx_quic_secret_t *s,
+    ngx_quic_md_t *key, ngx_int_t enc, ngx_log_t *log)
+{
+
+#ifdef OPENSSL_IS_BORINGSSL
+    EVP_AEAD_CTX  *ctx;
+
+    ctx = EVP_AEAD_CTX_new(cipher, key->data, key->len,
+                           EVP_AEAD_DEFAULT_TAG_LENGTH);
+    if (ctx == NULL) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_AEAD_CTX_new() failed");
+        return NGX_ERROR;
+    }
+#else
+    EVP_CIPHER_CTX  *ctx;
+
+    ctx = EVP_CIPHER_CTX_new();
+    if (ctx == NULL) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CIPHER_CTX_new() failed");
+        return NGX_ERROR;
+    }
+
+    if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc) != 1) {
+        EVP_CIPHER_CTX_free(ctx);
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CipherInit_ex() failed");
+        return NGX_ERROR;
+    }
+
+    if (EVP_CIPHER_mode(cipher) == EVP_CIPH_CCM_MODE
+        && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, NGX_QUIC_TAG_LEN,
+                               NULL)
+           == 0)
+    {
+        EVP_CIPHER_CTX_free(ctx);
+        ngx_ssl_error(NGX_LOG_INFO, log, 0,
+                      "EVP_CIPHER_CTX_ctrl(EVP_CTRL_AEAD_SET_TAG) failed");
+        return NGX_ERROR;
+    }
+
+    if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, s->iv.len, NULL)
+        == 0)
+    {
+        EVP_CIPHER_CTX_free(ctx);
+        ngx_ssl_error(NGX_LOG_INFO, log, 0,
+                      "EVP_CIPHER_CTX_ctrl(EVP_CTRL_AEAD_SET_IVLEN) failed");
+        return NGX_ERROR;
+    }
+
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, key->data, NULL, enc) != 1) {
+        EVP_CIPHER_CTX_free(ctx);
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CipherInit_ex() failed");
+        return NGX_ERROR;
+    }
+#endif
+
+    s->ctx = ctx;
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_crypto_open(ngx_quic_secret_t *s, ngx_str_t *out, u_char *nonce,
+    ngx_str_t *in, ngx_str_t *ad, ngx_log_t *log)
+{
+#ifdef OPENSSL_IS_BORINGSSL
+    if (EVP_AEAD_CTX_open(s->ctx, out->data, &out->len, out->len, nonce,
+                          s->iv.len, in->data, in->len, ad->data, ad->len)
+        != 1)
+    {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_AEAD_CTX_open() failed");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+#else
+    return ngx_quic_crypto_common(s, out, nonce, in, ad, log);
+#endif
+}
+
+
+ngx_int_t
+ngx_quic_crypto_seal(ngx_quic_secret_t *s, ngx_str_t *out, u_char *nonce,
+    ngx_str_t *in, ngx_str_t *ad, ngx_log_t *log)
+{
+#ifdef OPENSSL_IS_BORINGSSL
+    if (EVP_AEAD_CTX_seal(s->ctx, out->data, &out->len, out->len, nonce,
+                          s->iv.len, in->data, in->len, ad->data, ad->len)
+        != 1)
+    {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_AEAD_CTX_seal() failed");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+#else
+    return ngx_quic_crypto_common(s, out, nonce, in, ad, log);
+#endif
+}
+
+
+#ifndef OPENSSL_IS_BORINGSSL
+
+static ngx_int_t
+ngx_quic_crypto_common(ngx_quic_secret_t *s, ngx_str_t *out, u_char *nonce,
+    ngx_str_t *in, ngx_str_t *ad, ngx_log_t *log)
+{
+    int                     len, enc;
+    ngx_quic_crypto_ctx_t  *ctx;
+
+    ctx = s->ctx;
+    enc = EVP_CIPHER_CTX_encrypting(ctx);
+
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, nonce, enc) != 1) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CipherInit_ex() failed");
+        return NGX_ERROR;
+    }
+
+    if (enc == 0) {
+        in->len -= NGX_QUIC_TAG_LEN;
+
+        if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, NGX_QUIC_TAG_LEN,
+                                in->data + in->len)
+            == 0)
+        {
+            ngx_ssl_error(NGX_LOG_INFO, log, 0,
+                          "EVP_CIPHER_CTX_ctrl(EVP_CTRL_AEAD_SET_TAG) failed");
+            return NGX_ERROR;
+        }
+    }
+
+    if (EVP_CIPHER_mode(EVP_CIPHER_CTX_cipher(ctx)) == EVP_CIPH_CCM_MODE
+        && EVP_CipherUpdate(ctx, NULL, &len, NULL, in->len) != 1)
+    {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CipherUpdate() failed");
+        return NGX_ERROR;
+    }
+
+    if (EVP_CipherUpdate(ctx, NULL, &len, ad->data, ad->len) != 1) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CipherUpdate() failed");
+        return NGX_ERROR;
+    }
+
+    if (EVP_CipherUpdate(ctx, out->data, &len, in->data, in->len) != 1) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CipherUpdate() failed");
+        return NGX_ERROR;
+    }
+
+    out->len = len;
+
+    if (EVP_CipherFinal_ex(ctx, out->data + out->len, &len) <= 0) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CipherFinal_ex failed");
+        return NGX_ERROR;
+    }
+
+    out->len += len;
+
+    if (enc == 1) {
+        if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, NGX_QUIC_TAG_LEN,
+                                out->data + out->len)
+            == 0)
+        {
+            ngx_ssl_error(NGX_LOG_INFO, log, 0,
+                          "EVP_CIPHER_CTX_ctrl(EVP_CTRL_AEAD_GET_TAG) failed");
+            return NGX_ERROR;
+        }
+
+        out->len += NGX_QUIC_TAG_LEN;
+    }
+
+    return NGX_OK;
+}
+
+#endif
+
+
+void
+ngx_quic_crypto_cleanup(ngx_quic_secret_t *s)
+{
+    if (s->ctx) {
+#ifdef OPENSSL_IS_BORINGSSL
+        EVP_AEAD_CTX_free(s->ctx);
+#else
+        EVP_CIPHER_CTX_free(s->ctx);
+#endif
+        s->ctx = NULL;
+    }
+}
+
+
+static ngx_int_t
+ngx_quic_crypto_hp_init(const EVP_CIPHER *cipher, ngx_quic_secret_t *s,
+    ngx_log_t *log)
+{
+    EVP_CIPHER_CTX  *ctx;
+
+#ifdef OPENSSL_IS_BORINGSSL
+    if (cipher == (EVP_CIPHER *) EVP_aead_chacha20_poly1305()) {
+        /* no EVP interface */
+        s->hp_ctx = NULL;
+        return NGX_OK;
+    }
+#endif
+
+    ctx = EVP_CIPHER_CTX_new();
+    if (ctx == NULL) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CIPHER_CTX_new() failed");
+        return NGX_ERROR;
+    }
+
+    if (EVP_EncryptInit_ex(ctx, cipher, NULL, s->hp.data, NULL) != 1) {
+        EVP_CIPHER_CTX_free(ctx);
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_EncryptInit_ex() failed");
+        return NGX_ERROR;
+    }
+
+    s->hp_ctx = ctx;
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_crypto_hp(ngx_quic_secret_t *s, u_char *out, u_char *in,
+    ngx_log_t *log)
+{
+    int              outlen;
+    EVP_CIPHER_CTX  *ctx;
+    u_char           zero[NGX_QUIC_HP_LEN] = {0};
+
+    ctx = s->hp_ctx;
+
+#ifdef OPENSSL_IS_BORINGSSL
+    uint32_t         cnt;
+
+    if (ctx == NULL) {
+        ngx_memcpy(&cnt, in, sizeof(uint32_t));
+        CRYPTO_chacha_20(out, zero, NGX_QUIC_HP_LEN, s->hp.data, &in[4], cnt);
+        return NGX_OK;
+    }
+#endif
+
+    if (EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, in) != 1) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_EncryptInit_ex() failed");
+        return NGX_ERROR;
+    }
+
+    if (!EVP_EncryptUpdate(ctx, out, &outlen, zero, NGX_QUIC_HP_LEN)) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_EncryptUpdate() failed");
+        return NGX_ERROR;
+    }
+
+    if (!EVP_EncryptFinal_ex(ctx, out + NGX_QUIC_HP_LEN, &outlen)) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_EncryptFinal_Ex() failed");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_crypto_hp_cleanup(ngx_quic_secret_t *s)
+{
+    if (s->hp_ctx) {
+        EVP_CIPHER_CTX_free(s->hp_ctx);
+        s->hp_ctx = NULL;
+    }
+}
+
+
+ngx_int_t
+ngx_quic_keys_set_encryption_secret(ngx_log_t *log, ngx_uint_t is_write,
+    ngx_quic_keys_t *keys, enum ssl_encryption_level_t level,
+    const SSL_CIPHER *cipher, const uint8_t *secret, size_t secret_len)
+{
+    ngx_int_t            key_len;
+    ngx_str_t            secret_str;
+    ngx_uint_t           i;
+    ngx_quic_md_t        key;
+    ngx_quic_hkdf_t      seq[3];
+    ngx_quic_secret_t   *peer_secret;
+    ngx_quic_ciphers_t   ciphers;
+
+    peer_secret = is_write ? &keys->secrets[level].server
+                           : &keys->secrets[level].client;
+
+    keys->cipher = SSL_CIPHER_get_id(cipher);
+
+    key_len = ngx_quic_ciphers(keys->cipher, &ciphers);
+
+    if (key_len == NGX_ERROR) {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0, "unexpected cipher");
+        return NGX_ERROR;
+    }
+
+    if (sizeof(peer_secret->secret.data) < secret_len) {
+        ngx_log_error(NGX_LOG_ALERT, log, 0,
+                      "unexpected secret len: %uz", secret_len);
+        return NGX_ERROR;
+    }
+
+    peer_secret->secret.len = secret_len;
+    ngx_memcpy(peer_secret->secret.data, secret, secret_len);
+
+    key.len = key_len;
+    peer_secret->iv.len = NGX_QUIC_IV_LEN;
+    peer_secret->hp.len = key_len;
+
+    secret_str.len = secret_len;
+    secret_str.data = (u_char *) secret;
+
+    ngx_quic_hkdf_set(&seq[0], "tls13 quic key", &key, &secret_str);
+    ngx_quic_hkdf_set(&seq[1], "tls13 quic iv", &peer_secret->iv, &secret_str);
+    ngx_quic_hkdf_set(&seq[2], "tls13 quic hp", &peer_secret->hp, &secret_str);
+
+    for (i = 0; i < (sizeof(seq) / sizeof(seq[0])); i++) {
+        if (ngx_quic_hkdf_expand(&seq[i], ciphers.d, log) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (ngx_quic_crypto_init(ciphers.c, peer_secret, &key, is_write, log)
+        == NGX_ERROR)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_quic_crypto_hp_init(ciphers.hp, peer_secret, log) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    ngx_explicit_memzero(key.data, key.len);
+
+    return NGX_OK;
+}
+
+
+ngx_uint_t
+ngx_quic_keys_available(ngx_quic_keys_t *keys,
+    enum ssl_encryption_level_t level, ngx_uint_t is_write)
+{
+    if (is_write == 0) {
+        return keys->secrets[level].client.ctx != NULL;
+    }
+
+    return keys->secrets[level].server.ctx != NULL;
+}
+
+
+void
+ngx_quic_keys_discard(ngx_quic_keys_t *keys,
+    enum ssl_encryption_level_t level)
+{
+    ngx_quic_secret_t  *client, *server;
+
+    client = &keys->secrets[level].client;
+    server = &keys->secrets[level].server;
+
+    ngx_quic_crypto_cleanup(client);
+    ngx_quic_crypto_cleanup(server);
+
+    ngx_quic_crypto_hp_cleanup(client);
+    ngx_quic_crypto_hp_cleanup(server);
+
+    ngx_explicit_memzero(client->secret.data, client->secret.len);
+    ngx_explicit_memzero(server->secret.data, server->secret.len);
+}
+
+
+void
+ngx_quic_keys_switch(ngx_connection_t *c, ngx_quic_keys_t *keys)
+{
+    ngx_quic_secrets_t  *current, *next, tmp;
+
+    current = &keys->secrets[ssl_encryption_application];
+    next = &keys->next_key;
+
+    ngx_quic_crypto_cleanup(&current->client);
+    ngx_quic_crypto_cleanup(&current->server);
+
+    tmp = *current;
+    *current = *next;
+    *next = tmp;
+}
+
+
+void
+ngx_quic_keys_update(ngx_event_t *ev)
+{
+    ngx_int_t               key_len;
+    ngx_uint_t              i;
+    ngx_quic_md_t           client_key, server_key;
+    ngx_quic_hkdf_t         seq[6];
+    ngx_quic_keys_t        *keys;
+    ngx_connection_t       *c;
+    ngx_quic_ciphers_t      ciphers;
+    ngx_quic_secrets_t     *current, *next;
+    ngx_quic_connection_t  *qc;
+
+    c = ev->data;
+    qc = ngx_quic_get_connection(c);
+    keys = qc->keys;
+
+    current = &keys->secrets[ssl_encryption_application];
+    next = &keys->next_key;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic key update");
+
+    c->log->action = "updating keys";
+
+    key_len = ngx_quic_ciphers(keys->cipher, &ciphers);
+
+    if (key_len == NGX_ERROR) {
+        goto failed;
+    }
+
+    client_key.len = key_len;
+    server_key.len = key_len;
+
+    next->client.secret.len = current->client.secret.len;
+    next->client.iv.len = NGX_QUIC_IV_LEN;
+    next->client.hp = current->client.hp;
+    next->client.hp_ctx = current->client.hp_ctx;
+
+    next->server.secret.len = current->server.secret.len;
+    next->server.iv.len = NGX_QUIC_IV_LEN;
+    next->server.hp = current->server.hp;
+    next->server.hp_ctx = current->server.hp_ctx;
+
+    ngx_quic_hkdf_set(&seq[0], "tls13 quic ku",
+                      &next->client.secret, &current->client.secret);
+    ngx_quic_hkdf_set(&seq[1], "tls13 quic key",
+                      &client_key, &next->client.secret);
+    ngx_quic_hkdf_set(&seq[2], "tls13 quic iv",
+                      &next->client.iv, &next->client.secret);
+    ngx_quic_hkdf_set(&seq[3], "tls13 quic ku",
+                      &next->server.secret, &current->server.secret);
+    ngx_quic_hkdf_set(&seq[4], "tls13 quic key",
+                      &server_key, &next->server.secret);
+    ngx_quic_hkdf_set(&seq[5], "tls13 quic iv",
+                      &next->server.iv, &next->server.secret);
+
+    for (i = 0; i < (sizeof(seq) / sizeof(seq[0])); i++) {
+        if (ngx_quic_hkdf_expand(&seq[i], ciphers.d, c->log) != NGX_OK) {
+            goto failed;
+        }
+    }
+
+    if (ngx_quic_crypto_init(ciphers.c, &next->client, &client_key, 0, c->log)
+        == NGX_ERROR)
+    {
+        goto failed;
+    }
+
+    if (ngx_quic_crypto_init(ciphers.c, &next->server, &server_key, 1, c->log)
+        == NGX_ERROR)
+    {
+        goto failed;
+    }
+
+    ngx_explicit_memzero(current->client.secret.data,
+                         current->client.secret.len);
+    ngx_explicit_memzero(current->server.secret.data,
+                         current->server.secret.len);
+
+    ngx_explicit_memzero(client_key.data, client_key.len);
+    ngx_explicit_memzero(server_key.data, server_key.len);
+
+    return;
+
+failed:
+
+    ngx_quic_close_connection(c, NGX_ERROR);
+}
+
+
+void
+ngx_quic_keys_cleanup(ngx_quic_keys_t *keys)
+{
+    ngx_uint_t           i;
+    ngx_quic_secrets_t  *next;
+
+    for (i = 0; i < NGX_QUIC_ENCRYPTION_LAST; i++) {
+        ngx_quic_keys_discard(keys, i);
+    }
+
+    next = &keys->next_key;
+
+    ngx_quic_crypto_cleanup(&next->client);
+    ngx_quic_crypto_cleanup(&next->server);
+
+    ngx_explicit_memzero(next->client.secret.data,
+                         next->client.secret.len);
+    ngx_explicit_memzero(next->server.secret.data,
+                         next->server.secret.len);
+}
+
+
+static ngx_int_t
+ngx_quic_create_packet(ngx_quic_header_t *pkt, ngx_str_t *res)
+{
+    u_char             *pnp, *sample;
+    ngx_str_t           ad, out;
+    ngx_uint_t          i;
+    ngx_quic_secret_t  *secret;
+    u_char              nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
+
+    ad.data = res->data;
+    ad.len = ngx_quic_create_header(pkt, ad.data, &pnp);
+
+    out.len = pkt->payload.len + NGX_QUIC_TAG_LEN;
+    out.data = res->data + ad.len;
+
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                   "quic ad len:%uz %xV", ad.len, &ad);
+#endif
+
+    secret = &pkt->keys->secrets[pkt->level].server;
+
+    ngx_memcpy(nonce, secret->iv.data, secret->iv.len);
+    ngx_quic_compute_nonce(nonce, sizeof(nonce), pkt->number);
+
+    if (ngx_quic_crypto_seal(secret, &out, nonce, &pkt->payload, &ad, pkt->log)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    sample = &out.data[4 - pkt->num_len];
+    if (ngx_quic_crypto_hp(secret, mask, sample, pkt->log) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    /* RFC 9001, 5.4.1.  Header Protection Application */
+    ad.data[0] ^= mask[0] & ngx_quic_pkt_hp_mask(pkt->flags);
+
+    for (i = 0; i < pkt->num_len; i++) {
+        pnp[i] ^= mask[i + 1];
+    }
+
+    res->len = ad.len + out.len;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_create_retry_packet(ngx_quic_header_t *pkt, ngx_str_t *res)
+{
+    u_char              *start;
+    ngx_str_t            ad, itag;
+    ngx_quic_md_t        key;
+    ngx_quic_secret_t    secret;
+    ngx_quic_ciphers_t   ciphers;
+
+    /* 5.8.  Retry Packet Integrity */
+    static u_char     key_data[16] =
+        "\xbe\x0c\x69\x0b\x9f\x66\x57\x5a\x1d\x76\x6b\x54\xe3\x68\xc8\x4e";
+    static u_char     nonce[NGX_QUIC_IV_LEN] =
+        "\x46\x15\x99\xd3\x5d\x63\x2b\xf2\x23\x98\x25\xbb";
+    static ngx_str_t  in = ngx_string("");
+
+    ad.data = res->data;
+    ad.len = ngx_quic_create_retry_itag(pkt, ad.data, &start);
+
+    itag.data = ad.data + ad.len;
+    itag.len = NGX_QUIC_TAG_LEN;
+
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                   "quic retry itag len:%uz %xV", ad.len, &ad);
+#endif
+
+    if (ngx_quic_ciphers(NGX_QUIC_INITIAL_CIPHER, &ciphers) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    key.len = sizeof(key_data);
+    ngx_memcpy(key.data, key_data, sizeof(key_data));
+    secret.iv.len = NGX_QUIC_IV_LEN;
+
+    if (ngx_quic_crypto_init(ciphers.c, &secret, &key, 1, pkt->log)
+        == NGX_ERROR)
+    {
+        return NGX_ERROR;
+    }
+
+    if (ngx_quic_crypto_seal(&secret, &itag, nonce, &in, &ad, pkt->log)
+        != NGX_OK)
+    {
+        ngx_quic_crypto_cleanup(&secret);
+        return NGX_ERROR;
+    }
+
+    ngx_quic_crypto_cleanup(&secret);
+
+    res->len = itag.data + itag.len - start;
+    res->data = start;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_derive_key(ngx_log_t *log, const char *label, ngx_str_t *secret,
+    ngx_str_t *salt, u_char *out, size_t len)
+{
+    size_t         is_len, info_len;
+    uint8_t       *p;
+    const EVP_MD  *digest;
+
+    uint8_t        is[SHA256_DIGEST_LENGTH];
+    uint8_t        info[20];
+
+    digest = EVP_sha256();
+    is_len = SHA256_DIGEST_LENGTH;
+
+    if (ngx_hkdf_extract(is, &is_len, digest, secret->data, secret->len,
+                         salt->data, salt->len)
+        != NGX_OK)
+    {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0,
+                      "ngx_hkdf_extract(%s) failed", label);
+        return NGX_ERROR;
+    }
+
+    info[0] = 0;
+    info[1] = len;
+    info[2] = ngx_strlen(label);
+
+    info_len = 2 + 1 + info[2] + 1;
+
+    if (info_len >= 20) {
+        ngx_log_error(NGX_LOG_INFO, log, 0,
+                      "ngx_quic_create_key label \"%s\" too long", label);
+        return NGX_ERROR;
+    }
+
+    p = ngx_cpymem(&info[3], label, info[2]);
+    *p = '\0';
+
+    if (ngx_hkdf_expand(out, len, digest, is, is_len, info, info_len) != NGX_OK)
+    {
+        ngx_ssl_error(NGX_LOG_INFO, log, 0,
+                      "ngx_hkdf_expand(%s) failed", label);
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static uint64_t
+ngx_quic_parse_pn(u_char **pos, ngx_int_t len, u_char *mask,
+    uint64_t *largest_pn)
+{
+    u_char    *p;
+    uint64_t   truncated_pn, expected_pn, candidate_pn;
+    uint64_t   pn_nbits, pn_win, pn_hwin, pn_mask;
+
+    pn_nbits = ngx_min(len * 8, 62);
+
+    p = *pos;
+    truncated_pn = *p++ ^ *mask++;
+
+    while (--len) {
+        truncated_pn = (truncated_pn << 8) + (*p++ ^ *mask++);
+    }
+
+    *pos = p;
+
+    expected_pn = *largest_pn + 1;
+    pn_win = 1ULL << pn_nbits;
+    pn_hwin = pn_win / 2;
+    pn_mask = pn_win - 1;
+
+    candidate_pn = (expected_pn & ~pn_mask) | truncated_pn;
+
+    if ((int64_t) candidate_pn <= (int64_t) (expected_pn - pn_hwin)
+        && candidate_pn < (1ULL << 62) - pn_win)
+    {
+        candidate_pn += pn_win;
+
+    } else if (candidate_pn > expected_pn + pn_hwin
+               && candidate_pn >= pn_win)
+    {
+        candidate_pn -= pn_win;
+    }
+
+    *largest_pn = ngx_max((int64_t) *largest_pn, (int64_t) candidate_pn);
+
+    return candidate_pn;
+}
+
+
+void
+ngx_quic_compute_nonce(u_char *nonce, size_t len, uint64_t pn)
+{
+    nonce[len - 8] ^= (pn >> 56) & 0x3f;
+    nonce[len - 7] ^= (pn >> 48) & 0xff;
+    nonce[len - 6] ^= (pn >> 40) & 0xff;
+    nonce[len - 5] ^= (pn >> 32) & 0xff;
+    nonce[len - 4] ^= (pn >> 24) & 0xff;
+    nonce[len - 3] ^= (pn >> 16) & 0xff;
+    nonce[len - 2] ^= (pn >> 8) & 0xff;
+    nonce[len - 1] ^= pn & 0xff;
+}
+
+
+ngx_int_t
+ngx_quic_encrypt(ngx_quic_header_t *pkt, ngx_str_t *res)
+{
+    if (ngx_quic_pkt_retry(pkt->flags)) {
+        return ngx_quic_create_retry_packet(pkt, res);
+    }
+
+    return ngx_quic_create_packet(pkt, res);
+}
+
+
+ngx_int_t
+ngx_quic_decrypt(ngx_quic_header_t *pkt, uint64_t *largest_pn)
+{
+    u_char             *p, *sample;
+    size_t              len;
+    uint64_t            pn, lpn;
+    ngx_int_t           pnl;
+    ngx_str_t           in, ad;
+    ngx_uint_t          key_phase;
+    ngx_quic_secret_t  *secret;
+    uint8_t             nonce[NGX_QUIC_IV_LEN], mask[NGX_QUIC_HP_LEN];
+
+    secret = &pkt->keys->secrets[pkt->level].client;
+
+    p = pkt->raw->pos;
+    len = pkt->data + pkt->len - p;
+
+    /*
+     * RFC 9001, 5.4.2. Header Protection Sample
+     *           5.4.3. AES-Based Header Protection
+     *           5.4.4. ChaCha20-Based Header Protection
+     *
+     * the Packet Number field is assumed to be 4 bytes long
+     * AES and ChaCha20 algorithms sample 16 bytes
+     */
+
+    if (len < NGX_QUIC_TAG_LEN + 4) {
+        return NGX_DECLINED;
+    }
+
+    sample = p + 4;
+
+    /* header protection */
+
+    if (ngx_quic_crypto_hp(secret, mask, sample, pkt->log) != NGX_OK) {
+        return NGX_DECLINED;
+    }
+
+    pkt->flags ^= mask[0] & ngx_quic_pkt_hp_mask(pkt->flags);
+
+    if (ngx_quic_short_pkt(pkt->flags)) {
+        key_phase = (pkt->flags & NGX_QUIC_PKT_KPHASE) != 0;
+
+        if (key_phase != pkt->key_phase) {
+            if (pkt->keys->next_key.client.ctx != NULL) {
+                secret = &pkt->keys->next_key.client;
+                pkt->key_update = 1;
+
+            } else {
+                /*
+                 * RFC 9001,  6.3. Timing of Receive Key Generation.
+                 *
+                 * Trial decryption to avoid timing side-channel.
+                 */
+                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                               "quic next key missing");
+            }
+        }
+    }
+
+    lpn = *largest_pn;
+
+    pnl = (pkt->flags & 0x03) + 1;
+    pn = ngx_quic_parse_pn(&p, pnl, &mask[1], &lpn);
+
+    pkt->pn = pn;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                   "quic packet rx clearflags:%xd", pkt->flags);
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                   "quic packet rx number:%uL len:%xi", pn, pnl);
+
+    /* packet protection */
+
+    in.data = p;
+    in.len = len - pnl;
+
+    ad.len = p - pkt->data;
+    ad.data = pkt->plaintext;
+
+    ngx_memcpy(ad.data, pkt->data, ad.len);
+    ad.data[0] = pkt->flags;
+
+    do {
+        ad.data[ad.len - pnl] = pn >> (8 * (pnl - 1)) % 256;
+    } while (--pnl);
+
+    ngx_memcpy(nonce, secret->iv.data, secret->iv.len);
+    ngx_quic_compute_nonce(nonce, sizeof(nonce), pn);
+
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                   "quic ad len:%uz %xV", ad.len, &ad);
+#endif
+
+    pkt->payload.len = in.len - NGX_QUIC_TAG_LEN;
+    pkt->payload.data = pkt->plaintext + ad.len;
+
+    if (ngx_quic_crypto_open(secret, &pkt->payload, nonce, &in, &ad, pkt->log)
+        != NGX_OK)
+    {
+        return NGX_DECLINED;
+    }
+
+    if (pkt->payload.len == 0) {
+        /*
+         * RFC 9000, 12.4.  Frames and Frame Types
+         *
+         * An endpoint MUST treat receipt of a packet containing no
+         * frames as a connection error of type PROTOCOL_VIOLATION.
+         */
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic zero-length packet");
+        pkt->error = NGX_QUIC_ERR_PROTOCOL_VIOLATION;
+        return NGX_ERROR;
+    }
+
+    if (pkt->flags & ngx_quic_pkt_rb_mask(pkt->flags)) {
+        /*
+         * RFC 9000, Reserved Bits
+         *
+         * An endpoint MUST treat receipt of a packet that has
+         * a non-zero value for these bits, after removing both
+         * packet and header protection, as a connection error
+         * of type PROTOCOL_VIOLATION.
+         */
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic reserved bit set in packet");
+        pkt->error = NGX_QUIC_ERR_PROTOCOL_VIOLATION;
+        return NGX_ERROR;
+    }
+
+#if defined(NGX_QUIC_DEBUG_CRYPTO) && defined(NGX_QUIC_DEBUG_PACKETS)
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                   "quic packet payload len:%uz %xV",
+                   pkt->payload.len, &pkt->payload);
+#endif
+
+    *largest_pn = lpn;
+
+    return NGX_OK;
+}
diff --git a/src/event/quic/ngx_event_quic_protection.h b/src/event/quic/ngx_event_quic_protection.h
new file mode 100644
index 0000000..34cfee6
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_protection.h
@@ -0,0 +1,120 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_PROTECTION_H_INCLUDED_
+#define _NGX_EVENT_QUIC_PROTECTION_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+#include <ngx_event_quic_transport.h>
+
+
+#define NGX_QUIC_ENCRYPTION_LAST  ((ssl_encryption_application) + 1)
+
+/* RFC 5116, 5.1/5.3 and RFC 8439, 2.3/2.5 for all supported ciphers */
+#define NGX_QUIC_IV_LEN               12
+#define NGX_QUIC_TAG_LEN              16
+
+/* largest hash used in TLS is SHA-384 */
+#define NGX_QUIC_MAX_MD_SIZE          48
+
+
+#ifdef OPENSSL_IS_BORINGSSL
+#define ngx_quic_cipher_t             EVP_AEAD
+#define ngx_quic_crypto_ctx_t         EVP_AEAD_CTX
+#else
+#define ngx_quic_cipher_t             EVP_CIPHER
+#define ngx_quic_crypto_ctx_t         EVP_CIPHER_CTX
+#endif
+
+
+typedef struct {
+    size_t                    len;
+    u_char                    data[NGX_QUIC_MAX_MD_SIZE];
+} ngx_quic_md_t;
+
+
+typedef struct {
+    size_t                    len;
+    u_char                    data[NGX_QUIC_IV_LEN];
+} ngx_quic_iv_t;
+
+
+typedef struct {
+    ngx_quic_md_t             secret;
+    ngx_quic_iv_t             iv;
+    ngx_quic_md_t             hp;
+    ngx_quic_crypto_ctx_t    *ctx;
+    EVP_CIPHER_CTX           *hp_ctx;
+} ngx_quic_secret_t;
+
+
+typedef struct {
+    ngx_quic_secret_t         client;
+    ngx_quic_secret_t         server;
+} ngx_quic_secrets_t;
+
+
+struct ngx_quic_keys_s {
+    ngx_quic_secrets_t        secrets[NGX_QUIC_ENCRYPTION_LAST];
+    ngx_quic_secrets_t        next_key;
+    ngx_uint_t                cipher;
+};
+
+
+typedef struct {
+    const ngx_quic_cipher_t  *c;
+    const EVP_CIPHER         *hp;
+    const EVP_MD             *d;
+} ngx_quic_ciphers_t;
+
+
+typedef struct {
+    size_t                    out_len;
+    u_char                   *out;
+
+    size_t                    prk_len;
+    const uint8_t            *prk;
+
+    size_t                    label_len;
+    const u_char             *label;
+} ngx_quic_hkdf_t;
+
+#define ngx_quic_hkdf_set(seq, _label, _out, _prk)                            \
+    (seq)->out_len = (_out)->len; (seq)->out = (_out)->data;                  \
+    (seq)->prk_len = (_prk)->len, (seq)->prk = (_prk)->data,                  \
+    (seq)->label_len = (sizeof(_label) - 1); (seq)->label = (u_char *)(_label);
+
+
+ngx_int_t ngx_quic_keys_set_initial_secret(ngx_quic_keys_t *keys,
+    ngx_str_t *secret, ngx_log_t *log);
+ngx_int_t ngx_quic_keys_set_encryption_secret(ngx_log_t *log,
+    ngx_uint_t is_write, ngx_quic_keys_t *keys,
+    enum ssl_encryption_level_t level, const SSL_CIPHER *cipher,
+    const uint8_t *secret, size_t secret_len);
+ngx_uint_t ngx_quic_keys_available(ngx_quic_keys_t *keys,
+    enum ssl_encryption_level_t level, ngx_uint_t is_write);
+void ngx_quic_keys_discard(ngx_quic_keys_t *keys,
+    enum ssl_encryption_level_t level);
+void ngx_quic_keys_switch(ngx_connection_t *c, ngx_quic_keys_t *keys);
+void ngx_quic_keys_update(ngx_event_t *ev);
+void ngx_quic_keys_cleanup(ngx_quic_keys_t *keys);
+ngx_int_t ngx_quic_encrypt(ngx_quic_header_t *pkt, ngx_str_t *res);
+ngx_int_t ngx_quic_decrypt(ngx_quic_header_t *pkt, uint64_t *largest_pn);
+void ngx_quic_compute_nonce(u_char *nonce, size_t len, uint64_t pn);
+ngx_int_t ngx_quic_ciphers(ngx_uint_t id, ngx_quic_ciphers_t *ciphers);
+ngx_int_t ngx_quic_crypto_init(const ngx_quic_cipher_t *cipher,
+    ngx_quic_secret_t *s, ngx_quic_md_t *key, ngx_int_t enc, ngx_log_t *log);
+ngx_int_t ngx_quic_crypto_seal(ngx_quic_secret_t *s, ngx_str_t *out,
+    u_char *nonce, ngx_str_t *in, ngx_str_t *ad, ngx_log_t *log);
+void ngx_quic_crypto_cleanup(ngx_quic_secret_t *s);
+ngx_int_t ngx_quic_hkdf_expand(ngx_quic_hkdf_t *hkdf, const EVP_MD *digest,
+    ngx_log_t *log);
+
+
+#endif /* _NGX_EVENT_QUIC_PROTECTION_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_socket.c b/src/event/quic/ngx_event_quic_socket.c
new file mode 100644
index 0000000..c2bc822
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_socket.c
@@ -0,0 +1,237 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+ngx_int_t
+ngx_quic_open_sockets(ngx_connection_t *c, ngx_quic_connection_t *qc,
+    ngx_quic_header_t *pkt)
+{
+    ngx_quic_socket_t     *qsock, *tmp;
+    ngx_quic_client_id_t  *cid;
+
+    /*
+     * qc->path = NULL
+     *
+     * qc->nclient_ids = 0
+     * qc->nsockets = 0
+     * qc->max_retired_seqnum = 0
+     * qc->client_seqnum = 0
+     */
+
+    ngx_queue_init(&qc->sockets);
+    ngx_queue_init(&qc->free_sockets);
+
+    ngx_queue_init(&qc->paths);
+    ngx_queue_init(&qc->free_paths);
+
+    ngx_queue_init(&qc->client_ids);
+    ngx_queue_init(&qc->free_client_ids);
+
+    qc->tp.original_dcid.len = pkt->odcid.len;
+    qc->tp.original_dcid.data = ngx_pstrdup(c->pool, &pkt->odcid);
+    if (qc->tp.original_dcid.data == NULL) {
+        return NGX_ERROR;
+    }
+
+    /* socket to use for further processing (id auto-generated) */
+    qsock = ngx_quic_create_socket(c, qc);
+    if (qsock == NULL) {
+        return NGX_ERROR;
+    }
+
+    /* socket is listening at new server id */
+    if (ngx_quic_listen(c, qc, qsock) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    qsock->used = 1;
+
+    qc->tp.initial_scid.len = qsock->sid.len;
+    qc->tp.initial_scid.data = ngx_pnalloc(c->pool, qsock->sid.len);
+    if (qc->tp.initial_scid.data == NULL) {
+        goto failed;
+    }
+    ngx_memcpy(qc->tp.initial_scid.data, qsock->sid.id, qsock->sid.len);
+
+    /* for all packets except first, this is set at udp layer */
+    c->udp = &qsock->udp;
+
+    /* ngx_quic_get_connection(c) macro is now usable */
+
+    /* we have a client identified by scid */
+    cid = ngx_quic_create_client_id(c, &pkt->scid, 0, NULL);
+    if (cid == NULL) {
+        goto failed;
+    }
+
+    /* path of the first packet is our initial active path */
+    qc->path = ngx_quic_new_path(c, c->sockaddr, c->socklen, cid);
+    if (qc->path == NULL) {
+        goto failed;
+    }
+
+    qc->path->tag = NGX_QUIC_PATH_ACTIVE;
+
+    if (pkt->validated) {
+        qc->path->validated = 1;
+    }
+
+    ngx_quic_path_dbg(c, "set active", qc->path);
+
+    tmp = ngx_pcalloc(c->pool, sizeof(ngx_quic_socket_t));
+    if (tmp == NULL) {
+        goto failed;
+    }
+
+    tmp->sid.seqnum = NGX_QUIC_UNSET_PN; /* temporary socket */
+
+    ngx_memcpy(tmp->sid.id, pkt->dcid.data, pkt->dcid.len);
+    tmp->sid.len = pkt->dcid.len;
+
+    if (ngx_quic_listen(c, qc, tmp) != NGX_OK) {
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ngx_rbtree_delete(&c->listening->rbtree, &qsock->udp.node);
+    c->udp = NULL;
+
+    return NGX_ERROR;
+}
+
+
+ngx_quic_socket_t *
+ngx_quic_create_socket(ngx_connection_t *c, ngx_quic_connection_t *qc)
+{
+    ngx_queue_t        *q;
+    ngx_quic_socket_t  *sock;
+
+    if (!ngx_queue_empty(&qc->free_sockets)) {
+
+        q = ngx_queue_head(&qc->free_sockets);
+        sock = ngx_queue_data(q, ngx_quic_socket_t, queue);
+
+        ngx_queue_remove(&sock->queue);
+
+        ngx_memzero(sock, sizeof(ngx_quic_socket_t));
+
+    } else {
+
+        sock = ngx_pcalloc(c->pool, sizeof(ngx_quic_socket_t));
+        if (sock == NULL) {
+            return NULL;
+        }
+    }
+
+    sock->sid.len = NGX_QUIC_SERVER_CID_LEN;
+    if (ngx_quic_create_server_id(c, sock->sid.id) != NGX_OK) {
+        return NULL;
+    }
+
+    sock->sid.seqnum = qc->server_seqnum++;
+
+    return sock;
+}
+
+
+void
+ngx_quic_close_socket(ngx_connection_t *c, ngx_quic_socket_t *qsock)
+{
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    ngx_queue_remove(&qsock->queue);
+    ngx_queue_insert_head(&qc->free_sockets, &qsock->queue);
+
+    ngx_rbtree_delete(&c->listening->rbtree, &qsock->udp.node);
+    qc->nsockets--;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic socket seq:%L closed nsock:%ui",
+                   (int64_t) qsock->sid.seqnum, qc->nsockets);
+}
+
+
+ngx_int_t
+ngx_quic_listen(ngx_connection_t *c, ngx_quic_connection_t *qc,
+    ngx_quic_socket_t *qsock)
+{
+    ngx_str_t              id;
+    ngx_quic_server_id_t  *sid;
+
+    sid = &qsock->sid;
+
+    id.data = sid->id;
+    id.len = sid->len;
+
+    qsock->udp.connection = c;
+    qsock->udp.node.key = ngx_crc32_long(id.data, id.len);
+    qsock->udp.key = id;
+
+    ngx_rbtree_insert(&c->listening->rbtree, &qsock->udp.node);
+
+    ngx_queue_insert_tail(&qc->sockets, &qsock->queue);
+
+    qc->nsockets++;
+    qsock->quic = qc;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic socket seq:%L listening at sid:%xV nsock:%ui",
+                   (int64_t) sid->seqnum, &id, qc->nsockets);
+
+    return NGX_OK;
+}
+
+
+void
+ngx_quic_close_sockets(ngx_connection_t *c)
+{
+    ngx_queue_t            *q;
+    ngx_quic_socket_t      *qsock;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    while (!ngx_queue_empty(&qc->sockets)) {
+        q = ngx_queue_head(&qc->sockets);
+        qsock = ngx_queue_data(q, ngx_quic_socket_t, queue);
+
+        ngx_quic_close_socket(c, qsock);
+    }
+}
+
+
+ngx_quic_socket_t *
+ngx_quic_find_socket(ngx_connection_t *c, uint64_t seqnum)
+{
+    ngx_queue_t            *q;
+    ngx_quic_socket_t      *qsock;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    for (q = ngx_queue_head(&qc->sockets);
+         q != ngx_queue_sentinel(&qc->sockets);
+         q = ngx_queue_next(q))
+    {
+        qsock = ngx_queue_data(q, ngx_quic_socket_t, queue);
+
+        if (qsock->sid.seqnum == seqnum) {
+            return qsock;
+        }
+    }
+
+    return NULL;
+}
diff --git a/src/event/quic/ngx_event_quic_socket.h b/src/event/quic/ngx_event_quic_socket.h
new file mode 100644
index 0000000..68ecc06
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_socket.h
@@ -0,0 +1,28 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_SOCKET_H_INCLUDED_
+#define _NGX_EVENT_QUIC_SOCKET_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+ngx_int_t ngx_quic_open_sockets(ngx_connection_t *c,
+    ngx_quic_connection_t *qc, ngx_quic_header_t *pkt);
+void ngx_quic_close_sockets(ngx_connection_t *c);
+
+ngx_quic_socket_t *ngx_quic_create_socket(ngx_connection_t *c,
+    ngx_quic_connection_t *qc);
+ngx_int_t ngx_quic_listen(ngx_connection_t *c, ngx_quic_connection_t *qc,
+    ngx_quic_socket_t *qsock);
+void ngx_quic_close_socket(ngx_connection_t *c, ngx_quic_socket_t *qsock);
+
+ngx_quic_socket_t *ngx_quic_find_socket(ngx_connection_t *c, uint64_t seqnum);
+
+
+#endif /* _NGX_EVENT_QUIC_SOCKET_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_ssl.c b/src/event/quic/ngx_event_quic_ssl.c
new file mode 100644
index 0000000..7872783
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_ssl.c
@@ -0,0 +1,590 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+#if defined OPENSSL_IS_BORINGSSL                                              \
+    || defined LIBRESSL_VERSION_NUMBER                                        \
+    || NGX_QUIC_OPENSSL_COMPAT
+#define NGX_QUIC_BORINGSSL_API   1
+#endif
+
+
+/*
+ * RFC 9000, 7.5.  Cryptographic Message Buffering
+ *
+ * Implementations MUST support buffering at least 4096 bytes of data
+ */
+#define NGX_QUIC_MAX_BUFFERED    65535
+
+
+#if (NGX_QUIC_BORINGSSL_API)
+static int ngx_quic_set_read_secret(ngx_ssl_conn_t *ssl_conn,
+    enum ssl_encryption_level_t level, const SSL_CIPHER *cipher,
+    const uint8_t *secret, size_t secret_len);
+static int ngx_quic_set_write_secret(ngx_ssl_conn_t *ssl_conn,
+    enum ssl_encryption_level_t level, const SSL_CIPHER *cipher,
+    const uint8_t *secret, size_t secret_len);
+#else
+static int ngx_quic_set_encryption_secrets(ngx_ssl_conn_t *ssl_conn,
+    enum ssl_encryption_level_t level, const uint8_t *read_secret,
+    const uint8_t *write_secret, size_t secret_len);
+#endif
+
+static int ngx_quic_add_handshake_data(ngx_ssl_conn_t *ssl_conn,
+    enum ssl_encryption_level_t level, const uint8_t *data, size_t len);
+static int ngx_quic_flush_flight(ngx_ssl_conn_t *ssl_conn);
+static int ngx_quic_send_alert(ngx_ssl_conn_t *ssl_conn,
+    enum ssl_encryption_level_t level, uint8_t alert);
+static ngx_int_t ngx_quic_crypto_input(ngx_connection_t *c, ngx_chain_t *data,
+    enum ssl_encryption_level_t level);
+
+
+#if (NGX_QUIC_BORINGSSL_API)
+
+static int
+ngx_quic_set_read_secret(ngx_ssl_conn_t *ssl_conn,
+    enum ssl_encryption_level_t level, const SSL_CIPHER *cipher,
+    const uint8_t *rsecret, size_t secret_len)
+{
+    ngx_connection_t       *c;
+    ngx_quic_connection_t  *qc;
+
+    c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
+    qc = ngx_quic_get_connection(c);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic ngx_quic_set_read_secret() level:%d", level);
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic read secret len:%uz %*xs", secret_len,
+                   secret_len, rsecret);
+#endif
+
+    if (ngx_quic_keys_set_encryption_secret(c->log, 0, qc->keys, level,
+                                            cipher, rsecret, secret_len)
+        != NGX_OK)
+    {
+        return 0;
+    }
+
+    return 1;
+}
+
+
+static int
+ngx_quic_set_write_secret(ngx_ssl_conn_t *ssl_conn,
+    enum ssl_encryption_level_t level, const SSL_CIPHER *cipher,
+    const uint8_t *wsecret, size_t secret_len)
+{
+    ngx_connection_t       *c;
+    ngx_quic_connection_t  *qc;
+
+    c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
+    qc = ngx_quic_get_connection(c);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic ngx_quic_set_write_secret() level:%d", level);
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic write secret len:%uz %*xs", secret_len,
+                   secret_len, wsecret);
+#endif
+
+    if (ngx_quic_keys_set_encryption_secret(c->log, 1, qc->keys, level,
+                                            cipher, wsecret, secret_len)
+        != NGX_OK)
+    {
+        return 0;
+    }
+
+    return 1;
+}
+
+#else
+
+static int
+ngx_quic_set_encryption_secrets(ngx_ssl_conn_t *ssl_conn,
+    enum ssl_encryption_level_t level, const uint8_t *rsecret,
+    const uint8_t *wsecret, size_t secret_len)
+{
+    ngx_connection_t       *c;
+    const SSL_CIPHER       *cipher;
+    ngx_quic_connection_t  *qc;
+
+    c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
+    qc = ngx_quic_get_connection(c);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic ngx_quic_set_encryption_secrets() level:%d", level);
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic read secret len:%uz %*xs", secret_len,
+                   secret_len, rsecret);
+#endif
+
+    cipher = SSL_get_current_cipher(ssl_conn);
+
+    if (ngx_quic_keys_set_encryption_secret(c->log, 0, qc->keys, level,
+                                            cipher, rsecret, secret_len)
+        != NGX_OK)
+    {
+        return 0;
+    }
+
+    if (level == ssl_encryption_early_data) {
+        return 1;
+    }
+
+#ifdef NGX_QUIC_DEBUG_CRYPTO
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic write secret len:%uz %*xs", secret_len,
+                   secret_len, wsecret);
+#endif
+
+    if (ngx_quic_keys_set_encryption_secret(c->log, 1, qc->keys, level,
+                                            cipher, wsecret, secret_len)
+        != NGX_OK)
+    {
+        return 0;
+    }
+
+    return 1;
+}
+
+#endif
+
+
+static int
+ngx_quic_add_handshake_data(ngx_ssl_conn_t *ssl_conn,
+    enum ssl_encryption_level_t level, const uint8_t *data, size_t len)
+{
+    u_char                 *p, *end;
+    size_t                  client_params_len;
+    ngx_chain_t            *out;
+    const uint8_t          *client_params;
+    ngx_quic_tp_t           ctp;
+    ngx_quic_frame_t       *frame;
+    ngx_connection_t       *c;
+    ngx_quic_send_ctx_t    *ctx;
+    ngx_quic_connection_t  *qc;
+#if defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
+    unsigned int            alpn_len;
+    const unsigned char    *alpn_data;
+#endif
+
+    c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
+    qc = ngx_quic_get_connection(c);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic ngx_quic_add_handshake_data");
+
+    if (!qc->client_tp_done) {
+        /*
+         * things to do once during handshake: check ALPN and transport
+         * parameters; we want to break handshake if something is wrong
+         * here;
+         */
+
+#if defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
+
+        SSL_get0_alpn_selected(ssl_conn, &alpn_data, &alpn_len);
+
+        if (alpn_len == 0) {
+            qc->error = NGX_QUIC_ERR_CRYPTO(SSL_AD_NO_APPLICATION_PROTOCOL);
+            qc->error_reason = "unsupported protocol in ALPN extension";
+
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "quic unsupported protocol in ALPN extension");
+            return 0;
+        }
+
+#endif
+
+        SSL_get_peer_quic_transport_params(ssl_conn, &client_params,
+                                           &client_params_len);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic SSL_get_peer_quic_transport_params():"
+                       " params_len:%ui", client_params_len);
+
+        if (client_params_len == 0) {
+            /* RFC 9001, 8.2.  QUIC Transport Parameters Extension */
+            qc->error = NGX_QUIC_ERR_CRYPTO(SSL_AD_MISSING_EXTENSION);
+            qc->error_reason = "missing transport parameters";
+
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "missing transport parameters");
+            return 0;
+        }
+
+        p = (u_char *) client_params;
+        end = p + client_params_len;
+
+        /* defaults for parameters not sent by client */
+        ngx_memcpy(&ctp, &qc->ctp, sizeof(ngx_quic_tp_t));
+
+        if (ngx_quic_parse_transport_params(p, end, &ctp, c->log)
+            != NGX_OK)
+        {
+            qc->error = NGX_QUIC_ERR_TRANSPORT_PARAMETER_ERROR;
+            qc->error_reason = "failed to process transport parameters";
+
+            return 0;
+        }
+
+        if (ngx_quic_apply_transport_params(c, &ctp) != NGX_OK) {
+            return 0;
+        }
+
+        qc->client_tp_done = 1;
+    }
+
+    ctx = ngx_quic_get_send_ctx(qc, level);
+
+    out = ngx_quic_copy_buffer(c, (u_char *) data, len);
+    if (out == NGX_CHAIN_ERROR) {
+        return 0;
+    }
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return 0;
+    }
+
+    frame->data = out;
+    frame->level = level;
+    frame->type = NGX_QUIC_FT_CRYPTO;
+    frame->u.crypto.offset = ctx->crypto_sent;
+    frame->u.crypto.length = len;
+
+    ctx->crypto_sent += len;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    return 1;
+}
+
+
+static int
+ngx_quic_flush_flight(ngx_ssl_conn_t *ssl_conn)
+{
+#if (NGX_DEBUG)
+    ngx_connection_t  *c;
+
+    c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic ngx_quic_flush_flight()");
+#endif
+    return 1;
+}
+
+
+static int
+ngx_quic_send_alert(ngx_ssl_conn_t *ssl_conn, enum ssl_encryption_level_t level,
+    uint8_t alert)
+{
+    ngx_connection_t       *c;
+    ngx_quic_connection_t  *qc;
+
+    c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic ngx_quic_send_alert() level:%s alert:%d",
+                   ngx_quic_level_name(level), (int) alert);
+
+    /* already closed on regular shutdown */
+
+    qc = ngx_quic_get_connection(c);
+    if (qc == NULL) {
+        return 1;
+    }
+
+    qc->error = NGX_QUIC_ERR_CRYPTO(alert);
+    qc->error_reason = "handshake failed";
+
+    return 1;
+}
+
+
+ngx_int_t
+ngx_quic_handle_crypto_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
+    ngx_quic_frame_t *frame)
+{
+    uint64_t                  last;
+    ngx_chain_t              *cl;
+    ngx_quic_send_ctx_t      *ctx;
+    ngx_quic_connection_t    *qc;
+    ngx_quic_crypto_frame_t  *f;
+
+    qc = ngx_quic_get_connection(c);
+    ctx = ngx_quic_get_send_ctx(qc, pkt->level);
+    f = &frame->u.crypto;
+
+    /* no overflow since both values are 62-bit */
+    last = f->offset + f->length;
+
+    if (last > ctx->crypto.offset + NGX_QUIC_MAX_BUFFERED) {
+        qc->error = NGX_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED;
+        return NGX_ERROR;
+    }
+
+    if (last <= ctx->crypto.offset) {
+        if (pkt->level == ssl_encryption_initial) {
+            /* speeding up handshake completion */
+
+            if (!ngx_queue_empty(&ctx->sent)) {
+                ngx_quic_resend_frames(c, ctx);
+
+                ctx = ngx_quic_get_send_ctx(qc, ssl_encryption_handshake);
+                while (!ngx_queue_empty(&ctx->sent)) {
+                    ngx_quic_resend_frames(c, ctx);
+                }
+            }
+        }
+
+        return NGX_OK;
+    }
+
+    if (f->offset == ctx->crypto.offset) {
+        if (ngx_quic_crypto_input(c, frame->data, pkt->level) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        ngx_quic_skip_buffer(c, &ctx->crypto, last);
+
+    } else {
+        if (ngx_quic_write_buffer(c, &ctx->crypto, frame->data, f->length,
+                                  f->offset)
+            == NGX_CHAIN_ERROR)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    cl = ngx_quic_read_buffer(c, &ctx->crypto, (uint64_t) -1);
+
+    if (cl) {
+        if (ngx_quic_crypto_input(c, cl, pkt->level) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        ngx_quic_free_chain(c, cl);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_crypto_input(ngx_connection_t *c, ngx_chain_t *data,
+    enum ssl_encryption_level_t level)
+{
+    int                     n, sslerr;
+    ngx_buf_t              *b;
+    ngx_chain_t            *cl;
+    ngx_ssl_conn_t         *ssl_conn;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    ssl_conn = c->ssl->connection;
+
+    for (cl = data; cl; cl = cl->next) {
+        b = cl->buf;
+
+        if (!SSL_provide_quic_data(ssl_conn, level, b->pos, b->last - b->pos)) {
+            ngx_ssl_error(NGX_LOG_INFO, c->log, 0,
+                          "SSL_provide_quic_data() failed");
+            return NGX_ERROR;
+        }
+    }
+
+    n = SSL_do_handshake(ssl_conn);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_do_handshake: %d", n);
+
+    if (n <= 0) {
+        sslerr = SSL_get_error(ssl_conn, n);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d",
+                       sslerr);
+
+        if (sslerr != SSL_ERROR_WANT_READ) {
+
+            if (c->ssl->handshake_rejected) {
+                ngx_connection_error(c, 0, "handshake rejected");
+                ERR_clear_error();
+
+                return NGX_ERROR;
+            }
+
+            ngx_ssl_error(NGX_LOG_ERR, c->log, 0, "SSL_do_handshake() failed");
+            return NGX_ERROR;
+        }
+    }
+
+    if (n <= 0 || SSL_in_init(ssl_conn)) {
+        if (ngx_quic_keys_available(qc->keys, ssl_encryption_early_data, 0)
+            && qc->client_tp_done)
+        {
+            if (ngx_quic_init_streams(c) != NGX_OK) {
+                return NGX_ERROR;
+            }
+        }
+
+        return NGX_OK;
+    }
+
+#if (NGX_DEBUG)
+    ngx_ssl_handshake_log(c);
+#endif
+
+    c->ssl->handshaked = 1;
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_HANDSHAKE_DONE;
+    ngx_quic_queue_frame(qc, frame);
+
+    if (qc->conf->retry) {
+        if (ngx_quic_send_new_token(c, qc->path) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    /*
+     * RFC 9001, 9.5.  Header Protection Timing Side Channels
+     *
+     * Generating next keys before a key update is received.
+     */
+
+    ngx_post_event(&qc->key_update, &ngx_posted_events);
+
+    /*
+     * RFC 9001, 4.9.2.  Discarding Handshake Keys
+     *
+     * An endpoint MUST discard its Handshake keys
+     * when the TLS handshake is confirmed.
+     */
+    ngx_quic_discard_ctx(c, ssl_encryption_handshake);
+
+    ngx_quic_discover_path_mtu(c, qc->path);
+
+    /* start accepting clients on negotiated number of server ids */
+    if (ngx_quic_create_sockets(c) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_quic_init_streams(c) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_init_connection(ngx_connection_t *c)
+{
+    u_char                  *p;
+    size_t                   clen;
+    ssize_t                  len;
+    ngx_str_t                dcid;
+    ngx_ssl_conn_t          *ssl_conn;
+    ngx_quic_socket_t       *qsock;
+    ngx_quic_connection_t   *qc;
+    static SSL_QUIC_METHOD   quic_method;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (ngx_ssl_create_connection(qc->conf->ssl, c, 0) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    c->ssl->no_wait_shutdown = 1;
+
+    ssl_conn = c->ssl->connection;
+
+    if (!quic_method.send_alert) {
+#if (NGX_QUIC_BORINGSSL_API)
+        quic_method.set_read_secret = ngx_quic_set_read_secret;
+        quic_method.set_write_secret = ngx_quic_set_write_secret;
+#else
+        quic_method.set_encryption_secrets = ngx_quic_set_encryption_secrets;
+#endif
+        quic_method.add_handshake_data = ngx_quic_add_handshake_data;
+        quic_method.flush_flight = ngx_quic_flush_flight;
+        quic_method.send_alert = ngx_quic_send_alert;
+    }
+
+    if (SSL_set_quic_method(ssl_conn, &quic_method) == 0) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic SSL_set_quic_method() failed");
+        return NGX_ERROR;
+    }
+
+#ifdef OPENSSL_INFO_QUIC
+    if (SSL_CTX_get_max_early_data(qc->conf->ssl->ctx)) {
+        SSL_set_quic_early_data_enabled(ssl_conn, 1);
+    }
+#endif
+
+    qsock = ngx_quic_get_socket(c);
+
+    dcid.data = qsock->sid.id;
+    dcid.len = qsock->sid.len;
+
+    if (ngx_quic_new_sr_token(c, &dcid, qc->conf->sr_token_key, qc->tp.sr_token)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    len = ngx_quic_create_transport_params(NULL, NULL, &qc->tp, &clen);
+    /* always succeeds */
+
+    p = ngx_pnalloc(c->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    len = ngx_quic_create_transport_params(p, p + len, &qc->tp, NULL);
+    if (len < 0) {
+        return NGX_ERROR;
+    }
+
+#ifdef NGX_QUIC_DEBUG_PACKETS
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic transport parameters len:%uz %*xs", len, len, p);
+#endif
+
+    if (SSL_set_quic_transport_params(ssl_conn, p, len) == 0) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic SSL_set_quic_transport_params() failed");
+        return NGX_ERROR;
+    }
+
+#ifdef OPENSSL_IS_BORINGSSL
+    if (SSL_set_quic_early_data_context(ssl_conn, p, clen) == 0) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic SSL_set_quic_early_data_context() failed");
+        return NGX_ERROR;
+    }
+#endif
+
+    return NGX_OK;
+}
diff --git a/src/event/quic/ngx_event_quic_ssl.h b/src/event/quic/ngx_event_quic_ssl.h
new file mode 100644
index 0000000..ee0aa07
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_ssl.h
@@ -0,0 +1,19 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_SSL_H_INCLUDED_
+#define _NGX_EVENT_QUIC_SSL_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+ngx_int_t ngx_quic_init_connection(ngx_connection_t *c);
+
+ngx_int_t ngx_quic_handle_crypto_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_frame_t *frame);
+
+#endif /* _NGX_EVENT_QUIC_SSL_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_streams.c b/src/event/quic/ngx_event_quic_streams.c
new file mode 100644
index 0000000..178b805
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_streams.c
@@ -0,0 +1,1820 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+#define NGX_QUIC_STREAM_GONE     (void *) -1
+
+
+static ngx_int_t ngx_quic_do_reset_stream(ngx_quic_stream_t *qs,
+    ngx_uint_t err);
+static ngx_int_t ngx_quic_shutdown_stream_send(ngx_connection_t *c);
+static ngx_int_t ngx_quic_shutdown_stream_recv(ngx_connection_t *c);
+static ngx_quic_stream_t *ngx_quic_get_stream(ngx_connection_t *c, uint64_t id);
+static ngx_int_t ngx_quic_reject_stream(ngx_connection_t *c, uint64_t id);
+static void ngx_quic_init_stream_handler(ngx_event_t *ev);
+static void ngx_quic_init_streams_handler(ngx_connection_t *c);
+static ngx_int_t ngx_quic_do_init_streams(ngx_connection_t *c);
+static ngx_quic_stream_t *ngx_quic_create_stream(ngx_connection_t *c,
+    uint64_t id);
+static void ngx_quic_empty_handler(ngx_event_t *ev);
+static ssize_t ngx_quic_stream_recv(ngx_connection_t *c, u_char *buf,
+    size_t size);
+static ssize_t ngx_quic_stream_send(ngx_connection_t *c, u_char *buf,
+    size_t size);
+static ngx_chain_t *ngx_quic_stream_send_chain(ngx_connection_t *c,
+    ngx_chain_t *in, off_t limit);
+static ngx_int_t ngx_quic_stream_flush(ngx_quic_stream_t *qs);
+static void ngx_quic_stream_cleanup_handler(void *data);
+static ngx_int_t ngx_quic_close_stream(ngx_quic_stream_t *qs);
+static ngx_int_t ngx_quic_can_shutdown(ngx_connection_t *c);
+static ngx_int_t ngx_quic_control_flow(ngx_quic_stream_t *qs, uint64_t last);
+static ngx_int_t ngx_quic_update_flow(ngx_quic_stream_t *qs, uint64_t last);
+static ngx_int_t ngx_quic_update_max_stream_data(ngx_quic_stream_t *qs);
+static ngx_int_t ngx_quic_update_max_data(ngx_connection_t *c);
+static void ngx_quic_set_event(ngx_event_t *ev);
+
+
+ngx_connection_t *
+ngx_quic_open_stream(ngx_connection_t *c, ngx_uint_t bidi)
+{
+    uint64_t                id;
+    ngx_connection_t       *pc, *sc;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    pc = c->quic ? c->quic->parent : c;
+    qc = ngx_quic_get_connection(pc);
+
+    if (qc->closing) {
+        return NULL;
+    }
+
+    if (bidi) {
+        if (qc->streams.server_streams_bidi
+            >= qc->streams.server_max_streams_bidi)
+        {
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic too many server bidi streams:%uL",
+                           qc->streams.server_streams_bidi);
+            return NULL;
+        }
+
+        id = (qc->streams.server_streams_bidi << 2)
+             | NGX_QUIC_STREAM_SERVER_INITIATED;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic creating server bidi stream"
+                       " streams:%uL max:%uL id:0x%xL",
+                       qc->streams.server_streams_bidi,
+                       qc->streams.server_max_streams_bidi, id);
+
+        qc->streams.server_streams_bidi++;
+
+    } else {
+        if (qc->streams.server_streams_uni
+            >= qc->streams.server_max_streams_uni)
+        {
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic too many server uni streams:%uL",
+                           qc->streams.server_streams_uni);
+            return NULL;
+        }
+
+        id = (qc->streams.server_streams_uni << 2)
+             | NGX_QUIC_STREAM_SERVER_INITIATED
+             | NGX_QUIC_STREAM_UNIDIRECTIONAL;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic creating server uni stream"
+                       " streams:%uL max:%uL id:0x%xL",
+                       qc->streams.server_streams_uni,
+                       qc->streams.server_max_streams_uni, id);
+
+        qc->streams.server_streams_uni++;
+    }
+
+    qs = ngx_quic_create_stream(pc, id);
+    if (qs == NULL) {
+        return NULL;
+    }
+
+    sc = qs->connection;
+
+    sc->write->active = 1;
+    sc->write->ready = 1;
+
+    if (bidi) {
+        sc->read->active = 1;
+    }
+
+    return sc;
+}
+
+
+void
+ngx_quic_rbtree_insert_stream(ngx_rbtree_node_t *temp,
+    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel)
+{
+    ngx_rbtree_node_t  **p;
+    ngx_quic_stream_t   *qn, *qnt;
+
+    for ( ;; ) {
+        qn = (ngx_quic_stream_t *) node;
+        qnt = (ngx_quic_stream_t *) temp;
+
+        p = (qn->id < qnt->id) ? &temp->left : &temp->right;
+
+        if (*p == sentinel) {
+            break;
+        }
+
+        temp = *p;
+    }
+
+    *p = node;
+    node->parent = temp;
+    node->left = sentinel;
+    node->right = sentinel;
+    ngx_rbt_red(node);
+}
+
+
+ngx_quic_stream_t *
+ngx_quic_find_stream(ngx_rbtree_t *rbtree, uint64_t id)
+{
+    ngx_rbtree_node_t  *node, *sentinel;
+    ngx_quic_stream_t  *qn;
+
+    node = rbtree->root;
+    sentinel = rbtree->sentinel;
+
+    while (node != sentinel) {
+        qn = (ngx_quic_stream_t *) node;
+
+        if (id == qn->id) {
+            return qn;
+        }
+
+        node = (id < qn->id) ? node->left : node->right;
+    }
+
+    return NULL;
+}
+
+
+ngx_int_t
+ngx_quic_close_streams(ngx_connection_t *c, ngx_quic_connection_t *qc)
+{
+    ngx_pool_t         *pool;
+    ngx_queue_t        *q;
+    ngx_rbtree_t       *tree;
+    ngx_connection_t   *sc;
+    ngx_rbtree_node_t  *node;
+    ngx_quic_stream_t  *qs;
+
+    while (!ngx_queue_empty(&qc->streams.uninitialized)) {
+        q = ngx_queue_head(&qc->streams.uninitialized);
+        ngx_queue_remove(q);
+
+        qs = ngx_queue_data(q, ngx_quic_stream_t, queue);
+        pool = qs->connection->pool;
+
+        ngx_close_connection(qs->connection);
+        ngx_destroy_pool(pool);
+    }
+
+    tree = &qc->streams.tree;
+
+    if (tree->root == tree->sentinel) {
+        return NGX_OK;
+    }
+
+    node = ngx_rbtree_min(tree->root, tree->sentinel);
+
+    while (node) {
+        qs = (ngx_quic_stream_t *) node;
+        node = ngx_rbtree_next(tree, node);
+        sc = qs->connection;
+
+        qs->recv_state = NGX_QUIC_STREAM_RECV_RESET_RECVD;
+        qs->send_state = NGX_QUIC_STREAM_SEND_RESET_SENT;
+
+        if (sc == NULL) {
+            ngx_quic_close_stream(qs);
+            continue;
+        }
+
+        sc->read->error = 1;
+        sc->write->error = 1;
+
+        ngx_quic_set_event(sc->read);
+        ngx_quic_set_event(sc->write);
+
+        sc->close = 1;
+        sc->read->handler(sc->read);
+    }
+
+    if (tree->root == tree->sentinel) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic connection has active streams");
+
+    return NGX_AGAIN;
+}
+
+
+ngx_int_t
+ngx_quic_reset_stream(ngx_connection_t *c, ngx_uint_t err)
+{
+    return ngx_quic_do_reset_stream(c->quic, err);
+}
+
+
+static ngx_int_t
+ngx_quic_do_reset_stream(ngx_quic_stream_t *qs, ngx_uint_t err)
+{
+    ngx_connection_t       *pc;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    if (qs->send_state == NGX_QUIC_STREAM_SEND_DATA_RECVD
+        || qs->send_state == NGX_QUIC_STREAM_SEND_RESET_SENT
+        || qs->send_state == NGX_QUIC_STREAM_SEND_RESET_RECVD)
+    {
+        return NGX_OK;
+    }
+
+    qs->send_state = NGX_QUIC_STREAM_SEND_RESET_SENT;
+    qs->send_final_size = qs->send_offset;
+
+    if (qs->connection) {
+        qs->connection->write->error = 1;
+    }
+
+    pc = qs->parent;
+    qc = ngx_quic_get_connection(pc);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0,
+                   "quic stream id:0x%xL reset", qs->id);
+
+    frame = ngx_quic_alloc_frame(pc);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_RESET_STREAM;
+    frame->u.reset_stream.id = qs->id;
+    frame->u.reset_stream.error_code = err;
+    frame->u.reset_stream.final_size = qs->send_offset;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    ngx_quic_free_buffer(pc, &qs->send);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_shutdown_stream(ngx_connection_t *c, int how)
+{
+    if (how == NGX_RDWR_SHUTDOWN || how == NGX_WRITE_SHUTDOWN) {
+        if (ngx_quic_shutdown_stream_send(c) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (how == NGX_RDWR_SHUTDOWN || how == NGX_READ_SHUTDOWN) {
+        if (ngx_quic_shutdown_stream_recv(c) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_shutdown_stream_send(ngx_connection_t *c)
+{
+    ngx_quic_stream_t  *qs;
+
+    qs = c->quic;
+
+    if (qs->send_state != NGX_QUIC_STREAM_SEND_READY
+        && qs->send_state != NGX_QUIC_STREAM_SEND_SEND)
+    {
+        return NGX_OK;
+    }
+
+    qs->send_state = NGX_QUIC_STREAM_SEND_SEND;
+    qs->send_final_size = c->sent;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, qs->parent->log, 0,
+                   "quic stream id:0x%xL send shutdown", qs->id);
+
+    return ngx_quic_stream_flush(qs);
+}
+
+
+static ngx_int_t
+ngx_quic_shutdown_stream_recv(ngx_connection_t *c)
+{
+    ngx_connection_t       *pc;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qs = c->quic;
+
+    if (qs->recv_state != NGX_QUIC_STREAM_RECV_RECV
+        && qs->recv_state != NGX_QUIC_STREAM_RECV_SIZE_KNOWN)
+    {
+        return NGX_OK;
+    }
+
+    pc = qs->parent;
+    qc = ngx_quic_get_connection(pc);
+
+    if (qc->conf->stream_close_code == 0) {
+        return NGX_OK;
+    }
+
+    frame = ngx_quic_alloc_frame(pc);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0,
+                   "quic stream id:0x%xL recv shutdown", qs->id);
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_STOP_SENDING;
+    frame->u.stop_sending.id = qs->id;
+    frame->u.stop_sending.error_code = qc->conf->stream_close_code;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    return NGX_OK;
+}
+
+
+static ngx_quic_stream_t *
+ngx_quic_get_stream(ngx_connection_t *c, uint64_t id)
+{
+    uint64_t                min_id;
+    ngx_event_t            *rev;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    qs = ngx_quic_find_stream(&qc->streams.tree, id);
+
+    if (qs) {
+        return qs;
+    }
+
+    if (qc->shutdown || qc->closing) {
+        return NGX_QUIC_STREAM_GONE;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic stream id:0x%xL is missing", id);
+
+    if (id & NGX_QUIC_STREAM_UNIDIRECTIONAL) {
+
+        if (id & NGX_QUIC_STREAM_SERVER_INITIATED) {
+            if ((id >> 2) < qc->streams.server_streams_uni) {
+                return NGX_QUIC_STREAM_GONE;
+            }
+
+            qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+            return NULL;
+        }
+
+        if ((id >> 2) < qc->streams.client_streams_uni) {
+            return NGX_QUIC_STREAM_GONE;
+        }
+
+        if ((id >> 2) >= qc->streams.client_max_streams_uni) {
+            qc->error = NGX_QUIC_ERR_STREAM_LIMIT_ERROR;
+            return NULL;
+        }
+
+        min_id = (qc->streams.client_streams_uni << 2)
+                 | NGX_QUIC_STREAM_UNIDIRECTIONAL;
+        qc->streams.client_streams_uni = (id >> 2) + 1;
+
+    } else {
+
+        if (id & NGX_QUIC_STREAM_SERVER_INITIATED) {
+            if ((id >> 2) < qc->streams.server_streams_bidi) {
+                return NGX_QUIC_STREAM_GONE;
+            }
+
+            qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+            return NULL;
+        }
+
+        if ((id >> 2) < qc->streams.client_streams_bidi) {
+            return NGX_QUIC_STREAM_GONE;
+        }
+
+        if ((id >> 2) >= qc->streams.client_max_streams_bidi) {
+            qc->error = NGX_QUIC_ERR_STREAM_LIMIT_ERROR;
+            return NULL;
+        }
+
+        min_id = (qc->streams.client_streams_bidi << 2);
+        qc->streams.client_streams_bidi = (id >> 2) + 1;
+    }
+
+    /*
+     * RFC 9000, 2.1.  Stream Types and Identifiers
+     *
+     * successive streams of each type are created with numerically increasing
+     * stream IDs.  A stream ID that is used out of order results in all
+     * streams of that type with lower-numbered stream IDs also being opened.
+     */
+
+#if (NGX_SUPPRESS_WARN)
+    qs = NULL;
+#endif
+
+    for ( /* void */ ; min_id <= id; min_id += 0x04) {
+
+        qs = ngx_quic_create_stream(c, min_id);
+
+        if (qs == NULL) {
+            if (ngx_quic_reject_stream(c, min_id) != NGX_OK) {
+                return NULL;
+            }
+
+            continue;
+        }
+
+        ngx_queue_insert_tail(&qc->streams.uninitialized, &qs->queue);
+
+        rev = qs->connection->read;
+        rev->handler = ngx_quic_init_stream_handler;
+
+        if (qc->streams.initialized) {
+            ngx_post_event(rev, &ngx_posted_events);
+
+            if (qc->push.posted) {
+                /*
+                 * The posted stream can produce output immediately.
+                 * By postponing the push event, we coalesce the stream
+                 * output with queued frames in one UDP datagram.
+                 */
+
+                ngx_delete_posted_event(&qc->push);
+                ngx_post_event(&qc->push, &ngx_posted_events);
+            }
+        }
+    }
+
+    if (qs == NULL) {
+        return NGX_QUIC_STREAM_GONE;
+    }
+
+    return qs;
+}
+
+
+static ngx_int_t
+ngx_quic_reject_stream(ngx_connection_t *c, uint64_t id)
+{
+    uint64_t                code;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    code = (id & NGX_QUIC_STREAM_UNIDIRECTIONAL)
+           ? qc->conf->stream_reject_code_uni
+           : qc->conf->stream_reject_code_bidi;
+
+    if (code == 0) {
+        return NGX_DECLINED;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic stream id:0x%xL reject err:0x%xL", id, code);
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_RESET_STREAM;
+    frame->u.reset_stream.id = id;
+    frame->u.reset_stream.error_code = code;
+    frame->u.reset_stream.final_size = 0;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_STOP_SENDING;
+    frame->u.stop_sending.id = id;
+    frame->u.stop_sending.error_code = code;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_init_stream_handler(ngx_event_t *ev)
+{
+    ngx_connection_t   *c;
+    ngx_quic_stream_t  *qs;
+
+    c = ev->data;
+    qs = c->quic;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic init stream");
+
+    if ((qs->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0) {
+        c->write->active = 1;
+        c->write->ready = 1;
+    }
+
+    c->read->active = 1;
+
+    ngx_queue_remove(&qs->queue);
+
+    c->listening->handler(c);
+}
+
+
+ngx_int_t
+ngx_quic_init_streams(ngx_connection_t *c)
+{
+    ngx_int_t               rc;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (qc->streams.initialized) {
+        return NGX_OK;
+    }
+
+    rc = ngx_ssl_ocsp_validate(c);
+
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_AGAIN) {
+        c->ssl->handler = ngx_quic_init_streams_handler;
+        return NGX_OK;
+    }
+
+    return ngx_quic_do_init_streams(c);
+}
+
+
+static void
+ngx_quic_init_streams_handler(ngx_connection_t *c)
+{
+    if (ngx_quic_do_init_streams(c) != NGX_OK) {
+        ngx_quic_close_connection(c, NGX_ERROR);
+    }
+}
+
+
+static ngx_int_t
+ngx_quic_do_init_streams(ngx_connection_t *c)
+{
+    ngx_queue_t            *q;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic init streams");
+
+    qc = ngx_quic_get_connection(c);
+
+    if (qc->conf->init) {
+        if (qc->conf->init(c) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    for (q = ngx_queue_head(&qc->streams.uninitialized);
+         q != ngx_queue_sentinel(&qc->streams.uninitialized);
+         q = ngx_queue_next(q))
+    {
+        qs = ngx_queue_data(q, ngx_quic_stream_t, queue);
+        ngx_post_event(qs->connection->read, &ngx_posted_events);
+    }
+
+    qc->streams.initialized = 1;
+
+    if (!qc->closing && qc->close.timer_set) {
+        ngx_del_timer(&qc->close);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_quic_stream_t *
+ngx_quic_create_stream(ngx_connection_t *c, uint64_t id)
+{
+    ngx_str_t               addr_text;
+    ngx_log_t              *log;
+    ngx_pool_t             *pool;
+    ngx_uint_t              reusable;
+    ngx_queue_t            *q;
+    struct sockaddr        *sockaddr;
+    ngx_connection_t       *sc;
+    ngx_quic_stream_t      *qs;
+    ngx_pool_cleanup_t     *cln;
+    ngx_quic_connection_t  *qc;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic stream id:0x%xL create", id);
+
+    qc = ngx_quic_get_connection(c);
+
+    if (!ngx_queue_empty(&qc->streams.free)) {
+        q = ngx_queue_head(&qc->streams.free);
+        qs = ngx_queue_data(q, ngx_quic_stream_t, queue);
+        ngx_queue_remove(&qs->queue);
+
+    } else {
+        /*
+         * the number of streams is limited by transport
+         * parameters and application requirements
+         */
+
+        qs = ngx_palloc(c->pool, sizeof(ngx_quic_stream_t));
+        if (qs == NULL) {
+            return NULL;
+        }
+    }
+
+    ngx_memzero(qs, sizeof(ngx_quic_stream_t));
+
+    qs->node.key = id;
+    qs->parent = c;
+    qs->id = id;
+    qs->send_final_size = (uint64_t) -1;
+    qs->recv_final_size = (uint64_t) -1;
+
+    pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, c->log);
+    if (pool == NULL) {
+        ngx_queue_insert_tail(&qc->streams.free, &qs->queue);
+        return NULL;
+    }
+
+    log = ngx_palloc(pool, sizeof(ngx_log_t));
+    if (log == NULL) {
+        ngx_destroy_pool(pool);
+        ngx_queue_insert_tail(&qc->streams.free, &qs->queue);
+        return NULL;
+    }
+
+    *log = *c->log;
+    pool->log = log;
+
+    sockaddr = ngx_palloc(pool, c->socklen);
+    if (sockaddr == NULL) {
+        ngx_destroy_pool(pool);
+        ngx_queue_insert_tail(&qc->streams.free, &qs->queue);
+        return NULL;
+    }
+
+    ngx_memcpy(sockaddr, c->sockaddr, c->socklen);
+
+    if (c->addr_text.data) {
+        addr_text.data = ngx_pnalloc(pool, c->addr_text.len);
+        if (addr_text.data == NULL) {
+            ngx_destroy_pool(pool);
+            ngx_queue_insert_tail(&qc->streams.free, &qs->queue);
+            return NULL;
+        }
+
+        ngx_memcpy(addr_text.data, c->addr_text.data, c->addr_text.len);
+        addr_text.len = c->addr_text.len;
+
+    } else {
+        addr_text.len = 0;
+        addr_text.data = NULL;
+    }
+
+    reusable = c->reusable;
+    ngx_reusable_connection(c, 0);
+
+    sc = ngx_get_connection(c->fd, log);
+    if (sc == NULL) {
+        ngx_destroy_pool(pool);
+        ngx_queue_insert_tail(&qc->streams.free, &qs->queue);
+        ngx_reusable_connection(c, reusable);
+        return NULL;
+    }
+
+    qs->connection = sc;
+
+    sc->quic = qs;
+    sc->shared = 1;
+    sc->type = SOCK_STREAM;
+    sc->pool = pool;
+    sc->ssl = c->ssl;
+    sc->sockaddr = sockaddr;
+    sc->socklen = c->socklen;
+    sc->listening = c->listening;
+    sc->addr_text = addr_text;
+    sc->local_sockaddr = c->local_sockaddr;
+    sc->local_socklen = c->local_socklen;
+    sc->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+    sc->start_time = c->start_time;
+    sc->tcp_nodelay = NGX_TCP_NODELAY_DISABLED;
+
+    sc->recv = ngx_quic_stream_recv;
+    sc->send = ngx_quic_stream_send;
+    sc->send_chain = ngx_quic_stream_send_chain;
+
+    sc->read->log = log;
+    sc->write->log = log;
+
+    sc->read->handler = ngx_quic_empty_handler;
+    sc->write->handler = ngx_quic_empty_handler;
+
+    log->connection = sc->number;
+
+    if (id & NGX_QUIC_STREAM_UNIDIRECTIONAL) {
+        if (id & NGX_QUIC_STREAM_SERVER_INITIATED) {
+            qs->send_max_data = qc->ctp.initial_max_stream_data_uni;
+            qs->recv_state = NGX_QUIC_STREAM_RECV_DATA_READ;
+            qs->send_state = NGX_QUIC_STREAM_SEND_READY;
+
+        } else {
+            qs->recv_max_data = qc->tp.initial_max_stream_data_uni;
+            qs->recv_state = NGX_QUIC_STREAM_RECV_RECV;
+            qs->send_state = NGX_QUIC_STREAM_SEND_DATA_RECVD;
+        }
+
+    } else {
+        if (id & NGX_QUIC_STREAM_SERVER_INITIATED) {
+            qs->send_max_data = qc->ctp.initial_max_stream_data_bidi_remote;
+            qs->recv_max_data = qc->tp.initial_max_stream_data_bidi_local;
+
+        } else {
+            qs->send_max_data = qc->ctp.initial_max_stream_data_bidi_local;
+            qs->recv_max_data = qc->tp.initial_max_stream_data_bidi_remote;
+        }
+
+        qs->recv_state = NGX_QUIC_STREAM_RECV_RECV;
+        qs->send_state = NGX_QUIC_STREAM_SEND_READY;
+    }
+
+    qs->recv_window = qs->recv_max_data;
+
+    cln = ngx_pool_cleanup_add(pool, 0);
+    if (cln == NULL) {
+        ngx_close_connection(sc);
+        ngx_destroy_pool(pool);
+        ngx_queue_insert_tail(&qc->streams.free, &qs->queue);
+        ngx_reusable_connection(c, reusable);
+        return NULL;
+    }
+
+    cln->handler = ngx_quic_stream_cleanup_handler;
+    cln->data = sc;
+
+    ngx_rbtree_insert(&qc->streams.tree, &qs->node);
+
+    return qs;
+}
+
+
+void
+ngx_quic_cancelable_stream(ngx_connection_t *c)
+{
+    ngx_connection_t       *pc;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qs = c->quic;
+    pc = qs->parent;
+    qc = ngx_quic_get_connection(pc);
+
+    if (!qs->cancelable) {
+        qs->cancelable = 1;
+
+        if (ngx_quic_can_shutdown(pc) == NGX_OK) {
+            ngx_reusable_connection(pc, 1);
+
+            if (qc->shutdown) {
+                ngx_quic_shutdown_quic(pc);
+            }
+        }
+    }
+}
+
+
+static void
+ngx_quic_empty_handler(ngx_event_t *ev)
+{
+}
+
+
+static ssize_t
+ngx_quic_stream_recv(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ssize_t             len;
+    ngx_buf_t          *b;
+    ngx_chain_t        *cl, *in;
+    ngx_event_t        *rev;
+    ngx_connection_t   *pc;
+    ngx_quic_stream_t  *qs;
+
+    qs = c->quic;
+    pc = qs->parent;
+    rev = c->read;
+
+    if (qs->recv_state == NGX_QUIC_STREAM_RECV_RESET_RECVD
+        || qs->recv_state == NGX_QUIC_STREAM_RECV_RESET_READ)
+    {
+        qs->recv_state = NGX_QUIC_STREAM_RECV_RESET_READ;
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0,
+                   "quic stream id:0x%xL recv buf:%uz", qs->id, size);
+
+    if (size == 0) {
+        return 0;
+    }
+
+    in = ngx_quic_read_buffer(pc, &qs->recv, size);
+    if (in == NGX_CHAIN_ERROR) {
+        return NGX_ERROR;
+    }
+
+    len = 0;
+
+    for (cl = in; cl; cl = cl->next) {
+        b = cl->buf;
+        len += b->last - b->pos;
+        buf = ngx_cpymem(buf, b->pos, b->last - b->pos);
+    }
+
+    ngx_quic_free_chain(pc, in);
+
+    if (len == 0) {
+        rev->ready = 0;
+
+        if (qs->recv_state == NGX_QUIC_STREAM_RECV_DATA_RECVD
+            && qs->recv_offset == qs->recv_final_size)
+        {
+            qs->recv_state = NGX_QUIC_STREAM_RECV_DATA_READ;
+        }
+
+        if (qs->recv_state == NGX_QUIC_STREAM_RECV_DATA_READ) {
+            rev->eof = 1;
+            return 0;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic stream id:0x%xL recv() not ready", qs->id);
+        return NGX_AGAIN;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic stream id:0x%xL recv len:%z", qs->id, len);
+
+    if (ngx_quic_update_flow(qs, qs->recv_offset + len) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return len;
+}
+
+
+static ssize_t
+ngx_quic_stream_send(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ngx_buf_t    b;
+    ngx_chain_t  cl;
+
+    ngx_memzero(&b, sizeof(ngx_buf_t));
+
+    b.memory = 1;
+    b.pos = buf;
+    b.last = buf + size;
+
+    cl.buf = &b;
+    cl.next = NULL;
+
+    if (ngx_quic_stream_send_chain(c, &cl, 0) == NGX_CHAIN_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (b.pos == buf) {
+        return NGX_AGAIN;
+    }
+
+    return b.pos - buf;
+}
+
+
+static ngx_chain_t *
+ngx_quic_stream_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+{
+    uint64_t                n, flow;
+    ngx_event_t            *wev;
+    ngx_connection_t       *pc;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qs = c->quic;
+    pc = qs->parent;
+    qc = ngx_quic_get_connection(pc);
+    wev = c->write;
+
+    if (qs->send_state != NGX_QUIC_STREAM_SEND_READY
+        && qs->send_state != NGX_QUIC_STREAM_SEND_SEND)
+    {
+        wev->error = 1;
+        return NGX_CHAIN_ERROR;
+    }
+
+    qs->send_state = NGX_QUIC_STREAM_SEND_SEND;
+
+    flow = qs->acked + qc->conf->stream_buffer_size - qs->sent;
+
+    if (flow == 0) {
+        wev->ready = 0;
+        return in;
+    }
+
+    if (limit == 0 || limit > (off_t) flow) {
+        limit = flow;
+    }
+
+    n = qs->send.size;
+
+    in = ngx_quic_write_buffer(pc, &qs->send, in, limit, qs->sent);
+    if (in == NGX_CHAIN_ERROR) {
+        return NGX_CHAIN_ERROR;
+    }
+
+    n = qs->send.size - n;
+    c->sent += n;
+    qs->sent += n;
+    qc->streams.sent += n;
+
+    if (flow == n) {
+        wev->ready = 0;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic send_chain sent:%uL", n);
+
+    if (ngx_quic_stream_flush(qs) != NGX_OK) {
+        return NGX_CHAIN_ERROR;
+    }
+
+    return in;
+}
+
+
+static ngx_int_t
+ngx_quic_stream_flush(ngx_quic_stream_t *qs)
+{
+    off_t                   limit, len;
+    ngx_uint_t              last;
+    ngx_chain_t            *out;
+    ngx_quic_frame_t       *frame;
+    ngx_connection_t       *pc;
+    ngx_quic_connection_t  *qc;
+
+    if (qs->send_state != NGX_QUIC_STREAM_SEND_SEND) {
+        return NGX_OK;
+    }
+
+    pc = qs->parent;
+    qc = ngx_quic_get_connection(pc);
+
+    if (qc->streams.send_max_data == 0) {
+        qc->streams.send_max_data = qc->ctp.initial_max_data;
+    }
+
+    limit = ngx_min(qc->streams.send_max_data - qc->streams.send_offset,
+                    qs->send_max_data - qs->send_offset);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0,
+                   "quic stream id:0x%xL flush limit:%O", qs->id, limit);
+
+    len = qs->send.offset;
+
+    out = ngx_quic_read_buffer(pc, &qs->send, limit);
+    if (out == NGX_CHAIN_ERROR) {
+        return NGX_ERROR;
+    }
+
+    len = qs->send.offset - len;
+    last = 0;
+
+    if (qs->send_final_size != (uint64_t) -1
+        && qs->send_final_size == qs->send.offset)
+    {
+        qs->send_state = NGX_QUIC_STREAM_SEND_DATA_SENT;
+        last = 1;
+    }
+
+    if (len == 0 && !last) {
+        return NGX_OK;
+    }
+
+    frame = ngx_quic_alloc_frame(pc);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_STREAM;
+    frame->data = out;
+
+    frame->u.stream.off = 1;
+    frame->u.stream.len = 1;
+    frame->u.stream.fin = last;
+
+    frame->u.stream.stream_id = qs->id;
+    frame->u.stream.offset = qs->send_offset;
+    frame->u.stream.length = len;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    qs->send_offset += len;
+    qc->streams.send_offset += len;
+
+    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pc->log, 0,
+                   "quic stream id:0x%xL flush len:%O last:%ui",
+                   qs->id, len, last);
+
+    if (qs->connection == NULL) {
+        return ngx_quic_close_stream(qs);
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_stream_cleanup_handler(void *data)
+{
+    ngx_connection_t *c = data;
+
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qs = c->quic;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, qs->parent->log, 0,
+                   "quic stream id:0x%xL cleanup", qs->id);
+
+    if (ngx_quic_shutdown_stream(c, NGX_RDWR_SHUTDOWN) != NGX_OK) {
+        qs->connection = NULL;
+        goto failed;
+    }
+
+    qs->connection = NULL;
+
+    if (ngx_quic_close_stream(qs) != NGX_OK) {
+        goto failed;
+    }
+
+    return;
+
+failed:
+
+    qc = ngx_quic_get_connection(qs->parent);
+    qc->error = NGX_QUIC_ERR_INTERNAL_ERROR;
+
+    ngx_post_event(&qc->close, &ngx_posted_events);
+}
+
+
+static ngx_int_t
+ngx_quic_close_stream(ngx_quic_stream_t *qs)
+{
+    ngx_connection_t       *pc;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    pc = qs->parent;
+    qc = ngx_quic_get_connection(pc);
+
+    if (!qc->closing) {
+        /* make sure everything is sent and final size is received */
+
+        if (qs->recv_state == NGX_QUIC_STREAM_RECV_RECV) {
+            return NGX_OK;
+        }
+
+        if (qs->send_state != NGX_QUIC_STREAM_SEND_DATA_RECVD
+            && qs->send_state != NGX_QUIC_STREAM_SEND_RESET_RECVD)
+        {
+            return NGX_OK;
+        }
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0,
+                   "quic stream id:0x%xL close", qs->id);
+
+    ngx_quic_free_buffer(pc, &qs->send);
+    ngx_quic_free_buffer(pc, &qs->recv);
+
+    ngx_rbtree_delete(&qc->streams.tree, &qs->node);
+    ngx_queue_insert_tail(&qc->streams.free, &qs->queue);
+
+    if (qc->closing) {
+        /* schedule handler call to continue ngx_quic_close_connection() */
+        ngx_post_event(&qc->close, &ngx_posted_events);
+        return NGX_OK;
+    }
+
+    if (!pc->reusable && ngx_quic_can_shutdown(pc) == NGX_OK) {
+        ngx_reusable_connection(pc, 1);
+    }
+
+    if (qc->shutdown) {
+        ngx_quic_shutdown_quic(pc);
+        return NGX_OK;
+    }
+
+    if ((qs->id & NGX_QUIC_STREAM_SERVER_INITIATED) == 0) {
+        frame = ngx_quic_alloc_frame(pc);
+        if (frame == NULL) {
+            return NGX_ERROR;
+        }
+
+        frame->level = ssl_encryption_application;
+        frame->type = NGX_QUIC_FT_MAX_STREAMS;
+
+        if (qs->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) {
+            frame->u.max_streams.limit = ++qc->streams.client_max_streams_uni;
+            frame->u.max_streams.bidi = 0;
+
+        } else {
+            frame->u.max_streams.limit = ++qc->streams.client_max_streams_bidi;
+            frame->u.max_streams.bidi = 1;
+        }
+
+        ngx_quic_queue_frame(qc, frame);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_can_shutdown(ngx_connection_t *c)
+{
+    ngx_rbtree_t           *tree;
+    ngx_rbtree_node_t      *node;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    tree = &qc->streams.tree;
+
+    if (tree->root != tree->sentinel) {
+        for (node = ngx_rbtree_min(tree->root, tree->sentinel);
+             node;
+             node = ngx_rbtree_next(tree, node))
+        {
+            qs = (ngx_quic_stream_t *) node;
+
+            if (!qs->cancelable) {
+                return NGX_DECLINED;
+            }
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
+    ngx_quic_frame_t *frame)
+{
+    uint64_t                  last;
+    ngx_quic_stream_t        *qs;
+    ngx_quic_connection_t    *qc;
+    ngx_quic_stream_frame_t  *f;
+
+    qc = ngx_quic_get_connection(c);
+    f = &frame->u.stream;
+
+    if ((f->stream_id & NGX_QUIC_STREAM_UNIDIRECTIONAL)
+        && (f->stream_id & NGX_QUIC_STREAM_SERVER_INITIATED))
+    {
+        qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+        return NGX_ERROR;
+    }
+
+    /* no overflow since both values are 62-bit */
+    last = f->offset + f->length;
+
+    qs = ngx_quic_get_stream(c, f->stream_id);
+
+    if (qs == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (qs == NGX_QUIC_STREAM_GONE) {
+        return NGX_OK;
+    }
+
+    if (qs->recv_state != NGX_QUIC_STREAM_RECV_RECV
+        && qs->recv_state != NGX_QUIC_STREAM_RECV_SIZE_KNOWN)
+    {
+        return NGX_OK;
+    }
+
+    if (ngx_quic_control_flow(qs, last) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (qs->recv_final_size != (uint64_t) -1 && last > qs->recv_final_size) {
+        qc->error = NGX_QUIC_ERR_FINAL_SIZE_ERROR;
+        return NGX_ERROR;
+    }
+
+    if (last < qs->recv_offset) {
+        return NGX_OK;
+    }
+
+    if (f->fin) {
+        if (qs->recv_final_size != (uint64_t) -1 && qs->recv_final_size != last)
+        {
+            qc->error = NGX_QUIC_ERR_FINAL_SIZE_ERROR;
+            return NGX_ERROR;
+        }
+
+        if (qs->recv_last > last) {
+            qc->error = NGX_QUIC_ERR_FINAL_SIZE_ERROR;
+            return NGX_ERROR;
+        }
+
+        qs->recv_final_size = last;
+        qs->recv_state = NGX_QUIC_STREAM_RECV_SIZE_KNOWN;
+    }
+
+    if (ngx_quic_write_buffer(c, &qs->recv, frame->data, f->length, f->offset)
+        == NGX_CHAIN_ERROR)
+    {
+        return NGX_ERROR;
+    }
+
+    if (qs->recv_state == NGX_QUIC_STREAM_RECV_SIZE_KNOWN
+        && qs->recv.size == qs->recv_final_size)
+    {
+        qs->recv_state = NGX_QUIC_STREAM_RECV_DATA_RECVD;
+    }
+
+    if (qs->connection == NULL) {
+        return ngx_quic_close_stream(qs);
+    }
+
+    if (f->offset <= qs->recv_offset) {
+        ngx_quic_set_event(qs->connection->read);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_handle_max_data_frame(ngx_connection_t *c,
+    ngx_quic_max_data_frame_t *f)
+{
+    ngx_rbtree_t           *tree;
+    ngx_rbtree_node_t      *node;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+    tree = &qc->streams.tree;
+
+    if (f->max_data <= qc->streams.send_max_data) {
+        return NGX_OK;
+    }
+
+    if (tree->root == tree->sentinel
+        || qc->streams.send_offset < qc->streams.send_max_data)
+    {
+        /* not blocked on MAX_DATA */
+        qc->streams.send_max_data = f->max_data;
+        return NGX_OK;
+    }
+
+    qc->streams.send_max_data = f->max_data;
+    node = ngx_rbtree_min(tree->root, tree->sentinel);
+
+    while (node && qc->streams.send_offset < qc->streams.send_max_data) {
+
+        qs = (ngx_quic_stream_t *) node;
+        node = ngx_rbtree_next(tree, node);
+
+        if (ngx_quic_stream_flush(qs) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_handle_streams_blocked_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_streams_blocked_frame_t *f)
+{
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_handle_data_blocked_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_data_blocked_frame_t *f)
+{
+    return ngx_quic_update_max_data(c);
+}
+
+
+ngx_int_t
+ngx_quic_handle_stream_data_blocked_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_stream_data_blocked_frame_t *f)
+{
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if ((f->id & NGX_QUIC_STREAM_UNIDIRECTIONAL)
+        && (f->id & NGX_QUIC_STREAM_SERVER_INITIATED))
+    {
+        qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+        return NGX_ERROR;
+    }
+
+    qs = ngx_quic_get_stream(c, f->id);
+
+    if (qs == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (qs == NGX_QUIC_STREAM_GONE) {
+        return NGX_OK;
+    }
+
+    return ngx_quic_update_max_stream_data(qs);
+}
+
+
+ngx_int_t
+ngx_quic_handle_max_stream_data_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_max_stream_data_frame_t *f)
+{
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if ((f->id & NGX_QUIC_STREAM_UNIDIRECTIONAL)
+        && (f->id & NGX_QUIC_STREAM_SERVER_INITIATED) == 0)
+    {
+        qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+        return NGX_ERROR;
+    }
+
+    qs = ngx_quic_get_stream(c, f->id);
+
+    if (qs == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (qs == NGX_QUIC_STREAM_GONE) {
+        return NGX_OK;
+    }
+
+    if (f->limit <= qs->send_max_data) {
+        return NGX_OK;
+    }
+
+    if (qs->send_offset < qs->send_max_data) {
+        /* not blocked on MAX_STREAM_DATA */
+        qs->send_max_data = f->limit;
+        return NGX_OK;
+    }
+
+    qs->send_max_data = f->limit;
+
+    return ngx_quic_stream_flush(qs);
+}
+
+
+ngx_int_t
+ngx_quic_handle_reset_stream_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_reset_stream_frame_t *f)
+{
+    ngx_event_t            *rev;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if ((f->id & NGX_QUIC_STREAM_UNIDIRECTIONAL)
+        && (f->id & NGX_QUIC_STREAM_SERVER_INITIATED))
+    {
+        qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+        return NGX_ERROR;
+    }
+
+    qs = ngx_quic_get_stream(c, f->id);
+
+    if (qs == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (qs == NGX_QUIC_STREAM_GONE) {
+        return NGX_OK;
+    }
+
+    if (qs->recv_state == NGX_QUIC_STREAM_RECV_RESET_RECVD
+        || qs->recv_state == NGX_QUIC_STREAM_RECV_RESET_READ)
+    {
+        return NGX_OK;
+    }
+
+    qs->recv_state = NGX_QUIC_STREAM_RECV_RESET_RECVD;
+
+    if (ngx_quic_control_flow(qs, f->final_size) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (qs->recv_final_size != (uint64_t) -1
+        && qs->recv_final_size != f->final_size)
+    {
+        qc->error = NGX_QUIC_ERR_FINAL_SIZE_ERROR;
+        return NGX_ERROR;
+    }
+
+    if (qs->recv_last > f->final_size) {
+        qc->error = NGX_QUIC_ERR_FINAL_SIZE_ERROR;
+        return NGX_ERROR;
+    }
+
+    qs->recv_final_size = f->final_size;
+
+    if (ngx_quic_update_flow(qs, qs->recv_final_size) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (qs->connection == NULL) {
+        return ngx_quic_close_stream(qs);
+    }
+
+    rev = qs->connection->read;
+    rev->error = 1;
+
+    ngx_quic_set_event(rev);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_handle_stop_sending_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_stop_sending_frame_t *f)
+{
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if ((f->id & NGX_QUIC_STREAM_UNIDIRECTIONAL)
+        && (f->id & NGX_QUIC_STREAM_SERVER_INITIATED) == 0)
+    {
+        qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+        return NGX_ERROR;
+    }
+
+    qs = ngx_quic_get_stream(c, f->id);
+
+    if (qs == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (qs == NGX_QUIC_STREAM_GONE) {
+        return NGX_OK;
+    }
+
+    if (ngx_quic_do_reset_stream(qs, f->error_code) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (qs->connection == NULL) {
+        return ngx_quic_close_stream(qs);
+    }
+
+    ngx_quic_set_event(qs->connection->write);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_handle_max_streams_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_max_streams_frame_t *f)
+{
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    if (f->bidi) {
+        if (qc->streams.server_max_streams_bidi < f->limit) {
+            qc->streams.server_max_streams_bidi = f->limit;
+
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic max_streams_bidi:%uL", f->limit);
+        }
+
+    } else {
+        if (qc->streams.server_max_streams_uni < f->limit) {
+            qc->streams.server_max_streams_uni = f->limit;
+
+            ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                           "quic max_streams_uni:%uL", f->limit);
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+void
+ngx_quic_handle_stream_ack(ngx_connection_t *c, ngx_quic_frame_t *f)
+{
+    uint64_t                acked;
+    ngx_quic_stream_t      *qs;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    switch (f->type) {
+
+    case NGX_QUIC_FT_RESET_STREAM:
+
+        qs = ngx_quic_find_stream(&qc->streams.tree, f->u.reset_stream.id);
+        if (qs == NULL) {
+            return;
+        }
+
+        qs->send_state = NGX_QUIC_STREAM_SEND_RESET_RECVD;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic stream id:0x%xL ack reset final_size:%uL",
+                       qs->id, f->u.reset_stream.final_size);
+
+        break;
+
+    case NGX_QUIC_FT_STREAM:
+
+        qs = ngx_quic_find_stream(&qc->streams.tree, f->u.stream.stream_id);
+        if (qs == NULL) {
+            return;
+        }
+
+        acked = qs->acked;
+        qs->acked += f->u.stream.length;
+
+        if (f->u.stream.fin) {
+            qs->fin_acked = 1;
+        }
+
+        if (qs->send_state == NGX_QUIC_STREAM_SEND_DATA_SENT
+            && qs->acked == qs->sent && qs->fin_acked)
+        {
+            qs->send_state = NGX_QUIC_STREAM_SEND_DATA_RECVD;
+        }
+
+        ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "quic stream id:0x%xL ack len:%uL fin:%d unacked:%uL",
+                       qs->id, f->u.stream.length, f->u.stream.fin,
+                       qs->sent - qs->acked);
+
+        if (qs->connection
+            && qs->sent - acked == qc->conf->stream_buffer_size
+            && f->u.stream.length > 0)
+        {
+            ngx_quic_set_event(qs->connection->write);
+        }
+
+        break;
+
+    default:
+        return;
+    }
+
+    if (qs->connection == NULL) {
+        ngx_quic_close_stream(qs);
+    }
+}
+
+
+static ngx_int_t
+ngx_quic_control_flow(ngx_quic_stream_t *qs, uint64_t last)
+{
+    uint64_t                len;
+    ngx_connection_t       *pc;
+    ngx_quic_connection_t  *qc;
+
+    pc = qs->parent;
+    qc = ngx_quic_get_connection(pc);
+
+    if (last <= qs->recv_last) {
+        return NGX_OK;
+    }
+
+    len = last - qs->recv_last;
+
+    ngx_log_debug5(NGX_LOG_DEBUG_EVENT, pc->log, 0,
+                   "quic stream id:0x%xL flow control msd:%uL/%uL md:%uL/%uL",
+                   qs->id, last, qs->recv_max_data, qc->streams.recv_last + len,
+                   qc->streams.recv_max_data);
+
+    qs->recv_last += len;
+
+    if (qs->recv_state == NGX_QUIC_STREAM_RECV_RECV
+        && qs->recv_last > qs->recv_max_data)
+    {
+        qc->error = NGX_QUIC_ERR_FLOW_CONTROL_ERROR;
+        return NGX_ERROR;
+    }
+
+    qc->streams.recv_last += len;
+
+    if (qc->streams.recv_last > qc->streams.recv_max_data) {
+        qc->error = NGX_QUIC_ERR_FLOW_CONTROL_ERROR;
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_update_flow(ngx_quic_stream_t *qs, uint64_t last)
+{
+    uint64_t                len;
+    ngx_connection_t       *pc;
+    ngx_quic_connection_t  *qc;
+
+    pc = qs->parent;
+    qc = ngx_quic_get_connection(pc);
+
+    if (last <= qs->recv_offset) {
+        return NGX_OK;
+    }
+
+    len = last - qs->recv_offset;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0,
+                   "quic stream id:0x%xL flow update %uL", qs->id, last);
+
+    qs->recv_offset += len;
+
+    if (qs->recv_max_data <= qs->recv_offset + qs->recv_window / 2) {
+        if (ngx_quic_update_max_stream_data(qs) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    qc->streams.recv_offset += len;
+
+    if (qc->streams.recv_max_data
+        <= qc->streams.recv_offset + qc->streams.recv_window / 2)
+    {
+        if (ngx_quic_update_max_data(pc) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_update_max_stream_data(ngx_quic_stream_t *qs)
+{
+    uint64_t                recv_max_data;
+    ngx_connection_t       *pc;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    pc = qs->parent;
+    qc = ngx_quic_get_connection(pc);
+
+    if (qs->recv_state != NGX_QUIC_STREAM_RECV_RECV) {
+        return NGX_OK;
+    }
+
+    recv_max_data = qs->recv_offset + qs->recv_window;
+
+    if (qs->recv_max_data == recv_max_data) {
+        return NGX_OK;
+    }
+
+    qs->recv_max_data = recv_max_data;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0,
+                   "quic stream id:0x%xL flow update msd:%uL",
+                   qs->id, qs->recv_max_data);
+
+    frame = ngx_quic_alloc_frame(pc);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_MAX_STREAM_DATA;
+    frame->u.max_stream_data.id = qs->id;
+    frame->u.max_stream_data.limit = qs->recv_max_data;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_update_max_data(ngx_connection_t *c)
+{
+    uint64_t                recv_max_data;
+    ngx_quic_frame_t       *frame;
+    ngx_quic_connection_t  *qc;
+
+    qc = ngx_quic_get_connection(c);
+
+    recv_max_data = qc->streams.recv_offset + qc->streams.recv_window;
+
+    if (qc->streams.recv_max_data == recv_max_data) {
+        return NGX_OK;
+    }
+
+    qc->streams.recv_max_data = recv_max_data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic flow update md:%uL", qc->streams.recv_max_data);
+
+    frame = ngx_quic_alloc_frame(c);
+    if (frame == NULL) {
+        return NGX_ERROR;
+    }
+
+    frame->level = ssl_encryption_application;
+    frame->type = NGX_QUIC_FT_MAX_DATA;
+    frame->u.max_data.max_data = qc->streams.recv_max_data;
+
+    ngx_quic_queue_frame(qc, frame);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_set_event(ngx_event_t *ev)
+{
+    ev->ready = 1;
+
+    if (ev->active) {
+        ngx_post_event(ev, &ngx_posted_events);
+    }
+}
diff --git a/src/event/quic/ngx_event_quic_streams.h b/src/event/quic/ngx_event_quic_streams.h
new file mode 100644
index 0000000..fb6dbbd
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_streams.h
@@ -0,0 +1,44 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_STREAMS_H_INCLUDED_
+#define _NGX_EVENT_QUIC_STREAMS_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+ngx_int_t ngx_quic_handle_stream_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_frame_t *frame);
+void ngx_quic_handle_stream_ack(ngx_connection_t *c,
+    ngx_quic_frame_t *f);
+ngx_int_t ngx_quic_handle_max_data_frame(ngx_connection_t *c,
+    ngx_quic_max_data_frame_t *f);
+ngx_int_t ngx_quic_handle_streams_blocked_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_streams_blocked_frame_t *f);
+ngx_int_t ngx_quic_handle_data_blocked_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_data_blocked_frame_t *f);
+ngx_int_t ngx_quic_handle_stream_data_blocked_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_stream_data_blocked_frame_t *f);
+ngx_int_t ngx_quic_handle_max_stream_data_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_max_stream_data_frame_t *f);
+ngx_int_t ngx_quic_handle_reset_stream_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_reset_stream_frame_t *f);
+ngx_int_t ngx_quic_handle_stop_sending_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_stop_sending_frame_t *f);
+ngx_int_t ngx_quic_handle_max_streams_frame(ngx_connection_t *c,
+    ngx_quic_header_t *pkt, ngx_quic_max_streams_frame_t *f);
+
+ngx_int_t ngx_quic_init_streams(ngx_connection_t *c);
+void ngx_quic_rbtree_insert_stream(ngx_rbtree_node_t *temp,
+    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
+ngx_quic_stream_t *ngx_quic_find_stream(ngx_rbtree_t *rbtree,
+    uint64_t id);
+ngx_int_t ngx_quic_close_streams(ngx_connection_t *c,
+    ngx_quic_connection_t *qc);
+
+#endif /* _NGX_EVENT_QUIC_STREAMS_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_tokens.c b/src/event/quic/ngx_event_quic_tokens.c
new file mode 100644
index 0000000..c1da0d4
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_tokens.c
@@ -0,0 +1,309 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_sha1.h>
+#include <ngx_event_quic_connection.h>
+
+
+static void ngx_quic_address_hash(struct sockaddr *sockaddr, socklen_t socklen,
+    ngx_uint_t no_port, u_char buf[20]);
+
+
+ngx_int_t
+ngx_quic_new_sr_token(ngx_connection_t *c, ngx_str_t *cid, u_char *secret,
+    u_char *token)
+{
+    ngx_str_t  tmp;
+
+    tmp.data = secret;
+    tmp.len = NGX_QUIC_SR_KEY_LEN;
+
+    if (ngx_quic_derive_key(c->log, "sr_token_key", &tmp, cid, token,
+                            NGX_QUIC_SR_TOKEN_LEN)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "quic stateless reset token %*xs",
+                    (size_t) NGX_QUIC_SR_TOKEN_LEN, token);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_new_token(ngx_log_t *log, struct sockaddr *sockaddr,
+    socklen_t socklen, u_char *key, ngx_str_t *token, ngx_str_t *odcid,
+    time_t exp, ngx_uint_t is_retry)
+{
+    int                len, iv_len;
+    u_char            *p, *iv;
+    EVP_CIPHER_CTX    *ctx;
+    const EVP_CIPHER  *cipher;
+
+    u_char             in[NGX_QUIC_MAX_TOKEN_SIZE];
+
+    ngx_quic_address_hash(sockaddr, socklen, !is_retry, in);
+
+    p = in + 20;
+
+    p = ngx_cpymem(p, &exp, sizeof(time_t));
+
+    *p++ = is_retry ? 1 : 0;
+
+    if (odcid) {
+        *p++ = odcid->len;
+        p = ngx_cpymem(p, odcid->data, odcid->len);
+
+    } else {
+        *p++ = 0;
+    }
+
+    len = p - in;
+
+    cipher = EVP_aes_256_gcm();
+    iv_len = NGX_QUIC_AES_256_GCM_IV_LEN;
+
+    if ((size_t) (iv_len + len + NGX_QUIC_AES_256_GCM_TAG_LEN) > token->len) {
+        ngx_log_error(NGX_LOG_ALERT, log, 0, "quic token buffer is too small");
+        return NGX_ERROR;
+    }
+
+    ctx = EVP_CIPHER_CTX_new();
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    iv = token->data;
+
+    if (RAND_bytes(iv, iv_len) <= 0
+        || !EVP_EncryptInit_ex(ctx, cipher, NULL, key, iv))
+    {
+        EVP_CIPHER_CTX_free(ctx);
+        return NGX_ERROR;
+    }
+
+    token->len = iv_len;
+
+    if (EVP_EncryptUpdate(ctx, token->data + token->len, &len, in, len) != 1) {
+        EVP_CIPHER_CTX_free(ctx);
+        return NGX_ERROR;
+    }
+
+    token->len += len;
+
+    if (EVP_EncryptFinal_ex(ctx, token->data + token->len, &len) <= 0) {
+        EVP_CIPHER_CTX_free(ctx);
+        return NGX_ERROR;
+    }
+
+    token->len += len;
+
+    if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG,
+                            NGX_QUIC_AES_256_GCM_TAG_LEN,
+                            token->data + token->len)
+        == 0)
+    {
+        EVP_CIPHER_CTX_free(ctx);
+        return NGX_ERROR;
+    }
+
+    token->len += NGX_QUIC_AES_256_GCM_TAG_LEN;
+
+    EVP_CIPHER_CTX_free(ctx);
+
+#ifdef NGX_QUIC_DEBUG_PACKETS
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic new token len:%uz %xV", token->len, token);
+#endif
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_quic_address_hash(struct sockaddr *sockaddr, socklen_t socklen,
+    ngx_uint_t no_port, u_char buf[20])
+{
+    size_t                len;
+    u_char               *data;
+    ngx_sha1_t            sha1;
+    struct sockaddr_in   *sin;
+#if (NGX_HAVE_INET6)
+    struct sockaddr_in6  *sin6;
+#endif
+
+    len = (size_t) socklen;
+    data = (u_char *) sockaddr;
+
+    if (no_port) {
+        switch (sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            sin6 = (struct sockaddr_in6 *) sockaddr;
+
+            len = sizeof(struct in6_addr);
+            data = sin6->sin6_addr.s6_addr;
+
+            break;
+#endif
+
+        case AF_INET:
+            sin = (struct sockaddr_in *) sockaddr;
+
+            len = sizeof(in_addr_t);
+            data = (u_char *) &sin->sin_addr;
+
+            break;
+        }
+    }
+
+    ngx_sha1_init(&sha1);
+    ngx_sha1_update(&sha1, data, len);
+    ngx_sha1_final(buf, &sha1);
+}
+
+
+ngx_int_t
+ngx_quic_validate_token(ngx_connection_t *c, u_char *key,
+    ngx_quic_header_t *pkt)
+{
+    int                len, tlen, iv_len;
+    u_char            *iv, *p;
+    time_t             now, exp;
+    size_t             total;
+    ngx_str_t          odcid;
+    EVP_CIPHER_CTX    *ctx;
+    const EVP_CIPHER  *cipher;
+
+    u_char             addr_hash[20];
+    u_char             tdec[NGX_QUIC_MAX_TOKEN_SIZE];
+
+#if NGX_SUPPRESS_WARN
+    ngx_str_null(&odcid);
+#endif
+
+    /* Retry token or NEW_TOKEN in a previous connection */
+
+    cipher = EVP_aes_256_gcm();
+    iv = pkt->token.data;
+    iv_len = NGX_QUIC_AES_256_GCM_IV_LEN;
+
+    /* sanity checks */
+
+    if (pkt->token.len < (size_t) iv_len + NGX_QUIC_AES_256_GCM_TAG_LEN) {
+        goto garbage;
+    }
+
+    if (pkt->token.len > (size_t) iv_len + NGX_QUIC_MAX_TOKEN_SIZE
+                         + NGX_QUIC_AES_256_GCM_TAG_LEN)
+    {
+        goto garbage;
+    }
+
+    ctx = EVP_CIPHER_CTX_new();
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (!EVP_DecryptInit_ex(ctx, cipher, NULL, key, iv)) {
+        EVP_CIPHER_CTX_free(ctx);
+        return NGX_ERROR;
+    }
+
+    p = pkt->token.data + iv_len;
+    len = pkt->token.len - iv_len - NGX_QUIC_AES_256_GCM_TAG_LEN;
+
+    if (EVP_DecryptUpdate(ctx, tdec, &tlen, p, len) != 1) {
+        EVP_CIPHER_CTX_free(ctx);
+        goto garbage;
+    }
+    total = tlen;
+
+    if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
+                            NGX_QUIC_AES_256_GCM_TAG_LEN, p + len)
+        == 0)
+    {
+        EVP_CIPHER_CTX_free(ctx);
+        goto garbage;
+    }
+
+    if (EVP_DecryptFinal_ex(ctx, tdec + tlen, &tlen) <= 0) {
+        EVP_CIPHER_CTX_free(ctx);
+        goto garbage;
+    }
+    total += tlen;
+
+    EVP_CIPHER_CTX_free(ctx);
+
+    if (total < (20 + sizeof(time_t) + 2)) {
+        goto garbage;
+    }
+
+    p = tdec + 20;
+
+    ngx_memcpy(&exp, p, sizeof(time_t));
+    p += sizeof(time_t);
+
+    pkt->retried = (*p++ == 1);
+
+    ngx_quic_address_hash(c->sockaddr, c->socklen, !pkt->retried, addr_hash);
+
+    if (ngx_memcmp(tdec, addr_hash, 20) != 0) {
+        goto bad_token;
+    }
+
+    odcid.len = *p++;
+    if (odcid.len) {
+        if (odcid.len > NGX_QUIC_MAX_CID_LEN) {
+            goto bad_token;
+        }
+
+        if ((size_t)(tdec + total - p) < odcid.len) {
+            goto bad_token;
+        }
+
+        odcid.data = p;
+    }
+
+    now = ngx_time();
+
+    if (now > exp) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0, "quic expired token");
+        return NGX_DECLINED;
+    }
+
+    if (odcid.len) {
+        pkt->odcid.len = odcid.len;
+        pkt->odcid.data = pkt->odcid_buf;
+        ngx_memcpy(pkt->odcid.data, odcid.data, odcid.len);
+
+    } else {
+        pkt->odcid = pkt->dcid;
+    }
+
+    pkt->validated = 1;
+
+    return NGX_OK;
+
+garbage:
+
+    ngx_log_error(NGX_LOG_INFO, c->log, 0, "quic garbage token");
+
+    return NGX_ABORT;
+
+bad_token:
+
+    ngx_log_error(NGX_LOG_INFO, c->log, 0, "quic invalid token");
+
+    return NGX_DECLINED;
+}
diff --git a/src/event/quic/ngx_event_quic_tokens.h b/src/event/quic/ngx_event_quic_tokens.h
new file mode 100644
index 0000000..ee3fe5b
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_tokens.h
@@ -0,0 +1,34 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_TOKENS_H_INCLUDED_
+#define _NGX_EVENT_QUIC_TOKENS_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#define NGX_QUIC_MAX_TOKEN_SIZE              64
+    /* SHA-1(addr)=20 + sizeof(time_t) + retry(1) + odcid.len(1) + odcid */
+
+#define NGX_QUIC_AES_256_GCM_IV_LEN          12
+#define NGX_QUIC_AES_256_GCM_TAG_LEN         16
+
+#define NGX_QUIC_TOKEN_BUF_SIZE             (NGX_QUIC_AES_256_GCM_IV_LEN      \
+                                             + NGX_QUIC_MAX_TOKEN_SIZE        \
+                                             + NGX_QUIC_AES_256_GCM_TAG_LEN)
+
+
+ngx_int_t ngx_quic_new_sr_token(ngx_connection_t *c, ngx_str_t *cid,
+    u_char *secret, u_char *token);
+ngx_int_t ngx_quic_new_token(ngx_log_t *log, struct sockaddr *sockaddr,
+    socklen_t socklen, u_char *key, ngx_str_t *token, ngx_str_t *odcid,
+    time_t expires, ngx_uint_t is_retry);
+ngx_int_t ngx_quic_validate_token(ngx_connection_t *c,
+    u_char *key, ngx_quic_header_t *pkt);
+
+#endif /* _NGX_EVENT_QUIC_TOKENS_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_transport.c b/src/event/quic/ngx_event_quic_transport.c
new file mode 100644
index 0000000..19670a6
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_transport.c
@@ -0,0 +1,2202 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+#define NGX_QUIC_LONG_DCID_LEN_OFFSET  5
+#define NGX_QUIC_LONG_DCID_OFFSET      6
+#define NGX_QUIC_SHORT_DCID_OFFSET     1
+
+#define NGX_QUIC_STREAM_FRAME_FIN      0x01
+#define NGX_QUIC_STREAM_FRAME_LEN      0x02
+#define NGX_QUIC_STREAM_FRAME_OFF      0x04
+
+
+#if (NGX_HAVE_NONALIGNED)
+
+#define ngx_quic_parse_uint16(p)  ntohs(*(uint16_t *) (p))
+#define ngx_quic_parse_uint32(p)  ntohl(*(uint32_t *) (p))
+
+#define ngx_quic_write_uint16  ngx_quic_write_uint16_aligned
+#define ngx_quic_write_uint32  ngx_quic_write_uint32_aligned
+
+#else
+
+#define ngx_quic_parse_uint16(p)  ((p)[0] << 8 | (p)[1])
+#define ngx_quic_parse_uint32(p)                                              \
+    ((uint32_t) (p)[0] << 24 | (p)[1] << 16 | (p)[2] << 8 | (p)[3])
+
+#define ngx_quic_write_uint16(p, s)                                           \
+    ((p)[0] = (u_char) ((s) >> 8),                                            \
+     (p)[1] = (u_char)  (s),                                                  \
+     (p) + sizeof(uint16_t))
+
+#define ngx_quic_write_uint32(p, s)                                           \
+    ((p)[0] = (u_char) ((s) >> 24),                                           \
+     (p)[1] = (u_char) ((s) >> 16),                                           \
+     (p)[2] = (u_char) ((s) >> 8),                                            \
+     (p)[3] = (u_char)  (s),                                                  \
+     (p) + sizeof(uint32_t))
+
+#endif
+
+#define ngx_quic_write_uint64(p, s)                                           \
+    ((p)[0] = (u_char) ((s) >> 56),                                           \
+     (p)[1] = (u_char) ((s) >> 48),                                           \
+     (p)[2] = (u_char) ((s) >> 40),                                           \
+     (p)[3] = (u_char) ((s) >> 32),                                           \
+     (p)[4] = (u_char) ((s) >> 24),                                           \
+     (p)[5] = (u_char) ((s) >> 16),                                           \
+     (p)[6] = (u_char) ((s) >> 8),                                            \
+     (p)[7] = (u_char)  (s),                                                  \
+     (p) + sizeof(uint64_t))
+
+#define ngx_quic_write_uint24(p, s)                                           \
+    ((p)[0] = (u_char) ((s) >> 16),                                           \
+     (p)[1] = (u_char) ((s) >> 8),                                            \
+     (p)[2] = (u_char)  (s),                                                  \
+     (p) + 3)
+
+#define ngx_quic_write_uint16_aligned(p, s)                                   \
+    (*(uint16_t *) (p) = htons((uint16_t) (s)), (p) + sizeof(uint16_t))
+
+#define ngx_quic_write_uint32_aligned(p, s)                                   \
+    (*(uint32_t *) (p) = htonl((uint32_t) (s)), (p) + sizeof(uint32_t))
+
+#define ngx_quic_build_int_set(p, value, len, bits)                           \
+    (*(p)++ = ((value >> ((len) * 8)) & 0xff) | ((bits) << 6))
+
+
+static u_char *ngx_quic_parse_int(u_char *pos, u_char *end, uint64_t *out);
+static ngx_uint_t ngx_quic_varint_len(uint64_t value);
+static void ngx_quic_build_int(u_char **pos, uint64_t value);
+
+static u_char *ngx_quic_read_uint8(u_char *pos, u_char *end, uint8_t *value);
+static u_char *ngx_quic_read_uint32(u_char *pos, u_char *end, uint32_t *value);
+static u_char *ngx_quic_read_bytes(u_char *pos, u_char *end, size_t len,
+    u_char **out);
+static u_char *ngx_quic_copy_bytes(u_char *pos, u_char *end, size_t len,
+    u_char *dst);
+
+static ngx_int_t ngx_quic_parse_short_header(ngx_quic_header_t *pkt,
+    size_t dcid_len);
+static ngx_int_t ngx_quic_parse_long_header(ngx_quic_header_t *pkt);
+static ngx_int_t ngx_quic_supported_version(uint32_t version);
+static ngx_int_t ngx_quic_parse_long_header_v1(ngx_quic_header_t *pkt);
+
+static size_t ngx_quic_create_long_header(ngx_quic_header_t *pkt, u_char *out,
+    u_char **pnp);
+static size_t ngx_quic_create_short_header(ngx_quic_header_t *pkt, u_char *out,
+    u_char **pnp);
+
+static ngx_int_t ngx_quic_frame_allowed(ngx_quic_header_t *pkt,
+    ngx_uint_t frame_type);
+static size_t ngx_quic_create_ping(u_char *p);
+static size_t ngx_quic_create_ack(u_char *p, ngx_quic_ack_frame_t *ack,
+    ngx_chain_t *ranges);
+static size_t ngx_quic_create_reset_stream(u_char *p,
+    ngx_quic_reset_stream_frame_t *rs);
+static size_t ngx_quic_create_stop_sending(u_char *p,
+    ngx_quic_stop_sending_frame_t *ss);
+static size_t ngx_quic_create_crypto(u_char *p,
+    ngx_quic_crypto_frame_t *crypto, ngx_chain_t *data);
+static size_t ngx_quic_create_hs_done(u_char *p);
+static size_t ngx_quic_create_new_token(u_char *p,
+    ngx_quic_new_token_frame_t *token, ngx_chain_t *data);
+static size_t ngx_quic_create_stream(u_char *p, ngx_quic_stream_frame_t *sf,
+    ngx_chain_t *data);
+static size_t ngx_quic_create_max_streams(u_char *p,
+    ngx_quic_max_streams_frame_t *ms);
+static size_t ngx_quic_create_max_stream_data(u_char *p,
+    ngx_quic_max_stream_data_frame_t *ms);
+static size_t ngx_quic_create_max_data(u_char *p,
+    ngx_quic_max_data_frame_t *md);
+static size_t ngx_quic_create_path_challenge(u_char *p,
+    ngx_quic_path_challenge_frame_t *pc);
+static size_t ngx_quic_create_path_response(u_char *p,
+    ngx_quic_path_challenge_frame_t *pc);
+static size_t ngx_quic_create_new_connection_id(u_char *p,
+    ngx_quic_new_conn_id_frame_t *rcid);
+static size_t ngx_quic_create_retire_connection_id(u_char *p,
+    ngx_quic_retire_cid_frame_t *rcid);
+static size_t ngx_quic_create_close(u_char *p, ngx_quic_frame_t *f);
+
+static ngx_int_t ngx_quic_parse_transport_param(u_char *p, u_char *end,
+    uint16_t id, ngx_quic_tp_t *dst);
+
+
+uint32_t  ngx_quic_versions[] = {
+    /* QUICv1 */
+    0x00000001,
+};
+
+#define NGX_QUIC_NVERSIONS \
+    (sizeof(ngx_quic_versions) / sizeof(ngx_quic_versions[0]))
+
+
+static ngx_inline u_char *
+ngx_quic_parse_int(u_char *pos, u_char *end, uint64_t *out)
+{
+    u_char      *p;
+    uint64_t     value;
+    ngx_uint_t   len;
+
+    if (pos >= end) {
+        return NULL;
+    }
+
+    p = pos;
+    len = 1 << (*p >> 6);
+
+    value = *p++ & 0x3f;
+
+    if ((size_t)(end - p) < (len - 1)) {
+        return NULL;
+    }
+
+    while (--len) {
+        value = (value << 8) + *p++;
+    }
+
+    *out = value;
+
+    return p;
+}
+
+
+static ngx_inline u_char *
+ngx_quic_read_uint8(u_char *pos, u_char *end, uint8_t *value)
+{
+    if ((size_t)(end - pos) < 1) {
+        return NULL;
+    }
+
+    *value = *pos;
+
+    return pos + 1;
+}
+
+
+static ngx_inline u_char *
+ngx_quic_read_uint32(u_char *pos, u_char *end, uint32_t *value)
+{
+    if ((size_t)(end - pos) < sizeof(uint32_t)) {
+        return NULL;
+    }
+
+    *value = ngx_quic_parse_uint32(pos);
+
+    return pos + sizeof(uint32_t);
+}
+
+
+static ngx_inline u_char *
+ngx_quic_read_bytes(u_char *pos, u_char *end, size_t len, u_char **out)
+{
+    if ((size_t)(end - pos) < len) {
+        return NULL;
+    }
+
+    *out = pos;
+
+    return pos + len;
+}
+
+
+static u_char *
+ngx_quic_copy_bytes(u_char *pos, u_char *end, size_t len, u_char *dst)
+{
+    if ((size_t)(end - pos) < len) {
+        return NULL;
+    }
+
+    ngx_memcpy(dst, pos, len);
+
+    return pos + len;
+}
+
+
+static ngx_inline ngx_uint_t
+ngx_quic_varint_len(uint64_t value)
+{
+    if (value < (1 << 6)) {
+        return 1;
+    }
+
+    if (value < (1 << 14)) {
+        return 2;
+    }
+
+    if (value < (1 << 30)) {
+        return 4;
+    }
+
+    return 8;
+}
+
+
+static ngx_inline void
+ngx_quic_build_int(u_char **pos, uint64_t value)
+{
+    u_char  *p;
+
+    p = *pos;
+
+    if (value < (1 << 6)) {
+        ngx_quic_build_int_set(p, value, 0, 0);
+
+    } else if (value < (1 << 14)) {
+        ngx_quic_build_int_set(p, value, 1, 1);
+        ngx_quic_build_int_set(p, value, 0, 0);
+
+    } else if (value < (1 << 30)) {
+        ngx_quic_build_int_set(p, value, 3, 2);
+        ngx_quic_build_int_set(p, value, 2, 0);
+        ngx_quic_build_int_set(p, value, 1, 0);
+        ngx_quic_build_int_set(p, value, 0, 0);
+
+    } else {
+        ngx_quic_build_int_set(p, value, 7, 3);
+        ngx_quic_build_int_set(p, value, 6, 0);
+        ngx_quic_build_int_set(p, value, 5, 0);
+        ngx_quic_build_int_set(p, value, 4, 0);
+        ngx_quic_build_int_set(p, value, 3, 0);
+        ngx_quic_build_int_set(p, value, 2, 0);
+        ngx_quic_build_int_set(p, value, 1, 0);
+        ngx_quic_build_int_set(p, value, 0, 0);
+    }
+
+    *pos = p;
+}
+
+
+ngx_int_t
+ngx_quic_parse_packet(ngx_quic_header_t *pkt)
+{
+    if (!ngx_quic_long_pkt(pkt->flags)) {
+        pkt->level = ssl_encryption_application;
+
+        if (ngx_quic_parse_short_header(pkt, NGX_QUIC_SERVER_CID_LEN) != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        return NGX_OK;
+    }
+
+    if (ngx_quic_parse_long_header(pkt) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (!ngx_quic_supported_version(pkt->version)) {
+        return NGX_ABORT;
+    }
+
+    if (ngx_quic_parse_long_header_v1(pkt) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_parse_short_header(ngx_quic_header_t *pkt, size_t dcid_len)
+{
+    u_char  *p, *end;
+
+    p = pkt->raw->pos;
+    end = pkt->data + pkt->len;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                   "quic packet rx short flags:%xd", pkt->flags);
+
+    if (!(pkt->flags & NGX_QUIC_PKT_FIXED_BIT)) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic fixed bit is not set");
+        return NGX_ERROR;
+    }
+
+    pkt->dcid.len = dcid_len;
+
+    p = ngx_quic_read_bytes(p, end, dcid_len, &pkt->dcid.data);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic packet is too small to read dcid");
+        return NGX_ERROR;
+    }
+
+    pkt->raw->pos = p;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_parse_long_header(ngx_quic_header_t *pkt)
+{
+    u_char   *p, *end;
+    uint8_t   idlen;
+
+    p = pkt->raw->pos;
+    end = pkt->data + pkt->len;
+
+    p = ngx_quic_read_uint32(p, end, &pkt->version);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic packet is too small to read version");
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                   "quic packet rx long flags:%xd version:%xD",
+                   pkt->flags, pkt->version);
+
+    if (!(pkt->flags & NGX_QUIC_PKT_FIXED_BIT)) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic fixed bit is not set");
+        return NGX_ERROR;
+    }
+
+    p = ngx_quic_read_uint8(p, end, &idlen);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic packet is too small to read dcid len");
+        return NGX_ERROR;
+    }
+
+    if (idlen > NGX_QUIC_CID_LEN_MAX) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic packet dcid is too long");
+        return NGX_ERROR;
+    }
+
+    pkt->dcid.len = idlen;
+
+    p = ngx_quic_read_bytes(p, end, idlen, &pkt->dcid.data);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic packet is too small to read dcid");
+        return NGX_ERROR;
+    }
+
+    p = ngx_quic_read_uint8(p, end, &idlen);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic packet is too small to read scid len");
+        return NGX_ERROR;
+    }
+
+    if (idlen > NGX_QUIC_CID_LEN_MAX) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic packet scid is too long");
+        return NGX_ERROR;
+    }
+
+    pkt->scid.len = idlen;
+
+    p = ngx_quic_read_bytes(p, end, idlen, &pkt->scid.data);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic packet is too small to read scid");
+        return NGX_ERROR;
+    }
+
+    pkt->raw->pos = p;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_quic_supported_version(uint32_t version)
+{
+    ngx_uint_t  i;
+
+    for (i = 0; i < NGX_QUIC_NVERSIONS; i++) {
+        if (ngx_quic_versions[i] == version) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+
+static ngx_int_t
+ngx_quic_parse_long_header_v1(ngx_quic_header_t *pkt)
+{
+    u_char    *p, *end;
+    uint64_t   varint;
+
+    p = pkt->raw->pos;
+    end = pkt->raw->last;
+
+    pkt->log->action = "parsing quic long header";
+
+    if (ngx_quic_pkt_in(pkt->flags)) {
+
+        if (pkt->len < NGX_QUIC_MIN_INITIAL_SIZE) {
+            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                          "quic UDP datagram is too small for initial packet");
+            return NGX_DECLINED;
+        }
+
+        p = ngx_quic_parse_int(p, end, &varint);
+        if (p == NULL) {
+            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                          "quic failed to parse token length");
+            return NGX_ERROR;
+        }
+
+        pkt->token.len = varint;
+
+        p = ngx_quic_read_bytes(p, end, pkt->token.len, &pkt->token.data);
+        if (p == NULL) {
+            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                          "quic packet too small to read token data");
+            return NGX_ERROR;
+        }
+
+        pkt->level = ssl_encryption_initial;
+
+    } else if (ngx_quic_pkt_zrtt(pkt->flags)) {
+        pkt->level = ssl_encryption_early_data;
+
+    } else if (ngx_quic_pkt_hs(pkt->flags)) {
+        pkt->level = ssl_encryption_handshake;
+
+    } else {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic bad packet type");
+        return NGX_DECLINED;
+    }
+
+    p = ngx_quic_parse_int(p, end, &varint);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic bad packet length");
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                   "quic packet rx %s len:%uL",
+                   ngx_quic_level_name(pkt->level), varint);
+
+    if (varint > (uint64_t) ((pkt->data + pkt->len) - p)) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic truncated %s packet",
+                      ngx_quic_level_name(pkt->level));
+        return NGX_ERROR;
+    }
+
+    pkt->raw->pos = p;
+    pkt->len = p + varint - pkt->data;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_get_packet_dcid(ngx_log_t *log, u_char *data, size_t n,
+    ngx_str_t *dcid)
+{
+    size_t  len, offset;
+
+    if (n == 0) {
+        goto failed;
+    }
+
+    if (ngx_quic_long_pkt(*data)) {
+        if (n < NGX_QUIC_LONG_DCID_LEN_OFFSET + 1) {
+            goto failed;
+        }
+
+        len = data[NGX_QUIC_LONG_DCID_LEN_OFFSET];
+        offset = NGX_QUIC_LONG_DCID_OFFSET;
+
+    } else {
+        len = NGX_QUIC_SERVER_CID_LEN;
+        offset = NGX_QUIC_SHORT_DCID_OFFSET;
+    }
+
+    if (n < len + offset) {
+        goto failed;
+    }
+
+    dcid->len = len;
+    dcid->data = &data[offset];
+
+    return NGX_OK;
+
+failed:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, log, 0, "quic malformed packet");
+
+    return NGX_ERROR;
+}
+
+
+size_t
+ngx_quic_create_version_negotiation(ngx_quic_header_t *pkt, u_char *out)
+{
+    u_char      *p, *start;
+    ngx_uint_t   i;
+
+    p = start = out;
+
+    *p++ = pkt->flags;
+
+    /*
+     * The Version field of a Version Negotiation packet
+     * MUST be set to 0x00000000
+     */
+    p = ngx_quic_write_uint32(p, 0);
+
+    *p++ = pkt->dcid.len;
+    p = ngx_cpymem(p, pkt->dcid.data, pkt->dcid.len);
+
+    *p++ = pkt->scid.len;
+    p = ngx_cpymem(p, pkt->scid.data, pkt->scid.len);
+
+    for (i = 0; i < NGX_QUIC_NVERSIONS; i++) {
+        p = ngx_quic_write_uint32(p, ngx_quic_versions[i]);
+    }
+
+    return p - start;
+}
+
+
+/* returns the amount of payload quic packet of "pkt_len" size may fit or 0 */
+size_t
+ngx_quic_payload_size(ngx_quic_header_t *pkt, size_t pkt_len)
+{
+    size_t  len;
+
+    if (ngx_quic_short_pkt(pkt->flags)) {
+
+        len = 1 + pkt->dcid.len + pkt->num_len + NGX_QUIC_TAG_LEN;
+        if (len > pkt_len) {
+            return 0;
+        }
+
+        return pkt_len - len;
+    }
+
+    /* flags, version, dcid and scid with lengths and zero-length token */
+    len = 5 + 2 + pkt->dcid.len + pkt->scid.len
+          + (pkt->level == ssl_encryption_initial ? 1 : 0);
+
+    if (len > pkt_len) {
+        return 0;
+    }
+
+    /* (pkt_len - len) is 'remainder' packet length (see RFC 9000, 17.2) */
+    len += ngx_quic_varint_len(pkt_len - len)
+           + pkt->num_len + NGX_QUIC_TAG_LEN;
+
+    if (len > pkt_len) {
+        return 0;
+    }
+
+    return pkt_len - len;
+}
+
+
+size_t
+ngx_quic_create_header(ngx_quic_header_t *pkt, u_char *out, u_char **pnp)
+{
+    return ngx_quic_short_pkt(pkt->flags)
+           ? ngx_quic_create_short_header(pkt, out, pnp)
+           : ngx_quic_create_long_header(pkt, out, pnp);
+}
+
+
+static size_t
+ngx_quic_create_long_header(ngx_quic_header_t *pkt, u_char *out,
+    u_char **pnp)
+{
+    size_t   rem_len;
+    u_char  *p, *start;
+
+    rem_len = pkt->num_len + pkt->payload.len + NGX_QUIC_TAG_LEN;
+
+    if (out == NULL) {
+        return 5 + 2 + pkt->dcid.len + pkt->scid.len
+               + ngx_quic_varint_len(rem_len) + pkt->num_len
+               + (pkt->level == ssl_encryption_initial ? 1 : 0);
+    }
+
+    p = start = out;
+
+    *p++ = pkt->flags;
+
+    p = ngx_quic_write_uint32(p, pkt->version);
+
+    *p++ = pkt->dcid.len;
+    p = ngx_cpymem(p, pkt->dcid.data, pkt->dcid.len);
+
+    *p++ = pkt->scid.len;
+    p = ngx_cpymem(p, pkt->scid.data, pkt->scid.len);
+
+    if (pkt->level == ssl_encryption_initial) {
+        ngx_quic_build_int(&p, 0);
+    }
+
+    ngx_quic_build_int(&p, rem_len);
+
+    *pnp = p;
+
+    switch (pkt->num_len) {
+    case 1:
+        *p++ = pkt->trunc;
+        break;
+    case 2:
+        p = ngx_quic_write_uint16(p, pkt->trunc);
+        break;
+    case 3:
+        p = ngx_quic_write_uint24(p, pkt->trunc);
+        break;
+    case 4:
+        p = ngx_quic_write_uint32(p, pkt->trunc);
+        break;
+    }
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_short_header(ngx_quic_header_t *pkt, u_char *out,
+    u_char **pnp)
+{
+    u_char  *p, *start;
+
+    if (out == NULL) {
+        return 1 + pkt->dcid.len + pkt->num_len;
+    }
+
+    p = start = out;
+
+    *p++ = pkt->flags;
+
+    p = ngx_cpymem(p, pkt->dcid.data, pkt->dcid.len);
+
+    *pnp = p;
+
+    switch (pkt->num_len) {
+    case 1:
+        *p++ = pkt->trunc;
+        break;
+    case 2:
+        p = ngx_quic_write_uint16(p, pkt->trunc);
+        break;
+    case 3:
+        p = ngx_quic_write_uint24(p, pkt->trunc);
+        break;
+    case 4:
+        p = ngx_quic_write_uint32(p, pkt->trunc);
+        break;
+    }
+
+    return p - start;
+}
+
+
+size_t
+ngx_quic_create_retry_itag(ngx_quic_header_t *pkt, u_char *out,
+    u_char **start)
+{
+    u_char  *p;
+
+    p = out;
+
+    *p++ = pkt->odcid.len;
+    p = ngx_cpymem(p, pkt->odcid.data, pkt->odcid.len);
+
+    *start = p;
+
+    *p++ = 0xff;
+
+    p = ngx_quic_write_uint32(p, pkt->version);
+
+    *p++ = pkt->dcid.len;
+    p = ngx_cpymem(p, pkt->dcid.data, pkt->dcid.len);
+
+    *p++ = pkt->scid.len;
+    p = ngx_cpymem(p, pkt->scid.data, pkt->scid.len);
+
+    p = ngx_cpymem(p, pkt->token.data, pkt->token.len);
+
+    return p - out;
+}
+
+
+ssize_t
+ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
+    ngx_quic_frame_t *f)
+{
+    u_char      *p;
+    uint64_t     varint;
+    ngx_buf_t   *b;
+    ngx_uint_t   i;
+
+    b = f->data->buf;
+
+    p = start;
+
+    p = ngx_quic_parse_int(p, end, &varint);
+    if (p == NULL) {
+        pkt->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic failed to obtain quic frame type");
+        return NGX_ERROR;
+    }
+
+    if (varint > NGX_QUIC_FT_LAST) {
+        pkt->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic unknown frame type 0x%xL", varint);
+        return NGX_ERROR;
+    }
+
+    f->type = varint;
+
+    if (ngx_quic_frame_allowed(pkt, f->type) != NGX_OK) {
+        pkt->error = NGX_QUIC_ERR_PROTOCOL_VIOLATION;
+        return NGX_ERROR;
+    }
+
+    switch (f->type) {
+
+    case NGX_QUIC_FT_CRYPTO:
+
+        p = ngx_quic_parse_int(p, end, &f->u.crypto.offset);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.crypto.length);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_read_bytes(p, end, f->u.crypto.length, &b->pos);
+        if (p == NULL) {
+            goto error;
+        }
+
+        b->last = p;
+
+        break;
+
+    case NGX_QUIC_FT_PADDING:
+
+        while (p < end && *p == NGX_QUIC_FT_PADDING) {
+            p++;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_ACK:
+    case NGX_QUIC_FT_ACK_ECN:
+
+        p = ngx_quic_parse_int(p, end, &f->u.ack.largest);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.ack.delay);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.ack.range_count);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.ack.first_range);
+        if (p == NULL) {
+            goto error;
+        }
+
+        b->pos = p;
+
+        /* process all ranges to get bounds, values are ignored */
+        for (i = 0; i < f->u.ack.range_count; i++) {
+
+            p = ngx_quic_parse_int(p, end, &varint);
+            if (p == NULL) {
+                goto error;
+            }
+
+            p = ngx_quic_parse_int(p, end, &varint);
+            if (p == NULL) {
+                goto error;
+            }
+        }
+
+        b->last = p;
+
+        f->u.ack.ranges_length = b->last - b->pos;
+
+        if (f->type == NGX_QUIC_FT_ACK_ECN) {
+
+            p = ngx_quic_parse_int(p, end, &f->u.ack.ect0);
+            if (p == NULL) {
+                goto error;
+            }
+
+            p = ngx_quic_parse_int(p, end, &f->u.ack.ect1);
+            if (p == NULL) {
+                goto error;
+            }
+
+            p = ngx_quic_parse_int(p, end, &f->u.ack.ce);
+            if (p == NULL) {
+                goto error;
+            }
+
+            ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
+                           "quic ACK ECN counters ect0:%uL ect1:%uL ce:%uL",
+                           f->u.ack.ect0, f->u.ack.ect1, f->u.ack.ce);
+        }
+
+        break;
+
+    case NGX_QUIC_FT_PING:
+        break;
+
+    case NGX_QUIC_FT_NEW_CONNECTION_ID:
+
+        p = ngx_quic_parse_int(p, end, &f->u.ncid.seqnum);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.ncid.retire);
+        if (p == NULL) {
+            goto error;
+        }
+
+        if (f->u.ncid.retire > f->u.ncid.seqnum) {
+            goto error;
+        }
+
+        p = ngx_quic_read_uint8(p, end, &f->u.ncid.len);
+        if (p == NULL) {
+            goto error;
+        }
+
+        if (f->u.ncid.len < 1 || f->u.ncid.len > NGX_QUIC_CID_LEN_MAX) {
+            goto error;
+        }
+
+        p = ngx_quic_copy_bytes(p, end, f->u.ncid.len, f->u.ncid.cid);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_copy_bytes(p, end, NGX_QUIC_SR_TOKEN_LEN, f->u.ncid.srt);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_RETIRE_CONNECTION_ID:
+
+        p = ngx_quic_parse_int(p, end, &f->u.retire_cid.sequence_number);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_CONNECTION_CLOSE:
+    case NGX_QUIC_FT_CONNECTION_CLOSE_APP:
+
+        p = ngx_quic_parse_int(p, end, &f->u.close.error_code);
+        if (p == NULL) {
+            goto error;
+        }
+
+        if (f->type == NGX_QUIC_FT_CONNECTION_CLOSE) {
+            p = ngx_quic_parse_int(p, end, &f->u.close.frame_type);
+            if (p == NULL) {
+                goto error;
+            }
+        }
+
+        p = ngx_quic_parse_int(p, end, &varint);
+        if (p == NULL) {
+            goto error;
+        }
+
+        f->u.close.reason.len = varint;
+
+        p = ngx_quic_read_bytes(p, end, f->u.close.reason.len,
+                                &f->u.close.reason.data);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_STREAM:
+    case NGX_QUIC_FT_STREAM1:
+    case NGX_QUIC_FT_STREAM2:
+    case NGX_QUIC_FT_STREAM3:
+    case NGX_QUIC_FT_STREAM4:
+    case NGX_QUIC_FT_STREAM5:
+    case NGX_QUIC_FT_STREAM6:
+    case NGX_QUIC_FT_STREAM7:
+
+        f->u.stream.fin = (f->type & NGX_QUIC_STREAM_FRAME_FIN) ? 1 : 0;
+
+        p = ngx_quic_parse_int(p, end, &f->u.stream.stream_id);
+        if (p == NULL) {
+            goto error;
+        }
+
+        if (f->type & NGX_QUIC_STREAM_FRAME_OFF) {
+            f->u.stream.off = 1;
+
+            p = ngx_quic_parse_int(p, end, &f->u.stream.offset);
+            if (p == NULL) {
+                goto error;
+            }
+
+        } else {
+            f->u.stream.off = 0;
+            f->u.stream.offset = 0;
+        }
+
+        if (f->type & NGX_QUIC_STREAM_FRAME_LEN) {
+            f->u.stream.len = 1;
+
+            p = ngx_quic_parse_int(p, end, &f->u.stream.length);
+            if (p == NULL) {
+                goto error;
+            }
+
+        } else {
+            f->u.stream.len = 0;
+            f->u.stream.length = end - p; /* up to packet end */
+        }
+
+        p = ngx_quic_read_bytes(p, end, f->u.stream.length, &b->pos);
+        if (p == NULL) {
+            goto error;
+        }
+
+        b->last = p;
+
+        f->type = NGX_QUIC_FT_STREAM;
+        break;
+
+    case NGX_QUIC_FT_MAX_DATA:
+
+        p = ngx_quic_parse_int(p, end, &f->u.max_data.max_data);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_RESET_STREAM:
+
+        p = ngx_quic_parse_int(p, end, &f->u.reset_stream.id);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.reset_stream.error_code);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.reset_stream.final_size);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_STOP_SENDING:
+
+        p = ngx_quic_parse_int(p, end, &f->u.stop_sending.id);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.stop_sending.error_code);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_STREAMS_BLOCKED:
+    case NGX_QUIC_FT_STREAMS_BLOCKED2:
+
+        p = ngx_quic_parse_int(p, end, &f->u.streams_blocked.limit);
+        if (p == NULL) {
+            goto error;
+        }
+
+        if (f->u.streams_blocked.limit > 0x1000000000000000) {
+            goto error;
+        }
+
+        f->u.streams_blocked.bidi =
+                              (f->type == NGX_QUIC_FT_STREAMS_BLOCKED) ? 1 : 0;
+        break;
+
+    case NGX_QUIC_FT_MAX_STREAMS:
+    case NGX_QUIC_FT_MAX_STREAMS2:
+
+        p = ngx_quic_parse_int(p, end, &f->u.max_streams.limit);
+        if (p == NULL) {
+            goto error;
+        }
+
+        if (f->u.max_streams.limit > 0x1000000000000000) {
+            goto error;
+        }
+
+        f->u.max_streams.bidi = (f->type == NGX_QUIC_FT_MAX_STREAMS) ? 1 : 0;
+
+        break;
+
+    case NGX_QUIC_FT_MAX_STREAM_DATA:
+
+        p = ngx_quic_parse_int(p, end, &f->u.max_stream_data.id);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.max_stream_data.limit);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_DATA_BLOCKED:
+
+        p = ngx_quic_parse_int(p, end, &f->u.data_blocked.limit);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_STREAM_DATA_BLOCKED:
+
+        p = ngx_quic_parse_int(p, end, &f->u.stream_data_blocked.id);
+        if (p == NULL) {
+            goto error;
+        }
+
+        p = ngx_quic_parse_int(p, end, &f->u.stream_data_blocked.limit);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_PATH_CHALLENGE:
+
+        p = ngx_quic_copy_bytes(p, end, 8, f->u.path_challenge.data);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    case NGX_QUIC_FT_PATH_RESPONSE:
+
+        p = ngx_quic_copy_bytes(p, end, 8, f->u.path_response.data);
+        if (p == NULL) {
+            goto error;
+        }
+
+        break;
+
+    default:
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic unknown frame type 0x%xi", f->type);
+        return NGX_ERROR;
+    }
+
+    f->level = pkt->level;
+#if (NGX_DEBUG)
+    f->pnum = pkt->pn;
+#endif
+
+    return p - start;
+
+error:
+
+    pkt->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
+
+    ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                  "quic failed to parse frame type:0x%xi", f->type);
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_quic_frame_allowed(ngx_quic_header_t *pkt, ngx_uint_t frame_type)
+{
+    uint8_t  ptype;
+
+    /*
+     * RFC 9000, 12.4. Frames and Frame Types: Table 3
+     *
+     * Frame permissions per packet: 4 bits: IH01
+     */
+    static uint8_t ngx_quic_frame_masks[] = {
+         /* PADDING  */              0xF,
+         /* PING */                  0xF,
+         /* ACK */                   0xD,
+         /* ACK_ECN */               0xD,
+         /* RESET_STREAM */          0x3,
+         /* STOP_SENDING */          0x3,
+         /* CRYPTO */                0xD,
+         /* NEW_TOKEN */             0x0, /* only sent by server */
+         /* STREAM */                0x3,
+         /* STREAM1 */               0x3,
+         /* STREAM2 */               0x3,
+         /* STREAM3 */               0x3,
+         /* STREAM4 */               0x3,
+         /* STREAM5 */               0x3,
+         /* STREAM6 */               0x3,
+         /* STREAM7 */               0x3,
+         /* MAX_DATA */              0x3,
+         /* MAX_STREAM_DATA */       0x3,
+         /* MAX_STREAMS */           0x3,
+         /* MAX_STREAMS2 */          0x3,
+         /* DATA_BLOCKED */          0x3,
+         /* STREAM_DATA_BLOCKED */   0x3,
+         /* STREAMS_BLOCKED */       0x3,
+         /* STREAMS_BLOCKED2 */      0x3,
+         /* NEW_CONNECTION_ID */     0x3,
+         /* RETIRE_CONNECTION_ID */  0x3,
+         /* PATH_CHALLENGE */        0x3,
+         /* PATH_RESPONSE */         0x1,
+         /* CONNECTION_CLOSE */      0xF,
+         /* CONNECTION_CLOSE2 */     0x3,
+         /* HANDSHAKE_DONE */        0x0, /* only sent by server */
+    };
+
+    if (ngx_quic_long_pkt(pkt->flags)) {
+
+        if (ngx_quic_pkt_in(pkt->flags)) {
+            ptype = 8; /* initial */
+
+        } else if (ngx_quic_pkt_hs(pkt->flags)) {
+            ptype = 4; /* handshake */
+
+        } else {
+            ptype = 2; /* zero-rtt */
+        }
+
+    } else {
+        ptype = 1; /* application data */
+    }
+
+    if (ptype & ngx_quic_frame_masks[frame_type]) {
+        return NGX_OK;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                  "quic frame type 0x%xi is not "
+                  "allowed in packet with flags 0x%xd",
+                  frame_type, pkt->flags);
+
+    return NGX_DECLINED;
+}
+
+
+ssize_t
+ngx_quic_parse_ack_range(ngx_log_t *log, u_char *start, u_char *end,
+    uint64_t *gap, uint64_t *range)
+{
+    u_char  *p;
+
+    p = start;
+
+    p = ngx_quic_parse_int(p, end, gap);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_INFO, log, 0,
+                      "quic failed to parse ack frame gap");
+        return NGX_ERROR;
+    }
+
+    p = ngx_quic_parse_int(p, end, range);
+    if (p == NULL) {
+        ngx_log_error(NGX_LOG_INFO, log, 0,
+                      "quic failed to parse ack frame range");
+        return NGX_ERROR;
+    }
+
+    return p - start;
+}
+
+
+size_t
+ngx_quic_create_ack_range(u_char *p, uint64_t gap, uint64_t range)
+{
+    size_t   len;
+    u_char  *start;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(gap);
+        len += ngx_quic_varint_len(range);
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, gap);
+    ngx_quic_build_int(&p, range);
+
+    return p - start;
+}
+
+
+ssize_t
+ngx_quic_create_frame(u_char *p, ngx_quic_frame_t *f)
+{
+    /*
+     *  RFC 9002, 2.  Conventions and Definitions
+     *
+     *  Ack-eliciting frames:  All frames other than ACK, PADDING, and
+     *  CONNECTION_CLOSE are considered ack-eliciting.
+     */
+    f->need_ack = 1;
+
+    switch (f->type) {
+    case NGX_QUIC_FT_PING:
+        return ngx_quic_create_ping(p);
+
+    case NGX_QUIC_FT_ACK:
+        f->need_ack = 0;
+        return ngx_quic_create_ack(p, &f->u.ack, f->data);
+
+    case NGX_QUIC_FT_RESET_STREAM:
+        return ngx_quic_create_reset_stream(p, &f->u.reset_stream);
+
+    case NGX_QUIC_FT_STOP_SENDING:
+        return ngx_quic_create_stop_sending(p, &f->u.stop_sending);
+
+    case NGX_QUIC_FT_CRYPTO:
+        return ngx_quic_create_crypto(p, &f->u.crypto, f->data);
+
+    case NGX_QUIC_FT_HANDSHAKE_DONE:
+        return ngx_quic_create_hs_done(p);
+
+    case NGX_QUIC_FT_NEW_TOKEN:
+        return ngx_quic_create_new_token(p, &f->u.token, f->data);
+
+    case NGX_QUIC_FT_STREAM:
+        return ngx_quic_create_stream(p, &f->u.stream, f->data);
+
+    case NGX_QUIC_FT_CONNECTION_CLOSE:
+    case NGX_QUIC_FT_CONNECTION_CLOSE_APP:
+        f->need_ack = 0;
+        return ngx_quic_create_close(p, f);
+
+    case NGX_QUIC_FT_MAX_STREAMS:
+        return ngx_quic_create_max_streams(p, &f->u.max_streams);
+
+    case NGX_QUIC_FT_MAX_STREAM_DATA:
+        return ngx_quic_create_max_stream_data(p, &f->u.max_stream_data);
+
+    case NGX_QUIC_FT_MAX_DATA:
+        return ngx_quic_create_max_data(p, &f->u.max_data);
+
+    case NGX_QUIC_FT_PATH_CHALLENGE:
+        return ngx_quic_create_path_challenge(p, &f->u.path_challenge);
+
+    case NGX_QUIC_FT_PATH_RESPONSE:
+        return ngx_quic_create_path_response(p, &f->u.path_response);
+
+    case NGX_QUIC_FT_NEW_CONNECTION_ID:
+        return ngx_quic_create_new_connection_id(p, &f->u.ncid);
+
+    case NGX_QUIC_FT_RETIRE_CONNECTION_ID:
+        return ngx_quic_create_retire_connection_id(p, &f->u.retire_cid);
+
+    default:
+        /* BUG: unsupported frame type generated */
+        return NGX_ERROR;
+    }
+}
+
+
+static size_t
+ngx_quic_create_ping(u_char *p)
+{
+    u_char  *start;
+
+    if (p == NULL) {
+        return ngx_quic_varint_len(NGX_QUIC_FT_PING);
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_PING);
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_ack(u_char *p, ngx_quic_ack_frame_t *ack, ngx_chain_t *ranges)
+{
+    size_t      len;
+    u_char     *start;
+    ngx_buf_t  *b;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_ACK);
+        len += ngx_quic_varint_len(ack->largest);
+        len += ngx_quic_varint_len(ack->delay);
+        len += ngx_quic_varint_len(ack->range_count);
+        len += ngx_quic_varint_len(ack->first_range);
+        len += ack->ranges_length;
+
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_ACK);
+    ngx_quic_build_int(&p, ack->largest);
+    ngx_quic_build_int(&p, ack->delay);
+    ngx_quic_build_int(&p, ack->range_count);
+    ngx_quic_build_int(&p, ack->first_range);
+
+    while (ranges) {
+        b = ranges->buf;
+        p = ngx_cpymem(p, b->pos, b->last - b->pos);
+        ranges = ranges->next;
+    }
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_reset_stream(u_char *p, ngx_quic_reset_stream_frame_t *rs)
+{
+    size_t   len;
+    u_char  *start;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_RESET_STREAM);
+        len += ngx_quic_varint_len(rs->id);
+        len += ngx_quic_varint_len(rs->error_code);
+        len += ngx_quic_varint_len(rs->final_size);
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_RESET_STREAM);
+    ngx_quic_build_int(&p, rs->id);
+    ngx_quic_build_int(&p, rs->error_code);
+    ngx_quic_build_int(&p, rs->final_size);
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_stop_sending(u_char *p, ngx_quic_stop_sending_frame_t *ss)
+{
+    size_t   len;
+    u_char  *start;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_STOP_SENDING);
+        len += ngx_quic_varint_len(ss->id);
+        len += ngx_quic_varint_len(ss->error_code);
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_STOP_SENDING);
+    ngx_quic_build_int(&p, ss->id);
+    ngx_quic_build_int(&p, ss->error_code);
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_crypto(u_char *p, ngx_quic_crypto_frame_t *crypto,
+    ngx_chain_t *data)
+{
+    size_t      len;
+    u_char     *start;
+    ngx_buf_t  *b;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_CRYPTO);
+        len += ngx_quic_varint_len(crypto->offset);
+        len += ngx_quic_varint_len(crypto->length);
+        len += crypto->length;
+
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_CRYPTO);
+    ngx_quic_build_int(&p, crypto->offset);
+    ngx_quic_build_int(&p, crypto->length);
+
+    while (data) {
+        b = data->buf;
+        p = ngx_cpymem(p, b->pos, b->last - b->pos);
+        data = data->next;
+    }
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_hs_done(u_char *p)
+{
+    u_char  *start;
+
+    if (p == NULL) {
+        return ngx_quic_varint_len(NGX_QUIC_FT_HANDSHAKE_DONE);
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_HANDSHAKE_DONE);
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_new_token(u_char *p, ngx_quic_new_token_frame_t *token,
+    ngx_chain_t *data)
+{
+    size_t      len;
+    u_char     *start;
+    ngx_buf_t  *b;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_NEW_TOKEN);
+        len += ngx_quic_varint_len(token->length);
+        len += token->length;
+
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_NEW_TOKEN);
+    ngx_quic_build_int(&p, token->length);
+
+    while (data) {
+        b = data->buf;
+        p = ngx_cpymem(p, b->pos, b->last - b->pos);
+        data = data->next;
+    }
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_stream(u_char *p, ngx_quic_stream_frame_t *sf,
+    ngx_chain_t *data)
+{
+    size_t      len;
+    u_char     *start, type;
+    ngx_buf_t  *b;
+
+    type = NGX_QUIC_FT_STREAM;
+
+    if (sf->off) {
+        type |= NGX_QUIC_STREAM_FRAME_OFF;
+    }
+
+    if (sf->len) {
+        type |= NGX_QUIC_STREAM_FRAME_LEN;
+    }
+
+    if (sf->fin) {
+        type |= NGX_QUIC_STREAM_FRAME_FIN;
+    }
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(type);
+        len += ngx_quic_varint_len(sf->stream_id);
+
+        if (sf->off) {
+            len += ngx_quic_varint_len(sf->offset);
+        }
+
+        if (sf->len) {
+            len += ngx_quic_varint_len(sf->length);
+        }
+
+        len += sf->length;
+
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, type);
+    ngx_quic_build_int(&p, sf->stream_id);
+
+    if (sf->off) {
+        ngx_quic_build_int(&p, sf->offset);
+    }
+
+    if (sf->len) {
+        ngx_quic_build_int(&p, sf->length);
+    }
+
+    while (data) {
+        b = data->buf;
+        p = ngx_cpymem(p, b->pos, b->last - b->pos);
+        data = data->next;
+    }
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_max_streams(u_char *p, ngx_quic_max_streams_frame_t *ms)
+{
+    size_t       len;
+    u_char      *start;
+    ngx_uint_t   type;
+
+    type = ms->bidi ? NGX_QUIC_FT_MAX_STREAMS : NGX_QUIC_FT_MAX_STREAMS2;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(type);
+        len += ngx_quic_varint_len(ms->limit);
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, type);
+    ngx_quic_build_int(&p, ms->limit);
+
+    return p - start;
+}
+
+
+static ngx_int_t
+ngx_quic_parse_transport_param(u_char *p, u_char *end, uint16_t id,
+    ngx_quic_tp_t *dst)
+{
+    uint64_t   varint;
+    ngx_str_t  str;
+
+    varint = 0;
+    ngx_str_null(&str);
+
+    switch (id) {
+
+    case NGX_QUIC_TP_DISABLE_ACTIVE_MIGRATION:
+        /* zero-length option */
+        if (end - p != 0) {
+            return NGX_ERROR;
+        }
+        dst->disable_active_migration = 1;
+        return NGX_OK;
+
+    case NGX_QUIC_TP_MAX_IDLE_TIMEOUT:
+    case NGX_QUIC_TP_MAX_UDP_PAYLOAD_SIZE:
+    case NGX_QUIC_TP_INITIAL_MAX_DATA:
+    case NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL:
+    case NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE:
+    case NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_UNI:
+    case NGX_QUIC_TP_INITIAL_MAX_STREAMS_BIDI:
+    case NGX_QUIC_TP_INITIAL_MAX_STREAMS_UNI:
+    case NGX_QUIC_TP_ACK_DELAY_EXPONENT:
+    case NGX_QUIC_TP_MAX_ACK_DELAY:
+    case NGX_QUIC_TP_ACTIVE_CONNECTION_ID_LIMIT:
+
+        p = ngx_quic_parse_int(p, end, &varint);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+        break;
+
+    case NGX_QUIC_TP_INITIAL_SCID:
+
+        str.len = end - p;
+        str.data = p;
+        break;
+
+    default:
+        return NGX_DECLINED;
+    }
+
+    switch (id) {
+
+    case NGX_QUIC_TP_MAX_IDLE_TIMEOUT:
+        dst->max_idle_timeout = varint;
+        break;
+
+    case NGX_QUIC_TP_MAX_UDP_PAYLOAD_SIZE:
+        dst->max_udp_payload_size = varint;
+        break;
+
+    case NGX_QUIC_TP_INITIAL_MAX_DATA:
+        dst->initial_max_data = varint;
+        break;
+
+    case NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL:
+        dst->initial_max_stream_data_bidi_local = varint;
+        break;
+
+    case NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE:
+        dst->initial_max_stream_data_bidi_remote = varint;
+        break;
+
+    case NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_UNI:
+        dst->initial_max_stream_data_uni = varint;
+        break;
+
+    case NGX_QUIC_TP_INITIAL_MAX_STREAMS_BIDI:
+        dst->initial_max_streams_bidi = varint;
+        break;
+
+    case NGX_QUIC_TP_INITIAL_MAX_STREAMS_UNI:
+        dst->initial_max_streams_uni = varint;
+        break;
+
+    case NGX_QUIC_TP_ACK_DELAY_EXPONENT:
+        dst->ack_delay_exponent = varint;
+        break;
+
+    case NGX_QUIC_TP_MAX_ACK_DELAY:
+        dst->max_ack_delay = varint;
+        break;
+
+    case NGX_QUIC_TP_ACTIVE_CONNECTION_ID_LIMIT:
+        dst->active_connection_id_limit = varint;
+        break;
+
+    case NGX_QUIC_TP_INITIAL_SCID:
+        dst->initial_scid = str;
+        break;
+
+    default:
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp,
+    ngx_log_t *log)
+{
+    uint64_t   id, len;
+    ngx_int_t  rc;
+
+    while (p < end) {
+        p = ngx_quic_parse_int(p, end, &id);
+        if (p == NULL) {
+            ngx_log_error(NGX_LOG_INFO, log, 0,
+                          "quic failed to parse transport param id");
+            return NGX_ERROR;
+        }
+
+        switch (id) {
+        case NGX_QUIC_TP_ORIGINAL_DCID:
+        case NGX_QUIC_TP_PREFERRED_ADDRESS:
+        case NGX_QUIC_TP_RETRY_SCID:
+        case NGX_QUIC_TP_SR_TOKEN:
+            ngx_log_error(NGX_LOG_INFO, log, 0,
+                          "quic client sent forbidden transport param"
+                          " id:0x%xL", id);
+            return NGX_ERROR;
+        }
+
+        p = ngx_quic_parse_int(p, end, &len);
+        if (p == NULL) {
+            ngx_log_error(NGX_LOG_INFO, log, 0,
+                          "quic failed to parse"
+                          " transport param id:0x%xL length", id);
+            return NGX_ERROR;
+        }
+
+        rc = ngx_quic_parse_transport_param(p, p + len, id, tp);
+
+        if (rc == NGX_ERROR) {
+            ngx_log_error(NGX_LOG_INFO, log, 0,
+                          "quic failed to parse"
+                          " transport param id:0x%xL data", id);
+            return NGX_ERROR;
+        }
+
+        if (rc == NGX_DECLINED) {
+            ngx_log_error(NGX_LOG_INFO, log, 0,
+                          "quic %s transport param id:0x%xL, skipped",
+                          (id % 31 == 27) ? "reserved" : "unknown", id);
+        }
+
+        p += len;
+    }
+
+    if (p != end) {
+        ngx_log_error(NGX_LOG_INFO, log, 0,
+                      "quic trailing garbage in"
+                      " transport parameters: bytes:%ui",
+                      end - p);
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic transport parameters parsed ok");
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp disable active migration: %ui",
+                   tp->disable_active_migration);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, "quic tp idle_timeout:%ui",
+                   tp->max_idle_timeout);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp max_udp_payload_size:%ui",
+                   tp->max_udp_payload_size);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, "quic tp max_data:%ui",
+                   tp->initial_max_data);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp max_stream_data_bidi_local:%ui",
+                   tp->initial_max_stream_data_bidi_local);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp max_stream_data_bidi_remote:%ui",
+                   tp->initial_max_stream_data_bidi_remote);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp max_stream_data_uni:%ui",
+                   tp->initial_max_stream_data_uni);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp initial_max_streams_bidi:%ui",
+                   tp->initial_max_streams_bidi);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp initial_max_streams_uni:%ui",
+                   tp->initial_max_streams_uni);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp ack_delay_exponent:%ui",
+                   tp->ack_delay_exponent);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, "quic tp max_ack_delay:%ui",
+                   tp->max_ack_delay);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp active_connection_id_limit:%ui",
+                   tp->active_connection_id_limit);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "quic tp initial source_connection_id len:%uz %xV",
+                   tp->initial_scid.len, &tp->initial_scid);
+
+    return NGX_OK;
+}
+
+
+static size_t
+ngx_quic_create_max_stream_data(u_char *p, ngx_quic_max_stream_data_frame_t *ms)
+{
+    size_t   len;
+    u_char  *start;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_MAX_STREAM_DATA);
+        len += ngx_quic_varint_len(ms->id);
+        len += ngx_quic_varint_len(ms->limit);
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_MAX_STREAM_DATA);
+    ngx_quic_build_int(&p, ms->id);
+    ngx_quic_build_int(&p, ms->limit);
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_max_data(u_char *p, ngx_quic_max_data_frame_t *md)
+{
+    size_t   len;
+    u_char  *start;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_MAX_DATA);
+        len += ngx_quic_varint_len(md->max_data);
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_MAX_DATA);
+    ngx_quic_build_int(&p, md->max_data);
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_path_challenge(u_char *p, ngx_quic_path_challenge_frame_t *pc)
+{
+    size_t   len;
+    u_char  *start;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_PATH_CHALLENGE);
+        len += sizeof(pc->data);
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_PATH_CHALLENGE);
+    p = ngx_cpymem(p, &pc->data, sizeof(pc->data));
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_path_response(u_char *p, ngx_quic_path_challenge_frame_t *pc)
+{
+    size_t   len;
+    u_char  *start;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_PATH_RESPONSE);
+        len += sizeof(pc->data);
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_PATH_RESPONSE);
+    p = ngx_cpymem(p, &pc->data, sizeof(pc->data));
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_new_connection_id(u_char *p, ngx_quic_new_conn_id_frame_t *ncid)
+{
+    size_t   len;
+    u_char  *start;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_NEW_CONNECTION_ID);
+        len += ngx_quic_varint_len(ncid->seqnum);
+        len += ngx_quic_varint_len(ncid->retire);
+        len++;
+        len += ncid->len;
+        len += NGX_QUIC_SR_TOKEN_LEN;
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_NEW_CONNECTION_ID);
+    ngx_quic_build_int(&p, ncid->seqnum);
+    ngx_quic_build_int(&p, ncid->retire);
+    *p++ = ncid->len;
+    p = ngx_cpymem(p, ncid->cid, ncid->len);
+    p = ngx_cpymem(p, ncid->srt, NGX_QUIC_SR_TOKEN_LEN);
+
+    return p - start;
+}
+
+
+static size_t
+ngx_quic_create_retire_connection_id(u_char *p,
+    ngx_quic_retire_cid_frame_t *rcid)
+{
+    size_t   len;
+    u_char  *start;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(NGX_QUIC_FT_RETIRE_CONNECTION_ID);
+        len += ngx_quic_varint_len(rcid->sequence_number);
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, NGX_QUIC_FT_RETIRE_CONNECTION_ID);
+    ngx_quic_build_int(&p, rcid->sequence_number);
+
+    return p - start;
+}
+
+
+ngx_int_t
+ngx_quic_init_transport_params(ngx_quic_tp_t *tp, ngx_quic_conf_t *qcf)
+{
+    ngx_uint_t  nstreams;
+
+    ngx_memzero(tp, sizeof(ngx_quic_tp_t));
+
+    /*
+     * set by ngx_memzero():
+     *
+     *     tp->disable_active_migration = 0;
+     *     tp->original_dcid = { 0, NULL };
+     *     tp->initial_scid = { 0, NULL };
+     *     tp->retry_scid = { 0, NULL };
+     *     tp->sr_token = { 0 }
+     *     tp->sr_enabled = 0
+     *     tp->preferred_address = NULL
+     */
+
+    tp->max_idle_timeout = qcf->idle_timeout;
+
+    tp->max_udp_payload_size = NGX_QUIC_MAX_UDP_PAYLOAD_SIZE;
+
+    nstreams = qcf->max_concurrent_streams_bidi
+               + qcf->max_concurrent_streams_uni;
+
+    tp->initial_max_data = nstreams * qcf->stream_buffer_size;
+    tp->initial_max_stream_data_bidi_local = qcf->stream_buffer_size;
+    tp->initial_max_stream_data_bidi_remote = qcf->stream_buffer_size;
+    tp->initial_max_stream_data_uni = qcf->stream_buffer_size;
+
+    tp->initial_max_streams_bidi = qcf->max_concurrent_streams_bidi;
+    tp->initial_max_streams_uni = qcf->max_concurrent_streams_uni;
+
+    tp->max_ack_delay = NGX_QUIC_DEFAULT_MAX_ACK_DELAY;
+    tp->ack_delay_exponent = NGX_QUIC_DEFAULT_ACK_DELAY_EXPONENT;
+
+    tp->active_connection_id_limit = qcf->active_connection_id_limit;
+    tp->disable_active_migration = qcf->disable_active_migration;
+
+    return NGX_OK;
+}
+
+
+ssize_t
+ngx_quic_create_transport_params(u_char *pos, u_char *end, ngx_quic_tp_t *tp,
+    size_t *clen)
+{
+    u_char  *p;
+    size_t   len;
+
+#define ngx_quic_tp_len(id, value)                                            \
+    ngx_quic_varint_len(id)                                                   \
+    + ngx_quic_varint_len(value)                                              \
+    + ngx_quic_varint_len(ngx_quic_varint_len(value))
+
+#define ngx_quic_tp_vint(id, value)                                           \
+    do {                                                                      \
+        ngx_quic_build_int(&p, id);                                           \
+        ngx_quic_build_int(&p, ngx_quic_varint_len(value));                   \
+        ngx_quic_build_int(&p, value);                                        \
+    } while (0)
+
+#define ngx_quic_tp_strlen(id, value)                                         \
+    ngx_quic_varint_len(id)                                                   \
+    + ngx_quic_varint_len(value.len)                                          \
+    + value.len
+
+#define ngx_quic_tp_str(id, value)                                            \
+    do {                                                                      \
+        ngx_quic_build_int(&p, id);                                           \
+        ngx_quic_build_int(&p, value.len);                                    \
+        p = ngx_cpymem(p, value.data, value.len);                             \
+    } while (0)
+
+    len = ngx_quic_tp_len(NGX_QUIC_TP_INITIAL_MAX_DATA, tp->initial_max_data);
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_INITIAL_MAX_STREAMS_UNI,
+                           tp->initial_max_streams_uni);
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_INITIAL_MAX_STREAMS_BIDI,
+                           tp->initial_max_streams_bidi);
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL,
+                           tp->initial_max_stream_data_bidi_local);
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE,
+                           tp->initial_max_stream_data_bidi_remote);
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_UNI,
+                           tp->initial_max_stream_data_uni);
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_MAX_IDLE_TIMEOUT,
+                           tp->max_idle_timeout);
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_MAX_UDP_PAYLOAD_SIZE,
+                           tp->max_udp_payload_size);
+
+    if (tp->disable_active_migration) {
+        len += ngx_quic_varint_len(NGX_QUIC_TP_DISABLE_ACTIVE_MIGRATION);
+        len += ngx_quic_varint_len(0);
+    }
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_ACTIVE_CONNECTION_ID_LIMIT,
+                           tp->active_connection_id_limit);
+
+    /* transport parameters listed above will be saved in 0-RTT context */
+    if (clen) {
+        *clen = len;
+    }
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_MAX_ACK_DELAY,
+                           tp->max_ack_delay);
+
+    len += ngx_quic_tp_len(NGX_QUIC_TP_ACK_DELAY_EXPONENT,
+                           tp->ack_delay_exponent);
+
+    len += ngx_quic_tp_strlen(NGX_QUIC_TP_ORIGINAL_DCID, tp->original_dcid);
+    len += ngx_quic_tp_strlen(NGX_QUIC_TP_INITIAL_SCID, tp->initial_scid);
+
+    if (tp->retry_scid.len) {
+        len += ngx_quic_tp_strlen(NGX_QUIC_TP_RETRY_SCID, tp->retry_scid);
+    }
+
+    len += ngx_quic_varint_len(NGX_QUIC_TP_SR_TOKEN);
+    len += ngx_quic_varint_len(NGX_QUIC_SR_TOKEN_LEN);
+    len += NGX_QUIC_SR_TOKEN_LEN;
+
+    if (pos == NULL) {
+        return len;
+    }
+
+    p = pos;
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_INITIAL_MAX_DATA,
+                     tp->initial_max_data);
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_INITIAL_MAX_STREAMS_UNI,
+                     tp->initial_max_streams_uni);
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_INITIAL_MAX_STREAMS_BIDI,
+                     tp->initial_max_streams_bidi);
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL,
+                     tp->initial_max_stream_data_bidi_local);
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE,
+                     tp->initial_max_stream_data_bidi_remote);
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_UNI,
+                     tp->initial_max_stream_data_uni);
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_MAX_IDLE_TIMEOUT,
+                     tp->max_idle_timeout);
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_MAX_UDP_PAYLOAD_SIZE,
+                     tp->max_udp_payload_size);
+
+    if (tp->disable_active_migration) {
+        ngx_quic_build_int(&p, NGX_QUIC_TP_DISABLE_ACTIVE_MIGRATION);
+        ngx_quic_build_int(&p, 0);
+    }
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_ACTIVE_CONNECTION_ID_LIMIT,
+                     tp->active_connection_id_limit);
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_MAX_ACK_DELAY,
+                     tp->max_ack_delay);
+
+    ngx_quic_tp_vint(NGX_QUIC_TP_ACK_DELAY_EXPONENT,
+                     tp->ack_delay_exponent);
+
+    ngx_quic_tp_str(NGX_QUIC_TP_ORIGINAL_DCID, tp->original_dcid);
+    ngx_quic_tp_str(NGX_QUIC_TP_INITIAL_SCID, tp->initial_scid);
+
+    if (tp->retry_scid.len) {
+        ngx_quic_tp_str(NGX_QUIC_TP_RETRY_SCID, tp->retry_scid);
+    }
+
+    ngx_quic_build_int(&p, NGX_QUIC_TP_SR_TOKEN);
+    ngx_quic_build_int(&p, NGX_QUIC_SR_TOKEN_LEN);
+    p = ngx_cpymem(p, tp->sr_token, NGX_QUIC_SR_TOKEN_LEN);
+
+    return p - pos;
+}
+
+
+static size_t
+ngx_quic_create_close(u_char *p, ngx_quic_frame_t *f)
+{
+    size_t                   len;
+    u_char                  *start;
+    ngx_quic_close_frame_t  *cl;
+
+    cl = &f->u.close;
+
+    if (p == NULL) {
+        len = ngx_quic_varint_len(f->type);
+        len += ngx_quic_varint_len(cl->error_code);
+
+        if (f->type != NGX_QUIC_FT_CONNECTION_CLOSE_APP) {
+            len += ngx_quic_varint_len(cl->frame_type);
+        }
+
+        len += ngx_quic_varint_len(cl->reason.len);
+        len += cl->reason.len;
+
+        return len;
+    }
+
+    start = p;
+
+    ngx_quic_build_int(&p, f->type);
+    ngx_quic_build_int(&p, cl->error_code);
+
+    if (f->type != NGX_QUIC_FT_CONNECTION_CLOSE_APP) {
+        ngx_quic_build_int(&p, cl->frame_type);
+    }
+
+    ngx_quic_build_int(&p, cl->reason.len);
+    p = ngx_cpymem(p, cl->reason.data, cl->reason.len);
+
+    return p - start;
+}
+
+
+void
+ngx_quic_dcid_encode_key(u_char *dcid, uint64_t key)
+{
+    (void) ngx_quic_write_uint64(dcid, key);
+}
diff --git a/src/event/quic/ngx_event_quic_transport.h b/src/event/quic/ngx_event_quic_transport.h
new file mode 100644
index 0000000..3e32039
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_transport.h
@@ -0,0 +1,397 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_EVENT_QUIC_TRANSPORT_H_INCLUDED_
+#define _NGX_EVENT_QUIC_TRANSPORT_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+/*
+ * RFC 9000, 17.2.  Long Header Packets
+ *           17.3.  Short Header Packets
+ *
+ * QUIC flags in first byte
+ */
+#define NGX_QUIC_PKT_LONG       0x80  /* header form */
+#define NGX_QUIC_PKT_FIXED_BIT  0x40
+#define NGX_QUIC_PKT_TYPE       0x30  /* in long packet */
+#define NGX_QUIC_PKT_KPHASE     0x04  /* in short packet */
+
+#define ngx_quic_long_pkt(flags)  ((flags) & NGX_QUIC_PKT_LONG)
+#define ngx_quic_short_pkt(flags)  (((flags) & NGX_QUIC_PKT_LONG) == 0)
+
+/* Long packet types */
+#define NGX_QUIC_PKT_INITIAL    0x00
+#define NGX_QUIC_PKT_ZRTT       0x10
+#define NGX_QUIC_PKT_HANDSHAKE  0x20
+#define NGX_QUIC_PKT_RETRY      0x30
+
+#define ngx_quic_pkt_in(flags)                                                \
+    (((flags) & NGX_QUIC_PKT_TYPE) == NGX_QUIC_PKT_INITIAL)
+#define ngx_quic_pkt_zrtt(flags)                                              \
+    (((flags) & NGX_QUIC_PKT_TYPE) == NGX_QUIC_PKT_ZRTT)
+#define ngx_quic_pkt_hs(flags)                                                \
+    (((flags) & NGX_QUIC_PKT_TYPE) == NGX_QUIC_PKT_HANDSHAKE)
+#define ngx_quic_pkt_retry(flags)                                             \
+    (((flags) & NGX_QUIC_PKT_TYPE) == NGX_QUIC_PKT_RETRY)
+
+#define ngx_quic_pkt_rb_mask(flags)                                           \
+    (ngx_quic_long_pkt(flags) ? 0x0C : 0x18)
+#define ngx_quic_pkt_hp_mask(flags)                                           \
+    (ngx_quic_long_pkt(flags) ? 0x0F : 0x1F)
+
+#define ngx_quic_level_name(lvl)                                              \
+    (lvl == ssl_encryption_application) ? "app"                               \
+        : (lvl == ssl_encryption_initial) ? "init"                            \
+            : (lvl == ssl_encryption_handshake) ? "hs" : "early"
+
+#define NGX_QUIC_MAX_CID_LEN                             20
+#define NGX_QUIC_SERVER_CID_LEN                          NGX_QUIC_MAX_CID_LEN
+
+/* 12.4.  Frames and Frame Types */
+#define NGX_QUIC_FT_PADDING                              0x00
+#define NGX_QUIC_FT_PING                                 0x01
+#define NGX_QUIC_FT_ACK                                  0x02
+#define NGX_QUIC_FT_ACK_ECN                              0x03
+#define NGX_QUIC_FT_RESET_STREAM                         0x04
+#define NGX_QUIC_FT_STOP_SENDING                         0x05
+#define NGX_QUIC_FT_CRYPTO                               0x06
+#define NGX_QUIC_FT_NEW_TOKEN                            0x07
+#define NGX_QUIC_FT_STREAM                               0x08
+#define NGX_QUIC_FT_STREAM1                              0x09
+#define NGX_QUIC_FT_STREAM2                              0x0A
+#define NGX_QUIC_FT_STREAM3                              0x0B
+#define NGX_QUIC_FT_STREAM4                              0x0C
+#define NGX_QUIC_FT_STREAM5                              0x0D
+#define NGX_QUIC_FT_STREAM6                              0x0E
+#define NGX_QUIC_FT_STREAM7                              0x0F
+#define NGX_QUIC_FT_MAX_DATA                             0x10
+#define NGX_QUIC_FT_MAX_STREAM_DATA                      0x11
+#define NGX_QUIC_FT_MAX_STREAMS                          0x12
+#define NGX_QUIC_FT_MAX_STREAMS2                         0x13
+#define NGX_QUIC_FT_DATA_BLOCKED                         0x14
+#define NGX_QUIC_FT_STREAM_DATA_BLOCKED                  0x15
+#define NGX_QUIC_FT_STREAMS_BLOCKED                      0x16
+#define NGX_QUIC_FT_STREAMS_BLOCKED2                     0x17
+#define NGX_QUIC_FT_NEW_CONNECTION_ID                    0x18
+#define NGX_QUIC_FT_RETIRE_CONNECTION_ID                 0x19
+#define NGX_QUIC_FT_PATH_CHALLENGE                       0x1A
+#define NGX_QUIC_FT_PATH_RESPONSE                        0x1B
+#define NGX_QUIC_FT_CONNECTION_CLOSE                     0x1C
+#define NGX_QUIC_FT_CONNECTION_CLOSE_APP                 0x1D
+#define NGX_QUIC_FT_HANDSHAKE_DONE                       0x1E
+
+#define NGX_QUIC_FT_LAST  NGX_QUIC_FT_HANDSHAKE_DONE
+
+/* 22.5.  QUIC Transport Error Codes Registry */
+#define NGX_QUIC_ERR_NO_ERROR                            0x00
+#define NGX_QUIC_ERR_INTERNAL_ERROR                      0x01
+#define NGX_QUIC_ERR_CONNECTION_REFUSED                  0x02
+#define NGX_QUIC_ERR_FLOW_CONTROL_ERROR                  0x03
+#define NGX_QUIC_ERR_STREAM_LIMIT_ERROR                  0x04
+#define NGX_QUIC_ERR_STREAM_STATE_ERROR                  0x05
+#define NGX_QUIC_ERR_FINAL_SIZE_ERROR                    0x06
+#define NGX_QUIC_ERR_FRAME_ENCODING_ERROR                0x07
+#define NGX_QUIC_ERR_TRANSPORT_PARAMETER_ERROR           0x08
+#define NGX_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR           0x09
+#define NGX_QUIC_ERR_PROTOCOL_VIOLATION                  0x0A
+#define NGX_QUIC_ERR_INVALID_TOKEN                       0x0B
+#define NGX_QUIC_ERR_APPLICATION_ERROR                   0x0C
+#define NGX_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED              0x0D
+#define NGX_QUIC_ERR_KEY_UPDATE_ERROR                    0x0E
+#define NGX_QUIC_ERR_AEAD_LIMIT_REACHED                  0x0F
+#define NGX_QUIC_ERR_NO_VIABLE_PATH                      0x10
+
+#define NGX_QUIC_ERR_CRYPTO_ERROR                       0x100
+
+#define NGX_QUIC_ERR_CRYPTO(e)  (NGX_QUIC_ERR_CRYPTO_ERROR + (e))
+
+
+/* 22.3.  QUIC Transport Parameters Registry */
+#define NGX_QUIC_TP_ORIGINAL_DCID                        0x00
+#define NGX_QUIC_TP_MAX_IDLE_TIMEOUT                     0x01
+#define NGX_QUIC_TP_SR_TOKEN                             0x02
+#define NGX_QUIC_TP_MAX_UDP_PAYLOAD_SIZE                 0x03
+#define NGX_QUIC_TP_INITIAL_MAX_DATA                     0x04
+#define NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL   0x05
+#define NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE  0x06
+#define NGX_QUIC_TP_INITIAL_MAX_STREAM_DATA_UNI          0x07
+#define NGX_QUIC_TP_INITIAL_MAX_STREAMS_BIDI             0x08
+#define NGX_QUIC_TP_INITIAL_MAX_STREAMS_UNI              0x09
+#define NGX_QUIC_TP_ACK_DELAY_EXPONENT                   0x0A
+#define NGX_QUIC_TP_MAX_ACK_DELAY                        0x0B
+#define NGX_QUIC_TP_DISABLE_ACTIVE_MIGRATION             0x0C
+#define NGX_QUIC_TP_PREFERRED_ADDRESS                    0x0D
+#define NGX_QUIC_TP_ACTIVE_CONNECTION_ID_LIMIT           0x0E
+#define NGX_QUIC_TP_INITIAL_SCID                         0x0F
+#define NGX_QUIC_TP_RETRY_SCID                           0x10
+
+#define NGX_QUIC_CID_LEN_MIN                                8
+#define NGX_QUIC_CID_LEN_MAX                               20
+
+#define NGX_QUIC_MAX_RANGES                                10
+
+
+typedef struct {
+    uint64_t                                    gap;
+    uint64_t                                    range;
+} ngx_quic_ack_range_t;
+
+
+typedef struct {
+    uint64_t                                    largest;
+    uint64_t                                    delay;
+    uint64_t                                    range_count;
+    uint64_t                                    first_range;
+    uint64_t                                    ect0;
+    uint64_t                                    ect1;
+    uint64_t                                    ce;
+    uint64_t                                    ranges_length;
+} ngx_quic_ack_frame_t;
+
+
+typedef struct {
+    uint64_t                                    seqnum;
+    uint64_t                                    retire;
+    uint8_t                                     len;
+    u_char                                      cid[NGX_QUIC_CID_LEN_MAX];
+    u_char                                      srt[NGX_QUIC_SR_TOKEN_LEN];
+} ngx_quic_new_conn_id_frame_t;
+
+
+typedef struct {
+    uint64_t                                    length;
+} ngx_quic_new_token_frame_t;
+
+/*
+ * common layout for CRYPTO and STREAM frames;
+ * conceptually, CRYPTO frame is also a stream
+ * frame lacking some properties
+ */
+typedef struct {
+    uint64_t                                    offset;
+    uint64_t                                    length;
+} ngx_quic_ordered_frame_t;
+
+typedef ngx_quic_ordered_frame_t  ngx_quic_crypto_frame_t;
+
+
+typedef struct {
+    /* initial fields same as in ngx_quic_ordered_frame_t */
+    uint64_t                                    offset;
+    uint64_t                                    length;
+
+    uint64_t                                    stream_id;
+    unsigned                                    off:1;
+    unsigned                                    len:1;
+    unsigned                                    fin:1;
+} ngx_quic_stream_frame_t;
+
+
+typedef struct {
+    uint64_t                                    max_data;
+} ngx_quic_max_data_frame_t;
+
+
+typedef struct {
+    uint64_t                                    error_code;
+    uint64_t                                    frame_type;
+    ngx_str_t                                   reason;
+} ngx_quic_close_frame_t;
+
+
+typedef struct {
+    uint64_t                                    id;
+    uint64_t                                    error_code;
+    uint64_t                                    final_size;
+} ngx_quic_reset_stream_frame_t;
+
+
+typedef struct {
+    uint64_t                                    id;
+    uint64_t                                    error_code;
+} ngx_quic_stop_sending_frame_t;
+
+
+typedef struct {
+    uint64_t                                    limit;
+    ngx_uint_t                                  bidi;  /* unsigned: bidi:1 */
+} ngx_quic_streams_blocked_frame_t;
+
+
+typedef struct {
+    uint64_t                                    limit;
+    ngx_uint_t                                  bidi;  /* unsigned: bidi:1 */
+} ngx_quic_max_streams_frame_t;
+
+
+typedef struct {
+    uint64_t                                    id;
+    uint64_t                                    limit;
+} ngx_quic_max_stream_data_frame_t;
+
+
+typedef struct {
+    uint64_t                                    limit;
+} ngx_quic_data_blocked_frame_t;
+
+
+typedef struct {
+    uint64_t                                    id;
+    uint64_t                                    limit;
+} ngx_quic_stream_data_blocked_frame_t;
+
+
+typedef struct {
+    uint64_t                                    sequence_number;
+} ngx_quic_retire_cid_frame_t;
+
+
+typedef struct {
+    u_char                                      data[8];
+} ngx_quic_path_challenge_frame_t;
+
+
+typedef struct ngx_quic_frame_s                 ngx_quic_frame_t;
+
+struct ngx_quic_frame_s {
+    ngx_uint_t                                  type;
+    enum ssl_encryption_level_t                 level;
+    ngx_queue_t                                 queue;
+    uint64_t                                    pnum;
+    size_t                                      plen;
+    ngx_msec_t                                  send_time;
+    ssize_t                                     len;
+    unsigned                                    need_ack:1;
+    unsigned                                    pkt_need_ack:1;
+    unsigned                                    ignore_congestion:1;
+
+    ngx_chain_t                                *data;
+    union {
+        ngx_quic_ack_frame_t                    ack;
+        ngx_quic_crypto_frame_t                 crypto;
+        ngx_quic_ordered_frame_t                ord;
+        ngx_quic_new_conn_id_frame_t            ncid;
+        ngx_quic_new_token_frame_t              token;
+        ngx_quic_stream_frame_t                 stream;
+        ngx_quic_max_data_frame_t               max_data;
+        ngx_quic_close_frame_t                  close;
+        ngx_quic_reset_stream_frame_t           reset_stream;
+        ngx_quic_stop_sending_frame_t           stop_sending;
+        ngx_quic_streams_blocked_frame_t        streams_blocked;
+        ngx_quic_max_streams_frame_t            max_streams;
+        ngx_quic_max_stream_data_frame_t        max_stream_data;
+        ngx_quic_data_blocked_frame_t           data_blocked;
+        ngx_quic_stream_data_blocked_frame_t    stream_data_blocked;
+        ngx_quic_retire_cid_frame_t             retire_cid;
+        ngx_quic_path_challenge_frame_t         path_challenge;
+        ngx_quic_path_challenge_frame_t         path_response;
+    } u;
+};
+
+
+typedef struct {
+    ngx_log_t                                  *log;
+    ngx_quic_path_t                            *path;
+
+    ngx_quic_keys_t                            *keys;
+
+    ngx_msec_t                                  received;
+    uint64_t                                    number;
+    uint8_t                                     num_len;
+    uint32_t                                    trunc;
+    uint8_t                                     flags;
+    uint32_t                                    version;
+    ngx_str_t                                   token;
+    enum ssl_encryption_level_t                 level;
+    ngx_uint_t                                  error;
+
+    /* filled in by parser */
+    ngx_buf_t                                  *raw;   /* udp datagram */
+
+    u_char                                     *data;  /* quic packet */
+    size_t                                      len;
+
+    /* cleartext fields */
+    ngx_str_t                                   odcid; /* retry packet tag */
+    u_char                                      odcid_buf[NGX_QUIC_MAX_CID_LEN];
+    ngx_str_t                                   dcid;
+    ngx_str_t                                   scid;
+    uint64_t                                    pn;
+    u_char                                     *plaintext;
+    ngx_str_t                                   payload; /* decrypted data */
+
+    unsigned                                    need_ack:1;
+    unsigned                                    key_phase:1;
+    unsigned                                    key_update:1;
+    unsigned                                    parsed:1;
+    unsigned                                    decrypted:1;
+    unsigned                                    validated:1;
+    unsigned                                    retried:1;
+    unsigned                                    first:1;
+    unsigned                                    rebound:1;
+    unsigned                                    path_challenged:1;
+} ngx_quic_header_t;
+
+
+typedef struct {
+    ngx_msec_t                 max_idle_timeout;
+    ngx_msec_t                 max_ack_delay;
+
+    size_t                     max_udp_payload_size;
+    size_t                     initial_max_data;
+    size_t                     initial_max_stream_data_bidi_local;
+    size_t                     initial_max_stream_data_bidi_remote;
+    size_t                     initial_max_stream_data_uni;
+    ngx_uint_t                 initial_max_streams_bidi;
+    ngx_uint_t                 initial_max_streams_uni;
+    ngx_uint_t                 ack_delay_exponent;
+    ngx_uint_t                 active_connection_id_limit;
+    ngx_flag_t                 disable_active_migration;
+
+    ngx_str_t                  original_dcid;
+    ngx_str_t                  initial_scid;
+    ngx_str_t                  retry_scid;
+    u_char                     sr_token[NGX_QUIC_SR_TOKEN_LEN];
+
+    /* TODO */
+    void                      *preferred_address;
+} ngx_quic_tp_t;
+
+
+ngx_int_t ngx_quic_parse_packet(ngx_quic_header_t *pkt);
+
+size_t ngx_quic_create_version_negotiation(ngx_quic_header_t *pkt, u_char *out);
+
+size_t ngx_quic_payload_size(ngx_quic_header_t *pkt, size_t pkt_len);
+
+size_t ngx_quic_create_header(ngx_quic_header_t *pkt, u_char *out,
+    u_char **pnp);
+
+size_t ngx_quic_create_retry_itag(ngx_quic_header_t *pkt, u_char *out,
+    u_char **start);
+
+ssize_t ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
+    ngx_quic_frame_t *frame);
+ssize_t ngx_quic_create_frame(u_char *p, ngx_quic_frame_t *f);
+
+ssize_t ngx_quic_parse_ack_range(ngx_log_t *log, u_char *start,
+    u_char *end, uint64_t *gap, uint64_t *range);
+size_t ngx_quic_create_ack_range(u_char *p, uint64_t gap, uint64_t range);
+
+ngx_int_t ngx_quic_init_transport_params(ngx_quic_tp_t *tp,
+    ngx_quic_conf_t *qcf);
+ngx_int_t ngx_quic_parse_transport_params(u_char *p, u_char *end,
+    ngx_quic_tp_t *tp, ngx_log_t *log);
+ssize_t ngx_quic_create_transport_params(u_char *p, u_char *end,
+    ngx_quic_tp_t *tp, size_t *clen);
+
+void ngx_quic_dcid_encode_key(u_char *dcid, uint64_t key);
+
+#endif /* _NGX_EVENT_QUIC_TRANSPORT_H_INCLUDED_ */
diff --git a/src/event/quic/ngx_event_quic_udp.c b/src/event/quic/ngx_event_quic_udp.c
new file mode 100644
index 0000000..15b54bc
--- /dev/null
+++ b/src/event/quic/ngx_event_quic_udp.c
@@ -0,0 +1,420 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_event_quic_connection.h>
+
+
+static void ngx_quic_close_accepted_connection(ngx_connection_t *c);
+static ngx_connection_t *ngx_quic_lookup_connection(ngx_listening_t *ls,
+    ngx_str_t *key, struct sockaddr *local_sockaddr, socklen_t local_socklen);
+
+
+void
+ngx_quic_recvmsg(ngx_event_t *ev)
+{
+    ssize_t             n;
+    ngx_str_t           key;
+    ngx_buf_t           buf;
+    ngx_log_t          *log;
+    ngx_err_t           err;
+    socklen_t           socklen, local_socklen;
+    ngx_event_t        *rev, *wev;
+    struct iovec        iov[1];
+    struct msghdr       msg;
+    ngx_sockaddr_t      sa, lsa;
+    struct sockaddr    *sockaddr, *local_sockaddr;
+    ngx_listening_t    *ls;
+    ngx_event_conf_t   *ecf;
+    ngx_connection_t   *c, *lc;
+    ngx_quic_socket_t  *qsock;
+    static u_char       buffer[NGX_QUIC_MAX_UDP_PAYLOAD_SIZE];
+
+#if (NGX_HAVE_ADDRINFO_CMSG)
+    u_char             msg_control[CMSG_SPACE(sizeof(ngx_addrinfo_t))];
+#endif
+
+    if (ev->timedout) {
+        if (ngx_enable_accept_events((ngx_cycle_t *) ngx_cycle) != NGX_OK) {
+            return;
+        }
+
+        ev->timedout = 0;
+    }
+
+    ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module);
+
+    if (!(ngx_event_flags & NGX_USE_KQUEUE_EVENT)) {
+        ev->available = ecf->multi_accept;
+    }
+
+    lc = ev->data;
+    ls = lc->listening;
+    ev->ready = 0;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                   "quic recvmsg on %V, ready: %d",
+                   &ls->addr_text, ev->available);
+
+    do {
+        ngx_memzero(&msg, sizeof(struct msghdr));
+
+        iov[0].iov_base = (void *) buffer;
+        iov[0].iov_len = sizeof(buffer);
+
+        msg.msg_name = &sa;
+        msg.msg_namelen = sizeof(ngx_sockaddr_t);
+        msg.msg_iov = iov;
+        msg.msg_iovlen = 1;
+
+#if (NGX_HAVE_ADDRINFO_CMSG)
+        if (ls->wildcard) {
+            msg.msg_control = &msg_control;
+            msg.msg_controllen = sizeof(msg_control);
+
+            ngx_memzero(&msg_control, sizeof(msg_control));
+        }
+#endif
+
+        n = recvmsg(lc->fd, &msg, 0);
+
+        if (n == -1) {
+            err = ngx_socket_errno;
+
+            if (err == NGX_EAGAIN) {
+                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, err,
+                               "quic recvmsg() not ready");
+                return;
+            }
+
+            ngx_log_error(NGX_LOG_ALERT, ev->log, err, "quic recvmsg() failed");
+
+            return;
+        }
+
+#if (NGX_HAVE_ADDRINFO_CMSG)
+        if (msg.msg_flags & (MSG_TRUNC|MSG_CTRUNC)) {
+            ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
+                          "quic recvmsg() truncated data");
+            continue;
+        }
+#endif
+
+        sockaddr = msg.msg_name;
+        socklen = msg.msg_namelen;
+
+        if (socklen > (socklen_t) sizeof(ngx_sockaddr_t)) {
+            socklen = sizeof(ngx_sockaddr_t);
+        }
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+
+        if (sockaddr->sa_family == AF_UNIX) {
+            struct sockaddr_un *saun = (struct sockaddr_un *) sockaddr;
+
+            if (socklen <= (socklen_t) offsetof(struct sockaddr_un, sun_path)
+                || saun->sun_path[0] == '\0')
+            {
+                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
+                               "unbound unix socket");
+                goto next;
+            }
+        }
+
+#endif
+
+        local_sockaddr = ls->sockaddr;
+        local_socklen = ls->socklen;
+
+#if (NGX_HAVE_ADDRINFO_CMSG)
+
+        if (ls->wildcard) {
+            struct cmsghdr  *cmsg;
+
+            ngx_memcpy(&lsa, local_sockaddr, local_socklen);
+            local_sockaddr = &lsa.sockaddr;
+
+            for (cmsg = CMSG_FIRSTHDR(&msg);
+                 cmsg != NULL;
+                 cmsg = CMSG_NXTHDR(&msg, cmsg))
+            {
+                if (ngx_get_srcaddr_cmsg(cmsg, local_sockaddr) == NGX_OK) {
+                    break;
+                }
+            }
+        }
+
+#endif
+
+        if (ngx_quic_get_packet_dcid(ev->log, buffer, n, &key) != NGX_OK) {
+            goto next;
+        }
+
+        c = ngx_quic_lookup_connection(ls, &key, local_sockaddr, local_socklen);
+
+        if (c) {
+
+#if (NGX_DEBUG)
+            if (c->log->log_level & NGX_LOG_DEBUG_EVENT) {
+                ngx_log_handler_pt  handler;
+
+                handler = c->log->handler;
+                c->log->handler = NULL;
+
+                ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                               "quic recvmsg: fd:%d n:%z", c->fd, n);
+
+                c->log->handler = handler;
+            }
+#endif
+
+            ngx_memzero(&buf, sizeof(ngx_buf_t));
+
+            buf.pos = buffer;
+            buf.last = buffer + n;
+            buf.start = buf.pos;
+            buf.end = buffer + sizeof(buffer);
+
+            qsock = ngx_quic_get_socket(c);
+
+            ngx_memcpy(&qsock->sockaddr, sockaddr, socklen);
+            qsock->socklen = socklen;
+
+            c->udp->buffer = &buf;
+
+            rev = c->read;
+            rev->ready = 1;
+            rev->active = 0;
+
+            rev->handler(rev);
+
+            if (c->udp) {
+                c->udp->buffer = NULL;
+            }
+
+            rev->ready = 0;
+            rev->active = 1;
+
+            goto next;
+        }
+
+#if (NGX_STAT_STUB)
+        (void) ngx_atomic_fetch_add(ngx_stat_accepted, 1);
+#endif
+
+        ngx_accept_disabled = ngx_cycle->connection_n / 8
+                              - ngx_cycle->free_connection_n;
+
+        c = ngx_get_connection(lc->fd, ev->log);
+        if (c == NULL) {
+            return;
+        }
+
+        c->shared = 1;
+        c->type = SOCK_DGRAM;
+        c->socklen = socklen;
+
+#if (NGX_STAT_STUB)
+        (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
+#endif
+
+        c->pool = ngx_create_pool(ls->pool_size, ev->log);
+        if (c->pool == NULL) {
+            ngx_quic_close_accepted_connection(c);
+            return;
+        }
+
+        c->sockaddr = ngx_palloc(c->pool, NGX_SOCKADDRLEN);
+        if (c->sockaddr == NULL) {
+            ngx_quic_close_accepted_connection(c);
+            return;
+        }
+
+        ngx_memcpy(c->sockaddr, sockaddr, socklen);
+
+        log = ngx_palloc(c->pool, sizeof(ngx_log_t));
+        if (log == NULL) {
+            ngx_quic_close_accepted_connection(c);
+            return;
+        }
+
+        *log = ls->log;
+
+        c->log = log;
+        c->pool->log = log;
+        c->listening = ls;
+
+        if (local_sockaddr == &lsa.sockaddr) {
+            local_sockaddr = ngx_palloc(c->pool, local_socklen);
+            if (local_sockaddr == NULL) {
+                ngx_quic_close_accepted_connection(c);
+                return;
+            }
+
+            ngx_memcpy(local_sockaddr, &lsa, local_socklen);
+        }
+
+        c->local_sockaddr = local_sockaddr;
+        c->local_socklen = local_socklen;
+
+        c->buffer = ngx_create_temp_buf(c->pool, n);
+        if (c->buffer == NULL) {
+            ngx_quic_close_accepted_connection(c);
+            return;
+        }
+
+        c->buffer->last = ngx_cpymem(c->buffer->last, buffer, n);
+
+        rev = c->read;
+        wev = c->write;
+
+        rev->active = 1;
+        wev->ready = 1;
+
+        rev->log = log;
+        wev->log = log;
+
+        /*
+         * TODO: MT: - ngx_atomic_fetch_add()
+         *             or protection by critical section or light mutex
+         *
+         * TODO: MP: - allocated in a shared memory
+         *           - ngx_atomic_fetch_add()
+         *             or protection by critical section or light mutex
+         */
+
+        c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+
+        c->start_time = ngx_current_msec;
+
+#if (NGX_STAT_STUB)
+        (void) ngx_atomic_fetch_add(ngx_stat_handled, 1);
+#endif
+
+        if (ls->addr_ntop) {
+            c->addr_text.data = ngx_pnalloc(c->pool, ls->addr_text_max_len);
+            if (c->addr_text.data == NULL) {
+                ngx_quic_close_accepted_connection(c);
+                return;
+            }
+
+            c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->socklen,
+                                             c->addr_text.data,
+                                             ls->addr_text_max_len, 0);
+            if (c->addr_text.len == 0) {
+                ngx_quic_close_accepted_connection(c);
+                return;
+            }
+        }
+
+#if (NGX_DEBUG)
+        {
+        ngx_str_t  addr;
+        u_char     text[NGX_SOCKADDR_STRLEN];
+
+        ngx_debug_accepted_connection(ecf, c);
+
+        if (log->log_level & NGX_LOG_DEBUG_EVENT) {
+            addr.data = text;
+            addr.len = ngx_sock_ntop(c->sockaddr, c->socklen, text,
+                                     NGX_SOCKADDR_STRLEN, 1);
+
+            ngx_log_debug4(NGX_LOG_DEBUG_EVENT, log, 0,
+                           "*%uA quic recvmsg: %V fd:%d n:%z",
+                           c->number, &addr, c->fd, n);
+        }
+
+        }
+#endif
+
+        log->data = NULL;
+        log->handler = NULL;
+
+        ls->handler(c);
+
+    next:
+
+        if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
+            ev->available -= n;
+        }
+
+    } while (ev->available);
+}
+
+
+static void
+ngx_quic_close_accepted_connection(ngx_connection_t *c)
+{
+    ngx_free_connection(c);
+
+    c->fd = (ngx_socket_t) -1;
+
+    if (c->pool) {
+        ngx_destroy_pool(c->pool);
+    }
+
+#if (NGX_STAT_STUB)
+    (void) ngx_atomic_fetch_add(ngx_stat_active, -1);
+#endif
+}
+
+
+static ngx_connection_t *
+ngx_quic_lookup_connection(ngx_listening_t *ls, ngx_str_t *key,
+    struct sockaddr *local_sockaddr, socklen_t local_socklen)
+{
+    uint32_t            hash;
+    ngx_int_t           rc;
+    ngx_connection_t   *c;
+    ngx_rbtree_node_t  *node, *sentinel;
+    ngx_quic_socket_t  *qsock;
+
+    if (key->len == 0) {
+        return NULL;
+    }
+
+    node = ls->rbtree.root;
+    sentinel = ls->rbtree.sentinel;
+    hash = ngx_crc32_long(key->data, key->len);
+
+    while (node != sentinel) {
+
+        if (hash < node->key) {
+            node = node->left;
+            continue;
+        }
+
+        if (hash > node->key) {
+            node = node->right;
+            continue;
+        }
+
+        /* hash == node->key */
+
+        qsock = (ngx_quic_socket_t *) node;
+
+        rc = ngx_memn2cmp(key->data, qsock->sid.id, key->len, qsock->sid.len);
+
+        c = qsock->udp.connection;
+
+        if (rc == 0 && ls->wildcard) {
+            rc = ngx_cmp_sockaddr(local_sockaddr, local_socklen,
+                                  c->local_sockaddr, c->local_socklen, 1);
+        }
+
+        if (rc == 0) {
+            c->udp = &qsock->udp;
+            return c;
+        }
+
+        node = (rc < 0) ? node->left : node->right;
+    }
+
+    return NULL;
+}
diff --git a/src/http/modules/ngx_http_access_module.c b/src/http/modules/ngx_http_access_module.c
index 7355de9..ea75520 100644
--- a/src/http/modules/ngx_http_access_module.c
+++ b/src/http/modules/ngx_http_access_module.c
@@ -148,7 +148,7 @@ ngx_http_access_handler(ngx_http_request_t *r)
         p = sin6->sin6_addr.s6_addr;
 
         if (alcf->rules && IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
-            addr = p[12] << 24;
+            addr = (in_addr_t) p[12] << 24;
             addr += p[13] << 16;
             addr += p[14] << 8;
             addr += p[15];
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 2d9a18f..b989083 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -2048,7 +2048,10 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
                     }
 
                     u->headers_in.status_n = status;
-                    u->headers_in.status_line = *status_line;
+
+                    if (status_line->len > 3) {
+                        u->headers_in.status_line = *status_line;
+                    }
 
                 } else if (u->headers_in.location) {
                     u->headers_in.status_n = 302;
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index ef4e9b8..75c0397 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -199,7 +199,7 @@ ngx_http_geo_cidr_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
         p = inaddr6->s6_addr;
 
         if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
-            inaddr = p[12] << 24;
+            inaddr = (in_addr_t) p[12] << 24;
             inaddr += p[13] << 16;
             inaddr += p[14] << 8;
             inaddr += p[15];
@@ -272,7 +272,7 @@ ngx_http_geo_range_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
             if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
                 p = inaddr6->s6_addr;
 
-                inaddr = p[12] << 24;
+                inaddr = (in_addr_t) p[12] << 24;
                 inaddr += p[13] << 16;
                 inaddr += p[14] << 8;
                 inaddr += p[15];
@@ -1259,7 +1259,7 @@ ngx_http_geo_value(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
         return gvvn->value;
     }
 
-    val = ngx_palloc(ctx->pool, sizeof(ngx_http_variable_value_t));
+    val = ngx_pcalloc(ctx->pool, sizeof(ngx_http_variable_value_t));
     if (val == NULL) {
         return NULL;
     }
@@ -1271,8 +1271,6 @@ ngx_http_geo_value(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
     }
 
     val->valid = 1;
-    val->no_cacheable = 0;
-    val->not_found = 0;
 
     gvvn = ngx_palloc(ctx->temp_pool,
                       sizeof(ngx_http_geo_variable_value_node_t));
diff --git a/src/http/modules/ngx_http_geoip_module.c b/src/http/modules/ngx_http_geoip_module.c
index eaf9876..5b8b11f 100644
--- a/src/http/modules/ngx_http_geoip_module.c
+++ b/src/http/modules/ngx_http_geoip_module.c
@@ -266,7 +266,7 @@ ngx_http_geoip_addr(ngx_http_request_t *r, ngx_http_geoip_conf_t *gcf)
         if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
             p = inaddr6->s6_addr;
 
-            inaddr = p[12] << 24;
+            inaddr = (in_addr_t) p[12] << 24;
             inaddr += p[13] << 16;
             inaddr += p[14] << 8;
             inaddr += p[15];
diff --git a/src/http/modules/ngx_http_referer_module.c b/src/http/modules/ngx_http_referer_module.c
index 599dd3a..11a681b 100644
--- a/src/http/modules/ngx_http_referer_module.c
+++ b/src/http/modules/ngx_http_referer_module.c
@@ -631,7 +631,7 @@ ngx_http_add_regex_referer(ngx_conf_t *cf, ngx_http_referer_conf_t *rlcf,
 #else
 
     ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                       "the using of the regex \"%V\" requires PCRE library",
+                       "using regex \"%V\" requires PCRE library",
                        name);
 
     return NGX_ERROR;
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index 0e6d4df..ff3b687 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -489,6 +489,7 @@ ngx_http_rewrite_return(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
 
         if (cf->args->nelts == 2) {
+            ngx_str_set(&ret->text.value, "");
             return NGX_CONF_OK;
         }
 
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index 9fc18dc..3acea87 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -1153,7 +1153,10 @@ ngx_http_scgi_process_header(ngx_http_request_t *r)
                 }
 
                 u->headers_in.status_n = status;
-                u->headers_in.status_line = *status_line;
+
+                if (status_line->len > 3) {
+                    u->headers_in.status_line = *status_line;
+                }
 
             } else if (u->headers_in.location) {
                 u->headers_in.status_n = 302;
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index e7601b8..0b84bd3 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -2001,7 +2001,7 @@ ngx_http_ssi_regex_match(ngx_http_request_t *r, ngx_str_t *pattern,
 #else
 
     ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-                  "the using of the regex \"%V\" in SSI requires PCRE library",
+                  "using regex \"%V\" in SSI requires PCRE library",
                   pattern);
     return NGX_HTTP_SSI_ERROR;
 
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 4c4a598..1c92d9f 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -9,6 +9,10 @@
 #include <ngx_core.h>
 #include <ngx_http.h>
 
+#if (NGX_QUIC_OPENSSL_COMPAT)
+#include <ngx_event_quic_openssl_compat.h>
+#endif
+
 
 typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
     ngx_pool_t *pool, ngx_str_t *s);
@@ -39,8 +43,6 @@ static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf,
 static ngx_int_t ngx_http_ssl_compile_certificates(ngx_conf_t *cf,
     ngx_http_ssl_srv_conf_t *conf);
 
-static char *ngx_http_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
 static char *ngx_http_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -52,6 +54,10 @@ static char *ngx_http_ssl_conf_command_check(ngx_conf_t *cf, void *post,
     void *data);
 
 static ngx_int_t ngx_http_ssl_init(ngx_conf_t *cf);
+#if (NGX_QUIC_OPENSSL_COMPAT)
+static ngx_int_t ngx_http_ssl_quic_compat_init(ngx_conf_t *cf,
+    ngx_http_conf_addr_t *addr);
+#endif
 
 
 static ngx_conf_bitmask_t  ngx_http_ssl_protocols[] = {
@@ -82,24 +88,12 @@ static ngx_conf_enum_t  ngx_http_ssl_ocsp[] = {
 };
 
 
-static ngx_conf_deprecated_t  ngx_http_ssl_deprecated = {
-    ngx_conf_deprecated, "ssl", "listen ... ssl"
-};
-
-
 static ngx_conf_post_t  ngx_http_ssl_conf_command_post =
     { ngx_http_ssl_conf_command_check };
 
 
 static ngx_command_t  ngx_http_ssl_commands[] = {
 
-    { ngx_string("ssl"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
-      ngx_http_ssl_enable,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_ssl_srv_conf_t, enable),
-      &ngx_http_ssl_deprecated },
-
     { ngx_string("ssl_certificate"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_array_slot,
@@ -419,16 +413,22 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
     unsigned char *outlen, const unsigned char *in, unsigned int inlen,
     void *arg)
 {
-    unsigned int            srvlen;
-    unsigned char          *srv;
+    unsigned int             srvlen;
+    unsigned char           *srv;
 #if (NGX_DEBUG)
-    unsigned int            i;
+    unsigned int             i;
+#endif
+#if (NGX_HTTP_V2 || NGX_HTTP_V3)
+    ngx_http_connection_t   *hc;
 #endif
 #if (NGX_HTTP_V2)
-    ngx_http_connection_t  *hc;
+    ngx_http_v2_srv_conf_t  *h2scf;
 #endif
-#if (NGX_HTTP_V2 || NGX_DEBUG)
-    ngx_connection_t       *c;
+#if (NGX_HTTP_V3)
+    ngx_http_v3_srv_conf_t  *h3scf;
+#endif
+#if (NGX_HTTP_V2 || NGX_HTTP_V3 || NGX_DEBUG)
+    ngx_connection_t        *c;
 
     c = ngx_ssl_get_connection(ssl_conn);
 #endif
@@ -441,17 +441,49 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
     }
 #endif
 
-#if (NGX_HTTP_V2)
+#if (NGX_HTTP_V2 || NGX_HTTP_V3)
     hc = c->data;
+#endif
+
+#if (NGX_HTTP_V3)
+    if (hc->addr_conf->quic) {
+
+        h3scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v3_module);
+
+        if (h3scf->enable && h3scf->enable_hq) {
+            srv = (unsigned char *) NGX_HTTP_V3_ALPN_PROTO
+                                    NGX_HTTP_V3_HQ_ALPN_PROTO;
+            srvlen = sizeof(NGX_HTTP_V3_ALPN_PROTO NGX_HTTP_V3_HQ_ALPN_PROTO)
+                     - 1;
+
+        } else if (h3scf->enable_hq) {
+            srv = (unsigned char *) NGX_HTTP_V3_HQ_ALPN_PROTO;
+            srvlen = sizeof(NGX_HTTP_V3_HQ_ALPN_PROTO) - 1;
+
+        } else if (h3scf->enable) {
+            srv = (unsigned char *) NGX_HTTP_V3_ALPN_PROTO;
+            srvlen = sizeof(NGX_HTTP_V3_ALPN_PROTO) - 1;
+
+        } else {
+            return SSL_TLSEXT_ERR_ALERT_FATAL;
+        }
 
-    if (hc->addr_conf->http2) {
-        srv = (unsigned char *) NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS;
-        srvlen = sizeof(NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS) - 1;
     } else
 #endif
     {
-        srv = (unsigned char *) NGX_HTTP_ALPN_PROTOS;
-        srvlen = sizeof(NGX_HTTP_ALPN_PROTOS) - 1;
+#if (NGX_HTTP_V2)
+        h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
+
+        if (h2scf->enable || hc->addr_conf->http2) {
+            srv = (unsigned char *) NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS;
+            srvlen = sizeof(NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS) - 1;
+
+        } else
+#endif
+        {
+            srv = (unsigned char *) NGX_HTTP_ALPN_PROTOS;
+            srvlen = sizeof(NGX_HTTP_ALPN_PROTOS) - 1;
+        }
     }
 
     if (SSL_select_next_proto((unsigned char **) out, outlen, srv, srvlen,
@@ -579,7 +611,6 @@ ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
      *     sscf->stapling_responder = { 0, NULL };
      */
 
-    sscf->enable = NGX_CONF_UNSET;
     sscf->prefer_server_ciphers = NGX_CONF_UNSET;
     sscf->early_data = NGX_CONF_UNSET;
     sscf->reject_handshake = NGX_CONF_UNSET;
@@ -611,17 +642,6 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_pool_cleanup_t  *cln;
 
-    if (conf->enable == NGX_CONF_UNSET) {
-        if (prev->enable == NGX_CONF_UNSET) {
-            conf->enable = 0;
-
-        } else {
-            conf->enable = prev->enable;
-            conf->file = prev->file;
-            conf->line = prev->line;
-        }
-    }
-
     ngx_conf_merge_value(conf->session_timeout,
                          prev->session_timeout, 300);
 
@@ -676,37 +696,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     conf->ssl.log = cf->log;
 
-    if (conf->enable) {
-
-        if (conf->certificates) {
-            if (conf->certificate_keys == NULL) {
-                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                              "no \"ssl_certificate_key\" is defined for "
-                              "the \"ssl\" directive in %s:%ui",
-                              conf->file, conf->line);
-                return NGX_CONF_ERROR;
-            }
-
-            if (conf->certificate_keys->nelts < conf->certificates->nelts) {
-                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                              "no \"ssl_certificate_key\" is defined "
-                              "for certificate \"%V\" and "
-                              "the \"ssl\" directive in %s:%ui",
-                              ((ngx_str_t *) conf->certificates->elts)
-                              + conf->certificates->nelts - 1,
-                              conf->file, conf->line);
-                return NGX_CONF_ERROR;
-            }
-
-        } else if (!conf->reject_handshake) {
-            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                          "no \"ssl_certificate\" is defined for "
-                          "the \"ssl\" directive in %s:%ui",
-                          conf->file, conf->line);
-            return NGX_CONF_ERROR;
-        }
-
-    } else if (conf->certificates) {
+    if (conf->certificates) {
 
         if (conf->certificate_keys == NULL
             || conf->certificate_keys->nelts < conf->certificates->nelts)
@@ -992,26 +982,6 @@ found:
 }
 
 
-static char *
-ngx_http_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_ssl_srv_conf_t *sscf = conf;
-
-    char  *rv;
-
-    rv = ngx_conf_set_flag_slot(cf, cmd, conf);
-
-    if (rv != NGX_CONF_OK) {
-        return rv;
-    }
-
-    sscf->file = cf->conf_file->file.name.data;
-    sscf->line = cf->conf_file->line;
-
-    return NGX_CONF_OK;
-}
-
-
 static char *
 ngx_http_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -1241,6 +1211,7 @@ static ngx_int_t
 ngx_http_ssl_init(ngx_conf_t *cf)
 {
     ngx_uint_t                   a, p, s;
+    const char                  *name;
     ngx_http_conf_addr_t        *addr;
     ngx_http_conf_port_t        *port;
     ngx_http_ssl_srv_conf_t     *sscf;
@@ -1290,22 +1261,44 @@ ngx_http_ssl_init(ngx_conf_t *cf)
         addr = port[p].addrs.elts;
         for (a = 0; a < port[p].addrs.nelts; a++) {
 
-            if (!addr[a].opt.ssl) {
+            if (!addr[a].opt.ssl && !addr[a].opt.quic) {
                 continue;
             }
 
+            if (addr[a].opt.quic) {
+                name = "quic";
+
+#if (NGX_QUIC_OPENSSL_COMPAT)
+                if (ngx_http_ssl_quic_compat_init(cf, &addr[a]) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+#endif
+
+            } else {
+                name = "ssl";
+            }
+
             cscf = addr[a].default_server;
             sscf = cscf->ctx->srv_conf[ngx_http_ssl_module.ctx_index];
 
             if (sscf->certificates) {
+
+                if (addr[a].opt.quic && !(sscf->protocols & NGX_SSL_TLSv1_3)) {
+                    ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                                  "\"ssl_protocols\" must enable TLSv1.3 for "
+                                  "the \"listen ... %s\" directive in %s:%ui",
+                                  name, cscf->file_name, cscf->line);
+                    return NGX_ERROR;
+                }
+
                 continue;
             }
 
             if (!sscf->reject_handshake) {
                 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                               "no \"ssl_certificate\" is defined for "
-                              "the \"listen ... ssl\" directive in %s:%ui",
-                              cscf->file_name, cscf->line);
+                              "the \"listen ... %s\" directive in %s:%ui",
+                              name, cscf->file_name, cscf->line);
                 return NGX_ERROR;
             }
 
@@ -1326,8 +1319,8 @@ ngx_http_ssl_init(ngx_conf_t *cf)
 
                 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                               "no \"ssl_certificate\" is defined for "
-                              "the \"listen ... ssl\" directive in %s:%ui",
-                              cscf->file_name, cscf->line);
+                              "the \"listen ... %s\" directive in %s:%ui",
+                              name, cscf->file_name, cscf->line);
                 return NGX_ERROR;
             }
         }
@@ -1335,3 +1328,31 @@ ngx_http_ssl_init(ngx_conf_t *cf)
 
     return NGX_OK;
 }
+
+
+#if (NGX_QUIC_OPENSSL_COMPAT)
+
+static ngx_int_t
+ngx_http_ssl_quic_compat_init(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
+{
+    ngx_uint_t                  s;
+    ngx_http_ssl_srv_conf_t    *sscf;
+    ngx_http_core_srv_conf_t  **cscfp, *cscf;
+
+    cscfp = addr->servers.elts;
+    for (s = 0; s < addr->servers.nelts; s++) {
+
+        cscf = cscfp[s];
+        sscf = cscf->ctx->srv_conf[ngx_http_ssl_module.ctx_index];
+
+        if (sscf->certificates || sscf->reject_handshake) {
+            if (ngx_quic_compat_init(cf, sscf->ssl.ctx) != NGX_OK) {
+                return NGX_ERROR;
+            }
+        }
+    }
+
+    return NGX_OK;
+}
+
+#endif
diff --git a/src/http/modules/ngx_http_ssl_module.h b/src/http/modules/ngx_http_ssl_module.h
index 7ab0f7e..c69c8ff 100644
--- a/src/http/modules/ngx_http_ssl_module.h
+++ b/src/http/modules/ngx_http_ssl_module.h
@@ -15,8 +15,6 @@
 
 
 typedef struct {
-    ngx_flag_t                      enable;
-
     ngx_ssl_t                       ssl;
 
     ngx_flag_t                      prefer_server_ciphers;
@@ -64,9 +62,6 @@ typedef struct {
     ngx_flag_t                      stapling_verify;
     ngx_str_t                       stapling_file;
     ngx_str_t                       stapling_responder;
-
-    u_char                         *file;
-    ngx_uint_t                      line;
 } ngx_http_ssl_srv_conf_t;
 
 
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index e4f721b..c1731ff 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -1381,7 +1381,10 @@ ngx_http_uwsgi_process_header(ngx_http_request_t *r)
                 }
 
                 u->headers_in.status_n = status;
-                u->headers_in.status_line = *status_line;
+
+                if (status_line->len > 3) {
+                    u->headers_in.status_line = *status_line;
+                }
 
             } else if (u->headers_in.location) {
                 u->headers_in.status_n = 302;
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 93e1cd4..d835f89 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1200,7 +1200,10 @@ ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
     port = cmcf->ports->elts;
     for (i = 0; i < cmcf->ports->nelts; i++) {
 
-        if (p != port[i].port || sa->sa_family != port[i].family) {
+        if (p != port[i].port
+            || lsopt->type != port[i].type
+            || sa->sa_family != port[i].family)
+        {
             continue;
         }
 
@@ -1217,6 +1220,7 @@ ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
     }
 
     port->family = sa->sa_family;
+    port->type = lsopt->type;
     port->port = p;
     port->addrs.elts = NULL;
 
@@ -1237,6 +1241,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 #if (NGX_HTTP_V2)
     ngx_uint_t             http2;
 #endif
+#if (NGX_HTTP_V3)
+    ngx_uint_t             quic;
+#endif
 
     /*
      * we cannot compare whole sockaddr struct's as kernel
@@ -1278,6 +1285,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
         protocols |= lsopt->http2 << 2;
         protocols_prev |= addr[i].opt.http2 << 2;
 #endif
+#if (NGX_HTTP_V3)
+        quic = lsopt->quic || addr[i].opt.quic;
+#endif
 
         if (lsopt->set) {
 
@@ -1365,6 +1375,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 #if (NGX_HTTP_V2)
         addr[i].opt.http2 = http2;
 #endif
+#if (NGX_HTTP_V3)
+        addr[i].opt.quic = quic;
+#endif
 
         return NGX_OK;
     }
@@ -1831,6 +1844,7 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
     }
 #endif
 
+    ls->type = addr->opt.type;
     ls->backlog = addr->opt.backlog;
     ls->rcvbuf = addr->opt.rcvbuf;
     ls->sndbuf = addr->opt.sndbuf;
@@ -1866,6 +1880,12 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
     ls->reuseport = addr->opt.reuseport;
 #endif
 
+    ls->wildcard = addr->opt.wildcard;
+
+#if (NGX_HTTP_V3)
+    ls->quic = addr->opt.quic;
+#endif
+
     return ls;
 }
 
@@ -1897,6 +1917,9 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport,
 #endif
 #if (NGX_HTTP_V2)
         addrs[i].conf.http2 = addr[i].opt.http2;
+#endif
+#if (NGX_HTTP_V3)
+        addrs[i].conf.quic = addr[i].opt.quic;
 #endif
         addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
 
@@ -1962,6 +1985,9 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
 #endif
 #if (NGX_HTTP_V2)
         addrs6[i].conf.http2 = addr[i].opt.http2;
+#endif
+#if (NGX_HTTP_V3)
+        addrs6[i].conf.quic = addr[i].opt.quic;
 #endif
         addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
 
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index a7f312f..e06464e 100644
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -20,6 +20,8 @@ typedef struct ngx_http_file_cache_s  ngx_http_file_cache_t;
 typedef struct ngx_http_log_ctx_s     ngx_http_log_ctx_t;
 typedef struct ngx_http_chunked_s     ngx_http_chunked_t;
 typedef struct ngx_http_v2_stream_s   ngx_http_v2_stream_t;
+typedef struct ngx_http_v3_parse_s    ngx_http_v3_parse_t;
+typedef struct ngx_http_v3_session_s  ngx_http_v3_session_t;
 
 typedef ngx_int_t (*ngx_http_header_handler_pt)(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset);
@@ -38,6 +40,9 @@ typedef u_char *(*ngx_http_log_handler_pt)(ngx_http_request_t *r,
 #if (NGX_HTTP_V2)
 #include <ngx_http_v2.h>
 #endif
+#if (NGX_HTTP_V3)
+#include <ngx_http_v3.h>
+#endif
 #if (NGX_HTTP_CACHE)
 #include <ngx_http_cache.h>
 #endif
@@ -124,6 +129,11 @@ void ngx_http_handler(ngx_http_request_t *r);
 void ngx_http_run_posted_requests(ngx_connection_t *c);
 ngx_int_t ngx_http_post_request(ngx_http_request_t *r,
     ngx_http_posted_request_t *pr);
+ngx_int_t ngx_http_set_virtual_server(ngx_http_request_t *r,
+    ngx_str_t *host);
+ngx_int_t ngx_http_validate_host(ngx_str_t *host, ngx_pool_t *pool,
+    ngx_uint_t alloc);
+void ngx_http_close_request(ngx_http_request_t *r, ngx_int_t rc);
 void ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc);
 void ngx_http_free_request(ngx_http_request_t *r, ngx_int_t rc);
 
@@ -167,7 +177,7 @@ ngx_uint_t  ngx_http_degraded(ngx_http_request_t *);
 #endif
 
 
-#if (NGX_HTTP_V2)
+#if (NGX_HTTP_V2 || NGX_HTTP_V3)
 ngx_int_t ngx_http_huff_decode(u_char *state, u_char *src, size_t len,
     u_char **dst, ngx_uint_t last, ngx_log_t *log);
 size_t ngx_http_huff_encode(u_char *src, size_t len, u_char *dst,
diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c
index bd3028b..8e5de2b 100644
--- a/src/http/ngx_http_copy_filter_module.c
+++ b/src/http/ngx_http_copy_filter_module.c
@@ -170,6 +170,8 @@ ngx_http_copy_aio_handler(ngx_output_chain_ctx_t *ctx, ngx_file_t *file)
     file->aio->data = r;
     file->aio->handler = ngx_http_copy_aio_event_handler;
 
+    ngx_add_timer(&file->aio->event, 60000);
+
     r->main->blocked++;
     r->aio = 1;
     ctx->aio = 1;
@@ -192,12 +194,32 @@ ngx_http_copy_aio_event_handler(ngx_event_t *ev)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http aio: \"%V?%V\"", &r->uri, &r->args);
 
+    if (ev->timedout) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "aio operation took too long");
+        ev->timedout = 0;
+        return;
+    }
+
+    if (ev->timer_set) {
+        ngx_del_timer(ev);
+    }
+
     r->main->blocked--;
     r->aio = 0;
 
-    r->write_event_handler(r);
+    if (r->main->terminated) {
+        /*
+         * trigger connection event handler if the request was
+         * terminated
+         */
 
-    ngx_http_run_posted_requests(c);
+        c->write->handler(c->write);
+
+    } else {
+        r->write_event_handler(r);
+        ngx_http_run_posted_requests(c);
+    }
 }
 
 #endif
@@ -264,6 +286,8 @@ ngx_http_copy_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
         return NGX_ERROR;
     }
 
+    ngx_add_timer(&task->event, 60000);
+
     r->main->blocked++;
     r->aio = 1;
 
@@ -288,6 +312,17 @@ ngx_http_copy_thread_event_handler(ngx_event_t *ev)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http thread: \"%V?%V\"", &r->uri, &r->args);
 
+    if (ev->timedout) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "thread operation took too long");
+        ev->timedout = 0;
+        return;
+    }
+
+    if (ev->timer_set) {
+        ngx_del_timer(ev);
+    }
+
     r->main->blocked--;
     r->aio = 0;
 
@@ -305,11 +340,11 @@ ngx_http_copy_thread_event_handler(ngx_event_t *ev)
 
 #endif
 
-    if (r->done) {
+    if (r->done || r->main->terminated) {
         /*
          * trigger connection event handler if the subrequest was
-         * already finalized; this can happen if the handler is used
-         * for sendfile() in threads
+         * already finalized (this can happen if the handler is used
+         * for sendfile() in threads), or if the request was terminated
          */
 
         c->write->handler(c->write);
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 2140e06..033a3bf 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3005,6 +3005,7 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
         lsopt.socklen = sizeof(struct sockaddr_in);
 
         lsopt.backlog = NGX_LISTEN_BACKLOG;
+        lsopt.type = SOCK_STREAM;
         lsopt.rcvbuf = -1;
         lsopt.sndbuf = -1;
 #if (NGX_HAVE_SETFIB)
@@ -3960,7 +3961,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     ngx_str_t              *value, size;
     ngx_url_t               u;
-    ngx_uint_t              n, i;
+    ngx_uint_t              n, i, backlog;
     ngx_http_listen_opt_t   lsopt;
 
     cscf->listen = 1;
@@ -3986,6 +3987,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t));
 
     lsopt.backlog = NGX_LISTEN_BACKLOG;
+    lsopt.type = SOCK_STREAM;
     lsopt.rcvbuf = -1;
     lsopt.sndbuf = -1;
 #if (NGX_HAVE_SETFIB)
@@ -3998,6 +4000,8 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     lsopt.ipv6only = 1;
 #endif
 
+    backlog = 0;
+
     for (n = 2; n < cf->args->nelts; n++) {
 
         if (ngx_strcmp(value[n].data, "default_server") == 0
@@ -4056,6 +4060,8 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 return NGX_CONF_ERROR;
             }
 
+            backlog = 1;
+
             continue;
         }
 
@@ -4174,6 +4180,11 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strcmp(value[n].data, "http2") == 0) {
 #if (NGX_HTTP_V2)
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "the \"listen ... http2\" directive "
+                               "is deprecated, use "
+                               "the \"http2\" directive instead");
+
             lsopt.http2 = 1;
             continue;
 #else
@@ -4184,6 +4195,19 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
         }
 
+        if (ngx_strcmp(value[n].data, "quic") == 0) {
+#if (NGX_HTTP_V3)
+            lsopt.quic = 1;
+            lsopt.type = SOCK_DGRAM;
+            continue;
+#else
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "the \"quic\" parameter requires "
+                               "ngx_http_v3_module");
+            return NGX_CONF_ERROR;
+#endif
+        }
+
         if (ngx_strncmp(value[n].data, "so_keepalive=", 13) == 0) {
 
             if (ngx_strcmp(&value[n].data[13], "on") == 0) {
@@ -4285,6 +4309,50 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
+    if (lsopt.quic) {
+#if (NGX_HAVE_TCP_FASTOPEN)
+        if (lsopt.fastopen != -1) {
+            return "\"fastopen\" parameter is incompatible with \"quic\"";
+        }
+#endif
+
+        if (backlog) {
+            return "\"backlog\" parameter is incompatible with \"quic\"";
+        }
+
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
+        if (lsopt.accept_filter) {
+            return "\"accept_filter\" parameter is incompatible with \"quic\"";
+        }
+#endif
+
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
+        if (lsopt.deferred_accept) {
+            return "\"deferred\" parameter is incompatible with \"quic\"";
+        }
+#endif
+
+#if (NGX_HTTP_SSL)
+        if (lsopt.ssl) {
+            return "\"ssl\" parameter is incompatible with \"quic\"";
+        }
+#endif
+
+#if (NGX_HTTP_V2)
+        if (lsopt.http2) {
+            return "\"http2\" parameter is incompatible with \"quic\"";
+        }
+#endif
+
+        if (lsopt.so_keepalive) {
+            return "\"so_keepalive\" parameter is incompatible with \"quic\"";
+        }
+
+        if (lsopt.proxy_protocol) {
+            return "\"proxy_protocol\" parameter is incompatible with \"quic\"";
+        }
+    }
+
     for (n = 0; n < u.naddrs; n++) {
 
         for (i = 0; i < n; i++) {
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index e41bc68..765e7ff 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -75,6 +75,7 @@ typedef struct {
     unsigned                   wildcard:1;
     unsigned                   ssl:1;
     unsigned                   http2:1;
+    unsigned                   quic:1;
 #if (NGX_HAVE_INET6)
     unsigned                   ipv6only:1;
 #endif
@@ -86,6 +87,7 @@ typedef struct {
     int                        backlog;
     int                        rcvbuf;
     int                        sndbuf;
+    int                        type;
 #if (NGX_HAVE_SETFIB)
     int                        setfib;
 #endif
@@ -237,6 +239,7 @@ struct ngx_http_addr_conf_s {
 
     unsigned                   ssl:1;
     unsigned                   http2:1;
+    unsigned                   quic:1;
     unsigned                   proxy_protocol:1;
 };
 
@@ -266,6 +269,7 @@ typedef struct {
 
 typedef struct {
     ngx_int_t                  family;
+    ngx_int_t                  type;
     in_port_t                  port;
     ngx_array_t                addrs;     /* array of ngx_http_conf_addr_t */
 } ngx_http_conf_port_t;
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index aa5fd19..5209f00 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -14,7 +14,7 @@
 static ngx_int_t ngx_http_file_cache_lock(ngx_http_request_t *r,
     ngx_http_cache_t *c);
 static void ngx_http_file_cache_lock_wait_handler(ngx_event_t *ev);
-static void ngx_http_file_cache_lock_wait(ngx_http_request_t *r,
+static ngx_int_t ngx_http_file_cache_lock_wait(ngx_http_request_t *r,
     ngx_http_cache_t *c);
 static ngx_int_t ngx_http_file_cache_read(ngx_http_request_t *r,
     ngx_http_cache_t *c);
@@ -463,6 +463,7 @@ ngx_http_file_cache_lock(ngx_http_request_t *r, ngx_http_cache_t *c)
 static void
 ngx_http_file_cache_lock_wait_handler(ngx_event_t *ev)
 {
+    ngx_int_t            rc;
     ngx_connection_t    *c;
     ngx_http_request_t  *r;
 
@@ -474,13 +475,31 @@ ngx_http_file_cache_lock_wait_handler(ngx_event_t *ev)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http file cache wait: \"%V?%V\"", &r->uri, &r->args);
 
-    ngx_http_file_cache_lock_wait(r, r->cache);
+    rc = ngx_http_file_cache_lock_wait(r, r->cache);
 
-    ngx_http_run_posted_requests(c);
+    if (rc == NGX_AGAIN) {
+        return;
+    }
+
+    r->cache->waiting = 0;
+    r->main->blocked--;
+
+    if (r->main->terminated) {
+        /*
+         * trigger connection event handler if the request was
+         * terminated
+         */
+
+        c->write->handler(c->write);
+
+    } else {
+        r->write_event_handler(r);
+        ngx_http_run_posted_requests(c);
+    }
 }
 
 
-static void
+static ngx_int_t
 ngx_http_file_cache_lock_wait(ngx_http_request_t *r, ngx_http_cache_t *c)
 {
     ngx_uint_t              wait;
@@ -495,7 +514,7 @@ ngx_http_file_cache_lock_wait(ngx_http_request_t *r, ngx_http_cache_t *c)
         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
                       "cache lock timeout");
         c->lock_timeout = 0;
-        goto wakeup;
+        return NGX_OK;
     }
 
     cache = c->file_cache;
@@ -513,14 +532,10 @@ ngx_http_file_cache_lock_wait(ngx_http_request_t *r, ngx_http_cache_t *c)
 
     if (wait) {
         ngx_add_timer(&c->wait_event, (timer > 500) ? 500 : timer);
-        return;
+        return NGX_AGAIN;
     }
 
-wakeup:
-
-    c->waiting = 0;
-    r->main->blocked--;
-    r->write_event_handler(r);
+    return NGX_OK;
 }
 
 
@@ -690,6 +705,8 @@ ngx_http_file_cache_aio_read(ngx_http_request_t *r, ngx_http_cache_t *c)
         c->file.aio->data = r;
         c->file.aio->handler = ngx_http_cache_aio_event_handler;
 
+        ngx_add_timer(&c->file.aio->event, 60000);
+
         r->main->blocked++;
         r->aio = 1;
 
@@ -737,12 +754,32 @@ ngx_http_cache_aio_event_handler(ngx_event_t *ev)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http file cache aio: \"%V?%V\"", &r->uri, &r->args);
 
+    if (ev->timedout) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "aio operation took too long");
+        ev->timedout = 0;
+        return;
+    }
+
+    if (ev->timer_set) {
+        ngx_del_timer(ev);
+    }
+
     r->main->blocked--;
     r->aio = 0;
 
-    r->write_event_handler(r);
+    if (r->main->terminated) {
+        /*
+         * trigger connection event handler if the request was
+         * terminated
+         */
 
-    ngx_http_run_posted_requests(c);
+        c->write->handler(c->write);
+
+    } else {
+        r->write_event_handler(r);
+        ngx_http_run_posted_requests(c);
+    }
 }
 
 #endif
@@ -786,6 +823,8 @@ ngx_http_cache_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
         return NGX_ERROR;
     }
 
+    ngx_add_timer(&task->event, 60000);
+
     r->main->blocked++;
     r->aio = 1;
 
@@ -807,12 +846,32 @@ ngx_http_cache_thread_event_handler(ngx_event_t *ev)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http file cache thread: \"%V?%V\"", &r->uri, &r->args);
 
+    if (ev->timedout) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "thread operation took too long");
+        ev->timedout = 0;
+        return;
+    }
+
+    if (ev->timer_set) {
+        ngx_del_timer(ev);
+    }
+
     r->main->blocked--;
     r->aio = 0;
 
-    r->write_event_handler(r);
+    if (r->main->terminated) {
+        /*
+         * trigger connection event handler if the request was
+         * terminated
+         */
 
-    ngx_http_run_posted_requests(c);
+        c->write->handler(c->write);
+
+    } else {
+        r->write_event_handler(r);
+        ngx_http_run_posted_requests(c);
+    }
 }
 
 #endif
diff --git a/src/http/ngx_http_huff_decode.c b/src/http/ngx_http_huff_decode.c
index 14b7b78..a65c3c3 100644
--- a/src/http/ngx_http_huff_decode.c
+++ b/src/http/ngx_http_huff_decode.c
@@ -2657,7 +2657,7 @@ ngx_http_huff_decode(u_char *state, u_char *src, size_t len, u_char **dst,
             != NGX_OK)
         {
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
-                           "http2 huffman decoding error at state %d: "
+                           "http huffman decoding error at state %d: "
                            "bad code 0x%Xd", *state, ch >> 4);
 
             return NGX_ERROR;
@@ -2667,7 +2667,7 @@ ngx_http_huff_decode(u_char *state, u_char *src, size_t len, u_char **dst,
             != NGX_OK)
         {
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, log, 0,
-                           "http2 huffman decoding error at state %d: "
+                           "http huffman decoding error at state %d: "
                            "bad code 0x%Xd", *state, ch & 0xf);
 
             return NGX_ERROR;
@@ -2677,7 +2677,7 @@ ngx_http_huff_decode(u_char *state, u_char *src, size_t len, u_char **dst,
     if (last) {
         if (!ending) {
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
-                           "http2 huffman decoding error: "
+                           "http huffman decoding error: "
                            "incomplete code 0x%Xd", ch);
 
             return NGX_ERROR;
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index d4f2dae..f7e5038 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -451,19 +451,16 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
 
             switch (ch) {
             case '/':
-                r->port_end = p;
                 r->uri_start = p;
                 state = sw_after_slash_in_uri;
                 break;
             case '?':
-                r->port_end = p;
                 r->uri_start = p;
                 r->args_start = p + 1;
                 r->empty_path_in_uri = 1;
                 state = sw_uri;
                 break;
             case ' ':
-                r->port_end = p;
                 /*
                  * use single "/" from request line to preserve pointers,
                  * if request line will be copied to large client buffer
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 5e0340b..3cca57c 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -29,10 +29,6 @@ static ngx_int_t ngx_http_process_connection(ngx_http_request_t *r,
 static ngx_int_t ngx_http_process_user_agent(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset);
 
-static ngx_int_t ngx_http_validate_host(ngx_str_t *host, ngx_pool_t *pool,
-    ngx_uint_t alloc);
-static ngx_int_t ngx_http_set_virtual_server(ngx_http_request_t *r,
-    ngx_str_t *host);
 static ngx_int_t ngx_http_find_virtual_server(ngx_connection_t *c,
     ngx_http_virtual_names_t *virtual_names, ngx_str_t *host,
     ngx_http_request_t *r, ngx_http_core_srv_conf_t **cscfp);
@@ -50,7 +46,6 @@ static void ngx_http_keepalive_handler(ngx_event_t *ev);
 static void ngx_http_set_lingering_close(ngx_connection_t *c);
 static void ngx_http_lingering_close_handler(ngx_event_t *ev);
 static ngx_int_t ngx_http_post_action(ngx_http_request_t *r);
-static void ngx_http_close_request(ngx_http_request_t *r, ngx_int_t error);
 static void ngx_http_log_request(ngx_http_request_t *r);
 
 static u_char *ngx_http_log_error(ngx_log_t *log, u_char *buf, size_t len);
@@ -323,24 +318,19 @@ ngx_http_init_connection(ngx_connection_t *c)
     rev->handler = ngx_http_wait_request_handler;
     c->write->handler = ngx_http_empty_handler;
 
-#if (NGX_HTTP_V2)
-    if (hc->addr_conf->http2) {
-        rev->handler = ngx_http_v2_init;
+#if (NGX_HTTP_V3)
+    if (hc->addr_conf->quic) {
+        ngx_http_v3_init_stream(c);
+        return;
     }
 #endif
 
 #if (NGX_HTTP_SSL)
-    {
-    ngx_http_ssl_srv_conf_t  *sscf;
-
-    sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
-
-    if (sscf->enable || hc->addr_conf->ssl) {
+    if (hc->addr_conf->ssl) {
         hc->ssl = 1;
         c->log->action = "SSL handshaking";
         rev->handler = ngx_http_ssl_handshake;
     }
-    }
 #endif
 
     if (hc->addr_conf->proxy_protocol) {
@@ -381,6 +371,9 @@ ngx_http_wait_request_handler(ngx_event_t *rev)
     ngx_buf_t                 *b;
     ngx_connection_t          *c;
     ngx_http_connection_t     *hc;
+#if (NGX_HTTP_V2)
+    ngx_http_v2_srv_conf_t    *h2scf;
+#endif
     ngx_http_core_srv_conf_t  *cscf;
 
     c = rev->data;
@@ -427,6 +420,8 @@ ngx_http_wait_request_handler(ngx_event_t *rev)
         b->end = b->last + size;
     }
 
+    size = b->end - b->last;
+
     n = c->recv(c, b->last, size);
 
     if (n == NGX_AGAIN) {
@@ -441,12 +436,16 @@ ngx_http_wait_request_handler(ngx_event_t *rev)
             return;
         }
 
-        /*
-         * We are trying to not hold c->buffer's memory for an idle connection.
-         */
+        if (b->pos == b->last) {
 
-        if (ngx_pfree(c->pool, b->start) == NGX_OK) {
-            b->start = NULL;
+            /*
+             * We are trying to not hold c->buffer's memory for an
+             * idle connection.
+             */
+
+            if (ngx_pfree(c->pool, b->start) == NGX_OK) {
+                b->start = NULL;
+            }
         }
 
         return;
@@ -487,6 +486,29 @@ ngx_http_wait_request_handler(ngx_event_t *rev)
         }
     }
 
+#if (NGX_HTTP_V2)
+
+    h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
+
+    if (!hc->ssl && (h2scf->enable || hc->addr_conf->http2)) {
+
+        size = ngx_min(sizeof(NGX_HTTP_V2_PREFACE) - 1,
+                       (size_t) (b->last - b->pos));
+
+        if (ngx_memcmp(b->pos, NGX_HTTP_V2_PREFACE, size) == 0) {
+
+            if (size == sizeof(NGX_HTTP_V2_PREFACE) - 1) {
+                ngx_http_v2_init(rev);
+                return;
+            }
+
+            ngx_post_event(rev, &ngx_posted_events);
+            return;
+        }
+    }
+
+#endif
+
     c->log->action = "reading client request line";
 
     ngx_reusable_connection(c, 0);
@@ -806,13 +828,16 @@ ngx_http_ssl_handshake_handler(ngx_connection_t *c)
 #if (NGX_HTTP_V2                                                              \
      && defined TLSEXT_TYPE_application_layer_protocol_negotiation)
         {
-        unsigned int            len;
-        const unsigned char    *data;
-        ngx_http_connection_t  *hc;
+        unsigned int             len;
+        const unsigned char     *data;
+        ngx_http_connection_t   *hc;
+        ngx_http_v2_srv_conf_t  *h2scf;
 
         hc = c->data;
 
-        if (hc->addr_conf->http2) {
+        h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
+
+        if (h2scf->enable || hc->addr_conf->http2) {
 
             SSL_get0_alpn_selected(c->ssl->connection, &data, &len);
 
@@ -949,6 +974,14 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 
 #ifdef SSL_OP_NO_RENEGOTIATION
         SSL_set_options(ssl_conn, SSL_OP_NO_RENEGOTIATION);
+#endif
+
+#ifdef SSL_OP_ENABLE_MIDDLEBOX_COMPAT
+#if (NGX_HTTP_V3)
+        if (c->listening->quic) {
+            SSL_clear_options(ssl_conn, SSL_OP_ENABLE_MIDDLEBOX_COMPAT);
+        }
+#endif
 #endif
     }
 
@@ -1685,14 +1718,23 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
             r->request_end = new + (r->request_end - old);
         }
 
-        r->method_end = new + (r->method_end - old);
+        if (r->method_end) {
+            r->method_end = new + (r->method_end - old);
+        }
 
-        r->uri_start = new + (r->uri_start - old);
-        r->uri_end = new + (r->uri_end - old);
+        if (r->uri_start) {
+            r->uri_start = new + (r->uri_start - old);
+        }
+
+        if (r->uri_end) {
+            r->uri_end = new + (r->uri_end - old);
+        }
 
         if (r->schema_start) {
             r->schema_start = new + (r->schema_start - old);
-            r->schema_end = new + (r->schema_end - old);
+            if (r->schema_end) {
+                r->schema_end = new + (r->schema_end - old);
+            }
         }
 
         if (r->host_start) {
@@ -1702,11 +1744,6 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
             }
         }
 
-        if (r->port_start) {
-            r->port_start = new + (r->port_start - old);
-            r->port_end = new + (r->port_end - old);
-        }
-
         if (r->uri_ext) {
             r->uri_ext = new + (r->uri_ext - old);
         }
@@ -1721,9 +1758,18 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
 
     } else {
         r->header_name_start = new;
-        r->header_name_end = new + (r->header_name_end - old);
-        r->header_start = new + (r->header_start - old);
-        r->header_end = new + (r->header_end - old);
+
+        if (r->header_name_end) {
+            r->header_name_end = new + (r->header_name_end - old);
+        }
+
+        if (r->header_start) {
+            r->header_start = new + (r->header_start - old);
+        }
+
+        if (r->header_end) {
+            r->header_end = new + (r->header_end - old);
+        }
     }
 
     r->header_in = b;
@@ -2095,7 +2141,7 @@ ngx_http_process_request(ngx_http_request_t *r)
 }
 
 
-static ngx_int_t
+ngx_int_t
 ngx_http_validate_host(ngx_str_t *host, ngx_pool_t *pool, ngx_uint_t alloc)
 {
     u_char  *h, ch;
@@ -2187,7 +2233,7 @@ ngx_http_validate_host(ngx_str_t *host, ngx_pool_t *pool, ngx_uint_t alloc)
 }
 
 
-static ngx_int_t
+ngx_int_t
 ngx_http_set_virtual_server(ngx_http_request_t *r, ngx_str_t *host)
 {
     ngx_int_t                  rc;
@@ -2648,6 +2694,8 @@ ngx_http_terminate_request(ngx_http_request_t *r, ngx_int_t rc)
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http terminate request count:%d", mr->count);
 
+    mr->terminated = 1;
+
     if (rc > 0 && (mr->headers_out.status == 0 || mr->connection->sent == 0)) {
         mr->headers_out.status = rc;
     }
@@ -2670,8 +2718,11 @@ ngx_http_terminate_request(ngx_http_request_t *r, ngx_int_t rc)
     if (mr->write_event_handler) {
 
         if (mr->blocked) {
+            r = r->connection->data;
+
             r->connection->error = 1;
             r->write_event_handler = ngx_http_request_finalizer;
+
             return;
         }
 
@@ -2710,6 +2761,13 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
     }
 #endif
 
+#if (NGX_HTTP_V3)
+    if (r->connection->quic) {
+        ngx_http_close_request(r, 0);
+        return;
+    }
+#endif
+
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     if (r->main->count != 1) {
@@ -2925,6 +2983,20 @@ ngx_http_test_reading(ngx_http_request_t *r)
 
 #endif
 
+#if (NGX_HTTP_V3)
+
+    if (c->quic) {
+        if (rev->error) {
+            c->error = 1;
+            err = 0;
+            goto closed;
+        }
+
+        return;
+    }
+
+#endif
+
 #if (NGX_HAVE_KQUEUE)
 
     if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
@@ -3590,7 +3662,7 @@ ngx_http_post_action(ngx_http_request_t *r)
 }
 
 
-static void
+void
 ngx_http_close_request(ngx_http_request_t *r, ngx_int_t rc)
 {
     ngx_connection_t  *c;
@@ -3677,7 +3749,12 @@ ngx_http_free_request(ngx_http_request_t *r, ngx_int_t rc)
 
     log->action = "closing request";
 
-    if (r->connection->timedout) {
+    if (r->connection->timedout
+#if (NGX_HTTP_V3)
+        && r->connection->quic == NULL
+#endif
+       )
+    {
         clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
         if (clcf->reset_timedout_connection) {
@@ -3750,6 +3827,12 @@ ngx_http_close_connection(ngx_connection_t *c)
 
 #endif
 
+#if (NGX_HTTP_V3)
+    if (c->quic) {
+        ngx_http_v3_reset_stream(c);
+    }
+#endif
+
 #if (NGX_STAT_STUB)
     (void) ngx_atomic_fetch_add(ngx_stat_active, -1);
 #endif
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 8c9eed2..65c8333 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -24,6 +24,7 @@
 #define NGX_HTTP_VERSION_10                1000
 #define NGX_HTTP_VERSION_11                1001
 #define NGX_HTTP_VERSION_20                2000
+#define NGX_HTTP_VERSION_30                3000
 
 #define NGX_HTTP_UNKNOWN                   0x00000001
 #define NGX_HTTP_GET                       0x00000002
@@ -451,6 +452,7 @@ struct ngx_http_request_s {
 
     ngx_http_connection_t            *http_connection;
     ngx_http_v2_stream_t             *stream;
+    ngx_http_v3_parse_t              *v3_parse;
 
     ngx_http_log_handler_pt           log_handler;
 
@@ -543,10 +545,12 @@ struct ngx_http_request_s {
     unsigned                          request_complete:1;
     unsigned                          request_output:1;
     unsigned                          header_sent:1;
+    unsigned                          response_sent:1;
     unsigned                          expect_tested:1;
     unsigned                          root_tested:1;
     unsigned                          done:1;
     unsigned                          logged:1;
+    unsigned                          terminated:1;
 
     unsigned                          buffered:4;
 
@@ -594,8 +598,6 @@ struct ngx_http_request_s {
     u_char                           *schema_end;
     u_char                           *host_start;
     u_char                           *host_end;
-    u_char                           *port_start;
-    u_char                           *port_end;
 
     unsigned                          http_minor:16;
     unsigned                          http_major:16;
diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index ad3549f..afb0423 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -92,6 +92,13 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
     }
 #endif
 
+#if (NGX_HTTP_V3)
+    if (r->http_version == NGX_HTTP_VERSION_30) {
+        rc = ngx_http_v3_read_request_body(r);
+        goto done;
+    }
+#endif
+
     preread = r->header_in->last - r->header_in->pos;
 
     if (preread) {
@@ -238,6 +245,18 @@ ngx_http_read_unbuffered_request_body(ngx_http_request_t *r)
     }
 #endif
 
+#if (NGX_HTTP_V3)
+    if (r->http_version == NGX_HTTP_VERSION_30) {
+        rc = ngx_http_v3_read_unbuffered_request_body(r);
+
+        if (rc == NGX_OK) {
+            r->reading_body = 0;
+        }
+
+        return rc;
+    }
+#endif
+
     if (r->connection->read->timedout) {
         r->connection->timedout = 1;
         return NGX_HTTP_REQUEST_TIME_OUT;
@@ -625,6 +644,12 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
     }
 #endif
 
+#if (NGX_HTTP_V3)
+    if (r->http_version == NGX_HTTP_VERSION_30) {
+        return NGX_OK;
+    }
+#endif
+
     if (ngx_http_test_expect(r) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -920,6 +945,9 @@ ngx_http_test_expect(ngx_http_request_t *r)
         || r->http_version < NGX_HTTP_VERSION_11
 #if (NGX_HTTP_V2)
         || r->stream != NULL
+#endif
+#if (NGX_HTTP_V3)
+        || r->connection->quic != NULL
 #endif
        )
     {
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 3ae822b..2ce9f21 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -521,6 +521,13 @@ ngx_http_upstream_init(ngx_http_request_t *r)
     }
 #endif
 
+#if (NGX_HTTP_V3)
+    if (c->quic) {
+        ngx_http_upstream_init_request(r);
+        return;
+    }
+#endif
+
     if (c->read->timer_set) {
         ngx_del_timer(c->read);
     }
@@ -1354,6 +1361,19 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
     }
 #endif
 
+#if (NGX_HTTP_V3)
+
+    if (c->quic) {
+        if (c->write->error) {
+            ngx_http_upstream_finalize_request(r, u,
+                                               NGX_HTTP_CLIENT_CLOSED_REQUEST);
+        }
+
+        return;
+    }
+
+#endif
+
 #if (NGX_HAVE_KQUEUE)
 
     if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
@@ -3929,6 +3949,8 @@ ngx_http_upstream_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
     r->aio = 1;
     p->aio = 1;
 
+    ngx_add_timer(&task->event, 60000);
+
     return NGX_OK;
 }
 
@@ -3947,6 +3969,17 @@ ngx_http_upstream_thread_event_handler(ngx_event_t *ev)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "http upstream thread: \"%V?%V\"", &r->uri, &r->args);
 
+    if (ev->timedout) {
+        ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                      "thread operation took too long");
+        ev->timedout = 0;
+        return;
+    }
+
+    if (ev->timer_set) {
+        ngx_del_timer(ev);
+    }
+
     r->main->blocked--;
     r->aio = 0;
 
@@ -3964,11 +3997,11 @@ ngx_http_upstream_thread_event_handler(ngx_event_t *ev)
 
 #endif
 
-    if (r->done) {
+    if (r->done || r->main->terminated) {
         /*
          * trigger connection event handler if the subrequest was
-         * already finalized; this can happen if the handler is used
-         * for sendfile() in threads
+         * already finalized (this can happen if the handler is used
+         * for sendfile() in threads), or if the request was terminated
          */
 
         c->write->handler(c->write);
@@ -4541,6 +4574,10 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
 
     u->peer.connection = NULL;
 
+    if (u->pipe) {
+        u->pipe->upstream = NULL;
+    }
+
     if (u->pipe && u->pipe->temp_file) {
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "http upstream temp fd: %d",
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 16ffda3..4f0bd0e 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -828,7 +828,7 @@ ngx_http_variable_headers_internal(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data, u_char sep)
 {
     size_t            len;
-    u_char           *p;
+    u_char           *p, *end;
     ngx_table_elt_t  *h, *th;
 
     h = *(ngx_table_elt_t **) ((char *) r + data);
@@ -870,6 +870,8 @@ ngx_http_variable_headers_internal(ngx_http_request_t *r,
     v->len = len;
     v->data = p;
 
+    end = p + len;
+
     for (th = h; th; th = th->next) {
 
         if (th->hash == 0) {
@@ -878,7 +880,7 @@ ngx_http_variable_headers_internal(ngx_http_request_t *r,
 
         p = ngx_copy(p, th->value.data, th->value.len);
 
-        if (th->next == NULL) {
+        if (p == end) {
             break;
         }
 
diff --git a/src/http/ngx_http_write_filter_module.c b/src/http/ngx_http_write_filter_module.c
index 89ab49e..9188ee9 100644
--- a/src/http/ngx_http_write_filter_module.c
+++ b/src/http/ngx_http_write_filter_module.c
@@ -240,6 +240,10 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
             r->out = NULL;
             c->buffered &= ~NGX_HTTP_WRITE_BUFFERED;
 
+            if (last) {
+                r->response_sent = 1;
+            }
+
             return NGX_OK;
         }
 
@@ -346,6 +350,10 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     c->buffered &= ~NGX_HTTP_WRITE_BUFFERED;
 
+    if (last) {
+        r->response_sent = 1;
+    }
+
     if ((c->buffered & NGX_LOWLEVEL_BUFFERED) && r->postponed == NULL) {
         return NGX_AGAIN;
     }
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index ea3f27c..0f5bd3d 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -11,14 +11,6 @@
 #include <ngx_http_v2_module.h>
 
 
-typedef struct {
-    ngx_str_t           name;
-    ngx_uint_t          offset;
-    ngx_uint_t          hash;
-    ngx_http_header_t  *hh;
-} ngx_http_v2_parse_header_t;
-
-
 /* errors */
 #define NGX_HTTP_V2_NO_ERROR                     0x0
 #define NGX_HTTP_V2_PROTOCOL_ERROR               0x1
@@ -63,8 +55,6 @@ static void ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c);
 static void ngx_http_v2_lingering_close(ngx_connection_t *c);
 static void ngx_http_v2_lingering_close_handler(ngx_event_t *rev);
 
-static u_char *ngx_http_v2_state_proxy_protocol(ngx_http_v2_connection_t *h2c,
-    u_char *pos, u_char *end);
 static u_char *ngx_http_v2_state_preface(ngx_http_v2_connection_t *h2c,
     u_char *pos, u_char *end);
 static u_char *ngx_http_v2_state_preface_end(ngx_http_v2_connection_t *h2c,
@@ -128,7 +118,7 @@ static ngx_int_t ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c,
     u_char **pos, u_char *end, ngx_uint_t prefix);
 
 static ngx_http_v2_stream_t *ngx_http_v2_create_stream(
-    ngx_http_v2_connection_t *h2c, ngx_uint_t push);
+    ngx_http_v2_connection_t *h2c);
 static ngx_http_v2_node_t *ngx_http_v2_get_node_by_id(
     ngx_http_v2_connection_t *h2c, ngx_uint_t sid, ngx_uint_t alloc);
 static ngx_http_v2_node_t *ngx_http_v2_get_closed_node(
@@ -164,14 +154,11 @@ static ngx_int_t ngx_http_v2_parse_scheme(ngx_http_request_t *r,
     ngx_str_t *value);
 static ngx_int_t ngx_http_v2_parse_authority(ngx_http_request_t *r,
     ngx_str_t *value);
-static ngx_int_t ngx_http_v2_parse_header(ngx_http_request_t *r,
-    ngx_http_v2_parse_header_t *header, ngx_str_t *value);
 static ngx_int_t ngx_http_v2_construct_request_line(ngx_http_request_t *r);
 static ngx_int_t ngx_http_v2_cookie(ngx_http_request_t *r,
     ngx_http_v2_header_t *header);
 static ngx_int_t ngx_http_v2_construct_cookie_header(ngx_http_request_t *r);
 static void ngx_http_v2_run_request(ngx_http_request_t *r);
-static void ngx_http_v2_run_request_handler(ngx_event_t *ev);
 static ngx_int_t ngx_http_v2_process_request_body(ngx_http_request_t *r,
     u_char *pos, size_t size, ngx_uint_t last, ngx_uint_t flush);
 static ngx_int_t ngx_http_v2_filter_request_body(ngx_http_request_t *r);
@@ -212,26 +199,10 @@ static ngx_http_v2_handler_pt ngx_http_v2_frame_states[] = {
     (sizeof(ngx_http_v2_frame_states) / sizeof(ngx_http_v2_handler_pt))
 
 
-static ngx_http_v2_parse_header_t  ngx_http_v2_parse_headers[] = {
-    { ngx_string("host"),
-      offsetof(ngx_http_headers_in_t, host), 0, NULL },
-
-    { ngx_string("accept-encoding"),
-      offsetof(ngx_http_headers_in_t, accept_encoding), 0, NULL },
-
-    { ngx_string("accept-language"),
-      offsetof(ngx_http_headers_in_t, accept_language), 0, NULL },
-
-    { ngx_string("user-agent"),
-      offsetof(ngx_http_headers_in_t, user_agent), 0, NULL },
-
-    { ngx_null_string, 0, 0, NULL }
-};
-
-
 void
 ngx_http_v2_init(ngx_event_t *rev)
 {
+    u_char                    *p, *end;
     ngx_connection_t          *c;
     ngx_pool_cleanup_t        *cln;
     ngx_http_connection_t     *hc;
@@ -276,7 +247,6 @@ ngx_http_v2_init(ngx_event_t *rev)
 
     h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
 
-    h2c->concurrent_pushes = h2scf->concurrent_pushes;
     h2c->priority_limit = ngx_max(h2scf->concurrent_streams, 100);
 
     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
@@ -314,8 +284,7 @@ ngx_http_v2_init(ngx_event_t *rev)
         return;
     }
 
-    h2c->state.handler = hc->proxy_protocol ? ngx_http_v2_state_proxy_protocol
-                                            : ngx_http_v2_state_preface;
+    h2c->state.handler = ngx_http_v2_state_preface;
 
     ngx_queue_init(&h2c->waiting);
     ngx_queue_init(&h2c->dependencies);
@@ -335,6 +304,23 @@ ngx_http_v2_init(ngx_event_t *rev)
     c->idle = 1;
     ngx_reusable_connection(c, 0);
 
+    if (c->buffer) {
+        p = c->buffer->pos;
+        end = c->buffer->last;
+
+        do {
+            p = h2c->state.handler(h2c, p, end);
+
+            if (p == NULL) {
+                return;
+            }
+
+        } while (p != end);
+
+        h2c->total_bytes += p - c->buffer->pos;
+        c->buffer->pos = p;
+    }
+
     ngx_http_v2_read_handler(rev);
 }
 
@@ -361,6 +347,7 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");
 
     h2c->blocked = 1;
+    h2c->new_streams = 0;
 
     if (c->close) {
         c->close = 0;
@@ -370,7 +357,7 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
             return;
         }
 
-        if (!h2c->processing && !h2c->pushing) {
+        if (!h2c->processing) {
             ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
             return;
         }
@@ -399,13 +386,11 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
     h2mcf = ngx_http_get_module_main_conf(h2c->http_connection->conf_ctx,
                                           ngx_http_v2_module);
 
-    available = h2mcf->recv_buffer_size - 2 * NGX_HTTP_V2_STATE_BUFFER_SIZE;
+    available = h2mcf->recv_buffer_size - NGX_HTTP_V2_STATE_BUFFER_SIZE;
 
     do {
         p = h2mcf->recv_buffer;
-
-        ngx_memcpy(p, h2c->state.buffer, NGX_HTTP_V2_STATE_BUFFER_SIZE);
-        end = p + h2c->state.buffer_used;
+        end = ngx_cpymem(p, h2c->state.buffer, h2c->state.buffer_used);
 
         n = c->recv(c, end, available);
 
@@ -413,9 +398,7 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
             break;
         }
 
-        if (n == 0
-            && (h2c->state.incomplete || h2c->processing || h2c->pushing))
-        {
+        if (n == 0 && (h2c->state.incomplete || h2c->processing)) {
             ngx_log_error(NGX_LOG_INFO, c->log, 0,
                           "client prematurely closed connection");
         }
@@ -638,7 +621,7 @@ ngx_http_v2_handle_connection(ngx_http_v2_connection_t *h2c)
     ngx_connection_t          *c;
     ngx_http_core_loc_conf_t  *clcf;
 
-    if (h2c->last_out || h2c->processing || h2c->pushing) {
+    if (h2c->last_out || h2c->processing) {
         return;
     }
 
@@ -846,32 +829,11 @@ ngx_http_v2_lingering_close_handler(ngx_event_t *rev)
 }
 
 
-static u_char *
-ngx_http_v2_state_proxy_protocol(ngx_http_v2_connection_t *h2c, u_char *pos,
-    u_char *end)
-{
-    ngx_log_t  *log;
-
-    log = h2c->connection->log;
-    log->action = "reading PROXY protocol";
-
-    pos = ngx_proxy_protocol_read(h2c->connection, pos, end);
-
-    log->action = "processing HTTP/2 connection";
-
-    if (pos == NULL) {
-        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
-    }
-
-    return ngx_http_v2_state_preface(h2c, pos, end);
-}
-
-
 static u_char *
 ngx_http_v2_state_preface(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    static const u_char preface[] = "PRI * HTTP/2.0\r\n";
+    static const u_char preface[] = NGX_HTTP_V2_PREFACE_START;
 
     if ((size_t) (end - pos) < sizeof(preface) - 1) {
         return ngx_http_v2_state_save(h2c, pos, end, ngx_http_v2_state_preface);
@@ -892,7 +854,7 @@ static u_char *
 ngx_http_v2_state_preface_end(ngx_http_v2_connection_t *h2c, u_char *pos,
     u_char *end)
 {
-    static const u_char preface[] = "\r\nSM\r\n\r\n";
+    static const u_char preface[] = NGX_HTTP_V2_PREFACE_END;
 
     if ((size_t) (end - pos) < sizeof(preface) - 1) {
         return ngx_http_v2_state_save(h2c, pos, end,
@@ -1321,6 +1283,14 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         goto rst_stream;
     }
 
+    if (h2c->new_streams++ >= 2 * h2scf->concurrent_streams) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent too many streams at once");
+
+        status = NGX_HTTP_V2_REFUSED_STREAM;
+        goto rst_stream;
+    }
+
     if (!h2c->settings_ack
         && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
         && h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
@@ -1344,7 +1314,7 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
         h2c->closed_nodes--;
     }
 
-    stream = ngx_http_v2_create_stream(h2c, 0);
+    stream = ngx_http_v2_create_stream(h2c);
     if (stream == NULL) {
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
     }
@@ -1386,6 +1356,12 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
 
 rst_stream:
 
+    if (h2c->refused_streams++ > ngx_max(h2scf->concurrent_streams, 100)) {
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "client sent too many refused streams");
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_NO_ERROR);
+    }
+
     if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
     }
@@ -2133,11 +2109,6 @@ ngx_http_v2_state_rst_stream(ngx_http_v2_connection_t *h2c, u_char *pos,
                       "client canceled stream %ui", h2c->state.sid);
         break;
 
-    case NGX_HTTP_V2_REFUSED_STREAM:
-        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
-                      "client refused stream %ui", h2c->state.sid);
-        break;
-
     case NGX_HTTP_V2_INTERNAL_ERROR:
         ngx_log_error(NGX_LOG_INFO, fc->log, 0,
                       "client terminated stream %ui due to internal error",
@@ -2205,7 +2176,6 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
 {
     ssize_t                   window_delta;
     ngx_uint_t                id, value;
-    ngx_http_v2_srv_conf_t   *h2scf;
     ngx_http_v2_out_frame_t  *frame;
 
     window_delta = 0;
@@ -2267,14 +2237,6 @@ ngx_http_v2_state_settings_params(ngx_http_v2_connection_t *h2c, u_char *pos,
                                                     NGX_HTTP_V2_PROTOCOL_ERROR);
             }
 
-            h2c->push_disabled = !value;
-            break;
-
-        case NGX_HTTP_V2_MAX_STREAMS_SETTING:
-            h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
-                                                 ngx_http_v2_module);
-
-            h2c->concurrent_pushes = ngx_min(value, h2scf->concurrent_pushes);
             break;
 
         case NGX_HTTP_V2_HEADER_TABLE_SIZE_SETTING:
@@ -2628,7 +2590,7 @@ ngx_http_v2_state_save(ngx_http_v2_connection_t *h2c, u_char *pos, u_char *end,
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
     }
 
-    ngx_memcpy(h2c->state.buffer, pos, NGX_HTTP_V2_STATE_BUFFER_SIZE);
+    ngx_memcpy(h2c->state.buffer, pos, size);
 
     h2c->state.buffer_used = size;
     h2c->state.handler = handler;
@@ -2729,163 +2691,6 @@ ngx_http_v2_parse_int(ngx_http_v2_connection_t *h2c, u_char **pos, u_char *end,
 }
 
 
-ngx_http_v2_stream_t *
-ngx_http_v2_push_stream(ngx_http_v2_stream_t *parent, ngx_str_t *path)
-{
-    ngx_int_t                     rc;
-    ngx_str_t                     value;
-    ngx_pool_t                   *pool;
-    ngx_uint_t                    index;
-    ngx_table_elt_t             **h;
-    ngx_connection_t             *fc;
-    ngx_http_request_t           *r;
-    ngx_http_v2_node_t           *node;
-    ngx_http_v2_stream_t         *stream;
-    ngx_http_v2_srv_conf_t       *h2scf;
-    ngx_http_v2_connection_t     *h2c;
-    ngx_http_v2_parse_header_t   *header;
-
-    h2c = parent->connection;
-
-    pool = ngx_create_pool(1024, h2c->connection->log);
-    if (pool == NULL) {
-        goto rst_stream;
-    }
-
-    node = ngx_http_v2_get_node_by_id(h2c, h2c->last_push, 1);
-
-    if (node == NULL) {
-        ngx_destroy_pool(pool);
-        goto rst_stream;
-    }
-
-    stream = ngx_http_v2_create_stream(h2c, 1);
-    if (stream == NULL) {
-
-        if (node->parent == NULL) {
-            h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
-                                                 ngx_http_v2_module);
-
-            index = ngx_http_v2_index(h2scf, h2c->last_push);
-            h2c->streams_index[index] = node->index;
-
-            ngx_queue_insert_tail(&h2c->closed, &node->reuse);
-            h2c->closed_nodes++;
-        }
-
-        ngx_destroy_pool(pool);
-        goto rst_stream;
-    }
-
-    if (node->parent) {
-        ngx_queue_remove(&node->reuse);
-        h2c->closed_nodes--;
-    }
-
-    stream->pool = pool;
-
-    r = stream->request;
-    fc = r->connection;
-
-    stream->in_closed = 1;
-    stream->node = node;
-
-    node->stream = stream;
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 push stream sid:%ui "
-                   "depends on %ui excl:0 weight:16",
-                   h2c->last_push, parent->node->id);
-
-    node->weight = NGX_HTTP_V2_DEFAULT_WEIGHT;
-    ngx_http_v2_set_dependency(h2c, node, parent->node->id, 0);
-
-    r->method_name = ngx_http_core_get_method;
-    r->method = NGX_HTTP_GET;
-
-    r->schema.data = ngx_pstrdup(pool, &parent->request->schema);
-    if (r->schema.data == NULL) {
-        goto close;
-    }
-
-    r->schema.len = parent->request->schema.len;
-
-    value.data = ngx_pstrdup(pool, path);
-    if (value.data == NULL) {
-        goto close;
-    }
-
-    value.len = path->len;
-
-    rc = ngx_http_v2_parse_path(r, &value);
-
-    if (rc != NGX_OK) {
-        goto error;
-    }
-
-    for (header = ngx_http_v2_parse_headers; header->name.len; header++) {
-        h = (ngx_table_elt_t **)
-                ((char *) &parent->request->headers_in + header->offset);
-
-        if (*h == NULL) {
-            continue;
-        }
-
-        value.len = (*h)->value.len;
-
-        value.data = ngx_pnalloc(pool, value.len + 1);
-        if (value.data == NULL) {
-            goto close;
-        }
-
-        ngx_memcpy(value.data, (*h)->value.data, value.len);
-        value.data[value.len] = '\0';
-
-        rc = ngx_http_v2_parse_header(r, header, &value);
-
-        if (rc != NGX_OK) {
-            goto error;
-        }
-    }
-
-    fc->write->handler = ngx_http_v2_run_request_handler;
-    ngx_post_event(fc->write, &ngx_posted_events);
-
-    return stream;
-
-error:
-
-    if (rc == NGX_ABORT) {
-        /* header handler has already finalized request */
-        ngx_http_run_posted_requests(fc);
-        return NULL;
-    }
-
-    if (rc == NGX_DECLINED) {
-        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
-        ngx_http_run_posted_requests(fc);
-        return NULL;
-    }
-
-close:
-
-    ngx_http_v2_close_stream(stream, NGX_HTTP_INTERNAL_SERVER_ERROR);
-
-    return NULL;
-
-rst_stream:
-
-    if (ngx_http_v2_send_rst_stream(h2c, h2c->last_push,
-                                    NGX_HTTP_INTERNAL_SERVER_ERROR)
-        != NGX_OK)
-    {
-        h2c->connection->error = 1;
-    }
-
-    return NULL;
-}
-
-
 static ngx_int_t
 ngx_http_v2_send_settings(ngx_http_v2_connection_t *h2c)
 {
@@ -3157,7 +2962,7 @@ ngx_http_v2_frame_handler(ngx_http_v2_connection_t *h2c,
 
 
 static ngx_http_v2_stream_t *
-ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
+ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c)
 {
     ngx_log_t                 *log;
     ngx_event_t               *rev, *wev;
@@ -3212,13 +3017,7 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
     ngx_memcpy(log, h2c->connection->log, sizeof(ngx_log_t));
 
     log->data = ctx;
-
-    if (push) {
-        log->action = "processing pushed request headers";
-
-    } else {
-        log->action = "reading client request headers";
-    }
+    log->action = "reading client request headers";
 
     ngx_memzero(rev, sizeof(ngx_event_t));
 
@@ -3290,12 +3089,7 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
     stream->send_window = h2c->init_window;
     stream->recv_window = h2scf->preread_size;
 
-    if (push) {
-        h2c->pushing++;
-
-    } else {
-        h2c->processing++;
-    }
+    h2c->processing++;
 
     h2c->priority_limit += h2scf->concurrent_streams;
 
@@ -3717,46 +3511,42 @@ ngx_http_v2_parse_scheme(ngx_http_request_t *r, ngx_str_t *value)
 
 static ngx_int_t
 ngx_http_v2_parse_authority(ngx_http_request_t *r, ngx_str_t *value)
-{
-    return ngx_http_v2_parse_header(r, &ngx_http_v2_parse_headers[0], value);
-}
-
-
-static ngx_int_t
-ngx_http_v2_parse_header(ngx_http_request_t *r,
-    ngx_http_v2_parse_header_t *header, ngx_str_t *value)
 {
     ngx_table_elt_t            *h;
+    ngx_http_header_t          *hh;
     ngx_http_core_main_conf_t  *cmcf;
 
+    static ngx_str_t host = ngx_string("host");
+
     h = ngx_list_push(&r->headers_in.headers);
     if (h == NULL) {
         return NGX_ERROR;
     }
 
-    h->key.len = header->name.len;
-    h->key.data = header->name.data;
-    h->lowcase_key = header->name.data;
+    h->hash = ngx_hash(ngx_hash(ngx_hash('h', 'o'), 's'), 't');
 
-    if (header->hh == NULL) {
-        header->hash = ngx_hash_key(header->name.data, header->name.len);
-
-        cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-
-        header->hh = ngx_hash_find(&cmcf->headers_in_hash, header->hash,
-                                   h->lowcase_key, h->key.len);
-        if (header->hh == NULL) {
-            return NGX_ERROR;
-        }
-    }
-
-    h->hash = header->hash;
+    h->key.len = host.len;
+    h->key.data = host.data;
 
     h->value.len = value->len;
     h->value.data = value->data;
 
-    if (header->hh->handler(r, h, header->hh->offset) != NGX_OK) {
-        /* header handler has already finalized request */
+    h->lowcase_key = host.data;
+
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+    hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
+                       h->lowcase_key, h->key.len);
+
+    if (hh == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (hh->handler(r, h, hh->offset) != NGX_OK) {
+        /*
+         * request has been finalized already
+         * in ngx_http_process_host()
+         */
         return NGX_ABORT;
     }
 
@@ -3943,10 +3733,22 @@ static void
 ngx_http_v2_run_request(ngx_http_request_t *r)
 {
     ngx_connection_t          *fc;
+    ngx_http_v2_srv_conf_t    *h2scf;
     ngx_http_v2_connection_t  *h2c;
 
     fc = r->connection;
 
+    h2scf = ngx_http_get_module_srv_conf(r, ngx_http_v2_module);
+
+    if (!h2scf->enable && !r->http_connection->addr_conf->http2) {
+        ngx_log_error(NGX_LOG_INFO, fc->log, 0,
+                      "client attempted to request the server name "
+                      "for which the negotiated protocol is disabled");
+
+        ngx_http_finalize_request(r, NGX_HTTP_MISDIRECTED_REQUEST);
+        goto failed;
+    }
+
     if (ngx_http_v2_construct_request_line(r) != NGX_OK) {
         goto failed;
     }
@@ -3987,22 +3789,6 @@ failed:
 }
 
 
-static void
-ngx_http_v2_run_request_handler(ngx_event_t *ev)
-{
-    ngx_connection_t    *fc;
-    ngx_http_request_t  *r;
-
-    fc = ev->data;
-    r = fc->data;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-                   "http2 run request handler");
-
-    ngx_http_v2_run_request(r);
-}
-
-
 ngx_int_t
 ngx_http_v2_read_request_body(ngx_http_request_t *r)
 {
@@ -4606,7 +4392,6 @@ void
 ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
 {
     ngx_pool_t                *pool;
-    ngx_uint_t                 push;
     ngx_event_t               *ev;
     ngx_connection_t          *fc;
     ngx_http_v2_node_t        *node;
@@ -4615,10 +4400,9 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
     h2c = stream->connection;
     node = stream->node;
 
-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 close stream %ui, queued %ui, "
-                   "processing %ui, pushing %ui",
-                   node->id, stream->queued, h2c->processing, h2c->pushing);
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
+                   "http2 close stream %ui, queued %ui, processing %ui",
+                   node->id, stream->queued, h2c->processing);
 
     fc = stream->request->connection;
 
@@ -4653,8 +4437,6 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
         h2c->state.stream = NULL;
     }
 
-    push = stream->node->id % 2 == 0;
-
     node->stream = NULL;
 
     ngx_queue_insert_tail(&h2c->closed, &node->reuse);
@@ -4704,14 +4486,9 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
     fc->data = h2c->free_fake_connections;
     h2c->free_fake_connections = fc;
 
-    if (push) {
-        h2c->pushing--;
+    h2c->processing--;
 
-    } else {
-        h2c->processing--;
-    }
-
-    if (h2c->processing || h2c->pushing || h2c->blocked) {
+    if (h2c->processing || h2c->blocked) {
         return;
     }
 
@@ -4887,7 +4664,7 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
         }
     }
 
-    if (!h2c->processing && !h2c->pushing) {
+    if (!h2c->processing) {
         goto done;
     }
 
@@ -4935,7 +4712,7 @@ ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
 
     h2c->blocked = 0;
 
-    if (h2c->processing || h2c->pushing) {
+    if (h2c->processing) {
         c->error = 1;
         return;
     }
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
index 4e25293..6751b30 100644
--- a/src/http/v2/ngx_http_v2.h
+++ b/src/http/v2/ngx_http_v2.h
@@ -24,8 +24,6 @@
 #define NGX_HTTP_V2_MAX_FIELD                                                 \
     (127 + (1 << (NGX_HTTP_V2_INT_OCTETS - 1) * 7) - 1)
 
-#define NGX_HTTP_V2_STREAM_ID_SIZE       4
-
 #define NGX_HTTP_V2_FRAME_HEADER_SIZE    9
 
 /* frame types */
@@ -63,6 +61,15 @@ typedef u_char *(*ngx_http_v2_handler_pt) (ngx_http_v2_connection_t *h2c,
     u_char *pos, u_char *end);
 
 
+typedef struct {
+    ngx_flag_t                       enable;
+    size_t                           pool_size;
+    ngx_uint_t                       concurrent_streams;
+    size_t                           preread_size;
+    ngx_uint_t                       streams_index_mask;
+} ngx_http_v2_srv_conf_t;
+
+
 typedef struct {
     ngx_str_t                        name;
     ngx_str_t                        value;
@@ -124,11 +131,10 @@ struct ngx_http_v2_connection_s {
     ngx_uint_t                       processing;
     ngx_uint_t                       frames;
     ngx_uint_t                       idle;
+    ngx_uint_t                       new_streams;
+    ngx_uint_t                       refused_streams;
     ngx_uint_t                       priority_limit;
 
-    ngx_uint_t                       pushing;
-    ngx_uint_t                       concurrent_pushes;
-
     size_t                           send_window;
     size_t                           recv_window;
     size_t                           init_window;
@@ -155,7 +161,6 @@ struct ngx_http_v2_connection_s {
 
     ngx_uint_t                       closed_nodes;
     ngx_uint_t                       last_sid;
-    ngx_uint_t                       last_push;
 
     time_t                           lingering_time;
 
@@ -163,7 +168,6 @@ struct ngx_http_v2_connection_s {
     unsigned                         table_update:1;
     unsigned                         blocked:1;
     unsigned                         goaway:1;
-    unsigned                         push_disabled:1;
 };
 
 
@@ -293,9 +297,6 @@ void ngx_http_v2_init(ngx_event_t *rev);
 ngx_int_t ngx_http_v2_read_request_body(ngx_http_request_t *r);
 ngx_int_t ngx_http_v2_read_unbuffered_request_body(ngx_http_request_t *r);
 
-ngx_http_v2_stream_t *ngx_http_v2_push_stream(ngx_http_v2_stream_t *parent,
-    ngx_str_t *path);
-
 void ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc);
 
 ngx_int_t ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c);
@@ -397,20 +398,25 @@ ngx_int_t ngx_http_v2_table_size(ngx_http_v2_connection_t *h2c, size_t size);
 #define NGX_HTTP_V2_STATUS_404_INDEX      13
 #define NGX_HTTP_V2_STATUS_500_INDEX      14
 
-#define NGX_HTTP_V2_ACCEPT_ENCODING_INDEX 16
-#define NGX_HTTP_V2_ACCEPT_LANGUAGE_INDEX 17
 #define NGX_HTTP_V2_CONTENT_LENGTH_INDEX  28
 #define NGX_HTTP_V2_CONTENT_TYPE_INDEX    31
 #define NGX_HTTP_V2_DATE_INDEX            33
 #define NGX_HTTP_V2_LAST_MODIFIED_INDEX   44
 #define NGX_HTTP_V2_LOCATION_INDEX        46
 #define NGX_HTTP_V2_SERVER_INDEX          54
-#define NGX_HTTP_V2_USER_AGENT_INDEX      58
 #define NGX_HTTP_V2_VARY_INDEX            59
 
+#define NGX_HTTP_V2_PREFACE_START         "PRI * HTTP/2.0\r\n"
+#define NGX_HTTP_V2_PREFACE_END           "\r\nSM\r\n\r\n"
+#define NGX_HTTP_V2_PREFACE               NGX_HTTP_V2_PREFACE_START           \
+                                          NGX_HTTP_V2_PREFACE_END
+
 
 u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len,
     u_char *tmp, ngx_uint_t lower);
 
 
+extern ngx_module_t  ngx_http_v2_module;
+
+
 #endif /* _NGX_HTTP_V2_H_INCLUDED_ */
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 5f8626a..1e2cafa 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -27,39 +27,8 @@
 #define NGX_HTTP_V2_NO_TRAILERS           (ngx_http_v2_out_frame_t *) -1
 
 
-typedef struct {
-    ngx_str_t      name;
-    u_char         index;
-    ngx_uint_t     offset;
-} ngx_http_v2_push_header_t;
-
-
-static ngx_http_v2_push_header_t  ngx_http_v2_push_headers[] = {
-    { ngx_string(":authority"), NGX_HTTP_V2_AUTHORITY_INDEX,
-      offsetof(ngx_http_headers_in_t, host) },
-
-    { ngx_string("accept-encoding"), NGX_HTTP_V2_ACCEPT_ENCODING_INDEX,
-      offsetof(ngx_http_headers_in_t, accept_encoding) },
-
-    { ngx_string("accept-language"), NGX_HTTP_V2_ACCEPT_LANGUAGE_INDEX,
-      offsetof(ngx_http_headers_in_t, accept_language) },
-
-    { ngx_string("user-agent"), NGX_HTTP_V2_USER_AGENT_INDEX,
-      offsetof(ngx_http_headers_in_t, user_agent) },
-};
-
-#define NGX_HTTP_V2_PUSH_HEADERS                                              \
-    (sizeof(ngx_http_v2_push_headers) / sizeof(ngx_http_v2_push_header_t))
-
-
-static ngx_int_t ngx_http_v2_push_resources(ngx_http_request_t *r);
-static ngx_int_t ngx_http_v2_push_resource(ngx_http_request_t *r,
-    ngx_str_t *path, ngx_str_t *binary);
-
 static ngx_http_v2_out_frame_t *ngx_http_v2_create_headers_frame(
     ngx_http_request_t *r, u_char *pos, u_char *end, ngx_uint_t fin);
-static ngx_http_v2_out_frame_t *ngx_http_v2_create_push_frame(
-    ngx_http_request_t *r, u_char *pos, u_char *end);
 static ngx_http_v2_out_frame_t *ngx_http_v2_create_trailers_frame(
     ngx_http_request_t *r);
 
@@ -82,8 +51,6 @@ static ngx_inline ngx_int_t ngx_http_v2_filter_send(
 
 static ngx_int_t ngx_http_v2_headers_frame_handler(
     ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
-static ngx_int_t ngx_http_v2_push_frame_handler(
-    ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
 static ngx_int_t ngx_http_v2_data_frame_handler(
     ngx_http_v2_connection_t *h2c, ngx_http_v2_out_frame_t *frame);
 static ngx_inline void ngx_http_v2_handle_frame(
@@ -244,15 +211,6 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 
     h2c = stream->connection;
 
-    if (!h2c->push_disabled && !h2c->goaway
-        && stream->node->id % 2 == 1
-        && r->method != NGX_HTTP_HEAD)
-    {
-        if (ngx_http_v2_push_resources(r) != NGX_OK) {
-            return NGX_ERROR;
-        }
-    }
-
     len = h2c->table_update ? 1 : 0;
 
     len += status ? 1 : 1 + ngx_http_v2_literal_size("418");
@@ -653,7 +611,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 
     ngx_http_v2_queue_blocked_frame(h2c, frame);
 
-    stream->queued++;
+    stream->queued = 1;
 
     cln = ngx_http_cleanup_add(r, 0);
     if (cln == NULL) {
@@ -671,409 +629,6 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
 }
 
 
-static ngx_int_t
-ngx_http_v2_push_resources(ngx_http_request_t *r)
-{
-    u_char                    *start, *end, *last;
-    ngx_int_t                  rc;
-    ngx_str_t                  path;
-    ngx_uint_t                 i, push;
-    ngx_table_elt_t           *h;
-    ngx_http_v2_loc_conf_t    *h2lcf;
-    ngx_http_complex_value_t  *pushes;
-    ngx_str_t                  binary[NGX_HTTP_V2_PUSH_HEADERS];
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http2 push resources");
-
-    ngx_memzero(binary, NGX_HTTP_V2_PUSH_HEADERS * sizeof(ngx_str_t));
-
-    h2lcf = ngx_http_get_module_loc_conf(r, ngx_http_v2_module);
-
-    if (h2lcf->pushes) {
-        pushes = h2lcf->pushes->elts;
-
-        for (i = 0; i < h2lcf->pushes->nelts; i++) {
-
-            if (ngx_http_complex_value(r, &pushes[i], &path) != NGX_OK) {
-                return NGX_ERROR;
-            }
-
-            if (path.len == 0) {
-                continue;
-            }
-
-            if (path.len == 3 && ngx_strncmp(path.data, "off", 3) == 0) {
-                continue;
-            }
-
-            rc = ngx_http_v2_push_resource(r, &path, binary);
-
-            if (rc == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            if (rc == NGX_ABORT) {
-                return NGX_OK;
-            }
-
-            /* NGX_OK, NGX_DECLINED */
-        }
-    }
-
-    if (!h2lcf->push_preload) {
-        return NGX_OK;
-    }
-
-    for (h = r->headers_out.link; h; h = h->next) {
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http2 parse link: \"%V\"", &h->value);
-
-        start = h->value.data;
-        end = h->value.data + h->value.len;
-
-    next_link:
-
-        while (start < end && *start == ' ') { start++; }
-
-        if (start == end || *start++ != '<') {
-            continue;
-        }
-
-        while (start < end && *start == ' ') { start++; }
-
-        for (last = start; last < end && *last != '>'; last++) {
-            /* void */
-        }
-
-        if (last == start || last == end) {
-            continue;
-        }
-
-        path.len = last - start;
-        path.data = start;
-
-        start = last + 1;
-
-        while (start < end && *start == ' ') { start++; }
-
-        if (start == end) {
-            continue;
-        }
-
-        if (*start == ',') {
-            start++;
-            goto next_link;
-        }
-
-        if (*start++ != ';') {
-            continue;
-        }
-
-        last = ngx_strlchr(start, end, ',');
-
-        if (last == NULL) {
-            last = end;
-        }
-
-        push = 0;
-
-        for ( ;; ) {
-
-            while (start < last && *start == ' ') { start++; }
-
-            if (last - start >= 6
-                && ngx_strncasecmp(start, (u_char *) "nopush", 6) == 0)
-            {
-                start += 6;
-
-                if (start == last || *start == ' ' || *start == ';') {
-                    push = 0;
-                    break;
-                }
-
-                goto next_param;
-            }
-
-            if (last - start >= 11
-                && ngx_strncasecmp(start, (u_char *) "rel=preload", 11) == 0)
-            {
-                start += 11;
-
-                if (start == last || *start == ' ' || *start == ';') {
-                    push = 1;
-                }
-
-                goto next_param;
-            }
-
-            if (last - start >= 4
-                && ngx_strncasecmp(start, (u_char *) "rel=", 4) == 0)
-            {
-                start += 4;
-
-                while (start < last && *start == ' ') { start++; }
-
-                if (start == last || *start++ != '"') {
-                    goto next_param;
-                }
-
-                for ( ;; ) {
-
-                    while (start < last && *start == ' ') { start++; }
-
-                    if (last - start >= 7
-                        && ngx_strncasecmp(start, (u_char *) "preload", 7) == 0)
-                    {
-                        start += 7;
-
-                        if (start < last && (*start == ' ' || *start == '"')) {
-                            push = 1;
-                            break;
-                        }
-                    }
-
-                    while (start < last && *start != ' ' && *start != '"') {
-                        start++;
-                    }
-
-                    if (start == last) {
-                        break;
-                    }
-
-                    if (*start == '"') {
-                        break;
-                    }
-
-                    start++;
-                }
-            }
-
-        next_param:
-
-            start = ngx_strlchr(start, last, ';');
-
-            if (start == NULL) {
-                break;
-            }
-
-            start++;
-        }
-
-        if (push) {
-            while (path.len && path.data[path.len - 1] == ' ') {
-                path.len--;
-            }
-        }
-
-        if (push && path.len
-            && !(path.len > 1 && path.data[0] == '/' && path.data[1] == '/'))
-        {
-            rc = ngx_http_v2_push_resource(r, &path, binary);
-
-            if (rc == NGX_ERROR) {
-                return NGX_ERROR;
-            }
-
-            if (rc == NGX_ABORT) {
-                return NGX_OK;
-            }
-
-            /* NGX_OK, NGX_DECLINED */
-        }
-
-        if (last < end) {
-            start = last + 1;
-            goto next_link;
-        }
-    }
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
-ngx_http_v2_push_resource(ngx_http_request_t *r, ngx_str_t *path,
-    ngx_str_t *binary)
-{
-    u_char                      *start, *pos, *tmp;
-    size_t                       len;
-    ngx_str_t                   *value;
-    ngx_uint_t                   i;
-    ngx_table_elt_t            **h;
-    ngx_connection_t            *fc;
-    ngx_http_v2_stream_t        *stream;
-    ngx_http_v2_out_frame_t     *frame;
-    ngx_http_v2_connection_t    *h2c;
-    ngx_http_v2_push_header_t   *ph;
-
-    fc = r->connection;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0, "http2 push resource");
-
-    stream = r->stream;
-    h2c = stream->connection;
-
-    if (!ngx_path_separator(path->data[0])) {
-        ngx_log_error(NGX_LOG_WARN, fc->log, 0,
-                      "non-absolute path \"%V\" not pushed", path);
-        return NGX_DECLINED;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2 pushing:%ui limit:%ui",
-                   h2c->pushing, h2c->concurrent_pushes);
-
-    if (h2c->pushing >= h2c->concurrent_pushes) {
-        return NGX_ABORT;
-    }
-
-    if (h2c->last_push == 0x7ffffffe) {
-        return NGX_ABORT;
-    }
-
-    if (path->len > NGX_HTTP_V2_MAX_FIELD) {
-        return NGX_DECLINED;
-    }
-
-    if (r->headers_in.host == NULL) {
-        return NGX_ABORT;
-    }
-
-    ph = ngx_http_v2_push_headers;
-
-    len = ngx_max(r->schema.len, path->len);
-
-    if (binary[0].len) {
-        tmp = ngx_palloc(r->pool, len);
-        if (tmp == NULL) {
-            return NGX_ERROR;
-        }
-
-    } else {
-        for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
-            h = (ngx_table_elt_t **) ((char *) &r->headers_in + ph[i].offset);
-
-            if (*h) {
-                len = ngx_max(len, (*h)->value.len);
-            }
-        }
-
-        tmp = ngx_palloc(r->pool, len);
-        if (tmp == NULL) {
-            return NGX_ERROR;
-        }
-
-        for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
-            h = (ngx_table_elt_t **) ((char *) &r->headers_in + ph[i].offset);
-
-            if (*h == NULL) {
-                continue;
-            }
-
-            value = &(*h)->value;
-
-            len = 1 + NGX_HTTP_V2_INT_OCTETS + value->len;
-
-            pos = ngx_pnalloc(r->pool, len);
-            if (pos == NULL) {
-                return NGX_ERROR;
-            }
-
-            binary[i].data = pos;
-
-            *pos++ = ngx_http_v2_inc_indexed(ph[i].index);
-            pos = ngx_http_v2_write_value(pos, value->data, value->len, tmp);
-
-            binary[i].len = pos - binary[i].data;
-        }
-    }
-
-    len = (h2c->table_update ? 1 : 0)
-          + 1
-          + 1 + NGX_HTTP_V2_INT_OCTETS + path->len
-          + 1 + NGX_HTTP_V2_INT_OCTETS + r->schema.len;
-
-    for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
-        len += binary[i].len;
-    }
-
-    pos = ngx_pnalloc(r->pool, len);
-    if (pos == NULL) {
-        return NGX_ERROR;
-    }
-
-    start = pos;
-
-    if (h2c->table_update) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-                       "http2 table size update: 0");
-        *pos++ = (1 << 5) | 0;
-        h2c->table_update = 0;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-                   "http2 push header: \":method: GET\"");
-
-    *pos++ = ngx_http_v2_indexed(NGX_HTTP_V2_METHOD_GET_INDEX);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-                   "http2 push header: \":path: %V\"", path);
-
-    *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_PATH_INDEX);
-    pos = ngx_http_v2_write_value(pos, path->data, path->len, tmp);
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-                   "http2 push header: \":scheme: %V\"", &r->schema);
-
-    if (r->schema.len == 5 && ngx_strncmp(r->schema.data, "https", 5) == 0) {
-        *pos++ = ngx_http_v2_indexed(NGX_HTTP_V2_SCHEME_HTTPS_INDEX);
-
-    } else if (r->schema.len == 4
-               && ngx_strncmp(r->schema.data, "http", 4) == 0)
-    {
-        *pos++ = ngx_http_v2_indexed(NGX_HTTP_V2_SCHEME_HTTP_INDEX);
-
-    } else {
-        *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SCHEME_HTTP_INDEX);
-        pos = ngx_http_v2_write_value(pos, r->schema.data, r->schema.len, tmp);
-    }
-
-    for (i = 0; i < NGX_HTTP_V2_PUSH_HEADERS; i++) {
-        h = (ngx_table_elt_t **) ((char *) &r->headers_in + ph[i].offset);
-
-        if (*h == NULL) {
-            continue;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, fc->log, 0,
-                       "http2 push header: \"%V: %V\"",
-                       &ph[i].name, &(*h)->value);
-
-        pos = ngx_cpymem(pos, binary[i].data, binary[i].len);
-    }
-
-    frame = ngx_http_v2_create_push_frame(r, start, pos);
-    if (frame == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_http_v2_queue_blocked_frame(h2c, frame);
-
-    stream->queued++;
-
-    stream = ngx_http_v2_push_stream(stream, path);
-
-    if (stream) {
-        stream->request->request_length = pos - start;
-        return NGX_OK;
-    }
-
-    return NGX_ERROR;
-}
-
-
 static ngx_http_v2_out_frame_t *
 ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
     u_char *end, ngx_uint_t fin)
@@ -1179,125 +734,6 @@ ngx_http_v2_create_headers_frame(ngx_http_request_t *r, u_char *pos,
 }
 
 
-static ngx_http_v2_out_frame_t *
-ngx_http_v2_create_push_frame(ngx_http_request_t *r, u_char *pos, u_char *end)
-{
-    u_char                     type, flags;
-    size_t                     rest, frame_size, len;
-    ngx_buf_t                 *b;
-    ngx_chain_t               *cl, **ll;
-    ngx_http_v2_stream_t      *stream;
-    ngx_http_v2_out_frame_t   *frame;
-    ngx_http_v2_connection_t  *h2c;
-
-    stream = r->stream;
-    h2c = stream->connection;
-    rest = NGX_HTTP_V2_STREAM_ID_SIZE + (end - pos);
-
-    frame = ngx_palloc(r->pool, sizeof(ngx_http_v2_out_frame_t));
-    if (frame == NULL) {
-        return NULL;
-    }
-
-    frame->handler = ngx_http_v2_push_frame_handler;
-    frame->stream = stream;
-    frame->length = rest;
-    frame->blocked = 1;
-    frame->fin = 0;
-
-    ll = &frame->first;
-
-    type = NGX_HTTP_V2_PUSH_PROMISE_FRAME;
-    flags = NGX_HTTP_V2_NO_FLAG;
-    frame_size = h2c->frame_size;
-
-    for ( ;; ) {
-        if (rest <= frame_size) {
-            frame_size = rest;
-            flags |= NGX_HTTP_V2_END_HEADERS_FLAG;
-        }
-
-        b = ngx_create_temp_buf(r->pool,
-                                NGX_HTTP_V2_FRAME_HEADER_SIZE
-                                + ((type == NGX_HTTP_V2_PUSH_PROMISE_FRAME)
-                                   ? NGX_HTTP_V2_STREAM_ID_SIZE : 0));
-        if (b == NULL) {
-            return NULL;
-        }
-
-        b->last = ngx_http_v2_write_len_and_type(b->last, frame_size, type);
-        *b->last++ = flags;
-        b->last = ngx_http_v2_write_sid(b->last, stream->node->id);
-
-        b->tag = (ngx_buf_tag_t) &ngx_http_v2_module;
-
-        if (type == NGX_HTTP_V2_PUSH_PROMISE_FRAME) {
-            h2c->last_push += 2;
-
-            b->last = ngx_http_v2_write_sid(b->last, h2c->last_push);
-            len = frame_size - NGX_HTTP_V2_STREAM_ID_SIZE;
-
-        } else {
-            len = frame_size;
-        }
-
-        cl = ngx_alloc_chain_link(r->pool);
-        if (cl == NULL) {
-            return NULL;
-        }
-
-        cl->buf = b;
-
-        *ll = cl;
-        ll = &cl->next;
-
-        b = ngx_calloc_buf(r->pool);
-        if (b == NULL) {
-            return NULL;
-        }
-
-        b->pos = pos;
-
-        pos += len;
-
-        b->last = pos;
-        b->start = b->pos;
-        b->end = b->last;
-        b->temporary = 1;
-
-        cl = ngx_alloc_chain_link(r->pool);
-        if (cl == NULL) {
-            return NULL;
-        }
-
-        cl->buf = b;
-
-        *ll = cl;
-        ll = &cl->next;
-
-        rest -= frame_size;
-
-        if (rest) {
-            frame->length += NGX_HTTP_V2_FRAME_HEADER_SIZE;
-
-            type = NGX_HTTP_V2_CONTINUATION_FRAME;
-            continue;
-        }
-
-        cl->next = NULL;
-        frame->last = cl;
-
-        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http2:%ui create PUSH_PROMISE frame %p: "
-                       "sid:%ui len:%uz",
-                       stream->node->id, frame, h2c->last_push,
-                       frame->length);
-
-        return frame;
-    }
-}
-
-
 static ngx_http_v2_out_frame_t *
 ngx_http_v2_create_trailers_frame(ngx_http_request_t *r)
 {
@@ -1901,62 +1337,6 @@ ngx_http_v2_headers_frame_handler(ngx_http_v2_connection_t *h2c,
 }
 
 
-static ngx_int_t
-ngx_http_v2_push_frame_handler(ngx_http_v2_connection_t *h2c,
-    ngx_http_v2_out_frame_t *frame)
-{
-    ngx_chain_t           *cl, *ln;
-    ngx_http_v2_stream_t  *stream;
-
-    stream = frame->stream;
-    cl = frame->first;
-
-    for ( ;; ) {
-        if (cl->buf->pos != cl->buf->last) {
-            frame->first = cl;
-
-            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                           "http2:%ui PUSH_PROMISE frame %p was sent partially",
-                           stream->node->id, frame);
-
-            return NGX_AGAIN;
-        }
-
-        ln = cl->next;
-
-        if (cl->buf->tag == (ngx_buf_tag_t) &ngx_http_v2_module) {
-            cl->next = stream->free_frame_headers;
-            stream->free_frame_headers = cl;
-
-        } else {
-            cl->next = stream->free_bufs;
-            stream->free_bufs = cl;
-        }
-
-        if (cl == frame->last) {
-            break;
-        }
-
-        cl = ln;
-    }
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                   "http2:%ui PUSH_PROMISE frame %p was sent",
-                   stream->node->id, frame);
-
-    stream->request->header_size += NGX_HTTP_V2_FRAME_HEADER_SIZE
-                                    + frame->length;
-
-    h2c->payload_bytes += frame->length;
-
-    ngx_http_v2_handle_frame(stream, frame);
-
-    ngx_http_v2_handle_stream(h2c, stream);
-
-    return NGX_OK;
-}
-
-
 static ngx_int_t
 ngx_http_v2_data_frame_handler(ngx_http_v2_connection_t *h2c,
     ngx_http_v2_out_frame_t *frame)
diff --git a/src/http/v2/ngx_http_v2_module.c b/src/http/v2/ngx_http_v2_module.c
index 0050886..d64488c 100644
--- a/src/http/v2/ngx_http_v2_module.c
+++ b/src/http/v2/ngx_http_v2_module.c
@@ -27,8 +27,6 @@ static void *ngx_http_v2_create_loc_conf(ngx_conf_t *cf);
 static char *ngx_http_v2_merge_loc_conf(ngx_conf_t *cf, void *parent,
     void *child);
 
-static char *ngx_http_v2_push(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-
 static char *ngx_http_v2_recv_buffer_size(ngx_conf_t *cf, void *post,
     void *data);
 static char *ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data);
@@ -75,6 +73,13 @@ static ngx_conf_post_t  ngx_http_v2_chunk_size_post =
 
 static ngx_command_t  ngx_http_v2_commands[] = {
 
+    { ngx_string("http2"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v2_srv_conf_t, enable),
+      NULL },
+
     { ngx_string("http2_recv_buffer_size"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_size_slot,
@@ -98,9 +103,9 @@ static ngx_command_t  ngx_http_v2_commands[] = {
 
     { ngx_string("http2_max_concurrent_pushes"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v2_srv_conf_t, concurrent_pushes),
+      ngx_http_v2_obsolete,
+      0,
+      0,
       NULL },
 
     { ngx_string("http2_max_requests"),
@@ -161,15 +166,15 @@ static ngx_command_t  ngx_http_v2_commands[] = {
 
     { ngx_string("http2_push_preload"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_http_v2_loc_conf_t, push_preload),
+      ngx_http_v2_obsolete,
+      0,
+      0,
       NULL },
 
     { ngx_string("http2_push"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_http_v2_push,
-      NGX_HTTP_LOC_CONF_OFFSET,
+      ngx_http_v2_obsolete,
+      0,
       0,
       NULL },
 
@@ -314,10 +319,11 @@ ngx_http_v2_create_srv_conf(ngx_conf_t *cf)
         return NULL;
     }
 
+    h2scf->enable = NGX_CONF_UNSET;
+
     h2scf->pool_size = NGX_CONF_UNSET_SIZE;
 
     h2scf->concurrent_streams = NGX_CONF_UNSET_UINT;
-    h2scf->concurrent_pushes = NGX_CONF_UNSET_UINT;
 
     h2scf->preread_size = NGX_CONF_UNSET_SIZE;
 
@@ -333,12 +339,12 @@ ngx_http_v2_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_http_v2_srv_conf_t *prev = parent;
     ngx_http_v2_srv_conf_t *conf = child;
 
+    ngx_conf_merge_value(conf->enable, prev->enable, 0);
+
     ngx_conf_merge_size_value(conf->pool_size, prev->pool_size, 4096);
 
     ngx_conf_merge_uint_value(conf->concurrent_streams,
                               prev->concurrent_streams, 128);
-    ngx_conf_merge_uint_value(conf->concurrent_pushes,
-                              prev->concurrent_pushes, 10);
 
     ngx_conf_merge_size_value(conf->preread_size, prev->preread_size, 65536);
 
@@ -359,17 +365,8 @@ ngx_http_v2_create_loc_conf(ngx_conf_t *cf)
         return NULL;
     }
 
-    /*
-     * set by ngx_pcalloc():
-     *
-     *     h2lcf->pushes = NULL;
-     */
-
     h2lcf->chunk_size = NGX_CONF_UNSET_SIZE;
 
-    h2lcf->push_preload = NGX_CONF_UNSET;
-    h2lcf->push = NGX_CONF_UNSET;
-
     return h2lcf;
 }
 
@@ -382,72 +379,6 @@ ngx_http_v2_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_size_value(conf->chunk_size, prev->chunk_size, 8 * 1024);
 
-    ngx_conf_merge_value(conf->push, prev->push, 1);
-
-    if (conf->push && conf->pushes == NULL) {
-        conf->pushes = prev->pushes;
-    }
-
-    ngx_conf_merge_value(conf->push_preload, prev->push_preload, 0);
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_v2_push(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_http_v2_loc_conf_t *h2lcf = conf;
-
-    ngx_str_t                         *value;
-    ngx_http_complex_value_t          *cv;
-    ngx_http_compile_complex_value_t   ccv;
-
-    value = cf->args->elts;
-
-    if (ngx_strcmp(value[1].data, "off") == 0) {
-
-        if (h2lcf->pushes) {
-            return "\"off\" parameter cannot be used with URI";
-        }
-
-        if (h2lcf->push == 0) {
-            return "is duplicate";
-        }
-
-        h2lcf->push = 0;
-        return NGX_CONF_OK;
-    }
-
-    if (h2lcf->push == 0) {
-        return "URI cannot be used with \"off\" parameter";
-    }
-
-    h2lcf->push = 1;
-
-    if (h2lcf->pushes == NULL) {
-        h2lcf->pushes = ngx_array_create(cf->pool, 1,
-                                         sizeof(ngx_http_complex_value_t));
-        if (h2lcf->pushes == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    cv = ngx_array_push(h2lcf->pushes);
-    if (cv == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
-
-    ccv.cf = cf;
-    ccv.value = &value[1];
-    ccv.complex_value = cv;
-
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
     return NGX_CONF_OK;
 }
 
@@ -457,7 +388,7 @@ ngx_http_v2_recv_buffer_size(ngx_conf_t *cf, void *post, void *data)
 {
     size_t *sp = data;
 
-    if (*sp <= 2 * NGX_HTTP_V2_STATE_BUFFER_SIZE) {
+    if (*sp <= NGX_HTTP_V2_STATE_BUFFER_SIZE) {
         return "value is too small";
     }
 
@@ -551,10 +482,17 @@ ngx_http_v2_obsolete(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_conf_deprecated_t  *d = cmd->post;
 
-    ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                       "the \"%s\" directive is obsolete, "
-                       "use the \"%s\" directive instead",
-                       d->old_name, d->new_name);
+    if (d) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "the \"%s\" directive is obsolete, "
+                           "use the \"%s\" directive instead",
+                           d->old_name, d->new_name);
+
+    } else {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "the \"%V\" directive is obsolete, ignored",
+                           &cmd->name);
+    }
 
     return NGX_CONF_OK;
 }
diff --git a/src/http/v2/ngx_http_v2_module.h b/src/http/v2/ngx_http_v2_module.h
index ca4a0bf..07a595c 100644
--- a/src/http/v2/ngx_http_v2_module.h
+++ b/src/http/v2/ngx_http_v2_module.h
@@ -20,26 +20,9 @@ typedef struct {
 } ngx_http_v2_main_conf_t;
 
 
-typedef struct {
-    size_t                          pool_size;
-    ngx_uint_t                      concurrent_streams;
-    ngx_uint_t                      concurrent_pushes;
-    size_t                          preread_size;
-    ngx_uint_t                      streams_index_mask;
-} ngx_http_v2_srv_conf_t;
-
-
 typedef struct {
     size_t                          chunk_size;
-
-    ngx_flag_t                      push_preload;
-
-    ngx_flag_t                      push;
-    ngx_array_t                    *pushes;
 } ngx_http_v2_loc_conf_t;
 
 
-extern ngx_module_t  ngx_http_v2_module;
-
-
 #endif /* _NGX_HTTP_V2_MODULE_H_INCLUDED_ */
diff --git a/src/http/v3/ngx_http_v3.c b/src/http/v3/ngx_http_v3.c
new file mode 100644
index 0000000..8db229b
--- /dev/null
+++ b/src/http/v3/ngx_http_v3.c
@@ -0,0 +1,111 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+static void ngx_http_v3_keepalive_handler(ngx_event_t *ev);
+static void ngx_http_v3_cleanup_session(void *data);
+
+
+ngx_int_t
+ngx_http_v3_init_session(ngx_connection_t *c)
+{
+    ngx_pool_cleanup_t     *cln;
+    ngx_http_connection_t  *hc;
+    ngx_http_v3_session_t  *h3c;
+
+    hc = c->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 init session");
+
+    h3c = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_session_t));
+    if (h3c == NULL) {
+        goto failed;
+    }
+
+    h3c->http_connection = hc;
+
+    ngx_queue_init(&h3c->blocked);
+
+    h3c->keepalive.log = c->log;
+    h3c->keepalive.data = c;
+    h3c->keepalive.handler = ngx_http_v3_keepalive_handler;
+
+    h3c->table.send_insert_count.log = c->log;
+    h3c->table.send_insert_count.data = c;
+    h3c->table.send_insert_count.handler = ngx_http_v3_inc_insert_count_handler;
+
+    cln = ngx_pool_cleanup_add(c->pool, 0);
+    if (cln == NULL) {
+        goto failed;
+    }
+
+    cln->handler = ngx_http_v3_cleanup_session;
+    cln->data = h3c;
+
+    c->data = h3c;
+
+    return NGX_OK;
+
+failed:
+
+    ngx_log_error(NGX_LOG_ERR, c->log, 0, "failed to create http3 session");
+    return NGX_ERROR;
+}
+
+
+static void
+ngx_http_v3_keepalive_handler(ngx_event_t *ev)
+{
+    ngx_connection_t  *c;
+
+    c = ev->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 keepalive handler");
+
+    ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_NO_ERROR,
+                                    "keepalive timeout");
+}
+
+
+static void
+ngx_http_v3_cleanup_session(void *data)
+{
+    ngx_http_v3_session_t  *h3c = data;
+
+    ngx_http_v3_cleanup_table(h3c);
+
+    if (h3c->keepalive.timer_set) {
+        ngx_del_timer(&h3c->keepalive);
+    }
+
+    if (h3c->table.send_insert_count.posted) {
+        ngx_delete_posted_event(&h3c->table.send_insert_count);
+    }
+}
+
+
+ngx_int_t
+ngx_http_v3_check_flood(ngx_connection_t *c)
+{
+    ngx_http_v3_session_t  *h3c;
+
+    h3c = ngx_http_v3_get_session(c);
+
+    if (h3c->total_bytes / 8 > h3c->payload_bytes + 1048576) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0, "http3 flood detected");
+
+        ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_NO_ERROR,
+                                        "HTTP/3 flood detected");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
diff --git a/src/http/v3/ngx_http_v3.h b/src/http/v3/ngx_http_v3.h
new file mode 100644
index 0000000..9dcb5e6
--- /dev/null
+++ b/src/http/v3/ngx_http_v3.h
@@ -0,0 +1,160 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_HTTP_V3_H_INCLUDED_
+#define _NGX_HTTP_V3_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+#include <ngx_http_v3_parse.h>
+#include <ngx_http_v3_encode.h>
+#include <ngx_http_v3_uni.h>
+#include <ngx_http_v3_table.h>
+
+
+#define NGX_HTTP_V3_ALPN_PROTO                     "\x02h3"
+#define NGX_HTTP_V3_HQ_ALPN_PROTO                  "\x0Ahq-interop"
+#define NGX_HTTP_V3_HQ_PROTO                       "hq-interop"
+
+#define NGX_HTTP_V3_VARLEN_INT_LEN                 4
+#define NGX_HTTP_V3_PREFIX_INT_LEN                 11
+
+#define NGX_HTTP_V3_STREAM_CONTROL                 0x00
+#define NGX_HTTP_V3_STREAM_PUSH                    0x01
+#define NGX_HTTP_V3_STREAM_ENCODER                 0x02
+#define NGX_HTTP_V3_STREAM_DECODER                 0x03
+
+#define NGX_HTTP_V3_FRAME_DATA                     0x00
+#define NGX_HTTP_V3_FRAME_HEADERS                  0x01
+#define NGX_HTTP_V3_FRAME_CANCEL_PUSH              0x03
+#define NGX_HTTP_V3_FRAME_SETTINGS                 0x04
+#define NGX_HTTP_V3_FRAME_PUSH_PROMISE             0x05
+#define NGX_HTTP_V3_FRAME_GOAWAY                   0x07
+#define NGX_HTTP_V3_FRAME_MAX_PUSH_ID              0x0d
+
+#define NGX_HTTP_V3_PARAM_MAX_TABLE_CAPACITY       0x01
+#define NGX_HTTP_V3_PARAM_MAX_FIELD_SECTION_SIZE   0x06
+#define NGX_HTTP_V3_PARAM_BLOCKED_STREAMS          0x07
+
+#define NGX_HTTP_V3_MAX_TABLE_CAPACITY             4096
+
+#define NGX_HTTP_V3_STREAM_CLIENT_CONTROL          0
+#define NGX_HTTP_V3_STREAM_SERVER_CONTROL          1
+#define NGX_HTTP_V3_STREAM_CLIENT_ENCODER          2
+#define NGX_HTTP_V3_STREAM_SERVER_ENCODER          3
+#define NGX_HTTP_V3_STREAM_CLIENT_DECODER          4
+#define NGX_HTTP_V3_STREAM_SERVER_DECODER          5
+#define NGX_HTTP_V3_MAX_KNOWN_STREAM               6
+#define NGX_HTTP_V3_MAX_UNI_STREAMS                3
+
+/* HTTP/3 errors */
+#define NGX_HTTP_V3_ERR_NO_ERROR                   0x100
+#define NGX_HTTP_V3_ERR_GENERAL_PROTOCOL_ERROR     0x101
+#define NGX_HTTP_V3_ERR_INTERNAL_ERROR             0x102
+#define NGX_HTTP_V3_ERR_STREAM_CREATION_ERROR      0x103
+#define NGX_HTTP_V3_ERR_CLOSED_CRITICAL_STREAM     0x104
+#define NGX_HTTP_V3_ERR_FRAME_UNEXPECTED           0x105
+#define NGX_HTTP_V3_ERR_FRAME_ERROR                0x106
+#define NGX_HTTP_V3_ERR_EXCESSIVE_LOAD             0x107
+#define NGX_HTTP_V3_ERR_ID_ERROR                   0x108
+#define NGX_HTTP_V3_ERR_SETTINGS_ERROR             0x109
+#define NGX_HTTP_V3_ERR_MISSING_SETTINGS           0x10a
+#define NGX_HTTP_V3_ERR_REQUEST_REJECTED           0x10b
+#define NGX_HTTP_V3_ERR_REQUEST_CANCELLED          0x10c
+#define NGX_HTTP_V3_ERR_REQUEST_INCOMPLETE         0x10d
+#define NGX_HTTP_V3_ERR_CONNECT_ERROR              0x10f
+#define NGX_HTTP_V3_ERR_VERSION_FALLBACK           0x110
+
+/* QPACK errors */
+#define NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED       0x200
+#define NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR       0x201
+#define NGX_HTTP_V3_ERR_DECODER_STREAM_ERROR       0x202
+
+
+#define ngx_http_v3_get_session(c)                                            \
+    ((ngx_http_v3_session_t *) ((c)->quic ? (c)->quic->parent->data           \
+                                          : (c)->data))
+
+#define ngx_http_quic_get_connection(c)                                       \
+    (ngx_http_v3_get_session(c)->http_connection)
+
+#define ngx_http_v3_get_module_loc_conf(c, module)                            \
+    ngx_http_get_module_loc_conf(ngx_http_quic_get_connection(c)->conf_ctx,   \
+                                 module)
+
+#define ngx_http_v3_get_module_srv_conf(c, module)                            \
+    ngx_http_get_module_srv_conf(ngx_http_quic_get_connection(c)->conf_ctx,   \
+                                 module)
+
+#define ngx_http_v3_finalize_connection(c, code, reason)                      \
+    ngx_quic_finalize_connection((c)->quic ? (c)->quic->parent : (c),         \
+                                 code, reason)
+
+#define ngx_http_v3_shutdown_connection(c, code, reason)                      \
+    ngx_quic_shutdown_connection((c)->quic ? (c)->quic->parent : (c),         \
+                                 code, reason)
+
+
+typedef struct {
+    ngx_flag_t                    enable;
+    ngx_flag_t                    enable_hq;
+    size_t                        max_table_capacity;
+    ngx_uint_t                    max_blocked_streams;
+    ngx_uint_t                    max_concurrent_streams;
+    ngx_quic_conf_t               quic;
+} ngx_http_v3_srv_conf_t;
+
+
+struct ngx_http_v3_parse_s {
+    size_t                        header_limit;
+    ngx_http_v3_parse_headers_t   headers;
+    ngx_http_v3_parse_data_t      body;
+    ngx_array_t                  *cookies;
+};
+
+
+struct ngx_http_v3_session_s {
+    ngx_http_connection_t        *http_connection;
+
+    ngx_http_v3_dynamic_table_t   table;
+
+    ngx_event_t                   keepalive;
+    ngx_uint_t                    nrequests;
+
+    ngx_queue_t                   blocked;
+    ngx_uint_t                    nblocked;
+
+    uint64_t                      next_request_id;
+
+    off_t                         total_bytes;
+    off_t                         payload_bytes;
+
+    unsigned                      goaway:1;
+    unsigned                      hq:1;
+
+    ngx_connection_t             *known_streams[NGX_HTTP_V3_MAX_KNOWN_STREAM];
+};
+
+
+void ngx_http_v3_init_stream(ngx_connection_t *c);
+void ngx_http_v3_reset_stream(ngx_connection_t *c);
+ngx_int_t ngx_http_v3_init_session(ngx_connection_t *c);
+ngx_int_t ngx_http_v3_check_flood(ngx_connection_t *c);
+ngx_int_t ngx_http_v3_init(ngx_connection_t *c);
+void ngx_http_v3_shutdown(ngx_connection_t *c);
+
+ngx_int_t ngx_http_v3_read_request_body(ngx_http_request_t *r);
+ngx_int_t ngx_http_v3_read_unbuffered_request_body(ngx_http_request_t *r);
+
+
+extern ngx_module_t  ngx_http_v3_module;
+
+
+#endif /* _NGX_HTTP_V3_H_INCLUDED_ */
diff --git a/src/http/v3/ngx_http_v3_encode.c b/src/http/v3/ngx_http_v3_encode.c
new file mode 100644
index 0000000..fb089c4
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_encode.c
@@ -0,0 +1,304 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+uintptr_t
+ngx_http_v3_encode_varlen_int(u_char *p, uint64_t value)
+{
+    if (value <= 63) {
+        if (p == NULL) {
+            return 1;
+        }
+
+        *p++ = value;
+        return (uintptr_t) p;
+    }
+
+    if (value <= 16383) {
+        if (p == NULL) {
+            return 2;
+        }
+
+        *p++ = 0x40 | (value >> 8);
+        *p++ = value;
+        return (uintptr_t) p;
+    }
+
+    if (value <= 1073741823) {
+        if (p == NULL) {
+            return 4;
+        }
+
+        *p++ = 0x80 | (value >> 24);
+        *p++ = (value >> 16);
+        *p++ = (value >> 8);
+        *p++ = value;
+        return (uintptr_t) p;
+    }
+
+    if (p == NULL) {
+        return 8;
+    }
+
+    *p++ = 0xc0 | (value >> 56);
+    *p++ = (value >> 48);
+    *p++ = (value >> 40);
+    *p++ = (value >> 32);
+    *p++ = (value >> 24);
+    *p++ = (value >> 16);
+    *p++ = (value >> 8);
+    *p++ = value;
+    return (uintptr_t) p;
+}
+
+
+uintptr_t
+ngx_http_v3_encode_prefix_int(u_char *p, uint64_t value, ngx_uint_t prefix)
+{
+    ngx_uint_t  thresh, n;
+
+    thresh = (1 << prefix) - 1;
+
+    if (value < thresh) {
+        if (p == NULL) {
+            return 1;
+        }
+
+        *p++ |= value;
+        return (uintptr_t) p;
+    }
+
+    value -= thresh;
+
+    if (p == NULL) {
+        for (n = 2; value >= 128; n++) {
+            value >>= 7;
+        }
+
+        return n;
+    }
+
+    *p++ |= thresh;
+
+    while (value >= 128) {
+        *p++ = 0x80 | value;
+        value >>= 7;
+    }
+
+    *p++ = value;
+
+    return (uintptr_t) p;
+}
+
+
+uintptr_t
+ngx_http_v3_encode_field_section_prefix(u_char *p, ngx_uint_t insert_count,
+    ngx_uint_t sign, ngx_uint_t delta_base)
+{
+    if (p == NULL) {
+        return ngx_http_v3_encode_prefix_int(NULL, insert_count, 8)
+               + ngx_http_v3_encode_prefix_int(NULL, delta_base, 7);
+    }
+
+    *p = 0;
+    p = (u_char *) ngx_http_v3_encode_prefix_int(p, insert_count, 8);
+
+    *p = sign ? 0x80 : 0;
+    p = (u_char *) ngx_http_v3_encode_prefix_int(p, delta_base, 7);
+
+    return (uintptr_t) p;
+}
+
+
+uintptr_t
+ngx_http_v3_encode_field_ri(u_char *p, ngx_uint_t dynamic, ngx_uint_t index)
+{
+    /* Indexed Field Line */
+
+    if (p == NULL) {
+        return ngx_http_v3_encode_prefix_int(NULL, index, 6);
+    }
+
+    *p = dynamic ? 0x80 : 0xc0;
+
+    return ngx_http_v3_encode_prefix_int(p, index, 6);
+}
+
+
+uintptr_t
+ngx_http_v3_encode_field_lri(u_char *p, ngx_uint_t dynamic, ngx_uint_t index,
+    u_char *data, size_t len)
+{
+    size_t   hlen;
+    u_char  *p1, *p2;
+
+    /* Literal Field Line With Name Reference */
+
+    if (p == NULL) {
+        return ngx_http_v3_encode_prefix_int(NULL, index, 4)
+               + ngx_http_v3_encode_prefix_int(NULL, len, 7)
+               + len;
+    }
+
+    *p = dynamic ? 0x40 : 0x50;
+    p = (u_char *) ngx_http_v3_encode_prefix_int(p, index, 4);
+
+    p1 = p;
+    *p = 0;
+    p = (u_char *) ngx_http_v3_encode_prefix_int(p, len, 7);
+
+    if (data) {
+        p2 = p;
+        hlen = ngx_http_huff_encode(data, len, p, 0);
+
+        if (hlen) {
+            p = p1;
+            *p = 0x80;
+            p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 7);
+
+            if (p != p2) {
+                ngx_memmove(p, p2, hlen);
+            }
+
+            p += hlen;
+
+        } else {
+            p = ngx_cpymem(p, data, len);
+        }
+    }
+
+    return (uintptr_t) p;
+}
+
+
+uintptr_t
+ngx_http_v3_encode_field_l(u_char *p, ngx_str_t *name, ngx_str_t *value)
+{
+    size_t   hlen;
+    u_char  *p1, *p2;
+
+    /* Literal Field Line With Literal Name */
+
+    if (p == NULL) {
+        return ngx_http_v3_encode_prefix_int(NULL, name->len, 3)
+               + name->len
+               + ngx_http_v3_encode_prefix_int(NULL, value->len, 7)
+               + value->len;
+    }
+
+    p1 = p;
+    *p = 0x20;
+    p = (u_char *) ngx_http_v3_encode_prefix_int(p, name->len, 3);
+
+    p2 = p;
+    hlen = ngx_http_huff_encode(name->data, name->len, p, 1);
+
+    if (hlen) {
+        p = p1;
+        *p = 0x28;
+        p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 3);
+
+        if (p != p2) {
+            ngx_memmove(p, p2, hlen);
+        }
+
+        p += hlen;
+
+    } else {
+        ngx_strlow(p, name->data, name->len);
+        p += name->len;
+    }
+
+    p1 = p;
+    *p = 0;
+    p = (u_char *) ngx_http_v3_encode_prefix_int(p, value->len, 7);
+
+    p2 = p;
+    hlen = ngx_http_huff_encode(value->data, value->len, p, 0);
+
+    if (hlen) {
+        p = p1;
+        *p = 0x80;
+        p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 7);
+
+        if (p != p2) {
+            ngx_memmove(p, p2, hlen);
+        }
+
+        p += hlen;
+
+    } else {
+        p = ngx_cpymem(p, value->data, value->len);
+    }
+
+    return (uintptr_t) p;
+}
+
+
+uintptr_t
+ngx_http_v3_encode_field_pbi(u_char *p, ngx_uint_t index)
+{
+    /* Indexed Field Line With Post-Base Index */
+
+    if (p == NULL) {
+        return ngx_http_v3_encode_prefix_int(NULL, index, 4);
+    }
+
+    *p = 0x10;
+
+    return ngx_http_v3_encode_prefix_int(p, index, 4);
+}
+
+
+uintptr_t
+ngx_http_v3_encode_field_lpbi(u_char *p, ngx_uint_t index, u_char *data,
+    size_t len)
+{
+    size_t   hlen;
+    u_char  *p1, *p2;
+
+    /* Literal Field Line With Post-Base Name Reference */
+
+    if (p == NULL) {
+        return ngx_http_v3_encode_prefix_int(NULL, index, 3)
+               + ngx_http_v3_encode_prefix_int(NULL, len, 7)
+               + len;
+    }
+
+    *p = 0;
+    p = (u_char *) ngx_http_v3_encode_prefix_int(p, index, 3);
+
+    p1 = p;
+    *p = 0;
+    p = (u_char *) ngx_http_v3_encode_prefix_int(p, len, 7);
+
+    if (data) {
+        p2 = p;
+        hlen = ngx_http_huff_encode(data, len, p, 0);
+
+        if (hlen) {
+            p = p1;
+            *p = 0x80;
+            p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 7);
+
+            if (p != p2) {
+                ngx_memmove(p, p2, hlen);
+            }
+
+            p += hlen;
+
+        } else {
+            p = ngx_cpymem(p, data, len);
+        }
+    }
+
+    return (uintptr_t) p;
+}
diff --git a/src/http/v3/ngx_http_v3_encode.h b/src/http/v3/ngx_http_v3_encode.h
new file mode 100644
index 0000000..fca376d
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_encode.h
@@ -0,0 +1,34 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_HTTP_V3_ENCODE_H_INCLUDED_
+#define _NGX_HTTP_V3_ENCODE_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+uintptr_t ngx_http_v3_encode_varlen_int(u_char *p, uint64_t value);
+uintptr_t ngx_http_v3_encode_prefix_int(u_char *p, uint64_t value,
+    ngx_uint_t prefix);
+
+uintptr_t ngx_http_v3_encode_field_section_prefix(u_char *p,
+    ngx_uint_t insert_count, ngx_uint_t sign, ngx_uint_t delta_base);
+uintptr_t ngx_http_v3_encode_field_ri(u_char *p, ngx_uint_t dynamic,
+    ngx_uint_t index);
+uintptr_t ngx_http_v3_encode_field_lri(u_char *p, ngx_uint_t dynamic,
+    ngx_uint_t index, u_char *data, size_t len);
+uintptr_t ngx_http_v3_encode_field_l(u_char *p, ngx_str_t *name,
+    ngx_str_t *value);
+uintptr_t ngx_http_v3_encode_field_pbi(u_char *p, ngx_uint_t index);
+uintptr_t ngx_http_v3_encode_field_lpbi(u_char *p, ngx_uint_t index,
+    u_char *data, size_t len);
+
+
+#endif /* _NGX_HTTP_V3_ENCODE_H_INCLUDED_ */
diff --git a/src/http/v3/ngx_http_v3_filter_module.c b/src/http/v3/ngx_http_v3_filter_module.c
new file mode 100644
index 0000000..4d2276d
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_filter_module.c
@@ -0,0 +1,852 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+/* static table indices */
+#define NGX_HTTP_V3_HEADER_AUTHORITY                 0
+#define NGX_HTTP_V3_HEADER_PATH_ROOT                 1
+#define NGX_HTTP_V3_HEADER_CONTENT_LENGTH_ZERO       4
+#define NGX_HTTP_V3_HEADER_DATE                      6
+#define NGX_HTTP_V3_HEADER_LAST_MODIFIED             10
+#define NGX_HTTP_V3_HEADER_LOCATION                  12
+#define NGX_HTTP_V3_HEADER_METHOD_GET                17
+#define NGX_HTTP_V3_HEADER_SCHEME_HTTP               22
+#define NGX_HTTP_V3_HEADER_SCHEME_HTTPS              23
+#define NGX_HTTP_V3_HEADER_STATUS_200                25
+#define NGX_HTTP_V3_HEADER_ACCEPT_ENCODING           31
+#define NGX_HTTP_V3_HEADER_CONTENT_TYPE_TEXT_PLAIN   53
+#define NGX_HTTP_V3_HEADER_VARY_ACCEPT_ENCODING      59
+#define NGX_HTTP_V3_HEADER_ACCEPT_LANGUAGE           72
+#define NGX_HTTP_V3_HEADER_SERVER                    92
+#define NGX_HTTP_V3_HEADER_USER_AGENT                95
+
+
+typedef struct {
+    ngx_chain_t         *free;
+    ngx_chain_t         *busy;
+} ngx_http_v3_filter_ctx_t;
+
+
+static ngx_int_t ngx_http_v3_header_filter(ngx_http_request_t *r);
+static ngx_int_t ngx_http_v3_body_filter(ngx_http_request_t *r,
+    ngx_chain_t *in);
+static ngx_chain_t *ngx_http_v3_create_trailers(ngx_http_request_t *r,
+    ngx_http_v3_filter_ctx_t *ctx);
+static ngx_int_t ngx_http_v3_filter_init(ngx_conf_t *cf);
+
+
+static ngx_http_module_t  ngx_http_v3_filter_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_http_v3_filter_init,               /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    NULL,                                  /* create location configuration */
+    NULL                                   /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_v3_filter_module = {
+    NGX_MODULE_V1,
+    &ngx_http_v3_filter_module_ctx,        /* module context */
+    NULL,                                  /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
+static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
+
+
+static ngx_int_t
+ngx_http_v3_header_filter(ngx_http_request_t *r)
+{
+    u_char                    *p;
+    size_t                     len, n;
+    ngx_buf_t                 *b;
+    ngx_str_t                  host, location;
+    ngx_uint_t                 i, port;
+    ngx_chain_t               *out, *hl, *cl, **ll;
+    ngx_list_part_t           *part;
+    ngx_table_elt_t           *header;
+    ngx_connection_t          *c;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_v3_filter_ctx_t  *ctx;
+    ngx_http_core_loc_conf_t  *clcf;
+    ngx_http_core_srv_conf_t  *cscf;
+    u_char                     addr[NGX_SOCKADDR_STRLEN];
+
+    if (r->http_version != NGX_HTTP_VERSION_30) {
+        return ngx_http_next_header_filter(r);
+    }
+
+    if (r->header_sent) {
+        return NGX_OK;
+    }
+
+    r->header_sent = 1;
+
+    if (r != r->main) {
+        return NGX_OK;
+    }
+
+    h3c = ngx_http_v3_get_session(r->connection);
+
+    if (r->method == NGX_HTTP_HEAD) {
+        r->header_only = 1;
+    }
+
+    if (r->headers_out.last_modified_time != -1) {
+        if (r->headers_out.status != NGX_HTTP_OK
+            && r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT
+            && r->headers_out.status != NGX_HTTP_NOT_MODIFIED)
+        {
+            r->headers_out.last_modified_time = -1;
+            r->headers_out.last_modified = NULL;
+        }
+    }
+
+    if (r->headers_out.status == NGX_HTTP_NO_CONTENT) {
+        r->header_only = 1;
+        ngx_str_null(&r->headers_out.content_type);
+        r->headers_out.last_modified_time = -1;
+        r->headers_out.last_modified = NULL;
+        r->headers_out.content_length = NULL;
+        r->headers_out.content_length_n = -1;
+    }
+
+    if (r->headers_out.status == NGX_HTTP_NOT_MODIFIED) {
+        r->header_only = 1;
+    }
+
+    c = r->connection;
+
+    out = NULL;
+    ll = &out;
+
+    len = ngx_http_v3_encode_field_section_prefix(NULL, 0, 0, 0);
+
+    if (r->headers_out.status == NGX_HTTP_OK) {
+        len += ngx_http_v3_encode_field_ri(NULL, 0,
+                                           NGX_HTTP_V3_HEADER_STATUS_200);
+
+    } else {
+        len += ngx_http_v3_encode_field_lri(NULL, 0,
+                                            NGX_HTTP_V3_HEADER_STATUS_200,
+                                            NULL, 3);
+    }
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    if (r->headers_out.server == NULL) {
+        if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
+            n = sizeof(NGINX_VER) - 1;
+
+        } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) {
+            n = sizeof(NGINX_VER_BUILD) - 1;
+
+        } else {
+            n = sizeof("nginx") - 1;
+        }
+
+        len += ngx_http_v3_encode_field_lri(NULL, 0,
+                                            NGX_HTTP_V3_HEADER_SERVER,
+                                            NULL, n);
+    }
+
+    if (r->headers_out.date == NULL) {
+        len += ngx_http_v3_encode_field_lri(NULL, 0, NGX_HTTP_V3_HEADER_DATE,
+                                            NULL, ngx_cached_http_time.len);
+    }
+
+    if (r->headers_out.content_type.len) {
+        n = r->headers_out.content_type.len;
+
+        if (r->headers_out.content_type_len == r->headers_out.content_type.len
+            && r->headers_out.charset.len)
+        {
+            n += sizeof("; charset=") - 1 + r->headers_out.charset.len;
+        }
+
+        len += ngx_http_v3_encode_field_lri(NULL, 0,
+                                    NGX_HTTP_V3_HEADER_CONTENT_TYPE_TEXT_PLAIN,
+                                    NULL, n);
+    }
+
+    if (r->headers_out.content_length == NULL) {
+        if (r->headers_out.content_length_n > 0) {
+            len += ngx_http_v3_encode_field_lri(NULL, 0,
+                                        NGX_HTTP_V3_HEADER_CONTENT_LENGTH_ZERO,
+                                        NULL, NGX_OFF_T_LEN);
+
+        } else if (r->headers_out.content_length_n == 0) {
+            len += ngx_http_v3_encode_field_ri(NULL, 0,
+                                       NGX_HTTP_V3_HEADER_CONTENT_LENGTH_ZERO);
+        }
+    }
+
+    if (r->headers_out.last_modified == NULL
+        && r->headers_out.last_modified_time != -1)
+    {
+        len += ngx_http_v3_encode_field_lri(NULL, 0,
+                                  NGX_HTTP_V3_HEADER_LAST_MODIFIED, NULL,
+                                  sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1);
+    }
+
+    if (r->headers_out.location && r->headers_out.location->value.len) {
+
+        if (r->headers_out.location->value.data[0] == '/'
+            && clcf->absolute_redirect)
+        {
+            if (clcf->server_name_in_redirect) {
+                cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+                host = cscf->server_name;
+
+            } else if (r->headers_in.server.len) {
+                host = r->headers_in.server;
+
+            } else {
+                host.len = NGX_SOCKADDR_STRLEN;
+                host.data = addr;
+
+                if (ngx_connection_local_sockaddr(c, &host, 0) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+            }
+
+            port = ngx_inet_get_port(c->local_sockaddr);
+
+            location.len = sizeof("https://") - 1 + host.len
+                           + r->headers_out.location->value.len;
+
+            if (clcf->port_in_redirect) {
+                port = (port == 443) ? 0 : port;
+
+            } else {
+                port = 0;
+            }
+
+            if (port) {
+                location.len += sizeof(":65535") - 1;
+            }
+
+            location.data = ngx_pnalloc(r->pool, location.len);
+            if (location.data == NULL) {
+                return NGX_ERROR;
+            }
+
+            p = ngx_cpymem(location.data, "https://", sizeof("https://") - 1);
+            p = ngx_cpymem(p, host.data, host.len);
+
+            if (port) {
+                p = ngx_sprintf(p, ":%ui", port);
+            }
+
+            p = ngx_cpymem(p, r->headers_out.location->value.data,
+                              r->headers_out.location->value.len);
+
+            /* update r->headers_out.location->value for possible logging */
+
+            r->headers_out.location->value.len = p - location.data;
+            r->headers_out.location->value.data = location.data;
+            ngx_str_set(&r->headers_out.location->key, "Location");
+        }
+
+        r->headers_out.location->hash = 0;
+
+        len += ngx_http_v3_encode_field_lri(NULL, 0,
+                                           NGX_HTTP_V3_HEADER_LOCATION, NULL,
+                                           r->headers_out.location->value.len);
+    }
+
+#if (NGX_HTTP_GZIP)
+    if (r->gzip_vary) {
+        if (clcf->gzip_vary) {
+            len += ngx_http_v3_encode_field_ri(NULL, 0,
+                                      NGX_HTTP_V3_HEADER_VARY_ACCEPT_ENCODING);
+
+        } else {
+            r->gzip_vary = 0;
+        }
+    }
+#endif
+
+    part = &r->headers_out.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        len += ngx_http_v3_encode_field_l(NULL, &header[i].key,
+                                          &header[i].value);
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 header len:%uz", len);
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    b->last = (u_char *) ngx_http_v3_encode_field_section_prefix(b->last,
+                                                                 0, 0, 0);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 output header: \":status: %03ui\"",
+                   r->headers_out.status);
+
+    if (r->headers_out.status == NGX_HTTP_OK) {
+        b->last = (u_char *) ngx_http_v3_encode_field_ri(b->last, 0,
+                                                NGX_HTTP_V3_HEADER_STATUS_200);
+
+    } else {
+        b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
+                                                 NGX_HTTP_V3_HEADER_STATUS_200,
+                                                 NULL, 3);
+        b->last = ngx_sprintf(b->last, "%03ui", r->headers_out.status);
+    }
+
+    if (r->headers_out.server == NULL) {
+        if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) {
+            p = (u_char *) NGINX_VER;
+            n = sizeof(NGINX_VER) - 1;
+
+        } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) {
+            p = (u_char *) NGINX_VER_BUILD;
+            n = sizeof(NGINX_VER_BUILD) - 1;
+
+        } else {
+            p = (u_char *) "nginx";
+            n = sizeof("nginx") - 1;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 output header: \"server: %*s\"", n, p);
+
+        b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
+                                                     NGX_HTTP_V3_HEADER_SERVER,
+                                                     p, n);
+    }
+
+    if (r->headers_out.date == NULL) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 output header: \"date: %V\"",
+                       &ngx_cached_http_time);
+
+        b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
+                                                     NGX_HTTP_V3_HEADER_DATE,
+                                                     ngx_cached_http_time.data,
+                                                     ngx_cached_http_time.len);
+    }
+
+    if (r->headers_out.content_type.len) {
+        if (r->headers_out.content_type_len == r->headers_out.content_type.len
+            && r->headers_out.charset.len)
+        {
+            n = r->headers_out.content_type.len + sizeof("; charset=") - 1
+                + r->headers_out.charset.len;
+
+            p = ngx_pnalloc(r->pool, n);
+            if (p == NULL) {
+                return NGX_ERROR;
+            }
+
+            p = ngx_cpymem(p, r->headers_out.content_type.data,
+                           r->headers_out.content_type.len);
+
+            p = ngx_cpymem(p, "; charset=", sizeof("; charset=") - 1);
+
+            p = ngx_cpymem(p, r->headers_out.charset.data,
+                           r->headers_out.charset.len);
+
+            /* updated r->headers_out.content_type is also needed for logging */
+
+            r->headers_out.content_type.len = n;
+            r->headers_out.content_type.data = p - n;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 output header: \"content-type: %V\"",
+                       &r->headers_out.content_type);
+
+        b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
+                                    NGX_HTTP_V3_HEADER_CONTENT_TYPE_TEXT_PLAIN,
+                                    r->headers_out.content_type.data,
+                                    r->headers_out.content_type.len);
+    }
+
+    if (r->headers_out.content_length == NULL
+        && r->headers_out.content_length_n >= 0)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 output header: \"content-length: %O\"",
+                       r->headers_out.content_length_n);
+
+        if (r->headers_out.content_length_n > 0) {
+            p = ngx_sprintf(b->last, "%O", r->headers_out.content_length_n);
+            n = p - b->last;
+
+            b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
+                                        NGX_HTTP_V3_HEADER_CONTENT_LENGTH_ZERO,
+                                        NULL, n);
+
+            b->last = ngx_sprintf(b->last, "%O",
+                                  r->headers_out.content_length_n);
+
+        } else {
+            b->last = (u_char *) ngx_http_v3_encode_field_ri(b->last, 0,
+                                       NGX_HTTP_V3_HEADER_CONTENT_LENGTH_ZERO);
+        }
+    }
+
+    if (r->headers_out.last_modified == NULL
+        && r->headers_out.last_modified_time != -1)
+    {
+        n = sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1;
+
+        p = ngx_pnalloc(r->pool, n);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_http_time(p, r->headers_out.last_modified_time);
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 output header: \"last-modified: %*s\"", n, p);
+
+        b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
+                                              NGX_HTTP_V3_HEADER_LAST_MODIFIED,
+                                              p, n);
+    }
+
+    if (r->headers_out.location && r->headers_out.location->value.len) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 output header: \"location: %V\"",
+                       &r->headers_out.location->value);
+
+        b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
+                                           NGX_HTTP_V3_HEADER_LOCATION,
+                                           r->headers_out.location->value.data,
+                                           r->headers_out.location->value.len);
+    }
+
+#if (NGX_HTTP_GZIP)
+    if (r->gzip_vary) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 output header: \"vary: Accept-Encoding\"");
+
+        b->last = (u_char *) ngx_http_v3_encode_field_ri(b->last, 0,
+                                      NGX_HTTP_V3_HEADER_VARY_ACCEPT_ENCODING);
+    }
+#endif
+
+    part = &r->headers_out.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 output header: \"%V: %V\"",
+                       &header[i].key, &header[i].value);
+
+        b->last = (u_char *) ngx_http_v3_encode_field_l(b->last,
+                                                        &header[i].key,
+                                                        &header[i].value);
+    }
+
+    if (r->header_only) {
+        b->last_buf = 1;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    n = b->last - b->pos;
+
+    h3c->payload_bytes += n;
+
+    len = ngx_http_v3_encode_varlen_int(NULL, NGX_HTTP_V3_FRAME_HEADERS)
+          + ngx_http_v3_encode_varlen_int(NULL, n);
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    b->last = (u_char *) ngx_http_v3_encode_varlen_int(b->last,
+                                                    NGX_HTTP_V3_FRAME_HEADERS);
+    b->last = (u_char *) ngx_http_v3_encode_varlen_int(b->last, n);
+
+    hl = ngx_alloc_chain_link(r->pool);
+    if (hl == NULL) {
+        return NGX_ERROR;
+    }
+
+    hl->buf = b;
+    hl->next = cl;
+
+    *ll = hl;
+    ll = &cl->next;
+
+    if (r->headers_out.content_length_n >= 0
+        && !r->header_only && !r->expect_trailers)
+    {
+        len = ngx_http_v3_encode_varlen_int(NULL, NGX_HTTP_V3_FRAME_DATA)
+              + ngx_http_v3_encode_varlen_int(NULL,
+                                              r->headers_out.content_length_n);
+
+        b = ngx_create_temp_buf(r->pool, len);
+        if (b == NULL) {
+            return NGX_ERROR;
+        }
+
+        b->last = (u_char *) ngx_http_v3_encode_varlen_int(b->last,
+                                                       NGX_HTTP_V3_FRAME_DATA);
+        b->last = (u_char *) ngx_http_v3_encode_varlen_int(b->last,
+                                              r->headers_out.content_length_n);
+
+        h3c->payload_bytes += r->headers_out.content_length_n;
+        h3c->total_bytes += r->headers_out.content_length_n;
+
+        cl = ngx_alloc_chain_link(r->pool);
+        if (cl == NULL) {
+            return NGX_ERROR;
+        }
+
+        cl->buf = b;
+        cl->next = NULL;
+
+        *ll = cl;
+
+    } else {
+        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_v3_filter_ctx_t));
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_http_set_ctx(r, ctx, ngx_http_v3_filter_module);
+    }
+
+    for (cl = out; cl; cl = cl->next) {
+        h3c->total_bytes += cl->buf->last - cl->buf->pos;
+        r->header_size += cl->buf->last - cl->buf->pos;
+    }
+
+    return ngx_http_write_filter(r, out);
+}
+
+
+static ngx_int_t
+ngx_http_v3_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    u_char                    *chunk;
+    off_t                      size;
+    ngx_int_t                  rc;
+    ngx_buf_t                 *b;
+    ngx_chain_t               *out, *cl, *tl, **ll;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_v3_filter_ctx_t  *ctx;
+
+    if (in == NULL) {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_v3_filter_module);
+    if (ctx == NULL) {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    h3c = ngx_http_v3_get_session(r->connection);
+
+    out = NULL;
+    ll = &out;
+
+    size = 0;
+    cl = in;
+
+    for ( ;; ) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http3 chunk: %O", ngx_buf_size(cl->buf));
+
+        size += ngx_buf_size(cl->buf);
+
+        if (cl->buf->flush
+            || cl->buf->sync
+            || ngx_buf_in_memory(cl->buf)
+            || cl->buf->in_file)
+        {
+            tl = ngx_alloc_chain_link(r->pool);
+            if (tl == NULL) {
+                return NGX_ERROR;
+            }
+
+            tl->buf = cl->buf;
+            *ll = tl;
+            ll = &tl->next;
+        }
+
+        if (cl->next == NULL) {
+            break;
+        }
+
+        cl = cl->next;
+    }
+
+    if (size) {
+        tl = ngx_chain_get_free_buf(r->pool, &ctx->free);
+        if (tl == NULL) {
+            return NGX_ERROR;
+        }
+
+        b = tl->buf;
+        chunk = b->start;
+
+        if (chunk == NULL) {
+            chunk = ngx_palloc(r->pool, NGX_HTTP_V3_VARLEN_INT_LEN * 2);
+            if (chunk == NULL) {
+                return NGX_ERROR;
+            }
+
+            b->start = chunk;
+            b->end = chunk + NGX_HTTP_V3_VARLEN_INT_LEN * 2;
+        }
+
+        b->tag = (ngx_buf_tag_t) &ngx_http_v3_filter_module;
+        b->memory = 0;
+        b->temporary = 1;
+        b->pos = chunk;
+
+        b->last = (u_char *) ngx_http_v3_encode_varlen_int(chunk,
+                                                       NGX_HTTP_V3_FRAME_DATA);
+        b->last = (u_char *) ngx_http_v3_encode_varlen_int(b->last, size);
+
+        tl->next = out;
+        out = tl;
+
+        h3c->payload_bytes += size;
+    }
+
+    if (cl->buf->last_buf) {
+        tl = ngx_http_v3_create_trailers(r, ctx);
+        if (tl == NULL) {
+            return NGX_ERROR;
+        }
+
+        cl->buf->last_buf = 0;
+
+        *ll = tl;
+
+    } else {
+        *ll = NULL;
+    }
+
+    for (cl = out; cl; cl = cl->next) {
+        h3c->total_bytes += cl->buf->last - cl->buf->pos;
+    }
+
+    rc = ngx_http_next_body_filter(r, out);
+
+    ngx_chain_update_chains(r->pool, &ctx->free, &ctx->busy, &out,
+                            (ngx_buf_tag_t) &ngx_http_v3_filter_module);
+
+    return rc;
+}
+
+
+static ngx_chain_t *
+ngx_http_v3_create_trailers(ngx_http_request_t *r,
+    ngx_http_v3_filter_ctx_t *ctx)
+{
+    size_t                  len, n;
+    u_char                 *p;
+    ngx_buf_t              *b;
+    ngx_uint_t              i;
+    ngx_chain_t            *cl, *hl;
+    ngx_list_part_t        *part;
+    ngx_table_elt_t        *header;
+    ngx_http_v3_session_t  *h3c;
+
+    h3c = ngx_http_v3_get_session(r->connection);
+
+    len = 0;
+
+    part = &r->headers_out.trailers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        len += ngx_http_v3_encode_field_l(NULL, &header[i].key,
+                                          &header[i].value);
+    }
+
+    cl = ngx_chain_get_free_buf(r->pool, &ctx->free);
+    if (cl == NULL) {
+        return NULL;
+    }
+
+    b = cl->buf;
+
+    b->tag = (ngx_buf_tag_t) &ngx_http_v3_filter_module;
+    b->memory = 0;
+    b->last_buf = 1;
+
+    if (len == 0) {
+        b->temporary = 0;
+        b->pos = b->last = NULL;
+        return cl;
+    }
+
+    b->temporary = 1;
+
+    len += ngx_http_v3_encode_field_section_prefix(NULL, 0, 0, 0);
+
+    b->pos = ngx_palloc(r->pool, len);
+    if (b->pos == NULL) {
+        return NULL;
+    }
+
+    b->last = (u_char *) ngx_http_v3_encode_field_section_prefix(b->pos,
+                                                                 0, 0, 0);
+
+    part = &r->headers_out.trailers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http3 output trailer: \"%V: %V\"",
+                       &header[i].key, &header[i].value);
+
+        b->last = (u_char *) ngx_http_v3_encode_field_l(b->last,
+                                                        &header[i].key,
+                                                        &header[i].value);
+    }
+
+    n = b->last - b->pos;
+
+    h3c->payload_bytes += n;
+
+    hl = ngx_chain_get_free_buf(r->pool, &ctx->free);
+    if (hl == NULL) {
+        return NULL;
+    }
+
+    b = hl->buf;
+    p = b->start;
+
+    if (p == NULL) {
+        p = ngx_palloc(r->pool, NGX_HTTP_V3_VARLEN_INT_LEN * 2);
+        if (p == NULL) {
+            return NULL;
+        }
+
+        b->start = p;
+        b->end = p + NGX_HTTP_V3_VARLEN_INT_LEN * 2;
+    }
+
+    b->tag = (ngx_buf_tag_t) &ngx_http_v3_filter_module;
+    b->memory = 0;
+    b->temporary = 1;
+    b->pos = p;
+
+    b->last = (u_char *) ngx_http_v3_encode_varlen_int(p,
+                                                    NGX_HTTP_V3_FRAME_HEADERS);
+    b->last = (u_char *) ngx_http_v3_encode_varlen_int(b->last, n);
+
+    hl->next = cl;
+
+    return hl;
+}
+
+
+static ngx_int_t
+ngx_http_v3_filter_init(ngx_conf_t *cf)
+{
+    ngx_http_next_header_filter = ngx_http_top_header_filter;
+    ngx_http_top_header_filter = ngx_http_v3_header_filter;
+
+    ngx_http_next_body_filter = ngx_http_top_body_filter;
+    ngx_http_top_body_filter = ngx_http_v3_body_filter;
+
+    return NGX_OK;
+}
diff --git a/src/http/v3/ngx_http_v3_module.c b/src/http/v3/ngx_http_v3_module.c
new file mode 100644
index 0000000..139bd65
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_module.c
@@ -0,0 +1,393 @@
+
+/*
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Roman Arutyunyan
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+static ngx_int_t ngx_http_v3_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_v3_add_variables(ngx_conf_t *cf);
+static void *ngx_http_v3_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_http_v3_merge_srv_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static char *ngx_http_quic_host_key(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+
+static ngx_command_t  ngx_http_v3_commands[] = {
+
+    { ngx_string("http3"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v3_srv_conf_t, enable),
+      NULL },
+
+    { ngx_string("http3_hq"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v3_srv_conf_t, enable_hq),
+      NULL },
+
+    { ngx_string("http3_max_concurrent_streams"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v3_srv_conf_t, max_concurrent_streams),
+      NULL },
+
+    { ngx_string("http3_stream_buffer_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v3_srv_conf_t, quic.stream_buffer_size),
+      NULL },
+
+    { ngx_string("quic_retry"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v3_srv_conf_t, quic.retry),
+      NULL },
+
+    { ngx_string("quic_gso"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v3_srv_conf_t, quic.gso_enabled),
+      NULL },
+
+    { ngx_string("quic_host_key"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_http_quic_host_key,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("quic_active_connection_id_limit"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_v3_srv_conf_t, quic.active_connection_id_limit),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_v3_module_ctx = {
+    ngx_http_v3_add_variables,             /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    ngx_http_v3_create_srv_conf,           /* create server configuration */
+    ngx_http_v3_merge_srv_conf,            /* merge server configuration */
+
+    NULL,                                  /* create location configuration */
+    NULL                                   /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_v3_module = {
+    NGX_MODULE_V1,
+    &ngx_http_v3_module_ctx,               /* module context */
+    ngx_http_v3_commands,                  /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_http_variable_t  ngx_http_v3_vars[] = {
+
+    { ngx_string("http3"), NULL, ngx_http_v3_variable, 0, 0, 0 },
+
+      ngx_http_null_variable
+};
+
+static ngx_str_t  ngx_http_quic_salt = ngx_string("ngx_quic");
+
+
+static ngx_int_t
+ngx_http_v3_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_http_v3_session_t  *h3c;
+
+    if (r->connection->quic) {
+        h3c = ngx_http_v3_get_session(r->connection);
+
+        if (h3c->hq) {
+            v->len = sizeof("hq") - 1;
+            v->valid = 1;
+            v->no_cacheable = 0;
+            v->not_found = 0;
+            v->data = (u_char *) "hq";
+
+            return NGX_OK;
+        }
+
+        v->len = sizeof("h3") - 1;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = (u_char *) "h3";
+
+        return NGX_OK;
+    }
+
+    *v = ngx_http_variable_null_value;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v3_add_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t  *var, *v;
+
+    for (v = ngx_http_v3_vars; v->name.len; v++) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_http_v3_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_http_v3_srv_conf_t  *h3scf;
+
+    h3scf = ngx_pcalloc(cf->pool, sizeof(ngx_http_v3_srv_conf_t));
+    if (h3scf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     h3scf->quic.host_key = { 0, NULL }
+     *     h3scf->quic.stream_reject_code_uni = 0;
+     *     h3scf->quic.disable_active_migration = 0;
+     *     h3scf->quic.idle_timeout = 0;
+     *     h3scf->max_blocked_streams = 0;
+     */
+
+    h3scf->enable = NGX_CONF_UNSET;
+    h3scf->enable_hq = NGX_CONF_UNSET;
+    h3scf->max_table_capacity = NGX_HTTP_V3_MAX_TABLE_CAPACITY;
+    h3scf->max_concurrent_streams = NGX_CONF_UNSET_UINT;
+
+    h3scf->quic.stream_buffer_size = NGX_CONF_UNSET_SIZE;
+    h3scf->quic.max_concurrent_streams_bidi = NGX_CONF_UNSET_UINT;
+    h3scf->quic.max_concurrent_streams_uni = NGX_HTTP_V3_MAX_UNI_STREAMS;
+    h3scf->quic.retry = NGX_CONF_UNSET;
+    h3scf->quic.gso_enabled = NGX_CONF_UNSET;
+    h3scf->quic.stream_close_code = NGX_HTTP_V3_ERR_NO_ERROR;
+    h3scf->quic.stream_reject_code_bidi = NGX_HTTP_V3_ERR_REQUEST_REJECTED;
+    h3scf->quic.active_connection_id_limit = NGX_CONF_UNSET_UINT;
+
+    h3scf->quic.init = ngx_http_v3_init;
+    h3scf->quic.shutdown = ngx_http_v3_shutdown;
+
+    return h3scf;
+}
+
+
+static char *
+ngx_http_v3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_v3_srv_conf_t *prev = parent;
+    ngx_http_v3_srv_conf_t *conf = child;
+
+    ngx_http_ssl_srv_conf_t   *sscf;
+    ngx_http_core_srv_conf_t  *cscf;
+
+    ngx_conf_merge_value(conf->enable, prev->enable, 1);
+
+    ngx_conf_merge_value(conf->enable_hq, prev->enable_hq, 0);
+
+    ngx_conf_merge_uint_value(conf->max_concurrent_streams,
+                              prev->max_concurrent_streams, 128);
+
+    conf->max_blocked_streams = conf->max_concurrent_streams;
+
+    ngx_conf_merge_size_value(conf->quic.stream_buffer_size,
+                              prev->quic.stream_buffer_size,
+                              65536);
+
+    conf->quic.max_concurrent_streams_bidi = conf->max_concurrent_streams;
+
+    ngx_conf_merge_value(conf->quic.retry, prev->quic.retry, 0);
+    ngx_conf_merge_value(conf->quic.gso_enabled, prev->quic.gso_enabled, 0);
+
+    ngx_conf_merge_str_value(conf->quic.host_key, prev->quic.host_key, "");
+
+    ngx_conf_merge_uint_value(conf->quic.active_connection_id_limit,
+                              prev->quic.active_connection_id_limit,
+                              2);
+
+    if (conf->quic.host_key.len == 0) {
+
+        conf->quic.host_key.len = NGX_QUIC_DEFAULT_HOST_KEY_LEN;
+        conf->quic.host_key.data = ngx_palloc(cf->pool,
+                                              conf->quic.host_key.len);
+        if (conf->quic.host_key.data == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        if (RAND_bytes(conf->quic.host_key.data, NGX_QUIC_DEFAULT_HOST_KEY_LEN)
+            <= 0)
+        {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (ngx_quic_derive_key(cf->log, "av_token_key",
+                            &conf->quic.host_key, &ngx_http_quic_salt,
+                            conf->quic.av_token_key, NGX_QUIC_AV_KEY_LEN)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    if (ngx_quic_derive_key(cf->log, "sr_token_key",
+                            &conf->quic.host_key, &ngx_http_quic_salt,
+                            conf->quic.sr_token_key, NGX_QUIC_SR_KEY_LEN)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    cscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_core_module);
+    conf->quic.handshake_timeout = cscf->client_header_timeout;
+
+    sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
+    conf->quic.ssl = &sscf->ssl;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_quic_host_key(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_v3_srv_conf_t  *h3scf = conf;
+
+    u_char           *buf;
+    size_t            size;
+    ssize_t           n;
+    ngx_str_t        *value;
+    ngx_file_t        file;
+    ngx_file_info_t   fi;
+    ngx_quic_conf_t  *qcf;
+
+    qcf = &h3scf->quic;
+
+    if (qcf->host_key.len) {
+        return "is duplicate";
+    }
+
+    buf = NULL;
+#if (NGX_SUPPRESS_WARN)
+    size = 0;
+#endif
+
+    value = cf->args->elts;
+
+    if (ngx_conf_full_name(cf->cycle, &value[1], 1) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_memzero(&file, sizeof(ngx_file_t));
+    file.name = value[1];
+    file.log = cf->log;
+
+    file.fd = ngx_open_file(file.name.data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
+
+    if (file.fd == NGX_INVALID_FILE) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
+                           ngx_open_file_n " \"%V\" failed", &file.name);
+        return NGX_CONF_ERROR;
+    }
+
+    if (ngx_fd_info(file.fd, &fi) == NGX_FILE_ERROR) {
+        ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno,
+                           ngx_fd_info_n " \"%V\" failed", &file.name);
+        goto failed;
+    }
+
+    size = ngx_file_size(&fi);
+
+    if (size == 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "\"%V\" zero key size", &file.name);
+        goto failed;
+    }
+
+    buf = ngx_pnalloc(cf->pool, size);
+    if (buf == NULL) {
+        goto failed;
+    }
+
+    n = ngx_read_file(&file, buf, size, 0);
+
+    if (n == NGX_ERROR) {
+        ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno,
+                           ngx_read_file_n " \"%V\" failed", &file.name);
+        goto failed;
+    }
+
+    if ((size_t) n != size) {
+        ngx_conf_log_error(NGX_LOG_CRIT, cf, 0,
+                           ngx_read_file_n " \"%V\" returned only "
+                           "%z bytes instead of %uz", &file.name, n, size);
+        goto failed;
+    }
+
+    qcf->host_key.data = buf;
+    qcf->host_key.len = n;
+
+    if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
+                      ngx_close_file_n " \"%V\" failed", &file.name);
+    }
+
+    return NGX_CONF_OK;
+
+failed:
+
+    if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
+                      ngx_close_file_n " \"%V\" failed", &file.name);
+    }
+
+    if (buf) {
+        ngx_explicit_memzero(buf, size);
+    }
+
+    return NGX_CONF_ERROR;
+}
diff --git a/src/http/v3/ngx_http_v3_parse.c b/src/http/v3/ngx_http_v3_parse.c
new file mode 100644
index 0000000..5688163
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_parse.c
@@ -0,0 +1,1933 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+#define ngx_http_v3_is_v2_frame(type)                                         \
+    ((type) == 0x02 || (type) == 0x06 || (type) == 0x08 || (type) == 0x09)
+
+
+static void ngx_http_v3_parse_start_local(ngx_buf_t *b, ngx_buf_t *loc,
+    ngx_uint_t n);
+static void ngx_http_v3_parse_end_local(ngx_buf_t *b, ngx_buf_t *loc,
+    ngx_uint_t *n);
+static ngx_int_t ngx_http_v3_parse_skip(ngx_buf_t *b, ngx_uint_t *length);
+
+static ngx_int_t ngx_http_v3_parse_varlen_int(ngx_connection_t *c,
+    ngx_http_v3_parse_varlen_int_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_prefix_int(ngx_connection_t *c,
+    ngx_http_v3_parse_prefix_int_t *st, ngx_uint_t prefix, ngx_buf_t *b);
+
+static ngx_int_t ngx_http_v3_parse_field_section_prefix(ngx_connection_t *c,
+    ngx_http_v3_parse_field_section_prefix_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_field_rep(ngx_connection_t *c,
+    ngx_http_v3_parse_field_rep_t *st, ngx_uint_t base, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_literal(ngx_connection_t *c,
+    ngx_http_v3_parse_literal_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_field_ri(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_field_lri(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_field_l(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_field_pbi(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_field_lpbi(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b);
+
+static ngx_int_t ngx_http_v3_parse_control(ngx_connection_t *c,
+    ngx_http_v3_parse_control_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_settings(ngx_connection_t *c,
+    ngx_http_v3_parse_settings_t *st, ngx_buf_t *b);
+
+static ngx_int_t ngx_http_v3_parse_encoder(ngx_connection_t *c,
+    ngx_http_v3_parse_encoder_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_field_inr(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b);
+static ngx_int_t ngx_http_v3_parse_field_iln(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b);
+
+static ngx_int_t ngx_http_v3_parse_decoder(ngx_connection_t *c,
+    ngx_http_v3_parse_decoder_t *st, ngx_buf_t *b);
+
+static ngx_int_t ngx_http_v3_parse_lookup(ngx_connection_t *c,
+    ngx_uint_t dynamic, ngx_uint_t index, ngx_str_t *name, ngx_str_t *value);
+
+
+static void
+ngx_http_v3_parse_start_local(ngx_buf_t *b, ngx_buf_t *loc, ngx_uint_t n)
+{
+    *loc = *b;
+
+    if ((size_t) (loc->last - loc->pos) > n) {
+        loc->last = loc->pos + n;
+    }
+}
+
+
+static void
+ngx_http_v3_parse_end_local(ngx_buf_t *b, ngx_buf_t *loc, ngx_uint_t *pn)
+{
+    *pn -= loc->pos - b->pos;
+    b->pos = loc->pos;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_skip(ngx_buf_t *b, ngx_uint_t *length)
+{
+    if ((size_t) (b->last - b->pos) < *length) {
+        *length -= b->last - b->pos;
+        b->pos = b->last;
+        return NGX_AGAIN;
+    }
+
+    b->pos += *length;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_varlen_int(ngx_connection_t *c,
+    ngx_http_v3_parse_varlen_int_t *st, ngx_buf_t *b)
+{
+    u_char  ch;
+    enum {
+        sw_start = 0,
+        sw_length_2,
+        sw_length_3,
+        sw_length_4,
+        sw_length_5,
+        sw_length_6,
+        sw_length_7,
+        sw_length_8
+    };
+
+    for ( ;; ) {
+
+        if (b->pos == b->last) {
+            return NGX_AGAIN;
+        }
+
+        ch = *b->pos++;
+
+        switch (st->state) {
+
+        case sw_start:
+
+            st->value = ch;
+            if (st->value & 0xc0) {
+                st->state = sw_length_2;
+                break;
+            }
+
+            goto done;
+
+        case sw_length_2:
+
+            st->value = (st->value << 8) + ch;
+            if ((st->value & 0xc000) == 0x4000) {
+                st->value &= 0x3fff;
+                goto done;
+            }
+
+            st->state = sw_length_3;
+            break;
+
+        case sw_length_4:
+
+            st->value = (st->value << 8) + ch;
+            if ((st->value & 0xc0000000) == 0x80000000) {
+                st->value &= 0x3fffffff;
+                goto done;
+            }
+
+            st->state = sw_length_5;
+            break;
+
+        case sw_length_3:
+        case sw_length_5:
+        case sw_length_6:
+        case sw_length_7:
+
+            st->value = (st->value << 8) + ch;
+            st->state++;
+            break;
+
+        case sw_length_8:
+
+            st->value = (st->value << 8) + ch;
+            st->value &= 0x3fffffffffffffff;
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse varlen int %uL", st->value);
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_prefix_int(ngx_connection_t *c,
+    ngx_http_v3_parse_prefix_int_t *st, ngx_uint_t prefix, ngx_buf_t *b)
+{
+    u_char      ch;
+    ngx_uint_t  mask;
+    enum {
+        sw_start = 0,
+        sw_value
+    };
+
+    for ( ;; ) {
+
+        if (b->pos == b->last) {
+            return NGX_AGAIN;
+        }
+
+        ch = *b->pos++;
+
+        switch (st->state) {
+
+        case sw_start:
+
+            mask = (1 << prefix) - 1;
+            st->value = ch & mask;
+
+            if (st->value != mask) {
+                goto done;
+            }
+
+            st->shift = 0;
+            st->state = sw_value;
+            break;
+
+        case sw_value:
+
+            st->value += (uint64_t) (ch & 0x7f) << st->shift;
+
+            if (st->shift == 56
+                && ((ch & 0x80) || (st->value & 0xc000000000000000)))
+            {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                              "client exceeded integer size limit");
+                return NGX_HTTP_V3_ERR_EXCESSIVE_LOAD;
+            }
+
+            if (ch & 0x80) {
+                st->shift += 7;
+                break;
+            }
+
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse prefix int %uL", st->value);
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+ngx_int_t
+ngx_http_v3_parse_headers(ngx_connection_t *c, ngx_http_v3_parse_headers_t *st,
+    ngx_buf_t *b)
+{
+    ngx_buf_t  loc;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_type,
+        sw_length,
+        sw_skip,
+        sw_prefix,
+        sw_verify,
+        sw_field_rep,
+        sw_done
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse headers");
+
+            st->state = sw_type;
+
+            /* fall through */
+
+        case sw_type:
+
+            rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->type = st->vlint.value;
+
+            if (ngx_http_v3_is_v2_frame(st->type)
+                || st->type == NGX_HTTP_V3_FRAME_DATA
+                || st->type == NGX_HTTP_V3_FRAME_GOAWAY
+                || st->type == NGX_HTTP_V3_FRAME_SETTINGS
+                || st->type == NGX_HTTP_V3_FRAME_MAX_PUSH_ID
+                || st->type == NGX_HTTP_V3_FRAME_CANCEL_PUSH
+                || st->type == NGX_HTTP_V3_FRAME_PUSH_PROMISE)
+            {
+                return NGX_HTTP_V3_ERR_FRAME_UNEXPECTED;
+            }
+
+            st->state = sw_length;
+            break;
+
+        case sw_length:
+
+            rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->length = st->vlint.value;
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse headers type:%ui, len:%ui",
+                           st->type, st->length);
+
+            if (st->type != NGX_HTTP_V3_FRAME_HEADERS) {
+                st->state = st->length > 0 ? sw_skip : sw_type;
+                break;
+            }
+
+            if (st->length == 0) {
+                return NGX_HTTP_V3_ERR_FRAME_ERROR;
+            }
+
+            st->state = sw_prefix;
+            break;
+
+        case sw_skip:
+
+            rc = ngx_http_v3_parse_skip(b, &st->length);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->state = sw_type;
+            break;
+
+        case sw_prefix:
+
+            ngx_http_v3_parse_start_local(b, &loc, st->length);
+
+            rc = ngx_http_v3_parse_field_section_prefix(c, &st->prefix, &loc);
+
+            ngx_http_v3_parse_end_local(b, &loc, &st->length);
+
+            if (st->length == 0 && rc == NGX_AGAIN) {
+                return NGX_HTTP_V3_ERR_FRAME_ERROR;
+            }
+
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->state = sw_verify;
+            break;
+
+        case sw_verify:
+
+            rc = ngx_http_v3_check_insert_count(c, st->prefix.insert_count);
+            if (rc != NGX_OK) {
+                return rc;
+            }
+
+            st->state = sw_field_rep;
+
+            /* fall through */
+
+        case sw_field_rep:
+
+            ngx_http_v3_parse_start_local(b, &loc, st->length);
+
+            rc = ngx_http_v3_parse_field_rep(c, &st->field_rep, st->prefix.base,
+                                             &loc);
+
+            ngx_http_v3_parse_end_local(b, &loc, &st->length);
+
+            if (st->length == 0 && rc == NGX_AGAIN) {
+                return NGX_HTTP_V3_ERR_FRAME_ERROR;
+            }
+
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            if (st->length == 0) {
+                goto done;
+            }
+
+            return NGX_OK;
+        }
+    }
+
+done:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse headers done");
+
+    if (st->prefix.insert_count > 0) {
+        if (ngx_http_v3_send_ack_section(c, c->quic->id) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        ngx_http_v3_ack_insert_count(c, st->prefix.insert_count);
+    }
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_field_section_prefix(ngx_connection_t *c,
+    ngx_http_v3_parse_field_section_prefix_t *st, ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_req_insert_count,
+        sw_delta_base,
+        sw_read_delta_base
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse field section prefix");
+
+            st->state = sw_req_insert_count;
+
+            /* fall through */
+
+        case sw_req_insert_count:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 8, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->insert_count = st->pint.value;
+            st->state = sw_delta_base;
+            break;
+
+        case sw_delta_base:
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->sign = (ch & 0x80) ? 1 : 0;
+            st->state = sw_read_delta_base;
+
+            /* fall through */
+
+        case sw_read_delta_base:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->delta_base = st->pint.value;
+            goto done;
+        }
+    }
+
+done:
+
+    rc = ngx_http_v3_decode_insert_count(c, &st->insert_count);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    if (st->sign) {
+        if (st->insert_count <= st->delta_base) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0, "client sent negative base");
+            return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED;
+        }
+
+        st->base = st->insert_count - st->delta_base - 1;
+
+    } else {
+        st->base = st->insert_count + st->delta_base;
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                  "http3 parse field section prefix done "
+                  "insert_count:%ui, sign:%ui, delta_base:%ui, base:%ui",
+                  st->insert_count, st->sign, st->delta_base, st->base);
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_field_rep(ngx_connection_t *c,
+    ngx_http_v3_parse_field_rep_t *st, ngx_uint_t base, ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_field_ri,
+        sw_field_lri,
+        sw_field_l,
+        sw_field_pbi,
+        sw_field_lpbi
+    };
+
+    if (st->state == sw_start) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 parse field representation");
+
+        if (b->pos == b->last) {
+            return NGX_AGAIN;
+        }
+
+        ch = *b->pos;
+
+        ngx_memzero(&st->field, sizeof(ngx_http_v3_parse_field_t));
+
+        st->field.base = base;
+
+        if (ch & 0x80) {
+            /* Indexed Field Line */
+
+            st->state = sw_field_ri;
+
+        } else if (ch & 0x40) {
+            /* Literal Field Line With Name Reference */
+
+            st->state = sw_field_lri;
+
+        } else if (ch & 0x20) {
+            /* Literal Field Line With Literal Name */
+
+            st->state = sw_field_l;
+
+        } else if (ch & 0x10) {
+            /* Indexed Field Line With Post-Base Index */
+
+            st->state = sw_field_pbi;
+
+        } else {
+            /* Literal Field Line With Post-Base Name Reference */
+
+            st->state = sw_field_lpbi;
+        }
+    }
+
+    switch (st->state) {
+
+    case sw_field_ri:
+        rc = ngx_http_v3_parse_field_ri(c, &st->field, b);
+        break;
+
+    case sw_field_lri:
+        rc = ngx_http_v3_parse_field_lri(c, &st->field, b);
+        break;
+
+    case sw_field_l:
+        rc = ngx_http_v3_parse_field_l(c, &st->field, b);
+        break;
+
+    case sw_field_pbi:
+        rc = ngx_http_v3_parse_field_pbi(c, &st->field, b);
+        break;
+
+    case sw_field_lpbi:
+        rc = ngx_http_v3_parse_field_lpbi(c, &st->field, b);
+        break;
+
+    default:
+        rc = NGX_OK;
+    }
+
+    if (rc != NGX_DONE) {
+        return rc;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse field representation done");
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_literal(ngx_connection_t *c, ngx_http_v3_parse_literal_t *st,
+    ngx_buf_t *b)
+{
+    u_char                     ch;
+    ngx_uint_t                 n;
+    ngx_http_core_srv_conf_t  *cscf;
+    enum {
+        sw_start = 0,
+        sw_value
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse literal huff:%ui, len:%ui",
+                           st->huffman, st->length);
+
+            n = st->length;
+
+            cscf = ngx_http_v3_get_module_srv_conf(c, ngx_http_core_module);
+
+            if (n > cscf->large_client_header_buffers.size) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                              "client sent too large field line");
+                return NGX_HTTP_V3_ERR_EXCESSIVE_LOAD;
+            }
+
+            if (st->huffman) {
+                n = n * 8 / 5;
+                st->huffstate = 0;
+            }
+
+            st->last = ngx_pnalloc(c->pool, n + 1);
+            if (st->last == NULL) {
+                return NGX_ERROR;
+            }
+
+            st->value.data = st->last;
+            st->state = sw_value;
+
+            /* fall through */
+
+        case sw_value:
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos++;
+
+            if (st->huffman) {
+                if (ngx_http_huff_decode(&st->huffstate, &ch, 1, &st->last,
+                                         st->length == 1, c->log)
+                    != NGX_OK)
+                {
+                    ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                                  "client sent invalid encoded field line");
+                    return NGX_ERROR;
+                }
+
+            } else {
+                *st->last++ = ch;
+            }
+
+            if (--st->length) {
+                break;
+            }
+
+            st->value.len = st->last - st->value.data;
+            *st->last = '\0';
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse literal done \"%V\"", &st->value);
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_field_ri(ngx_connection_t *c, ngx_http_v3_parse_field_t *st,
+    ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_index
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse field ri");
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->dynamic = (ch & 0x40) ? 0 : 1;
+            st->state = sw_index;
+
+            /* fall through */
+
+        case sw_index:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 6, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->index = st->pint.value;
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse field ri done %s%ui]",
+                   st->dynamic ? "dynamic[-" : "static[", st->index);
+
+    if (st->dynamic) {
+        st->index = st->base - st->index - 1;
+    }
+
+    rc = ngx_http_v3_parse_lookup(c, st->dynamic, st->index, &st->name,
+                                  &st->value);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_field_lri(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_index,
+        sw_value_len,
+        sw_read_value_len,
+        sw_value
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse field lri");
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->dynamic = (ch & 0x10) ? 0 : 1;
+            st->state = sw_index;
+
+            /* fall through */
+
+        case sw_index:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 4, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->index = st->pint.value;
+            st->state = sw_value_len;
+            break;
+
+        case sw_value_len:
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->literal.huffman = (ch & 0x80) ? 1 : 0;
+            st->state = sw_read_value_len;
+
+            /* fall through */
+
+        case sw_read_value_len:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->literal.length = st->pint.value;
+            if (st->literal.length == 0) {
+                goto done;
+            }
+
+            st->state = sw_value;
+            break;
+
+        case sw_value:
+
+            rc = ngx_http_v3_parse_literal(c, &st->literal, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->value = st->literal.value;
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse field lri done %s%ui] \"%V\"",
+                   st->dynamic ? "dynamic[-" : "static[",
+                   st->index, &st->value);
+
+    if (st->dynamic) {
+        st->index = st->base - st->index - 1;
+    }
+
+    rc = ngx_http_v3_parse_lookup(c, st->dynamic, st->index, &st->name, NULL);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_field_l(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_name_len,
+        sw_name,
+        sw_value_len,
+        sw_read_value_len,
+        sw_value
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse field l");
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->literal.huffman = (ch & 0x08) ? 1 : 0;
+            st->state = sw_name_len;
+
+            /* fall through */
+
+        case sw_name_len:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 3, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->literal.length = st->pint.value;
+            if (st->literal.length == 0) {
+                return NGX_ERROR;
+            }
+
+            st->state = sw_name;
+            break;
+
+        case sw_name:
+
+            rc = ngx_http_v3_parse_literal(c, &st->literal, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->name = st->literal.value;
+            st->state = sw_value_len;
+            break;
+
+        case sw_value_len:
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->literal.huffman = (ch & 0x80) ? 1 : 0;
+            st->state = sw_read_value_len;
+
+            /* fall through */
+
+        case sw_read_value_len:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->literal.length = st->pint.value;
+            if (st->literal.length == 0) {
+                goto done;
+            }
+
+            st->state = sw_value;
+            break;
+
+        case sw_value:
+
+            rc = ngx_http_v3_parse_literal(c, &st->literal, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->value = st->literal.value;
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse field l done \"%V\" \"%V\"",
+                   &st->name, &st->value);
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_field_pbi(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b)
+{
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_index
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse field pbi");
+
+            st->state = sw_index;
+
+            /* fall through */
+
+        case sw_index:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 4, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->index = st->pint.value;
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse field pbi done dynamic[+%ui]", st->index);
+
+    rc = ngx_http_v3_parse_lookup(c, 1, st->base + st->index, &st->name,
+                                  &st->value);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_field_lpbi(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_index,
+        sw_value_len,
+        sw_read_value_len,
+        sw_value
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse field lpbi");
+
+            st->state = sw_index;
+
+            /* fall through */
+
+        case sw_index:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 3, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->index = st->pint.value;
+            st->state = sw_value_len;
+            break;
+
+        case sw_value_len:
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->literal.huffman = (ch & 0x80) ? 1 : 0;
+            st->state = sw_read_value_len;
+
+            /* fall through */
+
+        case sw_read_value_len:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->literal.length = st->pint.value;
+            if (st->literal.length == 0) {
+                goto done;
+            }
+
+            st->state = sw_value;
+            break;
+
+        case sw_value:
+
+            rc = ngx_http_v3_parse_literal(c, &st->literal, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->value = st->literal.value;
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse field lpbi done dynamic[+%ui] \"%V\"",
+                   st->index, &st->value);
+
+    rc = ngx_http_v3_parse_lookup(c, 1, st->base + st->index, &st->name, NULL);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_lookup(ngx_connection_t *c, ngx_uint_t dynamic,
+    ngx_uint_t index, ngx_str_t *name, ngx_str_t *value)
+{
+    u_char  *p;
+
+    if (!dynamic) {
+        if (ngx_http_v3_lookup_static(c, index, name, value) != NGX_OK) {
+            return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED;
+        }
+
+        return NGX_OK;
+    }
+
+    if (ngx_http_v3_lookup(c, index, name, value) != NGX_OK) {
+        return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED;
+    }
+
+    if (name) {
+        p = ngx_pnalloc(c->pool, name->len + 1);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(p, name->data, name->len);
+        p[name->len] = '\0';
+        name->data = p;
+    }
+
+    if (value) {
+        p = ngx_pnalloc(c->pool, value->len + 1);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(p, value->data, value->len);
+        p[value->len] = '\0';
+        value->data = p;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_control(ngx_connection_t *c, ngx_http_v3_parse_control_t *st,
+    ngx_buf_t *b)
+{
+    ngx_buf_t  loc;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_first_type,
+        sw_type,
+        sw_length,
+        sw_settings,
+        sw_skip
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse control");
+
+            st->state = sw_first_type;
+
+            /* fall through */
+
+        case sw_first_type:
+        case sw_type:
+
+            rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->type = st->vlint.value;
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse frame type:%ui", st->type);
+
+            if (st->state == sw_first_type
+                && st->type != NGX_HTTP_V3_FRAME_SETTINGS)
+            {
+                return NGX_HTTP_V3_ERR_MISSING_SETTINGS;
+            }
+
+            if (st->state != sw_first_type
+                && st->type == NGX_HTTP_V3_FRAME_SETTINGS)
+            {
+                return NGX_HTTP_V3_ERR_FRAME_UNEXPECTED;
+            }
+
+            if (ngx_http_v3_is_v2_frame(st->type)
+                || st->type == NGX_HTTP_V3_FRAME_DATA
+                || st->type == NGX_HTTP_V3_FRAME_HEADERS
+                || st->type == NGX_HTTP_V3_FRAME_PUSH_PROMISE)
+            {
+                return NGX_HTTP_V3_ERR_FRAME_UNEXPECTED;
+            }
+
+            if (st->type == NGX_HTTP_V3_FRAME_CANCEL_PUSH) {
+                return NGX_HTTP_V3_ERR_ID_ERROR;
+            }
+
+            st->state = sw_length;
+            break;
+
+        case sw_length:
+
+            rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse frame len:%uL", st->vlint.value);
+
+            st->length = st->vlint.value;
+            if (st->length == 0) {
+                st->state = sw_type;
+                break;
+            }
+
+            switch (st->type) {
+
+            case NGX_HTTP_V3_FRAME_SETTINGS:
+                st->state = sw_settings;
+                break;
+
+            default:
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                               "http3 parse skip unknown frame");
+                st->state = sw_skip;
+            }
+
+            break;
+
+        case sw_settings:
+
+            ngx_http_v3_parse_start_local(b, &loc, st->length);
+
+            rc = ngx_http_v3_parse_settings(c, &st->settings, &loc);
+
+            ngx_http_v3_parse_end_local(b, &loc, &st->length);
+
+            if (st->length == 0 && rc == NGX_AGAIN) {
+                return NGX_HTTP_V3_ERR_SETTINGS_ERROR;
+            }
+
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            if (st->length == 0) {
+                st->state = sw_type;
+            }
+
+            break;
+
+        case sw_skip:
+
+            rc = ngx_http_v3_parse_skip(b, &st->length);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->state = sw_type;
+            break;
+        }
+    }
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_settings(ngx_connection_t *c,
+    ngx_http_v3_parse_settings_t *st, ngx_buf_t *b)
+{
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_id,
+        sw_value
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse settings");
+
+            st->state = sw_id;
+
+            /* fall through */
+
+        case sw_id:
+
+            rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->id = st->vlint.value;
+            st->state = sw_value;
+            break;
+
+        case sw_value:
+
+            rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            if (ngx_http_v3_set_param(c, st->id, st->vlint.value) != NGX_OK) {
+                return NGX_HTTP_V3_ERR_SETTINGS_ERROR;
+            }
+
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse settings done");
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_encoder(ngx_connection_t *c, ngx_http_v3_parse_encoder_t *st,
+    ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_inr,
+        sw_iln,
+        sw_capacity,
+        sw_duplicate
+    };
+
+    for ( ;; ) {
+
+        if (st->state == sw_start) {
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse encoder instruction");
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            if (ch & 0x80) {
+                /* Insert With Name Reference */
+
+                st->state = sw_inr;
+
+            } else if (ch & 0x40) {
+                /* Insert With Literal Name */
+
+                st->state = sw_iln;
+
+            } else if (ch & 0x20) {
+                /* Set Dynamic Table Capacity */
+
+                st->state = sw_capacity;
+
+            } else {
+                /* Duplicate */
+
+                st->state = sw_duplicate;
+            }
+        }
+
+        switch (st->state) {
+
+        case sw_inr:
+
+            rc = ngx_http_v3_parse_field_inr(c, &st->field, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->state = sw_start;
+            break;
+
+        case sw_iln:
+
+            rc = ngx_http_v3_parse_field_iln(c, &st->field, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->state = sw_start;
+            break;
+
+        case sw_capacity:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 5, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            rc = ngx_http_v3_set_capacity(c, st->pint.value);
+            if (rc != NGX_OK) {
+                return rc;
+            }
+
+            st->state = sw_start;
+            break;
+
+        default: /* sw_duplicate */
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 5, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            rc = ngx_http_v3_duplicate(c, st->pint.value);
+            if (rc != NGX_OK) {
+                return rc;
+            }
+
+            st->state = sw_start;
+            break;
+        }
+    }
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_field_inr(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_name_index,
+        sw_value_len,
+        sw_read_value_len,
+        sw_value
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse field inr");
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->dynamic = (ch & 0x40) ? 0 : 1;
+            st->state = sw_name_index;
+
+            /* fall through */
+
+        case sw_name_index:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 6, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->index = st->pint.value;
+            st->state = sw_value_len;
+            break;
+
+        case sw_value_len:
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->literal.huffman = (ch & 0x80) ? 1 : 0;
+            st->state = sw_read_value_len;
+
+            /* fall through */
+
+        case sw_read_value_len:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->literal.length = st->pint.value;
+            if (st->literal.length == 0) {
+                st->value.len = 0;
+                goto done;
+            }
+
+            st->state = sw_value;
+            break;
+
+        case sw_value:
+
+            rc = ngx_http_v3_parse_literal(c, &st->literal, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->value = st->literal.value;
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse field inr done %s[%ui] \"%V\"",
+                   st->dynamic ? "dynamic" : "static",
+                   st->index, &st->value);
+
+    rc = ngx_http_v3_ref_insert(c, st->dynamic, st->index, &st->value);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_field_iln(ngx_connection_t *c,
+    ngx_http_v3_parse_field_t *st, ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_name_len,
+        sw_name,
+        sw_value_len,
+        sw_read_value_len,
+        sw_value
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse field iln");
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->literal.huffman = (ch & 0x20) ? 1 : 0;
+            st->state = sw_name_len;
+
+            /* fall through */
+
+        case sw_name_len:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 5, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->literal.length = st->pint.value;
+            if (st->literal.length == 0) {
+                return NGX_ERROR;
+            }
+
+            st->state = sw_name;
+            break;
+
+        case sw_name:
+
+            rc = ngx_http_v3_parse_literal(c, &st->literal, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->name = st->literal.value;
+            st->state = sw_value_len;
+            break;
+
+        case sw_value_len:
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            st->literal.huffman = (ch & 0x80) ? 1 : 0;
+            st->state = sw_read_value_len;
+
+            /* fall through */
+
+        case sw_read_value_len:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->literal.length = st->pint.value;
+            if (st->literal.length == 0) {
+                st->value.len = 0;
+                goto done;
+            }
+
+            st->state = sw_value;
+            break;
+
+        case sw_value:
+
+            rc = ngx_http_v3_parse_literal(c, &st->literal, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->value = st->literal.value;
+            goto done;
+        }
+    }
+
+done:
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 parse field iln done \"%V\":\"%V\"",
+                   &st->name, &st->value);
+
+    rc = ngx_http_v3_insert(c, &st->name, &st->value);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_v3_parse_decoder(ngx_connection_t *c, ngx_http_v3_parse_decoder_t *st,
+    ngx_buf_t *b)
+{
+    u_char     ch;
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_ack_section,
+        sw_cancel_stream,
+        sw_inc_insert_count
+    };
+
+    for ( ;; ) {
+
+        if (st->state == sw_start) {
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse decoder instruction");
+
+            if (b->pos == b->last) {
+                return NGX_AGAIN;
+            }
+
+            ch = *b->pos;
+
+            if (ch & 0x80) {
+                /* Section Acknowledgment */
+
+                st->state = sw_ack_section;
+
+            } else if (ch & 0x40) {
+                /*  Stream Cancellation */
+
+                st->state = sw_cancel_stream;
+
+            }  else {
+                /*  Insert Count Increment */
+
+                st->state = sw_inc_insert_count;
+            }
+        }
+
+        switch (st->state) {
+
+        case sw_ack_section:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 7, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            rc = ngx_http_v3_ack_section(c, st->pint.value);
+            if (rc != NGX_OK) {
+                return rc;
+            }
+
+            st->state = sw_start;
+            break;
+
+        case sw_cancel_stream:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 6, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            rc = ngx_http_v3_cancel_stream(c, st->pint.value);
+            if (rc != NGX_OK) {
+                return rc;
+            }
+
+            st->state = sw_start;
+            break;
+
+        case sw_inc_insert_count:
+
+            rc = ngx_http_v3_parse_prefix_int(c, &st->pint, 6, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            rc = ngx_http_v3_inc_insert_count(c, st->pint.value);
+            if (rc != NGX_OK) {
+                return rc;
+            }
+
+            st->state = sw_start;
+            break;
+        }
+    }
+}
+
+
+ngx_int_t
+ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st,
+    ngx_buf_t *b)
+{
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_type,
+        sw_length,
+        sw_skip
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse data");
+
+            st->state = sw_type;
+
+            /* fall through */
+
+        case sw_type:
+
+            rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->type = st->vlint.value;
+
+            if (st->type == NGX_HTTP_V3_FRAME_HEADERS) {
+                /* trailers */
+                goto done;
+            }
+
+            if (ngx_http_v3_is_v2_frame(st->type)
+                || st->type == NGX_HTTP_V3_FRAME_GOAWAY
+                || st->type == NGX_HTTP_V3_FRAME_SETTINGS
+                || st->type == NGX_HTTP_V3_FRAME_MAX_PUSH_ID
+                || st->type == NGX_HTTP_V3_FRAME_CANCEL_PUSH
+                || st->type == NGX_HTTP_V3_FRAME_PUSH_PROMISE)
+            {
+                return NGX_HTTP_V3_ERR_FRAME_UNEXPECTED;
+            }
+
+            st->state = sw_length;
+            break;
+
+        case sw_length:
+
+            rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->length = st->vlint.value;
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 parse data type:%ui, len:%ui",
+                           st->type, st->length);
+
+            if (st->type != NGX_HTTP_V3_FRAME_DATA && st->length > 0) {
+                st->state = sw_skip;
+                break;
+            }
+
+            st->state = sw_type;
+            return NGX_OK;
+
+        case sw_skip:
+
+            rc = ngx_http_v3_parse_skip(b, &st->length);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            st->state = sw_type;
+            break;
+        }
+    }
+
+done:
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse data done");
+
+    st->state = sw_start;
+    return NGX_DONE;
+}
+
+
+ngx_int_t
+ngx_http_v3_parse_uni(ngx_connection_t *c, ngx_http_v3_parse_uni_t *st,
+    ngx_buf_t *b)
+{
+    ngx_int_t  rc;
+    enum {
+        sw_start = 0,
+        sw_type,
+        sw_control,
+        sw_encoder,
+        sw_decoder,
+        sw_unknown
+    };
+
+    for ( ;; ) {
+
+        switch (st->state) {
+        case sw_start:
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse uni");
+
+            st->state = sw_type;
+
+            /* fall through */
+
+        case sw_type:
+
+            rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, b);
+            if (rc != NGX_DONE) {
+                return rc;
+            }
+
+            rc = ngx_http_v3_register_uni_stream(c, st->vlint.value);
+            if (rc != NGX_OK) {
+                return rc;
+            }
+
+            switch (st->vlint.value) {
+            case NGX_HTTP_V3_STREAM_CONTROL:
+                st->state = sw_control;
+                break;
+
+            case NGX_HTTP_V3_STREAM_ENCODER:
+                st->state = sw_encoder;
+                break;
+
+            case NGX_HTTP_V3_STREAM_DECODER:
+                st->state = sw_decoder;
+                break;
+
+            default:
+                st->state = sw_unknown;
+            }
+
+            break;
+
+        case sw_control:
+
+            return ngx_http_v3_parse_control(c, &st->u.control, b);
+
+        case sw_encoder:
+
+            return ngx_http_v3_parse_encoder(c, &st->u.encoder, b);
+
+        case sw_decoder:
+
+            return ngx_http_v3_parse_decoder(c, &st->u.decoder, b);
+
+        case sw_unknown:
+
+            b->pos = b->last;
+            return NGX_AGAIN;
+        }
+    }
+}
diff --git a/src/http/v3/ngx_http_v3_parse.h b/src/http/v3/ngx_http_v3_parse.h
new file mode 100644
index 0000000..ba004db
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_parse.h
@@ -0,0 +1,146 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_HTTP_V3_PARSE_H_INCLUDED_
+#define _NGX_HTTP_V3_PARSE_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    uint64_t                        value;
+} ngx_http_v3_parse_varlen_int_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_uint_t                      shift;
+    uint64_t                        value;
+} ngx_http_v3_parse_prefix_int_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    uint64_t                        id;
+    ngx_http_v3_parse_varlen_int_t  vlint;
+} ngx_http_v3_parse_settings_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_uint_t                      insert_count;
+    ngx_uint_t                      delta_base;
+    ngx_uint_t                      sign;
+    ngx_uint_t                      base;
+    ngx_http_v3_parse_prefix_int_t  pint;
+} ngx_http_v3_parse_field_section_prefix_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_uint_t                      length;
+    ngx_uint_t                      huffman;
+    ngx_str_t                       value;
+    u_char                         *last;
+    u_char                          huffstate;
+} ngx_http_v3_parse_literal_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_uint_t                      index;
+    ngx_uint_t                      base;
+    ngx_uint_t                      dynamic;
+
+    ngx_str_t                       name;
+    ngx_str_t                       value;
+
+    ngx_http_v3_parse_prefix_int_t  pint;
+    ngx_http_v3_parse_literal_t     literal;
+} ngx_http_v3_parse_field_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_http_v3_parse_field_t       field;
+} ngx_http_v3_parse_field_rep_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_uint_t                      type;
+    ngx_uint_t                      length;
+    ngx_http_v3_parse_varlen_int_t  vlint;
+    ngx_http_v3_parse_field_section_prefix_t  prefix;
+    ngx_http_v3_parse_field_rep_t   field_rep;
+} ngx_http_v3_parse_headers_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_http_v3_parse_field_t       field;
+    ngx_http_v3_parse_prefix_int_t  pint;
+} ngx_http_v3_parse_encoder_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_http_v3_parse_prefix_int_t  pint;
+} ngx_http_v3_parse_decoder_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_uint_t                      type;
+    ngx_uint_t                      length;
+    ngx_http_v3_parse_varlen_int_t  vlint;
+    ngx_http_v3_parse_settings_t    settings;
+} ngx_http_v3_parse_control_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_http_v3_parse_varlen_int_t  vlint;
+    union {
+        ngx_http_v3_parse_encoder_t  encoder;
+        ngx_http_v3_parse_decoder_t  decoder;
+        ngx_http_v3_parse_control_t  control;
+    } u;
+} ngx_http_v3_parse_uni_t;
+
+
+typedef struct {
+    ngx_uint_t                      state;
+    ngx_uint_t                      type;
+    ngx_uint_t                      length;
+    ngx_http_v3_parse_varlen_int_t  vlint;
+} ngx_http_v3_parse_data_t;
+
+
+/*
+ * Parse functions return codes:
+ *   NGX_DONE - parsing done
+ *   NGX_OK - sub-element done
+ *   NGX_AGAIN - more data expected
+ *   NGX_BUSY - waiting for external event
+ *   NGX_ERROR - internal error
+ *   NGX_HTTP_V3_ERROR_XXX - HTTP/3 or QPACK error
+ */
+
+ngx_int_t ngx_http_v3_parse_headers(ngx_connection_t *c,
+    ngx_http_v3_parse_headers_t *st, ngx_buf_t *b);
+ngx_int_t ngx_http_v3_parse_data(ngx_connection_t *c,
+    ngx_http_v3_parse_data_t *st, ngx_buf_t *b);
+ngx_int_t ngx_http_v3_parse_uni(ngx_connection_t *c,
+    ngx_http_v3_parse_uni_t *st, ngx_buf_t *b);
+
+
+#endif /* _NGX_HTTP_V3_PARSE_H_INCLUDED_ */
diff --git a/src/http/v3/ngx_http_v3_request.c b/src/http/v3/ngx_http_v3_request.c
new file mode 100644
index 0000000..87f5f32
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_request.c
@@ -0,0 +1,1710 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+static void ngx_http_v3_init_request_stream(ngx_connection_t *c);
+static void ngx_http_v3_wait_request_handler(ngx_event_t *rev);
+static void ngx_http_v3_cleanup_connection(void *data);
+static void ngx_http_v3_cleanup_request(void *data);
+static void ngx_http_v3_process_request(ngx_event_t *rev);
+static ngx_int_t ngx_http_v3_process_header(ngx_http_request_t *r,
+    ngx_str_t *name, ngx_str_t *value);
+static ngx_int_t ngx_http_v3_validate_header(ngx_http_request_t *r,
+    ngx_str_t *name, ngx_str_t *value);
+static ngx_int_t ngx_http_v3_process_pseudo_header(ngx_http_request_t *r,
+    ngx_str_t *name, ngx_str_t *value);
+static ngx_int_t ngx_http_v3_init_pseudo_headers(ngx_http_request_t *r);
+static ngx_int_t ngx_http_v3_process_request_header(ngx_http_request_t *r);
+static ngx_int_t ngx_http_v3_cookie(ngx_http_request_t *r, ngx_str_t *value);
+static ngx_int_t ngx_http_v3_construct_cookie_header(ngx_http_request_t *r);
+static void ngx_http_v3_read_client_request_body_handler(ngx_http_request_t *r);
+static ngx_int_t ngx_http_v3_do_read_client_request_body(ngx_http_request_t *r);
+static ngx_int_t ngx_http_v3_request_body_filter(ngx_http_request_t *r,
+    ngx_chain_t *in);
+
+
+static const struct {
+    ngx_str_t   name;
+    ngx_uint_t  method;
+} ngx_http_v3_methods[] = {
+
+    { ngx_string("GET"),       NGX_HTTP_GET },
+    { ngx_string("POST"),      NGX_HTTP_POST },
+    { ngx_string("HEAD"),      NGX_HTTP_HEAD },
+    { ngx_string("OPTIONS"),   NGX_HTTP_OPTIONS },
+    { ngx_string("PROPFIND"),  NGX_HTTP_PROPFIND },
+    { ngx_string("PUT"),       NGX_HTTP_PUT },
+    { ngx_string("MKCOL"),     NGX_HTTP_MKCOL },
+    { ngx_string("DELETE"),    NGX_HTTP_DELETE },
+    { ngx_string("COPY"),      NGX_HTTP_COPY },
+    { ngx_string("MOVE"),      NGX_HTTP_MOVE },
+    { ngx_string("PROPPATCH"), NGX_HTTP_PROPPATCH },
+    { ngx_string("LOCK"),      NGX_HTTP_LOCK },
+    { ngx_string("UNLOCK"),    NGX_HTTP_UNLOCK },
+    { ngx_string("PATCH"),     NGX_HTTP_PATCH },
+    { ngx_string("TRACE"),     NGX_HTTP_TRACE },
+    { ngx_string("CONNECT"),   NGX_HTTP_CONNECT }
+};
+
+
+void
+ngx_http_v3_init_stream(ngx_connection_t *c)
+{
+    ngx_http_connection_t     *hc, *phc;
+    ngx_http_v3_srv_conf_t    *h3scf;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    hc = c->data;
+
+    hc->ssl = 1;
+
+    clcf = ngx_http_get_module_loc_conf(hc->conf_ctx, ngx_http_core_module);
+
+    if (c->quic == NULL) {
+        h3scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v3_module);
+        h3scf->quic.idle_timeout = clcf->keepalive_timeout;
+
+        ngx_quic_run(c, &h3scf->quic);
+        return;
+    }
+
+    phc = ngx_http_quic_get_connection(c);
+
+    if (phc->ssl_servername) {
+        hc->ssl_servername = phc->ssl_servername;
+#if (NGX_PCRE)
+        hc->ssl_servername_regex = phc->ssl_servername_regex;
+#endif
+        hc->conf_ctx = phc->conf_ctx;
+
+        ngx_set_connection_log(c, clcf->error_log);
+    }
+
+    if (c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) {
+        ngx_http_v3_init_uni_stream(c);
+
+    } else  {
+        ngx_http_v3_init_request_stream(c);
+    }
+}
+
+
+ngx_int_t
+ngx_http_v3_init(ngx_connection_t *c)
+{
+    unsigned int               len;
+    const unsigned char       *data;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_v3_srv_conf_t    *h3scf;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 init");
+
+    if (ngx_http_v3_init_session(c) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    h3c = ngx_http_v3_get_session(c);
+    clcf = ngx_http_v3_get_module_loc_conf(c, ngx_http_core_module);
+    ngx_add_timer(&h3c->keepalive, clcf->keepalive_timeout);
+
+    h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
+
+    if (h3scf->enable_hq) {
+        if (!h3scf->enable) {
+            h3c->hq = 1;
+            return NGX_OK;
+        }
+
+        SSL_get0_alpn_selected(c->ssl->connection, &data, &len);
+
+        if (len == sizeof(NGX_HTTP_V3_HQ_PROTO) - 1
+            && ngx_strncmp(data, NGX_HTTP_V3_HQ_PROTO, len) == 0)
+        {
+            h3c->hq = 1;
+            return NGX_OK;
+        }
+    }
+
+    return ngx_http_v3_send_settings(c);
+}
+
+
+void
+ngx_http_v3_shutdown(ngx_connection_t *c)
+{
+    ngx_http_v3_session_t  *h3c;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 shutdown");
+
+    h3c = ngx_http_v3_get_session(c);
+
+    if (h3c == NULL) {
+        ngx_quic_finalize_connection(c, NGX_HTTP_V3_ERR_NO_ERROR,
+                                     "connection shutdown");
+        return;
+    }
+
+    if (!h3c->goaway) {
+        h3c->goaway = 1;
+
+        if (!h3c->hq) {
+            (void) ngx_http_v3_send_goaway(c, h3c->next_request_id);
+        }
+
+        ngx_http_v3_shutdown_connection(c, NGX_HTTP_V3_ERR_NO_ERROR,
+                                        "connection shutdown");
+    }
+}
+
+
+static void
+ngx_http_v3_init_request_stream(ngx_connection_t *c)
+{
+    uint64_t                   n;
+    ngx_event_t               *rev;
+    ngx_pool_cleanup_t        *cln;
+    ngx_http_connection_t     *hc;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_core_loc_conf_t  *clcf;
+    ngx_http_core_srv_conf_t  *cscf;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 init request stream");
+
+#if (NGX_STAT_STUB)
+    (void) ngx_atomic_fetch_add(ngx_stat_active, 1);
+#endif
+
+    hc = c->data;
+
+    clcf = ngx_http_get_module_loc_conf(hc->conf_ctx, ngx_http_core_module);
+
+    n = c->quic->id >> 2;
+
+    if (n >= clcf->keepalive_requests * 2) {
+        ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_EXCESSIVE_LOAD,
+                                        "too many requests per connection");
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    h3c = ngx_http_v3_get_session(c);
+
+    if (h3c->goaway) {
+        c->close = 1;
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    h3c->next_request_id = c->quic->id + 0x04;
+
+    if (n + 1 == clcf->keepalive_requests
+        || ngx_current_msec - c->start_time > clcf->keepalive_time)
+    {
+        h3c->goaway = 1;
+
+        if (!h3c->hq) {
+            if (ngx_http_v3_send_goaway(c, h3c->next_request_id) != NGX_OK) {
+                ngx_http_close_connection(c);
+                return;
+            }
+        }
+
+        ngx_http_v3_shutdown_connection(c, NGX_HTTP_V3_ERR_NO_ERROR,
+                                        "reached maximum number of requests");
+    }
+
+    cln = ngx_pool_cleanup_add(c->pool, 0);
+    if (cln == NULL) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    cln->handler = ngx_http_v3_cleanup_connection;
+    cln->data = c;
+
+    h3c->nrequests++;
+
+    if (h3c->keepalive.timer_set) {
+        ngx_del_timer(&h3c->keepalive);
+    }
+
+    rev = c->read;
+
+    if (!h3c->hq) {
+        rev->handler = ngx_http_v3_wait_request_handler;
+        c->write->handler = ngx_http_empty_handler;
+    }
+
+    if (rev->ready) {
+        rev->handler(rev);
+        return;
+    }
+
+    cscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_core_module);
+
+    ngx_add_timer(rev, cscf->client_header_timeout);
+    ngx_reusable_connection(c, 1);
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        ngx_http_close_connection(c);
+        return;
+    }
+}
+
+
+static void
+ngx_http_v3_wait_request_handler(ngx_event_t *rev)
+{
+    size_t                     size;
+    ssize_t                    n;
+    ngx_buf_t                 *b;
+    ngx_connection_t          *c;
+    ngx_pool_cleanup_t        *cln;
+    ngx_http_request_t        *r;
+    ngx_http_connection_t     *hc;
+    ngx_http_core_srv_conf_t  *cscf;
+
+    c = rev->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 wait request handler");
+
+    if (rev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
+        c->timedout = 1;
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    if (c->close) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    hc = c->data;
+    cscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_core_module);
+
+    size = cscf->client_header_buffer_size;
+
+    b = c->buffer;
+
+    if (b == NULL) {
+        b = ngx_create_temp_buf(c->pool, size);
+        if (b == NULL) {
+            ngx_http_close_connection(c);
+            return;
+        }
+
+        c->buffer = b;
+
+    } else if (b->start == NULL) {
+
+        b->start = ngx_palloc(c->pool, size);
+        if (b->start == NULL) {
+            ngx_http_close_connection(c);
+            return;
+        }
+
+        b->pos = b->start;
+        b->last = b->start;
+        b->end = b->last + size;
+    }
+
+    n = c->recv(c, b->last, size);
+
+    if (n == NGX_AGAIN) {
+
+        if (!rev->timer_set) {
+            ngx_add_timer(rev, cscf->client_header_timeout);
+            ngx_reusable_connection(c, 1);
+        }
+
+        if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+            ngx_http_close_connection(c);
+            return;
+        }
+
+        /*
+         * We are trying to not hold c->buffer's memory for an idle connection.
+         */
+
+        if (ngx_pfree(c->pool, b->start) == NGX_OK) {
+            b->start = NULL;
+        }
+
+        return;
+    }
+
+    if (n == NGX_ERROR) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    if (n == 0) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "client closed connection");
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    b->last += n;
+
+    c->log->action = "reading client request";
+
+    ngx_reusable_connection(c, 0);
+
+    r = ngx_http_create_request(c);
+    if (r == NULL) {
+        ngx_http_close_connection(c);
+        return;
+    }
+
+    r->http_version = NGX_HTTP_VERSION_30;
+
+    r->v3_parse = ngx_pcalloc(r->pool, sizeof(ngx_http_v3_parse_t));
+    if (r->v3_parse == NULL) {
+        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    r->v3_parse->header_limit = cscf->large_client_header_buffers.size
+                                * cscf->large_client_header_buffers.num;
+
+    c->data = r;
+    c->requests = (c->quic->id >> 2) + 1;
+
+    cln = ngx_pool_cleanup_add(r->pool, 0);
+    if (cln == NULL) {
+        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    cln->handler = ngx_http_v3_cleanup_request;
+    cln->data = r;
+
+    rev->handler = ngx_http_v3_process_request;
+    ngx_http_v3_process_request(rev);
+}
+
+
+void
+ngx_http_v3_reset_stream(ngx_connection_t *c)
+{
+    ngx_http_v3_session_t   *h3c;
+    ngx_http_v3_srv_conf_t  *h3scf;
+
+    h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
+
+    h3c = ngx_http_v3_get_session(c);
+
+    if (h3scf->max_table_capacity > 0 && !c->read->eof && !h3c->hq
+        && (c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0)
+    {
+        (void) ngx_http_v3_send_cancel_stream(c, c->quic->id);
+    }
+
+    if (c->timedout) {
+        ngx_quic_reset_stream(c, NGX_HTTP_V3_ERR_GENERAL_PROTOCOL_ERROR);
+
+    } else if (c->close) {
+        ngx_quic_reset_stream(c, NGX_HTTP_V3_ERR_REQUEST_REJECTED);
+
+    } else if (c->requests == 0 || c->error) {
+        ngx_quic_reset_stream(c, NGX_HTTP_V3_ERR_INTERNAL_ERROR);
+    }
+}
+
+
+static void
+ngx_http_v3_cleanup_connection(void *data)
+{
+    ngx_connection_t  *c = data;
+
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    h3c = ngx_http_v3_get_session(c);
+
+    if (--h3c->nrequests == 0) {
+        clcf = ngx_http_v3_get_module_loc_conf(c, ngx_http_core_module);
+        ngx_add_timer(&h3c->keepalive, clcf->keepalive_timeout);
+    }
+}
+
+
+static void
+ngx_http_v3_cleanup_request(void *data)
+{
+    ngx_http_request_t  *r = data;
+
+    if (!r->response_sent) {
+        r->connection->error = 1;
+    }
+}
+
+
+static void
+ngx_http_v3_process_request(ngx_event_t *rev)
+{
+    u_char                       *p;
+    ssize_t                       n;
+    ngx_buf_t                    *b;
+    ngx_int_t                     rc;
+    ngx_connection_t             *c;
+    ngx_http_request_t           *r;
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_core_srv_conf_t     *cscf;
+    ngx_http_v3_parse_headers_t  *st;
+
+    c = rev->data;
+    r = c->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, "http3 process request");
+
+    if (rev->timedout) {
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
+        c->timedout = 1;
+        ngx_http_close_request(r, NGX_HTTP_REQUEST_TIME_OUT);
+        return;
+    }
+
+    h3c = ngx_http_v3_get_session(c);
+
+    st = &r->v3_parse->headers;
+
+    b = r->header_in;
+
+    for ( ;; ) {
+
+        if (b->pos == b->last) {
+
+            if (rev->ready) {
+                n = c->recv(c, b->start, b->end - b->start);
+
+            } else {
+                n = NGX_AGAIN;
+            }
+
+            if (n == NGX_AGAIN) {
+                if (!rev->timer_set) {
+                    cscf = ngx_http_get_module_srv_conf(r,
+                                                        ngx_http_core_module);
+                    ngx_add_timer(rev, cscf->client_header_timeout);
+                }
+
+                if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+                    ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+                }
+
+                break;
+            }
+
+            if (n == 0) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                              "client prematurely closed connection");
+            }
+
+            if (n == 0 || n == NGX_ERROR) {
+                c->error = 1;
+                c->log->action = "reading client request";
+
+                ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+                break;
+            }
+
+            b->pos = b->start;
+            b->last = b->start + n;
+        }
+
+        p = b->pos;
+
+        rc = ngx_http_v3_parse_headers(c, st, b);
+
+        if (rc > 0) {
+            ngx_quic_reset_stream(c, rc);
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "client sent invalid header");
+            ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+            break;
+        }
+
+        if (rc == NGX_ERROR) {
+            ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+            break;
+        }
+
+        r->request_length += b->pos - p;
+        h3c->total_bytes += b->pos - p;
+
+        if (ngx_http_v3_check_flood(c) != NGX_OK) {
+            ngx_http_close_request(r, NGX_HTTP_CLOSE);
+            break;
+        }
+
+        if (rc == NGX_BUSY) {
+            if (rev->error) {
+                ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+                break;
+            }
+
+            if (!rev->timer_set) {
+                cscf = ngx_http_get_module_srv_conf(r,
+                                                    ngx_http_core_module);
+                ngx_add_timer(rev, cscf->client_header_timeout);
+            }
+
+            if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+                ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+            }
+
+            break;
+        }
+
+        if (rc == NGX_AGAIN) {
+            continue;
+        }
+
+        /* rc == NGX_OK || rc == NGX_DONE */
+
+        h3c->payload_bytes += ngx_http_v3_encode_field_l(NULL,
+                                                   &st->field_rep.field.name,
+                                                   &st->field_rep.field.value);
+
+        if (ngx_http_v3_process_header(r, &st->field_rep.field.name,
+                                       &st->field_rep.field.value)
+            != NGX_OK)
+        {
+            break;
+        }
+
+        if (rc == NGX_DONE) {
+            if (ngx_http_v3_process_request_header(r) != NGX_OK) {
+                break;
+            }
+
+            ngx_http_process_request(r);
+            break;
+        }
+    }
+
+    ngx_http_run_posted_requests(c);
+
+    return;
+}
+
+
+static ngx_int_t
+ngx_http_v3_process_header(ngx_http_request_t *r, ngx_str_t *name,
+    ngx_str_t *value)
+{
+    size_t                      len;
+    ngx_table_elt_t            *h;
+    ngx_http_header_t          *hh;
+    ngx_http_core_srv_conf_t   *cscf;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    static ngx_str_t cookie = ngx_string("cookie");
+
+    len = name->len + value->len;
+
+    if (len > r->v3_parse->header_limit) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent too large header");
+        ngx_http_finalize_request(r, NGX_HTTP_REQUEST_HEADER_TOO_LARGE);
+        return NGX_ERROR;
+    }
+
+    r->v3_parse->header_limit -= len;
+
+    if (ngx_http_v3_validate_header(r, name, value) != NGX_OK) {
+        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+        return NGX_ERROR;
+    }
+
+    if (r->invalid_header) {
+        cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+        if (cscf->ignore_invalid_headers) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent invalid header: \"%V\"", name);
+
+            return NGX_OK;
+        }
+    }
+
+    if (name->len && name->data[0] == ':') {
+        return ngx_http_v3_process_pseudo_header(r, name, value);
+    }
+
+    if (ngx_http_v3_init_pseudo_headers(r) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (name->len == cookie.len
+        && ngx_memcmp(name->data, cookie.data, cookie.len) == 0)
+    {
+        if (ngx_http_v3_cookie(r, value) != NGX_OK) {
+            ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+            return NGX_ERROR;
+        }
+
+    } else {
+        h = ngx_list_push(&r->headers_in.headers);
+        if (h == NULL) {
+            ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+            return NGX_ERROR;
+        }
+
+        h->key = *name;
+        h->value = *value;
+        h->lowcase_key = h->key.data;
+        h->hash = ngx_hash_key(h->key.data, h->key.len);
+
+        cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+        hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
+                           h->lowcase_key, h->key.len);
+
+        if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http3 header: \"%V: %V\"", name, value);
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v3_validate_header(ngx_http_request_t *r, ngx_str_t *name,
+    ngx_str_t *value)
+{
+    u_char                     ch;
+    ngx_uint_t                 i;
+    ngx_http_core_srv_conf_t  *cscf;
+
+    r->invalid_header = 0;
+
+    cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+    for (i = (name->data[0] == ':'); i != name->len; i++) {
+        ch = name->data[i];
+
+        if ((ch >= 'a' && ch <= 'z')
+            || (ch == '-')
+            || (ch >= '0' && ch <= '9')
+            || (ch == '_' && cscf->underscores_in_headers))
+        {
+            continue;
+        }
+
+        if (ch <= 0x20 || ch == 0x7f || ch == ':'
+            || (ch >= 'A' && ch <= 'Z'))
+        {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent invalid header name: \"%V\"", name);
+
+            return NGX_ERROR;
+        }
+
+        r->invalid_header = 1;
+    }
+
+    for (i = 0; i != value->len; i++) {
+        ch = value->data[i];
+
+        if (ch == '\0' || ch == LF || ch == CR) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent header \"%V\" with "
+                          "invalid value: \"%V\"", name, value);
+
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v3_process_pseudo_header(ngx_http_request_t *r, ngx_str_t *name,
+    ngx_str_t *value)
+{
+    u_char      ch, c;
+    ngx_uint_t  i;
+
+    if (r->request_line.len) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent out of order pseudo-headers");
+        goto failed;
+    }
+
+    if (name->len == 7 && ngx_strncmp(name->data, ":method", 7) == 0) {
+
+        if (r->method_name.len) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent duplicate \":method\" header");
+            goto failed;
+        }
+
+        if (value->len == 0) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent empty \":method\" header");
+            goto failed;
+        }
+
+        r->method_name = *value;
+
+        for (i = 0; i < sizeof(ngx_http_v3_methods)
+                        / sizeof(ngx_http_v3_methods[0]); i++)
+        {
+            if (value->len == ngx_http_v3_methods[i].name.len
+                && ngx_strncmp(value->data,
+                               ngx_http_v3_methods[i].name.data, value->len)
+                   == 0)
+            {
+                r->method = ngx_http_v3_methods[i].method;
+                break;
+            }
+        }
+
+        for (i = 0; i < value->len; i++) {
+            ch = value->data[i];
+
+            if ((ch < 'A' || ch > 'Z') && ch != '_' && ch != '-') {
+                ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                              "client sent invalid method: \"%V\"", value);
+                goto failed;
+            }
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http3 method \"%V\" %ui", value, r->method);
+        return NGX_OK;
+    }
+
+    if (name->len == 5 && ngx_strncmp(name->data, ":path", 5) == 0) {
+
+        if (r->uri_start) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent duplicate \":path\" header");
+            goto failed;
+        }
+
+        if (value->len == 0) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent empty \":path\" header");
+            goto failed;
+        }
+
+        r->uri_start = value->data;
+        r->uri_end = value->data + value->len;
+
+        if (ngx_http_parse_uri(r) != NGX_OK) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent invalid \":path\" header: \"%V\"",
+                          value);
+            goto failed;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http3 path \"%V\"", value);
+        return NGX_OK;
+    }
+
+    if (name->len == 7 && ngx_strncmp(name->data, ":scheme", 7) == 0) {
+
+        if (r->schema.len) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent duplicate \":scheme\" header");
+            goto failed;
+        }
+
+        if (value->len == 0) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent empty \":scheme\" header");
+            goto failed;
+        }
+
+        for (i = 0; i < value->len; i++) {
+            ch = value->data[i];
+
+            c = (u_char) (ch | 0x20);
+            if (c >= 'a' && c <= 'z') {
+                continue;
+            }
+
+            if (((ch >= '0' && ch <= '9')
+                 || ch == '+' || ch == '-' || ch == '.')
+                && i > 0)
+            {
+                continue;
+            }
+
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent invalid \":scheme\" header: \"%V\"",
+                          value);
+            goto failed;
+        }
+
+        r->schema = *value;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http3 schema \"%V\"", value);
+        return NGX_OK;
+    }
+
+    if (name->len == 10 && ngx_strncmp(name->data, ":authority", 10) == 0) {
+
+        if (r->host_start) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent duplicate \":authority\" header");
+            goto failed;
+        }
+
+        r->host_start = value->data;
+        r->host_end = value->data + value->len;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http3 authority \"%V\"", value);
+        return NGX_OK;
+    }
+
+    ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                  "client sent unknown pseudo-header \"%V\"", name);
+
+failed:
+
+    ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_v3_init_pseudo_headers(ngx_http_request_t *r)
+{
+    size_t      len;
+    u_char     *p;
+    ngx_int_t   rc;
+    ngx_str_t   host;
+
+    if (r->request_line.len) {
+        return NGX_OK;
+    }
+
+    if (r->method_name.len == 0) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent no \":method\" header");
+        goto failed;
+    }
+
+    if (r->schema.len == 0) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent no \":scheme\" header");
+        goto failed;
+    }
+
+    if (r->uri_start == NULL) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent no \":path\" header");
+        goto failed;
+    }
+
+    len = r->method_name.len + 1
+          + (r->uri_end - r->uri_start) + 1
+          + sizeof("HTTP/3.0") - 1;
+
+    p = ngx_pnalloc(r->pool, len);
+    if (p == NULL) {
+        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NGX_ERROR;
+    }
+
+    r->request_line.data = p;
+
+    p = ngx_cpymem(p, r->method_name.data, r->method_name.len);
+    *p++ = ' ';
+    p = ngx_cpymem(p, r->uri_start, r->uri_end - r->uri_start);
+    *p++ = ' ';
+    p = ngx_cpymem(p, "HTTP/3.0", sizeof("HTTP/3.0") - 1);
+
+    r->request_line.len = p - r->request_line.data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http3 request line: \"%V\"", &r->request_line);
+
+    ngx_str_set(&r->http_protocol, "HTTP/3.0");
+
+    if (ngx_http_process_request_uri(r) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (r->host_end) {
+
+        host.len = r->host_end - r->host_start;
+        host.data = r->host_start;
+
+        rc = ngx_http_validate_host(&host, r->pool, 0);
+
+        if (rc == NGX_DECLINED) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent invalid host in request line");
+            goto failed;
+        }
+
+        if (rc == NGX_ERROR) {
+            ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+            return NGX_ERROR;
+        }
+
+        if (ngx_http_set_virtual_server(r, &host) == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+
+        r->headers_in.server = host;
+    }
+
+    if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
+                      sizeof(ngx_table_elt_t))
+        != NGX_OK)
+    {
+        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_v3_process_request_header(ngx_http_request_t *r)
+{
+    ssize_t                  n;
+    ngx_buf_t               *b;
+    ngx_connection_t        *c;
+    ngx_http_v3_session_t   *h3c;
+    ngx_http_v3_srv_conf_t  *h3scf;
+
+    c = r->connection;
+
+    if (ngx_http_v3_init_pseudo_headers(r) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    h3c = ngx_http_v3_get_session(c);
+    h3scf = ngx_http_get_module_srv_conf(r, ngx_http_v3_module);
+
+    if ((h3c->hq && !h3scf->enable_hq) || (!h3c->hq && !h3scf->enable)) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "client attempted to request the server name "
+                      "for which the negotiated protocol is disabled");
+        ngx_http_finalize_request(r, NGX_HTTP_MISDIRECTED_REQUEST);
+        return NGX_ERROR;
+    }
+
+    if (ngx_http_v3_construct_cookie_header(r) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (r->headers_in.server.len == 0) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "client sent neither \":authority\" nor \"Host\" header");
+        goto failed;
+    }
+
+    if (r->headers_in.host) {
+        if (r->headers_in.host->value.len != r->headers_in.server.len
+            || ngx_memcmp(r->headers_in.host->value.data,
+                          r->headers_in.server.data,
+                          r->headers_in.server.len)
+               != 0)
+        {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "client sent \":authority\" and \"Host\" headers "
+                          "with different values");
+            goto failed;
+        }
+    }
+
+    if (r->headers_in.content_length) {
+        r->headers_in.content_length_n =
+                            ngx_atoof(r->headers_in.content_length->value.data,
+                                      r->headers_in.content_length->value.len);
+
+        if (r->headers_in.content_length_n == NGX_ERROR) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "client sent invalid \"Content-Length\" header");
+            goto failed;
+        }
+
+    } else {
+        b = r->header_in;
+        n = b->last - b->pos;
+
+        if (n == 0) {
+            n = c->recv(c, b->start, b->end - b->start);
+
+            if (n == NGX_ERROR) {
+                ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+                return NGX_ERROR;
+            }
+
+            if (n > 0) {
+                b->pos = b->start;
+                b->last = b->start + n;
+            }
+        }
+
+        if (n != 0) {
+            r->headers_in.chunked = 1;
+        }
+    }
+
+    if (r->method == NGX_HTTP_CONNECT) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0, "client sent CONNECT method");
+        ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
+        return NGX_ERROR;
+    }
+
+    if (r->method == NGX_HTTP_TRACE) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0, "client sent TRACE method");
+        ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_v3_cookie(ngx_http_request_t *r, ngx_str_t *value)
+{
+    ngx_str_t    *val;
+    ngx_array_t  *cookies;
+
+    cookies = r->v3_parse->cookies;
+
+    if (cookies == NULL) {
+        cookies = ngx_array_create(r->pool, 2, sizeof(ngx_str_t));
+        if (cookies == NULL) {
+            return NGX_ERROR;
+        }
+
+        r->v3_parse->cookies = cookies;
+    }
+
+    val = ngx_array_push(cookies);
+    if (val == NULL) {
+        return NGX_ERROR;
+    }
+
+    *val = *value;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v3_construct_cookie_header(ngx_http_request_t *r)
+{
+    u_char                     *buf, *p, *end;
+    size_t                      len;
+    ngx_str_t                  *vals;
+    ngx_uint_t                  i;
+    ngx_array_t                *cookies;
+    ngx_table_elt_t            *h;
+    ngx_http_header_t          *hh;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    static ngx_str_t cookie = ngx_string("cookie");
+
+    cookies = r->v3_parse->cookies;
+
+    if (cookies == NULL) {
+        return NGX_OK;
+    }
+
+    vals = cookies->elts;
+
+    i = 0;
+    len = 0;
+
+    do {
+        len += vals[i].len + 2;
+    } while (++i != cookies->nelts);
+
+    len -= 2;
+
+    buf = ngx_pnalloc(r->pool, len + 1);
+    if (buf == NULL) {
+        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NGX_ERROR;
+    }
+
+    p = buf;
+    end = buf + len;
+
+    for (i = 0; /* void */ ; i++) {
+
+        p = ngx_cpymem(p, vals[i].data, vals[i].len);
+
+        if (p == end) {
+            *p = '\0';
+            break;
+        }
+
+        *p++ = ';'; *p++ = ' ';
+    }
+
+    h = ngx_list_push(&r->headers_in.headers);
+    if (h == NULL) {
+        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NGX_ERROR;
+    }
+
+    h->hash = ngx_hash(ngx_hash(ngx_hash(ngx_hash(
+                                    ngx_hash('c', 'o'), 'o'), 'k'), 'i'), 'e');
+
+    h->key.len = cookie.len;
+    h->key.data = cookie.data;
+
+    h->value.len = len;
+    h->value.data = buf;
+
+    h->lowcase_key = cookie.data;
+
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+    hh = ngx_hash_find(&cmcf->headers_in_hash, h->hash,
+                       h->lowcase_key, h->key.len);
+
+    if (hh == NULL) {
+        ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return NGX_ERROR;
+    }
+
+    if (hh->handler(r, h, hh->offset) != NGX_OK) {
+        /*
+         * request has been finalized already
+         * in ngx_http_process_multi_header_lines()
+         */
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_v3_read_request_body(ngx_http_request_t *r)
+{
+    size_t                     preread;
+    ngx_int_t                  rc;
+    ngx_chain_t               *cl, out;
+    ngx_http_request_body_t   *rb;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    rb = r->request_body;
+
+    preread = r->header_in->last - r->header_in->pos;
+
+    if (preread) {
+
+        /* there is the pre-read part of the request body */
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http3 client request body preread %uz", preread);
+
+        out.buf = r->header_in;
+        out.next = NULL;
+        cl = &out;
+
+    } else {
+        cl = NULL;
+    }
+
+    rc = ngx_http_v3_request_body_filter(r, cl);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    if (rb->rest == 0 && rb->last_saved) {
+        /* the whole request body was pre-read */
+        r->request_body_no_buffering = 0;
+        rb->post_handler(r);
+        return NGX_OK;
+    }
+
+    if (rb->rest < 0) {
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "negative request body rest");
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    rb->buf = ngx_create_temp_buf(r->pool, clcf->client_body_buffer_size);
+    if (rb->buf == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    r->read_event_handler = ngx_http_v3_read_client_request_body_handler;
+    r->write_event_handler = ngx_http_request_empty_handler;
+
+    return ngx_http_v3_do_read_client_request_body(r);
+}
+
+
+static void
+ngx_http_v3_read_client_request_body_handler(ngx_http_request_t *r)
+{
+    ngx_int_t  rc;
+
+    if (r->connection->read->timedout) {
+        r->connection->timedout = 1;
+        ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
+        return;
+    }
+
+    rc = ngx_http_v3_do_read_client_request_body(r);
+
+    if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+        ngx_http_finalize_request(r, rc);
+    }
+}
+
+
+ngx_int_t
+ngx_http_v3_read_unbuffered_request_body(ngx_http_request_t *r)
+{
+    ngx_int_t  rc;
+
+    if (r->connection->read->timedout) {
+        r->connection->timedout = 1;
+        return NGX_HTTP_REQUEST_TIME_OUT;
+    }
+
+    rc = ngx_http_v3_do_read_client_request_body(r);
+
+    if (rc == NGX_OK) {
+        r->reading_body = 0;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_v3_do_read_client_request_body(ngx_http_request_t *r)
+{
+    off_t                      rest;
+    size_t                     size;
+    ssize_t                    n;
+    ngx_int_t                  rc;
+    ngx_uint_t                 flush;
+    ngx_chain_t                out;
+    ngx_connection_t          *c;
+    ngx_http_request_body_t   *rb;
+    ngx_http_core_loc_conf_t  *clcf;
+
+    c = r->connection;
+    rb = r->request_body;
+    flush = 1;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 read client request body");
+
+    for ( ;; ) {
+        for ( ;; ) {
+            if (rb->rest == 0) {
+                break;
+            }
+
+            if (rb->buf->last == rb->buf->end) {
+
+                /* update chains */
+
+                rc = ngx_http_v3_request_body_filter(r, NULL);
+
+                if (rc != NGX_OK) {
+                    return rc;
+                }
+
+                if (rb->busy != NULL) {
+                    if (r->request_body_no_buffering) {
+                        if (c->read->timer_set) {
+                            ngx_del_timer(c->read);
+                        }
+
+                        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                        }
+
+                        return NGX_AGAIN;
+                    }
+
+                    if (rb->filter_need_buffering) {
+                        clcf = ngx_http_get_module_loc_conf(r,
+                                                         ngx_http_core_module);
+                        ngx_add_timer(c->read, clcf->client_body_timeout);
+
+                        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                        }
+
+                        return NGX_AGAIN;
+                    }
+
+                    ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                                  "busy buffers after request body flush");
+
+                    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                }
+
+                flush = 0;
+                rb->buf->pos = rb->buf->start;
+                rb->buf->last = rb->buf->start;
+            }
+
+            size = rb->buf->end - rb->buf->last;
+            rest = rb->rest - (rb->buf->last - rb->buf->pos);
+
+            if ((off_t) size > rest) {
+                size = (size_t) rest;
+            }
+
+            if (size == 0) {
+                break;
+            }
+
+            n = c->recv(c, rb->buf->last, size);
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 client request body recv %z", n);
+
+            if (n == NGX_AGAIN) {
+                break;
+            }
+
+            if (n == 0) {
+                rb->buf->last_buf = 1;
+            }
+
+            if (n == NGX_ERROR) {
+                c->error = 1;
+                return NGX_HTTP_BAD_REQUEST;
+            }
+
+            rb->buf->last += n;
+
+            /* pass buffer to request body filter chain */
+
+            flush = 0;
+            out.buf = rb->buf;
+            out.next = NULL;
+
+            rc = ngx_http_v3_request_body_filter(r, &out);
+
+            if (rc != NGX_OK) {
+                return rc;
+            }
+
+            if (rb->rest == 0) {
+                break;
+            }
+
+            if (rb->buf->last < rb->buf->end) {
+                break;
+            }
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 client request body rest %O", rb->rest);
+
+        if (flush) {
+            rc = ngx_http_v3_request_body_filter(r, NULL);
+
+            if (rc != NGX_OK) {
+                return rc;
+            }
+        }
+
+        if (rb->rest == 0 && rb->last_saved) {
+            break;
+        }
+
+        if (!c->read->ready || rb->rest == 0) {
+
+            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+            ngx_add_timer(c->read, clcf->client_body_timeout);
+
+            if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            return NGX_AGAIN;
+        }
+    }
+
+    if (c->read->timer_set) {
+        ngx_del_timer(c->read);
+    }
+
+    if (!r->request_body_no_buffering) {
+        r->read_event_handler = ngx_http_block_reading;
+        rb->post_handler(r);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_v3_request_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    off_t                      max;
+    size_t                     size;
+    u_char                    *p;
+    ngx_int_t                  rc;
+    ngx_buf_t                 *b;
+    ngx_uint_t                 last;
+    ngx_chain_t               *cl, *out, *tl, **ll;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_request_body_t   *rb;
+    ngx_http_core_loc_conf_t  *clcf;
+    ngx_http_core_srv_conf_t  *cscf;
+    ngx_http_v3_parse_data_t  *st;
+
+    rb = r->request_body;
+    st = &r->v3_parse->body;
+
+    h3c = ngx_http_v3_get_session(r->connection);
+
+    if (rb->rest == -1) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http3 request body filter");
+
+        cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+        rb->rest = cscf->large_client_header_buffers.size;
+    }
+
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+
+    max = r->headers_in.content_length_n;
+
+    if (max == -1 && clcf->client_max_body_size) {
+        max = clcf->client_max_body_size;
+    }
+
+    out = NULL;
+    ll = &out;
+    last = 0;
+
+    for (cl = in; cl; cl = cl->next) {
+
+        ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
+                       "http3 body buf "
+                       "t:%d f:%d %p, pos %p, size: %z file: %O, size: %O",
+                       cl->buf->temporary, cl->buf->in_file,
+                       cl->buf->start, cl->buf->pos,
+                       cl->buf->last - cl->buf->pos,
+                       cl->buf->file_pos,
+                       cl->buf->file_last - cl->buf->file_pos);
+
+        if (cl->buf->last_buf) {
+            last = 1;
+        }
+
+        b = NULL;
+
+        while (cl->buf->pos < cl->buf->last) {
+
+            if (st->length == 0) {
+                p = cl->buf->pos;
+
+                rc = ngx_http_v3_parse_data(r->connection, st, cl->buf);
+
+                r->request_length += cl->buf->pos - p;
+                h3c->total_bytes += cl->buf->pos - p;
+
+                if (ngx_http_v3_check_flood(r->connection) != NGX_OK) {
+                    return NGX_HTTP_CLOSE;
+                }
+
+                if (rc == NGX_AGAIN) {
+                    continue;
+                }
+
+                if (rc == NGX_DONE) {
+                    last = 1;
+                    goto done;
+                }
+
+                if (rc > 0) {
+                    ngx_quic_reset_stream(r->connection, rc);
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "client sent invalid body");
+                    return NGX_HTTP_BAD_REQUEST;
+                }
+
+                if (rc == NGX_ERROR) {
+                    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                }
+
+                /* rc == NGX_OK */
+
+                if (max != -1 && (uint64_t) (max - rb->received) < st->length) {
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                                  "client intended to send too large "
+                                  "body: %O+%ui bytes",
+                                  rb->received, st->length);
+
+                    return NGX_HTTP_REQUEST_ENTITY_TOO_LARGE;
+                }
+
+                continue;
+            }
+
+            if (b
+                && st->length <= 128
+                && (uint64_t) (cl->buf->last - cl->buf->pos) >= st->length)
+            {
+                rb->received += st->length;
+                r->request_length += st->length;
+                h3c->total_bytes += st->length;
+                h3c->payload_bytes += st->length;
+
+                if (st->length < 8) {
+
+                    while (st->length) {
+                        *b->last++ = *cl->buf->pos++;
+                        st->length--;
+                    }
+
+                } else {
+                    ngx_memmove(b->last, cl->buf->pos, st->length);
+                    b->last += st->length;
+                    cl->buf->pos += st->length;
+                    st->length = 0;
+                }
+
+                continue;
+            }
+
+            tl = ngx_chain_get_free_buf(r->pool, &rb->free);
+            if (tl == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            b = tl->buf;
+
+            ngx_memzero(b, sizeof(ngx_buf_t));
+
+            b->temporary = 1;
+            b->tag = (ngx_buf_tag_t) &ngx_http_read_client_request_body;
+            b->start = cl->buf->pos;
+            b->pos = cl->buf->pos;
+            b->last = cl->buf->last;
+            b->end = cl->buf->end;
+            b->flush = r->request_body_no_buffering;
+
+            *ll = tl;
+            ll = &tl->next;
+
+            size = cl->buf->last - cl->buf->pos;
+
+            if (size > st->length) {
+                cl->buf->pos += (size_t) st->length;
+                rb->received += st->length;
+                r->request_length += st->length;
+                h3c->total_bytes += st->length;
+                h3c->payload_bytes += st->length;
+                st->length = 0;
+
+            } else {
+                st->length -= size;
+                rb->received += size;
+                r->request_length += size;
+                h3c->total_bytes += size;
+                h3c->payload_bytes += size;
+                cl->buf->pos = cl->buf->last;
+            }
+
+            b->last = cl->buf->pos;
+        }
+    }
+
+done:
+
+    if (last) {
+
+        if (st->length > 0) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client prematurely closed stream");
+            r->connection->error = 1;
+            return NGX_HTTP_BAD_REQUEST;
+        }
+
+        if (r->headers_in.content_length_n == -1) {
+            r->headers_in.content_length_n = rb->received;
+
+        } else if (r->headers_in.content_length_n != rb->received) {
+            ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                          "client sent less body data than expected: "
+                          "%O out of %O bytes of request body received",
+                          rb->received, r->headers_in.content_length_n);
+            return NGX_HTTP_BAD_REQUEST;
+        }
+
+        rb->rest = 0;
+
+        tl = ngx_chain_get_free_buf(r->pool, &rb->free);
+        if (tl == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        b = tl->buf;
+
+        ngx_memzero(b, sizeof(ngx_buf_t));
+
+        b->last_buf = 1;
+
+        *ll = tl;
+
+    } else {
+
+        /* set rb->rest, amount of data we want to see next time */
+
+        cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+
+        rb->rest = (off_t) cscf->large_client_header_buffers.size;
+    }
+
+    rc = ngx_http_top_request_body_filter(r, out);
+
+    ngx_chain_update_chains(r->pool, &rb->free, &rb->busy, &out,
+                            (ngx_buf_tag_t) &ngx_http_read_client_request_body);
+
+    return rc;
+}
diff --git a/src/http/v3/ngx_http_v3_table.c b/src/http/v3/ngx_http_v3_table.c
new file mode 100644
index 0000000..f49a8fc
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_table.c
@@ -0,0 +1,715 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+#define ngx_http_v3_table_entry_size(n, v) ((n)->len + (v)->len + 32)
+
+
+static ngx_int_t ngx_http_v3_evict(ngx_connection_t *c, size_t target);
+static void ngx_http_v3_unblock(void *data);
+static ngx_int_t ngx_http_v3_new_entry(ngx_connection_t *c);
+
+
+typedef struct {
+    ngx_queue_t        queue;
+    ngx_connection_t  *connection;
+    ngx_uint_t        *nblocked;
+} ngx_http_v3_block_t;
+
+
+static ngx_http_v3_field_t  ngx_http_v3_static_table[] = {
+
+    { ngx_string(":authority"),            ngx_string("") },
+    { ngx_string(":path"),                 ngx_string("/") },
+    { ngx_string("age"),                   ngx_string("0") },
+    { ngx_string("content-disposition"),   ngx_string("") },
+    { ngx_string("content-length"),        ngx_string("0") },
+    { ngx_string("cookie"),                ngx_string("") },
+    { ngx_string("date"),                  ngx_string("") },
+    { ngx_string("etag"),                  ngx_string("") },
+    { ngx_string("if-modified-since"),     ngx_string("") },
+    { ngx_string("if-none-match"),         ngx_string("") },
+    { ngx_string("last-modified"),         ngx_string("") },
+    { ngx_string("link"),                  ngx_string("") },
+    { ngx_string("location"),              ngx_string("") },
+    { ngx_string("referer"),               ngx_string("") },
+    { ngx_string("set-cookie"),            ngx_string("") },
+    { ngx_string(":method"),               ngx_string("CONNECT") },
+    { ngx_string(":method"),               ngx_string("DELETE") },
+    { ngx_string(":method"),               ngx_string("GET") },
+    { ngx_string(":method"),               ngx_string("HEAD") },
+    { ngx_string(":method"),               ngx_string("OPTIONS") },
+    { ngx_string(":method"),               ngx_string("POST") },
+    { ngx_string(":method"),               ngx_string("PUT") },
+    { ngx_string(":scheme"),               ngx_string("http") },
+    { ngx_string(":scheme"),               ngx_string("https") },
+    { ngx_string(":status"),               ngx_string("103") },
+    { ngx_string(":status"),               ngx_string("200") },
+    { ngx_string(":status"),               ngx_string("304") },
+    { ngx_string(":status"),               ngx_string("404") },
+    { ngx_string(":status"),               ngx_string("503") },
+    { ngx_string("accept"),                ngx_string("*/*") },
+    { ngx_string("accept"),
+          ngx_string("application/dns-message") },
+    { ngx_string("accept-encoding"),       ngx_string("gzip, deflate, br") },
+    { ngx_string("accept-ranges"),         ngx_string("bytes") },
+    { ngx_string("access-control-allow-headers"),
+                                           ngx_string("cache-control") },
+    { ngx_string("access-control-allow-headers"),
+                                           ngx_string("content-type") },
+    { ngx_string("access-control-allow-origin"),
+                                           ngx_string("*") },
+    { ngx_string("cache-control"),         ngx_string("max-age=0") },
+    { ngx_string("cache-control"),         ngx_string("max-age=2592000") },
+    { ngx_string("cache-control"),         ngx_string("max-age=604800") },
+    { ngx_string("cache-control"),         ngx_string("no-cache") },
+    { ngx_string("cache-control"),         ngx_string("no-store") },
+    { ngx_string("cache-control"),
+          ngx_string("public, max-age=31536000") },
+    { ngx_string("content-encoding"),      ngx_string("br") },
+    { ngx_string("content-encoding"),      ngx_string("gzip") },
+    { ngx_string("content-type"),
+          ngx_string("application/dns-message") },
+    { ngx_string("content-type"),
+          ngx_string("application/javascript") },
+    { ngx_string("content-type"),          ngx_string("application/json") },
+    { ngx_string("content-type"),
+          ngx_string("application/x-www-form-urlencoded") },
+    { ngx_string("content-type"),          ngx_string("image/gif") },
+    { ngx_string("content-type"),          ngx_string("image/jpeg") },
+    { ngx_string("content-type"),          ngx_string("image/png") },
+    { ngx_string("content-type"),          ngx_string("text/css") },
+    { ngx_string("content-type"),
+          ngx_string("text/html;charset=utf-8") },
+    { ngx_string("content-type"),          ngx_string("text/plain") },
+    { ngx_string("content-type"),
+          ngx_string("text/plain;charset=utf-8") },
+    { ngx_string("range"),                 ngx_string("bytes=0-") },
+    { ngx_string("strict-transport-security"),
+                                           ngx_string("max-age=31536000") },
+    { ngx_string("strict-transport-security"),
+          ngx_string("max-age=31536000;includesubdomains") },
+    { ngx_string("strict-transport-security"),
+          ngx_string("max-age=31536000;includesubdomains;preload") },
+    { ngx_string("vary"),                  ngx_string("accept-encoding") },
+    { ngx_string("vary"),                  ngx_string("origin") },
+    { ngx_string("x-content-type-options"),
+                                           ngx_string("nosniff") },
+    { ngx_string("x-xss-protection"),      ngx_string("1;mode=block") },
+    { ngx_string(":status"),               ngx_string("100") },
+    { ngx_string(":status"),               ngx_string("204") },
+    { ngx_string(":status"),               ngx_string("206") },
+    { ngx_string(":status"),               ngx_string("302") },
+    { ngx_string(":status"),               ngx_string("400") },
+    { ngx_string(":status"),               ngx_string("403") },
+    { ngx_string(":status"),               ngx_string("421") },
+    { ngx_string(":status"),               ngx_string("425") },
+    { ngx_string(":status"),               ngx_string("500") },
+    { ngx_string("accept-language"),       ngx_string("") },
+    { ngx_string("access-control-allow-credentials"),
+                                           ngx_string("FALSE") },
+    { ngx_string("access-control-allow-credentials"),
+                                           ngx_string("TRUE") },
+    { ngx_string("access-control-allow-headers"),
+                                           ngx_string("*") },
+    { ngx_string("access-control-allow-methods"),
+                                           ngx_string("get") },
+    { ngx_string("access-control-allow-methods"),
+                                           ngx_string("get, post, options") },
+    { ngx_string("access-control-allow-methods"),
+                                           ngx_string("options") },
+    { ngx_string("access-control-expose-headers"),
+                                           ngx_string("content-length") },
+    { ngx_string("access-control-request-headers"),
+                                           ngx_string("content-type") },
+    { ngx_string("access-control-request-method"),
+                                           ngx_string("get") },
+    { ngx_string("access-control-request-method"),
+                                           ngx_string("post") },
+    { ngx_string("alt-svc"),               ngx_string("clear") },
+    { ngx_string("authorization"),         ngx_string("") },
+    { ngx_string("content-security-policy"),
+          ngx_string("script-src 'none';object-src 'none';base-uri 'none'") },
+    { ngx_string("early-data"),            ngx_string("1") },
+    { ngx_string("expect-ct"),             ngx_string("") },
+    { ngx_string("forwarded"),             ngx_string("") },
+    { ngx_string("if-range"),              ngx_string("") },
+    { ngx_string("origin"),                ngx_string("") },
+    { ngx_string("purpose"),               ngx_string("prefetch") },
+    { ngx_string("server"),                ngx_string("") },
+    { ngx_string("timing-allow-origin"),   ngx_string("*") },
+    { ngx_string("upgrade-insecure-requests"),
+                                           ngx_string("1") },
+    { ngx_string("user-agent"),            ngx_string("") },
+    { ngx_string("x-forwarded-for"),       ngx_string("") },
+    { ngx_string("x-frame-options"),       ngx_string("deny") },
+    { ngx_string("x-frame-options"),       ngx_string("sameorigin") }
+};
+
+
+ngx_int_t
+ngx_http_v3_ref_insert(ngx_connection_t *c, ngx_uint_t dynamic,
+    ngx_uint_t index, ngx_str_t *value)
+{
+    ngx_str_t                     name;
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    if (dynamic) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 ref insert dynamic[%ui] \"%V\"", index, value);
+
+        h3c = ngx_http_v3_get_session(c);
+        dt = &h3c->table;
+
+        if (dt->base + dt->nelts <= index) {
+            return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
+        }
+
+        index = dt->base + dt->nelts - 1 - index;
+
+        if (ngx_http_v3_lookup(c, index, &name, NULL) != NGX_OK) {
+            return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
+        }
+
+    } else {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 ref insert static[%ui] \"%V\"", index, value);
+
+        if (ngx_http_v3_lookup_static(c, index, &name, NULL) != NGX_OK) {
+            return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
+        }
+    }
+
+    return ngx_http_v3_insert(c, &name, value);
+}
+
+
+ngx_int_t
+ngx_http_v3_insert(ngx_connection_t *c, ngx_str_t *name, ngx_str_t *value)
+{
+    u_char                       *p;
+    size_t                        size;
+    ngx_http_v3_field_t          *field;
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    size = ngx_http_v3_table_entry_size(name, value);
+
+    h3c = ngx_http_v3_get_session(c);
+    dt = &h3c->table;
+
+    if (size > dt->capacity) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                      "not enough dynamic table capacity");
+        return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
+    }
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 insert [%ui] \"%V\":\"%V\", size:%uz",
+                   dt->base + dt->nelts, name, value, size);
+
+    p = ngx_alloc(sizeof(ngx_http_v3_field_t) + name->len + value->len,
+                  c->log);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    field = (ngx_http_v3_field_t *) p;
+
+    field->name.data = p + sizeof(ngx_http_v3_field_t);
+    field->name.len = name->len;
+    field->value.data = ngx_cpymem(field->name.data, name->data, name->len);
+    field->value.len = value->len;
+    ngx_memcpy(field->value.data, value->data, value->len);
+
+    dt->elts[dt->nelts++] = field;
+    dt->size += size;
+
+    dt->insert_count++;
+
+    if (ngx_http_v3_evict(c, dt->capacity) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ngx_post_event(&dt->send_insert_count, &ngx_posted_events);
+
+    if (ngx_http_v3_new_entry(c) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+void
+ngx_http_v3_inc_insert_count_handler(ngx_event_t *ev)
+{
+    ngx_connection_t             *c;
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    c = ev->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 inc insert count handler");
+
+    h3c = ngx_http_v3_get_session(c);
+    dt = &h3c->table;
+
+    if (dt->insert_count > dt->ack_insert_count) {
+        if (ngx_http_v3_send_inc_insert_count(c,
+                                       dt->insert_count - dt->ack_insert_count)
+            != NGX_OK)
+        {
+            return;
+        }
+
+        dt->ack_insert_count = dt->insert_count;
+    }
+}
+
+
+ngx_int_t
+ngx_http_v3_set_capacity(ngx_connection_t *c, ngx_uint_t capacity)
+{
+    ngx_uint_t                     max, prev_max;
+    ngx_http_v3_field_t          **elts;
+    ngx_http_v3_session_t         *h3c;
+    ngx_http_v3_srv_conf_t        *h3scf;
+    ngx_http_v3_dynamic_table_t   *dt;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 set capacity %ui", capacity);
+
+    h3c = ngx_http_v3_get_session(c);
+    h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
+
+    if (capacity > h3scf->max_table_capacity) {
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "client exceeded http3_max_table_capacity limit");
+        return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
+    }
+
+    if (ngx_http_v3_evict(c, capacity) != NGX_OK) {
+        return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
+    }
+
+    dt = &h3c->table;
+    max = capacity / 32;
+    prev_max = dt->capacity / 32;
+
+    if (max > prev_max) {
+        elts = ngx_alloc(max * sizeof(void *), c->log);
+        if (elts == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (dt->elts) {
+            ngx_memcpy(elts, dt->elts, dt->nelts * sizeof(void *));
+            ngx_free(dt->elts);
+        }
+
+        dt->elts = elts;
+    }
+
+    dt->capacity = capacity;
+
+    return NGX_OK;
+}
+
+
+void
+ngx_http_v3_cleanup_table(ngx_http_v3_session_t *h3c)
+{
+    ngx_uint_t                    n;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    dt = &h3c->table;
+
+    if (dt->elts == NULL) {
+        return;
+    }
+
+    for (n = 0; n < dt->nelts; n++) {
+        ngx_free(dt->elts[n]);
+    }
+
+    ngx_free(dt->elts);
+}
+
+
+static ngx_int_t
+ngx_http_v3_evict(ngx_connection_t *c, size_t target)
+{
+    size_t                        size;
+    ngx_uint_t                    n;
+    ngx_http_v3_field_t          *field;
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    h3c = ngx_http_v3_get_session(c);
+    dt = &h3c->table;
+    n = 0;
+
+    while (dt->size > target) {
+        field = dt->elts[n++];
+        size = ngx_http_v3_table_entry_size(&field->name, &field->value);
+
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 evict [%ui] \"%V\":\"%V\" size:%uz",
+                       dt->base, &field->name, &field->value, size);
+
+        ngx_free(field);
+        dt->size -= size;
+    }
+
+    if (n) {
+        dt->nelts -= n;
+        dt->base += n;
+        ngx_memmove(dt->elts, &dt->elts[n], dt->nelts * sizeof(void *));
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_v3_duplicate(ngx_connection_t *c, ngx_uint_t index)
+{
+    ngx_str_t                     name, value;
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 duplicate %ui", index);
+
+    h3c = ngx_http_v3_get_session(c);
+    dt = &h3c->table;
+
+    if (dt->base + dt->nelts <= index) {
+        return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
+    }
+
+    index = dt->base + dt->nelts - 1 - index;
+
+    if (ngx_http_v3_lookup(c, index, &name, &value) != NGX_OK) {
+        return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
+    }
+
+    return ngx_http_v3_insert(c, &name, &value);
+}
+
+
+ngx_int_t
+ngx_http_v3_ack_section(ngx_connection_t *c, ngx_uint_t stream_id)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 ack section %ui", stream_id);
+
+    /* we do not use dynamic tables */
+
+    return NGX_HTTP_V3_ERR_DECODER_STREAM_ERROR;
+}
+
+
+ngx_int_t
+ngx_http_v3_inc_insert_count(ngx_connection_t *c, ngx_uint_t inc)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 increment insert count %ui", inc);
+
+    /* we do not use dynamic tables */
+
+    return NGX_HTTP_V3_ERR_DECODER_STREAM_ERROR;
+}
+
+
+ngx_int_t
+ngx_http_v3_lookup_static(ngx_connection_t *c, ngx_uint_t index,
+    ngx_str_t *name, ngx_str_t *value)
+{
+    ngx_uint_t            nelts;
+    ngx_http_v3_field_t  *field;
+
+    nelts = sizeof(ngx_http_v3_static_table)
+            / sizeof(ngx_http_v3_static_table[0]);
+
+    if (index >= nelts) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 static[%ui] lookup out of bounds: %ui",
+                       index, nelts);
+        return NGX_ERROR;
+    }
+
+    field = &ngx_http_v3_static_table[index];
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 static[%ui] lookup \"%V\":\"%V\"",
+                   index, &field->name, &field->value);
+
+    if (name) {
+        *name = field->name;
+    }
+
+    if (value) {
+        *value = field->value;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_v3_lookup(ngx_connection_t *c, ngx_uint_t index, ngx_str_t *name,
+    ngx_str_t *value)
+{
+    ngx_http_v3_field_t          *field;
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    h3c = ngx_http_v3_get_session(c);
+    dt = &h3c->table;
+
+    if (index < dt->base || index - dt->base >= dt->nelts) {
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 dynamic[%ui] lookup out of bounds: [%ui,%ui]",
+                       index, dt->base, dt->base + dt->nelts);
+        return NGX_ERROR;
+    }
+
+    field = dt->elts[index - dt->base];
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 dynamic[%ui] lookup \"%V\":\"%V\"",
+                   index, &field->name, &field->value);
+
+    if (name) {
+        *name = field->name;
+    }
+
+    if (value) {
+        *value = field->value;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_v3_decode_insert_count(ngx_connection_t *c, ngx_uint_t *insert_count)
+{
+    ngx_uint_t                    max_entries, full_range, max_value,
+                                  max_wrapped, req_insert_count;
+    ngx_http_v3_srv_conf_t       *h3scf;
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    /* QPACK 4.5.1.1. Required Insert Count */
+
+    if (*insert_count == 0) {
+        return NGX_OK;
+    }
+
+    h3c = ngx_http_v3_get_session(c);
+    dt = &h3c->table;
+
+    h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
+
+    max_entries = h3scf->max_table_capacity / 32;
+    full_range = 2 * max_entries;
+
+    if (*insert_count > full_range) {
+        return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED;
+    }
+
+    max_value = dt->base + dt->nelts + max_entries;
+    max_wrapped = (max_value / full_range) * full_range;
+    req_insert_count = max_wrapped + *insert_count - 1;
+
+    if (req_insert_count > max_value) {
+        if (req_insert_count <= full_range) {
+            return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED;
+        }
+
+        req_insert_count -= full_range;
+    }
+
+    if (req_insert_count == 0) {
+        return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 decode insert_count %ui -> %ui",
+                   *insert_count, req_insert_count);
+
+    *insert_count = req_insert_count;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_v3_check_insert_count(ngx_connection_t *c, ngx_uint_t insert_count)
+{
+    size_t                        n;
+    ngx_pool_cleanup_t           *cln;
+    ngx_http_v3_block_t          *block;
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_v3_srv_conf_t       *h3scf;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    h3c = ngx_http_v3_get_session(c);
+    dt = &h3c->table;
+
+    n = dt->base + dt->nelts;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 check insert count req:%ui, have:%ui",
+                   insert_count, n);
+
+    if (n >= insert_count) {
+        return NGX_OK;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 block stream");
+
+    block = NULL;
+
+    for (cln = c->pool->cleanup; cln; cln = cln->next) {
+        if (cln->handler == ngx_http_v3_unblock) {
+            block = cln->data;
+            break;
+        }
+    }
+
+    if (block == NULL) {
+        cln = ngx_pool_cleanup_add(c->pool, sizeof(ngx_http_v3_block_t));
+        if (cln == NULL) {
+            return NGX_ERROR;
+        }
+
+        cln->handler = ngx_http_v3_unblock;
+
+        block = cln->data;
+        block->queue.prev = NULL;
+        block->connection = c;
+        block->nblocked = &h3c->nblocked;
+    }
+
+    if (block->queue.prev == NULL) {
+        h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
+
+        if (h3c->nblocked == h3scf->max_blocked_streams) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "client exceeded http3_max_blocked_streams limit");
+
+            ngx_http_v3_finalize_connection(c,
+                                          NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED,
+                                          "too many blocked streams");
+            return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED;
+        }
+
+        h3c->nblocked++;
+        ngx_queue_insert_tail(&h3c->blocked, &block->queue);
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 blocked:%ui", h3c->nblocked);
+
+    return NGX_BUSY;
+}
+
+
+void
+ngx_http_v3_ack_insert_count(ngx_connection_t *c, uint64_t insert_count)
+{
+    ngx_http_v3_session_t        *h3c;
+    ngx_http_v3_dynamic_table_t  *dt;
+
+    h3c = ngx_http_v3_get_session(c);
+    dt = &h3c->table;
+
+    if (dt->ack_insert_count < insert_count) {
+        dt->ack_insert_count = insert_count;
+    }
+}
+
+
+static void
+ngx_http_v3_unblock(void *data)
+{
+    ngx_http_v3_block_t  *block = data;
+
+    if (block->queue.prev) {
+        ngx_queue_remove(&block->queue);
+        block->queue.prev = NULL;
+        (*block->nblocked)--;
+    }
+}
+
+
+static ngx_int_t
+ngx_http_v3_new_entry(ngx_connection_t *c)
+{
+    ngx_queue_t            *q;
+    ngx_connection_t       *bc;
+    ngx_http_v3_block_t    *block;
+    ngx_http_v3_session_t  *h3c;
+
+    h3c = ngx_http_v3_get_session(c);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 new dynamic entry, blocked:%ui", h3c->nblocked);
+
+    while (!ngx_queue_empty(&h3c->blocked)) {
+        q = ngx_queue_head(&h3c->blocked);
+        block = (ngx_http_v3_block_t *) q;
+        bc = block->connection;
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, bc->log, 0, "http3 unblock stream");
+
+        ngx_http_v3_unblock(block);
+        ngx_post_event(bc->read, &ngx_posted_events);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_v3_set_param(ngx_connection_t *c, uint64_t id, uint64_t value)
+{
+    switch (id) {
+
+    case NGX_HTTP_V3_PARAM_MAX_TABLE_CAPACITY:
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 param QPACK_MAX_TABLE_CAPACITY:%uL", value);
+        break;
+
+    case NGX_HTTP_V3_PARAM_MAX_FIELD_SECTION_SIZE:
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 param SETTINGS_MAX_FIELD_SECTION_SIZE:%uL",
+                       value);
+        break;
+
+    case NGX_HTTP_V3_PARAM_BLOCKED_STREAMS:
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 param QPACK_BLOCKED_STREAMS:%uL", value);
+        break;
+
+    default:
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 param #%uL:%uL", id, value);
+    }
+
+    return NGX_OK;
+}
diff --git a/src/http/v3/ngx_http_v3_table.h b/src/http/v3/ngx_http_v3_table.h
new file mode 100644
index 0000000..1c2fb17
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_table.h
@@ -0,0 +1,58 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_HTTP_V3_TABLE_H_INCLUDED_
+#define _NGX_HTTP_V3_TABLE_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    ngx_str_t                     name;
+    ngx_str_t                     value;
+} ngx_http_v3_field_t;
+
+
+typedef struct {
+    ngx_http_v3_field_t         **elts;
+    ngx_uint_t                    nelts;
+    ngx_uint_t                    base;
+    size_t                        size;
+    size_t                        capacity;
+    uint64_t                      insert_count;
+    uint64_t                      ack_insert_count;
+    ngx_event_t                   send_insert_count;
+} ngx_http_v3_dynamic_table_t;
+
+
+void ngx_http_v3_inc_insert_count_handler(ngx_event_t *ev);
+void ngx_http_v3_cleanup_table(ngx_http_v3_session_t *h3c);
+ngx_int_t ngx_http_v3_ref_insert(ngx_connection_t *c, ngx_uint_t dynamic,
+    ngx_uint_t index, ngx_str_t *value);
+ngx_int_t ngx_http_v3_insert(ngx_connection_t *c, ngx_str_t *name,
+    ngx_str_t *value);
+ngx_int_t ngx_http_v3_set_capacity(ngx_connection_t *c, ngx_uint_t capacity);
+ngx_int_t ngx_http_v3_duplicate(ngx_connection_t *c, ngx_uint_t index);
+ngx_int_t ngx_http_v3_ack_section(ngx_connection_t *c, ngx_uint_t stream_id);
+ngx_int_t ngx_http_v3_inc_insert_count(ngx_connection_t *c, ngx_uint_t inc);
+ngx_int_t ngx_http_v3_lookup_static(ngx_connection_t *c, ngx_uint_t index,
+    ngx_str_t *name, ngx_str_t *value);
+ngx_int_t ngx_http_v3_lookup(ngx_connection_t *c, ngx_uint_t index,
+    ngx_str_t *name, ngx_str_t *value);
+ngx_int_t ngx_http_v3_decode_insert_count(ngx_connection_t *c,
+    ngx_uint_t *insert_count);
+ngx_int_t ngx_http_v3_check_insert_count(ngx_connection_t *c,
+    ngx_uint_t insert_count);
+void ngx_http_v3_ack_insert_count(ngx_connection_t *c, uint64_t insert_count);
+ngx_int_t ngx_http_v3_set_param(ngx_connection_t *c, uint64_t id,
+    uint64_t value);
+
+
+#endif /* _NGX_HTTP_V3_TABLE_H_INCLUDED_ */
diff --git a/src/http/v3/ngx_http_v3_uni.c b/src/http/v3/ngx_http_v3_uni.c
new file mode 100644
index 0000000..2fc5b07
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_uni.c
@@ -0,0 +1,624 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    ngx_http_v3_parse_uni_t         parse;
+    ngx_int_t                       index;
+} ngx_http_v3_uni_stream_t;
+
+
+static void ngx_http_v3_close_uni_stream(ngx_connection_t *c);
+static void ngx_http_v3_uni_read_handler(ngx_event_t *rev);
+static void ngx_http_v3_uni_dummy_read_handler(ngx_event_t *wev);
+static void ngx_http_v3_uni_dummy_write_handler(ngx_event_t *wev);
+static ngx_connection_t *ngx_http_v3_get_uni_stream(ngx_connection_t *c,
+    ngx_uint_t type);
+
+
+void
+ngx_http_v3_init_uni_stream(ngx_connection_t *c)
+{
+    uint64_t                   n;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_v3_uni_stream_t  *us;
+
+    h3c = ngx_http_v3_get_session(c);
+    if (h3c->hq) {
+        ngx_http_v3_finalize_connection(c,
+                                        NGX_HTTP_V3_ERR_STREAM_CREATION_ERROR,
+                                        "uni stream in hq mode");
+        c->data = NULL;
+        ngx_http_v3_close_uni_stream(c);
+        return;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 init uni stream");
+
+    n = c->quic->id >> 2;
+
+    if (n >= NGX_HTTP_V3_MAX_UNI_STREAMS) {
+        ngx_http_v3_finalize_connection(c,
+                                      NGX_HTTP_V3_ERR_STREAM_CREATION_ERROR,
+                                      "reached maximum number of uni streams");
+        c->data = NULL;
+        ngx_http_v3_close_uni_stream(c);
+        return;
+    }
+
+    ngx_quic_cancelable_stream(c);
+
+    us = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_uni_stream_t));
+    if (us == NULL) {
+        ngx_http_v3_finalize_connection(c,
+                                        NGX_HTTP_V3_ERR_INTERNAL_ERROR,
+                                        "memory allocation error");
+        c->data = NULL;
+        ngx_http_v3_close_uni_stream(c);
+        return;
+    }
+
+    us->index = -1;
+
+    c->data = us;
+
+    c->read->handler = ngx_http_v3_uni_read_handler;
+    c->write->handler = ngx_http_v3_uni_dummy_write_handler;
+
+    ngx_http_v3_uni_read_handler(c->read);
+}
+
+
+static void
+ngx_http_v3_close_uni_stream(ngx_connection_t *c)
+{
+    ngx_pool_t                *pool;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_v3_uni_stream_t  *us;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 close stream");
+
+    us = c->data;
+
+    if (us && us->index >= 0) {
+        h3c = ngx_http_v3_get_session(c);
+        h3c->known_streams[us->index] = NULL;
+    }
+
+    c->destroyed = 1;
+
+    pool = c->pool;
+
+    ngx_close_connection(c);
+
+    ngx_destroy_pool(pool);
+}
+
+
+ngx_int_t
+ngx_http_v3_register_uni_stream(ngx_connection_t *c, uint64_t type)
+{
+    ngx_int_t                  index;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_v3_uni_stream_t  *us;
+
+    h3c = ngx_http_v3_get_session(c);
+
+    switch (type) {
+
+    case NGX_HTTP_V3_STREAM_ENCODER:
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 encoder stream");
+        index = NGX_HTTP_V3_STREAM_CLIENT_ENCODER;
+        break;
+
+    case NGX_HTTP_V3_STREAM_DECODER:
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 decoder stream");
+        index = NGX_HTTP_V3_STREAM_CLIENT_DECODER;
+        break;
+
+    case NGX_HTTP_V3_STREAM_CONTROL:
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 control stream");
+        index = NGX_HTTP_V3_STREAM_CLIENT_CONTROL;
+
+        break;
+
+    default:
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                       "http3 stream 0x%02xL", type);
+
+        if (h3c->known_streams[NGX_HTTP_V3_STREAM_CLIENT_ENCODER] == NULL
+            || h3c->known_streams[NGX_HTTP_V3_STREAM_CLIENT_DECODER] == NULL
+            || h3c->known_streams[NGX_HTTP_V3_STREAM_CLIENT_CONTROL] == NULL)
+        {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0, "missing mandatory stream");
+            return NGX_HTTP_V3_ERR_STREAM_CREATION_ERROR;
+        }
+
+        index = -1;
+    }
+
+    if (index >= 0) {
+        if (h3c->known_streams[index]) {
+            ngx_log_error(NGX_LOG_INFO, c->log, 0, "stream exists");
+            return NGX_HTTP_V3_ERR_STREAM_CREATION_ERROR;
+        }
+
+        h3c->known_streams[index] = c;
+
+        us = c->data;
+        us->index = index;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_v3_uni_read_handler(ngx_event_t *rev)
+{
+    u_char                     buf[128];
+    ssize_t                    n;
+    ngx_buf_t                  b;
+    ngx_int_t                  rc;
+    ngx_connection_t          *c;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_v3_uni_stream_t  *us;
+
+    c = rev->data;
+    us = c->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 read handler");
+
+    if (c->close) {
+        ngx_http_v3_close_uni_stream(c);
+        return;
+    }
+
+    ngx_memzero(&b, sizeof(ngx_buf_t));
+
+    while (rev->ready) {
+
+        n = c->recv(c, buf, sizeof(buf));
+
+        if (n == NGX_ERROR) {
+            rc = NGX_HTTP_V3_ERR_INTERNAL_ERROR;
+            goto failed;
+        }
+
+        if (n == 0) {
+            if (us->index >= 0) {
+                rc = NGX_HTTP_V3_ERR_CLOSED_CRITICAL_STREAM;
+                goto failed;
+            }
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 read eof");
+            ngx_http_v3_close_uni_stream(c);
+            return;
+        }
+
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
+        b.pos = buf;
+        b.last = buf + n;
+
+        h3c = ngx_http_v3_get_session(c);
+        h3c->total_bytes += n;
+
+        if (ngx_http_v3_check_flood(c) != NGX_OK) {
+            ngx_http_v3_close_uni_stream(c);
+            return;
+        }
+
+        rc = ngx_http_v3_parse_uni(c, &us->parse, &b);
+
+        if (rc == NGX_DONE) {
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http3 read done");
+            ngx_http_v3_close_uni_stream(c);
+            return;
+        }
+
+        if (rc > 0) {
+            goto failed;
+        }
+
+        if (rc != NGX_AGAIN) {
+            rc = NGX_HTTP_V3_ERR_GENERAL_PROTOCOL_ERROR;
+            goto failed;
+        }
+    }
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        rc = NGX_HTTP_V3_ERR_INTERNAL_ERROR;
+        goto failed;
+    }
+
+    return;
+
+failed:
+
+    ngx_http_v3_finalize_connection(c, rc, "stream error");
+    ngx_http_v3_close_uni_stream(c);
+}
+
+
+static void
+ngx_http_v3_uni_dummy_read_handler(ngx_event_t *rev)
+{
+    u_char             ch;
+    ngx_connection_t  *c;
+
+    c = rev->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 dummy read handler");
+
+    if (c->close) {
+        ngx_http_v3_close_uni_stream(c);
+        return;
+    }
+
+    if (rev->ready) {
+        if (c->recv(c, &ch, 1) != 0) {
+            ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_NO_ERROR, NULL);
+            ngx_http_v3_close_uni_stream(c);
+            return;
+        }
+    }
+
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_INTERNAL_ERROR,
+                                        NULL);
+        ngx_http_v3_close_uni_stream(c);
+    }
+}
+
+
+static void
+ngx_http_v3_uni_dummy_write_handler(ngx_event_t *wev)
+{
+    ngx_connection_t  *c;
+
+    c = wev->data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 dummy write handler");
+
+    if (ngx_handle_write_event(wev, 0) != NGX_OK) {
+        ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_INTERNAL_ERROR,
+                                        NULL);
+        ngx_http_v3_close_uni_stream(c);
+    }
+}
+
+
+static ngx_connection_t *
+ngx_http_v3_get_uni_stream(ngx_connection_t *c, ngx_uint_t type)
+{
+    u_char                     buf[NGX_HTTP_V3_VARLEN_INT_LEN];
+    size_t                     n;
+    ngx_int_t                  index;
+    ngx_connection_t          *sc;
+    ngx_http_v3_session_t     *h3c;
+    ngx_http_v3_uni_stream_t  *us;
+
+    switch (type) {
+    case NGX_HTTP_V3_STREAM_ENCODER:
+        index = NGX_HTTP_V3_STREAM_SERVER_ENCODER;
+        break;
+    case NGX_HTTP_V3_STREAM_DECODER:
+        index = NGX_HTTP_V3_STREAM_SERVER_DECODER;
+        break;
+    case NGX_HTTP_V3_STREAM_CONTROL:
+        index = NGX_HTTP_V3_STREAM_SERVER_CONTROL;
+        break;
+    default:
+        index = -1;
+    }
+
+    h3c = ngx_http_v3_get_session(c);
+
+    if (index >= 0) {
+        if (h3c->known_streams[index]) {
+            return h3c->known_streams[index];
+        }
+    }
+
+    sc = ngx_quic_open_stream(c, 0);
+    if (sc == NULL) {
+        goto failed;
+    }
+
+    ngx_quic_cancelable_stream(sc);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 create uni stream, type:%ui", type);
+
+    us = ngx_pcalloc(sc->pool, sizeof(ngx_http_v3_uni_stream_t));
+    if (us == NULL) {
+        goto failed;
+    }
+
+    us->index = index;
+
+    sc->data = us;
+
+    sc->read->handler = ngx_http_v3_uni_dummy_read_handler;
+    sc->write->handler = ngx_http_v3_uni_dummy_write_handler;
+
+    if (index >= 0) {
+        h3c->known_streams[index] = sc;
+    }
+
+    n = (u_char *) ngx_http_v3_encode_varlen_int(buf, type) - buf;
+
+    h3c = ngx_http_v3_get_session(c);
+    h3c->total_bytes += n;
+
+    if (sc->send(sc, buf, n) != (ssize_t) n) {
+        goto failed;
+    }
+
+    ngx_post_event(sc->read, &ngx_posted_events);
+
+    return sc;
+
+failed:
+
+    ngx_log_error(NGX_LOG_ERR, c->log, 0, "failed to create server stream");
+
+    ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_STREAM_CREATION_ERROR,
+                                    "failed to create server stream");
+    if (sc) {
+        ngx_http_v3_close_uni_stream(sc);
+    }
+
+    return NULL;
+}
+
+
+ngx_int_t
+ngx_http_v3_send_settings(ngx_connection_t *c)
+{
+    u_char                  *p, buf[NGX_HTTP_V3_VARLEN_INT_LEN * 6];
+    size_t                   n;
+    ngx_connection_t        *cc;
+    ngx_http_v3_session_t   *h3c;
+    ngx_http_v3_srv_conf_t  *h3scf;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 send settings");
+
+    cc = ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_CONTROL);
+    if (cc == NULL) {
+        return NGX_ERROR;
+    }
+
+    h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
+
+    n = ngx_http_v3_encode_varlen_int(NULL,
+                                      NGX_HTTP_V3_PARAM_MAX_TABLE_CAPACITY);
+    n += ngx_http_v3_encode_varlen_int(NULL, h3scf->max_table_capacity);
+    n += ngx_http_v3_encode_varlen_int(NULL, NGX_HTTP_V3_PARAM_BLOCKED_STREAMS);
+    n += ngx_http_v3_encode_varlen_int(NULL, h3scf->max_blocked_streams);
+
+    p = (u_char *) ngx_http_v3_encode_varlen_int(buf,
+                                                 NGX_HTTP_V3_FRAME_SETTINGS);
+    p = (u_char *) ngx_http_v3_encode_varlen_int(p, n);
+    p = (u_char *) ngx_http_v3_encode_varlen_int(p,
+                                         NGX_HTTP_V3_PARAM_MAX_TABLE_CAPACITY);
+    p = (u_char *) ngx_http_v3_encode_varlen_int(p, h3scf->max_table_capacity);
+    p = (u_char *) ngx_http_v3_encode_varlen_int(p,
+                                            NGX_HTTP_V3_PARAM_BLOCKED_STREAMS);
+    p = (u_char *) ngx_http_v3_encode_varlen_int(p, h3scf->max_blocked_streams);
+    n = p - buf;
+
+    h3c = ngx_http_v3_get_session(c);
+    h3c->total_bytes += n;
+
+    if (cc->send(cc, buf, n) != (ssize_t) n) {
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ngx_log_error(NGX_LOG_ERR, c->log, 0, "failed to send settings");
+
+    ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_EXCESSIVE_LOAD,
+                                    "failed to send settings");
+    ngx_http_v3_close_uni_stream(cc);
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_http_v3_send_goaway(ngx_connection_t *c, uint64_t id)
+{
+    u_char                 *p, buf[NGX_HTTP_V3_VARLEN_INT_LEN * 3];
+    size_t                  n;
+    ngx_connection_t       *cc;
+    ngx_http_v3_session_t  *h3c;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 send goaway %uL", id);
+
+    cc = ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_CONTROL);
+    if (cc == NULL) {
+        return NGX_ERROR;
+    }
+
+    n = ngx_http_v3_encode_varlen_int(NULL, id);
+    p = (u_char *) ngx_http_v3_encode_varlen_int(buf, NGX_HTTP_V3_FRAME_GOAWAY);
+    p = (u_char *) ngx_http_v3_encode_varlen_int(p, n);
+    p = (u_char *) ngx_http_v3_encode_varlen_int(p, id);
+    n = p - buf;
+
+    h3c = ngx_http_v3_get_session(c);
+    h3c->total_bytes += n;
+
+    if (cc->send(cc, buf, n) != (ssize_t) n) {
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ngx_log_error(NGX_LOG_ERR, c->log, 0, "failed to send goaway");
+
+    ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_EXCESSIVE_LOAD,
+                                    "failed to send goaway");
+    ngx_http_v3_close_uni_stream(cc);
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_http_v3_send_ack_section(ngx_connection_t *c, ngx_uint_t stream_id)
+{
+    u_char                  buf[NGX_HTTP_V3_PREFIX_INT_LEN];
+    size_t                  n;
+    ngx_connection_t       *dc;
+    ngx_http_v3_session_t  *h3c;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 send section acknowledgement %ui", stream_id);
+
+    dc = ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_DECODER);
+    if (dc == NULL) {
+        return NGX_ERROR;
+    }
+
+    buf[0] = 0x80;
+    n = (u_char *) ngx_http_v3_encode_prefix_int(buf, stream_id, 7) - buf;
+
+    h3c = ngx_http_v3_get_session(c);
+    h3c->total_bytes += n;
+
+    if (dc->send(dc, buf, n) != (ssize_t) n) {
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                  "failed to send section acknowledgement");
+
+    ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_EXCESSIVE_LOAD,
+                                    "failed to send section acknowledgement");
+    ngx_http_v3_close_uni_stream(dc);
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_http_v3_send_cancel_stream(ngx_connection_t *c, ngx_uint_t stream_id)
+{
+    u_char                  buf[NGX_HTTP_V3_PREFIX_INT_LEN];
+    size_t                  n;
+    ngx_connection_t       *dc;
+    ngx_http_v3_session_t  *h3c;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 send stream cancellation %ui", stream_id);
+
+    dc = ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_DECODER);
+    if (dc == NULL) {
+        return NGX_ERROR;
+    }
+
+    buf[0] = 0x40;
+    n = (u_char *) ngx_http_v3_encode_prefix_int(buf, stream_id, 6) - buf;
+
+    h3c = ngx_http_v3_get_session(c);
+    h3c->total_bytes += n;
+
+    if (dc->send(dc, buf, n) != (ssize_t) n) {
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ngx_log_error(NGX_LOG_ERR, c->log, 0, "failed to send stream cancellation");
+
+    ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_EXCESSIVE_LOAD,
+                                    "failed to send stream cancellation");
+    ngx_http_v3_close_uni_stream(dc);
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_http_v3_send_inc_insert_count(ngx_connection_t *c, ngx_uint_t inc)
+{
+    u_char                  buf[NGX_HTTP_V3_PREFIX_INT_LEN];
+    size_t                  n;
+    ngx_connection_t       *dc;
+    ngx_http_v3_session_t  *h3c;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 send insert count increment %ui", inc);
+
+    dc = ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_DECODER);
+    if (dc == NULL) {
+        return NGX_ERROR;
+    }
+
+    buf[0] = 0;
+    n = (u_char *) ngx_http_v3_encode_prefix_int(buf, inc, 6) - buf;
+
+    h3c = ngx_http_v3_get_session(c);
+    h3c->total_bytes += n;
+
+    if (dc->send(dc, buf, n) != (ssize_t) n) {
+        goto failed;
+    }
+
+    return NGX_OK;
+
+failed:
+
+    ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                  "failed to send insert count increment");
+
+    ngx_http_v3_finalize_connection(c, NGX_HTTP_V3_ERR_EXCESSIVE_LOAD,
+                                    "failed to send insert count increment");
+    ngx_http_v3_close_uni_stream(dc);
+
+    return NGX_ERROR;
+}
+
+
+ngx_int_t
+ngx_http_v3_cancel_stream(ngx_connection_t *c, ngx_uint_t stream_id)
+{
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "http3 cancel stream %ui", stream_id);
+
+    /* we do not use dynamic tables */
+
+    return NGX_OK;
+}
diff --git a/src/http/v3/ngx_http_v3_uni.h b/src/http/v3/ngx_http_v3_uni.h
new file mode 100644
index 0000000..911e153
--- /dev/null
+++ b/src/http/v3/ngx_http_v3_uni.h
@@ -0,0 +1,32 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NGX_HTTP_V3_UNI_H_INCLUDED_
+#define _NGX_HTTP_V3_UNI_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+void ngx_http_v3_init_uni_stream(ngx_connection_t *c);
+ngx_int_t ngx_http_v3_register_uni_stream(ngx_connection_t *c, uint64_t type);
+
+ngx_int_t ngx_http_v3_cancel_stream(ngx_connection_t *c, ngx_uint_t stream_id);
+
+ngx_int_t ngx_http_v3_send_settings(ngx_connection_t *c);
+ngx_int_t ngx_http_v3_send_goaway(ngx_connection_t *c, uint64_t id);
+ngx_int_t ngx_http_v3_send_ack_section(ngx_connection_t *c,
+    ngx_uint_t stream_id);
+ngx_int_t ngx_http_v3_send_cancel_stream(ngx_connection_t *c,
+    ngx_uint_t stream_id);
+ngx_int_t ngx_http_v3_send_inc_insert_count(ngx_connection_t *c,
+    ngx_uint_t inc);
+
+
+#endif /* _NGX_HTTP_V3_UNI_H_INCLUDED_ */
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index 487c5de..228a8d0 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -441,7 +441,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             continue;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "bind ipv6only is not supported "
+                               "ipv6only is not supported "
                                "on this platform");
             return NGX_CONF_ERROR;
 #endif
@@ -564,7 +564,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
 
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "the invalid \"%V\" parameter", &value[i]);
+                           "invalid parameter \"%V\"", &value[i]);
         return NGX_CONF_ERROR;
     }
 
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 246ba97..1167df3 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -283,11 +283,11 @@ ngx_mail_init_session_handler(ngx_event_t *rev)
 
     s = c->data;
 
-    sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
-
-    if (sslcf->enable || s->ssl) {
+    if (s->ssl) {
         c->log->action = "SSL handshaking";
 
+        sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
+
         ngx_mail_ssl_init_connection(&sslcf->ssl, c);
         return;
     }
diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index 28737ac..aebb4cc 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -23,8 +23,6 @@ static int ngx_mail_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn,
 static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf);
 static char *ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child);
 
-static char *ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd,
-    void *conf);
 static char *ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_mail_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -65,24 +63,12 @@ static ngx_conf_enum_t  ngx_mail_ssl_verify[] = {
 };
 
 
-static ngx_conf_deprecated_t  ngx_mail_ssl_deprecated = {
-    ngx_conf_deprecated, "ssl", "listen ... ssl"
-};
-
-
 static ngx_conf_post_t  ngx_mail_ssl_conf_command_post =
     { ngx_mail_ssl_conf_command_check };
 
 
 static ngx_command_t  ngx_mail_ssl_commands[] = {
 
-    { ngx_string("ssl"),
-      NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,
-      ngx_mail_ssl_enable,
-      NGX_MAIL_SRV_CONF_OFFSET,
-      offsetof(ngx_mail_ssl_conf_t, enable),
-      &ngx_mail_ssl_deprecated },
-
     { ngx_string("starttls"),
       NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
       ngx_mail_ssl_starttls,
@@ -322,7 +308,6 @@ ngx_mail_ssl_create_conf(ngx_conf_t *cf)
      *     scf->shm_zone = NULL;
      */
 
-    scf->enable = NGX_CONF_UNSET;
     scf->starttls = NGX_CONF_UNSET_UINT;
     scf->certificates = NGX_CONF_UNSET_PTR;
     scf->certificate_keys = NGX_CONF_UNSET_PTR;
@@ -349,7 +334,6 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     char                *mode;
     ngx_pool_cleanup_t  *cln;
 
-    ngx_conf_merge_value(conf->enable, prev->enable, 0);
     ngx_conf_merge_uint_value(conf->starttls, prev->starttls,
                          NGX_MAIL_STARTTLS_OFF);
 
@@ -394,9 +378,6 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     if (conf->listen) {
         mode = "listen ... ssl";
 
-    } else if (conf->enable) {
-        mode = "ssl";
-
     } else if (conf->starttls != NGX_MAIL_STARTTLS_OFF) {
         mode = "starttls";
 
@@ -545,34 +526,6 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 }
 
 
-static char *
-ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    ngx_mail_ssl_conf_t  *scf = conf;
-
-    char  *rv;
-
-    rv = ngx_conf_set_flag_slot(cf, cmd, conf);
-
-    if (rv != NGX_CONF_OK) {
-        return rv;
-    }
-
-    if (scf->enable && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"starttls\" directive conflicts with \"ssl on\"");
-        return NGX_CONF_ERROR;
-    }
-
-    if (!scf->listen) {
-        scf->file = cf->conf_file->file.name.data;
-        scf->line = cf->conf_file->line;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
 static char *
 ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -586,12 +539,6 @@ ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return rv;
     }
 
-    if (scf->enable == 1 && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"ssl\" directive conflicts with \"starttls\"");
-        return NGX_CONF_ERROR;
-    }
-
     if (!scf->listen) {
         scf->file = cf->conf_file->file.name.data;
         scf->line = cf->conf_file->line;
diff --git a/src/mail/ngx_mail_ssl_module.h b/src/mail/ngx_mail_ssl_module.h
index a0a6113..c0eb6a3 100644
--- a/src/mail/ngx_mail_ssl_module.h
+++ b/src/mail/ngx_mail_ssl_module.h
@@ -20,7 +20,6 @@
 
 
 typedef struct {
-    ngx_flag_t       enable;
     ngx_flag_t       prefer_server_ciphers;
 
     ngx_ssl_t        ssl;
diff --git a/src/os/unix/ngx_darwin_init.c b/src/os/unix/ngx_darwin_init.c
index aabe02f..70748ee 100644
--- a/src/os/unix/ngx_darwin_init.c
+++ b/src/os/unix/ngx_darwin_init.c
@@ -9,11 +9,12 @@
 #include <ngx_core.h>
 
 
-char    ngx_darwin_kern_ostype[16];
-char    ngx_darwin_kern_osrelease[128];
-int     ngx_darwin_hw_ncpu;
-int     ngx_darwin_kern_ipc_somaxconn;
-u_long  ngx_darwin_net_inet_tcp_sendspace;
+char     ngx_darwin_kern_ostype[16];
+char     ngx_darwin_kern_osrelease[128];
+int      ngx_darwin_hw_ncpu;
+int      ngx_darwin_kern_ipc_somaxconn;
+u_long   ngx_darwin_net_inet_tcp_sendspace;
+int64_t  ngx_darwin_hw_cachelinesize;
 
 ngx_uint_t  ngx_debug_malloc;
 
@@ -56,6 +57,10 @@ sysctl_t sysctls[] = {
       &ngx_darwin_kern_ipc_somaxconn,
       sizeof(ngx_darwin_kern_ipc_somaxconn), 0 },
 
+    { "hw.cachelinesize",
+      &ngx_darwin_hw_cachelinesize,
+      sizeof(ngx_darwin_hw_cachelinesize), 0 },
+
     { NULL, NULL, 0, 0 }
 };
 
@@ -155,6 +160,7 @@ ngx_os_specific_init(ngx_log_t *log)
         return NGX_ERROR;
     }
 
+    ngx_cacheline_size = ngx_darwin_hw_cachelinesize;
     ngx_ncpu = ngx_darwin_hw_ncpu;
 
     if (ngx_darwin_kern_ipc_somaxconn > 32767) {
diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h
index 7d6ca76..07fa8ce 100644
--- a/src/os/unix/ngx_errno.h
+++ b/src/os/unix/ngx_errno.h
@@ -54,6 +54,7 @@ typedef int               ngx_err_t;
 #define NGX_ENOMOREFILES  0
 #define NGX_ELOOP         ELOOP
 #define NGX_EBADF         EBADF
+#define NGX_EMSGSIZE      EMSGSIZE
 
 #if (NGX_HAVE_OPENAT)
 #define NGX_EMLINK        EMLINK
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 1c82a8e..2fec1ec 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -110,6 +110,8 @@ ngx_thread_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
             return NGX_ERROR;
         }
 
+        task->event.log = file->log;
+
         file->thread_task = task;
     }
 
@@ -493,6 +495,8 @@ ngx_thread_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
             return NGX_ERROR;
         }
 
+        task->event.log = file->log;
+
         file->thread_task = task;
     }
 
diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c
index 101d91a..603f917 100644
--- a/src/os/unix/ngx_linux_sendfile_chain.c
+++ b/src/os/unix/ngx_linux_sendfile_chain.c
@@ -332,6 +332,7 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size)
             return NGX_ERROR;
         }
 
+        task->event.log = c->log;
         task->handler = ngx_linux_sendfile_thread_handler;
 
         c->sendfile_task = task;
diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c
index 7824735..6ac931c 100644
--- a/src/os/unix/ngx_posix_init.c
+++ b/src/os/unix/ngx_posix_init.c
@@ -51,7 +51,10 @@ ngx_os_init(ngx_log_t *log)
     }
 
     ngx_pagesize = getpagesize();
-    ngx_cacheline_size = NGX_CPU_CACHE_LINE;
+
+    if (ngx_cacheline_size == 0) {
+        ngx_cacheline_size = NGX_CPU_CACHE_LINE;
+    }
 
     for (n = ngx_pagesize; n >>= 1; ngx_pagesize_shift++) { /* void */ }
 
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 98d2dd2..5bc5ce9 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -948,7 +948,7 @@ ngx_worker_process_exit(ngx_cycle_t *cycle)
         }
     }
 
-    if (ngx_exiting) {
+    if (ngx_exiting && !ngx_terminate) {
         c = cycle->connections;
         for (i = 0; i < cycle->connection_n; i++) {
             if (c[i].fd != -1
@@ -963,11 +963,11 @@ ngx_worker_process_exit(ngx_cycle_t *cycle)
                 ngx_debug_quit = 1;
             }
         }
+    }
 
-        if (ngx_debug_quit) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "aborting");
-            ngx_debug_point();
-        }
+    if (ngx_debug_quit) {
+        ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "aborting");
+        ngx_debug_point();
     }
 
     /*
diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h
index ec66a6f..4480adc 100644
--- a/src/os/unix/ngx_socket.h
+++ b/src/os/unix/ngx_socket.h
@@ -13,6 +13,8 @@
 
 
 #define NGX_WRITE_SHUTDOWN SHUT_WR
+#define NGX_READ_SHUTDOWN  SHUT_RD
+#define NGX_RDWR_SHUTDOWN  SHUT_RDWR
 
 typedef int  ngx_socket_t;
 
diff --git a/src/os/win32/ngx_errno.h b/src/os/win32/ngx_errno.h
index 255a39d..1e73a83 100644
--- a/src/os/win32/ngx_errno.h
+++ b/src/os/win32/ngx_errno.h
@@ -57,6 +57,7 @@ typedef DWORD                      ngx_err_t;
 #define NGX_EILSEQ                 ERROR_NO_UNICODE_TRANSLATION
 #define NGX_ELOOP                  0
 #define NGX_EBADF                  WSAEBADF
+#define NGX_EMSGSIZE               WSAEMSGSIZE
 
 #define NGX_EALREADY               WSAEALREADY
 #define NGX_EINVAL                 WSAEINVAL
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 6e59a6f..78ba13a 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -154,7 +154,8 @@ ngx_int_t ngx_file_info(u_char *filename, ngx_file_info_t *fi);
     (((off_t) (fi)->nFileSizeHigh << 32) | (fi)->nFileSizeLow)
 #define ngx_file_fs_size(fi)        ngx_file_size(fi)
 
-#define ngx_file_uniq(fi)   (*(ngx_file_uniq_t *) &(fi)->nFileIndexHigh)
+#define ngx_file_uniq(fi)                                                    \
+    (((ngx_file_uniq_t) (fi)->nFileIndexHigh << 32) | (fi)->nFileIndexLow)
 
 
 /* 116444736000000000 is commented in src/os/win32/ngx_time.c */
diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c
index 0c848ef..a39335f 100644
--- a/src/os/win32/ngx_process_cycle.c
+++ b/src/os/win32/ngx_process_cycle.c
@@ -834,7 +834,7 @@ ngx_worker_process_exit(ngx_cycle_t *cycle)
         }
     }
 
-    if (ngx_exiting) {
+    if (ngx_exiting && !ngx_terminate) {
         c = cycle->connections;
         for (i = 0; i < cycle->connection_n; i++) {
             if (c[i].fd != (ngx_socket_t) -1
diff --git a/src/os/win32/ngx_socket.h b/src/os/win32/ngx_socket.h
index ab56bc8..5b61389 100644
--- a/src/os/win32/ngx_socket.h
+++ b/src/os/win32/ngx_socket.h
@@ -14,6 +14,8 @@
 
 
 #define NGX_WRITE_SHUTDOWN SD_SEND
+#define NGX_READ_SHUTDOWN  SD_RECEIVE
+#define NGX_RDWR_SHUTDOWN  SD_BOTH
 
 
 typedef SOCKET  ngx_socket_t;
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index 406003a..7045613 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -280,7 +280,11 @@ typedef int                 sig_atomic_t;
 
 #define NGX_HAVE_GETADDRINFO         1
 
-#define ngx_random               rand
+#define ngx_random()                                                          \
+    ((long) (0x7fffffff & ( ((uint32_t) rand() << 16)                         \
+                          ^ ((uint32_t) rand() << 8)                          \
+                          ^ ((uint32_t) rand()) )))
+
 #define ngx_debug_init()
 
 
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index 3304c84..b6eeb23 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -16,16 +16,34 @@ static ngx_int_t ngx_stream_init_phases(ngx_conf_t *cf,
     ngx_stream_core_main_conf_t *cmcf);
 static ngx_int_t ngx_stream_init_phase_handlers(ngx_conf_t *cf,
     ngx_stream_core_main_conf_t *cmcf);
-static ngx_int_t ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
-    ngx_stream_listen_t *listen);
-static char *ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports);
+
+static ngx_int_t ngx_stream_add_addresses(ngx_conf_t *cf,
+    ngx_stream_core_srv_conf_t *cscf, ngx_stream_conf_port_t *port,
+    ngx_stream_listen_opt_t *lsopt);
+static ngx_int_t ngx_stream_add_address(ngx_conf_t *cf,
+    ngx_stream_core_srv_conf_t *cscf, ngx_stream_conf_port_t *port,
+    ngx_stream_listen_opt_t *lsopt);
+static ngx_int_t ngx_stream_add_server(ngx_conf_t *cf,
+    ngx_stream_core_srv_conf_t *cscf, ngx_stream_conf_addr_t *addr);
+
+static ngx_int_t ngx_stream_optimize_servers(ngx_conf_t *cf,
+    ngx_stream_core_main_conf_t *cmcf, ngx_array_t *ports);
+static ngx_int_t ngx_stream_server_names(ngx_conf_t *cf,
+    ngx_stream_core_main_conf_t *cmcf, ngx_stream_conf_addr_t *addr);
+static ngx_int_t ngx_stream_cmp_conf_addrs(const void *one, const void *two);
+static int ngx_libc_cdecl ngx_stream_cmp_dns_wildcards(const void *one,
+    const void *two);
+
+static ngx_int_t ngx_stream_init_listening(ngx_conf_t *cf,
+    ngx_stream_conf_port_t *port);
+static ngx_listening_t *ngx_stream_add_listening(ngx_conf_t *cf,
+    ngx_stream_conf_addr_t *addr);
 static ngx_int_t ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
     ngx_stream_conf_addr_t *addr);
 #if (NGX_HAVE_INET6)
 static ngx_int_t ngx_stream_add_addrs6(ngx_conf_t *cf,
     ngx_stream_port_t *stport, ngx_stream_conf_addr_t *addr);
 #endif
-static ngx_int_t ngx_stream_cmp_conf_addrs(const void *one, const void *two);
 
 
 ngx_uint_t  ngx_stream_max_module;
@@ -74,10 +92,8 @@ static char *
 ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     char                          *rv;
-    ngx_uint_t                     i, m, mi, s;
+    ngx_uint_t                     mi, m, s;
     ngx_conf_t                     pcf;
-    ngx_array_t                    ports;
-    ngx_stream_listen_t           *listen;
     ngx_stream_module_t           *module;
     ngx_stream_conf_ctx_t         *ctx;
     ngx_stream_core_srv_conf_t   **cscfp;
@@ -251,21 +267,13 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    if (ngx_array_init(&ports, cf->temp_pool, 4, sizeof(ngx_stream_conf_port_t))
-        != NGX_OK)
-    {
+    /* optimize the lists of ports, addresses and server names */
+
+    if (ngx_stream_optimize_servers(cf, cmcf, cmcf->ports) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
-    listen = cmcf->listen.elts;
-
-    for (i = 0; i < cmcf->listen.nelts; i++) {
-        if (ngx_stream_add_ports(cf, &ports, &listen[i]) != NGX_OK) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    return ngx_stream_optimize_servers(cf, &ports);
+    return NGX_CONF_OK;
 }
 
 
@@ -377,73 +385,295 @@ ngx_stream_init_phase_handlers(ngx_conf_t *cf,
 }
 
 
-static ngx_int_t
-ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
-    ngx_stream_listen_t *listen)
+ngx_int_t
+ngx_stream_add_listen(ngx_conf_t *cf, ngx_stream_core_srv_conf_t *cscf,
+    ngx_stream_listen_opt_t *lsopt)
 {
-    in_port_t                p;
-    ngx_uint_t               i;
-    struct sockaddr         *sa;
-    ngx_stream_conf_port_t  *port;
-    ngx_stream_conf_addr_t  *addr;
+    in_port_t                     p;
+    ngx_uint_t                    i;
+    struct sockaddr              *sa;
+    ngx_stream_conf_port_t       *port;
+    ngx_stream_core_main_conf_t  *cmcf;
 
-    sa = listen->sockaddr;
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    if (cmcf->ports == NULL) {
+        cmcf->ports = ngx_array_create(cf->temp_pool, 2,
+                                       sizeof(ngx_stream_conf_port_t));
+        if (cmcf->ports == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    sa = lsopt->sockaddr;
     p = ngx_inet_get_port(sa);
 
-    port = ports->elts;
-    for (i = 0; i < ports->nelts; i++) {
+    port = cmcf->ports->elts;
+    for (i = 0; i < cmcf->ports->nelts; i++) {
 
-        if (p == port[i].port
-            && listen->type == port[i].type
-            && sa->sa_family == port[i].family)
+        if (p != port[i].port
+            || lsopt->type != port[i].type
+            || sa->sa_family != port[i].family)
         {
-            /* a port is already in the port list */
-
-            port = &port[i];
-            goto found;
+            continue;
         }
+
+        /* a port is already in the port list */
+
+        return ngx_stream_add_addresses(cf, cscf, &port[i], lsopt);
     }
 
     /* add a port to the port list */
 
-    port = ngx_array_push(ports);
+    port = ngx_array_push(cmcf->ports);
     if (port == NULL) {
         return NGX_ERROR;
     }
 
     port->family = sa->sa_family;
-    port->type = listen->type;
+    port->type = lsopt->type;
     port->port = p;
+    port->addrs.elts = NULL;
 
-    if (ngx_array_init(&port->addrs, cf->temp_pool, 2,
-                       sizeof(ngx_stream_conf_addr_t))
-        != NGX_OK)
-    {
-        return NGX_ERROR;
+    return ngx_stream_add_address(cf, cscf, port, lsopt);
+}
+
+
+static ngx_int_t
+ngx_stream_add_addresses(ngx_conf_t *cf, ngx_stream_core_srv_conf_t *cscf,
+    ngx_stream_conf_port_t *port, ngx_stream_listen_opt_t *lsopt)
+{
+    ngx_uint_t               i, default_server, proxy_protocol,
+                             protocols, protocols_prev;
+    ngx_stream_conf_addr_t  *addr;
+#if (NGX_STREAM_SSL)
+    ngx_uint_t               ssl;
+#endif
+
+    /*
+     * we cannot compare whole sockaddr struct's as kernel
+     * may fill some fields in inherited sockaddr struct's
+     */
+
+    addr = port->addrs.elts;
+
+    for (i = 0; i < port->addrs.nelts; i++) {
+
+        if (ngx_cmp_sockaddr(lsopt->sockaddr, lsopt->socklen,
+                             addr[i].opt.sockaddr,
+                             addr[i].opt.socklen, 0)
+            != NGX_OK)
+        {
+            continue;
+        }
+
+        /* the address is already in the address list */
+
+        if (ngx_stream_add_server(cf, cscf, &addr[i]) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        /* preserve default_server bit during listen options overwriting */
+        default_server = addr[i].opt.default_server;
+
+        proxy_protocol = lsopt->proxy_protocol || addr[i].opt.proxy_protocol;
+        protocols = lsopt->proxy_protocol;
+        protocols_prev = addr[i].opt.proxy_protocol;
+
+#if (NGX_STREAM_SSL)
+        ssl = lsopt->ssl || addr[i].opt.ssl;
+        protocols |= lsopt->ssl << 1;
+        protocols_prev |= addr[i].opt.ssl << 1;
+#endif
+
+        if (lsopt->set) {
+
+            if (addr[i].opt.set) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "duplicate listen options for %V",
+                                   &addr[i].opt.addr_text);
+                return NGX_ERROR;
+            }
+
+            addr[i].opt = *lsopt;
+        }
+
+        /* check the duplicate "default" server for this address:port */
+
+        if (lsopt->default_server) {
+
+            if (default_server) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "a duplicate default server for %V",
+                                   &addr[i].opt.addr_text);
+                return NGX_ERROR;
+            }
+
+            default_server = 1;
+            addr[i].default_server = cscf;
+        }
+
+        /* check for conflicting protocol options */
+
+        if ((protocols | protocols_prev) != protocols_prev) {
+
+            /* options added */
+
+            if ((addr[i].opt.set && !lsopt->set)
+                || addr[i].protocols_changed
+                || (protocols | protocols_prev) != protocols)
+            {
+                ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                                   "protocol options redefined for %V",
+                                   &addr[i].opt.addr_text);
+            }
+
+            addr[i].protocols = protocols_prev;
+            addr[i].protocols_set = 1;
+            addr[i].protocols_changed = 1;
+
+        } else if ((protocols_prev | protocols) != protocols) {
+
+            /* options removed */
+
+            if (lsopt->set
+                || (addr[i].protocols_set && protocols != addr[i].protocols))
+            {
+                ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                                   "protocol options redefined for %V",
+                                   &addr[i].opt.addr_text);
+            }
+
+            addr[i].protocols = protocols;
+            addr[i].protocols_set = 1;
+            addr[i].protocols_changed = 1;
+
+        } else {
+
+            /* the same options */
+
+            if ((lsopt->set && addr[i].protocols_changed)
+                || (addr[i].protocols_set && protocols != addr[i].protocols))
+            {
+                ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                                   "protocol options redefined for %V",
+                                   &addr[i].opt.addr_text);
+            }
+
+            addr[i].protocols = protocols;
+            addr[i].protocols_set = 1;
+        }
+
+        addr[i].opt.default_server = default_server;
+        addr[i].opt.proxy_protocol = proxy_protocol;
+#if (NGX_STREAM_SSL)
+        addr[i].opt.ssl = ssl;
+#endif
+
+        return NGX_OK;
     }
 
-found:
+    /* add the address to the addresses list that bound to this port */
+
+    return ngx_stream_add_address(cf, cscf, port, lsopt);
+}
+
+
+/*
+ * add the server address, the server names and the server core module
+ * configurations to the port list
+ */
+
+static ngx_int_t
+ngx_stream_add_address(ngx_conf_t *cf, ngx_stream_core_srv_conf_t *cscf,
+    ngx_stream_conf_port_t *port, ngx_stream_listen_opt_t *lsopt)
+{
+    ngx_stream_conf_addr_t  *addr;
+
+    if (port->addrs.elts == NULL) {
+        if (ngx_array_init(&port->addrs, cf->temp_pool, 4,
+                           sizeof(ngx_stream_conf_addr_t))
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
 
     addr = ngx_array_push(&port->addrs);
     if (addr == NULL) {
         return NGX_ERROR;
     }
 
-    addr->opt = *listen;
+    addr->opt = *lsopt;
+    addr->protocols = 0;
+    addr->protocols_set = 0;
+    addr->protocols_changed = 0;
+    addr->hash.buckets = NULL;
+    addr->hash.size = 0;
+    addr->wc_head = NULL;
+    addr->wc_tail = NULL;
+#if (NGX_PCRE)
+    addr->nregex = 0;
+    addr->regex = NULL;
+#endif
+    addr->default_server = cscf;
+    addr->servers.elts = NULL;
+
+    return ngx_stream_add_server(cf, cscf, addr);
+}
+
+
+/* add the server core module configuration to the address:port */
+
+static ngx_int_t
+ngx_stream_add_server(ngx_conf_t *cf, ngx_stream_core_srv_conf_t *cscf,
+    ngx_stream_conf_addr_t *addr)
+{
+    ngx_uint_t                    i;
+    ngx_stream_core_srv_conf_t  **server;
+
+    if (addr->servers.elts == NULL) {
+        if (ngx_array_init(&addr->servers, cf->temp_pool, 4,
+                           sizeof(ngx_stream_core_srv_conf_t *))
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+    } else {
+        server = addr->servers.elts;
+        for (i = 0; i < addr->servers.nelts; i++) {
+            if (server[i] == cscf) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "a duplicate listen %V",
+                                   &addr->opt.addr_text);
+                return NGX_ERROR;
+            }
+        }
+    }
+
+    server = ngx_array_push(&addr->servers);
+    if (server == NULL) {
+        return NGX_ERROR;
+    }
+
+    *server = cscf;
 
     return NGX_OK;
 }
 
 
-static char *
-ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
+static ngx_int_t
+ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_stream_core_main_conf_t *cmcf,
+    ngx_array_t *ports)
 {
-    ngx_uint_t                   i, p, last, bind_wildcard;
-    ngx_listening_t             *ls;
-    ngx_stream_port_t           *stport;
-    ngx_stream_conf_port_t      *port;
-    ngx_stream_conf_addr_t      *addr;
-    ngx_stream_core_srv_conf_t  *cscf;
+    ngx_uint_t               p, a;
+    ngx_stream_conf_port_t  *port;
+    ngx_stream_conf_addr_t  *addr;
+
+    if (ports == NULL) {
+        return NGX_OK;
+    }
 
     port = ports->elts;
     for (p = 0; p < ports->nelts; p++) {
@@ -451,176 +681,192 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
         ngx_sort(port[p].addrs.elts, (size_t) port[p].addrs.nelts,
                  sizeof(ngx_stream_conf_addr_t), ngx_stream_cmp_conf_addrs);
 
-        addr = port[p].addrs.elts;
-        last = port[p].addrs.nelts;
-
         /*
-         * if there is the binding to the "*:port" then we need to bind()
-         * to the "*:port" only and ignore the other bindings
+         * check whether all name-based servers have the same
+         * configuration as a default server for given address:port
          */
 
-        if (addr[last - 1].opt.wildcard) {
-            addr[last - 1].opt.bind = 1;
-            bind_wildcard = 1;
+        addr = port[p].addrs.elts;
+        for (a = 0; a < port[p].addrs.nelts; a++) {
 
-        } else {
-            bind_wildcard = 0;
+            if (addr[a].servers.nelts > 1
+#if (NGX_PCRE)
+                || addr[a].default_server->captures
+#endif
+               )
+            {
+                if (ngx_stream_server_names(cf, cmcf, &addr[a]) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+            }
         }
 
-        i = 0;
+        if (ngx_stream_init_listening(cf, &port[p]) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
 
-        while (i < last) {
+    return NGX_OK;
+}
 
-            if (bind_wildcard && !addr[i].opt.bind) {
-                i++;
+
+static ngx_int_t
+ngx_stream_server_names(ngx_conf_t *cf, ngx_stream_core_main_conf_t *cmcf,
+    ngx_stream_conf_addr_t *addr)
+{
+    ngx_int_t                     rc;
+    ngx_uint_t                    n, s;
+    ngx_hash_init_t               hash;
+    ngx_hash_keys_arrays_t        ha;
+    ngx_stream_server_name_t     *name;
+    ngx_stream_core_srv_conf_t  **cscfp;
+#if (NGX_PCRE)
+    ngx_uint_t                    regex, i;
+
+    regex = 0;
+#endif
+
+    ngx_memzero(&ha, sizeof(ngx_hash_keys_arrays_t));
+
+    ha.temp_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE, cf->log);
+    if (ha.temp_pool == NULL) {
+        return NGX_ERROR;
+    }
+
+    ha.pool = cf->pool;
+
+    if (ngx_hash_keys_array_init(&ha, NGX_HASH_LARGE) != NGX_OK) {
+        goto failed;
+    }
+
+    cscfp = addr->servers.elts;
+
+    for (s = 0; s < addr->servers.nelts; s++) {
+
+        name = cscfp[s]->server_names.elts;
+
+        for (n = 0; n < cscfp[s]->server_names.nelts; n++) {
+
+#if (NGX_PCRE)
+            if (name[n].regex) {
+                regex++;
                 continue;
             }
+#endif
 
-            ls = ngx_create_listening(cf, addr[i].opt.sockaddr,
-                                      addr[i].opt.socklen);
-            if (ls == NULL) {
-                return NGX_CONF_ERROR;
+            rc = ngx_hash_add_key(&ha, &name[n].name, name[n].server,
+                                  NGX_HASH_WILDCARD_KEY);
+
+            if (rc == NGX_ERROR) {
+                goto failed;
             }
 
-            ls->addr_ntop = 1;
-            ls->handler = ngx_stream_init_connection;
-            ls->pool_size = 256;
-            ls->type = addr[i].opt.type;
-
-            cscf = addr->opt.ctx->srv_conf[ngx_stream_core_module.ctx_index];
-
-            ls->logp = cscf->error_log;
-            ls->log.data = &ls->addr_text;
-            ls->log.handler = ngx_accept_log_error;
-
-            ls->backlog = addr[i].opt.backlog;
-            ls->rcvbuf = addr[i].opt.rcvbuf;
-            ls->sndbuf = addr[i].opt.sndbuf;
-
-            ls->wildcard = addr[i].opt.wildcard;
-
-            ls->keepalive = addr[i].opt.so_keepalive;
-#if (NGX_HAVE_KEEPALIVE_TUNABLE)
-            ls->keepidle = addr[i].opt.tcp_keepidle;
-            ls->keepintvl = addr[i].opt.tcp_keepintvl;
-            ls->keepcnt = addr[i].opt.tcp_keepcnt;
-#endif
-
-#if (NGX_HAVE_INET6)
-            ls->ipv6only = addr[i].opt.ipv6only;
-#endif
-
-#if (NGX_HAVE_TCP_FASTOPEN)
-            ls->fastopen = addr[i].opt.fastopen;
-#endif
-
-#if (NGX_HAVE_REUSEPORT)
-            ls->reuseport = addr[i].opt.reuseport;
-#endif
-
-            stport = ngx_palloc(cf->pool, sizeof(ngx_stream_port_t));
-            if (stport == NULL) {
-                return NGX_CONF_ERROR;
+            if (rc == NGX_DECLINED) {
+                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                              "invalid server name or wildcard \"%V\" on %V",
+                              &name[n].name, &addr->opt.addr_text);
+                goto failed;
             }
 
-            ls->servers = stport;
-
-            stport->naddrs = i + 1;
-
-            switch (ls->sockaddr->sa_family) {
-#if (NGX_HAVE_INET6)
-            case AF_INET6:
-                if (ngx_stream_add_addrs6(cf, stport, addr) != NGX_OK) {
-                    return NGX_CONF_ERROR;
-                }
-                break;
-#endif
-            default: /* AF_INET */
-                if (ngx_stream_add_addrs(cf, stport, addr) != NGX_OK) {
-                    return NGX_CONF_ERROR;
-                }
-                break;
+            if (rc == NGX_BUSY) {
+                ngx_log_error(NGX_LOG_WARN, cf->log, 0,
+                              "conflicting server name \"%V\" on %V, ignored",
+                              &name[n].name, &addr->opt.addr_text);
             }
-
-            addr++;
-            last--;
         }
     }
 
-    return NGX_CONF_OK;
-}
+    hash.key = ngx_hash_key_lc;
+    hash.max_size = cmcf->server_names_hash_max_size;
+    hash.bucket_size = cmcf->server_names_hash_bucket_size;
+    hash.name = "server_names_hash";
+    hash.pool = cf->pool;
 
+    if (ha.keys.nelts) {
+        hash.hash = &addr->hash;
+        hash.temp_pool = NULL;
 
-static ngx_int_t
-ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
-    ngx_stream_conf_addr_t *addr)
-{
-    ngx_uint_t             i;
-    struct sockaddr_in    *sin;
-    ngx_stream_in_addr_t  *addrs;
+        if (ngx_hash_init(&hash, ha.keys.elts, ha.keys.nelts) != NGX_OK) {
+            goto failed;
+        }
+    }
 
-    stport->addrs = ngx_pcalloc(cf->pool,
-                                stport->naddrs * sizeof(ngx_stream_in_addr_t));
-    if (stport->addrs == NULL) {
+    if (ha.dns_wc_head.nelts) {
+
+        ngx_qsort(ha.dns_wc_head.elts, (size_t) ha.dns_wc_head.nelts,
+                  sizeof(ngx_hash_key_t), ngx_stream_cmp_dns_wildcards);
+
+        hash.hash = NULL;
+        hash.temp_pool = ha.temp_pool;
+
+        if (ngx_hash_wildcard_init(&hash, ha.dns_wc_head.elts,
+                                   ha.dns_wc_head.nelts)
+            != NGX_OK)
+        {
+            goto failed;
+        }
+
+        addr->wc_head = (ngx_hash_wildcard_t *) hash.hash;
+    }
+
+    if (ha.dns_wc_tail.nelts) {
+
+        ngx_qsort(ha.dns_wc_tail.elts, (size_t) ha.dns_wc_tail.nelts,
+                  sizeof(ngx_hash_key_t), ngx_stream_cmp_dns_wildcards);
+
+        hash.hash = NULL;
+        hash.temp_pool = ha.temp_pool;
+
+        if (ngx_hash_wildcard_init(&hash, ha.dns_wc_tail.elts,
+                                   ha.dns_wc_tail.nelts)
+            != NGX_OK)
+        {
+            goto failed;
+        }
+
+        addr->wc_tail = (ngx_hash_wildcard_t *) hash.hash;
+    }
+
+    ngx_destroy_pool(ha.temp_pool);
+
+#if (NGX_PCRE)
+
+    if (regex == 0) {
+        return NGX_OK;
+    }
+
+    addr->nregex = regex;
+    addr->regex = ngx_palloc(cf->pool,
+                             regex * sizeof(ngx_stream_server_name_t));
+    if (addr->regex == NULL) {
         return NGX_ERROR;
     }
 
-    addrs = stport->addrs;
+    i = 0;
 
-    for (i = 0; i < stport->naddrs; i++) {
+    for (s = 0; s < addr->servers.nelts; s++) {
 
-        sin = (struct sockaddr_in *) addr[i].opt.sockaddr;
-        addrs[i].addr = sin->sin_addr.s_addr;
+        name = cscfp[s]->server_names.elts;
 
-        addrs[i].conf.ctx = addr[i].opt.ctx;
-#if (NGX_STREAM_SSL)
-        addrs[i].conf.ssl = addr[i].opt.ssl;
-#endif
-        addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
-        addrs[i].conf.addr_text = addr[i].opt.addr_text;
+        for (n = 0; n < cscfp[s]->server_names.nelts; n++) {
+            if (name[n].regex) {
+                addr->regex[i++] = name[n];
+            }
+        }
     }
 
+#endif
+
     return NGX_OK;
+
+failed:
+
+    ngx_destroy_pool(ha.temp_pool);
+
+    return NGX_ERROR;
 }
 
 
-#if (NGX_HAVE_INET6)
-
-static ngx_int_t
-ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
-    ngx_stream_conf_addr_t *addr)
-{
-    ngx_uint_t              i;
-    struct sockaddr_in6    *sin6;
-    ngx_stream_in6_addr_t  *addrs6;
-
-    stport->addrs = ngx_pcalloc(cf->pool,
-                                stport->naddrs * sizeof(ngx_stream_in6_addr_t));
-    if (stport->addrs == NULL) {
-        return NGX_ERROR;
-    }
-
-    addrs6 = stport->addrs;
-
-    for (i = 0; i < stport->naddrs; i++) {
-
-        sin6 = (struct sockaddr_in6 *) addr[i].opt.sockaddr;
-        addrs6[i].addr6 = sin6->sin6_addr;
-
-        addrs6[i].conf.ctx = addr[i].opt.ctx;
-#if (NGX_STREAM_SSL)
-        addrs6[i].conf.ssl = addr[i].opt.ssl;
-#endif
-        addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
-        addrs6[i].conf.addr_text = addr[i].opt.addr_text;
-    }
-
-    return NGX_OK;
-}
-
-#endif
-
-
 static ngx_int_t
 ngx_stream_cmp_conf_addrs(const void *one, const void *two)
 {
@@ -630,12 +876,12 @@ ngx_stream_cmp_conf_addrs(const void *one, const void *two)
     second = (ngx_stream_conf_addr_t *) two;
 
     if (first->opt.wildcard) {
-        /* a wildcard must be the last resort, shift it to the end */
+        /* a wildcard address must be the last resort, shift it to the end */
         return 1;
     }
 
     if (second->opt.wildcard) {
-        /* a wildcard must be the last resort, shift it to the end */
+        /* a wildcard address must be the last resort, shift it to the end */
         return -1;
     }
 
@@ -653,3 +899,277 @@ ngx_stream_cmp_conf_addrs(const void *one, const void *two)
 
     return 0;
 }
+
+
+static int ngx_libc_cdecl
+ngx_stream_cmp_dns_wildcards(const void *one, const void *two)
+{
+    ngx_hash_key_t  *first, *second;
+
+    first = (ngx_hash_key_t *) one;
+    second = (ngx_hash_key_t *) two;
+
+    return ngx_dns_strcmp(first->key.data, second->key.data);
+}
+
+
+static ngx_int_t
+ngx_stream_init_listening(ngx_conf_t *cf, ngx_stream_conf_port_t *port)
+{
+    ngx_uint_t               i, last, bind_wildcard;
+    ngx_listening_t         *ls;
+    ngx_stream_port_t       *stport;
+    ngx_stream_conf_addr_t  *addr;
+
+    addr = port->addrs.elts;
+    last = port->addrs.nelts;
+
+    /*
+     * If there is a binding to an "*:port" then we need to bind() to
+     * the "*:port" only and ignore other implicit bindings.  The bindings
+     * have been already sorted: explicit bindings are on the start, then
+     * implicit bindings go, and wildcard binding is in the end.
+     */
+
+    if (addr[last - 1].opt.wildcard) {
+        addr[last - 1].opt.bind = 1;
+        bind_wildcard = 1;
+
+    } else {
+        bind_wildcard = 0;
+    }
+
+    i = 0;
+
+    while (i < last) {
+
+        if (bind_wildcard && !addr[i].opt.bind) {
+            i++;
+            continue;
+        }
+
+        ls = ngx_stream_add_listening(cf, &addr[i]);
+        if (ls == NULL) {
+            return NGX_ERROR;
+        }
+
+        stport = ngx_pcalloc(cf->pool, sizeof(ngx_stream_port_t));
+        if (stport == NULL) {
+            return NGX_ERROR;
+        }
+
+        ls->servers = stport;
+
+        stport->naddrs = i + 1;
+
+        switch (ls->sockaddr->sa_family) {
+
+#if (NGX_HAVE_INET6)
+        case AF_INET6:
+            if (ngx_stream_add_addrs6(cf, stport, addr) != NGX_OK) {
+                return NGX_ERROR;
+            }
+            break;
+#endif
+        default: /* AF_INET */
+            if (ngx_stream_add_addrs(cf, stport, addr) != NGX_OK) {
+                return NGX_ERROR;
+            }
+            break;
+        }
+
+        addr++;
+        last--;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_listening_t *
+ngx_stream_add_listening(ngx_conf_t *cf, ngx_stream_conf_addr_t *addr)
+{
+    ngx_listening_t             *ls;
+    ngx_stream_core_srv_conf_t  *cscf;
+
+    ls = ngx_create_listening(cf, addr->opt.sockaddr, addr->opt.socklen);
+    if (ls == NULL) {
+        return NULL;
+    }
+
+    ls->addr_ntop = 1;
+
+    ls->handler = ngx_stream_init_connection;
+
+    ls->pool_size = 256;
+
+    cscf = addr->default_server;
+
+    ls->logp = cscf->error_log;
+    ls->log.data = &ls->addr_text;
+    ls->log.handler = ngx_accept_log_error;
+
+    ls->type = addr->opt.type;
+    ls->backlog = addr->opt.backlog;
+    ls->rcvbuf = addr->opt.rcvbuf;
+    ls->sndbuf = addr->opt.sndbuf;
+
+    ls->keepalive = addr->opt.so_keepalive;
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+    ls->keepidle = addr->opt.tcp_keepidle;
+    ls->keepintvl = addr->opt.tcp_keepintvl;
+    ls->keepcnt = addr->opt.tcp_keepcnt;
+#endif
+
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
+    ls->accept_filter = addr->opt.accept_filter;
+#endif
+
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
+    ls->deferred_accept = addr->opt.deferred_accept;
+#endif
+
+#if (NGX_HAVE_INET6)
+    ls->ipv6only = addr->opt.ipv6only;
+#endif
+
+#if (NGX_HAVE_SETFIB)
+    ls->setfib = addr->opt.setfib;
+#endif
+
+#if (NGX_HAVE_TCP_FASTOPEN)
+    ls->fastopen = addr->opt.fastopen;
+#endif
+
+#if (NGX_HAVE_REUSEPORT)
+    ls->reuseport = addr->opt.reuseport;
+#endif
+
+    ls->wildcard = addr->opt.wildcard;
+
+    return ls;
+}
+
+
+static ngx_int_t
+ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
+    ngx_stream_conf_addr_t *addr)
+{
+    ngx_uint_t                   i;
+    struct sockaddr_in          *sin;
+    ngx_stream_in_addr_t        *addrs;
+    ngx_stream_virtual_names_t  *vn;
+
+    stport->addrs = ngx_pcalloc(cf->pool,
+                                stport->naddrs * sizeof(ngx_stream_in_addr_t));
+    if (stport->addrs == NULL) {
+        return NGX_ERROR;
+    }
+
+    addrs = stport->addrs;
+
+    for (i = 0; i < stport->naddrs; i++) {
+
+        sin = (struct sockaddr_in *) addr[i].opt.sockaddr;
+        addrs[i].addr = sin->sin_addr.s_addr;
+        addrs[i].conf.default_server = addr[i].default_server;
+#if (NGX_STREAM_SSL)
+        addrs[i].conf.ssl = addr[i].opt.ssl;
+#endif
+        addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
+
+        if (addr[i].hash.buckets == NULL
+            && (addr[i].wc_head == NULL
+                || addr[i].wc_head->hash.buckets == NULL)
+            && (addr[i].wc_tail == NULL
+                || addr[i].wc_tail->hash.buckets == NULL)
+#if (NGX_PCRE)
+            && addr[i].nregex == 0
+#endif
+            )
+        {
+            continue;
+        }
+
+        vn = ngx_palloc(cf->pool, sizeof(ngx_stream_virtual_names_t));
+        if (vn == NULL) {
+            return NGX_ERROR;
+        }
+
+        addrs[i].conf.virtual_names = vn;
+
+        vn->names.hash = addr[i].hash;
+        vn->names.wc_head = addr[i].wc_head;
+        vn->names.wc_tail = addr[i].wc_tail;
+#if (NGX_PCRE)
+        vn->nregex = addr[i].nregex;
+        vn->regex = addr[i].regex;
+#endif
+    }
+
+    return NGX_OK;
+}
+
+
+#if (NGX_HAVE_INET6)
+
+static ngx_int_t
+ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
+    ngx_stream_conf_addr_t *addr)
+{
+    ngx_uint_t                   i;
+    struct sockaddr_in6         *sin6;
+    ngx_stream_in6_addr_t       *addrs6;
+    ngx_stream_virtual_names_t  *vn;
+
+    stport->addrs = ngx_pcalloc(cf->pool,
+                                stport->naddrs * sizeof(ngx_stream_in6_addr_t));
+    if (stport->addrs == NULL) {
+        return NGX_ERROR;
+    }
+
+    addrs6 = stport->addrs;
+
+    for (i = 0; i < stport->naddrs; i++) {
+
+        sin6 = (struct sockaddr_in6 *) addr[i].opt.sockaddr;
+        addrs6[i].addr6 = sin6->sin6_addr;
+        addrs6[i].conf.default_server = addr[i].default_server;
+#if (NGX_STREAM_SSL)
+        addrs6[i].conf.ssl = addr[i].opt.ssl;
+#endif
+        addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
+
+        if (addr[i].hash.buckets == NULL
+            && (addr[i].wc_head == NULL
+                || addr[i].wc_head->hash.buckets == NULL)
+            && (addr[i].wc_tail == NULL
+                || addr[i].wc_tail->hash.buckets == NULL)
+#if (NGX_PCRE)
+            && addr[i].nregex == 0
+#endif
+            )
+        {
+            continue;
+        }
+
+        vn = ngx_palloc(cf->pool, sizeof(ngx_stream_virtual_names_t));
+        if (vn == NULL) {
+            return NGX_ERROR;
+        }
+
+        addrs6[i].conf.virtual_names = vn;
+
+        vn->names.hash = addr[i].hash;
+        vn->names.wc_head = addr[i].wc_head;
+        vn->names.wc_tail = addr[i].wc_tail;
+#if (NGX_PCRE)
+        vn->nregex = addr[i].nregex;
+        vn->regex = addr[i].regex;
+#endif
+    }
+
+    return NGX_OK;
+}
+
+#endif
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
index 46c3622..dc05dc5 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -45,74 +45,39 @@ typedef struct {
     socklen_t                      socklen;
     ngx_str_t                      addr_text;
 
-    /* server ctx */
-    ngx_stream_conf_ctx_t         *ctx;
-
+    unsigned                       set:1;
+    unsigned                       default_server:1;
     unsigned                       bind:1;
     unsigned                       wildcard:1;
     unsigned                       ssl:1;
 #if (NGX_HAVE_INET6)
     unsigned                       ipv6only:1;
 #endif
+    unsigned                       deferred_accept:1;
     unsigned                       reuseport:1;
     unsigned                       so_keepalive:2;
     unsigned                       proxy_protocol:1;
+
+    int                            backlog;
+    int                            rcvbuf;
+    int                            sndbuf;
+    int                            type;
+#if (NGX_HAVE_SETFIB)
+    int                            setfib;
+#endif
+#if (NGX_HAVE_TCP_FASTOPEN)
+    int                            fastopen;
+#endif
 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
     int                            tcp_keepidle;
     int                            tcp_keepintvl;
     int                            tcp_keepcnt;
 #endif
-    int                            backlog;
-    int                            rcvbuf;
-    int                            sndbuf;
-#if (NGX_HAVE_TCP_FASTOPEN)
-    int                            fastopen;
+
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
+    char                          *accept_filter;
 #endif
-    int                            type;
-} ngx_stream_listen_t;
-
-
-typedef struct {
-    ngx_stream_conf_ctx_t         *ctx;
-    ngx_str_t                      addr_text;
-    unsigned                       ssl:1;
-    unsigned                       proxy_protocol:1;
-} ngx_stream_addr_conf_t;
-
-typedef struct {
-    in_addr_t                      addr;
-    ngx_stream_addr_conf_t         conf;
-} ngx_stream_in_addr_t;
-
-
-#if (NGX_HAVE_INET6)
-
-typedef struct {
-    struct in6_addr                addr6;
-    ngx_stream_addr_conf_t         conf;
-} ngx_stream_in6_addr_t;
-
-#endif
-
-
-typedef struct {
-    /* ngx_stream_in_addr_t or ngx_stream_in6_addr_t */
-    void                          *addrs;
-    ngx_uint_t                     naddrs;
-} ngx_stream_port_t;
-
-
-typedef struct {
-    int                            family;
-    int                            type;
-    in_port_t                      port;
-    ngx_array_t                    addrs; /* array of ngx_stream_conf_addr_t */
-} ngx_stream_conf_port_t;
-
-
-typedef struct {
-    ngx_stream_listen_t            opt;
-} ngx_stream_conf_addr_t;
+} ngx_stream_listen_opt_t;
 
 
 typedef enum {
@@ -153,7 +118,6 @@ typedef struct {
 
 typedef struct {
     ngx_array_t                    servers;     /* ngx_stream_core_srv_conf_t */
-    ngx_array_t                    listen;      /* ngx_stream_listen_t */
 
     ngx_stream_phase_engine_t      phase_engine;
 
@@ -163,16 +127,24 @@ typedef struct {
     ngx_array_t                    prefix_variables; /* ngx_stream_variable_t */
     ngx_uint_t                     ncaptures;
 
+    ngx_uint_t                     server_names_hash_max_size;
+    ngx_uint_t                     server_names_hash_bucket_size;
+
     ngx_uint_t                     variables_hash_max_size;
     ngx_uint_t                     variables_hash_bucket_size;
 
     ngx_hash_keys_arrays_t        *variables_keys;
 
+    ngx_array_t                   *ports;
+
     ngx_stream_phase_t             phases[NGX_STREAM_LOG_PHASE + 1];
 } ngx_stream_core_main_conf_t;
 
 
 typedef struct {
+    /* array of the ngx_stream_server_name_t, "server_name" directive */
+    ngx_array_t                    server_names;
+
     ngx_stream_content_handler_pt  handler;
 
     ngx_stream_conf_ctx_t         *ctx;
@@ -180,6 +152,8 @@ typedef struct {
     u_char                        *file_name;
     ngx_uint_t                     line;
 
+    ngx_str_t                      server_name;
+
     ngx_flag_t                     tcp_nodelay;
     size_t                         preread_buffer_size;
     ngx_msec_t                     preread_timeout;
@@ -191,10 +165,98 @@ typedef struct {
 
     ngx_msec_t                     proxy_protocol_timeout;
 
-    ngx_uint_t                     listen;  /* unsigned  listen:1; */
+    unsigned                       listen:1;
+#if (NGX_PCRE)
+    unsigned                       captures:1;
+#endif
 } ngx_stream_core_srv_conf_t;
 
 
+/* list of structures to find core_srv_conf quickly at run time */
+
+
+typedef struct {
+#if (NGX_PCRE)
+    ngx_stream_regex_t            *regex;
+#endif
+    ngx_stream_core_srv_conf_t    *server;   /* virtual name server conf */
+    ngx_str_t                      name;
+} ngx_stream_server_name_t;
+
+
+typedef struct {
+    ngx_hash_combined_t            names;
+
+    ngx_uint_t                     nregex;
+    ngx_stream_server_name_t      *regex;
+} ngx_stream_virtual_names_t;
+
+
+typedef struct {
+    /* the default server configuration for this address:port */
+    ngx_stream_core_srv_conf_t    *default_server;
+
+    ngx_stream_virtual_names_t    *virtual_names;
+
+    unsigned                       ssl:1;
+    unsigned                       proxy_protocol:1;
+} ngx_stream_addr_conf_t;
+
+
+typedef struct {
+    in_addr_t                      addr;
+    ngx_stream_addr_conf_t         conf;
+} ngx_stream_in_addr_t;
+
+
+#if (NGX_HAVE_INET6)
+
+typedef struct {
+    struct in6_addr                addr6;
+    ngx_stream_addr_conf_t         conf;
+} ngx_stream_in6_addr_t;
+
+#endif
+
+
+typedef struct {
+    /* ngx_stream_in_addr_t or ngx_stream_in6_addr_t */
+    void                          *addrs;
+    ngx_uint_t                     naddrs;
+} ngx_stream_port_t;
+
+
+typedef struct {
+    int                            family;
+    int                            type;
+    in_port_t                      port;
+    ngx_array_t                    addrs; /* array of ngx_stream_conf_addr_t */
+} ngx_stream_conf_port_t;
+
+
+typedef struct {
+    ngx_stream_listen_opt_t        opt;
+
+    unsigned                       protocols:3;
+    unsigned                       protocols_set:1;
+    unsigned                       protocols_changed:1;
+
+    ngx_hash_t                     hash;
+    ngx_hash_wildcard_t           *wc_head;
+    ngx_hash_wildcard_t           *wc_tail;
+
+#if (NGX_PCRE)
+    ngx_uint_t                     nregex;
+    ngx_stream_server_name_t      *regex;
+#endif
+
+    /* the default server configuration for this address:port */
+    ngx_stream_core_srv_conf_t    *default_server;
+    ngx_array_t                    servers;
+                                      /* array of ngx_stream_core_srv_conf_t */
+} ngx_stream_conf_addr_t;
+
+
 struct ngx_stream_session_s {
     uint32_t                       signature;         /* "STRM" */
 
@@ -210,6 +272,8 @@ struct ngx_stream_session_s {
     void                         **main_conf;
     void                         **srv_conf;
 
+    ngx_stream_virtual_names_t    *virtual_names;
+
     ngx_stream_upstream_t         *upstream;
     ngx_array_t                   *upstream_states;
                                            /* of ngx_stream_upstream_state_t */
@@ -283,6 +347,9 @@ typedef struct {
 #define NGX_STREAM_WRITE_BUFFERED  0x10
 
 
+ngx_int_t ngx_stream_add_listen(ngx_conf_t *cf,
+    ngx_stream_core_srv_conf_t *cscf, ngx_stream_listen_opt_t *lsopt);
+
 void ngx_stream_core_run_phases(ngx_stream_session_t *s);
 ngx_int_t ngx_stream_core_generic_phase(ngx_stream_session_t *s,
     ngx_stream_phase_handler_t *ph);
@@ -291,6 +358,10 @@ ngx_int_t ngx_stream_core_preread_phase(ngx_stream_session_t *s,
 ngx_int_t ngx_stream_core_content_phase(ngx_stream_session_t *s,
     ngx_stream_phase_handler_t *ph);
 
+ngx_int_t ngx_stream_validate_host(ngx_str_t *host, ngx_pool_t *pool,
+    ngx_uint_t alloc);
+ngx_int_t ngx_stream_find_virtual_server(ngx_stream_session_t *s,
+    ngx_str_t *host, ngx_stream_core_srv_conf_t **cscfp);
 
 void ngx_stream_init_connection(ngx_connection_t *c);
 void ngx_stream_session_handler(ngx_event_t *rev);
diff --git a/src/stream/ngx_stream_access_module.c b/src/stream/ngx_stream_access_module.c
index a3020d4..070c226 100644
--- a/src/stream/ngx_stream_access_module.c
+++ b/src/stream/ngx_stream_access_module.c
@@ -144,7 +144,7 @@ ngx_stream_access_handler(ngx_stream_session_t *s)
         p = sin6->sin6_addr.s6_addr;
 
         if (ascf->rules && IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
-            addr = p[12] << 24;
+            addr = (in_addr_t) p[12] << 24;
             addr += p[13] << 16;
             addr += p[14] << 8;
             addr += p[15];
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index f0b7934..3093963 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -10,6 +10,11 @@
 #include <ngx_stream.h>
 
 
+static ngx_uint_t ngx_stream_preread_can_peek(ngx_connection_t *c);
+static ngx_int_t ngx_stream_preread_peek(ngx_stream_session_t *s,
+    ngx_stream_phase_handler_t *ph);
+static ngx_int_t ngx_stream_preread(ngx_stream_session_t *s,
+    ngx_stream_phase_handler_t *ph);
 static ngx_int_t ngx_stream_core_preconfiguration(ngx_conf_t *cf);
 static void *ngx_stream_core_create_main_conf(ngx_conf_t *cf);
 static char *ngx_stream_core_init_main_conf(ngx_conf_t *cf, void *conf);
@@ -22,6 +27,8 @@ static char *ngx_stream_core_server(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static char *ngx_stream_core_server_name(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 static char *ngx_stream_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
@@ -42,6 +49,20 @@ static ngx_command_t  ngx_stream_core_commands[] = {
       offsetof(ngx_stream_core_main_conf_t, variables_hash_bucket_size),
       NULL },
 
+    { ngx_string("server_names_hash_max_size"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      offsetof(ngx_stream_core_main_conf_t, server_names_hash_max_size),
+      NULL },
+
+    { ngx_string("server_names_hash_bucket_size"),
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_STREAM_MAIN_CONF_OFFSET,
+      offsetof(ngx_stream_core_main_conf_t, server_names_hash_bucket_size),
+      NULL },
+
     { ngx_string("server"),
       NGX_STREAM_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
       ngx_stream_core_server,
@@ -56,6 +77,13 @@ static ngx_command_t  ngx_stream_core_commands[] = {
       0,
       NULL },
 
+    { ngx_string("server_name"),
+      NGX_STREAM_SRV_CONF|NGX_CONF_1MORE,
+      ngx_stream_core_server_name,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
     { ngx_string("error_log"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE,
       ngx_stream_core_error_log,
@@ -203,8 +231,6 @@ ngx_int_t
 ngx_stream_core_preread_phase(ngx_stream_session_t *s,
     ngx_stream_phase_handler_t *ph)
 {
-    size_t                       size;
-    ssize_t                      n;
     ngx_int_t                    rc;
     ngx_connection_t            *c;
     ngx_stream_core_srv_conf_t  *cscf;
@@ -217,56 +243,33 @@ ngx_stream_core_preread_phase(ngx_stream_session_t *s,
 
     if (c->read->timedout) {
         rc = NGX_STREAM_OK;
+        goto done;
+    }
 
-    } else if (c->read->timer_set) {
-        rc = NGX_AGAIN;
+    if (!c->read->timer_set) {
+        rc = ph->handler(s);
+
+        if (rc != NGX_AGAIN) {
+            goto done;
+        }
+    }
+
+    if (c->buffer == NULL) {
+        c->buffer = ngx_create_temp_buf(c->pool, cscf->preread_buffer_size);
+        if (c->buffer == NULL) {
+            rc = NGX_ERROR;
+            goto done;
+        }
+    }
+
+    if (ngx_stream_preread_can_peek(c)) {
+        rc = ngx_stream_preread_peek(s, ph);
 
     } else {
-        rc = ph->handler(s);
+        rc = ngx_stream_preread(s, ph);
     }
 
-    while (rc == NGX_AGAIN) {
-
-        if (c->buffer == NULL) {
-            c->buffer = ngx_create_temp_buf(c->pool, cscf->preread_buffer_size);
-            if (c->buffer == NULL) {
-                rc = NGX_ERROR;
-                break;
-            }
-        }
-
-        size = c->buffer->end - c->buffer->last;
-
-        if (size == 0) {
-            ngx_log_error(NGX_LOG_ERR, c->log, 0, "preread buffer full");
-            rc = NGX_STREAM_BAD_REQUEST;
-            break;
-        }
-
-        if (c->read->eof) {
-            rc = NGX_STREAM_OK;
-            break;
-        }
-
-        if (!c->read->ready) {
-            break;
-        }
-
-        n = c->recv(c, c->buffer->last, size);
-
-        if (n == NGX_ERROR || n == 0) {
-            rc = NGX_STREAM_OK;
-            break;
-        }
-
-        if (n == NGX_AGAIN) {
-            break;
-        }
-
-        c->buffer->last += n;
-
-        rc = ph->handler(s);
-    }
+done:
 
     if (rc == NGX_AGAIN) {
         if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
@@ -311,6 +314,129 @@ ngx_stream_core_preread_phase(ngx_stream_session_t *s,
 }
 
 
+static ngx_uint_t
+ngx_stream_preread_can_peek(ngx_connection_t *c)
+{
+#if (NGX_STREAM_SSL)
+    if (c->ssl) {
+        return 0;
+    }
+#endif
+
+    if ((ngx_event_flags & NGX_USE_CLEAR_EVENT) == 0) {
+        return 0;
+    }
+
+#if (NGX_HAVE_KQUEUE)
+    if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
+        return 1;
+    }
+#endif
+
+#if (NGX_HAVE_EPOLLRDHUP)
+    if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && ngx_use_epoll_rdhup) {
+        return 1;
+    }
+#endif
+
+    return 0;
+}
+
+
+static ngx_int_t
+ngx_stream_preread_peek(ngx_stream_session_t *s, ngx_stream_phase_handler_t *ph)
+{
+    ssize_t            n;
+    ngx_int_t          rc;
+    ngx_err_t          err;
+    ngx_connection_t  *c;
+
+    c = s->connection;
+
+    n = recv(c->fd, (char *) c->buffer->last,
+             c->buffer->end - c->buffer->last, MSG_PEEK);
+
+    err = ngx_socket_errno;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0, "stream recv(): %z", n);
+
+    if (n == -1) {
+        if (err == NGX_EAGAIN) {
+            c->read->ready = 0;
+            return NGX_AGAIN;
+        }
+
+        ngx_connection_error(c, err, "recv() failed");
+        return NGX_STREAM_OK;
+    }
+
+    if (n == 0) {
+        return NGX_STREAM_OK;
+    }
+
+    c->buffer->last += n;
+
+    rc = ph->handler(s);
+
+    if (rc != NGX_AGAIN) {
+        c->buffer->last = c->buffer->pos;
+        return rc;
+    }
+
+    if (c->buffer->last == c->buffer->end) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0, "preread buffer full");
+        return NGX_STREAM_BAD_REQUEST;
+    }
+
+    if (c->read->pending_eof) {
+        return NGX_STREAM_OK;
+    }
+
+    c->buffer->last = c->buffer->pos;
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_stream_preread(ngx_stream_session_t *s, ngx_stream_phase_handler_t *ph)
+{
+    ssize_t            n;
+    ngx_int_t          rc;
+    ngx_connection_t  *c;
+
+    c = s->connection;
+
+    while (c->read->ready) {
+
+        n = c->recv(c, c->buffer->last, c->buffer->end - c->buffer->last);
+
+        if (n == NGX_AGAIN) {
+            return NGX_AGAIN;
+        }
+
+        if (n == NGX_ERROR || n == 0) {
+            return NGX_STREAM_OK;
+        }
+
+        c->buffer->last += n;
+
+        rc = ph->handler(s);
+
+        if (rc != NGX_AGAIN) {
+            return rc;
+        }
+
+        if (c->buffer->last == c->buffer->end) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0, "preread buffer full");
+            return NGX_STREAM_BAD_REQUEST;
+        }
+    }
+
+    return NGX_AGAIN;
+}
+
+
 ngx_int_t
 ngx_stream_core_content_phase(ngx_stream_session_t *s,
     ngx_stream_phase_handler_t *ph)
@@ -338,6 +464,149 @@ ngx_stream_core_content_phase(ngx_stream_session_t *s,
 }
 
 
+ngx_int_t
+ngx_stream_validate_host(ngx_str_t *host, ngx_pool_t *pool, ngx_uint_t alloc)
+{
+    u_char  *h, ch;
+    size_t   i, dot_pos, host_len;
+
+    enum {
+        sw_usual = 0,
+        sw_literal,
+        sw_rest
+    } state;
+
+    dot_pos = host->len;
+    host_len = host->len;
+
+    h = host->data;
+
+    state = sw_usual;
+
+    for (i = 0; i < host->len; i++) {
+        ch = h[i];
+
+        switch (ch) {
+
+        case '.':
+            if (dot_pos == i - 1) {
+                return NGX_DECLINED;
+            }
+            dot_pos = i;
+            break;
+
+        case ':':
+            if (state == sw_usual) {
+                host_len = i;
+                state = sw_rest;
+            }
+            break;
+
+        case '[':
+            if (i == 0) {
+                state = sw_literal;
+            }
+            break;
+
+        case ']':
+            if (state == sw_literal) {
+                host_len = i + 1;
+                state = sw_rest;
+            }
+            break;
+
+        default:
+
+            if (ngx_path_separator(ch)) {
+                return NGX_DECLINED;
+            }
+
+            if (ch <= 0x20 || ch == 0x7f) {
+                return NGX_DECLINED;
+            }
+
+            if (ch >= 'A' && ch <= 'Z') {
+                alloc = 1;
+            }
+
+            break;
+        }
+    }
+
+    if (dot_pos == host_len - 1) {
+        host_len--;
+    }
+
+    if (host_len == 0) {
+        return NGX_DECLINED;
+    }
+
+    if (alloc) {
+        host->data = ngx_pnalloc(pool, host_len);
+        if (host->data == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_strlow(host->data, h, host_len);
+    }
+
+    host->len = host_len;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_stream_find_virtual_server(ngx_stream_session_t *s,
+    ngx_str_t *host, ngx_stream_core_srv_conf_t **cscfp)
+{
+    ngx_stream_core_srv_conf_t  *cscf;
+
+    if (s->virtual_names == NULL) {
+        return NGX_DECLINED;
+    }
+
+    cscf = ngx_hash_find_combined(&s->virtual_names->names,
+                                  ngx_hash_key(host->data, host->len),
+                                  host->data, host->len);
+
+    if (cscf) {
+        *cscfp = cscf;
+        return NGX_OK;
+    }
+
+#if (NGX_PCRE)
+
+    if (host->len && s->virtual_names->nregex) {
+        ngx_int_t                  n;
+        ngx_uint_t                 i;
+        ngx_stream_server_name_t  *sn;
+
+        sn = s->virtual_names->regex;
+
+        for (i = 0; i < s->virtual_names->nregex; i++) {
+
+            n = ngx_stream_regex_exec(s, sn[i].regex, host);
+
+            if (n == NGX_DECLINED) {
+                continue;
+            }
+
+            if (n == NGX_OK) {
+                *cscfp = sn[i].server;
+                return NGX_OK;
+            }
+
+            return NGX_ERROR;
+        }
+    }
+
+#endif /* NGX_PCRE */
+
+    return NGX_DECLINED;
+}
+
+
 static ngx_int_t
 ngx_stream_core_preconfiguration(ngx_conf_t *cf)
 {
@@ -362,11 +631,8 @@ ngx_stream_core_create_main_conf(ngx_conf_t *cf)
         return NULL;
     }
 
-    if (ngx_array_init(&cmcf->listen, cf->pool, 4, sizeof(ngx_stream_listen_t))
-        != NGX_OK)
-    {
-        return NULL;
-    }
+    cmcf->server_names_hash_max_size = NGX_CONF_UNSET_UINT;
+    cmcf->server_names_hash_bucket_size = NGX_CONF_UNSET_UINT;
 
     cmcf->variables_hash_max_size = NGX_CONF_UNSET_UINT;
     cmcf->variables_hash_bucket_size = NGX_CONF_UNSET_UINT;
@@ -380,6 +646,14 @@ ngx_stream_core_init_main_conf(ngx_conf_t *cf, void *conf)
 {
     ngx_stream_core_main_conf_t *cmcf = conf;
 
+    ngx_conf_init_uint_value(cmcf->server_names_hash_max_size, 512);
+    ngx_conf_init_uint_value(cmcf->server_names_hash_bucket_size,
+                             ngx_cacheline_size);
+
+    cmcf->server_names_hash_bucket_size =
+            ngx_align(cmcf->server_names_hash_bucket_size, ngx_cacheline_size);
+
+
     ngx_conf_init_uint_value(cmcf->variables_hash_max_size, 1024);
     ngx_conf_init_uint_value(cmcf->variables_hash_bucket_size, 64);
 
@@ -411,6 +685,13 @@ ngx_stream_core_create_srv_conf(ngx_conf_t *cf)
      *     cscf->error_log = NULL;
      */
 
+    if (ngx_array_init(&cscf->server_names, cf->temp_pool, 4,
+                       sizeof(ngx_stream_server_name_t))
+        != NGX_OK)
+    {
+        return NULL;
+    }
+
     cscf->file_name = cf->conf_file->file.name.data;
     cscf->line = cf->conf_file->line;
     cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
@@ -429,6 +710,9 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_stream_core_srv_conf_t *prev = parent;
     ngx_stream_core_srv_conf_t *conf = child;
 
+    ngx_str_t                  name;
+    ngx_stream_server_name_t  *sn;
+
     ngx_conf_merge_msec_value(conf->resolver_timeout,
                               prev->resolver_timeout, 30000);
 
@@ -476,6 +760,37 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_msec_value(conf->preread_timeout,
                               prev->preread_timeout, 30000);
 
+    if (conf->server_names.nelts == 0) {
+        /* the array has 4 empty preallocated elements, so push cannot fail */
+        sn = ngx_array_push(&conf->server_names);
+#if (NGX_PCRE)
+        sn->regex = NULL;
+#endif
+        sn->server = conf;
+        ngx_str_set(&sn->name, "");
+    }
+
+    sn = conf->server_names.elts;
+    name = sn[0].name;
+
+#if (NGX_PCRE)
+    if (sn->regex) {
+        name.len++;
+        name.data--;
+    } else
+#endif
+
+    if (name.data[0] == '.') {
+        name.len--;
+        name.data++;
+    }
+
+    conf->server_name.len = name.len;
+    conf->server_name.data = ngx_pstrdup(cf->pool, &name);
+    if (conf->server_name.data == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
     return NGX_CONF_OK;
 }
 
@@ -575,11 +890,10 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_stream_core_srv_conf_t  *cscf = conf;
 
-    ngx_str_t                    *value, size;
-    ngx_url_t                     u;
-    ngx_uint_t                    i, n, backlog;
-    ngx_stream_listen_t          *ls, *als, *nls;
-    ngx_stream_core_main_conf_t  *cmcf;
+    ngx_str_t                *value, size;
+    ngx_url_t                 u;
+    ngx_uint_t                n, i, backlog;
+    ngx_stream_listen_opt_t   lsopt;
 
     cscf->listen = 1;
 
@@ -600,51 +914,67 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+    ngx_memzero(&lsopt, sizeof(ngx_stream_listen_opt_t));
 
-    ls = ngx_array_push(&cmcf->listen);
-    if (ls == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    ngx_memzero(ls, sizeof(ngx_stream_listen_t));
-
-    ls->backlog = NGX_LISTEN_BACKLOG;
-    ls->rcvbuf = -1;
-    ls->sndbuf = -1;
-    ls->type = SOCK_STREAM;
-    ls->ctx = cf->ctx;
-
-#if (NGX_HAVE_TCP_FASTOPEN)
-    ls->fastopen = -1;
+    lsopt.backlog = NGX_LISTEN_BACKLOG;
+    lsopt.type = SOCK_STREAM;
+    lsopt.rcvbuf = -1;
+    lsopt.sndbuf = -1;
+#if (NGX_HAVE_SETFIB)
+    lsopt.setfib = -1;
+#endif
+#if (NGX_HAVE_TCP_FASTOPEN)
+    lsopt.fastopen = -1;
 #endif
-
 #if (NGX_HAVE_INET6)
-    ls->ipv6only = 1;
+    lsopt.ipv6only = 1;
 #endif
 
     backlog = 0;
 
     for (i = 2; i < cf->args->nelts; i++) {
 
+        if (ngx_strcmp(value[i].data, "default_server") == 0) {
+            lsopt.default_server = 1;
+            continue;
+        }
+
 #if !(NGX_WIN32)
         if (ngx_strcmp(value[i].data, "udp") == 0) {
-            ls->type = SOCK_DGRAM;
+            lsopt.type = SOCK_DGRAM;
             continue;
         }
 #endif
 
         if (ngx_strcmp(value[i].data, "bind") == 0) {
-            ls->bind = 1;
+            lsopt.set = 1;
+            lsopt.bind = 1;
             continue;
         }
 
+#if (NGX_HAVE_SETFIB)
+        if (ngx_strncmp(value[i].data, "setfib=", 7) == 0) {
+            lsopt.setfib = ngx_atoi(value[i].data + 7, value[i].len - 7);
+            lsopt.set = 1;
+            lsopt.bind = 1;
+
+            if (lsopt.setfib == NGX_ERROR) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "invalid setfib \"%V\"", &value[i]);
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+#endif
+
 #if (NGX_HAVE_TCP_FASTOPEN)
         if (ngx_strncmp(value[i].data, "fastopen=", 9) == 0) {
-            ls->fastopen = ngx_atoi(value[i].data + 9, value[i].len - 9);
-            ls->bind = 1;
+            lsopt.fastopen = ngx_atoi(value[i].data + 9, value[i].len - 9);
+            lsopt.set = 1;
+            lsopt.bind = 1;
 
-            if (ls->fastopen == NGX_ERROR) {
+            if (lsopt.fastopen == NGX_ERROR) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                    "invalid fastopen \"%V\"", &value[i]);
                 return NGX_CONF_ERROR;
@@ -655,10 +985,11 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
 
         if (ngx_strncmp(value[i].data, "backlog=", 8) == 0) {
-            ls->backlog = ngx_atoi(value[i].data + 8, value[i].len - 8);
-            ls->bind = 1;
+            lsopt.backlog = ngx_atoi(value[i].data + 8, value[i].len - 8);
+            lsopt.set = 1;
+            lsopt.bind = 1;
 
-            if (ls->backlog == NGX_ERROR || ls->backlog == 0) {
+            if (lsopt.backlog == NGX_ERROR || lsopt.backlog == 0) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                    "invalid backlog \"%V\"", &value[i]);
                 return NGX_CONF_ERROR;
@@ -673,10 +1004,11 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             size.len = value[i].len - 7;
             size.data = value[i].data + 7;
 
-            ls->rcvbuf = ngx_parse_size(&size);
-            ls->bind = 1;
+            lsopt.rcvbuf = ngx_parse_size(&size);
+            lsopt.set = 1;
+            lsopt.bind = 1;
 
-            if (ls->rcvbuf == NGX_ERROR) {
+            if (lsopt.rcvbuf == NGX_ERROR) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                    "invalid rcvbuf \"%V\"", &value[i]);
                 return NGX_CONF_ERROR;
@@ -689,10 +1021,11 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             size.len = value[i].len - 7;
             size.data = value[i].data + 7;
 
-            ls->sndbuf = ngx_parse_size(&size);
-            ls->bind = 1;
+            lsopt.sndbuf = ngx_parse_size(&size);
+            lsopt.set = 1;
+            lsopt.bind = 1;
 
-            if (ls->sndbuf == NGX_ERROR) {
+            if (lsopt.sndbuf == NGX_ERROR) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                    "invalid sndbuf \"%V\"", &value[i]);
                 return NGX_CONF_ERROR;
@@ -701,13 +1034,40 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             continue;
         }
 
+        if (ngx_strncmp(value[i].data, "accept_filter=", 14) == 0) {
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
+            lsopt.accept_filter = (char *) &value[i].data[14];
+            lsopt.set = 1;
+            lsopt.bind = 1;
+#else
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "accept filters \"%V\" are not supported "
+                               "on this platform, ignored",
+                               &value[i]);
+#endif
+            continue;
+        }
+
+        if (ngx_strcmp(value[i].data, "deferred") == 0) {
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
+            lsopt.deferred_accept = 1;
+            lsopt.set = 1;
+            lsopt.bind = 1;
+#else
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "the deferred accept is not supported "
+                               "on this platform, ignored");
+#endif
+            continue;
+        }
+
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
             if (ngx_strcmp(&value[i].data[10], "n") == 0) {
-                ls->ipv6only = 1;
+                lsopt.ipv6only = 1;
 
             } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
-                ls->ipv6only = 0;
+                lsopt.ipv6only = 0;
 
             } else {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -716,11 +1076,13 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 return NGX_CONF_ERROR;
             }
 
-            ls->bind = 1;
+            lsopt.set = 1;
+            lsopt.bind = 1;
+
             continue;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "bind ipv6only is not supported "
+                               "ipv6only is not supported "
                                "on this platform");
             return NGX_CONF_ERROR;
 #endif
@@ -728,8 +1090,9 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strcmp(value[i].data, "reuseport") == 0) {
 #if (NGX_HAVE_REUSEPORT)
-            ls->reuseport = 1;
-            ls->bind = 1;
+            lsopt.reuseport = 1;
+            lsopt.set = 1;
+            lsopt.bind = 1;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "reuseport is not supported "
@@ -740,17 +1103,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         if (ngx_strcmp(value[i].data, "ssl") == 0) {
 #if (NGX_STREAM_SSL)
-            ngx_stream_ssl_conf_t  *sslcf;
-
-            sslcf = ngx_stream_conf_get_module_srv_conf(cf,
-                                                        ngx_stream_ssl_module);
-
-            sslcf->listen = 1;
-            sslcf->file = cf->conf_file->file.name.data;
-            sslcf->line = cf->conf_file->line;
-
-            ls->ssl = 1;
-
+            lsopt.ssl = 1;
             continue;
 #else
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -763,10 +1116,10 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         if (ngx_strncmp(value[i].data, "so_keepalive=", 13) == 0) {
 
             if (ngx_strcmp(&value[i].data[13], "on") == 0) {
-                ls->so_keepalive = 1;
+                lsopt.so_keepalive = 1;
 
             } else if (ngx_strcmp(&value[i].data[13], "off") == 0) {
-                ls->so_keepalive = 2;
+                lsopt.so_keepalive = 2;
 
             } else {
 
@@ -785,8 +1138,8 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 if (p > s.data) {
                     s.len = p - s.data;
 
-                    ls->tcp_keepidle = ngx_parse_time(&s, 1);
-                    if (ls->tcp_keepidle == (time_t) NGX_ERROR) {
+                    lsopt.tcp_keepidle = ngx_parse_time(&s, 1);
+                    if (lsopt.tcp_keepidle == (time_t) NGX_ERROR) {
                         goto invalid_so_keepalive;
                     }
                 }
@@ -801,8 +1154,8 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 if (p > s.data) {
                     s.len = p - s.data;
 
-                    ls->tcp_keepintvl = ngx_parse_time(&s, 1);
-                    if (ls->tcp_keepintvl == (time_t) NGX_ERROR) {
+                    lsopt.tcp_keepintvl = ngx_parse_time(&s, 1);
+                    if (lsopt.tcp_keepintvl == (time_t) NGX_ERROR) {
                         goto invalid_so_keepalive;
                     }
                 }
@@ -812,19 +1165,19 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 if (s.data < end) {
                     s.len = end - s.data;
 
-                    ls->tcp_keepcnt = ngx_atoi(s.data, s.len);
-                    if (ls->tcp_keepcnt == NGX_ERROR) {
+                    lsopt.tcp_keepcnt = ngx_atoi(s.data, s.len);
+                    if (lsopt.tcp_keepcnt == NGX_ERROR) {
                         goto invalid_so_keepalive;
                     }
                 }
 
-                if (ls->tcp_keepidle == 0 && ls->tcp_keepintvl == 0
-                    && ls->tcp_keepcnt == 0)
+                if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0
+                    && lsopt.tcp_keepcnt == 0)
                 {
                     goto invalid_so_keepalive;
                 }
 
-                ls->so_keepalive = 1;
+                lsopt.so_keepalive = 1;
 
 #else
 
@@ -836,7 +1189,8 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 #endif
             }
 
-            ls->bind = 1;
+            lsopt.set = 1;
+            lsopt.bind = 1;
 
             continue;
 
@@ -851,39 +1205,51 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
 
         if (ngx_strcmp(value[i].data, "proxy_protocol") == 0) {
-            ls->proxy_protocol = 1;
+            lsopt.proxy_protocol = 1;
             continue;
         }
 
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "the invalid \"%V\" parameter", &value[i]);
+                           "invalid parameter \"%V\"", &value[i]);
         return NGX_CONF_ERROR;
     }
 
-    if (ls->type == SOCK_DGRAM) {
+    if (lsopt.type == SOCK_DGRAM) {
+#if (NGX_HAVE_TCP_FASTOPEN)
+        if (lsopt.fastopen != -1) {
+            return "\"fastopen\" parameter is incompatible with \"udp\"";
+        }
+#endif
+
         if (backlog) {
             return "\"backlog\" parameter is incompatible with \"udp\"";
         }
 
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
+        if (lsopt.accept_filter) {
+            return "\"accept_filter\" parameter is incompatible with \"udp\"";
+        }
+#endif
+
+#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
+        if (lsopt.deferred_accept) {
+            return "\"deferred\" parameter is incompatible with \"udp\"";
+        }
+#endif
+
 #if (NGX_STREAM_SSL)
-        if (ls->ssl) {
+        if (lsopt.ssl) {
             return "\"ssl\" parameter is incompatible with \"udp\"";
         }
 #endif
 
-        if (ls->so_keepalive) {
+        if (lsopt.so_keepalive) {
             return "\"so_keepalive\" parameter is incompatible with \"udp\"";
         }
 
-        if (ls->proxy_protocol) {
+        if (lsopt.proxy_protocol) {
             return "\"proxy_protocol\" parameter is incompatible with \"udp\"";
         }
-
-#if (NGX_HAVE_TCP_FASTOPEN)
-        if (ls->fastopen != -1) {
-            return "\"fastopen\" parameter is incompatible with \"udp\"";
-        }
-#endif
     }
 
     for (n = 0; n < u.naddrs; n++) {
@@ -897,40 +1263,12 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             }
         }
 
-        if (n != 0) {
-            nls = ngx_array_push(&cmcf->listen);
-            if (nls == NULL) {
-                return NGX_CONF_ERROR;
-            }
+        lsopt.sockaddr = u.addrs[n].sockaddr;
+        lsopt.socklen = u.addrs[n].socklen;
+        lsopt.addr_text = u.addrs[n].name;
+        lsopt.wildcard = ngx_inet_wildcard(lsopt.sockaddr);
 
-            *nls = *ls;
-
-        } else {
-            nls = ls;
-        }
-
-        nls->sockaddr = u.addrs[n].sockaddr;
-        nls->socklen = u.addrs[n].socklen;
-        nls->addr_text = u.addrs[n].name;
-        nls->wildcard = ngx_inet_wildcard(nls->sockaddr);
-
-        als = cmcf->listen.elts;
-
-        for (i = 0; i < cmcf->listen.nelts - 1; i++) {
-            if (nls->type != als[i].type) {
-                continue;
-            }
-
-            if (ngx_cmp_sockaddr(als[i].sockaddr, als[i].socklen,
-                                 nls->sockaddr, nls->socklen, 1)
-                != NGX_OK)
-            {
-                continue;
-            }
-
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "duplicate \"%V\" address and port pair",
-                               &nls->addr_text);
+        if (ngx_stream_add_listen(cf, cscf, &lsopt) != NGX_OK) {
             return NGX_CONF_ERROR;
         }
 
@@ -942,6 +1280,107 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static char *
+ngx_stream_core_server_name(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_core_srv_conf_t *cscf = conf;
+
+    u_char                     ch;
+    ngx_str_t                 *value;
+    ngx_uint_t                 i;
+    ngx_stream_server_name_t  *sn;
+
+    value = cf->args->elts;
+
+    for (i = 1; i < cf->args->nelts; i++) {
+
+        ch = value[i].data[0];
+
+        if ((ch == '*' && (value[i].len < 3 || value[i].data[1] != '.'))
+            || (ch == '.' && value[i].len < 2))
+        {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "server name \"%V\" is invalid", &value[i]);
+            return NGX_CONF_ERROR;
+        }
+
+        if (ngx_strchr(value[i].data, '/')) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "server name \"%V\" has suspicious symbols",
+                               &value[i]);
+        }
+
+        sn = ngx_array_push(&cscf->server_names);
+        if (sn == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+#if (NGX_PCRE)
+        sn->regex = NULL;
+#endif
+        sn->server = cscf;
+
+        if (ngx_strcasecmp(value[i].data, (u_char *) "$hostname") == 0) {
+            sn->name = cf->cycle->hostname;
+
+        } else {
+            sn->name = value[i];
+        }
+
+        if (value[i].data[0] != '~') {
+            ngx_strlow(sn->name.data, sn->name.data, sn->name.len);
+            continue;
+        }
+
+#if (NGX_PCRE)
+        {
+        u_char               *p;
+        ngx_regex_compile_t   rc;
+        u_char                errstr[NGX_MAX_CONF_ERRSTR];
+
+        if (value[i].len == 1) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "empty regex in server name \"%V\"", &value[i]);
+            return NGX_CONF_ERROR;
+        }
+
+        value[i].len--;
+        value[i].data++;
+
+        ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
+
+        rc.pattern = value[i];
+        rc.err.len = NGX_MAX_CONF_ERRSTR;
+        rc.err.data = errstr;
+
+        for (p = value[i].data; p < value[i].data + value[i].len; p++) {
+            if (*p >= 'A' && *p <= 'Z') {
+                rc.options = NGX_REGEX_CASELESS;
+                break;
+            }
+        }
+
+        sn->regex = ngx_stream_regex_compile(cf, &rc);
+        if (sn->regex == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        sn->name = value[i];
+        cscf->captures = (rc.captures > 0);
+        }
+#else
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "using regex \"%V\" "
+                           "requires PCRE library", &value[i]);
+
+        return NGX_CONF_ERROR;
+#endif
+    }
+
+    return NGX_CONF_OK;
+}
+
+
 static char *
 ngx_stream_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
diff --git a/src/stream/ngx_stream_geo_module.c b/src/stream/ngx_stream_geo_module.c
index 4b4cad8..2324bef 100644
--- a/src/stream/ngx_stream_geo_module.c
+++ b/src/stream/ngx_stream_geo_module.c
@@ -190,7 +190,7 @@ ngx_stream_geo_cidr_variable(ngx_stream_session_t *s,
         p = inaddr6->s6_addr;
 
         if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
-            inaddr = p[12] << 24;
+            inaddr = (in_addr_t) p[12] << 24;
             inaddr += p[13] << 16;
             inaddr += p[14] << 8;
             inaddr += p[15];
@@ -263,7 +263,7 @@ ngx_stream_geo_range_variable(ngx_stream_session_t *s,
             if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
                 p = inaddr6->s6_addr;
 
-                inaddr = p[12] << 24;
+                inaddr = (in_addr_t) p[12] << 24;
                 inaddr += p[13] << 16;
                 inaddr += p[14] << 8;
                 inaddr += p[15];
@@ -1209,7 +1209,7 @@ ngx_stream_geo_value(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
         return gvvn->value;
     }
 
-    val = ngx_palloc(ctx->pool, sizeof(ngx_stream_variable_value_t));
+    val = ngx_pcalloc(ctx->pool, sizeof(ngx_stream_variable_value_t));
     if (val == NULL) {
         return NULL;
     }
@@ -1221,8 +1221,6 @@ ngx_stream_geo_value(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
     }
 
     val->valid = 1;
-    val->no_cacheable = 0;
-    val->not_found = 0;
 
     gvvn = ngx_palloc(ctx->temp_pool,
                       sizeof(ngx_stream_geo_variable_value_node_t));
diff --git a/src/stream/ngx_stream_geoip_module.c b/src/stream/ngx_stream_geoip_module.c
index 6507b71..3ee8f0e 100644
--- a/src/stream/ngx_stream_geoip_module.c
+++ b/src/stream/ngx_stream_geoip_module.c
@@ -236,7 +236,7 @@ ngx_stream_geoip_addr(ngx_stream_session_t *s, ngx_stream_geoip_conf_t *gcf)
         if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
             p = inaddr6->s6_addr;
 
-            inaddr = p[12] << 24;
+            inaddr = (in_addr_t) p[12] << 24;
             inaddr += p[13] << 16;
             inaddr += p[14] << 8;
             inaddr += p[15];
diff --git a/src/stream/ngx_stream_handler.c b/src/stream/ngx_stream_handler.c
index 669b6a1..a7ffc6e 100644
--- a/src/stream/ngx_stream_handler.c
+++ b/src/stream/ngx_stream_handler.c
@@ -30,6 +30,7 @@ ngx_stream_init_connection(ngx_connection_t *c)
     struct sockaddr_in           *sin;
     ngx_stream_in_addr_t         *addr;
     ngx_stream_session_t         *s;
+    ngx_stream_conf_ctx_t        *ctx;
     ngx_stream_addr_conf_t       *addr_conf;
 #if (NGX_HAVE_INET6)
     struct sockaddr_in6          *sin6;
@@ -121,9 +122,12 @@ ngx_stream_init_connection(ngx_connection_t *c)
         return;
     }
 
+    ctx = addr_conf->default_server->ctx;
+
     s->signature = NGX_STREAM_MODULE;
-    s->main_conf = addr_conf->ctx->main_conf;
-    s->srv_conf = addr_conf->ctx->srv_conf;
+    s->main_conf = ctx->main_conf;
+    s->srv_conf = ctx->srv_conf;
+    s->virtual_names = addr_conf->virtual_names;
 
 #if (NGX_STREAM_SSL)
     s->ssl = addr_conf->ssl;
@@ -144,7 +148,7 @@ ngx_stream_init_connection(ngx_connection_t *c)
 
     ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%uA %sclient %*s connected to %V",
                   c->number, c->type == SOCK_DGRAM ? "udp " : "",
-                  len, text, &addr_conf->addr_text);
+                  len, text, &c->listening->addr_text);
 
     c->log->connection = c->number;
     c->log->handler = ngx_stream_log_error;
diff --git a/src/stream/ngx_stream_pass_module.c b/src/stream/ngx_stream_pass_module.c
new file mode 100644
index 0000000..2c1c60c
--- /dev/null
+++ b/src/stream/ngx_stream_pass_module.c
@@ -0,0 +1,327 @@
+
+/*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+
+#define NGX_STREAM_PASS_MAX_PASSES  10
+
+
+typedef struct {
+    ngx_addr_t                  *addr;
+    ngx_stream_complex_value_t  *addr_value;
+} ngx_stream_pass_srv_conf_t;
+
+
+static void ngx_stream_pass_handler(ngx_stream_session_t *s);
+static ngx_int_t ngx_stream_pass_check_cycle(ngx_connection_t *c);
+static void ngx_stream_pass_cleanup(void *data);
+static ngx_int_t ngx_stream_pass_match(ngx_listening_t *ls, ngx_addr_t *addr);
+static void *ngx_stream_pass_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_stream_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
+
+static ngx_command_t  ngx_stream_pass_commands[] = {
+
+    { ngx_string("pass"),
+      NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      ngx_stream_pass,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_pass_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    ngx_stream_pass_create_srv_conf,       /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_pass_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_pass_module_ctx,           /* module context */
+    ngx_stream_pass_commands,              /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void
+ngx_stream_pass_handler(ngx_stream_session_t *s)
+{
+    ngx_url_t                    u;
+    ngx_str_t                    url;
+    ngx_addr_t                  *addr;
+    ngx_uint_t                   i;
+    ngx_listening_t             *ls;
+    ngx_connection_t            *c;
+    ngx_stream_pass_srv_conf_t  *pscf;
+
+    c = s->connection;
+
+    c->log->action = "passing connection to port";
+
+    if (c->buffer && c->buffer->pos != c->buffer->last) {
+        ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                      "cannot pass connection with preread data");
+        goto failed;
+    }
+
+    pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_pass_module);
+
+    addr = pscf->addr;
+
+    if (addr == NULL) {
+        if (ngx_stream_complex_value(s, pscf->addr_value, &url) != NGX_OK) {
+            goto failed;
+        }
+
+        ngx_memzero(&u, sizeof(ngx_url_t));
+
+        u.url = url;
+        u.no_resolve = 1;
+
+        if (ngx_parse_url(c->pool, &u) != NGX_OK) {
+            if (u.err) {
+                ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                              "%s in pass \"%V\"", u.err, &u.url);
+            }
+
+            goto failed;
+        }
+
+        if (u.naddrs == 0) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                          "no addresses in pass \"%V\"", &u.url);
+            goto failed;
+        }
+
+        if (u.no_port) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                          "no port in pass \"%V\"", &u.url);
+            goto failed;
+        }
+
+        addr = &u.addrs[0];
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "stream pass addr: \"%V\"", &addr->name);
+
+    if (ngx_stream_pass_check_cycle(c) != NGX_OK) {
+        goto failed;
+    }
+
+    ls = ngx_cycle->listening.elts;
+
+    for (i = 0; i < ngx_cycle->listening.nelts; i++) {
+
+        if (ngx_stream_pass_match(&ls[i], addr) != NGX_OK) {
+            continue;
+        }
+
+        c->listening = &ls[i];
+
+        c->data = NULL;
+        c->buffer = NULL;
+
+        *c->log = c->listening->log;
+        c->log->handler = NULL;
+        c->log->data = NULL;
+
+        c->local_sockaddr = addr->sockaddr;
+        c->local_socklen = addr->socklen;
+
+        c->listening->handler(c);
+
+        return;
+    }
+
+    ngx_log_error(NGX_LOG_ERR, c->log, 0,
+                  "port not found for \"%V\"", &addr->name);
+
+    ngx_stream_finalize_session(s, NGX_STREAM_OK);
+
+    return;
+
+failed:
+
+    ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+}
+
+
+static ngx_int_t
+ngx_stream_pass_check_cycle(ngx_connection_t *c)
+{
+    ngx_uint_t          *num;
+    ngx_pool_cleanup_t  *cln;
+
+    for (cln = c->pool->cleanup; cln; cln = cln->next) {
+        if (cln->handler != ngx_stream_pass_cleanup) {
+            continue;
+        }
+
+        num = cln->data;
+
+        if (++(*num) > NGX_STREAM_PASS_MAX_PASSES) {
+            ngx_log_error(NGX_LOG_ERR, c->log, 0, "stream pass cycle");
+            return NGX_ERROR;
+        }
+
+        return NGX_OK;
+    }
+
+    cln = ngx_pool_cleanup_add(c->pool, sizeof(ngx_uint_t));
+    if (cln == NULL) {
+        return NGX_ERROR;
+    }
+
+    cln->handler = ngx_stream_pass_cleanup;
+
+    num = cln->data;
+    *num = 1;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_stream_pass_cleanup(void *data)
+{
+    return;
+}
+
+
+static ngx_int_t
+ngx_stream_pass_match(ngx_listening_t *ls, ngx_addr_t *addr)
+{
+    if (!ls->wildcard) {
+        return ngx_cmp_sockaddr(ls->sockaddr, ls->socklen,
+                                addr->sockaddr, addr->socklen, 1);
+    }
+
+    if (ls->sockaddr->sa_family == addr->sockaddr->sa_family
+        && ngx_inet_get_port(ls->sockaddr) == ngx_inet_get_port(addr->sockaddr))
+    {
+        return NGX_OK;
+    }
+
+    return NGX_DECLINED;
+}
+
+
+static void *
+ngx_stream_pass_create_srv_conf(ngx_conf_t *cf)
+{
+    ngx_stream_pass_srv_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_pass_srv_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->addr = NULL;
+     *     conf->addr_value = NULL;
+     */
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_stream_pass_srv_conf_t *pscf = conf;
+
+    ngx_url_t                            u;
+    ngx_str_t                           *value, *url;
+    ngx_stream_complex_value_t           cv;
+    ngx_stream_core_srv_conf_t          *cscf;
+    ngx_stream_compile_complex_value_t   ccv;
+
+    if (pscf->addr || pscf->addr_value) {
+        return "is duplicate";
+    }
+
+    cscf = ngx_stream_conf_get_module_srv_conf(cf, ngx_stream_core_module);
+
+    cscf->handler = ngx_stream_pass_handler;
+
+    value = cf->args->elts;
+
+    url = &value[1];
+
+    ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = url;
+    ccv.complex_value = &cv;
+
+    if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cv.lengths) {
+        pscf->addr_value = ngx_palloc(cf->pool,
+                                      sizeof(ngx_stream_complex_value_t));
+        if (pscf->addr_value == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *pscf->addr_value = cv;
+
+        return NGX_CONF_OK;
+    }
+
+    ngx_memzero(&u, sizeof(ngx_url_t));
+
+    u.url = *url;
+    u.no_resolve = 1;
+
+    if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
+        if (u.err) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "%s in \"%V\" of the \"pass\" directive",
+                               u.err, &u.url);
+        }
+
+        return NGX_CONF_ERROR;
+    }
+
+    if (u.naddrs == 0) {
+        return "has no addresses";
+    }
+
+    if (u.no_port) {
+        return "has no port";
+    }
+
+    pscf->addr = &u.addrs[0];
+
+    return NGX_CONF_OK;
+}
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index 1ba1825..ba44477 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -40,12 +40,12 @@ static ngx_int_t ngx_stream_ssl_variable(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 
 static ngx_int_t ngx_stream_ssl_add_variables(ngx_conf_t *cf);
-static void *ngx_stream_ssl_create_conf(ngx_conf_t *cf);
-static char *ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent,
+static void *ngx_stream_ssl_create_srv_conf(ngx_conf_t *cf);
+static char *ngx_stream_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent,
     void *child);
 
 static ngx_int_t ngx_stream_ssl_compile_certificates(ngx_conf_t *cf,
-    ngx_stream_ssl_conf_t *conf);
+    ngx_stream_ssl_srv_conf_t *conf);
 
 static char *ngx_stream_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
@@ -90,21 +90,21 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_msec_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, handshake_timeout),
+      offsetof(ngx_stream_ssl_srv_conf_t, handshake_timeout),
       NULL },
 
     { ngx_string("ssl_certificate"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_array_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, certificates),
+      offsetof(ngx_stream_ssl_srv_conf_t, certificates),
       NULL },
 
     { ngx_string("ssl_certificate_key"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_array_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, certificate_keys),
+      offsetof(ngx_stream_ssl_srv_conf_t, certificate_keys),
       NULL },
 
     { ngx_string("ssl_password_file"),
@@ -118,63 +118,63 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, dhparam),
+      offsetof(ngx_stream_ssl_srv_conf_t, dhparam),
       NULL },
 
     { ngx_string("ssl_ecdh_curve"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, ecdh_curve),
+      offsetof(ngx_stream_ssl_srv_conf_t, ecdh_curve),
       NULL },
 
     { ngx_string("ssl_protocols"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE,
       ngx_conf_set_bitmask_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, protocols),
+      offsetof(ngx_stream_ssl_srv_conf_t, protocols),
       &ngx_stream_ssl_protocols },
 
     { ngx_string("ssl_ciphers"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, ciphers),
+      offsetof(ngx_stream_ssl_srv_conf_t, ciphers),
       NULL },
 
     { ngx_string("ssl_verify_client"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_enum_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, verify),
+      offsetof(ngx_stream_ssl_srv_conf_t, verify),
       &ngx_stream_ssl_verify },
 
     { ngx_string("ssl_verify_depth"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, verify_depth),
+      offsetof(ngx_stream_ssl_srv_conf_t, verify_depth),
       NULL },
 
     { ngx_string("ssl_client_certificate"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, client_certificate),
+      offsetof(ngx_stream_ssl_srv_conf_t, client_certificate),
       NULL },
 
     { ngx_string("ssl_trusted_certificate"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, trusted_certificate),
+      offsetof(ngx_stream_ssl_srv_conf_t, trusted_certificate),
       NULL },
 
     { ngx_string("ssl_prefer_server_ciphers"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, prefer_server_ciphers),
+      offsetof(ngx_stream_ssl_srv_conf_t, prefer_server_ciphers),
       NULL },
 
     { ngx_string("ssl_session_cache"),
@@ -188,37 +188,44 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, session_tickets),
+      offsetof(ngx_stream_ssl_srv_conf_t, session_tickets),
       NULL },
 
     { ngx_string("ssl_session_ticket_key"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_array_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, session_ticket_keys),
+      offsetof(ngx_stream_ssl_srv_conf_t, session_ticket_keys),
       NULL },
 
     { ngx_string("ssl_session_timeout"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_sec_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, session_timeout),
+      offsetof(ngx_stream_ssl_srv_conf_t, session_timeout),
       NULL },
 
     { ngx_string("ssl_crl"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, crl),
+      offsetof(ngx_stream_ssl_srv_conf_t, crl),
       NULL },
 
     { ngx_string("ssl_conf_command"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE2,
       ngx_conf_set_keyval_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
-      offsetof(ngx_stream_ssl_conf_t, conf_commands),
+      offsetof(ngx_stream_ssl_srv_conf_t, conf_commands),
       &ngx_stream_ssl_conf_command_post },
 
+    { ngx_string("ssl_reject_handshake"),
+      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_STREAM_SRV_CONF_OFFSET,
+      offsetof(ngx_stream_ssl_srv_conf_t, reject_handshake),
+      NULL },
+
     { ngx_string("ssl_alpn"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE,
       ngx_stream_ssl_alpn,
@@ -237,8 +244,8 @@ static ngx_stream_module_t  ngx_stream_ssl_module_ctx = {
     NULL,                                  /* create main configuration */
     NULL,                                  /* init main configuration */
 
-    ngx_stream_ssl_create_conf,            /* create server configuration */
-    ngx_stream_ssl_merge_conf              /* merge server configuration */
+    ngx_stream_ssl_create_srv_conf,        /* create server configuration */
+    ngx_stream_ssl_merge_srv_conf          /* merge server configuration */
 };
 
 
@@ -332,11 +339,11 @@ static ngx_str_t ngx_stream_ssl_sess_id_ctx = ngx_string("STREAM");
 static ngx_int_t
 ngx_stream_ssl_handler(ngx_stream_session_t *s)
 {
-    long                    rc;
-    X509                   *cert;
-    ngx_int_t               rv;
-    ngx_connection_t       *c;
-    ngx_stream_ssl_conf_t  *sslcf;
+    long                        rc;
+    X509                       *cert;
+    ngx_int_t                   rv;
+    ngx_connection_t           *c;
+    ngx_stream_ssl_srv_conf_t  *sscf;
 
     if (!s->ssl) {
         return NGX_OK;
@@ -344,23 +351,23 @@ ngx_stream_ssl_handler(ngx_stream_session_t *s)
 
     c = s->connection;
 
-    sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
+    sscf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
 
     if (c->ssl == NULL) {
         c->log->action = "SSL handshaking";
 
-        rv = ngx_stream_ssl_init_connection(&sslcf->ssl, c);
+        rv = ngx_stream_ssl_init_connection(&sscf->ssl, c);
 
         if (rv != NGX_OK) {
             return rv;
         }
     }
 
-    if (sslcf->verify) {
+    if (sscf->verify) {
         rc = SSL_get_verify_result(c->ssl->connection);
 
         if (rc != X509_V_OK
-            && (sslcf->verify != 3 || !ngx_ssl_verify_error_optional(rc)))
+            && (sscf->verify != 3 || !ngx_ssl_verify_error_optional(rc)))
         {
             ngx_log_error(NGX_LOG_INFO, c->log, 0,
                           "client SSL certificate verify error: (%l:%s)",
@@ -371,7 +378,7 @@ ngx_stream_ssl_handler(ngx_stream_session_t *s)
             return NGX_ERROR;
         }
 
-        if (sslcf->verify == 1) {
+        if (sscf->verify == 1) {
             cert = SSL_get_peer_certificate(c->ssl->connection);
 
             if (cert == NULL) {
@@ -396,7 +403,7 @@ ngx_stream_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c)
 {
     ngx_int_t                    rc;
     ngx_stream_session_t        *s;
-    ngx_stream_ssl_conf_t       *sslcf;
+    ngx_stream_ssl_srv_conf_t   *sscf;
     ngx_stream_core_srv_conf_t  *cscf;
 
     s = c->data;
@@ -418,9 +425,9 @@ ngx_stream_ssl_init_connection(ngx_ssl_t *ssl, ngx_connection_t *c)
     }
 
     if (rc == NGX_AGAIN) {
-        sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
+        sscf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
 
-        ngx_add_timer(c->read, sslcf->handshake_timeout);
+        ngx_add_timer(c->read, sscf->handshake_timeout);
 
         c->ssl->handler = ngx_stream_ssl_handshake_handler;
 
@@ -458,7 +465,112 @@ ngx_stream_ssl_handshake_handler(ngx_connection_t *c)
 static int
 ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 {
+    ngx_int_t                    rc;
+    ngx_str_t                    host;
+    const char                  *servername;
+    ngx_connection_t            *c;
+    ngx_stream_session_t        *s;
+    ngx_stream_ssl_srv_conf_t   *sscf;
+    ngx_stream_core_srv_conf_t  *cscf;
+
+    c = ngx_ssl_get_connection(ssl_conn);
+
+    if (c->ssl->handshaked) {
+        *ad = SSL_AD_NO_RENEGOTIATION;
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
+    s = c->data;
+
+    servername = SSL_get_servername(ssl_conn, TLSEXT_NAMETYPE_host_name);
+
+    if (servername == NULL) {
+        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                       "SSL server name: null");
+        goto done;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "SSL server name: \"%s\"", servername);
+
+    host.len = ngx_strlen(servername);
+
+    if (host.len == 0) {
+        goto done;
+    }
+
+    host.data = (u_char *) servername;
+
+    rc = ngx_stream_validate_host(&host, c->pool, 1);
+
+    if (rc == NGX_ERROR) {
+        goto error;
+    }
+
+    if (rc == NGX_DECLINED) {
+        goto done;
+    }
+
+    rc = ngx_stream_find_virtual_server(s, &host, &cscf);
+
+    if (rc == NGX_ERROR) {
+        goto error;
+    }
+
+    if (rc == NGX_DECLINED) {
+        goto done;
+    }
+
+    s->srv_conf = cscf->ctx->srv_conf;
+
+    ngx_set_connection_log(c, cscf->error_log);
+
+    sscf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
+
+    if (sscf->ssl.ctx) {
+        if (SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx) == NULL) {
+            goto error;
+        }
+
+        /*
+         * SSL_set_SSL_CTX() only changes certs as of 1.0.0d
+         * adjust other things we care about
+         */
+
+        SSL_set_verify(ssl_conn, SSL_CTX_get_verify_mode(sscf->ssl.ctx),
+                       SSL_CTX_get_verify_callback(sscf->ssl.ctx));
+
+        SSL_set_verify_depth(ssl_conn, SSL_CTX_get_verify_depth(sscf->ssl.ctx));
+
+#if OPENSSL_VERSION_NUMBER >= 0x009080dfL
+        /* only in 0.9.8m+ */
+        SSL_clear_options(ssl_conn, SSL_get_options(ssl_conn) &
+                                    ~SSL_CTX_get_options(sscf->ssl.ctx));
+#endif
+
+        SSL_set_options(ssl_conn, SSL_CTX_get_options(sscf->ssl.ctx));
+
+#ifdef SSL_OP_NO_RENEGOTIATION
+        SSL_set_options(ssl_conn, SSL_OP_NO_RENEGOTIATION);
+#endif
+    }
+
+done:
+
+    sscf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
+
+    if (sscf->reject_handshake) {
+        c->ssl->handshake_rejected = 1;
+        *ad = SSL_AD_UNRECOGNIZED_NAME;
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
     return SSL_TLSEXT_ERR_OK;
+
+error:
+
+    *ad = SSL_AD_INTERNAL_ERROR;
+    return SSL_TLSEXT_ERR_ALERT_FATAL;
 }
 
 #endif
@@ -513,7 +625,7 @@ ngx_stream_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg)
     ngx_uint_t                   i, nelts;
     ngx_connection_t            *c;
     ngx_stream_session_t        *s;
-    ngx_stream_ssl_conf_t       *sslcf;
+    ngx_stream_ssl_srv_conf_t   *sscf;
     ngx_stream_complex_value_t  *certs, *keys;
 
     c = ngx_ssl_get_connection(ssl_conn);
@@ -524,11 +636,11 @@ ngx_stream_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg)
 
     s = c->data;
 
-    sslcf = arg;
+    sscf = arg;
 
-    nelts = sslcf->certificate_values->nelts;
-    certs = sslcf->certificate_values->elts;
-    keys = sslcf->certificate_key_values->elts;
+    nelts = sscf->certificate_values->nelts;
+    certs = sscf->certificate_values->elts;
+    keys = sscf->certificate_key_values->elts;
 
     for (i = 0; i < nelts; i++) {
 
@@ -547,7 +659,7 @@ ngx_stream_ssl_certificate(ngx_ssl_conn_t *ssl_conn, void *arg)
                        "ssl key: \"%s\"", key.data);
 
         if (ngx_ssl_connection_certificate(c, c->pool, &cert, &key,
-                                           sslcf->passwords)
+                                           sscf->passwords)
             != NGX_OK)
         {
             return 0;
@@ -643,53 +755,53 @@ ngx_stream_ssl_add_variables(ngx_conf_t *cf)
 
 
 static void *
-ngx_stream_ssl_create_conf(ngx_conf_t *cf)
+ngx_stream_ssl_create_srv_conf(ngx_conf_t *cf)
 {
-    ngx_stream_ssl_conf_t  *scf;
+    ngx_stream_ssl_srv_conf_t  *sscf;
 
-    scf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_ssl_conf_t));
-    if (scf == NULL) {
+    sscf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_ssl_srv_conf_t));
+    if (sscf == NULL) {
         return NULL;
     }
 
     /*
      * set by ngx_pcalloc():
      *
-     *     scf->listen = 0;
-     *     scf->protocols = 0;
-     *     scf->certificate_values = NULL;
-     *     scf->dhparam = { 0, NULL };
-     *     scf->ecdh_curve = { 0, NULL };
-     *     scf->client_certificate = { 0, NULL };
-     *     scf->trusted_certificate = { 0, NULL };
-     *     scf->crl = { 0, NULL };
-     *     scf->alpn = { 0, NULL };
-     *     scf->ciphers = { 0, NULL };
-     *     scf->shm_zone = NULL;
+     *     sscf->protocols = 0;
+     *     sscf->certificate_values = NULL;
+     *     sscf->dhparam = { 0, NULL };
+     *     sscf->ecdh_curve = { 0, NULL };
+     *     sscf->client_certificate = { 0, NULL };
+     *     sscf->trusted_certificate = { 0, NULL };
+     *     sscf->crl = { 0, NULL };
+     *     sscf->alpn = { 0, NULL };
+     *     sscf->ciphers = { 0, NULL };
+     *     sscf->shm_zone = NULL;
      */
 
-    scf->handshake_timeout = NGX_CONF_UNSET_MSEC;
-    scf->certificates = NGX_CONF_UNSET_PTR;
-    scf->certificate_keys = NGX_CONF_UNSET_PTR;
-    scf->passwords = NGX_CONF_UNSET_PTR;
-    scf->conf_commands = NGX_CONF_UNSET_PTR;
-    scf->prefer_server_ciphers = NGX_CONF_UNSET;
-    scf->verify = NGX_CONF_UNSET_UINT;
-    scf->verify_depth = NGX_CONF_UNSET_UINT;
-    scf->builtin_session_cache = NGX_CONF_UNSET;
-    scf->session_timeout = NGX_CONF_UNSET;
-    scf->session_tickets = NGX_CONF_UNSET;
-    scf->session_ticket_keys = NGX_CONF_UNSET_PTR;
+    sscf->handshake_timeout = NGX_CONF_UNSET_MSEC;
+    sscf->certificates = NGX_CONF_UNSET_PTR;
+    sscf->certificate_keys = NGX_CONF_UNSET_PTR;
+    sscf->passwords = NGX_CONF_UNSET_PTR;
+    sscf->conf_commands = NGX_CONF_UNSET_PTR;
+    sscf->prefer_server_ciphers = NGX_CONF_UNSET;
+    sscf->reject_handshake = NGX_CONF_UNSET;
+    sscf->verify = NGX_CONF_UNSET_UINT;
+    sscf->verify_depth = NGX_CONF_UNSET_UINT;
+    sscf->builtin_session_cache = NGX_CONF_UNSET;
+    sscf->session_timeout = NGX_CONF_UNSET;
+    sscf->session_tickets = NGX_CONF_UNSET;
+    sscf->session_ticket_keys = NGX_CONF_UNSET_PTR;
 
-    return scf;
+    return sscf;
 }
 
 
 static char *
-ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
+ngx_stream_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 {
-    ngx_stream_ssl_conf_t *prev = parent;
-    ngx_stream_ssl_conf_t *conf = child;
+    ngx_stream_ssl_srv_conf_t *prev = parent;
+    ngx_stream_ssl_srv_conf_t *conf = child;
 
     ngx_pool_cleanup_t  *cln;
 
@@ -702,6 +814,8 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->prefer_server_ciphers,
                          prev->prefer_server_ciphers, 0);
 
+    ngx_conf_merge_value(conf->reject_handshake, prev->reject_handshake, 0);
+
     ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
                          (NGX_CONF_BITMASK_SET
                           |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
@@ -735,37 +849,23 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     conf->ssl.log = cf->log;
 
-    if (!conf->listen) {
+    if (conf->certificates) {
+
+        if (conf->certificate_keys == NULL
+            || conf->certificate_keys->nelts < conf->certificates->nelts)
+        {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "no \"ssl_certificate_key\" is defined "
+                          "for certificate \"%V\"",
+                          ((ngx_str_t *) conf->certificates->elts)
+                          + conf->certificates->nelts - 1);
+            return NGX_CONF_ERROR;
+        }
+
+    } else if (!conf->reject_handshake) {
         return NGX_CONF_OK;
     }
 
-    if (conf->certificates == NULL) {
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "no \"ssl_certificate\" is defined for "
-                      "the \"listen ... ssl\" directive in %s:%ui",
-                      conf->file, conf->line);
-        return NGX_CONF_ERROR;
-    }
-
-    if (conf->certificate_keys == NULL) {
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "no \"ssl_certificate_key\" is defined for "
-                      "the \"listen ... ssl\" directive in %s:%ui",
-                      conf->file, conf->line);
-        return NGX_CONF_ERROR;
-    }
-
-    if (conf->certificate_keys->nelts < conf->certificates->nelts) {
-        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                      "no \"ssl_certificate_key\" is defined "
-                      "for certificate \"%V\" and "
-                      "the \"listen ... ssl\" directive in %s:%ui",
-                      ((ngx_str_t *) conf->certificates->elts)
-                      + conf->certificates->nelts - 1,
-                      conf->file, conf->line);
-        return NGX_CONF_ERROR;
-    }
-
     if (ngx_ssl_create(&conf->ssl, conf->protocols, NULL) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
@@ -818,7 +918,7 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
 #endif
 
-    } else {
+    } else if (conf->certificates) {
 
         /* configure certificates */
 
@@ -910,13 +1010,17 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
 static ngx_int_t
 ngx_stream_ssl_compile_certificates(ngx_conf_t *cf,
-    ngx_stream_ssl_conf_t *conf)
+    ngx_stream_ssl_srv_conf_t *conf)
 {
     ngx_str_t                           *cert, *key;
     ngx_uint_t                           i, nelts;
     ngx_stream_complex_value_t          *cv;
     ngx_stream_compile_complex_value_t   ccv;
 
+    if (conf->certificates == NULL) {
+        return NGX_OK;
+    }
+
     cert = conf->certificates->elts;
     key = conf->certificate_keys->elts;
     nelts = conf->certificates->nelts;
@@ -995,19 +1099,19 @@ found:
 static char *
 ngx_stream_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    ngx_stream_ssl_conf_t  *scf = conf;
+    ngx_stream_ssl_srv_conf_t  *sscf = conf;
 
     ngx_str_t  *value;
 
-    if (scf->passwords != NGX_CONF_UNSET_PTR) {
+    if (sscf->passwords != NGX_CONF_UNSET_PTR) {
         return "is duplicate";
     }
 
     value = cf->args->elts;
 
-    scf->passwords = ngx_ssl_read_password_file(cf, &value[1]);
+    sscf->passwords = ngx_ssl_read_password_file(cf, &value[1]);
 
-    if (scf->passwords == NULL) {
+    if (sscf->passwords == NULL) {
         return NGX_CONF_ERROR;
     }
 
@@ -1018,7 +1122,7 @@ ngx_stream_ssl_password_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 static char *
 ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    ngx_stream_ssl_conf_t  *scf = conf;
+    ngx_stream_ssl_srv_conf_t  *sscf = conf;
 
     size_t       len;
     ngx_str_t   *value, name, size;
@@ -1030,17 +1134,17 @@ ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     for (i = 1; i < cf->args->nelts; i++) {
 
         if (ngx_strcmp(value[i].data, "off") == 0) {
-            scf->builtin_session_cache = NGX_SSL_NO_SCACHE;
+            sscf->builtin_session_cache = NGX_SSL_NO_SCACHE;
             continue;
         }
 
         if (ngx_strcmp(value[i].data, "none") == 0) {
-            scf->builtin_session_cache = NGX_SSL_NONE_SCACHE;
+            sscf->builtin_session_cache = NGX_SSL_NONE_SCACHE;
             continue;
         }
 
         if (ngx_strcmp(value[i].data, "builtin") == 0) {
-            scf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE;
+            sscf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE;
             continue;
         }
 
@@ -1055,7 +1159,7 @@ ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 goto invalid;
             }
 
-            scf->builtin_session_cache = n;
+            sscf->builtin_session_cache = n;
 
             continue;
         }
@@ -1098,13 +1202,13 @@ ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 return NGX_CONF_ERROR;
             }
 
-            scf->shm_zone = ngx_shared_memory_add(cf, &name, n,
+            sscf->shm_zone = ngx_shared_memory_add(cf, &name, n,
                                                    &ngx_stream_ssl_module);
-            if (scf->shm_zone == NULL) {
+            if (sscf->shm_zone == NULL) {
                 return NGX_CONF_ERROR;
             }
 
-            scf->shm_zone->init = ngx_ssl_session_cache_init;
+            sscf->shm_zone->init = ngx_ssl_session_cache_init;
 
             continue;
         }
@@ -1112,8 +1216,8 @@ ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         goto invalid;
     }
 
-    if (scf->shm_zone && scf->builtin_session_cache == NGX_CONF_UNSET) {
-        scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
+    if (sscf->shm_zone && sscf->builtin_session_cache == NGX_CONF_UNSET) {
+        sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
     }
 
     return NGX_CONF_OK;
@@ -1132,14 +1236,14 @@ ngx_stream_ssl_alpn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
 #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
 
-    ngx_stream_ssl_conf_t  *scf = conf;
+    ngx_stream_ssl_srv_conf_t  *sscf = conf;
 
     u_char      *p;
     size_t       len;
     ngx_str_t   *value;
     ngx_uint_t   i;
 
-    if (scf->alpn.len) {
+    if (sscf->alpn.len) {
         return "is duplicate";
     }
 
@@ -1156,19 +1260,19 @@ ngx_stream_ssl_alpn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         len += value[i].len + 1;
     }
 
-    scf->alpn.data = ngx_pnalloc(cf->pool, len);
-    if (scf->alpn.data == NULL) {
+    sscf->alpn.data = ngx_pnalloc(cf->pool, len);
+    if (sscf->alpn.data == NULL) {
         return NGX_CONF_ERROR;
     }
 
-    p = scf->alpn.data;
+    p = sscf->alpn.data;
 
     for (i = 1; i < cf->args->nelts; i++) {
         *p++ = value[i].len;
         p = ngx_cpymem(p, value[i].data, value[i].len);
     }
 
-    scf->alpn.len = len;
+    sscf->alpn.len = len;
 
     return NGX_CONF_OK;
 
@@ -1195,8 +1299,13 @@ ngx_stream_ssl_conf_command_check(ngx_conf_t *cf, void *post, void *data)
 static ngx_int_t
 ngx_stream_ssl_init(ngx_conf_t *cf)
 {
-    ngx_stream_handler_pt        *h;
-    ngx_stream_core_main_conf_t  *cmcf;
+    ngx_uint_t                     a, p, s;
+    ngx_stream_handler_pt         *h;
+    ngx_stream_conf_addr_t        *addr;
+    ngx_stream_conf_port_t        *port;
+    ngx_stream_ssl_srv_conf_t     *sscf;
+    ngx_stream_core_srv_conf_t   **cscfp, *cscf;
+    ngx_stream_core_main_conf_t   *cmcf;
 
     cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
@@ -1207,5 +1316,58 @@ ngx_stream_ssl_init(ngx_conf_t *cf)
 
     *h = ngx_stream_ssl_handler;
 
+    if (cmcf->ports == NULL) {
+        return NGX_OK;
+    }
+
+    port = cmcf->ports->elts;
+    for (p = 0; p < cmcf->ports->nelts; p++) {
+
+        addr = port[p].addrs.elts;
+        for (a = 0; a < port[p].addrs.nelts; a++) {
+
+            if (!addr[a].opt.ssl) {
+                continue;
+            }
+
+            cscf = addr[a].default_server;
+            sscf = cscf->ctx->srv_conf[ngx_stream_ssl_module.ctx_index];
+
+            if (sscf->certificates) {
+                continue;
+            }
+
+            if (!sscf->reject_handshake) {
+                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                              "no \"ssl_certificate\" is defined for "
+                              "the \"listen ... ssl\" directive in %s:%ui",
+                              cscf->file_name, cscf->line);
+                return NGX_ERROR;
+            }
+
+            /*
+             * if no certificates are defined in the default server,
+             * check all non-default server blocks
+             */
+
+            cscfp = addr[a].servers.elts;
+            for (s = 0; s < addr[a].servers.nelts; s++) {
+
+                cscf = cscfp[s];
+                sscf = cscf->ctx->srv_conf[ngx_stream_ssl_module.ctx_index];
+
+                if (sscf->certificates || sscf->reject_handshake) {
+                    continue;
+                }
+
+                ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                              "no \"ssl_certificate\" is defined for "
+                              "the \"listen ... ssl\" directive in %s:%ui",
+                              cscf->file_name, cscf->line);
+                return NGX_ERROR;
+            }
+        }
+    }
+
     return NGX_OK;
 }
diff --git a/src/stream/ngx_stream_ssl_module.h b/src/stream/ngx_stream_ssl_module.h
index e7c825e..6f6d9ae 100644
--- a/src/stream/ngx_stream_ssl_module.h
+++ b/src/stream/ngx_stream_ssl_module.h
@@ -18,10 +18,10 @@ typedef struct {
     ngx_msec_t       handshake_timeout;
 
     ngx_flag_t       prefer_server_ciphers;
+    ngx_flag_t       reject_handshake;
 
     ngx_ssl_t        ssl;
 
-    ngx_uint_t       listen;
     ngx_uint_t       protocols;
 
     ngx_uint_t       verify;
@@ -53,10 +53,7 @@ typedef struct {
 
     ngx_flag_t       session_tickets;
     ngx_array_t     *session_ticket_keys;
-
-    u_char          *file;
-    ngx_uint_t       line;
-} ngx_stream_ssl_conf_t;
+} ngx_stream_ssl_srv_conf_t;
 
 
 extern ngx_module_t  ngx_stream_ssl_module;
diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c
index a236fc5..bc96ade 100644
--- a/src/stream/ngx_stream_ssl_preread_module.c
+++ b/src/stream/ngx_stream_ssl_preread_module.c
@@ -33,6 +33,8 @@ typedef struct {
 static ngx_int_t ngx_stream_ssl_preread_handler(ngx_stream_session_t *s);
 static ngx_int_t ngx_stream_ssl_preread_parse_record(
     ngx_stream_ssl_preread_ctx_t *ctx, u_char *pos, u_char *last);
+static ngx_int_t ngx_stream_ssl_preread_servername(ngx_stream_session_t *s,
+    ngx_str_t *servername);
 static ngx_int_t ngx_stream_ssl_preread_protocol_variable(
     ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_ssl_preread_server_name_variable(
@@ -187,6 +189,10 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
             return NGX_DECLINED;
         }
 
+        if (rc == NGX_OK) {
+            return ngx_stream_ssl_preread_servername(s, &ctx->host);
+        }
+
         if (rc != NGX_AGAIN) {
             return rc;
         }
@@ -404,9 +410,6 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
         case sw_sni_host:
             ctx->host.len = (p[1] << 8) + p[2];
 
-            ngx_log_debug1(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
-                           "ssl preread: SNI hostname \"%V\"", &ctx->host);
-
             state = sw_ext;
             dst = NULL;
             size = ext;
@@ -496,6 +499,54 @@ ngx_stream_ssl_preread_parse_record(ngx_stream_ssl_preread_ctx_t *ctx,
 }
 
 
+static ngx_int_t
+ngx_stream_ssl_preread_servername(ngx_stream_session_t *s,
+    ngx_str_t *servername)
+{
+    ngx_int_t                    rc;
+    ngx_str_t                    host;
+    ngx_connection_t            *c;
+    ngx_stream_core_srv_conf_t  *cscf;
+
+    c = s->connection;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,
+                   "SSL preread server name: \"%V\"", servername);
+
+    if (servername->len == 0) {
+        return NGX_OK;
+    }
+
+    host = *servername;
+
+    rc = ngx_stream_validate_host(&host, c->pool, 1);
+
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_DECLINED) {
+        return NGX_OK;
+    }
+
+    rc = ngx_stream_find_virtual_server(s, &host, &cscf);
+
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_DECLINED) {
+        return NGX_OK;
+    }
+
+    s->srv_conf = cscf->ctx->srv_conf;
+
+    ngx_set_connection_log(c, cscf->error_log);
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_ssl_preread_protocol_variable(ngx_stream_session_t *s,
     ngx_variable_value_t *v, uintptr_t data)
diff --git a/src/stream/ngx_stream_variables.c b/src/stream/ngx_stream_variables.c
index 8126890..4658104 100644
--- a/src/stream/ngx_stream_variables.c
+++ b/src/stream/ngx_stream_variables.c
@@ -29,6 +29,8 @@ static ngx_int_t ngx_stream_variable_server_addr(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_server_port(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_variable_server_name(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_bytes(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_stream_variable_session_time(ngx_stream_session_t *s,
@@ -91,6 +93,9 @@ static ngx_stream_variable_t  ngx_stream_core_variables[] = {
     { ngx_string("server_port"), NULL,
       ngx_stream_variable_server_port, 0, 0, 0 },
 
+    { ngx_string("server_name"), NULL, ngx_stream_variable_server_name,
+      0, 0, 0 },
+
     { ngx_string("bytes_sent"), NULL, ngx_stream_variable_bytes,
       0, 0, 0 },
 
@@ -721,6 +726,24 @@ ngx_stream_variable_server_port(ngx_stream_session_t *s,
 }
 
 
+static ngx_int_t
+ngx_stream_variable_server_name(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data)
+{
+    ngx_stream_core_srv_conf_t  *cscf;
+
+    cscf = ngx_stream_get_module_srv_conf(s, ngx_stream_core_module);
+
+    v->len = cscf->server_name.len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+    v->data = cscf->server_name.data;
+
+    return NGX_OK;
+}
+
+
 static ngx_int_t
 ngx_stream_variable_bytes(ngx_stream_session_t *s,
     ngx_stream_variable_value_t *v, uintptr_t data)

From dd2f4866aa905e5e4ad8f9e1fb758c4e8fa76701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 17:42:53 +0200
Subject: [PATCH 544/600] d/changelog new version 1.26.0-1

---
 debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 15fb8e3..cb98ace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-nginx (1.24.0-3) UNRELEASED; urgency=medium
+nginx (1.26.0-1) UNRELEASED; urgency=medium
 
+  * New upstream version 1.26.0
   * d/u/signing-key.asc add Roman Arutyunyan’s PGP public key,
     the key is used to sign the 1.26.0 release
 

From 443e5c11eb9e9812386eb130d5cbdfb8400b3700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 17:44:10 +0200
Subject: [PATCH 545/600] nginx ABI release: nginx-abi-1.26.0-1

---
 debian/changelog                 | 1 +
 debian/libnginx-mod.abisubstvars | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cb98ace..8a4f9be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nginx (1.26.0-1) UNRELEASED; urgency=medium
 
   * New upstream version 1.26.0
+  * nginx ABI release: nginx-abi-1.26.0-1
   * d/u/signing-key.asc add Roman Arutyunyan’s PGP public key,
     the key is used to sign the 1.26.0 release
 
diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index 556875b..6455c05 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -5,7 +5,7 @@
 # note that debian revision can increase without breaking ABI
 #
 # TODO: use $(DEB_VERSION_UPSTREAM)
-nginx:abi=nginx-abi-1.24.0-1
+nginx:abi=nginx-abi-1.26.0-1
 
 # ABI-compatible versions of third-party modules
 libnginx-mod-http-auth-pam:Version=1:1.5.3-4

From 0f09f394ed0ec41086e68a016b18d75e69ff21ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 17:52:34 +0200
Subject: [PATCH 546/600] d/p/CVE-2023-44487.patch remove, fixed in upstream

---
 debian/changelog                    |  1 +
 debian/patches/CVE-2023-44487.patch | 75 -----------------------------
 debian/patches/series               |  1 -
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 debian/patches/CVE-2023-44487.patch

diff --git a/debian/changelog b/debian/changelog
index 8a4f9be..fa0c808 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
   * nginx ABI release: nginx-abi-1.26.0-1
   * d/u/signing-key.asc add Roman Arutyunyan’s PGP public key,
     the key is used to sign the 1.26.0 release
+  * d/p/CVE-2023-44487.patch remove, fixed in upstream
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200
 
diff --git a/debian/patches/CVE-2023-44487.patch b/debian/patches/CVE-2023-44487.patch
deleted file mode 100644
index 401f30b..0000000
--- a/debian/patches/CVE-2023-44487.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 6ceef192e7af1c507826ac38a2d43f08bf265fb9 Mon Sep 17 00:00:00 2001
-From: Maxim Dounin <mdounin@mdounin.ru>
-Date: Tue, 10 Oct 2023 15:13:39 +0300
-Subject: [PATCH] HTTP/2: per-iteration stream handling limit.
-Origin: https://github.com/nginx/nginx/commit/6ceef192e7af1c507826ac38a2d43f08bf265fb9
-Forwarded: not-needed
-
-To ensure that attempts to flood servers with many streams are detected
-early, a limit of no more than 2 * max_concurrent_streams new streams per one
-event loop iteration was introduced.  This limit is applied even if
-max_concurrent_streams is not yet reached - for example, if corresponding
-streams are handled synchronously or reset.
-
-Further, refused streams are now limited to maximum of max_concurrent_streams
-and 100, similarly to priority_limit initial value, providing some tolerance
-to clients trying to open several streams at the connection start, yet
-low tolerance to flooding attempts.
----
- src/http/v2/ngx_http_v2.c | 15 +++++++++++++++
- src/http/v2/ngx_http_v2.h |  2 ++
- 2 files changed, 17 insertions(+)
-
-Index: nginx/src/http/v2/ngx_http_v2.c
-===================================================================
---- nginx.orig/src/http/v2/ngx_http_v2.c
-+++ nginx/src/http/v2/ngx_http_v2.c
-@@ -361,6 +361,7 @@ ngx_http_v2_read_handler(ngx_event_t *re
-     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");
- 
-     h2c->blocked = 1;
-+    h2c->new_streams = 0;
- 
-     if (c->close) {
-         c->close = 0;
-@@ -1321,6 +1322,14 @@ ngx_http_v2_state_headers(ngx_http_v2_co
-         goto rst_stream;
-     }
- 
-+    if (h2c->new_streams++ >= 2 * h2scf->concurrent_streams) {
-+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-+                      "client sent too many streams at once");
-+
-+        status = NGX_HTTP_V2_REFUSED_STREAM;
-+        goto rst_stream;
-+    }
-+
-     if (!h2c->settings_ack
-         && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
-         && h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
-@@ -1386,6 +1395,12 @@ ngx_http_v2_state_headers(ngx_http_v2_co
- 
- rst_stream:
- 
-+    if (h2c->refused_streams++ > ngx_max(h2scf->concurrent_streams, 100)) {
-+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
-+                      "client sent too many refused streams");
-+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_NO_ERROR);
-+    }
-+
-     if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
-         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
-     }
-Index: nginx/src/http/v2/ngx_http_v2.h
-===================================================================
---- nginx.orig/src/http/v2/ngx_http_v2.h
-+++ nginx/src/http/v2/ngx_http_v2.h
-@@ -124,6 +124,8 @@ struct ngx_http_v2_connection_s {
-     ngx_uint_t                       processing;
-     ngx_uint_t                       frames;
-     ngx_uint_t                       idle;
-+    ngx_uint_t                       new_streams;
-+    ngx_uint_t                       refused_streams;
-     ngx_uint_t                       priority_limit;
- 
-     ngx_uint_t                       pushing;
diff --git a/debian/patches/series b/debian/patches/series
index 48dd724..52e1dc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 nginx-fix-pidfile.patch
 nginx-ssl_cert_cb_yield.patch
-CVE-2023-44487.patch

From 4c1fc35cb6024effa4f8e52710beb7aa22d7cc4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 18:35:43 +0200
Subject: [PATCH 547/600] d/changelog update

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index fa0c808..49ccacb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
   * d/u/signing-key.asc add Roman Arutyunyan’s PGP public key,
     the key is used to sign the 1.26.0 release
   * d/p/CVE-2023-44487.patch remove, fixed in upstream
+  * d/ufw/nginx update, add QUICK, thanks Marcus Bointon
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200
 

From a6a3352563ec92929361a3746a62cd497be25dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 18:42:05 +0200
Subject: [PATCH 548/600] d/changelog update

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 49ccacb..bc20cac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
     the key is used to sign the 1.26.0 release
   * d/p/CVE-2023-44487.patch remove, fixed in upstream
   * d/ufw/nginx update, add QUICK, thanks Marcus Bointon
+  * d/conf/mime.types add application/xslt+xml, thanks K. Widholm
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200
 

From 3fb6af3d349a44c2584724404441e67346cec198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 19:03:47 +0200
Subject: [PATCH 549/600] d/copyright: updated copyright related to new
 upstream version

---
 debian/changelog |  1 +
 debian/copyright | 47 +++++++++++++++++++++++++++++++++++++----------
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc20cac..0421fb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
   * d/p/CVE-2023-44487.patch remove, fixed in upstream
   * d/ufw/nginx update, add QUICK, thanks Marcus Bointon
   * d/conf/mime.types add application/xslt+xml, thanks K. Widholm
+  * d/copyright: updated copyright related to new upstream version
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 7fc2b36..f1c00c1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,9 +7,9 @@ Copyright: Valentin V. Bartenev
  Ruslan Ermilov
  Roman Arutyunyan
  Maxim Dounin
- 2011-2022, Nginx, Inc.
+ 2011-2024, Nginx, Inc.
  2002-2021, Igor Sysoev
- 2011-2022, Nginx, Inc.
+ 2011-2024, Nginx, Inc.
  2002-2021, Igor Sysoev
 License: BSD-2-clause
 
@@ -19,7 +19,7 @@ Copyright: Valentin V. Bartenev
  Ruslan Ermilov
  Roman Arutyunyan
  Maxim Dounin
- 2011-2022, Nginx, Inc.
+ 2011-2024, Nginx, Inc.
  2002-2021, Igor Sysoev
 License: BSD-2-clause
 
@@ -46,7 +46,7 @@ Copyright: Valentin V. Bartenev
  Ruslan Ermilov
  Roman Arutyunyan
  Maxim Dounin
- 2011-2022, Nginx, Inc.
+ 2011-2024, Nginx, Inc.
  2002-2021, Igor Sysoev
 License: BSD-2-clause
 
@@ -60,7 +60,7 @@ Copyright: Valentin V. Bartenev
  Ruslan Ermilov
  Roman Arutyunyan
  Maxim Dounin
- 2011-2022, Nginx, Inc.
+ 2011-2024, Nginx, Inc.
  2002-2021, Igor Sysoev
 License: BSD-2-clause
 
@@ -111,6 +111,13 @@ Copyright: Nginx, Inc.
  Igor Sysoev
 License: BSD-2-clause
 
+Files: src/core/ngx_bpf.c
+  src/core/ngx_bpf.h
+  src/core/ngx_syslog.c
+  src/core/ngx_syslog.h
+Copyright: Nginx, Inc.
+License: BSD-2-clause
+
 Files: src/core/ngx_crypt.c
 Copyright: Maxim Dounin
 License: BSD-2-clause
@@ -154,11 +161,6 @@ Copyright: Nginx, Inc.
  Maxim Dounin
 License: BSD-2-clause
 
-Files: src/core/ngx_syslog.c
-  src/core/ngx_syslog.h
-Copyright: Nginx, Inc.
-License: BSD-2-clause
-
 Files: src/core/ngx_thread_pool.c
 Copyright: Valentin V. Bartenev
  Ruslan Ermilov
@@ -190,6 +192,25 @@ Files: src/event/ngx_event_udp.h
 Copyright: Nginx, Inc.
 License: BSD-2-clause
 
+Files: src/event/quic/*
+Copyright: Nginx, Inc.
+License: BSD-2-clause
+
+Files: src/event/quic/bpf/*
+Copyright: Nginx, Inc.
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: src/event/quic/ngx_event_quic_bpf_code.c
+Copyright: Nginx, Inc.
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: src/event/quic/ngx_event_quic_udp.c
+Copyright: Roman Arutyunyan
+ Nginx, Inc.
+License: BSD-2-clause
+
 Files: src/http/modules/ngx_http_auth_request_module.c
   src/http/modules/ngx_http_grpc_module.c
   src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -264,6 +285,11 @@ Copyright: Valentin V. Bartenev
  Nginx, Inc.
 License: BSD-2-clause
 
+Files: src/http/v3/*
+Copyright: Roman Arutyunyan
+ Nginx, Inc.
+License: BSD-2-clause
+
 Files: src/misc/*
 Copyright: Valentin V. Bartenev
  Ruslan Ermilov
@@ -299,6 +325,7 @@ Files: src/stream/ngx_stream.c
   src/stream/ngx_stream.h
   src/stream/ngx_stream_core_module.c
   src/stream/ngx_stream_handler.c
+  src/stream/ngx_stream_pass_module.c
   src/stream/ngx_stream_proxy_module.c
   src/stream/ngx_stream_return_module.c
   src/stream/ngx_stream_upstream_hash_module.c

From 7dc4f2ecb77a85279937bff4798ecc7268ca05e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 19:04:28 +0200
Subject: [PATCH 550/600] d/copyright: bump my copyright year

---
 debian/changelog | 1 +
 debian/copyright | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0421fb2..5b4943e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
   * d/ufw/nginx update, add QUICK, thanks Marcus Bointon
   * d/conf/mime.types add application/xslt+xml, thanks K. Widholm
   * d/copyright: updated copyright related to new upstream version
+  * d/copyright: bump my copyright year 
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200
 
diff --git a/debian/copyright b/debian/copyright
index f1c00c1..816d187 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -69,7 +69,7 @@ Copyright: 2005, Andrei Nigmatulin
 License: BSD-2-clause
 
 Files: debian/*
-Copyright: 2022, 2023, Jan Mojžíš <jan.mojzis@gmail.com>
+Copyright: 2022-2024, Jan Mojžíš <jan.mojzis@gmail.com>
  2020-2022, Ondřej Nový <onovy@debian.org>
  2019-2022, Thomas Ward <teward@ubuntu.com>
  2013-2016, Christos Trochalakis <ctrochalakis@debian.org>

From b023f3fbf654fcb582841f9f664bf05db0b79df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 30 Apr 2024 22:04:10 +0200
Subject: [PATCH 551/600] d/copyright update

---
 debian/copyright | 280 +----------------------------------------------
 1 file changed, 3 insertions(+), 277 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 816d187..7106e51 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,59 +3,6 @@ Upstream-Name: nginx
 Source: https://nginx.org/en/download.html
 
 Files: *
-Copyright: Valentin V. Bartenev
- Ruslan Ermilov
- Roman Arutyunyan
- Maxim Dounin
- 2011-2024, Nginx, Inc.
- 2002-2021, Igor Sysoev
- 2011-2024, Nginx, Inc.
- 2002-2021, Igor Sysoev
-License: BSD-2-clause
-
-Files: CHANGES
-  README
-Copyright: Valentin V. Bartenev
- Ruslan Ermilov
- Roman Arutyunyan
- Maxim Dounin
- 2011-2024, Nginx, Inc.
- 2002-2021, Igor Sysoev
-License: BSD-2-clause
-
-Files: auto/*
-Copyright: Nginx, Inc.
- Igor Sysoev
-License: BSD-2-clause
-
-Files: auto/cc/clang
-Copyright: Nginx, Inc.
-License: BSD-2-clause
-
-Files: auto/module
-Copyright: Ruslan Ermilov
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: auto/threads
-Copyright: Nginx, Inc.
-License: BSD-2-clause
-
-Files: conf/*
-Copyright: Valentin V. Bartenev
- Ruslan Ermilov
- Roman Arutyunyan
- Maxim Dounin
- 2011-2024, Nginx, Inc.
- 2002-2021, Igor Sysoev
-License: BSD-2-clause
-
-Files: configure
-Copyright: Nginx, Inc.
- Igor Sysoev
-License: BSD-2-clause
-
-Files: contrib/*
 Copyright: Valentin V. Bartenev
  Ruslan Ermilov
  Roman Arutyunyan
@@ -93,160 +40,27 @@ Files: debian/debhelper/dh_nginx
 Copyright: 2016, Christos Trochalakis <ctrochalakis@debian.org>
 License: GPL-2+
 
-Files: debian/debhelper/nginx_mod.pm
-Copyright: © 2022, Miao Wang
-License: BSD-2-clause
-
-Files: debian/help/examples/nginx_modsite
-Copyright: 2010, Michael Lustfield <mtecknology@ubuntu.com>
-License: BSD-2-clause
+Files: debian/ngx-conf/ngx-conf
+Copyright: 2015, Michael Lustfield <michael@lustfield.net>
+License: Expat
 
 Files: man/*
 Copyright: Nginx, Inc.
  2010, 2019, Sergey A. Osokin
 License: BSD-2-clause
 
-Files: src/*
-Copyright: Nginx, Inc.
- Igor Sysoev
-License: BSD-2-clause
-
-Files: src/core/ngx_bpf.c
-  src/core/ngx_bpf.h
-  src/core/ngx_syslog.c
-  src/core/ngx_syslog.h
-Copyright: Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/core/ngx_crypt.c
-Copyright: Maxim Dounin
-License: BSD-2-clause
-
-Files: src/core/ngx_md5.c
-Copyright: Valentin V. Bartenev
- Ruslan Ermilov
- Roman Arutyunyan
- Maxim Dounin
- 2011-2022, Nginx, Inc.
- 2002-2021, Igor Sysoev
-License: BSD-2-clause
-
-Files: src/core/ngx_module.c
-  src/core/ngx_module.h
-Copyright: Nginx, Inc.
- Maxim Dounin
- Igor Sysoev
-License: BSD-2-clause
-
 Files: src/core/ngx_murmurhash.c
 Copyright: Austin Appleby
 License: public-domain
  All MurmurHash versions are public domain software, and the author
  disclaims all copyright to their code.
 
-Files: src/core/ngx_proxy_protocol.c
-  src/core/ngx_proxy_protocol.h
-Copyright: Roman Arutyunyan
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/core/ngx_rwlock.c
-  src/core/ngx_rwlock.h
-Copyright: Ruslan Ermilov
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/core/ngx_sha1.c
-Copyright: Nginx, Inc.
- Maxim Dounin
-License: BSD-2-clause
-
-Files: src/core/ngx_thread_pool.c
-Copyright: Valentin V. Bartenev
- Ruslan Ermilov
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/core/ngx_thread_pool.h
-Copyright: Valentin V. Bartenev
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/event/modules/ngx_win32_poll_module.c
-Copyright: Nginx, Inc.
- Maxim Dounin
- Igor Sysoev
-License: BSD-2-clause
-
-Files: src/event/ngx_event_openssl_stapling.c
-Copyright: Nginx, Inc.
- Maxim Dounin
-License: BSD-2-clause
-
-Files: src/event/ngx_event_udp.c
-Copyright: Roman Arutyunyan
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/event/ngx_event_udp.h
-Copyright: Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/event/quic/*
-Copyright: Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/event/quic/bpf/*
-Copyright: Nginx, Inc.
- Igor Sysoev
-License: BSD-2-clause
-
-Files: src/event/quic/ngx_event_quic_bpf_code.c
-Copyright: Nginx, Inc.
- Igor Sysoev
-License: BSD-2-clause
-
-Files: src/event/quic/ngx_event_quic_udp.c
-Copyright: Roman Arutyunyan
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/http/modules/ngx_http_auth_request_module.c
-  src/http/modules/ngx_http_grpc_module.c
-  src/http/modules/ngx_http_upstream_keepalive_module.c
-  src/http/modules/ngx_http_upstream_least_conn_module.c
-Copyright: Nginx, Inc.
- Maxim Dounin
-License: BSD-2-clause
-
-Files: src/http/modules/ngx_http_gunzip_filter_module.c
-Copyright: Nginx, Inc.
- Maxim Dounin
- Igor Sysoev
-License: BSD-2-clause
-
-Files: src/http/modules/ngx_http_mirror_module.c
-  src/http/modules/ngx_http_slice_filter_module.c
-  src/http/modules/ngx_http_upstream_hash_module.c
-Copyright: Roman Arutyunyan
- Nginx, Inc.
-License: BSD-2-clause
-
 Files: src/http/modules/ngx_http_scgi_module.c
 Copyright: Nginx, Inc.
  Manlio Perillo (manlio.perillo@gmail.com)
  Igor Sysoev
 License: BSD-2-clause
 
-Files: src/http/modules/ngx_http_upstream_random_module.c
-Copyright: Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/http/modules/ngx_http_upstream_zone_module.c
-Copyright: Ruslan Ermilov
- Nginx, Inc.
-License: BSD-2-clause
-
 Files: src/http/modules/ngx_http_uwsgi_module.c
 Copyright: Nginx, Inc.
  Igor Sysoev
@@ -254,105 +68,17 @@ Copyright: Nginx, Inc.
  2008, Manlio Perillo (manlio.perillo@gmail.com)
 License: BSD-2-clause
 
-Files: src/http/modules/perl/typemap
-Copyright: Valentin V. Bartenev
- Ruslan Ermilov
- Roman Arutyunyan
- Maxim Dounin
- 2011-2022, Nginx, Inc.
- 2002-2021, Igor Sysoev
-License: BSD-2-clause
-
-Files: src/http/ngx_http_huff_decode.c
-Copyright: Valentin V. Bartenev
- Nginx, Inc.
-License: BSD-2-clause
-
 Files: src/http/ngx_http_huff_encode.c
 Copyright: Valentin V. Bartenev
  Nginx, Inc.
  2015, Vlad Krasnov
 License: BSD-2-clause
 
-Files: src/http/v2/*
-Copyright: Valentin V. Bartenev
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/http/v2/ngx_http_v2_filter_module.c
-Copyright: Valentin V. Bartenev
- Ruslan Ermilov
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/http/v3/*
-Copyright: Roman Arutyunyan
- Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/misc/*
-Copyright: Valentin V. Bartenev
- Ruslan Ermilov
- Roman Arutyunyan
- Maxim Dounin
- 2011-2022, Nginx, Inc.
- 2002-2021, Igor Sysoev
-License: BSD-2-clause
-
-Files: src/misc/ngx_google_perftools_module.c
-Copyright: Nginx, Inc.
- Igor Sysoev
-License: BSD-2-clause
-
-Files: src/os/unix/ngx_dlopen.c
-  src/os/unix/ngx_dlopen.h
-Copyright: Nginx, Inc.
- Maxim Dounin
-License: BSD-2-clause
-
-Files: src/os/unix/ngx_setaffinity.c
-  src/os/unix/ngx_setaffinity.h
-Copyright: Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/os/win32/ngx_dlopen.c
-  src/os/win32/ngx_dlopen.h
-Copyright: Nginx, Inc.
- Maxim Dounin
-License: BSD-2-clause
-
-Files: src/stream/ngx_stream.c
-  src/stream/ngx_stream.h
-  src/stream/ngx_stream_core_module.c
-  src/stream/ngx_stream_handler.c
-  src/stream/ngx_stream_pass_module.c
-  src/stream/ngx_stream_proxy_module.c
-  src/stream/ngx_stream_return_module.c
-  src/stream/ngx_stream_upstream_hash_module.c
-Copyright: Roman Arutyunyan
- Nginx, Inc.
-License: BSD-2-clause
-
 Files: src/stream/ngx_stream_set_module.c
 Copyright: Pavel Pautov
  Nginx, Inc.
 License: BSD-2-clause
 
-Files: src/stream/ngx_stream_ssl_preread_module.c
-  src/stream/ngx_stream_upstream_random_module.c
-Copyright: Nginx, Inc.
-License: BSD-2-clause
-
-Files: src/stream/ngx_stream_upstream_least_conn_module.c
-Copyright: Nginx, Inc.
- Maxim Dounin
-License: BSD-2-clause
-
-Files: src/stream/ngx_stream_upstream_zone_module.c
-Copyright: Ruslan Ermilov
- Nginx, Inc.
-License: BSD-2-clause
-
 License: BSD-2-clause
  All rights reserved.
  .

From 9b80dfac5a0aabcc90336aef3878166578e8fdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 1 May 2024 05:33:34 +0200
Subject: [PATCH 552/600] d/conf/nginx.conf: add worker_cpu_affinity auto

---
 debian/changelog       | 1 +
 debian/conf/nginx.conf | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5b4943e..9d745d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
   * d/conf/mime.types add application/xslt+xml, thanks K. Widholm
   * d/copyright: updated copyright related to new upstream version
   * d/copyright: bump my copyright year 
+  * d/conf/nginx.conf: add worker_cpu_affinity auto (Closes: 1063659)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200
 
diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index f52668a..d72573c 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -1,5 +1,6 @@
 user www-data;
 worker_processes auto;
+worker_cpu_affinity auto;
 pid /run/nginx.pid;
 error_log /var/log/nginx/error.log;
 include /etc/nginx/modules-enabled/*.conf;

From 5c050148b66589785a7ef6b3d0047492cce8daf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 1 May 2024 05:35:33 +0200
Subject: [PATCH 553/600] d/changelog update

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9d745d9..a5318bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 nginx (1.26.0-1) UNRELEASED; urgency=medium
 
   * New upstream version 1.26.0
-  * nginx ABI release: nginx-abi-1.26.0-1
+  * nginx ABI release: nginx-abi-1.26.0-1 (Closes: 1069997)
   * d/u/signing-key.asc add Roman Arutyunyan’s PGP public key,
     the key is used to sign the 1.26.0 release
   * d/p/CVE-2023-44487.patch remove, fixed in upstream

From 2148a071bfa0dab4643f4b15dcd1f710ee961a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 1 May 2024 06:28:55 +0200
Subject: [PATCH 554/600] d/libnginx-mod.abisubstvars: remove third-party
 modules version constraints

---
 debian/changelog                 |  1 +
 debian/control                   | 42 ++++++++++++++++----------------
 debian/libnginx-mod.abisubstvars | 15 ------------
 3 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5318bd..46baa56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
 
   * New upstream version 1.26.0
   * nginx ABI release: nginx-abi-1.26.0-1 (Closes: 1069997)
+  * d/libnginx-mod.abisubstvars: remove third-party modules version constraints
   * d/u/signing-key.asc add Roman Arutyunyan’s PGP public key,
     the key is used to sign the 1.26.0 release
   * d/p/CVE-2023-44487.patch remove, fixed in upstream
diff --git a/debian/control b/debian/control
index a1fcbe9..2f6df9f 100644
--- a/debian/control
+++ b/debian/control
@@ -123,13 +123,13 @@ Description: nginx web/proxy server (standard version)
 
 Package: nginx-full
 Architecture: all
-Depends: libnginx-mod-http-auth-pam (>= ${libnginx-mod-http-auth-pam:Version}~),
-         libnginx-mod-http-dav-ext (>= ${libnginx-mod-http-dav-ext:Version}~),
-         libnginx-mod-http-echo (>= ${libnginx-mod-http-echo:Version}~),
-         libnginx-mod-http-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
-         libnginx-mod-http-subs-filter (>= ${libnginx-mod-http-subs-filter:Version}~),
-         libnginx-mod-http-upstream-fair (>= ${libnginx-mod-http-upstream-fair:Version}~),
-         libnginx-mod-stream-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
+Depends: libnginx-mod-http-auth-pam,
+         libnginx-mod-http-dav-ext,
+         libnginx-mod-http-echo,
+         libnginx-mod-http-geoip2,
+         libnginx-mod-http-subs-filter,
+         libnginx-mod-http-upstream-fair,
+         libnginx-mod-stream-geoip2,
          nginx (>= ${source:Version}),
          nginx (<< ${source:Version}.1~),
          ${misc:Depends},
@@ -161,7 +161,7 @@ Description: nginx web/proxy server (standard version with 3rd parties)
 
 Package: nginx-light
 Architecture: all
-Depends: libnginx-mod-http-echo (>= ${libnginx-mod-http-echo:Version}~),
+Depends: libnginx-mod-http-echo,
          nginx (>= ${source:Version}),
          nginx (<< ${source:Version}.1~),
          ${misc:Depends},
@@ -193,19 +193,19 @@ Depends: nginx (= ${binary:Version}),
          libnginx-mod-mail (= ${binary:Version}),
          libnginx-mod-stream (= ${binary:Version}),
          libnginx-mod-stream-geoip (= ${binary:Version}),
-         libnginx-mod-http-auth-pam (>= ${libnginx-mod-http-auth-pam:Version}~),
-         libnginx-mod-http-cache-purge (>= ${libnginx-mod-http-cache-purge:Version}~),
-         libnginx-mod-http-dav-ext (>= ${libnginx-mod-http-dav-ext:Version}~),
-         libnginx-mod-http-echo (>= ${libnginx-mod-http-echo:Version}~),
-         libnginx-mod-http-fancyindex (>= ${libnginx-mod-http-fancyindex:Version}~),
-         libnginx-mod-http-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
-         libnginx-mod-http-headers-more-filter (>= ${libnginx-mod-http-headers-more-filter:Version}~),
-         libnginx-mod-http-lua (>=${libnginx-mod-http-lua:Version}~) [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
-         libnginx-mod-http-subs-filter (>= ${libnginx-mod-http-subs-filter:Version}~),
-         libnginx-mod-http-uploadprogress (>= ${libnginx-mod-http-uploadprogress:Version}~),
-         libnginx-mod-http-upstream-fair (>= ${libnginx-mod-http-upstream-fair:Version}~),
-         libnginx-mod-nchan (>= ${libnginx-mod-nchan:Version}~),
-         libnginx-mod-stream-geoip2 (>= ${libnginx-mod-geoip2:Version}~),
+         libnginx-mod-http-auth-pam,
+         libnginx-mod-http-cache-purge,
+         libnginx-mod-http-dav-ext,
+         libnginx-mod-http-echo,
+         libnginx-mod-http-fancyindex,
+         libnginx-mod-http-geoip2,
+         libnginx-mod-http-headers-more-filter,
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
+         libnginx-mod-http-subs-filter,
+         libnginx-mod-http-uploadprogress,
+         libnginx-mod-http-upstream-fair,
+         libnginx-mod-nchan,
+         libnginx-mod-stream-geoip2,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: nginx web/proxy server (extended version)
diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index 6455c05..2b3d99d 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -6,18 +6,3 @@
 #
 # TODO: use $(DEB_VERSION_UPSTREAM)
 nginx:abi=nginx-abi-1.26.0-1
-
-# ABI-compatible versions of third-party modules
-libnginx-mod-http-auth-pam:Version=1:1.5.3-4
-libnginx-mod-http-cache-purge:Version=1:2.3-5
-libnginx-mod-http-dav-ext:Version=1:3.0.0-4
-libnginx-mod-http-echo:Version=1:0.63-5
-libnginx-mod-http-fancyindex:Version=1:0.5.2-4
-libnginx-mod-http-geoip2:Version=1:3.4-4
-libnginx-mod-http-headers-more-filter:Version=1:0.34-4
-libnginx-mod-http-lua:Version=1:0.10.23-2
-libnginx-mod-http-subs-filter:Version=1:0.6.4-5
-libnginx-mod-http-uploadprogress:Version=1:0.9.2-4
-libnginx-mod-http-upstream-fair:Version=1:0.0~git20120408.a18b409-4
-libnginx-mod-nchan:Version=1:1.3.6+dfsg-3
-libnginx-mod-geoip2:Version=1:3.4-4

From f5ed2727e51e4a26335493db5a31555f145769e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 1 May 2024 06:46:13 +0200
Subject: [PATCH 555/600] debian/upstream/signing-key.asc remove extra
 signatures

---
 debian/upstream/signing-key.asc | 125 ++++++++++----------------------
 1 file changed, 38 insertions(+), 87 deletions(-)

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 4b7818c..0264a10 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -122,91 +122,42 @@ qftDsCTQhssP1MHJWlejeqPlND3iT2vBDeOxqd6WhKuAc+L04iyBB6p867pwrgDF
 ecg82DPehsAnO2XBAFuIE/SLewkYm0B9HK7/J4LZqPwTAksPf/dnbMAmHWoBDqsu
 4U4U4SsJKsZ87R9ao8qO7IWCzHrXavHFmnbqweFfHToeKF/L4PB+tYoW3YmUOged
 CglpJv13bNWmRwL7+x8b7BwpVwClxHBHteDX4RIN5iPH9h20J4jIpzRa1kNJsTu1
-v4ZkqLWJlkiiiQEzBBABCAAdFiEEcziXMGntP0Q/TTffpk/VsXrbOagFAmYdpjsA
-CgkQpk/VsXrbOahISgf/U7ZO0yK0PsOcAFTB0TQBCNsAhxtJAEJoVoweuYiLk8jR
-0OeDRCy0BC//qWDLFT7NKuP50SM2u0Csbg+n6b0bdy+vXbbGVzIAYzG09rPYe2Q5
-qwqyAx+MMzyICXul9lGNU2qN2qjUXMb0mCWUhxwMvzRUeS7shT1CBhGrnpoYkY56
-NhWj7iG1BbLwYVQzDZC/Rp6rvwJQgZo7+DjaMjryGAEI0ujpUp8ywrPaJpwIuXDI
-D5BhcyUaEd3XOondHQNedlgERXHT4pN+oNMPWwN3+DeQYLS3FHiqyz05ZvoeWnao
-A2/fWNA+BqIdjilp/TDDI4Ef7c9hp13weaZggYB3M4kBMwQQAQgAHRYhBFc7/Ws9
-j7xkEHmmq6v1vYJ72b9iBQJmHabkAAoJEKv1vYJ72b9iDgoIAP1QJjl4ynLAV9Bo
-Ol4AAzxZ3x/2NEgLSnjLfhb/OduDxQlL9oPulWoLDG41xiZJkepEnQWmSsIYF6Xe
-RsAB+eREU2uCxqCvBXpyIs5npXvVDV2/PQuVEop7HByx6Hjr9XK8hugihnEi1p+9
-Ecbu+89fi93m3C/5uIIil46cHByjRZ+5Yy1UFUB/wsYud1qMcYmvDaqEo5AqWNcM
-gWUFhUfgGTtBbyvIWTeX0NHnrbzHP7lhmPfWsfOjAtO8PpM8Gz5RdNRq44DdRKdG
-uWVby/kni868H+8/tHalDR0I9/Mmg2Uax0eggTVpECv/4+xBduqSB2iPwgRnSzhZ
-6SVKJvKJAjMEEAEIAB0WIQT5TVS8DF1qZBfIzz/oLBEYr5TfbgUCZh5KVgAKCRDo
-LBEYr5TfbitgD/wMamMFfFZnPS7JS1NWEMb5fbhHob1EkmedIpbpRDXUtj0ksehW
-ZAEpmVF9btqS4B+B9tSK1VS2sy4XwEGodNVSGxdtF9W8+iAHAb6Hq1Z7ifWyb991
-Kt/pVk/8adxlU4G8h1fq0idhpnI8KvkAlPJR7+PoJOEN1+VdHS6tkE5LMTf6dF9F
-iVxKQczOS1b/GmfL3kYfu6UvI07ZuaP+90mOt/TZTwkzsWjRY2vofCIPSDY94rLj
-m6PmVFoU3PHLKW7yDz1YXkVE6SgQYGZ2bqB6OHJZnDXUTSHncHTbDVzZQekIs1lP
-V6e5N8Xo/VOpv28feKAsBqQ8ML53djmGUL0azjEz1g2kgPmTuZdKzZ5kcUsULdQV
-aRKcfyYD1oRpwwlw9GJAxliJHck1IdGGaCslrHtzkh3RMULlloAYitzD9jtKsrOj
-R19s+JK/tIfFZZ5gR5qhzgOL8WgkSrIaq2o9R4sigBz1IxnXXC573RDA2F5FAeE/
-K6EmAO+BqVkImZcmP1JsLtr+OM+jihXIILACEJwhOKPtZth9zrLYkXWB1nCaDxHp
-XEUpp6UPCQNgNX8NCghnJr5gis/SmYppgFlO9R9yZ7/LtP0tUX0CmhOeqGMnHt4R
-F8n8D7EBwMWvWjlUbsDkMKX4JORgojguHJZciWQC1gVRwJ0iTH/ImtzDnbQhUm9t
-YW4gQXJ1dHl1bnlhbiA8YXJ1dEBuZ2lueC5jb20+iQJOBBMBCAA4FiEEQzh4Jd2x
-u5fsNrpdAHyNfBXYc2kFAmYXyiQCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AA
-CgkQAHyNfBXYc2kRFw//VFuCnW3EwoLCWWgWCikgI9kbVDr0/Qiyf2Gb9sfOyzBN
-q/+ZGjTs7EqTHbYUiCTgjy8t0SNKizoCXjSWLToTAXhOeTY3wDuHkdc3C2OPMPgm
-HPGmdnfplmsZjj689sy0MTnlLmU/87texR/f3REAKtchVjo5AojuZxXJi+ryBvoz
-KXi82M1JaYlIr15T+OiRtfZ3cgfTkb5CRa0YRV7QQ1zhOiF0AFKVVikFwRuquphT
-y2cSLILLzOpwG/CjMJzO4VOASmGJmdicIfYSsZSzz37RrcfeYwR6quJ55Y9QF9IU
-fg5AHWufpXaf6FbMsW1U1mOq0tMvwvdcO+u5I5SBj6IkqO4zavmW/i5zkxaq96wF
-Qn6+oRkqHnNNn0hl/B4MWdEjDJsaDXfkQ3Snn4Bfl1JPT6cH2NDVYQn1siIOim/W
-G5lhGLNB1TOAVLHblQ2xILadK0T33y6lfRUV3BOW01BDoF0ndyd7LjG5Di/cjfSo
-1hvhTkW7QJGfzVV4IAAxEyHKlmgONfggZoplqukuPsq7eNNRPhvlZq632QXIqt6Y
-xE43Nk0O41rX/tWtB7eNcPvfNOc+sGljnCSwpRWyx9xO7plELVD9KdtcyHrIgora
-Flh7KsSbppSQ/iUKRNP+lfCQsMa1yrnQyxazss8OGlB7YpUJL4trQW35f/jXFD+J
-ATMEEAEIAB0WIQRzOJcwae0/RD9NN9+mT9Wxets5qAUCZh2mQQAKCRCmT9Wxets5
-qPBjB/0SDkET7h/Vw2PJKxuYujsL+tn3SKXshgyCM2u00njJM9TqpZbZV681unKM
-l8uHtj9b0Z4U0nHoNEC37wI5FJlxy1hLBw5f2fd/yi8LsD1KP2htjMUW+I2xjcdo
-FusQsIF0s8SyW1DZ3vvN2WcZpKHwub1sY9ZFBfxRc6w+33N4dJwXVXP57kj3Ci8j
-LDLfkaKyiuYgMtFYZiKKX0tfvaM5pXxLvLOzma9vwfjIMIllooZHDSI65jrbmMv0
-rfDKOX9Ws5Xi8n85jq6Oyq28QPLZUsmymCbhvBwq4FcdiyTl9sxCY4HLq0MzmJJ5
-DMhlFd2Ds3BopFTWCB2fvYyVoXRaiQEzBBABCAAdFiEEVzv9az2PvGQQeaarq/W9
-gnvZv2IFAmYdpugACgkQq/W9gnvZv2Jk4Qf+N0P/7FIHowlO01XmBB5KaztBmVb2
-Tj+jtYgPDHRf86O0kW40Rjx++zMlIRNWK4Ue5PKAi82Yue5uvZcVlpWpx/sMvL+N
-C4Xds3Q3qnkxkoemoIMqUKGvePjBpyUWArBkBQ3FrvZtywnzyFWNrvOpeM+5HIuz
-WBri/SHBHzQm1/Jl2r5pHcbUdSxB2o1v3f+SaS2vGxwigIf8v44pRfyeWgkoxYgN
-+2zR0Ing6URZCYkAbwILsmmWGxJIuq+N9Xs1CQ1WZd5S78p/JBMDQ1prUDLCLFMc
-AvlZpQ0HvzEbKGiIVNa1LEQRF4ZWjQOHaPJhg/D3r/Q7VaFlgsOqrwtQaYkCMwQQ
-AQgAHRYhBPlNVLwMXWpkF8jPP+gsERivlN9uBQJmHkpZAAoJEOgsERivlN9u8fYQ
-AK0s0CvQNTXrg/Oe92Ajj+CpFIGhEUgXsufpg3OF+4doXOoRrVcv6y/0dGC+u899
-Qiz5rzP8JkgT3Bvs/oFbQnESX7zob/GuBiRAnaanQQGjQsc8tXUcIgIB8vZI6Hxr
-BZYyjXMrc1fAp1zy6F3YfVtjntp6Zt740zlcFSHPL6pKeNC8lCas7f7EPGm9ERlf
-XvPOsMyKVDRTrtYVrQ17pgmWzMFl9eYzAV81X/cK7O9BmTvLb9HB9THl9QM6iKWd
-UPNNhMseMA55i1y1trvv2rQSP2tm7xAijlffNu/LHyVjOJA+63rk9JqpQi2O/sI6
-naCZ5kLky3+OisbzJLtsIv3KWGF4jnpZJwPI97UbRAxrBCPd8BDXW06qQ0xfF9GA
-sW46IDnf5uNV5Fj9T1IhZUUCU6XwwhcTENwcaJ2hubPzW19gvxieRpxdvnXhjUxR
-UgqgFjtlpyBSABYr2REiaBTHkR1qVMa8tThpSyzfmfBNe9chBGQBdDMzTTUDf4dU
-cw4UGGPXqrBEapleoZBszXLrZxQxCNmLGFBW3vcJDfRRTvg/OMCIwD72kfd8KY1t
-SRRi5vQ3CvV8E0EEXshjxVk0fwS+5muM1thWZM4xCSgyH6Ka/5biMeUv1VNcKJne
-J51xs9jfS/JltrT/ahWG4J9msJFtmYyrLh/nMxccXK75uQINBGYXyiQBEAC5tT5O
-uysy75BcwAg8jIK+Cw6hNy+riOoCIzsMen8ps4tyDFLmRdpJmVOpmtvESaix2MHf
-Hc/t9hOsQ8LmF3kDG/JisDXcB/v28EOiDpp5Ug/5UOFBnbu4DkxbakJF8KF/rQ9t
-i29lt03saGCf2XbqzTLI6FvZ2TT8hDwAZF5aOtDEHV3ChBPn6gplnJADiZ9DioMZ
-ji1HnL8Zu4IYHMNOgpxULi6TMhBH/MkHbyycOdt/EsQFamnLGeV8KR2fubYjrpbH
-pLZzSRepQyvKIhHAFj6DUeDyEt2XAitxI8YI40IVO75Zu8ZZq0qYGML8Am+t6ZjJ
-3ZR8/DWjxRUYeo+YVEe5f+oRl5GRNkLtGvTAD38Nb2/7SUYdSXA3y3Ocfo/bySwa
-qggeFpDqK5eHXmrO4hvRqYoEyNyW4VQlGyvYq4s2cLeCF/S2w6dV8OFsksIoq8uq
-R1/IQ8Bonsf7iAYpsMAZZOGKiJzr01W3GA4Ka3B/MmZP5CysUhFlFxMsDr3/TWfg
-p3CHd5yGAnuWWWkjqVQzx0tcub3gyDsHCPuws8P2OKJ2lzNPqpp08MjYMMRZb4Y6
-9REXkKw7kXU8zM5+1IpW2U+z83NU86QR08PTpjATz05ltdGqF82Z+Ygl2nav8oqV
-RqNd/k+WE60e1eJmgykjmz6nPbm0S2jt1C7QLQARAQABiQI2BBgBCAAgFiEEQzh4
-Jd2xu5fsNrpdAHyNfBXYc2kFAmYXyiQCGwwACgkQAHyNfBXYc2mTihAAqB+sv9lw
-kRorE6iXwvvj2Dt2iIy7jc1AhZQOH/j7B4GHpV3Ej/ptdUwuzj/aX5EnEeDPZ2JU
-sSKy2q0RpKGKdKOvgy5yVfd8xqujkawXv26QU53mgyfgQCZLhFFhq0MIAqnxPb8h
-SCQeol18Wqs++LjeDMwkgMrHJeNhW2U2llqTS37YfRMOo0Vr022ZHlMlkyMz1sQH
-+C2/nzmmtkI4+vlPeccoN+3239YzndW1+XM8S3dXNcsGTyLAbkCowfpuqQdIP0MY
-lBwx/Xj9fxBNAuqGVCjrjGMg7mozMkeCDzrAoZiaD3Kud8zSs9VpAyAymrPQJSSS
-96b+vr2mDKbV11QJeJZv/d02n4JMjK7Ai//3j/TqkJF4UoYH45g5hvGSrym1UKrf
-n8TqHdtTFjcxAMXLbWICHdDk7/0ole8Bl8csiSHyKy/sGJ0b/7zcB88CS8OfsR3C
-OanK13emeD6rHOp8wEWA1/PA1JoAC5suS/uIgPWa5ujLaViJ9pW6ohfzMqOtLABF
-BB/FgD/qgPF+uTPPLQZw3XO8Q61kFq6x0RJGNgBEOpseounx+T6FCxZqrvjWm/WK
-VQUiRBtJIvD7Z8UCP+NUzdj3hwLAXpXrPz0gkcbI+hdlTJHCC6i61Qf5OIWnhtw6
-kZv2zEcTtzlAYNEumy8KrJzICmPLS7BEC8w=
-=ilJ3
+v4ZkqLWJlkiitCFSb21hbiBBcnV0eXVueWFuIDxhcnV0QG5naW54LmNvbT6JAk4E
+EwEIADgWIQRDOHgl3bG7l+w2ul0AfI18FdhzaQUCZhfKJAIbAwULCQgHAgYVCgkI
+CwIEFgIDAQIeAQIXgAAKCRAAfI18FdhzaREXD/9UW4KdbcTCgsJZaBYKKSAj2RtU
+OvT9CLJ/YZv2x87LME2r/5kaNOzsSpMdthSIJOCPLy3RI0qLOgJeNJYtOhMBeE55
+NjfAO4eR1zcLY48w+CYc8aZ2d+mWaxmOPrz2zLQxOeUuZT/zu17FH9/dEQAq1yFW
+OjkCiO5nFcmL6vIG+jMpeLzYzUlpiUivXlP46JG19ndyB9ORvkJFrRhFXtBDXOE6
+IXQAUpVWKQXBG6q6mFPLZxIsgsvM6nAb8KMwnM7hU4BKYYmZ2Jwh9hKxlLPPftGt
+x95jBHqq4nnlj1AX0hR+DkAda5+ldp/oVsyxbVTWY6rS0y/C91w767kjlIGPoiSo
+7jNq+Zb+LnOTFqr3rAVCfr6hGSoec02fSGX8HgxZ0SMMmxoNd+RDdKefgF+XUk9P
+pwfY0NVhCfWyIg6Kb9YbmWEYs0HVM4BUsduVDbEgtp0rRPffLqV9FRXcE5bTUEOg
+XSd3J3suMbkOL9yN9KjWG+FORbtAkZ/NVXggADETIcqWaA41+CBmimWq6S4+yrt4
+01E+G+VmrrfZBciq3pjETjc2TQ7jWtf+1a0Ht41w+9805z6waWOcJLClFbLH3E7u
+mUQtUP0p21zIesiCitoWWHsqxJumlJD+JQpE0/6V8JCwxrXKudDLFrOyzw4aUHti
+lQkvi2tBbfl/+NcUP7kCDQRmF8okARAAubU+TrsrMu+QXMAIPIyCvgsOoTcvq4jq
+AiM7DHp/KbOLcgxS5kXaSZlTqZrbxEmosdjB3x3P7fYTrEPC5hd5AxvyYrA13Af7
+9vBDog6aeVIP+VDhQZ27uA5MW2pCRfChf60PbYtvZbdN7Ghgn9l26s0yyOhb2dk0
+/IQ8AGReWjrQxB1dwoQT5+oKZZyQA4mfQ4qDGY4tR5y/GbuCGBzDToKcVC4ukzIQ
+R/zJB28snDnbfxLEBWppyxnlfCkdn7m2I66Wx6S2c0kXqUMryiIRwBY+g1Hg8hLd
+lwIrcSPGCONCFTu+WbvGWatKmBjC/AJvremYyd2UfPw1o8UVGHqPmFRHuX/qEZeR
+kTZC7Rr0wA9/DW9v+0lGHUlwN8tznH6P28ksGqoIHhaQ6iuXh15qzuIb0amKBMjc
+luFUJRsr2KuLNnC3ghf0tsOnVfDhbJLCKKvLqkdfyEPAaJ7H+4gGKbDAGWThioic
+69NVtxgOCmtwfzJmT+QsrFIRZRcTLA69/01n4Kdwh3echgJ7lllpI6lUM8dLXLm9
+4Mg7Bwj7sLPD9jiidpczT6qadPDI2DDEWW+GOvURF5CsO5F1PMzOftSKVtlPs/Nz
+VPOkEdPD06YwE89OZbXRqhfNmfmIJdp2r/KKlUajXf5PlhOtHtXiZoMpI5s+pz25
+tEto7dQu0C0AEQEAAYkCNgQYAQgAIBYhBEM4eCXdsbuX7Da6XQB8jXwV2HNpBQJm
+F8okAhsMAAoJEAB8jXwV2HNpk4oQAKgfrL/ZcJEaKxOol8L749g7doiMu43NQIWU
+Dh/4+weBh6VdxI/6bXVMLs4/2l+RJxHgz2diVLEistqtEaShinSjr4MuclX3fMar
+o5GsF79ukFOd5oMn4EAmS4RRYatDCAKp8T2/IUgkHqJdfFqrPvi43gzMJIDKxyXj
+YVtlNpZak0t+2H0TDqNFa9NtmR5TJZMjM9bEB/gtv585prZCOPr5T3nHKDft9t/W
+M53VtflzPEt3VzXLBk8iwG5AqMH6bqkHSD9DGJQcMf14/X8QTQLqhlQo64xjIO5q
+MzJHgg86wKGYmg9yrnfM0rPVaQMgMpqz0CUkkvem/r69pgym1ddUCXiWb/3dNp+C
+TIyuwIv/94/06pCReFKGB+OYOYbxkq8ptVCq35/E6h3bUxY3MQDFy21iAh3Q5O/9
+KJXvAZfHLIkh8isv7BidG/+83AfPAkvDn7Edwjmpytd3png+qxzqfMBFgNfzwNSa
+AAubLkv7iID1muboy2lYifaVuqIX8zKjrSwARQQfxYA/6oDxfrkzzy0GcN1zvEOt
+ZBausdESRjYARDqbHqLp8fk+hQsWaq741pv1ilUFIkQbSSLw+2fFAj/jVM3Y94cC
+wF6V6z89IJHGyPoXZUyRwguoutUH+TiFp4bcOpGb9sxHE7c5QGDRLpsvCqycyApj
+y0uwRAvM
+=atsZ
 -----END PGP PUBLIC KEY BLOCK-----

From 880afec3d70c49ba5c17b1dccdc85c1028dbadff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 1 May 2024 06:48:05 +0200
Subject: [PATCH 556/600] d/changelog fix whitespace

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 46baa56..2589f9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
   * d/ufw/nginx update, add QUICK, thanks Marcus Bointon
   * d/conf/mime.types add application/xslt+xml, thanks K. Widholm
   * d/copyright: updated copyright related to new upstream version
-  * d/copyright: bump my copyright year 
+  * d/copyright: bump my copyright year
   * d/conf/nginx.conf: add worker_cpu_affinity auto (Closes: 1063659)
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200

From 2d4405e08a97826722785acd595b6011fb61a419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 1 May 2024 12:18:01 +0200
Subject: [PATCH 557/600] d/gbp.conf: add sign-tags = True, [pull]
 track-missing = True, [import-orig] merge-mode = replace

---
 debian/changelog | 2 ++
 debian/gbp.conf  | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2589f9b..3f5f042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
   * d/copyright: updated copyright related to new upstream version
   * d/copyright: bump my copyright year
   * d/conf/nginx.conf: add worker_cpu_affinity auto (Closes: 1063659)
+  * d/gbp.conf: add sign-tags = True, [pull] track-missing = True,
+    [import-orig] merge-mode = replace
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 49473cf..97cd209 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,12 @@
 [DEFAULT]
 debian-branch = main
-pristine-tar = True
 upstream-branch = upstream
 upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
+
+[pull]
+track-missing = True

From 6ccf66d20e676adb7df510d82be575cf4d1ee875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 5 May 2024 18:49:07 +0200
Subject: [PATCH 558/600] release nginx 1.26.0-1, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f5f042..a3ccd3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.26.0-1) UNRELEASED; urgency=medium
+nginx (1.26.0-1) unstable; urgency=medium
 
   * New upstream version 1.26.0
   * nginx ABI release: nginx-abi-1.26.0-1 (Closes: 1069997)
@@ -14,7 +14,7 @@ nginx (1.26.0-1) UNRELEASED; urgency=medium
   * d/gbp.conf: add sign-tags = True, [pull] track-missing = True,
     [import-orig] merge-mode = replace
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 30 Apr 2024 17:40:59 +0200
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 05 May 2024 18:48:05 +0200
 
 nginx (1.24.0-2) unstable; urgency=medium
 

From 5651e6f455f4eeb45e856e8337a9f4e789382e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 7 May 2024 19:12:06 +0200
Subject: [PATCH 559/600] d/rules: enable QUIC and HTTP/3 module

---
 debian/changelog | 6 ++++++
 debian/rules     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a3ccd3e..8ed3f90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.26.0-2) UNRELEASED; urgency=medium
+
+  * d/rules: enable QUIC and HTTP/3 module (Closes: 1070488)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 07 May 2024 19:09:56 +0200
+
 nginx (1.26.0-1) unstable; urgency=medium
 
   * New upstream version 1.26.0
diff --git a/debian/rules b/debian/rules
index 1d037dd..7b56607 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ basic_configure_flags := \
 			--with-http_realip_module \
 			--with-http_auth_request_module \
 			--with-http_v2_module \
+			--with-http_v3_module \
 			--with-http_dav_module \
 			--with-http_slice_module \
 			--with-threads

From 9ede767588de8085c5a219e6081d99e37632893a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 7 May 2024 19:12:52 +0200
Subject: [PATCH 560/600] d/control: bump Standards-Version: 4.7.0, no changes

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8ed3f90..1842f18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nginx (1.26.0-2) UNRELEASED; urgency=medium
 
   * d/rules: enable QUIC and HTTP/3 module (Closes: 1070488)
+  * d/control: bump Standards-Version: 4.7.0, no changes
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 07 May 2024 19:09:56 +0200
 
diff --git a/debian/control b/debian/control
index 2f6df9f..1b1a145 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 13),
                libxslt1-dev,
                po-debconf,
                zlib1g-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Homepage: https://nginx.org
 Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
 Vcs-Browser: https://salsa.debian.org/nginx-team/nginx

From 3e7838a6b214e430dadaecf931c1f1531c636581 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Mon, 17 Jun 2024 15:43:12 +0000
Subject: [PATCH 561/600] Update nginx.conf defaults

- Match current security practices for SSL protocols and SSL Prefer Server Ciphers
- Hide NGINX version in responses, modern security practice
---
 debian/conf/nginx.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index d72573c..594c93e 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -19,7 +19,7 @@ http {
 	sendfile on;
 	tcp_nopush on;
 	types_hash_max_size 2048;
-	# server_tokens off;
+	server_tokens off; # Recommended security practice is to turn this off
 
 	# server_names_hash_bucket_size 64;
 	# server_name_in_redirect off;
@@ -31,8 +31,8 @@ http {
 	# SSL Settings
 	##
 
-	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE
-	ssl_prefer_server_ciphers on;
+	ssl_protocols TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE; TLS 1.0, 1.1 deprecated.
+	ssl_prefer_server_ciphers off; # Modern security: don't force server cipher order.
 
 	##
 	# Logging Settings

From 6ef563d4f40f44f1c5422c80a59572559a1561ed Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Mon, 17 Jun 2024 11:52:46 -0400
Subject: [PATCH 562/600] Update comments

---
 debian/conf/nginx.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index 594c93e..f1466a7 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -19,7 +19,7 @@ http {
 	sendfile on;
 	tcp_nopush on;
 	types_hash_max_size 2048;
-	server_tokens off; # Recommended security practice is to turn this off
+    server_tokens off; # Recommended practice is to turn this off
 
 	# server_names_hash_bucket_size 64;
 	# server_name_in_redirect off;
@@ -31,8 +31,8 @@ http {
 	# SSL Settings
 	##
 
-	ssl_protocols TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE; TLS 1.0, 1.1 deprecated.
-	ssl_prefer_server_ciphers off; # Modern security: don't force server cipher order.
+	ssl_protocols TLSv1.2 TLSv1.3; # Dropping SSLv3 (POODLE), TLS 1.0, 1.1
+	ssl_prefer_server_ciphers off; # Don't force server cipher order.
 
 	##
 	# Logging Settings

From 2a1513acc87a1090cbeb8156d440f87a34e5e456 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Mon, 17 Jun 2024 11:53:50 -0400
Subject: [PATCH 563/600] Debian changelog entry

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a3ccd3e..39c80c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nginx (1.26.0-2) UNRELEASED; urgency=medium
+
+  * d/conf/nginx.conf: Update default options for current security 
+    practices and standards. SSL protos, disable prefer server 
+    ciphers, hide server tokens/versions in responses.
+
+ -- Thomas Ward <teward@ubuntu.com>  Mon, 17 Jun 2024 11:52:48 -0400
+
 nginx (1.26.0-1) unstable; urgency=medium
 
   * New upstream version 1.26.0

From 363e53be5d010d9e401007637b8994fac9c629da Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Mon, 17 Jun 2024 16:25:34 +0000
Subject: [PATCH 564/600] Update nginx.conf: whitespace matching

---
 debian/conf/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/conf/nginx.conf b/debian/conf/nginx.conf
index f1466a7..68a8fd4 100644
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@@ -19,7 +19,7 @@ http {
 	sendfile on;
 	tcp_nopush on;
 	types_hash_max_size 2048;
-    server_tokens off; # Recommended practice is to turn this off
+	server_tokens off; # Recommended practice is to turn this off
 
 	# server_names_hash_bucket_size 64;
 	# server_name_in_redirect off;

From 45c7770c5ef1f485dd1d4755dcb554868f0ddd32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 17 Jun 2024 18:46:59 +0200
Subject: [PATCH 565/600] d/p/nginx-1.26.1.patch add, backport changes from the
 nginx 1.26.1

---
 debian/changelog                  |   2 +
 debian/patches/nginx-1.26.1.patch | 367 ++++++++++++++++++++++++++++++
 debian/patches/series             |   1 +
 3 files changed, 370 insertions(+)
 create mode 100644 debian/patches/nginx-1.26.1.patch

diff --git a/debian/changelog b/debian/changelog
index a179f58..791b894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ nginx (1.26.0-2) UNRELEASED; urgency=medium
   [ Jan Mojžíš ]
   * d/rules: enable QUIC and HTTP/3 module (Closes: 1070488)
   * d/control: bump Standards-Version: 4.7.0, no changes
+  * d/p/nginx-1.26.1.patch add, backport changes from the nginx 1.26.1 and fix
+    CVE-2024-32760, CVE-2024-31079, CVE-2024-35200, CVE-2024-34161
 
   [ Thomas Ward ]
   * d/conf/nginx.conf: Update default options for current security 
diff --git a/debian/patches/nginx-1.26.1.patch b/debian/patches/nginx-1.26.1.patch
new file mode 100644
index 0000000..8086ae8
--- /dev/null
+++ b/debian/patches/nginx-1.26.1.patch
@@ -0,0 +1,367 @@
+From: =?utf-8?b?SmFuIE1vasW+w63FoQ==?= <jan.mojzis@gmail.com>
+Date: Mon, 17 Jun 2024 18:40:09 +0200
+Subject: nginx-1.26.1
+Forwarded: not-needed
+
+Backport changes from the nginx 1.26.1 and fix
+CVE-2024-32760, CVE-2024-31079, CVE-2024-35200, CVE-2024-34161
+
+---
+ auto/lib/libatomic/conf                          |  2 +-
+ src/core/ngx_output_chain.c                      | 10 ++++++++--
+ src/event/quic/ngx_event_quic_frames.c           |  1 +
+ src/event/quic/ngx_event_quic_ssl.c              |  5 +++++
+ src/event/quic/ngx_event_quic_transport.c        |  8 ++++++++
+ src/http/modules/ngx_http_grpc_module.c          |  5 ++++-
+ src/http/modules/ngx_http_gunzip_filter_module.c | 18 ++++++++++++++----
+ src/http/modules/ngx_http_gzip_filter_module.c   | 10 +++++++---
+ src/http/modules/ngx_http_ssi_filter_module.c    |  8 ++++++--
+ src/http/modules/ngx_http_sub_filter_module.c    |  8 ++++++--
+ src/http/v3/ngx_http_v3_parse.c                  |  3 +++
+ src/http/v3/ngx_http_v3_request.c                | 20 ++++++++++++++------
+ src/http/v3/ngx_http_v3_table.c                  |  2 +-
+ src/http/v3/ngx_http_v3_uni.c                    |  4 +---
+ src/http/v3/ngx_http_v3_uni.h                    |  2 ++
+ 15 files changed, 81 insertions(+), 25 deletions(-)
+
+diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
+index d1e484a..8c8cb43 100644
+--- a/auto/lib/libatomic/conf
++++ b/auto/lib/libatomic/conf
+@@ -19,7 +19,7 @@ else
+                       #include <atomic_ops.h>"
+     ngx_feature_path=
+     ngx_feature_libs="-latomic_ops"
+-    ngx_feature_test="long  n = 0;
++    ngx_feature_test="AO_t  n = 0;
+                       if (!AO_compare_and_swap(&n, 0, 1))
+                           return 1;
+                       if (AO_fetch_and_add(&n, 1) != 1)
+diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
+index 8570742..a46209c 100644
+--- a/src/core/ngx_output_chain.c
++++ b/src/core/ngx_output_chain.c
+@@ -117,7 +117,10 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
+ 
+                 ngx_debug_point();
+ 
+-                ctx->in = ctx->in->next;
++                cl = ctx->in;
++                ctx->in = cl->next;
++
++                ngx_free_chain(ctx->pool, cl);
+ 
+                 continue;
+             }
+@@ -203,7 +206,10 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
+             /* delete the completed buf from the ctx->in chain */
+ 
+             if (ngx_buf_size(ctx->in->buf) == 0) {
+-                ctx->in = ctx->in->next;
++                cl = ctx->in;
++                ctx->in = cl->next;
++
++                ngx_free_chain(ctx->pool, cl);
+             }
+ 
+             cl = ngx_alloc_chain_link(ctx->pool);
+diff --git a/src/event/quic/ngx_event_quic_frames.c b/src/event/quic/ngx_event_quic_frames.c
+index 42b7d9f..6ea908c 100644
+--- a/src/event/quic/ngx_event_quic_frames.c
++++ b/src/event/quic/ngx_event_quic_frames.c
+@@ -648,6 +648,7 @@ ngx_quic_free_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb)
+     ngx_quic_free_chain(c, qb->chain);
+ 
+     qb->chain = NULL;
++    qb->last_chain = NULL;
+ }
+ 
+ 
+diff --git a/src/event/quic/ngx_event_quic_ssl.c b/src/event/quic/ngx_event_quic_ssl.c
+index 7872783..ba0b592 100644
+--- a/src/event/quic/ngx_event_quic_ssl.c
++++ b/src/event/quic/ngx_event_quic_ssl.c
+@@ -326,6 +326,11 @@ ngx_quic_handle_crypto_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
+     ngx_quic_crypto_frame_t  *f;
+ 
+     qc = ngx_quic_get_connection(c);
++
++    if (!ngx_quic_keys_available(qc->keys, pkt->level, 0)) {
++        return NGX_OK;
++    }
++
+     ctx = ngx_quic_get_send_ctx(qc, pkt->level);
+     f = &frame->u.crypto;
+ 
+diff --git a/src/event/quic/ngx_event_quic_transport.c b/src/event/quic/ngx_event_quic_transport.c
+index 19670a6..fba098c 100644
+--- a/src/event/quic/ngx_event_quic_transport.c
++++ b/src/event/quic/ngx_event_quic_transport.c
+@@ -1750,6 +1750,14 @@ ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp,
+             return NGX_ERROR;
+         }
+ 
++        if ((size_t) (end - p) < len) {
++            ngx_log_error(NGX_LOG_INFO, log, 0,
++                          "quic failed to parse"
++                          " transport param id:0x%xL, data length %uL too long",
++                          id, len);
++            return NGX_ERROR;
++        }
++
+         rc = ngx_quic_parse_transport_param(p, p + len, id, tp);
+ 
+         if (rc == NGX_ERROR) {
+diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
+index dfe49c5..e7726f3 100644
+--- a/src/http/modules/ngx_http_grpc_module.c
++++ b/src/http/modules/ngx_http_grpc_module.c
+@@ -1231,7 +1231,7 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
+     ngx_buf_t              *b;
+     ngx_int_t               rc;
+     ngx_uint_t              next, last;
+-    ngx_chain_t            *cl, *out, **ll;
++    ngx_chain_t            *cl, *out, *ln, **ll;
+     ngx_http_upstream_t    *u;
+     ngx_http_grpc_ctx_t    *ctx;
+     ngx_http_grpc_frame_t  *f;
+@@ -1459,7 +1459,10 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
+             last = 1;
+         }
+ 
++        ln = in;
+         in = in->next;
++
++        ngx_free_chain(r->pool, ln);
+     }
+ 
+     ctx->in = in;
+diff --git a/src/http/modules/ngx_http_gunzip_filter_module.c b/src/http/modules/ngx_http_gunzip_filter_module.c
+index c1341f5..5d170a1 100644
+--- a/src/http/modules/ngx_http_gunzip_filter_module.c
++++ b/src/http/modules/ngx_http_gunzip_filter_module.c
+@@ -333,6 +333,8 @@ static ngx_int_t
+ ngx_http_gunzip_filter_add_data(ngx_http_request_t *r,
+     ngx_http_gunzip_ctx_t *ctx)
+ {
++    ngx_chain_t  *cl;
++
+     if (ctx->zstream.avail_in || ctx->flush != Z_NO_FLUSH || ctx->redo) {
+         return NGX_OK;
+     }
+@@ -344,8 +346,11 @@ ngx_http_gunzip_filter_add_data(ngx_http_request_t *r,
+         return NGX_DECLINED;
+     }
+ 
+-    ctx->in_buf = ctx->in->buf;
+-    ctx->in = ctx->in->next;
++    cl = ctx->in;
++    ctx->in_buf = cl->buf;
++    ctx->in = cl->next;
++
++    ngx_free_chain(r->pool, cl);
+ 
+     ctx->zstream.next_in = ctx->in_buf->pos;
+     ctx->zstream.avail_in = ctx->in_buf->last - ctx->in_buf->pos;
+@@ -374,6 +379,7 @@ static ngx_int_t
+ ngx_http_gunzip_filter_get_buf(ngx_http_request_t *r,
+     ngx_http_gunzip_ctx_t *ctx)
+ {
++    ngx_chain_t             *cl;
+     ngx_http_gunzip_conf_t  *conf;
+ 
+     if (ctx->zstream.avail_out) {
+@@ -383,8 +389,12 @@ ngx_http_gunzip_filter_get_buf(ngx_http_request_t *r,
+     conf = ngx_http_get_module_loc_conf(r, ngx_http_gunzip_filter_module);
+ 
+     if (ctx->free) {
+-        ctx->out_buf = ctx->free->buf;
+-        ctx->free = ctx->free->next;
++
++        cl = ctx->free;
++        ctx->out_buf = cl->buf;
++        ctx->free = cl->next;
++
++        ngx_free_chain(r->pool, cl);
+ 
+         ctx->out_buf->flush = 0;
+ 
+diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
+index ed0de60..b555278 100644
+--- a/src/http/modules/ngx_http_gzip_filter_module.c
++++ b/src/http/modules/ngx_http_gzip_filter_module.c
+@@ -985,10 +985,14 @@ static void
+ ngx_http_gzip_filter_free_copy_buf(ngx_http_request_t *r,
+     ngx_http_gzip_ctx_t *ctx)
+ {
+-    ngx_chain_t  *cl;
++    ngx_chain_t  *cl, *ln;
++
++    for (cl = ctx->copied; cl; /* void */) {
++        ln = cl;
++        cl = cl->next;
+ 
+-    for (cl = ctx->copied; cl; cl = cl->next) {
+-        ngx_pfree(r->pool, cl->buf->start);
++        ngx_pfree(r->pool, ln->buf->start);
++        ngx_free_chain(r->pool, ln);
+     }
+ 
+     ctx->copied = NULL;
+diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
+index 0b84bd3..47068f7 100644
+--- a/src/http/modules/ngx_http_ssi_filter_module.c
++++ b/src/http/modules/ngx_http_ssi_filter_module.c
+@@ -482,9 +482,13 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
+     while (ctx->in || ctx->buf) {
+ 
+         if (ctx->buf == NULL) {
+-            ctx->buf = ctx->in->buf;
+-            ctx->in = ctx->in->next;
++
++            cl = ctx->in;
++            ctx->buf = cl->buf;
++            ctx->in = cl->next;
+             ctx->pos = ctx->buf->pos;
++
++            ngx_free_chain(r->pool, cl);
+         }
+ 
+         if (ctx->state == ssi_start_state) {
+diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
+index 6d3de59..456bb27 100644
+--- a/src/http/modules/ngx_http_sub_filter_module.c
++++ b/src/http/modules/ngx_http_sub_filter_module.c
+@@ -335,9 +335,13 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
+     while (ctx->in || ctx->buf) {
+ 
+         if (ctx->buf == NULL) {
+-            ctx->buf = ctx->in->buf;
+-            ctx->in = ctx->in->next;
++
++            cl = ctx->in;
++            ctx->buf = cl->buf;
++            ctx->in = cl->next;
+             ctx->pos = ctx->buf->pos;
++
++            ngx_free_chain(r->pool, cl);
+         }
+ 
+         if (ctx->buf->flush || ctx->buf->recycled) {
+diff --git a/src/http/v3/ngx_http_v3_parse.c b/src/http/v3/ngx_http_v3_parse.c
+index 5688163..436765c 100644
+--- a/src/http/v3/ngx_http_v3_parse.c
++++ b/src/http/v3/ngx_http_v3_parse.c
+@@ -810,6 +810,7 @@ ngx_http_v3_parse_field_lri(ngx_connection_t *c,
+ 
+             st->literal.length = st->pint.value;
+             if (st->literal.length == 0) {
++                st->value.data = (u_char *) "";
+                 goto done;
+             }
+ 
+@@ -932,6 +933,7 @@ ngx_http_v3_parse_field_l(ngx_connection_t *c,
+ 
+             st->literal.length = st->pint.value;
+             if (st->literal.length == 0) {
++                st->value.data = (u_char *) "";
+                 goto done;
+             }
+ 
+@@ -1072,6 +1074,7 @@ ngx_http_v3_parse_field_lpbi(ngx_connection_t *c,
+ 
+             st->literal.length = st->pint.value;
+             if (st->literal.length == 0) {
++                st->value.data = (u_char *) "";
+                 goto done;
+             }
+ 
+diff --git a/src/http/v3/ngx_http_v3_request.c b/src/http/v3/ngx_http_v3_request.c
+index 87f5f32..0faddd2 100644
+--- a/src/http/v3/ngx_http_v3_request.c
++++ b/src/http/v3/ngx_http_v3_request.c
+@@ -134,7 +134,17 @@ ngx_http_v3_init(ngx_connection_t *c)
+         }
+     }
+ 
+-    return ngx_http_v3_send_settings(c);
++    if (ngx_http_v3_send_settings(c) != NGX_OK) {
++        return NGX_ERROR;
++    }
++
++    if (h3scf->max_table_capacity > 0) {
++        if (ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_DECODER) == NULL) {
++            return NGX_ERROR;
++        }
++    }
++
++    return NGX_OK;
+ }
+ 
+ 
+@@ -398,14 +408,12 @@ ngx_http_v3_wait_request_handler(ngx_event_t *rev)
+ void
+ ngx_http_v3_reset_stream(ngx_connection_t *c)
+ {
+-    ngx_http_v3_session_t   *h3c;
+-    ngx_http_v3_srv_conf_t  *h3scf;
+-
+-    h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
++    ngx_http_v3_session_t  *h3c;
+ 
+     h3c = ngx_http_v3_get_session(c);
+ 
+-    if (h3scf->max_table_capacity > 0 && !c->read->eof && !h3c->hq
++    if (!c->read->eof && !h3c->hq
++        && h3c->known_streams[NGX_HTTP_V3_STREAM_SERVER_DECODER]
+         && (c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0)
+     {
+         (void) ngx_http_v3_send_cancel_stream(c, c->quic->id);
+diff --git a/src/http/v3/ngx_http_v3_table.c b/src/http/v3/ngx_http_v3_table.c
+index f49a8fc..428e732 100644
+--- a/src/http/v3/ngx_http_v3_table.c
++++ b/src/http/v3/ngx_http_v3_table.c
+@@ -308,7 +308,7 @@ ngx_http_v3_set_capacity(ngx_connection_t *c, ngx_uint_t capacity)
+     prev_max = dt->capacity / 32;
+ 
+     if (max > prev_max) {
+-        elts = ngx_alloc(max * sizeof(void *), c->log);
++        elts = ngx_alloc((max + 1) * sizeof(void *), c->log);
+         if (elts == NULL) {
+             return NGX_ERROR;
+         }
+diff --git a/src/http/v3/ngx_http_v3_uni.c b/src/http/v3/ngx_http_v3_uni.c
+index 2fc5b07..302064b 100644
+--- a/src/http/v3/ngx_http_v3_uni.c
++++ b/src/http/v3/ngx_http_v3_uni.c
+@@ -20,8 +20,6 @@ static void ngx_http_v3_close_uni_stream(ngx_connection_t *c);
+ static void ngx_http_v3_uni_read_handler(ngx_event_t *rev);
+ static void ngx_http_v3_uni_dummy_read_handler(ngx_event_t *wev);
+ static void ngx_http_v3_uni_dummy_write_handler(ngx_event_t *wev);
+-static ngx_connection_t *ngx_http_v3_get_uni_stream(ngx_connection_t *c,
+-    ngx_uint_t type);
+ 
+ 
+ void
+@@ -307,7 +305,7 @@ ngx_http_v3_uni_dummy_write_handler(ngx_event_t *wev)
+ }
+ 
+ 
+-static ngx_connection_t *
++ngx_connection_t *
+ ngx_http_v3_get_uni_stream(ngx_connection_t *c, ngx_uint_t type)
+ {
+     u_char                     buf[NGX_HTTP_V3_VARLEN_INT_LEN];
+diff --git a/src/http/v3/ngx_http_v3_uni.h b/src/http/v3/ngx_http_v3_uni.h
+index 911e153..2805894 100644
+--- a/src/http/v3/ngx_http_v3_uni.h
++++ b/src/http/v3/ngx_http_v3_uni.h
+@@ -19,6 +19,8 @@ ngx_int_t ngx_http_v3_register_uni_stream(ngx_connection_t *c, uint64_t type);
+ 
+ ngx_int_t ngx_http_v3_cancel_stream(ngx_connection_t *c, ngx_uint_t stream_id);
+ 
++ngx_connection_t *ngx_http_v3_get_uni_stream(ngx_connection_t *c,
++    ngx_uint_t type);
+ ngx_int_t ngx_http_v3_send_settings(ngx_connection_t *c);
+ ngx_int_t ngx_http_v3_send_goaway(ngx_connection_t *c, uint64_t id);
+ ngx_int_t ngx_http_v3_send_ack_section(ngx_connection_t *c,
diff --git a/debian/patches/series b/debian/patches/series
index 52e1dc4..548660c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 nginx-fix-pidfile.patch
 nginx-ssl_cert_cb_yield.patch
+nginx-1.26.1.patch

From b3d7b0f3ed5c23cb50515a900d74340a3958a22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 18 Aug 2024 08:15:33 +0200
Subject: [PATCH 566/600] d/p/CVE-2024-7347.patch add, backport CVE-2024-7347
 fix

---
 debian/changelog                   |  1 +
 debian/patches/CVE-2024-7347.patch | 45 ++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 47 insertions(+)
 create mode 100644 debian/patches/CVE-2024-7347.patch

diff --git a/debian/changelog b/debian/changelog
index 791b894..5fdfbca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ nginx (1.26.0-2) UNRELEASED; urgency=medium
   * d/control: bump Standards-Version: 4.7.0, no changes
   * d/p/nginx-1.26.1.patch add, backport changes from the nginx 1.26.1 and fix
     CVE-2024-32760, CVE-2024-31079, CVE-2024-35200, CVE-2024-34161
+  * d/p/CVE-2024-7347.patch add, backport CVE-2024-7347 fix
 
   [ Thomas Ward ]
   * d/conf/nginx.conf: Update default options for current security 
diff --git a/debian/patches/CVE-2024-7347.patch b/debian/patches/CVE-2024-7347.patch
new file mode 100644
index 0000000..1ca3e79
--- /dev/null
+++ b/debian/patches/CVE-2024-7347.patch
@@ -0,0 +1,45 @@
+Origin: https://nginx.org/download/patch.2024.mp4.txt
+
+diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
+--- a/src/http/modules/ngx_http_mp4_module.c
++++ b/src/http/modules/ngx_http_mp4_module.c
+@@ -3099,7 +3099,8 @@ static ngx_int_t
+ ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
+     ngx_http_mp4_trak_t *trak, ngx_uint_t start)
+ {
+-    uint32_t               start_sample, chunk, samples, id, next_chunk, n,
++    uint64_t               n;
++    uint32_t               start_sample, chunk, samples, id, next_chunk,
+                            prev_samples;
+     ngx_buf_t             *data, *buf;
+     ngx_uint_t             entries, target_chunk, chunk_samples;
+@@ -3155,12 +3156,19 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4
+ 
+         next_chunk = ngx_mp4_get_32value(entry->chunk);
+ 
++        if (next_chunk < chunk) {
++            ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
++                          "unordered mp4 stsc chunks in \"%s\"",
++                          mp4->file.name.data);
++            return NGX_ERROR;
++        }
++
+         ngx_log_debug5(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
+                        "sample:%uD, chunk:%uD, chunks:%uD, "
+                        "samples:%uD, id:%uD",
+                        start_sample, chunk, next_chunk - chunk, samples, id);
+ 
+-        n = (next_chunk - chunk) * samples;
++        n = (uint64_t) (next_chunk - chunk) * samples;
+ 
+         if (start_sample < n) {
+             goto found;
+@@ -3182,7 +3190,7 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4
+                    "sample:%uD, chunk:%uD, chunks:%uD, samples:%uD",
+                    start_sample, chunk, next_chunk - chunk, samples);
+ 
+-    n = (next_chunk - chunk) * samples;
++    n = (uint64_t) (next_chunk - chunk) * samples;
+ 
+     if (start_sample > n) {
+         ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
diff --git a/debian/patches/series b/debian/patches/series
index 548660c..56e7725 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 nginx-fix-pidfile.patch
 nginx-ssl_cert_cb_yield.patch
 nginx-1.26.1.patch
+CVE-2024-7347.patch

From 7137628c08aed485e5c8e88737ee5a8bc74f9c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 18 Aug 2024 08:59:49 +0200
Subject: [PATCH 567/600] d/libnginx-mod.abisubstvars updated comment when ABI
 needs to be changed

---
 debian/changelog                 |  1 +
 debian/libnginx-mod.abisubstvars | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fdfbca..1b37dee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ nginx (1.26.0-2) UNRELEASED; urgency=medium
   * d/p/nginx-1.26.1.patch add, backport changes from the nginx 1.26.1 and fix
     CVE-2024-32760, CVE-2024-31079, CVE-2024-35200, CVE-2024-34161
   * d/p/CVE-2024-7347.patch add, backport CVE-2024-7347 fix
+  * d/libnginx-mod.abisubstvars updated comment when ABI needs to be changed
 
   [ Thomas Ward ]
   * d/conf/nginx.conf: Update default options for current security 
diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index 2b3d99d..d793435 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -1,8 +1,11 @@
-# update the ABI version when:
-# - nginx upstream has changed
-# - a patch might change the ABI
-# - a build-dependency has changed
-# note that debian revision can increase without breaking ABI
+# ABI must be changed:
+# - when upstream nginx version is changed
+# - when module signature is changed (e.g. time_t change from 32bit integer to 64bit integer https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069997)
+# - when symbols/structures/... (exported from header files) are changed
 #
-# TODO: use $(DEB_VERSION_UPSTREAM)
+# ABI format: nginx-abi-{UPSTREAM_VERSION}-{SUFFIX}
+# the {SUFFIX} provides a mechanism on rare cases when there have to be ABI
+# changes without upgrading the upstream nginx version, e.g. security updates
+# in oldstable
+
 nginx:abi=nginx-abi-1.26.0-1

From a079a02186531e8d5634d5c4c2cb9f48a3aed880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 18 Aug 2024 21:07:25 +0200
Subject: [PATCH 568/600] d/changelog close bug for CVE-2024-7347

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1b37dee..9b48673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ nginx (1.26.0-2) UNRELEASED; urgency=medium
   * d/control: bump Standards-Version: 4.7.0, no changes
   * d/p/nginx-1.26.1.patch add, backport changes from the nginx 1.26.1 and fix
     CVE-2024-32760, CVE-2024-31079, CVE-2024-35200, CVE-2024-34161
-  * d/p/CVE-2024-7347.patch add, backport CVE-2024-7347 fix
+  * d/p/CVE-2024-7347.patch add, backport CVE-2024-7347 fix (Closes: 1078971)
   * d/libnginx-mod.abisubstvars updated comment when ABI needs to be changed
 
   [ Thomas Ward ]

From 6e88f6d8584cea9c504d6fe78f1dea73b864aeb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 19 Aug 2024 10:59:44 +0200
Subject: [PATCH 569/600] d/changelog fix whitespace

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b48673..4d148a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,8 @@ nginx (1.26.0-2) UNRELEASED; urgency=medium
   * d/libnginx-mod.abisubstvars updated comment when ABI needs to be changed
 
   [ Thomas Ward ]
-  * d/conf/nginx.conf: Update default options for current security 
-    practices and standards. SSL protos, disable prefer server 
+  * d/conf/nginx.conf: Update default options for current security
+    practices and standards. SSL protos, disable prefer server
     ciphers, hide server tokens/versions in responses.
 
  -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 07 May 2024 19:09:56 +0200

From 9cd731914a2df9cc531106d486d9eb23ec144ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Mon, 19 Aug 2024 18:46:47 +0200
Subject: [PATCH 570/600] release nginx 1.26.0-2, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d148a7..c4b1813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.26.0-2) UNRELEASED; urgency=medium
+nginx (1.26.0-2) unstable; urgency=medium
 
   [ Jan Mojžíš ]
   * d/rules: enable QUIC and HTTP/3 module (Closes: 1070488)
@@ -13,7 +13,7 @@ nginx (1.26.0-2) UNRELEASED; urgency=medium
     practices and standards. SSL protos, disable prefer server
     ciphers, hide server tokens/versions in responses.
 
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 07 May 2024 19:09:56 +0200
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 19 Aug 2024 18:46:30 +0200
 
 nginx (1.26.0-1) unstable; urgency=medium
 

From 0722a5648de88e45079f9c7c4efa9271df0d12bf Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Fri, 20 Sep 2024 21:37:33 -0400
Subject: [PATCH 571/600] Resolve dependency loop (debbugs #1082373)

---
 debian/changelog | 7 +++++++
 debian/control   | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4b1813..40d44d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.26.0-3) UNRELEASED; urgency=medium
+
+  * d/control: Resolve dependency loop between nginx and nginx-common.
+    (Fixes: #1082373)
+
+ -- Thomas Ward <teward@ubuntu.com>  Fri, 20 Sep 2024 21:35:42 -0400
+
 nginx (1.26.0-2) unstable; urgency=medium
 
   [ Jan Mojžíš ]
diff --git a/debian/control b/debian/control
index 1b1a145..756f31f 100644
--- a/debian/control
+++ b/debian/control
@@ -50,9 +50,7 @@ Breaks: nginx (<< 1.22.1-8)
 Replaces: nginx (<< 1.22.1-8)
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends},
-         nginx (>= ${source:Version}),
-         nginx (<< ${source:Version}.1~),
+Depends: ${misc:Depends}
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server

From df67526348924acb51ae870baed33a114efbdc07 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Mon, 30 Sep 2024 11:39:49 -0400
Subject: [PATCH 572/600] Actual release

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 40d44d8..f7bbbcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.26.0-3) UNRELEASED; urgency=medium
+nginx (1.26.0-3) unstable; urgency=medium
 
   * d/control: Resolve dependency loop between nginx and nginx-common.
     (Fixes: #1082373)

From f180e25eb4b066aca70b47eb74e1b2851fe521b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 28 Jan 2025 08:27:48 +0100
Subject: [PATCH 573/600] d/u/signing-key.asc add Sergey Kandaurov
 <s.kandaurov@f5.com> public key

---
 debian/changelog                |   7 +
 debian/upstream/signing-key.asc | 392 ++++++++++++++++++++++++++++++++
 2 files changed, 399 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f7bbbcb..ab2519c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.26.0-4) UNRELEASED; urgency=medium
+
+  * d/u/signing-key.asc: add Sergey Kandaurov <s.kandaurov@f5.com> public key,
+    the key is used to sign the 1.26.2 release
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Tue, 28 Jan 2025 08:26:25 +0100
+
 nginx (1.26.0-3) unstable; urgency=medium
 
   * d/control: Resolve dependency loop between nginx and nginx-common.
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 0264a10..1014f9e 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -161,3 +161,395 @@ wF6V6z89IJHGyPoXZUyRwguoutUH+TiFp4bcOpGb9sxHE7c5QGDRLpsvCqycyApj
 y0uwRAvM
 =atsZ
 -----END PGP PUBLIC KEY BLOCK-----
+
+# Sergey Kandaurov <s.kandaurov@f5.com> public key,
+# the key is used to sign the 1.26.2 release
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFcok2QBEACt2nzM7Oqh6Tl/yNDzT9EXf4C5TTfxnKih6ehm0T0VWLFkWOxz
+bmVqo7PgS0q3bcMoUl8CIbs4foC+GCAVj8DNoiMkxvfxBb+V+qdzve0sh9WHUpDP
+dRBEHQb5T5KzTtGDarkhv1/15VqK1AOCSBroeFZXefr9bZqrGJCgixta/JZXSr6t
+xbouELXWzdviUEtcrN9V9rNJy7QvS2n/UqhjgCKhX5bdLVUy8Abja20rHiVUdBww
+aAee0+yZuS8Y/TksItquNwWce4qDtRrKxs2dmlLYsRULtoRKmTHPcpyrhVN7jIZX
+glYumuG0e5plY/4TUHeEu3ReFC+AdQIESa+6+IxgdIT6szwMF4u+50HFAFDiYfdt
+rjjAoD0fwEW7wSc8Ow9lA3m10yLqRuL+HbVQfb2F5iLsHa+TrSWOKfPboLo+Cg9o
+g7fVRYmPhSogcnGbFdFr52GGp/YRk8M7kbbYzuHmQLuDyiG7kyifq6fOBil2Jgyg
+MxRJcFl5G/sYw1naEKjAUKAMvCYaPdfFmOSJKDyFsR8ZaDO58rE/HUVsumCuN/kG
+wAFmRp3AzT9CrWFSXuZW1tLdd9d+6uHx9BZZUdKaMICpgP62OW1r4h0W8FrEkywf
+Tp/5FxEXjXE/xWRdeZ5sp9QbzJ6xm79c/N79vQQN+Jbq+T9o/p6pbUJ3rQARAQAB
+tCRKYW4gTW9qxb7DrcWhIDxqYW5tb2p6aXNAZGViaWFuLm9yZz6JAk4EEwEKADgW
+IQSq3y7fVSnxcCdyyKLexNJGkx70mwUCZyFKcQIbLwULCQgHAgYVCgkICwIEFgID
+AQIeAQIXgAAKCRDexNJGkx70m/ymEACpUcHefaXAiGEEvJa8eBJ+9qZUdtVSWDwE
+eP+GzlM/+6gbNRxFJAdcDDP3x3ALvAwA39vh8iIsrTONYcbCKi4uFMCH9/h08TzK
+jT/2Z9PmXb0wGaVt/Jz+qe4SjDimnEB0cE8HMRB5Uo6NPhaSTDjMGXYpx49RVzsL
+sJ9xsIDDd1it/KNVjpBMeLtyLRKQARjiAjVkLlWsy+PFxd7To0BnhmZ/9r42JrR9
+eBg3c8n+9hJ+ITA+nSV6RTuox4vADj5yPM0fNcITKpgbgvMv82C5S4DIs3KG/t/Q
+Cth25DHrrm+S0oiHSr9cF85IbwuX07E1HAYTUPuW2X2jLzRwlVihp/txg81W9fkz
+aJCv/tfvzo9oVecUx50WdkEFpJjjGTY+hMKE05dsU+SjY6Wi1kozcreSX4iAdlzV
+Y4u2Z8BNz+29dFnJSs8DMMgYslqiSzLraBuJ1gXo/gKeYuobgxZS2Yk4lft4xbJG
+STUjpLFbq29zGheUxjr9tGJKMrAyhK1X680KTjusR4sd4npAgBQgwYP9c8ozQ9+Q
+IniSZX3mLMcaTBay5JoqK9jR6sc545ltd/NFA9jA0eP7lUJPVjEOcO05DvrLihw5
+KEVopWd50S6/OtJAvd4T7kOxabolG/3K6Mfcz1XL3BMPKUK8dc4k4gEyiUfbYZkj
+05JdIMlO5rQkSmFuIE1vasW+w63FoSA8amFuLm1vanppc0BnbWFpbC5jb20+iQI3
+BBMBAgAiBQJXQ/pWAhsvBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDexNJG
+kx70m8pSD/QPwKHIg4ke+Gj49tnogx5I78x/5wIrY7ekk+OsOI/EisUkle/wpz+W
+nwEY0tVMGwg9G8XaWI3FWuUYnmHRaqIoeMlNaiYHJES00K5gWrrs4PrKNsHCMIct
+XTla88fKjnEgZFJ5KSnLTQoeIgxogbtEtAZyceAWrDc5LuW025xtleU3NLUM0jxi
+hlD4WAMz0Ov0qFH+FB0mTYvfFBKl/TpXnyMN0KSOmRQ8hqyAfeTi3hcz51PSH5uI
+g8nVLSPs6No253FE0MqQoED/tZGHNrkAEz1FIlYJE8Ze27vXMHhfx9Ik7rEbyS4T
+NQSJfVPxmiU/aI2gqN8Kom+vLP1qgrEoYXFPxFnYr73+iyq8UxIZcqGvQOx6XVHU
+GhIxj7fahGD2Q5s0GPJPnlCNvt6X3AGlARBdLAb/qIRAYD456kWlWon2P3raheEa
+EJBeFf1Z3s4/eOOCRP+ojQJPIr+g9MpKdfhlqvG43mrwRuO+ZPRPggixaK1LbWJk
+yImd/DXnTriSHeCKvHwvD2O74xvrKYPbYBSCTdG/0FG/3fT8XGXL84mWObRd3/IF
+fjjAnUugU75B+vE8dJh2B/fIzT8+TuXYCf5oyB1Q+INhwOSulJ2OUyizX8PhCJpR
+ykfmgACSJtM/dMJn1Q5eofii8tAIOjCaPK2olHJTWkS4hkPxd9y6tCpKYW4gTW9q
+xb7DrcWhIDxqYW4ubW9qemlzQGZpcm1hLnNlem5hbS5jej6JAjgEEwECACIFAlco
+m9ACGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEN7E0kaTHvSbCwkQAIuw
+/1e1jQkoGKEOJFtI1DMM85ByXwAwS8A4Xh7tOTYYYU59L6DeBFEGXXYsyb87U31p
+9nFEPmst/EG75wmaPGqqIT2IL2QKuVZiD30OXdQ5aJ3JVAJ++nwb7FYLUFt4JDDk
+jcB5f3dzHIy182EpbazDQwvlIn058n0b2Wm23nYsZOmXXd3b7KHJGU06jsnV6igC
+4VP3r8jwlWMh48SebTrx/kTDPO7VSayk6PBrr6ZEDkVs11s9rVNyXmXNVzmBTOGQ
+fllmsRdAFCUio4pTECrl1iAXLGsp+OJ80PsgDHSAVwiWmfhm6spHvDCGi0yMakmX
+5f/BWtimwqdAv+75wDB7TnHre40Lafqyr6kCkCzwr1B5RyOk3QhYZbGaed2dmDID
+lsF4MppiY46FxTu0kQroZOZtq/AwmPtxL+2R8cXgTBL2Jh7oQDmIxOKrvLK4hCbq
+mv7kCmgBUtNqzZ3sZdN3Va/deIHaFAJen20jOSLlokAtfFzyXpiRJqVwY7B96yXh
+dten5hRnAU+g2GcIPXd9BtDgDdyfbSDoREfh4fhUQzzwewegHjjiSJlGHKycDeFn
+NkdjjKQ/QiL3yiqEEXDDBZlMrdyz62DGWRZQLv/ZWRmbBAi/ftIjuMzXsZfuU/E4
+sB7GPnEouoKEhCqIV83RPjPI/IqduHu7sUK9LhR1tB5KYW4gTW9qxb7DrcWhIDxq
+YW5AbW9qemlzLmNvbT6JAjgEEwECACIFAlcok2QCGy8GCwkIBwMCBhUIAgkKCwQW
+AgMBAh4BAheAAAoJEN7E0kaTHvSb6QEP/j0PUJRm7NN8svpHy5AFz74MhGQtkQlz
+89WTZHX5kf+Bx6iGkOpCP5Z4iJBWWGn0XpMPwbDOw5R4LiBOhGwJvCpjxFLByOts
+EEsgqPy1ZsX10zg6MG2JVjFOYHUh+BaWZzCtchh7cUUwUM6SDE3H9Iis2+7Fkfz/
+UP6ha0/zLZONIq6bIzIZHJ1VDvfgY7v68R+XEFsQZpr4EKrriBQQZ6dsZs5xDYLo
+BoljD6KypOw6Cv9i7CCZnQnyctkVDLx4EOll/tRX+8tkl+5GpgRDGPzL83hBfm7q
+QNqK2J3Ex+iPcTfMCN64DRyyq4HpmvEJsMG+jfHJay87jKcU2F8+P8kwL28eBDGV
+ngl1hWOiOvZnSP13s6Ckjm95bLG+RyhcH30+sy9i75JxoWfh/sekYOVo4NmPFRls
+SdcMOJ5Znk702wx24qa4EgjcgtID6yr2IsotM/I+Y2maKBAluYDkRFROqLz0jsed
+1gMBNPse0oMEz2NRbzk6rfRJcYqX+s8jsS/VhzGd1JIgoGRkvFZlQTAfRe8NsDF2
+Yif504zarJABHRoGzLXvlYuhEPXZhpE5l/7i2PLVCG0rva+jBqwDValTaLyemVqb
+mM1FJuHf6Bb6UND4ccgXCiOIH/cGBXiVeYQQxHuuw1JZ+UlDViduVrnpWw7mFD8x
+BiMOjwL4PFp9uQINBFcok2QBEADPuwkLt5jAhIAjVVWNgDBNyqX5mW5bMvCFy7qy
+QLPaCPrxpEGjKA+hvK8FG9i/KPUlsdReZH3JPAngUteU16iJo8HbDum93+4a555B
+Ea4+Bzw5q0qREZPvybvhcrk/S93RpC7NAvwMUieAmJMZJnckjrcznQTYljTcX/NS
+WODutapYbCwgPf76kCsYFLcbcFuOSDiRxL7iHBjx3eB/3D1+dZBTfoTRqHQ23f4g
+M9q0DuBpifKI2KBaDU8z6LarT7wY+S2TsPESZ65vk9L5cMoZZkefTUlUEzYzL8DY
+CmjFqyeji7WoM28ophaLJrsgqtAbmzZLrvlq5F1OwlQJW7fvOwyppnBgTTkdYM2x
+gSLCtUfccgvjBpAcRPhP0MjAAyj7kFTwY6uaVMqyH4PL+e91OWMag2ZDtQ2y28RY
+PFkNBwOlFKemYyhylwLdPT9hYUXcnwmKh8R3vpvR2lnxRomKkx5IpTFIBaapf9eh
+9VBJ+Z2lEEhAprag2YaAgREGI4Ohp9WM1DtX6+bUf50TOllP78uKMUASGETtIeTN
+UoxCktefm4kGAk11OR1cfiyAAnFXXbMGYPPH1/TtPZUSgasrwjW89ER1xrYqklam
+BWEXbSEn4XCmeNJX2rVMhXZb0rJQuXEY0rIkVcyBXHHwnbUPgWeBtlsd4nxLxJeH
+zBQTrwARAQABiQQ+BBgBAgAJBQJXKJNkAhsuAikJEN7E0kaTHvSbwV0gBBkBAgAG
+BQJXKJNkAAoJEEXaUXSWk5/5mfUP/3cgCzFWd6QXk/oTqiXNJv5IxOM83XCyjoDu
+Zuphw/rzj+kYiBkez9YMJ4G7eGqZZsxHLgBbLOrom/a+cS862os9iRTEE/N+uqWG
+I6gSDPWihT/cnbBZaNcj+FKFtpe77WNcFKTw1K6vKGH/PkmlQgC9S4YJHFvLierr
+XUWp+J8sQn+vSbT4ntvcdqxuxYtIvHf89liZI3gmPemkapfPJ1ZdS7nNDSw74ijO
+rRzz45aZetm7hRY/BkujmJQ/27UVZaFHQ2AddUSLAA8keFLe4N47wL7UEVhPUTq0
+JCIZOSXnY/twMrlWv3OnVRRLtnph+WwAZ6O0qMV611kru77HHGCudAwiglkrkgvQ
+je4uRIqRLmFA9LyE1726n7Z20H3r8aptQ7wj6N6Ir0ARMC2/mHhFv8bgOEKnx4Zb
+8rLwfv/fqYF0brvyzaIUU3UqMYN4uSB37Y5HfBmtIp7yGqLWBslKLvbrizD4gFm2
+TqInaxClbfaX69dHYM5zZQK3GNsA6WXuIKTZFIWdnqYfzu6ihJmtLf5J6uX0PVt0
+728lL3fsXyi5K42kKnu3FBTY1iOTAGXDpGsYBcUney9mcrtbhr1V+/6y+B7UhNQp
+fAO/lCTyNwsorPSAaAEGIpUKJ6YZ9+kzcDnhz6ZQG0C1/EFRUGn0Qf2xNv8+RtB5
+tpXmVyqUtPgQAKjTE4DS+Fe/7MYf5KjQC7pc3/sgJVmXfjO3z9vclp4zcm8wGQAJ
+XZVCzY9xkyPJTWGtLBxdmyKUx39ZbXH3BBj6g8pVUiNER2JoHDleb2/YDnmC1hfe
+PA6trfKEfQFRPY8OkQj1z/vTosbwLTZMD6zjGGkZZe/bUMEK3pvl52Du54vANz1c
++wEEK3+73lh3L8zcBN5mzlNZHSeAQMlkX+JG46y3RqQuli+NzF40/KLSh/LH7Wwm
+7pn7ju0sR0NxWyRpwx1tKJeZf8AzqSTlUEqPSmGuy1sGwBwf0f2HxGpegctpfLM8
+4CF4fYMvmLj4rSReRnTblbKmTmmiPDN1Qnm5qYHVPnNtgrwap9/6Xr2akJGlxcvx
+OyUV9xLDToPlde9PFgruWpzh7EiQbO38LNF0ckoV+1z9muPh0s9D3NP+IgYcKuc8
+pOa4U2Y+ExAfAmEmiSUpJ/7G6bCxrdaF0/DFtA5TIwnTOI0CTh9AOBtqPcTe0TGT
+UARO0X5NqLsQy+sXn5gXdnrupzijgDrLU9v3ke4oXGAWZwuzsEtQpAuq/jPJF2Gu
+HgYDQ2qkNDM5Jxxjo/QC9ZKSbkJy3oU1Qf0lJCum2XHDjbD8RAaqGkiR3etBCO93
+Pmp1UMXdYLNqHC32BUIqrBBEWyBvHBhvF5gdqeddGszTm8kD36VL44FBmQINBFX2
+5mMBEAC9NHGWvdZGzFJ85VLglbBRgqoaFMznC6Dz329M8Y+pVvPE/YY4rhX6FGxT
+3lOLY7mSpRf3PpRBrGf1Iz6IpM/ZBs2fFfL1uXqtJ++VkOG5ZRpTzVoyFloDndqx
+v6VpYjE2ljb0kxdyOkMPIRQHxRelQwHJyKZI01oG5vXr0Th8/1giPSTwJ7m0h04y
+iweREuUr5Q1kBr1+Q1MgmErngVm1bKO/aJoWMW/aPA3Dp7kh5rGst7gp/wX7veH3
+K5KTaqM4NinGgCNhHJfaf4ANBjN4+Ot/cYehbPUDmdrI3gcz95DSS0N0R5YgpzFl
+yHxJ3FGyCrtbNro88Qxn5/JErevx3GDsvhsGBWrywF4VnFvoG8R5O7wZGpd44Mpu
+YngouH2n4O7oDq2n/0hIi2BZsVBO8MRxEBJPZEOwkRIBD86NXjZrA6LB2dQeg/uT
+eNdPAkxhhxrA/nDgYILNVDIIMq91DpjQBPWp9OO+mHhcM0eeSJWfONdK1cT18kfV
+v0r7fOGtFJvJ46EQvlHMORYVHsFZhtOsHbbybSVQeqqf86YtO1wDw2pEjRdz369V
+3bMd76WsCx1g8p0PursJO5l2c7Mha8NzSRbM3yeKuP61L8JKHx1prp6o25UOMszR
+JaQoYheyduhc49KfnKLj8i9593KzpIfvMJpoSCBV+OV6AwowfQARAQABtB9PbmTF
+mWVqIE5vdsO9IDxub3Z5QG9uZHJlai5vcmc+iQJXBBMBCgBBAhsDBQsJCAcDBRUK
+CQgLBRYCAwEAAh4BAheAAhkBFiEEPZg8UuuFmAxGpWCQNXMSVZ0eBksFAmch9N0F
+CRTtdXoACgkQNXMSVZ0eBktE/g//VfuzVv6KmNZClp3nT9Z5tZ/keOUpV0aElRjh
+TCO//OqigTVnsdApEIMGhkFmHPFRd8rJ6uhuYYtM6aS89/YhsGlPcDJOOqSipeSC
+No9eBBTtPAuo9sXvQUlO5frEAWXT2MNRz56af6IoMVYpr6lLJPlXG4UJ6jpNwZPM
++d8L2PC+riDAIjXDQ+ZZv3sqBLsSMb1OCKCTu6uaSeSaA8hPfgMz/6oyjcFLsATR
+wY9ixcRzjxHqpuiMWXK6yt8VK/+cyEYLT2p5Kc3sChjtqLSjcYM+rousYfBy+qUZ
+eOhZPgtzbTdIu6RhZQitRDlf1HQb2dLGDl+AtCZQFXxY/lnSB4D3JHYGjadZ9q+4
+pU9v2shGear7lTXAwNq356I/6EooT3iwNGySiehBl2sIWB8PWBDa5bibLdhmlYCM
+XLAFA8v4tgoU+/eY5elo0cweXVu0VVaou5XNTK4bVAUnoLCdd7kOtqUiapGxFFFg
+8pa2VzB0G/Syscf4VS6uw312lUQUCggj01ZggRFkiqaCMq+ldp3zt/wVShuU4zlO
+Ft6nf/wGEaFX6Nz/uWy14NZoFNO6i0SA2zL29Lh8VyHAeEqvwNvTQWyqXH/q0JJa
++/ANKpdOCYZoOGZK3kLzuexwGFz7v/Dhp61QeQXlPxKwk5BWR3zFuD1L4iECAUK/
+rSZBcFK0IE9uZMWZZWogTm92w70gPG9ub3Z5QGRlYmlhbi5vcmc+iQJUBBMBCgA+
+AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAFiEEPZg8UuuFmAxGpWCQNXMSVZ0e
+BksFAmch9N8FCRTtdXoACgkQNXMSVZ0eBkvNKw//aY3KISL+gJCDqxJw4jM1KG2R
++yCj3Pk/kd+Jn2V6w0zcdGZNUGlDKju4WC+pGfhNt0sPEFIBqVlvqo2g8LWzYMEY
+ObHGmGGExdcNasSROEecEZCEO5tUkO0mIGVjj34Uz+2vEqA70cIrV9OTXjbCTu5/
+5wdMu3WhuOs5nos23wuuYtsSELW0rA34AH2E64YlNQj/kaa/NQbd0kmqENuRrrua
+Btm37mht9rpazN4leGJ058/33F5MvgGvJlXiZeHPLWAGqcqvdV/S0DEoLnnA28kp
+MjoTc5mdsqrlFzbKzGAmPT2GsAOId9NFR++A1ZwRHnEykQZPhpYynoJLBCRdHn6a
+adrJmP3UlDEpNjr82Dwg1KljshhDrVQ+BpVDSuBjw7g1BzX2iFoym9Z+ZH8Sgsbq
+4rbyyXXipO5vvrENCIm2K+h/Se6Gp370lIc7N1YIfdFxdNgf8Xm2gsjb/N+TLPYm
+WA6+/0vAMA/SfQMo+8KzO2R/kpko5SPy7aVmc+/wI/X8FcYFe4dhHpp+pdGgxgUe
+KJJF0TMBnSYbtUrsVgZL3eHMd6KhA7GioE/JknpuqDjVFQ9Pqxsrw+S98HhsJJll
+KgUBMel5SF5nnealImOk+At7oqJOC3cMDdl1ljq3KA1OzMTQPQ2o9MqVZQCOqN+v
+c1R0nTsLBeUqS9sDcWq0K09uZMWZZWogTm92w70gPG9uZHJlai5ub3Z5QGZpcm1h
+LnNlem5hbS5jej6JAlQEEwEKAD4CGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AW
+IQQ9mDxS64WYDEalYJA1cxJVnR4GSwUCZyH03wUJFO11egAKCRA1cxJVnR4GS8I1
+D/9DHGPgpK1w5WF64fZ6OmksJlsXh95u4YHmP5skQoazHpurH/KxUqMPTZsJmZJ6
+hbbiEmuv8DJWdNH2+m1YbJZMsBFO6Yccf6KjiFhWHhqBX0VTBn+OoYpNZ30yxP4z
+p7QdJtF5+JyhOa1FzKYPBL2xpNLSqOn0FJe3sjXpv3LuYKhWxVD9MZcLdxbILVIB
+H9h/fzlSqA8eCa9Me09MVjVBcpHi7odtnyiJCEOmom1fjAGJxIBjWswc45pNXk9L
+feaOtIAkP5wZykR5ja3KwnSKcwyef137UFmLXYWUslvUyN7iCWhcEbuS+naYZm84
+9a6+CXNt2CiLeNCN9aUqE5YB4A1hsVrXRPmdGUMqqwqDV32mtkWHm9fFKvlIBOmd
+7DrziXp/TtOCwn7ssS09mVAywuk7emJbQ/TZW2ErTE9+GBvEVbDsiDS+O9/O9FL7
+EvLbZ9ZiQaT7Gaw/1sFpph5fzuKH/2QjbtNk4SrSWnSTaF9E0b1sw7PZ0V9so656
+Q3+xE8Bxk06r02QtHDMhe1bBVrm+mYHl0xGgOVPGP4JxyiGaSrv4m9tsGuKui+6R
+UoGrD/+RofeJ3yprm15MwsZ/l677LVQOaJW8+g2ZHuxzgNBeFXzxgpmKOkIni8Er
+5aBLXZZGunxMeix922d8veVIoBh26bI8KSJdAbfngkJzR7kCDQRV9uZjARAAqSfp
+goyJefQfvRg/deF1BNZKc/c6Vc2E0Tdwe44xQiUlAKv7V45v/uCWuNDeW+LzslqV
+bAtQZJJQhgOzPjwonUH9vb7DDCXZAUaYSFVu/9WAVCXa+LyNn3DlYZjnCQylGDDj
+NephM+VlS5jj/8CcG7Jq849trN7Pu8miAzjp6xwC/kFiaUhkGHRX/9jBlD+BJIEe
+0v0U79ztHU5jYRgpto7Wi2EKLjquUcM8fAhgqXyjBPgJUENcDBpv9xHDMG6iK0LJ
+pje9a0rQQMjFPFpEJRrP2hZEdhANtaiHmPw4v7EZFMmKqlYA0rmA6xlgf1tQPvWB
+zY5Sm4JWpPA6oloTHaHQp4cQAOyhkUIzs4lBfAI67izZ0f4OSV2YN316TyVVL52b
+Z9hDxD8OEpMNJB+UMmyWj3E0/UT6LJpwia2++gShtEjmcAvLoSOp63Jpoc9kivdq
+FJru+480XCZgCMfRw2AjXSh3oCH9EJKVK/7ZfCWunjlvTgz6JeLuPiBEhnGDtung
+D7qjvJzj1TFwj3atRdO0Nvv+OnqZ313pCgLQ8xekmqG9ctSSekD31/U/iF09aIHd
+saTzJoQqGnVmFXjKgmCTP2fa5pvsL5gwLaH9+oqTDasFaq6UdbOuLQWYld+8kLKM
+2pxg8P92spjaOQMlyViiRztlmKa4jehpL3XPRX0AEQEAAYkCPAQYAQoAJgIbDBYh
+BD2YPFLrhZgMRqVgkDVzElWdHgZLBQJnIfUPBQkU7XWsAAoJEDVzElWdHgZLB+QQ
+AKCzJ+0EqJ8HvtpmuxmQYMuh80TMMDagGzA3Vg9XrVMCW55WpjfZrrp+31IeSIob
+DMGiplsZaEkGZj7a+FIXH6Goh8aH05cdETZRWYPa3AMVj0suTZ8YEm/cXKh2BfRu
+6zXuMBVXNpVhhBe9TJK0SFKNkbvTunDhvD7qIJJ6r6+btTYMRt6VCE/MGuR77kfo
+N8orZq5tpAGyi6jLK0gDMEsNuPzXpzZJRUX5MCtnizDFMpM+7p83kiZqEEwU2emi
+9HjyKfU1I3QekW7AmQAj/YR9zV+9cs5OtqR+cUGbcltbtwqexfLC9ySnCoxPxyqu
+FqFVXmBXongIAWnnxqiYol5V7CLaVmBI57s6cjgvQt/Gj8jcfiPkBmFbzGx6ivIh
+pG+KvdpMj4XUQ5cBQL7z6X1KYggk3UxEBigNC4MAyLeHsaEYpKowXLpRrgFYFUHD
+vUSym0C9s7iMZFX677tt6nJs3dJScyJdkJOhFfnb0gDQE0A1WMkQx8XWqQehD5Pr
+qv9ashfY8zaHlclnZ6QqYKHULkIaoVDNGZCkLiwBid0+PvdGvGhu7OL1TDPCng/6
+E727g6wZcxMYZTAmewva/KIuOpb+QWy4r0Rsg1eeF6ulTIEGfjOKPJd6/RsVd2eJ
+zymVrCUVcPvLU8nVKsgJZLYsBeiq4mtaNJ3rvmUeaaZImQINBFilU2YBEADQf/CT
+tDpsKjzVeGJa+PIJq+qjdEWU2KWAcarjyafNQEDjEaW/FSj5k1PLWuz/GLdPCH6s
+bHRu92vYUZ1gU/GehUKirz+r/fPI3T0l4MVL+PqldE7j5TOf7WJ7y0OXzNzbUWWd
++7L9NkN++c7Dd0F1CbGsVsITn0lF6P0G1g5oee1i5RWs+l5JkYG4b5Yjzxs0Fn9E
+Ie+Ka5bdxF3r4Gha/zc2BVScUCi8raYroLRd1wD84UunrTjxHmVkLujHzeIX130A
+cKKZ/z025DeVkyGAO6d0gF5KaET+O/emlHQ7/dvY34ol6CHVCnnP7C9VDQL+3Qr8
+EBclXh9KHbASMgaU/iMYmF+7llDvtivc5l2A7NypLPOUW0RukmyGnLj8M8LtDzhV
+yP7apG2tXEDVZ1VaHmvDcbwparCiDzAbmX4J9QD9m7s9r+V0yEFxGAKtsvVrb8Pc
+ZHhtbuGJaFMrcco222pbPCGYOclqvSXQr59/8+qkP6lSKnYa6UAGIMVHW4LmOznA
+vBm6akw3t8QYlKByb8C+j0w0lVpfkDwol5+VDnTLnE/aVGw0nDgvWwyq1PrJz1Mf
+PrHi0nFKVizuZOD6mlncKFPuU3cNaSfkv0iNg5tnIalGIsKbxq2fjDhcHAfxXEFH
+Qb1e0DkgLB+cApLBX+XsEDTCLiMPqUN0sggHHwARAQABtCRPbmTFmWVqIEtvYmxp
+xb5layA8a29ibGFAZGViaWFuLm9yZz6JAlcEEwEKAEECGwMFCwkIBwIGFQoJCAsC
+BBYCAwECHgECF4ACGQEWIQR0bN0YYYY0KGDrnrVj/hDq1V0P2wUCZl3cnwUJEXrw
+OQAKCRBj/hDq1V0P2xxyEACu4krhemDHg6kxxr9mNPEf1sPcZGA286cpvNfr6+yB
+sbpqLuu4QCSJbg4hkPhB/hJHhtNpg0gZJpITEdT2+J+GKEIYBQ5IkGLxZl8uSFJ8
+3MsGEzLKfFMHoBpiPwAE0ajWI6ZGhvOFkuWDBYVSrnIG7PKA6OiNCD8VlrOMwOU8
+X6jmjw+zmUni8iDlM2zGjgZcg99zdZnAPuj5VbrNMya4kTNZVAaA69QmxWyAGJI8
+DApwj4ATAAQCCB8MCzYwKEvyF+jdu9AFLeK1RoMQVZzxXvDBsSg0a4xHYMcHrrxP
+YxkAlU1V1FcZ71Aw45rs/qJXKlFiPzOnEGezJUawbNm6Zujx4vyTihtBZxaHMuNU
+4wcrF4zUck9puaIXzEFuTwkCLWkb6xWz+X9XNVsF8dYJ+2klM9q3rKtDBqsnS+WM
+E1g9+TwpSyJrf174OTVztlgAfjeQfLeYmTMEl7FLDEnRgyHK0aHeFHwxKllZD0sI
+9Qhda1MKR2yPnmbsY39cV4+cVzrDwW25SGC6X5fSZtK5PmfneiuHW5EDRtkSODXU
+i81fYGCjtlEgCJ9y0Iv+Pb7aLulIWUfqTYWRbNZv7kSOgZ6uU5hcjLpO2xfcV/sD
+Qs7iffX8Yp0/+Q4/wxU+Xb8XElpei8X3XO63/Mvjym2zpIWLptd06h8a27E5PjEy
+KrQzT25kxZllaiBLb2JsacW+ZWsgPG9uZHJlai5rb2JsaXpla0BmaXJtYS5zZXpu
+YW0uY3o+iQJUBBMBCgA+AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAFiEEdGzd
+GGGGNChg6561Y/4Q6tVdD9sFAmZd3LUFCRF68DkACgkQY/4Q6tVdD9sc/A/+Il+7
+/pixpTIXkQwqExrTAdJ+jfzwyJ0CDZc8Cei3crfZNOwLMZ2ZGPJkTOURHkDHp/+j
+JUyJOBPwXeBWGR28ynGASZ/ydhLBGcTnVUpDE1h92D/D1zJx5i/yVwmsWxiP5ZyI
+Ua+RX3cVUJfYjLvljNrYiD9/cm21+Us1Kgqm9q3omMZUnarIFRmj9uIJ2HNO1n+H
+6HpifrRGl1oI8Ru/NA48wPaYfrB/Z9QqRmv8UhXRXp1q3REQ70d7odvd/KS7ssV8
+O90vdm1FSx38B21ZBgr0d+wDDVazzdrdi9Hby/4ONiAz2LoLDB+TuoUV8nfvyRhB
+KQTS+pFfEPP8U9cM5gJeQzXB/5LFycopAjPzjFolVtXRgXTGzjFmoGiQ4QVXtGA2
+Rp3ohZnoViUJvkcRXZ+RWJ06tOg8IGpk1LhI9M6B7YXTVMQq3/L/89oES3Sro09R
+wUw7gpglbuHdV4SrLeXotx15cnlKUOfU4oekgMEU3xY2ojbJOOJrchlBhw8s8tlH
+MhOWoI8ea8Pf2RpuGK0sBFzenf9naE8Q9mdcsK7OQ8smEhlueGu2devbv1wpDt3e
+UN+oxXN+b0hXg9T8v+NdmuX4fQ9NE6E1MU01K8XdHBtq+IrQAwT2IffdCS4Ghgqu
+Tj/KRJmL/E7TZYhbvCXCMFCVlhZHroDx+3X6vlK0J09uZMWZZWogS29ibGnFvmVr
+IDxrb2JsaXpla29AZ21haWwuY29tPokCVAQTAQoAPgIbAwULCQgHAwUVCgkICwUW
+AgMBAAIeAQIXgBYhBHRs3RhhhjQoYOuetWP+EOrVXQ/bBQJmXdy0BQkRevA5AAoJ
+EGP+EOrVXQ/blm4QAKlj9eJPZQA4nxda5qf8qMc9061mzs6vBsnYiE8PZF/zZR7e
+AmVT6Nh+MQH3D6j4FrbRTC+KjJ5Hl0aFG//V1U2mEckK4VdkYHxWMTyJlZ91TFK/
+vPhdszmhOxdhT0gcA9CmbGhnYb62t4uWw3T5s6bH7GKPuiVBSLu18QryiiHHXzyu
+jDB9znlJGwH5DUsO1jXirCVduiJ8+KSAU898s14D280ytMl26nxQE5n86jIe4s4z
+xOW13nKOLSnF7YDWhkpDSegE6+Kd0X26PiqRuMHdknbV86nktn27wP+/woNyzaDF
+4Ga3HXInW8s/5BHtQfhcuA++pHWrYZhPiBzNAcsFIim1Zv3GfxM4+lUbkwddIaHx
+kfMmuRKBYVA9/3TIujuAK8ovBHl7/zB9WBeEnAML3wzSmnAFnQdyshc7WAMNh5nB
+hWFTa4O9UmPRKdIfWdNVEp5TDor62r3R4Khjij6LPCnTzpX4OmwV6keRAikDYH6n
+Kik4lrXwhTJCF/HsXFyNhJWYsLXai9b3oiWrayJ4hX1WE8eYc/Gq7cNlHHin4wDD
+ftPpsyDBq6WYs43U4x4jaKsiRWgPnZdYPIbL0OkDtfH5Te3VQqHSRTeyuNtlVWJb
+XHn568yDeIxA5bAlpQWIKlui1exTZtyZIVMxOSaEBa7AutGnSW0WjaCG9YV+uQIN
+BFilU2YBEADWFWz8yy8cS3z+fnj++pL974UMe0X37GmZzw6EUHePOwI22Xl6DseC
+E3LpbnRUHlbnKOwLm/R5tUy5fXgXgAi5REntWJ3iJNgQK2NxG58ow3la+8jRMGdk
+GXhdtH6R8JG/jFCUUdIbT9FfhvKUKRT5Yja/Ai/Vy71abyzNuNBA0i8UejHntFHX
+//LCwVyuSN4XgorXLWLg/Vg81j2C2kbznfDLfdEzM3OUyozm1i1InIwT/oRAyIRk
+JbgmDLRY/qwED04YmDcteDemDGbDdTrmMSklMSSGR6M9V429EFjLdVEWA9YKX/BT
+Y6ZNPL1R7E/IQtHS20JJzKvFAVeDz8fPD1N8sfulOaZvx6b+UE+G+fcv+mUP0wEG
+2rlYgdIWD4rOQh2+eLIPoPDaVTfaPy34B0EYtk3T2sDGXlIEG3wqqRFkSxfEX4Qw
+gT8/rvIbmzi0QFGrBKS5WtMA2sz8lKedXYlRqN4FaIAKRj6isErqgxvRyZRmhWyZ
+khfKhwcoMZJDdjbvoIEp6cos18QQYKYczKz7nbnGTpjT1IFX2wik/vBxRYvgW1gP
+u/ZkmnsbuG2RRxtXKiqs7GInoY16ptMWTjilAanv/XSXpCHGfmBmeBGnJHo7hCxo
+TIpA5rDmFrIgGEKZhvaI3P7+BKuQ+SFq076NSOReGpnaaISmjo9kWQARAQABiQI8
+BBgBCgAmAhsMFiEEdGzdGGGGNChg6561Y/4Q6tVdD9sFAmZd3a4FCRF68UgACgkQ
+Y/4Q6tVdD9vfPA/+IrezMN9C3FJEwDYuyJ5uvltgh97NdtCelvJ9lvwa370X8G5f
+wRMdMMYa02InhuskSuArLuIsvKYETcLiEZyiQaeEWvuPqSQs1Y0gIjmAz6FIQBxY
+JFZsc7GmOeuq5JKBLFNhN3g7bSWGvm9/+02swi6IuLwcyoUBbH+aPoGQF9yZlwgu
+ylTGozu292ZtLlr9iS1foJVug+Hl0xacaiAAbRxNqR/EfHTVj7m63DS4kTJpfLb5
+ldGWZD5AGdvUTytJv8eDMdOGoUnADThIILgneXu33SUUoUwO3JiDPw9dicmez+yP
+M6l3H8E1OqfeeCUQpaTLlAGLYSCrDVH9iMXANjW9/W+y9pioo14gsmBft/sIY88u
+TxbKb3H2NSmk8IM4fc+XduKGsxYVEf9IWlLOpaxtD1r056NBJsjjbpMjaWywW+zn
+aXWBRqRy8BTf1/XOtXXpqligXAXAzEbDIJVTuQ/KZql5/dRHMR2zF9kdjKJ+d7Sk
+TEw772uVyhuKIMqtjp29jwqcw63BkmJ9k8jJC+yXUSLTj0WMKoI0DPl9cQSbE6z5
+LDGtZ1blbieh6whwYvkcOBJd6vSs/na6qqEIK9oMsUtG9mI/8q2zWV7xfGl5o1k+
+raM9hP1zGCymc3FdhrjqB8zB7wN7oBW7Or//Ct1ijdR69HN8aTRknIj6GPaZAQ0E
+UiC0aQEIAMHzTknImxjohJjz+EIl1DB09sJ2vBmt0vL5wkM8KccaYA0MpmOMqooz
+gyqKoxywdOO3Phqk6n5fLtjsqTgWoG7YivipiddPz77pnMvnm+1x5bbNCBKdGQZp
+a2gkf5RbEYwjEjPgbzt5FHzpQT7++oVfVnWKg0oeyjsTXGxRHLoRxqAhDSWrFHij
+K+iW1E7n9eE2DZuPO4ATZRr9zUoQT9pkCIoGKXO7+daCU4aViHwUfF295ukKWg+h
+Ldigp/eq2xGICTo2zqOMmJU/PpVFv19ij8O/jOLKuQjlTBOgDZ9vv3OFLAp1YBeR
+rUqWwcn7FZfRjaSl0lYV/3bXsp5+NYcAEQEAAbQrU3RlZmFuIFNhZmFyIDxTdGVm
+YW4uU2FmYXJAZmlybWEuc2V6bmFtLmN6PokBOQQTAQIAIwUCUiC0aQIbLwcLCQgH
+AwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEC8q9jUqRTyt9GwH/3BW2Su1m6H1z3ad
+S3wrNZxgvF9mcsySFh6DTNzRzx1g7qlZb0Z3NATHgmYZ50Q5Ib4e4ga70kqUiiOW
+zS8pZjrKU4cQ+dGj8XOdfJj1j+xD9lrbXFHw5w0B0adb8GM2R8Evh+1lv2LXLwaC
+Iu75z2+uMdsTgJZV257tGKqb3avSvmo0BPNGAXcRrAo9ejJR2g1g0XwWjFSCOIah
+fUEWA4vivy7+wrgAqYER1WyrYoQ54yGJuJgcQ1T6HjJ6dHkFfWmDMPz9VrrjMLWP
+Wz+6ZPCsRUNM4K/u0do0gmxel0ewguEH269ImDyovYMi75TPmkeLLgM6EickFa+9
+gB4WEKG5AQ0EUiC0aQEIAMQGNvwuaaa+RXHMHMaRdocdgLP637RQqqEncy6b46A2
+BqZhLWf1i1kSrdaTgsgjIYlTWB6jxtWDEbwXeVsJK7gZebjZyb2sO2/26/aT2FQ/
+jrEnYXn6f5QGXjV2OEIaz7+jGKGRCE6HCjGbh2O7yCRFp6AM3tci/XV1LaszERb0
+f3KB7V8HDW/h2zAgQDOXabv/c2sTt4tQNSwPExg8gU1xWNpsnUNfJ/O0o6xLUUkj
+7Z+VGHmag8EzUermS9TtF4/oNlrNZPD6GZTT/qw4Pff0t4alAsV9jc5J0tq7odS5
+X/38WGZNF9GAGCtSSAHZFhNoxetz11Z0ncQT9S+71K8AEQEAAYkCPgQYAQIACQUC
+UiC0aQIbLgEpCRAvKvY1KkU8rcBdIAQZAQIABgUCUiC0aQAKCRCi0IsGAXXWCnEg
+B/9fcao+ET8dLGl/ASL35sPv2W4Xn/sduwB+FdWtrgfmrK2a2RW1cY4KStgY3suT
+8AYob0E2TVm4KSu6TQrtke0F6ViR+Aione98tDMaOn4gp2x8ZVe5ZiBkdNLbDvG/
+l5fjgl60WRibkiRJp4LiyXKvjXDxs+2y/cODZNutGL9cus/IYshMUXEgztCnr8AN
+pjLobgWklRF77Vb2Gj0Xyok56E1U8hX5WMI5SgguV4mOg0wXpiQytgHah48ZquWx
+9I56EuODmCsKdXJNl6xdcYZR21UkS0mWeU+p85nY0mRwE1MWPN7IH7S40vpRi3nV
+aC++3YneSr1EGtQZxJmVZpInj74IAI1yP3KldOts74awN5YOXiDbbh/6Mtkelxpe
++FzSeiHX/olqZn+Om38Vme2ntU9V2Y9fbtxAo6VboITf5tXP3FclQxOhM10rN2gC
+UOPDIRrNDXxRWoDjbbihpUJIKbVTYWtqbQgSCs+S0rUROK5/+sAkMX2WZ4NmyADU
+XXCTLRpSJ7bNei4OFMSJtwhgFzXU5+YCaX9NRsnEdCQVga+IDFtSFSSo4cIfECND
+FuyfEnjto0mI0sosCtOv2yeNBLkl3sS3X7/F9UdinPcsChfR+1Vrk/zwtP6EdjIv
+B+5MMuXbP4f9mdDCCUSJ2Mte66kuds2AL42AME/4M2tE2aB2HTWZAg0EXEM+0gEQ
+ALzF49pa+rlwMwFi2ul2ZHbRhfnGsNdR4eC55JUT0zDzIJqfYKrUBzWMdidfGngm
+Peri0hL0mragBurHK8Ex0lioTPjPvT14OdgFpxlBwaqiMuHccjY/uWaYrGQvytLd
+DdSDTmZhP4zCCZG8g7X6TBBNyrUB4H3P3/OKSBjUm/VHzqAfwbzg49slSjB0T+ZP
+elD7ZRCdqsJU8ndYm1k0Nc9HOySTS3mH4yDlG1f4I6gd+y9YeIRROYcx/KfDj0Yb
+9gXqMtJXMyUozPeN0548gCumbYE1S7wO8Sf1q3p1opHgCH66MN3TyX2PzAWEmd6e
+f/34Q2Ob2Q4ZBY6Yf98Qg6UwABNV1kR8dV8BZuAgI9Ks/KL6/cAITi4ShrDzkuBs
+ABuHN2zCUt7MvFLsstOl8NlQVl+SGjUxIZdoJDjvn+JUB67GLrUHZVyYfiU5Ifsd
+g2QxjyCAaTb9Ybfl6rw9mZ7w+9dSYu75/aPPL1cV6Qiv78qzZNyEJNgLDpuFIs9r
+X0dqkLG9ZeA1xjNnyNQuoFewB+Pg2fMFOfq7mewnWt4Dwag728tpB/csOCv5Rj/P
+7o3jviUBV+vR4h1bORY+9fx9wEJ+IH3jis+v5DnRFR9z2eAgo/gmx+WFdOfrTVov
+ivqqQJwFWo795GFvi8IBSjtyx6ZMrMj/TmigZ9C1nc7lABEBAAG0Hk1hcmsgV2ll
+bGFhcmQgPG1hcmtAa2xvbXAub3JnPokCUQQTAQoAOwIbAQULCQgHAgYVCgkICwIE
+FgIDAQIeAQIXgBYhBOw8/oj2ygeId09cHRqkS+ZJ3nYKBQJcTfuZAhkBAAoJEBqk
+S+ZJ3nYK470P/0WLos6tT6JgeN8iT7BPyPKEXVg0BOeihrlbvL/hCVc4jIqaRcz/
+R9ofWFk0Z/ipUrh0FR7C6EAswTO52RcSHO52D0qkH1Jodk1HkNn5gejbTjMnzg/5
+olrsXwU5Jxs0CIbikUYLuxDG+0DPSyQzTIux2E2Da0zyUzef17+s7gQrtpHnmiPM
+T2kJaFFLH8AphPvnjkrNe4JFOTLx9Fwjxh400s8ix6hXdA+R/uo2LpheXTJQdXmB
+AwJaqBt90cCWN3b43VFm93N8Q4tU8tfj92DFvfqL04qS4IAcugvZRd/NwASWW0dC
+6d02L/FjNKLPMRgF4htWtu6qIk/XOaI9QrEeJuRTdOFllRuicpE1U9B7WE7jsLHK
+PVHFeXo23251rdb2jDoqv3oGOzdZUFKqy6iGpoCUDELpFxyyWsTD/s3uXxLjbcsk
+jplX4W/InOZICqQs3P+24VIyPvq4fizV0ttG/wrh9zDW9mCrL/iMiEEXJyfb2Ew2
+8iYpsycsPALsr3aUEZDqGnvn/Qd/Woc6kNqLJX1CrOvexM4xcmJibdpzlsOolv0y
+Llg80HY4PfDdsMwZPn55aObD1GJhPmA2NjqdmEOJBL8+0hzqXeLYZoGNJ26vCPjt
+OUJYAuPdmKIQqLJtqcrn9hd1VcZyEueg2TF4jVhwA1mFfrQVYTJodmxrtB5NYXJr
+IFdpZWxhYXJkIDxtandAcmVkaGF0LmNvbT6JAk4EEwEKADgWIQTsPP6I9soHiHdP
+XB0apEvmSd52CgUCXE36pwIbAQULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAa
+pEvmSd52CuiSD/4xqtmnQJJNSD7Fce1+Wq4Al2iOaN2kxvjegTzL4sxmOAsqkwZm
+AIN6kT1jeFPsMTRYM0N5z36bSSuhAwQGOC8PpCkeKPKOcz8owI23Pf23uW708DBZ
+jG81sRlqCeHIfVvsA+FvlvLLJyQ21YuQbae5CslIINyj+6FEKcWfTE4JihJj7nHv
+czkO/KviyD25ISPcwkv9VQh5Hlcp/k65wAqB8e7CoCaDsI1ZXG1t0tLHQrmhoN/l
+SyN79yKUOelFyF+kVXi1/c1Q2ZwKu9gIHuBx3MY1/e49eoi+WYWUXNuCebaUpCYB
+7fkQEjihyRjyIrwqim0CoWHNRuDGxWxs3JWi018mt0OHpBc6OKIXdoGu5oIxtEif
+miFOcAmMRFA7KiS5vrh/520M108SKEIR+crm+DoVvPM+i6cDxoS780tkrjySFwJW
+xsqx+9P7kWVpMChf/JkIzArCxGJGfQ0QfNea1E3PQiZJHjpT10FG8a9nwwIItI98
+gFMZawu4xEjv81CayAm8QoWAMfSjFhv9j7Cm6xgADCogu/qupmNPUOtxf4NQxBdr
+G/m4LjHVnO0hI+uIxVH/cCfr41NRd9tQZIf0FjAAb+p/uxBZMJzZMpQkeR9W6Dhz
+tN0zU9I8i2wRAke/zLacLeOnOPp/RDwpkMr3VNzFTzkb2YHtYc77r36NtrQbTWFy
+ayBXaWVsYWFyZCA8bWp3QGdudS5vcmc+iQJOBBMBCgA4FiEE7Dz+iPbKB4h3T1wd
+GqRL5knedgoFAlxN+lMCGwEFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQGqRL
+5knedgo1bhAArI7kReYq4YtaxS8Pxb5MdPxiQVtvfkbycWCZ4owzPeEIkJqcbadN
+UiGSqCRR2xeT4kuzFZWILiZfBTwHwFM/bXRDK/FOn7F8aqUAV1tq2W70Z7BUpTwp
+Av7Xm5YvsfbTBZmllJltEiIrKIzULCtRKKVXgtOKg0sd/W2aXwyl+OX+PVzu4mXX
+NEkO10J7VpnCvjyaJNeKgeJYQLizSWdEf7i6RX31yC29+GsSqikaOHdfxJMM+bo/
+x/aCuYlgDB+OQ6LZzpXZO0C8B5SMgMfZaK1rxDtUtViajSyOFJ4Ig6bcgc5qDCLn
+k407oEN1yBWps867uN/Bi4Dk+xh691feGsyq95DvPis2Ut+0X0/Wi/uLg3uu/X5E
+cNHynwht7KaGCLeuOZKxvzfeudNeyKFX34HtFyE/2k9LR0mFX8XnXQGBD9psOxcd
+2K8Rku9BjjKDZ/vf53sMh5vxUNo+zkd+5dLZWPnLrhkfQrepDBP+Tc/6W0VSZCP5
+/nKX6GjPwmELtZj4jGf33tgfNMJrmxGUjpDxtiJc7OroNC4he3F5AF4RNRa5VvHs
+6ah57swVvKyJmLH5mxxKIn39PspOhzVxSbkWNPLS+km2InPum+fmYKQL6IrHcqt/
+ecrR7o9GRgI0cJjLJ+wv93ti+gxsUWPbAUBaJPk24omIpQafFT/YAEW5AQ0EXEO7
+ogEIAKBUkmdjzOHy4efx38TuniP7255O9McxFg5LSSQaEcELsmbELDr8S9udtOwj
+QJB7IgkeWY8ioNWBFWOKNxNZpx3e8h1rPMf2yqzrmeXj3IycDbe0jJrhVaVscLcn
+jH8svzgDgZok78VUXa+/qFWDcgZuimnkpf6mvqznpOJZ11IOoyCNvutLONa43JEr
+vlOhy0vtj9mfqy3dmKg7stereCGRZ/wlHtlpQUhjo/WpLmF6IIc/Q/FAlKu2ljMf
+esomgekiSPGewH+wPQLTlwB2XNcFNRVM0tj4M+VDsV5GQb5Ur3VuuIbi29DyiGES
+IL0e4m7UAow1YFn2p5TCxdom83MAEQEAAYkCNgQYAQoAIBYhBOw8/oj2ygeId09c
+HRqkS+ZJ3nYKBQJcQ7uiAhsgAAoJEBqkS+ZJ3nYKHxkP/3Aq4iVpExIHUAwLCEY9
+qpdlqGsnrj1jSMjgmqkUq/b9TmEoc4btuKFEB4SPulnOGWAGuRmDVIF1ne8ezW58
+SWd97lFACl0Ob3d1pTlI/b2ISK8lDEqMX3UR8R9+XS2vHHO0GKkjn/YP6RpLxyc1
+V/OjlkRbL9x3oBKG9FUcztjZAdz6aVpmFiEG9O3ALpq9c2cbnlZiChsYQ14DCTIP
+TvYkXdevEVv5eRwrGVr3JF1Z0fEl3k9gmqwoz6dV4kzbbo7A7JTbfmB8iEg/ql8a
+oX1RUfS4WgJiRWRRKNV33pD4KPSR2FM6u0tbU5jXV31MHGN7jYY61ztf1nPHWeHB
+TysIISsX3+4kgkqWrsjTysxfesUNO2LPA3uDtkGQMOJk74EgpA+39rAD00z611rT
+aHJ9CiQEGL6/xv+IqJ8oh9Rqo8OjU8Dm7GWN2W7JfwBcii0qMlcXoSWyLPttWlwh
+zRlc44Wv3KWa1mbnVg2Y7MM3OcQGaiXagFl+yTYbnn9CBKEeYpSe/MoA0EZ+d9L9
+r8rse/ix9kBvnw+uXo6ZBKuSaHMWvL/gE0sqr6d3izxVeQk+nHc6B/cOgjKeqk0X
+RvB/nZTkiAlI1wk38esDCFobVb5jcsN7tLX0zRxTN+0RR6rcl3z2GiKMLva11tr4
+FF9bSdx+8RyyT1CJ9JTW29nFuQENBFxDurcBCACpIzhbHhC+8Ih/yKz7nuYsmFx4
+HaQu3dVHrtQVkLTLByvlXSm9O67ZTWhQH4FVgL8D1R2e9ZPIN5/fFMLHSECKIWGU
+x7oKQ4M5qWbEj4rA/EPbvr7vS1zF3y9HYUm+INArD3p/aGUsCfFHjsZSndw98iBV
++S8hedcsxQlC8GFd5eqBiE5wCmUjrvuf/NN4WMG138mq3IOgnQN7Wh0TIL5lkP8m
+jmrzRLJ2G9v30EdAyAtMlMk9bWJFXYArjF8GPE4zCqaX0vHgdEilX8gezcxPKESk
+QD4j94qk7pTECkdYdnvpmbwEvxHCd8VpeMy55GEgYwW0mcu40VzmY4tdre6HABEB
+AAGJA2wEGAEKACAWIQTsPP6I9soHiHdPXB0apEvmSd52CgUCXEO6twIbAgFACRAa
+pEvmSd52CsB0IAQZAQoAHRYhBBJ2ipZ5WZAQeg0v3/xX48ys2Zp4BQJcQ7q3AAoJ
+EPxX48ys2Zp4S+4H/3aoyPaZA3cJdFBROWbNU1QkskDDONEOhK3eSoOsAInY3wkt
+LFYV4eYSauuYU9SZd8FSRP4XZb46uwmVS3B6m5NhE6As1l5sVB2MHfyiqyPxEwpv
+mKRae1FSRrbGFINEFrQiWnEcFYsdLycTHXHgcHi5hErcilZKEBWZaTuOIBMYksVg
+kZWjhMF8zbvMK3Lz8ZA3/cDYMAnY4luInXYHJODPO0Z2Enr0f9BSW2Qrt4lQYyM/
+CGmanTuWuiXJS6tvNosxCjDhIuj9kjFrSc8L4CgxKTTq16JyEJnAjKJT/vRLRz+4
+vdEWGdNuBZx1CQBWlZ2TAWogRLjEblAtS7zn9ZPuUxAAskoq446ls54q/ItXXo6j
+vQ5Oaz8tuZdT35uMKPPtAhK7OEjiu5rSieNDMFpFcViR8KMG51ZoSnL/A/nCTpCW
+rEuR5k0KTROzCSwvFCPI7ZeAFw6etKxAgQntUgIb08O+1XNutIFgyOgOjnwDKeIQ
+xUA3JScViXVgGUW3nTo8OHzpkSqWlttF4Cxh8S4FB0F8mFamH1ZmAkNW0QdQDFqK
+qKy80RvPjFEgCzFf87GdAx0PT1eznTK+XfwREhp1px6O1CcAhh4RpQGyBCTeu3T6
+D2Wbq2sPs/gVdiFQP2+aXr+fxMYHdQmLeUqlfjUZJQLXL6g+dryn4QSaubcFsHh+
+CciR9iIQM2iC+bal7ufNQ/uw2cTxFzJhyNSgRDRSj4cHp+To14EYqpogpV7EJwTG
+dYoe+XQNnMbJ28rHjWfLMUjWy56DfgtxbCkYdfMnKGamOE17UY4q1UYcIYqEqGmk
+rie1RkhJyIaHfzC8q4UOiEc7clVn0CHJFYpO7KfMtqsGma+7XVMNu/SV+dlyCGVZ
+Yc2XHzHwN1oS4VZdlMO5VeoZyWZ5XaFLQuiZffcsIHifReRm0L0uyZMiyv5l1UIB
+dR5f+kk403E0XwbjuVksuAtYX1t64dane7UijfV/OHjhNnGbVnfXAJmM6uwv1u/L
+fEfIMVoMv7/uLpNexLG2pNe5AQ0EXEO6GQEIALX1DTbW/uRO7BgrASZupALnC+Zs
+QxPiV29DyBYJQgUv2RPEzrsgXRqeezKz6usDKqoVROraidWaCNyK726mXq4N1XfC
+K8IEQM31ktkBUdNK+KJcOGcdRKDoSEJ1kqFqX0MoCL68ZItJ7Xh7Yp+h7hzpHTIN
+Uj4OfQ59SGUxe7Y2gNIUsB0ewMdIKsTrEo74E2AvYw+4x5cuE2K00hWvKShkyQWt
+Qxwyweu+uTTlqHztFA7V7aWN6efyrE9Et05VZzRMmKiyOLLTi/AMBg1QI8MvlbYy
+nZu/YB5M8LMXWqQOcYpkSpXal5YoI8HrTyVLWJzDmgq06XnQ9KDNN1otVFcAEQEA
+AYkCNgQYAQoAIBYhBOw8/oj2ygeId09cHRqkS+ZJ3nYKBQJcQ7oZAhsMAAoJEBqk
+S+ZJ3nYKnLwP/22rgFDdXCsM0LHJwAupa9lI+/8CCxPqFG9CwtzpinQUS3P5+sU8
+ta3tvKUyvMoi2myvQbYWh9bDTI3Ic1g+YaUKL5KtYsmdRMSblNmDBP72Qu3+YngH
+QnWAeSSddKj3VLzgM9qKT0IfQaZchDI8A2QMOWan1b8eTygrHG8LH5JKxnoA1dqR
+w1WD/DgyENbYejBbiwG+2W04VKA9Gz3MhKI3D/8ZiN5it046eJ4yGzPCmNC4rldi
+cOHCJJqnYPydCUP9WkBrYK8T984VXYInIpl8TQny/kNk5T5JTCe3LV/nZkDWz84L
+KxorUst0JfPdtCLJtBmGhtwCd4FVkWU3N/rGlH6ka3Dc5VLItCjgtJB/iUWzM3Lw
+V8T4EnX/JRYUGOWMvAgd3ghbtjXs+6ABzX19DbeSs4hzc7iqy5jOp2HNjOoZs+9/
+t9jdPPQE1xbnzzkoRAkftUkkuql/cQQuGaQsE41iIXXSKCAVKafxZJBZtebSQZER
+O8DN/4VhwmwoO71ABINE1yTwnbRkkZUttk10/5W4s5cIMCRIYjGL3VMuLptjQxvb
+I1GACrpycglRMBtyfDTkEvFFb57wBLceh2NkdbMAwM+lmflMV8k5d0OF1549UaCT
+KnHCdt7JNPc6NQSHfu+v5ciCtMynP5k2kfEuvhslq1ARUrcfpDdltCQx
+=swck
+-----END PGP PUBLIC KEY BLOCK-----

From 9670e707d6585e7483025b8928e4f4ca541af4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 28 Jan 2025 08:29:18 +0100
Subject: [PATCH 574/600] d/gbp.conf: add upstream-signatures = on

---
 debian/changelog | 1 +
 debian/gbp.conf  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ab2519c..744b6e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nginx (1.26.0-4) UNRELEASED; urgency=medium
 
   * d/u/signing-key.asc: add Sergey Kandaurov <s.kandaurov@f5.com> public key,
     the key is used to sign the 1.26.2 release
+  * d/gbp.conf: add upstream-signatures = on
 
  -- Jan Mojžíš <janmojzis@debian.org>  Tue, 28 Jan 2025 08:26:25 +0100
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 97cd209..44bfd7d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,6 +4,7 @@ upstream-branch = upstream
 upstream-tag = upstream/%(version)s
 pristine-tar = True
 sign-tags = True
+upstream-signatures = on
 
 [import-orig]
 merge-mode = replace

From 65bcb0d8dd7e24d4914b3ce46015c97029cd4414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 28 Jan 2025 08:30:32 +0100
Subject: [PATCH 575/600] d/{control,copyright}: update my email to
 "janmojzis@debian.org"

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/copyright | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 744b6e6..346d776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nginx (1.26.0-4) UNRELEASED; urgency=medium
   * d/u/signing-key.asc: add Sergey Kandaurov <s.kandaurov@f5.com> public key,
     the key is used to sign the 1.26.2 release
   * d/gbp.conf: add upstream-signatures = on
+  * d/{control,copyright}: update my email to "janmojzis@debian.org"
 
  -- Jan Mojžíš <janmojzis@debian.org>  Tue, 28 Jan 2025 08:26:25 +0100
 
diff --git a/debian/control b/debian/control
index 756f31f..4f36832 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: nginx
 Section: httpd
 Priority: optional
 Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
-Uploaders: Jan Mojžíš <jan.mojzis@gmail.com>
+Uploaders: Jan Mojžíš <janmojzis@debian.org>
 Build-Depends: debhelper-compat (= 13),
                libexpat-dev,
                libgd-dev,
diff --git a/debian/copyright b/debian/copyright
index 7106e51..263e5db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,7 @@ Copyright: 2005, Andrei Nigmatulin
 License: BSD-2-clause
 
 Files: debian/*
-Copyright: 2022-2024, Jan Mojžíš <jan.mojzis@gmail.com>
+Copyright: 2022-2024, Jan Mojžíš <janmojzis@debian.org>
  2020-2022, Ondřej Nový <onovy@debian.org>
  2019-2022, Thomas Ward <teward@ubuntu.com>
  2013-2016, Christos Trochalakis <ctrochalakis@debian.org>

From f1e2f6cbb98e3572d9cb78815bd5099deb96c11f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Tue, 28 Jan 2025 08:31:42 +0100
Subject: [PATCH 576/600] d/copyright: bump my copyright year

---
 debian/changelog | 1 +
 debian/copyright | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 346d776..f4c0043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ nginx (1.26.0-4) UNRELEASED; urgency=medium
     the key is used to sign the 1.26.2 release
   * d/gbp.conf: add upstream-signatures = on
   * d/{control,copyright}: update my email to "janmojzis@debian.org"
+  * d/copyright: bump my copyright year
 
  -- Jan Mojžíš <janmojzis@debian.org>  Tue, 28 Jan 2025 08:26:25 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 263e5db..0536a8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,7 @@ Copyright: 2005, Andrei Nigmatulin
 License: BSD-2-clause
 
 Files: debian/*
-Copyright: 2022-2024, Jan Mojžíš <janmojzis@debian.org>
+Copyright: 2022-2025, Jan Mojžíš <janmojzis@debian.org>
  2020-2022, Ondřej Nový <onovy@debian.org>
  2019-2022, Thomas Ward <teward@ubuntu.com>
  2013-2016, Christos Trochalakis <ctrochalakis@debian.org>

From 71f2059cf8c8d7dbbf9407f4635b9dcf1ac45315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 2 Feb 2025 11:23:15 +0100
Subject: [PATCH 577/600] Add Sergey Kandaurov <s.kandaurov@f5.com> pgp public
 key

---
 debian/upstream/signing-key.asc | 788 ++++++++++----------------------
 1 file changed, 245 insertions(+), 543 deletions(-)

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 1014f9e..52abfd2 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -1,555 +1,257 @@
-# Previously used as signing key up through May 24, 2022
-# and may be used in future.  Keep this around intentionally as such.
-# gpg: pub  rsa2048/520A9993A1C052F8 2011-11-27  Maxim Dounin <mdounin@mdounin.ru>
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBE7SKu8BCADQo6x4ZQfAcPlJMLmL8zBEBUS6GyKMMMDtrTh3Yaq481HB54oR
-0cpKL05Ff9upjrIzLD5TJUCzYYM9GQOhguDUP8+ZU9JpSz3yO2TvH7WBbUZ8FADf
-hblmmUBLNgOWgLo3W+FYhl3mz1GFS2Fvid6Tfn02L8CBAj7jxbjL1Qj/OA/WmLLc
-m6BMTqI7IBlYW2vyIOIHasISGiAwZfp0ucMeXXvTtt14LGa8qXVcFnJTdwbf03AS
-ljhYrQnKnpl3VpDAoQt8C68YCwjaNJW59hKqWB+XeIJ9CW98+EOAxLAFszSyGanp
-rCqPd0numj9TIddjcRkTA/ZbmCWK+xjpVBGXABEBAAG0IU1heGltIERvdW5pbiA8
-bWRvdW5pbkBtZG91bmluLnJ1PokBOAQTAQIAIgUCTtIq7wIbAwYLCQgHAwIGFQgC
-CQoLBBYCAwECHgECF4AACgkQUgqZk6HAUvj+iwf/b4FS6zVzJ5T0v1vcQGD4ZzXe
-D5xMC4BJW414wVMU15rfX7aCdtoCYBNiApPxEd7SwiyxWRhRA9bikUq87JEgmnyV
-0iYbHZvCvc1jOkx4WR7E45t1Mi29KBoPaFXA9X5adZkYcOQLDxa2Z8m6LGXnlF6N
-tJkxQ8APrjZsdrbDvo3HxU9muPcq49ydzhgwfLwpUs11LYkwB0An9WRPuv3jporZ
-/XgI6RfPMZ5NIx+FRRCjn6DnfHboY9rNF6NzrOReJRBhXCi6I+KkHHEnMoyg8XET
-9lVkfHTOl81aIZqrAloX3/00TkYWyM2zO9oYpOg6eUFCX/Lw4MJZsTcT5EKVxLkB
-DQRO0irvAQgA0LjCc8S6oZzjiap2MjRNhRFA5BYjXZRZBdKF2VP74avt2/RELq8G
-W0n7JWmKn6vvrXabEGLyfkCngAhTq9tJ/K7LPx/bmlO5+jboO/1inH2BTtLiHjAX
-vicXZk3oaZt2Sotx5mMI3yzpFQRVqZXsi0LpUTPJEh3oS8IdYRjslQh1A7P5hfCZ
-wtzwb/hKm8upODe/ITUMuXeWfLuQj/uEU6wMzmfMHb+jlYMWtb+v98aJa2FODeKP
-mWCXLa7bliXp1SSeBOEfIgEAmjM6QGlDx5sZhr2Ss2xSPRdZ8DqD7oiRVzmstX1Y
-oxEzC0yXfaefC7SgM0nMnaTvYEOYJ9CH3wARAQABiQEfBBgBAgAJBQJO0irvAhsM
-AAoJEFIKmZOhwFL4844H/jo8icCcS6eOWvnen7lg0FcCo1fIm4wW3tEmkQdchSHE
-CJDq7pgTloN65pwB5tBoT47cyYNZA9eTfJVgRc74q5cexKOYrMC3KuAqWbwqXhkV
-s0nkWxnOIidTHSXvBZfDFA4Idwte94Thrzf8Pn8UESudTiqrWoCBXk2UyVsl03gJ
-blSJAeJGYPPeo+Yj6m63OWe2+/S2VTgmbPS/RObn0Aeg7yuff0n5+ytEt2KL51gO
-QE2uIxTCawHr12PsllPkbqPk/PagIttfEJqn9b0CrqPC3HREePb2aMJ/Ctw/76CO
-wn0mtXeIXLCTvBmznXfaMKllsqbsy2nCJ2P2uJjOntw=
-=NeQn
+mQINBGZXLBYBEACxv3nUIdUtFCpH1G4hBB+eVSsWwnHVTDtSYfINHmN8dQfyGy22
+XcX2DR6ZW9/I5e06McAz4e3hTuhD5+sF7zv4Dd/xEqxpra08liVvB3QlJ6kawBJa
+Bn29s/N/A06yUrOVC1ZjhpDLshaHeyHjWDVLUX9ibLx1N3BQoeoH/5lgTmfF4JPk
+LfnTMwHWQ5phT52MVE+B/XExldIPAn27m2ZfXHXnSUMKCRybQNypBiIp6OBfirwa
+pyjaRO1AajwalSkbSV9o/fL3liluv1HimQ11/5y0rxMdi+aaeca9oA4Gvfdh/biO
+MYcTeiZx72BKqDwMfJVXSjQ8XOYbfCjWp8dNkS5Yd4bmX+ITXRkZHqQxgmoKWr7B
+9/i+asColt/qqsQ6PROa2y86TbQSfn/HM8L6c85BkJrI41abJ2QHShVzpk0e/464
+hqxvnAZCrmdM+GBSuYfDDqHHHgxhIzHnKnyRX/MtfhZA/CUFUOe+m6j214KKtkMQ
+6EpZzgH52FFD6Vi1NkQvfYx5pqEdmJfRKR9ABf8fYI8U8ryNgIq7f13bwoX4haZy
+ql/fC4lTG6OEppgdQe7afyAmdi7G/w1pMcbz5Wwp91R+1372XifynBdeTrUsbK25
+P42TH3OADC2Id+MaaGh1AjY1bFifOGRf48rnrcMn0Q4Lw3l56wgjou4MUQARAQAB
+tCtuZ2lueCBzaWduaW5nIGtleSA8c2lnbmluZy1rZXktMkBuZ2lueC5jb20+iQIi
+BBMBCgAWBQJmVywWCRAv0hMQtJ9rRgIbAwIZAQAAq08P/jeIVEj9/cJFzdOeBqjg
+F9DNZljkR+2z5UAkQSHfkzWgHRbdAnjT1bc/ltLi6w/z/97kOZhaiSx6TLRg2mX/
+5nuC4KijhT9rNc/d5j/BHS4U7lFK8c5ED5wxGvJZcF0VCSfeaiuxoO3QiNYX1iiD
+qEyJ1XL/XHd7LjJ4gKxsohKL1rRLSuvtOkK799YArNit5ueATDWW6EUSZaxOiMNz
+MaQFMEkjoiPVlj7jNwZN7KHNXkaJjiER0kmJ9XWDtkgSHOZrUNX2PHJpxxCtQj7d
+YpOFM/DHvNUZ9dHXm3Ioo3R/MUcC4mbZpAvs4YwZ/yRqov/MX4WEUtvcCY36EL5t
+hUDK09huMMBLBdM0jgVLsJnXn5ksMdVkpgFyeR/SKEaUTmQrgkCIwqvRxDegAkNN
+lmAiNhxdKD+CrWws+EzQYOeWVRUO9aHKC5ttwhhQuxyvmNgoAMhd8x8Tcm7grC/m
+ZOqYWzpEWd1DEyi9jaTkhrSWMd5jc5lvCwOHDRzVi1HmIJy+cybPbQpkbFY6vj/7
+shx2Aa+QKRJs+33Ztg0drc3j+mDk9NJQy0KPIbqee0gy0pmaKNiJOxdIWI6ra3cM
+3lh5OG+CGakga1X9YiCWv4/OgDYY/6cFTqEN0wXruFLNZ7P4iowJgPU1KZauvDZl
+gfsgBoKJ35Nf6p9PdjcjcyW5iQEzBBABCAAdFiEEcziXMGntP0Q/TTffpk/VsXrb
+OagFAmZXLlcACgkQpk/VsXrbOaiWowgAvU9HwLkK74VGjosmPpcjurRowUp+/KOA
+HmIro2wQ6JVlUrSL2Rz+RIBJ1BKTgGnVZznkXywXHWK2LI4nL3aDoAuyyrzQk1pj
+hO1ZJGJBvh9Zq/kGRgEdlTe2sXVX2G7fr4fhd6BcYYvUBQ5OWR6Hh6uS+G1QVw0y
+Lu5Gp+7kyolyH6iYlgvxseche+EIqBPyHe5fyb1t8Zcu1uHoQHj9O90FvJSbq4dR
+d0tTlqK1tDklT+Aod2UobBCurn45udjiAKtzH6Bg2dvF/oY4udSC9/HgNPbm7JuY
+clEaLukWMdFOCEj9Xr6krHtUh7zTiU6pHvUL2SYMPhsJj6AKZRg52IkBMwQQAQgA
+HRYhBFc7/Ws9j7xkEHmmq6v1vYJ72b9iBQJmVz0rAAoJEKv1vYJ72b9iVTwH/Awq
+vgnXbJ5mCGbLdQgrDoUYe+1nw/qWbl7Hpn/px55BEIW5S0itI50c9sOS2QFQMdRh
+YVqZ+YH4aH5pDNW2kFik4Y+CFoJI9QkrEUx66PYIMu3RVBEE7/HQEwND/IbEAeMg
+PpGQdEfEDD8kevlinJTyDXJ3dfBa6HEDpK0wDYrBx3mbHP7ouACsZcxqSdx4kOyv
+U2Xvlc5pVRsdvJ7AsVRhRaRdSO8YlqU1Ue/OM/Ejj+GZ1Qo8EDge5887HiY8gcjy
+J4FS1n2+3839n990s5xDCFSB1G8KmwgkfbkS6gEpA5wf9nk3tiSPS+HMfjMb50GJ
+SayUVrAyUupv/Sxvyo+JAjMEEAEIAB0WIQTWeGzjA9mpAimY3GzIRk1UmvdcCgUC
+ZldKbQAKCRDIRk1UmvdcCn6EEACUhtMnJGtrunotTwywt/jfkqexA+lhQ+S9V5eF
+IIK6Tlq1asFy0s+twYJBQzTXt+hmL8GrBgeQp26CA8wrbxmnUOrXO1K9ksaXXjj0
+SRo9Xr/flCmeFKFRSSVy18UZVwf1vftFwF2lQspU+xZmj7vgr+2vKa3Z+81J8tHw
+3/Sc5pt3EGB8GeCiEThe3zr49KpANejy/7feASSS+BBBUbNqnCFImfwLJ2V99mGx
+GdejudbTYEXsn6jyVWTeKBcaLM4ArS20O0DJkqBcVC1Ymq+K3AGmKnrLJXDSwaV/
++yv5pyqApf6Lu9tx7wy6upBop8KroB9xiTN5UIiYhwtHBlpOLkmXB7K549CYX34y
+aOHJjez8Txn1bDhbCOe8WOnPEDI8V4RQBr0/xePru6lfwSmSriquVuBGZSir6qxA
+1folqrEuoF5aEuxFper6yC/zfVP85znqBOh8OaYTGBeb622UswzLTbW4y2M3E9Ws
+KhaXzTqXgIn3INCJLCv4CHiGQQB6zN6meGdOkEV0IaZvq3O4iZOAVFmKbN3GZcKT
+Kjxq295LNO15c0WCauik3FRjSppyvcAqoCEbr+LVAX3/ZV3oELhQPnkZCuAFQUB+
+LKxTcTEIdjFKrPEvDgXLL9CNe747ANcLCV02SRRGYnfQ1aoxJNQlzbFw0unHjyDk
+vKcD44kBswQQAQgAHRYhBBPIKmO2A1dhVuMKTqDqmBtmsNlnBQJmV1HlAAoJEKDq
+mBtmsNlni3gMALfZSqIL7v66dMyjLQR81G4o6rEAixTuFc3B8xDmWDHKIjmdRMTN
+mm2KGz0CG7VjdHSe3oOBYok4fDVS0o636EOxndOHszuB9cfhMMXNDFi4T1xcZCLm
+UTdXCH88cagwTf6REsbfuXF8WiFemNNiPzMzLmnTlUe7Va2t+gKD/Q9vSlDLKz66
+IZBMdDoAHDKHZTtvwlAKswnpO0cDIeZjO0C1+YFLLSJ1nYQbh6mH+hJvNLimWPKR
+ZQCPAa5w0Gutz91cE9nv03yg3FMcjlEgklQ77g/nGGFJnQHAeMhfgUUfPLx1rI9/
+5NON5w7Wf3PXOlTYWO25ieUVKESu8dUCFktKRMnzauej2vjnQlMFG0upzw8dhytn
+E83WanvRzVynanK38PCNYQ3INsydN3wvJNetHpBdpyPfOa61dOUtu1TBvV80qcBR
+wIe6vbWZx0WB59b3KV8Sc68j8OJxF6i3E0IRby4f0hcoqogBkry0NPK/rtL2HHnN
+vcV0wl+DODz9hw==
+=oWlI
 -----END PGP PUBLIC KEY BLOCK-----
-
-
-# First observed on May 24, 2022
-#
-# pub   rsa3072 2018-05-07 [SC] [expires: 2027-05-17]
-#      13C82A63B603576156E30A4EA0EA981B66B0D967
-#uid           [ unknown] Konstantin Pavlov <thresh@nginx.com>
-#uid           [ unknown] Konstantin Pavlov <k.pavlov@f5.com>
-#sub   rsa3072 2018-05-07 [E] [expires: 2027-05-17]
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGNBFrwMiUBDADo56OlDknN+ReCMP+8CN1biK5izmGd755TxktHLI9nAP8ociIq
-Hjrps22pBtAIQ6eZpwCFBys2mR/441rOgZW+O6uqBYrttbxTMvE43EmKYGuFCmuR
-u0JGMPuqnzF3Y+6uoKzqMzazSrZIBWsBKAkNYTw8+yPlxGgffhBp1ueME7Lskglh
-EV9gmrEM0QlWod7wSQvyruExPm5INx3MG63Xfvc0bPiWUOGKyMb7kXA5VgnWuzmS
-BCMm17+A32vMyxhYcvSEgUayQjGghI1uPDSqBQBMEFTgSK2wWzvAXf/M45nxKBgQ
-IEDmvoC8RM9JTtUr7RE/E1mjsuefF2vYYYsWBstRFGAlUV1/lPNNibu3NqbCug6b
-1IWJuV1DX9T9/f81GZJrsPgYYKC6Ai8C1B0NGWjos7/GzgEFENQgf5duOhFPadQz
-QbRxBoId4Fe/Uwe2HxI8ESCQMwsq8bowcCn6XRA2EYkAt17Kab6LH6tTP54XG9TL
-bV7bAhyrvZAk1lUAEQEAAbQjS29uc3RhbnRpbiBQYXZsb3YgPGsucGF2bG92QGY1
-LmNvbT6JAdcEEwEIAEECGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AWIQQT
-yCpjtgNXYVbjCk6g6pgbZrDZZwUCYoTfvAUJEPqvFwAKCRCg6pgbZrDZZxFYDADK
-R02XgC+AoyrqMwBNXC8Y6aiilEsyppsgj+KwZcGKDYN488gEmff+/KIEdtglw3I3
-tCMbo+FzFjHveeVCb0qrIMerWJg+o4YrxxqlQ9Q1InpduKLrIuGae0J1ybITS8+v
-iYAmwzy1Wb2CDDuCnhCR/QDfOE1CvRILVqIKezC0tRrBTEvRO84m6YMBtJ1DP75Z
-2cTNyjPos9+uxi4JcMKrMUBwZKya+z5i+Uxd66wuPj9KmggNG1x+bqMWmpTrSKUn
-gbLabFUth+uWumpj3/7HBT8Ov7rPgzY/vn3Fn5mKdLQm+kRwSX9/FbtHAE3Qsm+f
-6WW8CZ4XzL9ONfhQYwO2Jrq4HzgYloZkL+1Zs61X+zeEyr4o/mzt5DHbQRsD1UzQ
-gnh7t3YdSAy6gBqevjPWkQlq9e8eoFRydN/htwjS7dleikOsYktSnTIKlRXAWGCm
-jkRpQyZYuuPcWcGRt/0MVewRJmLemH6O+NviqhgGRePO9QR0R+yfdCwewPJEDk60
-JEtvbnN0YW50aW4gUGF2bG92IDx0aHJlc2hAbmdpbnguY29tPokB1AQTAQgAPgIb
-AwULCQgHAwUVCgkICwUWAwIBAAIeAQIXgBYhBBPIKmO2A1dhVuMKTqDqmBtmsNln
-BQJihN+8BQkQ+q8XAAoJEKDqmBtmsNlncQ0L/0Yk1QejO06gWwV1J2eK9LmjbMof
-y2ujZBgW1IGt/goo5R4PzC8lBBcsBtsKyN0Rsh7QdLrtKKLQrE/gpwMTMdKhJTdP
-/c5tUY3EwgIdBMYVaxArZQiWlPgSnoKuKydnn6Rb+Qtrhvb9pjn5XlGd/VSbAXZe
-8YTj6B8qjUa2YY+IreyB6wkPN/ytV5vcocbS7mzXaibGPVT35e0Pl1Be+xbJkbTm
-JTSJCSPwyHm9t2Vuq4e/c3fMwhOUbBjfssspR103vo91XO5sY+v2aQJOctNrv4Zp
-HMrwBH7MeqDISCWg9PICUv0ewHzAEGB+K0v342rVAzVNEctwM3Jic7fEJYsItdw+
-Zk4r8NYqACoRCdSUEHqhP0DbYoWdthpUwD1J5ryWyKTCpTL4wNhKEMcNaiHH3qor
-SssyMHMFRPoXKw9Pcay+Uo8NXc2KKxhEHTbQts0jYUNcq0yuWHoNQ4vhKkf9CHBr
-b/vS22vfEJyd6FX6ZRYK56A3EFAV8hK0BvZAw7kBjQRa8DInAQwA2Rk7UdUgpCWl
-+BMz9B9eKj0XtsNEciXHHKnSFYaSNCWNwib/FsiMfcPFh7xwUTof7e7HBFkvv0QE
-MCEp7R1MVNBfMiGtG1ICFIt9nByznPsRk4VvbY/prK4DZy2AmlwhNcT2pQO3Aasc
-gsCWdf6G+wcwnHg9tWCp0Xs9BNXuppmcRrpP4M1PPRIVeG1jeVXvuSHO2HjqPSXP
-5DhGgSGN7uLOhiLTnPINd186vf6tqRdqYw3g0W1ImEjGXHeNQfnieIWdU3X4C8KT
-EPsV3lvtmSAQCoge0CyKfz4cORi4j8Edp8JpDQlbAThe529+R3eKUw7I/3ESxJBd
-qzLE/ItWvAcbGEserLDFrg9J1ojiKhsw3TVcDk+HIDzVakMz6HTd4ExSijMqTehz
-gKSVHDL+l2jc0f4VSecI+xwC3/kNsNTBpiPoUYtXBbJllHgQAakREkSKQBas02eq
-Ru8SlQ3yEn87zTtNW8L7xpe7ZVtxwUgp40PUrsb8uMDJG7ZP5rhLABEBAAGJAbwE
-GAEIACYCGwwWIQQTyCpjtgNXYVbjCk6g6pgbZrDZZwUCYoTfwQUJEPqvGgAKCRCg
-6pgbZrDZZ3oEDAC1J3BVwlkX+eoo8VsXAYxMXm8kIaTqOn/tHMOYepK+cWUdHaeC
-H3N8LigwN4Ve2LtzLBqN3WRAxFNy0DIzdBfA7QdcAoDLnB2FNrWTmwvC9nXkCogF
-fSCq7c+1oFHdn7M/VZNU4o0nhVOnqM8NLGcgzX3K3hr+WLYUgNQ9G6x0N9VU43tq
-VwJhvNv4pyiRpRdLlmhOEf35a/sWE1dttSKdrBhyzTbptw4dXr4lUpvlswWs+dLp
-SPPhWAuifORv/amWh3bxIxYEqE4o5NI/PQLJvJJLsJvMIIjpKlAGBJg5h3WCiIAk
-l7H+BesOUIIg8ava5ZUyjlFdszBMaBosZvRgFAlfnYhSGqzhip6PvXfK1YokNv7k
-qw43c0f1SmtSXZR43SRv/4vpXG7IqtTuqgSwn1qDJgr4yfs8QQykO/jG+cz7X+5O
-KSAulWi9OoqLyDWlsm3WccPIcJfbm71P+I/ha7ESVQfOxC92fQ7HQAboj7NhecJ4
-RLqjzrWSHmPGClI=
-=J2qy
+mQENBE5OMmIBCAD+FPYKGriGGf7NqwKfWC83cBV01gabgVWQmZbMcFzeW+hMsgxH
+W6iimD0RsfZ9oEbfJCPG0CRSZ7ppq5pKamYs2+EJ8Q2ysOFHHwpGrA2C8zyNAs4I
+QxnZZIbETgcSwFtDun0XiqPwPZgyuXVm9PAbLZRbfBzm8wR/3SWygqZBBLdQk5TE
+fDR+Eny/M1RVR4xClECONF9UBB2ejFdI1LD45APbP2hsN/piFByU1t7yK2gpFyRt
+97WzGHn9MV5/TL7AmRPM4pcr3JacmtCnxXeCZ8nLqedoSuHFuhwyDnlAbu8I16O5
+XRrfzhrHRJFM1JnIiGmzZi6zBvH0ItfyX6ttABEBAAG0KW5naW54IHNpZ25pbmcg
+a2V5IDxzaWduaW5nLWtleUBuZ2lueC5jb20+iQE+BBMBAgAoBQJOTjJiAhsDBQkJ
+ZgGABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCr9b2Ce9m/YpvjB/98uV4t
+94d0oEh5XlqEZzVMrcTgPQ3BZt05N5xVuYaglv7OQtdlErMXmRWaFZEqDaMHdniC
+sF63jWMd29vC4xpzIfmsLK3ce9oYo4t9o4WWqBUdf0Ff1LMz1dfLG2HDtKPfYg3C
+8NESud09zuP5NohaE8Qzj/4p6rWDiRpuZ++4fnL3Dt3N6jXILwr/TM/Ma7jvaXGP
+DO3kzm4dNKp5b5bn2nT2QWLPnEKxvOg5Zoej8l9+KFsUnXoWoYCkMQ2QTpZQFNwF
+xwJGoAz8K3PwVPUrIL6b1lsiNovDgcgP0eDgzvwLynWKBPkRRjtgmWLoeaS9FAZV
+ccXJMmANXJFuCf26iQFVBBMBCAA/AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX
+gBYhBFc7/Ws9j7xkEHmmq6v1vYJ72b9iBQJmULK1BQkdphrTAAoJEKv1vYJ72b9i
+2+AH/RSX5voZXtSAl0fxVc9GDrGesOsykkSELnailOkWiFEHZS842U1EQst9Omki
+OC14xk9fY36gK8bxXnLwww4hnnh/fpj7vJkJpVCi2uO3RKizyN6rp+7xbZ2lCKfp
+5tsDg5U4iaaziTNtb4ISq79gLmLY/gqBwGksRozmChsl2QOVgg0KDTI5TP+41IwW
+AFuO+XzHZ7OEegxwHta65KeVNipYjCarTRcRhGxA0rpLdBynkZ/OaI5+J6UZVfna
+2eyDgHPlMo+v12+g/wOFOwShVWo4PwIsZw1jzBCLhspgezn7IolQFMHtVxCJAkgw
+XhLgogChbe885HzTB6GlMowXclGJATMEEAEIAB0WIQRzOJcwae0/RD9NN9+mT9Wx
+ets5qAUCZlcuRQAKCRCmT9Wxets5qD1GB/4/NIcvCRj3LvFbrtmtbExBoBP6Hv/8
+U4wUpuJbAAxImJ9uNKKaH+cmvoshkWTSUBXTvNjAQW3SM9oW+V3G7wicUtH+7cnd
+xExuqf5e6f6IGqKCgrV25g0WWvJZG6ynMDDkgnyu3fTE7GkVKwoWQ6qV6Akar8oV
+29P+xe2U7AWPvw+O+SBghl32x8DA/nUjIyLbvBQuXb6BjHOxrTw3WOJDfwHwOyMd
+P7NHe7RE70cSj/TNabuNw9c31H0+PAj+UWfvgs5diPVJ9Fd/PK4pWQoh/4poMEbc
+/1Ol0G7SItUKO6v4aHn89g00xnqUxrfwbCWCEF9EjnfFtlsDbGSWIdz8iQE+BBMB
+AgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCV2K1+AUJGB4fQQAKCRCr
+9b2Ce9m/YloaB/9XGrolkocm7l/tsVjaBQCteXKuwsm4XhCuAQ6YAwA1L1UheGOG
+/aa2xJvrXE8X32tgcTjrKoYoXWcdxaFjlXGTt6jV85qRguUzvMOxxSEM2Dn115et
+N9piPl0Zz+4rkx8+2vJGF+eMlruPXg/zd88NvyLq5gGHEsFRBMVufYmHtNfcp4ok
+C1klWiRIRSdp4QY1wdrN1O+/oCTl8Bzy6hcHjLIq3aoumcLxMjtBoclc/5OTioLD
+wSDfVx7rWyfRhcBzVbwDoe/PD08AoAA6fxXvWjSxy+dGhEaXoTHjkCbz/l6NxrK3
+JFyauDgU4K4MytsZ1HDiMgMW8hZXxszoICTTiQEcBBABAgAGBQJOTkelAAoJEKZP
+1bF62zmo79oH/1XDb29SYtWp+MTJTPFEwlWRiyRuDXy3wBd/BpwBRIWfWzMs1gnC
+jNjk0EVBVGa2grvy9JtxJKMd6l/PWXVucSt+U/+GO8rBkw14SdhqxaS2l14v6gyM
+eUrSbY3XfToGfwHC4sa/Thn8X4jFaQ2XN5dAIzJGU1s5JA0tjEzUwCnmrKmyMlXZ
+aoQVrmORGjCuH0I0aAFkRS0UtnB9HPpxhGVbs24xXZQnZDNbUQeulFxS4uP3OLDB
+AeCHl+v4t/uotIad8v6JSO93vc1evIje6lguE81HHmJn9noxPItvOvSMb2yPsE8m
+H4cJHRTFNSEhPW6ghmlfWa9ZwiVX5igxcvaIRgQQEQIABgUCTk5b0gAKCRDs8OkL
+LBcgg1G+AKCnacLb/+W6cflirUIExgZdUJqoogCeNPVwXiHEIVqithAM1pdY/gca
+QZmIRgQQEQIABgUCTk5fYQAKCRCpN2E5pSTFPnNWAJ9gUozyiS+9jf2rJvqmJSeW
+uCgVRwCcCUFhXRCpQO2YVa3l3WuB+rgKjsSJAjMEEAEIAB0WIQTWeGzjA9mpAimY
+3GzIRk1UmvdcCgUCZldKdQAKCRDIRk1UmvdcCj1hEACv1XfhwpsBPVNzcfzMIpfY
+xAQF28m/VFLwD8FYKoVgb4rF2wLBtt9kaoPZxphEvV/FWHhpa3Tyr3L320r6sVk2
+5Ou6G/AH6kNF6vYn98chEmbCc7DE2B03G1HFFuRSOmp0ZwafJ6MYUhjpDrf6fFDL
+fmdkr/hjLwCYvFQsHXYiIWDFBPZ6RvVC6ozbdFr4eWj+CIPZM4jcGTgSI/u67tC6
+8tOdX4a8/ujdkLDjyf2xgbWT8ZxY3o0fvfLFEQVpNMUsYtiW/kTPBsq48Gq2BWow
+/2Ld86KjgBOyElnVy9kMLCB4d/DPnSdBkjHzWWDx2c/PDGWIGnES6O7NYvRQ9Sr0
+bQwtr70nvai2OkpYVszVwOqyr4vDeTIt0GFKOMRDRrscVGmlGr2mpExiCEgGyAjR
+Z/aZDCzEnsswfJ+6IARYzE5nB3+pbJnzQNvj9r/YL8T9HkWID4sWJnnNmaFoWEMF
+m+yvI8vyVMGPSqfVtN9pEpx/pzV/Q525nFYuUlEsqGgaDydnwe6AV9gZsRyA+YjE
+H3gI1gxGwRyupldmstzoYzTktb4o1KL/vGj/onUIk8mFKx8p1X9VPWW0+8LqnAYf
+Ui3jDoXE/9avsF6ipS7y1k8ga81z01NOvuhai3c9pvMAIYrNTvoQVz8vTIOtJac1
+PEoU6jdm8blCt2UjGp8A4okBswQQAQgAHRYhBBPIKmO2A1dhVuMKTqDqmBtmsNln
+BQJmV1HrAAoJEKDqmBtmsNlntoEMANBPdskGMrU4ZxHMlOTd1JX74ucp5jez0Y2o
+bwlxOiWroraYVBnWT9v150kNf1Tb5mDxi820qebiSPZxhlI1Kj7NrPFNxQkhhNzN
+7Xr/M9OGpkwxosEpcMAiWfofyAdrnwos+MA/edu/EoyVRs6zpo75nP9GKUZwVcjH
+KtvPMojkZYpxjxsio0aK8LW8VwDtsbwPIXDIHzE7sxUvThrMdXumrh7gKqaC6gep
+HZB2lL5ES0kVE3/yjZR1khmcmF1zELeC0IddJjX2R9HMcSLixdJ2V8/VFsWMb2KQ
+pGtDzCuRyyxbugzBIxiGV2Xb7XwOByaikc1duqFv3gtk7Vk8wgQN3YwLkZ6pztlK
+vCbqy2b2wlPviGjApQ2GVd6EEmlCk2gKPkjrn2lxS2BXWorM+ANSswJT+eILi9yW
+Q5zzmYK2vFTzL7FAMeqS/671jNhZQ8O7jvbY/mRhl66k2MY7/JgI+coP0cY+HHr2
+ozw9yNdOZmnk2Prj7+mBuchbT3BJOQ==
+=AgHy
 -----END PGP PUBLIC KEY BLOCK-----
-
-# Roman Arutyunyan’s PGP public key,
-# the key is used to sign the 1.26.0 release
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQINBGYXyiQBEAC4jm1y+ODV4+YDGj9vp2BgHB4FJeQdgrBiVX+Mb2qCrEqJgeKV
-fVwKjkVYqnb76TTybdOKqCP5wdQrncKAKlXsMq6sdsiwPSrdRcjkeiE29WWrtbB4
-i+VObnoWklMblMxFQ1XQIkjs2wviidKjJw2VV3i4XnLSrHhWaWqviTLZCMQymoPs
-F+Tfu1WX9OUfOquekZ5KjkyBxB4ep6+NPeuIkPnW0SiTUhU8tbi8v0aBZEHSZLqE
-mq8KLROVuYSPvtU+NtaXAM09BHEVCfb409aDps9p6AFT+IN8yoOegGdEZjp6hJvS
-HxbhuwqNEtg4dTEV515YUCgKabqU1QaqI/Y0+Pdkpep1KRFc9YUYttDkCw7Ybu2u
-fwTGzwAbD+ThAIOdzmMDodzZaEMf+9fQG4bnO1PdNbXzyP7Kv9qzGa65+9oGCPOS
-qTpISR8pvzoI8w/Z/vG71ob/nQ6Xm0L986ksErdGhu16ZI7lW2eDYqy2IoFfbeSz
-HHxk484/pEibrlCRbP2Id+zULfxo1HGOGg+PAY9Q2uNzABsGDMnOhIvXHS+hP7oB
-sO9A4Prqu6K6cMp3QI219tmmOUegJpmGGPzoNgxR7H30wNcjZPv4PWr/c0fP70Ny
-ilgbdcEMDSHks30AmiuIvcUxo3A21p2nnpxsKAKYx42UJkyEK0HILMzcqwARAQAB
-tCZSb21hbiBBcnV0eXVueWFuIDxyLmFydXR5dW55YW5AZjUuY29tPokCTgQTAQgA
-OBYhBEM4eCXdsbuX7Da6XQB8jXwV2HNpBQJmF8pXAhsDBQsJCAcCBhUKCQgLAgQW
-AgMBAh4BAheAAAoJEAB8jXwV2HNppvQP/AjzdPKkGRzJkb1ioto/IEP1YhA/Eayk
-hvejJ0vyWVHXXH7FLW9fIZoApcsD1J8/7zIANm+62IfT3QNbL2R44IyhJB3AY22l
-t0ToLxodfugegF3NPYYyFOSRUoPD4g2T/dMCPOBX4MNEAnAlCmxAMaJNmQUO76IY
-GwELa3CH3Aqf7bthKy8P36G11hu7NgH6V9mVIRIpfnfpXFQIztj+vsWtswu4M5t7
-BNJwx4a2KTCVQpTdff5/0dO/5drQDxLbIg681WZk3Oe8Eu6nSc0Ud02NIkg1TQH/
-MryAp7o/ua3LRem+W/cktnT60p4uXPVZ3Rvg3zOmJSNJ+eIXY2+sDeZEPaROKldA
-IbnBacTsZjdswIlrbzinY8ZVRosaFlvHg/ESTBRItALHWCRdzOR1Wv1qy/PQfEEL
-qftDsCTQhssP1MHJWlejeqPlND3iT2vBDeOxqd6WhKuAc+L04iyBB6p867pwrgDF
-ecg82DPehsAnO2XBAFuIE/SLewkYm0B9HK7/J4LZqPwTAksPf/dnbMAmHWoBDqsu
-4U4U4SsJKsZ87R9ao8qO7IWCzHrXavHFmnbqweFfHToeKF/L4PB+tYoW3YmUOged
-CglpJv13bNWmRwL7+x8b7BwpVwClxHBHteDX4RIN5iPH9h20J4jIpzRa1kNJsTu1
-v4ZkqLWJlkiitCFSb21hbiBBcnV0eXVueWFuIDxhcnV0QG5naW54LmNvbT6JAk4E
-EwEIADgWIQRDOHgl3bG7l+w2ul0AfI18FdhzaQUCZhfKJAIbAwULCQgHAgYVCgkI
-CwIEFgIDAQIeAQIXgAAKCRAAfI18FdhzaREXD/9UW4KdbcTCgsJZaBYKKSAj2RtU
-OvT9CLJ/YZv2x87LME2r/5kaNOzsSpMdthSIJOCPLy3RI0qLOgJeNJYtOhMBeE55
-NjfAO4eR1zcLY48w+CYc8aZ2d+mWaxmOPrz2zLQxOeUuZT/zu17FH9/dEQAq1yFW
-OjkCiO5nFcmL6vIG+jMpeLzYzUlpiUivXlP46JG19ndyB9ORvkJFrRhFXtBDXOE6
-IXQAUpVWKQXBG6q6mFPLZxIsgsvM6nAb8KMwnM7hU4BKYYmZ2Jwh9hKxlLPPftGt
-x95jBHqq4nnlj1AX0hR+DkAda5+ldp/oVsyxbVTWY6rS0y/C91w767kjlIGPoiSo
-7jNq+Zb+LnOTFqr3rAVCfr6hGSoec02fSGX8HgxZ0SMMmxoNd+RDdKefgF+XUk9P
-pwfY0NVhCfWyIg6Kb9YbmWEYs0HVM4BUsduVDbEgtp0rRPffLqV9FRXcE5bTUEOg
-XSd3J3suMbkOL9yN9KjWG+FORbtAkZ/NVXggADETIcqWaA41+CBmimWq6S4+yrt4
-01E+G+VmrrfZBciq3pjETjc2TQ7jWtf+1a0Ht41w+9805z6waWOcJLClFbLH3E7u
-mUQtUP0p21zIesiCitoWWHsqxJumlJD+JQpE0/6V8JCwxrXKudDLFrOyzw4aUHti
-lQkvi2tBbfl/+NcUP7kCDQRmF8okARAAubU+TrsrMu+QXMAIPIyCvgsOoTcvq4jq
-AiM7DHp/KbOLcgxS5kXaSZlTqZrbxEmosdjB3x3P7fYTrEPC5hd5AxvyYrA13Af7
-9vBDog6aeVIP+VDhQZ27uA5MW2pCRfChf60PbYtvZbdN7Ghgn9l26s0yyOhb2dk0
-/IQ8AGReWjrQxB1dwoQT5+oKZZyQA4mfQ4qDGY4tR5y/GbuCGBzDToKcVC4ukzIQ
-R/zJB28snDnbfxLEBWppyxnlfCkdn7m2I66Wx6S2c0kXqUMryiIRwBY+g1Hg8hLd
-lwIrcSPGCONCFTu+WbvGWatKmBjC/AJvremYyd2UfPw1o8UVGHqPmFRHuX/qEZeR
-kTZC7Rr0wA9/DW9v+0lGHUlwN8tznH6P28ksGqoIHhaQ6iuXh15qzuIb0amKBMjc
-luFUJRsr2KuLNnC3ghf0tsOnVfDhbJLCKKvLqkdfyEPAaJ7H+4gGKbDAGWThioic
-69NVtxgOCmtwfzJmT+QsrFIRZRcTLA69/01n4Kdwh3echgJ7lllpI6lUM8dLXLm9
-4Mg7Bwj7sLPD9jiidpczT6qadPDI2DDEWW+GOvURF5CsO5F1PMzOftSKVtlPs/Nz
-VPOkEdPD06YwE89OZbXRqhfNmfmIJdp2r/KKlUajXf5PlhOtHtXiZoMpI5s+pz25
-tEto7dQu0C0AEQEAAYkCNgQYAQgAIBYhBEM4eCXdsbuX7Da6XQB8jXwV2HNpBQJm
-F8okAhsMAAoJEAB8jXwV2HNpk4oQAKgfrL/ZcJEaKxOol8L749g7doiMu43NQIWU
-Dh/4+weBh6VdxI/6bXVMLs4/2l+RJxHgz2diVLEistqtEaShinSjr4MuclX3fMar
-o5GsF79ukFOd5oMn4EAmS4RRYatDCAKp8T2/IUgkHqJdfFqrPvi43gzMJIDKxyXj
-YVtlNpZak0t+2H0TDqNFa9NtmR5TJZMjM9bEB/gtv585prZCOPr5T3nHKDft9t/W
-M53VtflzPEt3VzXLBk8iwG5AqMH6bqkHSD9DGJQcMf14/X8QTQLqhlQo64xjIO5q
-MzJHgg86wKGYmg9yrnfM0rPVaQMgMpqz0CUkkvem/r69pgym1ddUCXiWb/3dNp+C
-TIyuwIv/94/06pCReFKGB+OYOYbxkq8ptVCq35/E6h3bUxY3MQDFy21iAh3Q5O/9
-KJXvAZfHLIkh8isv7BidG/+83AfPAkvDn7Edwjmpytd3png+qxzqfMBFgNfzwNSa
-AAubLkv7iID1muboy2lYifaVuqIX8zKjrSwARQQfxYA/6oDxfrkzzy0GcN1zvEOt
-ZBausdESRjYARDqbHqLp8fk+hQsWaq741pv1ilUFIkQbSSLw+2fFAj/jVM3Y94cC
-wF6V6z89IJHGyPoXZUyRwguoutUH+TiFp4bcOpGb9sxHE7c5QGDRLpsvCqycyApj
-y0uwRAvM
-=atsZ
+mQINBGZXO1wBEADEm061e/MGo2f7rpSqokI59in/egWbeQE26vwxB7vPu4e7j+cU
+Vg3AezwCbf3nVRAE9DpJ+yuB0KVkM/0QszjOEEBuehZYJrUiwMyiY6jAk8xtqjpV
+PsOMyZrypoJhwzg/sYNadUPw4UoHJ/xq4wNA2ZG9Xf0l8M3shYJPmKWLz/eefa5V
+Ef/toQ7a55l0aJ7XyACTU6dv4bkHHqomDImK2C94s+KyCxaFyz6NgFz25V/j66Am
+gB1m6UGGsvP4qYXW+KTsLz9XDvJeLLHWNcqQoyUO5Vs5C3hGozL7kEkyK/1qHcou
+XXkeGN365z93ZeK+VdBZKJtsCswPk2wdDBByU9lAUNHYcLHf6S8fwCACeIqJ6LaY
+MKmZUN2gR/boTyMERHEA8XnWXTDp7EsSNIc+LkU5AT8yesANcczH5k/XOI4hltJC
+piEsSgg9V7FvO4eA2iQWGv/Y4nlUfw3lbRuRFvd7oqVQKlX4iIs++kVCCegBvtNA
+1naxPbvTqrC4THvBSSZpOW/y/6XibAr/scCNNW1mEhwm5SPBHq9Sv35p6xKDTcgQ
+8o3KLM8tKKt6kokAqlrXk9Nq6LYrZKwg5a9crFF7nCL2xgxZy1OJQVcPuhhZy5WT
+WReE5RJdlF5VGRT9nMJ3B4Vlp5luQnMUFYXTAKQd6Cogbb99J4MjDttAlwARAQAB
+tCtuZ2lueCBzaWduaW5nIGtleSA8c2lnbmluZy1rZXktM0BuZ2lueC5jb20+iQIi
+BBMBCgAWBQJmVztcCRC83NijjYiiswIbAwIZAQAA9FMQAJ/e8F1egZGbRIV6qU/Q
+bJD3EsKZZlitQSVXbBpxqDlkD+uzSFATGjiLGvJoTzfpJpJjI7FwrtO74lRkjCl9
+wQUNJ+wm2Kod6rEEQc6lWkDsgxpjqAAGVS0lmMf+VPBGQ+kc8S3ZdCOWEeq7nThZ
+/xWR+UuQQcz1vCKmEgwTrr5MJVcqDg4wiH1Z4lRVfjTezf9IWk+xeE3mV8h7Ltbr
+N5ZvOkiw88JLrbQsurxx+lYEaGIZyIk3huiDE/KpsMdw9KXUfoDcBqWc7oDjqKL+
+QEaq7TW6VetKyJaakP6Do+Opx0BtS3eH86PEZqtULEw9WifC86GtRr50iTXWBTfI
+MFZo4AwigHXvZ5WrJvLfldY+scoU1rPMouYlZJ9W+6YHLjf/jpr4W1w6LKKXX3ah
+h4VLtlOmrOLA21E7RQ0PwoE6nT7DAm1DsMFCXy7lyp3u5IXGahnJddWCb0Px3RTm
+PZgOt+YAGJDsP46ngl5LxhilMK5f5R8v5n1lJ/XzFcXCEN4i/d8A1jx9DQx4CJN1
+wp/WZzJ6GjnCqMCdOBlQ2eNmhR+q1bAI79kSv86ahaM/aS1FvHMz8ppzwkRhv5jY
+eR9aRlAwaCPOjbWhYJt/xveOWmxCdg5ta+Pj5g+41wHZyNf9aqR314aKwsxo2AYH
+uUe+PgpsHbe1sQTkb/W1OfSCiQEzBBABCAAdFiEEcziXMGntP0Q/TTffpk/VsXrb
+OagFAmZXO+kACgkQpk/VsXrbOajGgwf8CAXJwSIhGOWFSgV6vpvZPChTsgteZxhT
+8NrJJLxL8X34Rw5YctSli4akkchTonm5RRp/SlvI2fPe0o6q2ymF4BASPJ/oSI3p
+Gs/jwctHz8hwaVN0xQ4SBXgquIFWrLRNOjCxEV/vMRJRzuF9jrrdv3vxZEugETI+
+rnoEZu2Z2ZlMj7PPeiScf8dFXax67+Xi5S2KJCaXm1QGAJvttHrwsbBAIE9CVUg4
+UmXwADQ6HkOKjY+QS5AP8Ak1dg8/oadgyMqB4GrcE44KUpo4YafP37XnwXfQNKpk
+Rb0bO9Qm9lM/LhPulBY8WIPkmrFCVhGTE6K5ZvI59R4nECHHx24/LYkBMwQQAQgA
+HRYhBFc7/Ws9j7xkEHmmq6v1vYJ72b9iBQJmVzzzAAoJEKv1vYJ72b9iPPIIAJ5k
+hTz2d7CaJefHzoraogKSIeBnA3OR+nDgdDl9Mp8i2WLGu9YYhIrPU0iSVw8jqa8t
+GIjCw4/bS9HN8oub2Ip802xDLugCz1Yz6CXjCXN2rlNPsdBV8IIKNHOv93qMvnZS
+DwyBUAvAs4XzF7zbYgfZ30B0gRI0g0+Nt44oDOn3PfO/kNUJyBVPT9m7l3JUHuZT
+FPOD8a0oJPvW+iYlSkmPELBvgehsX7MVLoeQ5qtS1KkuWr+y1wqD5kxqabMPcfdU
+jAr4ssXs/pSsYJVyS4CuUWkY4FiCJm4KtU+XPDs1RCTzMkW6HHgSebocTZzLETYw
+XsDx80qd21UAdGc116qJAjMEEAEIAB0WIQTWeGzjA9mpAimY3GzIRk1UmvdcCgUC
+ZldKYgAKCRDIRk1UmvdcCoG/D/9qLmHYOGnsmedUbgtLmuBJOuA6oqnaWxYI45eV
++vaAaI2+QfRoJTrjklTXv29Pi4LTzN5YBySSIkv/z9ry5Xsz5yroNY9Xb6JdrqOt
+fLa/U0wddNuJbmIom4gUPXGInhHUBbP6mNz+s6e2ukBEWvb2XIsGe5v291QXMohQ
+/PT8zTIwNYaw2zVF6Sa/0spA9/9XA5BdUcrtl7xPgYL7pLVmKYGJlCf5TOaWfLDJ
+mIMeeUznVK9vK+vT+YqUPfFyIqO7dvio/+MRFjePoD6csT4UBT009ugy8vrYg2YR
+K9uaRxP3laz9b6xdUM648ycUQLoI4fLhyKAHwPU9/Q+4rOFdrL72ZGVKzv1XOB0H
+VXf0/E4JmJBydM7AyXHNxIPDtNFydosGn6VZsEvSPZdQSCsCeBs9UuBWgwFb1XBB
+61XiHGnheb3U3ZRkajS1ZNdxfohHrBzHnd8tbDkv5Rq+XoUmDauoeM0VcN15hl4a
+M/JzkeOrHuJicn3mg+HRHxQSCl3D37bVQT7O36n7cff22GykT7XQUBBxMlhKzygD
+SgdQUtSEt0eu7AXIvr6yl0kobgZQS3wzUIaY0JEuv2ahtEXXjoPzCVWB2OHIpPbu
+D58cpyyEVqr+ZecaI4HlaO9lVShf+K0rf/6DC12rC2gNzzv/fCIinDiqiMsPTfEM
+fduRSYkBswQQAQgAHRYhBBPIKmO2A1dhVuMKTqDqmBtmsNlnBQJmV1HlAAoJEKDq
+mBtmsNlnhI4L/0MHtfCZ2nuKTF/BkxJ7oB3Uule0tWiFj5SU97GjcVj1LgawGY7Y
++zoyEd6Twpl6H/+QkZBB55Bf8+cTzRbDzH1Og0fSORu0pGC0uxWdYu1sTLeTnn93
+mesXAvevHFNbsPchIWwsVJopTdzMWuAQS5hMMMtNb/14ZfnBadzhjvaJeH3DlZVK
+0cGFp0qfbMfjr9yRJzQ1IkiXsS4G4uKg9T+KRsPr4+JalurWJgLnBXZGetNNjjUa
+UCV1KZY/iWCAlZjkZ5z7yBRj5nUWLb5AVouEQPEDbn+i/0uEjukC+G6EMq2mgbrh
+m0bFHbHAYBaf9EH0eP799HpoAx2aziDB5igAC516i3BnqxINI9mXHh92tU/H797I
+oYZvpBsAHDWDHj6O74jwk5lXF5Qwri8gjA8aTudmuQX3uX4h0/FyGGQJW4/wWecH
+/1fMuvHHyRtOSsJsheDwcSjrw5WlsyNjvSIbBPV2fIx60W2haVMUVX6CrxAeq44F
+UYda9m8fOnaIew==
+=TEOn
 -----END PGP PUBLIC KEY BLOCK-----
-
-# Sergey Kandaurov <s.kandaurov@f5.com> public key,
-# the key is used to sign the 1.26.2 release
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQINBFcok2QBEACt2nzM7Oqh6Tl/yNDzT9EXf4C5TTfxnKih6ehm0T0VWLFkWOxz
-bmVqo7PgS0q3bcMoUl8CIbs4foC+GCAVj8DNoiMkxvfxBb+V+qdzve0sh9WHUpDP
-dRBEHQb5T5KzTtGDarkhv1/15VqK1AOCSBroeFZXefr9bZqrGJCgixta/JZXSr6t
-xbouELXWzdviUEtcrN9V9rNJy7QvS2n/UqhjgCKhX5bdLVUy8Abja20rHiVUdBww
-aAee0+yZuS8Y/TksItquNwWce4qDtRrKxs2dmlLYsRULtoRKmTHPcpyrhVN7jIZX
-glYumuG0e5plY/4TUHeEu3ReFC+AdQIESa+6+IxgdIT6szwMF4u+50HFAFDiYfdt
-rjjAoD0fwEW7wSc8Ow9lA3m10yLqRuL+HbVQfb2F5iLsHa+TrSWOKfPboLo+Cg9o
-g7fVRYmPhSogcnGbFdFr52GGp/YRk8M7kbbYzuHmQLuDyiG7kyifq6fOBil2Jgyg
-MxRJcFl5G/sYw1naEKjAUKAMvCYaPdfFmOSJKDyFsR8ZaDO58rE/HUVsumCuN/kG
-wAFmRp3AzT9CrWFSXuZW1tLdd9d+6uHx9BZZUdKaMICpgP62OW1r4h0W8FrEkywf
-Tp/5FxEXjXE/xWRdeZ5sp9QbzJ6xm79c/N79vQQN+Jbq+T9o/p6pbUJ3rQARAQAB
-tCRKYW4gTW9qxb7DrcWhIDxqYW5tb2p6aXNAZGViaWFuLm9yZz6JAk4EEwEKADgW
-IQSq3y7fVSnxcCdyyKLexNJGkx70mwUCZyFKcQIbLwULCQgHAgYVCgkICwIEFgID
-AQIeAQIXgAAKCRDexNJGkx70m/ymEACpUcHefaXAiGEEvJa8eBJ+9qZUdtVSWDwE
-eP+GzlM/+6gbNRxFJAdcDDP3x3ALvAwA39vh8iIsrTONYcbCKi4uFMCH9/h08TzK
-jT/2Z9PmXb0wGaVt/Jz+qe4SjDimnEB0cE8HMRB5Uo6NPhaSTDjMGXYpx49RVzsL
-sJ9xsIDDd1it/KNVjpBMeLtyLRKQARjiAjVkLlWsy+PFxd7To0BnhmZ/9r42JrR9
-eBg3c8n+9hJ+ITA+nSV6RTuox4vADj5yPM0fNcITKpgbgvMv82C5S4DIs3KG/t/Q
-Cth25DHrrm+S0oiHSr9cF85IbwuX07E1HAYTUPuW2X2jLzRwlVihp/txg81W9fkz
-aJCv/tfvzo9oVecUx50WdkEFpJjjGTY+hMKE05dsU+SjY6Wi1kozcreSX4iAdlzV
-Y4u2Z8BNz+29dFnJSs8DMMgYslqiSzLraBuJ1gXo/gKeYuobgxZS2Yk4lft4xbJG
-STUjpLFbq29zGheUxjr9tGJKMrAyhK1X680KTjusR4sd4npAgBQgwYP9c8ozQ9+Q
-IniSZX3mLMcaTBay5JoqK9jR6sc545ltd/NFA9jA0eP7lUJPVjEOcO05DvrLihw5
-KEVopWd50S6/OtJAvd4T7kOxabolG/3K6Mfcz1XL3BMPKUK8dc4k4gEyiUfbYZkj
-05JdIMlO5rQkSmFuIE1vasW+w63FoSA8amFuLm1vanppc0BnbWFpbC5jb20+iQI3
-BBMBAgAiBQJXQ/pWAhsvBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDexNJG
-kx70m8pSD/QPwKHIg4ke+Gj49tnogx5I78x/5wIrY7ekk+OsOI/EisUkle/wpz+W
-nwEY0tVMGwg9G8XaWI3FWuUYnmHRaqIoeMlNaiYHJES00K5gWrrs4PrKNsHCMIct
-XTla88fKjnEgZFJ5KSnLTQoeIgxogbtEtAZyceAWrDc5LuW025xtleU3NLUM0jxi
-hlD4WAMz0Ov0qFH+FB0mTYvfFBKl/TpXnyMN0KSOmRQ8hqyAfeTi3hcz51PSH5uI
-g8nVLSPs6No253FE0MqQoED/tZGHNrkAEz1FIlYJE8Ze27vXMHhfx9Ik7rEbyS4T
-NQSJfVPxmiU/aI2gqN8Kom+vLP1qgrEoYXFPxFnYr73+iyq8UxIZcqGvQOx6XVHU
-GhIxj7fahGD2Q5s0GPJPnlCNvt6X3AGlARBdLAb/qIRAYD456kWlWon2P3raheEa
-EJBeFf1Z3s4/eOOCRP+ojQJPIr+g9MpKdfhlqvG43mrwRuO+ZPRPggixaK1LbWJk
-yImd/DXnTriSHeCKvHwvD2O74xvrKYPbYBSCTdG/0FG/3fT8XGXL84mWObRd3/IF
-fjjAnUugU75B+vE8dJh2B/fIzT8+TuXYCf5oyB1Q+INhwOSulJ2OUyizX8PhCJpR
-ykfmgACSJtM/dMJn1Q5eofii8tAIOjCaPK2olHJTWkS4hkPxd9y6tCpKYW4gTW9q
-xb7DrcWhIDxqYW4ubW9qemlzQGZpcm1hLnNlem5hbS5jej6JAjgEEwECACIFAlco
-m9ACGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEN7E0kaTHvSbCwkQAIuw
-/1e1jQkoGKEOJFtI1DMM85ByXwAwS8A4Xh7tOTYYYU59L6DeBFEGXXYsyb87U31p
-9nFEPmst/EG75wmaPGqqIT2IL2QKuVZiD30OXdQ5aJ3JVAJ++nwb7FYLUFt4JDDk
-jcB5f3dzHIy182EpbazDQwvlIn058n0b2Wm23nYsZOmXXd3b7KHJGU06jsnV6igC
-4VP3r8jwlWMh48SebTrx/kTDPO7VSayk6PBrr6ZEDkVs11s9rVNyXmXNVzmBTOGQ
-fllmsRdAFCUio4pTECrl1iAXLGsp+OJ80PsgDHSAVwiWmfhm6spHvDCGi0yMakmX
-5f/BWtimwqdAv+75wDB7TnHre40Lafqyr6kCkCzwr1B5RyOk3QhYZbGaed2dmDID
-lsF4MppiY46FxTu0kQroZOZtq/AwmPtxL+2R8cXgTBL2Jh7oQDmIxOKrvLK4hCbq
-mv7kCmgBUtNqzZ3sZdN3Va/deIHaFAJen20jOSLlokAtfFzyXpiRJqVwY7B96yXh
-dten5hRnAU+g2GcIPXd9BtDgDdyfbSDoREfh4fhUQzzwewegHjjiSJlGHKycDeFn
-NkdjjKQ/QiL3yiqEEXDDBZlMrdyz62DGWRZQLv/ZWRmbBAi/ftIjuMzXsZfuU/E4
-sB7GPnEouoKEhCqIV83RPjPI/IqduHu7sUK9LhR1tB5KYW4gTW9qxb7DrcWhIDxq
-YW5AbW9qemlzLmNvbT6JAjgEEwECACIFAlcok2QCGy8GCwkIBwMCBhUIAgkKCwQW
-AgMBAh4BAheAAAoJEN7E0kaTHvSb6QEP/j0PUJRm7NN8svpHy5AFz74MhGQtkQlz
-89WTZHX5kf+Bx6iGkOpCP5Z4iJBWWGn0XpMPwbDOw5R4LiBOhGwJvCpjxFLByOts
-EEsgqPy1ZsX10zg6MG2JVjFOYHUh+BaWZzCtchh7cUUwUM6SDE3H9Iis2+7Fkfz/
-UP6ha0/zLZONIq6bIzIZHJ1VDvfgY7v68R+XEFsQZpr4EKrriBQQZ6dsZs5xDYLo
-BoljD6KypOw6Cv9i7CCZnQnyctkVDLx4EOll/tRX+8tkl+5GpgRDGPzL83hBfm7q
-QNqK2J3Ex+iPcTfMCN64DRyyq4HpmvEJsMG+jfHJay87jKcU2F8+P8kwL28eBDGV
-ngl1hWOiOvZnSP13s6Ckjm95bLG+RyhcH30+sy9i75JxoWfh/sekYOVo4NmPFRls
-SdcMOJ5Znk702wx24qa4EgjcgtID6yr2IsotM/I+Y2maKBAluYDkRFROqLz0jsed
-1gMBNPse0oMEz2NRbzk6rfRJcYqX+s8jsS/VhzGd1JIgoGRkvFZlQTAfRe8NsDF2
-Yif504zarJABHRoGzLXvlYuhEPXZhpE5l/7i2PLVCG0rva+jBqwDValTaLyemVqb
-mM1FJuHf6Bb6UND4ccgXCiOIH/cGBXiVeYQQxHuuw1JZ+UlDViduVrnpWw7mFD8x
-BiMOjwL4PFp9uQINBFcok2QBEADPuwkLt5jAhIAjVVWNgDBNyqX5mW5bMvCFy7qy
-QLPaCPrxpEGjKA+hvK8FG9i/KPUlsdReZH3JPAngUteU16iJo8HbDum93+4a555B
-Ea4+Bzw5q0qREZPvybvhcrk/S93RpC7NAvwMUieAmJMZJnckjrcznQTYljTcX/NS
-WODutapYbCwgPf76kCsYFLcbcFuOSDiRxL7iHBjx3eB/3D1+dZBTfoTRqHQ23f4g
-M9q0DuBpifKI2KBaDU8z6LarT7wY+S2TsPESZ65vk9L5cMoZZkefTUlUEzYzL8DY
-CmjFqyeji7WoM28ophaLJrsgqtAbmzZLrvlq5F1OwlQJW7fvOwyppnBgTTkdYM2x
-gSLCtUfccgvjBpAcRPhP0MjAAyj7kFTwY6uaVMqyH4PL+e91OWMag2ZDtQ2y28RY
-PFkNBwOlFKemYyhylwLdPT9hYUXcnwmKh8R3vpvR2lnxRomKkx5IpTFIBaapf9eh
-9VBJ+Z2lEEhAprag2YaAgREGI4Ohp9WM1DtX6+bUf50TOllP78uKMUASGETtIeTN
-UoxCktefm4kGAk11OR1cfiyAAnFXXbMGYPPH1/TtPZUSgasrwjW89ER1xrYqklam
-BWEXbSEn4XCmeNJX2rVMhXZb0rJQuXEY0rIkVcyBXHHwnbUPgWeBtlsd4nxLxJeH
-zBQTrwARAQABiQQ+BBgBAgAJBQJXKJNkAhsuAikJEN7E0kaTHvSbwV0gBBkBAgAG
-BQJXKJNkAAoJEEXaUXSWk5/5mfUP/3cgCzFWd6QXk/oTqiXNJv5IxOM83XCyjoDu
-Zuphw/rzj+kYiBkez9YMJ4G7eGqZZsxHLgBbLOrom/a+cS862os9iRTEE/N+uqWG
-I6gSDPWihT/cnbBZaNcj+FKFtpe77WNcFKTw1K6vKGH/PkmlQgC9S4YJHFvLierr
-XUWp+J8sQn+vSbT4ntvcdqxuxYtIvHf89liZI3gmPemkapfPJ1ZdS7nNDSw74ijO
-rRzz45aZetm7hRY/BkujmJQ/27UVZaFHQ2AddUSLAA8keFLe4N47wL7UEVhPUTq0
-JCIZOSXnY/twMrlWv3OnVRRLtnph+WwAZ6O0qMV611kru77HHGCudAwiglkrkgvQ
-je4uRIqRLmFA9LyE1726n7Z20H3r8aptQ7wj6N6Ir0ARMC2/mHhFv8bgOEKnx4Zb
-8rLwfv/fqYF0brvyzaIUU3UqMYN4uSB37Y5HfBmtIp7yGqLWBslKLvbrizD4gFm2
-TqInaxClbfaX69dHYM5zZQK3GNsA6WXuIKTZFIWdnqYfzu6ihJmtLf5J6uX0PVt0
-728lL3fsXyi5K42kKnu3FBTY1iOTAGXDpGsYBcUney9mcrtbhr1V+/6y+B7UhNQp
-fAO/lCTyNwsorPSAaAEGIpUKJ6YZ9+kzcDnhz6ZQG0C1/EFRUGn0Qf2xNv8+RtB5
-tpXmVyqUtPgQAKjTE4DS+Fe/7MYf5KjQC7pc3/sgJVmXfjO3z9vclp4zcm8wGQAJ
-XZVCzY9xkyPJTWGtLBxdmyKUx39ZbXH3BBj6g8pVUiNER2JoHDleb2/YDnmC1hfe
-PA6trfKEfQFRPY8OkQj1z/vTosbwLTZMD6zjGGkZZe/bUMEK3pvl52Du54vANz1c
-+wEEK3+73lh3L8zcBN5mzlNZHSeAQMlkX+JG46y3RqQuli+NzF40/KLSh/LH7Wwm
-7pn7ju0sR0NxWyRpwx1tKJeZf8AzqSTlUEqPSmGuy1sGwBwf0f2HxGpegctpfLM8
-4CF4fYMvmLj4rSReRnTblbKmTmmiPDN1Qnm5qYHVPnNtgrwap9/6Xr2akJGlxcvx
-OyUV9xLDToPlde9PFgruWpzh7EiQbO38LNF0ckoV+1z9muPh0s9D3NP+IgYcKuc8
-pOa4U2Y+ExAfAmEmiSUpJ/7G6bCxrdaF0/DFtA5TIwnTOI0CTh9AOBtqPcTe0TGT
-UARO0X5NqLsQy+sXn5gXdnrupzijgDrLU9v3ke4oXGAWZwuzsEtQpAuq/jPJF2Gu
-HgYDQ2qkNDM5Jxxjo/QC9ZKSbkJy3oU1Qf0lJCum2XHDjbD8RAaqGkiR3etBCO93
-Pmp1UMXdYLNqHC32BUIqrBBEWyBvHBhvF5gdqeddGszTm8kD36VL44FBmQINBFX2
-5mMBEAC9NHGWvdZGzFJ85VLglbBRgqoaFMznC6Dz329M8Y+pVvPE/YY4rhX6FGxT
-3lOLY7mSpRf3PpRBrGf1Iz6IpM/ZBs2fFfL1uXqtJ++VkOG5ZRpTzVoyFloDndqx
-v6VpYjE2ljb0kxdyOkMPIRQHxRelQwHJyKZI01oG5vXr0Th8/1giPSTwJ7m0h04y
-iweREuUr5Q1kBr1+Q1MgmErngVm1bKO/aJoWMW/aPA3Dp7kh5rGst7gp/wX7veH3
-K5KTaqM4NinGgCNhHJfaf4ANBjN4+Ot/cYehbPUDmdrI3gcz95DSS0N0R5YgpzFl
-yHxJ3FGyCrtbNro88Qxn5/JErevx3GDsvhsGBWrywF4VnFvoG8R5O7wZGpd44Mpu
-YngouH2n4O7oDq2n/0hIi2BZsVBO8MRxEBJPZEOwkRIBD86NXjZrA6LB2dQeg/uT
-eNdPAkxhhxrA/nDgYILNVDIIMq91DpjQBPWp9OO+mHhcM0eeSJWfONdK1cT18kfV
-v0r7fOGtFJvJ46EQvlHMORYVHsFZhtOsHbbybSVQeqqf86YtO1wDw2pEjRdz369V
-3bMd76WsCx1g8p0PursJO5l2c7Mha8NzSRbM3yeKuP61L8JKHx1prp6o25UOMszR
-JaQoYheyduhc49KfnKLj8i9593KzpIfvMJpoSCBV+OV6AwowfQARAQABtB9PbmTF
-mWVqIE5vdsO9IDxub3Z5QG9uZHJlai5vcmc+iQJXBBMBCgBBAhsDBQsJCAcDBRUK
-CQgLBRYCAwEAAh4BAheAAhkBFiEEPZg8UuuFmAxGpWCQNXMSVZ0eBksFAmch9N0F
-CRTtdXoACgkQNXMSVZ0eBktE/g//VfuzVv6KmNZClp3nT9Z5tZ/keOUpV0aElRjh
-TCO//OqigTVnsdApEIMGhkFmHPFRd8rJ6uhuYYtM6aS89/YhsGlPcDJOOqSipeSC
-No9eBBTtPAuo9sXvQUlO5frEAWXT2MNRz56af6IoMVYpr6lLJPlXG4UJ6jpNwZPM
-+d8L2PC+riDAIjXDQ+ZZv3sqBLsSMb1OCKCTu6uaSeSaA8hPfgMz/6oyjcFLsATR
-wY9ixcRzjxHqpuiMWXK6yt8VK/+cyEYLT2p5Kc3sChjtqLSjcYM+rousYfBy+qUZ
-eOhZPgtzbTdIu6RhZQitRDlf1HQb2dLGDl+AtCZQFXxY/lnSB4D3JHYGjadZ9q+4
-pU9v2shGear7lTXAwNq356I/6EooT3iwNGySiehBl2sIWB8PWBDa5bibLdhmlYCM
-XLAFA8v4tgoU+/eY5elo0cweXVu0VVaou5XNTK4bVAUnoLCdd7kOtqUiapGxFFFg
-8pa2VzB0G/Syscf4VS6uw312lUQUCggj01ZggRFkiqaCMq+ldp3zt/wVShuU4zlO
-Ft6nf/wGEaFX6Nz/uWy14NZoFNO6i0SA2zL29Lh8VyHAeEqvwNvTQWyqXH/q0JJa
-+/ANKpdOCYZoOGZK3kLzuexwGFz7v/Dhp61QeQXlPxKwk5BWR3zFuD1L4iECAUK/
-rSZBcFK0IE9uZMWZZWogTm92w70gPG9ub3Z5QGRlYmlhbi5vcmc+iQJUBBMBCgA+
-AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAFiEEPZg8UuuFmAxGpWCQNXMSVZ0e
-BksFAmch9N8FCRTtdXoACgkQNXMSVZ0eBkvNKw//aY3KISL+gJCDqxJw4jM1KG2R
-+yCj3Pk/kd+Jn2V6w0zcdGZNUGlDKju4WC+pGfhNt0sPEFIBqVlvqo2g8LWzYMEY
-ObHGmGGExdcNasSROEecEZCEO5tUkO0mIGVjj34Uz+2vEqA70cIrV9OTXjbCTu5/
-5wdMu3WhuOs5nos23wuuYtsSELW0rA34AH2E64YlNQj/kaa/NQbd0kmqENuRrrua
-Btm37mht9rpazN4leGJ058/33F5MvgGvJlXiZeHPLWAGqcqvdV/S0DEoLnnA28kp
-MjoTc5mdsqrlFzbKzGAmPT2GsAOId9NFR++A1ZwRHnEykQZPhpYynoJLBCRdHn6a
-adrJmP3UlDEpNjr82Dwg1KljshhDrVQ+BpVDSuBjw7g1BzX2iFoym9Z+ZH8Sgsbq
-4rbyyXXipO5vvrENCIm2K+h/Se6Gp370lIc7N1YIfdFxdNgf8Xm2gsjb/N+TLPYm
-WA6+/0vAMA/SfQMo+8KzO2R/kpko5SPy7aVmc+/wI/X8FcYFe4dhHpp+pdGgxgUe
-KJJF0TMBnSYbtUrsVgZL3eHMd6KhA7GioE/JknpuqDjVFQ9Pqxsrw+S98HhsJJll
-KgUBMel5SF5nnealImOk+At7oqJOC3cMDdl1ljq3KA1OzMTQPQ2o9MqVZQCOqN+v
-c1R0nTsLBeUqS9sDcWq0K09uZMWZZWogTm92w70gPG9uZHJlai5ub3Z5QGZpcm1h
-LnNlem5hbS5jej6JAlQEEwEKAD4CGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AW
-IQQ9mDxS64WYDEalYJA1cxJVnR4GSwUCZyH03wUJFO11egAKCRA1cxJVnR4GS8I1
-D/9DHGPgpK1w5WF64fZ6OmksJlsXh95u4YHmP5skQoazHpurH/KxUqMPTZsJmZJ6
-hbbiEmuv8DJWdNH2+m1YbJZMsBFO6Yccf6KjiFhWHhqBX0VTBn+OoYpNZ30yxP4z
-p7QdJtF5+JyhOa1FzKYPBL2xpNLSqOn0FJe3sjXpv3LuYKhWxVD9MZcLdxbILVIB
-H9h/fzlSqA8eCa9Me09MVjVBcpHi7odtnyiJCEOmom1fjAGJxIBjWswc45pNXk9L
-feaOtIAkP5wZykR5ja3KwnSKcwyef137UFmLXYWUslvUyN7iCWhcEbuS+naYZm84
-9a6+CXNt2CiLeNCN9aUqE5YB4A1hsVrXRPmdGUMqqwqDV32mtkWHm9fFKvlIBOmd
-7DrziXp/TtOCwn7ssS09mVAywuk7emJbQ/TZW2ErTE9+GBvEVbDsiDS+O9/O9FL7
-EvLbZ9ZiQaT7Gaw/1sFpph5fzuKH/2QjbtNk4SrSWnSTaF9E0b1sw7PZ0V9so656
-Q3+xE8Bxk06r02QtHDMhe1bBVrm+mYHl0xGgOVPGP4JxyiGaSrv4m9tsGuKui+6R
-UoGrD/+RofeJ3yprm15MwsZ/l677LVQOaJW8+g2ZHuxzgNBeFXzxgpmKOkIni8Er
-5aBLXZZGunxMeix922d8veVIoBh26bI8KSJdAbfngkJzR7kCDQRV9uZjARAAqSfp
-goyJefQfvRg/deF1BNZKc/c6Vc2E0Tdwe44xQiUlAKv7V45v/uCWuNDeW+LzslqV
-bAtQZJJQhgOzPjwonUH9vb7DDCXZAUaYSFVu/9WAVCXa+LyNn3DlYZjnCQylGDDj
-NephM+VlS5jj/8CcG7Jq849trN7Pu8miAzjp6xwC/kFiaUhkGHRX/9jBlD+BJIEe
-0v0U79ztHU5jYRgpto7Wi2EKLjquUcM8fAhgqXyjBPgJUENcDBpv9xHDMG6iK0LJ
-pje9a0rQQMjFPFpEJRrP2hZEdhANtaiHmPw4v7EZFMmKqlYA0rmA6xlgf1tQPvWB
-zY5Sm4JWpPA6oloTHaHQp4cQAOyhkUIzs4lBfAI67izZ0f4OSV2YN316TyVVL52b
-Z9hDxD8OEpMNJB+UMmyWj3E0/UT6LJpwia2++gShtEjmcAvLoSOp63Jpoc9kivdq
-FJru+480XCZgCMfRw2AjXSh3oCH9EJKVK/7ZfCWunjlvTgz6JeLuPiBEhnGDtung
-D7qjvJzj1TFwj3atRdO0Nvv+OnqZ313pCgLQ8xekmqG9ctSSekD31/U/iF09aIHd
-saTzJoQqGnVmFXjKgmCTP2fa5pvsL5gwLaH9+oqTDasFaq6UdbOuLQWYld+8kLKM
-2pxg8P92spjaOQMlyViiRztlmKa4jehpL3XPRX0AEQEAAYkCPAQYAQoAJgIbDBYh
-BD2YPFLrhZgMRqVgkDVzElWdHgZLBQJnIfUPBQkU7XWsAAoJEDVzElWdHgZLB+QQ
-AKCzJ+0EqJ8HvtpmuxmQYMuh80TMMDagGzA3Vg9XrVMCW55WpjfZrrp+31IeSIob
-DMGiplsZaEkGZj7a+FIXH6Goh8aH05cdETZRWYPa3AMVj0suTZ8YEm/cXKh2BfRu
-6zXuMBVXNpVhhBe9TJK0SFKNkbvTunDhvD7qIJJ6r6+btTYMRt6VCE/MGuR77kfo
-N8orZq5tpAGyi6jLK0gDMEsNuPzXpzZJRUX5MCtnizDFMpM+7p83kiZqEEwU2emi
-9HjyKfU1I3QekW7AmQAj/YR9zV+9cs5OtqR+cUGbcltbtwqexfLC9ySnCoxPxyqu
-FqFVXmBXongIAWnnxqiYol5V7CLaVmBI57s6cjgvQt/Gj8jcfiPkBmFbzGx6ivIh
-pG+KvdpMj4XUQ5cBQL7z6X1KYggk3UxEBigNC4MAyLeHsaEYpKowXLpRrgFYFUHD
-vUSym0C9s7iMZFX677tt6nJs3dJScyJdkJOhFfnb0gDQE0A1WMkQx8XWqQehD5Pr
-qv9ashfY8zaHlclnZ6QqYKHULkIaoVDNGZCkLiwBid0+PvdGvGhu7OL1TDPCng/6
-E727g6wZcxMYZTAmewva/KIuOpb+QWy4r0Rsg1eeF6ulTIEGfjOKPJd6/RsVd2eJ
-zymVrCUVcPvLU8nVKsgJZLYsBeiq4mtaNJ3rvmUeaaZImQINBFilU2YBEADQf/CT
-tDpsKjzVeGJa+PIJq+qjdEWU2KWAcarjyafNQEDjEaW/FSj5k1PLWuz/GLdPCH6s
-bHRu92vYUZ1gU/GehUKirz+r/fPI3T0l4MVL+PqldE7j5TOf7WJ7y0OXzNzbUWWd
-+7L9NkN++c7Dd0F1CbGsVsITn0lF6P0G1g5oee1i5RWs+l5JkYG4b5Yjzxs0Fn9E
-Ie+Ka5bdxF3r4Gha/zc2BVScUCi8raYroLRd1wD84UunrTjxHmVkLujHzeIX130A
-cKKZ/z025DeVkyGAO6d0gF5KaET+O/emlHQ7/dvY34ol6CHVCnnP7C9VDQL+3Qr8
-EBclXh9KHbASMgaU/iMYmF+7llDvtivc5l2A7NypLPOUW0RukmyGnLj8M8LtDzhV
-yP7apG2tXEDVZ1VaHmvDcbwparCiDzAbmX4J9QD9m7s9r+V0yEFxGAKtsvVrb8Pc
-ZHhtbuGJaFMrcco222pbPCGYOclqvSXQr59/8+qkP6lSKnYa6UAGIMVHW4LmOznA
-vBm6akw3t8QYlKByb8C+j0w0lVpfkDwol5+VDnTLnE/aVGw0nDgvWwyq1PrJz1Mf
-PrHi0nFKVizuZOD6mlncKFPuU3cNaSfkv0iNg5tnIalGIsKbxq2fjDhcHAfxXEFH
-Qb1e0DkgLB+cApLBX+XsEDTCLiMPqUN0sggHHwARAQABtCRPbmTFmWVqIEtvYmxp
-xb5layA8a29ibGFAZGViaWFuLm9yZz6JAlcEEwEKAEECGwMFCwkIBwIGFQoJCAsC
-BBYCAwECHgECF4ACGQEWIQR0bN0YYYY0KGDrnrVj/hDq1V0P2wUCZl3cnwUJEXrw
-OQAKCRBj/hDq1V0P2xxyEACu4krhemDHg6kxxr9mNPEf1sPcZGA286cpvNfr6+yB
-sbpqLuu4QCSJbg4hkPhB/hJHhtNpg0gZJpITEdT2+J+GKEIYBQ5IkGLxZl8uSFJ8
-3MsGEzLKfFMHoBpiPwAE0ajWI6ZGhvOFkuWDBYVSrnIG7PKA6OiNCD8VlrOMwOU8
-X6jmjw+zmUni8iDlM2zGjgZcg99zdZnAPuj5VbrNMya4kTNZVAaA69QmxWyAGJI8
-DApwj4ATAAQCCB8MCzYwKEvyF+jdu9AFLeK1RoMQVZzxXvDBsSg0a4xHYMcHrrxP
-YxkAlU1V1FcZ71Aw45rs/qJXKlFiPzOnEGezJUawbNm6Zujx4vyTihtBZxaHMuNU
-4wcrF4zUck9puaIXzEFuTwkCLWkb6xWz+X9XNVsF8dYJ+2klM9q3rKtDBqsnS+WM
-E1g9+TwpSyJrf174OTVztlgAfjeQfLeYmTMEl7FLDEnRgyHK0aHeFHwxKllZD0sI
-9Qhda1MKR2yPnmbsY39cV4+cVzrDwW25SGC6X5fSZtK5PmfneiuHW5EDRtkSODXU
-i81fYGCjtlEgCJ9y0Iv+Pb7aLulIWUfqTYWRbNZv7kSOgZ6uU5hcjLpO2xfcV/sD
-Qs7iffX8Yp0/+Q4/wxU+Xb8XElpei8X3XO63/Mvjym2zpIWLptd06h8a27E5PjEy
-KrQzT25kxZllaiBLb2JsacW+ZWsgPG9uZHJlai5rb2JsaXpla0BmaXJtYS5zZXpu
-YW0uY3o+iQJUBBMBCgA+AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAFiEEdGzd
-GGGGNChg6561Y/4Q6tVdD9sFAmZd3LUFCRF68DkACgkQY/4Q6tVdD9sc/A/+Il+7
-/pixpTIXkQwqExrTAdJ+jfzwyJ0CDZc8Cei3crfZNOwLMZ2ZGPJkTOURHkDHp/+j
-JUyJOBPwXeBWGR28ynGASZ/ydhLBGcTnVUpDE1h92D/D1zJx5i/yVwmsWxiP5ZyI
-Ua+RX3cVUJfYjLvljNrYiD9/cm21+Us1Kgqm9q3omMZUnarIFRmj9uIJ2HNO1n+H
-6HpifrRGl1oI8Ru/NA48wPaYfrB/Z9QqRmv8UhXRXp1q3REQ70d7odvd/KS7ssV8
-O90vdm1FSx38B21ZBgr0d+wDDVazzdrdi9Hby/4ONiAz2LoLDB+TuoUV8nfvyRhB
-KQTS+pFfEPP8U9cM5gJeQzXB/5LFycopAjPzjFolVtXRgXTGzjFmoGiQ4QVXtGA2
-Rp3ohZnoViUJvkcRXZ+RWJ06tOg8IGpk1LhI9M6B7YXTVMQq3/L/89oES3Sro09R
-wUw7gpglbuHdV4SrLeXotx15cnlKUOfU4oekgMEU3xY2ojbJOOJrchlBhw8s8tlH
-MhOWoI8ea8Pf2RpuGK0sBFzenf9naE8Q9mdcsK7OQ8smEhlueGu2devbv1wpDt3e
-UN+oxXN+b0hXg9T8v+NdmuX4fQ9NE6E1MU01K8XdHBtq+IrQAwT2IffdCS4Ghgqu
-Tj/KRJmL/E7TZYhbvCXCMFCVlhZHroDx+3X6vlK0J09uZMWZZWogS29ibGnFvmVr
-IDxrb2JsaXpla29AZ21haWwuY29tPokCVAQTAQoAPgIbAwULCQgHAwUVCgkICwUW
-AgMBAAIeAQIXgBYhBHRs3RhhhjQoYOuetWP+EOrVXQ/bBQJmXdy0BQkRevA5AAoJ
-EGP+EOrVXQ/blm4QAKlj9eJPZQA4nxda5qf8qMc9061mzs6vBsnYiE8PZF/zZR7e
-AmVT6Nh+MQH3D6j4FrbRTC+KjJ5Hl0aFG//V1U2mEckK4VdkYHxWMTyJlZ91TFK/
-vPhdszmhOxdhT0gcA9CmbGhnYb62t4uWw3T5s6bH7GKPuiVBSLu18QryiiHHXzyu
-jDB9znlJGwH5DUsO1jXirCVduiJ8+KSAU898s14D280ytMl26nxQE5n86jIe4s4z
-xOW13nKOLSnF7YDWhkpDSegE6+Kd0X26PiqRuMHdknbV86nktn27wP+/woNyzaDF
-4Ga3HXInW8s/5BHtQfhcuA++pHWrYZhPiBzNAcsFIim1Zv3GfxM4+lUbkwddIaHx
-kfMmuRKBYVA9/3TIujuAK8ovBHl7/zB9WBeEnAML3wzSmnAFnQdyshc7WAMNh5nB
-hWFTa4O9UmPRKdIfWdNVEp5TDor62r3R4Khjij6LPCnTzpX4OmwV6keRAikDYH6n
-Kik4lrXwhTJCF/HsXFyNhJWYsLXai9b3oiWrayJ4hX1WE8eYc/Gq7cNlHHin4wDD
-ftPpsyDBq6WYs43U4x4jaKsiRWgPnZdYPIbL0OkDtfH5Te3VQqHSRTeyuNtlVWJb
-XHn568yDeIxA5bAlpQWIKlui1exTZtyZIVMxOSaEBa7AutGnSW0WjaCG9YV+uQIN
-BFilU2YBEADWFWz8yy8cS3z+fnj++pL974UMe0X37GmZzw6EUHePOwI22Xl6DseC
-E3LpbnRUHlbnKOwLm/R5tUy5fXgXgAi5REntWJ3iJNgQK2NxG58ow3la+8jRMGdk
-GXhdtH6R8JG/jFCUUdIbT9FfhvKUKRT5Yja/Ai/Vy71abyzNuNBA0i8UejHntFHX
-//LCwVyuSN4XgorXLWLg/Vg81j2C2kbznfDLfdEzM3OUyozm1i1InIwT/oRAyIRk
-JbgmDLRY/qwED04YmDcteDemDGbDdTrmMSklMSSGR6M9V429EFjLdVEWA9YKX/BT
-Y6ZNPL1R7E/IQtHS20JJzKvFAVeDz8fPD1N8sfulOaZvx6b+UE+G+fcv+mUP0wEG
-2rlYgdIWD4rOQh2+eLIPoPDaVTfaPy34B0EYtk3T2sDGXlIEG3wqqRFkSxfEX4Qw
-gT8/rvIbmzi0QFGrBKS5WtMA2sz8lKedXYlRqN4FaIAKRj6isErqgxvRyZRmhWyZ
-khfKhwcoMZJDdjbvoIEp6cos18QQYKYczKz7nbnGTpjT1IFX2wik/vBxRYvgW1gP
-u/ZkmnsbuG2RRxtXKiqs7GInoY16ptMWTjilAanv/XSXpCHGfmBmeBGnJHo7hCxo
-TIpA5rDmFrIgGEKZhvaI3P7+BKuQ+SFq076NSOReGpnaaISmjo9kWQARAQABiQI8
-BBgBCgAmAhsMFiEEdGzdGGGGNChg6561Y/4Q6tVdD9sFAmZd3a4FCRF68UgACgkQ
-Y/4Q6tVdD9vfPA/+IrezMN9C3FJEwDYuyJ5uvltgh97NdtCelvJ9lvwa370X8G5f
-wRMdMMYa02InhuskSuArLuIsvKYETcLiEZyiQaeEWvuPqSQs1Y0gIjmAz6FIQBxY
-JFZsc7GmOeuq5JKBLFNhN3g7bSWGvm9/+02swi6IuLwcyoUBbH+aPoGQF9yZlwgu
-ylTGozu292ZtLlr9iS1foJVug+Hl0xacaiAAbRxNqR/EfHTVj7m63DS4kTJpfLb5
-ldGWZD5AGdvUTytJv8eDMdOGoUnADThIILgneXu33SUUoUwO3JiDPw9dicmez+yP
-M6l3H8E1OqfeeCUQpaTLlAGLYSCrDVH9iMXANjW9/W+y9pioo14gsmBft/sIY88u
-TxbKb3H2NSmk8IM4fc+XduKGsxYVEf9IWlLOpaxtD1r056NBJsjjbpMjaWywW+zn
-aXWBRqRy8BTf1/XOtXXpqligXAXAzEbDIJVTuQ/KZql5/dRHMR2zF9kdjKJ+d7Sk
-TEw772uVyhuKIMqtjp29jwqcw63BkmJ9k8jJC+yXUSLTj0WMKoI0DPl9cQSbE6z5
-LDGtZ1blbieh6whwYvkcOBJd6vSs/na6qqEIK9oMsUtG9mI/8q2zWV7xfGl5o1k+
-raM9hP1zGCymc3FdhrjqB8zB7wN7oBW7Or//Ct1ijdR69HN8aTRknIj6GPaZAQ0E
-UiC0aQEIAMHzTknImxjohJjz+EIl1DB09sJ2vBmt0vL5wkM8KccaYA0MpmOMqooz
-gyqKoxywdOO3Phqk6n5fLtjsqTgWoG7YivipiddPz77pnMvnm+1x5bbNCBKdGQZp
-a2gkf5RbEYwjEjPgbzt5FHzpQT7++oVfVnWKg0oeyjsTXGxRHLoRxqAhDSWrFHij
-K+iW1E7n9eE2DZuPO4ATZRr9zUoQT9pkCIoGKXO7+daCU4aViHwUfF295ukKWg+h
-Ldigp/eq2xGICTo2zqOMmJU/PpVFv19ij8O/jOLKuQjlTBOgDZ9vv3OFLAp1YBeR
-rUqWwcn7FZfRjaSl0lYV/3bXsp5+NYcAEQEAAbQrU3RlZmFuIFNhZmFyIDxTdGVm
-YW4uU2FmYXJAZmlybWEuc2V6bmFtLmN6PokBOQQTAQIAIwUCUiC0aQIbLwcLCQgH
-AwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEC8q9jUqRTyt9GwH/3BW2Su1m6H1z3ad
-S3wrNZxgvF9mcsySFh6DTNzRzx1g7qlZb0Z3NATHgmYZ50Q5Ib4e4ga70kqUiiOW
-zS8pZjrKU4cQ+dGj8XOdfJj1j+xD9lrbXFHw5w0B0adb8GM2R8Evh+1lv2LXLwaC
-Iu75z2+uMdsTgJZV257tGKqb3avSvmo0BPNGAXcRrAo9ejJR2g1g0XwWjFSCOIah
-fUEWA4vivy7+wrgAqYER1WyrYoQ54yGJuJgcQ1T6HjJ6dHkFfWmDMPz9VrrjMLWP
-Wz+6ZPCsRUNM4K/u0do0gmxel0ewguEH269ImDyovYMi75TPmkeLLgM6EickFa+9
-gB4WEKG5AQ0EUiC0aQEIAMQGNvwuaaa+RXHMHMaRdocdgLP637RQqqEncy6b46A2
-BqZhLWf1i1kSrdaTgsgjIYlTWB6jxtWDEbwXeVsJK7gZebjZyb2sO2/26/aT2FQ/
-jrEnYXn6f5QGXjV2OEIaz7+jGKGRCE6HCjGbh2O7yCRFp6AM3tci/XV1LaszERb0
-f3KB7V8HDW/h2zAgQDOXabv/c2sTt4tQNSwPExg8gU1xWNpsnUNfJ/O0o6xLUUkj
-7Z+VGHmag8EzUermS9TtF4/oNlrNZPD6GZTT/qw4Pff0t4alAsV9jc5J0tq7odS5
-X/38WGZNF9GAGCtSSAHZFhNoxetz11Z0ncQT9S+71K8AEQEAAYkCPgQYAQIACQUC
-UiC0aQIbLgEpCRAvKvY1KkU8rcBdIAQZAQIABgUCUiC0aQAKCRCi0IsGAXXWCnEg
-B/9fcao+ET8dLGl/ASL35sPv2W4Xn/sduwB+FdWtrgfmrK2a2RW1cY4KStgY3suT
-8AYob0E2TVm4KSu6TQrtke0F6ViR+Aione98tDMaOn4gp2x8ZVe5ZiBkdNLbDvG/
-l5fjgl60WRibkiRJp4LiyXKvjXDxs+2y/cODZNutGL9cus/IYshMUXEgztCnr8AN
-pjLobgWklRF77Vb2Gj0Xyok56E1U8hX5WMI5SgguV4mOg0wXpiQytgHah48ZquWx
-9I56EuODmCsKdXJNl6xdcYZR21UkS0mWeU+p85nY0mRwE1MWPN7IH7S40vpRi3nV
-aC++3YneSr1EGtQZxJmVZpInj74IAI1yP3KldOts74awN5YOXiDbbh/6Mtkelxpe
-+FzSeiHX/olqZn+Om38Vme2ntU9V2Y9fbtxAo6VboITf5tXP3FclQxOhM10rN2gC
-UOPDIRrNDXxRWoDjbbihpUJIKbVTYWtqbQgSCs+S0rUROK5/+sAkMX2WZ4NmyADU
-XXCTLRpSJ7bNei4OFMSJtwhgFzXU5+YCaX9NRsnEdCQVga+IDFtSFSSo4cIfECND
-FuyfEnjto0mI0sosCtOv2yeNBLkl3sS3X7/F9UdinPcsChfR+1Vrk/zwtP6EdjIv
-B+5MMuXbP4f9mdDCCUSJ2Mte66kuds2AL42AME/4M2tE2aB2HTWZAg0EXEM+0gEQ
-ALzF49pa+rlwMwFi2ul2ZHbRhfnGsNdR4eC55JUT0zDzIJqfYKrUBzWMdidfGngm
-Peri0hL0mragBurHK8Ex0lioTPjPvT14OdgFpxlBwaqiMuHccjY/uWaYrGQvytLd
-DdSDTmZhP4zCCZG8g7X6TBBNyrUB4H3P3/OKSBjUm/VHzqAfwbzg49slSjB0T+ZP
-elD7ZRCdqsJU8ndYm1k0Nc9HOySTS3mH4yDlG1f4I6gd+y9YeIRROYcx/KfDj0Yb
-9gXqMtJXMyUozPeN0548gCumbYE1S7wO8Sf1q3p1opHgCH66MN3TyX2PzAWEmd6e
-f/34Q2Ob2Q4ZBY6Yf98Qg6UwABNV1kR8dV8BZuAgI9Ks/KL6/cAITi4ShrDzkuBs
-ABuHN2zCUt7MvFLsstOl8NlQVl+SGjUxIZdoJDjvn+JUB67GLrUHZVyYfiU5Ifsd
-g2QxjyCAaTb9Ybfl6rw9mZ7w+9dSYu75/aPPL1cV6Qiv78qzZNyEJNgLDpuFIs9r
-X0dqkLG9ZeA1xjNnyNQuoFewB+Pg2fMFOfq7mewnWt4Dwag728tpB/csOCv5Rj/P
-7o3jviUBV+vR4h1bORY+9fx9wEJ+IH3jis+v5DnRFR9z2eAgo/gmx+WFdOfrTVov
-ivqqQJwFWo795GFvi8IBSjtyx6ZMrMj/TmigZ9C1nc7lABEBAAG0Hk1hcmsgV2ll
-bGFhcmQgPG1hcmtAa2xvbXAub3JnPokCUQQTAQoAOwIbAQULCQgHAgYVCgkICwIE
-FgIDAQIeAQIXgBYhBOw8/oj2ygeId09cHRqkS+ZJ3nYKBQJcTfuZAhkBAAoJEBqk
-S+ZJ3nYK470P/0WLos6tT6JgeN8iT7BPyPKEXVg0BOeihrlbvL/hCVc4jIqaRcz/
-R9ofWFk0Z/ipUrh0FR7C6EAswTO52RcSHO52D0qkH1Jodk1HkNn5gejbTjMnzg/5
-olrsXwU5Jxs0CIbikUYLuxDG+0DPSyQzTIux2E2Da0zyUzef17+s7gQrtpHnmiPM
-T2kJaFFLH8AphPvnjkrNe4JFOTLx9Fwjxh400s8ix6hXdA+R/uo2LpheXTJQdXmB
-AwJaqBt90cCWN3b43VFm93N8Q4tU8tfj92DFvfqL04qS4IAcugvZRd/NwASWW0dC
-6d02L/FjNKLPMRgF4htWtu6qIk/XOaI9QrEeJuRTdOFllRuicpE1U9B7WE7jsLHK
-PVHFeXo23251rdb2jDoqv3oGOzdZUFKqy6iGpoCUDELpFxyyWsTD/s3uXxLjbcsk
-jplX4W/InOZICqQs3P+24VIyPvq4fizV0ttG/wrh9zDW9mCrL/iMiEEXJyfb2Ew2
-8iYpsycsPALsr3aUEZDqGnvn/Qd/Woc6kNqLJX1CrOvexM4xcmJibdpzlsOolv0y
-Llg80HY4PfDdsMwZPn55aObD1GJhPmA2NjqdmEOJBL8+0hzqXeLYZoGNJ26vCPjt
-OUJYAuPdmKIQqLJtqcrn9hd1VcZyEueg2TF4jVhwA1mFfrQVYTJodmxrtB5NYXJr
-IFdpZWxhYXJkIDxtandAcmVkaGF0LmNvbT6JAk4EEwEKADgWIQTsPP6I9soHiHdP
-XB0apEvmSd52CgUCXE36pwIbAQULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAa
-pEvmSd52CuiSD/4xqtmnQJJNSD7Fce1+Wq4Al2iOaN2kxvjegTzL4sxmOAsqkwZm
-AIN6kT1jeFPsMTRYM0N5z36bSSuhAwQGOC8PpCkeKPKOcz8owI23Pf23uW708DBZ
-jG81sRlqCeHIfVvsA+FvlvLLJyQ21YuQbae5CslIINyj+6FEKcWfTE4JihJj7nHv
-czkO/KviyD25ISPcwkv9VQh5Hlcp/k65wAqB8e7CoCaDsI1ZXG1t0tLHQrmhoN/l
-SyN79yKUOelFyF+kVXi1/c1Q2ZwKu9gIHuBx3MY1/e49eoi+WYWUXNuCebaUpCYB
-7fkQEjihyRjyIrwqim0CoWHNRuDGxWxs3JWi018mt0OHpBc6OKIXdoGu5oIxtEif
-miFOcAmMRFA7KiS5vrh/520M108SKEIR+crm+DoVvPM+i6cDxoS780tkrjySFwJW
-xsqx+9P7kWVpMChf/JkIzArCxGJGfQ0QfNea1E3PQiZJHjpT10FG8a9nwwIItI98
-gFMZawu4xEjv81CayAm8QoWAMfSjFhv9j7Cm6xgADCogu/qupmNPUOtxf4NQxBdr
-G/m4LjHVnO0hI+uIxVH/cCfr41NRd9tQZIf0FjAAb+p/uxBZMJzZMpQkeR9W6Dhz
-tN0zU9I8i2wRAke/zLacLeOnOPp/RDwpkMr3VNzFTzkb2YHtYc77r36NtrQbTWFy
-ayBXaWVsYWFyZCA8bWp3QGdudS5vcmc+iQJOBBMBCgA4FiEE7Dz+iPbKB4h3T1wd
-GqRL5knedgoFAlxN+lMCGwEFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQGqRL
-5knedgo1bhAArI7kReYq4YtaxS8Pxb5MdPxiQVtvfkbycWCZ4owzPeEIkJqcbadN
-UiGSqCRR2xeT4kuzFZWILiZfBTwHwFM/bXRDK/FOn7F8aqUAV1tq2W70Z7BUpTwp
-Av7Xm5YvsfbTBZmllJltEiIrKIzULCtRKKVXgtOKg0sd/W2aXwyl+OX+PVzu4mXX
-NEkO10J7VpnCvjyaJNeKgeJYQLizSWdEf7i6RX31yC29+GsSqikaOHdfxJMM+bo/
-x/aCuYlgDB+OQ6LZzpXZO0C8B5SMgMfZaK1rxDtUtViajSyOFJ4Ig6bcgc5qDCLn
-k407oEN1yBWps867uN/Bi4Dk+xh691feGsyq95DvPis2Ut+0X0/Wi/uLg3uu/X5E
-cNHynwht7KaGCLeuOZKxvzfeudNeyKFX34HtFyE/2k9LR0mFX8XnXQGBD9psOxcd
-2K8Rku9BjjKDZ/vf53sMh5vxUNo+zkd+5dLZWPnLrhkfQrepDBP+Tc/6W0VSZCP5
-/nKX6GjPwmELtZj4jGf33tgfNMJrmxGUjpDxtiJc7OroNC4he3F5AF4RNRa5VvHs
-6ah57swVvKyJmLH5mxxKIn39PspOhzVxSbkWNPLS+km2InPum+fmYKQL6IrHcqt/
-ecrR7o9GRgI0cJjLJ+wv93ti+gxsUWPbAUBaJPk24omIpQafFT/YAEW5AQ0EXEO7
-ogEIAKBUkmdjzOHy4efx38TuniP7255O9McxFg5LSSQaEcELsmbELDr8S9udtOwj
-QJB7IgkeWY8ioNWBFWOKNxNZpx3e8h1rPMf2yqzrmeXj3IycDbe0jJrhVaVscLcn
-jH8svzgDgZok78VUXa+/qFWDcgZuimnkpf6mvqznpOJZ11IOoyCNvutLONa43JEr
-vlOhy0vtj9mfqy3dmKg7stereCGRZ/wlHtlpQUhjo/WpLmF6IIc/Q/FAlKu2ljMf
-esomgekiSPGewH+wPQLTlwB2XNcFNRVM0tj4M+VDsV5GQb5Ur3VuuIbi29DyiGES
-IL0e4m7UAow1YFn2p5TCxdom83MAEQEAAYkCNgQYAQoAIBYhBOw8/oj2ygeId09c
-HRqkS+ZJ3nYKBQJcQ7uiAhsgAAoJEBqkS+ZJ3nYKHxkP/3Aq4iVpExIHUAwLCEY9
-qpdlqGsnrj1jSMjgmqkUq/b9TmEoc4btuKFEB4SPulnOGWAGuRmDVIF1ne8ezW58
-SWd97lFACl0Ob3d1pTlI/b2ISK8lDEqMX3UR8R9+XS2vHHO0GKkjn/YP6RpLxyc1
-V/OjlkRbL9x3oBKG9FUcztjZAdz6aVpmFiEG9O3ALpq9c2cbnlZiChsYQ14DCTIP
-TvYkXdevEVv5eRwrGVr3JF1Z0fEl3k9gmqwoz6dV4kzbbo7A7JTbfmB8iEg/ql8a
-oX1RUfS4WgJiRWRRKNV33pD4KPSR2FM6u0tbU5jXV31MHGN7jYY61ztf1nPHWeHB
-TysIISsX3+4kgkqWrsjTysxfesUNO2LPA3uDtkGQMOJk74EgpA+39rAD00z611rT
-aHJ9CiQEGL6/xv+IqJ8oh9Rqo8OjU8Dm7GWN2W7JfwBcii0qMlcXoSWyLPttWlwh
-zRlc44Wv3KWa1mbnVg2Y7MM3OcQGaiXagFl+yTYbnn9CBKEeYpSe/MoA0EZ+d9L9
-r8rse/ix9kBvnw+uXo6ZBKuSaHMWvL/gE0sqr6d3izxVeQk+nHc6B/cOgjKeqk0X
-RvB/nZTkiAlI1wk38esDCFobVb5jcsN7tLX0zRxTN+0RR6rcl3z2GiKMLva11tr4
-FF9bSdx+8RyyT1CJ9JTW29nFuQENBFxDurcBCACpIzhbHhC+8Ih/yKz7nuYsmFx4
-HaQu3dVHrtQVkLTLByvlXSm9O67ZTWhQH4FVgL8D1R2e9ZPIN5/fFMLHSECKIWGU
-x7oKQ4M5qWbEj4rA/EPbvr7vS1zF3y9HYUm+INArD3p/aGUsCfFHjsZSndw98iBV
-+S8hedcsxQlC8GFd5eqBiE5wCmUjrvuf/NN4WMG138mq3IOgnQN7Wh0TIL5lkP8m
-jmrzRLJ2G9v30EdAyAtMlMk9bWJFXYArjF8GPE4zCqaX0vHgdEilX8gezcxPKESk
-QD4j94qk7pTECkdYdnvpmbwEvxHCd8VpeMy55GEgYwW0mcu40VzmY4tdre6HABEB
-AAGJA2wEGAEKACAWIQTsPP6I9soHiHdPXB0apEvmSd52CgUCXEO6twIbAgFACRAa
-pEvmSd52CsB0IAQZAQoAHRYhBBJ2ipZ5WZAQeg0v3/xX48ys2Zp4BQJcQ7q3AAoJ
-EPxX48ys2Zp4S+4H/3aoyPaZA3cJdFBROWbNU1QkskDDONEOhK3eSoOsAInY3wkt
-LFYV4eYSauuYU9SZd8FSRP4XZb46uwmVS3B6m5NhE6As1l5sVB2MHfyiqyPxEwpv
-mKRae1FSRrbGFINEFrQiWnEcFYsdLycTHXHgcHi5hErcilZKEBWZaTuOIBMYksVg
-kZWjhMF8zbvMK3Lz8ZA3/cDYMAnY4luInXYHJODPO0Z2Enr0f9BSW2Qrt4lQYyM/
-CGmanTuWuiXJS6tvNosxCjDhIuj9kjFrSc8L4CgxKTTq16JyEJnAjKJT/vRLRz+4
-vdEWGdNuBZx1CQBWlZ2TAWogRLjEblAtS7zn9ZPuUxAAskoq446ls54q/ItXXo6j
-vQ5Oaz8tuZdT35uMKPPtAhK7OEjiu5rSieNDMFpFcViR8KMG51ZoSnL/A/nCTpCW
-rEuR5k0KTROzCSwvFCPI7ZeAFw6etKxAgQntUgIb08O+1XNutIFgyOgOjnwDKeIQ
-xUA3JScViXVgGUW3nTo8OHzpkSqWlttF4Cxh8S4FB0F8mFamH1ZmAkNW0QdQDFqK
-qKy80RvPjFEgCzFf87GdAx0PT1eznTK+XfwREhp1px6O1CcAhh4RpQGyBCTeu3T6
-D2Wbq2sPs/gVdiFQP2+aXr+fxMYHdQmLeUqlfjUZJQLXL6g+dryn4QSaubcFsHh+
-CciR9iIQM2iC+bal7ufNQ/uw2cTxFzJhyNSgRDRSj4cHp+To14EYqpogpV7EJwTG
-dYoe+XQNnMbJ28rHjWfLMUjWy56DfgtxbCkYdfMnKGamOE17UY4q1UYcIYqEqGmk
-rie1RkhJyIaHfzC8q4UOiEc7clVn0CHJFYpO7KfMtqsGma+7XVMNu/SV+dlyCGVZ
-Yc2XHzHwN1oS4VZdlMO5VeoZyWZ5XaFLQuiZffcsIHifReRm0L0uyZMiyv5l1UIB
-dR5f+kk403E0XwbjuVksuAtYX1t64dane7UijfV/OHjhNnGbVnfXAJmM6uwv1u/L
-fEfIMVoMv7/uLpNexLG2pNe5AQ0EXEO6GQEIALX1DTbW/uRO7BgrASZupALnC+Zs
-QxPiV29DyBYJQgUv2RPEzrsgXRqeezKz6usDKqoVROraidWaCNyK726mXq4N1XfC
-K8IEQM31ktkBUdNK+KJcOGcdRKDoSEJ1kqFqX0MoCL68ZItJ7Xh7Yp+h7hzpHTIN
-Uj4OfQ59SGUxe7Y2gNIUsB0ewMdIKsTrEo74E2AvYw+4x5cuE2K00hWvKShkyQWt
-Qxwyweu+uTTlqHztFA7V7aWN6efyrE9Et05VZzRMmKiyOLLTi/AMBg1QI8MvlbYy
-nZu/YB5M8LMXWqQOcYpkSpXal5YoI8HrTyVLWJzDmgq06XnQ9KDNN1otVFcAEQEA
-AYkCNgQYAQoAIBYhBOw8/oj2ygeId09cHRqkS+ZJ3nYKBQJcQ7oZAhsMAAoJEBqk
-S+ZJ3nYKnLwP/22rgFDdXCsM0LHJwAupa9lI+/8CCxPqFG9CwtzpinQUS3P5+sU8
-ta3tvKUyvMoi2myvQbYWh9bDTI3Ic1g+YaUKL5KtYsmdRMSblNmDBP72Qu3+YngH
-QnWAeSSddKj3VLzgM9qKT0IfQaZchDI8A2QMOWan1b8eTygrHG8LH5JKxnoA1dqR
-w1WD/DgyENbYejBbiwG+2W04VKA9Gz3MhKI3D/8ZiN5it046eJ4yGzPCmNC4rldi
-cOHCJJqnYPydCUP9WkBrYK8T984VXYInIpl8TQny/kNk5T5JTCe3LV/nZkDWz84L
-KxorUst0JfPdtCLJtBmGhtwCd4FVkWU3N/rGlH6ka3Dc5VLItCjgtJB/iUWzM3Lw
-V8T4EnX/JRYUGOWMvAgd3ghbtjXs+6ABzX19DbeSs4hzc7iqy5jOp2HNjOoZs+9/
-t9jdPPQE1xbnzzkoRAkftUkkuql/cQQuGaQsE41iIXXSKCAVKafxZJBZtebSQZER
-O8DN/4VhwmwoO71ABINE1yTwnbRkkZUttk10/5W4s5cIMCRIYjGL3VMuLptjQxvb
-I1GACrpycglRMBtyfDTkEvFFb57wBLceh2NkdbMAwM+lmflMV8k5d0OF1549UaCT
-KnHCdt7JNPc6NQSHfu+v5ciCtMynP5k2kfEuvhslq1ARUrcfpDdltCQx
-=swck
+mQINBGKE4psBEADpHSM/IxFD1nXBmnODYXzcl2A+6b6m9m1m2Y4Dlr0ed+y5Lxne
+QidE9I74A2KSm6+eHW2yh4i1ZwZbmwpmQqM+j5BMt7axoXOdKSyN+fYtUakzNbBN
+EDRKT79q/zIzkgTJradHkCQkwF1W3go+qPXjR2ZEnLma9dZED9VNI6PmOpeYaASo
+IkEfbKbwa/vPrvnDSSYY6Y02RXSRk5U1NvQgVUTJP9WGK7NlPUcTBDELLQv6fFPU
+kjBOel6MecsQ+v8iq4RJF2cbVF0hNjbAiNldjLV74Xd7yWVRlCbdb2agyvQjMNrD
+jHSvbEMiNB3R8yBHVW2Zldv8q0XjcwoDfdiZYFJe3lRUYmv6I2p+/DptD4r/3ILI
+peGZtSeOdQEw+vvODL/Ehq03anTrzcpZ6sDLfLrYJhYcrltj0/LMUnLDAjciwRUq
+XI46EfxwqsdLeqoZFQeO3LOFsh0kJKR2xOrUHIVy84NJ4Gmro6WmUkb1NfdjyHzF
+z8Lfbo46NKoTcwFsFF0q74jVVIVNUyIS91DusiMqLCsP8jqDOz/kyP4bOJQ+aUXf
+BANn4Ll1TFWsJ417moxz+Pi5sTaI0na8z2XB1N9WPsSml3FS75hJPJshN2T3VIea
+zB7GFWqk33ynSDt+cAisG5nsK9fFdcH+t5wm59oobyFbFhKxwX6ROuxlZwARAQAB
+tCRTZXJnZXkgS2FuZGF1cm92IDxwbHVrbmV0QG5naW54LmNvbT6JAk4EEwEKADgW
+IQTWeGzjA9mpAimY3GzIRk1UmvdcCgUCYoTimwIbAwULCQgHAwUVCgkICwUWAwIB
+AAIeAQIXgAAKCRDIRk1UmvdcCqbOD/9Htgk3mWvUFmrApkWQTIDNmLACZ1Sw1PXj
+Uqte8StYB0bYY+nmAXs7O5eC2h1ViParl7En1joEEMQQmH0qSnw4X1CM/hA8TAYW
+mBPITTNWo/R52WoyWeWGFnFNIperQmuIZc+pXm0VEFVPiX/2DXbCIu+jaXySvlCN
+LekmOD4VC7dJS8/ohoaXOR2T8ufS+1CsyPXomEb+COhqRZ3EVBa+k7pnElkFft3Y
+a1fR0AgatZFQpy+ukePhK7s/M5RGhDJWHgSAZFkf+X2jVV4NRJ+XsY80gU5DD2ZX
+QT6Je6Knxqk7FnWNSxkhReH6Ss5flZSoGDCmJ2AsPtGeUhus2fGqeN+waGKTZC35
+die2V4/cro1SWswSI6Y5GFDZT1olIUztPmSXU/A3oyizJI7XZybwUbpk5kK83VXm
+el3U/7Qr/VErlDWFefZWeUvT1RILZ8IRoNj4dv158RnKHt9G508A5qz4hUPKoSeq
+SiXhYwfkc31WPzIJ4ev+X5Ka2sG/CKbEMJ7qwc0Kadiu+ePPfqqbXjpTWRyrbcRM
+hRNcLNUi1SLWMBClOQG+5GNG1dPPHkbj4dO1OZuaUMwQdu8R8NlsGoVWS40bmVv5
+pXstzYCl7k/UnC/Ytlq61GeAoq8ILa6jGj0EWqlhvi0ZNMN+fROhzrRlTzIr/+WE
+Xf8EiVNFSbQlU2VyZ2V5IEthbmRhdXJvdiA8cy5rYW5kYXVyb3ZAZjUuY29tPokC
+TgQTAQoAOBYhBNZ4bOMD2akCKZjcbMhGTVSa91wKBQJihO2zAhsDBQsJCAcDBRUK
+CQgLBRYDAgEAAh4BAheAAAoJEMhGTVSa91wKgLQQANaf4UMndkWoefDQPkJ5qR4K
+fuV0WRz59riZEApTkVpPXzl8Y1i8Rgt9pa1v1i12vPyIXKav1rJXQcuDEzqrhQ2G
+yvuAE2U/t2mYaMUmwxWO2d8JA3slvBSgOkiYpbLooDizAdKMT5UQWGyw31Wm51iz
+HjoztebsyXeXgq9VDjv3D8LUBr/OY3Hguj6HV+zRtC95qgXYadW2FiCtvBK6RTDb
+iShTuseLSheGh9dZIUSnzaOiJpDA61ZDYtFZxSpe67vEzhSfHVsF+ZdCjoWhhVv+
++2wR4E0VQQtOM9uX1PMlZ5Ymr02/gidsXCM0ZjYXx4cDDhnq+nKomN64VloXWY9t
+PIi86XmzcSWlGUd+Ac6LyW7/f64bUWs4Ih0Idl0PF0sAr/6axKUsIs1nbn5MEtXk
+ZPAjcDLqLb9IIQaXRurm/il8v+bLXVBOJq33YUuGRuz8pu4vPA5Q97zglqhlIgbu
+prHMJ9hl5q39JwS3As2rK0o6Q9VVKr29rqSEfk4wEttvk0QMMU5zEvVl8MtqPj42
+qURqpHOadFbYMTwhUmRBUszRZPa5/pWqq0gWOtpyCWFVAsHFWQGJM1Eo6gGEyHZM
+YgBp+d29p2p409r1+06U67GBnXvUy0RyIpkLQtU+lyOJ6vvrBmmsDs/gc69GnlSC
+tZmCt0pLesJ7ZJzGdDkduQINBGKE4psBEADQr/enuDeVT11v6ejuYrg7aaZaGFUe
+3i28bQ4pRUKNfxs7zVYDDHi2i2bhS5j2yQnbsQtGcgoenw6lapmdQRzr4vjQAz9o
+kT6l4qpqvFFQM0wZTnigVDmmO9vTHR8Uk3iCKTd2ax3oko/xPWWYJautJ6ex8cOA
+coHSDeOjuIWSxCKq0BDFp6LoxkM8nuyLAX2cbhI3LncaZhVveMeN+Fmcsv+WpkKs
+yhX92umZuGwlraSyFy23FiRWSZPu9qVIxMMHvVrQJIgfhyWaHFzoF4M4qDoSKx92
+uWfUWgFwPOxOJ6/YcPsX4T8qTl9htmwPN0BibPTlcWaIFXtiU5bE1MivUPeACrI/
+gwUfCR3Mg+GYc13C6jzepREUhI7PLi3+A203PlMZd/aaSZkP6j+h4cwdapH5P4uF
+7T1EQ0MSdx3neAvu5p0IM6JpriwxfT3HsG+Y952T6MIeXcjNRebsBrygJhJ0/vyr
+wV5t8jL0yQty4CiE/QFnBs42l+rngi7K7Y1AZRBGK7JA09XaoLrfLmS+PrbYPsaJ
+flkM8GzUB7BBCLozxDHPzmPkf/A1w3XHZnYuZmS+pvjWCIoKpLQHI99oSUGho/TR
+gMRO4v7EAzluqCiepMl0xwFfHB115ND/mATazc4Pt6FxUsqffzfZrN01e1UVPrp5
+4x6YLO80JnOY6QARAQABiQI2BBgBCgAgFiEE1nhs4wPZqQIpmNxsyEZNVJr3XAoF
+AmKE4psCGwwACgkQyEZNVJr3XAp9ghAAgCgErxQYn/Lh/mzsxYXPnisggcBpceks
+mGw7knj1EGkXqq9CHn3EjCw8dB5N857UFlUr++DHwpFL5O36PRQo33RIUFbmBypG
+8C/xX1jWGu3xcaqS3P1ncsSSl6ckdvy9pjMxThm/RkXO0eJCn7FcanwPJXEB3Pbb
+mm0wLI2OXl/m7l5QAr7kErnPvGNzcbX6G35Q/MY8mumBWQ9H53R5ZPpi+OS40Wfn
+pZNKdh/Acwa7+2RokPqoOcJfxVdBOUigXTzb45qZgqEsSR7bkZAy2E80A/sJKPqs
+OGjp9cog3rBYyNBn5dasfR9KeBtluKnjUbzutXsQoKUSECY00YGrtneSXMku5hoE
+Dguk68w/L63ZApYHO/JTgJAYvqPOErAVUegPIw2CT1/2qi5vpClBcKkNS7RXrssA
+X+lElE0zbzX3bNG+lQuXby7jNUFYltkEiz6vTtc4HuHy8u40DHMswzkoDr0T8IE0
+7ZRAWXwV1nlA/dI337cHCsWMJyqem5wZZO13iqe07qaCg1uvBPeqDo81hOCn1us7
+l5SYRUTlt7KSFEHZ+Sx4bmVneAuRi5okaQdmrepy/ss/vVpRwWuQxsPkvT8boS7s
+mqOVsZFcNOuUJPUyOz1dHUL6FMYpk1dw+9n41gO4fLBzJekFTB/fxL6SRbYFWWn7
+x0VGHDmuaYQ=
+=HmVo
 -----END PGP PUBLIC KEY BLOCK-----

From 359eb3866f30aac127dc7e258d866729f8fea8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 2 Feb 2025 11:23:45 +0100
Subject: [PATCH 578/600] New upstream version 1.26.2

---
 CHANGES                                       | 27 ++++++++++++++++++
 CHANGES.ru                                    | 28 +++++++++++++++++++
 auto/lib/libatomic/conf                       |  2 +-
 src/core/nginx.h                              |  4 +--
 src/core/ngx_output_chain.c                   | 10 +++++--
 src/event/quic/ngx_event_quic_frames.c        |  1 +
 src/event/quic/ngx_event_quic_ssl.c           |  5 ++++
 src/event/quic/ngx_event_quic_transport.c     |  8 ++++++
 src/http/modules/ngx_http_grpc_module.c       |  5 +++-
 .../modules/ngx_http_gunzip_filter_module.c   | 18 +++++++++---
 .../modules/ngx_http_gzip_filter_module.c     | 10 +++++--
 src/http/modules/ngx_http_mp4_module.c        | 14 ++++++++--
 src/http/modules/ngx_http_ssi_filter_module.c |  8 ++++--
 src/http/modules/ngx_http_sub_filter_module.c |  8 ++++--
 src/http/v3/ngx_http_v3_parse.c               |  3 ++
 src/http/v3/ngx_http_v3_request.c             | 20 +++++++++----
 src/http/v3/ngx_http_v3_table.c               |  2 +-
 src/http/v3/ngx_http_v3_uni.c                 |  4 +--
 src/http/v3/ngx_http_v3_uni.h                 |  2 ++
 19 files changed, 149 insertions(+), 30 deletions(-)

diff --git a/CHANGES b/CHANGES
index f60c885..49e47de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,31 @@
 
+Changes with nginx 1.26.2                                        14 Aug 2024
+
+    *) Security: processing of a specially crafted mp4 file by the
+       ngx_http_mp4_module might cause a worker process crash
+       (CVE-2024-7347).
+       Thanks to Nils Bars.
+
+
+Changes with nginx 1.26.1                                        29 May 2024
+
+    *) Security: when using HTTP/3, processing of a specially crafted QUIC
+       session might cause a worker process crash, worker process memory
+       disclosure on systems with MTU larger than 4096 bytes, or might have
+       potential other impact (CVE-2024-32760, CVE-2024-31079,
+       CVE-2024-35200, CVE-2024-34161).
+       Thanks to Nils Bars of CISPA.
+
+    *) Bugfix: reduced memory consumption for long-lived requests if "gzip",
+       "gunzip", "ssi", "sub_filter", or "grpc_pass" directives are used.
+
+    *) Bugfix: nginx could not be built by gcc 14 if the --with-libatomic
+       option was used.
+       Thanks to Edgar Bonet.
+
+    *) Bugfix: in HTTP/3.
+
+
 Changes with nginx 1.26.0                                        23 Apr 2024
 
     *) 1.26.x stable branch.
diff --git a/CHANGES.ru b/CHANGES.ru
index 7e42b52..aaa0f5f 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,32 @@
 
+Изменения в nginx 1.26.2                                          14.08.2024
+
+    *) Безопасность: обработка специально созданного mp4-файла модулем
+       ngx_http_mp4_module могла приводить к падению рабочего процесса
+       (CVE-2024-7347).
+       Спасибо Nils Bars.
+
+
+Изменения в nginx 1.26.1                                          29.05.2024
+
+    *) Безопасность: при использовании HTTP/3 обработка специально созданной
+       QUIC-сессии могла приводить к падению рабочего процесса, отправке
+       клиенту содержимого памяти рабочего процесса на системах с MTU больше
+       4096 байт, а также потенциально могла иметь другие последствия
+       (CVE-2024-32760, CVE-2024-31079, CVE-2024-35200, CVE-2024-34161).
+       Спасибо Nils Bars из CISPA.
+
+    *) Исправление: уменьшено потребление памяти для долгоживущих запросов,
+       если используются директивы gzip, gunzip, ssi, sub_filter или
+       grpc_pass.
+
+    *) Исправление: nginx не собирался gcc 14, если использовался параметр
+       --with-libatomic.
+       Спасибо Edgar Bonet.
+
+    *) Исправление: в HTTP/3.
+
+
 Изменения в nginx 1.26.0                                          23.04.2024
 
     *) Стабильная ветка 1.26.x.
diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
index d1e484a..8c8cb43 100644
--- a/auto/lib/libatomic/conf
+++ b/auto/lib/libatomic/conf
@@ -19,7 +19,7 @@ else
                       #include <atomic_ops.h>"
     ngx_feature_path=
     ngx_feature_libs="-latomic_ops"
-    ngx_feature_test="long  n = 0;
+    ngx_feature_test="AO_t  n = 0;
                       if (!AO_compare_and_swap(&n, 0, 1))
                           return 1;
                       if (AO_fetch_and_add(&n, 1) != 1)
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 7ef5cfb..d29edd2 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1026000
-#define NGINX_VERSION      "1.26.0"
+#define nginx_version      1026002
+#define NGINX_VERSION      "1.26.2"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index 8570742..a46209c 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -117,7 +117,10 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
 
                 ngx_debug_point();
 
-                ctx->in = ctx->in->next;
+                cl = ctx->in;
+                ctx->in = cl->next;
+
+                ngx_free_chain(ctx->pool, cl);
 
                 continue;
             }
@@ -203,7 +206,10 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
             /* delete the completed buf from the ctx->in chain */
 
             if (ngx_buf_size(ctx->in->buf) == 0) {
-                ctx->in = ctx->in->next;
+                cl = ctx->in;
+                ctx->in = cl->next;
+
+                ngx_free_chain(ctx->pool, cl);
             }
 
             cl = ngx_alloc_chain_link(ctx->pool);
diff --git a/src/event/quic/ngx_event_quic_frames.c b/src/event/quic/ngx_event_quic_frames.c
index 42b7d9f..6ea908c 100644
--- a/src/event/quic/ngx_event_quic_frames.c
+++ b/src/event/quic/ngx_event_quic_frames.c
@@ -648,6 +648,7 @@ ngx_quic_free_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb)
     ngx_quic_free_chain(c, qb->chain);
 
     qb->chain = NULL;
+    qb->last_chain = NULL;
 }
 
 
diff --git a/src/event/quic/ngx_event_quic_ssl.c b/src/event/quic/ngx_event_quic_ssl.c
index 7872783..ba0b592 100644
--- a/src/event/quic/ngx_event_quic_ssl.c
+++ b/src/event/quic/ngx_event_quic_ssl.c
@@ -326,6 +326,11 @@ ngx_quic_handle_crypto_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
     ngx_quic_crypto_frame_t  *f;
 
     qc = ngx_quic_get_connection(c);
+
+    if (!ngx_quic_keys_available(qc->keys, pkt->level, 0)) {
+        return NGX_OK;
+    }
+
     ctx = ngx_quic_get_send_ctx(qc, pkt->level);
     f = &frame->u.crypto;
 
diff --git a/src/event/quic/ngx_event_quic_transport.c b/src/event/quic/ngx_event_quic_transport.c
index 19670a6..fba098c 100644
--- a/src/event/quic/ngx_event_quic_transport.c
+++ b/src/event/quic/ngx_event_quic_transport.c
@@ -1750,6 +1750,14 @@ ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp,
             return NGX_ERROR;
         }
 
+        if ((size_t) (end - p) < len) {
+            ngx_log_error(NGX_LOG_INFO, log, 0,
+                          "quic failed to parse"
+                          " transport param id:0x%xL, data length %uL too long",
+                          id, len);
+            return NGX_ERROR;
+        }
+
         rc = ngx_quic_parse_transport_param(p, p + len, id, tp);
 
         if (rc == NGX_ERROR) {
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
index dfe49c5..e7726f3 100644
--- a/src/http/modules/ngx_http_grpc_module.c
+++ b/src/http/modules/ngx_http_grpc_module.c
@@ -1231,7 +1231,7 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
     ngx_buf_t              *b;
     ngx_int_t               rc;
     ngx_uint_t              next, last;
-    ngx_chain_t            *cl, *out, **ll;
+    ngx_chain_t            *cl, *out, *ln, **ll;
     ngx_http_upstream_t    *u;
     ngx_http_grpc_ctx_t    *ctx;
     ngx_http_grpc_frame_t  *f;
@@ -1459,7 +1459,10 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
             last = 1;
         }
 
+        ln = in;
         in = in->next;
+
+        ngx_free_chain(r->pool, ln);
     }
 
     ctx->in = in;
diff --git a/src/http/modules/ngx_http_gunzip_filter_module.c b/src/http/modules/ngx_http_gunzip_filter_module.c
index c1341f5..5d170a1 100644
--- a/src/http/modules/ngx_http_gunzip_filter_module.c
+++ b/src/http/modules/ngx_http_gunzip_filter_module.c
@@ -333,6 +333,8 @@ static ngx_int_t
 ngx_http_gunzip_filter_add_data(ngx_http_request_t *r,
     ngx_http_gunzip_ctx_t *ctx)
 {
+    ngx_chain_t  *cl;
+
     if (ctx->zstream.avail_in || ctx->flush != Z_NO_FLUSH || ctx->redo) {
         return NGX_OK;
     }
@@ -344,8 +346,11 @@ ngx_http_gunzip_filter_add_data(ngx_http_request_t *r,
         return NGX_DECLINED;
     }
 
-    ctx->in_buf = ctx->in->buf;
-    ctx->in = ctx->in->next;
+    cl = ctx->in;
+    ctx->in_buf = cl->buf;
+    ctx->in = cl->next;
+
+    ngx_free_chain(r->pool, cl);
 
     ctx->zstream.next_in = ctx->in_buf->pos;
     ctx->zstream.avail_in = ctx->in_buf->last - ctx->in_buf->pos;
@@ -374,6 +379,7 @@ static ngx_int_t
 ngx_http_gunzip_filter_get_buf(ngx_http_request_t *r,
     ngx_http_gunzip_ctx_t *ctx)
 {
+    ngx_chain_t             *cl;
     ngx_http_gunzip_conf_t  *conf;
 
     if (ctx->zstream.avail_out) {
@@ -383,8 +389,12 @@ ngx_http_gunzip_filter_get_buf(ngx_http_request_t *r,
     conf = ngx_http_get_module_loc_conf(r, ngx_http_gunzip_filter_module);
 
     if (ctx->free) {
-        ctx->out_buf = ctx->free->buf;
-        ctx->free = ctx->free->next;
+
+        cl = ctx->free;
+        ctx->out_buf = cl->buf;
+        ctx->free = cl->next;
+
+        ngx_free_chain(r->pool, cl);
 
         ctx->out_buf->flush = 0;
 
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index ed0de60..b555278 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -985,10 +985,14 @@ static void
 ngx_http_gzip_filter_free_copy_buf(ngx_http_request_t *r,
     ngx_http_gzip_ctx_t *ctx)
 {
-    ngx_chain_t  *cl;
+    ngx_chain_t  *cl, *ln;
 
-    for (cl = ctx->copied; cl; cl = cl->next) {
-        ngx_pfree(r->pool, cl->buf->start);
+    for (cl = ctx->copied; cl; /* void */) {
+        ln = cl;
+        cl = cl->next;
+
+        ngx_pfree(r->pool, ln->buf->start);
+        ngx_free_chain(r->pool, ln);
     }
 
     ctx->copied = NULL;
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 03175de..041ad26 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -3099,7 +3099,8 @@ static ngx_int_t
 ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
     ngx_http_mp4_trak_t *trak, ngx_uint_t start)
 {
-    uint32_t               start_sample, chunk, samples, id, next_chunk, n,
+    uint64_t               n;
+    uint32_t               start_sample, chunk, samples, id, next_chunk,
                            prev_samples;
     ngx_buf_t             *data, *buf;
     ngx_uint_t             entries, target_chunk, chunk_samples;
@@ -3155,12 +3156,19 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
 
         next_chunk = ngx_mp4_get_32value(entry->chunk);
 
+        if (next_chunk < chunk) {
+            ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                          "unordered mp4 stsc chunks in \"%s\"",
+                          mp4->file.name.data);
+            return NGX_ERROR;
+        }
+
         ngx_log_debug5(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
                        "sample:%uD, chunk:%uD, chunks:%uD, "
                        "samples:%uD, id:%uD",
                        start_sample, chunk, next_chunk - chunk, samples, id);
 
-        n = (next_chunk - chunk) * samples;
+        n = (uint64_t) (next_chunk - chunk) * samples;
 
         if (start_sample < n) {
             goto found;
@@ -3182,7 +3190,7 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
                    "sample:%uD, chunk:%uD, chunks:%uD, samples:%uD",
                    start_sample, chunk, next_chunk - chunk, samples);
 
-    n = (next_chunk - chunk) * samples;
+    n = (uint64_t) (next_chunk - chunk) * samples;
 
     if (start_sample > n) {
         ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index 0b84bd3..47068f7 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -482,9 +482,13 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     while (ctx->in || ctx->buf) {
 
         if (ctx->buf == NULL) {
-            ctx->buf = ctx->in->buf;
-            ctx->in = ctx->in->next;
+
+            cl = ctx->in;
+            ctx->buf = cl->buf;
+            ctx->in = cl->next;
             ctx->pos = ctx->buf->pos;
+
+            ngx_free_chain(r->pool, cl);
         }
 
         if (ctx->state == ssi_start_state) {
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index 6d3de59..456bb27 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -335,9 +335,13 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     while (ctx->in || ctx->buf) {
 
         if (ctx->buf == NULL) {
-            ctx->buf = ctx->in->buf;
-            ctx->in = ctx->in->next;
+
+            cl = ctx->in;
+            ctx->buf = cl->buf;
+            ctx->in = cl->next;
             ctx->pos = ctx->buf->pos;
+
+            ngx_free_chain(r->pool, cl);
         }
 
         if (ctx->buf->flush || ctx->buf->recycled) {
diff --git a/src/http/v3/ngx_http_v3_parse.c b/src/http/v3/ngx_http_v3_parse.c
index 5688163..436765c 100644
--- a/src/http/v3/ngx_http_v3_parse.c
+++ b/src/http/v3/ngx_http_v3_parse.c
@@ -810,6 +810,7 @@ ngx_http_v3_parse_field_lri(ngx_connection_t *c,
 
             st->literal.length = st->pint.value;
             if (st->literal.length == 0) {
+                st->value.data = (u_char *) "";
                 goto done;
             }
 
@@ -932,6 +933,7 @@ ngx_http_v3_parse_field_l(ngx_connection_t *c,
 
             st->literal.length = st->pint.value;
             if (st->literal.length == 0) {
+                st->value.data = (u_char *) "";
                 goto done;
             }
 
@@ -1072,6 +1074,7 @@ ngx_http_v3_parse_field_lpbi(ngx_connection_t *c,
 
             st->literal.length = st->pint.value;
             if (st->literal.length == 0) {
+                st->value.data = (u_char *) "";
                 goto done;
             }
 
diff --git a/src/http/v3/ngx_http_v3_request.c b/src/http/v3/ngx_http_v3_request.c
index 87f5f32..0faddd2 100644
--- a/src/http/v3/ngx_http_v3_request.c
+++ b/src/http/v3/ngx_http_v3_request.c
@@ -134,7 +134,17 @@ ngx_http_v3_init(ngx_connection_t *c)
         }
     }
 
-    return ngx_http_v3_send_settings(c);
+    if (ngx_http_v3_send_settings(c) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (h3scf->max_table_capacity > 0) {
+        if (ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_DECODER) == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
 }
 
 
@@ -398,14 +408,12 @@ ngx_http_v3_wait_request_handler(ngx_event_t *rev)
 void
 ngx_http_v3_reset_stream(ngx_connection_t *c)
 {
-    ngx_http_v3_session_t   *h3c;
-    ngx_http_v3_srv_conf_t  *h3scf;
-
-    h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
+    ngx_http_v3_session_t  *h3c;
 
     h3c = ngx_http_v3_get_session(c);
 
-    if (h3scf->max_table_capacity > 0 && !c->read->eof && !h3c->hq
+    if (!c->read->eof && !h3c->hq
+        && h3c->known_streams[NGX_HTTP_V3_STREAM_SERVER_DECODER]
         && (c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0)
     {
         (void) ngx_http_v3_send_cancel_stream(c, c->quic->id);
diff --git a/src/http/v3/ngx_http_v3_table.c b/src/http/v3/ngx_http_v3_table.c
index f49a8fc..428e732 100644
--- a/src/http/v3/ngx_http_v3_table.c
+++ b/src/http/v3/ngx_http_v3_table.c
@@ -308,7 +308,7 @@ ngx_http_v3_set_capacity(ngx_connection_t *c, ngx_uint_t capacity)
     prev_max = dt->capacity / 32;
 
     if (max > prev_max) {
-        elts = ngx_alloc(max * sizeof(void *), c->log);
+        elts = ngx_alloc((max + 1) * sizeof(void *), c->log);
         if (elts == NULL) {
             return NGX_ERROR;
         }
diff --git a/src/http/v3/ngx_http_v3_uni.c b/src/http/v3/ngx_http_v3_uni.c
index 2fc5b07..302064b 100644
--- a/src/http/v3/ngx_http_v3_uni.c
+++ b/src/http/v3/ngx_http_v3_uni.c
@@ -20,8 +20,6 @@ static void ngx_http_v3_close_uni_stream(ngx_connection_t *c);
 static void ngx_http_v3_uni_read_handler(ngx_event_t *rev);
 static void ngx_http_v3_uni_dummy_read_handler(ngx_event_t *wev);
 static void ngx_http_v3_uni_dummy_write_handler(ngx_event_t *wev);
-static ngx_connection_t *ngx_http_v3_get_uni_stream(ngx_connection_t *c,
-    ngx_uint_t type);
 
 
 void
@@ -307,7 +305,7 @@ ngx_http_v3_uni_dummy_write_handler(ngx_event_t *wev)
 }
 
 
-static ngx_connection_t *
+ngx_connection_t *
 ngx_http_v3_get_uni_stream(ngx_connection_t *c, ngx_uint_t type)
 {
     u_char                     buf[NGX_HTTP_V3_VARLEN_INT_LEN];
diff --git a/src/http/v3/ngx_http_v3_uni.h b/src/http/v3/ngx_http_v3_uni.h
index 911e153..2805894 100644
--- a/src/http/v3/ngx_http_v3_uni.h
+++ b/src/http/v3/ngx_http_v3_uni.h
@@ -19,6 +19,8 @@ ngx_int_t ngx_http_v3_register_uni_stream(ngx_connection_t *c, uint64_t type);
 
 ngx_int_t ngx_http_v3_cancel_stream(ngx_connection_t *c, ngx_uint_t stream_id);
 
+ngx_connection_t *ngx_http_v3_get_uni_stream(ngx_connection_t *c,
+    ngx_uint_t type);
 ngx_int_t ngx_http_v3_send_settings(ngx_connection_t *c);
 ngx_int_t ngx_http_v3_send_goaway(ngx_connection_t *c, uint64_t id);
 ngx_int_t ngx_http_v3_send_ack_section(ngx_connection_t *c,

From 2fe36c4448b6e038d68a656883153c27aafd5052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 2 Feb 2025 11:24:35 +0100
Subject: [PATCH 579/600] Drop upstream patches

---
 debian/patches/series | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 56e7725..52e1dc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 nginx-fix-pidfile.patch
 nginx-ssl_cert_cb_yield.patch
-nginx-1.26.1.patch
-CVE-2024-7347.patch

From 1518af2753f3adf3b9a4f72f03396520ef9b4a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 2 Feb 2025 11:24:45 +0100
Subject: [PATCH 580/600] Refresh patches

---
 debian/patches/nginx-fix-pidfile.patch       | 4 ++--
 debian/patches/nginx-ssl_cert_cb_yield.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/nginx-fix-pidfile.patch b/debian/patches/nginx-fix-pidfile.patch
index 43c6e2f..83f7cf9 100644
--- a/debian/patches/nginx-fix-pidfile.patch
+++ b/debian/patches/nginx-fix-pidfile.patch
@@ -7,7 +7,7 @@ Last-Update: 2020-06-24
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/core/nginx.c
 +++ b/src/core/nginx.c
-@@ -339,14 +339,21 @@
+@@ -340,14 +340,21 @@
          ngx_process = NGX_PROCESS_MASTER;
      }
  
@@ -30,7 +30,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              return 1;
          }
  
-@@ -359,8 +366,19 @@
+@@ -360,8 +367,19 @@
  
  #endif
  
diff --git a/debian/patches/nginx-ssl_cert_cb_yield.patch b/debian/patches/nginx-ssl_cert_cb_yield.patch
index adb1ba5..dfcf55c 100644
--- a/debian/patches/nginx-ssl_cert_cb_yield.patch
+++ b/debian/patches/nginx-ssl_cert_cb_yield.patch
@@ -16,7 +16,7 @@ connections.
 
 --- a/src/event/ngx_event_openssl.c
 +++ b/src/event/ngx_event_openssl.c
-@@ -1832,6 +1832,23 @@
+@@ -1914,6 +1914,23 @@
          return NGX_AGAIN;
      }
  
@@ -40,7 +40,7 @@ connections.
      err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
  
      c->ssl->no_wait_shutdown = 1;
-@@ -1968,6 +1985,21 @@
+@@ -2050,6 +2067,21 @@
          c->read->handler = ngx_ssl_handshake_handler;
          c->write->handler = ngx_ssl_handshake_handler;
  

From 215a9620ef32640b8a36bf830e889c842344f3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 2 Feb 2025 11:33:47 +0100
Subject: [PATCH 581/600] Version 1.26.2

---
 debian/changelog | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4c0043..09302b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-nginx (1.26.0-4) UNRELEASED; urgency=medium
+nginx (1.26.2-1) UNRELEASED; urgency=medium
 
+  [ Jan Mojžíš ]
   * d/u/signing-key.asc: add Sergey Kandaurov <s.kandaurov@f5.com> public key,
     the key is used to sign the 1.26.2 release
   * d/gbp.conf: add upstream-signatures = on
   * d/{control,copyright}: update my email to "janmojzis@debian.org"
   * d/copyright: bump my copyright year
 
- -- Jan Mojžíš <janmojzis@debian.org>  Tue, 28 Jan 2025 08:26:25 +0100
+  [ Jérémy Lal ]
+  * Add Sergey Kandaurov <s.kandaurov@f5.com> pgp public key
+  * New upstream version 1.26.2
+  * Drop upstream patches
+  * Refresh patches
+
+ -- Jérémy Lal <kapouer@melix.org>  Sun, 02 Feb 2025 11:24:55 +0100
 
 nginx (1.26.0-3) unstable; urgency=medium
 

From 9fb3b99b3dd880c9518b0478d2c654452bb63ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 2 Feb 2025 11:40:36 +0100
Subject: [PATCH 582/600] Bump abi

---
 debian/libnginx-mod.abisubstvars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index d793435..21d5511 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -8,4 +8,4 @@
 # changes without upgrading the upstream nginx version, e.g. security updates
 # in oldstable
 
-nginx:abi=nginx-abi-1.26.0-1
+nginx:abi=nginx-abi-1.26.2-1

From d2631d1b03e915d5544446fd939528754565904a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 2 Feb 2025 19:41:03 +0100
Subject: [PATCH 583/600] rm d/p/CVE-2024-7347.patch

---
 debian/patches/CVE-2024-7347.patch | 45 ------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 debian/patches/CVE-2024-7347.patch

diff --git a/debian/patches/CVE-2024-7347.patch b/debian/patches/CVE-2024-7347.patch
deleted file mode 100644
index 1ca3e79..0000000
--- a/debian/patches/CVE-2024-7347.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Origin: https://nginx.org/download/patch.2024.mp4.txt
-
-diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
---- a/src/http/modules/ngx_http_mp4_module.c
-+++ b/src/http/modules/ngx_http_mp4_module.c
-@@ -3099,7 +3099,8 @@ static ngx_int_t
- ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
-     ngx_http_mp4_trak_t *trak, ngx_uint_t start)
- {
--    uint32_t               start_sample, chunk, samples, id, next_chunk, n,
-+    uint64_t               n;
-+    uint32_t               start_sample, chunk, samples, id, next_chunk,
-                            prev_samples;
-     ngx_buf_t             *data, *buf;
-     ngx_uint_t             entries, target_chunk, chunk_samples;
-@@ -3155,12 +3156,19 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4
- 
-         next_chunk = ngx_mp4_get_32value(entry->chunk);
- 
-+        if (next_chunk < chunk) {
-+            ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
-+                          "unordered mp4 stsc chunks in \"%s\"",
-+                          mp4->file.name.data);
-+            return NGX_ERROR;
-+        }
-+
-         ngx_log_debug5(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
-                        "sample:%uD, chunk:%uD, chunks:%uD, "
-                        "samples:%uD, id:%uD",
-                        start_sample, chunk, next_chunk - chunk, samples, id);
- 
--        n = (next_chunk - chunk) * samples;
-+        n = (uint64_t) (next_chunk - chunk) * samples;
- 
-         if (start_sample < n) {
-             goto found;
-@@ -3182,7 +3190,7 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4
-                    "sample:%uD, chunk:%uD, chunks:%uD, samples:%uD",
-                    start_sample, chunk, next_chunk - chunk, samples);
- 
--    n = (next_chunk - chunk) * samples;
-+    n = (uint64_t) (next_chunk - chunk) * samples;
- 
-     if (start_sample > n) {
-         ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,

From 92496d21cf129e64f4435d9718a3ceadf029ff26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 2 Feb 2025 19:41:30 +0100
Subject: [PATCH 584/600] rm d/p/nginx-1.26.1.patch

---
 debian/patches/nginx-1.26.1.patch | 367 ------------------------------
 1 file changed, 367 deletions(-)
 delete mode 100644 debian/patches/nginx-1.26.1.patch

diff --git a/debian/patches/nginx-1.26.1.patch b/debian/patches/nginx-1.26.1.patch
deleted file mode 100644
index 8086ae8..0000000
--- a/debian/patches/nginx-1.26.1.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-From: =?utf-8?b?SmFuIE1vasW+w63FoQ==?= <jan.mojzis@gmail.com>
-Date: Mon, 17 Jun 2024 18:40:09 +0200
-Subject: nginx-1.26.1
-Forwarded: not-needed
-
-Backport changes from the nginx 1.26.1 and fix
-CVE-2024-32760, CVE-2024-31079, CVE-2024-35200, CVE-2024-34161
-
----
- auto/lib/libatomic/conf                          |  2 +-
- src/core/ngx_output_chain.c                      | 10 ++++++++--
- src/event/quic/ngx_event_quic_frames.c           |  1 +
- src/event/quic/ngx_event_quic_ssl.c              |  5 +++++
- src/event/quic/ngx_event_quic_transport.c        |  8 ++++++++
- src/http/modules/ngx_http_grpc_module.c          |  5 ++++-
- src/http/modules/ngx_http_gunzip_filter_module.c | 18 ++++++++++++++----
- src/http/modules/ngx_http_gzip_filter_module.c   | 10 +++++++---
- src/http/modules/ngx_http_ssi_filter_module.c    |  8 ++++++--
- src/http/modules/ngx_http_sub_filter_module.c    |  8 ++++++--
- src/http/v3/ngx_http_v3_parse.c                  |  3 +++
- src/http/v3/ngx_http_v3_request.c                | 20 ++++++++++++++------
- src/http/v3/ngx_http_v3_table.c                  |  2 +-
- src/http/v3/ngx_http_v3_uni.c                    |  4 +---
- src/http/v3/ngx_http_v3_uni.h                    |  2 ++
- 15 files changed, 81 insertions(+), 25 deletions(-)
-
-diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
-index d1e484a..8c8cb43 100644
---- a/auto/lib/libatomic/conf
-+++ b/auto/lib/libatomic/conf
-@@ -19,7 +19,7 @@ else
-                       #include <atomic_ops.h>"
-     ngx_feature_path=
-     ngx_feature_libs="-latomic_ops"
--    ngx_feature_test="long  n = 0;
-+    ngx_feature_test="AO_t  n = 0;
-                       if (!AO_compare_and_swap(&n, 0, 1))
-                           return 1;
-                       if (AO_fetch_and_add(&n, 1) != 1)
-diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
-index 8570742..a46209c 100644
---- a/src/core/ngx_output_chain.c
-+++ b/src/core/ngx_output_chain.c
-@@ -117,7 +117,10 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
- 
-                 ngx_debug_point();
- 
--                ctx->in = ctx->in->next;
-+                cl = ctx->in;
-+                ctx->in = cl->next;
-+
-+                ngx_free_chain(ctx->pool, cl);
- 
-                 continue;
-             }
-@@ -203,7 +206,10 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
-             /* delete the completed buf from the ctx->in chain */
- 
-             if (ngx_buf_size(ctx->in->buf) == 0) {
--                ctx->in = ctx->in->next;
-+                cl = ctx->in;
-+                ctx->in = cl->next;
-+
-+                ngx_free_chain(ctx->pool, cl);
-             }
- 
-             cl = ngx_alloc_chain_link(ctx->pool);
-diff --git a/src/event/quic/ngx_event_quic_frames.c b/src/event/quic/ngx_event_quic_frames.c
-index 42b7d9f..6ea908c 100644
---- a/src/event/quic/ngx_event_quic_frames.c
-+++ b/src/event/quic/ngx_event_quic_frames.c
-@@ -648,6 +648,7 @@ ngx_quic_free_buffer(ngx_connection_t *c, ngx_quic_buffer_t *qb)
-     ngx_quic_free_chain(c, qb->chain);
- 
-     qb->chain = NULL;
-+    qb->last_chain = NULL;
- }
- 
- 
-diff --git a/src/event/quic/ngx_event_quic_ssl.c b/src/event/quic/ngx_event_quic_ssl.c
-index 7872783..ba0b592 100644
---- a/src/event/quic/ngx_event_quic_ssl.c
-+++ b/src/event/quic/ngx_event_quic_ssl.c
-@@ -326,6 +326,11 @@ ngx_quic_handle_crypto_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
-     ngx_quic_crypto_frame_t  *f;
- 
-     qc = ngx_quic_get_connection(c);
-+
-+    if (!ngx_quic_keys_available(qc->keys, pkt->level, 0)) {
-+        return NGX_OK;
-+    }
-+
-     ctx = ngx_quic_get_send_ctx(qc, pkt->level);
-     f = &frame->u.crypto;
- 
-diff --git a/src/event/quic/ngx_event_quic_transport.c b/src/event/quic/ngx_event_quic_transport.c
-index 19670a6..fba098c 100644
---- a/src/event/quic/ngx_event_quic_transport.c
-+++ b/src/event/quic/ngx_event_quic_transport.c
-@@ -1750,6 +1750,14 @@ ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp,
-             return NGX_ERROR;
-         }
- 
-+        if ((size_t) (end - p) < len) {
-+            ngx_log_error(NGX_LOG_INFO, log, 0,
-+                          "quic failed to parse"
-+                          " transport param id:0x%xL, data length %uL too long",
-+                          id, len);
-+            return NGX_ERROR;
-+        }
-+
-         rc = ngx_quic_parse_transport_param(p, p + len, id, tp);
- 
-         if (rc == NGX_ERROR) {
-diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
-index dfe49c5..e7726f3 100644
---- a/src/http/modules/ngx_http_grpc_module.c
-+++ b/src/http/modules/ngx_http_grpc_module.c
-@@ -1231,7 +1231,7 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
-     ngx_buf_t              *b;
-     ngx_int_t               rc;
-     ngx_uint_t              next, last;
--    ngx_chain_t            *cl, *out, **ll;
-+    ngx_chain_t            *cl, *out, *ln, **ll;
-     ngx_http_upstream_t    *u;
-     ngx_http_grpc_ctx_t    *ctx;
-     ngx_http_grpc_frame_t  *f;
-@@ -1459,7 +1459,10 @@ ngx_http_grpc_body_output_filter(void *data, ngx_chain_t *in)
-             last = 1;
-         }
- 
-+        ln = in;
-         in = in->next;
-+
-+        ngx_free_chain(r->pool, ln);
-     }
- 
-     ctx->in = in;
-diff --git a/src/http/modules/ngx_http_gunzip_filter_module.c b/src/http/modules/ngx_http_gunzip_filter_module.c
-index c1341f5..5d170a1 100644
---- a/src/http/modules/ngx_http_gunzip_filter_module.c
-+++ b/src/http/modules/ngx_http_gunzip_filter_module.c
-@@ -333,6 +333,8 @@ static ngx_int_t
- ngx_http_gunzip_filter_add_data(ngx_http_request_t *r,
-     ngx_http_gunzip_ctx_t *ctx)
- {
-+    ngx_chain_t  *cl;
-+
-     if (ctx->zstream.avail_in || ctx->flush != Z_NO_FLUSH || ctx->redo) {
-         return NGX_OK;
-     }
-@@ -344,8 +346,11 @@ ngx_http_gunzip_filter_add_data(ngx_http_request_t *r,
-         return NGX_DECLINED;
-     }
- 
--    ctx->in_buf = ctx->in->buf;
--    ctx->in = ctx->in->next;
-+    cl = ctx->in;
-+    ctx->in_buf = cl->buf;
-+    ctx->in = cl->next;
-+
-+    ngx_free_chain(r->pool, cl);
- 
-     ctx->zstream.next_in = ctx->in_buf->pos;
-     ctx->zstream.avail_in = ctx->in_buf->last - ctx->in_buf->pos;
-@@ -374,6 +379,7 @@ static ngx_int_t
- ngx_http_gunzip_filter_get_buf(ngx_http_request_t *r,
-     ngx_http_gunzip_ctx_t *ctx)
- {
-+    ngx_chain_t             *cl;
-     ngx_http_gunzip_conf_t  *conf;
- 
-     if (ctx->zstream.avail_out) {
-@@ -383,8 +389,12 @@ ngx_http_gunzip_filter_get_buf(ngx_http_request_t *r,
-     conf = ngx_http_get_module_loc_conf(r, ngx_http_gunzip_filter_module);
- 
-     if (ctx->free) {
--        ctx->out_buf = ctx->free->buf;
--        ctx->free = ctx->free->next;
-+
-+        cl = ctx->free;
-+        ctx->out_buf = cl->buf;
-+        ctx->free = cl->next;
-+
-+        ngx_free_chain(r->pool, cl);
- 
-         ctx->out_buf->flush = 0;
- 
-diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
-index ed0de60..b555278 100644
---- a/src/http/modules/ngx_http_gzip_filter_module.c
-+++ b/src/http/modules/ngx_http_gzip_filter_module.c
-@@ -985,10 +985,14 @@ static void
- ngx_http_gzip_filter_free_copy_buf(ngx_http_request_t *r,
-     ngx_http_gzip_ctx_t *ctx)
- {
--    ngx_chain_t  *cl;
-+    ngx_chain_t  *cl, *ln;
-+
-+    for (cl = ctx->copied; cl; /* void */) {
-+        ln = cl;
-+        cl = cl->next;
- 
--    for (cl = ctx->copied; cl; cl = cl->next) {
--        ngx_pfree(r->pool, cl->buf->start);
-+        ngx_pfree(r->pool, ln->buf->start);
-+        ngx_free_chain(r->pool, ln);
-     }
- 
-     ctx->copied = NULL;
-diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
-index 0b84bd3..47068f7 100644
---- a/src/http/modules/ngx_http_ssi_filter_module.c
-+++ b/src/http/modules/ngx_http_ssi_filter_module.c
-@@ -482,9 +482,13 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
-     while (ctx->in || ctx->buf) {
- 
-         if (ctx->buf == NULL) {
--            ctx->buf = ctx->in->buf;
--            ctx->in = ctx->in->next;
-+
-+            cl = ctx->in;
-+            ctx->buf = cl->buf;
-+            ctx->in = cl->next;
-             ctx->pos = ctx->buf->pos;
-+
-+            ngx_free_chain(r->pool, cl);
-         }
- 
-         if (ctx->state == ssi_start_state) {
-diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
-index 6d3de59..456bb27 100644
---- a/src/http/modules/ngx_http_sub_filter_module.c
-+++ b/src/http/modules/ngx_http_sub_filter_module.c
-@@ -335,9 +335,13 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
-     while (ctx->in || ctx->buf) {
- 
-         if (ctx->buf == NULL) {
--            ctx->buf = ctx->in->buf;
--            ctx->in = ctx->in->next;
-+
-+            cl = ctx->in;
-+            ctx->buf = cl->buf;
-+            ctx->in = cl->next;
-             ctx->pos = ctx->buf->pos;
-+
-+            ngx_free_chain(r->pool, cl);
-         }
- 
-         if (ctx->buf->flush || ctx->buf->recycled) {
-diff --git a/src/http/v3/ngx_http_v3_parse.c b/src/http/v3/ngx_http_v3_parse.c
-index 5688163..436765c 100644
---- a/src/http/v3/ngx_http_v3_parse.c
-+++ b/src/http/v3/ngx_http_v3_parse.c
-@@ -810,6 +810,7 @@ ngx_http_v3_parse_field_lri(ngx_connection_t *c,
- 
-             st->literal.length = st->pint.value;
-             if (st->literal.length == 0) {
-+                st->value.data = (u_char *) "";
-                 goto done;
-             }
- 
-@@ -932,6 +933,7 @@ ngx_http_v3_parse_field_l(ngx_connection_t *c,
- 
-             st->literal.length = st->pint.value;
-             if (st->literal.length == 0) {
-+                st->value.data = (u_char *) "";
-                 goto done;
-             }
- 
-@@ -1072,6 +1074,7 @@ ngx_http_v3_parse_field_lpbi(ngx_connection_t *c,
- 
-             st->literal.length = st->pint.value;
-             if (st->literal.length == 0) {
-+                st->value.data = (u_char *) "";
-                 goto done;
-             }
- 
-diff --git a/src/http/v3/ngx_http_v3_request.c b/src/http/v3/ngx_http_v3_request.c
-index 87f5f32..0faddd2 100644
---- a/src/http/v3/ngx_http_v3_request.c
-+++ b/src/http/v3/ngx_http_v3_request.c
-@@ -134,7 +134,17 @@ ngx_http_v3_init(ngx_connection_t *c)
-         }
-     }
- 
--    return ngx_http_v3_send_settings(c);
-+    if (ngx_http_v3_send_settings(c) != NGX_OK) {
-+        return NGX_ERROR;
-+    }
-+
-+    if (h3scf->max_table_capacity > 0) {
-+        if (ngx_http_v3_get_uni_stream(c, NGX_HTTP_V3_STREAM_DECODER) == NULL) {
-+            return NGX_ERROR;
-+        }
-+    }
-+
-+    return NGX_OK;
- }
- 
- 
-@@ -398,14 +408,12 @@ ngx_http_v3_wait_request_handler(ngx_event_t *rev)
- void
- ngx_http_v3_reset_stream(ngx_connection_t *c)
- {
--    ngx_http_v3_session_t   *h3c;
--    ngx_http_v3_srv_conf_t  *h3scf;
--
--    h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
-+    ngx_http_v3_session_t  *h3c;
- 
-     h3c = ngx_http_v3_get_session(c);
- 
--    if (h3scf->max_table_capacity > 0 && !c->read->eof && !h3c->hq
-+    if (!c->read->eof && !h3c->hq
-+        && h3c->known_streams[NGX_HTTP_V3_STREAM_SERVER_DECODER]
-         && (c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0)
-     {
-         (void) ngx_http_v3_send_cancel_stream(c, c->quic->id);
-diff --git a/src/http/v3/ngx_http_v3_table.c b/src/http/v3/ngx_http_v3_table.c
-index f49a8fc..428e732 100644
---- a/src/http/v3/ngx_http_v3_table.c
-+++ b/src/http/v3/ngx_http_v3_table.c
-@@ -308,7 +308,7 @@ ngx_http_v3_set_capacity(ngx_connection_t *c, ngx_uint_t capacity)
-     prev_max = dt->capacity / 32;
- 
-     if (max > prev_max) {
--        elts = ngx_alloc(max * sizeof(void *), c->log);
-+        elts = ngx_alloc((max + 1) * sizeof(void *), c->log);
-         if (elts == NULL) {
-             return NGX_ERROR;
-         }
-diff --git a/src/http/v3/ngx_http_v3_uni.c b/src/http/v3/ngx_http_v3_uni.c
-index 2fc5b07..302064b 100644
---- a/src/http/v3/ngx_http_v3_uni.c
-+++ b/src/http/v3/ngx_http_v3_uni.c
-@@ -20,8 +20,6 @@ static void ngx_http_v3_close_uni_stream(ngx_connection_t *c);
- static void ngx_http_v3_uni_read_handler(ngx_event_t *rev);
- static void ngx_http_v3_uni_dummy_read_handler(ngx_event_t *wev);
- static void ngx_http_v3_uni_dummy_write_handler(ngx_event_t *wev);
--static ngx_connection_t *ngx_http_v3_get_uni_stream(ngx_connection_t *c,
--    ngx_uint_t type);
- 
- 
- void
-@@ -307,7 +305,7 @@ ngx_http_v3_uni_dummy_write_handler(ngx_event_t *wev)
- }
- 
- 
--static ngx_connection_t *
-+ngx_connection_t *
- ngx_http_v3_get_uni_stream(ngx_connection_t *c, ngx_uint_t type)
- {
-     u_char                     buf[NGX_HTTP_V3_VARLEN_INT_LEN];
-diff --git a/src/http/v3/ngx_http_v3_uni.h b/src/http/v3/ngx_http_v3_uni.h
-index 911e153..2805894 100644
---- a/src/http/v3/ngx_http_v3_uni.h
-+++ b/src/http/v3/ngx_http_v3_uni.h
-@@ -19,6 +19,8 @@ ngx_int_t ngx_http_v3_register_uni_stream(ngx_connection_t *c, uint64_t type);
- 
- ngx_int_t ngx_http_v3_cancel_stream(ngx_connection_t *c, ngx_uint_t stream_id);
- 
-+ngx_connection_t *ngx_http_v3_get_uni_stream(ngx_connection_t *c,
-+    ngx_uint_t type);
- ngx_int_t ngx_http_v3_send_settings(ngx_connection_t *c);
- ngx_int_t ngx_http_v3_send_goaway(ngx_connection_t *c, uint64_t id);
- ngx_int_t ngx_http_v3_send_ack_section(ngx_connection_t *c,

From 2939b5f2428f79794f89ff4946846c557e2d79b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Sun, 2 Feb 2025 19:41:56 +0100
Subject: [PATCH 585/600] d/changelog: remove duplicit lines

---
 debian/changelog | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09302b8..ad1798d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
 nginx (1.26.2-1) UNRELEASED; urgency=medium
 
   [ Jan Mojžíš ]
-  * d/u/signing-key.asc: add Sergey Kandaurov <s.kandaurov@f5.com> public key,
-    the key is used to sign the 1.26.2 release
   * d/gbp.conf: add upstream-signatures = on
   * d/{control,copyright}: update my email to "janmojzis@debian.org"
   * d/copyright: bump my copyright year

From 215777eecbceae05ed05a9f64cf6eef074239df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Sun, 2 Feb 2025 21:09:05 +0100
Subject: [PATCH 586/600] Release to experimental

---
 debian/changelog | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad1798d..469fb8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,16 @@
-nginx (1.26.2-1) UNRELEASED; urgency=medium
+nginx (1.26.2-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream version 1.26.2
+  * Add Sergey Kandaurov <s.kandaurov@f5.com> pgp public key
+  * Drop upstream patches
 
   [ Jan Mojžíš ]
   * d/gbp.conf: add upstream-signatures = on
   * d/{control,copyright}: update my email to "janmojzis@debian.org"
   * d/copyright: bump my copyright year
 
-  [ Jérémy Lal ]
-  * Add Sergey Kandaurov <s.kandaurov@f5.com> pgp public key
-  * New upstream version 1.26.2
-  * Drop upstream patches
-  * Refresh patches
-
- -- Jérémy Lal <kapouer@melix.org>  Sun, 02 Feb 2025 11:24:55 +0100
+ -- Jérémy Lal <kapouer@melix.org>  Sun, 02 Feb 2025 21:08:45 +0100
 
 nginx (1.26.0-3) unstable; urgency=medium
 

From be95fff10182255b961868e900115fb116ca3318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Wed, 5 Feb 2025 19:03:32 +0100
Subject: [PATCH 587/600] New upstream version 1.26.3

---
 .hgtags                                       | 483 ++++++++++++++++++
 CHANGES                                       |  24 +
 CHANGES.ru                                    |  25 +
 auto/lib/libatomic/conf                       |   4 +-
 auto/lib/libatomic/make                       |  11 +-
 auto/lib/pcre/make                            |   3 +-
 src/core/nginx.h                              |   4 +-
 .../quic/ngx_event_quic_openssl_compat.c      |   1 +
 src/event/quic/ngx_event_quic_output.c        |   4 +-
 src/event/quic/ngx_event_quic_streams.c       |  18 +-
 src/event/quic/ngx_event_quic_transport.c     |   5 +
 .../modules/ngx_http_gzip_filter_module.c     |   8 +-
 src/http/modules/ngx_http_mp4_module.c        |  18 +-
 src/http/ngx_http_request.c                   |  27 +-
 src/stream/ngx_stream_ssl_module.c            |  27 +-
 15 files changed, 639 insertions(+), 23 deletions(-)
 create mode 100644 .hgtags

diff --git a/.hgtags b/.hgtags
new file mode 100644
index 0000000..0dc64a5
--- /dev/null
+++ b/.hgtags
@@ -0,0 +1,483 @@
+551102312e19b704cd22bd7254a9444b9ea14e96 release-0.1.0
+23fb87bddda14ce9faec90f774085634106aded4 release-0.1.1
+295d97d70c698585705345f1a8f92b02e63d6d0d release-0.1.2
+ded1284520cc939ad5ae6ddab39925375e64237d release-0.1.3
+0491b909ef7612d8411f1f59054186c1f3471b52 release-0.1.4
+a88a3e4e158fade0aaa6f3eb25597d5ced2c1075 release-0.1.5
+1f31dc6d33a3a4e65240b08066bf186df9e33b79 release-0.1.6
+5aecc125bc33d81d6214c91d73eb44230a903dde release-0.1.7
+bbd6b0b4a2b15ef8c8f1aaf7b027b6da47303524 release-0.1.8
+2ff194b74f1e60cd04670986973e3b1a6aa3bece release-0.1.9
+31ee1b50354fb829564b81a6f34e8d6ceb2d3f48 release-0.1.10
+8e8f3af115b5b903b2b8f3335de971f18891246f release-0.1.11
+c3c2848fc081e19aec5ffa97e468ad20ddb81df0 release-0.1.12
+ad1e9ebf93bb5ae4c748d471fad2de8a0afc4d2a release-0.1.13
+c5240858380136a67bec261c59b1532560b57885 release-0.1.14
+fd661d14a7fad212e326a7dad6234ea0de992fbf release-0.1.15
+621229427cba1b0af417ff2a101fc4f17a7d93c8 release-0.1.16
+4ebe09b07e3021f1a63b459903ec58f162183b26 release-0.1.17
+31ff3e943e1675a2caf745ba7a981244445d4c98 release-0.1.18
+45a460f82aec80b0f61136aa09f412436d42203a release-0.1.19
+0f836f0288eee4980f57736d50a7a60fa082d8e9 release-0.1.20
+975f62e77f0244f1b631f740be77c72c8f2da1de release-0.1.21
+fc9909c369b2b4716304ac8e38da57b8fb781211 release-0.1.22
+d7c90bb5ce83dab08715e98f9c7b81c7df4b37be release-0.1.23
+64d9afb209da0cd4a917202b7b77e51cc23e2229 release-0.1.24
+d4ea69372b946dc4ec37fc3f5ddd93ff7c3da675 release-0.1.25
+b1648294f6935e993e436fd8a68bca75c74c826d release-0.1.26
+ee66921ecd47a7fa459f70f4a9d660f91f6a1b94 release-0.1.27
+cd3117ad9aab9c58c6f7e677e551e1adbdeaba54 release-0.1.28
+9b8c906f6e63ec2c71cecebfff35819a7d32227d release-0.1.29
+c12967aadd8726daf2d85e3f3e622d89c42db176 release-0.1.30
+fbbf16224844e7d560c00043e8ade8a560415bba release-0.1.31
+417a087c9c4d9abb9b0b9b3f787aff515c43c035 release-0.1.32
+dadfa78d227027348d7f9d1e7b7093d06ba545a0 release-0.1.33
+12234c998d83bfbbaa305273b3dd1b855ca325dc release-0.1.34
+6f00349b98e5f706b82115c6e4dc84456fc0d770 release-0.1.35
+2019117e6b38cc3e89fe4f56a23b271479c627a6 release-0.1.36
+09b42134ac0c42625340f16628e29690a04f8db5 release-0.1.37
+7fa11e5c6e9612ecff5eb58274cc846ae742d1d2 release-0.1.38
+e5d7d0334fdb946133c17523c198800142ac9fe9 release-0.1.39
+c3bd8cdabb8f73e5600a91f198eb7df6fac65e92 release-0.1.40
+d6e48c08d718bf5a9e58c20a37e8ae172bff1139 release-0.1.41
+563ad09abf5042eb41e8ecaf5b4e6c9deaa42731 release-0.1.42
+c9ad0d9c7d59b2fa2a5fe669f1e88debd03e6c04 release-0.1.43
+371c1cee100d7a1b0e6cad4d188e05c98a641ee7 release-0.1.44
+b09ee85d0ac823e36861491eedfc4dfafe282997 release-0.1.45
+511a89da35ada16ae806667d699f9610b4f8499a release-0.2.0
+0148586012ab3dde69b394ec5a389d44bb11c869 release-0.2.1
+818fbd4750b99d14d2736212c939855a11b1f1ef release-0.2.2
+e16a8d574da511622b97d6237d005f40f2cddb30 release-0.2.3
+483cca23060331f2078b1c2984870d80f288ad41 release-0.2.4
+45033d85b30e3f12c407b7cfc518d76e0eda0263 release-0.2.5
+7bd37aef1e7e87858c12b124e253e98558889b50 release-0.2.6
+ecd9c160f25b7a7075dd93383d98a0fc8d8c0a41 release-0.3.0
+c1f965ef97188fd7ef81342dcf8719da18c554d2 release-0.3.1
+e48ebafc69393fc94fecfdf9997c4179fd1ce473 release-0.3.2
+9c2f3ed7a24711d3b42b124d5f831155c8beff95 release-0.3.3
+7c1369d37c7eb0017c28ebcaa0778046f5aafdcc release-0.3.4
+1af2fcb3be8a63796b6b23a488049c92a6bc12f4 release-0.3.5
+174f1e853e1e831b01000aeccfd06a9c8d4d95a2 release-0.3.6
+458b6c3fea65a894c99dd429334a77bb164c7e83 release-0.3.7
+58475592100cb792c125101b6d2d898f5adada30 release-0.3.8
+fcd6fc7ff7f9b132c35193d834e6e7d05026c716 release-0.3.9
+4d9ea73a627a914d364e83e20c58eb1283f4031d release-0.3.10
+4c5c2c55975c1152b5ca5d5d55b32d4dd7945f7a release-0.3.11
+326634fb9d47912ad94221dc2f8fa4bec424d40c release-0.3.12
+4e296b7d25bf62390ca2afb599e395426b94f785 release-0.3.13
+401de5a43ba5a8acdb9c52465193c0ea7354afe7 release-0.3.14
+284cc140593bb16ac71094acd509ab415ff4837d release-0.3.15
+d4e858a5751a7fd08e64586795ed7d336011fbc0 release-0.3.16
+8c0cdd81580eb76d774cfc5724de68e7e5cbbdc2 release-0.3.17
+425af804d968f30eeff01e33b808bc2e8c467f2c release-0.3.18
+ebc68d8ca4962fe3531b7e13444f7ac4395d9c6e release-0.3.19
+9262f520ce214d3d5fd7c842891519336ef85ca6 release-0.3.20
+869b6444d2341a587183859d4df736c7f3381169 release-0.3.21
+77f77f53214a0e3a68fef8226c15532b54f2c365 release-0.3.22
+858700ae46b453ea111b966b6d03f2c21ddcb94e release-0.3.23
+5dac8c7fb71b86aafed8ea352305e7f85759f72e release-0.3.24
+77cdfe394a94a625955e7585e09983b3af9b889b release-0.3.25
+608cf78b24ef7baaf9705e4715a361f26bb16ba9 release-0.3.26
+3f8a2132b93d66ac19bec006205a304a68524a0b release-0.3.27
+c73c5c58c619c22dd3a5a26c91bb0567a62c6930 release-0.3.28
+5ef026a2ac7481f04154f29ab49377bf99aaf96f release-0.3.29
+51b27717f140b71a2e9158807d79da17c888ce4c release-0.3.30
+7a16e281c01f1c7ab3b79c64b43ddb754ea7935e release-0.3.31
+93e85a79757c49d502e42a1cb8264a0f133b0b00 release-0.3.32
+0216fd1471f386168545f772836156761eddec08 release-0.3.33
+fbed40ce7cb4fd7203fecc22a617b9ce5b950fb3 release-0.3.34
+387450de0b4d21652f0b6242a5e26a31e3be8d8c release-0.3.35
+65bf042c0b4f39f18a235464c52f980e9fa24f6b release-0.3.36
+5d2b8078c1c2593b95ec50acfeeafbefa65be344 release-0.3.37
+f971949ffb585d400e0f15508a56232a0f897c80 release-0.3.38
+18268abd340cb351e0c01b9c44e9f8cc05492364 release-0.3.39
+e60fe4cf1d4ea3c34be8c49047c712c6d46c1727 release-0.3.40
+715d243270806d38be776fc3ed826d97514a73d6 release-0.3.41
+5e8fb59c18c19347a5607fb5af075fe1e2925b9a release-0.3.42
+947c6fd27699e0199249ad592151f844c8a900b0 release-0.3.43
+4946078f0a79e6cc952d3e410813aac9b8bda650 release-0.3.44
+95d7da23ea5315a6e9255ce036ed2c51f091f180 release-0.3.45
+1e720b0be7ecd92358da8a60944669fa493e78cd release-0.3.46
+39b7d7b33c918d8f4abc86c4075052d8c19da3c7 release-0.3.47
+7cbef16c71a1f43a07f8141f02e0135c775f0f5b release-0.3.48
+4c8cd5ae5cc100add5c08c252d991b82b1838c6b release-0.3.49
+400711951595aef7cd2ef865b84b31df52b15782 release-0.3.50
+649c9063d0fda23620eaeaf0f6393be0a672ebe7 release-0.3.51
+9079ee4735aefa98165bb2cb26dee4f58d58c1d7 release-0.3.52
+6d5c1535bb9dcd891c5963971f767421a334a728 release-0.3.53
+5fd7a5e990477189c40718c8c3e01002a2c20b81 release-0.3.54
+63a820b0bc6ca629c8e45a069b52d622ddc27a2d release-0.3.55
+562806624c4afb1687cba83bc1852f5d0fecbac3 release-0.3.56
+cec32b3753acf610ac1a6227d14032c1a89d6319 release-0.3.57
+b80f94fa2197b99db5e033fec92e0426d1fe5026 release-0.3.58
+e924670896abe2769ea0fcfd2058b405bed8e8ec release-0.3.59
+921a7ce4baf42fd1091b7e40f89c858c6b23053e release-0.3.60
+df95dcff753a6dc5e94257302aea02c18c7a7c87 release-0.3.61
+7e24168b0853ee7e46c9c7b943ef077dc64f17f5 release-0.4.0
+8183d4ba50f8500465efb27e66dd23f98775dd21 release-0.4.1
+610267a772c7bf911b499d37f66c21ce8f2ebaf7 release-0.4.2
+39dd0b045441e21512e0a6061a03d0df63414d8b release-0.4.3
+5e42c1615f4de0079bd4d8913886d588ce6a295d release-0.4.4
+40266f92b829a870808b3d4ee54c8fccdecbd2d6 release-0.4.5
+56e33c6efee7ff63cdc52bd1cf172bde195079df release-0.4.6
+119bad43bfd493400c57a05848eada2c35a46810 release-0.4.7
+0f404f82a1343cb4e4b277a44e3417385798e5e5 release-0.4.8
+d24a717314365c857b9f283d6072c2a427d5e342 release-0.4.9
+d6f0a00015fdef861fd67fb583b9690638650656 release-0.4.10
+e372368dadd7b2ecd0182b2f1b11db86fc27b2c3 release-0.4.11
+fd57967d850d2361072c72562d1ed03598473478 release-0.4.12
+979045fdcbd20cf7188545c1c589ff240251f890 release-0.4.13
+93c94cfa9f78f0a5740595dde4466ec4fba664f8 release-0.4.14
+589ee12e8d7c2ae5e4f4676bcc7a1279a76f9e8e release-0.5.0
+13416db8a807e5acb4021bc3c581203de57e2f50 release-0.5.1
+06c58edc88831fb31c492a8eddcf2c6056567f18 release-0.5.2
+e2ac5fa41bcba14adbbb722d45c083c30c07bb5c release-0.5.3
+393dbc659df15ccd411680b5c1ce87ed86d4c144 release-0.5.4
+38cc7bd8e04f2c519fd4526c12841a876be353cb release-0.5.5
+6d1fcec2ea79101c756316c015f72e75f601a5ab release-0.5.6
+aed8a9de62456c4b360358bc112ccca32ce02e8d release-0.5.7
+7642f45af67d805452df2667486201c36efaff85 release-0.5.8
+779216610662c3a459935d506f66a9b16b9c9576 release-0.5.9
+9eeb585454f3daa30cf768e95c088a092fe229b9 release-0.5.10
+bb491c8197e38ca10ae63b1f1ecb36bf6fdaf950 release-0.5.11
+613369e08810f36bbcc9734ef1059a03ccbf5e16 release-0.5.12
+bd796ef5c9c9dd34bfac20261b98685e0410122a release-0.5.13
+8a730c49f906d783b47e4b44d735efd083936c64 release-0.5.14
+cb447039152d85e9145139ff2575a6199b9af9d4 release-0.5.15
+64854c7c95d04f838585ca08492823000503fa61 release-0.5.16
+d1ffcf84ea1244f659145c36ff28de6fcdf528b2 release-0.5.17
+796a6e30ca9d29504195c10210dbc8deced0ae83 release-0.5.18
+1f81c711d2a039e1f93b9b515065a2235372d455 release-0.5.19
+8e8f6082654aedb4438c8fca408cfc316c7c5a2a release-0.5.20
+e9551132f7dd40da5719dd5bcf924c86f1436f85 release-0.5.21
+533a252896c4d1cff1586ae42129d610f7497811 release-0.5.22
+f461a49b6c747e0b67f721f2be172902afea5528 release-0.5.23
+2d5ef73671f690b65bf6d9e22e7155f68f484d5a release-0.5.24
+77bf42576050862c268e267ef3e508b145845a25 release-0.5.25
+2aefee4d4ed69eb7567680bf27a2efd212232488 release-0.6.0
+7ac0fe9bec9a2b5f8e191f6fdd6922bfd916a6cb release-0.6.1
+4882735ebc71eeec0fbfe645bdfdb31306872d82 release-0.6.2
+b94731c73d0922f472ff938b9d252ba29020f20c release-0.6.3
+13e649b813d6ccba5db33a61e08ebe09d683cd5b release-0.6.4
+80de622646b0059fd4c553eff47c391bf7503b89 release-0.6.5
+3b05edb2619d5935023b979ee7a9611b61b6c9e5 release-0.6.6
+1dcfd375100c4479611f71efb99271d0a3059215 release-0.6.7
+0228185d4c5772947b842e856ad74cf7f7fd52f3 release-0.6.8
+d1879c52326ecac45c713203670f54220879911e release-0.6.9
+5a80c6ccbe2ad24fa3d4ff6f9fe4a2b07408d19d release-0.6.10
+f88a8b0b39601b19cd740e4db614ab0b5b874686 release-0.6.11
+5557460a7247a1602ae96efd1d0ccf781344cb58 release-0.6.12
+451b02cc770a794cd41363461b446948ae1d8bc8 release-0.6.13
+537b6ef014c4a133e0ab0b7dc817508e0647e315 release-0.6.14
+5e68764f0d6e91a983170fa806e7450a9e9b33fe release-0.6.15
+158aa4e8cc46fcf9504a61469d22daf3476b17bf release-0.6.16
+d8fcca555542619228d9fab89e1665b993f8c3ee release-0.6.17
+60707ebc037086cf004736a0d4979e2a608da033 release-0.6.18
+3c2a99d3a71af846855be35e62edb9a12f363f44 release-0.6.19
+3e0a27f9358ffc1b5249e0ea2311ce7da5c8967e release-0.6.20
+143f4d65b1c875d6563ccb7f653d9157afc72194 release-0.6.21
+95e6160d2b7d0af8ffd1b95a23cadadf8f0b3f6d release-0.6.22
+69a03d5e3b6e6660079ef1ef172db7ac08d8370e release-0.6.23
+3e2a58fb48f1e1a99ebf851e0d47a7034c52ae22 release-0.6.24
+3b8607c05a8bebcfa59235c2126a70d737f0ccf5 release-0.6.25
+07ad5b2606614c4be4ee720c46cf4af126059d31 release-0.6.26
+be531addfabe5214f409d457140c1038af10d199 release-0.6.27
+58f05255d3a345d04baef5cff0ca1ae0ac7ecebb release-0.6.28
+eb2bd21dc8d03f6c94016f04ffb9adaf83a2b606 release-0.6.29
+55408deb3cd171efa9b81d23d7a1dd1ccde0b839 release-0.6.30
+d4288915bba73c4c3c9cf5d39d34e86879eb2b45 release-0.6.31
+0a189588830b8629c4dfea68feb49af36b59e4a9 release-0.7.0
+6ab27a06f3346cf9ec8737f5dbcc82dd4031e30f release-0.7.1
+a07e258cef3b0a0b6e76a6ff4ba4651c5facc85a release-0.7.2
+9992c4583513d2804fc2e7fec860fbc7ab043009 release-0.7.3
+4dc24d50230fbadfc037a414a86390db2de69dd2 release-0.7.4
+9527137b4354a648a229c7169850c7c65272c00d release-0.7.5
+c2f0f7cf306f302254beae512bda18713922375c release-0.7.6
+bbcf6d75556fdcee8bd4aba8f6c27014be9920ee release-0.7.7
+43bde71f0bbe5a33b161760d7f9f980d50386597 release-0.7.8
+769f0dd7081e9011394f264aa22aa66fd79730d8 release-0.7.9
+511edfa732da637f5f0c9476335df7dca994706d release-0.7.10
+0e7023bf6b2461309c29885935443449a41be807 release-0.7.11
+9ad1bd2b21d93902863807528e426862aedee737 release-0.7.12
+d90ea21e24ea35379aef50c5d70564158e110a15 release-0.7.13
+c07d2d20d95c83d804079bbdcecbce4a0c8282f0 release-0.7.14
+0cd7bb051f67eac2b179fb9f9cc988b9ba18ed76 release-0.7.15
+eab2e87deba73ae6abd9cc740e8d4365bed96322 release-0.7.16
+91d7a9eb8ade90e9421d7b1e3c2e47a6bc427876 release-0.7.17
+fc10f7b5cb1305fb930f8ac40b46882d0828d61e release-0.7.18
+9dba9779e37e5969a2d408c792084fd7acfec062 release-0.7.19
+61838d1bcbddc7bc4dd9f30d535573a6fddca8f9 release-0.7.20
+5f665d0fa6a5f6e748157f2ccbc445b2db8125d0 release-0.7.21
+24763afa5efe91e54f00b2ae5b87666eb6c08c3b release-0.7.22
+0562fb355a25266150cbe8c8d4e00f55e3654df3 release-0.7.23
+19c452ecd083550816873a8a31eb3ed9879085e6 release-0.7.24
+46b68faf271d6fdcaaf3ad2c69f6167ea9e9fa28 release-0.7.25
+d04bfca0c7e3ae2e4422bc1d383553139d6f0a19 release-0.7.26
+9425d9c7f8ead95b00a3929a9a5e487e0e3c8499 release-0.7.27
+fbc3e7e8b3ee756568a875f87d8a954a2f9d3bf6 release-0.7.28
+5176dfdf153fc785b18604197d58806f919829ad release-0.7.29
+87e07ccdf0a4ec53458d9d7a4ea66e1239910968 release-0.7.30
+9fddd7e1a7a27f8463867f41a461aad57df461b2 release-0.7.31
+780b2ba1ec6daf6e3773774e26b05b9ff0d5483e release-0.7.32
+83027471a25385b1c671968be761e9aa7a8591a7 release-0.7.33
+1e9a362c3dcee221ca6e34308c483ed93867aca2 release-0.7.34
+c7ee9e15717b54ead5f4a554686e74abe66c6b07 release-0.7.35
+b84548abe9b9d4f4e203f848696e52c8c82c308f release-0.7.36
+3286f0bab8e77dbc7ebb370b1dc379592ccff123 release-0.7.37
+11a4e2ed5b166b9c9f119171aa399a9e3aa4684a release-0.7.38
+f822655d4120629977794c32d3b969343b6c30db release-0.7.39
+8a350e49d2b6751296db6d8e27277ccf63ed412a release-0.7.40
+c4a56c197eeafd71fc1caef7a9d890a330e3c23d release-0.7.41
+a9575a57a5443df39611774cf3840e9088132b0e release-0.7.42
+7503d95d6eadad14c28b2db183ba09848265274b release-0.7.43
+9be652e9114435fc6f1fdec84c0458d56702db91 release-0.7.44
+797e070d480a34b31ddac0d364784773f1bbbcf9 release-0.7.45
+9b5037e7ec7db25875c40f9d1cf20a853388b124 release-0.7.46
+d1d0e6d7ff0ca3c0dd1be1ef1cfff2e3fd0b4e1c release-0.7.47
+9816fb28eda599bfd53940e6d3b6617d1ecb6323 release-0.7.48
+452b9d09df8e3f2fb04b2a33d04d2f3a6436eb34 release-0.7.49
+e4350efa7cf7a0e868c2236a1137de8a33bd8ec6 release-0.7.50
+f51f2bec766c8b6d7e1799d904f18f8ea631bd44 release-0.7.51
+18e39e566781c9c187e2eb62bebd9d669d68f08c release-0.7.52
+b073eaa1dcea296a3488b83d455fab6621a73932 release-0.7.53
+01c6fe6c2a55998434cd3b05dd10ca487ac3fb6c release-0.7.54
+3ed9377e686f2521e6ec15873084381033fb490d release-0.7.55
+a1e44954549c35023b409f728c678be8bf898148 release-0.7.56
+fbb1918a85e38a7becdb1a001dbaf5933f23a919 release-0.7.57
+87f4a49a9cc34a5b11c8784cc5ea89e97b4b2bd8 release-0.7.58
+0c22cb4862c8beb4ee1b9e4627125162a29a5304 release-0.7.59
+82d56c2425ef857cd430b8530a3f9e1127145a67 release-0.8.0
+f4acb784b53cd952559567971b97dde1e818a2b6 release-0.8.1
+b3503597c1a0f0f378afdc5e5e5b85e2c095a4be release-0.8.2
+c98da980514a02ba81c421b25bf91803ffffddf3 release-0.8.3
+db34ec0c53c4b9dec12ffdf70caf89a325ab9577 release-0.8.4
+0914802433b8678ba2cdf91280766f00f4b9b76e release-0.8.5
+ff52ee9e6422f3759f43a442b7ba615595b3a3d4 release-0.8.6
+7607237b4829fff1f60999f4663c50ed9d5182f7 release-0.8.7
+1cef1807bc12cb05ac52fb0e7a0f111d3760b569 release-0.8.8
+a40f8475511d74a468ade29c1505e8986600d7a3 release-0.8.9
+2d9faf2260df6c3e5d4aa1781493c31f27a557d0 release-0.8.10
+d0d61c32331a6505381b5218318f7b69db167ca8 release-0.8.11
+ca7a1c6c798a7eb5b294d4ac3179ec87ecf297d3 release-0.8.12
+81c8277cd8ed55febcb2dd9d9213076f6c0ccb09 release-0.8.13
+3089486a8dc5844b5b6e9f78d536b4b26f7ffa16 release-0.8.14
+d364c2c12dd9723a2dfac3f096f5e55d4cfe6838 release-0.8.15
+52163a1027c3efd6b4c461b60a2ca6266c23e193 release-0.8.16
+06564e9a2d9ec5852132c212e85eda0bf1300307 release-0.8.17
+7aaa959da85e09e29bcac3b1cadec35b0a25b64d release-0.8.18
+4bc73c644329a510da4e96b7241b80ead7772f83 release-0.8.19
+ea3d168fb99c32a5c3545717ecc61e85a375e5dd release-0.8.20
+27951ca037e63dae45ff5b6279124c224ae1255a release-0.8.21
+d56c8b5df517c2bf6e7bc2827b8bf3e08cda90e1 release-0.8.22
+3c6ac062b379b126212cbb27e98a3c8275ef381a release-0.8.23
+89b9173476de14688b1418fbf7df10f91d1719ef release-0.8.24
+aa550cb4159ae0d566006e091fb1c7a888771050 release-0.8.25
+06ce92293f6a65651b08c466f90f55bd69984b98 release-0.8.26
+ea50b0d79ef1d7d901cd0e4dcd7373447849d719 release-0.8.27
+e68b1c35cad86105ff1c5b240f53442f4c36356e release-0.8.28
+78d3582a30afe63fc0adb17c3ac8891a64e47146 release-0.8.29
+9852c5965a3292a1b6127dbb4da9fce4912d898a release-0.8.30
+4f84115914490e572bcbee5069157b7334df2744 release-0.8.31
+59dee6f7f3afeb1fad6ed5983756e48c81ad2a5c release-0.8.32
+a4456378d234c07038456cf32bfe3c651f1d5e82 release-0.8.33
+21cb50799a20575a42f9733342d37a426f79db4d release-0.8.34
+7cb3cb8d78ef7ae63561733ed91fd07933896bc8 release-0.8.35
+aed68639d4eb6afe944b7fb50499c16f7f3f503c release-0.8.36
+265b7fd2ae21c75bbffa5115b83a0123d6c4acb4 release-0.8.37
+fa5f1ca353c0c5aa5415f51d72fd7bbcc02d1ed7 release-0.8.38
+af10bf9d4c6532850aa1f70cdf7504bd109b284c release-0.8.39
+4846ec9f83cb5bc4c8519d5641b35fb9b190430c release-0.8.40
+718b4cb3faf7efe4e0648140f064bf7a92c3f7e8 release-0.8.41
+b5a3065749093282ddd19845e0b77ffc2e54333e release-0.8.42
+34df9fb22fed415cdad52def04095dc6d4b48222 release-0.8.43
+00ec8cd76fb89af27363b76c40d9f88bf4679c3b release-0.8.44
+e16dd52a0d226c23dcae9a11252564a04753bbed release-0.8.45
+f034d9173df0a433e0bbcf5974f12ea9eb9076c0 release-0.8.46
+4434dc967087315efcd0658206a67fe6c85528f3 release-0.8.47
+0b65c962e0cd6783a854877b52c903cb058eec8c release-0.8.48
+a2b7e94b9807e981866bf07e37b715847d1b7120 release-0.8.49
+e7bdb8edc1bab2bc352a9fb6ce765c46575c35bf release-0.8.50
+21dacebd12f65cb57ceb8d2688db5b07fad6e06d release-0.8.51
+67dd7533b99c8945b5b8b5b393504d4e003a1c50 release-0.8.52
+010468d890dbac33a4cae6dfb2017db70721b2fe release-0.8.53
+62b599022a2fa625b526c2ad1711dc6db7d66786 release-0.9.0
+71281dd73b17a0ead5535d531afaee098da723cb release-0.9.1
+16cff36b0e49fc9fdeee13b2e92690286bcc1b3d release-0.9.2
+b7b306325972661117694879d3e22faf4cf0df32 release-0.9.3
+fe671505a8ea86a76f0358b3ec4de84a9037ac2b release-0.9.4
+70542931bc5436d1bbd38f152245d93ac063968d release-0.9.5
+27e2f3b7a3db1819c5d0ba28327ceaba84a13c4e release-0.9.6
+657d05d63915ce2f6c4d763091059f5f85bb10e5 release-0.9.7
+e0fd9f36005923b8f98d1ba1ea583cb7625f318f release-1.0.0
+f8f89eb4e0c27e857ec517d893d4f9a454985084 release-1.0.1
+c50df367648e53d55e80b60a447c9c66caa0d326 release-1.0.2
+80d586db316512b5a9d39f00fe185f7f91523f52 release-1.0.3
+c9c2805ac9245cc48ce6efeba2b4a444f859d6aa release-1.0.4
+fa2c37b1122c2c983b6e91d1188e387d72dde4d6 release-1.0.5
+f31aea5b06654c9163be5acd6d9b7aaf0fdf6b33 release-1.1.0
+44bf95f670656fae01ccb266b3863843ea13d324 release-1.1.1
+da1289482a143dfa016769649bdff636c26f53c8 release-1.1.2
+bac8ba08a6570bac2ecd3bf2ad64b0ac3030c903 release-1.1.3
+911060bc8221d4113a693ae97952a1fa88663ca8 release-1.1.4
+e47531dfabbf8e5f8b8aff9ff353642ea4aa7abb release-1.1.5
+f9ddecfe331462f870a95e4c1c3ba1bb8f19f2d3 release-1.1.6
+378c297bb7459fb99aa9c77decac0d35391a3932 release-1.1.7
+71600ce67510af093d4bc0117a78b3b4678c6b3a release-1.1.8
+482d7d907f1ab92b78084d8b8631ed0eb7dd08f7 release-1.1.9
+c7e65deabf0db5109e8d8f6cf64cd3fb7633a3d1 release-1.1.10
+9590f0cf5aab8e6e0b0c8ae59c70187b2b97d886 release-1.1.11
+ade8fc136430cfc04a8d0885c757968b0987d56c release-1.1.12
+6a6836e65827fd3cb10a406e7bbbe36e0dad8736 release-1.1.13
+6845f4ac909233f5a08ed8a51de137713a888328 release-1.1.14
+2397e9c72f1bc5eac67006e12ad3e33e0ea9ba74 release-1.1.15
+7b7c49639a7bceecabf4963c60b26b65a77d6ce0 release-1.1.16
+f7e1113a9a1648cad122543e7080e895cf2d88f4 release-1.1.17
+2b22743c3079b41233ded0fc35af8aa89bcfab91 release-1.1.18
+0f0b425659e0b26f5bc8ea14a42dbf34de2eaba6 release-1.1.19
+f582d662cc408eb7a132c21f4b298b71d0701abb release-1.2.0
+9ee68d629722f583d43d92271f2eb84281afc630 release-1.3.0
+61b6a3438afef630774e568eefd89c53e3b93287 release-1.3.1
+7ccd50a0a455f2f2d3b241f376e1193ad956196d release-1.2.1
+0000000000000000000000000000000000000000 release-1.2.1
+50107e2d96bbfc2c59e46f889b1a5f68dd10cf19 release-1.3.2
+2c5e1e88c8cf710caf551c5c67eba00443601efe release-1.3.3
+a43447fb82aa03eabcd85352758ae14606a84d35 release-1.3.4
+90f3b4ea7992a7bf9385851a3e77173363091eea release-1.3.5
+3aeb14f88daeb973e4708310daa3dc68ac1200f7 release-1.3.6
+dafd375f1c882b15fa4a9b7aa7c801c55082395e release-1.3.7
+ab7ce0eb4cf78a656750ab1d8e55ef61f7e535ec release-1.3.8
+1b1a9337a7399ad3cdc5e3a2f9fbaaec990271d5 release-1.3.9
+2c053b2572694eb9cd4aed26a498b6cb1f51bbcc release-1.3.10
+36409ac209872ce53019f084e4e07467c5d9d25e release-1.3.11
+560dc55e90c13860a79d8f3e0d67a81c7b0257bb release-1.3.12
+dc195ffe0965b2b9072f8e213fe74ecce38f6773 release-1.3.13
+e04428778567dd4de329bbbe97ad653e22801612 release-1.3.14
+cd84e467c72967b9f5fb4d96bfc708c93edeb634 release-1.3.15
+23159600bdea695db8f9d2890aaf73424303e49c release-1.3.16
+7809529022b83157067e7d1e2fb65d57db5f4d99 release-1.4.0
+48a84bc3ff074a65a63e353b9796ff2b14239699 release-1.5.0
+99eed1a88fc33f32d66e2ec913874dfef3e12fcc release-1.5.1
+5bdca4812974011731e5719a6c398b54f14a6d61 release-1.5.2
+644a079526295aca11c52c46cb81e3754e6ad4ad release-1.5.3
+376a5e7694004048a9d073e4feb81bb54ee3ba91 release-1.5.4
+60e0409b9ec7ee194c6d8102f0656598cc4a6cfe release-1.5.5
+70c5cd3a61cb476c2afb3a61826e59c7cda0b7a7 release-1.5.6
+9ba2542d75bf62a3972278c63561fc2ef5ec573a release-1.5.7
+eaa76f24975948b0ce8be01838d949122d44ed67 release-1.5.8
+5a1759f33b7fa6270e1617c08d7e655b7b127f26 release-1.5.9
+b798fc020e3a84ef68e6c9f47865a319c826d33c release-1.5.10
+f995a10d4c7e9a817157a6ce7b753297ad32897e release-1.5.11
+97b47d95e4449cbde976657cf8cbbc118351ffe0 release-1.5.12
+fd722b890eabc600394349730a093f50dac31639 release-1.5.13
+d161d68df8be32e5cbf72b07db1a707714827803 release-1.7.0
+0351a6d89c3dbcc7a76295024ba6b70e27b9a497 release-1.7.1
+0bd223a546192fdf2e862f33938f4ec2a3b5b283 release-1.7.2
+fe7cd01828d5ca7491059f0690bb4453645eb28b release-1.7.3
+cbb146b120296852e781079d5138b04495bab6df release-1.7.4
+fe129aa02db9001d220f1db7c3c056f79482c111 release-1.7.5
+a8d111bb68847f61d682a3c8792fecb2e52efa2c release-1.7.6
+6d2fbc30f8a7f70136cf08f32d5ff3179d524873 release-1.7.7
+d5ea659b8bab2d6402a2266efa691f705e84001e release-1.7.8
+34b201c1abd1e2d4faeae4650a21574771a03c0e release-1.7.9
+860cfbcc4606ee36d898a9cd0c5ae8858db984d6 release-1.7.10
+2b3b737b5456c05cd63d3d834f4fb4d3776953d0 release-1.7.11
+3ef00a71f56420a9c3e9cec311c9a2109a015d67 release-1.7.12
+53d850fe292f157d2fb999c52788ec1dc53c91ed release-1.9.0
+884a967c369f73ab16ea859670d690fb094d3850 release-1.9.1
+3a32d6e7404a79a0973bcd8d0b83181c5bf66074 release-1.9.2
+e27a215601292872f545a733859e06d01af1017d release-1.9.3
+5cb7e2eed2031e32d2e5422caf9402758c38a6ad release-1.9.4
+942475e10cb47654205ede7ccbe7d568698e665b release-1.9.5
+b78018cfaa2f0ec20494fccb16252daa87c48a31 release-1.9.6
+54117529e40b988590ea2d38aae909b0b191663f release-1.9.7
+1bdc497c81607d854e3edf8b9a3be324c3d136b6 release-1.9.8
+ef107f3ddc237a3007e2769ec04adde0dcf627fa release-1.9.9
+be00ca08e41a69e585b6aff70a725ed6c9e1a876 release-1.9.10
+fe66cff450a95beed36a2515210eb2d7ef62c9d3 release-1.9.11
+ead3907d74f90a14d1646f1b2b56ba01d3d11702 release-1.9.12
+5936b7ed929237f1a73b467f662611cdc0309e51 release-1.9.13
+4106db71cbcb9c8274700199ac17e520902c6c0f release-1.9.14
+13070ecfda67397985f0e986eb9c42ecb46d05b5 release-1.9.15
+271ee30c6791847980cd139d31807541f5e569bf release-1.11.0
+cb783d9cc19761e14e1285d91c38f4b84d0b8756 release-1.11.1
+4d3b3a13a8cf5fc3351a7f167d1c13325e00f21c release-1.11.2
+b83a067949a3384a49fd3d943eb8d0997b31f87b release-1.11.3
+953512ca02c6f63b4fcbbc3e10d0d9835896bf99 release-1.11.4
+5253015a339aaca0a3111473d3e931b6d4752393 release-1.11.5
+5e371426b3bcba4312ce08606194b89b758927d1 release-1.11.6
+5c8f60faf33ca8926473d2da27b4c3c417bd4630 release-1.11.7
+4591da489a30f790def29bc5987f43409b503cae release-1.11.8
+20a45c768e5ed26b740679d0e22045c98727c3cc release-1.11.9
+1ad0999a7ded3d4fb01c7acf8ff57c80b643da7e release-1.11.10
+d8b321a876d6254e9e98795e3b194ef053290354 release-1.11.11
+7f394e433f0003222aa6531931ecc0b24740d5e4 release-1.11.12
+3d0e8655f897959e48cc74e87670bb5492a58871 release-1.11.13
+3671096a45bce570a2afa20b9faf42c7fb0f7e66 release-1.13.0
+539f7893ecb96bee60965528c8958d7eb2f1ce6b release-1.13.1
+5be2b25bdc65775a85f18f68a4be4f58c7384415 release-1.13.2
+8457ce87640f9bfe6221c4ac4466ced20e03bebe release-1.13.3
+bbc642c813c829963ce8197c0ca237ab7601f3d4 release-1.13.4
+0d45b4cf7c2e4e626a5a16e1fe604402ace1cea5 release-1.13.5
+f87da7d9ca02b8ced4caa6c5eb9013ccd47b0117 release-1.13.6
+47cca243d0ed39bf5dcb9859184affc958b79b6f release-1.13.7
+20ca4bcff108d3e66977f4d97508637093492287 release-1.13.8
+fb1212c7eca4c5328fe17d6cd95b010c67336aac release-1.13.9
+31c929e16910c38492581ef474e72fa67c28f124 release-1.13.10
+64179f242cb55fc206bca59de9bfdc4cf5ebcec7 release-1.13.11
+051e5fa03b92b8a564f6b12debd483d267391e82 release-1.13.12
+990b3e885636d763b97ed02d0d2cfc161a4e0c09 release-1.15.0
+4189160cb946bb38d0bc0a452b5eb4cdd8979fb5 release-1.15.1
+b234199c7ed8a156a6bb98f7ff58302c857c954f release-1.15.2
+28b3e17ca7eba1e6a0891afde0e4bc5bcc99c861 release-1.15.3
+49d49835653857daa418e68d6cbfed4958c78fca release-1.15.4
+f062e43d74fc2578bb100a9e82a953efa1eb9e4e release-1.15.5
+2351853ce6867b6166823bdf94333c0a76633c0a release-1.15.6
+051a039ce1c7e09144de4a4846669ec7116cecea release-1.15.7
+ee551e3f6dba336c0d875e266d7d55385f379b42 release-1.15.8
+d2fd76709909767fc727a5b4affcf1dc9ca488a7 release-1.15.9
+75f5c7f628411c79c7044102049f7ab4f7a246e7 release-1.15.10
+5155d0296a5ef9841f035920527ffdb771076b44 release-1.15.11
+0130ca3d58437b3c7c707cdddd813d530c68da9a release-1.15.12
+054c1c46395caff79bb4caf16f40b331f71bb6dd release-1.17.0
+7816bd7dabf6ee86c53c073b90a7143161546e06 release-1.17.1
+2fc9f853a6b7cd29dc84e0af2ed3cf78e0da6ca8 release-1.17.2
+ed4303aa1b31a9aad5440640c0840d9d0af45fed release-1.17.3
+ce2ced3856909f36f8130c99eaa4dbdbae636ddc release-1.17.4
+9af0dddbddb2c368bfedd2801bc100ffad01e19b release-1.17.5
+de68d0d94320cbf033599c6f3ca37e5335c67fd7 release-1.17.6
+e56295fe0ea76bf53b06bffa77a2d3a9a335cb8c release-1.17.7
+fdacd273711ddf20f778c1fb91529ab53979a454 release-1.17.8
+5e8d52bca714d4b85284ddb649d1ba4a3ca978a8 release-1.17.9
+c44970de01474f6f3e01b0adea85ec1d03e3a5f2 release-1.17.10
+cbe6ba650211541310618849168631ce0b788f35 release-1.19.0
+062920e2f3bf871ef7a3d8496edec1b3065faf80 release-1.19.1
+a7b46539f507e6c64efa0efda69ad60b6f4ffbce release-1.19.2
+3cbc2602325f0ac08917a4397d76f5155c34b7b1 release-1.19.3
+dc0cc425fa63a80315f6efb68697cadb6626cdf2 release-1.19.4
+8e5b068f761cd512d10c9671fbde0b568c1fd08b release-1.19.5
+f618488eb769e0ed74ef0d93cd118d2ad79ef94d release-1.19.6
+3fa6e2095a7a51acc630517e1c27a7b7ac41f7b3 release-1.19.7
+8c65d21464aaa5923775f80c32474adc7a320068 release-1.19.8
+da571b8eaf8f30f36c43b3c9b25e01e31f47149c release-1.19.9
+ffcbb9980ee2bad27b4d7b1cd680b14ff47b29aa release-1.19.10
+df34dcc9ac072ffd0945e5a1f3eb7987e8275375 release-1.21.0
+a68ac0677f8553b1f84d357bc9da114731ab5f47 release-1.21.1
+bfbc52374adcbf2f9060afd62de940f6fab3bba5 release-1.21.2
+2217a9c1d0b86026f22700b3c089545db1964f55 release-1.21.3
+39be8a682c58308d9399cddd57e37f9fdb7bdf3e release-1.21.4
+d986378168fd4d70e0121cabac274c560cca9bdf release-1.21.5
+714eb4b2c09e712fb2572a2164ce2bf67638ccac release-1.21.6
+5da2c0902e8e2aa4534008a582a60c61c135960e release-1.23.0
+a63d0a70afea96813ba6667997bc7d68b5863f0d release-1.23.1
+aa901551a7ebad1e8b0f8c11cb44e3424ba29707 release-1.23.2
+ff3afd1ce6a6b65057741df442adfaa71a0e2588 release-1.23.3
+ac779115ed6ee4f3039e9aea414a54e560450ee2 release-1.23.4
+12dcf92b0c2c68552398f19644ce3104459807d7 release-1.25.0
+f8134640e8615448205785cf00b0bc810489b495 release-1.25.1
+1d839f05409d1a50d0f15a2bf36547001f99ae40 release-1.25.2
+294a3d07234f8f65d7b0e0b0e2c5b05c12c5da0a release-1.25.3
+173a0a7dbce569adbb70257c6ec4f0f6bc585009 release-1.25.4
+8618e4d900cc71082fbe7dc72af087937d64faf5 release-1.25.5
+a58202a8c41bf0bd97eef1b946e13105a105520d release-1.26.0
+a63c124e34bcf2d1d1feb8d40ff075103b967c4c release-1.26.1
+e4c5da06073ca24e2ffc5c8f8b8d7833a926356f release-1.26.2
diff --git a/CHANGES b/CHANGES
index 49e47de..9c2fb00 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,28 @@
 
+Changes with nginx 1.26.3                                        05 Feb 2025
+
+    *) Security: insufficient check in virtual servers handling with TLSv1.3
+       SNI allowed to reuse SSL sessions in a different virtual server, to
+       bypass client SSL certificates verification (CVE-2025-23419).
+
+    *) Bugfix: in the ngx_http_mp4_module.
+       Thanks to Nils Bars.
+
+    *) Workaround: "gzip filter failed to use preallocated memory" alerts
+       appeared in logs when using zlib-ng.
+
+    *) Bugfix: nginx could not build libatomic library using the library
+       sources if the --with-libatomic=DIR option was used.
+
+    *) Bugfix: nginx now ignores QUIC version negotiation packets from
+       clients.
+
+    *) Bugfix: nginx could not be built on Solaris 10 and earlier with the
+       ngx_http_v3_module.
+
+    *) Bugfixes in HTTP/3.
+
+
 Changes with nginx 1.26.2                                        14 Aug 2024
 
     *) Security: processing of a specially crafted mp4 file by the
diff --git a/CHANGES.ru b/CHANGES.ru
index aaa0f5f..0d1ba20 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,29 @@
 
+Изменения в nginx 1.26.3                                          05.02.2025
+
+    *) Безопасность: недостаточная проверка в обработке виртуальных серверов
+       при использовании SNI в TLSv1.3 позволяла повторно использовать
+       SSL-сессию в контексте другого виртуального сервера, чтобы обойти
+       проверку клиентских SSL-сертификатов (CVE-2025-23419).
+
+    *) Исправление: в модуле ngx_http_mp4_module.
+       Спасибо Nils Bars.
+
+    *) Изменение: при использовании zlib-ng в логах появлялись сообщения
+       "gzip filter failed to use preallocated memory".
+
+    *) Исправление: nginx не мог собрать библиотеку libatomic из исходных
+       текстов, если использовался параметр --with-libatomic=DIR.
+
+    *) Исправление: теперь nginx игнорирует пакеты согласования версий QUIC
+       от клиентов.
+
+    *) Исправление: nginx не собирался на Solaris 10 и более ранних с
+       модулем ngx_http_v3_module.
+
+    *) Исправления в HTTP/3.
+
+
 Изменения в nginx 1.26.2                                          14.08.2024
 
     *) Безопасность: обработка специально созданного mp4-файла модулем
diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
index 8c8cb43..dfdc1a6 100644
--- a/auto/lib/libatomic/conf
+++ b/auto/lib/libatomic/conf
@@ -7,8 +7,8 @@ if [ $NGX_LIBATOMIC != YES ]; then
 
     have=NGX_HAVE_LIBATOMIC . auto/have
     CORE_INCS="$CORE_INCS $NGX_LIBATOMIC/src"
-    LINK_DEPS="$LINK_DEPS $NGX_LIBATOMIC/src/libatomic_ops.a"
-    CORE_LIBS="$CORE_LIBS $NGX_LIBATOMIC/src/libatomic_ops.a"
+    LINK_DEPS="$LINK_DEPS $NGX_LIBATOMIC/build/lib/libatomic_ops.a"
+    CORE_LIBS="$CORE_LIBS $NGX_LIBATOMIC/build/lib/libatomic_ops.a"
 
 else
 
diff --git a/auto/lib/libatomic/make b/auto/lib/libatomic/make
index c90318e..530c746 100644
--- a/auto/lib/libatomic/make
+++ b/auto/lib/libatomic/make
@@ -3,14 +3,19 @@
 # Copyright (C) Nginx, Inc.
 
 
+    case $NGX_LIBATOMIC in
+        /*) ngx_prefix="$NGX_LIBATOMIC/build" ;;
+        *)  ngx_prefix="$PWD/$NGX_LIBATOMIC/build" ;;
+    esac
+
     cat << END                                            >> $NGX_MAKEFILE
 
-$NGX_LIBATOMIC/src/libatomic_ops.a:	$NGX_LIBATOMIC/Makefile
-	cd $NGX_LIBATOMIC && \$(MAKE)
+$NGX_LIBATOMIC/build/lib/libatomic_ops.a:	$NGX_LIBATOMIC/Makefile
+	cd $NGX_LIBATOMIC && \$(MAKE) && \$(MAKE) install
 
 $NGX_LIBATOMIC/Makefile:	$NGX_MAKEFILE
 	cd $NGX_LIBATOMIC \\
 	&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
-	&& ./configure
+	&& ./configure --prefix=$ngx_prefix
 
 END
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 839ef29..182590a 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -36,7 +36,8 @@ if [ $PCRE_LIBRARY = PCRE2 ]; then
                        pcre2_valid_utf.c \
                        pcre2_xclass.c"
 
-        ngx_pcre_test="pcre2_convert.c \
+        ngx_pcre_test="pcre2_chkdint.c \
+                       pcre2_convert.c \
                        pcre2_extuni.c \
                        pcre2_find_bracket.c \
                        pcre2_script_run.c \
diff --git a/src/core/nginx.h b/src/core/nginx.h
index d29edd2..ef000e0 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1026002
-#define NGINX_VERSION      "1.26.2"
+#define nginx_version      1026003
+#define NGINX_VERSION      "1.26.3"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/event/quic/ngx_event_quic_openssl_compat.c b/src/event/quic/ngx_event_quic_openssl_compat.c
index c7412e8..6052bc6 100644
--- a/src/event/quic/ngx_event_quic_openssl_compat.c
+++ b/src/event/quic/ngx_event_quic_openssl_compat.c
@@ -391,6 +391,7 @@ SSL_set_quic_method(SSL *ssl, const SSL_QUIC_METHOD *quic_method)
 
     wbio = BIO_new(BIO_s_null());
     if (wbio == NULL) {
+        BIO_free(rbio);
         return 0;
     }
 
diff --git a/src/event/quic/ngx_event_quic_output.c b/src/event/quic/ngx_event_quic_output.c
index ce6aaab..f087e2b 100644
--- a/src/event/quic/ngx_event_quic_output.c
+++ b/src/event/quic/ngx_event_quic_output.c
@@ -411,7 +411,7 @@ ngx_quic_send_segments(ngx_connection_t *c, u_char *buf, size_t len,
     ngx_memzero(msg_control, sizeof(msg_control));
 
     iov.iov_len = len;
-    iov.iov_base = buf;
+    iov.iov_base = (void *) buf;
 
     msg.msg_iov = &iov;
     msg.msg_iovlen = 1;
@@ -699,7 +699,7 @@ ngx_quic_send(ngx_connection_t *c, u_char *buf, size_t len,
     ngx_memzero(&msg, sizeof(struct msghdr));
 
     iov.iov_len = len;
-    iov.iov_base = buf;
+    iov.iov_base = (void *) buf;
 
     msg.msg_iov = &iov;
     msg.msg_iovlen = 1;
diff --git a/src/event/quic/ngx_event_quic_streams.c b/src/event/quic/ngx_event_quic_streams.c
index 178b805..a9a21f5 100644
--- a/src/event/quic/ngx_event_quic_streams.c
+++ b/src/event/quic/ngx_event_quic_streams.c
@@ -174,7 +174,7 @@ ngx_int_t
 ngx_quic_close_streams(ngx_connection_t *c, ngx_quic_connection_t *qc)
 {
     ngx_pool_t         *pool;
-    ngx_queue_t        *q;
+    ngx_queue_t        *q, posted_events;
     ngx_rbtree_t       *tree;
     ngx_connection_t   *sc;
     ngx_rbtree_node_t  *node;
@@ -197,6 +197,8 @@ ngx_quic_close_streams(ngx_connection_t *c, ngx_quic_connection_t *qc)
         return NGX_OK;
     }
 
+    ngx_queue_init(&posted_events);
+
     node = ngx_rbtree_min(tree->root, tree->sentinel);
 
     while (node) {
@@ -213,15 +215,21 @@ ngx_quic_close_streams(ngx_connection_t *c, ngx_quic_connection_t *qc)
         }
 
         sc->read->error = 1;
+        sc->read->ready = 1;
         sc->write->error = 1;
-
-        ngx_quic_set_event(sc->read);
-        ngx_quic_set_event(sc->write);
+        sc->write->ready = 1;
 
         sc->close = 1;
-        sc->read->handler(sc->read);
+
+        if (sc->read->posted) {
+            ngx_delete_posted_event(sc->read);
+        }
+
+        ngx_post_event(sc->read, &posted_events);
     }
 
+    ngx_event_process_posted((ngx_cycle_t *) ngx_cycle, &posted_events);
+
     if (tree->root == tree->sentinel) {
         return NGX_OK;
     }
diff --git a/src/event/quic/ngx_event_quic_transport.c b/src/event/quic/ngx_event_quic_transport.c
index fba098c..bb13447 100644
--- a/src/event/quic/ngx_event_quic_transport.c
+++ b/src/event/quic/ngx_event_quic_transport.c
@@ -295,6 +295,11 @@ ngx_quic_parse_packet(ngx_quic_header_t *pkt)
         return NGX_ERROR;
     }
 
+    if (pkt->version == 0) {
+        /* version negotiation */
+        return NGX_ERROR;
+    }
+
     if (!ngx_quic_supported_version(pkt->version)) {
         return NGX_ABORT;
     }
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index b555278..7113df6 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -516,8 +516,10 @@ ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
         /*
          * Another zlib variant, https://github.com/zlib-ng/zlib-ng.
          * It used to force window bits to 13 for fast compression level,
-         * uses (64 + sizeof(void*)) additional space on all allocations
-         * for alignment, 16-byte padding in one of window-sized buffers,
+         * used (64 + sizeof(void*)) additional space on all allocations
+         * for alignment and 16-byte padding in one of window-sized buffers,
+         * uses a single allocation with up to 200 bytes for alignment and
+         * internal pointers, 5/4 times more memory for the pending buffer,
          * and 128K hash.
          */
 
@@ -526,7 +528,7 @@ ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
         }
 
         ctx->allocated = 8192 + 16 + (1 << (wbits + 2))
-                         + 131072 + (1 << (memlevel + 8))
+                         + 131072 + (5 << (memlevel + 6))
                          + 4 * (64 + sizeof(void*));
         ctx->zlib_ng = 1;
     }
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c
index 041ad26..b7bd192 100644
--- a/src/http/modules/ngx_http_mp4_module.c
+++ b/src/http/modules/ngx_http_mp4_module.c
@@ -3176,7 +3176,10 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
 
         start_sample -= n;
 
-        prev_samples = samples;
+        if (next_chunk > chunk) {
+            prev_samples = samples;
+        }
+
         chunk = next_chunk;
         samples = ngx_mp4_get_32value(entry->samples);
         id = ngx_mp4_get_32value(entry->id);
@@ -3186,6 +3189,13 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
 
     next_chunk = trak->chunks + 1;
 
+    if (next_chunk < chunk) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "unordered mp4 stsc chunks in \"%s\"",
+                      mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
                    "sample:%uD, chunk:%uD, chunks:%uD, samples:%uD",
                    start_sample, chunk, next_chunk - chunk, samples);
@@ -3211,6 +3221,12 @@ found:
         return NGX_ERROR;
     }
 
+    if (chunk == 0) {
+        ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
+                      "zero chunk in \"%s\"", mp4->file.name.data);
+        return NGX_ERROR;
+    }
+
     target_chunk = chunk - 1;
     target_chunk += start_sample / samples;
     chunk_samples = start_sample % samples;
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 3cca57c..9593b7f 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -932,6 +932,31 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
         goto done;
     }
 
+    sscf = ngx_http_get_module_srv_conf(cscf->ctx, ngx_http_ssl_module);
+
+#if (defined TLS1_3_VERSION                                                   \
+     && !defined LIBRESSL_VERSION_NUMBER && !defined OPENSSL_IS_BORINGSSL)
+
+    /*
+     * SSL_SESSION_get0_hostname() is only available in OpenSSL 1.1.1+,
+     * but servername being negotiated in every TLSv1.3 handshake
+     * is only returned in OpenSSL 1.1.1+ as well
+     */
+
+    if (sscf->verify) {
+        const char  *hostname;
+
+        hostname = SSL_SESSION_get0_hostname(SSL_get0_session(ssl_conn));
+
+        if (hostname != NULL && ngx_strcmp(hostname, servername) != 0) {
+            c->ssl->handshake_rejected = 1;
+            *ad = SSL_AD_ACCESS_DENIED;
+            return SSL_TLSEXT_ERR_ALERT_FATAL;
+        }
+    }
+
+#endif
+
     hc->ssl_servername = ngx_palloc(c->pool, sizeof(ngx_str_t));
     if (hc->ssl_servername == NULL) {
         goto error;
@@ -945,8 +970,6 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
 
     ngx_set_connection_log(c, clcf->error_log);
 
-    sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
-
     c->ssl->buffer_size = sscf->buffer_size;
 
     if (sscf->ssl.ctx) {
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c
index ba44477..6dee106 100644
--- a/src/stream/ngx_stream_ssl_module.c
+++ b/src/stream/ngx_stream_ssl_module.c
@@ -521,12 +521,35 @@ ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg)
         goto done;
     }
 
+    sscf = ngx_stream_get_module_srv_conf(cscf->ctx, ngx_stream_ssl_module);
+
+#if (defined TLS1_3_VERSION                                                   \
+     && !defined LIBRESSL_VERSION_NUMBER && !defined OPENSSL_IS_BORINGSSL)
+
+    /*
+     * SSL_SESSION_get0_hostname() is only available in OpenSSL 1.1.1+,
+     * but servername being negotiated in every TLSv1.3 handshake
+     * is only returned in OpenSSL 1.1.1+ as well
+     */
+
+    if (sscf->verify) {
+        const char  *hostname;
+
+        hostname = SSL_SESSION_get0_hostname(SSL_get0_session(ssl_conn));
+
+        if (hostname != NULL && ngx_strcmp(hostname, servername) != 0) {
+            c->ssl->handshake_rejected = 1;
+            *ad = SSL_AD_ACCESS_DENIED;
+            return SSL_TLSEXT_ERR_ALERT_FATAL;
+        }
+    }
+
+#endif
+
     s->srv_conf = cscf->ctx->srv_conf;
 
     ngx_set_connection_log(c, cscf->error_log);
 
-    sscf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module);
-
     if (sscf->ssl.ctx) {
         if (SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx) == NULL) {
             goto error;

From c5cca14382978b08a86f6aecf0767c0ee49c3a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Wed, 5 Feb 2025 19:07:54 +0100
Subject: [PATCH 588/600] Bump ABI

---
 debian/libnginx-mod.abisubstvars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/libnginx-mod.abisubstvars b/debian/libnginx-mod.abisubstvars
index 21d5511..57261d4 100644
--- a/debian/libnginx-mod.abisubstvars
+++ b/debian/libnginx-mod.abisubstvars
@@ -8,4 +8,4 @@
 # changes without upgrading the upstream nginx version, e.g. security updates
 # in oldstable
 
-nginx:abi=nginx-abi-1.26.2-1
+nginx:abi=nginx-abi-1.26.3-1

From 58f592a8ab0e66fc979a6552e0d770b2cfbad015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Wed, 5 Feb 2025 19:08:06 +0100
Subject: [PATCH 589/600] Release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 469fb8b..0597f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.26.3-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream version 1.26.3
+
+ -- Jérémy Lal <kapouer@melix.org>  Wed, 05 Feb 2025 19:08:02 +0100
+
 nginx (1.26.2-1) experimental; urgency=medium
 
   * Team upload

From c789199d370d353157519250d7ef5930defe1942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
Date: Fri, 7 Feb 2025 12:53:15 +0100
Subject: [PATCH 590/600] Release to unstable

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0597f2f..d75820b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.26.3-2) unstable; urgency=medium
+
+  * Team upload
+  * Upload to unstable 
+
+ -- Jérémy Lal <kapouer@melix.org>  Fri, 07 Feb 2025 12:53:11 +0100
+
 nginx (1.26.3-1) experimental; urgency=medium
 
   * Team upload

From 3ef9946d9dbc44bd19cd5e193d7cc80072e9acfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 12 Feb 2025 19:36:44 +0100
Subject: [PATCH 591/600] d/changelog: fix whitespace in 1.26.3-2 record

---
 debian/changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d75820b..0870922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
+nginx (1.26.3-3) UNRELEASED; urgency=medium
+
+  * d/changelog: fix whitespace in 1.26.3-2 record
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Wed, 12 Feb 2025 19:37:40 +0100
+
 nginx (1.26.3-2) unstable; urgency=medium
 
   * Team upload
-  * Upload to unstable 
+  * Upload to unstable
 
  -- Jérémy Lal <kapouer@melix.org>  Fri, 07 Feb 2025 12:53:11 +0100
 

From 6c57927b8d95a6c61c855e24b29132567f122ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Wed, 12 Feb 2025 19:43:05 +0100
Subject: [PATCH 592/600] d/control: add libnginx-mod-http-lua dependency for
 nginx-extras package for riscv64 platform

---
 debian/changelog     | 2 ++
 debian/control       | 2 +-
 debian/tests/control | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0870922..0f2ce75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 nginx (1.26.3-3) UNRELEASED; urgency=medium
 
   * d/changelog: fix whitespace in 1.26.3-2 record
+  * d/control: add libnginx-mod-http-lua dependency for nginx-extras package
+    for riscv64 platform
 
  -- Jan Mojžíš <janmojzis@debian.org>  Wed, 12 Feb 2025 19:37:40 +0100
 
diff --git a/debian/control b/debian/control
index 4f36832..47749f4 100644
--- a/debian/control
+++ b/debian/control
@@ -198,7 +198,7 @@ Depends: nginx (= ${binary:Version}),
          libnginx-mod-http-fancyindex,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x riscv64 powerpc],
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
          libnginx-mod-http-upstream-fair,
diff --git a/debian/tests/control b/debian/tests/control
index 880cc6d..b8c6569 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -31,7 +31,7 @@ Depends: nginx-core,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x riscv64 powerpc],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
@@ -62,7 +62,7 @@ Depends: nginx-full,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x riscv64 powerpc],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
@@ -93,7 +93,7 @@ Depends: nginx-light,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x riscv64 powerpc],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,
@@ -124,7 +124,7 @@ Depends: nginx-extras,
          libnginx-mod-http-geoip2,
          libnginx-mod-http-headers-more-filter,
          libnginx-mod-http-image-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x powerpc],
+         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x riscv64 powerpc],
          libnginx-mod-http-perl,
          libnginx-mod-http-subs-filter,
          libnginx-mod-http-uploadprogress,

From 54cc7989701eb5d8ff561c6891f0a819cc54dcae Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Sun, 23 Feb 2025 18:17:04 +0000
Subject: [PATCH 593/600] Fix DebBug #1098477, salsa issue nginx-team/nginx:#23

---
 debian/changelog                  | 7 +++++++
 debian/nginx-common.nginx.service | 1 +
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0f2ce75..c1224e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 nginx (1.26.3-3) UNRELEASED; urgency=medium
 
+  [ Jan Mojžíš ]
   * d/changelog: fix whitespace in 1.26.3-2 record
   * d/control: add libnginx-mod-http-lua dependency for nginx-extras package
     for riscv64 platform
 
+  [ Thomas Ward ]
+  * d/nginx-common.nginx.service: Add ConditionFileIsExecutable to 
+    SystemD service file, prevents starting of service if nginx is
+    not installed (which can happen if nginx-common is installed 
+    independently from `nginx` itself (Closes: #1098477)
+
  -- Jan Mojžíš <janmojzis@debian.org>  Wed, 12 Feb 2025 19:37:40 +0100
 
 nginx (1.26.3-2) unstable; urgency=medium
diff --git a/debian/nginx-common.nginx.service b/debian/nginx-common.nginx.service
index a63fa0f..510c542 100644
--- a/debian/nginx-common.nginx.service
+++ b/debian/nginx-common.nginx.service
@@ -25,6 +25,7 @@ ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload
 ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile /run/nginx.pid
 TimeoutStopSec=5
 KillMode=mixed
+ConditionFileIsExecutable=/usr/sbin/nginx
 
 [Install]
 WantedBy=multi-user.target

From bfbdc5aef2d486391f4ca542c23d6ecf52b34d72 Mon Sep 17 00:00:00 2001
From: Thomas Ward <teward@ubuntu.com>
Date: Mon, 24 Feb 2025 20:42:35 +0000
Subject: [PATCH 594/600] Move ConditionFileIsExecutable to proper section

---
 debian/nginx-common.nginx.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/nginx-common.nginx.service b/debian/nginx-common.nginx.service
index 510c542..cb759f6 100644
--- a/debian/nginx-common.nginx.service
+++ b/debian/nginx-common.nginx.service
@@ -15,6 +15,7 @@ Description=A high performance web server and a reverse proxy server
 Documentation=man:nginx(8)
 After=network-online.target remote-fs.target nss-lookup.target
 Wants=network-online.target
+ConditionFileIsExecutable=/usr/sbin/nginx
 
 [Service]
 Type=forking
@@ -25,7 +26,6 @@ ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload
 ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile /run/nginx.pid
 TimeoutStopSec=5
 KillMode=mixed
-ConditionFileIsExecutable=/usr/sbin/nginx
 
 [Install]
 WantedBy=multi-user.target

From 653827e5a861000e0700f2d837dec6262e2188f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Moj=C5=BE=C3=AD=C5=A1?= <jan.mojzis@gmail.com>
Date: Thu, 15 May 2025 15:32:06 +0200
Subject: [PATCH 595/600] release nginx 1.26.3-3, upload to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1224e3..8ec0edd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nginx (1.26.3-3) UNRELEASED; urgency=medium
+nginx (1.26.3-3) unstable; urgency=medium
 
   [ Jan Mojžíš ]
   * d/changelog: fix whitespace in 1.26.3-2 record
@@ -11,7 +11,7 @@ nginx (1.26.3-3) UNRELEASED; urgency=medium
     not installed (which can happen if nginx-common is installed 
     independently from `nginx` itself (Closes: #1098477)
 
- -- Jan Mojžíš <janmojzis@debian.org>  Wed, 12 Feb 2025 19:37:40 +0100
+ -- Jan Mojžíš <janmojzis@debian.org>  Thu, 15 May 2025 15:31:38 +0200
 
 nginx (1.26.3-2) unstable; urgency=medium
 

From 67b2e7933cd9823cc8a5a1627cc90ecacb1b891d Mon Sep 17 00:00:00 2001
From: wrapper <wrapper@system.system>
Date: Tue, 15 Jul 2025 15:05:37 +0700
Subject: [PATCH 596/600] sid init

---
 .gitignore          |  9 ++++++
 configure.docker.sh | 69 +++++++++++++++++++++++++++++++++++++++++++++
 configure.sh        | 66 +++++++++++++++++++++++++++++++++++++++++++
 modules/PLACEHOLDER |  0
 4 files changed, 144 insertions(+)
 create mode 100644 .gitignore
 create mode 100755 configure.docker.sh
 create mode 100755 configure.sh
 create mode 100644 modules/PLACEHOLDER

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3f04d13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+objs/*
+!objs/ndk_*
+.pc/
+.vscode/
+modules/media-framework/
+modules/nginx-srt-module/
+modules/nginx-vod-module/
+Makefile
+*.orig
\ No newline at end of file
diff --git a/configure.docker.sh b/configure.docker.sh
new file mode 100755
index 0000000..f99417d
--- /dev/null
+++ b/configure.docker.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+./configure \
+    --with-cc-opt="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIC -D_FORTIFY_SOURCE=2 -I/tmp/build/quickjs/" \
+    --with-ld-opt="-Wl,-z,relro -Wl,-z,now -fPIC -L/tmp/build/quickjs/" \
+    --sbin-path=/usr/local/sbin/nginx \
+    --conf-path=/video_server/nginx/nginx.conf \
+    --error-log-path=/var/log/nginx/error.log \
+    --pid-path=/var/run/nginx/nginx.pid \
+    --lock-path=/var/lock/nginx/nginx.lock \
+    --http-log-path=/var/log/nginx/access.log \
+    --http-client-body-temp-path=/tmp/nginx-client-body \
+    --with-compat \
+    --with-debug \
+    --with-pcre-jit \
+    --with-http_ssl_module \
+    --with-http_stub_status_module \
+    --with-http_realip_module \
+    --with-http_auth_request_module \
+    --with-http_v2_module \
+    --with-http_dav_module \
+    --with-http_slice_module \
+    --with-threads \
+    --with-http_addition_module \
+    --with-http_flv_module \
+    --with-http_gunzip_module \
+    --with-http_gzip_static_module \
+    --with-http_mp4_module \
+    --with-http_random_index_module \
+    --with-http_secure_link_module \
+    --with-http_sub_module \
+    --with-mail_ssl_module \
+    --with-stream_ssl_module \
+    --with-stream_ssl_preread_module \
+    --with-stream_realip_module \
+    --with-http_geoip_module=dynamic \
+    --with-http_image_filter_module=dynamic \
+    --with-http_perl_module=dynamic \
+    --with-http_xslt_module=dynamic \
+    --with-mail=dynamic \
+    --with-stream=dynamic \
+    --with-stream_geoip_module=dynamic \
+    --add-module=./modules_deb/libnginx-mod-http-ndk-0.3.2 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-brotli-1.0.0~rc \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.3 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-echo-0.63 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-geoip2-3.4 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.34\
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.19 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-set-misc-0.33 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-srcache-filter-0.33 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-subs-filter-0.6.4 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.6+dfsg \
+    --add-dynamic-module=./modules/njs/nginx \
+    --add-module=./modules/media-framework/nginx-common \
+    --add-dynamic-module=./modules/nginx-stream-preread-str-module \
+    --add-dynamic-module=./modules/media-framework/nginx-kmp-in-module \
+    --add-dynamic-module=./modules/media-framework/nginx-kmp-out-module \
+    --add-dynamic-module=./modules/media-framework/nginx-rtmp-module \
+    --add-dynamic-module=./modules/media-framework/nginx-rtmp-kmp-module \
+    --add-dynamic-module=./modules/media-framework/nginx-mpegts-module \
+    --add-dynamic-module=./modules/media-framework/nginx-mpegts-kmp-module \
+    --add-dynamic-module=./modules/media-framework/nginx-kmp-cc-module \
+    --add-dynamic-module=./modules/media-framework/nginx-kmp-rtmp-module \
+    --add-dynamic-module=./modules/media-framework/nginx-live-module \
+    --add-dynamic-module=./modules/nginx-srt-module \
+    --add-dynamic-module=./modules/media-framework/nginx-pckg-module \
+    --add-dynamic-module=./modules/nginx-vod-module \
+    --add-dynamic-module=./modules/nginx-secure-token-module
\ No newline at end of file
diff --git a/configure.sh b/configure.sh
new file mode 100755
index 0000000..6d76886
--- /dev/null
+++ b/configure.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+./configure \
+    --with-cc-opt="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIC -D_FORTIFY_SOURCE=2 -I/usr/local/include/quickjs/" \
+    --with-ld-opt="-Wl,-z,relro -Wl,-z,now -fPIC -L/usr/local/lib/quickjs/" \
+    --prefix=/usr/local/temp/nginx/ \
+    --error-log-path=stderr \
+    --lock-path=/var/lock/nginx.lock \
+    --pid-path=/run/nginx.pid \
+    --with-compat \
+    --with-debug \
+    --with-pcre-jit \
+    --with-http_ssl_module \
+    --with-http_stub_status_module \
+    --with-http_realip_module \
+    --with-http_auth_request_module \
+    --with-http_v2_module \
+    --with-http_dav_module \
+    --with-http_slice_module \
+    --with-threads \
+    --with-http_addition_module \
+    --with-http_flv_module \
+    --with-http_gunzip_module \
+    --with-http_gzip_static_module \
+    --with-http_mp4_module \
+    --with-http_random_index_module \
+    --with-http_secure_link_module \
+    --with-http_sub_module \
+    --with-mail_ssl_module \
+    --with-stream_ssl_module \
+    --with-stream_ssl_preread_module \
+    --with-stream_realip_module \
+    --with-http_geoip_module=dynamic \
+    --with-http_image_filter_module=dynamic \
+    --with-http_perl_module=dynamic \
+    --with-http_xslt_module=dynamic \
+    --with-mail=dynamic \
+    --with-stream=dynamic \
+    --with-stream_geoip_module=dynamic \
+    --add-module=./modules_deb/libnginx-mod-http-ndk-0.3.2 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-brotli-1.0.0~rc \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.3 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-echo-0.63 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-geoip2-3.4 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.34\
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.19 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-set-misc-0.33 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-srcache-filter-0.33 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-subs-filter-0.6.4 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.6+dfsg \
+    --add-dynamic-module=./modules/njs/nginx \
+    --add-module=./modules/media-framework/nginx-common \
+    --add-dynamic-module=./modules/nginx-stream-preread-str-module \
+    --add-dynamic-module=./modules/media-framework/nginx-kmp-in-module \
+    --add-dynamic-module=./modules/media-framework/nginx-kmp-out-module \
+    --add-dynamic-module=./modules/media-framework/nginx-rtmp-module \
+    --add-dynamic-module=./modules/media-framework/nginx-rtmp-kmp-module \
+    --add-dynamic-module=./modules/media-framework/nginx-mpegts-module \
+    --add-dynamic-module=./modules/media-framework/nginx-mpegts-kmp-module \
+    --add-dynamic-module=./modules/media-framework/nginx-kmp-cc-module \
+    --add-dynamic-module=./modules/media-framework/nginx-kmp-rtmp-module \
+    --add-dynamic-module=./modules/media-framework/nginx-live-module \
+    --add-dynamic-module=./modules/nginx-srt-module \
+    --add-dynamic-module=./modules/media-framework/nginx-pckg-module \
+    --add-dynamic-module=./modules/nginx-vod-module \
+    --add-dynamic-module=./modules/nginx-secure-token-module
\ No newline at end of file
diff --git a/modules/PLACEHOLDER b/modules/PLACEHOLDER
new file mode 100644
index 0000000..e69de29

From bf4e347d840944f38946e4c7a8b83f62f76ea4e9 Mon Sep 17 00:00:00 2001
From: wrapper <wrapper@system.system>
Date: Tue, 15 Jul 2025 15:11:13 +0700
Subject: [PATCH 597/600] sid 2

---
 .../.gitmodules                               |    3 +
 .../.travis.yml                               |   46 +
 .../CONTRIBUTING.md                           |   27 +
 .../libnginx-mod-http-brotli-1.0.0~rc/LICENSE |   27 +
 .../README.md                                 |  177 +
 .../libnginx-mod-http-brotli-1.0.0~rc/config  |   34 +
 .../debian/changelog                          |   49 +
 .../debian/control                            |   41 +
 .../debian/copyright                          |   72 +
 .../debian/gbp.conf                           |    9 +
 .../libnginx-mod-http-brotli-filter.install   |    1 +
 .../libnginx-mod-http-brotli-static.install   |    1 +
 .../debian/patches/0001-Fix-Vary-header.patch |   38 +
 .../debian/patches/series                     |    1 +
 .../debian/rules                              |    6 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |   22 +
 .../debian/tests/filter                       |   44 +
 .../debian/tests/generic                      |   73 +
 .../debian/tests/static                       |   36 +
 .../debian/upstream/metadata                  |    4 +
 .../debian/watch                              |    6 +
 .../filter/config                             |  132 +
 .../filter/ngx_http_brotli_filter_module.c    |  770 +++
 .../script/.travis-before-test.sh             |   24 +
 .../script/.travis-compile.sh                 |   29 +
 .../script/.travis-test.sh                    |  168 +
 .../script/test.conf                          |   32 +
 .../script/test_h2.conf                       |   32 +
 .../static/config                             |   54 +
 .../static/ngx_http_brotli_static_module.c    |  323 +
 .../.astylerc                                 |   22 +
 .../.format.sh                                |   14 +
 .../.gitattributes                            |    1 +
 .../.travis.yml                               |   49 +
 .../CHANGES                                   |  103 +
 .../LICENSE                                   |   26 +
 .../README.md                                 |  283 +
 .../config                                    |   31 +
 .../debian/changelog                          |   74 +
 .../debian/control                            |   23 +
 .../debian/copyright                          |   36 +
 .../debian/gbp.conf                           |   12 +
 .../debian/rules                              |    6 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |   13 +
 .../debian/tests/generic                      |   73 +
 .../debian/tests/purgetest                    |   34 +
 .../debian/upstream/metadata                  |    4 +
 .../debian/watch                              |    6 +
 .../ngx_cache_purge_module.c                  | 2163 +++++++
 .../t/proxy1.t                                |  136 +
 .../t/proxy1_vars.t                           |  138 +
 .../t/proxy2.t                                |  349 ++
 .../t/proxy2_vars.t                           |  353 ++
 .../t/proxy3.t                                |  140 +
 .../t/proxy4.t                                |  168 +
 .../t/resptype1.t                             |  245 +
 .../.gitattributes                            |    1 +
 .../libnginx-mod-http-echo-0.63/.gitignore    |   65 +
 .../libnginx-mod-http-echo-0.63/.travis.yml   |   48 +
 .../libnginx-mod-http-echo-0.63/LICENSE       |   25 +
 .../README.markdown                           | 1851 ++++++
 .../libnginx-mod-http-echo-0.63/config        |   63 +
 .../debian/changelog                          |   53 +
 .../debian/control                            |   36 +
 .../debian/copyright                          |   71 +
 .../debian/fix.scanned.copyright              |    2 +
 .../debian/gbp.conf                           |    9 +
 .../libnginx-mod-http-echo-0.63/debian/rules  |    6 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |   13 +
 .../debian/tests/generic                      |   73 +
 .../debian/tests/helloworld                   |   32 +
 .../debian/upstream/metadata                  |    4 +
 .../libnginx-mod-http-echo-0.63/debian/watch  |    6 +
 .../libnginx-mod-http-echo-0.63/src/ddebug.h  |  114 +
 .../src/ngx_http_echo_echo.c                  |  342 ++
 .../src/ngx_http_echo_echo.h                  |   25 +
 .../src/ngx_http_echo_filter.c                |  282 +
 .../src/ngx_http_echo_filter.h                |   15 +
 .../src/ngx_http_echo_foreach.c               |  183 +
 .../src/ngx_http_echo_foreach.h               |   16 +
 .../src/ngx_http_echo_handler.c               |  433 ++
 .../src/ngx_http_echo_handler.h               |   18 +
 .../src/ngx_http_echo_location.c              |  182 +
 .../src/ngx_http_echo_location.h              |   13 +
 .../src/ngx_http_echo_module.c                |  682 +++
 .../src/ngx_http_echo_module.h                |  151 +
 .../src/ngx_http_echo_request_info.c          |  522 ++
 .../src/ngx_http_echo_request_info.h          |   36 +
 .../src/ngx_http_echo_sleep.c                 |  208 +
 .../src/ngx_http_echo_sleep.h                 |   16 +
 .../src/ngx_http_echo_subrequest.c            |  791 +++
 .../src/ngx_http_echo_subrequest.h            |   19 +
 .../src/ngx_http_echo_timer.c                 |   95 +
 .../src/ngx_http_echo_timer.h                 |   13 +
 .../src/ngx_http_echo_util.c                  |  302 +
 .../src/ngx_http_echo_util.h                  |   58 +
 .../src/ngx_http_echo_var.c                   |  110 +
 .../src/ngx_http_echo_var.h                   |    9 +
 .../t/abort-parent.t                          |   63 +
 .../t/blocking-sleep.t                        |  156 +
 .../t/echo-after-body.t                       |  261 +
 .../t/echo-before-body.t                      |  278 +
 .../t/echo-duplicate.t                        |   89 +
 .../t/echo-timer.t                            |  107 +
 .../libnginx-mod-http-echo-0.63/t/echo.t      |  416 ++
 .../libnginx-mod-http-echo-0.63/t/exec.t      |  228 +
 .../t/filter-used.t                           |   59 +
 .../t/foreach-split.t                         |  283 +
 .../libnginx-mod-http-echo-0.63/t/gzip.t      |   31 +
 .../libnginx-mod-http-echo-0.63/t/if.t        |  150 +
 .../libnginx-mod-http-echo-0.63/t/incr.t      |   32 +
 .../t/location-async.t                        |  439 ++
 .../libnginx-mod-http-echo-0.63/t/location.t  |  567 ++
 .../libnginx-mod-http-echo-0.63/t/mixed.t     |   82 +
 .../t/request-body.t                          |   58 +
 .../t/request-info.t                          |  870 +++
 .../libnginx-mod-http-echo-0.63/t/sleep.t     |  200 +
 .../libnginx-mod-http-echo-0.63/t/status.t    |  142 +
 .../t/subrequest-async.t                      |  604 ++
 .../t/subrequest.t                            |  725 +++
 .../libnginx-mod-http-echo-0.63/t/unused.t    |  119 +
 .../libnginx-mod-http-echo-0.63/util/build.sh |   44 +
 .../util/wiki2pod.pl                          |  131 +
 .../valgrind.suppress                         |   53 +
 .../libnginx-mod-http-geoip2-3.4/LICENSE      |   23 +
 .../libnginx-mod-http-geoip2-3.4/README.md    |  153 +
 .../libnginx-mod-http-geoip2-3.4/config       |   43 +
 .../debian/changelog                          |   52 +
 .../debian/control                            |   41 +
 .../debian/copyright                          |   46 +
 .../debian/gbp.conf                           |    9 +
 .../debian/libnginx-mod-http-geoip2.install   |    1 +
 .../debian/libnginx-mod-stream-geoip2.install |    1 +
 .../libnginx-mod-http-geoip2-3.4/debian/rules |    6 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |    6 +
 .../debian/tests/generic                      |   73 +
 .../debian/upstream/metadata                  |    4 +
 .../libnginx-mod-http-geoip2-3.4/debian/watch |    6 +
 .../ngx_http_geoip2_module.c                  |  803 +++
 .../ngx_stream_geoip2_module.c                |  694 +++
 .../.gitattributes                            |    1 +
 .../.gitignore                                |   54 +
 .../.travis.yml                               |   58 +
 .../LICENSE                                   |   20 +
 .../README.markdown                           |  538 ++
 .../config                                    |   32 +
 .../debian/changelog                          |   72 +
 .../debian/control                            |   26 +
 .../debian/copyright                          |   62 +
 .../debian/gbp.conf                           |   12 +
 .../debian/rules                              |    6 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |   13 +
 .../debian/tests/generic                      |   73 +
 .../debian/tests/helloworld                   |   34 +
 .../debian/upstream/metadata                  |    4 +
 .../debian/watch                              |    6 +
 .../src/ddebug.h                              |  124 +
 .../src/ngx_http_headers_more_filter_module.c |  348 ++
 .../src/ngx_http_headers_more_filter_module.h |   81 +
 .../src/ngx_http_headers_more_headers_in.c    |  959 +++
 .../src/ngx_http_headers_more_headers_in.h    |   26 +
 .../src/ngx_http_headers_more_headers_out.c   |  814 +++
 .../src/ngx_http_headers_more_headers_out.h   |   26 +
 .../src/ngx_http_headers_more_util.c          |  382 ++
 .../src/ngx_http_headers_more_util.h          |   52 +
 .../t/bug.t                                   |  416 ++
 .../t/builtin.t                               |  338 +
 .../t/eval.t                                  |   36 +
 .../t/input-conn.t                            |  137 +
 .../t/input-cookie.t                          |  183 +
 .../t/input-ua.t                              |  628 ++
 .../t/input.t                                 | 1331 ++++
 .../t/phase.t                                 |   25 +
 .../t/sanity.t                                |  628 ++
 .../t/subrequest.t                            |   68 +
 .../t/unused.t                                |  174 +
 .../t/vars.t                                  |   58 +
 .../util/build.sh                             |   38 +
 .../valgrind.suppress                         |  135 +
 .../libnginx-mod-http-ndk-0.3.4/.gitignore    |    4 +
 .../libnginx-mod-http-ndk-0.3.4/LICENSE       |   13 +
 .../libnginx-mod-http-ndk-0.3.4/README.md     |  254 +
 .../README_AUTO_LIB.md                        |  394 ++
 .../auto/actions/array                        |   10 +
 .../auto/actions/palloc                       |    8 +
 .../libnginx-mod-http-ndk-0.3.4/auto/build    |  597 ++
 .../auto/data/action_replacements             |    5 +
 .../auto/data/action_types                    |   12 +
 .../auto/data/conf_args                       |   22 +
 .../auto/data/conf_locs                       |   25 +
 .../auto/data/conf_macros                     |   35 +
 .../auto/data/contexts                        |   22 +
 .../auto/data/header_files                    |    3 +
 .../auto/data/headers                         |    4 +
 .../auto/data/module_dependencies             |    5 +
 .../auto/data/modules_optional                |   15 +
 .../auto/data/prefixes                        |    2 +
 .../auto/src/array.h                          |    7 +
 .../auto/src/conf_cmd_basic.h                 |   43 +
 .../auto/src/conf_merge.h                     |   78 +
 .../auto/src/palloc.h                         |    6 +
 .../auto/text/autogen                         |   12 +
 .../libnginx-mod-http-ndk-0.3.4/config        |   65 +
 .../debian/changelog                          |   58 +
 .../debian/control                            |   47 +
 .../debian/copyright                          |  155 +
 .../debian/copyright-scan-patterns.yml        |    4 +
 .../debian/fix.scanned.copyright              |    1 +
 .../debian/gbp.conf                           |   12 +
 .../debian/libnginx-mod-http-ndk-dev.install  |    5 +
 .../debian/libnginx-mod-http-ndk.install      |    1 +
 .../debian/libnginx-mod-http-ndk.nginx        |    1 +
 .../debian/mod-http-ndk.conf                  |    1 +
 .../libnginx-mod-http-ndk-0.3.4/debian/rules  |   35 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |    6 +
 .../debian/tests/generic                      |   73 +
 .../debian/upstream/metadata                  |    4 +
 .../libnginx-mod-http-ndk-0.3.4/debian/watch  |    6 +
 .../docs/core/action_macros                   |   63 +
 .../docs/core/conf_cmds                       |   62 +
 .../docs/modules/set_var                      |  124 +
 .../docs/patches/more_logging_info            |   48 +
 .../docs/upstream/list                        |   45 +
 .../examples/README                           |   12 +
 .../examples/http/set_var/config              |    4 +
 .../ngx_http_set_var_examples_module.c        |  136 +
 .../ngx_auto_lib_core                         |  797 +++
 .../libnginx-mod-http-ndk-0.3.4/notes/CHANGES |   17 +
 .../libnginx-mod-http-ndk-0.3.4/notes/LICENSE |   24 +
 .../objs/ndk_array.h                          |  113 +
 .../objs/ndk_conf_cmd_basic.h                 | 2203 +++++++
 .../objs/ndk_conf_cmd_extra.h                 | 5423 +++++++++++++++++
 .../objs/ndk_conf_merge.h                     |  227 +
 .../objs/ndk_config.c                         |   72 +
 .../objs/ndk_config.h                         |   98 +
 .../objs/ndk_includes.h                       |   66 +
 .../objs/ndk_palloc.h                         |  112 +
 .../patches/auto_config                       |   16 +
 .../patches/expose_rewrite_functions          |  291 +
 .../patches/rewrite_phase_handler             |   19 +
 .../src/hash/md5.h                            |  117 +
 .../src/hash/murmurhash2.c                    |   77 +
 .../src/hash/sha.h                            |  200 +
 .../libnginx-mod-http-ndk-0.3.4/src/ndk.c     |  155 +
 .../libnginx-mod-http-ndk-0.3.4/src/ndk.h     |   53 +
 .../libnginx-mod-http-ndk-0.3.4/src/ndk_buf.c |   43 +
 .../libnginx-mod-http-ndk-0.3.4/src/ndk_buf.h |    5 +
 .../src/ndk_complex_path.c                    |  129 +
 .../src/ndk_complex_path.h                    |   30 +
 .../src/ndk_complex_value.c                   |  192 +
 .../src/ndk_complex_value.h                   |   21 +
 .../src/ndk_conf_file.c                       |  396 ++
 .../src/ndk_conf_file.h                       |   44 +
 .../src/ndk_debug.c                           |   72 +
 .../src/ndk_debug.h                           |  171 +
 .../src/ndk_encoding.c                        |   57 +
 .../src/ndk_encoding.h                        |   12 +
 .../src/ndk_hash.c                            |   82 +
 .../src/ndk_hash.h                            |   45 +
 .../src/ndk_http.c                            |  138 +
 .../src/ndk_http.h                            |    3 +
 .../src/ndk_http_headers.h                    |   35 +
 .../libnginx-mod-http-ndk-0.3.4/src/ndk_log.c |    3 +
 .../libnginx-mod-http-ndk-0.3.4/src/ndk_log.h |  165 +
 .../src/ndk_parse.h                           |   67 +
 .../src/ndk_path.c                            |  583 ++
 .../src/ndk_path.h                            |   22 +
 .../src/ndk_process.c                         |   20 +
 .../src/ndk_process.h                         |   12 +
 .../src/ndk_regex.c                           |  215 +
 .../src/ndk_regex.h                           |    7 +
 .../src/ndk_rewrite.c                         |  103 +
 .../src/ndk_rewrite.h                         |   26 +
 .../src/ndk_set_var.c                         |  602 ++
 .../src/ndk_set_var.h                         |   44 +
 .../src/ndk_string.c                          |  434 ++
 .../src/ndk_string.h                          |   37 +
 .../src/ndk_string_util.h                     |   14 +
 .../src/ndk_upstream_list.c                   |  205 +
 .../src/ndk_upstream_list.h                   |   27 +
 .../libnginx-mod-http-ndk-0.3.4/src/ndk_uri.c |   45 +
 .../libnginx-mod-http-ndk-0.3.4/src/ndk_uri.h |    6 +
 .../.gitattributes                            |    1 +
 .../.gitignore                                |   72 +
 .../.travis.yml                               |   54 +
 .../README.markdown                           | 1451 +++++
 .../libnginx-mod-http-set-misc-0.33/config    |   79 +
 .../debian/changelog                          |   53 +
 .../debian/control                            |   27 +
 .../debian/copyright                          |   49 +
 .../debian/copyright-scan-patterns.yml        |    4 +
 .../debian/fix.scanned.copyright              |    2 +
 .../debian/gbp.conf                           |    9 +
 .../debian/rules                              |    6 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |   13 +
 .../debian/tests/generic                      |   73 +
 .../debian/tests/setifempty                   |   36 +
 .../debian/upstream/metadata                  |    4 +
 .../debian/watch                              |    6 +
 .../src/ddebug.h                              |   74 +
 .../src/ngx_http_set_base32.c                 |  263 +
 .../src/ngx_http_set_base32.h                 |   18 +
 .../src/ngx_http_set_base64.c                 |   48 +
 .../src/ngx_http_set_base64.h                 |   10 +
 .../src/ngx_http_set_base64url.c              |   50 +
 .../src/ngx_http_set_base64url.h              |   10 +
 .../src/ngx_http_set_default_value.c          |   48 +
 .../src/ngx_http_set_default_value.h          |   15 +
 .../src/ngx_http_set_escape_uri.c             |  210 +
 .../src/ngx_http_set_escape_uri.h             |   10 +
 .../src/ngx_http_set_hash.c                   |   83 +
 .../src/ngx_http_set_hash.h                   |   15 +
 .../src/ngx_http_set_hashed_upstream.c        |  141 +
 .../src/ngx_http_set_hashed_upstream.h        |   27 +
 .../src/ngx_http_set_hex.c                    |   62 +
 .../src/ngx_http_set_hex.h                    |    9 +
 .../src/ngx_http_set_hmac.c                   |   62 +
 .../src/ngx_http_set_hmac.h                   |    9 +
 .../src/ngx_http_set_local_today.c            |  110 +
 .../src/ngx_http_set_local_today.h            |   13 +
 .../src/ngx_http_set_misc_module.c            |  586 ++
 .../src/ngx_http_set_misc_module.h            |   30 +
 .../src/ngx_http_set_quote_json.c             |  165 +
 .../src/ngx_http_set_quote_json.h             |   16 +
 .../src/ngx_http_set_quote_sql.c              |  382 ++
 .../src/ngx_http_set_quote_sql.h              |   21 +
 .../src/ngx_http_set_random.c                 |   57 +
 .../src/ngx_http_set_random.h                 |   12 +
 .../src/ngx_http_set_rotate.c                 |  113 +
 .../src/ngx_http_set_rotate.h                 |   18 +
 .../src/ngx_http_set_secure_random.c          |  104 +
 .../src/ngx_http_set_secure_random.h          |   15 +
 .../src/ngx_http_set_unescape_uri.c           |  184 +
 .../src/ngx_http_set_unescape_uri.h           |   16 +
 .../t/base32.t                                |  556 ++
 .../t/base32_no_padding.t                     |  531 ++
 .../t/base64.t                                |   40 +
 .../t/base64url.t                             |   40 +
 .../t/default-value.t                         |   88 +
 .../t/escape-uri.t                            |  139 +
 .../t/formatted-time.t                        |   84 +
 .../libnginx-mod-http-set-misc-0.33/t/hash.t  |   94 +
 .../t/hashed-upstream.t                       |   70 +
 .../libnginx-mod-http-set-misc-0.33/t/hex.t   |   57 +
 .../libnginx-mod-http-set-misc-0.33/t/hmac.t  |   78 +
 .../t/local-today.t                           |   29 +
 .../t/quote-json.t                            |   69 +
 .../t/quote-sql.t                             |  195 +
 .../libnginx-mod-http-set-misc-0.33/t/rand.t  |  168 +
 .../t/rotate.t                                |  270 +
 .../t/secure-random.t                         |  107 +
 .../t/unescape-uri.t                          |   58 +
 .../util/build.sh                             |   35 +
 .../valgrind.suppress                         |  105 +
 .../.gitattributes                            |    1 +
 .../.gitignore                                |   79 +
 .../.travis.yml                               |   87 +
 .../Changes                                   |   16 +
 .../README.markdown                           | 1258 ++++
 .../config                                    |   50 +
 .../debian/changelog                          |   60 +
 .../debian/control                            |   24 +
 .../debian/copyright                          |   56 +
 .../debian/fix.scanned.copyright              |    2 +
 .../debian/gbp.conf                           |    9 +
 .../debian/rules                              |    6 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |    6 +
 .../debian/tests/generic                      |   73 +
 .../debian/upstream/metadata                  |    4 +
 .../debian/watch                              |    9 +
 .../src/ddebug.h                              |  124 +
 .../src/ngx_http_srcache_fetch.c              |  470 ++
 .../src/ngx_http_srcache_fetch.h              |   22 +
 .../src/ngx_http_srcache_filter_module.c      |  623 ++
 .../src/ngx_http_srcache_filter_module.h      |  152 +
 .../src/ngx_http_srcache_headers.c            |  359 ++
 .../src/ngx_http_srcache_headers.h            |   30 +
 .../src/ngx_http_srcache_store.c              |  675 ++
 .../src/ngx_http_srcache_store.h              |   23 +
 .../src/ngx_http_srcache_util.c               | 1296 ++++
 .../src/ngx_http_srcache_util.h               |   61 +
 .../src/ngx_http_srcache_var.c                |  180 +
 .../src/ngx_http_srcache_var.h                |   19 +
 .../t/000_init.t                              |  158 +
 .../t/access.t                                |   84 +
 .../t/bugs.t                                  |  668 ++
 .../t/conditional-get.t                       |  302 +
 .../t/content-length.t                        |   96 +
 .../t/content-type.t                          |   90 +
 .../t/disk.t                                  |   68 +
 .../t/drizzle-main.t                          |  105 +
 .../t/drizzle-sub.t                           |  113 +
 .../t/empty-resp.t                            |   88 +
 .../t/err-page.t                              |   82 +
 .../t/etag.t                                  |  186 +
 .../t/eval.t                                  |   96 +
 .../t/expire-var.t                            |  592 ++
 .../t/expires.t                               |  377 ++
 .../t/fetch-header.t                          |  232 +
 .../t/fetch-skip.t                            |  528 ++
 .../t/gzip.t                                  |  160 +
 .../t/header-buf-size.t                       |  145 +
 .../t/main-req.t                              |  146 +
 .../t/max-age.t                               |  305 +
 .../t/methods.t                               |  389 ++
 .../t/no-cache.t                              |  309 +
 .../t/no-store.t                              |  305 +
 .../t/postgres-main.t                         |  138 +
 .../t/private.t                               |  528 ++
 .../t/proxy.t                                 |   65 +
 .../t/ranges.t                                |  410 ++
 .../t/redis.t                                 |  246 +
 .../t/req-cache-control.t                     |  394 ++
 .../t/satisfy.t                               |  118 +
 .../t/static.t                                |  162 +
 .../t/status.t                                |  723 +++
 .../t/store-hide-headers.t                    |  389 ++
 .../t/store-max-size.t                        |  356 ++
 .../t/store-pass-headers.t                    |  173 +
 .../t/store-skip.t                            |  434 ++
 .../t/sub-req.t                               |  448 ++
 .../t/timeout.t                               |  119 +
 .../t/unused.t                                |  113 +
 .../util/build.sh                             |   75 +
 .../valgrind.suppress                         |   93 +
 .../CHANGES                                   |   37 +
 .../README                                    |  141 +
 .../config                                    |   15 +
 .../debian/changelog                          |   52 +
 .../debian/control                            |   24 +
 .../debian/copyright                          |  116 +
 .../debian/gbp.conf                           |    9 +
 ...Feature-nginx-dynamic-module-support.patch |   36 +
 ...ntent-encoding-header-more-carefully.patch |   29 +
 .../patches/0003-PCRE2-support-added.patch    |   30 +
 .../debian/patches/series                     |    3 +
 .../debian/rules                              |    6 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |    6 +
 .../debian/tests/generic                      |   73 +
 .../debian/upstream/metadata                  |    4 +
 .../debian/watch                              |    6 +
 .../doc/README.google_code_home_page.wiki     |  120 +
 .../doc/README.html                           |  199 +
 .../doc/README.wiki                           |  123 +
 .../ngx_http_subs_filter_module.c             | 1302 ++++
 .../test/README                               |  275 +
 .../test/inc/Module/AutoInstall.pm            |  820 +++
 .../test/inc/Module/Install.pm                |  470 ++
 .../test/inc/Module/Install/AutoInstall.pm    |   82 +
 .../test/inc/Module/Install/Base.pm           |   83 +
 .../test/inc/Module/Install/Can.pm            |   81 +
 .../test/inc/Module/Install/Fetch.pm          |   93 +
 .../test/inc/Module/Install/Include.pm        |   34 +
 .../test/inc/Module/Install/Makefile.pm       |  415 ++
 .../test/inc/Module/Install/Metadata.pm       |  716 +++
 .../test/inc/Module/Install/TestBase.pm       |   29 +
 .../test/inc/Module/Install/Win32.pm          |   64 +
 .../test/inc/Module/Install/WriteAll.pm       |   63 +
 .../test/inc/Spiffy.pm                        |  539 ++
 .../test/inc/Test/Base.pm                     |  682 +++
 .../test/inc/Test/Base/Filter.pm              |  341 ++
 .../test/inc/Test/Builder.pm                  | 1413 +++++
 .../test/inc/Test/Builder/Module.pm           |   81 +
 .../test/inc/Test/More.pm                     |  735 +++
 .../test/lib/Test/Nginx.pm                    |  315 +
 .../test/lib/Test/Nginx/LWP.pm                |  524 ++
 .../test/lib/Test/Nginx/Socket.pm             | 1749 ++++++
 .../test/lib/Test/Nginx/Util.pm               |  874 +++
 .../test/t/subs.t                             |  136 +
 .../test/t/subs_capture.t                     |   32 +
 .../test/t/subs_fix_string.t                  |   32 +
 .../test/t/subs_regex.t                       |  108 +
 .../test/t/subs_types.t                       |   59 +
 .../test/test.sh                              |    5 +
 .../util/update-readme.sh                     |    7 +
 .../util/wiki2google_code_homepage.pl         |   29 +
 .../util/wiki2pod.pl                          |  129 +
 .../.gdbinit                                  |   39 +
 .../README                                    |   53 +
 .../config                                    |   12 +
 .../debian/changelog                          |   44 +
 .../debian/control                            |   23 +
 .../debian/copyright                          |   39 +
 .../debian/gbp.conf                           |    9 +
 .../debian/patches/drop-default-port.patch    |   37 +
 .../debian/patches/dynamic-module.patch       |   29 +
 .../debian/patches/openssl-1.1.0.patch        |   50 +
 .../debian/patches/series                     |    3 +
 .../debian/rules                              |    6 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |    6 +
 .../debian/tests/generic                      |   73 +
 .../debian/upstream/metadata                  |    4 +
 .../debian/watch                              |    7 +
 .../ngx_http_upstream_fair_module.c           | 1354 ++++
 .../libnginx-mod-nchan-1.3.7+dfsg/LICENCE     |   24 +
 .../libnginx-mod-nchan-1.3.7+dfsg/README.md   | 1745 ++++++
 .../changelog.txt                             |  595 ++
 .../cloc-exclude.txt                          |   16 +
 .../libnginx-mod-nchan-1.3.7+dfsg/config      |  170 +
 .../debian/changelog                          |   81 +
 .../debian/control                            |   32 +
 .../debian/copyright                          |  246 +
 .../debian/fix.scanned.copyright              |    3 +
 .../debian/gbp.conf                           |   12 +
 .../debian/rules                              |    6 +
 .../debian/source/format                      |    1 +
 .../debian/source/options                     |    1 +
 .../debian/tests/control                      |    9 +
 .../debian/tests/generic                      |   73 +
 .../debian/upstream/metadata                  |    4 +
 .../debian/watch                              |    9 +
 .../src/.gitignore                            |    2 +
 .../src/nchan_commands.rb                     | 1188 ++++
 .../src/nchan_config_commands.c               | 1046 ++++
 .../src/nchan_defs.c                          |   97 +
 .../src/nchan_defs.h                          |  150 +
 .../src/nchan_module.c                        | 1336 ++++
 .../src/nchan_module.h                        |   73 +
 .../src/nchan_setup.c                         | 1747 ++++++
 .../src/nchan_types.h                         |  542 ++
 .../src/nchan_variables.c                     |  319 +
 .../src/nchan_variables.h                     |    1 +
 .../src/nchan_version.h                       |    1 +
 .../src/nchan_websocket_publisher.c           |   82 +
 .../src/nchan_websocket_publisher.h           |    2 +
 .../src/store/memory/groups.c                 |  570 ++
 .../src/store/memory/groups.h                 |   55 +
 .../src/store/memory/ipc-handlers.c           | 1213 ++++
 .../src/store/memory/ipc-handlers.h           |   28 +
 .../src/store/memory/ipc.c                    |  558 ++
 .../src/store/memory/ipc.h                    |   66 +
 .../src/store/memory/memstore.c               | 3498 +++++++++++
 .../src/store/memory/recycloc.c               |   47 +
 .../src/store/memory/store-private.h          |  180 +
 .../src/store/memory/store.h                  |   13 +
 .../src/store/ngx_rwlock.c                    |  178 +
 .../src/store/ngx_rwlock.h                    |    5 +
 .../src/store/redis/cmp.c                     | 3352 ++++++++++
 .../src/store/redis/cmp.h                     |  526 ++
 .../src/store/redis/hiredis/.gitignore        |    9 +
 .../src/store/redis/hiredis/.travis.yml       |  131 +
 .../src/store/redis/hiredis/CHANGELOG.md      |  364 ++
 .../src/store/redis/hiredis/COPYING           |   29 +
 .../src/store/redis/hiredis/README.md         |  664 ++
 .../src/store/redis/hiredis/alloc.c           |   86 +
 .../src/store/redis/hiredis/alloc.h           |   91 +
 .../src/store/redis/hiredis/async.c           |  890 +++
 .../src/store/redis/hiredis/async.h           |  147 +
 .../src/store/redis/hiredis/async_private.h   |   75 +
 .../src/store/redis/hiredis/dict.c            |  357 ++
 .../src/store/redis/hiredis/dict.h            |  126 +
 .../src/store/redis/hiredis/fmacros.h         |   12 +
 .../src/store/redis/hiredis/hiredis.c         | 1174 ++++
 .../src/store/redis/hiredis/hiredis.h         |  339 ++
 .../src/store/redis/hiredis/hiredis_ssl.h     |  127 +
 .../src/store/redis/hiredis/net.c             |  615 ++
 .../src/store/redis/hiredis/net.h             |   56 +
 .../src/store/redis/hiredis/read.c            |  739 +++
 .../src/store/redis/hiredis/read.h            |  129 +
 .../src/store/redis/hiredis/sds.c             | 1294 ++++
 .../src/store/redis/hiredis/sds.h             |  278 +
 .../src/store/redis/hiredis/sdsalloc.h        |   44 +
 .../src/store/redis/hiredis/sockcompat.c      |  248 +
 .../src/store/redis/hiredis/sockcompat.h      |   92 +
 .../src/store/redis/hiredis/ssl.c             |  526 ++
 .../src/store/redis/hiredis/test.c            | 1387 +++++
 .../src/store/redis/hiredis/win32.h           |   56 +
 .../src/store/redis/rdsstore.c                | 2721 +++++++++
 .../store/redis/redis-lua-scripts/.gitignore  |    1 +
 .../src/store/redis/redis-lua-scripts/Gemfile |   11 +
 .../redis/redis-lua-scripts/add_fakesub.lua   |   52 +
 .../redis-lua-scripts/channel_keepalive.lua   |   45 +
 .../store/redis/redis-lua-scripts/delete.lua  |   91 +
 .../redis/redis-lua-scripts/find_channel.lua  |   92 +
 .../redis/redis-lua-scripts/get_message.lua   |  155 +
 .../get_message_from_key.lua                  |    8 +
 .../get_subscriber_info_id.lua                |   18 +
 ...nostore_publish_multiexec_channel_info.lua |   56 +
 .../store/redis/redis-lua-scripts/publish.lua |  296 +
 .../request_subscriber_info.lua               |   15 +
 .../store/redis/redis-lua-scripts/rsck.lua    |  216 +
 .../redis-lua-scripts/subscriber_register.lua |   61 +
 .../subscriber_unregister.lua                 |   50 +
 .../redis/redis-lua-scripts/testscripts.rb    |  269 +
 .../src/store/redis/redis_lua_commands.c      | 1185 ++++
 .../src/store/redis/redis_lua_commands.h      |   83 +
 .../src/store/redis/redis_nginx_adapter.c     |  165 +
 .../src/store/redis/redis_nginx_adapter.h     |   22 +
 .../src/store/redis/redis_nodeset.c           | 3824 ++++++++++++
 .../src/store/redis/redis_nodeset.h           |  469 ++
 .../src/store/redis/redis_nodeset_parser.c    |  248 +
 .../src/store/redis/redis_nodeset_parser.h    |   40 +
 .../src/store/redis/redis_nodeset_stats.c     |  578 ++
 .../src/store/redis/store-private.h           |  114 +
 .../src/store/redis/store.h                   |   26 +
 .../src/store/spool.c                         | 1293 ++++
 .../src/store/spool.h                         |  117 +
 .../src/store/store_common.c                  |    8 +
 .../src/store/store_common.h                  |   12 +
 .../src/subscribers/benchmark.c               |   72 +
 .../src/subscribers/benchmark.h               |    3 +
 .../src/subscribers/common.c                  |  456 ++
 .../src/subscribers/common.h                  |   27 +
 .../src/subscribers/eventsource.c             |  414 ++
 .../src/subscribers/eventsource.h             |    4 +
 .../src/subscribers/getmsg_proxy.c            |  106 +
 .../src/subscribers/getmsg_proxy.h            |    1 +
 .../src/subscribers/http-chunked.c            |  259 +
 .../src/subscribers/http-chunked.h            |    4 +
 .../src/subscribers/http-multipart-mixed.c    |  291 +
 .../src/subscribers/http-multipart-mixed.h    |    3 +
 .../src/subscribers/http-raw-stream.c         |  157 +
 .../src/subscribers/http-raw-stream.h         |    1 +
 .../src/subscribers/internal.c                |  298 +
 .../src/subscribers/internal.h                |   32 +
 .../src/subscribers/intervalpoll.c            |   33 +
 .../src/subscribers/intervalpoll.h            |    1 +
 .../src/subscribers/longpoll-private.h        |   38 +
 .../src/subscribers/longpoll.c                |  551 ++
 .../src/subscribers/longpoll.h                |    2 +
 .../src/subscribers/memstore_ipc.c            |  197 +
 .../src/subscribers/memstore_ipc.h            |    5 +
 .../src/subscribers/memstore_multi.c          |  174 +
 .../src/subscribers/memstore_multi.h          |    2 +
 .../src/subscribers/memstore_redis.c          |  261 +
 .../src/subscribers/memstore_redis.h          |    3 +
 .../src/subscribers/websocket.c               | 2065 +++++++
 .../src/subscribers/websocket.h               |    5 +
 .../src/uthash.h                              | 1208 ++++
 .../src/util/hdr_histogram.c                  | 1015 +++
 .../src/util/hdr_histogram.h                  |  427 ++
 .../src/util/nchan_accumulator.c              |  212 +
 .../src/util/nchan_accumulator.h              |   45 +
 .../src/util/nchan_benchmark.c                |  804 +++
 .../src/util/nchan_benchmark.h                |   91 +
 .../src/util/nchan_bufchainpool.c             |  237 +
 .../src/util/nchan_bufchainpool.h             |   56 +
 .../src/util/nchan_channel_id.c               |  316 +
 .../src/util/nchan_channel_id.h               |    6 +
 .../src/util/nchan_debug.c                    |   81 +
 .../src/util/nchan_debug.h                    |   13 +
 .../src/util/nchan_fake_request.c             |  524 ++
 .../src/util/nchan_fake_request.h             |   58 +
 .../src/util/nchan_list.c                     |  175 +
 .../src/util/nchan_list.h                     |   54 +
 .../src/util/nchan_msg.c                      |  773 +++
 .../src/util/nchan_msg.h                      |   35 +
 .../src/util/nchan_output.c                   |  670 ++
 .../src/util/nchan_output.h                   |   30 +
 .../src/util/nchan_output_info.c              |  284 +
 .../src/util/nchan_output_info.h              |    6 +
 .../src/util/nchan_rbtree.c                   |  379 ++
 .../src/util/nchan_rbtree.h                   |   64 +
 .../src/util/nchan_reaper.c                   |  320 +
 .../src/util/nchan_reaper.h                   |   33 +
 .../src/util/nchan_reuse_queue.c              |  151 +
 .../src/util/nchan_reuse_queue.h              |   24 +
 .../src/util/nchan_slist.c                    |  164 +
 .../src/util/nchan_slist.h                    |   41 +
 .../src/util/nchan_stats.c                    |  103 +
 .../src/util/nchan_stats.h                    |   48 +
 .../src/util/nchan_subrequest.c               |  325 +
 .../src/util/nchan_subrequest.h               |    6 +
 .../src/util/nchan_thingcache.c               |  209 +
 .../src/util/nchan_thingcache.h               |    4 +
 .../src/util/nchan_timequeue.c                |  137 +
 .../src/util/nchan_timequeue.h                |   37 +
 .../src/util/nchan_util.c                     | 1334 ++++
 .../src/util/nchan_util.h                     |   86 +
 .../src/util/ngx_nchan_hacked_slab.c          |  770 +++
 .../src/util/ngx_nchan_hacked_slab.h          |   26 +
 .../src/util/shmem.c                          |  223 +
 .../src/util/shmem.h                          |   33 +
 src/core/nginx.c                              |   24 +-
 src/event/ngx_event_openssl.c                 |   32 +
 src/os/unix/ngx_daemon.c                      |    8 +-
 src/os/unix/ngx_posix_config.h                |    5 +-
 687 files changed, 145455 insertions(+), 6 deletions(-)
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.gitmodules
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.travis.yml
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/CONTRIBUTING.md
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/LICENSE
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/README.md
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/config
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/gbp.conf
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-filter.install
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-static.install
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/0001-Fix-Vary-header.patch
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/series
 create mode 100755 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/filter
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/static
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/config
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/ngx_http_brotli_filter_module.c
 create mode 100755 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-before-test.sh
 create mode 100755 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-compile.sh
 create mode 100755 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-test.sh
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test.conf
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test_h2.conf
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/config
 create mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/ngx_http_brotli_static_module.c
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/.astylerc
 create mode 100755 modules_deb/libnginx-mod-http-cache-purge-2.5.3/.format.sh
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/.gitattributes
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/.travis.yml
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/CHANGES
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/LICENSE
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/README.md
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/config
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/gbp.conf
 create mode 100755 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/purgetest
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/ngx_cache_purge_module.c
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy1.t
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy1_vars.t
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy2.t
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy2_vars.t
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy3.t
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy4.t
 create mode 100644 modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/resptype1.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/.gitattributes
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/.gitignore
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/.travis.yml
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/LICENSE
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/README.markdown
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/config
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/fix.scanned.copyright
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/gbp.conf
 create mode 100755 modules_deb/libnginx-mod-http-echo-0.63/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/tests/helloworld
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ddebug.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_echo.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_echo.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_filter.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_filter.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_foreach.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_foreach.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_handler.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_handler.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_location.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_location.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_module.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_module.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_request_info.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_request_info.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_sleep.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_sleep.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_subrequest.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_subrequest.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_timer.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_timer.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_util.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_util.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_var.c
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_var.h
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/abort-parent.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/blocking-sleep.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/echo-after-body.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/echo-before-body.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/echo-duplicate.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/echo-timer.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/echo.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/exec.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/filter-used.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/foreach-split.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/gzip.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/if.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/incr.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/location-async.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/location.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/mixed.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/request-body.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/request-info.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/sleep.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/status.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/subrequest-async.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/subrequest.t
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/t/unused.t
 create mode 100755 modules_deb/libnginx-mod-http-echo-0.63/util/build.sh
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/util/wiki2pod.pl
 create mode 100644 modules_deb/libnginx-mod-http-echo-0.63/valgrind.suppress
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/LICENSE
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/README.md
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/config
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/gbp.conf
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-http-geoip2.install
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-stream-geoip2.install
 create mode 100755 modules_deb/libnginx-mod-http-geoip2-3.4/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/ngx_http_geoip2_module.c
 create mode 100644 modules_deb/libnginx-mod-http-geoip2-3.4/ngx_stream_geoip2_module.c
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitattributes
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitignore
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/.travis.yml
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/LICENSE
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/README.markdown
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/config
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/gbp.conf
 create mode 100755 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/helloworld
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ddebug.h
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_filter_module.c
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_filter_module.h
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_in.c
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_in.h
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_out.c
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_out.h
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_util.c
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_util.h
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/bug.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/builtin.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/eval.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-conn.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-cookie.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-ua.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/phase.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/sanity.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/subrequest.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/unused.t
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/vars.t
 create mode 100755 modules_deb/libnginx-mod-http-headers-more-filter-0.38/util/build.sh
 create mode 100644 modules_deb/libnginx-mod-http-headers-more-filter-0.38/valgrind.suppress
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/.gitignore
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/LICENSE
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/README.md
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/README_AUTO_LIB.md
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/actions/array
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/actions/palloc
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/build
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/action_replacements
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/action_types
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_args
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_locs
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_macros
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/contexts
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/header_files
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/headers
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/module_dependencies
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/modules_optional
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/prefixes
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/array.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/conf_cmd_basic.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/conf_merge.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/palloc.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/auto/text/autogen
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/config
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright-scan-patterns.yml
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/fix.scanned.copyright
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/gbp.conf
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk-dev.install
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.install
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.nginx
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/mod-http-ndk.conf
 create mode 100755 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/docs/core/action_macros
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/docs/core/conf_cmds
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/docs/modules/set_var
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/docs/patches/more_logging_info
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/docs/upstream/list
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/examples/README
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/examples/http/set_var/config
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/examples/http/set_var/ngx_http_set_var_examples_module.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/ngx_auto_lib_core
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/notes/CHANGES
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/notes/LICENSE
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_array.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_cmd_basic.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_cmd_extra.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_merge.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_config.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_config.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_includes.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_palloc.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/patches/auto_config
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/patches/expose_rewrite_functions
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/patches/rewrite_phase_handler
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/md5.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/murmurhash2.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/sha.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_buf.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_buf.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_path.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_path.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_value.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_value.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_conf_file.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_conf_file.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_debug.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_debug.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_encoding.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_encoding.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_hash.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_hash.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http_headers.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_log.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_log.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_parse.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_path.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_path.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_process.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_process.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_regex.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_regex.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_rewrite.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_rewrite.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_set_var.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_set_var.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string_util.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_upstream_list.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_upstream_list.h
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_uri.c
 create mode 100644 modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_uri.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/.gitattributes
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/.gitignore
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/.travis.yml
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/README.markdown
 create mode 100755 modules_deb/libnginx-mod-http-set-misc-0.33/config
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright-scan-patterns.yml
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/fix.scanned.copyright
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/gbp.conf
 create mode 100755 modules_deb/libnginx-mod-http-set-misc-0.33/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/setifempty
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ddebug.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.c
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.h
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/base32.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/base32_no_padding.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/base64.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/base64url.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/default-value.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/escape-uri.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/formatted-time.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/hash.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/hashed-upstream.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/hex.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/hmac.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/local-today.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-json.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-sql.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/rand.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/rotate.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/secure-random.t
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/t/unescape-uri.t
 create mode 100755 modules_deb/libnginx-mod-http-set-misc-0.33/util/build.sh
 create mode 100644 modules_deb/libnginx-mod-http-set-misc-0.33/valgrind.suppress
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitattributes
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitignore
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/.travis.yml
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/Changes
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/README.markdown
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/config
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/fix.scanned.copyright
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/gbp.conf
 create mode 100755 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ddebug.h
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.c
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.h
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.c
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.h
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.c
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.h
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.c
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.h
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.c
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.h
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.c
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.h
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/000_init.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/access.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/bugs.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/conditional-get.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-length.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-type.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/disk.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-main.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-sub.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/empty-resp.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/err-page.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/etag.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/eval.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expire-var.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expires.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-header.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-skip.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/gzip.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/header-buf-size.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/main-req.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/max-age.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/methods.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-cache.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-store.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/postgres-main.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/private.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/proxy.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/ranges.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/redis.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/req-cache-control.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/satisfy.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/static.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/status.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-hide-headers.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-max-size.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-pass-headers.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-skip.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/sub-req.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/timeout.t
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/t/unused.t
 create mode 100755 modules_deb/libnginx-mod-http-srcache-filter-0.33/util/build.sh
 create mode 100644 modules_deb/libnginx-mod-http-srcache-filter-0.33/valgrind.suppress
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/CHANGES
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/README
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/config
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/gbp.conf
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0001-Feature-nginx-dynamic-module-support.patch
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0002-check-content-encoding-header-more-carefully.patch
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0003-PCRE2-support-added.patch
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/series
 create mode 100755 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.google_code_home_page.wiki
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.html
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.wiki
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/ngx_http_subs_filter_module.c
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/README
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/AutoInstall.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/AutoInstall.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Base.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Can.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Fetch.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Include.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Makefile.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Metadata.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/TestBase.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Win32.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/WriteAll.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Spiffy.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Base.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Base/Filter.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Builder.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Builder/Module.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/More.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/LWP.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/Socket.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/Util.pm
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs.t
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_capture.t
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_fix_string.t
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_regex.t
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_types.t
 create mode 100755 modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/test.sh
 create mode 100755 modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/update-readme.sh
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/wiki2google_code_homepage.pl
 create mode 100644 modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/wiki2pod.pl
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/.gdbinit
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/README
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/config
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/gbp.conf
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/drop-default-port.patch
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/dynamic-module.patch
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/openssl-1.1.0.patch
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/series
 create mode 100755 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/ngx_http_upstream_fair_module.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/LICENCE
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/README.md
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/changelog.txt
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/cloc-exclude.txt
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/config
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/control
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/fix.scanned.copyright
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/gbp.conf
 create mode 100755 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/rules
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/options
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/watch
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/.gitignore
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_commands.rb
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_config_commands.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_setup.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_types.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_variables.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_variables.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_version.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_websocket_publisher.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_websocket_publisher.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/groups.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/groups.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.h
 create mode 100755 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.c
 create mode 100755 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.h
 create mode 100755 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/memstore.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/recycloc.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/store-private.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/store.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/ngx_rwlock.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/ngx_rwlock.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/cmp.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/cmp.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/.gitignore
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/.travis.yml
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/CHANGELOG.md
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/COPYING
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/README.md
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/alloc.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/alloc.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async_private.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/dict.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/dict.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/fmacros.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis_ssl.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/net.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/net.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/read.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/read.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sds.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sds.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sdsalloc.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sockcompat.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sockcompat.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/ssl.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/test.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/win32.h
 create mode 100755 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/rdsstore.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/.gitignore
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/Gemfile
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/add_fakesub.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/channel_keepalive.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/delete.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/find_channel.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_message.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_message_from_key.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/nostore_publish_multiexec_channel_info.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/publish.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/request_subscriber_info.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/rsck.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_register.lua
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
 create mode 100755 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/testscripts.rb
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nginx_adapter.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nginx_adapter.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_parser.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_parser.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_stats.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store-private.h
 create mode 100755 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store.h
 create mode 100755 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/spool.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/spool.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/store_common.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/store_common.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/benchmark.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/benchmark.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/common.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/common.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/eventsource.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/eventsource.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/getmsg_proxy.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/getmsg_proxy.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-chunked.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-chunked.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-multipart-mixed.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-multipart-mixed.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-raw-stream.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-raw-stream.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/internal.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/internal.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/intervalpoll.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/intervalpoll.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll-private.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_ipc.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_ipc.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_multi.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_multi.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_redis.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_redis.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/websocket.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/websocket.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/uthash.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/hdr_histogram.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/hdr_histogram.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_benchmark.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_benchmark.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_bufchainpool.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_bufchainpool.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_channel_id.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_channel_id.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_debug.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_debug.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_fake_request.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_fake_request.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_msg.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_msg.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output_info.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output_info.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_rbtree.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_rbtree.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reaper.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reaper.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reuse_queue.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reuse_queue.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_slist.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_slist.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_subrequest.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_subrequest.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_thingcache.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_thingcache.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/ngx_nchan_hacked_slab.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/ngx_nchan_hacked_slab.h
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/shmem.c
 create mode 100644 modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/shmem.h

diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.gitmodules b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.gitmodules
new file mode 100644
index 0000000..694f088
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "deps/brotli"]
+	path = deps/brotli
+	url = https://github.com/google/brotli.git
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.travis.yml b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.travis.yml
new file mode 100644
index 0000000..57d2b8a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.travis.yml
@@ -0,0 +1,46 @@
+# required for http2 support in curl.
+dist: bionic
+language: c
+sudo: false
+matrix:
+  include:
+    # unfortunately, gcc-4.9 is dropped in bionic
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+      env:
+         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      env:
+        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+      env:
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+
+
+script:
+- script/.travis-compile.sh
+- script/.travis-before-test.sh
+- script/.travis-test.sh
+after_success:
+- killall nginx
+after_failure:
+- killall nginx
+
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/CONTRIBUTING.md b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/CONTRIBUTING.md
new file mode 100644
index 0000000..a9eabff
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/CONTRIBUTING.md
@@ -0,0 +1,27 @@
+# Contributing
+
+Want to contribute? Great! First, read this page (including the small print at the end).
+
+### Before you contribute
+Before we can use your code, you must sign the
+[Google Individual Contributor License Agreement](https://cla.developers.google.com/about/google-individual)
+(CLA), which you can do online. The CLA is necessary mainly because you own the
+copyright to your changes, even after your contribution becomes part of our
+codebase, so we need your permission to use and distribute your code. We also
+need to be sure of various other things—for instance that you'll tell us if you
+know that your code infringes on other people's patents. You don't have to sign
+the CLA until after you've submitted your code for review and a member has
+approved it, but you must do it before we can put your code into our codebase.
+Before you start working on a larger contribution, you should get in touch with
+us first through the issue tracker with your idea so that we can help out and
+possibly guide you. Coordinating up front makes it much easier to avoid
+frustration later on.
+
+### Code reviews
+All submissions, including submissions by project members, require review. We
+use Github pull requests for this purpose.
+
+### The small print
+Contributions made by corporations are covered by a different agreement than
+the one above, the
+[Software Grant and Corporate Contributor License Agreement](https://cla.developers.google.com/about/google-corporate).
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/LICENSE b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/LICENSE
new file mode 100644
index 0000000..db3aca7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/LICENSE
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2002-2015 Igor Sysoev
+ * Copyright (C) 2011-2015 Nginx, Inc.
+ * Copyright (C) 2015-2019 Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/README.md b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/README.md
new file mode 100644
index 0000000..80428e9
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/README.md
@@ -0,0 +1,177 @@
+# ngx_brotli
+
+Brotli is a generic-purpose lossless compression algorithm that compresses data
+using a combination of a modern variant of the LZ77 algorithm, Huffman coding
+and 2nd order context modeling, with a compression ratio comparable to the best
+currently available general-purpose compression methods. It is similar in speed
+with deflate but offers more dense compression.
+
+ngx_brotli is a set of two nginx modules:
+
+- ngx_brotli filter module - used to compress responses on-the-fly,
+- ngx_brotli static module - used to serve pre-compressed files.
+
+[![TravisCI Build Status](https://travis-ci.org/google/ngx_brotli.svg?branch=master)](https://travis-ci.org/google/ngx_brotli)
+
+## Table of Contents
+
+- [Status](#status)
+- [Installation](#installation)
+- [Configuration directives](#configuration-directives)
+  - [`brotli_static`](#brotli_static)
+  - [`brotli`](#brotli)
+  - [`brotli_types`](#brotli_types)
+  - [`brotli_buffers`](#brotli_buffers)
+  - [`brotli_comp_level`](#brotli_comp_level)
+  - [`brotli_window`](#brotli_window)
+  - [`brotli_min_length`](#brotli_min_length)
+- [Variables](#variables)
+  - [`$brotli_ratio`](#brotli_ratio)
+- [Sample configuration](#sample-configuration)
+- [Contributing](#contributing)
+- [License](#license)
+
+## Status
+
+Both Brotli library and nginx module are under active development.
+
+## Installation
+
+### Dynamically loaded
+
+    $ cd nginx-1.x.x
+    $ ./configure --with-compat --add-dynamic-module=/path/to/ngx_brotli
+    $ make modules
+
+You will need to use **exactly** the same `./configure` arguments as your Nginx configuration and append `--with-compat --add-dynamic-module=/path/to/ngx_brotli` to the end, otherwise you will get a "module is not binary compatible" error on startup. You can run `nginx -V` to get the configuration arguments for your Nginx installation.
+
+`make modules` will result in `ngx_http_brotli_filter_module.so` and `ngx_http_brotli_static_module.so` in the `objs` directory. Copy these to `/usr/lib/nginx/modules/` then add the `load_module` directives to `nginx.conf` (above the http block):
+```nginx
+load_module modules/ngx_http_brotli_filter_module.so;
+load_module modules/ngx_http_brotli_static_module.so;
+```
+
+### Statically compiled
+
+    $ cd nginx-1.x.x
+    $ ./configure --add-module=/path/to/ngx_brotli
+    $ make && make install
+  
+This will compile the module directly into Nginx.
+
+## Configuration directives
+
+### `brotli_static`
+
+- **syntax**: `brotli_static on|off|always`
+- **default**: `off`
+- **context**: `http`, `server`, `location`
+
+Enables or disables checking of the existence of pre-compressed files with`.br`
+extension. With the `always` value, pre-compressed file is used in all cases,
+without checking if the client supports it.
+
+### `brotli`
+
+- **syntax**: `brotli on|off`
+- **default**: `off`
+- **context**: `http`, `server`, `location`, `if`
+
+Enables or disables on-the-fly compression of responses.
+
+### `brotli_types`
+
+- **syntax**: `brotli_types <mime_type> [..]`
+- **default**: `text/html`
+- **context**: `http`, `server`, `location`
+
+Enables on-the-fly compression of responses for the specified MIME types
+in addition to `text/html`. The special value `*` matches any MIME type.
+Responses with the `text/html` MIME type are always compressed.
+
+### `brotli_buffers`
+
+- **syntax**: `brotli_buffers <number> <size>`
+- **default**: `32 4k|16 8k`
+- **context**: `http`, `server`, `location`
+
+**Deprecated**, ignored.
+
+### `brotli_comp_level`
+
+- **syntax**: `brotli_comp_level <level>`
+- **default**: `6`
+- **context**: `http`, `server`, `location`
+
+Sets on-the-fly compression Brotli quality (compression) `level`.
+Acceptable values are in the range from `0` to `11`.
+
+### `brotli_window`
+
+- **syntax**: `brotli_window <size>`
+- **default**: `512k`
+- **context**: `http`, `server`, `location`
+
+Sets Brotli window `size`. Acceptable values are `1k`, `2k`, `4k`, `8k`, `16k`,
+`32k`, `64k`, `128k`, `256k`, `512k`, `1m`, `2m`, `4m`, `8m` and `16m`.
+
+### `brotli_min_length`
+
+- **syntax**: `brotli_min_length <length>`
+- **default**: `20`
+- **context**: `http`, `server`, `location`
+
+Sets the minimum `length` of a response that will be compressed.
+The length is determined only from the `Content-Length` response header field.
+
+## Variables
+
+### `$brotli_ratio`
+
+Achieved compression ratio, computed as the ratio between the original
+and compressed response sizes.
+
+## Sample configuration
+
+```
+brotli on;
+brotli_comp_level 6;
+brotli_static on;
+brotli_types application/atom+xml application/javascript application/json application/rss+xml
+             application/vnd.ms-fontobject application/x-font-opentype application/x-font-truetype
+             application/x-font-ttf application/x-javascript application/xhtml+xml application/xml
+             font/eot font/opentype font/otf font/truetype image/svg+xml image/vnd.microsoft.icon
+             image/x-icon image/x-win-bitmap text/css text/javascript text/plain text/xml;
+```
+
+## Contributing
+
+See [Contributing](CONTRIBUTING.md).
+
+## License
+
+    Copyright (C) 2002-2015 Igor Sysoev
+    Copyright (C) 2011-2015 Nginx, Inc.
+    Copyright (C) 2015 Google Inc.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/config b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/config
new file mode 100644
index 0000000..42162a6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/config
@@ -0,0 +1,34 @@
+# Copyright (C) 2019 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+# Make sure the module knows it is a submodule.
+ngx_addon_name=ngx_brotli
+. $ngx_addon_dir/filter/config
+
+# Make sure the module knows it is a submodule.
+ngx_addon_name=ngx_brotli
+. $ngx_addon_dir/static/config
+
+# The final name for reporting.
+ngx_addon_name=ngx_brotli
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/changelog b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/changelog
new file mode 100644
index 0000000..c7021b7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/changelog
@@ -0,0 +1,49 @@
+libnginx-mod-http-brotli (1.0.0~rc-6) unstable; urgency=medium
+
+  * d/control: update my email to janmojzis@debian.org
+  * d/copyright: update my email to janmojzis@debian.org
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/copyright: bump debian/* copyright year
+  * d/watch: use more generic template
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 11 Apr 2025 14:26:55 +0200
+
+libnginx-mod-http-brotli (1.0.0~rc-5) unstable; urgency=medium
+
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 15:31:24 +0200
+
+libnginx-mod-http-brotli (1.0.0~rc-4) unstable; urgency=medium
+
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:16:35 +0200
+
+libnginx-mod-http-brotli (1.0.0~rc-3) unstable; urgency=medium
+
+  * d/watch: updated uversionmangle to be more generic
+  * d/copyright: reformat text to be compatible with 'cme update dpkg-copyright'
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:11 +0100
+
+libnginx-mod-http-brotli (1.0.0~rc-2) unstable; urgency=medium
+
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/p/0001-Fix-Vary-header.patch added (Closes: 1028153)
+    "brotli_static on;" causes "Vary: Accept-Encoding" to be added to every
+    file (including images, ...)
+    The patch fixes the problem and adds "Vary: Accept-Encoding" only to
+    responses when brotli static compression is used.
+  * d/changelog: bump my copyright year
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 13 Jan 2023 17:45:13 +0100
+
+libnginx-mod-http-brotli (1.0.0~rc-1) unstable; urgency=medium
+
+  * Initial release. (Closes: 1025515)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 06 Dec 2022 10:25:40 +0100
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/control b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/control
new file mode 100644
index 0000000..6e5752d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/control
@@ -0,0 +1,41 @@
+Source: libnginx-mod-http-brotli
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jan Mojžíš <janmojzis@debian.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+               libbrotli-dev,
+Standards-Version: 4.7.2
+Homepage: https://github.com/google/ngx_brotli
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-brotli.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-brotli
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-brotli-filter
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Brotli lossless compression support for Nginx - filter
+ Brotli is a generic-purpose lossless compression algorithm that compresses
+ data using a combination of a modern variant of the LZ77 algorithm, Huffman
+ coding and 2nd order context modeling, with a compression ratio comparable
+ to the best currently available general-purpose compression methods. It is
+ similar in speed with deflate but offers more dense compression.
+ .
+ ngx_brotli filter module - used to compress responses on-the-fly
+
+Package: libnginx-mod-http-brotli-static
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Brotli lossless compression support for Nginx - static
+ Brotli is a generic-purpose lossless compression algorithm that compresses
+ data using a combination of a modern variant of the LZ77 algorithm, Huffman
+ coding and 2nd order context modeling, with a compression ratio comparable
+ to the best currently available general-purpose compression methods. It is
+ similar in speed with deflate but offers more dense compression.
+ .
+ ngx_brotli static module - used to serve pre-compressed files
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/copyright b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/copyright
new file mode 100644
index 0000000..2ecfff5
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/copyright
@@ -0,0 +1,72 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ngx-brotli
+Source: https://github.com/google/ngx_brotli
+
+Files: *
+Copyright: 2015-2019, Google Inc.
+ 2011-2015, Nginx, Inc.
+ 2002-2015, Igor Sysoev
+License: BSD-2-clause
+
+Files: CONTRIBUTING.md
+Copyright: Copyright (C) 2015 Google Inc.
+ Copyright (C) 2011-2015 Nginx, Inc.
+ Copyright (C) 2002-2015 Igor Sysoev
+License: BSD-2-clause
+
+Files: config
+Copyright: 2015-2019, Google Inc.
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022, Miao Wang <shankerwangmiao@gmail.com>
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-2-clause
+
+Files: filter/*
+Copyright: 2015-2019, Google Inc.
+License: BSD-2-clause
+
+Files: filter/ngx_http_brotli_filter_module.c
+Copyright: Nginx, Inc.
+ Igor Sysoev
+ Google Inc.
+License: BSD-2-clause
+
+Files: script/*
+Copyright: Copyright (C) 2015 Google Inc.
+ Copyright (C) 2011-2015 Nginx, Inc.
+ Copyright (C) 2002-2015 Igor Sysoev
+License: BSD-2-clause
+
+Files: static/*
+Copyright: 2015-2019, Google Inc.
+License: BSD-2-clause
+
+Files: static/ngx_http_brotli_static_module.c
+Copyright: Nginx, Inc.
+ Igor Sysoev
+ Google Inc.
+License: BSD-2-clause
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/gbp.conf b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/gbp.conf
new file mode 100644
index 0000000..38c12c1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-filter.install b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-filter.install
new file mode 100644
index 0000000..5fcd39d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-filter.install
@@ -0,0 +1 @@
+/usr/lib/nginx/modules/ngx_http_brotli_filter_module.so
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-static.install b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-static.install
new file mode 100644
index 0000000..dd4a44e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/libnginx-mod-http-brotli-static.install
@@ -0,0 +1 @@
+/usr/lib/nginx/modules/ngx_http_brotli_static_module.so
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/0001-Fix-Vary-header.patch b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/0001-Fix-Vary-header.patch
new file mode 100644
index 0000000..09735a7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/0001-Fix-Vary-header.patch
@@ -0,0 +1,38 @@
+From: Jan Mojzis <jan.mojzis@gmail.com>
+Date: Fri, 13 Jan 2023 12:59:07 +0100
+Subject: Fix 'Vary' header
+
+The patch fixes problem described here:
+https://github.com/google/ngx_brotli/issues/97
+
+"brotli_static on;" causes "Vary: Accept-Encoding" to be added to every
+file (including images, ...)
+The patch fixes the problem and adds "Vary: Accept-Encoding" only to
+responses when brotli static compression is used.
+---
+ static/ngx_http_brotli_static_module.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/static/ngx_http_brotli_static_module.c b/static/ngx_http_brotli_static_module.c
+index 8f96177..44f0cb0 100644
+--- a/static/ngx_http_brotli_static_module.c
++++ b/static/ngx_http_brotli_static_module.c
+@@ -168,7 +168,6 @@ static ngx_int_t handler(ngx_http_request_t* req) {
+     /* Ignore request properties (e.g. Accept-Encoding). */
+   } else {
+     /* NGX_HTTP_BROTLI_STATIC_ON */
+-    req->gzip_vary = 1;
+     rc = check_eligility(req);
+     if (rc != NGX_OK) return NGX_DECLINED;
+   }
+@@ -227,6 +226,10 @@ static ngx_int_t handler(ngx_http_request_t* req) {
+     return NGX_DECLINED;
+   }
+ 
++  if (cfg->enable == NGX_HTTP_BROTLI_STATIC_ON) {
++	 req->gzip_vary = 1;
++  }
++
+   /* So far so good. */
+   ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d",
+                  file_info.fd);
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/series b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/series
new file mode 100644
index 0000000..dfd7340
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-Vary-header.patch
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/rules b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/source/format b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/control b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/control
new file mode 100644
index 0000000..de69689
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/control
@@ -0,0 +1,22 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
+
+Tests: static
+Restrictions: allow-stderr isolation-container needs-root
+Depends: brotli,
+         curl,
+         libnginx-mod-http-brotli-static,
+         nginx,
+         nginx-core,
+
+Tests: filter
+Restrictions: allow-stderr isolation-container needs-root
+Depends: brotli,
+         curl,
+         libnginx-mod-http-brotli-filter,
+         nginx,
+         nginx-core,
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/filter b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/filter
new file mode 100644
index 0000000..16ac356
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/filter
@@ -0,0 +1,44 @@
+#!/bin/sh
+set -e
+
+cat <<EOF > "/etc/nginx/sites-enabled/default"
+server {
+  listen 80 default_server;
+  root /var/www/html;
+
+  location /helloworld {
+    default_type text/plain;
+    brotli on;
+    brotli_types text/plain;
+    brotli_min_length 10;
+    brotli_comp_level 11;
+  }
+}
+EOF
+
+mkdir -p /var/www/html
+echo 'hello world' > /var/www/html/helloworld
+
+exp="content-encoding: br
+hello world
+response_code: 200"
+
+nginx -t
+invoke-rc.d nginx restart || { journalctl -n all -xu nginx.service; exit 1; }
+
+out=`curl --compressed --fail -D- -w "response_code: %{http_code}\n" http://127.0.0.1/helloworld`
+out=`echo "${out}" | sed 's/\r//'`
+out=`echo "${out}" | awk '{print tolower($0)}'`
+out=`echo "${out}" | grep '^content-encoding: \|^hello world$\|response_code: '`
+
+if [ x"${out}" != x"${exp}" ]; then
+  echo "output:"
+  echo "====================="
+  echo "${out}"
+  echo "====================="
+  echo "expected output:"
+  echo "====================="
+  echo "${exp}"
+  echo "====================="
+  exit 1
+fi
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/generic b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/static b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/static
new file mode 100644
index 0000000..bce1fbc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/tests/static
@@ -0,0 +1,36 @@
+#!/bin/sh
+set -e
+
+cat <<EOF > "/etc/nginx/sites-enabled/default"
+server {
+  listen 80 default_server;
+  root /var/www/html;
+
+  location /helloworld {
+    brotli_static on;
+  }
+}
+EOF
+
+mkdir -p /var/www/html
+echo 'hello world' | brotli -9 > /var/www/html/helloworld.br
+
+exp="hello world
+response_code: 200"
+
+nginx -t
+invoke-rc.d nginx restart || { journalctl -n all -xu nginx.service; exit 1; }
+
+out=`curl --compressed --fail -w "response_code: %{http_code}\n" http://127.0.0.1/helloworld`
+
+if [ x"${out}" != x"${exp}" ]; then
+  echo "output:"
+  echo "====================="
+  echo "${out}"
+  echo "====================="
+  echo "expected output:"
+  echo "====================="
+  echo "${exp}"
+  echo "====================="
+  exit 1
+fi
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/upstream/metadata b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/upstream/metadata
new file mode 100644
index 0000000..30627c6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/google/ngx_brotli/issues
+Bug-Submit: https://github.com/google/ngx_brotli/issues/new
+Repository-Browse: https://github.com/google/ngx_brotli
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/watch b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/watch
new file mode 100644
index 0000000..08b8983
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/debian/watch
@@ -0,0 +1,6 @@
+version=4
+opts="\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/google/ngx_brotli/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/config b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/config
new file mode 100644
index 0000000..9c27fc7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/config
@@ -0,0 +1,132 @@
+# Copyright (C) 2015-2016 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+if [ "$ngx_addon_name" = "ngx_brotli" ]; then
+  BROTLI_MODULE_SRC_DIR="$ngx_addon_dir/filter"
+else
+  BROTLI_MODULE_SRC_DIR="$ngx_addon_dir"
+fi
+
+ngx_addon_name=ngx_brotli_filter
+
+if [ -z "$ngx_module_link" ]; then
+cat << END
+
+$0: error: Brotli module requires recent version of NGINX (1.9.11+).
+
+END
+    exit 1
+fi
+
+ngx_module_type=HTTP_FILTER
+ngx_module_name=ngx_http_brotli_filter_module
+
+brotli="$ngx_addon_dir/deps/brotli/c"
+if [ ! -f "$brotli/include/brotli/encode.h" ]; then
+  brotli="/usr/local"
+fi
+if [ ! -f "$brotli/include/brotli/encode.h" ]; then
+  brotli="/usr"
+fi
+if [ ! -f "$brotli/include/brotli/encode.h" ]; then
+cat << END
+
+$0: error: \
+Brotli library is missing from the $brotli directory.
+
+Please make sure that the git submodule has been checked out:
+
+    cd $ngx_addon_dir && git submodule update --init && cd $PWD
+
+END
+    exit 1
+fi
+
+BROTLI_LISTS_FILE="$brotli/../scripts/sources.lst"
+
+if [ -f "$BROTLI_LISTS_FILE" ]; then
+
+BROTLI_LISTS=`cat "$BROTLI_LISTS_FILE" | grep -v "#" | tr '\n' '#' | \
+              sed 's/\\\\#//g' | tr -s ' ' '+' | tr -s '#' ' ' | \
+              sed 's/+c/+$brotli/g' | sed 's/+=+/=/g'`
+for ITEM in ${BROTLI_LISTS}; do
+  VAR=`echo $ITEM | sed 's/=.*//'`
+  VAL=`echo $ITEM | sed 's/.*=//' | tr '+' ' '`
+  eval ${VAR}=\"$VAL\"
+done
+
+else  # BROTLI_LISTS_FILE
+
+BROTLI_ENC_H="$brotli/include/brotli/encode.h \
+              $brotli/include/brotli/port.h \
+              $brotli/include/brotli/types.h"
+BROTLI_ENC_LIB="-lbrotlienc"
+
+fi
+
+ngx_module_incs="$brotli/include"
+ngx_module_deps="$BROTLI_COMMON_H $BROTLI_ENC_H"
+ngx_module_srcs="$BROTLI_COMMON_C $BROTLI_ENC_C \
+                 $BROTLI_MODULE_SRC_DIR/ngx_http_brotli_filter_module.c"
+ngx_module_libs="$BROTLI_ENC_LIB -lm"
+ngx_module_order="$ngx_module_name \
+                  ngx_pagespeed \
+                  ngx_http_postpone_filter_module \
+                  ngx_http_ssi_filter_module \
+                  ngx_http_charset_filter_module \
+                  ngx_http_xslt_filter_module \
+                  ngx_http_image_filter_module \
+                  ngx_http_sub_filter_module \
+                  ngx_http_addition_filter_module \
+                  ngx_http_gunzip_filter_module \
+                  ngx_http_userid_filter_module \
+                  ngx_http_headers_filter_module \
+                  ngx_http_copy_filter_module \
+                  ngx_http_range_body_filter_module \
+                  ngx_http_not_modified_filter_module \
+                  ngx_http_slice_filter_module"
+
+. auto/module
+
+if [ "$ngx_module_link" != DYNAMIC ]; then
+    # ngx_module_order doesn't work with static modules,
+    # so we must re-order filters here.
+
+    if [ "$HTTP_GZIP" = YES ]; then
+        next=ngx_http_gzip_filter_module
+    elif echo $HTTP_FILTER_MODULES | grep pagespeed_etag_filter >/dev/null; then
+        next=ngx_pagespeed_etag_filter
+    else
+        next=ngx_http_range_header_filter_module
+    fi
+
+    HTTP_FILTER_MODULES=`echo $HTTP_FILTER_MODULES \
+                         | sed "s/$ngx_module_name//" \
+                         | sed "s/$next/$next $ngx_module_name/"`
+fi
+
+CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+
+have=NGX_HTTP_BROTLI_FILTER . auto/have
+have=NGX_HTTP_BROTLI_FILTER_MODULE . auto/have  # deprecated
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/ngx_http_brotli_filter_module.c b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/ngx_http_brotli_filter_module.c
new file mode 100644
index 0000000..592b767
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/filter/ngx_http_brotli_filter_module.c
@@ -0,0 +1,770 @@
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Google Inc.
+ */
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+#if (NGX_HAVE_BROTLI_ENC_ENCODE_H)
+#include <brotli/enc/encode.h>
+#else
+#include <brotli/encode.h>
+#endif
+
+/* Brotli and GZip modules never stack, i.e. when one of them sets
+   "Content-Encoding" the other becomes a pass-through filter. Consequently,
+   it is almost legal to reuse this "buffered" bit.
+   IIUC, buffered == some data passed to filter has not been pushed further. */
+#define NGX_HTTP_BROTLI_BUFFERED NGX_HTTP_GZIP_BUFFERED
+
+/* Module configuration. */
+typedef struct {
+  ngx_flag_t enable;
+
+  /* Supported MIME types. */
+  ngx_hash_t types;
+  ngx_array_t* types_keys;
+
+  /* Minimal required length for compression (if known). */
+  ssize_t min_length;
+
+  ngx_bufs_t deprecated_unused_bufs;
+
+  /* Brotli encoder parameter: quality */
+  ngx_int_t quality;
+
+  /* Brotli encoder parameter: (max) lg_win */
+  size_t lg_win;
+} ngx_http_brotli_conf_t;
+
+/* Instance context. */
+typedef struct {
+  /* Brotli encoder instance. */
+  BrotliEncoderState* encoder;
+
+  /* Payload length; -1, if unknown. */
+  off_t content_length;
+
+  /* (uncompressed) bytes pushed to encoder. */
+  size_t bytes_in;
+  /* (compressed) bytes pulled from encoder. */
+  size_t bytes_out;
+
+  /* Input buffer chain. */
+  ngx_chain_t* in;
+
+  /* Output chain. */
+  ngx_chain_t* out_chain;
+
+  /* Output buffer. */
+  ngx_buf_t* out_buf;
+
+  /* Various state flags. */
+
+  /* 1 if encoder is initialized, output chain and buffer are allocated. */
+  unsigned initialized : 1;
+  /* 1 if compression is finished / failed. */
+  unsigned closed : 1;
+  /* 1 if compression is finished. */
+  unsigned success : 1;
+
+  /* 1 if out_chain is ready to be committed, 0 otherwise. */
+  unsigned output_ready : 1;
+  /* 1 if output buffer is committed to the next filter and not yet fully used.
+     0 otherwise. */
+  unsigned output_busy : 1;
+
+  unsigned end_of_input : 1;
+  unsigned end_of_block : 1;
+
+  ngx_http_request_t* request;
+} ngx_http_brotli_ctx_t;
+
+/* Forward declarations. */
+
+/* Initializes encoder, output chain and buffer, if necessary. Returns NGX_OK
+   if encoder is successfully initialized (have been already initialized),
+   and requires objects are allocated. Returns NGX_ERROR otherwise. */
+static ngx_int_t ngx_http_brotli_filter_ensure_stream_initialized(
+    ngx_http_request_t* r, ngx_http_brotli_ctx_t* ctx);
+/* Marks instance as closed and performs cleanup. */
+static void ngx_http_brotli_filter_close(ngx_http_brotli_ctx_t* ctx);
+
+static void* ngx_http_brotli_filter_alloc(void* opaque, size_t size);
+static void ngx_http_brotli_filter_free(void* opaque, void* address);
+
+static ngx_int_t ngx_http_brotli_check_request(ngx_http_request_t* r);
+
+static ngx_int_t ngx_http_brotli_add_variables(ngx_conf_t* cf);
+static ngx_int_t ngx_http_brotli_ratio_variable(ngx_http_request_t* r,
+                                                ngx_http_variable_value_t* v,
+                                                uintptr_t data);
+
+static void* ngx_http_brotli_create_conf(ngx_conf_t* cf);
+static char* ngx_http_brotli_merge_conf(ngx_conf_t* cf, void* parent,
+                                        void* child);
+static ngx_int_t ngx_http_brotli_filter_init(ngx_conf_t* cf);
+
+static char* ngx_http_brotli_parse_wbits(ngx_conf_t* cf, void* post,
+                                         void* data);
+
+/* Configuration literals. */
+
+static ngx_conf_num_bounds_t ngx_http_brotli_comp_level_bounds = {
+    ngx_conf_check_num_bounds, BROTLI_MIN_QUALITY, BROTLI_MAX_QUALITY};
+
+static ngx_conf_post_handler_pt ngx_http_brotli_parse_wbits_p =
+    ngx_http_brotli_parse_wbits;
+
+static ngx_command_t ngx_http_brotli_filter_commands[] = {
+    {ngx_string("brotli"),
+     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_brotli_conf_t, enable), NULL},
+
+    /* Deprecated, unused. */
+    {ngx_string("brotli_buffers"),
+     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF |
+         NGX_CONF_TAKE2,
+     ngx_conf_set_bufs_slot, NGX_HTTP_LOC_CONF_OFFSET,
+     offsetof(ngx_http_brotli_conf_t, deprecated_unused_bufs), NULL},
+
+    {ngx_string("brotli_types"),
+     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF |
+         NGX_CONF_1MORE,
+     ngx_http_types_slot, NGX_HTTP_LOC_CONF_OFFSET,
+     offsetof(ngx_http_brotli_conf_t, types_keys),
+     &ngx_http_html_default_types[0]},
+
+    {ngx_string("brotli_comp_level"),
+     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF |
+         NGX_CONF_TAKE1,
+     ngx_conf_set_num_slot, NGX_HTTP_LOC_CONF_OFFSET,
+     offsetof(ngx_http_brotli_conf_t, quality),
+     &ngx_http_brotli_comp_level_bounds},
+
+    {ngx_string("brotli_window"),
+     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF |
+         NGX_CONF_TAKE1,
+     ngx_conf_set_size_slot, NGX_HTTP_LOC_CONF_OFFSET,
+     offsetof(ngx_http_brotli_conf_t, lg_win), &ngx_http_brotli_parse_wbits_p},
+
+    {ngx_string("brotli_min_length"),
+     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF |
+         NGX_CONF_TAKE1,
+     ngx_conf_set_size_slot, NGX_HTTP_LOC_CONF_OFFSET,
+     offsetof(ngx_http_brotli_conf_t, min_length), NULL},
+
+    ngx_null_command};
+
+/* Module context hooks. */
+static ngx_http_module_t ngx_http_brotli_filter_module_ctx = {
+    ngx_http_brotli_add_variables, /* pre-configuration */
+    ngx_http_brotli_filter_init,   /* post-configuration */
+
+    NULL, /* create main configuration */
+    NULL, /* init main configuration */
+
+    NULL, /* create server configuration */
+    NULL, /* merge server configuration */
+
+    ngx_http_brotli_create_conf, /* create location configuration */
+    ngx_http_brotli_merge_conf   /* merge location configuration */
+};
+
+/* Module descriptor. */
+ngx_module_t ngx_http_brotli_filter_module = {
+    NGX_MODULE_V1,
+    &ngx_http_brotli_filter_module_ctx, /* module context */
+    ngx_http_brotli_filter_commands,    /* module directives */
+    NGX_HTTP_MODULE,                    /* module type */
+    NULL,                               /* init master */
+    NULL,                               /* init module */
+    NULL,                               /* init process */
+    NULL,                               /* init thread */
+    NULL,                               /* exit thread */
+    NULL,                               /* exit process */
+    NULL,                               /* exit master */
+    NGX_MODULE_V1_PADDING};
+
+/* Variable names. */
+static ngx_str_t ngx_http_brotli_ratio = ngx_string("brotli_ratio");
+
+/* Next filter in the filter chain. */
+static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
+static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
+
+static /* const */ char kEncoding[] = "br";
+static const size_t kEncodingLen = 2;
+
+static ngx_int_t check_accept_encoding(ngx_http_request_t* req) {
+  ngx_table_elt_t* accept_encoding_entry;
+  ngx_str_t* accept_encoding;
+  u_char* cursor;
+  u_char* end;
+  u_char before;
+  u_char after;
+
+  accept_encoding_entry = req->headers_in.accept_encoding;
+  if (accept_encoding_entry == NULL) return NGX_DECLINED;
+  accept_encoding = &accept_encoding_entry->value;
+
+  cursor = accept_encoding->data;
+  end = cursor + accept_encoding->len;
+  while (1) {
+    u_char digit;
+    /* It would be an idiotic idea to rely on compiler to produce performant
+       binary, that is why we just do -1 at every call site. */
+    cursor = ngx_strcasestrn(cursor, kEncoding, kEncodingLen - 1);
+    if (cursor == NULL) return NGX_DECLINED;
+    before = (cursor == accept_encoding->data) ? ' ' : cursor[-1];
+    cursor += kEncodingLen;
+    after = (cursor >= end) ? ' ' : *cursor;
+    if (before != ',' && before != ' ') continue;
+    if (after != ',' && after != ' ' && after != ';') continue;
+
+    /* Check for ";q=0[.[0[0[0]]]]" */
+    while (*cursor == ' ') cursor++;
+    if (*(cursor++) != ';') break;
+    while (*cursor == ' ') cursor++;
+    if (*(cursor++) != 'q') break;
+    while (*cursor == ' ') cursor++;
+    if (*(cursor++) != '=') break;
+    while (*cursor == ' ') cursor++;
+    if (*(cursor++) != '0') break;
+    if (*(cursor++) != '.') return NGX_DECLINED; /* ;q=0, */
+    digit = *(cursor++);
+    if (digit < '0' || digit > '9') return NGX_DECLINED; /* ;q=0., */
+    if (digit > '0') break;
+    digit = *(cursor++);
+    if (digit < '0' || digit > '9') return NGX_DECLINED; /* ;q=0.0, */
+    if (digit > '0') break;
+    digit = *(cursor++);
+    if (digit < '0' || digit > '9') return NGX_DECLINED; /* ;q=0.00, */
+    if (digit > '0') break;
+    return NGX_DECLINED; /* ;q=0.000 */
+  }
+  return NGX_OK;
+}
+
+/* Process headers and decide if request is eligible for brotli compression. */
+static ngx_int_t ngx_http_brotli_header_filter(ngx_http_request_t* r) {
+  ngx_table_elt_t* h;
+  ngx_http_brotli_ctx_t* ctx;
+  ngx_http_brotli_conf_t* conf;
+
+  conf = ngx_http_get_module_loc_conf(r, ngx_http_brotli_filter_module);
+
+  /* Filter only if enabled. */
+  if (!conf->enable) {
+    return ngx_http_next_header_filter(r);
+  }
+
+  /* Only compress OK / forbidden / not found responses. */
+  if (r->headers_out.status != NGX_HTTP_OK &&
+      r->headers_out.status != NGX_HTTP_FORBIDDEN &&
+      r->headers_out.status != NGX_HTTP_NOT_FOUND) {
+    return ngx_http_next_header_filter(r);
+  }
+
+  /* Bypass "header only" responses. */
+  if (r->header_only) {
+    return ngx_http_next_header_filter(r);
+  }
+
+  /* Bypass already compressed responses. */
+  if (r->headers_out.content_encoding &&
+      r->headers_out.content_encoding->value.len) {
+    return ngx_http_next_header_filter(r);
+  }
+
+  /* If response size is known, do not compress tiny responses. */
+  if (r->headers_out.content_length_n != -1 &&
+      r->headers_out.content_length_n < conf->min_length) {
+    return ngx_http_next_header_filter(r);
+  }
+
+  /* Compress only certain MIME-typed responses. */
+  if (ngx_http_test_content_type(r, &conf->types) == NULL) {
+    return ngx_http_next_header_filter(r);
+  }
+
+  r->gzip_vary = 1;
+
+  /* Check if client support brotli encoding. */
+  if (ngx_http_brotli_check_request(r) != NGX_OK) {
+    return ngx_http_next_header_filter(r);
+  }
+
+  /* Prepare instance context. */
+  ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_brotli_ctx_t));
+  if (ctx == NULL) {
+    return NGX_ERROR;
+  }
+  ctx->request = r;
+  ctx->content_length = r->headers_out.content_length_n;
+  ngx_http_set_ctx(r, ctx, ngx_http_brotli_filter_module);
+
+  /* Prepare response headers, so that following filters in the chain will
+     notice that response body is compressed. */
+  h = ngx_list_push(&r->headers_out.headers);
+  if (h == NULL) {
+    return NGX_ERROR;
+  }
+
+  h->hash = 1;
+  ngx_str_set(&h->key, "Content-Encoding");
+  ngx_str_set(&h->value, "br");
+  r->headers_out.content_encoding = h;
+
+  r->main_filter_need_in_memory = 1;
+
+  ngx_http_clear_content_length(r);
+  ngx_http_clear_accept_ranges(r);
+  ngx_http_weak_etag(r);
+
+  return ngx_http_next_header_filter(r);
+}
+
+/* Response body filtration (compression). */
+static ngx_int_t ngx_http_brotli_body_filter(ngx_http_request_t* r,
+                                             ngx_chain_t* in) {
+  int rc;
+  ngx_http_brotli_ctx_t* ctx;
+  size_t available_output;
+  ptrdiff_t available_busy_output;
+  size_t input_size;
+  size_t available_input;
+  const uint8_t* next_input_byte;
+  size_t consumed_input;
+  BROTLI_BOOL ok;
+  u_char* out;
+  ngx_chain_t* link;
+
+  ctx = ngx_http_get_module_ctx(r, ngx_http_brotli_filter_module);
+
+  ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                 "http brotli filter");
+
+  if (ctx == NULL || ctx->closed || r->header_only) {
+    return ngx_http_next_body_filter(r, in);
+  }
+
+  if (ngx_http_brotli_filter_ensure_stream_initialized(r, ctx) != NGX_OK) {
+    ngx_http_brotli_filter_close(ctx);
+    return NGX_ERROR;
+  }
+
+  /* If more input is provided - append it to our input chain. */
+  if (in) {
+    if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
+      ngx_http_brotli_filter_close(ctx);
+      return NGX_ERROR;
+    }
+    r->connection->buffered |= NGX_HTTP_BROTLI_BUFFERED;
+  }
+
+  /* Main loop:
+     - if output is not yet consumed - stop; encoder should not be touched,
+       until all the output is consumed
+     - if encoder has output - wrap it and send to consumer
+     - if encoder is finished (and all output is consumed) - stop
+     - if there is more input - push it to encoder */
+  for (;;) {
+    if (ctx->output_busy || ctx->output_ready) {
+      if (ctx->output_busy) {
+        available_busy_output = ngx_buf_size(ctx->out_buf);
+      } else {
+        available_busy_output = 0;
+      }
+
+      rc = ngx_http_next_body_filter(r,
+                                     ctx->output_ready ? ctx->out_chain : NULL);
+      if (ctx->output_ready) {
+        ctx->output_ready = 0;
+        ctx->output_busy = 1;
+      }
+      if (ngx_buf_size(ctx->out_buf) == 0) {
+        ctx->output_busy = 0;
+      }
+      if (rc == NGX_OK) {
+        if (ctx->output_busy &&
+            available_busy_output == ngx_buf_size(ctx->out_buf)) {
+          r->connection->buffered |= NGX_HTTP_BROTLI_BUFFERED;
+          return NGX_AGAIN;
+        }
+        continue;
+      } else if (rc == NGX_AGAIN) {
+        if (ctx->output_busy) {
+          /* Can't continue compression, let the outer filer decide. */
+          if (ctx->in != NULL) {
+            r->connection->buffered |= NGX_HTTP_BROTLI_BUFFERED;
+          }
+          return NGX_AGAIN;
+        } else {
+          /* Inner filter has given up, but we can continue processing. */
+          continue;
+        }
+      } else {
+        ngx_http_brotli_filter_close(ctx);
+        return NGX_ERROR;
+      }
+    }
+
+    if (BrotliEncoderHasMoreOutput(ctx->encoder)) {
+      available_output = 0;
+      out = (u_char*)BrotliEncoderTakeOutput(ctx->encoder, &available_output);
+      if (out == NULL || available_output == 0) {
+        ngx_http_brotli_filter_close(ctx);
+        return NGX_ERROR;
+      }
+      ctx->out_buf->start = out;
+      ctx->out_buf->pos = out;
+      ctx->out_buf->last = out + available_output;
+      ctx->out_buf->end = out + available_output;
+      ctx->bytes_out += available_output;
+      ctx->out_buf->last_buf = 0;
+      ctx->out_buf->flush = 0;
+      if (ctx->end_of_input && BrotliEncoderIsFinished(ctx->encoder)) {
+        ctx->out_buf->last_buf = 1;
+        r->connection->buffered &= ~NGX_HTTP_BROTLI_BUFFERED;
+      } else if (ctx->end_of_block) {
+        ctx->out_buf->flush = 1;
+        r->connection->buffered &= ~NGX_HTTP_BROTLI_BUFFERED;
+      }
+      ctx->end_of_block = 0;
+      ctx->output_ready = 1;
+      ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                     "brotli out: %p, size:%uz", ctx->out_buf,
+                     ngx_buf_size(ctx->out_buf));
+      continue;
+    }
+
+    if (BrotliEncoderIsFinished(ctx->encoder)) {
+      ctx->success = 1;
+      r->connection->buffered &= ~NGX_HTTP_BROTLI_BUFFERED;
+      ngx_http_brotli_filter_close(ctx);
+      return NGX_OK;
+    }
+
+    if (ctx->end_of_input) {
+      // Ask the encoder to dump the leftover.
+      available_input = 0;
+      available_output = 0;
+      ok = BrotliEncoderCompressStream(ctx->encoder, BROTLI_OPERATION_FINISH,
+                                       &available_input, NULL,
+                                       &available_output, NULL, NULL);
+      r->connection->buffered |= NGX_HTTP_BROTLI_BUFFERED;
+      if (!ok) {
+        ngx_http_brotli_filter_close(ctx);
+        return NGX_ERROR;
+      }
+      continue;
+    }
+
+    if (ctx->in == NULL) {
+      return NGX_OK;
+    }
+
+    /* TODO: coalesce tiny inputs, if they are not last/flush. */
+    input_size = ngx_buf_size(ctx->in->buf);
+    if (input_size == 0) {
+      if (!ctx->in->buf->last_buf && !ctx->in->buf->flush) {
+        link = ctx->in;
+        ctx->in = ctx->in->next;
+        ngx_free_chain(r->pool, link);
+        continue;
+      }
+    }
+
+    available_input = input_size;
+    next_input_byte = (const uint8_t*)ctx->in->buf->pos;
+    available_output = 0;
+    ok = BrotliEncoderCompressStream(
+        ctx->encoder,
+        ctx->in->buf->last_buf ? BROTLI_OPERATION_FINISH
+                               : ctx->in->buf->flush ? BROTLI_OPERATION_FLUSH
+                                                     : BROTLI_OPERATION_PROCESS,
+        &available_input, &next_input_byte, &available_output, NULL, NULL);
+    r->connection->buffered |= NGX_HTTP_BROTLI_BUFFERED;
+    if (!ok) {
+      ngx_http_brotli_filter_close(ctx);
+      return NGX_ERROR;
+    }
+
+    consumed_input = input_size - available_input;
+    ctx->bytes_in += consumed_input;
+    ctx->in->buf->pos += consumed_input;
+
+    if (consumed_input == input_size) {
+      if (ctx->in->buf->last_buf) {
+        ctx->end_of_input = 1;
+      } else if (ctx->in->buf->flush) {
+        ctx->end_of_block = 1;
+      }
+      link = ctx->in;
+      ctx->in = ctx->in->next;
+      ngx_free_chain(r->pool, link);
+      continue;
+    }
+
+    /* Should never happen, just to make sure we don't enter infinite loop. */
+    if (consumed_input == 0) {
+      ngx_http_brotli_filter_close(ctx);
+      return NGX_ERROR;
+    }
+  }
+
+  /* unreachable */
+  ngx_http_brotli_filter_close(ctx);
+  return NGX_ERROR;
+}
+
+static ngx_int_t ngx_http_brotli_filter_ensure_stream_initialized(
+    ngx_http_request_t* r, ngx_http_brotli_ctx_t* ctx) {
+  ngx_http_brotli_conf_t* conf;
+  BROTLI_BOOL ok;
+  size_t wbits;
+
+  if (ctx->initialized) {
+    return NGX_OK;
+  }
+  ctx->initialized = 1;
+
+  conf = ngx_http_get_module_loc_conf(r, ngx_http_brotli_filter_module);
+
+  /* Tune lg_win, if size is known. */
+  if (ctx->content_length > 0) {
+    wbits = BROTLI_MIN_WINDOW_BITS;
+    while ((wbits < conf->lg_win) && (ctx->content_length > (1 << wbits))) {
+      wbits++;
+    }
+  } else {
+    wbits = conf->lg_win;
+  }
+
+  ctx->encoder = BrotliEncoderCreateInstance(
+      ngx_http_brotli_filter_alloc, ngx_http_brotli_filter_free, r->pool);
+  if (ctx->encoder == NULL) {
+    ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                  "OOM / BrotliEncoderCreateInstance");
+    return NGX_ERROR;
+  }
+
+  ok = BrotliEncoderSetParameter(ctx->encoder, BROTLI_PARAM_QUALITY,
+                                 (uint32_t)conf->quality);
+  if (!ok) {
+    ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                  "BrotliEncoderSetParameter(QUALITY, %uD) failed",
+                  (uint32_t)conf->quality);
+    return NGX_ERROR;
+  }
+
+  ok = BrotliEncoderSetParameter(ctx->encoder, BROTLI_PARAM_LGWIN,
+                                 (uint32_t)wbits);
+  if (!ok) {
+    ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                  "BrotliEncoderSetParameter(LGWIN, %uD) failed",
+                  (uint32_t)wbits);
+    return NGX_ERROR;
+  }
+
+  ctx->out_buf = ngx_calloc_buf(r->pool);
+  if (ctx->out_buf == NULL) {
+    return NGX_ERROR;
+  }
+  ctx->out_buf->temporary = 1;
+
+  ctx->out_chain = ngx_alloc_chain_link(r->pool);
+  if (ctx->out_chain == NULL) {
+    return NGX_ERROR;
+  }
+  ctx->out_chain->buf = ctx->out_buf;
+  ctx->out_chain->next = NULL;
+
+  ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                 "brotli encoder initialized: lvl:%i win:%d", conf->quality,
+                 (1 << wbits));
+
+  return NGX_OK;
+}
+
+static void* ngx_http_brotli_filter_alloc(void* opaque, size_t size) {
+  ngx_pool_t* pool = opaque;
+  void* p;
+
+  p = ngx_palloc(pool, size);
+
+#if (NGX_DEBUG)
+  ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pool->log, 0, "brotli alloc: %p, size:%uz",
+                 p, size);
+#endif
+
+  return p;
+}
+
+static void ngx_http_brotli_filter_free(void* opaque, void* address) {
+  ngx_pool_t* pool = opaque;
+
+#if (NGX_DEBUG)
+  ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pool->log, 0, "brotli free: %p", address);
+#endif
+
+  ngx_pfree(pool, address);
+}
+
+static void ngx_http_brotli_filter_close(ngx_http_brotli_ctx_t* ctx) {
+  ctx->closed = 1;
+  if (ctx->encoder) {
+    BrotliEncoderDestroyInstance(ctx->encoder);
+    ctx->encoder = NULL;
+  }
+  if (ctx->out_chain) {
+    ngx_free_chain(ctx->request->pool, ctx->out_chain);
+    ctx->out_chain = NULL;
+  }
+  if (ctx->out_buf) {
+    ngx_pfree(ctx->request->pool, ctx->out_buf);
+    ctx->out_buf = NULL;
+  }
+}
+
+static ngx_int_t ngx_http_brotli_check_request(ngx_http_request_t* req) {
+  if (req != req->main) return NGX_DECLINED;
+  if (check_accept_encoding(req) != NGX_OK) return NGX_DECLINED;
+  req->gzip_tested = 1;
+  req->gzip_ok = 0;
+  return NGX_OK;
+}
+
+static ngx_int_t ngx_http_brotli_add_variables(ngx_conf_t* cf) {
+  ngx_http_variable_t* var;
+
+  var = ngx_http_add_variable(cf, &ngx_http_brotli_ratio, 0);
+  if (var == NULL) {
+    return NGX_ERROR;
+  }
+
+  var->get_handler = ngx_http_brotli_ratio_variable;
+
+  return NGX_OK;
+}
+
+static ngx_int_t ngx_http_brotli_ratio_variable(ngx_http_request_t* r,
+                                                ngx_http_variable_value_t* v,
+                                                uintptr_t data) {
+  ngx_uint_t ratio_int;
+  ngx_uint_t ratio_frac;
+  ngx_http_brotli_ctx_t* ctx;
+
+  v->valid = 1;
+  v->no_cacheable = 0;
+  v->not_found = 0;
+
+  ctx = ngx_http_get_module_ctx(r, ngx_http_brotli_filter_module);
+
+  /* Only report variable on non-failing streams. */
+  if (ctx == NULL || !ctx->success) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+
+  v->data = ngx_pnalloc(r->pool, NGX_INT32_LEN + 3);
+  if (v->data == NULL) {
+    return NGX_ERROR;
+  }
+
+  ratio_int = (ngx_uint_t)(ctx->bytes_in / ctx->bytes_out);
+  ratio_frac = (ngx_uint_t)((ctx->bytes_in * 100 / ctx->bytes_out) % 100);
+
+  /* Rounding; e.g. 2.125 to 2.13 */
+  if ((ctx->bytes_in * 1000 / ctx->bytes_out) % 10 > 4) {
+    ratio_frac++;
+    if (ratio_frac > 99) {
+      ratio_int++;
+      ratio_frac = 0;
+    }
+  }
+
+  v->len = ngx_sprintf(v->data, "%ui.%02ui", ratio_int, ratio_frac) - v->data;
+
+  return NGX_OK;
+}
+
+static void* ngx_http_brotli_create_conf(ngx_conf_t* cf) {
+  ngx_http_brotli_conf_t* conf;
+
+  conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_brotli_conf_t));
+  if (conf == NULL) {
+    return NULL;
+  }
+
+  /* ngx_pcalloc fills result with zeros ->
+       conf->bufs.num = 0;
+       conf->types = { NULL };
+       conf->types_keys = NULL; */
+
+  conf->enable = NGX_CONF_UNSET;
+
+  conf->quality = NGX_CONF_UNSET;
+  conf->lg_win = NGX_CONF_UNSET_SIZE;
+  conf->min_length = NGX_CONF_UNSET;
+
+  return conf;
+}
+
+static char* ngx_http_brotli_merge_conf(ngx_conf_t* cf, void* parent,
+                                        void* child) {
+  ngx_http_brotli_conf_t* prev = parent;
+  ngx_http_brotli_conf_t* conf = child;
+  char* rc;
+
+  ngx_conf_merge_value(conf->enable, prev->enable, 0);
+
+  ngx_conf_merge_value(conf->quality, prev->quality, 6);
+  ngx_conf_merge_size_value(conf->lg_win, prev->lg_win, 19);
+  ngx_conf_merge_value(conf->min_length, prev->min_length, 20);
+
+  rc = ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
+                            &prev->types_keys, &prev->types,
+                            ngx_http_html_default_types);
+  if (rc != NGX_CONF_OK) {
+    return NGX_CONF_ERROR;
+  }
+
+  return NGX_CONF_OK;
+}
+
+/* Prepend to filter chain. */
+static ngx_int_t ngx_http_brotli_filter_init(ngx_conf_t* cf) {
+  ngx_http_next_header_filter = ngx_http_top_header_filter;
+  ngx_http_top_header_filter = ngx_http_brotli_header_filter;
+
+  ngx_http_next_body_filter = ngx_http_top_body_filter;
+  ngx_http_top_body_filter = ngx_http_brotli_body_filter;
+
+  return NGX_OK;
+}
+
+/* Translate "window size" to window bits (log2), and check bounds. */
+static char* ngx_http_brotli_parse_wbits(ngx_conf_t* cf, void* post,
+                                         void* data) {
+  size_t* parameter = data;
+  size_t bits;
+  size_t wsize;
+
+  for (bits = BROTLI_MIN_WINDOW_BITS; bits <= BROTLI_MAX_WINDOW_BITS; bits++) {
+    wsize = 1u << bits;
+    if (*parameter == wsize) {
+      *parameter = bits;
+      return NGX_CONF_OK;
+    }
+  }
+
+  return "must be 1k, 2k, 4k, 8k, 16k, 32k, 64k, 128k, 256k, 512k, 1m, 2m, 4m, "
+         "8m or 16m";
+}
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-before-test.sh b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-before-test.sh
new file mode 100755
index 0000000..9f69164
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-before-test.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -ex
+
+# Setup shortcuts.
+ROOT=`pwd`
+FILES=$ROOT/script/test
+
+# Setup directory structure.
+cd $ROOT/script
+if [ ! -d test ]; then
+  mkdir test
+fi
+cd test
+if [ ! -d logs ]; then
+  mkdir logs
+fi
+
+# Download sample texts.
+curl --compressed -o $FILES/war-and-peace.txt http://www.gutenberg.org/files/2600/2600-0.txt
+echo "Kot lomom kolol slona!" > $FILES/small.txt
+echo "<html>Kot lomom kolol slona!</html>" > $FILES/small.html
+
+# Restore status-quo.
+cd $ROOT
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-compile.sh b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-compile.sh
new file mode 100755
index 0000000..2fa01d6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-compile.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+set -ex
+
+# Setup shortcuts.
+ROOT=`pwd`
+
+# Clone nginx read-only git repository.
+if [ ! -d "nginx" ]; then
+  git clone https://github.com/nginx/nginx.git
+fi
+
+# Build nginx + filter module.
+cd $ROOT/nginx
+# Pro memoria: --with-debug
+./auto/configure \
+    --prefix=$ROOT/script/test \
+    --with-http_v2_module \
+    --add-module=$ROOT
+make -j 16
+
+# Build brotli CLI.
+cd $ROOT/deps/brotli
+mkdir out
+cd out
+cmake ..
+make -j 16 brotli
+
+# Restore status-quo.
+cd $ROOT
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-test.sh b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-test.sh
new file mode 100755
index 0000000..1db8d15
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/.travis-test.sh
@@ -0,0 +1,168 @@
+#!/bin/bash
+
+# Setup shortcuts.
+ROOT=`pwd`
+NGINX=$ROOT/nginx/objs/nginx
+BROTLI=$ROOT/deps/brotli/out/brotli
+SERVER=http://localhost:8080
+FILES=$ROOT/script/test
+HR="---------------------------------------------------------------------------"
+
+if [ ! -d tmp ]; then
+  mkdir tmp
+fi
+
+rm tmp/*
+
+add_result() {
+  echo $1 >&2
+  echo $1 >> tmp/results.log
+}
+
+get_failed() {
+  echo `cat tmp/results.log | grep -v OK | wc -l`
+}
+
+get_count() {
+  echo `cat tmp/results.log | wc -l`
+}
+
+expect_equal() {
+  expected=$1
+  actual=$2
+  if cmp $expected $actual; then
+    add_result "OK"
+  else
+    add_result "FAIL (equality)"
+  fi
+}
+
+expect_br_equal() {
+  expected=$1
+  actual_br=$2
+  if $BROTLI -dfk ./${actual_br}.br; then
+    expect_equal $expected $actual_br
+  else
+    add_result "FAIL (decompression)"
+  fi
+}
+
+################################################################################
+
+# Start default server.
+echo "Statring NGINX"
+$NGINX -c $ROOT/script/test.conf
+# Fetch vanilla 404 response.
+curl -s -o tmp/notfound.txt $SERVER/notfound
+
+CURL="curl -s"
+
+# Run tests.
+echo $HR
+
+echo "Test: long file with rate limit"
+$CURL -H 'Accept-encoding: br' -o tmp/war-and-peace.br --limit-rate 300K $SERVER/war-and-peace.txt
+expect_br_equal $FILES/war-and-peace.txt tmp/war-and-peace
+
+echo "Test: compressed 404"
+$CURL -H 'Accept-encoding: br' -o tmp/notfound.br $SERVER/notfound
+expect_br_equal tmp/notfound.txt tmp/notfound
+
+echo "Test: A-E: 'gzip, br'"
+$CURL -H 'Accept-encoding: gzip, br' -o tmp/ae-01.br $SERVER/small.txt
+expect_br_equal $FILES/small.txt tmp/ae-01
+
+echo "Test: A-E: 'gzip, br, deflate'"
+$CURL -H 'Accept-encoding: gzip, br, deflate' -o tmp/ae-02.br $SERVER/small.txt
+expect_br_equal $FILES/small.txt tmp/ae-02
+
+echo "Test: A-E: 'gzip, br;q=1, deflate'"
+$CURL -H 'Accept-encoding: gzip, br;q=1, deflate' -o tmp/ae-03.br $SERVER/small.txt
+expect_br_equal $FILES/small.txt tmp/ae-03
+
+echo "Test: A-E: 'br;q=0.001'"
+$CURL -H 'Accept-encoding: br;q=0.001' -o tmp/ae-04.br $SERVER/small.txt
+expect_br_equal $FILES/small.txt tmp/ae-04
+
+echo "Test: A-E: 'bro'"
+$CURL -H 'Accept-encoding: bro' -o tmp/ae-05.txt $SERVER/small.txt
+expect_equal $FILES/small.txt tmp/ae-05.txt
+
+echo "Test: A-E: 'bo'"
+$CURL -H 'Accept-encoding: bo' -o tmp/ae-06.txt $SERVER/small.txt
+expect_equal $FILES/small.txt tmp/ae-06.txt
+
+echo "Test: A-E: 'br;q=0'"
+$CURL -H 'Accept-encoding: br;q=0' -o tmp/ae-07.txt $SERVER/small.txt
+expect_equal $FILES/small.txt tmp/ae-07.txt
+
+echo "Test: A-E: 'br;q=0.'"
+$CURL -H 'Accept-encoding: br;q=0.' -o tmp/ae-08.txt $SERVER/small.txt
+expect_equal $FILES/small.txt tmp/ae-08.txt
+
+echo "Test: A-E: 'br;q=0.0'"
+$CURL -H 'Accept-encoding: br;q=0.0' -o tmp/ae-09.txt $SERVER/small.txt
+expect_equal $FILES/small.txt tmp/ae-09.txt
+
+echo "Test: A-E: 'br;q=0.00'"
+$CURL -H 'Accept-encoding: br;q=0.00' -o tmp/ae-10.txt $SERVER/small.txt
+expect_equal $FILES/small.txt tmp/ae-10.txt
+
+echo "Test: A-E: 'br ; q = 0.000'"
+$CURL -H 'Accept-encoding: br ; q = 0.000' -o tmp/ae-11.txt $SERVER/small.txt
+expect_equal $FILES/small.txt tmp/ae-11.txt
+
+echo "Test: A-E: 'bar'"
+$CURL -H 'Accept-encoding: bar' -o tmp/ae-12.txt $SERVER/small.html
+expect_equal $FILES/small.html tmp/ae-12.txt
+
+echo "Test: A-E: 'b'"
+$CURL -H 'Accept-encoding: b' -o tmp/ae-13.txt $SERVER/small.html
+expect_equal $FILES/small.html tmp/ae-13.txt
+
+echo $HR
+echo "Stopping default NGINX"
+# Stop server.
+$NGINX -c $ROOT/script/test.conf -s stop
+
+################################################################################
+
+# Start default server.
+echo "Statring h2 NGINX"
+$NGINX -c $ROOT/script/test_h2.conf
+
+CURL="curl --http2-prior-knowledge -s"
+
+# Run tests.
+echo $HR
+
+echo "Test: long file with rate limit"
+$CURL -H 'Accept-encoding: br' -o tmp/h2-war-and-peace.br --limit-rate 300K $SERVER/war-and-peace.txt
+expect_br_equal $FILES/war-and-peace.txt tmp/h2-war-and-peace
+
+echo "Test: A-E: 'gzip, br'"
+$CURL -H 'Accept-encoding: gzip, br' -o tmp/h2-ae-01.br $SERVER/small.txt
+expect_br_equal $FILES/small.txt tmp/h2-ae-01
+
+echo "Test: A-E: 'b'"
+$CURL -H 'Accept-encoding: b' -o tmp/h2-ae-13.txt $SERVER/small.html
+expect_equal $FILES/small.html tmp/h2-ae-13.txt
+
+echo $HR
+echo "Stopping h2 NGINX"
+# Stop server.
+$NGINX -c $ROOT/script/test_h2.conf -s stop
+
+################################################################################
+
+# Report.
+
+FAILED=$(get_failed $STATUS)
+COUNT=$(get_count $STATUS)
+echo $HR
+echo "Results: $FAILED of $COUNT tests failed"
+
+# Restore status-quo.
+cd $ROOT
+
+exit $FAILED
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test.conf b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test.conf
new file mode 100644
index 0000000..93957f9
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test.conf
@@ -0,0 +1,32 @@
+events {
+  worker_connections 4;
+}
+
+daemon on;
+error_log /dev/stdout info;
+
+http {
+  access_log ./access.log;
+  error_log ./error.log;
+
+  gzip on;
+  gzip_comp_level 1;
+  gzip_types text/plain text/css;
+
+  brotli on;
+  brotli_comp_level 1;
+  brotli_types text/plain text/css;
+
+  server {
+    listen 8080 default_server;
+    listen [::]:8080 default_server;
+
+    root ./;
+
+    index index.html;
+
+    location / {
+      try_files $uri $uri/ =404;
+    }
+  }
+}
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test_h2.conf b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test_h2.conf
new file mode 100644
index 0000000..0f2c791
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/script/test_h2.conf
@@ -0,0 +1,32 @@
+events {
+  worker_connections 4;
+}
+
+daemon on;
+error_log /dev/stdout info;
+
+http {
+  access_log ./access.log;
+  error_log ./error.log;
+
+  gzip on;
+  gzip_comp_level 1;
+  gzip_types text/plain text/css;
+
+  brotli on;
+  brotli_comp_level 1;
+  brotli_types text/plain text/css;
+
+  server {
+    listen 8080 http2;
+    listen [::]:8080 http2;
+
+    root ./;
+
+    index index.html;
+
+    location / {
+      try_files $uri $uri/ =404;
+    }
+  }
+}
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/config b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/config
new file mode 100644
index 0000000..de07d1c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/config
@@ -0,0 +1,54 @@
+# Copyright (C) 2015-2019 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+if [ "$ngx_addon_name" = "ngx_brotli" ]; then
+  BROTLI_MODULE_SRC_DIR="$ngx_addon_dir/static"
+else
+  BROTLI_MODULE_SRC_DIR="$ngx_addon_dir"
+fi
+
+ngx_addon_name=ngx_brotli_static
+
+if [ -z "$ngx_module_link" ]; then
+cat << END
+
+$0: error: Brotli module requires recent version of NGINX (1.9.11+).
+
+END
+  exit 1
+fi
+
+ngx_module_type=HTTP
+ngx_module_name=ngx_http_brotli_static_module
+ngx_module_incs=
+ngx_module_deps=
+ngx_module_srcs="$BROTLI_MODULE_SRC_DIR/ngx_http_brotli_static_module.c"
+ngx_module_libs=
+ngx_module_order=
+
+. auto/module
+
+have=NGX_HTTP_GZIP . auto/have
+have=NGX_HTTP_BROTLI_STATIC . auto/have
+have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have  # deprecated
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/ngx_http_brotli_static_module.c b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/ngx_http_brotli_static_module.c
new file mode 100644
index 0000000..44f0cb0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/static/ngx_http_brotli_static_module.c
@@ -0,0 +1,323 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ * Copyright (C) Google Inc.
+ */
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+/* >> Configuration */
+
+#define NGX_HTTP_BROTLI_STATIC_OFF 0
+#define NGX_HTTP_BROTLI_STATIC_ON 1
+#define NGX_HTTP_BROTLI_STATIC_ALWAYS 2
+
+typedef struct {
+  ngx_uint_t enable;
+} configuration_t;
+
+static ngx_conf_enum_t kBrotliStaticEnum[] = {
+    {ngx_string("off"), NGX_HTTP_BROTLI_STATIC_OFF},
+    {ngx_string("on"), NGX_HTTP_BROTLI_STATIC_ON},
+    {ngx_string("always"), NGX_HTTP_BROTLI_STATIC_ALWAYS},
+    {ngx_null_string, 0}};
+
+/* << Configuration */
+
+/* >> Forward declarations */
+
+static ngx_int_t handler(ngx_http_request_t* req);
+static void* create_conf(ngx_conf_t* root_cfg);
+static char* merge_conf(ngx_conf_t* root_cfg, void* parent, void* child);
+static ngx_int_t init(ngx_conf_t* root_cfg);
+
+/* << Forward declarations*/
+
+/* >> Module definition */
+
+static ngx_command_t kCommands[] = {
+    {ngx_string("brotli_static"),
+     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF |
+         NGX_CONF_TAKE1,
+     ngx_conf_set_enum_slot, NGX_HTTP_LOC_CONF_OFFSET,
+     offsetof(configuration_t, enable), &kBrotliStaticEnum},
+    ngx_null_command};
+
+static ngx_http_module_t kModuleContext = {
+    NULL, /* preconfiguration */
+    init, /* postconfiguration */
+
+    NULL, /* create main configuration */
+    NULL, /* init main configuration */
+
+    NULL, /* create server configuration */
+    NULL, /* merge server configuration */
+
+    create_conf, /* create location configuration */
+    merge_conf   /* merge location configuration */
+};
+
+ngx_module_t ngx_http_brotli_static_module = {
+    NGX_MODULE_V1,
+    &kModuleContext, /* module context */
+    kCommands,       /* module directives */
+    NGX_HTTP_MODULE, /* module type */
+    NULL,            /* init master */
+    NULL,            /* init module */
+    NULL,            /* init process */
+    NULL,            /* init thread */
+    NULL,            /* exit thread */
+    NULL,            /* exit process */
+    NULL,            /* exit master */
+    NGX_MODULE_V1_PADDING};
+
+/* << Module definition*/
+
+static const u_char kContentEncoding[] = "Content-Encoding";
+static /* const */ char kEncoding[] = "br";
+static const size_t kEncodingLen = 2;
+static /* const */ u_char kSuffix[] = ".br";
+static const size_t kSuffixLen = 3;
+
+static ngx_int_t check_accept_encoding(ngx_http_request_t* req) {
+  ngx_table_elt_t* accept_encoding_entry;
+  ngx_str_t* accept_encoding;
+  u_char* cursor;
+  u_char* end;
+  u_char before;
+  u_char after;
+
+  accept_encoding_entry = req->headers_in.accept_encoding;
+  if (accept_encoding_entry == NULL) return NGX_DECLINED;
+  accept_encoding = &accept_encoding_entry->value;
+
+  cursor = accept_encoding->data;
+  end = cursor + accept_encoding->len;
+  while (1) {
+    u_char digit;
+    /* It would be an idiotic idea to rely on compiler to produce performant
+       binary, that is why we just do -1 at every call site. */
+    cursor = ngx_strcasestrn(cursor, kEncoding, kEncodingLen - 1);
+    if (cursor == NULL) return NGX_DECLINED;
+    before = (cursor == accept_encoding->data) ? ' ' : cursor[-1];
+    cursor += kEncodingLen;
+    after = (cursor >= end) ? ' ' : *cursor;
+    if (before != ',' && before != ' ') continue;
+    if (after != ',' && after != ' ' && after != ';') continue;
+
+    /* Check for ";q=0[.[0[0[0]]]]" */
+    while (*cursor == ' ') cursor++;
+    if (*(cursor++) != ';') break;
+    while (*cursor == ' ') cursor++;
+    if (*(cursor++) != 'q') break;
+    while (*cursor == ' ') cursor++;
+    if (*(cursor++) != '=') break;
+    while (*cursor == ' ') cursor++;
+    if (*(cursor++) != '0') break;
+    if (*(cursor++) != '.') return NGX_DECLINED; /* ;q=0, */
+    digit = *(cursor++);
+    if (digit < '0' || digit > '9') return NGX_DECLINED; /* ;q=0., */
+    if (digit > '0') break;
+    digit = *(cursor++);
+    if (digit < '0' || digit > '9') return NGX_DECLINED; /* ;q=0.0, */
+    if (digit > '0') break;
+    digit = *(cursor++);
+    if (digit < '0' || digit > '9') return NGX_DECLINED; /* ;q=0.00, */
+    if (digit > '0') break;
+    return NGX_DECLINED; /* ;q=0.000 */
+  }
+  return NGX_OK;
+}
+
+/* Test if this request is allowed to have the brotli response. */
+static ngx_int_t check_eligility(ngx_http_request_t* req) {
+  if (req != req->main) return NGX_DECLINED;
+  if (check_accept_encoding(req) != NGX_OK) return NGX_DECLINED;
+  req->gzip_tested = 1;
+  req->gzip_ok = 0;
+  return NGX_OK;
+}
+
+static ngx_int_t handler(ngx_http_request_t* req) {
+  configuration_t* cfg;
+  ngx_int_t rc;
+  u_char* last;
+  ngx_str_t path;
+  size_t root;
+  ngx_log_t* log;
+  ngx_http_core_loc_conf_t* location_cfg;
+  ngx_open_file_info_t file_info;
+  ngx_table_elt_t* content_encoding_entry;
+  ngx_buf_t* buf;
+  ngx_chain_t out;
+
+  /* Only GET and HEAD requensts are supported. */
+  if (!(req->method & (NGX_HTTP_GET | NGX_HTTP_HEAD))) return NGX_DECLINED;
+
+  /* Only files are supported. */
+  if (req->uri.data[req->uri.len - 1] == '/') return NGX_DECLINED;
+
+  /* Get configuration and check if module is disabled. */
+  cfg = ngx_http_get_module_loc_conf(req, ngx_http_brotli_static_module);
+  if (cfg->enable == NGX_HTTP_BROTLI_STATIC_OFF) return NGX_DECLINED;
+
+  if (cfg->enable == NGX_HTTP_BROTLI_STATIC_ALWAYS) {
+    /* Ignore request properties (e.g. Accept-Encoding). */
+  } else {
+    /* NGX_HTTP_BROTLI_STATIC_ON */
+    rc = check_eligility(req);
+    if (rc != NGX_OK) return NGX_DECLINED;
+  }
+
+  /* Get path and append the suffix. */
+  last = ngx_http_map_uri_to_path(req, &path, &root, kSuffixLen);
+  if (last == NULL) return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  /* +1 for reinstating the terminating 0. */
+  ngx_cpystrn(last, kSuffix, kSuffixLen + 1);
+  path.len += kSuffixLen;
+
+  log = req->connection->log;
+  ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http filename: \"%s\"",
+                 path.data);
+
+  /* Prepare to read the file. */
+  location_cfg = ngx_http_get_module_loc_conf(req, ngx_http_core_module);
+  ngx_memzero(&file_info, sizeof(ngx_open_file_info_t));
+  file_info.read_ahead = location_cfg->read_ahead;
+  file_info.directio = location_cfg->directio;
+  file_info.valid = location_cfg->open_file_cache_valid;
+  file_info.min_uses = location_cfg->open_file_cache_min_uses;
+  file_info.errors = location_cfg->open_file_cache_errors;
+  file_info.events = location_cfg->open_file_cache_events;
+  rc = ngx_http_set_disable_symlinks(req, location_cfg, &path, &file_info);
+  if (rc != NGX_OK) return NGX_HTTP_INTERNAL_SERVER_ERROR;
+
+  /* Try to fetch file and process errors. */
+  rc = ngx_open_cached_file(location_cfg->open_file_cache, &path, &file_info,
+                            req->pool);
+  if (rc != NGX_OK) {
+    ngx_uint_t level;
+    switch (file_info.err) {
+      case 0:
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+
+      case NGX_ENOENT:
+      case NGX_ENOTDIR:
+      case NGX_ENAMETOOLONG:
+        return NGX_DECLINED;
+
+#if (NGX_HAVE_OPENAT)
+      case NGX_EMLINK:
+      case NGX_ELOOP:
+#endif
+      case NGX_EACCES:
+        level = NGX_LOG_ERR;
+        break;
+
+      default:
+        level = NGX_LOG_CRIT;
+        break;
+    }
+    ngx_log_error(level, log, file_info.err, "%s \"%s\" failed",
+                  file_info.failed, path.data);
+    return NGX_DECLINED;
+  }
+
+  if (cfg->enable == NGX_HTTP_BROTLI_STATIC_ON) {
+	 req->gzip_vary = 1;
+  }
+
+  /* So far so good. */
+  ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d",
+                 file_info.fd);
+
+  /* Only files are supported. */
+  if (file_info.is_dir) {
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "http dir");
+    return NGX_DECLINED;
+  }
+#if !(NGX_WIN32)
+  if (!file_info.is_file) {
+    ngx_log_error(NGX_LOG_CRIT, log, 0, "\"%s\" is not a regular file",
+                  path.data);
+    return NGX_HTTP_NOT_FOUND;
+  }
+#endif
+
+  /* Prepare request push the body. */
+  req->root_tested = !req->error_page;
+  rc = ngx_http_discard_request_body(req);
+  if (rc != NGX_OK) return rc;
+  log->action = "sending response to client";
+  req->headers_out.status = NGX_HTTP_OK;
+  req->headers_out.content_length_n = file_info.size;
+  req->headers_out.last_modified_time = file_info.mtime;
+  rc = ngx_http_set_etag(req);
+  if (rc != NGX_OK) return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  rc = ngx_http_set_content_type(req);
+  if (rc != NGX_OK) return NGX_HTTP_INTERNAL_SERVER_ERROR;
+
+  /* Set "Content-Encoding" header. */
+  content_encoding_entry = ngx_list_push(&req->headers_out.headers);
+  if (content_encoding_entry == NULL) return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  content_encoding_entry->hash = 1;
+  ngx_str_set(&content_encoding_entry->key, kContentEncoding);
+  ngx_str_set(&content_encoding_entry->value, kEncoding);
+  req->headers_out.content_encoding = content_encoding_entry;
+
+  /* Setup response body. */
+  buf = ngx_pcalloc(req->pool, sizeof(ngx_buf_t));
+  if (buf == NULL) return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  buf->file = ngx_pcalloc(req->pool, sizeof(ngx_file_t));
+  if (buf->file == NULL) return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  buf->file_pos = 0;
+  buf->file_last = file_info.size;
+  buf->in_file = buf->file_last ? 1 : 0;
+  buf->last_buf = (req == req->main) ? 1 : 0;
+  buf->last_in_chain = 1;
+  buf->file->fd = file_info.fd;
+  buf->file->name = path;
+  buf->file->log = log;
+  buf->file->directio = file_info.is_directio;
+  out.buf = buf;
+  out.next = NULL;
+
+  /* Push the response header. */
+  rc = ngx_http_send_header(req);
+  if (rc == NGX_ERROR || rc > NGX_OK || req->header_only) {
+    return rc;
+  }
+
+  /* Push the response body. */
+  return ngx_http_output_filter(req, &out);
+}
+
+static void* create_conf(ngx_conf_t* root_cfg) {
+  configuration_t* cfg;
+  cfg = ngx_palloc(root_cfg->pool, sizeof(configuration_t));
+  if (cfg == NULL) return NULL;
+  cfg->enable = NGX_CONF_UNSET_UINT;
+  return cfg;
+}
+
+static char* merge_conf(ngx_conf_t* root_cfg, void* parent, void* child) {
+  configuration_t* prev = parent;
+  configuration_t* cfg = child;
+  ngx_conf_merge_uint_value(cfg->enable, prev->enable,
+                            NGX_HTTP_BROTLI_STATIC_OFF);
+  return NGX_CONF_OK;
+}
+
+static ngx_int_t init(ngx_conf_t* root_cfg) {
+  ngx_http_core_main_conf_t* core_cfg;
+  ngx_http_handler_pt* handler_slot;
+  core_cfg = ngx_http_conf_get_module_main_conf(root_cfg, ngx_http_core_module);
+  handler_slot =
+      ngx_array_push(&core_cfg->phases[NGX_HTTP_CONTENT_PHASE].handlers);
+  if (handler_slot == NULL) return NGX_ERROR;
+  *handler_slot = handler;
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.astylerc b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.astylerc
new file mode 100644
index 0000000..3c009b3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.astylerc
@@ -0,0 +1,22 @@
+# astylerc
+align-pointer=name
+align-reference=name
+break-after-logical
+#indent=spaces=2
+max-code-length=120
+style=google
+suffix=none
+
+# Indent
+indent-preproc-block
+
+# Padding
+pad-header
+unpad-paren
+
+# Formatting:
+add-brackets
+#convert-tabs
+
+# Output:
+formatted
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.format.sh b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.format.sh
new file mode 100755
index 0000000..75209eb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.format.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Search in the script folder
+pushd "$(dirname $0)" >/dev/null
+CWD="$(pwd -P)"
+popd >/dev/null
+FILES='ngx_cache_purge_module.c'
+
+# The file format in accordance with the style defined in .astylerc
+astyle -v --options='.astylerc' ${FILES} || (echo 'astyle failed'; exit 1);
+
+# To correct this, the issuance dos2unix on each file
+# sometimes adds in Windows as a string-endins (\r\n).
+dos2unix --quiet ${FILES} || (echo 'dos2unix failed'; exit 2);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.gitattributes b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.gitattributes
new file mode 100644
index 0000000..9b27d9f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.gitattributes
@@ -0,0 +1 @@
+*.t linguist-language=Text
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.travis.yml b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.travis.yml
new file mode 100644
index 0000000..3714921
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/.travis.yml
@@ -0,0 +1,49 @@
+sudo: required
+os: linux
+dist: trusty
+language: c
+compiler:
+  - gcc
+  - clang
+cache:
+  apt: true
+  directories:
+    - download-cache
+env:
+  global:
+    - JOBS=4
+    - NGINX_PREFIX=/opt/nginx
+  matrix:
+    - NGINX_VERSION=1.18.0
+    - NGINX_VERSION=1.19.2
+
+before_install:
+  - mkdir --parents download-cache
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq zlib1g-dev libpcre3-dev cpanminus
+  # Get OpenSSL 1.0.2 from Ubuntu Xenial
+  # https://packages.ubuntu.com/xenial-updates/libssl1.0.0
+  - test -f download-cache/libssl1.0.0_1.0.2g-1ubuntu4.16_amd64.deb || wget -O download-cache/libssl1.0.0_1.0.2g-1ubuntu4.17_amd64.deb "http://de.archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.0.0_1.0.2g-1ubuntu4.17_amd64.deb"
+  # https://packages.ubuntu.com/xenial/libssl-dev
+  - test -f download-cache/libssl-dev_1.0.2g-1ubuntu4.16_amd64.deb || wget -O download-cache/libssl-dev_1.0.2g-1ubuntu4.17_amd64.deb "http://de.archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl-dev_1.0.2g-1ubuntu4.17_amd64.deb"
+  - sudo dpkg -i download-cache/libssl*_amd64.deb
+  # Test::Nginx
+  - git clone https://github.com/openresty/test-nginx.git test-nginx
+  - cd test-nginx/ && sudo cpanm . && cd ..
+  # NGINX source
+  - test -f download-cache/nginx-$NGINX_VERSION.tar.gz || wget -O download-cache/nginx-$NGINX_VERSION.tar.gz http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz
+
+install:
+  - tar -xzf download-cache/nginx-${NGINX_VERSION}.tar.gz
+  - cd nginx-${NGINX_VERSION}/
+  - ./configure --prefix=${NGINX_PREFIX} --with-debug --with-http_ssl_module --add-module=${PWD}/..
+  - make -j${JOBS}
+  - sudo make install
+  - cd ..
+  - export PATH="${NGINX_PREFIX}/sbin:$PATH"
+#  - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+
+script:
+  - nginx -V
+  - ldd $(which nginx)
+  - prove t
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/CHANGES b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/CHANGES
new file mode 100644
index 0000000..7495742
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/CHANGES
@@ -0,0 +1,103 @@
+2020-06-27    VERSION 2.5.1
+    * fix: empty key check - it coredumps when cache key is empty, Tuğrul Topuz
+    * fix: purge report calloc fix - Report template has not cache file path but it's length is use in buffer memory allocation, Tuğrul Topuz
+
+2018-08-04    VERSION 2.5
+    * feat/docs: cache_purge_response_type directive, selecting response type (html|json|xml|text)
+    * break: changed status of HTTP code 404 (Not Found) to 412 (Precondition Failed)
+    * fix: remove path information of response body (#4, 3a8c08a, #11)
+
+2020-06-27    VERSION 2.4.3
+    * fix: empty key check - it coredumps when cache key is empty, Tuğrul Topuz
+
+2017-09-28    VERSION 2.4.2
+    * fix: segfault in call to `ngx_read_file` of partial key purge, Frankie Dintino
+    * fix: segfault in `cplcf->conf->purge_all` with separate location syntax, Frankie Dintino
+
+2017-02-21    VERSION 2.4.1
+    * Fix compatibility with nginx-1.11.6+, Sułowicz Paweł
+
+2016-11-20    VERSION 2.4
+    * Fix compatibility with nginx-1.7.12+.
+    * explain the purge logic
+    * feat(purge all): Include option to purge all the cached files
+      This option can be slow if a lot of content is cached, or if the
+      storage used for the cache is slow. But you really should be using
+      RAM as your cache storage.
+    * feat(partial keys): Support partial keys to purge multiple keys.
+      Put an '*' at the end of your purge cache URL.
+      e.g:
+          proxy_cache_key $scheme$host$uri$is_args$args$cookie_JSESSIONID;
+          curl -X PURGE https://example.com/pass*
+      This will remove every cached page whose key cache starting with:
+          httpsexample.com/pass*
+      Be careful not passing any value for the values after the $uri, or put
+      it at the end of your cache key.
+    * Convert a config file to build a dynamic module
+
+2014-12-23    VERSION 2.3
+    * Fix compatibility with nginx-1.7.9+.
+
+2014-12-02    VERSION 2.2
+    * Fix compatibility with nginx-1.7.8+.
+
+2014-05-19
+    * Fix build on Solaris with SunCC (Solaris Studio).
+      Reported by Jussi Sallinen.
+
+2013-03-19    VERSION 2.1
+    * When enabled, cache purge will now catch all requests with
+      PURGE (or specified) method, even if cache isn't configured.
+      Previously, it would pass such requests to the upstream.
+
+2012-12-07    VERSION 2.0
+    * Add alternative "same location" syntax.
+      From CloudFlare.
+
+2012-07-02    VERSION 1.6
+    * Fix compatibility with nginx-1.3.2+.
+      Reported by MagicBear, patch from Ruslan Ermilov.
+
+2011-12-20    VERSION 1.5
+    * Fix on-disk cache size calculation.
+      Since the initial release, recorded on-disk cache size was
+      decreased twice for purged content (once during cache purge
+      and once during subsequent cache update).
+      This resulted in recorded on-disk cache size being much
+      smaller than in reality, which could lead to on-disk cache
+      outgrowing defined "max_size" parameter.
+      Patch from Pyry Hakulinen.
+
+2011-10-05    VERSION 1.4
+    * Add AIO support.
+      Requested by Emin Hasanov.
+
+2011-05-03    VERSION 1.3
+    * Fix compatibility with nginx-1.0.1.
+      Reported by Sergey A. Osokin and Markus Linnala.
+
+2010-08-29
+    * Fix compatibility with nginx-0.8.0 and versions older than
+      nginx-0.7.60.
+
+2010-08-11    VERSION 1.2
+    * Fix various build scenarios with disabled upstream modules.
+      Reported by Johan Bergstroem.
+
+    * Add ability to purge content from SCGI's cache.
+      Requested by Johan Bergstroem.
+
+2010-06-08    VERSION 1.1
+    * Fix compatibility with nginx-0.8.40+.
+
+    * Add ability to purge content from uWSGI's cache.
+
+2010-01-10    VERSION 1.0
+    * Initial module release.
+
+2009-11-17
+    * Fix patch compatibility with nginx-0.8.11+.
+      Reported by Bing Ran.
+
+2009-08-11
+    * Initial patch release.
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/LICENSE b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/LICENSE
new file mode 100644
index 0000000..0047538
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2009-2014, FRiCKLE <info@frickle.com>
+Copyright (c) 2009-2014, Piotr Sikora <piotr.sikora@frickle.com>
+All rights reserved.
+
+This project was fully funded by yo.se.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/README.md b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/README.md
new file mode 100644
index 0000000..e3d92b4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/README.md
@@ -0,0 +1,283 @@
+About
+=====
+`ngx_cache_purge` is `nginx` module which adds ability to purge content from
+`FastCGI`, `proxy`, `SCGI` and `uWSGI` caches. A purge operation removes the 
+content with the same cache key as the purge request has.
+
+
+Sponsors
+========
+Work on the original patch was fully funded by [yo.se](http://yo.se).
+
+
+Status
+======
+This module is production-ready.
+
+
+Configuration directives (same location syntax)
+===============================================
+fastcgi_cache_purge
+-------------------
+* **syntax**: `fastcgi_cache_purge on|off|<method> [purge_all] [from all|<ip> [.. <ip>]]`
+* **default**: `none`
+* **context**: `http`, `server`, `location`
+
+Allow purging of selected pages from `FastCGI`'s cache.
+
+
+proxy_cache_purge
+-----------------
+* **syntax**: `proxy_cache_purge on|off|<method> [purge_all] [from all|<ip> [.. <ip>]]`
+* **default**: `none`
+* **context**: `http`, `server`, `location`
+
+Allow purging of selected pages from `proxy`'s cache.
+
+
+scgi_cache_purge
+----------------
+* **syntax**: `scgi_cache_purge on|off|<method> [purge_all] [from all|<ip> [.. <ip>]]`
+* **default**: `none`
+* **context**: `http`, `server`, `location`
+
+Allow purging of selected pages from `SCGI`'s cache.
+
+
+uwsgi_cache_purge
+-----------------
+* **syntax**: `uwsgi_cache_purge on|off|<method> [purge_all] [from all|<ip> [.. <ip>]]`
+* **default**: `none`
+* **context**: `http`, `server`, `location`
+
+Allow purging of selected pages from `uWSGI`'s cache.
+
+
+Configuration directives (separate location syntax)
+===================================================
+fastcgi_cache_purge
+-------------------
+* **syntax**: `fastcgi_cache_purge zone_name key`
+* **default**: `none`
+* **context**: `location`
+
+Sets area and key used for purging selected pages from `FastCGI`'s cache.
+
+
+proxy_cache_purge
+-----------------
+* **syntax**: `proxy_cache_purge zone_name key`
+* **default**: `none`
+* **context**: `location`
+
+Sets area and key used for purging selected pages from `proxy`'s cache.
+
+
+scgi_cache_purge
+----------------
+* **syntax**: `scgi_cache_purge zone_name key`
+* **default**: `none`
+* **context**: `location`
+
+Sets area and key used for purging selected pages from `SCGI`'s cache.
+
+
+uwsgi_cache_purge
+-----------------
+* **syntax**: `uwsgi_cache_purge zone_name key`
+* **default**: `none`
+* **context**: `location`
+
+Sets area and key used for purging selected pages from `uWSGI`'s cache.
+
+Configuration directives (Optional)
+===================================================
+
+cache_purge_response_type
+-----------------
+* **syntax**: `cache_purge_response_type html|json|xml|text`
+* **default**: `html`
+* **context**: `http`, `server`, `location`
+
+Sets a response type of purging result.
+
+
+
+Partial Keys
+============
+Sometimes it's not possible to pass the exact key cache to purge a page. For example; when the content of a cookie or the params are part of the key.
+You can specify a partial key adding an asterisk at the end of the URL.
+
+    curl -X PURGE /page*
+
+The asterisk must be the last character of the key, so you **must** put the $uri variable at the end.
+
+
+
+Sample configuration (same location syntax)
+===========================================
+    http {
+        proxy_cache_path  /tmp/cache  keys_zone=tmpcache:10m;
+
+        server {
+            location / {
+                proxy_pass         http://127.0.0.1:8000;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$uri$is_args$args";
+                proxy_cache_purge  PURGE from 127.0.0.1;
+            }
+        }
+    }
+
+
+Sample configuration (same location syntax - purge all cached files)
+====================================================================
+    http {
+        proxy_cache_path  /tmp/cache  keys_zone=tmpcache:10m;
+
+        server {
+            location / {
+                proxy_pass         http://127.0.0.1:8000;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$uri$is_args$args";
+                proxy_cache_purge  PURGE purge_all from 127.0.0.1 192.168.0.0/8;
+            }
+        }
+    }
+
+
+Sample configuration (separate location syntax)
+===============================================
+    http {
+        proxy_cache_path  /tmp/cache  keys_zone=tmpcache:10m;
+
+        server {
+            location / {
+                proxy_pass         http://127.0.0.1:8000;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$uri$is_args$args";
+            }
+
+            location ~ /purge(/.*) {
+                allow              127.0.0.1;
+                deny               all;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$1$is_args$args";
+            }
+        }
+    }
+
+Sample configuration (Optional)
+===============================================
+    http {
+        proxy_cache_path  /tmp/cache  keys_zone=tmpcache:10m;
+
+        cache_purge_response_type text;
+
+        server {
+
+            cache_purge_response_type json;
+
+            location / { #json
+                proxy_pass         http://127.0.0.1:8000;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$uri$is_args$args";
+            }
+
+            location ~ /purge(/.*) { #xml
+                allow              127.0.0.1;
+                deny               all;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$1$is_args$args";
+                cache_purge_response_type xml;
+            }
+
+            location ~ /purge2(/.*) { # json
+                allow              127.0.0.1;
+                deny               all;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$1$is_args$args";
+            }
+        }
+
+        server {
+
+            location / { #text
+                proxy_pass         http://127.0.0.1:8000;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$uri$is_args$args";
+            }
+
+            location ~ /purge(/.*) { #text
+                allow              127.0.0.1;
+                deny               all;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$1$is_args$args";
+            }
+
+            location ~ /purge2(/.*) { #html
+                allow              127.0.0.1;
+                deny               all;
+                proxy_cache        tmpcache;
+                proxy_cache_key    "$1$is_args$args";
+                cache_purge_response_type html;
+            }
+        }
+    }
+
+
+
+Solve problems
+==============
+* Enabling [`gzip_vary`](https://nginx.org/r/gzip_vary) can lead to different results when clearing, when enabling it, you may have problems clearing the cache. For reliable operation, you can disable [`gzip_vary`](https://nginx.org/r/gzip_vary) inside the location [#20](https://github.com/nginx-modules/ngx_cache_purge/issues/20).
+
+
+Testing
+=======
+`ngx_cache_purge` comes with complete test suite based on [Test::Nginx](http://github.com/agentzh/test-nginx).
+
+You can test it by running:
+
+`$ prove`
+
+
+License
+=======
+    Copyright (c) 2009-2014, FRiCKLE <info@frickle.com>
+    Copyright (c) 2009-2014, Piotr Sikora <piotr.sikora@frickle.com>
+    All rights reserved.
+
+    This project was fully funded by yo.se.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+See also
+========
+- [ngx_slowfs_cache](http://github.com/FRiCKLE/ngx_slowfs_cache).
+- http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#purger
+- http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_cache_purge
+- https://github.com/wandenberg/nginx-selective-cache-purge-module
+- https://github.com/wandenberg/nginx-sorted-querystring-module
+- https://github.com/ledgetech/ledge
+- [Faking Surrogate Cache-Keys for Nginx Plus](https://www.innoq.com/en/blog/faking-surrogate-cache-keys-for-nginx-plus/) ([gist](https://gist.github.com/titpetric/2f142e89eaa0f36ba4e4383b16d61474))
+- [Delete NGINX cached md5 items with a PURGE with wildcard support](https://gist.github.com/nosun/0cfb58d3164f829e2f027fd37b338ede)
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/config b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/config
new file mode 100644
index 0000000..b900680
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/config
@@ -0,0 +1,31 @@
+if [ "$HTTP_PROXY" = "YES" ]; then
+    have=NGX_HTTP_PROXY . auto/have
+fi
+
+if [ "$HTTP_FASTCGI" = "YES" ]; then
+    have=NGX_HTTP_FASTCGI . auto/have
+fi
+
+if [ "$HTTP_SCGI" = "YES" ]; then
+    have=NGX_HTTP_SCGI . auto/have
+fi
+
+if [ "$HTTP_UWSGI" = "YES" ]; then
+    have=NGX_HTTP_UWSGI . auto/have
+fi
+
+ngx_addon_name=ngx_http_cache_purge_module
+CACHE_PURGE_SRCS="$ngx_addon_dir/ngx_cache_purge_module.c"
+
+if [ -n "$ngx_module_link" ]; then
+    ngx_module_type=HTTP
+    ngx_module_name="$ngx_addon_name"
+    ngx_module_srcs="$CACHE_PURGE_SRCS"
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $CACHE_PURGE_SRCS"
+fi
+
+have=NGX_CACHE_PURGE_MODULE . auto/have
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/changelog b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/changelog
new file mode 100644
index 0000000..9e03744
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/changelog
@@ -0,0 +1,74 @@
+libnginx-mod-http-cache-purge (1:2.5.3-3) unstable; urgency=medium
+
+  * d/control: update my email to janmojzis@debian.org
+  * d/copyright: update my email to janmojzis@debian.org
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/copyright: bump debian/* copyright year
+  * d/watch: use more generic template
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 11 Apr 2025 14:26:56 +0200
+
+libnginx-mod-http-cache-purge (1:2.5.3-2) unstable; urgency=medium
+
+  * d/changelog fix closed bug number 1019003 -> 1055742 (Closes: 1055742)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 21 Jun 2024 19:34:05 +0200
+
+libnginx-mod-http-cache-purge (1:2.5.3-1) unstable; urgency=medium
+
+  * switch to a new upstream
+    https://github.com/nginx-modules/ngx_cache_purge
+    (Closes: 1072836) (Closes: 1055742)
+  * d/p/dynamic-module.patch remove, fixed in upstream
+  * d/p/segfault-1.11.6.patch remove, fixed in upstream
+  * d/t/purgetest added
+  * d/copyright: bump my copyright year
+  * d/gbp.conf: add [pull] track-missing = True
+  * d/control: bump Standards-Version: 4.7.0, no changes
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 21 Jun 2024 13:36:53 +0200
+
+libnginx-mod-http-cache-purge (1:2.3-6) unstable; urgency=medium
+
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 15:31:25 +0200
+
+libnginx-mod-http-cache-purge (1:2.3-5) unstable; urgency=medium
+
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:16:35 +0200
+
+libnginx-mod-http-cache-purge (1:2.3-4) unstable; urgency=medium
+
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/gbb.conf: switched to debian branch main (debian-branch = main)
+  * d/copyright: bump my copyright year
+  * d/copyright: reformat text to be compatible with 'cme update dpkg-copyright'
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:14 +0100
+
+libnginx-mod-http-cache-purge (1:2.3-3) unstable; urgency=medium
+
+  * d/copyright: fixed typo (empty line ngx_cache_purge_module.c)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 14:50:48 +0100
+
+libnginx-mod-http-cache-purge (1:2.3-2) experimental; urgency=medium
+
+  * d/control: added Multi-Arch: foreign
+  * d/copyright: add Igor Sysoev + Nginx, Inc.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 05 Dec 2022 21:15:13 +0100
+
+libnginx-mod-http-cache-purge (1:2.3-1) experimental; urgency=medium
+
+  * Initial release. (Closes: 1024213)
+  * Additional info: The separate package libnginx-mod-http-cache-purge ships
+    newest version of ngx_cache_purge (Closes: 911099)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 14:46:45 +0100
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/control b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/control
new file mode 100644
index 0000000..3936731
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/control
@@ -0,0 +1,23 @@
+Source: libnginx-mod-http-cache-purge
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jan Mojžíš <janmojzis@debian.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+Standards-Version: 4.7.2
+Homepage: https://github.com/FRiCKLE/ngx_cache_purge
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-cache-purge.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-cache-purge
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-cache-purge
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: Purge content from Nginx caches
+ Cache Purge module adds purging capabilities to Nginx. It allows purging
+ content from caches used by all of Nginx proxy modules, like FastCGI, Proxy,
+ SCGI and uWSGI.
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/copyright b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/copyright
new file mode 100644
index 0000000..a0ef36d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/copyright
@@ -0,0 +1,36 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ngx_cache_purge
+Upstream-Contact: FRiCKLE <info@frickle.com>
+Source: https://github.com/FRiCKLE/ngx_cache_purge
+
+Files: *
+Copyright: 2009-2014, Piotr Sikora <piotr.sikora@frickle.com>
+ 2009-2014, FRiCKLE <info@frickle.com>
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022, Miao Wang <shankerwangmiao@gmail.com>
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-2-clause
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/gbp.conf b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/gbp.conf
new file mode 100644
index 0000000..97cd209
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/gbp.conf
@@ -0,0 +1,12 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
+
+[pull]
+track-missing = True
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/rules b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/source/format b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/control b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/control
new file mode 100644
index 0000000..dd4e1a3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/control
@@ -0,0 +1,13 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
+
+Tests: purgetest
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/generic b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/purgetest b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/purgetest
new file mode 100644
index 0000000..1574080
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/tests/purgetest
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+cat <<EOF > "/etc/nginx/sites-enabled/default"
+proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
+proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
+
+server {
+    listen 127.0.0.1:80 default_server;
+
+    location /proxy {
+        proxy_pass         \$scheme://127.0.0.1:\$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    \$uri\$is_args\$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status \$upstream_cache_status;
+    }
+
+    location ~ /purge(/.*) {
+        proxy_cache_purge  test_cache \$1\$is_args\$args;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+}
+EOF
+
+nginx -t
+invoke-rc.d nginx restart || { journalctl -n all -xu nginx.service; exit 1; }
+
+curl --fail -s -o /dev/null -w "GET key: %{http_code}\n" http://127.0.0.1/proxy/passwd
+curl --fail -s -o /dev/null -w "PURGE existing key: %{http_code}\n" -X PURGE http://127.0.0.1/purge/proxy/passwd
+curl -s -o /dev/null -w "PURGE non-existing key: %{http_code}\n" -X PURGE http://127.0.0.1/purge/proxy/passwd
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/upstream/metadata b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/upstream/metadata
new file mode 100644
index 0000000..ca2631c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/FRiCKLE/ngx_cache_purge/issues
+Bug-Submit: https://github.com/FRiCKLE/ngx_cache_purge/issues/new
+Repository-Browse: https://github.com/FRiCKLE/ngx_cache_purge
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/watch b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/watch
new file mode 100644
index 0000000..11bd9bf
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/debian/watch
@@ -0,0 +1,6 @@
+version=4
+opts="\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/nginx-modules/ngx_cache_purge/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/ngx_cache_purge_module.c b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/ngx_cache_purge_module.c
new file mode 100644
index 0000000..251d3fe
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/ngx_cache_purge_module.c
@@ -0,0 +1,2163 @@
+/*
+ * Copyright (c) 2009-2014, FRiCKLE <info@frickle.com>
+ * Copyright (c) 2009-2014, Piotr Sikora <piotr.sikora@frickle.com>
+ * All rights reserved.
+ *
+ * This project was fully funded by yo.se.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <ngx_config.h>
+#include <nginx.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+#ifndef nginx_version
+    #error This module cannot be build against an unknown nginx version.
+#endif
+
+#define NGX_REPONSE_TYPE_HTML 1
+#define NGX_REPONSE_TYPE_XML  2
+#define NGX_REPONSE_TYPE_JSON 3
+#define NGX_REPONSE_TYPE_TEXT 4
+
+static const char ngx_http_cache_purge_content_type_json[] = "application/json";
+static const char ngx_http_cache_purge_content_type_html[] = "text/html";
+static const char ngx_http_cache_purge_content_type_xml[]  = "text/xml";
+static const char ngx_http_cache_purge_content_type_text[] = "text/plain";
+
+static size_t ngx_http_cache_purge_content_type_json_size = sizeof(ngx_http_cache_purge_content_type_json);
+static size_t ngx_http_cache_purge_content_type_html_size = sizeof(ngx_http_cache_purge_content_type_html);
+static size_t ngx_http_cache_purge_content_type_xml_size = sizeof(ngx_http_cache_purge_content_type_xml);
+static size_t ngx_http_cache_purge_content_type_text_size = sizeof(ngx_http_cache_purge_content_type_text);
+
+static const char ngx_http_cache_purge_body_templ_json[] = "{\"Key\": \"%s\"}";
+static const char ngx_http_cache_purge_body_templ_html[] = "<html><head><title>Successful purge</title></head><body bgcolor=\"white\"><center><h1>Successful purge</h1><p>Key : %s</p></center></body></html>";
+static const char ngx_http_cache_purge_body_templ_xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><status><Key><![CDATA[%s]]></Key></status>";
+static const char ngx_http_cache_purge_body_templ_text[] = "Key:%s\n";
+
+static size_t ngx_http_cache_purge_body_templ_json_size = sizeof(ngx_http_cache_purge_body_templ_json);
+static size_t ngx_http_cache_purge_body_templ_html_size = sizeof(ngx_http_cache_purge_body_templ_html);
+static size_t ngx_http_cache_purge_body_templ_xml_size = sizeof(ngx_http_cache_purge_body_templ_xml);
+static size_t ngx_http_cache_purge_body_templ_text_size = sizeof(ngx_http_cache_purge_body_templ_text);
+
+#if (NGX_HTTP_CACHE)
+
+typedef struct {
+    ngx_flag_t                    enable;
+    ngx_str_t                     method;
+    ngx_flag_t                    purge_all;
+    ngx_array_t                  *access;   /* array of ngx_in_cidr_t */
+    ngx_array_t                  *access6;  /* array of ngx_in6_cidr_t */
+} ngx_http_cache_purge_conf_t;
+
+typedef struct {
+# if (NGX_HTTP_FASTCGI)
+    ngx_http_cache_purge_conf_t   fastcgi;
+# endif /* NGX_HTTP_FASTCGI */
+# if (NGX_HTTP_PROXY)
+    ngx_http_cache_purge_conf_t   proxy;
+# endif /* NGX_HTTP_PROXY */
+# if (NGX_HTTP_SCGI)
+    ngx_http_cache_purge_conf_t   scgi;
+# endif /* NGX_HTTP_SCGI */
+# if (NGX_HTTP_UWSGI)
+    ngx_http_cache_purge_conf_t   uwsgi;
+# endif /* NGX_HTTP_UWSGI */
+
+    ngx_http_cache_purge_conf_t  *conf;
+    ngx_http_handler_pt           handler;
+    ngx_http_handler_pt           original_handler;
+
+    ngx_uint_t                    resptype; /* response content-type */
+} ngx_http_cache_purge_loc_conf_t;
+
+# if (NGX_HTTP_FASTCGI)
+char       *ngx_http_fastcgi_cache_purge_conf(ngx_conf_t *cf,
+        ngx_command_t *cmd, void *conf);
+ngx_int_t   ngx_http_fastcgi_cache_purge_handler(ngx_http_request_t *r);
+# endif /* NGX_HTTP_FASTCGI */
+
+# if (NGX_HTTP_PROXY)
+char       *ngx_http_proxy_cache_purge_conf(ngx_conf_t *cf,
+        ngx_command_t *cmd, void *conf);
+ngx_int_t   ngx_http_proxy_cache_purge_handler(ngx_http_request_t *r);
+# endif /* NGX_HTTP_PROXY */
+
+# if (NGX_HTTP_SCGI)
+char       *ngx_http_scgi_cache_purge_conf(ngx_conf_t *cf,
+        ngx_command_t *cmd, void *conf);
+ngx_int_t   ngx_http_scgi_cache_purge_handler(ngx_http_request_t *r);
+# endif /* NGX_HTTP_SCGI */
+
+# if (NGX_HTTP_UWSGI)
+char       *ngx_http_uwsgi_cache_purge_conf(ngx_conf_t *cf,
+        ngx_command_t *cmd, void *conf);
+ngx_int_t   ngx_http_uwsgi_cache_purge_handler(ngx_http_request_t *r);
+# endif /* NGX_HTTP_UWSGI */
+
+char        *ngx_http_cache_purge_response_type_conf(ngx_conf_t *cf, 
+                ngx_command_t *cmd, void *conf);
+static ngx_int_t
+ngx_http_purge_file_cache_noop(ngx_tree_ctx_t *ctx, ngx_str_t *path);
+static ngx_int_t
+ngx_http_purge_file_cache_delete_file(ngx_tree_ctx_t *ctx, ngx_str_t *path);
+
+ngx_int_t   ngx_http_cache_purge_access_handler(ngx_http_request_t *r);
+ngx_int_t   ngx_http_cache_purge_access(ngx_array_t *a, ngx_array_t *a6,
+                                        struct sockaddr *s);
+
+ngx_int_t   ngx_http_cache_purge_send_response(ngx_http_request_t *r);
+# if (nginx_version >= 1007009)
+ngx_int_t   ngx_http_cache_purge_cache_get(ngx_http_request_t *r,
+        ngx_http_upstream_t *u, ngx_http_file_cache_t **cache);
+# endif /* nginx_version >= 1007009 */
+ngx_int_t   ngx_http_cache_purge_init(ngx_http_request_t *r,
+                                      ngx_http_file_cache_t *cache, ngx_http_complex_value_t *cache_key);
+void        ngx_http_cache_purge_handler(ngx_http_request_t *r);
+
+ngx_int_t   ngx_http_file_cache_purge(ngx_http_request_t *r);
+
+
+void        ngx_http_cache_purge_all(ngx_http_request_t *r, ngx_http_file_cache_t *cache);
+void        ngx_http_cache_purge_partial(ngx_http_request_t *r, ngx_http_file_cache_t *cache);
+ngx_int_t   ngx_http_cache_purge_is_partial(ngx_http_request_t *r);
+
+char       *ngx_http_cache_purge_conf(ngx_conf_t *cf,
+                                      ngx_http_cache_purge_conf_t *cpcf);
+
+void       *ngx_http_cache_purge_create_loc_conf(ngx_conf_t *cf);
+char       *ngx_http_cache_purge_merge_loc_conf(ngx_conf_t *cf,
+        void *parent, void *child);
+
+static ngx_command_t  ngx_http_cache_purge_module_commands[] = {
+
+# if (NGX_HTTP_FASTCGI)
+    {
+        ngx_string("fastcgi_cache_purge"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+        ngx_http_fastcgi_cache_purge_conf,
+        NGX_HTTP_LOC_CONF_OFFSET,
+        0,
+        NULL
+    },
+# endif /* NGX_HTTP_FASTCGI */
+
+# if (NGX_HTTP_PROXY)
+    {
+        ngx_string("proxy_cache_purge"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+        ngx_http_proxy_cache_purge_conf,
+        NGX_HTTP_LOC_CONF_OFFSET,
+        0,
+        NULL
+    },
+# endif /* NGX_HTTP_PROXY */
+
+# if (NGX_HTTP_SCGI)
+    {
+        ngx_string("scgi_cache_purge"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+        ngx_http_scgi_cache_purge_conf,
+        NGX_HTTP_LOC_CONF_OFFSET,
+        0,
+        NULL
+    },
+# endif /* NGX_HTTP_SCGI */
+
+# if (NGX_HTTP_UWSGI)
+    {
+        ngx_string("uwsgi_cache_purge"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+        ngx_http_uwsgi_cache_purge_conf,
+        NGX_HTTP_LOC_CONF_OFFSET,
+        0,
+        NULL
+    },
+# endif /* NGX_HTTP_UWSGI */
+
+
+    { ngx_string("cache_purge_response_type"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_cache_purge_response_type_conf,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    ngx_null_command
+};
+
+static ngx_http_module_t  ngx_http_cache_purge_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    ngx_http_cache_purge_create_loc_conf,  /* create location configuration */
+    ngx_http_cache_purge_merge_loc_conf    /* merge location configuration */
+};
+
+ngx_module_t  ngx_http_cache_purge_module = {
+    NGX_MODULE_V1,
+    &ngx_http_cache_purge_module_ctx,      /* module context */
+    ngx_http_cache_purge_module_commands,  /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+# if (NGX_HTTP_FASTCGI)
+extern ngx_module_t  ngx_http_fastcgi_module;
+
+#  if (nginx_version >= 1007009)
+
+typedef struct {
+    ngx_array_t                    caches;  /* ngx_http_file_cache_t * */
+} ngx_http_fastcgi_main_conf_t;
+
+#  endif /* nginx_version >= 1007009 */
+
+#  if (nginx_version >= 1007008)
+
+typedef struct {
+    ngx_array_t                   *flushes;
+    ngx_array_t                   *lengths;
+    ngx_array_t                   *values;
+    ngx_uint_t                     number;
+    ngx_hash_t                     hash;
+} ngx_http_fastcgi_params_t;
+
+#  endif /* nginx_version >= 1007008 */
+
+typedef struct {
+    ngx_http_upstream_conf_t       upstream;
+
+    ngx_str_t                      index;
+
+#  if (nginx_version >= 1007008)
+    ngx_http_fastcgi_params_t      params;
+    ngx_http_fastcgi_params_t      params_cache;
+#  else
+    ngx_array_t                   *flushes;
+    ngx_array_t                   *params_len;
+    ngx_array_t                   *params;
+#  endif /* nginx_version >= 1007008 */
+
+    ngx_array_t                   *params_source;
+    ngx_array_t                   *catch_stderr;
+
+    ngx_array_t                   *fastcgi_lengths;
+    ngx_array_t                   *fastcgi_values;
+
+#  if (nginx_version >= 8040) && (nginx_version < 1007008)
+    ngx_hash_t                     headers_hash;
+    ngx_uint_t                     header_params;
+#  endif /* nginx_version >= 8040 && nginx_version < 1007008 */
+
+#  if (nginx_version >= 1001004)
+    ngx_flag_t                     keep_conn;
+#  endif /* nginx_version >= 1001004 */
+
+    ngx_http_complex_value_t       cache_key;
+
+#  if (NGX_PCRE)
+    ngx_regex_t                   *split_regex;
+    ngx_str_t                      split_name;
+#  endif /* NGX_PCRE */
+} ngx_http_fastcgi_loc_conf_t;
+
+char *
+ngx_http_fastcgi_cache_purge_conf(ngx_conf_t *cf, ngx_command_t *cmd,
+                                  void *conf) {
+    ngx_http_compile_complex_value_t   ccv;
+    ngx_http_cache_purge_loc_conf_t   *cplcf;
+    ngx_http_core_loc_conf_t          *clcf;
+    ngx_http_fastcgi_loc_conf_t       *flcf;
+    ngx_str_t                         *value;
+#  if (nginx_version >= 1007009)
+    ngx_http_complex_value_t           cv;
+#  endif /* nginx_version >= 1007009 */
+
+    cplcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_cache_purge_module);
+
+    /* check for duplicates / collisions */
+    if (cplcf->fastcgi.enable != NGX_CONF_UNSET) {
+        return "is duplicate";
+    }
+
+    if (cf->args->nelts != 3) {
+        return ngx_http_cache_purge_conf(cf, &cplcf->fastcgi);
+    }
+
+    if (cf->cmd_type & (NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF)) {
+        return "(separate location syntax) is not allowed here";
+    }
+
+    flcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_fastcgi_module);
+
+#  if (nginx_version >= 1007009)
+    if (flcf->upstream.cache > 0)
+#  else
+    if (flcf->upstream.cache != NGX_CONF_UNSET_PTR
+            && flcf->upstream.cache != NULL)
+#  endif /* nginx_version >= 1007009 */
+    {
+        return "is incompatible with \"fastcgi_cache\"";
+    }
+
+    if (flcf->upstream.upstream || flcf->fastcgi_lengths) {
+        return "is incompatible with \"fastcgi_pass\"";
+    }
+
+    if (flcf->upstream.store > 0
+#  if (nginx_version < 1007009)
+            || flcf->upstream.store_lengths
+#  endif /* nginx_version >= 1007009 */
+       ) {
+        return "is incompatible with \"fastcgi_store\"";
+    }
+
+    value = cf->args->elts;
+
+    /* set fastcgi_cache part */
+#  if (nginx_version >= 1007009)
+
+    flcf->upstream.cache = 1;
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &cv;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cv.lengths != NULL) {
+
+        flcf->upstream.cache_value = ngx_palloc(cf->pool,
+                                                sizeof(ngx_http_complex_value_t));
+        if (flcf->upstream.cache_value == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *flcf->upstream.cache_value = cv;
+
+    } else {
+
+        flcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
+                                    &ngx_http_fastcgi_module);
+        if (flcf->upstream.cache_zone == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+#  else
+
+    flcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0,
+                           &ngx_http_fastcgi_module);
+    if (flcf->upstream.cache == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+#  endif /* nginx_version >= 1007009 */
+
+    /* set fastcgi_cache_key part */
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[2];
+    ccv.complex_value = &flcf->cache_key;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    /* set handler */
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
+    cplcf->fastcgi.enable = 0;
+    cplcf->conf = &cplcf->fastcgi;
+    clcf->handler = ngx_http_fastcgi_cache_purge_handler;
+
+    return NGX_CONF_OK;
+}
+
+ngx_int_t
+ngx_http_fastcgi_cache_purge_handler(ngx_http_request_t *r) {
+    ngx_http_file_cache_t               *cache;
+    ngx_http_fastcgi_loc_conf_t         *flcf;
+    ngx_http_cache_purge_loc_conf_t     *cplcf;
+#  if (nginx_version >= 1007009)
+    ngx_http_fastcgi_main_conf_t        *fmcf;
+    ngx_int_t                           rc;
+#  endif /* nginx_version >= 1007009 */
+
+    if (ngx_http_upstream_create(r) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module);
+
+    r->upstream->conf = &flcf->upstream;
+
+#  if (nginx_version >= 1007009)
+
+    fmcf = ngx_http_get_module_main_conf(r, ngx_http_fastcgi_module);
+
+    r->upstream->caches = &fmcf->caches;
+
+    rc = ngx_http_cache_purge_cache_get(r, r->upstream, &cache);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+#  else
+
+    cache = flcf->upstream.cache->data;
+
+#  endif /* nginx_version >= 1007009 */
+
+    if (ngx_http_cache_purge_init(r, cache, &flcf->cache_key) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    /* Purge-all option */
+    cplcf = ngx_http_get_module_loc_conf(r, ngx_http_cache_purge_module);
+    if (cplcf->conf->purge_all) {
+        ngx_http_cache_purge_all(r, cache);
+    } else {
+        if (ngx_http_cache_purge_is_partial(r)) {
+            ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                          "http file cache purge with partial enabled");
+
+            ngx_http_cache_purge_partial(r, cache);
+        }
+    }
+
+#  if (nginx_version >= 8011)
+    r->main->count++;
+#  endif
+
+    ngx_http_cache_purge_handler(r);
+
+    return NGX_DONE;
+}
+# endif /* NGX_HTTP_FASTCGI */
+
+# if (NGX_HTTP_PROXY)
+extern ngx_module_t  ngx_http_proxy_module;
+
+typedef struct {
+    ngx_str_t                      key_start;
+    ngx_str_t                      schema;
+    ngx_str_t                      host_header;
+    ngx_str_t                      port;
+    ngx_str_t                      uri;
+} ngx_http_proxy_vars_t;
+
+#  if (nginx_version >= 1007009)
+
+typedef struct {
+    ngx_array_t                    caches;  /* ngx_http_file_cache_t * */
+} ngx_http_proxy_main_conf_t;
+
+#  endif /* nginx_version >= 1007009 */
+
+#  if (nginx_version >= 1007008)
+
+typedef struct {
+    ngx_array_t                   *flushes;
+    ngx_array_t                   *lengths;
+    ngx_array_t                   *values;
+    ngx_hash_t                     hash;
+} ngx_http_proxy_headers_t;
+
+#  endif /* nginx_version >= 1007008 */
+
+typedef struct {
+    ngx_http_upstream_conf_t       upstream;
+
+#  if (nginx_version >= 1007008)
+    ngx_array_t                   *body_flushes;
+    ngx_array_t                   *body_lengths;
+    ngx_array_t                   *body_values;
+    ngx_str_t                      body_source;
+
+    ngx_http_proxy_headers_t       headers;
+    ngx_http_proxy_headers_t       headers_cache;
+#  else
+    ngx_array_t                   *flushes;
+    ngx_array_t                   *body_set_len;
+    ngx_array_t                   *body_set;
+    ngx_array_t                   *headers_set_len;
+    ngx_array_t                   *headers_set;
+    ngx_hash_t                     headers_set_hash;
+#  endif /* nginx_version >= 1007008 */
+
+    ngx_array_t                   *headers_source;
+#  if (nginx_version < 8040)
+    ngx_array_t                   *headers_names;
+#  endif /* nginx_version < 8040 */
+
+    ngx_array_t                   *proxy_lengths;
+    ngx_array_t                   *proxy_values;
+
+    ngx_array_t                   *redirects;
+#  if (nginx_version >= 1001015)
+    ngx_array_t                   *cookie_domains;
+    ngx_array_t                   *cookie_paths;
+#  endif /* nginx_version >= 1001015 */
+#  if (nginx_version >= 1019003)
+    ngx_array_t                   *cookie_flags;
+#  endif /* nginx_version >= 1019003 */
+#  if (nginx_version < 1007008)
+    ngx_str_t                      body_source;
+#  endif /* nginx_version < 1007008 */
+
+#  if (nginx_version >= 1011006)
+    ngx_http_complex_value_t      *method;
+#  else
+    ngx_str_t                      method;
+#  endif /* nginx_version >= 1011006 */
+    ngx_str_t                      location;
+    ngx_str_t                      url;
+
+    ngx_http_complex_value_t       cache_key;
+
+    ngx_http_proxy_vars_t          vars;
+
+    ngx_flag_t                     redirect;
+
+#  if (nginx_version >= 1001004)
+    ngx_uint_t                     http_version;
+#  endif /* nginx_version >= 1001004 */
+
+    ngx_uint_t                     headers_hash_max_size;
+    ngx_uint_t                     headers_hash_bucket_size;
+
+#  if (NGX_HTTP_SSL)
+#    if (nginx_version >= 1005006)
+    ngx_uint_t                     ssl;
+    ngx_uint_t                     ssl_protocols;
+    ngx_str_t                      ssl_ciphers;
+#    endif /* nginx_version >= 1005006 */
+#    if (nginx_version >= 1007000)
+    ngx_uint_t                     ssl_verify_depth;
+    ngx_str_t                      ssl_trusted_certificate;
+    ngx_str_t                      ssl_crl;
+#    endif /* nginx_version >= 1007000 */
+#    if ((nginx_version >= 1007008) && (nginx_version < 1021000))
+    ngx_str_t                      ssl_certificate;
+    ngx_str_t                      ssl_certificate_key;
+    ngx_array_t                   *ssl_passwords;
+#    endif /* nginx_version >= 1007008 && nginx_version < 1021000 */
+#    if (nginx_version >= 1019004)
+    ngx_array_t                   *ssl_conf_commands;
+#    endif /*nginx_version >= 1019004 */
+#  endif
+} ngx_http_proxy_loc_conf_t;
+
+char *
+ngx_http_proxy_cache_purge_conf(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    ngx_http_compile_complex_value_t   ccv;
+    ngx_http_cache_purge_loc_conf_t   *cplcf;
+    ngx_http_core_loc_conf_t          *clcf;
+    ngx_http_proxy_loc_conf_t         *plcf;
+    ngx_str_t                         *value;
+#  if (nginx_version >= 1007009)
+    ngx_http_complex_value_t           cv;
+#  endif /* nginx_version >= 1007009 */
+
+    cplcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_cache_purge_module);
+
+    /* check for duplicates / collisions */
+    if (cplcf->proxy.enable != NGX_CONF_UNSET) {
+        return "is duplicate";
+    }
+
+    if (cf->args->nelts != 3) {
+        return ngx_http_cache_purge_conf(cf, &cplcf->proxy);
+    }
+
+    if (cf->cmd_type & (NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF)) {
+        return "(separate location syntax) is not allowed here";
+    }
+
+    plcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_proxy_module);
+
+#  if (nginx_version >= 1007009)
+    if (plcf->upstream.cache > 0)
+#  else
+    if (plcf->upstream.cache != NGX_CONF_UNSET_PTR
+            && plcf->upstream.cache != NULL)
+#  endif /* nginx_version >= 1007009 */
+    {
+        return "is incompatible with \"proxy_cache\"";
+    }
+
+    if (plcf->upstream.upstream || plcf->proxy_lengths) {
+        return "is incompatible with \"proxy_pass\"";
+    }
+
+    if (plcf->upstream.store > 0
+#  if (nginx_version < 1007009)
+            || plcf->upstream.store_lengths
+#  endif /* nginx_version >= 1007009 */
+       ) {
+        return "is incompatible with \"proxy_store\"";
+    }
+
+    value = cf->args->elts;
+
+    /* set proxy_cache part */
+#  if (nginx_version >= 1007009)
+
+    plcf->upstream.cache = 1;
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &cv;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cv.lengths != NULL) {
+
+        plcf->upstream.cache_value = ngx_palloc(cf->pool,
+                                                sizeof(ngx_http_complex_value_t));
+        if (plcf->upstream.cache_value == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *plcf->upstream.cache_value = cv;
+
+    } else {
+
+        plcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
+                                    &ngx_http_proxy_module);
+        if (plcf->upstream.cache_zone == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+#  else
+
+    plcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0,
+                           &ngx_http_proxy_module);
+    if (plcf->upstream.cache == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+#  endif /* nginx_version >= 1007009 */
+
+    /* set proxy_cache_key part */
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[2];
+    ccv.complex_value = &plcf->cache_key;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    /* set handler */
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
+    cplcf->proxy.enable = 0;
+    cplcf->conf = &cplcf->proxy;
+    clcf->handler = ngx_http_proxy_cache_purge_handler;
+
+    return NGX_CONF_OK;
+}
+
+ngx_int_t
+ngx_http_proxy_cache_purge_handler(ngx_http_request_t *r) {
+    ngx_http_file_cache_t               *cache;
+    ngx_http_proxy_loc_conf_t           *plcf;
+    ngx_http_cache_purge_loc_conf_t     *cplcf;
+#  if (nginx_version >= 1007009)
+    ngx_http_proxy_main_conf_t          *pmcf;
+    ngx_int_t                            rc;
+#  endif /* nginx_version >= 1007009 */
+
+    if (ngx_http_upstream_create(r) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    plcf = ngx_http_get_module_loc_conf(r, ngx_http_proxy_module);
+
+    r->upstream->conf = &plcf->upstream;
+
+#  if (nginx_version >= 1007009)
+
+    pmcf = ngx_http_get_module_main_conf(r, ngx_http_proxy_module);
+
+    r->upstream->caches = &pmcf->caches;
+
+    rc = ngx_http_cache_purge_cache_get(r, r->upstream, &cache);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+#  else
+
+    cache = plcf->upstream.cache->data;
+
+#  endif /* nginx_version >= 1007009 */
+
+    if (ngx_http_cache_purge_init(r, cache, &plcf->cache_key) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    /* Purge-all option */
+    cplcf = ngx_http_get_module_loc_conf(r, ngx_http_cache_purge_module);
+    if (cplcf->conf->purge_all) {
+        ngx_http_cache_purge_all(r, cache);
+    } else {
+        if (ngx_http_cache_purge_is_partial(r)) {
+            ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                          "http file cache purge with partial enabled");
+
+            ngx_http_cache_purge_partial(r, cache);
+        }
+    }
+
+#  if (nginx_version >= 8011)
+    r->main->count++;
+#  endif
+
+    ngx_http_cache_purge_handler(r);
+
+    return NGX_DONE;
+}
+# endif /* NGX_HTTP_PROXY */
+
+# if (NGX_HTTP_SCGI)
+extern ngx_module_t  ngx_http_scgi_module;
+
+#  if (nginx_version >= 1007009)
+
+typedef struct {
+    ngx_array_t                caches;  /* ngx_http_file_cache_t * */
+} ngx_http_scgi_main_conf_t;
+
+#  endif /* nginx_version >= 1007009 */
+
+#  if (nginx_version >= 1007008)
+
+typedef struct {
+    ngx_array_t               *flushes;
+    ngx_array_t               *lengths;
+    ngx_array_t               *values;
+    ngx_uint_t                 number;
+    ngx_hash_t                 hash;
+} ngx_http_scgi_params_t;
+
+#  endif /* nginx_version >= 1007008 */
+
+typedef struct {
+    ngx_http_upstream_conf_t   upstream;
+
+#  if (nginx_version >= 1007008)
+    ngx_http_scgi_params_t     params;
+    ngx_http_scgi_params_t     params_cache;
+    ngx_array_t               *params_source;
+#  else
+    ngx_array_t               *flushes;
+    ngx_array_t               *params_len;
+    ngx_array_t               *params;
+    ngx_array_t               *params_source;
+
+    ngx_hash_t                 headers_hash;
+    ngx_uint_t                 header_params;
+#  endif /* nginx_version >= 1007008 */
+
+    ngx_array_t               *scgi_lengths;
+    ngx_array_t               *scgi_values;
+
+    ngx_http_complex_value_t   cache_key;
+} ngx_http_scgi_loc_conf_t;
+
+char *
+ngx_http_scgi_cache_purge_conf(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    ngx_http_compile_complex_value_t   ccv;
+    ngx_http_cache_purge_loc_conf_t   *cplcf;
+    ngx_http_core_loc_conf_t          *clcf;
+    ngx_http_scgi_loc_conf_t          *slcf;
+    ngx_str_t                         *value;
+#  if (nginx_version >= 1007009)
+    ngx_http_complex_value_t           cv;
+#  endif /* nginx_version >= 1007009 */
+
+    cplcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_cache_purge_module);
+
+    /* check for duplicates / collisions */
+    if (cplcf->scgi.enable != NGX_CONF_UNSET) {
+        return "is duplicate";
+    }
+
+    if (cf->args->nelts != 3) {
+        return ngx_http_cache_purge_conf(cf, &cplcf->scgi);
+    }
+
+    if (cf->cmd_type & (NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF)) {
+        return "(separate location syntax) is not allowed here";
+    }
+
+    slcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_scgi_module);
+
+#  if (nginx_version >= 1007009)
+    if (slcf->upstream.cache > 0)
+#  else
+    if (slcf->upstream.cache != NGX_CONF_UNSET_PTR
+            && slcf->upstream.cache != NULL)
+#  endif /* nginx_version >= 1007009 */
+    {
+        return "is incompatible with \"scgi_cache\"";
+    }
+
+    if (slcf->upstream.upstream || slcf->scgi_lengths) {
+        return "is incompatible with \"scgi_pass\"";
+    }
+
+    if (slcf->upstream.store > 0
+#  if (nginx_version < 1007009)
+            || slcf->upstream.store_lengths
+#  endif /* nginx_version >= 1007009 */
+       ) {
+        return "is incompatible with \"scgi_store\"";
+    }
+
+    value = cf->args->elts;
+
+    /* set scgi_cache part */
+#  if (nginx_version >= 1007009)
+
+    slcf->upstream.cache = 1;
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &cv;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cv.lengths != NULL) {
+
+        slcf->upstream.cache_value = ngx_palloc(cf->pool,
+                                                sizeof(ngx_http_complex_value_t));
+        if (slcf->upstream.cache_value == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *slcf->upstream.cache_value = cv;
+
+    } else {
+
+        slcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
+                                    &ngx_http_scgi_module);
+        if (slcf->upstream.cache_zone == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+#  else
+
+    slcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0,
+                           &ngx_http_scgi_module);
+    if (slcf->upstream.cache == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+#  endif /* nginx_version >= 1007009 */
+
+    /* set scgi_cache_key part */
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[2];
+    ccv.complex_value = &slcf->cache_key;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    /* set handler */
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
+    cplcf->scgi.enable = 0;
+    cplcf->conf = &cplcf->scgi;
+    clcf->handler = ngx_http_scgi_cache_purge_handler;
+
+    return NGX_CONF_OK;
+}
+
+ngx_int_t
+ngx_http_scgi_cache_purge_handler(ngx_http_request_t *r) {
+    ngx_http_file_cache_t               *cache;
+    ngx_http_scgi_loc_conf_t            *slcf;
+    ngx_http_cache_purge_loc_conf_t     *cplcf;
+#  if (nginx_version >= 1007009)
+    ngx_http_scgi_main_conf_t           *smcf;
+    ngx_int_t                           rc;
+#  endif /* nginx_version >= 1007009 */
+
+    if (ngx_http_upstream_create(r) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_scgi_module);
+
+    r->upstream->conf = &slcf->upstream;
+
+#  if (nginx_version >= 1007009)
+
+    smcf = ngx_http_get_module_main_conf(r, ngx_http_scgi_module);
+
+    r->upstream->caches = &smcf->caches;
+
+    rc = ngx_http_cache_purge_cache_get(r, r->upstream, &cache);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+#  else
+
+    cache = slcf->upstream.cache->data;
+
+#  endif /* nginx_version >= 1007009 */
+
+    if (ngx_http_cache_purge_init(r, cache, &slcf->cache_key) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    /* Purge-all option */
+    cplcf = ngx_http_get_module_loc_conf(r, ngx_http_cache_purge_module);
+    if (cplcf->conf->purge_all) {
+        ngx_http_cache_purge_all(r, cache);
+    } else {
+        if (ngx_http_cache_purge_is_partial(r)) {
+            ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                          "http file cache purge with partial enabled");
+
+            ngx_http_cache_purge_partial(r, cache);
+        }
+    }
+
+#  if (nginx_version >= 8011)
+    r->main->count++;
+#  endif
+
+    ngx_http_cache_purge_handler(r);
+
+    return NGX_DONE;
+}
+# endif /* NGX_HTTP_SCGI */
+
+# if (NGX_HTTP_UWSGI)
+extern ngx_module_t  ngx_http_uwsgi_module;
+
+#  if (nginx_version >= 1007009)
+
+typedef struct {
+    ngx_array_t                caches;  /* ngx_http_file_cache_t * */
+} ngx_http_uwsgi_main_conf_t;
+
+#  endif /* nginx_version >= 1007009 */
+
+#  if (nginx_version >= 1007008)
+
+typedef struct {
+    ngx_array_t               *flushes;
+    ngx_array_t               *lengths;
+    ngx_array_t               *values;
+    ngx_uint_t                 number;
+    ngx_hash_t                 hash;
+} ngx_http_uwsgi_params_t;
+
+#  endif /* nginx_version >= 1007008 */
+
+typedef struct {
+    ngx_http_upstream_conf_t   upstream;
+
+#  if (nginx_version >= 1007008)
+    ngx_http_uwsgi_params_t    params;
+    ngx_http_uwsgi_params_t    params_cache;
+    ngx_array_t               *params_source;
+#  else
+    ngx_array_t               *flushes;
+    ngx_array_t               *params_len;
+    ngx_array_t               *params;
+    ngx_array_t               *params_source;
+
+    ngx_hash_t                 headers_hash;
+    ngx_uint_t                 header_params;
+#  endif /* nginx_version >= 1007008 */
+
+    ngx_array_t               *uwsgi_lengths;
+    ngx_array_t               *uwsgi_values;
+
+    ngx_http_complex_value_t   cache_key;
+
+    ngx_str_t                  uwsgi_string;
+
+    ngx_uint_t                 modifier1;
+    ngx_uint_t                 modifier2;
+
+#  if (NGX_HTTP_SSL)
+#    if (nginx_version >= 1005008)
+    ngx_uint_t                 ssl;
+    ngx_uint_t                 ssl_protocols;
+    ngx_str_t                  ssl_ciphers;
+#    endif /* nginx_version >= 1005008 */
+#    if (nginx_version >= 1007000)
+    ngx_uint_t                 ssl_verify_depth;
+    ngx_str_t                  ssl_trusted_certificate;
+    ngx_str_t                  ssl_crl;
+#    endif /* nginx_version >= 1007000 */
+#    if ((nginx_version >= 1007008) && (nginx_version < 1021000))
+    ngx_str_t                  ssl_certificate;
+    ngx_str_t                  ssl_certificate_key;
+    ngx_array_t               *ssl_passwords;
+#    endif /* nginx_version >= 1007008 && nginx_version < 1021000 */
+#    if (nginx_version >= 1019004)
+    ngx_array_t               *ssl_conf_commands;
+#    endif /*nginx_version >= 1019004 */
+#  endif
+} ngx_http_uwsgi_loc_conf_t;
+
+char *
+ngx_http_uwsgi_cache_purge_conf(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    ngx_http_compile_complex_value_t   ccv;
+    ngx_http_cache_purge_loc_conf_t   *cplcf;
+    ngx_http_core_loc_conf_t          *clcf;
+    ngx_http_uwsgi_loc_conf_t         *ulcf;
+    ngx_str_t                         *value;
+#  if (nginx_version >= 1007009)
+    ngx_http_complex_value_t           cv;
+#  endif /* nginx_version >= 1007009 */
+
+    cplcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_cache_purge_module);
+
+    /* check for duplicates / collisions */
+    if (cplcf->uwsgi.enable != NGX_CONF_UNSET) {
+        return "is duplicate";
+    }
+
+    if (cf->args->nelts != 3) {
+        return ngx_http_cache_purge_conf(cf, &cplcf->uwsgi);
+    }
+
+    if (cf->cmd_type & (NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF)) {
+        return "(separate location syntax) is not allowed here";
+    }
+
+    ulcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_uwsgi_module);
+
+#  if (nginx_version >= 1007009)
+    if (ulcf->upstream.cache > 0)
+#  else
+    if (ulcf->upstream.cache != NGX_CONF_UNSET_PTR
+            && ulcf->upstream.cache != NULL)
+#  endif /* nginx_version >= 1007009 */
+    {
+        return "is incompatible with \"uwsgi_cache\"";
+    }
+
+    if (ulcf->upstream.upstream || ulcf->uwsgi_lengths) {
+        return "is incompatible with \"uwsgi_pass\"";
+    }
+
+    if (ulcf->upstream.store > 0
+#  if (nginx_version < 1007009)
+            || ulcf->upstream.store_lengths
+#  endif /* nginx_version >= 1007009 */
+       ) {
+        return "is incompatible with \"uwsgi_store\"";
+    }
+
+    value = cf->args->elts;
+
+    /* set uwsgi_cache part */
+#  if (nginx_version >= 1007009)
+
+    ulcf->upstream.cache = 1;
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[1];
+    ccv.complex_value = &cv;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cv.lengths != NULL) {
+
+        ulcf->upstream.cache_value = ngx_palloc(cf->pool,
+                                                sizeof(ngx_http_complex_value_t));
+        if (ulcf->upstream.cache_value == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *ulcf->upstream.cache_value = cv;
+
+    } else {
+
+        ulcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
+                                    &ngx_http_uwsgi_module);
+        if (ulcf->upstream.cache_zone == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+#  else
+
+    ulcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0,
+                           &ngx_http_uwsgi_module);
+    if (ulcf->upstream.cache == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+#  endif /* nginx_version >= 1007009 */
+
+    /* set uwsgi_cache_key part */
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[2];
+    ccv.complex_value = &ulcf->cache_key;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    /* set handler */
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
+    cplcf->uwsgi.enable = 0;
+    cplcf->conf = &cplcf->uwsgi;
+    clcf->handler = ngx_http_uwsgi_cache_purge_handler;
+
+    return NGX_CONF_OK;
+}
+
+
+ngx_int_t
+ngx_http_uwsgi_cache_purge_handler(ngx_http_request_t *r) {
+    ngx_http_file_cache_t               *cache;
+    ngx_http_uwsgi_loc_conf_t           *ulcf;
+    ngx_http_cache_purge_loc_conf_t     *cplcf;
+#  if (nginx_version >= 1007009)
+    ngx_http_uwsgi_main_conf_t          *umcf;
+    ngx_int_t                           rc;
+#  endif /* nginx_version >= 1007009 */
+
+    if (ngx_http_upstream_create(r) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    ulcf = ngx_http_get_module_loc_conf(r, ngx_http_uwsgi_module);
+
+    r->upstream->conf = &ulcf->upstream;
+
+#  if (nginx_version >= 1007009)
+
+    umcf = ngx_http_get_module_main_conf(r, ngx_http_uwsgi_module);
+
+    r->upstream->caches = &umcf->caches;
+
+    rc = ngx_http_cache_purge_cache_get(r, r->upstream, &cache);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+#  else
+
+    cache = ulcf->upstream.cache->data;
+
+#  endif /* nginx_version >= 1007009 */
+
+    if (ngx_http_cache_purge_init(r, cache, &ulcf->cache_key) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    /* Purge-all option */
+    cplcf = ngx_http_get_module_loc_conf(r, ngx_http_cache_purge_module);
+    if (cplcf->conf->purge_all) {
+        ngx_http_cache_purge_all(r, cache);
+    } else {
+        if (ngx_http_cache_purge_is_partial(r)) {
+            ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                          "http file cache purge with partial enabled");
+
+            ngx_http_cache_purge_partial(r, cache);
+        }
+    }
+
+#  if (nginx_version >= 8011)
+    r->main->count++;
+#  endif
+
+    ngx_http_cache_purge_handler(r);
+
+    return NGX_DONE;
+}
+# endif /* NGX_HTTP_UWSGI */
+
+
+char *
+ngx_http_cache_purge_response_type_conf(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_cache_purge_loc_conf_t   *cplcf;
+    ngx_str_t                         *value;
+
+    cplcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_cache_purge_module);
+
+    /* check for duplicates / collisions */
+    if (cplcf->resptype != NGX_CONF_UNSET_UINT && cf->cmd_type == NGX_HTTP_LOC_CONF )  {
+        return "is duplicate";
+    }
+
+    /* sanity check */
+    if (cf->args->nelts < 2) {
+        return "is invalid paramter, ex) cache_purge_response_type (html|json|xml|text)";
+    }
+
+    if (cf->args->nelts > 2 ) {
+        return "is required only 1 option, ex) cache_purge_response_type (html|json|xml|text)";
+    }
+
+    value = cf->args->elts;
+
+    if (ngx_strcmp(value[1].data, "html") != 0 && ngx_strcmp(value[1].data, "json") != 0 
+        && ngx_strcmp(value[1].data, "xml") != 0 && ngx_strcmp(value[1].data, "text") != 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\", expected"
+                           " \"(html|json|xml|text)\" keyword", &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->cmd_type == NGX_HTTP_MODULE) {
+        return "(separate server or location syntax) is not allowed here";
+    }
+
+    if (ngx_strcmp(value[1].data, "html") == 0) {
+        cplcf->resptype = NGX_REPONSE_TYPE_HTML;
+    } else if (ngx_strcmp(value[1].data, "xml") == 0) {
+        cplcf->resptype = NGX_REPONSE_TYPE_XML;
+    } else if (ngx_strcmp(value[1].data, "json") == 0) {
+        cplcf->resptype = NGX_REPONSE_TYPE_JSON;
+    } else if (ngx_strcmp(value[1].data, "text") == 0) {
+        cplcf->resptype = NGX_REPONSE_TYPE_TEXT;
+    }
+
+    return NGX_CONF_OK;
+}
+
+static ngx_int_t
+ngx_http_purge_file_cache_noop(ngx_tree_ctx_t *ctx, ngx_str_t *path) {
+    return NGX_OK;
+}
+
+static ngx_int_t
+ngx_http_purge_file_cache_delete_file(ngx_tree_ctx_t *ctx, ngx_str_t *path) {
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                   "http file cache delete: \"%s\"", path->data);
+
+    if (ngx_delete_file(path->data) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno,
+                      ngx_delete_file_n " \"%s\" failed", path->data);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_purge_file_cache_delete_partial_file(ngx_tree_ctx_t *ctx, ngx_str_t *path) {
+    u_char *key_partial;
+    u_char *key_in_file;
+    ngx_uint_t len;
+    ngx_flag_t remove_file = 0;
+
+    key_partial = ctx->data;
+    len = ngx_strlen(key_partial);
+
+    /* if key_partial is empty always match, because is a '*' */
+    if (len == 0) {
+        ngx_log_debug(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                      "empty key_partial, forcing deletion");
+        remove_file = 1;
+    } else {
+        ngx_file_t file;
+
+        ngx_memzero(&file, sizeof(ngx_file_t));
+        file.offset = file.sys_offset = 0;
+        file.fd = ngx_open_file(path->data, NGX_FILE_RDONLY, NGX_FILE_OPEN,
+                                NGX_FILE_DEFAULT_ACCESS);
+        if (file.fd == -1) {
+            return NGX_OK;
+        }
+        file.log = ctx->log;
+
+        /* I don't know if it's a good idea to use the ngx_cycle pool for this,
+           but the request is not available here */
+        key_in_file = ngx_pcalloc(ngx_cycle->pool, sizeof(u_char) * (len + 1));
+
+        /* KEY: /proxy/passwd */
+        /* since we don't need the "KEY: " ignore 5 + 1 extra u_char from last
+           intro */
+        /* Optimization: we don't need to read the full key only the n chars
+           included in key_partial */
+        ngx_read_file(&file, key_in_file, sizeof(u_char) * len,
+                      sizeof(ngx_http_file_cache_header_t) + sizeof(u_char) * 6);
+        ngx_close_file(file.fd);
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                       "http cache file \"%s\" key read: \"%s\"", path->data, key_in_file);
+
+        if (ngx_strncasecmp(key_in_file, key_partial, len) == 0) {
+            ngx_log_debug(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+                          "match found, deleting file \"%s\"", path->data);
+            remove_file = 1;
+        }
+    }
+
+    if (remove_file && ngx_delete_file(path->data) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno,
+                      ngx_delete_file_n " \"%s\" failed", path->data);
+    }
+
+    return NGX_OK;
+}
+
+ngx_int_t
+ngx_http_cache_purge_access_handler(ngx_http_request_t *r) {
+    ngx_http_cache_purge_loc_conf_t   *cplcf;
+
+    cplcf = ngx_http_get_module_loc_conf(r, ngx_http_cache_purge_module);
+
+    if (r->method_name.len != cplcf->conf->method.len
+            || (ngx_strncmp(r->method_name.data, cplcf->conf->method.data,
+                            r->method_name.len))) {
+        return cplcf->original_handler(r);
+    }
+
+    if ((cplcf->conf->access || cplcf->conf->access6)
+            && ngx_http_cache_purge_access(cplcf->conf->access,
+                                           cplcf->conf->access6,
+                                           r->connection->sockaddr) != NGX_OK) {
+        return NGX_HTTP_FORBIDDEN;
+    }
+
+    if (cplcf->handler == NULL) {
+        return NGX_HTTP_NOT_FOUND;
+    }
+
+    return cplcf->handler(r);
+}
+
+ngx_int_t
+ngx_http_cache_purge_access(ngx_array_t *access, ngx_array_t *access6,
+                            struct sockaddr *s) {
+    in_addr_t         inaddr;
+    ngx_in_cidr_t    *a;
+    ngx_uint_t        i;
+# if (NGX_HAVE_INET6)
+    struct in6_addr  *inaddr6;
+    ngx_in6_cidr_t   *a6;
+    u_char           *p;
+    ngx_uint_t        n;
+# endif /* NGX_HAVE_INET6 */
+
+    switch (s->sa_family) {
+    case AF_INET:
+        if (access == NULL) {
+            return NGX_DECLINED;
+        }
+
+        inaddr = ((struct sockaddr_in *) s)->sin_addr.s_addr;
+
+# if (NGX_HAVE_INET6)
+ipv4:
+# endif /* NGX_HAVE_INET6 */
+
+        a = access->elts;
+        for (i = 0; i < access->nelts; i++) {
+            if ((inaddr & a[i].mask) == a[i].addr) {
+                return NGX_OK;
+            }
+        }
+
+        return NGX_DECLINED;
+
+# if (NGX_HAVE_INET6)
+    case AF_INET6:
+        inaddr6 = &((struct sockaddr_in6 *) s)->sin6_addr;
+        p = inaddr6->s6_addr;
+
+        if (access && IN6_IS_ADDR_V4MAPPED(inaddr6)) {
+            inaddr = p[12] << 24;
+            inaddr += p[13] << 16;
+            inaddr += p[14] << 8;
+            inaddr += p[15];
+            inaddr = htonl(inaddr);
+
+            goto ipv4;
+        }
+
+        if (access6 == NULL) {
+            return NGX_DECLINED;
+        }
+
+        a6 = access6->elts;
+        for (i = 0; i < access6->nelts; i++) {
+            for (n = 0; n < 16; n++) {
+                if ((p[n] & a6[i].mask.s6_addr[n]) != a6[i].addr.s6_addr[n]) {
+                    goto next;
+                }
+            }
+
+            return NGX_OK;
+
+next:
+            continue;
+        }
+
+        return NGX_DECLINED;
+# endif /* NGX_HAVE_INET6 */
+    }
+
+    return NGX_DECLINED;
+}
+
+ngx_int_t
+ngx_http_cache_purge_send_response(ngx_http_request_t *r) {
+    ngx_chain_t   out;
+    ngx_buf_t    *b;
+    ngx_str_t    *key;
+    ngx_int_t     rc;
+    size_t        len;
+    
+    size_t body_len;
+    size_t resp_tmpl_len;
+    u_char *buf;
+    u_char *buf_keydata;
+    u_char *p;
+    const char *resp_ct;
+    size_t resp_ct_size;
+    const char *resp_body;
+    size_t resp_body_size;
+
+    ngx_http_cache_purge_loc_conf_t   *cplcf;
+    cplcf = ngx_http_get_module_loc_conf(r, ngx_http_cache_purge_module);
+
+    key = r->cache->keys.elts;
+
+    buf_keydata = ngx_pcalloc(r->pool, key[0].len+1);
+    if (buf_keydata == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    p = ngx_cpymem(buf_keydata, key[0].data, key[0].len);
+    if (p == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    switch(cplcf->resptype) {
+
+        case NGX_REPONSE_TYPE_JSON:
+            resp_ct = ngx_http_cache_purge_content_type_json;
+            resp_ct_size = ngx_http_cache_purge_content_type_json_size;
+            resp_body = ngx_http_cache_purge_body_templ_json;
+            resp_body_size = ngx_http_cache_purge_body_templ_json_size;
+            break;
+
+        case NGX_REPONSE_TYPE_XML:
+            resp_ct = ngx_http_cache_purge_content_type_xml;
+            resp_ct_size = ngx_http_cache_purge_content_type_xml_size;
+            resp_body = ngx_http_cache_purge_body_templ_xml;
+            resp_body_size = ngx_http_cache_purge_body_templ_xml_size;
+            break;
+
+        case NGX_REPONSE_TYPE_TEXT:
+            resp_ct = ngx_http_cache_purge_content_type_text;
+            resp_ct_size = ngx_http_cache_purge_content_type_text_size;
+            resp_body = ngx_http_cache_purge_body_templ_text;
+            resp_body_size = ngx_http_cache_purge_body_templ_text_size;
+            break;
+
+        default:
+        case NGX_REPONSE_TYPE_HTML:
+            resp_ct = ngx_http_cache_purge_content_type_html;
+            resp_ct_size = ngx_http_cache_purge_content_type_html_size;
+            resp_body = ngx_http_cache_purge_body_templ_html;
+            resp_body_size = ngx_http_cache_purge_body_templ_html_size;
+            break;
+    }
+
+    body_len = resp_body_size - 2 - 1;
+    r->headers_out.content_type.len = resp_ct_size - 1;
+    r->headers_out.content_type.data = (u_char *) resp_ct;
+
+    resp_tmpl_len = body_len + key[0].len ;
+
+    buf = ngx_pcalloc(r->pool, resp_tmpl_len);
+    if (buf == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    p = ngx_snprintf(buf, resp_tmpl_len, resp_body , buf_keydata);
+    if (p == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    len = body_len + key[0].len;
+
+    r->headers_out.status = NGX_HTTP_OK;
+    r->headers_out.content_length_n = len;
+
+    if (r->method == NGX_HTTP_HEAD) {
+        rc = ngx_http_send_header(r);
+        if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+            return rc;
+        }
+    }
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+    
+
+    out.buf = b;
+    out.next = NULL;
+
+    b->last = ngx_cpymem(b->last, buf, resp_tmpl_len);
+    b->last_buf = 1;
+
+    rc = ngx_http_send_header(r);
+    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+        return rc;
+    }
+
+    return ngx_http_output_filter(r, &out);
+}
+
+# if (nginx_version >= 1007009)
+
+/*
+ * Based on: ngx_http_upstream.c/ngx_http_upstream_cache_get
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+ngx_int_t
+ngx_http_cache_purge_cache_get(ngx_http_request_t *r, ngx_http_upstream_t *u,
+                               ngx_http_file_cache_t **cache) {
+    ngx_str_t               *name, val;
+    ngx_uint_t               i;
+    ngx_http_file_cache_t  **caches;
+
+    if (u->conf->cache_zone) {
+        *cache = u->conf->cache_zone->data;
+        return NGX_OK;
+    }
+
+    if (ngx_http_complex_value(r, u->conf->cache_value, &val) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    if (val.len == 0
+            || (val.len == 3 && ngx_strncmp(val.data, "off", 3) == 0)) {
+        return NGX_DECLINED;
+    }
+
+    caches = u->caches->elts;
+
+    for (i = 0; i < u->caches->nelts; i++) {
+        name = &caches[i]->shm_zone->shm.name;
+
+        if (name->len == val.len
+                && ngx_strncmp(name->data, val.data, val.len) == 0) {
+            *cache = caches[i];
+            return NGX_OK;
+        }
+    }
+
+    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                  "cache \"%V\" not found", &val);
+
+    return NGX_ERROR;
+}
+
+# endif /* nginx_version >= 1007009 */
+
+ngx_int_t
+ngx_http_cache_purge_init(ngx_http_request_t *r, ngx_http_file_cache_t *cache,
+                          ngx_http_complex_value_t *cache_key) {
+    ngx_http_cache_t  *c;
+    ngx_str_t         *key;
+    ngx_int_t          rc;
+
+    rc = ngx_http_discard_request_body(r);
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    c = ngx_pcalloc(r->pool, sizeof(ngx_http_cache_t));
+    if (c == NULL) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_array_init(&c->keys, r->pool, 1, sizeof(ngx_str_t));
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    key = ngx_array_push(&c->keys);
+    if (key == NULL) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_complex_value(r, cache_key, key);
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    r->cache = c;
+    c->body_start = ngx_pagesize;
+    c->file_cache = cache;
+    c->file.log = r->connection->log;
+
+    ngx_http_file_cache_create_key(r);
+
+    return NGX_OK;
+}
+
+void
+ngx_http_cache_purge_handler(ngx_http_request_t *r) {
+    ngx_http_cache_purge_loc_conf_t     *cplcf;
+    ngx_int_t  rc;
+
+#  if (NGX_HAVE_FILE_AIO)
+    if (r->aio) {
+        return;
+    }
+#  endif
+
+    cplcf = ngx_http_get_module_loc_conf(r, ngx_http_cache_purge_module);
+    rc = NGX_OK;
+    if (!cplcf->conf->purge_all && !ngx_http_cache_purge_is_partial(r)) {
+        rc = ngx_http_file_cache_purge(r);
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http file cache purge: %i, \"%s\"",
+                       rc, r->cache->file.name.data);
+    }
+
+    switch (rc) {
+    case NGX_OK:
+        r->write_event_handler = ngx_http_request_empty_handler;
+        ngx_http_finalize_request(r, ngx_http_cache_purge_send_response(r));
+        return;
+    case NGX_DECLINED:
+        ngx_http_finalize_request(r, NGX_HTTP_PRECONDITION_FAILED);
+        return;
+#  if (NGX_HAVE_FILE_AIO)
+    case NGX_AGAIN:
+        r->write_event_handler = ngx_http_cache_purge_handler;
+        return;
+#  endif
+    default:
+        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    }
+}
+
+ngx_int_t
+ngx_http_file_cache_purge(ngx_http_request_t *r) {
+    ngx_http_file_cache_t  *cache;
+    ngx_http_cache_t       *c;
+
+    switch (ngx_http_file_cache_open(r)) {
+    case NGX_OK:
+    case NGX_HTTP_CACHE_STALE:
+#  if (nginx_version >= 8001) \
+       || ((nginx_version < 8000) && (nginx_version >= 7060))
+    case NGX_HTTP_CACHE_UPDATING:
+#  endif
+        break;
+    case NGX_DECLINED:
+        return NGX_DECLINED;
+#  if (NGX_HAVE_FILE_AIO)
+    case NGX_AGAIN:
+        return NGX_AGAIN;
+#  endif
+    default:
+        return NGX_ERROR;
+    }
+
+    c = r->cache;
+    cache = c->file_cache;
+
+    /*
+     * delete file from disk but *keep* in-memory node,
+     * because other requests might still point to it.
+     */
+
+    ngx_shmtx_lock(&cache->shpool->mutex);
+
+    if (!c->node->exists) {
+        /* race between concurrent purges, backoff */
+        ngx_shmtx_unlock(&cache->shpool->mutex);
+        return NGX_DECLINED;
+    }
+
+#  if (nginx_version >= 1000001)
+    cache->sh->size -= c->node->fs_size;
+    c->node->fs_size = 0;
+#  else
+    cache->sh->size -= (c->node->length + cache->bsize - 1) / cache->bsize;
+    c->node->length = 0;
+#  endif
+
+    c->node->exists = 0;
+#  if (nginx_version >= 8001) \
+       || ((nginx_version < 8000) && (nginx_version >= 7060))
+    c->node->updating = 0;
+#  endif
+
+    ngx_shmtx_unlock(&cache->shpool->mutex);
+
+    if (ngx_delete_file(c->file.name.data) == NGX_FILE_ERROR) {
+        /* entry in error log is enough, don't notice client */
+        ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
+                      ngx_delete_file_n " \"%s\" failed", c->file.name.data);
+    }
+
+    /* file deleted from cache */
+    return NGX_OK;
+}
+
+
+void
+ngx_http_cache_purge_all(ngx_http_request_t *r, ngx_http_file_cache_t *cache) {
+    ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                  "purge_all http in %s",
+                  cache->path->name.data);
+
+    /* Walk the tree and remove all the files */
+    ngx_tree_ctx_t  tree;
+    tree.init_handler = NULL;
+    tree.file_handler = ngx_http_purge_file_cache_delete_file;
+    tree.pre_tree_handler = ngx_http_purge_file_cache_noop;
+    tree.post_tree_handler = ngx_http_purge_file_cache_noop;
+    tree.spec_handler = ngx_http_purge_file_cache_noop;
+    tree.data = NULL;
+    tree.alloc = 0;
+    tree.log = ngx_cycle->log;
+
+    ngx_walk_tree(&tree, &cache->path->name);
+}
+
+void
+ngx_http_cache_purge_partial(ngx_http_request_t *r, ngx_http_file_cache_t *cache) {
+    ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                  "purge_partial http in %s",
+                  cache->path->name.data);
+
+    u_char              *key_partial;
+    ngx_str_t           *key;
+    ngx_http_cache_t    *c;
+    ngx_uint_t          len;
+
+    c = r->cache;
+    key = c->keys.elts;
+    len = key[0].len;
+
+    /* Only check the first key */
+    key_partial = ngx_pcalloc(r->pool, sizeof(u_char) * len);
+    ngx_memcpy(key_partial, key[0].data, sizeof(u_char) * (len - 1));
+
+    /* Walk the tree and remove all the files matching key_partial */
+    ngx_tree_ctx_t  tree;
+    tree.init_handler = NULL;
+    tree.file_handler = ngx_http_purge_file_cache_delete_partial_file;
+    tree.pre_tree_handler = ngx_http_purge_file_cache_noop;
+    tree.post_tree_handler = ngx_http_purge_file_cache_noop;
+    tree.spec_handler = ngx_http_purge_file_cache_noop;
+    tree.data = key_partial;
+    tree.alloc = 0;
+    tree.log = ngx_cycle->log;
+
+    ngx_walk_tree(&tree, &cache->path->name);
+}
+
+ngx_int_t
+ngx_http_cache_purge_is_partial(ngx_http_request_t *r) {
+    ngx_str_t *key;
+    ngx_http_cache_t  *c;
+
+    c = r->cache;
+    key = c->keys.elts;
+
+    /* Only check the first key */
+    return c->keys.nelts > 0 // number of array elements
+        && key[0].len > 0 // char length of the key
+        && key[0].data[key[0].len - 1] == '*'; // is the last char an asterix char?
+}
+
+char *
+ngx_http_cache_purge_conf(ngx_conf_t *cf, ngx_http_cache_purge_conf_t *cpcf) {
+    ngx_cidr_t       cidr;
+    ngx_in_cidr_t   *access;
+# if (NGX_HAVE_INET6)
+    ngx_in6_cidr_t  *access6;
+# endif /* NGX_HAVE_INET6 */
+    ngx_str_t       *value;
+    ngx_int_t        rc;
+    ngx_uint_t       i;
+    ngx_uint_t       from_position;
+
+    from_position = 2;
+
+    /* xxx_cache_purge on|off|<method> [purge_all] [from all|<ip> [.. <ip>]] */
+    value = cf->args->elts;
+
+    if (ngx_strcmp(value[1].data, "off") == 0) {
+        cpcf->enable = 0;
+        return NGX_CONF_OK;
+
+    } else if (ngx_strcmp(value[1].data, "on") == 0) {
+        ngx_str_set(&cpcf->method, "PURGE");
+
+    } else {
+        cpcf->method = value[1];
+    }
+
+    if (cf->args->nelts < 4) {
+        cpcf->enable = 1;
+        return NGX_CONF_OK;
+    }
+
+    /* We will purge all the keys */
+    if (ngx_strcmp(value[from_position].data, "purge_all") == 0) {
+        cpcf->purge_all = 1;
+        from_position++;
+    }
+
+
+    /* sanity check */
+    if (ngx_strcmp(value[from_position].data, "from") != 0) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid parameter \"%V\", expected"
+                           " \"from\" keyword", &value[from_position]);
+        return NGX_CONF_ERROR;
+    }
+
+    if (ngx_strcmp(value[from_position + 1].data, "all") == 0) {
+        cpcf->enable = 1;
+        return NGX_CONF_OK;
+    }
+
+    for (i = (from_position + 1); i < cf->args->nelts; i++) {
+        rc = ngx_ptocidr(&value[i], &cidr);
+
+        if (rc == NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid parameter \"%V\"", &value[i]);
+            return NGX_CONF_ERROR;
+        }
+
+        if (rc == NGX_DONE) {
+            ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                               "low address bits of %V are meaningless",
+                               &value[i]);
+        }
+
+        switch (cidr.family) {
+        case AF_INET:
+            if (cpcf->access == NULL) {
+                cpcf->access = ngx_array_create(cf->pool, cf->args->nelts - (from_position + 1),
+                                                sizeof(ngx_in_cidr_t));
+                if (cpcf->access == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+            }
+
+            access = ngx_array_push(cpcf->access);
+            if (access == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            access->mask = cidr.u.in.mask;
+            access->addr = cidr.u.in.addr;
+
+            break;
+
+# if (NGX_HAVE_INET6)
+        case AF_INET6:
+            if (cpcf->access6 == NULL) {
+                cpcf->access6 = ngx_array_create(cf->pool, cf->args->nelts - (from_position + 1),
+                                                 sizeof(ngx_in6_cidr_t));
+                if (cpcf->access6 == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+            }
+
+            access6 = ngx_array_push(cpcf->access6);
+            if (access6 == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            access6->mask = cidr.u.in6.mask;
+            access6->addr = cidr.u.in6.addr;
+
+            break;
+# endif /* NGX_HAVE_INET6 */
+        }
+    }
+
+    cpcf->enable = 1;
+
+    return NGX_CONF_OK;
+}
+
+void
+ngx_http_cache_purge_merge_conf(ngx_http_cache_purge_conf_t *conf,
+                                ngx_http_cache_purge_conf_t *prev) {
+    if (conf->enable == NGX_CONF_UNSET) {
+        if (prev->enable == 1) {
+            conf->enable = prev->enable;
+            conf->method = prev->method;
+            conf->purge_all = prev->purge_all;
+            conf->access = prev->access;
+            conf->access6 = prev->access6;
+        } else {
+            conf->enable = 0;
+        }
+    }
+}
+
+void *
+ngx_http_cache_purge_create_loc_conf(ngx_conf_t *cf) {
+    ngx_http_cache_purge_loc_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_cache_purge_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->*.method = { 0, NULL }
+     *     conf->*.access = NULL
+     *     conf->*.access6 = NULL
+     *     conf->handler = NULL
+     *     conf->original_handler = NULL
+     */
+
+# if (NGX_HTTP_FASTCGI)
+    conf->fastcgi.enable = NGX_CONF_UNSET;
+# endif /* NGX_HTTP_FASTCGI */
+# if (NGX_HTTP_PROXY)
+    conf->proxy.enable = NGX_CONF_UNSET;
+# endif /* NGX_HTTP_PROXY */
+# if (NGX_HTTP_SCGI)
+    conf->scgi.enable = NGX_CONF_UNSET;
+# endif /* NGX_HTTP_SCGI */
+# if (NGX_HTTP_UWSGI)
+    conf->uwsgi.enable = NGX_CONF_UNSET;
+# endif /* NGX_HTTP_UWSGI */
+
+    conf->resptype = NGX_CONF_UNSET_UINT;
+
+    conf->conf = NGX_CONF_UNSET_PTR;
+
+    return conf;
+}
+
+char *
+ngx_http_cache_purge_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
+    ngx_http_cache_purge_loc_conf_t  *prev = parent;
+    ngx_http_cache_purge_loc_conf_t  *conf = child;
+    ngx_http_core_loc_conf_t         *clcf;
+# if (NGX_HTTP_FASTCGI)
+    ngx_http_fastcgi_loc_conf_t      *flcf;
+# endif /* NGX_HTTP_FASTCGI */
+# if (NGX_HTTP_PROXY)
+    ngx_http_proxy_loc_conf_t        *plcf;
+# endif /* NGX_HTTP_PROXY */
+# if (NGX_HTTP_SCGI)
+    ngx_http_scgi_loc_conf_t         *slcf;
+# endif /* NGX_HTTP_SCGI */
+# if (NGX_HTTP_UWSGI)
+    ngx_http_uwsgi_loc_conf_t        *ulcf;
+# endif /* NGX_HTTP_UWSGI */
+
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
+    ngx_conf_merge_uint_value(conf->resptype, prev->resptype, NGX_REPONSE_TYPE_HTML);
+
+# if (NGX_HTTP_FASTCGI)
+    ngx_http_cache_purge_merge_conf(&conf->fastcgi, &prev->fastcgi);
+
+    if (conf->fastcgi.enable && clcf->handler != NULL) {
+        flcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_fastcgi_module);
+
+        if (flcf->upstream.upstream || flcf->fastcgi_lengths) {
+            conf->conf = &conf->fastcgi;
+            conf->handler = flcf->upstream.cache
+                            ? ngx_http_fastcgi_cache_purge_handler : NULL;
+            conf->original_handler = clcf->handler;
+
+            clcf->handler = ngx_http_cache_purge_access_handler;
+
+            return NGX_CONF_OK;
+        }
+    }
+# endif /* NGX_HTTP_FASTCGI */
+
+# if (NGX_HTTP_PROXY)
+    ngx_http_cache_purge_merge_conf(&conf->proxy, &prev->proxy);
+
+    if (conf->proxy.enable && clcf->handler != NULL) {
+        plcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_proxy_module);
+
+        if (plcf->upstream.upstream || plcf->proxy_lengths) {
+            conf->conf = &conf->proxy;
+            conf->handler = plcf->upstream.cache
+                            ? ngx_http_proxy_cache_purge_handler : NULL;
+            conf->original_handler = clcf->handler;
+
+            clcf->handler = ngx_http_cache_purge_access_handler;
+
+            return NGX_CONF_OK;
+        }
+    }
+# endif /* NGX_HTTP_PROXY */
+
+# if (NGX_HTTP_SCGI)
+    ngx_http_cache_purge_merge_conf(&conf->scgi, &prev->scgi);
+
+    if (conf->scgi.enable && clcf->handler != NULL) {
+        slcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_scgi_module);
+
+        if (slcf->upstream.upstream || slcf->scgi_lengths) {
+            conf->conf = &conf->scgi;
+            conf->handler = slcf->upstream.cache
+                            ? ngx_http_scgi_cache_purge_handler : NULL;
+            conf->original_handler = clcf->handler;
+            clcf->handler = ngx_http_cache_purge_access_handler;
+
+            return NGX_CONF_OK;
+        }
+    }
+# endif /* NGX_HTTP_SCGI */
+
+# if (NGX_HTTP_UWSGI)
+    ngx_http_cache_purge_merge_conf(&conf->uwsgi, &prev->uwsgi);
+
+    if (conf->uwsgi.enable && clcf->handler != NULL) {
+        ulcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_uwsgi_module);
+
+        if (ulcf->upstream.upstream || ulcf->uwsgi_lengths) {
+            conf->conf = &conf->uwsgi;
+            conf->handler = ulcf->upstream.cache
+                            ? ngx_http_uwsgi_cache_purge_handler : NULL;
+            conf->original_handler = clcf->handler;
+
+            clcf->handler = ngx_http_cache_purge_access_handler;
+
+            return NGX_CONF_OK;
+        }
+    }
+# endif /* NGX_HTTP_UWSGI */
+
+    ngx_conf_merge_ptr_value(conf->conf, prev->conf, NULL);
+
+    if (conf->handler == NULL) {
+        conf->handler = prev->handler;
+    }
+
+    if (conf->original_handler == NULL) {
+        conf->original_handler = prev->original_handler;
+    }
+
+    return NGX_CONF_OK;
+}
+
+#else /* !NGX_HTTP_CACHE */
+
+static ngx_http_module_t  ngx_http_cache_purge_module_ctx = {
+    NULL,  /* preconfiguration */
+    NULL,  /* postconfiguration */
+
+    NULL,  /* create main configuration */
+    NULL,  /* init main configuration */
+
+    NULL,  /* create server configuration */
+    NULL,  /* merge server configuration */
+
+    NULL,  /* create location configuration */
+    NULL,  /* merge location configuration */
+};
+
+ngx_module_t  ngx_http_cache_purge_module = {
+    NGX_MODULE_V1,
+    &ngx_http_cache_purge_module_ctx,  /* module context */
+    NULL,                              /* module directives */
+    NGX_HTTP_MODULE,                   /* module type */
+    NULL,                              /* init master */
+    NULL,                              /* init module */
+    NULL,                              /* init process */
+    NULL,                              /* init thread */
+    NULL,                              /* exit thread */
+    NULL,                              /* exit process */
+    NULL,                              /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+#endif /* NGX_HTTP_CACHE */
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy1.t b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy1.t
new file mode 100644
index 0000000..fefe9b8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy1.t
@@ -0,0 +1,136 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 4 + 3 * 1);
+
+our $http_config = <<'_EOC_';
+    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
+    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
+_EOC_
+
+our $config = <<'_EOC_';
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+    }
+
+    location ~ /purge(/.*) {
+        proxy_cache_purge  test_cache $1$is_args$args;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+worker_connections(128);
+no_shuffle();
+run_tests();
+
+no_diff();
+
+__DATA__
+
+=== TEST 1: prepare
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 2: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 3: purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /purge/proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 4: purge from empty cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /purge/proxy/passwd
+--- error_code: 412
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 412 Precondition Failed
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 5: get from source
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 6: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy1_vars.t b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy1_vars.t
new file mode 100644
index 0000000..b9da04b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy1_vars.t
@@ -0,0 +1,138 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 4 + 3 * 1);
+
+our $http_config = <<'_EOC_';
+    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
+    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
+_EOC_
+
+our $config = <<'_EOC_';
+    set $cache  test_cache;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        $cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+    }
+
+    location ~ /purge(/.*) {
+        proxy_cache_purge  $cache $1$is_args$args;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+worker_connections(128);
+no_shuffle();
+run_tests();
+
+no_diff();
+
+__DATA__
+
+=== TEST 1: prepare
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 2: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 5: < 1.7.9
+
+
+
+=== TEST 3: purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /purge/proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 4: purge from empty cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /purge/proxy/passwd
+--- error_code: 412
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 412 Precondition Failed
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 5: get from source
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 5: < 1.7.9
+
+
+
+=== TEST 6: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 5: < 1.7.9
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy2.t b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy2.t
new file mode 100644
index 0000000..4c7e19f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy2.t
@@ -0,0 +1,349 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 4 + 6 * 1);
+
+our $http_config = <<'_EOC_';
+    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
+    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
+_EOC_
+
+our $config = <<'_EOC_';
+    proxy_cache_purge  on;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+
+        if ($uri)          { }
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+our $config_allowed = <<'_EOC_';
+    proxy_cache_purge  PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+our $config_forbidden = <<'_EOC_';
+    proxy_cache_purge  PURGE from 1.0.0.0/8;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+worker_connections(128);
+no_shuffle();
+run_tests();
+
+no_diff();
+
+__DATA__
+
+=== TEST 1: prepare
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 2: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 3: purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 4: purge from empty cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /proxy/passwd
+--- error_code: 412
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 412 Precondition Failed
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 5: get from source
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 6: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 7: purge from cache (PURGE allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_allowed
+--- request
+PURGE /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 8: purge from empty cache (PURGE allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_allowed
+--- request
+PURGE /proxy/passwd
+--- error_code: 412
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 412 Precondition Failed
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 9: get from source (PURGE allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_allowed
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 10: get from cache (PURGE allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_allowed
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 11: purge from cache (PURGE not allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_forbidden
+--- request
+PURGE /proxy/passwd
+--- error_code: 403
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 403 Forbidden
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 12: get from cache (PURGE not allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_forbidden
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 13: no cache (PURGE allowed)
+--- http_config eval: $::http_config
+--- config
+    proxy_cache_purge  PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+--- request
+PURGE /proxy/passwd
+--- error_code: 404
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 14: no cache (PURGE not allowed)
+--- http_config eval: $::http_config
+--- config
+    proxy_cache_purge  PURGE from 1.0.0.0/8;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+--- request
+PURGE /proxy/passwd
+--- error_code: 403
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 403 Forbidden
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 15: multiple cache purge directives
+--- http_config eval: $::http_config
+--- config
+    fastcgi_cache_purge  on;
+    proxy_cache_purge    on;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+
+        if ($uri)          { }
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+--- request
+PURGE /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy2_vars.t b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy2_vars.t
new file mode 100644
index 0000000..08e3e1e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy2_vars.t
@@ -0,0 +1,353 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 4 + 6 * 1);
+
+our $http_config = <<'_EOC_';
+    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
+    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
+_EOC_
+
+our $config = <<'_EOC_';
+    proxy_cache_purge  on;
+    set $cache         test_cache;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        $cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+
+        if ($uri)          { }
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+our $config_allowed = <<'_EOC_';
+    proxy_cache_purge  PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
+    set $cache         test_cache;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        $cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+our $config_forbidden = <<'_EOC_';
+    proxy_cache_purge  PURGE from 1.0.0.0/8;
+    set $cache         test_cache;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        $cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+worker_connections(128);
+no_shuffle();
+run_tests();
+
+no_diff();
+
+__DATA__
+
+=== TEST 1: prepare
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 2: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 5: < 1.7.9
+
+
+
+=== TEST 3: purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 4: purge from empty cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /proxy/passwd
+--- error_code: 412
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 412 Precondition Failed
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 5: get from source
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 5: < 1.7.9
+
+
+
+=== TEST 6: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 5: < 1.7.9
+
+
+
+=== TEST 7: purge from cache (PURGE allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_allowed
+--- request
+PURGE /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 8: purge from empty cache (PURGE allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_allowed
+--- request
+PURGE /proxy/passwd
+--- error_code: 412
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 412 Precondition Failed
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 9: get from source (PURGE allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_allowed
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 5: < 1.7.9
+
+
+
+=== TEST 10: get from cache (PURGE allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_allowed
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 5: < 1.7.9
+
+
+
+=== TEST 11: purge from cache (PURGE not allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_forbidden
+--- request
+PURGE /proxy/passwd
+--- error_code: 403
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 403 Forbidden
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 12: get from cache (PURGE not allowed)
+--- http_config eval: $::http_config
+--- config eval: $::config_forbidden
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 5: < 1.7.9
+
+
+
+=== TEST 13: no cache (PURGE allowed)
+--- http_config eval: $::http_config
+--- config
+    proxy_cache_purge  PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+--- request
+PURGE /proxy/passwd
+--- error_code: 404
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 14: no cache (PURGE not allowed)
+--- http_config eval: $::http_config
+--- config
+    proxy_cache_purge  PURGE from 1.0.0.0/8;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+--- request
+PURGE /proxy/passwd
+--- error_code: 403
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 403 Forbidden
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
+
+
+
+=== TEST 15: multiple cache purge directives
+--- http_config eval: $::http_config
+--- config
+    fastcgi_cache_purge  on;
+    proxy_cache_purge    on;
+    set $cache           test_cache;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        $cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+
+        if ($uri)          { }
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+--- request
+PURGE /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx: 4: < 1.7.9
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy3.t b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy3.t
new file mode 100644
index 0000000..c8d71d9
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy3.t
@@ -0,0 +1,140 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => 32;
+
+our $http_config = <<'_EOC_';
+    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
+    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
+_EOC_
+
+our $config = <<'_EOC_';
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+
+        proxy_cache_purge PURGE purge_all from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
+    }
+
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+worker_connections(128);
+no_shuffle();
+run_tests();
+
+no_diff();
+
+__DATA__
+
+=== TEST 1: prepare passwd
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 2: prepare shadow
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/shadow
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+
+=== TEST 3: get from cache passwd
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 4: get from cache shadow
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/shadow
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 5: purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /proxy/any
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 6: get from empty cache passwd
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 7: get from empty cache shadow
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/shadow
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy4.t b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy4.t
new file mode 100644
index 0000000..e4d2f30
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/proxy4.t
@@ -0,0 +1,168 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => 41;
+
+our $http_config = <<'_EOC_';
+    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
+    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
+_EOC_
+
+our $config = <<'_EOC_';
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+
+        proxy_cache_purge PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
+    }
+
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+worker_connections(128);
+no_shuffle();
+run_tests();
+
+no_diff();
+
+__DATA__
+
+=== TEST 1: prepare passwd
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 2: prepare passwd2
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd2
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 3: prepare shadow
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/shadow
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 4: get from cache passwd
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 5: get from cache passwd2
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd2
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 6: purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /proxy/pass*
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 7: get from empty cache passwd
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 8: get from empty cache passwd2
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd2
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+
+
+=== TEST 9: get from cache shadow
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/shadow
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
diff --git a/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/resptype1.t b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/resptype1.t
new file mode 100644
index 0000000..816c3ff
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-cache-purge-2.5.3/t/resptype1.t
@@ -0,0 +1,245 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 4 + 3 * 1);
+
+our $http_config = <<'_EOC_';
+    proxy_cache_path  /tmp/ngx_cache_purge_cache keys_zone=test_cache:10m;
+    proxy_temp_path   /tmp/ngx_cache_purge_temp 1 2;
+_EOC_
+
+our $config = <<'_EOC_';
+
+    cache_purge_response_type json;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+    }
+
+    location ~ /purge(/.*) {
+        proxy_cache_purge           test_cache $1$is_args$args;
+        cache_purge_response_type   html;
+    }
+
+    location ~ /purge_json(/.*) {
+        proxy_cache_purge           test_cache $1$is_args$args;
+    }
+
+    location ~ /purge_xml(/.*) {
+        proxy_cache_purge           test_cache $1$is_args$args;
+        cache_purge_response_type   xml;
+    }
+
+    location ~ /purge_text(/.*) {
+        proxy_cache_purge           test_cache $1$is_args$args;
+        cache_purge_response_type   text;
+    }
+
+
+
+    location = /etc/passwd {
+        root               /;
+    }
+_EOC_
+
+worker_connections(128);
+no_shuffle();
+run_tests();
+
+no_diff();
+
+__DATA__
+
+=== TEST 1: prepare
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 2: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 3: purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /purge/proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 4: purge from empty cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /purge/proxy/passwd
+--- error_code: 412
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 412 Precondition Failed
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 5: get from source
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: MISS
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 6: get from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+X-Cache-Status: HIT
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 5: < 0.8.3 or < 0.7.62
+
+=== TEST 7-prepare: prepare purge
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd?t=7
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+=== TEST 7: get a JSON response after purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /purge_json/proxy/passwd?t=7
+--- error_code: 200
+--- response_headers
+Content-Type: application/json
+--- response_body_like: {\"Key\": \"\/proxy\/passwd\?t=7\"
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+=== TEST 8-prepare: prepare purge
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd?t=8
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+=== TEST 8: get a XML response after purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /purge_xml/proxy/passwd?t=8
+--- error_code: 200
+--- response_headers
+Content-Type: text/xml
+--- response_body_like: \<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><status><Key><\!\[CDATA\[\/proxy\/passwd\?t=8\]\]><\/Key>
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+=== TEST 9-prepare: prepare purge
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+GET /proxy/passwd?t=9
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: root
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+=== TEST 9: get a TEXT response after purge from cache
+--- http_config eval: $::http_config
+--- config eval: $::config
+--- request
+PURGE /purge_text/proxy/passwd?t=9
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like: Key
+--- timeout: 10
+--- no_error_log eval
+qr/\[(warn|error|crit|alert|emerg)\]/
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/.gitattributes b/modules_deb/libnginx-mod-http-echo-0.63/.gitattributes
new file mode 100644
index 0000000..6fe6f35
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/.gitattributes
@@ -0,0 +1 @@
+*.t linguist-language=Text
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/.gitignore b/modules_deb/libnginx-mod-http-echo-0.63/.gitignore
new file mode 100644
index 0000000..a9948e4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/.gitignore
@@ -0,0 +1,65 @@
+.libs
+*.swp
+*.slo
+*.la
+*.swo
+*.lo
+*.mobi
+genmobi.sh
+*~
+*.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_
+reindex
+src/location.h
+src/filter.c
+src/subrequest.h
+src/sleep.h
+src/util.c
+src/echo.c
+src/info.c
+src/util.h
+src/var.h
+src/filter.h
+src/sleep.c
+src/var.c
+src/timer.c
+src/module.h
+src/echo.h
+src/info.h
+src/foreach.c
+src/location.c
+src/timer.h
+src/module.c
+src/subrequest.c
+src/handler.h
+src/foreach.h
+src/handler.c
+nginx
+*.html
+ctags
+t/servroot
+all
+buildroot/
+go
+Changes
+build1[0-9]
+analyze
+Makefile
+*.plist
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/.travis.yml b/modules_deb/libnginx-mod-http-echo-0.63/.travis.yml
new file mode 100644
index 0000000..7dda358
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/.travis.yml
@@ -0,0 +1,48 @@
+sudo: required
+dist: bionic
+
+os: linux
+
+language: c
+
+compiler:
+  - gcc
+
+env:
+  global:
+    - LUAJIT_PREFIX=/opt/luajit21
+    - LUAJIT_LIB=$LUAJIT_PREFIX/lib
+    - LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
+    - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
+  matrix:
+    - NGINX_VERSION=1.17.8
+    - NGINX_VERSION=1.19.9
+
+before_install:
+  - sudo apt-get install -qq -y cpanminus libgd-dev ca-certificates
+  - sudo cpanm -v --notest Test::Nginx > build.log 2>&1 || (cat build.log && exit 1)
+
+install:
+  - wget http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && tar -xzf nginx-${NGINX_VERSION}.tar.gz
+  - git clone https://github.com/simpl/ngx_devel_kit.git
+  - git clone https://github.com/openresty/set-misc-nginx-module.git
+  - git clone https://github.com/openresty/xss-nginx-module.git
+  - git clone https://github.com/openresty/rds-json-nginx-module.git
+  - git clone https://github.com/openresty/headers-more-nginx-module.git
+  - git clone https://github.com/openresty/lua-nginx-module.git
+  - git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core
+  - git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
+  - git clone https://github.com/openresty/nginx-eval-module.git
+  - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git luajit2
+
+script:
+  - cd luajit2/
+  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT -msse4.2' > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ..
+  - cd nginx-${NGINX_VERSION}/
+  -  ./configure --without-http_ssi_module --with-debug --with-select_module --with-poll_module --with-http_stub_status_module --with-http_image_filter_module --add-module=../ngx_devel_kit --add-module=../set-misc-nginx-module --add-module=../nginx-eval-module --add-module=../xss-nginx-module --add-module=../rds-json-nginx-module --add-module=../headers-more-nginx-module --add-module=../lua-nginx-module  --add-module=.. > build.log 2>&1 || (cat build.log && exit 1)
+  - make -j2 > build.log 2>&1 || (cat build.log && exit 1)
+  - export PATH=$PATH:`pwd`/objs
+  - cd ..
+  - prove -I. -r t
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/LICENSE b/modules_deb/libnginx-mod-http-echo-0.63/LICENSE
new file mode 100644
index 0000000..6feffbf
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/LICENSE
@@ -0,0 +1,25 @@
+Copyright (C) 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/README.markdown b/modules_deb/libnginx-mod-http-echo-0.63/README.markdown
new file mode 100644
index 0000000..a6b25e3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/README.markdown
@@ -0,0 +1,1851 @@
+Name
+====
+
+**ngx_echo** - Brings "echo", "sleep", "time", "exec" and more shell-style goodies to Nginx config file.
+
+*This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
+
+Table of Contents
+=================
+
+* [Name](#name)
+* [Status](#status)
+* [Version](#version)
+* [Synopsis](#synopsis)
+* [Description](#description)
+* [Content Handler Directives](#content-handler-directives)
+    * [echo](#echo)
+    * [echo_duplicate](#echo_duplicate)
+    * [echo_flush](#echo_flush)
+    * [echo_sleep](#echo_sleep)
+    * [echo_blocking_sleep](#echo_blocking_sleep)
+    * [echo_reset_timer](#echo_reset_timer)
+    * [echo_read_request_body](#echo_read_request_body)
+    * [echo_location_async](#echo_location_async)
+    * [echo_location](#echo_location)
+    * [echo_subrequest_async](#echo_subrequest_async)
+    * [echo_subrequest](#echo_subrequest)
+    * [echo_foreach_split](#echo_foreach_split)
+    * [echo_end](#echo_end)
+    * [echo_request_body](#echo_request_body)
+    * [echo_exec](#echo_exec)
+    * [echo_status](#echo_status)
+* [Filter Directives](#filter-directives)
+    * [echo_before_body](#echo_before_body)
+    * [echo_after_body](#echo_after_body)
+* [Variables](#variables)
+    * [$echo_it](#echo_it)
+    * [$echo_timer_elapsed](#echo_timer_elapsed)
+    * [$echo_request_body](#echo_request_body)
+    * [$echo_request_method](#echo_request_method)
+    * [$echo_client_request_method](#echo_client_request_method)
+    * [$echo_client_request_headers](#echo_client_request_headers)
+    * [$echo_cacheable_request_uri](#echo_cacheable_request_uri)
+    * [$echo_request_uri](#echo_request_uri)
+    * [$echo_incr](#echo_incr)
+    * [$echo_response_status](#echo_response_status)
+* [Installation](#installation)
+* [Compatibility](#compatibility)
+* [Modules that use this module for testing](#modules-that-use-this-module-for-testing)
+* [Community](#community)
+    * [English Mailing List](#english-mailing-list)
+    * [Chinese Mailing List](#chinese-mailing-list)
+* [Report Bugs](#report-bugs)
+* [Source Repository](#source-repository)
+* [Changes](#changes)
+* [Test Suite](#test-suite)
+* [TODO](#todo)
+* [Getting involved](#getting-involved)
+* [Author](#author)
+* [Copyright & License](#copyright--license)
+* [See Also](#see-also)
+
+Status
+======
+
+This module is production ready.
+
+Version
+=======
+
+This document describes ngx_echo [v0.62](https://github.com/openresty/echo-nginx-module/tags) released on 2 July, 2020.
+
+Synopsis
+========
+
+```nginx
+
+   location /hello {
+     echo "hello, world!";
+   }
+```
+
+```nginx
+
+   location /hello {
+     echo -n "hello, ";
+     echo "world!";
+   }
+```
+
+```nginx
+
+   location /timed_hello {
+     echo_reset_timer;
+     echo hello world;
+     echo "'hello world' takes about $echo_timer_elapsed sec.";
+     echo hiya igor;
+     echo "'hiya igor' takes about $echo_timer_elapsed sec.";
+   }
+```
+
+```nginx
+
+   location /echo_with_sleep {
+     echo hello;
+     echo_flush;  # ensure the client can see previous output immediately
+     echo_sleep   2.5;  # in sec
+     echo world;
+   }
+```
+
+```nginx
+
+   # in the following example, accessing /echo yields
+   #   hello
+   #   world
+   #   blah
+   #   hiya
+   #   igor
+   location /echo {
+       echo_before_body hello;
+       echo_before_body world;
+       proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
+       echo_after_body hiya;
+       echo_after_body igor;
+   }
+   location /echo/more {
+       echo blah;
+   }
+```
+
+```nginx
+
+   # the output of /main might be
+   #   hello
+   #   world
+   #   took 0.000 sec for total.
+   # and the whole request would take about 2 sec to complete.
+   location /main {
+       echo_reset_timer;
+
+       # subrequests in parallel
+       echo_location_async /sub1;
+       echo_location_async /sub2;
+
+       echo "took $echo_timer_elapsed sec for total.";
+   }
+   location /sub1 {
+       echo_sleep 2;
+       echo hello;
+   }
+   location /sub2 {
+       echo_sleep 1;
+       echo world;
+   }
+```
+
+```nginx
+
+   # the output of /main might be
+   #   hello
+   #   world
+   #   took 3.003 sec for total.
+   # and the whole request would take about 3 sec to complete.
+   location /main {
+       echo_reset_timer;
+
+       # subrequests in series (chained by CPS)
+       echo_location /sub1;
+       echo_location /sub2;
+
+       echo "took $echo_timer_elapsed sec for total.";
+   }
+   location /sub1 {
+       echo_sleep 2;
+       echo hello;
+   }
+   location /sub2 {
+       echo_sleep 1;
+       echo world;
+   }
+```
+
+```nginx
+
+   # Accessing /dup gives
+   #   ------ END ------
+   location /dup {
+     echo_duplicate 3 "--";
+     echo_duplicate 1 " END ";
+     echo_duplicate 3 "--";
+     echo;
+   }
+```
+
+```nginx
+
+   # /bighello will generate 1000,000,000 hello's.
+   location /bighello {
+     echo_duplicate 1000_000_000 'hello';
+   }
+```
+
+```nginx
+
+   # echo back the client request
+   location /echoback {
+     echo_duplicate 1 $echo_client_request_headers;
+     echo "\r";
+
+     echo_read_request_body;
+
+     echo_request_body;
+   }
+```
+
+```nginx
+
+   # GET /multi will yields
+   #   querystring: foo=Foo
+   #   method: POST
+   #   body: hi
+   #   content length: 2
+   #   ///
+   #   querystring: bar=Bar
+   #   method: PUT
+   #   body: hello
+   #   content length: 5
+   #   ///
+   location /multi {
+       echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
+       echo_subrequest_async PUT '/sub' -q 'bar=Bar' -b 'hello';
+   }
+   location /sub {
+       echo "querystring: $query_string";
+       echo "method: $echo_request_method";
+       echo "body: $echo_request_body";
+       echo "content length: $http_content_length";
+       echo '///';
+   }
+```
+
+```nginx
+
+   # GET /merge?/foo.js&/bar/blah.js&/yui/baz.js will merge the .js resources together
+   location /merge {
+       default_type 'text/javascript';
+       echo_foreach_split '&' $query_string;
+           echo "/* JS File $echo_it */";
+           echo_location_async $echo_it;
+           echo;
+       echo_end;
+   }
+```
+
+```nginx
+
+   # accessing /if?val=abc yields the "hit" output
+   # while /if?val=bcd yields "miss":
+   location ^~ /if {
+       set $res miss;
+       if ($arg_val ~* '^a') {
+           set $res hit;
+           echo $res;
+       }
+       echo $res;
+   }
+```
+
+[Back to TOC](#table-of-contents)
+
+Description
+===========
+
+This module wraps lots of Nginx internal APIs for streaming input and output, parallel/sequential subrequests, timers and sleeping, as well as various meta data accessing.
+
+Basically it provides various utilities that help testing and debugging of other modules by trivially emulating different kinds of faked subrequest locations.
+
+People will also find it useful in real-world applications that need to
+
+1. serve static contents directly from memory (loading from the Nginx config file).
+1. wrap the upstream response with custom header and footer (kinda like the [addition module](http://nginx.org/en/docs/http/ngx_http_addition_module.html) but with contents read directly from the config file and Nginx variables).
+1. merge contents of various "Nginx locations" (i.e., subrequests) together in a single main request (using [echo_location](#echo_location) and its friends).
+
+This is a special dual-role module that can *lazily* serve as a content handler or register itself as an output filter only upon demand. By default, this module does not do anything at all.
+
+Technically, this module has also demonstrated the following techniques that might be helpful for module writers:
+
+1. Issue parallel subrequests directly from content handler.
+1. Issue chained subrequests directly from content handler, by passing continuation along the subrequest chain.
+1. Issue subrequests with all HTTP 1.1 methods and even an optional faked HTTP request body.
+1. Interact with the Nginx event model directly from content handler using custom events and timers, and resume the content handler back if necessary.
+1. Dual-role module that can (lazily) serve as a content handler or an output filter or both.
+1. Nginx config file variable creation and interpolation.
+1. Streaming output control using output_chain, flush and its friends.
+1. Read client request body from the content handler, and returns back (asynchronously) to the content handler after completion.
+1. Use Perl-based declarative [test suite](#test-suite) to drive the development of Nginx C modules.
+
+[Back to TOC](#table-of-contents)
+
+Content Handler Directives
+==========================
+
+Use of the following directives register this module to the current Nginx location as a content handler. If you want to use another module, like the [standard proxy module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), as the content handler, use the [filter directives](#filter-directives) provided by this module.
+
+All the content handler directives can be mixed together in a single Nginx location and they're supposed to run sequentially just as in the Bash scripting language.
+
+Every content handler directive supports variable interpolation in its arguments (if any).
+
+The MIME type set by the [standard default_type directive](http://nginx.org/en/docs/http/ngx_http_core_module.html#default_type) is respected by this module, as in:
+
+```nginx
+
+   location /hello {
+     default_type text/plain;
+     echo hello;
+   }
+```
+
+Then on the client side:
+
+```bash
+
+   $ curl -I 'http://localhost/echo'
+   HTTP/1.1 200 OK
+   Server: nginx/0.8.20
+   Date: Sat, 17 Oct 2009 03:40:19 GMT
+   Content-Type: text/plain
+   Connection: keep-alive
+```
+
+Since the [v0.22](#v022) release, all of the directives are allowed in the [rewrite module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)'s [if](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#if) directive block, for instance:
+
+```nginx
+
+ location ^~ /if {
+     set $res miss;
+     if ($arg_val ~* '^a') {
+         set $res hit;
+         echo $res;
+     }
+     echo $res;
+ }
+```
+
+[Back to TOC](#table-of-contents)
+
+echo
+----
+**syntax:** *echo \[options\] &lt;string&gt;...*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Sends arguments joined by spaces, along with a trailing newline, out to the client.
+
+Note that the data might be buffered by Nginx's underlying buffer. To force the output data flushed immediately, use the [echo_flush](#echo_flush) command just after `echo`, as in
+
+```nginx
+
+    echo hello world;
+    echo_flush;
+```
+
+When no argument is specified, *echo* emits the trailing newline alone, just like the *echo* command in shell.
+
+Variables may appear in the arguments. An example is
+
+```nginx
+
+    echo The current request uri is $request_uri;
+```
+
+where [$request_uri](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_uri) is a variable exposed by the [ngx_http_core_module](http://nginx.org/en/docs/http/ngx_http_core_module.html).
+
+This command can be used multiple times in a single location configuration, as in
+
+```nginx
+
+ location /echo {
+     echo hello;
+     echo world;
+ }
+```
+
+The output on the client side looks like this
+
+```bash
+
+ $ curl 'http://localhost/echo'
+ hello
+ world
+```
+
+Special characters like newlines (`\n`) and tabs (`\t`) can be escaped using C-style escaping sequences. But a notable exception is the dollar sign (`$`). As of Nginx 0.8.20, there's still no clean way to escape this character. (A work-around might be to use a `$echo_dollor` variable that is always evaluated to the constant `$` character. This feature will possibly be introduced in a future version of this module.)
+
+As of the echo [v0.28](#v028) release, one can suppress the trailing newline character in the output by using the `-n` option, as in
+
+```nginx
+
+ location /echo {
+     echo -n "hello, ";
+     echo "world";
+ }
+```
+
+Accessing `/echo` gives
+
+```bash
+
+ $ curl 'http://localhost/echo'
+ hello, world
+```
+
+Leading `-n` in variable values won't take effect and will be emitted literally, as in
+
+```nginx
+
+ location /echo {
+     set $opt -n;
+     echo $opt "hello,";
+     echo "world";
+ }
+```
+
+This gives the following output
+
+```bash
+
+ $ curl 'http://localhost/echo'
+ -n hello,
+ world
+```
+
+One can output leading `-n` literals and other options using the special `--` option like this
+
+```nginx
+
+ location /echo {
+     echo -- -n is an option;
+ }
+```
+
+which yields
+
+```bash
+
+ $ curl 'http://localhost/echo'
+ -n is an option
+```
+
+Use this form when you want to output anything leading with a dash (`-`).
+
+[Back to TOC](#table-of-contents)
+
+echo_duplicate
+--------------
+**syntax:** *echo_duplicate &lt;count&gt; &lt;string&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Outputs duplication of a string indicated by the second argument, using the count specified in the first argument.
+
+For instance,
+
+```nginx
+
+   location /dup {
+       echo_duplicate 3 "abc";
+   }
+```
+
+will lead to the output of `"abcabcabc"`.
+
+Underscores are allowed in the count number, just like in Perl. For example, to emit 1000,000,000 instances of `"hello, world"`:
+
+```nginx
+
+   location /many_hellos {
+       echo_duplicate 1000_000_000 "hello, world";
+   }
+```
+
+The `count` argument could be zero, but not negative. The second `string` argument could be an empty string ("") likewise.
+
+Unlike the [echo](#echo) directive, no trailing newline is appended to the result. So it's possible to "abuse" this directive as a no-trailing-newline version of [echo](#echo) by using "count" 1, as in
+
+```nginx
+
+   location /echo_art {
+       echo_duplicate 2 '---';
+       echo_duplicate 1 ' END ';  # we don't want a trailing newline here
+       echo_duplicate 2 '---';
+       echo;  # we want a trailing newline here...
+   }
+```
+
+You get
+
+```bash
+   ------ END ------
+```
+
+But use of the `-n` option in [echo](#echo) is more appropriate for this purpose.
+
+This directive was first introduced in [version 0.11](#v011).
+
+[Back to TOC](#table-of-contents)
+
+echo_flush
+----------
+**syntax:** *echo_flush*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Forces the data potentially buffered by underlying Nginx output filters to send immediately to the client side via socket.
+
+Note that techically the command just emits a ngx_buf_t object with `flush` slot set to 1, so certain weird third-party output filter module could still block it before it reaches Nginx's (last) write filter.
+
+This directive does not take any argument.
+
+Consider the following example:
+
+```nginx
+
+   location /flush {
+      echo hello;
+
+      echo_flush;
+
+      echo_sleep 1;
+      echo world;
+   }
+```
+
+Then on the client side, using curl to access `/flush`, you'll see the "hello" line immediately, but only after 1 second, the last "world" line. Without calling `echo_flush` in the example above, you'll most likely see no output until 1 second is elapsed due to the internal buffering of Nginx.
+
+This directive will fail to flush the output buffer in case of subrequests get involved. Consider the following example:
+
+```nginx
+
+   location /main {
+       echo_location_async /sub;
+       echo hello;
+       echo_flush;
+   }
+   location /sub {
+       echo_sleep 1;
+   }
+```
+
+Then the client won't see "hello" appear even if `echo_flush` has been executed before the subrequest to `/sub` has actually started executing. The outputs of `/main` that are sent *after* [echo_location_async](#echo_location_async) will be postponed and buffered firmly.
+
+This does *not* apply to outputs sent before the subrequest initiated. For a modified version of the example given above:
+
+```nginx
+
+   location /main {
+       echo hello;
+       echo_flush;
+       echo_location_async /sub;
+   }
+   location /sub {
+       echo_sleep 1;
+   }
+```
+
+The client will immediately see "hello" before `/sub` enters sleeping.
+
+See also [echo](#echo), [echo_sleep](#echo_sleep), and [echo_location_async](#echo_location_async).
+
+[Back to TOC](#table-of-contents)
+
+echo_sleep
+----------
+**syntax:** *echo_sleep &lt;seconds&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Sleeps for the time period specified by the argument, which is in seconds.
+
+This operation is non-blocking on server side, so unlike the [echo_blocking_sleep](#echo_blocking_sleep) directive, it won't block the whole Nginx worker process.
+
+The period might takes three digits after the decimal point and must be greater than 0.001.
+
+An example is
+
+```nginx
+
+    location /echo_after_sleep {
+        echo_sleep 1.234;
+        echo resumed!;
+    }
+```
+
+Behind the scene, it sets up a per-request "sleep" ngx_event_t object, and adds a timer using that custom event to the Nginx event model and just waits for a timeout on that event. Because the "sleep" event is per-request, this directive can work in parallel subrequests.
+
+[Back to TOC](#table-of-contents)
+
+echo_blocking_sleep
+-------------------
+**syntax:** *echo_blocking_sleep &lt;seconds&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+This is a blocking version of the [echo_sleep](#echo_sleep) directive.
+
+See the documentation of [echo_sleep](#echo_sleep) for more detail.
+
+Behind the curtain, it calls the ngx_msleep macro provided by the Nginx core which maps to usleep on POSIX-compliant systems.
+
+Note that this directive will block the current Nginx worker process completely while being executed, so never use it in production environment.
+
+[Back to TOC](#table-of-contents)
+
+echo_reset_timer
+----------------
+**syntax:** *echo_reset_timer*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Reset the timer begin time to *now*, i.e., the time when this command is executed during request.
+
+The timer begin time is default to the starting time of the current request and can be overridden by this directive, potentially multiple times in a single location. For example:
+
+```nginx
+
+   location /timed_sleep {
+       echo_sleep 0.03;
+       echo "$echo_timer_elapsed sec elapsed.";
+
+       echo_reset_timer;
+
+       echo_sleep 0.02;
+       echo "$echo_timer_elapsed sec elapsed.";
+   }
+```
+
+The output on the client side might be
+
+```bash
+
+ $ curl 'http://localhost/timed_sleep'
+ 0.032 sec elapsed.
+ 0.020 sec elapsed.
+```
+
+The actual figures you get on your side may vary a bit due to your system's current activities.
+
+Invocation of this directive will force the underlying Nginx timer to get updated to the current system time (regardless the timer resolution specified elsewhere in the config file). Furthermore, references of the [$echo_timer_elapsed](#echo_timer_elapsed) variable will also trigger timer update forcibly.
+
+See also [echo_sleep](#echo_sleep) and [$echo_timer_elapsed](#echo_timer_elapsed).
+
+[Back to TOC](#table-of-contents)
+
+echo_read_request_body
+----------------------
+**syntax:** *echo_read_request_body*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Explicitly reads request body so that the [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) variable will always have non-empty values (unless the body is so big that it has been saved by Nginx to a local temporary file).
+
+Note that this might not be the original client request body because the current request might be a subrequest with a "artificial" body specified by its parent.
+
+This directive does not generate any output itself, just like [echo_sleep](#echo_sleep).
+
+Here's an example for echo'ing back the original HTTP client request (both headers and body are included):
+
+```nginx
+
+   location /echoback {
+     echo_duplicate 1 $echo_client_request_headers;
+     echo "\r";
+     echo_read_request_body;
+     echo $request_body;
+   }
+```
+
+The content of `/echoback` looks like this on my side (I was using Perl's LWP utility to access this location on the server):
+
+```bash
+
+   $ (echo hello; echo world) | lwp-request -m POST 'http://localhost/echoback'
+   POST /echoback HTTP/1.1
+   TE: deflate,gzip;q=0.3
+   Connection: TE, close
+   Host: localhost
+   User-Agent: lwp-request/5.818 libwww-perl/5.820
+   Content-Length: 12
+   Content-Type: application/x-www-form-urlencoded
+
+   hello
+   world
+```
+
+Because `/echoback` is the main request, [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) holds the original client request body.
+
+Before Nginx 0.7.56, it makes no sense to use this directive because [$request_body](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_body) was first introduced in Nginx 0.7.58.
+
+This directive itself was first introduced in the echo module's [v0.14 release](#v014).
+
+[Back to TOC](#table-of-contents)
+
+echo_location_async
+-------------------
+**syntax:** *echo_location_async &lt;location&gt; [&lt;url_args&gt;]*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Issue GET subrequest to the location specified (first argument) with optional url arguments specified in the second argument.
+
+As of Nginx 0.8.20, the `location` argument does *not* support named location, due to a limitation in the `ngx_http_subrequest` function. The same is true for its brother, the [echo_location](#echo_location) directive.
+
+A very simple example is
+
+```nginx
+
+ location /main {
+     echo_location_async /sub;
+     echo world;
+ }
+ location /sub {
+     echo hello;
+ }
+```
+
+Accessing `/main` gets
+
+```bash
+
+   hello
+   world
+```
+
+Calling multiple locations in parallel is also possible:
+
+```nginx
+
+ location /main {
+     echo_reset_timer;
+     echo_location_async /sub1;
+     echo_location_async /sub2;
+     echo "took $echo_timer_elapsed sec for total.";
+ }
+ location /sub1 {
+     echo_sleep 2; # sleeps 2 sec
+     echo hello;
+ }
+ location /sub2 {
+     echo_sleep 1; # sleeps 1 sec
+     echo world;
+ }
+```
+
+Accessing `/main` yields
+
+```bash
+
+   $ time curl 'http://localhost/main'
+   hello
+   world
+   took 0.000 sec for total.
+
+   real  0m2.006s
+   user  0m0.000s
+   sys   0m0.004s
+```
+
+You can see that the main handler `/main` does *not* wait the subrequests `/sub1` and `/sub2` to complete and quickly goes on, hence the "0.000 sec" timing result. The whole request, however takes approximately 2 sec in total to complete because `/sub1` and `/sub2` run in parallel (or "concurrently" to be more accurate).
+
+If you use [echo_blocking_sleep](#echo_blocking_sleep) in the previous example instead, then you'll get the same output, but with 3 sec total response time, because "blocking sleep" blocks the whole Nginx worker process.
+
+Locations can also take an optional querystring argument, for instance
+
+```nginx
+
+ location /main {
+     echo_location_async /sub 'foo=Foo&bar=Bar';
+ }
+ location /sub {
+     echo $arg_foo $arg_bar;
+ }
+```
+
+Accessing `/main` yields
+
+```bash
+
+   $ curl 'http://localhost/main'
+   Foo Bar
+```
+
+Querystrings is *not* allowed to be concatenated onto the `location` argument with "?" directly, for example, `/sub?foo=Foo&bar=Bar` is an invalid location, and shouldn't be fed as the first argument to this directive.
+
+Technically speaking, this directive is an example that Nginx content handler issues one or more subrequests directly. AFAIK, the [fancyindex module](https://connectical.com/projects/ngx-fancyindex/wiki) also does such kind of things ;)
+
+Nginx named locations like `@foo` is *not* supported here.
+
+This directive is logically equivalent to the GET version of [echo_subrequest_async](#echo_subrequest_async). For example,
+
+```nginx
+
+   echo_location_async /foo 'bar=Bar';
+```
+
+is logically equivalent to
+
+```nginx
+
+   echo_subrequest_async GET /foo -q 'bar=Bar';
+```
+
+But calling this directive is slightly faster than calling [echo_subrequest_async](#echo_subrequest_async) using `GET` because we don't have to parse the HTTP method names like `GET` and options like `-q`.
+
+This directive is first introduced in [version 0.09](#v009) of this module and requires at least Nginx 0.7.46.
+
+[Back to TOC](#table-of-contents)
+
+echo_location
+-------------
+**syntax:** *echo_location &lt;location&gt; [&lt;url_args&gt;]*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Just like the [echo_location_async](#echo_location_async) directive, but `echo_location` issues subrequests *in series* rather than in parallel. That is, the content handler directives following this directive won't be executed until the subrequest issued by this directive completes.
+
+The final response body is almost always equivalent to the case when [echo_location_async](#echo_location_async) is used instead, only if timing variables is used in the outputs.
+
+Consider the following example:
+
+```nginx
+
+ location /main {
+     echo_reset_timer;
+     echo_location /sub1;
+     echo_location /sub2;
+     echo "took $echo_timer_elapsed sec for total.";
+ }
+ location /sub1 {
+     echo_sleep 2;
+     echo hello;
+ }
+ location /sub2 {
+     echo_sleep 1;
+     echo world;
+ }
+```
+
+The location `/main` above will take for total 3 sec to complete (compared to 2 sec if [echo_location_async](#echo_location_async) is used instead here). Here's the result in action on my machine:
+
+```bash
+
+   $ curl 'http://localhost/main'
+   hello
+   world
+   took 3.003 sec for total.
+
+   real  0m3.027s
+   user  0m0.020s
+   sys   0m0.004s
+```
+
+This directive is logically equivalent to the GET version of [echo_subrequest](#echo_subrequest). For example,
+
+```nginx
+
+   echo_location /foo 'bar=Bar';
+```
+
+is logically equivalent to
+
+```nginx
+
+   echo_subrequest GET /foo -q 'bar=Bar';
+```
+
+But calling this directive is slightly faster than calling [echo_subrequest](#echo_subrequest) using `GET` because we don't have to parse the HTTP method names like `GET` and options like `-q`.
+
+Behind the scene, it creates an `ngx_http_post_subrequest_t` object as a *continuation* and passes it into the `ngx_http_subrequest` function call. Nginx will later reopen this "continuation" in the subrequest's `ngx_http_finalize_request` function call. We resumes the execution of the parent-request's content handler and starts to run the next directive (command) if any.
+
+Nginx named locations like `@foo` is *not* supported here.
+
+This directive was first introduced in the [release v0.12](#v012).
+
+See also [echo_location_async](#echo_location_async) for more details about the meaning of the arguments.
+
+[Back to TOC](#table-of-contents)
+
+echo_subrequest_async
+---------------------
+**syntax:** *echo_subrequest_async &lt;HTTP_method&gt; &lt;location&gt; [-q &lt;url_args&gt;] [-b &lt;request_body&gt;] [-f &lt;request_body_path&gt;]*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Initiate an asynchronous subrequest using HTTP method, an optional url arguments (or querystring) and an optional request body which can be defined as a string or as a path to a file which contains the body.
+
+This directive is very much like a generalized version of the [echo_location_async](#echo_location_async) directive.
+
+Here's a small example demonstrating its usage:
+
+```nginx
+
+ location /multi {
+     # body defined as string
+     echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
+     # body defined as path to a file, relative to nginx prefix path if not absolute
+     echo_subrequest_async PUT '/sub' -q 'bar=Bar' -f '/tmp/hello.txt';
+ }
+ location /sub {
+     echo "querystring: $query_string";
+     echo "method: $echo_request_method";
+     echo "body: $echo_request_body";
+     echo "content length: $http_content_length";
+     echo '///';
+ }
+```
+
+Then on the client side:
+
+```bash
+
+   $ echo -n hello > /tmp/hello.txt
+   $ curl 'http://localhost/multi'
+   querystring: foo=Foo
+   method: POST
+   body: hi
+   content length: 2
+   ///
+   querystring: bar=Bar
+   method: PUT
+   body: hello
+   content length: 5
+   ///
+```
+
+Here's more funny example using the standard [proxy module](#httpproxymodule) to handle the subrequest:
+
+```nginx
+
+ location /main {
+     echo_subrequest_async POST /sub -b 'hello, world';
+ }
+ location /sub {
+     proxy_pass $scheme://127.0.0.1:$server_port/proxied;
+ }
+ location /proxied {
+     echo "method: $echo_request_method.";
+
+     # we need to read body explicitly here...or $echo_request_body
+     #   will evaluate to empty ("")
+     echo_read_request_body;
+
+     echo "body: $echo_request_body.";
+ }
+```
+
+Then on the client side, we can see that
+
+```bash
+
+   $ curl 'http://localhost/main'
+   method: POST.
+   body: hello, world.
+```
+
+Nginx named locations like `@foo` is *not* supported here.
+
+This directive takes several options:
+
+
+    -q <url_args>        Specify the URL arguments (or URL querystring) for the subrequest.
+
+    -f <path>            Specify the path for the file whose content will be serve as the
+                         subrequest's request body.
+
+    -b <data>            Specify the request body data
+
+
+This directive was first introduced in the [release v0.15](#v015).
+
+The `-f` option to define a file path for the body was introduced in the [release v0.35](#v035).
+
+See also the [echo_subrequest](#echo_subrequest) and [echo_location_async](#echo_location_async) directives.
+
+[Back to TOC](#table-of-contents)
+
+echo_subrequest
+---------------
+**syntax:** *echo_subrequest &lt;HTTP_method&gt; &lt;location&gt; [-q &lt;url_args&gt;] [-b &lt;request_body&gt;] [-f &lt;request_body_path&gt;]*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+This is the synchronous version of the [echo_subrequest_async](#echo_subrequest_async) directive. And just like [echo_location](#echo_location), it does not block the Nginx worker process (while [echo_blocking_sleep](#echo_blocking_sleep) does), rather, it uses continuation to pass control along the subrequest chain.
+
+See [echo_subrequest_async](#echo_subrequest_async) for more details.
+
+Nginx named locations like `@foo` is *not* supported here.
+
+This directive was first introduced in the [release v0.15](#v015).
+
+[Back to TOC](#table-of-contents)
+
+echo_foreach_split
+------------------
+**syntax:** *echo_foreach_split &lt;delimiter&gt; &lt;string&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Split the second argument `string` using the delimiter specified in the first argument, and then iterate through the resulting items. For instance:
+
+```nginx
+
+   location /loop {
+     echo_foreach_split ',' $arg_list;
+       echo "item: $echo_it";
+     echo_end;
+   }
+```
+
+Accessing /main yields
+
+```bash
+
+   $ curl 'http://localhost/loop?list=cat,dog,mouse'
+   item: cat
+   item: dog
+   item: mouse
+```
+
+As seen in the previous example, this directive should always be accompanied by an [echo_end](#echo_end) directive.
+
+Parallel `echo_foreach_split` loops are allowed, but nested ones are currently forbidden.
+
+The `delimiter` argument could contain *multiple* arbitrary characters, like
+
+```nginx
+
+   # this outputs "cat\ndog\nmouse\n"
+   echo_foreach_split -- '-a-' 'cat-a-dog-a-mouse';
+     echo $echo_it;
+   echo_end;
+```
+
+Logically speaking, this looping structure is just the `foreach` loop combined with a `split` function call in Perl (using the previous example):
+
+```perl
+
+    foreach (split ',', $arg_list) {
+        print "item $_\n";
+    }
+```
+
+People will also find it useful in merging multiple `.js` or `.css` resources into a whole. Here's an example:
+
+```nginx
+
+   location /merge {
+       default_type 'text/javascript';
+
+       echo_foreach_split '&' $query_string;
+           echo "/* JS File $echo_it */";
+           echo_location_async $echo_it;
+           echo;
+       echo_end;
+   }
+```
+
+Then accessing /merge to merge the `.js` resources specified in the query string:
+
+```bash
+
+   $ curl 'http://localhost/merge?/foo/bar.js&/yui/blah.js&/baz.js'
+```
+
+One can also use third-party Nginx cache module to cache the merged response generated by the `/merge` location in the previous example.
+
+This directive was first introduced in the [release v0.17](#v017).
+
+[Back to TOC](#table-of-contents)
+
+echo_end
+--------
+**syntax:** *echo_end*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+This directive is used to terminate the body of looping and conditional control structures like [echo_foreach_split](#echo_foreach_split).
+
+This directive was first introduced in the [release v0.17](#v017).
+
+[Back to TOC](#table-of-contents)
+
+echo_request_body
+-----------------
+**syntax:** *echo_request_body*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Outputs the contents of the request body previous read.
+
+Behind the scene, it's implemented roughly like this:
+
+```C
+
+   if (r->request_body && r->request_body->bufs) {
+       return ngx_http_output_filter(r, r->request_body->bufs);
+   }
+```
+
+Unlike the [$echo_request_body](#echo_request_body) and $request_body variables, this directive will show the whole request body even if some parts or all parts of it are saved in temporary files on the disk.
+
+It is a "no-op" if no request body has been read yet.
+
+This directive was first introduced in the [release v0.18](#v018).
+
+See also [echo_read_request_body](#echo_read_request_body) and the [chunkin module](http://github.com/agentzh/chunkin-nginx-module).
+
+[Back to TOC](#table-of-contents)
+
+echo_exec
+---------
+**syntax:** *echo_exec &lt;location&gt; [&lt;query_string&gt;]*
+
+**syntax:** *echo_exec &lt;named_location&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Does an internal redirect to the location specified. An optional query string can be specified for normal locations, as in
+
+```nginx
+
+   location /foo {
+       echo_exec /bar weight=5;
+   }
+   location /bar {
+       echo $arg_weight;
+   }
+```
+
+Or equivalently
+
+```nginx
+
+   location /foo {
+       echo_exec /bar?weight=5;
+   }
+   location /bar {
+       echo $arg_weight;
+   }
+```
+
+Named locations are also supported. Here's an example:
+
+```nginx
+
+   location /foo {
+       echo_exec @bar;
+   }
+   location @bar {
+       # you'll get /foo rather than @bar
+       #  due to a potential bug in nginx.
+       echo $echo_request_uri;
+   }
+```
+
+But query string (if any) will always be ignored for named location redirects due to a limitation in the `ngx_http_named_location` function.
+
+Never try to echo things before the `echo_exec` directive or you won't see the proper response of the location you want to redirect to. Because any echoing will cause the original location handler to send HTTP headers before the redirection happens.
+
+Technically speaking, this directive exposes the Nginx internal API functions `ngx_http_internal_redirect` and `ngx_http_named_location`.
+
+This directive was first introduced in the [v0.21 release](#v021).
+
+[Back to TOC](#table-of-contents)
+
+echo_status
+-----------
+**syntax:** *echo_status &lt;status-num&gt;*
+
+**default:** *echo_status 200*
+
+**context:** *location, location if*
+
+**phase:** *content*
+
+Specify the default response status code. Default to `200`. This directive is declarative and the relative order with other echo-like directives is not important.
+
+Here is an example,
+
+```nginx
+
+ location = /bad {
+     echo_status 404;
+     echo "Something is missing...";
+ }
+```
+
+then we get a response like this:
+
+
+    HTTP/1.1 404 Not Found
+    Server: nginx/1.2.1
+    Date: Sun, 24 Jun 2012 03:58:18 GMT
+    Content-Type: text/plain
+    Transfer-Encoding: chunked
+    Connection: keep-alive
+
+    Something is missing...
+
+
+This directive was first introduced in the `v0.40` release.
+
+[Back to TOC](#table-of-contents)
+
+Filter Directives
+=================
+
+Use of the following directives trigger the filter registration of this module. By default, no filter will be registered by this module.
+
+Every filter directive supports variable interpolation in its arguments (if any).
+
+[Back to TOC](#table-of-contents)
+
+echo_before_body
+----------------
+**syntax:** *echo_before_body \[options\] \[argument\]...*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *output filter*
+
+It's the filter version of the [echo](#echo) directive, and prepends its output to the beginning of the original outputs generated by the underlying content handler.
+
+An example is
+
+```nginx
+
+ location /echo {
+     echo_before_body hello;
+     proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
+ }
+ location /echo/more {
+     echo world
+ }
+```
+
+Accessing `/echo` from the client side yields
+
+```bash
+
+   hello
+   world
+```
+
+In the previous sample, we borrow the [standard proxy module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) to serve as the underlying content handler that generates the "main contents".
+
+Multiple instances of this filter directive are also allowed, as in:
+
+```nginx
+
+ location /echo {
+     echo_before_body hello;
+     echo_before_body world;
+     echo !;
+ }
+```
+
+On the client side, the output is like
+
+```bash
+
+   $ curl 'http://localhost/echo'
+   hello
+   world
+   !
+```
+
+In this example, we also use the [content handler directives](#content-handler-directives) provided by this module as the underlying content handler.
+
+This directive also supports the `-n` and `--` options like the [echo](#echo) directive.
+
+This directive can be mixed with its brother directive [echo_after_body](#echo_after_body).
+
+[Back to TOC](#table-of-contents)
+
+echo_after_body
+---------------
+**syntax:** *echo_after_body \[argument\]...*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *output filter*
+
+It's very much like the [echo_before_body](#echo_before_body) directive, but *appends* its output to the end of the original outputs generated by the underlying content handler.
+
+Here's a simple example:
+
+```nginx
+
+ location /echo {
+     echo_after_body hello;
+     proxy_pass http://127.0.0.1:$server_port$request_uri/more;
+ }
+ location /echo/more {
+     echo world
+ }
+```
+
+Accessing `/echo` from the client side yields
+
+
+      world
+      hello
+
+
+Multiple instances are allowed, as in:
+
+```nginx
+
+ location /echo {
+     echo_after_body hello;
+     echo_after_body world;
+     echo i;
+     echo say;
+ }
+```
+
+The output on the client side while accessing the `/echo` location looks like
+
+
+      i
+      say
+      hello
+      world
+
+
+This directive also supports the `-n` and `--` options like the [echo](#echo) directive.
+
+This directive can be mixed with its brother directive [echo_before_body](#echo_before_body).
+
+[Back to TOC](#table-of-contents)
+
+Variables
+=========
+
+[Back to TOC](#table-of-contents)
+
+$echo_it
+--------
+
+This is a "topic variable" used by [echo_foreach_split](#echo_foreach_split), just like the `$_` variable in Perl.
+
+[Back to TOC](#table-of-contents)
+
+$echo_timer_elapsed
+-------------------
+
+This variable holds the seconds elapsed since the start of the current request (might be a subrequest though) or the last invocation of the [echo_reset_timer](#echo_reset_timer) command.
+
+The timing result takes three digits after the decimal point.
+
+References of this variable will force the underlying Nginx timer to update to the current system time, regardless the timer resolution settings elsewhere in the config file, just like the [echo_reset_timer](#echo_reset_timer) directive.
+
+[Back to TOC](#table-of-contents)
+
+$echo_request_body
+------------------
+
+Evaluates to the current (sub)request's request body previously read if no part of the body has been saved to a temporary file. To always show the request body even if it's very large, use the [echo_request_body](#echo_request_body) directive.
+
+[Back to TOC](#table-of-contents)
+
+$echo_request_method
+--------------------
+
+Evaluates to the HTTP request method of the current request (it can be a subrequest).
+
+Behind the scene, it just takes the string data stored in `r->method_name`.
+
+Compare it to the [$echo_client_request_method](#echo_client_request_method) variable.
+
+At least for Nginx 0.8.20 and older, the [$request_method](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_method) variable provided by the [http core module](http://nginx.org/en/docs/http/ngx_http_core_module.html) is actually doing what our [$echo_client_request_method](#echo_client_request_method) is doing.
+
+This variable was first introduced in our [v0.15 release](#v015).
+
+[Back to TOC](#table-of-contents)
+
+$echo_client_request_method
+---------------------------
+
+Always evaluates to the main request's HTTP method even if the current request is a subrequest.
+
+Behind the scene, it just takes the string data stored in `r->main->method_name`.
+
+Compare it to the [$echo_request_method](#echo_request_method) variable.
+
+This variable was first introduced in our [v0.15 release](#v015).
+
+[Back to TOC](#table-of-contents)
+
+$echo_client_request_headers
+----------------------------
+
+Evaluates to the original client request's headers.
+
+Just as the name suggests, it will always take the main request (or the client request) even if it's currently executed in a subrequest.
+
+A simple example is below:
+
+```nginx
+
+   location /echoback {
+      echo "headers are:"
+      echo $echo_client_request_headers;
+   }
+```
+
+Accessing `/echoback` yields
+
+```bash
+
+   $ curl 'http://localhost/echoback'
+   headers are
+   GET /echoback HTTP/1.1
+   User-Agent: curl/7.18.2 (i486-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.8g
+   Host: localhost:1984
+   Accept: */*
+```
+
+Behind the scene, it recovers `r->main->header_in` (or the large header buffers, if any) on the C level and does not construct the headers itself by traversing parsed results in the request object.
+
+This varible is always evaluated to an empty value in HTTP/2 requests for now due to the current implementation.
+
+This variable was first introduced in [version 0.15](#v015).
+
+[Back to TOC](#table-of-contents)
+
+$echo_cacheable_request_uri
+---------------------------
+
+Evaluates to the parsed form of the URI (usually led by `/`) of the current (sub-)request. Unlike the [$echo_request_uri](#echo_request_uri) variable, it is cacheable.
+
+See [$echo_request_uri](#echo_request_uri) for more details.
+
+This variable was first introduced in [version 0.17](#v017).
+
+[Back to TOC](#table-of-contents)
+
+$echo_request_uri
+-----------------
+
+Evaluates to the parsed form of the URI (usually led by `/`) of the current (sub-)request. Unlike the [$echo_cacheable_request_uri](#echo_cacheable_request_uri) variable, it is *not* cacheable.
+
+This is quite different from the [$request_uri](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_uri) variable exported by the [ngx_http_core_module](http://nginx.org/en/docs/http/ngx_http_core_module.html), because `$request_uri` is the *unparsed* form of the current request's URI.
+
+This variable was first introduced in [version 0.17](#v017).
+
+[Back to TOC](#table-of-contents)
+
+$echo_incr
+----------
+
+It is a counter that always generate the current counting number, starting from 1. The counter is always associated with the main request even if it is accessed within a subrequest.
+
+Consider the following example
+
+```Nginx
+
+ location /main {
+     echo "main pre: $echo_incr";
+     echo_location_async /sub;
+     echo_location_async /sub;
+     echo "main post: $echo_incr";
+ }
+ location /sub {
+     echo "sub: $echo_incr";
+ }
+```
+
+Accessing `/main` yields
+
+    main pre: 1
+    sub: 3
+    sub: 4
+    main post: 2
+
+This directive was first introduced in the [v0.18 release](#v018).
+
+[Back to TOC](#table-of-contents)
+
+$echo_response_status
+---------------------
+
+Evaluates to the status code of the current (sub)request, null if not any.
+
+Behind the scene, it's just the textual representation of `r->headers_out->status`.
+
+This directive was first introduced in the [v0.23 release](#v023).
+
+[Back to TOC](#table-of-contents)
+
+Installation
+============
+
+You're recommended to install this module (as well as the Nginx core and many other goodies) via the [OpenResty bundle](http://openresty.org). See [the detailed instructions](http://openresty.org/#Installation) for downloading and installing OpenResty into your system. This is the easiest and most safe way to set things up.
+
+Alternatively, you can install this module manually with the Nginx source:
+
+Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
+the version 1.11.2 (see [nginx compatibility](#compatibility)), and then build the source with this module:
+
+```bash
+
+ $ wget 'http://nginx.org/download/nginx-1.11.2.tar.gz'
+ $ tar -xzvf nginx-1.11.2.tar.gz
+ $ cd nginx-1.11.2/
+
+ # Here we assume you would install you nginx under /opt/nginx/.
+ $ ./configure --prefix=/opt/nginx \
+     --add-module=/path/to/echo-nginx-module
+
+ $ make -j2
+ $ make install
+```
+
+Download the latest version of the release tarball of this module from [echo-nginx-module file list](https://github.com/openresty/echo-nginx-module/tags).
+
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ngx_http_echo_module.so;
+```
+
+Also, this module is included and enabled by default in the [OpenResty bundle](http://openresty.org).
+
+[Back to TOC](#table-of-contents)
+
+Compatibility
+=============
+
+The following versions of Nginx should work with this module:
+
+* **1.16.x**
+* **1.15.x**                      (last tested: 1.15.8)
+* **1.14.x**
+* **1.13.x**                      (last tested: 1.13.6)
+* **1.12.x**
+* **1.11.x**                      (last tested: 1.11.2)
+* **1.10.x**
+* **1.9.x**                       (last tested: 1.9.15)
+* **1.8.x**
+* **1.7.x**                       (last tested: 1.7.10)
+* **1.6.x**
+* **1.5.x**                       (last tested: 1.5.12)
+* **1.4.x**                       (last tested: 1.4.4)
+* **1.3.x**                       (last tested: 1.3.7)
+* **1.2.x**                       (last tested: 1.2.9)
+* **1.1.x**                       (last tested: 1.1.5)
+* **1.0.x**                       (last tested: 1.0.11)
+* **0.9.x**                       (last tested: 0.9.4)
+* **0.8.x**                       (last tested: 0.8.54)
+* **0.7.x >= 0.7.21**             (last tested: 0.7.68)
+
+In particular,
+
+* the directive [echo_location_async](#echo_location_async) and its brother [echo_subrequest_async](#echo_subrequest_async) do *not* work with **0.7.x < 0.7.46**.
+* the [echo_after_body](#echo_after_body) directive does *not* work at all with nginx **< 0.8.7**.
+* the [echo_sleep](#echo_sleep) directive cannot be used after [echo_location](#echo_location) or [echo_subrequest](#echo_subrequest) for nginx **< 0.8.11**.
+
+Earlier versions of Nginx like 0.6.x and 0.5.x will *not* work at all.
+
+If you find that any particular version of Nginx above 0.7.21 does not work with this module, please consider [reporting a bug](#report-bugs).
+
+[Back to TOC](#table-of-contents)
+
+Modules that use this module for testing
+========================================
+
+The following modules take advantage of this `echo` module in their test suite:
+
+* The [memc](http://github.com/openresty/memc-nginx-module) module that supports almost the whole memcached TCP protocol.
+* The [chunkin](http://github.com/agentzh/chunkin-nginx-module) module that adds HTTP 1.1 chunked input support to Nginx.
+* The [headers_more](http://github.com/openresty/headers-more-nginx-module) module that allows you to add, set, and clear input and output headers under the conditions that you specify.
+* The `echo` module itself.
+
+Please mail me other modules that use `echo` in any form and I'll add them to the list above :)
+
+[Back to TOC](#table-of-contents)
+
+Community
+=========
+
+[Back to TOC](#table-of-contents)
+
+English Mailing List
+--------------------
+
+The [openresty-en](https://groups.google.com/group/openresty-en) mailing list is for English speakers.
+
+[Back to TOC](#table-of-contents)
+
+Chinese Mailing List
+--------------------
+
+The [openresty](https://groups.google.com/group/openresty) mailing list is for Chinese speakers.
+
+[Back to TOC](#table-of-contents)
+
+Report Bugs
+===========
+
+Although a lot of effort has been put into testing and code tuning, there must be some serious bugs lurking somewhere in this module. So whenever you are bitten by any quirks, please don't hesitate to
+
+1. create a ticket on the [issue tracking interface](https://github.com/openresty/echo-nginx-module/issues) provided by GitHub,
+1. or send a bug report, questions, or even patches to the [OpenResty Community](#community).
+
+[Back to TOC](#table-of-contents)
+
+Source Repository
+=================
+
+Available on github at [openresty/echo-nginx-module](https://github.com/openresty/echo-nginx-module).
+
+[Back to TOC](#table-of-contents)
+
+Changes
+=======
+
+The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
+
+<http://openresty.org/#Changes>
+
+[Back to TOC](#table-of-contents)
+
+Test Suite
+==========
+
+This module comes with a Perl-driven test suite. The [test cases](https://github.com/openresty/echo-nginx-module/tree/master/t/) are
+[declarative](https://github.com/openresty/echo-nginx-module/blob/master/t/echo.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Nginx) module in the Perl world.
+
+To run it on your side:
+
+```bash
+
+ $ PATH=/path/to/your/nginx-with-echo-module:$PATH prove -r t
+```
+
+You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
+
+Because a single nginx server (by default, `localhost:1984`) is used across all the test scripts (`.t` files), it's meaningless to run the test suite in parallel by specifying `-jN` when invoking the `prove` utility.
+
+Some parts of the test suite requires standard modules [proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html) and [SSI](http://nginx.org/en/docs/http/ngx_http_ssi_module.html) to be enabled as well when building Nginx.
+
+[Back to TOC](#table-of-contents)
+
+TODO
+====
+
+* Fix the [echo_after_body](#echo_after_body) directive in subrequests.
+* Add directives *echo_read_client_request_body* and *echo_request_headers*.
+* Add new directive *echo_log* to use Nginx's logging facility directly from the config file and specific loglevel can be specified, as in
+
+```nginx
+
+   echo_log debug "I am being called.";
+```
+
+* Add support for options `-h` and `-t` to [echo_subrequest_async](#echo_subrequest_async) and [echo_subrequest](#echo_subrequest). For example
+
+```nginx
+
+   echo_subrequest POST /sub -q 'foo=Foo&bar=Bar' -b 'hello' -t 'text/plan' -h 'X-My-Header: blah blah'
+```
+
+* Add options to control whether a subrequest should inherit cached variables from its parent request (i.e. the current request that is calling the subrequest in question). Currently none of the subrequests issued by this module inherit the cached variables from the parent request.
+* Add new variable *$echo_active_subrequests* to show `r->main->count - 1`.
+* Add the *echo_file* and *echo_cached_file* directives.
+* Add new varaible *$echo_request_headers* to accompany the existing [$echo_client_request_headers](#echo_client_request_headers) variable.
+* Add new directive *echo_foreach*, as in
+
+```nginx
+
+   echo_foreach 'cat' 'dog' 'mouse';
+     echo_location_async "/animals/$echo_it";
+   echo_end;
+```
+
+* Add new directive *echo_foreach_range*, as in
+
+```nginx
+
+   echo_foreach_range '[1..100]' '[a-zA-z0-9]';
+     echo_location_async "/item/$echo_it";
+   echo_end;
+```
+
+* Add new directive *echo_repeat*, as in
+
+```nginx
+
+   echo_repeat 10 $i {
+       echo "Page $i";
+       echo_location "/path/to/page/$i";
+   }
+```
+
+This is just another way of saying
+
+```nginx
+
+   echo_foreach_range $i [1..10];
+       echo "Page $i";
+       echo_location "/path/to/page/$i";
+   echo_end;
+```
+
+Thanks Marcus Clyne for providing this idea.
+
+* Add new variable $echo_random which always returns a random non-negative integer with the lower/upper limit specified by the new directives `echo_random_min` and `echo_random_max`. For example,
+
+```nginx
+
+   echo_random_min  10
+   echo_random_max  200
+   echo "random number: $echo_random";
+```
+
+Thanks Marcus Clyne for providing this idea.
+
+[Back to TOC](#table-of-contents)
+
+Getting involved
+================
+
+You'll be very welcomed to submit patches to the [author](#author) or just ask for a commit bit to the [source repository](#source-repository) on GitHub.
+
+[Back to TOC](#table-of-contents)
+
+Author
+======
+
+Yichun "agentzh" Zhang (章亦春) *&lt;agentzh@gmail.com&gt;*, OpenResty Inc.
+
+This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
+
+[Back to TOC](#table-of-contents)
+
+Copyright & License
+===================
+
+Copyright (c) 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+
+This module is licensed under the terms of the BSD license.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[Back to TOC](#table-of-contents)
+
+See Also
+========
+
+* The original [blog post](http://agentzh.blogspot.com/2009/10/hacking-on-nginx-echo-module.html) about this module's initial development.
+* The standard [addition filter module](http://nginx.org/en/docs/http/ngx_http_addition_module.html).
+* The standard [proxy module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html).
+* The [OpenResty](http://openresty.org) bundle.
+
+[Back to TOC](#table-of-contents)
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/config b/modules_deb/libnginx-mod-http-echo-0.63/config
new file mode 100644
index 0000000..4bf0f00
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/config
@@ -0,0 +1,63 @@
+ngx_addon_name=ngx_http_echo_module
+
+ECHO_SRCS="                                                                 \
+        $ngx_addon_dir/src/ngx_http_echo_module.c                           \
+        $ngx_addon_dir/src/ngx_http_echo_util.c                             \
+        $ngx_addon_dir/src/ngx_http_echo_timer.c                            \
+        $ngx_addon_dir/src/ngx_http_echo_var.c                              \
+        $ngx_addon_dir/src/ngx_http_echo_handler.c                          \
+        $ngx_addon_dir/src/ngx_http_echo_filter.c                           \
+        $ngx_addon_dir/src/ngx_http_echo_sleep.c                            \
+        $ngx_addon_dir/src/ngx_http_echo_location.c                         \
+        $ngx_addon_dir/src/ngx_http_echo_echo.c                             \
+        $ngx_addon_dir/src/ngx_http_echo_request_info.c                     \
+        $ngx_addon_dir/src/ngx_http_echo_subrequest.c                       \
+        $ngx_addon_dir/src/ngx_http_echo_foreach.c                          \
+        "
+
+ECHO_DEPS="                                                                 \
+        $ngx_addon_dir/src/ddebug.h                                         \
+        $ngx_addon_dir/src/ngx_http_echo_module.h                           \
+        $ngx_addon_dir/src/ngx_http_echo_handler.h                          \
+        $ngx_addon_dir/src/ngx_http_echo_util.h                             \
+        $ngx_addon_dir/src/ngx_http_echo_sleep.h                            \
+        $ngx_addon_dir/src/ngx_http_echo_filter.h                           \
+        $ngx_addon_dir/src/ngx_http_echo_var.h                              \
+        $ngx_addon_dir/src/ngx_http_echo_location.h                         \
+        $ngx_addon_dir/src/ngx_http_echo_echo.h                             \
+        $ngx_addon_dir/src/ngx_http_echo_request_info.h                     \
+        $ngx_addon_dir/src/ngx_http_echo_subrequest.h                       \
+        $ngx_addon_dir/src/ngx_http_echo_foreach.h                          \
+        "
+
+# nginx 1.17.0+ unconditionally enables the postpone filter
+if [ ! -z "$HTTP_POSTPONE" ]; then
+    # nginx won't have HTTP_POSTPONE_FILTER_MODULE & HTTP_POSTPONE_FILTER_SRCS
+    # defined since 1.9.11
+    if [ -z "$HTTP_POSTPONE_FILTER_MODULE" ]; then
+        HTTP_POSTPONE_FILTER_MODULE=ngx_http_postpone_filter_module
+        HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
+    fi
+
+    # This module depends upon the postpone filter being activated
+    if [ "$HTTP_POSTPONE" != YES ]; then
+        HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
+        HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
+        HTTP_POSTPONE=YES
+    fi
+fi
+
+if [ -n "$ngx_module_link" ]; then
+    ngx_module_type=HTTP_AUX_FILTER
+    ngx_module_name=$ngx_addon_name
+    ngx_module_incs=
+    ngx_module_deps="$ECHO_DEPS"
+    ngx_module_srcs="$ECHO_SRCS"
+    ngx_module_libs=
+
+    . auto/module
+else
+    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ECHO_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ECHO_DEPS"
+fi
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/changelog b/modules_deb/libnginx-mod-http-echo-0.63/debian/changelog
new file mode 100644
index 0000000..1e6c923
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/changelog
@@ -0,0 +1,53 @@
+libnginx-mod-http-echo (1:0.63-7) unstable; urgency=medium
+
+  * d/control: update my email to janmojzis@debian.org
+  * d/copyright: update my email to janmojzis@debian.org
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/copyright: bump debian/* copyright year
+  * d/watch: use more generic template
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 11 Apr 2025 14:26:58 +0200
+
+libnginx-mod-http-echo (1:0.63-6) unstable; urgency=medium
+
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 15:31:26 +0200
+
+libnginx-mod-http-echo (1:0.63-5) unstable; urgency=medium
+
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:16:36 +0200
+
+libnginx-mod-http-echo (1:0.63-4) unstable; urgency=medium
+
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/gbb.conf: added
+  * d/copyright: bump my copyright year
+  * d/copyright: reformat text to be compatible with 'cme update dpkg-copyright'
+  * d/fix.scanned.copyright: added, fixes upstream author name parsing
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 15:03:42 +0100
+
+libnginx-mod-http-echo (1:0.63-3) unstable; urgency=medium
+
+  * No source change upload to unstable.
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 14:36:45 +0100
+
+libnginx-mod-http-echo (1:0.63-2) experimental; urgency=medium
+
+  * d/control: added Multi-Arch: foreign
+  * d/copyright: update, add Igor Sysoev
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 05 Dec 2022 21:14:02 +0100
+
+libnginx-mod-http-echo (1:0.63-1) experimental; urgency=medium
+
+  * Initial release. (Closes: 1024153)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 14:46:48 +0100
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/control b/modules_deb/libnginx-mod-http-echo-0.63/debian/control
new file mode 100644
index 0000000..e7cfde3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/control
@@ -0,0 +1,36 @@
+Source: libnginx-mod-http-echo
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jan Mojžíš <janmojzis@debian.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+Standards-Version: 4.7.2
+Homepage: https://github.com/agentzh/echo-nginx-module
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-echo.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-echo
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-echo
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: Bring echo and more shell style goodies to Nginx
+ Echo module wraps lots of Nginx internal APIs for streaming input and output,
+ parallel/sequential subrequests, timers and sleeping, as well as various meta
+ data accessing.
+ .
+ Basically it provides various utilities that help testing and debugging of
+ other modules by trivially emulating different kinds of faked subrequest
+ locations.
+ .
+ People will also find it useful in real-world applications that need to:
+ .
+ 1. Serve static contents directly from memory.
+ 2. Wrap the upstream response with custom header and footer (kinda like the
+    addition module but with contents read directly from the config file and
+    Nginx variables).
+ 3. Merge contents of various "Nginx locations" (i.e., subrequests) together in
+    a single main request (using echo_location and its friends).
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/copyright b/modules_deb/libnginx-mod-http-echo-0.63/debian/copyright
new file mode 100644
index 0000000..061d047
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/copyright
@@ -0,0 +1,71 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: echo-nginx-module
+Upstream-Contact: Yichun "agentzh" Zhang <agentzh@gmail.com>
+Source: https://github.com/agentzh/echo-nginx-module
+
+Files: *
+Copyright: 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+ 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+License: BSD-2-clause
+
+Files: README.markdown
+Copyright: 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: config
+Copyright: 2009-2018, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022, Miao Wang <shankerwangmiao@gmail.com>
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-2-clause
+
+Files: src/*
+Copyright: 2009-2018, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+License: BSD-2-clause
+
+Files: src/ngx_http_echo_handler.c
+  src/ngx_http_echo_module.c
+  src/ngx_http_echo_module.h
+  src/ngx_http_echo_request_info.c
+  src/ngx_http_echo_sleep.c
+  src/ngx_http_echo_subrequest.c
+  src/ngx_http_echo_util.c
+  src/ngx_http_echo_util.h
+Copyright: Yichun Zhang (agentzh)
+License: BSD-2-clause
+
+Files: t/*
+Copyright: 2009-2018, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+License: BSD-2-clause
+
+Files: util/*
+Copyright: 2009-2018, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+License: BSD-2-clause
+
+License: BSD-2-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+     * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ .
+     * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/fix.scanned.copyright b/modules_deb/libnginx-mod-http-echo-0.63/debian/fix.scanned.copyright
new file mode 100644
index 0000000..b25e244
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/fix.scanned.copyright
@@ -0,0 +1,2 @@
+# fixes upstream author name parsing
+! copyright Files:~/.*/ Copyright=~"s/(Zhang)\s\(.*x\{6625\}\)/$1\ (章亦春)/"
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/gbp.conf b/modules_deb/libnginx-mod-http-echo-0.63/debian/gbp.conf
new file mode 100644
index 0000000..d9f01a6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = False
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/rules b/modules_deb/libnginx-mod-http-echo-0.63/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/source/format b/modules_deb/libnginx-mod-http-echo-0.63/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/control b/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/control
new file mode 100644
index 0000000..b95c6ff
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/control
@@ -0,0 +1,13 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
+
+Tests: helloworld
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/generic b/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/helloworld b/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/helloworld
new file mode 100644
index 0000000..c66b2dc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/tests/helloworld
@@ -0,0 +1,32 @@
+#!/bin/sh
+set -e
+
+cat <<EOF > "/etc/nginx/sites-enabled/default"
+server {
+  listen 80 default_server;
+
+  location /helloworld {
+    echo "hello world";
+  }
+}
+EOF
+
+exp="hello world
+response_code: 200"
+
+nginx -t
+invoke-rc.d nginx restart || { journalctl -n all -xu nginx.service; exit 1; }
+
+out=`curl --fail -w "response_code: %{http_code}\n" http://127.0.0.1/helloworld`
+
+if [ x"${out}" != x"${exp}" ]; then
+  echo "output:"
+  echo "====================="
+  echo "${out}"
+  echo "====================="
+  echo "expected output:"
+  echo "====================="
+  echo "${exp}"
+  echo "====================="
+  exit 1
+fi
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/upstream/metadata b/modules_deb/libnginx-mod-http-echo-0.63/debian/upstream/metadata
new file mode 100644
index 0000000..81ba6ec
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/agentzh/echo-nginx-module/issues
+Bug-Submit: https://github.com/agentzh/echo-nginx-module/issues/new
+Repository-Browse: https://github.com/agentzh/echo-nginx-module
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/debian/watch b/modules_deb/libnginx-mod-http-echo-0.63/debian/watch
new file mode 100644
index 0000000..55febdb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/debian/watch
@@ -0,0 +1,6 @@
+version=4
+opts="\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/agentzh/echo-nginx-module/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ddebug.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ddebug.h
new file mode 100644
index 0000000..a92d7a7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ddebug.h
@@ -0,0 +1,114 @@
+#ifndef DDEBUG_H
+#define DDEBUG_H
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...) fprintf(stderr, "echo *** %s: ", __func__); \
+            fprintf(stderr, __VA_ARGS__); \
+            fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
+
+#   else
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char * fmt, ...) {
+}
+
+#    endif
+
+#   if DDEBUG > 1
+
+#       define dd_enter() dd_enter_helper(r, __func__)
+
+static ngx_inline void
+dd_enter_helper(ngx_http_request_t *r, const char *func) {
+    ngx_http_posted_request_t       *pr;
+
+    fprintf(stderr, ">enter %s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
+            func,
+            (int) r->method_name.len, r->method_name.data,
+            (int) r->uri.len, r->uri.data,
+            (int) r->args.len, r->args.data,
+            0/*(int) r->main->count*/, r->main,
+            r, r->connection->data, r->parent);
+
+    if (r->posted_requests) {
+        fprintf(stderr, " posted:");
+
+        for (pr = r->posted_requests; pr; pr = pr->next) {
+            fprintf(stderr, "%p,", pr);
+        }
+    }
+
+    fprintf(stderr, "\n");
+}
+
+#   else
+
+#       define dd_enter()
+
+#   endif
+
+#else
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...)
+
+#       define dd_enter()
+
+#   else
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char * fmt, ...) {
+}
+
+static ngx_inline void
+dd_enter() {
+}
+
+#   endif
+
+#endif
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#define dd_check_read_event_handler(r)   \
+    dd("r->read_event_handler = %s", \
+        r->read_event_handler == ngx_http_block_reading ? \
+            "ngx_http_block_reading" : \
+        r->read_event_handler == ngx_http_test_reading ? \
+            "ngx_http_test_reading" : \
+        r->read_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#define dd_check_write_event_handler(r)   \
+    dd("r->write_event_handler = %s", \
+        r->write_event_handler == ngx_http_handler ? \
+            "ngx_http_handler" : \
+        r->write_event_handler == ngx_http_core_run_phases ? \
+            "ngx_http_core_run_phases" : \
+        r->write_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#else
+
+#define dd_check_read_event_handler(r)
+#define dd_check_write_event_handler(r)
+
+#endif
+
+#endif /* DDEBUG_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_echo.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_echo.c
new file mode 100644
index 0000000..f5789f5
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_echo.c
@@ -0,0 +1,342 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_echo_echo.h"
+#include "ngx_http_echo_util.h"
+#include "ngx_http_echo_filter.h"
+
+#include <nginx.h>
+
+static ngx_buf_t ngx_http_echo_space_buf;
+
+static ngx_buf_t ngx_http_echo_newline_buf;
+
+
+ngx_int_t
+ngx_http_echo_echo_init(ngx_conf_t *cf)
+{
+    static u_char space_str[]   = " ";
+    static u_char newline_str[] = "\n";
+
+    dd("global init...");
+
+    ngx_memzero(&ngx_http_echo_space_buf, sizeof(ngx_buf_t));
+
+    ngx_http_echo_space_buf.memory = 1;
+
+    ngx_http_echo_space_buf.start =
+        ngx_http_echo_space_buf.pos =
+            space_str;
+
+    ngx_http_echo_space_buf.end =
+        ngx_http_echo_space_buf.last =
+            space_str + sizeof(space_str) - 1;
+
+    ngx_memzero(&ngx_http_echo_newline_buf, sizeof(ngx_buf_t));
+
+    ngx_http_echo_newline_buf.memory = 1;
+
+    ngx_http_echo_newline_buf.start =
+        ngx_http_echo_newline_buf.pos =
+            newline_str;
+
+    ngx_http_echo_newline_buf.end =
+        ngx_http_echo_newline_buf.last =
+            newline_str + sizeof(newline_str) - 1;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_sync(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx)
+{
+    ngx_buf_t                   *buf;
+    ngx_chain_t                 *cl = NULL; /* the head of the chain link */
+
+    buf = ngx_calloc_buf(r->pool);
+    if (buf == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    buf->sync = 1;
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    cl->buf  = buf;
+    cl->next = NULL;
+
+    return ngx_http_echo_send_chain_link(r, ctx, cl);
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args,
+    ngx_flag_t in_filter, ngx_array_t *opts)
+{
+    ngx_uint_t                  i;
+
+    ngx_buf_t                   *space_buf;
+    ngx_buf_t                   *newline_buf;
+    ngx_buf_t                   *buf;
+
+    ngx_str_t                   *computed_arg;
+    ngx_str_t                   *computed_arg_elts;
+    ngx_str_t                   *opt;
+
+    ngx_chain_t *cl  = NULL; /* the head of the chain link */
+    ngx_chain_t **ll = &cl;  /* always point to the address of the last link */
+
+    dd_enter();
+
+    if (computed_args == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    computed_arg_elts = computed_args->elts;
+    for (i = 0; i < computed_args->nelts; i++) {
+        computed_arg = &computed_arg_elts[i];
+
+        if (computed_arg->len == 0) {
+            buf = NULL;
+
+        } else {
+            buf = ngx_calloc_buf(r->pool);
+            if (buf == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            buf->start = buf->pos = computed_arg->data;
+            buf->last = buf->end = computed_arg->data +
+                computed_arg->len;
+
+            buf->memory = 1;
+        }
+
+        if (cl == NULL) {
+            cl = ngx_alloc_chain_link(r->pool);
+            if (cl == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+            cl->buf  = buf;
+            cl->next = NULL;
+            ll = &cl->next;
+
+        } else {
+            /* append a space first */
+            *ll = ngx_alloc_chain_link(r->pool);
+
+            if (*ll == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            space_buf = ngx_calloc_buf(r->pool);
+
+            if (space_buf == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            /* nginx clears buf flags at the end of each request handling,
+             * so we have to make a clone here. */
+            *space_buf = ngx_http_echo_space_buf;
+
+            (*ll)->buf = space_buf;
+            (*ll)->next = NULL;
+
+            ll = &(*ll)->next;
+
+            /* then append the buf only if it's non-empty */
+            if (buf) {
+                *ll = ngx_alloc_chain_link(r->pool);
+                if (*ll == NULL) {
+                    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                }
+                (*ll)->buf  = buf;
+                (*ll)->next = NULL;
+
+                ll = &(*ll)->next;
+            }
+        }
+    } /* end for */
+
+    if (cl && cl->buf == NULL) {
+        cl = cl->next;
+    }
+
+    if (opts && opts->nelts > 0) {
+        opt = opts->elts;
+        /* FIXME handle other unrecognized options here */
+        if (opt[0].len == 1 && opt[0].data[0] == 'n') {
+            goto done;
+        }
+    }
+
+    /* append the newline character */
+
+    newline_buf = ngx_calloc_buf(r->pool);
+
+    if (newline_buf == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    *newline_buf = ngx_http_echo_newline_buf;
+
+    if (cl == NULL) {
+        cl = ngx_alloc_chain_link(r->pool);
+
+        if (cl == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        cl->buf = newline_buf;
+        cl->next = NULL;
+        /* ll = &cl->next; */
+
+    } else {
+        *ll = ngx_alloc_chain_link(r->pool);
+
+        if (*ll == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        (*ll)->buf  = newline_buf;
+        (*ll)->next = NULL;
+        /* ll = &(*ll)->next; */
+    }
+
+done:
+
+    if (cl == NULL || cl->buf == NULL) {
+        return NGX_OK;
+    }
+
+    if (in_filter) {
+        return ngx_http_echo_next_body_filter(r, cl);
+    }
+
+    return ngx_http_echo_send_chain_link(r, ctx, cl);
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_flush(ngx_http_request_t *r, ngx_http_echo_ctx_t *ctx)
+{
+    return ngx_http_send_special(r, NGX_HTTP_FLUSH);
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_request_body(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx)
+{
+    ngx_buf_t       *b;
+    ngx_chain_t     *out, *cl, **ll;
+
+    if (r->request_body == NULL || r->request_body->bufs == NULL) {
+        return NGX_OK;
+    }
+
+    out = NULL;
+    ll = &out;
+
+    for (cl = r->request_body->bufs; cl; cl = cl->next) {
+        if (ngx_buf_special(cl->buf)) {
+            /* we do not want to create zero-size bufs */
+            continue;
+        }
+
+        *ll = ngx_alloc_chain_link(r->pool);
+        if (*ll == NULL) {
+            return NGX_ERROR;
+        }
+
+        b = ngx_alloc_buf(r->pool);
+        if (b == NULL) {
+            return NGX_ERROR;
+        }
+
+        (*ll)->buf = b;
+        (*ll)->next = NULL;
+
+        ngx_memcpy(b, cl->buf, sizeof(ngx_buf_t));
+        b->tag = (ngx_buf_tag_t) &ngx_http_echo_exec_echo_request_body;
+        b->last_buf = 0;
+        b->last_in_chain = 0;
+
+        ll = &(*ll)->next;
+    }
+
+    if (out == NULL) {
+        return NGX_OK;
+    }
+
+    return ngx_http_echo_send_chain_link(r, ctx, out);
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_duplicate(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
+{
+    ngx_str_t                   *computed_arg;
+    ngx_str_t                   *computed_arg_elts;
+    ssize_t                      i, count;
+    ngx_str_t                   *str;
+    u_char                      *p;
+    ngx_int_t                    rc;
+    ngx_buf_t                   *buf;
+    ngx_chain_t                 *cl;
+
+    dd_enter();
+
+    computed_arg_elts = computed_args->elts;
+
+    computed_arg = &computed_arg_elts[0];
+
+    count = ngx_http_echo_atosz(computed_arg->data, computed_arg->len);
+
+    if (count == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "invalid size specified: \"%V\"", computed_arg);
+
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    str = &computed_arg_elts[1];
+
+    if (count == 0 || str->len == 0) {
+        rc = ngx_http_echo_send_header_if_needed(r, ctx);
+        if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+            return rc;
+        }
+
+        return NGX_OK;
+    }
+
+    buf = ngx_create_temp_buf(r->pool, count * str->len);
+    if (buf == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    p = buf->pos;
+    for (i = 0; i < count; i++) {
+        p = ngx_copy(p, str->data, str->len);
+    }
+    buf->last = p;
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+    cl->next = NULL;
+    cl->buf = buf;
+
+    return ngx_http_echo_send_chain_link(r, ctx, cl);
+}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_echo.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_echo.h
new file mode 100644
index 0000000..896f1ed
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_echo.h
@@ -0,0 +1,25 @@
+#ifndef ECHO_ECHO_H
+#define ECHO_ECHO_H
+
+#include "ngx_http_echo_module.h"
+
+ngx_int_t ngx_http_echo_echo_init(ngx_conf_t *cf);
+
+ngx_int_t ngx_http_echo_exec_echo_sync(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx);
+
+ngx_int_t ngx_http_echo_exec_echo(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args,
+        ngx_flag_t in_filter, ngx_array_t *opts);
+
+ngx_int_t ngx_http_echo_exec_echo_request_body(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx);
+
+ngx_int_t ngx_http_echo_exec_echo_flush(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx);
+
+ngx_int_t ngx_http_echo_exec_echo_duplicate(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
+
+#endif /* ECHO_ECHO_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_filter.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_filter.c
new file mode 100644
index 0000000..689b52e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_filter.c
@@ -0,0 +1,282 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_echo_filter.h"
+#include "ngx_http_echo_util.h"
+#include "ngx_http_echo_echo.h"
+
+#include <ngx_log.h>
+
+
+
+ngx_http_output_header_filter_pt ngx_http_echo_next_header_filter;
+
+ngx_http_output_body_filter_pt ngx_http_echo_next_body_filter;
+
+static ngx_int_t ngx_http_echo_header_filter(ngx_http_request_t *r);
+
+static ngx_int_t ngx_http_echo_body_filter(ngx_http_request_t *r,
+        ngx_chain_t *in);
+
+/* filter handlers */
+static ngx_int_t ngx_http_echo_exec_filter_cmds(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *cmds, ngx_uint_t *iterator);
+
+
+static volatile ngx_cycle_t  *ngx_http_echo_prev_cycle = NULL;
+
+
+ngx_int_t
+ngx_http_echo_filter_init(ngx_conf_t *cf)
+{
+    int                              multi_http_blocks;
+    ngx_http_echo_main_conf_t       *emcf;
+
+    emcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_echo_module);
+
+    if (ngx_http_echo_prev_cycle != ngx_cycle) {
+        ngx_http_echo_prev_cycle = ngx_cycle;
+        multi_http_blocks = 0;
+
+    } else {
+        multi_http_blocks = 1;
+    }
+
+    if (multi_http_blocks || emcf->requires_filter) {
+        dd("top header filter: %ld",
+           (unsigned long) ngx_http_top_header_filter);
+
+        ngx_http_echo_next_header_filter = ngx_http_top_header_filter;
+        ngx_http_top_header_filter = ngx_http_echo_header_filter;
+
+        dd("top body filter: %ld", (unsigned long) ngx_http_top_body_filter);
+
+        ngx_http_echo_next_body_filter = ngx_http_top_body_filter;
+        ngx_http_top_body_filter  = ngx_http_echo_body_filter;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_echo_header_filter(ngx_http_request_t *r)
+{
+    ngx_http_echo_loc_conf_t    *conf;
+    ngx_http_echo_ctx_t         *ctx;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "echo header filter, uri \"%V?%V\"", &r->uri, &r->args);
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+
+    /* XXX we should add option to insert contents for responses
+     * of non-200 status code here... */
+    /*
+    if (r->headers_out.status != NGX_HTTP_OK) {
+        if (ctx != NULL) {
+            ctx->skip_filter = 1;
+        }
+        return ngx_http_echo_next_header_filter(r);
+    }
+    */
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
+    if (conf->before_body_cmds == NULL && conf->after_body_cmds == NULL) {
+        if (ctx != NULL) {
+            ctx->skip_filter = 1;
+        }
+        return ngx_http_echo_next_header_filter(r);
+    }
+
+    if (ctx == NULL) {
+        ctx = ngx_http_echo_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_http_set_ctx(r, ctx, ngx_http_echo_module);
+    }
+
+    /* enable streaming here (use chunked encoding) */
+    ngx_http_clear_content_length(r);
+    ngx_http_clear_accept_ranges(r);
+
+    return ngx_http_echo_next_header_filter(r);
+}
+
+
+static ngx_int_t
+ngx_http_echo_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    ngx_http_echo_ctx_t         *ctx;
+    ngx_int_t                    rc;
+    ngx_http_echo_loc_conf_t    *conf;
+    unsigned                     last;
+    ngx_chain_t                 *cl;
+    ngx_buf_t                   *b;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "echo body filter, uri \"%V?%V\"", &r->uri, &r->args);
+
+    if (in == NULL || r->header_only) {
+        return ngx_http_echo_next_body_filter(r, in);
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+
+    if (ctx == NULL || ctx->skip_filter) {
+        return ngx_http_echo_next_body_filter(r, in);
+    }
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
+
+    if (!ctx->before_body_sent) {
+        ctx->before_body_sent = 1;
+
+        if (conf->before_body_cmds != NULL) {
+            rc = ngx_http_echo_exec_filter_cmds(r, ctx, conf->before_body_cmds,
+                                                &ctx->next_before_body_cmd);
+            if (rc != NGX_OK) {
+                return NGX_ERROR;
+            }
+        }
+    }
+
+    if (conf->after_body_cmds == NULL) {
+        ctx->skip_filter = 1;
+        return ngx_http_echo_next_body_filter(r, in);
+    }
+
+    last = 0;
+
+    for (cl = in; cl; cl = cl->next) {
+        dd("cl %p, special %d", cl, ngx_buf_special(cl->buf));
+
+        if (cl->buf->last_buf || cl->buf->last_in_chain) {
+            cl->buf->last_buf = 0;
+            cl->buf->last_in_chain = 0;
+            cl->buf->sync = 1;
+            last = 1;
+        }
+    }
+
+    dd("in %p, last %d", in, (int) last);
+
+    if (in) {
+        rc = ngx_http_echo_next_body_filter(r, in);
+
+#if 0
+        if (rc == NGX_AGAIN) {
+            return NGX_ERROR;
+        }
+#endif
+
+        dd("next filter returns %d, last %d", (int) rc, (int) last);
+
+        if (rc == NGX_ERROR || rc > NGX_OK || !last) {
+            return rc;
+        }
+    }
+
+    dd("exec filter cmds for after body cmds");
+
+    rc = ngx_http_echo_exec_filter_cmds(r, ctx, conf->after_body_cmds,
+                                        &ctx->next_after_body_cmd);
+    if (rc == NGX_ERROR || rc > NGX_OK) {
+        dd("FAILED: exec filter cmds for after body cmds");
+        return NGX_ERROR;
+    }
+
+    ctx->skip_filter = 1;
+
+    dd("after body cmds executed...terminating...");
+
+    /* XXX we can NOT use
+     * ngx_http_send_special(r, NGX_HTTP_LAST) here
+     * because we should bypass the upstream filters. */
+
+    b = ngx_calloc_buf(r->pool);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (r == r->main && !r->post_action) {
+        b->last_buf = 1;
+
+    } else {
+        b->sync = 1;
+        b->last_in_chain = 1;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->next = NULL;
+    cl->buf = b;
+
+    return ngx_http_echo_next_body_filter(r, cl);
+}
+
+
+static ngx_int_t
+ngx_http_echo_exec_filter_cmds(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *cmds, ngx_uint_t *iterator)
+{
+    ngx_int_t                    rc;
+    ngx_array_t                 *opts = NULL;
+    ngx_array_t                 *computed_args = NULL;
+    ngx_http_echo_cmd_t         *cmd;
+    ngx_http_echo_cmd_t         *cmd_elts;
+
+    for (cmd_elts = cmds->elts; *iterator < cmds->nelts; (*iterator)++) {
+        cmd = &cmd_elts[*iterator];
+
+        /* evaluate arguments for the current cmd (if any) */
+        if (cmd->args) {
+            computed_args = ngx_array_create(r->pool, cmd->args->nelts,
+                                             sizeof(ngx_str_t));
+            if (computed_args == NULL) {
+                return NGX_ERROR;
+            }
+
+            opts = ngx_array_create(r->pool, 1, sizeof(ngx_str_t));
+            if (opts == NULL) {
+                return NGX_ERROR;
+            }
+
+            rc = ngx_http_echo_eval_cmd_args(r, cmd, computed_args, opts);
+
+            if (rc != NGX_OK) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "Failed to evaluate arguments for "
+                              "the directive.");
+                return rc;
+            }
+        }
+
+        /* do command dispatch based on the opcode */
+        switch (cmd->opcode) {
+        case echo_opcode_echo_before_body:
+        case echo_opcode_echo_after_body:
+            dd("exec echo_before_body or echo_after_body...");
+
+            rc = ngx_http_echo_exec_echo(r, ctx, computed_args,
+                                         1 /* in filter */, opts);
+
+            if (rc == NGX_ERROR || rc > NGX_OK) {
+                return rc;
+            }
+
+            break;
+        default:
+            break;
+        }
+    }
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_filter.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_filter.h
new file mode 100644
index 0000000..ea5115d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_filter.h
@@ -0,0 +1,15 @@
+#ifndef ECHO_FILTER_H
+#define ECHO_FILTER_H
+
+#include "ngx_http_echo_module.h"
+
+
+extern ngx_http_output_header_filter_pt ngx_http_echo_next_header_filter;
+
+extern ngx_http_output_body_filter_pt ngx_http_echo_next_body_filter;
+
+
+ngx_int_t ngx_http_echo_filter_init (ngx_conf_t *cf);
+
+#endif /* ECHO_FILTER_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_foreach.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_foreach.c
new file mode 100644
index 0000000..a4a2b54
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_foreach.c
@@ -0,0 +1,183 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_echo_foreach.h"
+#include "ngx_http_echo_util.h"
+
+#include <nginx.h>
+
+
+ngx_int_t
+ngx_http_echo_it_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_http_echo_ctx_t         *ctx;
+    ngx_uint_t                   i;
+    ngx_array_t                 *choices;
+    ngx_str_t                   *choice_elts, *choice;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+
+    if (ctx && ctx->foreach != NULL) {
+
+        choices = ctx->foreach->choices;
+        i = ctx->foreach->next_choice;
+
+        if (i < choices->nelts) {
+            choice_elts = choices->elts;
+            choice = &choice_elts[i];
+
+            v->len = choice->len;
+            v->data = choice->data;
+            v->valid = 1;
+            v->no_cacheable = 1;
+            v->not_found = 0;
+
+            return NGX_OK;
+        }
+    }
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_foreach_split(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
+{
+    ngx_http_echo_loc_conf_t    *elcf;
+    ngx_str_t                   *delimiter, *compound;
+    u_char                      *pos, *last, *end;
+    ngx_str_t                   *choice;
+    ngx_str_t                   *computed_arg_elts;
+    ngx_array_t                 *cmds;
+    ngx_http_echo_cmd_t         *cmd;
+    ngx_http_echo_cmd_t         *cmd_elts;
+
+    if (ctx->foreach != NULL) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "Nested echo_foreach not supported yet.");
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    if (computed_args->nelts < 2) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "echo_foreach should take at least two arguments. "
+                      "(if your delimiter starts with \"-\", preceding it "
+                      "with a \"--\".)");
+
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    computed_arg_elts = computed_args->elts;
+
+    compound  = &computed_arg_elts[1];
+
+    dd("HEY coumpound len: %u", (int) compound->len);
+
+    ctx->foreach = ngx_palloc(r->pool, sizeof(ngx_http_echo_foreach_ctx_t));
+
+    if (ctx->foreach == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->foreach->cmd_index = ctx->next_handler_cmd;
+
+    ctx->foreach->next_choice = 0;
+
+    ctx->foreach->choices = ngx_array_create(r->pool, 10, sizeof(ngx_str_t));
+    if (ctx->foreach->choices == NULL) {
+        return NGX_ERROR;
+    }
+
+    delimiter = &computed_arg_elts[0];
+
+    pos = compound->data;
+    end = compound->data + compound->len;
+
+    while ((last = ngx_http_echo_strlstrn(pos, end, delimiter->data,
+                                          delimiter->len - 1)) != NULL)
+    {
+        dd("entered the loop");
+
+        if (last == pos) {
+            dd("!!! len == 0");
+            pos = last + delimiter->len;
+            continue;
+        }
+
+        choice = ngx_array_push(ctx->foreach->choices);
+        if (choice == NULL) {
+            return NGX_ERROR;
+        }
+
+        choice->data = pos;
+        choice->len  = last - pos;
+        pos = last + delimiter->len;
+    }
+
+    if (pos < end) {
+        choice = ngx_array_push(ctx->foreach->choices);
+        if (choice == NULL) {
+            return NGX_ERROR;
+        }
+
+        choice->data = pos;
+        choice->len  = end - pos;
+    }
+
+    if (ctx->foreach->choices->nelts == 0) {
+        /* skip the foreach body entirely */
+        elcf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
+        cmds = elcf->handler_cmds;
+        cmd_elts = cmds->elts;
+        for (/* void */; ctx->next_handler_cmd < cmds->nelts;
+             ctx->next_handler_cmd++)
+        {
+            cmd = &cmd_elts[ctx->next_handler_cmd + 1];
+            if (cmd->opcode == echo_opcode_echo_end) {
+                return NGX_OK;
+            }
+        }
+
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_end(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx)
+{
+    if (ctx->foreach == NULL) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "Found a echo_end that has no corresponding echo_foreach "
+                      "before it.");
+        return NGX_ERROR;
+    }
+
+    ctx->foreach->next_choice++;
+
+    if (ctx->foreach->next_choice >= ctx->foreach->choices->nelts) {
+        /* TODO We need to explicitly free the foreach ctx from
+         * the pool */
+        ctx->foreach = NULL;
+
+        return NGX_OK;
+    }
+
+    dd("echo_end: ++ next_choice (total: %u): %u",
+       (unsigned) ctx->foreach->choices->nelts,
+       (unsigned) ctx->foreach->next_choice);
+
+    /* the main handler dispatcher loop will increment
+     *   ctx->next_handler_cmd for us anyway. */
+    ctx->next_handler_cmd = ctx->foreach->cmd_index;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_foreach.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_foreach.h
new file mode 100644
index 0000000..49592f4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_foreach.h
@@ -0,0 +1,16 @@
+#ifndef ECHO_FOREACH_H
+#define ECHO_FOREACH_H
+
+#include "ngx_http_echo_module.h"
+
+ngx_int_t ngx_http_echo_exec_echo_foreach_split(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
+
+ngx_int_t ngx_http_echo_exec_echo_end(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx);
+
+ngx_int_t ngx_http_echo_it_variable(ngx_http_request_t *r,
+        ngx_http_variable_value_t *v, uintptr_t data);
+
+#endif /* ECHO_FOREACH_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_handler.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_handler.c
new file mode 100644
index 0000000..120c8b0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_handler.c
@@ -0,0 +1,433 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_echo_filter.h"
+#include "ngx_http_echo_handler.h"
+#include "ngx_http_echo_echo.h"
+#include "ngx_http_echo_util.h"
+#include "ngx_http_echo_sleep.h"
+#include "ngx_http_echo_var.h"
+#include "ngx_http_echo_timer.h"
+#include "ngx_http_echo_location.h"
+#include "ngx_http_echo_subrequest.h"
+#include "ngx_http_echo_request_info.h"
+#include "ngx_http_echo_foreach.h"
+
+#include <nginx.h>
+#include <ngx_log.h>
+
+
+void
+ngx_http_echo_wev_handler(ngx_http_request_t *r)
+{
+    ngx_int_t                    rc;
+    ngx_http_echo_ctx_t         *ctx;
+
+    dd("wev handler");
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+
+    if (ctx == NULL) {
+        ngx_http_finalize_request(r, NGX_ERROR);
+        return;
+    }
+
+    dd("waiting: %d, done: %d", (int) ctx->waiting, (int) ctx->done);
+
+    if (ctx->waiting && ! ctx->done) {
+
+        if (r == r->connection->data && r->postponed) {
+
+            if (r->postponed->request) {
+                r->connection->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_http_echo_flush_postponed_outputs(r);
+            }
+        }
+
+        return;
+    }
+
+    ctx->done = 0;
+
+    ctx->next_handler_cmd++;
+
+    rc = ngx_http_echo_run_cmds(r);
+
+    dd("rc: %d", (int) rc);
+
+    if (rc == NGX_ERROR || rc == NGX_DONE) {
+        ngx_http_finalize_request(r, rc);
+        return;
+    }
+
+    if (rc == NGX_AGAIN) {
+        dd("mark busy %d for %.*s", (int) ctx->next_handler_cmd,
+           (int) r->uri.len,
+           r->uri.data);
+
+        ctx->waiting = 1;
+        ctx->done = 0;
+
+    } else {
+        dd("mark ready %d", (int) ctx->next_handler_cmd);
+        ctx->waiting = 0;
+        ctx->done = 1;
+
+        dd("finalizing with rc %d", (int) rc);
+
+        dd("finalize request %.*s with %d", (int) r->uri.len, r->uri.data,
+           (int) rc);
+
+        ngx_http_finalize_request(r, rc);
+    }
+}
+
+
+ngx_int_t
+ngx_http_echo_handler(ngx_http_request_t *r)
+{
+    ngx_int_t                    rc;
+    ngx_http_echo_ctx_t         *ctx;
+
+    dd("subrequest in memory: %d", (int) r->subrequest_in_memory);
+
+    rc = ngx_http_echo_run_cmds(r);
+
+    dd("run cmds returned %d", (int) rc);
+
+    if (rc == NGX_ERROR
+        || rc == NGX_OK
+        || rc == NGX_DONE
+        || rc == NGX_DECLINED)
+    {
+        return rc;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+
+    if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+        if (ctx && r->header_sent) {
+            return NGX_ERROR;
+        }
+
+        return rc;
+    }
+
+    /* rc == NGX_AGAIN */
+
+#if defined(nginx_version) && nginx_version >= 8011
+    r->main->count++;
+#endif
+
+    dd("%d", r->connection->destroyed);
+    dd("%d", r->done);
+
+    if (ctx) {
+        dd("mark busy %d for %.*s", (int) ctx->next_handler_cmd,
+           (int) r->uri.len,
+           r->uri.data);
+
+        ctx->waiting = 1;
+        ctx->done = 0;
+    }
+
+    return NGX_DONE;
+}
+
+
+ngx_int_t
+ngx_http_echo_run_cmds(ngx_http_request_t *r)
+{
+    ngx_http_echo_loc_conf_t    *elcf;
+    ngx_http_echo_ctx_t         *ctx;
+    ngx_int_t                    rc;
+    ngx_array_t                 *cmds;
+    ngx_array_t                 *computed_args = NULL;
+    ngx_http_echo_cmd_t         *cmd;
+    ngx_http_echo_cmd_t         *cmd_elts;
+    ngx_array_t                 *opts = NULL;
+
+    elcf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
+    cmds = elcf->handler_cmds;
+    if (cmds == NULL) {
+        return NGX_DECLINED;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+    if (ctx == NULL) {
+        ctx = ngx_http_echo_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        ngx_http_set_ctx(r, ctx, ngx_http_echo_module);
+    }
+
+    dd("exec handler: %.*s: %i", (int) r->uri.len, r->uri.data,
+       (int) ctx->next_handler_cmd);
+
+    cmd_elts = cmds->elts;
+
+    for (; ctx->next_handler_cmd < cmds->nelts; ctx->next_handler_cmd++) {
+
+        cmd = &cmd_elts[ctx->next_handler_cmd];
+
+        /* evaluate arguments for the current cmd (if any) */
+        if (cmd->args) {
+            computed_args = ngx_array_create(r->pool, cmd->args->nelts,
+                                             sizeof(ngx_str_t));
+
+            if (computed_args == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            opts = ngx_array_create(r->pool, 1, sizeof(ngx_str_t));
+
+            if (opts == NULL) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+
+            rc = ngx_http_echo_eval_cmd_args(r, cmd, computed_args, opts);
+            if (rc != NGX_OK) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "Failed to evaluate arguments for "
+                              "the directive.");
+                return rc;
+            }
+        }
+
+        if (computed_args == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        /* do command dispatch based on the opcode */
+
+        switch (cmd->opcode) {
+
+        case echo_opcode_echo_sync:
+            rc = ngx_http_echo_exec_echo_sync(r, ctx);
+            break;
+
+        case echo_opcode_echo:
+            /* XXX moved the following code to a separate
+             * function */
+            dd("found echo opcode");
+            rc = ngx_http_echo_exec_echo(r, ctx, computed_args,
+                                         0 /* in filter */, opts);
+            break;
+
+        case echo_opcode_echo_request_body:
+            rc = ngx_http_echo_exec_echo_request_body(r, ctx);
+            break;
+
+        case echo_opcode_echo_location_async:
+            if (!r->request_body) {
+                /* we require reading the request body before doing
+                 * subrequests */
+
+                ctx->next_handler_cmd--; /* re-run the current cmd */
+                goto read_request_body;
+            }
+
+            dd("found opcode echo location async...");
+            rc = ngx_http_echo_exec_echo_location_async(r, ctx,
+                                                        computed_args);
+            break;
+
+        case echo_opcode_echo_location:
+            if (!r->request_body) {
+                /* we require reading the request body before doing
+                 * subrequests */
+
+                ctx->next_handler_cmd--; /* re-run the current cmd */
+                goto read_request_body;
+            }
+
+            return ngx_http_echo_exec_echo_location(r, ctx, computed_args);
+
+        case echo_opcode_echo_subrequest_async:
+            if (!r->request_body) {
+                /* we require reading the request body before doing
+                 * subrequests */
+
+                ctx->next_handler_cmd--; /* re-run the current cmd */
+                goto read_request_body;
+            }
+
+            dd("found opcode echo subrequest async...");
+            rc = ngx_http_echo_exec_echo_subrequest_async(r, ctx,
+                                                          computed_args);
+            break;
+
+        case echo_opcode_echo_subrequest:
+            if (!r->request_body) {
+                /* we require reading the request body before doing
+                 * subrequests */
+
+                ctx->next_handler_cmd--; /* re-run the current cmd */
+                goto read_request_body;
+            }
+
+            return ngx_http_echo_exec_echo_subrequest(r, ctx, computed_args);
+
+        case echo_opcode_echo_sleep:
+            return ngx_http_echo_exec_echo_sleep(r, ctx, computed_args);
+
+        case echo_opcode_echo_flush:
+            rc = ngx_http_echo_exec_echo_flush(r, ctx);
+            break;
+
+        case echo_opcode_echo_blocking_sleep:
+            rc = ngx_http_echo_exec_echo_blocking_sleep(r, ctx,
+                                                        computed_args);
+            break;
+
+        case echo_opcode_echo_reset_timer:
+            rc = ngx_http_echo_exec_echo_reset_timer(r, ctx);
+            break;
+
+        case echo_opcode_echo_duplicate:
+            rc = ngx_http_echo_exec_echo_duplicate(r, ctx, computed_args);
+            break;
+
+        case echo_opcode_echo_read_request_body:
+
+read_request_body:
+
+            ctx->wait_read_request_body = 0;
+
+            rc = ngx_http_echo_exec_echo_read_request_body(r, ctx);
+
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+#if (nginx_version >= 8011 && nginx_version < 1002006)                       \
+    || (nginx_version >= 1003000 && nginx_version < 1003009)
+                r->main->count--;
+#endif
+                return rc;
+            }
+
+#if nginx_version >= 8011
+            r->main->count--;
+#endif
+            dd("read request body: %d", (int) rc);
+
+            if (rc == NGX_OK) {
+                continue;
+            }
+
+            /* rc == NGX_AGAIN */
+            ctx->wait_read_request_body = 1;
+            return NGX_AGAIN;
+
+        case echo_opcode_echo_foreach_split:
+            rc = ngx_http_echo_exec_echo_foreach_split(r, ctx, computed_args);
+            break;
+
+        case echo_opcode_echo_end:
+            rc = ngx_http_echo_exec_echo_end(r, ctx);
+            break;
+
+        case echo_opcode_echo_exec:
+            dd("echo_exec");
+            return ngx_http_echo_exec_exec(r, ctx, computed_args);
+
+        default:
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "unknown opcode: %d", cmd->opcode);
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+            return rc;
+        }
+    }
+
+    rc = ngx_http_echo_send_chain_link(r, ctx, NULL /* indicate LAST */);
+
+    if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+        return rc;
+    }
+
+    if (!r->request_body) {
+        if (ngx_http_discard_request_body(r) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_post_subrequest(ngx_http_request_t *r,
+    void *data, ngx_int_t rc)
+{
+    ngx_http_echo_ctx_t         *ctx = data;
+    ngx_http_request_t          *pr;
+    ngx_http_echo_ctx_t         *pr_ctx;
+
+    dd("echo post_subrequest: %.*s", (int) r->uri.len, r->uri.data);
+
+    if (ctx->run_post_subrequest) {
+        dd("already run post_subrequest: %p: %.*s", ctx,
+           (int) r->uri.len, r->uri.data);
+
+        return rc;
+    }
+
+    dd("setting run_post_subrequest to 1 for %p for %.*s", ctx,
+       (int) r->uri.len, r->uri.data);
+
+    ctx->run_post_subrequest = 1;
+
+    pr = r->parent;
+
+    pr_ctx = ngx_http_get_module_ctx(pr, ngx_http_echo_module);
+    if (pr_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    dd("mark ready %d", (int) pr_ctx->next_handler_cmd);
+
+    pr_ctx->waiting = 0;
+    pr_ctx->done = 1;
+
+    pr->write_event_handler = ngx_http_echo_wev_handler;
+
+    /* work-around issues in nginx's event module */
+
+    if (r != r->connection->data
+        && r->postponed
+        && (r->main->posted_requests == NULL
+            || r->main->posted_requests->request != pr))
+    {
+#if defined(nginx_version) && nginx_version >= 8012
+        ngx_http_post_request(pr, NULL);
+#else
+        ngx_http_post_request(pr);
+#endif
+    }
+
+    return rc;
+}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_handler.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_handler.h
new file mode 100644
index 0000000..afc0666
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_handler.h
@@ -0,0 +1,18 @@
+#ifndef ECHO_HANDLER_H
+#define ECHO_HANDLER_H
+
+#include "ngx_http_echo_module.h"
+
+
+void ngx_http_echo_wev_handler(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_echo_handler(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_echo_run_cmds(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_echo_post_subrequest(ngx_http_request_t *r,
+        void *data, ngx_int_t rc);
+
+
+#endif /* ECHO_HANDLER_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_location.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_location.c
new file mode 100644
index 0000000..820e504
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_location.c
@@ -0,0 +1,182 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_echo_util.h"
+#include "ngx_http_echo_location.h"
+#include "ngx_http_echo_handler.h"
+
+#include <nginx.h>
+
+
+static ngx_int_t ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr);
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_location_async(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
+{
+    ngx_int_t                    rc;
+    ngx_http_request_t          *sr; /* subrequest object */
+    ngx_str_t                   *computed_arg_elts;
+    ngx_str_t                    location;
+    ngx_str_t                   *url_args;
+    ngx_str_t                    args;
+    ngx_uint_t                   flags = 0;
+
+    dd_enter();
+
+    computed_arg_elts = computed_args->elts;
+
+    location = computed_arg_elts[0];
+
+    if (location.len == 0) {
+        return NGX_ERROR;
+    }
+
+    if (computed_args->nelts > 1) {
+        url_args = &computed_arg_elts[1];
+    } else {
+        url_args = NULL;
+    }
+
+    args.data = NULL;
+    args.len = 0;
+
+    if (ngx_http_parse_unsafe_uri(r, &location, &args, &flags) != NGX_OK) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "echo_location_async sees unsafe uri: \"%V\"",
+                       &location);
+        return NGX_ERROR;
+    }
+
+    if (args.len > 0 && url_args == NULL) {
+        url_args = &args;
+    }
+
+    rc = ngx_http_echo_send_header_if_needed(r, ctx);
+    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+        return rc;
+    }
+
+    rc = ngx_http_subrequest(r, &location, url_args, &sr, NULL, 0);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_echo_adjust_subrequest(sr);
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_location(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
+{
+    ngx_int_t                            rc;
+    ngx_http_request_t                  *sr; /* subrequest object */
+    ngx_str_t                           *computed_arg_elts;
+    ngx_str_t                            location;
+    ngx_str_t                           *url_args;
+    ngx_http_post_subrequest_t          *psr;
+    ngx_str_t                            args;
+    ngx_uint_t                           flags = 0;
+    ngx_http_echo_ctx_t                 *sr_ctx;
+
+    if (computed_args == NULL) {
+        return NGX_ERROR;
+    }
+
+    computed_arg_elts = computed_args->elts;
+
+    location = computed_arg_elts[0];
+
+    if (location.len == 0) {
+        return NGX_ERROR;
+    }
+
+    if (computed_args->nelts > 1) {
+        url_args = &computed_arg_elts[1];
+
+    } else {
+        url_args = NULL;
+    }
+
+    args.data = NULL;
+    args.len = 0;
+
+    if (ngx_http_parse_unsafe_uri(r, &location, &args, &flags) != NGX_OK) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "echo_location sees unsafe uri: \"%V\"",
+                       &location);
+        return NGX_ERROR;
+    }
+
+    if (args.len > 0 && url_args == NULL) {
+        url_args = &args;
+    }
+
+    rc = ngx_http_echo_send_header_if_needed(r, ctx);
+    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+        return rc;
+    }
+
+    sr_ctx = ngx_http_echo_create_ctx(r);
+
+    psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
+    if (psr == NULL) {
+        return NGX_ERROR;
+    }
+
+    psr->handler = ngx_http_echo_post_subrequest;
+    psr->data = sr_ctx;
+
+    rc = ngx_http_subrequest(r, &location, url_args, &sr, psr, 0);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_echo_adjust_subrequest(sr);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr)
+{
+    ngx_http_core_main_conf_t   *cmcf;
+    ngx_http_request_t          *r;
+
+    /* we do not inherit the parent request's variables */
+    cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
+
+    r = sr->parent;
+
+    sr->header_in = r->header_in;
+
+    /* XXX work-around a bug in ngx_http_subrequest */
+    if (r->headers_in.headers.last == &r->headers_in.headers.part) {
+        sr->headers_in.headers.last = &sr->headers_in.headers.part;
+    }
+
+    sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts
+                                * sizeof(ngx_http_variable_value_t));
+
+    if (sr->variables == NULL) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_location.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_location.h
new file mode 100644
index 0000000..6bc0e03
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_location.h
@@ -0,0 +1,13 @@
+#ifndef ECHO_LOCATION_H
+#define ECHO_LOCATION_H
+
+#include "ngx_http_echo_module.h"
+
+ngx_int_t ngx_http_echo_exec_echo_location_async(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
+
+ngx_int_t ngx_http_echo_exec_echo_location(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
+
+#endif /* ECHO_LOCATION_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_module.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_module.c
new file mode 100644
index 0000000..8d736d7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_module.c
@@ -0,0 +1,682 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_echo_handler.h"
+#include "ngx_http_echo_filter.h"
+#include "ngx_http_echo_echo.h"
+#include "ngx_http_echo_request_info.h"
+#include "ngx_http_echo_var.h"
+#include "ngx_http_echo_util.h"
+
+
+#include <nginx.h>
+#include <ngx_config.h>
+#include <ngx_log.h>
+
+
+/* config init handler */
+static void *ngx_http_echo_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_echo_merge_loc_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static void *ngx_http_echo_create_main_conf(ngx_conf_t *cf);
+static ngx_int_t ngx_http_echo_post_config(ngx_conf_t *cf);
+
+/* config directive handlers */
+static char *ngx_http_echo_echo(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_http_echo_echo_request_body(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_sleep(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_http_echo_echo_flush(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_http_echo_echo_blocking_sleep(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_reset_timer(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_before_body(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_after_body(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_location_async(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_location(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_subrequest_async(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_subrequest(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_duplicate(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_read_request_body(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_foreach_split(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_end(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_abort_parent(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_echo_exec(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_echo_helper(ngx_http_echo_opcode_t opcode,
+    ngx_http_echo_cmd_category_t cat,
+    ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
+
+static ngx_http_module_t ngx_http_echo_module_ctx = {
+    NULL,                           /* preconfiguration */
+    ngx_http_echo_post_config,      /* postconfiguration */
+
+    ngx_http_echo_create_main_conf, /* create main configuration */
+    NULL,                           /* init main configuration */
+
+    NULL,                           /* create server configuration */
+    NULL,                           /* merge server configuration */
+
+    ngx_http_echo_create_loc_conf,  /* create location configuration */
+    ngx_http_echo_merge_loc_conf    /* merge location configuration */
+};
+
+
+static ngx_command_t  ngx_http_echo_commands[] = {
+
+    { ngx_string("echo"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_ANY,
+      ngx_http_echo_echo,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_request_body"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
+      ngx_http_echo_echo_request_body,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_sleep"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+      ngx_http_echo_echo_sleep,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_flush"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
+      ngx_http_echo_echo_flush,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_blocking_sleep"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+      ngx_http_echo_echo_blocking_sleep,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_reset_timer"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
+      ngx_http_echo_echo_reset_timer,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_before_body"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_ANY,
+      ngx_http_echo_echo_before_body,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, before_body_cmds),
+      NULL },
+
+    { ngx_string("echo_after_body"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_ANY,
+      ngx_http_echo_echo_after_body,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, after_body_cmds),
+      NULL },
+
+    { ngx_string("echo_location_async"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+      ngx_http_echo_echo_location_async,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_location"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+      ngx_http_echo_echo_location,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_subrequest_async"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
+      ngx_http_echo_echo_subrequest_async,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_subrequest"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
+      ngx_http_echo_echo_subrequest,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_duplicate"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
+      ngx_http_echo_echo_duplicate,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_read_request_body"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
+      ngx_http_echo_echo_read_request_body,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_foreach_split"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
+      ngx_http_echo_echo_foreach_split,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_end"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
+      ngx_http_echo_echo_end,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_abort_parent"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS,
+      ngx_http_echo_echo_abort_parent,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_exec"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+      ngx_http_echo_echo_exec,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, handler_cmds),
+      NULL },
+
+    { ngx_string("echo_status"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_echo_loc_conf_t, status),
+      NULL },
+
+      ngx_null_command
+};
+
+
+ngx_module_t ngx_http_echo_module = {
+    NGX_MODULE_V1,
+    &ngx_http_echo_module_ctx,     /* module context */
+    ngx_http_echo_commands,        /* module directives */
+    NGX_HTTP_MODULE,               /* module type */
+    NULL,                          /* init master */
+    NULL,                          /* init module */
+    NULL,                          /* init process */
+    NULL,                          /* init thread */
+    NULL,                          /* exit thread */
+    NULL,                          /* exit process */
+    NULL,                          /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_http_echo_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_echo_loc_conf_t        *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_echo_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /* set by ngx_pcalloc
+     *  conf->handler_cmds = NULL
+     *  conf->before_body_cmds = NULL
+     *  conf->after_body_cmds = NULL
+     *  conf->seen_leading_output = 0
+     *  conf->seen_trailing_output = 0
+     */
+
+    conf->status = NGX_CONF_UNSET;
+
+    return conf;
+}
+
+
+static char *
+ngx_http_echo_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_echo_loc_conf_t    *prev = parent;
+    ngx_http_echo_loc_conf_t    *conf = child;
+
+    if (conf->handler_cmds == NULL) {
+        conf->handler_cmds = prev->handler_cmds;
+        conf->seen_leading_output = prev->seen_leading_output;
+    }
+
+    if (conf->before_body_cmds == NULL) {
+        conf->before_body_cmds = prev->before_body_cmds;
+    }
+
+    if (conf->after_body_cmds == NULL) {
+        conf->after_body_cmds = prev->after_body_cmds;
+    }
+
+    ngx_conf_merge_value(conf->status, prev->status, 200);
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_echo_helper(ngx_http_echo_opcode_t opcode,
+    ngx_http_echo_cmd_category_t cat,
+    ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t                       *raw_args;
+    ngx_uint_t                       i, n;
+    ngx_array_t                    **args_ptr;
+    ngx_array_t                    **cmds_ptr;
+    ngx_http_echo_cmd_t             *echo_cmd;
+    ngx_http_core_loc_conf_t        *clcf;
+    ngx_http_script_compile_t        sc;
+    ngx_http_echo_main_conf_t       *emcf;
+    ngx_http_echo_arg_template_t    *arg;
+
+    emcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_echo_module);
+
+    /* cmds_ptr points to ngx_http_echo_loc_conf_t's
+     * handler_cmds, before_body_cmds, or after_body_cmds
+     * array, depending on the actual offset */
+    cmds_ptr = (ngx_array_t **) (((u_char *) conf) + cmd->offset);
+
+    if (*cmds_ptr == NULL) {
+        *cmds_ptr = ngx_array_create(cf->pool, 1,
+                                     sizeof(ngx_http_echo_cmd_t));
+
+        if (*cmds_ptr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        if (cat == echo_handler_cmd) {
+            dd("registering the content handler");
+            /* register the content handler */
+            clcf = ngx_http_conf_get_module_loc_conf(cf,
+                                                     ngx_http_core_module);
+
+            dd("registering the content handler (2)");
+            clcf->handler = ngx_http_echo_handler;
+
+        } else {
+            dd("filter used = 1");
+            emcf->requires_filter = 1;
+        }
+    }
+
+    echo_cmd = ngx_array_push(*cmds_ptr);
+
+    if (echo_cmd == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    echo_cmd->opcode = opcode;
+
+    args_ptr = &echo_cmd->args;
+    *args_ptr = ngx_array_create(cf->pool, 1,
+                                 sizeof(ngx_http_echo_arg_template_t));
+
+    if (*args_ptr == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    raw_args = cf->args->elts;
+
+    /* we skip the first arg and start from the second */
+
+    for (i = 1 ; i < cf->args->nelts; i++) {
+        arg = ngx_array_push(*args_ptr);
+
+        if (arg == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        arg->raw_value = raw_args[i];
+
+        dd("found raw arg %s", raw_args[i].data);
+
+        arg->lengths = NULL;
+        arg->values  = NULL;
+
+        n = ngx_http_script_variables_count(&arg->raw_value);
+
+        if (n > 0) {
+            ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
+
+            sc.cf = cf;
+            sc.source = &arg->raw_value;
+            sc.lengths = &arg->lengths;
+            sc.values = &arg->values;
+            sc.variables = n;
+            sc.complete_lengths = 1;
+            sc.complete_values = 1;
+
+            if (ngx_http_script_compile(&sc) != NGX_OK) {
+                return NGX_CONF_ERROR;
+            }
+        }
+    } /* end for */
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_echo_echo(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_echo_loc_conf_t        *elcf = conf;
+
+    if (!elcf->seen_leading_output) {
+        elcf->seen_leading_output = 1;
+    }
+
+    dd("in echo_echo...");
+    return ngx_http_echo_helper(echo_opcode_echo, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_request_body(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    ngx_http_echo_loc_conf_t        *elcf = conf;
+
+    if (!elcf->seen_leading_output) {
+        elcf->seen_leading_output = 1;
+    }
+
+    dd("in echo_echo_request_body...");
+    return ngx_http_echo_helper(echo_opcode_echo_request_body, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_sleep(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    dd("in echo_sleep...");
+    return ngx_http_echo_helper(echo_opcode_echo_sleep, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_flush(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_echo_loc_conf_t        *elcf = conf;
+
+    if (!elcf->seen_leading_output) {
+        elcf->seen_leading_output = 1;
+    }
+
+    dd("in echo_flush...");
+    return ngx_http_echo_helper(echo_opcode_echo_flush, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_blocking_sleep(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    dd("in echo_blocking_sleep...");
+    return ngx_http_echo_helper(echo_opcode_echo_blocking_sleep,
+                                echo_handler_cmd, cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_reset_timer(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_echo_helper(echo_opcode_echo_reset_timer, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_before_body(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    dd("processing echo_before_body directive...");
+    return ngx_http_echo_helper(echo_opcode_echo_before_body, echo_filter_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_after_body(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_echo_helper(echo_opcode_echo_after_body, echo_filter_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_location_async(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    ngx_http_echo_loc_conf_t        *elcf = conf;
+    char                            *ret;
+
+    if (!elcf->seen_leading_output) {
+        elcf->seen_leading_output = 1;
+
+        ret = ngx_http_echo_helper(echo_opcode_echo_sync, echo_handler_cmd,
+                                   cf, cmd, conf);
+
+        if (ret != NGX_CONF_OK) {
+            return ret;
+        }
+    }
+
+    return ngx_http_echo_helper(echo_opcode_echo_location_async,
+                                echo_handler_cmd, cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_location(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_echo_loc_conf_t        *elcf = conf;
+    char                            *ret;
+
+    if (!elcf->seen_leading_output) {
+        elcf->seen_leading_output = 1;
+
+        ret = ngx_http_echo_helper(echo_opcode_echo_sync, echo_handler_cmd,
+                                   cf, cmd, conf);
+
+        if (ret != NGX_CONF_OK) {
+            return ret;
+        }
+    }
+
+    return ngx_http_echo_helper(echo_opcode_echo_location, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_subrequest_async(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char                            *ret;
+    ngx_http_echo_loc_conf_t        *elcf = conf;
+
+    if (!elcf->seen_leading_output) {
+        elcf->seen_leading_output = 1;
+
+        ret = ngx_http_echo_helper(echo_opcode_echo_sync, echo_handler_cmd,
+                                   cf, cmd, conf);
+
+        if (ret != NGX_CONF_OK) {
+            return ret;
+        }
+    }
+
+    return ngx_http_echo_helper(echo_opcode_echo_subrequest_async,
+                                echo_handler_cmd, cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_subrequest(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    ngx_http_echo_loc_conf_t        *elcf = conf;
+    char                            *ret;
+
+    if (!elcf->seen_leading_output) {
+        elcf->seen_leading_output = 1;
+
+        ret = ngx_http_echo_helper(echo_opcode_echo_sync, echo_handler_cmd,
+                                   cf, cmd, conf);
+
+        if (ret != NGX_CONF_OK) {
+            return ret;
+        }
+    }
+
+    return ngx_http_echo_helper(echo_opcode_echo_subrequest, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_duplicate(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_echo_loc_conf_t        *elcf = conf;
+
+    if (!elcf->seen_leading_output) {
+        elcf->seen_leading_output = 1;
+    }
+
+    return ngx_http_echo_helper(echo_opcode_echo_duplicate, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_read_request_body(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    return ngx_http_echo_helper(echo_opcode_echo_read_request_body,
+                                echo_handler_cmd, cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_foreach_split(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_echo_helper(echo_opcode_echo_foreach_split,
+                                echo_handler_cmd, cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_end(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_echo_helper(echo_opcode_echo_end, echo_handler_cmd, cf,
+                                cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_abort_parent(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_echo_helper(echo_opcode_echo_abort_parent, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static char *
+ngx_http_echo_echo_exec(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_echo_helper(echo_opcode_echo_exec, echo_handler_cmd,
+                                cf, cmd, conf);
+}
+
+
+static void *
+ngx_http_echo_create_main_conf(ngx_conf_t *cf)
+{
+#if nginx_version >= 1011011
+    ngx_pool_cleanup_t           *cln;
+#endif
+    ngx_http_echo_main_conf_t    *emcf;
+
+    emcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_echo_main_conf_t));
+    if (emcf == NULL) {
+        return NULL;
+    }
+
+    /* set by ngx_pcalloc:
+     *      hmcf->requires_filter = 0;
+     */
+
+#if nginx_version >= 1011011
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NULL;
+    }
+
+    cln->data = emcf;
+    cln->handler = ngx_http_echo_request_headers_cleanup;
+#endif
+
+    return emcf;
+}
+
+
+static ngx_int_t
+ngx_http_echo_post_config(ngx_conf_t *cf)
+{
+    ngx_int_t         rc;
+
+    rc = ngx_http_echo_filter_init(cf);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    rc = ngx_http_echo_echo_init(cf);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_http_echo_content_length_hash =
+                                  ngx_http_echo_hash_literal("content-length");
+
+    return ngx_http_echo_add_variables(cf);
+}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_module.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_module.h
new file mode 100644
index 0000000..ce0a305
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_module.h
@@ -0,0 +1,151 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_ECHO_MODULE_H
+#define NGX_HTTP_ECHO_MODULE_H
+
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+extern ngx_module_t  ngx_http_echo_module;
+
+
+/* config directive's opcode */
+typedef enum {
+    echo_opcode_echo_sync,
+    echo_opcode_echo,
+    echo_opcode_echo_request_body,
+    echo_opcode_echo_sleep,
+    echo_opcode_echo_flush,
+    echo_opcode_echo_blocking_sleep,
+    echo_opcode_echo_reset_timer,
+    echo_opcode_echo_before_body,
+    echo_opcode_echo_after_body,
+    echo_opcode_echo_location_async,
+    echo_opcode_echo_location,
+    echo_opcode_echo_subrequest_async,
+    echo_opcode_echo_subrequest,
+    echo_opcode_echo_duplicate,
+    echo_opcode_echo_read_request_body,
+    echo_opcode_echo_foreach_split,
+    echo_opcode_echo_end,
+    echo_opcode_echo_abort_parent,
+    echo_opcode_echo_exec
+} ngx_http_echo_opcode_t;
+
+
+/* all the various config directives (or commands) are
+ * divided into two categories: "handler commands",
+ * and "filter commands". For instance, the "echo"
+ * directive is a handler command while
+ * "echo_before_body" is a filter one. */
+typedef enum {
+    echo_handler_cmd,
+    echo_filter_cmd
+
+} ngx_http_echo_cmd_category_t;
+
+
+/* compiled form of a config directive argument's value */
+typedef struct {
+    /* holds the raw string of the argument value */
+    ngx_str_t       raw_value;
+
+    /* fields "lengths" and "values" are set by
+     * the function ngx_http_script_compile,
+     * iff the argument value indeed contains
+     * nginx variables like "$foo" */
+    ngx_array_t     *lengths;
+    ngx_array_t     *values;
+
+} ngx_http_echo_arg_template_t;
+
+
+/* represent a config directive (or command) like "echo". */
+typedef struct {
+    ngx_http_echo_opcode_t      opcode;
+
+    /* each argument is of type echo_arg_template_t: */
+    ngx_array_t                 *args;
+} ngx_http_echo_cmd_t;
+
+
+/* location config struct */
+typedef struct {
+    /* elements of the following arrays are of type
+     * ngx_http_echo_cmd_t */
+    ngx_array_t     *handler_cmds;
+    ngx_array_t     *before_body_cmds;
+    ngx_array_t     *after_body_cmds;
+
+    unsigned         seen_leading_output;
+
+    ngx_int_t        status;
+} ngx_http_echo_loc_conf_t;
+
+
+typedef struct {
+    ngx_int_t       requires_filter;
+#if nginx_version >= 1011011
+    ngx_buf_t     **busy_buf_ptrs;
+    ngx_int_t       busy_buf_ptr_count;
+#endif
+} ngx_http_echo_main_conf_t;
+
+
+typedef struct {
+    ngx_array_t     *choices; /* items after splitting */
+    ngx_uint_t      next_choice;  /* current item index */
+    ngx_uint_t      cmd_index; /* cmd index for the echo_foreach direcitve */
+} ngx_http_echo_foreach_ctx_t;
+
+
+/* context struct in the request handling cycle, holding
+ * the current states of the command evaluator */
+typedef struct {
+    /* index of the next handler command in
+     * ngx_http_echo_loc_conf_t's "handler_cmds" array. */
+    ngx_uint_t       next_handler_cmd;
+
+    /* index of the next before-body filter command in
+     * ngx_http_echo_loc_conf_t's "before_body_cmds" array. */
+    ngx_uint_t       next_before_body_cmd;
+
+    /* index of the next after-body filter command in
+     * ngx_http_echo_loc_conf_t's "after_body_cmds" array. */
+    ngx_uint_t       next_after_body_cmd;
+
+    ngx_http_echo_foreach_ctx_t   *foreach;
+
+    ngx_time_t       timer_begin;
+
+    ngx_event_t      sleep;
+
+    ngx_uint_t       counter;
+
+    unsigned         before_body_sent:1;
+    unsigned         skip_filter:1;
+
+    unsigned         wait_read_request_body:1;
+
+    unsigned         waiting:1;
+    unsigned         done:1;
+
+    unsigned         run_post_subrequest:1;
+    unsigned         header_sent:1; /* r->header_sent is not sufficient
+                                     * because special header filters like
+                                     * ngx_http_image_filter_module's may
+                                     * intercept the whole header filter chain
+                                     * leaving r->header_sent unset. So we
+                                     * should always test both flags. */
+
+} ngx_http_echo_ctx_t;
+
+
+#endif /* NGX_HTTP_ECHO_MODULE_H */
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_request_info.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_request_info.c
new file mode 100644
index 0000000..7dd3683
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_request_info.c
@@ -0,0 +1,522 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_echo_request_info.h"
+#include "ngx_http_echo_util.h"
+#include "ngx_http_echo_handler.h"
+
+#include <nginx.h>
+
+
+static void ngx_http_echo_post_read_request_body(ngx_http_request_t *r);
+#if nginx_version >= 1011011
+void ngx_http_echo_request_headers_cleanup(void *data);
+#endif
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_read_request_body(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx)
+{
+    return ngx_http_read_client_request_body(r,
+                                        ngx_http_echo_post_read_request_body);
+}
+
+
+static void
+ngx_http_echo_post_read_request_body(ngx_http_request_t *r)
+{
+    ngx_http_echo_ctx_t         *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+
+    dd("wait read request body %d", (int) ctx->wait_read_request_body);
+
+    if (ctx->wait_read_request_body) {
+        ctx->waiting = 0;
+        ctx->done = 1;
+
+        r->write_event_handler = ngx_http_echo_wev_handler;
+
+        ngx_http_echo_wev_handler(r);
+    }
+}
+
+
+/* this function's implementation is borrowed from nginx 0.8.20
+ * and modified a bit to work with subrequests.
+ * Copyrighted (C) by Igor Sysoev */
+ngx_int_t
+ngx_http_echo_request_method_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    if (r->method_name.data) {
+        v->len = r->method_name.len;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = r->method_name.data;
+
+    } else {
+        v->not_found = 1;
+    }
+
+    return NGX_OK;
+}
+
+
+/* this function's implementation is borrowed from nginx 0.8.20
+ * and modified a bit to work with subrequests.
+ * Copyrighted (C) by Igor Sysoev */
+ngx_int_t
+ngx_http_echo_client_request_method_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    if (r->main->method_name.data) {
+        v->len = r->main->method_name.len;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = r->main->method_name.data;
+
+    } else {
+        v->not_found = 1;
+    }
+
+    return NGX_OK;
+}
+
+
+/* this function's implementation is borrowed from nginx 0.8.20
+ * and modified a bit to work with subrequests.
+ * Copyrighted (C) by Igor Sysoev */
+ngx_int_t
+ngx_http_echo_request_body_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    u_char       *p;
+    size_t        len;
+    ngx_buf_t    *b;
+    ngx_chain_t  *cl;
+    ngx_chain_t  *in;
+
+    if (r->request_body == NULL
+        || r->request_body->bufs == NULL
+        || r->request_body->temp_file)
+    {
+        v->not_found = 1;
+
+        return NGX_OK;
+    }
+
+    in = r->request_body->bufs;
+
+    len = 0;
+    for (cl = in; cl; cl = cl->next) {
+        b = cl->buf;
+
+        if (!ngx_buf_in_memory(b)) {
+            if (b->in_file) {
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "variable echo_request_body sees in-file only "
+                               "buffers and discard the whole body data");
+
+                v->not_found = 1;
+
+                return NGX_OK;
+            }
+
+        } else {
+            len += b->last - b->pos;
+        }
+    }
+
+    p = ngx_pnalloc(r->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->data = p;
+
+    for (cl = in; cl; cl = cl->next) {
+        b = cl->buf;
+
+        if (ngx_buf_in_memory(b)) {
+            p = ngx_copy(p, b->pos, b->last - b->pos);
+        }
+    }
+
+    if (p - v->data != (ssize_t) len) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "variable echo_request_body: buffer error");
+
+        v->not_found = 1;
+
+        return NGX_OK;
+    }
+
+    v->len = len;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    int                          line_break_len;
+    size_t                       size;
+    u_char                      *p, *last, *pos;
+    ngx_int_t                    i, j;
+    ngx_buf_t                   *b, *first = NULL;
+    unsigned                     found;
+#if nginx_version >= 1011011
+    ngx_buf_t                  **bb;
+    ngx_chain_t                 *cl;
+    ngx_http_echo_main_conf_t   *emcf;
+#endif
+    ngx_connection_t            *c;
+    ngx_http_request_t          *mr;
+    ngx_http_connection_t       *hc;
+
+    mr = r->main;
+    hc = r->main->http_connection;
+    c = mr->connection;
+
+#if (NGX_HTTP_V2)
+    /* TODO */
+    if (mr->stream) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+#endif
+
+#if nginx_version >= 1011011
+    emcf = ngx_http_get_module_main_conf(r, ngx_http_echo_module);
+#endif
+
+    size = 0;
+    b = c->buffer;
+
+    if (mr->request_line.data[mr->request_line.len] == CR) {
+        line_break_len = 2;
+
+    } else {
+        line_break_len = 1;
+    }
+
+    if (mr->request_line.data >= b->start
+        && mr->request_line.data + mr->request_line.len + line_break_len
+           <= b->pos)
+    {
+        first = b;
+        size += b->pos - mr->request_line.data;
+    }
+
+    if (hc->nbusy) {
+        b = NULL;
+
+#if nginx_version >= 1011011
+        if (hc->nbusy > emcf->busy_buf_ptr_count) {
+            if (emcf->busy_buf_ptrs) {
+                ngx_free(emcf->busy_buf_ptrs);
+            }
+
+            emcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
+                                            r->connection->log);
+
+            if (emcf->busy_buf_ptrs == NULL) {
+                return NGX_ERROR;
+            }
+
+            emcf->busy_buf_ptr_count = hc->nbusy;
+        }
+
+        bb = emcf->busy_buf_ptrs;
+        for (cl = hc->busy; cl; cl = cl->next) {
+            *bb++ = cl->buf;
+        }
+
+        bb = emcf->busy_buf_ptrs;
+        for (i = hc->nbusy; i > 0; i--) {
+            b = bb[i - 1];
+#else
+        for (i = 0; i < hc->nbusy; i++) {
+            b = hc->busy[i];
+#endif
+
+            if (first == NULL) {
+                if (mr->request_line.data >= b->pos
+                    || mr->request_line.data + mr->request_line.len
+                       + line_break_len <= b->start)
+                {
+                    continue;
+                }
+
+                dd("found first at %d", (int) i);
+                first = b;
+            }
+
+            size += b->pos - b->start;
+        }
+    }
+
+
+    size++;  /* plus the null terminator, as required by the later
+                ngx_strstr() call */
+
+    v->data = ngx_palloc(r->pool, size);
+    if (v->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    last = v->data;
+
+    b = c->buffer;
+    found = 0;
+
+    if (first == b) {
+        found = 1;
+        pos = b->pos;
+
+        last = ngx_copy(v->data, mr->request_line.data,
+                        pos - mr->request_line.data);
+
+        if (b != mr->header_in) {
+            /* skip truncated header entries (if any) */
+            while (last > v->data && last[-1] != LF) {
+                last--;
+            }
+        }
+
+        i = 0;
+        for (p = v->data; p != last; p++) {
+            if (*p == '\0') {
+                i++;
+                if (p + 1 != last && *(p + 1) == LF) {
+                    *p = CR;
+
+                } else if (i % 2 == 1) {
+                    *p = ':';
+
+                } else {
+                    *p = LF;
+                }
+            }
+        }
+    }
+
+    if (hc->nbusy) {
+
+#if nginx_version >= 1011011
+        bb = emcf->busy_buf_ptrs;
+        for (i = hc->nbusy; i > 0; i--) {
+            b = bb[i - 1];
+#else
+        for (i = 0; i < hc->nbusy; i++) {
+            b = hc->busy[i];
+#endif
+
+            if (!found) {
+                if (b != first) {
+                    continue;
+                }
+
+                dd("found first");
+                found = 1;
+            }
+
+            p = last;
+
+            pos = b->pos;
+
+            if (b == first) {
+                dd("request line: %.*s", (int) mr->request_line.len,
+                   mr->request_line.data);
+
+                last = ngx_copy(last,
+                                mr->request_line.data,
+                                pos - mr->request_line.data);
+
+            } else {
+                last = ngx_copy(last, b->start, pos - b->start);
+            }
+
+#if 1
+            /* skip truncated header entries (if any) */
+            while (last > p && last[-1] != LF) {
+                last--;
+            }
+#endif
+
+            j = 0;
+            for (; p != last; p++) {
+                if (*p == '\0') {
+                    j++;
+                    if (p + 1 == last) {
+                        /* XXX this should not happen */
+                        dd("found string end!!");
+
+                    } else if (*(p + 1) == LF) {
+                        *p = CR;
+
+                    } else if (j % 2 == 1) {
+                        *p = ':';
+
+                    } else {
+                        *p = LF;
+                    }
+                }
+            }
+
+            if (b == mr->header_in) {
+                break;
+            }
+        }
+    }
+
+    *last++ = '\0';
+
+    if (last - v->data > (ssize_t) size) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "buffer error when evaluating "
+                      "$echo_client__request_headers: \"%V\"",
+                      (ngx_int_t) (last - v->data - size));
+
+        return NGX_ERROR;
+    }
+
+    /* strip the leading part (if any) of the request body in our header.
+     * the first part of the request body could slip in because nginx core's
+     * ngx_http_request_body_length_filter and etc can move r->header_in->pos
+     * in case that some of the body data has been preread into r->header_in.
+     */
+
+    if ((p = (u_char *) ngx_strstr(v->data, CRLF CRLF)) != NULL) {
+        last = p + sizeof(CRLF CRLF) - 1;
+
+    } else if ((p = (u_char *) ngx_strstr(v->data, CRLF "\n")) != NULL) {
+        last = p + sizeof(CRLF "\n") - 1;
+
+    } else if ((p = (u_char *) ngx_strstr(v->data, "\n" CRLF)) != NULL) {
+        last = p + sizeof("\n" CRLF) - 1;
+
+    } else {
+        for (p = last - 1; p - v->data >= 2; p--) {
+            if (p[0] == LF && p[-1] == CR) {
+                p[-1] = LF;
+                last = p + 1;
+                break;
+            }
+
+            if (p[0] == LF && p[-1] == LF) {
+                last = p + 1;
+                break;
+            }
+        }
+    }
+
+    v->len = last - v->data;
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_cacheable_request_uri_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    if (r->uri.len) {
+        v->len = r->uri.len;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+        v->data = r->uri.data;
+
+    } else {
+        v->not_found = 1;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_request_uri_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    if (r->uri.len) {
+        v->len = r->uri.len;
+        v->valid = 1;
+        v->no_cacheable = 1;
+        v->not_found = 0;
+        v->data = r->uri.data;
+
+    } else {
+        v->not_found = 1;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_response_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    u_char                      *p;
+
+    if (r->headers_out.status) {
+        dd("headers out status: %d", (int) r->headers_out.status);
+
+        p = ngx_palloc(r->pool, NGX_INT_T_LEN);
+        if (p == NULL) {
+            return NGX_ERROR;
+        }
+
+        v->len = ngx_sprintf(p, "%ui", r->headers_out.status) - p;
+        v->data = p;
+
+        v->valid = 1;
+        v->no_cacheable = 1;
+        v->not_found = 0;
+
+    } else {
+        v->not_found = 1;
+    }
+
+    return NGX_OK;
+}
+
+
+#if nginx_version >= 1011011
+void
+ngx_http_echo_request_headers_cleanup(void *data)
+{
+    ngx_http_echo_main_conf_t  *emcf;
+
+    emcf = (ngx_http_echo_main_conf_t *) data;
+
+    if (emcf->busy_buf_ptrs) {
+        ngx_free(emcf->busy_buf_ptrs);
+        emcf->busy_buf_ptrs = NULL;
+    }
+}
+#endif
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_request_info.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_request_info.h
new file mode 100644
index 0000000..aa5730b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_request_info.h
@@ -0,0 +1,36 @@
+#ifndef ECHO_REQUEST_INFO_H
+#define ECHO_REQUEST_INFO_H
+
+
+#include "ngx_http_echo_module.h"
+
+
+ngx_int_t ngx_http_echo_exec_echo_read_request_body(
+    ngx_http_request_t *r, ngx_http_echo_ctx_t *ctx);
+
+ngx_int_t ngx_http_echo_request_method_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+ngx_int_t ngx_http_echo_client_request_method_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+ngx_int_t ngx_http_echo_request_body_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+ngx_int_t ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+ngx_int_t ngx_http_echo_cacheable_request_uri_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+ngx_int_t ngx_http_echo_request_uri_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+ngx_int_t ngx_http_echo_response_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+#if nginx_version >= 1011011
+void ngx_http_echo_request_headers_cleanup(void *data);
+#endif
+
+#endif /* ECHO_REQUEST_INFO_H */
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_sleep.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_sleep.c
new file mode 100644
index 0000000..c96fa5a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_sleep.c
@@ -0,0 +1,208 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_echo_sleep.h"
+#include "ngx_http_echo_handler.h"
+
+#include <nginx.h>
+#include <ngx_log.h>
+
+
+/* event handler for echo_sleep */
+
+static void ngx_http_echo_post_sleep(ngx_http_request_t *r);
+static void ngx_http_echo_sleep_cleanup(void *data);
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_sleep(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
+{
+    ngx_str_t                   *computed_arg;
+    ngx_str_t                   *computed_arg_elts;
+    ngx_int_t                    delay; /* in msec */
+    ngx_http_cleanup_t          *cln;
+
+    computed_arg_elts = computed_args->elts;
+    computed_arg = &computed_arg_elts[0];
+
+    delay = ngx_atofp(computed_arg->data, computed_arg->len, 3);
+
+    if (delay == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "invalid sleep duration \"%V\"", &computed_arg_elts[0]);
+
+        return NGX_HTTP_BAD_REQUEST;
+    }
+
+    dd("adding timer with delay %lu ms, r:%.*s", (unsigned long) delay,
+       (int) r->uri.len, r->uri.data);
+
+    ngx_add_timer(&ctx->sleep, (ngx_msec_t) delay);
+
+    /* we don't check broken downstream connections
+     * ourselves so even if the client shuts down
+     * the connection prematurely, nginx will still
+     * go on waiting for our timers to get properly
+     * expired. However, we'd still register a
+     * cleanup handler for completeness. */
+
+    cln = ngx_http_cleanup_add(r, 0);
+    if (cln == NULL) {
+        return NGX_ERROR;
+    }
+
+    cln->handler = ngx_http_echo_sleep_cleanup;
+    cln->data = r;
+
+    return NGX_AGAIN;
+}
+
+
+static void
+ngx_http_echo_post_sleep(ngx_http_request_t *r)
+{
+    ngx_http_echo_ctx_t         *ctx;
+    /* ngx_int_t                    rc; */
+
+    dd("post sleep, r:%.*s", (int) r->uri.len, r->uri.data);
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+
+    if (ctx == NULL) {
+        return;
+    }
+
+    ctx->waiting = 0;
+    ctx->done = 1;
+
+    dd("sleep: after get module ctx");
+
+    dd("timed out? %d", ctx->sleep.timedout);
+    dd("timer set? %d", ctx->sleep.timer_set);
+
+    if (!ctx->sleep.timedout) {
+        dd("HERE reached!");
+        return;
+    }
+
+    ctx->sleep.timedout = 0;
+
+    if (ctx->sleep.timer_set) {
+        dd("deleting timer for echo_sleep");
+
+        ngx_del_timer(&ctx->sleep);
+    }
+
+    /* r->write_event_handler = ngx_http_request_empty_handler; */
+
+    ngx_http_echo_wev_handler(r);
+}
+
+
+void
+ngx_http_echo_sleep_event_handler(ngx_event_t *ev)
+{
+    ngx_connection_t        *c;
+    ngx_http_request_t      *r;
+    ngx_http_log_ctx_t      *ctx;
+
+    r = ev->data;
+    c = r->connection;
+
+    if (c->destroyed) {
+        return;
+    }
+
+    if (c->error) {
+        ngx_http_finalize_request(r, NGX_ERROR);
+        return;
+    }
+
+    ctx = c->log->data;
+    ctx->current_request = r;
+
+    /* XXX when r->done == 1 we should do cleaning immediately
+     * and delete our timer and then quit. */
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                   "echo sleep event handler: \"%V?%V\"", &r->uri, &r->args);
+
+    /*
+    if (r->done) {
+        return;
+    }
+    */
+
+    ngx_http_echo_post_sleep(r);
+
+#if defined(nginx_version)
+
+    dd("before run posted requests");
+
+    ngx_http_run_posted_requests(c);
+
+    dd("after run posted requests");
+
+#endif
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_blocking_sleep(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
+{
+    ngx_str_t                   *computed_arg;
+    ngx_str_t                   *computed_arg_elts;
+    ngx_int_t                    delay; /* in msec */
+
+    computed_arg_elts = computed_args->elts;
+    computed_arg = &computed_arg_elts[0];
+
+    delay = ngx_atofp(computed_arg->data, computed_arg->len, 3);
+
+    if (delay == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "invalid sleep duration \"%V\"", &computed_arg_elts[0]);
+        return NGX_HTTP_BAD_REQUEST;
+    }
+
+    dd("blocking delay: %lu ms", (unsigned long) delay);
+
+    ngx_msleep((ngx_msec_t) delay);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_echo_sleep_cleanup(void *data)
+{
+    ngx_http_request_t      *r = data;
+    ngx_http_echo_ctx_t     *ctx;
+
+    dd("echo sleep cleanup");
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+    if (ctx == NULL) {
+        return;
+    }
+
+    if (ctx->sleep.timer_set) {
+        dd("cleanup: deleting timer for echo_sleep");
+
+        ngx_del_timer(&ctx->sleep);
+        return;
+    }
+
+    dd("cleanup: timer not set");
+}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_sleep.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_sleep.h
new file mode 100644
index 0000000..8bb70c3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_sleep.h
@@ -0,0 +1,16 @@
+#ifndef ECHO_SLEEP_H
+#define ECHO_SLEEP_H
+
+#include "ngx_http_echo_module.h"
+
+ngx_int_t ngx_http_echo_exec_echo_sleep(
+        ngx_http_request_t *r, ngx_http_echo_ctx_t *ctx,
+        ngx_array_t *computed_args);
+
+ngx_int_t ngx_http_echo_exec_echo_blocking_sleep(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
+
+void ngx_http_echo_sleep_event_handler(ngx_event_t *ev);
+
+#endif /* ECHO_SLEEP_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_subrequest.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_subrequest.c
new file mode 100644
index 0000000..0980d58
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_subrequest.c
@@ -0,0 +1,791 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_echo_util.h"
+#include "ngx_http_echo_subrequest.h"
+#include "ngx_http_echo_handler.h"
+#include <nginx.h>
+
+
+#define ngx_http_echo_method_name(m) { sizeof(m) - 1, (u_char *) m " " }
+
+
+ngx_str_t  ngx_http_echo_content_length_header_key =
+        ngx_string("Content-Length");
+
+ngx_str_t  ngx_http_echo_get_method = ngx_http_echo_method_name("GET");
+ngx_str_t  ngx_http_echo_put_method = ngx_http_echo_method_name("PUT");
+ngx_str_t  ngx_http_echo_post_method = ngx_http_echo_method_name("POST");
+ngx_str_t  ngx_http_echo_head_method = ngx_http_echo_method_name("HEAD");
+ngx_str_t  ngx_http_echo_copy_method = ngx_http_echo_method_name("COPY");
+ngx_str_t  ngx_http_echo_move_method = ngx_http_echo_method_name("MOVE");
+ngx_str_t  ngx_http_echo_lock_method = ngx_http_echo_method_name("LOCK");
+ngx_str_t  ngx_http_echo_mkcol_method = ngx_http_echo_method_name("MKCOL");
+ngx_str_t  ngx_http_echo_trace_method = ngx_http_echo_method_name("TRACE");
+ngx_str_t  ngx_http_echo_delete_method = ngx_http_echo_method_name("DELETE");
+ngx_str_t  ngx_http_echo_unlock_method = ngx_http_echo_method_name("UNLOCK");
+ngx_str_t  ngx_http_echo_options_method = ngx_http_echo_method_name("OPTIONS");
+ngx_str_t  ngx_http_echo_propfind_method =
+        ngx_http_echo_method_name("PROPFIND");
+ngx_str_t  ngx_http_echo_proppatch_method =
+        ngx_http_echo_method_name("PROPPATCH");
+
+
+typedef struct ngx_http_echo_subrequest_s {
+    ngx_uint_t                   method;
+    ngx_str_t                   *method_name;
+    ngx_str_t                   *location;
+    ngx_str_t                   *query_string;
+    ssize_t                      content_length_n;
+    ngx_http_request_body_t     *request_body;
+} ngx_http_echo_subrequest_t;
+
+
+static ngx_int_t ngx_http_echo_parse_method_name(ngx_str_t **method_name_ptr);
+static ngx_int_t ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr,
+    ngx_http_echo_subrequest_t *parsed_sr);
+static ngx_int_t ngx_http_echo_parse_subrequest_spec(ngx_http_request_t *r,
+    ngx_array_t *computed_args, ngx_http_echo_subrequest_t **parsed_sr_ptr);
+static ngx_int_t ngx_http_echo_set_content_length_header(ngx_http_request_t *r,
+    off_t len);
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_subrequest_async(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
+{
+    ngx_int_t                        rc;
+    ngx_http_echo_subrequest_t      *parsed_sr;
+    ngx_http_request_t              *sr; /* subrequest object */
+    ngx_str_t                        args;
+    ngx_uint_t                       flags = 0;
+
+    dd_enter();
+
+    rc = ngx_http_echo_parse_subrequest_spec(r, computed_args, &parsed_sr);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    dd("location: %.*s",
+        (int) parsed_sr->location->len,
+        parsed_sr->location->data);
+
+    args.data = NULL;
+    args.len = 0;
+
+    if (ngx_http_parse_unsafe_uri(r, parsed_sr->location, &args, &flags)
+        != NGX_OK)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "echo_subrequest_async sees unsafe uri: \"%V\"",
+                       parsed_sr->location);
+        return NGX_ERROR;
+    }
+
+    if (args.len > 0 && parsed_sr->query_string == NULL) {
+        parsed_sr->query_string = &args;
+    }
+
+    rc = ngx_http_echo_send_header_if_needed(r, ctx);
+    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+        return rc;
+    }
+
+    rc = ngx_http_subrequest(r, parsed_sr->location, parsed_sr->query_string,
+                             &sr, NULL, 0);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_echo_adjust_subrequest(sr, parsed_sr);
+
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_subrequest(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
+{
+    ngx_int_t                            rc;
+    ngx_http_request_t                  *sr; /* subrequest object */
+    ngx_http_post_subrequest_t          *psr;
+    ngx_http_echo_subrequest_t          *parsed_sr;
+    ngx_str_t                            args;
+    ngx_uint_t                           flags = 0;
+    ngx_http_echo_ctx_t                 *sr_ctx;
+
+    dd_enter();
+
+    rc = ngx_http_echo_parse_subrequest_spec(r, computed_args, &parsed_sr);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    args.data = NULL;
+    args.len = 0;
+
+    if (ngx_http_parse_unsafe_uri(r, parsed_sr->location, &args, &flags)
+        != NGX_OK)
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "echo_subrequest sees unsafe uri: \"%V\"",
+                       parsed_sr->location);
+        return NGX_ERROR;
+    }
+
+    if (args.len > 0 && parsed_sr->query_string == NULL) {
+        parsed_sr->query_string = &args;
+    }
+
+    rc = ngx_http_echo_send_header_if_needed(r, ctx);
+    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+        return rc;
+    }
+
+    sr_ctx = ngx_http_echo_create_ctx(r);
+
+    /* set by ngx_http_echo_create_ctx
+     *  sr_ctx->run_post_subrequest = 0
+     */
+
+    dd("creating sr ctx for %.*s: %p", (int) parsed_sr->location->len,
+       parsed_sr->location->data, sr_ctx);
+
+    psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
+
+    if (psr == NULL) {
+        return NGX_ERROR;
+    }
+
+    psr->handler = ngx_http_echo_post_subrequest;
+    psr->data = sr_ctx;
+
+    rc = ngx_http_subrequest(r, parsed_sr->location, parsed_sr->query_string,
+                             &sr, psr, 0);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    sr_ctx->sleep.data = sr;
+
+    ngx_http_set_ctx(sr, sr_ctx, ngx_http_echo_module);
+
+    rc = ngx_http_echo_adjust_subrequest(sr, parsed_sr);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_http_echo_parse_subrequest_spec(ngx_http_request_t *r,
+    ngx_array_t *computed_args, ngx_http_echo_subrequest_t **parsed_sr_ptr)
+{
+    ngx_str_t                   *computed_arg_elts, *arg;
+    ngx_str_t                  **to_write = NULL;
+    ngx_str_t                   *method_name;
+    ngx_str_t                   *body_str = NULL;
+    ngx_str_t                   *body_file = NULL;
+    ngx_uint_t                   i;
+    ngx_flag_t                   expecting_opt;
+    ngx_http_request_body_t     *rb = NULL;
+    ngx_buf_t                   *b;
+    ngx_http_echo_subrequest_t  *parsed_sr;
+    ngx_open_file_info_t         of;
+    ngx_http_core_loc_conf_t    *clcf;
+    size_t                       len;
+
+    *parsed_sr_ptr = ngx_pcalloc(r->pool, sizeof(ngx_http_echo_subrequest_t));
+    if (*parsed_sr_ptr == NULL) {
+        return NGX_ERROR;
+    }
+
+    parsed_sr = *parsed_sr_ptr;
+    computed_arg_elts = computed_args->elts;
+    method_name = &computed_arg_elts[0];
+    parsed_sr->location = &computed_arg_elts[1];
+
+    if (parsed_sr->location->len == 0) {
+        return NGX_ERROR;
+    }
+
+    expecting_opt = 1;
+
+    for (i = 2; i < computed_args->nelts; i++) {
+        arg = &computed_arg_elts[i];
+
+        if (!expecting_opt) {
+            if (to_write == NULL) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                        "echo_subrequest_async: to_write should NOT be NULL");
+                return NGX_ERROR;
+            }
+
+            *to_write = arg;
+            to_write = NULL;
+
+            expecting_opt = 1;
+
+            continue;
+        }
+
+        if (arg->len == 2) {
+            if (ngx_strncmp("-q", arg->data, arg->len) == 0) {
+                to_write = &parsed_sr->query_string;
+                expecting_opt = 0;
+                continue;
+            }
+
+            if (ngx_strncmp("-b", arg->data, arg->len) == 0) {
+                to_write = &body_str;
+                expecting_opt = 0;
+                continue;
+            }
+
+            if (ngx_strncmp("-f", arg->data, arg->len) == 0) {
+                dd("found option -f");
+                to_write = &body_file;
+                expecting_opt = 0;
+                continue;
+            }
+        }
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "unknown option for echo_subrequest*: %V", arg);
+
+        return NGX_ERROR;
+    }
+
+    if (body_str != NULL && body_str->len) {
+        rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
+
+        if (rb == NULL) {
+            return NGX_ERROR;
+        }
+
+        parsed_sr->content_length_n = body_str->len;
+
+        b = ngx_calloc_buf(r->pool);
+        if (b == NULL) {
+            return NGX_ERROR;
+        }
+
+        b->temporary = 1;
+        /* b->memory = 1; */
+        b->start = b->pos = body_str->data;
+        b->end = b->last = body_str->data + body_str->len;
+
+        rb->bufs = ngx_alloc_chain_link(r->pool);
+        if (rb->bufs == NULL) {
+            return NGX_ERROR;
+        }
+
+        rb->bufs->buf = b;
+        rb->bufs->next = NULL;
+
+        rb->buf = b;
+
+    } else if (body_file != NULL && body_file->len) {
+
+        dd("body_file defined %.*s", (int) body_file->len, body_file->data);
+
+        body_file->data = ngx_http_echo_rebase_path(r->pool, body_file->data,
+                                                    body_file->len, &len);
+
+        if (body_file->data == NULL) {
+            return NGX_ERROR;
+        }
+
+        body_file->len = len;
+
+        dd("after rebase, the path becomes %.*s", (int) body_file->len,
+           body_file->data);
+
+        rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
+        if (rb == NULL) {
+            return NGX_ERROR;
+        }
+
+        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+        ngx_memzero(&of, sizeof(ngx_open_file_info_t));
+
+#if defined(nginx_version) && nginx_version >= 8018
+        of.read_ahead = clcf->read_ahead;
+#endif
+
+        of.directio = clcf->directio;
+        of.valid = clcf->open_file_cache_valid;
+        of.min_uses = clcf->open_file_cache_min_uses;
+        of.errors = clcf->open_file_cache_errors;
+        of.events = clcf->open_file_cache_events;
+
+        if (ngx_open_cached_file(clcf->open_file_cache, body_file, &of, r->pool)
+            != NGX_OK)
+        {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, of.err,
+                          "%s \"%V\" failed",
+                          of.failed, body_file);
+
+            return NGX_ERROR;
+        }
+
+        dd("file content size: %d", (int) of.size);
+
+        parsed_sr->content_length_n = (ssize_t) of.size;
+
+        b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
+        if (b == NULL) {
+            return NGX_ERROR;
+        }
+
+        b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t));
+        if (b->file == NULL) {
+            return NGX_ERROR;
+        }
+
+        b->file_pos = 0;
+        b->file_last = of.size;
+
+        b->in_file = b->file_last ? 1: 0;
+
+#if 0
+        b->last_buf = (r == r->main) ? 1: 0;
+        b->last_in_chain = 1;
+#endif
+
+        b->file->fd = of.fd;
+        b->file->name = *body_file;
+        b->file->log = r->connection->log;
+        b->file->directio = of.is_directio;
+
+        rb->bufs = ngx_alloc_chain_link(r->pool);
+        if (rb->bufs == NULL) {
+            return NGX_ERROR;
+        }
+
+        rb->bufs->buf = b;
+        rb->bufs->next = NULL;
+        rb->buf = b;
+    }
+
+    parsed_sr->request_body = rb;
+
+    parsed_sr->method = ngx_http_echo_parse_method_name(&method_name);
+    parsed_sr->method_name  = method_name;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_echo_adjust_subrequest(ngx_http_request_t *sr,
+    ngx_http_echo_subrequest_t *parsed_sr)
+{
+    ngx_http_core_main_conf_t  *cmcf;
+    ngx_http_request_t         *r;
+    ngx_http_request_body_t    *body;
+    ngx_int_t                   rc;
+
+    sr->method = parsed_sr->method;
+    sr->method_name = *(parsed_sr->method_name);
+
+    if (sr->method == NGX_HTTP_HEAD) {
+        sr->header_only = 1;
+    }
+
+    r = sr->parent;
+
+    sr->header_in = r->header_in;
+
+    /* XXX work-around a bug in ngx_http_subrequest */
+    if (r->headers_in.headers.last == &r->headers_in.headers.part) {
+        sr->headers_in.headers.last = &sr->headers_in.headers.part;
+    }
+
+    /* we do not inherit the parent request's variables */
+    cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
+    sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts
+                                * sizeof(ngx_http_variable_value_t));
+
+    if (sr->variables == NULL) {
+        return NGX_ERROR;
+    }
+
+    body = parsed_sr->request_body;
+    if (body) {
+        sr->request_body = body;
+
+        rc = ngx_http_echo_set_content_length_header(sr, body->buf ?
+                                                     ngx_buf_size(body->buf)
+                                                     : 0);
+
+        if (rc != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    dd("subrequest body: %p", sr->request_body);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_echo_parse_method_name(ngx_str_t **method_name_ptr)
+{
+    const ngx_str_t     *method_name = *method_name_ptr;
+
+    switch (method_name->len) {
+    case 3:
+        if (ngx_http_echo_strcmp_const(method_name->data, "GET") == 0) {
+            *method_name_ptr = &ngx_http_echo_get_method;
+            return NGX_HTTP_GET;
+        }
+
+        if (ngx_http_echo_strcmp_const(method_name->data, "PUT") == 0) {
+            *method_name_ptr = &ngx_http_echo_put_method;
+            return NGX_HTTP_PUT;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 4:
+        if (ngx_http_echo_strcmp_const(method_name->data, "POST") == 0) {
+            *method_name_ptr = &ngx_http_echo_post_method;
+            return NGX_HTTP_POST;
+        }
+
+        if (ngx_http_echo_strcmp_const(method_name->data, "HEAD") == 0) {
+            *method_name_ptr = &ngx_http_echo_head_method;
+            return NGX_HTTP_HEAD;
+        }
+
+        if (ngx_http_echo_strcmp_const(method_name->data, "COPY") == 0) {
+            *method_name_ptr = &ngx_http_echo_copy_method;
+            return NGX_HTTP_COPY;
+        }
+
+        if (ngx_http_echo_strcmp_const(method_name->data, "MOVE") == 0) {
+            *method_name_ptr = &ngx_http_echo_move_method;
+            return NGX_HTTP_MOVE;
+        }
+
+        if (ngx_http_echo_strcmp_const(method_name->data, "LOCK") == 0) {
+            *method_name_ptr = &ngx_http_echo_lock_method;
+            return NGX_HTTP_LOCK;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 5:
+        if (ngx_http_echo_strcmp_const(method_name->data, "MKCOL") == 0) {
+            *method_name_ptr = &ngx_http_echo_mkcol_method;
+            return NGX_HTTP_MKCOL;
+        }
+
+        if (ngx_http_echo_strcmp_const(method_name->data, "TRACE") == 0) {
+            *method_name_ptr = &ngx_http_echo_trace_method;
+            return NGX_HTTP_TRACE;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 6:
+        if (ngx_http_echo_strcmp_const(method_name->data, "DELETE") == 0) {
+            *method_name_ptr = &ngx_http_echo_delete_method;
+            return NGX_HTTP_DELETE;
+        }
+
+        if (ngx_http_echo_strcmp_const(method_name->data, "UNLOCK") == 0) {
+            *method_name_ptr = &ngx_http_echo_unlock_method;
+            return NGX_HTTP_UNLOCK;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 7:
+        if (ngx_http_echo_strcmp_const(method_name->data, "OPTIONS") == 0) {
+            *method_name_ptr = &ngx_http_echo_options_method;
+            return NGX_HTTP_OPTIONS;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 8:
+        if (ngx_http_echo_strcmp_const(method_name->data, "PROPFIND") == 0) {
+            *method_name_ptr = &ngx_http_echo_propfind_method;
+            return NGX_HTTP_PROPFIND;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 9:
+        if (ngx_http_echo_strcmp_const(method_name->data, "PROPPATCH") == 0) {
+            *method_name_ptr = &ngx_http_echo_proppatch_method;
+            return NGX_HTTP_PROPPATCH;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    default:
+        return NGX_HTTP_UNKNOWN;
+    }
+}
+
+
+/* XXX extermely evil and not working yet */
+ngx_int_t
+ngx_http_echo_exec_abort_parent(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx)
+{
+#if 0
+    ngx_http_postponed_request_t    *pr, *ppr;
+    ngx_http_request_t              *saved_data = NULL;
+    ngx_chain_t                     *out = NULL;
+    /* ngx_int_t                       rc; */
+
+    dd("aborting parent...");
+
+    if (r == r->main || r->parent == NULL) {
+        return NGX_OK;
+    }
+
+    if (r->parent->postponed) {
+        dd("Found parent->postponed...");
+
+        saved_data = r->connection->data;
+        ppr = NULL;
+        for (pr = r->parent->postponed; pr->next; pr = pr->next) {
+            if (pr->request == NULL) {
+                continue;
+            }
+
+            if (pr->request == r) {
+                /* r->parent->postponed->next = pr; */
+                dd("found the current subrequest");
+                out = pr->out;
+                continue;
+            }
+
+            /* r->connection->data = pr->request; */
+            dd("finalizing the subrequest...");
+            ngx_http_upstream_create(pr->request);
+            pr->request->upstream = NULL;
+
+            if (ppr == NULL) {
+                r->parent->postponed = pr->next;
+                ppr = pr->next;
+            } else {
+                ppr->next = pr->next;
+                ppr = pr->next;
+            }
+        }
+    }
+
+    r->parent->postponed->next = NULL;
+
+    /*
+    r->connection->data = r->parent;
+    r->connection->buffered = 0;
+
+    if (out != NULL) {
+        dd("trying to send more stuffs for the parent");
+        ngx_http_output_filter(r->parent, out);
+    }
+    */
+
+    /* ngx_http_send_special(r->parent, NGX_HTTP_LAST); */
+
+    if (saved_data) {
+        r->connection->data = saved_data;
+    }
+
+    dd("terminating the parent request");
+
+    return ngx_http_echo_send_chain_link(r, ctx, NULL /* indicate LAST */);
+
+    /* ngx_http_upstream_create(r); */
+
+    /* ngx_http_finalize_request(r->parent, NGX_ERROR); */
+#endif
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_exec(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args)
+{
+    ngx_str_t                       *uri;
+    ngx_str_t                       *user_args;
+    ngx_str_t                        args;
+    ngx_uint_t                       flags = 0;
+    ngx_str_t                       *computed_arg;
+
+    computed_arg = computed_args->elts;
+
+    uri = &computed_arg[0];
+
+    if (uri->len == 0) {
+        return NGX_HTTP_BAD_REQUEST;
+    }
+
+    if (computed_args->nelts > 1) {
+        user_args = &computed_arg[1];
+
+    } else {
+        user_args = NULL;
+    }
+
+    args.data = NULL;
+    args.len = 0;
+
+    if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "echo_exec sees unsafe uri: \"%V\"",
+                       uri);
+        return NGX_ERROR;
+    }
+
+    if (args.len > 0 && user_args == NULL) {
+        user_args = &args;
+    }
+
+    r->write_event_handler = ngx_http_request_empty_handler;
+
+    if (uri->data[0] == '@') {
+
+        if (user_args && user_args->len > 0) {
+            ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                          "querystring %V ignored when exec'ing named "
+                          "location %V", user_args, uri);
+        }
+
+#if 1
+        /* clear the modules contexts */
+        ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
+#endif
+
+        dd("named location: %.*s, c:%d", (int) uri->len, uri->data,
+           (int) r->main->count);
+
+        return ngx_http_named_location(r, uri);
+    }
+
+    return ngx_http_internal_redirect(r, uri, user_args);
+}
+
+
+static ngx_int_t
+ngx_http_echo_set_content_length_header(ngx_http_request_t *r, off_t len)
+{
+    ngx_table_elt_t                 *h, *header;
+    u_char                          *p;
+    ngx_list_part_t                 *part;
+    ngx_http_request_t              *pr;
+    ngx_uint_t                       i;
+
+    r->headers_in.content_length_n = len;
+
+    if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
+                      sizeof(ngx_table_elt_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    h = ngx_list_push(&r->headers_in.headers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    h->key = ngx_http_echo_content_length_header_key;
+    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
+    if (h->lowcase_key == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
+
+    r->headers_in.content_length = h;
+
+    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    h->value.data = p;
+
+    h->value.len = ngx_sprintf(h->value.data, "%O", len) - h->value.data;
+
+    h->hash = ngx_http_echo_content_length_hash;
+
+    dd("r content length: %.*s",
+       (int) r->headers_in.content_length->value.len,
+            r->headers_in.content_length->value.data);
+
+    pr = r->parent;
+
+    if (pr == NULL) {
+        return NGX_OK;
+    }
+
+    /* forward the parent request's all other request headers */
+
+    part = &pr->headers_in.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].key.len == sizeof("Content-Length") - 1
+            && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length",
+                               sizeof("Content-Length") - 1)
+               == 0)
+        {
+            continue;
+        }
+
+        h = ngx_list_push(&r->headers_in.headers);
+        if (h == NULL) {
+            return NGX_ERROR;
+        }
+
+        *h = header[i];
+    }
+
+    /* XXX maybe we should set those built-in header slot in
+     * ngx_http_headers_in_t too? */
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_subrequest.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_subrequest.h
new file mode 100644
index 0000000..61c0a04
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_subrequest.h
@@ -0,0 +1,19 @@
+#ifndef ECHO_SUBREQUEST_H
+#define ECHO_SUBREQUEST_H
+
+#include "ngx_http_echo_module.h"
+
+ngx_int_t ngx_http_echo_exec_echo_subrequest(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
+
+ngx_int_t ngx_http_echo_exec_echo_subrequest_async(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
+
+ngx_int_t ngx_http_echo_exec_abort_parent(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx);
+
+ngx_int_t ngx_http_echo_exec_exec(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx, ngx_array_t *computed_args);
+
+#endif /* ECHO_SUBREQUEST_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_timer.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_timer.c
new file mode 100644
index 0000000..e2777ee
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_timer.c
@@ -0,0 +1,95 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+
+#include "ddebug.h"
+
+#include "ngx_http_echo_timer.h"
+#include "ngx_http_echo_util.h"
+
+#include <stdlib.h>
+#include <ngx_log.h>
+#include <nginx.h>
+
+
+ngx_int_t
+ngx_http_echo_timer_elapsed_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_http_echo_ctx_t     *ctx;
+    ngx_msec_int_t           ms;
+    u_char                  *p;
+    ngx_time_t              *tp;
+    size_t                   size;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_echo_module);
+    if (ctx == NULL) {
+        ctx = ngx_http_echo_create_ctx(r);
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_http_set_ctx(r, ctx, ngx_http_echo_module);
+    }
+
+    if (ctx->timer_begin.sec == 0) {
+        ctx->timer_begin.sec  = r->start_sec;
+        ctx->timer_begin.msec = (ngx_msec_t) r->start_msec;
+    }
+
+    /* force the ngx timer to update */
+
+#if (nginx_version >= 8035) || (nginx_version < 8000 && nginx_version >= 7066)
+    ngx_time_update();
+#else
+    ngx_time_update(0, 0);
+#endif
+
+    tp = ngx_timeofday();
+
+    dd("old sec msec: %ld %d\n", (long) ctx->timer_begin.sec,
+       (int) ctx->timer_begin.msec);
+
+    dd("new sec msec: %ld %d\n", (long) tp->sec, (int) tp->msec);
+
+    ms = (ngx_msec_int_t)
+             ((tp->sec - ctx->timer_begin.sec) * 1000 +
+              (tp->msec - ctx->timer_begin.msec));
+    ms = (ms >= 0) ? ms : 0;
+
+    size = sizeof("-9223372036854775808.000") - 1;
+
+    p = ngx_palloc(r->pool, size);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->len = ngx_snprintf(p, size, "%T.%03M", ms / 1000, ms % 1000) - p;
+    v->data = p;
+
+    v->valid = 1;
+    v->no_cacheable = 1;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_exec_echo_reset_timer(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx)
+{
+    dd("Exec timer...");
+
+    /* force the ngx timer to update */
+
+#if (nginx_version >= 8035) || (nginx_version < 8000 && nginx_version >= 7066)
+    ngx_time_update();
+#else
+    ngx_time_update(0, 0);
+#endif
+
+    ctx->timer_begin = *ngx_timeofday();
+    return NGX_OK;
+}
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_timer.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_timer.h
new file mode 100644
index 0000000..b6e7ff3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_timer.h
@@ -0,0 +1,13 @@
+#ifndef ECHO_TIMER_H
+#define ECHO_TIMER_H
+
+#include "ngx_http_echo_module.h"
+
+ngx_int_t ngx_http_echo_timer_elapsed_variable(ngx_http_request_t *r,
+        ngx_http_variable_value_t *v, uintptr_t data);
+
+ngx_int_t ngx_http_echo_exec_echo_reset_timer(ngx_http_request_t *r,
+        ngx_http_echo_ctx_t *ctx);
+
+#endif /* ECHO_TIMER_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_util.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_util.c
new file mode 100644
index 0000000..fed0587
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_util.c
@@ -0,0 +1,302 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_echo_util.h"
+#include "ngx_http_echo_sleep.h"
+
+
+ngx_uint_t  ngx_http_echo_content_length_hash = 0;
+
+
+ngx_http_echo_ctx_t *
+ngx_http_echo_create_ctx(ngx_http_request_t *r)
+{
+    ngx_http_echo_ctx_t         *ctx;
+
+    ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_echo_ctx_t));
+    if (ctx == NULL) {
+        return NULL;
+    }
+
+    ctx->sleep.handler   = ngx_http_echo_sleep_event_handler;
+    ctx->sleep.data      = r;
+    ctx->sleep.log       = r->connection->log;
+
+    return ctx;
+}
+
+
+ngx_int_t
+ngx_http_echo_eval_cmd_args(ngx_http_request_t *r,
+    ngx_http_echo_cmd_t *cmd, ngx_array_t *computed_args,
+    ngx_array_t *opts)
+{
+    unsigned                         expecting_opts = 1;
+    ngx_uint_t                       i;
+    ngx_array_t                     *args = cmd->args;
+    ngx_str_t                       *arg, *raw, *opt;
+    ngx_http_echo_arg_template_t    *value;
+
+    value = args->elts;
+
+    for (i = 0; i < args->nelts; i++) {
+        raw = &value[i].raw_value;
+
+        if (value[i].lengths == NULL && raw->len > 0) {
+            if (expecting_opts) {
+                if (raw->len == 1 || raw->data[0] != '-') {
+                    expecting_opts = 0;
+
+                } else if (raw->data[1] == '-') {
+                    expecting_opts = 0;
+                    continue;
+
+                } else {
+                    opt = ngx_array_push(opts);
+                    if (opt == NULL) {
+                        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                    }
+
+                    opt->len = raw->len - 1;
+                    opt->data = raw->data + 1;
+
+                    dd("pushing opt: %.*s", (int) opt->len, opt->data);
+
+                    continue;
+                }
+            }
+
+        } else {
+            expecting_opts = 0;
+        }
+
+        arg = ngx_array_push(computed_args);
+        if (arg == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        if (value[i].lengths == NULL) { /* does not contain vars */
+            dd("Using raw value \"%.*s\"", (int) raw->len, raw->data);
+            *arg = *raw;
+
+        } else {
+            if (ngx_http_script_run(r, arg, value[i].lengths->elts,
+                                    0, value[i].values->elts)
+                == NULL)
+            {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
+        }
+
+        dd("pushed arg: %.*s", (int) arg->len, arg->data);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_echo_send_chain_link(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_chain_t *in)
+{
+    ngx_int_t        rc;
+
+    rc = ngx_http_echo_send_header_if_needed(r, ctx);
+
+    if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+        return rc;
+    }
+
+    if (in == NULL) {
+
+#if defined(nginx_version) && nginx_version <= 8004
+
+        /* earlier versions of nginx does not allow subrequests
+            to send last_buf themselves */
+        if (r != r->main) {
+            return NGX_OK;
+        }
+
+#endif
+
+        rc = ngx_http_send_special(r, NGX_HTTP_LAST);
+        if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+            return rc;
+        }
+
+        return NGX_OK;
+    }
+
+    /* FIXME we should udpate chains to recycle chain links and bufs */
+    return ngx_http_output_filter(r, in);
+}
+
+
+ngx_int_t
+ngx_http_echo_send_header_if_needed(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx)
+{
+    ngx_int_t                    rc;
+    ngx_http_echo_loc_conf_t    *elcf;
+
+    if (!r->header_sent && !ctx->header_sent) {
+        elcf = ngx_http_get_module_loc_conf(r, ngx_http_echo_module);
+
+        r->headers_out.status = (ngx_uint_t) elcf->status;
+
+        if (ngx_http_set_content_type(r) != NGX_OK) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        ngx_http_clear_content_length(r);
+        ngx_http_clear_accept_ranges(r);
+
+        rc = ngx_http_send_header(r);
+        ctx->header_sent = 1;
+        return rc;
+    }
+
+    return NGX_OK;
+}
+
+
+ssize_t
+ngx_http_echo_atosz(u_char *line, size_t n)
+{
+    ssize_t  value;
+
+    if (n == 0) {
+        return NGX_ERROR;
+    }
+
+    for (value = 0; n--; line++) {
+        if (*line == '_') { /* we ignore undercores */
+            continue;
+        }
+
+        if (*line < '0' || *line > '9') {
+            return NGX_ERROR;
+        }
+
+        value = value * 10 + (*line - '0');
+    }
+
+    if (value < 0) {
+        return NGX_ERROR;
+    }
+
+    return value;
+}
+
+
+/* Modified from the ngx_strlcasestrn function in ngx_string.h
+ * Copyright (C) by Igor Sysoev */
+u_char *
+ngx_http_echo_strlstrn(u_char *s1, u_char *last, u_char *s2, size_t n)
+{
+    ngx_uint_t  c1, c2;
+
+    c2 = (ngx_uint_t) *s2++;
+    last -= n;
+
+    do {
+        do {
+            if (s1 >= last) {
+                return NULL;
+            }
+
+            c1 = (ngx_uint_t) *s1++;
+
+        } while (c1 != c2);
+
+    } while (ngx_strncmp(s1, s2, n) != 0);
+
+    return --s1;
+}
+
+
+ngx_int_t
+ngx_http_echo_post_request_at_head(ngx_http_request_t *r,
+    ngx_http_posted_request_t *pr)
+{
+    dd_enter();
+
+    if (pr == NULL) {
+        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;
+}
+
+
+u_char *
+ngx_http_echo_rebase_path(ngx_pool_t *pool, u_char *src, size_t osize,
+    size_t *nsize)
+{
+    u_char            *p, *dst;
+
+    if (osize == 0) {
+        return NULL;
+    }
+
+    if (src[0] == '/') {
+        /* being an absolute path already, just add a trailing '\0' */
+        *nsize = osize;
+
+        dst = ngx_palloc(pool, *nsize + 1);
+        if (dst == NULL) {
+            *nsize = 0;
+            return NULL;
+        }
+
+        p = ngx_copy(dst, src, osize);
+        *p = '\0';
+
+        return dst;
+    }
+
+    *nsize = ngx_cycle->prefix.len + osize;
+
+    dst = ngx_palloc(pool, *nsize + 1);
+    if (dst == NULL) {
+        *nsize = 0;
+        return NULL;
+    }
+
+    p = ngx_copy(dst, ngx_cycle->prefix.data, ngx_cycle->prefix.len);
+    p = ngx_copy(p, src, osize);
+
+    *p = '\0';
+
+    return dst;
+}
+
+
+ngx_int_t
+ngx_http_echo_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_output_filter(r, NULL);
+    }
+
+    /* do nothing */
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_util.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_util.h
new file mode 100644
index 0000000..d620d09
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_util.h
@@ -0,0 +1,58 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_ECHO_UTIL_H
+#define NGX_HTTP_ECHO_UTIL_H
+
+
+#include "ngx_http_echo_module.h"
+
+
+#define ngx_http_echo_strcmp_const(a, b)                                     \
+    ngx_strncmp(a, b, sizeof(b) - 1)
+
+
+#define ngx_http_echo_hash_literal(s)                                        \
+    ngx_http_echo_hash_str((u_char *) s, sizeof(s) - 1)
+
+
+static ngx_inline ngx_uint_t
+ngx_http_echo_hash_str(u_char *src, size_t n)
+{
+    ngx_uint_t  key;
+
+    key = 0;
+
+    while (n--) {
+        key = ngx_hash(key, *src);
+        src++;
+    }
+
+    return key;
+}
+
+
+extern ngx_uint_t  ngx_http_echo_content_length_hash;
+
+
+ngx_http_echo_ctx_t *ngx_http_echo_create_ctx(ngx_http_request_t *r);
+ngx_int_t ngx_http_echo_eval_cmd_args(ngx_http_request_t *r,
+    ngx_http_echo_cmd_t *cmd, ngx_array_t *computed_args,
+    ngx_array_t *opts);
+ngx_int_t ngx_http_echo_send_header_if_needed(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx);
+ngx_int_t ngx_http_echo_send_chain_link(ngx_http_request_t *r,
+    ngx_http_echo_ctx_t *ctx, ngx_chain_t *cl);
+ssize_t ngx_http_echo_atosz(u_char *line, size_t n);
+u_char *ngx_http_echo_strlstrn(u_char *s1, u_char *last, u_char *s2, size_t n);
+ngx_int_t ngx_http_echo_post_request_at_head(ngx_http_request_t *r,
+    ngx_http_posted_request_t *pr);
+u_char *ngx_http_echo_rebase_path(ngx_pool_t *pool, u_char *src, size_t osize,
+    size_t *nsize);
+ngx_int_t ngx_http_echo_flush_postponed_outputs(ngx_http_request_t *r);
+
+
+#endif /* NGX_HTTP_ECHO_UTIL_H */
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_var.c b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_var.c
new file mode 100644
index 0000000..138a510
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_var.c
@@ -0,0 +1,110 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_echo_var.h"
+#include "ngx_http_echo_timer.h"
+#include "ngx_http_echo_request_info.h"
+#include "ngx_http_echo_foreach.h"
+
+
+static ngx_int_t ngx_http_echo_incr_variable(ngx_http_request_t *r,
+        ngx_http_variable_value_t *v, uintptr_t data);
+
+
+static ngx_http_variable_t ngx_http_echo_variables[] = {
+
+    { ngx_string("echo_timer_elapsed"), NULL,
+      ngx_http_echo_timer_elapsed_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("echo_request_method"), NULL,
+      ngx_http_echo_request_method_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("echo_cacheable_request_uri"), NULL,
+      ngx_http_echo_cacheable_request_uri_variable, 0,
+      0, 0 },
+
+    { ngx_string("echo_request_uri"), NULL,
+      ngx_http_echo_request_uri_variable, 0,
+      0, 0 },
+
+    { ngx_string("echo_client_request_method"), NULL,
+      ngx_http_echo_client_request_method_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("echo_request_body"), NULL,
+      ngx_http_echo_request_body_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("echo_client_request_headers"), NULL,
+      ngx_http_echo_client_request_headers_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("echo_it"), NULL,
+      ngx_http_echo_it_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("echo_incr"), NULL,
+      ngx_http_echo_incr_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("echo_response_status"), NULL,
+      ngx_http_echo_response_status_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
+ngx_int_t
+ngx_http_echo_add_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t *var, *v;
+
+    for (v = ngx_http_echo_variables; v->name.len; v++) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_echo_incr_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_http_echo_ctx_t         *ctx;
+    u_char                      *p;
+
+    ctx = ngx_http_get_module_ctx(r->main, ngx_http_echo_module);
+
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->counter++;
+
+    p = ngx_palloc(r->pool, NGX_INT_T_LEN);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->len = ngx_sprintf(p, "%ui", ctx->counter) - p;
+    v->data = p;
+
+    v->valid = 1;
+    v->not_found = 0;
+    v->no_cacheable = 1;
+
+    return NGX_OK;
+}
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_var.h b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_var.h
new file mode 100644
index 0000000..8b24e02
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/src/ngx_http_echo_var.h
@@ -0,0 +1,9 @@
+#ifndef ECHO_VAR_H
+#define ECHO_VAR_H
+
+#include "ngx_http_echo_module.h"
+
+ngx_int_t ngx_http_echo_add_variables(ngx_conf_t *cf);
+
+#endif /* ECHO_VAR_H */
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/abort-parent.t b/modules_deb/libnginx-mod-http-echo-0.63/t/abort-parent.t
new file mode 100644
index 0000000..6137607
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/abort-parent.t
@@ -0,0 +1,63 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::LWP skip_all =>
+    'not working at all';
+
+plan tests => 2 * blocks();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /abort {
+        echo hello;
+        echo_flush;
+        echo_location_async '/foo';
+        echo_location_async '/bar';
+        echo_location_async '/baz';
+        echo world;
+        echo_flush;
+    }
+
+    location /proxy {
+        proxy_pass "http://127.0.0.1:$server_port/sleep?$query_string";
+    }
+
+    location /sleep {
+        echo_sleep $arg_sleep;
+        echo $arg_echo;
+        echo_flush;
+    }
+
+    location /foo {
+        echo_location '/proxy?sleep=1&echo=foo';
+        #echo_flush;
+        echo_abort_parent;
+    }
+
+    location /bar {
+        proxy_pass 'http://127.0.0.1:$server_port/sleep_bar';
+    }
+
+    location /baz {
+        proxy_pass 'http://127.0.0.1:$server_port/sleep_baz';
+    }
+
+    location /sleep_bar {
+        echo_sleep 2;
+        echo bar;
+    }
+
+    location /sleep_baz {
+        echo_sleep 3;
+        echo baz;
+    }
+--- request
+    GET /abort
+--- response_body
+hello
+bar
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/blocking-sleep.t b/modules_deb/libnginx-mod-http-echo-0.63/t/blocking-sleep.t
new file mode 100644
index 0000000..0bdc6cc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/blocking-sleep.t
@@ -0,0 +1,156 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => 2 * blocks();
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /echo {
+        echo_blocking_sleep 1;
+    }
+--- request
+    GET /echo
+--- response_body
+
+
+
+=== TEST 2: fractional delay
+--- config
+    location /echo {
+        echo_blocking_sleep 0.01;
+    }
+--- request
+    GET /echo
+--- response_body
+
+
+
+=== TEST 3: leading echo
+--- config
+    location /echo {
+        echo before...;
+        echo_blocking_sleep 0.01;
+    }
+--- request
+    GET /echo
+--- response_body
+before...
+
+
+
+=== TEST 4: trailing echo
+--- config
+    location /echo {
+        echo_blocking_sleep 0.01;
+        echo after...;
+    }
+--- request
+    GET /echo
+--- response_body
+after...
+
+
+
+=== TEST 5: two echos around sleep
+--- config
+    location /echo {
+        echo before...;
+        echo_blocking_sleep 0.01;
+        echo after...;
+    }
+--- request
+    GET /echo
+--- response_body
+before...
+after...
+
+
+
+=== TEST 6: interleaving sleep and echo
+--- config
+    location /echo {
+        echo 1;
+        echo_blocking_sleep 0.01;
+        echo 2;
+        echo_blocking_sleep 0.01;
+    }
+--- request
+    GET /echo
+--- response_body
+1
+2
+
+
+
+=== TEST 7: interleaving sleep and echo with echo at the end...
+--- config
+    location /echo {
+        echo 1;
+        echo_blocking_sleep 0.01;
+        echo 2;
+        echo_blocking_sleep 0.01;
+        echo 3;
+    }
+--- request
+    GET /echo
+--- response_body
+1
+2
+3
+
+
+
+=== TEST 8: flush before sleep
+we didn't really test the actual effect of "echo_flush" here...
+merely checks if it croaks if appears.
+--- config
+    location /flush {
+        echo hi;
+        echo_flush;
+        echo_blocking_sleep 0.01;
+        echo trees;
+    }
+--- request
+    GET /flush
+--- response_body
+hi
+trees
+
+
+
+=== TEST 9: flush does not increment opcode pointer itself
+--- config
+    location /flush {
+        echo hi;
+        echo_flush;
+        echo trees;
+    }
+--- request
+    GET /flush
+--- response_body
+hi
+trees
+
+
+
+=== TEST 10: blocking sleep by variable
+--- config
+    location ~ ^/sleep/(.+) {
+        echo before...;
+        echo_blocking_sleep $1;
+        echo after...;
+    }
+--- request
+    GET /sleep/0.01
+--- response_body
+before...
+after...
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/echo-after-body.t b/modules_deb/libnginx-mod-http-echo-0.63/t/echo-after-body.t
new file mode 100644
index 0000000..44c4c72
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/echo-after-body.t
@@ -0,0 +1,261 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 1);
+
+no_long_string();
+log_level('warn');
+
+#master_on();
+#workers(1);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- http_config
+    postpone_output 1;
+--- config
+    location /echo {
+        echo_after_body hello;
+        echo world;
+    }
+--- request
+    GET /echo
+--- response_body
+world
+hello
+
+
+
+=== TEST 2: echo after proxy
+--- config
+    location /echo {
+        echo_after_body hello;
+        proxy_pass http://127.0.0.1:$server_port$request_uri/more;
+    }
+    location /echo/more {
+        echo world;
+    }
+--- request
+    GET /echo
+--- response_body
+world
+hello
+
+
+
+=== TEST 3: with variables
+--- config
+    location /echo {
+        echo_after_body $request_method;
+        echo world;
+    }
+--- request
+    GET /echo
+--- response_body
+world
+GET
+
+
+
+=== TEST 4: w/o args
+--- config
+    location /echo {
+        echo_after_body;
+        echo world;
+    }
+--- request
+    GET /echo
+--- response_body eval
+"world\n\n"
+
+
+
+=== TEST 5: order is not important
+--- config
+    location /reversed {
+        echo world;
+        echo_after_body hello;
+    }
+--- request
+    GET /reversed
+--- response_body
+world
+hello
+
+
+
+=== TEST 6: multiple echo_after_body instances
+--- config
+    location /echo {
+        echo_after_body hello;
+        echo_after_body world;
+        echo !;
+    }
+--- request
+    GET /echo
+--- response_body
+!
+hello
+world
+
+
+
+=== TEST 7: multiple echo_after_body instances with multiple echo cmds
+--- config
+    location /echo {
+        echo_after_body hello;
+        echo_after_body world;
+        echo i;
+        echo say;
+    }
+--- request
+    GET /echo
+--- response_body
+i
+say
+hello
+world
+
+
+
+=== TEST 8: echo-after-body & echo-before-body
+--- config
+    location /mixed {
+        echo_before_body hello;
+        echo_after_body world;
+        echo_before_body hiya;
+        echo_after_body igor;
+        echo ////////;
+    }
+--- request
+    GET /mixed
+--- response_body
+hello
+hiya
+////////
+world
+igor
+
+
+
+=== TEST 9: echo around proxy
+--- config
+    location /echo {
+        echo_before_body hello;
+        echo_before_body world;
+        #echo $scheme://$host:$server_port$request_uri/more;
+        proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
+        echo_after_body hiya;
+        echo_after_body igor;
+    }
+    location /echo/more {
+        echo blah;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+world
+blah
+hiya
+igor
+
+
+
+=== TEST 10: with $echo_response_status
+--- config
+    location /status {
+        echo_after_body "status: $echo_response_status";
+        return 404;
+    }
+--- request
+    GET /status
+--- response_body_like
+.*404 Not Found.*
+status: 404$
+--- error_code: 404
+
+
+
+=== TEST 11: in subrequests
+--- config
+    location /main {
+        echo_location_async /hello;
+    }
+    location /hello {
+        echo_after_body 'world!';
+        echo 'hello';
+    }
+--- request
+    GET /main
+--- response_body
+hello
+world!
+
+
+
+=== TEST 12: echo_after_body + gzip
+--- config
+    gzip             on;
+    gzip_min_length  1;
+    location /main {
+        echo_after_body 'world!';
+        echo_duplicate 1024 'hello';
+    }
+--- request
+    GET /main
+--- response_body_like
+hello
+--- SKIP
+
+
+
+=== TEST 13: echo_after_body + proxy output
+--- config
+    #gzip             on;
+    #gzip_min_length  1;
+    location /main {
+        echo_after_body 'world';
+        proxy_pass http://127.0.0.1:$server_port/foo;
+    }
+    location /foo {
+        echo_duplicate 10 hello;
+    }
+--- request
+    GET /main
+--- response_body_like
+^(?:hello){10}world$
+
+
+
+=== TEST 14: in subrequests (we get last_in_chain set properly)
+--- config
+    location /main {
+        echo_location_async /hello;
+    }
+    location /hello {
+        echo 'hello';
+        echo_after_body 'world!';
+        body_filter_by_lua '
+            local eof = ngx.arg[2]
+            if eof then
+                print("lua: eof found in body")
+            end
+        ';
+    }
+--- request
+    GET /main
+--- response_body
+hello
+world!
+--- log_level: notice
+--- error_log
+lua: eof found in body
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/echo-before-body.t b/modules_deb/libnginx-mod-http-echo-0.63/t/echo-before-body.t
new file mode 100644
index 0000000..1513184
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/echo-before-body.t
@@ -0,0 +1,278 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => 2 * blocks();
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /echo {
+        echo_before_body hello;
+        echo world;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+world
+
+
+
+=== TEST 2: echo before proxy
+--- config
+    location /echo {
+        echo_before_body hello;
+        proxy_pass $scheme://127.0.0.1:$server_port$request_uri/more;
+    }
+    location /echo/more {
+        echo world;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+world
+
+
+
+=== TEST 3: with variables
+--- config
+    location /echo {
+        echo_before_body $request_method;
+        echo world;
+    }
+--- request
+    GET /echo
+--- response_body
+GET
+world
+
+
+
+=== TEST 4: w/o args
+--- config
+    location /echo {
+        echo_before_body;
+        echo world;
+    }
+--- request
+    GET /echo
+--- response_body eval
+"\nworld\n"
+
+
+
+=== TEST 5: order is not important
+--- config
+    location /reversed {
+        echo world;
+        echo_before_body hello;
+    }
+--- request
+    GET /reversed
+--- response_body
+hello
+world
+
+
+
+=== TEST 6: multiple echo_before_body instances
+--- config
+    location /echo {
+        echo_before_body hello;
+        echo_before_body world;
+        echo !;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+world
+!
+
+
+
+=== TEST 7: multiple echo_before_body instances with multiple echo cmds
+--- config
+    location /echo {
+        echo_before_body hello;
+        echo_before_body world;
+        echo i;
+        echo say;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+world
+i
+say
+
+
+
+=== TEST 8: with $echo_response_status
+--- config
+    location /status {
+        echo_before_body "status: $echo_response_status";
+        return 404;
+    }
+--- request
+    GET /status
+--- response_body_like
+status: 404
+<html>.*404 Not Found.*$
+--- error_code: 404
+
+
+
+=== TEST 9: $echo_response_status in echo_before_body in subrequests
+--- config
+    location /main {
+        echo_location '/status?val=403';
+        echo_location '/status?val=500';
+    }
+    location /status {
+        if ($arg_val = 500) {
+            echo_before_body "status: $echo_response_status";
+            return 500;
+            break;
+        }
+        if ($arg_val = 403) {
+            echo_before_body "status: $echo_response_status";
+            return 403;
+            break;
+        }
+        return 200;
+    }
+--- request
+    GET /main
+--- response_body_like
+^status: 403.*?status: 500.*$
+
+
+
+=== TEST 10: echo -n
+--- config
+    location /echo {
+        echo_before_body -n hello;
+        echo_before_body -n world;
+        echo ==;
+    }
+--- request
+    GET /echo
+--- response_body
+helloworld==
+
+
+
+=== TEST 11: echo a -n
+--- config
+    location /echo {
+        echo_before_body a -n hello;
+        echo_before_body b -n world;
+        echo ==;
+    }
+--- request
+    GET /echo
+--- response_body
+a -n hello
+b -n world
+==
+
+
+
+=== TEST 12: -n in a var
+--- config
+    location /echo {
+        set $opt -n;
+        echo_before_body $opt hello;
+        echo_before_body $opt world;
+        echo ==;
+    }
+--- request
+    GET /echo
+--- response_body
+-n hello
+-n world
+==
+
+
+
+=== TEST 13: -n only
+--- config
+    location /echo {
+        echo_before_body -n;
+        echo_before_body -n;
+        echo ==;
+    }
+--- request
+    GET /echo
+--- response_body
+==
+
+
+
+=== TEST 14: -n with an empty string
+--- config
+    location /echo {
+        echo_before_body -n "";
+        set $empty "";
+        echo_before_body -n $empty;
+        echo ==;
+    }
+--- request
+    GET /echo
+--- response_body
+==
+
+
+
+=== TEST 15: -- -n
+--- config
+    location /echo {
+        echo_before_body -- -n hello;
+        echo_before_body -- -n world;
+        echo ==;
+    }
+--- request
+    GET /echo
+--- response_body
+-n hello
+-n world
+==
+
+
+
+=== TEST 16: -n -n
+--- config
+    location /echo {
+        echo_before_body -n -n hello;
+        echo_before_body -n -n world;
+        echo ==;
+    }
+--- request
+    GET /echo
+--- response_body
+helloworld==
+
+
+
+=== TEST 17: -n -- -n
+--- config
+    location /echo {
+        echo_before_body -n -- -n hello;
+        echo_before_body -n -- -n world;
+        echo ==;
+    }
+--- request
+    GET /echo
+--- response_body
+-n hello-n world==
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/echo-duplicate.t b/modules_deb/libnginx-mod-http-echo-0.63/t/echo-duplicate.t
new file mode 100644
index 0000000..82b6725
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/echo-duplicate.t
@@ -0,0 +1,89 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => 2 * blocks();
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /dup {
+        echo_duplicate 3 a;
+    }
+--- request
+    GET /dup
+--- response_body: aaa
+
+
+
+=== TEST 2: abc abc
+--- config
+    location /dup {
+        echo_duplicate 2 abc;
+    }
+--- request
+    GET /dup
+--- response_body: abcabc
+
+
+
+=== TEST 3: big size with underscores
+--- config
+    location /dup {
+        echo_duplicate 10_000 A;
+    }
+--- request
+    GET /dup
+--- response_body eval
+'A' x 10_000
+
+
+
+=== TEST 4: 0 duplicate 0 empty strings
+--- config
+    location /dup {
+        echo_duplicate 0 "";
+    }
+--- request
+    GET /dup
+--- response_body
+
+
+
+=== TEST 5: 0 duplicate non-empty strings
+--- config
+    location /dup {
+        echo_duplicate 0 "abc";
+    }
+--- request
+    GET /dup
+--- response_body
+
+
+
+=== TEST 6: duplication of empty strings
+--- config
+    location /dup {
+        echo_duplicate 2 "";
+    }
+--- request
+    GET /dup
+--- response_body
+
+
+
+=== TEST 7: sanity (HEAD)
+--- config
+    location /dup {
+        echo_duplicate 3 a;
+    }
+--- request
+    HEAD /dup
+--- response_body
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/echo-timer.t b/modules_deb/libnginx-mod-http-echo-0.63/t/echo-timer.t
new file mode 100644
index 0000000..712524d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/echo-timer.t
@@ -0,0 +1,107 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => 2 * blocks();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: timer without explicit reset
+--- config
+    location /timer {
+        echo_sleep 0.03;
+        echo "elapsed $echo_timer_elapsed sec.";
+    }
+--- request
+    GET /timer
+--- response_body_like
+^elapsed 0\.0(2[6-9]|3[0-6]) sec\.$
+
+
+
+=== TEST 2: timer without explicit reset and sleep
+--- config
+    location /timer {
+        echo "elapsed $echo_timer_elapsed sec.";
+    }
+--- request
+    GET /timer
+--- response_body_like
+^elapsed 0\.00[0-5] sec\.$
+
+
+
+=== TEST 3: timing accumulated sleeps
+--- config
+    location /timer {
+        echo_sleep 0.03;
+        echo_sleep 0.02;
+        echo "elapsed $echo_timer_elapsed sec.";
+    }
+--- request
+    GET /timer
+--- response_body_like
+^elapsed 0\.0(4[6-9]|5[0-6]) sec\.$
+
+
+
+=== TEST 4: timer with explicit reset but without sleep
+--- config
+    location /timer {
+        echo_reset_timer;
+        echo "elapsed $echo_timer_elapsed sec.";
+    }
+--- request
+    GET /timer
+--- response_body_like
+^elapsed 0\.00[0-5] sec\.$
+
+
+
+=== TEST 5: reset timer between sleeps
+--- config
+    location /timer {
+        echo_sleep 0.02;
+        echo "elapsed $echo_timer_elapsed sec.";
+        echo_reset_timer;
+        echo_sleep 0.03;
+        echo "elapsed $echo_timer_elapsed sec.";
+    }
+--- request
+    GET /timer
+--- response_body_like
+^elapsed 0\.0(1[6-9]|2[0-6]) sec\.
+elapsed 0\.0(2[6-9]|3[0-6]) sec\.$
+
+
+
+=== TEST 6: reset timer between blocking sleeps
+--- config
+    location /timer {
+        echo_blocking_sleep 0.02;
+        echo "elapsed $echo_timer_elapsed sec.";
+        echo_reset_timer;
+        echo_blocking_sleep 0.03;
+        echo "elapsed $echo_timer_elapsed sec.";
+    }
+--- request
+    GET /timer
+--- response_body_like
+^elapsed 0\.0(1[6-9]|2[0-9]) sec\.
+elapsed 0\.0(2[6-9]|3[0-6]) sec\.$
+
+
+
+=== TEST 7: timer without explicit reset
+--- config
+    location = /timer {
+        return 200 "$echo_timer_elapsed";
+    }
+--- request
+    GET /timer
+--- response_body_like chop
+^0(\.0\d*)$
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/echo.t b/modules_deb/libnginx-mod-http-echo-0.63/t/echo.t
new file mode 100644
index 0000000..b181259
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/echo.t
@@ -0,0 +1,416 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 6);
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /echo {
+        echo hello;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+
+
+
+=== TEST 2: multiple args
+--- config
+    location /echo {
+        echo say hello world;
+    }
+--- request
+    GET /echo
+--- response_body
+say hello world
+
+
+
+=== TEST 3: multiple directive instances
+--- config
+    location /echo {
+        echo say that;
+        echo hello;
+        echo world !;
+    }
+--- request
+    GET /echo
+--- response_body
+say that
+hello
+world !
+
+
+
+=== TEST 4: echo without arguments
+--- config
+    location /echo {
+        echo;
+        echo;
+    }
+--- request
+    GET /echo
+--- response_body eval
+"\n\n"
+
+
+
+=== TEST 5: escaped newline
+--- config
+    location /echo {
+        echo "hello\nworld";
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+world
+
+
+
+=== TEST 6: escaped tabs and \r and " wihtin "..."
+--- config
+    location /echo {
+        echo "i say \"hello\tworld\"\r";
+    }
+--- request
+    GET /echo
+--- response_body eval: "i say \"hello\tworld\"\r\n"
+
+
+
+=== TEST 7: escaped tabs and \r and " in single quotes
+--- config
+    location /echo {
+        echo 'i say \"hello\tworld\"\r';
+    }
+--- request
+    GET /echo
+--- response_body eval: "i say \"hello\tworld\"\r\n"
+
+
+
+=== TEST 8: escaped tabs and \r and " w/o any quotes
+--- config
+    location /echo {
+        echo i say \"hello\tworld\"\r;
+    }
+--- request
+    GET /echo
+--- response_body eval: "i say \"hello\tworld\"\r\n"
+
+
+
+=== TEST 9: escaping $
+As of Nginx 0.8.20, there's still no way to escape the '$' character.
+--- config
+    location /echo {
+        echo \$;
+    }
+--- request
+    GET /echo
+--- response_body
+$
+--- SKIP
+
+
+
+=== TEST 10: XSS
+--- config
+    location /blah {
+        echo_duplicate 1 "$arg_callback(";
+        echo_location_async "/data?$uri";
+        echo_duplicate 1 ")";
+    }
+    location /data {
+        echo_duplicate 1 '{"dog":"$query_string"}';
+    }
+--- request
+    GET /blah/9999999.json?callback=ding1111111
+--- response_body chomp
+ding1111111({"dog":"/blah/9999999.json"})
+
+
+
+=== TEST 11: XSS - filter version
+--- config
+    location /blah {
+        echo_before_body "$arg_callback(";
+
+        echo_duplicate 1 '{"dog":"$uri"}';
+
+        echo_after_body ")";
+    }
+--- request
+    GET /blah/9999999.json?callback=ding1111111
+--- response_body
+ding1111111(
+{"dog":"/blah/9999999.json"})
+
+
+
+=== TEST 12: if
+--- config
+location /first {
+ echo "before";
+ echo_location_async /second $request_uri;
+ echo "after";
+}
+
+location = /second {
+ if ($query_string ~ '([^?]+)') {
+     set $memcached_key $1;  # needing this to be keyed on the request_path, not the entire uri
+     echo $memcached_key;
+ }
+}
+--- request
+    GET /first/9999999.json?callback=ding1111111
+--- response_body
+before
+/first/9999999.json
+after
+
+
+
+=== TEST 13: echo -n
+--- config
+    location /echo {
+        echo -n hello;
+        echo -n world;
+    }
+--- request
+    GET /echo
+--- response_body chop
+helloworld
+
+
+
+=== TEST 14: echo a -n
+--- config
+    location /echo {
+        echo a -n hello;
+        echo b -n world;
+    }
+--- request
+    GET /echo
+--- response_body
+a -n hello
+b -n world
+
+
+
+=== TEST 15: -n in a var
+--- config
+    location /echo {
+        set $opt -n;
+        echo $opt hello;
+        echo $opt world;
+    }
+--- request
+    GET /echo
+--- response_body
+-n hello
+-n world
+
+
+
+=== TEST 16: -n only
+--- config
+    location /echo {
+        echo -n;
+        echo -n;
+    }
+--- request
+    GET /echo
+--- response_body chop
+
+
+
+=== TEST 17: -n with an empty string
+--- config
+    location /echo {
+        echo -n "";
+        set $empty "";
+        echo -n $empty;
+    }
+--- request
+    GET /echo
+--- response_body chop
+
+
+
+=== TEST 18: -- -n
+--- config
+    location /echo {
+        echo -- -n hello;
+        echo -- -n world;
+    }
+--- request
+    GET /echo
+--- response_body
+-n hello
+-n world
+
+
+
+=== TEST 19: -n -n
+--- config
+    location /echo {
+        echo -n -n hello;
+        echo -n -n world;
+    }
+--- request
+    GET /echo
+--- response_body chop
+helloworld
+
+
+
+=== TEST 20: -n -- -n
+--- config
+    location /echo {
+        echo -n -- -n hello;
+        echo -n -- -n world;
+    }
+--- request
+    GET /echo
+--- response_body chop
+-n hello-n world
+
+
+
+=== TEST 21: proxy
+--- config
+    location /main {
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+    location /echo {
+        echo hello;
+        echo world;
+    }
+--- request
+    GET /main
+--- response_headers
+!Content-Length
+--- response_body
+hello
+world
+
+
+
+=== TEST 22: if is evil
+--- config
+    location /test {
+        set $a 3;
+        set_by_lua $a '
+            if ngx.var.a == "3" then
+                return 4
+            end
+        ';
+        echo $a;
+    }
+--- request
+    GET /test
+--- response_body
+4
+--- SKIP
+
+
+
+=== TEST 23: HEAD
+--- config
+    location /echo {
+        echo hello;
+        echo world;
+    }
+--- request
+    HEAD /echo
+--- response_body
+
+
+
+=== TEST 24: POST
+--- config
+    location /echo {
+        echo hello;
+        echo world;
+    }
+--- pipelined_requests eval
+["POST /echo
+blah blah", "POST /echo
+foo bar baz"]
+--- response_body eval
+["hello\nworld\n","hello\nworld\n"]
+
+
+
+=== TEST 25: POST
+--- config
+    location /echo {
+        echo_sleep 0.001;
+        echo hello;
+        echo world;
+    }
+--- pipelined_requests eval
+["POST /echo
+blah blah", "POST /echo
+foo bar baz"]
+--- response_body eval
+["hello\nworld\n","hello\nworld\n"]
+
+
+
+=== TEST 26: empty arg after -n (github issue #33)
+--- config
+    location = /t {
+        set $empty "";
+        echo -n $empty hello world;
+    }
+--- request
+    GET /t
+--- response_body chop
+ hello world
+
+
+
+=== TEST 27: image filter
+--- config
+    location = /gif {
+        empty_gif;
+    }
+
+    location = /t {
+        default_type image/gif;
+        image_filter resize 10 10;
+        set $gif1 '';
+        set $gif2 '';
+        rewrite_by_lua '
+            local res = ngx.location.capture("/gif")
+            local data = res.body
+            ngx.var.gif1 = string.sub(data, 1, #data - 1)
+            ngx.var.gif2 = string.sub(data, #data)
+        ';
+        echo -n $gif1;
+        echo -n $gif2;
+    }
+--- request
+    GET /t
+--- stap
+F(ngx_http_image_header_filter) {
+    println("image header filter")
+}
+--- stap_out
+image header filter
+--- response_body_like: .
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/exec.t b/modules_deb/libnginx-mod-http-echo-0.63/t/exec.t
new file mode 100644
index 0000000..b7c1308
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/exec.t
@@ -0,0 +1,228 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 1);
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: exec normal location
+--- config
+    location /main {
+        echo_exec /bar;
+        echo end;
+    }
+    location = /bar {
+        echo "$echo_request_uri:";
+        echo bar;
+    }
+--- request
+    GET /main
+--- response_body
+/bar:
+bar
+
+
+
+=== TEST 2: location with args (inlined in uri)
+--- config
+    location /main {
+        echo_exec /bar?a=32;
+        echo end;
+    }
+    location /bar {
+        echo "a: [$arg_a]";
+    }
+--- request
+    GET /main
+--- response_body
+a: [32]
+
+
+
+=== TEST 3: location with args (in separate arg)
+--- config
+    location /main {
+        echo_exec /bar a=56;
+        echo end;
+    }
+    location /bar {
+        echo "a: [$arg_a]";
+    }
+--- request
+    GET /main
+--- response_body
+a: [56]
+
+
+
+=== TEST 4: exec named location
+--- config
+    location /main {
+        echo_exec @bar;
+        echo end;
+    }
+    location @bar {
+        echo bar;
+    }
+--- request
+    GET /main
+--- response_body
+bar
+
+
+
+=== TEST 5: query string ignored for named locations
+--- config
+    location /main {
+        echo_exec @bar?a=32;
+        echo end;
+    }
+    location @bar {
+        echo "a: [$arg_a]";
+    }
+--- request
+    GET /main
+--- response_body
+a: []
+--- error_log
+querystring a=32 ignored when exec'ing named location @bar
+
+
+
+=== TEST 6: query string ignored for named locations
+--- config
+  location /foo {
+      echo_exec @bar;
+  }
+  location @bar {
+      echo "uri: [$echo_request_uri]";
+  }
+--- request
+    GET /foo
+--- response_body
+uri: [/foo]
+
+
+
+=== TEST 7: exec(named location) in subrequests
+--- config
+    location /entry {
+        echo_location /foo;
+        echo_sleep 0.001;
+        echo_location /foo2;
+    }
+  location /foo {
+      echo_exec @bar;
+  }
+  location /foo2 {
+      echo_exec @bar;
+  }
+
+  location @bar {
+    proxy_pass http://127.0.0.1:$server_port/bar;
+  }
+  location /bar {
+    echo_sleep 0.01;
+    echo hello;
+  }
+--- request
+    GET /entry
+--- response_body
+hello
+hello
+
+
+
+=== TEST 8: exec(normal loctions) in subrequests
+--- config
+    location /entry {
+        echo_location /foo;
+        echo_sleep 0.001;
+        echo_location /foo2;
+    }
+  location /foo {
+      echo_exec /baz;
+  }
+  location /foo2 {
+      echo_exec /baz;
+  }
+
+  location /baz {
+    proxy_pass http://127.0.0.1:$server_port/bar;
+  }
+  location /bar {
+    echo_sleep 0.01;
+    echo hello;
+  }
+--- request
+    GET /entry
+--- response_body
+hello
+hello
+
+
+
+=== TEST 9: exec should clear ctx
+--- config
+    location @bar {
+        echo hello;
+        echo world;
+        echo heh;
+    }
+  location /foo {
+      #echo_sleep 0.001;
+      echo_reset_timer;
+      echo_exec @bar;
+  }
+--- request
+    GET /foo
+--- response_body
+hello
+world
+heh
+
+
+
+=== TEST 10: reset ctx
+--- config
+    location @proxy {
+        rewrite_by_lua return;
+        echo hello;
+    }
+    location /main {
+        rewrite_by_lua return;
+        echo_exec @proxy;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+
+
+
+=== TEST 11: yield before exec
+--- config
+    location @bar {
+        echo hello;
+        echo world;
+        echo heh;
+    }
+  location /foo {
+      echo_sleep 0.001;
+      echo_exec @bar;
+  }
+--- request
+    GET /foo
+--- response_body
+hello
+world
+heh
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/filter-used.t b/modules_deb/libnginx-mod-http-echo-0.63/t/filter-used.t
new file mode 100644
index 0000000..2835270
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/filter-used.t
@@ -0,0 +1,59 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks());
+
+no_long_string();
+log_level('warn');
+
+#master_on();
+#workers(1);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: filter indeed used
+--- http_config
+    postpone_output 1;
+--- config
+    location /echo {
+        echo_after_body hello;
+        echo world;
+    }
+--- request
+    GET /echo
+--- stap
+F(ngx_http_echo_header_filter) {
+    println("echo header filter called")
+}
+--- stap_out
+echo header filter called
+--- response_body
+world
+hello
+
+
+
+=== TEST 2: filter not used
+--- http_config
+    postpone_output 1;
+--- config
+    location /echo {
+        #echo_after_body hello;
+        echo world;
+    }
+--- request
+    GET /echo
+--- stap
+F(ngx_http_echo_header_filter) {
+    println("echo header filter called")
+}
+--- stap_out
+--- response_body
+world
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/foreach-split.t b/modules_deb/libnginx-mod-http-echo-0.63/t/foreach-split.t
new file mode 100644
index 0000000..266a701
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/foreach-split.t
@@ -0,0 +1,283 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /main {
+        echo_foreach_split '&' $query_string;
+            echo_location_async $echo_it;
+            echo '/* end */';
+        echo_end;
+    }
+    location /sub/1.css {
+        echo "body { font-size: 12pt; }";
+    }
+    location /sub/2.css {
+        echo "table { color: 'red'; }";
+    }
+--- request
+    GET /main?/sub/1.css&/sub/2.css
+--- response_body
+body { font-size: 12pt; }
+/* end */
+table { color: 'red'; }
+/* end */
+
+
+
+=== TEST 2: split in a url argument (echo_location_async)
+--- config
+    location /main_async {
+        echo_foreach_split ',' $arg_cssfiles;
+            echo_location_async $echo_it;
+        echo_end;
+    }
+    location /foo.css {
+        echo foo;
+    }
+    location /bar.css {
+        echo bar;
+    }
+    location /baz.css {
+        echo baz;
+    }
+--- request
+    GET /main_async?cssfiles=/foo.css,/bar.css,/baz.css
+--- response_body
+foo
+bar
+baz
+
+
+
+=== TEST 3: split in a url argument (echo_location)
+--- config
+    location /main_sync {
+        echo_foreach_split ',' $arg_cssfiles;
+            echo_location $echo_it;
+        echo_end;
+    }
+    location /foo.css {
+        echo foo;
+    }
+    location /bar.css {
+        echo bar;
+    }
+    location /baz.css {
+        echo baz;
+    }
+--- request
+    GET /main_sync?cssfiles=/foo.css,/bar.css,/baz.css
+--- response_body
+foo
+bar
+baz
+--- SKIP
+
+
+
+=== TEST 4: empty loop
+--- config
+    location /main {
+        echo "start";
+        echo_foreach_split ',' $arg_cssfiles;
+        echo_end;
+        echo "end";
+    }
+--- request
+    GET /main?cssfiles=/foo.css,/bar.css,/baz.css
+--- response_body
+start
+end
+
+
+
+=== TEST 5: trailing delimiter
+--- config
+    location /main_t {
+        echo_foreach_split ',' $arg_cssfiles;
+            echo_location_async $echo_it;
+        echo_end;
+    }
+    location /foo.css {
+        echo foo;
+    }
+--- request
+    GET /main_t?cssfiles=/foo.css,
+--- response_body
+foo
+
+
+
+=== TEST 6: multi-char delimiter
+--- config
+    location /main_sleep {
+        echo_foreach_split '-a-' $arg_list;
+            echo $echo_it;
+        echo_end;
+    }
+--- request
+    GET /main_sleep?list=foo-a-bar-a-baz
+--- error_code: 500
+--- response_body_like: 500 Internal Server Error
+
+
+
+=== TEST 7: multi-char delimiter (the right way)
+--- config
+    location /main_sleep {
+        echo_foreach_split -- '-a-' $arg_list;
+            echo $echo_it;
+        echo_end;
+    }
+--- request
+    GET /main_sleep?list=foo-a-bar-a-baz
+--- response_body
+foo
+bar
+baz
+
+
+
+=== TEST 8: loop with sleep
+--- config
+    location /main_sleep {
+        echo_foreach_split '-' $arg_list;
+            echo_sleep 0.001;
+            echo $echo_it;
+        echo_end;
+    }
+--- request
+    GET /main_sleep?list=foo-a-bar-A-baz
+--- response_body
+foo
+a
+bar
+A
+baz
+
+
+
+=== TEST 9: empty
+--- config
+  location /merge {
+      default_type 'text/javascript';
+      echo_foreach_split '&' $query_string;
+          echo "/* JS File $echo_it */";
+          echo_location_async $echo_it;
+          echo;
+      echo_end;
+  }
+--- request
+    GET /merge
+--- response_body
+
+
+
+=== TEST 10: single &
+--- config
+  location /merge {
+      default_type 'text/javascript';
+      echo_foreach_split '&' $query_string;
+          echo "/* JS File $echo_it */";
+          echo_location_async $echo_it;
+          echo;
+      echo_end;
+  }
+--- request
+    GET /merge?&
+--- response_body
+
+
+
+=== TEST 11: pure &'s
+--- config
+  location /merge {
+      default_type 'text/javascript';
+      echo_foreach_split '&' $query_string;
+          echo "/* JS File $echo_it */";
+          echo_location_async $echo_it;
+          echo;
+      echo_end;
+  }
+--- request
+    GET /merge?&&&
+--- response_body
+
+
+
+=== TEST 12: pure & and spaces
+TODO: needs to uri_decode $echo_it...
+--- config
+  location /merge {
+      default_type 'text/javascript';
+      echo_foreach_split '&' $query_string;
+          echo "/* JS File $echo_it */";
+          echo_location_async $echo_it;
+          echo;
+      echo_end;
+  }
+--- request
+    GET /merge?&%20&%20&
+--- response_body
+--- SKIP
+
+
+
+=== TEST 13: multiple foreach_split
+--- config
+    location /multi {
+        echo_foreach_split '&' $query_string;
+            echo [$echo_it];
+        echo_end;
+
+        echo '...';
+
+        echo_foreach_split '-' $query_string;
+            echo [$echo_it];
+        echo_end;
+    }
+--- request
+    GET /multi?a-b&c-d
+--- response_body
+[a-b]
+[c-d]
+...
+[a]
+[b&c]
+[d]
+
+
+
+=== TEST 14: github issue #2: setting a variable from $echo_it results to crashing
+--- config
+location = /getFile {
+    set $filelist "a,b,c";
+    echo_foreach_split ',' $filelist;
+    set $file $echo_it;
+    echo_subrequest GET '/getFile2' -q 'sha256=$file';
+    echo_end;
+}
+
+location = /getFile2 {
+    echo "sha256: $arg_sha256";
+}
+--- request
+    GET /getFile
+--- response_body
+sha256: 
+sha256: 
+sha256: 
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/gzip.t b/modules_deb/libnginx-mod-http-echo-0.63/t/gzip.t
new file mode 100644
index 0000000..61eb4f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/gzip.t
@@ -0,0 +1,31 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => repeat_each() * 2 * blocks();
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /gzip {
+      gzip             on;
+      gzip_min_length  10;
+      gzip_types       text/plain;
+
+      echo_duplicate   1000 hello;
+    }
+--- request
+    GET /gzip
+--- more_headers
+Accept-Encoding: gzip
+--- response_headers
+Content-Encoding: gzip
+--- timeout: 20
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/if.t b/modules_deb/libnginx-mod-http-echo-0.63/t/if.t
new file mode 100644
index 0000000..054ec43
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/if.t
@@ -0,0 +1,150 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => 2 * blocks();
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity (hit)
+--- config
+    location ^~ /if {
+        set $res miss;
+        if ($arg_val ~* '^a') {
+            set $res hit;
+            echo $res;
+        }
+        echo $res;
+    }
+--- request
+    GET /if?val=abc
+--- response_body
+hit
+
+
+
+=== TEST 2: sanity (miss)
+--- config
+    location ^~ /if {
+        set $res miss;
+        if ($arg_val ~* '^a') {
+            set $res hit;
+            echo $res;
+        }
+        echo $res;
+    }
+--- request
+    GET /if?val=bcd
+--- response_body
+miss
+
+
+
+=== TEST 3: proxy in if (hit)
+--- config
+    location ^~ /if {
+        set $res miss;
+        if ($arg_val ~* '^a') {
+            set $res hit;
+            proxy_pass $scheme://127.0.0.1:$server_port/foo?res=$res;
+        }
+        proxy_pass $scheme://127.0.0.1:$server_port/foo?res=$res;
+    }
+    location /foo {
+        echo "res = $arg_res";
+    }
+--- request
+    GET /if?val=abc
+--- response_body
+res = hit
+
+
+
+=== TEST 4: proxy in if (miss)
+--- config
+    location ^~ /if {
+        set $res miss;
+        if ($arg_val ~* '^a') {
+            set $res hit;
+            proxy_pass $scheme://127.0.0.1:$server_port/foo?res=$res;
+        }
+        proxy_pass $scheme://127.0.0.1:$server_port/foo?res=$res;
+    }
+    location /foo {
+        echo "res = $arg_res";
+    }
+--- request
+    GET /if?val=bcd
+--- response_body
+res = miss
+
+
+
+=== TEST 5: if too long url (hit)
+--- config
+    location /foo {
+        if ($request_uri ~ '.{20,}') {
+            echo too long;
+        }
+        echo ok;
+    }
+--- request
+    GET /foo?a=12345678901234567890
+--- response_body
+too long
+
+
+
+=== TEST 6: if too long url (miss)
+--- config
+    location /foo {
+        if ($request_uri ~ '.{20,}') {
+            echo too long;
+        }
+        echo ok;
+    }
+--- request
+    GET /foo?a=1234567890
+--- response_body
+ok
+
+
+
+=== TEST 7: echo should be inherited by if blocks
+--- config
+    location /foo {
+        if ($uri ~ 'foo') {
+        }
+        echo ok;
+    }
+--- request
+    GET /foo
+--- response_body
+ok
+
+
+
+=== TEST 8: echo_after_body and echo_before_body should be inherited by if blocks
+--- config
+    location /foo {
+        if ($uri ~ 'foo') {
+        }
+        echo_before_body -n 'hello';
+        echo_location /comma;
+        echo_after_body 'world';
+    }
+
+    location = /comma {
+        internal;
+        echo -n ', ';
+    }
+--- request
+    GET /foo
+--- response_body
+hello, world
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/incr.t b/modules_deb/libnginx-mod-http-echo-0.63/t/incr.t
new file mode 100644
index 0000000..8ad6d98
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/incr.t
@@ -0,0 +1,32 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => 2 * blocks();
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /main {
+        echo "main pre: $echo_incr";
+        echo_location_async /sub;
+        echo_location_async /sub;
+        echo "main post: $echo_incr";
+    }
+    location /sub {
+        echo "sub: $echo_incr";
+    }
+--- request
+    GET /main
+--- response_body
+main pre: 1
+sub: 3
+sub: 4
+main post: 2
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/location-async.t b/modules_deb/libnginx-mod-http-echo-0.63/t/location-async.t
new file mode 100644
index 0000000..3494516
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/location-async.t
@@ -0,0 +1,439 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 1);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /main {
+        echo_location_async /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+
+
+
+=== TEST 2: trailing echo
+--- config
+    location /main {
+        echo_location_async /sub;
+        echo after subrequest;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+after subrequest
+
+
+
+=== TEST 3: leading echo
+--- config
+    location /main {
+        echo before subrequest;
+        echo_location_async /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before subrequest
+hello
+
+
+
+=== TEST 4: leading & trailing echo
+--- config
+    location /main {
+        echo before subrequest;
+        echo_location_async /sub;
+        echo after subrequest;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before subrequest
+hello
+after subrequest
+
+
+
+=== TEST 5: multiple subrequests
+--- config
+    location /main {
+        echo before sr 1;
+        echo_location_async /sub;
+        echo after sr 1;
+        echo before sr 2;
+        echo_location_async /sub;
+        echo after sr 2;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before sr 1
+hello
+after sr 1
+before sr 2
+hello
+after sr 2
+
+
+
+=== TEST 6: timed multiple subrequests (blocking sleep)
+--- config
+    location /main {
+        echo_reset_timer;
+        echo_location_async /sub1;
+        echo_location_async /sub2;
+        echo "took $echo_timer_elapsed sec for total.";
+    }
+    location /sub1 {
+        echo_blocking_sleep 0.02;
+        echo hello;
+    }
+    location /sub2 {
+        echo_blocking_sleep 0.01;
+        echo world;
+    }
+
+--- request
+    GET /main
+--- response_body_like
+^hello
+world
+took 0\.00[0-5] sec for total\.$
+
+
+
+=== TEST 7: timed multiple subrequests (non-blocking sleep)
+--- config
+    location /main {
+        echo_reset_timer;
+        echo_location_async /sub1;
+        echo_location_async /sub2;
+        echo "took $echo_timer_elapsed sec for total.";
+    }
+    location /sub1 {
+        echo_sleep 0.02;
+        echo hello;
+    }
+    location /sub2 {
+        echo_sleep 0.01;
+        echo world;
+    }
+
+--- request
+    GET /main
+--- response_body_like
+^hello
+world
+took 0\.00[0-5] sec for total\.$
+
+
+
+=== TEST 8: location with args
+--- config
+    location /main {
+        echo_location_async /sub 'foo=Foo&bar=Bar';
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+Foo Bar
+
+
+
+=== TEST 9: encoded chars in query strings
+--- config
+    location /main {
+        echo_location_async /sub 'foo=a%20b&bar=Bar';
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+a%20b Bar
+
+
+
+=== TEST 10: UTF-8 chars in query strings
+--- config
+    location /main {
+        echo_location_async /sub 'foo=你好';
+    }
+    location /sub {
+        echo $arg_foo;
+    }
+--- request
+    GET /main
+--- response_body
+你好
+
+
+
+=== TEST 11: encoded chars in location url
+--- config
+    location /main {
+        echo_location_async /sub%31 'foo=Foo&bar=Bar';
+    }
+    location /sub%31 {
+        echo 'sub%31';
+    }
+    location /sub1 {
+        echo 'sub1';
+    }
+--- request
+    GET /main
+--- response_body
+sub1
+
+
+
+=== TEST 12: querystring in url
+--- config
+    location /main {
+        echo_location_async /sub?foo=Foo&bar=Bar;
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+Foo Bar
+
+
+
+=== TEST 13: querystring in url *AND* an explicit querystring
+--- config
+    location /main {
+        echo_location_async /sub?foo=Foo&bar=Bar blah=Blah;
+    }
+    location /sub {
+        echo $arg_foo $arg_bar $arg_blah;
+    }
+--- request
+    GET /main
+--- response_body
+  Blah
+
+
+
+=== TEST 14: explicit flush in main request
+flush won't really flush the buffer...
+--- config
+    location /main_flush {
+        echo 'pre main';
+        echo_location_async /sub;
+        echo 'post main';
+        echo_flush;
+    }
+
+    location /sub {
+        echo_sleep 0.02;
+        echo 'sub';
+    }
+--- request
+    GET /main_flush
+--- response_body
+pre main
+sub
+post main
+
+
+
+=== TEST 15: no varaiable inheritance
+--- config
+    location /main {
+        echo $echo_cacheable_request_uri;
+        echo_location_async /sub;
+        echo_location_async /sub2;
+    }
+    location /sub {
+        echo $echo_cacheable_request_uri;
+    }
+    location /sub2 {
+        echo $echo_cacheable_request_uri;
+    }
+
+--- request
+    GET /main
+--- response_body
+/main
+/sub
+/sub2
+
+
+
+=== TEST 16: unsafe uri
+--- config
+    location /unsafe {
+        echo_location_async '/../foo';
+    }
+--- request
+    GET /unsafe
+--- stap2
+F(ngx_http_send_header) {
+    printf("send header on req %p (header sent: %d)\n", $r, $r->header_sent)
+    print_ubacktrace()
+}
+--- ignore_response
+--- error_log
+echo_location_async sees unsafe uri: "/../foo"
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 17: access/deny (access phase handlers skipped in subrequests)
+--- config
+    location /main {
+        echo_location_async /denied;
+    }
+    location /denied {
+        deny all;
+        echo No no no;
+    }
+--- request
+    GET /main
+--- error_code: 200
+--- response_body
+No no no
+
+
+
+=== TEST 18: rewrite is honored.
+--- config
+    location /main {
+        echo_location_async /rewrite;
+    }
+    location /rewrite {
+        rewrite ^ /foo break;
+        echo $uri;
+    }
+--- request
+    GET /main
+--- response_body
+/foo
+
+
+
+=== TEST 19: let subrequest to read the main request's request body
+--- SKIP
+--- config
+    location /main {
+        echo_location_async /sub;
+    }
+    location /sub {
+        echo_read_request_body;
+        echo_request_body;
+    }
+--- request
+POST /main
+hello, body!
+--- response_body chomp
+hello, body!
+
+
+
+=== TEST 20: leading subrequest & echo_before_body
+--- config
+    location /main {
+        echo_before_body hello;
+        echo_location_async /foo;
+    }
+    location /foo {
+        echo world;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+world
+
+
+
+=== TEST 21: leading subrequest & xss
+--- config
+    location /main {
+        default_type 'application/json';
+        xss_get on;
+        xss_callback_arg c;
+        echo_location_async /foo;
+    }
+    location /foo {
+        echo -n world;
+    }
+--- request
+    GET /main?c=hi
+--- response_body chop
+hi(world);
+
+
+
+=== TEST 22: multiple leading subrequest & xss
+--- config
+    location /main {
+        default_type 'application/json';
+        xss_get on;
+        xss_callback_arg c;
+        echo_location_async /foo;
+        echo_location_async /bar;
+    }
+    location /foo {
+        echo -n world;
+    }
+    location /bar {
+        echo -n ' people';
+    }
+--- request
+    GET /main?c=hi
+--- response_body chop
+hi(world people);
+
+
+
+=== TEST 23: sanity (HEAD)
+--- config
+    location /main {
+        echo_location_async /sub;
+        echo_location_async /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    HEAD /main
+--- response_body
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/location.t b/modules_deb/libnginx-mod-http-echo-0.63/t/location.t
new file mode 100644
index 0000000..48c851e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/location.t
@@ -0,0 +1,567 @@
+# vi:filetype=
+
+use lib 'lib';
+
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 2);
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+#no_diff();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /main {
+        echo_location /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+
+
+
+=== TEST 2: sanity with proxy in the middle
+--- config
+    location /main {
+        echo_location /proxy;
+    }
+    location /proxy {
+        proxy_pass $scheme://127.0.0.1:$server_port/sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+
+
+
+=== TEST 3: trailing echo
+--- config
+    location /main {
+        echo_location /sub;
+        echo after subrequest;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+after subrequest
+
+
+
+=== TEST 4: leading echo
+--- config
+    location /main {
+        echo before subrequest;
+        echo_location /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before subrequest
+hello
+
+
+
+=== TEST 5: leading & trailing echo
+--- config
+    location /main {
+        echo before subrequest;
+        echo_location /sub;
+        echo after subrequest;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before subrequest
+hello
+after subrequest
+
+
+
+=== TEST 6: multiple subrequests
+--- config
+    location /main {
+        echo before sr 1;
+        echo_location /sub;
+        echo after sr 1;
+        echo before sr 2;
+        echo_location /sub;
+        echo after sr 2;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before sr 1
+hello
+after sr 1
+before sr 2
+hello
+after sr 2
+
+
+
+=== TEST 7: timed multiple subrequests (blocking sleep)
+--- config
+    location /main {
+        echo_reset_timer;
+        echo_location /sub1;
+        echo_location /sub2;
+        echo "took $echo_timer_elapsed sec for total.";
+    }
+    location /sub1 {
+        echo_blocking_sleep 0.02;
+        echo hello;
+    }
+    location /sub2 {
+        echo_blocking_sleep 0.01;
+        echo world;
+    }
+
+--- request
+    GET /main
+--- response_body_like
+^hello
+world
+took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
+
+
+
+=== TEST 8: timed multiple subrequests (non-blocking sleep)
+--- config
+    location /main {
+        echo_reset_timer;
+        echo_location /sub1;
+        echo_location /sub2;
+        echo "took $echo_timer_elapsed sec for total.";
+    }
+    location /sub1 {
+        echo_sleep 0.02;
+        echo hello;
+    }
+    location /sub2 {
+        echo_sleep 0.01;
+        echo world;
+    }
+
+--- request
+    GET /main
+--- response_body_like
+^hello
+world
+took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
+
+
+
+=== TEST 9: location with args
+--- config
+    location /main {
+        echo_location /sub 'foo=Foo&bar=Bar';
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+Foo Bar
+
+
+
+=== TEST 10: chained subrequests
+--- config
+    location /main {
+        echo 'pre main';
+        echo_location /sub;
+        echo 'post main';
+    }
+
+    location /sub {
+        echo 'pre sub';
+        echo_location /subsub;
+        echo 'post sub';
+    }
+
+    location /subsub {
+        echo 'subsub';
+    }
+--- request
+    GET /main
+--- response_body
+pre main
+pre sub
+subsub
+post sub
+post main
+
+
+
+=== TEST 11: chained subrequests using named locations
+as of 0.8.20, ngx_http_subrequest still does not support
+named location. sigh. this case is a TODO.
+--- config
+    location /main {
+        echo 'pre main';
+        echo_location @sub;
+        echo 'post main';
+    }
+
+    location @sub {
+        echo 'pre sub';
+        echo_location @subsub;
+        echo 'post sub';
+    }
+
+    location @subsub {
+        echo 'subsub';
+    }
+--- request
+    GET /main
+--- response_body
+pre main
+pre sub
+subsub
+post sub
+post main
+--- SKIP
+
+
+
+=== TEST 12: explicit flush in main request
+--- config
+    location /main {
+        echo 'pre main';
+        echo_location /sub;
+        echo 'post main';
+        echo_flush;
+    }
+
+    location /sub {
+        echo_sleep 0.02;
+        echo 'sub';
+    }
+--- request
+    GET /main
+--- response_body
+pre main
+sub
+post main
+
+
+
+=== TEST 13: no varaiable inheritance
+--- config
+    location /main {
+        echo $echo_cacheable_request_uri;
+        echo_location /sub;
+        echo_location /sub2;
+    }
+    location /sub {
+        echo $echo_cacheable_request_uri;
+    }
+    location /sub2 {
+        echo $echo_cacheable_request_uri;
+    }
+
+--- request
+    GET /main
+--- response_body
+/main
+/sub
+/sub2
+
+
+
+=== TEST 14: unsafe uri
+--- config
+    location /unsafe {
+        echo_location '/../foo';
+    }
+--- request
+    GET /unsafe
+--- ignore_response
+--- error_log
+echo_location sees unsafe uri: "/../foo"
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 15: querystring in url
+--- config
+    location /main {
+        echo_location /sub?foo=Foo&bar=Bar;
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+Foo Bar
+
+
+
+=== TEST 16: querystring in url *AND* an explicit querystring
+--- config
+    location /main {
+        echo_location /sub?foo=Foo&bar=Bar blah=Blah;
+    }
+    location /sub {
+        echo $arg_foo $arg_bar $arg_blah;
+    }
+--- request
+    GET /main
+--- response_body
+  Blah
+
+
+
+=== TEST 17: let subrequest to read the main request's request body
+--- SKIP
+--- config
+    location /main {
+        echo_location /sub;
+    }
+    location /sub {
+        echo_read_request_body;
+        echo_request_body;
+    }
+--- request
+POST /main
+hello, body!
+--- response_body chomp
+hello, body!
+
+
+
+=== TEST 18: sleep after location
+--- config
+    location /main {
+        echo_location /sub;
+        echo_sleep 0.001;
+        echo_location /sub;
+    }
+    location /sub {
+        echo_sleep 0.001;
+        echo sub;
+    }
+--- request
+    GET /main
+--- response_body
+sub
+sub
+--- skip_nginx: 2: < 0.8.11
+
+
+
+=== TEST 19: deep nested echo_location/echo_location_async
+--- config
+    location /main {
+        echo_location /bar;
+        echo_location_async /bar;
+        echo_location_async /bar;
+        echo_location /group;
+        echo_location_async /group;
+    }
+
+    location /group {
+        echo_location /bar;
+        echo_location_async /bar;
+    }
+
+    location /bar {
+        #echo_sleep 0.001;
+        echo $echo_incr;
+    }
+--- request
+GET /main
+--- response_body
+1
+2
+3
+4
+5
+6
+7
+--- timeout: 2
+
+
+
+=== TEST 20: deep nested echo_location/echo_location_async (with sleep)
+--- config
+    location /main {
+        echo_location /bar;
+        echo_location_async /bar;
+        echo_location_async /bar;
+        echo_location /group;
+        echo_location_async /group;
+    }
+
+    location /group {
+        echo_location /baz;
+        echo_location_async /bah;
+    }
+
+    location ~ '^/ba[rzh]' {
+        echo_sleep 0.001;
+        echo $echo_incr;
+    }
+--- request
+GET /main
+--- response_body
+1
+2
+3
+4
+5
+6
+7
+--- timeout: 2
+
+
+
+=== TEST 21: deep nested echo_location (with sleep)
+--- config
+    location /main {
+        echo_location /bar;
+        echo_location /bar;
+        echo_location /bar;
+        echo_location /group;
+        echo_location /group;
+    }
+
+    location /group {
+        echo_location /bar;
+        echo_location /bar;
+    }
+
+    location /incr {
+        echo_sleep 0.001;
+        echo $echo_incr;
+    }
+
+    location /bar {
+        proxy_pass $scheme://127.0.0.1:$server_port/incr;
+    }
+--- request
+GET /main
+--- response_body
+1
+1
+1
+1
+1
+1
+1
+--- timeout: 5
+--- no_error_log
+[error]
+
+
+
+=== TEST 22: leading subrequest & echo_before_body
+--- config
+    location /main {
+        echo_before_body hello;
+        echo_location /foo;
+    }
+    location /foo {
+        echo world;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+world
+
+
+
+=== TEST 23: leading subrequest & xss
+--- config
+    location /main {
+        default_type 'application/json';
+        xss_get on;
+        xss_callback_arg c;
+        echo_location /foo;
+    }
+    location /foo {
+        echo -n world;
+    }
+--- request
+    GET /main?c=hi
+--- response_body chop
+hi(world);
+
+
+
+=== TEST 24: multiple leading subrequest & xss
+--- config
+    location /main {
+        default_type 'application/json';
+        xss_get on;
+        xss_callback_arg c;
+        echo_location /foo;
+        echo_location /bar;
+    }
+    location /main2 {
+        content_by_lua '
+            local res = ngx.location.capture("/foo")
+            local res2 = ngx.location.capture("/bar")
+            ngx.say(res.body)
+            ngx.say(res2.body)
+        ';
+    }
+    location /foo {
+        echo -n world;
+    }
+    location /bar {
+        echo -n ' people';
+    }
+--- request
+    GET /main?c=hi
+--- response_body chop
+hi(world people);
+
+
+
+=== TEST 25: sanity (HEAD)
+--- config
+    location /main {
+        echo_location /sub;
+        echo_location /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    HEAD /main
+--- response_body
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/mixed.t b/modules_deb/libnginx-mod-http-echo-0.63/t/mixed.t
new file mode 100644
index 0000000..abf2599
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/mixed.t
@@ -0,0 +1,82 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => 2 * blocks();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: echo before echo_client_request_headers
+--- config
+    location /echo {
+        echo "headers:";
+        echo -n $echo_client_request_headers;
+    }
+--- request
+    GET /echo
+--- response_body eval
+"headers:
+GET /echo HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+"
+
+
+
+=== TEST 2: echo_client_request_headers before echo
+--- config
+    location /echo {
+        echo -n $echo_client_request_headers;
+        echo "...these are the headers";
+    }
+--- request
+    GET /echo
+--- response_body eval
+"GET /echo HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+...these are the headers
+"
+
+
+
+=== TEST 3: echo & headers & echo
+--- config
+    location /echo {
+        echo "headers are";
+        echo -n $echo_client_request_headers;
+        echo "...these are the headers";
+    }
+--- request
+    GET /echo
+--- response_body eval
+"headers are
+GET /echo HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+...these are the headers
+"
+
+
+
+=== TEST 4: mixed with echo_duplicate
+--- config
+    location /mixed {
+        echo hello;
+        echo_duplicate 2 ---;
+        echo_duplicate 1 ' END ';
+        echo_duplicate 2 ---;
+        echo;
+    }
+--- request
+    GET /mixed
+--- response_body
+hello
+------ END ------
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/request-body.t b/modules_deb/libnginx-mod-http-echo-0.63/t/request-body.t
new file mode 100644
index 0000000..d467b2e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/request-body.t
@@ -0,0 +1,58 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: big client body buffered into temp files
+--- config
+    location /echo {
+        client_body_buffer_size 1k;
+        echo_read_request_body;
+        echo_request_body;
+    }
+--- request eval
+"POST /echo
+" . 'a' x 4096 . 'end';
+--- response_body eval
+'a' x 4096 . 'end'
+
+
+
+=== TEST 2: in memory request body (trailing echo)
+--- config
+    location /echo {
+        client_body_buffer_size 1k;
+        echo_read_request_body;
+        echo_request_body;
+        echo done;
+    }
+--- request
+POST /echo
+hello world
+--- response_body
+hello worlddone
+
+
+
+=== TEST 3: big client body buffered into temp files (trailing echo)
+--- config
+    location /echo {
+        client_body_buffer_size 1k;
+        echo_read_request_body;
+        echo_request_body;
+        echo done;
+    }
+--- request eval
+"POST /echo
+" . 'a' x 4096 . "end\n";
+--- response_body eval
+'a' x 4096 . "enddone\n"
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/request-info.t b/modules_deb/libnginx-mod-http-echo-0.63/t/request-info.t
new file mode 100644
index 0000000..dd34da4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/request-info.t
@@ -0,0 +1,870 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks() + 14);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: standalone directive
+--- config
+    location /echo {
+        echo -n $echo_client_request_headers;
+    }
+--- request
+    GET /echo
+--- response_body eval
+"GET /echo HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: multiple instances
+--- config
+    location /echo {
+        echo -n $echo_client_request_headers;
+        echo -n $echo_client_request_headers;
+    }
+--- request
+    GET /echo
+--- response_body eval
+"GET /echo HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+GET /echo HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: does not explicitly request_body
+--- config
+    location /echo {
+        echo [$echo_request_body];
+    }
+--- request
+POST /echo
+body here
+heh
+--- response_body
+[]
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: let proxy read request_body
+--- config
+    location /echo {
+        echo_before_body [$echo_request_body];
+        proxy_pass $scheme://127.0.0.1:$server_port/blah;
+    }
+    location /blah { echo_duplicate 0 ''; }
+--- request
+POST /echo
+body here
+heh
+--- response_body
+[body here
+heh]
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: use echo_read_request_body to read it!
+--- config
+    location /echo {
+        echo_read_request_body;
+        echo [$echo_request_body];
+    }
+--- request
+POST /echo
+body here
+heh
+--- response_body
+[body here
+heh]
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: how about sleep after that?
+--- config
+    location /echo {
+        echo_read_request_body;
+        echo_sleep 0.002;
+        echo [$echo_request_body];
+    }
+--- request
+POST /echo
+body here
+heh
+--- response_body
+[body here
+heh]
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: echo back the whole client request
+--- config
+  # echo back the client request
+  location /echoback {
+    echo -n $echo_client_request_headers;
+    echo_read_request_body;
+    echo $echo_request_body;
+  }
+--- request
+POST /echoback
+body here
+haha
+--- response_body eval
+"POST /echoback HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 14\r
+\r
+body here
+haha
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: echo_request_body
+--- config
+    location /body {
+      client_body_buffer_size    5;
+      echo_read_request_body;
+      echo "[$echo_request_body]";
+      echo_request_body;
+    }
+--- request eval
+"POST /body
+" . ('a' x 2048) . "b"
+--- response_body eval
+"[]\n" .
+('a' x 2048) . "b"
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: $echo_response_status in content handler
+--- config
+    location /status {
+        echo "status: $echo_response_status";
+    }
+--- request
+    GET /status
+--- response_body
+status: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: echo_request_body (empty body)
+--- config
+    location /body {
+      echo_read_request_body;
+      echo_request_body;
+    }
+    location /main {
+        proxy_pass http://127.0.0.1:$server_port/body;
+    }
+--- request eval
+"POST /main"
+--- response_body eval
+""
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: small header
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- response_body eval
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+}
+--- no_error_log
+[error]
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: large header
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 30 561;
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- more_headers eval
+CORE::join "\n", map { "Header$_: value-$_" } 1..512
+
+--- response_body eval
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+}
+.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: small header, with leading CRLF
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+--- raw_request eval
+"\r\nGET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+"
+--- response_body eval
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: large header, with leading CRLF
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 30 561;
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+
+--- raw_request eval
+"\r\nGET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+".
+(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
+
+--- response_body eval
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+}
+.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n"
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: small header, pipelined
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+--- pipelined_requests eval
+["GET /t", "GET /th"]
+
+--- more_headers
+Foo: bar
+
+--- response_body eval
+[qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: keep-alive\r
+Foo: bar\r
+\r
+}, qq{GET /th HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Foo: bar\r
+\r
+}]
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: large header, pipelined
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 30 561;
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+--- pipelined_requests eval
+["GET /t", "GET /t"]
+
+--- more_headers eval
+CORE::join "\n", map { "Header$_: value-$_" } 1..512
+
+--- response_body eval
+my $headers = (CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\n\r\n";
+
+[qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: keep-alive\r
+$headers},
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$headers}]
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: small header, multi-line header
+multi-line header is not supported since 1.21
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+--- raw_request eval
+"GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Foo: bar baz\r
+  blah\r
+\r
+"
+--- response_body eval
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Foo: bar baz\r
+  blah\r
+\r
+}
+--- no_error_log
+[error]
+--- skip_nginx
+3: >= 1.21.1
+
+
+
+=== TEST 18: large header, multi-line header
+multi-line header is not supported since 1.21
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 50 567;
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+
+--- raw_request eval
+my $headers = (CORE::join "\r\n", map { "Header$_: value-$_\r\n hello $_ world blah blah" } 1..512) . "\r\n\r\n";
+
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$headers}
+
+--- response_body eval
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+}
+.(CORE::join "\r\n", map { "Header$_: value-$_\r\n hello $_ world blah blah" } 1..512) . "\r\n\r\n"
+
+--- no_error_log
+[error]
+--- skip_nginx
+3: >= 1.21.1
+
+
+
+=== TEST 19: small header (POST body)
+--- config
+    location /t {
+        echo_read_request_body;
+        echo -n $echo_client_request_headers;
+    }
+--- request
+POST /t
+hello
+--- response_body eval
+qq{POST /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 20: small header (POST body) - in subrequests (location)
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+    location /main {
+        echo_location /t;
+    }
+
+--- request
+POST /main
+hello
+--- response_body eval
+qq{POST /main HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: large header (POST body)
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 30 561;
+    location /t {
+        echo_read_request_body;
+        echo -n $echo_client_request_headers;
+    }
+--- request
+POST /t
+hello
+
+--- more_headers eval
+CORE::join"\n", map { "Header$_: value-$_" } 1..512
+
+--- response_body eval
+qq{POST /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+}
+.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\nContent-Length: 5\r\n\r\n"
+
+--- no_error_log
+[error]
+--- timeout: 5
+
+
+
+=== TEST 22: large header (POST body) - in subrequests
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 30 561;
+    location /t {
+        echo_read_request_body;
+        echo -n $echo_client_request_headers;
+    }
+
+    location /main {
+        echo_location /t;
+    }
+--- request
+POST /main
+hello
+--- more_headers eval
+CORE::join"\n", map { "Header$_: value-$_" } 1..512
+
+--- response_body eval
+qq{POST /main HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+}
+.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..512) . "\r\nContent-Length: 5\r\n\r\n"
+
+--- no_error_log
+[error]
+--- timeout: 5
+
+
+
+=== TEST 23: raw headers - the default header buffer can hold the request line, but not the header entries
+--- config
+    location /t {
+        echo_read_request_body;
+        echo -n $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- more_headers eval
+my $s = "User-Agent: curl\nBah: bah\n";
+$s .= "Accept: */*\n";
+$s .= "Cookie: " . "C" x 1200 . "\n";
+$s
+--- response_body eval
+"GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+User-Agent: curl\r
+Bah: bah\r
+Accept: */*\r
+Cookie: " . ("C" x 1200) . "\r\n\r\n"
+--- no_error_log
+[error]
+
+
+
+=== TEST 24: small header (POST body) - in subrequests (location_async)
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+    location /main {
+        echo_location_async /t;
+    }
+
+--- request
+POST /main
+hello
+--- response_body eval
+qq{POST /main HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 25: small header (POST body) - in subrequests (subrequest)
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+    location /main {
+        echo_subrequest GET /t;
+    }
+
+--- request
+POST /main
+hello
+--- response_body eval
+qq{POST /main HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 26: small header (POST body) - in subrequests (subrequest_async)
+--- config
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+    location /main {
+        echo_subrequest_async GET /t;
+    }
+
+--- request
+POST /main
+hello
+--- response_body eval
+qq{POST /main HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 5\r
+\r
+}
+--- no_error_log
+[error]
+
+
+
+=== TEST 27: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers
+--- config
+    location = /t {
+        proxy_buffering off;
+        proxy_pass http://127.0.0.1:$server_port/bad;
+        proxy_intercept_errors on;
+        error_page 500 = /500;
+    }
+
+    location = /bad {
+        return 500;
+    }
+
+    location = /500 {
+        echo -n $echo_client_request_headers;
+    }
+--- request
+GET /t
+--- response_body eval
+"GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 28: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (exclusive LF in the request data)
+--- config
+    location = /t {
+        proxy_buffering off;
+        proxy_pass http://127.0.0.1:$server_port/bad;
+        proxy_intercept_errors on;
+        error_page 500 = /500;
+    }
+
+    location = /bad {
+        return 500;
+    }
+
+    location = /500 {
+        internal;
+        echo -n $echo_client_request_headers;
+    }
+--- raw_request eval
+"GET /t HTTP/1.1
+Host: localhost
+Connection: close
+Content-Length: 5
+
+hello"
+--- response_body eval
+"GET /t HTTP/1.1
+Host: localhost
+Connection: close
+Content-Length: 5
+
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 29: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (mixed LF and CRLF in the request data)
+--- config
+    location = /t {
+        proxy_buffering off;
+        proxy_pass http://127.0.0.1:$server_port/bad;
+        proxy_intercept_errors on;
+        error_page 500 = /500;
+    }
+
+    location = /bad {
+        return 500;
+    }
+
+    location = /500 {
+        internal;
+        echo -n $echo_client_request_headers;
+    }
+--- raw_request eval
+"GET /t HTTP/1.1\r
+Host: localhost
+Connection: close\r
+Content-Length: 5\r
+
+hello"
+--- response_body eval
+"GET /t HTTP/1.1\r
+Host: localhost
+Connection: close\r
+Content-Length: 5\r
+
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 30: ngx_proxy/ngx_fastcgi/etc change r->header_end to point to their own buffers (another way of mixing LF and CRLF in the request data)
+--- config
+    location = /t {
+        proxy_buffering off;
+        proxy_pass http://127.0.0.1:$server_port/bad;
+        proxy_intercept_errors on;
+        error_page 500 = /500;
+    }
+
+    location = /bad {
+        return 500;
+    }
+
+    location = /500 {
+        internal;
+        echo -n $echo_client_request_headers;
+    }
+--- raw_request eval
+"GET /t HTTP/1.1\r
+Host: localhost
+Connection: close\r
+Content-Length: 5
+\r
+hello"
+--- response_body eval
+"GET /t HTTP/1.1\r
+Host: localhost
+Connection: close\r
+Content-Length: 5
+\r
+"
+--- no_error_log
+[error]
+
+
+
+=== TEST 31: two pipelined requests with large headers
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 3 5610;
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+--- pipelined_requests eval
+["GET /t", "GET /t"]
+--- more_headers eval
+CORE::join "\n", map { "Header$_: value-$_" } 1..585
+
+--- response_body eval
+[qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: keep-alive\r
+}
+.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..585) . "\r\n\r\n",
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+}
+.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..585) . "\r\n\r\n",
+,
+]
+
+--- no_error_log
+[error]
+--- timeout: 5
+
+
+
+=== TEST 32: a request with large header and a smaller pipelined request following
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 2 1921;
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+--- pipelined_requests eval
+["GET /t", "GET /t"]
+--- more_headers eval
+[CORE::join("\n", map { "Header$_: value-$_" } 1..170), "Foo: bar\n"]
+
+--- response_body eval
+[qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: keep-alive\r
+}
+.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..170) . "\r\n\r\n",
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Foo: bar\r
+\r
+},
+]
+
+--- no_error_log
+[error]
+--- timeout: 5
+
+
+
+=== TEST 33: a request with large header and a smaller pipelined request following
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 2 1921;
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+--- pipelined_requests eval
+["GET /t", "GET /t" . ("a" x 512)]
+--- more_headers eval
+[CORE::join("\n", map { "Header$_: value-$_" } 1..170), "Foo: bar\n"]
+
+--- response_body eval
+[qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: keep-alive\r
+}
+.(CORE::join "\r\n", map { "Header$_: value-$_" } 1..170) . "\r\n\r\n",
+qq{GET /t} . ("a" x 512) . qq{ HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Foo: bar\r
+\r
+},
+]
+
+--- no_error_log
+[error]
+--- timeout: 5
+
+
+
+=== TEST 34: invalid header line started with whitespace since nginx 1.21.1
+--- config
+    client_header_buffer_size 10;
+    large_client_header_buffers 50 567;
+    location /t {
+        echo -n $echo_client_request_headers;
+    }
+
+--- raw_request eval
+my $headers = (CORE::join "\r\n", map { "Header$_: value-$_\r\n hello $_ world blah blah" } 1..512) . "\r\n\r\n";
+
+qq{GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$headers}
+
+--- error_code: 400
+--- no_error_log
+[error]
+--- skip_nginx
+2: < 1.21.1
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/sleep.t b/modules_deb/libnginx-mod-http-echo-0.63/t/sleep.t
new file mode 100644
index 0000000..f8e741e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/sleep.t
@@ -0,0 +1,200 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => 2 * blocks();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /echo {
+        echo_sleep 1;
+    }
+--- request
+    GET /echo
+--- response_body
+
+
+
+=== TEST 2: fractional delay
+--- config
+    location /echo {
+        echo_sleep 0.01;
+    }
+--- request
+    GET /echo
+--- response_body
+
+
+
+=== TEST 3: leading echo
+--- config
+    location /echo {
+        echo before...;
+        echo_sleep 0.01;
+    }
+--- request
+    GET /echo
+--- response_body
+before...
+
+
+
+=== TEST 4: trailing echo
+--- config
+    location /echo {
+        echo_sleep 0.01;
+        echo after...;
+    }
+--- request
+    GET /echo
+--- response_body
+after...
+
+
+
+=== TEST 5: two echos around sleep
+--- config
+    location /echo {
+        echo before...;
+        echo_sleep 0.01;
+        echo after...;
+    }
+--- request
+    GET /echo
+--- response_body
+before...
+after...
+
+
+
+=== TEST 6: interleaving sleep and echo
+--- config
+    location /echo {
+        echo 1;
+        echo_sleep 0.01;
+        echo 2;
+        echo_sleep 0.01;
+    }
+--- request
+    GET /echo
+--- response_body
+1
+2
+
+
+
+=== TEST 7: interleaving sleep and echo with echo at the end...
+--- config
+    location /echo {
+        echo 1;
+        echo_sleep 0.01;
+        echo 2;
+        echo_sleep 0.01;
+        echo 3;
+    }
+--- request
+    GET /echo
+--- response_body
+1
+2
+3
+
+
+
+=== TEST 8: flush before sleep
+we didn't really test the actual effect of "echo_flush" here...
+merely checks if it croaks if appears.
+--- config
+    location /flush {
+        echo hi;
+        echo_flush;
+        echo_sleep 0.01;
+        echo trees;
+    }
+--- request
+    GET /flush
+--- response_body
+hi
+trees
+
+
+
+=== TEST 9: flush does not increment opcode pointer itself
+--- config
+    location /flush {
+        echo hi;
+        echo_flush;
+        echo trees;
+    }
+--- request
+    GET /flush
+--- response_body
+hi
+trees
+
+
+
+=== TEST 10: sleep through a proxy
+this reveals a bug in v0.19 and the bug is fixed in v0.20.
+--- config
+    location /proxy {
+        proxy_pass $scheme://127.0.0.1:$server_port/entry';
+    }
+    location /entry {
+        echo_sleep 0.001;
+        echo done;
+    }
+--- request
+    GET /proxy
+--- response_body_like
+done
+
+
+
+=== TEST 11: abnormally quit
+--- config
+    location /quit {
+        echo before;
+        echo_flush;
+        echo_sleep 1;
+        echo after;
+    }
+--- request
+    GET /quit
+--- response_body
+before
+after
+
+
+
+=== TEST 12: two echos around sleep (HEAD)
+--- config
+    location /echo {
+        echo before...;
+        echo_sleep 0.01;
+        echo after...;
+    }
+--- request
+    HEAD /echo
+--- response_body
+
+
+
+=== TEST 13: sleep by variable
+--- config
+    location ~ ^/sleep/(.+) {
+        echo before...;
+        echo_sleep $1;
+        echo after...;
+    }
+--- request
+    GET /sleep/0.01
+--- response_body
+before...
+after...
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/status.t b/modules_deb/libnginx-mod-http-echo-0.63/t/status.t
new file mode 100644
index 0000000..d97b084
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/status.t
@@ -0,0 +1,142 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => repeat_each() * (2 * blocks());
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: 200
+--- config
+    location /echo {
+        echo_status 200;
+        echo hello;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+--- error_code: 200
+
+
+
+=== TEST 2: if location (200)
+--- config
+    location /echo {
+        set $true 1;
+        if ($true) {
+        }
+        echo_status 200;
+        echo hello;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+--- error_code: 200
+
+
+
+=== TEST 3: 404
+--- config
+    location /echo {
+        echo_status 404;
+        echo hello;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+--- error_code: 404
+
+
+
+=== TEST 4: if location (404)
+--- config
+    location /echo {
+        set $true 1;
+        if ($true) {
+        }
+        echo_status 404;
+        echo hello;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+--- error_code: 404
+
+
+
+=== TEST 5: 500
+--- config
+    location /echo {
+        echo_status 500;
+        echo hello;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+--- error_code: 500
+
+
+
+=== TEST 6: if location (500)
+--- config
+    location /echo {
+        set $true 1;
+        if ($true) {
+        }
+        echo_status 500;
+        echo hello;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+--- error_code: 500
+
+
+
+=== TEST 7: if location (500) no inherit
+--- config
+    location /echo {
+        set $true 1;
+        if ($true) {
+            echo_status 503;
+        }
+        echo_status 500;
+        echo hello;
+    }
+--- request
+    GET /echo
+--- response_body
+hello
+--- error_code: 503
+
+
+
+=== TEST 8: subrequest
+--- config
+    location /echo {
+        echo_location /sub;
+        echo_status 503;
+    }
+
+    location /sub {
+        echo blah blah;
+    }
+--- request
+    GET /echo
+--- response_body
+blah blah
+--- error_code: 503
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/subrequest-async.t b/modules_deb/libnginx-mod-http-echo-0.63/t/subrequest-async.t
new file mode 100644
index 0000000..882b368
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/subrequest-async.t
@@ -0,0 +1,604 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 2 + 1);
+
+#$Test::Nginx::LWP::LogLevel = 'debug';
+
+$ENV{TEST_NGINX_HTML_DIR} = html_dir;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity - GET
+--- config
+    location /main {
+        echo_subrequest_async GET /sub;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        echo "main method: $echo_client_request_method";
+    }
+--- request
+    GET /main
+--- response_body
+sub method: GET
+main method: GET
+
+
+
+=== TEST 2: sanity - DELETE
+--- config
+    location /main {
+        echo_subrequest_async DELETE /sub;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        echo "main method: $echo_client_request_method";
+    }
+--- request
+    GET /main
+--- response_body
+sub method: DELETE
+main method: GET
+
+
+
+=== TEST 3: trailing echo
+--- config
+    location /main {
+        echo_subrequest_async GET /sub;
+        echo after subrequest;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+after subrequest
+
+
+
+=== TEST 4: leading echo
+--- config
+    location /main {
+        echo before subrequest;
+        echo_subrequest_async GET /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before subrequest
+hello
+
+
+
+=== TEST 5: leading & trailing echo
+--- config
+    location /main {
+        echo before subrequest;
+        echo_subrequest_async GET /sub;
+        echo after subrequest;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before subrequest
+hello
+after subrequest
+
+
+
+=== TEST 6: multiple subrequests
+--- config
+    location /main {
+        echo before sr 1;
+        echo_subrequest_async GET /sub;
+        echo after sr 1;
+        echo before sr 2;
+        echo_subrequest_async GET /sub;
+        echo after sr 2;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before sr 1
+hello
+after sr 1
+before sr 2
+hello
+after sr 2
+
+
+
+=== TEST 7: timed multiple subrequests (blocking sleep)
+--- config
+    location /main {
+        echo_reset_timer;
+        echo_subrequest_async GET /sub1;
+        echo_subrequest_async GET /sub2;
+        echo "took $echo_timer_elapsed sec for total.";
+    }
+    location /sub1 {
+        echo_blocking_sleep 0.02;
+        echo hello;
+    }
+    location /sub2 {
+        echo_blocking_sleep 0.01;
+        echo world;
+    }
+
+--- request
+    GET /main
+--- response_body_like
+^hello
+world
+took 0\.00[0-5] sec for total\.$
+
+
+
+=== TEST 8: timed multiple subrequests (non-blocking sleep)
+--- config
+    location /main {
+        echo_reset_timer;
+        echo_subrequest_async GET /sub1;
+        echo_subrequest_async GET /sub2;
+        echo "took $echo_timer_elapsed sec for total.";
+    }
+    location /sub1 {
+        echo_sleep 0.02;
+        echo hello;
+    }
+    location /sub2 {
+        echo_sleep 0.01;
+        echo world;
+    }
+
+--- request
+    GET /main
+--- response_body_like
+^hello
+world
+took 0\.00[0-5] sec for total\.$
+
+
+
+=== TEST 9: location with args
+--- config
+    location /main {
+        echo_subrequest_async GET /sub -q 'foo=Foo&bar=Bar';
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+Foo Bar
+
+
+
+=== TEST 10: encoded chars in query strings
+--- config
+    location /main {
+        echo_subrequest_async GET /sub -q 'foo=a%20b&bar=Bar';
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+a%20b Bar
+
+
+
+=== TEST 11: UTF-8 chars in query strings
+--- config
+    location /main {
+        echo_subrequest_async GET /sub -q 'foo=你好';
+    }
+    location /sub {
+        echo $arg_foo;
+    }
+--- request
+    GET /main
+--- response_body
+你好
+
+
+
+=== TEST 12: encoded chars in location url
+--- config
+    location /main {
+        echo_subrequest_async GET /sub%31 -q 'foo=Foo&bar=Bar';
+    }
+    location /sub%31 {
+        echo 'sub%31';
+    }
+    location /sub1 {
+        echo 'sub1';
+    }
+--- request
+    GET /main
+--- response_body
+sub1
+
+
+
+=== TEST 13: querystring in url
+--- config
+    location /main {
+        echo_subrequest_async GET /sub?foo=Foo&bar=Bar;
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+Foo Bar
+
+
+
+=== TEST 14: querystring in url *AND* an explicit querystring
+--- config
+    location /main {
+        echo_subrequest_async GET /sub?foo=Foo&bar=Bar -q blah=Blah;
+    }
+    location /sub {
+        echo $arg_foo $arg_bar $arg_blah;
+    }
+--- request
+    GET /main
+--- response_body
+  Blah
+
+
+
+=== TEST 15: explicit flush in main request
+flush won't really flush the buffer...
+--- config
+    location /main_flush {
+        echo 'pre main';
+        echo_subrequest_async GET /sub;
+        echo 'post main';
+        echo_flush;
+    }
+
+    location /sub {
+        echo_sleep 0.02;
+        echo 'sub';
+    }
+--- request
+    GET /main_flush
+--- response_body
+pre main
+sub
+post main
+
+
+
+=== TEST 16: POST subrequest with body (with proxy in the middle) and without read body explicitly
+--- config
+    location /main {
+        echo_subrequest_async POST /proxy -b 'hello, world';
+    }
+    location /proxy {
+        proxy_pass $scheme://127.0.0.1:$server_port/sub;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method.";
+        # we need to read body explicitly here...or $echo_request_body
+        #   will evaluate to empty ("")
+        echo "sub body: $echo_request_body.";
+    }
+--- request
+    GET /main
+--- response_body
+sub method: POST.
+sub body: .
+
+
+
+=== TEST 17: POST subrequest with body (with proxy in the middle) and read body explicitly
+--- config
+    location /main {
+        echo_subrequest_async POST /proxy -b 'hello, world';
+    }
+    location /proxy {
+        proxy_pass $scheme://127.0.0.1:$server_port/sub;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method.";
+        # we need to read body explicitly here...or $echo_request_body
+        #   will evaluate to empty ("")
+        echo_read_request_body;
+        echo "sub body: $echo_request_body.";
+    }
+--- request
+    GET /main
+--- response_body
+sub method: POST.
+sub body: hello, world.
+
+
+
+=== TEST 18: multiple subrequests
+--- config
+    location /multi {
+        echo_subrequest_async POST '/sub' -q 'foo=Foo' -b 'hi';
+        echo_subrequest_async PUT '/sub' -q 'bar=Bar' -b 'hello';
+    }
+    location /sub {
+        echo "querystring: $query_string";
+        echo "method: $echo_request_method";
+        echo "body: $echo_request_body";
+        echo "content length: $http_content_length";
+        echo '///';
+    }
+--- request
+    GET /multi
+--- response_body
+querystring: foo=Foo
+method: POST
+body: hi
+content length: 2
+///
+querystring: bar=Bar
+method: PUT
+body: hello
+content length: 5
+///
+
+
+
+=== TEST 19: no varaiable inheritance
+--- config
+    location /main {
+        echo $echo_cacheable_request_uri;
+        echo_subrequest_async GET /sub;
+        echo_subrequest_async GET /sub2;
+    }
+    location /sub {
+        echo $echo_cacheable_request_uri;
+    }
+    location /sub2 {
+        echo $echo_cacheable_request_uri;
+    }
+
+--- request
+    GET /main
+--- response_body
+/main
+/sub
+/sub2
+
+
+
+=== TEST 20: unsafe uri
+--- config
+    location /unsafe {
+        echo_subrequest_async GET '/../foo';
+    }
+--- request
+    GET /unsafe
+--- ignore_response
+--- error_log
+echo_subrequest_async sees unsafe uri: "/../foo"
+--- no_error_log
+[error]
+[alert]
+
+
+
+=== TEST 21: let subrequest to read the main request's request body
+--- SKIP
+--- config
+    location /main {
+        echo_subrequest_async POST /sub;
+    }
+    location /sub {
+        echo_read_request_body;
+        echo_request_body;
+    }
+--- request
+POST /main
+hello, body!
+--- response_body chomp
+hello, body!
+
+
+
+=== TEST 22: POST subrequest with file body (relative paths)
+--- config
+    location /main {
+        echo_subrequest_async POST /sub -f html/blah.txt;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        # we don't need to call echo_read_client_body explicitly here
+        echo_request_body;
+    }
+--- user_files
+>>> blah.txt
+Hello, world
+--- request
+    GET /main
+--- response_body
+sub method: POST
+Hello, world
+
+
+
+=== TEST 23: POST subrequest with file body (absolute paths)
+--- config
+    location /main {
+        echo_subrequest_async POST /sub -f $TEST_NGINX_HTML_DIR/blah.txt;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        # we don't need to call echo_read_client_body explicitly here
+        echo_request_body;
+    }
+--- user_files
+>>> blah.txt
+Hello, world!
+Haha
+--- request
+    GET /main
+--- response_body
+sub method: POST
+Hello, world!
+Haha
+
+
+
+=== TEST 24: POST subrequest with file body (file not found)
+--- config
+    location /main {
+        echo_subrequest_async POST /sub -f html/blah/blah.txt;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        # we don't need to call echo_read_client_body explicitly here
+        echo_request_body;
+    }
+--- user_files
+>>> blah.txt
+Hello, world
+--- request
+    GET /main
+--- ignore_response
+--- error_log eval
+qr/open\(\) ".*?" failed/
+--- no_error_log
+[alert]
+
+
+
+=== TEST 25: POST subrequest with file body (absolute paths in vars)
+--- config
+    location /main {
+        set $path $TEST_NGINX_HTML_DIR/blah.txt;
+        echo_subrequest_async POST /sub -f $path;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        # we don't need to call echo_read_client_body explicitly here
+        echo_request_body;
+    }
+--- user_files
+>>> blah.txt
+Hello, world!
+Haha
+--- request
+    GET /main
+--- response_body
+sub method: POST
+Hello, world!
+Haha
+
+
+
+=== TEST 26: leading subrequest & echo_before_body
+--- config
+    location /main {
+        echo_before_body hello;
+        echo_subrequest_async GET /foo;
+    }
+    location /foo {
+        echo world;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+world
+
+
+
+=== TEST 27: leading subrequest & xss
+--- config
+    location /main {
+        default_type 'application/json';
+        xss_get on;
+        xss_callback_arg c;
+        echo_subrequest_async GET /foo;
+    }
+    location /foo {
+        echo -n world;
+    }
+--- request
+    GET /main?c=hi
+--- response_body chop
+hi(world);
+
+
+
+=== TEST 28: multiple leading subrequest & xss
+--- config
+    location /main {
+        default_type 'application/json';
+        xss_get on;
+        xss_callback_arg c;
+        echo_subrequest_async GET /foo;
+        echo_subrequest_async GET /bar;
+    }
+    location /foo {
+        echo -n world;
+    }
+    location /bar {
+        echo -n ' people';
+    }
+--- request
+    GET /main?c=hi
+--- response_body chop
+hi(world people);
+
+
+
+=== TEST 29: sanity (HEAD)
+--- config
+    location /main {
+        echo_subrequest_async GET /sub;
+        echo_subrequest_async GET /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    HEAD /main
+--- response_body
+
+
+
+=== TEST 30: HEAD subrequest
+--- config
+    location /main {
+        echo_subrequest_async HEAD /sub;
+        echo_subrequest_async HEAD /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/subrequest.t b/modules_deb/libnginx-mod-http-echo-0.63/t/subrequest.t
new file mode 100644
index 0000000..6d965d0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/subrequest.t
@@ -0,0 +1,725 @@
+# vi:filetype=
+
+use lib 'lib';
+
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 1);
+
+$ENV{TEST_NGINX_HTML_DIR} = html_dir;
+$ENV{TEST_NGINX_CLIENT_PORT} ||= server_port();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /main {
+        echo_subrequest GET /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+
+
+
+=== TEST 2: trailing echo
+--- config
+    location /main {
+        echo_subrequest GET /sub;
+        echo after subrequest;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+after subrequest
+
+
+
+=== TEST 3: leading echo
+--- config
+    location /main {
+        echo before subrequest;
+        echo_subrequest GET /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before subrequest
+hello
+
+
+
+=== TEST 4: leading & trailing echo
+--- config
+    location /main {
+        echo before subrequest;
+        echo_subrequest GET /sub;
+        echo after subrequest;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before subrequest
+hello
+after subrequest
+
+
+
+=== TEST 5: multiple subrequests
+--- config
+    location /main {
+        echo before sr 1;
+        echo_subrequest GET /sub;
+        echo after sr 1;
+        echo before sr 2;
+        echo_subrequest GET /sub;
+        echo after sr 2;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+before sr 1
+hello
+after sr 1
+before sr 2
+hello
+after sr 2
+
+
+
+=== TEST 6: timed multiple subrequests (blocking sleep)
+--- config
+    location /main {
+        echo_reset_timer;
+        echo_subrequest GET /sub1;
+        echo_subrequest GET /sub2;
+        echo "took $echo_timer_elapsed sec for total.";
+    }
+    location /sub1 {
+        echo_blocking_sleep 0.02;
+        echo hello;
+    }
+    location /sub2 {
+        echo_blocking_sleep 0.01;
+        echo world;
+    }
+
+--- request
+    GET /main
+--- response_body_like
+^hello
+world
+took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
+
+
+
+=== TEST 7: timed multiple subrequests (non-blocking sleep)
+--- config
+    location /main {
+        echo_reset_timer;
+        echo_subrequest GET /sub1;
+        echo_subrequest GET /sub2;
+        echo "took $echo_timer_elapsed sec for total.";
+    }
+    location /sub1 {
+        echo_sleep 0.02;
+        echo hello;
+    }
+    location /sub2 {
+        echo_sleep 0.01;
+        echo world;
+    }
+
+--- request
+    GET /main
+--- response_body_like
+^hello
+world
+took 0\.0(?:2[5-9]|3[0-6]) sec for total\.$
+
+
+
+=== TEST 8: location with args
+--- config
+    location /main {
+        echo_subrequest GET /sub -q 'foo=Foo&bar=Bar';
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+Foo Bar
+
+
+
+=== TEST 9: chained subrequests
+--- config
+    location /main {
+        echo 'pre main';
+        echo_subrequest GET /sub;
+        echo 'post main';
+    }
+
+    location /sub {
+        echo 'pre sub';
+        echo_subrequest GET /subsub;
+        echo 'post sub';
+    }
+
+    location /subsub {
+        echo 'subsub';
+    }
+--- request
+    GET /main
+--- response_body
+pre main
+pre sub
+subsub
+post sub
+post main
+
+
+
+=== TEST 10: chained subrequests using named locations
+as of 0.8.20, ngx_http_subrequest still does not support
+named location. sigh. this case is a TODO.
+--- config
+    location /main {
+        echo 'pre main';
+        echo_subrequest GET @sub;
+        echo 'post main';
+    }
+
+    location @sub {
+        echo 'pre sub';
+        echo_subrequest GET @subsub;
+        echo 'post sub';
+    }
+
+    location @subsub {
+        echo 'subsub';
+    }
+--- request
+    GET /main
+--- response_body
+pre main
+pre sub
+subsub
+post sub
+post main
+--- SKIP
+
+
+
+=== TEST 11: explicit flush in main request
+--- config
+    location /main {
+        echo 'pre main';
+        echo_subrequest GET /sub;
+        echo 'post main';
+        echo_flush;
+    }
+
+    location /sub {
+        echo_sleep 0.02;
+        echo 'sub';
+    }
+--- request
+    GET /main
+--- response_body
+pre main
+sub
+post main
+
+
+
+=== TEST 12: DELETE subrequest
+--- config
+    location /main {
+        echo_subrequest DELETE /sub;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        echo "main method: $echo_client_request_method";
+    }
+--- request
+    GET /main
+--- response_body
+sub method: DELETE
+main method: GET
+
+
+
+=== TEST 13: DELETE subrequest
+--- config
+    location /main {
+        echo "main method: $echo_client_request_method";
+        echo_subrequest GET /proxy;
+        echo_subrequest DELETE /proxy;
+    }
+    location /proxy {
+        proxy_pass $scheme://127.0.0.1:$server_port/sub;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+    }
+--- request
+    GET /main
+--- response_body
+main method: GET
+sub method: GET
+sub method: DELETE
+
+
+
+=== TEST 14: POST subrequest with body
+--- config
+    location /main {
+        echo_subrequest POST /sub -b 'hello, world';
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        # we don't need to call echo_read_client_body explicitly here
+        echo "sub body: $echo_request_body";
+    }
+--- request
+    GET /main
+--- response_body
+sub method: POST
+sub body: hello, world
+
+
+
+=== TEST 15: POST subrequest with body (explicitly read the body)
+--- config
+    location /main {
+        echo_subrequest POST /sub -b 'hello, world';
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        # we call echo_read_client_body explicitly here even
+        #   though it's not necessary.
+        echo_read_request_body;
+        echo "sub body: $echo_request_body";
+    }
+--- request
+    GET /main
+--- response_body
+sub method: POST
+sub body: hello, world
+
+
+
+=== TEST 16: POST subrequest with body (with proxy in the middle) and without read body explicitly
+--- config
+    location /main {
+        echo_subrequest POST /proxy -b 'hello, world';
+    }
+    location /proxy {
+        proxy_pass $scheme://127.0.0.1:$server_port/sub;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method.";
+        # we need to read body explicitly here...or $echo_request_body
+        #   will evaluate to empty ("")
+        echo "sub body: $echo_request_body.";
+    }
+--- request
+    GET /main
+--- response_body
+sub method: POST.
+sub body: .
+
+
+
+=== TEST 17: POST subrequest with body (with proxy in the middle) and read body explicitly
+--- config
+    location /main {
+        echo_subrequest POST /proxy -b 'hello, world';
+    }
+    location /proxy {
+        proxy_pass $scheme://127.0.0.1:$server_port/sub;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method.";
+        # we need to read body explicitly here...or $echo_request_body
+        #   will evaluate to empty ("")
+        echo_read_request_body;
+        echo "sub body: $echo_request_body.";
+    }
+--- request
+    GET /main
+--- response_body
+sub method: POST.
+sub body: hello, world.
+
+
+
+=== TEST 18: multiple subrequests
+--- config
+    location /multi {
+        echo_subrequest POST '/sub' -q 'foo=Foo' -b 'hi';
+        echo_subrequest PUT '/sub' -q 'bar=Bar' -b 'hello';
+    }
+    location /sub {
+        echo "querystring: $query_string";
+        echo "method: $echo_request_method";
+        echo "body: $echo_request_body";
+        echo "content length: $http_content_length";
+        echo '///';
+    }
+--- request
+    GET /multi
+--- response_body
+querystring: foo=Foo
+method: POST
+body: hi
+content length: 2
+///
+querystring: bar=Bar
+method: PUT
+body: hello
+content length: 5
+///
+
+
+
+=== TEST 19: unsafe uri
+--- config
+    location /unsafe {
+        echo_subrequest GET '/../foo';
+    }
+--- request
+    GET /unsafe
+--- ignore_response
+--- error_log
+echo_subrequest sees unsafe uri: "/../foo"
+--- no_error_log
+[error]
+
+
+
+=== TEST 20: querystring in url
+--- config
+    location /main {
+        echo_subrequest GET /sub?foo=Foo&bar=Bar;
+    }
+    location /sub {
+        echo $arg_foo $arg_bar;
+    }
+--- request
+    GET /main
+--- response_body
+Foo Bar
+
+
+
+=== TEST 21: querystring in url *AND* an explicit querystring
+--- config
+    location /main {
+        echo_subrequest GET /sub?foo=Foo&bar=Bar -q blah=Blah;
+    }
+    location /sub {
+        echo $arg_foo $arg_bar $arg_blah;
+    }
+--- request
+    GET /main
+--- response_body
+  Blah
+
+
+
+=== TEST 22: let subrequest to read the main request's request body
+--- SKIP
+--- config
+    location /main {
+        echo_subrequest POST /sub;
+    }
+    location /sub {
+        echo_read_request_body;
+        echo_request_body;
+    }
+--- request
+POST /main
+hello, body!
+--- response_body chomp
+hello, body!
+
+
+
+=== TEST 23: deep nested echo_subrequest/echo_subrequest_async
+--- config
+    location /main {
+        echo_subrequest GET /bar;
+        echo_subrequest_async GET /bar;
+        echo_subrequest_async GET /bar;
+        echo_subrequest GET /group;
+        echo_subrequest_async GET /group;
+    }
+
+    location /group {
+        echo_subrequest GET /bar;
+        echo_subrequest_async GET /bar;
+    }
+
+    location /bar {
+        echo $echo_incr;
+    }
+--- request
+GET /main
+--- response_body
+1
+2
+3
+4
+5
+6
+7
+
+
+
+=== TEST 24: deep nested echo_subrequest/echo_subrequest_async
+--- config
+    location /main {
+        echo_subrequest GET /bar?a;
+        echo_subrequest_async GET /bar?b;
+        echo_subrequest_async GET /bar?c;
+        echo_subrequest GET /group?a=d&b=e;
+        echo_subrequest_async GET /group?a=f&b=g;
+    }
+
+    location /group {
+        echo_subrequest GET /bar?$arg_a;
+        echo_subrequest_async GET /bar?$arg_b;
+    }
+
+    location /bar {
+        echo -n $query_string;
+    }
+--- request
+GET /main
+--- response_body: abcdefg
+--- timeout: 2
+
+
+
+=== TEST 25: POST subrequest with file body (relative paths)
+--- config
+    location /main {
+        echo_subrequest POST /sub -f html/blah.txt;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        # we don't need to call echo_read_client_body explicitly here
+        echo_request_body;
+    }
+--- user_files
+>>> blah.txt
+Hello, world
+--- request
+    GET /main
+--- response_body
+sub method: POST
+Hello, world
+
+
+
+=== TEST 26: POST subrequest with file body (absolute paths)
+--- config
+    location /main {
+        echo_subrequest POST /sub -f $TEST_NGINX_HTML_DIR/blah.txt;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        # we don't need to call echo_read_client_body explicitly here
+        echo_request_body;
+    }
+--- user_files
+>>> blah.txt
+Hello, world!
+Haha
+--- request
+    GET /main
+--- response_body
+sub method: POST
+Hello, world!
+Haha
+
+
+
+=== TEST 27: POST subrequest with file body (file not found)
+--- config
+    location /main {
+        echo_subrequest POST /sub -f html/blah/blah.txt;
+    }
+    location /sub {
+        echo "sub method: $echo_request_method";
+        # we don't need to call echo_read_client_body explicitly here
+        echo_request_body;
+    }
+--- user_files
+>>> blah.txt
+Hello, world
+--- request
+    GET /main
+--- ignore_response
+--- error_log eval
+qr/open\(\) ".*?" failed/
+--- no_error_log
+[alert]
+
+
+
+=== TEST 28: leading subrequest & echo_before_body
+--- config
+    location /main {
+        echo_before_body hello;
+        echo_subrequest GET /foo;
+    }
+    location /foo {
+        echo world;
+    }
+--- request
+    GET /main
+--- response_body
+hello
+world
+
+
+
+=== TEST 29: leading subrequest & xss
+--- config
+    location /main {
+        default_type 'application/json';
+        xss_get on;
+        xss_callback_arg c;
+        echo_subrequest GET /foo;
+    }
+    location /foo {
+        echo -n world;
+    }
+--- request
+    GET /main?c=hi
+--- response_body chop
+hi(world);
+
+
+
+=== TEST 30: multiple leading subrequest & xss
+--- config
+    location /main {
+        default_type 'application/json';
+        xss_get on;
+        xss_callback_arg c;
+        echo_subrequest GET /foo;
+        echo_subrequest GET /bar;
+    }
+    location /foo {
+        echo -n world;
+    }
+    location /bar {
+        echo -n ' people';
+    }
+--- request
+    GET /main?c=hi
+--- response_body chop
+hi(world people);
+
+
+
+=== TEST 31: sanity (HEAD)
+--- config
+    location /main {
+        echo_subrequest GET /sub;
+        echo_subrequest GET /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    HEAD /main
+--- response_body
+
+
+
+=== TEST 32: POST subrequest to ngx_proxy
+--- config
+    location /hello {
+       default_type text/plain;
+       echo_subrequest POST '/proxy' -q 'foo=Foo&bar=baz' -b 'request_body=test&test=3';
+    }
+
+    location /proxy {
+        proxy_pass http://127.0.0.1:$TEST_NGINX_CLIENT_PORT/sub;
+        #proxy_pass http://127.0.0.1:1113/sub;
+    }
+
+    location /sub {
+        echo_read_request_body;
+        echo "sub method: $echo_request_method";
+        # we don't need to call echo_read_client_body explicitly here
+        echo "sub body: $echo_request_body";
+    }
+--- request
+    GET /hello
+--- response_body
+sub method: POST
+sub body: request_body=test&test=3
+
+
+
+=== TEST 33: HEAD subrequest
+--- config
+    location /main {
+        echo_subrequest HEAD /sub;
+        echo_subrequest HEAD /sub;
+    }
+    location /sub {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+
+
+
+=== TEST 34: method name as an nginx variable (github issue #34)
+--- config
+  location ~ ^/delay/(?<delay>[0-9.]+)/(?<originalURL>.*)$ {
+      # echo_blocking_sleep $delay;
+      echo_subrequest '$echo_request_method' '/$originalURL' -q '$args';
+  }
+
+  location /api {
+      echo "args: $args";
+  }
+--- request
+    GET /delay/0.343/api/?a=b
+--- response_body
+args: a=b
+--- no_error_log
+[error]
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/t/unused.t b/modules_deb/libnginx-mod-http-echo-0.63/t/unused.t
new file mode 100644
index 0000000..f3c6e9e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/t/unused.t
@@ -0,0 +1,119 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (5 * blocks());
+
+no_long_string();
+log_level('warn');
+
+#master_on();
+#workers(1);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: filters used
+--- http_config
+    postpone_output 1;
+--- config
+    location /echo {
+        echo world;
+        echo_after_body hello;
+    }
+--- request
+    GET /echo?blah
+--- response_body
+world
+hello
+--- error_log
+echo header filter, uri "/echo?blah"
+echo body filter, uri "/echo?blah"
+--- no_error_log
+[error]
+--- log_level: debug
+
+
+
+=== TEST 2: filters not used
+--- http_config
+    postpone_output 1;
+--- config
+    location /echo {
+        echo world;
+        #echo_after_body hello;
+    }
+--- request
+    GET /echo?blah
+--- response_body
+world
+--- no_error_log
+echo header filter, uri "/echo?blah"
+echo body filter, uri "/echo?blah"
+[error]
+--- log_level: debug
+
+
+
+=== TEST 3: (after) filters used (multiple http {} blocks)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
+--- http_config
+    postpone_output 1;
+--- config
+    location /echo {
+        echo world;
+        echo_after_body hello;
+    }
+
+--- post_main_config
+    http {
+    }
+
+--- request
+    GET /echo?blah
+--- response_body
+world
+hello
+--- error_log
+echo header filter, uri "/echo?blah"
+echo body filter, uri "/echo?blah"
+--- no_error_log
+[error]
+--- log_level: debug
+
+
+
+=== TEST 4: (before) filters used (multiple http {} blocks)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
+--- http_config
+    postpone_output 1;
+--- config
+    location /echo {
+        echo world;
+        echo_before_body hello;
+    }
+
+--- post_main_config
+    http {
+    }
+
+--- request
+    GET /echo?blah
+--- response_body
+hello
+world
+--- error_log
+echo header filter, uri "/echo?blah"
+echo body filter, uri "/echo?blah"
+--- no_error_log
+[error]
+--- log_level: debug
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/util/build.sh b/modules_deb/libnginx-mod-http-echo-0.63/util/build.sh
new file mode 100755
index 0000000..45949bb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/util/build.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+# this file is mostly meant to be used by the author himself.
+
+root=`pwd`
+version=$1
+force=$2
+home=~
+
+            #--with-cc=gcc46 \
+
+ngx-build $force $version \
+            --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:/usr/local/lib" \
+            --with-cc-opt="-DDEBUG_MALLOC" \
+            --with-http_stub_status_module \
+            --with-http_image_filter_module \
+            --without-mail_pop3_module \
+            --without-mail_imap_module \
+            --without-mail_smtp_module \
+            --without-http_upstream_ip_hash_module \
+            --without-http_memcached_module \
+            --without-http_referer_module \
+            --without-http_autoindex_module \
+            --without-http_auth_basic_module \
+            --without-http_userid_module \
+          --add-module=$root/../ndk-nginx-module \
+          --add-module=$root/../set-misc-nginx-module \
+          --add-module=$root/../eval-nginx-module \
+          --add-module=$root/../xss-nginx-module \
+          --add-module=$root/../rds-json-nginx-module \
+          --add-module=$root/../headers-more-nginx-module \
+          --add-module=$root/../lua-nginx-module \
+          --add-module=$root $opts \
+          --with-http_v2_module \
+          --with-select_module \
+          --with-poll_module \
+          --without-http_ssi_module \
+          --with-debug || exit 1
+          #--add-module=$root/../lz-session-nginx-module \
+          #--add-module=$home/work/ndk \
+          #--add-module=$home/work/ndk/examples/http/set_var \
+          #--add-module=$root/../eval-nginx-module \
+          #--add-module=/home/agentz/work/nginx_eval_module-1.0.1 \
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/util/wiki2pod.pl b/modules_deb/libnginx-mod-http-echo-0.63/util/wiki2pod.pl
new file mode 100644
index 0000000..cdd33a2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/util/wiki2pod.pl
@@ -0,0 +1,131 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use bytes;
+
+my @nl_counts;
+my $last_nl_count_level;
+
+my @bl_counts;
+my $last_bl_count_level;
+
+sub fmt_pos ($) {
+    (my $s = $_[0]) =~ s{\#(.*)}{/"$1"};
+    $s;
+}
+
+sub fmt_mark ($$) {
+    my ($tag, $s) = @_;
+    my $max_level = 0;
+    while ($s =~ /([<>])\1*/g) {
+        my $level = length $&;
+        if ($level > $max_level) {
+            $max_level = $level;
+        }
+    }
+
+    my $times = $max_level + 1;
+    if ($times > 1) {
+        $s = " $s ";
+    }
+    return $tag . ('<' x $times) . $s . ('>' x $times);
+}
+
+print "=encoding utf-8\n\n";
+
+while (<>) {
+    if ($. == 1) {
+        # strip the leading U+FEFF byte in MS-DOS text files
+        my $first = ord(substr($_, 0, 1));
+        #printf STDERR "0x%x", $first;
+        #my $second = ord(substr($_, 2, 1));
+        #printf STDERR "0x%x", $second;
+        if ($first == 0xEF) {
+            substr($_, 0, 1, '');
+            #warn "Hit!";
+        }
+    }
+    s{\[(http[^ \]]+) ([^\]]*)\]}{$2 (L<$1>)}gi;
+    s{ \[\[ ( [^\]\|]+ ) \| ([^\]]*) \]\] }{"L<$2|" . fmt_pos($1) . ">"}gixe;
+    s{<code>(.*?)</code>}{fmt_mark('C', $1)}gie;
+    s{'''(.*?)'''}{fmt_mark('B', $1)}ge;
+    s{''(.*?)''}{fmt_mark('I', $1)}ge;
+    if (s{^\s*<[^>]+>\s*$}{}) {
+        next;
+    }
+
+    if (/^\s*$/) {
+        print "\n";
+        next;
+    }
+
+=begin cmt
+
+    if ($. == 1) {
+        warn $_;
+        for my $i (0..length($_) - 1) {
+            my $chr = substr($_, $i, 1);
+            warn "chr ord($i): ".ord($chr)." \"$chr\"\n";
+        }
+    }
+
+=end cmt
+=cut
+
+    if (/(=+) (.*) \1$/) {
+        #warn "HERE! $_" if $. == 1;
+        my ($level, $title) = (length $1, $2);
+        collapse_lists();
+
+        print "\n=head$level $title\n\n";
+    } elsif (/^(\#+) (.*)/) {
+        my ($level, $txt) = (length($1) - 1, $2);
+        if (defined $last_nl_count_level && $level != $last_nl_count_level) {
+            print "\n=back\n\n";
+        }
+        $last_nl_count_level = $level;
+        $nl_counts[$level] ||= 0;
+        if ($nl_counts[$level] == 0) {
+            print "\n=over\n\n";
+        }
+        $nl_counts[$level]++;
+        print "\n=item $nl_counts[$level].\n\n";
+        print "$txt\n";
+    } elsif (/^(\*+) (.*)/) {
+        my ($level, $txt) = (length($1) - 1, $2);
+        if (defined $last_bl_count_level && $level != $last_bl_count_level) {
+            print "\n=back\n\n";
+        }
+        $last_bl_count_level = $level;
+        $bl_counts[$level] ||= 0;
+        if ($bl_counts[$level] == 0) {
+            print "\n=over\n\n";
+        }
+        $bl_counts[$level]++;
+        print "\n=item *\n\n";
+        print "$txt\n";
+    } else {
+        collapse_lists();
+        print;
+    }
+}
+
+collapse_lists();
+
+sub collapse_lists {
+    while (defined $last_nl_count_level && $last_nl_count_level >= 0) {
+        print "\n=back\n\n";
+        $last_nl_count_level--;
+    }
+    undef $last_nl_count_level;
+    undef @nl_counts;
+
+    while (defined $last_bl_count_level && $last_bl_count_level >= 0) {
+        print "\n=back\n\n";
+        $last_bl_count_level--;
+    }
+    undef $last_bl_count_level;
+    undef @bl_counts;
+}
+
diff --git a/modules_deb/libnginx-mod-http-echo-0.63/valgrind.suppress b/modules_deb/libnginx-mod-http-echo-0.63/valgrind.suppress
new file mode 100644
index 0000000..975415e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-echo-0.63/valgrind.suppress
@@ -0,0 +1,53 @@
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_ctl(event)
+   fun:epoll_ctl
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_event_process_init
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:index
+   fun:expand_dynamic_string_token
+   fun:_dl_map_object
+   fun:map_doit
+   fun:_dl_catch_error
+   fun:do_preload
+   fun:dl_main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+   fun:main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+}
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/LICENSE b/modules_deb/libnginx-mod-http-geoip2-3.4/LICENSE
new file mode 100644
index 0000000..fdc13a7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2014, Lee Valentine <lee@leev.net>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/README.md b/modules_deb/libnginx-mod-http-geoip2-3.4/README.md
new file mode 100644
index 0000000..cea0d04
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/README.md
@@ -0,0 +1,153 @@
+Description
+===========
+
+**ngx_http_geoip2_module** - creates variables with values from the maxmind geoip2 databases based on the client IP (default) or from a specific variable (supports both IPv4 and IPv6)
+
+The module now supports nginx streams and can be used in the same way the http module can be used.
+
+## Installing
+First install [libmaxminddb](https://github.com/maxmind/libmaxminddb) as described in its [README.md
+file](https://github.com/maxmind/libmaxminddb/blob/main/README.md#installing-from-a-tarball).
+
+#### Download nginx source
+```
+wget http://nginx.org/download/nginx-VERSION.tar.gz
+tar zxvf nginx-VERSION.tar.gz
+cd nginx-VERSION
+```
+
+##### To build as a dynamic module (nginx 1.9.11+):
+```
+./configure --add-dynamic-module=/path/to/ngx_http_geoip2_module
+make
+make install
+```
+
+This will produce ```objs/ngx_http_geoip2_module.so```. It can be copied to your nginx module path manually if you wish.
+
+Add the following line to your nginx.conf:
+```
+load_module modules/ngx_http_geoip2_module.so;
+```
+
+##### To build as a static module:
+```
+./configure --add-module=/path/to/ngx_http_geoip2_module
+make
+make install
+```
+
+##### If you need stream support, make sure to compile with stream:
+```
+./configure --add-dynamic-module=/path/to/ngx_http_geoip2_module --with-stream
+OR
+./configure --add-module=/path/to/ngx_http_geoip2_module --with-stream
+```
+
+
+## Download Maxmind GeoLite2 Database (optional)
+The free GeoLite2 databases are available from [Maxminds website](http://dev.maxmind.com/geoip/geoip2/geolite2/) (requires signing up)
+
+## Example Usage:
+```
+http {
+    ...
+    geoip2 /etc/maxmind-country.mmdb {
+        auto_reload 5m;
+        $geoip2_metadata_country_build metadata build_epoch;
+        $geoip2_data_country_code default=US source=$variable_with_ip country iso_code;
+        $geoip2_data_country_name country names en;
+    }
+
+    geoip2 /etc/maxmind-city.mmdb {
+        $geoip2_data_city_name default=London city names en;
+    }
+    ....
+
+    fastcgi_param COUNTRY_CODE $geoip2_data_country_code;
+    fastcgi_param COUNTRY_NAME $geoip2_data_country_name;
+    fastcgi_param CITY_NAME    $geoip2_data_city_name;
+    ....
+}
+
+stream {
+    ...
+    geoip2 /etc/maxmind-country.mmdb {
+        $geoip2_data_country_code default=US source=$remote_addr country iso_code;
+    }
+    ...
+}
+```
+
+##### Metadata:
+Retrieve metadata regarding the geoip database.
+```
+$variable_name metadata <field>
+```
+Available fields:
+  - build_epoch: the build timestamp of the maxmind database.
+  - last_check: the last time the database was checked for changes (when using auto_reload)
+  - last_change: the last time the database was reloaded (when using auto_reload)
+
+##### Autoreload (default: disabled):
+Enabling auto reload will have nginx check the modification time of the database at the specified
+interval and reload it if it has changed.
+```
+auto_reload <interval>
+```
+
+##### GeoIP:
+```
+$variable_name [default=<value] [source=$variable_with_ip] path ...
+```
+If default is not specified, the variable will be empty if not found.
+
+If source is not specified, $remote_addr will be used to perform the lookup.
+
+To find the path of the data you want (eg: country names en), use the [mmdblookup tool](https://maxmind.github.io/libmaxminddb/mmdblookup.html):
+
+```
+$ mmdblookup --file /usr/share/GeoIP/GeoIP2-Country.mmdb --ip 8.8.8.8
+
+  {
+    "country":
+      {
+        "geoname_id":
+          6252001 <uint32>
+        "iso_code":
+          "US" <utf8_string>
+        "names":
+          {
+            "de":
+              "USA" <utf8_string>
+            "en":
+              "United States" <utf8_string>
+          }
+      }
+  }
+
+$ mmdblookup --file /usr/share/GeoIP/GeoIP2-Country.mmdb --ip 8.8.8.8 country names en
+
+  "United States" <utf8_string>
+```
+
+This translates to:
+
+```
+$country_name "default=United States" source=$remote_addr country names en
+```
+
+##### Additional Commands:
+These commands works the same as the original ngx_http_geoip_module documented here: http://nginx.org/en/docs/http/ngx_http_geoip_module.html#geoip_proxy.
+
+However, if you provide the `source=$variable_with_ip` option on a variable, these settings will be ignored for that particular variable.
+
+```
+geoip2_proxy < cidr >
+```
+Defines trusted addresses.  When a request comes from a trusted address, an address from the "X-Forwarded-For" request header field will be used instead.
+
+```
+geoip2_proxy_recursive < on | off >
+```
+If recursive search is disabled then instead of the original client address that matches one of the trusted addresses, the last address sent in "X-Forwarded-For" will be used. If recursive search is enabled then instead of the original client address that matches one of the trusted addresses, the last non-trusted address sent in "X-Forwarded-For" will be used.
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/config b/modules_deb/libnginx-mod-http-geoip2-3.4/config
new file mode 100644
index 0000000..48bf15d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/config
@@ -0,0 +1,43 @@
+ngx_feature="MaxmindDB library"
+ngx_feature_name=
+ngx_feature_run=no
+ngx_feature_incs="#include <maxminddb.h>"
+ngx_feature_libs=-lmaxminddb
+ngx_feature_test="MMDB_s mmdb"
+. auto/feature
+
+ngx_addon_name="ngx_geoip2_module"
+
+if [ $ngx_found = yes ]; then
+	if test -n "$ngx_module_link"; then
+		if [ $HTTP != NO ]; then
+			ngx_module_type=HTTP
+			ngx_module_name="ngx_http_geoip2_module"
+			ngx_module_incs=
+			ngx_module_deps=
+			ngx_module_srcs="$ngx_addon_dir/ngx_http_geoip2_module.c"
+			ngx_module_libs="$ngx_feature_libs"
+			. auto/module
+		fi
+
+		nginx_version=`awk '/^#define nginx_version / {print $3}' src/core/nginx.h`
+		if [ $STREAM != NO -a $nginx_version -gt 1011001 ]; then
+			ngx_module_type=STREAM
+			ngx_module_name="ngx_stream_geoip2_module"
+			ngx_module_incs=
+			ngx_module_deps=
+			ngx_module_srcs="$ngx_addon_dir/ngx_stream_geoip2_module.c"
+			ngx_module_libs="$ngx_feature_libs"
+			. auto/module
+		fi
+	else
+		HTTP_MODULES="$HTTP_MODULES ngx_http_geoip2_module"
+		NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_geoip2_module.c"
+		CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+	fi
+else   
+	cat << END
+$0: error: the geoip2 module requires the maxminddb library.
+END
+	exit 1
+fi
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/changelog b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/changelog
new file mode 100644
index 0000000..0c0f22e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/changelog
@@ -0,0 +1,52 @@
+libnginx-mod-http-geoip2 (1:3.4-6) unstable; urgency=medium
+
+  * d/control: update my email to janmojzis@debian.org
+  * d/copyright: update my email to janmojzis@debian.org
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/copyright: bump debian/* copyright year
+  * d/watch: use more generic template
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 11 Apr 2025 14:26:59 +0200
+
+libnginx-mod-http-geoip2 (1:3.4-5) unstable; urgency=medium
+
+  * Better usage of dh-sequence-nginx
+    * d/rules: remove override_dh_auto_configure, override_dh_auto_test
+    * d/control: remove Build-Depends nginx-abi-1.24.0-1
+    * d/control: use Build-Depends libnginx-mod-stream instead of
+      libnginx-mod-stream (<<1.24.0.1~), libnginx-mod-stream (>=1.24.0)
+    * d/control: use Build-Depends nginx-dev (>= 1.24.0-2)
+    * d/control: remove Depends libnginx-mod-stream (<<1.24.0.1~),
+      libnginx-mod-stream (>=1.24.0)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Oct 2023 07:37:12 +0200
+
+libnginx-mod-http-geoip2 (1:3.4-4) unstable; urgency=medium
+
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:16:38 +0200
+
+libnginx-mod-http-geoip2 (1:3.4-3) unstable; urgency=medium
+
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/gbb.conf: switched to debian branch main (debian-branch = main)
+  * d/copyright: bump my copyright year
+  * d/copyright: reformat text to be compatible with 'cme update dpkg-copyright'
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:24 +0100
+
+libnginx-mod-http-geoip2 (1:3.4-2) unstable; urgency=medium
+
+  * d/control: added Multi-Arch: foreign
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 12:50:27 +0100
+
+libnginx-mod-http-geoip2 (1:3.4-1) experimental; urgency=medium
+
+  * Initial release. (Closes: 1024843)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 14:46:51 +0100
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/control b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/control
new file mode 100644
index 0000000..3ccc4e3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/control
@@ -0,0 +1,41 @@
+Source: libnginx-mod-http-geoip2
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jan Mojžíš <janmojzis@debian.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+               libmaxminddb-dev,
+               libnginx-mod-stream,
+               nginx-dev (>= 1.24.0-2),
+Standards-Version: 4.7.2
+Homepage: https://github.com/leev/ngx_http_geoip2_module
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-geoip2.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-geoip2
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-geoip2
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: GeoIP2 HTTP module for Nginx
+ The ngx_http_geoip2 module creates variables with values depending on the
+ client IP address, using the precompiled MaxMind GeoIP2 databases.
+ .
+ Those variables include country, region, city, latitude, longitude, postal
+ code, etc.
+
+Package: libnginx-mod-stream-geoip2
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: GeoIP2 Stream module for Nginx
+ The ngx_stream_geoip2 module creates variables with values depending on the
+ client IP address, using the precompiled MaxMind GeoIP2 databases.
+ .
+ Those variables include country, region, city, latitude, longitude, postal
+ code, etc.
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/copyright b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/copyright
new file mode 100644
index 0000000..ab01158
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/copyright
@@ -0,0 +1,46 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ngx_http_geoip2_module
+Upstream-Contact: Lee Valentine <lee@leev.net>
+Source: https://github.com/leev/ngx_http_geoip2_module
+
+Files: *
+Copyright: 2014, Lee Valentine <lee@leev.net>
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022, Miao Wang <shankerwangmiao@gmail.com>
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-2-clause
+
+Files: ngx_http_geoip2_module.c
+Copyright: Lee Valentine <lee@leev.net>
+License: BSD-2-clause
+
+Files: ngx_stream_geoip2_module.c
+Copyright: Lee Valentine <lee@leev.net>
+ Andrei Belov <defanator@gmail.com>
+License: BSD-2-clause
+
+License: BSD-2-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright notice, this
+   list of conditions and the following disclaimer in the documentation and/or
+   other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/gbp.conf b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/gbp.conf
new file mode 100644
index 0000000..38c12c1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-http-geoip2.install b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-http-geoip2.install
new file mode 100644
index 0000000..2692817
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-http-geoip2.install
@@ -0,0 +1 @@
+/usr/lib/nginx/modules/ngx_http_geoip2_module.so
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-stream-geoip2.install b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-stream-geoip2.install
new file mode 100644
index 0000000..9f45e96
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/libnginx-mod-stream-geoip2.install
@@ -0,0 +1 @@
+/usr/lib/nginx/modules/ngx_stream_geoip2_module.so
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/rules b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/source/format b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/control b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/control
new file mode 100644
index 0000000..ca20b9f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/control
@@ -0,0 +1,6 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/generic b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/upstream/metadata b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/upstream/metadata
new file mode 100644
index 0000000..5f50585
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/leev/ngx_http_geoip2_module/issues
+Bug-Submit: https://github.com/leev/ngx_http_geoip2_module/issues/new
+Repository-Browse: https://github.com/leev/ngx_http_geoip2_module
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/debian/watch b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/watch
new file mode 100644
index 0000000..04e3a51
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/debian/watch
@@ -0,0 +1,6 @@
+version=4
+opts="\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/leev/ngx_http_geoip2_module/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/ngx_http_geoip2_module.c b/modules_deb/libnginx-mod-http-geoip2-3.4/ngx_http_geoip2_module.c
new file mode 100644
index 0000000..4b3461c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/ngx_http_geoip2_module.c
@@ -0,0 +1,803 @@
+/*
+ * Copyright (C) Lee Valentine <lee@leev.net>
+ *
+ * Based on nginx's 'ngx_http_geoip_module.c' by Igor Sysoev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+#include <maxminddb.h>
+
+
+typedef struct {
+    MMDB_s                   mmdb;
+    MMDB_lookup_result_s     result;
+    time_t                   last_check;
+    time_t                   last_change;
+    time_t                   check_interval;
+#if (NGX_HAVE_INET6)
+    uint8_t                  address[16];
+#else
+    unsigned long            address;
+#endif
+    ngx_queue_t              queue;
+} ngx_http_geoip2_db_t;
+
+typedef struct {
+    ngx_queue_t              databases;
+    ngx_array_t              *proxies;
+    ngx_flag_t               proxy_recursive;
+} ngx_http_geoip2_conf_t;
+
+typedef struct {
+    ngx_http_geoip2_db_t     *database;
+    const char               **lookup;
+    ngx_str_t                default_value;
+    ngx_http_complex_value_t source;
+} ngx_http_geoip2_ctx_t;
+
+typedef struct {
+    ngx_http_geoip2_db_t     *database;
+    ngx_str_t                metavalue;
+} ngx_http_geoip2_metadata_t;
+
+
+static ngx_int_t ngx_http_geoip2_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_geoip2_metadata(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+static void *ngx_http_geoip2_create_conf(ngx_conf_t *cf);
+static char *ngx_http_geoip2_init_conf(ngx_conf_t *cf, void *conf);
+static char *ngx_http_geoip2(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_http_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy,
+    void *conf);
+static char *ngx_http_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy,
+    void *conf);
+static char *ngx_http_geoip2_add_variable_geodata(ngx_conf_t *cf,
+    ngx_http_geoip2_db_t *database);
+static char *ngx_http_geoip2_add_variable_metadata(ngx_conf_t *cf,
+    ngx_http_geoip2_db_t *database);
+static char *ngx_http_geoip2_proxy(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static ngx_int_t ngx_http_geoip2_cidr_value(ngx_conf_t *cf, ngx_str_t *net,
+    ngx_cidr_t *cidr);
+static void ngx_http_geoip2_cleanup(void *data);
+static ngx_int_t ngx_http_geoip2_init(ngx_conf_t *cf);
+
+
+#define FORMAT(fmt, ...) do {                           \
+        p = ngx_palloc(r->pool, NGX_OFF_T_LEN);         \
+        if (p == NULL) {                                \
+            return NGX_ERROR;                           \
+        }                                               \
+        v->len = ngx_sprintf(p, fmt, __VA_ARGS__) - p;  \
+        v->data = p;                                    \
+} while (0)
+
+static ngx_command_t  ngx_http_geoip2_commands[] = {
+
+    { ngx_string("geoip2"),
+        NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
+        ngx_http_geoip2,
+        NGX_HTTP_MAIN_CONF_OFFSET,
+        0,
+        NULL },
+
+    { ngx_string("geoip2_proxy"),
+        NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+        ngx_http_geoip2_proxy,
+        NGX_HTTP_MAIN_CONF_OFFSET,
+        0,
+        NULL },
+
+    { ngx_string("geoip2_proxy_recursive"),
+        NGX_HTTP_MAIN_CONF|NGX_CONF_FLAG,
+        ngx_conf_set_flag_slot,
+        NGX_HTTP_MAIN_CONF_OFFSET,
+        offsetof(ngx_http_geoip2_conf_t, proxy_recursive),
+        NULL },
+
+    ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_geoip2_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_http_geoip2_init,                  /* postconfiguration */
+
+    ngx_http_geoip2_create_conf,           /* create main configuration */
+    ngx_http_geoip2_init_conf,             /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    NULL,                                  /* create location configuration */
+    NULL                                   /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_geoip2_module = {
+    NGX_MODULE_V1,
+    &ngx_http_geoip2_module_ctx,           /* module context */
+    ngx_http_geoip2_commands,              /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_http_geoip2_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
+    uintptr_t data)
+{
+    ngx_http_geoip2_ctx_t   *geoip2 = (ngx_http_geoip2_ctx_t *) data;
+    ngx_http_geoip2_db_t    *database = geoip2->database;
+    int                     mmdb_error;
+    MMDB_entry_data_s       entry_data;
+    ngx_http_geoip2_conf_t  *gcf;
+    ngx_addr_t              addr;
+#if defined(nginx_version) && nginx_version >= 1023000
+    ngx_table_elt_t         *xfwd;
+#else
+    ngx_array_t             *xfwd;
+#endif
+    u_char                  *p;
+    ngx_str_t               val;
+
+#if (NGX_HAVE_INET6)
+    uint8_t address[16], *addressp = address;
+#else
+    unsigned long address;
+#endif
+
+    if (geoip2->source.value.len > 0) {
+         if (ngx_http_complex_value(r, &geoip2->source, &val) != NGX_OK) {
+             goto not_found;
+         }
+
+        if (ngx_parse_addr(r->pool, &addr, val.data, val.len) != NGX_OK) {
+            goto not_found;
+        }
+    } else {
+        gcf = ngx_http_get_module_main_conf(r, ngx_http_geoip2_module);
+        addr.sockaddr = r->connection->sockaddr;
+        addr.socklen = r->connection->socklen;
+
+#if defined(nginx_version) && nginx_version >= 1023000
+        xfwd = r->headers_in.x_forwarded_for;
+
+        if (xfwd != NULL && gcf->proxies != NULL) {
+#else
+        xfwd = &r->headers_in.x_forwarded_for;
+
+        if (xfwd->nelts > 0 && gcf->proxies != NULL) {
+#endif
+            (void) ngx_http_get_forwarded_addr(r, &addr, xfwd, NULL,
+                                               gcf->proxies, gcf->proxy_recursive);
+        }
+    }
+
+    switch (addr.sockaddr->sa_family) {
+        case AF_INET:
+#if (NGX_HAVE_INET6)
+            ngx_memset(addressp, 0, 12);
+            ngx_memcpy(addressp + 12, &((struct sockaddr_in *)
+                                        addr.sockaddr)->sin_addr.s_addr, 4);
+            break;
+
+        case AF_INET6:
+            ngx_memcpy(addressp, &((struct sockaddr_in6 *)
+                                   addr.sockaddr)->sin6_addr.s6_addr, 16);
+#else
+            address = ((struct sockaddr_in *)addr.sockaddr)->sin_addr.s_addr;
+#endif
+            break;
+
+        default:
+            goto not_found;
+    }
+
+#if (NGX_HAVE_INET6)
+    if (ngx_memcmp(&address, &database->address, sizeof(address))
+        != 0) {
+#else
+    if (address != database->address) {
+#endif
+        memcpy(&database->address, &address, sizeof(address));
+        database->result = MMDB_lookup_sockaddr(&database->mmdb,
+                                           addr.sockaddr, &mmdb_error);
+
+        if (mmdb_error != MMDB_SUCCESS) {
+            goto not_found;
+        }
+    }
+
+    if (!database->result.found_entry
+            || MMDB_aget_value(&database->result.entry, &entry_data,
+                               geoip2->lookup) != MMDB_SUCCESS) {
+        goto not_found;
+    }
+
+    if (!entry_data.has_data) {
+        goto not_found;
+    }
+
+    switch (entry_data.type) {
+        case MMDB_DATA_TYPE_BOOLEAN:
+            FORMAT("%d", entry_data.boolean);
+            break;
+        case MMDB_DATA_TYPE_UTF8_STRING:
+            v->len = entry_data.data_size;
+            v->data = ngx_pnalloc(r->pool, v->len);
+            if (v->data == NULL) {
+                return NGX_ERROR;
+            }
+            ngx_memcpy(v->data, (u_char *) entry_data.utf8_string, v->len);
+            break;
+        case MMDB_DATA_TYPE_BYTES:
+            v->len = entry_data.data_size;
+            v->data = ngx_pnalloc(r->pool, v->len);
+            if (v->data == NULL) {
+                return NGX_ERROR;
+            }
+            ngx_memcpy(v->data, (u_char *) entry_data.bytes, v->len);
+            break;
+        case MMDB_DATA_TYPE_FLOAT:
+            FORMAT("%.5f", entry_data.float_value);
+            break;
+        case MMDB_DATA_TYPE_DOUBLE:
+            FORMAT("%.5f", entry_data.double_value);
+            break;
+        case MMDB_DATA_TYPE_UINT16:
+            FORMAT("%uD", entry_data.uint16);
+            break;
+        case MMDB_DATA_TYPE_UINT32:
+            FORMAT("%uD", entry_data.uint32);
+            break;
+        case MMDB_DATA_TYPE_INT32:
+            FORMAT("%D", entry_data.int32);
+            break;
+        case MMDB_DATA_TYPE_UINT64:
+            FORMAT("%uL", entry_data.uint64);
+            break;
+        case MMDB_DATA_TYPE_UINT128: ;
+#if MMDB_UINT128_IS_BYTE_ARRAY
+            uint8_t *val = (uint8_t *)entry_data.uint128;
+            FORMAT( "0x%02x%02x%02x%02x%02x%02x%02x%02x"
+                      "%02x%02x%02x%02x%02x%02x%02x%02x",
+                    val[0], val[1], val[2], val[3],
+                    val[4], val[5], val[6], val[7],
+                    val[8], val[9], val[10], val[11],
+                    val[12], val[13], val[14], val[15]);
+#else
+            mmdb_uint128_t val = entry_data.uint128;
+            FORMAT("0x%016uxL%016uxL",
+                    (uint64_t) (val >> 64), (uint64_t) val);
+#endif
+            break;
+        default:
+            goto not_found;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+
+not_found:
+    if (geoip2->default_value.len > 0) {
+        v->data = geoip2->default_value.data;
+        v->len = geoip2->default_value.len;
+
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+    } else {
+        v->not_found = 1;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_geoip2_metadata(ngx_http_request_t *r, ngx_http_variable_value_t *v,
+    uintptr_t data)
+{
+    ngx_http_geoip2_metadata_t  *metadata = (ngx_http_geoip2_metadata_t *) data;
+    ngx_http_geoip2_db_t        *database = metadata->database;
+    u_char                      *p;
+
+    if (ngx_strncmp(metadata->metavalue.data, "build_epoch", 11) == 0) {
+        FORMAT("%uL", database->mmdb.metadata.build_epoch);
+    } else if (ngx_strncmp(metadata->metavalue.data, "last_check", 10) == 0) {
+        FORMAT("%T", database->last_check);
+    } else if (ngx_strncmp(metadata->metavalue.data, "last_change", 11) == 0) {
+        FORMAT("%T", database->last_change);
+    } else {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_http_geoip2_create_conf(ngx_conf_t *cf)
+{
+    ngx_pool_cleanup_t      *cln;
+    ngx_http_geoip2_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->proxy_recursive = NGX_CONF_UNSET;
+
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NULL;
+    }
+
+    ngx_queue_init(&conf->databases);
+
+    cln->handler = ngx_http_geoip2_cleanup;
+    cln->data = conf;
+
+    return conf;
+}
+
+
+static char *
+ngx_http_geoip2(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_geoip2_conf_t  *gcf = conf;
+    ngx_str_t               *value;
+    int                     status;
+    ngx_http_geoip2_db_t    *database;
+    char                    *rv;
+    ngx_conf_t              save;
+    ngx_queue_t             *q;
+
+    value = cf->args->elts;
+
+    if (value[1].data && value[1].data[0] != '/') {
+        if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (!ngx_queue_empty(&gcf->databases)) {
+        for (q = ngx_queue_head(&gcf->databases);
+             q != ngx_queue_sentinel(&gcf->databases);
+             q = ngx_queue_next(q))
+        {
+            database = ngx_queue_data(q, ngx_http_geoip2_db_t, queue);
+            if (ngx_strcmp(value[1].data, database->mmdb.filename) == 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "Duplicate GeoIP2 mmdb - %V", &value[1]);
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+    database = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_db_t));
+    if (database == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_queue_insert_tail(&gcf->databases, &database->queue);
+    database->last_check = database->last_change = ngx_time();
+
+    status = MMDB_open((char *) value[1].data, MMDB_MODE_MMAP, &database->mmdb);
+
+    if (status != MMDB_SUCCESS) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "MMDB_open(\"%V\") failed - %s", &value[1],
+                           MMDB_strerror(status));
+        return NGX_CONF_ERROR;
+    }
+
+    save = *cf;
+    cf->handler = ngx_http_geoip2_parse_config;
+    cf->handler_conf = (void *) database;
+
+    rv = ngx_conf_parse(cf, NULL);
+    *cf = save;
+    return rv;
+}
+
+
+static char *
+ngx_http_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    ngx_http_geoip2_db_t  *database;
+    ngx_str_t             *value;
+    time_t                interval;
+
+    value = cf->args->elts;
+
+    if (value[0].data[0] == '$') {
+        return ngx_http_geoip2_add_variable(cf, dummy, conf);
+    }
+
+    if (value[0].len == 11
+            && ngx_strncmp(value[0].data, "auto_reload", 11) == 0) {
+        if ((int) cf->args->nelts != 2) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid number of arguments for auto_reload");
+            return NGX_CONF_ERROR;
+        }
+
+        interval = ngx_parse_time(&value[1], true);
+
+        if (interval == (time_t) NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid interval for auto_reload \"%V\"",
+                               value[1]);
+            return NGX_CONF_ERROR;
+        }
+
+
+        database = (ngx_http_geoip2_db_t *) conf;
+        database->check_interval = interval;
+        return NGX_CONF_OK;
+    }
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "invalid setting \"%V\"", &value[0]);
+    return NGX_CONF_ERROR;
+}
+
+
+static char *
+ngx_http_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    ngx_http_geoip2_db_t  *database;
+    ngx_str_t             *value;
+    int                   nelts;
+
+    value = cf->args->elts;
+
+    if (value[0].data[0] != '$') {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"%V\"", &value[0]);
+        return NGX_CONF_ERROR;
+    }
+
+    value[0].len--;
+    value[0].data++;
+
+    nelts = (int) cf->args->nelts;
+    database = (ngx_http_geoip2_db_t *) conf;
+
+    if (nelts > 0 && value[1].len == 8 && ngx_strncmp(value[1].data, "metadata", 8) == 0) {
+        return ngx_http_geoip2_add_variable_metadata(cf, database);
+    }
+
+    return ngx_http_geoip2_add_variable_geodata(cf, database);
+}
+
+
+static char *
+ngx_http_geoip2_add_variable_metadata(ngx_conf_t *cf, ngx_http_geoip2_db_t *database)
+{
+    ngx_http_geoip2_metadata_t  *metadata;
+    ngx_str_t                   *value, name;
+    ngx_http_variable_t         *var;
+
+    metadata = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_metadata_t));
+    if (metadata == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+    name = value[0];
+
+    metadata->database = database;
+    metadata->metavalue = value[2];
+
+    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    var->get_handler = ngx_http_geoip2_metadata;
+    var->data = (uintptr_t) metadata;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_geoip2_add_variable_geodata(ngx_conf_t *cf, ngx_http_geoip2_db_t *database)
+{
+    ngx_http_geoip2_ctx_t             *geoip2;
+    ngx_http_compile_complex_value_t  ccv;
+    ngx_str_t                         *value, name, source;
+    ngx_http_variable_t               *var;
+    int                               i, nelts, idx;
+
+    geoip2 = ngx_pcalloc(cf->pool, sizeof(ngx_http_geoip2_ctx_t));
+    if (geoip2 == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    geoip2->database = database;
+    ngx_str_null(&source);
+
+    value = cf->args->elts;
+    name = value[0];
+
+    nelts = (int) cf->args->nelts;
+    idx = 1;
+
+    if (nelts > idx) {
+        for (i = idx; i < nelts; i++) {
+            if (ngx_strnstr(value[idx].data, "=", value[idx].len) == NULL) {
+                break;
+            }
+
+            if (value[idx].len > 8 && ngx_strncmp(value[idx].data, "default=", 8) == 0) {
+                if (geoip2->default_value.len > 0) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "default has already been declared for  \"$%V\"", &name);
+                    return NGX_CONF_ERROR;
+                }
+
+                geoip2->default_value.len  = value[idx].len - 8;
+                geoip2->default_value.data = value[idx].data + 8;
+            } else if (value[idx].len > 7 && ngx_strncmp(value[idx].data, "source=", 7) == 0) {
+                if (source.len > 0) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "source has already been declared for  \"$%V\"", &name);
+                    return NGX_CONF_ERROR;
+                }
+
+                source.len  = value[idx].len - 7;
+                source.data = value[idx].data + 7;
+
+                if (source.data[0] != '$') {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "invalid source variable name \"%V\"", &source);
+                    return NGX_CONF_ERROR;
+                }
+
+                ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+                ccv.cf = cf;
+                ccv.value = &source;
+                ccv.complex_value = &geoip2->source;
+
+                if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "unable to compile \"%V\" for \"$%V\"", &source, &name);
+                    return NGX_CONF_ERROR;
+                }
+            } else {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "invalid setting \"%V\" for \"$%V\"", &value[idx], &name);
+                    return NGX_CONF_ERROR;
+            }
+
+            idx++;
+        }
+    }
+
+    var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    geoip2->lookup = ngx_pcalloc(cf->pool, sizeof(const char *) *
+                                 (cf->args->nelts - (idx - 1)));
+
+    if (geoip2->lookup == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    for (i = idx; i < nelts; i++) {
+        geoip2->lookup[i - idx] = (char *) value[i].data;
+    }
+    geoip2->lookup[i - idx] = NULL;
+
+    var->get_handler = ngx_http_geoip2_variable;
+    var->data = (uintptr_t) geoip2;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_geoip2_init_conf(ngx_conf_t *cf, void *conf)
+{
+    ngx_http_geoip2_conf_t  *gcf = conf;
+    ngx_conf_init_value(gcf->proxy_recursive, 0);
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_geoip2_proxy(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_geoip2_conf_t  *gcf = conf;
+    ngx_str_t               *value;
+    ngx_cidr_t              cidr, *c;
+
+    value = cf->args->elts;
+
+    if (ngx_http_geoip2_cidr_value(cf, &value[1], &cidr) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (gcf->proxies == NULL) {
+        gcf->proxies = ngx_array_create(cf->pool, 4, sizeof(ngx_cidr_t));
+        if (gcf->proxies == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    c = ngx_array_push(gcf->proxies);
+    if (c == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    *c = cidr;
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_geoip2_cidr_value(ngx_conf_t *cf, ngx_str_t *net, ngx_cidr_t *cidr)
+{
+    ngx_int_t  rc;
+
+    if (ngx_strcmp(net->data, "255.255.255.255") == 0) {
+        cidr->family = AF_INET;
+        cidr->u.in.addr = 0xffffffff;
+        cidr->u.in.mask = 0xffffffff;
+
+        return NGX_OK;
+    }
+
+    rc = ngx_ptocidr(net, cidr);
+
+    if (rc == NGX_ERROR) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid network \"%V\"", net);
+        return NGX_ERROR;
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                           "low address bits of %V are meaningless", net);
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_geoip2_cleanup(void *data)
+{
+    ngx_http_geoip2_conf_t  *gcf = data;
+    ngx_queue_t             *q;
+    ngx_http_geoip2_db_t    *database;
+
+    while (!ngx_queue_empty(&gcf->databases)) {
+        q = ngx_queue_head(&gcf->databases);
+        ngx_queue_remove(q);
+        database = ngx_queue_data(q, ngx_http_geoip2_db_t, queue);
+        MMDB_close(&database->mmdb);
+    }
+}
+
+
+static ngx_int_t
+ngx_http_geoip2_log_handler(ngx_http_request_t *r)
+{
+    int                      status;
+    MMDB_s                   tmpdb;
+    ngx_queue_t              *q;
+    ngx_file_info_t          fi;
+    ngx_http_geoip2_db_t    *database;
+    ngx_http_geoip2_conf_t  *gcf;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "geoip2 http log handler");
+
+    gcf = ngx_http_get_module_main_conf(r, ngx_http_geoip2_module);
+
+    if (ngx_queue_empty(&gcf->databases)) {
+        return NGX_OK;
+    }
+
+    for (q = ngx_queue_head(&gcf->databases);
+         q != ngx_queue_sentinel(&gcf->databases);
+         q = ngx_queue_next(q))
+    {
+        database = ngx_queue_data(q, ngx_http_geoip2_db_t, queue);
+        if (database->check_interval == 0) {
+            continue;
+        }
+
+        if ((database->last_check + database->check_interval)
+            > ngx_time())
+        {
+            continue;
+        }
+
+        database->last_check = ngx_time();
+
+        if (ngx_file_info(database->mmdb.filename, &fi) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_EMERG, r->connection->log, ngx_errno,
+                          ngx_file_info_n " \"%s\" failed",
+                          database->mmdb.filename);
+
+            continue;
+        }
+
+        if (ngx_file_mtime(&fi) <= database->last_change) {
+            continue;
+        }
+
+        /* do the reload */
+
+        ngx_memzero(&tmpdb, sizeof(MMDB_s));
+        status = MMDB_open(database->mmdb.filename, MMDB_MODE_MMAP, &tmpdb);
+
+        if (status != MMDB_SUCCESS) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "MMDB_open(\"%s\") failed to reload - %s",
+                          database->mmdb.filename, MMDB_strerror(status));
+
+            continue;
+        }
+
+        database->last_change = ngx_file_mtime(&fi);
+        MMDB_close(&database->mmdb);
+        database->mmdb = tmpdb;
+
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "Reload MMDB \"%s\"",
+                      database->mmdb.filename);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_geoip2_init(ngx_conf_t *cf)
+{
+    ngx_http_handler_pt        *h;
+    ngx_http_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_HTTP_LOG_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_http_geoip2_log_handler;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-geoip2-3.4/ngx_stream_geoip2_module.c b/modules_deb/libnginx-mod-http-geoip2-3.4/ngx_stream_geoip2_module.c
new file mode 100644
index 0000000..eb59082
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-geoip2-3.4/ngx_stream_geoip2_module.c
@@ -0,0 +1,694 @@
+/*
+ * Copyright (C) Lee Valentine <lee@leev.net>
+ * Copyright (C) Andrei Belov <defanator@gmail.com>
+ *
+ * Based on nginx's 'ngx_stream_geoip_module.c' by Igor Sysoev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_stream.h>
+
+#include <maxminddb.h>
+
+
+typedef struct {
+    MMDB_s                   mmdb;
+    MMDB_lookup_result_s     result;
+    time_t                   last_check;
+    time_t                   last_change;
+    time_t                   check_interval;
+#if (NGX_HAVE_INET6)
+    uint8_t                  address[16];
+#else
+    unsigned long            address;
+#endif
+    ngx_queue_t              queue;
+} ngx_stream_geoip2_db_t;
+
+typedef struct {
+    ngx_queue_t              databases;
+} ngx_stream_geoip2_conf_t;
+
+typedef struct {
+    ngx_stream_geoip2_db_t   *database;
+    const char               **lookup;
+    ngx_str_t                default_value;
+    ngx_stream_complex_value_t source;
+} ngx_stream_geoip2_ctx_t;
+
+typedef struct {
+    ngx_stream_geoip2_db_t   *database;
+    ngx_str_t                metavalue;
+} ngx_stream_geoip2_metadata_t;
+
+
+static ngx_int_t ngx_stream_geoip2_variable(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_stream_geoip2_metadata(ngx_stream_session_t *s,
+    ngx_stream_variable_value_t *v, uintptr_t data);
+static void *ngx_stream_geoip2_create_conf(ngx_conf_t *cf);
+static char *ngx_stream_geoip2(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy,
+    void *conf);
+static char *ngx_stream_geoip2(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_stream_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy,
+    void *conf);
+static char *ngx_stream_geoip2_add_variable_geodata(ngx_conf_t *cf,
+    ngx_stream_geoip2_db_t *database);
+static char *ngx_stream_geoip2_add_variable_metadata(ngx_conf_t *cf,
+    ngx_stream_geoip2_db_t *database);
+static void ngx_stream_geoip2_cleanup(void *data);
+static ngx_int_t ngx_stream_geoip2_init(ngx_conf_t *cf);
+
+
+#define FORMAT(fmt, ...) do {                               \
+        p = ngx_palloc(s->connection->pool, NGX_OFF_T_LEN); \
+        if (p == NULL) {                                    \
+            return NGX_ERROR;                               \
+        }                                                   \
+        v->len = ngx_sprintf(p, fmt, __VA_ARGS__) - p;      \
+        v->data = p;                                        \
+} while (0)
+
+static ngx_command_t  ngx_stream_geoip2_commands[] = {
+
+    { ngx_string("geoip2"),
+        NGX_STREAM_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1,
+        ngx_stream_geoip2,
+        NGX_STREAM_MAIN_CONF_OFFSET,
+        0,
+        NULL },
+
+    ngx_null_command
+};
+
+
+static ngx_stream_module_t  ngx_stream_geoip2_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_stream_geoip2_init,                /* postconfiguration */
+
+    ngx_stream_geoip2_create_conf,         /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL                                   /* merge server configuration */
+};
+
+
+ngx_module_t  ngx_stream_geoip2_module = {
+    NGX_MODULE_V1,
+    &ngx_stream_geoip2_module_ctx,         /* module context */
+    ngx_stream_geoip2_commands,            /* module directives */
+    NGX_STREAM_MODULE,                     /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_int_t
+ngx_stream_geoip2_variable(ngx_stream_session_t *s, ngx_stream_variable_value_t *v,
+    uintptr_t data)
+{
+    int                       mmdb_error;
+    u_char                   *p;
+    ngx_str_t                 val;
+    ngx_addr_t                addr;
+    MMDB_entry_data_s         entry_data;
+    ngx_stream_geoip2_ctx_t  *geoip2 = (ngx_stream_geoip2_ctx_t *) data;
+    ngx_stream_geoip2_db_t   *database = geoip2->database;
+
+#if (NGX_HAVE_INET6)
+    uint8_t address[16], *addressp = address;
+#else
+    unsigned long address;
+#endif
+
+    if (geoip2->source.value.len > 0) {
+         if (ngx_stream_complex_value(s, &geoip2->source, &val) != NGX_OK) {
+             goto not_found;
+         }
+
+        if (ngx_parse_addr(s->connection->pool, &addr, val.data, val.len) != NGX_OK) {
+            goto not_found;
+        }
+    } else {
+        addr.sockaddr = s->connection->sockaddr;
+        addr.socklen = s->connection->socklen;
+    }
+
+    switch (addr.sockaddr->sa_family) {
+        case AF_INET:
+#if (NGX_HAVE_INET6)
+            ngx_memset(addressp, 0, 12);
+            ngx_memcpy(addressp + 12, &((struct sockaddr_in *)
+                                        addr.sockaddr)->sin_addr.s_addr, 4);
+            break;
+
+        case AF_INET6:
+            ngx_memcpy(addressp, &((struct sockaddr_in6 *)
+                                   addr.sockaddr)->sin6_addr.s6_addr, 16);
+#else
+            address = ((struct sockaddr_in *)addr.sockaddr)->sin_addr.s_addr;
+#endif
+            break;
+
+        default:
+            goto not_found;
+    }
+
+#if (NGX_HAVE_INET6)
+    if (ngx_memcmp(&address, &database->address, sizeof(address)) != 0) {
+#else
+    if (address != database->address) {
+#endif
+        memcpy(&database->address, &address, sizeof(address));
+        database->result = MMDB_lookup_sockaddr(&database->mmdb,
+                                                addr.sockaddr, &mmdb_error);
+
+        if (mmdb_error != MMDB_SUCCESS) {
+            goto not_found;
+        }
+    }
+
+    if (!database->result.found_entry
+        || MMDB_aget_value(&database->result.entry, &entry_data, geoip2->lookup)
+        != MMDB_SUCCESS)
+    {
+        goto not_found;
+    }
+
+    if (!entry_data.has_data) {
+        goto not_found;
+    }
+
+    switch (entry_data.type) {
+        case MMDB_DATA_TYPE_BOOLEAN:
+            FORMAT("%d", entry_data.boolean);
+            break;
+        case MMDB_DATA_TYPE_UTF8_STRING:
+            v->len = entry_data.data_size;
+            v->data = ngx_pnalloc(s->connection->pool, v->len);
+            if (v->data == NULL) {
+                return NGX_ERROR;
+            }
+            ngx_memcpy(v->data, (u_char *) entry_data.utf8_string, v->len);
+            break;
+        case MMDB_DATA_TYPE_BYTES:
+            v->len = entry_data.data_size;
+            v->data = ngx_pnalloc(s->connection->pool, v->len);
+            if (v->data == NULL) {
+                return NGX_ERROR;
+            }
+            ngx_memcpy(v->data, (u_char *) entry_data.bytes, v->len);
+            break;
+        case MMDB_DATA_TYPE_FLOAT:
+            FORMAT("%.5f", entry_data.float_value);
+            break;
+        case MMDB_DATA_TYPE_DOUBLE:
+            FORMAT("%.5f", entry_data.double_value);
+            break;
+        case MMDB_DATA_TYPE_UINT16:
+            FORMAT("%uD", entry_data.uint16);
+            break;
+        case MMDB_DATA_TYPE_UINT32:
+            FORMAT("%uD", entry_data.uint32);
+            break;
+        case MMDB_DATA_TYPE_INT32:
+            FORMAT("%D", entry_data.int32);
+            break;
+        case MMDB_DATA_TYPE_UINT64:
+            FORMAT("%uL", entry_data.uint64);
+            break;
+        case MMDB_DATA_TYPE_UINT128: ;
+#if MMDB_UINT128_IS_BYTE_ARRAY
+            uint8_t *val = (uint8_t *) entry_data.uint128;
+            FORMAT("0x%02x%02x%02x%02x%02x%02x%02x%02x"
+                   "%02x%02x%02x%02x%02x%02x%02x%02x",
+                   val[0], val[1], val[2], val[3],
+                   val[4], val[5], val[6], val[7],
+                   val[8], val[9], val[10], val[11],
+                   val[12], val[13], val[14], val[15]);
+#else
+            mmdb_uint128_t val = entry_data.uint128;
+            FORMAT("0x%016uxL%016uxL",
+                   (uint64_t) (val >> 64), (uint64_t) val);
+#endif
+            break;
+        default:
+            goto not_found;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+
+not_found:
+    if (geoip2->default_value.len > 0) {
+        v->data = geoip2->default_value.data;
+        v->len = geoip2->default_value.len;
+
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+
+        return NGX_OK;
+    }
+
+    v->not_found = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip2_metadata(ngx_stream_session_t *s, ngx_stream_variable_value_t *v,
+    uintptr_t data)
+{
+    ngx_stream_geoip2_metadata_t  *metadata = (ngx_stream_geoip2_metadata_t *) data;
+    ngx_stream_geoip2_db_t        *database = metadata->database;
+    u_char                        *p;
+
+    if (ngx_strncmp(metadata->metavalue.data, "build_epoch", 11) == 0) {
+        FORMAT("%uL", database->mmdb.metadata.build_epoch);
+    } else if (ngx_strncmp(metadata->metavalue.data, "last_check", 10) == 0) {
+        FORMAT("%T", database->last_check);
+    } else if (ngx_strncmp(metadata->metavalue.data, "last_change", 11) == 0) {
+        FORMAT("%T", database->last_change);
+    } else {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_stream_geoip2_create_conf(ngx_conf_t *cf)
+{
+    ngx_pool_cleanup_t        *cln;
+    ngx_stream_geoip2_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    cln = ngx_pool_cleanup_add(cf->pool, 0);
+    if (cln == NULL) {
+        return NULL;
+    }
+
+    ngx_queue_init(&conf->databases);
+
+    cln->handler = ngx_stream_geoip2_cleanup;
+    cln->data = conf;
+
+    return conf;
+}
+
+
+static char *
+ngx_stream_geoip2(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    int                       status;
+    char                      *rv;
+    ngx_str_t                 *value;
+    ngx_conf_t                save;
+    ngx_stream_geoip2_db_t    *database;
+    ngx_stream_geoip2_conf_t  *gcf = conf;
+    ngx_queue_t               *q;
+
+    value = cf->args->elts;
+
+    if (value[1].data && value[1].data[0] != '/') {
+        if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (!ngx_queue_empty(&gcf->databases)) {
+        for (q = ngx_queue_head(&gcf->databases);
+             q != ngx_queue_sentinel(&gcf->databases);
+             q = ngx_queue_next(q))
+        {
+            database = ngx_queue_data(q, ngx_stream_geoip2_db_t, queue);
+            if (ngx_strcmp(value[1].data, database->mmdb.filename) == 0) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "Duplicate GeoIP2 mmdb - %V", &value[1]);
+                return NGX_CONF_ERROR;
+            }
+        }
+    }
+
+    database = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_db_t));
+    if (database == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_queue_insert_tail(&gcf->databases, &database->queue);
+    database->last_check = database->last_change = ngx_time();
+
+    status = MMDB_open((char *) value[1].data, MMDB_MODE_MMAP, &database->mmdb);
+
+    if (status != MMDB_SUCCESS) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "MMDB_open(\"%V\") failed - %s", &value[1],
+                           MMDB_strerror(status));
+        return NGX_CONF_ERROR;
+    }
+
+    save = *cf;
+    cf->handler = ngx_stream_geoip2_parse_config;
+    cf->handler_conf = (void *) database;
+
+    rv = ngx_conf_parse(cf, NULL);
+    *cf = save;
+    return rv;
+}
+
+
+static char *
+ngx_stream_geoip2_parse_config(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    ngx_stream_geoip2_db_t  *database;
+    ngx_str_t             *value;
+    time_t                interval;
+
+    value = cf->args->elts;
+
+    if (value[0].data[0] == '$') {
+        return ngx_stream_geoip2_add_variable(cf, dummy, conf);
+    }
+
+    if (value[0].len == 11
+            && ngx_strncmp(value[0].data, "auto_reload", 11) == 0) {
+        if ((int) cf->args->nelts != 2) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid number of arguments for auto_reload");
+            return NGX_CONF_ERROR;
+        }
+
+        interval = ngx_parse_time(&value[1], true);
+
+        if (interval == (time_t) NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "invalid interval for auto_reload \"%V\"",
+                               value[1]);
+            return NGX_CONF_ERROR;
+        }
+
+
+        database = (ngx_stream_geoip2_db_t *) conf;
+        database->check_interval = interval;
+        return NGX_CONF_OK;
+    }
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "invalid setting \"%V\"", &value[0]);
+    return NGX_CONF_ERROR;
+}
+
+
+static char *
+ngx_stream_geoip2_add_variable(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
+{
+    ngx_stream_geoip2_db_t  *database;
+    ngx_str_t               *value;
+    int                     nelts;
+
+    value = cf->args->elts;
+
+    if (value[0].data[0] != '$') {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"%V\"", &value[0]);
+        return NGX_CONF_ERROR;
+    }
+
+    value[0].len--;
+    value[0].data++;
+
+    nelts = (int) cf->args->nelts;
+    database = (ngx_stream_geoip2_db_t *) conf;
+
+    if (nelts > 0 && value[1].len == 8 && ngx_strncmp(value[1].data, "metadata", 8) == 0) {
+        return ngx_stream_geoip2_add_variable_metadata(cf, database);
+    }
+
+    return ngx_stream_geoip2_add_variable_geodata(cf, database);
+}
+
+
+static char *
+ngx_stream_geoip2_add_variable_metadata(ngx_conf_t *cf, ngx_stream_geoip2_db_t *database)
+{
+    ngx_stream_geoip2_metadata_t  *metadata;
+    ngx_str_t                     *value, name;
+    ngx_stream_variable_t         *var;
+
+    metadata = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_metadata_t));
+    if (metadata == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+    name = value[0];
+
+    metadata->database = database;
+    metadata->metavalue = value[2];
+
+    var = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    var->get_handler = ngx_stream_geoip2_metadata;
+    var->data = (uintptr_t) metadata;
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_stream_geoip2_add_variable_geodata(ngx_conf_t *cf, ngx_stream_geoip2_db_t *database)
+{
+    ngx_stream_geoip2_ctx_t             *geoip2;
+    ngx_stream_compile_complex_value_t  ccv;
+    ngx_str_t                           *value, name, source;
+    ngx_stream_variable_t               *var;
+    int                                 i, nelts, idx;
+
+    geoip2 = ngx_pcalloc(cf->pool, sizeof(ngx_stream_geoip2_ctx_t));
+    if (geoip2 == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    geoip2->database = database;
+    ngx_str_null(&source);
+
+    value = cf->args->elts;
+    name = value[0];
+
+    nelts = (int) cf->args->nelts;
+    idx = 1;
+
+    if (nelts > idx) {
+        for (i = idx; i < nelts; i++) {
+            if (ngx_strnstr(value[idx].data, "=", value[idx].len) == NULL) {
+                break;
+            }
+
+            if (value[idx].len > 8 && ngx_strncmp(value[idx].data, "default=", 8) == 0) {
+                if (geoip2->default_value.len > 0) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "default has already been declared for  \"$%V\"", &name);
+                    return NGX_CONF_ERROR;
+                }
+
+                geoip2->default_value.len  = value[idx].len - 8;
+                geoip2->default_value.data = value[idx].data + 8;
+
+            } else if (value[idx].len > 7 && ngx_strncmp(value[idx].data, "source=", 7) == 0) {
+                if (source.len > 0) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "source has already been declared for  \"$%V\"", &name);
+                    return NGX_CONF_ERROR;
+                }
+
+                source.len  = value[idx].len - 7;
+                source.data = value[idx].data + 7;
+
+                if (source.data[0] != '$') {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "invalid source variable name \"%V\"", &source);
+                    return NGX_CONF_ERROR;
+                }
+
+                ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t));
+                ccv.cf = cf;
+                ccv.value = &source;
+                ccv.complex_value = &geoip2->source;
+
+                if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "unable to compile \"%V\" for \"$%V\"", &source, &name);
+                    return NGX_CONF_ERROR;
+                }
+
+            } else {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "invalid setting \"%V\" for \"$%V\"", &value[idx], &name);
+                    return NGX_CONF_ERROR;
+            }
+
+            idx++;
+        }
+    }
+
+    var = ngx_stream_add_variable(cf, &name, NGX_STREAM_VAR_CHANGEABLE);
+    if (var == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    geoip2->lookup = ngx_pcalloc(cf->pool,
+                         sizeof(const char *) * (cf->args->nelts - (idx - 1)));
+
+    if (geoip2->lookup == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    for (i = idx; i < nelts; i++) {
+        geoip2->lookup[i - idx] = (char *) value[i].data;
+    }
+    geoip2->lookup[i - idx] = NULL;
+
+    var->get_handler = ngx_stream_geoip2_variable;
+    var->data = (uintptr_t) geoip2;
+
+    return NGX_CONF_OK;
+}
+
+
+static void
+ngx_stream_geoip2_cleanup(void *data)
+{
+    ngx_queue_t               *q;
+    ngx_stream_geoip2_db_t    *database;
+    ngx_stream_geoip2_conf_t  *gcf = data;
+
+    while (!ngx_queue_empty(&gcf->databases)) {
+        q = ngx_queue_head(&gcf->databases);
+        ngx_queue_remove(q);
+        database = ngx_queue_data(q, ngx_stream_geoip2_db_t, queue);
+        MMDB_close(&database->mmdb);
+    }
+}
+
+
+static ngx_int_t
+ngx_stream_geoip2_log_handler(ngx_stream_session_t *s)
+{
+    int                        status;
+    MMDB_s                     tmpdb;
+    ngx_queue_t                *q;
+    ngx_file_info_t            fi;
+    ngx_stream_geoip2_db_t    *database;
+    ngx_stream_geoip2_conf_t  *gcf;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
+                   "geoip2 stream log handler");
+
+    gcf = ngx_stream_get_module_main_conf(s, ngx_stream_geoip2_module);
+
+    if (ngx_queue_empty(&gcf->databases)) {
+        return NGX_OK;
+    }
+
+    for (q = ngx_queue_head(&gcf->databases);
+         q != ngx_queue_sentinel(&gcf->databases);
+         q = ngx_queue_next(q))
+    {
+        database = ngx_queue_data(q, ngx_stream_geoip2_db_t, queue);
+        if (database->check_interval == 0) {
+            continue;
+        }
+
+        if ((database->last_check + database->check_interval)
+            > ngx_time())
+        {
+            continue;
+        }
+
+        database->last_check = ngx_time();
+
+        if (ngx_file_info(database->mmdb.filename, &fi) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_EMERG, s->connection->log, ngx_errno,
+                          ngx_file_info_n " \"%s\" failed",
+                          database->mmdb.filename);
+
+            continue;
+        }
+
+        if (ngx_file_mtime(&fi) <= database->last_change) {
+            continue;
+        }
+
+        /* do the reload */
+
+        ngx_memzero(&tmpdb, sizeof(MMDB_s));
+        status = MMDB_open(database->mmdb.filename, MMDB_MODE_MMAP, &tmpdb);
+
+        if (status != MMDB_SUCCESS) {
+            ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                          "MMDB_open(\"%s\") failed to reload - %s",
+                          database->mmdb.filename, MMDB_strerror(status));
+
+            continue;
+        }
+
+        database->last_change = ngx_file_mtime(&fi);
+        MMDB_close(&database->mmdb);
+        database->mmdb = tmpdb;
+
+        ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
+                      "Reload MMDB \"%s\"",
+                      database->mmdb.filename);
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_stream_geoip2_init(ngx_conf_t *cf)
+{
+    ngx_stream_handler_pt        *h;
+    ngx_stream_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_STREAM_LOG_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_stream_geoip2_log_handler;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitattributes b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitattributes
new file mode 100644
index 0000000..6fe6f35
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitattributes
@@ -0,0 +1 @@
+*.t linguist-language=Text
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitignore b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitignore
new file mode 100644
index 0000000..39c82fa
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.gitignore
@@ -0,0 +1,54 @@
+reindex
+.libs
+*.swp
+*.slo
+*.la
+*.swo
+*.lo
+*~
+*.o
+print.txt
+.rsync
+*.tar.gz
+dist
+build[78]
+build
+tags
+update-readme
+*.tmp
+test/Makefile
+test/blib
+test.sh
+t.sh
+t/t.sh
+test/t/servroot/
+releng
+reset
+*.t_
+genmobi.sh
+*.mobi
+misc/chunked
+src/headers.c
+src/headers.h
+src/module.c
+src/module.h
+src/util.c
+src/util.h
+go
+ctags
+src/in.c
+src/in.h
+src/out.c
+src/out.h
+build[89]
+build1[0-9]
+buildroot/
+work/
+all
+t/servroot
+analyze
+cov
+nginx
+*.plist
+a.patch
+Makefile
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.travis.yml b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.travis.yml
new file mode 100644
index 0000000..6b346a8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/.travis.yml
@@ -0,0 +1,58 @@
+sudo: required
+dist: focal
+
+branches:
+  only:
+    - "master"
+
+os: linux
+
+language: c
+
+compiler:
+  - gcc
+
+addons:
+  apt:
+    packages:
+    - axel
+    - cpanminus
+
+env:
+  global:
+    - LUAJIT_PREFIX=/opt/luajit21
+    - LUAJIT_LIB=$LUAJIT_PREFIX/lib
+    - LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
+    - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
+  matrix:
+    - NGINX_VERSION=1.25.3 WITHOUT_PCRE2=1
+    - NGINX_VERSION=1.27.1 WITHOUT_PCRE2=1
+
+before_install:
+  - sudo apt-get update -y
+  - sudo apt-get install -y ca-certificates
+  - sudo cpanm -v --notest Test::Nginx > build.log 2>&1 || (cat build.log && exit 1)
+
+install:
+  - git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
+  - git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
+  - git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core
+  - git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
+  - git clone https://github.com/openresty/nginx-eval-module.git ../eval-nginx-module
+  - git clone https://github.com/openresty/openresty.git ../openresty
+  - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
+  - git clone https://github.com/openresty/nginx-devel-utils.git
+  - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git luajit2
+
+before_script:
+  - cd luajit2/
+  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT -msse4.2' > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ..
+
+script:
+  - export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH
+  - export NGX_BUILD_CC=$CC
+  - sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
+  - prove -I. -r t
+
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/LICENSE b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/LICENSE
new file mode 100644
index 0000000..c14f60a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/LICENSE
@@ -0,0 +1,20 @@
+This module is licensed under the terms of the BSD license.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/README.markdown b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/README.markdown
new file mode 100644
index 0000000..6baea91
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/README.markdown
@@ -0,0 +1,538 @@
+Name
+====
+
+**ngx_headers_more** - Set and clear input and output headers...more than "add"!
+
+*This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
+
+Table of Contents
+=================
+
+* [Name](#name)
+* [Version](#version)
+* [Synopsis](#synopsis)
+* [Description](#description)
+* [Directives](#directives)
+    * [more_set_headers](#more_set_headers)
+    * [more_clear_headers](#more_clear_headers)
+    * [more_set_input_headers](#more_set_input_headers)
+    * [more_clear_input_headers](#more_clear_input_headers)
+* [Limitations](#limitations)
+* [Installation](#installation)
+* [Compatibility](#compatibility)
+* [Community](#community)
+    * [English Mailing List](#english-mailing-list)
+    * [Chinese Mailing List](#chinese-mailing-list)
+* [Bugs and Patches](#bugs-and-patches)
+* [Source Repository](#source-repository)
+* [Changes](#changes)
+* [Test Suite](#test-suite)
+* [TODO](#todo)
+* [Getting involved](#getting-involved)
+* [Authors](#authors)
+* [Copyright & License](#copyright--license)
+* [See Also](#see-also)
+
+Version
+=======
+
+This document describes headers-more-nginx-module [v0.34](https://github.com/openresty/headers-more-nginx-module/tags) released on 17 July 2022.
+
+Synopsis
+========
+
+```nginx
+
+ # set the Server output header
+ more_set_headers 'Server: my-server';
+
+ # set and clear output headers
+ location /bar {
+     more_set_headers 'X-MyHeader: blah' 'X-MyHeader2: foo';
+     more_set_headers -t 'text/plain text/css' 'Content-Type: text/foo';
+     more_set_headers -s '400 404 500 503' -s 413 'Foo: Bar';
+     more_clear_headers 'Content-Type';
+
+     # your proxy_pass/memcached_pass/or any other config goes here...
+ }
+
+ # set output headers
+ location /type {
+     more_set_headers 'Content-Type: text/plain';
+     # ...
+ }
+
+ # set input headers
+ location /foo {
+     set $my_host 'my dog';
+     more_set_input_headers 'Host: $my_host';
+     more_set_input_headers -t 'text/plain' 'X-Foo: bah';
+
+     # now $host and $http_host have their new values...
+     # ...
+ }
+
+ # replace input header X-Foo *only* if it already exists
+ more_set_input_headers -r 'X-Foo: howdy';
+```
+
+Description
+===========
+
+This module allows you to add, set, or clear any output
+or input header that you specify.
+
+This is an enhanced version of the standard
+[headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module because it provides more utilities like
+resetting or clearing "builtin headers" like `Content-Type`,
+`Content-Length`, and `Server`.
+
+It also allows you to specify an optional HTTP status code
+criteria using the `-s` option and an optional content
+type criteria using the `-t` option while modifying the
+output headers with the [more_set_headers](#more_set_headers) and
+[more_clear_headers](#more_clear_headers) directives. For example,
+
+```nginx
+ more_set_headers -s 404 -t 'text/html' 'X-Foo: Bar';
+```
+
+You can also specify multiple MIME types to filter out in a single `-t` option.
+For example,
+
+```nginx
+more_set_headers -t 'text/html text/plain' 'X-Foo: Bar';
+```
+
+Never use other parameters like `charset=utf-8` in the `-t` option values; they will not
+work as you would expect.
+
+Input headers can be modified as well. For example
+
+```nginx
+ location /foo {
+     more_set_input_headers 'Host: foo' 'User-Agent: faked';
+     # now $host, $http_host, $user_agent, and
+     #   $http_user_agent all have their new values.
+ }
+```
+
+The option `-t` is also available in the
+[more_set_input_headers](#more_set_input_headers) and
+[more_clear_input_headers](#more_clear_input_headers) directives (for request header filtering) while the `-s` option
+is not allowed.
+
+Unlike the standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module, this module's directives will by
+default apply to all the status codes, including `4xx` and `5xx`.
+
+[Back to TOC](#table-of-contents)
+
+Directives
+==========
+
+[Back to TOC](#table-of-contents)
+
+more_set_headers
+----------------
+**syntax:** *more_set_headers [-t &lt;content-type list&gt;]... [-s &lt;status-code list&gt;]... [-a] &lt;new-header&gt;...*
+
+**default:** *no*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+Replaces (if any) or adds (if not any) the specified output headers when the response status code matches the codes specified by the `-s` option *AND* the response content type matches the types specified by the `-t` option.
+
+If the "-a" option is specified, the specified output headers can be appended directly without clearing the old fields. The behavior of builtin headers such as "Content-Type", "Content-Length", "Server", etc. cannot be changed.
+
+If either `-s` or `-t` is not specified or has an empty list value, then no match is required. Therefore, the following directive set the `Server` output header to the custom value for *any* status code and *any* content type:
+
+```nginx
+
+   more_set_headers    "Server: my_server";
+```
+
+Existing response headers with the same name are always overridden. If you want to add headers incrementally, use the standard [add_header](http://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header) directive instead.
+
+A single directive can set/add multiple output headers. For example
+
+```nginx
+
+   more_set_headers 'Foo: bar' 'Baz: bah';
+```
+
+Multiple occurrences of the options are allowed in a single directive. Their values will be merged together. For instance
+
+```nginx
+
+   more_set_headers -s 404 -s '500 503' 'Foo: bar';
+```
+
+is equivalent to
+
+```nginx
+
+   more_set_headers -s '404 500 503' 'Foo: bar';
+```
+
+The new header should be the one of the forms:
+
+1. `Name: Value`
+1. `Name: `
+1. `Name`
+
+The last two effectively clear the value of the header `Name`.
+
+Nginx variables are allowed in header values. For example:
+
+```nginx
+
+    set $my_var "dog";
+    more_set_headers "Server: $my_var";
+```
+
+But variables won't work in header keys due to performance considerations.
+
+Multiple set/clear header directives are allowed in a single location, and they're executed sequentially.
+
+Directives inherited from an upper level scope (say, http block or server blocks) are executed before the directives in the location block.
+
+Note that although `more_set_headers` is allowed in *location* if blocks, it is *not* allowed in the *server* if blocks, as in
+
+```nginx
+
+   ?  # This is NOT allowed!
+   ?  server {
+   ?      if ($args ~ 'download') {
+   ?          more_set_headers 'Foo: Bar';
+   ?      }
+   ?      ...
+   ?  }
+```
+
+Behind the scene, use of this directive and its friend [more_clear_headers](#more_clear_headers) will (lazily) register an ouput header filter that modifies `r->headers_out` the way you specify.
+
+[Back to TOC](#table-of-contents)
+
+more_clear_headers
+------------------
+**syntax:** *more_clear_headers [-t &lt;content-type list&gt;]... [-s &lt;status-code list&gt;]... &lt;new-header&gt;...*
+
+**default:** *no*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+Clears the specified output headers.
+
+In fact,
+
+```nginx
+
+    more_clear_headers -s 404 -t 'text/plain' Foo Baz;
+```
+
+is exactly equivalent to
+
+```nginx
+
+    more_set_headers -s 404 -t 'text/plain' "Foo: " "Baz: ";
+```
+
+or
+
+```nginx
+
+    more_set_headers -s 404 -t 'text/plain' Foo Baz
+```
+
+See [more_set_headers](#more_set_headers) for more details.
+
+The wildcard character, `*`, can also be used at the end of the header name to specify a pattern. For example, the following directive
+effectively clears *any* output headers starting by "`X-Hidden-`":
+
+```nginx
+
+ more_clear_headers 'X-Hidden-*';
+```
+
+The `*` wildcard support was first introduced in [v0.09](#v009).
+
+[Back to TOC](#table-of-contents)
+
+more_set_input_headers
+----------------------
+**syntax:** *more_set_input_headers [-r] [-t &lt;content-type list&gt;]... &lt;new-header&gt;...*
+
+**default:** *no*
+
+**context:** *http, server, location, location if*
+
+**phase:** *rewrite tail*
+
+Very much like [more_set_headers](#more_set_headers) except that it operates on input headers (or request headers) and it only supports the `-t` option.
+
+Note that using the `-t` option in this directive means filtering by the `Content-Type` *request* header, rather than the response header.
+
+Behind the scene, use of this directive and its friend [more_clear_input_headers](#more_clear_input_headers) will (lazily)
+register a `rewrite phase` handler that modifies `r->headers_in` the way you specify. Note that it always run at the *end* of
+the `rewrite` phase so that it runs *after* the standard [rewrite module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)
+and works in subrequests as well.
+
+If the `-r` option is specified, then the headers will be replaced to the new values *only if* they already exist.
+
+[Back to TOC](#table-of-contents)
+
+more_clear_input_headers
+------------------------
+**syntax:** *more_clear_input_headers [-t &lt;content-type list&gt;]... &lt;new-header&gt;...*
+
+**default:** *no*
+
+**context:** *http, server, location, location if*
+
+**phase:** *rewrite tail*
+
+Clears the specified input headers.
+
+In fact,
+
+```nginx
+
+    more_clear_input_headers -t 'text/plain' Foo Baz;
+```
+
+is exactly equivalent to
+
+```nginx
+
+    more_set_input_headers -t 'text/plain' "Foo: " "Baz: ";
+```
+
+or
+
+```nginx
+
+    more_set_input_headers -t 'text/plain' Foo Baz
+```
+
+To remove request headers "Foo" and "Baz" for all incoming requests regardless of the content type, we can write
+
+```nginx
+
+    more_clear_input_headers "Foo" "Baz";
+```
+
+See [more_set_input_headers](#more_set_input_headers) for more details.
+
+The wildcard character, `*`, can also be used at the end of the header name to specify a pattern. For example, the following directive
+effectively clears *any* input headers starting by "`X-Hidden-`":
+
+```nginx
+
+     more_clear_input_headers 'X-Hidden-*';
+```
+
+[Back to TOC](#table-of-contents)
+
+Limitations
+===========
+
+* Unlike the standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module, this module does not automatically take care of the constraint among the `Expires`, `Cache-Control`, and `Last-Modified` headers. You have to get them right yourself or use the [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module together with this module.
+* You cannot remove the `Connection` response header using this module because the `Connection` response header is generated by the standard `ngx_http_header_filter_module` in the Nginx core, whose output header filter runs always *after* the filter of this module. The only way to actually remove the `Connection` header is to patch the Nginx core, that is, editing the C function `ngx_http_header_filter` in the `src/http/ngx_http_header_filter_module.c` file.
+
+[Back to TOC](#table-of-contents)
+
+Installation
+============
+
+Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
+the version 1.17.8 (see [nginx compatibility](#compatibility)), and then build the source with this module:
+
+```bash
+
+ wget 'http://nginx.org/download/nginx-1.17.8.tar.gz'
+ tar -xzvf nginx-1.17.8.tar.gz
+ cd nginx-1.17.8/
+
+ # Here we assume you would install you nginx under /opt/nginx/.
+ ./configure --prefix=/opt/nginx \
+     --add-module=/path/to/headers-more-nginx-module
+
+ make
+ make install
+```
+
+Download the latest version of the release tarball of this module from [headers-more-nginx-module file list](https://github.com/openresty/headers-more-nginx-module/tags).
+
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ngx_http_headers_more_filter_module.so;
+```
+
+Also, this module is included and enabled by default in the [OpenResty bundle](http://openresty.org).
+
+[Back to TOC](#table-of-contents)
+
+Compatibility
+=============
+
+The following versions of Nginx should work with this module:
+
+* **1.21.x**                      (last tested: 1.21.4)
+* **1.19.x**                      (last tested: 1.19.9)
+* **1.17.x**                      (last tested: 1.17.8)
+* **1.16.x**
+* **1.15.x**                      (last tested: 1.15.8)
+* **1.14.x**
+* **1.13.x**                      (last tested: 1.13.6)
+* **1.12.x**
+* **1.11.x**                      (last tested: 1.11.2)
+* **1.10.x**
+* **1.9.x**                       (last tested: 1.9.15)
+* **1.8.x**
+* **1.7.x**                       (last tested: 1.7.10)
+* **1.6.x**                       (last tested: 1.6.2)
+* **1.5.x**                       (last tested: 1.5.8)
+* **1.4.x**                       (last tested: 1.4.4)
+* **1.3.x**                       (last tested: 1.3.7)
+* **1.2.x**                       (last tested: 1.2.9)
+* **1.1.x**                       (last tested: 1.1.5)
+* **1.0.x**                       (last tested: 1.0.11)
+* **0.9.x**                       (last tested: 0.9.4)
+* **0.8.x**                       (last tested: 0.8.54)
+* **0.7.x >= 0.7.44**             (last tested: 0.7.68)
+
+Earlier versions of Nginx like 0.6.x and 0.5.x will *not* work.
+
+If you find that any particular version of Nginx above 0.7.44 does not work with this module, please consider [reporting a bug](#report-bugs).
+
+[Back to TOC](#table-of-contents)
+
+Community
+=========
+
+[Back to TOC](#table-of-contents)
+
+English Mailing List
+--------------------
+
+The [openresty-en](https://groups.google.com/group/openresty-en) mailing list is for English speakers.
+
+[Back to TOC](#table-of-contents)
+
+Chinese Mailing List
+--------------------
+
+The [openresty](https://groups.google.com/group/openresty) mailing list is for Chinese speakers.
+
+[Back to TOC](#table-of-contents)
+
+Bugs and Patches
+================
+
+Please submit bug reports, wishlists, or patches by
+
+1. creating a ticket on the [GitHub Issue Tracker](https://github.com/chaoslawful/lua-nginx-module/issues),
+1. or posting to the [OpenResty community](#community).
+
+[Back to TOC](#table-of-contents)
+
+Source Repository
+=================
+
+Available on github at [openresty/headers-more-nginx-module](https://github.com/openresty/headers-more-nginx-module).
+
+[Back to TOC](#table-of-contents)
+
+Changes
+=======
+
+The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
+
+<http://openresty.org/#Changes>
+
+[Back to TOC](#table-of-contents)
+
+Test Suite
+==========
+
+This module comes with a Perl-driven test suite. The [test cases](https://github.com/openresty/headers-more-nginx-module/tree/master/t/) are
+[declarative](https://github.com/openresty/headers-more-nginx-module/blob/master/t/sanity.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Nginx) module in the Perl world.
+
+To run it on your side:
+
+```bash
+
+ $ PATH=/path/to/your/nginx-with-headers-more-module:$PATH prove -r t
+```
+
+To run the test suite with valgrind's memcheck, use the following commands:
+
+```bash
+
+ $ export PATH=/path/to/your/nginx-with-headers-more-module:$PATH
+ $ TEST_NGINX_USE_VALGRIND=1 prove -r t
+```
+
+You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
+
+Because a single nginx server (by default, `localhost:1984`) is used across all the test scripts (`.t` files), it's meaningless to run the test suite in parallel by specifying `-jN` when invoking the `prove` utility.
+
+Some parts of the test suite requires modules [proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html), and [echo](https://github.com/openresty/echo-nginx-module) to be enabled as well when building Nginx.
+
+[Back to TOC](#table-of-contents)
+
+TODO
+====
+
+* Support variables in new headers' keys.
+
+[Back to TOC](#table-of-contents)
+
+Getting involved
+================
+
+You'll be very welcomed to submit patches to the [author](#author) or just ask for a commit bit to the [source repository](#source-repository) on GitHub.
+
+[Back to TOC](#table-of-contents)
+
+Authors
+=======
+
+* Yichun "agentzh" Zhang (章亦春) *&lt;agentzh@gmail.com&gt;*, OpenResty Inc.
+* Bernd Dorn ( <http://www.lovelysystems.com/> )
+
+This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
+
+[Back to TOC](#table-of-contents)
+
+Copyright & License
+===================
+
+The code base is borrowed directly from the standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module in Nginx 0.8.24. This part of code is copyrighted by Igor Sysoev.
+
+Copyright (c) 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+
+Copyright (c) 2010-2013, Bernd Dorn.
+
+The license text is available in the [LICENSE](LICENSE) file located in the root directory of the project.
+
+[Back to TOC](#table-of-contents)
+
+See Also
+========
+
+* The original thread on the Nginx mailing list that inspires this module's development: ["A question about add_header replication"](http://forum.nginx.org/read.php?2,11206,11738).
+* The orginal announcement thread on the Nginx mailing list: ["The "headers_more" module: Set and clear output headers...more than 'add'!"](http://forum.nginx.org/read.php?2,23460).
+* The original [blog post](http://agentzh.blogspot.com/2009/11/headers-more-module-scripting-input-and.html) about this module's initial development.
+* The [echo module](https://github.com/openresty/echo-nginx-module) for Nginx module's automated testing.
+* The standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module.
+
+[Back to TOC](#table-of-contents)
+
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/config b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/config
new file mode 100644
index 0000000..5707cc4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/config
@@ -0,0 +1,32 @@
+ngx_addon_name=ngx_http_headers_more_filter_module
+
+HEADERS_MORE_SRCS="                                                         \
+                $ngx_addon_dir/src/ngx_http_headers_more_filter_module.c    \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_out.c      \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_in.c       \
+                $ngx_addon_dir/src/ngx_http_headers_more_util.c             \
+                "
+
+HEADERS_MORE_DEPS="                                                         \
+                $ngx_addon_dir/src/ddebug.h                                 \
+                $ngx_addon_dir/src/ngx_http_headers_more_filter_module.h    \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_in.h       \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_out.h      \
+                $ngx_addon_dir/src/ngx_http_headers_more_headers_in.h       \
+                $ngx_addon_dir/src/ngx_http_headers_more_util.h             \
+                "
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP_AUX_FILTER
+    ngx_module_name=$ngx_addon_name
+    ngx_module_incs=
+    ngx_module_deps="$HEADERS_MORE_DEPS"
+    ngx_module_srcs="$HEADERS_MORE_SRCS"
+    ngx_module_libs=
+
+    . auto/module
+else
+    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $HEADERS_MORE_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $HEADERS_MORE_DEPS"
+fi
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/changelog b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/changelog
new file mode 100644
index 0000000..0fd56e3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/changelog
@@ -0,0 +1,72 @@
+libnginx-mod-http-headers-more-filter (1:0.38-2) unstable; urgency=medium
+
+  * d/control: bump Standards-Version: 4.7.2, no changes
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 11 Apr 2025 14:26:59 +0200
+
+libnginx-mod-http-headers-more-filter (1:0.38-1) unstable; urgency=medium
+
+  * New upstream version 0.38
+  * d/{control,copyright}: update my email to "janmojzis@debian.org"
+  * d/copyright: bump debian/* copyright year
+  * d/watch: use more generic template
+  * d/control: bump Standards-Version: 4.7.0, no changes
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Mon, 10 Feb 2025 19:20:06 +0100
+
+libnginx-mod-http-headers-more-filter (1:0.37-2) unstable; urgency=medium
+
+  * d/watch: use new recommended github template
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 13 Jan 2024 22:22:57 +0100
+
+libnginx-mod-http-headers-more-filter (1:0.37-1) unstable; urgency=medium
+
+  * New upstream version 0.37
+  * d/gbp.conf: add [pull] track-missing = True
+  * d/copyright: bump my copyright year
+  * d/watch: remove filenamemangle
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 07 Jan 2024 23:40:37 +0100
+
+libnginx-mod-http-headers-more-filter (1:0.36-1) unstable; urgency=medium
+
+  * New upstream version 0.36
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 18 Dec 2023 16:55:54 +0100
+
+libnginx-mod-http-headers-more-filter (1:0.34-5) unstable; urgency=medium
+
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 15:31:27 +0200
+
+libnginx-mod-http-headers-more-filter (1:0.34-4) unstable; urgency=medium
+
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:16:38 +0200
+
+libnginx-mod-http-headers-more-filter (1:0.34-3) unstable; urgency=medium
+
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/gbb.conf: switched to debian branch main (debian-branch = main)
+  * d/copyright: bump my copyright year
+  * d/copyright: reformat text to be compatible with 'cme update dpkg-copyright'
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:26 +0100
+
+libnginx-mod-http-headers-more-filter (1:0.34-2) unstable; urgency=medium
+
+  * d/control: added Multi-Arch: foreign
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 12:50:28 +0100
+
+libnginx-mod-http-headers-more-filter (1:0.34-1) experimental; urgency=medium
+
+  * Initial release. (Closes: 1024151)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 14:46:53 +0100
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/control b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/control
new file mode 100644
index 0000000..a8ebd83
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/control
@@ -0,0 +1,26 @@
+Source: libnginx-mod-http-headers-more-filter
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jan Mojžíš <janmojzis@debian.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+Standards-Version: 4.7.2
+Homepage: https://github.com/openresty/headers-more-nginx-module
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-headers-more-filter.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-headers-more-filter
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-headers-more-filter
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: Set and clear input and output headers for Nginx
+ The Headers More module allows you to add, set, or clear any output or input
+ header that you specify.
+ .
+ This is an enhanced version of the standard headers module because it provides
+ more utilities like resetting or clearing "builtin headers" like Content-Type,
+ Content-Length, and Server.
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/copyright b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/copyright
new file mode 100644
index 0000000..251922c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/copyright
@@ -0,0 +1,62 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: headers-more-nginx-module
+Upstream-Contact: Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>
+Source: https://github.com/openresty/headers-more-nginx-module
+
+Files: *
+Copyright: 2010-2013, Bernd Dorn.
+ 2009-2017, Yichun "agentzh" Zhang (\x{7ae0}\x{4ea6}\x{6625}) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: config
+Copyright: Igor Sysoev
+ 2010-2013, Bernd Dorn
+ 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022, Miao Wang <shankerwangmiao@gmail.com>
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-2-clause
+
+Files: src/*
+Copyright: Yichun Zhang (agentzh)
+License: BSD-2-clause
+
+Files: src/ddebug.h
+Copyright: Igor Sysoev
+ 2010-2013, Bernd Dorn
+ 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+License: BSD-2-clause
+
+Files: t/*
+Copyright: Igor Sysoev
+ 2010-2013, Bernd Dorn
+ 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+License: BSD-2-clause
+
+Files: util/*
+Copyright: Igor Sysoev
+ 2010-2013, Bernd Dorn
+ 2009-2017, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+License: BSD-2-clause
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/gbp.conf b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/gbp.conf
new file mode 100644
index 0000000..97cd209
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/gbp.conf
@@ -0,0 +1,12 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
+
+[pull]
+track-missing = True
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/rules b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/source/format b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/control b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/control
new file mode 100644
index 0000000..b95c6ff
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/control
@@ -0,0 +1,13 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
+
+Tests: helloworld
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/generic b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/helloworld b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/helloworld
new file mode 100644
index 0000000..6a2e85b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/tests/helloworld
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+cat <<EOF > "/etc/nginx/sites-enabled/default"
+server {
+	listen 80 default_server;
+
+	location /helloworld {
+    more_set_headers 'Content-Type: text/helloworld';
+    more_set_headers -s '200' 'Content-Type: text/helloworld200';
+    return 200;
+	}
+}
+EOF
+
+exp="content_type: text/helloworld200
+response_code: 200"
+
+nginx -t
+invoke-rc.d nginx restart || { journalctl -n all -xu nginx.service; exit 1; }
+
+out=`curl --fail -w "content_type: %{content_type}\nresponse_code: %{http_code}\n" http://127.0.0.1/helloworld`
+
+if [ x"${out}" != x"${exp}" ]; then
+  echo "output:"
+  echo "====================="
+  echo "${out}"
+  echo "====================="
+  echo "expected output:"
+  echo "====================="
+  echo "${exp}"
+  echo "====================="
+  exit 1
+fi
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/upstream/metadata b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/upstream/metadata
new file mode 100644
index 0000000..185ca21
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/openresty/headers-more-nginx-module/issues
+Bug-Submit: https://github.com/openresty/headers-more-nginx-module/issues/new
+Repository-Browse: https://github.com/openresty/headers-more-nginx-module
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/watch b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/watch
new file mode 100644
index 0000000..426294e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/debian/watch
@@ -0,0 +1,6 @@
+version=4
+opts="\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/openresty/headers-more-nginx-module/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ddebug.h b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ddebug.h
new file mode 100644
index 0000000..13879af
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ddebug.h
@@ -0,0 +1,124 @@
+#ifndef DDEBUG_H
+#define DDEBUG_H
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...) fprintf(stderr, "headers-more *** %s: ", __func__); \
+            fprintf(stderr, __VA_ARGS__); \
+            fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
+
+#   else
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char * fmt, ...) {
+}
+
+#    endif
+
+#   if DDEBUG > 1
+
+#       define dd_enter() dd_enter_helper(r, __func__)
+
+#       if defined(nginx_version) && nginx_version >= 8011
+#           define dd_main_req_count r->main->count
+#       else
+#           define dd_main_req_count 0
+#       endif
+
+static ngx_inline void
+dd_enter_helper(ngx_http_request_t *r, const char *func)
+{
+    ngx_http_posted_request_t       *pr;
+
+    fprintf(stderr, "headers-more *** enter %s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
+            func,
+            (int) r->method_name.len, r->method_name.data,
+            (int) r->uri.len, r->uri.data,
+            (int) r->args.len, r->args.data,
+            (int) dd_main_req_count, r->main,
+            r, r->connection->data, r->parent);
+
+    if (r->posted_requests) {
+        fprintf(stderr, " posted:");
+
+        for (pr = r->posted_requests; pr; pr = pr->next) {
+            fprintf(stderr, "%p,", pr);
+        }
+    }
+
+    fprintf(stderr, "\n");
+}
+
+#   else
+
+#       define dd_enter()
+
+#   endif
+
+#else
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...)
+
+#       define dd_enter()
+
+#   else
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char * fmt, ...) {
+}
+
+static ngx_inline void
+dd_enter() {
+}
+
+#   endif
+
+#endif
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#define dd_check_read_event_handler(r)   \
+    dd("r->read_event_handler = %s", \
+        r->read_event_handler == ngx_http_block_reading ? \
+            "ngx_http_block_reading" : \
+        r->read_event_handler == ngx_http_test_reading ? \
+            "ngx_http_test_reading" : \
+        r->read_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#define dd_check_write_event_handler(r)   \
+    dd("r->write_event_handler = %s", \
+        r->write_event_handler == ngx_http_handler ? \
+            "ngx_http_handler" : \
+        r->write_event_handler == ngx_http_core_run_phases ? \
+            "ngx_http_core_run_phases" : \
+        r->write_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#else
+
+#define dd_check_read_event_handler(r)
+#define dd_check_write_event_handler(r)
+
+#endif
+
+#endif /* DDEBUG_H */
+
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_filter_module.c b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_filter_module.c
new file mode 100644
index 0000000..0bb6fec
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_filter_module.c
@@ -0,0 +1,348 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_headers_more_filter_module.h"
+#include "ngx_http_headers_more_headers_out.h"
+#include "ngx_http_headers_more_headers_in.h"
+#include "ngx_http_headers_more_util.h"
+#include <ngx_config.h>
+
+
+/* config handlers */
+
+static void *ngx_http_headers_more_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_headers_more_merge_loc_conf(ngx_conf_t *cf,
+    void *parent, void *child);
+static void *ngx_http_headers_more_create_main_conf(ngx_conf_t *cf);
+static ngx_int_t ngx_http_headers_more_post_config(ngx_conf_t *cf);
+
+/* post-read-phase handler */
+
+static ngx_int_t ngx_http_headers_more_handler(ngx_http_request_t *r);
+
+/* filter handlers */
+
+static ngx_int_t ngx_http_headers_more_filter_init(ngx_conf_t *cf);
+
+ngx_uint_t  ngx_http_headers_more_location_hash = 0;
+
+
+static ngx_command_t  ngx_http_headers_more_filter_commands[] = {
+
+    { ngx_string("more_set_headers"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_1MORE,
+      ngx_http_headers_more_set_headers,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL},
+
+    { ngx_string("more_clear_headers"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_1MORE,
+      ngx_http_headers_more_clear_headers,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL},
+
+    { ngx_string("more_set_input_headers"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_1MORE,
+      ngx_http_headers_more_set_input_headers,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL},
+
+    { ngx_string("more_clear_input_headers"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_1MORE,
+      ngx_http_headers_more_clear_input_headers,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL},
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_headers_more_filter_module_ctx = {
+    NULL,                                   /* preconfiguration */
+    ngx_http_headers_more_post_config,      /* postconfiguration */
+
+    ngx_http_headers_more_create_main_conf, /* create main configuration */
+    NULL,                                   /* init main configuration */
+
+    NULL,                                   /* create server configuration */
+    NULL,                                   /* merge server configuration */
+
+    ngx_http_headers_more_create_loc_conf,  /* create location configuration */
+    ngx_http_headers_more_merge_loc_conf    /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_headers_more_filter_module = {
+    NGX_MODULE_V1,
+    &ngx_http_headers_more_filter_module_ctx,   /* module context */
+    ngx_http_headers_more_filter_commands,      /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
+
+
+static volatile ngx_cycle_t  *ngx_http_headers_more_prev_cycle = NULL;
+
+
+static ngx_int_t
+ngx_http_headers_more_filter(ngx_http_request_t *r)
+{
+    ngx_int_t                            rc;
+    ngx_uint_t                           i;
+    ngx_http_headers_more_loc_conf_t    *conf;
+    ngx_http_headers_more_cmd_t         *cmd;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "headers more header filter, uri \"%V\"", &r->uri);
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_more_filter_module);
+
+    if (conf->cmds) {
+        cmd = conf->cmds->elts;
+        for (i = 0; i < conf->cmds->nelts; i++) {
+            if (cmd[i].is_input) {
+                continue;
+            }
+
+            rc = ngx_http_headers_more_exec_cmd(r, &cmd[i]);
+
+            if (rc != NGX_OK) {
+                return rc;
+            }
+        }
+    }
+
+    return ngx_http_next_header_filter(r);
+}
+
+
+static ngx_int_t
+ngx_http_headers_more_filter_init(ngx_conf_t *cf)
+{
+    ngx_http_next_header_filter = ngx_http_top_header_filter;
+    ngx_http_top_header_filter = ngx_http_headers_more_filter;
+
+    return NGX_OK;
+}
+
+
+static void *
+ngx_http_headers_more_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_headers_more_loc_conf_t    *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_headers_more_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->cmds = NULL;
+     */
+
+    return conf;
+}
+
+
+static char *
+ngx_http_headers_more_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_uint_t                           i;
+    ngx_uint_t                           orig_len;
+    ngx_http_headers_more_cmd_t         *prev_cmd, *cmd;
+    ngx_http_headers_more_loc_conf_t    *prev = parent;
+    ngx_http_headers_more_loc_conf_t    *conf = child;
+
+    if (conf->cmds == NULL || conf->cmds->nelts == 0) {
+        conf->cmds = prev->cmds;
+
+    } else if (prev->cmds && prev->cmds->nelts) {
+        orig_len = conf->cmds->nelts;
+
+        (void) ngx_array_push_n(conf->cmds, prev->cmds->nelts);
+
+        cmd = conf->cmds->elts;
+
+        for (i = 0; i < orig_len; i++) {
+            cmd[conf->cmds->nelts - 1 - i] = cmd[orig_len - 1 - i];
+        }
+
+        prev_cmd = prev->cmds->elts;
+
+        for (i = 0; i < prev->cmds->nelts; i++) {
+            cmd[i] = prev_cmd[i];
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_headers_more_post_config(ngx_conf_t *cf)
+{
+    int                              multi_http_blocks;
+    ngx_int_t                        rc;
+    ngx_http_handler_pt             *h;
+    ngx_http_core_main_conf_t       *cmcf;
+
+    ngx_http_headers_more_main_conf_t       *hmcf;
+
+    ngx_http_headers_more_location_hash =
+                               ngx_http_headers_more_hash_literal("location");
+
+    hmcf = ngx_http_conf_get_module_main_conf(cf,
+                                         ngx_http_headers_more_filter_module);
+
+    if (ngx_http_headers_more_prev_cycle != ngx_cycle) {
+        ngx_http_headers_more_prev_cycle = ngx_cycle;
+        multi_http_blocks = 0;
+
+    } else {
+        multi_http_blocks = 1;
+    }
+
+    if (multi_http_blocks || hmcf->requires_filter) {
+        rc = ngx_http_headers_more_filter_init(cf);
+        if (rc != NGX_OK) {
+            return rc;
+        }
+    }
+
+    if (!hmcf->requires_handler) {
+        return NGX_OK;
+    }
+
+    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+
+    h = ngx_array_push(&cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    *h = ngx_http_headers_more_handler;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_headers_more_handler(ngx_http_request_t *r)
+{
+    ngx_int_t                            rc;
+    ngx_uint_t                           i;
+    ngx_http_headers_more_loc_conf_t    *conf;
+    ngx_http_headers_more_main_conf_t   *hmcf;
+    ngx_http_headers_more_cmd_t         *cmd;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "headers more rewrite handler, uri \"%V\"", &r->uri);
+
+    hmcf = ngx_http_get_module_main_conf(r,
+                                         ngx_http_headers_more_filter_module);
+
+    if (!hmcf->postponed_to_phase_end) {
+        ngx_http_core_main_conf_t       *cmcf;
+        ngx_http_phase_handler_t         tmp;
+        ngx_http_phase_handler_t        *ph;
+        ngx_http_phase_handler_t        *cur_ph;
+        ngx_http_phase_handler_t        *last_ph;
+
+        hmcf->postponed_to_phase_end = 1;
+
+        cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+        ph = cmcf->phase_engine.handlers;
+        cur_ph = &ph[r->phase_handler];
+        last_ph = &ph[cur_ph->next - 1];
+
+        if (cur_ph < last_ph) {
+            dd("swaping the contents of cur_ph and last_ph...");
+
+            tmp = *cur_ph;
+
+            memmove(cur_ph, cur_ph + 1,
+                    (last_ph - cur_ph) * sizeof (ngx_http_phase_handler_t));
+
+            *last_ph = tmp;
+
+            r->phase_handler--; /* redo the current ph */
+
+            return NGX_DECLINED;
+        }
+    }
+
+    dd("running phase handler...");
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_more_filter_module);
+
+    if (conf->cmds) {
+        if (r->http_version < NGX_HTTP_VERSION_10) {
+            return NGX_DECLINED;
+        }
+
+        cmd = conf->cmds->elts;
+        for (i = 0; i < conf->cmds->nelts; i++) {
+            if (!cmd[i].is_input) {
+                continue;
+            }
+
+            rc = ngx_http_headers_more_exec_input_cmd(r, &cmd[i]);
+
+            if (rc != NGX_OK) {
+                return rc;
+            }
+        }
+    }
+
+    return NGX_DECLINED;
+}
+
+
+static void *
+ngx_http_headers_more_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_http_headers_more_main_conf_t    *hmcf;
+
+    hmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_headers_more_main_conf_t));
+    if (hmcf == NULL) {
+        return NULL;
+    }
+
+    /* set by ngx_pcalloc:
+     *      hmcf->postponed_to_phase_end = 0;
+     *      hmcf->requires_filter        = 0;
+     *      hmcf->requires_handler       = 0;
+     */
+
+    return hmcf;
+}
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_filter_module.h b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_filter_module.h
new file mode 100644
index 0000000..5f31ab4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_filter_module.h
@@ -0,0 +1,81 @@
+
+/*
+ * Copyright (c) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_HEADERS_MORE_FILTER_MODULE_H
+#define NGX_HTTP_HEADERS_MORE_FILTER_MODULE_H
+
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <assert.h>
+
+
+typedef enum {
+    ngx_http_headers_more_opcode_set,
+    ngx_http_headers_more_opcode_clear
+} ngx_http_headers_more_opcode_t;
+
+
+typedef struct {
+    ngx_array_t                       *types; /* of ngx_str_t */
+    ngx_array_t                       *statuses; /* of ngx_uint_t */
+    ngx_array_t                       *headers; /* of ngx_http_header_val_t */
+    ngx_flag_t                         is_input;
+} ngx_http_headers_more_cmd_t;
+
+
+typedef struct {
+    ngx_array_t             *cmds; /* of ngx_http_headers_more_cmd_t */
+} ngx_http_headers_more_loc_conf_t;
+
+
+typedef struct {
+    ngx_int_t              postponed_to_phase_end;
+    ngx_int_t              requires_filter;
+    ngx_int_t              requires_handler;
+} ngx_http_headers_more_main_conf_t;
+
+
+typedef struct ngx_http_headers_more_header_val_s
+    ngx_http_headers_more_header_val_t;
+
+
+typedef ngx_int_t (*ngx_http_headers_more_set_header_pt)(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+
+
+typedef struct {
+    ngx_str_t                               name;
+    ngx_uint_t                              offset;
+    ngx_http_headers_more_set_header_pt     handler;
+} ngx_http_headers_more_set_header_t;
+
+
+struct ngx_http_headers_more_header_val_s {
+    ngx_http_complex_value_t                value;
+    ngx_uint_t                              hash;
+    ngx_str_t                               key;
+    ngx_http_headers_more_set_header_pt     handler;
+    ngx_uint_t                              offset;
+    unsigned                                replace:1;
+    unsigned                                wildcard:1;
+    unsigned                                append:1;
+};
+
+
+extern ngx_module_t  ngx_http_headers_more_filter_module;
+
+
+#ifndef ngx_str_set
+#define ngx_str_set(str, text)                                               \
+        (str)->len = sizeof(text) - 1; (str)->data = (u_char *) text
+#endif
+
+
+#define ngx_http_headers_more_assert(a)  assert(a)
+
+
+#endif /* NGX_HTTP_HEADERS_MORE_FILTER_MODULE_H */
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_in.c b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_in.c
new file mode 100644
index 0000000..983be5b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_in.c
@@ -0,0 +1,959 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_headers_more_headers_in.h"
+#include "ngx_http_headers_more_util.h"
+#include <ctype.h>
+
+
+static char *ngx_http_headers_more_parse_directive(ngx_conf_t *cf,
+    ngx_command_t *ngx_cmd, void *conf,
+    ngx_http_headers_more_opcode_t opcode);
+static int ngx_http_headers_more_check_type(ngx_http_request_t *r,
+    ngx_array_t *types);
+static ngx_int_t ngx_http_set_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_set_header_helper(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value,
+    ngx_table_elt_t **output_header);
+static ngx_int_t ngx_http_set_builtin_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_set_user_agent_header(ngx_http_request_t *r,
+    ngx_http_headers_more_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_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_clear_builtin_header(ngx_http_request_t *r,
+    ngx_http_headers_more_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_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_set_host_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_set_connection_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_headers_more_validate_host(ngx_str_t *host,
+    ngx_pool_t *pool, ngx_uint_t alloc);
+
+
+static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
+        = {
+
+    { ngx_string("Host"),
+                 offsetof(ngx_http_headers_in_t, host),
+                 ngx_http_set_host_header },
+
+    { ngx_string("Connection"),
+                 offsetof(ngx_http_headers_in_t, connection),
+                 ngx_http_set_connection_header },
+
+    { ngx_string("If-Modified-Since"),
+                 offsetof(ngx_http_headers_in_t, if_modified_since),
+                 ngx_http_set_builtin_header },
+
+#if defined(nginx_version) && nginx_version >= 9002
+    { ngx_string("If-Unmodified-Since"),
+                 offsetof(ngx_http_headers_in_t, if_unmodified_since),
+                 ngx_http_set_builtin_header },
+#endif
+
+#if defined(nginx_version) && nginx_version >= 1003003
+    { ngx_string("If-Match"),
+                 offsetof(ngx_http_headers_in_t, if_match),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("If-None-Match"),
+                 offsetof(ngx_http_headers_in_t, if_none_match),
+                 ngx_http_set_builtin_header },
+#endif
+
+    { ngx_string("User-Agent"),
+                 offsetof(ngx_http_headers_in_t, user_agent),
+                 ngx_http_set_user_agent_header },
+
+    { ngx_string("Referer"),
+                 offsetof(ngx_http_headers_in_t, referer),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Content-Length"),
+                 offsetof(ngx_http_headers_in_t, content_length),
+                 ngx_http_set_content_length_header },
+
+    { ngx_string("Content-Type"),
+                 offsetof(ngx_http_headers_in_t, content_type),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Range"),
+                 offsetof(ngx_http_headers_in_t, range),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("If-Range"),
+                 offsetof(ngx_http_headers_in_t, if_range),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Transfer-Encoding"),
+                 offsetof(ngx_http_headers_in_t, transfer_encoding),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Expect"),
+                 offsetof(ngx_http_headers_in_t, expect),
+                 ngx_http_set_builtin_header },
+
+#if defined(nginx_version) && nginx_version >= 1003013
+    { ngx_string("Upgrade"),
+                 offsetof(ngx_http_headers_in_t, upgrade),
+                 ngx_http_set_builtin_header },
+#endif
+
+#if (NGX_HTTP_GZIP)
+    { ngx_string("Accept-Encoding"),
+                 offsetof(ngx_http_headers_in_t, accept_encoding),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Via"), offsetof(ngx_http_headers_in_t, via),
+                 ngx_http_set_builtin_header },
+#endif
+
+    { ngx_string("Authorization"),
+                 offsetof(ngx_http_headers_in_t, authorization),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Keep-Alive"),
+                 offsetof(ngx_http_headers_in_t, keep_alive),
+                 ngx_http_set_builtin_header },
+
+#if (NGX_HTTP_X_FORWARDED_FOR)
+    { ngx_string("X-Forwarded-For"),
+                 offsetof(ngx_http_headers_in_t, x_forwarded_for),
+                 ngx_http_set_builtin_multi_header },
+
+#endif
+
+#if (NGX_HTTP_REALIP)
+    { ngx_string("X-Real-IP"),
+                 offsetof(ngx_http_headers_in_t, x_real_ip),
+                 ngx_http_set_builtin_header },
+#endif
+
+#if (NGX_HTTP_DAV)
+    { ngx_string("Depth"), offsetof(ngx_http_headers_in_t, depth),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Destination"), offsetof(ngx_http_headers_in_t, destination),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Overwrite"), offsetof(ngx_http_headers_in_t, overwrite),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Date"), offsetof(ngx_http_headers_in_t, date),
+                 ngx_http_set_builtin_header },
+#endif
+
+#if defined(nginx_version) && nginx_version >= 1023000
+    { ngx_string("Cookie"),
+                 offsetof(ngx_http_headers_in_t, cookie),
+                 ngx_http_set_builtin_multi_header },
+#else
+    { ngx_string("Cookie"),
+                 offsetof(ngx_http_headers_in_t, cookies),
+                 ngx_http_set_builtin_multi_header },
+#endif
+
+    { ngx_null_string, 0, ngx_http_set_header }
+};
+
+
+ngx_int_t
+ngx_http_headers_more_exec_input_cmd(ngx_http_request_t *r,
+    ngx_http_headers_more_cmd_t *cmd)
+{
+    ngx_str_t                                    value;
+    ngx_http_headers_more_header_val_t          *h;
+    ngx_uint_t                                   i;
+
+    if (!cmd->headers) {
+        return NGX_OK;
+    }
+
+    if (cmd->types && !ngx_http_headers_more_check_type(r, cmd->types)) {
+        return NGX_OK;
+    }
+
+    h = cmd->headers->elts;
+    for (i = 0; i < cmd->headers->nelts; i++) {
+
+        if (ngx_http_complex_value(r, &h[i].value, &value) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (value.len) {
+            value.len--;  /* remove the trailing '\0' added by
+                             ngx_http_headers_more_parse_header */
+        }
+
+        if (h[i].handler(r, &h[i], &value) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_set_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    return ngx_http_set_header_helper(r, hv, value, NULL);
+}
+
+
+static ngx_int_t
+ngx_http_set_header_helper(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value,
+    ngx_table_elt_t **output_header)
+{
+    ngx_table_elt_t             *h, *matched;
+    ngx_list_part_t             *part;
+    ngx_uint_t                   i;
+    ngx_uint_t                   rc;
+
+    dd_enter();
+
+    matched = NULL;
+
+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;
+            }
+
+            part = part->next;
+            h = part->elts;
+            i = 0;
+        }
+
+        if (!hv->wildcard
+            && h[i].key.len == hv->key.len
+            && ngx_strncasecmp(h[i].key.data, hv->key.data,
+                               h[i].key.len) == 0)
+        {
+            goto matched;
+        }
+
+        if (hv->wildcard
+            && value->len == 0
+            && h[i].key.len >= hv->key.len - 1
+            && ngx_strncasecmp(h[i].key.data, hv->key.data,
+                               hv->key.len - 1) == 0)
+        {
+            goto matched;
+        }
+
+        /* not matched */
+        continue;
+
+matched:
+
+        if (value->len == 0 || (matched && matched != &h[i])) {
+            h[i].hash = 0;
+
+            rc = ngx_http_headers_more_rm_header_helper(
+                                        &r->headers_in.headers, part, i);
+
+            ngx_http_headers_more_assert(
+                !(r->headers_in.headers.part.next == NULL
+                  && r->headers_in.headers.last
+                     != &r->headers_in.headers.part));
+
+            if (rc == NGX_OK) {
+                if (output_header) {
+                    *output_header = NULL;
+                }
+
+                goto retry;
+            }
+
+            return NGX_ERROR;
+        }
+
+        h[i].value = *value;
+
+        if (output_header) {
+            *output_header = &h[i];
+            dd("setting existing builtin input header");
+        }
+
+        if (matched == NULL) {
+            matched = &h[i];
+        }
+    }
+
+    if (matched) {
+        return NGX_OK;
+    }
+
+    if (value->len == 0 || hv->replace) {
+        return NGX_OK;
+    }
+
+    if (r->headers_in.headers.last == NULL) {
+        /* must be 400 bad request */
+        return NGX_OK;
+    }
+
+    h = ngx_list_push(&r->headers_in.headers);
+
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    dd("created new header for %.*s", (int) hv->key.len, hv->key.data);
+
+    if (value->len == 0) {
+        h->hash = 0;
+
+    } else {
+        h->hash = hv->hash;
+    }
+
+    h->key = hv->key;
+    h->value = *value;
+#if defined(nginx_version) && nginx_version >= 1023000
+    h->next = NULL;
+#endif
+
+    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
+    if (h->lowcase_key == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
+
+    if (output_header) {
+        *output_header = h;
+
+        while (r != r->main) {
+            r->parent->headers_in = r->headers_in;
+            r = r->parent;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_set_builtin_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    ngx_table_elt_t             *h, **old;
+
+    dd("entered set_builtin_header (input)");
+
+    if (hv->offset) {
+        old = (ngx_table_elt_t **) ((char *) &r->headers_in + hv->offset);
+
+    } else {
+        old = NULL;
+    }
+
+    dd("old builtin ptr ptr: %p", old);
+    if (old) {
+        dd("old builtin ptr: %p", *old);
+    }
+
+    if (old == NULL || *old == NULL) {
+        dd("set normal header");
+        return ngx_http_set_header_helper(r, hv, value, old);
+    }
+
+    h = *old;
+
+    if (value->len == 0) {
+        h->hash = 0;
+        h->value = *value;
+
+        return ngx_http_set_header_helper(r, hv, value, old);
+    }
+
+    h->hash = hv->hash;
+    h->value = *value;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_set_host_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    ngx_str_t host;
+
+    if (value->len) {
+        host= *value;
+
+        if (ngx_http_headers_more_validate_host(&host, r->pool, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        r->headers_in.server = host;
+
+    } else {
+        r->headers_in.server = *value;
+    }
+
+    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_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    off_t           len;
+
+    if (value->len == 0) {
+        return ngx_http_clear_content_length_header(r, hv, value);
+    }
+
+    len = ngx_atosz(value->data, value->len);
+    if (len == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    dd("reset headers_in.content_length_n to %d", (int) len);
+
+    r->headers_in.content_length_n = len;
+
+    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_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    r->headers_in.content_length_n = -1;
+
+    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_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    value->len = 0;
+    return ngx_http_set_builtin_header(r, hv, value);
+}
+
+
+char *
+ngx_http_headers_more_set_input_headers(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_headers_more_parse_directive(cf, cmd, conf,
+                                         ngx_http_headers_more_opcode_set);
+}
+
+
+char *
+ngx_http_headers_more_clear_input_headers(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_headers_more_parse_directive(cf, cmd, conf,
+                                        ngx_http_headers_more_opcode_clear);
+}
+
+
+static int
+ngx_http_headers_more_check_type(ngx_http_request_t *r, ngx_array_t *types)
+{
+    ngx_uint_t           i;
+    ngx_str_t           *t;
+    ngx_str_t            actual_type;
+
+    if (r->headers_in.content_type == NULL) {
+        return 0;
+    }
+
+    actual_type = r->headers_in.content_type->value;
+    if (actual_type.len == 0) {
+        return 0;
+    }
+
+    dd("headers_in->content_type: %.*s",
+       (int) actual_type.len,
+       actual_type.data);
+
+    t = types->elts;
+    for (i = 0; i < types->nelts; i++) {
+        dd("...comparing with type [%.*s]", (int) t[i].len, t[i].data);
+
+        if (actual_type.len == t[i].len
+            && ngx_strncmp(actual_type.data, t[i].data, t[i].len) == 0)
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+
+static char *
+ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
+    void *conf, ngx_http_headers_more_opcode_t opcode)
+{
+    ngx_http_headers_more_loc_conf_t   *hlcf = conf;
+
+    ngx_uint_t                          i;
+    ngx_http_headers_more_cmd_t        *cmd;
+    ngx_str_t                          *arg;
+    ngx_flag_t                          ignore_next_arg;
+    ngx_str_t                          *cmd_name;
+    ngx_int_t                           rc;
+    ngx_flag_t                          replace = 0;
+    ngx_http_headers_more_header_val_t *h;
+
+    ngx_http_headers_more_main_conf_t  *hmcf;
+
+    if (hlcf->cmds == NULL) {
+        hlcf->cmds = ngx_array_create(cf->pool, 1,
+                                      sizeof(ngx_http_headers_more_cmd_t));
+
+        if (hlcf->cmds == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    cmd = ngx_array_push(hlcf->cmds);
+
+    if (cmd == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    cmd->headers = ngx_array_create(cf->pool, 1,
+                                    sizeof(ngx_http_headers_more_header_val_t));
+
+    if (cmd->headers == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    cmd->types = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t));
+    if (cmd->types == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    cmd->statuses = NULL;
+
+    arg = cf->args->elts;
+
+    cmd_name = &arg[0];
+
+    ignore_next_arg = 0;
+
+    for (i = 1; i < cf->args->nelts; i++) {
+        if (ignore_next_arg) {
+            ignore_next_arg = 0;
+            continue;
+        }
+
+        if (arg[i].len == 0) {
+            continue;
+        }
+
+        if (arg[i].data[0] != '-') {
+            rc = ngx_http_headers_more_parse_header(cf, cmd_name,
+                                                    &arg[i], cmd->headers,
+                                                    opcode,
+                                        ngx_http_headers_more_set_handlers);
+
+            if (rc != NGX_OK) {
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (arg[i].len == 2) {
+            if (arg[i].data[1] == 't') {
+                if (i == cf->args->nelts - 1) {
+                    ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                                  "%V: option -t takes an argument.",
+                                  cmd_name);
+
+                    return NGX_CONF_ERROR;
+                }
+
+                rc = ngx_http_headers_more_parse_types(cf->log, cmd_name,
+                                                       &arg[i + 1],
+                                                       cmd->types);
+
+                if (rc != NGX_OK) {
+                    return NGX_CONF_ERROR;
+                }
+
+                ignore_next_arg = 1;
+
+                continue;
+            }
+
+            if (arg[i].data[1] == 'r') {
+                dd("Found replace flag");
+                replace = 1;
+                continue;
+            }
+        }
+
+        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                      "%V: invalid option name: \"%V\"", cmd_name, &arg[i]);
+
+        return NGX_CONF_ERROR;
+    }
+
+    dd("Found %d types, and %d headers",
+       (int) cmd->types->nelts,
+       (int) cmd->headers->nelts);
+
+    if (cmd->headers->nelts == 0) {
+        ngx_pfree(cf->pool, cmd->headers);
+        cmd->headers = NULL;
+
+    } else {
+        h = cmd->headers->elts;
+        for (i = 0; i < cmd->headers->nelts; i++) {
+            h[i].replace = replace;
+        }
+    }
+
+    if (cmd->types->nelts == 0) {
+        ngx_pfree(cf->pool, cmd->types);
+        cmd->types = NULL;
+    }
+
+    cmd->is_input = 1;
+
+    hmcf = ngx_http_conf_get_module_main_conf(cf,
+                                         ngx_http_headers_more_filter_module);
+
+    hmcf->requires_handler = 1;
+
+    return NGX_CONF_OK;
+}
+
+
+/* borrowed the code from ngx_http_request.c:ngx_http_process_user_agent */
+static ngx_int_t
+ngx_http_set_user_agent_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    u_char  *user_agent, *msie;
+
+    /* clear existing settings */
+
+    r->headers_in.msie = 0;
+    r->headers_in.msie6 = 0;
+    r->headers_in.opera = 0;
+    r->headers_in.gecko = 0;
+    r->headers_in.chrome = 0;
+    r->headers_in.safari = 0;
+    r->headers_in.konqueror = 0;
+
+    if (value->len == 0) {
+        return ngx_http_set_builtin_header(r, hv, value);
+    }
+
+    /* check some widespread browsers */
+
+    user_agent = value->data;
+
+    msie = ngx_strstrn(user_agent, "MSIE ", 5 - 1);
+
+    if (msie && msie + 7 < user_agent + value->len) {
+
+        r->headers_in.msie = 1;
+
+        if (msie[6] == '.') {
+
+            switch (msie[5]) {
+            case '4':
+            case '5':
+                r->headers_in.msie6 = 1;
+                break;
+            case '6':
+                if (ngx_strstrn(msie + 8, "SV1", 3 - 1) == NULL) {
+                    r->headers_in.msie6 = 1;
+                }
+                break;
+            }
+        }
+    }
+
+    if (ngx_strstrn(user_agent, "Opera", 5 - 1)) {
+        r->headers_in.opera = 1;
+        r->headers_in.msie = 0;
+        r->headers_in.msie6 = 0;
+    }
+
+    if (!r->headers_in.msie && !r->headers_in.opera) {
+
+        if (ngx_strstrn(user_agent, "Gecko/", 6 - 1)) {
+            r->headers_in.gecko = 1;
+
+        } else if (ngx_strstrn(user_agent, "Chrome/", 7 - 1)) {
+            r->headers_in.chrome = 1;
+
+        } else if (ngx_strstrn(user_agent, "Safari/", 7 - 1)
+                   && ngx_strstrn(user_agent, "Mac OS X", 8 - 1))
+        {
+            r->headers_in.safari = 1;
+
+        } else if (ngx_strstrn(user_agent, "Konqueror", 9 - 1)) {
+            r->headers_in.konqueror = 1;
+        }
+    }
+
+    return ngx_http_set_builtin_header(r, hv, value);
+}
+
+
+static ngx_int_t
+ngx_http_set_connection_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    r->headers_in.connection_type = 0;
+
+    if (value->len == 0) {
+        return ngx_http_set_builtin_header(r, hv, value);
+    }
+
+    if (ngx_strcasestrn(value->data, "close", 5 - 1)) {
+        r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE;
+        r->headers_in.keep_alive_n = -1;
+        r->keepalive = 0;
+
+    } else if (ngx_strcasestrn(value->data, "keep-alive", 10 - 1)) {
+        r->headers_in.connection_type = NGX_HTTP_CONNECTION_KEEP_ALIVE;
+    }
+
+    return ngx_http_set_builtin_header(r, hv, value);
+}
+
+
+static ngx_int_t
+ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+#if defined(nginx_version) && nginx_version >= 1023000
+    ngx_table_elt_t  **headers, **ph, *h;
+#if (DDEBUG)
+    int                nelts;
+#endif
+
+    if (r->headers_out.status == 400 || r->headers_in.headers.last == NULL) {
+        /* must be a 400 Bad Request */
+        return NGX_OK;
+    }
+
+    headers = (ngx_table_elt_t **) ((char *) &r->headers_in + hv->offset);
+
+    if (*headers) {
+#if (DDEBUG)
+        nelts = 0;
+        for (h = *headers; h; h = h->next) {
+            nelts++;
+        }
+
+        dd("clear multi-value headers: %d", nelts);
+#endif
+        
+        *headers = NULL;
+    }
+
+    if (ngx_http_set_header_helper(r, hv, value, &h) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (value->len == 0) {
+        return NGX_OK;
+    }
+
+    dd("new multi-value header: %p", h);
+
+    if (*headers) {
+        for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ }
+        *ph = h;
+
+    } else {
+        *headers = h;
+    }
+
+    h->next = NULL;
+
+    return NGX_OK;
+#else
+    ngx_array_t       *headers;
+    ngx_table_elt_t  **v, *h;
+
+    if (r->headers_out.status == 400 || r->headers_in.headers.last == NULL) {
+        /* must be a 400 Bad Request */
+        return NGX_OK;
+    }
+
+    headers = (ngx_array_t *) ((char *) &r->headers_in + hv->offset);
+
+    if (headers->nelts > 0) {
+        ngx_array_destroy(headers);
+
+        if (ngx_array_init(headers, r->pool, 2,
+                           sizeof(ngx_table_elt_t *))
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+        dd("clear multi-value headers: %d", (int) headers->nelts);
+    }
+
+#if 1
+    if (headers->nalloc == 0) {
+        if (ngx_array_init(headers, r->pool, 2,
+                           sizeof(ngx_table_elt_t *))
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+#endif
+
+    h = NULL;
+    if (ngx_http_set_header_helper(r, hv, value, &h) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    if (value->len == 0) {
+        return NGX_OK;
+    }
+
+    dd("new cookie header: %p", h);
+
+    v = ngx_array_push(headers);
+    if (v == NULL) {
+        return NGX_ERROR;
+    }
+
+    *v = h;
+    return NGX_OK;
+#endif
+}
+
+
+static ngx_int_t
+ngx_http_headers_more_validate_host(ngx_str_t *host, ngx_pool_t *pool,
+    ngx_uint_t alloc)
+{
+    u_char  *h, ch;
+    size_t   i, dot_pos, host_len;
+
+    enum {
+        sw_usual = 0,
+        sw_literal,
+        sw_rest
+    } state;
+
+    dot_pos = host->len;
+    host_len = host->len;
+
+    h = host->data;
+
+    state = sw_usual;
+
+    for (i = 0; i < host->len; i++) {
+        ch = h[i];
+
+        switch (ch) {
+
+        case '.':
+            if (dot_pos == i - 1) {
+                return NGX_DECLINED;
+            }
+
+            dot_pos = i;
+            break;
+
+        case ':':
+            if (state == sw_usual) {
+                host_len = i;
+                state = sw_rest;
+            }
+            break;
+
+        case '[':
+            if (i == 0) {
+                state = sw_literal;
+            }
+            break;
+
+        case ']':
+            if (state == sw_literal) {
+                host_len = i + 1;
+                state = sw_rest;
+            }
+            break;
+
+        case '\0':
+            return NGX_DECLINED;
+
+        default:
+
+            if (ngx_path_separator(ch)) {
+                return NGX_DECLINED;
+            }
+
+            if (ch >= 'A' && ch <= 'Z') {
+                alloc = 1;
+            }
+
+            break;
+        }
+    }
+
+    if (dot_pos == host_len - 1) {
+        host_len--;
+    }
+
+    if (host_len == 0) {
+        return NGX_DECLINED;
+    }
+
+    if (alloc) {
+        host->data = ngx_pnalloc(pool, host_len);
+        if (host->data == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_strlow(host->data, h, host_len);
+    }
+
+    host->len = host_len;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_in.h b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_in.h
new file mode 100644
index 0000000..d2251da
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_in.h
@@ -0,0 +1,26 @@
+
+/*
+ * Copyright (c) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_HEADERS_MORE_INPUT_HEADERS_H
+#define NGX_HTTP_HEADERS_MORE_INPUT_HEADERS_H
+
+
+#include "ngx_http_headers_more_filter_module.h"
+
+
+/* output header setters and clearers */
+
+ngx_int_t ngx_http_headers_more_exec_input_cmd(ngx_http_request_t *r,
+    ngx_http_headers_more_cmd_t *cmd);
+
+char *ngx_http_headers_more_set_input_headers(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+
+char *ngx_http_headers_more_clear_input_headers(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+
+
+#endif /* NGX_HTTP_HEADERS_MORE_INPUT_HEADERS_H */
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_out.c b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_out.c
new file mode 100644
index 0000000..2a95b5f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_out.c
@@ -0,0 +1,814 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_headers_more_headers_out.h"
+#include "ngx_http_headers_more_util.h"
+#include <ctype.h>
+
+
+static char *
+ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
+        void *conf, ngx_http_headers_more_opcode_t opcode);
+static ngx_flag_t ngx_http_headers_more_check_type(ngx_http_request_t *r,
+        ngx_array_t *types);
+static ngx_flag_t ngx_http_headers_more_check_status(ngx_http_request_t *r,
+        ngx_array_t *statuses);
+static ngx_int_t ngx_http_set_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_set_header_helper(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value,
+    ngx_table_elt_t **output_header, ngx_flag_t no_create);
+static ngx_int_t ngx_http_set_builtin_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_set_accept_ranges_header(ngx_http_request_t *r,
+    ngx_http_headers_more_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_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_set_content_type_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_clear_builtin_header(ngx_http_request_t *r,
+    ngx_http_headers_more_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_headers_more_header_val_t *hv, ngx_str_t *value);
+static ngx_int_t ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value);
+
+
+static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
+    = {
+
+    { ngx_string("Server"),
+                 offsetof(ngx_http_headers_out_t, server),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Date"),
+                 offsetof(ngx_http_headers_out_t, date),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Content-Encoding"),
+                 offsetof(ngx_http_headers_out_t, content_encoding),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Location"),
+                 offsetof(ngx_http_headers_out_t, location),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Refresh"),
+                 offsetof(ngx_http_headers_out_t, refresh),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Last-Modified"),
+                 offsetof(ngx_http_headers_out_t, last_modified),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Content-Range"),
+                 offsetof(ngx_http_headers_out_t, content_range),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Accept-Ranges"),
+                 offsetof(ngx_http_headers_out_t, accept_ranges),
+                 ngx_http_set_accept_ranges_header },
+
+    { ngx_string("WWW-Authenticate"),
+                 offsetof(ngx_http_headers_out_t, www_authenticate),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Expires"),
+                 offsetof(ngx_http_headers_out_t, expires),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("E-Tag"),
+                 offsetof(ngx_http_headers_out_t, etag),
+                 ngx_http_set_builtin_header },
+
+    { ngx_string("Content-Length"),
+                 offsetof(ngx_http_headers_out_t, content_length),
+                 ngx_http_set_content_length_header },
+
+    { ngx_string("Content-Type"),
+                 0,
+                 ngx_http_set_content_type_header },
+
+    { ngx_string("Cache-Control"),
+                 offsetof(ngx_http_headers_out_t, cache_control),
+                 ngx_http_set_builtin_multi_header },
+
+    { ngx_null_string, 0, ngx_http_set_header }
+};
+
+
+ngx_int_t
+ngx_http_headers_more_exec_cmd(ngx_http_request_t *r,
+    ngx_http_headers_more_cmd_t *cmd)
+{
+    ngx_str_t                                   value;
+    ngx_http_headers_more_header_val_t         *h;
+    ngx_uint_t                                  i;
+
+    if (!cmd->headers) {
+        return NGX_OK;
+    }
+
+    if (cmd->types && !ngx_http_headers_more_check_type(r, cmd->types)) {
+        return NGX_OK;
+    }
+
+    if (cmd->statuses
+        && !ngx_http_headers_more_check_status(r, cmd->statuses))
+    {
+        return NGX_OK;
+    }
+
+    h = cmd->headers->elts;
+    for (i = 0; i < cmd->headers->nelts; i++) {
+
+        if (ngx_http_complex_value(r, &h[i].value, &value) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (value.len) {
+            value.len--;  /* remove the trailing '\0' added by
+                             ngx_http_headers_more_parse_header */
+        }
+
+        if (h[i].handler(r, &h[i], &value) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_set_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    return ngx_http_set_header_helper(r, hv, value, NULL, 0);
+}
+
+
+static ngx_int_t
+ngx_http_set_header_helper(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value,
+    ngx_table_elt_t **output_header, ngx_flag_t no_create)
+{
+    ngx_table_elt_t             *h;
+    ngx_list_part_t             *part;
+    ngx_uint_t                   i;
+    ngx_flag_t                   matched = 0;
+
+    dd_enter();
+
+#if 1
+    if (r->headers_out.location
+        && r->headers_out.location->value.len
+        && r->headers_out.location->value.data[0] == '/')
+    {
+        /* XXX ngx_http_core_find_config_phase, for example,
+         * may not initialize the "key" and "hash" fields
+         * for a nasty optimization purpose, and
+         * we have to work-around it here */
+
+        r->headers_out.location->hash = ngx_http_headers_more_location_hash;
+        ngx_str_set(&r->headers_out.location->key, "Location");
+    }
+#endif
+
+    if (hv->append) {
+        goto append;
+    }
+
+    part = &r->headers_out.headers.part;
+    h = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            h = part->elts;
+            i = 0;
+        }
+
+        if (h[i].hash == 0) {
+            continue;
+        }
+
+        if (!hv->wildcard
+            && h[i].key.len == hv->key.len
+            && ngx_strncasecmp(h[i].key.data, hv->key.data,
+                               h[i].key.len) == 0)
+        {
+            goto matched;
+        }
+
+        if (hv->wildcard
+            && h[i].key.len >= hv->key.len - 1
+            && ngx_strncasecmp(h[i].key.data, hv->key.data,
+                               hv->key.len - 1) == 0)
+        {
+            goto matched;
+        }
+
+        /* not matched */
+        continue;
+
+matched:
+
+        if (value->len == 0 || matched) {
+            dd("clearing normal header for %.*s", (int) hv->key.len,
+               hv->key.data);
+
+            h[i].value.len = 0;
+            h[i].hash = 0;
+
+        } else {
+            h[i].value = *value;
+            h[i].hash = hv->hash;
+        }
+
+        if (output_header) {
+            *output_header = &h[i];
+        }
+
+        matched = 1;
+    }
+
+    if (matched){
+        return NGX_OK;
+    }
+
+    if ((hv->wildcard || no_create) && value->len == 0) {
+        return NGX_OK;
+    }
+
+    /* XXX we still need to create header slot even if the value
+     * is empty because some builtin headers like Last-Modified
+     * relies on this to get cleared */
+
+append:
+
+    h = ngx_list_push(&r->headers_out.headers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (value->len == 0) {
+        h->hash = 0;
+
+    } else {
+        h->hash = hv->hash;
+    }
+
+    h->key = hv->key;
+    h->value = *value;
+
+    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
+    if (h->lowcase_key == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
+
+    if (output_header) {
+        *output_header = h;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_set_builtin_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    ngx_table_elt_t  *h, **old;
+
+    dd_enter();
+
+    if (hv->offset) {
+        old = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
+
+    } else {
+        old = NULL;
+    }
+
+    if (old == NULL || *old == NULL) {
+        return ngx_http_set_header_helper(r, hv, value, old, 0);
+    }
+
+    h = *old;
+
+    if (value->len == 0) {
+        dd("clearing the builtin header");
+
+        h->hash = 0;
+        h->value = *value;
+
+        return NGX_OK;
+    }
+
+    h->hash = hv->hash;
+    h->key = hv->key;
+    h->value = *value;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+#if defined(nginx_version) && nginx_version >= 1023000
+    ngx_table_elt_t  **headers, *h, *ho, **ph;
+
+    headers = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
+
+    if (*headers) {
+        for (h = (*headers)->next; h; h = h->next) {
+            h->hash = 0;
+            h->value.len = 0;
+        }
+
+        h = *headers;
+
+        h->value = *value;
+
+        if (value->len == 0) {
+            h->hash = 0;
+
+        } else {
+            h->hash = hv->hash;
+        }
+
+        return NGX_OK;
+    }
+
+    for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ }
+
+    ho = ngx_list_push(&r->headers_out.headers);
+    if (ho == NULL) {
+        return NGX_ERROR;
+    }
+
+    ho->value = *value;
+    ho->hash = hv->hash;
+    ngx_str_set(&ho->key, "Cache-Control");
+    ho->next = NULL;
+    *ph = ho;
+
+    return NGX_OK;
+#else
+    ngx_array_t      *pa;
+    ngx_table_elt_t  *ho, **ph;
+    ngx_uint_t        i;
+
+    pa = (ngx_array_t *) ((char *) &r->headers_out + hv->offset);
+
+    if (pa->elts == NULL) {
+        if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *))
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    /* override old values (if any) */
+
+    if (pa->nelts > 0) {
+        ph = pa->elts;
+        for (i = 1; i < pa->nelts; i++) {
+            ph[i]->hash = 0;
+            ph[i]->value.len = 0;
+        }
+
+        ph[0]->value = *value;
+
+        if (value->len == 0) {
+            ph[0]->hash = 0;
+
+        } else {
+            ph[0]->hash = hv->hash;
+        }
+
+        return NGX_OK;
+    }
+
+    ph = ngx_array_push(pa);
+    if (ph == NULL) {
+        return NGX_ERROR;
+    }
+
+    ho = ngx_list_push(&r->headers_out.headers);
+    if (ho == NULL) {
+        return NGX_ERROR;
+    }
+
+    ho->value = *value;
+    ho->hash = hv->hash;
+    ngx_str_set(&ho->key, "Cache-Control");
+    *ph = ho;
+
+    return NGX_OK;
+#endif
+}
+
+
+static ngx_int_t
+ngx_http_set_content_type_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    u_char          *p, *last, *end;
+
+    r->headers_out.content_type_len = value->len;
+    r->headers_out.content_type = *value;
+    r->headers_out.content_type_hash = hv->hash;
+    r->headers_out.content_type_lowcase = NULL;
+
+    p = value->data;
+    end = p + value->len;
+
+    for (; p != end; p++) {
+
+        if (*p != ';') {
+            continue;
+        }
+
+        last = p;
+
+        while (*++p == ' ') { /* void */ }
+
+        if (p == end) {
+            break;
+        }
+
+        if (ngx_strncasecmp(p, (u_char *) "charset=", 8) != 0) {
+            continue;
+        }
+
+        p += 8;
+
+        r->headers_out.content_type_len = last - value->data;
+
+        if (*p == '"') {
+            p++;
+        }
+
+        last = end;
+
+        if (*(last - 1) == '"') {
+            last--;
+        }
+
+        r->headers_out.charset.len = last - p;
+        r->headers_out.charset.data = p;
+
+        break;
+    }
+
+    value->len = 0;
+
+    return ngx_http_set_header_helper(r, hv, value, NULL, 1);
+}
+
+
+static ngx_int_t
+ngx_http_set_content_length_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    off_t           len;
+
+    if (value->len == 0) {
+        return ngx_http_clear_content_length_header(r, hv, value);
+    }
+
+    len = ngx_atosz(value->data, value->len);
+    if (len == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    r->headers_out.content_length_n = len;
+
+    return ngx_http_set_builtin_header(r, hv, value);
+}
+
+
+static ngx_int_t
+ngx_http_set_accept_ranges_header(ngx_http_request_t *r,
+    ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    if (value->len == 0) {
+        r->allow_ranges = 0;
+    }
+
+    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_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    r->headers_out.content_length_n = -1;
+
+    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_headers_more_header_val_t *hv, ngx_str_t *value)
+{
+    dd_enter();
+
+    value->len = 0;
+
+    return ngx_http_set_builtin_header(r, hv, value);
+}
+
+
+char *
+ngx_http_headers_more_set_headers(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_headers_more_parse_directive(cf, cmd, conf,
+                                         ngx_http_headers_more_opcode_set);
+}
+
+
+char *
+ngx_http_headers_more_clear_headers(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf)
+{
+    return ngx_http_headers_more_parse_directive(cf, cmd, conf,
+                                        ngx_http_headers_more_opcode_clear);
+}
+
+
+static ngx_flag_t
+ngx_http_headers_more_check_type(ngx_http_request_t *r, ngx_array_t *types)
+{
+    ngx_uint_t          i;
+    ngx_str_t          *t;
+
+    dd("headers_out->content_type: %.*s (len %d)",
+       (int) r->headers_out.content_type.len,
+       r->headers_out.content_type.data,
+       (int) r->headers_out.content_type.len);
+
+    t = types->elts;
+
+    for (i = 0; i < types->nelts; i++) {
+        dd("...comparing with type [%.*s]", (int) t[i].len, t[i].data);
+
+        if (r->headers_out.content_type_len == t[i].len
+            && ngx_strncmp(r->headers_out.content_type.data,
+                           t[i].data, t[i].len) == 0)
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+
+static ngx_flag_t
+ngx_http_headers_more_check_status(ngx_http_request_t *r, ngx_array_t *statuses)
+{
+    ngx_uint_t          i;
+    ngx_uint_t         *status;
+
+    dd("headers_out.status = %d", (int) r->headers_out.status);
+
+    status = statuses->elts;
+    for (i = 0; i < statuses->nelts; i++) {
+        dd("...comparing with specified status %d", (int) status[i]);
+
+        if (r->headers_out.status == status[i]) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+
+static char *
+ngx_http_headers_more_parse_directive(ngx_conf_t *cf, ngx_command_t *ngx_cmd,
+    void *conf, ngx_http_headers_more_opcode_t opcode)
+{
+    ngx_http_headers_more_loc_conf_t   *hlcf = conf;
+
+    ngx_uint_t                          i, j;
+    ngx_http_headers_more_cmd_t        *cmd;
+    ngx_str_t                          *arg;
+    ngx_flag_t                          ignore_next_arg;
+    ngx_str_t                          *cmd_name;
+    ngx_int_t                           rc;
+    ngx_flag_t                          append = 0;
+    ngx_flag_t                          is_builtin_header = 0;
+    ngx_http_headers_more_header_val_t *h;
+    ngx_http_headers_more_set_header_t *handlers;
+
+    ngx_http_headers_more_main_conf_t  *hmcf;
+
+    if (hlcf->cmds == NULL) {
+        hlcf->cmds = ngx_array_create(cf->pool, 1,
+                                      sizeof(ngx_http_headers_more_cmd_t));
+
+        if (hlcf->cmds == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    cmd = ngx_array_push(hlcf->cmds);
+    if (cmd == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    cmd->headers =
+        ngx_array_create(cf->pool, 1,
+                         sizeof(ngx_http_headers_more_header_val_t));
+    if (cmd->headers == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    cmd->types = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t));
+    if (cmd->types == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    cmd->statuses = ngx_array_create(cf->pool, 1, sizeof(ngx_uint_t));
+    if (cmd->statuses == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    arg = cf->args->elts;
+
+    cmd_name = &arg[0];
+
+    ignore_next_arg = 0;
+
+    for (i = 1; i < cf->args->nelts; i++) {
+
+        if (ignore_next_arg) {
+            ignore_next_arg = 0;
+            continue;
+        }
+
+        if (arg[i].len == 0) {
+            continue;
+        }
+
+        if (arg[i].data[0] != '-') {
+            rc = ngx_http_headers_more_parse_header(cf, cmd_name,
+                                                    &arg[i], cmd->headers,
+                                                    opcode,
+                                        ngx_http_headers_more_set_handlers);
+
+            if (rc != NGX_OK) {
+                return NGX_CONF_ERROR;
+            }
+
+            continue;
+        }
+
+        if (arg[i].len == 2) {
+            if (arg[i].data[1] == 't') {
+                if (i == cf->args->nelts - 1) {
+                    ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                                  "%V: option -t takes an argument.",
+                                  cmd_name);
+
+                    return NGX_CONF_ERROR;
+                }
+
+                rc = ngx_http_headers_more_parse_types(cf->log, cmd_name,
+                                                       &arg[i + 1],
+                                                       cmd->types);
+
+                if (rc != NGX_OK) {
+                    return NGX_CONF_ERROR;
+                }
+
+                ignore_next_arg = 1;
+
+                continue;
+
+            } else if (arg[i].data[1] == 's') {
+
+                if (i == cf->args->nelts - 1) {
+                    ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                                  "%V: option -s takes an argument.",
+                                  cmd_name);
+
+                    return NGX_CONF_ERROR;
+                }
+
+                rc = ngx_http_headers_more_parse_statuses(cf->log, cmd_name,
+                                                          &arg[i + 1],
+                                                          cmd->statuses);
+
+                if (rc != NGX_OK) {
+                    return NGX_CONF_ERROR;
+                }
+
+                ignore_next_arg = 1;
+
+                continue;
+
+            } else if (arg[i].data[1] == 'a') {
+
+                if (ngx_strncasecmp((u_char *) "more_set_headers",
+                                    cmd_name->data, cmd_name->len) != 0)
+                {
+                    ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                                  "%V: invalid option name: \"%V\"",
+                                  cmd_name, &arg[i]);
+
+                    return NGX_CONF_ERROR;
+                }
+
+                dd("Found append flag");
+                append = 1;
+                continue;
+            }
+        }
+
+        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                      "%V: invalid option name: \"%V\"", cmd_name, &arg[i]);
+
+        return NGX_CONF_ERROR;
+    }
+
+    dd("Found %d statuses, %d types, and %d headers",
+       (int) cmd->statuses->nelts, (int) cmd->types->nelts,
+       (int) cmd->headers->nelts);
+
+    if (cmd->headers->nelts == 0) {
+        cmd->headers = NULL;
+
+    } else {
+
+        h = cmd->headers->elts;
+        for (i = 0; i < cmd->headers->nelts; i++) {
+            h[i].append = 0;
+
+            handlers = ngx_http_headers_more_set_handlers;
+
+            for (j = 0; handlers[j].name.len; j++) {
+                if (h[i].key.len == handlers[j].name.len
+                    && ngx_strncasecmp(h[i].key.data, handlers[j].name.data,
+                                       h[i].key.len) == 0)
+                {
+                    is_builtin_header = 1;
+                    break;
+                }
+            }
+
+            if (is_builtin_header && append) {
+                ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                              "%V: can not append builtin headers \"%V\"",
+                              cmd_name, &h[i].key);
+
+                return NGX_CONF_ERROR;
+            }
+
+            if (!is_builtin_header) {
+                h[i].append = append;
+            }
+        }
+    }
+
+    if (cmd->types->nelts == 0) {
+        cmd->types = NULL;
+    }
+
+    if (cmd->statuses->nelts == 0) {
+        cmd->statuses = NULL;
+    }
+
+    cmd->is_input = 0;
+
+    hmcf = ngx_http_conf_get_module_main_conf(cf,
+                                         ngx_http_headers_more_filter_module);
+
+    hmcf->requires_filter = 1;
+
+    return NGX_CONF_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_out.h b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_out.h
new file mode 100644
index 0000000..c939507
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_headers_out.h
@@ -0,0 +1,26 @@
+
+/*
+ * Copyright (c) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_HEADERS_MORE_OUTPUT_HEADERS_H
+#define NGX_HTTP_HEADERS_MORE_OUTPUT_HEADERS_H
+
+
+#include "ngx_http_headers_more_filter_module.h"
+
+
+/* output header setters and clearers */
+
+ngx_int_t ngx_http_headers_more_exec_cmd(ngx_http_request_t *r,
+    ngx_http_headers_more_cmd_t *cmd);
+
+char *ngx_http_headers_more_set_headers(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+
+char *ngx_http_headers_more_clear_headers(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+
+
+#endif /* NGX_HTTP_HEADERS_MORE_OUTPUT_HEADERS_H */
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_util.c b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_util.c
new file mode 100644
index 0000000..e1f3636
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_util.c
@@ -0,0 +1,382 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_headers_more_util.h"
+#include <ctype.h>
+
+
+ngx_int_t
+ngx_http_headers_more_parse_header(ngx_conf_t *cf, ngx_str_t *cmd_name,
+    ngx_str_t *raw_header, ngx_array_t *headers,
+    ngx_http_headers_more_opcode_t opcode,
+    ngx_http_headers_more_set_header_t *handlers)
+{
+    ngx_http_headers_more_header_val_t             *hv;
+
+    ngx_uint_t                           i;
+    ngx_str_t                            key = ngx_null_string;
+    ngx_str_t                            value = ngx_null_string;
+    ngx_flag_t                           seen_end_of_key;
+    ngx_http_compile_complex_value_t     ccv;
+    u_char                              *p;
+
+    hv = ngx_array_push(headers);
+    if (hv == NULL) {
+        return NGX_ERROR;
+    }
+
+    seen_end_of_key = 0;
+    for (i = 0; i < raw_header->len; i++) {
+        if (key.len == 0) {
+            if (isspace(raw_header->data[i])) {
+                continue;
+            }
+
+            key.data = raw_header->data;
+            key.len  = 1;
+
+            continue;
+        }
+
+        if (!seen_end_of_key) {
+            if (raw_header->data[i] == ':'
+                || isspace(raw_header->data[i]))
+            {
+                seen_end_of_key = 1;
+                continue;
+            }
+
+            key.len++;
+
+            continue;
+        }
+
+        if (value.len == 0) {
+            if (raw_header->data[i] == ':'
+                || isspace(raw_header->data[i]))
+            {
+                continue;
+            }
+
+            value.data = &raw_header->data[i];
+            value.len  = 1;
+
+            continue;
+        }
+
+        value.len++;
+    }
+
+    if (key.len == 0) {
+        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                      "%V: no key found in the header argument: %V",
+                      cmd_name, raw_header);
+
+        return NGX_ERROR;
+    }
+
+    hv->wildcard = (key.data[key.len - 1] == '*');
+    if (hv->wildcard && key.len<2){
+        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                      "%V: wildcard key too short: %V",
+                      cmd_name, raw_header);
+        return NGX_ERROR;
+    }
+
+    hv->hash = ngx_hash_key_lc(key.data, key.len);
+    hv->key = key;
+
+    hv->offset = 0;
+
+    for (i = 0; handlers[i].name.len; i++) {
+        if (hv->key.len != handlers[i].name.len
+            || ngx_strncasecmp(hv->key.data, handlers[i].name.data,
+                               handlers[i].name.len) != 0)
+        {
+            dd("hv key comparison: %s <> %s", handlers[i].name.data,
+               hv->key.data);
+
+            continue;
+        }
+
+        hv->offset = handlers[i].offset;
+        hv->handler = handlers[i].handler;
+
+        break;
+    }
+
+    if (handlers[i].name.len == 0 && handlers[i].handler) {
+        hv->offset = handlers[i].offset;
+        hv->handler = handlers[i].handler;
+    }
+
+    if (opcode == ngx_http_headers_more_opcode_clear) {
+        value.len = 0;
+    }
+
+    if (value.len == 0) {
+        ngx_memzero(&hv->value, sizeof(ngx_http_complex_value_t));
+        return NGX_OK;
+
+    }
+
+    /* Nginx request header value requires to be a null-terminated
+     * C string */
+
+    p = ngx_palloc(cf->pool, value.len + 1);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(p, value.data, value.len);
+    p[value.len] = '\0';
+    value.data = p;
+    value.len++; /* we should also compile the trailing '\0' */
+
+    /* compile the header value as a complex value */
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value;
+    ccv.complex_value = &hv->value;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_headers_more_parse_statuses(ngx_log_t *log, ngx_str_t *cmd_name,
+    ngx_str_t *value, ngx_array_t *statuses)
+{
+    u_char          *p, *last;
+    ngx_uint_t      *s = NULL;
+
+    p = value->data;
+    last = p + value->len;
+
+    for (; p != last; p++) {
+        if (s == NULL) {
+            if (isspace(*p)) {
+                continue;
+            }
+
+            s = ngx_array_push(statuses);
+            if (s == NULL) {
+                return NGX_ERROR;
+            }
+
+            if (*p >= '0' && *p <= '9') {
+                *s = *p - '0';
+
+            } else {
+                ngx_log_error(NGX_LOG_ERR, log, 0,
+                              "%V: invalid digit \"%c\" found in "
+                              "the status code list \"%V\"",
+                              cmd_name, *p, value);
+
+                return NGX_ERROR;
+            }
+
+            continue;
+        }
+
+        if (isspace(*p)) {
+            dd("Parsed status %d", (int) *s);
+
+            s = NULL;
+            continue;
+        }
+
+        if (*p >= '0' && *p <= '9') {
+            *s *= 10;
+            *s += *p - '0';
+
+        } else {
+            ngx_log_error(NGX_LOG_ERR, log, 0,
+                          "%V: invalid digit \"%c\" found in "
+                          "the status code list \"%V\"",
+                          cmd_name, *p, value);
+
+            return NGX_ERROR;
+        }
+    }
+
+    if (s) {
+        dd("Parsed status %d", (int) *s);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_headers_more_parse_types(ngx_log_t *log, ngx_str_t *cmd_name,
+    ngx_str_t *value, ngx_array_t *types)
+{
+    u_char          *p, *last;
+    ngx_str_t       *t = NULL;
+
+    p = value->data;
+    last = p + value->len;
+
+    for (; p != last; p++) {
+        if (t == NULL) {
+            if (isspace(*p) || *p == ';') {
+                continue;
+            }
+
+            t = ngx_array_push(types);
+            if (t == NULL) {
+                return NGX_ERROR;
+            }
+
+            t->len = 1;
+            t->data = p;
+
+            continue;
+        }
+
+        if (isspace(*p) || *p == ';') {
+            t = NULL;
+            continue;
+        }
+
+        t->len++;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
+    ngx_uint_t i)
+{
+    ngx_table_elt_t             *data;
+    ngx_list_part_t             *new, *part;
+
+    dd("list rm item: part %p, i %d, nalloc %d", cur, (int) i,
+       (int) l->nalloc);
+
+    data = cur->elts;
+
+    dd("cur: nelts %d, nalloc %d", (int) cur->nelts,
+       (int) l->nalloc);
+
+    if (i == 0) {
+        cur->elts = (char *) cur->elts + l->size;
+        cur->nelts--;
+
+        if (cur == l->last) {
+            if (cur->nelts == 0) {
+#if 1
+                part = &l->part;
+
+                if (part == cur) {
+                    cur->elts = (char *) cur->elts - l->size;
+                    /* do nothing */
+
+                } else {
+                    while (part->next != cur) {
+                        if (part->next == NULL) {
+                            return NGX_ERROR;
+                        }
+
+                        part = part->next;
+                    }
+
+                    l->last = part;
+                    part->next = NULL;
+                    dd("part nelts: %d", (int) part->nelts);
+                    l->nalloc = part->nelts;
+                }
+#endif
+
+            } else {
+                l->nalloc--;
+            }
+
+            return NGX_OK;
+        }
+
+        if (cur->nelts == 0) {
+            part = &l->part;
+
+            if (part == cur) {
+                ngx_http_headers_more_assert(cur->next != NULL);
+
+                dd("remove 'cur' from the list by rewriting 'cur': "
+                   "l->last: %p, cur: %p, cur->next: %p, part: %p",
+                   l->last, cur, cur->next, part);
+
+                if (l->last == cur->next) {
+                    dd("last is cur->next");
+                    l->part = *(cur->next);
+                    l->last = part;
+                    l->nalloc = part->nelts;
+
+                } else {
+                    l->part = *(cur->next);
+                }
+
+            } else {
+                dd("remove 'cur' from the list");
+                while (part->next != cur) {
+                    if (part->next == NULL) {
+                        return NGX_ERROR;
+                    }
+
+                    part = part->next;
+                }
+
+                part->next = cur->next;
+            }
+
+            return NGX_OK;
+        }
+
+        return NGX_OK;
+    }
+
+    if (i == cur->nelts - 1) {
+        cur->nelts--;
+
+        if (cur == l->last) {
+            l->nalloc = cur->nelts;
+        }
+
+        return NGX_OK;
+    }
+
+    new = ngx_palloc(l->pool, sizeof(ngx_list_part_t));
+    if (new == NULL) {
+        return NGX_ERROR;
+    }
+
+    new->elts = &data[i + 1];
+    new->nelts = cur->nelts - i - 1;
+    new->next = cur->next;
+
+    cur->nelts = i;
+    cur->next = new;
+    if (cur == l->last) {
+        l->last = new;
+        l->nalloc = new->nelts;
+    }
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_util.h b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_util.h
new file mode 100644
index 0000000..6c4614b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/src/ngx_http_headers_more_util.h
@@ -0,0 +1,52 @@
+
+/*
+ * Copyright (c) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_HEADERS_MORE_UTIL_H
+#define NGX_HTTP_HEADERS_MORE_UTIL_H
+
+
+#include "ngx_http_headers_more_filter_module.h"
+
+
+#define ngx_http_headers_more_hash_literal(s)                                \
+    ngx_http_headers_more_hash_str((u_char *) s, sizeof(s) - 1)
+
+
+static ngx_inline ngx_uint_t
+ngx_http_headers_more_hash_str(u_char *src, size_t n)
+{
+    ngx_uint_t  key;
+
+    key = 0;
+
+    while (n--) {
+        key = ngx_hash(key, *src);
+        src++;
+    }
+
+    return key;
+}
+
+
+extern ngx_uint_t  ngx_http_headers_more_location_hash;
+
+
+ngx_int_t ngx_http_headers_more_parse_header(ngx_conf_t *cf,
+    ngx_str_t *cmd_name, ngx_str_t *raw_header, ngx_array_t *headers,
+    ngx_http_headers_more_opcode_t opcode,
+    ngx_http_headers_more_set_header_t *handlers);
+
+ngx_int_t ngx_http_headers_more_parse_statuses(ngx_log_t *log,
+    ngx_str_t *cmd_name, ngx_str_t *value, ngx_array_t *statuses);
+
+ngx_int_t ngx_http_headers_more_parse_types(ngx_log_t *log,
+    ngx_str_t *cmd_name, ngx_str_t *value, ngx_array_t *types);
+
+ngx_int_t ngx_http_headers_more_rm_header_helper(ngx_list_t *l,
+    ngx_list_part_t *cur, ngx_uint_t i);
+
+
+#endif /* NGX_HTTP_HEADERS_MORE_UTIL_H */
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/bug.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/bug.t
new file mode 100644
index 0000000..2339401
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/bug.t
@@ -0,0 +1,416 @@
+# vi:filetype=
+
+use Test::Nginx::Socket; # 'no_plan';
+
+repeat_each(2);
+
+plan tests => 56 * repeat_each();
+
+no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set Server
+--- config
+    #more_set_headers 'Last-Modified: x';
+    more_clear_headers 'Last-Modified';
+--- request
+    GET /index.html
+--- response_headers
+! Last-Modified
+--- response_body_like: It works!
+
+
+
+=== TEST 2: variables in the Ranges header
+--- config
+    location /index.html {
+        set $rfrom 1;
+        set $rto 3;
+        more_set_input_headers 'Range: bytes=$rfrom - $rto';
+        #more_set_input_headers 'Range: bytes=1 - 3';
+        #echo $http_range;
+    }
+--- request
+GET /index.html
+--- error_code: 206
+--- response_body chomp
+htm
+
+
+
+=== TEST 3: mime type overriding (inlined types)
+--- config
+    more_clear_headers 'X-Powered-By' 'X-Runtime' 'ETag';
+
+    types {
+        text/html                             html htm shtml;
+        text/css                              css;
+    }
+--- user_files
+>>> a.css
+hello
+--- request
+GET /a.css
+--- error_code: 200
+--- response_headers
+Content-Type: text/css
+--- response_body
+hello
+
+
+
+=== TEST 4: mime type overriding (included types file)
+--- config
+    more_clear_headers 'X-Powered-By' 'X-Runtime' 'ETag';
+    include mime.types;
+--- user_files
+>>> a.css
+hello
+>>> ../conf/mime.types
+types {
+    text/html                             html htm shtml;
+    text/css                              css;
+}
+--- request
+GET /a.css
+--- error_code: 200
+--- response_headers
+Content-Type: text/css
+--- response_body
+hello
+
+
+
+=== TEST 5: empty variable as the header value
+--- config
+    location /foo {
+        more_set_headers 'X-Foo: $arg_foo';
+        echo hi;
+    }
+--- request
+    GET /foo
+--- response_headers
+! X-Foo
+--- response_body
+hi
+
+
+
+=== TEST 6: range bug
+--- config
+    location /index.html {
+        more_clear_input_headers "Range*" ;
+        more_clear_input_headers "Content-Range*" ;
+
+        more_set_input_headers 'Range: bytes=1-5';
+        more_set_headers  'Content-Range: bytes 1-5/1000';
+    }
+--- request
+    GET /index.html
+--- more_headers
+Range: bytes=1-3
+--- raw_response_headers_like: Content-Range: bytes 1-5/1000$
+--- response_body chop
+html>
+--- error_code: 206
+--- SKIP
+
+
+
+=== TEST 7: Allow-Ranges
+--- config
+    location /index.html {
+        more_clear_headers 'Accept-Ranges';
+    }
+--- request
+    GET /index.html
+--- response_headers
+! Accept-Ranges
+--- response_body_like: It works
+
+
+
+=== TEST 8: clear hand-written Allow-Ranges headers
+--- config
+    location /index.html {
+        more_set_headers 'Accept-Ranges: bytes';
+        more_clear_headers 'Accept-Ranges';
+    }
+--- request
+    GET /index.html
+--- response_headers
+! Accept-Ranges
+--- response_body_like: It works
+
+
+
+=== TEST 9: clear first, then add
+--- config
+    location /bug {
+        more_clear_headers 'Foo';
+        more_set_headers 'Foo: a';
+        echo hello;
+    }
+--- request
+    GET /bug
+--- raw_response_headers_like eval
+".*Foo: a.*"
+--- response_body
+hello
+
+
+
+=== TEST 10: first add, then clear, then add again
+--- config
+    location /bug {
+        more_set_headers 'Foo: a';
+        more_clear_headers 'Foo';
+        more_set_headers 'Foo: b';
+        echo hello;
+    }
+--- request
+    GET /bug
+--- raw_response_headers_like eval
+".*Foo: b.*"
+--- response_body
+hello
+
+
+
+=== TEST 11: override charset
+--- config
+    location /foo {
+        charset iso-8859-1;
+        default_type "text/html";
+        echo hiya;
+    }
+
+    location /bug {
+        more_set_headers "Content-Type: text/html; charset=UTF-8";
+        proxy_pass http://127.0.0.1:$server_port/foo;
+    }
+--- request
+    GET /bug
+--- response_body
+hiya
+--- response_headers
+Content-Type: text/html; charset=UTF-8
+
+
+
+=== TEST 12: set multi-value header to a single value
+--- config
+    location /main {
+        set $footer '';
+        proxy_pass http://127.0.0.1:$server_port/foo;
+        more_set_headers 'Foo: b';
+        header_filter_by_lua '
+            ngx.var.footer = ngx.header.Foo
+        ';
+        echo_after_body $footer;
+    }
+    location /foo {
+        echo foo;
+        add_header Foo a;
+        add_header Foo c;
+    }
+--- request
+    GET /main
+--- response_headers
+Foo: b
+--- response_body
+foo
+b
+
+
+
+=== TEST 13: set multi values to cache-control and override it with multiple values (to reproduce a bug)
+--- config
+    location /lua {
+        content_by_lua '
+            ngx.header.cache_control = { "private", "no-store", "foo", "bar", "baz" }
+            ngx.send_headers()
+            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
+        ';
+        more_clear_headers Cache-Control;
+        add_header Cache-Control "blah";
+    }
+--- request
+    GET /lua
+--- response_headers
+Cache-Control: blah
+--- response_body
+Cache-Control: blah
+
+
+
+=== TEST 14: set 20+ headers
+--- config
+    location /test {
+        more_clear_input_headers "Authorization";
+        echo $http_a1;
+        echo $http_authorization;
+        echo $http_a2;
+        echo $http_a3;
+        echo $http_a23;
+        echo $http_a24;
+        echo $http_a25;
+    }
+--- request
+    GET /test
+--- more_headers eval
+my $i = 1;
+my $s;
+while ($i <= 25) {
+    $s .= "A$i: $i\n";
+    if ($i == 22) {
+        $s .= "Authorization: blah\n";
+    }
+    $i++;
+}
+#warn $s;
+$s
+--- response_body
+1
+
+2
+3
+23
+24
+25
+
+
+
+=== TEST 15: github #20: segfault caused by the nasty optimization in the nginx core (set)
+--- config
+    location = /t/ {
+        more_set_headers "Foo: 1";
+        proxy_pass http://127.0.0.1:$server_port;
+    }
+--- request
+GET /t
+--- more_headers
+Foo: bar
+Bah: baz
+--- response_body_like: 301 Moved Permanently
+--- error_code: 301
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: github #20: segfault caused by the nasty optimization in the nginx core (clear)
+--- config
+    location = /t/ {
+        more_clear_headers Foo;
+        proxy_pass http://127.0.0.1:$server_port;
+    }
+--- request
+GET /t
+--- more_headers
+Foo: bar
+Bah: baz
+--- response_body_like: 301 Moved Permanently
+--- error_code: 301
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: Content-Type response headers with a charset param (correct -t values)
+--- config
+    location = /t {
+        more_set_headers -t 'text/html' 'X-Foo: Bar';
+        proxy_pass http://127.0.0.1:$server_port/fake;
+    }
+
+    location = /fake {
+        default_type text/html;
+        charset utf-8;
+        echo ok;
+    }
+--- request
+GET /t
+--- response_headers
+X-Foo: Bar
+--- response_body
+ok
+
+
+
+=== TEST 18: Content-Type response headers with a charset param (WRONG -t values)
+--- config
+    location = /t {
+        more_set_headers -t 'text/html; charset=utf-8' 'X-Foo: Bar';
+        proxy_pass http://127.0.0.1:$server_port/fake;
+    }
+
+    location = /fake {
+        default_type text/html;
+        charset utf-8;
+        echo ok;
+    }
+--- request
+GET /t
+--- response_headers
+X-Foo: Bar
+--- response_body
+ok
+
+
+
+=== TEST 19: for bad requests (bad request method letter case)
+--- config
+    error_page 400 = /err;
+
+    location = /err {
+        more_set_input_headers "Foo: bar";
+        echo ok;
+    }
+--- raw_request
+GeT / HTTP/1.1
+--- response_body
+ok
+--- no_check_leak
+
+
+
+=== TEST 20: for bad requests (bad request method names)
+--- config
+    error_page 400 = /err;
+
+    location = /err {
+        more_set_input_headers "Foo: bar";
+        echo ok;
+    }
+--- raw_request
+GET x HTTP/1.1
+--- response_body
+ok
+--- no_check_leak
+
+
+
+=== TEST 21: override Cache-Control header sent by proxy module
+--- config
+    location = /back {
+        content_by_lua_block {
+            ngx.header['Cache-Control'] = 'max-age=0, no-cache'
+            ngx.send_headers()
+            ngx.say("Cache-Control: ", ngx.var.sent_http_cache_control)
+        }
+    }
+
+    location = /t {
+        more_set_headers "Cache-Control: max-age=1800";
+        proxy_pass http://127.0.0.1:$server_port/back;
+    }
+--- request
+    GET /t
+--- response_headers
+Cache-Control: max-age=1800
+--- response_body
+Cache-Control: max-age=0, no-cache
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/builtin.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/builtin.t
new file mode 100644
index 0000000..27b20af
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/builtin.t
@@ -0,0 +1,338 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket; # 'no_plan';
+
+plan tests => 60;
+
+no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set Server
+--- config
+    location /foo {
+        echo hi;
+        more_set_headers 'Server: Foo';
+    }
+--- request
+    GET /foo
+--- response_headers
+Server: Foo
+--- response_body
+hi
+
+
+
+=== TEST 2: clear Server
+--- config
+    location /foo {
+        echo hi;
+        more_clear_headers 'Server: ';
+    }
+--- request
+    GET /foo
+--- response_headers
+! Server
+--- response_body
+hi
+
+
+
+=== TEST 3: set Content-Type
+--- config
+    location /foo {
+        default_type 'text/plan';
+        more_set_headers 'Content-Type: text/css';
+        echo hi;
+    }
+--- request
+    GET /foo
+--- response_headers
+Content-Type: text/css
+--- response_body
+hi
+
+
+
+=== TEST 4: set Content-Type
+--- config
+    location /foo {
+        default_type 'text/plan';
+        more_set_headers 'Content-Type: text/css';
+        return 404;
+    }
+--- request
+    GET /foo
+--- response_headers
+Content-Type: text/css
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 5: clear Content-Type
+--- config
+    location /foo {
+        default_type 'text/plain';
+        more_clear_headers 'Content-Type: ';
+        return 404;
+    }
+--- request
+    GET /foo
+--- response_headers
+! Content-Type
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 6: clear Content-Type (colon not required)
+--- config
+    location /foo {
+        default_type 'text/plain';
+        more_set_headers 'Content-Type: Hello';
+        more_clear_headers 'Content-Type';
+        return 404;
+    }
+--- request
+    GET /foo
+--- response_headers
+! Content-Type
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 7: clear Content-Type (value ignored)
+--- config
+    location /foo {
+        default_type 'text/plain';
+        more_set_headers 'Content-Type: Hello';
+        more_clear_headers 'Content-Type: blah';
+        return 404;
+    }
+--- request
+    GET /foo
+--- response_headers
+! Content-Type
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 8: clear Content-Type (case insensitive)
+--- config
+    location /foo {
+        default_type 'text/plain';
+        more_set_headers 'Content-Type: Hello';
+        more_clear_headers 'content-type: blah';
+        return 404;
+    }
+--- request
+    GET /foo
+--- response_headers
+! Content-Type
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 9: clear Content-Type using set empty
+--- config
+    location /foo {
+        default_type 'text/plain';
+        more_set_headers 'Content-Type: Hello';
+        more_set_headers 'content-type:';
+        return 404;
+    }
+--- request
+    GET /foo
+--- response_headers
+! Content-Type
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 10: clear Content-Type using setting key only
+--- config
+    location /foo {
+        default_type 'text/plain';
+        more_set_headers 'Content-Type: Hello';
+        more_set_headers 'content-type';
+        return 404;
+    }
+--- request
+    GET /foo
+--- response_headers
+! Content-Type
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 11: set content-length
+--- config
+    location /len {
+        more_set_headers 'Content-Length: 2';
+        echo hello;
+    }
+--- request
+    GET /len
+--- response_headers
+Content-Length: 2
+--- response_body chop
+he
+
+
+
+=== TEST 12: set content-length multiple times
+--- config
+    location /len {
+        more_set_headers 'Content-Length: 2';
+        more_set_headers 'Content-Length: 4';
+        echo hello;
+    }
+--- request
+    GET /len
+--- response_headers
+Content-Length: 4
+--- response_body chop
+hell
+
+
+
+=== TEST 13: clear content-length
+--- config
+    location /len {
+        more_set_headers 'Content-Length: 4';
+        more_set_headers 'Content-Length:';
+        echo hello;
+    }
+--- request
+    GET /len
+--- response_headers
+! Content-Length
+--- response_body
+hello
+
+
+
+=== TEST 14: clear content-length (another way)
+--- config
+    location /len {
+        more_set_headers 'Content-Length: 4';
+        more_clear_headers 'Content-Length';
+        echo hello;
+    }
+--- request
+    GET /len
+--- response_headers
+! Content-Length
+--- response_body
+hello
+
+
+
+=== TEST 15: clear content-type
+--- config
+    location /len {
+        default_type 'text/plain';
+        more_set_headers 'Content-Type:';
+        echo hello;
+    }
+--- request
+    GET /len
+--- response_headers
+! Content-Type
+--- response_body
+hello
+
+
+
+=== TEST 16: clear content-type (the other way)
+--- config
+    location /len {
+        default_type 'text/plain';
+        more_clear_headers 'Content-Type:';
+        echo hello;
+    }
+--- request
+    GET /len
+--- response_headers
+! Content-Type
+--- response_body
+hello
+
+
+
+=== TEST 17: set Charset
+--- config
+    location /len {
+        default_type 'text/plain';
+        more_set_headers 'Charset: gbk';
+        echo hello;
+    }
+--- request
+    GET /len
+--- response_headers
+Charset: gbk
+--- response_body
+hello
+
+
+
+=== TEST 18: clear Charset
+--- config
+    location /len {
+        default_type 'text/plain';
+        more_set_headers 'Charset: gbk';
+        more_clear_headers 'Charset';
+        echo hello;
+    }
+--- request
+    GET /len
+--- response_headers
+! Charset
+--- response_body
+hello
+
+
+
+=== TEST 19: clear Charset (the other way: using set)
+--- config
+    location /len {
+        default_type 'text/plain';
+        more_set_headers 'Charset: gbk';
+        more_set_headers 'Charset: ';
+        echo hello;
+    }
+--- request
+    GET /len
+--- response_headers
+! Charset
+--- response_body
+hello
+
+
+
+=== TEST 20: set Vary
+--- config
+    location /foo {
+        more_set_headers 'Vary: gbk';
+        echo hello;
+    }
+    location /len {
+        default_type 'text/plain';
+        more_set_headers 'Vary: hello';
+        proxy_pass http://127.0.0.1:$server_port/foo;
+    }
+--- request
+    GET /len
+--- response_headers
+Vary: hello
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/eval.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/eval.t
new file mode 100644
index 0000000..febd306
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/eval.t
@@ -0,0 +1,36 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket; # 'no_plan';
+
+repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+#no_long_string();
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set request header at client side
+--- config
+    location /foo {
+        eval_subrequest_in_memory off;
+        eval_override_content_type text/plain;
+        eval $res {
+            echo -n 1;
+        }
+        #echo "[$res]";
+        if ($res = '1') {
+            more_set_input_headers 'Foo: Bar';
+            echo "OK";
+            break;
+        }
+        echo "NOT OK";
+    }
+--- request
+    GET /foo
+--- response_body
+OK
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-conn.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-conn.t
new file mode 100644
index 0000000..f53e80f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-conn.t
@@ -0,0 +1,137 @@
+# 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() * (4 * blocks());
+
+#no_diff();
+no_long_string();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: clear the Connection req header
+--- config
+    location /req-header {
+        more_clear_input_headers Connection;
+        echo "connection: $http_connection";
+    }
+--- request
+GET /req-header
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: conn type: %d\n", $r->headers_in->connection_type)
+}
+
+--- stap_out
+rewrite: conn type: 1
+content: conn type: 0
+
+--- response_body
+connection: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: set custom Connection req header (close)
+--- config
+    location /req-header {
+        more_set_input_headers "Connection: CLOSE";
+        echo "connection: $http_connection";
+    }
+--- request
+GET /req-header
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: conn type: %d\n", $r->headers_in->connection_type)
+}
+
+--- stap_out
+rewrite: conn type: 1
+content: conn type: 1
+
+--- response_body
+connection: CLOSE
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: set custom Connection req header (keep-alive)
+--- config
+    location /req-header {
+        more_set_input_headers "Connection: keep-alive";
+        echo "connection: $http_connection";
+    }
+--- request
+GET /req-header
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: conn type: %d\n", $r->headers_in->connection_type)
+}
+
+--- stap_out
+rewrite: conn type: 1
+content: conn type: 2
+
+--- response_body
+connection: keep-alive
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: set custom Connection req header (bad)
+--- config
+    location /req-header {
+        more_set_input_headers "Connection: bad";
+        echo "connection: $http_connection";
+    }
+--- request
+GET /req-header
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: conn type: %d\n", $r->headers_in->connection_type)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: conn type: %d\n", $r->headers_in->connection_type)
+}
+
+--- stap_out
+rewrite: conn type: 1
+content: conn type: 0
+
+--- response_body
+connection: bad
+--- no_error_log
+[error]
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-cookie.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-cookie.t
new file mode 100644
index 0000000..3e5257b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-cookie.t
@@ -0,0 +1,183 @@
+# 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() * (4 * blocks());
+
+#no_diff();
+no_long_string();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: clear cookie (with existing cookies)
+--- config
+    location /t {
+        more_clear_input_headers Cookie;
+        echo "Cookie foo: $cookie_foo";
+        echo "Cookie baz: $cookie_baz";
+        echo "Cookie: $http_cookie";
+    }
+--- request
+GET /t
+--- more_headers
+Cookie: foo=bar
+Cookie: baz=blah
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
+}
+
+--- stap_out
+rewrite: cookies: 2
+content: cookies: 0
+
+--- response_body
+Cookie foo: 
+Cookie baz: 
+Cookie: 
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: clear cookie (without existing cookies)
+--- config
+    location /t {
+        more_clear_input_headers Cookie;
+        echo "Cookie foo: $cookie_foo";
+        echo "Cookie baz: $cookie_baz";
+        echo "Cookie: $http_cookie";
+    }
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
+}
+
+--- stap_out
+rewrite: cookies: 0
+content: cookies: 0
+
+--- response_body
+Cookie foo: 
+Cookie baz: 
+Cookie: 
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: set one custom cookie (with existing cookies)
+--- config
+    location /t {
+        more_set_input_headers "Cookie: boo=123";
+        echo "Cookie foo: $cookie_foo";
+        echo "Cookie baz: $cookie_baz";
+        echo "Cookie boo: $cookie_boo";
+        echo "Cookie: $http_cookie";
+    }
+--- request
+GET /t
+--- more_headers
+Cookie: foo=bar
+Cookie: baz=blah
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
+}
+
+--- stap_out
+rewrite: cookies: 2
+content: cookies: 1
+
+--- response_body
+Cookie foo: 
+Cookie baz: 
+Cookie boo: 123
+Cookie: boo=123
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: set one custom cookie (without existing cookies)
+--- config
+    location /t {
+        more_set_input_headers "Cookie: boo=123";
+        echo "Cookie foo: $cookie_foo";
+        echo "Cookie baz: $cookie_baz";
+        echo "Cookie boo: $cookie_boo";
+        echo "Cookie: $http_cookie";
+    }
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: cookies: %d\n", $r->headers_in->cookies->nelts)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: cookies: %d\n", $r->headers_in->cookies->nelts)
+}
+
+--- stap_out
+rewrite: cookies: 0
+content: cookies: 1
+
+--- response_body
+Cookie foo: 
+Cookie baz: 
+Cookie boo: 123
+Cookie: boo=123
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: for bad requests causing segfaults when setting & getting multi-value headers
+--- config
+    error_page 400 = /err;
+
+    location = /err {
+        more_set_input_headers "Cookie: foo=bar";
+        echo -n $cookie_foo;
+        echo ok;
+    }
+--- raw_request
+GeT / HTTP/1.1
+--- response_body
+ok
+--- no_error_log
+[warn]
+[error]
+--- no_check_leak
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-ua.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-ua.t
new file mode 100644
index 0000000..da9a60d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input-ua.t
@@ -0,0 +1,628 @@
+# 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() * (4 * blocks());
+
+#no_diff();
+no_long_string();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: clear Opera user-agent
+--- config
+    location /t {
+        more_clear_input_headers User-Agent;
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+User-Agent: Opera/9.80 (Macintosh; Intel Mac OS X 10.7.4; U; en) Presto/2.10.229 Version/11.62
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: opera: %d\n", $r->headers_in->opera)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: opera: %d\n", $r->headers_in->opera)
+}
+
+--- stap_out
+rewrite: opera: 1
+content: opera: 0
+
+--- response_body
+User-Agent: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: clear MSIE 4 user-agent
+--- config
+    location /t {
+        more_clear_input_headers User-Agent;
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+User-Agent: Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+--- stap_out
+rewrite: msie=1 msie6=1
+content: msie=0 msie6=0
+
+--- response_body
+User-Agent: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: set custom MSIE 4 user-agent
+--- config
+    location /t {
+        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)";
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+--- stap_out
+rewrite: msie=0 msie6=0
+content: msie=1 msie6=1
+
+--- response_body
+User-Agent: Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: clear MSIE 5 user-agent
+--- config
+    location /t {
+        more_clear_input_headers User-Agent;
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+User-Agent: Mozilla/4.0 (compatible; MSIE 5.01; Windows 95; MSIECrawler)
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+--- stap_out
+rewrite: msie=1 msie6=1
+content: msie=0 msie6=0
+
+--- response_body
+User-Agent: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: set custom MSIE 5 user-agent
+--- config
+    location /t {
+        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 5.01; Windows 95; MSIECrawler)";
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+--- stap_out
+rewrite: msie=0 msie6=0
+content: msie=1 msie6=1
+
+--- response_body
+User-Agent: Mozilla/4.0 (compatible; MSIE 5.01; Windows 95; MSIECrawler)
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: clear MSIE 6 (without SV1) user-agent
+--- config
+    location /t {
+        more_clear_input_headers User-Agent;
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+--- stap_out
+rewrite: msie=1 msie6=1
+content: msie=0 msie6=0
+
+--- response_body
+User-Agent: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: set custom MSIE 6 (without SV1) user-agent
+--- config
+    location /t {
+        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)";
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+--- stap_out
+rewrite: msie=0 msie6=0
+content: msie=1 msie6=1
+
+--- response_body
+User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: clear MSIE 6 (with SV1) user-agent
+--- config
+    location /t {
+        more_clear_input_headers User-Agent;
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+--- stap_out
+rewrite: msie=1 msie6=0
+content: msie=0 msie6=0
+
+--- response_body
+User-Agent: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: set custom MSIE 6 (with SV1) user-agent
+--- config
+    location /t {
+        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)";
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+--- stap_out
+rewrite: msie=0 msie6=0
+content: msie=1 msie6=0
+
+--- response_body
+User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; InfoPath.1)
+--- no_error_log
+[error]
+
+
+
+=== TEST 10: set custom MSIE 7 user-agent
+--- config
+    location /t {
+        more_set_input_headers "User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; winfx; .NET CLR 1.1.4322; .NET CLR 2.0.50727; Zune 2.0)";
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+F(ngx_http_core_content_phase) {
+    printf("content: msie=%d msie6=%d\n",
+           $r->headers_in->msie,
+           $r->headers_in->msie6)
+}
+
+--- stap_out
+rewrite: msie=0 msie6=0
+content: msie=1 msie6=0
+
+--- response_body
+User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; winfx; .NET CLR 1.1.4322; .NET CLR 2.0.50727; Zune 2.0)
+--- no_error_log
+[error]
+
+
+
+=== TEST 11: clear Gecko user-agent
+--- config
+    location /t {
+        more_clear_input_headers User-Agent;
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+User-Agent: Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: gecko: %d\n", $r->headers_in->gecko)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: gecko: %d\n", $r->headers_in->gecko)
+}
+
+--- stap_out
+rewrite: gecko: 1
+content: gecko: 0
+
+--- response_body
+User-Agent: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: set custom Gecko user-agent
+--- config
+    location /t {
+        more_set_input_headers "User-Agent: Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0";
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: gecko: %d\n", $r->headers_in->gecko)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: gecko: %d\n", $r->headers_in->gecko)
+}
+
+--- stap_out
+rewrite: gecko: 0
+content: gecko: 1
+
+--- response_body
+User-Agent: Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: clear Chrome user-agent
+--- config
+    location /t {
+        more_clear_input_headers User-Agent;
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.151 Safari/535.19
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: chrome: %d\n", $r->headers_in->chrome)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: chrome: %d\n", $r->headers_in->chrome)
+}
+
+--- stap_out
+rewrite: chrome: 1
+content: chrome: 0
+
+--- response_body
+User-Agent: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: set custom Chrome user-agent
+--- config
+    location /t {
+        more_set_input_headers "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.151 Safari/535.19";
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: chrome: %d\n", $r->headers_in->chrome)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: chrome: %d\n", $r->headers_in->chrome)
+}
+
+--- stap_out
+rewrite: chrome: 0
+content: chrome: 1
+
+--- response_body
+User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.151 Safari/535.19
+--- no_error_log
+[error]
+
+
+
+=== TEST 15: clear Safari (Mac OS X) user-agent
+--- config
+    location /t {
+        more_clear_input_headers User-Agent;
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: safari: %d\n", $r->headers_in->safari)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: safari: %d\n", $r->headers_in->safari)
+}
+
+--- stap_out
+rewrite: safari: 1
+content: safari: 0
+
+--- response_body
+User-Agent: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: set custom Safari user-agent
+--- config
+    location /t {
+        more_set_input_headers "User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8";
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: safari: %d\n", $r->headers_in->safari)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: safari: %d\n", $r->headers_in->safari)
+}
+
+--- stap_out
+rewrite: safari: 0
+content: safari: 1
+
+--- response_body
+User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: clear Konqueror user-agent
+--- config
+    location /t {
+        more_clear_input_headers User-Agent;
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: konqueror: %d\n", $r->headers_in->konqueror)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: konqueror: %d\n", $r->headers_in->konqueror)
+}
+
+--- stap_out
+rewrite: konqueror: 1
+content: konqueror: 0
+
+--- response_body
+User-Agent: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 18: set custom Konqueror user-agent
+--- config
+    location /t {
+        more_set_input_headers "User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)";
+        echo "User-Agent: $http_user_agent";
+    }
+
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    printf("rewrite: konqueror: %d\n", $r->headers_in->konqueror)
+}
+
+
+F(ngx_http_core_content_phase) {
+    printf("content: konqueror: %d\n", $r->headers_in->konqueror)
+}
+
+--- stap_out
+rewrite: konqueror: 0
+content: konqueror: 1
+
+--- response_body
+User-Agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.10 (like Gecko) (Kubuntu)
+--- no_error_log
+[error]
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input.t
new file mode 100644
index 0000000..01ae73f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/input.t
@@ -0,0 +1,1331 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket; # 'no_plan';
+
+repeat_each(2);
+
+plan tests => repeat_each() * 128;
+
+no_long_string();
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set request header at client side
+--- config
+    location /foo {
+        #more_set_input_headers 'X-Foo: howdy';
+        echo $http_x_foo;
+    }
+--- request
+    GET /foo
+--- more_headers
+X-Foo: blah
+--- response_headers
+! X-Foo
+--- response_body
+blah
+
+
+
+=== TEST 2: set request header at client side and rewrite it
+--- config
+    location /foo {
+        more_set_input_headers 'X-Foo: howdy';
+        echo $http_x_foo;
+    }
+--- request
+    GET /foo
+--- more_headers
+X-Foo: blah
+--- response_headers
+! X-Foo
+--- response_body
+howdy
+
+
+
+=== TEST 3: rewrite content length
+--- config
+    location /bar {
+        more_set_input_headers 'Content-Length: 2048';
+        echo_read_request_body;
+        echo_request_body;
+    }
+--- request eval
+"POST /bar\n" .
+"a" x 4096
+--- response_body eval
+"a" x 2048
+--- timeout: 15
+
+
+
+=== TEST 4: try to rewrite content length using the rewrite module
+Thisshould not take effect ;)
+--- config
+    location /bar {
+        set $http_content_length 2048;
+        echo_read_request_body;
+        echo_request_body;
+    }
+--- request eval
+"POST /bar\n" .
+"a" x 4096
+--- response_body eval
+"a" x 4096
+
+
+
+=== TEST 5: rewrite host and user-agent
+--- config
+    location /bar {
+        more_set_input_headers 'Host: foo' 'User-Agent: blah';
+        echo "Host: $host";
+        echo "User-Agent: $http_user_agent";
+    }
+--- request
+GET /bar
+--- response_body
+Host: foo
+User-Agent: blah
+
+
+
+=== TEST 6: clear host and user-agent
+$host always has a default value and cannot be really cleared.
+--- config
+    location /bar {
+        more_clear_input_headers 'Host: foo' 'User-Agent: blah';
+        echo "Host: $host";
+        echo "Host (2): $http_host";
+        echo "User-Agent: $http_user_agent";
+    }
+--- request
+GET /bar
+--- response_body
+Host: localhost
+Host (2): 
+User-Agent: 
+
+
+
+=== TEST 7: clear host and user-agent (the other way)
+--- config
+    location /bar {
+        more_set_input_headers 'Host:' 'User-Agent:' 'X-Foo:';
+        echo "Host: $host";
+        echo "User-Agent: $http_user_agent";
+        echo "X-Foo: $http_x_foo";
+    }
+--- request
+GET /bar
+--- more_headers
+X-Foo: bar
+--- response_body
+Host: localhost
+User-Agent: 
+X-Foo: 
+
+
+
+=== TEST 8: clear content-length
+--- config
+    location /bar {
+        more_set_input_headers 'Content-Length: ';
+        echo "Content-Length: $http_content_length";
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+--- response_body
+Content-Length: 
+
+
+
+=== TEST 9: clear content-length (the other way)
+--- config
+    location /bar {
+        more_clear_input_headers 'Content-Length: ';
+        echo "Content-Length: $http_content_length";
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+--- response_body
+Content-Length: 
+
+
+
+=== TEST 10: rewrite type
+--- config
+    location /bar {
+        more_set_input_headers 'Content-Type: text/css';
+        echo "Content-Type: $content_type";
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+Content-Type: text/plain
+--- response_body
+Content-Type: text/css
+
+
+
+=== TEST 11: clear type
+--- config
+    location /bar {
+        more_set_input_headers 'Content-Type:';
+        echo "Content-Type: $content_type";
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+Content-Type: text/plain
+--- response_body
+Content-Type: 
+
+
+
+=== TEST 12: clear type (the other way)
+--- config
+    location /bar {
+        more_clear_input_headers 'Content-Type:foo';
+        echo "Content-Type: $content_type";
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+Content-Type: text/plain
+--- response_body
+Content-Type: 
+
+
+
+=== TEST 13: add type constraints
+--- config
+    location /bar {
+        more_set_input_headers -t 'text/plain' 'X-Blah:yay';
+        echo $http_x_blah;
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+Content-Type: text/plain
+--- response_body
+yay
+
+
+
+=== TEST 14: add type constraints (not matched)
+--- config
+    location /bar {
+        more_set_input_headers -t 'text/plain' 'X-Blah:yay';
+        echo $http_x_blah;
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+Content-Type: text/css
+--- response_body eval: "\n"
+
+
+
+=== TEST 15: add type constraints (OR'd)
+--- config
+    location /bar {
+        more_set_input_headers -t 'text/plain text/css' 'X-Blah:yay';
+        echo $http_x_blah;
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+Content-Type: text/css
+--- response_body
+yay
+
+
+
+=== TEST 16: add type constraints (OR'd)
+--- config
+    location /bar {
+        more_set_input_headers -t 'text/plain text/css' 'X-Blah:yay';
+        echo $http_x_blah;
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+Content-Type: text/plain
+--- response_body
+yay
+
+
+
+=== TEST 17: add type constraints (OR'd) (not matched)
+--- config
+    location /bar {
+        more_set_input_headers -t 'text/plain text/css' 'X-Blah:yay';
+        echo $http_x_blah;
+    }
+--- request
+POST /bar
+hello
+--- more_headers
+Content-Type: text/html
+--- response_body eval: "\n"
+
+
+
+=== TEST 18: mix input and output cmds
+--- config
+    location /bar {
+        more_set_input_headers 'X-Blah:yay';
+        more_set_headers 'X-Blah:hiya';
+        echo $http_x_blah;
+    }
+--- request
+GET /bar
+--- response_headers
+X-Blah: hiya
+--- response
+yay
+
+
+
+=== TEST 19: set request header at client side and replace
+--- config
+    location /foo {
+        more_set_input_headers -r 'X-Foo: howdy';
+        echo $http_x_foo;
+    }
+--- request
+    GET /foo
+--- more_headers
+X-Foo: blah
+--- response_headers
+! X-Foo
+--- response_body
+howdy
+
+
+
+=== TEST 20: do no set request header at client, so no replace with -r option
+--- config
+    location /foo {
+        more_set_input_headers -r 'X-Foo: howdy';
+        echo "empty_header:" $http_x_foo;
+    }
+--- request
+    GET /foo
+--- response_headers
+! X-Foo
+--- response_body
+empty_header: 
+
+
+
+=== TEST 21: clear input headers
+--- config
+    location /foo {
+        set $val 'dog';
+
+        more_clear_input_headers 'User-Agent';
+
+        proxy_pass http://127.0.0.1:$server_port/proxy;
+    }
+    location /proxy {
+        echo -n $echo_client_request_headers;
+    }
+--- request
+    GET /foo
+--- more_headers
+User-Agent: my-sock
+--- response_body eval
+"GET /proxy HTTP/1.0\r
+Host: 127.0.0.1:\$ServerPort\r
+Connection: close\r
+\r
+"
+--- skip_nginx: 3: < 0.7.46
+
+
+
+=== TEST 22: clear input headers
+--- config
+    location /foo {
+        more_clear_input_headers 'User-Agent';
+
+        proxy_pass http://127.0.0.1:$server_port/proxy;
+    }
+    location /proxy {
+        echo -n $echo_client_request_headers;
+    }
+--- request
+    GET /foo
+--- response_body eval
+"GET /proxy HTTP/1.0\r
+Host: 127.0.0.1:\$ServerPort\r
+Connection: close\r
+\r
+"
+--- skip_nginx: 3: < 0.7.46
+
+
+
+=== TEST 23: clear input headers
+--- config
+    location /foo {
+        more_clear_input_headers 'X-Foo19';
+        more_clear_input_headers 'X-Foo20';
+        more_clear_input_headers 'X-Foo21';
+
+        proxy_pass http://127.0.0.1:$server_port/proxy;
+    }
+    location /proxy {
+        echo -n $echo_client_request_headers;
+    }
+--- request
+    GET /foo
+--- more_headers eval
+my $s;
+for my $i (3..21) {
+    $s .= "X-Foo$i: $i\n";
+}
+$s;
+--- response_body eval
+"GET /proxy HTTP/1.0\r
+Host: 127.0.0.1:\$ServerPort\r
+Connection: close\r
+X-Foo3: 3\r
+X-Foo4: 4\r
+X-Foo5: 5\r
+X-Foo6: 6\r
+X-Foo7: 7\r
+X-Foo8: 8\r
+X-Foo9: 9\r
+X-Foo10: 10\r
+X-Foo11: 11\r
+X-Foo12: 12\r
+X-Foo13: 13\r
+X-Foo14: 14\r
+X-Foo15: 15\r
+X-Foo16: 16\r
+X-Foo17: 17\r
+X-Foo18: 18\r
+\r
+"
+--- skip_nginx: 3: < 0.7.46
+
+
+
+=== TEST 24: Accept-Encoding
+--- config
+    location /bar {
+        default_type 'text/plain';
+        more_set_input_headers 'Accept-Encoding: gzip';
+        gzip on;
+        gzip_min_length  1;
+        gzip_buffers     4 8k;
+        gzip_types       text/plain;
+    }
+--- user_files
+">>> bar
+" . ("hello" x 512)
+--- request
+GET /bar
+--- response_headers
+Content-Encoding: gzip
+--- response_body_like: .
+
+
+
+=== TEST 25: rewrite + set request header
+--- config
+    location /t {
+        rewrite ^ /foo last;
+    }
+
+    location /foo {
+        more_set_input_headers 'X-Foo: howdy';
+        proxy_pass http://127.0.0.1:$server_port/echo;
+    }
+
+    location /echo {
+        echo "X-Foo: $http_x_foo";
+    }
+--- request
+    GET /foo
+--- response_headers
+! X-Foo
+--- response_body
+X-Foo: howdy
+
+
+
+=== TEST 26: clear_header should clear all the instances of the user custom header
+--- config
+    location = /t {
+        more_clear_input_headers 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 27: clear_header should clear all the instances of the builtin header
+--- config
+    location = /t {
+        more_clear_input_headers 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 28: Converting POST to GET - clearing headers (bug found by Matthieu Tourne, 411 error page)
+--- config
+    location /t {
+        more_clear_input_headers Content-Type;
+        more_clear_input_headers 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
+\r
+$/
+--- no_error_log
+[error]
+
+
+
+=== TEST 29: clear_header() does not duplicate subsequent headers (old bug)
+--- config
+    location = /t {
+        more_clear_input_headers 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 30: clear input header (just more than 20 headers)
+--- config
+    location = /t {
+        more_clear_input_headers "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 -n $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
+\r
+"
+
+
+
+=== TEST 31: clear input header (just more than 20 headers, and add more)
+--- config
+    location = /t {
+        more_clear_input_headers R;
+        more_set_input_headers "foo-1: 1" "foo-2: 2" "foo-3: 3" "foo-4: 4"
+            "foo-5: 5" "foo-6: 6" "foo-7: 7" "foo-8: 8" "foo-9: 9"
+            "foo-10: 10" "foo-11: 11" "foo-12: 12" "foo-13: 13"
+            "foo-14: 14" "foo-15: 15" "foo-16: 16" "foo-17: 17" "foo-18: 18"
+            "foo-19: 19" "foo-20: 20" "foo-21: 21";
+
+        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 -n $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
+\r
+"
+
+
+
+=== TEST 32: clear input header (just more than 21 headers)
+--- config
+    location = /t {
+        more_clear_input_headers R 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 -n $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
+\r
+"
+
+
+
+=== TEST 33: clear input header (just more than 21 headers)
+--- config
+    location = /t {
+        more_clear_input_headers R Q;
+        more_set_input_headers "foo-1: 1" "foo-2: 2" "foo-3: 3" "foo-4: 4"
+            "foo-5: 5" "foo-6: 6" "foo-7: 7" "foo-8: 8" "foo-9: 9"
+            "foo-10: 10" "foo-11: 11" "foo-12: 12" "foo-13: 13"
+            "foo-14: 14" "foo-15: 15" "foo-16: 16" "foo-17: 17" "foo-18: 18"
+            "foo-19: 19" "foo-20: 20" "foo-21: 21";
+
+        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 -n $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
+\r
+"
+
+
+
+=== TEST 34: clear X-Real-IP
+--- config
+    location /t {
+        more_clear_input_headers X-Real-IP;
+        echo "X-Real-IP: $http_x_real_ip";
+    }
+--- request
+GET /t
+--- more_headers
+X-Real-IP: 8.8.8.8
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
+        printf("rewrite: x-real-ip: %s\n",
+               user_string_n($r->headers_in->x_real_ip->value->data,
+                             $r->headers_in->x_real_ip->value->len))
+    } else {
+        println("rewrite: no x-real-ip")
+    }
+}
+
+F(ngx_http_core_content_phase) {
+    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
+        printf("content: x-real-ip: %s\n",
+               user_string_n($r->headers_in->x_real_ip->value->data,
+                             $r->headers_in->x_real_ip->value->len))
+    } else {
+        println("content: no x-real-ip")
+    }
+}
+
+--- stap_out
+rewrite: x-real-ip: 8.8.8.8
+content: no x-real-ip
+
+--- response_body
+X-Real-IP: 
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 35: set custom X-Real-IP
+--- config
+    location /t {
+        more_set_input_headers "X-Real-IP: 8.8.4.4";
+        echo "X-Real-IP: $http_x_real_ip";
+    }
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
+        printf("rewrite: x-real-ip: %s\n",
+               user_string_n($r->headers_in->x_real_ip->value->data,
+                             $r->headers_in->x_real_ip->value->len))
+    } else {
+        println("rewrite: no x-real-ip")
+    }
+
+}
+
+F(ngx_http_core_content_phase) {
+    if (@defined($r->headers_in->x_real_ip) && $r->headers_in->x_real_ip) {
+        printf("content: x-real-ip: %s\n",
+               user_string_n($r->headers_in->x_real_ip->value->data,
+                             $r->headers_in->x_real_ip->value->len))
+    } else {
+        println("content: no x-real-ip")
+    }
+}
+
+--- stap_out
+rewrite: no x-real-ip
+content: x-real-ip: 8.8.4.4
+
+--- response_body
+X-Real-IP: 8.8.4.4
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 36: clear Via
+--- config
+    location /t {
+        more_clear_input_headers Via;
+        echo "Via: $http_via";
+    }
+--- request
+GET /t
+--- more_headers
+Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    if (@defined($r->headers_in->via) && $r->headers_in->via) {
+        printf("rewrite: via: %s\n",
+               user_string_n($r->headers_in->via->value->data,
+                             $r->headers_in->via->value->len))
+    } else {
+        println("rewrite: no via")
+    }
+}
+
+F(ngx_http_core_content_phase) {
+    if (@defined($r->headers_in->via) && $r->headers_in->via) {
+        printf("content: via: %s\n",
+               user_string_n($r->headers_in->via->value->data,
+                             $r->headers_in->via->value->len))
+    } else {
+        println("content: no via")
+    }
+}
+
+--- stap_out
+rewrite: via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
+content: no via
+
+--- response_body
+Via: 
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 37: set custom Via
+--- config
+    location /t {
+        more_set_input_headers "Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)";
+        echo "Via: $http_via";
+    }
+--- request
+GET /t
+
+--- stap
+F(ngx_http_headers_more_exec_input_cmd) {
+    if (@defined($r->headers_in->via) && $r->headers_in->via) {
+        printf("rewrite: via: %s\n",
+               user_string_n($r->headers_in->via->value->data,
+                             $r->headers_in->via->value->len))
+    } else {
+        println("rewrite: no via")
+    }
+
+}
+
+F(ngx_http_core_content_phase) {
+    if (@defined($r->headers_in->via) && $r->headers_in->via) {
+        printf("content: via: %s\n",
+               user_string_n($r->headers_in->via->value->data,
+                             $r->headers_in->via->value->len))
+    } else {
+        println("content: no via")
+    }
+}
+
+--- stap_out
+rewrite: no via
+content: via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
+
+--- response_body
+Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1)
+
+--- no_error_log
+[error]
+
+
+
+=== TEST 38: HTTP 0.9 (set)
+--- config
+    location /foo {
+        more_set_input_headers 'X-Foo: howdy';
+        echo "x-foo: $http_x_foo";
+    }
+--- raw_request eval
+"GET /foo\r\n"
+--- response_headers
+! X-Foo
+--- response_body
+x-foo: 
+--- http09
+
+
+
+=== TEST 39: HTTP 0.9 (clear)
+--- config
+    location /foo {
+        more_clear_input_headers 'X-Foo';
+        echo "x-foo: $http_x_foo";
+    }
+--- raw_request eval
+"GET /foo\r\n"
+--- response_headers
+! X-Foo
+--- response_body
+x-foo: 
+--- http09
+
+
+
+=== TEST 40: Host header with port and $host
+--- config
+    location /bar {
+        more_set_input_headers 'Host: agentzh.org:1984';
+        echo "host var: $host";
+        echo "http_host var: $http_host";
+    }
+--- request
+GET /bar
+--- response_body
+host var: agentzh.org
+http_host var: agentzh.org:1984
+
+
+
+=== TEST 41: Host header with upper case letters and $host
+--- config
+    location /bar {
+        more_set_input_headers 'Host: agentZH.org:1984';
+        echo "host var: $host";
+        echo "http_host var: $http_host";
+    }
+--- request
+GET /bar
+--- response_body
+host var: agentzh.org
+http_host var: agentZH.org:1984
+
+
+
+=== TEST 42: clear all and re-insert
+--- config
+    location = /t {
+        more_clear_input_headers Host Connection Cache-Control Accept
+                                 User-Agent Accept-Encoding Accept-Language
+                                 Cookie;
+
+        more_set_input_headers "Host: a" "Connection: b" "Cache-Control: c"
+                               "Accept: d" "User-Agent: e" "Accept-Encoding: f"
+                               "Accept-Language: g" "Cookie: h";
+
+        more_clear_input_headers Host Connection Cache-Control Accept
+                                 User-Agent Accept-Encoding Accept-Language
+                                 Cookie;
+
+        more_set_input_headers "Host: a" "Connection: b" "Cache-Control: c"
+                               "Accept: d" "User-Agent: e" "Accept-Encoding: f"
+                               "Accept-Language: g" "Cookie: h";
+
+        echo ok;
+    }
+
+--- raw_request eval
+"GET /t HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Cache-Control: max-age=0\r
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8\r
+User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36\r
+Accept-Encoding: gzip,deflate,sdch\r
+Accept-Language: en-US,en;q=0.8\r
+Cookie: test=cookie;\r
+\r
+"
+--- response_body
+ok
+--- no_error_log
+[error]
+
+
+
+=== TEST 43: more_set_input_header does not override request headers with multiple values
+--- config
+    #lua_code_cache off;
+    location = /t {
+        more_set_input_headers "AAA: 111";
+
+        content_by_lua '
+            local headers = ngx.req.get_headers()
+            ngx.say(headers["AAA"])
+        ';
+    }
+--- request
+GET /t
+--- more_headers
+AAA: 123
+AAA: 456
+AAA: 678
+
+--- response_body
+111
+--- no_error_log
+[error]
+
+
+
+=== TEST 44: clear If-Unmodified-Since req header
+--- config
+    location = /t {
+        more_clear_input_headers 'If-Unmodified-Since';
+        content_by_lua '
+            ngx.header["Last-Modified"] = "Tue, 30 Jun 2011 12:16:36 GMT"
+            ngx.say("If-Unmodified-Since: ", ngx.var.http_if_unmodified_since)
+        ';
+    }
+--- request
+GET /t
+--- more_headers
+If-Unmodified-Since: Tue, 28 Jun 2011 12:16:36 GMT
+--- response_body
+If-Unmodified-Since: nil
+--- no_error_log
+[error]
+
+
+
+=== TEST 45: clear If-Match req header
+--- config
+    location = /t {
+        more_clear_input_headers 'If-Match';
+        echo "If-Match: $http_if_match";
+    }
+--- request
+GET /t
+--- more_headers
+If-Match: abc
+--- response_body
+If-Match: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 46: clear If-None-Match req header
+--- config
+    location = /t {
+        more_clear_input_headers 'If-None-Match';
+        echo "If-None-Match: $http_if_none_match";
+    }
+--- request
+GET /t
+--- more_headers
+If-None-Match: *
+--- response_body
+If-None-Match: 
+--- no_error_log
+[error]
+
+
+
+=== TEST 47: set the Destination request header for WebDav
+--- config
+    location = /a.txt {
+        more_set_input_headers "Destination: /b.txt";
+        dav_methods MOVE;
+        dav_access            all:rw;
+        root                  html;
+    }
+
+--- user_files
+>>> a.txt
+hello, world!
+
+--- request
+MOVE /a.txt
+
+--- response_body
+--- no_error_log
+client sent no "Destination" header
+[error]
+--- error_code: 204
+
+
+
+=== TEST 48: more_set_input_headers + X-Forwarded-For
+--- config
+    location = /t {
+        more_set_input_headers "X-Forwarded-For: 8.8.8.8";
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Foo $proxy_add_x_forwarded_for;
+    }
+
+    location = /back {
+        echo "Foo: $http_foo";
+    }
+
+--- request
+GET /t
+
+--- response_body
+Foo: 8.8.8.8, 127.0.0.1
+--- no_error_log
+[error]
+
+
+
+=== TEST 49: more_clear_input_headers + X-Forwarded-For
+--- config
+    location = /t {
+        more_clear_input_headers "X-Forwarded-For";
+        proxy_pass http://127.0.0.1:$server_port/back;
+        proxy_set_header Foo $proxy_add_x_forwarded_for;
+    }
+
+    location = /back {
+        echo "Foo: $http_foo";
+    }
+
+--- request
+GET /t
+
+--- more_headers
+X-Forwarded-For: 8.8.8.8
+--- response_body
+Foo: 127.0.0.1
+--- no_error_log
+[error]
+
+
+
+=== TEST 50: clear input headers with wildcard
+--- config
+    location /hello {
+        more_clear_input_headers 'X-Hidden-*';
+        content_by_lua '
+            ngx.say("X-Hidden-One: ", ngx.var.http_x_hidden_one)
+            ngx.say("X-Hidden-Two: ", ngx.var.http_x_hidden_two)
+        ';
+    }
+--- request
+    GET /hello
+--- more_headers
+X-Hidden-One: i am hidden
+X-Hidden-Two: me 2
+--- response_body
+X-Hidden-One: nil
+X-Hidden-Two: nil
+
+
+
+=== TEST 51: make sure wildcard doesn't affect more_set_input_headers
+--- config
+    location /hello {
+        more_set_input_headers 'X-Hidden-*: lol';
+        content_by_lua '
+            ngx.say("X-Hidden-One: ", ngx.var.http_x_hidden_one)
+            ngx.say("X-Hidden-Two: ", ngx.var.http_x_hidden_two)
+        ';
+    }
+--- request
+    GET /hello
+--- more_headers
+X-Hidden-One: i am hidden
+X-Hidden-Two: me 2
+--- response_body
+X-Hidden-One: i am hidden
+X-Hidden-Two: me 2
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/phase.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/phase.t
new file mode 100644
index 0000000..11183db
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/phase.t
@@ -0,0 +1,25 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => 3;
+
+no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple set (1 arg)
+--- config
+    location /foo {
+        deny all;
+        more_set_headers 'X-Foo: Blah';
+    }
+--- request
+    GET /foo
+--- response_headers
+X-Foo: Blah
+--- response_body_like: 403 Forbidden
+--- error_code: 403
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/sanity.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/sanity.t
new file mode 100644
index 0000000..47d65e3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/sanity.t
@@ -0,0 +1,628 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * 123;
+
+#master_on();
+#workers(2);
+log_level("warn");
+no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple set (1 arg)
+--- config
+    location /foo {
+        echo hi;
+        more_set_headers 'X-Foo: Blah';
+    }
+--- request
+    GET /foo
+--- response_headers
+X-Foo: Blah
+--- response_body
+hi
+
+
+
+=== TEST 2: simple set (2 args)
+--- config
+    location /foo {
+        echo hi;
+        more_set_headers 'X-Foo: Blah' 'X-Bar: hi';
+    }
+--- request
+    GET /foo
+--- response_headers
+X-Foo: Blah
+X-Bar: hi
+--- response_body
+hi
+
+
+
+=== TEST 3: two sets in a single location
+--- config
+    location /two {
+        echo hi;
+        more_set_headers 'X-Foo: Blah'
+        more_set_headers 'X-Bar: hi';
+    }
+--- request
+    GET /two
+--- response_headers
+X-Foo: Blah
+X-Bar: hi
+--- response_body
+hi
+
+
+
+=== TEST 4: two sets in a single location (for 404 too)
+--- config
+    location /two {
+        more_set_headers 'X-Foo: Blah'
+        more_set_headers 'X-Bar: hi';
+        return 404;
+    }
+--- request
+    GET /two
+--- response_headers
+X-Foo: Blah
+X-Bar: hi
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 5: set a header then clears it (500)
+--- config
+    location /two {
+        more_set_headers 'X-Foo: Blah';
+        more_set_headers 'X-Foo:';
+        return 500;
+    }
+--- request
+    GET /two
+--- response_headers
+! X-Foo
+! X-Bar
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 6: set a header only when 500 (matched)
+--- config
+    location /bad {
+        more_set_headers -s 500 'X-Mine: Hiya';
+        more_set_headers -s 404 'X-Yours: Blah';
+        return 500;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-Mine: Hiya
+! X-Yours
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 7: set a header only when 500 (not matched with 200)
+--- config
+    location /bad {
+        more_set_headers -s 500 'X-Mine: Hiya';
+        more_set_headers -s 404 'X-Yours: Blah';
+        echo hello;
+    }
+--- request
+    GET /bad
+--- response_headers
+! X-Mine
+! X-Yours
+--- response_body
+hello
+--- error_code: 200
+
+
+
+=== TEST 8: set a header only when 500 (not matched with 404)
+--- config
+    location /bad {
+        more_set_headers -s 500 'X-Mine: Hiya';
+        more_set_headers -s 404 'X-Yours: Blah';
+        return 404;
+    }
+--- request
+    GET /bad
+--- response_headers
+! X-Mine
+X-Yours: Blah
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 9: more conditions
+--- config
+    location /bad {
+        more_set_headers -s '503 404' 'X-Mine: Hiya';
+        more_set_headers -s ' 404  413 ' 'X-Yours: Blah';
+        return 503;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-Mine: Hiya
+! X-Yours
+--- response_body_like: 503 Service
+--- error_code: 503
+
+
+
+=== TEST 10: more conditions
+--- config
+    location /bad {
+        more_set_headers -s '503 404' 'X-Mine: Hiya';
+        more_set_headers -s ' 404   413 ' 'X-Yours: Blah';
+        return 404;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-Mine: Hiya
+X-Yours: Blah
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 11: more conditions
+--- config
+    location /bad {
+        more_set_headers -s '503 404' 'X-Mine: Hiya';
+        more_set_headers -s ' 404   413  ' 'X-Yours: Blah';
+        return 413;
+    }
+--- request
+    GET /bad
+--- response_headers
+! X-Mine
+X-Yours: Blah
+--- response_body_like: 413 Request Entity Too Large
+--- error_code: 413
+
+
+
+=== TEST 12: simple -t
+--- config
+    location /bad {
+        default_type 'text/css';
+        more_set_headers -t 'text/css' 'X-CSS: yes';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-CSS: yes
+--- response_body
+hi
+
+
+
+=== TEST 13: simple -t (not matched)
+--- config
+    location /bad {
+        default_type 'text/plain';
+        more_set_headers -t 'text/css' 'X-CSS: yes';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+! X-CSS
+--- response_body
+hi
+
+
+
+=== TEST 14: multiple -t (not matched)
+--- config
+    location /bad {
+        default_type 'text/plain';
+        more_set_headers -t 'text/javascript' -t 'text/css' 'X-CSS: yes';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+! X-CSS
+--- response_body
+hi
+
+
+
+=== TEST 15: multiple -t (matched)
+--- config
+    location /bad {
+        default_type 'text/plain';
+        more_set_headers -t 'text/javascript' -t 'text/plain' 'X-CSS: yes';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-CSS: yes
+--- response_body
+hi
+
+
+
+=== TEST 16: multiple -t (matched)
+--- config
+    location /bad {
+        default_type 'text/javascript';
+        more_set_headers -t 'text/javascript' -t 'text/plain' 'X-CSS: yes';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-CSS: yes
+--- response_body
+hi
+
+
+
+=== TEST 17: multiple -t (matched) with extra spaces
+--- config
+    location /bad {
+        default_type 'text/javascript';
+        more_set_headers -t ' text/javascript  ' -t 'text/plain' 'X-CSS: yes';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-CSS: yes
+--- response_body
+hi
+
+
+
+=== TEST 18: multiple -t merged
+--- config
+    location /bad {
+        default_type 'text/javascript';
+        more_set_headers -t ' text/javascript  text/plain' 'X-CSS: yes';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-CSS: yes
+--- response_body
+hi
+
+
+
+=== TEST 19: multiple -t merged (2)
+--- config
+    location /bad {
+        default_type 'text/plain';
+        more_set_headers -t ' text/javascript  text/plain' 'X-CSS: yes';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-CSS: yes
+--- response_body
+hi
+
+
+
+=== TEST 20: multiple -s option in a directive (not matched)
+--- config
+    location /bad {
+        more_set_headers -s 404 -s 500 'X-status: howdy';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+! X-status
+--- response_body
+hi
+
+
+
+=== TEST 21: multiple -s option in a directive (matched 404)
+--- config
+    location /bad {
+        more_set_headers -s 404 -s 500 'X-status: howdy';
+        return 404;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-status: howdy
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 22: multiple -s option in a directive (matched 500)
+--- config
+    location /bad {
+        more_set_headers -s 404 -s 500 'X-status: howdy';
+        return 500;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-status: howdy
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 23: -s mixed with -t
+--- config
+    location /bad {
+        default_type 'text/html';
+        more_set_headers -s 404 -s 200 -t 'text/html' 'X-status: howdy2';
+        return 404;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-status: howdy2
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 24: -s mixed with -t
+--- config
+    location /bad {
+        default_type 'text/html';
+        more_set_headers -s 404 -s 200 -t 'text/plain' 'X-status: howdy2';
+        return 404;
+    }
+--- request
+    GET /bad
+--- response_headers
+! X-status
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 25: -s mixed with -t
+--- config
+    location /bad {
+        default_type 'text/html';
+        more_set_headers -s 404 -s 200 -t 'text/html' 'X-status: howdy2';
+        echo hi;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-status: howdy2
+--- response_body
+hi
+--- error_code: 200
+
+
+
+=== TEST 26: -s mixed with -t
+--- config
+    location /bad {
+        default_type 'text/html';
+        more_set_headers -s 500 -s 200 -t 'text/html' 'X-status: howdy2';
+        return 404;
+    }
+--- request
+    GET /bad
+--- response_headers
+! X-status
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 27: merge from the upper level
+--- config
+    more_set_headers -s 404 -t 'text/html' 'X-status2: howdy3';
+    location /bad {
+        default_type 'text/html';
+        more_set_headers -s 500 -s 200 -t 'text/html' 'X-status: howdy2';
+        return 404;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-status2: howdy3
+! X-status
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 28: merge from the upper level
+--- config
+    more_set_headers -s 404 -t 'text/html' 'X-status2: howdy3';
+    location /bad {
+        default_type 'text/html';
+        more_set_headers -s 500 -s 200 -t 'text/html' 'X-status: howdy2';
+        echo yeah;
+    }
+--- request
+    GET /bad
+--- response_headers
+! X-status2
+X-status: howdy2
+--- response_body
+yeah
+--- error_code: 200
+
+
+
+=== TEST 29: override settings by inheritance
+--- config
+    more_set_headers -s 404 -t 'text/html' 'X-status: yeah';
+    location /bad {
+        default_type 'text/html';
+        more_set_headers -s 404 -t 'text/html' 'X-status: nope';
+        return 404;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-status: nope
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 30: append settings by inheritance
+--- config
+    more_set_headers -s 404 -t 'text/html' 'X-status: yeah';
+    location /bad {
+        default_type 'text/html';
+        more_set_headers -s 404 -t 'text/html' 'X-status2: nope';
+        return 404;
+    }
+--- request
+    GET /bad
+--- response_headers
+X-status: yeah
+X-status2: nope
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 31: clear headers with wildcard
+--- config
+    location = /backend {
+        add_header X-Hidden-One "i am hidden";
+        add_header X-Hidden-Two "me 2";
+        echo hi;
+    }
+    location /hello {
+        more_clear_headers 'X-Hidden-*';
+        proxy_pass http://127.0.0.1:$server_port/backend;
+    }
+--- request
+    GET /hello
+--- response_headers
+! X-Hidden-One
+! X-Hidden-Two
+--- response_body
+hi
+
+
+
+=== TEST 32: clear duplicate headers
+--- config
+    location = /backend {
+        add_header pragma no-cache;
+        add_header pragma no-cache;
+        echo hi;
+    }
+    location /hello {
+        more_clear_headers 'pragma';
+        proxy_pass http://127.0.0.1:$server_port/backend;
+    }
+--- request
+    GET /hello
+--- response_headers
+!pragma
+--- response_body
+hi
+
+
+
+=== TEST 33: HTTP 0.9 (set)
+--- config
+    location /foo {
+        more_set_headers 'X-Foo: howdy';
+        echo ok;
+    }
+--- raw_request eval
+"GET /foo\r\n"
+--- response_headers
+! X-Foo
+--- response_body
+ok
+--- http09
+
+
+
+=== TEST 34: use the -a option to append the cookie field
+--- config
+    location /cookie {
+        more_set_headers -a 'Set-Cookie: name=lynch';
+        echo ok;
+    }
+--- request
+    GET /cookie
+--- response_headers
+Set-Cookie: name=lynch
+--- response_body
+ok
+
+
+
+=== TEST 35: the original Set-Cookie fields will not be overwritten, when using the -a option
+--- config
+    location /cookie {
+        more_set_headers 'Set-Cookie: name=lynch';
+        more_set_headers -a 'Set-Cookie: born=1981';
+        echo ok;
+    }
+--- request
+    GET /cookie
+--- raw_response_headers_like eval
+"Set-Cookie: name=lynch\r\nSet-Cookie: born=1981\r\n"
+--- response_body
+ok
+
+
+
+=== TEST 36: The behavior of builtin headers can not be changed
+--- config
+    location /foo {
+        more_set_headers -a "Server: myServer";
+        echo ok;
+    }
+--- request
+    GET /foo
+--- must_die
+--- error_log chomp
+can not append builtin headers
+--- suppress_stderr
+
+
+
+=== TEST 37: can not use -a option with more_clear_headers
+--- config
+    location /foo {
+        more_clear_headers -a 'Content-Type';
+        echo ok;
+    }
+--- request
+    GET /foo
+--- must_die
+--- error_log chomp
+invalid option name: "-a"
+--- suppress_stderr
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/subrequest.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/subrequest.t
new file mode 100644
index 0000000..9443eca
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/subrequest.t
@@ -0,0 +1,68 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket; # 'no_plan';
+
+plan tests => blocks() * 3;
+
+no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: vars in input header directives
+--- config
+    location /main {
+        echo_location /foo;
+        echo "main: $http_user_agent";
+    }
+    location /foo {
+        set $val 'dog';
+
+        more_set_input_headers 'User-Agent: $val';
+
+        proxy_pass http://127.0.0.1:$server_port/proxy;
+    }
+    location /proxy {
+        echo "sub: $http_user_agent";
+    }
+--- request
+    GET /main
+--- more_headers
+User-Agent: my-sock
+--- response_body
+sub: dog
+main: dog
+--- response_headers
+! Host
+--- skip_nginx: 3: < 0.7.46
+
+
+
+=== TEST 2: vars in input header directives
+--- config
+    location /main {
+        #more_set_input_headers 'User-Agent: cat';
+        echo_location /foo;
+        echo "main: $http_user_agent";
+    }
+    location /foo {
+        set $val 'dog';
+
+        more_set_input_headers 'User-Agent: $val';
+
+        proxy_pass http://127.0.0.1:$server_port/proxy;
+        #echo $http_user_agent;
+    }
+    location /proxy {
+        echo "sub: $http_user_agent";
+    }
+--- request
+    GET /main
+--- response_body
+sub: dog
+main: dog
+--- response_headers
+! Host
+--- skip_nginx: 3: < 0.7.46
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/unused.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/unused.t
new file mode 100644
index 0000000..c51f91c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/unused.t
@@ -0,0 +1,174 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 4 + 2);
+
+#master_on();
+#workers(2);
+log_level("warn");
+no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: used output filter
+--- config
+    location /foo {
+        echo hi;
+        more_set_headers "Foo: bar";
+    }
+--- request
+    GET /foo
+--- response_headers
+Foo: bar
+--- response_body
+hi
+--- error_log
+headers more header filter
+--- no_error_log
+[error]
+--- log_level: debug
+
+
+
+=== TEST 2: unused output filter (none)
+--- config
+    location /foo {
+        echo hi;
+    }
+--- request
+    GET /foo
+--- response_body
+hi
+--- no_error_log
+headers more header filter
+[error]
+--- log_level: debug
+
+
+
+=== TEST 3: unused output filter (with more_set_input_headers only)
+--- config
+    location /foo {
+        more_set_input_headers "Foo: bar";
+        echo hi;
+    }
+--- request
+    GET /foo
+--- response_body
+hi
+--- no_error_log
+headers more header filter
+[error]
+--- log_level: debug
+
+
+
+=== TEST 4: used rewrite handler
+--- config
+    location /foo {
+        more_set_input_headers "Foo: bar";
+        echo hi;
+    }
+--- request
+    GET /foo
+--- response_body
+hi
+--- error_log
+headers more rewrite handler
+--- no_error_log
+[error]
+--- log_level: debug
+
+
+
+=== TEST 5: unused rewrite handler (none)
+--- config
+    location /foo {
+        #more_set_input_headers "Foo: bar";
+        echo hi;
+    }
+--- request
+    GET /foo
+--- response_body
+hi
+--- no_error_log
+headers more rewrite handler
+[error]
+--- log_level: debug
+
+
+
+=== TEST 6: unused rewrite handler (with output header filters)
+--- config
+    location /foo {
+        #more_set_input_headers "Foo: bar";
+        echo hi;
+        more_set_headers "Foo: bar";
+    }
+--- request
+    GET /foo
+--- response_headers
+Foo: bar
+--- response_body
+hi
+--- no_error_log
+headers more rewrite handler
+[error]
+--- log_level: debug
+
+
+
+=== TEST 7: multiple http {} blocks (filter)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
+--- config
+    location /foo {
+        echo hi;
+        more_set_headers 'Foo: bar';
+    }
+--- post_main_config
+    http {
+    }
+
+--- request
+    GET /foo
+--- response_body
+hi
+--- response_headers
+Foo: bar
+--- no_error_log
+[error]
+--- error_log
+headers more header filter
+--- log_level: debug
+
+
+
+=== TEST 8: multiple http {} blocks (handler)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
+--- config
+    location /foo {
+        more_set_input_headers 'Foo: bar';
+        echo $http_foo;
+    }
+--- post_main_config
+    http {
+    }
+
+--- request
+    GET /foo
+--- response_body
+bar
+--- no_error_log
+headers more header handler
+[error]
+--- log_level: debug
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/vars.t b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/vars.t
new file mode 100644
index 0000000..04c75c3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/t/vars.t
@@ -0,0 +1,58 @@
+# vi:ft=
+
+use lib 'lib';
+use Test::Nginx::Socket; # 'no_plan';
+
+plan tests => 9;
+
+no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: vars
+--- config
+    location /foo {
+        echo hi;
+        set $val 'hello, world';
+        more_set_headers 'X-Foo: $val';
+    }
+--- request
+    GET /foo
+--- response_headers
+X-Foo: hello, world
+--- response_body
+hi
+
+
+
+=== TEST 2: vars in both key and val
+--- config
+    location /foo {
+        echo hi;
+        set $val 'hello, world';
+        more_set_headers '$val: $val';
+    }
+--- request
+    GET /foo
+--- response_headers
+$val: hello, world
+--- response_body
+hi
+
+
+
+=== TEST 3: vars in input header directives
+--- config
+    location /foo {
+        set $val 'dog';
+        more_set_input_headers 'Host: $val';
+        echo $host;
+    }
+--- request
+    GET /foo
+--- response_body
+dog
+--- response_headers
+Host:
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/util/build.sh b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/util/build.sh
new file mode 100755
index 0000000..00a191f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/util/build.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# this file is mostly meant to be used by the author himself.
+
+root=`pwd`
+version=$1
+home=~
+force=$2
+pcre2_opt=""
+if [ "$WITHOUT_PCRE2" = "1" ]; then
+    pcre2_opt="--without-pcre2"
+fi
+
+        #--with-cc=gcc46 \
+
+ngx-build $force $version \
+        --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB" \
+        --without-mail_pop3_module \
+        --without-mail_imap_module \
+        --without-mail_smtp_module \
+        --without-http_upstream_ip_hash_module \
+        --without-http_empty_gif_module \
+        --without-http_memcached_module \
+        --without-http_referer_module \
+        --without-http_autoindex_module \
+        --without-http_auth_basic_module \
+        --without-http_userid_module \
+        $pcre2_opt \
+        --with-http_realip_module \
+        --with-http_dav_module \
+      --add-module=$root/../eval-nginx-module \
+      --add-module=$root/../lua-nginx-module \
+      --add-module=$root/../echo-nginx-module \
+      --add-module=$root $opts \
+      --with-debug
+      #--add-module=$root/../ndk-nginx-module \
+  #--without-http_ssi_module  # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
+
diff --git a/modules_deb/libnginx-mod-http-headers-more-filter-0.38/valgrind.suppress b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/valgrind.suppress
new file mode 100644
index 0000000..d51de70
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-headers-more-filter-0.38/valgrind.suppress
@@ -0,0 +1,135 @@
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   obj:*
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_calloc
+   fun:ngx_event_process_init
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_event_process_init
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_ctl(event)
+   fun:epoll_ctl
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:memcpy
+   fun:ngx_vslprintf
+   fun:ngx_log_error_core
+   fun:ngx_http_charset_header_filter
+}
+{
+   nginx-core-process-init
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_event_process_init
+}
+{
+   nginx-core-crc32-init
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_crc32_table_init
+   fun:main
+}
+{
+   palloc_large_for_init_request
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_palloc_large
+   fun:ngx_palloc
+   fun:ngx_pcalloc
+   fun:ngx_http_init_request
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+}
+{
+   palloc_large_for_create_temp_buf
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_palloc_large
+   fun:ngx_palloc
+   fun:ngx_create_temp_buf
+   fun:ngx_http_init_request
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+}
+{
+   accept_create_pool
+   Memcheck:Leak
+   fun:memalign
+   fun:posix_memalign
+   fun:ngx_memalign
+   fun:ngx_create_pool
+   fun:ngx_event_accept
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+}
+{
+   create_pool_for_init_req
+   Memcheck:Leak
+   fun:memalign
+   fun:posix_memalign
+   fun:ngx_memalign
+   fun:ngx_create_pool
+   fun:ngx_http_init_request
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Addr8
+   fun:getenv
+   fun:gcov_exit
+   fun:exit
+   fun:ngx_master_process_exit
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:index
+   fun:expand_dynamic_string_token
+   fun:_dl_map_object
+   fun:map_doit
+   fun:_dl_catch_error
+   fun:do_preload
+   fun:dl_main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+}
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/.gitignore b/modules_deb/libnginx-mod-http-ndk-0.3.4/.gitignore
new file mode 100644
index 0000000..0fd79d0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/.gitignore
@@ -0,0 +1,4 @@
+tags
+cscope.*
+*~
+*.swp
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/LICENSE b/modules_deb/libnginx-mod-http-ndk-0.3.4/LICENSE
new file mode 100644
index 0000000..e1a5221
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2010-2018, Marcus Clyne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/README.md b/modules_deb/libnginx-mod-http-ndk-0.3.4/README.md
new file mode 100644
index 0000000..d9d3972
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/README.md
@@ -0,0 +1,254 @@
+Name
+====
+
+Nginx Development Kit (NDK)
+
+Table of Contents
+=================
+
+* [Name](#name)
+* [Synopsis](#synopsis)
+* [Status](#status)
+* [Features](#features)
+* [Design](#design)
+    * [modular](#modular)
+    * [auto-generated & easily extensible](#auto-generated--easily-extensible)
+* [Usage for users](#usage-for-users)
+    * [Building as a dynamic module](#building-as-a-dynamic-module)
+* [Usage for developers](#usage-for-developers)
+    * [Warning: using NDK_ALL](#warning-using-ndk_all)
+* [Modules using NDK](#modules-using-ndk)
+* [TODO](#todo)
+* [License](#license)
+* [Contributing / Feedback](#contributing--feedback)
+* [Authors](#authors)
+* [Special Thanks](#special-thanks)
+
+Synopsis
+========
+
+The NDK is an Nginx module that is designed to extend the core functionality of the
+excellent Nginx webserver in a way that can be used as a basis of other Nginx modules.
+
+It has functions and macros to deal with generic tasks that don't currently have
+generic code as part of the core distribution.  The NDK itself adds few features
+that are seen from a user's point of view - it's just designed to help reduce the
+code that Nginx module developers need to write.
+
+Nginx module developers wishing to use any of the features in the NDK should specify
+that the NDK is a dependency of their module, and that users will need to compile
+it as well when they compile their own modules.  They will also need to declare in
+their own modules which features of the NDK they wish to use (explained below).
+
+If you are not an Nginx module developer, then the only useful part of this project
+will be the 'usage for users' section below.
+
+[Back to TOC](#table-of-contents)
+
+Status
+======
+
+The NDK is now considered to be stable. It is already being used in quite a few third
+party modules (see list below).
+
+[Back to TOC](#table-of-contents)
+
+Features
+========
+
+* additional conf_set functions for regexes, complex/script values, paths...
+* macros to simplify tasks like checking for NULL values when doing ngx_array_push
+* patches to the main source code
+* ngx_auto_lib_core generic external library handler is included (see separate readme)
+
+[Back to TOC](#table-of-contents)
+
+Design
+======
+
+modular
+-------
+
+The kit itself is designed in a modular way, so that only the required code is compiled.
+It's possible to add just a single NDK module, a few or all of them.
+
+[Back to TOC](#table-of-contents)
+
+auto-generated & easily extensible
+----------------------------------
+
+Many of the macros available in the NDK are auto-generated from simple configuration
+files.  This makes creating similar macros for your own code very simple - it's usually
+just the case of adding an extra line to a config file and re-running the build script.
+
+[Back to TOC](#table-of-contents)
+
+Usage for users
+===============
+
+If another Nginx module you wish to use specifies that the NDK is a dependency, you
+will need to do the following :
+
+1. download the source (https://github.com/simpl/ngx_devel_kit)
+2. unpack the source (tar -xzf $name)
+3. compile Nginx with the following extra option `--add-module=/path/to/ngx_devel_kit`.
+
+e.g.
+
+```bash
+./configure --add-module=/path/to/ngx_devel_kit \
+            --add-module=/path/to/another/module
+```
+
+[Back to TOC](#table-of-contents)
+
+Building as a dynamic module
+----------------------------
+
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ndk_http_module.so;
+load_module /path/to/another/module.so;
+```
+
+[Back to TOC](#table-of-contents)
+
+Usage for developers
+====================
+
+To use the NDK in your own module, you need to add the following:
+
+1. add this line to your module
+
+```C
+#include    <ndk.h>
+```
+
+Note: since the NDK includes the following lines
+
+```C
+#include    <ngx_config.h>
+#include    <ngx_core.h>
+#include    <ngx_http.h>
+```
+
+you can replace these with the single include above.
+2. add the following line in the config file for your module:
+
+```bash
+have=NDK_[module_name]  . auto/have
+```
+
+for each NDK module that you wish to use (you need to include auto/have multiple
+times if you wish to use multiple NDK modules.
+
+Note: the old method of setting
+
+```config
+CFLAGS="$CFLAGS -DNDK_[module_name]"
+```
+
+is now deprecated. It will still work, but results in unnecessary lines being
+displayed when compiling Nginx.
+
+[Back to TOC](#table-of-contents)
+
+Warning: Using NDK_ALL
+----------------------
+
+You can also set `NDK_ALL` to include all the NDK modules.  This is primarily as
+a convenience in the early stages of development of another module. However,
+
+DO NOT LEAVE `NDK_ALL` IN YOUR CONFIG FILE WHEN PUBLISHING
+
+Although the NDK is fairly small now, it could in time become a large repository
+of code that would, if using NDK_ALL, result in considerably more code being compiled
+than is necessary.
+
+[Back to TOC](#table-of-contents)
+
+Modules using NDK
+=================
+
+The following 3rd-party modules make use of NDK.
+
+* [ngx_http_lua_module](https://github.com/openresty/lua-nginx-module#readme)
+* [ngx_http_set_misc_module](https://github.com/openresty/set-misc-nginx-module#readme)
+* [ngx_http_encrypted_session_module](https://github.com/openresty/encrypted-session-nginx-module#readme)
+* [ngx_http_form_input_module](https://github.com/calio/form-input-nginx-module#readme)
+* [ngx_http_iconv_module](https://github.com/calio/iconv-nginx-module#readme)
+* [ngx_http_array_var_module](https://github.com/openresty/array-var-nginx-module#readme)
+
+If you would like to add your module to this list, please let us know.
+
+[Back to TOC](#table-of-contents)
+
+TODO
+====
+
+* documentation for modules that don't already have it
+* additional phase-handler functions
+* generically testing for needing to add a handler
+* remove dependency of set_var on OpenSSL being compiled in
+* for backward compatability, add the ndk_macros
+
+[Back to TOC](#table-of-contents)
+
+License
+=======
+
+Copyright (c) 2010-2018, Marcus Clyne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other materials
+provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific prior
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[Back to TOC](#table-of-contents)
+
+Contributing / Feedback
+=======================
+
+If you are an Nginx module developer, and have developed some functions that are
+generic in nature (or would be easily adapted to be so), then please send them to
+me at the address below, and I'll addmclyne to the kit.
+
+[Back to TOC](#table-of-contents)
+
+Author
+======
+
+[Marcus Clyne](https://github.com/mclyne)
+
+[Back to TOC](#table-of-contents)
+
+
+Special Thanks
+==============
+
+A special thanks goes to [Yichun Zhang](https://github.com/agentzh) for helping to maintain
+this module.
+
+[Back to TOC](#table-of-contents)
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/README_AUTO_LIB.md b/modules_deb/libnginx-mod-http-ndk-0.3.4/README_AUTO_LIB.md
new file mode 100644
index 0000000..f2c3371
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/README_AUTO_LIB.md
@@ -0,0 +1,394 @@
+Nginx Auto Lib Core
+===================
+
+Nginx Auto Lib Core is a generic external library-handler that has been designed to
+facilitate the inclusion of external libraries in modules for the Nginx web server.
+It has been written both for the benefit of Nginx module developers and for the end
+users of those Nginx modules, and can provide a consistent, intelligent, flexible
+cross-platform way to include external libraries.
+
+Any developers of Nginx modules are encouraged to use Auto Lib Core to handle library
+dependencies for their modules rather than writing their own custom handler from scratch.
+
+Note : The latest version can be found [here](https://github.com/simplresty/ngx_auto_lib).
+
+
+Information for end users
+=========================
+
+To include external libraries using Auto Lib to you may need or wish to export some
+variables before you run configure. e.g.
+
+$ export MOZJS=/path/to/mozjs
+$ export MOZJS_SHARED=NO
+$ ./configure ...
+
+In all cases below [PFX] should be replaced with the name of the library (e.g. MOZJS). The
+specific value for [PFX] should be mentioned in the README file for the module that
+uses Auto Lib Core.
+
+
+Search order for paths
+----------------------
+
+(1) [PFX]_INC and [PFX]_LIB
+(2) [PFX] (source or install dir)
+(3) any dirs under [PFX]_BASE (see below)
+(4) any dirs under the parent directory of the Nginx source dir beginning with '[pfx]-'
+(5) standard system paths (including /usr/local, /usr, /opt/local, /opt, /usr/pkg)
+
+If any of 1-3 are specified, then any set values will be searched, and the the Nginx
+source's parent directory and system paths are not searched unless [PFX]_SEARCH_[PLACE]
+variable is set to YES, where PLACE ::= PARENT | SYSTEM. e.g.
+
+$ export OPENSSL_LIB=/path/to/openssl/lib
+$ export OPENSSL_INC=/path/to/openssl/inc
+$ ./configure
+
+will search only in the lib and include paths specified, and
+
+$ export OPENSSL_LIB=/path/to/openssl/lib
+$ export OPENSSL_INC=/path/to/openssl/inc
+$ export OPENSSL_BASE=/path/to/openssl/base
+$ export OPENSSL_SEARCH_PARENT=YES
+$ ./configure --with-openssl=/path/to/openssl
+
+will search first in the lib & inc dirs specified, then in /path/to/openssl, then will
+look for directories in /path/to/openssl/base and then in the Nginx source parent
+directory, but will skip checking the system paths.
+
+Note : apart from system paths, all dirs are checked as both source and install directories,
+so static versions of installed OpenSSL, PCRE, Zlib etc libraries can be used with Nginx
+if desired.
+
+
+Specifying a path to find a library
+-----------------------------------
+
+If the version of a library you wish to include is in any of the standard paths (e.g.
+/usr/local, /usr ...), you will not need to specify a path to include the library.
+
+If you do wish to specify a specific path, in most cases just specifying
+[PFX]=/path/to/library will be sufficient. e.g.
+
+$ export MOZJS=/path/to/mozjs
+$ ./configure ...
+
+The path can be either a source directory or an install directory. Auto Lib will search
+
+
+Searching under base paths
+--------------------------
+
+Rather than specifying a specific path to find new libraries in non-standard locations,
+you may wish to specify a base path (or just let Auto Lib search the directory that the
+Nginx source is located in). This will then automatically find the most recent versions
+of libraries and check them before older versions.
+
+e.g.
+
+You have installations
+
+/openssl/version/0.9.8m
+/openssl/version/1.0.0a
+...
+
+$ export OPENSSL_BASE=/openssl/version
+$ ./configure ...
+
+Any directories under /openssl/version will be searched IN REVERSE ORDER, i.e. most recent
+version first. Here /openssl/version/1.0.0a would be searched before /openssl/version/0.9.8m.
+
+If [PFX]_BASE_SEARCH_PREFIX=YES, then only directories beginning with '[pfx]-' are searched.
+If [PFX]_BASE_SEARCH_PREFIX=something, then only directories beginning with 'something' are
+searched.
+
+When searching under [PFX]_BASE no prefix is added to the search, but when searching under
+the directory that the Nginx source is located in, the prefix [pfx]- is automatically added.
+
+Note : there is currently a minor bug (due to the implementation of the 'sort' command)
+means versions that include hyphens (e.g. 1.0.0-beta5) are checked before versions like
+1.0.0a. This will be fixed soon, and searching of -build folders before normal source ones
+will be added too.
+
+
+
+Shared or static?
+-----------------
+
+The default for most libraries is to look for shared libraries, though this can be overridden
+by the user by setting [PFX]_SHARED=NO.
+
+In the near future the default action will be to look for shared libraries then to look
+for static libraries in each directory searched unless one of [PFX]_SHARED and/or
+[PFX]_STATIC = NO. If both are set to NO, then Auto Lib will not be used at all.
+
+
+
+Variables that users can set to help find libraries
+---------------------------------------------------
+
+[PFX]                   Location of dir where the library can be found      (PATH, see below)
+[PFX]_INC               Include dir for library headers                     (PATH)
+[PFX]_LIB               Lib dir for library archive/shared objects          (PATH)
+[PFX]_BASE              Base dir under which to search for other dirs       (PATH)
+[PFX]_SEARCH_LIB_INC    Search in [PFX]_INC and [PFX]_LIB if set            (YES|NO, def=YES)
+[PFX]_SEARCH_DIR        Search [PFX] if set                                 (YES|NO, def=YES)
+[PFX]_SEARCH_BASE       Search under [PFX]_BASE if set                      (YES|NO, def=YES)
+[PFX]_SEARCH_PARENT     Search under the dir that the Nginx source is in    (YES|NO, see above)
+[PFX]_SEARCH_SYSTEM     Search in standard system paths                     (YES|NO, see above)
+[PFX]_SHARED            Use shared library rather than static               (YES|NO, def=YES)
+[PFX]_SYSTEM_DIRS       System dirs to search in (PATHS, space-separated, overrides the defaults)
+USE_[PFX]               Whether or not to install the library               (YES|NO, def=YES)
+
+
+Note : for libraries that have configure options (e.g. --with-openssl=/path), the [PFX]
+variable is set automatically by configure, so will not be used if exported.
+
+
+
+Information for module developers
+=================================
+
+How Auto Lib Core works
+-----------------------
+
+Auto Lib Core works as an interface layer between the module and the auto/feature part of
+the Nginx source. This is the file that results in the 'checking for ...' lines that you
+see when you call ./configure.
+
+auto/feature works by using a few key variables (see below) to generate some C code, trying
+to compile it to see if it works and optionally running the code. This output file is called
+autotest.c (located under the objs/ directory whilst configure is running, but is deleted
+after each call to auto/feature).
+
+Normally, whenever an external library is required, a module developer will write a number
+of calls to auto/feature manually in their config files - e.g. to check under a range of
+different possible locations to find a library. Apart from being tedious, this is obviously
+potentially error-prone.
+
+Auto Lib Core will automatically generate all the calls to auto/feature for you, and will
+take into account different operating systems etc in a consistent way, 'intelligent' way.
+
+
+Including Nginx Auto Lib Core with custom modules
+-------------------------------------------------
+
+Option 1 :
+
+- include ngx_auto_lib_core in the same directory that your module config file is
+  located
+- add the following line to your config file
+
+  . $ngx_addon_dir/ngx_auto_lib_core
+
+NOTE : if you want to include the file in a different directory to your config
+file, you will need to change both the include line in your config file AND
+the line in the ngx_auto_lib_core file that points to the file (it's the line that
+has $ngx_addon_dir/ngx_auto_lib_core in it)
+
+Option 2 :
+
+- make the Nginx Development Kit (github.com/simpl-it/ngx_devel_kit) a dependency
+  for your module (Auto Lib Core is included automatically with it)
+
+
+Recommended way of including Auto Lib Core
+------------------------------------------
+
+If the Nginx Development Kit (NDK) is already a dependency for your module, then you do
+not need to do anything - just follow the 'using Auto Lib Core' instructions below.
+
+If the NDK is not a dependency for your module, then it is recommended to include a
+copy of ngx_auto_lib_core with your module, but to recommend to users of your module
+to include the NDK when compiling. If the module is not required for anything else, this
+will not make any difference to the Nginx binary that they compile, but will mean they
+will get the latest version of Auto Lib Core (which probably won't change much anyway,
+but you never know).
+
+You will also probably want to include a copy of this readme file for Auto Lib Core
+(at least the user section), and mention what the relevant [PFX] you use for your module
+is in your module's readme file so that users will know what to write for any variables
+that they might use to control the search paths for libraries (see above user section).
+
+
+Using Auto Lib Core
+-------------------
+
+To use Auto Lib Core, you should do the following in your config file for each
+external library that you want to include :
+
+1 - Call ngx_auto_lib_init
+2 - Define any variables used for testing
+3 - Define any hooks (custom functions)
+4 - Call ngx_auto_lib_run
+
+
+Calling ngx_auto_lib_init() and ngx_auto_lib_run()
+--------------------------------------------------
+
+You can pass either one or two variables to ngx_auto_lib_init(). The first is the name of
+the library as it will appear when running ./configure, the second is the prefix that is
+used for internal variables and looking for directory prefixes. If the second is not
+specified, it defaults to the first.
+
+The init function resets all key variables and functions, so it must be called before
+setting any other variables or functions that are to be used as hooks (see the notes below).
+
+ngx_auto_lib_run() should be called in the config files after all the variables and hooks
+have been defined. This will then run through all the tests to try to find the external
+library.
+
+
+Variables you can set in your config files
+------------------------------------------
+
+All the variables that you set in Auto Lib Core are similar to the ones you set for
+including libraries in the normal way.
+
+       name                           description
+----------------------------------------------------------------------------------------
+
+core variables (i.e. the ones in the core Nginx source)
+
+ngx_feature_inc_path                CFLAGS and include path info (including -I)
+ngx_feature_incs                    Include/define code inserted before main() in autotest.c
+ngx_feature_libs                    External libraries to add (see below)
+ngx_feature_path                    Space-separated include path
+ngx_feature_run                     Whether to run the autotest binary (default = no)
+ngx_feature_test                    C-code inserted inside main() in autotest.c
+
+extended variables (only work in NALC) :
+
+ngx_feature_add_libs                Add libraries (but do not add include files)
+ngx_feature_add_path                Add extra directories to include path
+ngx_feature_build_dirs              Sub dirs that builds might be found
+ngx_feature_build_inc_dirs          Sub dirs that include files might be found
+ngx_feature_build_lib_dirs          Sub dirs that lib files might be found
+ngx_feature_check_macros_defined    Lib required only if one of these macros is defined
+ngx_feature_check_macros_non_zero   Lib required only if one of these macros is non-zero
+ngx_feature_defines                 Define these macros if the library is found
+ngx_feature_deps                    Deps to add (e.g. to CORE_DEPS) if the library is found
+ngx_feature_exit_if_not_found       Quit configure if the library is not found
+ngx_feature_haves                   Set these macros to 1 if the library is found
+ngx_feature_inc_names               Names for include files (not including the .h)
+ngx_feature_lib_files               Add these files under the lib dir for static inclusions
+ngx_feature_lib_names               Names for lib files (not including -l or .a)
+ngx_feature_modules                 Modules to add if the library is found
+ngx_feature_srcs                    Sources to add (e.g. to ADDON_SRCS) if the lib is found
+ngx_feature_shared                  If set to 'no', then only use static lib versions
+ngx_feature_test_libs               Add these libs when testing, but not to the final binary
+ngx_feature_variables               Set these variables if the library is found
+
+standard variables that are completely over-written (i.e. they won't work with NALC) :
+
+ngx_feature_name                    Message that is displayed after 'checking for' in configure
+
+
+Using these variables
+---------------------
+
+You do not need to set most of these variables, since 'intelligent' guesses are made that
+will work for most cases. With the exception of ngx_feature_test, you should generally use
+the extended variables rather than the core ones, since sensible core variables will be
+automatically generated from them, and will work for both static and shared libraries.
+
+
+Variable defaults
+-----------------
+
+ngx_feature_incs            for i in $ngx_feature_inc_names { #include <$i.h> }
+ngx_feature_libs            for l in $ngx_feature_lib_names { -l$l or $LIB/lib$l.a }
+                            + $ngx_feature_add_libs
+ngx_feature_inc_names       $ngx_feature_lib_names
+ngx_feature_lib_names       $pfx
+pfx                         str_to_lower (if two variables are passed to ngx_auto_lib_init, then
+                            then $2, otherwise, $1)
+
+The easiest way to understand how all the defaults work is probably to look at the source code
+of ngx_auto_lib_test_setup() and to look at the examples in the standard Nginx Auto Lib module
+which has code for OpenSSL, PCRE, Zlib, MD5 and SHA1.
+
+
+Hooks
+-----
+
+To facilitate using Auto Lib Core in a flexible way, a number of 'hooks' have been
+placed in the testing cycle. These hooks are implemented as functions that you define
+in your config file which are called if required by the core library. In the core
+library they are left as empty functions that return either 0 or 1. Any functions
+you write will
+
+Note : ngx_auto_lib_init() resets the variables and functions each time it is called, so
+you must DEFINE HOOKS AFTER YOU CALL ngx_auto_lib_init.
+
+Note : an update on what hooks are available will be added later. To see what hooks are
+available, just look in the source code of ngx_auto_lib_core for any functions that just
+return 0 or 1.
+
+See the MD5 and SHA1 libraries of Nginx Auto Lib module for examples.
+
+
+
+Checking that a library is required
+-----------------------------------
+
+Although in most cases Auto Lib Core will be used where external libraries are
+definitely required (for a module to work), this may not always be the case. In the
+standard Nginx Auto Lib module (github.com/simpl-it/ngx_auto_lib) - which is designed
+to improve the inclusion of OpenSSL, PCRE and Zlib libraries and increase compilation
+speed where possible - the libraries are not always required, so checks are made to
+see if it is necessary.
+
+
+
+How Auto Lib Core checks if a library is required - ngx_auto_lib_check_require()
+------------------------------------------------------------------------------------
+
+- search for USE_[PFX]=YES (it is set to YES by default for most modules)
+- search for any external libraries that have been included in the CORE_LIBS or ADDON_LIBS
+  variables that use the same lib name as any set in ngx_feature_lib_names
+- search for any macros that have been defined either in the CFLAGS variable or using
+  auto/have or auto/define as set in the ngx_feature_check_macros_defined and
+  ngx_feature_ngx_macros_non_zero variables
+- any custom checks implemented by creating an ngx_auto_lib_check hook function (which
+  should return 0 if the library is required and return 1 at the end if the module is
+  not required)
+
+
+
+Guaranteeing that the correct version of a shared library is linked at run time
+-------------------------------------------------------------------------------
+
+Sometimes users will want to use shared libraries that are in non-standard locations
+that the linker may have a problem in locating at run time - even if the correct
+linker path (-L/path/to/lib) is supplied when checking. To make sure that the linker
+can find the library at run time, and to make sure that the linker will use the correct
+version of a library if the library is also located in a standard directory, a run path
+is added to the linker flags (using -Wl,--rpath -Wl,/path/to/lib/dir). In most cases this
+will guarantee that the correct library is used when linking - though care should be taken
+by any users specifying specific paths for libraries that the correct version of the
+library has been linked at run time (e.g. using ldd etc).
+
+As an additional check when running auto/feature, as well as the compilation of the
+autotest.c file, a check is made by ldd to see that the path of the shared library
+that the linker links to is the same as the one specified. This is done because
+
+
+To do
+-----
+
+- Change how library paths are searched to include both shared and static libraries
+- Touch up documentation
+
+
+License
+-------
+
+    BSD
+
+
+Copyright
+---------
+
+    [Marcus Clyne](https://github.com/mclyne) (c) 2010
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/actions/array b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/actions/array
new file mode 100644
index 0000000..04cd889
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/actions/array
@@ -0,0 +1,10 @@
+
+array_create        (a,pl,n,sz)     a = %1%_array_create (pl,n,sz); if (a == NULL) %A%
+array_init          (a,pl,n,sz)     if (%1%_array_init (a,pl,n,sz) == %E%) %A%
+array_push          (p,a)           p = %1%_array_push (a);     if (p == NULL) %A%
+array_push_clean    (p,a)           p = %1%_array_push (a);     if (p == NULL) %A%; %2%_zerop (p)
+array_push_n        (p,a,n)         p = %1%_array_push_n (a,n); if (p == NULL) %A%
+array_push_n_clean  (p,a,n)         p = %1%_array_push_n (a,n); if (p == NULL) %A%; %2%_zeropn (p,n)
+
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/actions/palloc b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/actions/palloc
new file mode 100644
index 0000000..6d430bd
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/actions/palloc
@@ -0,0 +1,8 @@
+
+palloc              (p,pl,sz)       p = %1%_palloc (pl,sz);    if (p == NULL) %A%
+pallocp             (p,pl)          %2%_pallocp (p,pl);        if (p == NULL) %A%
+pallocpn            (p,pl,n)        %2%_pallocpn (p,pl,n);     if (p == NULL) %A%
+pcalloc             (p,pl,sz)       p = %1%_pcalloc (pl,sz);   if (p == NULL) %A%
+pcallocp            (p,pl)          %2%_pcallocp (p,pl);       if (p == NULL) %A%
+pcallocpn           (p,pl,n)        %2%_pcallocpn (p,pl,n);    if (p == NULL) %A%
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/build b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/build
new file mode 100644
index 0000000..feb84b3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/build
@@ -0,0 +1,597 @@
+#! /bin/bash
+
+cd `dirname $0`
+
+if [ $# -eq 2 ];
+then
+  if [ `expr $2 : /` -eq 1 ];
+  then
+    output_dir=$2
+  else
+    output_dir=$1/$2
+  fi
+else
+    output_dir=../objs
+fi
+
+list_file=data/action_list
+types_file=data/action_types
+reps_file=data/action_replacements
+prefix_file=data/prefixes 
+header_file=data/header_files
+optional_modules_file=data/modules_optional
+headers_file=data/headers
+module_dependencies_file=data/module_dependencies
+conf_macros_file=data/conf_macros
+conf_locs_file=data/conf_locs
+conf_args_file=data/conf_args
+
+autogen_notice=text/autogen
+
+actions_dir=actions
+srcs_dir=src
+include_prefix=
+file_prefix=ndk_
+auto_file_name=config
+auto_includes_name=includes
+
+conf_merge_filename=conf_merge.h
+conf_cmd_basic_filename=conf_cmd_basic.h
+conf_cmd_extra_filename=conf_cmd_extra.h
+
+
+spacer=¬
+
+sed_delete_empty_lines='t_NEL;d;:_NEL'
+
+
+function trim_lines {
+    sed -e '/./,$!d' -e :a -e '/^\n*$/{$d;N;ba' -e '}'
+}
+
+
+function strtoupper {
+    [ $# -eq 1 ] || return 1
+    local _str _cu _cl _x
+    _cu=(A B C D E F G H I J K L M N O P Q R S T U V W X Y Z)
+    _cl=(a b c d e f g h i j k l m n o p q r s t u v w x y z)
+    _str=$1
+    for ((_x=0;_x<${#_cl[*]};_x++)); do
+        _str=${_str//${_cl[$_x]}/${_cu[$_x]}}
+    done
+    echo $_str
+}
+
+
+function sed_pad_right {
+    len=$1
+    spacer=$2
+    prefix=_PR$3
+
+    # returns a SED script that pads out (spaces) to the right to alignment $len
+    # this script should be used inside a call to sed
+    # NOTE : a spacer character $spacer should have already been written into the parsed string
+
+    echo "t${prefix}a;:${prefix}a;s/^[^$spacer]{$len}/&/;\
+t${prefix}b;s/^[^$spacer]*/& /;t${prefix}a;:${prefix}b;s/$spacer/ /"
+}
+
+
+function sed_pad_left {
+
+    len=$1
+    spacer=$2
+    prefix=_PL$3
+
+   # echo "t${prefix}a;:${prefix}a;s/^[^$spacer]{$len}/& /;t${prefix}a"     # NOT CORRECT?
+}
+
+
+function add_notice {
+
+    echo > $1
+    cat $autogen_notice | trim_lines >> $1
+    echo >> $1
+    echo >> $1
+}
+
+function add_non_generated_content {
+
+    file=src/$1.h
+    [ ! -f $file ] && return
+
+    echo "/* Non-generated macros */" >> $2
+    echo >> $2
+
+    cat $file | trim_lines >> $2
+
+    echo >> $2
+    echo >> $2
+}
+
+
+function add_action_macros {
+
+    list_file=$actions_dir/$1
+
+    [ ! -f $list_file ] && return
+
+    out=$2
+
+
+    # alignment settings
+
+    align1=20
+    align2=35
+    align3=62
+    base_shrink=12
+    define="#define     "
+
+
+
+    # base macros
+
+    echo "/* base action macro macros */" >> $out
+    echo >> $out
+
+    cat $list_file | trim_lines | sed -r \
+    -e "s/^[ ]*([a-zA-Z0-9_]+)([ ]*)\(([a-zA-Z0-9_,]+)\)([ ]*)(.*)/$define%2%_\1_ac(\3,ac)\2\4  {\5;}/" \
+    -e "s/[ ]{$base_shrink}\{/\{/" \
+    -e 's/%A%/ac/g' \
+    >> $out
+
+    echo >> $out
+    echo >> $out
+
+
+
+    # generated macros
+
+    echo "/* generated action macros */" >> $out
+    echo >> $out
+
+    cat -s $list_file | while read list_line; do
+
+        [ "x`echo $list_line`" = 'x' ] && continue
+
+        cat $types_file | while read type_line; do
+
+            [ "x`echo $type_line`" = 'x' ] && continue  
+
+            #ext=`echo $type_line | grep -E '^[a-zA-Z0-9_]+' | cut -d " " -f1`
+            ext=`echo $type_line | sed -r 's/^([a-zA-Z0-9_]+).*/\1/'`
+            params=`echo $type_line | sed -r 's/^[a-zA-Z0-9_]+[ ]*\((.*)\).*/\1/;ta;d;:a'`
+            act=`echo $type_line | sed -r 's/^[a-zA-Z0-9_]+[ ]*(\(.*\))?(.*)/\2/'`
+            [ "x$params" != "x" ] && params=",$params"
+
+            echo $list_line | sed -r \
+            -e "s/^([a-zA-Z0-9_]+)[ ]*\(([a-zA-Z0-9_,]+)\).*/%2%_\1_$ext(\2$params)$spacer%2%_\1_ac$spacer(\2,$act)/" \
+            -e 's/[ ]*,[ ]*/,/g' \
+            -e "`sed_pad_right $align2 $spacer 1`" \
+            -e "`sed_pad_right $align3 $spacer 2`" \
+            -e "s/.*/$define&/" \
+            >> $out
+        done
+        echo >> $out
+    done
+}
+
+
+function replace_prefixes {
+
+    temp=.temp
+
+    file=`cat $prefix_file`
+
+    prefix1=
+    prefix2=
+
+    for prefix in $file ; do
+        [ "x$prefix2" != "x" ] && echo "Too many prefixes in prefix file $prefix_file" && exit 1
+        [ "x$prefix1" != "x" ] && prefix2=$prefix && continue
+        prefix1=$prefix
+    done
+
+    sed -r "s/%1%/$prefix1/g;s/%2%/$prefix2/g" < $1 > $temp
+
+    mv -f $temp $1
+}
+
+
+function replace_other_strings {
+
+    temp=.temp
+
+    cat $reps_file | while read line; do
+
+        rep1=
+        rep2=
+
+        for rep in $line ; do
+            [ "x$rep2" != "x" ] && echo "Too many replacments in replacements file $reps_file" && exit 1
+            [ "x$rep1" != "x" ] && rep2=$rep && continue
+            rep1=$rep
+        done
+
+        sed -r "s/%$rep1%/$rep2/g" < $1 > $temp
+        mv -f $temp $1
+    done
+}
+
+
+function generate_header_file {
+
+    name=$1
+    out=$output_dir/$file_prefix$name.h
+
+    add_notice $out
+    add_non_generated_content $name $out
+    add_action_macros $name $out
+    replace_prefixes $out
+    replace_other_strings $out
+}
+
+
+function add_auto_include {
+    echo "#include  <${file_prefix}$2>" >> $1
+}
+
+
+function add_include {
+    echo "#include  <${include_prefix}${file_prefix}$2>" >> $1
+}
+
+
+function generate_non_optional_h_includes {
+
+    # TODO : split into auto-generated and non-auto-generated ones
+
+    echo "/* non-optional includes */" >> $1
+    echo >> $1
+
+    for mod in `cat $headers_file | sort`; do
+
+        add_auto_include  $1  $mod.h
+    done
+
+    echo >> $1
+    echo >> $1
+}
+
+
+function generate_include_all_includes {
+
+    echo "/* include all optional modules */" >> $1
+    echo >> $1
+    echo "#ifdef NDK_ALL" >> $1
+    echo >> $1
+
+    modules=`cat $optional_modules_file | sed 's/*//g' | sort`
+
+    for mod in $modules; do
+        def="NDK_`strtoupper $mod`"
+        echo "#ifndef $def" >> $1
+        echo "#define $def 1" >> $1
+        echo "#endif" >> $1
+    done
+
+    echo >> $1
+    echo "#endif" >> $1
+    echo >> $1
+    echo >> $1
+}
+
+
+function generate_dependent_includes {
+
+    echo "/* module dependencies */" >> $1
+    echo >> $1
+
+    cat $module_dependencies_file | while read line; do
+
+        first=1
+
+        for mod in $line; do
+
+            def="NDK_`strtoupper $mod`"
+
+            if [ $first = 1 ] ; then
+
+                echo "#ifdef  $def" >> $1
+                first=0
+            else
+                echo "#ifndef $def" >> $1
+                echo "#define $def 1" >> $1
+                echo "#endif" >> $1
+            fi
+        done
+
+        [ $first = 0 ] && echo "#endif" >> $1
+    done
+
+    echo >> $1
+    echo >> $1
+}
+
+
+
+function generate_optional_h_includes {
+
+    echo "/* optional includes */" >> $1
+    echo >> $1
+
+    for mod in $modules; do
+        def="NDK_`strtoupper $mod`"
+        echo "#if ($def)" >> $1
+        add_include  $1  $mod.h
+        echo "#endif" >> $1
+    done
+
+    echo >> $1
+    echo >> $1
+}
+
+
+
+
+
+function generate_conf_merge_macros_file {
+
+    file=$conf_merge_filename
+    out_file=${file_prefix}$file
+    out=$output_dir/$out_file
+
+    add_notice $out
+
+    echo "/* conf-merge-value macros */" >> $out
+    echo >> $out
+
+    cat $srcs_dir/$file | trim_lines >> $out
+    echo >> $out
+    echo >> $out
+
+    echo "/* conf-merge-prop macros */" >> $out
+    echo >> $out
+
+    echo "#define     ndk_conf_merge_prop(prop,default)\\" >> $out
+    echo "            ndk_conf_merge_value\\" >> $out
+    echo "                (conf->prop, prev->prop, default)" >> $out
+    echo >> $out
+
+    # loads macros, removes empty elements, sorts and translates to merge-prop macros
+
+    cat $conf_macros_file | sed -r 's/^[A-Z0-9_]+[ ]*[A-Z0-9_]+[ ]*([a-z0-9_]+).*$/\1/;ta;d;:a' \
+        | sort | sed -r \
+        's/(.*)/#define     ndk_conf_merge_\1_prop(prop,default,...)\\\
+            ndk_conf_merge_\1_value\\\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)\
+    /' \
+    >> $out
+
+    add_auto_include $1 $file
+}
+
+
+
+
+function generate_conf_cmd_basic_file {
+
+    temp=.rep
+    file=$conf_cmd_basic_filename
+    out_file=${file_prefix}$file
+    out=$output_dir/$out_file
+
+    align1=35
+
+    # initial text
+
+    add_notice $out
+
+
+    # add ndk bitmasks
+
+    echo "/* conf cmd core values/bitmasks */" >> $out
+    echo >> $out
+
+
+    cat $conf_args_file | sort | trim_lines | sed -r \
+    -e "s/^([A-Z0-9_]+)/${define}NDK_\1${spacer}NGX_\1/" \
+    -e $sed_delete_empty_lines \
+    -e  "`sed_pad_right $align1 $spacer`" \
+    >> $out
+
+    echo >> $out
+    echo >> $out
+
+
+    # add additional bitmasks stored in file
+
+    echo "/* conf cmd bitmasks */" >> $out
+    echo >> $out
+
+    cat $srcs_dir/$conf_cmd_basic_filename | trim_lines >> $out
+
+    echo >> $out
+    echo >> $out
+
+    echo "/* conf cmd basic macros */" >> $out
+    echo >> $out
+
+
+    # build replacement string
+
+    echo -n "s/^([A-Z0-9_]+)$/" > $temp
+
+    cat $conf_locs_file | sed \
+    -r -e 's/^([A-Z0-9_]+) *([A-Z0-9_]+).*/#define     NDK_\1_CONF_\\1\(name,func,off1,off2,post)\\\\\\\
+                                    {ngx_string (name),\\\\\\\
+                                    NGX_CONF_\\1|NDK_\1_CONF,\\\\\\\
+                                    func, off1, off2, post},\\\
+\\/' -e $sed_delete_empty_lines \
+    >> $temp
+
+    echo -n "/;$sed_delete_empty_lines" >> $temp
+
+
+    # apply the replacement string to the 
+
+    cat $conf_args_file | sort | trim_lines | sed -rf $temp >> $out
+    rm -f $temp
+
+    add_auto_include $1 $file
+}
+
+
+
+function generate_conf_cmd_extra_file {
+
+    temp=.rep
+    file=$conf_cmd_extra_filename
+    out=$output_dir/${file_prefix}$file
+
+    align1=35
+
+    # initial text
+
+    add_notice $out
+
+    echo "/* conf command macros */" >> $out
+    echo >> $out
+
+
+    # build replacement string
+
+    echo -n 's/^([A-Z0-9_]+)[ ]*([A-Z0-9_]+)[ ]*([a-z0-9_]+).*$/' > $temp
+
+    cat $conf_locs_file | sed \
+    -r -e 's/^([A-Z0-9_]+)[ ]*([A-Z0-9_]+)[ ]*([a-zA-Z0-9_]+)/#define     NDK_\1_CONF_\\1(name,p,post\)\\\\\\\
+            NDK_\1_CONF_\\2\\\\\\\
+                (name,\\\\\\\
+                ndk_conf_set_\\3_slot,\\\\\\\
+                NGX_\2_CONF_OFFSET,\\\\\\\
+                offsetof (ndk_module_\3_conf_t, p),\\\\\\\
+                post)\\\
+\\/' -e $sed_delete_empty_lines \
+    >> $temp
+
+    echo -n "/;$sed_delete_empty_lines" >> $temp
+    #echo -n ";`sed_pad_right 60 $spacer`" >> $temp
+
+
+    # apply the replacement string to the 
+
+    cat $conf_macros_file | sort | trim_lines | sed -rf $temp -e "`sed_pad_right 60 $spacer`" >> $out
+    rm -f $temp
+
+    add_auto_include $1 $file
+}
+
+
+
+function generate_auto_generated_h_includes {
+
+    echo "/* auto-generated headers */" >> $1
+    echo >> $1
+
+    for name in `cat $header_file | sort` ; do
+
+        generate_header_file $name
+        add_auto_include $1 $name.h
+    done
+
+    generate_conf_merge_macros_file $1
+    generate_conf_cmd_basic_file $1
+    generate_conf_cmd_extra_file $1
+
+    echo >> $1
+    echo >> $1
+}
+
+
+
+function generate_optional_c_includes {
+
+    echo "/* optional includes */" >> $1
+    echo >> $1
+
+    modules=`cat $optional_modules_file | sed 's/*//g' | sort`
+
+    for mod in $modules; do
+        def="NDK_`strtoupper "$mod"`"
+        echo "#if ($def)" >> $1
+        add_include $1 $mod.c
+        echo "#endif" >> $1
+    done
+
+    echo >> $1
+    echo >> $1
+}
+
+
+function generate_commands {
+
+    echo "/* module commands */" >> $1
+    echo >> $1
+    echo "static ngx_command_t  ndk_http_commands[] = {" >> $1
+
+    cat $optional_modules_file | sort | while read line; do
+
+        cmds=`echo "$line" | grep -E '\*'`
+
+        [ "x$cmds" = "x" ] && continue
+
+        mod=`echo "$line" | grep -E '^[a-zA-Z0-9_]+' | cut -d " " -f1`
+        up=`strtoupper $mod`
+        def="NDK_$up"
+        defcmd="NDK_${up}_CMDS"
+
+        echo "#if ($def)"                   >> $1
+        echo "#define $defcmd 1"            >> $1
+        add_include  $1  $mod.h
+        echo "#undef  $defcmd"              >> $1
+        echo "#endif"                       >> $1
+
+    done
+
+    echo -e "    ngx_null_command\n};"      >> $1
+}
+
+
+function generate_all_h_files {
+
+    out=$output_dir/${file_prefix}$auto_file_name.h
+
+    add_notice $out
+
+    generate_include_all_includes $out
+    generate_dependent_includes $out
+
+    out=$output_dir/${file_prefix}$auto_includes_name.h
+
+    generate_optional_h_includes $out
+    generate_non_optional_h_includes $out
+    generate_auto_generated_h_includes $out $list
+}
+
+
+function generate_all_c_files {
+
+    out=$output_dir/${file_prefix}$auto_file_name.c
+
+    add_notice $out
+    generate_optional_c_includes $out
+    generate_commands $out
+}
+
+
+
+function generate_all_files {
+
+    mkdir -p $output_dir
+    rm -f $output_dir/*
+
+    generate_all_h_files
+    generate_all_c_files
+}
+
+generate_all_files
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/action_replacements b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/action_replacements
new file mode 100644
index 0000000..f419bc3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/action_replacements
@@ -0,0 +1,5 @@
+
+OK      NGX_OK
+E       NGX_ERROR
+CE      NGX_CONF_ERROR
+COK     NGX_CONF_OK
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/action_types b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/action_types
new file mode 100644
index 0000000..284a5cb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/action_types
@@ -0,0 +1,12 @@
+r0          return 0
+r1          return 1
+r_1         return -1
+rok         return %OK%
+rce         return %CE%
+rcok        return %COK%
+re          return %E%
+rn          return NULL
+rse         {ngx_script_error (e); return;}
+sce         {ngx_script_configure_error (c); return;}
+g(_lb)      goto _lb
+ge          goto error
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_args b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_args
new file mode 100644
index 0000000..752b533
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_args
@@ -0,0 +1,22 @@
+ 
+TAKE1
+TAKE2
+TAKE3
+TAKE4
+TAKE5
+TAKE6
+TAKE7
+TAKE8
+TAKE12
+TAKE13
+TAKE23
+TAKE123
+TAKE1234
+1MORE
+2MORE
+ANY
+FLAG
+BLOCK
+MULTI
+ARGS_NUMBER
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_locs b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_locs
new file mode 100644
index 0000000..f5352c3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_locs
@@ -0,0 +1,25 @@
+
+HTTP_MAIN                   HTTP_MAIN       main
+HTTP_SRV                    HTTP_SRV        srv
+HTTP_SIF                    HTTP_SRV        srv
+HTTP_LOC                    HTTP_LOC        loc
+HTTP_LIF                    HTTP_LOC        loc
+
+HTTP_MAIN_SRV               HTTP_SRV        srv
+HTTP_MAIN_SIF               HTTP_SRV        srv
+HTTP_MAIN_LOC               HTTP_LOC        loc
+HTTP_MAIN_LIF               HTTP_LOC        loc
+
+HTTP_SRV_LOC                HTTP_LOC        loc
+HTTP_SRV_LIF                HTTP_LOC        loc
+HTTP_SIF_LOC                HTTP_LOC        loc
+HTTP_SIF_LIF                HTTP_LOC        loc
+
+HTTP_MAIN_SRV_LOC           HTTP_LOC        loc
+HTTP_MAIN_SRV_LIF           HTTP_LOC        loc
+HTTP_MAIN_SIF_LOC           HTTP_LOC        loc
+HTTP_MAIN_SRV_SIF_LOC       HTTP_LOC        loc
+HTTP                        HTTP_LOC        loc
+HTTP_UPS                    HTTP_LOC        loc
+HTTP_ANY                    HTTP_LOC        loc
+ANY                         HTTP_LOC        loc
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_macros b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_macros
new file mode 100644
index 0000000..f42206a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/conf_macros
@@ -0,0 +1,35 @@
+
+BITMASK             1MORE       bitmask
+BUFS                TAKE1       bufs
+COMPLEX_KEYVAL      TAKE2       http_complex_keyval
+COMPLEX_PATH        TAKE1       http_complex_path
+COMPLEX_VALUE       TAKE1       http_complex_value
+COMPLEX_VALUE_ARRAY 1MORE       http_complex_value_array
+ENCODING            TAKE1       encoding
+ENUM                TAKE1       enum
+FALSE               NOARGS      false
+FULL_PATH           TAKE1       full_path
+KEYVAL              TAKE2       keyval
+KEYVAL1             TAKE2       keyval1
+MSEC                TAKE1       msec
+NULL                NOARGS      null
+NUM                 TAKE1       num
+NUM64               TAKE1       num64
+NUM_FLAG            TAKE1       num_flag
+ONOFF               FLAG        flag
+OFF                 TAKE1       off
+PATH                TAKE1       split_path
+REXEX               TAKE1       regex
+REGEX_CL            TAKE1       regex_caseless
+REGEX_ARRAY         1MORE       regex_array
+REGEX_ARRAY_CL      1MORE       regex_array_caseless
+PTR                 NOARGS      ptr
+SEC                 TAKE1       sec
+SEC_FLAG            TAKE2       sec_flag
+SIZE                TAKE1       size
+STR                 TAKE1       str
+STR_ARRAY           1MORE       str_array_multi
+STR_ARRAY1          TAKE1       str_array
+TRUE                NOARGS      true
+
+ 
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/contexts b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/contexts
new file mode 100644
index 0000000..e7e8ff0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/contexts
@@ -0,0 +1,22 @@
+ 
+MAIN
+SRV
+SIF
+LOC
+LIF
+
+MAIN_SRV
+MAIN_SIF
+MAIN_LOC
+MAIN_LIF
+SRV_LOC
+SRV_LIF
+SIF_LOC
+SIF_LIF
+
+MAIN_SRV_LOC
+MAIN_SRV_LIF
+MAIN_SIF_LOC
+MAIN_SIF_LIF
+ANY_MAIN
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/header_files b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/header_files
new file mode 100644
index 0000000..aa0f11c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/header_files
@@ -0,0 +1,3 @@
+array
+palloc
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/headers b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/headers
new file mode 100644
index 0000000..7583cb9
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/headers
@@ -0,0 +1,4 @@
+http_headers
+log
+parse
+string_util
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/module_dependencies b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/module_dependencies
new file mode 100644
index 0000000..a179316
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/module_dependencies
@@ -0,0 +1,5 @@
+complex_path    complex_value   path
+conf_file       string
+hash            string
+set_var         rewrite
+upstream_list   http_create_main_conf
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/modules_optional b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/modules_optional
new file mode 100644
index 0000000..bbd6ec5
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/modules_optional
@@ -0,0 +1,15 @@
+buf
+complex_path
+complex_value
+conf_file
+encoding
+hash
+http
+path
+process
+regex
+rewrite
+set_var
+string
+upstream_list   *
+uri
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/prefixes b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/prefixes
new file mode 100644
index 0000000..ee53474
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/data/prefixes
@@ -0,0 +1,2 @@
+ngx
+ndk 
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/array.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/array.h
new file mode 100644
index 0000000..a583759
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/array.h
@@ -0,0 +1,7 @@
+
+#define     %2%_array_count(a)                  ((a)->nelts)
+#define     %2%_array_get_first(a)              ((a)->elts)
+#define     %2%_array_get_index(a,n)            ((void*) ((char*) (a)->elts + (a)->size * n))
+#define     %2%_array_get_last(a)               ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1)))
+#define     %2%_array_get_reverse_index(a,n)    ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1 - n)))
+#define     %2%_array_push_clean(p,a)           {p = %1%_array_push (a); %2%_zerop (p);}
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/conf_cmd_basic.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/conf_cmd_basic.h
new file mode 100644
index 0000000..38743a6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/conf_cmd_basic.h
@@ -0,0 +1,43 @@
+
+/* TODO : finish this */
+
+#define     NDK_HTTP_MAIN_CONF              NGX_HTTP_MAIN_CONF
+#define     NDK_HTTP_SRV_CONF               NGX_HTTP_SRV_CONF
+#define     NDK_HTTP_SIF_CONF               NGX_HTTP_SIF_CONF
+#define     NDK_HTTP_LOC_CONF               NGX_HTTP_LOC_CONF
+#define     NDK_HTTP_LIF_CONF               NGX_HTTP_LIF_CONF
+#define     NDK_HTTP_UPS_CONF               NGX_HTTP_UPS_CONF
+#define     NDK_MAIN_CONF                   NGX_MAIN_CONF
+#define     NDK_ANY_CONF                    NGX_ANY_CONF
+
+
+/* compound locations */
+
+#define     NDK_HTTP_MAIN_SRV_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_CONF
+#define     NDK_HTTP_MAIN_SIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_SIF_CONF
+#define     NDK_HTTP_MAIN_LOC_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_CONF
+#define     NDK_HTTP_MAIN_LIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_LIF_CONF
+
+#define     NDK_HTTP_SRV_SIF_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_SIF_CONF
+#define     NDK_HTTP_SRV_LOC_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_CONF
+#define     NDK_HTTP_SRV_LOC_LIF_CONF               NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_LIF_CONF
+#define     NDK_HTTP_SRV_SIF_LOC_CONF               NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_CONF
+#define     NDK_HTTP_SRV_SIF_LOC_LIF_CONF           NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_LIF_CONF
+
+#define     NDK_HTTP_LOC_LIF_CONF                   NDK_HTTP_LOC_CONF|NDK_HTTP_LIF_CONF
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LOC_CONF
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LIF_CONF
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SIF_LOC_CONF
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF      NDK_HTTP_SRV_SIF_LOC_LIF_CONF|NDK_MAIN_CONF
+#define     NDK_HTTP_CONF                           NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF
+#define     NDK_HTTP_ANY_CONF                       NDK_HTTP_CONF|NDK_HTTP_UPS_CONF
+
+
+/* property offsets     NOTE : ngx_module_main_conf_t etc should be defined in the module's .c file before the commands */
+
+#define     NDK_HTTP_MAIN_CONF_PROP(p)      NGX_HTTP_MAIN_CONF_OFFSET, offsetof (ndk_module_main_conf_t, p)
+#define     NDK_HTTP_SRV_CONF_PROP(p)       NGX_HTTP_SRV_CONF_OFFSET, offsetof (ndk_module_srv_conf_t, p)
+#define     NDK_HTTP_LOC_CONF_PROP(p)       NGX_HTTP_LOC_CONF_OFFSET, offsetof (ndk_module_loc_conf_t, p)
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/conf_merge.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/conf_merge.h
new file mode 100644
index 0000000..1e3ba70
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/conf_merge.h
@@ -0,0 +1,78 @@
+
+/* TODO : check that all the main types have a corresponding merge function */
+
+#define     ndk_conf_merge_value            ngx_conf_merge_value
+#define     ndk_conf_merge_off_value        ngx_conf_merge_off_value 
+#define     ndk_conf_merge_ptr_value        ngx_conf_merge_ptr_value
+#define     ndk_conf_merge_str_value        ngx_conf_merge_str_value
+#define     ndk_conf_merge_size_value       ngx_conf_merge_size_value 
+
+
+#define     ndk_conf_merge_keyval_value(conf,prev,default)                                  \
+                                                                                            \
+                conf = prev ? prev : default;
+
+#define     ndk_conf_merge_str_array_value(conf,prev,val1,...)                              \
+                                                                                            \
+                if (conf == NGX_CONF_UNSET_PTR) {                                           \
+                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
+                        if (val1 == NULL) {                                                 \
+                            conf = NULL;                                                    \
+                        } else {                                                            \
+                            char * elts[] = {val1,##__VA_ARGS__};                           \
+                            int    n = sizeof(elts)/sizeof(char*);                          \
+                                                                                            \
+                            conf = ndk_str_array_create (cf->pool, elts, n);                \
+                                                                                            \
+                            if (conf == NULL)                                               \
+                                return  NGX_CONF_ERROR;                                     \
+                        }                                                                   \
+                    } else {                                                                \
+                        conf = prev;                                                        \
+                    }                                                                       \
+                }
+
+#define     ndk_conf_merge_http_complex_value_value(conf,prev,default)                      \
+                                                                                            \
+                if (!conf.str.len) {                                                        \
+                    if (prev.str.len) {                                                     \
+                        conf = prev;                                                        \
+                    } else {                                                                \
+                        conf.str.data = (u_char *) default;                                 \
+                        conf.str.len = sizeof (default) - 1;                                \
+                                                                                            \
+                        if (ndk_http_complex_value_compile (cf, &conf))                     \
+                            return  NGX_CONF_ERROR;                                         \
+                    }                                                                       \
+                }
+
+#define     ndk_conf_merge_http_complex_value_array_value(conf,prev,val1,...)               \
+                                                                                            \
+                if (conf == NGX_CONF_UNSET_PTR) {                                           \
+                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
+                        if (val1 == NULL)                                                   \
+                            conf = NULL;                                                    \
+                        else {                                                              \
+                            char * elts[] = {val1,##__VA_ARGS__};                           \
+                            int    n = sizeof(elts)/sizeof(char*);                          \
+                                                                                            \
+                            conf = ndk_http_complex_value_array_create (cf, elts, n);       \
+                                                                                            \
+                            if (conf == NULL)                                               \
+                                return  NGX_CONF_ERROR;                                     \
+                        }                                                                   \
+                    } else {                                                                \
+                        conf = prev;                                                        \
+                    }                                                                       \
+                }
+
+#define     ndk_conf_merge_http_complex_path_value(conf,prev,...)                           \
+                ndk_conf_merge_http_complex_value_array_value (conf.a, prev.a, __VA_ARGS__)
+
+#define     ndk_conf_merge_split_path_value(conf,prev,path)                                 \
+                                                                                            \
+                if (conf == NGX_CONF_UNSET_PTR)  {                                          \
+                    conf = (prev == NGX_CONF_UNSET_PTR ?                                    \
+                        ndk_split_path_create_raw (cf, path) : prev);                       \
+                }
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/palloc.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/palloc.h
new file mode 100644
index 0000000..798e360
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/src/palloc.h
@@ -0,0 +1,6 @@
+
+#define     %2%_pallocp(p,pl)                   p = %1%_palloc (pl,sizeof(*p))
+#define     %2%_pallocpn(p,pl,n)                p = %1%_palloc (pl,sizeof(*p)*(n))
+
+#define     %2%_pcallocp(p,pl)                  p = %1%_pcalloc (pl,sizeof(*p))
+#define     %2%_pcallocpn(p,pl,n)               p = %1%_pcalloc (pl,sizeof(*p)*(n))
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/text/autogen b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/text/autogen
new file mode 100644
index 0000000..6a244c2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/auto/text/autogen
@@ -0,0 +1,12 @@
+
+/* 
+ * 2010 (C) Marcus Clyne 
+ *
+ * DO NOT EDIT THIS FILE MANUALLY
+ * ------------------------------
+ * This file has been generated automatically from scripts in the $base/auto dir and
+ * data in the $base/auto/data dir. If you wish to edit the output of this file, then
+ * you should edit these files instead.
+ *
+*/
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/config b/modules_deb/libnginx-mod-http-ndk-0.3.4/config
new file mode 100644
index 0000000..8cb7ad0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/config
@@ -0,0 +1,65 @@
+
+###############
+## FUNCTIONS ##
+###############
+
+# TODO : provide information about checking versions of sed etc
+# TODO : an optional patch function
+
+ndk_generate_files() {
+    echo "building Nginx Development Kit utility functions and macros ..."
+
+    autobuild="$ngx_addon_dir/auto/build"
+    chmod +x $autobuild
+    $autobuild `pwd` $NGX_OBJS/addon/ndk || exit 1
+}
+
+ndk_get_nginx_version() {
+    # We get the Nginx version number from the string form rather than
+    # nginx_version because it is available in more (every?) version
+
+    cat src/core/nginx.h                                |
+    grep  '#define NGINX_VERSION'                       |
+    sed -r                                              \
+        -e 's/[^0-9.]*([0-9.]+).*/\1/'                  \
+        -e 's/([0-9]+\.[0-9]+\.)([0-9]{1})$/\100\2/'    \
+        -e 's/([0-9]+\.[0-9]+\.)([0-9]{2})$/\10\2/'     \
+        -e 's/\.//g'                                    \
+        -e 's/^0+(.*)/\1/'
+}
+
+#####################
+## CONFIG SETTINGS ##
+#####################
+
+ngx_addon_name=ngx_devel_kit
+ngx_objs_dirs="$ngx_addon_dir/objs $NGX_OBJS/addon/ndk"
+
+NDK_SRCS="$ngx_addon_dir/src/ndk.c"
+NDK_DEPS="$ngx_addon_dir/src/ndk.h"
+NDK_INCS="$ngx_addon_dir/src $ngx_objs_dirs"
+
+CORE_INCS="$CORE_INCS $ngx_objs_dirs"
+HTTP_INCS="$HTTP_INCS $ngx_addon_dir/src $ngx_objs_dir"
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP
+    ngx_module_name="ndk_http_module"
+    ngx_module_srcs="$NDK_SRCS"
+    ngx_module_deps="$NDK_DEPS"
+    ngx_module_incs="$NDK_INCS"
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES ndk_http_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $NDK_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_SRCS $NDK_DEPS"
+fi
+
+have=NDK . auto/have
+
+##############
+## INCLUDES ##
+##############
+
+. $ngx_addon_dir/ngx_auto_lib_core
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/changelog b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/changelog
new file mode 100644
index 0000000..93ab9b1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/changelog
@@ -0,0 +1,58 @@
+libnginx-mod-http-ndk (1:0.3.4-2) unstable; urgency=medium
+
+  * d/control: bump Standards-Version: 4.7.2, no changes
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 11 Apr 2025 14:27:01 +0200
+
+libnginx-mod-http-ndk (1:0.3.4-1) unstable; urgency=medium
+
+  * New upstream version 0.3.4
+  * d/{control,copyright}: update my email to "janmojzis@debian.org"
+  * d/copyright: bump debian/* copyright year
+  * d/watch: use more generic template
+  * d/control: bump Standards-Version: 4.7.0, no changes
+  * d/gbp.conf: add [pull] track-missing = True
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 21 Mar 2025 08:50:27 +0100
+
+libnginx-mod-http-ndk (1:0.3.3-1) unstable; urgency=medium
+
+  * New upstream version 0.3.3
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 18 Dec 2023 16:23:15 +0100
+
+libnginx-mod-http-ndk (1:0.3.2-5) unstable; urgency=medium
+
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 15:31:27 +0200
+
+libnginx-mod-http-ndk (1:0.3.2-4) unstable; urgency=medium
+
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:16:39 +0200
+
+libnginx-mod-http-ndk (1:0.3.2-3) unstable; urgency=medium
+
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/gbb.conf: switched to debian branch main (debian-branch = main)
+  * d/copyright: bump my copyright year
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:32 +0100
+
+libnginx-mod-http-ndk (1:0.3.2-2) unstable; urgency=medium
+
+  * d/rules: enabled NDK upstream list module NDK_UPSTREAM_LIST
+  * d/control: added Multi-Arch: foreign
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 06 Dec 2022 17:28:22 +0100
+
+libnginx-mod-http-ndk (1:0.3.2-1) experimental; urgency=medium
+
+  * Initial release. (Closes: 1024150)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 14:46:55 +0100
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/control b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/control
new file mode 100644
index 0000000..b5eec8e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/control
@@ -0,0 +1,47 @@
+Source: libnginx-mod-http-ndk
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jan Mojžíš <janmojzis@debian.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+Standards-Version: 4.7.2
+Homepage: https://github.com/simpl/ngx_devel_kit
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-ndk.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-ndk
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-ndk
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: Nginx Development Kit module
+ The NDK is an Nginx module that is designed to extend the core functionality of
+ the excellent Nginx webserver in a way that can be used as a basis of other
+ Nginx modules.
+ .
+ It has functions and macros to deal with generic tasks that don't currently
+ have generic code as part of the core distribution. The NDK itself adds few
+ features that are seen from a user's point of view - it's just designed to help
+ reduce the code that Nginx module developers need to write.
+
+Package: libnginx-mod-http-ndk-dev
+Architecture: all
+Multi-Arch: foreign
+Depends: libnginx-mod-http-ndk (<< ${source:Version}.1~),
+         libnginx-mod-http-ndk (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Nginx Development Kit module - development files
+ The NDK is an Nginx module that is designed to extend the core functionality of
+ the excellent Nginx webserver in a way that can be used as a basis of other
+ Nginx modules.
+ .
+ This package provides development headers and necessary config scripts
+ for the Nginx development kit module, useful to develop and link third party
+ additions to the Debian nginx web/proxy server packages using Nginx
+ development kit module.
+ .
+ Development files.
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright
new file mode 100644
index 0000000..50da8f9
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright
@@ -0,0 +1,155 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ngx_devel_kit
+Upstream-Contact: Marcus Clyne <maccaday@gmail.com>
+Source: https://github.com/simpl/ngx_devel_kit
+
+Files: *
+Copyright: 2010-2018, Marcus Clyne
+License: BSD-3-clause
+
+Files: auto/text/*
+Copyright: Marcus Clyne
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2022, Miao Wang <shankerwangmiao@gmail.com>
+ 2022 - 2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-3-clause
+
+Files: docs/patches/*
+Copyright: Brian Moran - bmoran@onehub.com
+License: BSD-3-clause
+
+Files: examples/*
+Copyright: Marcus Clyne
+License: BSD-3-clause
+
+Files: examples/http/*
+Copyright: 2010-2018, Marcus Clyne
+License: BSD-3-clause
+
+Files: examples/http/set_var/ngx_http_set_var_examples_module.c
+Copyright: Marcus Clyne
+License: BSD-3-clause
+
+Files: notes/*
+Copyright: 2010, Marcus Clyne, Simpl (simpl.it)
+License: BSD-3-clause
+
+Files: notes/CHANGES
+Copyright: 2010-2018, Marcus Clyne
+License: BSD-3-clause
+
+Files: objs/*
+Copyright: Marcus Clyne
+License: BSD-3-clause
+
+Files: objs/ndk_includes.h
+Copyright: 2010-2018, Marcus Clyne
+License: BSD-3-clause
+
+Files: patches/expose_rewrite_functions
+Copyright: Marcus Clyne
+License: BSD-3-clause
+
+Files: src/hash/*
+Copyright: 1995-1998, Eric Young (eay@cryptsoft.com)
+License: SSLeay
+
+Files: src/hash/murmurhash2.c
+Copyright: Austin Appleby
+License: BSD-3-clause
+
+Files: src/ndk.c
+  src/ndk.h
+  src/ndk_set_var.h
+Copyright: Marcus Clyne
+License: BSD-3-clause
+
+License: BSD-3-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: SSLeay
+ This software is Copyright (c) 2022 by X. Ample.
+ .
+ This is free software, licensed under:
+ .
+   Original SSLeay License
+ .
+   Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+ .
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+ .
+   This library is free for commercial and non-commercial use as long as
+   the following conditions are aheared to.  The following conditions
+   apply to all code found in this distribution, be it the RC4, RSA,
+   lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+   included with this distribution is covered by the same copyright terms
+   except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ .
+   Copyright remains Eric Young’s, and as such any Copyright notices in the code
+   are not to be removed. If this package is used in a product, Eric Young
+   should be given attribution as the author of the parts of the library used.
+   This can be in the form of a textual message at program startup or in
+   documentation (online or textual) provided with the package.
+ .
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+ .
+     1. Redistributions of source code must retain the copyright
+        notice, this list of conditions and the following disclaimer.
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+     3. All advertising materials mentioning features or use of this software
+        must display the following acknowledgement:
+        “This product includes cryptographic software written by
+         Eric Young (eay@cryptsoft.com)”
+        The word ‘cryptographic’ can be left out if the rouines from the library
+        being used are not cryptographic related :-).
+     4. If you include any Windows specific code (or a derivative thereof) from
+        the apps directory (application code) you must include an
+        acknowledgement: “This product includes software written by Tim Hudson
+        (tjh@cryptsoft.com)”
+ .
+   THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ‘‘AS IS’’ AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+ .
+   The licence and distribution terms for any publically available version or
+   derivative of this code cannot be changed.  i.e. this code cannot simply be
+   copied and put under another distribution licence
+   [including the GNU Public Licence.]
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright-scan-patterns.yml b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright-scan-patterns.yml
new file mode 100644
index 0000000..044c11d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/copyright-scan-patterns.yml
@@ -0,0 +1,4 @@
+---
+ignore:
+  pattern:
+  - README_AUTO_LIB\.md
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/fix.scanned.copyright b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/fix.scanned.copyright
new file mode 100644
index 0000000..b5e57b8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/fix.scanned.copyright
@@ -0,0 +1 @@
+! copyright Files:"docs/patches/*" Copyright=~s/\s\(.*//
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/gbp.conf b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/gbp.conf
new file mode 100644
index 0000000..97cd209
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/gbp.conf
@@ -0,0 +1,12 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
+
+[pull]
+track-missing = True
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk-dev.install b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk-dev.install
new file mode 100644
index 0000000..d9988f1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk-dev.install
@@ -0,0 +1,5 @@
+debian/build-src/auto usr/share/nginx-ndk/src/
+debian/build-src/config usr/share/nginx-ndk/src/
+debian/build-src/ngx_auto_lib_core usr/share/nginx-ndk/src/
+debian/build-src/objs usr/share/nginx-ndk/src/
+debian/build-src/src usr/share/nginx-ndk/src/
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.install b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.install
new file mode 100644
index 0000000..c7a20b4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.install
@@ -0,0 +1 @@
+/usr/lib/nginx/modules/ndk_http_module.so
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.nginx b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.nginx
new file mode 100644
index 0000000..ec2f484
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/libnginx-mod-http-ndk.nginx
@@ -0,0 +1 @@
+mod debian/mod-http-ndk.conf 10
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/mod-http-ndk.conf b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/mod-http-ndk.conf
new file mode 100644
index 0000000..3908af6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/mod-http-ndk.conf
@@ -0,0 +1 @@
+load_module modules/ndk_http_module.so;
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/rules b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/rules
new file mode 100755
index 0000000..42e9c85
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/rules
@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+BUILDDIR_SRC = $(CURDIR)/debian/build-src
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure --buildsystem=nginx_mod
+	for have in NDK_SET_VAR NDK_UPSTREAM_LIST; do \
+	  ( \
+	    echo "#ifndef $$have"; \
+	    echo "#define $$have 1"; \
+	    echo "#endif"; \
+	    echo; \
+	  ) >> $(objdir)/ngx_auto_config.h; \
+	done
+
+override_dh_auto_build: build.src
+	dh_auto_build --buildsystem=nginx_mod
+
+build.src:
+	mkdir -p $(BUILDDIR_SRC)
+	cp -Pa $(CURDIR)/auto config ngx_auto_lib_core $(BUILDDIR_SRC)/
+	for i in src objs; do \
+	  find $(CURDIR)/$$i -type f -name '*.h' -printf "$$i/%P\0" | tar -C $(CURDIR) --null --files-from - -c | tar -C $(BUILDDIR_SRC)/ -x; \
+	done
+
+override_dh_clean:
+	rm -rf $(BUILDDIR_SRC)
+	dh_clean
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/source/format b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/control b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/control
new file mode 100644
index 0000000..ca20b9f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/control
@@ -0,0 +1,6 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/generic b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/upstream/metadata b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/upstream/metadata
new file mode 100644
index 0000000..51ef420
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/simpl/ngx_devel_kit/issues
+Bug-Submit: https://github.com/simpl/ngx_devel_kit/issues/new
+Repository-Browse: https://github.com/simpl/ngx_devel_kit
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/watch b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/watch
new file mode 100644
index 0000000..e0b5b75
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/debian/watch
@@ -0,0 +1,6 @@
+version=4
+opts="\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/simpl/ngx_devel_kit/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/core/action_macros b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/core/action_macros
new file mode 100644
index 0000000..802eb1f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/core/action_macros
@@ -0,0 +1,63 @@
+
+    GENERAL NOTES
+    -------------
+
+    These functions and macros have been provided as a tool for Nginx module developers.  They have
+    been created with four main purposes:
+
+        - to speed up code-writing
+        - to reduce the code you have to read on file
+        - to add additional generic functionality similar to exising Nginx functions 
+        - to reduce code errors
+
+    Most of the utility macros are just wrappers around commonly used code, especially checking for
+    NULL and returning a value, zeroing data etc.  The functions add things like extra conf_set_X_slot
+    functions that don't exist in the standard Nginx distribution, but which might be useful in more
+    than one module.
+
+    A consistent approach has been taken to creating the macros, so that in theory you should be able
+    to 'know' the macro name from using the few rules below and your knowledge of the existing Nginx
+    functions.  As much as possible, the ordering of variables used within the underlying functions
+    remain the same, to reduce the learning time.  Also, a constent naming pattern has been used to
+    make it easier to read the macros above.
+
+    Obviously not all programmers will want to use all or any of these macros, but they are provided
+    as a tool for those who wish to use them.
+
+    If you have any comments about them, including any additions or errors please let me know at 
+    'eugaia at gmail dot com'.  I don't promise to include all additions people send, but if they seem
+    like they could be of use to multiple developers, I will.
+
+
+    UTILITY MACRO PARAMS
+    --------------------
+    p       pointer                 - used to set the result of a function to a pointer
+    a       array
+    pl      pool
+    n       multiplication factor   - for allocating multiple pointers & pushing 'n' elts in arrays etc
+    sz      size
+    l       log
+    rv      return value
+
+
+
+    UTILITY MACRO FUNCTION SUFFIXES
+    -------------------------------
+
+ - general
+
+    p       p = [FUNCTION] ()
+    _r      [ if result of function is NULL | NGX_ERROR (as appropriate) ] return rv
+    _rce    rv = NGX_CONF_ERROR
+    _re     rv = NGX_ERROR
+    _rn     rv = NULL
+
+ - (p)(c)alloc functions
+
+    p       p = [function] (pool, sizeof (*p))
+    pn      p = [function] (pool, sizeof (*p) * n)
+
+
+    UTILITY MACRO PARAMS ORDER
+    --------------------------
+    p, pl|a, sz|n, l, rv 
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/core/conf_cmds b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/core/conf_cmds
new file mode 100644
index 0000000..70978b1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/core/conf_cmds
@@ -0,0 +1,62 @@
+
+Conf command macros
+-------------------
+
+The build script generates a large number of macros for reducing the code required for command
+definitions.
+
+There are basically three types of macros :
+
+- combination bitmasks
+
+    e.g. NDK_HTTP_MAIN_SRV_CONF  =  (NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF)
+
+- base command structures
+
+    e.g. NDK_HTTP_MAIN_CONF_TAKE1
+
+- conf-set command structures
+
+    e.g. NDK_HTTP_CONF_STR
+
+
+Combination bitmasks
+--------------------
+
+Basically combinations of existing bitmasks for locations, with general > specific order
+
+NDK_HTTP_CONF = (NGX_HTTP_MAIN_CONF | NGX_HTTP_SVR_CONF | NGX_HTTP_SIF_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF)
+
+
+Base command structures
+-----------------------
+
+These macros are basically there as wrappers for the conf-set command structures, and but incorporate 
+the bitmask element into the name of the macro.
+
+
+Conf-set command structures
+---------------------------
+
+These macros simplify creating commands that use any of the build-in conf-set functions or any of those
+added by the NDK.
+
+e.g.  NGX_HTTP_MAIN_SRV_STR ("name", prop, NULL)
+
+where prop is the name of the property that is a ngx_str_t.  Whether this is in the loc conf, main conf
+or svr conf is generated automatically in by the macro.
+
+NOTE : you need to set the following if they will be used (using macro definitions) :
+
+ndk_module_main_conf_t
+ndk_module_srv_conf_t
+ndk_module_loc_conf_t
+
+e.g
+
+#define     ndk_module_loc_conf_t       ngx_http_my_module_loc_conf_t
+
+
+TODO
+----
+Much better documentation for this
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/modules/set_var b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/modules/set_var
new file mode 100644
index 0000000..6be5c0f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/modules/set_var
@@ -0,0 +1,124 @@
+
+set var tools
+=============
+
+OVERVIEW
+--------
+This collection of tools is designed to make it easier to set Nginx variables
+using a common interface.  It works by plugging into and extending the features
+of the internal rewrite module, and operations performed by this module are
+therefore done at the rewrite phase of handling.
+
+
+ADVANTAGES OF USING THIS MODULE
+-------------------------------
+
+- simple interface - you don't have to worry about lots of http script compiling
+- it plugs into the rewrite module, so setting (and getting) vars will happen
+  in the order you expect based on how they appear in the configuration file
+- you do not have to worry about overriding the v->get_handler (useful if
+  a variable of a specific name could be set in multiple different ways)
+
+
+WHEN TO USE THIS AND WHEN TO USE v->get_handler = my_func
+---------------------------------------------------------
+
+- if you want a variable to always be generated using a specific function,
+    and should not be over-ridden by 'set' functions (e.g. $request_uri, 
+    $document_root), then you should use v->get_handler
+
+- if you want to allow a variable to be set using many possible methods,
+    including using the 'set' directive, then this module provides an easy way
+    for you to do so (if you use the v->get_handler method in this case, you may
+    run into problems because the get_handler may over-ride previous uses of the
+    set directive)
+
+
+USAGE
+-----
+
+- decide on the type of function you'll need to write
+
+    type                                use when there are these requirements
+    ----                                -------------------------------------
+    NDK_SET_VAR_BASIC                   0 variable values, no extra data
+    NDK_SET_VAR_DATA                    0 variable values, extra data
+    NDK_SET_VAR_VALUE                   1 variable value, no extra data
+    NDK_SET_VAR_VALUE_DATA              1 variable value, extra data
+    NDK_SET_VAR_MULTI_VALUE             2+ variable values, no extra data
+    NDK_SET_VAR_MULTI_VALUE_DATA        2+ variable values, extra data
+    NDK_SET_VAR_HASH                    the space needed for the result string 
+                                        value is known in advance (usually 
+                                        used in a hash function)
+
+    NOTE : if none of these generic calling types suit your needs, it is
+    easy to extend the list of types in the .c file (and you if you let me know
+    I'll add them to the list
+
+
+- define the filter function with the respective prototype
+
+    type                                prototype
+    ----                                ---------
+    NDK_SET_VAR_BASIC                   ndk_set_var_pt
+    NDK_SET_VAR_DATA                    ndk_set_var_data_pt
+    NDK_SET_VAR_VALUE                   ndk_set_var_value_pt
+    NDK_SET_VAR_DATA_VALUE              ndk_set_var_value_data_pt
+    NDK_SET_VAR_MULTI_VALUE             ndk_set_var_value_pt
+    NDK_SET_VAR_MULTI_VALUE_DATA        ndk_set_var_value_data_pt
+    NDK_SET_VAR_HASH                    ndk_set_var_hash_pt
+
+    (See ngx_tools_module.h for the prototype definitions.)
+
+    Note : For the multi_value functions, the variable value pointer is to the
+    first value (with the others being in an array following it)
+
+
+to use one of the default setup functions
+-----------------------------------------
+
+- define one or multiple ngx_http_var_filter_t's at the global scope, setting :
+
+    type = (one of types above)
+    func = function to call
+    size = (for multi value)        the number of variable values
+           (for hash)               length of buffer to allocate
+    data = (for data functions)     additional data (see note below)
+
+- define a configuration directive (see in the .c file for examples), where the
+    function is 'ngx_http_set_var' and the 'post' is a pointer your filter definition
+
+
+to setup in a customized way
+----------------------------
+
+- define a configuration directive which has your own specific configuration function
+
+- inside your config function, define one or several ngx_http_var_filter_t's like
+    above, and call one of the ngx_http_set_var_..._core functions, passing the 
+    variable name and value pointers as appropriate - see examples section
+
+Note : if you're passing extra data to the function, then you will probably want
+to use this second method and store the data either in the loc conf, or just
+allocate the space for it using one of the ngx_palloc functions.
+
+If the values that will be used for processing are in the same order as in the
+config file and there aren't any additional values that are input, then you can
+just use the (ngx_str_t *) (cf->args->elts) + 1 as your base for the values or 
+possibly not use the _core versions of the functions.
+
+
+That's it!
+
+
+FEEDBACK
+--------
+
+If you have any comments (good/bad), or have found any bugs, please let me know at:
+ngx.eugaia AT gmail DOT com
+
+
+TODO
+----
+- add more documentation/examples
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/patches/more_logging_info b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/patches/more_logging_info
new file mode 100644
index 0000000..3685916
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/patches/more_logging_info
@@ -0,0 +1,48 @@
+When tracking down some potential issues in the nginx constellation,
+we've found it useful to understand where particular error messages
+are coming from, since many of the same messages are repeated in
+various places. This patch will write the source file from which the
+message originated, the function name, and the line number if you're
+using GCC to compile nginx. Here's an example:
+
+Old Output:
+2010/01/12 14:43:10 [notice] 67772#0: nginx/0.7.64
+2010/01/12 14:43:10 [notice] 67772#0: built by gcc 4.0.1 (Apple Inc. build 5490)
+2010/01/12 14:43:10 [notice] 67772#0: OS: Darwin 9.8.0
+2010/01/12 14:43:10 [notice] 67772#0: hw.ncpu: 2
+2010/01/12 14:43:10 [notice] 67772#0: net.inet.tcp.sendspace: 65536
+2010/01/12 14:43:10 [notice] 67772#0: kern.ipc.somaxconn: 128
+2010/01/12 14:43:10 [notice] 67772#0: getrlimit(RLIMIT_NOFILE):
+256:9223372036854775807
+2010/01/12 14:43:10 [notice] 67772#0: start worker processes
+2010/01/12 14:43:10 [notice] 67772#0: start worker process 67785
+2010/01/12 14:43:16 [notice] 67772#0: signal 20 (SIGCHLD) received
+
+New Output:
+2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_posix_init.c
+ngx_os_status(   80) nginx/0.7.64
+2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_posix_init.c
+ngx_os_status(   83) built by gcc 4.0.1 (Apple Inc. build 5490)
+2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_darwin_init.c
+ngx_os_specific_status(  153) OS: Darwin 9.8.0
+2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_darwin_init.c
+ngx_os_specific_status(  166) hw.ncpu: 2
+2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_darwin_init.c
+ngx_os_specific_status(  166) net.inet.tcp.sendspace: 65536
+2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_darwin_init.c
+ngx_os_specific_status(  166) kern.ipc.somaxconn: 128
+2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_posix_init.c
+ngx_os_status(   92) getrlimit(RLIMIT_NOFILE):
+2560:9223372036854775807
+2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_process_cycle.c
+ngx_start_worker_processes(  337) start worker processes
+2010/01/14 16:35:09 [notice] 27241#0: src/os/unix/ngx_process.c
+ngx_spawn_process(  201) start worker process 27254
+2010/01/14 16:35:14 [notice] 27241#0: src/os/unix/ngx_process.c
+ngx_signal_handler(  420) signal 20 (SIGCHLD) received
+
+Formatting the filename and function name fields into fixed-width
+fields would be nicer, however that would require further changes in
+src/core/ngx_string.c
+
+(C) Brian Moran - bmoran@onehub.com  (posted to nginx-devel mailing list on 15/01/10)
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/upstream/list b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/upstream/list
new file mode 100644
index 0000000..3ad485d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/docs/upstream/list
@@ -0,0 +1,45 @@
+
+NDK_UPSTREAM_LIST
+-----------------
+
+This submodule provides a directive that creates a list of upstreams, with
+optional weighting. This list can then be used by other modules to hash over
+the upstreams however they choose.
+
+
+USAGE IN CONF FILE
+------------------
+
+e.g. upstream_list   name    backend1  4:backend2    3:backend3;
+
+
+
+USAGE WITH OTHER MODULES
+------------------------
+
+Add a line like
+
+CFLAGS="$CFLAGS -DNDK_UPSTREAM_LIST"
+
+to the config file of your module.
+
+
+
+INTEGRATING WITH YOUR MODULE
+----------------------------
+
+The upstream lists are stored in the array given in the lists.h file, which is
+an array of ndk_upstream_list_t elts.  The elts are currently all pointers to 
+strings which have been distributed according to the weight - so if there are
+two backends, with weight 3 and 4 respectively, there will be 7 pointers in
+total with the first 3 pointing to the first backend and the last 4 to the 
+second.
+
+
+
+TODO
+----
+-   replace strings with pointers to upstreams if they are available (and if 
+    this is possible)
+-   add additional 'http://' to strings if necessary
+-   improve this documentation
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/README b/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/README
new file mode 100644
index 0000000..22e2417
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/README
@@ -0,0 +1,12 @@
+
+2010 (C) Marcus Clyne
+
+
+Examples
+--------
+
+In this section there are a number of examples of the various features of the tools
+module.  These have been given in the form of dummy modules, to make it easier to
+use as templates for your own module should you choose to do so.
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/http/set_var/config b/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/http/set_var/config
new file mode 100644
index 0000000..aa58f77
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/http/set_var/config
@@ -0,0 +1,4 @@
+ngx_addon_name=ngx_http_set_var_examples_module
+HTTP_MODULES="$HTTP_MODULES ngx_http_set_var_examples_module"
+NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_set_var_examples_module.c"
+have=NDK_SET_VAR . auto/have
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/http/set_var/ngx_http_set_var_examples_module.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/http/set_var/ngx_http_set_var_examples_module.c
new file mode 100644
index 0000000..7a4daae
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/examples/http/set_var/ngx_http_set_var_examples_module.c
@@ -0,0 +1,136 @@
+
+/*
+ * 2010 (C) Marcus Clyne
+ */
+ 
+
+#include    <ndk.h>
+
+
+static ngx_int_t    ngx_http_set_var_concat2    (ngx_http_request_t *r, ngx_str_t *val, ngx_http_variable_value_t *v);
+static char *       ngx_http_set_prepend_hello   (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
+
+static  ndk_set_var_t      ngx_http_var_set_concat2 = {
+    NDK_SET_VAR_MULTI_VALUE,
+    ngx_http_set_var_concat2,
+    2,
+    NULL
+};
+
+
+static ngx_command_t  ngx_http_set_var_examples_commands[] = {
+    {
+        ngx_string ("set_concat2"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE3,
+        ndk_set_var_multi_value,
+        0,
+        0,
+        &ngx_http_var_set_concat2
+    },
+    {
+        ngx_string ("set_prepend_hello"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+        ngx_http_set_prepend_hello,
+        0,
+        0,
+        NULL
+    },
+    ngx_null_command
+};
+
+
+ngx_http_module_t     ngx_http_set_var_examples_module_ctx = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+ngx_module_t          ngx_http_set_var_examples_module = {
+
+    NGX_MODULE_V1,
+    &ngx_http_set_var_examples_module_ctx,  // module context
+    ngx_http_set_var_examples_commands,     // module directives
+    NGX_HTTP_MODULE,                        // module type
+    NULL,                                   // init master
+    NULL,                                   // init module
+    NULL,                                   // init process
+    NULL,                                   // init thread
+    NULL,                                   // exit thread
+    NULL,                                   // exit process
+    NULL,                                   // exit master
+    NGX_MODULE_V1_PADDING
+};
+
+
+/*
+    This function is called by both examples, takes two variable values and concatenates them
+    to give a third string.
+*/
+
+static ngx_int_t
+ngx_http_set_var_concat2 (ngx_http_request_t *r, ngx_str_t *val, ngx_http_variable_value_t *v)
+{
+    size_t                      len;
+    ngx_http_variable_value_t   *v2;
+    u_char                      *p;
+
+    v2 = v + 1;
+
+    len = v->len + v2->len;
+
+	/*
+	 * NDK provided abbreviation for the following code:
+	 *
+	 * p = ngx_palloc (r->pool, len);
+	 * if (p == NULL)
+	 * 		return  NGX_ERROR;
+	 *
+	 * */
+	ndk_palloc_re(p, r->pool, len);
+
+    val->data = p;
+    val->len = len;
+
+    ngx_memzero (p, len);
+
+    p = ngx_cpymem (p, v->data, v->len);
+    ngx_memcpy (p, v2->data, v2->len);
+
+    return  NGX_OK;
+}
+
+
+
+/*  
+    This function demonstrates using the 'core' function in a function that appends the word
+    'hello_' to the beginning of a variable.
+
+    set                 $var      world;
+    set_prepend_hello    $var      $var;
+
+    If the arguments used in the variable value filter do not all come directly from the conf
+    file, or are not given in the order
+
+    direcive    $var_name   val1 "val2 string $var" ...
+
+    then the _core functions should be used inside the function that is called when the directive
+    is read.
+*/
+
+static char *
+ngx_http_set_prepend_hello (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t               s[2], *var_name;
+    ndk_set_var_t      filter;
+
+    var_name = cf->args->elts;
+    var_name++;
+
+    s[0].data = (u_char*) "hello_";
+    s[0].len = 6;
+
+    s[1] = *(var_name + 1);
+
+    filter.type = NDK_SET_VAR_MULTI_VALUE;
+    filter.func = ngx_http_set_var_concat2;
+    filter.size = 2;
+
+    return  ndk_set_var_multi_value_core (cf, var_name, (ngx_str_t *) s, &filter);
+}
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/ngx_auto_lib_core b/modules_deb/libnginx-mod-http-ndk-0.3.4/ngx_auto_lib_core
new file mode 100644
index 0000000..d5441fb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/ngx_auto_lib_core
@@ -0,0 +1,797 @@
+
+## Directories to search for usable builds:
+##
+## - [$PFX]_INC and [$PFX]_LIB
+## - the dir specified by --with-[$pfx]=*
+## - each dir named [$pfx]-* under [$PFX]_BASE (descending order)
+## - each dir named [$pfx]-* under $ngx_src_dir/.. (descending order)
+## - system_paths (see below)
+##
+## Note : specifying [$PFX]_INC or [$PFX]_LIB prevents other dirs being tried
+##        specifying --with-[$pfx]= prevents autodiscovery of dirs
+##
+## Note : if this file is not in the same directory as the config file, the value
+##        for ngx_auto_lib_file should be changed to a relative path from that file
+## e.g. : $ngx_addon_dir/libs/ngx_auto_lib
+##
+## TODO : explain hooks
+
+#############
+## VERSION ##
+#############
+
+ngx_auto_lib_version=1001
+
+if [ ! $ngx_auto_lib_file_version ] || [ $ngx_auto_lib_file_version -lt $ngx_auto_lib_version ]; then
+
+    if [ ! $ngx_addon_dir ]; then
+        ngx_addon_dir=`cd $(dirname $0); pwd`
+    fi
+
+    ngx_auto_lib_file="$ngx_addon_dir/ngx_auto_lib_core"
+    ngx_auto_lib_file_version="$ngx_auto_lib_version"
+fi
+
+###############
+## VARIABLES ##
+###############
+
+v=
+v="$v       inc_path"
+v="$v       incs"
+v="$v       libs"
+v="$v       name"
+v="$v       path"
+v="$v       run"
+v="$v       test"
+ev=
+ev="$ev     add_libs"
+ev="$ev     add_path"
+ev="$ev     build_dirs"
+ev="$ev     build_inc_dirs"
+ev="$ev     build_lib_dirs"
+ev="$ev     check_macros_defined"
+ev="$ev     check_macros_non_zero"
+ev="$ev     defines"
+ev="$ev     deps"
+ev="$ev     exit_if_not_found"
+ev="$ev     haves"
+ev="$ev     inc_names"
+ev="$ev     lib_files"
+ev="$ev     lib_names"
+ev="$ev     libs_to_add"
+ev="$ev     modules"
+ev="$ev     srcs"
+ev="$ev     shared"
+ev="$ev     test_libs"
+ev="$ev     variables"
+
+ngx_feature_vars="$v"
+ngx_feature_extra_vars="$ev"
+ngx_feature_all_vars="$v $ev"
+
+NGX_AUTO_LIB_DEFAULT_SYSTEM_DIRS='/usr/local /usr /opt/local /opt /usr/pkg'
+
+####################
+## UTIL FUNCTIONS ##
+####################
+
+to_upper() {
+    echo "$@" | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+}
+
+to_lower() {
+    echo "$@" | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
+}
+
+####################
+## INIT FUNCTIONS ##
+####################
+
+ngx_auto_lib_init() {
+
+    . $ngx_auto_lib_file
+
+    ngx_auto_lib_init_latest  $@
+}
+
+ngx_auto_lib_init_latest() {
+
+    # set name and prefixes
+
+    if [ ! $1 ]; then
+        echo "ngx_auto_lib_init() requires that a name be passed"
+        exit 1
+    fi
+
+    ngx_auto_lib_name=$1
+    ngx_auto_lib_module_name=$2
+
+    if [ $2 ]; then
+        NGX_AUTO_LIB_PFX=`to_upper $2`
+    else
+        NGX_AUTO_LIB_PFX=`to_upper $1`
+    fi
+
+    ngx_auto_lib_pfx=`to_lower $NGX_AUTO_LIB_PFX`
+
+    ngx_auto_lib_clean_feature_vars
+}
+
+ngx_auto_lib_clean_feature_vars() {
+    for var in $ngx_feature_all_vars; do
+        eval ngx_feature_$var=
+    done
+}
+
+ngx_auto_lib_get_variables() {
+
+    local pfx=$ngx_auto_lib_pfx
+    local PFX=$NGX_AUTO_LIB_PFX
+
+    eval NGX_AUTO_LIB_INC=\"\$${PFX}_INC\"
+    eval NGX_AUTO_LIB_LIB=\"\$${PFX}_LIB\"
+    eval NGX_AUTO_LIB_DIR=\"\$${PFX}\"
+    eval NGX_AUTO_LIB_BASE=\"\$${PFX}_BASE\"
+    eval NGX_AUTO_LIB_SEARCH_LIB_INC=\"\$${PFX}_SEARCH_LIB_INC\"
+    eval NGX_AUTO_LIB_SEARCH_DIR=\"\$${PFX}_SEARCH_DIR\"
+    eval NGX_AUTO_LIB_SEARCH_BASE=\"\$${PFX}_SEARCH_BASE\"
+    eval NGX_AUTO_LIB_SEARCH_BASE_PREFIX=\"\$${PFX}_SEARCH_BASE_PREFIX\"
+    eval NGX_AUTO_LIB_SEARCH_PARENT=\"\$${PFX}_SEARCH_PARENT\"
+    eval NGX_AUTO_LIB_SEARCH_SYSTEM=\"\$${PFX}_SEARCH_SYSTEM\"
+    eval NGX_AUTO_LIB_SHARED=\"\$${PFX}_SHARED\"
+    eval NGX_AUTO_LIB_SYSTEM_DIRS=\"\$${PFX}_SYSTEM_DIR\"
+    eval USE_NGX_AUTO_LIB=\"\$USE_${LIB}\"
+
+    if [ ! "$NGX_AUTO_LIB_DIR" ]; then
+        NGX_AUTO_LIB_DIR=NONE
+    fi
+
+    if [ ! "$USE_NGX_AUTO_LIB" ]; then
+        if [ $ngx_feature_check_macros_defined -o $ngx_feature_check_macros_non_zero ]; then
+            USE_NGX_AUTO_LIB=MAYBE
+        elif [ "$ngx_feature_required" = no ]; then
+            USE_NGX_AUTO_LIB=MAYBE
+        else
+            USE_NGX_AUTO_LIB=YES
+        fi
+    fi
+
+    if [ ! "$NGX_AUTO_LIB_SYSTEM_DIRS" ]; then
+        NGX_AUTO_LIB_SYSTEM_DIRS=$NGX_AUTO_LIB_DEFAULT_SYSTEM_DIRS
+    fi
+
+    # TODO : add _STATIC, and do searches for both static and shared libs
+
+    if [ ! "$NGX_AUTO_LIB_SHARED" ]; then
+        if [ "$ngx_feature_shared" = no ]; then
+            NGX_AUTO_LIB_SHARED=NO
+        else
+            NGX_AUTO_LIB_SHARED=YES
+        fi
+    fi
+
+    NGX_AUTO_LIB_SEARCH_DEP=NO
+
+    # set default search methods
+    # Note : these can be over-ridden by setting NGX_AUTO_LIB_SEARCH_[type]=YES|NO
+
+    local auto=y
+
+    if [ "$NGX_AUTO_LIB_INC" ] || [ "$NGX_AUTO_LIB_LIB" ]; then
+        ngx_auto_lib_search  LIB_INC    YES
+        auto=n
+    fi
+
+    if [ "$NGX_AUTO_LIB_DIR" != NONE ]; then
+        ngx_auto_lib_search  DIR        YES
+        auto=n
+    fi
+
+    if [ "$NGX_AUTO_LIB_BASE" ]; then
+        ngx_auto_lib_search  BASE       YES
+        auto=n
+    fi
+
+    if [ $auto = y ]; then
+        ngx_auto_lib_search  PARENT     YES
+        ngx_auto_lib_search  SYSTEM     YES
+    fi
+
+    ngx_auto_lib_search  LIB_INC    NO
+    ngx_auto_lib_search  DIR        NO
+    ngx_auto_lib_search  BASE       NO
+    ngx_auto_lib_search  PARENT     NO
+    ngx_auto_lib_search  SYSTEM     NO
+
+    if [ ! "$ngx_feature_lib_names" ]; then
+        ngx_feature_lib_names=$pfx
+    fi
+
+    if [ ! "$ngx_feature_inc_names" ]; then
+        ngx_feature_inc_names=$ngx_feature_lib_names
+    fi
+
+    if [ ! "$ngx_feature_exit_if_not_found" ]; then
+        ngx_feature_exit_if_not_found=yes
+    fi
+}
+
+#######################
+## DEFAULT FUNCTIONS ##
+#######################
+
+ngx_auto_lib_set_default() {
+
+    local suffix=
+    if [ $1 ]; then
+        suffix="_$1"
+    fi
+
+    local def=$2
+    local var="NGX_AUTO_LIB$suffix"
+
+    val=
+    if [ ! `eval echo '$'$var` ]; then
+        eval $var=\"$def\"
+    fi
+
+    #eval echo "$var = \$$var"
+}
+
+ngx_auto_lib_search() {
+    ngx_auto_lib_set_default "SEARCH_$1" $2
+}
+
+####################
+## SAVE FUNCTIONS ##
+####################
+
+ngx_auto_lib_save_vars() {
+    OLD_CORE_DEPS=$CORE_DEPS
+    OLD_CORE_INCS=$CORE_INCS
+    OLD_CORE_LIBS=$CORE_LIBS
+    OLD_CORE_SRCS=$CORE_SRCS
+    OLD_LINK_DEPS=$LINK_DEPS
+
+    CORE_DEPS=
+    CORE_INCS=
+    CORE_LIBS=
+    CORE_SRCS=
+    LINK_DEPS=
+}
+
+ngx_auto_lib_reset_vars() {
+    CORE_DEPS=$OLD_CORE_DEPS
+    CORE_INCS=$OLD_CORE_INCS
+    CORE_LIBS=$OLD_CORE_LIBS
+    CORE_SRCS=$OLD_CORE_SRCS
+    LINK_DEPS=$OLD_LINK_DEPS
+}
+
+ngx_auto_lib_save_feature_vars() {
+    for var in $ngx_feature_all_vars; do
+        eval main_ngx_feature_$var=\"\$ngx_feature_$var\"
+    done
+}
+
+ngx_auto_lib_reset_feature_vars() {
+    for var in $ngx_feature_all_vars; do
+        eval ngx_feature_$var=\"\$main_ngx_feature_$var\"
+    done
+}
+
+########################
+## CHECKING FUNCTIONS ##
+########################
+
+ngx_auto_lib_check_auto_config() {
+
+    ngx_auto_lib_save_feature_vars
+    ngx_auto_lib_clean_feature_vars
+
+    ngx_feature=$1
+    ngx_feature_inc_path="`echo $CFLAGS | tr ' ' '\n' | grep -- -D | tr '\n' ' '`"
+    ngx_feature_incs="#include <$NGX_AUTO_CONFIG_H>"
+    ngx_feature_libs=
+    ngx_feature_path=`pwd`
+    ngx_feature_run=no
+    ngx_feature_test=$2
+
+    #ngx_auto_lib_print_feature_vars
+
+    . auto/feature
+
+    if [ $ngx_found = yes ]; then
+        rv=0
+    else
+        rv=1
+    fi
+
+    ngx_auto_lib_reset_feature_vars
+
+    return $rv
+}
+
+ngx_auto_lib_check_macro_defined() {
+
+    for m in $@; do
+        ngx_auto_lib_check_auto_config  "$m"  "
+    #ifndef $m
+        rubbish
+    #endif"  && return 0
+    done
+
+    return 1
+}
+
+ngx_auto_lib_check_macro_non_zero() {
+
+    for m in $@; do
+        ngx_auto_lib_check_auto_config  "$m" "
+    #if !($m)
+        rubbish
+    #endif"  && return 0
+    done
+
+    return 1
+}
+
+ngx_auto_lib_check_require() {
+
+    if [ $USE_NGX_AUTO_LIB = YES ]; then
+        return 0
+    elif [ $USE_NGX_AUTO_LIB = NO ]; then
+        return 1
+    fi
+
+
+    # check if the libraries are required elsewhere
+
+    for l in $ngx_feature_lib_names; do
+        [ ! "`echo $CORE_LIBS $ADDON_LIBS | grep -w -- -l$l`" ] && return 0
+    done
+
+
+
+    # check that any required macros are set
+
+    local d=$ngx_feature_check_macros_defined
+    local nz=$ngx_feature_check_macros_non_zero
+
+    if [ "$d" ] || [ "$nz" ]; then
+
+        ngx_auto_lib_check_macro_defined   $d  && return 0
+        ngx_auto_lib_check_macro_non_zero  $nz  && return 0
+    fi
+
+
+    ngx_auto_lib_check
+}
+
+ngx_auto_lib_check() {
+    return 1
+}
+
+##################################
+## TEST PHASE HANDLER FUNCTIONS ##
+##################################
+
+ngx_auto_lib_test() {
+    ngx_auto_lib_test_pre_setup "$@"
+    ngx_auto_lib_test_setup "$@"
+    ngx_auto_lib_test_post_setup "$@"
+    ngx_auto_lib_test_feature
+}
+
+ngx_auto_lib_test_pre_setup() {
+    return 0
+}
+
+ngx_auto_lib_test_setup() {
+
+    local INC=$1
+    local LIB=$2
+
+    ngx_auto_lib_inc_dir=$INC
+    ngx_auto_lib_lib_dir=$LIB
+
+    ngx_auto_lib_reset_feature_vars
+
+    if [ ! "$ngx_feature_path" ]; then
+        ngx_feature_path="$INC"
+    fi
+
+    ngx_feature_path="$ngx_feature_path $ngx_feature_add_path"
+
+    for sfx in $ngx_feature_path_suffixes; do
+        ngx_feature_path="$ngx_feature_path $INC/$sfx"
+    done
+
+
+    local inc=
+    local lib=
+    local incs="$ngx_feature_inc_names"
+    local libs="$ngx_feature_lib_names"
+    local lib_files="$ngx_feature_lib_files"
+
+    for inc in $incs; do
+        ngx_feature_incs="$ngx_feature_incs
+#include <$inc.h>"
+    done
+
+
+    if [ ! "$ngx_feature_libs" ]; then
+
+        if [ $NGX_AUTO_LIB_SHARED = YES ]; then
+            if [ $NGX_RPATH = YES ]; then
+                ngx_feature_libs="-R$LIB"
+            fi
+            ngx_feature_libs="$ngx_feature_libs -L$LIB"
+
+            for lib in $libs; do
+                ngx_feature_libs="$ngx_feature_libs -l$lib"
+            done
+
+            # TODO : only add --rpath when the path is not a standard system path - warn if /usr
+
+            ngx_feature_libs="$ngx_feature_libs -Wl,--rpath -Wl,$LIB"
+
+        else
+
+            for lib in $lib_files; do
+                ngx_feature_libs="$ngx_feature_libs $LIB/$lib"      
+            done
+
+            for lib in $libs; do
+                ngx_feature_libs="$ngx_feature_libs $LIB/lib$lib.a"
+            done
+        fi
+    fi
+
+    if [ ! $ngx_feature_run ]; then
+        ngx_feature_run=no
+    fi
+
+    if [ $NGX_AUTO_LIB_SHARED = YES ]; then
+
+        # Add a test to be called in auto/feature after compilation that will check 
+        # whether any libraries that are linked are in fact using the path provided to
+        # link libraries rather than a standard path. Note : this test will work on 
+        # all linked shared objects, even if supplied directly by setting 
+        # $ngx_feature_libs instead of usign $ngx_feature_lib_names
+
+        # TODO : allow for some libraries to not be checked here if desired - if part of system paths
+
+        libs="`echo $ngx_feature_libs | tr ' ' '\n' | grep -- -l | sed 's|-l||g'`"
+
+        local test="
+            for l in $libs; do
+                o="'\`ldd '$NGX_AUTOTEST' | grep '$LIB'/lib\$l\\.so\`;
+                if [ ! \"\$o\" ]; then
+                    chmod -x $NGX_AUTOTEST;
+                    echo Linker does not link to correct version
+                else
+                    chmod +x $NGX_AUTOTEST;
+                fi
+            done'
+        test="`echo "$test" | tr '\n' ' '`"
+
+        ngx_feature_test_libs="$ngx_feature_test_libs; $test"
+    fi
+
+    ngx_feature_libs="$ngx_feature_libs $ngx_feature_add_libs"
+    ngx_feature_libs_to_add="$ngx_feature_libs"
+    ngx_feature_libs="$ngx_feature_libs $ngx_feature_test_libs"
+    ngx_feature="$ngx_auto_lib_name library $ngx_feature"
+}
+
+ngx_auto_lib_test_post_setup() {
+    return 0
+}
+
+ngx_auto_lib_test_feature() {
+    #ngx_auto_lib_print_feature_vars
+    . auto/feature
+    [ $ngx_found = yes ] && return 0
+    return 1
+}
+
+########################
+## TEST DIR FUNCTIONS ##
+########################
+
+ngx_auto_lib_test_dir_pair() {
+    ngx_auto_lib_test_inc_dir=$1
+    ngx_auto_lib_test_lib_dir=$2
+
+    if [ $1 = $2 ]; then
+        ngx_feature="in $1$3"
+    else
+        ngx_feature="in $1 and $2$3"
+    fi
+    ngx_auto_lib_test "$1" "$2" "$3"
+}
+
+ngx_auto_lib_test_dir_pairs() {
+    ngx_auto_lib_test_dir_pair  "$1/include"  "$2/lib"  "$3"   && return 0
+    ngx_auto_lib_test_dir_pair  "$1"          "$2"      "$3"   && return 0
+    return 1
+}
+
+ngx_auto_lib_test_dirs() {
+
+    local msg="$1"
+    local bdir idir ldir
+
+    local bdirs=$ngx_feature_build_dirs
+    local idirs=$ngx_feature_build_inc_dirs
+    local ldirs=$ngx_feature_build_lib_dirs
+
+    shift
+
+    for dir in "$@"; do
+        ngx_auto_lib_test_dir=$dir
+
+        for ldir in $ldirs; do
+            for idir in $idirs; do
+                ngx_auto_lib_test_dir_pair   "$dir/$idir"  "$dir/$ldir"  "$msg"  && return 0
+            done
+        done
+
+        for ldir in $ldirs; do
+            ngx_auto_lib_test_dir_pair       "$dir"        "$dir/$ldir"  "$msg"  && return 0
+        done
+
+        for idir in $idirs; do
+            ngx_auto_lib_test_dir_pair       "$dir/$idir"  "$dir"        "$msg"  && return 0
+        done
+
+        for bdir in $bdirs; do
+            ngx_auto_lib_test_dir_pairs      "$dir/$bdir"  "$dir/$bdir"  "$msg"  && return 0
+        done
+
+        ngx_auto_lib_test_dir_pairs          "$dir"        "$dir"        "$msg"  && return 0
+        ngx_auto_lib_test_dir=
+    done
+
+    return 1
+}
+
+ngx_auto_lib_test_install_dirs() {
+
+    local msg="$1"
+    local dir=
+
+    shift
+
+    for dir in "$@"; do
+        ngx_auto_lib_test_dir=$dir
+        ngx_auto_lib_test_dir_pair  "$dir/include"  "$dir/lib"  "$msg"   && return 0
+        ngx_auto_lib_test_dir=
+    done
+
+    return 1
+}
+
+ngx_auto_lib_run_tests() {
+
+    local name="$ngx_auto_lib_name"
+    local pfx="$ngx_auto_lib_pfx"
+    local PFX="$NGX_AUTO_LIB_PFX"
+    local INC="$NGX_AUTO_LIB_INC"
+    local LIB="$NGX_AUTO_LIB_LIB"
+    local DIR="$NGX_AUTO_LIB_DIR"
+    local BASE="$NGX_AUTO_LIB_BASE"
+    local MSG="$NGX_AUTO_LIB_MSG"
+
+
+    ngx_found=no
+
+
+    # dependency
+
+    if [ $NGX_AUTO_LIB_SEARCH_DEP = YES ]; then
+        ngx_auto_lib_test_dir_pair  "$INC"  "$LIB"  "$MSG"
+        return $?
+    fi
+
+
+    # lib and include dirs set explicitly (e.g. $OPENSSL_INC, $OPENSSL_LIB)
+
+    if [ $NGX_AUTO_LIB_SEARCH_LIB_INC = YES ]; then
+        ngx_auto_lib_test_dir_pair  "$INC"  "$LIB"  " (specified by \$${PFX}_INC and \$${PFX}_LIB)"  && return 0
+    fi
+
+
+    # path specified by ${PFX} (e.g. $OPENSSL, $PCRE)
+    # Note : these will be set automatically by configure for OpenSSL, PCRE, Zlib etc
+    # TODO : change to searching more than one path
+
+    if [ $NGX_AUTO_LIB_SEARCH_DIR = YES ] && [ $DIR != NONE ]; then
+        ngx_auto_lib_test_dirs  " (specified by \$${PFX})"  $DIR  && return 0
+    fi
+
+
+    # directories beginning with '$pfx-' that are in $NGX_AUTO_LIB_BASE (e.g. $OPENSSL_BASE)
+
+    if [ $NGX_AUTO_LIB_SEARCH_BASE = YES ] && [ $BASE ]; then
+
+        p=$NGX_AUTO_LIB_SEARCH_BASE_PREFIX
+
+        if [ "$p" = YES ]; then
+            p="!ame $pfx-*"
+        elif [ "$p" ]; then
+            p="!ame $p*"
+        fi
+
+        ngx_auto_lib_test_dirs " (found under \$${PFX}_BASE)" \
+                `find $BASE/* -maxdepth 0 -type d $p 2> /dev/null | sort -r`  && return 0
+    fi
+
+
+    # directories beginning with '$pfx-' that are in the same directory as the Nginx source
+
+    if [ $NGX_AUTO_LIB_SEARCH_PARENT = YES ]; then
+        local src_dir=`cd ..; pwd`
+        ngx_auto_lib_test_dirs " (found under Nginx source parent dir)" \
+                `find $src_dir/* -maxdepth 0 -type d !ame $pfx-* 2> /dev/null | sort -r` && return 0
+    fi
+
+
+    # system folders
+
+    if [ $NGX_AUTO_LIB_SEARCH_SYSTEM = YES ]; then
+        ngx_auto_lib_test_install_dirs  ""  $NGX_AUTO_LIB_SYSTEM_DIRS  && return 0
+    fi
+
+    return 1
+}
+
+#######################
+## HANDLER FUNCTIONS ##
+#######################
+
+ngx_auto_lib_run() {
+    ngx_auto_lib_get_variables
+    eval AUTO_$NGX_AUTO_LIB_PFX=NO
+
+    ngx_auto_lib_check_require  || return
+    ngx_auto_lib_setup          || return
+    ngx_auto_lib_save_feature_vars
+    ngx_auto_lib_run_tests
+    ngx_auto_lib_post_tests     || return
+    ngx_auto_lib_finalize
+}
+
+ngx_auto_lib_print_feature_vars() {
+    echo ----------------------------
+    for var in $ngx_feature_vars; do
+        eval "echo ngx_feature_$var = \$ngx_feature_$var"
+    done
+    echo ----------------------------
+}
+
+ngx_auto_lib_setup() {
+    return 0
+}
+
+ngx_auto_lib_post_tests() {
+    return 0
+}
+
+#############################
+## SET VARIABLES FUNCTIONS ##
+#############################
+
+# TODO : add HTTP/ADDON settings too
+
+ngx_auto_lib_set_core_variables() {
+    # TODO : don't add includes / libs more than once
+
+    eval CORE_DEPS=\"$CORE_DEPS $ngx_feature_deps\"
+    eval CORE_INCS=\"$CORE_INCS $ngx_feature_path\"
+    eval CORE_LIBS=\"$CORE_LIBS $ngx_feature_libs_to_add\"
+    eval CORE_SRCS=\"$CORE_SRCS $ngx_feature_srcs\"
+}
+
+ngx_auto_lib_set_generic_variables() {
+    local INC=$ngx_auto_lib_test_inc_dir
+    local LIB=$ngx_auto_lib_test_lib_dir
+
+    modules="$modules $ngx_feature_modules"
+
+    for have in $ngx_feature_haves; do
+        . auto/have
+    done
+
+    set - $ngx_feature_defines
+
+    while [ $1 ]; do
+        have=$1
+        value=$2
+        . auto/define
+    done
+
+    local PFX=$NGX_AUTO_LIB_PFX
+
+    eval USE_$PFX=NO
+
+    if [ $ngx_auto_lib_test_dir ]; then
+        eval $PFX=$ngx_auto_lib_test_dir
+    else
+        eval $PFX=$ngx_auto_lib_lib_dir
+    fi
+
+    if [ $NGX_AUTO_LIB_SHARED != YES ]; then
+        for l in $ngx_feature_lib_names; do
+            CORE_LIBS=`echo $CORE_LIBS | sed 's|-\<l$l\>||g'`
+            ADDON_LIBS=`echo $ADDON_LIBS | sed 's|-\<l$l\>||g'`
+        done
+    fi
+
+    eval ${PFX}_INC=$INC
+    eval ${PFX}_LIB=$LIB
+    eval ${PFX}_SHARED=$NGX_AUTO_LIB_SHARED
+    eval AUTO_$PFX=YES
+}
+
+ngx_auto_lib_set_custom_variables() {
+    return 0
+}
+
+########################
+## FINALIZE FUNCTIONS ##
+########################
+
+ngx_auto_lib_finalize() {
+    ngx_auto_lib_finalize_core
+}
+
+ngx_auto_lib_finalize_core() {
+
+    if [ $ngx_found = yes ]; then
+
+        ngx_auto_lib_set_core_variables
+        ngx_auto_lib_set_generic_variables
+
+        if [ "$ngx_feature_variables" ]; then
+            eval $ngx_feature_variables
+        fi
+
+        ngx_auto_lib_set_custom_variables
+
+    elif [ $ngx_feature_exit_if_not_found = yes ]; then
+
+        if [ $ngx_auto_lib_module_name ]; then
+            module_txt=" by the $ngx_auto_lib_module_name module" 
+        else
+            module_text=
+        fi        
+
+        lib=$ngx_auto_lib_name
+        pfx=$ngx_auto_lib_pfx
+        PFX=$NGX_AUTO_LIB_PFX
+
+cat << END
+
+$0: error: the $lib library is required$module_txt, but cannot
+be found using the current configuration. In order for the compilation to succeed,
+you will need to install the library using your system's package installer or point
+the configure script to the library using one of the following variables :
+
+to define a dir to find $pfx library (source or install dir)    $PFX
+to define $pfx lib and include dirs separately                  ${PFX}_LIB & ${PFX}_INC
+to define a base dir to search for dirs beginning with $pfx-    ${PFX}_BASE
+
+e.g.
+
+$ export ${PFX}_LIB=/path/to/library/lib
+$ export ${PFX}_LIB=/path/to/library/include
+$ $0 ...
+
+END
+        exit 1
+    fi
+}
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/CHANGES b/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/CHANGES
new file mode 100644
index 0000000..eaaef0b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/CHANGES
@@ -0,0 +1,17 @@
+Changelog
+---------
+
+0.1         feature : set_var functions
+0.1.1       feature : upstream_list directive and functions
+0.2         feature : conf merge functions
+            feature : conf command macros
+            feature : 'action' macros
+0.2.1       bugfix  : ndk_map_uri_to_path_add_suffix
+0.2.2       feature : regex conf functions
+0.2.3       feature : version number
+0.2.4       change  : the auto/build script is now executed automatically on compilation
+0.2.9       feature : ngx_auto_lib included with source
+0.2.11      bugfix  : hash functions did not display properly
+0.2.12      feature : patches for rewrite functions and rewrite phase handler
+0.2.13      change  : revert to old behaviour rewrite functions
+            change  : pre-generated config and macro files now provided
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/LICENSE b/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/LICENSE
new file mode 100644
index 0000000..7074f57
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/notes/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2010, Marcus Clyne, Simpl (simpl.it)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the organization (Simpl) nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MARCUS CLYNE OR SIMPL BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_array.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_array.h
new file mode 100644
index 0000000..4e0d518
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_array.h
@@ -0,0 +1,113 @@
+
+/* 
+ * 2010 (C) Marcus Clyne 
+ *
+ * DO NOT EDIT THIS FILE MANUALLY
+ * ------------------------------
+ * This file has been generated automatically from scripts in the $base/auto dir and
+ * data in the $base/auto/data dir. If you wish to edit the output of this file, then
+ * you should edit these files instead.
+ *
+*/
+
+
+/* Non-generated macros */
+
+#define     ndk_array_count(a)                  ((a)->nelts)
+#define     ndk_array_get_first(a)              ((a)->elts)
+#define     ndk_array_get_index(a,n)            ((void*) ((char*) (a)->elts + (a)->size * n))
+#define     ndk_array_get_last(a)               ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1)))
+#define     ndk_array_get_reverse_index(a,n)    ((void*) ((char*) (a)->elts + (a)->size * ((a)->nelts - 1 - n)))
+#define     ndk_array_push_clean(p,a)           {p = ngx_array_push (a); ndk_zerop (p);}
+
+
+/* base action macro macros */
+
+#define     ndk_array_create_ac(a,pl,n,sz,ac)   {a = ngx_array_create (pl,n,sz); if (a == NULL) ac;}
+#define     ndk_array_init_ac(a,pl,n,sz,ac)     {if (ngx_array_init (a,pl,n,sz) == NGX_ERROR) ac;}
+#define     ndk_array_push_ac(p,a,ac)           {p = ngx_array_push (a);     if (p == NULL) ac;}
+#define     ndk_array_push_clean_ac(p,a,ac)     {p = ngx_array_push (a);     if (p == NULL) ac; ndk_zerop (p);}
+#define     ndk_array_push_n_ac(p,a,n,ac)       {p = ngx_array_push_n (a,n); if (p == NULL) ac;}
+#define     ndk_array_push_n_clean_ac(p,a,n,ac) {p = ngx_array_push_n (a,n); if (p == NULL) ac; ndk_zeropn (p,n);}
+
+
+/* generated action macros */
+
+#define     ndk_array_create_r0(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,return 0)
+#define     ndk_array_create_r1(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,return 1)
+#define     ndk_array_create_r_1(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,return -1)
+#define     ndk_array_create_rok(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,return NGX_OK)
+#define     ndk_array_create_rce(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,return NGX_CONF_ERROR)
+#define     ndk_array_create_rcok(a,pl,n,sz)    ndk_array_create_ac        (a,pl,n,sz,return NGX_CONF_OK)
+#define     ndk_array_create_re(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,return NGX_ERROR)
+#define     ndk_array_create_rn(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,return NULL)
+#define     ndk_array_create_rse(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,{ngx_script_error (e); return;})
+#define     ndk_array_create_sce(a,pl,n,sz)     ndk_array_create_ac        (a,pl,n,sz,{ngx_script_configure_error (c); return;})
+#define     ndk_array_create_g(a,pl,n,sz,_lb)   ndk_array_create_ac        (a,pl,n,sz,goto _lb)
+#define     ndk_array_create_ge(a,pl,n,sz)      ndk_array_create_ac        (a,pl,n,sz,goto error)
+
+#define     ndk_array_init_r0(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,return 0)
+#define     ndk_array_init_r1(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,return 1)
+#define     ndk_array_init_r_1(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,return -1)
+#define     ndk_array_init_rok(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,return NGX_OK)
+#define     ndk_array_init_rce(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,return NGX_CONF_ERROR)
+#define     ndk_array_init_rcok(a,pl,n,sz)      ndk_array_init_ac          (a,pl,n,sz,return NGX_CONF_OK)
+#define     ndk_array_init_re(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,return NGX_ERROR)
+#define     ndk_array_init_rn(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,return NULL)
+#define     ndk_array_init_rse(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,{ngx_script_error (e); return;})
+#define     ndk_array_init_sce(a,pl,n,sz)       ndk_array_init_ac          (a,pl,n,sz,{ngx_script_configure_error (c); return;})
+#define     ndk_array_init_g(a,pl,n,sz,_lb)     ndk_array_init_ac          (a,pl,n,sz,goto _lb)
+#define     ndk_array_init_ge(a,pl,n,sz)        ndk_array_init_ac          (a,pl,n,sz,goto error)
+
+#define     ndk_array_push_r0(p,a)              ndk_array_push_ac          (p,a,return 0)
+#define     ndk_array_push_r1(p,a)              ndk_array_push_ac          (p,a,return 1)
+#define     ndk_array_push_r_1(p,a)             ndk_array_push_ac          (p,a,return -1)
+#define     ndk_array_push_rok(p,a)             ndk_array_push_ac          (p,a,return NGX_OK)
+#define     ndk_array_push_rce(p,a)             ndk_array_push_ac          (p,a,return NGX_CONF_ERROR)
+#define     ndk_array_push_rcok(p,a)            ndk_array_push_ac          (p,a,return NGX_CONF_OK)
+#define     ndk_array_push_re(p,a)              ndk_array_push_ac          (p,a,return NGX_ERROR)
+#define     ndk_array_push_rn(p,a)              ndk_array_push_ac          (p,a,return NULL)
+#define     ndk_array_push_rse(p,a)             ndk_array_push_ac          (p,a,{ngx_script_error (e); return;})
+#define     ndk_array_push_sce(p,a)             ndk_array_push_ac          (p,a,{ngx_script_configure_error (c); return;})
+#define     ndk_array_push_g(p,a,_lb)           ndk_array_push_ac          (p,a,goto _lb)
+#define     ndk_array_push_ge(p,a)              ndk_array_push_ac          (p,a,goto error)
+
+#define     ndk_array_push_clean_r0(p,a)        ndk_array_push_clean_ac    (p,a,return 0)
+#define     ndk_array_push_clean_r1(p,a)        ndk_array_push_clean_ac    (p,a,return 1)
+#define     ndk_array_push_clean_r_1(p,a)       ndk_array_push_clean_ac    (p,a,return -1)
+#define     ndk_array_push_clean_rok(p,a)       ndk_array_push_clean_ac    (p,a,return NGX_OK)
+#define     ndk_array_push_clean_rce(p,a)       ndk_array_push_clean_ac    (p,a,return NGX_CONF_ERROR)
+#define     ndk_array_push_clean_rcok(p,a)      ndk_array_push_clean_ac    (p,a,return NGX_CONF_OK)
+#define     ndk_array_push_clean_re(p,a)        ndk_array_push_clean_ac    (p,a,return NGX_ERROR)
+#define     ndk_array_push_clean_rn(p,a)        ndk_array_push_clean_ac    (p,a,return NULL)
+#define     ndk_array_push_clean_rse(p,a)       ndk_array_push_clean_ac    (p,a,{ngx_script_error (e); return;})
+#define     ndk_array_push_clean_sce(p,a)       ndk_array_push_clean_ac    (p,a,{ngx_script_configure_error (c); return;})
+#define     ndk_array_push_clean_g(p,a,_lb)     ndk_array_push_clean_ac    (p,a,goto _lb)
+#define     ndk_array_push_clean_ge(p,a)        ndk_array_push_clean_ac    (p,a,goto error)
+
+#define     ndk_array_push_n_r0(p,a,n)          ndk_array_push_n_ac        (p,a,n,return 0)
+#define     ndk_array_push_n_r1(p,a,n)          ndk_array_push_n_ac        (p,a,n,return 1)
+#define     ndk_array_push_n_r_1(p,a,n)         ndk_array_push_n_ac        (p,a,n,return -1)
+#define     ndk_array_push_n_rok(p,a,n)         ndk_array_push_n_ac        (p,a,n,return NGX_OK)
+#define     ndk_array_push_n_rce(p,a,n)         ndk_array_push_n_ac        (p,a,n,return NGX_CONF_ERROR)
+#define     ndk_array_push_n_rcok(p,a,n)        ndk_array_push_n_ac        (p,a,n,return NGX_CONF_OK)
+#define     ndk_array_push_n_re(p,a,n)          ndk_array_push_n_ac        (p,a,n,return NGX_ERROR)
+#define     ndk_array_push_n_rn(p,a,n)          ndk_array_push_n_ac        (p,a,n,return NULL)
+#define     ndk_array_push_n_rse(p,a,n)         ndk_array_push_n_ac        (p,a,n,{ngx_script_error (e); return;})
+#define     ndk_array_push_n_sce(p,a,n)         ndk_array_push_n_ac        (p,a,n,{ngx_script_configure_error (c); return;})
+#define     ndk_array_push_n_g(p,a,n,_lb)       ndk_array_push_n_ac        (p,a,n,goto _lb)
+#define     ndk_array_push_n_ge(p,a,n)          ndk_array_push_n_ac        (p,a,n,goto error)
+
+#define     ndk_array_push_n_clean_r0(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,return 0)
+#define     ndk_array_push_n_clean_r1(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,return 1)
+#define     ndk_array_push_n_clean_r_1(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,return -1)
+#define     ndk_array_push_n_clean_rok(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,return NGX_OK)
+#define     ndk_array_push_n_clean_rce(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,return NGX_CONF_ERROR)
+#define     ndk_array_push_n_clean_rcok(p,a,n)  ndk_array_push_n_clean_ac  (p,a,n,return NGX_CONF_OK)
+#define     ndk_array_push_n_clean_re(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,return NGX_ERROR)
+#define     ndk_array_push_n_clean_rn(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,return NULL)
+#define     ndk_array_push_n_clean_rse(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,{ngx_script_error (e); return;})
+#define     ndk_array_push_n_clean_sce(p,a,n)   ndk_array_push_n_clean_ac  (p,a,n,{ngx_script_configure_error (c); return;})
+#define     ndk_array_push_n_clean_g(p,a,n,_lb) ndk_array_push_n_clean_ac  (p,a,n,goto _lb)
+#define     ndk_array_push_n_clean_ge(p,a,n)    ndk_array_push_n_clean_ac  (p,a,n,goto error)
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_cmd_basic.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_cmd_basic.h
new file mode 100644
index 0000000..c2db894
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_cmd_basic.h
@@ -0,0 +1,2203 @@
+
+/*
+ * 2010 (C) Marcus Clyne
+ *
+ * DO NOT EDIT THIS FILE MANUALLY
+ * ------------------------------
+ * This file has been generated automatically from scripts in the $base/auto dir and
+ * data in the $base/auto/data dir. If you wish to edit the output of this file, then
+ * you should edit these files instead.
+ *
+*/
+
+
+/* conf cmd core values/bitmasks */
+
+#define     NDK_1MORE               NGX_1MORE
+#define     NDK_2MORE               NGX_2MORE
+#define     NDK_ANY                 NGX_ANY
+#define     NDK_ARGS_NUMBER         NGX_ARGS_NUMBER
+#define     NDK_BLOCK               NGX_BLOCK
+#define     NDK_FLAG                NGX_FLAG
+#define     NDK_MULTI               NGX_MULTI
+#define     NDK_TAKE1               NGX_TAKE1
+#define     NDK_TAKE12              NGX_TAKE12
+#define     NDK_TAKE123             NGX_TAKE123
+#define     NDK_TAKE1234            NGX_TAKE1234
+#define     NDK_TAKE13              NGX_TAKE13
+#define     NDK_TAKE2               NGX_TAKE2
+#define     NDK_TAKE23              NGX_TAKE23
+#define     NDK_TAKE3               NGX_TAKE3
+#define     NDK_TAKE4               NGX_TAKE4
+#define     NDK_TAKE5               NGX_TAKE5
+#define     NDK_TAKE6               NGX_TAKE6
+#define     NDK_TAKE7               NGX_TAKE7
+#define     NDK_TAKE8               NGX_TAKE8
+
+
+/* conf cmd bitmasks */
+
+/* TODO : finish this */
+
+#define     NDK_HTTP_MAIN_CONF              NGX_HTTP_MAIN_CONF
+#define     NDK_HTTP_SRV_CONF               NGX_HTTP_SRV_CONF
+#define     NDK_HTTP_SIF_CONF               NGX_HTTP_SIF_CONF
+#define     NDK_HTTP_LOC_CONF               NGX_HTTP_LOC_CONF
+#define     NDK_HTTP_LIF_CONF               NGX_HTTP_LIF_CONF
+#define     NDK_HTTP_UPS_CONF               NGX_HTTP_UPS_CONF
+#define     NDK_MAIN_CONF                   NGX_MAIN_CONF
+#define     NDK_ANY_CONF                    NGX_ANY_CONF
+
+
+/* compound locations */
+
+#define     NDK_HTTP_MAIN_SRV_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_CONF
+#define     NDK_HTTP_MAIN_SIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_SIF_CONF
+#define     NDK_HTTP_MAIN_LOC_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_CONF
+#define     NDK_HTTP_MAIN_LIF_CONF                  NDK_HTTP_MAIN_CONF|NDK_HTTP_LOC_LIF_CONF
+
+#define     NDK_HTTP_SRV_SIF_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_SIF_CONF
+#define     NDK_HTTP_SRV_LOC_CONF                   NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_CONF
+#define     NDK_HTTP_SRV_LOC_LIF_CONF               NDK_HTTP_SRV_CONF|NDK_HTTP_LOC_LIF_CONF
+#define     NDK_HTTP_SRV_SIF_LOC_CONF               NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_CONF
+#define     NDK_HTTP_SRV_SIF_LOC_LIF_CONF           NDK_HTTP_SRV_SIF_CONF|NDK_HTTP_LOC_LIF_CONF
+
+#define     NDK_HTTP_LOC_LIF_CONF                   NDK_HTTP_LOC_CONF|NDK_HTTP_LIF_CONF
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LOC_CONF
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SRV_LIF_CONF
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF              NDK_HTTP_MAIN_CONF|NDK_HTTP_SIF_LOC_CONF
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF      NDK_HTTP_SRV_SIF_LOC_LIF_CONF|NDK_MAIN_CONF
+#define     NDK_HTTP_CONF                           NDK_HTTP_MAIN_SRV_SIF_LOC_LIF_CONF
+#define     NDK_HTTP_ANY_CONF                       NDK_HTTP_CONF|NDK_HTTP_UPS_CONF
+
+
+/* property offsets     NOTE : ngx_module_main_conf_t etc should be defined in the module's .c file before the commands */
+
+#define     NDK_HTTP_MAIN_CONF_PROP(p)      NGX_HTTP_MAIN_CONF_OFFSET, offsetof (ndk_module_main_conf_t, p)
+#define     NDK_HTTP_SRV_CONF_PROP(p)       NGX_HTTP_SRV_CONF_OFFSET, offsetof (ndk_module_srv_conf_t, p)
+#define     NDK_HTTP_LOC_CONF_PROP(p)       NGX_HTTP_LOC_CONF_OFFSET, offsetof (ndk_module_loc_conf_t, p)
+
+
+/* conf cmd basic macros */
+
+#define     NDK_HTTP_MAIN_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_1MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_1MORE|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_2MORE(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_2MORE|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_ANY(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ANY|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_ARGS_NUMBER(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_ARGS_NUMBER|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_BLOCK(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_BLOCK|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_FLAG(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_FLAG|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_MULTI(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_MULTI|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE1(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE12(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE12|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE123(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE123|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE1234(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE1234|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE13(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE13|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE2(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE2|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE23(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE23|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE3(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE3|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE4(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE4|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE5(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE5|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE6(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE6|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE7(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE7|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
+#define     NDK_HTTP_MAIN_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LOC_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_LIF_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SRV_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LOC_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SRV_LIF_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LOC_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_SIF_LIF_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_SIF_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SRV_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SRV_LIF_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_MAIN_SRV_SIF_LOC_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_UPS_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_UPS_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_HTTP_ANY_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_HTTP_ANY_CONF,\
+                                    func, off1, off2, post},
+
+#define     NDK_ANY_CONF_TAKE8(name,func,off1,off2,post)\
+                                    {ngx_string (name),\
+                                    NGX_CONF_TAKE8|NDK_ANY_CONF,\
+                                    func, off1, off2, post},
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_cmd_extra.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_cmd_extra.h
new file mode 100644
index 0000000..68e276f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_cmd_extra.h
@@ -0,0 +1,5423 @@
+
+/*
+ * 2010 (C) Marcus Clyne
+ *
+ * DO NOT EDIT THIS FILE MANUALLY
+ * ------------------------------
+ * This file has been generated automatically from scripts in the $base/auto dir and
+ * data in the $base/auto/data dir. If you wish to edit the output of this file, then
+ * you should edit these files instead.
+ *
+*/
+
+
+/* conf command macros */
+
+#define     NDK_HTTP_MAIN_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_MAIN_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_UPS_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_BITMASK(name,p,post)\
+            NDK_HTTP_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_BITMASK(name,p,post)\
+            NDK_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_bitmask_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_BUFS(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_BUFS(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_BUFS(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_BUFS(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_BUFS(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_BUFS(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_BUFS(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_BUFS(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_BUFS(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_BUFS(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_BUFS(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_BUFS(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_BUFS(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_BUFS(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_BUFS(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_BUFS(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_BUFS(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_BUFS(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_BUFS(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_BUFS(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_BUFS(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_bufs_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_COMPLEX_KEYVAL(name,p,post)\
+            NDK_ANY_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_http_complex_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_COMPLEX_PATH(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_UPS_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_HTTP_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_COMPLEX_VALUE_ARRAY(name,p,post)\
+            NDK_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_http_complex_value_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_COMPLEX_VALUE(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_http_complex_value_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_ENCODING(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_ENCODING(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_encoding_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_ENUM(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_ENUM(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_ENUM(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_ENUM(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_ENUM(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_ENUM(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_ENUM(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_ENUM(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_ENUM(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_ENUM(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_ENUM(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_ENUM(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_ENUM(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ENUM(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ENUM(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ENUM(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ENUM(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_ENUM(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_ENUM(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_ENUM(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_ENUM(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_enum_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_FALSE(name,p,post)\
+            NDK_HTTP_MAIN_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_FALSE(name,p,post)\
+            NDK_HTTP_SRV_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_FALSE(name,p,post)\
+            NDK_HTTP_SIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_FALSE(name,p,post)\
+            NDK_HTTP_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_FALSE(name,p,post)\
+            NDK_HTTP_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_FALSE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_FALSE(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_FALSE(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_FALSE(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_FALSE(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_FALSE(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_FALSE(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_FALSE(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_FALSE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_FALSE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_FALSE(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_FALSE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_FALSE(name,p,post)\
+            NDK_HTTP_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_FALSE(name,p,post)\
+            NDK_HTTP_UPS_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_FALSE(name,p,post)\
+            NDK_HTTP_ANY_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_FALSE(name,p,post)\
+            NDK_ANY_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_false_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_FULL_PATH(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_FULL_PATH(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_full_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_KEYVAL1(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_KEYVAL1(name,p,post)\
+            NDK_ANY_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval1_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_KEYVAL(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_KEYVAL(name,p,post)\
+            NDK_ANY_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_keyval_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_MSEC(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_MSEC(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_MSEC(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_MSEC(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_MSEC(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_MSEC(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_MSEC(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_MSEC(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_MSEC(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_MSEC(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_MSEC(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_MSEC(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_MSEC(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_MSEC(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_MSEC(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_MSEC(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_MSEC(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_MSEC(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_MSEC(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_MSEC(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_MSEC(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_msec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_NULL(name,p,post)\
+            NDK_HTTP_MAIN_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_NULL(name,p,post)\
+            NDK_HTTP_SRV_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_NULL(name,p,post)\
+            NDK_HTTP_SIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_NULL(name,p,post)\
+            NDK_HTTP_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_NULL(name,p,post)\
+            NDK_HTTP_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_NULL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_NULL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_NULL(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_NULL(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_NULL(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_NULL(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_NULL(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_NULL(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_NULL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_NULL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_NULL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NULL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_NULL(name,p,post)\
+            NDK_HTTP_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_NULL(name,p,post)\
+            NDK_HTTP_UPS_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_NULL(name,p,post)\
+            NDK_HTTP_ANY_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_NULL(name,p,post)\
+            NDK_ANY_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_null_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_NUM64(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_NUM64(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_NUM64(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_NUM64(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_NUM64(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_NUM64(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_NUM64(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_NUM64(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_NUM64(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_NUM64(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_NUM64(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_NUM64(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_NUM64(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_NUM64(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_NUM64(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_NUM64(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NUM64(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_NUM64(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_NUM64(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_NUM64(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_NUM64(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num64_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_NUM_FLAG(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_NUM_FLAG(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_NUM(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_NUM(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_NUM(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_NUM(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_NUM(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_NUM(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_NUM(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_NUM(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_NUM(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_NUM(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_NUM(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_NUM(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_NUM(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_NUM(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_NUM(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_NUM(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NUM(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_NUM(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_NUM(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_NUM(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_NUM(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_num_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_OFF(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_OFF(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_OFF(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_OFF(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_OFF(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_OFF(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_OFF(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_OFF(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_OFF(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_OFF(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_OFF(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_OFF(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_OFF(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_OFF(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_OFF(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_OFF(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_OFF(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_OFF(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_OFF(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_OFF(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_OFF(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_off_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_MAIN_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_SRV_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_SIF_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_LOC_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_LIF_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_UPS_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_ONOFF(name,p,post)\
+            NDK_HTTP_ANY_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_ONOFF(name,p,post)\
+            NDK_ANY_CONF_FLAG\
+                (name,\
+                ndk_conf_set_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_PATH(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_PATH(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_PATH(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_PATH(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_PATH(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_PATH(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_PATH(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_PATH(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_PATH(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_PATH(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_PATH(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_PATH(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_PATH(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_PATH(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_PATH(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_PATH(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_split_path_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_PTR(name,p,post)\
+            NDK_HTTP_MAIN_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_PTR(name,p,post)\
+            NDK_HTTP_SRV_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_PTR(name,p,post)\
+            NDK_HTTP_SIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_PTR(name,p,post)\
+            NDK_HTTP_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_PTR(name,p,post)\
+            NDK_HTTP_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_PTR(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_PTR(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_PTR(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_PTR(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_PTR(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_PTR(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_PTR(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_PTR(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_PTR(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_PTR(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_PTR(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_PTR(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_PTR(name,p,post)\
+            NDK_HTTP_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_PTR(name,p,post)\
+            NDK_HTTP_UPS_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_PTR(name,p,post)\
+            NDK_HTTP_ANY_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_PTR(name,p,post)\
+            NDK_ANY_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_ptr_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_UPS_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_HTTP_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_REGEX_ARRAY(name,p,post)\
+            NDK_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_MAIN_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_UPS_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_HTTP_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_REGEX_ARRAY_CL(name,p,post)\
+            NDK_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_regex_array_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_REGEX_CL(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_REGEX_CL(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_caseless_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_REXEX(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_REXEX(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_REXEX(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_REXEX(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_REXEX(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_REXEX(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_REXEX(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_REXEX(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_REXEX(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_REXEX(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_REXEX(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_REXEX(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_REXEX(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_REXEX(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_REXEX(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_REXEX(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_REXEX(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_REXEX(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_REXEX(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_REXEX(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_REXEX(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_regex_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_SEC_FLAG(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_SEC_FLAG(name,p,post)\
+            NDK_ANY_CONF_TAKE2\
+                (name,\
+                ndk_conf_set_sec_flag_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_SEC(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_SEC(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_SEC(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_SEC(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_SEC(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_SEC(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_SEC(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_SEC(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_SEC(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_SEC(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_SEC(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_SEC(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_SEC(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_SEC(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_SEC(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_SEC(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_SEC(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_SEC(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_SEC(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_SEC(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_SEC(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_sec_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_SIZE(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_SIZE(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_SIZE(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_SIZE(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_SIZE(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_SIZE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_SIZE(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_SIZE(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_SIZE(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_SIZE(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_SIZE(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_SIZE(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_SIZE(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_SIZE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_SIZE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_SIZE(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_SIZE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_SIZE(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_SIZE(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_SIZE(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_SIZE(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_size_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_UPS_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_STR_ARRAY(name,p,post)\
+            NDK_HTTP_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_STR_ARRAY(name,p,post)\
+            NDK_ANY_CONF_1MORE\
+                (name,\
+                ndk_conf_set_str_array_multi_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_STR_ARRAY1(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_STR_ARRAY1(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_array_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_STR(name,p,post)\
+            NDK_HTTP_MAIN_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_STR(name,p,post)\
+            NDK_HTTP_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_STR(name,p,post)\
+            NDK_HTTP_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_STR(name,p,post)\
+            NDK_HTTP_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_STR(name,p,post)\
+            NDK_HTTP_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_STR(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_STR(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_STR(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_STR(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_STR(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_STR(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_STR(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_STR(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_STR(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_STR(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_STR(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_STR(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_STR(name,p,post)\
+            NDK_HTTP_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_STR(name,p,post)\
+            NDK_HTTP_UPS_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_STR(name,p,post)\
+            NDK_HTTP_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_STR(name,p,post)\
+            NDK_ANY_CONF_TAKE1\
+                (name,\
+                ndk_conf_set_str_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
+#define     NDK_HTTP_MAIN_CONF_TRUE(name,p,post)\
+            NDK_HTTP_MAIN_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_MAIN_CONF_OFFSET,\
+                offsetof (ndk_module_main_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_CONF_TRUE(name,p,post)\
+            NDK_HTTP_SRV_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_CONF_TRUE(name,p,post)\
+            NDK_HTTP_SIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LOC_CONF_TRUE(name,p,post)\
+            NDK_HTTP_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_LIF_CONF_TRUE(name,p,post)\
+            NDK_HTTP_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_CONF_TRUE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_CONF_TRUE(name,p,post)\
+            NDK_HTTP_MAIN_SIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_SRV_CONF_OFFSET,\
+                offsetof (ndk_module_srv_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LOC_CONF_TRUE(name,p,post)\
+            NDK_HTTP_MAIN_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_LIF_CONF_TRUE(name,p,post)\
+            NDK_HTTP_MAIN_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LOC_CONF_TRUE(name,p,post)\
+            NDK_HTTP_SRV_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SRV_LIF_CONF_TRUE(name,p,post)\
+            NDK_HTTP_SRV_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LOC_CONF_TRUE(name,p,post)\
+            NDK_HTTP_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_SIF_LIF_CONF_TRUE(name,p,post)\
+            NDK_HTTP_SIF_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LOC_CONF_TRUE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_LIF_CONF_TRUE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_LIF_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SIF_LOC_CONF_TRUE(name,p,post)\
+            NDK_HTTP_MAIN_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_TRUE(name,p,post)\
+            NDK_HTTP_MAIN_SRV_SIF_LOC_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_CONF_TRUE(name,p,post)\
+            NDK_HTTP_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_UPS_CONF_TRUE(name,p,post)\
+            NDK_HTTP_UPS_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_HTTP_ANY_CONF_TRUE(name,p,post)\
+            NDK_HTTP_ANY_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+#define     NDK_ANY_CONF_TRUE(name,p,post)\
+            NDK_ANY_CONF_NOARGS\
+                (name,\
+                ndk_conf_set_true_slot,\
+                NGX_HTTP_LOC_CONF_OFFSET,\
+                offsetof (ndk_module_loc_conf_t, p),\
+                post)
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_merge.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_merge.h
new file mode 100644
index 0000000..4f7855f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_conf_merge.h
@@ -0,0 +1,227 @@
+
+/* 
+ * 2010 (C) Marcus Clyne 
+ *
+ * DO NOT EDIT THIS FILE MANUALLY
+ * ------------------------------
+ * This file has been generated automatically from scripts in the $base/auto dir and
+ * data in the $base/auto/data dir. If you wish to edit the output of this file, then
+ * you should edit these files instead.
+ *
+*/
+
+
+/* conf-merge-value macros */
+
+/* TODO : check that all the main types have a corresponding merge function */
+
+#define     ndk_conf_merge_value            ngx_conf_merge_value
+#define     ndk_conf_merge_off_value        ngx_conf_merge_off_value 
+#define     ndk_conf_merge_ptr_value        ngx_conf_merge_ptr_value
+#define     ndk_conf_merge_str_value        ngx_conf_merge_str_value
+#define     ndk_conf_merge_size_value       ngx_conf_merge_size_value 
+
+
+#define     ndk_conf_merge_keyval_value(conf,prev,default)                                  \
+                                                                                            \
+                conf = prev ? prev : default;
+
+#define     ndk_conf_merge_str_array_value(conf,prev,val1,...)                              \
+                                                                                            \
+                if (conf == NGX_CONF_UNSET_PTR) {                                           \
+                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
+                        if (val1 == NULL) {                                                 \
+                            conf = NULL;                                                    \
+                        } else {                                                            \
+                            char * elts[] = {val1,##__VA_ARGS__};                           \
+                            int    n = sizeof(elts)/sizeof(char*);                          \
+                                                                                            \
+                            conf = ndk_str_array_create (cf->pool, elts, n);                \
+                                                                                            \
+                            if (conf == NULL)                                               \
+                                return  NGX_CONF_ERROR;                                     \
+                        }                                                                   \
+                    } else {                                                                \
+                        conf = prev;                                                        \
+                    }                                                                       \
+                }
+
+#define     ndk_conf_merge_http_complex_value_value(conf,prev,default)                      \
+                                                                                            \
+                if (!conf.str.len) {                                                        \
+                    if (prev.str.len) {                                                     \
+                        conf = prev;                                                        \
+                    } else {                                                                \
+                        conf.str.data = (u_char *) default;                                 \
+                        conf.str.len = sizeof (default) - 1;                                \
+                                                                                            \
+                        if (ndk_http_complex_value_compile (cf, &conf))                     \
+                            return  NGX_CONF_ERROR;                                         \
+                    }                                                                       \
+                }
+
+#define     ndk_conf_merge_http_complex_value_array_value(conf,prev,val1,...)               \
+                                                                                            \
+                if (conf == NGX_CONF_UNSET_PTR) {                                           \
+                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
+                        if (val1 == NULL)                                                   \
+                            conf = NULL;                                                    \
+                        else {                                                              \
+                            char * elts[] = {val1,##__VA_ARGS__};                           \
+                            int    n = sizeof(elts)/sizeof(char*);                          \
+                                                                                            \
+                            conf = ndk_http_complex_value_array_create (cf, elts, n);       \
+                                                                                            \
+                            if (conf == NULL)                                               \
+                                return  NGX_CONF_ERROR;                                     \
+                        }                                                                   \
+                    } else {                                                                \
+                        conf = prev;                                                        \
+                    }                                                                       \
+                }
+
+#define     ndk_conf_merge_http_complex_path_value(conf,prev,...)                           \
+                ndk_conf_merge_http_complex_value_array_value (conf.a, prev.a, __VA_ARGS__)
+
+#define     ndk_conf_merge_split_path_value(conf,prev,path)                                 \
+                                                                                            \
+                if (conf == NGX_CONF_UNSET_PTR)  {                                          \
+                    conf = (prev == NGX_CONF_UNSET_PTR ?                                    \
+                        ndk_split_path_create_raw (cf, path) : prev);                       \
+                }
+
+
+/* conf-merge-prop macros */
+
+#define     ndk_conf_merge_prop(prop,default)\
+            ndk_conf_merge_value\
+                (conf->prop, prev->prop, default)
+
+#define     ndk_conf_merge_bitmask_prop(prop,default,...)\
+            ndk_conf_merge_bitmask_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_bufs_prop(prop,default,...)\
+            ndk_conf_merge_bufs_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_encoding_prop(prop,default,...)\
+            ndk_conf_merge_encoding_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_enum_prop(prop,default,...)\
+            ndk_conf_merge_enum_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_false_prop(prop,default,...)\
+            ndk_conf_merge_false_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_flag_prop(prop,default,...)\
+            ndk_conf_merge_flag_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_full_path_prop(prop,default,...)\
+            ndk_conf_merge_full_path_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_http_complex_keyval_prop(prop,default,...)\
+            ndk_conf_merge_http_complex_keyval_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_http_complex_path_prop(prop,default,...)\
+            ndk_conf_merge_http_complex_path_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_http_complex_value_prop(prop,default,...)\
+            ndk_conf_merge_http_complex_value_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_http_complex_value_array_prop(prop,default,...)\
+            ndk_conf_merge_http_complex_value_array_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_keyval_prop(prop,default,...)\
+            ndk_conf_merge_keyval_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_keyval1_prop(prop,default,...)\
+            ndk_conf_merge_keyval1_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_msec_prop(prop,default,...)\
+            ndk_conf_merge_msec_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_null_prop(prop,default,...)\
+            ndk_conf_merge_null_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_num_prop(prop,default,...)\
+            ndk_conf_merge_num_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_num64_prop(prop,default,...)\
+            ndk_conf_merge_num64_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_num_flag_prop(prop,default,...)\
+            ndk_conf_merge_num_flag_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_off_prop(prop,default,...)\
+            ndk_conf_merge_off_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_ptr_prop(prop,default,...)\
+            ndk_conf_merge_ptr_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_regex_prop(prop,default,...)\
+            ndk_conf_merge_regex_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_regex_array_prop(prop,default,...)\
+            ndk_conf_merge_regex_array_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_regex_array_caseless_prop(prop,default,...)\
+            ndk_conf_merge_regex_array_caseless_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_regex_caseless_prop(prop,default,...)\
+            ndk_conf_merge_regex_caseless_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_sec_prop(prop,default,...)\
+            ndk_conf_merge_sec_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_sec_flag_prop(prop,default,...)\
+            ndk_conf_merge_sec_flag_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_size_prop(prop,default,...)\
+            ndk_conf_merge_size_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_split_path_prop(prop,default,...)\
+            ndk_conf_merge_split_path_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_str_prop(prop,default,...)\
+            ndk_conf_merge_str_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_str_array_prop(prop,default,...)\
+            ndk_conf_merge_str_array_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_str_array_multi_prop(prop,default,...)\
+            ndk_conf_merge_str_array_multi_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
+#define     ndk_conf_merge_true_prop(prop,default,...)\
+            ndk_conf_merge_true_value\
+                (conf->prop, prev->prop, default,##__VA_ARGS__)
+    
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_config.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_config.c
new file mode 100644
index 0000000..d2e572f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_config.c
@@ -0,0 +1,72 @@
+
+/*
+ * 2010 (C) Marcus Clyne
+ *
+ * DO NOT EDIT THIS FILE MANUALLY
+ * ------------------------------
+ * This file has been generated automatically from scripts in the $base/auto dir and
+ * data in the $base/auto/data dir. If you wish to edit the output of this file, then
+ * you should edit these files instead.
+ *
+*/
+
+
+/* optional includes */
+
+#if (NDK_BUF)
+#include  <ndk_buf.c>
+#endif
+#if (NDK_COMPLEX_PATH)
+#include  <ndk_complex_path.c>
+#endif
+#if (NDK_COMPLEX_VALUE)
+#include  <ndk_complex_value.c>
+#endif
+#if (NDK_CONF_FILE)
+#include  <ndk_conf_file.c>
+#endif
+#if (NDK_ENCODING)
+#include  <ndk_encoding.c>
+#endif
+#if (NDK_HASH)
+#include  <ndk_hash.c>
+#endif
+#if (NDK_HTTP)
+#include  <ndk_http.c>
+#endif
+#if (NDK_PATH)
+#include  <ndk_path.c>
+#endif
+#if (NDK_PROCESS)
+#include  <ndk_process.c>
+#endif
+#if (NDK_REGEX)
+#include  <ndk_regex.c>
+#endif
+#if (NDK_REWRITE)
+#include  <ndk_rewrite.c>
+#endif
+#if (NDK_SET_VAR)
+#include  <ndk_set_var.c>
+#endif
+#if (NDK_STRING)
+#include  <ndk_string.c>
+#endif
+#if (NDK_UPSTREAM_LIST)
+#include  <ndk_upstream_list.c>
+#endif
+#if (NDK_URI)
+#include  <ndk_uri.c>
+#endif
+
+
+/* module commands */
+
+static ngx_command_t  ndk_http_commands[] = {
+#if (NDK_UPSTREAM_LIST)
+#define NDK_UPSTREAM_LIST_CMDS 1
+#include  <ndk_upstream_list.h>
+#undef  NDK_UPSTREAM_LIST_CMDS
+#endif
+    ngx_null_command
+};
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_config.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_config.h
new file mode 100644
index 0000000..7223950
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_config.h
@@ -0,0 +1,98 @@
+
+/* 
+ * 2010 (C) Marcus Clyne 
+ *
+ * DO NOT EDIT THIS FILE MANUALLY
+ * ------------------------------
+ * This file has been generated automatically from scripts in the $base/auto dir and
+ * data in the $base/auto/data dir. If you wish to edit the output of this file, then
+ * you should edit these files instead.
+ *
+*/
+
+
+/* include all optional modules */
+
+#ifdef NDK_ALL
+
+#ifndef NDK_BUF
+#define NDK_BUF 1
+#endif
+#ifndef NDK_COMPLEX_PATH
+#define NDK_COMPLEX_PATH 1
+#endif
+#ifndef NDK_COMPLEX_VALUE
+#define NDK_COMPLEX_VALUE 1
+#endif
+#ifndef NDK_CONF_FILE
+#define NDK_CONF_FILE 1
+#endif
+#ifndef NDK_ENCODING
+#define NDK_ENCODING 1
+#endif
+#ifndef NDK_HASH
+#define NDK_HASH 1
+#endif
+#ifndef NDK_HTTP
+#define NDK_HTTP 1
+#endif
+#ifndef NDK_PATH
+#define NDK_PATH 1
+#endif
+#ifndef NDK_PROCESS
+#define NDK_PROCESS 1
+#endif
+#ifndef NDK_REGEX
+#define NDK_REGEX 1
+#endif
+#ifndef NDK_REWRITE
+#define NDK_REWRITE 1
+#endif
+#ifndef NDK_SET_VAR
+#define NDK_SET_VAR 1
+#endif
+#ifndef NDK_STRING
+#define NDK_STRING 1
+#endif
+#ifndef NDK_UPSTREAM_LIST
+#define NDK_UPSTREAM_LIST 1
+#endif
+#ifndef NDK_URI
+#define NDK_URI 1
+#endif
+
+#endif
+
+
+/* module dependencies */
+
+#ifdef  NDK_COMPLEX_PATH
+#ifndef NDK_COMPLEX_VALUE
+#define NDK_COMPLEX_VALUE 1
+#endif
+#ifndef NDK_PATH
+#define NDK_PATH 1
+#endif
+#endif
+#ifdef  NDK_CONF_FILE
+#ifndef NDK_STRING
+#define NDK_STRING 1
+#endif
+#endif
+#ifdef  NDK_HASH
+#ifndef NDK_STRING
+#define NDK_STRING 1
+#endif
+#endif
+#ifdef  NDK_SET_VAR
+#ifndef NDK_REWRITE
+#define NDK_REWRITE 1
+#endif
+#endif
+#ifdef  NDK_UPSTREAM_LIST
+#ifndef NDK_HTTP_CREATE_MAIN_CONF
+#define NDK_HTTP_CREATE_MAIN_CONF 1
+#endif
+#endif
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_includes.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_includes.h
new file mode 100644
index 0000000..cbbf60a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_includes.h
@@ -0,0 +1,66 @@
+/* optional includes */
+
+#if (NDK_BUF)
+#include  <ndk_buf.h>
+#endif
+#if (NDK_COMPLEX_PATH)
+#include  <ndk_complex_path.h>
+#endif
+#if (NDK_COMPLEX_VALUE)
+#include  <ndk_complex_value.h>
+#endif
+#if (NDK_CONF_FILE)
+#include  <ndk_conf_file.h>
+#endif
+#if (NDK_ENCODING)
+#include  <ndk_encoding.h>
+#endif
+#if (NDK_HASH)
+#include  <ndk_hash.h>
+#endif
+#if (NDK_HTTP)
+#include  <ndk_http.h>
+#endif
+#if (NDK_PATH)
+#include  <ndk_path.h>
+#endif
+#if (NDK_PROCESS)
+#include  <ndk_process.h>
+#endif
+#if (NDK_REGEX)
+#include  <ndk_regex.h>
+#endif
+#if (NDK_REWRITE)
+#include  <ndk_rewrite.h>
+#endif
+#if (NDK_SET_VAR)
+#include  <ndk_set_var.h>
+#endif
+#if (NDK_STRING)
+#include  <ndk_string.h>
+#endif
+#if (NDK_UPSTREAM_LIST)
+#include  <ndk_upstream_list.h>
+#endif
+#if (NDK_URI)
+#include  <ndk_uri.h>
+#endif
+
+
+/* non-optional includes */
+
+#include  <ndk_http_headers.h>
+#include  <ndk_log.h>
+#include  <ndk_parse.h>
+#include  <ndk_string_util.h>
+
+
+/* auto-generated headers */
+
+#include  <ndk_array.h>
+#include  <ndk_palloc.h>
+#include  <ndk_conf_merge.h>
+#include  <ndk_conf_cmd_basic.h>
+#include  <ndk_conf_cmd_extra.h>
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_palloc.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_palloc.h
new file mode 100644
index 0000000..db8aaf1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/objs/ndk_palloc.h
@@ -0,0 +1,112 @@
+
+/* 
+ * 2010 (C) Marcus Clyne 
+ *
+ * DO NOT EDIT THIS FILE MANUALLY
+ * ------------------------------
+ * This file has been generated automatically from scripts in the $base/auto dir and
+ * data in the $base/auto/data dir. If you wish to edit the output of this file, then
+ * you should edit these files instead.
+ *
+*/
+
+
+/* Non-generated macros */
+
+#define     ndk_pallocp(p,pl)                   p = ngx_palloc (pl,sizeof(*p))
+#define     ndk_pallocpn(p,pl,n)                p = ngx_palloc (pl,sizeof(*p)*(n))
+
+#define     ndk_pcallocp(p,pl)                  p = ngx_pcalloc (pl,sizeof(*p))
+#define     ndk_pcallocpn(p,pl,n)               p = ngx_pcalloc (pl,sizeof(*p)*(n))
+
+
+/* base action macro macros */
+
+#define     ndk_palloc_ac(p,pl,sz,ac)           {p = ngx_palloc (pl,sz);    if (p == NULL) ac;}
+#define     ndk_pallocp_ac(p,pl,ac)             {ndk_pallocp (p,pl);        if (p == NULL) ac;}
+#define     ndk_pallocpn_ac(p,pl,n,ac)          {ndk_pallocpn (p,pl,n);     if (p == NULL) ac;}
+#define     ndk_pcalloc_ac(p,pl,sz,ac)          {p = ngx_pcalloc (pl,sz);   if (p == NULL) ac;}
+#define     ndk_pcallocp_ac(p,pl,ac)            {ndk_pcallocp (p,pl);       if (p == NULL) ac;}
+#define     ndk_pcallocpn_ac(p,pl,n,ac)         {ndk_pcallocpn (p,pl,n);    if (p == NULL) ac;}
+
+
+/* generated action macros */
+
+#define     ndk_palloc_r0(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,return 0)
+#define     ndk_palloc_r1(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,return 1)
+#define     ndk_palloc_r_1(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,return -1)
+#define     ndk_palloc_rok(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,return NGX_OK)
+#define     ndk_palloc_rce(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,return NGX_CONF_ERROR)
+#define     ndk_palloc_rcok(p,pl,sz)            ndk_palloc_ac              (p,pl,sz,return NGX_CONF_OK)
+#define     ndk_palloc_re(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,return NGX_ERROR)
+#define     ndk_palloc_rn(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,return NULL)
+#define     ndk_palloc_rse(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,{ngx_script_error (e); return;})
+#define     ndk_palloc_sce(p,pl,sz)             ndk_palloc_ac              (p,pl,sz,{ngx_script_configure_error (c); return;})
+#define     ndk_palloc_g(p,pl,sz,_lb)           ndk_palloc_ac              (p,pl,sz,goto _lb)
+#define     ndk_palloc_ge(p,pl,sz)              ndk_palloc_ac              (p,pl,sz,goto error)
+
+#define     ndk_pallocp_r0(p,pl)                ndk_pallocp_ac             (p,pl,return 0)
+#define     ndk_pallocp_r1(p,pl)                ndk_pallocp_ac             (p,pl,return 1)
+#define     ndk_pallocp_r_1(p,pl)               ndk_pallocp_ac             (p,pl,return -1)
+#define     ndk_pallocp_rok(p,pl)               ndk_pallocp_ac             (p,pl,return NGX_OK)
+#define     ndk_pallocp_rce(p,pl)               ndk_pallocp_ac             (p,pl,return NGX_CONF_ERROR)
+#define     ndk_pallocp_rcok(p,pl)              ndk_pallocp_ac             (p,pl,return NGX_CONF_OK)
+#define     ndk_pallocp_re(p,pl)                ndk_pallocp_ac             (p,pl,return NGX_ERROR)
+#define     ndk_pallocp_rn(p,pl)                ndk_pallocp_ac             (p,pl,return NULL)
+#define     ndk_pallocp_rse(p,pl)               ndk_pallocp_ac             (p,pl,{ngx_script_error (e); return;})
+#define     ndk_pallocp_sce(p,pl)               ndk_pallocp_ac             (p,pl,{ngx_script_configure_error (c); return;})
+#define     ndk_pallocp_g(p,pl,_lb)             ndk_pallocp_ac             (p,pl,goto _lb)
+#define     ndk_pallocp_ge(p,pl)                ndk_pallocp_ac             (p,pl,goto error)
+
+#define     ndk_pallocpn_r0(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,return 0)
+#define     ndk_pallocpn_r1(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,return 1)
+#define     ndk_pallocpn_r_1(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,return -1)
+#define     ndk_pallocpn_rok(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,return NGX_OK)
+#define     ndk_pallocpn_rce(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,return NGX_CONF_ERROR)
+#define     ndk_pallocpn_rcok(p,pl,n)           ndk_pallocpn_ac            (p,pl,n,return NGX_CONF_OK)
+#define     ndk_pallocpn_re(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,return NGX_ERROR)
+#define     ndk_pallocpn_rn(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,return NULL)
+#define     ndk_pallocpn_rse(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,{ngx_script_error (e); return;})
+#define     ndk_pallocpn_sce(p,pl,n)            ndk_pallocpn_ac            (p,pl,n,{ngx_script_configure_error (c); return;})
+#define     ndk_pallocpn_g(p,pl,n,_lb)          ndk_pallocpn_ac            (p,pl,n,goto _lb)
+#define     ndk_pallocpn_ge(p,pl,n)             ndk_pallocpn_ac            (p,pl,n,goto error)
+
+#define     ndk_pcalloc_r0(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,return 0)
+#define     ndk_pcalloc_r1(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,return 1)
+#define     ndk_pcalloc_r_1(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,return -1)
+#define     ndk_pcalloc_rok(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,return NGX_OK)
+#define     ndk_pcalloc_rce(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,return NGX_CONF_ERROR)
+#define     ndk_pcalloc_rcok(p,pl,sz)           ndk_pcalloc_ac             (p,pl,sz,return NGX_CONF_OK)
+#define     ndk_pcalloc_re(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,return NGX_ERROR)
+#define     ndk_pcalloc_rn(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,return NULL)
+#define     ndk_pcalloc_rse(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,{ngx_script_error (e); return;})
+#define     ndk_pcalloc_sce(p,pl,sz)            ndk_pcalloc_ac             (p,pl,sz,{ngx_script_configure_error (c); return;})
+#define     ndk_pcalloc_g(p,pl,sz,_lb)          ndk_pcalloc_ac             (p,pl,sz,goto _lb)
+#define     ndk_pcalloc_ge(p,pl,sz)             ndk_pcalloc_ac             (p,pl,sz,goto error)
+
+#define     ndk_pcallocp_r0(p,pl)               ndk_pcallocp_ac            (p,pl,return 0)
+#define     ndk_pcallocp_r1(p,pl)               ndk_pcallocp_ac            (p,pl,return 1)
+#define     ndk_pcallocp_r_1(p,pl)              ndk_pcallocp_ac            (p,pl,return -1)
+#define     ndk_pcallocp_rok(p,pl)              ndk_pcallocp_ac            (p,pl,return NGX_OK)
+#define     ndk_pcallocp_rce(p,pl)              ndk_pcallocp_ac            (p,pl,return NGX_CONF_ERROR)
+#define     ndk_pcallocp_rcok(p,pl)             ndk_pcallocp_ac            (p,pl,return NGX_CONF_OK)
+#define     ndk_pcallocp_re(p,pl)               ndk_pcallocp_ac            (p,pl,return NGX_ERROR)
+#define     ndk_pcallocp_rn(p,pl)               ndk_pcallocp_ac            (p,pl,return NULL)
+#define     ndk_pcallocp_rse(p,pl)              ndk_pcallocp_ac            (p,pl,{ngx_script_error (e); return;})
+#define     ndk_pcallocp_sce(p,pl)              ndk_pcallocp_ac            (p,pl,{ngx_script_configure_error (c); return;})
+#define     ndk_pcallocp_g(p,pl,_lb)            ndk_pcallocp_ac            (p,pl,goto _lb)
+#define     ndk_pcallocp_ge(p,pl)               ndk_pcallocp_ac            (p,pl,goto error)
+
+#define     ndk_pcallocpn_r0(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,return 0)
+#define     ndk_pcallocpn_r1(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,return 1)
+#define     ndk_pcallocpn_r_1(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,return -1)
+#define     ndk_pcallocpn_rok(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,return NGX_OK)
+#define     ndk_pcallocpn_rce(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,return NGX_CONF_ERROR)
+#define     ndk_pcallocpn_rcok(p,pl,n)          ndk_pcallocpn_ac           (p,pl,n,return NGX_CONF_OK)
+#define     ndk_pcallocpn_re(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,return NGX_ERROR)
+#define     ndk_pcallocpn_rn(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,return NULL)
+#define     ndk_pcallocpn_rse(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,{ngx_script_error (e); return;})
+#define     ndk_pcallocpn_sce(p,pl,n)           ndk_pcallocpn_ac           (p,pl,n,{ngx_script_configure_error (c); return;})
+#define     ndk_pcallocpn_g(p,pl,n,_lb)         ndk_pcallocpn_ac           (p,pl,n,goto _lb)
+#define     ndk_pcallocpn_ge(p,pl,n)            ndk_pcallocpn_ac           (p,pl,n,goto error)
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/patches/auto_config b/modules_deb/libnginx-mod-http-ndk-0.3.4/patches/auto_config
new file mode 100644
index 0000000..ba4fdd4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/patches/auto_config
@@ -0,0 +1,16 @@
+diff -pNr a/src/core/ngx_config.h b/src/core/ngx_config.h
+*** a/src/core/ngx_config.h	2008-09-19 13:47:13.000000000 +0100
+--- b/src/core/ngx_config.h	2010-10-09 17:14:13.000000000 +0100
+*************** typedef intptr_t        ngx_flag_t;
+*** 127,131 ****
+  #define NGX_MAX_UINT32_VALUE  (uint32_t) 0xffffffff
+  #endif
+  
+! 
+  #endif /* _NGX_CONFIG_H_INCLUDED_ */
+--- 127,131 ----
+  #define NGX_MAX_UINT32_VALUE  (uint32_t) 0xffffffff
+  #endif
+  
+! #include <ndk_config.h>
+  #endif /* _NGX_CONFIG_H_INCLUDED_ */
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/patches/expose_rewrite_functions b/modules_deb/libnginx-mod-http-ndk-0.3.4/patches/expose_rewrite_functions
new file mode 100644
index 0000000..ec1d6d8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/patches/expose_rewrite_functions
@@ -0,0 +1,291 @@
+diff -rNp a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
+*** a/src/http/modules/ngx_http_rewrite_module.c	2010-06-18 16:15:20.000000000 +0100
+--- b/src/http/modules/ngx_http_rewrite_module.c	2010-10-09 14:47:10.000000000 +0100
+***************
+*** 8,14 ****
+  #include <ngx_core.h>
+  #include <ngx_http.h>
+  
+! 
+  typedef struct {
+      ngx_array_t  *codes;        /* uintptr_t */
+  
+--- 8,14 ----
+  #include <ngx_core.h>
+  #include <ngx_http.h>
+  
+! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
+  typedef struct {
+      ngx_array_t  *codes;        /* uintptr_t */
+  
+*************** typedef struct {
+*** 17,23 ****
+      ngx_flag_t    log;
+      ngx_flag_t    uninitialized_variable_warn;
+  } ngx_http_rewrite_loc_conf_t;
+! 
+  
+  static void *ngx_http_rewrite_create_loc_conf(ngx_conf_t *cf);
+  static char *ngx_http_rewrite_merge_loc_conf(ngx_conf_t *cf,
+--- 17,23 ----
+      ngx_flag_t    log;
+      ngx_flag_t    uninitialized_variable_warn;
+  } ngx_http_rewrite_loc_conf_t;
+! #endif
+  
+  static void *ngx_http_rewrite_create_loc_conf(ngx_conf_t *cf);
+  static char *ngx_http_rewrite_merge_loc_conf(ngx_conf_t *cf,
+*************** static char *ngx_http_rewrite_return(ngx
+*** 28,44 ****
+      void *conf);
+  static char *ngx_http_rewrite_break(ngx_conf_t *cf, ngx_command_t *cmd,
+      void *conf);
+  static char *ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd,
+      void *conf);
+  static char * ngx_http_rewrite_if_condition(ngx_conf_t *cf,
+      ngx_http_rewrite_loc_conf_t *lcf);
+  static char *ngx_http_rewrite_variable(ngx_conf_t *cf,
+      ngx_http_rewrite_loc_conf_t *lcf, ngx_str_t *value);
+  static char *ngx_http_rewrite_set(ngx_conf_t *cf, ngx_command_t *cmd,
+      void *conf);
+  static char * ngx_http_rewrite_value(ngx_conf_t *cf,
+      ngx_http_rewrite_loc_conf_t *lcf, ngx_str_t *value);
+! 
+  
+  static ngx_command_t  ngx_http_rewrite_commands[] = {
+  
+--- 28,47 ----
+      void *conf);
+  static char *ngx_http_rewrite_break(ngx_conf_t *cf, ngx_command_t *cmd,
+      void *conf);
++ #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
+  static char *ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd,
+      void *conf);
+  static char * ngx_http_rewrite_if_condition(ngx_conf_t *cf,
+      ngx_http_rewrite_loc_conf_t *lcf);
+  static char *ngx_http_rewrite_variable(ngx_conf_t *cf,
+      ngx_http_rewrite_loc_conf_t *lcf, ngx_str_t *value);
++ #endif
+  static char *ngx_http_rewrite_set(ngx_conf_t *cf, ngx_command_t *cmd,
+      void *conf);
++ #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
+  static char * ngx_http_rewrite_value(ngx_conf_t *cf,
+      ngx_http_rewrite_loc_conf_t *lcf, ngx_str_t *value);
+! #endif
+  
+  static ngx_command_t  ngx_http_rewrite_commands[] = {
+  
+*************** ngx_http_rewrite_handler(ngx_http_reques
+*** 178,185 ****
+      return r->err_status;
+  }
+  
+! 
+! static ngx_int_t
+  ngx_http_rewrite_var(ngx_http_request_t *r, ngx_http_variable_value_t *v,
+      uintptr_t data)
+  {
+--- 181,190 ----
+      return r->err_status;
+  }
+  
+! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
+! static
+! #endif
+! ngx_int_t
+  ngx_http_rewrite_var(ngx_http_request_t *r, ngx_http_variable_value_t *v,
+      uintptr_t data)
+  {
+*************** ngx_http_rewrite_break(ngx_conf_t *cf, n
+*** 511,517 ****
+  }
+  
+  
+! static char *
+  ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+  {
+      ngx_http_rewrite_loc_conf_t  *lcf = conf;
+--- 516,525 ----
+  }
+  
+  
+! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
+! static
+! #endif
+! char *
+  ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+  {
+      ngx_http_rewrite_loc_conf_t  *lcf = conf;
+*************** ngx_http_rewrite_if(ngx_conf_t *cf, ngx_
+*** 627,633 ****
+  }
+  
+  
+! static char *
+  ngx_http_rewrite_if_condition(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf)
+  {
+      u_char                        *p;
+--- 635,644 ----
+  }
+  
+  
+! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
+! static
+! #endif
+! char *
+  ngx_http_rewrite_if_condition(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf)
+  {
+      u_char                        *p;
+*************** ngx_http_rewrite_if_condition(ngx_conf_t
+*** 847,853 ****
+  }
+  
+  
+! static char *
+  ngx_http_rewrite_variable(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
+      ngx_str_t *value)
+  {
+--- 858,867 ----
+  }
+  
+  
+! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
+! static
+! #endif
+! char *
+  ngx_http_rewrite_variable(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
+      ngx_str_t *value)
+  {
+*************** ngx_http_rewrite_set(ngx_conf_t *cf, ngx
+*** 948,954 ****
+  }
+  
+  
+! static char *
+  ngx_http_rewrite_value(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
+      ngx_str_t *value)
+  {
+--- 962,971 ----
+  }
+  
+  
+! #if !(NDK_EXPOSE_REWRITE_FUNCTIONS)
+! static
+! #endif
+! char *
+  ngx_http_rewrite_value(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
+      ngx_str_t *value)
+  {
+diff -rNp a/src/http/modules/ngx_http_rewrite_module.h b/src/http/modules/ngx_http_rewrite_module.h
+*** a/src/http/modules/ngx_http_rewrite_module.h	1970-01-01 01:00:00.000000000 +0100
+--- b/src/http/modules/ngx_http_rewrite_module.h	2010-10-09 14:38:04.000000000 +0100
+***************
+*** 0 ****
+--- 1,47 ----
++ 
++ /*
++  * Copyright (C) Marcus Clyne
++  *
++  * Note : this file has been created by the Nginx Development Kit using
++  * some code from ngx_http_rewrite_module.c
++  */
++ 
++ #if (NDK_EXPOSE_REWRITE_FUNCTIONS)
++ 
++ #ifndef _NGX_HTTP_REWRITE_H_INCLUDED_
++ #define _NGX_HTTP_REWRITE_H_INCLUDED_
++ 
++ #include <ngx_config.h>
++ #include <ngx_core.h>
++ #include <ngx_http.h>
++ 
++ 
++ extern  ngx_module_t  ngx_http_rewrite_module;
++ 
++ 
++ typedef struct {
++     ngx_array_t  *codes;        /* uintptr_t */
++ 
++     ngx_uint_t    stack_size;
++ 
++     ngx_flag_t    log;
++     ngx_flag_t    uninitialized_variable_warn;
++ } ngx_http_rewrite_loc_conf_t;
++ 
++ 
++ char *
++ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
++ char *
++ ngx_http_rewrite_if_condition(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf);
++ char *
++ ngx_http_rewrite_variable(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
++     ngx_str_t *value);
++ char *
++ ngx_http_rewrite_value(ngx_conf_t *cf, ngx_http_rewrite_loc_conf_t *lcf,
++     ngx_str_t *value);
++ ngx_int_t
++ ngx_http_rewrite_var(ngx_http_request_t *r, ngx_http_variable_value_t *v,
++     uintptr_t data);
++ 
++ #endif
++ #endif
+diff -rNp a/src/http/ngx_http.h b/src/http/ngx_http.h
+*** a/src/http/ngx_http.h	2010-06-15 16:13:34.000000000 +0100
+--- b/src/http/ngx_http.h	2010-10-09 14:25:56.000000000 +0100
+*************** typedef u_char *(*ngx_http_log_handler_p
+*** 43,48 ****
+--- 43,52 ----
+  #include <ngx_http_ssl_module.h>
+  #endif
+  
++ #if (NDK_EXPOSE_REWRITE_FUNCTIONS)
++ #include <ngx_http_rewrite_module.h>
++ #endif
++ 
+  
+  struct ngx_http_log_ctx_s {
+      ngx_connection_t    *connection;
+diff -rNp a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
+*** a/src/http/ngx_http_script.c	2010-09-13 13:44:43.000000000 +0100
+--- b/src/http/ngx_http_script.c	2010-10-09 14:36:10.000000000 +0100
+*************** static size_t ngx_http_script_full_name_
+*** 26,35 ****
+--- 26,43 ----
+  static void ngx_http_script_full_name_code(ngx_http_script_engine_t *e);
+  
+  
++ #if (NDK_EXPOSE_REWRITE_FUNCTIONS)
++ 
++ uintptr_t ngx_http_script_exit_code = (uintptr_t) NULL;
++ 
++ #else
++ 
+  #define ngx_http_script_exit  (u_char *) &ngx_http_script_exit_code
+  
+  static uintptr_t ngx_http_script_exit_code = (uintptr_t) NULL;
+  
++ #endif
++ 
+  
+  void
+  ngx_http_script_flush_complex_value(ngx_http_request_t *r,
+diff -rNp a/src/http/ngx_http_script.h b/src/http/ngx_http_script.h
+*** a/src/http/ngx_http_script.h	2010-09-13 13:44:43.000000000 +0100
+--- b/src/http/ngx_http_script.h	2010-10-09 14:33:40.000000000 +0100
+***************
+*** 12,17 ****
+--- 12,25 ----
+  #include <ngx_core.h>
+  #include <ngx_http.h>
+  
++ #if (NDK_EXPOSE_REWRITE_FUNCTIONS)
++ 
++ #define ngx_http_script_exit  (u_char *) &ngx_http_script_exit_code
++ 
++ extern uintptr_t ngx_http_script_exit_code;
++ 
++ #endif
++ 
+  
+  typedef struct {
+      u_char                     *ip;
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/patches/rewrite_phase_handler b/modules_deb/libnginx-mod-http-ndk-0.3.4/patches/rewrite_phase_handler
new file mode 100644
index 0000000..bd5161f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/patches/rewrite_phase_handler
@@ -0,0 +1,19 @@
+diff -p -r a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+*** a/src/http/ngx_http_core_module.c	2010-09-27 12:48:12.000000000 +0100
+--- b/src/http/ngx_http_core_module.c	2010-10-09 13:44:09.000000000 +0100
+*************** ngx_http_core_rewrite_phase(ngx_http_req
+*** 910,915 ****
+--- 910,922 ----
+          return NGX_AGAIN;
+      }
+  
++ #if defined(nginx_version) && nginx_version >= 8042 && (NDK_REWRITE_PHASE)
++ 
++     if (rc == NGX_AGAIN || rc == NGX_DONE) {
++         return NGX_OK;
++     }
++     
++ #endif
+      /* rc == NGX_OK || rc == NGX_ERROR || rc == NGX_HTTP_...  */
+  
+      ngx_http_finalize_request(r, rc);
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/md5.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/md5.h
new file mode 100644
index 0000000..4cbf843
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/md5.h
@@ -0,0 +1,117 @@
+/* crypto/md5/md5.h */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef HEADER_MD5_H
+#define HEADER_MD5_H
+
+#include <openssl/e_os2.h>
+#include <stddef.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifdef OPENSSL_NO_MD5
+#error MD5 is disabled.
+#endif
+
+/*
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * ! MD5_LONG has to be at least 32 bits wide. If it's wider, then !
+ * ! MD5_LONG_LOG2 has to be defined along.			   !
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ */
+
+#if defined(__LP32__)
+#define MD5_LONG unsigned long
+#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
+#define MD5_LONG unsigned long
+#define MD5_LONG_LOG2 3
+/*
+ * _CRAY note. I could declare short, but I have no idea what impact
+ * does it have on performance on none-T3E machines. I could declare
+ * int, but at least on C90 sizeof(int) can be chosen at compile time.
+ * So I've chosen long...
+ *					<appro@fy.chalmers.se>
+ */
+#else
+#define MD5_LONG unsigned int
+#endif
+
+#define MD5_CBLOCK	64
+#define MD5_LBLOCK	(MD5_CBLOCK/4)
+#define MD5_DIGEST_LENGTH 16
+
+typedef struct MD5state_st
+	{
+	MD5_LONG A,B,C,D;
+	MD5_LONG Nl,Nh;
+	MD5_LONG data[MD5_LBLOCK];
+	unsigned int num;
+	} MD5_CTX;
+
+int MD5_Init(MD5_CTX *c);
+int MD5_Update(MD5_CTX *c, const void *data, size_t len);
+int MD5_Final(unsigned char *md, MD5_CTX *c);
+unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md);
+void MD5_Transform(MD5_CTX *c, const unsigned char *b);
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/murmurhash2.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/murmurhash2.c
new file mode 100644
index 0000000..ac899b4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/murmurhash2.c
@@ -0,0 +1,77 @@
+
+
+#ifndef MURMURHASH2_C
+#define MURMURHASH2_C
+
+#define     MURMURHASH2_DIGEST_LENGTH   4
+
+/*
+ * -----------------------------------------------------------------------------
+ * MurmurHash2, by Austin Appleby
+
+ * Note - This code makes a few assumptions about how your machine behaves -
+
+ * 1. We can read a 4-byte value from any address without crashing
+ * 2. sizeof(int) == 4
+
+ * And it has a few limitations -
+
+ * 1. It will not work incrementally.
+ * 2. It will not produce the same results on little-endian and big-endian
+ *    machines.
+ */
+
+unsigned int MurmurHash2 ( const void * key, int len, unsigned int seed )
+{
+	/*
+         * 'm' and 'r' are mixing constants generated offline.
+	 * They're not really 'magic', they just happen to work well.
+         */
+
+	const unsigned int m = 0x5bd1e995;
+	const int r = 24;
+
+	/* Initialize the hash to a 'random' value */
+
+	unsigned int h = seed ^ len;
+
+	/* Mix 4 bytes at a time into the hash */
+
+	const unsigned char * data = (const unsigned char *)key;
+
+	while(len >= 4)
+	{
+		unsigned int k = *(unsigned int *)data;
+
+		k *= m;
+		k ^= k >> r;
+		k *= m;
+
+		h *= m;
+		h ^= k;
+
+		data += 4;
+		len -= 4;
+	}
+
+	/* Handle the last few bytes of the input array */
+
+	switch(len)
+	{
+	case 3: h ^= data[2] << 16;
+	case 2: h ^= data[1] << 8;
+	case 1: h ^= data[0];
+	        h *= m;
+	};
+
+	/* Do a few final mixes of the hash to ensure the last few
+	 * bytes are well-incorporated. */
+
+	h ^= h >> 13;
+	h *= m;
+	h ^= h >> 15;
+
+	return h;
+}
+
+#endif
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/sha.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/sha.h
new file mode 100644
index 0000000..16cacf9
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/hash/sha.h
@@ -0,0 +1,200 @@
+/* crypto/sha/sha.h */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef HEADER_SHA_H
+#define HEADER_SHA_H
+
+#include <openssl/e_os2.h>
+#include <stddef.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
+#error SHA is disabled.
+#endif
+
+#if defined(OPENSSL_FIPS)
+#define FIPS_SHA_SIZE_T size_t
+#endif
+
+/*
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
+ * ! SHA_LONG_LOG2 has to be defined along.                        !
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ */
+
+#if defined(__LP32__)
+#define SHA_LONG unsigned long
+#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
+#define SHA_LONG unsigned long
+#define SHA_LONG_LOG2 3
+#else
+#define SHA_LONG unsigned int
+#endif
+
+#define SHA_LBLOCK	16
+#define SHA_CBLOCK	(SHA_LBLOCK*4)	/* SHA treats input data as a
+					 * contiguous array of 32 bit
+					 * wide big-endian values. */
+#define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
+#define SHA_DIGEST_LENGTH 20
+
+typedef struct SHAstate_st
+	{
+	SHA_LONG h0,h1,h2,h3,h4;
+	SHA_LONG Nl,Nh;
+	SHA_LONG data[SHA_LBLOCK];
+	unsigned int num;
+	} SHA_CTX;
+
+#ifndef OPENSSL_NO_SHA0
+int SHA_Init(SHA_CTX *c);
+int SHA_Update(SHA_CTX *c, const void *data, size_t len);
+int SHA_Final(unsigned char *md, SHA_CTX *c);
+unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md);
+void SHA_Transform(SHA_CTX *c, const unsigned char *data);
+#endif
+#ifndef OPENSSL_NO_SHA1
+int SHA1_Init(SHA_CTX *c);
+int SHA1_Update(SHA_CTX *c, const void *data, size_t len);
+int SHA1_Final(unsigned char *md, SHA_CTX *c);
+unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
+void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
+#endif
+
+#define SHA256_CBLOCK	(SHA_LBLOCK*4)	/* SHA-256 treats input data as a
+					 * contiguous array of 32 bit
+					 * wide big-endian values. */
+#define SHA224_DIGEST_LENGTH	28
+#define SHA256_DIGEST_LENGTH	32
+
+typedef struct SHA256state_st
+	{
+	SHA_LONG h[8];
+	SHA_LONG Nl,Nh;
+	SHA_LONG data[SHA_LBLOCK];
+	unsigned int num,md_len;
+	} SHA256_CTX;
+
+#ifndef OPENSSL_NO_SHA256
+int SHA224_Init(SHA256_CTX *c);
+int SHA224_Update(SHA256_CTX *c, const void *data, size_t len);
+int SHA224_Final(unsigned char *md, SHA256_CTX *c);
+unsigned char *SHA224(const unsigned char *d, size_t n,unsigned char *md);
+int SHA256_Init(SHA256_CTX *c);
+int SHA256_Update(SHA256_CTX *c, const void *data, size_t len);
+int SHA256_Final(unsigned char *md, SHA256_CTX *c);
+unsigned char *SHA256(const unsigned char *d, size_t n,unsigned char *md);
+void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
+#endif
+
+#define SHA384_DIGEST_LENGTH	48
+#define SHA512_DIGEST_LENGTH	64
+
+#ifndef OPENSSL_NO_SHA512
+/*
+ * Unlike 32-bit digest algorithms, SHA-512 *relies* on SHA_LONG64
+ * being exactly 64-bit wide. See Implementation Notes in sha512.c
+ * for further details.
+ */
+#define SHA512_CBLOCK	(SHA_LBLOCK*8)	/* SHA-512 treats input data as a
+					 * contiguous array of 64 bit
+					 * wide big-endian values. */
+#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+#define SHA_LONG64 unsigned __int64
+#define U64(C)     C##UI64
+#elif defined(__arch64__)
+#define SHA_LONG64 unsigned long
+#define U64(C)     C##UL
+#else
+#define SHA_LONG64 unsigned long long
+#define U64(C)     C##ULL
+#endif
+
+typedef struct SHA512state_st
+	{
+	SHA_LONG64 h[8];
+	SHA_LONG64 Nl,Nh;
+	union {
+		SHA_LONG64	d[SHA_LBLOCK];
+		unsigned char	p[SHA512_CBLOCK];
+	} u;
+	unsigned int num,md_len;
+	} SHA512_CTX;
+#endif
+
+#ifndef OPENSSL_NO_SHA512
+int SHA384_Init(SHA512_CTX *c);
+int SHA384_Update(SHA512_CTX *c, const void *data, size_t len);
+int SHA384_Final(unsigned char *md, SHA512_CTX *c);
+unsigned char *SHA384(const unsigned char *d, size_t n,unsigned char *md);
+int SHA512_Init(SHA512_CTX *c);
+int SHA512_Update(SHA512_CTX *c, const void *data, size_t len);
+int SHA512_Final(unsigned char *md, SHA512_CTX *c);
+unsigned char *SHA512(const unsigned char *d, size_t n,unsigned char *md);
+void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk.c
new file mode 100644
index 0000000..d57040a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk.c
@@ -0,0 +1,155 @@
+
+/*
+ * 2010 (C) Marcus Clyne
+ */
+
+#include    <ndk.h>
+
+#include    <ndk_config.c>
+
+
+#if (NDK_HTTP_PRE_CONFIG)
+static  ngx_int_t   ndk_http_preconfiguration    (ngx_conf_t *cf);
+#endif
+#if (NDK_HTTP_POST_CONFIG)
+static  ngx_int_t   ndk_http_postconfiguration   (ngx_conf_t *cf);
+#endif
+#if (NDK_HTTP_CREATE_MAIN_CONF)
+static void *       ndk_http_create_main_conf    (ngx_conf_t *cf);
+#endif
+#if (NDK_HTTP_INIT_MAIN_CONF)
+static char *       ndk_http_init_main_conf      (ngx_conf_t *cf, void *conf);
+#endif
+#if (NDK_HTTP_CREATE_SRV_CONF)
+static void *       ndk_http_create_srv_conf     (ngx_conf_t *cf);
+#endif
+#if (NDK_HTTP_MERGE_SRV_CONF)
+static char *       ndk_http_merge_srv_conf      (ngx_conf_t *cf, void *parent, void *child);
+#endif
+#if (NDK_HTTP_CREATE_LOC_CONF)
+static void *       ndk_http_create_loc_conf     (ngx_conf_t *cf);
+#endif
+#if (NDK_HTTP_MERGE_LOC_CONF)
+static char *       ndk_http_merge_loc_conf      (ngx_conf_t *cf, void *parent, void *child);
+#endif
+
+
+#if (NDK_HTTP_INIT_MASTER)
+static ngx_int_t    ndk_http_init_master         (ngx_log_t *log);
+#endif
+#if (NDK_HTTP_INIT_MODULE)
+static ngx_int_t    ndk_http_init_module         (ngx_cycle_t *cycle);
+#endif
+#if (NDK_HTTP_INIT_PROCESS)
+static ngx_int_t    ndk_http_init_process        (ngx_cycle_t *cycle);
+#endif
+#if (NDK_HTTP_EXIT_PROCESS)
+static void         ndk_http_exit_process        (ngx_cycle_t *cycle);
+#endif
+#if (NDK_HTTP_EXIT_MASTER)
+static void         ndk_http_exit_master         (ngx_cycle_t *cycle);
+#endif
+
+
+ngx_http_module_t   ndk_http_module_ctx = {
+
+#if (NDK_HTTP_PRE_CONFIG)
+    ndk_http_preconfiguration,
+#else
+    NULL,
+#endif
+#if (NDK_HTTP_POST_CONFIG)
+    ndk_http_postconfiguration,
+#else
+    NULL,
+#endif
+
+#if (NDK_HTTP_CREATE_MAIN_CONF)
+    ndk_http_create_main_conf,
+#else
+    NULL,
+#endif
+#if (NDK_HTTP_INIT_MAIN_CONF)
+    ndk_http_merge_main_conf,
+#else
+    NULL,
+#endif
+
+#if (NDK_HTTP_CREATE_SVR_CONF)
+    ndk_http_create_srv_conf,
+#else
+    NULL,
+#endif
+#if (NDK_HTTP_MERGE_SVR_CONF)
+    ndk_http_merge_srv_conf,
+#else
+    NULL,
+#endif
+
+#if (NDK_HTTP_CREATE_LOC_CONF)
+    ndk_http_create_loc_conf,
+#else
+    NULL,
+#endif
+#if (NDK_HTTP_MERGE_LOC_CONF)
+    ndk_http_merge_loc_conf,
+#else
+    NULL,
+#endif
+
+};
+
+ngx_module_t          ndk_http_module = {
+
+    NGX_MODULE_V1,
+    &ndk_http_module_ctx,          /* module context */
+    ndk_http_commands,             /* module directives */
+    NGX_HTTP_MODULE,               /* module type */
+
+#if (NDK_HTTP_INIT_MASTER)
+    ndk_http_init_master,
+#else
+    NULL,
+#endif
+
+#if (NDK_HTTP_INIT_MODULE)
+    ndk_http_init_module,
+#else
+    NULL,
+#endif
+#if (NDK_HTTP_INIT_PROCESS)
+    ndk_http_init_process,
+#else
+    NULL,
+#endif
+
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+
+#if (NDK_HTTP_EXIT_PROCESS)
+    ndk_http_exit_process,
+#else
+    NULL,
+#endif
+#if (NDK_HTTP_EXIT_MASTER)
+    ndk_http_exit_master,
+#else
+    NULL,
+#endif
+    NGX_MODULE_V1_PADDING
+};
+
+
+
+#if (NDK_HTTP_CREATE_MAIN_CONF)
+static void *
+ndk_http_create_main_conf (ngx_conf_t *cf)
+{
+    ndk_http_main_conf_t    *mcf;
+
+    ndk_pcallocp_rce (mcf, cf->pool);
+
+    return  mcf;
+}
+#endif
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk.h
new file mode 100644
index 0000000..e08dfac
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk.h
@@ -0,0 +1,53 @@
+ 
+/*
+ * 2010 (C) Marcus Clyne
+*/
+
+
+#ifndef NDK_H
+#define NDK_H
+
+
+#include    <ngx_config.h>
+#include    <ngx_core.h>
+#include    <ngx_http.h>
+
+
+#define     ndk_version     3004
+#define     NDK_VERSION     "0.3.4"
+
+
+#if (NGX_DEBUG)
+#ifndef     NDK_DEBUG
+#define     NDK_DEBUG 1
+#endif
+#else
+#ifndef     NDK_DEBUG
+#define     NDK_DEBUG 0
+#endif
+#endif
+
+
+#include    <ndk_config.h>
+
+
+#if (NDK_HTTP_CREATE_MAIN_CONF)
+
+#define     ndk_http_conf_get_main_conf(cf)   ngx_http_conf_get_module_main_conf (cf, ndk_http_module)
+#define     ndk_http_get_main_conf(r)         ngx_http_get_module_main_conf (r, ndk_http_module)
+
+typedef struct {
+#if (NDK_UPSTREAM_LIST)
+    ngx_array_t         *upstreams;
+#endif
+} ndk_http_main_conf_t;
+
+#endif /* NDK_HTTP_CREATE_MAIN_CONF */
+
+#include    <ndk_includes.h>
+
+
+extern  ngx_module_t    ndk_http_module;
+
+
+#endif
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_buf.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_buf.c
new file mode 100644
index 0000000..c491f72
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_buf.c
@@ -0,0 +1,43 @@
+
+ngx_int_t
+ndk_copy_chain_to_str (ngx_pool_t *pool, ngx_chain_t *in, ngx_str_t *str)
+{
+    ngx_chain_t     *cl;
+    size_t           len;
+    u_char          *p;
+    ngx_buf_t       *b;
+    
+    len = 0;
+    for (cl = in; cl; cl = cl->next)
+        len += ngx_buf_size (cl->buf);
+    
+    ndk_palloc_re (p, pool, len + 1);
+    
+    str->data = p;
+    str->len = len;
+    
+    for (cl = in; cl; cl = cl->next) {
+        
+        b = cl->buf;
+        
+        if (ngx_buf_in_memory (b)) {
+            p = ngx_cpymem (p, b->pos, b->last - b->pos);
+        }
+    }
+    
+    *p = '\0';
+    
+    return  NGX_OK;
+}
+
+
+char *
+ndk_copy_chain_to_charp (ngx_pool_t *pool, ngx_chain_t *in)
+{
+    ngx_str_t   str;
+    
+    if (ndk_copy_chain_to_str (pool, in, &str) != NGX_OK)
+        return  NULL;
+    
+    return  (char *) str.data;
+}
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_buf.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_buf.h
new file mode 100644
index 0000000..e6334ad
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_buf.h
@@ -0,0 +1,5 @@
+
+
+ngx_int_t   ndk_copy_chain_to_str   (ngx_pool_t *pool, ngx_chain_t *in, ngx_str_t *str);
+char *      ndk_copy_chain_to_charp (ngx_pool_t *pool, ngx_chain_t *in);
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_path.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_path.c
new file mode 100644
index 0000000..8b32713
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_path.c
@@ -0,0 +1,129 @@
+
+
+ndk_http_complex_path_value_t     ndk_empty_http_complex_path_value = {{0,NULL},0};
+
+
+ngx_int_t
+ndk_http_complex_path_value_compile (ngx_conf_t *cf, ngx_http_complex_value_t *cv, ngx_str_t *value, ngx_uint_t prefix)
+{
+    ngx_http_compile_complex_value_t   ccv;
+
+    ngx_memzero (&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = value;
+    ccv.complex_value = cv;
+
+    switch (prefix) {
+
+    case    1 :
+        ccv.root_prefix = 1;
+        break;
+
+    case    2 :
+        ccv.conf_prefix = 1;
+        break;
+    }
+
+    ndk_path_to_dir_safe (value, 1, 0);
+
+    if (!value->len)
+        return  NGX_OK;
+
+    return  ngx_http_compile_complex_value (&ccv);
+}
+
+
+
+ngx_array_t *
+ndk_http_complex_path_create_compile (ngx_conf_t *cf, ngx_str_t *path, ngx_uint_t prefix)
+{
+    ndk_http_complex_path_elt_t     *cpe;
+    ngx_array_t                     *a;
+    ngx_int_t                        n;
+    u_char                          *m, *s, *e;
+    ngx_str_t                        value;
+
+    n = ndk_strcntc (path, ':') + 1;
+
+    a = ngx_array_create (cf->pool, n, sizeof (ndk_http_complex_path_elt_t));
+    if (a == NULL) {
+        return  NULL;
+    }
+
+    s = path->data;
+    e = s + path->len;
+
+
+    while (s < e) {
+
+        m = s;
+
+        while (m < e && *m != ':') m++;
+
+        if (m == s) {
+            s = m+1;
+            continue;
+        }
+
+        cpe = ngx_array_push (a);
+        if (cpe == NULL) {
+            return  NULL;
+        }
+
+        if (*s == '#') {
+            s++;
+            cpe->dynamic = 1;
+        } else {
+            cpe->dynamic = 0;
+        }
+
+        value.data = s;
+        value.len = m - s;
+
+        if (ndk_http_complex_path_value_compile (cf, &cpe->val, &value, prefix) == NGX_ERROR)
+            return  NULL;
+
+        s = m+1;
+    }
+
+    return  a;
+}
+
+
+
+
+char *
+ndk_conf_set_http_complex_path_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t                   *path;
+    ngx_conf_post_t             *post;
+    ndk_http_complex_path_t     *cp;
+
+    cp = (ndk_http_complex_path_t *) (p + cmd->offset);
+
+    if (cp->a != NGX_CONF_UNSET_PTR) {
+        return  "is duplicate";
+    }
+
+    path = cf->args->elts;
+    path++;
+
+    cp->a = ndk_http_complex_path_create_compile (cf, path, cp->prefix);
+    if (cp->a == NULL) {
+        /* TODO : log */
+        return  NGX_CONF_ERROR;
+    }
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, cp->a);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_path.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_path.h
new file mode 100644
index 0000000..eb93d1f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_path.h
@@ -0,0 +1,30 @@
+
+
+typedef struct {
+    ngx_array_t                    *a;
+    ngx_uint_t                      prefix;
+} ndk_http_complex_path_t;
+
+typedef struct {
+    ngx_http_complex_value_t        val;
+    ngx_flag_t                      dynamic;
+} ndk_http_complex_path_elt_t;
+
+typedef struct {
+    ngx_str_t                       val;
+    ngx_flag_t                      dynamic;
+} ndk_http_complex_path_value_t;
+
+typedef struct {
+    ndk_http_complex_path_value_t  *elts;
+    ngx_uint_t                      nelts;
+} ndk_http_complex_path_values_t;
+
+
+extern  ndk_http_complex_path_value_t     ndk_empty_http_complex_path_value;
+
+
+ngx_array_t *   ndk_http_complex_path_create_compile     (ngx_conf_t *cf, ngx_str_t *path, ngx_uint_t prefix);
+ngx_int_t       ndk_http_complex_path_value_compile      (ngx_conf_t *cf, ngx_http_complex_value_t *cv, 
+                                                                    ngx_str_t *value, ngx_uint_t prefix);
+char *          ndk_conf_set_http_complex_path_slot      (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_value.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_value.c
new file mode 100644
index 0000000..97681ff
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_value.c
@@ -0,0 +1,192 @@
+
+
+
+ngx_int_t
+ndk_http_complex_value_compile (ngx_conf_t *cf, ngx_http_complex_value_t *cv, ngx_str_t *value)
+{
+    ngx_http_compile_complex_value_t   ccv;
+
+    ngx_memzero (&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = value;
+    ccv.complex_value = cv;
+
+    return  ngx_http_compile_complex_value (&ccv);
+}
+
+
+
+
+ngx_array_t *
+ndk_http_complex_value_array_create (ngx_conf_t *cf, char **s, ngx_int_t n)
+{
+    ngx_int_t                    i;
+    ngx_http_complex_value_t    *cv;
+    ngx_array_t                 *a;
+    ngx_str_t                    value;
+
+    a = ngx_array_create (cf->pool, n, sizeof (ngx_http_complex_value_t));
+    if (a == NULL)
+        return  NULL;
+
+
+    for (i=0; i<n; i++, s++) {
+
+        cv = ngx_array_push (a);
+
+        value.data = (u_char *) *s;
+        value.len = strlen (*s);
+
+        if (ndk_http_complex_value_compile (cf, cv, &value))
+            return  NULL;
+    }
+
+    return  a;
+}
+
+
+
+ngx_int_t
+ndk_http_complex_value_array_compile (ngx_conf_t *cf, ngx_array_t *a)
+{
+    ngx_uint_t                  i;
+    ngx_http_complex_value_t   *cv;
+
+    if (a == NULL || a == NGX_CONF_UNSET_PTR) {
+        return  NGX_ERROR;
+    }
+
+    cv = a->elts;
+
+    for (i=0; i<a->nelts; i++, cv++) {
+
+        if (ndk_http_complex_value_compile (cf, cv, &cv->value))
+            return  NGX_ERROR;
+    }
+
+    return  NGX_OK;
+}
+
+
+
+char *
+ndk_conf_set_http_complex_value_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_http_complex_value_t    *cv;
+    ngx_str_t                   *value;
+    ngx_conf_post_t             *post;
+
+    cv = (ngx_http_complex_value_t *) (p + cmd->offset);
+
+    if (cv->value.data) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    if (ndk_http_complex_value_compile (cf, cv, value + 1))
+        return  NGX_CONF_ERROR;
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, cv);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_http_complex_value_array_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char *p = conf;
+
+    ngx_str_t                   *value;
+    ngx_http_complex_value_t    *cv;
+    ngx_array_t                **a;
+    ngx_conf_post_t             *post;
+    ngx_uint_t                   i, alloc;
+
+    a = (ngx_array_t **) (p + cmd->offset);
+
+    if (*a == NULL || *a == NGX_CONF_UNSET_PTR) {
+
+        alloc = cf->args->nelts > 4 ? cf->args->nelts : 4;
+
+        *a = ngx_array_create (cf->pool, alloc, sizeof (ngx_http_complex_value_t));
+        if (*a == NULL) {
+            return  NGX_CONF_ERROR;
+        }
+    }
+
+    value = cf->args->elts;
+
+    for (i=1; i<cf->args->nelts; i++) {
+
+        cv = ngx_array_push (*a);
+        if (cv == NULL) {
+            return  NGX_CONF_ERROR;
+        }
+
+        if (ndk_http_complex_value_compile (cf, cv, &value[i]) == NGX_ERROR)
+            return  NGX_CONF_ERROR;
+    }
+
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, a);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+char *
+ndk_conf_set_http_complex_keyval_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char *p = conf;
+
+    ngx_str_t                   *value;
+    ndk_http_complex_keyval_t   *ckv;
+    ngx_array_t                **a;
+    ngx_conf_post_t             *post;
+    ngx_int_t                    alloc;
+
+    a = (ngx_array_t **) (p + cmd->offset);
+
+    if (*a == NULL || *a == NGX_CONF_UNSET_PTR) {
+
+        alloc = cf->args->nelts > 4 ? cf->args->nelts : 4;
+
+        *a = ngx_array_create (cf->pool, alloc, sizeof (ndk_http_complex_keyval_t));
+        if (*a == NULL) {
+            return  NGX_CONF_ERROR;
+        }
+    }
+
+    ckv = ngx_array_push (*a);
+    if (ckv == NULL) {
+        return  NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    ckv->key = value[1];
+
+    if (ndk_http_complex_value_compile (cf, &ckv->value, &value[2]) == NGX_ERROR)
+        return  NGX_CONF_ERROR;
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, a);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+/* TODO : complex keyval1 */
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_value.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_value.h
new file mode 100644
index 0000000..4178d62
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_complex_value.h
@@ -0,0 +1,21 @@
+
+
+typedef struct {
+    ngx_str_t                   key;
+    ngx_http_complex_value_t    value;
+} ndk_http_complex_keyval_t;
+
+
+
+/* create/compile functions */
+
+ngx_int_t      ndk_http_complex_value_compile        (ngx_conf_t *cf, ngx_http_complex_value_t *cv, ngx_str_t *value);
+ngx_array_t *  ndk_http_complex_value_array_create   (ngx_conf_t *cf, char **s, ngx_int_t n);
+ngx_int_t      ndk_http_complex_value_array_compile  (ngx_conf_t *cf, ngx_array_t *a);
+
+
+/* conf set slot functions */
+
+char *  ndk_conf_set_http_complex_keyval_slot        (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_http_complex_value_slot         (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_http_complex_value_array_slot   (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_conf_file.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_conf_file.c
new file mode 100644
index 0000000..980641c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_conf_file.c
@@ -0,0 +1,396 @@
+
+
+/* NOTE : you will find other conf_set functions in the following files :
+ *
+ * complex_value.c
+ * encoding.c
+ * path.c
+ *
+ */
+
+
+char *
+ndk_conf_set_true_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_flag_t       *fp;
+    ngx_conf_post_t  *post;
+
+    fp = (ngx_flag_t*) (p + cmd->offset);
+
+    if (*fp != NGX_CONF_UNSET) {
+        return  "is duplicate";
+    }
+
+    *fp = 1;
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, fp);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_false_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_flag_t       *fp;
+    ngx_conf_post_t  *post;
+
+    fp = (ngx_flag_t*) (p + cmd->offset);
+
+    if (*fp != NGX_CONF_UNSET) {
+        return  "is duplicate";
+    }
+
+    *fp = 0;
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, fp);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
+
+char *
+ndk_conf_set_ptr_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    void  **ptr;
+
+    ptr = (void**) (p + cmd->offset);
+
+    if (*ptr != NGX_CONF_UNSET_PTR) {
+        return  "is duplicate";
+    }
+
+    *ptr = cmd->post;
+
+    return  NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_null_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    void            **pp;
+    ngx_conf_post_t  *post;
+
+    pp = (void **) (p + cmd->offset);
+
+    if (*pp != NGX_CONF_UNSET_PTR) {
+        return  "is duplicate";
+    }
+
+    *pp = NULL;
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, pp);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+char *
+ndk_conf_set_num64_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    int64_t          *np;
+    ngx_str_t        *value;
+    ngx_conf_post_t  *post;
+
+
+    np = (int64_t *) (p + cmd->offset);
+
+    if (*np != NGX_CONF_UNSET) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+    *np = ndk_atoi64 (value[1].data, value[1].len);
+    if (*np == NGX_ERROR) {
+        return "invalid number";
+    }
+
+    if (cmd->post) {
+        post = cmd->post;
+        return post->post_handler(cf, post, np);
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+char *
+ndk_conf_set_str_array_multi_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t         *value, *s;
+    ngx_array_t      **a;
+    ngx_conf_post_t   *post;
+    ngx_uint_t         i;
+
+    a = (ngx_array_t **) (p + cmd->offset);
+
+    if (*a == NGX_CONF_UNSET_PTR) {
+        *a = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t));
+        if (*a == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    s = NULL;
+
+    for (i=cf->args->nelts-1; i; i--) {
+
+        s = ngx_array_push(*a);
+        if (s == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        value = cf->args->elts;
+
+        *s = value[i];
+    }
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler(cf, post, s);
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_keyval1_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t           *value;
+    ngx_keyval_t        *kv;
+    ngx_conf_post_t     *post;
+
+    kv = (ngx_keyval_t *) (p + cmd->offset);
+
+    if (kv->key.data)
+        return  "is duplicate";
+
+    value = cf->args->elts;
+
+    kv->key = value[1];
+    kv->value = value[2];
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, kv);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_num_flag_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_int_t        *np;
+    ngx_str_t        *value;
+    ngx_conf_post_t  *post;
+
+    np = (ngx_int_t *) (p + cmd->offset);
+
+    if (*np != NGX_CONF_UNSET) {
+        return  "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    if (ngx_strcasecmp (value[1].data, (u_char *) "on") == 0) {
+        *np = NDK_CONF_SET_TRUE;
+
+    } else if (ngx_strcasecmp (value[1].data, (u_char *) "off") == 0) {
+        *np = NDK_CONF_SET_FALSE;
+
+    } else {
+        *np = ngx_atoi (value[1].data, value[1].len);
+        if (*np == NGX_ERROR) {
+            return  "invalid number and not 'on'/'off'";
+        }
+    }
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, np);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_sec_flag_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    time_t              *tp;
+    ngx_str_t           *value;
+    ngx_conf_post_t     *post;
+
+    tp = (time_t *) (p + cmd->offset);
+
+    if (*tp != NGX_CONF_UNSET) {
+        return  "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    if (ngx_strcasecmp (value[1].data, (u_char *) "on") == 0) {
+        *tp = NDK_CONF_SET_TRUE;
+
+    } else if (ngx_strcasecmp (value[1].data, (u_char *) "off") == 0) {
+        *tp = NDK_CONF_SET_FALSE;
+
+    } else {
+        *tp = ngx_parse_time (&value[1], 1);
+        if (*tp == NGX_ERROR) {
+            return  "has an invalid time and not 'on'/'off'";
+        }
+    }
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, tp);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
+ngx_http_conf_ctx_t *
+ndk_conf_create_http_location (ngx_conf_t *cf)
+{
+    ngx_http_conf_ctx_t          *ctx, *pctx;
+    void                         *mconf;
+    ngx_http_core_loc_conf_t     *clcf, *pclcf;
+    ngx_uint_t                    i;
+    ngx_http_module_t            *module;
+
+    ndk_pcallocp_rce (ctx, cf->pool);
+
+    pctx = cf->ctx;
+    ctx->main_conf = pctx->main_conf;
+    ctx->srv_conf = pctx->srv_conf;
+
+    ndk_pcalloc_rce (ctx->loc_conf, cf->pool, sizeof(void *) * ngx_http_max_module);
+
+
+    for (i = 0; ngx_modules[i]; i++) {
+        if (ngx_modules[i]->type != NGX_HTTP_MODULE) {
+            continue;
+        }
+
+        module = ngx_modules[i]->ctx;
+
+        if (module->create_loc_conf) {
+
+            mconf = module->create_loc_conf(cf);
+            if (mconf == NULL) {
+                 return NGX_CONF_ERROR;
+            }
+
+            ctx->loc_conf[ngx_modules[i]->ctx_index] = mconf;
+        }
+    }
+
+    pclcf = pctx->loc_conf[ngx_http_core_module.ctx_index];
+
+    clcf = ctx->loc_conf[ngx_http_core_module.ctx_index];
+    clcf->loc_conf = ctx->loc_conf;
+    clcf->name = pclcf->name;
+    clcf->noname = 1;
+
+    if (ngx_http_add_location(cf, &pclcf->locations, clcf) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    return  ctx;
+}
+
+
+ngx_http_conf_ctx_t *
+ngx_conf_create_http_named_location (ngx_conf_t *cf, ngx_str_t *name)
+{
+    ngx_http_conf_ctx_t          *ctx;
+    ngx_http_core_loc_conf_t     *clcf;
+
+    ctx = ndk_conf_create_http_location (cf);
+    if (ctx == NGX_CONF_ERROR)
+        return  NGX_CONF_ERROR;
+
+    clcf = ctx->loc_conf[ngx_http_core_module.ctx_index];
+
+    /* in case the developer forgets to add '@' at the beginning of the named location */
+
+    if (name->data[0] != '@' && ndk_catstrf (cf->pool, name, "sS", "@", name) == NULL)
+        return  NGX_CONF_ERROR;
+
+    clcf->name = *name;     /* TODO : copy? */
+    clcf->noname = 0;
+    clcf->named = 1;
+
+    return  ctx;
+}
+
+
+ngx_int_t
+ndk_replace_command (ngx_command_t *new_cmd, ngx_uint_t module_type)
+{
+    ngx_uint_t       i;
+    ngx_command_t   *cmd;
+
+    for (i = 0; ngx_modules[i]; i++) {
+
+        if (ngx_modules[i]->type != module_type)
+            continue;
+
+        cmd = ngx_modules[i]->commands;
+        if (cmd == NULL) {
+            continue;
+        }
+
+        for ( /* void */ ; cmd->name.len; cmd++) {
+
+            if (ndk_cmpstr (&new_cmd->name, &cmd->name) == 0) {
+
+                ndk_memcpyp (cmd, new_cmd);
+                return  NGX_OK;
+            }
+        }
+    }
+
+    return  NGX_DECLINED;
+}
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_conf_file.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_conf_file.h
new file mode 100644
index 0000000..6956b17
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_conf_file.h
@@ -0,0 +1,44 @@
+
+
+/* conf set functions */
+
+char *  ndk_conf_set_true_slot              (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_false_slot             (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_full_path_slot         (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_ptr_slot               (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_null_slot              (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_str_array_multi_slot   (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_keyval1_slot           (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_num_flag               (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_num64_slot             (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_sec_flag_slot          (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
+ngx_http_conf_ctx_t *   ndk_conf_create_http_location           (ngx_conf_t *cf);
+ngx_http_conf_ctx_t *   ngx_conf_create_http_named_location     (ngx_conf_t *cf, ngx_str_t *name);
+
+ngx_int_t               ndk_replace_command     (ngx_command_t *new_cmd, ngx_uint_t module_type);
+
+
+/* values for conf_set_xxx_flag */
+
+#define     NDK_CONF_SET_TRUE       -2
+#define     NDK_CONF_SET_FALSE      -3
+
+
+/* wrappers for utility macros */
+
+#define     ndk_conf_set_bitmask_slot       ngx_conf_set_bitmask_slot
+#define     ndk_conf_set_bufs_slot          ngx_conf_set_bufs_slot
+#define     ndk_conf_set_enum_slot          ngx_conf_set_enum_slot
+#define     ndk_conf_set_flag_slot          ngx_conf_set_flag_slot
+#define     ndk_conf_set_keyval_slot        ngx_conf_set_keyval_slot
+#define     ndk_conf_set_msec_slot          ngx_conf_set_msec_slot
+#define     ndk_conf_set_num_slot           ngx_conf_set_num_slot
+#define     ndk_conf_set_off_slot           ngx_conf_set_off_slot
+#define     ndk_conf_set_sec_slot           ngx_conf_set_sec_slot
+#define     ndk_conf_set_size_slot          ngx_conf_set_size_slot
+#define     ndk_conf_set_str_slot           ngx_conf_set_str_slot
+
+
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_debug.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_debug.c
new file mode 100644
index 0000000..e0251cc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_debug.c
@@ -0,0 +1,72 @@
+
+#if (NGX_DEBUG)
+
+void
+ndk_debug_helper (const char *func, const char *fmt, ...)
+{
+    size_t   len, flen, tlen;
+    char    *s, *p, *e;
+
+    /* check to see if the format is empty */
+
+    flen = strlen (fmt);
+
+    /* build func name */
+
+    len = strlen (func);
+
+    if (flen == 0)
+        tlen = len + 1;
+    else
+
+    char    func_name [len + flen + 1];
+
+    s = func_name;
+    e = s + len;
+
+    memcpy (s, func, len);
+
+    /* remove initial ngx_ */
+
+    if (strncmp (s, "ngx_", 4) == 0)
+        s += 4;
+
+    /* replace '_' with ' ' */
+
+    for (p=s; p<e; p++) {
+        if (*p == '_')
+            *p = ' ';
+    }
+
+    vfprintf (stderr, const char *format, va_list ap)
+}
+
+
+void
+ndk_debug_request_helper (const char *func, ngx_http_request_t *r)
+{
+    ngx_http_posted_request_t       *pr;
+
+    /* TODO : improve the format */
+
+    fprintf (stderr, "%s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
+            func,
+            (int) r->method_name.len, r->method_name.data,
+            (int) r->uri.len, r->uri.data,
+            (int) r->args.len, r->args.data,
+            0/*(int) r->main->count*/, r->main,
+            r, r->connection->data, r->parent);
+
+    if (r->posted_requests) {
+        fprintf(stderr, " posted:");
+
+        for (pr = r->posted_requests; pr; pr = pr->next) {
+            fprintf (stderr, "%p,", pr);
+        }
+    }
+
+    fprintf (stderr, "\n");
+}
+
+
+#endif
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_debug.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_debug.h
new file mode 100644
index 0000000..883a6eb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_debug.h
@@ -0,0 +1,171 @@
+#ifndef NDK_DEBUG_H
+#define NDK_DEBUG_H
+
+
+/* TODO : use the Nginx printf function */
+
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+/* TODO
+- andk_debug variety of debugging formats
+- global include file for all debugging - can pass declaration to cflags for the option
+*/
+
+
+#if (NDK_DEBUG)
+
+    #if (NGX_HAVE_VARIADIC_MACROS)
+
+        #define ndk_debug(...)  ndk_debug_helper (__func__,__VA_ARGS__)
+
+        #define ndk_debug_helper(func,...) \
+            fprintf(stderr, "%-60s", func); \
+            fprintf(stderr, (const char *)__VA_ARGS__); \
+            fprintf(stderr,"\n");
+            /*fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)*/
+
+    #else
+
+        /* NOTE : these includes might not be necessary since they're probably included with the core */
+
+        #include <stdarg.h>
+        #include <stdio.h>
+        #include <stdarg.h>
+
+        static void ndk_debug (const char * fmt, ...) {
+        }
+
+    #endif
+
+    #if NDK_DEBUG > 1
+
+        #define ndk_debug_request()  ndk_debug_request_helper(r, __func__)
+
+        static ngx_inline void
+        ndk_debug_request_helper (ngx_http_request_t *r, const char *func)
+        {
+            ngx_http_posted_request_t       *pr;
+
+            /* TODO : improve the format */
+
+            fprintf (stderr, "%s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
+                    func,
+                    (int) r->method_name.len, r->method_name.data,
+                    (int) r->uri.len, r->uri.data,
+                    (int) r->args.len, r->args.data,
+                    0/*(int) r->main->count*/, r->main,
+                    r, r->connection->data, r->parent);
+
+            if (r->posted_requests) {
+                fprintf(stderr, " posted:");
+
+                for (pr = r->posted_requests; pr; pr = pr->next) {
+                    fprintf (stderr, "%p,", pr);
+                }
+            }
+
+            fprintf (stderr, "\n");
+        }
+
+
+    #else
+
+        #define ndk_debug_request()
+
+    #endif
+
+
+    static ngx_inline void
+    ndk_debug_print_posted_requests (ngx_http_request_t *r)
+    {
+        ngx_http_posted_request_t   *pr;
+
+        ndk_request_log_debug_http (r, "ndk debug - http posted requests");
+
+        for (pr = r->main->posted_requests; pr; pr = pr->next) {
+
+            if (!pr->request)
+                continue;
+
+            ndk_request_log_debug_http (r, "ndk debug - http posted request:%V", &pr->request->uri);
+        }
+    }
+
+
+    #define ndk_debug_http_conf_location(cf)    ndk_debug_http_conf_location_helper (cf, __func__)
+
+    static ngx_inline void
+    ndk_debug_http_conf_location_helper (ngx_conf_t *cf, const char *func)
+    {
+        ngx_http_core_loc_conf_t        *lcf;
+
+        lcf = ngx_http_conf_get_module_loc_conf (cf, ngx_http_core_module);
+
+        ndk_debug_helper (func, "[%s]", lcf->name.data);
+    }
+
+    /*
+    static void
+    ndk_debug_log_chain (ngx_log_t *log, ngx_chain_t *cl)
+    {
+
+
+    }
+    */
+
+#else
+
+    #if (NGX_HAVE_VARIADIC_MACROS)
+
+        #define     ndk_debug(...)
+        #define     ndk_debug_request()
+
+    #else
+
+        #include <stdarg.h>
+
+        static void ndk_debug (const char * fmt, ...) {
+        }
+
+        static void ndk_debug_request() {
+        }
+
+    #endif
+
+    #define     ndk_debug_http_conf_location(cf)
+
+#endif
+
+#if (NDK_DEBUG)
+
+    #define     ndk_debug_check_read_event_handler(r)                               \
+                                                                                    \
+                    ndk_debug("r->read_event_handler = %s",                         \
+                        r->read_event_handler == ngx_http_block_reading ?           \
+                            "ngx_http_block_reading" :                              \
+                        r->read_event_handler == ngx_http_test_reading ?            \
+                            "ngx_http_test_reading" :                               \
+                        r->read_event_handler == ngx_http_request_empty_handler ?   \
+                            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+    #define     ndk_debug_check_write_event_handler(r)                              \
+                                                                                    \
+                    ndk_debug ("r->write_event_handler = %s",                       \
+                        r->write_event_handler == ngx_http_handler ?                \
+                            "ngx_http_handler" :                                    \
+                        r->write_event_handler == ngx_http_core_run_phases ?        \
+                            "ngx_http_core_run_phases" :                            \
+                        r->write_event_handler == ngx_http_request_empty_handler ?  \
+                            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#else
+
+    #define     ndk_debug_check_read_event_handler(r)
+    #define     ndk_debug_check_write_event_handler(r)
+
+#endif
+
+#endif /* NDK_DEBUG_H */
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_encoding.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_encoding.c
new file mode 100644
index 0000000..4a07872
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_encoding.c
@@ -0,0 +1,57 @@
+
+
+
+char *
+ndk_conf_set_encoding_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char    *p = conf;
+
+    ndk_encoding_t  *ep;
+    ngx_str_t       *value;
+    size_t           len;
+    iconv_t          ic;
+
+    ep = (ndk_encoding_t *) (p + cmd->offset);
+    if (ep->from && ep->to)
+        return  "is duplicate";
+
+    value = cf->args->elts;
+
+
+    if (ep->from) {
+
+        ep->to = (char *) value[1].data;
+        len = strlen (ep->from);
+
+    } else if (ep->to) {
+
+        ep->from = (char *) value[1].data;
+        len = strlen (ep->to);
+
+    } else {
+        return  "has no base encoding";
+    }
+
+
+    if (len == value[1].len && !strncasecmp (ep->to, ep->from, len)) {
+
+        ngx_log_error (NGX_LOG_WARN, cf->log, 0, 
+            "\"%V\" '%V' encoding is ignored (no conversion)", &value[0], &value[1]);
+
+        return  NGX_CONF_OK;
+    }
+
+
+    ic = iconv_open (ep->to, ep->from);
+    if (ic == (iconv_t)-1)
+        return  "has an invalid encoding";
+
+
+    if (iconv_close (ic)) {
+        ngx_log_error (NGX_LOG_EMERG, cf->log, errno, "iconv_close()");
+        return  NGX_CONF_ERROR;
+    }
+
+    return  NGX_CONF_OK;
+}
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_encoding.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_encoding.h
new file mode 100644
index 0000000..b295b18
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_encoding.h
@@ -0,0 +1,12 @@
+
+
+#include    <iconv.h>
+
+typedef struct {
+    char        *from;
+    char        *to;
+} ndk_encoding_t;
+
+
+char *  ndk_conf_set_encoding_slot  (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_hash.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_hash.c
new file mode 100644
index 0000000..dec3d41
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_hash.c
@@ -0,0 +1,82 @@
+
+#include <ndk_hash.h>
+
+
+
+/* openssl hashes */
+
+#define     NDK_OPENSSL_HASH(type,ctxt_type,upper)                  \
+    u_char              md [ctxt_type ## _DIGEST_LENGTH];           \
+    ctxt_type ##_CTX    c;                                          \
+                                                                    \
+    type ## _Init (&c);                                             \
+    type ## _Update (&c, data, len);                                \
+    type ## _Final (md, &c);                                        \
+                                                                    \
+    ndk_hex_dump (p, (u_char *) md, ctxt_type ## _DIGEST_LENGTH);   \
+    if (upper) {                                                    \
+        ndk_strtoupper (p, (ctxt_type ## _DIGEST_LENGTH) *2);       \
+    }
+
+
+#ifdef NDK_MD5
+
+void
+ndk_md5_hash (u_char *p, char *data, size_t len)
+{
+    NDK_OPENSSL_HASH (MD5, MD5, 0);
+}
+
+void
+ndk_md5_hash_upper (u_char *p, char *data, size_t len)
+{
+    NDK_OPENSSL_HASH (MD5, MD5, 1);
+}
+
+#endif
+#ifdef NDK_SHA1
+
+void
+ndk_sha1_hash (u_char *p, char *data, size_t len)
+{
+    NDK_OPENSSL_HASH (SHA1, SHA, 0);
+}
+
+void
+ndk_sha1_hash_upper (u_char *p, char *data, size_t len)
+{
+    NDK_OPENSSL_HASH (SHA1, SHA, 1);
+}
+
+#endif
+
+
+
+/* non-openssl hashes */
+
+#ifdef NDK_MURMUR2
+
+#include    "hash/murmurhash2.c"
+
+void
+ndk_murmur2_hash (u_char *p, char *data, size_t len)
+{
+    uint32_t    hash;
+
+    hash = MurmurHash2 (data, len, 47);
+
+    ndk_hex_dump (p, (u_char*) &hash, 4);
+}
+
+void
+ndk_murmur2_hash_upper (u_char *p, char *data, size_t len)
+{
+    uint32_t    hash;
+
+    hash = MurmurHash2 (data, len, 47);
+
+    ndk_hex_dump (p, (u_char*) &hash, 4);
+    ndk_strtoupper (p, 8);
+}
+
+#endif
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_hash.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_hash.h
new file mode 100644
index 0000000..a15e923
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_hash.h
@@ -0,0 +1,45 @@
+
+#ifndef NDK_HASH_H
+#define NDK_HASH_H
+
+#ifdef NDK_HASH_ALL
+
+#ifndef NDK_MD5
+#define NDK_MD5
+#endif
+
+#ifndef NDK_MURMUR2
+#define NDK_MURMUR2
+#endif
+
+#ifndef NDK_SHA1
+#define NDK_SHA1
+#endif
+
+#endif
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+typedef void (*ndk_hash_pt) (u_char *p, char *data, size_t len);
+
+
+#ifdef NDK_MD5
+#include <ngx_md5.h>
+void    ndk_md5_hash            (u_char *p, char *data, size_t len);
+void    ndk_md5_hash_upper      (u_char *p, char *data, size_t len);
+#endif
+
+#ifdef NDK_MURMUR2
+#define MURMURHASH2_DIGEST_LENGTH   4
+void    ndk_murmur2_hash        (u_char *p, char *data, size_t len);
+void    ndk_murmur2_hash_upper  (u_char *p, char *data, size_t len);
+#endif
+
+#ifdef NDK_SHA1
+#include <ngx_sha1.h>
+void    ndk_sha1_hash           (u_char *p, char *data, size_t len);
+void    ndk_sha1_hash_upper     (u_char *p, char *data, size_t len);
+#endif
+
+#endif /* NDK_HASH_H */
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http.c
new file mode 100644
index 0000000..60728bb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http.c
@@ -0,0 +1,138 @@
+
+ngx_uint_t
+ndk_http_count_phase_handlers (ngx_http_core_main_conf_t *cmcf)
+{
+    ngx_http_phase_handler_t    *ph;
+    ngx_uint_t                   i;
+    
+    ph = cmcf->phase_engine.handlers;
+    
+    for (i=0; ph[i].checker; i++) /* void */;
+        
+    return  i;        
+}
+
+
+ngx_uint_t
+ndk_http_parse_request_method (ngx_str_t *m)
+{
+    switch (m->len) {
+
+        case 3:
+            
+#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
+        {
+            u_char    t[4];
+            
+            ngx_memcpy (t, m->data, 3);
+            t[3] = ' ';
+            
+            if (ndk_str3_cmp (t, 'G', 'E', 'T', ' ')) {
+                return  NGX_HTTP_GET;
+            }
+
+            if (ndk_str3_cmp (t, 'P', 'U', 'T', ' ')) {
+                return  NGX_HTTP_PUT;
+            }
+        }
+            
+#else
+
+            if (ndk_str3_cmp (m->data, 'G', 'E', 'T', ' ')) {
+                return  NGX_HTTP_GET;
+            }
+
+            if (ndk_str3_cmp (m->data, 'P', 'U', 'T', ' ')) {
+                return  NGX_HTTP_PUT;
+            }
+
+#endif
+            break;
+
+        case 4:
+            
+            if  (m->data[1] == 'O') {
+
+                if (ndk_str3Ocmp (m->data, 'P', 'O', 'S', 'T')) {
+                    return  NGX_HTTP_POST;
+                }
+
+                if (ndk_str3Ocmp (m->data, 'C', 'O', 'P', 'Y')) {
+                    return  NGX_HTTP_COPY;
+                }
+
+                if (ndk_str3Ocmp (m->data, 'M', 'O', 'V', 'E')) {
+                    return  NGX_HTTP_MOVE;
+                }
+
+                if (ndk_str3Ocmp (m->data, 'L', 'O', 'C', 'K')) {
+                    return  NGX_HTTP_LOCK;
+                }
+
+            } else {
+
+                if (ndk_str4cmp (m->data, 'H', 'E', 'A', 'D')) {
+                    return  NGX_HTTP_HEAD;
+                }
+            }
+
+            break;
+
+        case 5:
+            
+            if (ndk_str5cmp (m->data, 'M', 'K', 'C', 'O', 'L')) {
+                return  NGX_HTTP_MKCOL;
+            }
+
+            if (ndk_str5cmp (m->data, 'P', 'A', 'T', 'C', 'H')) {
+                return  NGX_HTTP_PATCH;
+            }
+
+            if (ndk_str5cmp (m->data, 'T', 'R', 'A', 'C', 'E')) {
+                return  NGX_HTTP_TRACE;
+            }
+
+            break;
+
+        case 6:
+            
+            if (ndk_str6cmp (m->data, 'D', 'E', 'L', 'E', 'T', 'E')) {
+                return  NGX_HTTP_DELETE;
+            }
+
+            if (ndk_str6cmp (m->data, 'U', 'N', 'L', 'O', 'C', 'K')) {
+                return  NGX_HTTP_UNLOCK;
+            }
+
+            break;
+
+        case 7:
+            
+            if (ndk_str7_cmp (m->data, 'O', 'P', 'T', 'I', 'O', 'N', 'S', ' '))
+            {
+                return  NGX_HTTP_OPTIONS;
+            }
+
+            break;
+
+        case 8:
+            
+            if (ndk_str8cmp (m->data, 'P', 'R', 'O', 'P', 'F', 'I', 'N', 'D'))
+            {
+                return  NGX_HTTP_PROPFIND;
+            }
+
+            break;
+
+        case 9:
+            
+            if (ndk_str9cmp (m->data, 'P', 'R', 'O', 'P', 'P', 'A', 'T', 'C', 'H'))
+            {
+                return  NGX_HTTP_PROPPATCH;
+            }
+
+            break;
+    }
+
+    return  0;
+}
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http.h
new file mode 100644
index 0000000..6a9d1c5
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http.h
@@ -0,0 +1,3 @@
+
+ngx_uint_t  ndk_http_count_phase_handlers       (ngx_http_core_main_conf_t *cmcf);
+ngx_uint_t  ndk_http_parse_request_method       (ngx_str_t *m);
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http_headers.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http_headers.h
new file mode 100644
index 0000000..e71c70e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_http_headers.h
@@ -0,0 +1,35 @@
+
+
+/* TODO : organize and add */
+/* TODO : check - should it be r->main? */
+
+#define     ndk_http_uri(r)                         (r)->uri
+#define     ndk_http_request_uri(r)                 (r)->unparsed_uri
+
+#define     ndk_http_header_in(r,name)              ((r)->headers_in.name ? &(r)->headers_in.name->value : NULL)
+#define     ndk_http_header_out(r,name)             ((r)->headers_out.name ? &(r)->headers_out.name->value : NULL)
+
+#define     ndk_http_host_header(r)                 ndk_http_header_in (r, host)
+#define     ndk_http_connection_header(r)           ndk_http_header_in (r, connection)
+#define     ndk_http_if_modified_since_header(r)    ndk_http_header_in (r, if_modified_since)
+#define     ndk_http_user_agent_header(r)           ndk_http_header_in (r, user_agent)
+#define     ndk_http_referer_header(r)              ndk_http_header_in (r, referer)
+#define     ndk_http_content_length_header(r)       ndk_http_header_in (r, content_length)
+#define     ndk_http_content_type_header(r)         ndk_http_header_in (r, content_type)
+#define     ndk_http_range_header(r)                ndk_http_header_in (r, range)
+#define     ndk_http_if_range_header(r)             ndk_http_header_in (r, if_range)
+#define     ndk_http_transfer_encoding_header(r)    ndk_http_header_in (r, transfer_encoding)
+#define     ndk_http_expect_header(r)               ndk_http_header_in (r, expect)
+#define     ndk_http_accept_encoding_header(r)      ndk_http_header_in (r, accept_encoding)
+#define     ndk_http_via_header(r)                  ndk_http_header_in (r, via)
+#define     ndk_http_authorization_header(r)        ndk_http_header_in (r, authorization)
+#define     ndk_http_keep_alive_header(r)           ndk_http_header_in (r, keep_alive)
+#define     ndk_http_x_forwarded_for_header(r)      ndk_http_header_in (r, x_forwarded_for)
+#define     ndk_http_x_real_ip_header(r)            ndk_http_header_in (r, x_real_ip)
+#define     ndk_http_accept_header(r)               ndk_http_header_in (r, accept)
+#define     ndk_http_accept_language_header(r)      ndk_http_header_in (r, accept_language)
+#define     ndk_http_depth_header(r)                ndk_http_header_in (r, depth)
+#define     ndk_http_destination_header(r)          ndk_http_header_in (r, destination)
+#define     ndk_http_overwrite_header(r)            ndk_http_header_in (r, overwrite)
+#define     ndk_http_date_header(r)                 ndk_http_header_in (r, date)
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_log.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_log.c
new file mode 100644
index 0000000..36dca15
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_log.c
@@ -0,0 +1,3 @@
+
+
+/* TODO : the required functions if the compiler does not have variadic macros */
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_log.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_log.h
new file mode 100644
index 0000000..1dd9c22
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_log.h
@@ -0,0 +1,165 @@
+
+/* TODO : fix the conf_log macros */
+
+#define NGX_LOG_DEBUG_SCRIPT        NGX_LOG_DEBUG_HTTP      /* TODO : add new section to log/conf directives */
+
+#define ndk_conf_to_log(cf)         ((cf)->log)
+
+#ifndef ndk_request_to_log
+#define ndk_request_to_log(r)       ((r)->connection->log)
+#endif
+
+
+/*********************************/
+
+#if (NGX_HAVE_C99_VARIADIC_MACROS)
+
+#define ndk_log_stderr(log,...)                     ngx_log_error (NGX_LOG_STDERR, log, 0, __VA_ARGS__)
+#define ndk_log_emerg(log,...)                      ngx_log_error (NGX_LOG_EMERG, log, 0, __VA_ARGS__)
+#define ndk_log_alert(log,...)                      ngx_log_error (NGX_LOG_ALERT, log, 0, __VA_ARGS__)
+#define ndk_log_crit(log,...)                       ngx_log_error (NGX_LOG_CRIT, log, 0, __VA_ARGS__)
+#define ndk_log_err(log,...)                        ngx_log_error (NGX_LOG_ERR, log, 0, __VA_ARGS__)
+#define ndk_log_warning(log,...)                    ngx_log_error (NGX_LOG_WARN, log, 0, __VA_ARGS__)
+#define ndk_log_notice(log,...)                     ngx_log_error (NGX_LOG_NOTICE, log, 0, __VA_ARGS__)
+#define ndk_log_info(log,...)                       ngx_log_error (NGX_LOG_INFO, log, 0, __VA_ARGS__)
+
+#define ndk_conf_log_stderr(cf,...)                 ngx_conf_log_error (NGX_LOG_STDERR, cf, 0, __VA_ARGS__)
+#define ndk_conf_log_emerg(cf,...)                  ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, __VA_ARGS__)
+#define ndk_conf_log_alert(cf,...)                  ngx_conf_log_error (NGX_LOG_ALERT, cf, 0, __VA_ARGS__)
+#define ndk_conf_log_crit(cf,...)                   ngx_conf_log_error (NGX_LOG_CRIT, cf, 0, __VA_ARGS__)
+#define ndk_conf_log_err(cf,...)                    ngx_conf_log_error (NGX_LOG_ERR, cf, 0, __VA_ARGS__)
+#define ndk_conf_log_warning(cf,...)                ngx_conf_log_error (NGX_LOG_WARN, cf, 0, __VA_ARGS__)
+#define ndk_conf_log_notice(cf,...)                 ngx_conf_log_error (NGX_LOG_NOTICE, cf, 0, __VA_ARGS__)
+#define ndk_conf_log_info(cf,...)                   ngx_conf_log_error (NGX_LOG_INFO, cf, 0, __VA_ARGS__)
+
+#define ndk_request_log_stderr(r,...)               ndk_log_stderr (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_emerg(r,...)                ndk_log_emerg (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_alert(r,...)                ndk_log_alert (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_crit(r,...)                 ndk_log_crit (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_err(r,...)                  ndk_log_err (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_warning(r,...)              ndk_log_warning (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_notice(r,...)               ndk_log_notice (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_info(r,...)                 ndk_log_info (ndk_request_to_log(r), __VA_ARGS__)
+
+
+#if (NGX_DEBUG)
+
+#define ndk_log_debug_core(log,...)                 ngx_log_debug (NGX_LOG_DEBUG_CORE, log, 0, __VA_ARGS__)
+#define ndk_log_debug_alloc(log,...)                ngx_log_debug (NGX_LOG_DEBUG_ALLOC, log, 0, __VA_ARGS__)
+#define ndk_log_debug_mutex(log,...)                ngx_log_debug (NGX_LOG_DEBUG_MUTEX, log, 0, __VA_ARGS__)
+#define ndk_log_debug_event(log,...)                ngx_log_debug (NGX_LOG_DEBUG_EVENT, log, 0, __VA_ARGS__)
+#define ndk_log_debug_http(log,...)                 ngx_log_debug (NGX_LOG_DEBUG_HTTP, log, 0, __VA_ARGS__)
+#define ndk_log_debug_mail(log,...)                 ngx_log_debug (NGX_LOG_DEBUG_MAIL, log, 0, __VA_ARGS__)
+#define ndk_log_debug_mysql(log,...)                ngx_log_debug (NGX_LOG_DEBUG_MYSQL, log, 0, __VA_ARGS__)
+
+#define ndk_conf_log_debug_core(r,...)              ndk_log_debug_core (ndk_conf_to_log(r), __VA_ARGS__)
+#define ndk_conf_log_debug_alloc(r,...)             ndk_log_debug_alloc (ndk_conf_to_log(r), __VA_ARGS__)
+#define ndk_conf_log_debug_mutex(r,...)             ndk_log_debug_mutex (ndk_conf_to_log(r), __VA_ARGS__)
+#define ndk_conf_log_debug_event(r,...)             ndk_log_debug_event (ndk_conf_to_log(r), __VA_ARGS__)
+#define ndk_conf_log_debug_http(r,...)              ndk_log_debug_http (ndk_conf_to_log(r), __VA_ARGS__)
+#define ndk_conf_log_debug_mail(r,...)              ndk_log_debug_mail (ndk_conf_to_log(r), __VA_ARGS__)
+#define ndk_conf_log_debug_mysql(r,...)             ndk_log_debug_mysql (ndk_conf_to_log(r), __VA_ARGS__)
+
+#define ndk_request_log_debug_core(r,...)           ndk_log_debug_core (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_debug_alloc(r,...)          ndk_log_debug_alloc (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_debug_mutex(r,...)          ndk_log_debug_mutex (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_debug_event(r,...)          ndk_log_debug_event (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_debug_http(r,...)           ndk_log_debug_http (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_debug_mail(r,...)           ndk_log_debug_mail (ndk_request_to_log(r), __VA_ARGS__)
+#define ndk_request_log_debug_mysql(r,...)          ndk_log_debug_mysql (ndk_request_to_log(r), __VA_ARGS__)
+
+#else 
+
+#define ndk_log_debug_core(log,...)
+#define ndk_log_debug_alloc(log,...)
+#define ndk_log_debug_mutex(log,...)
+#define ndk_log_debug_event(log,...)
+#define ndk_log_debug_http(log,...)
+#define ndk_log_debug_mail(log,...)
+#define ndk_log_debug_mysql(log,...)
+
+#define ndk_conf_log_debug_core(r,...)
+#define ndk_conf_log_debug_alloc(r,...)
+#define ndk_conf_log_debug_mutex(r,...)
+#define ndk_conf_log_debug_event(r,...)
+#define ndk_conf_log_debug_http(r,...)
+#define ndk_conf_log_debug_mail(r,...)
+#define ndk_conf_log_debug_mysql(r,...)
+
+#define ndk_request_log_debug_core(r,...)
+#define ndk_request_log_debug_alloc(r,...)
+#define ndk_request_log_debug_mutex(r,...)
+#define ndk_request_log_debug_event(r,...)
+#define ndk_request_log_debug_http(r,...)
+#define ndk_request_log_debug_mail(r,...)
+#define ndk_request_log_debug_mysql(r,...)
+
+#endif
+
+
+/*********************************/
+
+#elif (NGX_HAVE_GCC_VARIADIC_MACROS)
+
+#define ndk_log_stderr(log,args...)                 ngx_log_error (NGX_LOG_STDERR, log, 0, args)
+#define ndk_log_emerg(log,args...)                  ngx_log_error (NGX_LOG_EMERG, log, 0, args)
+#define ndk_log_alert(log,args...)                  ngx_log_error (NGX_LOG_ALERT, log, 0, args)
+#define ndk_log_crit(log,args...)                   ngx_log_error (NGX_LOG_CRIT, log, 0, args)
+#define ndk_log_err(log,args...)                    ngx_log_error (NGX_LOG_ERR, log, 0, args)
+#define ndk_log_warning(log,args...)                ngx_log_error (NGX_LOG_WARN, log, 0, args)
+#define ndk_log_notice(log,args...)                 ngx_log_error (NGX_LOG_NOTICE, log, 0, args)
+#define ndk_log_info(log,args...)                   ngx_log_error (NGX_LOG_INFO, log, 0, args)
+
+#define ndk_log_debug_core(log,args...)             ngx_log_debug (NGX_LOG_DEBUG_CORE, log, 0, args)
+#define ndk_log_debug_alloc(log,args...)            ngx_log_debug (NGX_LOG_DEBUG_ALLOC, log, 0, args)
+#define ndk_log_debug_mutex(log,args...)            ngx_log_debug (NGX_LOG_DEBUG_MUTEX, log, 0, args)
+#define ndk_log_debug_event(log,args...)            ngx_log_debug (NGX_LOG_DEBUG_EVENT, log, 0, args)
+#define ndk_log_debug_http(log,args...)             ngx_log_debug (NGX_LOG_DEBUG_HTTP, log, 0, args)
+#define ndk_log_debug_mail(log,args...)             ngx_log_debug (NGX_LOG_DEBUG_MAIL, log, 0, args)
+#define ndk_log_debug_mysql(log,args...)            ngx_log_debug (NGX_LOG_DEBUG_MYSQL, log, 0, args)
+#define ndk_log_debug_script(log,args...)           ngx_log_debug (NGX_LOG_DEBUG_SCRIPT, log, 0, args)
+
+#define ndk_conf_log_stderr(cf,args...)             ngx_conf_log_error (NGX_LOG_STDERR, cf, 0, args)
+#define ndk_conf_log_emerg(cf,args...)              ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, args)
+#define ndk_conf_log_alert(cf,args...)              ngx_conf_log_error (NGX_LOG_ALERT, cf, 0, args)
+#define ndk_conf_log_crit(cf,args...)               ngx_conf_log_error (NGX_LOG_CRIT, cf, 0, args)
+#define ndk_conf_log_err(cf,args...)                ngx_conf_log_error (NGX_LOG_ERR, cf, 0, args)
+#define ndk_conf_log_warning(cf,args...)            ngx_conf_log_error (NGX_LOG_WARN, cf, 0, args)
+#define ndk_conf_log_notice(cf,args...)             ngx_conf_log_error (NGX_LOG_NOTICE, cf, 0, args)
+#define ndk_conf_log_info(cf,args...)               ngx_conf_log_error (NGX_LOG_INFO, cf, 0, args)
+
+#define ndk_conf_log_debug_core(r,args...)          ndk_log_debug_core (ndk_conf_to_log(r), args)
+#define ndk_conf_log_debug_alloc(r,args...)         ndk_log_debug_alloc (ndk_conf_to_log(r), args)
+#define ndk_conf_log_debug_mutex(r,args...)         ndk_log_debug_mutex (ndk_conf_to_log(r), args)
+#define ndk_conf_log_debug_event(r,args...)         ndk_log_debug_event (ndk_conf_to_log(r), args)
+#define ndk_conf_log_debug_http(r,args...)          ndk_log_debug_http (ndk_conf_to_log(r), args)
+#define ndk_conf_log_debug_mail(r,args...)          ndk_log_debug_mail (ndk_conf_to_log(r), args)
+#define ndk_conf_log_debug_mysql(r,args...)         ndk_log_debug_mysql (ndk_conf_to_log(r), args)
+#define ndk_conf_log_debug_script(r,args...)        ndk_log_debug_script (ndk_conf_to_log(r), args)
+
+#define ndk_request_log_stderr(r,args...)           ndk_log_stderr (ndk_request_to_log(r), args)
+#define ndk_request_log_emerg(r,args...)            ndk_log_emerg (ndk_request_to_log(r), args)
+#define ndk_request_log_alert(r,args...)            ndk_log_alert (ndk_request_to_log(r), args)
+#define ndk_request_log_crit(r,args...)             ndk_log_crit (ndk_request_to_log(r), args)
+#define ndk_request_log_err(r,args...)              ndk_log_err (ndk_request_to_log(r), args)
+#define ndk_request_log_warning(r,args...)          ndk_log_warning (ndk_request_to_log(r), args)
+#define ndk_request_log_notice(r,args...)           ndk_log_notice (ndk_request_to_log(r), args)
+#define ndk_request_log_info(r,args...)             ndk_log_info (ndk_request_to_log(r), args)
+
+#define ndk_request_log_debug_core(r,args...)       ndk_log_debug_core (ndk_request_to_log(r), args)
+#define ndk_request_log_debug_alloc(r,args...)      ndk_log_debug_alloc (ndk_request_to_log(r), args)
+#define ndk_request_log_debug_mutex(r,args...)      ndk_log_debug_mutex (ndk_request_to_log(r), args)
+#define ndk_request_log_debug_event(r,args...)      ndk_log_debug_event (ndk_request_to_log(r), args)
+#define ndk_request_log_debug_http(r,args...)       ndk_log_debug_http (ndk_request_to_log(r), args)
+#define ndk_request_log_debug_mail(r,args...)       ndk_log_debug_mail (ndk_request_to_log(r), args)
+#define ndk_request_log_debug_mysql(r,args...)      ndk_log_debug_mysql (ndk_request_to_log(r), args)
+#define ndk_request_log_debug_script(r,args...)     ndk_log_debug_script (ndk_request_to_log(r), args)
+
+/*********************************/
+
+#else /* NO VARIADIC MACROS */
+
+/* #warning does not work on Windows */
+#pragma message("Nginx Devel Kit logging without variadic macros not yet implemented")
+
+#endif /* VARIADIC MACROS */
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_parse.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_parse.h
new file mode 100644
index 0000000..7c43e14
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_parse.h
@@ -0,0 +1,67 @@
+
+
+
+#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
+
+#define ndk_str3_cmp(m, c0, c1, c2, c3)                                       \
+    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)
+
+#define ndk_str3Ocmp(m, c0, c1, c2, c3)                                       \
+    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)
+
+#define ndk_str4cmp(m, c0, c1, c2, c3)                                        \
+    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)
+
+#define ndk_str5cmp(m, c0, c1, c2, c3, c4)                                    \
+    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
+        && m[4] == c4
+
+#define ndk_str6cmp(m, c0, c1, c2, c3, c4, c5)                                \
+    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
+        && (((uint32_t *) m)[1] & 0xffff) == ((c5 << 8) | c4)
+
+#define ndk_str7_cmp(m, c0, c1, c2, c3, c4, c5, c6, c7)                       \
+    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
+        && ((uint32_t *) m)[1] == ((c7 << 24) | (c6 << 16) | (c5 << 8) | c4)
+
+#define ndk_str8cmp(m, c0, c1, c2, c3, c4, c5, c6, c7)                        \
+    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
+        && ((uint32_t *) m)[1] == ((c7 << 24) | (c6 << 16) | (c5 << 8) | c4)
+
+#define ndk_str9cmp(m, c0, c1, c2, c3, c4, c5, c6, c7, c8)                    \
+    *(uint32_t *) m == ((c3 << 24) | (c2 << 16) | (c1 << 8) | c0)             \
+        && ((uint32_t *) m)[1] == ((c7 << 24) | (c6 << 16) | (c5 << 8) | c4)  \
+        && m[8] == c8
+
+#else /* !(NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED) */
+
+#define ndk_str3_cmp(m, c0, c1, c2, c3)                                       \
+    m[0] == c0 && m[1] == c1 && m[2] == c2
+
+#define ndk_str3Ocmp(m, c0, c1, c2, c3)                                       \
+    m[0] == c0 && m[2] == c2 && m[3] == c3
+
+#define ndk_str4cmp(m, c0, c1, c2, c3)                                        \
+    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3
+
+#define ndk_str5cmp(m, c0, c1, c2, c3, c4)                                    \
+    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3 && m[4] == c4
+
+#define ndk_str6cmp(m, c0, c1, c2, c3, c4, c5)                                \
+    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3                      \
+        && m[4] == c4 && m[5] == c5
+
+#define ndk_str7_cmp(m, c0, c1, c2, c3, c4, c5, c6, c7)                       \
+    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3                      \
+        && m[4] == c4 && m[5] == c5 && m[6] == c6
+
+#define ndk_str8cmp(m, c0, c1, c2, c3, c4, c5, c6, c7)                        \
+    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3                      \
+        && m[4] == c4 && m[5] == c5 && m[6] == c6 && m[7] == c7
+
+#define ndk_str9cmp(m, c0, c1, c2, c3, c4, c5, c6, c7, c8)                    \
+    m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3                      \
+        && m[4] == c4 && m[5] == c5 && m[6] == c6 && m[7] == c7 && m[8] == c8
+
+#endif
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_path.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_path.c
new file mode 100644
index 0000000..0b7c266
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_path.c
@@ -0,0 +1,583 @@
+
+
+
+/* This function cleans a path to its most basic form, performing the following transformations :
+ *
+ *  - ./ -> [empty]
+ *  - // -> /
+ *  - /base/parent/../ -> /base/
+ *
+ * If possible, it leaves the original string in place and does not copy characters, otherwise
+ * characters are copied.
+*/
+
+void
+ndk_clean_path (ngx_str_t *path, ngx_uint_t complex, size_t off)
+{
+    u_char         *s, *p, *m, *e, c, *l;
+    ngx_uint_t      root;
+
+    if (path->len == 1) {
+
+        if (path->data[0] == '.') {
+            path->len = 0;
+        }
+
+        return;
+    }
+
+    /* strip initial './' */
+
+    s = path->data;
+    e = s + path->len;
+
+    if (off) {
+        p = s + off;
+        goto check_basic;
+    }
+
+    if (*s == '/')
+        root = 1;
+    else
+        root = 0;
+
+    while (s < e) {
+
+        switch (*s) {
+
+        case    '/' :
+
+            /* '//' => '/' */
+
+            s++;
+            continue;
+
+        case    '.' :
+
+            if (s == e-1) {
+
+                if (root) {
+                    path->data[0] = '/';
+                    path->len = 1;
+                } else {
+                    path->len = 0;
+                }
+
+                return;
+            }
+
+            /* './' => '' */
+
+            if (s[1] == '/') {
+
+                s += 2;
+
+                if (s == e) {
+
+                    path->len = 0;
+                    return;
+                }
+
+                continue;
+            }
+        }
+
+        break;
+    }
+
+    if (root && *s != '/') {
+        s--;
+    }
+
+    p = s;
+
+check_basic :
+
+    for ( ; p<e; p++) {
+
+        if (*p == '/') {
+
+        new_dir_first :
+
+            if (e - p == 1)
+                break;
+
+            switch (p[1]) {
+
+            case    '/' :
+
+                /* '//' => '/' */
+
+                m = p + 2;
+                goto copy;
+
+            case    '.' :
+
+                if (e - p == 2)
+                    break;
+
+                switch (p[2]) {
+
+                case    '/' :
+
+                    /* './' => '' */
+
+                    m = p + 2;
+                    goto copy;
+
+                case    '.' :
+
+                    if (e - p == 3 || p[3] == '/') {
+
+                        if (p == s) {
+
+                            s += 3;
+                            continue;
+                        }
+
+                        if (p - s >= 2) {
+
+                            if (p[-1] == '.' && p[-2] == '.') {
+
+                                if (p - s == 2 || p[-3] == '/') {    /* = '../../' */
+
+                                    p += 2;     /* 3? */
+                                    continue;
+                                }
+                            }
+                        }
+
+                        m = p + 4;
+
+                        if (complex) {
+
+                            for (p--; p >= s; p--) {
+
+                                switch (*p) {
+
+                                case    '/' :
+                                    goto copy;
+
+                                case    '$' :
+
+                                    p = m - 1;
+
+                                    if (m == e)
+                                        goto end_basic;
+
+                                    goto new_dir_first;
+                                }
+                            }
+
+                        } else {
+
+                           for (p--; p > s; p--) {
+
+                                /* '/path/folder/../' => '/path/' */
+
+                                if (*p == '/')
+                                    break;
+                            }
+                        }
+
+                        goto copy;
+                    }
+                }
+            }
+        }
+    }
+
+end_basic :
+
+    path->data = s;
+    path->len = p - s;
+
+    return;
+
+copy :
+
+    p++;
+
+    if (m < e)
+        goto new_dir;
+
+    while (m < e) {       
+
+        c = *m;
+        *p = c;
+        p++;
+
+        if (c == '/') {
+
+            m++;
+
+        new_dir :
+
+            for ( ; m<e; m++) {
+
+                c = *m;
+                if (c != '/')
+                    break;
+            }
+
+            if (m == e)
+                break;
+
+            if (c == '.') {
+
+                if (e - m == 1)
+                    break;
+
+                switch (m[1]) {
+
+                case    '/' :
+
+                    /* './' => '' */
+
+                    m += 2;
+                    if (m == e)
+                        break;
+
+                    goto new_dir;
+
+                case    '.' :
+
+                    if (e - m == 2 || m[2] == '/') {
+
+                        if (m - s >= 3) {   /* NOTE : this is one higher than above because m has moved on 1 */
+
+                            if (p[-2] == '.' && p[-3] == '.') {
+
+                                if (m - s == 3 || p[-4] == '/') {    /* = '../../' */
+
+                                    p[0] = '.';
+                                    p[1] = '.';
+                                    p[2] = '/';
+                                    p += 3;
+                                    m += 3;
+                                    goto new_dir;
+                                }
+                            }
+                        }
+
+                        if (complex) {
+
+                            l = p;
+
+                            for (p -= 2; p >= s; p--) {
+
+                                switch (*p) {
+
+                                case    '/' :
+                                    break;
+
+                                case    '$' :
+
+                                    l[0] = '.';
+                                    l[1] = '.';
+                                    l[2] = '/';
+                                    p = l + 4;
+                                    break;
+
+                                default :
+                                    continue;
+                                }
+
+                                break;
+                            }
+
+                            m += 3;
+                            if (m == e)
+                                goto end;
+
+                            goto new_dir;
+
+                        } else {
+
+                            for (p -= 2; p > s; p--) {
+
+                                /* '/path/folder/../' => '/path/' */
+
+                                if (*p == '/')
+                                    break;
+                            }
+
+                            m += 3;
+                            if (m == e)
+                                goto end;
+
+                            goto new_dir;
+                        }
+                    }
+                }
+            }
+
+        } else {
+            m++;
+        }
+    }
+
+end :
+
+    path->data = s;
+    path->len = p - s;
+}
+
+
+/* This function converts a path to its directory version, and assumes that there is always space
+ * to allocatate an extra character on the end (which is only true if the provided strings always
+ * have NULL's at the end (hence the 'safe').
+*/
+
+void
+ndk_path_to_dir_safe (ngx_str_t *path, ngx_uint_t complex, size_t off)
+{
+    size_t   len;
+    u_char  *p, *m;
+
+    ndk_clean_path (path, complex, off);
+
+    len = path->len;
+    if (!len)
+        return;
+
+    p = path->data;
+    m = p + len - 1;
+
+    if (*m != '/') {
+
+        p [len] = '/';
+        path->len++;
+    }
+}
+
+
+/* Divides a path given by path/to/path1:path/to/path2 into separate strings and returns an
+ * array of these strings.
+*/
+
+ngx_array_t *
+ndk_split_path_create (ngx_conf_t *cf, ngx_str_t *path)
+{
+    ngx_str_t         *str;
+    int                n;
+    u_char            *m, *s, *e;
+    ngx_array_t       *a; 
+
+    if (path == NULL)
+        return  NULL;
+
+    n = ndk_strcntc (path, ':');
+
+    a = ngx_array_create (cf->pool, n + 1, sizeof (ngx_str_t));
+    if (a == NULL) {
+        return  NULL;
+    }
+
+    s = path->data;
+    e = s + path->len;
+
+    while (s < e) {
+
+        m = s;
+
+        while (m < e && *m != ':') m++;
+
+        if (m == s) {
+            s = m+1;
+            continue;
+        }
+
+        str = ngx_array_push (a);
+        if (str == NULL) {
+            return  NULL;
+        }
+
+        str->data = s;
+        str->len = m - s;
+
+        if (ngx_conf_full_name (cf->cycle, str, 0) == NGX_ERROR)
+            return  NULL;
+
+        s = m+1;
+    }
+
+    return  a;
+}
+
+
+
+ngx_array_t *
+ndk_split_path_create_raw (ngx_conf_t *cf, char *path)
+{
+    ngx_str_t         *str;
+    int                n;
+    char              *m, *s;
+    ngx_array_t       *a; 
+
+    if (path == NULL)
+        return  NULL;
+
+    n = ndk_strccnt (path, ':');
+
+    a = ngx_array_create (cf->pool, n + 1, sizeof (ngx_str_t));
+    if (a == NULL) {
+        return  NULL;
+    }
+
+    s = path;
+
+
+    while (*s != '\0') {
+
+        m = s;
+
+        while (*m != '\0' && *m != ':') m++;
+
+        if (m == s) {
+            s = m+1;
+            continue;
+        }
+
+        str = ngx_array_push (a);
+        if (str == NULL) {
+            return  NULL;
+        }
+
+        str->data = (u_char *) s;
+        str->len = m - s;
+
+        if (ngx_conf_full_name (cf->cycle, str, 0) == NGX_ERROR)
+            return  NULL;
+
+        if (*m == '\0')
+            break;
+
+        s = m+1;
+    }
+
+    return  a;
+}
+
+
+
+char *
+ndk_conf_set_full_path_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t        *path, *value;
+    ngx_conf_post_t  *post;
+
+    path = (ngx_str_t *) (p + cmd->offset);
+
+    if (path->data) {
+        return "is duplicate";
+    }
+
+    value = cf->args->elts;
+
+    *path = value[1];
+
+    if (ngx_conf_full_name (cf->cycle, path, 0) == NGX_ERROR)
+        return  NGX_CONF_ERROR;
+
+    if (cmd->post) {
+        post = cmd->post;
+        return post->post_handler(cf, post, path);
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_split_path_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)     
+{
+    /* TODO : change to use the path func above */
+
+    char  *p = conf;
+
+    ngx_str_t         *value, *str;
+    ngx_array_t      **a;
+    ngx_conf_post_t   *post;
+    int                n;
+    u_char            *m, *s, *e;
+
+    a = (ngx_array_t **) (p + cmd->offset);
+
+    if (*a != NGX_CONF_UNSET_PTR) {
+        return  "is duplicate";
+    }
+
+    value = cf->args->elts;
+    value++;
+
+    n = ndk_strcntc (value, ':') + 1;
+
+    *a = ngx_array_create (cf->pool, n, sizeof (ngx_str_t));
+    if (*a == NULL) {
+        return  NGX_CONF_ERROR;
+    }
+
+    s = value->data;
+    e = s + value->len;
+
+    while (s < e) {
+
+        m = s;
+
+        while (m < e && *m != ':') m++;
+
+        if (m == s) {
+            s = m+1;
+            continue;
+        }
+
+        str = ngx_array_push (*a);
+        if (str == NULL) {
+            return  NGX_CONF_ERROR;
+        }
+
+        str->data = s;
+        str->len = m - s;
+
+        if (ngx_conf_full_name (cf->cycle, str, 0) == NGX_ERROR)
+            return  NGX_CONF_ERROR;
+
+        s = m+1;
+    }
+
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, a);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_full_path (ngx_conf_t *cf, void *data, ngx_str_t *path)
+{
+    if (ngx_conf_full_name (cf->cycle, path, 0) == NGX_ERROR)
+        return  NGX_CONF_ERROR;
+
+    return  NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_full_conf_path (ngx_conf_t *cf, void *data, ngx_str_t *path)
+{
+    if (ngx_conf_full_name (cf->cycle, path, 1) == NGX_ERROR)
+        return  NGX_CONF_ERROR;
+
+    return  NGX_CONF_OK;
+}
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_path.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_path.h
new file mode 100644
index 0000000..22ba945
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_path.h
@@ -0,0 +1,22 @@
+
+
+/* path conversion functions */
+
+void            ndk_clean_path                  (ngx_str_t *path, ngx_uint_t complex, size_t off);
+void            ndk_path_to_dir_safe            (ngx_str_t *path, ngx_uint_t complex, size_t off);
+
+/* path create functions */
+
+ngx_array_t *   ndk_split_path_create           (ngx_conf_t *cf, ngx_str_t *path);
+ngx_array_t *   ndk_split_path_create_raw       (ngx_conf_t *cf, char *path);
+
+/* conf set functions */
+
+char *          ndk_conf_set_full_path_slot     (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *          ndk_conf_set_split_path_slot    (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
+/* conf set post functions */
+
+char *          ndk_conf_set_full_path          (ngx_conf_t *cf, void *data, ngx_str_t *path);
+char *          ndk_conf_set_full_conf_path     (ngx_conf_t *cf, void *data, ngx_str_t *path);
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_process.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_process.c
new file mode 100644
index 0000000..fbc789c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_process.c
@@ -0,0 +1,20 @@
+
+ngx_int_t
+ndk_init_signals (ngx_signal_t *sig, ngx_log_t *log)
+{
+    struct sigaction   sa;
+
+    for ( ; sig->signo != 0; sig++) {
+        ndk_zerov (sa);
+        sa.sa_handler = sig->handler;
+        sigemptyset (&sa.sa_mask);
+        
+        if (sigaction (sig->signo, &sa, NULL) == -1) {
+            ngx_log_error (NGX_LOG_EMERG, log, ngx_errno,
+                          "sigaction(%s) failed", sig->signame);
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_process.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_process.h
new file mode 100644
index 0000000..7ac1d99
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_process.h
@@ -0,0 +1,12 @@
+
+
+typedef struct {
+    int     signo;
+    char   *signame;
+    char   *name;
+    void  (*handler)(int signo);
+} ngx_signal_t;
+
+
+ngx_int_t   ndk_init_signals    (ngx_signal_t *sig, ngx_log_t *log);
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_regex.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_regex.c
new file mode 100644
index 0000000..c1efd86
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_regex.c
@@ -0,0 +1,215 @@
+
+
+char *
+ndk_conf_set_regex_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t               *value;
+    ngx_conf_post_t         *post;
+    ngx_regex_elt_t         *re;   
+    ngx_regex_compile_t      rc;
+    u_char                   errstr[NGX_MAX_CONF_ERRSTR];
+
+    re = (ngx_regex_elt_t *) (p + cmd->offset);
+
+    if (re->name) {
+        return  "is duplicate";
+    }
+
+    value = cf->args->elts;
+    value++;
+
+    ndk_zerov (rc);
+
+    rc.pool = cf->pool;
+    rc.err.len = NGX_MAX_CONF_ERRSTR;
+    rc.err.data = errstr;
+    rc.pattern = *value;
+
+    if (ngx_regex_compile(&rc) != NGX_OK) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
+        return NGX_CONF_ERROR;
+    }
+
+    re->regex = rc.regex;
+    re->name = value->data;
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, re);
+    }
+
+    return  NGX_CONF_OK;
+}
+ 
+
+char *
+ndk_conf_set_regex_caseless_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t               *value;
+    ngx_conf_post_t         *post;
+    ngx_regex_elt_t         *re;   
+    ngx_regex_compile_t      rc;
+    u_char                   errstr[NGX_MAX_CONF_ERRSTR];
+
+    re = (ngx_regex_elt_t *) (p + cmd->offset);
+
+    if (re->name) {
+        return  "is duplicate";
+    }
+
+    value = cf->args->elts;
+    value++;
+
+    ndk_zerov (rc);
+
+    rc.pool = cf->pool;
+    rc.err.len = NGX_MAX_CONF_ERRSTR;
+    rc.err.data = errstr;
+    rc.pattern = *value;
+    rc.options = NGX_REGEX_CASELESS;
+
+    if (ngx_regex_compile(&rc) != NGX_OK) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
+        return NGX_CONF_ERROR;
+    }
+
+    re->regex = rc.regex;
+    re->name = value->data;
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, re);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_regex_array_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t               *value;
+    ngx_conf_post_t         *post;
+    ngx_array_t            **a;
+    ngx_regex_elt_t         *re;   
+    ngx_regex_compile_t      rc;
+    ngx_uint_t               i, n = 0;
+    u_char                   errstr[NGX_MAX_CONF_ERRSTR];
+
+    a = (ngx_array_t **) (p + cmd->offset);
+
+    if (*a != NGX_CONF_UNSET_PTR) {
+
+        n = cf->args->nelts > 4 ? cf->args->nelts : 4;
+
+        *a = ngx_array_create (cf->pool, n, sizeof (ngx_regex_elt_t));
+        if (*a == NULL) {
+            return  NGX_CONF_ERROR;
+        }
+    }
+
+    ndk_zerov (rc);
+
+    rc.pool = cf->pool;
+    rc.err.len = NGX_MAX_CONF_ERRSTR;
+    rc.err.data = errstr;
+
+    value = cf->args->elts;
+    value++;
+
+    for (i=0; i<n; i++, value++) {
+
+        re = ngx_array_push (*a);
+        if (re == NULL)
+            return  NGX_CONF_ERROR;
+
+        rc.pattern = *value;
+
+        if (ngx_regex_compile(&rc) != NGX_OK) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
+            return NGX_CONF_ERROR;
+        }
+
+        re->regex = rc.regex;
+        re->name = value->data;
+    }
+
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, a);
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+
+char *
+ndk_conf_set_regex_array_caseless_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t               *value;
+    ngx_conf_post_t         *post;
+    ngx_array_t            **a;
+    ngx_regex_elt_t         *re;   
+    ngx_regex_compile_t      rc;
+    ngx_uint_t               i, n = 0;
+    u_char                   errstr[NGX_MAX_CONF_ERRSTR];
+
+    a = (ngx_array_t **) (p + cmd->offset);
+
+    if (*a != NGX_CONF_UNSET_PTR) {
+
+        n = cf->args->nelts > 4 ? cf->args->nelts : 4;
+
+        *a = ngx_array_create (cf->pool, n, sizeof (ngx_regex_elt_t));
+        if (*a == NULL) {
+            return  NGX_CONF_ERROR;
+        }
+    }
+
+    ndk_zerov (rc);
+
+    rc.pool = cf->pool;
+    rc.err.len = NGX_MAX_CONF_ERRSTR;
+    rc.err.data = errstr;
+
+    value = cf->args->elts;
+    value++;
+
+    for (i=0; i<n; i++, value++) {
+
+        re = ngx_array_push (*a);
+        if (re == NULL)
+            return  NGX_CONF_ERROR;
+
+        rc.pattern = *value;
+        rc.options = NGX_REGEX_CASELESS;
+
+        if (ngx_regex_compile(&rc) != NGX_OK) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
+            return NGX_CONF_ERROR;
+        }
+
+        re->regex = rc.regex;
+        re->name = value->data;
+    }
+
+
+    if (cmd->post) {
+        post = cmd->post;
+        return  post->post_handler (cf, post, a);
+    }
+
+    return  NGX_CONF_OK;
+}
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_regex.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_regex.h
new file mode 100644
index 0000000..4319b04
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_regex.h
@@ -0,0 +1,7 @@
+
+
+char *  ndk_conf_set_regex_slot                 (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_regex_caseless_slot        (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_regex_array_slot           (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_conf_set_regex_array_caseless_slot  (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_rewrite.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_rewrite.c
new file mode 100644
index 0000000..77ce9f8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_rewrite.c
@@ -0,0 +1,103 @@
+
+
+/* these have been taken from the rewrite module and http_script file
+ * because those functions are defined as being static - a patch will
+ * be provided later to un-define them as being static
+ */
+
+
+uintptr_t ndk_http_script_exit_code = (uintptr_t) NULL;
+
+
+char *
+ndk_http_rewrite_value (ngx_conf_t *cf, ndk_http_rewrite_loc_conf_t *lcf,
+    ngx_str_t *value)
+{
+    ngx_int_t                              n;
+    ngx_http_script_compile_t              sc;
+    ngx_http_script_value_code_t          *val;
+    ngx_http_script_complex_value_code_t  *complex;
+
+    n = ngx_http_script_variables_count(value);
+
+    if (n == 0) {
+        val = ngx_http_script_start_code(cf->pool, &lcf->codes,
+                                         sizeof(ngx_http_script_value_code_t));
+        if (val == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        n = ngx_atoi(value->data, value->len);
+
+        if (n == NGX_ERROR) {
+            n = 0;
+        }
+
+        val->code = ngx_http_script_value_code;
+        val->value = (uintptr_t) n;
+        val->text_len = (uintptr_t) value->len;
+        val->text_data = (uintptr_t) value->data;
+
+        return NGX_CONF_OK;
+    }
+
+    complex = ngx_http_script_start_code(cf->pool, &lcf->codes,
+                                 sizeof(ngx_http_script_complex_value_code_t));
+    if (complex == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    complex->code = ngx_http_script_complex_value_code;
+    complex->lengths = NULL;
+
+    ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
+
+    sc.cf = cf;
+    sc.source = value;
+    sc.lengths = &complex->lengths;
+    sc.values = &lcf->codes;
+    sc.variables = n;
+    sc.complete_lengths = 1;
+
+    if (ngx_http_script_compile(&sc) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+ngx_int_t
+ndk_http_rewrite_var (ngx_http_request_t *r, ngx_http_variable_value_t *v,
+    uintptr_t data)
+{
+    ngx_http_variable_t          *var;
+    ngx_http_core_main_conf_t    *cmcf;
+    ndk_http_rewrite_loc_conf_t  *rlcf;
+
+    rlcf = ngx_http_get_module_loc_conf(r, ngx_http_rewrite_module);
+
+    if (rlcf->uninitialized_variable_warn == 0) {
+        *v = ngx_http_variable_null_value;
+        return NGX_OK;
+    }
+
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+    var = cmcf->variables.elts;
+
+    /*
+     * the ngx_http_rewrite_module sets variables directly in r->variables,
+     * and they should be handled by ngx_http_get_indexed_variable(),
+     * so the handler is called only if the variable is not initialized
+     */
+
+    ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                  "using uninitialized \"%V\" variable", &var[data].name);
+
+    *v = ngx_http_variable_null_value;
+
+    return  NGX_OK;
+}
+
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_rewrite.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_rewrite.h
new file mode 100644
index 0000000..2479aa2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_rewrite.h
@@ -0,0 +1,26 @@
+
+
+/* TODO : should remove this when not needed */
+
+
+
+/* used for plugging into the rewrite module (taken from the rewrite module) */
+
+typedef struct {
+    ngx_array_t  *codes;        /* uintptr_t */
+    ngx_uint_t    stack_size;
+    ngx_flag_t    log;
+    ngx_flag_t    uninitialized_variable_warn;
+} ndk_http_rewrite_loc_conf_t;
+
+
+extern  ngx_module_t    ngx_http_rewrite_module;
+extern  uintptr_t       ndk_http_script_exit_code;
+
+char *      ndk_http_rewrite_value      (ngx_conf_t *cf, ndk_http_rewrite_loc_conf_t *lcf,
+                                            ngx_str_t *value);
+ngx_int_t   ndk_http_rewrite_var        (ngx_http_request_t *r, 
+                                            ngx_http_variable_value_t *v, uintptr_t data);
+
+#define     ndk_http_script_exit  (u_char *) &ndk_http_script_exit_code
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_set_var.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_set_var.c
new file mode 100644
index 0000000..388f873
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_set_var.c
@@ -0,0 +1,602 @@
+#include    <ndk.h>
+
+
+typedef struct {
+    ngx_http_script_code_pt     code;
+    void                       *func;
+} ndk_set_var_code_t;
+
+
+typedef struct {
+    ngx_http_script_code_pt     code;
+    void                       *func;
+    size_t                      size;
+} ndk_set_var_size_code_t;
+
+
+typedef struct {
+    ngx_http_script_code_pt     code;
+    void                       *func;
+    void                       *data;
+} ndk_set_var_data_code_t;
+
+
+typedef struct {
+    ngx_http_script_code_pt     code;
+    void                       *func;
+    size_t                      size;
+    void                       *data;
+} ndk_set_var_size_data_code_t;
+
+
+typedef struct {
+    ngx_int_t                        index;
+    ngx_str_t                       *value;
+    ngx_http_variable_t             *v;
+    ngx_conf_t                      *cf;
+    ndk_http_rewrite_loc_conf_t     *rlcf;
+} ndk_set_var_info_t;
+
+
+static void     ndk_set_var_code           (ngx_http_script_engine_t *e);
+static void     ndk_set_var_hash_code      (ngx_http_script_engine_t *e);
+static void     ndk_set_var_value_code     (ngx_http_script_engine_t *e);
+
+
+static ngx_inline void
+ndk_set_var_code_finalize(ngx_http_script_engine_t *e, ngx_int_t rc,
+                                ngx_http_variable_value_t *v, ngx_str_t *str)
+{
+    switch (rc) {
+
+    case NGX_OK:
+
+        v->data = str->data;
+        v->len = str->len;
+        v->valid = 1;
+        v->no_cacheable = 0;
+        v->not_found = 0;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0,
+                        "http script value (post filter): \"%v\"", v);
+        break;
+
+    case NGX_DECLINED:
+
+        v->valid = 0;
+        v->not_found = 1;
+        v->no_cacheable = 1;
+        break;
+
+    case NGX_ERROR:
+
+        e->ip = ndk_http_script_exit;
+        e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
+        break;
+    }
+}
+
+
+
+static void
+ndk_set_var_code(ngx_http_script_engine_t *e)
+{
+    ngx_int_t                    rc;
+    ngx_str_t                    str;
+    ngx_http_variable_value_t   *v;
+    ndk_set_var_code_t          *sv;
+    ndk_set_var_pt               func;
+
+    sv = (ndk_set_var_code_t *) e->ip;
+
+    e->ip += sizeof(ndk_set_var_code_t);
+
+    v = e->sp++;
+
+    func = (ndk_set_var_pt) sv->func;
+
+    rc = func(e->request, &str);
+
+    ndk_set_var_code_finalize(e, rc, v, &str);
+}
+
+
+static void
+ndk_set_var_data_code(ngx_http_script_engine_t *e)
+{
+    ngx_int_t                    rc;
+    ngx_str_t                    str;
+    ngx_http_variable_value_t   *v;
+    ndk_set_var_data_code_t     *svd;
+    ndk_set_var_data_pt          func;
+
+    svd = (ndk_set_var_data_code_t *) e->ip;
+
+    e->ip += sizeof(ndk_set_var_data_code_t);
+
+    v = e->sp++;
+
+    func = (ndk_set_var_data_pt) svd->func;
+
+    rc = func(e->request, &str, svd->data);
+
+    ndk_set_var_code_finalize(e, rc, v, &str);
+}
+
+
+static void
+ndk_set_var_value_code(ngx_http_script_engine_t *e)
+{
+    ngx_int_t                    rc;
+    ngx_str_t                    str;
+    ngx_http_variable_value_t   *v;
+    ndk_set_var_code_t          *sv;
+    ndk_set_var_value_pt         func;
+
+    sv = (ndk_set_var_code_t *) e->ip;
+
+    e->ip += sizeof(ndk_set_var_code_t);
+
+    v = e->sp - 1;
+
+    func = (ndk_set_var_value_pt) sv->func;
+
+    rc = func(e->request, &str, v);
+
+    ndk_set_var_code_finalize(e, rc, v, &str);
+}
+
+
+static void
+ndk_set_var_value_data_code(ngx_http_script_engine_t *e)
+{
+    ngx_int_t                    rc;
+    ngx_str_t                    str;
+    ngx_http_variable_value_t   *v;
+    ndk_set_var_data_code_t     *svd;
+    ndk_set_var_value_data_pt    func;
+
+    svd = (ndk_set_var_data_code_t *) e->ip;
+
+    e->ip += sizeof(ndk_set_var_data_code_t);
+
+    v = e->sp - 1;
+
+    func = (ndk_set_var_value_data_pt) svd->func;
+
+    rc = func(e->request, &str, v, svd->data);
+
+    ndk_set_var_code_finalize(e, rc, v, &str);
+}
+
+
+static void
+ndk_set_var_multi_value_code(ngx_http_script_engine_t *e)
+{
+    ngx_int_t                    rc;
+    ngx_str_t                    str;
+    ngx_http_variable_value_t   *v;
+    ndk_set_var_size_code_t     *svs;
+    ndk_set_var_value_pt         func;
+
+    svs = (ndk_set_var_size_code_t *) e->ip;
+
+    e->ip += sizeof(ndk_set_var_size_code_t);
+
+    v = e->sp - svs->size;
+    e->sp = v + 1;
+
+    func = (ndk_set_var_value_pt) svs->func;
+
+    rc = func(e->request, &str, v);
+
+    ndk_set_var_code_finalize(e, rc, v, &str);
+}
+
+
+static void
+ndk_set_var_multi_value_data_code(ngx_http_script_engine_t *e)
+{
+    ngx_int_t                        rc;
+    ngx_str_t                        str;
+    ngx_http_variable_value_t       *v;
+    ndk_set_var_size_data_code_t    *svsd;
+    ndk_set_var_value_data_pt        func;
+
+    svsd = (ndk_set_var_size_data_code_t *) e->ip;
+
+    e->ip += sizeof(ndk_set_var_size_data_code_t);
+
+    v = e->sp - svsd->size;
+    e->sp = v + 1;
+
+    func = (ndk_set_var_value_data_pt) svsd->func;
+
+    rc = func(e->request, &str, v, svsd->data);
+
+    ndk_set_var_code_finalize(e, rc, v, &str);
+}
+
+
+static void
+ndk_set_var_hash_code(ngx_http_script_engine_t *e)
+{
+    u_char                      *p;
+    ngx_http_variable_value_t   *v;
+    ndk_set_var_size_code_t     *svs;
+    ndk_set_var_hash_pt          func;
+
+    svs = (ndk_set_var_size_code_t *) e->ip;
+
+    e->ip += sizeof(ndk_set_var_size_code_t);
+
+    p = ngx_palloc(e->request->pool, svs->size);
+    if (p == NULL) {
+        e->ip = ndk_http_script_exit;
+        e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
+        return;
+    }
+
+    v = e->sp - 1;
+
+    func = (ndk_set_var_hash_pt) svs->func;
+
+    func(p, (char *) v->data, v->len);
+
+    v->data = (u_char *) p;
+    v->len = svs->size;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0,
+                   "http script hashed value: \"%v\"", v);
+}
+
+
+
+static char *
+ndk_set_var_name(ndk_set_var_info_t *info, ngx_str_t *varname)
+{
+    ngx_int_t                        index;
+    ngx_http_variable_t             *v;
+    ngx_conf_t                      *cf;
+    ndk_http_rewrite_loc_conf_t     *rlcf;
+    ngx_str_t                        name;
+
+    name = *varname;
+
+    cf = info->cf;
+    rlcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_rewrite_module);
+
+    if (name.data[0] != '$') {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid variable name \"%V\"", &name);
+        return NGX_CONF_ERROR;
+    }
+
+    name.len--;
+    name.data++;
+
+    v = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
+    if (v == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    index = ngx_http_get_variable_index(cf, &name);
+    if (index == NGX_ERROR) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (v->get_handler == NULL
+        && ngx_strncasecmp(name.data, (u_char *) "arg_", 4) != 0
+        && ngx_strncasecmp(name.data, (u_char *) "cookie_", 7) != 0
+        && ngx_strncasecmp(name.data, (u_char *) "http_", 5) != 0
+        && ngx_strncasecmp(name.data, (u_char *) "sent_http_", 10) != 0
+        && ngx_strncasecmp(name.data, (u_char *) "upstream_http_", 14) != 0)
+    {
+        v->get_handler = ndk_http_rewrite_var;
+        v->data = index;
+    }
+
+    info->v = v;
+    info->index = index;
+    info->rlcf = rlcf;
+
+    return NGX_CONF_OK;
+}
+
+
+
+static void
+ndk_set_variable_value_space(ndk_http_rewrite_loc_conf_t *rlcf, ngx_uint_t count)
+{
+    /* if the number of variable values that will be used is greater than 10,
+     * make sure there is enough space allocated on the rewrite value stack
+     */
+
+    if (count <= 10)
+        return;
+
+    if (rlcf->stack_size == NGX_CONF_UNSET_UINT) {
+        rlcf->stack_size = count;
+        return;
+    }
+
+    if (rlcf->stack_size < count)
+        rlcf->stack_size = count;
+}
+
+
+
+static char *
+ndk_set_var_filter(ngx_conf_t *cf, ndk_http_rewrite_loc_conf_t *rlcf,
+    ndk_set_var_t *filter)
+{
+    ndk_set_var_code_t             *sv;
+    ndk_set_var_size_code_t        *svs;
+    ndk_set_var_data_code_t        *svd;
+    ndk_set_var_size_data_code_t   *svsd;
+
+    if (filter == NULL) {
+        return "no filter set";
+    }
+
+    switch (filter->type) {
+    case NDK_SET_VAR_BASIC:
+
+        sv = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+                                         sizeof(ndk_set_var_code_t));
+        if (sv == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        sv->code = ndk_set_var_code;
+        sv->func = filter->func;
+        break;
+
+    case NDK_SET_VAR_DATA:
+
+        svd = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+                                         sizeof(ndk_set_var_data_code_t));
+        if (svd == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        svd->code = ndk_set_var_data_code;
+        svd->func = filter->func;
+        svd->data = filter->data;
+        break;
+
+    case NDK_SET_VAR_VALUE:
+
+        sv = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+                                         sizeof(ndk_set_var_code_t));
+        if (sv == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        sv->code = ndk_set_var_value_code;
+        sv->func = filter->func;
+        break;
+
+    case NDK_SET_VAR_VALUE_DATA:
+
+        svd = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+                                         sizeof(ndk_set_var_data_code_t));
+        if (svd == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        svd->code = ndk_set_var_value_data_code;
+        svd->func = filter->func;
+        svd->data = filter->data;
+        break;
+
+    case NDK_SET_VAR_MULTI_VALUE:
+
+        svs = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+                                          sizeof(ndk_set_var_size_code_t));
+        if (svs == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        svs->code = ndk_set_var_multi_value_code;
+        svs->func = filter->func;
+        svs->size = filter->size;
+
+        ndk_set_variable_value_space(rlcf, svs->size);
+        break;
+
+    case NDK_SET_VAR_MULTI_VALUE_DATA:
+
+        svsd = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+                                          sizeof(ndk_set_var_size_data_code_t));
+        if (svsd == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        svsd->code = ndk_set_var_multi_value_data_code;
+        svsd->func = filter->func;
+        svsd->size = filter->size;
+        svsd->data = filter->data;
+
+        ndk_set_variable_value_space(rlcf, svsd->size);
+        break;
+
+
+    case NDK_SET_VAR_HASH:
+
+        svs = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+                                          sizeof(ndk_set_var_size_code_t));
+        if (svs == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        svs->code = ndk_set_var_hash_code;
+        svs->func = filter->func;
+        svs->size = filter->size;
+        break;
+
+    default:
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "invalid filter type \"%ul\"", filter->type);
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ndk_set_var_filter_value(ndk_set_var_info_t *info, ndk_set_var_t *filter)
+{
+    ngx_conf_t                          *cf;
+    ngx_http_variable_t                 *v;
+    ndk_http_rewrite_loc_conf_t         *rlcf;
+    ngx_http_script_var_code_t          *vcode;
+    ngx_http_script_var_handler_code_t  *vhcode;
+
+    v = info->v;
+    cf = info->cf;
+    rlcf = info->rlcf;
+
+    if (ndk_set_var_filter(cf, rlcf, filter) != NGX_CONF_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    if (v->set_handler) {
+        vhcode = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+                                   sizeof(ngx_http_script_var_handler_code_t));
+        if (vhcode == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        vhcode->code = ngx_http_script_var_set_handler_code;
+        vhcode->handler = v->set_handler;
+        vhcode->data = v->data;
+
+        return NGX_CONF_OK;
+    }
+
+    vcode = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+                                       sizeof(ngx_http_script_var_code_t));
+    if (vcode == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    vcode->code = ngx_http_script_set_var_code;
+    vcode->index = (uintptr_t) info->index;
+
+    return NGX_CONF_OK;
+}
+
+
+char *
+ndk_set_var_core(ngx_conf_t *cf, ngx_str_t *name, ndk_set_var_t *filter)
+{
+    char                    *p;
+    ndk_set_var_info_t       info;
+
+    info.cf = cf;
+
+    p = ndk_set_var_name(&info, name);
+    if (p != NGX_CONF_OK) {
+        return p;
+    }
+
+    return ndk_set_var_filter_value(&info, filter);
+}
+
+
+char *
+ndk_set_var_value_core(ngx_conf_t *cf, ngx_str_t *name, ngx_str_t *value, ndk_set_var_t *filter)
+{
+    char                    *p;
+    ndk_set_var_info_t       info;
+
+    info.cf = cf;
+
+    p = ndk_set_var_name(&info, name);
+    if (p != NGX_CONF_OK) {
+        return p;
+    }
+
+    p = ndk_http_rewrite_value(cf, info.rlcf, value);
+    if (p != NGX_CONF_OK) {
+        return p;
+    }
+
+    return ndk_set_var_filter_value(&info, filter);
+}
+
+
+char *
+ndk_set_var_multi_value_core(ngx_conf_t *cf, ngx_str_t *name,
+        ngx_str_t *value, ndk_set_var_t *filter)
+{
+    char                    *p;
+    ndk_set_var_info_t       info;
+    ngx_int_t                i;
+
+    info.cf = cf;
+
+    p = ndk_set_var_name(&info, name);
+    if (p != NGX_CONF_OK) {
+        return p;
+    }
+
+    for (i = filter->size; i; i--, value++) {
+
+        p = ndk_http_rewrite_value(cf, info.rlcf, value);
+        if (p != NGX_CONF_OK) {
+            return p;
+        }
+    }
+
+    return ndk_set_var_filter_value(&info, filter);
+}
+
+
+char *
+ndk_set_var(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t               *value;
+    ndk_set_var_t      *filter;
+
+    value = cf->args->elts;
+    value++;
+
+    filter = (ndk_set_var_t *) cmd->post;
+
+    return ndk_set_var_core(cf, value, filter);
+}
+
+
+char *
+ndk_set_var_value(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t               *value;
+    ndk_set_var_t           *filter;
+
+    value = cf->args->elts;
+    value++;
+
+    filter = (ndk_set_var_t *) cmd->post;
+
+    return ndk_set_var_value_core(cf, value,
+            cf->args->nelts == 1 + 1 ? value : value + 1, filter);
+}
+
+
+char *
+ndk_set_var_multi_value(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t               *value;
+    ndk_set_var_t      *filter;
+
+    value = cf->args->elts;
+    value++;
+
+    filter = (ndk_set_var_t *) cmd->post;
+
+    return ndk_set_var_multi_value_core(cf, value, value + 1, filter);
+}
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_set_var.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_set_var.h
new file mode 100644
index 0000000..5dcba97
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_set_var.h
@@ -0,0 +1,44 @@
+/*
+ * 2010 (C) Marcus Clyne
+ */
+
+#ifndef _NDK_SET_VAR_H_INCLUDED_
+#define _NDK_SET_VAR_H_INCLUDED_
+
+
+typedef ngx_int_t   (*ndk_set_var_pt)              (ngx_http_request_t *r, ngx_str_t *val);
+typedef ngx_int_t   (*ndk_set_var_data_pt)         (ngx_http_request_t *r, ngx_str_t *val, void *data);
+typedef ngx_int_t   (*ndk_set_var_value_pt)        (ngx_http_request_t *r, ngx_str_t *val, ngx_http_variable_value_t *v);
+typedef ngx_int_t   (*ndk_set_var_value_data_pt)   (ngx_http_request_t *r, ngx_str_t *val, ngx_http_variable_value_t *v, void *data);
+typedef void        (*ndk_set_var_hash_pt)         (u_char *p, char *data, size_t len);
+
+
+typedef struct {
+    ngx_uint_t      type;
+    void           *func;
+    size_t          size;
+    void           *data;
+} ndk_set_var_t;
+
+
+enum {
+    NDK_SET_VAR_BASIC = 0,
+    NDK_SET_VAR_DATA,
+    NDK_SET_VAR_VALUE,
+    NDK_SET_VAR_VALUE_DATA,
+    NDK_SET_VAR_MULTI_VALUE,
+    NDK_SET_VAR_MULTI_VALUE_DATA,
+    NDK_SET_VAR_HASH
+};
+
+
+char *  ndk_set_var                    (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_set_var_value              (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *  ndk_set_var_multi_value        (ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+
+
+char *  ndk_set_var_core               (ngx_conf_t *cf, ngx_str_t *name, ndk_set_var_t *filter);
+char *  ndk_set_var_value_core         (ngx_conf_t *cf, ngx_str_t *name, ngx_str_t *value, ndk_set_var_t *filter);
+char *  ndk_set_var_multi_value_core   (ngx_conf_t *cf, ngx_str_t *name, ngx_str_t *value, ndk_set_var_t *filter);
+
+#endif /* _NDK_SET_VAR_H_INCLUDED_ */
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string.c
new file mode 100644
index 0000000..7c2a965
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string.c
@@ -0,0 +1,434 @@
+
+
+int64_t
+ndk_atoi64 (u_char *line, size_t n)
+{
+    int64_t  value;
+
+    if (n == 0ll) {
+        return NGX_ERROR;
+    }
+
+    for (value = 0ll; n--; line++) {
+        if (*line < '0' || *line > '9') {
+            return NGX_ERROR;
+        }
+
+        value = value * 10ll + (*line - '0');
+    }
+
+    if (value < 0ll) {
+        return NGX_ERROR;
+    }
+
+    return value;
+}
+
+
+ngx_int_t
+ndk_strcntc (ngx_str_t *s, char c)
+{
+    ngx_int_t   n;
+    size_t      i;
+    u_char     *p;
+
+    i = s->len;
+    p = s->data;
+
+    for (n=0; i; i--, p++) {
+
+        if (*p == (u_char) c)
+            n++;
+    }
+
+    return  n;
+}
+
+
+ngx_int_t
+ndk_strccnt (char *s, char c)
+{
+    ngx_int_t   n;
+
+    n = 0;
+
+    while (*s != '\0') {
+
+        if (*s == 'c')
+            n++;
+
+        s++;
+    }
+
+    return  n;
+}
+
+
+
+ngx_array_t *
+ndk_str_array_create (ngx_pool_t *pool, char **s, ngx_int_t n)
+{
+    ngx_int_t        i;
+    ngx_str_t       *str;
+    ngx_array_t     *a;
+
+    a = ngx_array_create (pool, n, sizeof (ngx_str_t));
+    if (a == NULL)
+        return  NULL;
+
+
+    for (i=0; i<n; i++, s++) {
+
+        str = ngx_array_push (a);
+
+        str->data = (u_char *) *s;
+        str->len = strlen (*s);
+    }
+
+    return  a;
+}
+
+
+
+u_char *
+ndk_vcatstrf (ngx_pool_t *pool, ngx_str_t *dest, const char *fmt, va_list args)
+{
+    size_t          len, l, el;
+    int             argc;
+    u_char         *p, *m, *e, c, c1, *cp;
+
+    argc = strlen (fmt);
+
+    ngx_str_t      *s;
+    ndk_estr_t     *sp, *sp2, ss [argc];
+    u_char        cs [argc];
+
+    sp = sp2 = ss;
+    cp = cs;
+
+    len = 0;
+
+    /* TODO : maybe have 'e' at the beginning? */
+
+    /* parse format to get strings */
+
+    while (*fmt) {
+
+        switch (*fmt) {
+
+        case    'S'     :
+
+            s = va_arg (args, ngx_str_t *);
+
+            sp->data = s->data;
+            sp->len = s->len;
+            sp->escaped = 0;
+
+            len += sp->len;
+            break;
+
+        case    's'     :
+
+            sp->data = va_arg (args, u_char *);
+            sp->len = (size_t) ngx_strlen (sp->data);
+            sp->escaped = 0;
+
+            len += sp->len;
+            break;
+
+        case    'l'     :
+
+            sp->data = va_arg (args, u_char *);
+            sp->len = (size_t) va_arg (args, int);
+            sp->escaped = 0;
+
+            len += sp->len;
+            break;
+
+        case    'L'     :
+
+            sp->data = va_arg (args, u_char *);
+            sp->len = va_arg (args, size_t);
+            sp->escaped = 0;
+
+            len += sp->len;
+            break;
+
+        case    'e' :
+
+            p = va_arg (args, u_char *);
+
+            sp->data = p;
+
+            l = 0;
+            el = 0;
+            c = *p;
+
+            while (c != '\0') {
+
+                if (c == '\\') {
+                    l += 2;
+                    p += 2;
+                } else {
+                    l++;
+                    p++;
+                }
+
+                el++; 
+                c = *p;
+            }
+
+            sp->len = l;
+            sp->escaped = 1;
+
+            len += el;
+            break;
+
+        case    'E' :
+
+            s = va_arg (args, ngx_str_t *);
+
+            sp->data = s->data;
+            sp->len = s->len;
+
+            p = sp->data;
+
+            el = 0;
+            e = p + sp->len;
+
+            while (p < e) {
+
+                c = *p;
+
+                if (c == '\\') {
+                    p += 2;
+                } else {
+                    p++;
+                }
+
+                el++;                    
+            }
+
+            sp->escaped = 1;
+
+            len += el;
+            break;
+
+        case    'n' :
+
+            sp->data = va_arg (args, u_char *);
+            sp->len = (size_t) va_arg (args, int);
+
+            p = sp->data;
+
+            el = 0;
+            e = p + sp->len;
+
+            while (p < e) {
+
+                c = *p;
+
+                if (c == '\\') {
+                    p += 2;
+                } else {
+                    p++;
+                }
+
+                el++;                    
+            }
+
+            sp->escaped = 1;
+
+            len += el;
+            break;
+
+        case    'c' :
+
+            *cp = (u_char) va_arg (args, int);
+
+            sp->data = cp;
+            sp->len = (size_t) 1;
+
+            len++;
+            cp++;
+
+            break; 
+
+        default         :
+
+            ndk_log_alert (pool->log, 0, "catstrf () : format [%s] incorrect", fmt);
+
+            return  NULL;
+
+        }
+
+        sp++;
+        fmt++;
+    }
+
+
+
+    /* create space for string (assumes no NULL's in strings) */
+
+    ndk_palloc_rn (p, pool, len + 1);
+
+    dest->data = p;
+    dest->len = len;
+
+    /* copy other strings */
+
+    if (len) {
+
+        while (sp2 < sp) {
+
+            if (sp2->escaped) {
+
+                m = sp2->data;
+                e = m + sp2->len;
+
+                while (m < e) {
+
+                    c = *m;
+
+                    if (c == '\\') {
+
+                        if (m == e - 1) {
+                            *p = '\\';
+                            p++;
+                            break;
+                        }
+
+                        c1 = m[1];
+
+                        switch (c1) {
+
+                        case    'n' :
+                            *p = '\n';
+                            break;
+
+                        case    't' :
+                            *p = '\t';
+                            break;
+
+                        case    '0' :
+                            *p = '\0';
+                            break;
+
+                        case    '\\' :
+                            *p = '\\';
+                            break;
+
+                        case    's' :
+                            *p = ' ';
+                            break;
+
+                        case    'b' :
+                            *p = '\b';
+                            break;
+
+                        case    'r' :
+                            *p = '\r';
+                            break;
+
+                        default :
+
+                            *p = c1;
+                            break;
+                        }
+
+                        m += 2;
+
+                    } else {
+
+                        *p = c;
+                        m++;
+                    }
+
+                    p++;
+                }
+
+            } else {
+
+                p = ngx_cpymem (p, sp2->data, sp2->len);
+            }
+
+            sp2++;
+        }
+    }
+
+    *p = '\0';
+
+    return  dest->data;
+}
+
+
+u_char *
+ndk_catstrf (ngx_pool_t *pool, ngx_str_t *dest, const char *fmt, ...)
+{
+    u_char       *p;
+    va_list         args;
+
+    va_start (args, fmt);
+    p = ndk_vcatstrf (pool, dest, fmt, args);
+    va_end (args);
+
+    return  p;
+}
+
+
+ngx_int_t
+ndk_cmpstr (ngx_str_t *s1, ngx_str_t *s2)
+{
+    ngx_int_t   rv;
+    size_t      len1, len2;
+
+    len1 = s1->len;
+    len2 = s2->len;
+
+    if (len1 == len2) {
+        return  ngx_strncmp (s1->data, s2->data, len1);
+    }
+
+    if (len1 > len2) {
+
+        rv = ngx_strncmp (s1->data, s2->data, len2);
+        if (rv == 0)
+            return  1;
+
+        return  rv;
+    }
+
+    rv = ngx_strncmp (s1->data, s2->data, len1);
+    if (rv == 0)
+        return  -1;
+
+    return  rv;
+}
+
+
+u_char *
+ndk_dupstr (ngx_pool_t *pool, ngx_str_t *dest, ngx_str_t *src)
+{
+    u_char       *d;
+    size_t       n;
+
+    n = src->len;
+
+    ndk_palloc_rn (d, pool, n + 1);
+    ndk_strncpy (d, src->data, n);
+
+    dest->data = d;
+    dest->len = n;
+
+    return  d;
+}
+
+/*
+ngx_keyval_t *
+ndk_url_args_to_keyval_list (ngx_pool_t *pool, ngx_str_t *str)
+{
+    ngx_keyval_t    *kv;
+    ngx_st
+    
+}
+*/
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string.h
new file mode 100644
index 0000000..ecd21c4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string.h
@@ -0,0 +1,37 @@
+
+
+#if 1
+/* TODO : set ndk_hex_dump for older versions of Nginx */
+#define     ndk_hex_dump                    ngx_hex_dump
+#endif
+
+typedef struct {
+    size_t          len;
+    u_char         *data;
+    ngx_flag_t      escaped;
+} ndk_estr_t;
+
+int64_t         ndk_atoi64                  (u_char *line, size_t n);
+
+ngx_int_t       ndk_strcntc                 (ngx_str_t *s, char c);
+ngx_int_t       ndk_strccnt                 (char *s, char c);
+ngx_array_t *   ndk_str_array_create        (ngx_pool_t *pool, char **s, ngx_int_t n);
+u_char *        ndk_catstrf                 (ngx_pool_t *pool, ngx_str_t *dest, const char *fmt, ...);
+ngx_int_t       ndk_cmpstr                  (ngx_str_t *s1, ngx_str_t *s2);
+u_char *        ndk_dupstr                  (ngx_pool_t *pool, ngx_str_t *dest, ngx_str_t *src);
+
+static ngx_inline void
+ndk_strtoupper (u_char *p, size_t len)
+{
+    u_char *e = p + len;
+    for ( ; p<e; p++) {
+        *p = ngx_toupper(*p);
+    }
+}
+
+
+static ngx_inline u_char *
+ndk_strncpy (u_char *d, u_char *s, size_t n)
+{
+    return  (u_char *) strncpy ((char *) d, (char *) s, n);
+}
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string_util.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string_util.h
new file mode 100644
index 0000000..18a28f0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_string_util.h
@@ -0,0 +1,14 @@
+
+
+#define     ndk_str_init(ns,s)              {(ns).data = (u_char*) s; (ns).len = sizeof (s) - 1;}
+#define     ndk_strp_init(ns,s)             {(ns)->data = (u_char*) s; (ns)->len = sizeof (s) - 1;}
+
+#define     ndk_zero(p,sz)                  memset (p,'\0',sz)
+#define     ndk_zerop(p)                    ndk_zero (p,sizeof(*p))
+#define     ndk_zeropn(p,n)                 ndk_zero (p,sizeof(*p)*(n))
+#define     ndk_zerov(v)                    ndk_zero (&v,sizeof(v))
+
+#define     ngx_null_enum   { ngx_null_string, 0 }
+
+#define     ndk_memcpyp(d,s)                ngx_memcpy(d,s,sizeof(*s))
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_upstream_list.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_upstream_list.c
new file mode 100644
index 0000000..3a83a25
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_upstream_list.c
@@ -0,0 +1,205 @@
+
+
+/* TODO : generalize this into a generic list module, with weight */
+
+
+typedef struct {
+    ngx_uint_t      weight;
+    ngx_str_t       s;
+    ngx_conf_t     *cf;
+} ndk_upstream_list_parse_t;
+
+
+
+static ngx_int_t
+ndk_upstream_list_parse_weight (ndk_upstream_list_parse_t *ulp)
+{
+    size_t      i;
+    ngx_str_t   *s;
+
+    s = &ulp->s;
+
+    for (i=0; i<s->len; i++) {
+
+        if (s->data[i] < '0' || s->data[i] > '9')
+            break;
+    }
+
+    if (!i) {
+        ulp->weight = 1;
+        return  NGX_OK;
+    }
+
+    if (i == s->len) {
+        ngx_conf_log_error (NGX_LOG_EMERG, ulp->cf, 0,
+            "upstream list just consists of number \"%V\"", s);
+
+        return  NGX_ERROR;
+    }
+
+    if (s->data[i] != ':') {
+        ngx_conf_log_error (NGX_LOG_EMERG, ulp->cf, 0,
+            "upstream list not correct format \"%V\"", s);
+
+        return  NGX_ERROR;
+    }
+
+
+    ulp->weight = ngx_atoi (s->data, i);
+
+    s->data += (i + 1);
+    s->len -= (i + 1);
+
+    return  NGX_OK;
+}
+
+
+
+static char *
+ndk_upstream_list (ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    /* TODO : change this for getting upstream pointer if available */
+
+    ngx_uint_t                   buckets, count, i, j;
+    ngx_str_t                   *value, **bucket, *us;
+    ngx_array_t                 *ula;
+    ndk_upstream_list_t         *ul, *ule;
+    ndk_upstream_list_parse_t    ulp;
+
+    ndk_http_main_conf_t        *mcf;
+
+    mcf = ngx_http_conf_get_module_main_conf (cf, ndk_http_module);
+
+    ula = mcf->upstreams;
+
+    /* create array of upstream lists it doesn't already exist */
+
+    if (ula == NULL) {
+
+        ula = ngx_array_create (cf->pool, 4, sizeof (ndk_upstream_list_t));
+        if (ula == NULL)
+            return  NGX_CONF_ERROR;
+
+        mcf->upstreams = ula;
+    }
+
+
+    /* check to see if the list already exists */
+
+    value = cf->args->elts;
+    value++;
+
+    ul = ula->elts;
+    ule = ul + ula->nelts;
+
+    for ( ; ul<ule; ul++) {
+
+        if (ul->name.len == value->len &&
+            ngx_strncasecmp (ul->name.data, value->data, value->len) == 0) {
+
+            ngx_conf_log_error (NGX_LOG_EMERG, cf, 0,
+                           "duplicate upstream list name \"%V\"", value);
+
+            return  NGX_CONF_ERROR;
+        }
+    }
+
+
+    /* create a new list */
+
+    ul = ngx_array_push (ula);
+    if (ul == NULL)
+        return  NGX_CONF_ERROR;
+
+    ul->name = *value;
+
+
+
+    /* copy all the upstream names */
+
+    count = cf->args->nelts - 2;
+
+    us = ngx_palloc (cf->pool, count * sizeof (ngx_str_t));
+    if (us == NULL)
+        return  NGX_CONF_ERROR;
+
+    ngx_memcpy (us, value + 1, count * sizeof (ngx_str_t));
+
+
+    /* calculate the total number of buckets */
+
+    buckets = 0;
+
+    ulp.cf = cf;
+
+    for (i=0; i<count; i++, us++) {
+
+        ulp.s = *us;
+
+        if (ndk_upstream_list_parse_weight (&ulp) != NGX_OK)
+            return  NGX_CONF_ERROR;
+
+        buckets += ulp.weight;
+    }
+
+
+    /* allocate space for all buckets */
+
+    bucket = ngx_palloc (cf->pool, buckets * sizeof (ngx_str_t *));
+    if (bucket == NULL)
+        return  NGX_CONF_ERROR;
+
+    ul->elts = bucket;
+    ul->nelts = buckets;
+
+
+    /* set values for each bucket */
+
+    us -= count;
+
+    for (i=0; i<count; i++, us++) {
+
+        ulp.s = *us;
+
+        if (ndk_upstream_list_parse_weight (&ulp) != NGX_OK)
+            return  NGX_CONF_ERROR;
+
+        us->data = ulp.s.data;
+        us->len = ulp.s.len;
+
+        /* TODO : check format of upstream */
+        /* TODO : add automatic adding of http:// in upstreams? */
+
+        for (j=0; j<ulp.weight; j++, bucket++) {
+
+            *bucket = us;
+        }
+    }
+
+    return  NGX_CONF_OK;
+}
+
+
+ndk_upstream_list_t *
+ndk_get_upstream_list (ndk_http_main_conf_t *mcf, u_char *data, size_t len)
+{
+    ndk_upstream_list_t         *ul, *ule;
+    ngx_array_t                 *ua = mcf->upstreams;
+
+    if (ua == NULL) {
+        return NULL;
+    }
+
+    ul = ua->elts;
+    ule = ul + ua->nelts;
+
+    for (; ul < ule; ul++) {
+        if (ul->name.len == len && ngx_strncasecmp(ul->name.data, data, len) == 0)
+        {
+            return ul;
+        }
+    }
+
+    return NULL;
+}
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_upstream_list.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_upstream_list.h
new file mode 100644
index 0000000..3786456
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_upstream_list.h
@@ -0,0 +1,27 @@
+
+#if (NDK_UPSTREAM_LIST_CMDS)
+
+/* TODO : use the generated commands */
+
+{
+    ngx_string ("upstream_list"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_2MORE,
+    ndk_upstream_list,
+    0,
+    0,
+    NULL
+},
+
+#else
+
+typedef struct {
+    ngx_str_t       **elts;
+    ngx_uint_t        nelts;
+    ngx_str_t         name;
+} ndk_upstream_list_t;
+
+
+ndk_upstream_list_t *
+ndk_get_upstream_list (ndk_http_main_conf_t *mcf, u_char *data, size_t len);
+
+#endif
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_uri.c b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_uri.c
new file mode 100644
index 0000000..19e90e8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_uri.c
@@ -0,0 +1,45 @@
+
+
+/* TODO : check that this is correct */
+
+u_char *
+ndk_map_uri_to_path_add_suffix (ngx_http_request_t *r, ngx_str_t *path, ngx_str_t *suffix, ngx_int_t dot)
+{
+    size_t      root_size;
+    u_char     *p;
+
+    if (suffix->len) {
+
+        if (dot) {
+
+            p = ngx_http_map_uri_to_path (r, path, &root_size, suffix->len + 1);
+
+            if (p == NULL)
+                return  NULL;
+
+            *p = '.';
+            p++;
+
+        } else {
+
+            p = ngx_http_map_uri_to_path (r, path, &root_size, suffix->len);
+
+            if (p == NULL)
+                return  NULL;
+        }       
+
+        path->len--;
+
+        p = ngx_cpymem (p, suffix->data, suffix->len);
+        *p = '\0';
+
+        return  p;  
+    }
+
+    p = ngx_http_map_uri_to_path (r, path, &root_size, 0);
+
+    path->len--;
+
+    return  p;
+}
+
diff --git a/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_uri.h b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_uri.h
new file mode 100644
index 0000000..dac3880
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-ndk-0.3.4/src/ndk_uri.h
@@ -0,0 +1,6 @@
+
+
+
+u_char *  ndk_map_uri_to_path_add_suffix  (ngx_http_request_t *r, ngx_str_t *path, ngx_str_t *suffix, ngx_int_t dot);
+
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/.gitattributes b/modules_deb/libnginx-mod-http-set-misc-0.33/.gitattributes
new file mode 100644
index 0000000..6fe6f35
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/.gitattributes
@@ -0,0 +1 @@
+*.t linguist-language=Text
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/.gitignore b/modules_deb/libnginx-mod-http-set-misc-0.33/.gitignore
new file mode 100644
index 0000000..7500112
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/.gitignore
@@ -0,0 +1,72 @@
+reindex
+.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
+all
+t/t.sh
+test/t/servroot/
+releng
+reset
+*.t_
+genmobi.sh
+*.mobi
+misc/chunked
+ctags
+src/base32.h
+src/uri.c
+src/module.c
+src/upstream.c
+src/upstream.h
+src/uri.c
+src/sql.c
+src/uri.h
+src/sql.h
+src/uri.h
+src/value.c
+src/base32.c
+src/value.h
+src/hash.h
+src/hash.c
+src/today.h
+src/today.c
+src/json.[ch]
+all.sh
+go
+t/servroot/
+src/base64.c
+src/base64.h
+src/hex.c
+src/hex.h
+src/hmac.c
+src/hmac.h
+src/rotate.[ch]
+analyze
+buildroot/
+src/module.h
+work/
+src/random.[ch]
+build1[0-9]
+nginx
+analyze
+src/rotate.[ch]
+*.plist
+Makefile
+src/base64url.[ch]
+src/expired.[ch]
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/.travis.yml b/modules_deb/libnginx-mod-http-set-misc-0.33/.travis.yml
new file mode 100644
index 0000000..a841a11
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/.travis.yml
@@ -0,0 +1,54 @@
+sudo: required
+dist: trusty
+
+branches:
+  only:
+    - "master"
+
+os: linux
+
+language: c
+compiler: gcc
+
+env:
+  global:
+    - LUAJIT_PREFIX=/opt/luajit21
+    - LUAJIT_LIB=$LUAJIT_PREFIX/lib
+    - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
+    - LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
+    - LUA_INCLUDE_DIR=$LUAJIT_INC
+    - LUA_CMODULE_DIR=/lib
+    - JOBS=3
+    - NGX_BUILD_JOBS=$JOBS
+    - TEST_NGINX_SLEEP=0.006
+  matrix:
+    - NGINX_VERSION=1.19.9
+
+before_install:
+  - sudo apt-get install -qq -y axel cpanminus libtest-base-perl libtext-diff-perl liburi-perl libwww-perl libtest-longstring-perl liblist-moreutils-perl > build.log 2>&1 || (cat build.log && exit 1)
+
+install:
+  - git clone https://github.com/openresty/nginx-devel-utils.git
+  - git clone https://github.com/openresty/openresty.git ../openresty
+  - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
+  - git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
+  - git clone https://github.com/openresty/test-nginx.git
+  - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git
+  - git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
+  - git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core
+  - git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
+  - git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
+  - git clone https://github.com/calio/iconv-nginx-module.git ../iconv-nginx-module
+
+script:
+  - export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH
+  - ngx-releng > check.txt || true
+  - lines=`wc -l check.txt | awk '{print $1}'`; if [ $lines -gt 3 ]; then cat check.txt; exit 1; fi
+  - cd luajit2
+  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT' > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ../test-nginx && sudo cpanm . && cd ..
+  - export NGX_BUILD_CC=$CC
+  - sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
+  - nginx -V
+  - prove -r t
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/README.markdown b/modules_deb/libnginx-mod-http-set-misc-0.33/README.markdown
new file mode 100644
index 0000000..f7f4010
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/README.markdown
@@ -0,0 +1,1451 @@
+<!---
+Don't edit this file manually! Instead you should generate it by using:
+    wiki2markdown.pl doc/HttpSetMiscModule.wiki
+-->
+
+Name
+====
+
+**ngx_set_misc** - Various set_xxx directives added to nginx's rewrite module (md5/sha1, sql/json quoting, and many more)
+
+*This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
+
+Table of Contents
+=================
+
+* [Name](#name)
+* [Version](#version)
+* [Synopsis](#synopsis)
+* [Description](#description)
+* [Directives](#directives)
+    * [set_if_empty](#set_if_empty)
+    * [set_quote_sql_str](#set_quote_sql_str)
+    * [set_quote_pgsql_str](#set_quote_pgsql_str)
+    * [set_quote_json_str](#set_quote_json_str)
+    * [set_unescape_uri](#set_unescape_uri)
+    * [set_escape_uri](#set_escape_uri)
+    * [set_hashed_upstream](#set_hashed_upstream)
+    * [set_encode_base32](#set_encode_base32)
+    * [set_base32_padding](#set_base32_padding)
+    * [set_misc_base32_padding](#set_misc_base32_padding)
+    * [set_base32_alphabet](#set_base32_alphabet)
+    * [set_decode_base32](#set_decode_base32)
+    * [set_encode_base64](#set_encode_base64)
+    * [set_decode_base64](#set_decode_base64)
+    * [set_encode_base64url](#set_encode_base64url)
+    * [set_decode_base64url](#set_decode_base64url)
+    * [set_encode_hex](#set_encode_hex)
+    * [set_decode_hex](#set_decode_hex)
+    * [set_sha1](#set_sha1)
+    * [set_md5](#set_md5)
+    * [set_hmac_sha1](#set_hmac_sha1)
+    * [set_hmac_sha256](#set_hmac_sha256)
+    * [set_random](#set_random)
+    * [set_secure_random_alphanum](#set_secure_random_alphanum)
+    * [set_secure_random_lcalpha](#set_secure_random_lcalpha)
+    * [set_rotate](#set_rotate)
+    * [set_local_today](#set_local_today)
+    * [set_formatted_gmt_time](#set_formatted_gmt_time)
+    * [set_formatted_local_time](#set_formatted_local_time)
+* [Caveats](#caveats)
+* [Installation](#installation)
+    * [Building as a dynamic module](#building-as-a-dynamic-module)
+* [Compatibility](#compatibility)
+* [Report Bugs](#report-bugs)
+* [Source Repository](#source-repository)
+* [Changes](#changes)
+* [Test Suite](#test-suite)
+* [Getting involved](#getting-involved)
+* [Author](#author)
+* [Copyright & License](#copyright--license)
+* [See Also](#see-also)
+
+Version
+=======
+
+This document describes ngx_set_misc [v0.32](https://github.com/openresty/set-misc-nginx-module/tags) released on 19 April 2018.
+
+Synopsis
+========
+
+```nginx
+
+ location /foo {
+     set $a $arg_a;
+     set_if_empty $a 56;
+
+     # GET /foo?a=32 will yield $a == 32
+     # while GET /foo and GET /foo?a= will
+     # yeild $a == 56 here.
+ }
+
+ location /bar {
+     set $foo "hello\n\n'\"\\";
+     set_quote_sql_str $foo $foo; # for mysql
+
+     # OR in-place editing:
+     #   set_quote_sql_str $foo;
+
+     # now $foo is: 'hello\n\n\'\"\\'
+ }
+
+ location /bar {
+     set $foo "hello\n\n'\"\\";
+     set_quote_pgsql_str $foo;  # for PostgreSQL
+
+     # now $foo is: E'hello\n\n\'\"\\'
+ }
+
+ location /json {
+     set $foo "hello\n\n'\"\\";
+     set_quote_json_str $foo $foo;
+
+     # OR in-place editing:
+     #   set_quote_json_str $foo;
+
+     # now $foo is: "hello\n\n'\"\\"
+ }
+
+ location /baz {
+     set $foo "hello%20world";
+     set_unescape_uri $foo $foo;
+
+     # OR in-place editing:
+     #   set_unescape_uri $foo;
+
+     # now $foo is: hello world
+ }
+
+ upstream_list universe moon sun earth;
+ upstream moon { ... }
+ upstream sun { ... }
+ upstream earth { ... }
+ location /foo {
+     set_hashed_upstream $backend universe $arg_id;
+     drizzle_pass $backend; # used with ngx_drizzle
+ }
+
+ location /base32 {
+     set $a 'abcde';
+     set_encode_base32 $a;
+     set_decode_base32 $b $a;
+
+     # now $a == 'c5h66p35' and
+     # $b == 'abcde'
+ }
+
+ location /base64 {
+     set $a 'abcde';
+     set_encode_base64 $a;
+     set_decode_base64 $b $a;
+
+     # now $a == 'YWJjZGU=' and
+     # $b == 'abcde'
+ }
+
+ location /hex {
+     set $a 'abcde';
+     set_encode_hex $a;
+     set_decode_hex $b $a;
+
+     # now $a == '6162636465' and
+     # $b == 'abcde'
+ }
+
+ # GET /sha1 yields the output
+ #   aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d
+ location /sha1 {
+     set_sha1 $a hello;
+     echo $a;
+ }
+
+ # ditto
+ location /sha1 {
+     set $a hello;
+     set_sha1 $a;
+     echo $a;
+ }
+
+ # GET /today yields the date of today in local time using format 'yyyy-mm-dd'
+ location /today {
+     set_local_today $today;
+     echo $today;
+ }
+
+ # GET /signature yields the hmac-sha-1 signature
+ # given a secret and a string to sign
+ # this example yields the base64 encoded singature which is
+ # "HkADYytcoQQzqbjQX33k/ZBB/DQ="
+ location /signature {
+     set $secret_key 'secret-key';
+     set $string_to_sign "some-string-to-sign";
+     set_hmac_sha1 $signature $secret_key $string_to_sign;
+     set_encode_base64 $signature $signature;
+     echo $signature;
+ }
+
+ location = /rand {
+     set $from 3;
+     set $to 15;
+     set_random $rand $from $to;
+
+     # or write directly
+     #   set_random $rand 3 15;
+
+     echo $rand;  # will print a random integer in the range [3, 15]
+ }
+```
+
+Description
+===========
+
+This module extends the standard HttpRewriteModule's directive set to provide more functionalities like URI escaping and unescaping, JSON quoting, Hexadecimal/MD5/SHA1/Base32/Base64 digest encoding and decoding, random number generator, and more!
+
+Every directive provided by this module can be mixed freely with other [ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)'s directives, like [if](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#if) and [set](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#set). (Thanks to the [Nginx Devel Kit](https://github.com/simpl/ngx_devel_kit)!)
+
+[Back to TOC](#table-of-contents)
+
+Directives
+==========
+
+[Back to TOC](#table-of-contents)
+
+set_if_empty
+------------
+**syntax:** *set_if_empty $dst &lt;src&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Assign the value of the argument `<src>` if and only if variable `$dst` is empty (i.e., not found or has an empty string value).
+
+In the following example,
+
+```nginx
+
+ set $a 32;
+ set_if_empty $a 56;
+```
+
+the variable `$dst` will take the value 32 at last. But in the sample
+
+```nginx
+
+ set $a '';
+ set $value "hello, world"
+ set_if_empty $a $value;
+```
+
+`$a` will take the value `"hello, world"` at last.
+
+[Back to TOC](#table-of-contents)
+
+set_quote_sql_str
+-----------------
+**syntax:** *set_quote_sql_str $dst &lt;src&gt;*
+
+**syntax:** *set_quote_sql_str $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+When taking two arguments, this directive will quote the value of the second argument `<src>` by MySQL's string value quoting rule and assign the result into the first argument, variable `$dst`. For example,
+
+```nginx
+
+ location /test {
+     set $value "hello\n\r'\"\\";
+     set_quote_sql_str $quoted $value;
+
+     echo $quoted;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+```sql
+
+ 'hello\n\r\'\"\\'
+```
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+When taking a single argument, this directive will do in-place modification of the argument variable. For example,
+
+```nginx
+
+ location /test {
+     set $value "hello\n\r'\"\\";
+     set_quote_sql_str $value;
+
+     echo $value;
+ }
+```
+
+then request `GET /test` will give exactly the same output as the previous example.
+
+This directive is usually used to prevent SQL injection.
+
+This directive can be invoked by [lua-nginx-module](http://github.com/openresty/lua-nginx-module)'s [ndk.set_var.DIRECTIVE](http://github.com/openresty/lua-nginx-module#ndkset_vardirective) interface and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module)'s [array_map_op](http://github.com/openresty/array-var-nginx-module#array_map_op) directive.
+
+[Back to TOC](#table-of-contents)
+
+set_quote_pgsql_str
+-------------------
+**syntax:** *set_quote_pgsql_str $dst &lt;src&gt;*
+
+**syntax:** *set_quote_pgsql_str $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+Very much like [set_quote_sql_str](#set_quote_sql_str), but with PostgreSQL quoting rules for SQL string literals.
+
+[Back to TOC](#table-of-contents)
+
+set_quote_json_str
+------------------
+**syntax:** *set_quote_json_str $dst &lt;src&gt;*
+
+**syntax:** *set_quote_json_str $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+When taking two arguments, this directive will quote the value of the second argument `<src>` by JSON string value quoting rule and assign the result into the first argument, variable `$dst`. For example,
+
+```nginx
+
+ location /test {
+     set $value "hello\n\r'\"\\";
+     set_quote_json_str $quoted $value;
+
+     echo $quoted;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+```javascript
+
+ "hello\n\r'\"\\"
+```
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+When taking a single argument, this directive will do in-place modification of the argument variable. For example,
+
+```nginx
+
+ location /test {
+     set $value "hello\n\r'\"\\";
+     set_quote_json_str $value;
+
+     echo $value;
+ }
+```
+
+then request `GET /test` will give exactly the same output as the previous example.
+
+This directive can be invoked by [lua-nginx-module](http://github.com/openresty/lua-nginx-module)'s [ndk.set_var.DIRECTIVE](http://github.com/openresty/lua-nginx-module#ndkset_vardirective) interface and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module)'s [array_map_op](http://github.com/openresty/array-var-nginx-module#array_map_op) directive.
+
+[Back to TOC](#table-of-contents)
+
+set_unescape_uri
+----------------
+**syntax:** *set_unescape_uri $dst &lt;src&gt;*
+
+**syntax:** *set_unescape_uri $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+When taking two arguments, this directive will unescape the value of the second argument `<src>` as a URI component and assign the result into the first argument, variable `$dst`. For example,
+
+```nginx
+
+ location /test {
+     set_unescape_uri $key $arg_key;
+     echo $key;
+ }
+```
+
+Then request `GET /test?key=hello+world%21` will yield the following output
+
+```
+hello world!
+```
+
+The nginx standard [$arg_PARAMETER](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_arg_) variable holds the raw (escaped) value of the URI parameter. So we need the `set_unescape_uri` directive to unescape it first.
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+When taking a single argument, this directive will do in-place modification of the argument variable. For example,
+
+```nginx
+
+ location /test {
+     set $key $arg_key;
+     set_unescape_uri $key;
+
+     echo $key;
+ }
+```
+
+then request `GET /test?key=hello+world%21` will give exactly the same output as the previous example.
+
+This directive can be invoked by [lua-nginx-module](http://github.com/openresty/lua-nginx-module)'s [ndk.set_var.DIRECTIVE](http://github.com/openresty/lua-nginx-module#ndkset_vardirective) interface and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module)'s [array_map_op](http://github.com/openresty/array-var-nginx-module#array_map_op) directive.
+
+[Back to TOC](#table-of-contents)
+
+set_escape_uri
+--------------
+**syntax:** *set_escape_uri $dst &lt;src&gt;*
+
+**syntax:** *set_escape_uri $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+Very much like the [set_unescape_uri](#set_unescape_uri) directive, but does the conversion the other way around, i.e., URL component escaping.
+
+[Back to TOC](#table-of-contents)
+
+set_hashed_upstream
+-------------------
+**syntax:** *set_hashed_upstream $dst &lt;upstream_list_name&gt; &lt;src&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Hashes the string argument `<src>` into one of the upstream name included in the upstream list named `<upstream_list_name>`. The hash function being used is simple modulo.
+
+Here's an example,
+
+```nginx
+
+ upstream moon { ... }
+ upstream sun { ... }
+ upstream earth { ... }
+
+ upstream_list universe moon sun earth;
+
+ location /test {
+     set_unescape_uri $key $arg_key;
+     set $list_name universe;
+     set_hashed_upstream $backend $list_name $key;
+
+     echo $backend;
+ }
+```
+
+Then `GET /test?key=blah` will output either "moon", "sun", or "earth", depending on the actual value of the `key` query argument.
+
+This directive is usually used to compute an nginx variable to be passed to [memc-nginx-module](http://github.com/openresty/memc-nginx-module)'s [memc_pass](http://github.com/openresty/memc-nginx-module#memc_pass) directive, [redis2-nginx-module](http://github.com/openresty/redis2-nginx-module)'s [[HttpRedis2Module#redis2_pass]] directive, and [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html)'s [proxy_pass](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass) directive, among others.
+
+[Back to TOC](#table-of-contents)
+
+set_encode_base32
+-----------------
+**syntax:** *set_encode_base32 $dst &lt;src&gt;*
+
+**syntax:** *set_encode_base32 $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+When taking two arguments, this directive will encode the value of the second argument `<src>` to its base32(hex) digest and assign the result into the first argument, variable `$dst`. For example,
+
+```nginx
+
+ location /test {
+     set $raw "abcde";
+     set_encode_base32 $digest $raw;
+
+     echo $digest;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+```
+c5h66p35
+```
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+RFC forces the `[A-Z2-7]` RFC-3548 compliant encoding, but we are using the "base32hex" encoding (`[0-9a-v]`) by default. The [set_base32_alphabet](#set_base32_alphabet) directive (first introduced in `v0.28`) allows you to change the alphabet used for encoding/decoding so RFC-3548 compliant encoding is still possible by custom configurations.
+
+By default, the `=` character is used to pad the left-over bytes due to alignment. But the padding behavior can be completely disabled by setting [set_base32_padding](#set_base32_padding) `off`.
+
+When taking a single argument, this directive will do in-place modification of the argument variable. For example,
+
+```nginx
+
+ location /test {
+     set $value "abcde";
+     set_encode_base32 $value;
+
+     echo $value;
+ }
+```
+
+then request `GET /test` will give exactly the same output as the previous example.
+
+This directive can be invoked by [lua-nginx-module](http://github.com/openresty/lua-nginx-module)'s [ndk.set_var.DIRECTIVE](http://github.com/openresty/lua-nginx-module#ndkset_vardirective) interface and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module)'s [array_map_op](http://github.com/openresty/array-var-nginx-module#array_map_op) directive.
+
+[Back to TOC](#table-of-contents)
+
+set_base32_padding
+------------------
+**syntax:** *set_base32_padding on|off*
+
+**default:** *on*
+
+**context:** *http, server, server if, location, location if*
+
+**phase:** *no*
+
+This directive can control whether to pad left-over bytes with the "=" character when encoding a base32 digest by the
+[set_encode_base32](#set_encode_base32) directive.
+
+This directive was first introduced in `v0.28`. If you use earlier versions of this module, then you should use [set_misc_base32_padding](#set_misc_base32_padding) instead.
+
+[Back to TOC](#table-of-contents)
+
+set_misc_base32_padding
+-----------------------
+**syntax:** *set_misc_base32_padding on|off*
+
+**default:** *on*
+
+**context:** *http, server, server if, location, location if*
+
+**phase:** *no*
+
+This directive has been deprecated since `v0.28`. Use [set_base32_padding](#set_base32_padding) instead if you are using `v0.28+`.
+
+[Back to TOC](#table-of-contents)
+
+set_base32_alphabet
+-------------------
+**syntax:** *set_base32_alphabet &lt;alphabet&gt;*
+
+**default:** *"0123456789abcdefghijklmnopqrstuv"*
+
+**context:** *http, server, server if, location, location if*
+
+**phase:** *no*
+
+This directive controls the alphabet used for encoding/decoding a base32 digest. It accepts a string containing the desired alphabet like "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567" for standard alphabet.
+
+Extended (base32hex) alphabet is used by default.
+
+This directive was first introduced in `v0.28`.
+
+[Back to TOC](#table-of-contents)
+
+set_decode_base32
+-----------------
+**syntax:** *set_decode_base32 $dst &lt;src&gt;*
+
+**syntax:** *set_decode_base32 $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+Similar to the [set_encode_base32](#set_encode_base32) directive, but does exactly the opposite operation, .i.e, decoding a base32(hex) digest into its original form.
+
+[Back to TOC](#table-of-contents)
+
+set_encode_base64
+-----------------
+**syntax:** *set_encode_base64 $dst &lt;src&gt;*
+
+**syntax:** *set_encode_base64 $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+When taking two arguments, this directive will encode the value of the second argument `<src>` to its base64 digest and assign the result into the first argument, variable `$dst`. For example,
+
+```nginx
+
+ location /test {
+     set $raw "abcde";
+     set_encode_base64 $digest $raw;
+
+     echo $digest;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+```
+YWJjZGU=
+```
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+When taking a single argument, this directive will do in-place modification of the argument variable. For example,
+
+```nginx
+
+ location /test {
+     set $value "abcde";
+     set_encode_base64 $value;
+
+     echo $value;
+ }
+```
+
+then request `GET /test` will give exactly the same output as the previous example.
+
+This directive can be invoked by [lua-nginx-module](http://github.com/openresty/lua-nginx-module)'s [ndk.set_var.DIRECTIVE](http://github.com/openresty/lua-nginx-module#ndkset_vardirective) interface and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module)'s [array_map_op](http://github.com/openresty/array-var-nginx-module#array_map_op) directive.
+
+[Back to TOC](#table-of-contents)
+
+set_encode_base64url
+-----------------
+**syntax:** *set_encode_base64url $dst &lt;src&gt;*
+
+**syntax:** *set_encode_base64url $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+When taking two arguments, this directive will encode the value of the second argument `<src>` to its base64 url safe digest and assign the result into the first argument, variable `$dst`. For example,
+
+```nginx
+
+ location /test {
+     set $raw "abcde";
+     set_encode_base64url $digest $raw;
+
+     echo $digest;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+```
+YWJjZGU=
+```
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+When taking a single argument, this directive will do in-place modification of the argument variable. For example,
+
+```nginx
+
+ location /test {
+     set $value "abcde";
+     set_encode_base64url $value;
+
+     echo $value;
+ }
+```
+
+then request `GET /test` will give exactly the same output as the previous example.
+
+This directive can be invoked by [lua-nginx-module](http://github.com/openresty/lua-nginx-module)'s [ndk.set_var.DIRECTIVE](http://github.com/openresty/lua-nginx-module#ndkset_vardirective) interface and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module)'s [array_map_op](http://github.com/openresty/array-var-nginx-module#array_map_op) directive.
+
+[Back to TOC](#table-of-contents)
+
+set_decode_base64
+-----------------
+**syntax:** *set_decode_base64 $dst &lt;src&gt;*
+
+**syntax:** *set_decode_base64 $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+Similar to the [set_encode_base64](#set_encode_base64) directive, but does exactly the opposite operation, .i.e, decoding a base64 digest into its original form.
+
+[Back to TOC](#table-of-contents)
+
+set_decode_base64url
+-----------------
+**syntax:** *set_decode_base64url $dst &lt;src&gt;*
+
+**syntax:** *set_decode_base64url $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+Similar to the [set_encode_base64url](#set_encode_base64url) directive, but does exactly the the opposite operation, .i.e, decoding a base64 url safe digest into its original form.
+
+[Back to TOC](#table-of-contents)
+
+set_encode_hex
+--------------
+**syntax:** *set_encode_hex $dst &lt;src&gt;*
+
+**syntax:** *set_encode_hex $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+When taking two arguments, this directive will encode the value of the second argument `<src>` to its hexadecimal digest and assign the result into the first argument, variable `$dst`. For example,
+
+```nginx
+
+ location /test {
+     set $raw "章亦春";
+     set_encode_hex $digest $raw;
+
+     echo $digest;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+```
+e7aba0e4baa6e698a5
+```
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+When taking a single argument, this directive will do in-place modification of the argument variable. For example,
+
+```nginx
+
+ location /test {
+     set $value "章亦春";
+     set_encode_hex $value;
+
+     echo $value;
+ }
+```
+
+then request `GET /test` will give exactly the same output as the previous example.
+
+This directive can be invoked by [lua-nginx-module](http://github.com/openresty/lua-nginx-module)'s [ndk.set_var.DIRECTIVE](http://github.com/openresty/lua-nginx-module#ndkset_vardirective) interface and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module)'s [array_map_op](http://github.com/openresty/array-var-nginx-module#array_map_op) directive.
+
+[Back to TOC](#table-of-contents)
+
+set_decode_hex
+--------------
+**syntax:** *set_decode_hex $dst &lt;src&gt;*
+
+**syntax:** *set_decode_hex $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+Similar to the [set_encode_hex](#set_encode_hex) directive, but does exactly the opposite operation, .i.e, decoding a hexadecimal digest into its original form.
+
+[Back to TOC](#table-of-contents)
+
+set_sha1
+--------
+**syntax:** *set_sha1 $dst &lt;src&gt;*
+
+**syntax:** *set_sha1 $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+When taking two arguments, this directive will encode the value of the second argument `<src>` to its [SHA-1](http://en.wikipedia.org/wiki/SHA-1) digest and assign the result into the first argument, variable `$dst`. The hexadecimal form of the `SHA-1` digest will be generated automatically, use [set_decode_hex](#set_decode_hex) to decode the result if you want the binary form of the `SHA-1` digest.
+
+For example,
+
+```nginx
+
+ location /test {
+     set $raw "hello";
+     set_sha1 $digest $raw;
+
+     echo $digest;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+```
+aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d
+```
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+When taking a single argument, this directive will do in-place modification of the argument variable. For example,
+
+```nginx
+
+ location /test {
+     set $value "hello";
+     set_sha1 $value;
+
+     echo $value;
+ }
+```
+
+then request `GET /test` will give exactly the same output as the previous example.
+
+This directive can be invoked by [lua-nginx-module](http://github.com/openresty/lua-nginx-module)'s [ndk.set_var.DIRECTIVE](http://github.com/openresty/lua-nginx-module#ndkset_vardirective) interface and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module)'s [array_map_op](http://github.com/openresty/array-var-nginx-module#array_map_op) directive.
+
+[Back to TOC](#table-of-contents)
+
+set_md5
+-------
+**syntax:** *set_md5 $dst &lt;src&gt;*
+
+**syntax:** *set_md5 $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+**category:** *ndk_set_var_value*
+
+When taking two arguments, this directive will encode the value of the second argument `<src>` to its [MD5](http://en.wikipedia.org/wiki/MD5) digest and assign the result into the first argument, variable `$dst`. The hexadecimal form of the `MD5` digest will be generated automatically, use [set_decode_hex](#set_decode_hex) to decode the result if you want the binary form of the `MD5` digest.
+
+For example,
+
+```nginx
+
+ location /test {
+     set $raw "hello";
+     set_md5 $digest $raw;
+
+     echo $digest;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+
+    5d41402abc4b2a76b9719d911017c592
+
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+When taking a single argument, this directive will do in-place modification of the argument variable. For example,
+
+```nginx
+
+ location /test {
+     set $value "hello";
+     set_md5 $value;
+
+     echo $value;
+ }
+```
+
+then request `GET /test` will give exactly the same output as the previous example.
+
+This directive can be invoked by [lua-nginx-module](http://github.com/openresty/lua-nginx-module)'s [ndk.set_var.DIRECTIVE](http://github.com/openresty/lua-nginx-module#ndkset_vardirective) interface and [array-var-nginx-module](http://github.com/openresty/array-var-nginx-module)'s [array_map_op](http://github.com/openresty/array-var-nginx-module#array_map_op) directive.
+
+[Back to TOC](#table-of-contents)
+
+set_hmac_sha1
+-------------
+**syntax:** *set_hmac_sha1 $dst &lt;secret_key&gt; &lt;src&gt;*
+
+**syntax:** *set_hmac_sha1 $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Computes the [HMAC-SHA1](http://en.wikipedia.org/wiki/HMAC) digest of the argument `<src>` and assigns the result into the argument variable `$dst` with the secret key `<secret_key>`.
+
+The raw binary form of the `HMAC-SHA1` digest will be generated, use [set_encode_base64](#set_encode_base64), for example, to encode the result to a textual representation if desired.
+
+For example,
+
+```nginx
+
+ location /test {
+     set $secret 'thisisverysecretstuff';
+     set $string_to_sign 'some string we want to sign';
+     set_hmac_sha1 $signature $secret $string_to_sign;
+     set_encode_base64 $signature $signature;
+     echo $signature;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+```
+R/pvxzHC4NLtj7S+kXFg/NePTmk=
+```
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+This directive requires the OpenSSL library enabled in your Nginx build (usually by passing the `--with-http_ssl_module` option to the `./configure` script).
+
+[Back to TOC](#table-of-contents)
+
+set_hmac_sha256
+---------------
+**syntax:** *set_hmac_sha256 $dst &lt;secret_key&gt; &lt;src&gt;*
+
+**syntax:** *set_hmac_sha256 $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Computes the [HMAC-SHA256](http://en.wikipedia.org/wiki/HMAC) digest of the argument `<src>` and assigns the result into the argument variable `$dst` with the secret key `<secret_key>`.
+
+The raw binary form of the `HMAC-SHA256` digest will be generated, use [set_encode_base64](#set_encode_base64), for example, to encode the result to a textual representation if desired.
+
+For example,
+
+```nginx
+
+ location /test {
+     set $secret 'thisisverysecretstuff';
+     set $string_to_sign 'some string we want to sign';
+     set_hmac_sha256 $signature $secret $string_to_sign;
+     set_encode_base64 $signature $signature;
+     echo $signature;
+ }
+```
+
+Then request `GET /test` will yield the following output
+
+```
+4pU3GRQrKKIoeLb9CqYsavHE2l6Hx+KMmRmesU+Cfrs=
+```
+
+Please note that we're using [echo-nginx-module](http://github.com/openresty/echo-nginx-module)'s [echo directive](http://github.com/openresty/echo-nginx-module#echo) here to output values of nginx variables directly.
+
+This directive requires the OpenSSL library enabled in your Nginx build (usually by passing the `--with-http_ssl_module` option to the `./configure` script).
+
+[Back to TOC](#table-of-contents)
+
+set_random
+----------
+**syntax:** *set_random $res &lt;from&gt; &lt;to&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Generates a (pseudo) random number (in textual form) within the range `[<$from>, <$to>]` (inclusive).
+
+Only non-negative numbers are allowed for the `<from>` and `<to>` arguments.
+
+When `<from>` is greater than `<to>`, their values will be exchanged accordingly.
+
+For instance,
+
+```nginx
+
+ location /test {
+     set $from 5;
+     set $to 7;
+     set_random $res $from $to;
+
+     echo $res;
+ }
+```
+
+then request `GET /test` will output a number between 5 and 7 (i.e., among 5, 6, 7).
+
+For now, there's no way to configure a custom random generator seed.
+
+Behind the scene, it makes use of the standard C function `rand()`.
+
+This directive was first introduced in the `v0.22rc1` release.
+
+See also [set_secure_random_alphanum](#set_secure_random_alphanum) and [set_secure_random_lcalpha](#set_secure_random_lcalpha).
+
+[Back to TOC](#table-of-contents)
+
+set_secure_random_alphanum
+--------------------------
+**syntax:** *set_secure_random_alphanum $res &lt;length&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Generates a cryptographically-strong random string `<length>` characters long with the alphabet `[a-zA-Z0-9]`.
+
+`<length>` may be between 1 and 64, inclusive.
+
+For instance,
+
+```nginx
+
+ location /test {
+     set_secure_random_alphanum $res 32;
+
+     echo $res;
+ }
+```
+
+then request `GET /test` will output a string like `ivVVRP2DGaAqDmdf3Rv4ZDJ7k0gOfASz`.
+
+This functionality depends on the presence of the `/dev/urandom` device, available on most UNIX-like systems.
+
+See also [set_secure_random_lcalpha](#set_secure_random_lcalpha) and [set_random](#set_random).
+
+This directive was first introduced in the `v0.22rc8` release.
+
+[Back to TOC](#table-of-contents)
+
+set_secure_random_lcalpha
+-------------------------
+**syntax:** *set_secure_random_lcalpha $res &lt;length&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Generates a cryptographically-strong random string `<length>` characters long with the alphabet `[a-z]`.
+
+`<length>` may be between 1 and 64, inclusive.
+
+For instance,
+
+```nginx
+
+ location /test {
+     set_secure_random_lcalpha $res 32;
+
+     echo $res;
+ }
+```
+
+then request `GET /test` will output a string like `kcuxcddktffsippuekhshdaclaquiusj`.
+
+This functionality depends on the presence of the `/dev/urandom` device, available on most UNIX-like systems.
+
+This directive was first introduced in the `v0.22rc8` release.
+
+See also [set_secure_random_alphanum](#set_secure_random_alphanum) and [set_random](#set_random).
+
+[Back to TOC](#table-of-contents)
+
+set_rotate
+----------
+**syntax:** *set_rotate $value &lt;from&gt; &lt;to&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Increments `$value` but keeps it in range from `<from>` to `<to>`. 
+If `$value` is greater than `<to>` or less than `<from>` is will be 
+set to `<from>` value.
+
+The current value after running this directive will always be saved on a per-location basis. And the this saved value will be used for incrementation when the `$value` is not initialized or has a bad value.
+
+Only non-negative numbers are allowed for the `<from>` and `<to>` arguments.
+
+When `<from>` is greater than `<to>`, their values will be exchanged accordingly.
+
+For instance,
+
+```nginx
+
+ location /rotate {
+     default_type text/plain;
+     set $counter $cookie_counter;
+     set_rotate $counter 1 5;
+     echo $counter;
+     add_header Set-Cookie counter=$counter;
+ }
+```
+
+then request `GET /rotate` will output next number between 1 and 5 (i.e., 1, 2, 3, 4, 5) on each
+refresh of the page. This directive may be userful for banner rotation purposes.
+
+Another example is to use server-side value persistence to do simple round-robin:
+
+```nginx
+
+ location /rotate {
+     default_type text/plain;
+     set_rotate $counter 0 3;
+     echo $counter;
+ }
+```
+
+And accessing `/rotate` will also output integer sequence 0, 1, 2, 3, 0, 1, 2, 3, and so on.
+
+This directive was first introduced in the `v0.22rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+set_local_today
+---------------
+**syntax:** *set_local_today $dst*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Set today's date ("yyyy-mm-dd") in localtime to the argument variable `$dst`.
+
+Here's an example,
+
+```nginx
+
+ location /today {
+     set_local_today $today;
+     echo $today;
+ }
+```
+
+then request `GET /today` will output something like
+
+```
+2011-08-16
+```
+
+and year, the actual date you get here will vary every day ;)
+
+Behind the scene, this directive utilizes the `ngx_time` API in the Nginx core, so usually no syscall is involved due to the time caching mechanism in the Nginx core.
+
+[Back to TOC](#table-of-contents)
+
+set_formatted_gmt_time
+----------------------
+**syntax:** *set_formatted_gmt_time $res &lt;time-format&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Set a formatted GMT time to variable `$res` (as the first argument) using the format string in the second argument.
+
+All the conversion specification notations in the standard C function `strftime` are supported, like `%Y` (for 4-digit years) and `%M` (for minutes in decimal). See <http://linux.die.net/man/3/strftime> for a complete list of conversion specification symbols.
+
+Below is an example:
+
+```nginx
+
+ location = /t {
+     set_formatted_gmt_time $timestr "%a %b %e %H:%M:%S %Y GMT";
+     echo $timestr;
+ }
+```
+
+Accessing `/t` yields the output
+
+```
+Fri Dec 13 15:34:37 2013 GMT
+```
+
+This directive was first added in the `0.23` release.
+
+See also [set_formatted_local_time](#set_formatted_local_time).
+
+[Back to TOC](#table-of-contents)
+
+set_formatted_local_time
+------------------------
+**syntax:** *set_formatted_local_time $res &lt;time-format&gt;*
+
+**default:** *no*
+
+**context:** *location, location if*
+
+**phase:** *rewrite*
+
+Set a formatted local time to variable `$res` (as the first argument) using the format string in the second argument.
+
+All the conversion specification notations in the standard C function `strftime` are supported, like `%Y` (for 4-digit years) and `%M` (for minutes in decimal). See <http://linux.die.net/man/3/strftime> for a complete list of conversion specification symbols.
+
+Below is an example:
+
+```nginx
+
+ location = /t {
+     set_formatted_local_time $timestr "%a %b %e %H:%M:%S %Y %Z";
+     echo $timestr;
+ }
+```
+
+Accessing `/t` yields the output
+
+```
+Fri Dec 13 15:42:15 2013 PST
+```
+
+This directive was first added in the `0.23` release.
+
+See also [set_formatted_gmt_time](#set_formatted_gmt_time).
+
+[Back to TOC](#table-of-contents)
+
+Caveats
+=======
+
+Do not use [$arg_PARAMETER](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_arg_), [$cookie_COOKIE](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_cookie_), [$http_HEADER](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_http_) or other special variables defined in the Nginx core module as the target variable in this module's directives. For instance,
+
+```nginx
+
+ set_if_empty $arg_user 'foo';  # DO NOT USE THIS!
+```
+
+may lead to segmentation faults.
+
+[Back to TOC](#table-of-contents)
+
+Installation
+============
+
+This module is included and enabled by default in the [OpenResty bundle](http://openresty.org). If you want to install this module manually with your own Nginx source tarball, then follow the steps below:
+
+Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
+the version 1.13.6 (see [nginx compatibility](#compatibility)), and then build the source with this module:
+
+```bash
+
+ wget 'http://nginx.org/download/nginx-1.13.6.tar.gz'
+ tar -xzvf nginx-1.13.6.tar.gz
+ cd nginx-1.13.6/
+
+ # Here we assume you would install you nginx under /opt/nginx/.
+ ./configure --prefix=/opt/nginx \
+     --with-http_ssl_module \
+     --add-module=/path/to/ngx_devel_kit \
+     --add-module=/path/to/set-misc-nginx-module
+
+ make -j2
+ make install
+```
+
+Download the latest version of the release tarball of this module from [set-misc-nginx-module file list](http://github.com/openresty/set-misc-nginx-module/tags), and the latest tarball for [ngx_devel_kit](https://github.com/simplresty/ngx_devel_kit) from its [file list](https://github.com/simplresty/ngx_devel_kit/tags).
+
+[Back to TOC](#table-of-contents)
+
+Building as a dynamic module
+----------------------------
+
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ndk_http_module.so;  # assuming NDK is built as a dynamic module too
+load_module /path/to/modules/ngx_http_set_misc_module.so;
+```
+
+Also, this module is included and enabled by default in the [OpenResty bundle](http://openresty.org/).
+
+[Back to TOC](#table-of-contents)
+
+Compatibility
+=============
+
+The following versions of Nginx should work with this module:
+
+* **1.13.x**                      (last tested: 1.13.6)
+* **1.12.x**
+* **1.11.x**                      (last tested: 1.11.2)
+* **1.10.x**
+* **1.9.x**                       (last tested: 1.9.15)
+* **1.8.x**
+* **1.7.x**                       (last tested: 1.7.10)
+* **1.6.x**
+* **1.5.x**                       (last tested: 1.5.8)
+* **1.4.x**                       (last tested: 1.4.4)
+* **1.2.x**                       (last tested: 1.2.9)
+* **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**                       (last tested: 0.8.54)
+* **0.7.x >= 0.7.46**             (last tested: 0.7.68)
+
+If you find that any particular version of Nginx above 0.7.46 does not work with this module, please consider [reporting a bug](#report-bugs).
+
+[Back to TOC](#table-of-contents)
+
+Report Bugs
+===========
+
+Although a lot of effort has been put into testing and code tuning, there must be some serious bugs lurking somewhere in this module. So whenever you are bitten by any quirks, please don't hesitate to
+
+1. send a bug report or even patches to the [openresty-en mailing list](https://groups.google.com/group/openresty-en),
+1. or create a ticket on the [issue tracking interface](http://github.com/openresty/set-misc-nginx-module/issues) provided by GitHub.
+
+[Back to TOC](#table-of-contents)
+
+Source Repository
+=================
+
+Available on github at [openresty/set-misc-nginx-module](http://github.com/openresty/set-misc-nginx-module).
+
+[Back to TOC](#table-of-contents)
+
+Changes
+=======
+
+The change logs for every release of this module can be obtained from the OpenResty bundle's change logs:
+
+<http://openresty.org/#Changes>
+
+[Back to TOC](#table-of-contents)
+
+Test Suite
+==========
+
+This module comes with a Perl-driven test suite. The [test cases](http://github.com/openresty/set-misc-nginx-module/tree/master/t/) are
+[declarative](http://github.com/openresty/set-misc-nginx-module/blob/master/t/escape-uri.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Nginx) module in the Perl world.
+
+To run it on your side:
+
+```bash
+
+ $ PATH=/path/to/your/nginx-with-set-misc-module:$PATH prove -r t
+```
+
+You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
+
+Because a single nginx server (by default, `localhost:1984`) is used across all the test scripts (`.t` files), it's meaningless to run the test suite in parallel by specifying `-jN` when invoking the `prove` utility.
+
+[Back to TOC](#table-of-contents)
+
+Getting involved
+================
+
+You'll be very welcomed to submit patches to the [author](#author) or just ask for a commit bit to the [source repository](#source-repository) on GitHub.
+
+[Back to TOC](#table-of-contents)
+
+Author
+======
+
+Yichun Zhang (agentzh) *&lt;agentzh@gmail.com&gt;*, OpenResty Inc.
+
+This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
+
+[Back to TOC](#table-of-contents)
+
+Copyright & License
+===================
+
+Copyright (C) 2009-2018, Yichun Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+
+This module is licensed under the terms of the BSD license.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[Back to TOC](#table-of-contents)
+
+See Also
+========
+* [Nginx Devel Kit](https://github.com/simpl/ngx_devel_kit)
+* [The OpenResty bundle](http://openresty.org)
+
+[Back to TOC](#table-of-contents)
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/config b/modules_deb/libnginx-mod-http-set-misc-0.33/config
new file mode 100755
index 0000000..7bb00af
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/config
@@ -0,0 +1,79 @@
+ngx_addon_name=ngx_http_set_misc_module
+
+if test -n "$ngx_module_link"; then
+    if test -n "$NDK_SRCS"; then
+        echo "found ngx_devel_kit for ngx_set_misc; looks good."
+    else
+        echo "error: ngx_devel_kit is required to build ngx_set_misc; please put it before ngx_set_misc." 1>&2
+        exit 1
+    fi
+else
+    if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then
+        echo "found ngx_devel_kit for ngx_set_misc; looks good."
+    else
+        echo "error: ngx_devel_kit is required to build ngx_set_misc; please put it before ngx_set_misc." 1>&2
+        exit 1
+    fi
+fi
+
+SET_MISC_SRCS="                                                             \
+            $ngx_addon_dir/src/ngx_http_set_base32.c                        \
+            $ngx_addon_dir/src/ngx_http_set_default_value.c                 \
+            $ngx_addon_dir/src/ngx_http_set_hashed_upstream.c               \
+            $ngx_addon_dir/src/ngx_http_set_quote_sql.c                     \
+            $ngx_addon_dir/src/ngx_http_set_quote_json.c                    \
+            $ngx_addon_dir/src/ngx_http_set_unescape_uri.c                  \
+            $ngx_addon_dir/src/ngx_http_set_misc_module.c                   \
+            $ngx_addon_dir/src/ngx_http_set_escape_uri.c                    \
+            $ngx_addon_dir/src/ngx_http_set_hash.c                          \
+            $ngx_addon_dir/src/ngx_http_set_local_today.c                   \
+            $ngx_addon_dir/src/ngx_http_set_hex.c                           \
+            $ngx_addon_dir/src/ngx_http_set_base64.c                        \
+            $ngx_addon_dir/src/ngx_http_set_base64url.c                     \
+            $ngx_addon_dir/src/ngx_http_set_random.c                        \
+            $ngx_addon_dir/src/ngx_http_set_secure_random.c                 \
+            $ngx_addon_dir/src/ngx_http_set_rotate.c
+            "
+
+SET_MISC_DEPS="                                                             \
+            $ngx_addon_dir/src/ddebug.h                                     \
+            $ngx_addon_dir/src/ngx_http_set_default_value.h                 \
+            $ngx_addon_dir/src/ngx_http_set_hashed_upstream.h               \
+            $ngx_addon_dir/src/ngx_http_set_quote_sql.h                     \
+            $ngx_addon_dir/src/ngx_http_set_quote_json.h                    \
+            $ngx_addon_dir/src/ngx_http_set_unescape_uri.h                  \
+            $ngx_addon_dir/src/ngx_http_set_escape_uri.h                    \
+            $ngx_addon_dir/src/ngx_http_set_hash.h                          \
+            $ngx_addon_dir/src/ngx_http_set_local_today.h                   \
+            $ngx_addon_dir/src/ngx_http_set_hex.h                           \
+            $ngx_addon_dir/src/ngx_http_set_base64url.h                     \
+            $ngx_addon_dir/src/ngx_http_set_base64.h                        \
+            $ngx_addon_dir/src/ngx_http_set_random.h                        \
+            $ngx_addon_dir/src/ngx_http_set_rotate.h                        \
+            $ngx_addon_dir/src/ngx_http_set_secure_random.h                 \
+            $ngx_addon_dir/src/ngx_http_set_misc_module.h                   \
+            "
+
+if [ $USE_OPENSSL = YES -o $MAIL_SSL = YES ]; then
+    SET_MISC_DEPS="$SET_MISC_DEPS $ngx_addon_dir/src/ngx_http_set_hmac.h"
+    SET_MISC_SRCS="$SET_MISC_SRCS $ngx_addon_dir/src/ngx_http_set_hmac.c"
+fi
+
+CFLAGS="$CFLAGS -DNDK_SET_VAR -DNDK_UPSTREAM_LIST"
+USE_SHA1=YES
+USE_MD5=YES
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP
+    ngx_module_name=$ngx_addon_name
+    ngx_module_incs=
+    ngx_module_deps="$SET_MISC_DEPS"
+    ngx_module_srcs="$SET_MISC_SRCS"
+    ngx_module_libs=
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $SET_MISC_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $SET_MISC_DEPS"
+fi
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/changelog b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/changelog
new file mode 100644
index 0000000..bb494f4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/changelog
@@ -0,0 +1,53 @@
+libnginx-mod-http-set-misc (0.33-6) unstable; urgency=medium
+
+  * Team upload.
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/watch: use more generic template
+  * d/copyright: bump debian/* copyright year
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Sat, 12 Apr 2025 09:05:50 +0200
+
+libnginx-mod-http-set-misc (0.33-5) unstable; urgency=medium
+
+  * Team upload.
+  * Better usage of dh-sequence-nginx.
+    * d/control: remove Build-Depends nginx-abi-1.24.0-1
+    * d/rules: remove override_dh_auto_test, override_dh_auto_test
+    * d/control: remove Depends libnginx-mod-http-ndk
+  * d/copyright-scan-patterns.yml add
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 08 Oct 2023 17:10:26 +0200
+
+libnginx-mod-http-set-misc (0.33-4) unstable; urgency=medium
+
+  * Team upload.
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 28 Jun 2023 00:01:59 +0200
+
+libnginx-mod-http-set-misc (0.33-3) unstable; urgency=medium
+
+  * Team upload.
+  * d/t/set_if_empty renamed to d/t/setifempty, fixes lintian
+    warning illegal-runtime-test-name
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/copyright: reformat text to be compatible with 'cme update dpkg-copyright'
+  * d/fix.scanned.copyright: added, fixes upstream author name parsing
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:37 +0100
+
+libnginx-mod-http-set-misc (0.33-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/control: fixed dependency libnginx-mod-http-ndk-dev (>= 1:0.3.2-2)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 14:08:01 +0100
+
+libnginx-mod-http-set-misc (0.33-1) unstable; urgency=medium
+
+  * Initial release. (Closes: #1025291)
+
+ -- Jérémy Lal <kapouer@melix.org>  Fri, 02 Dec 2022 00:32:56 +0100
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/control b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/control
new file mode 100644
index 0000000..9223829
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/control
@@ -0,0 +1,27 @@
+Source: libnginx-mod-http-set-misc
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jérémy Lal <kapouer@melix.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+               libnginx-mod-http-ndk-dev (>= 1:0.3.2-2),
+Standards-Version: 4.7.2
+Homepage: https://github.com/openresty/set-misc-nginx-module
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-set-misc.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-set-misc
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-set-misc
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: Extended rewrite directives module for Nginx
+ This module provides more directives that can be used in
+ the Nginx rewrite phase, like the 'set' directive.
+  - URI escaping and unescaping
+  - JSON quoting
+  - digests encoding and decoding
+  - random number generator
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright
new file mode 100644
index 0000000..f77abc0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright
@@ -0,0 +1,49 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: memc-nginx-module
+Upstream-Contact: Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>
+Source: https://github.com/openresty/set-misc-nginx-module
+
+Files: *
+Copyright: 2009-2018, Yichun Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: config
+Copyright: 2009-2018, Yichun Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022, Jérémy Lal <kapouer@melix.org>,
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-2-clause
+
+Files: src/*
+Copyright: 2009-2018, Yichun Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: t/*
+Copyright: 2009-2018, Yichun Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: util/*
+Copyright: 2009-2018, Yichun Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright-scan-patterns.yml b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright-scan-patterns.yml
new file mode 100644
index 0000000..e195ac6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/copyright-scan-patterns.yml
@@ -0,0 +1,4 @@
+---
+ignore:
+  pattern:
+  - debian/output
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/fix.scanned.copyright b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/fix.scanned.copyright
new file mode 100644
index 0000000..b25e244
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/fix.scanned.copyright
@@ -0,0 +1,2 @@
+# fixes upstream author name parsing
+! copyright Files:~/.*/ Copyright=~"s/(Zhang)\s\(.*x\{6625\}\)/$1\ (章亦春)/"
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/gbp.conf b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/gbp.conf
new file mode 100644
index 0000000..38c12c1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/rules b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/source/format b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/control b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/control
new file mode 100644
index 0000000..9ecf806
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/control
@@ -0,0 +1,13 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
+
+Tests: setifempty
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/generic b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/setifempty b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/setifempty
new file mode 100644
index 0000000..6aee6f3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/tests/setifempty
@@ -0,0 +1,36 @@
+#!/bin/sh
+set -e
+
+cat <<EOF > "/etc/nginx/sites-enabled/default"
+server {
+  listen 80 default_server;
+
+  location /setifempty {
+    set_if_empty \$var aaa;
+    set_if_empty \$var bbb;
+    if (\$var = aaa ) {
+      return 200;
+    }
+    return 500;
+  }
+}
+EOF
+
+exp="response_code: 200"
+
+nginx -t
+invoke-rc.d nginx restart || { journalctl -n all -xu nginx.service; exit 1; }
+
+out=`curl --fail -w "response_code: %{http_code}\n" http://127.0.0.1/setifempty`
+
+if [ x"${out}" != x"${exp}" ]; then
+  echo "output:"
+  echo "====================="
+  echo "${out}"
+  echo "====================="
+  echo "expected output:"
+  echo "====================="
+  echo "${exp}"
+  echo "====================="
+  exit 1
+fi
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/upstream/metadata b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/upstream/metadata
new file mode 100644
index 0000000..fe767d2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/openresty/set-misc-nginx-module/issues
+Bug-Submit: https://github.com/openresty/set-misc-nginx-module/issues/new
+Repository-Browse: https://github.com/openresty/set-misc-nginx-module
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/debian/watch b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/watch
new file mode 100644
index 0000000..b6d7cc0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/debian/watch
@@ -0,0 +1,6 @@
+version=4
+opts="\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/openresty/set-misc-nginx-module/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ddebug.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ddebug.h
new file mode 100644
index 0000000..aaa6fef
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ddebug.h
@@ -0,0 +1,74 @@
+#ifndef DDEBUG_H
+#define DDEBUG_H
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...) fprintf(stderr, "set_misc *** "); \
+            fprintf(stderr, __VA_ARGS__); \
+            fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
+
+#   else
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char *fmt, ...) {
+}
+
+#    endif
+
+#else
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...)
+
+#   else
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char *fmt, ...) {
+}
+
+#   endif
+
+#endif
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#define dd_check_read_event_handler(r)   \
+    dd("r->read_event_handler = %s", \
+        r->read_event_handler == ngx_http_block_reading ? \
+            "ngx_http_block_reading" : \
+        r->read_event_handler == ngx_http_test_reading ? \
+            "ngx_http_test_reading" : \
+        r->read_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#define dd_check_write_event_handler(r)   \
+    dd("r->write_event_handler = %s", \
+        r->write_event_handler == ngx_http_handler ? \
+            "ngx_http_handler" : \
+        r->write_event_handler == ngx_http_core_run_phases ? \
+            "ngx_http_core_run_phases" : \
+        r->write_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#else
+
+#define dd_check_read_event_handler(r)
+#define dd_check_write_event_handler(r)
+
+#endif
+
+#endif /* DDEBUG_H */
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.c
new file mode 100644
index 0000000..c56c7ba
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.c
@@ -0,0 +1,263 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include <ndk.h>
+
+#include "ngx_http_set_base32.h"
+#include "ngx_http_set_misc_module.h"
+
+
+#define base32_encoded_length(len) ((((len)+4)/5)*8)
+#define base32_decoded_length(len) ((((len)+7)/8)*5)
+
+
+static void encode_base32(size_t slen, u_char *src, size_t *dlen, u_char *dst,
+    ngx_flag_t padding, ngx_str_t *alphabet);
+static int decode_base32(size_t slen, u_char *src, size_t *dlen, u_char *dst,
+    u_char *basis32);
+
+
+ngx_int_t
+ngx_http_set_misc_encode_base32(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    size_t                   len;
+    u_char                  *p;
+    u_char                  *src, *dst;
+
+    ngx_http_set_misc_loc_conf_t        *conf;
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_set_misc_module);
+
+    len = base32_encoded_length(v->len);
+
+    dd("estimated dst len: %d", (int) len);
+
+    p = ngx_palloc(r->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    src = v->data; dst = p;
+
+    encode_base32(v->len, src, &len, dst, conf->base32_padding,
+                  &conf->base32_alphabet);
+
+    res->data = p;
+    res->len = len;
+
+    dd("res (len %d): %.*s", (int) res->len, (int) res->len, res->data);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_set_misc_decode_base32(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    size_t                   len;
+    u_char                  *p;
+    u_char                  *src, *dst;
+    int                      ret;
+
+    ngx_http_set_misc_loc_conf_t        *conf;
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_set_misc_module);
+
+    len = base32_decoded_length(v->len);
+
+    dd("estimated dst len: %d", (int) len);
+
+    p = ngx_palloc(r->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    src = v->data; dst = p;
+
+    ret = decode_base32(v->len, src, &len, dst, conf->basis32);
+
+    if (ret == 0 /* OK */) {
+        res->data = p;
+        res->len = len;
+
+        return NGX_OK;
+    }
+
+    /* failed to decode */
+
+    res->data = NULL;
+    res->len = 0;
+
+    return NGX_OK;
+}
+
+
+/* See the implementation in src/core/ngx_string.c's
+ * ngx_(encode|decode)_base64() for details. */
+
+static void
+encode_base32(size_t slen, u_char *src, size_t *dlen, u_char *dst,
+    ngx_flag_t padding, ngx_str_t *alphabet)
+{
+    unsigned char *basis32 = alphabet->data;
+
+    size_t       len;
+    u_char      *s;
+    u_char      *d;
+
+    len = slen;
+    s = src;
+    d = dst;
+
+    while (len > 4) {
+        *d++ = basis32[s[0] >> 3];
+        *d++ = basis32[((s[0] & 0x07) << 2) | (s[1] >> 6)];
+        *d++ = basis32[(s[1] >> 1) & 0x1f];
+        *d++ = basis32[((s[1] & 1) << 4) | (s[2] >> 4)];
+        *d++ = basis32[((s[2] & 0x0f) << 1) | (s[3] >> 7)];
+        *d++ = basis32[(s[3] >> 2) & 0x1f];
+        *d++ = basis32[((s[3] & 0x03) << 3) | (s[4] >> 5)];
+        *d++ = basis32[s[4] & 0x1f];
+
+        s += 5;
+        len -= 5;
+    }
+
+    if (len) {
+        *d++ = basis32[s[0] >> 3];
+
+        if (len == 1) {
+            /* 1 byte left */
+            *d++ = basis32[(s[0] & 0x07) << 2];
+
+            /* pad six '='s to the end */
+            if (padding) {
+                *d++ = '=';
+                *d++ = '=';
+                *d++ = '=';
+                *d++ = '=';
+                *d++ = '=';
+            }
+
+        } else {
+            *d++ = basis32[((s[0] & 0x07) << 2) | (s[1] >> 6)];
+            *d++ = basis32[(s[1] >> 1) & 0x1f];
+
+            if (len == 2) {
+                /* 2 bytes left */
+                *d++ = basis32[(s[1] & 1) << 4];
+
+                /* pad four '='s to the end */
+                if (padding) {
+                    *d++ = '=';
+                    *d++ = '=';
+                    *d++ = '=';
+                }
+
+            } else {
+                *d++ = basis32[((s[1] & 1) << 4) | (s[2] >> 4)];
+
+                if (len == 3) {
+                    /* 3 bytes left */
+                    *d++ = basis32[(s[2] & 0x0f) << 1];
+
+                    if (padding) {
+                        /* pad three '='s to the end */
+                        *d++ = '=';
+                        *d++ = '=';
+                    }
+
+                } else {
+                    /* 4 bytes left */
+                    *d++ = basis32[((s[2] & 0x0f) << 1) | (s[3] >> 7)];
+                    *d++ = basis32[(s[3] >> 2) & 0x1f];
+                    *d++ = basis32[(s[3] & 0x03) << 3];
+
+                    /* pad one '=' to the end */
+                }
+            }
+        }
+
+        if (padding) {
+            *d++ = '=';
+        }
+    }
+
+    *dlen = (size_t) (d - dst);
+}
+
+
+static int
+decode_base32(size_t slen, u_char *src, size_t *dlen, u_char *dst,
+    u_char *basis32)
+{
+    size_t                   len, mod;
+    u_char                  *s = src;
+    u_char                  *d = dst;
+
+    for (len = 0; len < slen; len++) {
+        if (s[len] == '=') {
+            break;
+        }
+
+        if (basis32[s[len]] == 77) {
+            return -1;
+        }
+    }
+
+    mod = len % 8;
+
+    if (mod == 1 || mod == 3 || mod == 6) {
+        /* bad Base32 digest length */
+        return -1;
+    }
+
+    while (len > 7) {
+        *d++ = (basis32[s[0]] << 3) | ((basis32[s[1]] >> 2) & 0x07);
+
+        *d++ = ((basis32[s[1]] & 0x03) << 6) | (basis32[s[2]] << 1) |
+            ((basis32[s[3]] >> 4) & 1);
+
+        *d++ = ((basis32[s[3]] & 0x0f) << 4) | ((basis32[s[4]] >> 1) & 0x0f);
+
+        *d++ = ((basis32[s[4]] & 1) << 7) | ((basis32[s[5]] & 0x1f) << 2) |
+            ((basis32[s[6]] >> 3) & 0x03);
+        *d++ = ((basis32[s[6]] & 0x07) << 5) | (basis32[s[7]] & 0x1f);
+
+        s += 8;
+        len -= 8;
+    }
+
+    if (len) {
+        /* 2 bytes left */
+        *d++ = (basis32[s[0]] << 3) | ((basis32[s[1]] >> 2) & 0x07);
+
+        if (len > 2) {
+            /* 4 bytes left */
+            *d++ = ((basis32[s[1]] & 0x03) << 6) | ((basis32[s[2]] & 0x1f) << 1)
+                | ((basis32[s[3]] >> 4) & 1);
+
+            if (len > 4) {
+                /* 5 bytes left */
+                *d++ = ((basis32[s[3]] & 0x0f) << 4) |
+                    ((basis32[s[4]] >> 1) & 0x0f);
+
+                if (len > 5) {
+                    /* 7 bytes left */
+                    *d++ = ((basis32[s[4]] & 1) << 7) |
+                        ((basis32[s[5]] & 0x1f) << 2) |
+                        ((basis32[s[6]] >> 3) & 0x03);
+                }
+            }
+        }
+    }
+
+    *dlen = (size_t) (d - dst);
+
+    return 0;
+}
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.h
new file mode 100644
index 0000000..68ca277
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base32.h
@@ -0,0 +1,18 @@
+#ifndef NGX_HTTP_SET_BASE32
+#define NGX_HTTP_SET_BASE32
+
+
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+
+ngx_int_t ngx_http_set_misc_encode_base32(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+ngx_int_t ngx_http_set_misc_decode_base32(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+
+#endif /* NGX_HTTP_SET_BASE32 */
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.c
new file mode 100644
index 0000000..8666ad8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.c
@@ -0,0 +1,48 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include    <ndk.h>
+#include "ngx_http_set_base64.h"
+
+
+ngx_int_t
+ngx_http_set_misc_set_decode_base64(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    ngx_str_t        src;
+
+    src.len = v->len;
+    src.data = v->data;
+
+    res->len = ngx_base64_decoded_length(v->len);
+    ndk_palloc_re(res->data, r->pool, res->len);
+
+    if (ngx_decode_base64(res, &src) != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_decode_base64: invalid value");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_set_misc_set_encode_base64(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    ngx_str_t        src;
+
+    src.len = v->len;
+    src.data = v->data;
+
+    res->len = ngx_base64_encoded_length(v->len);
+    ndk_palloc_re(res->data, r->pool, res->len);
+
+    ngx_encode_base64(res, &src);
+
+    return NGX_OK;
+}
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.h
new file mode 100644
index 0000000..6594c77
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64.h
@@ -0,0 +1,10 @@
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+ngx_int_t ngx_http_set_misc_set_encode_base64(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+ngx_int_t ngx_http_set_misc_set_decode_base64(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.c
new file mode 100644
index 0000000..f1426ad
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.c
@@ -0,0 +1,50 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include    <ndk.h>
+#include "ngx_http_set_base64url.h"
+
+
+ngx_int_t
+ngx_http_set_misc_set_decode_base64url(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+
+    ngx_str_t        src;
+
+    src.len = v->len;
+    src.data = v->data;
+
+    res->len = ngx_base64_decoded_length(v->len);
+    ndk_palloc_re(res->data, r->pool, res->len);
+
+    if (ngx_decode_base64url(res, &src) != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_decode_base64url: invalid value");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_set_misc_set_encode_base64url(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+
+    ngx_str_t        src;
+
+    src.len = v->len;
+    src.data = v->data;
+
+    res->len = ngx_base64_encoded_length(v->len);
+    ndk_palloc_re(res->data, r->pool, res->len);
+
+    ngx_encode_base64url(res, &src);
+
+    return NGX_OK;
+}
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.h
new file mode 100644
index 0000000..6ccf63b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_base64url.h
@@ -0,0 +1,10 @@
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+ngx_int_t ngx_http_set_misc_set_encode_base64url(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+ngx_int_t ngx_http_set_misc_set_decode_base64url(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.c
new file mode 100644
index 0000000..f4c80a1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.c
@@ -0,0 +1,48 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include <ndk.h>
+#include "ngx_http_set_default_value.h"
+
+
+ngx_int_t
+ngx_http_set_misc_set_if_empty(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    ngx_http_variable_value_t   *cur_v, *default_v;
+
+    cur_v = &v[0];
+    default_v = &v[1];
+
+    if (cur_v->not_found || cur_v->len == 0) {
+        res->data = default_v->data;
+        res->len = default_v->len;
+
+        return NGX_OK;
+    }
+
+    res->data = cur_v->data;
+    res->len = cur_v->len;
+
+    return NGX_OK;
+}
+
+
+char *
+ngx_http_set_if_empty(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t               *value;
+    ndk_set_var_t            filter;
+
+    value = cf->args->elts;
+
+    filter.type = NDK_SET_VAR_MULTI_VALUE;
+    filter.func = (void *) ngx_http_set_misc_set_if_empty;
+    filter.size = 2;
+    filter.data = NULL;
+
+    return  ndk_set_var_multi_value_core(cf, &value[1], &value[1], &filter);
+}
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.h
new file mode 100644
index 0000000..5bf5168
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_default_value.h
@@ -0,0 +1,15 @@
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+#ifndef NGX_HTTP_SET_DEFAULT_VALUE
+#define NGX_HTTP_SET_DEFAULT_VALUE
+
+
+char *ngx_http_set_if_empty(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+ngx_int_t ngx_http_set_misc_set_if_empty(ngx_http_request_t *r,
+    ngx_str_t *res, ngx_http_variable_value_t *v);
+
+
+#endif /* NGX_HTTP_SET_DEFAULT_VALUE */
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.c
new file mode 100644
index 0000000..a09f8da
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.c
@@ -0,0 +1,210 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include <ndk.h>
+#include "ngx_http_set_escape_uri.h"
+#include "ngx_string.h"
+
+
+static uintptr_t ngx_escape_uri_patched(u_char *dst, u_char *src, size_t size,
+    ngx_uint_t type);
+
+
+ngx_int_t
+ngx_http_set_misc_escape_uri(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    size_t           len;
+    uintptr_t        escape;
+    u_char          *src, *dst;
+
+    if (v->len == 0) {
+        res->len = 0;
+        res->data = NULL;
+        return NGX_OK;
+    }
+
+    src = v->data;
+
+    dd("before escape:%.*s", v->len, v->data);
+    escape = 2 * ngx_escape_uri_patched(NULL, src, v->len, NGX_ESCAPE_URI);
+    /* len = v->len + 2 * ngx_escape_uri(NULL, src, v->len, NGX_ESCAPE_URI); */
+    len = escape + v->len;
+    dd("escaped string len:%zu", len);
+
+    dst = ngx_palloc(r->pool, len);
+
+    if (dst == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (escape == 0) {
+        ngx_memcpy(dst, src, len);
+        dd("escape == 0");
+
+    } else {
+        ngx_escape_uri_patched(dst, src, v->len, NGX_ESCAPE_URI);
+    }
+
+    res->data = dst;
+    res->len = len;
+
+    dd("after eacape:%.*s", (int) res->len, res->data);
+
+    return NGX_OK;
+}
+
+
+static uintptr_t
+ngx_escape_uri_patched(u_char *dst, u_char *src, size_t size, ngx_uint_t type)
+{
+    ngx_uint_t      n;
+    uint32_t       *escape;
+    static u_char   hex[] = "0123456789ABCDEF";
+
+                    /* " ", "#", "%", "?", %00-%1F, %7F-%FF */
+
+    static uint32_t   uri[] = {
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+
+                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
+        0xfc00886d, /* 1111 1100 0000 0000  1000 1000 0110 1101 */
+
+                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
+        0x78000000, /* 0111 1000 0000 0000  0000 0000 0000 0000 */
+
+                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
+        0xa8000000, /* 1010 1000 0000 0000  0000 0000 0000 0000 */
+
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+    };
+
+                    /* " ", "#", "%", "+", "?", %00-%1F, %7F-%FF */
+
+    static uint32_t   args[] = {
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+
+                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
+        0x80000829, /* 1000 0000 0000 0000  0000 1000 0010 1001 */
+
+                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+
+                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
+        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
+
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+    };
+
+                    /* " ", "#", """, "%", "'", %00-%1F, %7F-%FF */
+
+    static uint32_t   html[] = {
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+
+                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
+        0x000000ad, /* 0000 0000 0000 0000  0000 0000 1010 1101 */
+
+                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+
+                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
+        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
+
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+    };
+
+                    /* " ", """, "%", "'", %00-%1F, %7F-%FF */
+
+    static uint32_t   refresh[] = {
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+
+                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
+        0x00000085, /* 0000 0000 0000 0000  0000 0000 1000 0101 */
+
+                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+
+                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
+        0x80000000, /* 1000 0000 0000 0000  0000 0000 0000 0000 */
+
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+        0xffffffff  /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+    };
+
+                    /* " ", "%", %00-%1F */
+
+    static uint32_t   memcached[] = {
+        0xffffffff, /* 1111 1111 1111 1111  1111 1111 1111 1111 */
+
+                    /* ?>=< ;:98 7654 3210  /.-, +*)( '&%$ #"!  */
+        0x00000021, /* 0000 0000 0000 0000  0000 0000 0010 0001 */
+
+                    /* _^]\ [ZYX WVUT SRQP  ONML KJIH GFED CBA@ */
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+
+                    /*  ~}| {zyx wvut srqp  onml kjih gfed cba` */
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+        0x00000000, /* 0000 0000 0000 0000  0000 0000 0000 0000 */
+    };
+
+                    /* mail_auth is the same as memcached */
+
+    static uint32_t  *map[] =
+        { uri, args, html, refresh, memcached, memcached };
+
+
+    escape = map[type];
+
+    if (dst == NULL) {
+
+        /* find the number of the characters to be escaped */
+
+        n = 0;
+
+        while (size) {
+            if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
+                n++;
+            }
+
+            src++;
+            size--;
+        }
+
+        return (uintptr_t) n;
+    }
+
+    while (size) {
+        if (escape[*src >> 5] & (1 << (*src & 0x1f))) {
+            *dst++ = '%';
+            *dst++ = hex[*src >> 4];
+            *dst++ = hex[*src & 0xf];
+            src++;
+
+        } else {
+            *dst++ = *src++;
+        }
+
+        size--;
+    }
+
+    return (uintptr_t) dst;
+}
+
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.h
new file mode 100644
index 0000000..b8564bd
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_escape_uri.h
@@ -0,0 +1,10 @@
+#ifndef NGX_HTTP_SET_ESCAPE_URI
+#define NGX_HTTP_SET_ESCAPE_URI
+
+
+ngx_int_t
+ngx_http_set_misc_escape_uri(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v);
+
+
+#endif /* NGX_HTTP_SET_ESCAPE_URI */
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.c
new file mode 100644
index 0000000..59ad606
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.c
@@ -0,0 +1,83 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_set_hash.h"
+
+#if NGX_HAVE_SHA1
+#include "ngx_sha1.h"
+
+#ifndef SHA_DIGEST_LENGTH
+#define SHA_DIGEST_LENGTH 20
+#endif
+
+#endif
+
+#include "ngx_md5.h"
+
+
+#ifndef MD5_DIGEST_LENGTH
+#define MD5_DIGEST_LENGTH 16
+#endif
+
+enum {
+#if NGX_HAVE_SHA1
+    SHA_HEX_LENGTH = SHA_DIGEST_LENGTH * 2,
+#endif
+    MD5_HEX_LENGTH = MD5_DIGEST_LENGTH * 2
+};
+
+
+#if NGX_HAVE_SHA1
+ngx_int_t
+ngx_http_set_misc_set_sha1(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    u_char                  *p;
+    ngx_sha1_t               sha;
+    u_char                   sha_buf[SHA_DIGEST_LENGTH];
+
+    p = ngx_palloc(r->pool, SHA_HEX_LENGTH);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_sha1_init(&sha);
+    ngx_sha1_update(&sha, v->data, v->len);
+    ngx_sha1_final(sha_buf, &sha);
+
+    ngx_hex_dump(p, sha_buf, sizeof(sha_buf));
+
+    res->data = p;
+    res->len = SHA_HEX_LENGTH;
+
+    return NGX_OK;
+}
+#endif
+
+
+ngx_int_t
+ngx_http_set_misc_set_md5(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    u_char                  *p;
+    ngx_md5_t                md5;
+    u_char                   md5_buf[MD5_DIGEST_LENGTH];
+
+    p = ngx_palloc(r->pool, MD5_HEX_LENGTH);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_md5_init(&md5);
+    ngx_md5_update(&md5, v->data, v->len);
+    ngx_md5_final(md5_buf, &md5);
+
+    ngx_hex_dump(p, md5_buf, sizeof(md5_buf));
+
+    res->data = p;
+    res->len = MD5_HEX_LENGTH;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.h
new file mode 100644
index 0000000..db3a558
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hash.h
@@ -0,0 +1,15 @@
+#ifndef NGX_HTTP_SET_HASH_H
+#define NGX_HTTP_SET_HASH_H
+
+
+#include "ngx_http_set_misc_module.h"
+
+
+ngx_int_t ngx_http_set_misc_set_sha1(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+
+ngx_int_t ngx_http_set_misc_set_md5(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+#endif /* NGX_HTTP_SET_HASH_H */
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.c
new file mode 100644
index 0000000..391dd35
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.c
@@ -0,0 +1,141 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_set_hashed_upstream.h"
+
+
+ngx_uint_t
+ngx_http_set_misc_apply_distribution(ngx_log_t *log, ngx_uint_t hash,
+    ndk_upstream_list_t *ul, ngx_http_set_misc_distribution_t type)
+{
+    switch (type) {
+    case ngx_http_set_misc_distribution_modula:
+        return (uint32_t) hash % (uint32_t) ul->nelts;
+
+    default:
+        ngx_log_error(NGX_LOG_ERR, log, 0, "apply_distribution: "
+                      "unknown distribution: %d", type);
+
+        return 0;
+    }
+
+    /* impossible to reach here */
+}
+
+
+ngx_int_t
+ngx_http_set_misc_set_hashed_upstream(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v, void *data)
+{
+    ngx_str_t                  **u;
+    ndk_upstream_list_t         *ul = data;
+    ngx_str_t                    ulname;
+    ngx_uint_t                   hash, index;
+    ngx_http_variable_value_t   *key;
+
+    if (ul == NULL) {
+        ulname.data = v->data;
+        ulname.len = v->len;
+
+        dd("ulname: %.*s", (int) ulname.len, ulname.data);
+
+        ul = ndk_get_upstream_list(ndk_http_get_main_conf(r),
+                                   ulname.data, ulname.len);
+
+        if (ul == NULL) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "set_hashed_upstream: upstream list \"%V\" "
+                    "not defined yet", &ulname);
+            return NGX_ERROR;
+        }
+
+        key = v + 1;
+
+    } else {
+        key = v;
+    }
+
+    if (ul->nelts == 0) {
+        res->data = NULL;
+        res->len = 0;
+
+        return NGX_OK;
+    }
+
+    u = ul->elts;
+
+    dd("upstream list: %d upstreams found", (int) ul->nelts);
+
+    if (ul->nelts == 1) {
+        dd("only one upstream found in the list");
+
+        res->data = u[0]->data;
+        res->len = u[0]->len;
+
+        return NGX_OK;
+    }
+
+    dd("key: \"%.*s\"", key->len, key->data);
+
+    hash = ngx_hash_key_lc(key->data, key->len);
+
+    index = ngx_http_set_misc_apply_distribution(r->connection->log, hash, ul,
+            ngx_http_set_misc_distribution_modula);
+
+    res->data = u[index]->data;
+    res->len = u[index]->len;
+
+    return NGX_OK;
+}
+
+
+char *
+ngx_http_set_hashed_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t               *value;
+    ndk_set_var_t            filter;
+    ngx_uint_t               n;
+    ngx_str_t               *var;
+    ngx_str_t               *ulname;
+    ndk_upstream_list_t     *ul;
+    ngx_str_t               *v;
+
+    value = cf->args->elts;
+
+    var = &value[1];
+    ulname = &value[2];
+
+    n = ngx_http_script_variables_count(ulname);
+
+    filter.func = (void *) ngx_http_set_misc_set_hashed_upstream;
+
+    if (n) {
+        /* upstream list name contains variables */
+        v = &value[2];
+        filter.size = 2;
+        filter.data = NULL;
+        filter.type = NDK_SET_VAR_MULTI_VALUE_DATA;
+
+        return  ndk_set_var_multi_value_core(cf, var, v, &filter);
+    }
+
+    ul = ndk_get_upstream_list(ndk_http_conf_get_main_conf(cf),
+                               ulname->data, ulname->len);
+    if (ul == NULL) {
+        ngx_log_error(NGX_LOG_ERR, cf->log, 0,
+                      "set_hashed_upstream: upstream list \"%V\" "
+                      "not defined yet", ulname);
+        return NGX_CONF_ERROR;
+    }
+
+    v = &value[3];
+
+    filter.size = 1;
+    filter.data = ul;
+    filter.type = NDK_SET_VAR_VALUE_DATA;
+
+    return ndk_set_var_value_core(cf, var, v, &filter);
+}
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.h
new file mode 100644
index 0000000..8b7caa7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hashed_upstream.h
@@ -0,0 +1,27 @@
+#ifndef NGX_HTTP_SET_HASHED_UPSTREAM
+#define NGX_HTTP_SET_HASHED_UPSTREAM
+
+
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+#include <ndk.h>
+
+
+typedef enum {
+    ngx_http_set_misc_distribution_modula,
+    ngx_http_set_misc_distribution_random /* XXX not used */
+} ngx_http_set_misc_distribution_t;
+
+
+ngx_uint_t ngx_http_set_misc_apply_distribution(ngx_log_t *log, ngx_uint_t hash,
+    ndk_upstream_list_t *ul, ngx_http_set_misc_distribution_t type);
+
+char *ngx_http_set_hashed_upstream(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+
+ngx_int_t ngx_http_set_misc_set_hashed_upstream(ngx_http_request_t *r,
+    ngx_str_t *res, ngx_http_variable_value_t *v, void *data);
+
+
+#endif /* NGX_HTTP_SET_HASHED_UPSTREAM */
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.c
new file mode 100644
index 0000000..6900650
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.c
@@ -0,0 +1,62 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include <ndk.h>
+#include "ngx_http_set_hex.h"
+
+
+ngx_int_t
+ngx_http_set_misc_set_decode_hex(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    u_char      *p;
+    ngx_int_t    n;
+    ngx_uint_t   i;
+    size_t       len;
+
+    if (v->len % 2 != 0) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_decode_hex: invalid value");
+        return NGX_ERROR;
+    }
+
+    p = v->data;
+    len = v->len >> 1;
+
+    res->data = ngx_palloc(r->pool, len);
+    if (res->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    for (i = 0; i < len; i++) {
+        n = ngx_hextoi(p, 2);
+        if (n == NGX_ERROR || n > 255) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "set_decode_hex: invalid value");
+            return NGX_ERROR;
+        }
+
+        p += 2;
+        res->data[i] = (u_char) n;
+    }
+
+    res->len = len;
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_set_misc_set_encode_hex(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    res->len = v->len << 1;
+    res->data = ngx_palloc(r->pool, res->len);
+    if (res->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_hex_dump(res->data, v->data, v->len);
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.h
new file mode 100644
index 0000000..e8b77e0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hex.h
@@ -0,0 +1,9 @@
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+ngx_int_t ngx_http_set_misc_set_decode_hex(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+ngx_int_t ngx_http_set_misc_set_encode_hex(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.c
new file mode 100644
index 0000000..139c0c7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.c
@@ -0,0 +1,62 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include <ndk.h>
+
+#include "ngx_http_set_hmac.h"
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+
+
+/* this function's implementation is partly borrowed from
+ * https://github.com/anomalizer/ngx_aws_auth */
+static ngx_int_t
+ngx_http_set_misc_set_hmac(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v, const EVP_MD *evp_md)
+{
+    ngx_http_variable_value_t   *secret, *string_to_sign;
+    unsigned int                 md_len = 0;
+    unsigned char                md[EVP_MAX_MD_SIZE];
+
+    secret = v;
+    string_to_sign = v + 1;
+
+    dd("secret=%.*s, string_to_sign=%.*s", (int) secret->len, secret->data,
+       (int) string_to_sign->len, string_to_sign->data);
+
+    HMAC(evp_md, secret->data, secret->len, string_to_sign->data,
+         string_to_sign->len, md, &md_len);
+
+    /* defensive test if there is something wrong with openssl */
+    if (md_len == 0 || md_len > EVP_MAX_MD_SIZE) {
+        res->len = 0;
+        return NGX_ERROR;
+    }
+
+    res->len = md_len;
+    ndk_palloc_re(res->data, r->pool, md_len);
+
+    ngx_memcpy(res->data,
+               &md,
+               md_len);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_set_misc_set_hmac_sha1(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    return ngx_http_set_misc_set_hmac(r, res, v, EVP_sha1());
+}
+
+
+ngx_int_t
+ngx_http_set_misc_set_hmac_sha256(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    return ngx_http_set_misc_set_hmac(r, res, v, EVP_sha256());
+}
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.h
new file mode 100644
index 0000000..fe02ea4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_hmac.h
@@ -0,0 +1,9 @@
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+ngx_int_t ngx_http_set_misc_set_hmac_sha1(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+ngx_int_t ngx_http_set_misc_set_hmac_sha256(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.c
new file mode 100644
index 0000000..fa1c703
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.c
@@ -0,0 +1,110 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include <ndk.h>
+
+
+#ifndef NGX_HTTP_SET_MISC_FMT_DATE_LEN
+#define NGX_HTTP_SET_MISC_FMT_DATE_LEN       256
+#endif
+
+
+ngx_int_t
+ngx_http_set_local_today(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    time_t           now;
+    ngx_tm_t         tm;
+    u_char          *p;
+
+    /*t = ngx_timeofday();*/
+
+    now = ngx_time();
+
+    ngx_gmtime(now + ngx_cached_time->gmtoff * 60, &tm);
+
+    dd("tm.ngx_tm_hour:%d", tm.ngx_tm_hour);
+
+    p = ngx_palloc(r->pool, sizeof("yyyy-mm-dd") - 1);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_sprintf(p, "%04d-%02d-%02d", tm.ngx_tm_year, tm.ngx_tm_mon,
+                tm.ngx_tm_mday);
+
+    res->data = p;
+    res->len = sizeof("yyyy-mm-dd") - 1;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_set_formatted_gmt_time(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    time_t           now;
+    u_char          *p;
+    struct tm        tm;
+
+    if (v->not_found || v->len == 0) {
+        res->data = NULL;
+        res->len = 0;
+        return NGX_OK;
+    }
+
+    now = ngx_time();
+    ngx_libc_gmtime(now, &tm);
+
+    p = ngx_palloc(r->pool, NGX_HTTP_SET_MISC_FMT_DATE_LEN);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    res->len = strftime((char *) p, NGX_HTTP_SET_MISC_FMT_DATE_LEN,
+                        (char *) v->data, &tm);
+    if (res->len == 0) {
+        return NGX_ERROR;
+    }
+
+    res->data = p;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_set_formatted_local_time(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    time_t           now;
+    u_char          *p;
+    struct tm        tm;
+
+    if (v->not_found || v->len == 0) {
+        res->data = NULL;
+        res->len = 0;
+        return NGX_OK;
+    }
+
+    now = ngx_time();
+    ngx_libc_localtime(now, &tm);
+
+    p = ngx_palloc(r->pool, NGX_HTTP_SET_MISC_FMT_DATE_LEN);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    res->len = strftime((char *) p, NGX_HTTP_SET_MISC_FMT_DATE_LEN,
+                        (char *) v->data, &tm);
+    if (res->len == 0) {
+        return NGX_ERROR;
+    }
+
+    res->data = p;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.h
new file mode 100644
index 0000000..993431e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_local_today.h
@@ -0,0 +1,13 @@
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+
+ngx_int_t ngx_http_set_local_today(ngx_http_request_t *r, ngx_str_t *res,
+        ngx_http_variable_value_t *v);
+
+ngx_int_t ngx_http_set_formatted_gmt_time(ngx_http_request_t *r, ngx_str_t *res,
+        ngx_http_variable_value_t *v);
+
+ngx_int_t ngx_http_set_formatted_local_time(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.c
new file mode 100644
index 0000000..3b12b0e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.c
@@ -0,0 +1,586 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_set_misc_module.h"
+#include <ndk.h>
+#include "ngx_http_set_base32.h"
+#include "ngx_http_set_default_value.h"
+#include "ngx_http_set_hashed_upstream.h"
+#include "ngx_http_set_unescape_uri.h"
+#include "ngx_http_set_quote_sql.h"
+#include "ngx_http_set_quote_json.h"
+#include "ngx_http_set_escape_uri.h"
+#include "ngx_http_set_local_today.h"
+#include "ngx_http_set_hash.h"
+#include "ngx_http_set_hex.h"
+#include "ngx_http_set_base64.h"
+#include "ngx_http_set_base64url.h"
+#if NGX_OPENSSL
+#include "ngx_http_set_hmac.h"
+#endif
+#include "ngx_http_set_random.h"
+#include "ngx_http_set_secure_random.h"
+#include "ngx_http_set_rotate.h"
+
+
+#define NGX_UNESCAPE_URI_COMPONENT  0
+#define BASE32_ALPHABET_LEN         32
+
+
+static void *ngx_http_set_misc_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_set_misc_merge_loc_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static char *ngx_http_set_misc_base32_alphabet(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+
+
+static ngx_conf_deprecated_t  ngx_conf_deprecated_set_misc_base32_padding = {
+    ngx_conf_deprecated, "set_misc_base32_padding", "set_base32_padding"
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_encode_base64_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_encode_base64,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_decode_base64_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_decode_base64,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_encode_base64url_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_encode_base64url,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_decode_base64url_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_decode_base64url,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_decode_hex_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_decode_hex,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_encode_hex_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_encode_hex,
+    1,
+    NULL
+};
+
+
+#if NGX_OPENSSL
+static ndk_set_var_t  ngx_http_set_misc_set_hmac_sha1_filter = {
+    NDK_SET_VAR_MULTI_VALUE,
+    (void *) ngx_http_set_misc_set_hmac_sha1,
+    2,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_hmac_sha256_filter = {
+    NDK_SET_VAR_MULTI_VALUE,
+    (void *) ngx_http_set_misc_set_hmac_sha256,
+    2,
+    NULL
+};
+#endif
+
+
+#ifndef NGX_HTTP_SET_HASH
+static ndk_set_var_t  ngx_http_set_misc_set_md5_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_md5,
+    1,
+    NULL
+};
+
+
+#if NGX_HAVE_SHA1
+static ndk_set_var_t  ngx_http_set_misc_set_sha1_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_sha1,
+    1,
+    NULL
+};
+#endif
+#endif
+
+
+static ndk_set_var_t  ngx_http_set_misc_unescape_uri_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_unescape_uri,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t ngx_http_set_misc_escape_uri_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_escape_uri,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_decode_base32_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_decode_base32,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_quote_sql_str_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_quote_sql_str,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_quote_pgsql_str_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_quote_pgsql_str,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_quote_json_str_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_quote_json_str,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_encode_base32_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_encode_base32,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t ngx_http_set_misc_local_today_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_local_today,
+    0,
+    NULL
+};
+
+
+static ndk_set_var_t ngx_http_set_misc_formatted_gmt_time_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_formatted_gmt_time,
+    2,
+    NULL
+};
+
+
+static ndk_set_var_t ngx_http_set_misc_formatted_local_time_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_formatted_local_time,
+    2,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_random_filter = {
+    NDK_SET_VAR_MULTI_VALUE,
+    (void *) ngx_http_set_misc_set_random,
+    2,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_secure_random_alphanum_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_secure_random_alphanum,
+    1,
+    NULL
+};
+
+
+static ndk_set_var_t  ngx_http_set_misc_set_secure_random_lcalpha_filter = {
+    NDK_SET_VAR_VALUE,
+    (void *) ngx_http_set_misc_set_secure_random_lcalpha,
+    1,
+    NULL
+};
+
+
+static ngx_command_t  ngx_http_set_misc_commands[] = {
+    {   ngx_string ("set_encode_base64"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_encode_base64_filter
+    },
+    {   ngx_string ("set_decode_base64"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_decode_base64_filter
+    },
+    {   ngx_string ("set_encode_base64url"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_encode_base64url_filter
+    },
+    {   ngx_string ("set_decode_base64url"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_decode_base64url_filter
+    },
+    {   ngx_string ("set_decode_hex"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_decode_hex_filter
+    },
+    {   ngx_string ("set_encode_hex"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_encode_hex_filter
+    },
+#if NGX_OPENSSL
+    {   ngx_string ("set_hmac_sha1"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE3,
+        ndk_set_var_multi_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_hmac_sha1_filter
+    },
+    {   ngx_string ("set_hmac_sha256"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE3,
+        ndk_set_var_multi_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_hmac_sha256_filter
+    },
+#endif
+#ifndef NGX_HTTP_SET_HASH
+    {   ngx_string ("set_md5"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_md5_filter
+    },
+#if NGX_HAVE_SHA1
+    {
+        ngx_string ("set_sha1"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_sha1_filter
+    },
+#endif
+#endif
+    {
+        ngx_string ("set_unescape_uri"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_unescape_uri_filter
+    },
+    {
+        ngx_string ("set_escape_uri"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_escape_uri_filter
+    },
+    {
+        ngx_string ("set_quote_sql_str"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_quote_sql_str_filter
+    },
+    {
+        ngx_string ("set_quote_pgsql_str"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_quote_pgsql_str_filter
+    },
+    {
+        ngx_string ("set_quote_json_str"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_quote_json_str_filter
+    },
+    {
+        ngx_string ("set_if_empty"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE2,
+        ngx_http_set_if_empty,
+        0,
+        0,
+        NULL
+    },
+    {
+        ngx_string("set_hashed_upstream"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE3,
+        ngx_http_set_hashed_upstream,
+        0,
+        0,
+        NULL
+    },
+    {
+        /* this is now deprecated; use set_base32_padding instead */
+        ngx_string("set_misc_base32_padding"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_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_set_misc_loc_conf_t, base32_padding),
+        &ngx_conf_deprecated_set_misc_base32_padding,
+    },
+    {
+        ngx_string("set_base32_padding"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_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_set_misc_loc_conf_t, base32_padding),
+        NULL
+    },
+    {
+        ngx_string("set_base32_alphabet"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+        ngx_http_set_misc_base32_alphabet,
+        NGX_HTTP_LOC_CONF_OFFSET,
+        offsetof(ngx_http_set_misc_loc_conf_t, base32_alphabet),
+        NULL
+    },
+    {
+        ngx_string("set_encode_base32"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_encode_base32_filter
+    },
+    {
+        ngx_string("set_decode_base32"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_decode_base32_filter
+    },
+    {
+        ngx_string("set_local_today"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_local_today_filter
+    },
+    {
+        ngx_string("set_formatted_gmt_time"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE2,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_formatted_gmt_time_filter
+    },
+    {
+        ngx_string("set_formatted_local_time"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE2,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_formatted_local_time_filter
+    },
+    {   ngx_string ("set_random"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE3,
+        ndk_set_var_multi_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_random_filter
+    },
+    {   ngx_string ("set_secure_random_alphanum"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_secure_random_alphanum_filter
+    },
+    {   ngx_string ("set_secure_random_lcalpha"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE12,
+        ndk_set_var_value,
+        0,
+        0,
+        &ngx_http_set_misc_set_secure_random_lcalpha_filter
+    },
+    {   ngx_string ("set_rotate"),
+        NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
+            |NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE3,
+        ngx_http_set_rotate,
+        0,
+        0,
+        NULL
+    },
+
+    ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_set_misc_module_ctx = {
+    NULL,                                 /* preconfiguration */
+    NULL,                                 /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    ngx_http_set_misc_create_loc_conf,     /* create location configuration */
+    ngx_http_set_misc_merge_loc_conf       /*  merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_set_misc_module = {
+    NGX_MODULE_V1,
+    &ngx_http_set_misc_module_ctx,          /* module context */
+    ngx_http_set_misc_commands,             /* module directives */
+    NGX_HTTP_MODULE,                        /* module type */
+    NULL,                                   /* init master */
+    NULL,                                   /* init module */
+    NULL,                                   /* init process */
+    NULL,                                   /* init thread */
+    NULL,                                   /* exit thread */
+    NULL,                                   /* exit process */
+    NULL,                                   /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+void *
+ngx_http_set_misc_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_set_misc_loc_conf_t *conf;
+
+    conf = ngx_palloc(cf->pool, sizeof(ngx_http_set_misc_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    conf->base32_padding = NGX_CONF_UNSET;
+    conf->base32_alphabet.data = NULL;
+    conf->base32_alphabet.len = 0;
+    conf->current = NGX_CONF_UNSET;
+
+    return conf;
+}
+
+
+char *
+ngx_http_set_misc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_uint_t               i;
+
+    ngx_http_set_misc_loc_conf_t *prev = parent;
+    ngx_http_set_misc_loc_conf_t *conf = child;
+
+    ngx_conf_merge_value(conf->base32_padding, prev->base32_padding, 1);
+
+    ngx_conf_merge_str_value(conf->base32_alphabet, prev->base32_alphabet,
+                             "0123456789abcdefghijklmnopqrstuv");
+
+    ngx_conf_merge_value(conf->current, prev->current, NGX_CONF_UNSET);
+
+    for (i = 0; i < BASE32_ALPHABET_LEN; i++) {
+        conf->basis32[conf->base32_alphabet.data[i]] = (u_char) i;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_set_misc_base32_alphabet(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    ngx_str_t       *value;
+
+    value = cf->args->elts;
+
+    if (value[1].len != BASE32_ALPHABET_LEN) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "\"set_base32_alphabet\" directive takes an "
+                           "alphabet of %uz bytes but %d expected",
+                           value[1].len, BASE32_ALPHABET_LEN);
+        return NGX_CONF_ERROR;
+    }
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.h
new file mode 100644
index 0000000..49b3c9e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_misc_module.h
@@ -0,0 +1,30 @@
+#ifndef NGX_HTTP_SET_MISC_MODULE_H
+#define NGX_HTTP_SET_MISC_MODULE_H
+
+
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+#ifndef NGX_HAVE_SHA1
+#   if (nginx_version >= 1011002)
+#       define NGX_HAVE_SHA1  1
+#   endif
+#endif
+
+
+typedef struct {
+    ngx_flag_t          base32_padding;
+    ngx_str_t           base32_alphabet;
+    u_char              basis32[256];
+    ngx_int_t           current;  /* for set_rotate */
+} ngx_http_set_misc_loc_conf_t;
+
+
+extern ngx_module_t  ngx_http_set_misc_module;
+
+
+#endif /* NGX_HTTP_SET_MISC_MODULE_H */
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.c
new file mode 100644
index 0000000..4bed13c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.c
@@ -0,0 +1,165 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include <ndk.h>
+#include "ngx_http_set_quote_json.h"
+
+ngx_int_t
+ngx_http_set_misc_quote_json_str(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    size_t                   len;
+    u_char                  *p;
+    size_t                   escape;
+
+    if (v->not_found || v->len == 0) {
+        res->data = (u_char *) "null";
+        res->len = sizeof("null") - 1;
+        return NGX_OK;
+    }
+
+    escape = ngx_http_set_misc_escape_json_str(NULL, v->data, v->len);
+
+    len = sizeof("''") - 1
+        + v->len
+        + escape;
+
+    p = ngx_palloc(r->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    res->data = p;
+    res->len = len;
+
+    *p++ = '\"';
+
+    if (escape == 0) {
+        p = ngx_copy(p, v->data, v->len);
+
+    } else {
+        p = (u_char *) ngx_http_set_misc_escape_json_str(p, v->data, v->len);
+    }
+
+    *p++ = '\"';
+
+    if (p != res->data + res->len) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_quote_sql_str: buffer error");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+uintptr_t
+ngx_http_set_misc_escape_json_str(u_char *dst, u_char *src, size_t size)
+{
+    ngx_uint_t                   n;
+
+    static u_char hex[] = "0123456789abcdef";
+
+    if (dst == NULL) {
+        /* find the number of characters to be escaped */
+
+        n = 0;
+
+        while (size) {
+            /* UTF-8 char has high bit of 1 */
+            if ((*src & 0x80) == 0) {
+                switch (*src) {
+                case '\r':
+                case '\n':
+                case '\\':
+                case '"':
+                case '\f':
+                case '\b':
+                case '\t':
+                    n++;
+                    break;
+                default:
+                    if (*src < 32) {
+                        n += sizeof("\\u00xx") - 2;
+                    }
+
+                    break;
+                }
+            }
+
+            src++;
+            size--;
+        }
+
+        return (uintptr_t) n;
+    }
+
+    while (size) {
+        if ((*src & 0x80) == 0) {
+            switch (*src) {
+            case '\r':
+                *dst++ = '\\';
+                *dst++ = 'r';
+                break;
+
+            case '\n':
+                *dst++ = '\\';
+                *dst++ = 'n';
+                break;
+
+            case '\\':
+                *dst++ = '\\';
+                *dst++ = '\\';
+                break;
+
+            case '"':
+                *dst++ = '\\';
+                *dst++ = '"';
+                break;
+
+            case '\f':
+                *dst++ = '\\';
+                *dst++ = 'f';
+                break;
+
+            case '\b':
+                *dst++ = '\\';
+                *dst++ = 'b';
+                break;
+
+            case '\t':
+                *dst++ = '\\';
+                *dst++ = 't';
+                break;
+
+            default:
+                if (*src < 32) { /* control chars */
+                    *dst++ = '\\';
+                    *dst++ = 'u';
+                    *dst++ = '0';
+                    *dst++ = '0';
+                    *dst++ = hex[*src >> 4];
+                    *dst++ = hex[*src & 0x0f];
+
+                } else {
+                    *dst++ = *src;
+                }
+
+                break;
+            } /* switch */
+
+            src++;
+
+        } else {
+            *dst++ = *src++;
+        }
+
+        size--;
+    }
+
+    return (uintptr_t) dst;
+}
+
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.h
new file mode 100644
index 0000000..1bf55e2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_json.h
@@ -0,0 +1,16 @@
+#ifndef NGX_HTTP_SET_QUOTE_JSON_H
+#define NGX_HTTP_SET_QUOTE_JSON_H
+
+
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+
+ngx_int_t ngx_http_set_misc_quote_json_str(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+uintptr_t ngx_http_set_misc_escape_json_str(u_char *dst, u_char *src,
+        size_t size);
+
+
+#endif /* NGX_HTTP_SET_QUOTE_JSON_H */
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.c
new file mode 100644
index 0000000..8d78348
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.c
@@ -0,0 +1,382 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include <ndk.h>
+#include "ngx_http_set_quote_sql.h"
+
+
+static ngx_int_t ngx_http_pg_utf_escape(ngx_http_request_t *r, ngx_str_t *res);
+static ngx_int_t ngx_http_pg_utf_islegal(const unsigned char *s, ngx_int_t len);
+static ngx_int_t ngx_http_pg_utf_mblen(const unsigned char *s);
+
+
+ngx_int_t
+ngx_http_set_misc_quote_pgsql_str(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    u_char                   *pstr;
+    ngx_int_t                 length;
+
+    if (v->not_found || v->len ==0) {
+        res->data = (u_char *) "''";
+        res->len = sizeof("''") - 1;
+        return NGX_OK;
+    }
+
+    ngx_http_set_misc_quote_sql_str(r, res, v);
+    length  = res->len;
+
+    pstr    = ngx_palloc(r->pool, length + 1);
+    if (pstr == NULL) {
+        return NGX_ERROR;
+    }
+
+    *pstr   = 'E';
+    memcpy(pstr + 1, res->data, length);
+    res->data   = pstr;
+    res->len    = length + 1;
+
+    if (ngx_http_pg_utf_islegal(res->data, res->len)) {
+        return NGX_OK;
+    }
+
+    if (ngx_http_pg_utf_escape(r, res) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_pg_utf_mblen(const unsigned char *s)
+{
+    int len;
+
+    if ((*s & 0x80) == 0)
+        len = 1;
+    else if ((*s & 0xe0) == 0xc0)
+        len = 2;
+    else if ((*s & 0xf0) == 0xe0)
+        len = 3;
+    else if ((*s & 0xf8) == 0xf0)
+        len = 4;
+#ifdef NOT_USED
+    else if ((*s & 0xfc) == 0xf8)
+        len = 5;
+    else if ((*s & 0xfe) == 0xfc)
+        len = 6;
+#endif
+    else
+        len = 1;
+    return len;
+}
+
+
+static ngx_int_t
+ngx_http_pg_utf_islegal(const unsigned char *s, ngx_int_t len)
+{
+    ngx_int_t               mblen;
+    ngx_int_t               slen;
+    u_char                  a;
+
+    slen = len;
+
+    while (slen > 0) {
+        mblen = ngx_http_pg_utf_mblen(s);
+        if (slen < mblen) {
+            return 0;
+        }
+
+        switch (mblen) {
+
+        case 4:
+            a = *(s + 3);
+            if (a < 0x80 || a > 0xBF) {
+                return 0;
+            }
+
+            break;
+
+        case 3:
+            a = *(s + 2);
+            if (a < 0x80 || a > 0xBF) {
+                return 0;
+            }
+
+            break;
+
+        case 2:
+            a = *(s + 1);
+
+            switch (*s) {
+
+            case 0xE0:
+                if (a < 0xA0 || a > 0xBF) {
+                    return 0;
+                }
+
+                break;
+
+            case 0xED:
+                if (a < 0x80 || a > 0x9F) {
+                    return 0;
+                }
+
+                break;
+
+            case 0xF0:
+                if (a < 0x90 || a > 0xBF) {
+                    return 0;
+                }
+
+                break;
+
+            case 0xF4:
+                if (a < 0x80 || a > 0x8F) {
+                    return 0;
+                }
+
+                break;
+
+            default:
+                if (a < 0x80 || a > 0xBF) {
+                    return 0;
+                }
+
+                break;
+            }
+
+            break;
+
+        case 1:
+            a = *s;
+            if (a >= 0x80 && a < 0xC2) {
+                return 0;
+            }
+
+            if (a > 0xF4) {
+                return 0;
+            }
+
+            break;
+
+        default:
+            return 0;
+        }
+
+        s += mblen;
+        slen -= mblen;
+    }
+
+    return 1;
+}
+
+
+static ngx_int_t
+ngx_http_pg_utf_escape(ngx_http_request_t *r, ngx_str_t *res)
+{
+    ngx_str_t               *result;
+    ngx_int_t                l, count;
+    u_char                  *d, *p, *p1;
+
+    l      = res->len;
+    d      = res->data;
+    result = res;
+    count  = 0;
+
+    while (l-- > 0) {
+        if (*d & 0x80) {
+            count += 4;
+        }
+
+        d++;
+        count++;
+    }
+
+    d = res->data;
+    l = res->len;
+
+    p = ngx_palloc(r->pool, count);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    p1  = p;
+    while (l-- > 0) {
+        if ((*d & 0x80)) {
+            *p++ = '\\';
+            *p++ = '\\';
+            *p++ = (*d >> 6) + '0';
+            *p++ = ((*d >> 3) & 07) + '0';
+            *p++ = (*d & 07) + '0';
+
+        } else {
+            *p++ = *d;
+        }
+
+        d++;
+    }
+
+    result->len  = count;
+    result->data = p1;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_set_misc_quote_sql_str(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    size_t                   len;
+    u_char                  *p;
+    size_t                   escape;
+
+    if (v->not_found || v->len == 0) {
+        res->data   = (u_char *) "''";
+        res->len    = sizeof("''") - 1;
+        return NGX_OK;
+    }
+
+    escape = ngx_http_set_misc_escape_sql_str(NULL, v->data, v->len);
+
+    len = sizeof("''") - 1 + v->len + escape;
+
+    p = ngx_palloc(r->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    res->data = p;
+    res->len = len;
+
+    *p++ = '\'';
+
+    if (escape == 0) {
+        p = ngx_copy(p, v->data, v->len);
+
+    } else {
+        p = (u_char *) ngx_http_set_misc_escape_sql_str(p, v->data, v->len);
+    }
+
+    *p++ = '\'';
+
+    if (p != res->data + res->len) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_quote_sql_str: buffer error");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+uintptr_t
+ngx_http_set_misc_escape_sql_str(u_char *dst, u_char *src, size_t size)
+{
+    ngx_uint_t               n;
+
+    if (dst == NULL) {
+        /* find the number of chars to be escaped */
+        n = 0;
+        while (size) {
+            /* the highest bit of all the UTF-8 chars
+             * is always 1 */
+            if ((*src & 0x80) == 0) {
+                switch (*src) {
+                    case '\0':
+                    case '\b':
+                    case '\n':
+                    case '\r':
+                    case '\t':
+                    case '\\':
+                    case '\'':
+                    case '"':
+                    case '$':
+                    case 26: /* \Z */
+                        n++;
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            src++;
+            size--;
+        }
+
+        return (uintptr_t) n;
+    }
+
+    while (size) {
+        if ((*src & 0x80) == 0) {
+            switch (*src) {
+                case '\0':
+                    *dst++ = '\\';
+                    *dst++ = '0';
+                    break;
+
+                case '\b':
+                    *dst++ = '\\';
+                    *dst++ = 'b';
+                    break;
+
+                case '\n':
+                    *dst++ = '\\';
+                    *dst++ = 'n';
+                    break;
+
+                case '\r':
+                    *dst++ = '\\';
+                    *dst++ = 'r';
+                    break;
+
+                case '\t':
+                    *dst++ = '\\';
+                    *dst++ = 't';
+                    break;
+
+                case '\\':
+                    *dst++ = '\\';
+                    *dst++ = '\\';
+                    break;
+
+                case '\'':
+                    *dst++ = '\\';
+                    *dst++ = '\'';
+                    break;
+
+                case '"':
+                    *dst++ = '\\';
+                    *dst++ = '"';
+                    break;
+
+                case '$':
+                    *dst++ = '\\';
+                    *dst++ = '$';
+                    break;
+
+                case 26:
+                    *dst++ = '\\';
+                    *dst++ = 'Z';
+                    break;
+
+                default:
+                    *dst++ = *src;
+                    break;
+            }
+
+        } else {
+            *dst++ = *src;
+        }
+
+        src++;
+        size--;
+    } /* while (size) */
+
+    return (uintptr_t) dst;
+}
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.h
new file mode 100644
index 0000000..c631dd7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_quote_sql.h
@@ -0,0 +1,21 @@
+#ifndef NGX_SET_QUOTE_SQL_H
+#define NGX_SET_QUOTE_SQL_H
+
+
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+
+uintptr_t ngx_http_set_misc_escape_sql_str(u_char *dst, u_char *src,
+        size_t size);
+
+ngx_int_t ngx_http_set_misc_quote_sql_str(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+ngx_int_t ngx_http_set_misc_quote_pgsql_str(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+
+#endif /* NGX_SET_QUOTE_SQL_H */
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.c
new file mode 100644
index 0000000..c223633
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.c
@@ -0,0 +1,57 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include <ndk.h>
+#include "ngx_http_set_random.h"
+#include <stdlib.h>
+
+
+ngx_int_t
+ngx_http_set_misc_set_random(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    ngx_http_variable_value_t   *rand_from, *rand_to;
+    ngx_int_t                    int_from, int_to, tmp, random;
+
+    rand_from = v;
+    rand_to = v + 1;
+
+    int_from = ngx_atoi(rand_from->data, rand_from->len);
+    if (int_from == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_random: bad \"from\" argument: %v", rand_from);
+        return NGX_ERROR;
+    }
+
+    int_to = ngx_atoi(rand_to->data, rand_to->len);
+    if (int_to == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_random: bad \"to\" argument: %v", rand_to);
+        return NGX_ERROR;
+    }
+
+    if (int_from > int_to) {
+        tmp = int_from;
+        int_from = int_to;
+        int_to = tmp;
+    }
+
+    random = rand() % (int_to - int_from + 1) + int_from;
+
+    res->data = ngx_palloc(r->pool, NGX_INT_T_LEN);
+    if (res->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    res->len = ngx_sprintf(res->data, "%i", random) - res->data;
+
+    /* Set all required params */
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.h
new file mode 100644
index 0000000..88cffdc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_random.h
@@ -0,0 +1,12 @@
+#ifndef NGX_SET_RANDOM_H
+#define NGX_SET_RANDOM_H
+
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+ngx_int_t ngx_http_set_misc_set_random(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+#endif /* NGX_SET_RANDOM_H */
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.c
new file mode 100644
index 0000000..b83dee7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.c
@@ -0,0 +1,113 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include <ndk.h>
+#include "ngx_http_set_rotate.h"
+#include "ngx_http_set_misc_module.h"
+#include <stdlib.h>
+
+
+ngx_int_t
+ngx_http_set_misc_set_rotate(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    ngx_http_variable_value_t   *rotate_from, *rotate_to, *rotate_num;
+    ngx_int_t                    int_from, int_to, tmp, int_current;
+
+    ngx_http_set_misc_loc_conf_t        *conf;
+
+    rotate_num = &v[0];
+    rotate_from = &v[1];
+    rotate_to = &v[2];
+
+    int_from = ngx_atoi(rotate_from->data, rotate_from->len);
+    if (int_from == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_rotate: bad \"from\" argument value: \"%v\"",
+                      rotate_from);
+        return NGX_ERROR;
+    }
+
+    int_to = ngx_atoi(rotate_to->data, rotate_to->len);
+    if (int_to == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_rotate: bad \"to\" argument value: \"%v\"",
+                      rotate_to);
+        return NGX_ERROR;
+    }
+
+    if (int_from > int_to) {
+        tmp = int_from;
+        int_from = int_to;
+        int_to = tmp;
+    }
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_set_misc_module);
+
+    dd("current value not found: %d", (int) rotate_num->not_found);
+
+    if (rotate_num->len == 0) {
+        if (conf->current != NGX_CONF_UNSET) {
+            int_current = conf->current;
+
+        } else {
+            int_current = int_from - 1;
+        }
+
+    } else {
+
+        int_current = ngx_atoi(rotate_num->data, rotate_num->len);
+        if (int_current == NGX_ERROR) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "set_rotate: bad current value: \"%v\"", rotate_num);
+
+            if (conf->current != NGX_CONF_UNSET) {
+                int_current = conf->current;
+
+            } else {
+                int_current = int_from - 1;
+            }
+        }
+    }
+
+    int_current++;
+
+    if (int_current > int_to || int_current < int_from) {
+        int_current = int_from;
+    }
+
+    conf->current = int_current;
+
+    res->data = ngx_palloc(r->pool, NGX_INT_T_LEN);
+    if (res->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    res->len = ngx_sprintf(res->data, "%i", int_current) - res->data;
+
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
+
+
+char *
+ngx_http_set_rotate(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_str_t               *value;
+    ndk_set_var_t            filter;
+
+    value = cf->args->elts;
+
+    filter.type = NDK_SET_VAR_MULTI_VALUE;
+    filter.func = (void *) ngx_http_set_misc_set_rotate;
+    filter.size = 3;
+    filter.data = NULL;
+
+    return ndk_set_var_multi_value_core(cf, &value[1], &value[1], &filter);
+}
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.h
new file mode 100644
index 0000000..429204c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_rotate.h
@@ -0,0 +1,18 @@
+#ifndef NGX_HTTP_SET_MISC_ROTATE_H
+#define NGX_HTTP_SET_MISC_ROTATE_H
+
+
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+
+char *ngx_http_set_rotate(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+
+ngx_int_t ngx_http_set_misc_set_rotate(ngx_http_request_t *r,
+    ngx_str_t *res, ngx_http_variable_value_t *v);
+
+
+#endif /* NGX_HTTP_SET_MISC_ROTATE_H */
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.c
new file mode 100644
index 0000000..a07efe8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.c
@@ -0,0 +1,104 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include <ndk.h>
+#include "ngx_http_set_secure_random.h"
+#include <stdlib.h>
+
+
+enum {
+    MAX_RANDOM_STRING = 64,
+    ALPHANUM = 1,
+    LCALPHA  = 2
+};
+
+
+static ngx_int_t
+ngx_http_set_misc_set_secure_random_common(int alphabet_type,
+    ngx_http_request_t *r, ngx_str_t *res, ngx_http_variable_value_t *v);
+
+
+ngx_int_t
+ngx_http_set_misc_set_secure_random_alphanum(ngx_http_request_t *r,
+    ngx_str_t *res, ngx_http_variable_value_t *v)
+{
+    return ngx_http_set_misc_set_secure_random_common(ALPHANUM, r, res, v);
+}
+
+
+ngx_int_t
+ngx_http_set_misc_set_secure_random_lcalpha(ngx_http_request_t *r,
+    ngx_str_t *res, ngx_http_variable_value_t *v)
+{
+    return ngx_http_set_misc_set_secure_random_common(LCALPHA, r, res, v);
+}
+
+
+static ngx_int_t
+ngx_http_set_misc_set_secure_random_common(int alphabet_type,
+    ngx_http_request_t *r, ngx_str_t *res, ngx_http_variable_value_t *v)
+{
+    static u_char  alphabet[] = "abcdefghijklmnopqrstuvwxyz"
+                                "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+    u_char         entropy[MAX_RANDOM_STRING];
+    u_char         output[MAX_RANDOM_STRING];
+    ngx_int_t      length, i;
+    ngx_fd_t       fd;
+    ssize_t        n;
+
+    length = ngx_atoi(v->data, v->len);
+
+    if (length == NGX_ERROR || length < 1 || length > MAX_RANDOM_STRING) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_random: bad \"length\" argument: %v", v);
+        return NGX_ERROR;
+    }
+
+    fd = ngx_open_file((u_char *) "/dev/urandom", NGX_FILE_RDONLY,
+                       NGX_FILE_OPEN, 0);
+    if (fd == NGX_INVALID_FILE) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_secure_random: could not open /dev/urandom");
+        return NGX_ERROR;
+    }
+
+    n = ngx_read_fd(fd, entropy, length);
+    if (n != length) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_secure_random: could not read all %i byte(s) from "
+                      "/dev/urandom", length);
+        ngx_close_file(fd);
+        return NGX_ERROR;
+    }
+
+    ngx_close_file(fd);
+
+    for (i = 0; i < length; i++) {
+        if (alphabet_type == LCALPHA) {
+            output[i] = entropy[i] % 26 + 'a';
+
+        } else {
+            output[i] = alphabet[ entropy[i] % (sizeof alphabet - 1) ];
+        }
+    }
+
+    res->data = ngx_palloc(r->pool, length);
+    if (res->data == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_memcpy(res->data, output, length);
+
+    res->len = length;
+
+    /* set all required params */
+    v->valid = 1;
+    v->no_cacheable = 0;
+    v->not_found = 0;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.h
new file mode 100644
index 0000000..d65129e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_secure_random.h
@@ -0,0 +1,15 @@
+#ifndef NGX_SET_SECURE_RANDOM_H
+#define NGX_SET_SECURE_RANDOM_H
+
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+ngx_int_t ngx_http_set_misc_set_secure_random_alphanum(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+ngx_int_t ngx_http_set_misc_set_secure_random_lcalpha(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+#endif /* NGX_SET_SECURE_RANDOM_H */
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.c b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.c
new file mode 100644
index 0000000..3ae1d0a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.c
@@ -0,0 +1,184 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include <ndk.h>
+#include "ngx_http_set_unescape_uri.h"
+
+#define NGX_UNESCAPE_URI_COMPONENT  0
+
+
+static void ngx_unescape_uri_patched(u_char **dst, u_char **src, size_t size,
+    ngx_uint_t type);
+
+
+ngx_int_t
+ngx_http_set_misc_unescape_uri(ngx_http_request_t *r, ngx_str_t *res,
+    ngx_http_variable_value_t *v)
+{
+    size_t                   len;
+    u_char                  *p;
+    u_char                  *src, *dst;
+
+    /* the unescaped string can only be smaller */
+    len = v->len;
+
+    p = ngx_palloc(r->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    src = v->data; dst = p;
+
+    ngx_unescape_uri_patched(&dst, &src, v->len, NGX_UNESCAPE_URI_COMPONENT);
+
+    if (src != v->data + v->len) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "set_unescape_uri: input data not consumed completely");
+        return NGX_ERROR;
+    }
+
+    res->data = p;
+    res->len = dst - p;
+
+    return NGX_OK;
+}
+
+
+/* XXX we also decode '+' to ' ' */
+static void
+ngx_unescape_uri_patched(u_char **dst, u_char **src, size_t size,
+    ngx_uint_t type)
+{
+    u_char  *d, *s, ch, c, decoded;
+    enum {
+        sw_usual = 0,
+        sw_quoted,
+        sw_quoted_second
+    } state;
+
+    d = *dst;
+    s = *src;
+
+    state = 0;
+    decoded = 0;
+
+    while (size--) {
+
+        ch = *s++;
+
+        switch (state) {
+        case sw_usual:
+            if (ch == '?'
+                && (type & (NGX_UNESCAPE_URI|NGX_UNESCAPE_REDIRECT)))
+            {
+                *d++ = ch;
+                goto done;
+            }
+
+            if (ch == '%') {
+                state = sw_quoted;
+                break;
+            }
+
+            if (ch == '+') {
+                *d++ = ' ';
+                break;
+            }
+
+            *d++ = ch;
+            break;
+
+        case sw_quoted:
+
+            if (ch >= '0' && ch <= '9') {
+                decoded = (u_char) (ch - '0');
+                state = sw_quoted_second;
+                break;
+            }
+
+            c = (u_char) (ch | 0x20);
+            if (c >= 'a' && c <= 'f') {
+                decoded = (u_char) (c - 'a' + 10);
+                state = sw_quoted_second;
+                break;
+            }
+
+            /* the invalid quoted character */
+
+            state = sw_usual;
+
+            *d++ = ch;
+
+            break;
+
+        case sw_quoted_second:
+
+            state = sw_usual;
+
+            if (ch >= '0' && ch <= '9') {
+                ch = (u_char) ((decoded << 4) + ch - '0');
+
+                if (type & NGX_UNESCAPE_REDIRECT) {
+                    if (ch > '%' && ch < 0x7f) {
+                        *d++ = ch;
+                        break;
+                    }
+
+                    *d++ = '%'; *d++ = *(s - 2); *d++ = *(s - 1);
+
+                    break;
+                }
+
+                *d++ = ch;
+
+                break;
+            }
+
+            c = (u_char) (ch | 0x20);
+            if (c >= 'a' && c <= 'f') {
+                ch = (u_char) ((decoded << 4) + c - 'a' + 10);
+
+                if (type & NGX_UNESCAPE_URI) {
+                    if (ch == '?') {
+                        *d++ = ch;
+                        goto done;
+                    }
+
+                    *d++ = ch;
+                    break;
+                }
+
+                if (type & NGX_UNESCAPE_REDIRECT) {
+                    if (ch == '?') {
+                        *d++ = ch;
+                        goto done;
+                    }
+
+                    if (ch > '%' && ch < 0x7f) {
+                        *d++ = ch;
+                        break;
+                    }
+
+                    *d++ = '%'; *d++ = *(s - 2); *d++ = *(s - 1);
+                    break;
+                }
+
+                *d++ = ch;
+
+                break;
+            }
+
+            /* the invalid quoted character */
+
+            break;
+        }
+    }
+
+done:
+
+    *dst = d;
+    *src = s;
+}
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.h b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.h
new file mode 100644
index 0000000..59e9a93
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/src/ngx_http_set_unescape_uri.h
@@ -0,0 +1,16 @@
+
+#ifndef NGX_HTTP_SET_UNESCAPE_URI
+#define NGX_HTTP_SET_UNESCAPE_URI
+
+
+#include <ngx_core.h>
+#include <ngx_config.h>
+#include <ngx_http.h>
+
+
+ngx_int_t ngx_http_set_misc_unescape_uri(ngx_http_request_t *r,
+        ngx_str_t *res, ngx_http_variable_value_t *v);
+
+
+#endif /* NGX_HTTP_SET_UNESCAPE_URI */
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/base32.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/base32.t
new file mode 100644
index 0000000..2efa731
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/base32.t
@@ -0,0 +1,556 @@
+# vi:filetype=
+
+use Test::Nginx::Socket;
+
+repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: base32 (5 bytes)
+--- config
+    location /bar {
+        set $a 'abcde';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+c5h66p35
+abcde
+
+
+
+=== TEST 2: base32 (1 byte)
+--- config
+    location /bar {
+        set $a '!';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+44======
+!
+
+
+
+=== TEST 3: base32 (1 byte) - not in-place editing
+--- config
+    location /bar {
+        set $a '!';
+        set_encode_base32 $a $a;
+        set_decode_base32 $b $a;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+44======
+!
+
+
+
+=== TEST 4: base32 (hello world)
+--- config
+    location /bar {
+        set $a '"hello, world!\nhiya"';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m6888ad1knio92
+"hello, world!
+hiya"
+
+
+
+=== TEST 5: base32 (0 bytes left)
+--- config
+    set_base32_padding on;
+    location /bar {
+        set $a '"hello, world!"';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892
+
+
+
+=== TEST 6: base32 (6 bytes padded)
+--- config
+    set_base32_padding on;
+    location /bar {
+        set $a '"hello, world!"a';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892c4======
+
+
+
+=== TEST 7: base32 (4 bytes left)
+--- config
+    set_base32_padding on;
+    location /bar {
+        set $a '"hello, world!"ab';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892c5h0====
+
+
+
+=== TEST 8: base32 (3 bytes left)
+--- config
+    set_base32_padding on;
+    location /bar {
+        set $a '"hello, world!"abc';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892c5h66===
+
+
+
+=== TEST 9: base32 (1 bytes left)
+--- config
+    set_base32_padding on;
+    location /bar {
+        set $a '"hello, world!"abcd';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892c5h66p0=
+
+
+
+=== TEST 10: base32 standard alphabet (5 bytes)
+--- config
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a 'abcde';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+MFRGGZDF
+abcde
+
+
+
+=== TEST 11: base32 standard alphabet (1 byte)
+--- config
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '!';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+EE======
+!
+
+
+
+=== TEST 12: base32 standard alphabet (1 byte) - not in-place editing
+--- config
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '!';
+        set_encode_base32 $a $a;
+        set_decode_base32 $b $a;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+EE======
+!
+
+
+
+=== TEST 13: base32 standard alphabet (hello world)
+--- config
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!\nhiya"';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIIKNBUXSYJC
+"hello, world!
+hiya"
+
+
+
+=== TEST 14: base32 standard alphabet (0 bytes left)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJC
+
+
+
+=== TEST 15: base32 standard alphabet (6 bytes padded)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"a';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJCME======
+
+
+
+=== TEST 16: base32 standard alphabet (4 bytes left)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"ab';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJCMFRA====
+
+
+
+=== TEST 17: base32 standard alphabet (3 bytes left)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"abc';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJCMFRGG===
+
+
+
+=== TEST 18: base32 standard alphabet (1 bytes left)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"abcd';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJCMFRGGZA=
+
+
+
+=== TEST 19: base32 custom alphabet (5 bytes)
+--- config
+    set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+    location /bar {
+        set $a 'abcde';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+qjvkk3hj
+abcde
+
+
+
+=== TEST 20: base32 custom alphabet (1 byte)
+--- config
+    set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+    location /bar {
+        set $a '!';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+ii======
+!
+
+
+
+=== TEST 21: base32 custom alphabet (1 byte) - not in-place editing
+--- config
+    set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+    location /bar {
+        set $a '!';
+        set_encode_base32 $a $a;
+        set_decode_base32 $b $a;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+ii======
+!
+
+
+
+=== TEST 22: base32 custom alphabet (hello world)
+--- config
+    set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+    location /bar {
+        set $a '"hello, world!\nhiya"';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+inyko5hqr60ge75tsn0kmmmorfy1w2ng
+"hello, world!
+hiya"
+
+
+
+=== TEST 23: base32 custom alphabet (0 bytes left)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+    location /bar {
+        set $a '"hello, world!"';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+inyko5hqr60ge75tsn0kmmng
+
+
+
+=== TEST 24: base32 custom alphabet (6 bytes padded)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+    location /bar {
+        set $a '"hello, world!"a';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+inyko5hqr60ge75tsn0kmmngqi======
+
+
+
+=== TEST 25: base32 custom alphabet (4 bytes left)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+    location /bar {
+        set $a '"hello, world!"ab';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+inyko5hqr60ge75tsn0kmmngqjve====
+
+
+
+=== TEST 26: base32 custom alphabet (3 bytes left)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+    location /bar {
+        set $a '"hello, world!"abc';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+inyko5hqr60ge75tsn0kmmngqjvkk===
+
+
+
+=== TEST 27: base32 custom alphabet (1 bytes left)
+--- config
+    set_base32_padding on;
+    set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+    location /bar {
+        set $a '"hello, world!"abcd';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+inyko5hqr60ge75tsn0kmmngqjvkk3e=
+
+
+
+=== TEST 28: use set_base32_alphabet in location
+--- config
+    set_base32_padding on;
+    location /bar {
+        set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789";
+        set $a '"hello, world!"abcd';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+inyko5hqr60ge75tsn0kmmngqjvkk3e=
+
+
+
+=== TEST 29: one byte less in set_base32_alphabet
+--- config
+    set_base32_padding on;
+    location /bar {
+        set_base32_alphabet "efghijklmnopqrstuvwxyz012345678";
+        set $a '"hello, world!"abcd?\/.;';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+inyko5hqr60ge75tsn0kmmngqjvkk3e=
+--- must_die
+--- error_log eval
+qr/\[emerg\] .*? "set_base32_alphabet" directive takes an alphabet of 31 bytes but 32 expected/
+
+
+
+=== TEST 30: one byte more in set_base32_alphabet
+--- config
+    set_base32_padding on;
+    location /bar {
+        set_base32_alphabet "efghijklmnopqrstuvwxyz0123456789A";
+        set $a '"hello, world!"abcd?\/.;';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+inyko5hqr60ge75tsn0kmmngqjvkk3e=
+--- must_die
+--- error_log eval
+qr/\[emerg\] .*? "set_base32_alphabet" directive takes an alphabet of 33 bytes but 32 expected/
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/base32_no_padding.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/base32_no_padding.t
new file mode 100644
index 0000000..9330cbf
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/base32_no_padding.t
@@ -0,0 +1,531 @@
+# vi:filetype=
+
+use Test::Nginx::Socket;
+
+repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: base32 (5 bytes)
+--- config
+    set_base32_padding off;
+    location /bar {
+        set $a 'abcde';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+c5h66p35
+abcde
+
+
+
+=== TEST 2: base32 (1 byte)
+--- config
+    set_base32_padding off;
+    location /bar {
+        set $a '!';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+44
+!
+
+
+
+=== TEST 3: base32 (1 byte) - not in-place editing
+--- config
+    location /bar {
+        set_base32_padding off;
+        set $a '!';
+        set_encode_base32 $a $a;
+        set_decode_base32 $b $a;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+44
+!
+
+
+
+=== TEST 4: base32 (hello world)
+--- config
+    set_base32_padding off;
+    location /bar {
+        set $a '"hello, world!\nhiya"';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m6888ad1knio92
+"hello, world!
+hiya"
+
+
+
+=== TEST 5: base32 (0 bytes left)
+--- config
+    set_base32_padding off;
+    location /bar {
+        set $a '"hello, world!"';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892
+
+
+
+=== TEST 6: base32 (6 bytes padded)
+--- config
+    set_base32_padding off;
+    location /bar {
+        set $a '"hello, world!"a';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892c4
+
+
+
+=== TEST 7: base32 (4 bytes left)
+--- config
+    set_base32_padding off;
+    location /bar {
+        set $a '"hello, world!"ab';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892c5h0
+
+
+
+=== TEST 8: base32 (3 bytes left)
+--- config
+    set_base32_padding off;
+    location /bar {
+        set $a '"hello, world!"abc';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892c5h66
+
+
+
+=== TEST 9: base32 (1 bytes left)
+--- config
+    set_base32_padding off;
+    location /bar {
+        set $a '"hello, world!"abcd';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+49k6ar3cdsm20trfe9m68892c5h66p0
+
+
+
+=== TEST 10: base32 standard alphabet (5 bytes)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a 'abcde';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+MFRGGZDF
+abcde
+
+
+
+=== TEST 11: base32 standard alphabet (1 byte)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '!';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+EE
+!
+
+
+
+=== TEST 12: base32 standard alphabet (1 byte) - not in-place editing
+--- config
+    location /bar {
+        set_base32_padding off;
+        set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+        set $a '!';
+        set_encode_base32 $a $a;
+        set_decode_base32 $b $a;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+EE
+!
+
+
+
+=== TEST 13: base32 standard alphabet (hello world)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!\nhiya"';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIIKNBUXSYJC
+"hello, world!
+hiya"
+
+
+
+=== TEST 14: base32 standard alphabet (0 bytes left)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJC
+
+
+
+=== TEST 15: base32 standard alphabet (6 bytes padded)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"a';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJCME
+
+
+
+=== TEST 16: base32 standard alphabet (4 bytes left)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"ab';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJCMFRA
+
+
+
+=== TEST 17: base32 standard alphabet (3 bytes left)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"abc';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJCMFRGG
+
+
+
+=== TEST 18: base32 standard alphabet (1 bytes left)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+    location /bar {
+        set $a '"hello, world!"abcd';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+EJUGK3DMN4WCA53POJWGIIJCMFRGGZA
+
+
+
+=== TEST 19: base32 custom alphabet (5 bytes)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "cdefghijklmnopqrstuvwxyz12345678";
+    location /bar {
+        set $a 'abcde';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+ohtii2fh
+abcde
+
+
+
+=== TEST 20: base32 custom alphabet (1 byte)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "cdefghijklmnopqrstuvwxyz12345678";
+    location /bar {
+        set $a '!';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+gg
+!
+
+
+
+=== TEST 21: base32 custom alphabet (1 byte) - not in-place editing
+--- config
+    location /bar {
+        set_base32_padding off;
+        set_base32_alphabet "cdefghijklmnopqrstuvwxyz12345678";
+        set $a '!';
+        set_encode_base32 $a $a;
+        set_decode_base32 $b $a;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+gg
+!
+
+
+
+=== TEST 22: base32 custom alphabet (hello world)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "cdefghijklmnopqrstuvwxyz12345678";
+    location /bar {
+        set $a '"hello, world!\nhiya"';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+glwim4fop5yec64rqlyikkkmpdwzu1le
+"hello, world!
+hiya"
+
+
+
+=== TEST 23: base32 custom alphabet (0 bytes left)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "cdefghijklmnopqrstuvwxyz12345678";
+    location /bar {
+        set $a '"hello, world!"';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+glwim4fop5yec64rqlyikkle
+
+
+
+=== TEST 24: base32 custom alphabet (6 bytes padded)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "cdefghijklmnopqrstuvwxyz12345678";
+    location /bar {
+        set $a '"hello, world!"a';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+glwim4fop5yec64rqlyikkleog
+
+
+
+=== TEST 25: base32 custom alphabet (4 bytes left)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "cdefghijklmnopqrstuvwxyz12345678";
+    location /bar {
+        set $a '"hello, world!"ab';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+glwim4fop5yec64rqlyikkleohtc
+
+
+
+=== TEST 26: base32 custom alphabet (3 bytes left)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "cdefghijklmnopqrstuvwxyz12345678";
+    location /bar {
+        set $a '"hello, world!"abc';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+glwim4fop5yec64rqlyikkleohtii
+
+
+
+=== TEST 27: base32 custom alphabet (1 bytes left)
+--- config
+    set_base32_padding off;
+    set_base32_alphabet "cdefghijklmnopqrstuvwxyz12345678";
+    location /bar {
+        set $a '"hello, world!"abcd';
+        set_encode_base32 $a;
+
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+glwim4fop5yec64rqlyikkleohtii2c
+
+
+
+=== TEST 28: deprecated set_misc_base32_padding
+--- config
+    set_misc_base32_padding off;
+    location /bar {
+        set $a 'abcde';
+        set_encode_base32 $a;
+        set $b $a;
+        set_decode_base32 $b;
+
+        echo $a;
+        echo $b;
+    }
+--- request
+    GET /bar
+--- response_body
+c5h66p35
+abcde
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/base64.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/base64.t
new file mode 100644
index 0000000..5dd5af8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/base64.t
@@ -0,0 +1,40 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: base64 encode
+--- config
+    location /bar {
+        set_encode_base64 $out "abcde";
+        echo $out;
+    }
+--- request
+    GET /bar
+--- response_body
+YWJjZGU=
+
+
+
+=== TEST 2: base64 decode
+--- config
+    location /bar {
+        set_decode_base64 $out "YWJjZGU=";
+        echo $out;
+    }
+--- request
+    GET /bar
+--- response_body
+abcde
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/base64url.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/base64url.t
new file mode 100644
index 0000000..fc71d59
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/base64url.t
@@ -0,0 +1,40 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: base64url encode
+--- config
+    location /bar {
+        set_encode_base64url $out "?b><d?";
+        echo $out;
+    }
+--- request
+    GET /bar
+--- response_body
+P2I-PGQ_
+
+
+
+=== TEST 2: base64url decode
+--- config
+    location /bar {
+        set_decode_base64url $out "P2I-PGQ_";
+        echo $out;
+    }
+--- request
+    GET /bar
+--- response_body
+?b><d?
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/default-value.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/default-value.t
new file mode 100644
index 0000000..d86e4a2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/default-value.t
@@ -0,0 +1,88 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: set if empty
+--- config
+    location /foo {
+        set $a 32;
+        set_if_empty $a 56;
+        echo $a;
+
+        set_if_empty $b 72;
+        echo $b;
+    }
+--- request
+GET /foo
+--- response_body
+32
+72
+
+
+
+=== TEST 2: set if empty
+--- config
+    location /foo {
+        set $bar $arg_bar;
+        set_if_empty $bar 15;
+        echo $bar;
+
+        set $bah $arg_bah;
+        set_if_empty $bah 25;
+        echo $bah;
+    }
+--- request
+GET /foo?bar=71
+--- response_body
+71
+25
+
+
+
+=== TEST 3: set if empty
+--- config
+    location /foo {
+        set $bar $arg_bar;
+        set_if_empty $bar 15;
+        echo $bar;
+
+        set $bah $arg_bah;
+        set_if_empty $bah 25;
+        echo $bah;
+    }
+--- request
+GET /foo?bar=
+--- response_body
+15
+25
+
+
+
+=== TEST 4: set if empty (using arg_xxx directly)
+buggy?
+--- config
+    location /foo {
+        set_if_empty $arg_bar 15;
+        echo $arg_bar;
+
+        set_if_empty $arg_bah 25;
+        echo $arg_bah;
+    }
+--- request
+GET /foo?bar=71
+--- response_body
+71
+25
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/escape-uri.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/escape-uri.t
new file mode 100644
index 0000000..7cbd067
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/escape-uri.t
@@ -0,0 +1,139 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+#no_diff();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set escape uri
+--- config
+	location /foo {
+		set $foo "hello world";
+		set_escape_uri $foo $foo;
+		echo $foo;
+	}
+--- request
+GET /foo
+--- response_body
+hello%20world
+
+
+
+=== TEST 2: set escape uri(in-place)
+--- config
+	location /foo {
+		set $foo "hello world";
+		set_escape_uri $foo;
+		echo $foo;
+	}
+--- request
+GET /foo
+--- response_body
+hello%20world
+
+
+
+=== TEST 3: blank string
+--- config
+	location /foo {
+		set $foo "";
+		set_escape_uri $foo;
+		echo $foo;
+	}
+--- request
+GET /foo
+--- response_body eval
+"\n"
+
+
+
+=== TEST 4: blank string(in place)
+--- config
+	location /foo {
+		set $foo "";
+		set_escape_uri $foo;
+		echo $foo;
+	}
+--- request
+GET /foo
+--- response_body eval
+"\n"
+
+
+
+=== TEST 5: eacape chinese character
+--- config
+    location /foo {
+        set $foo "你好";
+        set_escape_uri $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+%E4%BD%A0%E5%A5%BD
+
+
+
+=== TEST 6: escape long string
+--- config
+    location /foo {
+        set $foo "法规及饿哦物权法家哦低价非结果哦我二期界  附件饿哦武器  积分饿哦为契机佛i 该软件哦气氛  份额叫我起 国无二君哦气氛为界非ieowq结果哦而完全附件  份额叫我iqfjeowiqgjeriowqfjpdjfosadijfoiasdjf 附件饿哦武器界 份额叫我起界份额叫我起哦ifjefejwioq附件饿哦武器界非风格及去哦根据份额叫我起哦界份额为契机哦乳房阿基完全哦igqtewqo个人就去哦ieorjwrewqoi日哦额外起今天诶哦我亲热为特务前日哦我而哥特完全哦iijrtewmkdf 服务鄂潜江哦irewq";
+        set_escape_uri $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+%E6%B3%95%E8%A7%84%E5%8F%8A%E9%A5%BF%E5%93%A6%E7%89%A9%E6%9D%83%E6%B3%95%E5%AE%B6%E5%93%A6%E4%BD%8E%E4%BB%B7%E9%9D%9E%E7%BB%93%E6%9E%9C%E5%93%A6%E6%88%91%E4%BA%8C%E6%9C%9F%E7%95%8C%20%20%E9%99%84%E4%BB%B6%E9%A5%BF%E5%93%A6%E6%AD%A6%E5%99%A8%20%20%E7%A7%AF%E5%88%86%E9%A5%BF%E5%93%A6%E4%B8%BA%E5%A5%91%E6%9C%BA%E4%BD%9Bi%20%E8%AF%A5%E8%BD%AF%E4%BB%B6%E5%93%A6%E6%B0%94%E6%B0%9B%20%20%E4%BB%BD%E9%A2%9D%E5%8F%AB%E6%88%91%E8%B5%B7%20%E5%9B%BD%E6%97%A0%E4%BA%8C%E5%90%9B%E5%93%A6%E6%B0%94%E6%B0%9B%E4%B8%BA%E7%95%8C%E9%9D%9Eieowq%E7%BB%93%E6%9E%9C%E5%93%A6%E8%80%8C%E5%AE%8C%E5%85%A8%E9%99%84%E4%BB%B6%20%20%E4%BB%BD%E9%A2%9D%E5%8F%AB%E6%88%91iqfjeowiqgjeriowqfjpdjfosadijfoiasdjf%20%E9%99%84%E4%BB%B6%E9%A5%BF%E5%93%A6%E6%AD%A6%E5%99%A8%E7%95%8C%20%E4%BB%BD%E9%A2%9D%E5%8F%AB%E6%88%91%E8%B5%B7%E7%95%8C%E4%BB%BD%E9%A2%9D%E5%8F%AB%E6%88%91%E8%B5%B7%E5%93%A6ifjefejwioq%E9%99%84%E4%BB%B6%E9%A5%BF%E5%93%A6%E6%AD%A6%E5%99%A8%E7%95%8C%E9%9D%9E%E9%A3%8E%E6%A0%BC%E5%8F%8A%E5%8E%BB%E5%93%A6%E6%A0%B9%E6%8D%AE%E4%BB%BD%E9%A2%9D%E5%8F%AB%E6%88%91%E8%B5%B7%E5%93%A6%E7%95%8C%E4%BB%BD%E9%A2%9D%E4%B8%BA%E5%A5%91%E6%9C%BA%E5%93%A6%E4%B9%B3%E6%88%BF%E9%98%BF%E5%9F%BA%E5%AE%8C%E5%85%A8%E5%93%A6igqtewqo%E4%B8%AA%E4%BA%BA%E5%B0%B1%E5%8E%BB%E5%93%A6ieorjwrewqoi%E6%97%A5%E5%93%A6%E9%A2%9D%E5%A4%96%E8%B5%B7%E4%BB%8A%E5%A4%A9%E8%AF%B6%E5%93%A6%E6%88%91%E4%BA%B2%E7%83%AD%E4%B8%BA%E7%89%B9%E5%8A%A1%E5%89%8D%E6%97%A5%E5%93%A6%E6%88%91%E8%80%8C%E5%93%A5%E7%89%B9%E5%AE%8C%E5%85%A8%E5%93%A6iijrtewmkdf%20%E6%9C%8D%E5%8A%A1%E9%84%82%E6%BD%9C%E6%B1%9F%E5%93%A6irewq
+
+
+
+=== TEST 7: no need to escape
+--- config
+    location /foo {
+        set $foo 'welcometotheworldofnginx';
+        set_escape_uri $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+welcometotheworldofnginx
+
+
+
+=== TEST 8: fixed ngx_escape_uri issues: + and / should also be escaped
+--- config
+    location /foo {
+        set $foo '+/=';
+        set_escape_uri $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+%2B%2F%3D
+
+
+
+=== TEST 9: fixed ngx_escape_uri issues: / {} : & [] and more
+--- config
+    location /foo {
+        set $foo '"a/b={}:<>;&[]\\^';
+        set_escape_uri $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+%22a%2Fb%3D%7B%7D%3A%3C%3E%3B%26%5B%5D%5C%5E
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/formatted-time.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/formatted-time.t
new file mode 100644
index 0000000..9b0fc73
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/formatted-time.t
@@ -0,0 +1,84 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+use POSIX qw(strftime);
+
+my $fmt="%a %b %e %H:%M:%S %Y";
+
+our $str_local = (strftime $fmt, localtime  time()).'|'.(strftime $fmt, localtime time()+1).'|'.(strftime $fmt, localtime time()+2);
+
+our $str_gmt =  (strftime $fmt, gmtime time()).'|'.(strftime $fmt, gmtime time()+1).'|'.(strftime $fmt, gmtime time()+2);
+
+repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+log_level('warn');
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: local time format
+--- config
+    location /foo {
+        set_formatted_local_time $today "%a %b %e %H:%M:%S %Y";
+        echo $today;
+    }
+--- request
+GET /foo
+--- response_body_like eval: $main::str_local
+
+
+
+=== TEST 2: GMT time format
+--- config
+    location /bar {
+        set_formatted_gmt_time $today "%a %b %e %H:%M:%S %Y";
+        echo $today;
+    }
+--- request
+GET /bar
+--- response_body_like eval: $main::str_gmt
+
+
+
+=== TEST 3: set_formatted_gmt_time (empty formatter)
+--- config
+    location /bar {
+        set_formatted_gmt_time $today "";
+        echo "[$today]";
+    }
+--- request
+GET /bar
+--- response_body
+[]
+
+
+
+=== TEST 4: set_formatted_local_time (empty formatter)
+--- config
+    location /bar {
+        set_formatted_local_time $today "";
+        echo "[$today]";
+    }
+--- request
+GET /bar
+--- response_body
+[]
+
+
+
+=== TEST 5: set_formatted_local_time (constant formatter)
+--- config
+    location /bar {
+        set_formatted_local_time $today "hello world";
+        echo "[$today]";
+    }
+--- request
+GET /bar
+--- response_body
+[hello world]
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/hash.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/hash.t
new file mode 100644
index 0000000..a9c884b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/hash.t
@@ -0,0 +1,94 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: sha1 hello (copy)
+--- config
+    location /sha1 {
+        set_sha1 $a hello;
+        echo $a;
+    }
+--- request
+GET /sha1
+--- response_body
+aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d
+
+
+
+=== TEST 2: sha1 hello (in-place)
+--- config
+    location /sha1 {
+        set $a hello;
+        set_sha1 $a;
+        echo $a;
+    }
+--- request
+GET /sha1
+--- response_body
+aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d
+
+
+
+=== TEST 3: sha1 (empty)
+--- config
+    location /sha1 {
+        set_sha1 $a "";
+        echo $a;
+    }
+--- request
+GET /sha1
+--- response_body
+da39a3ee5e6b4b0d3255bfef95601890afd80709
+
+
+
+=== TEST 4: md5 hello (copy)
+--- config
+    location /md5 {
+        set_md5 $a hello;
+        echo $a;
+    }
+--- request
+GET /md5
+--- response_body
+5d41402abc4b2a76b9719d911017c592
+
+
+
+=== TEST 5: md5 hello (in-place)
+--- config
+    location /md5 {
+        set $a hello;
+        set_md5 $a;
+        echo $a;
+    }
+--- request
+GET /md5
+--- response_body
+5d41402abc4b2a76b9719d911017c592
+
+
+
+=== TEST 6: md5 (empty)
+--- config
+    location /md5 {
+        set_md5 $a "";
+        echo $a;
+    }
+--- request
+GET /md5
+--- response_body
+d41d8cd98f00b204e9800998ecf8427e
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/hashed-upstream.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/hashed-upstream.t
new file mode 100644
index 0000000..fdebd15
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/hashed-upstream.t
@@ -0,0 +1,70 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+#master_on();
+#log_level("warn");
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: set hashed upstream
+buggy?
+--- config
+    upstream_list universe moon sun earth;
+    location /foo {
+        set_hashed_upstream $backend universe $arg_id;
+        echo $backend;
+    }
+    location /main {
+        echo_location_async /foo;
+        echo_location_async /foo?id=hello;
+        echo_location_async /foo?id=world;
+        echo_location_async /foo?id=larry;
+        echo_location_async /foo?id=audreyt;
+    }
+--- request
+GET /main
+--- response_body
+moon
+sun
+moon
+earth
+earth
+
+
+
+=== TEST 2: set hashed upstream (use var for upstream_list name)
+buggy?
+--- config
+    upstream_list universe moon sun earth;
+    location /foo {
+        set $list_name universe;
+        set_hashed_upstream $backend $list_name $arg_id;
+        echo $backend;
+    }
+    location /main {
+        echo_location_async /foo;
+        echo_location_async /foo?id=hello;
+        echo_location_async /foo?id=world;
+        echo_location_async /foo?id=larry;
+        echo_location_async /foo?id=audreyt;
+    }
+--- request
+GET /main
+--- response_body
+moon
+sun
+moon
+earth
+earth
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/hex.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/hex.t
new file mode 100644
index 0000000..ae28105
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/hex.t
@@ -0,0 +1,57 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: hex encode
+--- config
+    location /bar {
+        set_encode_hex $out "abcde";
+        echo $out;
+    }
+--- request
+    GET /bar
+--- response_body
+6162636465
+
+
+
+=== TEST 2: hex decode
+--- config
+    location /bar {
+        set_decode_hex $out "6162636465";
+        echo $out;
+    }
+--- request
+    GET /bar
+--- response_body
+abcde
+
+
+
+=== TEST 3: hex encode (chinese)
+--- config
+    location /bar {
+        set $raw "章亦春";
+        set_encode_hex $digest $raw;
+        set_decode_hex $hex $digest;
+        echo $digest;
+        echo $hex;
+    }
+--- request
+    GET /bar
+--- response_body
+e7aba0e4baa6e698a5
+章亦春
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/hmac.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/hmac.t
new file mode 100644
index 0000000..5353eca
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/hmac.t
@@ -0,0 +1,78 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: hmac_sha1
+--- config
+    location /bar {
+        set $secret 'thisisverysecretstuff';
+        set $string_to_sign 'some string we want to sign';
+        set_hmac_sha1 $signature $secret $string_to_sign;
+        set_encode_base64 $signature $signature;
+        echo $signature;
+    }
+--- request
+    GET /bar
+--- response_body
+R/pvxzHC4NLtj7S+kXFg/NePTmk=
+
+
+
+=== TEST 2: hmac_sha1 empty vars
+--- config
+    location /bar {
+        set $secret '';
+        set $string_to_sign '';
+        set_hmac_sha1 $signature $secret $string_to_sign;
+        set_encode_base64 $signature $signature;
+        echo $signature;
+    }
+--- request
+    GET /bar
+--- response_body
++9sdGxiqbAgyS31ktx+3Y3BpDh0=
+
+
+
+=== TEST 3: hmac_sha256
+--- config
+    location /bar {
+        set $secret 'thisisverysecretstuff';
+        set $string_to_sign 'some string we want to sign';
+        set_hmac_sha256 $signature $secret $string_to_sign;
+        set_encode_base64 $signature $signature;
+        echo $signature;
+    }
+--- request
+    GET /bar
+--- response_body
+4pU3GRQrKKIoeLb9CqYsavHE2l6Hx+KMmRmesU+Cfrs=
+
+
+
+=== TEST 4: hmac_sha256 empty vars
+--- config
+    location /bar {
+        set $secret '';
+        set $string_to_sign '';
+        set_hmac_sha256 $signature $secret $string_to_sign;
+        set_encode_base64 $signature $signature;
+        echo $signature;
+    }
+--- request
+    GET /bar
+--- response_body
+thNnmggU2ex3L5XXeMNfxf8Wl8STcVZTxscSFEKSxa0=
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/local-today.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/local-today.t
new file mode 100644
index 0000000..7de0968
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/local-today.t
@@ -0,0 +1,29 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+my ($sec, $min, $hour, $mday, $mon, $year) = localtime;
+
+our $str = sprintf("%04d-%02d-%02d\n", $year + 1900, $mon + 1, $mday);
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+#no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /foo {
+        set_local_today $today;
+        echo $today;
+    }
+--- request
+GET /foo
+--- response_body eval: $main::str
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-json.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-json.t
new file mode 100644
index 0000000..8e15def
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-json.t
@@ -0,0 +1,69 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: set quote json value
+--- config
+    location /foo {
+        set $foo "hello\n\r'\"\\";
+        set_quote_json_str $foo $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+"hello\n\r'\"\\"
+
+
+
+=== TEST 2: set quote json value (in place)
+--- config
+    location /foo {
+        set $foo "hello\n\r'\"\\";
+        set_quote_json_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+"hello\n\r'\"\\"
+
+
+
+=== TEST 3: set quote empty json value
+--- config
+    location /foo {
+        set $foo "";
+        set_quote_json_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+null
+
+
+
+=== TEST 4: set quote null json value
+--- config
+    location /foo {
+        set_quote_json_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+null
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-sql.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-sql.t
new file mode 100644
index 0000000..bd81a87
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/quote-sql.t
@@ -0,0 +1,195 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: set quote sql value
+--- config
+    location /foo {
+        set $foo "hello\n\r'\"\\";
+        set_quote_sql_str $foo $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+'hello\n\r\'\"\\'
+
+
+
+=== TEST 2: set quote sql value (in place)
+--- config
+    location /foo {
+        set $foo "hello\n\r'\"\\";
+        set_quote_sql_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+'hello\n\r\'\"\\'
+
+
+
+=== TEST 3: set quote empty sql value
+--- config
+    location /foo {
+        set $foo "";
+        set_quote_sql_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+''
+
+
+
+=== TEST 4: set quote null sql value
+--- config
+    location /foo {
+        set_quote_sql_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+''
+
+
+
+=== TEST 5: set quote null pgsql value
+--- config
+    location /foo {
+        set_quote_pgsql_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+''
+
+
+
+=== TEST 6: set quote pgsql value
+--- config
+    location /foo {
+        set $foo "hello\n\r'\"\\";
+        set_quote_pgsql_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+E'hello\n\r\'\"\\'
+
+
+
+=== TEST 7: set quote pgsql valid utf8 value
+--- config
+    location /foo {
+        set $foo "你好";
+        set_quote_pgsql_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+E'你好'
+
+
+
+=== TEST 8: set quote pgsql invalid utf8 value
+--- config
+    location /foo {
+        set $foo "你好";
+        set_iconv $foo $foo from=utf-8 to=gbk;
+        set_quote_pgsql_str $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+E'\\304\\343\\272\\303'
+
+
+
+=== TEST 9: \0 for mysql
+--- config
+    location /foo {
+        set_unescape_uri $foo $arg_a;
+        set_quote_sql_str $foo $foo;
+        echo $foo;
+    }
+--- request
+GET /foo?a=a%00b%00
+--- response_body
+'a\0b\0'
+
+
+
+=== TEST 10: \b for mysql
+--- config
+    location /foo {
+        set_unescape_uri $foo $arg_a;
+        set_quote_sql_str $foo $foo;
+        echo $foo;
+    }
+--- request
+GET /foo?a=a%08b%08
+--- response_body
+'a\bb\b'
+
+
+
+=== TEST 11: \t for mysql
+--- config
+    location /foo {
+        set_unescape_uri $foo $arg_a;
+        set_quote_sql_str $foo $foo;
+        echo $foo;
+    }
+--- request
+GET /foo?a=a%09b%09
+--- response_body
+'a\tb\t'
+
+
+
+=== TEST 12: \Z for mysql
+--- config
+    location /foo {
+        set_unescape_uri $foo $arg_a;
+        set_quote_sql_str $foo $foo;
+        echo $foo;
+    }
+--- request
+GET /foo?a=a%1ab%1a
+--- response_body
+'a\Zb\Z'
+
+
+
+=== TEST 13: set quote sql value
+--- config
+    location /foo {
+        set_unescape_uri $foo $arg_a;
+        set_quote_sql_str $foo $foo;
+        echo $foo;
+    }
+--- request
+GET /foo?a=$$
+--- response_body
+'\$\$'
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/rand.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/rand.t
new file mode 100644
index 0000000..7f042bb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/rand.t
@@ -0,0 +1,168 @@
+# vi:filetype=perl
+
+use Test::Nginx::Socket;
+
+repeat_each(100);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /rand {
+        set $from 5;
+        set $to 7;
+        set_random $res $from $to;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body_like: [5-7]
+
+
+
+=== TEST 2: sanity (two digits)
+--- config
+    location /rand {
+        set $from 35;
+        set $to 37;
+        set_random $res $from $to;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body_like: 3[5-7]
+
+
+
+=== TEST 3: sanity (two digits, from > to)
+--- config
+    location /rand {
+        set $from 37;
+        set $to 35;
+        set_random $res $from $to;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body_like: 3[5-7]
+
+
+
+=== TEST 4: sanity (two digits, from == to)
+--- config
+    location /rand {
+        set $from 117;
+        set $to 117;
+        set_random $res $from $to;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body
+117
+
+
+
+=== TEST 5: negative number not allowed in from arg
+--- config
+    location /rand {
+        set $from -2;
+        set $to 4;
+        set_random $res $from $to;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 6: negative number not allowed in to arg
+--- config
+    location /rand {
+        set $from 2;
+        set $to -4;
+        set_random $res $from $to;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 7: empty string not allowed in from arg
+--- config
+    location /rand {
+        set $from '';
+        set $to 4;
+        set_random $res $from $to;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 8: empty string not allowed in to arg
+--- config
+    location /rand {
+        set $from 2;
+        set $to '';
+        set_random $res $from $to;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 9: wrong number of arguments
+--- config
+    location /rand {
+        set $from 2;
+        set_random $res $from;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- SKIP
+
+
+
+=== TEST 10: zero is fine
+--- config
+    location /rand {
+        set_random $res 0 0;
+
+        echo $res;
+    }
+--- request
+    GET /rand
+--- response_body
+0
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/rotate.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/rotate.t
new file mode 100644
index 0000000..2982a71
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/rotate.t
@@ -0,0 +1,270 @@
+# vi:filetype=
+
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks());
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: sanity
+--- config
+    location /bar {
+        set $a 1;
+        set_rotate $a 1 3;
+
+        set $b 2;
+        set_rotate $b 1 3;
+
+        set $c 3;
+        set_rotate $c 1 3;
+
+        set $d 0;
+        set_rotate $d 1 3;
+
+        set $e 1;
+        set_rotate $e 3 5;
+
+        echo "a = $a";
+        echo "b = $b";
+        echo "c = $c";
+        echo "d = $d";
+        echo "e = $e";
+    }
+--- request
+    GET /bar
+--- response_body
+a = 2
+b = 3
+c = 1
+d = 1
+e = 3
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: bad current value
+--- config
+    location /bar {
+        set $a abc;
+        set_rotate $a 1 3;
+
+        echo "a = $a";
+    }
+--- request
+    GET /bar
+--- response_body_like: ^a = [12]$
+--- error_log
+set_rotate: bad current value: "abc"
+
+
+
+=== TEST 3: bad "from" value
+--- config
+    location /bar {
+        set $a 2;
+        set_rotate $a abc 3;
+
+        echo "a = $a";
+    }
+--- request
+    GET /bar
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+set_rotate: bad "from" argument value: "abc"
+
+
+
+=== TEST 4: bad "to" argument value
+--- config
+    location /bar {
+        set $a 2;
+        set_rotate $a 1 abc;
+
+        echo "a = $a";
+    }
+--- request
+    GET /bar
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- error_log
+set_rotate: bad "to" argument value: "abc"
+
+
+
+=== TEST 5: when no current value is given
+--- config
+    location /incr {
+        set_rotate $a 1 3;
+
+        echo "a = $a";
+    }
+
+    location /t {
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+    }
+--- request
+    GET /t
+--- response_body
+a = 1
+a = 2
+a = 3
+a = 1
+a = 2
+a = 3
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: when no current value is given (starting from 0)
+--- config
+    location /incr {
+        set_rotate $a 0 2;
+
+        echo "a = $a";
+    }
+
+    location /t {
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+    }
+--- request
+    GET /t
+--- response_body
+a = 0
+a = 1
+a = 2
+a = 0
+a = 1
+a = 2
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: when a non-integer string value is given
+--- config
+    location /incr {
+        set $a "hello";
+        set_rotate $a 0 2;
+
+        echo "a = $a";
+    }
+
+    location /t {
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+    }
+--- request
+    GET /t
+--- response_body
+a = 0
+a = 1
+a = 2
+a = 0
+a = 1
+a = 2
+--- error_log
+set_rotate: bad current value: "hello"
+
+
+
+=== TEST 8: when an empty string value is given
+--- config
+    location /incr {
+        set $a "";
+        set_rotate $a 0 2;
+
+        echo "a = $a";
+    }
+
+    location /t {
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+        echo_location /incr;
+    }
+--- request
+    GET /t
+--- response_body
+a = 0
+a = 1
+a = 2
+a = 0
+a = 1
+a = 2
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: value persistence is per-location
+--- config
+    location /incr {
+        set_rotate $a 0 2;
+
+        echo "a = $a";
+    }
+
+    location /incr2 {
+        set_rotate $a 0 2;
+
+        echo "a = $a";
+    }
+
+    location /t {
+        echo_location /incr;
+        echo_location /incr2;
+        echo_location /incr;
+        echo_location /incr2;
+        echo_location /incr;
+        echo_location /incr2;
+        echo_location /incr;
+        echo_location /incr2;
+        echo_location /incr;
+        echo_location /incr2;
+        echo_location /incr;
+        echo_location /incr2;
+    }
+--- request
+    GET /t
+--- response_body
+a = 0
+a = 0
+a = 1
+a = 1
+a = 2
+a = 2
+a = 0
+a = 0
+a = 1
+a = 1
+a = 2
+a = 2
+--- no_error_log
+[error]
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/secure-random.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/secure-random.t
new file mode 100644
index 0000000..1f0b4a3
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/secure-random.t
@@ -0,0 +1,107 @@
+# vi:filetype=
+
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: a 32-character alphanum
+--- config
+    location /alphanum {
+        set_secure_random_alphanum $res 32;
+
+        echo $res;
+    }
+--- request
+    GET /alphanum
+--- response_body_like: ^[a-zA-Z0-9]{32}$
+
+
+
+=== TEST 2: a 16-character alphanum
+--- config
+    location /alphanum {
+        set_secure_random_alphanum $res 16;
+
+        echo $res;
+    }
+--- request
+    GET /alphanum
+--- response_body_like: ^[a-zA-Z0-9]{16}$
+
+
+
+=== TEST 3: a 1-character alphanum
+--- config
+    location /alphanum {
+        set_secure_random_alphanum $res 1;
+
+        echo $res;
+    }
+--- request
+    GET /alphanum
+--- response_body_like: ^[a-zA-Z0-9]{1}$
+
+
+
+=== TEST 4: length less than <= 0 should fail
+--- config
+    location /alphanum {
+        set_secure_random_alphanum $res 0;
+
+        echo $res;
+    }
+--- request
+    GET /alphanum
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 5: length less than <= 0 should fail
+--- config
+    location /alphanum {
+        set_secure_random_alphanum $res -4;
+
+        echo $res;
+    }
+--- request
+    GET /alphanum
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 6: non-numeric length should fail
+--- config
+    location /alphanum {
+        set_secure_random_alphanum $res bob;
+
+        echo $res;
+    }
+--- request
+    GET /alphanum
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+
+
+
+=== TEST 7: a 16-character lcalpha
+--- config
+    location /lcalpha {
+        set_secure_random_lcalpha $res 16;
+
+        echo $res;
+    }
+--- request
+    GET /lcalpha
+--- response_body_like: ^[a-z]{16}$
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/t/unescape-uri.t b/modules_deb/libnginx-mod-http-set-misc-0.33/t/unescape-uri.t
new file mode 100644
index 0000000..ad52b59
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/t/unescape-uri.t
@@ -0,0 +1,58 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+no_long_string();
+
+run_tests();
+
+#no_diff();
+
+__DATA__
+
+=== TEST 1: set unescape uri
+buggy?
+--- config
+    location /foo {
+        set $foo "hello%20world";
+        set_unescape_uri $foo $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+hello world
+
+
+
+=== TEST 2: set unescape uri (in-place)
+buggy?
+--- config
+    location /foo {
+        set $foo "hello%20world";
+        set_unescape_uri $foo;
+        echo $foo;
+    }
+--- request
+GET /foo
+--- response_body
+hello world
+
+
+
+=== TEST 3: unescape '+' to ' '
+--- config
+    location /bar {
+        set $a 'a+b';
+        set_unescape_uri $a;
+        echo $a;
+    }
+--- request
+    GET /bar
+--- response_body
+a b
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/util/build.sh b/modules_deb/libnginx-mod-http-set-misc-0.33/util/build.sh
new file mode 100755
index 0000000..dc2bcb6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/util/build.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# this file is mostly meant to be used by the author himself.
+
+root=`pwd`
+home=~
+version=$1
+force=$2
+
+    #--with-cc="gcc46" \
+    #--with-ld-opt="-rdynamic" \
+    #--with-mail \
+    #--with-mail_ssl_module \
+
+ngx-build $force $version \
+    --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" \
+    --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" \
+    --with-http_ssl_module \
+    --without-mail_pop3_module \
+    --without-mail_imap_module \
+    --without-mail_smtp_module \
+    --without-http_upstream_ip_hash_module \
+    --without-http_empty_gif_module \
+    --without-http_memcached_module \
+    --without-http_referer_module \
+    --without-http_autoindex_module \
+    --without-http_auth_basic_module \
+    --without-http_userid_module \
+    --add-module=$root/../echo-nginx-module \
+    --add-module=$root/../ndk-nginx-module \
+    --add-module=$root/../iconv-nginx-module \
+    --add-module=$root $opts \
+    --with-debug \
+  || exit 1
+
diff --git a/modules_deb/libnginx-mod-http-set-misc-0.33/valgrind.suppress b/modules_deb/libnginx-mod-http-set-misc-0.33/valgrind.suppress
new file mode 100644
index 0000000..470978e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-set-misc-0.33/valgrind.suppress
@@ -0,0 +1,105 @@
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_create_pool
+   fun:ngx_http_init_request
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_create_pool
+   fun:ngx_event_accept
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Addr4
+   fun:ngx_init_cycle
+   fun:ngx_master_process_cycle
+   fun:main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_calloc
+   fun:ngx_event_process_init
+}
+{
+   <insert_a_suppression_name_here>
+   exp-sgcheck:SorG
+   fun:ngx_http_variables_init_vars
+   fun:ngx_http_block
+}
+{
+   <insert_a_suppression_name_here>
+   exp-sgcheck:SorG
+   fun:ngx_conf_parse
+}
+{
+   <insert_a_suppression_name_here>
+   exp-sgcheck:SorG
+   fun:ngx_vslprintf
+   fun:ngx_log_error_core
+}
+{
+   <insert_a_suppression_name_here>
+   exp-sgcheck:SorG
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+}
+{
+   nginx-core-process-init
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_event_process_init
+}
+{
+   nginx-core-crc32-init
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_crc32_table_init
+   fun:main
+}
+{
+   libc-2.12.so
+   Memcheck:Param
+   epoll_ctl(event)
+   fun:epoll_ctl
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:index
+   fun:expand_dynamic_string_token
+   fun:_dl_map_object
+   fun:map_doit
+   fun:_dl_catch_error
+   fun:do_preload
+   fun:dl_main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+}
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitattributes b/modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitattributes
new file mode 100644
index 0000000..6fe6f35
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitattributes
@@ -0,0 +1 @@
+*.t linguist-language=Text
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitignore b/modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitignore
new file mode 100644
index 0000000..5e0cb97
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/.gitignore
@@ -0,0 +1,79 @@
+*.mobi
+genmobi.sh
+.libs
+*.swp
+*.slo
+*.la
+*.swo
+*.lo
+*~
+*.o
+print.txt
+.rsync
+*.tar.gz
+dist
+build[78]
+build
+tags
+update-readme
+*.tmp
+test/Makefile
+test/blib
+test.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
+src/var.[ch]
+util/bench
+*.html
+trace.out*
+try.sh
+build9
+src/fetch.[ch]
+src/store.[ch]
+t/servroot/
+headers.[ch]
+buildroot/
+build1[0-9]
+go
+all
+analyze
+addr2line
+*.plist
+Makefile
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/.travis.yml b/modules_deb/libnginx-mod-http-srcache-filter-0.33/.travis.yml
new file mode 100644
index 0000000..600cf7d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/.travis.yml
@@ -0,0 +1,87 @@
+sudo: required
+dist: bionic
+
+os: linux
+
+language: c
+
+cache:
+  directories:
+  - download-cache
+
+compiler:
+  - gcc
+
+env:
+  global:
+    - LUAJIT_PREFIX=/opt/luajit21
+    - LUAJIT_LIB=$LUAJIT_PREFIX/lib
+    - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
+    - LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
+    - LUA_INCLUDE_DIR=$LUAJIT_INC
+    - LUA_CMODULE_DIR=/lib
+    - JOBS=3
+    - NGX_BUILD_JOBS=$JOBS
+  matrix:
+    - NGINX_VERSION=1.17.8
+    - NGINX_VERSION=1.19.9
+    - NGINX_VERSION=1.23.0
+
+services:
+ - memcache
+ - redis-server
+ - postgresql
+ - mysql
+
+before_install:
+  - sudo apt-get install -qq -y axel cpanminus libtest-base-perl libtext-diff-perl liburi-perl libwww-perl libtest-longstring-perl liblist-moreutils-perl > build.log 2>&1 || (cat build.log && exit 1)
+
+install:
+  - echo $HOME
+  - if [ ! -d download-cache ]; then mkdir download-cache; fi
+  - if [ ! -f download-cache/ngx_http_redis-0.3.7.tar.gz ]; then wget -O download-cache/ngx_http_redis-0.3.7.tar.gz http://people.freebsd.org/~osa/ngx_http_redis-0.3.7.tar.gz; fi
+  - if [ ! -f download-cache/drizzle7-2011.07.21.tar.gz ]; then wget -O download-cache/drizzle7-2011.07.21.tar.gz http://openresty.org/download/drizzle7-2011.07.21.tar.gz; fi
+  - mkdir -p ~/work/nginx && cp download-cache/ngx_http_redis-0.3.7.tar.gz ~/work/nginx/
+  - git clone https://github.com/openresty/nginx-devel-utils.git
+  - git clone https://github.com/openresty/openresty.git ../openresty
+  - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
+  - git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
+  - git clone https://github.com/openresty/test-nginx.git
+  - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git
+  - git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
+  - git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core
+  - git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
+  - git clone https://github.com/openresty/nginx-eval-module.git ../eval-nginx-module
+  - git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
+  - git clone https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module
+  - git clone https://github.com/openresty/xss-nginx-module.git ../xss-nginx-module
+  - git clone https://github.com/openresty/redis2-nginx-module.git ../redis2-nginx-module
+  - git clone https://github.com/openresty/headers-more-nginx-module.git ../headers-more-nginx-module
+  - git clone https://github.com/openresty/rds-json-nginx-module.git ../rds-json-nginx-module
+  - git clone https://github.com/openresty/drizzle-nginx-module.git ../drizzle-nginx-module
+  - git clone https://github.com/openresty/memc-nginx-module.git ../memc-nginx-module
+  - git clone https://github.com/openresty/ngx_postgres.git ../postgres-nginx-module
+  - git clone https://github.com/openresty/openresty.git ../ngx_openresty
+
+before_script:
+  - mysql -uroot -e 'create database ngx_test; grant all on ngx_test.* to "ngx_test"@"%" identified by "ngx_test"; flush privileges;'
+  - psql -c "create database ngx_test;" -U postgres
+  - psql -c "create user ngx_test with password 'ngx_test';" -U postgres
+  - psql -c "grant all privileges on database ngx_test to ngx_test;" -U postgres
+
+script:
+  - tar xzf download-cache/drizzle7-2011.07.21.tar.gz && cd drizzle7-2011.07.21
+  - ./configure --prefix=/usr --without-server > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo PATH=$PATH make libdrizzle-1.0 install-libdrizzle-1.0 > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ..
+  - cd luajit2
+  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT' > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ..
+  - cd test-nginx && sudo cpanm . && cd ..
+  - export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH
+  - export NGX_BUILD_CC=$CC
+  - sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
+  - nginx -V
+  - ldd `which nginx`|grep luajit
+  - prove -I. -r t
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/Changes b/modules_deb/libnginx-mod-http-srcache-filter-0.33/Changes
new file mode 100644
index 0000000..5f257fe
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/Changes
@@ -0,0 +1,16 @@
+v0.12 - 11 July 2011
+* now we properly support fetch/store subrequests with internal redirection in them. main requests with internal redirection will still not be stored into the cache if there is a cache miss. thanks Liseen Wan for reporting it.
+* fixed spots that trigger the unused-but-set-variable warning by gcc 4.6.
+* added srcache_store_skip and srcache_fetch_skip directives to skip cache fetching or storing based on variables that are set and not empty nor 0. thanks Andre. Examples of using Lua to set $nocache to avoid storing URIs that contain /tmp:
+    set_by_lua $nocache '
+    	if string.match(ngx.var.request_uri, "/tmp") then
+    	  return "true"
+    	else
+    	  return ""
+    	end';
+
+    srcache_store_skip $nocache;
+* added new directive srcache_store_max_size. thanks Andre.
+* made our filter optimization work with nginx HUP by clearing the ngx_http_srcache_used flag at nginx pre-config callback. thanks Marcus Clyne.
+* now we skip NULL chains in our output filters and also removed the SUBREQUEST_IN_MEMORY flag for our srcache_store subrequests because it will cause mysterious hanging issues when memcached returns CLIENT_ERROR for "get".
+
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/README.markdown b/modules_deb/libnginx-mod-http-srcache-filter-0.33/README.markdown
new file mode 100644
index 0000000..e880b9c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/README.markdown
@@ -0,0 +1,1258 @@
+Name
+====
+
+**ngx_srcache** - Transparent subrequest-based caching layout for arbitrary nginx locations
+
+*This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
+
+Table of Contents
+=================
+
+* [Name](#name)
+* [Status](#status)
+* [Version](#version)
+* [Synopsis](#synopsis)
+* [Description](#description)
+    * [Subrequest caching](#subrequest-caching)
+    * [Distributed Memcached Caching](#distributed-memcached-caching)
+    * [Caching with Redis](#caching-with-redis)
+    * [Cache Key Preprocessing](#cache-key-preprocessing)
+* [Directives](#directives)
+    * [srcache_fetch](#srcache_fetch)
+    * [srcache_fetch_skip](#srcache_fetch_skip)
+    * [srcache_store](#srcache_store)
+    * [srcache_store_max_size](#srcache_store_max_size)
+    * [srcache_store_skip](#srcache_store_skip)
+    * [srcache_store_statuses](#srcache_store_statuses)
+    * [srcache_store_ranges](#srcache_store_ranges)
+    * [srcache_header_buffer_size](#srcache_header_buffer_size)
+    * [srcache_store_hide_header](#srcache_store_hide_header)
+    * [srcache_store_pass_header](#srcache_store_pass_header)
+    * [srcache_methods](#srcache_methods)
+    * [srcache_ignore_content_encoding](#srcache_ignore_content_encoding)
+    * [srcache_request_cache_control](#srcache_request_cache_control)
+    * [srcache_response_cache_control](#srcache_response_cache_control)
+    * [srcache_store_no_store](#srcache_store_no_store)
+    * [srcache_store_no_cache](#srcache_store_no_cache)
+    * [srcache_store_private](#srcache_store_private)
+    * [srcache_default_expire](#srcache_default_expire)
+    * [srcache_max_expire](#srcache_max_expire)
+* [Variables](#variables)
+    * [$srcache_expire](#srcache_expire)
+    * [$srcache_fetch_status](#srcache_fetch_status)
+    * [$srcache_store_status](#srcache_store_status)
+* [Known Issues](#known-issues)
+* [Caveats](#caveats)
+* [Trouble Shooting](#trouble-shooting)
+* [Installation](#installation)
+* [Compatibility](#compatibility)
+* [Community](#community)
+    * [English Mailing List](#english-mailing-list)
+    * [Chinese Mailing List](#chinese-mailing-list)
+* [Bugs and Patches](#bugs-and-patches)
+* [Source Repository](#source-repository)
+* [Test Suite](#test-suite)
+* [TODO](#todo)
+* [Getting involved](#getting-involved)
+* [Author](#author)
+* [Copyright & License](#copyright--license)
+* [See Also](#see-also)
+
+Status
+======
+
+This module is production ready.
+
+Version
+=======
+
+This document describes srcache-nginx-module [v0.32](https://github.com/openresty/srcache-nginx-module/tags) released on 2 July 2020.
+
+Synopsis
+========
+
+```nginx
+
+ upstream my_memcached {
+     server 10.62.136.7:11211;
+     keepalive 10;
+ }
+
+ location = /memc {
+     internal;
+
+     memc_connect_timeout 100ms;
+     memc_send_timeout 100ms;
+     memc_read_timeout 100ms;
+     memc_ignore_client_abort on;
+
+     set $memc_key $query_string;
+     set $memc_exptime 300;
+
+     memc_pass my_memcached;
+ }
+
+ location /foo {
+     set $key $uri$args;
+     srcache_fetch GET /memc $key;
+     srcache_store PUT /memc $key;
+     srcache_store_statuses 200 301 302 307 308;
+
+     # proxy_pass/fastcgi_pass/drizzle_pass/echo/etc...
+     # or even static files on the disk
+ }
+```
+
+```nginx
+
+ location = /memc2 {
+     internal;
+
+     memc_connect_timeout 100ms;
+     memc_send_timeout 100ms;
+     memc_read_timeout 100ms;
+     memc_ignore_client_abort on;
+
+     set_unescape_uri $memc_key $arg_key;
+     set $memc_exptime $arg_exptime;
+
+     memc_pass unix:/tmp/memcached.sock;
+ }
+
+ location /bar {
+     set_escape_uri $key $uri$args;
+     srcache_fetch GET /memc2 key=$key;
+     srcache_store PUT /memc2 key=$key&exptime=$srcache_expire;
+
+     # proxy_pass/fastcgi_pass/drizzle_pass/echo/etc...
+     # or even static files on the disk
+ }
+```
+
+```nginx
+
+ map $request_method $skip_fetch {
+     default     0;
+     POST        1;
+     PUT         1;
+ }
+
+ server {
+     listen 8080;
+
+     location /api/ {
+         set $key "$uri?$args";
+
+         srcache_fetch GET /memc $key;
+         srcache_store PUT /memc $key;
+
+         srcache_methods GET PUT POST;
+         srcache_fetch_skip $skip_fetch;
+
+         # proxy_pass/drizzle_pass/content_by_lua/echo/...
+     }
+ }
+```
+
+[Back to TOC](#table-of-contents)
+
+Description
+===========
+
+This module provides a transparent caching layer for arbitrary nginx locations (like those use an upstream or even serve static disk files). The caching behavior is mostly compatible with [RFC 2616](http://www.ietf.org/rfc/rfc2616.txt).
+
+Usually, [memc-nginx-module](https://github.com/openresty/memc-nginx-module) is used together with this module to provide a concrete caching storage backend. But technically, any modules that provide a REST interface can be used as the fetching and storage subrequests used by this module.
+
+For main requests, the [srcache_fetch](#srcache_fetch) directive works at the end of the access phase, so the [standard access module](http://nginx.org/en/docs/http/ngx_http_access_module.html)'s [allow](http://nginx.org/en/docs/http/ngx_http_access_module.html#allow) and [deny](http://nginx.org/en/docs/http/ngx_http_access_module.html#deny) direcives run *before* ours, which is usually the desired behavior for security reasons.
+
+The workflow of this module looks like below:
+
+![srcache flowchart](http://agentzh.org/misc/image/srcache-flowchart.png "srcache flowchart")
+
+[Back to TOC](#table-of-contents)
+
+Subrequest caching
+------------------
+
+For *subrequests*, we explicitly **disallow** the use of this module because it's too difficult to get right. There used to be an implementation but it was buggy and I finally gave up fixing it and abandoned it.
+
+However, if you're using [lua-nginx-module](https://github.com/openresty/lua-nginx-module), it's easy to do subrequest caching in Lua all by yourself. That is, first issue a subrequest to an [memc-nginx-module](https://github.com/openresty/memc-nginx-module) location to do an explicit cache lookup, if cache hit, just use the cached data returned; otherwise, fall back to the true backend, and finally do a cache insertion to feed the data into the cache.
+
+Using this module for main request caching and Lua for subrequest caching is the approach that we're taking in our business. This hybrid solution works great in production.
+
+[Back to TOC](#table-of-contents)
+
+Distributed Memcached Caching
+-----------------------------
+
+Here is a simple example demonstrating a distributed memcached caching mechanism built atop this module. Suppose we do have three different memcached nodes and we use simple modulo to hash our keys.
+
+```nginx
+
+ http {
+     upstream moon {
+         server 10.62.136.54:11211;
+         server unix:/tmp/memcached.sock backup;
+     }
+
+     upstream earth {
+         server 10.62.136.55:11211;
+     }
+
+     upstream sun {
+         server 10.62.136.56:11211;
+     }
+
+     upstream_list universe moon earth sun;
+
+     server {
+         memc_connect_timeout 100ms;
+         memc_send_timeout 100ms;
+         memc_read_timeout 100ms;
+
+         location = /memc {
+             internal;
+
+             set $memc_key $query_string;
+             set_hashed_upstream $backend universe $memc_key;
+             set $memc_exptime 3600; # in seconds
+             memc_pass $backend;
+         }
+
+         location / {
+             set $key $uri;
+             srcache_fetch GET /memc $key;
+             srcache_store PUT /memc $key;
+
+             # proxy_pass/fastcgi_pass/content_by_lua/drizzle_pass/...
+         }
+     }
+ }
+```
+Here's what is going on in the sample above:
+1. We first define three upstreams, `moon`, `earth`, and `sun`. These are our three memcached servers.
+1. And then we group them together as an upstream list entity named `universe` with the `upstream_list` directive provided by [set-misc-nginx-module](https://github.com/openresty/set-misc-nginx-module).
+1. After that, we define an internal location named `/memc` for talking to the memcached cluster.
+1. In this `/memc` location, we first set the `$memc_key` variable with the query string (`$args`), and then use the [set_hashed_upstream](https://github.com/openresty/set-misc-nginx-module#set_hashed_upstream) directive to hash our [$memc_key](https://github.com/openresty/memc-nginx-module#memc_key) over the upsteam list `universe`, so as to obtain a concrete upstream name to be assigned to the variable `$backend`.
+1. We pass this `$backend` variable into the [memc_pass](https://github.com/openresty/memc-nginx-module#memc_pass) directive. The `$backend` variable can hold a value among `moon`, `earth`, and `sun`.
+1. Also, we define the memcached caching expiration time to be 3600 seconds (i.e., an hour) by overriding the [$memc_exptime](https://github.com/openresty/memc-nginx-module#memc_exptime) variable.
+1. In our main public location `/`, we configure the `$uri` variable as our cache key, and then configure [srcache_fetch](#srcache_fetch) for cache lookups and [srcache_store](#srcache_store) for cache updates. We're using two subrequests to our `/memc` location defined earlier in these two directives.
+
+One can use [lua-nginx-module](https://github.com/openresty/lua-nginx-module)'s [set_by_lua](https://github.com/openresty/lua-nginx-module#set_by_lua) or [rewrite_by_lua](https://github.com/openresty/lua-nginx-module#rewrite_by_lua) directives to inject custom Lua code to compute the `$backend` and/or `$key` variables in the sample above.
+
+One thing that should be taken care of is that memcached does have restriction on key lengths, i.e., 250 bytes, so for keys that may be very long, one could use the [set_md5](https://github.com/openresty/set-misc-nginx-module#set_md5) directive or its friends to pre-hash the key to a fixed-length digest before assigning it to `$memc_key` in the `/memc` location or the like.
+
+Further, one can utilize the [srcache_fetch_skip](#srcache_fetch_skip) and [srcache_store_skip](#srcache_store_skip) directives to control what to cache and what not on a per-request basis, and Lua can also be used here in a similar way. So the possibility is really unlimited.
+
+To maximize speed, we often enable TCP (or Unix Domain Socket) connection pool for our memcached upstreams provided by [HttpUpstreamKeepaliveModule](http://wiki.nginx.org/HttpUpstreamKeepaliveModule), for example,
+
+```nginx
+
+ upstream moon {
+     server 10.62.136.54:11211;
+     server unix:/tmp/memcached.sock backup;
+     keepalive 10;
+ }
+```
+
+where we define a connection pool which holds up to 10 keep-alive connections (per nginx worker process) for our `moon` upstream (cluster).
+
+[Back to TOC](#table-of-contents)
+
+Caching with Redis
+------------------
+
+Redis is an alternative key-value store with many additional features.
+
+Here is a working example using the lua-resty-redis module:
+
+```
+  location ~ '\.php$|^/update.php' {
+    # cache setup
+    set $key $request_uri;
+    try_files $uri =404;
+
+    srcache_fetch_skip $skip_cache;
+    srcache_store_skip $skip_cache;
+
+    srcache_response_cache_control off;
+    srcache_store_statuses 200 201 301 302 307 308 404 503;
+
+    set_escape_uri $escaped_key $key;
+
+    srcache_fetch GET /redis-fetch $key;
+    srcache_store PUT /redis-store key=$escaped_key;
+
+    more_set_headers 'X-Cache-Fetch-Status $srcache_fetch_status';
+    more_set_headers 'X-Cache-Store-Status $srcache_store_status';
+
+    fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
+    # Security note: If you're running a version of PHP older than the
+    # latest 5.3, you should have "cgi.fix_pathinfo = 0;" in php.ini.
+    # See http://serverfault.com/q/627903/94922 for details.
+    include fastcgi_params;
+    # Block httproxy attacks. See https://httpoxy.org/.
+    fastcgi_param HTTP_PROXY "";
+    fastcgi_param SCRIPT_FILENAME /var/www/html/$fastcgi_script_name;
+    fastcgi_param PATH_INFO $fastcgi_path_info;
+    fastcgi_param QUERY_STRING $query_string;
+    fastcgi_intercept_errors on;
+
+    fastcgi_pass upstream-name;
+  }
+
+  location /redis-fetch {
+    internal;
+
+    resolver 8.8.8.8 valid=300s;
+    resolver_timeout 10s;
+
+    content_by_lua_block {
+      local key = assert(ngx.var.request_uri, "no key found")
+      local redis = require "resty.redis"
+      local red, err = redis:new()
+      if not red then
+        ngx.log(ngx.ERR, "Failed to create redis variable, error -> ", err)
+        ngx.exit(500)
+      end
+      assert(red:connect("redis-master.default.svc.cluster.local", 6379))
+      if not red then
+        ngx.log(ngx.ERR, "Failed to connect to redis, error -> ", err)
+        ngx.exit(500)
+      end
+      local res, err = red:auth("redispassword")
+      if not res then
+        ngx.say("failed to authenticate, ", err)
+        ngx.exit(500)
+      end
+      local data = assert(red:get(key))
+      assert(red:set_keepalive(10000, 100))
+      if res == ngx.null then
+        return ngx.exit(404)
+      end
+      ngx.print(data)
+    }
+  }
+
+  location /redis-store {
+    internal;
+
+    resolver 8.8.8.8 valid=300s;
+    resolver_timeout 10s;
+
+    content_by_lua_block {
+      local value = assert(ngx.req.get_body_data(), "no value found")
+      local key = assert(ngx.var.request_uri, "no key found")
+      local redis = require "resty.redis"
+      local red, err = redis:new()
+      if not red then
+        ngx.log(ngx.ERR, "Failed to create redis variable, error -> ", err)
+        ngx.exit(500)
+      end
+      assert(red:connect("redis-master.default.svc.cluster.local", 6379))
+      if not red then
+        ngx.log(ngx.ERR, "Failed to connect to redis, error -> ", err)
+        ngx.exit(500)
+      end
+      local res, err = red:auth("redispassword")
+      if not res then
+        ngx.say("failed to authenticate, ", err)
+        ngx.exit(500)
+      end
+      local data = assert(red:set(key, value))
+      assert(red:set_keepalive(10000, 100))
+      if res == ngx.null then
+        return ngx.exit(404)
+      end
+    }
+  }
+```
+
+
+Here is a working example by using the HTTPRedis (fetch) and Redis2 (store) modules:
+
+```nginx
+
+ location /api {
+     default_type text/css;
+
+     set $key $uri;
+     set_escape_uri $escaped_key $key;
+
+     srcache_fetch GET /redis $key;
+     srcache_store PUT /redis2 key=$escaped_key&exptime=120;
+
+     # fastcgi_pass/proxy_pass/drizzle_pass/postgres_pass/echo/etc
+ }
+
+ location = /redis {
+     internal;
+
+     set_md5 $redis_key $args;
+     redis_pass 127.0.0.1:6379;
+ }
+
+ location = /redis2 {
+     internal;
+
+     set_unescape_uri $exptime $arg_exptime;
+     set_unescape_uri $key $arg_key;
+     set_md5 $key;
+
+     redis2_query set $key $echo_request_body;
+     redis2_query expire $key $exptime;
+     redis2_pass 127.0.0.1:6379;
+ }
+```
+
+This example makes use of the [$echo_request_body](https://github.com/openresty/echo-nginx-module#echo_request_body) variable provided by [echo-nginx-module](https://github.com/openresty/echo-nginx-module). Note that you need the latest version of [echo-nginx-module](https://github.com/openresty/echo-nginx-module), `v0.38rc2` because earlier versions may not work reliably.
+
+Also, you need both [HttpRedisModule](http://wiki.nginx.org/HttpRedisModule) and [redis2-nginx-module](https://github.com/openresty/redis2-nginx-module). The former is used in the [srcache_fetch](#srcache_fetch) subrequest and the latter is used in the [srcache_store](#srcache_store) subrequest.
+
+The Nginx core also has a bug that could prevent [redis2-nginx-module](https://github.com/openresty/redis2-nginx-module)'s pipelining support from working properly in certain extreme conditions. And the following patch fixes this:
+
+   http://mailman.nginx.org/pipermail/nginx-devel/2012-March/002040.html
+
+Note that, however, if you are using the [OpenResty](http://openresty.org/) 1.0.15.3 bundle or later, then you already have everything that you need here in the bundle.
+
+[Back to TOC](#table-of-contents)
+
+Cache Key Preprocessing
+-----------------------
+
+It is often desired to preprocess the cache key to exclude random noises that may hurt the cache hit rate. For example, random session IDs in the URI arguments are usually desired to get removed.
+
+Consider the following URI querystring
+
+    SID=BC3781C3-2E02-4A11-89CF-34E5CFE8B0EF&UID=44332&L=EN&M=1&H=1&UNC=0&SRC=LK&RT=62
+
+we want to remove the `SID` and `UID` arguments from it. It is easy to achieve if you use [lua-nginx-module](https://github.com/openresty/lua-nginx-module) at the same time:
+
+```nginx
+
+ location = /t {
+     rewrite_by_lua '
+         local args = ngx.req.get_uri_args()
+         args.SID = nil
+         args.UID = nil
+         ngx.req.set_uri_args(args)
+     ';
+
+     echo $args;
+ }
+```
+
+Here we use the [echo](https://github.com/openresty/echo-nginx-module#echo) directive from [echo-nginx-module](https://github.com/openresty/echo-nginx-module) to dump out
+the final value of [$args](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_args) in the end. You can replace it with your
+[srcache-nginx-module](https://github.com/openresty/srcache-nginx-module) configurations and upstream configurations instead for
+your case. Let's test this /t interface with curl:
+
+    $ curl 'localhost:8081/t?RT=62&SID=BC3781C3-2E02-4A11-89CF-34E5CFE8B0EF&UID=44332&L=EN&M=1&H=1&UNC=0&SRC=LK'
+    M=1&UNC=0&RT=62&H=1&L=EN&SRC=LK
+
+It is worth mentioning that, if you want to retain the order of the URI
+arguments, then you can do string substitutions on the value of [$args](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_args)
+directly, for example,
+
+    location = /t {
+        rewrite_by_lua '
+            local args = ngx.var.args
+            newargs, n, err = ngx.re.gsub(args, [[\b[SU]ID=[^&]*&?]], "", "jo")
+            if n and n > 0 then
+                ngx.var.args = newargs
+            end
+        ';
+
+        echo $args;
+    }
+
+Now test it with the original curl command again, we get exactly what
+we would expect:
+
+    RT=62&L=EN&M=1&H=1&UNC=0&SRC=LK
+
+But for caching purposes, it's good to normalize the URI argument
+order so that you can increase the cache hit rate. And the hash table
+entry order used by LuaJIT or Lua can be used to normalize the order
+as a nice side effect.
+
+[Back to TOC](#table-of-contents)
+
+Directives
+==========
+
+[Back to TOC](#table-of-contents)
+
+srcache_fetch
+-------------
+**syntax:** *srcache_fetch &lt;method&gt; &lt;uri&gt; &lt;args&gt;?*
+
+**default:** *no*
+
+**context:** *http, server, location, location if*
+
+**phase:** *post-access*
+
+This directive registers an access phase handler that will issue an Nginx subrequest to lookup the cache.
+
+When the subrequest returns status code other than `200`, than a cache miss is signaled and the control flow will continue to the later phases including the content phase configured by [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html), and others. If the subrequest returns `200 OK`, then a cache hit is signaled and this module will send the subrequest's response as the current main request's response to the client directly.
+
+This directive will always run at the end of the access phase, such that [ngx_http_access_module](http://nginx.org/en/docs/http/ngx_http_access_module.html)'s [allow](http://nginx.org/en/docs/http/ngx_http_access_module.html#allow) and [deny](http://nginx.org/en/docs/http/ngx_http_access_module.html#deny) will always run *before* this.
+
+You can use the [srcache_fetch_skip](#srcache_fetch_skip) directive to disable cache look-up selectively.
+
+[Back to TOC](#table-of-contents)
+
+srcache_fetch_skip
+------------------
+**syntax:** *srcache_fetch_skip &lt;flag&gt;*
+
+**default:** *srcache_fetch_skip 0*
+
+**context:** *http, server, location, location if*
+
+**phase:** *post-access*
+
+The `<flag>` argument supports nginx variables. When this argument's value is not empty *and* not equal to `0`, then the fetching process will be unconditionally skipped.
+
+For example, to skip caching requests which have a cookie named `foo` with the value `bar`, we can write
+
+```nginx
+
+ location / {
+     set $key ...;
+     set_by_lua $skip '
+         if ngx.var.cookie_foo == "bar" then
+             return 1
+         end
+         return 0
+     ';
+
+     srcache_fetch_skip $skip;
+     srcache_store_skip $skip;
+
+     srcache_fetch GET /memc $key;
+     srcache_store GET /memc $key;
+
+     # proxy_pass/fastcgi_pass/content_by_lua/...
+ }
+```
+where [lua-nginx-module](https://github.com/openresty/lua-nginx-module) is used to calculate the value of the `$skip` variable at the (earlier) rewrite phase. Similarly, the `$key` variable can be computed by Lua using the [set_by_lua](https://github.com/openresty/lua-nginx-module#set_by_lua) or [rewrite_by_lua](https://github.com/openresty/lua-nginx-module#rewrite_by_lua) directive too.
+
+The standard [map](http://nginx.org/en/docs/http/ngx_http_map_module.html#map) directive can also be used to compute the value of the `$skip` variable used in the sample above:
+
+```nginx
+
+ map $cookie_foo $skip {
+     default     0;
+     bar         1;
+ }
+```
+
+but your [map](http://nginx.org/en/docs/http/ngx_http_map_module.html#map) statement should be put into the `http` config block in your `nginx.conf` file though.
+
+[Back to TOC](#table-of-contents)
+
+srcache_store
+-------------
+**syntax:** *srcache_store &lt;method&gt; &lt;uri&gt; &lt;args&gt;?*
+
+**default:** *no*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-filter*
+
+This directive registers an output filter handler that will issue an Nginx subrequest to save the response of the current main request into a cache backend. The status code of the subrequest will be ignored.
+
+You can use the [srcache_store_skip](#srcache_store_skip) and [srcache_store_max_size](#srcache_store_max_size) directives to disable caching for certain requests in case of a cache miss.
+
+Since the `v0.12rc7` release, both the response status line, response headers, and response bodies will be put into the cache. By default, the following special response headers will not be cached:
+
+* Connection
+* Keep-Alive
+* Proxy-Authenticate
+* Proxy-Authorization
+* TE
+* Trailers
+* Transfer-Encoding
+* Upgrade
+* Set-Cookie
+
+You can use the [srcache_store_pass_header](#srcache_store_pass_header) and/or [srcache_store_hide_header](#srcache_store_hide_header) directives to control what headers to cache and what not.
+
+The original response's data chunks get emitted as soon as
+they arrive. `srcache_store` just copies and collects the data in an output filter without postponing them from being sent downstream.
+
+But please note that even though all the response data will be sent immediately, the current Nginx request lifetime will not finish until the srcache_store subrequest completes. That means a delay in closing the TCP connection on the server side (when HTTP keepalive is disabled, but proper HTTP clients should close the connection actively on the client side, which adds no extra delay or other issues at all) or serving the next request sent on the same TCP connection (when HTTP keepalive is in action).
+
+[Back to TOC](#table-of-contents)
+
+srcache_store_max_size
+----------------------
+**syntax:** *srcache_store_max_size &lt;size&gt;*
+
+**default:** *srcache_store_max_size 0*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+When the response body length is exceeding this size, this module will not try to store the response body into the cache using the subrequest template that is specified in [srcache_store](#srcache_store).
+
+This is particular useful when using a cache storage backend that does have a hard upper limit on the input data. For example, the Memcached server has a default limit of `1 MB` by item.
+
+When `0` is specified (the default value), there's no limit check at all.
+
+[Back to TOC](#table-of-contents)
+
+srcache_store_skip
+------------------
+**syntax:** *srcache_store_skip &lt;flag&gt;*
+
+**default:** *srcache_store_skip 0*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+The `<flag>` argument supports Nginx variables. When this argument's value is not empty *and* not equal to `0`, then the storing process will be unconditionally skipped.
+
+Starting from the `v0.25` release, the `<flag>` expression (possibly containing Nginx variables) can be evaluated up to twice: the first time is right after the response header is being sent and when the `<flag>` expression is not evaluated to true values it will be evaluated again right after the end of the response body data stream is seen. Before `v0.25`, only the first time evaluation is performed.
+
+Here's an example using Lua to set $nocache to avoid storing URIs that contain the string "/tmp":
+
+```nginx
+
+ set_by_lua $nocache '
+     if string.match(ngx.var.uri, "/tmp") then
+         return 1
+     end
+     return 0';
+
+ srcache_store_skip $nocache;
+```
+
+[Back to TOC](#table-of-contents)
+
+srcache_store_statuses
+----------------------
+**syntax:** *srcache_store_statuses &lt;status1&gt; &lt;status2&gt; ..*
+
+**default:** *srcache_store_statuses 200 301 302 307 308*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+This directive controls what responses to store to the cache according to their status code.
+
+By default, only `200`, `301`, `302`, `307` and `308` responses will be stored to cache and any other responses will skip [srcache_store](#srcache_store).
+
+You can specify arbitrary positive numbers for the response status code that you'd like to cache, even including error code like `404` and `503`. For example:
+
+```nginx
+
+ srcache_store_statuses 200 201 301 302 307 308 404 503;
+```
+
+At least one argument should be given to this directive.
+
+This directive was first introduced in the `v0.13rc2` release.
+
+[Back to TOC](#table-of-contents)
+
+srcache_store_ranges
+--------------------
+**syntax:** *srcache_store_ranges on|off*
+
+**default:** *srcache_store_ranges off*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-body-filter*
+
+When this directive is turned on (default to `off`), [srcache_store](#srcache_store) will also store 206 Partial Content responses generated by the standard `ngx_http_range_filter_module`. If you turn this directive on, you MUST add `$http_range` to your cache keys. For example,
+
+```nginx
+
+ location / {
+     set $key "$uri$args$http_range";
+     srcache_fetch GET /memc $key;
+     srcache_store PUT /memc $key;
+ }
+```
+
+This directive was first introduced in the `v0.27` release.
+
+[Back to TOC](#table-of-contents)
+
+srcache_header_buffer_size
+--------------------------
+**syntax:** *srcache_header_buffer_size &lt;size&gt;*
+
+**default:** *srcache_header_buffer_size 4k/8k*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+This directive controles the header buffer when serializing response headers for [srcache_store](#srcache_store). The default size is the page size, usually `4k` or `8k` depending on specific platforms.
+
+Note that the buffer is not used to hold all the response headers, but just each individual header. So the buffer is merely needed to be big enough to hold the longest response header.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+srcache_store_hide_header
+-------------------------
+**syntax:** *srcache_store_hide_header &lt;header&gt;*
+
+**default:** *no*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+By default, this module caches all the response headers except the following ones:
+
+* Connection
+* Keep-Alive
+* Proxy-Authenticate
+* Proxy-Authorization
+* TE
+* Trailers
+* Transfer-Encoding
+* Upgrade
+* Set-Cookie
+
+You can hide even more response headers from [srcache_store](#srcache_store) by listing their names (case-insensitive) by means of this directive. For examples,
+
+```nginx
+
+ srcache_store_hide_header X-Foo;
+ srcache_store_hide_header Last-Modified;
+```
+
+Multiple occurrences of this directive are allowed in a single location.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+See also [srcache_store_pass_header](#srcache_store_pass_header).
+
+[Back to TOC](#table-of-contents)
+
+srcache_store_pass_header
+-------------------------
+**syntax:** *srcache_store_pass_header &lt;header&gt;*
+
+**default:** *no*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+By default, this module caches all the response headers except the following ones:
+
+* Connection
+* Keep-Alive
+* Proxy-Authenticate
+* Proxy-Authorization
+* TE
+* Trailers
+* Transfer-Encoding
+* Upgrade
+* Set-Cookie
+
+You can force [srcache_store](#srcache_store) to store one or more of these response headers from [srcache_store](#srcache_store) by listing their names (case-insensitive) by means of this directive. For examples,
+
+```nginx
+
+ srcache_store_pass_header Set-Cookie;
+ srcache_store_pass_header Proxy-Autenticate;
+```
+
+Multiple occurrences of this directive are allowed in a single location.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+See also [srcache_store_hide_header](#srcache_store_hide_header).
+
+[Back to TOC](#table-of-contents)
+
+srcache_methods
+---------------
+**syntax:** *srcache_methods &lt;method&gt;...*
+
+**default:** *srcache_methods GET HEAD*
+
+**context:** *http, server, location*
+
+**phase:** *post-access, output-header-filter*
+
+This directive specifies HTTP request methods that are considered by either [srcache_fetch](#srcache_fetch) or [srcache_store](#srcache_store). HTTP request methods not listed will be skipped completely from the cache.
+
+The following HTTP methods are allowed: `GET`, `HEAD`, `POST`, `PUT`, and `DELETE`. The `GET` and `HEAD` methods are always implicitly included in the list regardless of their presence in this directive.
+
+Note that since the `v0.17` release `HEAD` requests are always skipped by [srcache_store](#srcache_store) because their responses never carry a response body.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+srcache_ignore_content_encoding
+-------------------------------
+**syntax:** *srcache_ignore_content_encoding on|off*
+
+**default:** *srcache_ignore_content_encoding off*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+When this directive is turned `off` (which is the default), non-empty `Content-Encoding` response header will cause [srcache_store](#srcache_store) skip storing the whole response into the cache and issue a warning into nginx's `error.log` file like this:
+
+
+    [warn] 12500#0: *1 srcache_store skipped due to response header "Content-Encoding: gzip"
+                (maybe you forgot to disable compression on the backend?)
+
+
+Turning on this directive will ignore the `Content-Encoding` response header and store the response as usual (and also without warning).
+
+It's recommended to always disable gzip/deflate compression on your backend server by specifying the following line in your `nginx.conf` file:
+
+```nginx
+
+ proxy_set_header  Accept-Encoding  "";
+```
+
+This directive was first introduced in the `v0.12rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+srcache_request_cache_control
+-----------------------------
+**syntax:** *srcache_request_cache_control on|off*
+
+**default:** *srcache_request_cache_control off*
+
+**context:** *http, server, location*
+
+**phase:** *post-access, output-header-filter*
+
+When this directive is turned `on`, the request headers `Cache-Control` and `Pragma` will be honored by this module in the following ways:
+
+1. [srcache_fetch](#srcache_fetch), i.e., the cache lookup operation, will be skipped when request headers `Cache-Control: no-cache` and/or `Pragma: no-cache` are present.
+1. [srcache_store](#srcache_store), i.e., the cache store operation, will be skipped when the request header `Cache-Control: no-store` is specified.
+
+Turning off this directive will disable this functionality and is considered safer for busy sites mainly relying on cache for speed.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+See also [srcache_response_cache_control](#srcache_response_cache_control).
+
+[Back to TOC](#table-of-contents)
+
+srcache_response_cache_control
+------------------------------
+**syntax:** *srcache_response_cache_control on|off*
+
+**default:** *srcache_response_cache_control on*
+
+**context:** *http, server, location*
+
+**phase:** *output-header-filter*
+
+When this directive is turned `on`, the response headers `Cache-Control` and `Expires` will be honored by this module in the following ways:
+
+* `Cache-Control: private` skips [srcache_store](#srcache_store),
+* `Cache-Control: no-store` skips [srcache_store](#srcache_store),
+* `Cache-Control: no-cache` skips [srcache_store](#srcache_store),
+* `Cache-Control: max-age=0` skips [srcache_store](#srcache_store),
+* and `Expires: <date-no-more-recently-than-now>` skips [srcache_store](#srcache_store).
+
+This directive takes priority over the [srcache_store_no_store](#srcache_store_no_store), [srcache_store_no_cache](#srcache_store_no_cache), and [srcache_store_private](#srcache_store_private) directives.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+See also [srcache_request_cache_control](#srcache_request_cache_control).
+
+[Back to TOC](#table-of-contents)
+
+srcache_store_no_store
+----------------------
+**syntax:** *srcache_store_no_store on|off*
+
+**default:** *srcache_store_no_store off*
+
+**context:** *http, server, location*
+
+**phase:** *output-header-filter*
+
+Turning this directive on will force responses with the header `Cache-Control: no-store` to be stored into the cache when [srcache_response_cache_control](#srcache_response_cache_control) is turned `on` *and* other conditions are met. Default to `off`.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+srcache_store_no_cache
+----------------------
+**syntax:** *srcache_store_no_cache on|off*
+
+**default:** *srcache_store_no_cache off*
+
+**context:** *http, server, location*
+
+**phase:** *output-header-filter*
+
+Turning this directive on will force responses with the header `Cache-Control: no-cache` to be stored into the cache when [srcache_response_cache_control](#srcache_response_cache_control) is turned `on` *and* other conditions are met. Default to `off`.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+srcache_store_private
+---------------------
+**syntax:** *srcache_store_private on|off*
+
+**default:** *srcache_store_private off*
+
+**context:** *http, server, location*
+
+**phase:** *output-header-filter*
+
+Turning this directive on will force responses with the header `Cache-Control: private` to be stored into the cache when [srcache_response_cache_control](#srcache_response_cache_control) is turned `on` *and* other conditions are met. Default to `off`.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+srcache_default_expire
+----------------------
+**syntax:** *srcache_default_expire &lt;time&gt;*
+
+**default:** *srcache_default_expire 60s*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+This directive controls the default expiration time period that is allowed for the [$srcache_expire](#srcache_expire) variable value when neither `Cache-Control: max-age=N` nor `Expires` are specified in the response headers.
+
+The `<time>` argument values are in seconds by default. But it's wise to always explicitly specify the time unit to avoid confusion. Time units supported are "s"(seconds), "ms"(milliseconds), "y"(years), "M"(months), "w"(weeks), "d"(days), "h"(hours), and "m"(minutes). For example,
+
+```nginx
+
+ srcache_default_expire 30m; # 30 minutes
+```
+
+This time must be less than 597 hours.
+
+The semantics of a zero expiration time depends on the actual cache backend storage you are currently using, which is agnostic to this
+module. In the case of memcached, for example, zero expiration times mean that the item will never expire.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+srcache_max_expire
+------------------
+**syntax:** *srcache_max_expire &lt;time&gt;*
+
+**default:** *srcache_max_expire 0*
+
+**context:** *http, server, location, location if*
+
+**phase:** *output-header-filter*
+
+This directive controls the maximal expiration time period that is allowed for the [$srcache_expire](#srcache_expire) variable value. This setting takes priority over other calculating methods.
+
+The `<time>` argument values are in seconds by default. But it's wise to always explicitly specify the time unit to avoid confusion. Time units supported are "s"(seconds), "ms"(milliseconds), "y"(years), "M"(months), "w"(weeks), "d"(days), "h"(hours), and "m"(minutes). For example,
+
+```nginx
+
+ srcache_max_expire 2h;  # 2 hours
+```
+
+This time must be less than 597 hours.
+
+When `0` is specified, which is the default setting, then there will be *no* limit at all.
+
+This directive was first introduced in the `v0.12rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+Variables
+=========
+[Back to TOC](#table-of-contents)
+
+$srcache_expire
+---------------
+**type:** *integer*
+
+**cacheable:** *no*
+
+**writable:** *no*
+
+This Nginx variable gives the recommended expiration time period (in seconds) for the current response being stored into the cache. The algorithm of computing the value is as follows:
+
+1. When the response header `Cache-Control: max-age=N` is specified, then `N` will be used as the expiration time,
+1. otherwise if the response header `Expires` is specified, then the expiration time will be obtained by subtracting the current time stamp from the time specified in the `Expires` header,
+1. when neither `Cache-Control: max-age=N` nor `Expires` headers are specified, use the value specified in the [srcache_default_expire](#srcache_default_expire) directive.
+
+The final value of this variable will be the value specified by the [srcache_max_expire](#srcache_max_expire) directive if the value obtained in the algorithm above exceeds the maximal value (if any).
+
+You don't have to use this variable for the expiration time.
+
+This variable was first introduced in the `v0.12rc7` release.
+
+[Back to TOC](#table-of-contents)
+
+$srcache_fetch_status
+---------------------
+**type:** *string*
+
+**cacheable:** *no*
+
+**writable:** *no*
+
+This Nginx variable is evaluated to the status of the "fetch" phase for the caching system. Three values are possible, `HIT`, `MISS`, and `BYPASS`.
+
+When the "fetch" subrequest returns status code other than `200` or its response data is not well-formed, then this variable is evaluated to the value `MISS`.
+
+The value of this variable is only meaningful after the `access` request processing phase, or `BYPASS` is always given.
+
+This variable was first introduced in the `v0.14` release.
+
+[Back to TOC](#table-of-contents)
+
+$srcache_store_status
+---------------------
+**type:** *string*
+
+**cacheable:** *no*
+
+**writable:** *no*
+
+This Nginx variable gives the current caching status for the "store" phase. Two possible values, `STORE` and `BYPASS` can be obtained.
+
+Because the responses for the "store" subrequest are always discarded, so the value of this variable will always be `STORE` as long as the "store" subrequest is actually issued.
+
+The value of this variable is only meaningful at least when the request headers of the current (main) request are being sent. The final result can only be obtained after all the response body has been sent if the `Content-Length` response header is not specified for the main request.
+
+This variable was first introduced in the `v0.14` release.
+
+[Back to TOC](#table-of-contents)
+
+Known Issues
+============
+* On certain systems, enabling aio and/or sendfile may stop [srcache_store](#srcache_store) from working. You can disable them in the locations configured by [srcache_store](#srcache_store).
+* The [srcache_store](#srcache_store) directive can not be used to capture the responses generated by [echo-nginx-module](https://github.com/openresty/echo-nginx-module)'s subrequest directivees like [echo_subrequest_async](https://github.com/openresty/echo-nginx-module#echo_subrequest_async) and [echo_location](https://github.com/openresty/echo-nginx-module#echo_location). You are recommended to use HttpLuaModule to initiate and capture subrequests, which should work with [srcache_store](#srcache_store).
+
+[Back to TOC](#table-of-contents)
+
+Caveats
+=======
+* It is recommended to disable your backend server's gzip compression and use nginx's [ngx_http_gzip_module](http://nginx.org/en/docs/http/ngx_http_gzip_module.html) to do the job. In case of [ngx_http_proxy_module](http://nginx.org/en/docs/http/ngx_http_proxy_module.html), you can use the following configure setting to disable backend gzip compression:
+```nginx
+
+ proxy_set_header  Accept-Encoding  "";
+```
+* Do *not* use [ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html)'s [if](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#if) directive in the same location as this module's, because "[if](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html#if) is evil". Instead, use [ngx_http_map_module](http://nginx.org/en/docs/http/ngx_http_map_module.html) or [lua-nginx-module](https://github.com/openresty/lua-nginx-module) combined with this module's [srcache_store_skip](#srcache_store_skip) and/or [srcache_fetch_skip](#srcache_fetch_skip) directives. For example:
+```nginx
+
+ map $request_method $skip_fetch {
+     default     0;
+     POST        1;
+     PUT         1;
+ }
+
+ server {
+     listen 8080;
+
+     location /api/ {
+         set $key "$uri?$args";
+
+         srcache_fetch GET /memc $key;
+         srcache_store PUT /memc $key;
+
+         srcache_methods GET PUT POST;
+         srcache_fetch_skip $skip_fetch;
+
+         # proxy_pass/drizzle_pass/content_by_lua/echo/...
+     }
+ }
+```
+
+[Back to TOC](#table-of-contents)
+
+Trouble Shooting
+================
+
+To debug issues, you should always check your Nginx `error.log` file first. If no error messages are printed, you need to enable the Nginx debugging logs to get more details, as explained in [debugging log](http://nginx.org/en/docs/debugging_log.html).
+
+Several common pitfalls for beginners:
+
+* The original response carries a `Cache-Control` header that explicitly disables caching and you do not configure directives like [srcache_response_cache_control](#srcache_response_cache_control).
+* The original response is already gzip compressed, which is not cached by default (see [srcache_ignore_content_encoding](#srcache_ignore_content_encoding)).
+* Memcached might return `CLIENT_ERROR bad command line format` when using a too long key (250 chars as of version 1.4.25). It is thus safer to use `set_md5 $key $uri$args;` instead of `set $key $uri$args;`. The `set_md5` directive (and more) is available from [OpenResty's set-misc module](https://github.com/openresty/set-misc-nginx-module).
+* Nginx might return `client intended to send too large body` when trying to store objects larger than 1m to the storage backend, in which case nginx `client_max_body_size` must be set to a higher value.
+* Memcached might fail to store objects larger than 1m, causing errors like `srcache_store subrequest failed status=502`. Since version 1.4.2, memcached supports a command-line `-I` option to override the default size of each slab page. Please read its manpage for more information.
+
+[Back to TOC](#table-of-contents)
+
+Installation
+============
+
+It is recommended to install this module as well as the Nginx core and many other goodies via the [OpenResty bundle](http://openresty.org). It is the easiest way and most safe way to set things up. See OpenResty's [installation instructions](http://openresty.org/#Installation) for details.
+
+Alternatively, you can build Nginx with this module all by yourself:
+
+* Grab the nginx source code from [nginx.org](http://nginx.org), for example, the version 1.9.15 (see [Nginx Compatibility](#compatibility)),
+* and then apply the patch to your nginx source tree that fixes an important bug in the mainline Nginx core: <https://raw.github.com/openresty/openresty/master/patches/nginx-1.4.3-upstream_truncation.patch> (you do NOT need this patch if you are using nginx 1.5.3 and later versions.)
+* after that, download the latest version of the release tarball of this module from srcache-nginx-module [file list](https://github.com/openresty/srcache-nginx-module/tags),
+* and finally build the Nginx source with this module
+
+```bash
+ wget 'http://nginx.org/download/nginx-1.9.15.tar.gz'
+ tar -xzvf nginx-1.9.15.tar.gz
+ cd nginx-1.9.15/
+
+ # Here we assume you would install you nginx under /opt/nginx/.
+ ./configure --prefix=/opt/nginx \
+      --add-module=/path/to/srcache-nginx-module
+
+ make -j2
+ make install
+```
+
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ngx_http_srcache_filter_module.so;
+```
+
+[Back to TOC](#table-of-contents)
+
+Compatibility
+=============
+
+The following versions of Nginx should work with this module:
+
+* 1.9.x (last tested: 1.9.15)
+* 1.8.x
+* 1.7.x (last tested: 1.7.10)
+* 1.5.x (last tested: 1.5.12)
+* 1.4.x (last tested: 1.4.4)
+* 1.3.x (last tested: 1.3.7)
+* 1.2.x (last tested: 1.2.9)
+* 1.1.x (last tested: 1.1.5)
+* 1.0.x (last tested: 1.0.11)
+* 0.9.x (last tested: 0.9.4)
+* 0.8.x >= 0.8.54 (last tested: 0.8.54)
+
+Earlier versions of Nginx like 0.7.x, 0.6.x and 0.5.x will *not* work.
+
+If you find that any particular version of Nginx above 0.7.44 does not work with this module, please consider reporting a bug.
+
+[Back to TOC](#table-of-contents)
+
+Community
+=========
+
+[Back to TOC](#table-of-contents)
+
+English Mailing List
+--------------------
+
+The [openresty-en](https://groups.google.com/group/openresty-en) mailing list is for English speakers.
+
+[Back to TOC](#table-of-contents)
+
+Chinese Mailing List
+--------------------
+
+The [openresty](https://groups.google.com/group/openresty) mailing list is for Chinese speakers.
+
+[Back to TOC](#table-of-contents)
+
+Bugs and Patches
+================
+
+Please submit bug reports, wishlists, or patches by
+
+1. creating a ticket on the [GitHub Issue Tracker](https://github.com/openresty/srcache-nginx-module/issues),
+1. or posting to the [OpenResty community](#community).
+
+[Back to TOC](#table-of-contents)
+
+Source Repository
+=================
+Available on github at [openresty/srcache-nginx-module](https://github.com/openresty/srcache-nginx-module).
+
+[Back to TOC](#table-of-contents)
+
+Test Suite
+==========
+This module comes with a Perl-driven test suite. The [test cases](https://github.com/openresty/srcache-nginx-module/tree/master/test/t) are [declarative](https://github.com/openresty/srcache-nginx-module/blob/master/test/t/main-req.t) too. Thanks to the [Test::Nginx](http://search.cpan.org/perldoc?Test::Base) module in the Perl world.
+
+To run it on your side:
+```bash
+
+ $ PATH=/path/to/your/nginx-with-srcache-module:$PATH prove -r t
+```
+You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
+
+Because a single nginx server (by default, `localhost:1984`) is used across all the test scripts (`.t` files), it's meaningless to run the test suite in parallel by specifying `-jN` when invoking the `prove` utility.
+
+Some parts of the test suite requires modules [ngx_http_rewrite_module](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html), [echo-nginx-module](https://github.com/openresty/echo-nginx-module), [rds-json-nginx-module](https://github.com/openresty/rds-json-nginx-module), and [drizzle-nginx-module](https://github.com/openresty/drizzle-nginx-module) to be enabled as well when building Nginx.
+
+[Back to TOC](#table-of-contents)
+
+TODO
+====
+* add gzip compression and decompression support.
+* add new nginx variable `$srcache_key` and new directives `srcache_key_ignore_args`, `srcache_key_filter_args`, and `srcache_key_sort_args`.
+
+[Back to TOC](#table-of-contents)
+
+Getting involved
+================
+You'll be very welcomed to submit patches to the author or just ask for a commit bit to the source repository on GitHub.
+
+[Back to TOC](#table-of-contents)
+
+Author
+======
+Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+
+[Back to TOC](#table-of-contents)
+
+Copyright & License
+===================
+
+Copyright (c) 2010-2016, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+
+This module is licensed under the terms of the BSD license.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[Back to TOC](#table-of-contents)
+
+See Also
+========
+* [memc-nginx-module](https://github.com/openresty/memc-nginx-module)
+* [lua-nginx-module](https://github.com/openresty/lua-nginx-module)
+* [set-misc-nginx-module](https://github.com/openresty/set-misc-nginx-module)
+* The [openresty bundle](http://openresty.org)
+
+[Back to TOC](#table-of-contents)
+
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/config b/modules_deb/libnginx-mod-http-srcache-filter-0.33/config
new file mode 100644
index 0000000..11d21b5
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/config
@@ -0,0 +1,50 @@
+ngx_addon_name=ngx_http_srcache_filter_module
+
+HTTP_SRCACHE_FILTER_SRCS="                                                  \
+                        $ngx_addon_dir/src/ngx_http_srcache_filter_module.c \
+                        $ngx_addon_dir/src/ngx_http_srcache_util.c          \
+                        $ngx_addon_dir/src/ngx_http_srcache_var.c           \
+                        $ngx_addon_dir/src/ngx_http_srcache_store.c         \
+                        $ngx_addon_dir/src/ngx_http_srcache_fetch.c         \
+                        $ngx_addon_dir/src/ngx_http_srcache_headers.c       \
+                        "
+
+HTTP_SRCACHE_FILTER_DEPS="                                                  \
+                        $ngx_addon_dir/src/ddebug.h                         \
+                        $ngx_addon_dir/src/ngx_http_srcache_filter_module.h \
+                        $ngx_addon_dir/src/ngx_http_srcache_util.h          \
+                        $ngx_addon_dir/src/ngx_http_srcache_var.h           \
+                        $ngx_addon_dir/src/ngx_http_srcache_fetch.h         \
+                        $ngx_addon_dir/src/ngx_http_srcache_store.h         \
+                        $ngx_addon_dir/src/ngx_http_srcache_headers.h       \
+                        "
+
+# nginx 1.17.0+ unconditionally enables the postpone filter
+if [ ! -z "$HTTP_POSTPONE" ]; then
+    # nginx won't have HTTP_POSTPONE_FILTER_MODULE & HTTP_POSTPONE_FILTER_SRCS
+    # defined since 1.9.11
+    if [ -z "$HTTP_POSTPONE_FILTER_MODULE" ]; then
+        HTTP_POSTPONE_FILTER_MODULE=ngx_http_postpone_filter_module
+        HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
+    fi
+
+    # This module depends upon the postpone filter being activated
+    if [ "$HTTP_POSTPONE" != YES ]; then
+        HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
+        HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
+        HTTP_POSTPONE=YES
+    fi
+fi
+
+if [ -n "$ngx_module_link" ]; then
+    ngx_module_type=HTTP_AUX_FILTER
+    ngx_module_name=$ngx_addon_name
+    ngx_module_srcs="$HTTP_SRCACHE_FILTER_SRCS"
+    ngx_module_deps="$HTTP_SRCACHE_FILTER_DEPS"
+
+    . auto/module
+else
+    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $HTTP_SRCACHE_FILTER_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $HTTP_SRCACHE_FILTER_DEPS"
+fi
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/changelog b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/changelog
new file mode 100644
index 0000000..02239af
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/changelog
@@ -0,0 +1,60 @@
+libnginx-mod-http-srcache-filter (0.33-4) unstable; urgency=medium
+
+  * Team upload.
+  * d/copyright: update my email to janmojzis@debian.org
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/copyright: bump debian/* copyright year
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Sat, 12 Apr 2025 09:05:51 +0200
+
+libnginx-mod-http-srcache-filter (0.33-3) unstable; urgency=medium
+
+  * Team upload.
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 17:50:21 +0200
+
+libnginx-mod-http-srcache-filter (0.33-2) unstable; urgency=medium
+
+  * Team upload.
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 28 Jun 2023 00:02:16 +0200
+
+libnginx-mod-http-srcache-filter (0.33-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version 0.33
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 24 Feb 2023 18:22:50 +0100
+
+libnginx-mod-http-srcache-filter (0.32.7.gbe22ac0-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/gbb.conf: switched to debian branch main (debian-branch = main)
+  * d/copyright: bump my copyright year
+  * d/copyright: reformat text to be compatible with 'cme update dpkg-copyright'
+  * d/fix.scanned.copyright: added, fixes upstream author name parsing
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:41 +0100
+
+libnginx-mod-http-srcache-filter (0.32.7.gbe22ac0-1) unstable; urgency=medium
+
+  [ Jan Mojžíš ]
+  * d/control: added Multi-Arch: foreign
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+
+  [ Jérémy Lal ]
+  * Upstream stopped tagging: update watch
+  * New upstream version 0.32.7.gbe22ac0
+
+ -- Jérémy Lal <kapouer@melix.org>  Tue, 27 Dec 2022 21:42:29 +0100
+
+libnginx-mod-http-srcache-filter (0.32-1) unstable; urgency=medium
+
+  * Initial release. (Closes: #1025288)
+
+ -- Jérémy Lal <kapouer@melix.org>  Fri, 02 Dec 2022 00:32:56 +0100
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/control b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/control
new file mode 100644
index 0000000..31e4daa
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/control
@@ -0,0 +1,24 @@
+Source: libnginx-mod-http-srcache-filter
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jérémy Lal <kapouer@melix.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+               libnginx-mod-http-ndk-dev,
+Standards-Version: 4.7.2
+Homepage: https://github.com/openresty/srcache-nginx-module
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-srcache-filter.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-srcache-filter
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-srcache-filter
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: Transparent caching layer for Nginx
+ This module provides a transparent caching layer for arbitrary nginx
+ locations. The caching behavior is mostly compatible with RFC 2616.
+ It allows full configuration through its nginx directives.
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/copyright b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/copyright
new file mode 100644
index 0000000..90ae398
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/copyright
@@ -0,0 +1,56 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: srcache-nginx-module
+Upstream-Contact: Yichun Zhang (agentzh) <yichun@openresty.com>
+Source: https://github.com/openresty/srcache-nginx-module
+
+Files: *
+Copyright: 2010-2016, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+License: BSD-2-clause
+
+Files: Changes
+  config
+Copyright: Copyright (c) 2010-2016, Yichun "agentzh" Zhang (章亦春) agentzh@gmail.com, CloudFlare Inc.
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-2-clause
+
+Files: src/*
+Copyright: Yichun Zhang (agentzh)
+License: BSD-2-clause
+
+Files: src/ddebug.h
+Copyright: Copyright (c) 2010-2016, Yichun "agentzh" Zhang (章亦春) agentzh@gmail.com, CloudFlare Inc.
+License: BSD-2-clause
+
+Files: t/*
+Copyright: Copyright (c) 2010-2016, Yichun "agentzh" Zhang (章亦春) agentzh@gmail.com, CloudFlare Inc.
+License: BSD-2-clause
+
+Files: util/*
+Copyright: Copyright (c) 2010-2016, Yichun "agentzh" Zhang (章亦春) agentzh@gmail.com, CloudFlare Inc.
+License: BSD-2-clause
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/fix.scanned.copyright b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/fix.scanned.copyright
new file mode 100644
index 0000000..b25e244
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/fix.scanned.copyright
@@ -0,0 +1,2 @@
+# fixes upstream author name parsing
+! copyright Files:~/.*/ Copyright=~"s/(Zhang)\s\(.*x\{6625\}\)/$1\ (章亦春)/"
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/gbp.conf b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/gbp.conf
new file mode 100644
index 0000000..38c12c1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/rules b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/source/format b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/control b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/control
new file mode 100644
index 0000000..ca20b9f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/control
@@ -0,0 +1,6 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/generic b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/upstream/metadata b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/upstream/metadata
new file mode 100644
index 0000000..1eb2a27
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/openresty/srcache-nginx-module/issues
+Bug-Submit: https://github.com/openresty/srcache-nginx-module/issues/new
+Repository-Browse: https://github.com/openresty/srcache-nginx-module
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/watch b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/watch
new file mode 100644
index 0000000..1ca8874
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/debian/watch
@@ -0,0 +1,9 @@
+version=4
+
+opts="\
+ mode=git,\
+ pgpmode=none,\
+ pretty=describe,\
+ uversionmangle=s/^v// \
+" https://github.com/openresty/srcache-nginx-module \
+HEAD
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ddebug.h b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ddebug.h
new file mode 100644
index 0000000..a2c6808
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ddebug.h
@@ -0,0 +1,124 @@
+#ifndef DDEBUG_H
+#define DDEBUG_H
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...) fprintf(stderr, "srcache *** %s: ", __func__); \
+            fprintf(stderr, __VA_ARGS__); \
+            fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
+
+#   else
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char * fmt, ...) {
+}
+
+#    endif
+
+#   if DDEBUG > 1
+
+#       define dd_enter() dd_enter_helper(r, __func__)
+
+
+#       if defined(nginx_version) && nginx_version >= 8011
+#           define dd_main_req_count r->main->count
+#       else
+#           define dd_main_req_count 0
+#       endif
+
+static ngx_inline void
+dd_enter_helper(ngx_http_request_t *r, const char *func) {
+    ngx_http_posted_request_t       *pr;
+
+    fprintf(stderr, ">enter %s %.*s %.*s?%.*s c:%d m:%p r:%p ar:%p pr:%p",
+            func,
+            (int) r->method_name.len, r->method_name.data,
+            (int) r->uri.len, r->uri.data,
+            (int) r->args.len, r->args.data,
+            (int) dd_main_req_count, r->main,
+            r, r->connection->data, r->parent);
+
+    if (r->posted_requests) {
+        fprintf(stderr, " posted:");
+
+        for (pr = r->posted_requests; pr; pr = pr->next) {
+            fprintf(stderr, "%p,", pr);
+        }
+    }
+
+    fprintf(stderr, "\n");
+}
+
+#   else
+
+#       define dd_enter()
+
+#   endif
+
+#else
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...)
+
+#       define dd_enter()
+
+#   else
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char * fmt, ...) {
+}
+
+static ngx_inline void
+dd_enter() {
+}
+
+#   endif
+
+#endif
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#define dd_check_read_event_handler(r)   \
+    dd("r->read_event_handler = %s", \
+        r->read_event_handler == ngx_http_block_reading ? \
+            "ngx_http_block_reading" : \
+        r->read_event_handler == ngx_http_test_reading ? \
+            "ngx_http_test_reading" : \
+        r->read_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#define dd_check_write_event_handler(r)   \
+    dd("r->write_event_handler = %s", \
+        r->write_event_handler == ngx_http_handler ? \
+            "ngx_http_handler" : \
+        r->write_event_handler == ngx_http_core_run_phases ? \
+            "ngx_http_core_run_phases" : \
+        r->write_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#else
+
+#define dd_check_read_event_handler(r)
+#define dd_check_write_event_handler(r)
+
+#endif
+
+#endif /* DDEBUG_H */
+
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.c b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.c
new file mode 100644
index 0000000..9d3e649
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.c
@@ -0,0 +1,470 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_srcache_fetch.h"
+#include "ngx_http_srcache_store.h"
+#include "ngx_http_srcache_util.h"
+#include <nginx.h>
+
+
+static ngx_int_t ngx_http_srcache_fetch_subrequest(ngx_http_request_t *r,
+        ngx_http_srcache_loc_conf_t *conf, ngx_http_srcache_ctx_t *ctx);
+static void ngx_http_srcache_post_read_body(ngx_http_request_t *r);
+
+
+ngx_int_t
+ngx_http_srcache_access_handler(ngx_http_request_t *r)
+{
+    ngx_str_t                       skip;
+    ngx_int_t                       rc;
+    ngx_http_srcache_loc_conf_t    *conf;
+    ngx_http_srcache_main_conf_t   *smcf;
+    ngx_http_srcache_ctx_t         *ctx;
+    ngx_chain_t                    *cl;
+    size_t                          len;
+    unsigned                        no_store;
+
+    /* access phase handlers are skipped in subrequests,
+     * so the current request must be a main request */
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_srcache_filter_module);
+
+    if (conf->fetch == NULL && conf->store == NULL) {
+        dd("bypass: %.*s", (int) r->uri.len, r->uri.data);
+        return NGX_DECLINED;
+    }
+
+    dd("store defined? %p", conf->store);
+
+    dd("req method: %lu", (unsigned long) r->method);
+    dd("cache methods: %lu", (unsigned long) conf->cache_methods);
+
+    if (!(r->method & conf->cache_methods)) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_fetch and srcache_store skipped due to request "
+                       "method %V", &r->method_name);
+
+        return NGX_DECLINED;
+    }
+
+    if (conf->req_cache_control
+        && ngx_http_srcache_request_no_cache(r, &no_store) == NGX_OK)
+    {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_fetch skipped due to request headers "
+                       "\"Cache-Control: no-cache\" or \"Pragma: no-cache\"");
+
+        if (!no_store) {
+            /* register a ctx to give a chance to srcache_store to run */
+
+            ctx = ngx_pcalloc(r->pool,
+                              sizeof(ngx_http_srcache_filter_module));
+
+            if (ctx == NULL) {
+                return NGX_ERROR;
+            }
+
+            ngx_http_set_ctx(r, ctx, ngx_http_srcache_filter_module);
+
+        } else {
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "srcache_store skipped due to request header "
+                           "\"Cache-Control: no-store\"");
+        }
+
+        return NGX_DECLINED;
+    }
+
+    if (conf->fetch_skip != NULL
+        && ngx_http_complex_value(r, conf->fetch_skip, &skip) == NGX_OK
+        && skip.len
+        && (skip.len != 1 || skip.data[0] != '0'))
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_fetch skipped due to the true value fed into "
+                       "srcache_fetch_skip: \"%V\"", &skip);
+
+        /* register a ctx to give a chance to srcache_store to run */
+
+        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_srcache_filter_module));
+
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_http_set_ctx(r, ctx, ngx_http_srcache_filter_module);
+
+        return NGX_DECLINED;
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
+
+    if (ctx != NULL) {
+        /*
+        if (ctx->fetch_error) {
+            return NGX_DECLINED;
+        }
+        */
+
+        if (ctx->waiting_subrequest) {
+            dd("waiting subrequest");
+            return NGX_AGAIN;
+        }
+
+        if (ctx->waiting_request_body) {
+            return NGX_AGAIN;
+        }
+
+        if (ctx->request_body_done == 1) {
+            ctx->request_body_done = 0;
+            goto do_fetch_subrequest;
+        }
+
+        if (ctx->request_done) {
+            dd("request done");
+
+            if (ngx_http_post_request(r, NULL) != NGX_OK) {
+                return NGX_ERROR;
+            }
+
+            if (!ctx->from_cache) {
+                return NGX_DECLINED;
+            }
+
+            dd("sending header");
+
+            if (ctx->body_from_cache) {
+                len = 0;
+
+                for (cl = ctx->body_from_cache; cl->next; cl = cl->next) {
+                    len += ngx_buf_size(cl->buf);
+                }
+
+                len += ngx_buf_size(cl->buf);
+
+                cl->buf->last_buf = 1;
+
+                r->headers_out.content_length_n = len;
+
+                rc = ngx_http_send_header(r);
+
+                dd("srcache fetch header returned %d", (int) rc);
+
+                if (rc == NGX_ERROR || rc > NGX_OK) {
+                    return rc;
+                }
+
+#if 1
+                if (r->header_only) {
+                    return NGX_HTTP_OK;
+                }
+#endif
+
+                if (!r->filter_finalize) {
+                    rc = ngx_http_output_filter(r, ctx->body_from_cache);
+                    if (rc == NGX_ERROR || rc > NGX_OK) {
+                        return rc;
+                    }
+                }
+
+                dd("sent body from cache: %d", (int) rc);
+                dd("finalize from here...");
+
+                ngx_http_finalize_request(r, rc);
+
+                /* dd("r->main->count (post): %d", (int) r->main->count); */
+                return NGX_DONE;
+            }
+
+            return NGX_DECLINED;
+        }
+
+    } else {
+        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_srcache_filter_module));
+
+        if (ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_http_set_ctx(r, ctx, ngx_http_srcache_filter_module);
+    }
+
+    smcf = ngx_http_get_module_main_conf(r, ngx_http_srcache_filter_module);
+
+    if (!smcf->postponed_to_access_phase_end) {
+        ngx_http_core_main_conf_t       *cmcf;
+        ngx_http_phase_handler_t         tmp;
+        ngx_http_phase_handler_t        *ph;
+        ngx_http_phase_handler_t        *cur_ph;
+        ngx_http_phase_handler_t        *last_ph;
+
+        smcf->postponed_to_access_phase_end = 1;
+
+        cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+        ph = cmcf->phase_engine.handlers;
+        cur_ph = &ph[r->phase_handler];
+
+        /* we should skip the post_access phase handler here too */
+        last_ph = &ph[cur_ph->next - 2];
+
+        if (cur_ph < last_ph) {
+            dd("swaping the contents of cur_ph and last_ph...");
+
+            tmp = *cur_ph;
+
+            memmove(cur_ph, cur_ph + 1,
+                    (last_ph - cur_ph) * sizeof (ngx_http_phase_handler_t));
+
+            *last_ph = tmp;
+
+            r->phase_handler--; /* redo the current ph */
+
+            return NGX_DECLINED;
+        }
+    }
+
+    if (conf->fetch == NULL) {
+        dd("fetch is not defined");
+        return NGX_DECLINED;
+    }
+
+    dd("running phase handler...");
+
+    if (!r->request_body) {
+        dd("reading request body: ctx = %p", ctx);
+
+        rc = ngx_http_read_client_request_body(r,
+                                               ngx_http_srcache_post_read_body);
+        if (rc == NGX_ERROR || rc > NGX_OK) {
+#if (nginx_version < 1002006)                                                \
+    || (nginx_version >= 1003000 && nginx_version < 1003009)
+            r->main->count--;
+#endif
+            return rc;
+        }
+
+        if (rc == NGX_AGAIN) {
+            ctx->waiting_request_body = 1;
+            return NGX_AGAIN;
+        }
+
+        /* rc == NGX_OK */
+    }
+
+do_fetch_subrequest:
+
+    /* issue a subrequest to fetch cached stuff (if any) */
+
+    rc = ngx_http_srcache_fetch_subrequest(r, conf, ctx);
+
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ctx->waiting_subrequest = 1;
+
+    dd("quit");
+
+    return NGX_AGAIN;
+}
+
+
+ngx_int_t
+ngx_http_srcache_fetch_post_subrequest(ngx_http_request_t *r, void *data,
+    ngx_int_t rc)
+{
+    ngx_http_srcache_ctx_t      *ctx = data;
+    ngx_http_srcache_ctx_t      *pr_ctx;
+    ngx_http_request_t          *pr;
+
+    dd_enter();
+
+    if (r != r->connection->data) {
+        dd("waited: %d, rc: %d", (int) r->waited, (int) rc);
+    }
+
+    pr = r->parent;
+
+    pr_ctx = ngx_http_get_module_ctx(pr, ngx_http_srcache_filter_module);
+    if (pr_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (ctx == NULL) {
+        return NGX_OK;
+    }
+
+    if (ctx->parsing_cached_headers) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "srcache_fetch: cache sent truncated status line "
+                      "or headers");
+
+        pr_ctx->from_cache = 0;
+
+    } else if (r->headers_out.status >= NGX_HTTP_SPECIAL_RESPONSE
+               || rc == NGX_ERROR
+               || rc >= NGX_HTTP_SPECIAL_RESPONSE)
+    {
+        dd("HERE");
+        pr_ctx->from_cache = 0;
+
+    } else if (!ctx->seen_subreq_eof) {
+
+#if 1
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "srcache_fetch: cache sent truncated "
+                      "response body");
+
+        pr_ctx->from_cache = 0;
+#endif
+    }
+
+    pr_ctx->waiting_subrequest = 0;
+    pr_ctx->request_done = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_fetch_subrequest(ngx_http_request_t *r,
+    ngx_http_srcache_loc_conf_t *conf, ngx_http_srcache_ctx_t *ctx)
+{
+    ngx_http_srcache_ctx_t         *sr_ctx;
+    ngx_http_post_subrequest_t     *psr;
+    ngx_str_t                       args;
+    ngx_uint_t                      flags = 0;
+    ngx_http_request_t             *sr;
+    ngx_int_t                       rc;
+
+    ngx_http_srcache_parsed_request_t  *parsed_sr;
+
+    dd_enter();
+
+    parsed_sr = ngx_palloc(r->pool, sizeof(ngx_http_srcache_parsed_request_t));
+    if (parsed_sr == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (conf->fetch == NULL) {
+        return NGX_ERROR;
+    }
+
+    parsed_sr->method      = conf->fetch->method;
+    parsed_sr->method_name = conf->fetch->method_name;
+
+    parsed_sr->request_body = NULL;
+    parsed_sr->content_length_n = -1;
+
+    if (ngx_http_complex_value(r, &conf->fetch->location,
+                               &parsed_sr->location) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (parsed_sr->location.len == 0) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_http_complex_value(r, &conf->fetch->args, &parsed_sr->args)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    args.data = NULL;
+    args.len = 0;
+
+    if (ngx_http_parse_unsafe_uri(r, &parsed_sr->location, &args, &flags)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (args.len > 0 && parsed_sr->args.len == 0) {
+        parsed_sr->args = args;
+    }
+
+    sr_ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_srcache_ctx_t));
+    if (sr_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    sr_ctx->in_fetch_subrequest = 1;
+
+    psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
+    if (psr == NULL) {
+        return NGX_ERROR;
+    }
+
+    psr->handler = ngx_http_srcache_fetch_post_subrequest;
+    psr->data = sr_ctx;
+
+    dd("firing the fetch subrequest");
+
+    dd("fetch location: %.*s", (int) parsed_sr->location.len,
+       parsed_sr->location.data);
+
+    dd("fetch args: %.*s", (int) parsed_sr->args.len,
+       parsed_sr->args.data);
+
+    rc = ngx_http_subrequest(r, &parsed_sr->location, &parsed_sr->args,
+                             &sr, psr, flags);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_srcache_adjust_subrequest(sr, parsed_sr);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ngx_http_set_ctx(sr, sr_ctx, ngx_http_srcache_filter_module);
+
+    ctx->issued_fetch_subrequest = 1;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_srcache_post_read_body(ngx_http_request_t *r)
+{
+    ngx_http_srcache_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
+
+    dd("post read: ctx=%p", ctx);
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "srcache post read for the access phase: wait:%ud c:%ud",
+                   (unsigned) ctx->waiting_request_body, r->main->count);
+
+    r->write_event_handler = ngx_http_core_run_phases;
+
+#if defined(nginx_version) && nginx_version >= 8011
+    r->main->count--;
+#endif
+
+    dd("c:%u", r->main->count);
+
+    if (ctx->waiting_request_body) {
+        ctx->request_body_done = 1;
+        ctx->waiting_request_body = 0;
+        ngx_http_core_run_phases(r);
+    }
+}
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.h b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.h
new file mode 100644
index 0000000..3a30e35
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_fetch.h
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_SRCACHE_FETCH_H_INCLUDED_
+#define _NGX_HTTP_SRCACHE_FETCH_H_INCLUDED_
+
+
+#include "ngx_http_srcache_filter_module.h"
+
+
+ngx_int_t ngx_http_srcache_access_handler(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_srcache_fetch_post_subrequest(ngx_http_request_t *r,
+        void *data, ngx_int_t rc);
+
+
+#endif /* _NGX_HTTP_SRCACHE_FETCH_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.c b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.c
new file mode 100644
index 0000000..7bbad4e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.c
@@ -0,0 +1,623 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_srcache_filter_module.h"
+#include "ngx_http_srcache_util.h"
+#include "ngx_http_srcache_var.h"
+#include "ngx_http_srcache_fetch.h"
+#include "ngx_http_srcache_store.h"
+#include "ngx_http_srcache_headers.h"
+
+
+static void *ngx_http_srcache_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static ngx_int_t ngx_http_srcache_post_config(ngx_conf_t *cf);
+static char *ngx_http_srcache_conf_set_request(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static void *ngx_http_srcache_create_main_conf(ngx_conf_t *cf);
+static char *ngx_http_srcache_init_main_conf(ngx_conf_t *cf, void *conf);
+static char *ngx_http_srcache_store_statuses(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+
+
+static volatile ngx_cycle_t  *ngx_http_srcache_prev_cycle = NULL;
+
+
+static ngx_str_t  ngx_http_srcache_hide_headers[] = {
+    ngx_string("Connection"),
+    ngx_string("Keep-Alive"),
+    ngx_string("Proxy-Authenticate"),
+    ngx_string("Proxy-Authorization"),
+    ngx_string("TE"),
+    ngx_string("Trailers"),
+    ngx_string("Transfer-Encoding"),
+    ngx_string("Upgrade"),
+    ngx_string("Set-Cookie"),
+    ngx_null_string
+};
+
+
+static ngx_conf_bitmask_t  ngx_http_srcache_cache_method_mask[] = {
+    { ngx_string("GET"),  NGX_HTTP_GET},
+    { ngx_string("HEAD"), NGX_HTTP_HEAD },
+    { ngx_string("POST"), NGX_HTTP_POST },
+    { ngx_string("PUT"), NGX_HTTP_PUT },
+    { ngx_string("DELETE"), NGX_HTTP_DELETE },
+    { ngx_null_string, 0 }
+};
+
+
+static ngx_command_t  ngx_http_srcache_commands[] = {
+
+    { ngx_string("srcache_buffer"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+          |NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, buf_size),
+      NULL },
+
+    { ngx_string("srcache_fetch"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+          |NGX_CONF_TAKE23,
+      ngx_http_srcache_conf_set_request,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, fetch),
+      NULL },
+
+    { ngx_string("srcache_store"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+          |NGX_CONF_TAKE23,
+      ngx_http_srcache_conf_set_request,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, store),
+      NULL },
+
+    { ngx_string("srcache_store_max_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+          |NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, store_max_size),
+      NULL },
+
+    { ngx_string("srcache_fetch_skip"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+          |NGX_CONF_TAKE1,
+      ngx_http_set_complex_value_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, fetch_skip),
+      NULL },
+
+    { ngx_string("srcache_store_skip"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+          |NGX_CONF_TAKE1,
+      ngx_http_set_complex_value_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, store_skip),
+      NULL },
+
+    { ngx_string("srcache_store_statuses"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+          |NGX_CONF_1MORE,
+      ngx_http_srcache_store_statuses,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("srcache_methods"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_conf_set_bitmask_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, cache_methods),
+      &ngx_http_srcache_cache_method_mask },
+
+    { ngx_string("srcache_request_cache_control"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, req_cache_control),
+      NULL },
+
+    { ngx_string("srcache_store_private"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, store_private),
+      NULL },
+
+    { ngx_string("srcache_store_no_store"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, store_no_store),
+      NULL },
+
+    { ngx_string("srcache_store_no_cache"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, store_no_cache),
+      NULL },
+
+    { ngx_string("srcache_response_cache_control"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, resp_cache_control),
+      NULL },
+
+    { ngx_string("srcache_store_hide_header"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_array_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, hide_headers),
+      NULL },
+
+    { ngx_string("srcache_store_pass_header"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_str_array_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, pass_headers),
+      NULL },
+
+    { ngx_string("srcache_store_ranges"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, store_ranges),
+      NULL },
+
+    { ngx_string("srcache_ignore_content_encoding"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, ignore_content_encoding),
+      NULL },
+
+    { ngx_string("srcache_header_buffer_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
+          |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, header_buf_size),
+      NULL },
+
+    { ngx_string("srcache_max_expire"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
+          |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_sec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, max_expire),
+      NULL },
+
+    { ngx_string("srcache_default_expire"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
+          |NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_sec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, default_expire),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_srcache_filter_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_http_srcache_post_config,          /* postconfiguration */
+
+    ngx_http_srcache_create_main_conf,     /* create main configuration */
+    ngx_http_srcache_init_main_conf,       /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    ngx_http_srcache_create_loc_conf,      /* create location configuration */
+    ngx_http_srcache_merge_loc_conf        /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_srcache_filter_module = {
+    NGX_MODULE_V1,
+    &ngx_http_srcache_filter_module_ctx,   /* module context */
+    ngx_http_srcache_commands,             /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_http_srcache_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_srcache_loc_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_srcache_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *      conf->fetch_skip = NULL;
+     *      conf->store_skip = NULL;
+     *      conf->cache_methods = 0;
+     *      conf->hide_headers_hash = { NULL, 0 };
+     *      conf->skip_content_type = 0;
+     *      conf->store_statuses = NULL;
+     */
+
+    conf->fetch = NGX_CONF_UNSET_PTR;
+    conf->store = NGX_CONF_UNSET_PTR;
+
+    conf->buf_size = NGX_CONF_UNSET_SIZE;
+    conf->store_max_size = NGX_CONF_UNSET_SIZE;
+    conf->header_buf_size = NGX_CONF_UNSET_SIZE;
+
+    conf->req_cache_control = NGX_CONF_UNSET;
+    conf->resp_cache_control = NGX_CONF_UNSET;
+
+    conf->store_private = NGX_CONF_UNSET;
+    conf->store_no_store = NGX_CONF_UNSET;
+    conf->store_no_cache = NGX_CONF_UNSET;
+    conf->store_ranges = NGX_CONF_UNSET;
+
+    conf->max_expire = NGX_CONF_UNSET;
+    conf->default_expire = NGX_CONF_UNSET;
+
+    conf->ignore_content_encoding = NGX_CONF_UNSET;
+
+    conf->hide_headers = NGX_CONF_UNSET_PTR;
+    conf->pass_headers = NGX_CONF_UNSET_PTR;
+
+    return conf;
+}
+
+
+static char *
+ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_srcache_loc_conf_t     *prev = parent;
+    ngx_http_srcache_loc_conf_t     *conf = child;
+    ngx_hash_init_t                  hash;
+
+    ngx_conf_merge_ptr_value(conf->fetch, prev->fetch, NULL);
+    ngx_conf_merge_ptr_value(conf->store, prev->store, NULL);
+
+    ngx_conf_merge_size_value(conf->buf_size, prev->buf_size,
+                              (size_t) ngx_pagesize);
+
+    ngx_conf_merge_size_value(conf->store_max_size, prev->store_max_size, 0);
+
+    ngx_conf_merge_size_value(conf->header_buf_size, prev->header_buf_size,
+                              (size_t) ngx_pagesize);
+
+    if (conf->fetch_skip == NULL) {
+        conf->fetch_skip = prev->fetch_skip;
+    }
+
+    if (conf->store_skip == NULL) {
+        conf->store_skip = prev->store_skip;
+    }
+
+    if (conf->store_statuses == NULL) {
+        conf->store_statuses = prev->store_statuses;
+    }
+
+    if (conf->cache_methods == 0) {
+        conf->cache_methods = prev->cache_methods;
+    }
+
+    conf->cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD;
+
+    ngx_conf_merge_value(conf->req_cache_control, prev->req_cache_control, 0);
+    ngx_conf_merge_value(conf->resp_cache_control, prev->resp_cache_control, 1);
+
+    ngx_conf_merge_value(conf->store_private, prev->store_private, 0);
+    ngx_conf_merge_value(conf->store_no_store, prev->store_no_store, 0);
+    ngx_conf_merge_value(conf->store_no_cache, prev->store_no_cache, 0);
+    ngx_conf_merge_value(conf->store_ranges, prev->store_ranges, 0);
+
+    ngx_conf_merge_value(conf->max_expire, prev->max_expire, 0);
+    ngx_conf_merge_value(conf->default_expire, prev->default_expire, 60);
+
+    ngx_conf_merge_value(conf->ignore_content_encoding,
+                         prev->ignore_content_encoding, 0);
+
+    hash.max_size = 512;
+    hash.bucket_size = ngx_align(64, ngx_cacheline_size);
+    hash.name = "srcache_store_hide_headers_hash";
+
+    if (ngx_http_srcache_hide_headers_hash(cf, conf,
+             prev, ngx_http_srcache_hide_headers, &hash)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_srcache_conf_set_request(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char  *p = conf;
+
+    ngx_http_srcache_request_t      **rpp;
+    ngx_http_srcache_request_t       *rp;
+    ngx_str_t                        *value;
+    ngx_str_t                        *method_name;
+    ngx_http_compile_complex_value_t  ccv;
+    ngx_http_srcache_main_conf_t     *smcf;
+
+    rpp = (ngx_http_srcache_request_t **) (p + cmd->offset);
+
+    if (*rpp != NGX_CONF_UNSET_PTR) {
+        return "is duplicate";
+    }
+
+    smcf = ngx_http_conf_get_module_main_conf(cf,
+                                              ngx_http_srcache_filter_module);
+
+    smcf->module_used = 1;
+
+    value = cf->args->elts;
+
+    *rpp = ngx_pcalloc(cf->pool, sizeof(ngx_http_srcache_request_t));
+    if (*rpp == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    rp = *rpp;
+
+    method_name = &value[1];
+
+    rp->method = ngx_http_srcache_parse_method_name(&method_name);
+
+    if (rp->method == NGX_HTTP_UNKNOWN) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "%V specifies bad HTTP method %V",
+                           &cmd->name, method_name);
+
+        return NGX_CONF_ERROR;
+    }
+
+    rp->method_name = *method_name;
+
+    /* compile the location arg */
+
+    if (value[2].len == 0) {
+        ngx_memzero(&rp->location, sizeof(ngx_http_complex_value_t));
+
+    } else {
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+        ccv.cf = cf;
+        ccv.value = &value[2];
+        ccv.complex_value = &rp->location;
+
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    if (cf->args->nelts == 2 + 1) {
+        return NGX_CONF_OK;
+    }
+
+    /* compile the args arg */
+
+    if (value[3].len == 0) {
+        ngx_memzero(&rp->location, sizeof(ngx_http_complex_value_t));
+        return NGX_CONF_OK;
+    }
+
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+    ccv.cf = cf;
+    ccv.value = &value[3];
+    ccv.complex_value = &rp->args;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_http_srcache_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_http_srcache_main_conf_t *smcf;
+
+    smcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_srcache_main_conf_t));
+    if (smcf == NULL) {
+        return NULL;
+    }
+
+    /* set by ngx_pcalloc:
+     *      smcf->postponed_to_access_phase_end = 0;
+     *      smcf->module_used = 0;
+     *      smcf->headers_in_hash = { NULL, 0 };
+     */
+
+    return smcf;
+}
+
+
+static char *
+ngx_http_srcache_init_main_conf(ngx_conf_t *cf, void *conf)
+{
+    ngx_http_srcache_main_conf_t *smcf = conf;
+
+    ngx_array_t                     headers_in;
+    ngx_hash_key_t                 *hk;
+    ngx_hash_init_t                 hash;
+    ngx_http_srcache_header_t      *header;
+
+    /* srcache_headers_in_hash */
+
+    if (ngx_array_init(&headers_in, cf->temp_pool, 32, sizeof(ngx_hash_key_t))
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    for (header = ngx_http_srcache_headers_in; header->name.len; header++) {
+        hk = ngx_array_push(&headers_in);
+        if (hk == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        hk->key = header->name;
+        hk->key_hash = ngx_hash_key_lc(header->name.data, header->name.len);
+        hk->value = header;
+    }
+
+    hash.hash = &smcf->headers_in_hash;
+    hash.key = ngx_hash_key_lc;
+    hash.max_size = 512;
+    hash.bucket_size = ngx_align(64, ngx_cacheline_size);
+    hash.name = "srcache_headers_in_hash";
+    hash.pool = cf->pool;
+    hash.temp_pool = NULL;
+
+    if (ngx_hash_init(&hash, headers_in.elts, headers_in.nelts) != NGX_OK) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_post_config(ngx_conf_t *cf)
+{
+    int                              multi_http_blocks;
+    ngx_int_t                        rc;
+    ngx_http_handler_pt             *h;
+    ngx_http_core_main_conf_t       *cmcf;
+    ngx_http_srcache_main_conf_t    *smcf;
+
+    rc = ngx_http_srcache_add_variables(cf);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    smcf = ngx_http_conf_get_module_main_conf(cf,
+                                              ngx_http_srcache_filter_module);
+
+    if (ngx_http_srcache_prev_cycle != ngx_cycle) {
+        ngx_http_srcache_prev_cycle = ngx_cycle;
+        multi_http_blocks = 0;
+
+    } else {
+        multi_http_blocks = 1;
+    }
+
+    if (multi_http_blocks || smcf->module_used) {
+
+        dd("using ngx-srcache");
+
+        /* register our output filters */
+        rc = ngx_http_srcache_filter_init(cf);
+        if (rc != NGX_OK) {
+            return rc;
+        }
+
+        cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+
+        /* register our access phase handler */
+
+        h = ngx_array_push(&cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers);
+        if (h == NULL) {
+            return NGX_ERROR;
+        }
+
+        *h = ngx_http_srcache_access_handler;
+    }
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_http_srcache_store_statuses(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    ngx_http_srcache_loc_conf_t     *slcf = conf;
+
+    ngx_uint_t       i, n;
+    ngx_int_t        status;
+    ngx_str_t       *value;
+
+    value = cf->args->elts;
+
+    if (slcf->store_statuses) {
+        return "is duplicate";
+    }
+
+    n = cf->args->nelts - 1;
+
+    slcf->store_statuses = ngx_pnalloc(cf->pool, (n + 1) * sizeof(ngx_int_t));
+    if (slcf->store_statuses == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    for (i = 1; i <= n; i++) {
+        status = ngx_atoi(value[i].data, value[i].len);
+        if (status == NGX_ERROR) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "status code \"%V\" is an invalid number",
+                               &value[i]);
+
+            return NGX_CONF_ERROR;
+        }
+
+        if (status < 0) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "status code \"%V\" is not a positive number",
+                               &value[i]);
+
+            return NGX_CONF_ERROR;
+        }
+
+        slcf->store_statuses[i - 1] = status;
+    }
+
+    slcf->store_statuses[i - 1] = 0;
+
+    ngx_sort(slcf->store_statuses, n, sizeof(ngx_int_t),
+             ngx_http_srcache_cmp_int);
+
+#if 0
+    for (i = 0; i < n; i++) {
+        dd("status: %d", (int) slcf->store_statuses[i]);
+    }
+#endif
+
+    return NGX_CONF_OK;
+}
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.h b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.h
new file mode 100644
index 0000000..50c4b87
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_filter_module.h
@@ -0,0 +1,152 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_SRCACHE_FILTER_MODULE_H_INCLUDED_
+#define _NGX_HTTP_SRCACHE_FILTER_MODULE_H_INCLUDED_
+
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+enum {
+    NGX_HTTP_SRCACHE_FETCH_BYPASS = 0,
+    NGX_HTTP_SRCACHE_FETCH_MISS   = 1,
+    NGX_HTTP_SRCACHE_FETCH_HIT    = 2
+};
+
+
+enum {
+    NGX_HTTP_SRCACHE_STORE_BYPASS = 0,
+    NGX_HTTP_SRCACHE_STORE_STORE  = 1
+};
+
+
+extern ngx_module_t  ngx_http_srcache_filter_module;
+
+
+typedef struct {
+    ngx_uint_t                  method;
+    ngx_str_t                   method_name;
+    ngx_http_complex_value_t    location;
+    ngx_http_complex_value_t    args;
+
+} ngx_http_srcache_request_t;
+
+
+typedef struct {
+    ngx_uint_t                  method;
+    ngx_str_t                   method_name;
+    ngx_str_t                   location;
+    ngx_str_t                   args;
+    ngx_http_request_body_t    *request_body;
+    ssize_t                     content_length_n;
+
+} ngx_http_srcache_parsed_request_t;
+
+
+typedef struct {
+    ngx_http_srcache_request_t      *fetch;
+    ngx_http_srcache_request_t      *store;
+    size_t                           buf_size;
+    size_t                           store_max_size;
+    size_t                           header_buf_size;
+
+    ngx_http_complex_value_t        *fetch_skip;
+    ngx_http_complex_value_t        *store_skip;
+
+    ngx_uint_t                       cache_methods;
+
+    ngx_int_t                       *store_statuses;
+
+    ngx_flag_t                       req_cache_control;
+    ngx_flag_t                       resp_cache_control;
+
+    ngx_flag_t                       store_private;
+    ngx_flag_t                       store_no_store;
+    ngx_flag_t                       store_no_cache;
+    ngx_flag_t                       store_ranges;
+
+    ngx_flag_t                       ignore_content_encoding;
+
+    ngx_hash_t                       hide_headers_hash;
+    ngx_array_t                     *hide_headers;
+    ngx_array_t                     *pass_headers;
+
+    time_t                           max_expire;
+    time_t                           default_expire;
+
+    unsigned                         postponed_to_access_phase_end:1;
+    unsigned                         hide_content_type:1;
+    unsigned                         hide_last_modified:1;
+} ngx_http_srcache_loc_conf_t;
+
+
+typedef struct {
+    unsigned            postponed_to_access_phase_end;
+    unsigned            module_used;
+    ngx_hash_t          headers_in_hash;
+
+} ngx_http_srcache_main_conf_t;
+
+
+typedef struct ngx_http_srcache_ctx_s  ngx_http_srcache_ctx_t;
+
+typedef struct ngx_http_srcache_postponed_request_s
+    ngx_http_srcache_postponed_request_t;
+
+
+struct ngx_http_srcache_ctx_s {
+    ngx_chain_t                     *body_from_cache;
+    ngx_chain_t                     *body_to_cache;
+    size_t                           response_length;
+    size_t                           response_body_length;
+    void                            *store_wev_handler_ctx;
+
+    ngx_int_t                      (*process_header)(ngx_http_request_t *r,
+                                                     ngx_buf_t *b);
+
+    time_t                           valid_sec;
+
+    ngx_http_status_t                status;
+    ngx_buf_t                       *header_buf;
+
+    ngx_http_srcache_postponed_request_t  *postponed_requests;
+
+    ngx_uint_t      http_status; /* the HTTP status code that has been
+                                    actually sent */
+
+    unsigned        waiting_subrequest:1;
+    unsigned        request_done:1;
+    unsigned        from_cache:1;
+    /* unsigned      fetch_error:1; */
+    unsigned        in_fetch_subrequest:1;
+    unsigned        in_store_subrequest:1;
+    unsigned        ignore_body:1;
+    unsigned        parsing_cached_headers:1;
+    unsigned        store_response:1;
+    unsigned        store_skip:1;
+    unsigned        issued_fetch_subrequest:1;
+    unsigned        seen_subreq_eof:1;
+    unsigned        waiting_request_body:1;
+    unsigned        request_body_done:1;
+};
+
+
+struct ngx_http_srcache_postponed_request_s {
+    ngx_http_srcache_postponed_request_t     *next;
+
+    ngx_http_request_t              *request;
+    ngx_http_srcache_ctx_t          *ctx;
+    unsigned                         ready:1;
+    unsigned                         done:1;
+};
+
+
+#endif  /* _NGX_HTTP_SRCACHE_FILTER_MODULE_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.c b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.c
new file mode 100644
index 0000000..2802df2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.c
@@ -0,0 +1,359 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_srcache_headers.h"
+
+
+static ngx_int_t ngx_http_srcache_process_content_type(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t ngx_http_srcache_process_content_length(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t ngx_http_srcache_process_last_modified(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t
+    ngx_http_srcache_process_multi_header_lines(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t ngx_http_srcache_process_allow_ranges(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t ngx_http_srcache_process_accept_ranges(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t ngx_http_srcache_ignore_header_line(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+static ngx_int_t ngx_http_srcache_process_location(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+
+#if (NGX_HTTP_GZIP)
+static ngx_int_t
+    ngx_http_srcache_process_content_encoding(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+#endif
+
+
+ngx_http_srcache_header_t  ngx_http_srcache_headers_in[] = {
+
+    { ngx_string("Content-Type"),
+                 ngx_http_srcache_process_content_type, 0 },
+
+    { ngx_string("Content-Length"),
+                 ngx_http_srcache_process_content_length, 0 },
+
+    { ngx_string("Date"),
+                 ngx_http_srcache_process_header_line,
+                 offsetof(ngx_http_headers_out_t, date) },
+
+    { ngx_string("Last-Modified"),
+                 ngx_http_srcache_process_last_modified, 0 },
+
+    { ngx_string("ETag"),
+                 ngx_http_srcache_process_header_line,
+                 offsetof(ngx_http_headers_out_t, etag) },
+
+    { ngx_string("Server"),
+                 ngx_http_srcache_process_header_line,
+                 offsetof(ngx_http_headers_out_t, server) },
+
+    { ngx_string("WWW-Authenticate"),
+                 ngx_http_srcache_process_header_line,
+                 offsetof(ngx_http_headers_out_t, www_authenticate) },
+
+    { ngx_string("Location"),
+                 ngx_http_srcache_process_location,
+                 0 },
+
+    { ngx_string("Refresh"),
+                 ngx_http_srcache_process_header_line,
+                 offsetof(ngx_http_headers_out_t, refresh) },
+
+    { ngx_string("Cache-Control"),
+                 ngx_http_srcache_process_multi_header_lines,
+                 offsetof(ngx_http_headers_out_t, cache_control) },
+
+    { ngx_string("Expires"),
+                 ngx_http_srcache_process_header_line,
+                 offsetof(ngx_http_headers_out_t, expires) },
+
+    { ngx_string("X-SRCache-Allow-Ranges"),
+                 ngx_http_srcache_process_allow_ranges,
+                 offsetof(ngx_http_headers_out_t, accept_ranges) },
+
+    { ngx_string("Accept-Ranges"),
+                 ngx_http_srcache_process_accept_ranges,
+                 offsetof(ngx_http_headers_out_t, accept_ranges) },
+
+    { ngx_string("Connection"),
+                 ngx_http_srcache_ignore_header_line, 0 },
+
+    { ngx_string("Keep-Alive"),
+                 ngx_http_srcache_ignore_header_line, 0 },
+
+#if (NGX_HTTP_GZIP)
+    { ngx_string("Content-Encoding"),
+                 ngx_http_srcache_process_content_encoding,
+                 offsetof(ngx_http_headers_out_t, content_encoding) },
+#endif
+
+    { ngx_null_string, NULL, 0 }
+};
+
+
+ngx_int_t
+ngx_http_srcache_process_header_line(ngx_http_request_t *r, ngx_table_elt_t *h,
+    ngx_uint_t offset)
+{
+    ngx_table_elt_t  *ho, **ph;
+
+    ho = ngx_list_push(&r->headers_out.headers);
+    if (ho == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ho = *h;
+
+    if (offset) {
+        ph = (ngx_table_elt_t **) ((char *) &r->headers_out + offset);
+        *ph = ho;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_process_location(ngx_http_request_t *r, ngx_table_elt_t *h,
+    ngx_uint_t offset)
+{
+    ngx_table_elt_t  *ho;
+
+    ho = ngx_list_push(&r->headers_out.headers);
+    if (ho == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ho = *h;
+
+    if (ho->value.data[0] != '/') {
+        r->headers_out.location = ho;
+    }
+
+    /*
+     * we do not set r->headers_out.location here to avoid the handling
+     * the local redirects without a host name by ngx_http_header_filter()
+     */
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_process_content_type(ngx_http_request_t *r, ngx_table_elt_t *h,
+    ngx_uint_t offset)
+{
+    u_char  *p, *last;
+
+    r->headers_out.content_type_len = h->value.len;
+    r->headers_out.content_type = h->value;
+    r->headers_out.content_type_lowcase = NULL;
+
+    for (p = h->value.data; *p; p++) {
+
+        if (*p != ';') {
+            continue;
+        }
+
+        last = p;
+
+        while (*++p == ' ') { /* void */ }
+
+        if (*p == '\0') {
+            return NGX_OK;
+        }
+
+        if (ngx_strncasecmp(p, (u_char *) "charset=", 8) != 0) {
+            continue;
+        }
+
+        p += 8;
+
+        r->headers_out.content_type_len = last - h->value.data;
+
+        if (*p == '"') {
+            p++;
+        }
+
+        last = h->value.data + h->value.len;
+
+        if (*(last - 1) == '"') {
+            last--;
+        }
+
+        r->headers_out.charset.len = last - p;
+        r->headers_out.charset.data = p;
+
+        return NGX_OK;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_process_content_length(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset)
+{
+    ngx_table_elt_t  *ho;
+
+    ho = ngx_list_push(&r->headers_out.headers);
+    if (ho == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ho = *h;
+
+    r->headers_out.content_length = ho;
+    r->headers_out.content_length_n = ngx_atoof(h->value.data, h->value.len);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_process_last_modified(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset)
+{
+#if 1
+    ngx_table_elt_t  *ho;
+
+    ho = ngx_list_push(&r->headers_out.headers);
+    if (ho == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ho = *h;
+
+    r->headers_out.last_modified = ho;
+#endif
+
+    r->headers_out.last_modified_time = ngx_http_parse_time(h->value.data,
+                                                            h->value.len);
+
+    dd("setting last-modified-time: %d",
+       (int) r->headers_out.last_modified_time);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_process_multi_header_lines(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset)
+{
+#if defined(nginx_version) && nginx_version < 1023000
+    ngx_array_t      *pa;
+#endif
+    ngx_table_elt_t  *ho, **ph;
+
+#if defined(nginx_version) && nginx_version >= 1023000
+    ph = (ngx_table_elt_t **) ((char *) &r->headers_out + offset);
+    while (*ph) {
+      ph = &(*ph)->next;
+    }
+#else
+    pa = (ngx_array_t *) ((char *) &r->headers_out + offset);
+
+    if (pa->elts == NULL) {
+        if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+    }
+
+    ph = ngx_array_push(pa);
+    if (ph == NULL) {
+        return NGX_ERROR;
+    }
+#endif
+
+    ho = ngx_list_push(&r->headers_out.headers);
+    if (ho == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ho = *h;
+    *ph = ho;
+#if defined(nginx_version) && nginx_version >= 1023000
+    ho->next = NULL;
+#endif
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_process_accept_ranges(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset)
+{
+    ngx_table_elt_t  *ho;
+
+    ho = ngx_list_push(&r->headers_out.headers);
+    if (ho == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ho = *h;
+
+    r->headers_out.accept_ranges = ho;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_process_allow_ranges(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset)
+{
+    r->allow_ranges = 1;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_ignore_header_line(ngx_http_request_t *r, ngx_table_elt_t *h,
+    ngx_uint_t offset)
+{
+    return NGX_OK;
+}
+
+
+#if (NGX_HTTP_GZIP)
+
+static ngx_int_t
+ngx_http_srcache_process_content_encoding(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset)
+{
+    ngx_table_elt_t  *ho;
+
+    ho = ngx_list_push(&r->headers_out.headers);
+    if (ho == NULL) {
+        return NGX_ERROR;
+    }
+
+    *ho = *h;
+
+    r->headers_out.content_encoding = ho;
+
+    return NGX_OK;
+}
+
+#endif
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.h b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.h
new file mode 100644
index 0000000..5951c92
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_headers.h
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_SRCACHE_HEADERS_H_INCLUDED_
+#define _NGX_HTTP_SRCACHE_HEADERS_H_INCLUDED_
+
+
+#include "ngx_http_srcache_filter_module.h"
+
+
+typedef struct {
+    ngx_str_t                        name;
+    ngx_http_header_handler_pt       handler;
+    ngx_uint_t                       offset;
+} ngx_http_srcache_header_t;
+
+
+extern ngx_http_srcache_header_t  ngx_http_srcache_headers_in[];
+
+
+ngx_int_t ngx_http_srcache_process_header_line(ngx_http_request_t *r,
+    ngx_table_elt_t *h, ngx_uint_t offset);
+
+
+#endif /* _NGX_HTTP_SRCACHE_HEADERS_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.c b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.c
new file mode 100644
index 0000000..d03a2b6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.c
@@ -0,0 +1,675 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_srcache_store.h"
+#include "ngx_http_srcache_fetch.h"
+#include "ngx_http_srcache_util.h"
+#include <assert.h>
+
+
+static ngx_int_t ngx_http_srcache_store_post_subrequest(ngx_http_request_t *r,
+    void *data, ngx_int_t rc);
+static ngx_int_t ngx_http_srcache_store_subrequest(ngx_http_request_t *r,
+        ngx_http_srcache_ctx_t *ctx);
+static ngx_int_t ngx_http_srcache_header_filter(ngx_http_request_t *r);
+static ngx_int_t ngx_http_srcache_body_filter(ngx_http_request_t *r,
+        ngx_chain_t *in);
+
+
+ngx_http_output_header_filter_pt  ngx_http_srcache_next_header_filter;
+ngx_http_output_body_filter_pt    ngx_http_srcache_next_body_filter;
+
+
+static ngx_int_t
+ngx_http_srcache_header_filter(ngx_http_request_t *r)
+{
+    ngx_http_srcache_ctx_t          *ctx, *pr_ctx;
+    ngx_http_srcache_loc_conf_t     *slcf;
+    ngx_http_post_subrequest_t      *ps;
+    ngx_str_t                        skip;
+    ngx_uint_t                      *sp; /* status pointer */
+
+    dd_enter();
+    dd("srcache header filter");
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
+
+    if (r != r->main && ctx == NULL) {
+        ps = r->post_subrequest;
+        if (ps != NULL
+            && (ps->handler == ngx_http_srcache_fetch_post_subrequest
+                || ps->handler == ngx_http_srcache_store_post_subrequest)
+            && ps->data != NULL)
+        {
+            /* the subrequest ctx has been cleared by
+             * ngx_http_internal_redirect, resume it from the post_subrequest
+             * data
+             */
+            dd("resumed ctx from post_subrequest");
+            ctx = ps->data;
+            ngx_http_set_ctx(r, ctx, ngx_http_srcache_filter_module);
+        }
+    }
+
+    if (ctx == NULL || ctx->from_cache) {
+        dd("bypass: %.*s", (int) r->uri.len, r->uri.data);
+        return ngx_http_srcache_next_header_filter(r);
+    }
+
+    if (ctx->in_fetch_subrequest) {
+        dd("in fetch subrequest");
+
+        pr_ctx = ngx_http_get_module_ctx(r->parent,
+                                         ngx_http_srcache_filter_module);
+
+        if (pr_ctx == NULL) {
+            dd("parent ctx is null");
+
+            ctx->ignore_body = 1;
+
+            return NGX_ERROR;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_fetch: subrequest returned status %ui",
+                       r->headers_out.status);
+
+        if (r->headers_out.status != NGX_HTTP_OK) {
+            dd("ignoring body because status == %d",
+               (int) r->headers_out.status);
+
+            ctx->ignore_body = 1;
+
+            pr_ctx->waiting_subrequest = 0;
+            /* pr_ctx->fetch_error = 1; */
+            r->header_sent = 1;
+
+            if (r->method == NGX_HTTP_HEAD) {
+                r->header_only = 1;
+            }
+
+            return NGX_OK;
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_fetch decides to send the response in cache");
+
+        r->filter_need_in_memory = 1;
+        pr_ctx->from_cache = 1;
+        ctx->parsing_cached_headers = 1;
+        r->header_sent = 1;
+
+        if (r->method == NGX_HTTP_HEAD) {
+            r->header_only = 1;
+        }
+
+        return NGX_OK;
+    }
+
+    if (ctx->in_store_subrequest) {
+        dd("in store subreuqest");
+        ctx->ignore_body = 1;
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_store: subrequest returned status %ui",
+                       r->headers_out.status);
+
+        r->header_sent = 1;
+
+        if (r->method == NGX_HTTP_HEAD) {
+            r->header_only = 1;
+        }
+
+        return NGX_OK;
+    }
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_srcache_filter_module);
+
+    if (slcf->store == NULL) {
+        dd("slcf->store is NULL");
+        return ngx_http_srcache_next_header_filter(r);
+    }
+
+    /* slcf->store != NULL */
+
+#if 1
+    if (!(r->method & (slcf->cache_methods & ~NGX_HTTP_HEAD))) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_store skipped due to request method %V",
+                       &r->method_name);
+
+        return ngx_http_srcache_next_header_filter(r);
+    }
+#endif
+
+    if (!slcf->ignore_content_encoding
+        && r->headers_out.content_encoding
+        && r->headers_out.content_encoding->value.len)
+    {
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "srcache_store skipped due to response header "
+                      "\"Content-Encoding: %V\" (maybe you forgot to disable "
+                      "compression on the backend?)",
+                      &r->headers_out.content_encoding->value);
+
+        return ngx_http_srcache_next_header_filter(r);
+    }
+
+    if (slcf->resp_cache_control
+        && ngx_http_srcache_response_no_cache(r, slcf, ctx) == NGX_OK)
+    {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_store skipped due to response header "
+                       "Cache-Control");
+
+        return ngx_http_srcache_next_header_filter(r);
+    }
+
+    if (slcf->store_skip != NULL
+        && ngx_http_complex_value(r, slcf->store_skip, &skip) == NGX_OK
+        && skip.len
+        && (skip.len != 1 || skip.data[0] != '0'))
+    {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_store skipped due to the true value fed into "
+                       "srcache_store_skip: \"%V\"", &skip);
+
+        ctx->store_skip = 1;
+
+        return ngx_http_srcache_next_header_filter(r);
+    }
+
+    dd("error page: %d", (int) r->error_page);
+
+    if (slcf->store_statuses != NULL) {
+
+        sp = (ngx_uint_t *) slcf->store_statuses;
+
+        while (r->headers_out.status < *sp) {
+            sp++;
+        }
+
+        if (*sp == 0 || r->headers_out.status > *sp) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "srcache_store bypassed because of unmatched "
+                           "status code %ui with srcache_store_statuses",
+                           r->headers_out.status);
+
+            return ngx_http_srcache_next_header_filter(r);
+        }
+
+        /* r->headers_out.status == (ngx_uint_t) *sp */
+
+    } else {
+
+        if (r->headers_out.status != NGX_HTTP_OK
+            && r->headers_out.status != NGX_HTTP_MOVED_TEMPORARILY
+            && r->headers_out.status != NGX_HTTP_MOVED_PERMANENTLY
+            && r->headers_out.status != NGX_HTTP_TEMPORARY_REDIRECT
+            && r->headers_out.status != NGX_HTTP_PERMANENT_REDIRECT)
+        {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "srcache_store bypassed because of unmatched status "
+                           "code %i (only 200, 301, 302, 307, or 308 are accepted "
+                           "by default)", r->headers_out.status);
+
+            return ngx_http_srcache_next_header_filter(r);
+        }
+    }
+
+    if (slcf->store_max_size != 0
+        && r->headers_out.content_length_n > 0
+        && r->headers_out.content_length_n + 15
+           /* just an approxiation for the response header size */
+           > (off_t) slcf->store_max_size)
+    {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "srcache_store bypassed because of too large "
+                       "Content-Length response header: %O (limit is: %z)",
+                       r->headers_out.content_length_n, slcf->store_max_size);
+
+        return ngx_http_srcache_next_header_filter(r);
+    }
+
+    dd("try to save the response header");
+
+    if (r != r->main) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "ngx_srcache not working in subrequests (yet)");
+
+        /* not allowd in subrquests */
+        return NGX_ERROR;
+    }
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "srcache_store decides to store the response");
+
+    r->filter_need_in_memory = 1;
+
+    ctx->http_status = r->headers_out.status;
+    ctx->store_response = 1;
+
+    if (r->method == NGX_HTTP_HEAD) {
+        r->header_only = 1;
+    }
+
+    /* store the response header to ctx->body_to_cache */
+    if (ngx_http_srcache_store_response_header(r, ctx) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    return ngx_http_srcache_next_header_filter(r);
+}
+
+
+static ngx_int_t
+ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    ngx_http_srcache_ctx_t      *ctx, *pr_ctx;
+    ngx_int_t                    rc;
+    ngx_str_t                    skip;
+    ngx_chain_t                 *cl;
+    ngx_http_srcache_loc_conf_t *slcf;
+    size_t                       len;
+    unsigned                     last;
+
+    dd_enter();
+
+    if (in == NULL) {
+        return ngx_http_srcache_next_body_filter(r, NULL);
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
+
+    if (ctx == NULL || ctx->from_cache || ctx->store_skip) {
+        dd("bypass: %.*s", (int) r->uri.len, r->uri.data);
+        return ngx_http_srcache_next_body_filter(r, in);
+    }
+
+    if (ctx->ignore_body || ctx->in_store_subrequest/* || ctx->fetch_error */) {
+        dd("ignore body: ignore body %d, in store sr %d",
+           (int) ctx->ignore_body, (int) ctx->in_store_subrequest);
+        ngx_http_srcache_discard_bufs(r->pool, in);
+        return NGX_OK;
+    }
+
+    if (ctx->in_fetch_subrequest) {
+        if (ctx->parsing_cached_headers) {
+
+            /* parse the cached response's headers and
+             * set r->parent->headers_out */
+
+            if (ctx->process_header == NULL) {
+                dd("restore parent request header");
+                ctx->process_header = ngx_http_srcache_process_status_line;
+                r->state = 0; /* sw_start */
+            }
+
+            for (cl = in; cl; cl = cl->next) {
+                if (ngx_buf_in_memory(cl->buf)) {
+                    dd("old pos %p, last %p", cl->buf->pos, cl->buf->last);
+
+                    rc = ctx->process_header(r, cl->buf);
+
+                    if (rc == NGX_AGAIN) {
+                        dd("AGAIN/OK: new pos %p, last %p",
+                           cl->buf->pos, cl->buf->last);
+
+                        continue;
+                    }
+
+                    if (rc == NGX_ERROR) {
+                        r->state = 0; /* sw_start */
+                        ctx->parsing_cached_headers = 0;
+                        ctx->ignore_body = 1;
+                        ngx_http_srcache_discard_bufs(r->pool, cl);
+                        pr_ctx = ngx_http_get_module_ctx(r->parent,
+                                              ngx_http_srcache_filter_module);
+
+                        if (pr_ctx == NULL) {
+                            return NGX_ERROR;
+                        }
+
+                        pr_ctx->from_cache = 0;
+
+                        return NGX_OK;
+                    }
+
+                    /* rc == NGX_OK */
+
+                    dd("OK: new pos %p, last %p", cl->buf->pos, cl->buf->last);
+                    dd("buf left: %.*s", (int) (cl->buf->last - cl->buf->pos),
+                       cl->buf->pos);
+
+                    ctx->parsing_cached_headers = 0;
+
+                    break;
+                }
+            }
+
+            if (cl == NULL) {
+                return NGX_OK;
+            }
+
+            if (cl->buf->pos == cl->buf->last) {
+                cl = cl->next;
+            }
+
+            if (cl == NULL) {
+                return NGX_OK;
+            }
+
+            in = cl;
+        }
+
+        dd("save the cached response body for parent");
+
+        pr_ctx = ngx_http_get_module_ctx(r->parent,
+                                         ngx_http_srcache_filter_module);
+
+        if (pr_ctx == NULL) {
+            return NGX_ERROR;
+        }
+
+        rc = ngx_http_srcache_add_copy_chain(r->pool,
+                                             &pr_ctx->body_from_cache, in,
+                                             &last);
+
+        if (rc != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (last) {
+            ctx->seen_subreq_eof = 1;
+        }
+
+        ngx_http_srcache_discard_bufs(r->pool, in);
+
+        return NGX_OK;
+    }
+
+    if (ctx->store_response) {
+        dd("storing the response: %p", in);
+
+        slcf = ngx_http_get_module_loc_conf(r, ngx_http_srcache_filter_module);
+
+        if (r->headers_out.status == NGX_HTTP_PARTIAL_CONTENT
+            && ctx->http_status == NGX_HTTP_OK)
+        {
+            u_char *p;
+
+            if (!slcf->store_ranges) {
+                ctx->store_response = 0;
+                goto done;
+            }
+
+            dd("fix 206 status code");
+
+            /* handle 206 Partial Content generated by the range filter */
+            cl = ctx->body_to_cache;
+            assert(cl && cl->buf && cl->buf->last - cl->buf->pos > 12);
+            p = cl->buf->pos + sizeof("HTTP/1.x 20") - 1;
+            *p = '6';
+
+            ctx->http_status = NGX_HTTP_PARTIAL_CONTENT;
+        }
+
+        for (cl = in; cl; cl = cl->next) {
+            if (ngx_buf_in_memory(cl->buf)) {
+                len = ngx_buf_size(cl->buf);
+                ctx->response_length += len;
+                ctx->response_body_length += len;
+            }
+        }
+
+        if (slcf->store_max_size != 0
+            && ctx->response_length > slcf->store_max_size)
+        {
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "srcache_store bypassed because response body "
+                           "exceeded maximum size: %z (limit is: %z)",
+                           ctx->response_length, slcf->store_max_size);
+
+            ctx->store_response = 0;
+
+            goto done;
+        }
+
+        rc = ngx_http_srcache_add_copy_chain(r->pool, &ctx->body_to_cache,
+                                             in, &last);
+
+        if (rc != NGX_OK) {
+            ctx->store_response = 0;
+            goto done;
+        }
+
+        if (last && r == r->main) {
+
+#if 1
+            if (r->headers_out.content_length_n >
+                (off_t) ctx->response_body_length)
+            {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "srcache_store: skipped because response body "
+                              "truncated: %O > %uz",
+                              r->headers_out.content_length_n,
+                              ctx->response_body_length);
+
+                ctx->store_response = 0;
+                goto done;
+            }
+
+            if (r->headers_out.status >= NGX_HTTP_SPECIAL_RESPONSE
+                && r->headers_out.status != ctx->http_status)
+            {
+                /* data truncation or body receive timeout */
+
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "srcache_store: skipped due to new error status "
+                              "code %ui (old: %ui)",
+                              r->headers_out.status, ctx->http_status);
+
+                ctx->store_response = 0;
+                goto done;
+            }
+#endif
+
+            if (slcf->store_skip != NULL
+                && ngx_http_complex_value(r, slcf->store_skip, &skip) == NGX_OK
+                && skip.len
+                && (skip.len != 1 || skip.data[0] != '0'))
+            {
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "srcache_store skipped due to the true value in "
+                               "srcache_store_skip: \"%V\"", &skip);
+
+                ctx->store_response = 0;
+                goto done;
+            }
+
+            rc = ngx_http_srcache_store_subrequest(r, ctx);
+
+            if (rc != NGX_OK) {
+                ctx->store_response = 0;
+                goto done;
+            }
+        }
+
+    } else {
+        dd("NO store response");
+    }
+
+done:
+
+    return ngx_http_srcache_next_body_filter(r, in);
+}
+
+
+
+
+static ngx_int_t
+ngx_http_srcache_store_subrequest(ngx_http_request_t *r,
+    ngx_http_srcache_ctx_t *ctx)
+{
+    ngx_http_srcache_ctx_t         *sr_ctx;
+    ngx_str_t                       args;
+    ngx_uint_t                      flags = 0;
+    ngx_http_request_t             *sr;
+    ngx_int_t                       rc;
+    ngx_http_request_body_t        *rb = NULL;
+    ngx_http_srcache_loc_conf_t    *conf;
+    ngx_http_post_subrequest_t     *psr;
+
+    ngx_http_srcache_parsed_request_t  *parsed_sr;
+
+    dd("store subrequest");
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_srcache_filter_module);
+
+    if (conf->store == NULL) {
+        dd("conf store is NULL");
+        return NGX_ERROR;
+    }
+
+    parsed_sr = ngx_palloc(r->pool, sizeof(ngx_http_srcache_parsed_request_t));
+    if (parsed_sr == NULL) {
+        return NGX_ERROR;
+    }
+
+    parsed_sr->method      = conf->store->method;
+    parsed_sr->method_name = conf->store->method_name;
+
+    if (ctx->body_to_cache) {
+        dd("found body to cache (len %d)", (int) ctx->response_length);
+
+        rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
+
+        if (rb == NULL) {
+            return NGX_ERROR;
+        }
+
+        rb->bufs = ctx->body_to_cache;
+        rb->buf = ctx->body_to_cache->buf;
+
+        parsed_sr->request_body = rb;
+
+    } else {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "srcache_store: no request body for the subrequest");
+
+        return NGX_ERROR;
+    }
+
+    parsed_sr->content_length_n = ctx->response_length;
+
+    if (ngx_http_complex_value(r, &conf->store->location,
+                               &parsed_sr->location) != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (parsed_sr->location.len == 0) {
+        return NGX_ERROR;
+    }
+
+    if (ngx_http_complex_value(r, &conf->store->args, &parsed_sr->args)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    args.data = NULL;
+    args.len = 0;
+
+    if (ngx_http_parse_unsafe_uri(r, &parsed_sr->location, &args, &flags)
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    if (args.len > 0 && parsed_sr->args.len == 0) {
+        parsed_sr->args = args;
+    }
+
+    dd("firing the store subrequest");
+
+    dd("store location: %.*s", (int) parsed_sr->location.len,
+       parsed_sr->location.data);
+
+    dd("store args: %.*s", (int) parsed_sr->args.len,
+       parsed_sr->args.data);
+
+    sr_ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_srcache_ctx_t));
+
+    if (sr_ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    sr_ctx->in_store_subrequest = 1;
+
+    psr = ngx_palloc(r->pool, sizeof(ngx_http_post_subrequest_t));
+    if (psr == NULL) {
+        return NGX_ERROR;
+    }
+
+    psr->handler = ngx_http_srcache_store_post_subrequest;
+    psr->data = sr_ctx;
+
+    rc = ngx_http_subrequest(r, &parsed_sr->location, &parsed_sr->args,
+                             &sr, psr, flags);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    rc = ngx_http_srcache_adjust_subrequest(sr, parsed_sr);
+
+    if (rc != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    ngx_http_set_ctx(sr, sr_ctx, ngx_http_srcache_filter_module);
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_store_post_subrequest(ngx_http_request_t *r, void *data,
+    ngx_int_t rc)
+{
+    if (rc == NGX_ERROR
+        || rc >= NGX_HTTP_SPECIAL_RESPONSE
+        || r->headers_out.status >= NGX_HTTP_SPECIAL_RESPONSE)
+    {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "srcache_store subrequest failed: rc=%i status=%ui",
+                      rc, r->headers_out.status);
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_srcache_filter_init(ngx_conf_t *cf)
+{
+    ngx_http_srcache_next_header_filter = ngx_http_top_header_filter;
+    ngx_http_top_header_filter = ngx_http_srcache_header_filter;
+
+    ngx_http_srcache_next_body_filter = ngx_http_top_body_filter;
+    ngx_http_top_body_filter = ngx_http_srcache_body_filter;
+
+    return NGX_OK;
+}
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.h b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.h
new file mode 100644
index 0000000..08aaf56
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_store.h
@@ -0,0 +1,23 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_SRCACHE_STORE_H_INCLUDED_
+#define _NGX_HTTP_SRCACHE_STORE_H_INCLUDED_
+
+
+#include "ngx_http_srcache_filter_module.h"
+
+
+extern ngx_http_output_header_filter_pt  ngx_http_srcache_next_header_filter;
+extern ngx_http_output_body_filter_pt    ngx_http_srcache_next_body_filter;
+
+
+ngx_int_t ngx_http_srcache_filter_init(ngx_conf_t *cf);
+
+
+#endif /* _NGX_HTTP_SRCACHE_STORE_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.c b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.c
new file mode 100644
index 0000000..bfa1eaa
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.c
@@ -0,0 +1,1296 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_srcache_util.h"
+#include "ngx_http_srcache_headers.h"
+
+
+static ngx_int_t ngx_http_srcache_set_content_length_header(
+        ngx_http_request_t *r, off_t len);
+
+
+static ngx_str_t ngx_http_status_lines[] = {
+
+    ngx_string("200 OK"),
+    ngx_string("201 Created"),
+    ngx_string("202 Accepted"),
+    ngx_null_string,  /* "203 Non-Authoritative Information" */
+    ngx_string("204 No Content"),
+    ngx_null_string,  /* "205 Reset Content" */
+    ngx_string("206 Partial Content"),
+
+    /* ngx_null_string, */  /* "207 Multi-Status" */
+
+#define NGX_HTTP_LAST_LEVEL_200  207
+#define NGX_HTTP_LEVEL_200       (NGX_HTTP_LAST_LEVEL_200 - 200)
+
+    /* ngx_null_string, */  /* "300 Multiple Choices" */
+
+    ngx_string("301 Moved Permanently"),
+    ngx_string("302 Moved Temporarily"),
+    ngx_string("303 See Other"),
+    ngx_string("304 Not Modified"),
+    ngx_null_string,  /* "305 Use Proxy" */
+    ngx_null_string,  /* "306 unused" */
+    ngx_string("307 Temporary Redirect"),
+    ngx_string("308 Permanent Redirect"),
+
+#define NGX_HTTP_LAST_LEVEL_300  309
+#define NGX_HTTP_LEVEL_300       (NGX_HTTP_LAST_LEVEL_300 - 301)
+
+    ngx_string("400 Bad Request"),
+    ngx_string("401 Unauthorized"),
+    ngx_string("402 Payment Required"),
+    ngx_string("403 Forbidden"),
+    ngx_string("404 Not Found"),
+    ngx_string("405 Not Allowed"),
+    ngx_string("406 Not Acceptable"),
+    ngx_null_string,  /* "407 Proxy Authentication Required" */
+    ngx_string("408 Request Time-out"),
+    ngx_string("409 Conflict"),
+    ngx_string("410 Gone"),
+    ngx_string("411 Length Required"),
+    ngx_string("412 Precondition Failed"),
+    ngx_string("413 Request Entity Too Large"),
+    ngx_null_string,  /* "414 Request-URI Too Large", but we never send it
+                       * because we treat such requests as the HTTP/0.9
+                       * requests and send only a body without a header
+                       */
+    ngx_string("415 Unsupported Media Type"),
+    ngx_string("416 Requested Range Not Satisfiable"),
+
+    /* ngx_null_string, */  /* "417 Expectation Failed" */
+    /* ngx_null_string, */  /* "418 unused" */
+    /* ngx_null_string, */  /* "419 unused" */
+    /* ngx_null_string, */  /* "420 unused" */
+    /* ngx_null_string, */  /* "421 unused" */
+    /* ngx_null_string, */  /* "422 Unprocessable Entity" */
+    /* ngx_null_string, */  /* "423 Locked" */
+    /* ngx_null_string, */  /* "424 Failed Dependency" */
+
+#define NGX_HTTP_LAST_LEVEL_400  417
+#define NGX_HTTP_LEVEL_400       (NGX_HTTP_LAST_LEVEL_400 - 400)
+
+    ngx_string("500 Internal Server Error"),
+    ngx_string("501 Method Not Implemented"),
+    ngx_string("502 Bad Gateway"),
+    ngx_string("503 Service Temporarily Unavailable"),
+    ngx_string("504 Gateway Time-out"),
+
+    ngx_null_string,        /* "505 HTTP Version Not Supported" */
+    ngx_null_string,        /* "506 Variant Also Negotiates" */
+    ngx_string("507 Insufficient Storage"),
+    /* ngx_null_string, */  /* "508 unused" */
+    /* ngx_null_string, */  /* "509 unused" */
+    /* ngx_null_string, */  /* "510 Not Extended" */
+
+#define NGX_HTTP_LAST_LEVEL_500  508
+
+};
+
+
+ngx_str_t  ngx_http_srcache_content_length_header_key =
+        ngx_string("Content-Length");
+ngx_str_t  ngx_http_srcache_get_method =
+        ngx_http_srcache_method_name("GET");
+ngx_str_t  ngx_http_srcache_put_method =
+        ngx_http_srcache_method_name("PUT");
+ngx_str_t  ngx_http_srcache_post_method =
+        ngx_http_srcache_method_name("POST");
+ngx_str_t  ngx_http_srcache_head_method =
+        ngx_http_srcache_method_name("HEAD");
+ngx_str_t  ngx_http_srcache_copy_method =
+        ngx_http_srcache_method_name("COPY");
+ngx_str_t  ngx_http_srcache_move_method =
+        ngx_http_srcache_method_name("MOVE");
+ngx_str_t  ngx_http_srcache_lock_method =
+        ngx_http_srcache_method_name("LOCK");
+ngx_str_t  ngx_http_srcache_mkcol_method =
+        ngx_http_srcache_method_name("MKCOL");
+ngx_str_t  ngx_http_srcache_trace_method =
+        ngx_http_srcache_method_name("TRACE");
+ngx_str_t  ngx_http_srcache_delete_method =
+        ngx_http_srcache_method_name("DELETE");
+ngx_str_t  ngx_http_srcache_unlock_method =
+        ngx_http_srcache_method_name("UNLOCK");
+ngx_str_t  ngx_http_srcache_options_method =
+        ngx_http_srcache_method_name("OPTIONS");
+ngx_str_t  ngx_http_srcache_propfind_method =
+        ngx_http_srcache_method_name("PROPFIND");
+ngx_str_t  ngx_http_srcache_proppatch_method =
+        ngx_http_srcache_method_name("PROPPATCH");
+
+
+void
+ngx_http_srcache_discard_bufs(ngx_pool_t *pool, ngx_chain_t *in)
+{
+    ngx_chain_t         *cl;
+
+    for (cl = in; cl; cl = cl->next) {
+        cl->buf->pos = cl->buf->last;
+    }
+}
+
+
+ngx_int_t
+ngx_http_srcache_parse_method_name(ngx_str_t **method_name_ptr)
+{
+    const ngx_str_t         *method_name = *method_name_ptr;
+
+    switch (method_name->len) {
+
+    case 3:
+        if (ngx_http_srcache_strcmp_const(method_name->data, "GET") == 0) {
+            *method_name_ptr = &ngx_http_srcache_get_method;
+            return NGX_HTTP_GET;
+        }
+
+        if (ngx_http_srcache_strcmp_const(method_name->data, "PUT") == 0) {
+            *method_name_ptr = &ngx_http_srcache_put_method;
+            return NGX_HTTP_PUT;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 4:
+        if (ngx_http_srcache_strcmp_const(method_name->data, "POST") == 0) {
+            *method_name_ptr = &ngx_http_srcache_post_method;
+            return NGX_HTTP_POST;
+        }
+
+        if (ngx_http_srcache_strcmp_const(method_name->data, "HEAD") == 0) {
+            *method_name_ptr = &ngx_http_srcache_head_method;
+            return NGX_HTTP_HEAD;
+        }
+
+        if (ngx_http_srcache_strcmp_const(method_name->data, "COPY") == 0) {
+            *method_name_ptr = &ngx_http_srcache_copy_method;
+            return NGX_HTTP_COPY;
+        }
+
+        if (ngx_http_srcache_strcmp_const(method_name->data, "MOVE") == 0) {
+            *method_name_ptr = &ngx_http_srcache_move_method;
+            return NGX_HTTP_MOVE;
+        }
+
+        if (ngx_http_srcache_strcmp_const(method_name->data, "LOCK") == 0) {
+            *method_name_ptr = &ngx_http_srcache_lock_method;
+            return NGX_HTTP_LOCK;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 5:
+        if (ngx_http_srcache_strcmp_const(method_name->data, "MKCOL") == 0) {
+            *method_name_ptr = &ngx_http_srcache_mkcol_method;
+            return NGX_HTTP_MKCOL;
+        }
+
+        if (ngx_http_srcache_strcmp_const(method_name->data, "TRACE") == 0) {
+            *method_name_ptr = &ngx_http_srcache_trace_method;
+            return NGX_HTTP_TRACE;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 6:
+        if (ngx_http_srcache_strcmp_const(method_name->data, "DELETE") == 0) {
+            *method_name_ptr = &ngx_http_srcache_delete_method;
+            return NGX_HTTP_DELETE;
+        }
+
+        if (ngx_http_srcache_strcmp_const(method_name->data, "UNLOCK") == 0) {
+            *method_name_ptr = &ngx_http_srcache_unlock_method;
+            return NGX_HTTP_UNLOCK;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 7:
+        if (ngx_http_srcache_strcmp_const(method_name->data, "OPTIONS") == 0) {
+            *method_name_ptr = &ngx_http_srcache_options_method;
+            return NGX_HTTP_OPTIONS;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 8:
+        if (ngx_http_srcache_strcmp_const(method_name->data, "PROPFIND") == 0) {
+            *method_name_ptr = &ngx_http_srcache_propfind_method;
+            return NGX_HTTP_PROPFIND;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    case 9:
+        if (ngx_http_srcache_strcmp_const(method_name->data, "PROPPATCH")
+            == 0)
+        {
+            *method_name_ptr = &ngx_http_srcache_proppatch_method;
+            return NGX_HTTP_PROPPATCH;
+        }
+
+        return NGX_HTTP_UNKNOWN;
+
+    default:
+        return NGX_HTTP_UNKNOWN;
+    }
+
+    return NGX_HTTP_UNKNOWN;
+}
+
+
+ngx_int_t
+ngx_http_srcache_adjust_subrequest(ngx_http_request_t *sr,
+    ngx_http_srcache_parsed_request_t *parsed_sr)
+{
+    ngx_http_core_main_conf_t  *cmcf;
+    ngx_http_request_t         *r;
+    ngx_http_request_body_t    *body;
+    ngx_int_t                   rc;
+
+    sr->method      = parsed_sr->method;
+    sr->method_name = parsed_sr->method_name;
+
+    r = sr->parent;
+
+    dd("subrequest method: %d %.*s", (int) sr->method,
+       (int) sr->method_name.len, sr->method_name.data);
+
+    sr->header_in = r->header_in;
+
+#if 1
+    /* XXX work-around a bug in ngx_http_subrequest */
+    if (r->headers_in.headers.last == &r->headers_in.headers.part) {
+        sr->headers_in.headers.last = &sr->headers_in.headers.part;
+    }
+#endif
+
+    /* we do not inherit the parent request's variables */
+    cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
+    sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts
+                                * sizeof(ngx_http_variable_value_t));
+
+    if (sr->variables == NULL) {
+        return NGX_ERROR;
+    }
+
+    body = parsed_sr->request_body;
+    if (body) {
+        sr->request_body = body;
+
+        rc = ngx_http_srcache_set_content_length_header(sr,
+                                                 parsed_sr->content_length_n);
+
+        if (rc != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_srcache_add_copy_chain(ngx_pool_t *pool, ngx_chain_t **chain,
+    ngx_chain_t *in, unsigned *plast)
+{
+    ngx_chain_t     *cl, **ll;
+    size_t           len;
+
+    ll = chain;
+
+    for (cl = *chain; cl; cl = cl->next) {
+        ll = &cl->next;
+    }
+
+    *plast = 0;
+
+    while (in) {
+        cl = ngx_alloc_chain_link(pool);
+        if (cl == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (in->buf->last_buf || in->buf->last_in_chain) {
+            *plast = 1;
+        }
+
+        if (ngx_buf_special(in->buf)) {
+            cl->buf = in->buf;
+
+        } else {
+            if (ngx_buf_in_memory(in->buf)) {
+                len = ngx_buf_size(in->buf);
+                cl->buf = ngx_create_temp_buf(pool, len);
+                if (cl->buf == NULL) {
+                    return NGX_ERROR;
+                }
+
+                dd("buf: %.*s", (int) len, in->buf->pos);
+
+                cl->buf->last = ngx_copy(cl->buf->pos, in->buf->pos, len);
+
+            } else {
+                return NGX_ERROR;
+            }
+        }
+
+        *ll = cl;
+        ll = &cl->next;
+        in = in->next;
+    }
+
+    *ll = NULL;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_srcache_post_request_at_head(ngx_http_request_t *r,
+    ngx_http_posted_request_t *pr)
+{
+    dd_enter();
+
+    if (pr == NULL) {
+        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;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_set_content_length_header(ngx_http_request_t *r, off_t len)
+{
+    ngx_table_elt_t                 *h, *header;
+    u_char                          *p;
+    ngx_list_part_t                 *part;
+    ngx_http_request_t              *pr;
+    ngx_uint_t                       i;
+
+    r->headers_in.content_length_n = len;
+
+    if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
+                      sizeof(ngx_table_elt_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    h = ngx_list_push(&r->headers_in.headers);
+    if (h == NULL) {
+        return NGX_ERROR;
+    }
+
+    h->key = ngx_http_srcache_content_length_header_key;
+    h->lowcase_key = ngx_pnalloc(r->pool, h->key.len);
+    if (h->lowcase_key == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
+
+    r->headers_in.content_length = h;
+
+    p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    h->value.data = p;
+
+    h->value.len = ngx_sprintf(h->value.data, "%O", len) - h->value.data;
+
+    h->hash = ngx_hash(ngx_hash(ngx_hash(ngx_hash(ngx_hash(ngx_hash(ngx_hash(
+            ngx_hash(ngx_hash(ngx_hash(ngx_hash(ngx_hash(
+            ngx_hash('c', 'o'), 'n'), 't'), 'e'), 'n'), 't'), '-'), 'l'), 'e'),
+            'n'), 'g'), 't'), 'h');
+
+    dd("r content length: %.*s",
+       (int) r->headers_in.content_length->value.len,
+       r->headers_in.content_length->value.data);
+
+    pr = r->parent;
+
+    if (pr == NULL) {
+        return NGX_OK;
+    }
+
+    /* forward the parent request's all other request headers */
+
+    part = &pr->headers_in.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].key.len == sizeof("Content-Length") - 1
+            && ngx_strncasecmp(header[i].key.data,
+                               (u_char *) "Content-Length",
+                               sizeof("Content-Length") - 1) == 0)
+        {
+            continue;
+        }
+
+        h = ngx_list_push(&r->headers_in.headers);
+        if (h == NULL) {
+            return NGX_ERROR;
+        }
+
+        *h = header[i];
+    }
+
+    /* XXX maybe we should set those built-in header slot in
+     * ngx_http_headers_in_t too? */
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_srcache_request_no_cache(ngx_http_request_t *r, unsigned *no_store)
+{
+    ngx_table_elt_t                 *h;
+    ngx_list_part_t                 *part;
+    u_char                          *p;
+    u_char                          *last;
+    ngx_uint_t                       i;
+    unsigned                         no_cache;
+
+    part = &r->headers_in.headers.part;
+    h = part->elts;
+
+    *no_store = 0;
+    no_cache = 0;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            h = part->elts;
+            i = 0;
+        }
+
+        if (h[i].key.len == sizeof("Cache-Control") - 1
+            && ngx_strncasecmp(h[i].key.data, (u_char *) "Cache-Control",
+                               sizeof("Cache-Control") - 1) == 0)
+        {
+            p = h[i].value.data;
+            last = p + h[i].value.len;
+
+            if (!*no_store
+                && ngx_strlcasestrn(p, last, (u_char *) "no-store", 8 - 1)
+                   != NULL)
+            {
+                *no_store = 1;
+            }
+
+            if (ngx_strlcasestrn(p, last, (u_char *) "no-cache", 8 - 1) != NULL)
+            {
+                no_cache = 1;
+            }
+
+            continue;
+        }
+
+        if (h[i].key.len == sizeof("Pragma") - 1
+            && ngx_strncasecmp(h[i].key.data, (u_char *) "Pragma",
+                               sizeof("Pragma") - 1) == 0)
+        {
+            p = h[i].value.data;
+            last = p + h[i].value.len;
+
+            if (ngx_strlcasestrn(p, last, (u_char *) "no-cache", 8 - 1) != NULL)
+            {
+                no_cache = 1;
+            }
+        }
+    }
+
+    return no_cache ? NGX_OK : NGX_DECLINED;
+}
+
+
+ngx_int_t
+ngx_http_srcache_response_no_cache(ngx_http_request_t *r,
+    ngx_http_srcache_loc_conf_t *conf, ngx_http_srcache_ctx_t *ctx)
+{
+    ngx_table_elt_t    *h;
+#if defined(nginx_version) && nginx_version >= 1023000
+    ngx_table_elt_t    *cc;
+#else
+    ngx_table_elt_t   **ccp;
+    ngx_uint_t          i;
+#endif
+    u_char             *p, *last;
+    ngx_int_t           n;
+    time_t              expires;
+
+    dd("checking response cache control settings");
+
+#if defined(nginx_version) && nginx_version >= 1023000
+    cc = r->headers_out.cache_control;
+
+    if (cc == NULL) {
+        goto check_expires;
+    }
+
+    for (; cc; cc = cc->next) {
+        if (!cc->hash) {
+            continue;
+        }
+
+        p = cc->value.data;
+        last = p + cc->value.len;
+#else
+    ccp = r->headers_out.cache_control.elts;
+
+    if (ccp == NULL) {
+        goto check_expires;
+    }
+
+    for (i = 0; i < r->headers_out.cache_control.nelts; i++) {
+        if (!ccp[i]->hash) {
+            continue;
+        }
+
+        p = ccp[i]->value.data;
+        last = p + ccp[i]->value.len;
+#endif
+
+        if (!conf->store_private
+            && ngx_strlcasestrn(p, last, (u_char *) "private", 7 - 1) != NULL)
+        {
+            return NGX_OK;
+        }
+
+        if (!conf->store_no_store
+            && ngx_strlcasestrn(p, last, (u_char *) "no-store", 8 - 1) != NULL)
+        {
+            return NGX_OK;
+        }
+
+        if (!conf->store_no_cache
+            && ngx_strlcasestrn(p, last, (u_char *) "no-cache", 8 - 1) != NULL)
+        {
+            return NGX_OK;
+        }
+
+        if (ctx->valid_sec != 0) {
+            continue;
+        }
+
+        p = ngx_strlcasestrn(p, last, (u_char *) "max-age=", 8 - 1);
+
+        if (p == NULL) {
+            continue;
+        }
+
+        n = 0;
+
+        for (p += 8; p < last; p++) {
+            if (*p == ',' || *p == ';' || *p == ' ') {
+                break;
+            }
+
+            if (*p >= '0' && *p <= '9') {
+                n = n * 10 + *p - '0';
+                continue;
+            }
+
+            return NGX_OK;
+        }
+
+        if (n == 0) {
+            return NGX_OK;
+        }
+
+        ctx->valid_sec = ngx_time() + n;
+    }
+
+check_expires:
+
+    dd("valid_sec after processing cache-control: %d", (int) ctx->valid_sec);
+
+    if (ctx->valid_sec == 0) {
+        h = r->headers_out.expires;
+
+        dd("expires header: %p", h);
+
+        if (h != NULL && h->hash != 0) {
+            expires = ngx_http_parse_time(h->value.data, h->value.len);
+
+            if (expires == NGX_ERROR || expires <= ngx_time()) {
+                return NGX_OK;
+            }
+
+            ctx->valid_sec = expires;
+        }
+    }
+
+    return NGX_DECLINED;
+}
+
+
+ngx_int_t
+ngx_http_srcache_process_status_line(ngx_http_request_t *r, ngx_buf_t *b)
+{
+    ngx_int_t                    rc;
+    ngx_http_srcache_ctx_t      *ctx;
+    ngx_http_request_t          *pr;
+    ngx_http_srcache_loc_conf_t *conf;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
+
+    rc = ngx_http_parse_status_line(r, b, &ctx->status);
+
+    if (rc == NGX_AGAIN) {
+        return NGX_AGAIN;
+    }
+
+    if (rc == NGX_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "srcache_fetch: cache sent invalid status line");
+        return NGX_ERROR;
+    }
+
+    /* rc == NGX_OK */
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "srcache_fetch status line done");
+
+    pr = r->parent;
+    pr->headers_out.status = ctx->status.code;
+
+    ctx->process_header = ngx_http_srcache_process_header;
+
+    conf = ngx_http_get_module_loc_conf(pr, ngx_http_srcache_filter_module);
+
+    dd("header buffer size: %d", (int) conf->header_buf_size);
+
+    ctx->header_buf = ngx_create_temp_buf(r->pool, conf->header_buf_size);
+    if (ctx->header_buf == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (b->pos == b->last) {
+        return NGX_AGAIN;
+    }
+
+    return ngx_http_srcache_process_header(r, b);
+}
+
+
+ngx_int_t
+ngx_http_srcache_process_header(ngx_http_request_t *r, ngx_buf_t *b)
+{
+    ngx_int_t                       rc;
+    ngx_table_elt_t                 header;
+    ngx_http_srcache_ctx_t         *ctx;
+    off_t                           len, rest;
+    unsigned                        truncate;
+    u_char                         *p;
+    ngx_http_srcache_header_t      *hh;
+    ngx_http_srcache_main_conf_t   *smcf;
+
+    smcf = ngx_http_get_module_main_conf(r, ngx_http_srcache_filter_module);
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
+
+    for ( ;; ) {
+
+        len = b->last - b->pos;
+        rest = ctx->header_buf->end - ctx->header_buf->last;
+
+        dd("len: %d, rest: %d", (int) len, (int) rest);
+
+        if (len > rest) {
+            len = rest;
+            truncate = 1;
+
+        } else {
+            truncate = 0;
+        }
+
+        ctx->header_buf->last = ngx_copy(ctx->header_buf->last, b->pos,
+                                         (size_t) len);
+
+        p = ctx->header_buf->pos;
+
+        rc = ngx_http_parse_header_line(r, ctx->header_buf, 1);
+
+        b->pos += ctx->header_buf->pos - p;
+
+        if (rc == NGX_OK) {
+
+            /* a header line has been parsed successfully */
+
+            ngx_memzero(&header, sizeof(ngx_table_elt_t));
+
+            header.hash = r->header_hash;
+
+            header.key.len = r->header_name_end - r->header_name_start;
+            header.value.len = r->header_end - r->header_start;
+
+            header.key.data = ngx_pnalloc(r->pool,
+                                          header.key.len + 1
+                                          + header.value.len + 1
+                                          + header.key.len);
+
+            if (header.key.data == NULL) {
+                return NGX_ERROR;
+            }
+
+            header.value.data = header.key.data + header.key.len + 1;
+            header.lowcase_key = header.key.data + header.key.len + 1
+                                 + header.value.len + 1;
+
+            ngx_cpystrn(header.key.data, r->header_name_start,
+                        header.key.len + 1);
+
+            ngx_cpystrn(header.value.data, r->header_start,
+                        header.value.len + 1);
+
+            if (header.key.len == r->lowcase_index) {
+                ngx_memcpy(header.lowcase_key, r->lowcase_header,
+                           header.key.len);
+
+            } else {
+                ngx_strlow(header.lowcase_key, header.key.data, header.key.len);
+            }
+
+            hh = ngx_hash_find(&smcf->headers_in_hash, header.hash,
+                               header.lowcase_key, header.key.len);
+
+            if (hh) {
+                if (hh->handler(r->parent, &header, hh->offset) != NGX_OK) {
+                    return NGX_ERROR;
+                }
+
+            } else {
+
+                if (ngx_http_srcache_process_header_line(r->parent, &header, 0)
+                    != NGX_OK)
+                {
+                    return NGX_ERROR;
+                }
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "srcache_fetch header: \"%V: %V\"",
+                           &header.key, &header.value);
+
+            ctx->header_buf->pos = ctx->header_buf->start;
+            ctx->header_buf->last = ctx->header_buf->start;
+
+            continue;
+        }
+
+        if (rc == NGX_HTTP_PARSE_HEADER_DONE) {
+
+            /* a whole header has been parsed successfully */
+
+            ctx->header_buf->pos = ctx->header_buf->start;
+            ctx->header_buf->last = ctx->header_buf->start;
+            ngx_pfree(r->pool, ctx->header_buf->start);
+
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "srcache_fetch header done");
+
+            return NGX_OK;
+        }
+
+        if (rc == NGX_AGAIN) {
+            if (truncate) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "srcache_fetch: header buffer overflown "
+                              "(maybe you should consider increasing "
+                              "srcache_header_buffer_size?)");
+
+                ctx->header_buf->pos = ctx->header_buf->start;
+                ctx->header_buf->last = ctx->header_buf->start;
+                ngx_pfree(r->pool, ctx->header_buf->start);
+
+                return NGX_ERROR;
+            }
+
+            return NGX_AGAIN;
+        }
+
+        /* there was error while a header line parsing */
+
+        ctx->header_buf->pos = ctx->header_buf->start;
+        ctx->header_buf->last = ctx->header_buf->start;
+        ngx_pfree(r->pool, ctx->header_buf->start);
+
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "srcache_fetch: cache sent invalid header");
+
+        return NGX_ERROR;
+    }
+}
+
+
+ngx_int_t
+ngx_http_srcache_store_response_header(ngx_http_request_t *r,
+    ngx_http_srcache_ctx_t *ctx)
+{
+    ngx_chain_t             *cl;
+    size_t                   len;
+    ngx_buf_t               *b;
+    ngx_uint_t               status;
+    ngx_uint_t               i;
+    ngx_str_t               *status_line;
+    ngx_list_part_t         *part;
+    ngx_table_elt_t         *header;
+
+    u_char                   buf[sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1];
+
+    ngx_http_srcache_loc_conf_t    *conf;
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_srcache_filter_module);
+
+    dd("request: %p, uri: %.*s", r, (int) r->uri.len, r->uri.data);
+
+    len = sizeof("HTTP/1.x ") - 1 + sizeof(CRLF) - 1
+          /* the end of the header */
+          + sizeof(CRLF) - 1;
+
+    if (r->headers_out.status_line.len) {
+        dd("status line defined");
+        len += r->headers_out.status_line.len;
+        status_line = &r->headers_out.status_line;
+        status = 0;
+
+    } else {
+        dd("status line not defined");
+
+        status = r->headers_out.status;
+
+        if (status >= NGX_HTTP_OK
+            && status < NGX_HTTP_LAST_LEVEL_200)
+        {
+            /* 2XX */
+
+            status -= NGX_HTTP_OK;
+            dd("status: %d", (int) status);
+            status_line = &ngx_http_status_lines[status];
+            len += ngx_http_status_lines[status].len;
+
+        } else if (status >= NGX_HTTP_MOVED_PERMANENTLY
+                   && status < NGX_HTTP_LAST_LEVEL_300)
+        {
+            /* 3XX */
+
+            if (status == NGX_HTTP_NOT_MODIFIED) {
+                r->header_only = 1;
+            }
+
+            status = status - NGX_HTTP_MOVED_PERMANENTLY + NGX_HTTP_LEVEL_200;
+            status_line = &ngx_http_status_lines[status];
+            len += ngx_http_status_lines[status].len;
+
+        } else if (status >= NGX_HTTP_BAD_REQUEST
+                   && status < NGX_HTTP_LAST_LEVEL_400)
+        {
+            /* 4XX */
+            status = status - NGX_HTTP_BAD_REQUEST
+                            + NGX_HTTP_LEVEL_200
+                            + NGX_HTTP_LEVEL_300;
+
+            status_line = &ngx_http_status_lines[status];
+            len += ngx_http_status_lines[status].len;
+
+        } else if (status >= NGX_HTTP_INTERNAL_SERVER_ERROR
+                   && status < NGX_HTTP_LAST_LEVEL_500)
+        {
+            /* 5XX */
+            status = status - NGX_HTTP_INTERNAL_SERVER_ERROR
+                            + NGX_HTTP_LEVEL_200
+                            + NGX_HTTP_LEVEL_300
+                            + NGX_HTTP_LEVEL_400;
+
+            status_line = &ngx_http_status_lines[status];
+            len += ngx_http_status_lines[status].len;
+
+        } else {
+            len += NGX_INT_T_LEN;
+            status_line = NULL;
+        }
+    }
+
+    if (!conf->hide_content_type && r->headers_out.content_type.len) {
+        len += sizeof("Content-Type: ") - 1
+               + r->headers_out.content_type.len + 2;
+
+        if (r->headers_out.content_type_len == r->headers_out.content_type.len
+            && r->headers_out.charset.len)
+        {
+            len += sizeof("; charset=") - 1 + r->headers_out.charset.len;
+        }
+    }
+
+    if (!conf->hide_last_modified) {
+        if (r->headers_out.last_modified_time != -1) {
+            if (r->headers_out.status != NGX_HTTP_OK
+                && r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT
+                && r->headers_out.status != NGX_HTTP_NOT_MODIFIED
+                && r->headers_out.status != NGX_HTTP_NO_CONTENT)
+            {
+                r->headers_out.last_modified_time = -1;
+                r->headers_out.last_modified = NULL;
+            }
+        }
+
+        dd("last modified time: %d", (int) r->headers_out.last_modified_time);
+
+        if (r->headers_out.last_modified == NULL
+            && r->headers_out.last_modified_time != -1)
+        {
+            (void) ngx_http_time(buf, r->headers_out.last_modified_time);
+
+            len += sizeof("Last-Modified: ") - 1 + sizeof(buf) + 2;
+        }
+    }
+
+    if (r->allow_ranges) {
+        len += sizeof("X-SRCache-Allow-Ranges: 1") - 1 + 2;
+    }
+
+    part = &r->headers_out.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        if (ngx_hash_find(&conf->hide_headers_hash, header[i].hash,
+                          header[i].lowcase_key, header[i].key.len))
+        {
+            continue;
+        }
+
+        len += header[i].key.len + sizeof(": ") - 1 + header[i].value.len
+               + sizeof(CRLF) - 1;
+    }
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    /* "HTTP/1.x " */
+    b->last = ngx_cpymem(b->last, "HTTP/1.1 ", sizeof("HTTP/1.x ") - 1);
+
+    /* status line */
+    if (status_line) {
+        b->last = ngx_copy(b->last, status_line->data, status_line->len);
+
+    } else {
+        b->last = ngx_sprintf(b->last, "%ui", status);
+    }
+    *b->last++ = CR; *b->last++ = LF;
+
+    if (!conf->hide_content_type && r->headers_out.content_type.len) {
+        b->last = ngx_cpymem(b->last, "Content-Type: ",
+                             sizeof("Content-Type: ") - 1);
+        b->last = ngx_copy(b->last, r->headers_out.content_type.data,
+                           r->headers_out.content_type.len);
+
+        if (r->headers_out.content_type_len == r->headers_out.content_type.len
+            && r->headers_out.charset.len)
+        {
+            b->last = ngx_cpymem(b->last, "; charset=",
+                                 sizeof("; charset=") - 1);
+            b->last = ngx_copy(b->last, r->headers_out.charset.data,
+                               r->headers_out.charset.len);
+        }
+
+        *b->last++ = CR; *b->last++ = LF;
+    }
+
+    if (!conf->hide_last_modified
+        && r->headers_out.last_modified == NULL
+        && r->headers_out.last_modified_time != -1)
+    {
+        b->last = ngx_cpymem(b->last, "Last-Modified: ",
+                             sizeof("Last-Modified: ") - 1);
+
+        b->last = ngx_cpymem(b->last, buf, sizeof(buf));
+
+        *b->last++ = CR; *b->last++ = LF;
+    }
+
+    if (r->allow_ranges) {
+        b->last = ngx_cpymem(b->last, "X-SRCache-Allow-Ranges: 1\r\n",
+                             sizeof("X-SRCache-Allow-Ranges: 1\r\n") - 1);
+    }
+
+    part = &r->headers_out.headers.part;
+    header = part->elts;
+
+    for (i = 0; /* void */; i++) {
+
+        if (i >= part->nelts) {
+            if (part->next == NULL) {
+                break;
+            }
+
+            part = part->next;
+            header = part->elts;
+            i = 0;
+        }
+
+        if (header[i].hash == 0) {
+            continue;
+        }
+
+        dd("header hash: %lu, hash lc: %lu", (unsigned long) header[i].hash,
+           (unsigned long) ngx_hash_key_lc(header[i].key.data,
+                                           header[i].key.len));
+
+        if (ngx_hash_find(&conf->hide_headers_hash, header[i].hash,
+                          header[i].lowcase_key, header[i].key.len))
+        {
+            dd("skipped header key: %.*s", (int) header[i].key.len,
+               header[i].key.data);
+            continue;
+        }
+
+        dd("header not skipped");
+
+        b->last = ngx_copy(b->last, header[i].key.data, header[i].key.len);
+        *b->last++ = ':'; *b->last++ = ' ';
+
+        b->last = ngx_copy(b->last, header[i].value.data, header[i].value.len);
+        *b->last++ = CR; *b->last++ = LF;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "srcache store header %*s", (size_t) (b->last - b->pos),
+                   b->pos);
+
+    /* the end of HTTP header */
+    *b->last++ = CR; *b->last++ = LF;
+
+    if (b->last != b->end) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "srcache_fetch: buffer error when serializing the "
+                      "response header: %O left", (off_t) (b->last - b->end));
+
+        return NGX_ERROR;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    ctx->body_to_cache = cl;
+
+    ctx->response_length += len;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_srcache_hide_headers_hash(ngx_conf_t *cf,
+    ngx_http_srcache_loc_conf_t *conf, ngx_http_srcache_loc_conf_t *prev,
+    ngx_str_t *default_hide_headers, ngx_hash_init_t *hash)
+{
+    ngx_str_t       *h;
+    ngx_uint_t       i, j;
+    ngx_array_t      hide_headers;
+    ngx_hash_key_t  *hk;
+
+    if (conf->hide_headers == NGX_CONF_UNSET_PTR
+        && conf->pass_headers == NGX_CONF_UNSET_PTR)
+    {
+        conf->hide_headers_hash = prev->hide_headers_hash;
+
+        if (conf->hide_headers_hash.buckets) {
+            return NGX_OK;
+        }
+
+        conf->hide_headers = prev->hide_headers;
+        conf->pass_headers = prev->pass_headers;
+        conf->hide_content_type = prev->hide_content_type;
+        conf->hide_last_modified = prev->hide_last_modified;
+
+    } else {
+        if (conf->hide_headers == NGX_CONF_UNSET_PTR) {
+            conf->hide_headers = prev->hide_headers;
+        }
+
+        if (conf->pass_headers == NGX_CONF_UNSET_PTR) {
+            conf->pass_headers = prev->pass_headers;
+        }
+    }
+
+    dd("init hide headers");
+
+    if (ngx_array_init(&hide_headers, cf->temp_pool, 4, sizeof(ngx_hash_key_t))
+        != NGX_OK)
+    {
+        return NGX_ERROR;
+    }
+
+    for (h = default_hide_headers; h->len; h++) {
+        hk = ngx_array_push(&hide_headers);
+        if (hk == NULL) {
+            return NGX_ERROR;
+        }
+
+        hk->key = *h;
+        hk->key_hash = ngx_hash_key_lc(h->data, h->len);
+        hk->value = (void *) 1;
+    }
+
+    if (conf->hide_headers != NGX_CONF_UNSET_PTR) {
+        dd("hide headers not empty");
+
+        h = conf->hide_headers->elts;
+
+        for (i = 0; i < conf->hide_headers->nelts; i++) {
+
+            hk = hide_headers.elts;
+
+            for (j = 0; j < hide_headers.nelts; j++) {
+                if (ngx_strcasecmp(h[i].data, hk[j].key.data) == 0) {
+                    goto exist;
+                }
+            }
+
+            hk = ngx_array_push(&hide_headers);
+            if (hk == NULL) {
+                return NGX_ERROR;
+            }
+
+            hk->key = h[i];
+            hk->key_hash = ngx_hash_key_lc(h[i].data, h[i].len);
+            hk->value = (void *) 1;
+
+            if (h[i].len == sizeof("Last-Modified") - 1
+                && ngx_strncasecmp(h[i].data, (u_char *) "Last-Modified",
+                                   sizeof("Last-Modified") - 1)
+                == 0)
+            {
+                conf->hide_last_modified = 1;
+            }
+
+            if (h[i].len == sizeof("Content-Type") - 1
+                && ngx_strncasecmp(h[i].data, (u_char *) "Content-Type",
+                                   sizeof("Content-Type") - 1) == 0)
+            {
+                conf->hide_content_type = 1;
+            }
+
+            dd("adding header to hide headers: %.*s", (int) h[i].len,
+               h[i].data);
+
+        exist:
+
+            continue;
+        }
+    }
+
+    if (conf->pass_headers != NGX_CONF_UNSET_PTR) {
+
+        h = conf->pass_headers->elts;
+        hk = hide_headers.elts;
+
+        for (i = 0; i < conf->pass_headers->nelts; i++) {
+            for (j = 0; j < hide_headers.nelts; j++) {
+
+                if (hk[j].key.data == NULL) {
+                    continue;
+                }
+
+                if (h[i].len == sizeof("Content-Type") - 1
+                    && ngx_strncasecmp(h[i].data, (u_char *) "Content-Type",
+                                       sizeof("Content-Type") - 1) == 0)
+                {
+                    conf->hide_content_type = 0;
+                }
+
+                if (h[i].len == sizeof("Last-Modified") - 1
+                    && ngx_strncasecmp(h[i].data, (u_char *) "Last-Modified",
+                                       sizeof("Last-Modified") - 1) == 0)
+                {
+                    conf->hide_last_modified = 0;
+                }
+
+                if (ngx_strcasecmp(h[i].data, hk[j].key.data) == 0) {
+                    hk[j].key.data = NULL;
+                    break;
+                }
+            }
+        }
+    }
+
+    hash->hash = &conf->hide_headers_hash;
+    hash->key = ngx_hash_key_lc;
+    hash->pool = cf->pool;
+    hash->temp_pool = NULL;
+
+    return ngx_hash_init(hash, hide_headers.elts, hide_headers.nelts);
+}
+
+
+ngx_int_t
+ngx_http_srcache_cmp_int(const void *one, const void *two)
+{
+    const ngx_int_t           *a = one;
+    const ngx_int_t           *b = two;
+
+    return (*a < *b);
+}
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.h b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.h
new file mode 100644
index 0000000..d9650d5
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_util.h
@@ -0,0 +1,61 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_SRCACHE_UTIL_H_INCLUDED_
+#define _NGX_HTTP_SRCACHE_UTIL_H_INCLUDED_
+
+#include "ngx_http_srcache_filter_module.h"
+
+
+#define ngx_http_srcache_method_name(m) { sizeof(m) - 1, (u_char *) m " " }
+
+#define ngx_http_srcache_strcmp_const(a, b)                                  \
+        ngx_strncmp(a, b, sizeof(b) - 1)
+
+extern ngx_str_t  ngx_http_srcache_content_length_header_key;
+
+extern ngx_str_t  ngx_http_srcache_get_method;
+extern ngx_str_t  ngx_http_srcache_put_method;
+extern ngx_str_t  ngx_http_srcache_post_method;
+extern ngx_str_t  ngx_http_srcache_head_method;
+extern ngx_str_t  ngx_http_srcache_copy_method;
+extern ngx_str_t  ngx_http_srcache_move_method;
+extern ngx_str_t  ngx_http_srcache_lock_method;
+extern ngx_str_t  ngx_http_srcache_mkcol_method;
+extern ngx_str_t  ngx_http_srcache_trace_method;
+extern ngx_str_t  ngx_http_srcache_delete_method;
+extern ngx_str_t  ngx_http_srcache_unlock_method;
+extern ngx_str_t  ngx_http_srcache_options_method;
+extern ngx_str_t  ngx_http_srcache_propfind_method;
+extern ngx_str_t  ngx_http_srcache_proppatch_method;
+
+ngx_int_t ngx_http_srcache_parse_method_name(ngx_str_t **method_name_ptr);
+void ngx_http_srcache_discard_bufs(ngx_pool_t *pool, ngx_chain_t *in);
+ngx_int_t ngx_http_srcache_adjust_subrequest(ngx_http_request_t *sr,
+        ngx_http_srcache_parsed_request_t *parsed_sr);
+ngx_int_t ngx_http_srcache_add_copy_chain(ngx_pool_t *pool,
+        ngx_chain_t **chain, ngx_chain_t *in, unsigned *plast);
+ngx_int_t ngx_http_srcache_post_request_at_head(ngx_http_request_t *r,
+        ngx_http_posted_request_t *pr);
+ngx_int_t ngx_http_srcache_request_no_cache(ngx_http_request_t *r,
+        unsigned *no_store);
+ngx_int_t ngx_http_srcache_response_no_cache(ngx_http_request_t *r,
+        ngx_http_srcache_loc_conf_t *conf, ngx_http_srcache_ctx_t *ctx);
+ngx_int_t ngx_http_srcache_process_status_line(ngx_http_request_t *r,
+        ngx_buf_t *b);
+ngx_int_t ngx_http_srcache_process_header(ngx_http_request_t *r,
+        ngx_buf_t *b);
+ngx_int_t ngx_http_srcache_store_response_header(ngx_http_request_t *r,
+        ngx_http_srcache_ctx_t *ctx);
+ngx_int_t ngx_http_srcache_hide_headers_hash(ngx_conf_t *cf,
+        ngx_http_srcache_loc_conf_t *conf, ngx_http_srcache_loc_conf_t *prev,
+        ngx_str_t *default_hide_headers, ngx_hash_init_t *hash);
+ngx_int_t ngx_http_srcache_cmp_int(const void *one, const void *two);
+
+
+#endif /* _NGX_HTTP_SRCACHE_UTIL_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.c b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.c
new file mode 100644
index 0000000..16b1f4f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.c
@@ -0,0 +1,180 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_srcache_var.h"
+
+
+static ngx_int_t ngx_http_srcache_expire_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_srcache_fetch_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_srcache_store_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data);
+
+
+static ngx_str_t  ngx_http_srcache_fetch_status[] = {
+    ngx_string("BYPASS"),
+    ngx_string("MISS"),
+    ngx_string("HIT")
+};
+
+
+static ngx_str_t  ngx_http_srcache_store_status[] = {
+    ngx_string("BYPASS"),
+    ngx_string("STORE"),
+};
+
+
+static ngx_http_variable_t ngx_http_srcache_variables[] = {
+
+    { ngx_string("srcache_expire"), NULL,
+      ngx_http_srcache_expire_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("srcache_fetch_status"), NULL,
+      ngx_http_srcache_fetch_status_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_string("srcache_store_status"), NULL,
+      ngx_http_srcache_store_status_variable, 0,
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
+static ngx_int_t
+ngx_http_srcache_expire_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_http_srcache_ctx_t       *ctx;
+    u_char                       *p;
+    time_t                        expire;
+    ngx_http_srcache_loc_conf_t  *conf;
+
+    conf = ngx_http_get_module_loc_conf(r, ngx_http_srcache_filter_module);
+
+    v->valid = 1;
+    v->no_cacheable = 1;
+    v->not_found = 0;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
+
+    if (!ctx || !ctx->store_response) {
+        v->not_found = 1;
+        return NGX_OK;
+    }
+
+    if (ctx->valid_sec == 0) {
+        expire = conf->default_expire;
+
+    } else {
+        expire = ctx->valid_sec - ngx_time();
+    }
+
+    if (conf->max_expire > 0 && expire > conf->max_expire) {
+        expire = conf->max_expire;
+    }
+
+    p = ngx_palloc(r->pool, NGX_TIME_T_LEN);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->data = p;
+    p =  ngx_sprintf(p, "%T", expire);
+    v->len = p - v->data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_fetch_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_uint_t                    status;
+    ngx_http_srcache_ctx_t       *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
+
+    if (ctx == NULL) {
+        status = NGX_HTTP_SRCACHE_FETCH_BYPASS;
+
+    } else if (ctx->from_cache) {
+        status = NGX_HTTP_SRCACHE_FETCH_HIT;
+
+    } else if (ctx->issued_fetch_subrequest) {
+        status = NGX_HTTP_SRCACHE_FETCH_MISS;
+
+    } else {
+        status = NGX_HTTP_SRCACHE_FETCH_BYPASS;
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 1;
+    v->not_found = 0;
+
+    v->len = ngx_http_srcache_fetch_status[status].len;
+    v->data = ngx_http_srcache_fetch_status[status].data;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_srcache_store_status_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    ngx_uint_t                    status;
+    ngx_http_srcache_ctx_t       *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
+
+    if (ctx && ctx->store_response) {
+        status = NGX_HTTP_SRCACHE_STORE_STORE;
+
+    } else {
+        status = NGX_HTTP_SRCACHE_STORE_BYPASS;
+
+    }
+
+    v->valid = 1;
+    v->no_cacheable = 1;
+    v->not_found = 0;
+
+    v->len = ngx_http_srcache_store_status[status].len;
+    v->data = ngx_http_srcache_store_status[status].data;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_srcache_add_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t *var, *v;
+
+    for (v = ngx_http_srcache_variables; v->name.len; v++) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+
+    return NGX_OK;
+}
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.h b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.h
new file mode 100644
index 0000000..151561d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/src/ngx_http_srcache_var.h
@@ -0,0 +1,19 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_SRCACHE_VAR_H_INCLUDED_
+#define _NGX_HTTP_SRCACHE_VAR_H_INCLUDED_
+
+
+#include "ngx_http_srcache_filter_module.h"
+
+
+ngx_int_t ngx_http_srcache_add_variables(ngx_conf_t *cf);
+
+
+#endif /* _NGX_HTTP_SRCACHE_VAR_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/000_init.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/000_init.t
new file mode 100644
index 0000000..b611e6c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/000_init.t
@@ -0,0 +1,158 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => repeat_each() * (2 * blocks());
+
+$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
+$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432;
+
+our $http_config = <<'_EOC_';
+    upstream database {
+        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+
+    upstream pg {
+        postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+
+_EOC_
+
+worker_connections(128);
+no_shuffle();
+run_tests();
+
+no_diff();
+
+__DATA__
+
+=== TEST 1: cats - drop table
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        drizzle_pass   database;
+        drizzle_query  "DROP TABLE IF EXISTS cats";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: cats - create table
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        drizzle_pass   database;
+        drizzle_query  "CREATE TABLE cats (id integer, name text)";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: cats - insert value
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        drizzle_pass   database;
+        drizzle_query  "INSERT INTO cats (id) VALUES (2)";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: cats - insert value
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        drizzle_pass   database;
+        drizzle_query  "INSERT INTO cats (id, name) VALUES (3, 'bob')";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: cats - drop table - pg
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        postgres_pass   pg;
+        postgres_query  "DROP TABLE IF EXISTS cats";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: cats - create table - pg
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        postgres_pass   pg;
+        postgres_query  "CREATE TABLE cats (id integer, name text)";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: cats - insert value - pg
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        postgres_pass   pg;
+        postgres_query  "INSERT INTO cats (id) VALUES (2)";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: cats - insert value - pg
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        postgres_pass   pg;
+        postgres_query  "INSERT INTO cats (id, name) VALUES (3, 'bob')";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+--- no_error_log
+[error]
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/access.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/access.t
new file mode 100644
index 0000000..d22c527
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/access.t
@@ -0,0 +1,84 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 3 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        #deny all;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        deny all;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 403 Forbidden
+--- error_code: 403
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/bugs.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/bugs.t
new file mode 100644
index 0000000..e7c046f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/bugs.t
@@ -0,0 +1,668 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (4 * blocks() + 4);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_long_string();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: basic fetch
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc;
+        srcache_store PUT /memc;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key 'foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo';
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+--- timeout: 15
+
+
+
+=== TEST 2: internal redirect in fetch subrequest
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+
+        echo hello;
+    }
+    location /fetch {
+        echo_exec /bar;
+    }
+    location /bar {
+        default_type 'text/css';
+        echo "HTTP/1.1 200 OK\r\nContent-Type: text/css\r\n\r\nbar";
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 4
+--- response_body
+bar
+
+
+
+=== TEST 3: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 4: internal redirect in main request (no caching happens) (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo_exec /bar;
+    }
+
+    location /bar {
+        default_type text/javascript;
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/javascript
+! Content-Length
+--- response_body
+hello
+
+
+
+=== TEST 5: internal redirect happends in the main request (cache miss as well)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        #srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+!Content-Length
+--- response_body
+world
+
+
+
+=== TEST 6: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 7: internal redirect in store subrequest
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_store GET /store;
+
+        echo blah;
+    }
+    location /store {
+        echo_exec /set-value;
+    }
+    location /set-value {
+        set $memc_key foo;
+        set $memc_value "HTTP/1.0 201 Created\r\nContent-Type: text/blah\r\n\r\nbar";
+        set $memc_cmd set;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+!Content-Length
+--- response_body
+blah
+
+
+
+=== TEST 8: internal redirect in store subrequest (check if value has been stored)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+
+        echo blah;
+    }
+    location /fetch {
+        set $memc_key foo;
+        set $memc_cmd get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/blah
+Content-Length: 3
+--- response_body chop
+bar
+--- error_code: 201
+
+
+
+=== TEST 9: skipped in subrequests
+--- config
+    location /sub {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+    }
+
+    location /main {
+        echo_location /sub;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 128.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_headers
+Content-Type: text/plain
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 10: multi-buffer response resulted in incorrect request length header
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_store POST /store;
+
+        echo hello;
+        echo world;
+    }
+
+    location /store {
+        content_by_lua '
+            ngx.log(ngx.WARN, "srcache_store: request Content-Length: ", ngx.var.http_content_length)
+            -- local body = ngx.req.get_body_data()
+            -- ngx.log(ngx.WARN, "srcache_store: request body len: ", #body)
+        ';
+    }
+--- request
+GET /foo
+--- response_headers
+!Content-Length
+--- response_body
+hello
+world
+--- error_log
+srcache_store: request Content-Length: 55
+
+
+
+=== TEST 11: read timed out when receiving upstream response body in srcache_fetch
+--- config
+    memc_read_timeout 200ms;
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+
+        srcache_fetch GET /memc $uri;
+        #srcache_store PUT /memc $uri;
+
+        echo I do like you;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key 'foo';
+        #set $memc_exptime 300;
+        memc_pass 127.0.0.1:19112; #$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- 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_srcache_fetch_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_like chop
+^finalize: -4
+conn err: 110: upstream timed out
+upstream fin req: error=0 eof=0 rc=504
+finalize: 0
+post subreq: rc=0, status=200
+finalize: 0$
+
+--- tcp_listen: 19112
+--- tcp_no_close
+--- tcp_reply eval
+"VALUE foo 0 1024\r\nHTTP/1.1 200 OK\r\n\r\nhello world"
+--- response_headers
+Content-Type: text/css
+--- response_body
+I do like you
+--- error_log
+upstream timed out
+
+
+
+=== TEST 12: exit(ngx.ERROR) in srcache_fetch
+--- config
+    memc_read_timeout 200ms;
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+
+        srcache_fetch GET /sub;
+        #srcache_store PUT /memc $uri;
+
+        echo I do like you;
+    }
+
+    location /sub {
+        content_by_lua '
+            ngx.exit(ngx.ERROR)
+        ';
+    }
+--- request
+GET /foo
+--- 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_srcache_fetch_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_headers
+Content-Type: text/css
+--- response_body
+I do like you
+--- no_error_log
+[error]
+
+
+
+=== TEST 13: exit(500) in srcache_fetch
+--- config
+    memc_read_timeout 200ms;
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+
+        srcache_fetch GET /sub;
+        #srcache_store PUT /memc $uri;
+
+        echo I do like you;
+    }
+
+    location /sub {
+        return 500;
+    }
+--- request
+GET /foo
+--- 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_srcache_fetch_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_headers
+Content-Type: text/css
+--- response_body
+I do like you
+--- no_error_log
+[error]
+
+
+
+=== TEST 14: upstream closes the connection prematurely in srcache_fetch
+--- config
+    memc_read_timeout 200ms;
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+
+        srcache_fetch GET /memc $uri;
+        #srcache_store PUT /memc $uri;
+
+        echo I do like you;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key 'foo';
+        #set $memc_exptime 300;
+        memc_pass 127.0.0.1:19112; #$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- 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_srcache_fetch_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_like
+finalize: -4
+(?:upstream fin req: error=0 eof=1 rc=502
+finalize: 0
+post subreq: rc=0, status=200
+|conn err: \d+: writev\(\) failed
+upstream fin req: error=0 eof=0 rc=502
+finalize: (?:0|502)
+post subreq: rc=(?:0|502), status=(?:0|200)
+(?:finalize: 0
+)?)?finalize: 0
+
+--- tcp_listen: 19112
+--- tcp_reply eval
+"VALUE foo 0 1024\r\nHTTP/1.1 200 OK\r\n\r\nhello world"
+--- response_headers
+Content-Type: text/css
+--- response_body
+I do like you
+--- wait: 0.1
+--- error_log
+upstream prematurely closed connection
+
+
+
+=== TEST 15: exit(ngx.ERROR) in srcache_store
+--- config
+    memc_read_timeout 200ms;
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+
+        srcache_store PUT /sub;
+
+        echo I do like you;
+    }
+
+    location /sub {
+        content_by_lua '
+            ngx.exit(ngx.ERROR)
+        ';
+    }
+--- request
+GET /foo
+--- 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_srcache_store_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
+finalize: 0
+finalize: -1
+post subreq: rc=-1, status=0
+finalize: 0
+--- response_headers
+Content-Type: text/css
+--- response_body
+I do like you
+--- error_log
+srcache_store subrequest failed: rc=-1 status=0
+
+
+
+=== TEST 16: exit(500) in srcache_store
+--- config
+    memc_read_timeout 200ms;
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+
+        srcache_store PUT /sub;
+
+        echo I do like you;
+    }
+
+    location /sub {
+        return 500;
+    }
+--- request
+GET /foo
+--- 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_srcache_store_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
+finalize: 0
+finalize: 500
+post subreq: rc=500, status=0
+finalize: 0
+
+--- response_headers
+Content-Type: text/css
+--- response_body
+I do like you
+--- error_log
+srcache_store subrequest failed: rc=500 status=0,
+
+
+
+=== TEST 17: skipped in subrequests
+--- config
+    location /t {
+        srcache_fetch GET /f;
+        echo hello;
+    }
+
+    location /f {
+        echo "HTTP/1.1 200 OK\r\n\r\ncached data";
+        body_filter_by_lua '
+            if ngx.arg[2] then
+                ngx.arg[2] = false
+            end
+        ';
+    }
+--- request
+GET /t
+--- response_body
+hello
+--- error_log
+srcache_fetch: cache sent truncated response body
+--- no_error_log
+[alert]
+
+
+
+=== TEST 18: store subrequest failure
+--- http_config
+    upstream local {
+        server localhost:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+--- config
+    memc_connect_timeout 100ms;
+    memc_send_timeout 100ms;
+    memc_read_timeout 100ms;
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 1d;
+        memc_pass local;
+    }
+
+    location = /tblah {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        proxy_pass http://127.0.0.1:$server_port/back;
+    }
+
+    location = /back {
+        echo ok;
+    }
+--- request
+    GET /tblah
+--- response_body
+ok
+--- error_log
+variable "$memc_exptime" takes invalid value: 1d,
+srcache_store subrequest failed: rc=400 status=0,
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/conditional-get.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/conditional-get.t
new file mode 100644
index 0000000..b652ee6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/conditional-get.t
@@ -0,0 +1,302 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(100);
+
+plan tests => repeat_each() * (6 * blocks() - 1);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+#$ENV{TEST_NGINX_MYSQL_PORT}     ||= 3306;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Last-Modified
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: cache miss
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type application/json;
+
+        content_by_lua '
+            ngx.header.last_modified = "Thu, 10 May 2012 07:50:59 GMT"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 3000;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- response_headers
+Content-Type: application/json
+Last-Modified: Thu, 10 May 2012 07:50:59 GMT
+!Content-Length
+--- response_body
+hello
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: cache hit
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 3000;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- response_headers
+Content-Type: application/json
+Content-Length: 6
+Last-Modified: Thu, 10 May 2012 07:50:59 GMT
+--- response_body
+hello
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: cache hit (I-M-S conditional GET, exact)
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 3000;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- more_headers
+If-Modified-Since: Thu, 10 May 2012 07:50:59 GMT
+--- response_headers
+!Content-Type
+!Content-Length
+Last-Modified: Thu, 10 May 2012 07:50:59 GMT
+--- stap2
+F(ngx_http_core_content_phase) {
+    printf("r content handler: %s\n", usymname($r->content_handler))
+}
+
+--- error_code: 304
+--- response_body
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: cache hit (I-M-S conditional GET, exact failed)
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 3000;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- more_headers
+If-Modified-Since: Thu, 10 May 2012 07:51:00 GMT
+--- response_headers
+Content-Type: application/json
+Content-Length: 6
+Last-Modified: Thu, 10 May 2012 07:50:59 GMT
+--- response_body
+hello
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: cache hit (I-M-S conditional GET, exact failed, before suceeded)
+--- config
+    location /cats {
+        if_modified_since before;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 3000;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- more_headers
+If-Modified-Since: Thu, 10 May 2012 07:51:00 GMT
+--- response_headers
+!Content-Type
+!Content-Length
+Last-Modified: Thu, 10 May 2012 07:50:59 GMT
+--- response_body
+--- error_code: 304
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: cache hit (I-U-S conditional GET, 412)
+--- config
+    server_tokens off;
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 3000;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- more_headers
+If-Unmodified-Since: Thu, 10 May 2012 07:50:58 GMT
+--- response_headers
+Content-Type: text/html
+!Last-Modified
+--- response_body_like: 412 Precondition Failed
+--- error_code: 412
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: cache hit (I-U-S conditional GET, precondition succeeded)
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 3000;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- more_headers
+If-Unmodified-Since: Thu, 10 May 2012 07:50:59 GMT
+--- response_headers
+Content-Type: application/json
+Content-Length: 6
+Last-Modified: Thu, 10 May 2012 07:50:59 GMT
+--- response_body
+hello
+--- no_error_log
+[error]
+
+
+
+=== TEST 9: cache hit (I-U-S conditional GET, precondition succeeded, newer)
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 3000;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- more_headers
+If-Unmodified-Since: Thu, 10 May 2012 07:51:00 GMT
+--- response_headers
+Content-Type: application/json
+Content-Length: 6
+Last-Modified: Thu, 10 May 2012 07:50:59 GMT
+--- response_body
+hello
+--- no_error_log
+[error]
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-length.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-length.t
new file mode 100644
index 0000000..14a78ba
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-length.t
@@ -0,0 +1,96 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 5 - 4);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: basic fetch (cache miss)
+--- config
+    location /foo {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        proxy_pass http://127.0.0.1:$server_port/gate;
+    }
+
+    location = /gate {
+        default_type text/css;
+        content_by_lua '
+            ngx.header.content_length = 10
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 10
+--- ignore_response
+--- no_error_log
+srcache_store: subrequest returned status
+
+
+
+=== TEST 3: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+!Content-Length
+--- response_body
+world
+--- no_error_log
+[error]
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-type.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-type.t
new file mode 100644
index 0000000..5e2b912
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/content-type.t
@@ -0,0 +1,90 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => repeat_each() * (4 * blocks());
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (Set-Cookie and Proxy-Authenticate hide by default)
+--- config
+    location /foo {
+        charset UTF-8;
+        charset_types application/x-javascript;
+        default_type application/json;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        xss_get on;
+        xss_callback_arg c;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo?c=bar
+--- response_headers
+Content-Type: application/x-javascript; charset=UTF-8
+Content-Length:
+--- response_body chop
+bar(hello
+);
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        charset UTF-8;
+        charset_types application/x-javascript;
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        xss_get on;
+        xss_callback_arg c;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo?c=bar
+--- response_headers
+Content-Type: application/x-javascript; charset=UTF-8
+Content-Length: 
+!Set-Cookie
+!Proxy-Authenticate
+--- response_body chop
+bar(hello
+);
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/disk.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/disk.t
new file mode 100644
index 0000000..4f0e90e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/disk.t
@@ -0,0 +1,68 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(100);
+
+plan tests => repeat_each() * (2 * blocks() + 1);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: cache miss
+--- config
+    location /index.html {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- response_headers
+Accept-Ranges: bytes
+--- response_body_like: It works!
+
+
+
+=== TEST 3: cache hit
+--- config
+    location /index.html {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- response_body_like: It works!
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-main.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-main.t
new file mode 100644
index 0000000..5ff11eb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-main.t
@@ -0,0 +1,105 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(100);
+
+plan tests => repeat_each() * 4 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_MYSQL_PORT}     ||= 3306;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: cache miss
+--- http_config
+    upstream backend {
+        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        drizzle_pass backend;
+        drizzle_query 'select * from cats';
+
+        rds_json on;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- response_headers
+Content-Type: application/json
+--- response_body chomp
+[{"id":2,"name":null},{"id":3,"name":"bob"}]
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: cache hit
+--- http_config
+    upstream backend {
+        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        drizzle_pass backend;
+        drizzle_query 'invalid sql here';
+
+        rds_json on;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- response_headers
+Content-Type: application/json
+--- response_body chomp
+[{"id":2,"name":null},{"id":3,"name":"bob"}]
+--- no_error_log
+[error]
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-sub.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-sub.t
new file mode 100644
index 0000000..7b56d12
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/drizzle-sub.t
@@ -0,0 +1,113 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket skip_all => 'subrequests not working';
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 3 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_MYSQL_PORT}     ||= 3306;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss)
+--- http_config
+    upstream backend {
+        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+--- config
+    location /main {
+        echo_location /cats dir=asc;
+        echo_location /cats dir=desc;
+    }
+
+    location /cats {
+        internal;
+
+        srcache_fetch GET /memc $uri-$arg_dir;
+        srcache_store PUT /memc $uri-$arg_dir;
+
+        default_type text/css;
+
+        drizzle_pass backend;
+        drizzle_query 'select * from cats order by id $arg_dir';
+
+        rds_json on;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_headers
+Content-Type: text/plain
+--- response_body chomp
+[{"id":2,"name":null},{"id":3,"name":"bob"}][{"id":3,"name":"bob"},{"id":2,"name":null}]
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- http_config
+    upstream backend {
+        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+--- config
+    location /main {
+        echo_location /cats dir=asc;
+        echo_location /cats dir=desc;
+    }
+
+    location /cats {
+        internal;
+
+        srcache_fetch GET /memc $uri-$arg_dir;
+        srcache_store PUT /memc $uri-$arg_dir;
+
+        default_type text/css;
+
+        drizzle_pass backend;
+        drizzle_query 'invalid sql here';
+
+        rds_json on;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_headers
+Content-Type: text/plain
+--- response_body chomp
+[{"id":2,"name":null},{"id":3,"name":"bob"}][{"id":3,"name":"bob"},{"id":2,"name":null}]
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/empty-resp.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/empty-resp.t
new file mode 100644
index 0000000..cc0d64c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/empty-resp.t
@@ -0,0 +1,88 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(100);
+
+plan tests => repeat_each() * (4 * blocks() + 1);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+#$ENV{TEST_NGINX_MYSQL_PORT}     ||= 3306;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: cache miss
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type application/json;
+
+        echo -n '';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- response_headers
+Content-Type: application/json
+--- response_body:
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: cache hit
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- response_headers
+Content-Type: application/json
+Content-Length: 0
+--- response_body:
+--- no_error_log
+[error]
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/err-page.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/err-page.t
new file mode 100644
index 0000000..5076774
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/err-page.t
@@ -0,0 +1,82 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch
+--- config
+    location @err {
+        echo "err";
+    }
+
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.exit(404)
+        ';
+        error_page 404 = @err;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_body
+err
+
+
+
+=== TEST 3: fetch again
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        error_page 404 = @err;
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/etag.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/etag.t
new file mode 100644
index 0000000..bc62570
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/etag.t
@@ -0,0 +1,186 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (5 * blocks() + 4);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all (not using ngx_srcache)
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+X-Fetch-Status: BYPASS
+X-Store-Status: BYPASS
+
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header["ETag"] = [["abcd1234"]]
+            ngx.header["Last-Modified"] = "Sat, 01 Mar 2014 01:02:38 GMT"
+            ngx.say("hello")
+        ';
+        #echo hello;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+X-Fetch-Status: MISS
+X-Store-Status: STORE
+Last-Modified: Sat, 01 Mar 2014 01:02:38 GMT
+--- response_body
+hello
+--- wait: 0.1
+--- error_log
+srcache_store: subrequest returned status 201
+--- log_level: debug
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- more_headers
+If-None-Match: "abcd1234"
+--- response_headers
+X-Fetch-Status: HIT
+X-Store-Status: BYPASS
+ETag: "abcd1234"
+Last-Modified: Sat, 01 Mar 2014 01:02:38 GMT
+--- response_body:
+--- error_code: 304
+
+
+
+=== TEST 4: flush all (not using ngx_srcache)
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+X-Fetch-Status: BYPASS
+X-Store-Status: BYPASS
+
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss, 304)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header["ETag"] = [["abcd1234"]]
+            ngx.header["Last-Modified"] = "Sat, 01 Mar 2014 01:02:38 GMT"
+            ngx.say("hello")
+        ';
+        #echo hello;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- more_headers
+If-None-Match: "abcd1234"
+--- response_headers
+Content-Length:
+X-Fetch-Status: MISS
+X-Store-Status: BYPASS
+Last-Modified: Sat, 01 Mar 2014 01:02:38 GMT
+--- response_body:
+--- error_code: 304
+--- wait: 0.1
+--- error_log
+--- log_level: debug
+
+
+
+=== TEST 6: basic fetch (cache hit)
+--- config
+    location /memc {
+        #internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc?/foo
+--- response_body_like: 404 Not Found
+--- error_code: 404
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/eval.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/eval.t
new file mode 100644
index 0000000..c109463
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/eval.t
@@ -0,0 +1,96 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_MYSQL_PORT}     ||= 3306;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: cache miss
+--- http_config
+    upstream backend {
+        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+
+    upstream mem_backend {
+        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        #keepalive 100 single;
+    }
+--- config
+    location /test1 {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        default_type text/css;
+        charset UTF-8;
+
+        drizzle_query "select 1+2 as a;";
+        drizzle_pass backend;
+        rds_json on;
+    }
+
+    location /memc {
+        #internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass mem_backend;
+    }
+
+    location /pt1 {
+        echo "pt1";
+    }
+
+    location /proxy {
+        eval_subrequest_in_memory off;
+        eval_override_content_type text/plain;
+
+        eval $res {
+            #proxy_pass http://127.0.0.1:$server_port/test1;
+            proxy_pass $scheme://127.0.0.1:$server_port/pt1;
+            #echo "ab";
+        }
+
+        if ($res ~ '1') {
+            #proxy_pass $scheme://127.0.0.1:$server_port/test1;
+            #echo_exec /pi;
+            echo_exec /test1;
+            #echo_exec /pt1;
+            #echo "okay $res";
+            break;
+        }
+
+        echo "[$res] error";
+    }
+
+    location /pi {
+        proxy_pass $scheme://127.0.0.1:$server_port/test1;
+        #echo hi;
+    }
+
+--- request
+GET /proxy
+--- response_body chomp
+[{"a":3}]
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expire-var.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expire-var.t
new file mode 100644
index 0000000..f257d9d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expire-var.t
@@ -0,0 +1,592 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks() + 10);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss), exptime specified by Expires
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+        srcache_store PUT /store $srcache_expire;
+
+        content_by_lua '
+            ngx.header["Cache-Control"] = "max-age=60"
+            ngx.say("hello")
+        ';
+    }
+
+    location /fetch {
+        return 404;
+    }
+
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value $args;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 3: check memcached key
+--- config
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /store
+--- response_body chop
+60
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss), exptime specified by Expires
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+        srcache_store PUT /store $srcache_expire;
+
+        content_by_lua '
+            ngx.header.expires = ngx.http_time(ngx.time() + 12)
+            ngx.say("hello")
+        ';
+    }
+
+    location /fetch {
+        return 404;
+    }
+
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value $args;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 6: check memcached key
+--- config
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /store
+--- response_body chop
+12
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: basic fetch (cache miss), greater than exptime
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+        srcache_store PUT /store $srcache_expire;
+        srcache_max_expire 11s;
+
+        content_by_lua '
+            ngx.header.expires = ngx.http_time(ngx.time() + 12)
+            ngx.say("hello")
+        ';
+    }
+
+    location /fetch {
+        return 404;
+    }
+
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value $args;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 9: check memcached key
+--- config
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /store
+--- response_body chop
+11
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: basic fetch (cache miss), no greater than exptime
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+        srcache_store PUT /store $srcache_expire;
+        srcache_max_expire 12s;
+
+        content_by_lua '
+            ngx.header.expires = ngx.http_time(ngx.time() + 12)
+            ngx.say("hello")
+        ';
+    }
+
+    location /fetch {
+        return 404;
+    }
+
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value $args;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 12: check memcached key
+--- config
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /store
+--- response_body chop
+12
+
+
+
+=== TEST 13: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 14: basic fetch (cache miss), less than exptime
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+        srcache_store PUT /store $srcache_expire;
+        srcache_max_expire 13s;
+
+        content_by_lua '
+            ngx.header.expires = ngx.http_time(ngx.time() + 12)
+            ngx.say("hello")
+        ';
+    }
+
+    location /fetch {
+        return 404;
+    }
+
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value $args;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 15: check memcached key
+--- config
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /store
+--- response_body chop
+12
+
+
+
+=== TEST 16: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 17: basic fetch (cache miss), default expire
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+        srcache_store PUT /store $srcache_expire;
+        srcache_max_expire 13s;
+        srcache_default_expire 6s;
+
+        content_by_lua '
+            ngx.say("hello")
+        ';
+    }
+
+    location /fetch {
+        return 404;
+    }
+
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value $args;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 18: check memcached key
+--- config
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /store
+--- response_body chop
+6
+
+
+
+=== TEST 19: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 20: cache-control: max-age
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+        srcache_store PUT /store $srcache_expire;
+        srcache_max_expire 13s;
+        srcache_default_expire 6s;
+
+        content_by_lua '
+            ngx.header.cache_control = "max-age=7"
+            ngx.say("hello")
+        ';
+    }
+
+    location /fetch {
+        return 404;
+    }
+
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value $args;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 21: check memcached key
+--- config
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /store
+--- response_body chop
+7
+
+
+
+=== TEST 22: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 23: cache-control: max-age (greater than max_expire)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+        srcache_store PUT /store $srcache_expire;
+        srcache_max_expire 6s;
+        srcache_default_expire 5s;
+
+        content_by_lua '
+            ngx.header.cache_control = "max-age=7"
+            ngx.say("hello")
+        ';
+    }
+
+    location /fetch {
+        return 404;
+    }
+
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value $args;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 24: check memcached key
+--- config
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /store
+--- response_body chop
+6
+
+
+
+=== TEST 25: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 26: $srcache_expire used too early
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /fetch;
+        srcache_store PUT /store $srcache_expire;
+        srcache_max_expire 8s;
+        srcache_default_expire 5s;
+
+        set $saved_expire $srcache_expire;
+
+        content_by_lua '
+            ngx.header.cache_control = "max-age=7"
+            ngx.say("expire in content before sending header: ", ngx.var.srcache_expire)
+            ngx.say("expire in content after sending header: ", ngx.var.srcache_expire)
+            ngx.say("expire in rewrite: ", ngx.var.saved_expire)
+        ';
+    }
+
+    location /fetch {
+        return 404;
+    }
+
+    location /store {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value $args;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+expire in content before sending header: nil
+expire in content after sending header: 7
+expire in rewrite: 
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expires.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expires.t
new file mode 100644
index 0000000..7c5bf03
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/expires.t
@@ -0,0 +1,377 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 4 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss), and no store due to Expires: <now>
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.expires = ngx.http_time(ngx.time())
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache miss because not stored before)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss), and no store due to Expires: <now> - 1
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.expires = ngx.http_time(ngx.time() - 1)
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (cache miss because not stored before)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: basic fetch (cache miss), and no store due to Expires: <now>, and srcache_response_cache_control on
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_response_cache_control on;
+
+        content_by_lua '
+            ngx.header.expires = ngx.http_time(ngx.time())
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 9: basic fetch (cache miss because not stored before)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: basic fetch (cache miss), and store due to Expires: <now>, and srcache_response_cache_control off
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_response_cache_control off;
+
+        content_by_lua '
+            ngx.header.expires = ngx.http_time(ngx.time())
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 12: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 13: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 14: basic fetch (cache miss), and store due to not expired expires
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.expires = ngx.http_time(ngx.time() + 10)
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 15: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-header.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-header.t
new file mode 100644
index 0000000..ca5c9c8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-header.t
@@ -0,0 +1,232 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (5 * blocks() + 1);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+X-Fetch-Status: BYPASS
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: set key in memcached (good content)
+--- config
+    location /memc {
+        set $memc_key '/foo';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 8
+!X-Fetch-Status
+--- request eval
+"PUT /memc
+HTTP/1.1 200 OK\r
+Content-Type: foo/bar\r
+Foo: Bar\r
+\r
+hello
+"
+--- response_body eval: "STORED\r\n"
+--- error_code: 201
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: foo/bar
+Content-Length: 5
+Foo: Bar
+X-Fetch-Status: HIT
+--- response_body chop
+hello
+
+
+
+=== TEST 4: set key in memcached (bad content, syntax error in status line)
+--- config
+    location /memc {
+        set $memc_key '/foo';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 8
+!X-Fetch-Status
+--- request eval
+"PUT /memc
+HTTP 200 OK\r
+Content-Type: foo/bar\r
+Foo: Bar\r
+\r
+hello
+"
+--- response_body eval: "STORED\r\n"
+--- error_code: 201
+
+
+
+=== TEST 5: basic fetch (cache hit, but found syntax error in status line)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+X-Fetch-Status: MISS
+--- response_body
+world
+
+
+
+=== TEST 6: set key in memcached (bad content, unexpected eof in status line)
+--- config
+    location /memc {
+        set $memc_key '/foo';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 8
+!X-Fetch-Status
+--- request eval
+"PUT /memc
+HTTP/1.1 200"
+--- response_body eval: "STORED\r\n"
+--- error_code: 201
+
+
+
+=== TEST 7: basic fetch (cache hit, but found unexpected eof in status line)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+X-Fetch-Status: MISS
+--- response_body
+world
+
+
+
+=== TEST 8: set key in memcached (bad content, unexpected eof in header)
+--- config
+    location /memc {
+        set $memc_key '/foo';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 8
+!X-Fetch-Status
+--- request eval
+"PUT /memc
+HTTP/1.1 200 OK\r
+Content-Ty"
+--- response_body eval: "STORED\r\n"
+--- error_code: 201
+
+
+
+=== TEST 9: basic fetch (cache hit, but found unexpected eof in status line)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        add_header X-Fetch-Status $srcache_fetch_status;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+X-Fetch-Status: MISS
+--- response_body
+world
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-skip.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-skip.t
new file mode 100644
index 0000000..3564325
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/fetch-skip.t
@@ -0,0 +1,528 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks() + 10);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 2: skip is false
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        set $skip '';
+        srcache_fetch_skip $skip;
+
+        echo hello;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_value hello;
+        set $memc_value 'hello';
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+--- response_headers
+X-Fetch-Status: MISS
+
+
+
+=== TEST 3: check if /memc was invoked (just equal)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        set $memc_value hello;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+    GET /memc
+--- response_body chomp
+hello
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 5: fetch_skip is literally false
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_fetch_skip 0;
+
+        echo hello;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_value hello;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+--- response_headers
+X-Fetch-Status: MISS
+
+
+
+=== TEST 6: check if /memc was invoked (less than)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        set $memc_value hello;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+    GET /memc
+--- response_body chomp
+hello
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 8: fetch_skip is true
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_fetch_skip 1;
+        add_header X-Fetch-Status $srcache_fetch_status;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_value hello;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 9: check if /memc was invoked (more than)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        set $memc_value hello;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
+--- response_headers
+!X-Fetch-Status
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 11: explicit "true" string
+--- config
+    location /foo.txt {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_fetch_skip true;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_value hello;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo.txt
+hello
+--- request
+    GET /foo.txt
+--- response_body
+hello
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 12: check if /memc was invoked (explicit "true" string)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        set $memc_value hello;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
+--- response_headers
+!X-Fetch-Status
+
+
+
+=== TEST 13: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 14: server-side config
+--- config
+    srcache_fetch_skip 1;
+    location /foo.txt {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_value hello;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo.txt
+abc
+--- request
+    GET /foo.txt
+--- response_body
+abc
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 15: check if /memc was invoked (server-level config)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        set $memc_value hello;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
+--- response_headers
+!X-Fetch-Status
+
+
+
+=== TEST 16: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 17: overriding server-side config
+--- config
+    srcache_fetch_skip 1;
+    location /foo.txt {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_fetch_skip 0;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_value hello;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo.txt
+hello, world
+--- request
+    GET /foo.txt
+--- response_body
+hello, world
+--- response_headers
+X-Fetch-Status: MISS
+
+
+
+=== TEST 18: check if /memc was invoked (overriding server config)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        set $memc_value hello;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- request
+    GET /memc
+--- response_body chomp
+hello
+--- response_headers
+X-Fetch-Status: BYPASS
+
+
+
+=== TEST 19: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+X-Fetch-Status: BYPASS
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 20: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        add_header X-Fetch-Status $srcache_fetch_status;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+X-Fetch-Status: MISS
+--- response_body
+hello
+
+
+
+=== TEST 21: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        add_header X-Fetch-Status $srcache_fetch_status;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+X-Fetch-Status: HIT
+--- response_body
+hello
+
+
+
+=== TEST 22: fetch skip true
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_fetch_skip 1;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- more_headers
+cache-control: No-Cache
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+X-Fetch-Status: BYPASS
+--- response_body
+world
+
+
+
+=== TEST 23: basic fetch (cache hit again)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+X-Fetch-Status: HIT
+--- response_body
+world
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/gzip.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/gzip.t
new file mode 100644
index 0000000..d1aa7c0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/gzip.t
@@ -0,0 +1,160 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 4 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss), and not stored due to Content-Encoding
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.content_encoding = "gzip"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Length:
+Content-Encoding: gzip
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss), and stored due to Content-Encoding + srcache_ignore_content_encoding
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_ignore_content_encoding on;
+
+        content_by_lua '
+            ngx.header.content_encoding = "gzip"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Length:
+Content-Encoding: gzip
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/header-buf-size.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/header-buf-size.t
new file mode 100644
index 0000000..af9cccc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/header-buf-size.t
@@ -0,0 +1,145 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (4 * blocks());
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: set key in memcached (header buf overflown)
+--- config
+    location /memc {
+        set $memc_key '/foo';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 8
+--- request eval
+"PUT /memc
+HTTP/1.1 200 OK\r
+Foo: Bar\r
+Content-Type: foo/bar\r
+\r
+hello
+"
+--- response_body eval: "STORED\r\n"
+--- error_code: 201
+
+
+
+=== TEST 3: basic fetch (cache hit, but header buf overflown)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_header_buffer_size 22;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: set key in memcached
+--- config
+    location /memc {
+        set $memc_key '/foo';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 8
+--- request eval
+"PUT /memc
+HTTP/1.1 200 OK\r
+Foo: Bar\r
+Content-Type: foo/bar\r
+\r
+hello
+"
+--- response_body eval: "STORED\r\n"
+--- error_code: 201
+
+
+
+=== TEST 6: basic fetch (cache hit, just enough big header buffer)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_header_buffer_size 23;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: foo/bar
+Content-Length: 5
+--- response_body chomp
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/main-req.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/main-req.t
new file mode 100644
index 0000000..66056d0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/main-req.t
@@ -0,0 +1,146 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (5 * blocks() + 5);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all (not using ngx_srcache)
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+X-Fetch-Status: BYPASS
+X-Store-Status: BYPASS
+
+--- stap
+F(ngx_http_srcache_access_handler) {
+    println("srcache access handler")
+}
+
+F(ngx_http_srcache_header_filter) {
+    println("srcache header filter")
+}
+
+F(ngx_http_srcache_body_filter) {
+    println("srcache body filter")
+}
+
+--- stap_out
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+X-Fetch-Status: MISS
+X-Store-Status: STORE
+--- response_body
+hello
+--- wait: 0.1
+--- error_log
+srcache_store: subrequest returned status 201
+--- log_level: debug
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+X-Fetch-Status: HIT
+X-Store-Status: BYPASS
+--- response_body
+hello
+
+
+
+=== TEST 4: rewrite directives run before srcache directives
+--- config
+    location /foo {
+        default_type text/css;
+        set $key $uri;
+        set $loc /memc;
+        srcache_fetch GET $loc $key;
+        srcache_store PUT $loc $key;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+X-Fetch-Status: HIT
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/max-age.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/max-age.t
new file mode 100644
index 0000000..9baa442
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/max-age.t
@@ -0,0 +1,305 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 4 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss), and no store due to max-age=0
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.cache_control = "public; max-age=0"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache miss because not stored before)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss), and no store due to max-age=0, and srcache_response_cache_control on
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_response_cache_control on;
+
+        content_by_lua '
+            ngx.header["Cache-Control"] = "public; max-age=0"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (cache miss because not stored before)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: basic fetch (cache miss), and store due to max-age=0, and srcache_response_cache_control off
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_response_cache_control off;
+
+        content_by_lua '
+            ngx.header["Cache-Control"] = "public; max-age=0"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 9: basic fetch (cache miss because not stored before)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: basic fetch (cache miss), and store due to max-age=<not 0>
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header["Cache-Control"] = "public; max-age=7";
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 12: basic fetch (cache miss because not stored before)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/methods.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/methods.t
new file mode 100644
index 0000000..9a57b38
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/methods.t
@@ -0,0 +1,389 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (4 * blocks() + 3);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 4: basic fetch (POST cache miss for POST by default)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /foo
+hiya, china
+--- response_headers
+Content-Type: text/css
+! Content-Length
+--- response_body
+world
+
+
+
+=== TEST 5: basic fetch (POST cache hit if we enable POST explicitly)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_methods POST;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /foo
+hiya, china
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (GET still cache hit if we enable POST  and PUT explicitly)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_methods POST PUT;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 7: basic fetch (HEAD still cache hit if we enable POST explicitly)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_methods POST;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+HEAD /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+--- no_error_log
+[error]
+
+
+
+=== TEST 8: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 9: basic fetch (cache miss), POST not store
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /foo
+howdy
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 10: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 11: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 12: basic fetch (cache miss), POST stored when POST is enabled in srcache_methods
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_methods POST;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /foo
+howdy
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 13: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        proxy_pass http://agentzh.org:12345/;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 14: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 15: basic fetch (cache miss) - HEAD
+--- config
+    location /foo {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        proxy_pass http://127.0.0.1:$server_port/back;
+    }
+
+    location /back {
+        return 200 "hello world";
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+HEAD /foo
+--- response_headers
+Content-Type: text/plain
+Content-Length: 11
+--- response_body
+--- error_log
+srcache_store skipped due to request method HEAD
+--- no_error_log
+[error]
+--- log_level: debug
+--- wait: 0.1
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-cache.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-cache.t
new file mode 100644
index 0000000..40c99f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-cache.t
@@ -0,0 +1,309 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 4 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss), and not stored due to Cache-Control: no-cache
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.cache_control = "no-cache"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss), and not stored due to Cache-Control: no-cache (srcache_store_no_cache off)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_no_cache off;
+        srcache_store_no_store on;
+        srcache_store_private on;
+
+        content_by_lua '
+            ngx.header.cache_control = "no-cache"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: basic fetch (cache miss), and stored due to srcache_store_no_cache on
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_no_cache on;
+        srcache_store_no_store off;
+        srcache_store_private off;
+
+        content_by_lua '
+            ngx.header.cache_control = "no-cache"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 9: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: basic fetch (cache miss), and not stored due to Cache-Control: no-cache
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.cache_control = { "blah", "blah; No-Cache" }
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 12: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-store.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-store.t
new file mode 100644
index 0000000..91973b2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/no-store.t
@@ -0,0 +1,305 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 4 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss), and not stored due to Cache-Control: no-store
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.cache_control = "no-store"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss), and not stored due to Cache-Control: no-store (srcache_store_no_store off)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_no_store off;
+
+        content_by_lua '
+            ngx.header.cache_control = "no-store"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: basic fetch (cache miss), and stored due to srcache_store_no_store on
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_no_store on;
+
+        content_by_lua '
+            ngx.header.cache_control = "no-store"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 9: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: basic fetch (cache miss), and not stored due to Cache-Control: no-store
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.cache_control = { "blah", "blah; No-Store" }
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 12: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/postgres-main.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/postgres-main.t
new file mode 100644
index 0000000..ccc00c4
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/postgres-main.t
@@ -0,0 +1,138 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(100);
+
+plan tests => repeat_each() * 3 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: cache miss
+--- http_config
+    upstream backend {
+        postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        postgres_pass backend;
+        postgres_query 'select * from cats';
+
+        rds_json on;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- response_headers
+Content-Type: application/json
+--- response_body chomp
+[{"id":2,"name":null},{"id":3,"name":"bob"}]
+
+
+
+=== TEST 3: cache hit
+--- http_config
+    upstream backend {
+        postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        postgres_pass backend;
+        postgres_query 'invalid sql here';
+
+        rds_json on;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- response_headers
+Content-Type: application/json
+--- response_body chomp
+[{"id":2,"name":null},{"id":3,"name":"bob"}]
+
+
+
+=== TEST 4: SSL packet issue (bug)
+--- SKIP
+--- http_config
+    upstream backend {
+        postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type application/json;
+
+        postgres_escape $token $arg_token;
+        postgres_escape $limit $arg_limit;
+        postgres_pass backend;
+        postgres_query HEAD GET "select $token,$limit";
+
+        rds_json on;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats?token=3&limit=10
+--- response_headers
+Content-Type: text/css
+--- response_body chomp
+[{"id":2,"name":null},{"id":3,"name":"bob"}]
+--- SKIP
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/private.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/private.t
new file mode 100644
index 0000000..281dd76
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/private.t
@@ -0,0 +1,528 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 4 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss), and not stored due to Cache-Control: private
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.cache_control = "private"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss), and not stored due to Cache-Control: private (srcache_store_private off)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_private off;
+
+        content_by_lua '
+            ngx.header.cache_control = "private"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: basic fetch (cache miss), and stored due to srcache_store_private on
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_private on;
+
+        content_by_lua '
+            ngx.header.cache_control = "private"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 9: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: basic fetch (cache miss), and not stored due to Cache-Control: private
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header.cache_control = { "blah", "blah; Private" }
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 12: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 13: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 14: basic fetch (cache miss), and not stored due to Cache-Control: private, proxy_pass
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        proxy_pass http://127.0.0.1:$server_port/bar;
+    }
+
+    location /bar {
+        default_type text/css;
+        content_by_lua '
+            ngx.header.cache_control = "private"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 15: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 16: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 17: basic fetch (cache miss), and not stored due to Cache-Control: private, proxy_pass
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header["Cache-Control"] = "private"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+hello
+
+
+
+=== TEST 18: basic fetch (cache miss again, not stored in the previous case)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 19: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 20: basic fetch (cache miss), and stored due to Cache-Control: private but srcache_response_cache_control off
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_private off;
+        srcache_response_cache_control off;
+
+        content_by_lua '
+            ngx.header.cache_control = { "blah", "blah; Private" }
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 21: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/proxy.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/proxy.t
new file mode 100644
index 0000000..f3e6a31
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/proxy.t
@@ -0,0 +1,65 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(100);
+
+plan tests => repeat_each() * 3 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+$ENV{TEST_NGINX_MYSQL_PORT}     ||= 3306;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: cache miss
+--- SKIP
+--- http_config
+    upstream backend {
+        drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+--- config
+    location /cats {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        default_type text/css;
+
+        proxy_pass http://127.0.0.1:$server_port/foo;
+    }
+
+    location /foo {
+        echo foo;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /cats
+--- response_headers
+Content-Type: application/json
+--- response_body chomp
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/ranges.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/ranges.t
new file mode 100644
index 0000000..cc3c0f9
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/ranges.t
@@ -0,0 +1,410 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (5 * blocks() + 12);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+no_long_string();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all (not using ngx_srcache)
+--- config
+    location = /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+X-Fetch-Status: BYPASS
+X-Store-Status: BYPASS
+
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: range fetch (cache miss)
+--- config
+    location = /index.html {
+        default_type text/css;
+        srcache_store_ranges on;
+        srcache_fetch GET /memc $uri$http_range;
+        srcache_store PUT /memc $uri$http_range;
+
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- more_headers
+Range: bytes=2-5
+--- response_headers
+Content-Type: text/html
+Content-Length: 4
+X-Fetch-Status: MISS
+X-Store-Status: STORE
+--- response_body chop
+tml>
+--- wait: 0.1
+--- error_log
+srcache_store: subrequest returned status 201
+--- error_code: 206
+--- log_level: debug
+
+
+
+=== TEST 3: range fetch (cache hit)
+--- config
+    location = /index.html {
+        default_type text/css;
+        srcache_fetch GET /memc $uri$http_range;
+        srcache_store PUT /memc $uri$http_range;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- more_headers
+Range: bytes=2-5
+
+--- response_headers
+X-Fetch-Status: HIT
+X-Store-Status: BYPASS
+Content-Length: 4
+--- response_body chop
+tml>
+--- error_code: 206
+
+
+
+=== TEST 4: full fetch (cache miss)
+--- config
+    location = /index.html {
+        default_type text/css;
+        srcache_fetch GET /memc $uri$http_range;
+        srcache_store PUT /memc $uri$http_range;
+
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+
+--- response_headers
+X-Fetch-Status: MISS
+X-Store-Status: STORE
+Content-Length: 72
+--- response_body_like: It works!
+--- error_code: 200
+
+
+
+=== TEST 5: flush all (not using ngx_srcache)
+--- config
+    location = /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+X-Fetch-Status: BYPASS
+X-Store-Status: BYPASS
+
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 6: full fetch (cache miss)
+--- config
+    location = /index.html {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- response_headers
+Content-Type: text/html
+Content-Length: 72
+X-Fetch-Status: MISS
+X-Store-Status: STORE
+--- response_body_like: It works!
+--- wait: 0.1
+--- error_log
+srcache_store: subrequest returned status 201
+--- error_code: 200
+--- log_level: debug
+
+
+
+=== TEST 7: range fetch (cache hit)
+--- config
+    location = /index.html {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- more_headers
+Range: bytes=2-5
+
+--- response_headers
+X-Fetch-Status: HIT
+X-Store-Status: BYPASS
+Content-Length: 4
+--- response_body chop
+tml>
+--- error_code: 206
+
+
+
+=== TEST 8: flush all (not using ngx_srcache)
+--- config
+    location = /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+X-Fetch-Status: BYPASS
+X-Store-Status: BYPASS
+
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 9: range fetch (cache miss) - no store ranges (default off)
+--- config
+    location = /index.html {
+        default_type text/css;
+        #srcache_store_ranges on;
+        srcache_fetch GET /memc $uri$http_range;
+        srcache_store PUT /memc $uri$http_range;
+
+        #add_header X-Fetch-Status $srcache_fetch_status;
+        #add_header X-Store-Status $srcache_store_status;
+    }
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- more_headers
+Range: bytes=2-5
+--- response_headers
+Content-Type: text/html
+Content-Length: 4
+!X-Fetch-Status
+!X-Store-Status
+--- response_body chop
+tml>
+--- wait: 0.1
+--- no_error_log
+srcache_store: subrequest returned status 201
+--- error_code: 206
+--- log_level: debug
+
+
+
+=== TEST 10: range fetch (cache hit)
+--- config
+    location = /index.html {
+        default_type text/css;
+        srcache_fetch GET /memc $uri$http_range;
+        srcache_store PUT /memc $uri$http_range;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- more_headers
+Range: bytes=2-5
+
+--- response_headers
+X-Fetch-Status: MISS
+X-Store-Status: STORE
+!Content-Length
+--- response_body
+world
+--- error_code: 200
+
+
+
+=== TEST 11: flush all (not using ngx_srcache)
+--- config
+    location = /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+X-Fetch-Status: BYPASS
+X-Store-Status: BYPASS
+
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 12: range fetch (cache miss) - no store ranges (explicit off)
+--- config
+    location = /index.html {
+        default_type text/css;
+        srcache_store_ranges off;
+        srcache_fetch GET /memc $uri$http_range;
+        srcache_store PUT /memc $uri$http_range;
+
+        #add_header X-Fetch-Status $srcache_fetch_status;
+        #add_header X-Store-Status $srcache_store_status;
+    }
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- more_headers
+Range: bytes=2-5
+--- response_headers
+Content-Type: text/html
+Content-Length: 4
+!X-Fetch-Status
+!X-Store-Status
+--- response_body chop
+tml>
+--- wait: 0.1
+--- no_error_log
+srcache_store: subrequest returned status 201
+--- error_code: 206
+--- log_level: debug
+
+
+
+=== TEST 13: range fetch (cache hit)
+--- config
+    location = /index.html {
+        default_type text/css;
+        srcache_fetch GET /memc $uri$http_range;
+        srcache_store PUT /memc $uri$http_range;
+
+        echo world;
+        add_header X-Fetch-Status $srcache_fetch_status;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /index.html
+--- more_headers
+Range: bytes=2-5
+
+--- response_headers
+X-Fetch-Status: MISS
+X-Store-Status: STORE
+!Content-Length
+--- response_body
+world
+--- error_code: 200
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/redis.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/redis.t
new file mode 100644
index 0000000..8af2ff0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/redis.t
@@ -0,0 +1,246 @@
+# vi:ft=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 5 * blocks();
+
+$ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
+
+#master_on();
+#no_long_string();
+no_shuffle();
+
+#log_level('warn');
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        redis2_query flushall;
+        redis2_pass 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+!Content-Length
+--- request
+GET /flush
+--- response_body eval: "+OK\r\n"
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: basic fetch (cache miss)
+--- timeout: 3
+--- config
+    location /foo {
+        default_type text/css;
+
+        set $key $uri;
+        set_escape_uri $escaped_key $key;
+        srcache_fetch GET /redis $key;
+        srcache_store POST /redis2 key=$escaped_key&exptime=120;
+
+        echo hello;
+        echo hiya;
+    }
+
+    location = /redis {
+        internal;
+
+        set $redis_key $args;
+        redis_pass 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+
+    location = /redis2 {
+        internal;
+
+        set_unescape_uri $exptime $arg_exptime;
+        set_unescape_uri $key $arg_key;
+
+        redis2_query set $key $echo_request_body;
+        redis2_query expire $key $exptime;
+        redis2_pass 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+!Content-Length
+--- response_body
+hello
+hiya
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+
+        set $key $uri;
+        srcache_fetch GET /redis $key;
+        srcache_store PUT /redis2 key=$key&exptime=10;
+
+        echo world;
+    }
+
+    location = /redis {
+        #internal;
+
+        #redis2_query get $args;
+        #redis2_pass 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+        #echo "args = $args";
+
+        set $redis_key $args;
+        redis_pass 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+
+    location = /redis2 {
+        internal;
+
+        set_unescape_uri $exptime $arg_exptime;
+        set_unescape_uri $key $arg_key;
+
+        redis2_query set $key $echo_request_body;
+        redis2_query expire $key $exptime;
+
+        redis2_pass 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 11
+--- response_body
+hello
+hiya
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: flush all - cluster
+--- config
+    location /flush {
+        redis2_query flushall;
+        redis2_pass 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+!Content-Length
+--- request
+GET /flush
+--- response_body eval: "+OK\r\n"
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: basic fetch (cache miss) - cluster
+--- timeout: 3
+--- http_config
+    upstream foo {
+        server 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+--- config
+    location /foo {
+        default_type text/css;
+
+        set $key $uri;
+        set_escape_uri $escaped_key $key;
+        #srcache_fetch GET /redis $key;
+        srcache_store POST /redis2 key=$escaped_key&exptime=120;
+
+        echo hello;
+        echo hiya;
+    }
+
+    location = /redis {
+        internal;
+
+        set_md5 $redis_key $args;
+        set $backend foo;
+        redis_pass $backend;
+    }
+
+    location = /redis2 {
+        internal;
+
+        set_unescape_uri $exptime $arg_exptime;
+        set_unescape_uri $key $arg_key;
+        set_md5 $key;
+        set $backend foo;
+
+        redis2_query set $key $echo_request_body;
+        redis2_query expire $key $exptime;
+        redis2_pass $backend;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+!Content-Length
+--- response_body
+hello
+hiya
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: basic fetch (cache hit) - cluster
+--- http_config
+    upstream foo {
+        server 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+
+--- config
+    location /foo {
+        default_type text/css;
+
+        set $key $uri;
+        srcache_fetch GET /redis $key;
+        srcache_store PUT /redis2 key=$key&exptime=10;
+
+        echo world;
+    }
+
+    location = /redis {
+        #internal;
+
+        set_md5 $redis_key $args;
+        set $backend foo;
+        redis_pass $backend;
+    }
+
+    location = /redis2 {
+        internal;
+
+        set_unescape_uri $exptime $arg_exptime;
+        set_unescape_uri $key $arg_key;
+        set_md5 $key;
+
+        redis2_query set $key $echo_request_body;
+        redis2_query expire $key $exptime;
+
+        set $backend foo;
+        redis2_pass $backend;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 11
+--- response_body
+hello
+hiya
+--- no_error_log
+[error]
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/req-cache-control.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/req-cache-control.t
new file mode 100644
index 0000000..9dd97c8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/req-cache-control.t
@@ -0,0 +1,394 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 4 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 4: request cache-control: no-cache
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_request_cache_control on;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- more_headers
+cache-control: No-Cache
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 5: basic fetch (cache hit again)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+world
+
+
+
+=== TEST 6: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 7: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 8: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 9: request cache-control: no-cache & no-store
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_request_cache_control on;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- more_headers
+Cache-Control: no-cache
+Cache-Control: no-store
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 10: basic fetch (cache hit again)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 11: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 12: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 13: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 14: request cache-control: no-store
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_request_cache_control on;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- more_headers
+Cache-Control: no-store
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 15: basic fetch (cache hit again)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/satisfy.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/satisfy.t
new file mode 100644
index 0000000..f4cca71
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/satisfy.t
@@ -0,0 +1,118 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks() + 2);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss) - deny all
+--- config
+    location /foo {
+        satisfy any;
+
+        deny all;
+
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+--- response_body_like: 403 Forbidden
+--- error_code: 403
+
+
+
+=== TEST 3: basic fetch (cache miss)
+--- config
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 4: basic fetch (cache hit)
+--- config
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/static.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/static.t
new file mode 100644
index 0000000..97be58c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/static.t
@@ -0,0 +1,162 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 5 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+Last-Modified: 
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo 201103040521.59
+hello
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+Last-Modified: Fri, 04 Mar 2011 05:21:59 GMT
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+Last-Modified: Fri, 04 Mar 2011 05:21:59 GMT
+--- response_body
+hello
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+Last-Modified: 
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss), hide Last-Modified
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_hide_header Last-Modified;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo 201103040521.59
+hello
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+Last-Modified: Fri, 04 Mar 2011 05:21:59 GMT
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+!Last-Modified
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/status.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/status.t
new file mode 100644
index 0000000..f5b3704
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/status.t
@@ -0,0 +1,723 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => repeat_each() * 124;
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_long_string();
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (http 1.0)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua 'ngx.say("hello")';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 3: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/plain
+Content-Length: 49
+!Set-Cookie
+!Proxy-Authenticate
+--- response_body eval
+"HTTP/1.1 200 OK\r
+Content-Type: text/css\r
+\r
+hello
+"
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache 500 404 200 statuses)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_statuses 500 200 404;
+
+        content_by_lua '
+            ngx.exit(404)
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 6: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/plain
+--- response_body_like
+^HTTP/1\.1 404 Not Found\r
+Content-Type: text/html\r
+\r
+.*?404 Not Found.*
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: basic fetch (404 not listed in store_statuses)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_statuses 500 200 410;
+
+        content_by_lua '
+            ngx.exit(404)
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 9: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: basic fetch (cache 301 by default)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.redirect("/bah", 301)
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 301 Moved Permanently
+--- error_code: 301
+
+
+
+=== TEST 12: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/html
+--- response_headers
+Content-Type: text/plain
+--- response_body_like
+^HTTP/1\.1 301 Moved Permanently\r
+Content-Type: text/html\r
+Location: /bah\r
+\r
+.*?301 Moved Permanently.*
+
+
+
+=== TEST 13: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 14: basic fetch (cache 302 by default)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.redirect("/bah", 302)
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+Location: /bah
+--- response_body_like: 302 Found
+--- error_code: 302
+
+
+
+=== TEST 15: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/html
+--- response_headers
+Content-Type: text/plain
+--- response_body_like
+^HTTP/1\.1 302 Moved Temporarily\r
+Content-Type: text/html\r
+Location: /bah\r
+\r
+.*?302 Found.*
+
+
+
+=== TEST 16: cache hit
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_statuses 303 304;
+
+        content_by_lua '
+            ngx.say("hi")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+Location: /bah
+--- response_body_like: 302 Found
+--- error_code: 302
+
+
+
+=== TEST 17: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 18: basic fetch (201 not cached by default)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.status = 201
+            ngx.say("Dog created")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/css
+--- response_body
+Dog created
+--- error_code: 201
+
+
+
+=== TEST 19: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/html
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 20: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 21: basic fetch (explicitly do not cache 302)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_statuses 301 200;
+
+        content_by_lua '
+            ngx.redirect("/bah", 302)
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 302 Found
+--- error_code: 302
+
+
+
+=== TEST 22: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/html
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 23: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 24: basic fetch (explicitly do not cache 302, and store_statuses are all bigger than 302)
+github pull #19
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_statuses 303 304;
+
+        content_by_lua '
+            ngx.redirect("/bah", 302)
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 302 Found
+--- error_code: 302
+
+
+
+=== TEST 25: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/html
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 26: basic fetch (cache 308 by default)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.redirect("/bah", 308)
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 308 Permanent Redirect
+--- error_code: 308
+
+
+
+=== TEST 27: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/html
+--- response_headers
+Content-Type: text/plain
+--- response_body_like
+^HTTP/1\.1 308 Permanent Redirect\r
+Content-Type: text/html\r
+Location: /bah\r
+\r
+.*?308 Permanent Redirect.*
+
+
+
+=== TEST 28: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 29: basic fetch (cache 307 by default)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.redirect("/bah", 307)
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+Location: /bah
+--- response_body_like: 307 Temporary Redirect
+--- error_code: 307
+
+
+
+=== TEST 30: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/html
+--- response_headers
+Content-Type: text/plain
+--- response_body_like
+^HTTP/1\.1 307 Temporary Redirect\r
+Content-Type: text/html\r
+Location: /bah\r
+\r
+.*?307 Temporary Redirect.*
+
+
+
+=== TEST 31: cache hit
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_statuses 303 304;
+
+        content_by_lua '
+            ngx.say("hi")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo HTTP/1.0
+--- response_headers
+Content-Type: text/html
+Location: /bah
+--- response_body_like: 307 Temporary Redirect
+--- error_code: 307
+
+
+
+=== TEST 32: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-hide-headers.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-hide-headers.t
new file mode 100644
index 0000000..47262bd
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-hide-headers.t
@@ -0,0 +1,389 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * 5 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header["Foo-Bar"] = "hi world"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+Foo-Bar: hi world
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+Foo-Bar: hi world
+--- response_body
+hello
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_hide_header "Foo-Bar";
+
+        content_by_lua '
+            ngx.header["Foo-Bar"] = "hi world"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+Foo-Bar: hi world
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+!Foo-Bar
+--- response_body
+hello
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_hide_header "Foo-Bar";
+
+        content_by_lua '
+            ngx.header["Foo-Bar"] = "hi world";
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+Foo-Bar: hi world
+--- response_body
+hello
+
+
+
+=== TEST 9: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+!Foo-Bar
+--- response_body
+hello
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: basic fetch (hide Content-Type in store)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_hide_header "Content-Type";
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+!Foo-Bar
+--- response_body
+hello
+
+
+
+=== TEST 12: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+!Content-Type
+Content-Length: 6
+!Foo-Bar
+--- response_body
+hello
+
+
+
+=== TEST 13: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 14: basic fetch (hide and pass Content-Type in store)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_hide_header "Content-Type";
+        srcache_store_pass_header "Content-Type";
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+!Foo-Bar
+--- response_body
+hello
+
+
+
+=== TEST 15: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/blah;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+!Foo-Bar
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-max-size.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-max-size.t
new file mode 100644
index 0000000..8a9cd85
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-max-size.t
@@ -0,0 +1,356 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 5);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: just hit store_max_size
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        srcache_store_max_size 49;
+
+        echo hello;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key hit_store_max_size;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+--- response_headers
+X-Store-Status: STORE
+
+
+
+=== TEST 3: check if /memc was invoked (just equal)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key hit_store_max_size;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body eval
+"HTTP/1.1 200 OK\r
+Content-Type: text/css\r
+\r
+hello
+"
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: less than store_max_size
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        srcache_store_max_size 50;
+
+        echo hello;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key less_than_store_max_size;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+--- response_headers
+X-Store-Status: STORE
+
+
+
+=== TEST 6: check if /memc was invoked (less than)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key less_than_store_max_size;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body eval
+"HTTP/1.1 200 OK\r
+Content-Type: text/css\r
+\r
+hello
+"
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: just more than store_max_size
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        srcache_store_max_size 48;
+
+        echo hello;
+        add_header X-Store-Status $srcache_store_status;
+        log_by_lua 'ngx.log(ngx.WARN, "store status: ", ngx.var.srcache_store_status)';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key more_than_store_max_size;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+--- wait: 0.1
+--- response_headers
+X-Store-Status: STORE
+--- error_log
+store status: BYPASS
+
+
+
+=== TEST 9: check if /memc was invoked (more than)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key more_than_store_max_size;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: just more than store_max_size (explicit content-length)
+--- config
+    location /foo.txt {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        srcache_store_max_size 48;
+
+        content_by_lua '
+            ngx.header.content_length = 40;
+            ngx.say("hello")
+        ';
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key more_than_store_max_size;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo.txt
+--- response_body
+hello
+--- response_headers
+X-Store-Status: BYPASS
+
+
+
+=== TEST 12: check if /memc was invoked (more than)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key more_than_store_max_size;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 13: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 14: server-side config
+--- config
+    srcache_store_max_size 46;
+    location /foo.txt {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key more_than_store_max_size;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo.txt
+abc
+--- request
+    GET /foo.txt
+--- response_body
+abc
+
+
+
+=== TEST 15: check if /memc was invoked (server-level config)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key more_than_store_max_size;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 16: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 17: 0 means unlimited
+--- config
+    srcache_store_max_size 3;
+    location /foo.txt {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        srcache_store_max_size 0;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key more_than_store_max_size;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo.txt 199801171935.33
+hello, world
+--- request
+    GET /foo.txt
+--- response_body
+hello, world
+
+
+
+=== TEST 18: check if /memc was invoked (explicit unlimited)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key more_than_store_max_size;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body_like eval
+qr{^HTTP/1.1 200 OK\r
+Content-Type: text/css\r
+Last-Modified: Sat, 17 Jan 1998 19:35:33 GMT\r
+X-SRCache-Allow-Ranges: 1\r
+(?:ETag: "[^"]+"\r
+)?\r
+hello, world$}
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-pass-headers.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-pass-headers.t
new file mode 100644
index 0000000..4361ae7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-pass-headers.t
@@ -0,0 +1,173 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (5 * blocks() + 4);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: basic fetch (Set-Cookie and Proxy-Authenticate hide by default)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        content_by_lua '
+            ngx.header["Set-Cookie"] = "foo=baz"
+            ngx.header["Proxy-Authenticate"] = "blah"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+Set-Cookie: foo=baz
+Proxy-Authenticate: blah
+--- response_body
+hello
+
+
+
+=== TEST 3: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+!Set-Cookie
+!Proxy-Authenticate
+--- response_body
+hello
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: basic fetch (Set-Cookie hide by default)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_pass_header Set-Cookie;
+        srcache_store_pass_header Proxy-Authenticate;
+
+        content_by_lua '
+            ngx.header["Set-Cookie"] = "foo=baz"
+            ngx.header["Proxy-Authenticate"] = "blah"
+            ngx.say("hello")
+        ';
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+Set-Cookie: foo=baz
+Proxy-Authenticate: blah
+--- response_body
+hello
+
+
+
+=== TEST 6: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+Set-Cookie: foo=baz
+Proxy-Authenticate: blah
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-skip.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-skip.t
new file mode 100644
index 0000000..13fdae2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/store-skip.t
@@ -0,0 +1,434 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 8);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 2: skip is false
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        set $skip '';
+        srcache_store_skip $skip;
+
+        echo hello;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+--- response_headers
+X-Store-Status: STORE
+
+
+
+=== TEST 3: check if /memc was invoked (just equal)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body eval
+"HTTP/1.1 200 OK\r
+Content-Type: text/css\r
+\r
+hello
+"
+
+
+
+=== TEST 4: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 5: store_skip is literally false
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        srcache_store_skip 0;
+        add_header X-Store-Status $srcache_store_status;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+--- response_headers
+X-Store-Status: STORE
+
+
+
+=== TEST 6: check if /memc was invoked (less than)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body eval
+"HTTP/1.1 200 OK\r
+Content-Type: text/css\r
+\r
+hello
+"
+
+
+
+=== TEST 7: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 8: store_skip is true
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        srcache_store_skip 1;
+
+        echo hello;
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+--- response_headers
+X-Store-Status: BYPASS
+
+
+
+=== TEST 9: check if /memc was invoked (more than)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 10: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 11: explicit "true" string
+--- config
+    location /foo.txt {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        srcache_store_skip true;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo.txt
+hello
+--- request
+    GET /foo.txt
+--- response_body
+hello
+
+
+
+=== TEST 12: check if /memc was invoked (explicit "true" string)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 13: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 14: server-side config
+--- config
+    srcache_store_skip 1;
+    location /foo.txt {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo.txt
+abc
+--- request
+    GET /foo.txt
+--- response_body
+abc
+
+
+
+=== TEST 15: check if /memc was invoked (server-level config)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
+
+
+=== TEST 16: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 17: overriding server-side config
+--- config
+    srcache_store_skip 1;
+    location /foo.txt {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        srcache_store_skip 0;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- user_files
+>>> foo.txt 201012240310.03
+hello, world
+--- request
+    GET /foo.txt
+--- response_body
+hello, world
+
+
+
+=== TEST 18: check if /memc was invoked (overriding server config)
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body eval
+qr{HTTP/1.1 200 OK\r
+Content-Type: text/css\r
+Last-Modified: Fri, 24 Dec 2010 03:10:03 GMT\r
+X-SRCache-Allow-Ranges: 1\r
+(?:ETag: "4d140f0b-d"\r
+)?\r
+hello, world$}
+
+
+
+=== TEST 19: check the response
+--- config
+    location /foo.txt {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo.txt
+--- response_headers
+Accept-Ranges: bytes
+Last-Modified: Fri, 24 Dec 2010 03:10:03 GMT
+Content-Length: 13
+--- response_body
+hello, world
+
+
+
+=== TEST 20: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 21: store_skip is true in the last minute
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_store PUT /memc $uri;
+        set $skip '';
+        srcache_store_skip $skip;
+
+        content_by_lua '
+            ngx.say("hello")
+            ngx.say("world")
+            ngx.var.skip = 1
+        ';
+        add_header X-Store-Status $srcache_store_status;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_cmd set;
+        set $memc_key key;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body
+hello
+world
+--- response_headers
+X-Store-Status: STORE
+--- error_log
+srcache_store skipped due to the true value in srcache_store_skip: "1"
+
+
+
+=== TEST 22: check if /memc was invoked
+--- config
+     location /memc {
+        set $memc_cmd get;
+        set $memc_key key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc
+--- response_body_like: 404 Not Found
+--- error_code: 404
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/sub-req.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/sub-req.t
new file mode 100644
index 0000000..f0dd6c7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/sub-req.t
@@ -0,0 +1,448 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket skip_all => 'subrequests not working';
+;
+
+no_long_string();
+#repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple fetch
+--- config
+    location /main {
+        echo_location /pre /foo;
+        echo_location /foo;
+        echo_location /foo;
+    }
+
+    location /foo {
+        srcache_fetch GET /memc $uri;
+
+        echo $echo_incr;
+    }
+
+    location /pre {
+        set $memc_cmd 'set';
+        set $memc_key $query_string;
+        set $memc_value "hello\n";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /memc {
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"STORED\r
+hello
+hello
+"
+
+
+
+=== TEST 2: simple fetch (without fetch)
+--- config
+    location /main {
+        echo_location /foo?1;
+        echo_location /foo?2;
+    }
+
+    location /foo {
+        srcache_store PUT /memc $uri;
+
+        echo $echo_incr;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body
+1
+2
+
+
+
+=== TEST 3: simple fetch (flush fetch)
+--- config
+    location /main {
+        echo_location /flush;
+        echo_location /bar;
+        echo_location /flush;
+        echo_location /bar;
+    }
+
+    location /bar {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo $echo_incr;
+    }
+
+    location /flush {
+        internal;
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"OK\r
+1
+OK\r
+2
+"
+
+
+
+=== TEST 4: fetch & store
+--- config
+    location /main {
+        echo_location /flush;
+        echo_location /bar;
+        echo_location /bar;
+        echo_location /bar;
+    }
+
+    location /bar {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo $echo_incr;
+    }
+
+    location /flush {
+        internal;
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"OK\r
+1
+1
+1
+"
+--- timeout: 2
+
+
+
+=== TEST 5: fetch & store (mixture of echo_location & echo_location_async)
+--- config
+    location /main {
+        echo_location /flush;
+        #echo_location /bar?;
+        echo_location /group?a=1&b=2;
+        echo_location_async /group?a=3&b=4;
+    }
+
+    location /group {
+        #echo_location /bar;
+        echo_location /bar $arg_a;
+        echo_location_async /bar $arg_b;
+    }
+
+    location /bar {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo $query_string;
+    }
+
+    location /flush {
+        internal;
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /memc {
+        #internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"OK\r
+1
+1
+1
+1
+"
+--- timeout: 2
+
+
+
+=== TEST 6: deep nested echo_location/echo_location_async
+--- config
+    location /main {
+        echo_location /flush;
+        echo_location /bar;
+        echo_location_async /bar;
+        echo_location_async /bar;
+        echo_location /group;
+        echo_location_async /group;
+    }
+
+    location /group {
+        echo_location /bar;
+        echo_location_async /bar;
+    }
+
+    location /bar {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo $echo_incr;
+    }
+
+    location /flush {
+        internal;
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"OK\r
+1
+1
+1
+1
+1
+1
+1
+"
+--- timeout: 2
+--- SKIP
+
+
+
+=== TEST 7: deep nested pure echo_location
+--- config
+    location /main {
+        echo_location /flush;
+        echo_location /bar;
+        echo_location /bar;
+        echo_location /bar;
+        echo_location /group;
+        echo_location /group;
+    }
+
+    location /group {
+        echo_location /bar;
+        echo_location /bar;
+    }
+
+    location /bar {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo $echo_incr;
+    }
+
+    location /flush {
+        internal;
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"OK\r
+1
+1
+1
+1
+1
+1
+1
+"
+--- timeout: 2
+
+
+
+=== TEST 8: deep nested echo_location/echo_location_async
+--- config
+    location /main {
+        echo_location /flush;
+        echo_location /bar;
+        echo_location_async /bar;
+        echo_location_async /bar;
+        echo_location_async /group;
+        echo_location_async /group;
+    }
+
+    location /group {
+        echo_location_async /bar;
+        echo_location_async /bar;
+    }
+
+    location /bar {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo $echo_incr;
+    }
+
+    location /flush {
+        internal;
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"OK\r
+1
+1
+1
+1
+1
+1
+1
+"
+--- timeout: 2
+
+
+
+=== TEST 9: deep nested echo_location/echo_location_async
+--- config
+    location /main {
+        echo_location /flush;
+        echo_location /bar;
+        echo_location_async /bar;
+        echo_location /group;
+    }
+
+    location /group {
+        echo_location /bar;
+        echo_location_async /bar;
+    }
+
+    location /bar {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo $echo_incr;
+    }
+
+    location /flush {
+        internal;
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"OK\r
+1
+1
+1
+1
+"
+--- timeout: 1
+
+
+
+=== TEST 10: simple store
+--- config
+    location /main {
+        echo_location /flush;
+        echo_location /bar;
+    }
+
+    location /bar {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo $echo_incr;
+    }
+
+    location /flush {
+        internal;
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"OK\r
+1
+"
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/timeout.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/timeout.t
new file mode 100644
index 0000000..9357658
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/timeout.t
@@ -0,0 +1,119 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (4 * blocks() - 2);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: basic fetch (cache miss)
+--- config
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+       root   html;
+    }
+
+    location = /foo {
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        proxy_pass http://127.0.0.1:$server_port/hello;
+    }
+
+    location = /hello {
+        echo hello;
+        default_type text/css;
+    }
+
+    memc_connect_timeout 1ms;
+    location = /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass www.google.com:1234;
+    }
+--- user_files
+>>> 50x.html
+bad bad
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+!Content-Length
+--- response_body
+hello
+
+
+
+=== TEST 2: main req upstream truncation (with content-length)
+--- config
+    location = /t {
+        srcache_store PUT /err;
+
+        proxy_read_timeout 100ms;
+        proxy_pass http://127.0.0.1:11945/echo;
+    }
+
+    location = /err {
+        content_by_lua '
+            ngx.log(ngx.ERR, "location /err is called")
+        ';
+    }
+
+--- tcp_listen: 11945
+--- tcp_no_close
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\nContent-Length: 120\r\n\r\nhello world"
+
+--- request
+GET /t
+--- ignore_response
+--- no_error_log
+location /err is called
+--- no_error_log
+srcache_store: subrequest returned status
+
+
+
+=== TEST 3: main req upstream truncation (without content-length)
+--- config
+    location = /t {
+        srcache_store PUT /err;
+
+        proxy_read_timeout 100ms;
+        proxy_pass http://127.0.0.1:11945/echo;
+    }
+
+    location = /err {
+        content_by_lua '
+            ngx.log(ngx.ERR, "location /err is called")
+        ';
+    }
+
+--- tcp_listen: 11945
+--- tcp_no_close
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\n\r\nhello world"
+
+--- request
+GET /t
+--- ignore_response
+--- no_error_log
+location /err is called
+srcache_store: subrequest returned status
+[alert]
+[crit]
+
+--- error_log
+upstream timed out
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/unused.t b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/unused.t
new file mode 100644
index 0000000..9b4088f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/t/unused.t
@@ -0,0 +1,113 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks());
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_long_string();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: module used
+--- config
+    location /foo {
+        srcache_store PUT /store;
+        echo hello;
+    }
+
+    location /store {
+        echo stored;
+    }
+--- request
+GET /foo
+--- stap
+F(ngx_http_srcache_header_filter) {
+    println("srcache header filter called")
+}
+
+F(ngx_http_srcache_access_handler) {
+    println("srcache access handler called")
+}
+
+--- stap_out
+srcache access handler called
+srcache access handler called
+srcache header filter called
+srcache header filter called
+--- response_body
+hello
+
+
+
+=== TEST 2: module unused
+--- config
+    location /foo {
+        #srcache_store PUT /store;
+        echo hello;
+    }
+
+    location /store {
+        echo stored;
+    }
+--- request
+GET /foo
+--- stap
+F(ngx_http_srcache_header_filter) {
+    println("srcache header filter called")
+}
+
+F(ngx_http_srcache_access_handler) {
+    println("srcache access handler called")
+}
+
+--- stap_out
+--- response_body
+hello
+
+
+
+=== TEST 3: module used (multiple http {} blocks)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
+--- config
+    location /foo {
+        srcache_store PUT /store;
+        echo hello;
+    }
+
+    location /store {
+        echo stored;
+    }
+
+--- post_main_config
+    http {
+    }
+
+--- request
+GET /foo
+--- stap
+F(ngx_http_srcache_header_filter) {
+    println("srcache header filter called")
+}
+
+F(ngx_http_srcache_access_handler) {
+    println("srcache access handler called")
+}
+
+--- stap_out
+srcache access handler called
+srcache access handler called
+srcache header filter called
+srcache header filter called
+--- response_body
+hello
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/util/build.sh b/modules_deb/libnginx-mod-http-srcache-filter-0.33/util/build.sh
new file mode 100755
index 0000000..f28bac0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/util/build.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# this file is only meant to be used by the module developers.
+
+root=`pwd`
+version=$1
+home=~
+force=$2
+
+ngx_redis_version=0.3.7
+cd $home/work/nginx/ || exit 1
+ngx_redis_path=$home/work/nginx/ngx_http_redis-$ngx_redis_version
+rm -rf $ngx_redis_path || exit 1
+tar -xzvf ngx_http_redis-$ngx_redis_version.tar.gz || exit 1
+
+cd $ngx_redis_path || exit 1
+
+patch_file=$root/../openresty/patches/ngx_http_redis-$ngx_redis_version-variables_in_redis_pass.patch
+if [ ! -f $patch_file ]; then
+    echo "$patch_file: No such file" > /dev/stderr
+    exit 1
+fi
+# we ignore any errors here since the target directory might have already been patched.
+patch -p1 < $patch_file || exit 1
+
+cd $ngx_redis_path || exit 1
+
+patch_file=$root/../openresty/patches/ngx_http_redis-$ngx_redis_version-default_port_fix.patch
+if [ ! -f $patch_file ]; then
+    echo "$patch_file: No such file" > /dev/stderr
+    exit 1
+fi
+# we ignore any errors here since the target directory might have already been patched.
+patch -p1 < $patch_file || exit 1
+
+cd $root || exit 1
+
+            #--without-http_memcached_module \
+ngx-build $force $version \
+            --with-cc-opt="-O0" \
+            --with-ld-opt="-Wl,-rpath,/opt/postgres/lib:/opt/drizzle/lib:/usr/local/lib:/home/lz/lib" \
+            --without-mail_pop3_module \
+            --without-mail_imap_module \
+            --without-mail_smtp_module \
+            --without-http_upstream_ip_hash_module \
+            --without-http_empty_gif_module \
+            --without-http_referer_module \
+            --without-http_autoindex_module \
+            --without-http_auth_basic_module \
+            --without-http_userid_module \
+            --add-module=$root/../ndk-nginx-module \
+            --add-module=$root/../set-misc-nginx-module \
+          --add-module=$ngx_redis_path \
+          --add-module=$root/../xss-nginx-module \
+          --add-module=$root/../redis2-nginx-module \
+          --add-module=$root/../eval-nginx-module \
+          --add-module=$root/../echo-nginx-module \
+          --add-module=$root/../headers-more-nginx-module \
+          --add-module=$root $opts \
+          --add-module=$root/../lua-nginx-module \
+          --add-module=$root/../rds-json-nginx-module \
+          --add-module=$root/../drizzle-nginx-module \
+          --add-module=$root/../postgres-nginx-module \
+          --add-module=$root/../memc-nginx-module \
+            --add-module=$home/work/nginx/ngx_http_upstream_keepalive-0.7 \
+          --with-select_module \
+          --with-poll_module \
+          --without-http_ssi_module \
+          --with-debug
+          #--add-module=/home/agentz/git/dodo/utils/dodo-hook \
+          #--add-module=$home/work/ngx_http_auth_request-0.1 #\
+          #--with-rtsig_module
+          #--with-cc-opt="-g3 -O0"
+          #--add-module=$root/../echo-nginx-module \
+
diff --git a/modules_deb/libnginx-mod-http-srcache-filter-0.33/valgrind.suppress b/modules_deb/libnginx-mod-http-srcache-filter-0.33/valgrind.suppress
new file mode 100644
index 0000000..769d9d0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-srcache-filter-0.33/valgrind.suppress
@@ -0,0 +1,93 @@
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Addr4
+   fun:ngx_init_cycle
+   fun:ngx_master_process_cycle
+   fun:main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_ctl(event)
+   fun:epoll_ctl
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:memcpy
+   fun:ngx_vslprintf
+   fun:ngx_log_error_core
+   fun:ngx_http_charset_header_filter
+}
+{
+   <insert_a_suppression_name_here>
+   exp-sgcheck:SorG
+   fun:ngx_http_variables_init_vars
+   fun:ngx_http_block
+}
+{
+   <insert_a_suppression_name_here>
+   exp-sgcheck:SorG
+   fun:ngx_conf_parse
+}
+{
+   <insert_a_suppression_name_here>
+   exp-sgcheck:SorG
+   fun:ngx_vslprintf
+   fun:ngx_log_error_core
+}
+{
+   <insert_a_suppression_name_here>
+   exp-sgcheck:SorG
+   fun:ngx_conf_parse
+   fun:ngx_http_core_location
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   socketcall.setsockopt(optval)
+   fun:setsockopt
+   fun:drizzle_state_connect
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:ngx_conf_flush_files
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_event_process_init
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:index
+   fun:expand_dynamic_string_token
+   fun:_dl_map_object
+   fun:map_doit
+   fun:_dl_catch_error
+   fun:do_preload
+   fun:dl_main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+}
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/CHANGES b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/CHANGES
new file mode 100644
index 0000000..b8a7ef1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/CHANGES
@@ -0,0 +1,37 @@
+
+Changes with nginx_substitutions_filter 0.6.4                                     2014-02-15
+
+    *) Now non-200 response will work
+    *) added the subs_filter_bypass directive
+
+Changes with nginx_substitutions_filter 0.6.2                                     2012-08-26
+
+    *) fixed a bug of buffer overlap
+    *) fixed a bug with last zero buffer
+
+Changes with nginx_substitutions_filter 0.6.0                                     2012-06-30
+
+    *) refactor this module
+
+Changes with nginx_substitutions_filter 0.5.2                                     2010-08-11
+
+    *) do many optimizing for this module
+    *) fix a bug of buffer overlap
+    *) fix a segment fault bug when output chain return NGX_AGAIN.
+    *) fix a bug about last buffer with no linefeed. This may cause segment fault. Thanks for Josef Fröhle 
+
+Changes with nginx_substitutions_filter 0.5                                       2010-04-15
+
+    *) refactor the source structure, create branches of dev
+    *) fix a bug of small chunk of buffers causing lose content
+    *) fix the bug of last_buf and the nginx's compatibility above 0.8.25
+    *) fix a bug with unwanted capture config error in fix string substitution
+    *) add feature of regex captures
+
+Changes with nginx_substitutions_filter 0.4                                       2009-12-23
+
+    *) fix many bugs
+
+Changes with nginx_substitutions_filter 0.3                                       2009-02-04
+
+    *) Initial public release
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/README b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/README
new file mode 100644
index 0000000..1d32e05
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/README
@@ -0,0 +1,141 @@
+nginx_substitutions_filter
+    *Note: this module is not distributed with the Nginx source.
+    Installation instructions can be found below.*
+
+  Description
+    nginx_substitutions_filter is a filter module which can do both regular
+    expression and fixed string substitutions on response bodies. This
+    module is quite different from the Nginx's native Substitution Module.
+    It scans the output chains buffer and matches string line by line, just
+    like Apache's mod_substitute
+    (<http://httpd.apache.org/docs/trunk/mod/mod_substitute.html>).
+
+  Example
+    location / {
+
+        subs_filter_types text/html text/css text/xml;
+        subs_filter st(\d*).example.com $1.example.com ir;
+        subs_filter a.example.com s.example.com;
+
+    }
+
+  Directives
+    *   subs_filter_types
+
+    *   subs_filter
+
+   subs_filter_types
+    syntax: *subs_filter_types mime-type [mime-types] *
+
+    default: *subs_filter_types text/html*
+
+    context: *http, server, location*
+
+    *subs_filter_types* is used to specify which content types should be
+    checked for *subs_filter*. The default is only *text/html*.
+
+    This module just works with plain text. If the response is compressed,
+    it can't uncompress the response and will ignore this response. This
+    module can be compatible with gzip filter module. But it will not work
+    with proxy compressed response. You can disable the compressed response
+    like this:
+
+    proxy_set_header Accept-Encoding "";
+
+   subs_filter
+    syntax: *subs_filter source_str destination_str [gior] *
+
+    default: *none*
+
+    context: *http, server, location*
+
+    *subs_filter* allows replacing source string(regular expression or
+    fixed) in the nginx response with destination string. Substitution text
+    may contain variables. More than one substitution rules per location is
+    supported. The meaning of the third flags are:
+
+    *   *g*(default): Replace all the match strings.
+
+    *   *i*: Perform a case-insensitive match.
+
+    *   *o*: Just replace the first one.
+
+    *   *r*: The pattern is treated as a regular expression, default is
+        fixed string.
+
+   subs_filter_bypass
+    syntax: *subs_filter_bypass $variable1 ...*
+
+    default: *none*
+
+    context: *http, server, location*
+
+    You can sepcify several variables with this directive. If at least one
+    of the variable is not empty and is not equal to '0', this substitution
+    filter will be disabled.
+
+  Installation
+    To install, get the source with subversion:
+
+    git clone
+    git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git
+
+    and then compile nginx with the following option:
+
+    ./configure --add-module=/path/to/module
+
+  Known issue
+    *   Can't substitute the response header.
+
+  CHANGES
+    Changes with nginx_substitutions_filter 0.6.4 2014-02-15
+
+    *   Now non-200 response will work
+
+    *   added the subs_filter_bypass directive
+
+    Changes with nginx_substitutions_filter 0.6.2 2012-08-26
+
+    *   fixed a bug of buffer overlap
+
+    *   fixed a bug with last zero buffer
+
+    Changes with nginx_substitutions_filter 0.6.0 2012-06-30
+
+    *   refactor this module
+
+    Changes with nginx_substitutions_filter 0.5.2 2010-08-11
+
+    *   do many optimizing for this module
+
+    *   fix a bug of buffer overlap
+
+    *   fix a segment fault bug when output chain return NGX_AGAIN.
+
+    *   fix a bug about last buffer with no linefeed. This may cause segment
+        fault. Thanks for Josef Fröhle
+
+    Changes with nginx_substitutions_filter 0.5 2010-04-15
+
+    *   refactor the source structure, create branches of dev
+
+    *   fix a bug of small chunk of buffers causing lose content
+
+    *   fix the bug of last_buf and the nginx's compatibility above 0.8.25
+
+    *   fix a bug with unwanted capture config error in fix string
+        substitution
+
+    *   add feature of regex captures
+
+    Changes with nginx_substitutions_filter 0.4 2009-12-23
+
+    *   fix many bugs
+
+    Changes with nginx_substitutions_filter 0.3 2009-02-04
+
+    *   Initial public release
+
+  Reporting a bug
+    Questions/patches may be directed to Weibin Yao, yaoweibin@gmail.com.
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/config b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/config
new file mode 100644
index 0000000..f1de029
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/config
@@ -0,0 +1,15 @@
+ngx_addon_name=ngx_http_subs_filter_module
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP_FILTER
+    ngx_module_name=ngx_http_subs_filter_module
+    ngx_module_incs=
+    ngx_module_deps=
+    ngx_module_srcs="$ngx_addon_dir/ngx_http_subs_filter_module.c"
+    ngx_module_libs=""
+
+    . auto/module
+else
+    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
+fi
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/changelog b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/changelog
new file mode 100644
index 0000000..0187588
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/changelog
@@ -0,0 +1,52 @@
+libnginx-mod-http-subs-filter (1:0.6.4-7) unstable; urgency=medium
+
+  * d/control: update my email to janmojzis@debian.org
+  * d/copyright: update my email to janmojzis@debian.org
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/copyright: bump debian/* copyright year
+  * d/watch: use more generic template
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 11 Apr 2025 14:27:02 +0200
+
+libnginx-mod-http-subs-filter (1:0.6.4-6) unstable; urgency=medium
+
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 15:31:28 +0200
+
+libnginx-mod-http-subs-filter (1:0.6.4-5) unstable; urgency=medium
+
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:16:40 +0200
+
+libnginx-mod-http-subs-filter (1:0.6.4-4) unstable; urgency=medium
+
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/copyright: bump my copyright year
+  * d/copyright: update text to be compatible with 'cme update dpkg-copyright'
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:45 +0100
+
+libnginx-mod-http-subs-filter (1:0.6.4-3) unstable; urgency=medium
+
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/p/0002-check-content-encoding-header-more-carefully.patch added,
+    (Closes: 966293) + refreshed other patches
+  * d/gbb.conf: switched to debian branch main (debian-branch = main)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 04 Jan 2023 19:53:04 +0100
+
+libnginx-mod-http-subs-filter (1:0.6.4-2) unstable; urgency=medium
+
+  * d/control: added Multi-Arch: foreign
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 12:50:29 +0100
+
+libnginx-mod-http-subs-filter (1:0.6.4-1) experimental; urgency=medium
+
+  * Initial release. (Closes: 1024370)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 14:46:56 +0100
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/control b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/control
new file mode 100644
index 0000000..b11de7a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/control
@@ -0,0 +1,24 @@
+Source: libnginx-mod-http-subs-filter
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jan Mojžíš <janmojzis@debian.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+Standards-Version: 4.7.2
+Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-subs-filter.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-subs-filter
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-subs-filter
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: Substitution filter module for Nginx
+ Substitution Nginx module can do both regular expression and fixed string
+ substitutions on response bodies. The module is quite different from Nginx's
+ native Substitution module. It scans the output chains buffer and
+ matches string line by line, just like Apache's mod_substitute.
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/copyright b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/copyright
new file mode 100644
index 0000000..03e9e31
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/copyright
@@ -0,0 +1,116 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ngx_http_substitutions_filter_module
+Upstream-Contact: Weibin Yao <yaoweibin@gmail.com>
+Source: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
+
+Files: *
+Copyright: 2014, Weibin Yao <yaoweibin@gmail.com>
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022, Miao Wang <shankerwangmiao@gmail.com>
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-3-clause
+
+Files: test/*
+Copyright: 2011, Antoine Bonavita "<antoine.bonavita@gmail.com>".
+ 2009-2011, agentzh "<agentzh@gmail.com>".
+ 2009-2011, Taobao Inc., Alibaba Group
+License: BSD-3-clause
+
+Files: test/inc/*
+Copyright: agentzh (章亦春) "<agentzh@gmail.com>"
+ Antoine BONAVITA "<antoine.bonavita@gmail.com>"
+ 2009-2011, Taobao Inc., Alibaba Group
+License: BSD-3-clause
+
+Files: test/inc/Module/Install.pm
+Copyright: 2008-2011, Adam Kennedy.
+License: BSD-3-clause
+
+Files: test/lib/*
+Copyright: agentzh (章亦春) "<agentzh@gmail.com>"
+ Antoine BONAVITA "<antoine.bonavita@gmail.com>"
+ 2009-2011, Taobao Inc., Alibaba Group
+License: BSD-3-clause
+
+Files: test/lib/Test/Nginx.pm
+Copyright: 2011, Antoine Bonavita C<< <antoine.bonavita@gmail.com> >>.
+ 2009-2011, agentzh C<< <agentzh@gmail.com> >>.
+ 2009-2011, Taobao Inc., Alibaba Group (L<http://www.taobao.com>).
+License: BSD-3-clause
+
+Files: test/lib/Test/Nginx/LWP.pm
+Copyright: 2009-2011, agentzh C<< <agentzh@gmail.com> >>.
+ 2009-2011, Taobao Inc., Alibaba Group (L<http://www.taobao.com>).
+License: BSD-3-clause
+
+Files: test/lib/Test/Nginx/Socket.pm
+Copyright: 2011, Antoine BONAVITA C<< <antoine.bonavita@gmail.com> >>.
+ 2009-2011, agentzh C<< <agentzh@gmail.com> >>.
+ 2009-2011, Taobao Inc., Alibaba Group (L<http://www.taobao.com>).
+License: BSD-3-clause
+
+Files: test/t/*
+Copyright: agentzh (章亦春) "<agentzh@gmail.com>"
+ Antoine BONAVITA "<antoine.bonavita@gmail.com>"
+ 2009-2011, Taobao Inc., Alibaba Group
+License: BSD-3-clause
+
+Files: test/test.sh
+Copyright: agentzh (章亦春) "<agentzh@gmail.com>"
+ Antoine BONAVITA "<antoine.bonavita@gmail.com>"
+ 2009-2011, Taobao Inc., Alibaba Group
+License: BSD-3-clause
+
+License: BSD-2-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: BSD-3-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/gbp.conf b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/gbp.conf
new file mode 100644
index 0000000..38c12c1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0001-Feature-nginx-dynamic-module-support.patch b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0001-Feature-nginx-dynamic-module-support.patch
new file mode 100644
index 0000000..f1ca5c5
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0001-Feature-nginx-dynamic-module-support.patch
@@ -0,0 +1,36 @@
+From b157ed379c3c9c5c1846caa594d6733e88406863 Mon Sep 17 00:00:00 2001
+From: Jeffrey Kriegsman <jeffrey@kriegsman.eu>
+Date: Mon, 15 Feb 2016 15:36:21 +0100
+Subject: [PATCH] Feature: nginx dynamic module support
+Origin: https://github.com/yaoweibin/ngx_http_substitutions_filter_module/commit/b157ed379c3c9c5c1846caa594d6733e88406863
+Forwarded: not-needed
+
+---
+ config | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/config b/config
+index fdb016c..f1de029 100644
+--- a/config
++++ b/config
+@@ -1,3 +1,15 @@
+ ngx_addon_name=ngx_http_subs_filter_module
+-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
++
++if test -n "$ngx_module_link"; then
++    ngx_module_type=HTTP_FILTER
++    ngx_module_name=ngx_http_subs_filter_module
++    ngx_module_incs=
++    ngx_module_deps=
++    ngx_module_srcs="$ngx_addon_dir/ngx_http_subs_filter_module.c"
++    ngx_module_libs=""
++
++    . auto/module
++else
++    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
++    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
++fi
+-- 
+2.30.2
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0002-check-content-encoding-header-more-carefully.patch b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0002-check-content-encoding-header-more-carefully.patch
new file mode 100644
index 0000000..7887569
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0002-check-content-encoding-header-more-carefully.patch
@@ -0,0 +1,29 @@
+From b5f4e924efdeb2004acdf8f2632df8a63d4263f1 Mon Sep 17 00:00:00 2001
+From: Indust <603170673m@gmail.com>
+Date: Tue, 12 Apr 2016 13:32:19 +0800
+Subject: [PATCH] check content-encoding header more carefully
+Origin: https://github.com/yaoweibin/ngx_http_substitutions_filter_module/commit/b5f4e924efdeb2004acdf8f2632df8a63d4263f1
+Forwarded: not-needed
+
+---
+ ngx_http_subs_filter_module.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ngx_http_subs_filter_module.c b/ngx_http_subs_filter_module.c
+index a23b2df..bb48e9d 100644
+--- a/ngx_http_subs_filter_module.c
++++ b/ngx_http_subs_filter_module.c
+@@ -245,7 +245,9 @@ ngx_http_subs_header_filter(ngx_http_request_t *r)
+ 
+     /* Don't do substitution with the compressed content */
+     if (r->headers_out.content_encoding
+-        && r->headers_out.content_encoding->value.len) {
++        && r->headers_out.content_encoding->value.len
++        && ngx_strncasecmp(r->headers_out.content_encoding->value.data,
++                            (u_char *) "identity", 8) != 0) {
+ 
+         ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                       "http subs filter header ignored, this may be a "
+-- 
+2.30.2
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0003-PCRE2-support-added.patch b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0003-PCRE2-support-added.patch
new file mode 100644
index 0000000..b01993b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/0003-PCRE2-support-added.patch
@@ -0,0 +1,30 @@
+From cc494d7f5c5273a7a8ae503faebf1101689d75c0 Mon Sep 17 00:00:00 2001
+From: shmux8 <75251845+shmux8@users.noreply.github.com>
+Date: Tue, 28 Dec 2021 11:15:00 +0300
+Subject: [PATCH] PCRE2 support added
+Origin: https://github.com/yaoweibin/ngx_http_substitutions_filter_module/commit/cc494d7f5c5273a7a8ae503faebf1101689d75c0
+Forwarded: not-needed
+
+Use pcre2_pattern_info call if nginx built with PCRE2.
+---
+ ngx_http_subs_filter_module.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ngx_http_subs_filter_module.c b/ngx_http_subs_filter_module.c
+index bb48e9d..13355bf 100644
+--- a/ngx_http_subs_filter_module.c
++++ b/ngx_http_subs_filter_module.c
+@@ -1248,7 +1248,9 @@ ngx_http_subs_regex_capture_count(ngx_regex_t *re)
+ 
+     n = 0;
+ 
+-#if defined(nginx_version) && nginx_version >= 1002002
++#if (NGX_PCRE2)
++    rc = pcre2_pattern_info(re, PCRE2_INFO_CAPTURECOUNT, &n);
++#elif defined(nginx_version) && nginx_version >= 1002002
+     rc = pcre_fullinfo(re->code, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+ #elif defined(nginx_version) && nginx_version >= 1001012
+     rc = pcre_fullinfo(re->pcre, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+-- 
+2.30.2
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/series b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/series
new file mode 100644
index 0000000..7316931
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/patches/series
@@ -0,0 +1,3 @@
+0001-Feature-nginx-dynamic-module-support.patch
+0002-check-content-encoding-header-more-carefully.patch
+0003-PCRE2-support-added.patch
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/rules b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/source/format b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/control b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/control
new file mode 100644
index 0000000..ca20b9f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/control
@@ -0,0 +1,6 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/generic b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/upstream/metadata b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/upstream/metadata
new file mode 100644
index 0000000..d3ab623
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/yaoweibin/ngx_http_substitutions_filter_module/issues
+Bug-Submit: https://github.com/yaoweibin/ngx_http_substitutions_filter_module/issues/new
+Repository-Browse: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/watch b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/watch
new file mode 100644
index 0000000..b4c56bf
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/debian/watch
@@ -0,0 +1,6 @@
+version=4
+opts="\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/yaoweibin/ngx_http_substitutions_filter_module/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.google_code_home_page.wiki b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.google_code_home_page.wiki
new file mode 100644
index 0000000..6a158a2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.google_code_home_page.wiki
@@ -0,0 +1,120 @@
+= nginx_substitutions_filter =
+
+_Note: this module is not distributed with the Nginx source. Installation instructions can be found [#Installation below]._
+
+== Description ==
+
+`nginx_substitutions_filter` is a filter module which can do both regular expression and fixed string substitutions on response bodies. This module is quite different from the Nginx's native Substitution Module. It scans the output chains buffer and matches string line by line, just like Apache's [http://httpd.apache.org/docs/trunk/mod/mod_substitute.html mod_substitute].
+
+== Example ==
+
+{{{
+location / {
+
+    subs_filter_types text/html text/css text/xml;
+    subs_filter st(\d*).example.com $1.example.com ir;
+    subs_filter a.example.com s.example.com;
+
+}
+}}}
+== Directives ==
+
+ * [#subs_filter_types subs_filter_types]
+ * [#subs_filter subs_filter]
+
+=== subs_filter_types ===
+
+`syntax:` _subs_filter_types mime-type `[`mime-types`]` _
+
+`default:` _subs_filter_types text/html_
+
+`context:` _http, server, location_
+
+_subs_filter_types_ is used to specify which content types should be checked for _subs_filter_. The default is only _text/html_.
+
+This module just works with plain text. If the response is compressed, it can't uncompress the response and will ignore this response. This module can be compatible with gzip filter module. But it will not work with proxy compressed response. You can disable the compressed response like this:
+
+proxy_set_header Accept-Encoding "";
+
+=== subs_filter ===
+
+`syntax:` _subs_filter source_str destination_str `[`gior`]` _
+
+`default:` _none_
+
+`context:` _http, server, location_
+
+_subs_filter_ allows replacing source string(regular expression or fixed) in the nginx response with destination string. Substitution text may contain variables. More than one substitution rules per location is supported. The meaning of the third flags are:
+ * _g_(default): Replace all the match strings.
+ * _i_: Perform a case-insensitive match.
+ * _o_: Just replace the first one.
+ * _r_: The pattern is treated as a regular expression, default is fixed string.
+
+=== subs_filter_bypass ===
+
+`syntax:` _subs_filter_bypass $variable1 ..._
+
+`default:` _none_
+
+`context:` _http, server, location_
+
+You can sepcify several variables with this directive. If at least one of the variable is not empty and is not equal to '0', this substitution filter will be disabled.
+
+== Installation ==
+
+To install, get the source with subversion:
+
+{{{
+git clone git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git
+}}}
+and then compile nginx with the following option:
+
+{{{
+./configure --add-module=/path/to/module
+}}}
+== Known issue ==
+ * Can't substitute the response header.
+
+== CHANGES ==
+
+Changes with nginx_substitutions_filter 0.6.4                                     2014-02-15
+
+ * Now non-200 response will work
+ * added the subs_filter_bypass directive
+
+Changes with nginx_substitutions_filter 0.6.2                                     2012-08-26
+
+ * fixed a bug of buffer overlap
+ * fixed a bug with last zero buffer
+
+Changes with nginx_substitutions_filter 0.6.0                                     2012-06-30
+
+ * refactor this module
+
+Changes with nginx_substitutions_filter 0.5.2                                     2010-08-11
+
+ * do many optimizing for this module
+ * fix a bug of buffer overlap
+ * fix a segment fault bug when output chain return NGX_AGAIN.
+ * fix a bug about last buffer with no linefeed. This may cause segment fault. Thanks for Josef Fröhle
+
+Changes with nginx_substitutions_filter 0.5                                       2010-04-15
+
+ * refactor the source structure, create branches of dev
+ * fix a bug of small chunk of buffers causing lose content
+ * fix the bug of last_buf and the nginx's compatibility above 0.8.25
+ * fix a bug with unwanted capture config error in fix string substitution
+ * add feature of regex captures
+
+Changes with nginx_substitutions_filter 0.4                                       2009-12-23
+
+ * fix many bugs
+
+Changes with nginx_substitutions_filter 0.3                                       2009-02-04
+
+ * Initial public release
+
+== Reporting a bug ==
+
+Questions/patches may be directed to Weibin Yao, yaoweibin@gmail.com.
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.html b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.html
new file mode 100644
index 0000000..28c6810
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.html
@@ -0,0 +1,199 @@
+<?xml version="1.0" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>nginx_substitutions_filter</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rev="made" href="mailto:root@localhost" />
+</head>
+
+<body style="background-color: white">
+
+<p><a name="__index__"></a></p>
+<!-- INDEX BEGIN -->
+
+<ul>
+
+	<li><a href="#nginx_substitutions_filter">nginx_substitutions_filter</a></li>
+	<ul>
+
+		<li><a href="#description">Description</a></li>
+		<li><a href="#example">Example</a></li>
+		<li><a href="#directives">Directives</a></li>
+		<ul>
+
+			<li><a href="#subs_filter_types">subs_filter_types</a></li>
+			<li><a href="#subs_filter">subs_filter</a></li>
+			<li><a href="#subs_filter_bypass">subs_filter_bypass</a></li>
+		</ul>
+
+		<li><a href="#installation">Installation</a></li>
+		<li><a href="#known_issue">Known issue</a></li>
+		<li><a href="#changes">CHANGES</a></li>
+		<li><a href="#reporting_a_bug">Reporting a bug</a></li>
+	</ul>
+
+</ul>
+<!-- INDEX END -->
+
+<hr />
+<p>
+</p>
+<h1><a name="nginx_substitutions_filter">nginx_substitutions_filter</a></h1>
+<p><em>Note: this module is not distributed with the Nginx source. Installation instructions can be found <a href="#installation">below</a>. </em>&gt;</p>
+<p>
+</p>
+<h2><a name="description">Description</a></h2>
+<p><strong>nginx_substitutions_filter</strong> is a filter module which can do both regular expression and fixed string substitutions on response bodies. This module is quite different from the Nginx's native Substitution Module. It scans the output chains buffer and matches string line by line, just like Apache's mod_substitute (<a href="http://httpd.apache.org/docs/trunk/mod/mod_substitute.html">http://httpd.apache.org/docs/trunk/mod/mod_substitute.html</a>).</p>
+<p>
+</p>
+<h2><a name="example">Example</a></h2>
+<p>location / {</p>
+<pre>
+    subs_filter_types text/html text/css text/xml;
+    subs_filter st(\d*).example.com $1.example.com ir;
+    subs_filter a.example.com s.example.com;</pre>
+<p>}</p>
+<p>
+</p>
+<h2><a name="directives">Directives</a></h2>
+<ul>
+<li>
+<p><a href="#subs_filter_types">subs_filter_types</a></p>
+</li>
+<li>
+<p><a href="#subs_filter">subs_filter</a></p>
+</li>
+</ul>
+<p>
+</p>
+<h3><a name="subs_filter_types">subs_filter_types</a></h3>
+<p><strong>syntax:</strong> <em>subs_filter_types mime-type [mime-types] </em></p>
+<p><strong>default:</strong> <em>subs_filter_types text/html</em></p>
+<p><strong>context:</strong> <em>http, server, location</em></p>
+<p><em>subs_filter_types</em> is used to specify which content types should be checked for <em>subs_filter</em>. The default is only <em>text/html</em>.</p>
+<p>This module just works with plain text. If the response is compressed, it can't uncompress the response and will ignore this response. This module can be compatible with gzip filter module. But it will not work with proxy compressed response. You can disable the compressed response like this:</p>
+<p>proxy_set_header Accept-Encoding ``'';</p>
+<p>
+</p>
+<h3><a name="subs_filter">subs_filter</a></h3>
+<p><strong>syntax:</strong> <em>subs_filter source_str destination_str [gior] </em></p>
+<p><strong>default:</strong> <em>none</em></p>
+<p><strong>context:</strong> <em>http, server, location</em></p>
+<p><em>subs_filter</em> allows replacing source string(regular expression or fixed) in the nginx response with destination string. Substitution text may contain variables. More than one substitution rules per location is supported. The meaning of the third flags are:</p>
+<ul>
+<li>
+<p><em>g</em>(default): Replace all the match strings.</p>
+</li>
+<li>
+<p><em>i</em>: Perform a case-insensitive match.</p>
+</li>
+<li>
+<p><em>o</em>: Just replace the first one.</p>
+</li>
+<li>
+<p><em>r</em>: The pattern is treated as a regular expression, default is fixed string.</p>
+</li>
+</ul>
+<p>
+</p>
+<h3><a name="subs_filter_bypass">subs_filter_bypass</a></h3>
+<p><strong>syntax:</strong> <em>subs_filter_bypass $variable1 ...</em></p>
+<p><strong>default:</strong> <em>none</em></p>
+<p><strong>context:</strong> <em>http, server, location</em></p>
+<p>You can sepcify several variables with this directive. If at least one of the variable is not empty and is not equal to '0', this substitution filter will be disabled.</p>
+<p>
+</p>
+<h2><a name="installation">Installation</a></h2>
+<p>To install, get the source with subversion:</p>
+<p>git clone <a href="git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git">git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git</a></p>
+<p>and then compile nginx with the following option:</p>
+<p>./configure --add-module=/path/to/module</p>
+<p>
+</p>
+<h2><a name="known_issue">Known issue</a></h2>
+<ul>
+<li>
+<p>Can't substitute the response header.</p>
+</li>
+</ul>
+<p>
+</p>
+<h2><a name="changes">CHANGES</a></h2>
+<p>Changes with nginx_substitutions_filter 0.6.4                                     2014-02-15</p>
+<ul>
+<li>
+<p>Now non-200 response will work</p>
+</li>
+<li>
+<p>added the subs_filter_bypass directive</p>
+</li>
+</ul>
+<p>Changes with nginx_substitutions_filter 0.6.2                                     2012-08-26</p>
+<ul>
+<li>
+<p>fixed a bug of buffer overlap</p>
+</li>
+<li>
+<p>fixed a bug with last zero buffer</p>
+</li>
+</ul>
+<p>Changes with nginx_substitutions_filter 0.6.0                                     2012-06-30</p>
+<ul>
+<li>
+<p>refactor this module</p>
+</li>
+</ul>
+<p>Changes with nginx_substitutions_filter 0.5.2                                     2010-08-11</p>
+<ul>
+<li>
+<p>do many optimizing for this module</p>
+</li>
+<li>
+<p>fix a bug of buffer overlap</p>
+</li>
+<li>
+<p>fix a segment fault bug when output chain return NGX_AGAIN.</p>
+</li>
+<li>
+<p>fix a bug about last buffer with no linefeed. This may cause segment fault. Thanks for Josef Fröhle</p>
+</li>
+</ul>
+<p>Changes with nginx_substitutions_filter 0.5                                       2010-04-15</p>
+<ul>
+<li>
+<p>refactor the source structure, create branches of dev</p>
+</li>
+<li>
+<p>fix a bug of small chunk of buffers causing lose content</p>
+</li>
+<li>
+<p>fix the bug of last_buf and the nginx's compatibility above 0.8.25</p>
+</li>
+<li>
+<p>fix a bug with unwanted capture config error in fix string substitution</p>
+</li>
+<li>
+<p>add feature of regex captures</p>
+</li>
+</ul>
+<p>Changes with nginx_substitutions_filter 0.4                                       2009-12-23</p>
+<ul>
+<li>
+<p>fix many bugs</p>
+</li>
+</ul>
+<p>Changes with nginx_substitutions_filter 0.3                                       2009-02-04</p>
+<ul>
+<li>
+<p>Initial public release</p>
+</li>
+</ul>
+<p>
+</p>
+<h2><a name="reporting_a_bug">Reporting a bug</a></h2>
+<p>Questions/patches may be directed to Weibin Yao, <a href="mailto:yaoweibin@gmail.com.">yaoweibin@gmail.com.</a></p>
+
+</body>
+
+</html>
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.wiki b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.wiki
new file mode 100644
index 0000000..b707f45
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/doc/README.wiki
@@ -0,0 +1,123 @@
+= nginx_substitutions_filter =
+
+''Note: this module is not distributed with the Nginx source. Installation instructions can be found [[#Installation|below]].''
+
+== Description ==
+
+'''nginx_substitutions_filter''' is a filter module which can do both regular expression and fixed string substitutions on response bodies. This module is quite different from the Nginx's native Substitution Module. It scans the output chains buffer and matches string line by line, just like Apache's [http://httpd.apache.org/docs/trunk/mod/mod_substitute.html mod_substitute].
+
+== Example ==
+
+<geshi lang="nginx">
+location / {
+
+    subs_filter_types text/html text/css text/xml;
+    subs_filter st(\d*).example.com $1.example.com ir;
+    subs_filter a.example.com s.example.com;
+
+}
+</geshi>
+
+== Directives ==
+
+* [[#subs_filter_types|subs_filter_types]]
+* [[#subs_filter|subs_filter]]
+
+=== subs_filter_types ===
+
+'''syntax:''' ''subs_filter_types mime-type [mime-types] ''
+
+'''default:''' ''subs_filter_types text/html''
+
+'''context:''' ''http, server, location''
+
+''subs_filter_types'' is used to specify which content types should be checked for ''subs_filter''. The default is only ''text/html''.
+
+This module just works with plain text. If the response is compressed, it can't uncompress the response and will ignore this response. This module can be compatible with gzip filter module. But it will not work with proxy compressed response. You can disable the compressed response like this:
+
+proxy_set_header Accept-Encoding "";
+
+=== subs_filter ===
+
+'''syntax:''' ''subs_filter source_str destination_str [gior] ''
+
+'''default:''' ''none''
+
+'''context:''' ''http, server, location''
+
+''subs_filter'' allows replacing source string(regular expression or fixed) in the nginx response with destination string. Substitution text may contain variables. More than one substitution rules per location is supported. The meaning of the third flags are:
+* ''g''(default): Replace all the match strings.
+* ''i'': Perform a case-insensitive match.
+* ''o'': Just replace the first one.
+* ''r'': The pattern is treated as a regular expression, default is fixed string.
+
+=== subs_filter_bypass ===
+
+'''syntax:''' ''subs_filter_bypass $variable1 ...''
+
+'''default:''' ''none''
+
+'''context:''' ''http, server, location''
+
+You can sepcify several variables with this directive. If at least one of the variable is not empty and is not equal to '0', this substitution filter will be disabled.
+
+== Installation ==
+
+To install, get the source with subversion:
+
+<code>
+git clone git://github.com/yaoweibin/ngx_http_substitutions_filter_module.git
+</code>
+
+and then compile nginx with the following option:
+
+<code>
+./configure --add-module=/path/to/module
+</code>
+
+== Known issue ==
+* Can't substitute the response header.
+
+== CHANGES ==
+
+Changes with nginx_substitutions_filter 0.6.4                                     2014-02-15
+
+* Now non-200 response will work
+* added the subs_filter_bypass directive
+
+Changes with nginx_substitutions_filter 0.6.2                                     2012-08-26
+
+* fixed a bug of buffer overlap
+* fixed a bug with last zero buffer
+
+Changes with nginx_substitutions_filter 0.6.0                                     2012-06-30
+
+* refactor this module
+
+Changes with nginx_substitutions_filter 0.5.2                                     2010-08-11
+
+* do many optimizing for this module
+* fix a bug of buffer overlap
+* fix a segment fault bug when output chain return NGX_AGAIN.
+* fix a bug about last buffer with no linefeed. This may cause segment fault. Thanks for Josef Fröhle
+
+Changes with nginx_substitutions_filter 0.5                                       2010-04-15
+
+* refactor the source structure, create branches of dev
+* fix a bug of small chunk of buffers causing lose content
+* fix the bug of last_buf and the nginx's compatibility above 0.8.25
+* fix a bug with unwanted capture config error in fix string substitution
+* add feature of regex captures
+
+Changes with nginx_substitutions_filter 0.4                                       2009-12-23
+
+* fix many bugs
+
+Changes with nginx_substitutions_filter 0.3                                       2009-02-04
+
+* Initial public release
+
+== Reporting a bug ==
+
+Questions/patches may be directed to Weibin Yao, yaoweibin@gmail.com.
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/ngx_http_subs_filter_module.c b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/ngx_http_subs_filter_module.c
new file mode 100644
index 0000000..04834f8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/ngx_http_subs_filter_module.c
@@ -0,0 +1,1302 @@
+/*
+ * Author: Weibin Yao(yaoweibin@gmail.com)
+ *
+ * Licence: This module could be distributed under the
+ * same terms as Nginx itself.
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+#if (NGX_DEBUG)
+#define SUBS_DEBUG 1
+#else
+#define SUBS_DEBUG 0
+#endif
+
+
+#ifndef NGX_HTTP_MAX_CAPTURES
+#define NGX_HTTP_MAX_CAPTURES 9
+#endif
+
+
+#define ngx_buffer_init(b) b->pos = b->last = b->start;
+
+
+typedef struct {
+    ngx_flag_t     once;
+    ngx_flag_t     regex;
+    ngx_flag_t     insensitive;
+
+    /* If it has captured variables? */
+    ngx_flag_t     has_captured;
+
+    ngx_str_t      match;
+#if (NGX_PCRE)
+    ngx_regex_t   *match_regex;
+    int           *captures;
+    ngx_int_t      ncaptures;
+#endif
+
+    ngx_str_t      sub;
+    ngx_array_t   *sub_lengths;
+    ngx_array_t   *sub_values;
+
+    unsigned       matched;
+} sub_pair_t;
+
+
+typedef struct {
+    ngx_hash_t     types;
+    ngx_array_t   *sub_pairs;   /* array of sub_pair_t     */
+    ngx_array_t   *types_keys;  /* array of ngx_hash_key_t */
+    ngx_array_t   *bypass;      /* array of ngx_http_complex_value_t */
+    size_t         line_buffer_size;
+    ngx_bufs_t     bufs;
+} ngx_http_subs_loc_conf_t;
+
+
+typedef struct {
+    ngx_array_t   *sub_pairs;  /* array of sub_pair_t */
+
+    ngx_chain_t   *in;
+
+    /* the line input buffer before substitution */
+    ngx_buf_t     *line_in;
+    /* the line destination buffer after substitution */
+    ngx_buf_t     *line_dst;
+
+    /* the last output buffer */
+    ngx_buf_t     *out_buf;
+    /* point to the last output chain's next chain */
+    ngx_chain_t  **last_out;
+    ngx_chain_t   *out;
+
+    ngx_chain_t   *busy;
+
+    /* the freed chain buffers. */
+    ngx_chain_t   *free;
+
+    ngx_int_t      bufs;
+
+    unsigned       last;
+
+} ngx_http_subs_ctx_t;
+
+
+static ngx_int_t ngx_http_subs_header_filter(ngx_http_request_t *r);
+static ngx_int_t ngx_http_subs_init_context(ngx_http_request_t *r);
+
+static ngx_int_t ngx_http_subs_body_filter(ngx_http_request_t *r,
+    ngx_chain_t *in);
+static ngx_int_t ngx_http_subs_body_filter_init_context(ngx_http_request_t *r,
+    ngx_chain_t *in);
+static ngx_int_t ngx_http_subs_body_filter_process_buffer(ngx_http_request_t *r,
+    ngx_buf_t *b);
+static ngx_int_t  ngx_http_subs_match(ngx_http_request_t *r,
+    ngx_http_subs_ctx_t *ctx);
+#if (NGX_PCRE)
+static ngx_int_t ngx_http_subs_match_regex_substituion(ngx_http_request_t *r,
+    sub_pair_t *pair, ngx_buf_t *b, ngx_buf_t *dst);
+#endif
+static ngx_int_t ngx_http_subs_match_fix_substituion(ngx_http_request_t *r,
+    sub_pair_t *pair, ngx_buf_t *b, ngx_buf_t *dst);
+static ngx_buf_t * buffer_append_string(ngx_buf_t *b, u_char *s, size_t len,
+    ngx_pool_t *pool);
+static ngx_int_t  ngx_http_subs_out_chain_append(ngx_http_request_t *r,
+    ngx_http_subs_ctx_t *ctx, ngx_buf_t *b);
+static ngx_int_t  ngx_http_subs_get_chain_buf(ngx_http_request_t *r,
+    ngx_http_subs_ctx_t *ctx);
+static ngx_int_t ngx_http_subs_output(ngx_http_request_t *r,
+    ngx_http_subs_ctx_t *ctx, ngx_chain_t *in);
+
+static char * ngx_http_subs_filter(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static ngx_int_t ngx_http_subs_filter_regex_compile(sub_pair_t *pair,
+    ngx_http_script_compile_t *sc, ngx_conf_t *cf);
+
+
+static void *ngx_http_subs_create_conf(ngx_conf_t *cf);
+static char *ngx_http_subs_merge_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+
+static ngx_int_t ngx_http_subs_filter_init(ngx_conf_t *cf);
+
+#if (NGX_PCRE)
+static ngx_int_t ngx_http_subs_regex_capture_count(ngx_regex_t *re);
+#endif
+
+
+static ngx_command_t  ngx_http_subs_filter_commands[] = {
+
+    { ngx_string("subs_filter"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE,
+      ngx_http_subs_filter,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("subs_filter_bypass"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_http_set_predicate_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_subs_loc_conf_t, bypass),
+      NULL },
+
+    { ngx_string("subs_filter_types"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_http_types_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_subs_loc_conf_t, types_keys),
+      &ngx_http_html_default_types[0] },
+
+    { ngx_string("subs_line_buffer_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_subs_loc_conf_t, line_buffer_size),
+      NULL },
+
+    { ngx_string("subs_buffers"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
+      ngx_conf_set_bufs_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_subs_loc_conf_t, bufs),
+      NULL },
+
+    ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_subs_filter_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_http_subs_filter_init,             /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    ngx_http_subs_create_conf,             /* create location configuration */
+    ngx_http_subs_merge_conf               /* merge location configuration */
+};
+
+
+ngx_module_t  ngx_http_subs_filter_module = {
+    NGX_MODULE_V1,
+    &ngx_http_subs_filter_module_ctx,      /* module context */
+    ngx_http_subs_filter_commands,         /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
+static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
+
+extern volatile ngx_cycle_t  *ngx_cycle;
+
+
+static ngx_int_t
+ngx_http_subs_header_filter(ngx_http_request_t *r)
+{
+    ngx_http_subs_loc_conf_t  *slcf;
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_subs_filter_module);
+
+    if (slcf->sub_pairs->nelts == 0
+        || r->header_only
+        || r->headers_out.content_type.len == 0
+        || r->headers_out.content_length_n == 0)
+    {
+        return ngx_http_next_header_filter(r);
+    }
+
+    if (ngx_http_test_content_type(r, &slcf->types) == NULL) {
+        return ngx_http_next_header_filter(r);
+    }
+
+    switch (ngx_http_test_predicates(r, slcf->bypass)) {
+
+    case NGX_ERROR:
+        /*pass through*/
+
+    case NGX_DECLINED:
+
+        return ngx_http_next_header_filter(r);
+
+    default: /* NGX_OK */
+        break;
+    }
+
+    /* Don't do substitution with the compressed content */
+    if (r->headers_out.content_encoding
+        && r->headers_out.content_encoding->value.len
+        && ngx_strncasecmp(r->headers_out.content_encoding->value.data,
+                            (u_char *) "identity", 8) != 0) {
+
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
+                      "http subs filter header ignored, this may be a "
+                      "compressed response.");
+
+        return ngx_http_next_header_filter(r);
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http subs filter header \"%V\"", &r->uri);
+
+    if (ngx_http_subs_init_context(r) == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    r->filter_need_in_memory = 1;
+
+    if (r == r->main) {
+        ngx_http_clear_content_length(r);
+        ngx_http_clear_last_modified(r);
+    }
+
+    return ngx_http_next_header_filter(r);
+}
+
+
+static ngx_int_t
+ngx_http_subs_init_context(ngx_http_request_t *r)
+{
+    ngx_uint_t                 i;
+    sub_pair_t                *src_pair, *dst_pair;
+    ngx_http_subs_ctx_t       *ctx;
+    ngx_http_subs_loc_conf_t  *slcf;
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_subs_filter_module);
+
+    /* Everything in ctx is NULL or 0. */
+    ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_subs_ctx_t));
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_http_set_ctx(r, ctx, ngx_http_subs_filter_module);
+
+    ctx->sub_pairs = ngx_array_create(r->pool, slcf->sub_pairs->nelts,
+                                      sizeof(sub_pair_t));
+    if (slcf->sub_pairs == NULL) {
+        return NGX_ERROR;
+    }
+
+    /* Deep copy sub_pairs from slcf to ctx, matched and captures need it */
+    src_pair = (sub_pair_t *) slcf->sub_pairs->elts;
+
+    for (i = 0; i < slcf->sub_pairs->nelts; i++) {
+
+        dst_pair = ngx_array_push(ctx->sub_pairs);
+        if (dst_pair == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_memcpy(dst_pair, src_pair + i, sizeof(sub_pair_t));
+    }
+
+    if (ctx->line_in == NULL) {
+
+        ctx->line_in = ngx_create_temp_buf(r->pool, slcf->line_buffer_size);
+        if (ctx->line_in == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    if (ctx->line_dst == NULL) {
+
+        ctx->line_dst = ngx_create_temp_buf(r->pool, slcf->line_buffer_size);
+        if (ctx->line_dst == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_subs_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    ngx_int_t    	           rc;
+    ngx_log_t                 *log;
+    ngx_chain_t               *cl, *temp;
+    ngx_http_subs_ctx_t       *ctx;
+    ngx_http_subs_loc_conf_t  *slcf;
+
+    log = r->connection->log;
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_subs_filter_module);
+    if (slcf == NULL) {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_subs_filter_module);
+    if (ctx == NULL) {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
+                   "http subs filter \"%V\"", &r->uri);
+
+    if (in == NULL && ctx->busy == NULL) {
+        return ngx_http_next_body_filter(r, in);
+    }
+
+    if (ngx_http_subs_body_filter_init_context(r, in) != NGX_OK){
+        goto failed;
+    }
+
+    for (cl = ctx->in; cl; cl = cl->next) {
+
+        if (cl->buf->last_buf || cl->buf->last_in_chain){
+            ctx->last = 1;
+        }
+
+        /* TODO: check the flush flag */
+        rc = ngx_http_subs_body_filter_process_buffer(r, cl->buf);
+
+        if (rc == NGX_DECLINED) {
+            continue;
+        } else if (rc == NGX_ERROR) {
+            goto failed;
+        }
+
+        if (cl->next != NULL) {
+            continue;
+        }
+
+        if (ctx->last) {
+
+            /* copy line_in to ctx->out. */
+            if (ngx_buf_size(ctx->line_in) > 0) {
+
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
+                    "[subs_filter] Lost last linefeed, output anyway.");
+
+                if (ngx_http_subs_out_chain_append(r, ctx, ctx->line_in)
+                    != NGX_OK) {
+                    goto failed;
+                }
+            }
+
+            if (ctx->out_buf == NULL) {
+
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0,
+                               "[subs_filter] The last buffer is zero size.");
+
+                /*
+                 * This is a zero buffer, it should not be set the temporary
+                 * or memory flag
+                 * */
+                ctx->out_buf = ngx_calloc_buf(r->pool);
+                if (ctx->out_buf == NULL) {
+                    goto failed;
+                }
+
+                ctx->out_buf->sync = 1;
+
+                temp = ngx_alloc_chain_link(r->pool);
+                if (temp == NULL) {
+                    goto failed;
+                }
+
+                temp->buf = ctx->out_buf;
+                temp->next = NULL;
+
+                *ctx->last_out = temp;
+                ctx->last_out = &temp->next;
+            }
+
+            ctx->out_buf->last_buf = (r == r->main) ? 1 : 0;
+            ctx->out_buf->last_in_chain = cl->buf->last_in_chain;
+
+            break;
+        }
+    }
+
+    /* It doesn't output anything, return */
+    if ((ctx->out == NULL) && (ctx->busy == NULL)) {
+        return NGX_OK;
+    }
+
+    return ngx_http_subs_output(r, ctx, in);
+
+failed:
+
+    ngx_log_error(NGX_LOG_ERR, log, 0,
+                  "[subs_filter] ngx_http_subs_body_filter error.");
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_subs_body_filter_init_context(ngx_http_request_t *r, ngx_chain_t *in)
+{
+    ngx_http_subs_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_subs_filter_module);
+
+    r->connection->buffered |= NGX_HTTP_SUB_BUFFERED;
+
+    ctx->in = NULL;
+
+    if (in) {
+        if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+#if SUBS_DEBUG
+    if (ngx_buf_size(ctx->line_in) > 0) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "subs line in buffer: %p, size:%uz",
+                       ctx->line_in, ngx_buf_size(ctx->line_in));
+    }
+#endif
+
+#if SUBS_DEBUG
+    ngx_chain_t               *cl;
+
+    for (cl = ctx->in; cl; cl = cl->next) {
+        if (cl->buf) {
+            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "subs in buffer:%p, size:%uz, "
+                           "flush:%d, last_buf:%d",
+                           cl->buf, ngx_buf_size(cl->buf),
+                           cl->buf->flush, cl->buf->last_buf);
+        }
+    }
+#endif
+
+    ctx->last_out = &ctx->out;
+    ctx->out_buf  = NULL;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_subs_body_filter_process_buffer(ngx_http_request_t *r, ngx_buf_t *b)
+{
+    u_char               *p, *last, *linefeed;
+    ngx_int_t             len, rc;
+    ngx_http_subs_ctx_t  *ctx;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_subs_filter_module);
+
+    if (b == NULL) {
+        return NGX_DECLINED;
+    }
+
+    p = b->pos;
+    last = b->last;
+    b->pos = b->last;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "subs process in buffer: %p %uz, line_in buffer: %p %uz",
+                   b, last - p,
+                   ctx->line_in, ngx_buf_size(ctx->line_in));
+
+    if ((last - p) == 0 && ngx_buf_size(ctx->line_in) == 0){
+        return NGX_OK;
+    }
+
+    if ((last - p) == 0 && ngx_buf_size(ctx->line_in) && ctx->last) {
+
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "the last zero buffer, try to do substitution");
+
+        rc = ngx_http_subs_match(r, ctx);
+        if (rc < 0) {
+            return NGX_ERROR;
+        }
+
+        return NGX_OK;
+    }
+
+    while (p < last) {
+
+        linefeed = memchr(p, LF, last - p);
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "find linefeed: %p",
+                       linefeed);
+
+        if (linefeed == NULL) {
+
+            if (ctx->last) {
+                linefeed = last - 1;
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                               "the last buffer, not find linefeed");
+            }
+        }
+
+        if (linefeed) {
+
+            len = linefeed - p + 1;
+
+            if (buffer_append_string(ctx->line_in, p, len, r->pool) == NULL) {
+                return NGX_ERROR;
+            }
+
+            p += len;
+
+            rc = ngx_http_subs_match(r, ctx);
+            if (rc < 0) {
+                return NGX_ERROR;
+            }
+
+        } else {
+
+            /* Not find linefeed in this chain, save the left data to line_in */
+            if (buffer_append_string(ctx->line_in, p, last - p, r->pool)
+                == NULL) {
+                return NGX_ERROR;
+            }
+
+            break;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+/*
+ * Do the substitutions from ctx->line_in
+ * and output the chain buffers to ctx->out
+ * */
+static ngx_int_t
+ngx_http_subs_match(ngx_http_request_t *r, ngx_http_subs_ctx_t *ctx)
+{
+    ngx_buf_t   *src, *dst, *temp;
+    ngx_log_t   *log;
+    ngx_int_t    count, match_count;
+    sub_pair_t  *pairs, *pair;
+    ngx_uint_t   i;
+
+    count = 0;
+    match_count = 0;
+
+    log = r->connection->log;
+
+    src = ctx->line_in;
+    dst = ctx->line_dst;
+
+    pairs = (sub_pair_t *) ctx->sub_pairs->elts;
+    for (i = 0; i < ctx->sub_pairs->nelts; i++) {
+
+        pair = &pairs[i];
+
+        if (!pair->has_captured) {
+            if (pair->sub.data == NULL) {
+                if (ngx_http_script_run(r, &pair->sub, pair->sub_lengths->elts,
+                                        0, pair->sub_values->elts) == NULL)
+                {
+                    goto failed;
+                }
+            }
+
+        } else {
+            pair->sub.data = NULL;
+            pair->sub.len = 0;
+        }
+
+        /* exchange the src and dst buffer */
+        if (dst->pos != dst->last) {
+
+            temp = src;
+            src = dst;
+            dst = temp;
+
+            ngx_buffer_init(dst);
+        }
+
+        if ((!pair->regex)
+             && ((ngx_uint_t)(src->last - src->pos) < pair->match.len)) {
+            continue;
+        }
+
+        if (pair->once && pair->matched) {
+            continue;
+        }
+
+        if (pair->sub.data == NULL && !pair->has_captured) {
+
+            if (ngx_http_script_run(r, &pair->sub, pair->sub_lengths->elts, 0,
+                                    pair->sub_values->elts) == NULL)
+            {
+                goto failed;
+            }
+        }
+
+        /* regex substitution */
+        if (pair->regex || pair->insensitive) {
+#if (NGX_PCRE)
+            count = ngx_http_subs_match_regex_substituion(r, pair, src, dst);
+            if (count == NGX_ERROR) {
+                goto failed;
+            }
+#endif
+        } else {
+            /* fixed string substituion */
+            count = ngx_http_subs_match_fix_substituion(r, pair, src, dst);
+            if (count == NGX_ERROR) {
+                goto failed;
+            }
+        }
+
+        /* no match. */
+        if (count == 0){
+            continue;
+        }
+
+        if (src->pos < src->last) {
+
+            if (buffer_append_string(dst, src->pos, src->last - src->pos,
+                                     r->pool) == NULL) {
+                goto failed;
+            }
+
+            src->pos = src->last;
+        }
+
+        /* match */
+        match_count += count;
+    }
+
+    /* no match last time */
+    if (dst->pos == dst->last){
+        dst = src;
+    }
+
+    if (ngx_http_subs_out_chain_append(r, ctx, dst) != NGX_OK) {
+        goto failed;
+    }
+
+    ngx_buffer_init(ctx->line_in);
+    ngx_buffer_init(ctx->line_dst);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "match counts: %i", match_count);
+
+    return match_count;
+
+failed:
+
+    ngx_log_error(NGX_LOG_ERR, log, 0,
+                  "[subs_filter] ngx_http_subs_match error.");
+
+    return -1;
+}
+
+
+#if (NGX_PCRE)
+static ngx_int_t
+ngx_http_subs_match_regex_substituion(ngx_http_request_t *r, sub_pair_t *pair,
+                                      ngx_buf_t *b, ngx_buf_t *dst)
+{
+    ngx_str_t  line;
+    ngx_log_t *log;
+    ngx_int_t  rc, count = 0;
+
+    log = r->connection->log;
+
+    if (pair->captures == NULL || pair->ncaptures == 0) {
+        pair->ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3;
+        pair->captures = ngx_palloc(r->pool, pair->ncaptures * sizeof(int));
+        if (pair->captures == NULL) {
+            return NGX_ERROR;
+        }
+    }
+
+    while (b->pos < b->last) {
+
+        if (pair->once && pair->matched) {
+            break;
+        }
+
+        line.data = b->pos;
+        line.len = b->last - b->pos;
+
+        rc = ngx_regex_exec(pair->match_regex, &line,
+                            (int *) pair->captures, pair->ncaptures);
+
+        if (rc == NGX_REGEX_NO_MATCHED) {
+            break;
+
+        } else if(rc < 0) {
+            ngx_log_error(NGX_LOG_ERR, log, 0,
+                          ngx_regex_exec_n " failed: %i on \"%V\" using \"%V\"",
+                          rc, &line, &pair->match);
+
+            return NGX_ERROR;
+        }
+
+        pair->matched++;
+        count++;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, log, 0,
+                       "regex match:%i, start:%d, end:%d ",
+                       rc, pair->captures[0], pair->captures[1]);
+
+        if (pair->has_captured) {
+            r->captures = pair->captures;
+            r->ncaptures = pair->ncaptures;
+            r->captures_data = line.data;
+
+            if (ngx_http_script_run(r, &pair->sub, pair->sub_lengths->elts, 0,
+                                    pair->sub_values->elts) == NULL)
+            {
+                ngx_log_error(NGX_LOG_ALERT, log, 0,
+                              "[subs_filter] ngx_http_script_run error.");
+                return NGX_ERROR;
+            }
+        }
+
+        if (buffer_append_string(dst, b->pos, pair->captures[0],
+                                 r->pool) == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (buffer_append_string(dst, pair->sub.data, pair->sub.len,
+                                 r->pool) == NULL) {
+            return NGX_ERROR;
+        }
+
+        b->pos =  b->pos + pair->captures[1];
+    }
+
+    return count;
+}
+#endif
+
+
+/*
+ * Thanks to Laurent Ghigonis
+ * Taken from FreeBSD
+ * Find the first occurrence of the byte string s in byte string l.
+ */
+static void *
+subs_memmem(const void *l, size_t l_len, const void *s, size_t s_len)
+{
+    register char *cur, *last;
+    const char *cl = (const char *)l;
+    const char *cs = (const char *)s;
+
+    /* we need something to compare */
+    if (l_len == 0 || s_len == 0) {
+        return NULL;
+    }
+
+    /* "s" must be smaller or equal to "l" */
+    if (l_len < s_len) {
+        return NULL;
+    }
+
+    /* special case where s_len == 1 */
+    if (s_len == 1) {
+        return memchr(l, (int)*cs, l_len);
+    }
+
+    /* the last position where its possible to find "s" in "l" */
+    last = (char *)cl + l_len - s_len;
+
+    for (cur = (char *)cl; cur <= last; cur++) {
+        if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0) {
+            return cur;
+        }
+    }
+
+    return NULL;
+}
+
+
+static ngx_int_t
+ngx_http_subs_match_fix_substituion(ngx_http_request_t *r,
+    sub_pair_t *pair, ngx_buf_t *b, ngx_buf_t *dst)
+{
+    u_char      *sub_start;
+    ngx_int_t    count = 0;
+
+    while(b->pos < b->last) {
+        if (pair->once && pair->matched) {
+            break;
+        }
+
+        sub_start = subs_memmem(b->pos, b->last - b->pos,
+                                pair->match.data, pair->match.len);
+        if (sub_start == NULL) {
+            break;
+        }
+
+        pair->matched++;
+        count++;
+
+        if (buffer_append_string(dst, b->pos, sub_start - b->pos,
+                                 r->pool) == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (buffer_append_string(dst, pair->sub.data, pair->sub.len,
+                                 r->pool) == NULL) {
+            return NGX_ERROR;
+        }
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "fixed string match: %p", sub_start);
+
+        b->pos = sub_start + pair->match.len;
+
+        if ((ngx_uint_t)(b->last - b->pos) < pair->match.len)
+            break;
+    }
+
+    return count;
+}
+
+
+static ngx_buf_t *
+buffer_append_string(ngx_buf_t *b, u_char *s, size_t len, ngx_pool_t *pool)
+{
+    u_char     *p;
+    ngx_uint_t capacity, size;
+
+    if (len > (size_t) (b->end - b->last)) {
+
+        size = b->last - b->pos;
+
+        capacity = b->end - b->start;
+        capacity <<= 1;
+
+        if (capacity < (size + len)) {
+            capacity = size + len;
+        }
+
+        p = ngx_palloc(pool, capacity);
+        if (p == NULL) {
+            return NULL;
+        }
+
+        b->last = ngx_copy(p, b->pos, size);
+
+        b->start = b->pos = p;
+        b->end = p + capacity;
+    }
+
+    b->last = ngx_copy(b->last, s, len);
+
+    return b;
+}
+
+
+static ngx_int_t
+ngx_http_subs_out_chain_append(ngx_http_request_t *r,
+    ngx_http_subs_ctx_t *ctx, ngx_buf_t *b)
+{
+    size_t       len, capcity;
+
+    if (b == NULL || ngx_buf_size(b) == 0) {
+        return NGX_OK;
+    }
+
+    if (ctx->out_buf == NULL) {
+       if (ngx_http_subs_get_chain_buf(r, ctx) != NGX_OK) {
+           return NGX_ERROR;
+       }
+    }
+
+    while (1) {
+
+        len = (size_t) ngx_buf_size(b);
+        if (len == 0) {
+            break;
+        }
+
+        capcity = ctx->out_buf->end - ctx->out_buf->last;
+
+        if (len <= capcity) {
+            ctx->out_buf->last = ngx_copy(ctx->out_buf->last, b->pos, len);
+            b->pos += len;
+            break;
+
+        } else {
+            ctx->out_buf->last = ngx_copy(ctx->out_buf->last,
+                                          b->pos, capcity);
+        }
+
+        b->pos += capcity;
+
+        /* get more buffers */
+        if (ngx_http_subs_get_chain_buf(r, ctx) != NGX_OK) {
+            return NGX_ERROR;
+        }
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_subs_get_chain_buf(ngx_http_request_t *r,
+    ngx_http_subs_ctx_t *ctx)
+{
+    ngx_chain_t               *temp;
+    ngx_http_subs_loc_conf_t  *slcf;
+
+    slcf = ngx_http_get_module_loc_conf(r, ngx_http_subs_filter_module);
+
+    if (ctx->free) {
+        temp = ctx->free;
+        ctx->free = ctx->free->next;
+
+    } else {
+        temp = ngx_alloc_chain_link(r->pool);
+        if (temp == NULL) {
+            return NGX_ERROR;
+        }
+
+        temp->buf = ngx_create_temp_buf(r->pool, slcf->bufs.size);
+        if (temp->buf == NULL) {
+            return NGX_ERROR;
+        }
+
+        temp->buf->tag = (ngx_buf_tag_t) &ngx_http_subs_filter_module;
+        temp->buf->recycled = 1;
+
+        /* TODO: limit the buffer number */
+        ctx->bufs++;
+    }
+
+    temp->next = NULL;
+
+    ctx->out_buf = temp->buf;
+    *ctx->last_out = temp;
+    ctx->last_out = &temp->next;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_subs_output(ngx_http_request_t *r, ngx_http_subs_ctx_t *ctx,
+                     ngx_chain_t *in)
+{
+    ngx_int_t     rc;
+
+#if SUBS_DEBUG
+    ngx_buf_t    *b;
+    ngx_chain_t  *cl;
+
+    for (cl = ctx->out; cl; cl = cl->next) {
+
+        b = cl->buf;
+
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "subs out buffer:%p, size:%uz, t:%d, l:%d",
+                       b, ngx_buf_size(b), b->temporary, b->last_buf);
+    }
+#endif
+
+    /* ctx->out may not output all the data */
+    rc = ngx_http_next_body_filter(r, ctx->out);
+    if (rc == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+#if SUBS_DEBUG
+    for (cl = ctx->out; cl; cl = cl->next) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "subs out end: %p %uz", cl->buf, ngx_buf_size(cl->buf));
+    }
+#endif
+
+#if defined(nginx_version) && (nginx_version >= 1001004)
+    ngx_chain_update_chains(r->pool, &ctx->free, &ctx->busy, &ctx->out,
+                            (ngx_buf_tag_t) &ngx_http_subs_filter_module);
+#else
+    ngx_chain_update_chains(&ctx->free, &ctx->busy, &ctx->out,
+                            (ngx_buf_tag_t) &ngx_http_subs_filter_module);
+#endif
+
+    if (ctx->last) {
+        r->connection->buffered &= ~NGX_HTTP_SUB_BUFFERED;
+    }
+
+    return rc;
+}
+
+
+static char *
+ngx_http_subs_filter( ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_int_t                   n;
+    ngx_uint_t                  i;
+    ngx_str_t                  *value;
+    ngx_str_t                  *option;
+    sub_pair_t                 *pair;
+    ngx_http_subs_loc_conf_t   *slcf = conf;
+    ngx_http_script_compile_t   sc;
+
+    value = cf->args->elts;
+
+    if (slcf->sub_pairs == NULL) {
+        slcf->sub_pairs = ngx_array_create(cf->pool, 4, sizeof(sub_pair_t));
+        if (slcf->sub_pairs == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    pair = ngx_array_push(slcf->sub_pairs);
+    if (pair == NULL) {
+        return NGX_CONF_ERROR;
+    }
+    ngx_memzero(pair, sizeof(sub_pair_t));
+
+    pair->match = value[1];
+
+    n = ngx_http_script_variables_count(&value[2]);
+    if (n != 0) {
+        ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
+
+        sc.cf = cf;
+        sc.source = &value[2];
+        sc.lengths = &pair->sub_lengths;
+        sc.values = &pair->sub_values;
+        sc.variables = n;
+        sc.complete_lengths = 1;
+        sc.complete_values = 1;
+
+        if (ngx_http_script_compile(&sc) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+
+        /* Dirty hack, if it has captured variables */
+        if (sc.captures_mask) {
+            pair->has_captured = 1;
+        }
+
+    } else {
+        pair->sub = value[2];
+    }
+
+    if (cf->args->nelts > 3) {
+        option = &value[3];
+        for(i = 0; i < option->len; i++) {
+
+            switch (option->data[i]){
+            case 'i':
+                pair->insensitive = 1;
+                break;
+
+            case 'o':
+                pair->once = 1;
+                break;
+
+            case 'r':
+                pair->regex = 1;
+                break;
+
+            case 'g':
+            default:
+                continue;
+            }
+        }
+    }
+
+    if (pair->regex || pair->insensitive) {
+        if (ngx_http_subs_filter_regex_compile(pair, &sc, cf) == NGX_ERROR) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_subs_filter_regex_compile(sub_pair_t *pair,
+    ngx_http_script_compile_t *sc, ngx_conf_t *cf)
+{
+    /* Caseless match can only be implemented in regex. */
+#if (NGX_PCRE)
+    u_char            errstr[NGX_MAX_CONF_ERRSTR];
+    ngx_int_t         n, options;
+    ngx_str_t         err, *value;
+    ngx_uint_t        mask;
+
+    value = cf->args->elts;
+
+    err.len = NGX_MAX_CONF_ERRSTR;
+    err.data = errstr;
+
+    options = (pair->insensitive ? NGX_REGEX_CASELESS : 0);
+
+    /* make nginx-0.8.25+ happy */
+#if defined(nginx_version) && nginx_version >= 8025
+    ngx_regex_compile_t   rc;
+
+    rc.pattern = pair->match;
+    rc.pool = cf->pool;
+    rc.err = err;
+    rc.options = options;
+
+    if (ngx_regex_compile(&rc) != NGX_OK) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
+        return NGX_ERROR;
+    }
+
+    pair->match_regex = rc.regex;
+
+#else
+    pair->match_regex = ngx_regex_compile(&pair->match, options,
+                                          cf->pool, &err);
+#endif
+
+    if (pair->match_regex == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &err);
+        return NGX_ERROR;
+    }
+
+    n = ngx_http_subs_regex_capture_count(pair->match_regex);
+
+    if (pair->has_captured) {
+        mask = ((1 << (n + 1)) - 1);
+        if ( mask < sc->captures_mask ) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "You want to capture too many regex substrings, "
+                               "more than %i in \"%V\"",
+                               n, &value[2]);
+
+            return NGX_ERROR;
+        }
+    }
+#else
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "the using of the regex \"%V\" requires PCRE library",
+                       &pair->match);
+
+    return NGX_ERROR;
+#endif
+
+    return NGX_OK;
+}
+
+
+#if (NGX_PCRE)
+static ngx_int_t
+ngx_http_subs_regex_capture_count(ngx_regex_t *re)
+{
+    int rc, n;
+
+    n = 0;
+
+#if (NGX_PCRE2)
+    rc = pcre2_pattern_info(re, PCRE2_INFO_CAPTURECOUNT, &n);
+#elif defined(nginx_version) && nginx_version >= 1002002
+    rc = pcre_fullinfo(re->code, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+#elif defined(nginx_version) && nginx_version >= 1001012
+    rc = pcre_fullinfo(re->pcre, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+#else
+    rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+#endif
+
+    if (rc < 0) {
+        return (ngx_int_t) rc;
+    }
+
+    return (ngx_int_t) n;
+}
+#endif
+
+
+static void *
+ngx_http_subs_create_conf(ngx_conf_t *cf)
+{
+    ngx_http_subs_loc_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_subs_loc_conf_t));
+    if (conf == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->sub_pairs = NULL;
+     *     conf->types = {NULL, 0};
+     *     conf->types_keys = NULL;
+     *     conf->bufs.num = 0;
+     */
+
+    conf->line_buffer_size = NGX_CONF_UNSET_SIZE;
+    conf->bypass = NGX_CONF_UNSET_PTR;
+
+    return conf;
+}
+
+
+static char *
+ngx_http_subs_merge_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_subs_loc_conf_t *prev = parent;
+    ngx_http_subs_loc_conf_t *conf = child;
+
+    if (conf->sub_pairs == NULL) {
+        if (prev->sub_pairs == NULL) {
+            conf->sub_pairs = ngx_array_create(cf->pool, 4, sizeof(sub_pair_t));
+            if (conf->sub_pairs == NULL) {
+                return NGX_CONF_ERROR;
+            }
+        } else {
+            conf->sub_pairs = prev->sub_pairs;
+        }
+    }
+
+    ngx_conf_merge_ptr_value(conf->bypass,
+                             prev->bypass, NULL);
+
+    if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
+                             &prev->types_keys, &prev->types,
+                             ngx_http_html_default_types)
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    ngx_conf_merge_size_value(conf->line_buffer_size,
+                              prev->line_buffer_size, 8 * ngx_pagesize);
+
+    /* Default total buffer size is 128k */
+    ngx_conf_merge_bufs_value(conf->bufs, prev->bufs,
+                              (128 * 1024) / ngx_pagesize, ngx_pagesize);
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_subs_filter_init(ngx_conf_t *cf)
+{
+    ngx_http_next_header_filter = ngx_http_top_header_filter;
+    ngx_http_top_header_filter = ngx_http_subs_header_filter;
+
+    ngx_http_next_body_filter = ngx_http_top_body_filter;
+    ngx_http_top_body_filter = ngx_http_subs_body_filter;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/README b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/README
new file mode 100644
index 0000000..b9ff21b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/README
@@ -0,0 +1,275 @@
+NAME
+    Test::Nginx - Testing modules for Nginx C module development
+
+DESCRIPTION
+    This distribution provides two testing modules for Nginx C module
+    development:
+
+    *   Test::Nginx::LWP
+
+    *   Test::Nginx::Socket
+
+    All of them are based on Test::Base.
+
+    Usually, Test::Nginx::Socket is preferred because it works on a much
+    lower level and not that fault tolerant like Test::Nginx::LWP.
+
+    Also, a lot of connection hang issues (like wrong "r->main->count" value
+    in nginx 0.8.x) can only be captured by Test::Nginx::Socket because
+    Perl's LWP::UserAgent client will close the connection itself which will
+    conceal such issues from the testers.
+
+    Test::Nginx automatically starts an nginx instance (from the "PATH" env)
+    rooted at t/servroot/ and the default config template makes this nginx
+    instance listen on the port 1984 by default. One can specify a different
+    port number by setting his port number to the "TEST_NGINX_PORT"
+    environment, as in
+
+        export TEST_NGINX_PORT=1989
+
+  etcproxy integration
+    The default settings in etcproxy
+    (https://github.com/chaoslawful/etcproxy) makes this small TCP proxy
+    split the TCP packets into bytes and introduce 1 ms latency among them.
+
+    There's usually various TCP chains that we can put etcproxy into, for
+    example
+
+   Test::Nginx <=> nginx
+      $ ./etcproxy 1234 1984
+
+    Here we tell etcproxy to listen on port 1234 and to delegate all the TCP
+    traffic to the port 1984, the default port that Test::Nginx makes nginx
+    listen to.
+
+    And then we tell Test::Nginx to test against the port 1234, where
+    etcproxy listens on, rather than the port 1984 that nginx directly
+    listens on:
+
+      $ TEST_NGINX_CLIENT_PORT=1234 prove -r t/
+
+    Then the TCP chain now looks like this:
+
+      Test::Nginx <=> etcproxy (1234) <=> nginx (1984)
+
+    So etcproxy can effectively emulate extreme network conditions and
+    exercise "unusual" code paths in your nginx server by your tests.
+
+    In practice, *tons* of weird bugs can be captured by this setting. Even
+    ourselves didn't expect that this simple approach is so effective.
+
+   nginx <=> memcached
+    We first start the memcached server daemon on port 11211:
+
+       memcached -p 11211 -vv
+
+    and then we another etcproxy instance to listen on port 11984 like this
+
+       $ ./etcproxy 11984 11211
+
+    Then we tell our t/foo.t test script to connect to 11984 rather than
+    11211:
+
+      # foo.t
+      use Test::Nginx::Socket;
+      repeat_each(1);
+      plan tests => 2 * repeat_each() * blocks();
+      $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;  # make this env take a default value
+      run_tests();
+
+      __DATA__
+
+      === TEST 1: sanity
+      --- config
+      location /foo {
+           set $memc_cmd set;
+           set $memc_key foo;
+           set $memc_value bar;
+           memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+      }
+      --- request
+          GET /foo
+      --- response_body_like: STORED
+
+    The Test::Nginx library will automatically expand the special macro
+    $TEST_NGINX_MEMCACHED_PORT to the environment with the same name. You
+    can define your own $TEST_NGINX_BLAH_BLAH_PORT macros as long as its
+    prefix is "TEST_NGINX_" and all in upper case letters.
+
+    And now we can run your test script against the etcproxy port 11984:
+
+       TEST_NGINX_MEMCACHED_PORT=11984 prove t/foo.t
+
+    Then the TCP chains look like this:
+
+       Test::Nginx <=> nginx (1984) <=> etcproxy (11984) <=> memcached (11211)
+
+    If "TEST_NGINX_MEMCACHED_PORT" is not set, then it will take the default
+    value 11211, which is what we want when there's no etcproxy configured:
+
+       Test::Nginx <=> nginx (1984) <=> memcached (11211)
+
+    This approach also works for proxied mysql and postgres traffic. Please
+    see the live test suite of ngx_drizzle and ngx_postgres for more
+    details.
+
+    Usually we set both "TEST_NGINX_CLIENT_PORT" and
+    "TEST_NGINX_MEMCACHED_PORT" (and etc) at the same time, effectively
+    yielding the following chain:
+
+       Test::Nginx <=> etcproxy (1234) <=> nginx (1984) <=> etcproxy (11984) <=> memcached (11211)
+
+    as long as you run two separate etcproxy instances in two separate
+    terminals.
+
+    It's easy to verify if the traffic actually goes through your etcproxy
+    server. Just check if the terminal running etcproxy emits outputs. By
+    default, etcproxy always dump out the incoming and outgoing data to
+    stdout/stderr.
+
+  valgrind integration
+    Test::Nginx has integrated support for valgrind (<http://valgrind.org>)
+    even though by default it does not bother running it with the tests
+    because valgrind will significantly slow down the test sutie.
+
+    First ensure that your valgrind executable visible in your PATH env. And
+    then run your test suite with the "TEST_NGINX_USE_VALGRIND" env set to
+    true:
+
+       TEST_NGINX_USE_VALGRIND=1 prove -r t
+
+    If you see false alarms, you do have a chance to skip them by defining a
+    ./valgrind.suppress file at the root of your module source tree, as in
+
+    <https://github.com/chaoslawful/drizzle-nginx-module/blob/master/valgrin
+    d.suppress>
+
+    This is the suppression file for ngx_drizzle. Test::Nginx will
+    automatically use it to start nginx with valgrind memcheck if this file
+    does exist at the expected location.
+
+    If you do see a lot of "Connection refused" errors while running the
+    tests this way, then you probably have a slow machine (or a very busy
+    one) that the default waiting time is not sufficient for valgrind to
+    start. You can define the sleep time to a larger value by setting the
+    "TEST_NGINX_SLEEP" env:
+
+       TEST_NGINX_SLEEP=1 prove -r t
+
+    The time unit used here is "second". The default sleep setting just fits
+    my ThinkPad ("Core2Duo T9600").
+
+    Applying the no-pool patch to your nginx core is recommended while
+    running nginx with valgrind:
+
+    <https://github.com/shrimp/no-pool-nginx>
+
+    The nginx memory pool can prevent valgrind from spotting lots of invalid
+    memory reads/writes as well as certain double-free errors. We did find a
+    lot more memory issues in many of our modules when we first introduced
+    the no-pool patch in practice ;)
+
+    There's also more advanced features in Test::Nginx that have never
+    documented. I'd like to write more about them in the near future ;)
+
+Nginx C modules that use Test::Nginx to drive their test suites
+    ngx_echo
+        <http://github.com/agentzh/echo-nginx-module>
+
+    ngx_headers_more
+        <http://github.com/agentzh/headers-more-nginx-module>
+
+    ngx_chunkin
+        <http://wiki.nginx.org/NginxHttpChunkinModule>
+
+    ngx_memc
+        <http://wiki.nginx.org/NginxHttpMemcModule>
+
+    ngx_drizzle
+        <http://github.com/chaoslawful/drizzle-nginx-module>
+
+    ngx_rds_json
+        <http://github.com/agentzh/rds-json-nginx-module>
+
+    ngx_xss
+        <http://github.com/agentzh/xss-nginx-module>
+
+    ngx_srcache
+        <http://github.com/agentzh/srcache-nginx-module>
+
+    ngx_lua
+        <http://github.com/chaoslawful/lua-nginx-module>
+
+    ngx_set_misc
+        <http://github.com/agentzh/set-misc-nginx-module>
+
+    ngx_array_var
+        <http://github.com/agentzh/array-var-nginx-module>
+
+    ngx_form_input
+        <http://github.com/calio/form-input-nginx-module>
+
+    ngx_iconv
+        <http://github.com/calio/iconv-nginx-module>
+
+    ngx_set_cconv
+        <http://github.com/liseen/set-cconv-nginx-module>
+
+    ngx_postgres
+        <http://github.com/FRiCKLE/ngx_postgres>
+
+    ngx_coolkit
+        <http://github.com/FRiCKLE/ngx_coolkit>
+
+SOURCE REPOSITORY
+    This module has a Git repository on Github, which has access for all.
+
+        http://github.com/agentzh/test-nginx
+
+    If you want a commit bit, feel free to drop me a line.
+
+AUTHORS
+    agentzh (章亦春) "<agentzh@gmail.com>"
+
+    Antoine BONAVITA "<antoine.bonavita@gmail.com>"
+
+COPYRIGHT & LICENSE
+    Copyright (c) 2009-2011, Taobao Inc., Alibaba Group
+    (<http://www.taobao.com>).
+
+    Copyright (c) 2009-2011, agentzh "<agentzh@gmail.com>".
+
+    Copyright (c) 2011, Antoine Bonavita "<antoine.bonavita@gmail.com>".
+
+    This module is licensed under the terms of the BSD license.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+    *   Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of the Taobao Inc. nor the names of its
+        contributors may be used to endorse or promote products derived from
+        this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+SEE ALSO
+    Test::Nginx::LWP, Test::Nginx::Socket, Test::Base.
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/AutoInstall.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/AutoInstall.pm
new file mode 100644
index 0000000..60b90ea
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/AutoInstall.pm
@@ -0,0 +1,820 @@
+#line 1
+package Module::AutoInstall;
+
+use strict;
+use Cwd                 ();
+use ExtUtils::MakeMaker ();
+
+use vars qw{$VERSION};
+BEGIN {
+	$VERSION = '1.03';
+}
+
+# special map on pre-defined feature sets
+my %FeatureMap = (
+    ''      => 'Core Features',    # XXX: deprecated
+    '-core' => 'Core Features',
+);
+
+# various lexical flags
+my ( @Missing, @Existing,  %DisabledTests, $UnderCPAN,     $HasCPANPLUS );
+my (
+    $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
+);
+my ( $PostambleActions, $PostambleUsed );
+
+# See if it's a testing or non-interactive session
+_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN ); 
+_init();
+
+sub _accept_default {
+    $AcceptDefault = shift;
+}
+
+sub missing_modules {
+    return @Missing;
+}
+
+sub do_install {
+    __PACKAGE__->install(
+        [
+            $Config
+            ? ( UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
+            : ()
+        ],
+        @Missing,
+    );
+}
+
+# initialize various flags, and/or perform install
+sub _init {
+    foreach my $arg (
+        @ARGV,
+        split(
+            /[\s\t]+/,
+            $ENV{PERL_AUTOINSTALL} || $ENV{PERL_EXTUTILS_AUTOINSTALL} || ''
+        )
+      )
+    {
+        if ( $arg =~ /^--config=(.*)$/ ) {
+            $Config = [ split( ',', $1 ) ];
+        }
+        elsif ( $arg =~ /^--installdeps=(.*)$/ ) {
+            __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
+            exit 0;
+        }
+        elsif ( $arg =~ /^--default(?:deps)?$/ ) {
+            $AcceptDefault = 1;
+        }
+        elsif ( $arg =~ /^--check(?:deps)?$/ ) {
+            $CheckOnly = 1;
+        }
+        elsif ( $arg =~ /^--skip(?:deps)?$/ ) {
+            $SkipInstall = 1;
+        }
+        elsif ( $arg =~ /^--test(?:only)?$/ ) {
+            $TestOnly = 1;
+        }
+        elsif ( $arg =~ /^--all(?:deps)?$/ ) {
+            $AllDeps = 1;
+        }
+    }
+}
+
+# overrides MakeMaker's prompt() to automatically accept the default choice
+sub _prompt {
+    goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault;
+
+    my ( $prompt, $default ) = @_;
+    my $y = ( $default =~ /^[Yy]/ );
+
+    print $prompt, ' [', ( $y ? 'Y' : 'y' ), '/', ( $y ? 'n' : 'N' ), '] ';
+    print "$default\n";
+    return $default;
+}
+
+# the workhorse
+sub import {
+    my $class = shift;
+    my @args  = @_ or return;
+    my $core_all;
+
+    print "*** $class version " . $class->VERSION . "\n";
+    print "*** Checking for Perl dependencies...\n";
+
+    my $cwd = Cwd::cwd();
+
+    $Config = [];
+
+    my $maxlen = length(
+        (
+            sort   { length($b) <=> length($a) }
+              grep { /^[^\-]/ }
+              map  {
+                ref($_)
+                  ? ( ( ref($_) eq 'HASH' ) ? keys(%$_) : @{$_} )
+                  : ''
+              }
+              map { +{@args}->{$_} }
+              grep { /^[^\-]/ or /^-core$/i } keys %{ +{@args} }
+        )[0]
+    );
+
+    # We want to know if we're under CPAN early to avoid prompting, but
+    # if we aren't going to try and install anything anyway then skip the
+    # check entirely since we don't want to have to load (and configure)
+    # an old CPAN just for a cosmetic message
+
+    $UnderCPAN = _check_lock(1) unless $SkipInstall;
+
+    while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
+        my ( @required, @tests, @skiptests );
+        my $default  = 1;
+        my $conflict = 0;
+
+        if ( $feature =~ m/^-(\w+)$/ ) {
+            my $option = lc($1);
+
+            # check for a newer version of myself
+            _update_to( $modules, @_ ) and return if $option eq 'version';
+
+            # sets CPAN configuration options
+            $Config = $modules if $option eq 'config';
+
+            # promote every features to core status
+            $core_all = ( $modules =~ /^all$/i ) and next
+              if $option eq 'core';
+
+            next unless $option eq 'core';
+        }
+
+        print "[" . ( $FeatureMap{ lc($feature) } || $feature ) . "]\n";
+
+        $modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' );
+
+        unshift @$modules, -default => &{ shift(@$modules) }
+          if ( ref( $modules->[0] ) eq 'CODE' );    # XXX: bugward combatability
+
+        while ( my ( $mod, $arg ) = splice( @$modules, 0, 2 ) ) {
+            if ( $mod =~ m/^-(\w+)$/ ) {
+                my $option = lc($1);
+
+                $default   = $arg    if ( $option eq 'default' );
+                $conflict  = $arg    if ( $option eq 'conflict' );
+                @tests     = @{$arg} if ( $option eq 'tests' );
+                @skiptests = @{$arg} if ( $option eq 'skiptests' );
+
+                next;
+            }
+
+            printf( "- %-${maxlen}s ...", $mod );
+
+            if ( $arg and $arg =~ /^\D/ ) {
+                unshift @$modules, $arg;
+                $arg = 0;
+            }
+
+            # XXX: check for conflicts and uninstalls(!) them.
+            my $cur = _load($mod);
+            if (_version_cmp ($cur, $arg) >= 0)
+            {
+                print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
+                push @Existing, $mod => $arg;
+                $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
+            }
+            else {
+                if (not defined $cur)   # indeed missing
+                {
+                    print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+                }
+                else
+                {
+                    # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above
+                    print "too old. ($cur < $arg)\n";
+                }
+
+                push @required, $mod => $arg;
+            }
+        }
+
+        next unless @required;
+
+        my $mandatory = ( $feature eq '-core' or $core_all );
+
+        if (
+            !$SkipInstall
+            and (
+                $CheckOnly
+                or ($mandatory and $UnderCPAN)
+                or $AllDeps
+                or _prompt(
+                    qq{==> Auto-install the }
+                      . ( @required / 2 )
+                      . ( $mandatory ? ' mandatory' : ' optional' )
+                      . qq{ module(s) from CPAN?},
+                    $default ? 'y' : 'n',
+                ) =~ /^[Yy]/
+            )
+          )
+        {
+            push( @Missing, @required );
+            $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
+        }
+
+        elsif ( !$SkipInstall
+            and $default
+            and $mandatory
+            and
+            _prompt( qq{==> The module(s) are mandatory! Really skip?}, 'n', )
+            =~ /^[Nn]/ )
+        {
+            push( @Missing, @required );
+            $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
+        }
+
+        else {
+            $DisabledTests{$_} = 1 for map { glob($_) } @tests;
+        }
+    }
+
+    if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
+        require Config;
+        print
+"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n";
+
+        # make an educated guess of whether we'll need root permission.
+        print "    (You may need to do that as the 'root' user.)\n"
+          if eval '$>';
+    }
+    print "*** $class configuration finished.\n";
+
+    chdir $cwd;
+
+    # import to main::
+    no strict 'refs';
+    *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
+
+    return (@Existing, @Missing);
+}
+
+sub _running_under {
+    my $thing = shift;
+    print <<"END_MESSAGE";
+*** Since we're running under ${thing}, I'll just let it take care
+    of the dependency's installation later.
+END_MESSAGE
+    return 1;
+}
+
+# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
+# if we are, then we simply let it taking care of our dependencies
+sub _check_lock {
+    return unless @Missing or @_;
+
+    my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
+
+    if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
+        return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS');
+    }
+
+    require CPAN;
+
+    if ($CPAN::VERSION > '1.89') {
+        if ($cpan_env) {
+            return _running_under('CPAN');
+        }
+        return; # CPAN.pm new enough, don't need to check further
+    }
+
+    # last ditch attempt, this -will- configure CPAN, very sorry
+
+    _load_cpan(1); # force initialize even though it's already loaded
+
+    # Find the CPAN lock-file
+    my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
+    return unless -f $lock;
+
+    # Check the lock
+    local *LOCK;
+    return unless open(LOCK, $lock);
+
+    if (
+            ( $^O eq 'MSWin32' ? _under_cpan() : <LOCK> == getppid() )
+        and ( $CPAN::Config->{prerequisites_policy} || '' ) ne 'ignore'
+    ) {
+        print <<'END_MESSAGE';
+
+*** Since we're running under CPAN, I'll just let it take care
+    of the dependency's installation later.
+END_MESSAGE
+        return 1;
+    }
+
+    close LOCK;
+    return;
+}
+
+sub install {
+    my $class = shift;
+
+    my $i;    # used below to strip leading '-' from config keys
+    my @config = ( map { s/^-// if ++$i; $_ } @{ +shift } );
+
+    my ( @modules, @installed );
+    while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
+
+        # grep out those already installed
+        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+            push @installed, $pkg;
+        }
+        else {
+            push @modules, $pkg, $ver;
+        }
+    }
+
+    return @installed unless @modules;  # nothing to do
+    return @installed if _check_lock(); # defer to the CPAN shell
+
+    print "*** Installing dependencies...\n";
+
+    return unless _connected_to('cpan.org');
+
+    my %args = @config;
+    my %failed;
+    local *FAILED;
+    if ( $args{do_once} and open( FAILED, '.#autoinstall.failed' ) ) {
+        while (<FAILED>) { chomp; $failed{$_}++ }
+        close FAILED;
+
+        my @newmod;
+        while ( my ( $k, $v ) = splice( @modules, 0, 2 ) ) {
+            push @newmod, ( $k => $v ) unless $failed{$k};
+        }
+        @modules = @newmod;
+    }
+
+    if ( _has_cpanplus() and not $ENV{PERL_AUTOINSTALL_PREFER_CPAN} ) {
+        _install_cpanplus( \@modules, \@config );
+    } else {
+        _install_cpan( \@modules, \@config );
+    }
+
+    print "*** $class installation finished.\n";
+
+    # see if we have successfully installed them
+    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
+        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+            push @installed, $pkg;
+        }
+        elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
+            print FAILED "$pkg\n";
+        }
+    }
+
+    close FAILED if $args{do_once};
+
+    return @installed;
+}
+
+sub _install_cpanplus {
+    my @modules   = @{ +shift };
+    my @config    = _cpanplus_config( @{ +shift } );
+    my $installed = 0;
+
+    require CPANPLUS::Backend;
+    my $cp   = CPANPLUS::Backend->new;
+    my $conf = $cp->configure_object;
+
+    return unless $conf->can('conf') # 0.05x+ with "sudo" support
+               or _can_write($conf->_get_build('base'));  # 0.04x
+
+    # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
+    my $makeflags = $conf->get_conf('makeflags') || '';
+    if ( UNIVERSAL::isa( $makeflags, 'HASH' ) ) {
+        # 0.03+ uses a hashref here
+        $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST};
+
+    } else {
+        # 0.02 and below uses a scalar
+        $makeflags = join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
+          if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
+
+    }
+    $conf->set_conf( makeflags => $makeflags );
+    $conf->set_conf( prereqs   => 1 );
+
+    
+
+    while ( my ( $key, $val ) = splice( @config, 0, 2 ) ) {
+        $conf->set_conf( $key, $val );
+    }
+
+    my $modtree = $cp->module_tree;
+    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
+        print "*** Installing $pkg...\n";
+
+        MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
+
+        my $success;
+        my $obj = $modtree->{$pkg};
+
+        if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) {
+            my $pathname = $pkg;
+            $pathname =~ s/::/\\W/;
+
+            foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
+                delete $INC{$inc};
+            }
+
+            my $rv = $cp->install( modules => [ $obj->{module} ] );
+
+            if ( $rv and ( $rv->{ $obj->{module} } or $rv->{ok} ) ) {
+                print "*** $pkg successfully installed.\n";
+                $success = 1;
+            } else {
+                print "*** $pkg installation cancelled.\n";
+                $success = 0;
+            }
+
+            $installed += $success;
+        } else {
+            print << ".";
+*** Could not find a version $ver or above for $pkg; skipping.
+.
+        }
+
+        MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
+    }
+
+    return $installed;
+}
+
+sub _cpanplus_config {
+	my @config = ();
+	while ( @_ ) {
+		my ($key, $value) = (shift(), shift());
+		if ( $key eq 'prerequisites_policy' ) {
+			if ( $value eq 'follow' ) {
+				$value = CPANPLUS::Internals::Constants::PREREQ_INSTALL();
+			} elsif ( $value eq 'ask' ) {
+				$value = CPANPLUS::Internals::Constants::PREREQ_ASK();
+			} elsif ( $value eq 'ignore' ) {
+				$value = CPANPLUS::Internals::Constants::PREREQ_IGNORE();
+			} else {
+				die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n";
+			}
+		} else {
+			die "*** Cannot convert option $key to CPANPLUS version.\n";
+		}
+	}
+	return @config;
+}
+
+sub _install_cpan {
+    my @modules   = @{ +shift };
+    my @config    = @{ +shift };
+    my $installed = 0;
+    my %args;
+
+    _load_cpan();
+    require Config;
+
+    if (CPAN->VERSION < 1.80) {
+        # no "sudo" support, probe for writableness
+        return unless _can_write( MM->catfile( $CPAN::Config->{cpan_home}, 'sources' ) )
+                  and _can_write( $Config::Config{sitelib} );
+    }
+
+    # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
+    my $makeflags = $CPAN::Config->{make_install_arg} || '';
+    $CPAN::Config->{make_install_arg} =
+      join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
+      if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
+
+    # don't show start-up info
+    $CPAN::Config->{inhibit_startup_message} = 1;
+
+    # set additional options
+    while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) {
+        ( $args{$opt} = $arg, next )
+          if $opt =~ /^force$/;    # pseudo-option
+        $CPAN::Config->{$opt} = $arg;
+    }
+
+    local $CPAN::Config->{prerequisites_policy} = 'follow';
+
+    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
+        MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
+
+        print "*** Installing $pkg...\n";
+
+        my $obj     = CPAN::Shell->expand( Module => $pkg );
+        my $success = 0;
+
+        if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) {
+            my $pathname = $pkg;
+            $pathname =~ s/::/\\W/;
+
+            foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
+                delete $INC{$inc};
+            }
+
+            my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
+                                  : CPAN::Shell->install($pkg);
+            $rv ||= eval {
+                $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
+                  ->{install}
+                  if $CPAN::META;
+            };
+
+            if ( $rv eq 'YES' ) {
+                print "*** $pkg successfully installed.\n";
+                $success = 1;
+            }
+            else {
+                print "*** $pkg installation failed.\n";
+                $success = 0;
+            }
+
+            $installed += $success;
+        }
+        else {
+            print << ".";
+*** Could not find a version $ver or above for $pkg; skipping.
+.
+        }
+
+        MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
+    }
+
+    return $installed;
+}
+
+sub _has_cpanplus {
+    return (
+        $HasCPANPLUS = (
+            $INC{'CPANPLUS/Config.pm'}
+              or _load('CPANPLUS::Shell::Default')
+        )
+    );
+}
+
+# make guesses on whether we're under the CPAN installation directory
+sub _under_cpan {
+    require Cwd;
+    require File::Spec;
+
+    my $cwd  = File::Spec->canonpath( Cwd::cwd() );
+    my $cpan = File::Spec->canonpath( $CPAN::Config->{cpan_home} );
+
+    return ( index( $cwd, $cpan ) > -1 );
+}
+
+sub _update_to {
+    my $class = __PACKAGE__;
+    my $ver   = shift;
+
+    return
+      if _version_cmp( _load($class), $ver ) >= 0;  # no need to upgrade
+
+    if (
+        _prompt( "==> A newer version of $class ($ver) is required. Install?",
+            'y' ) =~ /^[Nn]/
+      )
+    {
+        die "*** Please install $class $ver manually.\n";
+    }
+
+    print << ".";
+*** Trying to fetch it from CPAN...
+.
+
+    # install ourselves
+    _load($class) and return $class->import(@_)
+      if $class->install( [], $class, $ver );
+
+    print << '.'; exit 1;
+
+*** Cannot bootstrap myself. :-( Installation terminated.
+.
+}
+
+# check if we're connected to some host, using inet_aton
+sub _connected_to {
+    my $site = shift;
+
+    return (
+        ( _load('Socket') and Socket::inet_aton($site) ) or _prompt(
+            qq(
+*** Your host cannot resolve the domain name '$site', which
+    probably means the Internet connections are unavailable.
+==> Should we try to install the required module(s) anyway?), 'n'
+          ) =~ /^[Yy]/
+    );
+}
+
+# check if a directory is writable; may create it on demand
+sub _can_write {
+    my $path = shift;
+    mkdir( $path, 0755 ) unless -e $path;
+
+    return 1 if -w $path;
+
+    print << ".";
+*** You are not allowed to write to the directory '$path';
+    the installation may fail due to insufficient permissions.
+.
+
+    if (
+        eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt(
+            qq(
+==> Should we try to re-execute the autoinstall process with 'sudo'?),
+            ((-t STDIN) ? 'y' : 'n')
+        ) =~ /^[Yy]/
+      )
+    {
+
+        # try to bootstrap ourselves from sudo
+        print << ".";
+*** Trying to re-execute the autoinstall process with 'sudo'...
+.
+        my $missing = join( ',', @Missing );
+        my $config = join( ',',
+            UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
+          if $Config;
+
+        return
+          unless system( 'sudo', $^X, $0, "--config=$config",
+            "--installdeps=$missing" );
+
+        print << ".";
+*** The 'sudo' command exited with error!  Resuming...
+.
+    }
+
+    return _prompt(
+        qq(
+==> Should we try to install the required module(s) anyway?), 'n'
+    ) =~ /^[Yy]/;
+}
+
+# load a module and return the version it reports
+sub _load {
+    my $mod  = pop;    # class/instance doesn't matter
+    my $file = $mod;
+
+    $file =~ s|::|/|g;
+    $file .= '.pm';
+
+    local $@;
+    return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 );
+}
+
+# Load CPAN.pm and it's configuration
+sub _load_cpan {
+    return if $CPAN::VERSION and $CPAN::Config and not @_;
+    require CPAN;
+
+    # CPAN-1.82+ adds CPAN::Config::AUTOLOAD to redirect to
+    #    CPAN::HandleConfig->load. CPAN reports that the redirection
+    #    is deprecated in a warning printed at the user.
+
+    # CPAN-1.81 expects CPAN::HandleConfig->load, does not have
+    #   $CPAN::HandleConfig::VERSION but cannot handle
+    #   CPAN::Config->load
+
+    # Which "versions expect CPAN::Config->load?
+
+    if ( $CPAN::HandleConfig::VERSION
+        || CPAN::HandleConfig->can('load')
+    ) {
+        # Newer versions of CPAN have a HandleConfig module
+        CPAN::HandleConfig->load;
+    } else {
+    	# Older versions had the load method in Config directly
+        CPAN::Config->load;
+    }
+}
+
+# compare two versions, either use Sort::Versions or plain comparison
+# return values same as <=>
+sub _version_cmp {
+    my ( $cur, $min ) = @_;
+    return -1 unless defined $cur;  # if 0 keep comparing
+    return 1 unless $min;
+
+    $cur =~ s/\s+$//;
+
+    # check for version numbers that are not in decimal format
+    if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) {
+        if ( ( $version::VERSION or defined( _load('version') )) and
+             version->can('new') 
+            ) {
+
+            # use version.pm if it is installed.
+            return version->new($cur) <=> version->new($min);
+        }
+        elsif ( $Sort::Versions::VERSION or defined( _load('Sort::Versions') ) )
+        {
+
+            # use Sort::Versions as the sorting algorithm for a.b.c versions
+            return Sort::Versions::versioncmp( $cur, $min );
+        }
+
+        warn "Cannot reliably compare non-decimal formatted versions.\n"
+          . "Please install version.pm or Sort::Versions.\n";
+    }
+
+    # plain comparison
+    local $^W = 0;    # shuts off 'not numeric' bugs
+    return $cur <=> $min;
+}
+
+# nothing; this usage is deprecated.
+sub main::PREREQ_PM { return {}; }
+
+sub _make_args {
+    my %args = @_;
+
+    $args{PREREQ_PM} = { %{ $args{PREREQ_PM} || {} }, @Existing, @Missing }
+      if $UnderCPAN or $TestOnly;
+
+    if ( $args{EXE_FILES} and -e 'MANIFEST' ) {
+        require ExtUtils::Manifest;
+        my $manifest = ExtUtils::Manifest::maniread('MANIFEST');
+
+        $args{EXE_FILES} =
+          [ grep { exists $manifest->{$_} } @{ $args{EXE_FILES} } ];
+    }
+
+    $args{test}{TESTS} ||= 't/*.t';
+    $args{test}{TESTS} = join( ' ',
+        grep { !exists( $DisabledTests{$_} ) }
+          map { glob($_) } split( /\s+/, $args{test}{TESTS} ) );
+
+    my $missing = join( ',', @Missing );
+    my $config =
+      join( ',', UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
+      if $Config;
+
+    $PostambleActions = (
+        ($missing and not $UnderCPAN)
+        ? "\$(PERL) $0 --config=$config --installdeps=$missing"
+        : "\$(NOECHO) \$(NOOP)"
+    );
+
+    return %args;
+}
+
+# a wrapper to ExtUtils::MakeMaker::WriteMakefile
+sub Write {
+    require Carp;
+    Carp::croak "WriteMakefile: Need even number of args" if @_ % 2;
+
+    if ($CheckOnly) {
+        print << ".";
+*** Makefile not written in check-only mode.
+.
+        return;
+    }
+
+    my %args = _make_args(@_);
+
+    no strict 'refs';
+
+    $PostambleUsed = 0;
+    local *MY::postamble = \&postamble unless defined &MY::postamble;
+    ExtUtils::MakeMaker::WriteMakefile(%args);
+
+    print << "." unless $PostambleUsed;
+*** WARNING: Makefile written with customized MY::postamble() without
+    including contents from Module::AutoInstall::postamble() --
+    auto installation features disabled.  Please contact the author.
+.
+
+    return 1;
+}
+
+sub postamble {
+    $PostambleUsed = 1;
+
+    return <<"END_MAKE";
+
+config :: installdeps
+\t\$(NOECHO) \$(NOOP)
+
+checkdeps ::
+\t\$(PERL) $0 --checkdeps
+
+installdeps ::
+\t$PostambleActions
+
+END_MAKE
+
+}
+
+1;
+
+__END__
+
+#line 1071
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install.pm
new file mode 100644
index 0000000..74caf9c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install.pm
@@ -0,0 +1,470 @@
+#line 1
+package Module::Install;
+
+# For any maintainers:
+# The load order for Module::Install is a bit magic.
+# It goes something like this...
+#
+# IF ( host has Module::Install installed, creating author mode ) {
+#     1. Makefile.PL calls "use inc::Module::Install"
+#     2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install
+#     3. The installed version of inc::Module::Install loads
+#     4. inc::Module::Install calls "require Module::Install"
+#     5. The ./inc/ version of Module::Install loads
+# } ELSE {
+#     1. Makefile.PL calls "use inc::Module::Install"
+#     2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install
+#     3. The ./inc/ version of Module::Install loads
+# }
+
+use 5.005;
+use strict 'vars';
+use Cwd        ();
+use File::Find ();
+use File::Path ();
+
+use vars qw{$VERSION $MAIN};
+BEGIN {
+	# All Module::Install core packages now require synchronised versions.
+	# This will be used to ensure we don't accidentally load old or
+	# different versions of modules.
+	# This is not enforced yet, but will be some time in the next few
+	# releases once we can make sure it won't clash with custom
+	# Module::Install extensions.
+	$VERSION = '1.01';
+
+	# Storage for the pseudo-singleton
+	$MAIN    = undef;
+
+	*inc::Module::Install::VERSION = *VERSION;
+	@inc::Module::Install::ISA     = __PACKAGE__;
+
+}
+
+sub import {
+	my $class = shift;
+	my $self  = $class->new(@_);
+	my $who   = $self->_caller;
+
+	#-------------------------------------------------------------
+	# all of the following checks should be included in import(),
+	# to allow "eval 'require Module::Install; 1' to test
+	# installation of Module::Install. (RT #51267)
+	#-------------------------------------------------------------
+
+	# Whether or not inc::Module::Install is actually loaded, the
+	# $INC{inc/Module/Install.pm} is what will still get set as long as
+	# the caller loaded module this in the documented manner.
+	# If not set, the caller may NOT have loaded the bundled version, and thus
+	# they may not have a MI version that works with the Makefile.PL. This would
+	# result in false errors or unexpected behaviour. And we don't want that.
+	my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
+	unless ( $INC{$file} ) { die <<"END_DIE" }
+
+Please invoke ${\__PACKAGE__} with:
+
+	use inc::${\__PACKAGE__};
+
+not:
+
+	use ${\__PACKAGE__};
+
+END_DIE
+
+	# This reportedly fixes a rare Win32 UTC file time issue, but
+	# as this is a non-cross-platform XS module not in the core,
+	# we shouldn't really depend on it. See RT #24194 for detail.
+	# (Also, this module only supports Perl 5.6 and above).
+	eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006;
+
+	# If the script that is loading Module::Install is from the future,
+	# then make will detect this and cause it to re-run over and over
+	# again. This is bad. Rather than taking action to touch it (which
+	# is unreliable on some platforms and requires write permissions)
+	# for now we should catch this and refuse to run.
+	if ( -f $0 ) {
+		my $s = (stat($0))[9];
+
+		# If the modification time is only slightly in the future,
+		# sleep briefly to remove the problem.
+		my $a = $s - time;
+		if ( $a > 0 and $a < 5 ) { sleep 5 }
+
+		# Too far in the future, throw an error.
+		my $t = time;
+		if ( $s > $t ) { die <<"END_DIE" }
+
+Your installer $0 has a modification time in the future ($s > $t).
+
+This is known to create infinite loops in make.
+
+Please correct this, then run $0 again.
+
+END_DIE
+	}
+
+
+	# Build.PL was formerly supported, but no longer is due to excessive
+	# difficulty in implementing every single feature twice.
+	if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
+
+Module::Install no longer supports Build.PL.
+
+It was impossible to maintain duel backends, and has been deprecated.
+
+Please remove all Build.PL files and only use the Makefile.PL installer.
+
+END_DIE
+
+	#-------------------------------------------------------------
+
+	# To save some more typing in Module::Install installers, every...
+	# use inc::Module::Install
+	# ...also acts as an implicit use strict.
+	$^H |= strict::bits(qw(refs subs vars));
+
+	#-------------------------------------------------------------
+
+	unless ( -f $self->{file} ) {
+		foreach my $key (keys %INC) {
+			delete $INC{$key} if $key =~ /Module\/Install/;
+		}
+
+		local $^W;
+		require "$self->{path}/$self->{dispatch}.pm";
+		File::Path::mkpath("$self->{prefix}/$self->{author}");
+		$self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
+		$self->{admin}->init;
+		@_ = ($class, _self => $self);
+		goto &{"$self->{name}::import"};
+	}
+
+	local $^W;
+	*{"${who}::AUTOLOAD"} = $self->autoload;
+	$self->preload;
+
+	# Unregister loader and worker packages so subdirs can use them again
+	delete $INC{'inc/Module/Install.pm'};
+	delete $INC{'Module/Install.pm'};
+
+	# Save to the singleton
+	$MAIN = $self;
+
+	return 1;
+}
+
+sub autoload {
+	my $self = shift;
+	my $who  = $self->_caller;
+	my $cwd  = Cwd::cwd();
+	my $sym  = "${who}::AUTOLOAD";
+	$sym->{$cwd} = sub {
+		my $pwd = Cwd::cwd();
+		if ( my $code = $sym->{$pwd} ) {
+			# Delegate back to parent dirs
+			goto &$code unless $cwd eq $pwd;
+		}
+		unless ($$sym =~ s/([^:]+)$//) {
+			# XXX: it looks like we can't retrieve the missing function
+			# via $$sym (usually $main::AUTOLOAD) in this case.
+			# I'm still wondering if we should slurp Makefile.PL to
+			# get some context or not ...
+			my ($package, $file, $line) = caller;
+			die <<"EOT";
+Unknown function is found at $file line $line.
+Execution of $file aborted due to runtime errors.
+
+If you're a contributor to a project, you may need to install
+some Module::Install extensions from CPAN (or other repository).
+If you're a user of a module, please contact the author.
+EOT
+		}
+		my $method = $1;
+		if ( uc($method) eq $method ) {
+			# Do nothing
+			return;
+		} elsif ( $method =~ /^_/ and $self->can($method) ) {
+			# Dispatch to the root M:I class
+			return $self->$method(@_);
+		}
+
+		# Dispatch to the appropriate plugin
+		unshift @_, ( $self, $1 );
+		goto &{$self->can('call')};
+	};
+}
+
+sub preload {
+	my $self = shift;
+	unless ( $self->{extensions} ) {
+		$self->load_extensions(
+			"$self->{prefix}/$self->{path}", $self
+		);
+	}
+
+	my @exts = @{$self->{extensions}};
+	unless ( @exts ) {
+		@exts = $self->{admin}->load_all_extensions;
+	}
+
+	my %seen;
+	foreach my $obj ( @exts ) {
+		while (my ($method, $glob) = each %{ref($obj) . '::'}) {
+			next unless $obj->can($method);
+			next if $method =~ /^_/;
+			next if $method eq uc($method);
+			$seen{$method}++;
+		}
+	}
+
+	my $who = $self->_caller;
+	foreach my $name ( sort keys %seen ) {
+		local $^W;
+		*{"${who}::$name"} = sub {
+			${"${who}::AUTOLOAD"} = "${who}::$name";
+			goto &{"${who}::AUTOLOAD"};
+		};
+	}
+}
+
+sub new {
+	my ($class, %args) = @_;
+
+	delete $INC{'FindBin.pm'};
+	{
+		# to suppress the redefine warning
+		local $SIG{__WARN__} = sub {};
+		require FindBin;
+	}
+
+	# ignore the prefix on extension modules built from top level.
+	my $base_path = Cwd::abs_path($FindBin::Bin);
+	unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
+		delete $args{prefix};
+	}
+	return $args{_self} if $args{_self};
+
+	$args{dispatch} ||= 'Admin';
+	$args{prefix}   ||= 'inc';
+	$args{author}   ||= ($^O eq 'VMS' ? '_author' : '.author');
+	$args{bundle}   ||= 'inc/BUNDLES';
+	$args{base}     ||= $base_path;
+	$class =~ s/^\Q$args{prefix}\E:://;
+	$args{name}     ||= $class;
+	$args{version}  ||= $class->VERSION;
+	unless ( $args{path} ) {
+		$args{path}  = $args{name};
+		$args{path}  =~ s!::!/!g;
+	}
+	$args{file}     ||= "$args{base}/$args{prefix}/$args{path}.pm";
+	$args{wrote}      = 0;
+
+	bless( \%args, $class );
+}
+
+sub call {
+	my ($self, $method) = @_;
+	my $obj = $self->load($method) or return;
+        splice(@_, 0, 2, $obj);
+	goto &{$obj->can($method)};
+}
+
+sub load {
+	my ($self, $method) = @_;
+
+	$self->load_extensions(
+		"$self->{prefix}/$self->{path}", $self
+	) unless $self->{extensions};
+
+	foreach my $obj (@{$self->{extensions}}) {
+		return $obj if $obj->can($method);
+	}
+
+	my $admin = $self->{admin} or die <<"END_DIE";
+The '$method' method does not exist in the '$self->{prefix}' path!
+Please remove the '$self->{prefix}' directory and run $0 again to load it.
+END_DIE
+
+	my $obj = $admin->load($method, 1);
+	push @{$self->{extensions}}, $obj;
+
+	$obj;
+}
+
+sub load_extensions {
+	my ($self, $path, $top) = @_;
+
+	my $should_reload = 0;
+	unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
+		unshift @INC, $self->{prefix};
+		$should_reload = 1;
+	}
+
+	foreach my $rv ( $self->find_extensions($path) ) {
+		my ($file, $pkg) = @{$rv};
+		next if $self->{pathnames}{$pkg};
+
+		local $@;
+		my $new = eval { local $^W; require $file; $pkg->can('new') };
+		unless ( $new ) {
+			warn $@ if $@;
+			next;
+		}
+		$self->{pathnames}{$pkg} =
+			$should_reload ? delete $INC{$file} : $INC{$file};
+		push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
+	}
+
+	$self->{extensions} ||= [];
+}
+
+sub find_extensions {
+	my ($self, $path) = @_;
+
+	my @found;
+	File::Find::find( sub {
+		my $file = $File::Find::name;
+		return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
+		my $subpath = $1;
+		return if lc($subpath) eq lc($self->{dispatch});
+
+		$file = "$self->{path}/$subpath.pm";
+		my $pkg = "$self->{name}::$subpath";
+		$pkg =~ s!/!::!g;
+
+		# If we have a mixed-case package name, assume case has been preserved
+		# correctly.  Otherwise, root through the file to locate the case-preserved
+		# version of the package name.
+		if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
+			my $content = Module::Install::_read($subpath . '.pm');
+			my $in_pod  = 0;
+			foreach ( split //, $content ) {
+				$in_pod = 1 if /^=\w/;
+				$in_pod = 0 if /^=cut/;
+				next if ($in_pod || /^=cut/);  # skip pod text
+				next if /^\s*#/;               # and comments
+				if ( m/^\s*package\s+($pkg)\s*;/i ) {
+					$pkg = $1;
+					last;
+				}
+			}
+		}
+
+		push @found, [ $file, $pkg ];
+	}, $path ) if -d $path;
+
+	@found;
+}
+
+
+
+
+
+#####################################################################
+# Common Utility Functions
+
+sub _caller {
+	my $depth = 0;
+	my $call  = caller($depth);
+	while ( $call eq __PACKAGE__ ) {
+		$depth++;
+		$call = caller($depth);
+	}
+	return $call;
+}
+
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
+sub _read {
+	local *FH;
+	open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+	my $string = do { local $/; <FH> };
+	close FH or die "close($_[0]): $!";
+	return $string;
+}
+END_NEW
+sub _read {
+	local *FH;
+	open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
+	my $string = do { local $/; <FH> };
+	close FH or die "close($_[0]): $!";
+	return $string;
+}
+END_OLD
+
+sub _readperl {
+	my $string = Module::Install::_read($_[0]);
+	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
+	$string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s;
+	$string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg;
+	return $string;
+}
+
+sub _readpod {
+	my $string = Module::Install::_read($_[0]);
+	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
+	return $string if $_[0] =~ /\.pod\z/;
+	$string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg;
+	$string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg;
+	$string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg;
+	$string =~ s/^\n+//s;
+	return $string;
+}
+
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
+sub _write {
+	local *FH;
+	open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+	foreach ( 1 .. $#_ ) {
+		print FH $_[$_] or die "print($_[0]): $!";
+	}
+	close FH or die "close($_[0]): $!";
+}
+END_NEW
+sub _write {
+	local *FH;
+	open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
+	foreach ( 1 .. $#_ ) {
+		print FH $_[$_] or die "print($_[0]): $!";
+	}
+	close FH or die "close($_[0]): $!";
+}
+END_OLD
+
+# _version is for processing module versions (eg, 1.03_05) not
+# Perl versions (eg, 5.8.1).
+sub _version ($) {
+	my $s = shift || 0;
+	my $d =()= $s =~ /(\.)/g;
+	if ( $d >= 2 ) {
+		# Normalise multipart versions
+		$s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg;
+	}
+	$s =~ s/^(\d+)\.?//;
+	my $l = $1 || 0;
+	my @v = map {
+		$_ . '0' x (3 - length $_)
+	} $s =~ /(\d{1,3})\D?/g;
+	$l = $l . '.' . join '', @v if @v;
+	return $l + 0;
+}
+
+sub _cmp ($$) {
+	_version($_[0]) <=> _version($_[1]);
+}
+
+# Cloned from Params::Util::_CLASS
+sub _CLASS ($) {
+	(
+		defined $_[0]
+		and
+		! ref $_[0]
+		and
+		$_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s
+	) ? $_[0] : undef;
+}
+
+1;
+
+# Copyright 2008 - 2011 Adam Kennedy.
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/AutoInstall.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/AutoInstall.pm
new file mode 100644
index 0000000..bc3d172
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/AutoInstall.pm
@@ -0,0 +1,82 @@
+#line 1
+package Module::Install::AutoInstall;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.01';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+sub AutoInstall { $_[0] }
+
+sub run {
+    my $self = shift;
+    $self->auto_install_now(@_);
+}
+
+sub write {
+    my $self = shift;
+    $self->auto_install(@_);
+}
+
+sub auto_install {
+    my $self = shift;
+    return if $self->{done}++;
+
+    # Flatten array of arrays into a single array
+    my @core = map @$_, map @$_, grep ref,
+               $self->build_requires, $self->requires;
+
+    my @config = @_;
+
+    # We'll need Module::AutoInstall
+    $self->include('Module::AutoInstall');
+    require Module::AutoInstall;
+
+    my @features_require = Module::AutoInstall->import(
+        (@config ? (-config => \@config) : ()),
+        (@core   ? (-core   => \@core)   : ()),
+        $self->features,
+    );
+
+    my %seen;
+    my @requires = map @$_, map @$_, grep ref, $self->requires;
+    while (my ($mod, $ver) = splice(@requires, 0, 2)) {
+        $seen{$mod}{$ver}++;
+    }
+    my @build_requires = map @$_, map @$_, grep ref, $self->build_requires;
+    while (my ($mod, $ver) = splice(@build_requires, 0, 2)) {
+        $seen{$mod}{$ver}++;
+    }
+    my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires;
+    while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) {
+        $seen{$mod}{$ver}++;
+    }
+
+    my @deduped;
+    while (my ($mod, $ver) = splice(@features_require, 0, 2)) {
+        push @deduped, $mod => $ver unless $seen{$mod}{$ver}++;
+    }
+
+    $self->requires(@deduped);
+
+    $self->makemaker_args( Module::AutoInstall::_make_args() );
+
+    my $class = ref($self);
+    $self->postamble(
+        "# --- $class section:\n" .
+        Module::AutoInstall::postamble()
+    );
+}
+
+sub auto_install_now {
+    my $self = shift;
+    $self->auto_install(@_);
+    Module::AutoInstall::do_install();
+}
+
+1;
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Base.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Base.pm
new file mode 100644
index 0000000..d3662c9
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Base.pm
@@ -0,0 +1,83 @@
+#line 1
+package Module::Install::Base;
+
+use strict 'vars';
+use vars qw{$VERSION};
+BEGIN {
+	$VERSION = '1.01';
+}
+
+# Suspend handler for "redefined" warnings
+BEGIN {
+	my $w = $SIG{__WARN__};
+	$SIG{__WARN__} = sub { $w };
+}
+
+#line 42
+
+sub new {
+	my $class = shift;
+	unless ( defined &{"${class}::call"} ) {
+		*{"${class}::call"} = sub { shift->_top->call(@_) };
+	}
+	unless ( defined &{"${class}::load"} ) {
+		*{"${class}::load"} = sub { shift->_top->load(@_) };
+	}
+	bless { @_ }, $class;
+}
+
+#line 61
+
+sub AUTOLOAD {
+	local $@;
+	my $func = eval { shift->_top->autoload } or return;
+	goto &$func;
+}
+
+#line 75
+
+sub _top {
+	$_[0]->{_top};
+}
+
+#line 90
+
+sub admin {
+	$_[0]->_top->{admin}
+	or
+	Module::Install::Base::FakeAdmin->new;
+}
+
+#line 106
+
+sub is_admin {
+	! $_[0]->admin->isa('Module::Install::Base::FakeAdmin');
+}
+
+sub DESTROY {}
+
+package Module::Install::Base::FakeAdmin;
+
+use vars qw{$VERSION};
+BEGIN {
+	$VERSION = $Module::Install::Base::VERSION;
+}
+
+my $fake;
+
+sub new {
+	$fake ||= bless(\@_, $_[0]);
+}
+
+sub AUTOLOAD {}
+
+sub DESTROY {}
+
+# Restore warning handler
+BEGIN {
+	$SIG{__WARN__} = $SIG{__WARN__}->();
+}
+
+1;
+
+#line 159
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Can.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Can.pm
new file mode 100644
index 0000000..276409a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Can.pm
@@ -0,0 +1,81 @@
+#line 1
+package Module::Install::Can;
+
+use strict;
+use Config                ();
+use File::Spec            ();
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.01';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+# check if we can load some module
+### Upgrade this to not have to load the module if possible
+sub can_use {
+	my ($self, $mod, $ver) = @_;
+	$mod =~ s{::|\\}{/}g;
+	$mod .= '.pm' unless $mod =~ /\.pm$/i;
+
+	my $pkg = $mod;
+	$pkg =~ s{/}{::}g;
+	$pkg =~ s{\.pm$}{}i;
+
+	local $@;
+	eval { require $mod; $pkg->VERSION($ver || 0); 1 };
+}
+
+# check if we can run some command
+sub can_run {
+	my ($self, $cmd) = @_;
+
+	my $_cmd = $cmd;
+	return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
+
+	for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+		next if $dir eq '';
+		my $abs = File::Spec->catfile($dir, $_[1]);
+		return $abs if (-x $abs or $abs = MM->maybe_command($abs));
+	}
+
+	return;
+}
+
+# can we locate a (the) C compiler
+sub can_cc {
+	my $self   = shift;
+	my @chunks = split(/ /, $Config::Config{cc}) or return;
+
+	# $Config{cc} may contain args; try to find out the program part
+	while (@chunks) {
+		return $self->can_run("@chunks") || (pop(@chunks), next);
+	}
+
+	return;
+}
+
+# Fix Cygwin bug on maybe_command();
+if ( $^O eq 'cygwin' ) {
+	require ExtUtils::MM_Cygwin;
+	require ExtUtils::MM_Win32;
+	if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
+		*ExtUtils::MM_Cygwin::maybe_command = sub {
+			my ($self, $file) = @_;
+			if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
+				ExtUtils::MM_Win32->maybe_command($file);
+			} else {
+				ExtUtils::MM_Unix->maybe_command($file);
+			}
+		}
+	}
+}
+
+1;
+
+__END__
+
+#line 156
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Fetch.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Fetch.pm
new file mode 100644
index 0000000..093cb7a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Fetch.pm
@@ -0,0 +1,93 @@
+#line 1
+package Module::Install::Fetch;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.01';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+sub get_file {
+    my ($self, %args) = @_;
+    my ($scheme, $host, $path, $file) =
+        $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
+
+    if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
+        $args{url} = $args{ftp_url}
+            or (warn("LWP support unavailable!\n"), return);
+        ($scheme, $host, $path, $file) =
+            $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
+    }
+
+    $|++;
+    print "Fetching '$file' from $host... ";
+
+    unless (eval { require Socket; Socket::inet_aton($host) }) {
+        warn "'$host' resolve failed!\n";
+        return;
+    }
+
+    return unless $scheme eq 'ftp' or $scheme eq 'http';
+
+    require Cwd;
+    my $dir = Cwd::getcwd();
+    chdir $args{local_dir} or return if exists $args{local_dir};
+
+    if (eval { require LWP::Simple; 1 }) {
+        LWP::Simple::mirror($args{url}, $file);
+    }
+    elsif (eval { require Net::FTP; 1 }) { eval {
+        # use Net::FTP to get past firewall
+        my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600);
+        $ftp->login("anonymous", 'anonymous@example.com');
+        $ftp->cwd($path);
+        $ftp->binary;
+        $ftp->get($file) or (warn("$!\n"), return);
+        $ftp->quit;
+    } }
+    elsif (my $ftp = $self->can_run('ftp')) { eval {
+        # no Net::FTP, fallback to ftp.exe
+        require FileHandle;
+        my $fh = FileHandle->new;
+
+        local $SIG{CHLD} = 'IGNORE';
+        unless ($fh->open("|$ftp -n")) {
+            warn "Couldn't open ftp: $!\n";
+            chdir $dir; return;
+        }
+
+        my @dialog = split(/\n/, <<"END_FTP");
+open $host
+user anonymous anonymous\@example.com
+cd $path
+binary
+get $file $file
+quit
+END_FTP
+        foreach (@dialog) { $fh->print("$_\n") }
+        $fh->close;
+    } }
+    else {
+        warn "No working 'ftp' program available!\n";
+        chdir $dir; return;
+    }
+
+    unless (-f $file) {
+        warn "Fetching failed: $@\n";
+        chdir $dir; return;
+    }
+
+    return if exists $args{size} and -s $file != $args{size};
+    system($args{run}) if exists $args{run};
+    unlink($file) if $args{remove};
+
+    print(((!exists $args{check_for} or -e $args{check_for})
+        ? "done!" : "failed! ($!)"), "\n");
+    chdir $dir; return !$?;
+}
+
+1;
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Include.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Include.pm
new file mode 100644
index 0000000..90cc979
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Include.pm
@@ -0,0 +1,34 @@
+#line 1
+package Module::Install::Include;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.01';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+sub include {
+	shift()->admin->include(@_);
+}
+
+sub include_deps {
+	shift()->admin->include_deps(@_);
+}
+
+sub auto_include {
+	shift()->admin->auto_include(@_);
+}
+
+sub auto_include_deps {
+	shift()->admin->auto_include_deps(@_);
+}
+
+sub auto_include_dependent_dists {
+	shift()->admin->auto_include_dependent_dists(@_);
+}
+
+1;
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Makefile.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Makefile.pm
new file mode 100644
index 0000000..4c71003
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Makefile.pm
@@ -0,0 +1,415 @@
+#line 1
+package Module::Install::Makefile;
+
+use strict 'vars';
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
+use Fcntl qw/:flock :seek/;
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.01';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+sub Makefile { $_[0] }
+
+my %seen = ();
+
+sub prompt {
+	shift;
+
+	# Infinite loop protection
+	my @c = caller();
+	if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
+		die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
+	}
+
+	# In automated testing or non-interactive session, always use defaults
+	if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) {
+		local $ENV{PERL_MM_USE_DEFAULT} = 1;
+		goto &ExtUtils::MakeMaker::prompt;
+	} else {
+		goto &ExtUtils::MakeMaker::prompt;
+	}
+}
+
+# Store a cleaned up version of the MakeMaker version,
+# since we need to behave differently in a variety of
+# ways based on the MM version.
+my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
+
+# If we are passed a param, do a "newer than" comparison.
+# Otherwise, just return the MakeMaker version.
+sub makemaker {
+	( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
+}
+
+# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified
+# as we only need to know here whether the attribute is an array
+# or a hash or something else (which may or may not be appendable).
+my %makemaker_argtype = (
+ C                  => 'ARRAY',
+ CONFIG             => 'ARRAY',
+# CONFIGURE          => 'CODE', # ignore
+ DIR                => 'ARRAY',
+ DL_FUNCS           => 'HASH',
+ DL_VARS            => 'ARRAY',
+ EXCLUDE_EXT        => 'ARRAY',
+ EXE_FILES          => 'ARRAY',
+ FUNCLIST           => 'ARRAY',
+ H                  => 'ARRAY',
+ IMPORTS            => 'HASH',
+ INCLUDE_EXT        => 'ARRAY',
+ LIBS               => 'ARRAY', # ignore ''
+ MAN1PODS           => 'HASH',
+ MAN3PODS           => 'HASH',
+ META_ADD           => 'HASH',
+ META_MERGE         => 'HASH',
+ PL_FILES           => 'HASH',
+ PM                 => 'HASH',
+ PMLIBDIRS          => 'ARRAY',
+ PMLIBPARENTDIRS    => 'ARRAY',
+ PREREQ_PM          => 'HASH',
+ CONFIGURE_REQUIRES => 'HASH',
+ SKIP               => 'ARRAY',
+ TYPEMAPS           => 'ARRAY',
+ XS                 => 'HASH',
+# VERSION            => ['version',''],  # ignore
+# _KEEP_AFTER_FLUSH  => '',
+
+ clean      => 'HASH',
+ depend     => 'HASH',
+ dist       => 'HASH',
+ dynamic_lib=> 'HASH',
+ linkext    => 'HASH',
+ macro      => 'HASH',
+ postamble  => 'HASH',
+ realclean  => 'HASH',
+ test       => 'HASH',
+ tool_autosplit => 'HASH',
+
+ # special cases where you can use makemaker_append
+ CCFLAGS   => 'APPENDABLE',
+ DEFINE    => 'APPENDABLE',
+ INC       => 'APPENDABLE',
+ LDDLFLAGS => 'APPENDABLE',
+ LDFROM    => 'APPENDABLE',
+);
+
+sub makemaker_args {
+	my ($self, %new_args) = @_;
+	my $args = ( $self->{makemaker_args} ||= {} );
+	foreach my $key (keys %new_args) {
+		if ($makemaker_argtype{$key}) {
+			if ($makemaker_argtype{$key} eq 'ARRAY') {
+				$args->{$key} = [] unless defined $args->{$key};
+				unless (ref $args->{$key} eq 'ARRAY') {
+					$args->{$key} = [$args->{$key}]
+				}
+				push @{$args->{$key}},
+					ref $new_args{$key} eq 'ARRAY'
+						? @{$new_args{$key}}
+						: $new_args{$key};
+			}
+			elsif ($makemaker_argtype{$key} eq 'HASH') {
+				$args->{$key} = {} unless defined $args->{$key};
+				foreach my $skey (keys %{ $new_args{$key} }) {
+					$args->{$key}{$skey} = $new_args{$key}{$skey};
+				}
+			}
+			elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
+				$self->makemaker_append($key => $new_args{$key});
+			}
+		}
+		else {
+			if (defined $args->{$key}) {
+				warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n};
+			}
+			$args->{$key} = $new_args{$key};
+		}
+	}
+	return $args;
+}
+
+# For mm args that take multiple space-seperated args,
+# append an argument to the current list.
+sub makemaker_append {
+	my $self = shift;
+	my $name = shift;
+	my $args = $self->makemaker_args;
+	$args->{$name} = defined $args->{$name}
+		? join( ' ', $args->{$name}, @_ )
+		: join( ' ', @_ );
+}
+
+sub build_subdirs {
+	my $self    = shift;
+	my $subdirs = $self->makemaker_args->{DIR} ||= [];
+	for my $subdir (@_) {
+		push @$subdirs, $subdir;
+	}
+}
+
+sub clean_files {
+	my $self  = shift;
+	my $clean = $self->makemaker_args->{clean} ||= {};
+	  %$clean = (
+		%$clean,
+		FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_),
+	);
+}
+
+sub realclean_files {
+	my $self      = shift;
+	my $realclean = $self->makemaker_args->{realclean} ||= {};
+	  %$realclean = (
+		%$realclean,
+		FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_),
+	);
+}
+
+sub libs {
+	my $self = shift;
+	my $libs = ref $_[0] ? shift : [ shift ];
+	$self->makemaker_args( LIBS => $libs );
+}
+
+sub inc {
+	my $self = shift;
+	$self->makemaker_args( INC => shift );
+}
+
+sub _wanted_t {
+}
+
+sub tests_recursive {
+	my $self = shift;
+	my $dir = shift || 't';
+	unless ( -d $dir ) {
+		die "tests_recursive dir '$dir' does not exist";
+	}
+	my %tests = map { $_ => 1 } split / /, ($self->tests || '');
+	require File::Find;
+	File::Find::find(
+        sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 },
+        $dir
+    );
+	$self->tests( join ' ', sort keys %tests );
+}
+
+sub write {
+	my $self = shift;
+	die "&Makefile->write() takes no arguments\n" if @_;
+
+	# Check the current Perl version
+	my $perl_version = $self->perl_version;
+	if ( $perl_version ) {
+		eval "use $perl_version; 1"
+			or die "ERROR: perl: Version $] is installed, "
+			. "but we need version >= $perl_version";
+	}
+
+	# Make sure we have a new enough MakeMaker
+	require ExtUtils::MakeMaker;
+
+	if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
+		# MakeMaker can complain about module versions that include
+		# an underscore, even though its own version may contain one!
+		# Hence the funny regexp to get rid of it.  See RT #35800
+		# for details.
+		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
+		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+	} else {
+		# Allow legacy-compatibility with 5.005 by depending on the
+		# most recent EU:MM that supported 5.005.
+		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+	}
+
+	# Generate the MakeMaker params
+	my $args = $self->makemaker_args;
+	$args->{DISTNAME} = $self->name;
+	$args->{NAME}     = $self->module_name || $self->name;
+	$args->{NAME}     =~ s/-/::/g;
+	$args->{VERSION}  = $self->version or die <<'EOT';
+ERROR: Can't determine distribution version. Please specify it
+explicitly via 'version' in Makefile.PL, or set a valid $VERSION
+in a module, and provide its file path via 'version_from' (or
+'all_from' if you prefer) in Makefile.PL.
+EOT
+
+	$DB::single = 1;
+	if ( $self->tests ) {
+		my @tests = split ' ', $self->tests;
+		my %seen;
+		$args->{test} = {
+			TESTS => (join ' ', grep {!$seen{$_}++} @tests),
+		};
+    } elsif ( $Module::Install::ExtraTests::use_extratests ) {
+        # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness.
+        # So, just ignore our xt tests here.
+	} elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
+		$args->{test} = {
+			TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
+		};
+	}
+	if ( $] >= 5.005 ) {
+		$args->{ABSTRACT} = $self->abstract;
+		$args->{AUTHOR}   = join ', ', @{$self->author || []};
+	}
+	if ( $self->makemaker(6.10) ) {
+		$args->{NO_META}   = 1;
+		#$args->{NO_MYMETA} = 1;
+	}
+	if ( $self->makemaker(6.17) and $self->sign ) {
+		$args->{SIGN} = 1;
+	}
+	unless ( $self->is_admin ) {
+		delete $args->{SIGN};
+	}
+	if ( $self->makemaker(6.31) and $self->license ) {
+		$args->{LICENSE} = $self->license;
+	}
+
+	my $prereq = ($args->{PREREQ_PM} ||= {});
+	%$prereq = ( %$prereq,
+		map { @$_ } # flatten [module => version]
+		map { @$_ }
+		grep $_,
+		($self->requires)
+	);
+
+	# Remove any reference to perl, PREREQ_PM doesn't support it
+	delete $args->{PREREQ_PM}->{perl};
+
+	# Merge both kinds of requires into BUILD_REQUIRES
+	my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
+	%$build_prereq = ( %$build_prereq,
+		map { @$_ } # flatten [module => version]
+		map { @$_ }
+		grep $_,
+		($self->configure_requires, $self->build_requires)
+	);
+
+	# Remove any reference to perl, BUILD_REQUIRES doesn't support it
+	delete $args->{BUILD_REQUIRES}->{perl};
+
+	# Delete bundled dists from prereq_pm, add it to Makefile DIR
+	my $subdirs = ($args->{DIR} || []);
+	if ($self->bundles) {
+		my %processed;
+		foreach my $bundle (@{ $self->bundles }) {
+			my ($mod_name, $dist_dir) = @$bundle;
+			delete $prereq->{$mod_name};
+			$dist_dir = File::Basename::basename($dist_dir); # dir for building this module
+			if (not exists $processed{$dist_dir}) {
+				if (-d $dist_dir) {
+					# List as sub-directory to be processed by make
+					push @$subdirs, $dist_dir;
+				}
+				# Else do nothing: the module is already present on the system
+				$processed{$dist_dir} = undef;
+			}
+		}
+	}
+
+	unless ( $self->makemaker('6.55_03') ) {
+		%$prereq = (%$prereq,%$build_prereq);
+		delete $args->{BUILD_REQUIRES};
+	}
+
+	if ( my $perl_version = $self->perl_version ) {
+		eval "use $perl_version; 1"
+			or die "ERROR: perl: Version $] is installed, "
+			. "but we need version >= $perl_version";
+
+		if ( $self->makemaker(6.48) ) {
+			$args->{MIN_PERL_VERSION} = $perl_version;
+		}
+	}
+
+	if ($self->installdirs) {
+		warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS};
+		$args->{INSTALLDIRS} = $self->installdirs;
+	}
+
+	my %args = map {
+		( $_ => $args->{$_} ) } grep {defined($args->{$_} )
+	} keys %$args;
+
+	my $user_preop = delete $args{dist}->{PREOP};
+	if ( my $preop = $self->admin->preop($user_preop) ) {
+		foreach my $key ( keys %$preop ) {
+			$args{dist}->{$key} = $preop->{$key};
+		}
+	}
+
+	my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
+	$self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
+}
+
+sub fix_up_makefile {
+	my $self          = shift;
+	my $makefile_name = shift;
+	my $top_class     = ref($self->_top) || '';
+	my $top_version   = $self->_top->VERSION || '';
+
+	my $preamble = $self->preamble
+		? "# Preamble by $top_class $top_version\n"
+			. $self->preamble
+		: '';
+	my $postamble = "# Postamble by $top_class $top_version\n"
+		. ($self->postamble || '');
+
+	local *MAKEFILE;
+	open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+	eval { flock MAKEFILE, LOCK_EX };
+	my $makefile = do { local $/; <MAKEFILE> };
+
+	$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
+	$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
+	$makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
+	$makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
+	$makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
+
+	# Module::Install will never be used to build the Core Perl
+	# Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
+	# PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
+	$makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
+	#$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
+
+	# Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
+	$makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g;
+
+	# XXX - This is currently unused; not sure if it breaks other MM-users
+	# $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
+
+	seek MAKEFILE, 0, SEEK_SET;
+	truncate MAKEFILE, 0;
+	print MAKEFILE  "$preamble$makefile$postamble" or die $!;
+	close MAKEFILE  or die $!;
+
+	1;
+}
+
+sub preamble {
+	my ($self, $text) = @_;
+	$self->{preamble} = $text . $self->{preamble} if defined $text;
+	$self->{preamble};
+}
+
+sub postamble {
+	my ($self, $text) = @_;
+	$self->{postamble} ||= $self->admin->postamble;
+	$self->{postamble} .= $text if defined $text;
+	$self->{postamble}
+}
+
+1;
+
+__END__
+
+#line 541
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Metadata.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Metadata.pm
new file mode 100644
index 0000000..3b01e09
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Metadata.pm
@@ -0,0 +1,716 @@
+#line 1
+package Module::Install::Metadata;
+
+use strict 'vars';
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.01';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+my @boolean_keys = qw{
+	sign
+};
+
+my @scalar_keys = qw{
+	name
+	module_name
+	abstract
+	version
+	distribution_type
+	tests
+	installdirs
+};
+
+my @tuple_keys = qw{
+	configure_requires
+	build_requires
+	requires
+	recommends
+	bundles
+	resources
+};
+
+my @resource_keys = qw{
+	homepage
+	bugtracker
+	repository
+};
+
+my @array_keys = qw{
+	keywords
+	author
+};
+
+*authors = \&author;
+
+sub Meta              { shift          }
+sub Meta_BooleanKeys  { @boolean_keys  }
+sub Meta_ScalarKeys   { @scalar_keys   }
+sub Meta_TupleKeys    { @tuple_keys    }
+sub Meta_ResourceKeys { @resource_keys }
+sub Meta_ArrayKeys    { @array_keys    }
+
+foreach my $key ( @boolean_keys ) {
+	*$key = sub {
+		my $self = shift;
+		if ( defined wantarray and not @_ ) {
+			return $self->{values}->{$key};
+		}
+		$self->{values}->{$key} = ( @_ ? $_[0] : 1 );
+		return $self;
+	};
+}
+
+foreach my $key ( @scalar_keys ) {
+	*$key = sub {
+		my $self = shift;
+		return $self->{values}->{$key} if defined wantarray and !@_;
+		$self->{values}->{$key} = shift;
+		return $self;
+	};
+}
+
+foreach my $key ( @array_keys ) {
+	*$key = sub {
+		my $self = shift;
+		return $self->{values}->{$key} if defined wantarray and !@_;
+		$self->{values}->{$key} ||= [];
+		push @{$self->{values}->{$key}}, @_;
+		return $self;
+	};
+}
+
+foreach my $key ( @resource_keys ) {
+	*$key = sub {
+		my $self = shift;
+		unless ( @_ ) {
+			return () unless $self->{values}->{resources};
+			return map  { $_->[1] }
+			       grep { $_->[0] eq $key }
+			       @{ $self->{values}->{resources} };
+		}
+		return $self->{values}->{resources}->{$key} unless @_;
+		my $uri = shift or die(
+			"Did not provide a value to $key()"
+		);
+		$self->resources( $key => $uri );
+		return 1;
+	};
+}
+
+foreach my $key ( grep { $_ ne "resources" } @tuple_keys) {
+	*$key = sub {
+		my $self = shift;
+		return $self->{values}->{$key} unless @_;
+		my @added;
+		while ( @_ ) {
+			my $module  = shift or last;
+			my $version = shift || 0;
+			push @added, [ $module, $version ];
+		}
+		push @{ $self->{values}->{$key} }, @added;
+		return map {@$_} @added;
+	};
+}
+
+# Resource handling
+my %lc_resource = map { $_ => 1 } qw{
+	homepage
+	license
+	bugtracker
+	repository
+};
+
+sub resources {
+	my $self = shift;
+	while ( @_ ) {
+		my $name  = shift or last;
+		my $value = shift or next;
+		if ( $name eq lc $name and ! $lc_resource{$name} ) {
+			die("Unsupported reserved lowercase resource '$name'");
+		}
+		$self->{values}->{resources} ||= [];
+		push @{ $self->{values}->{resources} }, [ $name, $value ];
+	}
+	$self->{values}->{resources};
+}
+
+# Aliases for build_requires that will have alternative
+# meanings in some future version of META.yml.
+sub test_requires     { shift->build_requires(@_) }
+sub install_requires  { shift->build_requires(@_) }
+
+# Aliases for installdirs options
+sub install_as_core   { $_[0]->installdirs('perl')   }
+sub install_as_cpan   { $_[0]->installdirs('site')   }
+sub install_as_site   { $_[0]->installdirs('site')   }
+sub install_as_vendor { $_[0]->installdirs('vendor') }
+
+sub dynamic_config {
+	my $self = shift;
+	unless ( @_ ) {
+		warn "You MUST provide an explicit true/false value to dynamic_config\n";
+		return $self;
+	}
+	$self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+	return 1;
+}
+
+sub perl_version {
+	my $self = shift;
+	return $self->{values}->{perl_version} unless @_;
+	my $version = shift or die(
+		"Did not provide a value to perl_version()"
+	);
+
+	# Normalize the version
+	$version = $self->_perl_version($version);
+
+	# We don't support the reall old versions
+	unless ( $version >= 5.005 ) {
+		die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
+	}
+
+	$self->{values}->{perl_version} = $version;
+}
+
+sub all_from {
+	my ( $self, $file ) = @_;
+
+	unless ( defined($file) ) {
+		my $name = $self->name or die(
+			"all_from called with no args without setting name() first"
+		);
+		$file = join('/', 'lib', split(/-/, $name)) . '.pm';
+		$file =~ s{.*/}{} unless -e $file;
+		unless ( -e $file ) {
+			die("all_from cannot find $file from $name");
+		}
+	}
+	unless ( -f $file ) {
+		die("The path '$file' does not exist, or is not a file");
+	}
+
+	$self->{values}{all_from} = $file;
+
+	# Some methods pull from POD instead of code.
+	# If there is a matching .pod, use that instead
+	my $pod = $file;
+	$pod =~ s/\.pm$/.pod/i;
+	$pod = $file unless -e $pod;
+
+	# Pull the different values
+	$self->name_from($file)         unless $self->name;
+	$self->version_from($file)      unless $self->version;
+	$self->perl_version_from($file) unless $self->perl_version;
+	$self->author_from($pod)        unless @{$self->author || []};
+	$self->license_from($pod)       unless $self->license;
+	$self->abstract_from($pod)      unless $self->abstract;
+
+	return 1;
+}
+
+sub provides {
+	my $self     = shift;
+	my $provides = ( $self->{values}->{provides} ||= {} );
+	%$provides = (%$provides, @_) if @_;
+	return $provides;
+}
+
+sub auto_provides {
+	my $self = shift;
+	return $self unless $self->is_admin;
+	unless (-e 'MANIFEST') {
+		warn "Cannot deduce auto_provides without a MANIFEST, skipping\n";
+		return $self;
+	}
+	# Avoid spurious warnings as we are not checking manifest here.
+	local $SIG{__WARN__} = sub {1};
+	require ExtUtils::Manifest;
+	local *ExtUtils::Manifest::manicheck = sub { return };
+
+	require Module::Build;
+	my $build = Module::Build->new(
+		dist_name    => $self->name,
+		dist_version => $self->version,
+		license      => $self->license,
+	);
+	$self->provides( %{ $build->find_dist_packages || {} } );
+}
+
+sub feature {
+	my $self     = shift;
+	my $name     = shift;
+	my $features = ( $self->{values}->{features} ||= [] );
+	my $mods;
+
+	if ( @_ == 1 and ref( $_[0] ) ) {
+		# The user used ->feature like ->features by passing in the second
+		# argument as a reference.  Accomodate for that.
+		$mods = $_[0];
+	} else {
+		$mods = \@_;
+	}
+
+	my $count = 0;
+	push @$features, (
+		$name => [
+			map {
+				ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_
+			} @$mods
+		]
+	);
+
+	return @$features;
+}
+
+sub features {
+	my $self = shift;
+	while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
+		$self->feature( $name, @$mods );
+	}
+	return $self->{values}->{features}
+		? @{ $self->{values}->{features} }
+		: ();
+}
+
+sub no_index {
+	my $self = shift;
+	my $type = shift;
+	push @{ $self->{values}->{no_index}->{$type} }, @_ if $type;
+	return $self->{values}->{no_index};
+}
+
+sub read {
+	my $self = shift;
+	$self->include_deps( 'YAML::Tiny', 0 );
+
+	require YAML::Tiny;
+	my $data = YAML::Tiny::LoadFile('META.yml');
+
+	# Call methods explicitly in case user has already set some values.
+	while ( my ( $key, $value ) = each %$data ) {
+		next unless $self->can($key);
+		if ( ref $value eq 'HASH' ) {
+			while ( my ( $module, $version ) = each %$value ) {
+				$self->can($key)->($self, $module => $version );
+			}
+		} else {
+			$self->can($key)->($self, $value);
+		}
+	}
+	return $self;
+}
+
+sub write {
+	my $self = shift;
+	return $self unless $self->is_admin;
+	$self->admin->write_meta;
+	return $self;
+}
+
+sub version_from {
+	require ExtUtils::MM_Unix;
+	my ( $self, $file ) = @_;
+	$self->version( ExtUtils::MM_Unix->parse_version($file) );
+
+	# for version integrity check
+	$self->makemaker_args( VERSION_FROM => $file );
+}
+
+sub abstract_from {
+	require ExtUtils::MM_Unix;
+	my ( $self, $file ) = @_;
+	$self->abstract(
+		bless(
+			{ DISTNAME => $self->name },
+			'ExtUtils::MM_Unix'
+		)->parse_abstract($file)
+	);
+}
+
+# Add both distribution and module name
+sub name_from {
+	my ($self, $file) = @_;
+	if (
+		Module::Install::_read($file) =~ m/
+		^ \s*
+		package \s*
+		([\w:]+)
+		\s* ;
+		/ixms
+	) {
+		my ($name, $module_name) = ($1, $1);
+		$name =~ s{::}{-}g;
+		$self->name($name);
+		unless ( $self->module_name ) {
+			$self->module_name($module_name);
+		}
+	} else {
+		die("Cannot determine name from $file\n");
+	}
+}
+
+sub _extract_perl_version {
+	if (
+		$_[0] =~ m/
+		^\s*
+		(?:use|require) \s*
+		v?
+		([\d_\.]+)
+		\s* ;
+		/ixms
+	) {
+		my $perl_version = $1;
+		$perl_version =~ s{_}{}g;
+		return $perl_version;
+	} else {
+		return;
+	}
+}
+
+sub perl_version_from {
+	my $self = shift;
+	my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
+	if ($perl_version) {
+		$self->perl_version($perl_version);
+	} else {
+		warn "Cannot determine perl version info from $_[0]\n";
+		return;
+	}
+}
+
+sub author_from {
+	my $self    = shift;
+	my $content = Module::Install::_read($_[0]);
+	if ($content =~ m/
+		=head \d \s+ (?:authors?)\b \s*
+		([^\n]*)
+		|
+		=head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s*
+		.*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s*
+		([^\n]*)
+	/ixms) {
+		my $author = $1 || $2;
+
+		# XXX: ugly but should work anyway...
+		if (eval "require Pod::Escapes; 1") {
+			# Pod::Escapes has a mapping table.
+			# It's in core of perl >= 5.9.3, and should be installed
+			# as one of the Pod::Simple's prereqs, which is a prereq
+			# of Pod::Text 3.x (see also below).
+			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
+			{
+				defined $2
+				? chr($2)
+				: defined $Pod::Escapes::Name2character_number{$1}
+				? chr($Pod::Escapes::Name2character_number{$1})
+				: do {
+					warn "Unknown escape: E<$1>";
+					"E<$1>";
+				};
+			}gex;
+		}
+		elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) {
+			# Pod::Text < 3.0 has yet another mapping table,
+			# though the table name of 2.x and 1.x are different.
+			# (1.x is in core of Perl < 5.6, 2.x is in core of
+			# Perl < 5.9.3)
+			my $mapping = ($Pod::Text::VERSION < 2)
+				? \%Pod::Text::HTML_Escapes
+				: \%Pod::Text::ESCAPES;
+			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
+			{
+				defined $2
+				? chr($2)
+				: defined $mapping->{$1}
+				? $mapping->{$1}
+				: do {
+					warn "Unknown escape: E<$1>";
+					"E<$1>";
+				};
+			}gex;
+		}
+		else {
+			$author =~ s{E<lt>}{<}g;
+			$author =~ s{E<gt>}{>}g;
+		}
+		$self->author($author);
+	} else {
+		warn "Cannot determine author info from $_[0]\n";
+	}
+}
+
+#Stolen from M::B
+my %license_urls = (
+    perl         => 'http://dev.perl.org/licenses/',
+    apache       => 'http://apache.org/licenses/LICENSE-2.0',
+    apache_1_1   => 'http://apache.org/licenses/LICENSE-1.1',
+    artistic     => 'http://opensource.org/licenses/artistic-license.php',
+    artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
+    lgpl         => 'http://opensource.org/licenses/lgpl-license.php',
+    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
+    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
+    bsd          => 'http://opensource.org/licenses/bsd-license.php',
+    gpl          => 'http://opensource.org/licenses/gpl-license.php',
+    gpl2         => 'http://opensource.org/licenses/gpl-2.0.php',
+    gpl3         => 'http://opensource.org/licenses/gpl-3.0.html',
+    mit          => 'http://opensource.org/licenses/mit-license.php',
+    mozilla      => 'http://opensource.org/licenses/mozilla1.1.php',
+    open_source  => undef,
+    unrestricted => undef,
+    restrictive  => undef,
+    unknown      => undef,
+);
+
+sub license {
+	my $self = shift;
+	return $self->{values}->{license} unless @_;
+	my $license = shift or die(
+		'Did not provide a value to license()'
+	);
+	$license = __extract_license($license) || lc $license;
+	$self->{values}->{license} = $license;
+
+	# Automatically fill in license URLs
+	if ( $license_urls{$license} ) {
+		$self->resources( license => $license_urls{$license} );
+	}
+
+	return 1;
+}
+
+sub _extract_license {
+	my $pod = shift;
+	my $matched;
+	return __extract_license(
+		($matched) = $pod =~ m/
+			(=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?)
+			(=head \d.*|=cut.*|)\z
+		/xms
+	) || __extract_license(
+		($matched) = $pod =~ m/
+			(=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?)
+			(=head \d.*|=cut.*|)\z
+		/xms
+	);
+}
+
+sub __extract_license {
+	my $license_text = shift or return;
+	my @phrases      = (
+		'(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1,
+		'(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
+		'Artistic and GPL'                   => 'perl',         1,
+		'GNU general public license'         => 'gpl',          1,
+		'GNU public license'                 => 'gpl',          1,
+		'GNU lesser general public license'  => 'lgpl',         1,
+		'GNU lesser public license'          => 'lgpl',         1,
+		'GNU library general public license' => 'lgpl',         1,
+		'GNU library public license'         => 'lgpl',         1,
+		'GNU Free Documentation license'     => 'unrestricted', 1,
+		'GNU Affero General Public License'  => 'open_source',  1,
+		'(?:Free)?BSD license'               => 'bsd',          1,
+		'Artistic license 2\.0'              => 'artistic_2',   1,
+		'Artistic license'                   => 'artistic',     1,
+		'Apache (?:Software )?license'       => 'apache',       1,
+		'GPL'                                => 'gpl',          1,
+		'LGPL'                               => 'lgpl',         1,
+		'BSD'                                => 'bsd',          1,
+		'Artistic'                           => 'artistic',     1,
+		'MIT'                                => 'mit',          1,
+		'Mozilla Public License'             => 'mozilla',      1,
+		'Q Public License'                   => 'open_source',  1,
+		'OpenSSL License'                    => 'unrestricted', 1,
+		'SSLeay License'                     => 'unrestricted', 1,
+		'zlib License'                       => 'open_source',  1,
+		'proprietary'                        => 'proprietary',  0,
+	);
+	while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
+		$pattern =~ s#\s+#\\s+#gs;
+		if ( $license_text =~ /\b$pattern\b/i ) {
+			return $license;
+		}
+	}
+	return '';
+}
+
+sub license_from {
+	my $self = shift;
+	if (my $license=_extract_license(Module::Install::_read($_[0]))) {
+		$self->license($license);
+	} else {
+		warn "Cannot determine license info from $_[0]\n";
+		return 'unknown';
+	}
+}
+
+sub _extract_bugtracker {
+	my @links   = $_[0] =~ m#L<(
+	 https?\Q://rt.cpan.org/\E[^>]+|
+	 https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
+	 https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
+	 )>#gx;
+	my %links;
+	@links{@links}=();
+	@links=keys %links;
+	return @links;
+}
+
+sub bugtracker_from {
+	my $self    = shift;
+	my $content = Module::Install::_read($_[0]);
+	my @links   = _extract_bugtracker($content);
+	unless ( @links ) {
+		warn "Cannot determine bugtracker info from $_[0]\n";
+		return 0;
+	}
+	if ( @links > 1 ) {
+		warn "Found more than one bugtracker link in $_[0]\n";
+		return 0;
+	}
+
+	# Set the bugtracker
+	bugtracker( $links[0] );
+	return 1;
+}
+
+sub requires_from {
+	my $self     = shift;
+	my $content  = Module::Install::_readperl($_[0]);
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	while ( @requires ) {
+		my $module  = shift @requires;
+		my $version = shift @requires;
+		$self->requires( $module => $version );
+	}
+}
+
+sub test_requires_from {
+	my $self     = shift;
+	my $content  = Module::Install::_readperl($_[0]);
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	while ( @requires ) {
+		my $module  = shift @requires;
+		my $version = shift @requires;
+		$self->test_requires( $module => $version );
+	}
+}
+
+# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
+# numbers (eg, 5.006001 or 5.008009).
+# Also, convert double-part versions (eg, 5.8)
+sub _perl_version {
+	my $v = $_[-1];
+	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
+	$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
+	$v =~ s/(\.\d\d\d)000$/$1/;
+	$v =~ s/_.+$//;
+	if ( ref($v) ) {
+		# Numify
+		$v = $v + 0;
+	}
+	return $v;
+}
+
+sub add_metadata {
+    my $self = shift;
+    my %hash = @_;
+    for my $key (keys %hash) {
+        warn "add_metadata: $key is not prefixed with 'x_'.\n" .
+             "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/;
+        $self->{values}->{$key} = $hash{$key};
+    }
+}
+
+
+######################################################################
+# MYMETA Support
+
+sub WriteMyMeta {
+	die "WriteMyMeta has been deprecated";
+}
+
+sub write_mymeta_yaml {
+	my $self = shift;
+
+	# We need YAML::Tiny to write the MYMETA.yml file
+	unless ( eval { require YAML::Tiny; 1; } ) {
+		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.yml\n";
+	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+	my $self = shift;
+
+	# We need JSON to write the MYMETA.json file
+	unless ( eval { require JSON; 1; } ) {
+		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.json\n";
+	Module::Install::_write(
+		'MYMETA.json',
+		JSON->new->pretty(1)->canonical->encode($meta),
+	);
+}
+
+sub _write_mymeta_data {
+	my $self = shift;
+
+	# If there's no existing META.yml there is nothing we can do
+	return undef unless -f 'META.yml';
+
+	# We need Parse::CPAN::Meta to load the file
+	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+		return undef;
+	}
+
+	# Merge the perl version into the dependencies
+	my $val  = $self->Meta->{values};
+	my $perl = delete $val->{perl_version};
+	if ( $perl ) {
+		$val->{requires} ||= [];
+		my $requires = $val->{requires};
+
+		# Canonize to three-dot version after Perl 5.6
+		if ( $perl >= 5.006 ) {
+			$perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e
+		}
+		unshift @$requires, [ perl => $perl ];
+	}
+
+	# Load the advisory META.yml file
+	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
+	my $meta = $yaml[0];
+
+	# Overwrite the non-configure dependency hashs
+	delete $meta->{requires};
+	delete $meta->{build_requires};
+	delete $meta->{recommends};
+	if ( exists $val->{requires} ) {
+		$meta->{requires} = { map { @$_ } @{ $val->{requires} } };
+	}
+	if ( exists $val->{build_requires} ) {
+		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
+	}
+
+	return $meta;
+}
+
+1;
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/TestBase.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/TestBase.pm
new file mode 100644
index 0000000..e222ac1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/TestBase.pm
@@ -0,0 +1,29 @@
+#line 1
+package Module::Install::TestBase;
+use strict;
+use warnings;
+
+use Module::Install::Base;
+
+use vars qw($VERSION @ISA);
+BEGIN {
+    $VERSION = '0.60';
+    @ISA     = 'Module::Install::Base';
+}
+
+sub use_test_base {
+    my $self = shift;
+    $self->include('Test::Base');
+    $self->include('Test::Base::Filter');
+    $self->include('Spiffy');
+    $self->include('Test::More');
+    $self->include('Test::Builder');
+    $self->include('Test::Builder::Module');
+    $self->requires('Filter::Util::Call');
+}
+
+1;
+
+=encoding utf8
+
+#line 70
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Win32.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Win32.pm
new file mode 100644
index 0000000..3139a63
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/Win32.pm
@@ -0,0 +1,64 @@
+#line 1
+package Module::Install::Win32;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.01';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+# determine if the user needs nmake, and download it if needed
+sub check_nmake {
+	my $self = shift;
+	$self->load('can_run');
+	$self->load('get_file');
+
+	require Config;
+	return unless (
+		$^O eq 'MSWin32'                     and
+		$Config::Config{make}                and
+		$Config::Config{make} =~ /^nmake\b/i and
+		! $self->can_run('nmake')
+	);
+
+	print "The required 'nmake' executable not found, fetching it...\n";
+
+	require File::Basename;
+	my $rv = $self->get_file(
+		url       => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
+		ftp_url   => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
+		local_dir => File::Basename::dirname($^X),
+		size      => 51928,
+		run       => 'Nmake15.exe /o > nul',
+		check_for => 'Nmake.exe',
+		remove    => 1,
+	);
+
+	die <<'END_MESSAGE' unless $rv;
+
+-------------------------------------------------------------------------------
+
+Since you are using Microsoft Windows, you will need the 'nmake' utility
+before installation. It's available at:
+
+  http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe
+      or
+  ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe
+
+Please download the file manually, save it to a directory in %PATH% (e.g.
+C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to
+that directory, and run "Nmake15.exe" from there; that will create the
+'nmake.exe' file needed by this module.
+
+You may then resume the installation process described in README.
+
+-------------------------------------------------------------------------------
+END_MESSAGE
+
+}
+
+1;
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/WriteAll.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/WriteAll.pm
new file mode 100644
index 0000000..1f724a7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Module/Install/WriteAll.pm
@@ -0,0 +1,63 @@
+#line 1
+package Module::Install::WriteAll;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.01';
+	@ISA     = qw{Module::Install::Base};
+	$ISCORE  = 1;
+}
+
+sub WriteAll {
+	my $self = shift;
+	my %args = (
+		meta        => 1,
+		sign        => 0,
+		inline      => 0,
+		check_nmake => 1,
+		@_,
+	);
+
+	$self->sign(1)                if $args{sign};
+	$self->admin->WriteAll(%args) if $self->is_admin;
+
+	$self->check_nmake if $args{check_nmake};
+	unless ( $self->makemaker_args->{PL_FILES} ) {
+		# XXX: This still may be a bit over-defensive...
+		unless ($self->makemaker(6.25)) {
+			$self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL';
+		}
+	}
+
+	# Until ExtUtils::MakeMaker support MYMETA.yml, make sure
+	# we clean it up properly ourself.
+	$self->realclean_files('MYMETA.yml');
+
+	if ( $args{inline} ) {
+		$self->Inline->write;
+	} else {
+		$self->Makefile->write;
+	}
+
+	# The Makefile write process adds a couple of dependencies,
+	# so write the META.yml files after the Makefile.
+	if ( $args{meta} ) {
+		$self->Meta->write;
+	}
+
+	# Experimental support for MYMETA
+	if ( $ENV{X_MYMETA} ) {
+		if ( $ENV{X_MYMETA} eq 'JSON' ) {
+			$self->Meta->write_mymeta_json;
+		} else {
+			$self->Meta->write_mymeta_yaml;
+		}
+	}
+
+	return 1;
+}
+
+1;
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Spiffy.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Spiffy.pm
new file mode 100644
index 0000000..7b10f7a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Spiffy.pm
@@ -0,0 +1,539 @@
+#line 1
+package Spiffy;
+use strict;
+use 5.006001;
+use warnings;
+use Carp;
+require Exporter;
+our $VERSION = '0.30';
+our @EXPORT = ();
+our @EXPORT_BASE = qw(field const stub super);
+our @EXPORT_OK = (@EXPORT_BASE, qw(id WWW XXX YYY ZZZ));
+our %EXPORT_TAGS = (XXX => [qw(WWW XXX YYY ZZZ)]);
+
+my $stack_frame = 0; 
+my $dump = 'yaml';
+my $bases_map = {};
+
+sub WWW; sub XXX; sub YYY; sub ZZZ;
+
+# This line is here to convince "autouse" into believing we are autousable.
+sub can {
+    ($_[1] eq 'import' and caller()->isa('autouse'))
+        ? \&Exporter::import        # pacify autouse's equality test
+        : $_[0]->SUPER::can($_[1])  # normal case
+}
+
+# TODO
+#
+# Exported functions like field and super should be hidden so as not to
+# be confused with methods that can be inherited.
+#
+
+sub new {
+    my $class = shift;
+    $class = ref($class) || $class;
+    my $self = bless {}, $class;
+    while (@_) {
+        my $method = shift;
+        $self->$method(shift);
+    }
+    return $self;    
+}
+
+my $filtered_files = {};
+my $filter_dump = 0;
+my $filter_save = 0;
+our $filter_result = '';
+sub import {
+    no strict 'refs'; 
+    no warnings;
+    my $self_package = shift;
+
+    # XXX Using parse_arguments here might cause confusion, because the
+    # subclass's boolean_arguments and paired_arguments can conflict, causing
+    # difficult debugging. Consider using something truly local.
+    my ($args, @export_list) = do {
+        local *boolean_arguments = sub { 
+            qw(
+                -base -Base -mixin -selfless 
+                -XXX -dumper -yaml 
+                -filter_dump -filter_save
+            ) 
+        };
+        local *paired_arguments = sub { qw(-package) };
+        $self_package->parse_arguments(@_);
+    };
+    return spiffy_mixin_import(scalar(caller(0)), $self_package, @export_list)
+      if $args->{-mixin};
+
+    $filter_dump = 1 if $args->{-filter_dump};
+    $filter_save = 1 if $args->{-filter_save};
+    $dump = 'yaml' if $args->{-yaml};
+    $dump = 'dumper' if $args->{-dumper};
+
+    local @EXPORT_BASE = @EXPORT_BASE;
+
+    if ($args->{-XXX}) {
+        push @EXPORT_BASE, @{$EXPORT_TAGS{XXX}}
+          unless grep /^XXX$/, @EXPORT_BASE;
+    }
+
+    spiffy_filter() 
+      if ($args->{-selfless} or $args->{-Base}) and 
+         not $filtered_files->{(caller($stack_frame))[1]}++;
+
+    my $caller_package = $args->{-package} || caller($stack_frame);
+    push @{"$caller_package\::ISA"}, $self_package
+      if $args->{-Base} or $args->{-base};
+
+    for my $class (@{all_my_bases($self_package)}) {
+        next unless $class->isa('Spiffy');
+        my @export = grep {
+            not defined &{"$caller_package\::$_"};
+        } ( @{"$class\::EXPORT"}, 
+            ($args->{-Base} or $args->{-base})
+              ? @{"$class\::EXPORT_BASE"} : (),
+          );
+        my @export_ok = grep {
+            not defined &{"$caller_package\::$_"};
+        } @{"$class\::EXPORT_OK"};
+
+        # Avoid calling the expensive Exporter::export 
+        # if there is nothing to do (optimization)
+        my %exportable = map { ($_, 1) } @export, @export_ok;
+        next unless keys %exportable;
+
+        my @export_save = @{"$class\::EXPORT"};
+        my @export_ok_save = @{"$class\::EXPORT_OK"};
+        @{"$class\::EXPORT"} = @export;
+        @{"$class\::EXPORT_OK"} = @export_ok;
+        my @list = grep {
+            (my $v = $_) =~ s/^[\!\:]//;
+            $exportable{$v} or ${"$class\::EXPORT_TAGS"}{$v};
+        } @export_list;
+        Exporter::export($class, $caller_package, @list);
+        @{"$class\::EXPORT"} = @export_save;
+        @{"$class\::EXPORT_OK"} = @export_ok_save;
+    }
+}
+
+sub spiffy_filter {
+    require Filter::Util::Call;
+    my $done = 0;
+    Filter::Util::Call::filter_add(
+        sub {
+            return 0 if $done;
+            my ($data, $end) = ('', '');
+            while (my $status = Filter::Util::Call::filter_read()) {
+                return $status if $status < 0;
+                if (/^__(?:END|DATA)__\r?$/) {
+                    $end = $_;
+                    last;
+                }
+                $data .= $_;
+                $_ = '';
+            }
+            $_ = $data;
+            my @my_subs;
+            s[^(sub\s+\w+\s+\{)(.*\n)]
+             [${1}my \$self = shift;$2]gm;
+            s[^(sub\s+\w+)\s*\(\s*\)(\s+\{.*\n)]
+             [${1}${2}]gm;
+            s[^my\s+sub\s+(\w+)(\s+\{)(.*)((?s:.*?\n))\}\n]
+             [push @my_subs, $1; "\$$1 = sub$2my \$self = shift;$3$4\};\n"]gem;
+            my $preclare = '';
+            if (@my_subs) {
+                $preclare = join ',', map "\$$_", @my_subs;
+                $preclare = "my($preclare);";
+            }
+            $_ = "use strict;use warnings;$preclare${_};1;\n$end";
+            if ($filter_dump) { print; exit }
+            if ($filter_save) { $filter_result = $_; $_ = $filter_result; }
+            $done = 1;
+        }
+    );
+}
+
+sub base {
+    push @_, -base;
+    goto &import;
+}
+
+sub all_my_bases {
+    my $class = shift;
+
+    return $bases_map->{$class} 
+      if defined $bases_map->{$class};
+
+    my @bases = ($class);
+    no strict 'refs';
+    for my $base_class (@{"${class}::ISA"}) {
+        push @bases, @{all_my_bases($base_class)};
+    }
+    my $used = {};
+    $bases_map->{$class} = [grep {not $used->{$_}++} @bases];
+}
+
+my %code = ( 
+    sub_start => 
+      "sub {\n",
+    set_default => 
+      "  \$_[0]->{%s} = %s\n    unless exists \$_[0]->{%s};\n",
+    init =>
+      "  return \$_[0]->{%s} = do { my \$self = \$_[0]; %s }\n" .
+      "    unless \$#_ > 0 or defined \$_[0]->{%s};\n",
+    weak_init =>
+      "  return do {\n" .
+      "    \$_[0]->{%s} = do { my \$self = \$_[0]; %s };\n" .
+      "    Scalar::Util::weaken(\$_[0]->{%s}) if ref \$_[0]->{%s};\n" .
+      "    \$_[0]->{%s};\n" .
+      "  } unless \$#_ > 0 or defined \$_[0]->{%s};\n",
+    return_if_get => 
+      "  return \$_[0]->{%s} unless \$#_ > 0;\n",
+    set => 
+      "  \$_[0]->{%s} = \$_[1];\n",
+    weaken => 
+      "  Scalar::Util::weaken(\$_[0]->{%s}) if ref \$_[0]->{%s};\n",
+    sub_end => 
+      "  return \$_[0]->{%s};\n}\n",
+);
+
+sub field {
+    my $package = caller;
+    my ($args, @values) = do {
+        no warnings;
+        local *boolean_arguments = sub { (qw(-weak)) };
+        local *paired_arguments = sub { (qw(-package -init)) };
+        Spiffy->parse_arguments(@_);
+    };
+    my ($field, $default) = @values;
+    $package = $args->{-package} if defined $args->{-package};
+    die "Cannot have a default for a weakened field ($field)"
+        if defined $default && $args->{-weak};
+    return if defined &{"${package}::$field"};
+    require Scalar::Util if $args->{-weak};
+    my $default_string =
+        ( ref($default) eq 'ARRAY' and not @$default )
+        ? '[]'
+        : (ref($default) eq 'HASH' and not keys %$default )
+          ? '{}'
+          : default_as_code($default);
+
+    my $code = $code{sub_start};
+    if ($args->{-init}) {
+        my $fragment = $args->{-weak} ? $code{weak_init} : $code{init};
+        $code .= sprintf $fragment, $field, $args->{-init}, ($field) x 4;
+    }
+    $code .= sprintf $code{set_default}, $field, $default_string, $field
+      if defined $default;
+    $code .= sprintf $code{return_if_get}, $field;
+    $code .= sprintf $code{set}, $field;
+    $code .= sprintf $code{weaken}, $field, $field 
+      if $args->{-weak};
+    $code .= sprintf $code{sub_end}, $field;
+
+    my $sub = eval $code;
+    die $@ if $@;
+    no strict 'refs';
+    *{"${package}::$field"} = $sub;
+    return $code if defined wantarray;
+}
+
+sub default_as_code {
+    require Data::Dumper;
+    local $Data::Dumper::Sortkeys = 1;
+    my $code = Data::Dumper::Dumper(shift);
+    $code =~ s/^\$VAR1 = //;
+    $code =~ s/;$//;
+    return $code;
+}
+
+sub const {
+    my $package = caller;
+    my ($args, @values) = do {
+        no warnings;
+        local *paired_arguments = sub { (qw(-package)) };
+        Spiffy->parse_arguments(@_);
+    };
+    my ($field, $default) = @values;
+    $package = $args->{-package} if defined $args->{-package};
+    no strict 'refs';
+    return if defined &{"${package}::$field"};
+    *{"${package}::$field"} = sub { $default }
+}
+
+sub stub {
+    my $package = caller;
+    my ($args, @values) = do {
+        no warnings;
+        local *paired_arguments = sub { (qw(-package)) };
+        Spiffy->parse_arguments(@_);
+    };
+    my ($field, $default) = @values;
+    $package = $args->{-package} if defined $args->{-package};
+    no strict 'refs';
+    return if defined &{"${package}::$field"};
+    *{"${package}::$field"} = 
+    sub { 
+        require Carp;
+        Carp::confess 
+          "Method $field in package $package must be subclassed";
+    }
+}
+
+sub parse_arguments {
+    my $class = shift;
+    my ($args, @values) = ({}, ());
+    my %booleans = map { ($_, 1) } $class->boolean_arguments;
+    my %pairs = map { ($_, 1) } $class->paired_arguments;
+    while (@_) {
+        my $elem = shift;
+        if (defined $elem and defined $booleans{$elem}) {
+            $args->{$elem} = (@_ and $_[0] =~ /^[01]$/)
+            ? shift
+            : 1;
+        }
+        elsif (defined $elem and defined $pairs{$elem} and @_) {
+            $args->{$elem} = shift;
+        }
+        else {
+            push @values, $elem;
+        }
+    }
+    return wantarray ? ($args, @values) : $args;        
+}
+
+sub boolean_arguments { () }
+sub paired_arguments { () }
+
+# get a unique id for any node
+sub id {
+    if (not ref $_[0]) {
+        return 'undef' if not defined $_[0];
+        \$_[0] =~ /\((\w+)\)$/o or die;
+        return "$1-S";
+    }
+    require overload;
+    overload::StrVal($_[0]) =~ /\((\w+)\)$/o or die;
+    return $1;
+}
+
+#===============================================================================
+# It's super, man.
+#===============================================================================
+package DB;
+{
+    no warnings 'redefine';
+    sub super_args { 
+        my @dummy = caller(@_ ? $_[0] : 2); 
+        return @DB::args;
+    }
+}
+
+package Spiffy;
+sub super {
+    my $method;
+    my $frame = 1;
+    while ($method = (caller($frame++))[3]) {
+        $method =~ s/.*::// and last;
+    }
+    my @args = DB::super_args($frame);
+    @_ = @_ ? ($args[0], @_) : @args;
+    my $class = ref $_[0] ? ref $_[0] : $_[0];
+    my $caller_class = caller;
+    my $seen = 0;
+    my @super_classes = reverse grep {
+        ($seen or $seen = ($_ eq $caller_class)) ? 0 : 1;
+    } reverse @{all_my_bases($class)};
+    for my $super_class (@super_classes) {
+        no strict 'refs';
+        next if $super_class eq $class;
+        if (defined &{"${super_class}::$method"}) {
+            ${"$super_class\::AUTOLOAD"} = ${"$class\::AUTOLOAD"}
+              if $method eq 'AUTOLOAD';
+            return &{"${super_class}::$method"};
+        }
+    }
+    return;
+}
+
+#===============================================================================
+# This code deserves a spanking, because it is being very naughty.
+# It is exchanging base.pm's import() for its own, so that people
+# can use base.pm with Spiffy modules, without being the wiser.
+#===============================================================================
+my $real_base_import;
+my $real_mixin_import;
+
+BEGIN {
+    require base unless defined $INC{'base.pm'};
+    $INC{'mixin.pm'} ||= 'Spiffy/mixin.pm';
+    $real_base_import = \&base::import;
+    $real_mixin_import = \&mixin::import;
+    no warnings;
+    *base::import = \&spiffy_base_import;
+    *mixin::import = \&spiffy_mixin_import;
+}
+
+# my $i = 0;
+# while (my $caller = caller($i++)) {
+#     next unless $caller eq 'base' or $caller eq 'mixin';
+#     croak <<END;
+# Spiffy.pm must be loaded before calling 'use base' or 'use mixin' with a
+# Spiffy module. See the documentation of Spiffy.pm for details.
+# END
+# }
+
+sub spiffy_base_import {
+    my @base_classes = @_;
+    shift @base_classes;
+    no strict 'refs';
+    goto &$real_base_import
+      unless grep {
+          eval "require $_" unless %{"$_\::"};
+          $_->isa('Spiffy');
+      } @base_classes;
+    my $inheritor = caller(0);
+    for my $base_class (@base_classes) {
+        next if $inheritor->isa($base_class);
+        croak "Can't mix Spiffy and non-Spiffy classes in 'use base'.\n", 
+              "See the documentation of Spiffy.pm for details\n  "
+          unless $base_class->isa('Spiffy');
+        $stack_frame = 1; # tell import to use different caller
+        import($base_class, '-base');
+        $stack_frame = 0;
+    }
+}
+
+sub mixin {
+    my $self = shift;
+    my $target_class = ref($self);
+    spiffy_mixin_import($target_class, @_)
+}
+
+sub spiffy_mixin_import {
+    my $target_class = shift;
+    $target_class = caller(0)
+      if $target_class eq 'mixin';
+    my $mixin_class = shift
+      or die "Nothing to mixin";
+    eval "require $mixin_class";
+    my @roles = @_;
+    my $pseudo_class = join '-', $target_class, $mixin_class, @roles;
+    my %methods = spiffy_mixin_methods($mixin_class, @roles);
+    no strict 'refs';
+    no warnings;
+    @{"$pseudo_class\::ISA"} = @{"$target_class\::ISA"};
+    @{"$target_class\::ISA"} = ($pseudo_class);
+    for (keys %methods) {
+        *{"$pseudo_class\::$_"} = $methods{$_};
+    }
+}
+
+sub spiffy_mixin_methods {
+    my $mixin_class = shift;
+    no strict 'refs';
+    my %methods = spiffy_all_methods($mixin_class);
+    map {
+        $methods{$_}
+          ? ($_, \ &{"$methods{$_}\::$_"})
+          : ($_, \ &{"$mixin_class\::$_"})
+    } @_ 
+      ? (get_roles($mixin_class, @_))
+      : (keys %methods);
+}
+
+sub get_roles {
+    my $mixin_class = shift;
+    my @roles = @_;
+    while (grep /^!*:/, @roles) {
+        @roles = map {
+            s/!!//g;
+            /^!:(.*)/ ? do { 
+                my $m = "_role_$1"; 
+                map("!$_", $mixin_class->$m);
+            } :
+            /^:(.*)/ ? do {
+                my $m = "_role_$1"; 
+                ($mixin_class->$m);
+            } :
+            ($_)
+        } @roles;
+    }
+    if (@roles and $roles[0] =~ /^!/) {
+        my %methods = spiffy_all_methods($mixin_class);
+        unshift @roles, keys(%methods);
+    }
+    my %roles;
+    for (@roles) {
+        s/!!//g;
+        delete $roles{$1}, next
+          if /^!(.*)/;
+        $roles{$_} = 1;
+    }
+    keys %roles;
+}
+
+sub spiffy_all_methods {
+    no strict 'refs';
+    my $class = shift;
+    return if $class eq 'Spiffy';
+    my %methods = map {
+        ($_, $class)
+    } grep {
+        defined &{"$class\::$_"} and not /^_/
+    } keys %{"$class\::"};
+    my %super_methods;
+    %super_methods = spiffy_all_methods(${"$class\::ISA"}[0])
+      if @{"$class\::ISA"};
+    %{{%super_methods, %methods}};
+}
+
+
+# END of naughty code.
+#===============================================================================
+# Debugging support
+#===============================================================================
+sub spiffy_dump {
+    no warnings;
+    if ($dump eq 'dumper') {
+        require Data::Dumper;
+        $Data::Dumper::Sortkeys = 1;
+        $Data::Dumper::Indent = 1;
+        return Data::Dumper::Dumper(@_);
+    }
+    require YAML;
+    $YAML::UseVersion = 0;
+    return YAML::Dump(@_) . "...\n";
+}
+
+sub at_line_number {
+    my ($file_path, $line_number) = (caller(1))[1,2];
+    "  at $file_path line $line_number\n";
+}
+
+sub WWW {
+    warn spiffy_dump(@_) . at_line_number;
+    return wantarray ? @_ : $_[0];
+}
+
+sub XXX {
+    die spiffy_dump(@_) . at_line_number;
+}
+
+sub YYY {
+    print spiffy_dump(@_) . at_line_number;
+    return wantarray ? @_ : $_[0];
+}
+
+sub ZZZ {
+    require Carp;
+    Carp::confess spiffy_dump(@_);
+}
+
+1;
+
+__END__
+
+#line 1066
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Base.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Base.pm
new file mode 100644
index 0000000..8609584
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Base.pm
@@ -0,0 +1,682 @@
+#line 1
+package Test::Base;
+use 5.006001;
+use Spiffy 0.30 -Base;
+use Spiffy ':XXX';
+our $VERSION = '0.60';
+
+my @test_more_exports;
+BEGIN {
+    @test_more_exports = qw(
+        ok isnt like unlike is_deeply cmp_ok
+        skip todo_skip pass fail
+        eq_array eq_hash eq_set
+        plan can_ok isa_ok diag
+        use_ok
+        $TODO
+    );
+}
+
+use Test::More import => \@test_more_exports;
+use Carp;
+
+our @EXPORT = (@test_more_exports, qw(
+    is no_diff
+
+    blocks next_block first_block
+    delimiters spec_file spec_string 
+    filters filters_delay filter_arguments
+    run run_compare run_is run_is_deeply run_like run_unlike 
+    skip_all_unless_require is_deep run_is_deep
+    WWW XXX YYY ZZZ
+    tie_output no_diag_on_only
+
+    find_my_self default_object
+
+    croak carp cluck confess
+));
+
+field '_spec_file';
+field '_spec_string';
+field _filters => [qw(norm trim)];
+field _filters_map => {};
+field spec =>
+      -init => '$self->_spec_init';
+field block_list =>
+      -init => '$self->_block_list_init';
+field _next_list => [];
+field block_delim =>
+      -init => '$self->block_delim_default';
+field data_delim =>
+      -init => '$self->data_delim_default';
+field _filters_delay => 0;
+field _no_diag_on_only => 0;
+
+field block_delim_default => '===';
+field data_delim_default => '---';
+
+my $default_class;
+my $default_object;
+my $reserved_section_names = {};
+
+sub default_object { 
+    $default_object ||= $default_class->new;
+    return $default_object;
+}
+
+my $import_called = 0;
+sub import() {
+    $import_called = 1;
+    my $class = (grep /^-base$/i, @_) 
+    ? scalar(caller)
+    : $_[0];
+    if (not defined $default_class) {
+        $default_class = $class;
+    }
+#     else {
+#         croak "Can't use $class after using $default_class"
+#           unless $default_class->isa($class);
+#     }
+
+    unless (grep /^-base$/i, @_) {
+        my @args;
+        for (my $ii = 1; $ii <= $#_; ++$ii) {
+            if ($_[$ii] eq '-package') {
+                ++$ii;
+            } else {
+                push @args, $_[$ii];
+            }
+        }
+        Test::More->import(import => \@test_more_exports, @args)
+            if @args;
+     }
+    
+    _strict_warnings();
+    goto &Spiffy::import;
+}
+
+# Wrap Test::Builder::plan
+my $plan_code = \&Test::Builder::plan;
+my $Have_Plan = 0;
+{
+    no warnings 'redefine';
+    *Test::Builder::plan = sub {
+        $Have_Plan = 1;
+        goto &$plan_code;
+    };
+}
+
+my $DIED = 0;
+$SIG{__DIE__} = sub { $DIED = 1; die @_ };
+
+sub block_class  { $self->find_class('Block') }
+sub filter_class { $self->find_class('Filter') }
+
+sub find_class {
+    my $suffix = shift;
+    my $class = ref($self) . "::$suffix";
+    return $class if $class->can('new');
+    $class = __PACKAGE__ . "::$suffix";
+    return $class if $class->can('new');
+    eval "require $class";
+    return $class if $class->can('new');
+    die "Can't find a class for $suffix";
+}
+
+sub check_late {
+    if ($self->{block_list}) {
+        my $caller = (caller(1))[3];
+        $caller =~ s/.*:://;
+        croak "Too late to call $caller()"
+    }
+}
+
+sub find_my_self() {
+    my $self = ref($_[0]) eq $default_class
+    ? splice(@_, 0, 1)
+    : default_object();
+    return $self, @_;
+}
+
+sub blocks() {
+    (my ($self), @_) = find_my_self(@_);
+
+    croak "Invalid arguments passed to 'blocks'"
+      if @_ > 1;
+    croak sprintf("'%s' is invalid argument to blocks()", shift(@_))
+      if @_ && $_[0] !~ /^[a-zA-Z]\w*$/;
+
+    my $blocks = $self->block_list;
+    
+    my $section_name = shift || '';
+    my @blocks = $section_name
+    ? (grep { exists $_->{$section_name} } @$blocks)
+    : (@$blocks);
+
+    return scalar(@blocks) unless wantarray;
+    
+    return (@blocks) if $self->_filters_delay;
+
+    for my $block (@blocks) {
+        $block->run_filters
+          unless $block->is_filtered;
+    }
+
+    return (@blocks);
+}
+
+sub next_block() {
+    (my ($self), @_) = find_my_self(@_);
+    my $list = $self->_next_list;
+    if (@$list == 0) {
+        $list = [@{$self->block_list}, undef];
+        $self->_next_list($list);
+    }
+    my $block = shift @$list;
+    if (defined $block and not $block->is_filtered) {
+        $block->run_filters;
+    }
+    return $block;
+}
+
+sub first_block() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->_next_list([]);
+    $self->next_block;
+}
+
+sub filters_delay() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->_filters_delay(defined $_[0] ? shift : 1);
+}
+
+sub no_diag_on_only() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->_no_diag_on_only(defined $_[0] ? shift : 1);
+}
+
+sub delimiters() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->check_late;
+    my ($block_delimiter, $data_delimiter) = @_;
+    $block_delimiter ||= $self->block_delim_default;
+    $data_delimiter ||= $self->data_delim_default;
+    $self->block_delim($block_delimiter);
+    $self->data_delim($data_delimiter);
+    return $self;
+}
+
+sub spec_file() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->check_late;
+    $self->_spec_file(shift);
+    return $self;
+}
+
+sub spec_string() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->check_late;
+    $self->_spec_string(shift);
+    return $self;
+}
+
+sub filters() {
+    (my ($self), @_) = find_my_self(@_);
+    if (ref($_[0]) eq 'HASH') {
+        $self->_filters_map(shift);
+    }
+    else {    
+        my $filters = $self->_filters;
+        push @$filters, @_;
+    }
+    return $self;
+}
+
+sub filter_arguments() {
+    $Test::Base::Filter::arguments;
+}
+
+sub have_text_diff {
+    eval { require Text::Diff; 1 } &&
+        $Text::Diff::VERSION >= 0.35 &&
+        $Algorithm::Diff::VERSION >= 1.15;
+}
+
+sub is($$;$) {
+    (my ($self), @_) = find_my_self(@_);
+    my ($actual, $expected, $name) = @_;
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    if ($ENV{TEST_SHOW_NO_DIFFS} or
+         not defined $actual or
+         not defined $expected or
+         $actual eq $expected or 
+         not($self->have_text_diff) or 
+         $expected !~ /\n./s
+    ) {
+        Test::More::is($actual, $expected, $name);
+    }
+    else {
+        $name = '' unless defined $name;
+        ok $actual eq $expected,
+           $name . "\n" . Text::Diff::diff(\$expected, \$actual);
+    }
+}
+
+sub run(&;$) {
+    (my ($self), @_) = find_my_self(@_);
+    my $callback = shift;
+    for my $block (@{$self->block_list}) {
+        $block->run_filters unless $block->is_filtered;
+        &{$callback}($block);
+    }
+}
+
+my $name_error = "Can't determine section names";
+sub _section_names {
+    return @_ if @_ == 2;
+    my $block = $self->first_block
+      or croak $name_error;
+    my @names = grep {
+        $_ !~ /^(ONLY|LAST|SKIP)$/;
+    } @{$block->{_section_order}[0] || []};
+    croak "$name_error. Need two sections in first block"
+      unless @names == 2;
+    return @names;
+}
+
+sub _assert_plan {
+    plan('no_plan') unless $Have_Plan;
+}
+
+sub END {
+    run_compare() unless $Have_Plan or $DIED or not $import_called;
+}
+
+sub run_compare() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->_assert_plan;
+    my ($x, $y) = $self->_section_names(@_);
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    for my $block (@{$self->block_list}) {
+        next unless exists($block->{$x}) and exists($block->{$y});
+        $block->run_filters unless $block->is_filtered;
+        if (ref $block->$x) {
+            is_deeply($block->$x, $block->$y,
+                $block->name ? $block->name : ());
+        }
+        elsif (ref $block->$y eq 'Regexp') {
+            my $regexp = ref $y ? $y : $block->$y;
+            like($block->$x, $regexp, $block->name ? $block->name : ());
+        }
+        else {
+            is($block->$x, $block->$y, $block->name ? $block->name : ());
+        }
+    }
+}
+
+sub run_is() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->_assert_plan;
+    my ($x, $y) = $self->_section_names(@_);
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    for my $block (@{$self->block_list}) {
+        next unless exists($block->{$x}) and exists($block->{$y});
+        $block->run_filters unless $block->is_filtered;
+        is($block->$x, $block->$y, 
+           $block->name ? $block->name : ()
+          );
+    }
+}
+
+sub run_is_deeply() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->_assert_plan;
+    my ($x, $y) = $self->_section_names(@_);
+    for my $block (@{$self->block_list}) {
+        next unless exists($block->{$x}) and exists($block->{$y});
+        $block->run_filters unless $block->is_filtered;
+        is_deeply($block->$x, $block->$y, 
+           $block->name ? $block->name : ()
+          );
+    }
+}
+
+sub run_like() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->_assert_plan;
+    my ($x, $y) = $self->_section_names(@_);
+    for my $block (@{$self->block_list}) {
+        next unless exists($block->{$x}) and defined($y);
+        $block->run_filters unless $block->is_filtered;
+        my $regexp = ref $y ? $y : $block->$y;
+        like($block->$x, $regexp,
+             $block->name ? $block->name : ()
+            );
+    }
+}
+
+sub run_unlike() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->_assert_plan;
+    my ($x, $y) = $self->_section_names(@_);
+    for my $block (@{$self->block_list}) {
+        next unless exists($block->{$x}) and defined($y);
+        $block->run_filters unless $block->is_filtered;
+        my $regexp = ref $y ? $y : $block->$y;
+        unlike($block->$x, $regexp,
+               $block->name ? $block->name : ()
+              );
+    }
+}
+
+sub skip_all_unless_require() {
+    (my ($self), @_) = find_my_self(@_);
+    my $module = shift;
+    eval "require $module; 1"
+        or Test::More::plan(
+            skip_all => "$module failed to load"
+        );
+}
+
+sub is_deep() {
+    (my ($self), @_) = find_my_self(@_);
+    require Test::Deep;
+    Test::Deep::cmp_deeply(@_);
+}
+
+sub run_is_deep() {
+    (my ($self), @_) = find_my_self(@_);
+    $self->_assert_plan;
+    my ($x, $y) = $self->_section_names(@_);
+    for my $block (@{$self->block_list}) {
+        next unless exists($block->{$x}) and exists($block->{$y});
+        $block->run_filters unless $block->is_filtered;
+        is_deep($block->$x, $block->$y, 
+           $block->name ? $block->name : ()
+          );
+    }
+}
+
+sub _pre_eval {
+    my $spec = shift;
+    return $spec unless $spec =~
+      s/\A\s*<<<(.*?)>>>\s*$//sm;
+    my $eval_code = $1;
+    eval "package main; $eval_code";
+    croak $@ if $@;
+    return $spec;
+}
+
+sub _block_list_init {
+    my $spec = $self->spec;
+    $spec = $self->_pre_eval($spec);
+    my $cd = $self->block_delim;
+    my @hunks = ($spec =~ /^(\Q${cd}\E.*?(?=^\Q${cd}\E|\z))/msg);
+    my $blocks = $self->_choose_blocks(@hunks);
+    $self->block_list($blocks); # Need to set early for possible filter use
+    my $seq = 1;
+    for my $block (@$blocks) {
+        $block->blocks_object($self);
+        $block->seq_num($seq++);
+    }
+    return $blocks;
+}
+
+sub _choose_blocks {
+    my $blocks = [];
+    for my $hunk (@_) {
+        my $block = $self->_make_block($hunk);
+        if (exists $block->{ONLY}) {
+            diag "I found ONLY: maybe you're debugging?"
+                unless $self->_no_diag_on_only;
+            return [$block];
+        }
+        next if exists $block->{SKIP};
+        push @$blocks, $block;
+        if (exists $block->{LAST}) {
+            return $blocks;
+        }
+    }
+    return $blocks;
+}
+
+sub _check_reserved {
+    my $id = shift;
+    croak "'$id' is a reserved name. Use something else.\n"
+      if $reserved_section_names->{$id} or
+         $id =~ /^_/;
+}
+
+sub _make_block {
+    my $hunk = shift;
+    my $cd = $self->block_delim;
+    my $dd = $self->data_delim;
+    my $block = $self->block_class->new;
+    $hunk =~ s/\A\Q${cd}\E[ \t]*(.*)\s+// or die;
+    my $name = $1;
+    my @parts = split /^\Q${dd}\E +\(?(\w+)\)? *(.*)?\n/m, $hunk;
+    my $description = shift @parts;
+    $description ||= '';
+    unless ($description =~ /\S/) {
+        $description = $name;
+    }
+    $description =~ s/\s*\z//;
+    $block->set_value(description => $description);
+    
+    my $section_map = {};
+    my $section_order = [];
+    while (@parts) {
+        my ($type, $filters, $value) = splice(@parts, 0, 3);
+        $self->_check_reserved($type);
+        $value = '' unless defined $value;
+        $filters = '' unless defined $filters;
+        if ($filters =~ /:(\s|\z)/) {
+            croak "Extra lines not allowed in '$type' section"
+              if $value =~ /\S/;
+            ($filters, $value) = split /\s*:(?:\s+|\z)/, $filters, 2;
+            $value = '' unless defined $value;
+            $value =~ s/^\s*(.*?)\s*$/$1/;
+        }
+        $section_map->{$type} = {
+            filters => $filters,
+        };
+        push @$section_order, $type;
+        $block->set_value($type, $value);
+    }
+    $block->set_value(name => $name);
+    $block->set_value(_section_map => $section_map);
+    $block->set_value(_section_order => $section_order);
+    return $block;
+}
+
+sub _spec_init {
+    return $self->_spec_string
+      if $self->_spec_string;
+    local $/;
+    my $spec;
+    if (my $spec_file = $self->_spec_file) {
+        open FILE, $spec_file or die $!;
+        $spec = <FILE>;
+        close FILE;
+    }
+    else {    
+        $spec = do { 
+            package main; 
+            no warnings 'once';
+            <DATA>;
+        };
+    }
+    return $spec;
+}
+
+sub _strict_warnings() {
+    require Filter::Util::Call;
+    my $done = 0;
+    Filter::Util::Call::filter_add(
+        sub {
+            return 0 if $done;
+            my ($data, $end) = ('', '');
+            while (my $status = Filter::Util::Call::filter_read()) {
+                return $status if $status < 0;
+                if (/^__(?:END|DATA)__\r?$/) {
+                    $end = $_;
+                    last;
+                }
+                $data .= $_;
+                $_ = '';
+            }
+            $_ = "use strict;use warnings;$data$end";
+            $done = 1;
+        }
+    );
+}
+
+sub tie_output() {
+    my $handle = shift;
+    die "No buffer to tie" unless @_;
+    tie *$handle, 'Test::Base::Handle', $_[0];
+}
+
+sub no_diff {
+    $ENV{TEST_SHOW_NO_DIFFS} = 1;
+}
+
+package Test::Base::Handle;
+
+sub TIEHANDLE() {
+    my $class = shift;
+    bless \ $_[0], $class;
+}
+
+sub PRINT {
+    $$self .= $_ for @_;
+}
+
+#===============================================================================
+# Test::Base::Block
+#
+# This is the default class for accessing a Test::Base block object.
+#===============================================================================
+package Test::Base::Block;
+our @ISA = qw(Spiffy);
+
+our @EXPORT = qw(block_accessor);
+
+sub AUTOLOAD {
+    return;
+}
+
+sub block_accessor() {
+    my $accessor = shift;
+    no strict 'refs';
+    return if defined &$accessor;
+    *$accessor = sub {
+        my $self = shift;
+        if (@_) {
+            Carp::croak "Not allowed to set values for '$accessor'";
+        }
+        my @list = @{$self->{$accessor} || []};
+        return wantarray
+        ? (@list)
+        : $list[0];
+    };
+}
+
+block_accessor 'name';
+block_accessor 'description';
+Spiffy::field 'seq_num';
+Spiffy::field 'is_filtered';
+Spiffy::field 'blocks_object';
+Spiffy::field 'original_values' => {};
+
+sub set_value {
+    no strict 'refs';
+    my $accessor = shift;
+    block_accessor $accessor
+      unless defined &$accessor;
+    $self->{$accessor} = [@_];
+}
+
+sub run_filters {
+    my $map = $self->_section_map;
+    my $order = $self->_section_order;
+    Carp::croak "Attempt to filter a block twice"
+      if $self->is_filtered;
+    for my $type (@$order) {
+        my $filters = $map->{$type}{filters};
+        my @value = $self->$type;
+        $self->original_values->{$type} = $value[0];
+        for my $filter ($self->_get_filters($type, $filters)) {
+            $Test::Base::Filter::arguments =
+              $filter =~ s/=(.*)$// ? $1 : undef;
+            my $function = "main::$filter";
+            no strict 'refs';
+            if (defined &$function) {
+                local $_ =
+                    (@value == 1 and not defined($value[0])) ? undef :
+                        join '', @value;
+                my $old = $_;
+                @value = &$function(@value);
+                if (not(@value) or 
+                    @value == 1 and defined($value[0]) and $value[0] =~ /\A(\d+|)\z/
+                ) {
+                    if ($value[0] && $_ eq $old) {
+                        Test::Base::diag("Filters returning numbers are supposed to do munging \$_: your filter '$function' apparently doesn't.");
+                    }
+                    @value = ($_);
+                }
+            }
+            else {
+                my $filter_object = $self->blocks_object->filter_class->new;
+                die "Can't find a function or method for '$filter' filter\n"
+                  unless $filter_object->can($filter);
+                $filter_object->current_block($self);
+                @value = $filter_object->$filter(@value);
+            }
+            # Set the value after each filter since other filters may be
+            # introspecting.
+            $self->set_value($type, @value);
+        }
+    }
+    $self->is_filtered(1);
+}
+
+sub _get_filters {
+    my $type = shift;
+    my $string = shift || '';
+    $string =~ s/\s*(.*?)\s*/$1/;
+    my @filters = ();
+    my $map_filters = $self->blocks_object->_filters_map->{$type} || [];
+    $map_filters = [ $map_filters ] unless ref $map_filters;
+    my @append = ();
+    for (
+        @{$self->blocks_object->_filters}, 
+        @$map_filters,
+        split(/\s+/, $string),
+    ) {
+        my $filter = $_;
+        last unless length $filter;
+        if ($filter =~ s/^-//) {
+            @filters = grep { $_ ne $filter } @filters;
+        }
+        elsif ($filter =~ s/^\+//) {
+            push @append, $filter;
+        }
+        else {
+            push @filters, $filter;
+        }
+    }
+    return @filters, @append;
+}
+
+{
+    %$reserved_section_names = map {
+        ($_, 1);
+    } keys(%Test::Base::Block::), qw( new DESTROY );
+}
+
+__DATA__
+
+=encoding utf8
+
+#line 1374
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Base/Filter.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Base/Filter.pm
new file mode 100644
index 0000000..d7b116b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Base/Filter.pm
@@ -0,0 +1,341 @@
+#line 1
+#===============================================================================
+# This is the default class for handling Test::Base data filtering.
+#===============================================================================
+package Test::Base::Filter;
+use Spiffy -Base;
+use Spiffy ':XXX';
+
+field 'current_block';
+
+our $arguments;
+sub current_arguments {
+    return undef unless defined $arguments;
+    my $args = $arguments;
+    $args =~ s/(\\s)/ /g;
+    $args =~ s/(\\[a-z])/'"' . $1 . '"'/gee;
+    return $args;
+}
+
+sub assert_scalar {
+    return if @_ == 1;
+    require Carp;
+    my $filter = (caller(1))[3];
+    $filter =~ s/.*:://;
+    Carp::croak "Input to the '$filter' filter must be a scalar, not a list";
+}
+
+sub _apply_deepest {
+    my $method = shift;
+    return () unless @_;
+    if (ref $_[0] eq 'ARRAY') {
+        for my $aref (@_) {
+            @$aref = $self->_apply_deepest($method, @$aref);
+        }
+        return @_;
+    }
+    $self->$method(@_);
+}
+
+sub _split_array {
+    map {
+        [$self->split($_)];
+    } @_;
+}
+
+sub _peel_deepest {
+    return () unless @_;
+    if (ref $_[0] eq 'ARRAY') {
+        if (ref $_[0]->[0] eq 'ARRAY') {
+            for my $aref (@_) {
+                @$aref = $self->_peel_deepest(@$aref);
+            }
+            return @_;
+        }
+        return map { $_->[0] } @_;
+    }
+    return @_;
+}
+
+#===============================================================================
+# these filters work on the leaves of nested arrays
+#===============================================================================
+sub Join { $self->_peel_deepest($self->_apply_deepest(join => @_)) }
+sub Reverse { $self->_apply_deepest(reverse => @_) }
+sub Split { $self->_apply_deepest(_split_array => @_) }
+sub Sort { $self->_apply_deepest(sort => @_) }
+
+
+sub append {
+    my $suffix = $self->current_arguments;
+    map { $_ . $suffix } @_;
+}
+
+sub array {
+    return [@_];
+}
+
+sub base64_decode {
+    $self->assert_scalar(@_);
+    require MIME::Base64;
+    MIME::Base64::decode_base64(shift);
+}
+
+sub base64_encode {
+    $self->assert_scalar(@_);
+    require MIME::Base64;
+    MIME::Base64::encode_base64(shift);
+}
+
+sub chomp {
+    map { CORE::chomp; $_ } @_;
+}
+
+sub chop {
+    map { CORE::chop; $_ } @_;
+}
+
+sub dumper {
+    no warnings 'once';
+    require Data::Dumper;
+    local $Data::Dumper::Sortkeys = 1;
+    local $Data::Dumper::Indent = 1;
+    local $Data::Dumper::Terse = 1;
+    Data::Dumper::Dumper(@_);
+}
+
+sub escape {
+    $self->assert_scalar(@_);
+    my $text = shift;
+    $text =~ s/(\\.)/eval "qq{$1}"/ge;
+    return $text;
+}
+
+sub eval {
+    $self->assert_scalar(@_);
+    my @return = CORE::eval(shift);
+    return $@ if $@;
+    return @return;
+}
+
+sub eval_all {
+    $self->assert_scalar(@_);
+    my $out = '';
+    my $err = '';
+    Test::Base::tie_output(*STDOUT, $out);
+    Test::Base::tie_output(*STDERR, $err);
+    my $return = CORE::eval(shift);
+    no warnings;
+    untie *STDOUT;
+    untie *STDERR;
+    return $return, $@, $out, $err;
+}
+
+sub eval_stderr {
+    $self->assert_scalar(@_);
+    my $output = '';
+    Test::Base::tie_output(*STDERR, $output);
+    CORE::eval(shift);
+    no warnings;
+    untie *STDERR;
+    return $output;
+}
+
+sub eval_stdout {
+    $self->assert_scalar(@_);
+    my $output = '';
+    Test::Base::tie_output(*STDOUT, $output);
+    CORE::eval(shift);
+    no warnings;
+    untie *STDOUT;
+    return $output;
+}
+
+sub exec_perl_stdout {
+    my $tmpfile = "/tmp/test-blocks-$$";
+    $self->_write_to($tmpfile, @_);
+    open my $execution, "$^X $tmpfile 2>&1 |"
+      or die "Couldn't open subprocess: $!\n";
+    local $/;
+    my $output = <$execution>;
+    close $execution;
+    unlink($tmpfile)
+      or die "Couldn't unlink $tmpfile: $!\n";
+    return $output;
+}
+
+sub flatten {
+    $self->assert_scalar(@_);
+    my $ref = shift;
+    if (ref($ref) eq 'HASH') {
+        return map {
+            ($_, $ref->{$_});
+        } sort keys %$ref;
+    }
+    if (ref($ref) eq 'ARRAY') {
+        return @$ref;
+    }
+    die "Can only flatten a hash or array ref";
+}
+
+sub get_url {
+    $self->assert_scalar(@_);
+    my $url = shift;
+    CORE::chomp($url);
+    require LWP::Simple;
+    LWP::Simple::get($url);
+}
+
+sub hash {
+    return +{ @_ };
+}
+
+sub head {
+    my $size = $self->current_arguments || 1;
+    return splice(@_, 0, $size);
+}
+
+sub join {
+    my $string = $self->current_arguments;
+    $string = '' unless defined $string;
+    CORE::join $string, @_;
+}
+
+sub lines {
+    $self->assert_scalar(@_);
+    my $text = shift;
+    return () unless length $text;
+    my @lines = ($text =~ /^(.*\n?)/gm);
+    return @lines;
+}
+
+sub norm {
+    $self->assert_scalar(@_);
+    my $text = shift;
+    $text = '' unless defined $text;
+    $text =~ s/\015\012/\n/g;
+    $text =~ s/\r/\n/g;
+    return $text;
+}
+
+sub prepend {
+    my $prefix = $self->current_arguments;
+    map { $prefix . $_ } @_;
+}
+
+sub read_file {
+    $self->assert_scalar(@_);
+    my $file = shift;
+    CORE::chomp $file;
+    open my $fh, $file
+      or die "Can't open '$file' for input:\n$!";
+    CORE::join '', <$fh>;
+}
+
+sub regexp {
+    $self->assert_scalar(@_);
+    my $text = shift;
+    my $flags = $self->current_arguments;
+    if ($text =~ /\n.*?\n/s) {
+        $flags = 'xism'
+          unless defined $flags;
+    }
+    else {
+        CORE::chomp($text);
+    }
+    $flags ||= '';
+    my $regexp = eval "qr{$text}$flags";
+    die $@ if $@;
+    return $regexp;
+}
+
+sub reverse {
+    CORE::reverse(@_);
+}
+
+sub slice {
+    die "Invalid args for slice"
+      unless $self->current_arguments =~ /^(\d+)(?:,(\d))?$/;
+    my ($x, $y) = ($1, $2);
+    $y = $x if not defined $y;
+    die "Invalid args for slice"
+      if $x > $y;
+    return splice(@_, $x, 1 + $y - $x);
+}
+
+sub sort {
+    CORE::sort(@_);
+}
+
+sub split {
+    $self->assert_scalar(@_);
+    my $separator = $self->current_arguments;
+    if (defined $separator and $separator =~ s{^/(.*)/$}{$1}) {
+        my $regexp = $1;
+        $separator = qr{$regexp};
+    }
+    $separator = qr/\s+/ unless $separator;
+    CORE::split $separator, shift;
+}
+
+sub strict {
+    $self->assert_scalar(@_);
+    <<'...' . shift;
+use strict;
+use warnings;
+...
+}
+
+sub tail {
+    my $size = $self->current_arguments || 1;
+    return splice(@_, @_ - $size, $size);
+}
+
+sub trim {
+    map {
+        s/\A([ \t]*\n)+//;
+        s/(?<=\n)\s*\z//g;
+        $_;
+    } @_;
+}
+
+sub unchomp {
+    map { $_ . "\n" } @_;
+}
+
+sub write_file {
+    my $file = $self->current_arguments
+      or die "No file specified for write_file filter";
+    if ($file =~ /(.*)[\\\/]/) {
+        my $dir = $1;
+        if (not -e $dir) {
+            require File::Path;
+            File::Path::mkpath($dir)
+              or die "Can't create $dir";
+        }
+    }
+    open my $fh, ">$file"
+      or die "Can't open '$file' for output\n:$!";
+    print $fh @_;
+    close $fh;
+    return $file;
+}
+
+sub yaml {
+    $self->assert_scalar(@_);
+    require YAML;
+    return YAML::Load(shift);
+}
+
+sub _write_to {
+    my $filename = shift;
+    open my $script, ">$filename"
+      or die "Couldn't open $filename: $!\n";
+    print $script @_;
+    close $script
+      or die "Couldn't close $filename: $!\n";
+}
+
+__DATA__
+
+#line 636
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Builder.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Builder.pm
new file mode 100644
index 0000000..14961dc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Builder.pm
@@ -0,0 +1,1413 @@
+#line 1
+package Test::Builder;
+
+use 5.006;
+use strict;
+use warnings;
+
+our $VERSION = '0.92';
+$VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
+
+BEGIN {
+    if( $] < 5.008 ) {
+        require Test::Builder::IO::Scalar;
+    }
+}
+
+
+# Make Test::Builder thread-safe for ithreads.
+BEGIN {
+    use Config;
+    # Load threads::shared when threads are turned on.
+    # 5.8.0's threads are so busted we no longer support them.
+    if( $] >= 5.008001 && $Config{useithreads} && $INC{'threads.pm'} ) {
+        require threads::shared;
+
+        # Hack around YET ANOTHER threads::shared bug.  It would
+        # occassionally forget the contents of the variable when sharing it.
+        # So we first copy the data, then share, then put our copy back.
+        *share = sub (\[$@%]) {
+            my $type = ref $_[0];
+            my $data;
+
+            if( $type eq 'HASH' ) {
+                %$data = %{ $_[0] };
+            }
+            elsif( $type eq 'ARRAY' ) {
+                @$data = @{ $_[0] };
+            }
+            elsif( $type eq 'SCALAR' ) {
+                $$data = ${ $_[0] };
+            }
+            else {
+                die( "Unknown type: " . $type );
+            }
+
+            $_[0] = &threads::shared::share( $_[0] );
+
+            if( $type eq 'HASH' ) {
+                %{ $_[0] } = %$data;
+            }
+            elsif( $type eq 'ARRAY' ) {
+                @{ $_[0] } = @$data;
+            }
+            elsif( $type eq 'SCALAR' ) {
+                ${ $_[0] } = $$data;
+            }
+            else {
+                die( "Unknown type: " . $type );
+            }
+
+            return $_[0];
+        };
+    }
+    # 5.8.0's threads::shared is busted when threads are off
+    # and earlier Perls just don't have that module at all.
+    else {
+        *share = sub { return $_[0] };
+        *lock  = sub { 0 };
+    }
+}
+
+#line 117
+
+my $Test = Test::Builder->new;
+
+sub new {
+    my($class) = shift;
+    $Test ||= $class->create;
+    return $Test;
+}
+
+#line 139
+
+sub create {
+    my $class = shift;
+
+    my $self = bless {}, $class;
+    $self->reset;
+
+    return $self;
+}
+
+#line 158
+
+our $Level;
+
+sub reset {    ## no critic (Subroutines::ProhibitBuiltinHomonyms)
+    my($self) = @_;
+
+    # We leave this a global because it has to be localized and localizing
+    # hash keys is just asking for pain.  Also, it was documented.
+    $Level = 1;
+
+    $self->{Have_Plan}    = 0;
+    $self->{No_Plan}      = 0;
+    $self->{Have_Output_Plan} = 0;
+
+    $self->{Original_Pid} = $$;
+
+    share( $self->{Curr_Test} );
+    $self->{Curr_Test} = 0;
+    $self->{Test_Results} = &share( [] );
+
+    $self->{Exported_To}    = undef;
+    $self->{Expected_Tests} = 0;
+
+    $self->{Skip_All} = 0;
+
+    $self->{Use_Nums} = 1;
+
+    $self->{No_Header} = 0;
+    $self->{No_Ending} = 0;
+
+    $self->{Todo}       = undef;
+    $self->{Todo_Stack} = [];
+    $self->{Start_Todo} = 0;
+    $self->{Opened_Testhandles} = 0;
+
+    $self->_dup_stdhandles;
+
+    return;
+}
+
+#line 219
+
+my %plan_cmds = (
+    no_plan     => \&no_plan,
+    skip_all    => \&skip_all,
+    tests       => \&_plan_tests,
+);
+
+sub plan {
+    my( $self, $cmd, $arg ) = @_;
+
+    return unless $cmd;
+
+    local $Level = $Level + 1;
+
+    $self->croak("You tried to plan twice") if $self->{Have_Plan};
+
+    if( my $method = $plan_cmds{$cmd} ) {
+        local $Level = $Level + 1;
+        $self->$method($arg);
+    }
+    else {
+        my @args = grep { defined } ( $cmd, $arg );
+        $self->croak("plan() doesn't understand @args");
+    }
+
+    return 1;
+}
+
+
+sub _plan_tests {
+    my($self, $arg) = @_;
+
+    if($arg) {
+        local $Level = $Level + 1;
+        return $self->expected_tests($arg);
+    }
+    elsif( !defined $arg ) {
+        $self->croak("Got an undefined number of tests");
+    }
+    else {
+        $self->croak("You said to run 0 tests");
+    }
+
+    return;
+}
+
+
+#line 275
+
+sub expected_tests {
+    my $self = shift;
+    my($max) = @_;
+
+    if(@_) {
+        $self->croak("Number of tests must be a positive integer.  You gave it '$max'")
+          unless $max =~ /^\+?\d+$/;
+
+        $self->{Expected_Tests} = $max;
+        $self->{Have_Plan}      = 1;
+
+        $self->_output_plan($max) unless $self->no_header;
+    }
+    return $self->{Expected_Tests};
+}
+
+#line 299
+
+sub no_plan {
+    my($self, $arg) = @_;
+
+    $self->carp("no_plan takes no arguments") if $arg;
+
+    $self->{No_Plan}   = 1;
+    $self->{Have_Plan} = 1;
+
+    return 1;
+}
+
+
+#line 333
+
+sub _output_plan {
+    my($self, $max, $directive, $reason) = @_;
+
+    $self->carp("The plan was already output") if $self->{Have_Output_Plan};
+
+    my $plan = "1..$max";
+    $plan .= " # $directive" if defined $directive;
+    $plan .= " $reason"      if defined $reason;
+
+    $self->_print("$plan\n");
+
+    $self->{Have_Output_Plan} = 1;
+
+    return;
+}
+
+#line 384
+
+sub done_testing {
+    my($self, $num_tests) = @_;
+
+    # If done_testing() specified the number of tests, shut off no_plan.
+    if( defined $num_tests ) {
+        $self->{No_Plan} = 0;
+    }
+    else {
+        $num_tests = $self->current_test;
+    }
+
+    if( $self->{Done_Testing} ) {
+        my($file, $line) = @{$self->{Done_Testing}}[1,2];
+        $self->ok(0, "done_testing() was already called at $file line $line");
+        return;
+    }
+
+    $self->{Done_Testing} = [caller];
+
+    if( $self->expected_tests && $num_tests != $self->expected_tests ) {
+        $self->ok(0, "planned to run @{[ $self->expected_tests ]} ".
+                     "but done_testing() expects $num_tests");
+    }
+    else {
+        $self->{Expected_Tests} = $num_tests;
+    }
+
+    $self->_output_plan($num_tests) unless $self->{Have_Output_Plan};
+
+    $self->{Have_Plan} = 1;
+
+    return 1;
+}
+
+
+#line 429
+
+sub has_plan {
+    my $self = shift;
+
+    return( $self->{Expected_Tests} ) if $self->{Expected_Tests};
+    return('no_plan') if $self->{No_Plan};
+    return(undef);
+}
+
+#line 446
+
+sub skip_all {
+    my( $self, $reason ) = @_;
+
+    $self->{Skip_All} = 1;
+
+    $self->_output_plan(0, "SKIP", $reason) unless $self->no_header;
+    exit(0);
+}
+
+#line 468
+
+sub exported_to {
+    my( $self, $pack ) = @_;
+
+    if( defined $pack ) {
+        $self->{Exported_To} = $pack;
+    }
+    return $self->{Exported_To};
+}
+
+#line 498
+
+sub ok {
+    my( $self, $test, $name ) = @_;
+
+    # $test might contain an object which we don't want to accidentally
+    # store, so we turn it into a boolean.
+    $test = $test ? 1 : 0;
+
+    lock $self->{Curr_Test};
+    $self->{Curr_Test}++;
+
+    # In case $name is a string overloaded object, force it to stringify.
+    $self->_unoverload_str( \$name );
+
+    $self->diag(<<"ERR") if defined $name and $name =~ /^[\d\s]+$/;
+    You named your test '$name'.  You shouldn't use numbers for your test names.
+    Very confusing.
+ERR
+
+    # Capture the value of $TODO for the rest of this ok() call
+    # so it can more easily be found by other routines.
+    my $todo    = $self->todo();
+    my $in_todo = $self->in_todo;
+    local $self->{Todo} = $todo if $in_todo;
+
+    $self->_unoverload_str( \$todo );
+
+    my $out;
+    my $result = &share( {} );
+
+    unless($test) {
+        $out .= "not ";
+        @$result{ 'ok', 'actual_ok' } = ( ( $self->in_todo ? 1 : 0 ), 0 );
+    }
+    else {
+        @$result{ 'ok', 'actual_ok' } = ( 1, $test );
+    }
+
+    $out .= "ok";
+    $out .= " $self->{Curr_Test}" if $self->use_numbers;
+
+    if( defined $name ) {
+        $name =~ s|#|\\#|g;    # # in a name can confuse Test::Harness.
+        $out .= " - $name";
+        $result->{name} = $name;
+    }
+    else {
+        $result->{name} = '';
+    }
+
+    if( $self->in_todo ) {
+        $out .= " # TODO $todo";
+        $result->{reason} = $todo;
+        $result->{type}   = 'todo';
+    }
+    else {
+        $result->{reason} = '';
+        $result->{type}   = '';
+    }
+
+    $self->{Test_Results}[ $self->{Curr_Test} - 1 ] = $result;
+    $out .= "\n";
+
+    $self->_print($out);
+
+    unless($test) {
+        my $msg = $self->in_todo ? "Failed (TODO)" : "Failed";
+        $self->_print_to_fh( $self->_diag_fh, "\n" ) if $ENV{HARNESS_ACTIVE};
+
+        my( undef, $file, $line ) = $self->caller;
+        if( defined $name ) {
+            $self->diag(qq[  $msg test '$name'\n]);
+            $self->diag(qq[  at $file line $line.\n]);
+        }
+        else {
+            $self->diag(qq[  $msg test at $file line $line.\n]);
+        }
+    }
+
+    return $test ? 1 : 0;
+}
+
+sub _unoverload {
+    my $self = shift;
+    my $type = shift;
+
+    $self->_try(sub { require overload; }, die_on_fail => 1);
+
+    foreach my $thing (@_) {
+        if( $self->_is_object($$thing) ) {
+            if( my $string_meth = overload::Method( $$thing, $type ) ) {
+                $$thing = $$thing->$string_meth();
+            }
+        }
+    }
+
+    return;
+}
+
+sub _is_object {
+    my( $self, $thing ) = @_;
+
+    return $self->_try( sub { ref $thing && $thing->isa('UNIVERSAL') } ) ? 1 : 0;
+}
+
+sub _unoverload_str {
+    my $self = shift;
+
+    return $self->_unoverload( q[""], @_ );
+}
+
+sub _unoverload_num {
+    my $self = shift;
+
+    $self->_unoverload( '0+', @_ );
+
+    for my $val (@_) {
+        next unless $self->_is_dualvar($$val);
+        $$val = $$val + 0;
+    }
+
+    return;
+}
+
+# This is a hack to detect a dualvar such as $!
+sub _is_dualvar {
+    my( $self, $val ) = @_;
+
+    # Objects are not dualvars.
+    return 0 if ref $val;
+
+    no warnings 'numeric';
+    my $numval = $val + 0;
+    return $numval != 0 and $numval ne $val ? 1 : 0;
+}
+
+#line 649
+
+sub is_eq {
+    my( $self, $got, $expect, $name ) = @_;
+    local $Level = $Level + 1;
+
+    $self->_unoverload_str( \$got, \$expect );
+
+    if( !defined $got || !defined $expect ) {
+        # undef only matches undef and nothing else
+        my $test = !defined $got && !defined $expect;
+
+        $self->ok( $test, $name );
+        $self->_is_diag( $got, 'eq', $expect ) unless $test;
+        return $test;
+    }
+
+    return $self->cmp_ok( $got, 'eq', $expect, $name );
+}
+
+sub is_num {
+    my( $self, $got, $expect, $name ) = @_;
+    local $Level = $Level + 1;
+
+    $self->_unoverload_num( \$got, \$expect );
+
+    if( !defined $got || !defined $expect ) {
+        # undef only matches undef and nothing else
+        my $test = !defined $got && !defined $expect;
+
+        $self->ok( $test, $name );
+        $self->_is_diag( $got, '==', $expect ) unless $test;
+        return $test;
+    }
+
+    return $self->cmp_ok( $got, '==', $expect, $name );
+}
+
+sub _diag_fmt {
+    my( $self, $type, $val ) = @_;
+
+    if( defined $$val ) {
+        if( $type eq 'eq' or $type eq 'ne' ) {
+            # quote and force string context
+            $$val = "'$$val'";
+        }
+        else {
+            # force numeric context
+            $self->_unoverload_num($val);
+        }
+    }
+    else {
+        $$val = 'undef';
+    }
+
+    return;
+}
+
+sub _is_diag {
+    my( $self, $got, $type, $expect ) = @_;
+
+    $self->_diag_fmt( $type, $_ ) for \$got, \$expect;
+
+    local $Level = $Level + 1;
+    return $self->diag(<<"DIAGNOSTIC");
+         got: $got
+    expected: $expect
+DIAGNOSTIC
+
+}
+
+sub _isnt_diag {
+    my( $self, $got, $type ) = @_;
+
+    $self->_diag_fmt( $type, \$got );
+
+    local $Level = $Level + 1;
+    return $self->diag(<<"DIAGNOSTIC");
+         got: $got
+    expected: anything else
+DIAGNOSTIC
+}
+
+#line 746
+
+sub isnt_eq {
+    my( $self, $got, $dont_expect, $name ) = @_;
+    local $Level = $Level + 1;
+
+    if( !defined $got || !defined $dont_expect ) {
+        # undef only matches undef and nothing else
+        my $test = defined $got || defined $dont_expect;
+
+        $self->ok( $test, $name );
+        $self->_isnt_diag( $got, 'ne' ) unless $test;
+        return $test;
+    }
+
+    return $self->cmp_ok( $got, 'ne', $dont_expect, $name );
+}
+
+sub isnt_num {
+    my( $self, $got, $dont_expect, $name ) = @_;
+    local $Level = $Level + 1;
+
+    if( !defined $got || !defined $dont_expect ) {
+        # undef only matches undef and nothing else
+        my $test = defined $got || defined $dont_expect;
+
+        $self->ok( $test, $name );
+        $self->_isnt_diag( $got, '!=' ) unless $test;
+        return $test;
+    }
+
+    return $self->cmp_ok( $got, '!=', $dont_expect, $name );
+}
+
+#line 797
+
+sub like {
+    my( $self, $this, $regex, $name ) = @_;
+
+    local $Level = $Level + 1;
+    return $self->_regex_ok( $this, $regex, '=~', $name );
+}
+
+sub unlike {
+    my( $self, $this, $regex, $name ) = @_;
+
+    local $Level = $Level + 1;
+    return $self->_regex_ok( $this, $regex, '!~', $name );
+}
+
+#line 821
+
+my %numeric_cmps = map { ( $_, 1 ) } ( "<", "<=", ">", ">=", "==", "!=", "<=>" );
+
+sub cmp_ok {
+    my( $self, $got, $type, $expect, $name ) = @_;
+
+    my $test;
+    my $error;
+    {
+        ## no critic (BuiltinFunctions::ProhibitStringyEval)
+
+        local( $@, $!, $SIG{__DIE__} );    # isolate eval
+
+        my($pack, $file, $line) = $self->caller();
+
+        $test = eval qq[
+#line 1 "cmp_ok [from $file line $line]"
+\$got $type \$expect;
+];
+        $error = $@;
+    }
+    local $Level = $Level + 1;
+    my $ok = $self->ok( $test, $name );
+
+    # Treat overloaded objects as numbers if we're asked to do a
+    # numeric comparison.
+    my $unoverload
+      = $numeric_cmps{$type}
+      ? '_unoverload_num'
+      : '_unoverload_str';
+
+    $self->diag(<<"END") if $error;
+An error occurred while using $type:
+------------------------------------
+$error
+------------------------------------
+END
+
+    unless($ok) {
+        $self->$unoverload( \$got, \$expect );
+
+        if( $type =~ /^(eq|==)$/ ) {
+            $self->_is_diag( $got, $type, $expect );
+        }
+        elsif( $type =~ /^(ne|!=)$/ ) {
+            $self->_isnt_diag( $got, $type );
+        }
+        else {
+            $self->_cmp_diag( $got, $type, $expect );
+        }
+    }
+    return $ok;
+}
+
+sub _cmp_diag {
+    my( $self, $got, $type, $expect ) = @_;
+
+    $got    = defined $got    ? "'$got'"    : 'undef';
+    $expect = defined $expect ? "'$expect'" : 'undef';
+
+    local $Level = $Level + 1;
+    return $self->diag(<<"DIAGNOSTIC");
+    $got
+        $type
+    $expect
+DIAGNOSTIC
+}
+
+sub _caller_context {
+    my $self = shift;
+
+    my( $pack, $file, $line ) = $self->caller(1);
+
+    my $code = '';
+    $code .= "#line $line $file\n" if defined $file and defined $line;
+
+    return $code;
+}
+
+#line 920
+
+sub BAIL_OUT {
+    my( $self, $reason ) = @_;
+
+    $self->{Bailed_Out} = 1;
+    $self->_print("Bail out!  $reason");
+    exit 255;
+}
+
+#line 933
+
+*BAILOUT = \&BAIL_OUT;
+
+#line 944
+
+sub skip {
+    my( $self, $why ) = @_;
+    $why ||= '';
+    $self->_unoverload_str( \$why );
+
+    lock( $self->{Curr_Test} );
+    $self->{Curr_Test}++;
+
+    $self->{Test_Results}[ $self->{Curr_Test} - 1 ] = &share(
+        {
+            'ok'      => 1,
+            actual_ok => 1,
+            name      => '',
+            type      => 'skip',
+            reason    => $why,
+        }
+    );
+
+    my $out = "ok";
+    $out .= " $self->{Curr_Test}" if $self->use_numbers;
+    $out .= " # skip";
+    $out .= " $why"               if length $why;
+    $out .= "\n";
+
+    $self->_print($out);
+
+    return 1;
+}
+
+#line 985
+
+sub todo_skip {
+    my( $self, $why ) = @_;
+    $why ||= '';
+
+    lock( $self->{Curr_Test} );
+    $self->{Curr_Test}++;
+
+    $self->{Test_Results}[ $self->{Curr_Test} - 1 ] = &share(
+        {
+            'ok'      => 1,
+            actual_ok => 0,
+            name      => '',
+            type      => 'todo_skip',
+            reason    => $why,
+        }
+    );
+
+    my $out = "not ok";
+    $out .= " $self->{Curr_Test}" if $self->use_numbers;
+    $out .= " # TODO & SKIP $why\n";
+
+    $self->_print($out);
+
+    return 1;
+}
+
+#line 1062
+
+sub maybe_regex {
+    my( $self, $regex ) = @_;
+    my $usable_regex = undef;
+
+    return $usable_regex unless defined $regex;
+
+    my( $re, $opts );
+
+    # Check for qr/foo/
+    if( _is_qr($regex) ) {
+        $usable_regex = $regex;
+    }
+    # Check for '/foo/' or 'm,foo,'
+    elsif(( $re, $opts )        = $regex =~ m{^ /(.*)/ (\w*) $ }sx              or
+          ( undef, $re, $opts ) = $regex =~ m,^ m([^\w\s]) (.+) \1 (\w*) $,sx
+    )
+    {
+        $usable_regex = length $opts ? "(?$opts)$re" : $re;
+    }
+
+    return $usable_regex;
+}
+
+sub _is_qr {
+    my $regex = shift;
+
+    # is_regexp() checks for regexes in a robust manner, say if they're
+    # blessed.
+    return re::is_regexp($regex) if defined &re::is_regexp;
+    return ref $regex eq 'Regexp';
+}
+
+sub _regex_ok {
+    my( $self, $this, $regex, $cmp, $name ) = @_;
+
+    my $ok           = 0;
+    my $usable_regex = $self->maybe_regex($regex);
+    unless( defined $usable_regex ) {
+        local $Level = $Level + 1;
+        $ok = $self->ok( 0, $name );
+        $self->diag("    '$regex' doesn't look much like a regex to me.");
+        return $ok;
+    }
+
+    {
+        ## no critic (BuiltinFunctions::ProhibitStringyEval)
+
+        my $test;
+        my $code = $self->_caller_context;
+
+        local( $@, $!, $SIG{__DIE__} );    # isolate eval
+
+        # Yes, it has to look like this or 5.4.5 won't see the #line
+        # directive.
+        # Don't ask me, man, I just work here.
+        $test = eval "
+$code" . q{$test = $this =~ /$usable_regex/ ? 1 : 0};
+
+        $test = !$test if $cmp eq '!~';
+
+        local $Level = $Level + 1;
+        $ok = $self->ok( $test, $name );
+    }
+
+    unless($ok) {
+        $this = defined $this ? "'$this'" : 'undef';
+        my $match = $cmp eq '=~' ? "doesn't match" : "matches";
+
+        local $Level = $Level + 1;
+        $self->diag( sprintf <<'DIAGNOSTIC', $this, $match, $regex );
+                  %s
+    %13s '%s'
+DIAGNOSTIC
+
+    }
+
+    return $ok;
+}
+
+# I'm not ready to publish this.  It doesn't deal with array return
+# values from the code or context.
+
+#line 1162
+
+sub _try {
+    my( $self, $code, %opts ) = @_;
+
+    my $error;
+    my $return;
+    {
+        local $!;               # eval can mess up $!
+        local $@;               # don't set $@ in the test
+        local $SIG{__DIE__};    # don't trip an outside DIE handler.
+        $return = eval { $code->() };
+        $error = $@;
+    }
+
+    die $error if $error and $opts{die_on_fail};
+
+    return wantarray ? ( $return, $error ) : $return;
+}
+
+#line 1191
+
+sub is_fh {
+    my $self     = shift;
+    my $maybe_fh = shift;
+    return 0 unless defined $maybe_fh;
+
+    return 1 if ref $maybe_fh  eq 'GLOB';    # its a glob ref
+    return 1 if ref \$maybe_fh eq 'GLOB';    # its a glob
+
+    return eval { $maybe_fh->isa("IO::Handle") } ||
+           # 5.5.4's tied() and can() doesn't like getting undef
+           eval { ( tied($maybe_fh) || '' )->can('TIEHANDLE') };
+}
+
+#line 1235
+
+sub level {
+    my( $self, $level ) = @_;
+
+    if( defined $level ) {
+        $Level = $level;
+    }
+    return $Level;
+}
+
+#line 1267
+
+sub use_numbers {
+    my( $self, $use_nums ) = @_;
+
+    if( defined $use_nums ) {
+        $self->{Use_Nums} = $use_nums;
+    }
+    return $self->{Use_Nums};
+}
+
+#line 1300
+
+foreach my $attribute (qw(No_Header No_Ending No_Diag)) {
+    my $method = lc $attribute;
+
+    my $code = sub {
+        my( $self, $no ) = @_;
+
+        if( defined $no ) {
+            $self->{$attribute} = $no;
+        }
+        return $self->{$attribute};
+    };
+
+    no strict 'refs';    ## no critic
+    *{ __PACKAGE__ . '::' . $method } = $code;
+}
+
+#line 1353
+
+sub diag {
+    my $self = shift;
+
+    $self->_print_comment( $self->_diag_fh, @_ );
+}
+
+#line 1368
+
+sub note {
+    my $self = shift;
+
+    $self->_print_comment( $self->output, @_ );
+}
+
+sub _diag_fh {
+    my $self = shift;
+
+    local $Level = $Level + 1;
+    return $self->in_todo ? $self->todo_output : $self->failure_output;
+}
+
+sub _print_comment {
+    my( $self, $fh, @msgs ) = @_;
+
+    return if $self->no_diag;
+    return unless @msgs;
+
+    # Prevent printing headers when compiling (i.e. -c)
+    return if $^C;
+
+    # Smash args together like print does.
+    # Convert undef to 'undef' so its readable.
+    my $msg = join '', map { defined($_) ? $_ : 'undef' } @msgs;
+
+    # Escape the beginning, _print will take care of the rest.
+    $msg =~ s/^/# /;
+
+    local $Level = $Level + 1;
+    $self->_print_to_fh( $fh, $msg );
+
+    return 0;
+}
+
+#line 1418
+
+sub explain {
+    my $self = shift;
+
+    return map {
+        ref $_
+          ? do {
+            $self->_try(sub { require Data::Dumper }, die_on_fail => 1);
+
+            my $dumper = Data::Dumper->new( [$_] );
+            $dumper->Indent(1)->Terse(1);
+            $dumper->Sortkeys(1) if $dumper->can("Sortkeys");
+            $dumper->Dump;
+          }
+          : $_
+    } @_;
+}
+
+#line 1447
+
+sub _print {
+    my $self = shift;
+    return $self->_print_to_fh( $self->output, @_ );
+}
+
+sub _print_to_fh {
+    my( $self, $fh, @msgs ) = @_;
+
+    # Prevent printing headers when only compiling.  Mostly for when
+    # tests are deparsed with B::Deparse
+    return if $^C;
+
+    my $msg = join '', @msgs;
+
+    local( $\, $", $, ) = ( undef, ' ', '' );
+
+    # Escape each line after the first with a # so we don't
+    # confuse Test::Harness.
+    $msg =~ s{\n(?!\z)}{\n# }sg;
+
+    # Stick a newline on the end if it needs it.
+    $msg .= "\n" unless $msg =~ /\n\z/;
+
+    return print $fh $msg;
+}
+
+#line 1506
+
+sub output {
+    my( $self, $fh ) = @_;
+
+    if( defined $fh ) {
+        $self->{Out_FH} = $self->_new_fh($fh);
+    }
+    return $self->{Out_FH};
+}
+
+sub failure_output {
+    my( $self, $fh ) = @_;
+
+    if( defined $fh ) {
+        $self->{Fail_FH} = $self->_new_fh($fh);
+    }
+    return $self->{Fail_FH};
+}
+
+sub todo_output {
+    my( $self, $fh ) = @_;
+
+    if( defined $fh ) {
+        $self->{Todo_FH} = $self->_new_fh($fh);
+    }
+    return $self->{Todo_FH};
+}
+
+sub _new_fh {
+    my $self = shift;
+    my($file_or_fh) = shift;
+
+    my $fh;
+    if( $self->is_fh($file_or_fh) ) {
+        $fh = $file_or_fh;
+    }
+    elsif( ref $file_or_fh eq 'SCALAR' ) {
+        # Scalar refs as filehandles was added in 5.8.
+        if( $] >= 5.008 ) {
+            open $fh, ">>", $file_or_fh
+              or $self->croak("Can't open scalar ref $file_or_fh: $!");
+        }
+        # Emulate scalar ref filehandles with a tie.
+        else {
+            $fh = Test::Builder::IO::Scalar->new($file_or_fh)
+              or $self->croak("Can't tie scalar ref $file_or_fh");
+        }
+    }
+    else {
+        open $fh, ">", $file_or_fh
+          or $self->croak("Can't open test output log $file_or_fh: $!");
+        _autoflush($fh);
+    }
+
+    return $fh;
+}
+
+sub _autoflush {
+    my($fh) = shift;
+    my $old_fh = select $fh;
+    $| = 1;
+    select $old_fh;
+
+    return;
+}
+
+my( $Testout, $Testerr );
+
+sub _dup_stdhandles {
+    my $self = shift;
+
+    $self->_open_testhandles;
+
+    # Set everything to unbuffered else plain prints to STDOUT will
+    # come out in the wrong order from our own prints.
+    _autoflush($Testout);
+    _autoflush( \*STDOUT );
+    _autoflush($Testerr);
+    _autoflush( \*STDERR );
+
+    $self->reset_outputs;
+
+    return;
+}
+
+sub _open_testhandles {
+    my $self = shift;
+
+    return if $self->{Opened_Testhandles};
+
+    # We dup STDOUT and STDERR so people can change them in their
+    # test suites while still getting normal test output.
+    open( $Testout, ">&STDOUT" ) or die "Can't dup STDOUT:  $!";
+    open( $Testerr, ">&STDERR" ) or die "Can't dup STDERR:  $!";
+
+    #    $self->_copy_io_layers( \*STDOUT, $Testout );
+    #    $self->_copy_io_layers( \*STDERR, $Testerr );
+
+    $self->{Opened_Testhandles} = 1;
+
+    return;
+}
+
+sub _copy_io_layers {
+    my( $self, $src, $dst ) = @_;
+
+    $self->_try(
+        sub {
+            require PerlIO;
+            my @src_layers = PerlIO::get_layers($src);
+
+            binmode $dst, join " ", map ":$_", @src_layers if @src_layers;
+        }
+    );
+
+    return;
+}
+
+#line 1631
+
+sub reset_outputs {
+    my $self = shift;
+
+    $self->output        ($Testout);
+    $self->failure_output($Testerr);
+    $self->todo_output   ($Testout);
+
+    return;
+}
+
+#line 1657
+
+sub _message_at_caller {
+    my $self = shift;
+
+    local $Level = $Level + 1;
+    my( $pack, $file, $line ) = $self->caller;
+    return join( "", @_ ) . " at $file line $line.\n";
+}
+
+sub carp {
+    my $self = shift;
+    return warn $self->_message_at_caller(@_);
+}
+
+sub croak {
+    my $self = shift;
+    return die $self->_message_at_caller(@_);
+}
+
+
+#line 1697
+
+sub current_test {
+    my( $self, $num ) = @_;
+
+    lock( $self->{Curr_Test} );
+    if( defined $num ) {
+        $self->{Curr_Test} = $num;
+
+        # If the test counter is being pushed forward fill in the details.
+        my $test_results = $self->{Test_Results};
+        if( $num > @$test_results ) {
+            my $start = @$test_results ? @$test_results : 0;
+            for( $start .. $num - 1 ) {
+                $test_results->[$_] = &share(
+                    {
+                        'ok'      => 1,
+                        actual_ok => undef,
+                        reason    => 'incrementing test number',
+                        type      => 'unknown',
+                        name      => undef
+                    }
+                );
+            }
+        }
+        # If backward, wipe history.  Its their funeral.
+        elsif( $num < @$test_results ) {
+            $#{$test_results} = $num - 1;
+        }
+    }
+    return $self->{Curr_Test};
+}
+
+#line 1739
+
+sub summary {
+    my($self) = shift;
+
+    return map { $_->{'ok'} } @{ $self->{Test_Results} };
+}
+
+#line 1794
+
+sub details {
+    my $self = shift;
+    return @{ $self->{Test_Results} };
+}
+
+#line 1823
+
+sub todo {
+    my( $self, $pack ) = @_;
+
+    return $self->{Todo} if defined $self->{Todo};
+
+    local $Level = $Level + 1;
+    my $todo = $self->find_TODO($pack);
+    return $todo if defined $todo;
+
+    return '';
+}
+
+#line 1845
+
+sub find_TODO {
+    my( $self, $pack ) = @_;
+
+    $pack = $pack || $self->caller(1) || $self->exported_to;
+    return unless $pack;
+
+    no strict 'refs';    ## no critic
+    return ${ $pack . '::TODO' };
+}
+
+#line 1863
+
+sub in_todo {
+    my $self = shift;
+
+    local $Level = $Level + 1;
+    return( defined $self->{Todo} || $self->find_TODO ) ? 1 : 0;
+}
+
+#line 1913
+
+sub todo_start {
+    my $self = shift;
+    my $message = @_ ? shift : '';
+
+    $self->{Start_Todo}++;
+    if( $self->in_todo ) {
+        push @{ $self->{Todo_Stack} } => $self->todo;
+    }
+    $self->{Todo} = $message;
+
+    return;
+}
+
+#line 1935
+
+sub todo_end {
+    my $self = shift;
+
+    if( !$self->{Start_Todo} ) {
+        $self->croak('todo_end() called without todo_start()');
+    }
+
+    $self->{Start_Todo}--;
+
+    if( $self->{Start_Todo} && @{ $self->{Todo_Stack} } ) {
+        $self->{Todo} = pop @{ $self->{Todo_Stack} };
+    }
+    else {
+        delete $self->{Todo};
+    }
+
+    return;
+}
+
+#line 1968
+
+sub caller {    ## no critic (Subroutines::ProhibitBuiltinHomonyms)
+    my( $self, $height ) = @_;
+    $height ||= 0;
+
+    my $level = $self->level + $height + 1;
+    my @caller;
+    do {
+        @caller = CORE::caller( $level );
+        $level--;
+    } until @caller;
+    return wantarray ? @caller : $caller[0];
+}
+
+#line 1985
+
+#line 1999
+
+#'#
+sub _sanity_check {
+    my $self = shift;
+
+    $self->_whoa( $self->{Curr_Test} < 0, 'Says here you ran a negative number of tests!' );
+    $self->_whoa( $self->{Curr_Test} != @{ $self->{Test_Results} },
+        'Somehow you got a different number of results than tests ran!' );
+
+    return;
+}
+
+#line 2020
+
+sub _whoa {
+    my( $self, $check, $desc ) = @_;
+    if($check) {
+        local $Level = $Level + 1;
+        $self->croak(<<"WHOA");
+WHOA!  $desc
+This should never happen!  Please contact the author immediately!
+WHOA
+    }
+
+    return;
+}
+
+#line 2044
+
+sub _my_exit {
+    $? = $_[0];    ## no critic (Variables::RequireLocalizedPunctuationVars)
+
+    return 1;
+}
+
+#line 2056
+
+sub _ending {
+    my $self = shift;
+
+    my $real_exit_code = $?;
+
+    # Don't bother with an ending if this is a forked copy.  Only the parent
+    # should do the ending.
+    if( $self->{Original_Pid} != $$ ) {
+        return;
+    }
+
+    # Ran tests but never declared a plan or hit done_testing
+    if( !$self->{Have_Plan} and $self->{Curr_Test} ) {
+        $self->diag("Tests were run but no plan was declared and done_testing() was not seen.");
+    }
+
+    # Exit if plan() was never called.  This is so "require Test::Simple"
+    # doesn't puke.
+    if( !$self->{Have_Plan} ) {
+        return;
+    }
+
+    # Don't do an ending if we bailed out.
+    if( $self->{Bailed_Out} ) {
+        return;
+    }
+
+    # Figure out if we passed or failed and print helpful messages.
+    my $test_results = $self->{Test_Results};
+    if(@$test_results) {
+        # The plan?  We have no plan.
+        if( $self->{No_Plan} ) {
+            $self->_output_plan($self->{Curr_Test}) unless $self->no_header;
+            $self->{Expected_Tests} = $self->{Curr_Test};
+        }
+
+        # Auto-extended arrays and elements which aren't explicitly
+        # filled in with a shared reference will puke under 5.8.0
+        # ithreads.  So we have to fill them in by hand. :(
+        my $empty_result = &share( {} );
+        for my $idx ( 0 .. $self->{Expected_Tests} - 1 ) {
+            $test_results->[$idx] = $empty_result
+              unless defined $test_results->[$idx];
+        }
+
+        my $num_failed = grep !$_->{'ok'}, @{$test_results}[ 0 .. $self->{Curr_Test} - 1 ];
+
+        my $num_extra = $self->{Curr_Test} - $self->{Expected_Tests};
+
+        if( $num_extra != 0 ) {
+            my $s = $self->{Expected_Tests} == 1 ? '' : 's';
+            $self->diag(<<"FAIL");
+Looks like you planned $self->{Expected_Tests} test$s but ran $self->{Curr_Test}.
+FAIL
+        }
+
+        if($num_failed) {
+            my $num_tests = $self->{Curr_Test};
+            my $s = $num_failed == 1 ? '' : 's';
+
+            my $qualifier = $num_extra == 0 ? '' : ' run';
+
+            $self->diag(<<"FAIL");
+Looks like you failed $num_failed test$s of $num_tests$qualifier.
+FAIL
+        }
+
+        if($real_exit_code) {
+            $self->diag(<<"FAIL");
+Looks like your test exited with $real_exit_code just after $self->{Curr_Test}.
+FAIL
+
+            _my_exit($real_exit_code) && return;
+        }
+
+        my $exit_code;
+        if($num_failed) {
+            $exit_code = $num_failed <= 254 ? $num_failed : 254;
+        }
+        elsif( $num_extra != 0 ) {
+            $exit_code = 255;
+        }
+        else {
+            $exit_code = 0;
+        }
+
+        _my_exit($exit_code) && return;
+    }
+    elsif( $self->{Skip_All} ) {
+        _my_exit(0) && return;
+    }
+    elsif($real_exit_code) {
+        $self->diag(<<"FAIL");
+Looks like your test exited with $real_exit_code before it could output anything.
+FAIL
+        _my_exit($real_exit_code) && return;
+    }
+    else {
+        $self->diag("No tests run!\n");
+        _my_exit(255) && return;
+    }
+
+    $self->_whoa( 1, "We fell off the end of _ending()" );
+}
+
+END {
+    $Test->_ending if defined $Test and !$Test->no_ending;
+}
+
+#line 2236
+
+1;
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Builder/Module.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Builder/Module.pm
new file mode 100644
index 0000000..de793c1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/Builder/Module.pm
@@ -0,0 +1,81 @@
+#line 1
+package Test::Builder::Module;
+
+use strict;
+
+use Test::Builder;
+
+require Exporter;
+our @ISA = qw(Exporter);
+
+our $VERSION = '0.92';
+$VERSION = eval $VERSION;      ## no critic (BuiltinFunctions::ProhibitStringyEval)
+
+# 5.004's Exporter doesn't have export_to_level.
+my $_export_to_level = sub {
+    my $pkg   = shift;
+    my $level = shift;
+    (undef) = shift;    # redundant arg
+    my $callpkg = caller($level);
+    $pkg->export( $callpkg, @_ );
+};
+
+#line 82
+
+sub import {
+    my($class) = shift;
+
+    # Don't run all this when loading ourself.
+    return 1 if $class eq 'Test::Builder::Module';
+
+    my $test = $class->builder;
+
+    my $caller = caller;
+
+    $test->exported_to($caller);
+
+    $class->import_extra( \@_ );
+    my(@imports) = $class->_strip_imports( \@_ );
+
+    $test->plan(@_);
+
+    $class->$_export_to_level( 1, $class, @imports );
+}
+
+sub _strip_imports {
+    my $class = shift;
+    my $list  = shift;
+
+    my @imports = ();
+    my @other   = ();
+    my $idx     = 0;
+    while( $idx <= $#{$list} ) {
+        my $item = $list->[$idx];
+
+        if( defined $item and $item eq 'import' ) {
+            push @imports, @{ $list->[ $idx + 1 ] };
+            $idx++;
+        }
+        else {
+            push @other, $item;
+        }
+
+        $idx++;
+    }
+
+    @$list = @other;
+
+    return @imports;
+}
+
+#line 145
+
+sub import_extra { }
+
+#line 175
+
+sub builder {
+    return Test::Builder->new;
+}
+
+1;
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/More.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/More.pm
new file mode 100644
index 0000000..9e98a6a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/inc/Test/More.pm
@@ -0,0 +1,735 @@
+#line 1
+package Test::More;
+
+use 5.006;
+use strict;
+use warnings;
+
+#---- perlcritic exemptions. ----#
+
+# We use a lot of subroutine prototypes
+## no critic (Subroutines::ProhibitSubroutinePrototypes)
+
+# Can't use Carp because it might cause use_ok() to accidentally succeed
+# even though the module being used forgot to use Carp.  Yes, this
+# actually happened.
+sub _carp {
+    my( $file, $line ) = ( caller(1) )[ 1, 2 ];
+    return warn @_, " at $file line $line\n";
+}
+
+our $VERSION = '0.92';
+$VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
+
+use Test::Builder::Module;
+our @ISA    = qw(Test::Builder::Module);
+our @EXPORT = qw(ok use_ok require_ok
+  is isnt like unlike is_deeply
+  cmp_ok
+  skip todo todo_skip
+  pass fail
+  eq_array eq_hash eq_set
+  $TODO
+  plan
+  done_testing
+  can_ok isa_ok new_ok
+  diag note explain
+  BAIL_OUT
+);
+
+#line 163
+
+sub plan {
+    my $tb = Test::More->builder;
+
+    return $tb->plan(@_);
+}
+
+# This implements "use Test::More 'no_diag'" but the behavior is
+# deprecated.
+sub import_extra {
+    my $class = shift;
+    my $list  = shift;
+
+    my @other = ();
+    my $idx   = 0;
+    while( $idx <= $#{$list} ) {
+        my $item = $list->[$idx];
+
+        if( defined $item and $item eq 'no_diag' ) {
+            $class->builder->no_diag(1);
+        }
+        else {
+            push @other, $item;
+        }
+
+        $idx++;
+    }
+
+    @$list = @other;
+
+    return;
+}
+
+#line 216
+
+sub done_testing {
+    my $tb = Test::More->builder;
+    $tb->done_testing(@_);
+}
+
+#line 289
+
+sub ok ($;$) {
+    my( $test, $name ) = @_;
+    my $tb = Test::More->builder;
+
+    return $tb->ok( $test, $name );
+}
+
+#line 367
+
+sub is ($$;$) {
+    my $tb = Test::More->builder;
+
+    return $tb->is_eq(@_);
+}
+
+sub isnt ($$;$) {
+    my $tb = Test::More->builder;
+
+    return $tb->isnt_eq(@_);
+}
+
+*isn't = \&isnt;
+
+#line 411
+
+sub like ($$;$) {
+    my $tb = Test::More->builder;
+
+    return $tb->like(@_);
+}
+
+#line 426
+
+sub unlike ($$;$) {
+    my $tb = Test::More->builder;
+
+    return $tb->unlike(@_);
+}
+
+#line 471
+
+sub cmp_ok($$$;$) {
+    my $tb = Test::More->builder;
+
+    return $tb->cmp_ok(@_);
+}
+
+#line 506
+
+sub can_ok ($@) {
+    my( $proto, @methods ) = @_;
+    my $class = ref $proto || $proto;
+    my $tb = Test::More->builder;
+
+    unless($class) {
+        my $ok = $tb->ok( 0, "->can(...)" );
+        $tb->diag('    can_ok() called with empty class or reference');
+        return $ok;
+    }
+
+    unless(@methods) {
+        my $ok = $tb->ok( 0, "$class->can(...)" );
+        $tb->diag('    can_ok() called with no methods');
+        return $ok;
+    }
+
+    my @nok = ();
+    foreach my $method (@methods) {
+        $tb->_try( sub { $proto->can($method) } ) or push @nok, $method;
+    }
+
+    my $name = (@methods == 1) ? "$class->can('$methods[0]')" :
+                                 "$class->can(...)"           ;
+
+    my $ok = $tb->ok( !@nok, $name );
+
+    $tb->diag( map "    $class->can('$_') failed\n", @nok );
+
+    return $ok;
+}
+
+#line 572
+
+sub isa_ok ($$;$) {
+    my( $object, $class, $obj_name ) = @_;
+    my $tb = Test::More->builder;
+
+    my $diag;
+
+    if( !defined $object ) {
+        $obj_name = 'The thing' unless defined $obj_name;
+        $diag = "$obj_name isn't defined";
+    }
+    else {
+        my $whatami = ref $object ? 'object' : 'class';
+        # We can't use UNIVERSAL::isa because we want to honor isa() overrides
+        my( $rslt, $error ) = $tb->_try( sub { $object->isa($class) } );
+        if($error) {
+            if( $error =~ /^Can't call method "isa" on unblessed reference/ ) {
+                # Its an unblessed reference
+                $obj_name = 'The reference' unless defined $obj_name;
+                if( !UNIVERSAL::isa( $object, $class ) ) {
+                    my $ref = ref $object;
+                    $diag = "$obj_name isn't a '$class' it's a '$ref'";
+                }
+            }
+            elsif( $error =~ /Can't call method "isa" without a package/ ) {
+                # It's something that can't even be a class
+                $diag = "$obj_name isn't a class or reference";
+            }
+            else {
+                die <<WHOA;
+WHOA! I tried to call ->isa on your $whatami and got some weird error.
+Here's the error.
+$error
+WHOA
+            }
+        }
+        else {
+            $obj_name = "The $whatami" unless defined $obj_name;
+            if( !$rslt ) {
+                my $ref = ref $object;
+                $diag = "$obj_name isn't a '$class' it's a '$ref'";
+            }
+        }
+    }
+
+    my $name = "$obj_name isa $class";
+    my $ok;
+    if($diag) {
+        $ok = $tb->ok( 0, $name );
+        $tb->diag("    $diag\n");
+    }
+    else {
+        $ok = $tb->ok( 1, $name );
+    }
+
+    return $ok;
+}
+
+#line 650
+
+sub new_ok {
+    my $tb = Test::More->builder;
+    $tb->croak("new_ok() must be given at least a class") unless @_;
+
+    my( $class, $args, $object_name ) = @_;
+
+    $args ||= [];
+    $object_name = "The object" unless defined $object_name;
+
+    my $obj;
+    my( $success, $error ) = $tb->_try( sub { $obj = $class->new(@$args); 1 } );
+    if($success) {
+        local $Test::Builder::Level = $Test::Builder::Level + 1;
+        isa_ok $obj, $class, $object_name;
+    }
+    else {
+        $tb->ok( 0, "new() died" );
+        $tb->diag("    Error was:  $error");
+    }
+
+    return $obj;
+}
+
+#line 690
+
+sub pass (;$) {
+    my $tb = Test::More->builder;
+
+    return $tb->ok( 1, @_ );
+}
+
+sub fail (;$) {
+    my $tb = Test::More->builder;
+
+    return $tb->ok( 0, @_ );
+}
+
+#line 753
+
+sub use_ok ($;@) {
+    my( $module, @imports ) = @_;
+    @imports = () unless @imports;
+    my $tb = Test::More->builder;
+
+    my( $pack, $filename, $line ) = caller;
+
+    my $code;
+    if( @imports == 1 and $imports[0] =~ /^\d+(?:\.\d+)?$/ ) {
+        # probably a version check.  Perl needs to see the bare number
+        # for it to work with non-Exporter based modules.
+        $code = <<USE;
+package $pack;
+use $module $imports[0];
+1;
+USE
+    }
+    else {
+        $code = <<USE;
+package $pack;
+use $module \@{\$args[0]};
+1;
+USE
+    }
+
+    my( $eval_result, $eval_error ) = _eval( $code, \@imports );
+    my $ok = $tb->ok( $eval_result, "use $module;" );
+
+    unless($ok) {
+        chomp $eval_error;
+        $@ =~ s{^BEGIN failed--compilation aborted at .*$}
+                {BEGIN failed--compilation aborted at $filename line $line.}m;
+        $tb->diag(<<DIAGNOSTIC);
+    Tried to use '$module'.
+    Error:  $eval_error
+DIAGNOSTIC
+
+    }
+
+    return $ok;
+}
+
+sub _eval {
+    my( $code, @args ) = @_;
+
+    # Work around oddities surrounding resetting of $@ by immediately
+    # storing it.
+    my( $sigdie, $eval_result, $eval_error );
+    {
+        local( $@, $!, $SIG{__DIE__} );    # isolate eval
+        $eval_result = eval $code;              ## no critic (BuiltinFunctions::ProhibitStringyEval)
+        $eval_error  = $@;
+        $sigdie      = $SIG{__DIE__} || undef;
+    }
+    # make sure that $code got a chance to set $SIG{__DIE__}
+    $SIG{__DIE__} = $sigdie if defined $sigdie;
+
+    return( $eval_result, $eval_error );
+}
+
+#line 822
+
+sub require_ok ($) {
+    my($module) = shift;
+    my $tb = Test::More->builder;
+
+    my $pack = caller;
+
+    # Try to deterine if we've been given a module name or file.
+    # Module names must be barewords, files not.
+    $module = qq['$module'] unless _is_module_name($module);
+
+    my $code = <<REQUIRE;
+package $pack;
+require $module;
+1;
+REQUIRE
+
+    my( $eval_result, $eval_error ) = _eval($code);
+    my $ok = $tb->ok( $eval_result, "require $module;" );
+
+    unless($ok) {
+        chomp $eval_error;
+        $tb->diag(<<DIAGNOSTIC);
+    Tried to require '$module'.
+    Error:  $eval_error
+DIAGNOSTIC
+
+    }
+
+    return $ok;
+}
+
+sub _is_module_name {
+    my $module = shift;
+
+    # Module names start with a letter.
+    # End with an alphanumeric.
+    # The rest is an alphanumeric or ::
+    $module =~ s/\b::\b//g;
+
+    return $module =~ /^[a-zA-Z]\w*$/ ? 1 : 0;
+}
+
+#line 899
+
+our( @Data_Stack, %Refs_Seen );
+my $DNE = bless [], 'Does::Not::Exist';
+
+sub _dne {
+    return ref $_[0] eq ref $DNE;
+}
+
+## no critic (Subroutines::RequireArgUnpacking)
+sub is_deeply {
+    my $tb = Test::More->builder;
+
+    unless( @_ == 2 or @_ == 3 ) {
+        my $msg = <<'WARNING';
+is_deeply() takes two or three args, you gave %d.
+This usually means you passed an array or hash instead 
+of a reference to it
+WARNING
+        chop $msg;    # clip off newline so carp() will put in line/file
+
+        _carp sprintf $msg, scalar @_;
+
+        return $tb->ok(0);
+    }
+
+    my( $got, $expected, $name ) = @_;
+
+    $tb->_unoverload_str( \$expected, \$got );
+
+    my $ok;
+    if( !ref $got and !ref $expected ) {    # neither is a reference
+        $ok = $tb->is_eq( $got, $expected, $name );
+    }
+    elsif( !ref $got xor !ref $expected ) {    # one's a reference, one isn't
+        $ok = $tb->ok( 0, $name );
+        $tb->diag( _format_stack({ vals => [ $got, $expected ] }) );
+    }
+    else {                                     # both references
+        local @Data_Stack = ();
+        if( _deep_check( $got, $expected ) ) {
+            $ok = $tb->ok( 1, $name );
+        }
+        else {
+            $ok = $tb->ok( 0, $name );
+            $tb->diag( _format_stack(@Data_Stack) );
+        }
+    }
+
+    return $ok;
+}
+
+sub _format_stack {
+    my(@Stack) = @_;
+
+    my $var       = '$FOO';
+    my $did_arrow = 0;
+    foreach my $entry (@Stack) {
+        my $type = $entry->{type} || '';
+        my $idx = $entry->{'idx'};
+        if( $type eq 'HASH' ) {
+            $var .= "->" unless $did_arrow++;
+            $var .= "{$idx}";
+        }
+        elsif( $type eq 'ARRAY' ) {
+            $var .= "->" unless $did_arrow++;
+            $var .= "[$idx]";
+        }
+        elsif( $type eq 'REF' ) {
+            $var = "\${$var}";
+        }
+    }
+
+    my @vals = @{ $Stack[-1]{vals} }[ 0, 1 ];
+    my @vars = ();
+    ( $vars[0] = $var ) =~ s/\$FOO/     \$got/;
+    ( $vars[1] = $var ) =~ s/\$FOO/\$expected/;
+
+    my $out = "Structures begin differing at:\n";
+    foreach my $idx ( 0 .. $#vals ) {
+        my $val = $vals[$idx];
+        $vals[$idx]
+          = !defined $val ? 'undef'
+          : _dne($val)    ? "Does not exist"
+          : ref $val      ? "$val"
+          :                 "'$val'";
+    }
+
+    $out .= "$vars[0] = $vals[0]\n";
+    $out .= "$vars[1] = $vals[1]\n";
+
+    $out =~ s/^/    /msg;
+    return $out;
+}
+
+sub _type {
+    my $thing = shift;
+
+    return '' if !ref $thing;
+
+    for my $type (qw(ARRAY HASH REF SCALAR GLOB CODE Regexp)) {
+        return $type if UNIVERSAL::isa( $thing, $type );
+    }
+
+    return '';
+}
+
+#line 1059
+
+sub diag {
+    return Test::More->builder->diag(@_);
+}
+
+sub note {
+    return Test::More->builder->note(@_);
+}
+
+#line 1085
+
+sub explain {
+    return Test::More->builder->explain(@_);
+}
+
+#line 1151
+
+## no critic (Subroutines::RequireFinalReturn)
+sub skip {
+    my( $why, $how_many ) = @_;
+    my $tb = Test::More->builder;
+
+    unless( defined $how_many ) {
+        # $how_many can only be avoided when no_plan is in use.
+        _carp "skip() needs to know \$how_many tests are in the block"
+          unless $tb->has_plan eq 'no_plan';
+        $how_many = 1;
+    }
+
+    if( defined $how_many and $how_many =~ /\D/ ) {
+        _carp
+          "skip() was passed a non-numeric number of tests.  Did you get the arguments backwards?";
+        $how_many = 1;
+    }
+
+    for( 1 .. $how_many ) {
+        $tb->skip($why);
+    }
+
+    no warnings 'exiting';
+    last SKIP;
+}
+
+#line 1238
+
+sub todo_skip {
+    my( $why, $how_many ) = @_;
+    my $tb = Test::More->builder;
+
+    unless( defined $how_many ) {
+        # $how_many can only be avoided when no_plan is in use.
+        _carp "todo_skip() needs to know \$how_many tests are in the block"
+          unless $tb->has_plan eq 'no_plan';
+        $how_many = 1;
+    }
+
+    for( 1 .. $how_many ) {
+        $tb->todo_skip($why);
+    }
+
+    no warnings 'exiting';
+    last TODO;
+}
+
+#line 1293
+
+sub BAIL_OUT {
+    my $reason = shift;
+    my $tb     = Test::More->builder;
+
+    $tb->BAIL_OUT($reason);
+}
+
+#line 1332
+
+#'#
+sub eq_array {
+    local @Data_Stack = ();
+    _deep_check(@_);
+}
+
+sub _eq_array {
+    my( $a1, $a2 ) = @_;
+
+    if( grep _type($_) ne 'ARRAY', $a1, $a2 ) {
+        warn "eq_array passed a non-array ref";
+        return 0;
+    }
+
+    return 1 if $a1 eq $a2;
+
+    my $ok = 1;
+    my $max = $#$a1 > $#$a2 ? $#$a1 : $#$a2;
+    for( 0 .. $max ) {
+        my $e1 = $_ > $#$a1 ? $DNE : $a1->[$_];
+        my $e2 = $_ > $#$a2 ? $DNE : $a2->[$_];
+
+        push @Data_Stack, { type => 'ARRAY', idx => $_, vals => [ $e1, $e2 ] };
+        $ok = _deep_check( $e1, $e2 );
+        pop @Data_Stack if $ok;
+
+        last unless $ok;
+    }
+
+    return $ok;
+}
+
+sub _deep_check {
+    my( $e1, $e2 ) = @_;
+    my $tb = Test::More->builder;
+
+    my $ok = 0;
+
+    # Effectively turn %Refs_Seen into a stack.  This avoids picking up
+    # the same referenced used twice (such as [\$a, \$a]) to be considered
+    # circular.
+    local %Refs_Seen = %Refs_Seen;
+
+    {
+        # Quiet uninitialized value warnings when comparing undefs.
+        no warnings 'uninitialized';
+
+        $tb->_unoverload_str( \$e1, \$e2 );
+
+        # Either they're both references or both not.
+        my $same_ref = !( !ref $e1 xor !ref $e2 );
+        my $not_ref = ( !ref $e1 and !ref $e2 );
+
+        if( defined $e1 xor defined $e2 ) {
+            $ok = 0;
+        }
+        elsif( !defined $e1 and !defined $e2 ) {
+            # Shortcut if they're both defined.
+            $ok = 1;
+        }
+        elsif( _dne($e1) xor _dne($e2) ) {
+            $ok = 0;
+        }
+        elsif( $same_ref and( $e1 eq $e2 ) ) {
+            $ok = 1;
+        }
+        elsif($not_ref) {
+            push @Data_Stack, { type => '', vals => [ $e1, $e2 ] };
+            $ok = 0;
+        }
+        else {
+            if( $Refs_Seen{$e1} ) {
+                return $Refs_Seen{$e1} eq $e2;
+            }
+            else {
+                $Refs_Seen{$e1} = "$e2";
+            }
+
+            my $type = _type($e1);
+            $type = 'DIFFERENT' unless _type($e2) eq $type;
+
+            if( $type eq 'DIFFERENT' ) {
+                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
+                $ok = 0;
+            }
+            elsif( $type eq 'ARRAY' ) {
+                $ok = _eq_array( $e1, $e2 );
+            }
+            elsif( $type eq 'HASH' ) {
+                $ok = _eq_hash( $e1, $e2 );
+            }
+            elsif( $type eq 'REF' ) {
+                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
+                $ok = _deep_check( $$e1, $$e2 );
+                pop @Data_Stack if $ok;
+            }
+            elsif( $type eq 'SCALAR' ) {
+                push @Data_Stack, { type => 'REF', vals => [ $e1, $e2 ] };
+                $ok = _deep_check( $$e1, $$e2 );
+                pop @Data_Stack if $ok;
+            }
+            elsif($type) {
+                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
+                $ok = 0;
+            }
+            else {
+                _whoa( 1, "No type in _deep_check" );
+            }
+        }
+    }
+
+    return $ok;
+}
+
+sub _whoa {
+    my( $check, $desc ) = @_;
+    if($check) {
+        die <<"WHOA";
+WHOA!  $desc
+This should never happen!  Please contact the author immediately!
+WHOA
+    }
+}
+
+#line 1465
+
+sub eq_hash {
+    local @Data_Stack = ();
+    return _deep_check(@_);
+}
+
+sub _eq_hash {
+    my( $a1, $a2 ) = @_;
+
+    if( grep _type($_) ne 'HASH', $a1, $a2 ) {
+        warn "eq_hash passed a non-hash ref";
+        return 0;
+    }
+
+    return 1 if $a1 eq $a2;
+
+    my $ok = 1;
+    my $bigger = keys %$a1 > keys %$a2 ? $a1 : $a2;
+    foreach my $k ( keys %$bigger ) {
+        my $e1 = exists $a1->{$k} ? $a1->{$k} : $DNE;
+        my $e2 = exists $a2->{$k} ? $a2->{$k} : $DNE;
+
+        push @Data_Stack, { type => 'HASH', idx => $k, vals => [ $e1, $e2 ] };
+        $ok = _deep_check( $e1, $e2 );
+        pop @Data_Stack if $ok;
+
+        last unless $ok;
+    }
+
+    return $ok;
+}
+
+#line 1522
+
+sub eq_set {
+    my( $a1, $a2 ) = @_;
+    return 0 unless @$a1 == @$a2;
+
+    no warnings 'uninitialized';
+
+    # It really doesn't matter how we sort them, as long as both arrays are
+    # sorted with the same algorithm.
+    #
+    # Ensure that references are not accidentally treated the same as a
+    # string containing the reference.
+    #
+    # Have to inline the sort routine due to a threading/sort bug.
+    # See [rt.cpan.org 6782]
+    #
+    # I don't know how references would be sorted so we just don't sort
+    # them.  This means eq_set doesn't really work with refs.
+    return eq_array(
+        [ grep( ref, @$a1 ), sort( grep( !ref, @$a1 ) ) ],
+        [ grep( ref, @$a2 ), sort( grep( !ref, @$a2 ) ) ],
+    );
+}
+
+#line 1735
+
+1;
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx.pm
new file mode 100644
index 0000000..0a1408e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx.pm
@@ -0,0 +1,315 @@
+package Test::Nginx;
+
+use strict;
+use warnings;
+
+our $VERSION = '0.17';
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+Test::Nginx - Testing modules for Nginx C module development
+
+=head1 DESCRIPTION
+
+This distribution provides two testing modules for Nginx C module development:
+
+=over
+
+=item *
+
+L<Test::Nginx::LWP>
+
+=item *
+
+L<Test::Nginx::Socket>
+
+=back
+
+All of them are based on L<Test::Base>.
+
+Usually, L<Test::Nginx::Socket> is preferred because it works on a much lower
+level and not that fault tolerant like L<Test::Nginx::LWP>.
+
+Also, a lot of connection hang issues (like wrong C<< r->main->count >> value in nginx
+0.8.x) can only be captured by L<Test::Nginx::Socket> because Perl's L<LWP::UserAgent> client
+will close the connection itself which will conceal such issues from
+the testers.
+
+Test::Nginx automatically starts an nginx instance (from the C<PATH> env)
+rooted at t/servroot/ and the default config template makes this nginx
+instance listen on the port C<1984> by default. One can specify a different
+port number by setting his port number to the C<TEST_NGINX_PORT> environment,
+as in
+
+    export TEST_NGINX_PORT=1989
+
+=head2 etcproxy integration
+
+The default settings in etcproxy (https://github.com/chaoslawful/etcproxy)
+makes this small TCP proxy split the TCP packets into bytes and introduce 1 ms latency among them.
+
+There's usually various TCP chains that we can put etcproxy into, for example
+
+=head3 Test::Nginx <=> nginx
+
+  $ ./etcproxy 1234 1984
+
+Here we tell etcproxy to listen on port 1234 and to delegate all the
+TCP traffic to the port 1984, the default port that Test::Nginx makes
+nginx listen to.
+
+And then we tell Test::Nginx to test against the port 1234, where
+etcproxy listens on, rather than the port 1984 that nginx directly
+listens on:
+
+  $ TEST_NGINX_CLIENT_PORT=1234 prove -r t/
+
+Then the TCP chain now looks like this:
+
+  Test::Nginx <=> etcproxy (1234) <=> nginx (1984)
+
+So etcproxy can effectively emulate extreme network conditions and
+exercise "unusual" code paths in your nginx server by your tests.
+
+In practice, *tons* of weird bugs can be captured by this setting.
+Even ourselves didn't expect that this simple approach is so
+effective.
+
+=head3 nginx <=> memcached
+
+We first start the memcached server daemon on port 11211:
+
+   memcached -p 11211 -vv
+
+and then we another etcproxy instance to listen on port 11984 like this
+
+   $ ./etcproxy 11984 11211
+
+Then we tell our t/foo.t test script to connect to 11984 rather than 11211:
+
+  # foo.t
+  use Test::Nginx::Socket;
+  repeat_each(1);
+  plan tests => 2 * repeat_each() * blocks();
+  $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;  # make this env take a default value
+  run_tests();
+
+  __DATA__
+
+  === TEST 1: sanity
+  --- config
+  location /foo {
+       set $memc_cmd set;
+       set $memc_key foo;
+       set $memc_value bar;
+       memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+  }
+  --- request
+      GET /foo
+  --- response_body_like: STORED
+
+The Test::Nginx library will automatically expand the special macro
+C<$TEST_NGINX_MEMCACHED_PORT> to the environment with the same name.
+You can define your own C<$TEST_NGINX_BLAH_BLAH_PORT> macros as long as
+its prefix is C<TEST_NGINX_> and all in upper case letters.
+
+And now we can run your test script against the etcproxy port 11984:
+
+   TEST_NGINX_MEMCACHED_PORT=11984 prove t/foo.t
+
+Then the TCP chains look like this:
+
+   Test::Nginx <=> nginx (1984) <=> etcproxy (11984) <=> memcached (11211)
+
+If C<TEST_NGINX_MEMCACHED_PORT> is not set, then it will take the default
+value 11211, which is what we want when there's no etcproxy
+configured:
+
+   Test::Nginx <=> nginx (1984) <=> memcached (11211)
+
+This approach also works for proxied mysql and postgres traffic.
+Please see the live test suite of ngx_drizzle and ngx_postgres for
+more details.
+
+Usually we set both C<TEST_NGINX_CLIENT_PORT> and
+C<TEST_NGINX_MEMCACHED_PORT> (and etc) at the same time, effectively
+yielding the following chain:
+
+   Test::Nginx <=> etcproxy (1234) <=> nginx (1984) <=> etcproxy (11984) <=> memcached (11211)
+
+as long as you run two separate etcproxy instances in two separate terminals.
+
+It's easy to verify if the traffic actually goes through your etcproxy
+server. Just check if the terminal running etcproxy emits outputs. By
+default, etcproxy always dump out the incoming and outgoing data to
+stdout/stderr.
+
+=head2 valgrind integration
+
+Test::Nginx has integrated support for valgrind (L<http://valgrind.org>) even though by
+default it does not bother running it with the tests because valgrind
+will significantly slow down the test sutie.
+
+First ensure that your valgrind executable visible in your PATH env.
+And then run your test suite with the C<TEST_NGINX_USE_VALGRIND> env set
+to true:
+
+   TEST_NGINX_USE_VALGRIND=1 prove -r t
+
+If you see false alarms, you do have a chance to skip them by defining
+a ./valgrind.suppress file at the root of your module source tree, as
+in
+
+L<https://github.com/chaoslawful/drizzle-nginx-module/blob/master/valgrind.suppress>
+
+This is the suppression file for ngx_drizzle. Test::Nginx will
+automatically use it to start nginx with valgrind memcheck if this
+file does exist at the expected location.
+
+If you do see a lot of "Connection refused" errors while running the
+tests this way, then you probably have a slow machine (or a very busy
+one) that the default waiting time is not sufficient for valgrind to
+start. You can define the sleep time to a larger value by setting the
+C<TEST_NGINX_SLEEP> env:
+
+   TEST_NGINX_SLEEP=1 prove -r t
+
+The time unit used here is "second". The default sleep setting just
+fits my ThinkPad (C<Core2Duo T9600>).
+
+Applying the no-pool patch to your nginx core is recommended while
+running nginx with valgrind:
+
+L<https://github.com/shrimp/no-pool-nginx>
+
+The nginx memory pool can prevent valgrind from spotting lots of
+invalid memory reads/writes as well as certain double-free errors. We
+did find a lot more memory issues in many of our modules when we first
+introduced the no-pool patch in practice ;)
+
+There's also more advanced features in Test::Nginx that have never
+documented. I'd like to write more about them in the near future ;)
+
+
+=head1 Nginx C modules that use Test::Nginx to drive their test suites
+
+=over
+
+=item ngx_echo
+
+L<http://github.com/agentzh/echo-nginx-module>
+
+=item ngx_headers_more
+
+L<http://github.com/agentzh/headers-more-nginx-module>
+
+=item ngx_chunkin
+
+L<http://wiki.nginx.org/NginxHttpChunkinModule>
+
+=item ngx_memc
+
+L<http://wiki.nginx.org/NginxHttpMemcModule>
+
+=item ngx_drizzle
+
+L<http://github.com/chaoslawful/drizzle-nginx-module>
+
+=item ngx_rds_json
+
+L<http://github.com/agentzh/rds-json-nginx-module>
+
+=item ngx_xss
+
+L<http://github.com/agentzh/xss-nginx-module>
+
+=item ngx_srcache
+
+L<http://github.com/agentzh/srcache-nginx-module>
+
+=item ngx_lua
+
+L<http://github.com/chaoslawful/lua-nginx-module>
+
+=item ngx_set_misc
+
+L<http://github.com/agentzh/set-misc-nginx-module>
+
+=item ngx_array_var
+
+L<http://github.com/agentzh/array-var-nginx-module>
+
+=item ngx_form_input
+
+L<http://github.com/calio/form-input-nginx-module>
+
+=item ngx_iconv
+
+L<http://github.com/calio/iconv-nginx-module>
+
+=item ngx_set_cconv
+
+L<http://github.com/liseen/set-cconv-nginx-module>
+
+=item ngx_postgres
+
+L<http://github.com/FRiCKLE/ngx_postgres>
+
+=item ngx_coolkit
+
+L<http://github.com/FRiCKLE/ngx_coolkit>
+
+=back
+
+=head1 SOURCE REPOSITORY
+
+This module has a Git repository on Github, which has access for all.
+
+    http://github.com/agentzh/test-nginx
+
+If you want a commit bit, feel free to drop me a line.
+
+=head1 AUTHORS
+
+agentzh (章亦春) C<< <agentzh@gmail.com> >>
+
+Antoine BONAVITA C<< <antoine.bonavita@gmail.com> >>
+
+=head1 COPYRIGHT & LICENSE
+
+Copyright (c) 2009-2011, Taobao Inc., Alibaba Group (L<http://www.taobao.com>).
+
+Copyright (c) 2009-2011, agentzh C<< <agentzh@gmail.com> >>.
+
+Copyright (c) 2011, Antoine Bonavita C<< <antoine.bonavita@gmail.com> >>.
+
+This module is licensed under the terms of the BSD license.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+=over
+
+=item *
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+=item *
+
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+=item *
+
+Neither the name of the Taobao Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
+
+=back
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+=head1 SEE ALSO
+
+L<Test::Nginx::LWP>, L<Test::Nginx::Socket>, L<Test::Base>.
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/LWP.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/LWP.pm
new file mode 100644
index 0000000..53f6c85
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/LWP.pm
@@ -0,0 +1,524 @@
+package Test::Nginx::LWP;
+
+use lib 'lib';
+use lib 'inc';
+use Test::Base -Base;
+
+our $VERSION = '0.17';
+
+our $NoLongString;
+
+use LWP::UserAgent;
+use Time::HiRes qw(sleep);
+use Test::LongString;
+use Test::Nginx::Util qw(
+    setup_server_root
+    write_config_file
+    get_canon_version
+    get_nginx_version
+    trim
+    show_all_chars
+    parse_headers
+    run_tests
+    $ServerPortForClient
+    $PidFile
+    $ServRoot
+    $ConfFile
+    $ServerPort
+    $RunTestHelper
+    $NoNginxManager
+    $RepeatEach
+    worker_connections
+    master_process_enabled
+    config_preamble
+    repeat_each
+    no_shuffle
+    no_root_location
+);
+
+our $UserAgent = LWP::UserAgent->new;
+$UserAgent->agent(__PACKAGE__);
+#$UserAgent->default_headers(HTTP::Headers->new);
+
+#use Smart::Comments::JSON '##';
+
+our @EXPORT = qw( plan run_tests run_test
+    repeat_each config_preamble worker_connections
+    master_process_enabled
+    no_long_string no_shuffle no_root_location);
+
+sub no_long_string () {
+    $NoLongString = 1;
+}
+
+sub run_test_helper ($$);
+
+$RunTestHelper = \&run_test_helper;
+
+sub parse_request ($$) {
+    my ($name, $rrequest) = @_;
+    open my $in, '<', $rrequest;
+    my $first = <$in>;
+    if (!$first) {
+        Test::More::BAIL_OUT("$name - Request line should be non-empty");
+        die;
+    }
+    $first =~ s/^\s+|\s+$//g;
+    my ($meth, $rel_url) = split /\s+/, $first, 2;
+    my $url = "http://localhost:$ServerPortForClient" . $rel_url;
+
+    my $content = do { local $/; <$in> };
+    if ($content) {
+        $content =~ s/^\s+|\s+$//s;
+    }
+
+    close $in;
+
+    return {
+        method  => $meth,
+        url     => $url,
+        content => $content,
+    };
+}
+
+sub chunk_it ($$$) {
+    my ($chunks, $start_delay, $middle_delay) = @_;
+    my $i = 0;
+    return sub {
+        if ($i == 0) {
+            if ($start_delay) {
+                sleep($start_delay);
+            }
+        } elsif ($middle_delay) {
+            sleep($middle_delay);
+        }
+        return $chunks->[$i++];
+    }
+}
+
+sub run_test_helper ($$) {
+    my ($block, $dry_run) = @_;
+
+    my $request = $block->request;
+
+    my $name = $block->name;
+    #if (defined $TODO) {
+    #$name .= "# $TODO";
+    #}
+
+    my $req_spec = parse_request($name, \$request);
+    ## $req_spec
+    my $method = $req_spec->{method};
+    my $req = HTTP::Request->new($method);
+    my $content = $req_spec->{content};
+
+    if (defined ($block->request_headers)) {
+        my $headers = parse_headers($block->request_headers);
+        while (my ($key, $val) = each %$headers) {
+            $req->header($key => $val);
+        }
+    }
+
+    #$req->header('Accept', '*/*');
+    $req->url($req_spec->{url});
+    if ($content) {
+        if ($method eq 'GET' or $method eq 'HEAD') {
+            croak "HTTP 1.0/1.1 $method request should not have content: $content";
+        }
+        $req->content($content);
+    } elsif ($method eq 'POST' or $method eq 'PUT') {
+        my $chunks = $block->chunked_body;
+        if (defined $chunks) {
+            if (!ref $chunks or ref $chunks ne 'ARRAY') {
+
+                Test::More::BAIL_OUT("$name - --- chunked_body should takes a Perl array ref as its value");
+            }
+
+            my $start_delay = $block->start_chunk_delay || 0;
+            my $middle_delay = $block->middle_chunk_delay || 0;
+            $req->content(chunk_it($chunks, $start_delay, $middle_delay));
+            if (!defined $req->header('Content-Type')) {
+                $req->header('Content-Type' => 'text/plain');
+            }
+        } else {
+            if (!defined $req->header('Content-Type')) {
+                $req->header('Content-Type' => 'text/plain');
+            }
+
+            $req->header('Content-Length' => 0);
+        }
+    }
+
+    if ($block->more_headers) {
+        my @headers = split /\n+/, $block->more_headers;
+        for my $header (@headers) {
+            next if $header =~ /^\s*\#/;
+            my ($key, $val) = split /:\s*/, $header, 2;
+            #warn "[$key, $val]\n";
+            $req->header($key => $val);
+        }
+    }
+
+    #warn "req: ", $req->as_string, "\n";
+    #warn "DONE!!!!!!!!!!!!!!!!!!!!";
+
+    my $res = HTTP::Response->new;
+    unless ($dry_run) {
+        $res = $UserAgent->request($req);
+    }
+
+    #warn "res returned!!!";
+
+    if ($dry_run) {
+        SKIP: {
+            Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
+        }
+    } else {
+        if (defined $block->error_code) {
+            is($res->code, $block->error_code, "$name - status code ok");
+        } else {
+            is($res->code, 200, "$name - status code ok");
+        }
+    }
+
+    if (defined $block->response_headers) {
+        my $headers = parse_headers($block->response_headers);
+        while (my ($key, $val) = each %$headers) {
+            my $expected_val = $res->header($key);
+            if (!defined $expected_val) {
+                $expected_val = '';
+            }
+            if ($dry_run) {
+                SKIP: {
+                    Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
+                }
+            } else {
+                is $expected_val, $val,
+                    "$name - header $key ok";
+            }
+        }
+    } elsif (defined $block->response_headers_like) {
+        my $headers = parse_headers($block->response_headers_like);
+        while (my ($key, $val) = each %$headers) {
+            my $expected_val = $res->header($key);
+            if (!defined $expected_val) {
+                $expected_val = '';
+            }
+            if ($dry_run) {
+                SKIP: {
+                    Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
+                }
+            } else {
+                like $expected_val, qr/^$val$/,
+                    "$name - header $key like ok";
+            }
+        }
+    }
+
+    if (defined $block->response_body) {
+        my $content = $res->content;
+        if (defined $content) {
+            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
+        }
+
+        $content =~ s/^Connection: TE, close\r\n//gms;
+        my $expected = $block->response_body;
+        $expected =~ s/\$ServerPort\b/$ServerPort/g;
+        $expected =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
+        #warn show_all_chars($content);
+
+        if ($dry_run) {
+            SKIP: {
+                Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
+            }
+        } else {
+            if ($NoLongString) {
+                is($content, $expected, "$name - response_body - response is expected");
+            } else {
+                is_string($content, $expected, "$name - response_body - response is expected");
+            }
+            #is($content, $expected, "$name - response_body - response is expected");
+        }
+
+    } elsif (defined $block->response_body_like) {
+        my $content = $res->content;
+        if (defined $content) {
+            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
+        }
+        $content =~ s/^Connection: TE, close\r\n//gms;
+        my $expected_pat = $block->response_body_like;
+        $expected_pat =~ s/\$ServerPort\b/$ServerPort/g;
+        $expected_pat =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
+        my $summary = trim($content);
+
+        if ($dry_run) {
+            SKIP: {
+                Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
+            }
+        } else {
+            like($content, qr/$expected_pat/s, "$name - response_body_like - response is expected ($summary)");
+        }
+    } elsif (defined $block->response_body_unlike) {
+        my $content = $res->content;
+        if (defined $content) {
+            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
+        }
+        $content =~ s/^Connection: TE, close\r\n//gms;
+        my $expected_pat = $block->response_body_unlike;
+        $expected_pat =~ s/\$ServerPort\b/$ServerPort/g;
+        $expected_pat =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
+        my $summary = trim($content);
+
+        if ($dry_run) {
+            SKIP: {
+                Test::More::skip("$name - tests skipped due to the lack of directive $dry_run", 1);
+            }
+        } else {
+           unlike($content, qr/$expected_pat/s, "$name - response_body_like - response is expected ($summary)");
+        }
+    }
+}
+
+1;
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+Test::Nginx::LWP - LWP-backed test scaffold for the Nginx C modules
+
+=head1 SYNOPSIS
+
+    use Test::Nginx::LWP;
+
+    plan tests => $Test::Nginx::LWP::RepeatEach * 2 * blocks();
+
+    run_tests();
+
+    __DATA__
+
+    === TEST 1: sanity
+    --- config
+        location /echo {
+            echo_before_body hello;
+            echo world;
+        }
+    --- request
+        GET /echo
+    --- response_body
+    hello
+    world
+    --- error_code: 200
+
+
+    === TEST 2: set Server
+    --- config
+        location /foo {
+            echo hi;
+            more_set_headers 'Server: Foo';
+        }
+    --- request
+        GET /foo
+    --- response_headers
+    Server: Foo
+    --- response_body
+    hi
+
+
+    === TEST 3: clear Server
+    --- config
+        location /foo {
+            echo hi;
+            more_clear_headers 'Server: ';
+        }
+    --- request
+        GET /foo
+    --- response_headers_like
+    Server: nginx.*
+    --- response_body
+    hi
+
+
+    === TEST 4: set request header at client side and rewrite it
+    --- config
+        location /foo {
+            more_set_input_headers 'X-Foo: howdy';
+            echo $http_x_foo;
+        }
+    --- request
+        GET /foo
+    --- request_headers
+    X-Foo: blah
+    --- response_headers
+    X-Foo:
+    --- response_body
+    howdy
+
+
+    === TEST 3: rewrite content length
+    --- config
+        location /bar {
+            more_set_input_headers 'Content-Length: 2048';
+            echo_read_request_body;
+            echo_request_body;
+        }
+    --- request eval
+    "POST /bar\n" .
+    "a" x 4096
+    --- response_body eval
+    "a" x 2048
+
+
+    === TEST 4: timer without explicit reset
+    --- config
+        location /timer {
+            echo_sleep 0.03;
+            echo "elapsed $echo_timer_elapsed sec.";
+        }
+    --- request
+        GET /timer
+    --- response_body_like
+    ^elapsed 0\.0(2[6-9]|3[0-6]) sec\.$
+
+
+    === TEST 5: small buf (using 2-byte buf)
+    --- config
+        chunkin on;
+        location /main {
+            client_body_buffer_size    2;
+            echo "body:";
+            echo $echo_request_body;
+            echo_request_body;
+        }
+    --- request
+    POST /main
+    --- start_chunk_delay: 0.01
+    --- middle_chunk_delay: 0.01
+    --- chunked_body eval
+    ["hello", "world"]
+    --- error_code: 200
+    --- response_body eval
+    "body:
+
+    helloworld"
+
+=head1 DESCRIPTION
+
+This module provides a test scaffold based on L<LWP::UserAgent> for automated testing in Nginx C module development.
+
+This class inherits from L<Test::Base>, thus bringing all its
+declarative power to the Nginx C module testing practices.
+
+You need to terminate or kill any Nginx processes before running the test suite if you have changed the Nginx server binary. Normally it's as simple as
+
+  killall nginx
+  PATH=/path/to/your/nginx-with-memc-module:$PATH prove -r t
+
+This module will create a temporary server root under t/servroot/ of the current working directory and starts and uses the nginx executable in the PATH environment.
+
+You will often want to look into F<t/servroot/logs/error.log>
+when things go wrong ;)
+
+=head1 Sections supported
+
+The following sections are supported:
+
+=over
+
+=item config
+
+=item http_config
+
+=item request
+
+=item request_headers
+
+=item more_headers
+
+=item response_body
+
+=item response_body_like
+
+=item response_headers
+
+=item response_headers_like
+
+=item error_code
+
+=item chunked_body
+
+=item middle_chunk_delay
+
+=item start_chunk_delay
+
+=back
+
+=head1 Samples
+
+You'll find live samples in the following Nginx 3rd-party modules:
+
+=over
+
+=item ngx_echo
+
+L<http://wiki.nginx.org/NginxHttpEchoModule>
+
+=item ngx_headers_more
+
+L<http://wiki.nginx.org/NginxHttpHeadersMoreModule>
+
+=item ngx_chunkin
+
+L<http://wiki.nginx.org/NginxHttpChunkinModule>
+
+=item ngx_memc
+
+L<http://wiki.nginx.org/NginxHttpMemcModule>
+
+=back
+
+=head1 SOURCE REPOSITORY
+
+This module has a Git repository on Github, which has access for all.
+
+    http://github.com/agentzh/test-nginx
+
+If you want a commit bit, feel free to drop me a line.
+
+=head1 AUTHOR
+
+agentzh (章亦春) C<< <agentzh@gmail.com> >>
+
+=head1 COPYRIGHT & LICENSE
+
+Copyright (c) 2009-2011, Taobao Inc., Alibaba Group (L<http://www.taobao.com>).
+
+Copyright (c) 2009-2011, agentzh C<< <agentzh@gmail.com> >>.
+
+This module is licensed under the terms of the BSD license.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+=over
+
+=item *
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+=item *
+
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+=item *
+
+Neither the name of the Taobao Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
+
+=back
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+=head1 SEE ALSO
+
+L<Test::Nginx::Socket>, L<Test::Base>.
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/Socket.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/Socket.pm
new file mode 100644
index 0000000..833c00a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/Socket.pm
@@ -0,0 +1,1749 @@
+package Test::Nginx::Socket;
+
+use lib 'lib';
+use lib 'inc';
+
+use Test::Base -Base;
+
+our $VERSION = '0.17';
+
+use Encode;
+use Data::Dumper;
+use Time::HiRes qw(sleep time);
+use Test::LongString;
+use List::MoreUtils qw( any );
+use IO::Select ();
+
+our $ServerAddr = 'localhost';
+our $Timeout = $ENV{TEST_NGINX_TIMEOUT} || 2;
+
+use Test::Nginx::Util qw(
+  setup_server_root
+  write_config_file
+  get_canon_version
+  get_nginx_version
+  trim
+  show_all_chars
+  parse_headers
+  run_tests
+  $ServerPortForClient
+  $ServerPort
+  $PidFile
+  $ServRoot
+  $ConfFile
+  $RunTestHelper
+  $RepeatEach
+  worker_connections
+  master_process_enabled
+  config_preamble
+  repeat_each
+  workers
+  master_on
+  log_level
+  no_shuffle
+  no_root_location
+  server_root
+  html_dir
+  server_port
+  no_nginx_manager
+);
+
+#use Smart::Comments::JSON '###';
+use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
+use POSIX qw(EAGAIN);
+use IO::Socket;
+
+#our ($PrevRequest, $PrevConfig);
+
+our $NoLongString = undef;
+
+our @EXPORT = qw( plan run_tests run_test
+  repeat_each config_preamble worker_connections
+  master_process_enabled
+  no_long_string workers master_on
+  log_level no_shuffle no_root_location
+  server_addr server_root html_dir server_port
+  timeout no_nginx_manager
+);
+
+sub send_request ($$$$@);
+
+sub run_test_helper ($$);
+
+sub error_event_handler ($);
+sub read_event_handler ($);
+sub write_event_handler ($);
+
+sub no_long_string () {
+    $NoLongString = 1;
+}
+
+sub server_addr (@) {
+    if (@_) {
+
+        #warn "setting server addr to $_[0]\n";
+        $ServerAddr = shift;
+    }
+    else {
+        return $ServerAddr;
+    }
+}
+
+sub timeout (@) {
+    if (@_) {
+        $Timeout = shift;
+    }
+    else {
+        $Timeout;
+    }
+}
+
+$RunTestHelper = \&run_test_helper;
+
+#  This will parse a "request"" string. The expected format is:
+# - One line for the HTTP verb (POST, GET, etc.) plus optional relative URL
+#   (default is /) plus optional HTTP version (default is HTTP/1.1).
+# - More lines considered as the body of the request.
+# Most people don't care about headers and this is enough.
+#
+#  This function will return a reference to a hash with the parsed elements
+# plus information on the parsing itself like "how many white spaces were
+# skipped before the VERB" (skipped_before_method), "was the version provided"
+# (http_ver_size = 0).
+sub parse_request ($$) {
+    my ( $name, $rrequest ) = @_;
+    open my $in, '<', $rrequest;
+    my $first = <$in>;
+    if ( !$first ) {
+        Test::More::BAIL_OUT("$name - Request line should be non-empty");
+        die;
+    }
+    #$first =~ s/^\s+|\s+$//gs;
+    my ($before_meth, $meth, $after_meth);
+    my ($rel_url, $rel_url_size, $after_rel_url);
+    my ($http_ver, $http_ver_size, $after_http_ver);
+    my $end_line_size;
+    if ($first =~ /^(\s*)(\S+)( *)((\S+)( *))?((\S+)( *))?(\s*)/) {
+        $before_meth = defined $1 ? length($1) : undef;
+        $meth = $2;
+        $after_meth = defined $3 ? length($3) : undef;
+        $rel_url = $5;
+        $rel_url_size = defined $5 ? length($5) : undef;
+        $after_rel_url = defined $6 ? length($6) : undef;
+        $http_ver = $8;
+        if (!defined $8) {
+            $http_ver_size = undef;
+        } else {
+            $http_ver_size = defined $8 ? length($8) : undef;
+        }
+        if (!defined $9) {
+            $after_http_ver = undef;
+        } else {
+            $after_http_ver = defined $9 ? length($9) : undef;
+        }
+        $end_line_size = defined $10 ? length($10) : undef;
+    } else {
+        Test::More::BAIL_OUT("$name - Request line is not valid. Should be 'meth [url [version]]'");
+        die;
+    }
+    if ( !defined $rel_url ) {
+        $rel_url = '/';
+        $rel_url_size = 0;
+        $after_rel_url = 0;
+    }
+    if ( !defined $http_ver ) {
+        $http_ver = 'HTTP/1.1';
+        $http_ver_size = 0;
+        $after_http_ver = 0;
+    }
+
+    #my $url = "http://localhost:$ServerPortForClient" . $rel_url;
+
+    my $content = do { local $/; <$in> };
+    my $content_size;
+    if ( !defined $content ) {
+        $content = "";
+        $content_size = 0;
+    } else {
+        $content_size = length($content);
+    }
+
+    #warn Dumper($content);
+
+    close $in;
+
+    return {
+        method  => $meth,
+        url     => $rel_url,
+        content => $content,
+        http_ver => $http_ver,
+        skipped_before_method => $before_meth,
+        method_size => length($meth),
+        skipped_after_method => $after_meth,
+        url_size => $rel_url_size,
+        skipped_after_url => $after_rel_url,
+        http_ver_size => $http_ver_size,
+        skipped_after_http_ver => $after_http_ver + $end_line_size,
+        content_size => $content_size,
+    };
+}
+
+# From a parsed request, builds the "moves" to apply to the original request
+# to transform it (e.g. add missing version). Elements of the returned array
+# are of 2 types:
+# - d : number of characters to remove.
+# - s_* : number of characters (s_s) to replace by value (s_v).
+sub get_moves($) {
+    my ($parsed_req) = @_;
+    return ({d => $parsed_req->{skipped_before_method}},
+                          {s_s => $parsed_req->{method_size},
+                           s_v => $parsed_req->{method}},
+                          {d => $parsed_req->{skipped_after_method}},
+                          {s_s => $parsed_req->{url_size},
+                           s_v => $parsed_req->{url}},
+                          {d => $parsed_req->{skipped_after_url}},
+                          {s_s => $parsed_req->{http_ver_size},
+                           s_v => $parsed_req->{http_ver}},
+                          {d => $parsed_req->{skipped_after_http_ver}},
+                          {s_s => 0,
+                           s_v => $parsed_req->{headers}},
+                          {s_s => $parsed_req->{content_size},
+                           s_v => $parsed_req->{content}}
+                         );
+}
+
+#  Apply moves (see above) to an array of packets that correspond to a request.
+# The use of this function is explained in the build_request_from_packets
+# function.
+sub apply_moves($$) {
+    my ($r_packet, $r_move) = @_;
+    my $current_packet = shift @$r_packet;
+    my $current_move = shift @$r_move;
+    my $in_packet_cursor = 0;
+    my @result = ();
+    while (defined $current_packet) {
+        if (!defined $current_move) {
+            push @result, $current_packet;
+            $current_packet = shift @$r_packet;
+            $in_packet_cursor = 0;
+        } elsif (defined $current_move->{d}) {
+            # Remove stuff from packet
+            if ($current_move->{d} > length($current_packet) - $in_packet_cursor) {
+                # Eat up what is left of packet.
+                $current_move->{d} -= length($current_packet) - $in_packet_cursor;
+                if ($in_packet_cursor > 0) {
+                    # Something in packet from previous iteration.
+                    push @result, $current_packet;
+                }
+                $current_packet = shift @$r_packet;
+                $in_packet_cursor = 0;
+            } else {
+                # Remove from current point in current packet
+                substr($current_packet, $in_packet_cursor, $current_move->{d}) = '';
+                $current_move = shift @$r_move;
+            }
+        } else {
+            # Substitute stuff
+            if ($current_move->{s_s} > length($current_packet) - $in_packet_cursor) {
+                #   {s_s=>3, s_v=>GET} on ['GE', 'T /foo']
+                $current_move->{s_s} -= length($current_packet) - $in_packet_cursor;
+                substr($current_packet, $in_packet_cursor) = substr($current_move->{s_v}, 0, length($current_packet) - $in_packet_cursor);
+                push @result, $current_packet;
+                $current_move->{s_v} = substr($current_move->{s_v}, length($current_packet) - $in_packet_cursor);
+                $current_packet = shift @$r_packet;
+                $in_packet_cursor = 0;
+            } else {
+                substr($current_packet, $in_packet_cursor, $current_move->{s_s}) = $current_move->{s_v};
+                $in_packet_cursor += length($current_move->{s_v});
+                $current_move = shift @$r_move;
+            }
+        }
+    }
+    return \@result;
+}
+#  Given a request as an array of packets, will parse it, append the appropriate
+# headers and return another array of packets.
+#  The function implemented here can be high-level summarized as:
+#   1 - Concatenate all packets to obtain a string representation of request.
+#   2 - Parse the string representation
+#   3 - Get the "moves" from the parsing
+#   4 - Apply the "moves" to the packets.
+sub build_request_from_packets($$$$$) {
+    my ( $name, $more_headers, $is_chunked, $conn_header, $request_packets ) = @_;
+    # Concatenate packets as a string
+    my $parsable_request = '';
+    my @packet_length;
+    for my $one_packet (@$request_packets) {
+        $parsable_request .= $one_packet;
+        push @packet_length, length($one_packet);
+    }
+    #  Parse the string representation.
+    my $parsed_req = parse_request( $name, \$parsable_request );
+
+    # Append headers
+    my $len_header = '';
+    if (   !$is_chunked
+        && defined $parsed_req->{content}
+        && $parsed_req->{content} ne ''
+        && $more_headers !~ /\bContent-Length:/ )
+    {
+        $parsed_req->{content} =~ s/^\s+|\s+$//gs;
+
+        $len_header .=
+          "Content-Length: " . length( $parsed_req->{content} ) . "\r\n";
+    }
+    $parsed_req->{method} .= ' ';
+    $parsed_req->{url} .= ' ';
+    $parsed_req->{http_ver} .= "\r\n";
+    $parsed_req->{headers} = "Host: localhost\r\nConnection: $conn_header\r\n$more_headers$len_header\r\n";
+
+    #  Get the moves from parsing
+    my @elements_moves = get_moves($parsed_req);
+    # Apply them to the packets.
+    return apply_moves($request_packets, \@elements_moves);
+}
+
+#  Returns an array of array of hashes from the block. Each element of
+# the first-level array is a request.
+#  Each request is an array of the "packets" to be sent. Each packet is a
+# string to send, with an (optionnal) delay before sending it.
+#  This function parses (and therefore defines the syntax) of "request*"
+# sections. See documentation for supported syntax.
+sub get_req_from_block ($) {
+    my ($block) = @_;
+    my $name = $block->name;
+
+    my @req_list = ();
+
+    if ( defined $block->raw_request ) {
+
+        # Should be deprecated.
+        if ( ref $block->raw_request && ref $block->raw_request eq 'ARRAY' ) {
+
+            #  User already provided an array. So, he/she specified where the
+            # data should be split. This allows for backward compatibility but
+            # should use request with arrays as it provides the same functionnality.
+            my @rr_list = ();
+            for my $elt ( @{ $block->raw_request } ) {
+                push @rr_list, {value => $elt};
+            }
+            push @req_list, \@rr_list;
+        }
+        else {
+            push @req_list, [{value => $block->raw_request}];
+        }
+    }
+    else {
+        my $request;
+        if ( defined $block->request_eval ) {
+
+            diag "$name - request_eval DEPRECATED. Use request eval instead.";
+            $request = eval $block->request_eval;
+            if ($@) {
+                warn $@;
+            }
+        }
+        else {
+            $request = $block->request;
+        }
+
+        my $is_chunked   = 0;
+        my $more_headers = '';
+        if ( $block->more_headers ) {
+            my @headers = split /\n+/, $block->more_headers;
+            for my $header (@headers) {
+                next if $header =~ /^\s*\#/;
+                my ( $key, $val ) = split /:\s*/, $header, 2;
+                if ( lc($key) eq 'transfer-encoding' and $val eq 'chunked' ) {
+                    $is_chunked = 1;
+                }
+
+                #warn "[$key, $val]\n";
+                $more_headers .= "$key: $val\r\n";
+            }
+        }
+
+        if ( $block->pipelined_requests ) {
+            my $reqs = $block->pipelined_requests;
+            if ( !ref $reqs || ref $reqs ne 'ARRAY' ) {
+                Test::More::BAIL_OUT(
+                    "$name - invalid entries in --- pipelined_requests");
+            }
+            my $i = 0;
+            my $prq = "";
+            for my $request (@$reqs) {
+                my $conn_type;
+                if ( $i++ == @$reqs - 1 ) {
+                    $conn_type = 'close';
+                }
+                else {
+                    $conn_type = 'keep-alive';
+                }
+                my $r_br = build_request_from_packets($name, $more_headers,
+                                      $is_chunked, $conn_type,
+                                      [$request] );
+                $prq .= $$r_br[0];
+            }
+            push @req_list, [{value =>$prq}];
+        }
+        else {
+            # request section.
+            if (!ref $request) {
+                # One request and it is a good old string.
+                my $r_br = build_request_from_packets($name, $more_headers,
+                                                      $is_chunked, 'Close',
+                                                      [$request] );
+                push @req_list, [{value => $$r_br[0]}];
+            } elsif (ref $request eq 'ARRAY') {
+                # A bunch of requests...
+                for my $one_req (@$request) {
+                    if (!ref $one_req) {
+                        # This request is a good old string.
+                        my $r_br = build_request_from_packets($name, $more_headers,
+                                                      $is_chunked, 'Close',
+                                                      [$one_req] );
+                        push @req_list, [{value => $$r_br[0]}];
+                    } elsif (ref $one_req eq 'ARRAY') {
+                        # Request expressed as a serie of packets
+                        my @packet_array = ();
+                        for my $one_packet (@$one_req) {
+                            if (!ref $one_packet) {
+                                # Packet is a string.
+                                push @packet_array, $one_packet;
+                            } elsif (ref $one_packet eq 'HASH'){
+                                # Packet is a hash with a value...
+                                push @packet_array, $one_packet->{value};
+                            } else {
+                                Test::More::BAIL_OUT "$name - Invalid syntax. $one_packet should be a string or hash with value.";
+                            }
+                        }
+                        my $transformed_packet_array = build_request_from_packets($name, $more_headers,
+                                                   $is_chunked, 'Close',
+                                                   \@packet_array);
+                        my @transformed_req = ();
+                        my $idx = 0;
+                        for my $one_transformed_packet (@$transformed_packet_array) {
+                            if (!ref $$one_req[$idx]) {
+                                push @transformed_req, {value => $one_transformed_packet};
+                            } else {
+                                # Is a HASH (checked above as $one_packet)
+                                $$one_req[$idx]->{value} = $one_transformed_packet;
+                                push @transformed_req, $$one_req[$idx];
+                            }
+                            $idx++;
+                        }
+                        push @req_list, \@transformed_req;
+                    } else {
+                        Test::More::BAIL_OUT "$name - Invalid syntax. $one_req should be a string or an array of packets.";
+                    }
+                }
+            } else {
+                Test::More::BAIL_OUT(
+                    "$name - invalid ---request : MUST be string or array of requests");
+            }
+        }
+
+    }
+    return \@req_list;
+}
+
+sub run_test_helper ($$) {
+    my ( $block, $dry_run ) = @_;
+
+    my $name = $block->name;
+
+    my $r_req_list = get_req_from_block($block);
+
+    if ( $#$r_req_list < 0 ) {
+        Test::More::BAIL_OUT("$name - request empty");
+    }
+
+    #warn "request: $req\n";
+
+    my $timeout = $block->timeout;
+    if ( !defined $timeout ) {
+        $timeout = $Timeout;
+    }
+
+    my $req_idx = 0;
+    for my $one_req (@$r_req_list) {
+        my $raw_resp;
+
+        if ($dry_run) {
+            $raw_resp = "200 OK HTTP/1.0\r\nContent-Length: 0\r\n\r\n";
+        }
+        else {
+            $raw_resp = send_request( $one_req, $block->raw_request_middle_delay,
+                $timeout, $block->name );
+        }
+
+        #warn "raw resonse: [$raw_resp]\n";
+
+        my ($n, $need_array);
+
+        if ($block->pipelined_requests) {
+            $n = @{ $block->pipelined_requests };
+            $need_array = 1;
+
+        } else {
+            $need_array = $#$r_req_list > 0;
+        }
+
+again:
+        #warn "!!! resp: [$raw_resp]";
+        if (!defined $raw_resp) {
+            $raw_resp = '';
+        }
+
+        my ( $res, $raw_headers, $left ) = parse_response( $name, $raw_resp );
+
+        if (!$n) {
+            if ($left) {
+                my $name = $block->name;
+                $left =~ s/([\0-\037\200-\377])/sprintf('\x{%02x}',ord $1)/eg;
+                warn "WARNING: $name - unexpected extra bytes after last chunk in ",
+                    "response: \"$left\"\n";
+            }
+
+        } else {
+            $raw_resp = $left;
+            $n--;
+        }
+
+        check_error_code($block, $res, $dry_run, $req_idx, $need_array);
+        check_raw_response_headers($block, $raw_headers, $dry_run, $req_idx, $need_array);
+        check_response_headers($block, $res, $raw_headers, $dry_run, $req_idx, $need_array);
+        check_response_body($block, $res, $dry_run, $req_idx, $need_array);
+        $req_idx++;
+
+        if ($n) {
+            goto again;
+        }
+    }
+}
+
+#  Helper function to retrieve a "check" (e.g. error_code) section. This also
+# checks that tests with arrays of requests are arrays themselves.
+sub get_indexed_value($$$$) {
+    my ($name, $value, $req_idx, $need_array) = @_;
+    if ($need_array) {
+        if (ref $value && ref $value eq 'ARRAY') {
+            return $$value[$req_idx];
+        } else {
+            Test::More::BAIL_OUT("$name - You asked for many requests, the expected results should be arrays as well.");
+        }
+    } else {
+        # One element but still provided as an array.
+        if (ref $value && ref $value eq 'ARRAY') {
+            if ($req_idx != 0) {
+                Test::More::BAIL_OUT("$name - SHOULD NOT HAPPEN: idx != 0 and don't need array.");
+            } else {
+                return $$value[0];
+            }
+        } else {
+            return $value;
+        }
+    }
+}
+sub check_error_code($$$$$) {
+    my ($block, $res, $dry_run, $req_idx, $need_array) = @_;
+    my $name = $block->name;
+    SKIP: {
+        skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
+        if ( defined $block->error_code ) {
+            is( $res->code || '',
+                get_indexed_value($name, $block->error_code, $req_idx, $need_array),
+                "$name - status code ok" );
+        } else {
+            is( $res->code || '', 200, "$name - status code ok" );
+        }
+    }
+}
+sub check_raw_response_headers($$$$$) {
+    my ($block, $raw_headers, $dry_run, $req_idx, $need_array) = @_;
+    my $name = $block->name;
+    if ( defined $block->raw_response_headers_like ) {
+        SKIP: {
+            skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
+            my $expected = get_indexed_value($name,
+                                             $block->raw_response_headers_like,
+                                             $req_idx,
+                                             $need_array);
+            like $raw_headers, qr/$expected/s, "$name - raw resp headers like";
+        }
+    }
+}
+sub check_response_headers($$$$$) {
+    my ($block, $res, $raw_headers, $dry_run, $req_idx, $need_array) = @_;
+    my $name = $block->name;
+    if ( defined $block->response_headers ) {
+        my $headers = parse_headers( get_indexed_value($name,
+                                                       $block->response_headers,
+                                                       $req_idx,
+                                                       $need_array));
+        while ( my ( $key, $val ) = each %$headers ) {
+            if ( !defined $val ) {
+
+                #warn "HIT";
+                SKIP: {
+                    skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
+                    unlike $raw_headers, qr/^\s*\Q$key\E\s*:/ms,
+                      "$name - header $key not present in the raw headers";
+                }
+                next;
+            }
+
+            my $actual_val = $res->header($key);
+            if ( !defined $actual_val ) {
+                $actual_val = '';
+            }
+
+            SKIP: {
+                skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
+                is $actual_val, $val, "$name - header $key ok";
+            }
+        }
+    }
+    elsif ( defined $block->response_headers_like ) {
+        my $headers = parse_headers( get_indexed_value($name,
+                                                       $block->response_headers_like,
+                                                       $req_idx,
+                                                       $need_array) );
+        while ( my ( $key, $val ) = each %$headers ) {
+            my $expected_val = $res->header($key);
+            if ( !defined $expected_val ) {
+                $expected_val = '';
+            }
+            SKIP: {
+                skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
+                like $expected_val, qr/^$val$/, "$name - header $key like ok";
+            }
+        }
+    }
+}
+
+sub check_response_body() {
+    my ($block, $res, $dry_run, $req_idx, $need_array) = @_;
+    my $name = $block->name;
+    if (   defined $block->response_body
+        || defined $block->response_body_eval )
+    {
+        my $content = $res->content;
+        if ( defined $content ) {
+            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
+            $content =~ s/^Connection: TE, close\r\n//gms;
+        }
+
+        my $expected;
+        if ( $block->response_body_eval ) {
+            diag "$name - response_body_eval is DEPRECATED. Use response_body eval instead.";
+            $expected = eval get_indexed_value($name,
+                                               $block->response_body_eval,
+                                               $req_idx,
+                                               $need_array);
+            if ($@) {
+                warn $@;
+            }
+        }
+        else {
+            $expected = get_indexed_value($name,
+                                          $block->response_body,
+                                          $req_idx,
+                                          $need_array);
+        }
+
+        if ( $block->charset ) {
+            Encode::from_to( $expected, 'UTF-8', $block->charset );
+        }
+
+        unless (ref $expected) {
+            $expected =~ s/\$ServerPort\b/$ServerPort/g;
+            $expected =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
+        }
+
+        #warn show_all_chars($content);
+
+        #warn "no long string: $NoLongString";
+        SKIP: {
+            skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
+            if (ref $expected) {
+                like $content, $expected, "$name - response_body - like";
+
+            } else {
+                if ($NoLongString) {
+                    is( $content, $expected,
+                        "$name - response_body - response is expected" );
+                }
+                else {
+                    is_string( $content, $expected,
+                        "$name - response_body - response is expected" );
+                }
+            }
+        }
+
+    }
+    elsif ( defined $block->response_body_like ) {
+        my $content = $res->content;
+        if ( defined $content ) {
+            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
+        }
+        $content =~ s/^Connection: TE, close\r\n//gms;
+        my $expected_pat = get_indexed_value($name,
+                                             $block->response_body_like,
+                                             $req_idx,
+                                             $need_array);
+        $expected_pat =~ s/\$ServerPort\b/$ServerPort/g;
+        $expected_pat =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
+        my $summary = trim($content);
+
+        SKIP: {
+            skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
+            like( $content, qr/$expected_pat/s,
+                "$name - response_body_like - response is expected ($summary)"
+            );
+        }
+    } elsif ( defined $block->response_body_unlike ) {
+        my $content = $res->content;
+        if ( defined $content ) {
+            $content =~ s/^TE: deflate,gzip;q=0\.3\r\n//gms;
+        }
+        $content =~ s/^Connection: TE, close\r\n//gms;
+        my $expected_pat = get_indexed_value($name,
+                                             $block->response_body_unlike,
+                                             $req_idx,
+                                             $need_array);
+        $expected_pat =~ s/\$ServerPort\b/$ServerPort/g;
+        $expected_pat =~ s/\$ServerPortForClient\b/$ServerPortForClient/g;
+        my $summary = trim($content);
+
+        SKIP: {
+            skip "$name - tests skipped due to the lack of directive $dry_run", 1 if $dry_run;
+            unlike( $content, qr/$expected_pat/s,
+                "$name - response_body_like - response is expected ($summary)"
+            );
+        }
+}
+
+sub parse_response($$) {
+    my ( $name, $raw_resp ) = @_;
+
+    my $left;
+
+    my $raw_headers = '';
+    if ( $raw_resp =~ /(.*?\r\n)\r\n/s ) {
+
+        #warn "\$1: $1";
+        $raw_headers = $1;
+    }
+
+    #warn "raw headers: $raw_headers\n";
+
+    my $res = HTTP::Response->parse($raw_resp);
+    my $enc = $res->header('Transfer-Encoding');
+
+    my $len = $res->header('Content-Length');
+
+    if ( defined $enc && $enc eq 'chunked' ) {
+
+        #warn "Found chunked!";
+        my $raw = $res->content;
+        if ( !defined $raw ) {
+            $raw = '';
+        }
+
+        my $decoded = '';
+        while (1) {
+            if ( $raw =~ /\G 0 [\ \t]* \r\n \r\n /gcsx ) {
+                if ( $raw =~ /\G (.+) /gcsx ) {
+                    $left = $1;
+                }
+
+                last;
+            }
+            if ( $raw =~ m{ \G [\ \t]* ( [A-Fa-f0-9]+ ) [\ \t]* \r\n }gcsx ) {
+                my $rest = hex($1);
+
+                #warn "chunk size: $rest\n";
+                my $bit_sz = 32765;
+                while ( $rest > 0 ) {
+                    my $bit = $rest < $bit_sz ? $rest : $bit_sz;
+
+                    #warn "bit: $bit\n";
+                    if ( $raw =~ /\G(.{$bit})/gcs ) {
+                        $decoded .= $1;
+
+                        #warn "decoded: [$1]\n";
+                    }
+                    else {
+                        fail(
+"$name - invalid chunked data received (not enought octets for the data section)"
+                        );
+                        return;
+                    }
+
+                    $rest -= $bit;
+                }
+                if ( $raw !~ /\G\r\n/gcs ) {
+                    fail(
+                        "$name - invalid chunked data received (expected CRLF)."
+                    );
+                    return;
+                }
+            }
+            elsif ( $raw =~ /\G.+/gcs ) {
+                fail "$name - invalid chunked body received: $&";
+                return;
+            }
+            else {
+                fail "$name - no last chunk found - $raw";
+                return;
+            }
+        }
+
+        #warn "decoded: $decoded\n";
+        $res->content($decoded);
+
+    } elsif (defined $len && $len ne '' && $len >= 0) {
+        my $raw = $res->content;
+        if (length $raw < $len) {
+            warn "WARNING: $name - response body truncated: ",
+                "$len expected, but got ", length $raw, "\n";
+
+        } elsif (length $raw > $len) {
+            my $content = substr $raw, 0, $len;
+            $left = substr $raw, $len;
+            $res->content($content);
+            #warn "parsed body: [", $res->content, "]\n";
+        }
+    }
+
+    return ( $res, $raw_headers, $left );
+}
+
+sub send_request ($$$$@) {
+    my ( $req, $middle_delay, $timeout, $name, $tries ) = @_;
+
+    my $sock = IO::Socket::INET->new(
+        PeerAddr => $ServerAddr,
+        PeerPort => $ServerPortForClient,
+        Proto    => 'tcp'
+    );
+
+    if (! defined $sock) {
+        $tries ||= 0;
+        if ($tries < 3) {
+            warn "Can't connect to $ServerAddr:$ServerPortForClient: $!\n";
+            sleep 1;
+            return send_request($req, $middle_delay, $timeout, $name, $tries + 1);
+        } else {
+            die "Can't connect to $ServerAddr:$ServerPortForClient: $!\n";
+        }
+    }
+
+    my @req_bits = ref $req ? @$req : ($req);
+
+    my $flags = fcntl $sock, F_GETFL, 0
+      or die "Failed to get flags: $!\n";
+
+    fcntl $sock, F_SETFL, $flags | O_NONBLOCK
+      or die "Failed to set flags: $!\n";
+
+    my $ctx = {
+        resp         => '',
+        write_offset => 0,
+        buf_size     => 1024,
+        req_bits     => \@req_bits,
+        write_buf    => (shift @req_bits)->{"value"},
+        middle_delay => $middle_delay,
+        sock         => $sock,
+        name         => $name,
+    };
+
+    my $readable_hdls = IO::Select->new($sock);
+    my $writable_hdls = IO::Select->new($sock);
+    my $err_hdls      = IO::Select->new($sock);
+
+    while (1) {
+        if (   $readable_hdls->count == 0
+            && $writable_hdls->count == 0
+            && $err_hdls->count == 0 )
+        {
+            last;
+        }
+
+        my ( $new_readable, $new_writable, $new_err ) =
+          IO::Select->select( $readable_hdls, $writable_hdls, $err_hdls,
+            $timeout );
+
+        if (   !defined $new_err
+            && !defined $new_readable
+            && !defined $new_writable )
+        {
+
+            # timed out
+            timeout_event_handler($ctx);
+            last;
+        }
+
+        for my $hdl (@$new_err) {
+            next if !defined $hdl;
+
+            error_event_handler($ctx);
+
+            if ( $err_hdls->exists($hdl) ) {
+                $err_hdls->remove($hdl);
+            }
+
+            if ( $readable_hdls->exists($hdl) ) {
+                $readable_hdls->remove($hdl);
+            }
+
+            if ( $writable_hdls->exists($hdl) ) {
+                $writable_hdls->remove($hdl);
+            }
+
+            for my $h (@$readable_hdls) {
+                next if !defined $h;
+                if ( $h eq $hdl ) {
+                    undef $h;
+                    last;
+                }
+            }
+
+            for my $h (@$writable_hdls) {
+                next if !defined $h;
+                if ( $h eq $hdl ) {
+                    undef $h;
+                    last;
+                }
+            }
+
+            close $hdl;
+        }
+
+        for my $hdl (@$new_readable) {
+            next if !defined $hdl;
+
+            my $res = read_event_handler($ctx);
+            if ( !$res ) {
+
+                # error occured
+                if ( $err_hdls->exists($hdl) ) {
+                    $err_hdls->remove($hdl);
+                }
+
+                if ( $readable_hdls->exists($hdl) ) {
+                    $readable_hdls->remove($hdl);
+                }
+
+                if ( $writable_hdls->exists($hdl) ) {
+                    $writable_hdls->remove($hdl);
+                }
+
+                for my $h (@$writable_hdls) {
+                    next if !defined $h;
+                    if ( $h eq $hdl ) {
+                        undef $h;
+                        last;
+                    }
+                }
+
+                close $hdl;
+            }
+        }
+
+        for my $hdl (@$new_writable) {
+            next if !defined $hdl;
+
+            my $res = write_event_handler($ctx);
+            if ( !$res ) {
+
+                # error occured
+                if ( $err_hdls->exists($hdl) ) {
+                    $err_hdls->remove($hdl);
+                }
+
+                if ( $readable_hdls->exists($hdl) ) {
+                    $readable_hdls->remove($hdl);
+                }
+
+                if ( $writable_hdls->exists($hdl) ) {
+                    $writable_hdls->remove($hdl);
+                }
+
+                close $hdl;
+
+            } elsif ( $res == 2 ) {
+                if ( $writable_hdls->exists($hdl) ) {
+                    $writable_hdls->remove($hdl);
+                }
+            }
+        }
+    }
+
+    return $ctx->{resp};
+}
+
+sub timeout_event_handler ($) {
+    my $ctx = shift;
+    warn "ERROR: socket client: timed out - $ctx->{name}\n";
+}
+
+sub error_event_handler ($) {
+    warn "exception occurs on the socket: $!\n";
+}
+
+sub write_event_handler ($) {
+    my ($ctx) = @_;
+
+    while (1) {
+        return undef if !defined $ctx->{write_buf};
+
+        my $rest = length( $ctx->{write_buf} ) - $ctx->{write_offset};
+
+  #warn "offset: $write_offset, rest: $rest, length ", length($write_buf), "\n";
+  #die;
+
+        if ( $rest > 0 ) {
+            my $bytes;
+            eval {
+                $bytes = syswrite(
+                    $ctx->{sock}, $ctx->{write_buf},
+                    $rest,        $ctx->{write_offset}
+                );
+            };
+
+            if ($@) {
+                my $errmsg = "write failed: $@";
+                warn "$errmsg\n";
+                $ctx->{resp} =  $errmsg;
+                return undef;
+            }
+
+            if ( !defined $bytes ) {
+                if ( $! == EAGAIN ) {
+
+                    #warn "write again...";
+                    #sleep 0.002;
+                    return 1;
+                }
+                my $errmsg = "write failed: $!";
+                warn "$errmsg\n";
+                if ( !$ctx->{resp} ) {
+                    $ctx->{resp} = "$errmsg";
+                }
+                return undef;
+            }
+
+            #warn "wrote $bytes bytes.\n";
+            $ctx->{write_offset} += $bytes;
+        }
+        else {
+            my $next_send = shift @{ $ctx->{req_bits} } or return 2;
+            $ctx->{write_buf} = $next_send->{'value'};
+            $ctx->{write_offset} = 0;
+            my $wait_time;
+            if (!defined $next_send->{'delay_before'}) {
+                if (defined $ctx->{middle_delay}) {
+                    $wait_time = $ctx->{middle_delay};
+                }
+            } else {
+                $wait_time = $next_send->{'delay_before'};
+            }
+            if ($wait_time) {
+                #warn "sleeping..";
+                sleep $wait_time;
+            }
+        }
+    }
+
+    # impossible to reach here...
+    return undef;
+}
+
+sub read_event_handler ($) {
+    my ($ctx) = @_;
+    while (1) {
+        my $read_buf;
+        my $bytes = sysread( $ctx->{sock}, $read_buf, $ctx->{buf_size} );
+
+        if ( !defined $bytes ) {
+            if ( $! == EAGAIN ) {
+
+                #warn "read again...";
+                #sleep 0.002;
+                return 1;
+            }
+            $ctx->{resp} = "500 read failed: $!";
+            return undef;
+        }
+
+        if ( $bytes == 0 ) {
+            return undef;    # connection closed
+        }
+
+        $ctx->{resp} .= $read_buf;
+
+        #warn "read $bytes ($read_buf) bytes.\n";
+    }
+
+    # impossible to reach here...
+    return undef;
+}
+
+1;
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+Test::Nginx::Socket - Socket-backed test scaffold for the Nginx C modules
+
+=head1 SYNOPSIS
+
+    use Test::Nginx::Socket;
+
+    plan tests => $Test::Nginx::Socket::RepeatEach * 2 * blocks();
+
+    run_tests();
+
+    __DATA__
+
+    === TEST 1: sanity
+    --- config
+        location /echo {
+            echo_before_body hello;
+            echo world;
+        }
+    --- request
+        GET /echo
+    --- response_body
+    hello
+    world
+    --- error_code: 200
+
+
+    === TEST 2: set Server
+    --- config
+        location /foo {
+            echo hi;
+            more_set_headers 'Server: Foo';
+        }
+    --- request
+        GET /foo
+    --- response_headers
+    Server: Foo
+    --- response_body
+    hi
+
+
+    === TEST 3: clear Server
+    --- config
+        location /foo {
+            echo hi;
+            more_clear_headers 'Server: ';
+        }
+    --- request
+        GET /foo
+    --- response_headers_like
+    Server: nginx.*
+    --- response_body
+    hi
+
+
+    === TEST 3: chunk size too small
+    --- config
+        chunkin on;
+        location /main {
+            echo_request_body;
+        }
+    --- more_headers
+    Transfer-Encoding: chunked
+    --- request eval
+    "POST /main
+    4\r
+    hello\r
+    0\r
+    \r
+    "
+    --- error_code: 400
+    --- response_body_like: 400 Bad Request
+
+=head1 DESCRIPTION
+
+This module provides a test scaffold based on non-blocking L<IO::Socket> for automated testing in Nginx C module development.
+
+This class inherits from L<Test::Base>, thus bringing all its
+declarative power to the Nginx C module testing practices.
+
+You need to terminate or kill any Nginx processes before running the test suite if you have changed the Nginx server binary. Normally it's as simple as
+
+  killall nginx
+  PATH=/path/to/your/nginx-with-memc-module:$PATH prove -r t
+
+This module will create a temporary server root under t/servroot/ of the current working directory and starts and uses the nginx executable in the PATH environment.
+
+You will often want to look into F<t/servroot/logs/error.log>
+when things go wrong ;)
+
+=head1 Sections supported
+
+The following sections are supported:
+
+=head2 config
+
+Content of this section will be included in the "server" part of the generated
+config file. This is the place where you want to put the "location" directive
+enabling the module you want to test. Example:
+
+        location /echo {
+            echo_before_body hello;
+            echo world;
+        }
+
+Sometimes you simply don't want to bother copying ten times the same
+configuration for the ten tests you want to run against your module. One way
+to do this is to write a config section only for the first test in your C<.t>
+file. All subsequent tests will re-use the same config. Please note that this
+depends on the order of test, so you should run C<prove> with variable
+C<TEST_NGINX_NO_SHUFFLE=1> (see below for more on this variable).
+
+Please note that config section goes through environment variable expansion
+provided the variables to expand start with TEST_NGINX.
+So, the following is a perfectly legal (provided C<TEST_NGINX_HTML_DIR> is
+set correctly):
+
+    location /main {
+        echo_subrequest POST /sub -f $TEST_NGINX_HTML_DIR/blah.txt;
+    }
+
+=head2 http_config
+
+Content of this section will be included in the "http" part of the generated
+config file. This is the place where you want to put the "upstream" directive
+you might want to test. Example:
+
+    upstream database {
+        postgres_server     127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT
+                            dbname=ngx_test user=ngx_test
+                            password=wrong_pass;
+    }
+
+As you guessed from the example above, this section goes through environment
+variable expansion (variables have to start with TEST_NGINX).
+
+=head2 main_config
+
+Content of this section will be included in the "main" part of the generated
+config file. This is very rarely used, except if you are testing nginx core
+itself.
+
+This section goes through environment
+variable expansion (variables have to start with TEST_NGINX).
+
+=head2 request
+
+This is probably the most important section. It defines the request(s) you
+are going to send to the nginx server. It offers a pretty powerful grammar
+which we are going to walk through one example at a time.
+
+In its most basic form, this section looks like that:
+
+    --- request
+    GET
+
+This will just do a GET request on the root (i.e. /) of the server using
+HTTP/1.1.
+
+Of course, you might want to test something else than the root of your
+web server and even use a different version of HTTP. This is possible:
+
+    --- request
+    GET /foo HTTP/1.0
+
+Please note that specifying HTTP/1.0 will not prevent Test::Nginx from
+sending the C<Host> header. Actually Test::Nginx always sends 2 headers:
+C<Host> (with value localhost) and C<Connection> (with value Close for
+simple requests and keep-alive for all but the last pipelined_requests).
+
+You can also add a content to your request:
+
+    --- request
+    POST /foo
+    Hello world
+
+Test::Nginx will automatically calculate the content length and add the
+corresponding header for you.
+
+This being said, as soon as you want to POST real data, you will be interested
+in using the more_headers section and using the power of Test::Base filters
+to urlencode the content you are sending. Which gives us a
+slightly more realistic example:
+
+    --- more_headers
+    Content-type: application/x-www-form-urlencoded
+    --- request eval
+    use URI::Escape;
+    "POST /rrd/foo
+    value=".uri_escape("N:12345")
+
+Sometimes a test is more than one request. Typically you want to POST some
+data and make sure the data has been taken into account with a GET. You can
+do it using arrays:
+
+    --- request eval
+    ["POST /users
+    name=foo", "GET /users/foo"]
+
+This way, REST-like interfaces are pretty easy to test.
+
+When you develop nifty nginx modules you will eventually want to test things
+with buffers and "weird" network conditions. This is where you split
+your request into network packets:
+
+    --- request eval
+    [["POST /users\nna", "me=foo"]]
+
+Here, Test::Nginx will first send the request line, the headers it
+automatically added for you and the first two letters of the body ("na" in
+our example) in ONE network packet. Then, it will send the next packet (here
+it's "me=foo"). When we talk about packets here, this is nto exactly correct
+as there is no way to guarantee the behavior of the TCP/IP stack. What
+Test::Nginx can guarantee is that this will result in two calls to
+C<syswrite>.
+
+A good way to make I<almost> sure the two calls result in two packets is to
+introduce a delay (let's say 2 seconds)before sending the second packet:
+
+    --- request eval
+    [["POST /users\nna", {value => "me=foo", delay_before => 2}]]
+
+Of course, everything can be combined till your brain starts boiling ;) :
+
+    --- request eval
+    use URI::Escape;
+    my $val="value=".uri_escape("N:12346");
+    [["POST /rrd/foo
+    ".substr($val, 0, 6),
+    {value => substr($val, 6, 5), delay_before=>5},
+    substr($val, 11)],  "GET /rrd/foo"]
+
+=head2 request_eval
+
+Use of this section is deprecated and tests using it should replace it with
+a C<request> section with an C<eval> filter. More explicitly:
+
+    --- request_eval
+    "POST /echo_body
+    hello\x00\x01\x02
+    world\x03\x04\xff"
+
+should be replaced by:
+
+    --- request eval
+    "POST /echo_body
+    hello\x00\x01\x02
+    world\x03\x04\xff"
+
+=head2 pipelined_requests
+
+Specify pipelined requests that use a single keep-alive connection to the server.
+
+Here is an example from ngx_lua's test suite:
+
+    === TEST 7: discard body
+    --- config
+        location = /foo {
+            content_by_lua '
+                ngx.req.discard_body()
+                ngx.say("body: ", ngx.var.request_body)
+            ';
+        }
+        location = /bar {
+            content_by_lua '
+                ngx.req.read_body()
+                ngx.say("body: ", ngx.var.request_body)
+            ';
+        }
+    --- pipelined_requests eval
+    ["POST /foo
+    hello, world",
+    "POST /bar
+    hiya, world"]
+    --- response_body eval
+    ["body: nil\n",
+    "body: hiya, world\n"]
+
+=head2 more_headers
+
+Adds the content of this section as headers to the request being sent. Example:
+
+    --- more_headers
+    X-Foo: blah
+
+This will add C<X-Foo: blah> to the request (on top of the automatically
+generated headers like C<Host>, C<Connection> and potentially
+C<Content-Length>).
+
+=head2 response_body
+
+The expected value for the body of the submitted request.
+
+    --- response_body
+    hello
+
+If the test is made of multiple requests, then the response_body B<MUST>
+be an array and each request B<MUST> return the corresponding expected
+body:
+
+    --- request eval
+    ["GET /hello", "GET /world"]
+    --- response_body eval
+    ["hello", "world"]
+
+=head2 response_body_eval
+
+Use of this section is deprecated and tests using it should replace it
+with a C<request> section with an C<eval> filter. Therefore:
+
+    --- response_body_eval
+    "hello\x00\x01\x02
+    world\x03\x04\xff"
+
+should be replaced by:
+
+    --- response_body eval
+    "hello\x00\x01\x02
+    world\x03\x04\xff"
+
+=head2 response_body_like
+
+The body returned by the request MUST match the pattern provided by this
+section. Example:
+
+    --- response_body_like
+    ^elapsed 0\.00[0-5] sec\.$
+
+If the test is made of multiple requests, then response_body_like B<MUST>
+be an array and each request B<MUST> match the corresponding pattern.
+
+=head2 response_headers
+
+The headers specified in this section are in the response sent by nginx.
+
+    --- response_headers
+    Content-Type: application/x-resty-dbd-stream
+
+Of course, you can specify many headers in this section:
+
+    --- response_headers
+    X-Resty-DBD-Module:
+    Content-Type: application/x-resty-dbd-stream
+
+The test will be successful only if all headers are found in the response with
+the appropriate values.
+
+If the test is made of multiple requests, then response_headers B<MUST>
+be an array and each element of the array is checked against the
+response to the corresponding request.
+
+=head2 response_headers_like
+
+The value of the headers returned by nginx match the patterns.
+
+    --- response_headers_like
+    X-Resty-DBD-Module: ngx_drizzle \d+\.\d+\.\d+
+    Content-Type: application/x-resty-dbd-stream
+
+This will check that the response's C<Content-Type> is
+application/x-resty-dbd-stream and that the C<X-Resty-DBD-Module> matches
+C<ngx_drizzle \d+\.\d+\.\d+>.
+
+The test will be successful only if all headers are found in the response and
+if the values match the patterns.
+
+If the test is made of multiple requests, then response_headers_like B<MUST>
+be an array and each element of the array is checked against the
+response to the corresponding request.
+
+=head2 raw_response_headers_like
+
+Checks the headers part of the response against this pattern. This is
+particularly useful when you want to write tests of redirect functions
+that are not bound to the value of the port your nginx server (under
+test) is listening to:
+
+    --- raw_response_headers_like: Location: http://localhost(?::\d+)?/foo\r\n
+
+As usual, if the test is made of multiple requests, then
+raw_response_headers_like B<MUST> be an array.
+
+=head2 error_code
+
+The expected value of the HTTP response code. If not set, this is assumed
+to be 200. But you can expect other things such as a redirect:
+
+    --- error_code: 302
+
+If the test is made of multiple requests, then
+error_code B<MUST> be an array with the expected value for the response status
+of each request in the test.
+
+=head2 raw_request
+
+The exact request to send to nginx. This is useful when you want to test
+soem behaviors that are not available with "request" such as an erroneous
+C<Content-Length> header or splitting packets right in the middle of headers:
+
+    --- raw_request eval
+    ["POST /rrd/taratata HTTP/1.1\r
+    Host: localhost\r
+    Connection: Close\r
+    Content-Type: application/",
+    "x-www-form-urlencoded\r
+    Content-Length:15\r\n\r\nvalue=N%3A12345"]
+
+This can also be useful to tests "invalid" request lines:
+
+    --- raw_request
+    GET /foo HTTP/2.0 THE_FUTURE_IS_NOW
+
+=head2 user_files
+
+With this section you can create a file that will be copied in the
+html directory of the nginx server under test. For example:
+
+    --- user_files
+    >>> blah.txt
+    Hello, world
+
+will create a file named C<blah.txt> in the html directory of the nginx
+server tested. The file will contain the text "Hello, world".
+
+=head2 skip_nginx
+
+=head2 skip_nginx2
+
+Both string scalar and string arrays are supported as values.
+
+=head2 raw_request_middle_delay
+
+Delay in sec between sending successive packets in the "raw_request" array
+value. Also used when a request is split in packets.
+
+=head1 Environment variables
+
+All environment variables starting with C<TEST_NGINX_> are expanded in the
+sections used to build the configuration of the server that tests automatically
+starts. The following environment variables are supported by this module:
+
+=head2 TEST_NGINX_NO_NGINX_MANAGER
+
+Defaults to 0. If set to 1, Test::Nginx module will not manage
+(configure/start/stop) the C<nginx> process. Can be useful to run tests
+against an already configured (and running) nginx server.
+
+=head2 TEST_NGINX_NO_SHUFFLE
+
+Dafaults to 0. If set to 1, will make sure the tests are run in the order
+they appear in the test file (and not in random order).
+
+=head2 TEST_NGINX_USE_VALGRIND
+
+If set to 1, will start nginx with valgrind. nginx is actually started with
+C<valgrind -q --leak-check=full --gen-suppressions=all --suppressions=valgrind.suppress>,
+the suppressions option being used only if there is actually
+a valgrind.suppress file.
+
+=head2 TEST_NGINX_BINARY
+
+The command to start nginx. Defaults to C<nginx>. Can be used as an alternative
+to setting C<PATH> to run a specific nginx instance.
+
+=head2 TEST_NGINX_LOG_LEVEL
+
+Value of the last argument of the C<error_log> configuration directive.
+Defaults to C<debug>.
+
+=head2 TEST_NGINX_MASTER_PROCESS
+
+Value of the C<master_process> configuration directive. Defaults to C<off>.
+
+=head2 TEST_NGINX_SERVER_PORT
+
+Value of the port the server started by Test::Nginx will listen to. If not
+set, C<TEST_NGINX_PORT> is used. If C<TEST_NGINX_PORT> is not set,
+then C<1984> is used. See below for typical use.
+
+=head2 TEST_NGINX_CLIENT_PORT
+
+Value of the port Test::Nginx will diirect requests to. If not
+set, C<TEST_NGINX_PORT> is used. If C<TEST_NGINX_PORT> is not set,
+then C<1984> is used. A typical use of this feature is to test extreme
+network conditions by adding a "proxy" between Test::Nginx and nginx
+itself. This is described in the C<etcproxy integration> section of this
+module README.
+
+=head2 TEST_NGINX_PORT
+
+A shortcut for setting both C<TEST_NGINX_CLIENT_PORT> and
+C<TEST_NGINX_SERVER_PORT>.
+
+=head2 TEST_NGINX_SLEEP
+
+How much time (in seconds) should Test::Nginx sleep between two calls to C<syswrite> when
+sending request data. Defaults to 0.
+
+=head2 TEST_NGINX_FORCE_RESTART_ON_TEST
+
+Defaults to 1. If set to 0, Test::Nginx will not restart the nginx
+server when the config does not change between two tests.
+
+=head2 TEST_NGINX_SERVROOT
+
+The root of the nginx "hierarchy" (where you find the conf, *_tmp and logs
+directories). This value will be used with the C<-p> option of C<nginx>.
+Defaults to appending C<t/servroot> to the current directory.
+
+=head2 TEST_NGINX_IGNORE_MISSING_DIRECTIVES
+
+If set to 1 will SKIP all tests which C<config> sections resulted in a
+C<unknown directive> when trying to start C<nginx>. Useful when you want to
+run tests on a build of nginx that does not include all modules it should.
+By default, these tests will FAIL.
+
+=head2 TEST_NGINX_EVENT_TYPE
+
+This environment can be used to specify a event API type to be used by Nginx. Possible values are C<epoll>, C<kqueue>, C<select>, C<rtsig>, C<poll>, and others.
+
+For example,
+
+    $ TEST_NGINX_EVENT_TYPE=select prove -r t
+
+=head2 TEST_NGINX_ERROR_LOG
+
+Error log files from all tests will be appended to the file specified with
+this variable. There is no default value which disables the feature. This
+is very useful when debugging. By default, each test triggers a start/stop
+cycle for C<nginx>. All logs are removed before each restart, so you can
+only see the logs for the last test run (which you usually do not control
+except if you set C<TEST_NGINX_NO_SHUFFLE=1>). With this, you accumulate
+all logs into a single file that is never cleaned up by Test::Nginx.
+
+=head1 Samples
+
+You'll find live samples in the following Nginx 3rd-party modules:
+
+=over
+
+=item ngx_echo
+
+L<http://github.com/agentzh/echo-nginx-module>
+
+=item ngx_chunkin
+
+L<http://wiki.nginx.org/NginxHttpChunkinModule>
+
+=item ngx_memc
+
+L<http://wiki.nginx.org/NginxHttpMemcModule>
+
+=item ngx_drizzle
+
+L<http://github.com/chaoslawful/drizzle-nginx-module>
+
+=item ngx_rds_json
+
+L<http://github.com/agentzh/rds-json-nginx-module>
+
+=item ngx_xss
+
+L<http://github.com/agentzh/xss-nginx-module>
+
+=item ngx_srcache
+
+L<http://github.com/agentzh/srcache-nginx-module>
+
+=item ngx_lua
+
+L<http://github.com/chaoslawful/lua-nginx-module>
+
+=item ngx_set_misc
+
+L<http://github.com/agentzh/set-misc-nginx-module>
+
+=item ngx_array_var
+
+L<http://github.com/agentzh/array-var-nginx-module>
+
+=item ngx_form_input
+
+L<http://github.com/calio/form-input-nginx-module>
+
+=item ngx_iconv
+
+L<http://github.com/calio/iconv-nginx-module>
+
+=item ngx_set_cconv
+
+L<http://github.com/liseen/set-cconv-nginx-module>
+
+=item ngx_postgres
+
+L<http://github.com/FRiCKLE/ngx_postgres>
+
+=item ngx_coolkit
+
+L<http://github.com/FRiCKLE/ngx_coolkit>
+
+=back
+
+=head1 SOURCE REPOSITORY
+
+This module has a Git repository on Github, which has access for all.
+
+    http://github.com/agentzh/test-nginx
+
+If you want a commit bit, feel free to drop me a line.
+
+=head1 AUTHORS
+
+agentzh (章亦春) C<< <agentzh@gmail.com> >>
+
+Antoine BONAVITA C<< <antoine.bonavita@gmail.com> >>
+
+=head1 COPYRIGHT & LICENSE
+
+Copyright (c) 2009-2011, Taobao Inc., Alibaba Group (L<http://www.taobao.com>).
+
+Copyright (c) 2009-2011, agentzh C<< <agentzh@gmail.com> >>.
+
+Copyright (c) 2011, Antoine BONAVITA C<< <antoine.bonavita@gmail.com> >>.
+
+This module is licensed under the terms of the BSD license.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+=over
+
+=item *
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+=item *
+
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+=item *
+
+Neither the name of the Taobao Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+=back
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=head1 SEE ALSO
+
+L<Test::Nginx::LWP>, L<Test::Base>.
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/Util.pm b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/Util.pm
new file mode 100644
index 0000000..bcfcf19
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/lib/Test/Nginx/Util.pm
@@ -0,0 +1,874 @@
+package Test::Nginx::Util;
+
+use strict;
+use warnings;
+
+our $VERSION = '0.17';
+
+use base 'Exporter';
+
+use POSIX qw( SIGQUIT SIGKILL SIGTERM );
+use File::Spec ();
+use HTTP::Response;
+use Cwd qw( cwd );
+use List::Util qw( shuffle );
+use Time::HiRes qw( sleep );
+use ExtUtils::MakeMaker ();
+
+our $LatestNginxVersion = 0.008039;
+
+our $NoNginxManager = $ENV{TEST_NGINX_NO_NGINX_MANAGER} || 0;
+our $Profiling = 0;
+
+our $RepeatEach = 1;
+our $MAX_PROCESSES = 10;
+
+our $NoShuffle = $ENV{TEST_NGINX_NO_SHUFFLE} || 0;
+
+our $UseValgrind = $ENV{TEST_NGINX_USE_VALGRIND};
+
+our $EventType = $ENV{TEST_NGINX_EVENT_TYPE};
+
+sub no_shuffle () {
+    $NoShuffle = 1;
+}
+
+sub no_nginx_manager () {
+    $NoNginxManager = 1;
+}
+
+our $ForkManager;
+
+if ($Profiling || $UseValgrind) {
+    eval "use Parallel::ForkManager";
+    if ($@) {
+        die "Failed to load Parallel::ForkManager: $@\n";
+    }
+    $ForkManager = new Parallel::ForkManager($MAX_PROCESSES);
+}
+
+our $NginxBinary            = $ENV{TEST_NGINX_BINARY} || 'nginx';
+our $Workers                = 1;
+our $WorkerConnections      = 64;
+our $LogLevel               = $ENV{TEST_NGINX_LOG_LEVEL} || 'debug';
+our $MasterProcessEnabled   = $ENV{TEST_NGINX_MASTER_PROCESS} || 'off';
+our $DaemonEnabled          = 'on';
+our $ServerPort             = $ENV{TEST_NGINX_SERVER_PORT} || $ENV{TEST_NGINX_PORT} || 1984;
+our $ServerPortForClient    = $ENV{TEST_NGINX_CLIENT_PORT} || $ENV{TEST_NGINX_PORT} || 1984;
+our $NoRootLocation         = 0;
+our $TestNginxSleep         = $ENV{TEST_NGINX_SLEEP} || 0;
+our $BuildSlaveName         = $ENV{TEST_NGINX_BUILDSLAVE};
+our $ForceRestartOnTest     = (defined $ENV{TEST_NGINX_FORCE_RESTART_ON_TEST})
+                               ? $ENV{TEST_NGINX_FORCE_RESTART_ON_TEST} : 1;
+
+sub server_port (@) {
+    if (@_) {
+        $ServerPort = shift;
+    } else {
+        $ServerPort;
+    }
+}
+
+sub repeat_each (@) {
+    if (@_) {
+        $RepeatEach = shift;
+    } else {
+        return $RepeatEach;
+    }
+}
+
+sub worker_connections (@) {
+    if (@_) {
+        $WorkerConnections = shift;
+    } else {
+        return $WorkerConnections;
+    }
+}
+
+sub no_root_location () {
+    $NoRootLocation = 1;
+}
+
+sub workers (@) {
+    if (@_) {
+        #warn "setting workers to $_[0]";
+        $Workers = shift;
+    } else {
+        return $Workers;
+    }
+}
+
+sub log_level (@) {
+    if (@_) {
+        $LogLevel = shift;
+    } else {
+        return $LogLevel;
+    }
+}
+
+sub master_on () {
+    $MasterProcessEnabled = 'on';
+}
+
+sub master_process_enabled (@) {
+    if (@_) {
+        $MasterProcessEnabled = shift() ? 'on' : 'off';
+    } else {
+        return $MasterProcessEnabled;
+    }
+}
+
+our @EXPORT_OK = qw(
+    setup_server_root
+    write_config_file
+    get_canon_version
+    get_nginx_version
+    trim
+    show_all_chars
+    parse_headers
+    run_tests
+    $ServerPortForClient
+    $ServerPort
+    $NginxVersion
+    $PidFile
+    $ServRoot
+    $ConfFile
+    $RunTestHelper
+    $NoNginxManager
+    $RepeatEach
+    worker_connections
+    workers
+    master_on
+    config_preamble
+    repeat_each
+    master_process_enabled
+    log_level
+    no_shuffle
+    no_root_location
+    html_dir
+    server_root
+    server_port
+    no_nginx_manager
+);
+
+
+if ($Profiling || $UseValgrind) {
+    $DaemonEnabled          = 'off';
+    $MasterProcessEnabled   = 'off';
+}
+
+our $ConfigPreamble = '';
+
+sub config_preamble ($) {
+    $ConfigPreamble = shift;
+}
+
+our $RunTestHelper;
+
+our $NginxVersion;
+our $NginxRawVersion;
+our $TODO;
+
+#our ($PrevRequest)
+our $PrevConfig;
+
+our $ServRoot   = $ENV{TEST_NGINX_SERVROOT} || File::Spec->catfile(cwd() || '.', 't/servroot');
+our $LogDir     = File::Spec->catfile($ServRoot, 'logs');
+our $ErrLogFile = File::Spec->catfile($LogDir, 'error.log');
+our $AccLogFile = File::Spec->catfile($LogDir, 'access.log');
+our $HtmlDir    = File::Spec->catfile($ServRoot, 'html');
+our $ConfDir    = File::Spec->catfile($ServRoot, 'conf');
+our $ConfFile   = File::Spec->catfile($ConfDir, 'nginx.conf');
+our $PidFile    = File::Spec->catfile($LogDir, 'nginx.pid');
+
+sub html_dir () {
+    return $HtmlDir;
+}
+
+sub server_root () {
+    return $ServRoot;
+}
+
+sub bail_out ($) {
+    Test::More::BAIL_OUT(@_);
+}
+
+sub run_tests () {
+    $NginxVersion = get_nginx_version();
+
+    if (defined $NginxVersion) {
+        #warn "[INFO] Using nginx version $NginxVersion ($NginxRawVersion)\n";
+    }
+
+    for my $block ($NoShuffle ? Test::Base::blocks() : shuffle Test::Base::blocks()) {
+        #for (1..3) {
+            run_test($block);
+        #}
+    }
+
+    if ($Profiling || $UseValgrind) {
+        $ForkManager->wait_all_children;
+    }
+}
+
+sub setup_server_root () {
+    if (-d $ServRoot) {
+        # Take special care, so we won't accidentally remove
+        # real user data when TEST_NGINX_SERVROOT is mis-used.
+        system("rm -rf $ConfDir > /dev/null") == 0 or
+            die "Can't remove $ConfDir";
+        system("rm -rf $HtmlDir > /dev/null") == 0 or
+            die "Can't remove $HtmlDir";
+        system("rm -rf $LogDir > /dev/null") == 0 or
+            die "Can't remove $LogDir";
+        system("rm -rf $ServRoot/*_temp > /dev/null") == 0 or
+            die "Can't remove $ServRoot/*_temp";
+        system("rmdir $ServRoot > /dev/null") == 0 or
+            die "Can't remove $ServRoot (not empty?)";
+    }
+    mkdir $ServRoot or
+        die "Failed to do mkdir $ServRoot\n";
+    mkdir $LogDir or
+        die "Failed to do mkdir $LogDir\n";
+    mkdir $HtmlDir or
+        die "Failed to do mkdir $HtmlDir\n";
+
+    my $index_file = "$HtmlDir/index.html";
+
+    open my $out, ">$index_file" or
+        die "Can't open $index_file for writing: $!\n";
+
+    print $out '<html><head><title>It works!</title></head><body>It works!</body></html>';
+
+    close $out;
+
+    mkdir $ConfDir or
+        die "Failed to do mkdir $ConfDir\n";
+}
+
+sub write_user_files ($) {
+    my $block = shift;
+
+    my $name = $block->name;
+
+    if ($block->user_files) {
+        my $raw = $block->user_files;
+
+        open my $in, '<', \$raw;
+
+        my @files;
+        my ($fname, $body, $date);
+        while (<$in>) {
+            if (/>>> (\S+)(?:\s+(.+))?/) {
+                if ($fname) {
+                    push @files, [$fname, $body, $date];
+                }
+
+                $fname = $1;
+                $date = $2;
+                undef $body;
+            } else {
+                $body .= $_;
+            }
+        }
+
+        if ($fname) {
+            push @files, [$fname, $body, $date];
+        }
+
+        for my $file (@files) {
+            my ($fname, $body, $date) = @$file;
+            #warn "write file $fname with content [$body]\n";
+
+            if (!defined $body) {
+                $body = '';
+            }
+
+            if ($fname =~ /(.*)\//) {
+                my $dir = "$HtmlDir/$1";
+                if (! -d $dir) {
+                    mkdir $dir or die "$name - Cannot create directory ", $dir;
+                }
+            }
+
+            open my $out, ">$HtmlDir/$fname" or
+                die "$name - Cannot open $HtmlDir/$fname for writing: $!\n";
+            print $out $body;
+            close $out;
+
+            if ($date) {
+                my $cmd = "touch -t '$date' $HtmlDir/$fname";
+                system($cmd) == 0 or
+                    die "Failed to run shell command: $cmd\n";
+            }
+        }
+    }
+}
+
+sub write_config_file ($$$) {
+    my ($config, $http_config, $main_config) = @_;
+
+    $http_config = expand_env_in_config($http_config);
+
+    if (!defined $config) {
+        $config = '';
+    }
+
+    if (!defined $http_config) {
+        $http_config = '';
+    }
+
+    if (!defined $main_config) {
+        $main_config = '';
+    }
+
+    open my $out, ">$ConfFile" or
+        die "Can't open $ConfFile for writing: $!\n";
+    print $out <<_EOC_;
+worker_processes  $Workers;
+daemon $DaemonEnabled;
+master_process $MasterProcessEnabled;
+error_log $ErrLogFile $LogLevel;
+pid       $PidFile;
+
+$main_config
+
+http {
+    access_log $AccLogFile;
+
+    default_type text/plain;
+    keepalive_timeout  68;
+
+$http_config
+
+    server {
+        listen          $ServerPort;
+        server_name     'localhost';
+
+        client_max_body_size 30M;
+        #client_body_buffer_size 4k;
+
+        # Begin preamble config...
+$ConfigPreamble
+        # End preamble config...
+
+        # Begin test case config...
+$config
+        # End test case config.
+
+_EOC_
+
+    if (! $NoRootLocation) {
+        print $out <<_EOC_;
+        location / {
+            root $HtmlDir;
+            index index.html index.htm;
+        }
+_EOC_
+    }
+
+    print $out <<_EOC_;
+    }
+}
+
+events {
+    worker_connections  $WorkerConnections;
+_EOC_
+
+    if ($EventType) {
+        print $out <<_EOC_;
+    use $EventType;
+_EOC_
+    }
+
+    print $out "}\n";
+
+    close $out;
+}
+
+sub get_canon_version (@) {
+    sprintf "%d.%03d%03d", $_[0], $_[1], $_[2];
+}
+
+sub get_nginx_version () {
+    my $out = `$NginxBinary -V 2>&1`;
+    if (!defined $out || $? != 0) {
+        warn "Failed to get the version of the Nginx in PATH.\n";
+    }
+    if ($out =~ m{(?:nginx|ngx_openresty)/(\d+)\.(\d+)\.(\d+)}s) {
+        $NginxRawVersion = "$1.$2.$3";
+        return get_canon_version($1, $2, $3);
+    }
+    warn "Failed to parse the output of \"nginx -V\": $out\n";
+    return undef;
+}
+
+sub get_pid_from_pidfile ($) {
+    my ($name) = @_;
+    open my $in, $PidFile or
+        bail_out("$name - Failed to open the pid file $PidFile for reading: $!");
+    my $pid = do { local $/; <$in> };
+    chomp $pid;
+    #warn "Pid: $pid\n";
+    close $in;
+    return $pid;
+}
+
+sub trim ($) {
+    (my $s = shift) =~ s/^\s+|\s+$//g;
+    $s =~ s/\n/ /gs;
+    $s =~ s/\s{2,}/ /gs;
+    $s;
+}
+
+sub show_all_chars ($) {
+    my $s = shift;
+    $s =~ s/\n/\\n/gs;
+    $s =~ s/\r/\\r/gs;
+    $s =~ s/\t/\\t/gs;
+    $s;
+}
+
+sub parse_headers ($) {
+    my $s = shift;
+    my %headers;
+    open my $in, '<', \$s;
+    while (<$in>) {
+        s/^\s+|\s+$//g;
+        my $neg = ($_ =~ s/^!\s*//);
+        #warn "neg: $neg ($_)";
+        if ($neg) {
+            $headers{$_} = undef;
+        } else {
+            my ($key, $val) = split /\s*:\s*/, $_, 2;
+            $headers{$key} = $val;
+        }
+    }
+    close $in;
+    return \%headers;
+}
+
+sub expand_env_in_config ($) {
+    my $config = shift;
+
+    if (!defined $config) {
+        return;
+    }
+
+    $config =~ s/\$(TEST_NGINX_[_A-Z0-9]+)/
+        if (!defined $ENV{$1}) {
+            bail_out "No environment $1 defined.\n";
+        }
+        $ENV{$1}/eg;
+
+    $config;
+}
+
+sub check_if_missing_directives () {
+    open my $in, $ErrLogFile or
+        bail_out "check_if_missing_directives: Cannot open $ErrLogFile for reading: $!\n";
+
+    while (<$in>) {
+        #warn $_;
+        if (/\[emerg\] \S+?: unknown directive "([^"]+)"/) {
+            #warn "MATCHED!!! $1";
+            return $1;
+        }
+    }
+
+    close $in;
+
+    #warn "NOT MATCHED!!!";
+
+    return 0;
+}
+
+sub run_test ($) {
+    my $block = shift;
+    my $name = $block->name;
+
+    my $config = $block->config;
+
+    $config = expand_env_in_config($config);
+
+    my $dry_run = 0;
+    my $should_restart = 1;
+    my $should_reconfig = 1;
+
+    if (!defined $config) {
+        if (!$NoNginxManager) {
+            # Manager without config.
+            if (!defined $PrevConfig) {
+                bail_out("$name - No '--- config' section specified and could not get previous one. Use TEST_NGINX_NO_NGINX_MANAGER ?");
+                die;
+            }
+            $should_reconfig = 0; # There is nothing to reconfig to.
+            $should_restart = $ForceRestartOnTest;
+        }
+        # else: not manager without a config. This is not a problem at all.
+        # setting these values to something meaningful but should not be used
+        $should_restart = 0;
+        $should_reconfig = 0;
+    } elsif ($NoNginxManager) {
+        # One config but not manager: it's worth a warning.
+        Test::Base::diag("NO_NGINX_MANAGER activated: config for $name ignored");
+        # Like above: setting them to something meaningful just in case.
+        $should_restart = 0;
+        $should_reconfig = 0;
+    } else {
+        # One config and manager. Restart only if forced to or if config
+        # changed.
+        if ((!defined $PrevConfig) || ($config ne $PrevConfig)) {
+            $should_reconfig = 1;
+        } else {
+            $should_reconfig = 0;
+        }
+        if ($should_reconfig || $ForceRestartOnTest) {
+            $should_restart = 1;
+        } else {
+            $should_restart = 0;
+        }
+    }
+
+    my $skip_nginx = $block->skip_nginx;
+    my $skip_nginx2 = $block->skip_nginx2;
+    my $skip_slave = $block->skip_slave;
+    my ($tests_to_skip, $should_skip, $skip_reason);
+    if (defined $skip_nginx) {
+        if ($skip_nginx =~ m{
+                ^ \s* (\d+) \s* : \s*
+                    ([<>]=?) \s* (\d+)\.(\d+)\.(\d+)
+                    (?: \s* : \s* (.*) )?
+                \s*$}x) {
+            $tests_to_skip = $1;
+            my ($op, $ver1, $ver2, $ver3) = ($2, $3, $4, $5);
+            $skip_reason = $6;
+            #warn "$ver1 $ver2 $ver3";
+            my $ver = get_canon_version($ver1, $ver2, $ver3);
+            if ((!defined $NginxVersion and $op =~ /^</)
+                    or eval "$NginxVersion $op $ver")
+            {
+                $should_skip = 1;
+            }
+        } else {
+            bail_out("$name - Invalid --- skip_nginx spec: " .
+                $skip_nginx);
+            die;
+        }
+    } elsif (defined $skip_nginx2) {
+        if ($skip_nginx2 =~ m{
+                ^ \s* (\d+) \s* : \s*
+                    ([<>]=?) \s* (\d+)\.(\d+)\.(\d+)
+                    \s* (or|and) \s*
+                    ([<>]=?) \s* (\d+)\.(\d+)\.(\d+)
+                    (?: \s* : \s* (.*) )?
+                \s*$}x) {
+            $tests_to_skip = $1;
+            my ($opa, $ver1a, $ver2a, $ver3a) = ($2, $3, $4, $5);
+            my $opx = $6;
+            my ($opb, $ver1b, $ver2b, $ver3b) = ($7, $8, $9, $10);
+            $skip_reason = $11;
+            my $vera = get_canon_version($ver1a, $ver2a, $ver3a);
+            my $verb = get_canon_version($ver1b, $ver2b, $ver3b);
+
+            if ((!defined $NginxVersion)
+                or (($opx eq "or") and (eval "$NginxVersion $opa $vera"
+                                        or eval "$NginxVersion $opb $verb"))
+                or (($opx eq "and") and (eval "$NginxVersion $opa $vera"
+                                        and eval "$NginxVersion $opb $verb")))
+            {
+                $should_skip = 1;
+            }
+        } else {
+            bail_out("$name - Invalid --- skip_nginx2 spec: " .
+                $skip_nginx2);
+            die;
+        }
+    } elsif (defined $skip_slave and defined $BuildSlaveName) {
+        if ($skip_slave =~ m{
+              ^ \s* (\d+) \s* : \s*
+                (\w+) \s* (?: (\w+) \s* )?  (?: (\w+) \s* )?
+                (?: \s* : \s* (.*) )? \s*$}x)
+        {
+            $tests_to_skip = $1;
+            my ($slave1, $slave2, $slave3) = ($2, $3, $4);
+            $skip_reason = $5;
+            if ((defined $slave1 and $slave1 eq "all")
+                or (defined $slave1 and $slave1 eq $BuildSlaveName)
+                or (defined $slave2 and $slave2 eq $BuildSlaveName)
+                or (defined $slave3 and $slave3 eq $BuildSlaveName)
+                )
+            {
+                $should_skip = 1;
+            }
+        } else {
+            bail_out("$name - Invalid --- skip_slave spec: " .
+                $skip_slave);
+            die;
+        }
+    }
+
+    if (!defined $skip_reason) {
+        $skip_reason = "various reasons";
+    }
+
+    my $todo_nginx = $block->todo_nginx;
+    my ($should_todo, $todo_reason);
+    if (defined $todo_nginx) {
+        if ($todo_nginx =~ m{
+                ^ \s*
+                    ([<>]=?) \s* (\d+)\.(\d+)\.(\d+)
+                    (?: \s* : \s* (.*) )?
+                \s*$}x) {
+            my ($op, $ver1, $ver2, $ver3) = ($1, $2, $3, $4);
+            $todo_reason = $5;
+            my $ver = get_canon_version($ver1, $ver2, $ver3);
+            if ((!defined $NginxVersion and $op =~ /^</)
+                    or eval "$NginxVersion $op $ver")
+            {
+                $should_todo = 1;
+            }
+        } else {
+            bail_out("$name - Invalid --- todo_nginx spec: " .
+                $todo_nginx);
+            die;
+        }
+    }
+
+    if (!defined $todo_reason) {
+        $todo_reason = "various reasons";
+    }
+
+    if (!$NoNginxManager && !$should_skip && $should_restart) {
+        if ($should_reconfig) {
+            $PrevConfig = $config;
+        }
+        my $nginx_is_running = 1;
+        if (-f $PidFile) {
+            my $pid = get_pid_from_pidfile($name);
+            if (!defined $pid or $pid eq '') {
+                undef $nginx_is_running;
+                goto start_nginx;
+            }
+
+            if (system("ps $pid > /dev/null") == 0) {
+                #warn "found running nginx...";
+                write_config_file($config, $block->http_config, $block->main_config);
+                if (kill(SIGQUIT, $pid) == 0) { # send quit signal
+                    #warn("$name - Failed to send quit signal to the nginx process with PID $pid");
+                }
+                sleep 0.02;
+                if (system("ps $pid > /dev/null") == 0) {
+                    #warn "killing with force...\n";
+                    kill(SIGKILL, $pid);
+                    sleep 0.02;
+                }
+                undef $nginx_is_running;
+            } else {
+                unlink $PidFile or
+                    die "Failed to remove pid file $PidFile\n";
+                undef $nginx_is_running;
+            }
+        } else {
+            undef $nginx_is_running;
+        }
+
+start_nginx:
+
+        unless ($nginx_is_running) {
+            #system("killall -9 nginx");
+
+            #warn "*** Restarting the nginx server...\n";
+            setup_server_root();
+            write_user_files($block);
+            write_config_file($config, $block->http_config, $block->main_config);
+            #warn "nginx binary: $NginxBinary";
+            if ( ! can_run($NginxBinary) ) {
+                bail_out("$name - Cannot find the nginx executable in the PATH environment");
+                die;
+            }
+        #if (system("nginx -p $ServRoot -c $ConfFile -t") != 0) {
+        #Test::More::BAIL_OUT("$name - Invalid config file");
+        #}
+        #my $cmd = "nginx -p $ServRoot -c $ConfFile > /dev/null";
+            if (!defined $NginxVersion) {
+                $NginxVersion = $LatestNginxVersion;
+            }
+
+            my $cmd;
+            if ($NginxVersion >= 0.007053) {
+                $cmd = "$NginxBinary -p $ServRoot/ -c $ConfFile > /dev/null";
+            } else {
+                $cmd = "$NginxBinary -c $ConfFile > /dev/null";
+            }
+
+            if ($UseValgrind) {
+                if (-f 'valgrind.suppress') {
+                    $cmd = "valgrind -q --leak-check=full --gen-suppressions=all --suppressions=valgrind.suppress $cmd";
+                } else {
+                    $cmd = "valgrind -q --leak-check=full --gen-suppressions=all $cmd";
+                }
+
+                warn "$name\n";
+                #warn "$cmd\n";
+            }
+
+            if ($Profiling || $UseValgrind) {
+                my $pid = $ForkManager->start;
+                if (!$pid) {
+                    # child process
+                    exec $cmd;
+
+=begin cmt
+
+                    if (system($cmd) != 0) {
+                        Test::More::BAIL_OUT("$name - Cannot start nginx using command \"$cmd\".");
+                    }
+
+                    $ForkManager->finish; # terminate the child process
+
+=end cmt
+
+=cut
+
+                }
+                #warn "sleeping";
+                if ($TestNginxSleep) {
+                    sleep $TestNginxSleep;
+                } else {
+                    sleep 1;
+                }
+            } else {
+                if (system($cmd) != 0) {
+                    if ($ENV{TEST_NGINX_IGNORE_MISSING_DIRECTIVES} and
+                            my $directive = check_if_missing_directives())
+                    {
+                        $dry_run = $directive;
+
+                    } else {
+                        bail_out("$name - Cannot start nginx using command \"$cmd\".");
+                    }
+                }
+            }
+
+            sleep 0.1;
+        }
+    }
+
+    if ($block->init) {
+        eval $block->init;
+        if ($@) {
+            bail_out("$name - init failed: $@");
+        }
+    }
+
+    my $i = 0;
+    while ($i++ < $RepeatEach) {
+        if ($should_skip) {
+            SKIP: {
+                Test::More::skip("$name - $skip_reason", $tests_to_skip);
+
+                $RunTestHelper->($block, $dry_run);
+            }
+        } elsif ($should_todo) {
+            TODO: {
+                local $TODO = "$name - $todo_reason";
+
+                $RunTestHelper->($block, $dry_run);
+            }
+        } else {
+            $RunTestHelper->($block, $dry_run);
+        }
+    }
+
+    if (my $total_errlog = $ENV{TEST_NGINX_ERROR_LOG}) {
+        my $errlog = "$LogDir/error.log";
+        if (-s $errlog) {
+            open my $out, ">>$total_errlog" or
+                die "Failed to append test case title to $total_errlog: $!\n";
+            print $out "\n=== $0 $name\n";
+            close $out;
+            system("cat $errlog >> $total_errlog") == 0 or
+                die "Failed to append $errlog to $total_errlog. Abort.\n";
+        }
+    }
+
+    if ($Profiling || $UseValgrind) {
+        #warn "Found quit...";
+        if (-f $PidFile) {
+            #warn "found pid file...";
+            my $pid = get_pid_from_pidfile($name);
+            if (system("ps $pid > /dev/null") == 0) {
+                write_config_file($config, $block->http_config, $block->main_config);
+                if (kill(SIGQUIT, $pid) == 0) { # send quit signal
+                    warn("$name - Failed to send quit signal to the nginx process with PID $pid");
+                }
+                if ($TestNginxSleep) {
+                    sleep $TestNginxSleep;
+                } else {
+                    sleep 0.1;
+                }
+                if (-f $PidFile) {
+                    #warn "killing with force (valgrind or profile)...\n";
+                    kill(SIGKILL, $pid);
+                    sleep 0.02;
+                } else {
+                    #warn "nginx killed";
+                }
+            } else {
+                unlink $PidFile or
+                    die "Failed to remove pid file $PidFile\n";
+            }
+        } else {
+            #warn "pid file not found";
+        }
+    }
+}
+
+END {
+    if ($UseValgrind || !$ENV{TEST_NGINX_NO_CLEAN}) {
+        local $?; # to avoid confusing Test::Builder::_ending
+        if (-f $PidFile) {
+            my $pid = get_pid_from_pidfile('');
+            if (!$pid) {
+                die "No pid found.";
+            }
+            if (system("ps $pid > /dev/null") == 0) {
+                if (kill(SIGQUIT, $pid) == 0) { # send quit signal
+                    #warn("Failed to send quit signal to the nginx process with PID $pid");
+                }
+                if ($TestNginxSleep) {
+                    sleep $TestNginxSleep;
+                } else {
+                    sleep 0.02;
+                }
+                if (system("ps $pid > /dev/null") == 0) {
+                    #warn "killing with force...\n";
+                    kill(SIGKILL, $pid);
+                    sleep 0.02;
+                }
+            } else {
+                unlink $PidFile;
+            }
+        }
+    }
+}
+
+# check if we can run some command
+sub can_run {
+	my ($cmd) = @_;
+
+        #warn "can run: @_\n";
+	my $_cmd = $cmd;
+	return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
+
+	for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+		next if $dir eq '';
+		my $abs = File::Spec->catfile($dir, $_[0]);
+		return $abs if (-x $abs or $abs = MM->maybe_command($abs));
+	}
+
+	return;
+}
+
+1;
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs.t b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs.t
new file mode 100644
index 0000000..ad26c5d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs.t
@@ -0,0 +1,136 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::LWP;
+
+plan tests => repeat_each() * 2 * blocks();
+$ENV{TEST_NGINX_BACKENDS_PORT} ||= "www.taobao.com:80";
+no_root_location();
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: the "substitution" command
+
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    location / {
+        subs_filter 'taobao\.com' 'yaoweibin' ir;
+        proxy_set_header Host 'www.taobao.com';
+        proxy_pass http://backends;
+    }
+--- request
+    GET /
+--- response_body_unlike: ^(.*)taobao\.com(.*)$
+
+=== TEST 2: the "substitution" command with gzip
+
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    location / {
+        gzip on;
+        gzip_http_version 1.0;
+        proxy_set_header Accept-Encoding "";
+        proxy_pass http://yaoweibin.cn/test/subs/index.htm;
+        subs_filter 'taobao\.com' 'yaoweibin' ir;
+    }
+--- request
+    GET /
+--- more_headers
+Accept-Encoding:gzip;
+--- response_body_like: ^(.*)$
+
+=== TEST 3: the "substitution" command with large line
+
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    location / {
+        subs_filter_types text/plain;
+        subs_filter 'a' 'b' ir;
+    }
+--- user_files
+>>> foo.txt
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+--- request
+    GET /foo.txt
+--- response_body_like: ^[b ]+$
+
+=== TEST 4: the "substitution" command with large line
+
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    location / {
+        subs_filter_types text/plain;
+        subs_filter 'a' 'b' iro;
+    }
+--- user_files
+>>> foo.txt
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+--- request
+    GET /foo.txt
+--- response_body_like: ^b[a ]+$
+
+=== TEST 5: the "substitution" command with large line
+
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    
+    location / {
+        subs_filter_types text/plain;
+        subs_filter 'a' 'b';
+    }
+--- user_files
+>>> foo.txt
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+--- request
+    GET /foo.txt
+--- response_body_like: ^[b ]+$
+
+=== TEST 6: the "substitution" command with large line
+
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    
+    location / {
+        subs_filter_types text/plain;
+        subs_filter 'a' 'b' o;
+    }
+--- user_files
+>>> foo.txt
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+--- request
+    GET /foo.txt
+--- response_body_like: ^b[a ]+$
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_capture.t b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_capture.t
new file mode 100644
index 0000000..7ae6d29
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_capture.t
@@ -0,0 +1,32 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::LWP;
+
+plan tests => repeat_each() * 2 * blocks();
+$ENV{TEST_NGINX_BACKENDS_PORT} ||= "www.taobao.com:80";
+no_root_location();
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: the "regex with captures substitution" command
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+
+    location / {
+        subs_filter 'taobao.(com)' 'yaoweibin.$1' ir;
+        proxy_set_header Host 'www.taobao.com';
+        proxy_pass http://backends;
+    }
+--- request
+    GET /
+--- response_body_unlike: ^(.*)taobao.com(.*)$
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_fix_string.t b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_fix_string.t
new file mode 100644
index 0000000..725125c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_fix_string.t
@@ -0,0 +1,32 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::LWP;
+
+plan tests => repeat_each() * 2 * blocks();
+$ENV{TEST_NGINX_BACKENDS_PORT} ||= "www.taobao.com:80";
+no_root_location();
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: the "fix string substitution" command
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+
+    location / {
+        subs_filter 'taobao.com' 'yaoweibin';
+        proxy_set_header Host 'www.taobao.com';
+        proxy_pass http://backends;
+    }
+--- request
+    GET /
+--- response_body_unlike: ^(.*)taobao\.com(.*)$
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_regex.t b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_regex.t
new file mode 100644
index 0000000..4e39a11
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_regex.t
@@ -0,0 +1,108 @@
+
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::LWP;
+
+plan tests => repeat_each() * 2 * blocks();
+$ENV{TEST_NGINX_BACKENDS_PORT} ||= "www.taobao.com:80";
+no_root_location();
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: the "regex substitution" command
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+
+    location / {
+        subs_filter 'taobao.com' 'yaoweibin' ir;
+        proxy_set_header Host 'www.taobao.com';
+        proxy_pass http://backends;
+    }
+--- request
+    GET /
+--- response_body_unlike: ^(.*)taobao.com(.*)$
+
+=== TEST 2: the "subs_filter_bypass" directive, one variable
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    set $bypass "1";
+    location / {
+        subs_filter 'taobao.com' 'yaoweibin' ir;
+        subs_filter_bypass $bypass;
+        proxy_set_header Host 'www.taobao.com';
+        proxy_pass http://backends;
+    }
+--- request
+    GET /
+--- response_body_like: ^(.*)taobao.com(.*)$
+
+=== TEST 3: the "subs_filter_bypass" directive, two variables
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    set $foo "0";
+    set $bypass "1";
+    location / {
+        subs_filter 'taobao.com' 'yaoweibin' ir;
+        subs_filter_bypass $foo $bypass;
+        proxy_set_header Host 'www.taobao.com';
+        proxy_pass http://backends;
+    }
+--- request
+    GET /
+--- response_body_like: ^(.*)taobao.com(.*)$
+
+=== TEST 4: the "subs_filter_bypass" directive, raw string
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    location / {
+        subs_filter 'taobao.com' 'yaoweibin' ir;
+        subs_filter_bypass "1";
+        proxy_set_header Host 'www.taobao.com';
+        proxy_pass http://backends;
+    }
+--- request
+    GET /
+--- response_body_like: ^(.*)taobao.com(.*)$
+
+=== TEST 5: the "subs_filter_bypass" directive, raw string
+--- http_config
+
+    upstream backends {
+        server $TEST_NGINX_BACKENDS_PORT;
+    }
+
+--- config
+    location / {
+        subs_filter 'taobao.com' 'yaoweibin' ir;
+        subs_filter_bypass "0";
+        proxy_set_header Host 'www.taobao.com';
+        proxy_pass http://backends;
+    }
+--- request
+    GET /
+--- response_body_unlike: ^(.*)taobao.com(.*)$
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_types.t b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_types.t
new file mode 100644
index 0000000..32e1d88
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/t/subs_types.t
@@ -0,0 +1,59 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::LWP;
+
+plan tests => repeat_each() * 2 * blocks();
+no_root_location();
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: the "substitution" command with default types
+--- config
+    location / {
+        subs_filter 'tom' 'yaoweibin' ir;
+        root html;
+    }
+--- user_files
+>>> a.html
+tom and jerry
+--- request
+    GET /a.html
+--- response_body_unlike: ^(.*)tom(.*)$
+
+=== TEST 2: the "substitution" command with css types
+--- config
+    location / {
+        subs_filter_types text/css;
+        subs_filter 'tom' 'yaoweibin' ir;
+        root html;
+    }
+--- user_files
+>>> a.xml
+tom and jerry
+--- request
+    GET /a.xml
+--- response_body_like: ^(.*)tom(.*)$
+
+=== TEST 3: the "substitution" command with xml types
+--- config
+    types {
+        text/html html;
+        text/xml xml;
+        text/css  css;
+    }
+    location / {
+        subs_filter_types text/xml;
+        subs_filter 'tom' 'yaoweibin' ir;
+        root html;
+    }
+--- user_files
+>>> a.xml
+tom and jerry
+--- request
+    GET /a.xml
+--- response_body_unlike: ^(.*)tom(.*)$
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/test.sh b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/test.sh
new file mode 100755
index 0000000..3716b92
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/test/test.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+#TEST_NGINX_BACKENDS_PORT=127.0.0.1:1234 PATH=/home/yaoweibin/nginx/sbin:$PATH prove -r t
+
+PATH=/home/yaoweibin/nginx/sbin:$PATH prove -r t
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/update-readme.sh b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/update-readme.sh
new file mode 100755
index 0000000..81498d5
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/update-readme.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+perl util/wiki2pod.pl doc/README.wiki > /tmp/a.pod && pod2text /tmp/a.pod > README
+
+perl util/wiki2pod.pl doc/README.wiki > /tmp/a.pod && pod2html /tmp/a.pod > doc/README.html
+
+perl util/wiki2google_code_homepage.pl doc/README.wiki > doc/README.google_code_home_page.wiki
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/wiki2google_code_homepage.pl b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/wiki2google_code_homepage.pl
new file mode 100644
index 0000000..88970a6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/wiki2google_code_homepage.pl
@@ -0,0 +1,29 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use bytes;
+
+while (<>) {
+
+    s{\s\[ ( [^\[\s]+ ) \]\s }{" `[`$1`]` "}gixe;
+
+    s{ \[\[ ( [^\]\|]+ ) \| ([^\]]*) \]\] }{"[$1 $2]"}gixe;
+
+    s{'''(.*?)'''}{"`$1`"}ge;
+    s{''(.*?)''}{"_$1_"}ge;
+
+    s{^\s*<[^/>]+>\s*$}{\{\{\{\n};
+    s{^\s*</[^/]+>\s*$}{\}\}\}};
+
+    if (/^\s*$/) {
+        print "\n";
+        next;
+    }
+
+    s{^\*}{ \*};
+    s{^\#}{ \#};
+
+    print $_;
+}
+
diff --git a/modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/wiki2pod.pl b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/wiki2pod.pl
new file mode 100644
index 0000000..34904fc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-subs-filter-0.6.4/util/wiki2pod.pl
@@ -0,0 +1,129 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use bytes;
+
+my @nl_counts;
+my $last_nl_count_level;
+
+my @bl_counts;
+my $last_bl_count_level;
+
+sub fmt_pos ($) {
+    (my $s = $_[0]) =~ s{\#(.*)}{/"$1"};
+    $s;
+}
+
+sub fmt_mark ($$) {
+    my ($tag, $s) = @_;
+    my $max_level = 0;
+    while ($s =~ /([<>])\1*/g) {
+        my $level = length $&;
+        if ($level > $max_level) {
+            $max_level = $level;
+        }
+    }
+
+    my $times = $max_level + 1;
+    if ($times > 1) {
+        $s = " $s ";
+    }
+    return $tag . ('<' x $times) . $s . ('>' x $times);
+}
+
+while (<>) {
+    if ($. == 1) {
+        # strip the leading U+FEFF byte in MS-DOS text files
+        my $first = ord(substr($_, 0, 1));
+        #printf STDERR "0x%x", $first;
+        #my $second = ord(substr($_, 2, 1));
+        #printf STDERR "0x%x", $second;
+        if ($first == 0xEF) {
+            substr($_, 0, 1, '');
+            #warn "Hit!";
+        }
+    }
+    s{\[(http[^ \]]+) ([^\]]*)\]}{$2 (L<$1>)}gi;
+    s{ \[\[ ( [^\]\|]+ ) \| ([^\]]*) \]\] }{"L<$2|" . fmt_pos($1) . ">"}gixe;
+    s{<code>(.*?)</code>}{fmt_mark('C', $1)}gie;
+    s{'''(.*?)'''}{fmt_mark('B', $1)}ge;
+    s{''(.*?)''}{fmt_mark('I', $1)}ge;
+    if (s{^\s*<[^>]+>\s*$}{}) {
+        next;
+    }
+
+    if (/^\s*$/) {
+        print "\n";
+        next;
+    }
+
+=begin cmt
+
+    if ($. == 1) {
+        warn $_;
+        for my $i (0..length($_) - 1) {
+            my $chr = substr($_, $i, 1);
+            warn "chr ord($i): ".ord($chr)." \"$chr\"\n";
+        }
+    }
+
+=end cmt
+=cut
+
+    if (/(=+) (.*) \1$/) {
+        #warn "HERE! $_" if $. == 1;
+        my ($level, $title) = (length $1, $2);
+        collapse_lists();
+
+        print "\n=head$level $title\n\n";
+    } elsif (/^(\#+) (.*)/) {
+        my ($level, $txt) = (length($1) - 1, $2);
+        if (defined $last_nl_count_level && $level != $last_nl_count_level) {
+            print "\n=back\n\n";
+        }
+        $last_nl_count_level = $level;
+        $nl_counts[$level] ||= 0;
+        if ($nl_counts[$level] == 0) {
+            print "\n=over\n\n";
+        }
+        $nl_counts[$level]++;
+        print "\n=item $nl_counts[$level].\n\n";
+        print "$txt\n";
+    } elsif (/^(\*+) (.*)/) {
+        my ($level, $txt) = (length($1) - 1, $2);
+        if (defined $last_bl_count_level && $level != $last_bl_count_level) {
+            print "\n=back\n\n";
+        }
+        $last_bl_count_level = $level;
+        $bl_counts[$level] ||= 0;
+        if ($bl_counts[$level] == 0) {
+            print "\n=over\n\n";
+        }
+        $bl_counts[$level]++;
+        print "\n=item *\n\n";
+        print "$txt\n";
+    } else {
+        collapse_lists();
+        print;
+    }
+}
+
+collapse_lists();
+
+sub collapse_lists {
+    while (defined $last_nl_count_level && $last_nl_count_level >= 0) {
+        print "\n=back\n\n";
+        $last_nl_count_level--;
+    }
+    undef $last_nl_count_level;
+    undef @nl_counts;
+
+    while (defined $last_bl_count_level && $last_bl_count_level >= 0) {
+        print "\n=back\n\n";
+        $last_bl_count_level--;
+    }
+    undef $last_bl_count_level;
+    undef @bl_counts;
+}
+
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/.gdbinit b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/.gdbinit
new file mode 100644
index 0000000..775ba29
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/.gdbinit
@@ -0,0 +1,39 @@
+define show_fair_peer
+	set $n = (ngx_http_upstream_fair_shm_block_t *)$arg0
+	set $peers = $n->peers
+	printf "upstream id: 0x%08x (%s), current peer: %d/%d\n", $n->node.key, $peers->name.data, $peers->current, $peers->number
+	set $i = 0
+	while $i < $peers->number
+		set $peer = &$peers->peer[$i]
+		printf "peer %d: %s weight: %d/%d fails: %d/%d acc: %d down: %d nreq: %u last_req_id: %u\n", $i, $peer->name.data,\
+			$peer->shared->current_weight, $peer->weight,\
+			$peer->shared->fails, $peer->max_fails,\
+			$peer->accessed, $peer->down,\
+			$peer->shared->nreq, $peer->shared->last_req_id
+		set $i = $i + 1
+	end
+	printf "-----------------\n"
+	if ($n->node.left != $arg1)
+		show_fair_peer $n->node.left $arg1
+	end
+	if ($n->node.right != $arg1)
+		show_fair_peer $n->node.right $arg1
+	end
+end
+
+define show_fair_peers
+	set $tree = ngx_http_upstream_fair_rbtree
+	if (!$tree)
+		printf "Cannot find the upstream_fair peer information tree\n"
+	else
+		set $root = (ngx_http_upstream_fair_shm_block_t *)($tree->root)
+		if ($root != $tree->sentinel)
+			show_fair_peer $root $tree->sentinel
+		else
+			printf "No upstream_fair peer information\n"
+		end
+	end
+end
+document show_fair_peers
+Dump upstream_fair peer infromation
+end
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/README b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/README
new file mode 100644
index 0000000..18802e1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/README
@@ -0,0 +1,53 @@
+Nginx Upstream Fair Proxy Load Balancer
+--
+
+Description:
+--
+
+The Nginx fair proxy balancer enhances the standard round-robin load balancer provided
+with Nginx so that it will track busy back end servers (e.g. Thin, Ebb, Mongrel)
+and balance the load to non-busy server processes.
+
+Further information can be found on http://nginx.localdomain.pl/
+
+Ezra Zygmuntowicz has a good writeup of the fair proxy load balancer and how to use it here:
+http://brainspl.at/articles/2007/11/09/a-fair-proxy-balancer-for-nginx-and-mongrel
+
+
+Installation:
+--
+
+You'll need to re-compile Nginx from source to include this module.
+Modify your compile of Nginx by adding the following directive
+(modified to suit your path of course):
+
+./configure --with-http_ssl_module --add-module=/absolute/path/to/nginx-upstream-fair
+make
+make install
+
+
+Usage:
+--
+
+Change your Nginx config file's upstream block to include the 'fair' directive:
+
+upstream mongrel {
+    fair;
+    server 127.0.0.1:5000;
+    server 127.0.0.1:5001;
+    server 127.0.0.1:5002;
+  }
+
+
+If you encounter any issues, please report them using the bugtracker at
+http://nginx.localdomain.pl/
+
+Contributing:
+--
+
+Git source repositories:
+http://github.com/gnosek/nginx-upstream-fair/tree/master
+http://git.localdomain.pl/?p=nginx-upstream-fair.git;a=summary
+
+Please feel free to fork the project at GitHub and submit pull requests or patches.
+
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/config b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/config
new file mode 100644
index 0000000..d8d478b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/config
@@ -0,0 +1,12 @@
+ngx_addon_name=ngx_http_upstream_fair_module
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP
+    ngx_module_name=ngx_http_upstream_fair_module
+    ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_fair_module.c"
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
+fi
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/changelog b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/changelog
new file mode 100644
index 0000000..b43207d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/changelog
@@ -0,0 +1,44 @@
+libnginx-mod-http-upstream-fair (1:0.0~git20120408.a18b409-6) unstable; urgency=medium
+
+  * d/control: update my email to janmojzis@debian.org
+  * d/copyright: update my email to janmojzis@debian.org
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/copyright: bump debian/* copyright year
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 11 Apr 2025 14:27:03 +0200
+
+libnginx-mod-http-upstream-fair (1:0.0~git20120408.a18b409-5) unstable; urgency=medium
+
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 15:31:28 +0200
+
+libnginx-mod-http-upstream-fair (1:0.0~git20120408.a18b409-4) unstable; urgency=medium
+
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:16:41 +0200
+
+libnginx-mod-http-upstream-fair (1:0.0~git20120408.a18b409-3) unstable; urgency=medium
+
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/gbb.conf: switched to debian branch main (debian-branch = main)
+  * d/copyright: bump my copyright year
+  * d/copyright: update text to be compatible with 'cme update dpkg-copyright'
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:49 +0100
+
+libnginx-mod-http-upstream-fair (1:0.0~git20120408.a18b409-2) unstable; urgency=medium
+
+  * d/control: added Multi-Arch: foreign
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Fri, 09 Dec 2022 12:50:31 +0100
+
+libnginx-mod-http-upstream-fair (1:0.0~git20120408.a18b409-1) experimental; urgency=medium
+
+  * Initial release. (Closes: 1024379)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 14:46:59 +0100
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/control b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/control
new file mode 100644
index 0000000..12c9b1f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/control
@@ -0,0 +1,23 @@
+Source: libnginx-mod-http-upstream-fair
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jan Mojžíš <janmojzis@debian.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+Standards-Version: 4.7.2
+Homepage: https://github.com/gnosek/nginx-upstream-fair
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-upstream-fair.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-upstream-fair
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-upstream-fair
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: Nginx Upstream Fair Proxy Load Balancer
+ The Nginx fair proxy balancer enhances the standard round-robin load balancer
+ provided with Nginx so that it tracks busy backend servers and adjusts
+ balancing accordingly.
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/copyright b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/copyright
new file mode 100644
index 0000000..7a26e54
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/copyright
@@ -0,0 +1,39 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nginx-upstream-fair
+Upstream-Contact: Grzegorz Nosek <grzegorz.nosek@gmail.com>
+Source: https://github.com/gnosek/nginx-upstream-fair
+
+Files: *
+Copyright: Igor Sysoev
+ 2007, Grzegorz Nosek
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022, Miao Wang <shankerwangmiao@gmail.com>
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-2-clause
+
+License: BSD-2-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/gbp.conf b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/gbp.conf
new file mode 100644
index 0000000..38c12c1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/drop-default-port.patch b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/drop-default-port.patch
new file mode 100644
index 0000000..708caa0
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/drop-default-port.patch
@@ -0,0 +1,37 @@
+From d754c97abc103f6cb3c4d9385daa8547245a07e6 Mon Sep 17 00:00:00 2001
+From: Christos Trochalakis <yatiohi@ideopolis.gr>
+Date: Wed, 16 Nov 2016 10:52:08 +0200
+Subject: [PATCH] Don't use default_port (dropped in nginx 1.11.6)
+
+See:
+4dea01cf49e8 Upstream: removed ngx_http_upstream_srv_conf_t.default_port.
+3fa5983b6b44 Upstream: don't consider default_port when matching upstreams.
+---
+ ngx_http_upstream_fair_module.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c
+index a4419ca..5d76bb4 100644
+--- a/ngx_http_upstream_fair_module.c
++++ b/ngx_http_upstream_fair_module.c
+@@ -540,7 +540,7 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+ 
+     /* an upstream implicitly defined by proxy_pass, etc. */
+ 
+-    if (us->port == 0 && us->default_port == 0) {
++    if (us->port == 0) {
+         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                       "no port in upstream \"%V\" in %s:%ui",
+                       &us->host, us->file_name, us->line);
+@@ -550,7 +550,7 @@ ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+     ngx_memzero(&u, sizeof(ngx_url_t));
+ 
+     u.host = us->host;
+-    u.port = (in_port_t) (us->port ? us->port : us->default_port);
++    u.port = (in_port_t) us->port;
+ 
+     if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
+         if (u.err) {
+-- 
+2.10.2
+
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/dynamic-module.patch b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/dynamic-module.patch
new file mode 100644
index 0000000..0e00466
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/dynamic-module.patch
@@ -0,0 +1,29 @@
+From 725c58638f5d1921ad5d4a39274edb81bc5b47e6 Mon Sep 17 00:00:00 2001
+From: 99999 <PeterTonoli@users.noreply.github.com>
+Date: Sat, 30 Apr 2016 23:56:19 +1000
+Subject: [PATCH] nginx-upstream-fair can now be compiled as a dynamic module
+Origin: other, https://github.com/gnosek/nginx-upstream-fair/pull/21
+
+---
+ config | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/config b/config
+index ff351b7..d8d478b 100644
+--- a/config
++++ b/config
+@@ -1,3 +1,12 @@
+ ngx_addon_name=ngx_http_upstream_fair_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
++
++if test -n "$ngx_module_link"; then
++    ngx_module_type=HTTP
++    ngx_module_name=ngx_http_upstream_fair_module
++    ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_fair_module.c"
++
++    . auto/module
++else
++    HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
++    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
++fi
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/openssl-1.1.0.patch b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/openssl-1.1.0.patch
new file mode 100644
index 0000000..c154daa
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/openssl-1.1.0.patch
@@ -0,0 +1,50 @@
+From cfdf4ffa18e812cbbff3872c1026c3c072d22c09 Mon Sep 17 00:00:00 2001
+From: Kurt Roeckx <kurt@roeckx.be>
+Date: Fri, 2 Sep 2016 23:04:36 +0200
+Subject: [PATCH] Make it build using OpenSSL 1.1.0
+Origin: other, https://github.com/gnosek/nginx-upstream-fair/pull/22
+
+The reference counter is now internal in OpenSSL and not accessible any more.
+---
+ ngx_http_upstream_fair_module.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c
+index a4419ca..6353f1b 100644
+--- a/ngx_http_upstream_fair_module.c
++++ b/ngx_http_upstream_fair_module.c
+@@ -1174,9 +1174,8 @@ ngx_http_upstream_fair_set_session(ngx_peer_connection_t *pc, void *data)
+ 
+     rc = ngx_ssl_set_session(pc->connection, ssl_session);
+ 
+-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+-                   "set session: %p:%d",
+-                   ssl_session, ssl_session ? ssl_session->references : 0);
++    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
++                   "set session: %p", ssl_session);
+ 
+     /* ngx_unlock_mutex(fp->peers->mutex); */
+ 
+@@ -1200,8 +1199,8 @@ ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc, void *data)
+         return;
+     }
+ 
+-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+-                   "save session: %p:%d", ssl_session, ssl_session->references);
++    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
++                   "save session: %p", ssl_session);
+ 
+     peer = &fp->peers->peer[fp->current];
+ 
+@@ -1215,9 +1214,8 @@ ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc, void *data)
+ 
+     if (old_ssl_session) {
+ 
+-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+-                       "old session: %p:%d",
+-                       old_ssl_session, old_ssl_session->references);
++        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
++                       "old session: %p", old_ssl_session);
+ 
+         /* TODO: may block */
+ 
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/series b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/series
new file mode 100644
index 0000000..f8e5439
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/patches/series
@@ -0,0 +1,3 @@
+dynamic-module.patch
+openssl-1.1.0.patch
+drop-default-port.patch
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/rules b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/source/format b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/control b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/control
new file mode 100644
index 0000000..ca20b9f
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/control
@@ -0,0 +1,6 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/generic b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/upstream/metadata b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/upstream/metadata
new file mode 100644
index 0000000..0589425
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/gnosek/nginx-upstream-fair/issues
+Bug-Submit: https://github.com/gnosek/nginx-upstream-fair/issues/new
+Repository-Browse: https://github.com/gnosek/nginx-upstream-fair
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/watch b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/watch
new file mode 100644
index 0000000..494c265
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/debian/watch
@@ -0,0 +1,7 @@
+version=4
+
+opts="\
+mode=git,\
+pgpmode=none,\
+compression=xz,\
+" https://github.com/gnosek/nginx-upstream-fair HEAD
diff --git a/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/ngx_http_upstream_fair_module.c b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/ngx_http_upstream_fair_module.c
new file mode 100644
index 0000000..60a6de1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409/ngx_http_upstream_fair_module.c
@@ -0,0 +1,1354 @@
+/*
+ * Copyright (C) 2007 Grzegorz Nosek
+ * Work sponsored by Ezra Zygmuntowicz & EngineYard.com
+ *
+ * Based on nginx source (C) Igor Sysoev
+ */
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+typedef struct {
+    ngx_uint_t                          nreq;
+    ngx_uint_t                          total_req;
+    ngx_uint_t                          last_req_id;
+    ngx_uint_t                          fails;
+    ngx_uint_t                          current_weight;
+} ngx_http_upstream_fair_shared_t;
+
+typedef struct ngx_http_upstream_fair_peers_s ngx_http_upstream_fair_peers_t;
+
+typedef struct {
+    ngx_rbtree_node_t                   node;
+    ngx_uint_t                          generation;
+    uintptr_t                           peers;      /* forms a unique cookie together with generation */
+    ngx_uint_t                          total_nreq;
+    ngx_uint_t                          total_requests;
+    ngx_atomic_t                        lock;
+    ngx_http_upstream_fair_shared_t     stats[1];
+} ngx_http_upstream_fair_shm_block_t;
+
+/* ngx_spinlock is defined without a matching unlock primitive */
+#define ngx_spinlock_unlock(lock)       (void) ngx_atomic_cmp_set(lock, ngx_pid, 0)
+
+typedef struct {
+    ngx_http_upstream_fair_shared_t    *shared;
+    struct sockaddr                    *sockaddr;
+    socklen_t                           socklen;
+    ngx_str_t                           name;
+
+    ngx_uint_t                          weight;
+    ngx_uint_t                          max_fails;
+    time_t                              fail_timeout;
+
+    time_t                              accessed;
+    ngx_uint_t                          down:1;
+
+#if (NGX_HTTP_SSL)
+    ngx_ssl_session_t                  *ssl_session;    /* local to a process */
+#endif
+
+} ngx_http_upstream_fair_peer_t;
+
+#define NGX_HTTP_UPSTREAM_FAIR_NO_RR            (1<<26)
+#define NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_IDLE (1<<27)
+#define NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_PEAK (1<<28)
+#define NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_MASK ((1<<27) | (1<<28))
+
+enum { WM_DEFAULT = 0, WM_IDLE, WM_PEAK };
+
+struct ngx_http_upstream_fair_peers_s {
+    ngx_http_upstream_fair_shm_block_t *shared;
+    ngx_uint_t                          current;
+    ngx_uint_t                          size_err:1;
+    ngx_uint_t                          no_rr:1;
+    ngx_uint_t                          weight_mode:2;
+    ngx_uint_t                          number;
+    ngx_str_t                          *name;
+    ngx_http_upstream_fair_peers_t     *next;           /* for backup peers support, not really used yet */
+    ngx_http_upstream_fair_peer_t       peer[1];
+};
+
+
+#define NGX_PEER_INVALID (~0UL)
+
+typedef struct {
+    ngx_http_upstream_fair_peers_t     *peers;
+    ngx_uint_t                          current;
+    uintptr_t                          *tried;
+    uintptr_t                          *done;
+    uintptr_t                           data;
+    uintptr_t                           data2;
+} ngx_http_upstream_fair_peer_data_t;
+
+
+static ngx_int_t ngx_http_upstream_init_fair(ngx_conf_t *cf,
+    ngx_http_upstream_srv_conf_t *us);
+static ngx_int_t ngx_http_upstream_get_fair_peer(ngx_peer_connection_t *pc,
+    void *data);
+static void ngx_http_upstream_free_fair_peer(ngx_peer_connection_t *pc,
+    void *data, ngx_uint_t state);
+static ngx_int_t ngx_http_upstream_init_fair_peer(ngx_http_request_t *r,
+    ngx_http_upstream_srv_conf_t *us);
+static char *ngx_http_upstream_fair(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_http_upstream_fair_set_shm_size(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static ngx_int_t ngx_http_upstream_fair_init_module(ngx_cycle_t *cycle);
+
+#if (NGX_HTTP_EXTENDED_STATUS)
+static ngx_chain_t *ngx_http_upstream_fair_report_status(ngx_http_request_t *r,
+    ngx_int_t *length);
+#endif
+
+#if (NGX_HTTP_SSL)
+static ngx_int_t ngx_http_upstream_fair_set_session(ngx_peer_connection_t *pc,
+    void *data);
+static void ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc,
+    void *data);
+#endif
+
+static ngx_command_t  ngx_http_upstream_fair_commands[] = {
+
+    { ngx_string("fair"),
+      NGX_HTTP_UPS_CONF|NGX_CONF_ANY,
+      ngx_http_upstream_fair,
+      0,
+      0,
+      NULL },
+
+    { ngx_string("upstream_fair_shm_size"),
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+      ngx_http_upstream_fair_set_shm_size,
+      0,
+      0,
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_upstream_fair_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    NULL,                                  /* postconfiguration */
+
+    NULL,                                  /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    NULL,                                  /* create location configuration */
+    NULL,                                  /* merge location configuration */
+
+#if (NGX_HTTP_EXTENDED_STATUS)
+    ngx_http_upstream_fair_report_status,
+#endif
+};
+
+
+ngx_module_t  ngx_http_upstream_fair_module = {
+    NGX_MODULE_V1,
+    &ngx_http_upstream_fair_module_ctx, /* module context */
+    ngx_http_upstream_fair_commands,    /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    ngx_http_upstream_fair_init_module,    /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static ngx_uint_t ngx_http_upstream_fair_shm_size;
+static ngx_shm_zone_t * ngx_http_upstream_fair_shm_zone;
+static ngx_rbtree_t * ngx_http_upstream_fair_rbtree;
+static ngx_uint_t ngx_http_upstream_fair_generation;
+
+static int
+ngx_http_upstream_fair_compare_rbtree_node(const ngx_rbtree_node_t *v_left,
+    const ngx_rbtree_node_t *v_right)
+{
+    ngx_http_upstream_fair_shm_block_t *left, *right;
+
+    left = (ngx_http_upstream_fair_shm_block_t *) v_left;
+    right = (ngx_http_upstream_fair_shm_block_t *) v_right;
+
+    if (left->generation < right->generation) {
+        return -1;
+    } else if (left->generation > right->generation) {
+        return 1;
+    } else { /* left->generation == right->generation */
+        if (left->peers < right->peers) {
+            return -1;
+        } else if (left->peers > right->peers) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+}
+
+/*
+ * generic functions start here
+ */
+static void
+ngx_rbtree_generic_insert(ngx_rbtree_node_t *temp,
+    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel,
+    int (*compare)(const ngx_rbtree_node_t *left, const ngx_rbtree_node_t *right))
+{
+    for ( ;; ) {
+        if (node->key < temp->key) {
+
+            if (temp->left == sentinel) {
+                temp->left = node;
+                break;
+            }
+
+            temp = temp->left;
+
+        } else if (node->key > temp->key) {
+
+            if (temp->right == sentinel) {
+                temp->right = node;
+                break;
+            }
+
+            temp = temp->right;
+
+        } else { /* node->key == temp->key */
+            if (compare(node, temp) < 0) {
+
+                if (temp->left == sentinel) {
+                    temp->left = node;
+                    break;
+                }
+
+                temp = temp->left;
+
+            } else {
+
+                if (temp->right == sentinel) {
+                    temp->right = node;
+                    break;
+                }
+
+                temp = temp->right;
+            }
+        }
+    }
+
+    node->parent = temp;
+    node->left = sentinel;
+    node->right = sentinel;
+    ngx_rbt_red(node);
+}
+
+#define NGX_BITVECTOR_ELT_SIZE (sizeof(uintptr_t) * 8)
+
+static uintptr_t *
+ngx_bitvector_alloc(ngx_pool_t *pool, ngx_uint_t size, uintptr_t *small)
+{
+    ngx_uint_t nelts = (size + NGX_BITVECTOR_ELT_SIZE - 1) / NGX_BITVECTOR_ELT_SIZE;
+
+    if (small && nelts == 1) {
+        *small = 0;
+        return small;
+    }
+
+    return ngx_pcalloc(pool, nelts * NGX_BITVECTOR_ELT_SIZE);
+}
+
+static ngx_int_t
+ngx_bitvector_test(uintptr_t *bv, ngx_uint_t bit)
+{
+    ngx_uint_t                      n, m;
+
+    n = bit / NGX_BITVECTOR_ELT_SIZE;
+    m = 1 << (bit % NGX_BITVECTOR_ELT_SIZE);
+
+    return bv[n] & m;
+}
+
+static void
+ngx_bitvector_set(uintptr_t *bv, ngx_uint_t bit)
+{
+    ngx_uint_t                      n, m;
+
+    n = bit / NGX_BITVECTOR_ELT_SIZE;
+    m = 1 << (bit % NGX_BITVECTOR_ELT_SIZE);
+
+    bv[n] |= m;
+}
+
+/*
+ * generic functions end here
+ */
+
+static ngx_int_t
+ngx_http_upstream_fair_init_module(ngx_cycle_t *cycle)
+{
+    ngx_http_upstream_fair_generation++;
+    return NGX_OK;
+}
+
+static void
+ngx_http_upstream_fair_rbtree_insert(ngx_rbtree_node_t *temp,
+    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) {
+
+    ngx_rbtree_generic_insert(temp, node, sentinel,
+        ngx_http_upstream_fair_compare_rbtree_node);
+}
+
+
+static ngx_int_t
+ngx_http_upstream_fair_init_shm_zone(ngx_shm_zone_t *shm_zone, void *data)
+{
+    ngx_slab_pool_t                *shpool;
+    ngx_rbtree_t                   *tree;
+    ngx_rbtree_node_t              *sentinel;
+
+    if (data) {
+        shm_zone->data = data;
+        return NGX_OK;
+    }
+
+    shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
+    tree = ngx_slab_alloc(shpool, sizeof *tree);
+    if (tree == NULL) {
+        return NGX_ERROR;
+    }
+
+    sentinel = ngx_slab_alloc(shpool, sizeof *sentinel);
+    if (sentinel == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_rbtree_sentinel_init(sentinel);
+    tree->root = sentinel;
+    tree->sentinel = sentinel;
+    tree->insert = ngx_http_upstream_fair_rbtree_insert;
+    shm_zone->data = tree;
+    ngx_http_upstream_fair_rbtree = tree;
+
+    return NGX_OK;
+}
+
+
+static char *
+ngx_http_upstream_fair_set_shm_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ssize_t                         new_shm_size;
+    ngx_str_t                      *value;
+
+    value = cf->args->elts;
+
+    new_shm_size = ngx_parse_size(&value[1]);
+    if (new_shm_size == NGX_ERROR) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "Invalid memory area size `%V'", &value[1]);
+        return NGX_CONF_ERROR;
+    }
+
+    new_shm_size = ngx_align(new_shm_size, ngx_pagesize);
+
+    if (new_shm_size < 8 * (ssize_t) ngx_pagesize) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "The upstream_fair_shm_size value must be at least %udKiB", (8 * ngx_pagesize) >> 10);
+        new_shm_size = 8 * ngx_pagesize;
+    }
+
+    if (ngx_http_upstream_fair_shm_size &&
+        ngx_http_upstream_fair_shm_size != (ngx_uint_t) new_shm_size) {
+        ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Cannot change memory area size without restart, ignoring change");
+    } else {
+        ngx_http_upstream_fair_shm_size = new_shm_size;
+    }
+    ngx_conf_log_error(NGX_LOG_DEBUG, cf, 0, "Using %udKiB of shared memory for upstream_fair", new_shm_size >> 10);
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_upstream_fair(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_upstream_srv_conf_t  *uscf;
+    ngx_uint_t i;
+    ngx_uint_t extra_peer_flags = 0;
+
+    for (i = 1; i < cf->args->nelts; i++) {
+        ngx_str_t *value = cf->args->elts;
+        if (ngx_strcmp(value[i].data, "no_rr") == 0) {
+            extra_peer_flags |= NGX_HTTP_UPSTREAM_FAIR_NO_RR;
+        } else if (ngx_strcmp(value[i].data, "weight_mode=peak") == 0) {
+            if (extra_peer_flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_MASK) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "weight_mode= options are mutually exclusive");
+                return NGX_CONF_ERROR;
+            }
+            extra_peer_flags |= NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_PEAK;
+        } else if (ngx_strcmp(value[i].data, "weight_mode=idle") == 0) {
+            if (extra_peer_flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_MASK) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "weight_mode= options are mutually exclusive");
+                return NGX_CONF_ERROR;
+            }
+            extra_peer_flags |= NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_IDLE;
+        } else {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "Invalid `fair' parameter `%V'", &value[i]);
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);
+
+    uscf->peer.init_upstream = ngx_http_upstream_init_fair;
+
+    uscf->flags = NGX_HTTP_UPSTREAM_CREATE
+                  |NGX_HTTP_UPSTREAM_WEIGHT
+                  |NGX_HTTP_UPSTREAM_MAX_FAILS
+                  |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT
+                  |NGX_HTTP_UPSTREAM_DOWN
+                  |extra_peer_flags;
+
+    return NGX_CONF_OK;
+}
+
+
+static ngx_int_t
+ngx_http_upstream_cmp_servers(const void *one, const void *two)
+{
+    const ngx_http_upstream_fair_peer_t  *first, *second;
+
+    first = one;
+    second = two;
+
+    return (first->weight < second->weight);
+}
+
+
+/* TODO: Actually support backup servers */
+static ngx_int_t
+ngx_http_upstream_init_fair_rr(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+{
+    ngx_url_t                      u;
+    ngx_uint_t                     i, j, n;
+    ngx_http_upstream_server_t    *server;
+    ngx_http_upstream_fair_peers_t  *peers, *backup;
+
+    if (us->servers) {
+        server = us->servers->elts;
+
+        n = 0;
+
+        for (i = 0; i < us->servers->nelts; i++) {
+            if (server[i].backup) {
+                continue;
+            }
+
+            n += server[i].naddrs;
+        }
+
+        peers = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_fair_peers_t)
+                              + sizeof(ngx_http_upstream_fair_peer_t) * (n - 1));
+        if (peers == NULL) {
+            return NGX_ERROR;
+        }
+
+        peers->number = n;
+        peers->name = &us->host;
+
+        n = 0;
+
+        for (i = 0; i < us->servers->nelts; i++) {
+            for (j = 0; j < server[i].naddrs; j++) {
+                if (server[i].backup) {
+                    continue;
+                }
+
+                peers->peer[n].sockaddr = server[i].addrs[j].sockaddr;
+                peers->peer[n].socklen = server[i].addrs[j].socklen;
+                peers->peer[n].name = server[i].addrs[j].name;
+                peers->peer[n].max_fails = server[i].max_fails;
+                peers->peer[n].fail_timeout = server[i].fail_timeout;
+                peers->peer[n].down = server[i].down;
+                peers->peer[n].weight = server[i].down ? 0 : server[i].weight;
+                n++;
+            }
+        }
+
+        us->peer.data = peers;
+
+        ngx_sort(&peers->peer[0], (size_t) n,
+                 sizeof(ngx_http_upstream_fair_peer_t),
+                 ngx_http_upstream_cmp_servers);
+
+        /* backup servers */
+
+        n = 0;
+
+        for (i = 0; i < us->servers->nelts; i++) {
+            if (!server[i].backup) {
+                continue;
+            }
+
+            n += server[i].naddrs;
+        }
+
+        if (n == 0) {
+            return NGX_OK;
+        }
+
+        backup = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_fair_peers_t)
+                              + sizeof(ngx_http_upstream_fair_peer_t) * (n - 1));
+        if (backup == NULL) {
+            return NGX_ERROR;
+        }
+
+        backup->number = n;
+        backup->name = &us->host;
+
+        n = 0;
+
+        for (i = 0; i < us->servers->nelts; i++) {
+            for (j = 0; j < server[i].naddrs; j++) {
+                if (!server[i].backup) {
+                    continue;
+                }
+
+                backup->peer[n].sockaddr = server[i].addrs[j].sockaddr;
+                backup->peer[n].socklen = server[i].addrs[j].socklen;
+                backup->peer[n].name = server[i].addrs[j].name;
+                backup->peer[n].weight = server[i].weight;
+                backup->peer[n].max_fails = server[i].max_fails;
+                backup->peer[n].fail_timeout = server[i].fail_timeout;
+                backup->peer[n].down = server[i].down;
+                n++;
+            }
+        }
+
+        peers->next = backup;
+
+        ngx_sort(&backup->peer[0], (size_t) n,
+                 sizeof(ngx_http_upstream_fair_peer_t),
+                 ngx_http_upstream_cmp_servers);
+
+        return NGX_OK;
+    }
+
+
+    /* an upstream implicitly defined by proxy_pass, etc. */
+
+    if (us->port == 0) {
+        ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                      "no port in upstream \"%V\" in %s:%ui",
+                      &us->host, us->file_name, us->line);
+        return NGX_ERROR;
+    }
+
+    ngx_memzero(&u, sizeof(ngx_url_t));
+
+    u.host = us->host;
+    u.port = (in_port_t) us->port;
+
+    if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) {
+        if (u.err) {
+            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                          "%s in upstream \"%V\" in %s:%ui",
+                          u.err, &us->host, us->file_name, us->line);
+        }
+
+        return NGX_ERROR;
+    }
+
+    n = u.naddrs;
+
+    peers = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_fair_peers_t)
+                              + sizeof(ngx_http_upstream_fair_peer_t) * (n - 1));
+    if (peers == NULL) {
+        return NGX_ERROR;
+    }
+
+    peers->number = n;
+    peers->name = &us->host;
+
+    for (i = 0; i < u.naddrs; i++) {
+        peers->peer[i].sockaddr = u.addrs[i].sockaddr;
+        peers->peer[i].socklen = u.addrs[i].socklen;
+        peers->peer[i].name = u.addrs[i].name;
+        peers->peer[i].weight = 1;
+        peers->peer[i].max_fails = 1;
+        peers->peer[i].fail_timeout = 10;
+    }
+
+    us->peer.data = peers;
+
+    /* implicitly defined upstream has no backup servers */
+
+    return NGX_OK;
+}
+
+static ngx_int_t
+ngx_http_upstream_init_fair(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+{
+    ngx_http_upstream_fair_peers_t     *peers;
+    ngx_uint_t                          n;
+    ngx_str_t                          *shm_name;
+
+    /* do the dirty work using rr module */
+    if (ngx_http_upstream_init_fair_rr(cf, us) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    /* setup our wrapper around rr */
+    peers = ngx_palloc(cf->pool, sizeof *peers);
+    if (peers == NULL) {
+        return NGX_ERROR;
+    }
+    peers = us->peer.data;
+    n = peers->number;
+
+    shm_name = ngx_palloc(cf->pool, sizeof *shm_name);
+    shm_name->len = sizeof("upstream_fair") - 1;
+    shm_name->data = (unsigned char *) "upstream_fair";
+
+    if (ngx_http_upstream_fair_shm_size == 0) {
+        ngx_http_upstream_fair_shm_size = 8 * ngx_pagesize;
+    }
+
+    ngx_http_upstream_fair_shm_zone = ngx_shared_memory_add(
+        cf, shm_name, ngx_http_upstream_fair_shm_size, &ngx_http_upstream_fair_module);
+    if (ngx_http_upstream_fair_shm_zone == NULL) {
+        return NGX_ERROR;
+    }
+    ngx_http_upstream_fair_shm_zone->init = ngx_http_upstream_fair_init_shm_zone;
+
+    peers->shared = NULL;
+    peers->current = n - 1;
+    if (us->flags & NGX_HTTP_UPSTREAM_FAIR_NO_RR) {
+        peers->no_rr = 1;
+    }
+    if (us->flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_IDLE) {
+        peers->weight_mode = WM_IDLE;
+    } else if (us->flags & NGX_HTTP_UPSTREAM_FAIR_WEIGHT_MODE_PEAK) {
+        peers->weight_mode = WM_PEAK;
+    }
+    peers->size_err = 0;
+
+    us->peer.init = ngx_http_upstream_init_fair_peer;
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_upstream_fair_update_nreq(ngx_http_upstream_fair_peer_data_t *fp, int delta, ngx_log_t *log)
+{
+#if (NGX_DEBUG)
+    ngx_uint_t                          nreq;
+    ngx_uint_t                          total_nreq;
+
+    nreq = (fp->peers->peer[fp->current].shared->nreq += delta);
+    total_nreq = (fp->peers->shared->total_nreq += delta);
+
+    ngx_log_debug6(NGX_LOG_DEBUG_HTTP, log, 0,
+        "[upstream_fair] nreq for peer %ui @ %p/%p now %d, total %d, delta %d",
+        fp->current, fp->peers, fp->peers->peer[fp->current].shared, nreq,
+        total_nreq, delta);
+#endif
+}
+
+/*
+ * SCHED_COUNTER_BITS is the portion of an ngx_uint_t which represents
+ * the req_delta part (number of requests serviced on _other_
+ * backends). The rest (top bits) represents the number of currently
+ * processed requests.
+ *
+ * The value is not too critical because overflow is handled via
+ * saturation. With the default value of 20, scheduling is exact for
+ * fewer than 4k concurrent requests per backend (on 32-bit
+ * architectures) and fewer than 1M concurrent requests to all backends
+ * together. Beyond these limits, the algorithm essentially falls back
+ * to pure weighted round-robin.
+ *
+ * A higher score means less suitable.
+ *
+ * The `delta' parameter is bit-negated so that high values yield low
+ * scores and get chosen more often.
+ */
+
+#define SCHED_COUNTER_BITS 20
+#define SCHED_NREQ_MAX ((~0UL) >> SCHED_COUNTER_BITS)
+#define SCHED_COUNTER_MAX ((1 << SCHED_COUNTER_BITS) - 1)
+#define SCHED_SCORE(nreq,delta) (((nreq) << SCHED_COUNTER_BITS) | (~(delta) & SCHED_COUNTER_MAX))
+#define ngx_upstream_fair_min(a,b) (((a) < (b)) ? (a) : (b))
+
+static ngx_uint_t
+ngx_http_upstream_fair_sched_score(ngx_peer_connection_t *pc,
+    ngx_http_upstream_fair_peer_data_t *fp,
+    ngx_uint_t n)
+{
+    ngx_http_upstream_fair_peer_t      *peer = &fp->peers->peer[n];
+    ngx_http_upstream_fair_shared_t    *fs = peer->shared;
+    ngx_uint_t req_delta = fp->peers->shared->total_requests - fs->last_req_id;
+
+    /* sanity check */
+    if ((ngx_int_t)fs->nreq < 0) {
+        ngx_log_error(NGX_LOG_WARN, pc->log, 0, "[upstream_fair] upstream %ui has negative nreq (%i)", n, fs->nreq);
+        return SCHED_SCORE(0, req_delta);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] peer %ui: nreq = %i, req_delta = %ui", n, fs->nreq, req_delta);
+
+    return SCHED_SCORE(
+        ngx_upstream_fair_min(fs->nreq, SCHED_NREQ_MAX),
+        ngx_upstream_fair_min(req_delta, SCHED_COUNTER_MAX));
+}
+
+/*
+ * the core of load balancing logic
+ */
+
+static ngx_int_t
+ngx_http_upstream_fair_try_peer(ngx_peer_connection_t *pc,
+    ngx_http_upstream_fair_peer_data_t *fp,
+    ngx_uint_t peer_id)
+{
+    ngx_http_upstream_fair_peer_t        *peer;
+
+    if (ngx_bitvector_test(fp->tried, peer_id))
+        return NGX_BUSY;
+
+    peer = &fp->peers->peer[peer_id];
+
+    if (!peer->down) {
+        if (peer->max_fails == 0 || peer->shared->fails < peer->max_fails) {
+            return NGX_OK;
+        }
+
+        if (ngx_time() - peer->accessed > peer->fail_timeout) {
+            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] resetting fail count for peer %d, time delta %d > %d",
+                peer_id, ngx_time() - peer->accessed, peer->fail_timeout);
+            peer->shared->fails = 0;
+            return NGX_OK;
+        }
+    }
+
+    return NGX_BUSY;
+}
+
+static ngx_uint_t
+ngx_http_upstream_choose_fair_peer_idle(ngx_peer_connection_t *pc,
+    ngx_http_upstream_fair_peer_data_t *fp)
+{
+    ngx_uint_t                          i, n;
+    ngx_uint_t                          npeers = fp->peers->number;
+    ngx_uint_t                          weight_mode = fp->peers->weight_mode;
+    ngx_uint_t                          best_idx = NGX_PEER_INVALID;
+    ngx_uint_t                          best_nreq = ~0U;
+
+    for (i = 0, n = fp->current; i < npeers; i++, n = (n + 1) % npeers) {
+        ngx_uint_t nreq = fp->peers->peer[n].shared->nreq;
+        ngx_uint_t weight = fp->peers->peer[n].weight;
+
+        if (fp->peers->peer[n].shared->fails > 0)
+            continue;
+
+        if (nreq >= weight || (nreq > 0 && weight_mode != WM_IDLE)) {
+            continue;
+        }
+
+        if (ngx_http_upstream_fair_try_peer(pc, fp, n) != NGX_OK) {
+            continue;
+        }
+
+        /* not in WM_IDLE+no_rr mode: the first completely idle backend gets chosen */
+        if (weight_mode != WM_IDLE || !fp->peers->no_rr) {
+            best_idx = n;
+            break;
+        }
+
+        /* in WM_IDLE+no_rr mode we actually prefer slightly loaded backends
+         * to totally idle ones, under the assumption that they're spawned
+         * on demand and can handle up to 'weight' concurrent requests
+         */
+        if (best_idx == NGX_PEER_INVALID || nreq) {
+            if (best_nreq <= nreq) {
+                continue;
+            }
+            best_idx = n;
+            best_nreq = nreq;
+        }
+    }
+
+    return best_idx;
+}
+
+static ngx_int_t
+ngx_http_upstream_choose_fair_peer_busy(ngx_peer_connection_t *pc,
+    ngx_http_upstream_fair_peer_data_t *fp)
+{
+    ngx_uint_t                          i, n;
+    ngx_uint_t                          npeers = fp->peers->number;
+    ngx_uint_t                          weight_mode = fp->peers->weight_mode;
+    ngx_uint_t                          best_idx = NGX_PEER_INVALID;
+    ngx_uint_t                          sched_score;
+    ngx_uint_t                          best_sched_score = ~0UL;
+
+    /*
+     * calculate sched scores for all the peers, choosing the lowest one
+     */
+    for (i = 0, n = fp->current; i < npeers; i++, n = (n + 1) % npeers) {
+        ngx_http_upstream_fair_peer_t      *peer;
+        ngx_uint_t                          nreq;
+        ngx_uint_t                          weight;
+
+        peer = &fp->peers->peer[n];
+        nreq = fp->peers->peer[n].shared->nreq;
+
+        if (weight_mode == WM_PEAK && nreq >= peer->weight) {
+            ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] backend %d has nreq %ui >= weight %ui in WM_PEAK mode", n, nreq, peer->weight);
+            continue;
+        }
+
+        if (ngx_http_upstream_fair_try_peer(pc, fp, n) != NGX_OK) {
+            if (!pc->tries) {
+                ngx_log_debug(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] all backends exhausted");
+                return NGX_PEER_INVALID;
+            }
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] backend %d already tried", n);
+            continue;
+        }
+
+        sched_score = ngx_http_upstream_fair_sched_score(pc, fp, n);
+
+        if (weight_mode == WM_DEFAULT) {
+            /*
+             * take peer weight into account
+             */
+            weight = peer->shared->current_weight;
+            if (peer->max_fails) {
+                ngx_uint_t mf = peer->max_fails;
+                weight = peer->shared->current_weight * (mf - peer->shared->fails) / mf;
+            }
+            if (weight > 0) {
+                sched_score /= weight;
+            }
+            ngx_log_debug8(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] bss = %ui, ss = %ui (n = %d, w = %d/%d, f = %d/%d, weight = %d)",
+                best_sched_score, sched_score, n, peer->shared->current_weight, peer->weight, peer->shared->fails, peer->max_fails, weight);
+        }
+
+        if (sched_score <= best_sched_score) {
+            best_idx = n;
+            best_sched_score = sched_score;
+        }
+    }
+
+    return best_idx;
+}
+
+static ngx_int_t
+ngx_http_upstream_choose_fair_peer(ngx_peer_connection_t *pc,
+    ngx_http_upstream_fair_peer_data_t *fp, ngx_uint_t *peer_id)
+{
+    ngx_uint_t                          npeers;
+    ngx_uint_t                          best_idx = NGX_PEER_INVALID;
+    ngx_uint_t                          weight_mode;
+
+    npeers = fp->peers->number;
+    weight_mode = fp->peers->weight_mode;
+
+    /* just a single backend */
+    if (npeers == 1) {
+        *peer_id = 0;
+        return NGX_OK;
+    }
+
+    /* any idle backends? */
+    best_idx = ngx_http_upstream_choose_fair_peer_idle(pc, fp);
+    if (best_idx != NGX_PEER_INVALID) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] peer %i is idle", best_idx);
+        goto chosen;
+    }
+
+    /* no idle backends, choose the least loaded one */
+    best_idx = ngx_http_upstream_choose_fair_peer_busy(pc, fp);
+    if (best_idx != NGX_PEER_INVALID) {
+        goto chosen;
+    }
+
+    return NGX_BUSY;
+
+chosen:
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] chose peer %i", best_idx);
+    *peer_id = best_idx;
+    ngx_bitvector_set(fp->tried, best_idx);
+
+    if (weight_mode == WM_DEFAULT) {
+        ngx_http_upstream_fair_peer_t      *peer = &fp->peers->peer[best_idx];
+
+        if (peer->shared->current_weight-- == 0) {
+            peer->shared->current_weight = peer->weight;
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] peer %d expired weight, reset to %d", best_idx, peer->weight);
+        }
+    }
+    return NGX_OK;
+}
+
+ngx_int_t
+ngx_http_upstream_get_fair_peer(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_int_t                           ret;
+    ngx_uint_t                          peer_id, i;
+    ngx_http_upstream_fair_peer_data_t *fp = data;
+    ngx_http_upstream_fair_peer_t      *peer;
+    ngx_atomic_t                       *lock;
+
+    peer_id = fp->current;
+    fp->current = (fp->current + 1) % fp->peers->number;
+
+    lock = &fp->peers->shared->lock;
+    ngx_spinlock(lock, ngx_pid, 1024);
+    ret = ngx_http_upstream_choose_fair_peer(pc, fp, &peer_id);
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] fp->current = %d, peer_id = %d, ret = %d",
+        fp->current, peer_id, ret);
+
+    if (pc)
+        pc->tries--;
+
+    if (ret == NGX_BUSY) {
+        for (i = 0; i < fp->peers->number; i++) {
+            fp->peers->peer[i].shared->fails = 0;
+        }
+
+        pc->name = fp->peers->name;
+        fp->current = NGX_PEER_INVALID;
+        ngx_spinlock_unlock(lock);
+        return NGX_BUSY;
+    }
+
+    /* assert(ret == NGX_OK); */
+    peer = &fp->peers->peer[peer_id];
+    fp->current = peer_id;
+    if (!fp->peers->no_rr) {
+        fp->peers->current = peer_id;
+    }
+    pc->sockaddr = peer->sockaddr;
+    pc->socklen = peer->socklen;
+    pc->name = &peer->name;
+
+    peer->shared->last_req_id = fp->peers->shared->total_requests;
+    ngx_http_upstream_fair_update_nreq(fp, 1, pc->log);
+    peer->shared->total_req++;
+    ngx_spinlock_unlock(lock);
+    return ret;
+}
+
+
+void
+ngx_http_upstream_free_fair_peer(ngx_peer_connection_t *pc, void *data,
+    ngx_uint_t state)
+{
+    ngx_http_upstream_fair_peer_data_t     *fp = data;
+    ngx_http_upstream_fair_peer_t          *peer;
+    ngx_atomic_t                           *lock;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, pc->log, 0, "[upstream_fair] fp->current = %d, state = %ui, pc->tries = %d, pc->data = %p",
+        fp->current, state, pc->tries, pc->data);
+
+    if (fp->current == NGX_PEER_INVALID) {
+        return;
+    }
+
+    lock = &fp->peers->shared->lock;
+    ngx_spinlock(lock, ngx_pid, 1024);
+    if (!ngx_bitvector_test(fp->done, fp->current)) {
+        ngx_bitvector_set(fp->done, fp->current);
+        ngx_http_upstream_fair_update_nreq(fp, -1, pc->log);
+    }
+
+    if (fp->peers->number == 1) {
+        pc->tries = 0;
+    }
+
+    if (state & NGX_PEER_FAILED) {
+        peer = &fp->peers->peer[fp->current];
+
+        peer->shared->fails++;
+        peer->accessed = ngx_time();
+    }
+    ngx_spinlock_unlock(lock);
+}
+
+/*
+ * walk through the rbtree, removing old entries and looking for
+ * a matching one -- compared by (cycle, peers) pair
+ *
+ * no attempt at optimisation is made, for two reasons:
+ *  - the tree will be quite small, anyway
+ *  - being called once per worker startup per upstream block,
+ *    this code isn't really the hot path
+ */
+static ngx_http_upstream_fair_shm_block_t *
+ngx_http_upstream_fair_walk_shm(
+    ngx_slab_pool_t *shpool,
+    ngx_rbtree_node_t *node,
+    ngx_rbtree_node_t *sentinel,
+    ngx_http_upstream_fair_peers_t *peers)
+{
+    ngx_http_upstream_fair_shm_block_t     *uf_node;
+    ngx_http_upstream_fair_shm_block_t     *found_node = NULL;
+    ngx_http_upstream_fair_shm_block_t     *tmp_node;
+
+    if (node == sentinel) {
+        return NULL;
+    }
+
+    /* visit left node */
+    if (node->left != sentinel) {
+        tmp_node = ngx_http_upstream_fair_walk_shm(shpool, node->left,
+            sentinel, peers);
+        if (tmp_node) {
+            found_node = tmp_node;
+        }
+    }
+
+    /* visit right node */
+    if (node->right != sentinel) {
+        tmp_node = ngx_http_upstream_fair_walk_shm(shpool, node->right,
+            sentinel, peers);
+        if (tmp_node) {
+            found_node = tmp_node;
+        }
+    }
+
+    /* visit current node */
+    uf_node = (ngx_http_upstream_fair_shm_block_t *) node;
+    if (uf_node->generation != ngx_http_upstream_fair_generation) {
+        ngx_spinlock(&uf_node->lock, ngx_pid, 1024);
+        if (uf_node->total_nreq == 0) {
+            /* don't bother unlocking */
+            ngx_rbtree_delete(ngx_http_upstream_fair_rbtree, node);
+            ngx_slab_free_locked(shpool, node);
+        }
+        ngx_spinlock_unlock(&uf_node->lock);
+    } else if (uf_node->peers == (uintptr_t) peers) {
+        found_node = uf_node;
+    }
+
+    return found_node;
+}
+
+static ngx_int_t
+ngx_http_upstream_fair_shm_alloc(ngx_http_upstream_fair_peers_t *usfp, ngx_log_t *log)
+{
+    ngx_slab_pool_t                        *shpool;
+    ngx_uint_t                              i;
+
+    if (usfp->shared) {
+        return NGX_OK;
+    }
+
+    shpool = (ngx_slab_pool_t *)ngx_http_upstream_fair_shm_zone->shm.addr;
+
+    ngx_shmtx_lock(&shpool->mutex);
+
+    usfp->shared = ngx_http_upstream_fair_walk_shm(shpool,
+        ngx_http_upstream_fair_rbtree->root,
+        ngx_http_upstream_fair_rbtree->sentinel,
+        usfp);
+
+    if (usfp->shared) {
+        ngx_shmtx_unlock(&shpool->mutex);
+        return NGX_OK;
+    }
+
+    usfp->shared = ngx_slab_alloc_locked(shpool,
+        sizeof(ngx_http_upstream_fair_shm_block_t) +
+        (usfp->number - 1) * sizeof(ngx_http_upstream_fair_shared_t));
+
+    if (!usfp->shared) {
+        ngx_shmtx_unlock(&shpool->mutex);
+        if (!usfp->size_err) {
+            ngx_log_error(NGX_LOG_EMERG, log, 0,
+                "upstream_fair_shm_size too small (current value is %udKiB)",
+                ngx_http_upstream_fair_shm_size >> 10);
+            usfp->size_err = 1;
+        }
+        return NGX_ERROR;
+    }
+
+    usfp->shared->node.key = ngx_crc32_short((u_char *) &ngx_cycle, sizeof ngx_cycle) ^
+        ngx_crc32_short((u_char *) &usfp, sizeof(usfp));
+
+    usfp->shared->generation = ngx_http_upstream_fair_generation;
+    usfp->shared->peers = (uintptr_t) usfp;
+    usfp->shared->total_nreq = 0;
+    usfp->shared->total_requests = 0;
+
+    for (i = 0; i < usfp->number; i++) {
+            usfp->shared->stats[i].nreq = 0;
+            usfp->shared->stats[i].last_req_id = 0;
+            usfp->shared->stats[i].total_req = 0;
+    }
+
+    ngx_rbtree_insert(ngx_http_upstream_fair_rbtree, &usfp->shared->node);
+
+    ngx_shmtx_unlock(&shpool->mutex);
+    return NGX_OK;
+}
+
+ngx_int_t
+ngx_http_upstream_init_fair_peer(ngx_http_request_t *r,
+    ngx_http_upstream_srv_conf_t *us)
+{
+    ngx_http_upstream_fair_peer_data_t     *fp;
+    ngx_http_upstream_fair_peers_t         *usfp;
+    ngx_uint_t                              n;
+
+    fp = r->upstream->peer.data;
+
+    if (fp == NULL) {
+        fp = ngx_palloc(r->pool, sizeof(ngx_http_upstream_fair_peer_data_t));
+        if (fp == NULL) {
+            return NGX_ERROR;
+        }
+
+        r->upstream->peer.data = fp;
+    }
+
+    usfp = us->peer.data;
+
+    fp->tried = ngx_bitvector_alloc(r->pool, usfp->number, &fp->data);
+    fp->done = ngx_bitvector_alloc(r->pool, usfp->number, &fp->data2);
+
+    if (fp->tried == NULL || fp->done == NULL) {
+        return NGX_ERROR;
+    }
+
+    /* set up shared memory area */
+    ngx_http_upstream_fair_shm_alloc(usfp, r->connection->log);
+
+    fp->current = usfp->current;
+    fp->peers = usfp;
+    usfp->shared->total_requests++;
+
+    for (n = 0; n < usfp->number; n++) {
+        usfp->peer[n].shared = &usfp->shared->stats[n];
+    }
+
+    r->upstream->peer.get = ngx_http_upstream_get_fair_peer;
+    r->upstream->peer.free = ngx_http_upstream_free_fair_peer;
+    r->upstream->peer.tries = usfp->number;
+#if (NGX_HTTP_SSL)
+    r->upstream->peer.set_session =
+                               ngx_http_upstream_fair_set_session;
+    r->upstream->peer.save_session =
+                               ngx_http_upstream_fair_save_session;
+#endif
+
+    return NGX_OK;
+}
+
+#if (NGX_HTTP_SSL)
+static ngx_int_t
+ngx_http_upstream_fair_set_session(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_http_upstream_fair_peer_data_t  *fp = data;
+
+    ngx_int_t                      rc;
+    ngx_ssl_session_t             *ssl_session;
+    ngx_http_upstream_fair_peer_t *peer;
+
+    if (fp->current == NGX_PEER_INVALID)
+        return NGX_OK;
+
+    peer = &fp->peers->peer[fp->current];
+
+    /* TODO: threads only mutex */
+    /* ngx_lock_mutex(fp->peers->mutex); */
+
+    ssl_session = peer->ssl_session;
+
+    rc = ngx_ssl_set_session(pc->connection, ssl_session);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                   "set session: %p", ssl_session);
+
+    /* ngx_unlock_mutex(fp->peers->mutex); */
+
+    return rc;
+}
+
+static void
+ngx_http_upstream_fair_save_session(ngx_peer_connection_t *pc, void *data)
+{
+    ngx_http_upstream_fair_peer_data_t  *fp = data;
+
+    ngx_ssl_session_t             *old_ssl_session, *ssl_session;
+    ngx_http_upstream_fair_peer_t *peer;
+
+    if (fp->current == NGX_PEER_INVALID)
+        return;
+
+    ssl_session = ngx_ssl_get_session(pc->connection);
+
+    if (ssl_session == NULL) {
+        return;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                   "save session: %p", ssl_session);
+
+    peer = &fp->peers->peer[fp->current];
+
+    /* TODO: threads only mutex */
+    /* ngx_lock_mutex(fp->peers->mutex); */
+
+    old_ssl_session = peer->ssl_session;
+    peer->ssl_session = ssl_session;
+
+    /* ngx_unlock_mutex(fp->peers->mutex); */
+
+    if (old_ssl_session) {
+
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
+                       "old session: %p", old_ssl_session);
+
+        /* TODO: may block */
+
+        ngx_ssl_free_session(old_ssl_session);
+    }
+}
+
+#endif
+
+#if (NGX_HTTP_EXTENDED_STATUS)
+static void
+ngx_http_upstream_fair_walk_status(ngx_pool_t *pool, ngx_chain_t *cl, ngx_int_t *length,
+    ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel)
+{
+    ngx_http_upstream_fair_shm_block_t     *s_node = (ngx_http_upstream_fair_shm_block_t *) node;
+    ngx_http_upstream_fair_peers_t         *peers;
+    ngx_chain_t                            *new_cl;
+    ngx_buf_t                              *b;
+    ngx_uint_t                              size, i;
+
+    if (node == sentinel) {
+        return;
+    }
+
+    if (node->left != sentinel) {
+        ngx_http_upstream_fair_walk_status(pool, cl, length, node->left, sentinel);
+    }
+
+    if (s_node->generation != ngx_http_upstream_fair_generation) {
+        size = 100;
+        peers = NULL;
+    } else {
+        /* this is rather ugly (casting an uintptr_t back into a pointer
+         * but as long as the generation is still the same (verified above),
+         * it should be still safe
+         */
+        peers = (ngx_http_upstream_fair_peers_t *) s_node->peers;
+        if (!peers->shared) {
+            goto next;
+        }
+
+        size = 200 + peers->number * 120; /* LOTS of slack */
+    }
+
+    b = ngx_create_temp_buf(pool, size);
+    if (!b) {
+        goto next;
+    }
+
+    new_cl = ngx_alloc_chain_link(pool);
+    if (!new_cl) {
+        goto next;
+    }
+
+    new_cl->buf = b;
+    new_cl->next = NULL;
+
+    while (cl->next) {
+        cl = cl->next;
+    }
+    cl->next = new_cl;
+
+    if (peers) {
+        b->last = ngx_sprintf(b->last, "upstream %V (%p): current peer %d/%d, total requests: %ui\n", peers->name, (void*) node, peers->current, peers->number, s_node->total_requests);
+        for (i = 0; i < peers->number; i++) {
+            ngx_http_upstream_fair_peer_t *peer = &peers->peer[i];
+            ngx_http_upstream_fair_shared_t *sh = peer->shared;
+            b->last = ngx_sprintf(b->last, " peer %d: %V weight: %d/%d, fails: %d/%d, acc: %d, down: %d, nreq: %d, total_req: %ui, last_req: %ui\n",
+                i, &peer->name, sh->current_weight, peer->weight, sh->fails, peer->max_fails, peer->accessed, peer->down,
+                sh->nreq, sh->total_req, sh->last_req_id);
+        }
+    } else {
+        b->last = ngx_sprintf(b->last, "upstream %p: gen %ui != %ui, total_nreq = %ui", (void*) node, s_node->generation, ngx_http_upstream_fair_generation, s_node->total_nreq);
+    }
+    b->last = ngx_sprintf(b->last, "\n");
+    b->last_buf = 1;
+
+    *length += b->last - b->pos;
+
+    if (cl->buf) {
+        cl->buf->last_buf = 0;
+    }
+
+    cl = cl->next;
+next:
+
+    if (node->right != sentinel) {
+        ngx_http_upstream_fair_walk_status(pool, cl, length, node->right, sentinel);
+    }
+}
+
+static ngx_chain_t*
+ngx_http_upstream_fair_report_status(ngx_http_request_t *r, ngx_int_t *length)
+{
+    ngx_buf_t              *b;
+    ngx_chain_t            *cl;
+    ngx_slab_pool_t        *shpool;
+
+    b = ngx_create_temp_buf(r->pool, sizeof("\nupstream_fair status report:\n"));
+    if (!b) {
+        return NULL;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (!cl) {
+        return NULL;
+    }
+    cl->next = NULL;
+    cl->buf = b;
+
+    b->last = ngx_cpymem(b->last, "\nupstream_fair status report:\n",
+        sizeof("\nupstream_fair status report:\n") - 1);
+
+    *length = b->last - b->pos;
+
+    shpool = (ngx_slab_pool_t *)ngx_http_upstream_fair_shm_zone->shm.addr;
+
+    ngx_shmtx_lock(&shpool->mutex);
+
+    ngx_http_upstream_fair_walk_status(r->pool, cl,
+        length,
+        ngx_http_upstream_fair_rbtree->root,
+        ngx_http_upstream_fair_rbtree->sentinel);
+
+    ngx_shmtx_unlock(&shpool->mutex);
+
+    if (!cl->next || !cl->next->buf) {
+        /* no upstream_fair status to report */
+        return NULL;
+    }
+
+    return cl;
+}
+#endif
+
+/* vim: set et ts=4 sw=4: */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/LICENCE b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/LICENCE
new file mode 100644
index 0000000..aed1f30
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/LICENCE
@@ -0,0 +1,24 @@
+This work is distributed under the MIT Licence.
+
+Written by Leo Ponomarev (slact) 2009-2015.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above authorship notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/README.md b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/README.md
new file mode 100644
index 0000000..5a97a1e
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/README.md
@@ -0,0 +1,1745 @@
+<img class="logo" alt="NCHAN" src="https://nchan.io/github-logo.png" />
+
+https://nchan.io
+
+Nchan is a scalable, flexible pub/sub server for the modern web, built as a module for the [Nginx](http://nginx.org) web server. It can be configured as a standalone server, or as a shim between your application and hundreds, thousands, or millions of live subscribers. It can buffer messages in memory, on-disk, or via [Redis](http://redis.io). All connections are handled asynchronously and distributed among any number of worker processes. It can also scale to many Nginx servers with [Redis](http://redis.io).
+
+Messages are [published](#publisher-endpoints) to channels with HTTP `POST` requests or Websocket, and [subscribed](#subscriber-endpoint) also through [Websocket](#websocket), [long-polling](#long-polling), [EventSource](#eventsource) (SSE), old-fashioned [interval polling](#interval-polling), [and](#http-chunked-transfer) [more](#http-multipart-mixed).
+
+In a web browser, you can use Websocket or EventSource natively, or the [NchanSubscriber.js](https://github.com/slact/nchan.js) wrapper library. It supports Long-Polling, EventSource, and resumable Websockets, and has a few other added convenience options. It's also available on [NPM](https://www.npmjs.com/package/nchan).
+
+## Features
+ - RESTful, HTTP-native [API](#publishing-messages).
+ - Supports [Websocket](#websocket), [EventSource (Server-Sent Events)](#eventsource), [Long-Polling](#long-polling) and other HTTP-based subscribers.
+ - Per-channel configurable message buffers with no-repeat, no-loss message delivery guarantees.
+ - Subscribe to [hundreds of channels](#channel-multiplexing) over a single subscriber connection.
+ - HTTP request [callbacks and hooks](#hooks-and-callbacks) for easy integration.
+ - Introspection with [channel events](#channel-events) and [url for monitoring performance statistics](#nchan_stub_status-stats).
+ - Channel [group](#channel-groups) usage [accounting and limits](#limits-and-accounting).
+ - Fast, nonblocking [shared-memory local message storage](#memory-storage) and optional, slower, persistent storage with [Redis](#redis).
+ - Horizontally scalable (using [Redis](#redis)).
+ - Auto-failover and [high availability](#high-availability) with no single point of failure using [Redis Cluster](#redis-cluster).
+
+## Status and History
+
+The latest Nchan release is 1.3.7 (September 19, 2024) ([changelog](https://nchan.io/changelog)).
+
+The first iteration of Nchan was written in 2009-2010 as the [Nginx HTTP Push Module](https://pushmodule.slact.net), and was vastly refactored into its present state in 2014-2016.
+
+#### Upgrade from Nginx HTTP Push Module
+
+Although Nchan is backwards-compatible with all Push Module configuration directives, some of the more unusual and rarely used settings have been disabled and will be ignored (with a warning). See the [upgrade page](https://nchan.io/upgrade) for a detailed list of changes and improvements, as well as a full list of incompatibilities.
+
+
+## Does it scale?
+
+<img class="benchmark_graph" alt="benchmarking internal subscriber response times" src="https://nchan.io/img/benchmark_internal_total.png" />
+
+Yes it does. Like Nginx, Nchan can easily handle as much traffic as you can throw at it. I've tried to benchmark it, but my benchmarking tools are much slower than Nchan. The data I've gathered is on how long Nchan itself takes to respond to every subscriber after publishing a message -- this excludes TCP handshake times and internal HTTP request parsing. Basically, it measures how Nchan scales assuming all other components are already tuned for scalability. The graphed data are averages of 5 runs with 50-byte messages.
+
+With a well-tuned OS and network stack on commodity server hardware, expect to handle upwards of 300K concurrent subscribers per second at minimal CPU load. Nchan can also be scaled out to multiple Nginx instances using the [Redis storage engine](#nchan_use_redis), and that too can be scaled up beyond a single-point-of-failure by using [Redis Cluster](#redis-cluster).
+
+
+## Install
+
+#### Download Packages
+ - [Arch Linux](https://archlinux.org): [nginx-mod-nchan](https://aur.archlinux.org/packages/nginx-mod-nchan/) and [nginx-mainline-mod-nchan](https://aur.archlinux.org/packages/nginx-mainline-mod-nchan/) are available in the Arch User Repository.
+ - Mac OS X: a [homebrew](http://brew.sh) package is available. `brew tap denji/nginx; brew install nginx-full --with-nchan-module`
+ - [Debian](https://www.debian.org/): A dynamic module build is available in the Debian package repository: [libnginx-mod-nchan](https://packages.debian.org/sid/libnginx-mod-nchan).  
+ Additionally, you can use the pre-built static module packages [nginx-common.deb](https://nchan.io/download/nginx-common.deb) and [nginx-extras.deb](https://nchan.io/download/nginx-extras.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`.
+ - [Ubuntu](http://www.ubuntu.com/):  [nginx-common.ubuntu.deb](https://nchan.io/download/nginx-common.ubuntu.deb) and [nginx-extras.ubuntu.deb](https://nchan.io/download/nginx-extras.ubuntu.deb). Download both and install them with `dpkg -i`, followed by `sudo apt-get -f install`. Who knows when Ubuntu will add Nchan to their repository?...
+ - [Fedora](https://fedoraproject.org): Dynamic module builds for Nginx > 1.10.0 are available: [nginx-mod-nchan.x86_64.rpm](https://nchan.io/download/nginx-mod-nchan.x86-64.rpm), [nginx-mod-nchan.src.rpm](https://nchan.io/download/nginx-mod-nchan.src.rpm). 
+ - [Heroku](https://heroku.com): A buildpack for compiling Nchan into Nginx is available: [nchan-buildpack](https://github.com/andjosh/nchan-buildpack). A one-click, readily-deployable app is also available: [nchan-heroku](https://github.com/andjosh/nchan-heroku).
+ - A statically compiled binary and associated linux nginx installation files are also [available as a tarball](https://nchan.io/download/nginx-nchan-latest.tar.gz).
+
+
+#### Build From Source
+Grab the latest copy of Nginx from [nginx.org](http://nginx.org). Grab the latest Nchan source from [github](https://github.com/slact/nchan/releases). Follow the instructions for [building Nginx](https://www.nginx.com/resources/wiki/start/topics/tutorials/install/#source-releases), except during the `configure` stage, add
+```
+./configure --add-module=path/to/nchan ...
+```
+
+If you're using Nginx  > 1.9.11, you can build Nchan as a [dynamic module](https://www.nginx.com/blog/dynamic-modules-nginx-1-9-11/) with `--add-dynamic-module=path/to/nchan`
+
+Run `make`, then `make install`.
+
+## Getting Started
+
+Once you've built and installed Nchan, it's very easy to start using. Add two locations to your nginx config:
+
+```nginx
+#...
+http {  
+  server {
+    #...
+    
+    location = /sub {
+      nchan_subscriber;
+      nchan_channel_id $arg_id;
+    }
+    
+    location = /pub {
+      nchan_publisher;
+      nchan_channel_id $arg_id;
+    }
+  }
+}
+```
+
+You can now publish messages to channels by `POST`ing data to `/pub?id=channel_id` , and subscribe by pointing Websocket, EventSource, or [NchanSubscriber.js](https://github.com/slact/nchan.js) to `sub/?id=channel_id`. It's that simple.
+
+But Nchan is very flexible and highly configurable. So, of course, it can get a lot more complicated...
+
+### Conceptual Overview
+
+The basic unit of most pub/sub solutions is the messaging *channel*. Nchan is no different. Publishers send messages to channels with a certain *channel id*, and subscribers subscribed to those channels receive them. Some number of messages may be buffered for a time in a channel's message buffer before they are deleted. Pretty simple, right? 
+
+Well... the trouble is that nginx configuration does not deal with channels, publishers, and subscribers. Rather, it has several sections for incoming requests to match against *server* and *location* sections. **Nchan configuration directives map servers and locations onto channel publishing and subscribing endpoints**:
+
+```nginx
+#very basic nchan config
+worker_processes 5;
+
+http {  
+  server {
+    listen       80;
+    
+    location = /sub {
+      nchan_subscriber;
+      nchan_channel_id foobar;
+    }
+    
+    location = /pub {
+      nchan_publisher;
+      nchan_channel_id foobar;
+    }
+  }
+}
+```
+
+The above maps requests to the URI `/sub` onto the channel `foobar`'s *subscriber endpoint* , and similarly `/pub` onto channel `foobar`'s *publisher endpoint*.
+
+
+## Publisher Endpoints
+
+Publisher endpoints are Nginx config *locations* with the [*`nchan_publisher`*](#nchan_publisher) directive.
+
+Messages can be published to a channel by sending HTTP **POST** requests with the message contents to the *publisher endpoint* locations. You can also publish messages through a **Websocket** connection to the same location.
+
+```nginx
+  location /pub {
+    #example publisher location
+    nchan_publisher;
+    nchan_channel_id foo;
+    nchan_channel_group test;
+    nchan_message_buffer_length 50;
+    nchan_message_timeout 5m;
+  }
+```
+
+<!-- tag:publisher -->
+
+### Publishing Messages
+
+Requests and websocket messages are responded to with information about the channel at time of message publication. Here's an example from publishing with `curl`:
+
+```console
+>  curl --request POST --data "test message" http://127.0.0.1:80/pub
+
+ queued messages: 5
+ last requested: 18 sec. ago
+ active subscribers: 0
+ last message id: 1450755280:0
+```
+
+The response can be in plaintext (as above), JSON, or XML, based on the request's *`Accept`* header:
+
+```console
+> curl --request POST --data "test message" -H "Accept: text/json" http://127.0.0.2:80/pub
+
+ {"messages": 5, "requested": 18, "subscribers": 0, "last_message_id": "1450755280:0" }
+```
+
+Websocket publishers also receive the same responses when publishing, with the encoding determined by the *`Accept`* header present during the handshake.
+
+The response code for an HTTP request is *`202` Accepted* if no subscribers are present at time of publication, or *`201` Created* if at least 1 subscriber was present.
+
+Metadata can be added to a message when using an HTTP POST request for publishing. A `Content-Type` header will be associated as the message's content type (and output to Long-Poll, Interval-Poll, and multipart/mixed subscribers). A `X-EventSource-Event` header can also be used to associate an EventSource `event:` line value with a message.
+
+### Other Publisher Endpoint Actions
+
+**HTTP `GET`** requests return channel information without publishing a message. The response code is `200` if the channel exists, and `404` otherwise:  
+```console
+> curl --request POST --data "test message" http://127.0.0.2:80/pub
+  ...
+
+> curl -v --request GET -H "Accept: text/json" http://127.0.0.2:80/pub
+
+ {"messages": 1, "requested": 7, "subscribers": 0, "last_message_id": "1450755421:0" }
+```
+
+
+**HTTP `DELETE`** requests delete a channel and end all subscriber connections. Like the `GET` requests, this returns a `200` status response with channel info if the channel existed, and a `404` otherwise.
+
+### How Channel Settings Work
+
+*A channel's configuration is set to the that of its last-used publishing location.*
+So, if you want a channel to behave consistently, and want to publish to it from multiple locations, *make sure those locations have the same configuration*.
+
+You can also can use differently-configured publisher locations to dynamically update a channel's message buffer settings. This can be used to erase messages or to scale an existing channel's message buffer as desired.
+
+## Subscriber Endpoints
+
+Subscriber endpoints are Nginx config *locations* with the [*`nchan_subscriber`*](#nchan_subscriber) directive.
+
+Nchan supports several different kinds of subscribers for receiving messages: [*Websocket*](#websocket), [*EventSource*](#eventsource) (Server Sent Events),  [*Long-Poll*](#long-polling), [*Interval-Poll*](#interval-polling). [*HTTP chunked transfer*](#http-chunked-transfer), and [*HTTP multipart/mixed*](#http-multipart-mixed).
+
+```nginx
+  location /sub {
+    #example subscriber location
+    nchan_subscriber;
+    nchan_channel_id foo;
+    nchan_channel_group test;
+    nchan_subscriber_first_message oldest;
+  }
+```
+
+<!-- tag:subscriber -->
+
+- ### Long-Polling
+  The tried-and-true server-push method supported by every browser out there.  
+  Initiated by sending an HTTP `GET` request to a channel subscriber endpoint.  
+  The long-polling subscriber walks through a channel's message queue via the built-in cache mechanism of HTTP clients, namely with the "`Last-Modified`" and "`Etag`" headers. Explicitly, to receive the next message for given a long-poll subscriber response, send a request with the "`If-Modified-Since`" header set to the previous response's "`Last-Modified`" header, and "`If-None-Match`" likewise set to the previous response's "`Etag`" header.  
+  Sending a request without a "`If-Modified-Since`" or "`If-None-Match`" headers returns the oldest message in a channel's message queue, or waits until the next published message, depending on the value of the `nchan_subscriber_first_message` config directive.  
+  A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
+  <!-- tag:subscriber-longpoll -->
+  
+- ### Interval-Polling
+  Works just like long-polling, except if the requested message is not yet available, immediately responds with a `304 Not Modified`.
+  Nchan cannot automatically distinguish between long-poll and interval-poll subscriber requests, so long-polling must be disabled for a subscriber location if you wish to use interval-polling.
+
+- ### Websocket
+  Bidirectional communication for web browsers. Part of the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html). Nchan supports the latest protocol version 13 ([RFC 6455](https://tools.ietf.org/html/rfc6455)).  
+  Initiated by sending a websocket handshake to the desired subscriber endpoint location.  
+  If the websocket connection is closed by the server, the `close` frame will contain the HTTP response code and status line describing the reason for closing the connection. Server-initiated keep-alive pings can be configured with the [`nchan_websocket_ping_interval`](#nchan_websocket_ping_interval) config directive.
+  Messages are delivered to subscribers in `text` websocket frames, except if a message's `content-type` is "`application/octet-stream`" -- then it is delivered in a `binary` frame.
+  <br />
+  Websocket subscribers can use the custom `ws+meta.nchan` subprotocol to receive message metadata with messages, making websocket connections resumable. Messages received with this subprotocol are of the form
+  <pre>
+  id: message_id
+  content-type: message_content_type
+  \n
+  message_data
+  </pre>   
+  The `content-type:` line may be omitted.
+  <br />
+  #### Websocket Publisher
+  Messages published through a websocket connection can be forwarded to an upstream application with the [`nchan_publisher_upstream_request`](#nchan_publisher_upstream_request) config directive.   
+  Messages published in a binary frame are automatically given the `content-type` "`application/octet-stream`".
+  #### Permessage-deflate
+  Nchan version 1.1.8 and above supports the [permessage-deflate protocol extension](https://tools.ietf.org/html/rfc7692). Messages are deflated once when they are published, and then can be broadcast to any number of compatible websocket subscribers. Message deflation is enabled by setting the [`nchan_deflate_message_for_websocket on;`](#nchan_deflate_message_for_websocket) directive in a publisher location.
+  <br />
+  The deflated data is stored alongside the original message in memory, or, if large enough, on disk. This means more [shared memory](#nchan_shared_memory_size) is necessary when using `nchan_deflate_message_for_websocket`.
+  <br />
+  Deflation parameters (speed, memory use, strategy, etc.), can be tweaked using the [`nchan_permessage_deflate_compression_window`](#nchan_permessage_deflate_compression_window), [`nchan_permessage_deflate_compression_level`](#nchan_permessage_deflate_compression_level),
+  [`nchan_permessage_deflate_compression_strategy`](#nchan_permessage_deflate_compression_strategy), and 
+  [`nchan_permessage_deflate_compression_window`](#nchan_permessage_deflate_compression_window) settings.
+  <br />
+  Nchan also supports the (deprecated) [perframe-deflate extension](https://tools.ietf.org/html/draft-tyoshino-hybi-websocket-perframe-deflate-06) still in use by Safari as `x-webkit-perframe-deflate`.
+  <br />
+  <!-- tag:subscriber-websocket -->
+  
+- ### EventSource
+  Also known as [Server-Sent Events](https://en.wikipedia.org/wiki/Server-sent_events) or SSE, it predates Websockets in the [HTML5 spec](http://www.w3.org/TR/2014/REC-html5-20141028/single-page.html), and is a [very simple protocol](http://www.w3.org/TR/eventsource/#event-stream-interpretation).  
+  Initiated by sending an HTTP `GET` request to a channel subscriber endpoint with the "`Accept: text/event-stream`" header.    
+  Each message `data: ` segment will be prefaced by the message `id: `.  
+  To resume a closed EventSource connection from the last-received message, one *should* start the connection with the "`Last-Event-ID`" header set to the last message's `id`.  
+  Unfortunately, browsers [don't support setting](http://www.w3.org/TR/2011/WD-eventsource-20111020/#concept-event-stream-last-event-id) this header for an `EventSource` object, so by default the last message id is set either from the "`Last-Event-Id`" header or the `last_event_id` url query string argument.  
+  This behavior can be configured via the [`nchan_subscriber_last_message_id`](#nchan_subscriber_last_message_id) config.  
+  A message's `content-type` will not be received by an EventSource subscriber, as the protocol makes no provisions for this metadata.
+  A message's associated `event` type, if present, will be sent to this subscriber with the `event:` line.  
+  <!-- tag:subscriber-eventsource -->
+  
+- ### HTTP [multipart/mixed](http://www.w3.org/Protocols/rfc1341/7_2_Multipart.html#z0)
+  The `multipart/mixed` MIMEtype was conceived for emails, but hey, why not use it for HTTP? It's easy to parse and includes metadata with each message.  
+  Initiated by including an `Accept: multipart/mixed` header.  
+  The response headers and the unused "preamble" portion of the response body are sent right away, with the boundary string generated randomly for each subscriber.  Each subsequent message will be sent as one part of the multipart message, and will include the message time and tag (`Last-Modified` and `Etag`) as well as the optional `Content-Type` headers.  
+  Each message is terminated with the next multipart message's boundary **without a trailing newline**. While this conforms to the multipart spec, it is unusual as multipart messages are defined as *starting*, rather than ending with a boundary.  
+  A message's associated content type, if present, will be sent to this subscriber with the `Content-Type` header.
+  <!-- tag:subscriber-multipart -->
+  
+- ### HTTP Raw Stream
+  A simple subscription method similar to the [streaming subscriber](https://github.com/wandenberg/nginx-push-stream-module/blob/master/docs/directives/subscribers.textile#push_stream_subscriber) of the [Nginx HTTP Push Stream Module](https://github.com/wandenberg/nginx-push-stream-module). Messages are appended to the response body, separated by a newline or configurable by `nchan_subscriber_http_raw_stream_separator`.
+  <!-- tag:subscriber-rawstream -->
+
+- ### HTTP [Chunked Transfer](http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1)
+  This subscription method uses the `chunked` `Transfer-Encoding` to receive messages.   
+  Initiated by explicitly including `chunked` in the [`TE` header](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.39):  
+  `TE: chunked` (or `TE: chunked;q=??` where the qval > 0)  
+  The response headers are sent right away, and each message will be sent as an individual chunk. Note that because a zero-length chunk terminates the transfer, **zero-length messages will not be sent** to the subscriber.  
+  Unlike the other subscriber types, the `chunked` subscriber cannot be used with http/2 because it disallows chunked encoding.
+  <!-- tag:subscriber-chunked -->
+
+## PubSub Endpoint  
+
+PubSub endpoints are Nginx config *locations* with the [*`nchan_pubsub`*](#nchan_pubsub) directive.
+
+A combination of *publisher* and *subscriber* endpoints, this location treats all HTTP `GET`
+requests as subscribers, and all HTTP `POST` as publishers. Channels cannot be deleted through a pubsub endpoing with an HTTP `DELETE` request.
+
+One simple use case is an echo server:
+
+```nginx
+  location = /pubsub {
+    nchan_pubsub;
+    nchan_channel_id foo;
+    nchan_channel_group test;
+  }
+```
+
+A more interesting setup may set different publisher and subscriber channel ids:
+
+```nginx
+  location = /pubsub {
+    nchan_pubsub;
+    nchan_publisher_channel_id foo;
+    nchan_subscriber_channel_id bar;
+    nchan_channel_group test;
+  }
+```
+
+Here, subscribers will listen for messages on channel `foo`, and publishers will publish messages to channel `bar`. This can be useful when setting up websocket proxying between web clients and your application.
+<!-- tag:pubsub -->
+
+## The Channel ID
+
+So far the examples have used static channel ids, which is not very useful. In practice, the channel id can be set to any nginx *variable*, such as a querystring argument, a header value, or a part of the location url:
+
+```nginx
+  location = /sub_by_ip {
+    #channel id is the subscriber's IP address
+    nchan_subscriber;
+    nchan_channel_id $remote_addr;
+  }
+  
+  location /sub_by_querystring {
+    #channel id is the query string parameter chanid
+    # GET /sub/sub_by_querystring?foo=bar&chanid=baz will have the channel id set to 'baz'
+    nchan_subscriber;
+    nchan_channel_id $arg_chanid;
+  }
+
+  location ~ /sub/(\w+)$ {
+    #channel id is the word after /sub/
+    # GET /sub/foobar_baz will have the channel id set to 'foobar_baz'
+    # I hope you know your regular expressions...
+    nchan_subscriber;
+    nchan_channel_id $1; #first capture of the location match
+  }
+```
+
+I recommend using the last option, a channel id derived from the request URL via a regular expression. It makes things nice and RESTful.
+
+<!-- tag:channel-id -->
+
+### Channel Multiplexing
+
+With channel multiplexing, subscribers can subscribe to up to 255 channels per connection. Messages published to all the specified channels will be delivered in-order to the subscriber. There are two ways to enable multiplexing:
+
+Up to 7 channel ids can be specified for the `nchan_channel_id` or `nchan_channel_subscriber_id` config directive:
+
+```nginx
+  location ~ /multisub/(\w+)/(\w+)$ {
+    nchan_subscriber;
+    nchan_channel_id "$1" "$2" "common_channel";
+    #GET /multisub/foo/bar will be subscribed to:
+    # channels 'foo', 'bar', and 'common_channel',
+    #and will receive messages from all of the above.
+  }
+```
+
+For more than 7 channels, `nchan_channel_id_split_delimiter` can be used to split the `nchan_channel_id` or `nchan_channel_subscriber_id` into up to 255 individual channel ids:
+
+```nginx
+  location ~ /multisub-split/(.*)$ {
+    nchan_subscriber;
+    nchan_channel_id "$1";
+    nchan_channel_id_split_delimiter ",";
+    #GET /multisub-split/foo,bar,baz,a will be subscribed to:
+    # channels 'foo', 'bar', 'baz', and 'a'
+    #and will receive messages from all of the above.
+  }
+```
+
+It is also possible to publish to multiple channels with a single request as well as delete multiple channels with a single request, with similar configuration:
+
+```nginx
+  location ~ /multipub/(\w+)/(\w+)$ {
+    nchan_publisher;
+    nchan_channel_id "$1" "$2" "another_channel";
+    #POST /multipub/foo/bar will publish to:
+    # channels 'foo', 'bar', 'another_channel'
+    #DELETE /multipub/foo/bar will delete:
+    # channels 'foo', 'bar', 'another_channel'
+  }
+```
+
+When a channel is deleted, all of its messages are deleted, and all of its subscribers' connection are closed -- including ones subscribing through a multiplexed location. For example, suppose a subscriber is subscribed to channels "foo" and "bar" via a single multiplexed connection. If "foo" is deleted, the connection is closed, and the subscriber therefore loses the "bar" subscription as well.
+
+See the [Channel Security](#securing-channels) section about using good IDs and keeping private channels secure.
+
+<!-- tag:channel-multiplexing -->
+
+### Channel Groups
+
+Channels can be associated with groups to avoid channel ID conflicts:
+
+```nginx
+  location /test_pubsub {
+    nchan_pubsub;
+    nchan_channel_group "test";
+    nchan_channel_id "foo";
+  }
+  
+  location /pubsub {
+    nchan_pubsub;
+    nchan_channel_group "production";
+    nchan_channel_id "foo";
+    #same channel id, different channel group. Thus, different channel.
+  }
+  
+  location /flexgroup_pubsub {
+    nchan_pubsub;
+    nchan_channel_group $arg_group;
+    nchan_channel_id "foo";
+    #group can be set with request variables too
+  }
+```
+
+#### Limits and Accounting
+
+Groups can be used to track aggregate channel usage, as well as set limits on the number of channels, subscribers, stored messages, memory use, etc:
+
+```nginx
+  #enable group accounting
+  nchan_channel_group_accounting on;
+  
+  location ~ /pubsub/(\w+)$ {
+    nchan_pubsub;
+    nchan_channel_group "limited";
+    nchan_channel_id $1;
+  }
+  
+  location ~ /prelimited_pubsub/(\w+)$ {
+    nchan_pubsub;
+    nchan_channel_group "limited";
+    nchan_channel_id $1;
+    nchan_group_max_subscribers 100;
+    nchan_group_max_messages_memory 50M;
+  }
+  
+  location /group {
+    nchan_channel_group limited;
+    nchan_group_location;
+    nchan_group_max_channels $arg_max_channels;
+    nchan_group_max_messages $arg_max_messages;
+    nchan_group_max_messages_memory $arg_max_messages_mem;
+    nchan_group_max_messages_disk $arg_max_messages_disk;
+    nchan_group_max_subscribers $arg_max_subs;
+  }
+```
+
+Here, `/group` is an `nchan_group_location`, which is used for accessing and modifying group data. To get group data, send a `GET` request to a `nchan_group_location`:
+
+```sh
+>  curl http://localhost/group
+
+channels: 10
+subscribers: 0
+messages: 219
+shared memory used by messages: 42362 bytes
+disk space used by messages: 0 bytes
+limits:
+  max channels: 0
+  max subscribers: 0
+  max messages: 0
+  max messages shared memory: 0
+  max messages disk space: 0  
+```
+
+By default, the data is returned in human-readable plaintext, but can also be formatted as JSON, XML, or YAML:
+
+```sh
+>  curl -H "Accept: text/json" http://localhost/group
+
+{
+  "channels": 21,
+  "subscribers": 40,
+  "messages": 53,
+  "messages_memory": 19941,
+  "messages_disk": 0,
+  "limits": {
+    "channels": 0,
+    "subscribers": 0,
+    "messages": 0,
+    "messages_memory": 0,
+    "messages_disk": 0
+  }
+}
+```
+
+The data in the response are for the single Nchan instance only, regardless of whether Redis is used. A limit of 0 means 'unlimited'.
+
+Limits can be set per-location, as with the above `/prelimited_pubsub/...` location, or with a POST request to the `nchan_group_location`:
+```sh
+>  curl -X POST "http://localhost/group?max_channels=15&max_subs=1000&max_messages_disk=0.5G"
+
+channels: 0
+subscribers: 0
+messages: 0
+shared memory used by messages: 0 bytes
+disk space used by messages: 0 bytes
+limits:
+  max channels: 15
+  max subscribers: 1000
+  max messages: 0
+  max messages shared memory: 0
+  max messages disk space: 536870912
+
+```
+
+Limits are only applied locally, regardless of whether Redis is enabled. 
+If a publisher or subscriber request exceeds a group limit, Nchan will respond to it with a `403 Forbidden` response.
+
+<!-- tag:group -->
+
+## Hooks and Callbacks
+
+<!-- tag:hook -->
+  
+### Request Authorization
+
+This feature, configured with [`nchan_authorize_request`](#nchan_authorize_request), behaves just like the Nginx [http_auth_request module](http://nginx.org/en/docs/http/ngx_http_auth_request_module.html#auth_request_set).
+
+Consider the configuration:
+```nginx
+  upstream my_app {
+    server 127.0.0.1:8080;
+  }
+  location = /auth {
+    proxy_pass http://my_app/pubsub_authorize;
+    proxy_pass_request_body off;
+    proxy_set_header Content-Length "";
+    proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
+    proxy_set_header X-Publisher-Type $nchan_publisher_type;
+    proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
+    proxy_set_header X-Channel-Id $nchan_channel_id;
+    proxy_set_header X-Original-URI $request_uri;
+    proxy_set_header X-Forwarded-For $remote_addr;
+  }
+  
+  location ~ /pubsub/auth/(\w+)$ {
+    nchan_channel_id $1;
+    nchan_authorize_request /auth;
+    nchan_pubsub;
+    nchan_channel_group test;
+  }
+```
+
+Here, any request to the location `/pubsub/auth/<...>` will need to be authorized by your application (`my_app`). Nginx will generate a `GET /pubsub_authorize` request to the application, with additional headers set by the `proxy_set_header` directives. Note that Nchan-specific variables are available for this authorization request. Once your application receives this request, it should decide whether or not to authorize the subscriber. This can be done based on a forwarded session cookie, IP address, or any set of parameters of your choosing. If authorized, it should respond with an empty `200 OK` response.  
+All non-`2xx` response codes (such as `403 Forbidden`) are interpreted as authorization failures. In this case, the failing response is proxied to the client. 
+
+Note that Websocket and EventSource clients will only try to authorize during the initial handshake request, whereas Long-Poll and Interval-Poll subscribers will need to be authorized each time they request the next message, which may flood your application with too many authorization requests.
+
+<!-- commands: nchan_authorize_request -->
+
+### Subscriber Presence
+
+Subscribers can notify an application when they have subscribed and unsubscribed to a channel using the [`nchan_subscribe_request`](#nchan_subscribe_request)
+and [`nchan_unsubscribe_request`](#nchan_unsubscribe_request) settings. 
+These should point to Nginx locations configured to forward requests to an upstream proxy (your application):
+
+```nginx
+  location ~ /sub/(\w+)$ {
+    nchan_channel_id $1;
+    nchan_subscribe_request /upstream/sub;
+    nchan_unsubscribe_request /upstream/unsub;
+    nchan_subscriber;
+    nchan_channel_group test;
+  }
+
+  location = /upstream/unsub {
+    proxy_pass http://127.0.0.1:9292/unsub;
+    proxy_ignore_client_abort on;  #!!!important!!!!
+    proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
+    proxy_set_header X-Channel-Id $nchan_channel_id;
+    proxy_set_header X-Original-URI $request_uri;
+  } 
+  location = /upstream/sub {
+    proxy_pass http://127.0.0.1:9292/sub;
+    proxy_set_header X-Subscriber-Type $nchan_subscriber_type;
+    proxy_set_header X-Message-Id $nchan_message_id;
+    proxy_set_header X-Channel-Id $nchan_channel_id;
+    proxy_set_header X-Original-URI $request_uri;
+  } 
+```
+
+In order for `nchan_unsubscribe_request` to work correctly, the location it points to must have `proxy_ignore_client_abort on;`. Otherwise, suddenly aborted subscribers may not trigger an unsubscribe request.
+
+Note that the subscribe/unsubscribe hooks are **disabled for long-poll and interval-poll clients**, because they would trigger these hooks each time they receive a message.
+
+<!-- commands: nchan_subscribe_request nchan_unsubscribe_request -->
+
+### Message Forwarding
+
+Messages can be forwarded to an upstream application before being published using the `nchan_publisher_upstream_request` setting:
+
+```nginx
+  location ~ /pub/(\w+)$ {
+    #publisher endpoint
+    nchan_channel_id $1;
+    nchan_pubsub;
+    nchan_publisher_upstream_request /upstream_pub;
+  }
+  
+  location = /upstream_pub {
+    proxy_pass http://127.0.0.1:9292/pub;
+    proxy_set_header X-Publisher-Type $nchan_publisher_type;
+    proxy_set_header X-Prev-Message-Id $nchan_prev_message_id;
+    proxy_set_header X-Channel-Id $nchan_channel_id;
+    proxy_set_header X-Original-URI $request_uri;
+  } 
+```
+With this configuration, incoming messages are first `POST`ed to `http://127.0.0.1:9292/pub`.
+The upstream response code determines how publishing will proceed:
+  - `304 Not Modified` publishes the message as received, without modifification.
+  - `204 No Content` discards the message
+  - `200 OK` is used for modifying the message. Instead of the original incoming message, the message contained in this HTTP response is published.
+
+There are two main use cases for `nchan_publisher_upstream_request`: forwarding incoming data from Websocket publishers to an application, and mutating incoming messages.
+
+<!-- commands: nchan_publisher_upstream_request -->
+
+## Storage
+
+Nchan can stores messages in memory, on disk, or via Redis. Memory storage is much faster, whereas Redis has additional overhead as is considerably slower for publishing messages, but offers near unlimited scalability for broadcast use cases with far more subscribers than publishers.
+
+### Memory Storage
+
+This default storage method uses a segment of shared memory to store messages and channel data. Large messages as determined by Nginx's caching layer are stored on-disk. The size of the memory segment is configured with `nchan_shared_memory_size`. Data stored here is not persistent, and is lost if Nginx is restarted or reloaded.
+
+<!-- tag:memstore -->
+
+### Redis
+
+[Redis](http://redis.io) can be used to add **data persistence** and **horizontal scalability**, **failover** and **high availability** to your Nchan setup. 
+
+<!-- tag:redis -->
+
+#### Connecting to a Redis Server
+To connect to a single Redis master server, use an `upstream` with `nchan_redis_server` and `nchan_redis_pass` settings:
+
+```nginx
+http {
+  upstream my_redis_server {
+    nchan_redis_server 127.0.0.1;
+  }
+  server {
+    listen 80;
+    
+    location ~ /redis_sub/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_id $1;
+      nchan_redis_pass my_redis_server;
+    }
+    location ~ /redis_pub/(\w+)$ {
+      nchan_redis_pass my_redis_server;
+      nchan_publisher;
+      nchan_channel_id $1;
+    }
+  }
+} 
+```
+
+All servers with the above configuration connecting to the same redis server share channel and message data.
+
+Channels that don't use Redis can be configured side-by-side with Redis-backed channels, provided the endpoints never overlap. (This can be ensured, as above, by setting separate `nchan_channel_group`s.). Different locations can also connect to different Redis servers.
+
+Nchan can work with a single Redis master. It can also auto-discover and use Redis slaves to balance PUBSUB traffic.
+
+<!-- commands: nchan_redis_server nchan_redis_pass -->
+
+#### Redis Cluster
+Nchan also supports using Redis Cluster, which adds scalability via sharding channels among cluster nodes. Redis cluster also provides **automatic failover**, **high availability**, and eliminates the single point of failure of one shared Redis server. It is configured and used like so:
+
+```nginx
+http {
+  upstream redis_cluster {
+    nchan_redis_server redis://127.0.0.1:7000;
+    nchan_redis_server redis://127.0.0.1:7001;
+    nchan_redis_server redis://127.0.0.1:7002;
+    # you don't need to specify all the nodes, they will be autodiscovered
+    # however, it's recommended that you do specify at least a few master nodes.
+  }
+  server {
+    listen 80;
+    
+    location ~ /sub/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_id $1;
+      nchan_redis_pass redis_cluster;
+    }
+    location ~ /pub/(\w+)$ {
+      nchan_publisher;
+      nchan_channel_id $1;
+      nchan_redis_pass redis_cluster;
+    }
+  }
+} 
+```
+
+<!-- commands: nchan_redis_server nchan_redis_pass -->
+
+##### High Availability
+Redis Cluster connections are designed to be resilient and try to recover from errors. Interrupted connections will have their commands queued until reconnection, and Nchan will publish any messages it successfully received while disconnected. Nchan is also adaptive to cluster modifications. It will add new nodes and remove them as needed.
+
+All Nchan servers sharing a Redis server or cluster should have their times synchronized (via ntpd or your favorite ntp daemon). Failure to do so may result in missed or duplicate messages.
+
+##### Failover Recovery
+Starting with version 1.3.0, Nchan will attempt to recover from cluster node failures, keyslot errors, and cluster epoch changes without disconnecting from the entire cluster. It will attempt to do this until [`nchan_redis_cluster_max_failing_time`](#nchan_redis_cluster_max_failing_time) is exceeded. Additionally, [recovery attempt delays](#nchan_redis_cluster_recovery_delay) have configurable [jitter](#nchan_redis_cluster_recovery_delay_jitter), [exponential backoff](#nchan_redis_cluster_recovery_delay_backoff), and [maximum](#nchan_redis_cluster_recovery_delay_max) values.
+
+#### Using Redis securely
+
+Redis servers can be connected to via TLS by using the [`nchan_redis_ssl`](#nchan_redis_ssl) config setting in an `upstream` block, or by using the `rediss://`  schema for the server URLs.
+
+A password and optional username for the `AUTH` command can be set by the [`nchan_redis_username`](#nchan_redis_username) and [`nchan_redis_password`](#nchan_redis_password) config settings in an `upstream` block, or by using the `redis://<username>:<password>@hostname` server URL schema.
+
+Note that autodiscovered Redis nodes inherit their parent's SSL, username, and password settings.
+
+#### Tweaks and Optimizations
+
+As of version 1.2.0, Nchan uses Redis slaves to load-balance PUBSUB traffic. By default, there is an equal chance that a channel's PUBSUB subscription will go to any master or slave. The [`nchan_redis_subscribe_weights`](#nchan_redis_subscribe_weights) setting is available to fine-tune this load-balancing.
+
+Also from 1.2.0 onward, [`nchan_redis_optimize_target`](#nchan_redis_optimize_target) can be used to prefer optimizing Redis slaves for CPU or bandwidth. For heavy publishing loads, the tradeoff is very roughly 35% replication bandwidth per slave to 30% CPU load on slaves.
+
+#### Performance Statistics
+
+Redis command statistics were added in version 1.3.5. These provide total number of times different Redis commands were run on, and the total amount of time they took. The stats are for a given Nchan server, *not* all servers connected to a Redis upstream. They are grouped by each upstream, and totaled per node.
+
+```nginx
+http {
+  upstream my_redis_cluster {
+    nchan_redis_server 127.0.0.1;
+  }
+  
+  server {
+    #[...]
+    
+    location ~ /nchan_redis_cluster_stats$ {
+      nchan_redis_upstream_stats my_redis_cluster;
+    }
+  }
+
+```
+
+To get the stats, send a GET request to the stats location.
+
+```console
+  curl http://localhost/nchan_redis_cluster_stats
+```
+
+The response is JSON of the form:
+
+```js
+{
+  "upstream": "redis_cluster",
+  "nodes": [
+    {
+      "address"        : "127.0.0.1:7000",
+      "id"             : "f13d71b1d14d8bf92b72cebee61421294e95dc72",
+      "command_totals" : {
+        "connect"    : {
+          "msec"     : 357,
+          "times"    : 5
+        },
+        "pubsub_subscribe": {
+          "msec"     : 749,
+          "times"    : 37
+        },
+        "pubsub_unsubsribe": {
+          "msec"     : 332,
+          "times"    : 37
+        }
+        /*[...]*/
+      }
+    },
+    {
+      "address"        : "127.0.0.1:7001",
+      "id"             : "b768ecb4152912bed6dc927e8f70284191a79ed7",
+      "command_totals" : {
+        "connect"    : {
+          "msec"     : 4281,
+          "times"    : 5
+        },
+        "pubsub_subscribe": {
+          "msec"     : 309,
+          "times"    : 33
+        },
+        "pubsub_unsubsribe": {
+          "msec"     : 307,
+          "times"    : 30
+        },
+        /*[...]*/
+      },
+    }
+    /*[...]*/
+  ]
+}
+```
+
+For brevity, the entire `command_totals` hash is omitted in this documentation.
+
+<!-- commands: nchan_redis_upstream_stats nchan_redis_upstream_stats_disconnected_timeout nchan_redis_upstream_stats_enabled -->
+
+## Introspection
+
+There are several ways to see what's happening inside Nchan. These are useful for debugging application integration and for measuring performance.
+
+### Channel Events
+
+Channel events are messages automatically published by Nchan when certain events occur in a channel. These are very useful for debugging the use of channels. However, they carry a significant performance overhead and should be used during development, and not in production.
+
+Channel events are published to special 'meta' channels associated with normal channels. Here's how to configure them:
+
+```nginx
+location ~ /pubsub/(.+)$ {
+  nchan_pubsub;
+  nchan_channel_id $1;
+  nchan_channel_events_channel_id $1; #enables channel events for this location
+}
+
+location ~ /channel_events/(.+) {
+  #channel events subscriber location
+  nchan_subscriber;
+  nchan_channel_group meta; #"meta" is a SPECIAL channel group
+  nchan_channel_id $1;
+}
+```
+
+Note the `/channel_events/...` location has a *special* `nchan_channel_group`, `meta`. This group is reserved for accessing "channel events channels", or"metachannels".
+
+Now, say I subscribe to `/channel_events/foo` I will refer to this as the channel events subscriber.
+
+Let's see what this channel events subscriber receives when I publish messages to 
+
+Subscribing to `/pubsub/foo` produces the channel event
+```
+subscriber_enqueue foo
+```
+
+Publishing a message to `/pubsub/foo`:
+```
+channel_publish foo
+```
+
+Unsubscribing from `/pubsub/foo`:
+```
+subscriber_dequeue foo
+```
+
+Deleting `/pubsub/foo` (with HTTP `DELETE /pubsub/foo`):
+```
+channel_delete foo
+```
+
+The event string itself is configirable with [nchan_channel_event_string](#nchan_channel_event_string). By default, it is set to `$nchan_channel_event $nchan_channel_id`. 
+This string can use any Nginx and [Nchan variables](/#variables).
+
+
+### nchan_stub_status Stats
+
+Like Nginx's [stub_status](https://nginx.org/en/docs/http/ngx_http_stub_status_module.html),
+`nchan_stub_status` is used to get performance metrics.
+
+```nginx
+  location /nchan_stub_status {
+    nchan_stub_status;
+  }
+```
+
+Sending a GET request to this location produces the response:
+
+```text
+total published messages: 1906
+stored messages: 1249
+shared memory used: 1824K
+channels: 80
+subscribers: 90
+redis pending commands: 0
+redis connected servers: 0
+redis unhealthy upstreams: 0
+total redis commands sent: 0
+total interprocess alerts received: 1059634
+interprocess alerts in transit: 0
+interprocess queued alerts: 0
+total interprocess send delay: 0
+total interprocess receive delay: 0
+nchan version: 1.1.5
+```
+
+Here's what each line means, and how to interpret it:
+  - `total published messages`: Number of messages published to all channels through this Nchan server.
+  - `stored messages`: Number of messages currently buffered in memory
+  - `shared memory used`: Total shared memory used for buffering messages, storing channel information, and other purposes. This value should be comfortably below `nchan_shared_memory_size`.
+  - `channels`: Number of channels present on this Nchan server.
+  - `subscribers`: Number of subscribers to all channels on this Nchan server.
+  - `redis pending commands`: Number of commands sent to Redis that are awaiting a reply. May spike during high load, especially if the Redis server is overloaded. Should tend towards 0.
+  - `redis connected servers`: Number of redis servers to which Nchan is currently connected.
+  - `redis unhealthy upstreams`: Number of redis upstreams (individual server or cluster mode) that are currently not usable for publishing and subscribing.
+  - `total redis commands sent`: Total number of commands this Nchan instance sent to Redis.
+  - `total interprocess alerts received`: Number of interprocess communication packets transmitted between Nginx workers processes for Nchan. Can grow at 100-10000 per second at high load.
+  - `interprocess alerts in transit`: Number of interprocess communication packets in transit between Nginx workers. May be nonzero during high load, but should always tend toward 0 over time.
+  - `interprocess queued alerts`: Number of interprocess communication packets waiting to be sent. May be nonzero during high load, but should always tend toward 0 over time.
+  - `total interprocess send delay`: Total amount of time interprocess communication packets spend being queued if delayed. May increase during high load.
+  - `total interprocess receive delay`: Total amount of time interprocess communication packets spend in transit if delayed. May increase during high load.
+  - `nchan_version`: current version of Nchan. Available for version 1.1.5 and above.
+
+Additionally, when there is at least one `nchan_stub_status` location, this data is also available [through variables](#variables).
+  
+## Securing Channels
+
+### Securing Publisher Endpoints
+Consider the use case of an application where authenticated users each use a private, dedicated channel for live updates. The configuration might look like this:
+
+```nginx
+http {
+  server {
+    #available only on localhost
+    listen  127.0.0.1:8080;
+    location ~ /pub/(\w+)$ {
+      nchan_publisher;
+      nchan_channel_group my_app_group;
+      nchan_channel_id $1;
+    }
+  }
+  
+  server {
+    #available to the world
+    listen 80;
+    
+    location ~ /sub/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_group my_app_group;
+      nchan_channel_id $1;
+    }
+  }
+}
+
+```
+
+Here, the subscriber endpoint is available on a public-facing port 80, and the publisher endpoint is only available on localhost, so can be accessed only by applications residing on that machine. Another way to limit access to the publisher endpoint is by using the allow/deny settings:
+
+```nginx
+
+  server {
+    #available to the world
+    listen 80; 
+    location ~ /pub/(\w+)$ {
+      allow 127.0.0.1;
+      deny all;
+      nchan_publisher;
+      nchan_channel_group my_app_group;
+      nchan_channel_id $1;
+    }
+```
+
+Here, only the local IP 127.0.0.1 is allowed to use the publisher location, even though it is defined in a non-localhost server block.
+
+### Keeping a Channel Private
+
+A Channel ID that is meant to be private should be treated with the same care as a session ID token. Considering the above use case of one-channel-per-user, how can we ensure that only the authenticated user, and no one else, is able to access his channel? 
+
+First, if you intend on securing the channel contents, you must use TLS/SSL:
+
+```nginx 
+http {
+  server {
+    #available only on localhost
+    listen  127.0.0.1:8080;
+    #...publisher endpoint config
+  }
+  server {
+    #available to the world
+    listen 443 ssl;
+    #SSL config goes here
+    location ~ /sub/(\w+)$ {
+      nchan_subscriber;
+      nchan_channel_group my_app_group;
+      nchan_channel_id $1;
+    }
+  }
+}
+```
+
+Now that you have a secure connection between the subscriber client and the server, you don't need to worry about the channel ID or messages being passively intercepted. This is a minimum requirement for secure message delivery, but it is not sufficient. 
+
+You must also take care to do at least one of the following:
+  - [Generate good, high-entropy Channel IDs](#good-ids).
+  - [Authorize all subscribers with the `nchan_authorize_request` config directive](#request-authorization).
+  - [Authorize subscribers and hide channel IDs with the "`X-Accel-Redirect`" mechanism](#x-accel-redirect).
+  
+#### Good IDs
+
+An ID that can be guessed is an ID that can be hijacked. If you are not authenticating subscribers (as described below), a channel ID should be impossible to guess. Use at least 128 bits of entropy to generate a random token, associate it with the authenticated user, and share it only with the user's client. Do not reuse tokens, just as you would not reuse session IDs.
+
+#### X-Accel-Redirect
+
+This feature uses the [X-Accel feature](https://www.nginx.com/resources/wiki/start/topics/examples/x-accel) of Nginx upstream proxies to perform an internal request to a subscriber endpoint.
+It allows a subscriber client to be authenticated by your application, and then redirected by nginx internally to a location chosen by your application (such as a publisher or subscriber endpoint). This makes it possible to have securely authenticated clients that are unaware of the channel id they are subscribed to.
+
+Consider the following configuration:
+```nginx 
+upstream upstream_app {
+  server 127.0.0.1:8080;
+}
+
+server {
+  listen 80; 
+  
+  location = /sub_upstream {
+    proxy_pass http://upstream_app/subscriber_x_accel_redirect;
+    proxy_set_header X-Forwarded-For $remote_addr;
+  }
+  
+  location ~ /sub/internal/(\w+)$ {
+    internal; #this location only accessible for internal nginx redirects
+    nchan_subscriber;
+    nchan_channel_id $1;
+    nchan_channel_group test;
+  }
+}
+```
+
+As commented, `/sub/internal/` is inaccessible from the outside:
+```console
+> curl  -v  http://127.0.0.1/sub/internal/foo
+  
+  < HTTP/1.1 404 Not Found
+  < Server: nginx/1.9.5
+  <
+  <html>
+  <head><title>404 Not Found</title></head>
+  <body bgcolor="white">
+  <center><h1>404 Not Found</h1></center>
+  <hr><center>nginx/1.9.5</center>
+  </body>
+  </html>
+```
+
+But if a request is made to `/sub_upstream`, it gets forwarded to your application (`my_app`) on port 8080 with the url `/subscriber_x_accel_redirect`.
+Note that you can set any forwarded headers here like any [`proxy_pass`](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass) Nginx location, 
+but unlike the case with `nchan_authorize_request`, Nchan-specific variables are not available.
+
+Now, your application must be set up to handle the request to `/subscriber_x_accel_redirect`. You should make sure the client is properly authenticated (maybe using a session cookie), and generate an associated channel id. If authentication fails, respond with a normal `403 Forbidden` response. You can also pass extra information about the failure in the response body and headers.
+
+If your application successfully authenticates the subscriber request, you now need to instruct Nginx to issue an internal redirect to `/sub/internal/my_channel_id`.
+This is accomplished by responding with an empty `200 OK` response that includes two headers:
+- `X-Accel-Redirect: /sub/internal/my_channel_id`
+- `X-Accel-Buffering: no`
+
+In the presence of these headers, Nginx will not forward your app's response to the client, and instead will *internally* redirect to `/sub/internal/my_channel_id`. 
+This will behave as if the client had requested the subscriber endpoint location directly.
+
+Thus using X-Accel-Redirect it is possible to both authenticate all subscribers *and* keep channel IDs completely hidden from subscribers.
+
+This method is especially useful for EventSource and Websocket subscribers. Long-Polling subscribers will need to be re-authenticated for every new message, which may flood your application with too many authentication requests.
+
+### Revoking Channel Authorization
+
+In some cases, you may want to revoke a particular subscriber's authorization for a given channel (e.g., if the user's permissions are changed). If the channel is unique to the subscriber, this is simply accomplished by deleting the channel. The same can be achieved for shared channels by subscribing each subscriber to both the shared channel and a subscriber-specific channel via a multiplexed connection. Deleting the subscriber-specific channel will terminate the subscriber''s connection, thereby also terminating their subscription to the shared channel. Consider the following configuration:
+
+```nginx
+location ~ /sub/(\w+) {
+  nchan_subscriber;
+  nchan_channel_id shared_$1 user_$arg_userid;
+  nchan_authorize_request /authorize;
+}
+
+location /pub/user {
+  nchan_publisher;
+  nchan_channel_id user_$arg_userid;
+}
+```
+
+A request to `/sub/foo?userid=1234` will subscribe to channels "shared_foo" and "user_1234" via a multiplexed connection. If you later send a `DELETE` request to `/pub/user?userid=1234`, this subscriber will be disconnected and therefore unsubscribed from both "user_1234" and "shared_foo".
+  
+## Variables
+
+Nchan makes several variables usabled in the config file:
+ 
+- `$nchan_channel_id`  
+  The channel id extracted from a publisher or subscriber location request. For multiplexed locations, this is the first channel id in the list.
+
+- `$nchan_channel_id1`, `$nchan_channel_id2`, `$nchan_channel_id3`, `$nchan_channel_id4`  
+  As above, but for the nth channel id in multiplexed channels.
+
+- `$nchan_subscriber_type`  
+  For subscriber locations, this variable is set to the subscriber type (websocket, longpoll, etc.).
+
+- `$nchan_channel_subscriber_last_seen`  
+  For publisher locations, this variable is set to the timestamp for the last connected subscriber.
+  
+- `$nchan_channel_subscriber_count`  
+  For publisher locations, this variable is set to the number of subscribers in the published channel.
+  
+- `$nchan_channel_message_count`  
+  For publisher locations, this variable is set to the number of messages buffered in the published channel.
+  
+- `$nchan_publisher_type`  
+  For publisher locations, this variable is set to the subscriber type (http or websocket).
+  
+- `$nchan_prev_message_id`, `$nchan_message_id`  
+  The current and previous (if applicable) message id for publisher request or subscriber response.
+
+- `$nchan_channel_event`  
+  For channel events, this is the event name. Useful when configuring `nchan_channel_event_string`.
+
+- `$nchan_version`  
+  Current Nchan version. Available since 1.1.5.
+  
+Additionally, `nchan_stub_status` data is also exposed as variables. These are available only when `nchan_stub_status` is enabled on at least one location:
+
+- `$nchan_stub_status_total_published_messages`  
+- `$nchan_stub_status_stored_messages`  
+- `$nchan_stub_status_shared_memory_used`  
+- `$nchan_stub_status_channels`  
+- `$nchan_stub_status_subscribers`  
+- `$nchan_stub_status_redis_pending_commands`  
+- `$nchan_stub_status_redis_connected_servers`  
+- `$nchan_stub_status_redis_unhealthy_upstreams`  
+- `$nchan_stub_status_total_ipc_alerts_received`  
+- `$nchan_stub_status_ipc_queued_alerts`  
+- `$nchan_stub_status_total_ipc_send_delay`  
+- `$nchan_stub_status_total_ipc_receive_delay`  
+
+
+## Configuration Directives
+
+- **nchan_channel_id**  
+  arguments: 1 - 7  
+  default: `(none)`  
+  context: server, location, if  
+  > Channel id for a publisher or subscriber location. Can have up to 4 values to subscribe to up to 4 channels.    
+  [more details](#the-channel-id)  
+
+- **nchan_channel_id_split_delimiter**  
+  arguments: 1  
+  default: `(none)`  
+  context: server, location, if  
+  > Split the channel id into several ids for multiplexing using the delimiter string provided.    
+  [more details](#channel-multiplexing)  
+
+- **nchan_deflate_message_for_websocket** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: server, location  
+  > Store a compressed (deflated) copy of the message along with the original to be sent to websocket clients supporting the permessage-deflate protocol extension    
+
+- **nchan_eventsource_event**  
+  arguments: 1  
+  default: `(none)`  
+  context: server, location, if  
+  > Set the EventSource `event:` line to this value. When used in a publisher location, overrides the published message's `X-EventSource-Event` header and associates the message with the given value. When used in a subscriber location, overrides all messages' associated `event:` string with the given value.    
+
+- **nchan_eventsource_ping_comment**  
+  arguments: 1  
+  default: `(empty)`  
+  context: server, location, if  
+  > Set the EventSource comment `: ...` line for periodic pings from server to client. Newlines are not allowed. If empty, no comment is sent with the ping.    
+
+- **nchan_eventsource_ping_data**  
+  arguments: 1  
+  default: `(empty)`  
+  context: server, location, if  
+  > Set the EventSource `data:` line for periodic pings from server to client. Newlines are not allowed. If empty, no data is sent with the ping.    
+
+- **nchan_eventsource_ping_event**  
+  arguments: 1  
+  default: `ping`  
+  context: server, location, if  
+  > Set the EventSource `event:` line for periodic pings from server to client. Newlines are not allowed. If empty, no event type is sent with the ping.    
+
+- **nchan_eventsource_ping_interval** `<number> (seconds)`  
+  arguments: 1  
+  default: `0 (none)`  
+  context: server, location, if  
+  > Interval for sending ping messages to EventSource subscribers. Disabled by default.    
+
+- **nchan_longpoll_multipart_response** `[ off | on | raw ]`  
+  arguments: 1  
+  default: `off`  
+  context: server, location, if  
+  > when set to 'on', enable sending multiple messages in a single longpoll response, separated using the multipart/mixed content-type scheme. If there is only one available message in response to a long-poll request, it is sent unmodified. This is useful for high-latency long-polling connections as a way to minimize round-trips to the server. When set to 'raw', sends multiple messages using the http-raw-stream message separator.    
+
+- **nchan_permessage_deflate_compression_level** `[ 0-9 ]`  
+  arguments: 1  
+  default: `6`  
+  context: http  
+  > Compression level for the `deflate` algorithm used in websocket's permessage-deflate extension. 0: no compression, 1: fastest, worst, 9: slowest, best    
+
+- **nchan_permessage_deflate_compression_memlevel** `[ 1-9 ]`  
+  arguments: 1  
+  default: `8`  
+  context: http  
+  > Memory level for the `deflate` algorithm used in websocket's permessage-deflate extension. How much memory should be allocated for the internal compression state. 1 - minimum memory, slow and reduces compression ratio; 9 - maximum memory for optimal speed    
+
+- **nchan_permessage_deflate_compression_strategy** `[ default | filtered | huffman-only | rle | fixed ]`  
+  arguments: 1  
+  default: `default`  
+  context: http  
+  > Compression strategy for the `deflate` algorithm used in websocket's permessage-deflate extension. Use 'default' for normal data, For details see [zlib's section on copression strategies](http://zlib.net/manual.html#Advanced)    
+
+- **nchan_permessage_deflate_compression_window** `[ 9-15 ]`  
+  arguments: 1  
+  default: `10`  
+  context: http  
+  > Compression window for the `deflate` algorithm used in websocket's permessage-deflate extension. The base two logarithm of the window size (the size of the history buffer). The bigger the window, the better the compression, but the more memory used by the compressor.    
+
+- **nchan_publisher** `[ http | websocket ]`  
+  arguments: 0 - 2  
+  default: `http websocket`  
+  context: server, location, if  
+  legacy name: push_publisher  
+  > Defines a server or location as a publisher endpoint. Requests to a publisher location are treated as messages to be sent to subscribers. See the protocol documentation for a detailed description.    
+  [more details](#publisher-endpoints)  
+
+- **nchan_publisher_channel_id**  
+  arguments: 1 - 7  
+  default: `(none)`  
+  context: server, location, if  
+  > Channel id for publisher location.    
+
+- **nchan_publisher_upstream_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.    
+  > The upstream response code determines how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.    
+  [more details](#message-forwarding)  
+
+- **nchan_pubsub** `[ http | websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
+  arguments: 0 - 6  
+  default: `http websocket eventsource longpoll chunked multipart-mixed`  
+  context: server, location, if  
+  > Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server.    
+  [more details](#pubsub-endpoint)  
+
+- **nchan_subscribe_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send GET request to internal location (which may proxy to an upstream server) after subscribing. Disabled for longpoll and interval-polling subscribers.    
+  [more details](#subscriber-presence)  
+
+- **nchan_subscriber** `[ websocket | eventsource | longpoll | intervalpoll | chunked | multipart-mixed | http-raw-stream ]`  
+  arguments: 0 - 5  
+  default: `websocket eventsource longpoll chunked multipart-mixed`  
+  context: server, location, if  
+  legacy name: push_subscriber  
+  > Defines a server or location as a channel subscriber endpoint. This location represents a subscriber's interface to a channel's message queue. The queue is traversed automatically, starting at the position defined by the `nchan_subscriber_first_message` setting.    
+  >  The value is a list of permitted subscriber types.    
+  [more details](#subscriber-endpoints)  
+
+- **nchan_subscriber_channel_id**  
+  arguments: 1 - 7  
+  default: `(none)`  
+  context: server, location, if  
+  > Channel id for subscriber location. Can have up to 4 values to subscribe to up to 4 channels.    
+
+- **nchan_subscriber_compound_etag_message_id**  
+  arguments: 1  
+  default: `off`  
+  context: server, location, if  
+  > Override the default behavior of using both `Last-Modified` and `Etag` headers for the message id.    
+  > Enabling this option packs the entire message id into the `Etag` header, and discards  
+  > `Last-Modified` and `If-Modified-Since` headers.    
+  [more details]()  
+
+- **nchan_subscriber_first_message** `[ oldest | newest | <number> ]`  
+  arguments: 1  
+  default: `oldest`  
+  context: server, location, if  
+  > Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` starts at `n`th from now). 0 is equivalent to 'newest'.    
+
+- **nchan_subscriber_http_raw_stream_separator** `<string>`  
+  arguments: 1  
+  default: `\n`  
+  context: server, location, if  
+  > Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character if not explicitly set to an empty string.    
+
+- **nchan_subscriber_info**  
+  arguments: 0  
+  context: location  
+  > A subscriber location for debugging the state of subscribers on a given channel. The subscribers of the channel specified by `nchan_channel_id` evaluate `nchan_subscriber_info_string` and send it back to the requested on this location. This is useful to see where subscribers are in an Nchan cluster, as well as debugging subscriber connection issues.    
+
+- **nchan_subscriber_info_string**  
+  arguments: 1  
+  default: `$nchan_subscriber_type $remote_addr:$remote_port $http_user_agent $server_name $request_uri $pid`  
+  context: server, location  
+  > this string is evaluated by each subscriber on a given channel and sent to the requester of a `nchan_subscriber_info` location    
+
+- **nchan_subscriber_last_message_id**  
+  arguments: 1 - 5  
+  default: `$http_last_event_id $arg_last_event_id`  
+  context: server, location, if  
+  > If `If-Modified-Since` and `If-None-Match` headers are absent, set the message id to the first non-empty of these values. Used primarily as a workaround for the inability to set the first `Last-Message-Id` of a web browser's EventSource object.     
+
+- **nchan_subscriber_message_id_custom_etag_header**  
+  arguments: 1  
+  default: `(none)`  
+  context: server, location, if  
+  > Use a custom header instead of the Etag header for message ID in subscriber responses. This setting is a hack, useful when behind a caching proxy such as Cloudflare that under some conditions (like using gzip encoding) swallow the Etag header.    
+
+- **nchan_subscriber_timeout** `<number> (seconds)`  
+  arguments: 1  
+  default: `0 (none)`  
+  context: http, server, location, if  
+  legacy name: push_subscriber_timeout  
+  > Maximum time a subscriber may wait for a message before being disconnected. If you don't want a subscriber's connection to timeout, set this to 0. When possible, the subscriber will get a response with a `408 Request Timeout` status; otherwise the subscriber will simply be disconnected.    
+
+- **nchan_unsubscribe_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send GET request to internal location (which may proxy to an upstream server) after unsubscribing. Disabled for longpoll and interval-polling subscribers.    
+  [more details](#subscriber-presence)  
+
+- **nchan_websocket_client_heartbeat** `<heartbeat_in> <heartbeat_out>`  
+  arguments: 2  
+  default: `none (disabled)`  
+  context: server, location, if  
+  > Most browser Websocket clients do not allow manually sending PINGs to the server. To overcome this limitation, this setting can be used to set up a PING/PONG message/response connection heartbeat. When the client sends the server message *heartbeat_in* (PING), the server automatically responds with *heartbeat_out* (PONG).    
+
+- **nchan_websocket_ping_interval** `<number> (seconds)`  
+  arguments: 1  
+  default: `0 (none)`  
+  context: server, location, if  
+  > Interval for sending websocket ping frames. Disabled by default.    
+
+- **nchan_access_control_allow_credentials**  
+  arguments: 1  
+  default: `on`  
+  context: http, server, location, if  
+  > When enabled, sets the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Credentials` header to `true`.    
+
+- **nchan_access_control_allow_origin** `<string>`  
+  arguments: 1  
+  default: `$http_origin`  
+  context: http, server, location, if  
+  > Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the incoming request's `Origin` header does not match this value, respond with a `403 Forbidden`. Multiple origins can be provided in a single argument separated with a space.    
+
+- **nchan_authorize_request** `<url>`  
+  arguments: 1  
+  context: server, location, if  
+  > Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it.    
+  [more details](#request-authorization)  
+
+- **nchan_channel_group** `<string>`  
+  arguments: 1  
+  default: `(none)`  
+  context: server, location, if  
+  legacy name: push_channel_group  
+  > The accounting and security group a channel belongs to. Works like a prefix string to the channel id. Can be set with nginx variables.    
+
+- **nchan_channel_group_accounting**  
+  arguments: 1  
+  default: `off`  
+  context: server, location  
+  > Enable tracking channel, subscriber, and message information on a per-channel-group basis. Can be used to place upper limits on channel groups.    
+
+- **nchan_group_location** `[ get | set | delete | off ]`  
+  arguments: 0 - 3  
+  default: `get set delete`  
+  context: location  
+  > Group information and configuration location. GET request for group info, POST to set limits, DELETE to delete all channels in group.    
+
+- **nchan_group_max_channels** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum number of channels allowed in the group.    
+
+- **nchan_group_max_messages** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum number of messages allowed for all the channels in the group.    
+
+- **nchan_group_max_messages_disk** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum amount of disk space allowed for the messages of all the channels in the group.    
+
+- **nchan_group_max_messages_memory** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum amount of shared memory allowed for the messages of all the channels in the group.    
+
+- **nchan_group_max_subscribers** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: location  
+  > Maximum number of subscribers allowed for the messages of all the channels in the group.    
+
+- **nchan_max_channel_id_length** `<number>`  
+  arguments: 1  
+  default: `1024`  
+  context: http, server, location  
+  legacy name: push_max_channel_id_length  
+  > Maximum permissible channel id length (number of characters). This settings applies to ids before they may be split by the `nchan_channel_id_split_delimiter` Requests with a channel id that is too long will receive a `403 Forbidden` response.    
+
+- **nchan_max_channel_subscribers** `<number>`  
+  arguments: 1  
+  default: `0 (unlimited)`  
+  context: http, server, location  
+  legacy name: push_max_channel_subscribers  
+  > Maximum concurrent subscribers to the channel on this Nchan server. Does not include subscribers on other Nchan instances when using a shared Redis server.    
+
+- **nchan_subscribe_existing_channels_only** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: http, server, location  
+  legacy name: push_authorized_channels_only  
+  > Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response.    
+
+- **nchan_message_buffer_length** `[ <number> | <variable> ]`  
+  arguments: 1  
+  default: `10`  
+  context: http, server, location  
+  legacy names: push_max_message_buffer_length, push_message_buffer_length  
+  > Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages. An Nginx variable can also be used to set the buffer length dynamically.    
+
+- **nchan_message_temp_path** `<path>`  
+  arguments: 1  
+  default: `<client_body_temp_path>`  
+  context: http  
+  > Large messages are stored in temporary files in the `client_body_temp_path` or the `nchan_message_temp_path` if the former is unavailable. Default is the built-in default `client_body_temp_path`    
+
+- **nchan_message_timeout** `[ <time> | <variable> ]`  
+  arguments: 1  
+  default: `1h`  
+  context: http, server, location  
+  legacy name: push_message_timeout  
+  > Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Note that messages always expire from oldest to newest, so an older message may prevent a newer one with a shorter timeout from expiring. An Nginx variable can also be used to set the timeout dynamically.    
+
+- **nchan_redis_accurate_subscriber_count**  
+  arguments: 1  
+  default: `off`  
+  context: upstream  
+  > When disabled, use fast but potentially inaccurate subscriber counts. These may become inaccurate if Nginx workers exit uncleanly or are terminated. When enabled, use a slightly slower but completely accurate subscriber count. Defaults to 'off' for legacy reasons, but will be enabled by default in the future.    
+
+- **nchan_redis_cluster_check_interval_backoff** `<floating point> >= 0, ratio of current delay`  
+  arguments: 1  
+  default: `2 (increase delay by 200% each try)`  
+  context: upstream  
+  > Add an exponentially increasing delay to the Redis cluster check interval. `Delay[n] = (Delay[n-1] + jitter) * (nchan_redis_cluster_check_interval_backoff + 1)`.    
+
+- **nchan_redis_cluster_check_interval_jitter** `<floating point> >= 0, (0 to disable)`  
+  arguments: 1  
+  default: `0.2 (20% of interval value)`  
+  context: upstream  
+  > Introduce random jitter to Redis cluster check interval, where the range is `±(cluster_check_interval * nchan_redis_cluster_check_interval_jitter) / 2`.    
+
+- **nchan_redis_cluster_check_interval_max** `<time> (0 to disable)`  
+  arguments: 1  
+  default: `30s`  
+  context: upstream  
+  > Maximum Redis cluster check interval after backoff and jitter.    
+
+- **nchan_redis_cluster_check_interval_min** `<time>`  
+  arguments: 1  
+  default: `1s (0 to disable)`  
+  context: upstream  
+  > When connected to a cluster, periodically check the cluster state and layout via a random master node.    
+
+- **nchan_redis_cluster_connect_timeout**  
+  arguments: 1  
+  default: `15s`  
+  context: upstream  
+  > Redis cluster connection timeout.    
+
+- **nchan_redis_cluster_max_failing_time**  
+  arguments: 1  
+  default: `30s`  
+  context: upstream  
+  > Maximum time a Redis cluster can be in a failing state before Nchan disconnects from it. During this time, Nchan will try to recover from a cluster or node failure without disconnecting the entire cluster.    
+
+- **nchan_redis_cluster_recovery_delay** `<time>`  
+  arguments: 1  
+  default: `100ms`  
+  context: upstream  
+  > After a cluster recovery failure, wait this long to try again.    
+
+- **nchan_redis_cluster_recovery_delay_backoff** `<floating point> >= 0, ratio of current delay`  
+  arguments: 1  
+  default: `0.5 (increase delay by 50% each try)`  
+  context: upstream  
+  > Add an exponentially increasing delay to Redis cluster recovery retries. `Delay[n] = (Delay[n-1] + jitter) * (nchan_redis_cluster_recovery_delay_backoff + 1)`.    
+
+- **nchan_redis_cluster_recovery_delay_jitter** `<floating point> >= 0, (0 to disable)`  
+  arguments: 1  
+  default: `0.5 (50% of delay value)`  
+  context: upstream  
+  > Introduce random jitter to Redis cluster recovery retry time, where the range is `±(recovery_delay * nchan_redis_cluster_recovery_delay_jitter) / 2`.    
+
+- **nchan_redis_cluster_recovery_delay_max** `<time> (0 to disable)`  
+  arguments: 1  
+  default: `2s`  
+  context: upstream  
+  > Maximum Redis cluster recovery delay after backoff and jitter.    
+
+- **nchan_redis_command_timeout** `<time> (0 to leave unlimited)`  
+  arguments: 1  
+  default: `5s`  
+  context: upstream  
+  > If a Redis server exceeds this time to produce a command reply, it is considered unhealthy and is disconnected.    
+
+- **nchan_redis_connect_timeout**  
+  arguments: 1  
+  default: `10s`  
+  context: upstream  
+  > Redis server connection timeout.    
+
+- **nchan_redis_discovered_ip_range_blacklist** `<CIDR range>`  
+  arguments: 1 - 7  
+  context: upstream  
+  > do not attempt to connect to **autodiscovered** nodes with IPs in the specified ranges. Useful for blacklisting private network ranges for clusters and Redis slaves. NOTE that this blacklist applies only to autodiscovered nodes, and not ones specified in the upstream block    
+
+- **nchan_redis_idle_channel_cache_timeout** `<time>`  
+  arguments: 1  
+  default: `30s`  
+  context: http, server, location  
+  > A Redis-stored channel and its messages are removed from memory (local cache) after this timeout, provided there are no local subscribers.    
+
+- **nchan_redis_namespace** `<string>`  
+  arguments: 1  
+  context: http, server, upstream, location  
+  > Prefix all Redis keys with this string. All Nchan-related keys in redis will be of the form "nchan_redis_namespace:*" . Default is empty.    
+
+- **nchan_redis_nostore_fastpublish** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: http, server, upstream  
+  > Increases publishing capacity by 2-3x for Redis nostore mode at the expense of inaccurate subscriber counts in the publisher response.    
+
+- **nchan_redis_optimize_target** `[ cpu | bandwidth ]`  
+  arguments: 1  
+  default: `bandwidth`  
+  context: upstream  
+  > This tweaks whether [effect replication](https://redis.io/commands/eval#replicating-commands-instead-of-scripts) is enabled. This setting is obsolete, as effect replication is now always enabled to support other features    
+
+- **nchan_redis_pass** `<upstream-name>`  
+  arguments: 1  
+  context: http, server, location  
+  > Use an upstream config block for Redis servers.    
+  [more details](#connecting-to-a-redis-server)  
+
+- **nchan_redis_password**  
+  arguments: 1  
+  default: `<none>`  
+  context: upstream  
+  > Set Redis password for AUTH command. All servers in the upstream block will use this password _unless_ a different password is specified by a server URL.    
+
+- **nchan_redis_ping_interval**  
+  arguments: 1  
+  default: `4m`  
+  context: http, server, upstream, location  
+  > Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable.    
+
+- **nchan_redis_reconnect_delay** `<time>`  
+  arguments: 1  
+  default: `500ms`  
+  context: upstream  
+  > After a connection failure, wait this long before trying to reconnect to Redis.    
+
+- **nchan_redis_reconnect_delay_backoff** `<floating point> >= 0 (0 to disable)`  
+  arguments: 1  
+  default: `0.5 (increase delay by 50% each try)`  
+  context: upstream  
+  > Add an exponentially increasing delay to Redis connection retries. `Delay[n] = (Delay[n-1] + jitter) * (nchan_redis_reconnect_delay_backoff + 1)`.    
+
+- **nchan_redis_reconnect_delay_jitter** `<floating point> >= 0 (0 to disable)`  
+  arguments: 1  
+  default: `0.1 (10% of delay value)`  
+  context: upstream  
+  > Introduce random jitter to Redis reconnection time, where the range is `±(reconnect_delay * nchan_redis_reconnect_delay_jitter) / 2`.    
+
+- **nchan_redis_reconnect_delay_max** `<time> (0 to disable)`  
+  arguments: 1  
+  default: `10s`  
+  context: upstream  
+  > Maximum Redis reconnection delay after backoff and jitter.    
+
+- **nchan_redis_retry_commands**  
+  arguments: 1  
+  default: `on`  
+  context: upstream  
+  > Allow Nchan to retry some Redis commands on keyslot errors and cluster unavailability. Queuing up a lot of commands while the cluster is unavailable may lead to excessive memory use, but it can also defer commands during transient failures.    
+
+- **nchan_redis_retry_commands_max_wait** `<time> (0 to leave unlimited)`  
+  arguments: 1  
+  default: `500ms`  
+  context: upstream  
+  > When `nchan_redis_retry_commands` is on, the maximum time a command will stayed queued to be retried.    
+
+- **nchan_redis_server** `<redis-url> <optional-forced-role>`  
+  arguments: 1 - 2  
+  default: `<redis-url>`  
+  context: upstream  
+  > Used in upstream { } blocks to set redis servers. Redis url is in the form 'redis://:password@hostname:6379/0'. Shorthands 'host:port' or 'host' are permitted. A role may optionally be provided as well to force a server to be treated as 'master' or 'slave'.  
+  >       uri:     
+
+- **nchan_redis_ssl** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: upstream  
+  > Enables SSL/TLS for all connections to Redis servers in this upstream block. When enabled, no unsecured connections are permitted    
+
+- **nchan_redis_ssl_ciphers**  
+  arguments: 1  
+  default: `<system default>`  
+  context: upstream  
+  > Acceptable ciphers when using TLS for Redis connections    
+
+- **nchan_redis_ssl_client_certificate**  
+  arguments: 1  
+  context: upstream  
+  > Path to client certificate when using TLS for Redis connections    
+
+- **nchan_redis_ssl_client_certificate_key**  
+  arguments: 1  
+  context: upstream  
+  > Path to client certificate key when using TLS for Redis connections    
+
+- **nchan_redis_ssl_server_name**  
+  arguments: 1  
+  context: upstream  
+  > Server name to verify (CN) when using TLS for Redis connections    
+
+- **nchan_redis_ssl_trusted_certificate**  
+  arguments: 1  
+  context: upstream  
+  > Trusted certificate (CA) when using TLS for Redis connections    
+
+- **nchan_redis_ssl_trusted_certificate_path**  
+  arguments: 1  
+  default: `<system default>`  
+  context: upstream  
+  > Trusted certificate (CA) when using TLS for Redis connections. Defaults to the system's SSL cert path unless nchan_redis_ssl_trusted_certificate is set    
+
+- **nchan_redis_ssl_verify_certificate** `[ on | off ]`  
+  arguments: 1  
+  default: `on`  
+  context: upstream  
+  > Should the server certificate be verified when using TLS for Redis connections? Useful to disable when testing with a self-signed server certificate.    
+
+- **nchan_redis_storage_mode** `[ distributed | backup | nostore ]`  
+  arguments: 1  
+  default: `distributed`  
+  context: http, server, upstream, location  
+  > The mode of operation of the Redis server. In `distributed` mode, messages are published directly to Redis, and retrieved in real-time. Any number of Nchan servers in distributed mode can share the Redis server (or cluster). Useful for horizontal scalability, but suffers the latency penalty of all message publishing going through Redis first.  
+  >   
+  > In `backup` mode, messages are published locally first, then later forwarded to Redis, and are retrieved only upon channel initialization. Only one Nchan server should use a Redis server (or cluster) in this mode. Useful for data persistence without sacrificing response times to the latency of a round-trip to Redis.  
+  >   
+  > In `nostore` mode, messages are published as in `distributed` mode, but are not stored. Thus Redis is used to broadcast messages to many Nchan instances with no delivery guarantees during connection failure, and only local in-memory storage. This means that there are also no message delivery guarantees for subscribers switching from one Nchan instance to another connected to the same Redis server or cluster. Nostore mode increases Redis publishing capacity by an order of magnitude.    
+
+- **nchan_redis_subscribe_weights** `master=<integer> slave=<integer>`  
+  arguments: 1 - 2  
+  default: `master=1 slave=1`  
+  context: upstream  
+  > Determines how subscriptions to Redis PUBSUB channels are distributed between master and slave nodes. The higher the number, the more likely that each node of that type will be chosen for each new channel. The weights for slave nodes are cumulative, so an equal 1:1 master:slave weight ratio with two slaves would have a 1/3 chance of picking a master, and 2/3 chance of picking one of the slaves. The weight must be a non-negative integer.    
+
+- **nchan_redis_upstream_stats** `<upstream_name>`  
+  arguments: 1  
+  default: `(none)`  
+  context: server, location  
+  > Defines a location as redis statistics endpoint. GET requests to this location produce a JSON response with detailed listings of total Redis command times and number of calls, broken down by node and command type. Useful for making graphs about Redis performance. Can be set with nginx variables.    
+
+- **nchan_redis_upstream_stats_disconnected_timeout**  
+  arguments: 1  
+  default: `5m`  
+  context: upstream  
+  > Keep stats for disconnected nodes around for this long. Useful for tracking stats for nodes that have intermittent connectivity issues.    
+
+- **nchan_redis_upstream_stats_enabled** `[ on | off ]`  
+  arguments: 1  
+  default: `<on> if at least 1 redis stats location is configured, otherwise <off>`  
+  context: upstream  
+  > Gather Redis node command timings for this upstream    
+
+- **nchan_redis_url** `<redis-url>`  
+  arguments: 1  
+  default: `127.0.0.1:6379`  
+  context: http, server, location  
+  > Use of this command is discouraged in favor of upstreams blocks with [`nchan_redis_server`](#nchan_redis_server). The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.    
+  [more details](#connecting-to-a-redis-server)  
+
+- **nchan_redis_username**  
+  arguments: 1  
+  default: `<none>`  
+  context: upstream  
+  > Set Redis username for AUTH command (available when using ACLs on the Redis server). All servers in the upstream block will use this username _unless_ a different username is specified by a server URL.    
+
+- **nchan_shared_memory_size** `<size>`  
+  arguments: 1  
+  default: `128M`  
+  context: http  
+  legacy names: push_max_reserved_memory, nchan_max_reserved_memory  
+  > Shared memory slab pre-allocated for Nchan. Used for channel statistics, message storage, and interprocess communication.    
+  [more details](#memory-storage)  
+
+- **nchan_store_messages** `[ on | off ]`  
+  arguments: 1  
+  default: `on`  
+  context: http, server, location, if  
+  legacy name: push_store_messages  
+  > Publisher configuration. "`off`" is equivalent to setting `nchan_message_buffer_length 0`, which disables the buffering of old messages. Using this setting is not recommended when publishing very quickly, as it may result in missed messages.    
+
+- **nchan_use_redis** `[ on | off ]`  
+  arguments: 1  
+  default: `off`  
+  context: http, server, location  
+  > Use of this command is discouraged in favor of (`nchan_redis_pass`)[#nchan_redis_pass]. Use Redis for message storage at this location.    
+  [more details](#connecting-to-a-redis-server)  
+
+- **nchan_channel_event_string** `<string>`  
+  arguments: 1  
+  default: `"$nchan_channel_event $nchan_channel_id"`  
+  context: server, location, if  
+  > Contents of channel event message    
+
+- **nchan_channel_events_channel_id**  
+  arguments: 1  
+  context: server, location, if  
+  > Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'.    
+  [more details](#channel-events)  
+
+- **nchan_stub_status**  
+  arguments: 0  
+  context: location  
+  > Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc.    
+  [more details](#nchan_stub_status)  
+
+- **nchan_channel_timeout**  
+  arguments: 1  
+  context: http, server, location  
+  legacy name: push_channel_timeout  
+  > Amount of time an empty channel hangs around. Don't mess with this setting unless you know what you are doing!    
+
+- **nchan_storage_engine** `[ memory | redis ]`  
+  arguments: 1  
+  default: `memory`  
+  context: http, server, location  
+  > Development directive to completely replace default storage engine. Don't use unless you are an Nchan developer.    
+
+## Contribute
+Please support this project with a donation to keep me warm through the winter. I accept bitcoin at 15dLBzRS4HLRwCCVjx4emYkxXcyAPmGxM3 . Other donation methods can be found at https://nchan.io
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/changelog.txt b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/changelog.txt
new file mode 100644
index 0000000..551ed8c
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/changelog.txt
@@ -0,0 +1,595 @@
+1.3.7 (Sep. 19 2024)
+ fix: repeated DELETE requests can leave unresponsive subscribers connected to a channel
+ fix: channel info subscriber count incorrect when using Redis following unclean worker exit
+      (Thanks, Steven Green)
+ feature: manually set Redis server roles to master or slave
+ fix: Redis server blacklist was only applied in cluster mode
+      (Thanks, piotr-lwks)
+ fix: Nchan may fail to connect to non-cluster Redis if more than 1 server is specified
+      (Thanks, Mike Baroukh)
+ fix: Some invalid message IDs may result in a worker crash
+ fix: Nchan may fail to reconnect ro a Redis cluster when using many workers due to a race condition
+      (Thanks, Fabio Urquiza)
+ fix: subscriber info may be incorrect for Redis version >=7
+ fix: Redis cluster may fail to reconnect to a cluster without consensus
+      (Thanks, Fabio Urquiza)
+1.3.6 (Jan. 6 2023)
+ fix: reloading Nginx with nchan_stub_status enabled may result in a crash (introduced in v1.3.1) 
+ fix: nchan_redis_upstream_stats_enabled incorrectly documented as having "yes/no" values instead of "on/off"
+ fix: compilation erros for Nginx 1.23.2
+1.3.5 (Oct. 27 2022)
+ feature: track Redis upstreams statistics with nchan_redis_upstream_stats
+ fix: possible invalid memory access after Redis cluster node discovery
+ fix: GET publisher location request may return incorrect subscriber count when using Redis
+ fix: possible to log invalid string for rare error
+1.3.4 (Sep. 1 2022)
+ fix: Redis cluster slave failover may result in crash
+1.3.3 (Aug. 29 2022)
+ fix: incorrect timeout handling for new nchan_redis_accurate_subscriber_count resulted in inaccurate subscriber counts
+1.3.2 (Aug. 23 2022)
+ feature: stub status now shows the total number of commands sent to Redis
+ fix: Redis cluster checks may not time out
+ fix: Redis cluster may not be marked unhealthy if a required node is marked in the node list as 'fail'
+ fix: simultaneous creating many Redis-backed channels may result in CPU usage spikes on Redis server
+1.3.1 (Aug. 1 2022)
+ fix: Nchan may become unresponsive after a worker is uncleanly terminated
+ change: nchan_redis_optimize_setting is now obsolete
+ feature: nchan_redis_accurate_subscriber_count that doesn't corrupt Redis
+          subscriber counts when nginx workers are killed
+ feature: added "redis unhealthy upstreams" to nchan_stub_status
+ fix: incorrect nchan_stub_status variables after a worker is uncleanly terminated
+ fix: build errors with Nginx >= 1.20.1
+ feature: Redis >=7.0.1 SMESSAGE support
+ fix: Redis cluster slot assignments may not be reconfigured correctly
+ fix: discovery of Redis slave nodes in cluster may be incomplete
+1.3.0 (May 26 2022)
+ feature: configurable Redis command timeouts with nchan_redis_command_timeout
+ feature: configurable Redis command retries with nchan_redis_retry_commands and nchan_redis_retry_commands_max_wait
+ fix: Redis cluster status checks can now discover new slaves
+ fix: Redis 7 cluster keyslot errors not recognized on Redis 7
+ feature: Redis 7 sharded pubsub support
+ feature: configurable Redis cluster recovery time, backoff, and jitter
+ feature: Redis cluster failure recovery without disconnection
+ feature: configurable Redis reconnection time, backoff, and jitter
+ fix: Redis scripts are now loaded only when missing
+1.2.15 (Dec. 27 2021)
+ fix: publishing to >255 string-delimitered channels could result in a crash
+ fix: Redis connection failures (since 1 2.14)
+1.2.14 [WITHDRAWN] (Dec. 20 2021)
+ fix: compiler warnings from the use of the 'typeof' macro
+ fix: Nchan can't be built without the Nginx SSL module (bug introduced in 1.2.13)
+ update: hiredis updated to 1.0.2
+ fix: some Redis connection failures could result in a crash (bug introduced in 1.2.13)
+ fix: upstream subrequests crashed with Nginx >= 1.19.9
+1.2.13 [WITHDRAWN] (Dec. 13 2021)
+ feature: Redis ACL support with username and passwword
+ feature: Redis TLS support
+1.2.12 (Sep. 22 2021)
+ fix: better Redis cluster connection logging
+ fix: redundant method to discover Redis slave nodes in cluster mode could result in receiving unreachable IPs
+1.2.11 (Sep. 17 2021)
+ feature: nchan_redis_discovered_ip_range_blacklist for ignoring autotiscoreved nodes
+ feature: nchan_redis_storage_mode is now configurable in location contexts 
+1.2.10 (Aug. 25 2021)
+ fix: Nchan could not be built without openssl due to hiredis dependency
+      (introduced in v1.2.9)
+ feature: allow no separator for http-raw-stream (thanks @sclem)
+1.2.9 (Aug. 12 2021)
+ feature: Redis cluster reconfiguration check timer,
+      nchan_redis_cluster_check_interval setting
+ fix: detect Redis cluster reconfiguration when publishing messages in "nostore" mode
+ update: hiredis updated to v1.0.0 
+ fix: segfault on out-of-shared-memory condition for multiplexed publishers
+1.2.8 (Apr. 12 2021)
+ feature: nchan_subscriber_info locations for receiving customizable info from 
+      subscribers of a given channel.
+ fix: incorrect lgging of disconnected subscribers with 400 error instead of 499
+      (bug introduced in v1.2.7)
+ feature: add $nchan_channel_subscriber_last_seen, $nchan_channel_subscriber_count 
+      and $nchan_channel_message_count variables
+ fix: GCC 10 compatibility
+1.2.7 (Mar. 17 2020)
+ fix: unidirectional subscribers have their connection terminated if they send any data to the server
+      after the initial request handshake. This applies to all subscribers except Websocket
+ feature: periodic pings for EventSource subscribers
+ fix: Redis pending commands count may be incorrect in nchan's stub status page
+ fix: channel deletion fails to propagate to Redis slaves
+ fix: possible stack overflow when using websocket subscribers
+1.2.6 (Jun. 18 2019)
+ fix: when using Redis, a channel can stop receiving new messages if 
+      they are published faster than they can be sent to subscribers and the 
+      message buffer is sufficiently small
+ fix: websocket PONG response did not contain PING frame data
+ fix: multiplexed channels may stop receiving messages
+ fix (security): specially crafted websocket publisher requests when using Redis
+      may result in use-after-free memory access
+ fix: Nginx config reload may result in crash when using Redis cluster
+1.2.5 (Mar. 20 2019)
+ fix: using multiplexed channels with Redis in backup mode may result in worker crash
+ fix: nchan_publisher_channel_id could not be set exclusively in a publisher location
+ fix: Google pagespeed module compatibility
+ fix: nchan prevents nginx from starting if no http {} block is configured
+1.2.4 (Feb. 25 2019)
+ fix: Redis cluster info with zero-length hostname may result in worker crash
+ fix: build problems with included hiredis lib in FreeBSD
+ feature: nchan_redis_namespace and nchan_redis_ping_interval now work in upstream blocks
+ fix: websocket publisher did not publishing channel events
+ fix: Redis namespace was limited to 8 bytes
+1.2.3 (Oct. 15 2018)
+ fix: possible invalid memory access when the initial connection to a Redis cluster node times out
+1.2.2 (Oct. 9 2018)
+ fix (security): using an unresponsive, overloaded Redis server may result in invalid memory access
+ fix: incorrect logging of discovered Redis cluster nodes
+ fix: better handling of connection loss when Redis server is unresponsive
+ fix: presence of Redis cluster nodes with no known address ("noaddr") nodes could result in worker crash
+ fix (security): subscriber may erroneously receive a 400 Bad Request or crash a worker 
+      based on data from a previous subscriber
+ feature: built-in backend benchmark
+ feature: add optimized fastpublish option to Redis nostore mode for maximum
+      message publishing thoroughput via Redis
+ feature: add no-store Redis mode that uses Redis for broadcasting messages, not storage
+ fix: connecting to load-balancing Redis proxy resulted in crash
+ fix: using longpoll-multipart in "raw" mode cound result in worker crash
+ fix: channel events used with Redis resulted in segfault
+1.2.1 (Aug. 2 2018)
+ fix: channel last_requested was set to 0 instead of -1 on channel creation
+ fix: authentication failure body not forwarded for Nginx > 1.13.10
+ fix: possible invalid memory access for websocket unsubscribe requests
+ fix: building Nchan could interfere with building other modules
+1.2.0 (Jul. 23 2018)
+ feature: configurable support for CORS Access-Control-Allow-Credentials header
+ fix: better compliance with RFC7692  Websocket permessage-deflate parameter negotiation
+ fix (security): possible busy-loop denial-of-service for specially crafted 
+      handshakes from Websocket subscribers using permessage-deflate
+      (Thanks, Benjamin Michéle)
+ fix: nchan_permessage_deflate_compression_memlevel was not applied when set
+ refactor: all publisher and subscriber upstream requests are now more memory-efficient
+ fix: Using websocket publisher upstream requests may result in invalid memory access
+ fix: publishing Redis-backed messages with 1-second expiration may fail after
+      cluster restart
+ change: nchan_redis_wait_after_connecting directive is now obsolete, and is ignored
+ feature: nchan_redis_optimize_target for "cpu" or "bandwidth". Trades off CPU
+      load on Redis slaves for syncronization bandwidth.
+ feature: configurable Redis master/slave channel subscribe weights with
+      nchan_redis_subscribe_weights
+ fix: Compilation issues on OS X and systems lacking non-POSIX memrchr()
+ fix: nchan_pubsub CORS Allowed headers did not include headers used by subscribers
+ fix: Redis-backed channel buffer length could exceed nchan_message_buffer_length
+ fix: Publisher upstream compatibility for Nginx > 1.13.10
+ feature: nchan_redis_connect_timeout to configure maximum connection time 
+      to Redis servers
+ feature: Offload Redis SUBSCRIBE traffic to slaves 
+      (one SUBSCRIBE per channel per worker)
+ fix: Redis cluster and master/slave failover and reconnection issues
+ refactor: Redis connection handling rewritten from scratch
+ fix: subscribers may not receive new messages after reconnecting to Redis
+ fix: publishing to an unavailable Redis-backed channel may result in a 
+      following 400 Bad Request
+ change: Old Redis-backed channel messages are now delivered after the message
+      buffer is fully loaded into memory. Previously they were delivered
+      incrementally while the buffer loaded.
+ fix: multiplexed Redis-backed channels may not deliver messages if one or
+      more channels' messages all expire
+ fix: possible crash when catching up to reconnected Redis channel with
+      subscribers waiting for consecutive messages
+ fix: possible crash from rapidly creating and deleting channels
+1.1.15 (Apr. 27 2018)
+ fix: A disconnect from a Redis cluster node can result in a segfault
+ fix: Using Redis-backed multiplexed channels can result in a segfault
+1.1.14 (Jan. 10 2018)
+ feature: added nchan_redis_wait_after_connecting setting
+ fix: compatibility with Redis >= 4.0 cluster
+1.1.13 (Dec. 4 2017)
+ fix: added Redis backwards compatibility with Nchan 1.1.7 and below
+      for online upgrades with mixed-version Nchan cluster
+1.1.12 (Dec. 1 2017)
+ fix: possible "Unexpected spool == nuspool" worker crash
+ fix: subscriber messages delivered during active nchan_subscribe subrequest
+      may be garbled
+1.1.11 (Nov. 29 2017)
+ fix: Redis backup-mode not working (since 1.1.9)
+ fix: incorrect handling of Redis permessage-deflated messages results in
+      missing first char of eventsource event type
+ fix: worker crash when unable to create temp file for large websocket
+      permessage-deflate message
+ fix: CPU-bound overloaded Nginx may result in worker crashes
+      (may occur with large Openresty Lua load)
+ change: default nchan_shared_memory_size is now 128M
+ fix: some channel info from publisher GET requests may be incorrect with Redis
+ fix: file descriptor leak when reconnecting to Redis
+1.1.10 (Nov. 13 2017)
+ feature: nchan_authorize_request failure response forwarded back to subscriber
+      Sponsored by Symless (https://symless.com/)
+ fix: allow nchan_access_control_allow_origin in if blocks
+ fix: longpoll-multipart may read uninitialized memory when receiving 
+      zero-length message
+ fix (security): invalid memory access for aborted websocket subscriber 
+      after channel existence check via Redis
+ fix: websocket handhshake failure handled incorrectly when messages 
+      are available
+ fix (security): websocket subscriber disconnecting before handshake may
+      result in invalid memory access
+ fix (security): possible invalid memory access for disappearing longpoll sub
+ feature: add "shared memory limit" to nchan_stub_status output
+1.1.9 (Oct. 30 2017)
+ fix: more proper websocket extension negotiation with more 
+      informative failure messages
+ fix: websocket handshake failure response included superfluous CLOSE frame
+ feature: websocket deflate-frame and x-webkit-deflate-frame support
+1.1.8 (Oct. 26 2017)
+ feature: websocket permessage-deflate support
+      Sponsored by HYFN (https://hyfn.com/)
+ fix (security): websocket publisher may crash worker when publishing with
+      channel group accounting on to a new group
+ fix: messages published to Nchan via websocket binary frames 
+      should have content-type set to "application/octet-stream"
+ fix: accept websocket publisher binary frames (thanks @rponczkowski)
+ fix: multiplexing over exactly 255 channels results in worker crash
+ fix (security): Specially crafted invalid subscriber msgid may crash worker
+ fix: nchan_subscriber_first_message <= 0 (newest) with existing Redis data
+      incorrectly treated as "oldest" for initial subscribers
+ fix: 0-length channel name may crash worker
+ fix: subscribe/unsubscribe callback requests do not work when used with
+      authorization callback request
+ fix (security): Messages published with Redis through websocket publisher 
+      may result in worker crash (bug introduced in 1.1.5)
+ fix: nchan_pubsub setting may not be parsed correctly
+1.1.7 (Jul. 3 2017)
+ fix: possible read-after-free after redis disconnect
+ fix: publishing to redis cluster before it is connected results in worker crash
+ fix: possible use-after-free for suddenly disconnected longpoll-multipart subscriber
+ fix: possible use-after-free when using nchan_authorize_request for slow subscribers and slow upstream
+ fix: nchan_stub_status "stored messages" value could be incorrect when using Redis
+1.1.6 (May 9 2017)
+ fix: messages published through Redis may crash worker (introduced in 1.1.5)
+ fix (security): urlencoded message id in url parsed incorrectly can result in worker crash
+1.1.5 (May 3 2017)
+ feature: get current Nchan version through $nchan_version variable 
+      and nchan_stub_status
+ fix (security): invalid memory access for multiplexed channel subscribers 
+      with buffered output (Thanks Casey Forbes (@caseyf) for debugging.)
+ fix: "redis pending commands" nchan_stub_status stat could be wrong after 
+      deleting channels
+ fix: invalid memory access when using Redis under high load
+ fix: possible "message from the past" errors under high publishing load
+ fix: graceful publisher/subscriber notifications when out of shared memory
+      (via HTTP 507 Insufficient Storage status code)
+ fix: compatibility with limit_except directive
+1.1.4 (Apr. 25 2017)
+ fix (security): possible memory corruption using multiplexed channels 
+      at high load (Thanks Giovanni Caporaletti (@TrustNoOne) for debugging.)
+ fix: possible crash when reconnecting to Redis cluster (introduced in 1.1.3)
+1.1.3 (Mar. 25 2017)
+ fix (security): incorrect handling of WS optimization could trigger SIGABRT
+ fix: Redis cluster reconnect readiness verification
+1.1.2 (Mar. 1 2017)
+ change: "interprocess alert X delayed by Y sec" log messages downgraded 
+      from ERROR to NOTICE
+ fix: "group info string too short" error
+ fix: Incorrect handling of connections to Redis cluster nodes with round-robin
+      DNS hostnames (Thanks to ring.com for sponsoring this fix!)
+1.1.1 (Feb. 8 2017)
+ fix: incorrect stats for nchan_stub_status after reload.
+      (Stats are no longer reset after reload)
+ fix: websocket subscriber may receive two CLOSE frames
+ fix: websocket with ws+meta.nchan subprotocol did not receive empty messages
+ feature: websocket client heartbeats with nchan_websocket_client_heartbeat
+ fix: websocket now echoes code and reason when connection close initiated from client
+1.1.0 (Jan. 4 2017)
+ feature: websocket subscribers now receive "application/octet-stream" messages
+      in binary frame rather than text
+ fix: publisher request variables not always passed to nchan_publisher_upstream_request
+ feature: Redis storage 'backup' mode strictly for data persistence
+ fix: possible lingering subscriber if connection is closed just before subscribing
+ fix: possible memory leak when using multiplexed channels
+ security fix: subscribing with If-Modified-Since and without If-None-Match headers
+      crashed the Nginx worker (thanks @supertong)
+ security fix: sending an empty message to multipart/mixed subscriber crashed Nginx worker
+ fix: publisher & subscriber response codes were logged incorrectly
+ fix: websocket subscriber memory leak on upstream authentication failure
+ fix: possible crash after reloading when using several instances of Nchan with Redis
+ feature: nchan_access_control_allow_origin can accept nginx variables
+ feature: Redis key namespaces
+ feature: all size configurations can now parse decimal values
+ fix: off-by-one subscriber count when using multiplexed channels
+ feature: accounting and dynamic limits for channel groups
+1.0.8 (Nov. 28 2016)
+ fix: possible crash under severely heavy load, introduced in 1.0.7 with stack-overflow fix
+1.0.7 (Nov. 27 2016)
+ fix: memory leak after websocket publisher uncleanly aborts connection
+ fix: misbehaving websocket publisher with nchan_publisher_upstream_request
+ fix: potential stack overflow with very large message buffers
+ fix: invalid memory access with empty nchan_publisher_upstream_request for websocket publisher
+ fix: incorrect handling of chunked response from nchan_publisher_upstream_request
+ fix: publishing through websocket too fast may result in buffered messages that never arrive
+ fix: DELETE to multiplexed channel should delete all listed channels
+ fix: abort if publishing to multiple channels while using redis
+1.0.6 (Nov. 15 2016)
+ fix: large messages were sometimes incorrectly cleaned up, leaving behind temp files
+ fix: file descriptor leak when listening on a unix socket and suddenly 
+      aborting client connections
+ fix: invalid memory access after reloading twice with redis enabled
+ fix: crash after shutting down nginx when 'master_process' set to 'off'
+ change: nchan_max_channel_subscribers now always refers to subscribers on this instance of
+      Nchan, even when using Redis.
+ feature: subscribe/unsubscribe callbacks with nchan_subscribe_request and nchan_unsubscribe_request
+1.0.4 (Oct. 28 2016)
+ security: fix crash when receiving large messages over websocket with ws+nchan subprotocol
+1.0.3 (Sept. 3 2016)
+ feature: nchan_message_timeout and nchan_message_buffer_length 
+      can now use nginx variables for dynamic values
+ fix: unsolicited websocket PONGs disconnected the subscriber in violation of RFC6455
+ fix: possible script error when getting channel from Redis
+ fix: possible incorrect message IDs when using Redis (thanks @supertong)
+ security: possible invalid memory access on publisher GET, POST, or DELETE when
+      using Redis and the publisher connection is terminated before receiving
+      a response
+ fix: correct publisher response code when nchan_authorize_request is unavailable
+      (502 instead of 500)
+ security: crash if publisher POSTs request with no Content-Length header when 
+      using nchan_authorize_request
+1.0.2 (Aug. 29 2016)
+ fix: more informative missed-message warnings
+ fix: invalid memory access when Redis enabled without setting server URL
+ fix: incomplete redis channel deletion
+ fix: Redis command responses may not be processed after large message
+      until next command
+ feature: catch up with missed messages after reconnecting to Redis cluster
+ fix: possible invalid memory access after disconnecting from Redis cluster
+ fix: Redis-stored unbuffered messages may not be delivered
+ fix: possible invalid memory access when using previously idling channels
+ fix: invalid memory access if publisher POST request's connection terminates
+      before receiving response
+ fix: messages published rapidly to Redis via different Ncnan servers may
+      be received out of order
+ fix: possible stack overflow when receiving messages through Redis
+      for multiplexed channels
+ fix: channels with 'nchan_store_messages off' published 1 message per second
+ fix: issue warning when out-of-order published message is detected
+ fix: Redis cluster compatibility with channel ids containing '}' character
+ fix: Redis-stored channel deleted too quickly when publishing short-lived messages
+1.0.1 (Aug. 22 2016)
+ feature: nchan_stub_status shared memory accounting
+ fix: various compiler warnings
+1.0.0 (Aug. 20 2016)
+ fix: incorrectly repeated subscriber_enqueue channel events
+ fix: badly handled Redis messages with TTL < 1 (again)
+ fix: websocket didn't close connection on PING fail
+ feature: nchan_stub_status stats location
+ fix: bad memory access for Redis channels when unsubscribing and very busy
+ optimize: SSE2 & AVX2 optimizations for websocket frame unmasking
+ feature: Redis Cluster support
+ (WARNING:) data in Redis from previous versions will be inaccessible
+ feature: different locations can use different Redis servers
+ feature: nchan_subscriber_first_message can take a number (positive or negative) 
+      for nth message (from first or last)
+ feature: expire Redis-stored idle channels with nchan_redis_idle_channel_cache_timeout
+ fix: some multiplexed channels never garbage-collected when inactive
+ fix: unbuffered message garbage collector was too lazy
+ fix: update nchan_message_buffer_length correctly when using Redis (thanks @supertong)
+ fix: incorrect handling of missing/expired messages in multiplexed channels
+ fix: memory leak when publishing via Websocket on a pubsub location
+ fix: multiplexed channel DELETE when using Redis handled incorrectly
+ fix: rare Redis script error when publishing message
+ fix: Redis connection ping infinite loop when reloading
+ fix: crash if Redis message TTL less than 1 sec
+ fix: message delivery occasionally stopped when using Redis 
+      and rapidly publishing messages
+ fix: logpoll-multipart sometimes failed to respond when using Redis 
+      and rapidly publishing messages
+ fix: don't crash if Redis server is busy loading data
+0.99.16 (Jun 10 2016)
+ fix: invalid memory access when upstream subscriber authorize request failed
+ fix: longpoll-multipart subscriber was managed incorrectly on channel deletion
+ fix: subscribers may not receive messages after Redis reconnection
+0.99.15 (May 31 2016)
+ feature: Redis client keepalive configurable with nchan_redis_ping_interval
+ feature: try to reconnect to Redis after lost connection to Redis
+ fix: invalid memory access after lost connection to Redis
+ fix: use-after-free error if subscriber disconnects before response 
+      from upstream authorize server (thanks Filip Jenicek)
+ fix: corrupt longpoll-multipart boundary data with long messages
+ feature: 'raw' mode for longpoll-multipart
+ feature: http-raw-stream client, like Push Stream Module's 'stream' mode
+ fix: incomplete longpoll-multipart response when using Redis
+ fix: "subrequests cycle" error for websocket publisher for nginx > 1.9.4
+ fix: nchan_channel_id_split_delimiter inheritance
+ fix: subscriber memory leak from 0.99.8
+ fix: reload crash from 0.99.14
+0.99.14 (May 4 2016)
+ fix: trailing NULL character in Publisher response content-type for json, xml, and yaml
+ fix: don't crash when out of shared memory
+ fix: invalid memory access when using nchan_publisher_upstream_request with websocket 
+ fix: incorrect stored messages count when using Redis store
+ fix: incorrect last_message_id on publisher GETs (memstore and Redis)
+ fix: incorrect behavior when subscribing right after startup before all workers are ready
+ fix: some internal event loop timers were not being canceled, leading to slow shutdown
+ fix: resuming some subscribers with valid message ids didn't work when using Redis store
+ fix: possible invalid memory access when restarting Nginx after using multiplexed channels
+ fix: accept url-encoded message ids
+ feature: add ws+meta.nchan websocket subprotocol that include message metadata
+ fix: all requests after X-Accel-Redirect from upstream were treated as GETs
+0.99.13 (Apr. 20 2016)
+ fix: invalid content-length for nchan_authorize_request publisher requests
+ fix: "subrequests cycle" error after 200 websocket publish requests
+ fix: zero-size buf warning when publishing empty messages via websocket
+ fix: nchan_max_channel_subscribers was ignored
+ fix: use a blocking Redis connection for commands during shutdown to ensure commands are sent
+ fix: better TTL handling for Redis keys
+0.99.12 (Apr. 10 2016)
+ fix: SPDY compatibility with EventSource and multipart/mixed subscribers
+ fix: warnings when shutting down Redis storage
+ feature: use system's hiredis library if present
+ fix: incorrect handling of missing messages when publishing to Redis
+0.99.11 (Apr. 3 2016)
+ feature: nchan can be built as a dynamic module (for nginx >= 1.9.11)
+0.99.10 (Apr. 2 2016)
+ fix: messages not freed until expired after being deleted from channel
+ fix: buffering and output issues for large messages
+ update: hiredis updated to v0.13.3
+ fix: Redis publishing and subscribing memory leaks
+ optimize: per-channel Redis subscriber counts batched into 100-ms intervals
+    to prevent Redis roundtrip floods
+ fix: Redis subscriber memory leak
+ refactor: extracted shared subscriber and message store logic
+ fix: use-after-free error for Redis channels without subscribers
+ fix: channel readying logic sometimes got confused and tripped up assert()s
+ fix: even more proper handling of websocket close frames
+ change: 408 Request Timeout instead of 304 No Content status code for timed out subscribers
+0.99.8 (Mar. 13 2016)
+ fix: multipart/mixed subscriber output issues
+ fix: memory leak for multiplexed > 4 channels
+ fix: invalid memory access for aborted subscriber connection with Redis
+      and nchan_subscribe_existing_channels_only
+ fix: accept websocket binary data frames
+ fix: proper handling of websocket close frames
+ fix: incorrect expire calculation for cached Redis-stored messages
+ fix: double free for multiplexed >4 websocket subs
+0.99.7 (Mar. 10 2016)
+ fix: websocket infinite ping loop after reload
+ feature: nchan_subscriber_message_id_custom_etag_header for misbehaving proxies that eat etags
+ fix: 100% cpu after lost Redis connection
+ fix: refined CORS cross-origin access control headers and logic
+ fix: longpoll subscriber in multipart mode didn't output all messages
+ fix: longpoll subscriber in multipart mode could access invalid memory
+ fix: compatibility with supported Redis versions < 2.8.14
+ fix: nchan_message_timeout 0 should not expire messages
+0.99.6 (Feb. 22 2016)
+ fix: SIGHUP reloading under load
+0.99.5 (Feb 15 2016)
+ fix: publishing with client_body_in_file_only enabled
+0.99.4 (Feb 12 2016)
+ fix: invalid memory access in channel DELETE response
+ fix: race condition in IPC during channel creation (thanks vtslothy)
+0.99.3 (Feb 10 2016)
+ fix: SIGHUP reloading
+ fix: startup with insufficient file descriptors shouldn't crash
+ fix: longpoll-multipart failure to immediately respond
+ fix: longpoll-multipart abort handling
+ fix: Redis-store cached message timeouts
+ fix: Redis connection-lost handling
+ fix: startup with 'master_process off' (single-process mode)
+ feature: EventSource 'event:' line support with custom header or config
+0.98 (Jan 21 2016)
+ feature: publish to multiple channels with one request
+ feature: nchan_longpoll_multipart_response config setting
+ fix: large message (in-file) handling for multipart/mixed and chunked subscribers
+ fix: 400 Bad Request error on 32-bit systems
+ fix: memory allocation error for >8 multi-channel subscribers
+0.97 (Jan 5 2016) 
+ fix: build issues with debian
+ fix: compatibility with nginx versions down to 1.0.15
+ fix: publishing bug introduced in 0.96
+0.961 (Jan 4 2016)
+ fix: compiler warning
+0.96 (Jan 1. 2016)
+ feature: websocket ping with nchan_websocket_ping_interval
+ fix: unsafe memory access for Redis publisher
+ feature: nchan_publisher_upstream_request
+ fix: http/2 compatibility for EventSource and multipart/mixed
+ fix: nchan_authorize_request for publisher location endpoints
+ fix: publishing long (stored in file) messages to Redis-store
+0.95 (Dec. 24 2015)
+ feature: configurable nchan_access_control_origin_header, default to *
+ fix: recognize non-preflighted CORS requests
+ fix: Redis invalid memory access after timeout
+0.94 (Dec. 22 2015)
+ feature: last mesage id in channel info response
+ feature: subscribe up to 255 channel ids using nchan_channel_id_split_delimiter
+ fix: tried connecting to Redis when not needed
+ change: "last requested" no longer has a -1 value for 'never requested'.
+ fix: "last requested" in channel info sometimes not updated
+ fix: deleting empty channels
+ change: more compact message ids
+0.931 (Dec. 14 2015)
+ optimize: inter-process internal subscriber fetched too many messages
+0.93 (Dec. 12 2015)
+ feature: optionally only use Etag for subscriber message id
+ feature: optionally get requested message id from variable config
+0.92 (Dec. 11 2015)
+ feature: HTTP multipart/mixed subscriber
+ fix: EventSource bad memory access on disconnect
+ feature: HTTP chunked encoding subscriber
+ fix: resolved some strict compiler warnings
+ fix: more stringent out-of-memory detection during response output. thanks @woodyhymns
+ fix: less-than-optimal cache filename handling. thanks @ZhouBox
+ fix: incorrect EventSource charset in header. thanks @eschultz
+ fix: segfault when websocket publishes message and immediately disconnects
+ fix: Duplicate "Connection: Upgrade" header for websocket handshake. thanks @eschultz 
+0.904 (Dec. 7 2015)
+ fix: more flexible Websocket handshake for "Connection" header. thanks @eschultz
+ fix: out-of-memory safety check. thanks @woodyhymns
+0.903 (Dec 3 2015)
+ fix: better Redis engine connection initializer
+ change: simpler message buffer settings
+ fix: more backwards-compatibility for pushmodule config settings
+0.9 (Dec. 2 2015) - first beta pre-release tag after rebranding as Nchan
+ feature: meta channel events: track when subscribers connect and disconnect, and when messages are
+          published, with configurable event strings
+ feature: request authorization: send upstream request before publishing or subscribing.
+          works just like the auth_request module.
+ feature: channel multiplexing. up to 4 channels can be subscribed to from a single location
+ fix: channel ids were not set within if statements in the nginx config
+ feature: hybrid memstore + Redis storage. local caching + distributed message publishing, the best
+          of both worlds. (still slower than pure memstore though)
+ feature: pubsub locations, optional separate publisher and subscriber channel ids per location
+ feature: websocket publisher support
+ name change: we're nchan now. code renamed, and cleaned up. config options are backwards-compatible.
+ feature: websocket subscriber support
+ huge refactor: completely new in-memory storage engine. No more global lock.
+    Actually, no more locks at all!
+ feature: Redis storage engine. 
+0.73 (Sep. 2 2014)
+ fix: turning on gzip cleared Etag subscriber response header
+ fix: channels incorrectly deleted when overwhelmed with connections
+ feature: CORS support via OPTIONS request method response
+ fix: file descriptor leak when restarting nginx via SIGHUP
+ improve: concurrency for interprocess notifications
+ refactor: completely encapsulated message store
+ fix: slow memory leak introduced in 0.7
+ fix: memory leak when not using message buffer
+0.712 (Mar. 21 2014)
+ fix: intermittently dropped long-polling connections on internal redirects
+ fix: unable to proxy long-polling subscribers. (thanks wandenberg and sanmai)
+0.711 (Mar. 13 2014)
+ fix: incompatibility with cache manager (proxy_cache and fastcgi_cache directives)
+0.71 (Mar. 1 2014)
+ fix: removed unused variables and functions to quiet down GCC
+0.7: (Feb. 20 2014)
+ fix: last-in concurrency setting wasn't working reliably
+ refactor: partially separated message storage. add a test harness.
+ fix: segfault from concurrency bug while garbage-collecting channels
+ fix: some large messages got lost
+0.692 (Feb. 3 2010)
+ fix: error log reported failed close() for some publisher requests with large messages
+ fix: occasional memory leak during message deletion
+ fix: worker messages intended for dead worker processes were not deleted
+0.691 (Feb. 2 2010)
+ fix: server reload (via SIGHUP signal) was failing
+ fix: segfault on messages longer than client_body_buffer_size (thanks wfelipe)
+ change: removed push_min_message_recipients, added push_delete_oldest_received_message
+0.69 (Nov. 17 2009)
+ fix: publisher got a 201 Created response even if the channel had no subscribers at the time (should be 202 Accepted)
+ fix: small memory leak after each message broadcast to a channel
+ feature: optional push_max_channel_subscribers setting added
+ fix: first-in concurrency setting wasn't responding to subscribers with a correct status code on conflict
+ fix: reused subscriber connections sometimes failed to receive messages
+ unfeature: no more nginx 0.6 support. not worth the hassle.
+0.683 (Nov. 10 2009)
+ change: default max. reserved memory size changed form 16MB to 32 MB
+ change: unused node garbage collection made a little more aggressive (max. 3 unused channels per channel search instead of 1)
+ fix: unused nodes were deleted only on channel id hash collision (very rare)
+ fix: segmentation fault from allocating insufficient memory for interprocess messaging
+0.681 (Nov. 6 2009)
+ feature: added push_message_buffer_length setting, which sets push_message_max_buffer_length and push_message_min_buffer_length at once.
+ fix: publisher channel info text/json response now uses double quotes instead of single.
+ fix: interprocess messages were not removed from shared memory correctly, causing weird errors
+0.68 (Nov. 5 2009)
+ change: default push_subscriber_concurrency value is now "broadcast"
+ fix: incorrect error messages for invalid push_pubscriber and push_subscriber_concurrency settings
+ change: removed deprecated push_buffer_size and push_queue_messages settings
+ feature: rudimentary content-type negotiation for publisher channel info response.
+   support text/plain, text/json, text/yaml and application/xml (and mimetype equivalents)
+ fix: publisher GET response has HTTP status 0
+0.67beta (Nov. 4 2009) and older
+ see git repository
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/cloc-exclude.txt b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/cloc-exclude.txt
new file mode 100644
index 0000000..fdf0e34
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/cloc-exclude.txt
@@ -0,0 +1,16 @@
+src/uthash.h
+src/hiredis
+src/util/ngx_nchan_hacked_slab.c
+src/util/hdr_histogram.c
+src/util/hdr_histogram.h
+src/store/redis/cmp.c
+src/store/redis/cmp.h
+src/store/redis/redis_lua_commands.h
+src/nginx-source
+src/nchan_config_commands.c
+dev/bench
+dev/nginx-pkg
+dev/clang-analyzer
+dev/package
+dev/src
+dev/redis-trib.rb
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/config b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/config
new file mode 100644
index 0000000..afc42d3
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/config
@@ -0,0 +1,170 @@
+ngx_addon_name=ngx_nchan_module
+
+nchan_libs=""
+#do we have hiredis on the platform?
+# it's currently no longer possible to link the platform's hiredis lib, 
+# because we now use a hacked connect function
+# maybe it can be brought back at some later time...
+ngx_feature="hiredis with stored sockaddr"
+ngx_feature_name="NCHAN_HAVE_HIREDIS_WITH_SOCKADDR"
+ngx_feature_run=yes
+ngx_feature_path=
+ngx_feature_incs=" \
+  #include <hiredis/hiredis.h>
+  #include <sys/socket.h>
+"
+ngx_feature_libs="-lhiredis"
+ngx_feature_test=" \
+  redisContext c; \
+  if(HIREDIS_SONAME < 0.13) { return 1; } \
+  if(sizeof(c.sockaddr) != sizeof(struct sockaddr)) { return 1;} \
+"
+. auto/feature
+if [ $ngx_found = no ]; then
+  _NCHAN_HIREDIS_SRCS="\
+    ${ngx_addon_dir}/src/store/redis/hiredis/alloc.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/async.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/dict.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/hiredis.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/net.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/read.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/sds.c \
+    ${ngx_addon_dir}/src/store/redis/hiredis/sockcompat.c \
+  "
+  
+  if [ $USE_OPENSSL = YES ]; then
+    _NCHAN_HIREDIS_SRCS="$_NCHAN_HIREDIS_SRCS\
+      ${ngx_addon_dir}/src/store/redis/hiredis/ssl.c \
+    "
+  fi
+  
+  ngx_feature_libs=""
+else
+  nchan_libs="$nchan_libs $ngx_feature_libs"
+  _NCHAN_HIREDIS_SRCS=""
+fi
+
+ngx_feature="math lib"
+ngx_feature_name="NCHAN_HAVE_MATH"
+ngx_feature_run=yes
+ngx_feature_path=
+ngx_feature_incs="#include <math.h>"
+ngx_feature_libs="-lm"
+ngx_feature_test="sqrt(20);"
+. auto/feature
+if [ $ngx_found = yes ]; then
+  nchan_libs="$nchan_libs $ngx_feature_libs"
+fi
+
+#do we have memrchr() on the platform?
+ngx_feature="memrchr()"
+ngx_feature_name="NCHAN_HAVE_MEMRCHR"
+ngx_feature_run=yes
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_incs=" \
+  #include <string.h> 
+  #include <stddef.h> 
+"
+ngx_feature_test=" \
+  const char *str = \"aboobar\"; \
+  const void *place = &str[4]; \
+  const void *found = memrchr(str, 'b', strlen(str)); \
+  if(place != found) { return 1; } \
+"
+. auto/feature
+
+_NCHAN_SUBSCRIBERS_SRCS="\
+  ${ngx_addon_dir}/src/subscribers/common.c \
+  ${ngx_addon_dir}/src/subscribers/longpoll.c \
+  ${ngx_addon_dir}/src/subscribers/intervalpoll.c \
+  ${ngx_addon_dir}/src/subscribers/eventsource.c \
+  ${ngx_addon_dir}/src/subscribers/http-chunked.c \
+  ${ngx_addon_dir}/src/subscribers/http-multipart-mixed.c \
+  ${ngx_addon_dir}/src/subscribers/http-raw-stream.c \
+  ${ngx_addon_dir}/src/subscribers/websocket.c \
+  ${ngx_addon_dir}/src/nchan_websocket_publisher.c \
+  ${ngx_addon_dir}/src/subscribers/internal.c \
+  ${ngx_addon_dir}/src/subscribers/memstore_ipc.c \
+  ${ngx_addon_dir}/src/subscribers/memstore_multi.c \
+  ${ngx_addon_dir}/src/subscribers/memstore_redis.c \
+  ${ngx_addon_dir}/src/subscribers/getmsg_proxy.c \
+  ${ngx_addon_dir}/src/subscribers/benchmark.c \
+"
+
+_NCHAN_REDIS_STORE_SRCS="\
+  ${_NCHAN_HIREDIS_SRCS} \
+  ${ngx_addon_dir}/src/store/redis/cmp.c \
+  ${ngx_addon_dir}/src/store/redis/redis_lua_commands.c \
+  ${ngx_addon_dir}/src/store/redis/redis_nodeset_parser.c \
+  ${ngx_addon_dir}/src/store/redis/redis_nodeset.c \
+  ${ngx_addon_dir}/src/store/redis/redis_nodeset_stats.c \
+  ${ngx_addon_dir}/src/store/redis/rdsstore.c \
+  ${ngx_addon_dir}/src/store/redis/redis_nginx_adapter.c \
+"
+_NCHAN_MEMORY_STORE_SRCS="\
+  ${ngx_addon_dir}/src/store/memory/ipc.c \
+  ${ngx_addon_dir}/src/store/memory/ipc-handlers.c \
+  ${ngx_addon_dir}/src/store/memory/groups.c \
+  ${ngx_addon_dir}/src/store/memory/memstore.c \
+"
+
+_nchan_util_dir="${ngx_addon_dir}/src/util"
+_NCHAN_UTIL_SRCS=" \
+  $_nchan_util_dir/nchan_debug.c \
+  $_nchan_util_dir/nchan_list.c \
+  $_nchan_util_dir/nchan_slist.c \
+  $_nchan_util_dir/ngx_nchan_hacked_slab.c \
+  $_nchan_util_dir/shmem.c \
+  $_nchan_util_dir/nchan_rbtree.c \
+  $_nchan_util_dir/nchan_reuse_queue.c \
+  $_nchan_util_dir/nchan_output.c \
+  $_nchan_util_dir/nchan_util.c \
+  $_nchan_util_dir/nchan_fake_request.c \
+  $_nchan_util_dir/nchan_bufchainpool.c \
+  $_nchan_util_dir/nchan_channel_id.c \
+  $_nchan_util_dir/nchan_output_info.c \
+  $_nchan_util_dir/nchan_msg.c \
+  $_nchan_util_dir/nchan_thingcache.c \
+  $_nchan_util_dir/nchan_reaper.c \
+  $_nchan_util_dir/nchan_subrequest.c \
+  $_nchan_util_dir/nchan_benchmark.c \
+  $_nchan_util_dir/nchan_stats.c \
+  $_nchan_util_dir/nchan_accumulator.c \
+  $_nchan_util_dir/nchan_timequeue.c \
+  $_nchan_util_dir/hdr_histogram.c \
+"
+
+_NCHAN_STORE_SRCS="\
+  ${ngx_addon_dir}/src/store/spool.c \
+  ${ngx_addon_dir}/src/store/ngx_rwlock.c \
+  ${ngx_addon_dir}/src/store/store_common.c \
+  $_NCHAN_MEMORY_STORE_SRCS \
+  $_NCHAN_REDIS_STORE_SRCS \
+"
+
+_NCHAN_SRCS="\
+  ${ngx_addon_dir}/src/nchan_defs.c \
+  ${ngx_addon_dir}/src/nchan_variables.c \
+  ${ngx_addon_dir}/src/nchan_module.c \
+  $_NCHAN_UTIL_SRCS \
+  $_NCHAN_SUBSCRIBERS_SRCS \
+  $_NCHAN_STORE_SRCS \
+"
+
+ngx_module_incs=$ngx_addon_dir/src
+
+have=NGX_HTTP_HEADERS . auto/have
+
+if test -n "$ngx_module_link"; then
+  ngx_module_type=HTTP
+  ngx_module_name=$ngx_addon_name
+  ngx_module_srcs="$_NCHAN_SRCS"
+  ngx_module_libs=$nchan_libs
+  . auto/module
+else
+  NGX_ADDON_SRCS="$NGX_ADDON_SRCS $_NCHAN_SRCS"
+  CORE_LIBS="$CORE_LIBS $nchan_libs"
+  CORE_INCS="$CORE_INCS $ngx_module_incs"
+  HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
+fi
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/changelog b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/changelog
new file mode 100644
index 0000000..d1282f8
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/changelog
@@ -0,0 +1,81 @@
+libnginx-mod-nchan (1:1.3.7+dfsg-2) unstable; urgency=medium
+
+  * d/control: update my email to janmojzis@debian.org
+  * d/copyright: update my email to janmojzis@debian.org
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/copyright: bump debian/* copyright year
+  * d/watch: use more generic template
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Fri, 11 Apr 2025 14:27:04 +0200
+
+libnginx-mod-nchan (1:1.3.7+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 1.3.7
+  * d/control: bump Standards-Version: 4.7.0, no changes
+  * d/copyright: bump copyright year
+  * d/gbp.conf: add [pull] track-missing = True
+  * d/control, d/t/control: wrap-and-sort -asbkt
+  * d/watch: use new recommended github template
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 23 Oct 2024 20:49:28 +0200
+
+libnginx-mod-nchan (1:1.3.6+dfsg-4) unstable; urgency=medium
+
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 15:31:29 +0200
+
+libnginx-mod-nchan (1:1.3.6+dfsg-3) unstable; urgency=medium
+
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:16:41 +0200
+
+libnginx-mod-nchan (1:1.3.6+dfsg-2) unstable; urgency=medium
+
+  * d/copyright: reformat text to be compatible with 'cme update dpkg-copyright'
+  * d/copyright: fix missing BSD-1-clause
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:54 +0100
+
+libnginx-mod-nchan (1:1.3.6+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 1.3.6
+  * d/changelog: fixed spelling-error-in-changelog, spelling-error-in-copyright
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/copyright: remove 'nchan' from Files-Excluded
+  * d/copyright: bump my copyright year
+  * d/p/ca871576826e83ff1dfefdb1b2cbea914aeb16ea.patch removed: fixed in
+    upstream
+  * d/gbb.conf: switched to debian branch main (debian-branch = main)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 08 Jan 2023 12:48:45 +0100
+
+libnginx-mod-nchan (1:1.3.5+dfsg-3) unstable; urgency=medium
+
+  [ Jan Mojžíš ]
+  * d/t/generic rework. The test now checks HTTP request:
+    - after module installation
+    - after nginx reload
+    - after nginx restart.
+    The test caught a SIGSEGV problem in the nchan 1.3.5 module
+    after nginx reload.
+
+  [ Jérémy Lal ]
+  * d/p/ca871576826e83ff1dfefdb1b2cbea914aeb16ea.patch added, fixes the problem
+    when nginx with nchan module crash on SIGHUP
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 15 Dec 2022 17:27:27 +0100
+
+libnginx-mod-nchan (1:1.3.5+dfsg-2) unstable; urgency=medium
+
+  * d/control: added Multi-Arch: foreign
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 06 Dec 2022 20:36:26 +0100
+
+libnginx-mod-nchan (1:1.3.5+dfsg-1) experimental; urgency=medium
+
+  * Initial release. (Closes: 1024377)
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 14:47:01 +0100
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/control b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/control
new file mode 100644
index 0000000..ab68216
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/control
@@ -0,0 +1,32 @@
+Source: libnginx-mod-nchan
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders:
+ Jan Mojžíš <janmojzis@debian.org>,
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-sequence-nginx,
+Standards-Version: 4.7.2
+Homepage: https://github.com/slact/nchan
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-nchan.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-nchan
+Rules-Requires-Root: no
+
+Package: libnginx-mod-nchan
+Architecture: any
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ nginx,
+Description: Fast, flexible pub/sub server for Nginx
+ Nchan is a scalable, flexible pub/sub server for the modern web, It can be
+ configured as a standalone server, or as a shim between your application and
+ tens, thousands, or millions of live subscribers. It can buffer messages in
+ memory, on-disk, or via Redis. All connections are handled asynchronously and
+ distributed among any number of worker processes. It can also scale to many
+ nginx server instances with Redis.
+ .
+ Full documentation available at https://nchan.slact.net
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/copyright b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/copyright
new file mode 100644
index 0000000..f72dce4
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/copyright
@@ -0,0 +1,246 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nchan
+Upstream-Contact: Leo Ponomarev <junk@slact.net>
+Source: https://github.com/slact/nchan
+Comment:
+ * nchan_logo.png might have license issues (nginx logo)
+ * NchanSubscriber.js comes from another project
+   https://github.com/slact/nchan.js
+ * dev directory contains many other software, not part of upstream source
+ * nchan is just a useless symlink
+Files-Excluded:
+ dev
+ nchan_logo.png
+ NchanSubscriber.js
+
+Files: *
+Copyright: Rogério Carvalho Schneider <stockrt@gmail.com>
+ Alexander Lyalin
+ 2014, Wandenberg Peixoto
+ 2009-2016, Leo Ponomarev (slact)
+License: Expat
+
+Files: debian/*
+Copyright: 2022, Miao Wang <shankerwangmiao@gmail.com>
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-3-clause
+
+Files: src/store/redis/cmp.c
+  src/store/redis/cmp.h
+Copyright: 2017, Charles Gunyon
+License: Expat
+
+Files: src/store/redis/hiredis/*
+Copyright: Jan-Erik Rediger <janerik.fnordig.com>
+ 2015, Matt Stancliff <matt@genges.com>
+ 2010, 2011, Pieter Noordhuis <pcnoordhuis@gmail.com>
+ 2006-2014, Salvatore Sanfilippo <antirez@gmail.com>
+ 2010, 2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/CHANGELOG.md
+  src/store/redis/hiredis/README.md
+  src/store/redis/hiredis/fmacros.h
+  src/store/redis/hiredis/test.c
+  src/store/redis/hiredis/win32.h
+Copyright: Jan-Erik Rediger <janerik.fnordig.com>
+ 2015, Matt Stancliff <matt@genges.com>
+ 2010, 2011, Pieter Noordhuis <pcnoordhuis@gmail.com>
+ 2006-2014, Salvatore Sanfilippo <antirez@gmail.com>
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/Makefile
+Copyright: 2010, 2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ 2010, 2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/alloc.c
+  src/store/redis/hiredis/alloc.h
+Copyright: 2020, Michael Grunder <michael dot grunder at gmail dot com>
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/async.c
+  src/store/redis/hiredis/async.h
+  src/store/redis/hiredis/async_private.h
+  src/store/redis/hiredis/read.c
+  src/store/redis/hiredis/read.h
+Copyright: 2010, 2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/dict.c
+  src/store/redis/hiredis/dict.h
+Copyright: 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/hiredis.c
+  src/store/redis/hiredis/hiredis.h
+  src/store/redis/hiredis/net.c
+  src/store/redis/hiredis/net.h
+Copyright: 2015, Matt Stancliff <matt at genges dot com>
+ 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/hiredis_ssl.h
+Copyright: 2019, Redis Labs
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/sds.c
+  src/store/redis/hiredis/sds.h
+  src/store/redis/hiredis/sdsalloc.h
+Copyright: 2015, Redis Labs, Inc
+ 2015, Oran Agra
+ 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/sockcompat.c
+  src/store/redis/hiredis/sockcompat.h
+Copyright: 2019, Marcus Geelnard <m at bitsnbites dot eu>
+License: BSD-3-clause
+
+Files: src/store/redis/hiredis/ssl.c
+Copyright: 2019, Redis Labs
+ 2010, 2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+License: BSD-3-clause
+
+Files: src/store/redis/redis_nginx_adapter.c
+Copyright: 2014, Wandenberg Peixoto
+License: Expat
+
+Files: src/store/redis/redis_nginx_adapter.h
+Copyright: 2015-2021, slact
+ 2014, Wandenberg Peixoto
+License: Expat
+
+Files: src/store/redis/redis_nodeset.c
+Copyright: 2010, Salvatore Sanfilippo
+ 2001-2010, Georges Menie
+License: BSD-3-clause
+
+Files: src/uthash.h
+Copyright: 2003-2017, Troy D. Hanson
+License: BSD-1-Clause
+
+Files: src/util/hdr_histogram.c
+  src/util/hdr_histogram.h
+Copyright: Rogério Carvalho Schneider <stockrt@gmail.com>
+ Alexander Lyalin
+ 2014, Wandenberg Peixoto
+ 2009-2016, Leo Ponomarev (slact)
+License: public-domain
+
+Files: src/util/nchan_accumulator.c
+Copyright: 2011-2017, Leo Ponomarev
+License: Expat
+
+Files: src/util/nchan_subrequest.c
+Copyright: 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+License: BSD-2-clause
+
+Files: src/util/nchan_util.c
+Copyright: 2015, Alibaba Group Holding Limited
+License: Expat
+
+Files: src/util/ngx_nchan_hacked_slab.c
+  src/util/ngx_nchan_hacked_slab.h
+Copyright: Nginx, Inc.
+ Igor Sysoev
+License: Expat
+
+License: BSD-1-Clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: BSD-2-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: BSD-3-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
+
+License: public-domain
+  Public domain.
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/fix.scanned.copyright b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/fix.scanned.copyright
new file mode 100644
index 0000000..17c5e62
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/fix.scanned.copyright
@@ -0,0 +1,3 @@
+! copyright Files:"src/uthash.h" Copyright=~s/\shttp:.*//
+! copyright Files:"src/store/redis/redis_nodeset.c" Copyright=~s/\s\(.*\)//g
+! copyright Files:~/.*/ Copyright=~s/\sunder\sthe\sMIT\sLicence//g
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/gbp.conf b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/gbp.conf
new file mode 100644
index 0000000..97cd209
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/gbp.conf
@@ -0,0 +1,12 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
+
+[pull]
+track-missing = True
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/rules b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/rules
new file mode 100755
index 0000000..d8309f6
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/format b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/options b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/options
new file mode 100644
index 0000000..51ee303
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^make-dist$"
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/control b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/control
new file mode 100644
index 0000000..29a2042
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/control
@@ -0,0 +1,9 @@
+Tests:
+ generic,
+Restrictions:
+ allow-stderr isolation-container needs-root,
+Depends:
+ curl,
+ nginx,
+ nginx-core,
+ @,
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/generic b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/upstream/metadata b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/upstream/metadata
new file mode 100644
index 0000000..4316d28
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/slact/nchan/issues
+Bug-Submit: https://github.com/slact/nchan/issues/new
+Repository-Browse: https://github.com/slact/nchan
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/watch b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/watch
new file mode 100644
index 0000000..624190c
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/debian/watch
@@ -0,0 +1,9 @@
+version=4
+opts="\
+compression=xz,\
+repacksuffix=+dfsg,\
+dversionmangle=s/\+dfsg\d*//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/slact/nchan/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/.gitignore b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/.gitignore
new file mode 100644
index 0000000..67fd4b3
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/.gitignore
@@ -0,0 +1,2 @@
+nginx
+nginx-source
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_commands.rb b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_commands.rb
new file mode 100644
index 0000000..9ea17e5
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_commands.rb
@@ -0,0 +1,1188 @@
+CfCmd.new do
+  
+  nchan_channel_id [:srv, :loc, :if],
+      :nchan_set_pubsub_channel_id,
+      :loc_conf,
+      args: 1..7,
+      alt: [ :nchan_pubsub_channel_id ],
+      
+      group: "pubsub",
+      default: "(none)",
+      tags: [ 'channel-id' ],
+      info: "Channel id for a publisher or subscriber location. Can have up to 4 values to subscribe to up to 4 channels.",
+      uri: "#the-channel-id"
+  
+  nchan_publisher_channel_id [:srv, :loc, :if],
+      :nchan_set_pub_channel_id,
+      :loc_conf,
+      args: 1..7,
+      alt: [ :nchan_pub_channel_id ],
+      
+      group: "pubsub",
+      tags: [ 'pubsub', 'channel-id' ],
+      default: "(none)",
+      info: "Channel id for publisher location."
+  
+  nchan_publisher_upstream_request [:srv, :loc, :if],
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :publisher_upstream_request_url],
+      
+      group: "pubsub",
+      tags: [ 'publisher', 'hook' ],
+      value: "<url>",
+      uri: "#message-forwarding",
+      info: <<-EOS.gsub(/^ {8}/, '')
+        Send POST request to internal location (which may proxy to an upstream server) with published message in the request body. Useful for bridging websocket publishers with HTTP applications, or for transforming message via upstream application before publishing to a channel.  
+        The upstream response code determines how publishing will proceed. A `200 OK` will publish the message from the upstream response's body. A `304 Not Modified` will publish the message as it was received from the publisher. A `204 No Content` will result in the message not being published.
+      EOS
+  
+      
+  nchan_deflate_message_for_websocket [:srv, :loc],
+      :nchan_set_message_compression_slot,
+      :loc_conf,
+      args: 1,
+      
+      group: "pubsub",
+      tags: ["publisher", 'subscriber-websocket'],
+      value: ['on', 'off'],
+      default: "off",
+      info: "Store a compressed (deflated) copy of the message along with the original to be sent to websocket clients supporting the permessage-deflate protocol extension"
+      
+  nchan_channel_id_split_delimiter [:srv, :loc, :if],
+      :ngx_conf_set_str_slot,
+      [:loc_conf, :channel_id_split_delimiter],
+      
+      group: "pubsub",
+      tags: [ 'channel-id', 'channel-multiplexing' ],
+      default: "(none)",
+      info: "Split the channel id into several ids for multiplexing using the delimiter string provided.",
+      uri: "#channel-multiplexing"
+  
+  nchan_subscriber_channel_id [:srv, :loc, :if],
+      :nchan_set_sub_channel_id,
+      :loc_conf,
+      args: 1..7,
+      alt: :nchan_sub_channel_id,
+      group: "pubsub",
+      tags: ["pubsub", 'channel-id'],
+      
+      default: "(none)",
+      info: "Channel id for subscriber location. Can have up to 4 values to subscribe to up to 4 channels."
+  
+  nchan_pubsub [:srv, :loc, :if],
+      :nchan_pubsub_directive,
+      :loc_conf,
+      args: 0..6,
+      alt: :nchan_pubsub_location,
+      
+      group: "pubsub",
+      tags: [ 'publisher', 'subscriber', 'pubsub' ],
+      value: ["http", "websocket", "eventsource", "longpoll", "intervalpoll", "chunked", "multipart-mixed", "http-raw-stream"],
+      default: ["http", "websocket", "eventsource", "longpoll", "chunked", "multipart-mixed"],
+      info: "Defines a server or location as a pubsub endpoint. For long-polling, GETs subscribe. and POSTs publish. For Websockets, publishing data on a connection does not yield a channel metadata response. Without additional configuration, this turns a location into an echo server.",
+      uri: '#pubsub-endpoint'
+  
+  nchan_subscriber_info [:loc],
+      :nchan_subscriber_info_directive,
+      :loc_conf,
+      args: 0,
+      
+      group: "pubsub",
+      tags: ["subscriber", "debug"],
+      info: "A subscriber location for debugging the state of subscribers on a given channel. The subscribers of the channel specified by `nchan_channel_id` evaluate `nchan_subscriber_info_string` and send it back to the requested on this location. This is useful to see where subscribers are in an Nchan cluster, as well as debugging subscriber connection issues."
+  
+  nchan_subscriber_info_string [:srv, :loc],
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :subscriber_info_string],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ["subscriber", "debug"],
+      default: "$nchan_subscriber_type $remote_addr:$remote_port $http_user_agent $server_name $request_uri $pid",
+      info: "this string is evaluated by each subscriber on a given channel and sent to the requester of a `nchan_subscriber_info` location"
+  
+  nchan_longpoll_multipart_response [:srv, :loc, :if],
+      :nchan_set_longpoll_multipart,
+      [:loc_conf, :longpoll_multimsg],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber-longpoll'],
+      default: "off",
+      value: ["off", "on", "raw"],
+      info: "when set to 'on', enable sending multiple messages in a single longpoll response, separated using the multipart/mixed content-type scheme. If there is only one available message in response to a long-poll request, it is sent unmodified. This is useful for high-latency long-polling connections as a way to minimize round-trips to the server. When set to 'raw', sends multiple messages using the http-raw-stream message separator."
+  
+  nchan_eventsource_event [:srv, :loc, :if],
+      :ngx_conf_set_str_slot,
+      [:loc_conf, :eventsource_event],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber-eventsource'],
+      default: "(none)",
+      info: "Set the EventSource `event:` line to this value. When used in a publisher location, overrides the published message's `X-EventSource-Event` header and associates the message with the given value. When used in a subscriber location, overrides all messages' associated `event:` string with the given value."
+  
+  nchan_eventsource_ping_comment [:srv, :loc, :if],
+      :ngx_conf_set_str_slot_no_newlines,
+      [:loc_conf, :"eventsource_ping.comment"],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber-eventsource'],
+      default: "(empty)",
+      info: "Set the EventSource comment `: ...` line for periodic pings from server to client. Newlines are not allowed. If empty, no comment is sent with the ping."
+  
+  nchan_eventsource_ping_event [:srv, :loc, :if],
+      :ngx_conf_set_str_slot_no_newlines,
+      [:loc_conf, :"eventsource_ping.event"],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber-eventsource'],
+      default: "ping",
+      info: "Set the EventSource `event:` line for periodic pings from server to client. Newlines are not allowed. If empty, no event type is sent with the ping."
+  
+  nchan_eventsource_ping_data [:srv, :loc, :if],
+      :ngx_conf_set_str_slot_no_newlines,
+      [:loc_conf, :"eventsource_ping.data"],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber-eventsource'],
+      default: "(empty)",
+      info: "Set the EventSource `data:` line for periodic pings from server to client. Newlines are not allowed. If empty, no data is sent with the ping."
+  
+    nchan_eventsource_ping_interval [:srv, :loc, :if],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :"eventsource_ping.interval"],
+      
+      group: "pubsub",
+      tags: ['subscriber-eventsource'],
+      value: "<number> (seconds)",
+      default: "0 (none)",
+      info: "Interval for sending ping messages to EventSource subscribers. Disabled by default."
+  
+  nchan_subscriber [:srv, :loc, :if],
+      :nchan_subscriber_directive,
+      :loc_conf,
+      args: 0..5,
+      legacy: "push_subscriber",
+      alt: :nchan_subscriber_location,
+      
+      group: "pubsub",
+      tags: ['subscriber'],
+      value: ["websocket", "eventsource", "longpoll", "intervalpoll", "chunked", "multipart-mixed", "http-raw-stream"],
+      default: ["websocket", "eventsource", "longpoll", "chunked", "multipart-mixed"],
+      info: "Defines a server or location as a channel subscriber endpoint. This location represents a subscriber's interface to a channel's message queue. The queue is traversed automatically, starting at the position defined by the `nchan_subscriber_first_message` setting.  \n The value is a list of permitted subscriber types." ,
+      uri: "#subscriber-endpoints"
+  
+  nchan_subscriber_compound_etag_message_id [:srv, :loc, :if], 
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, :msg_in_etag_only],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber'],
+      default: "off",
+      uri: "",
+      info: <<-EOS.gsub(/^ {8}/, '')
+        Override the default behavior of using both `Last-Modified` and `Etag` headers for the message id.  
+        Enabling this option packs the entire message id into the `Etag` header, and discards
+        `Last-Modified` and `If-Modified-Since` headers.
+      EOS
+      
+  nchan_subscriber_message_id_custom_etag_header [:srv, :loc, :if], 
+      :ngx_conf_set_str_slot, 
+      [:loc_conf, :custom_msgtag_header],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber'],
+      default: "(none)",
+      info: <<-EOS.gsub(/^ {8}/, '')
+        Use a custom header instead of the Etag header for message ID in subscriber responses. This setting is a hack, useful when behind a caching proxy such as Cloudflare that under some conditions (like using gzip encoding) swallow the Etag header.
+      EOS
+  
+  nchan_subscriber_last_message_id [:srv, :loc, :if], 
+      :nchan_subscriber_last_message_id,
+      :loc_conf,
+      args: 1..5,
+      
+      group: "pubsub",
+      tags: ['subscriber'],
+      default: ["$http_last_event_id", "$arg_last_event_id"],
+      info: "If `If-Modified-Since` and `If-None-Match` headers are absent, set the message id to the first non-empty of these values. Used primarily as a workaround for the inability to set the first `Last-Message-Id` of a web browser's EventSource object. "
+  
+  nchan_subscriber_http_raw_stream_separator [:srv, :loc, :if],
+      :nchan_set_raw_subscriber_separator,
+      [:loc_conf, :subscriber_http_raw_stream_separator],
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber-rawstream'],
+      value: "<string>",
+      default: "\\n",
+      info: "Message separator string for the http-raw-stream subscriber. Automatically terminated with a newline character if not explicitly set to an empty string."
+  
+  nchan_subscriber_first_message [:srv, :loc, :if],
+      :nchan_subscriber_first_message_directive,
+      :loc_conf,
+      args: 1,
+      
+      group: "pubsub",
+      tags: ['subscriber'],
+      value: ["oldest", "newest", "<number>"],
+      default: "oldest",
+      info: "Controls the first message received by a new subscriber. 'oldest' starts at the oldest available message in a channel's message queue, 'newest' waits until a message arrives. If a number `n` is specified, starts at `n`th message from the oldest. (`-n` starts at `n`th from now). 0 is equivalent to 'newest'."
+  
+  
+  #nchan_subscriber_concurrency [:main, :srv, :loc, :if],
+  #    :nchan_set_subscriber_concurrency,
+  #    [:loc_conf, :subscriber_concurrency],
+  #    legacy: "push_subscriber_concurrency",
+  #    
+  #    group: "pubsub",
+  #    value: [ :last, :first, :broadcast ],
+  #    info: "Controls how multiple subscriber requests to a channel (identified by some common ID) are handled.The values work as follows:
+  #    - broadcast: any number of concurrent subscriber requests may be held.
+  #    - last: only the most recent subscriber request is kept, all others get a 409 Conflict response.
+  #    - first: only the oldest subscriber request is kept, all others get a 409 Conflict response."
+  
+  nchan_websocket_ping_interval [:srv, :loc, :if],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :websocket_ping_interval],
+      
+      group: "pubsub",
+      tags: ['subscriber-websocket'],
+      value: "<number> (seconds)",
+      default: "0 (none)",
+      info: "Interval for sending websocket ping frames. Disabled by default."
+  
+  nchan_websocket_client_heartbeat [:srv, :loc, :if],
+      :nchan_websocket_heartbeat_directive,
+      [:loc_conf, :websocket_heartbeat],
+      args: 2,
+      
+      group: "pubsub",
+      tags:['subscriber-websocket'],
+      value: "<heartbeat_in> <heartbeat_out>",
+      default: "none (disabled)",
+      info: "Most browser Websocket clients do not allow manually sending PINGs to the server. To overcome this limitation, this setting can be used to set up a PING/PONG message/response connection heartbeat. When the client sends the server message *heartbeat_in* (PING), the server automatically responds with *heartbeat_out* (PONG)."
+  
+  nchan_publisher [:srv, :loc, :if],
+      :nchan_publisher_directive,
+      :loc_conf,
+      args: 0..2,
+      legacy: "push_publisher",
+      alt: :nchan_publisher_location,
+      
+      group: "pubsub",
+      tags: ['publisher'],
+      value: ["http", "websocket"],
+      default: ["http", "websocket"],
+      info: "Defines a server or location as a publisher endpoint. Requests to a publisher location are treated as messages to be sent to subscribers. See the protocol documentation for a detailed description.",
+      uri: "#publisher-endpoints"
+  
+  nchan_subscriber_timeout [:main, :srv, :loc, :if],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :subscriber_timeout],
+      legacy: "push_subscriber_timeout",
+      
+      group: "pubsub",
+      tags: ['subscriber'],
+      value: "<number> (seconds)",
+      default: "0 (none)",
+      info: "Maximum time a subscriber may wait for a message before being disconnected. If you don't want a subscriber's connection to timeout, set this to 0. When possible, the subscriber will get a response with a `408 Request Timeout` status; otherwise the subscriber will simply be disconnected."
+      
+  
+  nchan_authorize_request [:srv, :loc, :if], 
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :authorize_request_url],
+      
+      group: "security",
+      tags: ['publisher', 'subscriber', 'hook'],
+      value: "<url>",
+      info: "Send GET request to internal location (which may proxy to an upstream server) for authorization of a publisher or subscriber request. A 200 response authorizes the request, a 403 response forbids it.",
+      uri: "#request-authorization"
+  
+  nchan_subscribe_request [:srv, :loc, :if], 
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :subscribe_request_url],
+      
+      group: "pubsub",
+      tags: ['subscriber', 'hook'],
+      value: "<url>",
+      info: "Send GET request to internal location (which may proxy to an upstream server) after subscribing. Disabled for longpoll and interval-polling subscribers.",
+      uri: "#subscriber-presence"
+  
+  nchan_unsubscribe_request [:srv, :loc, :if], 
+      :ngx_http_set_unsubscribe_request_url,
+      [:loc_conf, :unsubscribe_request_url],
+      
+      group: "pubsub",
+      tags: ['subscriber', 'hook'],
+      value: "<url>",
+      info: "Send GET request to internal location (which may proxy to an upstream server) after unsubscribing. Disabled for longpoll and interval-polling subscribers.",
+      uri: "#subscriber-presence"
+  
+  nchan_message_temp_path [:main],
+      :ngx_conf_set_path_slot,
+      [:main_conf, :message_temp_path],
+      
+      group: "storage",
+      tags: ["memstore"],
+      value: "<path>",
+      default: "<client_body_temp_path>",
+      info: "Large messages are stored in temporary files in the `client_body_temp_path` or the `nchan_message_temp_path` if the former is unavailable. Default is the built-in default `client_body_temp_path`"
+      
+  
+  nchan_store_messages [:main, :srv, :loc, :if],
+      :nchan_store_messages_directive,
+      :loc_conf,
+      legacy: "push_store_messages",
+      
+      group: "storage",
+      tags: ['publisher'],
+      value: [:on, :off],
+      default: :on,
+      info: "Publisher configuration. \"`off`\" is equivalent to setting `nchan_message_buffer_length 0`, which disables the buffering of old messages. Using this setting is not recommended when publishing very quickly, as it may result in missed messages."
+    
+  nchan_shared_memory_size [:main],
+      :nchan_conf_set_size_slot,
+      [:main_conf, :shm_size],
+      legacy: ["push_max_reserved_memory", "nchan_max_reserved_memory"],
+      
+      group: "storage",
+      tags: ['memstore'],
+      value: "<size>",
+      default: "128M",
+      info: "Shared memory slab pre-allocated for Nchan. Used for channel statistics, message storage, and interprocess communication.",
+      uri: "#memory-storage"
+  
+  nchan_permessage_deflate_compression_level [:main],
+      :nchan_conf_deflate_compression_level_directive,
+      :main_conf,
+      
+      group: "pubsub",
+      tags: ['subscriber-websocket'],
+      value: ["0-9"],
+      default: "6",
+      info: "Compression level for the `deflate` algorithm used in websocket's permessage-deflate extension. 0: no compression, 1: fastest, worst, 9: slowest, best"
+  
+  nchan_permessage_deflate_compression_strategy [:main],
+      :nchan_conf_deflate_compression_strategy_directive,
+      :main_conf,
+      
+      group: "pubsub",
+      tags: ['subscriber-websocket'],
+      value: ["default", "filtered", "huffman-only", "rle", "fixed"],
+      default: "default",
+      info: "Compression strategy for the `deflate` algorithm used in websocket's permessage-deflate extension. Use 'default' for normal data, For details see [zlib's section on copression strategies](http://zlib.net/manual.html#Advanced)"
+  
+  nchan_permessage_deflate_compression_window [:main],
+      :nchan_conf_deflate_compression_window_directive,
+      :main_conf,
+      
+      group: "pubsub",
+      tags: ['subscriber-websocket'],
+      value: ["9-15"],
+      default: "10",
+      info: "Compression window for the `deflate` algorithm used in websocket's permessage-deflate extension. The base two logarithm of the window size (the size of the history buffer). The bigger the window, the better the compression, but the more memory used by the compressor."
+  
+  nchan_permessage_deflate_compression_memlevel [:main],
+      :nchan_conf_deflate_compression_memlevel_directive,
+      :main_conf,
+      
+      group: "pubsub",
+      tags: ['subscriber-websocket'],
+      value: ["1-9"],
+      default: "8",
+      info: "Memory level for the `deflate` algorithm used in websocket's permessage-deflate extension. How much memory should be allocated for the internal compression state. 1 - minimum memory, slow and reduces compression ratio; 9 - maximum memory for optimal speed"
+  
+  nchan_redis_url [:main, :srv, :loc],
+      :ngx_conf_set_redis_url,
+      [:loc_conf, :"redis.url"],
+      
+      group: "storage",
+      tags: ['redis'],
+      value: "<redis-url>",
+      default: "127.0.0.1:6379",
+      info: "Use of this command is discouraged in favor of upstreams blocks with [`nchan_redis_server`](#nchan_redis_server). The path to a redis server, of the form 'redis://:password@hostname:6379/0'. Shorthand of the form 'host:port' or just 'host' is also accepted.",
+      uri: "#connecting-to-a-redis-server"
+  
+  nchan_redis_pass [:main, :srv, :loc],
+      :ngx_conf_set_redis_upstream_pass,
+      [:loc_conf, :"redis"],
+      
+      group: "storage",
+      tags: ['publisher', 'subscriber', 'redis'],
+      value: "<upstream-name>",
+      info: "Use an upstream config block for Redis servers.",
+      uri: "#connecting-to-a-redis-server"
+  
+  nchan_redis_pass_inheritable [:main, :srv, :loc],
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, :"redis.upstream_inheritable"],
+      
+      undocumented: true,
+      group: "debug"
+  
+  nchan_redis_publish_msgpacked_max_size [:main],
+      :ngx_conf_set_size_slot,
+      [:main_conf, :redis_publish_message_msgkey_size],
+      undocumented: true,
+      group: "storage"
+  
+  nchan_redis_discovered_ip_range_blacklist [:upstream],
+      :ngx_conf_set_redis_ip_blacklist,
+      :srv_conf,
+      args: 1..7,
+      group: "storage",
+      tags: ['redis'],
+      value: "<CIDR range>",
+      info: "do not attempt to connect to **autodiscovered** nodes with IPs in the specified ranges. Useful for blacklisting private network ranges for clusters and Redis slaves. NOTE that this blacklist applies only to autodiscovered nodes, and not ones specified in the upstream block"
+  
+  nchan_redis_server [:upstream],
+      :ngx_conf_upstream_redis_server,
+      :loc_conf,
+      group: "storage",
+      tags: ['redis'],
+      args: 1..2,
+      value: "<redis-url> <optional-forced-role>",
+      default: "<redis-url>",
+      info: "Used in upstream { } blocks to set redis servers. Redis url is in the form 'redis://:password@hostname:6379/0'. Shorthands 'host:port' or 'host' are permitted. A role may optionally be provided as well to force a server to be treated as 'master' or 'slave'.
+      uri: "#connecting-to-a-redis-server"
+  
+  nchan_redis_storage_mode [:main, :srv, :upstream, :loc], 
+      :ngx_conf_set_redis_storage_mode_slot,
+      [:loc_conf, :"redis.storage_mode"],
+      
+      group: "storage",
+      tags: ['redis'],
+      value: ["distributed", "backup", "nostore"],
+      default: "distributed",
+      info: <<-EOS.gsub(/^ {8}/, '')
+        The mode of operation of the Redis server. In `distributed` mode, messages are published directly to Redis, and retrieved in real-time. Any number of Nchan servers in distributed mode can share the Redis server (or cluster). Useful for horizontal scalability, but suffers the latency penalty of all message publishing going through Redis first.
+        
+        In `backup` mode, messages are published locally first, then later forwarded to Redis, and are retrieved only upon channel initialization. Only one Nchan server should use a Redis server (or cluster) in this mode. Useful for data persistence without sacrificing response times to the latency of a round-trip to Redis.
+        
+        In `nostore` mode, messages are published as in `distributed` mode, but are not stored. Thus Redis is used to broadcast messages to many Nchan instances with no delivery guarantees during connection failure, and only local in-memory storage. This means that there are also no message delivery guarantees for subscribers switching from one Nchan instance to another connected to the same Redis server or cluster. Nostore mode increases Redis publishing capacity by an order of magnitude.
+      EOS
+  
+  nchan_redis_nostore_fastpublish [:main, :srv, :upstream],
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, :"redis.nostore_fastpublish"],
+      
+      group: "storage",
+      tags: ['redis', 'publisher'],
+      value: [:on, :off],
+      default: :off,
+      info: "Increases publishing capacity by 2-3x for Redis nostore mode at the expense of inaccurate subscriber counts in the publisher response."
+  
+  nchan_redis_username [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.username"],
+      
+      group: "storage",
+      tags: ['redis'],
+      default: "<none>",
+      info: "Set Redis username for AUTH command (available when using ACLs on the Redis server). All servers in the upstream block will use this username _unless_ a different username is specified by a server URL."
+  
+  nchan_redis_password [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.password"],
+      
+      group: "storage",
+      tags: ['redis'],
+      default: "<none>",
+      info: "Set Redis password for AUTH command. All servers in the upstream block will use this password _unless_ a different password is specified by a server URL."
+  
+  nchan_redis_ssl [:upstream],
+      :ngx_conf_set_flag_slot,
+      [:srv_conf, :"redis.tls.enabled"],
+      alt: :nchan_redis_tls,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      value: [:on, :off],
+      default: :off,
+      info: "Enables SSL/TLS for all connections to Redis servers in this upstream block. When enabled, no unsecured connections are permitted"
+  
+  nchan_redis_ssl_client_certificate [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.client_certificate"],
+      alt: :nchan_redis_tls_client_certificate,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      info: "Path to client certificate when using TLS for Redis connections"
+  
+  nchan_redis_ssl_client_certificate_key [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.client_certificate_key"],
+      alt: :nchan_redis_tls_client_certificate,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      info: "Path to client certificate key when using TLS for Redis connections"
+  
+  nchan_redis_ssl_server_name [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.server_name"],
+      alt: :nchan_redis_tls_server_name,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      info: "Server name to verify (CN) when using TLS for Redis connections"
+  
+  nchan_redis_ssl_trusted_certificate [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.trusted_certificate"],
+      alt: :nchan_redis_tls_trusted_certificate,
+      
+      group: "storage",
+      tags: ['redis', 'ssl'],
+      info: "Trusted certificate (CA) when using TLS for Redis connections"
+      
+  nchan_redis_ssl_trusted_certificate_path [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.trusted_certificate_path"],
+      alt: :nchan_redis_tls_trusted_certificate_path,
+      
+      group: "storage",
+      default: "<system default>",
+      tags: ['redis', 'ssl'],
+      info: "Trusted certificate (CA) when using TLS for Redis connections. Defaults to the system's SSL cert path unless nchan_redis_ssl_trusted_certificate is set"
+  
+  nchan_redis_ssl_ciphers [:upstream],
+      :ngx_conf_set_str_slot,
+      [:srv_conf, :"redis.tls.ciphers"],
+      alt: :nchan_redis_tls_ciphers,
+      
+      group: "storage",
+      default: "<system default>",
+      tags: ['redis', 'ssl'],
+      info: "Acceptable ciphers when using TLS for Redis connections"
+  
+  nchan_redis_ssl_verify_certificate [:upstream],
+      :ngx_conf_set_flag_slot,
+      [:srv_conf, :"redis.tls.ciphers"],
+      alt: :nchan_redis_tls_verify_certificate,
+      
+      group: "storage",
+      value: [:on, :off],
+      default: :on,
+      tags: ['redis', 'ssl'],
+      info: "Should the server certificate be verified when using TLS for Redis connections? Useful to disable when testing with a self-signed server certificate."
+  
+  nchan_use_redis [:main, :srv, :loc],
+      :ngx_conf_enable_redis,
+      [:loc_conf, :"redis.url_enabled"],
+      
+      group: "storage",
+      tags: ['redis', 'publisher', 'subscriber'],
+      value: [ :on, :off ],
+      default: :off,
+      info: "Use of this command is discouraged in favor of (`nchan_redis_pass`)[#nchan_redis_pass]. Use Redis for message storage at this location.",
+      uri: "#connecting-to-a-redis-server"
+  
+  nchan_redis_ping_interval [:main, :srv, :upstream, :loc],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :"redis.ping_interval"],
+      
+      group: "storage",
+      tags: ['redis'],
+      default: "4m",
+      info: "Send a keepalive command to redis to keep the Nchan redis clients from disconnecting. Set to 0 to disable."
+  
+  nchan_redis_load_scripts_unconditionally [:upstream],
+      :ngx_conf_set_flag_slot,
+      [:srv_conf, "redis.load_scripts_unconditionally"],
+      default: "no",
+      group: "development",
+      undocumented: true
+  
+  nchan_redis_accurate_subscriber_count [:upstream],
+      :ngx_conf_set_flag_slot,
+      [:srv_conf, "redis.accurate_subscriber_count"],
+      default: "off",
+      group: "storage",
+      tags: ['redis'],
+      info: "When disabled, use fast but potentially inaccurate subscriber counts. These may become inaccurate if Nginx workers exit uncleanly or are terminated. When enabled, use a slightly slower but completely accurate subscriber count. Defaults to 'off' for legacy reasons, but will be enabled by default in the future."
+  
+  nchan_redis_wait_after_connecting [:main, :srv, :loc],
+      :nchan_ignore_obsolete_setting,
+      :loc_conf,
+      
+      group: "obsolete",
+      tags: ['redis'],
+      undocumented: true
+  
+  nchan_redis_connect_timeout [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.node_connect_timeout"],
+  
+      alt: :nchan_redis_node_connect_timeout,
+      group: "storage",
+      tags: ['redis'],
+      default: "10s",
+      info: "Redis server connection timeout."
+  
+  nchan_redis_cluster_connect_timeout [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.cluster_connect_timeout"],
+  
+      alt: :nchan_redis_node_connect_timeout,
+      group: "storage",
+      tags: ['redis'],
+      default: "15s",
+      info: "Redis cluster connection timeout."
+  
+  nchan_redis_cluster_max_failing_time [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.cluster_max_failing_msec"],
+  
+      group: "storage",
+      tags: ['redis'],
+      default: "30s",
+      info: "Maximum time a Redis cluster can be in a failing state before Nchan disconnects from it. During this time, Nchan will try to recover from a cluster or node failure without disconnecting the entire cluster."
+  
+  nchan_redis_reconnect_delay [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.reconnect_delay.min"],
+  
+      alt: :nchan_redis_reconnect_delay_min,
+      group: "storage",
+      tags: ['redis'],
+      value: "<time>",
+      default: "500ms",
+      info: "After a connection failure, wait this long before trying to reconnect to Redis."
+  
+  nchan_redis_reconnect_delay_jitter [:upstream],
+      :ngx_conf_set_jitter,
+      [:srv_conf, :"redis.reconnect_delay.jitter_multiplier"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<floating point> >= 0 (0 to disable)",
+      default: "0.1 (10% of delay value)",
+      info: "Introduce random jitter to Redis reconnection time, where the range is `±(reconnect_delay * nchan_redis_reconnect_delay_jitter) / 2`."
+    
+  nchan_redis_reconnect_delay_backoff [:upstream],
+      :ngx_conf_set_exponential_backoff,
+      [:srv_conf, :"redis.reconnect_delay.backoff_multiplier"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<floating point> >= 0 (0 to disable)",
+      default: "0.5 (increase delay by 50% each try)",
+      info: "Add an exponentially increasing delay to Redis connection retries. `Delay[n] = (Delay[n-1] + jitter) * (nchan_redis_reconnect_delay_backoff + 1)`."
+      
+  nchan_redis_reconnect_delay_max [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.reconnect_delay.max"],
+  
+      group: "storage",
+      tags: ['redis'],
+      default: "10s",
+      value: "<time> (0 to disable)",
+      info: "Maximum Redis reconnection delay after backoff and jitter."
+
+  nchan_redis_idle_channel_keepalive_safety_margin [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.idle_channel_ttl_safety_margin"],
+      group: "storage",
+      tags: ['redis'],
+      value: "<time>",
+      default: "60s",
+      undocumented: true
+  
+  nchan_redis_idle_channel_keepalive_min [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.idle_channel_ttl.min"],
+      group: "storage",
+      tags: ['redis'],
+      value: "<time>",
+      default: "10m",
+      undocumented: true
+  
+  nchan_redis_idle_channel_keepalive_jitter [:upstream],
+      :ngx_conf_set_jitter,
+      [:srv_conf, :"redis.idle_channel_ttl.jitter_multiplier"],
+      group: "storage",
+      tags: ['redis'],
+      value: "<floating point> >= 0 (0 to disable)",
+      default: "0.7 (70% of delay value)",
+      undocumented: true
+    
+  nchan_redis_idle_channel_keepalive_backoff [:upstream],
+      :ngx_conf_set_exponential_backoff,
+      [:srv_conf, :"redis.idle_channel_ttl.backoff_multiplier"],
+      group: "storage",
+      tags: ['redis'],
+      value: "<floating point> >= 0 (0 to disable)",
+      default: "1 (increase by 100% each time)",
+      undocumented: true
+      
+  nchan_redis_idle_channel_keepalive_max [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.idle_channel_ttl.max"],
+      group: "storage",
+      tags: ['redis'],
+      default: "168h (1 week)",
+      value: "<time> (0 to disable)",
+      undocumented: true
+  
+  nchan_redis_cluster_check_interval_min [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.cluster_check_interval.min"],
+  
+      alt: :nchan_redis_cluster_check_interval,
+      group: "storage",
+      tags: ['redis'],
+      value: "<time>",
+      default: "1s (0 to disable)",
+      info: "When connected to a cluster, periodically check the cluster state and layout via a random master node."
+  
+  nchan_redis_cluster_check_interval_jitter [:upstream],
+      :ngx_conf_set_jitter,
+      [:srv_conf, :"redis.cluster_check_interval.jitter_multiplier"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<floating point> >= 0, (0 to disable)",
+      default: "0.2 (20% of interval value)",
+      info: "Introduce random jitter to Redis cluster check interval, where the range is `±(cluster_check_interval * nchan_redis_cluster_check_interval_jitter) / 2`."
+  
+  nchan_redis_cluster_check_interval_backoff [:upstream],
+      :ngx_conf_set_exponential_backoff,
+      [:srv_conf, :"redis.cluster_check_interval.backoff_multiplier"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<floating point> >= 0, ratio of current delay",
+      default: "2 (increase delay by 200% each try)",
+      info: "Add an exponentially increasing delay to the Redis cluster check interval. `Delay[n] = (Delay[n-1] + jitter) * (nchan_redis_cluster_check_interval_backoff + 1)`."
+      
+  nchan_redis_cluster_check_interval_max [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.cluster_check_interval.max"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<time> (0 to disable)",
+      default: "30s",
+      info: "Maximum Redis cluster check interval after backoff and jitter."
+    
+
+  nchan_redis_cluster_recovery_delay [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.cluster_recovery_delay.min"],
+  
+      alt: :nchan_redis_cluster_recovery_delay_min,
+      group: "storage",
+      tags: ['redis'],
+      value: "<time>",
+      default: "100ms",
+      info: "After a cluster recovery failure, wait this long to try again."
+  
+  nchan_redis_cluster_recovery_delay_jitter [:upstream],
+      :ngx_conf_set_jitter,
+      [:srv_conf, :"redis.cluster_recovery_delay.jitter_multiplier"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<floating point> >= 0, (0 to disable)",
+      default: "0.5 (50% of delay value)",
+      info: "Introduce random jitter to Redis cluster recovery retry time, where the range is `±(recovery_delay * nchan_redis_cluster_recovery_delay_jitter) / 2`."
+  
+  nchan_redis_cluster_recovery_delay_backoff [:upstream],
+      :ngx_conf_set_exponential_backoff,
+      [:srv_conf, :"redis.cluster_recovery_delay.backoff_multiplier"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<floating point> >= 0, ratio of current delay",
+      default: "0.5 (increase delay by 50% each try)",
+      info: "Add an exponentially increasing delay to Redis cluster recovery retries. `Delay[n] = (Delay[n-1] + jitter) * (nchan_redis_cluster_recovery_delay_backoff + 1)`."
+      
+  nchan_redis_cluster_recovery_delay_max [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.cluster_recovery_delay.max"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<time> (0 to disable)",
+      default: "2s",
+      info: "Maximum Redis cluster recovery delay after backoff and jitter."
+  
+  nchan_redis_command_timeout [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.command_timeout"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<time> (0 to leave unlimited)",
+      default: "5s",
+      info: "If a Redis server exceeds this time to produce a command reply, it is considered unhealthy and is disconnected."
+  
+  nchan_redis_retry_commands [:upstream],
+      :ngx_conf_set_flag_slot,
+      [:srv_conf, :"redis.retry_commands"],
+  
+      group: "storage",
+      tags: ['redis'],
+      default: "on",
+      info: "Allow Nchan to retry some Redis commands on keyslot errors and cluster unavailability. Queuing up a lot of commands while the cluster is unavailable may lead to excessive memory use, but it can also defer commands during transient failures."
+
+  nchan_redis_retry_commands_max_wait [:upstream],
+      :ngx_conf_set_msec_slot,
+      [:srv_conf, :"redis.retry_commands_max_wait"],
+  
+      group: "storage",
+      tags: ['redis'],
+      value: "<time> (0 to leave unlimited)",
+      default: "500ms",
+      info: "When `nchan_redis_retry_commands` is on, the maximum time a command will stayed queued to be retried."
+  
+  nchan_redis_subscribe_weights [:upstream],
+      :ngx_conf_set_redis_subscribe_weights,
+      :srv_conf,
+      args: 1..2,
+      
+      group: "storage",
+      tags: ['redis'],
+      value: "master=<integer> slave=<integer>",
+      default: "master=1 slave=1",
+      info: "Determines how subscriptions to Redis PUBSUB channels are distributed between master and slave nodes. The higher the number, the more likely that each node of that type will be chosen for each new channel. The weights for slave nodes are cumulative, so an equal 1:1 master:slave weight ratio with two slaves would have a 1/3 chance of picking a master, and 2/3 chance of picking one of the slaves. The weight must be a non-negative integer."
+  
+  nchan_redis_optimize_target [:upstream],
+      :nchan_ignore_obsolete_setting,
+      :srv_conf,
+      group: "storage",
+      tags: ['redis'],
+      value: [:cpu, :bandwidth],
+      default: "bandwidth",
+      info: "This tweaks whether [effect replication](https://redis.io/commands/eval#replicating-commands-instead-of-scripts) is enabled. This setting is obsolete, as effect replication is now always enabled to support other features"
+  
+  nchan_redis_namespace [:main, :srv, :upstream, :loc], 
+      :ngx_conf_set_str_slot,
+      [:loc_conf, :"redis.namespace"],
+      args: 1,
+      post_handler: "ngx_conf_process_redis_namespace_slot",
+      
+      group: "storage",
+      value: "<string>",
+      tags: ['redis'],
+      info: "Prefix all Redis keys with this string. All Nchan-related keys in redis will be of the form \"nchan_redis_namespace:*\" . Default is empty."
+  
+  nchan_redis_fakesub_timer_interval [:main],
+      :ngx_conf_set_msec_slot,
+      [:main_conf, :redis_fakesub_timer_interval],
+      
+      group: "tweak",
+      undocumented: true,
+      default: "100ms"
+  
+  nchan_redis_idle_channel_cache_timeout [:main, :srv, :loc],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :redis_idle_channel_cache_timeout],
+      
+      group: "storage",
+      tags: ['redis'],
+      value: "<time>",
+      default: "30s",
+      info: "A Redis-stored channel and its messages are removed from memory (local cache) after this timeout, provided there are no local subscribers."
+  
+  nchan_redis_upstream_stats [:srv, :loc],
+      :nchan_redis_stats_directive,
+      [:loc_conf, :"redis.stats.upstream_name"],
+      args: 1,
+      
+      group: "storage",
+      tags: [ 'redis', 'meta', 'stats' ],
+      value: "<upstream_name>",
+      default: "(none)",
+      info: "Defines a location as redis statistics endpoint. GET requests to this location produce a JSON response with detailed listings of total Redis command times and number of calls, broken down by node and command type. Useful for making graphs about Redis performance. Can be set with nginx variables."
+  
+  nchan_redis_upstream_stats_enabled [:upstream],
+      :ngx_conf_set_flag_slot,
+      [:srv_conf, :"redis.stats.enabled"],
+      args: 1,
+      group: "storage",
+      tags: ['redis'],
+      value: [:on, :off],
+      default: "<on> if at least 1 redis stats location is configured, otherwise <off>",
+      info: "Gather Redis node command timings for this upstream"
+
+  nchan_redis_upstream_stats_disconnected_timeout [:upstream],
+      :ngx_conf_set_flag_slot,
+      [:srv_conf, :"redis.stats.max_detached_time_sec"],
+      args: 1,
+      group: "storage",
+      tags: ['redis'],
+      default: "5m",
+      info: "Keep stats for disconnected nodes around for this long. Useful for tracking stats for nodes that have intermittent connectivity issues."
+  
+  nchan_message_timeout [:main, :srv, :loc], 
+      :nchan_set_message_timeout, 
+      [:loc_conf, :message_timeout],
+      legacy: "push_message_timeout",
+      
+      group: "storage",
+      tags: ['publisher'],
+      value: ["<time>", "<variable>"],
+      default: "1h",
+      info: "Publisher configuration setting the length of time a message may be queued before it is considered expired. If you do not want messages to expire, set this to 0. Note that messages always expire from oldest to newest, so an older message may prevent a newer one with a shorter timeout from expiring. An Nginx variable can also be used to set the timeout dynamically."
+  
+  nchan_message_buffer_length [:main, :srv, :loc],
+      :nchan_set_message_buffer_length,
+      [:loc_conf, :max_messages],
+      legacy: [ "push_max_message_buffer_length", "push_message_buffer_length" ],
+      alt: :nchan_message_max_buffer_length,
+      
+      group: "storage",
+      tags: ['publisher'],
+      value: ["<number>", "<variable>"],
+      default: 10,
+      info: "Publisher configuration setting the maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages. An Nginx variable can also be used to set the buffer length dynamically."
+  
+  nchan_subscribe_existing_channels_only [:main, :srv, :loc],
+      :ngx_conf_set_flag_slot, 
+      [:loc_conf, :subscribe_only_existing_channel],
+      legacy: "push_authorized_channels_only",
+      
+      group: "security",
+      tags: ['subscriber'],
+      value: [:on, :off],
+      default: :off,
+      info: "Whether or not a subscriber may create a channel by sending a request to a subscriber location. If set to on, a publisher must send a POST or PUT request before a subscriber can request messages on the channel. Otherwise, all subscriber requests to nonexistent channels will get a 403 Forbidden response."
+  
+  nchan_access_control_allow_origin [:main, :srv, :loc, :if], 
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :allow_origin],
+      args: 1,
+      
+      group: "security",
+      value: "<string>",
+      tags: ['publisher', 'subscriber'],
+      default: "$http_origin",
+      info: "Set the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Origin` header to this value. If the incoming request's `Origin` header does not match this value, respond with a `403 Forbidden`. Multiple origins can be provided in a single argument separated with a space."
+
+  nchan_access_control_allow_credentials [:main, :srv, :loc, :if], 
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, :allow_credentials],
+      args: 1,
+      
+      group: "security",
+      tags: ['publisher', 'subscriber'],
+      default: "on",
+      info: "When enabled, sets the [Cross-Origin Resource Sharing (CORS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) `Access-Control-Allow-Credentials` header to `true`."
+  
+  
+  nchan_channel_group [:srv, :loc, :if], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, :channel_group],
+      legacy: "push_channel_group",
+      
+      group: "security",
+      tags: ['publisher', 'subscriber', 'channel-events', 'group'],
+      value: "<string>",
+      default: "(none)",
+      info: "The accounting and security group a channel belongs to. Works like a prefix string to the channel id. Can be set with nginx variables."
+  
+  nchan_channel_group_accounting [:srv, :loc], 
+      :ngx_conf_set_flag_slot,
+      [:loc_conf, "group.enable_accounting"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      default: "off",
+      info: "Enable tracking channel, subscriber, and message information on a per-channel-group basis. Can be used to place upper limits on channel groups."
+  
+  nchan_group_location [:loc], 
+      :nchan_group_directive, 
+      [:loc_conf],
+      args: 0..3,
+      
+      group: "security",
+      tags: ['group'],
+      value: ["get", "set", "delete", "off"],
+      default: ["get", "set", "delete"],
+      info: "Group information and configuration location. GET request for group info, POST to set limits, DELETE to delete all channels in group."
+  
+  nchan_group_max_channels [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_channels"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum number of channels allowed in the group."
+  
+  nchan_group_max_messages [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_messages"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum number of messages allowed for all the channels in the group."
+  
+  nchan_group_max_messages_memory [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_messages_shm_bytes"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum amount of shared memory allowed for the messages of all the channels in the group."
+  
+  nchan_group_max_messages_disk [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_messages_file_bytes"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum amount of disk space allowed for the messages of all the channels in the group."
+  
+  nchan_group_max_subscribers [:loc], 
+      :ngx_http_set_complex_value_slot, 
+      [:loc_conf, "group.max_subscribers"],
+      
+      group: "security",
+      tags: ['group', 'security'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum number of subscribers allowed for the messages of all the channels in the group."
+  
+  nchan_channel_events_channel_id [:srv, :loc, :if],
+      :nchan_set_channel_events_channel_id,
+      :loc_conf,
+      args: 1,
+      
+      group: "meta",
+      tags: ['publisher', 'subscriber', 'channel-events', 'introspection'],
+      uri: "#channel-events",
+      info: "Channel id where `nchan_channel_id`'s events should be sent. Events like subscriber enqueue/dequeue, publishing messages, etc. Useful for application debugging. The channel event message is configurable via nchan_channel_event_string. The channel group for events is hardcoded to 'meta'."
+  
+  nchan_stub_status [:loc],
+      :nchan_stub_status_directive,
+      :loc_conf,
+      args: 0,
+      
+      group: "meta",
+      tags: ['introspection'],
+      info: "Similar to Nginx's stub_status directive, requests to an `nchan_stub_status` location get a response with some vital Nchan statistics. This data does not account for information from other Nchan instances, and monitors only local connections, published messages, etc.",
+      uri: "#nchan_stub_status"
+  
+  nchan_channel_event_string [:srv, :loc, :if], 
+      :ngx_http_set_complex_value_slot,
+      [:loc_conf, :channel_event_string],
+      
+      group: "meta",
+      tags: ['publisher', 'subscriber', 'channel-events', 'introspection'],
+      value: "<string>",
+      default: "\"$nchan_channel_event $nchan_channel_id\"",
+      info: "Contents of channel event message"
+  
+  nchan_max_channel_id_length [:main, :srv, :loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, :max_channel_id_length],
+      legacy: "push_max_channel_id_length",
+      
+      group: "security",
+      tags: ['publisher', 'subscriber', 'channel-id' ],
+      value: "<number>",
+      default: 1024,
+      info: "Maximum permissible channel id length (number of characters). This settings applies to ids before they may be split by the `nchan_channel_id_split_delimiter` Requests with a channel id that is too long will receive a `403 Forbidden` response."
+  
+  nchan_max_channel_subscribers [:main, :srv, :loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, :max_channel_subscribers],
+      legacy: "push_max_channel_subscribers",
+      
+      group: "security",
+      tags: ['subscriber'],
+      value: "<number>",
+      default: "0 (unlimited)",
+      info: "Maximum concurrent subscribers to the channel on this Nchan server. Does not include subscribers on other Nchan instances when using a shared Redis server."
+  
+  nchan_channel_timeout [:main, :srv, :loc],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, :channel_timeout],
+      legacy: "push_channel_timeout",
+      
+      group: "development",
+      info: "Amount of time an empty channel hangs around. Don't mess with this setting unless you know what you are doing!"
+  
+  nchan_storage_engine [:main, :srv, :loc],
+      :nchan_set_storage_engine, 
+      [:loc_conf, :storage_engine],
+      
+      group: "development",
+      value: ["memory", "redis"],
+      default: "memory",
+      info: "Development directive to completely replace default storage engine. Don't use unless you are an Nchan developer."
+  
+  nchan_benchmark [:loc],
+      :nchan_benchmark_directive,
+      [:loc_conf],
+      group: "development",
+      undocumented: true,
+      args: 0
+  nchan_benchmark_time [:loc],
+      :ngx_conf_set_sec_slot,
+      [:loc_conf, "benchmark.time"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_messages_per_channel_per_minute [:loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, "benchmark.msgs_per_minute"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_message_padding_bytes [:loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, "benchmark.msg_padding"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_channels [:loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, "benchmark.channels"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_subscribers_per_channel [:loc],
+      :ngx_conf_set_num_slot,
+      [:loc_conf, "benchmark.subscribers_per_channel"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_subscriber_distribution [:loc],
+      :nchan_benchmark_subscriber_distribution_directive,
+      [:loc_conf, "benchmark.subscriber_distribution"],
+      group: "development",
+      undocumented: true
+  nchan_benchmark_publisher_distribution [:loc],
+      :nchan_benchmark_publisher_distribution_directive,
+      [:loc_conf, "benchmark.publisher_distribution"],
+      group: "development",
+      undocumented: true
+
+  
+  push_min_message_buffer_length [:srv, :loc, :if],
+      :nchan_ignore_obsolete_setting,
+      :loc_conf,
+      undocumented: true,
+      group: "obsolete"
+  
+  push_subscriber_concurrency [:srv, :loc, :if],
+      :nchan_ignore_subscriber_concurrency,
+      :loc_conf,
+      undocumented: true,
+      group: "obsolete"
+  
+end
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_config_commands.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_config_commands.c
new file mode 100644
index 0000000..793c549
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_config_commands.c
@@ -0,0 +1,1046 @@
+//AUTOGENERATED, do not edit! see nchan_commands.rb
+static ngx_conf_post_t nchan_redis_namespace__post_handler = {
+  ngx_conf_process_redis_namespace_slot
+};
+
+static ngx_command_t  nchan_commands[] = {
+    { ngx_string("nchan_channel_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_pubsub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_pubsub_channel_id"), //alt for nchan_channel_id
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_pubsub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_publisher_channel_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_pub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_pub_channel_id"), //alt for nchan_publisher_channel_id
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_pub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_publisher_upstream_request"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, publisher_upstream_request_url),
+    NULL } ,
+
+  { ngx_string("nchan_deflate_message_for_websocket"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_compression_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_channel_id_split_delimiter"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_id_split_delimiter),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_channel_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_sub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_sub_channel_id"), //alt for nchan_subscriber_channel_id
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    nchan_set_sub_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_pubsub"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6,
+    nchan_pubsub_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_pubsub_location"), //alt for nchan_pubsub
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6,
+    nchan_pubsub_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_info"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
+    nchan_subscriber_info_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_info_string"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_info_string),
+    NULL } ,
+
+  { ngx_string("nchan_longpoll_multipart_response"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_set_longpoll_multipart,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, longpoll_multimsg),
+    NULL } ,
+
+  { ngx_string("nchan_eventsource_event"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_event),
+    NULL } ,
+
+  { ngx_string("nchan_eventsource_ping_comment"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot_no_newlines,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.comment),
+    NULL } ,
+
+  { ngx_string("nchan_eventsource_ping_event"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot_no_newlines,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.event),
+    NULL } ,
+
+  { ngx_string("nchan_eventsource_ping_data"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot_no_newlines,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.data),
+    NULL } ,
+
+  { ngx_string("nchan_eventsource_ping_interval"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, eventsource_ping.interval),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
+    nchan_subscriber_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("push_subscriber"), //legacy for nchan_subscriber
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
+    nchan_subscriber_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_subscriber_location"), //alt for nchan_subscriber
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
+    nchan_subscriber_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_compound_etag_message_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, msg_in_etag_only),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_message_id_custom_etag_header"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, custom_msgtag_header),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_last_message_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5,
+    nchan_subscriber_last_message_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_http_raw_stream_separator"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_set_raw_subscriber_separator,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_http_raw_stream_separator),
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_first_message"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_subscriber_first_message_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_websocket_ping_interval"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, websocket_ping_interval),
+    NULL } ,
+
+  { ngx_string("nchan_websocket_client_heartbeat"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE2,
+    nchan_websocket_heartbeat_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, websocket_heartbeat),
+    NULL } ,
+
+  { ngx_string("nchan_publisher"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    nchan_publisher_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("push_publisher"), //legacy for nchan_publisher
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    nchan_publisher_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("nchan_publisher_location"), //alt for nchan_publisher
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    nchan_publisher_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_subscriber_timeout"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_timeout),
+    NULL } ,
+  { ngx_string("push_subscriber_timeout"), //legacy for nchan_subscriber_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscriber_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_authorize_request"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, authorize_request_url),
+    NULL } ,
+
+  { ngx_string("nchan_subscribe_request"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscribe_request_url),
+    NULL } ,
+
+  { ngx_string("nchan_unsubscribe_request"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_unsubscribe_request_url,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, unsubscribe_request_url),
+    NULL } ,
+
+  { ngx_string("nchan_message_temp_path"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_path_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, message_temp_path),
+    NULL } ,
+
+  { ngx_string("nchan_store_messages"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_store_messages_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("push_store_messages"), //legacy for nchan_store_messages
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_store_messages_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_shared_memory_size"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, shm_size),
+    NULL } ,
+  { ngx_string("push_max_reserved_memory"), //legacy for nchan_shared_memory_size
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, shm_size),
+    NULL } ,
+  { ngx_string("nchan_max_reserved_memory"), //legacy for nchan_shared_memory_size
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, shm_size),
+    NULL } ,
+
+  { ngx_string("nchan_permessage_deflate_compression_level"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_level_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_permessage_deflate_compression_strategy"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_strategy_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_permessage_deflate_compression_window"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_window_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_permessage_deflate_compression_memlevel"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    nchan_conf_deflate_compression_memlevel_directive,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_redis_url"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_url,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.url),
+    NULL } ,
+
+  { ngx_string("nchan_redis_pass"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_upstream_pass,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis),
+    NULL } ,
+
+  { ngx_string("nchan_redis_pass_inheritable"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.upstream_inheritable),
+    NULL } ,
+
+  { ngx_string("nchan_redis_publish_msgpacked_max_size"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_size_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, redis_publish_message_msgkey_size),
+    NULL } ,
+
+  { ngx_string("nchan_redis_discovered_ip_range_blacklist"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3|NGX_CONF_TAKE4|NGX_CONF_TAKE5|NGX_CONF_TAKE6|NGX_CONF_TAKE7,
+    ngx_conf_set_redis_ip_blacklist,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_redis_server"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    ngx_conf_upstream_redis_server,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_redis_storage_mode"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_redis_storage_mode_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.storage_mode),
+    NULL } ,
+
+  { ngx_string("nchan_redis_nostore_fastpublish"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.nostore_fastpublish),
+    NULL } ,
+
+  { ngx_string("nchan_redis_username"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.username),
+    NULL } ,
+
+  { ngx_string("nchan_redis_password"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.password),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.enabled),
+    NULL } ,
+  { ngx_string("nchan_redis_tls"), //alt for nchan_redis_ssl
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.enabled),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_client_certificate"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.client_certificate),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_client_certificate"), //alt for nchan_redis_ssl_client_certificate
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.client_certificate),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_client_certificate_key"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.client_certificate_key),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_client_certificate"), //alt for nchan_redis_ssl_client_certificate_key
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.client_certificate_key),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_server_name"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.server_name),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_server_name"), //alt for nchan_redis_ssl_server_name
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.server_name),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_trusted_certificate"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_trusted_certificate"), //alt for nchan_redis_ssl_trusted_certificate
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_trusted_certificate_path"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate_path),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_trusted_certificate_path"), //alt for nchan_redis_ssl_trusted_certificate_path
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.trusted_certificate_path),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_ciphers"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_ciphers"), //alt for nchan_redis_ssl_ciphers
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ssl_verify_certificate"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
+    NULL } ,
+  { ngx_string("nchan_redis_tls_verify_certificate"), //alt for nchan_redis_ssl_verify_certificate
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.tls.ciphers),
+    NULL } ,
+
+  { ngx_string("nchan_use_redis"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_enable_redis,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.url_enabled),
+    NULL } ,
+
+  { ngx_string("nchan_redis_ping_interval"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.ping_interval),
+    NULL } ,
+
+  { ngx_string("nchan_redis_load_scripts_unconditionally"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.load_scripts_unconditionally),
+    NULL } ,
+
+  { ngx_string("nchan_redis_accurate_subscriber_count"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.accurate_subscriber_count),
+    NULL } ,
+
+  { ngx_string("nchan_redis_wait_after_connecting"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_obsolete_setting,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_redis_connect_timeout"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.node_connect_timeout),
+    NULL } ,
+  { ngx_string("nchan_redis_node_connect_timeout"), //alt for nchan_redis_connect_timeout
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.node_connect_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_connect_timeout"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_connect_timeout),
+    NULL } ,
+  { ngx_string("nchan_redis_node_connect_timeout"), //alt for nchan_redis_cluster_connect_timeout
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_connect_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_max_failing_time"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_max_failing_msec),
+    NULL } ,
+
+  { ngx_string("nchan_redis_reconnect_delay"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.reconnect_delay.min),
+    NULL } ,
+  { ngx_string("nchan_redis_reconnect_delay_min"), //alt for nchan_redis_reconnect_delay
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.reconnect_delay.min),
+    NULL } ,
+
+  { ngx_string("nchan_redis_reconnect_delay_jitter"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_jitter,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.reconnect_delay.jitter_multiplier),
+    NULL } ,
+
+  { ngx_string("nchan_redis_reconnect_delay_backoff"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_exponential_backoff,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.reconnect_delay.backoff_multiplier),
+    NULL } ,
+
+  { ngx_string("nchan_redis_reconnect_delay_max"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.reconnect_delay.max),
+    NULL } ,
+
+  { ngx_string("nchan_redis_idle_channel_keepalive_safety_margin"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.idle_channel_ttl_safety_margin),
+    NULL } ,
+
+  { ngx_string("nchan_redis_idle_channel_keepalive_min"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.idle_channel_ttl.min),
+    NULL } ,
+
+  { ngx_string("nchan_redis_idle_channel_keepalive_jitter"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_jitter,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.idle_channel_ttl.jitter_multiplier),
+    NULL } ,
+
+  { ngx_string("nchan_redis_idle_channel_keepalive_backoff"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_exponential_backoff,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.idle_channel_ttl.backoff_multiplier),
+    NULL } ,
+
+  { ngx_string("nchan_redis_idle_channel_keepalive_max"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.idle_channel_ttl.max),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_check_interval_min"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_check_interval.min),
+    NULL } ,
+  { ngx_string("nchan_redis_cluster_check_interval"), //alt for nchan_redis_cluster_check_interval_min
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_check_interval.min),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_check_interval_jitter"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_jitter,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_check_interval.jitter_multiplier),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_check_interval_backoff"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_exponential_backoff,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_check_interval.backoff_multiplier),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_check_interval_max"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_check_interval.max),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_recovery_delay"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_recovery_delay.min),
+    NULL } ,
+  { ngx_string("nchan_redis_cluster_recovery_delay_min"), //alt for nchan_redis_cluster_recovery_delay
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_recovery_delay.min),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_recovery_delay_jitter"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_jitter,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_recovery_delay.jitter_multiplier),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_recovery_delay_backoff"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_exponential_backoff,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_recovery_delay.backoff_multiplier),
+    NULL } ,
+
+  { ngx_string("nchan_redis_cluster_recovery_delay_max"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.cluster_recovery_delay.max),
+    NULL } ,
+
+  { ngx_string("nchan_redis_command_timeout"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.command_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_redis_retry_commands"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.retry_commands),
+    NULL } ,
+
+  { ngx_string("nchan_redis_retry_commands_max_wait"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.retry_commands_max_wait),
+    NULL } ,
+
+  { ngx_string("nchan_redis_subscribe_weights"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1|NGX_CONF_TAKE2,
+    ngx_conf_set_redis_subscribe_weights,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_redis_optimize_target"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_obsolete_setting,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_redis_namespace"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_UPS_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_str_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.namespace),
+    &nchan_redis_namespace__post_handler } ,
+
+  { ngx_string("nchan_redis_fakesub_timer_interval"),
+    NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_msec_slot,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(nchan_main_conf_t, redis_fakesub_timer_interval),
+    NULL } ,
+
+  { ngx_string("nchan_redis_idle_channel_cache_timeout"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis_idle_channel_cache_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_redis_upstream_stats"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_redis_stats_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, redis.stats.upstream_name),
+    NULL } ,
+
+  { ngx_string("nchan_redis_upstream_stats_enabled"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.stats.enabled),
+    NULL } ,
+
+  { ngx_string("nchan_redis_upstream_stats_disconnected_timeout"),
+    NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_SRV_CONF_OFFSET,
+    offsetof(nchan_srv_conf_t, redis.stats.max_detached_time_sec),
+    NULL } ,
+
+  { ngx_string("nchan_message_timeout"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_timeout,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, message_timeout),
+    NULL } ,
+  { ngx_string("push_message_timeout"), //legacy for nchan_message_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_timeout,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, message_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_message_buffer_length"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_buffer_length,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_messages),
+    NULL } ,
+  { ngx_string("push_max_message_buffer_length"), //legacy for nchan_message_buffer_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_buffer_length,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_messages),
+    NULL } ,
+  { ngx_string("push_message_buffer_length"), //legacy for nchan_message_buffer_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_buffer_length,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_messages),
+    NULL } ,
+  { ngx_string("nchan_message_max_buffer_length"), //alt for nchan_message_buffer_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_buffer_length,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_messages),
+    NULL } ,
+
+  { ngx_string("nchan_subscribe_existing_channels_only"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscribe_only_existing_channel),
+    NULL } ,
+  { ngx_string("push_authorized_channels_only"), //legacy for nchan_subscribe_existing_channels_only
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, subscribe_only_existing_channel),
+    NULL } ,
+
+  { ngx_string("nchan_access_control_allow_origin"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, allow_origin),
+    NULL } ,
+
+  { ngx_string("nchan_access_control_allow_credentials"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, allow_credentials),
+    NULL } ,
+
+  { ngx_string("nchan_channel_group"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_group),
+    NULL } ,
+  { ngx_string("push_channel_group"), //legacy for nchan_channel_group
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_group),
+    NULL } ,
+
+  { ngx_string("nchan_channel_group_accounting"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_flag_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.enable_accounting),
+    NULL } ,
+
+  { ngx_string("nchan_group_location"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS|NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3,
+    nchan_group_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_group_max_channels"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_channels),
+    NULL } ,
+
+  { ngx_string("nchan_group_max_messages"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_messages),
+    NULL } ,
+
+  { ngx_string("nchan_group_max_messages_memory"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_messages_shm_bytes),
+    NULL } ,
+
+  { ngx_string("nchan_group_max_messages_disk"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_messages_file_bytes),
+    NULL } ,
+
+  { ngx_string("nchan_group_max_subscribers"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, group.max_subscribers),
+    NULL } ,
+
+  { ngx_string("nchan_channel_events_channel_id"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_set_channel_events_channel_id,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_stub_status"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
+    nchan_stub_status_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_channel_event_string"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    ngx_http_set_complex_value_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_event_string),
+    NULL } ,
+
+  { ngx_string("nchan_max_channel_id_length"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_id_length),
+    NULL } ,
+  { ngx_string("push_max_channel_id_length"), //legacy for nchan_max_channel_id_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_id_length),
+    NULL } ,
+
+  { ngx_string("nchan_max_channel_subscribers"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_subscribers),
+    NULL } ,
+  { ngx_string("push_max_channel_subscribers"), //legacy for nchan_max_channel_subscribers
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, max_channel_subscribers),
+    NULL } ,
+
+  { ngx_string("nchan_channel_timeout"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_timeout),
+    NULL } ,
+  { ngx_string("push_channel_timeout"), //legacy for nchan_channel_timeout
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, channel_timeout),
+    NULL } ,
+
+  { ngx_string("nchan_storage_engine"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_storage_engine,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, storage_engine),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS,
+    nchan_benchmark_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_time"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_sec_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.time),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_messages_per_channel_per_minute"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.msgs_per_minute),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_message_padding_bytes"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.msg_padding),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_channels"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.channels),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_subscribers_per_channel"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    ngx_conf_set_num_slot,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.subscribers_per_channel),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_subscriber_distribution"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_benchmark_subscriber_distribution_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.subscriber_distribution),
+    NULL } ,
+
+  { ngx_string("nchan_benchmark_publisher_distribution"),
+    NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_benchmark_publisher_distribution_directive,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(nchan_loc_conf_t, benchmark.publisher_distribution),
+    NULL } ,
+
+  { ngx_string("push_min_message_buffer_length"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_obsolete_setting,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+  { ngx_string("push_subscriber_concurrency"),
+    NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+    nchan_ignore_subscriber_concurrency,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
+
+  ngx_null_command
+};
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.c
new file mode 100644
index 0000000..52b0456
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.c
@@ -0,0 +1,97 @@
+#include <ngx_http.h>
+#include "nchan_defs.h"
+
+//string constants
+//headers
+const  ngx_str_t NCHAN_HEADER_ETAG = ngx_string("Etag");
+const  ngx_str_t NCHAN_HEADER_IF_NONE_MATCH = ngx_string("If-None-Match");
+const  ngx_str_t NCHAN_HEADER_VARY = ngx_string("Vary");
+const  ngx_str_t NCHAN_HEADER_ALLOW = ngx_string("Allow");
+const  ngx_str_t NCHAN_HEADER_CACHE_CONTROL = ngx_string("Cache-Control");
+const  ngx_str_t NCHAN_HEADER_PRAGMA = ngx_string("Pragma");
+const  ngx_str_t NCHAN_HEADER_ORIGIN = ngx_string("Origin");
+
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS = ngx_string("Access-Control-Allow-Headers");
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS = ngx_string("Access-Control-Allow-Methods");
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN = ngx_string("Access-Control-Allow-Origin");
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS = ngx_string("Access-Control-Expose-Headers");
+const  ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS = ngx_string("Access-Control-Allow-Credentials");
+
+const  ngx_str_t NCHAN_HEADER_EVENTSOURCE_EVENT = ngx_string("X-EventSource-Event");
+
+//websocket headers
+
+const ngx_str_t NCHAN_HEADER_CONNECTION = ngx_string("Connection");
+const ngx_str_t NCHAN_HEADER_UPGRADE = ngx_string("Upgrade");
+const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_KEY = ngx_string("Sec-WebSocket-Key");
+const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT = ngx_string("Sec-WebSocket-Accept");
+const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_VERSION = ngx_string("Sec-WebSocket-Version");
+const ngx_str_t NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL = ngx_string("Sec-WebSocket-Protocol");
+const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS = ngx_string("Sec-WebSocket-Extensions");
+
+//and some wobsockety values
+const ngx_str_t NCHAN_UPGRADE = ngx_string("Upgrade");
+const ngx_str_t NCHAN_WEBSOCKET = ngx_string("websocket");
+
+
+//header values
+const  ngx_str_t NCHAN_CACHE_CONTROL_VALUE = ngx_string("no-cache");
+
+//status strings
+const  ngx_str_t NCHAN_HTTP_STATUS_101 = ngx_string("101 Switching Protocols");
+const  ngx_str_t NCHAN_HTTP_STATUS_204 = ngx_string("204 No Content");
+const  ngx_str_t NCHAN_HTTP_STATUS_304 = ngx_string("304 Not Modified");
+const  ngx_str_t NCHAN_HTTP_STATUS_400 = ngx_string("400 Bad Request");
+const  ngx_str_t NCHAN_HTTP_STATUS_408 = ngx_string("408 Request Timeout");
+const  ngx_str_t NCHAN_HTTP_STATUS_409 = ngx_string("409 Conflict");
+const  ngx_str_t NCHAN_HTTP_STATUS_410 = ngx_string("410 Gone");
+
+//other stuff
+const  ngx_str_t NCHAN_SUBSCRIBER_TIMEOUT= ngx_string("Subscriber Timeout");
+const  ngx_str_t NCHAN_ANYSTRING= ngx_string("*");
+const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_GROUP_HEADERS = ngx_string("Accept, Content-Type");
+const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS = ngx_string("Content-Type");
+const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS = ngx_string("If-None-Match, If-Modified-Since, Content-Type, Cache-Control, X-EventSource-Event");
+const  ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBSUB_HEADERS = ngx_string("If-None-Match, If-Modified-Since, Content-Type, Cache-Control, X-EventSource-Event");
+const  ngx_str_t NCHAN_ALLOW_GET_POST_PUT_DELETE= ngx_string("GET, POST, PUT, DELETE");
+const  ngx_str_t NCHAN_ALLOW_GET= ngx_string("GET");
+const  ngx_str_t NCHAN_ALLOW_GET_POST_DELETE= ngx_string("GET, POST, DELETE");
+
+const  ngx_str_t NCHAN_VARY_HEADER_VALUE = ngx_string("If-None-Match, If-Modified-Since");
+const  ngx_str_t NCHAN_MSG_RESPONSE_ALLOWED_HEADERS = ngx_string("Last-Modified, Etag, Content-Type");
+const  char *NCHAN_MSG_RESPONSE_ALLOWED_CUSTOM_ETAG_HEADERS_STRF = "Last-Modified, %V, Content-Type";
+
+const ngx_str_t  NCHAN_CONTENT_TYPE_TEXT_PLAIN = ngx_string("text/plain");
+
+const ngx_str_t NCHAN_CHANNEL_INFO_PLAIN = ngx_string(
+  "queued messages: %ui" CRLF
+  "last requested: %d sec. ago" CRLF
+  "active subscribers: %ui" CRLF
+  "last message id: %V" 
+  "\0");
+
+const ngx_str_t NCHAN_CHANNEL_INFO_JSON = ngx_string(
+  "{\"messages\": %ui, "
+  "\"requested\": %d, "
+  "\"subscribers\": %ui, "
+  "\"last_message_id\": \"%V\" }"
+  "\0");
+
+const ngx_str_t NCHAN_CHANNEL_INFO_XML = ngx_string(
+  "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" CRLF
+  "<channel>" CRLF
+  "  <messages>%ui</messages>" CRLF
+  "  <requested>%d</requested>" CRLF
+  "  <subscribers>%ui</subscribers>" CRLF
+  "  <last_message_id>%V</last_message_id>" CRLF
+  "</channel>"
+  "\0");
+
+const ngx_str_t NCHAN_CHANNEL_INFO_YAML = ngx_string(
+  "---" CRLF
+  "messages: %ui" CRLF
+  "requested: %d" CRLF
+  "subscribers: %ui" CRLF
+  "last_message_id: \"%V\"" CRLF
+  CRLF
+  "\0");
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.h
new file mode 100644
index 0000000..f0b8284
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_defs.h
@@ -0,0 +1,150 @@
+#ifndef NCHAN_DEFS_H
+#define NCHAN_DEFS_H
+
+
+#define NCHAN_DEFAULT_SHM_SIZE 134217728 //128 megs
+#define NCHAN_DEFAULT_MESSAGE_TIMEOUT 3600
+#define NCHAN_DEFAULT_REDIS_IDLE_CHANNEL_CACHE_TIMEOUT 30
+#define NCHAN_DEFAULT_SUBSCRIBER_TIMEOUT 0  //default: never timeout
+#define NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC 10000
+#define NCHAN_DEFAULT_REDIS_CLUSTER_CONNECT_TIMEOUT_MSEC 15000
+#define NCHAN_DEFAULT_REDIS_CLUSTER_MAX_FAILING_TIME_MSEC 30000
+#define NCHAN_DEFAULT_REDIS_COMMAND_TIMEOUT_MSEC 5000
+
+#define NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_MIN_MSEC 1000
+#define NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_BACKOFF_MULTIPLIER 2
+#define NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_JITTER_MULTIPLIER 0.2
+#define NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_MAX_MSEC 30000
+
+#define NCHAN_REDIS_DEFAULT_RECONNECT_DELAY_MIN_MSEC 500
+#define NCHAN_REDIS_DEFAULT_RECONNECT_DELAY_BACKOFF_MULTIPLIER 0.5
+#define NCHAN_REDIS_DEFAULT_RECONNECT_DELAY_JITTER_MULTIPLIER 0.1
+#define NCHAN_REDIS_DEFAULT_RECONNECT_DELAY_MAX_MSEC 10000
+
+#define NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY_MIN_MSEC 100
+#define NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY_BACKOFF_MULTIPLIER 0.5
+#define NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY_JITTER_MULTIPLIER 0.5
+#define NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY_MAX_MSEC 2000
+
+#define NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL_MIN_MSEC 600000
+#define NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL_BACKOFF_MULTIPLIER 1
+#define NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL_JITTER_MULTIPLIER 1
+#define NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL_MAX_MSEC 604800000
+
+#define NCHAN_REDIS_DEFAULT_STATS_MAX_DETACHED_TIME_SEC 300
+
+#define NCHAN_REDIS_IDLE_CHANNEL_TTL_SAFETY_MARGIN_MSEC 60000
+
+#define NCHAN_DEFAULT_REDIS_CAN_RETRY_COMMANDS 1
+#define NCHAN_DEFAULT_REDIS_RETRY_COMMANDS_MAX_WAIT_MSEC 500
+
+
+//(liucougar: this is a bit confusing, but it is what's the default behavior before this option is introducecd)
+#define NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL 0
+
+#define NCHAN_DEFAULT_CHANNEL_TIMEOUT 5 //default: timeout in 5 seconds
+
+#define NCHAN_DEFAULT_MIN_MESSAGES 1
+#define NCHAN_DEFAULT_MAX_MESSAGES 10
+
+#define NCHAN_SUBSCRIBER_DEFAULT_FIRST_MESSAGE 1
+#define NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET 4096
+
+#define NCHAN_MAX_CHANNEL_ID_LENGTH 1024 //bytes
+
+#define NCHAN_META_CHANNEL_MAX_MESSAGES 100
+#define NCHAN_META_CHANNEL_MESSAGE_TTL 10
+#define NCHAN_META_CHANNEL_TIMEOUT 30
+
+#ifndef NGX_HTTP_REQUEST_TIMEOUT
+#define NGX_HTTP_REQUEST_TIMEOUT 408
+#endif
+
+#ifndef NGX_HTTP_CONFLICT
+#define NGX_HTTP_CONFLICT 409
+#endif
+
+#ifndef NGX_HTTP_SWITCHING_PROTOCOLS
+#define NGX_HTTP_SWITCHING_PROTOCOLS       101
+#endif
+
+#ifndef NGX_HTTP_GONE
+#define NGX_HTTP_GONE 410
+#endif
+
+#ifndef NGX_HTTP_CREATED
+#define NGX_HTTP_CREATED 201
+#endif
+
+#ifndef NGX_HTTP_ACCEPTED
+#define NGX_HTTP_ACCEPTED 202
+#endif
+
+#define NCHAN_MESSAGE_RECEIVED  9000
+#define NCHAN_MESSAGE_QUEUED    9001
+
+#define NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST 1337
+
+#define NCHAN_SUBSCRIBER_INFO_CHANNEL_ID_BUFFER_SIZE 64
+
+extern const ngx_str_t NCHAN_HEADER_ETAG;
+extern const ngx_str_t NCHAN_HEADER_IF_NONE_MATCH;
+extern const ngx_str_t NCHAN_HEADER_VARY;
+extern const ngx_str_t NCHAN_HEADER_ALLOW;
+extern const ngx_str_t NCHAN_HEADER_CACHE_CONTROL;
+extern const ngx_str_t NCHAN_HEADER_PRAGMA;
+extern const ngx_str_t NCHAN_HEADER_ORIGIN;
+
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS;
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS;
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN;
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS;
+extern const ngx_str_t NCHAN_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS;
+
+extern const ngx_str_t NCHAN_HEADER_EVENTSOURCE_EVENT;
+
+extern const ngx_str_t NCHAN_HEADER_CONNECTION;
+extern const ngx_str_t NCHAN_HEADER_UPGRADE;
+extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_KEY;
+extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT;
+extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_VERSION;
+extern const ngx_str_t NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL;
+extern const ngx_str_t NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS;
+
+//header values
+extern const  ngx_str_t NCHAN_CACHE_CONTROL_VALUE;
+
+//status strings
+extern const  ngx_str_t NCHAN_HTTP_STATUS_101;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_204;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_304;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_400;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_408;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_409;
+extern const  ngx_str_t NCHAN_HTTP_STATUS_410;
+
+//other stuff
+
+extern const ngx_str_t NCHAN_UPGRADE;
+extern const ngx_str_t NCHAN_SUBSCRIBER_TIMEOUT;
+extern const ngx_str_t NCHAN_WEBSOCKET;
+extern const ngx_str_t NCHAN_ANYSTRING;
+extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS;
+extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS;
+extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_PUBSUB_HEADERS;
+extern const ngx_str_t NCHAN_ACCESS_CONTROL_ALLOWED_GROUP_HEADERS;
+extern const ngx_str_t NCHAN_ALLOW_GET_POST_PUT_DELETE;
+extern const ngx_str_t NCHAN_ALLOW_GET_POST_DELETE;
+extern const ngx_str_t NCHAN_ALLOW_GET;
+extern const ngx_str_t NCHAN_VARY_HEADER_VALUE;
+extern const ngx_str_t NCHAN_MSG_RESPONSE_ALLOWED_HEADERS;
+extern const char *NCHAN_MSG_RESPONSE_ALLOWED_CUSTOM_ETAG_HEADERS_STRF;
+extern const ngx_str_t NCHAN_CONTENT_TYPE_TEXT_PLAIN;
+extern const ngx_str_t NCHAN_CHANNEL_INFO_PLAIN;
+extern const ngx_str_t NCHAN_CHANNEL_INFO_JSON;
+extern const ngx_str_t NCHAN_CHANNEL_INFO_XML;
+extern const ngx_str_t NCHAN_CHANNEL_INFO_YAML;
+
+#define NCHAN_REDIS_DEFAULT_URL "redis://127.0.0.1:6379"
+
+#endif /* NCHAN_DEFS_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.c
new file mode 100644
index 0000000..da8de53
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.c
@@ -0,0 +1,1336 @@
+/*
+ *  Written by Leo Ponomarev 2009-2015
+ */
+
+#include <nchan_module.h>
+#include <util/nchan_subrequest.h>
+#include <assert.h>
+
+#include <subscribers/longpoll.h>
+#include <subscribers/intervalpoll.h>
+#include <subscribers/eventsource.h>
+#include <subscribers/http-chunked.h>
+#include <subscribers/http-multipart-mixed.h>
+#include <subscribers/http-raw-stream.h>
+#include <subscribers/websocket.h>
+#include <subscribers/benchmark.h>
+#include <store/memory/store.h>
+#include <store/redis/store.h>
+#include <store/redis/redis_nodeset.h>
+
+#include <nchan_setup.c>
+
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
+
+
+#if FAKESHARD
+#include <store/memory/ipc.h>
+#include <store/memory/shmem.h>
+//#include <store/memory/store-private.h> //for debugging
+#endif
+#include <util/nchan_output.h>
+#include <nchan_websocket_publisher.h>
+
+ngx_int_t           nchan_worker_processes;
+int                 nchan_stub_status_enabled = 0;
+int                 nchan_redis_stats_enabled = 0;
+
+
+static void nchan_publisher_body_handler(ngx_http_request_t *r);
+static void nchan_publisher_unavailable_body_handler(ngx_http_request_t *r);
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+//#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+//#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "NCHAN:" fmt, ##args)
+
+typedef struct {
+  ngx_http_request_t    *r;
+  ngx_http_cleanup_t    *cln;
+} safe_request_ptr_t;
+static safe_request_ptr_t *nchan_set_safe_request_ptr(ngx_http_request_t *r);
+static ngx_http_request_t *nchan_get_safe_request_ptr(safe_request_ptr_t *pd);
+
+ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *r, channel_event_type_t event_type) {
+  static nchan_loc_conf_t            evcf_data;
+  static nchan_loc_conf_t           *evcf = NULL;
+  
+  static ngx_str_t group =           ngx_string("meta");
+  
+  static ngx_str_t evt_sub_enqueue = ngx_string("subscriber_enqueue");
+  static ngx_str_t evt_sub_dequeue = ngx_string("subscriber_dequeue");
+  static ngx_str_t evt_sub_recvmsg = ngx_string("subscriber_receive_message");
+  static ngx_str_t evt_sub_recvsts = ngx_string("subscriber_receive_status");
+  static ngx_str_t evt_chan_publish= ngx_string("channel_publish");
+  static ngx_str_t evt_chan_delete = ngx_string("channel_delete");
+
+  nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_http_complex_value_t  *cv = cf->channel_events_channel_id;
+  if(cv==NULL) {
+    //nothing to send
+    return NGX_OK;
+  }
+  
+  nchan_request_ctx_t       *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_str_t                  tmpid;
+  size_t                     sz;
+  ngx_str_t                 *id;
+  u_char                    *cur;
+  ngx_str_t                  evstr;
+  nchan_msg_t                msg;
+  
+  switch(event_type) {
+    case SUB_ENQUEUE:
+      ctx->channel_event_name = &evt_sub_enqueue;
+      break;
+    case SUB_DEQUEUE:
+      ctx->channel_event_name = &evt_sub_dequeue;
+      break;
+    case SUB_RECEIVE_MESSAGE:
+      ctx->channel_event_name = &evt_sub_recvmsg;
+      break;
+    case SUB_RECEIVE_STATUS:
+      ctx->channel_event_name = &evt_sub_recvsts;
+      break;
+    case CHAN_PUBLISH:
+      ctx->channel_event_name = &evt_chan_publish;
+      break;
+    case CHAN_DELETE:
+      ctx->channel_event_name = &evt_chan_delete;
+      break;
+  }
+  
+  //the id
+  ngx_http_complex_value(r, cv, &tmpid); 
+  sz = group.len + 1 + tmpid.len;
+  if((id = ngx_palloc(r->pool, sizeof(*id) + sz)) == NULL) {
+    nchan_log_request_error(r, "can't allocate space for legacy channel id");
+    return NGX_ERROR;
+  }
+  id->len = sz;
+  id->data = (u_char *)&id[1];
+  cur = id->data;  
+  ngx_memcpy(cur, group.data, group.len);
+  cur += group.len;
+  cur[0]='/';
+  cur++;
+  ngx_memcpy(cur, tmpid.data, tmpid.len);
+  
+  
+  //the event message
+  ngx_http_complex_value(r, cf->channel_event_string, &evstr);
+  
+  ngx_memzero(&msg, sizeof(msg));
+  
+  msg.buf.temporary = 1;
+  msg.buf.memory = 1;
+  msg.buf.last_buf = 1;
+  msg.buf.pos = evstr.data;
+  msg.buf.last = evstr.data + evstr.len;
+  msg.buf.start = msg.buf.pos;
+  msg.buf.end = msg.buf.last;
+  
+  msg.id.time = 0;
+  msg.id.tag.fixed[0] = 0;
+  msg.id.tagactive = 0;
+  msg.id.tagcount = 1;
+  msg.storage = NCHAN_MSG_STACK;
+  
+  if(evcf == NULL) {
+    evcf = &evcf_data;
+    ngx_memzero(evcf, sizeof(*evcf));
+
+    evcf->message_timeout = NCHAN_META_CHANNEL_MESSAGE_TTL;
+    evcf->max_messages = NCHAN_META_CHANNEL_MAX_MESSAGES;
+    evcf->complex_max_messages = NULL;
+    evcf->complex_message_timeout = NULL;
+    evcf->subscriber_first_message = 0;
+    evcf->channel_timeout = NCHAN_META_CHANNEL_TIMEOUT;
+  }
+  evcf->storage_engine = cf->storage_engine;
+  evcf->redis = cf->redis;
+  
+  evcf->storage_engine->publish(id, &msg, evcf, NULL, NULL);
+  
+  return NGX_OK;
+}
+
+#if FAKESHARD 
+static void memstore_sub_debug_start() {
+  #ifdef SUB_FAKE_WORKER
+  memstore_fakeprocess_push(SUB_FAKE_WORKER);
+  #else
+  memstore_fakeprocess_push_random();
+  #endif
+}
+static void memstore_sub_debug_end() {
+  memstore_fakeprocess_pop();
+}
+static void memstore_pub_debug_start() {
+  #ifdef PUB_FAKE_WORKER
+  memstore_fakeprocess_push(PUB_FAKE_WORKER);
+  #else
+  memstore_fakeprocess_push_random();
+  #endif
+}
+static void memstore_pub_debug_end() {
+  memstore_fakeprocess_pop();
+}
+#endif
+
+time_t nchan_loc_conf_message_timeout(nchan_loc_conf_t *cf) {
+  time_t                        timeout;
+  nchan_loc_conf_shared_data_t *shcf;
+  
+  if(!cf->complex_message_timeout) {
+    timeout = cf->message_timeout;
+  }
+  else {
+    shcf = memstore_get_conf_shared_data(cf);
+    timeout = shcf->message_timeout;
+  }
+  
+  return timeout != 0 ? timeout : 525600 * 60;
+}
+
+ngx_int_t nchan_loc_conf_max_messages(nchan_loc_conf_t *cf) {  
+  ngx_int_t                     num;
+  nchan_loc_conf_shared_data_t *shcf;
+  
+  if(!cf->complex_max_messages) {
+    num = cf->max_messages;
+  }
+  else {
+    shcf = memstore_get_conf_shared_data(cf);
+    num = shcf->max_messages;
+  }
+  
+  return num;
+}
+
+static ngx_int_t nchan_http_publisher_handler(ngx_http_request_t * r, void (*body_handler)(ngx_http_request_t *r)) {
+  ngx_int_t                       rc;
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  static ngx_str_t                publisher_name = ngx_string("http");
+  
+  if(ctx) ctx->publisher_type = &publisher_name;
+  
+  /* Instruct ngx_http_read_client_request_body to store the request
+     body entirely in a memory buffer or in a file */
+  r->request_body_in_single_buf = 1;
+  r->request_body_in_persistent_file = 1;
+  r->request_body_in_clean_file = 0;
+  r->request_body_file_log_level = 0;
+  
+  //don't buffer the request body --send it right on through
+  //r->request_body_no_buffering = 1;
+
+  rc = ngx_http_read_client_request_body(r, body_handler);
+  if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+    return rc;
+  }
+  return NGX_DONE;
+}
+
+ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r) {
+  ngx_buf_t           *b;
+  ngx_chain_t          out;
+  
+  nchan_stats_global_t global;
+  nchan_stats_worker_t worker;
+  
+  nchan_main_conf_t   *mcf = ngx_http_get_module_main_conf(r, ngx_nchan_module);
+  
+  float                shmem_used, shmem_max;
+  
+  char     *buf_fmt = "total published messages: %ui\n"
+                      "stored messages: %ui\n"
+                      "shared memory used: %fK\n"
+                      "shared memory limit: %fK\n"
+                      "channels: %ui\n"
+                      "subscribers: %ui\n"
+                      "redis pending commands: %ui\n"
+                      "redis connected servers: %ui\n"
+                      "redis unhealthy upstreams: %ui\n"
+                      "total redis commands sent: %ui\n"
+                      "total interprocess alerts received: %ui\n"
+                      "interprocess alerts in transit: %ui\n"
+                      "interprocess queued alerts: %ui\n"
+                      "total interprocess send delay: %ui\n"
+                      "total interprocess receive delay: %ui\n"
+                      "nchan version: %s\n";
+  
+  if ((b = ngx_pcalloc(r->pool, sizeof(*b) + 800)) == NULL) {
+    nchan_log_request_error(r, "Failed to allocate response buffer for nchan_stub_status.");
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  
+  shmem_used = (float )((float )nchan_get_used_shmem() / 1024.0);
+  shmem_max = (float )((float )mcf->shm_size / 1024.0);
+  
+  if(nchan_stats_get_all(&worker, &global) != NGX_OK) {
+    nchan_log_request_error(r, "Failed to get stub status stats.");
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  
+  b->start = (u_char *)&b[1];
+  b->pos = b->start;
+  
+  b->end = ngx_snprintf(b->start, 800, buf_fmt, global.total_published_messages, worker.messages, shmem_used, shmem_max, worker.channels, worker.subscribers, worker.redis_pending_commands, worker.redis_connected_servers, worker.redis_unhealthy_upstreams, global.total_redis_commands_sent, global.total_ipc_alerts_received, global.total_ipc_alerts_sent - global.total_ipc_alerts_received, worker.ipc_queue_size, global.total_ipc_send_delay, global.total_ipc_receive_delay, NCHAN_VERSION);
+  b->last = b->end;
+
+  b->memory = 1;
+  b->last_buf = 1;
+  
+  r->headers_out.status = NGX_HTTP_OK;
+  r->headers_out.content_type.len = sizeof("text/plain") - 1;
+  r->headers_out.content_type.data = (u_char *) "text/plain";
+  
+  r->headers_out.content_length_n = b->end - b->start;
+  ngx_http_send_header(r);
+  
+  out.buf = b;
+  out.next = NULL;
+  
+  return ngx_http_output_filter(r, &out);
+}
+
+static ngx_int_t redis_stats_callback(ngx_int_t rc, void *d, void *pd) {
+  redis_nodeset_command_stats_t *stats = d;
+  ngx_http_request_t            *r = pd;
+  ngx_str_t                      content_type_plain = ngx_string("text/plain");
+  ngx_str_t                      content_type_json = ngx_string("application/json");
+  
+  
+  if(stats->error) {
+    nchan_respond_cstring(r, NGX_HTTP_INTERNAL_SERVER_ERROR, &content_type_plain, stats->error, 1);
+    return NGX_OK;
+  }
+  
+  if(stats->count == 0 || stats->stats == NULL) {
+    nchan_respond_cstring(r, NGX_HTTP_INTERNAL_SERVER_ERROR, &content_type_plain, "weird error getting status data", 1);
+    return NGX_OK;
+  }
+  
+  ngx_chain_t *body = redis_nodeset_stats_response_body_chain_palloc(stats, r->pool);
+  if(!body) {
+    nchan_respond_cstring(r, NGX_HTTP_INTERNAL_SERVER_ERROR, &content_type_plain, "failed to allocate response body", 1);
+    return NGX_OK;
+  }
+  
+  r->headers_out.content_type = content_type_json;
+  nchan_respond_status(r, NGX_HTTP_OK, NULL, body, 1);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_redis_stats_handler(ngx_http_request_t *r) {
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  nchan_request_ctx_t    *ctx;
+  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
+  
+  ngx_str_t             nodeset_name;
+  
+  if(ngx_http_complex_value(r, cf->redis.stats.upstream_name, &nodeset_name) != NGX_OK) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  
+  ngx_int_t             rc = redis_nodeset_global_command_stats_palloc_async(&nodeset_name, r->pool, redis_stats_callback, r);
+  ngx_str_t             content_type_plain = ngx_string("text/plain");
+  
+  
+  ctx->request_ran_content_handler = 1;
+  
+  switch(rc) {
+    case NGX_ERROR:
+      return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    case NGX_DECLINED:
+      nchan_respond_sprintf(r, NGX_HTTP_NOT_FOUND, &content_type_plain, 0, "Redis upstream \"%V\" not found", &nodeset_name);
+      return NGX_OK;
+    case NGX_DONE:
+      r->main->count++; //hold that request!
+      return NGX_DONE;
+    default:
+      return rc;
+  }
+}
+
+static int nchan_parse_message_buffer_config(ngx_http_request_t *r, nchan_loc_conf_t *cf, char **err) {
+  ngx_str_t                      val;
+  nchan_loc_conf_shared_data_t  *shcf;
+  
+  if(!cf->complex_message_timeout && !cf->complex_max_messages) {
+    return 1;
+  }
+  
+  if(cf->complex_message_timeout) {
+    time_t    timeout;
+    if(ngx_http_complex_value(r, cf->complex_message_timeout, &val) != NGX_OK) {
+      nchan_log_request_error(r, "cannot evaluate nchan_message_timeout value");
+      *err = NULL;
+      return 0;
+    }
+    if(val.len == 0) {
+      *err = "missing nchan_message_timeout value";
+      nchan_log_request_error(r, "%s", *err);
+      return 0;
+    }
+    
+    if((timeout = ngx_parse_time(&val, 1)) == (time_t )NGX_ERROR) {
+      *err = "invalid nchan_message_timeout value";
+      nchan_log_request_error(r, "%s '%V'", *err, &val);
+      return 0;
+    }
+    
+    shcf = memstore_get_conf_shared_data(cf);
+    shcf->message_timeout = timeout;
+  }
+  if(cf->complex_max_messages) {
+    ngx_int_t                      num;
+    if(ngx_http_complex_value(r, cf->complex_max_messages, &val) != NGX_OK) {
+      nchan_log_request_error(r, "cannot evaluate nchan_message_buffer_length value");
+      *err = NULL;
+      return 0;
+    }
+    
+    if(val.len == 0) {
+      *err = "missing nchan_message_buffer_length value";
+      nchan_log_request_error(r, "%s", *err);
+      return 0;
+    }
+    
+    num = ngx_atoi(val.data, val.len);
+    if(num == NGX_ERROR || num < 0) {
+      *err = "invalid nchan_message_buffer_length value";
+      nchan_log_request_error(r, "%s %V", *err, &val);
+      return 0;
+    }
+    
+    shcf = memstore_get_conf_shared_data(cf);
+    shcf->max_messages = num;
+  }
+  return 1;
+}
+
+static ngx_int_t group_handler_callback(ngx_int_t status, nchan_group_t *group, ngx_http_request_t *r) {
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  if(!group) {
+    group = ngx_pcalloc(r->pool, sizeof(*group));
+  }
+  
+  if(!ctx->request_ran_content_handler) {
+    r->main->count--;
+    nchan_group_info(r, group);
+  }
+  else {
+    nchan_http_finalize_request(r, nchan_group_info(r, group));
+  }
+  
+  
+  
+  return NGX_OK;
+}
+
+
+static ngx_int_t parse_size_limit(u_char *data, size_t len) {
+  ngx_str_t  str;
+  str.data = data;
+  str.len = len;
+  return nchan_parse_size(&str);
+}
+
+static ngx_int_t set_group_num_limit(ngx_http_request_t *r, ngx_http_complex_value_t *cv, ngx_atomic_int_t *dst, ngx_int_t (*parsefunc)(u_char *, size_t), char *errstr) {
+  ngx_str_t               tmp;
+  ngx_int_t               num;
+  if(cv) {
+    ngx_http_complex_value(r, cv, &tmp);
+    if(tmp.len == 0) {
+      *dst = -1;
+      return 1;
+    }
+    else if((num = parsefunc(tmp.data, tmp.len)) == NGX_ERROR || num < 0) {
+      nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, errstr, 0);
+      return 0;
+    }
+    *dst = num;
+  }
+  else {
+    *dst = -1;
+  }
+  return 1;
+}
+
+static ngx_int_t parse_group_limits(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_group_limits_t *limits) {
+  set_group_num_limit(r, cf->group.max_channels, &limits->channels, ngx_atoi, "invalid nchan_group_max_channels value");
+  set_group_num_limit(r, cf->group.max_subscribers, &limits->subscribers, ngx_atoi, "invalid nchan_group_max_subscribers value");
+  set_group_num_limit(r, cf->group.max_messages, &limits->messages, ngx_atoi, "invalid nchan_group_max_messages value");
+  set_group_num_limit(r, cf->group.max_messages_shm_bytes, &limits->messages_shmem_bytes, parse_size_limit, "invalid nchan_group_max_messages_memory value");
+  set_group_num_limit(r, cf->group.max_messages_file_bytes, &limits->messages_file_bytes, parse_size_limit, "invalid nchan_group_max_messages_disk value");
+  
+  return r->headers_out.status != NGX_HTTP_FORBIDDEN ? NGX_OK : NGX_ERROR;
+}
+
+ngx_int_t nchan_group_handler(ngx_http_request_t *r) {
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  nchan_request_ctx_t    *ctx;
+  ngx_int_t               rc = NGX_DONE;
+  ngx_str_t              *group;
+  
+  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
+  
+  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
+    ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+    return NGX_ERROR;
+  }
+  
+  if(!cf->group.enable_accounting) {
+    nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Channel group accounting is disabled.", 0);
+    return NGX_OK;
+  }
+  
+  group = nchan_get_group_name(r, cf, ctx);
+  if(group == NULL) {
+    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "No group specified", 0);
+    return NGX_OK;
+  }
+  
+  switch(r->method) {
+    case NGX_HTTP_GET:
+      if(!cf->group.get) {
+        rc = nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+      }
+      r->main->count++;
+      cf->storage_engine->get_group(group, cf, (callback_pt )group_handler_callback, r);
+      
+      break;
+      
+    case NGX_HTTP_POST:
+      if(!cf->group.set) {
+        rc = nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+      }
+      
+      nchan_group_limits_t     limits;
+      
+      if(parse_group_limits(r, cf, &limits) != NGX_OK) {
+        return NGX_OK;
+      }
+      
+      r->main->count++;
+      cf->storage_engine->set_group_limits(group, cf, &limits, (callback_pt )group_handler_callback, r);
+      break;
+      
+    case NGX_HTTP_DELETE:
+      if(!cf->group.delete) {
+        rc = nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+      }
+      r->main->count++;
+      cf->storage_engine->delete_group(group, cf, (callback_pt )group_handler_callback, r);
+      break;
+      
+    case NGX_HTTP_OPTIONS:
+        rc= nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_GROUP_HEADERS, &NCHAN_ALLOW_GET_POST_DELETE);
+      break;
+  }
+  ctx->request_ran_content_handler = 1;
+  return rc;
+}
+
+static ngx_int_t nchan_subscriber_info_handler_continued(ngx_int_t, void *, void *);
+static void nchan_subscriber_info_publish_info_request_after_subscribing(subscriber_t *, void *);
+
+ngx_int_t nchan_subscriber_info_handler(ngx_http_request_t *r) {
+  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
+    ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+    return NGX_ERROR;
+  } 
+  
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  
+  nchan_request_ctx_t    *ctx;
+  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
+  
+  
+  if(r->upstream && r->upstream->headers_in.x_accel_redirect) {
+    nchan_recover_x_accel_redirected_request_method(r);
+  }
+  
+  if(!nchan_match_origin_header(r, cf, ctx)) {
+    nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+    ctx->request_ran_content_handler = 1;
+    return NGX_OK;
+  }
+  
+  if(cf->redis.enabled && !nchan_store_redis_ready(cf)) {
+    nchan_respond_status(r, NGX_HTTP_SERVICE_UNAVAILABLE, NULL, NULL, 0);
+    return NGX_OK;
+  }
+  
+  ngx_int_t rc = cf->storage_engine->get_subscriber_info_id(cf, nchan_subscriber_info_handler_continued, r);
+  //get_unique_request is expected to never complete in the current event loop cycle.
+  if(rc == NGX_ERROR) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  
+  r->main->count++; //hold that request!
+  ctx->request_ran_content_handler = 1;
+  return NGX_DONE;
+}
+
+static ngx_int_t nchan_subscriber_info_handler_continued(ngx_int_t rc, void *d, void *pd) {
+  ngx_http_request_t     *r = pd;
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  
+  uintptr_t               response_id = (uintptr_t )d;
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ctx->subscriber_info_response_id = response_id;
+  
+  if(rc == NGX_ERROR) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  if(r->method == NGX_HTTP_OPTIONS) {
+    nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS, &NCHAN_ALLOW_GET);
+    return NGX_ERROR;
+  }
+  
+  ngx_str_t              *channel_id = nchan_get_subscriber_info_response_channel_id(r, response_id);
+  if(channel_id == NULL) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  subscriber_t *(*sub_create)(ngx_http_request_t *r, nchan_msg_id_t *msg_id) = NULL;
+  
+  if(nchan_detect_websocket_request(r)) {
+    if(!cf->sub.websocket) {
+      nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+      return NGX_ERROR;
+    }
+    sub_create = websocket_subscriber_create;
+  }
+  else if(r->method != NGX_HTTP_GET) {
+    nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  else {
+    if(cf->sub.eventsource && nchan_detect_eventsource_request(r)) {
+      sub_create = eventsource_subscriber_create;
+    }
+    else if(cf->sub.http_chunked && nchan_detect_chunked_subscriber_request(r)) {
+      sub_create = http_chunked_subscriber_create;
+    }
+    else if(cf->sub.http_multipart && nchan_detect_multipart_subscriber_request(r)) {
+      sub_create = http_multipart_subscriber_create;
+    }
+    else if(cf->sub.poll) {
+      sub_create = intervalpoll_subscriber_create;
+    }
+    else if(cf->sub.http_raw_stream) {
+      sub_create = http_raw_stream_subscriber_create;
+    }
+    else if(cf->sub.longpoll) {
+      sub_create = longpoll_subscriber_create;
+    }
+  }
+  
+  if(!sub_create) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  nchan_msg_id_t *msg_id;
+  if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
+    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Message ID invalid", 0);
+    return NGX_ERROR;
+  }
+  
+  subscriber_t *sub;
+  if((sub = sub_create(r, msg_id)) == NULL) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  if(sub->fn->set_enqueue_callback(sub, nchan_subscriber_info_publish_info_request_after_subscribing, r) != NGX_OK) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  if(sub->fn->subscribe(sub, channel_id) != NGX_OK) {
+    nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+    return NGX_ERROR;
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t info_request_publish_callback(ngx_int_t status, void *d, void *pd) {
+  //whatever
+  return NGX_OK;
+}
+
+static void really_publish_info_request(void *pd) {
+  subscriber_t           *sub = pd;
+  ngx_http_request_t     *r = sub->request;
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_str_t              *channel_id;
+  if((channel_id = nchan_get_channel_id(r, PUB, 1))==NULL) {
+    sub->fn->respond_status(sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL);
+    return;
+  }
+  
+  cf->storage_engine->request_subscriber_info(channel_id, ctx->subscriber_info_response_id, cf, (callback_pt) &info_request_publish_callback, r);
+  nchan_stats_global_incr(total_published_messages, 1);
+}
+
+static void nchan_subscriber_info_publish_info_request_after_subscribing(subscriber_t *sub, void *pd) {
+  //publishing needs to happen AFTER this subscriber has enqueued, not during.
+  nchan_add_oneshot_timer(really_publish_info_request, sub, 0);
+}
+
+
+ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_str_t              *channel_id;
+  subscriber_t           *sub;
+  nchan_msg_id_t         *msg_id;
+  ngx_int_t               rc = NGX_DONE;
+  nchan_request_ctx_t    *ctx;
+  nchan_group_limits_t    group_limits;
+  
+  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
+    ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
+    return NGX_ERROR;
+  }  
+  
+  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
+
+  //X-Accel-Redirected requests get their method mangled to GET. De-mangle it if necessary
+  if(r->upstream && r->upstream->headers_in.x_accel_redirect) {
+    //yep, we got x-accel-redirected. what was the original method?...
+    nchan_recover_x_accel_redirected_request_method(r);
+  }
+  
+  if(!nchan_match_origin_header(r, cf, ctx)) {
+    goto forbidden;
+  }
+  
+  if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
+    goto bad_msgid;
+  }
+  
+  if(parse_group_limits(r, cf, &group_limits) == NGX_OK) {
+    // unless the group already exists, these limits may only be set after this incoming request.
+    // TODO: fix this, although that will lead to even gnarlier control flow.
+    cf->storage_engine->set_group_limits(nchan_get_group_name(r, cf, ctx), cf, &group_limits, NULL, NULL);
+  }
+  else {
+    // there was an error parsing group limit strings, and it has already been sent in the response. 
+    // just quit.
+    return NGX_OK;
+  }
+  
+  if(cf->redis.enabled && !nchan_store_redis_ready(cf)) {
+    //using redis, and it's not ready yet
+    if(r->method == NGX_HTTP_POST || r->method == NGX_HTTP_PUT) {
+      //discard request body before responding
+      nchan_http_publisher_handler(r, nchan_publisher_unavailable_body_handler);
+    }
+    else {
+      nchan_respond_status(r, NGX_HTTP_SERVICE_UNAVAILABLE, NULL, NULL, 0);
+    }
+    return NGX_OK;
+  }
+  
+  if(cf->pub.websocket || cf->pub.http) {
+    char *err;
+    if(!nchan_parse_message_buffer_config(r, cf, &err)) {
+      if(err) {
+        nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, err, 0);
+        return NGX_OK;
+      }
+      else {
+        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+        return NGX_OK;
+      }
+    }
+  }
+  
+  if(nchan_detect_websocket_request(r)) {
+    //want websocket?
+    if(cf->sub.websocket) {
+      //we prefer to subscribe
+      if((channel_id = nchan_get_channel_id(r, SUB, 1)) == NULL) {
+        return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
+      }
+      
+#if FAKESHARD
+      memstore_sub_debug_start();
+#endif
+      if(nchan_subscriber_get_msg_id(r) == NULL) {
+        goto bad_msgid;
+      }
+      if((sub = websocket_subscriber_create(r, msg_id)) == NULL) {
+        nchan_log_request_error(r, "unable to create websocket subscriber");
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+      }
+      if(sub->fn->subscribe(sub, channel_id) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+      }
+#if FAKESHARD      
+      memstore_sub_debug_end();
+#endif
+    }
+    else if(cf->pub.websocket) {
+      //no need to subscribe, but keep a connection open for publishing
+      nchan_create_websocket_publisher(r);
+    }
+    else goto forbidden;
+    return NGX_DONE;
+  }
+  else {
+    subscriber_t *(*sub_create)(ngx_http_request_t *r, nchan_msg_id_t *msg_id) = NULL;
+    
+    switch(r->method) {
+      case NGX_HTTP_GET:
+        if(cf->sub.eventsource && nchan_detect_eventsource_request(r)) {
+          sub_create = eventsource_subscriber_create;
+        }
+        else if(cf->sub.http_chunked && nchan_detect_chunked_subscriber_request(r)) {
+          sub_create = http_chunked_subscriber_create;
+        }
+        else if(cf->sub.http_multipart && nchan_detect_multipart_subscriber_request(r)) {
+          sub_create = http_multipart_subscriber_create;
+        }
+        else if(cf->sub.poll) {
+          sub_create = intervalpoll_subscriber_create;
+        }
+        else if(cf->sub.http_raw_stream) {
+          sub_create = http_raw_stream_subscriber_create;
+        }
+        else if(cf->sub.longpoll) {
+          sub_create = longpoll_subscriber_create;
+        }
+        else if(cf->pub.http) {
+          nchan_http_publisher_handler(r, nchan_publisher_body_handler);
+        }
+        else {
+          goto forbidden;
+        }
+        
+        if(sub_create) {
+          if((channel_id = nchan_get_channel_id(r, SUB, 1)) == NULL) {
+            return r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR;
+          }
+#if FAKESHARD
+          memstore_sub_debug_start();
+#endif
+          if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
+            goto bad_msgid;
+          }
+          
+          if((sub = sub_create(r, msg_id)) == NULL) {
+            nchan_log_request_error(r, "unable to create subscriber");
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+          }
+          
+          if(sub->fn->subscribe(sub, channel_id) != NGX_OK) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+          }
+#if FAKESHARD
+          memstore_sub_debug_end();
+#endif
+        }
+        
+        break;
+      
+      case NGX_HTTP_POST:
+      case NGX_HTTP_PUT:
+        if(cf->pub.http) {
+          nchan_http_publisher_handler(r, nchan_publisher_body_handler);
+        }
+        else goto forbidden;
+        break;
+      
+      case NGX_HTTP_DELETE:
+        if(cf->pub.http) {
+          nchan_http_publisher_handler(r, nchan_publisher_body_handler);
+        }
+        else goto forbidden;
+        break;
+      
+      case NGX_HTTP_OPTIONS:
+        if(cf->pub.http && (cf->sub.poll || cf->sub.longpoll || cf->sub.eventsource || cf->sub.websocket)) {
+          nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_PUBSUB_HEADERS, &NCHAN_ALLOW_GET_POST_PUT_DELETE);
+        }
+        else if(cf->pub.http) {
+          nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_PUBLISHER_HEADERS, &NCHAN_ALLOW_GET_POST_PUT_DELETE);
+        }
+        else if(cf->sub.poll || cf->sub.longpoll || cf->sub.eventsource || cf->sub.websocket) {
+          nchan_OPTIONS_respond(r, &NCHAN_ACCESS_CONTROL_ALLOWED_SUBSCRIBER_HEADERS, &NCHAN_ALLOW_GET);
+        }
+        else goto forbidden;
+        break;
+    }
+  }
+  ctx->request_ran_content_handler = 1;
+  return rc;
+  
+forbidden:
+  nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+  ctx->request_ran_content_handler = 1;
+  return NGX_OK;
+
+bad_msgid:
+  nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Message ID invalid", 0);
+  ctx->request_ran_content_handler = 1;
+  return NGX_OK;
+  
+}
+
+static ngx_int_t channel_info_callback(ngx_int_t status, void *rptr, void *pd) {
+  ngx_http_request_t *r = nchan_get_safe_request_ptr(pd);
+  if(r == NULL) {
+    return NGX_ERROR;
+  }
+  if(status>=500 && status <= 599) {
+    nchan_http_finalize_request(r, status);
+  }
+  else {
+    nchan_http_finalize_request(r, nchan_response_channel_ptr_info( (nchan_channel_t *)rptr, r, 0));
+  }
+  return NGX_OK;
+}
+
+static void clear_request_pointer(safe_request_ptr_t *pdata) {
+  if(pdata) {
+    pdata->r = NULL;
+  }
+}
+
+static safe_request_ptr_t *nchan_set_safe_request_ptr(ngx_http_request_t *r) {
+  safe_request_ptr_t           *data = ngx_alloc(sizeof(*data), ngx_cycle->log);
+  ngx_http_cleanup_t           *cln = ngx_http_cleanup_add(r, 0);
+  
+  if(!data || !cln) {
+    nchan_log_request_error(r, "couldn't allocate request cleanup stuff.");
+    if(cln) {
+      cln->data = NULL;
+      cln->handler = (ngx_http_cleanup_pt )clear_request_pointer;
+    }
+    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    return NULL;
+  }
+  
+  data->cln = cln;
+  data->r = r;
+  
+  cln->data = data;
+  cln->handler = (ngx_http_cleanup_pt )clear_request_pointer;
+  
+  return data;
+}
+
+static ngx_http_request_t *nchan_get_safe_request_ptr(safe_request_ptr_t *d) {
+  ngx_http_request_t    *r = d->r;
+  ngx_http_cleanup_t    *cln = d->cln;
+  
+  ngx_free(d);
+  
+  if(r) {
+    cln->data = NULL;
+  }
+  
+  return r;
+}
+
+
+static ngx_int_t publish_callback(ngx_int_t status, void *data, safe_request_ptr_t *pd) {
+  nchan_request_ctx_t   *ctx;
+  static nchan_msg_id_t  empty_msgid = NCHAN_ZERO_MSGID;
+  nchan_channel_t       *ch = data;
+  
+  ngx_http_request_t    *r = nchan_get_safe_request_ptr(pd);
+  
+  if(r == NULL) { // the request has since disappered
+    return NGX_ERROR;
+  }
+  ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  //DBG("publish_callback %V owner %i status %i", ch_id, memstore_channel_owner(ch_id), status);
+  switch(status) {
+    case NCHAN_MESSAGE_QUEUED:
+      //message was queued successfully, but there were no subscribers to receive it.
+      ctx->prev_msg_id = ctx->msg_id;
+      ctx->msg_id = ch != NULL ? ch->last_published_msg_id : empty_msgid;
+      
+      nchan_maybe_send_channel_event_message(r, CHAN_PUBLISH);
+      nchan_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_ACCEPTED));
+      return NGX_OK;
+      
+    case NCHAN_MESSAGE_RECEIVED:
+      //message was queued successfully, and it was already sent to at least one subscriber
+      ctx->prev_msg_id = ctx->msg_id;
+      ctx->msg_id = ch != NULL ? ch->last_published_msg_id : empty_msgid;
+      
+      nchan_maybe_send_channel_event_message(r, CHAN_PUBLISH);
+      nchan_http_finalize_request(r, nchan_response_channel_ptr_info(ch, r, NGX_HTTP_CREATED));
+      return NGX_OK;
+      
+    case NGX_ERROR:
+      status = NGX_HTTP_INTERNAL_SERVER_ERROR;
+      /*fallthrough*/
+    case NGX_HTTP_INSUFFICIENT_STORAGE:
+    case NGX_HTTP_INTERNAL_SERVER_ERROR:
+    case NGX_HTTP_SERVICE_UNAVAILABLE:
+      //WTF?
+      nchan_log_request_error(r, "error publishing message (HTTP status code %i)", status);
+      ctx->prev_msg_id = empty_msgid;
+      ctx->msg_id = empty_msgid;
+      nchan_http_finalize_request(r, status);
+      return NGX_ERROR;
+      
+    case NGX_HTTP_FORBIDDEN:
+      ctx->prev_msg_id = empty_msgid;
+      ctx->msg_id = empty_msgid;
+      if(data) {
+        nchan_respond_cstring(r, NGX_HTTP_FORBIDDEN, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, (char *)data, 1);
+      }
+      else {
+        nchan_http_finalize_request(r, NGX_HTTP_FORBIDDEN);
+      }
+      return NGX_OK;
+      
+    default:
+      //for debugging, mostly. I don't expect this branch to behit during regular operation
+      ctx->prev_msg_id = empty_msgid;;
+      ctx->msg_id = empty_msgid;
+      nchan_log_request_error(r, "TOTALLY UNEXPECTED error publishing message (HTTP status code %i)", status);
+      nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+      return NGX_ERROR;
+  }
+}
+
+static void nchan_publisher_post_request(ngx_http_request_t *r, ngx_str_t *content_type, size_t content_length, ngx_chain_t *request_body_chain, ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  ngx_buf_t                      *buf;
+  nchan_msg_t                    *msg;
+  ngx_str_t                      *eventsource_event;
+  
+  safe_request_ptr_t             *pd;
+
+#if FAKESHARD
+  memstore_pub_debug_start();
+#endif
+  if((msg = ngx_pcalloc(r->pool, sizeof(*msg))) == NULL) {
+    nchan_log_request_error(r, "can't allocate msg in request pool");
+    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    return; 
+  }
+  msg->storage = NCHAN_MSG_POOL;
+  
+  
+  if(cf->eventsource_event.len > 0) {
+    msg->eventsource_event = &cf->eventsource_event;
+  }
+  else if((eventsource_event = nchan_get_header_value(r, NCHAN_HEADER_EVENTSOURCE_EVENT)) != NULL) {
+    msg->eventsource_event = eventsource_event;
+  }
+  
+  //content type
+  if(content_type) {
+    msg->content_type = content_type;
+  }
+  
+  if(content_length == 0) {
+    buf = ngx_create_temp_buf(r->pool, 0);
+  }
+  else if(request_body_chain!=NULL) {
+    buf = nchan_chain_to_single_buffer(r->pool, request_body_chain, content_length);
+  }
+  else {
+    nchan_log_request_error(r, "unexpected publisher message request body buffer location. please report this to the nchan developers.");
+    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+    return;
+  }
+  
+  msg->id.time = 0;
+  msg->id.tag.fixed[0] = 0;
+  msg->id.tagactive = 0;
+  msg->id.tagcount = 1;
+  
+  msg->buf = *buf;
+#if NCHAN_MSG_LEAK_DEBUG
+  msg->lbl = r->uri;
+#endif
+  nchan_deflate_message_if_needed(msg, cf, r, r->pool);
+  if((pd = nchan_set_safe_request_ptr(r)) == NULL) {
+    return;
+  }
+  
+  cf->storage_engine->publish(channel_id, msg, cf, (callback_pt) &publish_callback, pd);
+  nchan_stats_global_incr(total_published_messages, 1);
+#if FAKESHARD
+  memstore_pub_debug_end();
+#endif
+}
+
+typedef struct {
+  ngx_str_t       *ch_id;
+} nchan_pub_upstream_data_t;
+
+typedef struct {
+  ngx_http_post_subrequest_t    psr;
+  nchan_pub_upstream_data_t   psr_data;
+} nchan_pub_upstream_stuff_t;
+
+static ngx_int_t nchan_publisher_upstream_handler(ngx_http_request_t *sr, void *data, ngx_int_t rc) {
+  ngx_http_request_t         *r = sr->parent;
+  nchan_pub_upstream_data_t  *d = (nchan_pub_upstream_data_t *)data;
+  
+  //switch(r->headers_out
+  if(rc == NGX_OK) {
+    nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+    ngx_int_t                 code = sr->headers_out.status;
+    ngx_str_t                *content_type;
+    ngx_int_t                 content_length;
+    ngx_chain_t              *request_chain;
+    
+    switch(code) {
+      case NGX_HTTP_OK:
+      case NGX_HTTP_CREATED:
+      case NGX_HTTP_ACCEPTED:
+        if(sr->upstream) {
+          content_type = (sr->upstream->headers_in.content_type ? &sr->upstream->headers_in.content_type->value : NULL);
+          content_length = nchan_subrequest_content_length(sr);
+#if nginx_version >= 1013010
+          request_chain = sr->out;
+#else
+          request_chain = sr->upstream->out_bufs;
+#endif
+        }
+        else {
+          content_type = NULL;
+          content_length = 0;
+          request_chain = NULL;
+        }
+        nchan_publisher_post_request(r, content_type, content_length, request_chain, d->ch_id, cf);
+        break;
+      
+      case NGX_HTTP_NOT_MODIFIED:
+        content_type = (r->headers_in.content_type ? &r->headers_in.content_type->value : NULL);
+        content_length = r->headers_in.content_length_n > 0 ? r->headers_in.content_length_n : 0;
+        nchan_publisher_post_request(r, content_type, content_length, r->request_body->bufs, d->ch_id, cf);
+        break;
+        
+      case NGX_HTTP_NO_CONTENT:
+        //cancel publication
+        nchan_http_finalize_request(r, NGX_HTTP_NO_CONTENT);
+        break;
+      
+      default:
+        nchan_http_finalize_request(r, NGX_HTTP_FORBIDDEN);
+    }
+  }
+  else {
+    nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+  }
+  
+  return NGX_OK;
+}
+
+static void nchan_publisher_body_handler_continued(ngx_http_request_t *r, ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  ngx_http_complex_value_t       *publisher_upstream_request_url_ccv;
+  static ngx_str_t                POST_REQUEST_STRING = {4, (u_char *)"POST "};
+  safe_request_ptr_t             *pd;
+  
+  switch(r->method) {
+    case NGX_HTTP_GET:
+      if((pd = nchan_set_safe_request_ptr(r)) == NULL){
+        return;
+      }
+      cf->storage_engine->find_channel(channel_id, cf, (callback_pt) &channel_info_callback, pd);
+      break;
+    
+    case NGX_HTTP_PUT:
+    case NGX_HTTP_POST:
+      publisher_upstream_request_url_ccv = cf->publisher_upstream_request_url;
+      if(publisher_upstream_request_url_ccv == NULL) {
+        ngx_str_t    *content_type = (r->headers_in.content_type ? &r->headers_in.content_type->value : NULL);
+        ngx_int_t     content_length = r->headers_in.content_length_n > 0 ? r->headers_in.content_length_n : 0;
+        // no need to check for chunked transfer-encoding, nginx automatically sets the 
+        // content-length either way.
+        
+        nchan_publisher_post_request(r, content_type, content_length, r->request_body->bufs, channel_id, cf);
+      }
+      else {
+        nchan_pub_upstream_stuff_t    *psr_stuff;
+        
+        if((psr_stuff = ngx_palloc(r->pool, sizeof(*psr_stuff))) == NULL) {
+          nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest");
+          nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+          return;
+        }
+        
+        ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
+        nchan_pub_upstream_data_t     *psrd = &psr_stuff->psr_data;
+        ngx_http_request_t            *sr;
+        ngx_str_t                      publisher_upstream_request_url;
+        
+        ngx_http_complex_value(r, publisher_upstream_request_url_ccv, &publisher_upstream_request_url);
+        
+        psr->handler = nchan_publisher_upstream_handler;
+        psr->data = psrd;
+        
+        psrd->ch_id = channel_id;
+        
+        ngx_http_subrequest(r, &publisher_upstream_request_url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
+        nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, r->request_body, r->headers_in.content_length_n);
+        sr->args = r->args;
+      }
+      break;
+      
+    case NGX_HTTP_DELETE:
+      if((pd = nchan_set_safe_request_ptr(r)) == NULL){
+        return;
+      }
+      cf->storage_engine->delete_channel(channel_id, cf, (callback_pt) &channel_info_callback, pd);
+      nchan_maybe_send_channel_event_message(r, CHAN_DELETE);
+      break;
+      
+    default: 
+      nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+  }
+  
+}
+
+typedef struct {
+  ngx_str_t       *ch_id;
+} nchan_pub_subrequest_data_t;
+
+typedef struct {
+  ngx_http_post_subrequest_t    psr;
+  nchan_pub_subrequest_data_t   psr_data;
+} nchan_pub_subrequest_stuff_t;
+
+
+static ngx_int_t nchan_publisher_body_authorize_handler(ngx_http_request_t *r, void *data, ngx_int_t rc) {
+  nchan_pub_subrequest_data_t  *d = data;
+  
+  if(rc == NGX_OK) {
+    nchan_loc_conf_t    *cf = ngx_http_get_module_loc_conf(r->parent, ngx_nchan_module);
+    ngx_int_t            code = r->headers_out.status;
+    if(code >= 200 && code <299) {
+      //authorized. proceed as planned
+      nchan_publisher_body_handler_continued(r->parent, d->ch_id, cf);
+    }
+    else { //anything else means forbidden
+      nchan_http_finalize_request(r->parent, NGX_HTTP_FORBIDDEN);
+    }
+  }
+  else {
+    nchan_http_finalize_request(r->parent, rc);
+  }
+  return NGX_OK;
+}
+
+static void nchan_publisher_unavailable_body_handler(ngx_http_request_t *r) {
+  nchan_http_finalize_request(r, NGX_HTTP_SERVICE_UNAVAILABLE);
+  return;
+}
+
+static void nchan_publisher_body_handler(ngx_http_request_t *r) {
+  ngx_str_t                      *channel_id;
+  nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_table_elt_t                *content_length_elt;
+  ngx_http_complex_value_t       *authorize_request_url_ccv = cf->authorize_request_url;
+  
+  if((channel_id = nchan_get_channel_id(r, PUB, 1))==NULL) {
+    nchan_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
+    return;
+  }
+  
+  if(!authorize_request_url_ccv) {
+    nchan_publisher_body_handler_continued(r, channel_id, cf);
+  }
+  else {
+    nchan_pub_subrequest_stuff_t   *psr_stuff;
+    
+    if((psr_stuff = ngx_palloc(r->pool, sizeof(*psr_stuff))) == NULL) {
+      nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest");
+      nchan_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+      return;
+    }
+    
+    ngx_http_post_subrequest_t    *psr = &psr_stuff->psr;
+    nchan_pub_subrequest_data_t   *psrd = &psr_stuff->psr_data;
+    ngx_http_request_t            *sr;
+    ngx_str_t                      auth_request_url;
+    
+    ngx_http_complex_value(r, authorize_request_url_ccv, &auth_request_url);
+    
+    psr->handler = nchan_publisher_body_authorize_handler;
+    psr->data = psrd;
+    
+    psrd->ch_id = channel_id;
+    
+    ngx_http_subrequest(r, &auth_request_url, NULL, &sr, psr, 0);
+    
+    if((sr->request_body = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t))) == NULL) {
+      nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest body");
+      nchan_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
+      return;
+    }
+    if((content_length_elt = ngx_palloc(r->pool, sizeof(*content_length_elt))) == NULL) {
+      nchan_log_request_error(r, "can't allocate memory for publisher auth subrequest content-length header");
+      nchan_http_finalize_request(r, r->headers_out.status ? NGX_OK : NGX_HTTP_INTERNAL_SERVER_ERROR);
+      return;
+    }
+    
+    if(sr->headers_in.content_length) {
+      *content_length_elt = *sr->headers_in.content_length;
+      content_length_elt->value.len=1;
+      content_length_elt->value.data=(u_char *)"0";
+      sr->headers_in.content_length = content_length_elt;
+    }
+    
+    sr->headers_in.content_length_n = 0;
+    sr->args = r->args;
+    sr->header_only = 1;
+  }
+}
+
+ngx_int_t nchan_benchmark_handler(ngx_http_request_t *r) {
+  nchan_request_ctx_t    *ctx;
+  
+  if(r->connection && (r->connection->read->eof || r->connection->read->pending_eof)) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  if((ctx = ngx_pcalloc(r->pool, sizeof(nchan_request_ctx_t))) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  ngx_http_set_ctx(r, ctx, ngx_nchan_module);
+  
+  return nchan_benchmark_ws_initialize(r);
+  
+  /*
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  return nchan_benchmark_initialize(r);
+  */
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.h
new file mode 100644
index 0000000..3b626cd
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_module.h
@@ -0,0 +1,73 @@
+#ifndef NCHAN_MODULE_H
+#define NCHAN_MODULE_H
+//#define NCHAN_SUBSCRIBER_LEAK_DEBUG 1
+//#define NCHAN_MSG_RESERVE_DEBUG 1
+//#define NCHAN_MSG_LEAK_DEBUG 1
+
+//debugging config
+//#define FAKESHARD 1
+//#define FAKE_SHMEM 1
+#if FAKESHARD
+//#define PUB_FAKE_WORKER 0
+//#define SUB_FAKE_WORKER 1
+//#define ONE_FAKE_CHANNEL_OWNER 2
+#define MAX_FAKE_WORKERS 5
+#endif
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nchan_version.h>
+
+//building for old versions
+#ifndef NGX_MAX_INT_T_VALUE
+#if (NGX_PTR_SIZE == 4)
+#define NGX_MAX_INT_T_VALUE  2147483647
+#else
+#define NGX_MAX_INT_T_VALUE  9223372036854775807
+#endif
+#endif
+
+#include <nginx.h>
+#include <nchan_types.h>
+#include <nchan_defs.h>
+#include <util/nchan_util.h>
+#include <util/nchan_channel_id.h>
+#include <util/nchan_output_info.h>
+#include <util/nchan_msg.h>
+#include <util/nchan_output.h>
+#include <util/nchan_debug.h>
+#include <util/nchan_stats.h>
+#include <util/nchan_accumulator.h>
+
+extern ngx_pool_t *nchan_pool;
+extern ngx_int_t nchan_worker_processes;
+extern ngx_module_t ngx_nchan_module;
+extern nchan_store_t *nchan_store;
+
+extern int nchan_stub_status_enabled;
+extern int nchan_redis_stats_enabled;
+
+ngx_int_t nchan_stub_status_handler(ngx_http_request_t *r);
+ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r);
+ngx_int_t nchan_group_handler(ngx_http_request_t *r);
+ngx_int_t nchan_subscriber_info_handler(ngx_http_request_t *r);
+ngx_int_t nchan_benchmark_handler(ngx_http_request_t *r);
+ngx_int_t nchan_redis_stats_handler(ngx_http_request_t *r);
+
+time_t nchan_loc_conf_message_timeout(nchan_loc_conf_t *cf);
+ngx_int_t nchan_loc_conf_max_messages(nchan_loc_conf_t *cf);
+
+ngx_int_t nchan_maybe_send_channel_event_message(ngx_http_request_t *, channel_event_type_t);
+
+size_t nchan_get_used_shmem(void);
+
+#define nchan_log(level, log, errno, fmt, args...) ngx_log_error(level, log, errno, "nchan: " fmt, ##args)
+#define nchan_log_notice(fmt, args...) nchan_log(NGX_LOG_NOTICE, ngx_cycle->log, 0, fmt, ##args)
+#define nchan_log_warning(fmt, args...) nchan_log(NGX_LOG_WARN, ngx_cycle->log, 0, fmt, ##args)
+#define nchan_log_error(fmt, args...) nchan_log(NGX_LOG_ERR, ngx_cycle->log, 0, fmt, ##args)
+#define nchan_log_ooshm_error(fmt, args...) nchan_log(NGX_LOG_ERR, ngx_cycle->log, 0, "Out of shared memory while " fmt ". Increase nchan_max_reserved_memory.", ##args)
+
+#define nchan_log_request_warning(request, fmt, args...) ngx_log_error(NGX_LOG_WARN, (request)->connection->log, 0, "nchan: " fmt, ##args)
+#define nchan_log_request_error(request, fmt, args...)    ngx_log_error(NGX_LOG_ERR, ((request) ? (request)->connection->log : ngx_cycle->log), 0, "nchan: " fmt, ##args)
+
+#endif /*NCHAN_MODULE_H*/
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_setup.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_setup.c
new file mode 100644
index 0000000..8014cec
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_setup.c
@@ -0,0 +1,1747 @@
+#include <nchan_websocket_publisher.h>
+#include <nchan_types.h>
+#include <util/nchan_output.h>
+#include <nchan_variables.h>
+#include <store/memory/store.h>
+#include <store/redis/store.h>
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
+
+static char *nchan_set_complex_value_array(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, nchan_complex_value_arr_t *chid);
+static ngx_int_t set_complex_value_array_size1(ngx_conf_t *cf, nchan_complex_value_arr_t *chid, char *val);
+
+static ngx_str_t      DEFAULT_CHANNEL_EVENT_STRING = ngx_string("$nchan_channel_event $nchan_channel_id");
+
+static ngx_str_t      DEFAULT_SUBSCRIBER_INFO_STRING = ngx_string("$nchan_subscriber_type $remote_addr:$remote_port $http_user_agent $server_name $request_uri $pid");
+
+nchan_store_t   *default_storage_engine = &nchan_store_memory;
+ngx_flag_t       global_nchan_enabled = 0;
+ngx_flag_t       global_redis_enabled = 0;
+ngx_flag_t       global_zstream_needed = 0;
+ngx_flag_t       global_benchmark_enabled = 0;
+void            *global_owner_cycle = NULL;
+
+#define MERGE_UNSET_CONF(conf, prev, unset, default)         \
+if (conf == unset) {                                         \
+  conf = (prev == unset) ? default : prev;                   \
+}
+
+#define MERGE_CONF(cf, prev_cf, name) if((cf)->name == NULL) { (cf)->name = (prev_cf)->name; }
+
+static ngx_int_t nchan_init_module(ngx_cycle_t *cycle) {
+  if(global_owner_cycle && global_owner_cycle != ngx_cycle) {
+    global_nchan_enabled = 0;
+    global_redis_enabled = 0;
+    global_zstream_needed = 0;
+    global_benchmark_enabled = 0;
+  }
+  global_owner_cycle = (void *)ngx_cycle;
+  
+  if(!global_nchan_enabled) {
+    return NGX_OK;
+  }
+  ngx_core_conf_t         *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  nchan_worker_processes = ccf->worker_processes;
+  
+  //initialize storage engines
+  nchan_store_memory.init_module(cycle);
+  if(global_benchmark_enabled) {
+    nchan_benchmark_init_module(cycle);
+  }
+  if(global_redis_enabled) {
+    nchan_store_redis.init_module(cycle);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_init_worker(ngx_cycle_t *cycle) {
+  if(!global_nchan_enabled) {
+    return NGX_OK;
+  }
+  if (ngx_process != NGX_PROCESS_WORKER && ngx_process != NGX_PROCESS_SINGLE) {
+    //not a worker, stop initializing stuff.
+    return NGX_OK;
+  }
+  
+  if(nchan_stats_init_worker(cycle) != NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+  if(nchan_store_memory.init_worker(cycle)!=NGX_OK) {
+    return NGX_ERROR;
+  }
+  if(global_benchmark_enabled) {
+    nchan_benchmark_init_worker(cycle);
+  }
+  
+  if(global_redis_enabled && nchan_store_redis.init_worker(cycle)!=NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+  nchan_websocket_publisher_llist_init();
+  nchan_output_init();
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_preconfig(ngx_conf_t *cf) {
+  global_owner_cycle = (void *)ngx_cycle;
+  global_nchan_enabled = 0;
+  return nchan_add_variables(cf);
+}
+
+static ngx_int_t nchan_postconfig(ngx_conf_t *cf) {
+  global_owner_cycle = (void *)ngx_cycle;
+  if(nchan_stats_init_postconfig(cf, nchan_stub_status_enabled) != NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+  if(nchan_store_memory.init_postconfig(cf)!=NGX_OK) {
+    return NGX_ERROR;
+  }
+  if(global_redis_enabled && nchan_store_redis.init_postconfig(cf)!=NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+#if (NGX_ZLIB)
+  if(global_zstream_needed) {
+    nchan_main_conf_t  *mcf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
+    nchan_common_deflate_init(mcf);
+  }
+#endif
+  
+  global_nchan_enabled = 1;
+  
+  return NGX_OK;
+}
+
+//main config
+static void * nchan_create_main_conf(ngx_conf_t *cf) {
+  nchan_main_conf_t      *mcf = ngx_pcalloc(cf->pool, sizeof(*mcf));
+  if(mcf == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  
+  static ngx_path_init_t nchan_temp_path = { ngx_string(NGX_HTTP_CLIENT_TEMP_PATH), { 0, 0, 0 } };
+  ngx_conf_merge_path_value(cf, &mcf->message_temp_path, NULL, &nchan_temp_path);
+  
+  nchan_store_memory.create_main_conf(cf, mcf);
+  nchan_store_redis.create_main_conf(cf, mcf);
+  
+#if (NGX_ZLIB)
+  mcf->zlib_params.level = Z_DEFAULT_COMPRESSION;
+  mcf->zlib_params.windowBits = 10;
+  mcf->zlib_params.memLevel = 8;
+  mcf->zlib_params.strategy = Z_DEFAULT_STRATEGY;
+#endif
+  
+  return mcf;
+}
+
+static void *nchan_create_srv_conf(ngx_conf_t *cf) {
+  nchan_srv_conf_t       *scf = ngx_pcalloc(cf->pool, sizeof(*scf));
+  if(scf == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  scf->redis.retry_commands = NGX_CONF_UNSET;
+  scf->redis.retry_commands_max_wait = NGX_CONF_UNSET_MSEC;
+  scf->redis.node_connect_timeout = NGX_CONF_UNSET_MSEC;
+  scf->redis.cluster_connect_timeout = NGX_CONF_UNSET_MSEC;
+  
+  scf->redis.reconnect_delay = NCHAN_CONF_UNSEC_BACKOFF;
+  scf->redis.cluster_recovery_delay = NCHAN_CONF_UNSEC_BACKOFF;
+  scf->redis.cluster_check_interval = NCHAN_CONF_UNSEC_BACKOFF;
+  scf->redis.idle_channel_ttl = NCHAN_CONF_UNSEC_BACKOFF;
+  
+  scf->redis.idle_channel_ttl_safety_margin = NGX_CONF_UNSET_MSEC;
+  
+  scf->redis.cluster_max_failing_msec = NGX_CONF_UNSET_MSEC;
+  scf->redis.command_timeout = NGX_CONF_UNSET_MSEC;
+  scf->redis.load_scripts_unconditionally = NGX_CONF_UNSET;
+  scf->redis.accurate_subscriber_count = NGX_CONF_UNSET;
+  scf->redis.master_weight = NGX_CONF_UNSET;
+  scf->redis.slave_weight = NGX_CONF_UNSET;
+  scf->redis.blacklist_count = NGX_CONF_UNSET;
+  scf->redis.blacklist = NULL;
+  scf->redis.tls.enabled = NGX_CONF_UNSET;
+  scf->redis.tls.verify_certificate = NGX_CONF_UNSET;
+  
+  scf->redis.stats.enabled = NGX_CONF_UNSET;
+  scf->redis.stats.max_detached_time_sec = NGX_CONF_UNSET;
+  
+  scf->upstream_nchan_loc_conf = NULL;
+  return scf;
+}
+
+static char *nchan_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) {
+  nchan_srv_conf_t       *prev = parent, *conf = child;
+  
+  ngx_conf_merge_value(conf->redis.retry_commands, prev->redis.retry_commands, NCHAN_DEFAULT_REDIS_CAN_RETRY_COMMANDS);
+  
+  ngx_conf_merge_msec_value(conf->redis.retry_commands_max_wait, prev->redis.retry_commands_max_wait, NCHAN_DEFAULT_REDIS_RETRY_COMMANDS_MAX_WAIT_MSEC);
+  
+  ngx_conf_merge_msec_value(conf->redis.node_connect_timeout, prev->redis.node_connect_timeout, NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC);
+  ngx_conf_merge_msec_value(conf->redis.cluster_connect_timeout, prev->redis.cluster_connect_timeout, NCHAN_DEFAULT_REDIS_CLUSTER_CONNECT_TIMEOUT_MSEC);
+  
+  ngx_conf_merge_msec_value(conf->redis.cluster_max_failing_msec, prev->redis.cluster_max_failing_msec, NCHAN_DEFAULT_REDIS_CLUSTER_MAX_FAILING_TIME_MSEC);
+  
+  ngx_conf_merge_msec_value(conf->redis.command_timeout, prev->redis.command_timeout, NCHAN_DEFAULT_REDIS_COMMAND_TIMEOUT_MSEC);
+  
+  nchan_conf_merge_backoff_value(&conf->redis.reconnect_delay, &prev->redis.reconnect_delay, &NCHAN_REDIS_DEFAULT_RECONNECT_DELAY);
+  
+  nchan_conf_merge_backoff_value(&conf->redis.cluster_recovery_delay, &prev->redis.cluster_recovery_delay, &NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY);
+  
+  nchan_conf_merge_backoff_value(&conf->redis.cluster_check_interval, &prev->redis.cluster_check_interval, &NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL);
+
+  nchan_conf_merge_backoff_value(&conf->redis.idle_channel_ttl, &prev->redis.idle_channel_ttl, &NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL);
+  
+  ngx_conf_merge_msec_value(conf->redis.idle_channel_ttl_safety_margin, prev->redis.idle_channel_ttl_safety_margin, NCHAN_REDIS_IDLE_CHANNEL_TTL_SAFETY_MARGIN_MSEC);
+  
+  ngx_conf_merge_value(conf->redis.load_scripts_unconditionally, prev->redis.load_scripts_unconditionally, 0);
+  
+  ngx_conf_merge_value(conf->redis.accurate_subscriber_count, prev->redis.accurate_subscriber_count, 0);
+  
+  ngx_conf_merge_value(conf->redis.stats.enabled, prev->redis.stats.enabled, NGX_CONF_UNSET);
+  //default to unset to enable only if at least 1 stats location is configured
+  
+  ngx_conf_merge_value(conf->redis.stats.max_detached_time_sec, prev->redis.stats.max_detached_time_sec, NCHAN_REDIS_DEFAULT_STATS_MAX_DETACHED_TIME_SEC);
+  
+  ngx_conf_merge_value(conf->redis.master_weight, prev->redis.master_weight, 1);
+  ngx_conf_merge_value(conf->redis.slave_weight, prev->redis.slave_weight, 1);
+  ngx_conf_merge_value(conf->redis.blacklist_count, prev->redis.blacklist_count, 0);
+  if(conf->redis.blacklist == NULL) {
+    conf->redis.blacklist = prev->redis.blacklist;
+  }
+  ngx_conf_merge_value(conf->redis.tls.enabled, prev->redis.tls.enabled, 0);
+  ngx_conf_merge_value(conf->redis.tls.verify_certificate, prev->redis.tls.verify_certificate, 1);
+  ngx_conf_merge_str_value(conf->redis.tls.trusted_certificate, prev->redis.tls.trusted_certificate, "");
+    ngx_conf_merge_str_value(conf->redis.tls.trusted_certificate_path, prev->redis.tls.trusted_certificate_path, "");
+  ngx_conf_merge_str_value(conf->redis.tls.client_certificate, prev->redis.tls.client_certificate, "");
+  ngx_conf_merge_str_value(conf->redis.tls.client_certificate_key, prev->redis.tls.client_certificate_key, "");
+  ngx_conf_merge_str_value(conf->redis.tls.server_name, prev->redis.tls.server_name, "");
+  ngx_conf_merge_str_value(conf->redis.tls.ciphers, prev->redis.tls.ciphers, "");
+  
+  ngx_conf_merge_str_value(conf->redis.username, prev->redis.username, "");
+  ngx_conf_merge_str_value(conf->redis.password, prev->redis.password, "");
+  
+  return NGX_CONF_OK;
+}
+
+//location config stuff
+static void *nchan_create_loc_conf(ngx_conf_t *cf) {
+  nchan_loc_conf_t       *lcf = ngx_pcalloc(cf->pool, sizeof(*lcf));
+  if(lcf == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  
+  lcf->pub.http=0;
+  lcf->pub.websocket=0;
+  
+  lcf->sub.poll=0;
+  lcf->sub.longpoll=0;
+  lcf->sub.eventsource=0;
+  lcf->sub.websocket=0;
+  lcf->sub.http_chunked=0;
+  
+  // lcf->group is already zeroed
+  lcf->group.enable_accounting = NGX_CONF_UNSET;
+  
+  lcf->shared_data_index=NGX_CONF_UNSET;
+  
+  lcf->authorize_request_url = NULL;
+  lcf->publisher_upstream_request_url = NULL;
+  lcf->unsubscribe_request_url = NULL;
+  lcf->subscribe_request_url = NULL;
+  lcf->channel_group = NULL;
+  
+  lcf->message_timeout=NGX_CONF_UNSET;
+  lcf->max_messages=NGX_CONF_UNSET;
+  
+  lcf->complex_message_timeout = NULL;
+  lcf->complex_max_messages = NULL;
+  
+  lcf->subscriber_first_message=NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET;
+  
+  lcf->subscriber_info_string=NULL;
+  lcf->subscriber_info_location=NGX_CONF_UNSET;
+  
+  lcf->subscriber_timeout=NGX_CONF_UNSET;
+  lcf->subscribe_only_existing_channel=NGX_CONF_UNSET;
+  lcf->redis_idle_channel_cache_timeout=NGX_CONF_UNSET;
+  lcf->max_channel_id_length=NGX_CONF_UNSET;
+  lcf->max_channel_subscribers=NGX_CONF_UNSET;
+  lcf->channel_timeout=NGX_CONF_UNSET;
+  lcf->storage_engine=NULL;
+  
+  lcf->websocket_ping_interval=NGX_CONF_UNSET;
+  
+  lcf->eventsource_ping.interval=NGX_CONF_UNSET;
+  
+  lcf->msg_in_etag_only = NGX_CONF_UNSET;
+  
+  lcf->allow_origin = NULL;
+  lcf->allow_credentials = NGX_CONF_UNSET;
+  
+  lcf->channel_events_channel_id = NULL;
+  lcf->channel_event_string = NULL;
+  
+  lcf->websocket_heartbeat.enabled=NGX_CONF_UNSET;
+  
+  lcf->message_compression = NCHAN_MSG_COMPRESSION_INVALID;
+  
+  lcf->longpoll_multimsg=NGX_CONF_UNSET;
+  lcf->longpoll_multimsg_use_raw_stream_separator=NGX_CONF_UNSET;
+  
+  ngx_memzero(&lcf->pub_chid, sizeof(nchan_complex_value_arr_t));
+  ngx_memzero(&lcf->sub_chid, sizeof(nchan_complex_value_arr_t));
+  ngx_memzero(&lcf->pubsub_chid, sizeof(nchan_complex_value_arr_t));
+  ngx_memzero(&lcf->last_message_id, sizeof(nchan_complex_value_arr_t));
+  
+  ngx_memzero(&lcf->redis, sizeof(lcf->redis));
+  lcf->redis.url_enabled=NGX_CONF_UNSET;
+  lcf->redis.ping_interval = NGX_CONF_UNSET;
+  lcf->redis.upstream_inheritable=NGX_CONF_UNSET;
+  lcf->redis.storage_mode = REDIS_MODE_CONF_UNSET;
+  lcf->redis.nostore_fastpublish = NGX_CONF_UNSET;
+  lcf->redis.privdata = NULL;
+  lcf->redis.nodeset = NULL;
+  lcf->redis.stats.upstream_name = NULL;
+  
+  lcf->request_handler = NULL;
+  
+  lcf->benchmark.time = NGX_CONF_UNSET;
+  lcf->benchmark.msgs_per_minute = NGX_CONF_UNSET;
+  lcf->benchmark.msg_padding = NGX_CONF_UNSET;
+  lcf->benchmark.channels = NGX_CONF_UNSET;
+  lcf->benchmark.subscribers_per_channel = NGX_CONF_UNSET;
+  lcf->benchmark.subscriber_distribution = NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_UNSET;
+  lcf->benchmark.publisher_distribution = NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_UNSET;
+  return lcf;
+}
+
+static char * create_complex_value_from_ngx_str(ngx_conf_t *cf, ngx_http_complex_value_t **dst_cv, ngx_str_t *str) {
+  ngx_http_complex_value_t           *cv;
+  ngx_http_compile_complex_value_t    ccv;
+  
+  cv = ngx_palloc(cf->pool, sizeof(*cv));
+  if (cv == NULL) {
+    ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "unable to allocate space for complex value");
+    return NGX_CONF_ERROR;
+  }
+  
+  ngx_memzero(&ccv, sizeof(ccv));
+  
+  ccv.cf = cf;
+  ccv.value = str;
+  ccv.complex_value = cv;
+  
+  if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+    return NGX_CONF_ERROR;
+  }
+  
+  *dst_cv = cv;
+  return NGX_CONF_OK;
+}
+
+static int is_pub_location(nchan_loc_conf_t *lcf) {
+  return lcf->pub.http || lcf->pub.websocket;
+}
+static int is_sub_location(nchan_loc_conf_t *lcf) {
+  nchan_conf_subscriber_types_t s = lcf->sub;
+  return s.poll || s.http_raw_stream || s.longpoll || s.http_chunked || s.http_multipart || s.eventsource || s.websocket;
+}
+static int is_group_location(nchan_loc_conf_t *lcf) {
+  return lcf->group.get || lcf->group.set || lcf->group.delete;
+}
+
+static int is_redis_stats_location(nchan_loc_conf_t *lcf) {
+  return lcf->redis.stats.upstream_name != NULL;
+}
+
+static int is_valid_location(ngx_conf_t *cf, nchan_loc_conf_t *lcf) {
+  
+  if(is_group_location(lcf)) {
+    if(is_pub_location(lcf) && is_sub_location(lcf)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a publisher and subscriber location and also be a group access location (nchan_group + nchan_publisher, nchan_subscriber or nchan_pubsub)");
+      return 0;
+    }
+    else if(is_pub_location(lcf)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a publisher location and also be a group access location (nchan_group + nchan_publisher)");
+      return 0;
+    }
+    else if(is_sub_location(lcf)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a subscriber location and also be a group access location (nchan_group + nchan_subscriber)");
+      return 0;
+    }
+    else if(is_redis_stats_location(lcf)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a redis stats location and also be a group access location (nchan_group + nchan_subscriber)");
+      return 0;
+    }
+  }
+  if(is_redis_stats_location(lcf)) {
+    if (is_group_location(lcf) || is_sub_location(lcf) || is_pub_location(lcf)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "Can't have a redis stats location and also a group, publisher, or subscriber location.");
+    }
+  }
+  return 1;
+}
+
+static char *ngx_conf_set_redis_upstream(ngx_conf_t *cf, ngx_str_t *url, void *conf) {  
+  ngx_url_t             upstream_url;
+  nchan_loc_conf_t     *lcf = conf;
+  if (lcf->redis.upstream) {
+    return "is duplicate";
+  }
+  
+  ngx_memzero(&upstream_url, sizeof(upstream_url));
+  upstream_url.url = *url;
+  upstream_url.no_resolve = 1;
+  
+  if ((lcf->redis.upstream = ngx_http_upstream_add(cf, &upstream_url, 0)) == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  
+  lcf->redis.enabled = 1;
+  global_redis_enabled = 1;
+  nchan_store_redis_add_active_loc_conf(cf, lcf);
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_setup_handler(ngx_conf_t *cf, ngx_int_t (*handler)(ngx_http_request_t *)) {
+  ngx_http_core_loc_conf_t       *clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+  //nchan_loc_conf_t               *plcf = conf;
+  clcf->handler = handler;
+  clcf->if_modified_since = NGX_HTTP_IMS_OFF;
+  
+  return NGX_CONF_OK;
+}
+
+static nchan_loc_conf_t *nchan_loc_conf_get_upstream_lcf(nchan_loc_conf_t *conf, nchan_loc_conf_t *prev) {
+  nchan_redis_conf_t *rcf = &conf->redis, *prev_rcf = &prev->redis;
+  if(rcf->upstream == prev_rcf->upstream || rcf->upstream == NULL) {
+    //same or no upstream, so don't bother
+    return NULL;
+  }
+  else {
+    assert(rcf->upstream);
+    nchan_srv_conf_t      *upstream_scf = ngx_http_conf_upstream_srv_conf(rcf->upstream, ngx_nchan_module);
+    if(upstream_scf && upstream_scf->upstream_nchan_loc_conf) {
+      return upstream_scf->upstream_nchan_loc_conf;
+    }
+    else {
+      //ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "nchan upstream srv_conf loc_conf ptr is null");
+      return NULL;
+    }
+  }
+}
+
+
+static char * nchan_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
+  nchan_loc_conf_t       *prev = parent, *conf = child;
+  nchan_loc_conf_t       *up = nchan_loc_conf_get_upstream_lcf(conf, prev);
+  //publisher types
+  ngx_conf_merge_bitmask_value(conf->pub.http, prev->pub.http, 0);
+  ngx_conf_merge_bitmask_value(conf->pub.websocket, prev->pub.websocket, 0);
+  
+  //subscriber types
+  ngx_conf_merge_bitmask_value(conf->sub.poll, prev->sub.poll, 0);
+  ngx_conf_merge_bitmask_value(conf->sub.longpoll, prev->sub.longpoll, 0);
+  ngx_conf_merge_bitmask_value(conf->sub.eventsource, prev->sub.eventsource, 0);
+  ngx_conf_merge_bitmask_value(conf->sub.http_chunked, prev->sub.http_chunked, 0);
+  ngx_conf_merge_bitmask_value(conf->sub.websocket, prev->sub.websocket, 0);
+  
+  //group request types
+  ngx_conf_merge_bitmask_value(conf->group.get, prev->group.get, 0);
+  ngx_conf_merge_bitmask_value(conf->group.set, prev->group.set, 0);
+  ngx_conf_merge_bitmask_value(conf->group.delete, prev->group.delete, 0);
+  
+  ngx_conf_merge_value(conf->group.enable_accounting, prev->group.enable_accounting, 0);
+  
+  MERGE_CONF(conf, prev, redis.stats.upstream_name);
+  
+  //validate location
+  if(!is_valid_location(cf, conf)) {
+    return NGX_CONF_ERROR;
+  }
+  
+  MERGE_UNSET_CONF(conf->message_compression, prev->message_compression, NCHAN_MSG_COMPRESSION_INVALID, NCHAN_MSG_NO_COMPRESSION);
+  
+  ngx_conf_merge_sec_value(conf->message_timeout, prev->message_timeout, NCHAN_DEFAULT_MESSAGE_TIMEOUT);
+  ngx_conf_merge_value(conf->max_messages, prev->max_messages, NCHAN_DEFAULT_MAX_MESSAGES);
+  
+  MERGE_CONF(conf, prev, complex_message_timeout);
+  MERGE_CONF(conf, prev, complex_max_messages);
+  
+  if (conf->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) {
+    conf->subscriber_first_message = (prev->subscriber_first_message == NCHAN_SUBSCRIBER_FIRST_MESSAGE_UNSET) ? NCHAN_SUBSCRIBER_DEFAULT_FIRST_MESSAGE : prev->subscriber_first_message;
+  }
+  
+  MERGE_CONF(conf, prev, subscriber_info_string);
+  if(conf->subscriber_info_string == NULL) { //still null? use the default string
+    if(create_complex_value_from_ngx_str(cf, &conf->subscriber_info_string, &DEFAULT_SUBSCRIBER_INFO_STRING) == NGX_CONF_ERROR) {
+      return NGX_CONF_ERROR;
+    }
+  }
+  
+  ngx_conf_merge_value(conf->subscriber_info_location, prev->subscriber_info_location, 0);
+  
+  ngx_conf_merge_sec_value(conf->websocket_ping_interval, prev->websocket_ping_interval, NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL);
+  
+  ngx_conf_merge_sec_value(conf->eventsource_ping.interval, prev->eventsource_ping.interval, NCHAN_DEFAULT_SUBSCRIBER_PING_INTERVAL);
+  ngx_conf_merge_str_value(conf->eventsource_ping.data, prev->eventsource_ping.comment, "");
+  ngx_conf_merge_str_value(conf->eventsource_ping.event, prev->eventsource_ping.event, "ping");
+  ngx_conf_merge_str_value(conf->eventsource_ping.data, prev->eventsource_ping.data, "");
+  
+  ngx_conf_merge_sec_value(conf->subscriber_timeout, prev->subscriber_timeout, NCHAN_DEFAULT_SUBSCRIBER_TIMEOUT);
+  ngx_conf_merge_sec_value(conf->redis_idle_channel_cache_timeout, prev->redis_idle_channel_cache_timeout, NCHAN_DEFAULT_REDIS_IDLE_CHANNEL_CACHE_TIMEOUT);
+  
+  ngx_conf_merge_value(conf->subscribe_only_existing_channel, prev->subscribe_only_existing_channel, 0);
+  ngx_conf_merge_value(conf->max_channel_id_length, prev->max_channel_id_length, NCHAN_MAX_CHANNEL_ID_LENGTH);
+  ngx_conf_merge_value(conf->max_channel_subscribers, prev->max_channel_subscribers, 0);
+  ngx_conf_merge_value(conf->channel_timeout, prev->channel_timeout, NCHAN_DEFAULT_CHANNEL_TIMEOUT);
+  
+  ngx_conf_merge_str_value(conf->subscriber_http_raw_stream_separator, prev->subscriber_http_raw_stream_separator, "\n");
+  
+  ngx_conf_merge_str_value(conf->channel_id_split_delimiter, prev->channel_id_split_delimiter, "");
+  MERGE_CONF(conf, prev, allow_origin);
+  ngx_conf_merge_value(conf->allow_credentials, prev->allow_credentials, 1);
+  ngx_conf_merge_str_value(conf->eventsource_event, prev->eventsource_event, "");
+  ngx_conf_merge_str_value(conf->custom_msgtag_header, prev->custom_msgtag_header, "");
+  ngx_conf_merge_value(conf->msg_in_etag_only, prev->msg_in_etag_only, 0);
+  ngx_conf_merge_value(conf->longpoll_multimsg, prev->longpoll_multimsg, 0);
+  ngx_conf_merge_value(conf->longpoll_multimsg_use_raw_stream_separator, prev->longpoll_multimsg_use_raw_stream_separator, 0);
+  
+  ngx_conf_merge_value(conf->websocket_heartbeat.enabled, prev->websocket_heartbeat.enabled, 0);
+  MERGE_CONF(conf, prev, websocket_heartbeat.in);
+  MERGE_CONF(conf, prev, websocket_heartbeat.out);
+  
+  MERGE_CONF(conf, prev, channel_events_channel_id);
+  MERGE_CONF(conf, prev, channel_event_string);
+  
+  if(conf->channel_event_string == NULL) { //still null? use the default string
+    if(create_complex_value_from_ngx_str(cf, &conf->channel_event_string, &DEFAULT_CHANNEL_EVENT_STRING) == NGX_CONF_ERROR) {
+      return NGX_CONF_ERROR;
+    }
+  }
+
+  if(conf->storage_engine == NULL) {
+    conf->storage_engine = prev->storage_engine ? prev->storage_engine : default_storage_engine;
+  }
+
+  MERGE_CONF(conf, prev, authorize_request_url);
+  MERGE_CONF(conf, prev, publisher_upstream_request_url);
+  MERGE_CONF(conf, prev, unsubscribe_request_url);
+  MERGE_CONF(conf, prev, subscribe_request_url);
+  MERGE_CONF(conf, prev, channel_group);
+  
+  MERGE_CONF(conf, prev, group.max_channels);
+  MERGE_CONF(conf, prev, group.max_subscribers);
+  MERGE_CONF(conf, prev, group.max_messages);
+  MERGE_CONF(conf, prev, group.max_messages_shm_bytes);
+  MERGE_CONF(conf, prev, group.max_messages_file_bytes);
+  
+  if(conf->pub_chid.n == 0) {
+    conf->pub_chid = prev->pub_chid;
+  }
+  if(conf->sub_chid.n == 0) {
+    conf->sub_chid = prev->sub_chid;
+  }
+  if(conf->pubsub_chid.n == 0) {
+    conf->pubsub_chid = prev->pubsub_chid;
+  }
+  if(conf->last_message_id.n == 0) {
+    conf->last_message_id = prev->last_message_id;
+  }
+  if(conf->last_message_id.n == 0) { //if it's still null
+    ngx_str_t      first_choice_msgid = ngx_string("$http_last_event_id");
+    ngx_str_t      second_choice_msgid = ngx_string("$arg_last_event_id");
+    
+    if(create_complex_value_from_ngx_str(cf, &conf->last_message_id.cv[0], &first_choice_msgid) == NGX_CONF_ERROR) {
+      return NGX_CONF_ERROR;
+    }
+    if(create_complex_value_from_ngx_str(cf, &conf->last_message_id.cv[1], &second_choice_msgid) == NGX_CONF_ERROR) {
+      return NGX_CONF_ERROR;
+    }
+    conf->last_message_id.n = 2;
+  }
+    
+  ngx_conf_merge_value(conf->redis.url_enabled, prev->redis.url_enabled, 0);
+  
+  ngx_conf_merge_value(conf->redis.upstream_inheritable, prev->redis.upstream_inheritable, 0);
+  ngx_conf_merge_str_value(conf->redis.url, prev->redis.url, NCHAN_REDIS_DEFAULT_URL);
+  
+  if(up && up->redis.namespace.len > 0) { //upstream has a namespace set
+    ngx_conf_merge_str_value(conf->redis.namespace, up->redis.namespace, ""); 
+  }
+  else {
+    ngx_conf_merge_str_value(conf->redis.namespace, prev->redis.namespace, "");
+  }
+  
+  if(up)
+    ngx_conf_merge_value(conf->redis.ping_interval, up->redis.ping_interval, NGX_CONF_UNSET);
+  ngx_conf_merge_value(conf->redis.ping_interval, prev->redis.ping_interval, NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME);
+  
+  if(up)
+    ngx_conf_merge_value(conf->redis.nostore_fastpublish, up->redis.nostore_fastpublish, NGX_CONF_UNSET);
+  ngx_conf_merge_value(conf->redis.nostore_fastpublish, prev->redis.nostore_fastpublish, 0);
+  
+  if(conf->redis.url_enabled) {
+    conf->redis.enabled = 1;
+    nchan_store_redis_add_active_loc_conf(cf, conf);
+  }
+  if(conf->redis.upstream_inheritable && !conf->redis.upstream && prev->redis.upstream && prev->redis.upstream_url.len > 0) {
+    conf->redis.upstream_url = prev->redis.upstream_url;
+    ngx_conf_set_redis_upstream(cf, &conf->redis.upstream_url, conf);
+  }
+  
+  if(up)
+    MERGE_UNSET_CONF(conf->redis.storage_mode, up->redis.storage_mode, REDIS_MODE_CONF_UNSET, REDIS_MODE_CONF_UNSET);
+  MERGE_UNSET_CONF(conf->redis.storage_mode, prev->redis.storage_mode, REDIS_MODE_CONF_UNSET, REDIS_MODE_DISTRIBUTED);
+  
+  if(prev->request_handler != NULL && conf->request_handler == NULL) {
+    conf->request_handler = prev->request_handler;
+  }
+  if(conf->request_handler != NULL) {
+    nchan_setup_handler(cf, conf->request_handler);
+  }
+  
+  ngx_conf_merge_value(conf->benchmark.time, prev->benchmark.time, 10);
+  ngx_conf_merge_value(conf->benchmark.msgs_per_minute, prev->benchmark.msgs_per_minute, 120);
+  ngx_conf_merge_value(conf->benchmark.msg_padding, prev->benchmark.msg_padding, 0);
+  ngx_conf_merge_value(conf->benchmark.channels, prev->benchmark.channels, 1000);
+  ngx_conf_merge_value(conf->benchmark.subscribers_per_channel, prev->benchmark.subscribers_per_channel, 100);
+  MERGE_UNSET_CONF(conf->benchmark.subscriber_distribution, prev->benchmark.subscriber_distribution, NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_UNSET, NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM);
+  MERGE_UNSET_CONF(conf->benchmark.publisher_distribution, prev->benchmark.publisher_distribution, NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_UNSET, NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM);
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_set_storage_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t     *lcf = conf;
+  ngx_str_t            *val = &((ngx_str_t *) cf->args->elts)[1];
+  
+  if(nchan_strmatch(val, 1, "memory")) {
+    lcf->storage_engine = &nchan_store_memory;
+  }
+  else if(nchan_strmatch(val, 1, "redis")) {
+    lcf->storage_engine = &nchan_store_redis;
+    global_redis_enabled = 1;
+  }
+  else {
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "invalid %V value: %V", &cmd->name, val);
+    return NGX_CONF_ERROR;
+  }
+
+  return NGX_CONF_OK;
+}
+
+#define WEBSOCKET_STRINGS "websocket", "ws", "websockets"
+#define WEBSOCKET_STRINGS_N 3
+
+#define EVENTSOURCE_STRINGS "eventsource", "event-source", "es", "sse"
+#define EVENTSOURCE_STRINGS_N 4
+
+#define HTTP_CHUNKED_STRINGS "chunked", "http-chunked"
+#define HTTP_CHUNKED_STRINGS_N 2
+
+#define HTTP_MULTIPART_STRINGS "multipart", "multipart/mixed", "http-multipart", "multipart-mixed"
+#define HTTP_MULTIPART_STRINGS_N 4
+
+#define LONGPOLL_STRINGS "longpoll", "long-poll"
+#define LONGPOLL_STRINGS_N 2
+
+#define INTERVALPOLL_STRINGS "poll", "interval-poll", "intervalpoll", "http"
+#define INTERVALPOLL_STRINGS_N 4
+
+#define HTTP_RAW_STREAM_STRINGS "http-raw-stream"
+#define HTTP_RAW_STREAM_STRINGS_N 1
+
+#define DISABLED_STRINGS "none", "off", "disabled"
+#define DISABLED_STRINGS_N 3
+
+static char *nchan_publisher_directive_parse(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, ngx_int_t fail) {
+  nchan_loc_conf_t     *lcf = conf;
+  ngx_str_t            *val;
+  ngx_uint_t            i;
+  
+  
+  nchan_conf_publisher_types_t *pubt = &lcf->pub;
+  
+  if(cf->args->nelts == 1){ //no arguments
+    pubt->http=1;
+    pubt->websocket=1;
+  }
+  else {
+    for(i=1; i < cf->args->nelts; i++) {
+      val = &((ngx_str_t *) cf->args->elts)[i];
+      if(nchan_strmatch(val, 1, "http")) {
+        pubt->http=1;
+      }
+      else if(nchan_strmatch(val, WEBSOCKET_STRINGS_N, WEBSOCKET_STRINGS)) {
+        pubt->websocket=1;
+      }
+      else{
+         if(fail) {
+          ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
+         }
+        return NGX_CONF_ERROR;
+      }
+    }
+  }
+  
+  if(!is_valid_location(cf, lcf)) {
+    return NGX_CONF_ERROR;
+  }
+  lcf->request_handler = &nchan_pubsub_handler;
+  return NGX_CONF_OK;
+}
+
+static char *nchan_publisher_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_publisher_directive_parse(cf, cmd, conf, 1);
+}
+
+static char *nchan_subscriber_directive_parse(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, ngx_int_t fail) {
+  nchan_loc_conf_t     *lcf = conf;
+  ngx_str_t            *val;
+  ngx_uint_t            i;
+  
+  nchan_conf_subscriber_types_t *subt = &lcf->sub;
+  
+  if(cf->args->nelts == 1){ //no arguments
+    subt->poll=0;
+    subt->http_raw_stream = 0;
+    subt->longpoll=1;
+    subt->websocket=1;
+    subt->eventsource=1;
+    subt->http_chunked=1;
+    subt->http_multipart=1;
+  }
+  else {
+    for(i=1; i < cf->args->nelts; i++) {
+      val = &((ngx_str_t *) cf->args->elts)[i];
+      if(nchan_strmatch(val, LONGPOLL_STRINGS_N, LONGPOLL_STRINGS)) {
+        subt->longpoll=1;
+      }
+      else if(nchan_strmatch(val, INTERVALPOLL_STRINGS_N, INTERVALPOLL_STRINGS)) {
+        subt->poll=1;
+      }
+      else if(nchan_strmatch(val, HTTP_RAW_STREAM_STRINGS_N, HTTP_RAW_STREAM_STRINGS)) {
+        subt->http_raw_stream=1;
+      }
+      else if(nchan_strmatch(val, HTTP_CHUNKED_STRINGS_N, HTTP_CHUNKED_STRINGS)) {
+        subt->http_chunked=1;
+      }
+      else if(nchan_strmatch(val, HTTP_MULTIPART_STRINGS_N, HTTP_MULTIPART_STRINGS)) {
+        subt->http_multipart=1;
+      }
+      else if(nchan_strmatch(val, WEBSOCKET_STRINGS_N, WEBSOCKET_STRINGS)) {
+        subt->websocket=1;
+      }
+      else if(nchan_strmatch(val, EVENTSOURCE_STRINGS_N, EVENTSOURCE_STRINGS)) {
+        subt->eventsource=1;
+      }
+      else if(nchan_strmatch(val, DISABLED_STRINGS_N, DISABLED_STRINGS)) {
+        subt->poll=0;
+        subt->longpoll=0;
+        subt->websocket=0;
+        subt->eventsource=0;
+        subt->http_chunked=0;
+        subt->http_multipart=0;
+      }
+      else {
+        if(fail) {
+          ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
+        }
+        return NGX_CONF_ERROR;
+      }
+    }
+  }
+  
+  if(!is_valid_location(cf, lcf)) {
+    return NGX_CONF_ERROR;
+  }
+  lcf->request_handler = &nchan_pubsub_handler;
+  return NGX_CONF_OK;
+}
+
+static char *nchan_subscriber_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_subscriber_directive_parse(cf, cmd, conf, 1);
+}
+
+static char *nchan_pubsub_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t            *val;
+  ngx_uint_t            i;
+  nchan_loc_conf_t     *lcf = conf;
+  nchan_publisher_directive_parse(cf, cmd, conf, 0);
+  nchan_subscriber_directive_parse(cf, cmd, conf, 0);
+  for(i=1; i < cf->args->nelts; i++) {
+    val = &((ngx_str_t *) cf->args->elts)[i];
+    if(! nchan_strmatch(val, 
+      WEBSOCKET_STRINGS_N + EVENTSOURCE_STRINGS_N + HTTP_CHUNKED_STRINGS_N + HTTP_MULTIPART_STRINGS_N + LONGPOLL_STRINGS_N + INTERVALPOLL_STRINGS_N + HTTP_RAW_STREAM_STRINGS_N + DISABLED_STRINGS_N,
+      WEBSOCKET_STRINGS, EVENTSOURCE_STRINGS, HTTP_CHUNKED_STRINGS, HTTP_MULTIPART_STRINGS, LONGPOLL_STRINGS, INTERVALPOLL_STRINGS, HTTP_RAW_STREAM_STRINGS, DISABLED_STRINGS)) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
+      return NGX_CONF_ERROR;
+    }
+  }
+  
+  if(!is_valid_location(cf, lcf)) {
+    return NGX_CONF_ERROR;
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_subscriber_info_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t     *lcf = conf;
+  nchan_conf_subscriber_types_t *subt = &lcf->sub;
+  
+  // doesn't make sense to have longpoll be the default HTTP subscriber, since channel info locations are likely to be curl'd by developers
+  subt->poll=0;
+  subt->http_raw_stream = 1;
+  subt->longpoll=0;
+  subt->websocket=1;
+  subt->eventsource=1;
+  subt->http_chunked=1;
+  subt->http_multipart=1;
+  
+  lcf->subscriber_info_location = 1;
+  
+  lcf->message_timeout=10;
+  lcf->complex_message_timeout = NULL;
+  
+  lcf->request_handler = &nchan_subscriber_info_handler;
+  return NGX_CONF_OK;
+}
+
+static char *nchan_group_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t     *lcf = conf;
+  ngx_str_t            *val;
+  ngx_uint_t            i;
+  nchan_conf_group_t   *group = &lcf->group;
+  
+  if(cf->args->nelts == 1){ //no arguments
+    group->get=1;
+    group->set=1;
+    group->delete=1;
+  }
+  else {
+    for(i=1; i < cf->args->nelts; i++) {
+      val = &((ngx_str_t *) cf->args->elts)[i];
+      if(nchan_strmatch(val, 1, "get")) {
+        group->get=1;
+      }
+      else if(nchan_strmatch(val, 1, "set")) {
+        group->set=1;
+      }
+      else if(nchan_strmatch(val, 1, "delete")) {
+        group->delete=1;
+      }
+      else if(nchan_strmatch(val, 1, "off")) {
+        group->get=0;
+        group->set=0;
+        group->delete=0;
+      }
+      else {
+        ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V", &cmd->name, val);
+        return NGX_CONF_ERROR;
+      }
+    }
+  }
+  
+  if(!is_valid_location(cf, lcf)) {
+    return NGX_CONF_ERROR;
+  }
+  lcf->request_handler = &nchan_group_handler;
+  return NGX_CONF_OK;
+}
+
+static ngx_int_t set_complex_value(ngx_conf_t *cf, ngx_http_complex_value_t **cv, char *val) {
+  ngx_http_compile_complex_value_t    ccv;
+  ngx_str_t                          *value = ngx_palloc(cf->pool, sizeof(ngx_str_t));;
+  if(value == NULL) {
+    return NGX_ERROR;
+  }
+  value->data = (u_char *)val;
+  value->len = strlen(val);
+  *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+  if (*cv == NULL) {
+    return NGX_ERROR;
+  } 
+  ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+  ccv.cf = cf;
+  ccv.value = value;
+  ccv.complex_value = *cv;
+  if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t set_complex_value_array_size1(ngx_conf_t *cf, nchan_complex_value_arr_t *chid, char *val) {
+  chid->n = 1;
+  return set_complex_value(cf, &chid->cv[0], val);
+}
+
+static char *nchan_benchmark_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t     *lcf = conf;
+  global_benchmark_enabled = 1;
+  lcf->request_handler = &nchan_benchmark_handler;
+  
+  
+  //set group
+  if(set_complex_value(cf, &lcf->channel_group, "benchmark") != NGX_OK) {
+    return "error setting benchmark channel group";
+  }
+  //set pub and sub channel ids
+  if(set_complex_value_array_size1(cf, &lcf->pub_chid, "control") != NGX_OK) {
+    return "error setting benchmark control channel";
+  }
+  if(set_complex_value_array_size1(cf, &lcf->sub_chid, "data") != NGX_OK) {
+    return "error setting benchmark data channel";
+  }
+  
+  lcf->sub.websocket = 1;
+  lcf->pub.websocket = 1;
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_benchmark_subscriber_distribution_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+  if(nchan_strmatch(val, 1, "random")) {
+    lcf->benchmark.subscriber_distribution = NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM;
+  }
+  else if(nchan_strmatch(val, 2, "optimal", "best")) {
+    lcf->benchmark.subscriber_distribution = NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_OPTIMAL;
+  }
+  else {
+    return "invalid value, must be \"random\" or \"optimal\"";
+  }
+  return NGX_CONF_OK;
+}
+static char *nchan_benchmark_publisher_distribution_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+  if(nchan_strmatch(val, 1, "random")) {
+    lcf->benchmark.publisher_distribution = NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM;
+  }
+  else if(nchan_strmatch(val, 2, "optimal", "best")) {
+    lcf->benchmark.publisher_distribution = NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_OPTIMAL;
+  }
+  else {
+    return "invalid value, must be \"random\" or \"optimal\"";
+  }
+  return NGX_CONF_OK;
+}
+
+static char *nchan_subscriber_first_message_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t   *lcf = (nchan_loc_conf_t *)conf;
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  if(nchan_strmatch(val, 1, "oldest")) {
+    lcf->subscriber_first_message = 1;
+  }
+  else if(nchan_strmatch(val, 1, "newest")) {
+    lcf->subscriber_first_message = 0;
+  }
+  else {
+    //maybe a number?
+    ngx_str_t num = *val;
+    int       sign = 1;
+    ngx_int_t n;
+    
+    if(num.len > 0 && num.data[0] == '-') {
+      num.len--;
+      num.data++;
+      sign = -1;
+    }
+    if((n = ngx_atoi(num.data, num.len)) == NGX_ERROR) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V, must be 'oldest', 'newest', or a number", &cmd->name, val);
+      return NGX_CONF_ERROR;
+    }
+    if (n > 32) {
+      ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid %V value: %V, must be 'oldest', 'newest', or a number between -32 and 32", &cmd->name, val);
+      return NGX_CONF_ERROR;
+    }
+    lcf->subscriber_first_message = n * sign;
+  }
+  return NGX_CONF_OK;
+}
+
+static char *nchan_websocket_heartbeat_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t   *lcf = (nchan_loc_conf_t *)conf;
+  ngx_str_t          *heartbeat_in = &((ngx_str_t *) cf->args->elts)[1];
+  ngx_str_t          *heartbeat_out = &((ngx_str_t *) cf->args->elts)[2];
+  ngx_str_t          *in, *out;
+  lcf->websocket_heartbeat.enabled = 1;
+  
+  in = ngx_pcalloc(cf->pool, sizeof(ngx_str_t) + heartbeat_in->len);
+  in->data = (u_char *)&in[1];
+  in->len = heartbeat_in->len;
+  ngx_memcpy(in->data, heartbeat_in->data, heartbeat_in->len);
+  lcf->websocket_heartbeat.in = in;
+  
+  out = ngx_pcalloc(cf->pool, sizeof(ngx_str_t) + heartbeat_out->len);
+  out->data = (u_char *)&out[1];
+  out->len = heartbeat_out->len;
+  ngx_memcpy(out->data, heartbeat_out->data, heartbeat_out->len);
+  lcf->websocket_heartbeat.out = out;
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_conf_deflate_compression_level_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if (NGX_ZLIB)
+  nchan_main_conf_t  *mcf = (nchan_main_conf_t *)conf;
+  ngx_int_t           np;
+  ngx_str_t           *value = cf->args->elts;
+  np = ngx_atoi(value[1].data, value[1].len);
+  if (np == NGX_ERROR) {
+    return "invalid number";
+  }
+  if(np < 0 || np > 9) {
+    return "must be between 0 and 9";
+  }
+  
+  mcf->zlib_params.level = np;
+#endif
+  return NGX_CONF_OK;
+}
+
+static char *nchan_conf_deflate_compression_strategy_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if (NGX_ZLIB)
+  nchan_main_conf_t   *mcf = (nchan_main_conf_t *)conf;
+  ngx_str_t           *val = cf->args->elts;
+  if(nchan_strmatch(val, 1, "default")) {
+    mcf->zlib_params.strategy = Z_DEFAULT_STRATEGY;
+  }
+  else if(nchan_strmatch(val, 1, "filtered")) {
+    mcf->zlib_params.strategy = Z_FILTERED;
+  }
+  else if(nchan_strmatch(val, 1, "huffman-only")) {
+    mcf->zlib_params.strategy = Z_HUFFMAN_ONLY;
+  }
+  else if(nchan_strmatch(val, 1, "rle")) {
+    mcf->zlib_params.strategy = Z_RLE;
+  }
+  else if(nchan_strmatch(val, 1, "fixed")) {
+    mcf->zlib_params.strategy = Z_FIXED;
+  }
+  else {
+    return "invalid compression strategy";
+  }
+#endif
+  return NGX_CONF_OK;
+}
+
+static char *nchan_conf_deflate_compression_window_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if (NGX_ZLIB)
+  nchan_main_conf_t  *mcf = (nchan_main_conf_t *)conf;
+  ngx_int_t           np;
+  ngx_str_t           *value = cf->args->elts;
+  np = ngx_atoi(value[1].data, value[1].len);
+  if (np == NGX_ERROR) {
+    return "invalid number";
+  }
+  if(np < 9 || np > 15) {
+    return "must be between 9 and 15";
+  }
+  
+  mcf->zlib_params.windowBits = np;
+#endif
+  return NGX_CONF_OK;
+}
+
+static char *nchan_conf_deflate_compression_memlevel_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if (NGX_ZLIB)
+  nchan_main_conf_t  *mcf = (nchan_main_conf_t *)conf;
+  ngx_int_t           np;
+  ngx_str_t           *value = cf->args->elts;
+  np = ngx_atoi(value[1].data, value[1].len);
+  if (np == NGX_ERROR) {
+    return "invalid number";
+  }
+  if(np < 1 || np > 9) {
+    return "must be between 1 and 9";
+  }
+  
+  mcf->zlib_params.memLevel = np;
+#endif
+  return NGX_CONF_OK;
+}
+
+
+static void nchan_exit_worker(ngx_cycle_t *cycle) {
+  if(!global_nchan_enabled) {
+    return;
+  }
+  
+  nchan_stats_exit_worker(cycle);
+  
+  if(global_redis_enabled) {
+    redis_store_prepare_to_exit_worker();
+  }
+  nchan_store_memory.exit_worker(cycle);
+  if(global_redis_enabled) {
+    nchan_store_redis.exit_worker(cycle);
+  }
+  nchan_output_shutdown();
+#if (NGX_ZLIB)
+  if(global_zstream_needed) {
+    nchan_common_deflate_shutdown();
+  }
+#endif
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  subscriber_debug_assert_isempty();
+#endif
+}
+
+static void nchan_exit_master(ngx_cycle_t *cycle) {
+  if(!global_nchan_enabled) {
+    return;
+  }
+  nchan_stats_exit_master(cycle);
+  
+  if(global_benchmark_enabled) {
+    nchan_benchmark_exit_master(cycle);
+  }
+  nchan_store_memory.exit_master(cycle);
+  if(global_redis_enabled) {
+    nchan_store_redis.exit_master(cycle);
+  }
+#if (NGX_ZLIB)
+  if(global_zstream_needed) {
+    nchan_common_deflate_shutdown();
+  }
+#endif
+}
+
+static char *nchan_set_complex_value_array(ngx_conf_t *cf, ngx_command_t *cmd, void *conf, nchan_complex_value_arr_t *chid) {
+  ngx_uint_t                          i;
+  ngx_str_t                          *value;
+  ngx_http_complex_value_t          **cv;
+  ngx_http_compile_complex_value_t    ccv;  
+  
+  chid->n = cf->args->nelts - 1;
+  for(i=1; i < cf->args->nelts && i <= NCHAN_COMPLEX_VALUE_ARRAY_MAX; i++) {
+    value = &((ngx_str_t *) cf->args->elts)[i];
+    
+    cv = &chid->cv[i-1];
+    *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+    if (*cv == NULL) {
+      return NGX_CONF_ERROR;
+    }
+    
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+    ccv.cf = cf;
+    ccv.value = value;
+    ccv.complex_value = *cv;
+    
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+      return NGX_CONF_ERROR;
+    }
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_set_pub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->pub_chid);
+}
+
+static char *nchan_set_sub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t *lcf = conf;
+  return nchan_set_complex_value_array(cf, cmd, conf, &lcf->sub_chid);
+}
+
+static char *nchan_set_pubsub_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t *lcf = conf;
+  return nchan_set_complex_value_array(cf, cmd, conf, &lcf->pubsub_chid);
+}
+
+static char *nchan_subscriber_last_message_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  return nchan_set_complex_value_array(cf, cmd, conf, &((nchan_loc_conf_t *)conf)->last_message_id);
+}
+
+static char *nchan_set_channel_events_channel_id(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t                          *value = &((ngx_str_t *) cf->args->elts)[1];
+  ngx_http_complex_value_t          **cv = &((nchan_loc_conf_t *)conf)->channel_events_channel_id;
+  ngx_http_compile_complex_value_t    ccv;  
+  
+  *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+  if (*cv == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  
+  ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+  ccv.cf = cf;
+  ccv.value = value;
+  ccv.complex_value = *cv;
+  
+  if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+    return NGX_CONF_ERROR;
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *nchan_store_messages_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  char    *p = conf;
+  ngx_str_t *val = cf->args->elts;
+
+  
+  if (ngx_strcasecmp(val[1].data, (u_char *) "off") == 0) {
+    ngx_int_t *max;
+    max = (ngx_int_t *) (p + offsetof(nchan_loc_conf_t, max_messages));
+    *max=0;
+  }
+  return NGX_CONF_OK;
+}
+
+static char *nchan_set_message_buffer_length(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t    *lcf = conf;
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *arg = &val[1];
+  
+  if(memchr(arg->data, '$', arg->len)) {
+    //complex
+    lcf->max_messages = NGX_CONF_UNSET;
+    cmd->offset = offsetof(nchan_loc_conf_t, complex_max_messages);
+    ngx_http_set_complex_value_slot(cf, cmd, conf);
+    memstore_reserve_conf_shared_data(lcf);
+  }
+  else {
+    //simple
+    lcf->complex_max_messages = NULL;
+    cmd->offset = offsetof(nchan_loc_conf_t, max_messages);
+    ngx_conf_set_num_slot(cf, cmd, conf);
+  }
+  return NGX_CONF_OK;
+}
+
+static char *ngx_http_set_unsubscribe_request_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+#if nginx_version >= 1003015
+  return ngx_http_set_complex_value_slot(cf, cmd, conf);
+#else
+  ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "%V not available on nginx version: %s, must be at least 1.3.15", &cmd->name, NGINX_VERSION);
+  return NGX_CONF_ERROR;
+#endif
+}
+
+static char *nchan_set_message_timeout(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t    *lcf = conf;
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *arg = &val[1];
+  
+  if(memchr(arg->data, '$', arg->len)) {
+    //complex
+    lcf->message_timeout = NGX_CONF_UNSET;
+    cmd->offset = offsetof(nchan_loc_conf_t, complex_message_timeout);
+    ngx_http_set_complex_value_slot(cf, cmd, conf);
+    memstore_reserve_conf_shared_data(lcf);
+  }
+  else {
+    //simple
+    lcf->complex_message_timeout = NULL;
+    cmd->offset = offsetof(nchan_loc_conf_t, message_timeout);
+    ngx_conf_set_sec_slot(cf, cmd, conf);
+  }
+  return NGX_CONF_OK;
+}
+
+static char *nchan_ignore_obsolete_setting(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "ignoring obsolete nchan config directive '%V'.", &cmd->name);
+  return NGX_CONF_OK;
+}
+
+static char *nchan_ignore_subscriber_concurrency(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  if(!nchan_strmatch(val, 1, "broadcast")) {
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "ignoring obsolete nchan config directive '%V %V;'. Only 'broadcast' is currently supported.", &cmd->name, val);
+  }
+  return NGX_CONF_OK;
+}
+
+static char *nchan_set_raw_subscriber_separator(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+  ngx_str_t          *cf_val = &lcf->subscriber_http_raw_stream_separator;
+  
+  if( val->len && val->data[val->len - 1] != '\n' ) { //must end in a newline if not empty
+    u_char   *cur;
+    if((cur = ngx_palloc(cf->pool, val->len + 1)) == NULL) {
+      return NGX_CONF_ERROR;
+    }
+    ngx_memcpy(cur, val->data, val->len);
+    cur[val->len] = '\n';
+    cf_val->len = val->len + 1;
+    cf_val->data = cur;
+  }
+  else {
+    *cf_val = *val;
+  }
+  return NGX_CONF_OK;
+}
+
+static char *nchan_set_message_compression_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+#if (NGX_ZLIB)
+  if(nchan_strmatch(val, 1, "on")) {
+    lcf->message_compression = 1;
+    global_zstream_needed = 1;
+  }
+  else if(nchan_strmatch(val, 1, "off")) {
+    lcf->message_compression = 0;
+  }
+  else {
+    return "invalid value: must be 'on' or 'off'";
+  }
+  return NGX_CONF_OK;
+#else
+  return "cannot use compression, Nginx was built without zlib";
+#endif
+}
+
+static char *nchan_set_longpoll_multipart(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  nchan_loc_conf_t   *lcf = conf;
+  if(nchan_strmatch(val, 1, "on")) {
+    lcf->longpoll_multimsg = 1;
+  }
+  else if(nchan_strmatch(val, 1, "off")) {
+    lcf->longpoll_multimsg = 0;
+  }
+  else if(nchan_strmatch(val, 1, "raw")) {
+    lcf->longpoll_multimsg = 1;
+    lcf->longpoll_multimsg_use_raw_stream_separator = 1;
+  }
+  else {
+    ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "invalid value for %V: %V;'. Must be 'on', 'off', or 'raw'", &cmd->name, val);
+    return NGX_CONF_ERROR;
+  }
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_set_redis_subscribe_weights(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_int_t  master = NGX_CONF_UNSET;
+  ngx_int_t  slave = NGX_CONF_UNSET;
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *cur;
+  unsigned   i;
+  nchan_srv_conf_t *scf = conf;
+  for(i=1; i < cf->args->nelts; i++) {
+    cur = &val[i];
+    if(nchan_str_after(&cur, "master=")) {
+      if((master = ngx_atoi(cur->data, cur->len)) == NGX_ERROR) {
+        return "has invalid weight for master";
+      }
+    }
+    else if(nchan_str_after(&cur, "slave=")) {
+      if((slave = ngx_atoi(cur->data, cur->len)) == NGX_ERROR) {
+        return "has invalid weight for slave";
+      }
+    }
+  }
+  
+  if(master != NGX_CONF_UNSET) {
+    scf->redis.master_weight = master;
+  }
+  if(slave != NGX_CONF_UNSET) {
+    scf->redis.slave_weight = slave;
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_set_jitter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  char               *p = conf;
+  double             *field = (double *) (p + cmd->offset);
+  double              fp;
+  
+  if((fp = nchan_atof(val->data, val->len)) == NGX_ERROR) {
+    return "invalid value, must be a non-negative floating-point number";
+  }
+
+  if(fp >= 1) {
+    return "jitter multiplier cannot exceed 1";
+  }
+  if(fp < 0) {
+    return "jitter multiplier cannot be less than 0";
+  }
+  *field = fp;
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_set_exponential_backoff(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t          *val = &((ngx_str_t *) cf->args->elts)[1];
+  char               *p = conf;
+  double             *field = (double *) (p + cmd->offset);
+  double              fp;
+  
+  if((fp = nchan_atof(val->data, val->len)) == NGX_ERROR) {
+    return "invalid value, must be a non-negative floating-point number";
+  }
+
+  if(fp < 0) {
+    return "value cannot be less than 0";
+  }
+  
+  *field = fp;
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_enable_redis(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  char                *rc;
+  ngx_flag_t          *fp;
+  char                *p = conf;
+  nchan_loc_conf_t    *lcf = conf;
+  
+  ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Use of %V is discouraged in favor of nchan_redis_pass.", &cmd->name);
+  
+  rc = ngx_conf_set_flag_slot(cf, cmd, conf);
+  if(rc == NGX_CONF_ERROR) {
+    return rc;
+  }
+  fp = (ngx_flag_t *) (p + cmd->offset);
+  
+  if(*fp) {
+    if(!lcf->redis.enabled) {
+      lcf->redis.enabled = 1;
+      nchan_store_redis_add_active_loc_conf(cf, lcf);
+    }
+    global_redis_enabled = 1;
+  }
+  else {
+    nchan_store_redis_remove_active_loc_conf(cf, lcf);
+  }
+  
+  return rc;
+}
+
+static char *nchan_stub_status_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t    *lcf = conf;
+  nchan_stub_status_enabled = 1;
+  lcf->request_handler = &nchan_stub_status_handler;
+  return NGX_CONF_OK;
+}
+
+
+static ngx_int_t nchan_upstream_dummy_roundrobin_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us) {
+  return NGX_OK;
+}
+
+static char *ngx_conf_upstream_redis_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_http_upstream_srv_conf_t        *uscf;
+  ngx_str_t                           *value;
+  ngx_http_upstream_server_t          *usrv;
+  nchan_loc_conf_t                    *lcf = conf;
+  uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module);  
+  nchan_srv_conf_t                    *scf = NULL;
+  ngx_str_t                           server_name;
+  ngx_str_t                           slave = ngx_string("slave");
+  scf = ngx_http_conf_upstream_srv_conf(uscf, ngx_nchan_module);
+  if(scf->upstream_nchan_loc_conf) {
+    assert(scf->upstream_nchan_loc_conf == lcf);
+  }
+  else {
+    //is this even a safe technique? it might break in the future...
+    scf->upstream_nchan_loc_conf = lcf;
+  }
+  
+  
+  if(uscf->servers == NULL) {
+        uscf->servers = ngx_array_create(cf->pool, 4, sizeof(ngx_http_upstream_server_t));
+  }
+  if ((usrv = ngx_array_push(uscf->servers)) == NULL) {
+    return NGX_CONF_ERROR;
+  }
+  value = cf->args->elts;
+  
+  if(!nchan_store_redis_validate_url(&value[1])) {
+    return "url is invalid";
+  }
+  if(cf->args->nelts <= 2) {
+    server_name = value[1];
+  }
+  else {
+    ngx_str_t *forced_role = &value[2];
+    
+    if(nchan_strmatch(forced_role, 1, "master")) {
+      //good.
+    }
+    else if(nchan_strmatch(forced_role, 2, "slave", "replica")) {
+      forced_role = &slave;
+    }
+    else {
+      return "invalid redis server role";
+    }
+    
+    size_t combined_length = value[1].len + 1 + value[2].len + 1;
+    server_name.data = ngx_pcalloc(cf->pool, combined_length);
+    assert(server_name.data);
+    server_name.len = ngx_snprintf(server_name.data, combined_length, "%V %V%Z", &value[1], forced_role) - server_name.data;
+  }
+  
+  ngx_memzero(usrv, sizeof(*usrv));
+#if nginx_version >= 1007002
+  usrv->name = server_name;
+#endif
+  usrv->addrs = ngx_pcalloc(cf->pool, sizeof(ngx_addr_t));
+  usrv->addrs->name = server_name;
+  
+  uscf->peer.init_upstream = nchan_upstream_dummy_roundrobin_init;
+  return NGX_CONF_OK;
+}
+
+static void ipv6_prefix_size_to_mask(int prefix_size, struct in6_addr *mask) {
+  ngx_memzero(mask, sizeof(*mask));
+  int i;
+  for(i=0; prefix_size > 0; prefix_size-=8, i++) {
+    mask->s6_addr[i]= (prefix_size >= 8) ? 0xFF : (unsigned long)(0xFFU << (8 - prefix_size));
+  }
+}
+
+static void ipv4_prefix_size_to_mask(int prefix_size, struct in_addr *mask) {
+  mask->s_addr= (in_addr_t )(prefix_size > 0 ? htonl(~((1 << (32 - prefix_size)) - 1)) : 0);
+}
+
+static char *ngx_conf_set_redis_ip_blacklist(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_srv_conf_t    *scf = conf;
+  ngx_str_t           *cur;
+  ngx_str_t           *val = cf->args->elts;
+  int                  i;
+  nchan_redis_ip_range_t *blacklist = ngx_palloc(cf->pool, sizeof(*blacklist) * (cf->args->nelts - 1));
+  if(blacklist == NULL) {
+    return "couldn't allocate Redis server blacklist";
+  }
+  
+  scf->redis.blacklist = blacklist;
+  scf->redis.blacklist_count = cf->args->nelts - 1;
+  
+  for(i=1; i <= scf->redis.blacklist_count; i++) {
+    cur = &val[i];
+    nchan_redis_ip_range_t *entry = &blacklist[i-1];
+    entry->str = *cur;
+    int                     prefix_size;
+    u_char                 *slash = memchr(cur->data, '/', cur->len);
+    if(slash) {
+      prefix_size = ngx_atoi(slash+1, cur->len - (slash + 1 - cur->data));
+      if(prefix_size == NGX_ERROR) {
+        return "invalid CIDR range prefix size";
+      }
+    }
+    else {
+      prefix_size = -1;
+      slash = &cur->data[cur->len];
+    }
+    
+    char buf[64];
+    ngx_memzero(buf, sizeof(buf));
+    memcpy(buf, cur->data, (slash - cur->data));
+    
+    struct addrinfo hints = {0};
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags    = AI_PASSIVE;
+    
+    struct addrinfo *res;
+    if(getaddrinfo(buf, NULL, &hints, &res) != 0) {
+      return "unable to parse IP address";
+    }
+    entry->family = res->ai_family;
+    if(entry->family == AF_INET) {
+      struct sockaddr_in *sa = (struct sockaddr_in *)res->ai_addr;
+      entry->addr.ipv4 = sa->sin_addr;
+      entry->addr_block.ipv4 = sa->sin_addr;
+    }
+#ifdef AF_INET6
+    else if(entry->family == AF_INET6) {
+      struct sockaddr_in6 *sa = (struct sockaddr_in6 *)res->ai_addr;
+      entry->addr.ipv6 = sa->sin6_addr;
+      entry->addr_block.ipv6 = sa->sin6_addr;
+    }
+#endif
+    else {
+      return "invalid address family";
+    }
+    
+    if(prefix_size == 0) {
+      return "netmask size of 0 would block everything";
+    }
+    
+    if(prefix_size == -1) {
+      //no prefix size given, assume we're blacklisting single ip.
+      //prefix size depends on ipv4 or ipv6
+      prefix_size = entry->family == AF_INET ? 32 : 128;
+    }
+    entry->prefix_size = prefix_size;
+    
+    if(entry->family == AF_INET) {
+      if(prefix_size > 32) {
+        return "netmask size cannot exceed 32 for IPv4";
+      }
+      ipv4_prefix_size_to_mask(prefix_size, &entry->mask.ipv4);
+      entry->addr_block.ipv4.s_addr &= entry->mask.ipv4.s_addr;
+      
+    }
+#ifdef AF_INET6
+    else if(entry->family == AF_INET6) {
+      if(prefix_size > 128) {
+        return "netmask size cannot exceed 128 for IPv4";
+      }
+      ipv6_prefix_size_to_mask(prefix_size, &entry->mask.ipv6);
+      unsigned j;
+      uint8_t *addr = entry->addr_block.ipv6.s6_addr;
+      uint8_t *mask = entry->mask.ipv6.s6_addr;
+      for(j=0; j<sizeof(entry->addr_block.ipv6.s6_addr); j++) {
+        addr[j] &= mask[j];
+      }
+    }
+#endif
+    else {
+      return "invalid address family";
+    }
+    freeaddrinfo(res);
+  }
+  return NGX_OK;
+}
+
+static char *ngx_conf_set_str_slot_no_newlines(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *arg = &val[1];
+  
+  if(nchan_ngx_str_substr(arg, "\n")) {
+    return "can't contain any newline characters";
+  }
+  
+  return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
+static char *ngx_conf_set_redis_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t  *lcf = conf;
+  ngx_str_t *val = cf->args->elts;
+  ngx_str_t *arg = &val[1];
+  
+  ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Use of %V is discouraged in favor of an upstream { } block with nchan_redis_server %V;", &cmd->name, arg);
+  
+  if(lcf->redis.upstream) {
+    return "can't be set here: already using nchan_redis_pass";
+  }
+  if(!nchan_store_redis_validate_url(arg)) {
+    return "url is invalid";
+  }
+  
+  return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
+static char *ngx_conf_process_redis_namespace_slot(ngx_conf_t *cf, void *post, void *fld) {
+  ngx_str_t *arg = fld;
+
+  if(memchr(arg->data, '{', arg->len)) {
+    return "can't contain character '{'";
+  }
+  
+  if(memchr(arg->data, '}', arg->len)) {
+    return "can't contain character '}'";
+  }
+  
+  if(arg->len > 0 && arg->data[arg->len-1] != ':') {
+    u_char  *nns;
+    if((nns = ngx_palloc(cf->pool, arg->len + 2)) == NULL) {
+      return "couldn't allocate redis namespace data";
+    }
+    ngx_memcpy(nns, arg->data, arg->len);
+    nns[arg->len]=':';
+    nns[arg->len+1]='\0';
+    arg->len++;
+    arg->data=nns;
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_set_redis_storage_mode_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  char                         *p = conf;
+  ngx_str_t                    *val = cf->args->elts;
+  ngx_str_t                    *arg = &val[1];
+  
+  nchan_redis_storage_mode_t   *field;
+
+  field = (nchan_redis_storage_mode_t *) (p + cmd->offset);
+  
+  if(*field != REDIS_MODE_CONF_UNSET) {
+    return "is duplicate";
+  }
+  
+  if(nchan_strmatch(arg, 1, "backup")) {
+    *field = REDIS_MODE_BACKUP;
+  }
+  else if(nchan_strmatch(arg, 1, "distributed")) {
+    *field = REDIS_MODE_DISTRIBUTED;
+  }
+  else if(nchan_strmatch(arg, 1, "nostore") ||  nchan_strmatch(arg, 1, "distributed-nostore")) {
+    *field = REDIS_MODE_DISTRIBUTED_NOSTORE;
+  }
+  else {
+    return "is invalid, must be one of 'distributed',  'backup' or 'nostore'";
+  }
+  
+  return NGX_CONF_OK;
+}
+
+static char *ngx_conf_set_redis_upstream_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t  *lcf = conf;
+  ngx_str_t         *value = cf->args->elts;
+  
+  lcf->redis.upstream_url = value[1];
+  return ngx_conf_set_redis_upstream(cf, &value[1], conf);
+}
+
+
+static char *nchan_redis_stats_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  nchan_loc_conf_t     *lcf = conf;
+  
+  ngx_http_set_complex_value_slot(cf, cmd, conf);
+  
+  if(!is_valid_location(cf, lcf)) {
+    return NGX_CONF_ERROR;
+  }
+  
+  nchan_redis_stats_enabled = 1;
+  
+  lcf->request_handler = &nchan_redis_stats_handler;
+  return NGX_CONF_OK;
+}
+
+#include "nchan_config_commands.c" //hideous but hey, it works
+
+static ngx_http_module_t  nchan_module_ctx = {
+    nchan_preconfig,               /* preconfiguration */
+    nchan_postconfig,              /* postconfiguration */
+    nchan_create_main_conf,        /* create main configuration */
+    NULL,                          /* init main configuration */
+    nchan_create_srv_conf,         /* create server configuration */
+    nchan_merge_srv_conf,          /* merge server configuration */
+    nchan_create_loc_conf,         /* create location configuration */
+    nchan_merge_loc_conf,          /* merge location configuration */
+};
+
+ngx_module_t  ngx_nchan_module = {
+    NGX_MODULE_V1,
+    &nchan_module_ctx,             /* module context */
+    nchan_commands,                /* module directives */
+    NGX_HTTP_MODULE,               /* module type */
+    NULL,                          /* init master */
+    nchan_init_module,             /* init module */
+    nchan_init_worker,             /* init process */
+    NULL,                          /* init thread */
+    NULL,                          /* exit thread */
+    nchan_exit_worker,             /* exit process */
+    nchan_exit_master,             /* exit master */
+    NGX_MODULE_V1_PADDING
+};
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_types.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_types.h
new file mode 100644
index 0000000..778e15a
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_types.h
@@ -0,0 +1,542 @@
+#ifndef NCHAN_TYPES_H
+#define NCHAN_TYPES_H
+#include <util/nchan_reuse_queue.h>
+#include <util/nchan_bufchainpool.h>
+
+typedef ngx_int_t (*callback_pt)(ngx_int_t, void *, void *);
+
+#include <util/nchan_fake_request.h>
+
+typedef enum {MSG_ERROR, MSG_CHANNEL_NOTREADY, MSG_INVALID, MSG_PENDING, MSG_NOTFOUND, MSG_FOUND, MSG_EXPECTED, MSG_EXPIRED} nchan_msg_status_t;
+typedef enum {INACTIVE, NOTREADY, WAITING, STUBBED, READY, DELETED} chanhead_pubsub_status_t;
+
+typedef enum {NCHAN_CONTENT_TYPE_PLAIN, NCHAN_CONTENT_TYPE_JSON, NCHAN_CONTENT_TYPE_XML, NCHAN_CONTENT_TYPE_YAML, NCHAN_CONTENT_TYPE_HTML} nchan_content_type_t;
+
+typedef enum {REDIS_MODE_CONF_UNSET = NGX_CONF_UNSET, REDIS_MODE_BACKUP = 1, REDIS_MODE_DISTRIBUTED = 2, REDIS_MODE_DISTRIBUTED_NOSTORE = 3} nchan_redis_storage_mode_t;
+
+typedef enum {
+  SUB_ENQUEUE, SUB_DEQUEUE, SUB_RECEIVE_MESSAGE, SUB_RECEIVE_STATUS, 
+  CHAN_PUBLISH, CHAN_DELETE  
+} channel_event_type_t;
+//on with the declarations
+typedef struct {
+  size_t                          shm_size;
+  ngx_msec_t                      redis_fakesub_timer_interval;
+  size_t                          redis_publish_message_msgkey_size;
+#if (NGX_ZLIB)
+  struct {
+                                    int level;
+                                    int windowBits;
+                                    int memLevel;
+                                    int strategy;
+  }                               zlib_params;
+#endif
+  ngx_path_t                     *message_temp_path;
+} nchan_main_conf_t;
+
+
+typedef struct {
+  ngx_str_t                     url;
+  ngx_flag_t                    url_enabled;
+  time_t                        ping_interval;
+  ngx_str_t                     namespace;
+  nchan_redis_storage_mode_t    storage_mode;
+  ngx_int_t                     nostore_fastpublish;
+  ngx_str_t                     upstream_url;
+  ngx_http_upstream_srv_conf_t *upstream;
+  ngx_flag_t                    upstream_inheritable;
+  unsigned                      enabled:1;
+  void                         *nodeset;
+  void                         *privdata;
+  
+  struct {
+    ngx_http_complex_value_t     *upstream_name;
+  }                             stats;
+  
+} nchan_redis_conf_t;
+
+typedef struct {
+  ngx_atomic_int_t  lock;
+  ngx_atomic_t      mutex;
+  ngx_int_t         write_pid;
+} ngx_rwlock_t;
+
+
+#define NCHAN_OLDEST_MSGID_TIME 0
+#define NCHAN_NEWEST_MSGID_TIME -1
+#define NCHAN_NTH_MSGID_TIME -2
+
+#define NCHAN_ZERO_MSGID {0, {{0}}, 0, 0}
+#define NCHAN_OLDEST_MSGID {NCHAN_OLDEST_MSGID_TIME, {{0}}, 0, 1}
+#define NCHAN_NEWEST_MSGID {NCHAN_NEWEST_MSGID_TIME, {{0}}, 0, 1}
+#define NCHAN_NTH_MSGID {NCHAN_NTH_MSGID_TIME, {{0}}, 0, 1}
+
+#define NCHAN_MULTITAG_MAX 255
+#define NCHAN_FIXED_MULTITAG_MAX 4
+union nchan_msg_multitag {
+  int16_t         fixed[NCHAN_FIXED_MULTITAG_MAX];
+  int16_t        *allocd;
+};
+
+typedef struct {
+  time_t                          time; //tag message by time
+  union nchan_msg_multitag        tag;
+  int16_t                         tagactive;
+  int16_t                         tagcount;
+} nchan_msg_id_t;
+
+typedef struct {
+  time_t                          time;
+  int16_t                         tag;
+} nchan_msg_tiny_id_t;
+
+//message queue
+
+#if NCHAN_MSG_RESERVE_DEBUG
+typedef struct msg_rsv_dbg_s msg_rsv_dbg_t;
+struct msg_rsv_dbg_s {
+  char                  *lbl;
+  msg_rsv_dbg_t         *prev;
+  msg_rsv_dbg_t         *next;
+}; //msg_rsv_dbg_s
+#endif
+
+typedef struct nchan_loc_conf_s nchan_loc_conf_t;
+typedef struct nchan_msg_s nchan_msg_t;
+
+typedef enum {NCHAN_MSG_SHARED, NCHAN_MSG_HEAP, NCHAN_MSG_POOL, NCHAN_MSG_STACK} nchan_msg_storage_t;
+
+typedef enum {
+  NCHAN_MSG_COMPRESSION_INVALID = -1,
+  NCHAN_MSG_NO_COMPRESSION = 0, 
+  NCHAN_MSG_COMPRESSION_WEBSOCKET_PERMESSAGE_DEFLATE
+} nchan_msg_compression_type_t;
+  
+typedef struct {
+  ngx_buf_t                       buf;
+  nchan_msg_compression_type_t    compression;
+} nchan_compressed_msg_t;
+
+struct nchan_msg_s {
+  nchan_msg_id_t                  id;
+  nchan_msg_id_t                  prev_id;
+  ngx_str_t                      *content_type;
+  ngx_str_t                      *eventsource_event;
+  //  ngx_str_t                   charset;
+  ngx_buf_t                       buf;
+  time_t                          expires;
+  
+  ngx_atomic_int_t                refcount;
+  nchan_msg_t                    *parent;
+  nchan_compressed_msg_t         *compressed;
+  //struct nchan_msg_s             *reload_next;
+  
+  nchan_msg_storage_t             storage;
+  
+#if NCHAN_MSG_RESERVE_DEBUG
+  struct msg_rsv_dbg_s           *rsv;
+#endif
+#if NCHAN_MSG_LEAK_DEBUG
+  ngx_str_t                       lbl;
+  struct nchan_msg_s             *dbg_prev;
+  struct nchan_msg_s             *dbg_next;
+#endif
+}; // nchan_msg_t
+
+typedef struct {
+  ngx_str_t                       id;
+  ngx_int_t                       messages;
+  ngx_int_t                       subscribers;
+  time_t                          last_seen;
+  nchan_msg_id_t                  last_published_msg_id;
+} nchan_channel_t;
+
+
+//garbage collecting goodness
+typedef struct {
+  ngx_queue_t                     queue;
+  nchan_channel_t                *channel;
+} nchan_channel_queue_t;
+
+
+typedef struct {
+  ngx_queue_t                    queue;
+  ngx_rwlock_t                   lock;
+} nchan_worker_msg_sentinel_t;
+
+typedef struct subscriber_s subscriber_t;
+
+typedef struct {
+  //must be made entirely of ngx_atomic_int_t
+  ngx_atomic_int_t                channels;
+  ngx_atomic_int_t                subscribers;
+  ngx_atomic_int_t                messages;
+  ngx_atomic_int_t                messages_shmem_bytes;
+  ngx_atomic_int_t                messages_file_bytes;
+} nchan_group_limits_t;
+
+typedef struct {
+  ngx_atomic_int_t               channels;
+  ngx_atomic_int_t               multiplexed_channels;
+  ngx_atomic_int_t               subscribers;
+  ngx_atomic_int_t               messages;
+  ngx_atomic_int_t               messages_shmem_bytes;
+  ngx_atomic_int_t               messages_file_bytes;
+  nchan_group_limits_t           limit;
+  ngx_str_t                      name;
+} nchan_group_t;
+
+typedef struct{
+  //init
+  ngx_int_t (*init_module)(ngx_cycle_t *cycle);
+  ngx_int_t (*init_worker)(ngx_cycle_t *cycle);
+  ngx_int_t (*init_postconfig)(ngx_conf_t *cf);
+  void      (*create_main_conf)(ngx_conf_t *cf, nchan_main_conf_t *mcf);
+  
+  //quit
+  void      (*exit_worker)(ngx_cycle_t *cycle);
+  void      (*exit_master)(ngx_cycle_t *cycle);
+  
+  //async-friendly functions with callbacks
+  ngx_int_t (*get_message) (ngx_str_t *, nchan_msg_id_t *, nchan_loc_conf_t *cf, callback_pt, void *);
+  ngx_int_t (*subscribe)   (ngx_str_t *, subscriber_t *);
+  ngx_int_t (*publish)     (ngx_str_t *, nchan_msg_t *, nchan_loc_conf_t *, callback_pt, void *);
+  
+    //channel actions
+  ngx_int_t (*delete_channel)(ngx_str_t *, nchan_loc_conf_t *, callback_pt, void *);
+  ngx_int_t (*find_channel)(ngx_str_t *, nchan_loc_conf_t *, callback_pt, void*);
+  
+  //group actions
+  ngx_int_t (*get_group)(ngx_str_t *name, nchan_loc_conf_t *, callback_pt, void *);
+  ngx_int_t (*set_group_limits)(ngx_str_t *name, nchan_loc_conf_t *, nchan_group_limits_t *limits, callback_pt, void *);
+  ngx_int_t (*delete_group)(ngx_str_t *name, nchan_loc_conf_t *, callback_pt, void *);
+
+  //subscriber info stuff
+  ngx_int_t (*get_subscriber_info_id)(nchan_loc_conf_t *,  callback_pt, void *);
+  ngx_int_t (*request_subscriber_info)(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *, callback_pt, void *);
+  
+} nchan_store_t;
+
+#define NCHAN_MULTI_SEP_CHR '\0'
+
+typedef struct {
+  unsigned                        http:1;
+  unsigned                        websocket:1;
+} nchan_conf_publisher_types_t;
+
+typedef struct {
+  unsigned                        poll:1; //bleugh
+  unsigned                        http_raw_stream:1; //ugleh
+  unsigned                        longpoll:1;
+  unsigned                        http_chunked:1;
+  unsigned                        http_multipart:1;
+  unsigned                        eventsource:1;
+  unsigned                        websocket:1;
+} nchan_conf_subscriber_types_t;
+
+typedef struct {
+  unsigned                        get:1;
+  unsigned                        set:1;
+  unsigned                        delete:1;
+  
+  ngx_int_t                       enable_accounting;
+  
+  ngx_http_complex_value_t       *max_channels;
+  ngx_http_complex_value_t       *max_subscribers;
+  ngx_http_complex_value_t       *max_messages;
+  ngx_http_complex_value_t       *max_messages_shm_bytes;
+  ngx_http_complex_value_t       *max_messages_file_bytes;
+} nchan_conf_group_t;
+
+#define NCHAN_COMPLEX_VALUE_ARRAY_MAX 8
+typedef struct {
+  ngx_http_complex_value_t       *cv[NCHAN_COMPLEX_VALUE_ARRAY_MAX];
+  ngx_int_t                       n;
+} nchan_complex_value_arr_t;
+
+typedef struct {
+ ngx_atomic_uint_t               message_timeout;
+ ngx_atomic_uint_t               max_messages;
+} nchan_loc_conf_shared_data_t;
+
+typedef struct {
+  int family;
+  int prefix_size;
+  ngx_str_t str;
+  struct {
+    union {
+      struct in_addr ipv4;
+#ifdef AF_INET6
+      struct in6_addr ipv6;
+      char            str[16];
+#endif
+    };
+  } addr;
+  struct {
+    union {
+      struct in_addr ipv4;
+#ifdef AF_INET6
+      struct in6_addr ipv6;
+      char            str[16];
+#endif
+    };
+  } addr_block;
+  struct {
+    union {
+      struct in_addr ipv4;
+#ifdef AF_INET6
+      struct in6_addr ipv6;
+#endif
+      char            str[16];
+    };
+  } mask;
+} nchan_redis_ip_range_t;
+
+typedef struct {
+  ngx_int_t         enabled;
+  ngx_str_t         trusted_certificate;
+  ngx_str_t         trusted_certificate_path;
+  ngx_str_t         client_certificate;
+  ngx_str_t         client_certificate_key;
+  ngx_str_t         server_name;
+  ngx_str_t         ciphers;
+  ngx_int_t         verify_certificate;
+} nchan_redis_tls_settings_t;
+
+typedef struct {
+    ngx_msec_t      min;
+    ngx_msec_t      max;
+    double          jitter_multiplier;
+    double          backoff_multiplier;
+} nchan_backoff_settings_t;
+
+typedef struct {
+  struct {
+      ngx_int_t                     retry_commands;
+      ngx_msec_t                    retry_commands_max_wait;
+      ngx_msec_t                    node_connect_timeout;  
+      ngx_msec_t                    cluster_connect_timeout;
+      ngx_msec_t                    cluster_max_failing_msec;
+      ngx_int_t                     load_scripts_unconditionally;
+      ngx_int_t                     accurate_subscriber_count;
+      nchan_backoff_settings_t      reconnect_delay;
+      nchan_backoff_settings_t      cluster_recovery_delay;
+      nchan_backoff_settings_t      cluster_check_interval;
+      nchan_backoff_settings_t      idle_channel_ttl;
+      ngx_msec_t                    idle_channel_ttl_safety_margin;
+      ngx_msec_t                    command_timeout;
+      ngx_int_t                     master_weight;
+      ngx_int_t                     slave_weight;
+      ngx_int_t                     blacklist_count;
+      nchan_redis_ip_range_t       *blacklist;
+      ngx_str_t                     username;
+      ngx_str_t                     password;
+      nchan_redis_tls_settings_t    tls;
+      struct {
+        ngx_int_t                     enabled;
+        time_t                        max_detached_time_sec;
+      }                             stats;
+  }                               redis;
+  nchan_loc_conf_t                *upstream_nchan_loc_conf;
+} nchan_srv_conf_t;
+
+typedef struct {
+  time_t                          time;
+  ngx_int_t                       msgs_per_minute;
+  ngx_int_t                       msg_padding;
+  ngx_int_t                       channels;
+  ngx_int_t                       subscribers_per_channel;
+  enum {
+    NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_UNSET = -1,
+    NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM = 1,
+    NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_OPTIMAL = 2
+  }                               subscriber_distribution;
+  enum {
+    NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_UNSET = -1,
+    NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM = 1,
+    NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_OPTIMAL = 2
+  }                               publisher_distribution;
+} nchan_benchmark_conf_t;
+
+struct nchan_loc_conf_s { //nchan_loc_conf_t
+  
+  ngx_int_t                       shared_data_index;
+  
+  time_t                          message_timeout;
+  ngx_int_t                       max_messages;
+  
+  ngx_http_complex_value_t       *complex_message_timeout;
+  ngx_http_complex_value_t       *complex_max_messages;
+  
+  ngx_http_complex_value_t       *authorize_request_url;
+  ngx_http_complex_value_t       *publisher_upstream_request_url;
+  
+  ngx_http_complex_value_t       *unsubscribe_request_url;
+  ngx_http_complex_value_t       *subscribe_request_url;
+  
+  nchan_complex_value_arr_t       pub_chid;
+  nchan_complex_value_arr_t       sub_chid;
+  nchan_complex_value_arr_t       pubsub_chid;
+  ngx_http_complex_value_t       *channel_group;
+  
+  ngx_str_t                       channel_id_split_delimiter;
+  
+  ngx_str_t                       subscriber_http_raw_stream_separator;
+
+  ngx_http_complex_value_t       *allow_origin;
+  ngx_int_t                       allow_credentials;
+  
+  nchan_complex_value_arr_t       last_message_id;
+  ngx_str_t                       custom_msgtag_header;
+  ngx_int_t                       msg_in_etag_only;
+  
+  nchan_conf_publisher_types_t    pub;
+  nchan_conf_subscriber_types_t   sub; 
+  nchan_conf_group_t              group;
+  time_t                          subscriber_timeout;
+  
+  ngx_int_t                       longpoll_multimsg;
+  ngx_int_t                       longpoll_multimsg_use_raw_stream_separator;
+  
+  ngx_str_t                       eventsource_event;
+  
+  time_t                          websocket_ping_interval;
+  struct {
+    time_t                          interval;
+    ngx_str_t                       event;
+    ngx_str_t                       data;
+    ngx_str_t                       comment;
+  }                               eventsource_ping;
+  
+  struct {
+    ngx_int_t   enabled;
+    ngx_str_t  *in;
+    ngx_str_t  *out;
+  }                               websocket_heartbeat;
+  
+  nchan_msg_compression_type_t    message_compression;
+  
+  ngx_int_t                       subscriber_first_message;
+  
+  ngx_http_complex_value_t       *subscriber_info_string;
+  ngx_int_t                       subscriber_info_location;
+  
+  ngx_http_complex_value_t       *channel_events_channel_id;
+  ngx_http_complex_value_t       *channel_event_string;
+  
+  ngx_int_t                       subscribe_only_existing_channel;
+  
+  nchan_redis_conf_t              redis;
+  time_t                          redis_idle_channel_cache_timeout;
+  
+  ngx_int_t                       max_channel_id_length;
+  ngx_int_t                       max_channel_subscribers;
+  time_t                          channel_timeout;
+  nchan_store_t                  *storage_engine;
+  
+  nchan_benchmark_conf_t          benchmark;
+  
+  ngx_int_t                     (*request_handler)(ngx_http_request_t *r);
+};// nchan_loc_conf_t;
+
+typedef struct nchan_llist_timed_s {
+  struct nchan_llist_timed_s     *prev;
+  void                           *data;
+  time_t                          time;
+  struct nchan_llist_timed_s     *next;
+} nchan_llist_timed_t;
+
+typedef enum {PUB, SUB} pub_or_sub_t;
+typedef enum {LONGPOLL, HTTP_CHUNKED, HTTP_MULTIPART, HTTP_RAW_STREAM, INTERVALPOLL, EVENTSOURCE, WEBSOCKET, INTERNAL, SUBSCRIBER_TYPES} subscriber_type_t;
+typedef void (*subscriber_callback_pt)(subscriber_t *, void *);
+
+typedef struct {
+  ngx_int_t              (*enqueue)(struct subscriber_s *);
+  ngx_int_t              (*dequeue)(struct subscriber_s *);
+  ngx_int_t              (*respond_message)(struct subscriber_s *, nchan_msg_t *);
+  ngx_int_t              (*respond_status)(struct subscriber_s *, ngx_int_t, const ngx_str_t *, ngx_chain_t *);
+  ngx_int_t              (*set_enqueue_callback)(subscriber_t *self, subscriber_callback_pt cb, void *privdata);
+  ngx_int_t              (*set_dequeue_callback)(subscriber_t *self, subscriber_callback_pt cb, void *privdata);
+  ngx_int_t              (*reserve)(struct subscriber_s *);
+  ngx_int_t              (*release)(struct subscriber_s *, uint8_t nodestroy);
+  ngx_int_t              (*notify)(struct subscriber_s *, ngx_int_t code, void *data);
+  ngx_int_t              (*subscribe)(subscriber_t *, ngx_str_t *);
+  
+} subscriber_fn_t;
+
+typedef enum {ALIVE, DEAD, UNKNOWN, PININGFORTHEFJORDS} nchan_subscriber_status_t;
+
+struct subscriber_s {
+  ngx_str_t                 *name;
+  subscriber_type_t          type;
+  const subscriber_fn_t     *fn;
+  nchan_subscriber_status_t  status;
+  nchan_msg_id_t             last_msgid;
+  nchan_loc_conf_t          *cf;
+  ngx_http_request_t        *request;
+  void                      *upstream_requestmachine;
+  ngx_uint_t                 reserved;
+  
+  unsigned                   enable_sub_unsub_callbacks;
+  unsigned                   dequeue_after_response:1;
+  unsigned                   destroy_after_dequeue:1;
+  unsigned                   enqueued:1;
+  
+#if FAKESHARD
+  ngx_int_t                  owner;
+#endif
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  u_char                    *lbl;
+  subscriber_t              *dbg_prev;
+  subscriber_t              *dbg_next;
+#endif
+}; //subscriber_t
+
+#define NCHAN_MULTITAG_REQUEST_CTX_MAX 4
+typedef struct {
+  subscriber_t                  *sub;
+  nchan_reuse_queue_t           *output_str_queue;
+  nchan_reuse_queue_t           *reserved_msg_queue;
+  nchan_bufchain_pool_t         *bcp; //bufchainpool maybe?
+  
+  ngx_str_t                     *subscriber_type;
+  nchan_msg_id_t                 msg_id;
+  nchan_msg_id_t                 prev_msg_id;
+  ngx_str_t                     *publisher_type;
+  ngx_str_t                     *multipart_boundary;
+  ngx_str_t                     *channel_event_name;
+  ngx_str_t                      channel_id[NCHAN_MULTITAG_REQUEST_CTX_MAX];
+  int                            channel_id_count;
+  time_t                         channel_subscriber_last_seen;
+  int                            channel_subscriber_count;
+  int                            channel_message_count;
+  ngx_str_t                     *channel_group_name;
+  
+  ngx_str_t                     *request_origin_header;
+  ngx_str_t                     *allow_origin;
+  
+  ngx_int_t                      subscriber_info_response_id;
+  ngx_str_t                     *subscriber_info_response_channel_id;
+  
+  unsigned                       sent_unsubscribe_request:1;
+  unsigned                       request_ran_content_handler:1;
+  
+} nchan_request_ctx_t;
+
+
+typedef struct {
+  ngx_str_t     hostname;
+  ngx_str_t     peername; // resolved hostname (ip address)
+  ngx_int_t     port;
+  ngx_str_t     username;
+  ngx_str_t     password;
+  ngx_int_t     db;
+  ngx_int_t     use_tls;
+  enum {
+    REDIS_FORCED_ROLE_NONE = 0,
+    REDIS_FORCED_ROLE_MASTER,
+    REDIS_FORCED_ROLE_SLAVE
+  }             forced_role;
+} redis_connect_params_t;
+
+#endif  /* NCHAN_TYPES_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_variables.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_variables.c
new file mode 100644
index 0000000..18d92e2
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_variables.c
@@ -0,0 +1,319 @@
+#include <nchan_module.h>
+#include <nchan_variables.h>
+#include <util/nchan_output.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "VARIABLES:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "VARIABLES:" fmt, ##arg)
+
+typedef struct {
+  ngx_str_t                   name;
+  ngx_http_get_variable_pt    handler;
+  uintptr_t                   data;
+} nchan_variable_t;
+
+static nchan_request_ctx_t *get_main_request_ctx(ngx_http_request_t *r){
+  nchan_request_ctx_t        *ctx;
+  ngx_http_request_t        *rcur;
+  
+  //if this is an subrequest, get nearest parent existing ctx
+  for(rcur = r; rcur != NULL; rcur = rcur->parent) {
+    ctx = ngx_http_get_module_ctx(rcur, ngx_nchan_module);
+    if(ctx) return ctx;
+  }
+  
+  //no existing ctx found
+  return NULL;
+}
+
+static void set_varval(ngx_http_variable_value_t *v, u_char *data, size_t len) {
+  v->valid = 1;
+  v->no_cacheable = 1;
+  v->not_found = 0;
+  v->len = len;
+  v->data = data;
+}
+
+static ngx_int_t nchan_channel_event(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL || ctx->channel_event_name == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  set_varval(v, ctx->channel_event_name->data, ctx->channel_event_name->len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_channel_id_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  set_varval(v, ctx->channel_id[data].data, ctx->channel_id[data].len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_subscriber_type_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL || ctx->subscriber_type == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  set_varval(v, ctx->subscriber_type->data, ctx->subscriber_type->len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_publisher_type_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL || ctx->publisher_type == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  set_varval(v, ctx->publisher_type->data, ctx->publisher_type->len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_message_id_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char        msgidbuf[100];
+  ngx_str_t           *msgid;
+  
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL || (ctx->msg_id.time == 0 && ctx->msg_id.tagcount == 0)) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  msgid = msgid_to_str(&ctx->msg_id);
+  ngx_memcpy(msgidbuf, msgid->data, msgid->len);
+  set_varval(v, msgidbuf, msgid->len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_prev_message_id_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char        msgidbuf[100];
+  ngx_str_t           *msgid;
+  
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL  || (ctx->prev_msg_id.time == 0 && ctx->prev_msg_id.tagcount == 0)) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  
+  msgid = msgid_to_str(&ctx->prev_msg_id);
+  ngx_memcpy(msgidbuf, msgid->data, msgid->len);
+  set_varval(v, msgidbuf, msgid->len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_channel_subscriber_last_seen_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[NGX_INT_T_LEN + 4];
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  ngx_str_t             str;
+  str.data = &buf[0];
+  str.len = ngx_sprintf(str.data, "%l", (long)ctx->channel_subscriber_last_seen) - str.data;
+  set_varval(v, str.data, str.len);  
+  return NGX_OK;
+}
+static ngx_int_t nchan_channel_subscriber_count_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[NGX_INT_T_LEN + 4];
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  ngx_str_t             str;
+  str.data = &buf[0];
+  str.len = ngx_sprintf(str.data, "%i", (int)ctx->channel_subscriber_count) - str.data;
+  set_varval(v, str.data, str.len);
+  return NGX_OK;
+}
+static ngx_int_t nchan_channel_message_count_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[NGX_INT_T_LEN + 4];
+  nchan_request_ctx_t        *ctx = get_main_request_ctx(r);
+  if(ctx == NULL) {
+    v->not_found = 1;
+    return NGX_OK;
+  }
+  ngx_str_t             str;
+  str.data = &buf[0];
+  str.len = ngx_sprintf(str.data, "%i", (int)ctx->channel_message_count) - str.data;
+  set_varval(v, str.data, str.len); 
+  return NGX_OK;
+}
+
+
+/*
+static ngx_int_t nchan_message_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  
+  
+  v->not_found = 1;
+  return NGX_OK;
+}
+*/
+
+/*
+static ngx_int_t nchan_message_alert_type_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  
+  
+  v->not_found = 1;
+  return NGX_OK;
+}
+*/
+
+static ngx_int_t nchan_stats_worker_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[sizeof(nchan_stats_worker_t)/sizeof(ngx_atomic_uint_t)][NGX_INT_T_LEN + 4];
+  off_t                 offset = (off_t )data;
+  int                   n = offset / sizeof(ngx_atomic_uint_t);
+  nchan_stats_worker_t  worker;
+  
+  if(nchan_stats_get_all(&worker, NULL) != NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+  ngx_atomic_uint_t     stat = *(ngx_atomic_uint_t *)((char *)&worker + offset);
+  ngx_str_t             str;
+  
+  str.data = &buf[n][0];
+  str.len = ngx_sprintf(str.data, "%ui", stat) - str.data;
+  
+  set_varval(v, str.data, str.len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_stats_global_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[sizeof(nchan_stats_global_t)/sizeof(ngx_atomic_uint_t)][NGX_INT_T_LEN + 4];
+  off_t                 offset = (off_t )data;
+  int                   n = offset / sizeof(ngx_atomic_uint_t);
+  nchan_stats_global_t  global;
+  
+  if(nchan_stats_get_all(NULL, &global) != NGX_OK) {
+    return NGX_ERROR;
+  }
+  
+  ngx_atomic_uint_t     stat = *(ngx_atomic_uint_t *)((char *)&global + offset);
+  ngx_str_t             str;
+  
+  str.data = &buf[n][0];
+  str.len = ngx_sprintf(str.data, "%ui", stat) - str.data;
+  
+  set_varval(v, str.data, str.len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_stub_status_ipc_alerts_in_transit(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {
+  static u_char         buf[NGX_INT_T_LEN + 4];
+  nchan_stats_global_t  global;
+  
+  if(nchan_stats_get_all(NULL, &global) != NGX_OK) {
+    return NGX_ERROR;
+  }
+  ngx_str_t             str;
+  
+  str.data = &buf[0];
+  str.len = ngx_sprintf(str.data, "%ui", global.total_ipc_alerts_sent - global.total_ipc_alerts_received) - str.data;
+  
+  set_varval(v, str.data, str.len);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_stub_status_shared_memory_used(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t d) {
+  static u_char data[30];
+  
+  set_varval(v, data, ngx_snprintf(data, 30, "%fK", (float )((float )nchan_get_used_shmem() / 1024.0)) - data);
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_version_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t d) {
+  set_varval(v, (u_char *)NCHAN_VERSION, strlen(NCHAN_VERSION));
+  return NGX_OK;
+}
+
+
+#define STUB_STATUS_GLOBAL_VARIABLE(counter) \
+  {  ngx_string("nchan_stub_status_"#counter), nchan_stats_global_variable, offsetof(nchan_stats_global_t, counter) }
+  
+#define STUB_STATUS_GLOBAL_NAMED_VARIABLE(var_name, counter) \
+  {  ngx_string("nchan_stub_status_" var_name), nchan_stats_global_variable, offsetof(nchan_stats_global_t, counter) }
+  
+  #define STUB_STATUS_WORKER_VARIABLE(counter) \
+  {  ngx_string("nchan_stub_status_"#counter), nchan_stats_worker_variable, offsetof(nchan_stats_worker_t, counter) }
+  
+#define STUB_STATUS_WORKER_NAMED_VARIABLE(var_name, counter) \
+  {  ngx_string("nchan_stub_status_" var_name), nchan_stats_worker_variable, offsetof(nchan_stats_worker_t, counter) }
+
+
+nchan_variable_t nchan_vars[] = {
+  { ngx_string("nchan_channel_id"),         nchan_channel_id_variable, 0},
+  { ngx_string("nchan_channel_id1"),        nchan_channel_id_variable, 0},
+  { ngx_string("nchan_channel_id2"),        nchan_channel_id_variable, 1},
+  { ngx_string("nchan_channel_id3"),        nchan_channel_id_variable, 2},
+  { ngx_string("nchan_channel_id4"),        nchan_channel_id_variable, 3},
+  { ngx_string("nchan_channel_subscriber_last_seen"), nchan_channel_subscriber_last_seen_variable, 0},
+  { ngx_string("nchan_channel_subscriber_count"),     nchan_channel_subscriber_count_variable, 0},
+  { ngx_string("nchan_channel_message_count"),        nchan_channel_message_count_variable, 0},
+  { ngx_string("nchan_channel_event"),      nchan_channel_event, 0},
+  { ngx_string("nchan_subscriber_type"),    nchan_subscriber_type_variable, 0},
+  { ngx_string("nchan_publisher_type"),     nchan_publisher_type_variable, 0},
+//  { ngx_string("nchan_message"),            nchan_message_variable, 0},
+  { ngx_string("nchan_prev_message_id"),    nchan_prev_message_id_variable, 0},
+  { ngx_string("nchan_message_id"),         nchan_message_id_variable, 0},
+  
+  STUB_STATUS_WORKER_VARIABLE(channels),
+  STUB_STATUS_WORKER_VARIABLE(subscribers),
+  STUB_STATUS_WORKER_NAMED_VARIABLE("stored_messages", messages),
+  STUB_STATUS_WORKER_VARIABLE(redis_pending_commands),
+  STUB_STATUS_WORKER_VARIABLE(redis_connected_servers),
+  STUB_STATUS_WORKER_VARIABLE(redis_unhealthy_upstreams),
+  STUB_STATUS_WORKER_NAMED_VARIABLE("ipc_queued_alerts", ipc_queue_size),
+  STUB_STATUS_GLOBAL_VARIABLE(total_published_messages),
+  STUB_STATUS_GLOBAL_VARIABLE(total_ipc_alerts_sent),
+  STUB_STATUS_GLOBAL_VARIABLE(total_ipc_alerts_received),
+  STUB_STATUS_GLOBAL_VARIABLE(total_ipc_send_delay),
+  STUB_STATUS_GLOBAL_VARIABLE(total_ipc_receive_delay),
+  STUB_STATUS_GLOBAL_VARIABLE(total_redis_commands_sent),
+  { ngx_string("nchan_stub_status_shared_memory_used"),  nchan_stub_status_shared_memory_used, 0},
+  { ngx_string("nchan_stub_status_ipc_alerts_in_transit"),  nchan_stub_status_ipc_alerts_in_transit, 0},
+  { ngx_string("nchan_version"), nchan_version_variable, 0},
+  
+//  { ngx_string("nchan_message_alert_type"), nchan_message_alert_type_variable, 0},
+  
+  { ngx_null_string,                        NULL, 0 }
+};
+
+
+ngx_int_t nchan_add_variables(ngx_conf_t *cf) {
+  nchan_variable_t              *var;
+  ngx_http_variable_t           *v;
+
+  for (var = nchan_vars; var->name.len; var++) {
+    
+    v = ngx_http_add_variable(cf, &var->name, NGX_HTTP_VAR_CHANGEABLE);
+    if (v == NULL) {
+      return NGX_ERROR;
+    }
+    
+    v->get_handler = var->handler;
+    v->data = var->data;
+  }
+
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_variables.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_variables.h
new file mode 100644
index 0000000..726b99c
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_variables.h
@@ -0,0 +1 @@
+ngx_int_t nchan_add_variables(ngx_conf_t *cf);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_version.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_version.h
new file mode 100644
index 0000000..ad52a56
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_version.h
@@ -0,0 +1 @@
+#define NCHAN_VERSION "1.3.7"
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_websocket_publisher.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_websocket_publisher.c
new file mode 100644
index 0000000..321dadf
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_websocket_publisher.c
@@ -0,0 +1,82 @@
+#include <nchan_module.h>
+#include "subscribers/websocket.h"
+#include <nchan_websocket_publisher.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "WEBSOCKET_PUBLISHER:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "WEBSOCKET_PUBLISHER:" fmt, ##arg)
+
+static nchan_llist_timed_t  ws_pub_head;
+
+void nchan_websocket_publisher_llist_init() {
+  DBG("init WS publisher llist");
+  ws_pub_head.prev = &ws_pub_head;
+  ws_pub_head.next = &ws_pub_head;
+  ws_pub_head.data = NULL;
+  ws_pub_head.time = 0;
+}
+
+
+static nchan_llist_timed_t   *nchan_ws_llist_enqueue(subscriber_t *sub) {
+  nchan_llist_timed_t    *cur, *last;
+  if((cur = ngx_alloc(sizeof(*cur), ngx_cycle->log)) == NULL) {
+    ERR("couldn't allocate llink for websocket publisher");
+    return NULL;
+  }
+  last = ws_pub_head.prev;
+  
+  cur->prev = last;
+  last->next = cur;
+  
+  cur->next = &ws_pub_head;
+  ws_pub_head.prev = cur;
+  
+  cur->time = ngx_time();
+  cur->data = (void *)sub;
+  return cur;
+}
+
+static ngx_int_t nchan_ws_llink_destroy(nchan_llist_timed_t *cur) {
+  nchan_llist_timed_t    *prev, *next;
+  prev = cur->prev;
+  next = cur->next;
+  
+  prev->next = next;
+  next->prev = prev;
+  
+  ngx_memset(cur, 0xC4, sizeof(*cur)); //debugstuffs
+  ngx_free(cur);
+  return NGX_OK;
+}
+
+static void ws_publisher_dequeue_callback(subscriber_t *sub, void *privdata) {
+  nchan_ws_llink_destroy((nchan_llist_timed_t *)privdata);
+}
+
+static ngx_str_t   pub_name = ngx_string("websocket");
+
+ngx_int_t nchan_create_websocket_publisher(ngx_http_request_t  *r) {
+  subscriber_t         *sub;
+  nchan_llist_timed_t  *sub_link;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  if(ctx) {
+    ctx->publisher_type = &pub_name;
+  }
+  
+  if((sub = websocket_subscriber_create(r, NULL)) == NULL) {
+    ERR("couldn't create websocket publisher.");
+    return NGX_ERROR;
+  }
+  
+  if((sub_link = nchan_ws_llist_enqueue(sub)) == NULL) {
+    websocket_subscriber_destroy(sub);
+    ERR("couldn't create websocket publisher llink");
+    return NGX_ERROR;
+  }
+  
+  sub->fn->set_dequeue_callback(sub, ws_publisher_dequeue_callback, sub_link);
+  sub->fn->enqueue(sub);
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_websocket_publisher.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_websocket_publisher.h
new file mode 100644
index 0000000..b08e419
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/nchan_websocket_publisher.h
@@ -0,0 +1,2 @@
+void nchan_websocket_publisher_llist_init();
+ngx_int_t nchan_create_websocket_publisher(ngx_http_request_t  *r);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/groups.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/groups.c
new file mode 100644
index 0000000..de86738
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/groups.c
@@ -0,0 +1,570 @@
+#include "groups.h"
+#include "store.h"
+#include "ipc-handlers.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:GROUPS: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:GROUPS: " fmt, ##args)
+
+//#define NCHAN_DEBUG_GROUP_NOCACAHE 1
+#define MAX_GETGROUP_WAIT_TIME_BEFORE_RETRY 5
+
+static void *group_id(void *d) {
+  return &((group_tree_node_t *)d)->name;
+}
+
+#if NCHAN_DEBUG_GROUP_NOCACAHE
+ngx_int_t clear_group_if_not_owner(rbtree_seed_t *seed, void *node_data, void *pd) {
+  group_tree_node_t *gtn = node_data;
+  ngx_int_t          myslot = memstore_slot();
+  
+  if(memstore_str_owner(&gtn->name) != myslot) {
+    gtn->group = NULL; //asshole.
+    //DBG("cleared group %V shared data", &gtn->name);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t jerk_group_clearer(void *pd) {
+  memstore_groups_t *gp = pd;
+  
+  rbtree_walk(&gp->tree, clear_group_if_not_owner, NULL);
+  
+  return NGX_OK;
+}
+#endif
+
+ngx_int_t memstore_groups_init(memstore_groups_t *gp) {
+  return rbtree_init(&gp->tree, "memstore groups", group_id, NULL, NULL);
+}
+
+static ngx_int_t shutdown_walker(rbtree_seed_t *seed, void *node_data, void *privdata) {
+  group_tree_node_t *gtn = (group_tree_node_t *)node_data;
+  shmem_t *          shm = nchan_store_memory_shmem;
+  ngx_int_t          myslot = memstore_slot();
+  DBG("shutdown_walker %V group %p", &gtn->name, gtn->group);
+  if(memstore_str_owner(&gtn->name) == myslot) {
+    shm_free(shm, gtn->group);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_groups_shutdown(memstore_groups_t *gp) {
+  rbtree_empty(&gp->tree, shutdown_walker, NULL);
+  DBG("empties rbtree");
+  return NGX_OK;
+}
+
+static group_tree_node_t *group_create_node(memstore_groups_t *gp, ngx_str_t *name, nchan_group_t *shm_group) {
+  //assumes node does not yet exist
+  ngx_rbtree_node_t      *node;
+  group_tree_node_t      *gtn;
+  
+  if((node = rbtree_create_node(&gp->tree, sizeof(group_tree_node_t) + name->len)) == NULL) {
+    ERR("couldn't alloc rbtree node for group %V", name);
+    return NULL;
+  }
+  gtn = rbtree_data_from_node(node);
+  gtn->name.len = name->len;
+  gtn->name.data = (u_char *)(&gtn[1]);
+  ngx_memcpy(gtn->name.data, name->data, name->len);
+  
+  gtn->group = shm_group;
+  
+  gtn->when_ready_head = NULL;
+  gtn->when_ready_tail = NULL;
+  
+  gtn->owned_chanhead_head = NULL;
+  
+  gtn->getting_group = 0;
+  
+  rbtree_insert_node(&gp->tree, node);
+  
+  return gtn;
+}
+
+static group_tree_node_t *group_owner_create_node(memstore_groups_t *gp, ngx_str_t *name) {
+  //ASSUMES group name is owned by current worker, AND node does not yet exist
+  group_tree_node_t      *gtn;
+  nchan_group_t          *group;
+  group = shm_calloc(nchan_store_memory_shmem, sizeof(*group) + name->len, "group");
+  if(group == NULL) {
+    nchan_log_ooshm_error("creating group %V", name);
+    return NULL;
+  }
+  
+  group->name.len = name->len;
+  group->name.data = (u_char *)(&group[1]);
+  ngx_memcpy(group->name.data, name->data, name->len);
+  
+  DBG("created group %p %V", group, &group->name);
+  
+  if((gtn = group_create_node(gp, name, group)) == NULL) {
+    shm_free(nchan_store_memory_shmem, group);
+    return NULL;
+  }
+  
+  memstore_ipc_broadcast_group(group);
+  
+  return gtn;
+}
+
+nchan_group_t *memstore_group_owner_find(memstore_groups_t *gp, ngx_str_t *name, int *group_just_created) {
+  ngx_rbtree_node_t      *node;
+  group_tree_node_t      *gtn;
+  assert(memstore_str_owner(name) == memstore_slot());
+  if((node = rbtree_find_node(&gp->tree, name)) != NULL) {
+    gtn = rbtree_data_from_node(node);
+    if(group_just_created) *group_just_created = 0;
+  }
+  else {
+    gtn = group_owner_create_node(gp, name);
+    if(group_just_created) *group_just_created = 1;
+  }
+  
+  return gtn ? gtn->group : NULL;
+}
+
+
+static ngx_int_t add_whenready_callback(group_tree_node_t *gtn, char *lbl, callback_pt cb, void *pd) {
+  //not ready yet, queue up the callback
+  group_callback_t  *gcb;
+  DBG("add to %p whenready %s for group %V", gtn, lbl, &gtn->name);
+  if((gcb = ngx_alloc(sizeof(*gcb), ngx_cycle->log)) == NULL) {
+    ERR("couldn't allocate callback link for group %V", &gtn->name);
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+  
+  gcb->cb = cb;
+  gcb->pd = pd;
+  gcb->label = lbl;
+  gcb->next = NULL;
+  
+  if(gtn->when_ready_tail) {
+    gtn->when_ready_tail->next = gcb;
+  }
+  
+  if(!gtn->when_ready_head) {
+    gtn->when_ready_head = gcb;
+  }
+  
+  
+  gtn->when_ready_tail = gcb;
+  
+  for(gcb = gtn->when_ready_head; gcb != NULL; gcb = gcb->next){
+    DBG("  whenready %s", gcb->label);
+  }
+  
+  if(ngx_time() - gtn->getting_group > MAX_GETGROUP_WAIT_TIME_BEFORE_RETRY) {
+    gtn->getting_group = ngx_time();
+    memstore_ipc_send_get_group(memstore_str_owner(&gtn->name), &gtn->name);    
+  }
+  
+  return NGX_OK;
+}
+
+static void call_whenready_callbacks(group_tree_node_t *gtn, nchan_group_t *shm_group) {
+  group_callback_t       *gcb, *next_gcb;
+  
+  for(gcb = gtn->when_ready_head; gcb != NULL; gcb = next_gcb) {
+    DBG("whenready for %p callback %s for group %V", gtn, gcb->label, &gtn->name);
+    next_gcb = gcb->next;
+    gcb->cb(shm_group ? NGX_OK : NGX_ERROR, shm_group , gcb->pd);
+    ngx_free(gcb);
+  }
+  gtn->when_ready_head = NULL;
+  gtn->when_ready_tail = NULL;
+}
+
+ngx_int_t memstore_group_find_from_groupnode(memstore_groups_t *gp, group_tree_node_t *gtn, callback_pt cb, void *pd) {
+  if(!gtn) {
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+  if(gtn->group) {
+    cb(NGX_OK, gtn->group, pd);
+  }
+  else {
+    add_whenready_callback(gtn, "group find", cb, pd);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_find(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd) {
+#if NCHAN_DEBUG_GROUP_NOCACAHE
+  static int hmm = 0;
+  if(!hmm) {
+    nchan_add_interval_timer(jerk_group_clearer, gp, 100);
+    hmm = 1; 
+  }
+#endif
+  group_tree_node_t  *gtn = memstore_groupnode_get(gp, name);
+  return memstore_group_find_from_groupnode(gp, gtn, cb, pd);
+}
+
+group_tree_node_t *memstore_groupnode_get(memstore_groups_t *gp, ngx_str_t *name) {
+  ngx_rbtree_node_t      *node;
+  group_tree_node_t      *gtn = NULL;
+  ngx_int_t               owner;
+  if((node = rbtree_find_node(&gp->tree, name)) != NULL) {
+    gtn = rbtree_data_from_node(node);
+  }
+  else {
+    owner = memstore_str_owner(name);
+    if(owner == memstore_slot()) {
+      gtn = group_owner_create_node(gp, name);
+    }
+    else {
+      if((gtn = group_create_node(gp, name, NULL))!=NULL) {
+        gtn->getting_group=1;
+        memstore_ipc_send_get_group(memstore_str_owner(name), name);
+      }
+    }
+    if(!gtn) {
+      ERR("couldn't create groupnode for group %V", name);
+    }
+  }
+  return gtn;
+}
+
+ngx_int_t memstore_group_receive(memstore_groups_t *gp, nchan_group_t *shm_group) {
+  ngx_rbtree_node_t      *node;
+  group_tree_node_t      *gtn = NULL;
+  
+  assert(memstore_str_owner(&shm_group->name) != memstore_slot());
+  
+  DBG("memstore group receive %V", &shm_group->name);
+  
+  if((node = rbtree_find_node(&gp->tree, &shm_group->name)) != NULL) {
+    gtn = rbtree_data_from_node(node);  
+    gtn->group = shm_group;
+    gtn->getting_group = 0;
+    call_whenready_callbacks(gtn, shm_group);
+    
+#if NCHAN_DEBUG_GROUP_NOCACAHE
+    gtn->group = NULL;
+#endif
+    
+  }
+  else {
+    gtn = group_create_node(gp, &shm_group->name, shm_group);
+    DBG("created node %p", gtn);
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_receive_delete(memstore_groups_t *gp, nchan_group_t *shm_group) {
+  memstore_channel_head_t    *cur;
+  group_tree_node_t          *gtn = NULL;
+  ngx_rbtree_node_t          *node;
+  DBG("receive GROUP DELETE for %V", &shm_group->name);
+  if((node = rbtree_find_node(&gp->tree, &shm_group->name)) != NULL) {
+    gtn = rbtree_data_from_node(node);
+  }
+  DBG("gtn is %V", gtn);
+  if(gtn) {
+    
+    call_whenready_callbacks(gtn, NULL);
+    
+    while((cur = gtn->owned_chanhead_head) != NULL) {
+      memstore_group_dissociate_own_channel(cur);
+      nchan_store_memory.delete_channel(&cur->id, cur->cf, NULL, NULL);
+    }
+  }
+  
+  return NGX_OK;
+}
+
+typedef struct {
+  callback_pt        cb;
+  void              *pd;
+  memstore_groups_t *gp;
+  unsigned           owned;
+} group_delete_callback_data_t;
+
+static ngx_int_t group_delete_callback(ngx_int_t rc, nchan_group_t *shm_group, group_delete_callback_data_t *d) {
+  static nchan_group_t  group;
+  if(shm_group) {
+    DBG("GROUP DELETE find_group callback for %V", &shm_group->name);
+    group = *shm_group;
+    if(d->owned) {
+      memstore_group_receive_delete(d->gp, shm_group);
+    }
+    memstore_ipc_broadcast_group_delete(shm_group);
+  }
+  else {
+    ERR("group for delete callback is NULL");
+    ngx_memzero(&group, sizeof(group));
+  }
+  d->cb(rc, &group, d->pd);
+  ngx_free(d);
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_delete(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd) {
+  group_tree_node_t            *gtn = NULL;
+  ngx_int_t                     owner = memstore_str_owner(name);
+  group_delete_callback_data_t *d;
+  
+  if((gtn = memstore_groupnode_get(gp, name)) == NULL) {
+    ERR("couldn't get groupnode for deletion");
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+  
+  if((d = ngx_alloc(sizeof(*d), ngx_cycle->log)) == NULL) {
+    ERR("couldn't alloc callback data for group deletion");
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+  
+  d->cb = cb;
+  d->pd = pd;
+  d->gp = gp;
+  d->owned = owner == memstore_slot();
+  DBG("start DELETE GROUP %V", &gtn->name);
+  return memstore_group_find(gp, &gtn->name, (callback_pt )group_delete_callback, d);
+}
+
+
+static void verify_gnd(memstore_channel_head_t *ch) {
+  /*
+  memstore_channel_head_t *cur;
+  int n=0, n2=0;
+  for(cur = ch; cur != NULL; cur = cur->groupnode_next) {
+    if(cur->groupnode_next) {
+      assert(cur->groupnode_next->groupnode_prev == cur);
+      n++;
+    }
+  }
+  for(cur = ch; cur != NULL; cur = cur->groupnode_prev) {
+    if(cur->groupnode_prev) {
+      assert(cur->groupnode_prev->groupnode_next == cur);
+      n++;
+    }
+  }
+
+  if(ch->groupnode) {
+    int prevnulls = 0;
+    int nextnulls = 0;
+    for(cur = ch->groupnode->owned_chanhead_head; cur != NULL; cur = cur->groupnode_next) {
+      n2++;
+      if(!cur->groupnode_prev) {
+        assert(++prevnulls <= 1);
+      }
+      else {
+        assert(cur->groupnode_prev->groupnode_next == cur);
+      }
+      
+      if(!cur->groupnode_next) {
+        assert(++nextnulls <= 1);
+      }
+      else {
+        assert(cur->groupnode_next->groupnode_prev == cur);
+      }
+    }
+    if(n>0) {
+      assert(n2 - 1 == n);
+    }
+  }
+  */
+}
+
+static void verify_gnd_ch_absent(memstore_channel_head_t *ch) {
+  /*memstore_channel_head_t *cur;
+  for(cur = ch->groupnode->owned_chanhead_head; cur != NULL; cur = cur->groupnode_next) {
+    assert(cur != ch);
+    if(cur->groupnode_prev) {      
+      assert(cur->groupnode_prev != ch);
+    }
+  }
+  */
+  /*memstore_channel_head_t *tmp;
+  HASH_ITER(hh, mpt->hash, cur, tmp) {
+    assert(cur->groupnode_prev != ch);
+    assert(cur->groupnode_next != ch);
+  }*/
+}
+
+
+void memstore_group_associate_own_channel(memstore_channel_head_t *ch) {
+  group_tree_node_t *gtn = ch->groupnode;
+  
+  verify_gnd(ch);
+  verify_gnd_ch_absent(ch);
+  
+  assert(ch->owner == memstore_slot());
+  
+  if(!ch->multi) {
+    ch->groupnode_next = gtn->owned_chanhead_head;
+    if(gtn->owned_chanhead_head) {
+      gtn->owned_chanhead_head->groupnode_prev = ch;
+    }
+    gtn->owned_chanhead_head = ch;
+    
+  }
+  
+  verify_gnd(ch);
+}
+
+void memstore_group_dissociate_own_channel(memstore_channel_head_t *ch) {
+  verify_gnd(ch);
+  assert(ch->owner == memstore_slot());
+  if(!ch->multi) {
+    if(ch->groupnode->owned_chanhead_head == ch) {
+      ch->groupnode->owned_chanhead_head = ch->groupnode_next;
+    }
+    if(ch->groupnode_prev) {
+      assert(ch->groupnode_prev->groupnode_next == ch);
+      ch->groupnode_prev->groupnode_next = ch->groupnode_next;
+    }
+    if(ch->groupnode_next) {
+      assert(ch->groupnode_next->groupnode_prev == ch);
+      ch->groupnode_next->groupnode_prev = ch->groupnode_prev;
+    }
+    
+    ch->groupnode_prev = NULL;
+    ch->groupnode_next = NULL;
+  }
+  assert(ch->groupnode->owned_chanhead_head != ch);
+  verify_gnd(ch);
+  verify_gnd_ch_absent(ch);
+}
+
+
+
+static ngx_int_t group_add_channel_internal(nchan_group_t *shm_group, int multi, int self_owned, int n) {
+  if(shm_group) {
+    if(multi) {
+      ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->multiplexed_channels, n);
+    }
+    else if (self_owned) {
+      ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->channels, n);
+    }
+  }
+  return NGX_OK;
+}
+
+typedef struct {
+  int       n;
+  unsigned  multi:1;
+  unsigned  self_owned:1;
+} add_channel_count_callback_data_t;
+
+static ngx_int_t group_add_channel_callback(ngx_int_t rc, nchan_group_t *shm_group, add_channel_count_callback_data_t *d) {
+  group_add_channel_internal(shm_group, d->multi, d->self_owned, d->n);
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static ngx_int_t memstore_group_add_channel_generic(memstore_channel_head_t *ch, int n) {
+  int self_owned = ch->owner == memstore_slot();
+  if(ch->groupnode->group) {
+    group_add_channel_internal(ch->groupnode->group, ch->multi != NULL, self_owned, n);
+  }
+  else {
+    add_channel_count_callback_data_t             *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    if(!d) {
+      ERR("Couldn't allocate group_add_channel data");
+      return NGX_ERROR;
+    }
+    else {
+      d->n = n;
+      d->multi = ch->multi != NULL;
+      d->self_owned = self_owned;
+      add_whenready_callback(ch->groupnode, "add channel", (callback_pt )group_add_channel_callback, d);
+    }
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_add_channel(memstore_channel_head_t *ch) {
+  return memstore_group_add_channel_generic(ch, 1);
+}
+
+ngx_int_t memstore_group_remove_channel(memstore_channel_head_t *ch) {
+  return memstore_group_add_channel_generic(ch, -1);
+}
+
+static ngx_int_t group_add_message_internal(nchan_group_t *shm_group, size_t mem_sz, size_t file_sz, int n) {
+  
+  if(shm_group) {
+    ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->messages, n);
+    ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->messages_shmem_bytes, n * mem_sz);
+    if(file_sz > 0) {
+      ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->messages_file_bytes, n * file_sz);
+    }
+  }
+  return NGX_OK;
+}
+
+typedef struct {
+  int n;
+  size_t mem_sz;
+  size_t file_sz;
+} add_message_callback_data_t;
+
+static ngx_int_t group_add_message_callback(ngx_int_t rc, nchan_group_t *shm_group, add_message_callback_data_t *d) {
+  group_add_message_internal(shm_group, d->mem_sz, d->file_sz, d->n);
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static ngx_int_t memstore_group_add_message_generic(group_tree_node_t *gtn, nchan_msg_t *msg, int n) {
+  size_t         mem_sz = memstore_msg_memsize(msg);
+  size_t         file_sz = ngx_buf_in_memory_only((&msg->buf)) ? 0 : ngx_buf_size((&msg->buf));
+  if(gtn->group) {
+    group_add_message_internal(gtn->group, mem_sz, file_sz, n);
+  }
+  else {
+    add_message_callback_data_t *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    if(!d) {
+      ERR("Couldn't allocate group_add_message data");
+      return NGX_ERROR;
+    }
+    else {
+      d->n = n;
+      d->mem_sz = mem_sz;
+      d->file_sz = file_sz;
+      add_whenready_callback(gtn, "add message", (callback_pt )group_add_message_callback, d);
+    }
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_add_message(group_tree_node_t *gtn, nchan_msg_t *msg) {
+  return memstore_group_add_message_generic(gtn, msg, 1);
+}
+
+ngx_int_t memstore_group_remove_message(group_tree_node_t *gtn, nchan_msg_t *msg) {
+  return memstore_group_add_message_generic(gtn, msg, -1);
+}
+
+
+
+static ngx_int_t group_add_subscribers_internal(nchan_group_t *shm_group, int n) {
+  if(shm_group) {
+    ngx_atomic_fetch_add((ngx_atomic_uint_t *)&shm_group->subscribers, n);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t group_add_subscribers_callback(ngx_int_t rc, nchan_group_t *shm_group, void *pd) {
+  intptr_t    n = (intptr_t )pd;
+  group_add_subscribers_internal(shm_group, n);
+  return NGX_OK;
+}
+
+ngx_int_t memstore_group_add_subscribers(group_tree_node_t *gtn, int count) {
+  if(gtn->group) {
+    group_add_subscribers_internal(gtn->group, count);
+  }
+  else {
+    add_whenready_callback(gtn, "add subscribers", (callback_pt )group_add_subscribers_callback, (void *)(intptr_t )count);
+  }
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/groups.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/groups.h
new file mode 100644
index 0000000..6fc80dd
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/groups.h
@@ -0,0 +1,55 @@
+ #ifndef MEMSTORE_GROUPS_HEADER
+#define MEMSTORE_GROUPS_HEADER
+#include <nchan_module.h>
+#include <util/nchan_rbtree.h>
+
+typedef struct {
+  rbtree_seed_t           tree;
+} memstore_groups_t;
+
+typedef struct group_tree_node_s group_tree_node_t ;
+
+#include "store-private.h"
+
+typedef struct group_callback_s group_callback_t ;
+struct group_callback_s {
+  callback_pt         cb;
+  void               *pd;
+  group_callback_t   *next;
+  char               *label;
+};
+
+struct group_tree_node_s {
+  ngx_str_t                 name; //local memory copy of group name
+  nchan_group_t            *group;
+  group_callback_t         *when_ready_head;
+  group_callback_t         *when_ready_tail;
+  memstore_channel_head_t  *owned_chanhead_head;
+  time_t                    getting_group;
+};
+
+ngx_int_t memstore_groups_init(memstore_groups_t *);
+ngx_int_t memstore_groups_shutdown(memstore_groups_t *);
+
+
+ngx_int_t memstore_group_find(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd);
+ngx_int_t memstore_group_find_from_groupnode(memstore_groups_t *gp, group_tree_node_t *gtn, callback_pt cb, void *pd);
+
+
+group_tree_node_t *memstore_groupnode_get(memstore_groups_t *gp, ngx_str_t *name);
+nchan_group_t *memstore_group_owner_find(memstore_groups_t *gp, ngx_str_t *name, int *group_just_created);
+ngx_int_t memstore_group_receive(memstore_groups_t *gp, nchan_group_t *shm_group);
+ngx_int_t memstore_group_delete(memstore_groups_t *gp, ngx_str_t *name, callback_pt cb, void *pd);
+ngx_int_t memstore_group_receive_delete(memstore_groups_t *gp, nchan_group_t *shm_group);
+
+ngx_int_t memstore_group_add_channel(memstore_channel_head_t *ch);
+ngx_int_t memstore_group_remove_channel(memstore_channel_head_t *ch);
+
+void memstore_group_associate_own_channel(memstore_channel_head_t *ch);
+void memstore_group_dissociate_own_channel(memstore_channel_head_t *ch);
+
+ngx_int_t memstore_group_add_message(group_tree_node_t *gtn, nchan_msg_t *msg);
+ngx_int_t memstore_group_remove_message(group_tree_node_t *gtn, nchan_msg_t *msg);
+
+ngx_int_t memstore_group_add_subscribers(group_tree_node_t *gtn, int count);
+#endif //MEMSTORE_GROUPS_HEADER
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.c
new file mode 100644
index 0000000..654b449
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.c
@@ -0,0 +1,1213 @@
+#include <nchan_module.h>
+#include <ngx_channel.h>
+#include "ipc.h"
+#include "ipc-handlers.h"
+#include "store-private.h"
+#include "store.h"
+#include <assert.h>
+#include <store/redis/store.h>
+#include <subscribers/memstore_ipc.h>
+#include <subscribers/getmsg_proxy.h>
+#include <subscribers/memstore_redis.h>
+#include <util/nchan_msg.h>
+#include <util/nchan_benchmark.h>
+#include <store/redis/redis_nodeset.h>
+
+
+//macro black magic, AKA X-Macros
+#define LIST_IPC_COMMANDS(L) \
+  L(subscribe) \
+  L(subscribe_reply) \
+  L(subscribe_chanhead_release) \
+  L(subscribe_chanhead_nevermind_release) \
+  L(unsubscribed) \
+  L(publish_message) \
+  L(publish_message_reply) \
+  L(publish_status) \
+  L(publish_notice) \
+  L(get_message) \
+  L(get_message_reply) \
+  L(delete) \
+  L(delete_reply) \
+  L(get_channel_info) \
+  L(get_channel_info_reply) \
+  L(channel_auth_check) \
+  L(channel_auth_check_reply) \
+  L(subscriber_keepalive) \
+  L(subscriber_keepalive_reply) \
+  L(get_group) \
+  L(group) \
+  L(group_delete) \
+  L(flood_test) \
+  L(benchmark_initialize) \
+  L(benchmark_start) \
+  L(benchmark_stop) \
+  L(benchmark_abort) \
+  L(benchmark_finish) \
+  L(benchmark_finish_reply) \
+  L(redis_stats_request) \
+  L(redis_stats_reply) \
+
+
+
+#define MAKE_ipc_handlers_t(val) ipc_handler_pt val;
+typedef struct {
+  LIST_IPC_COMMANDS(MAKE_ipc_handlers_t)
+} ipc_handlers_t;
+
+#define MAKE_ipc_command_codes_t(val) int val;
+typedef struct {
+  LIST_IPC_COMMANDS(MAKE_ipc_command_codes_t);
+} ipc_command_codes_t;
+
+#define MAKE_ipc_cmd(val) offsetof(ipc_handlers_t, val)/sizeof(ipc_handler_pt),
+static ipc_command_codes_t ipc_cmd = {
+  LIST_IPC_COMMANDS(MAKE_ipc_cmd)
+};
+
+#define IPC_CMDS (sizeof(ipc_handlers_t)/sizeof(ipc_handler_pt))
+
+#define ipc_cmd(cmd, dst, data) ipc_alert(nchan_memstore_get_ipc(), dst, ipc_cmd.cmd, data, sizeof(*(data)))
+#define ipc_broadcast_cmd(cmd, data) ipc_broadcast_alert(nchan_memstore_get_ipc(), ipc_cmd.cmd, data, sizeof(*(data)))
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "IPC-HANDLERS(%i):" fmt, memstore_slot(), ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "IPC-HANDLERS(%i):" fmt, memstore_slot(), ##args)
+
+//#define DEBUG_MEMZERO(var) ngx_memzero(var, sizeof(*(var)))
+#define DEBUG_MEMZERO(var) /*nothing*/
+
+//lots of copypasta here, but it's the fastest way for me to write these IPC handlers
+//maybe TODO: simplify this stuff, but probably not as it's not a performance penalty and the code is simple
+
+
+//static ngx_int_t empty_callback() {
+//  return NGX_OK;
+//}
+
+static nchan_msg_id_t zero_msgid = NCHAN_ZERO_MSGID;
+
+static ngx_str_t *str_shm_copy(ngx_str_t *str){
+  ngx_str_t *out;
+  out = shm_copy_immutable_string(nchan_store_memory_shmem, str);
+  if(out) {
+    DBG("create shm_str %p (data@ %p) %V", out, out->data, out);
+  }
+  return out;
+}
+
+static void str_shm_free(ngx_str_t *str) {
+  DBG("free shm_str %V @ %p", str, str->data);
+  shm_free_immutable_string(nchan_store_memory_shmem, str);
+}
+
+////////// SUBSCRIBE ////////////////
+typedef struct {
+  ngx_str_t                   *shm_chid;
+  store_channel_head_shm_t    *shared_channel_data;
+  nchan_loc_conf_t            *cf;
+  memstore_channel_head_t     *origin_chanhead;
+  memstore_channel_head_t     *owner_chanhead;
+  subscriber_t                *subscriber;
+  ngx_int_t                    rc;
+} subscribe_data_t;
+
+ngx_int_t memstore_ipc_send_subscribe(ngx_int_t dst, ngx_str_t *chid, memstore_channel_head_t *origin_chanhead, nchan_loc_conf_t *cf) {
+  DBG("send subscribe to %i, %V", dst, chid);
+
+  subscribe_data_t   data; 
+  DEBUG_MEMZERO(&data);
+  
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    nchan_log_ooshm_error("sending IPC subscribe alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  data.shared_channel_data = NULL;
+  data.origin_chanhead = origin_chanhead;
+  data.owner_chanhead = NULL;
+  data.cf = cf;
+  
+  assert(memstore_str_owner(data.shm_chid) == dst);
+  
+  return ipc_cmd(subscribe, dst, &data);
+}
+static void receive_subscribe(ngx_int_t sender, subscribe_data_t *d) {
+  memstore_channel_head_t    *head;
+  subscriber_t               *ipc_sub = NULL;
+  ngx_int_t                   rc;
+  
+  DBG("received subscribe request for channel %V", d->shm_chid);
+  head = nchan_memstore_get_chanhead(d->shm_chid, d->cf);
+  
+  if(head == NULL) {
+    //ERR("couldn't get chanhead while receiving subscribe ipc msg");
+    d->shared_channel_data = NULL;
+    d->subscriber = NULL;
+  }
+  else {
+    ipc_sub = memstore_ipc_subscriber_create(sender, &head->id, d->cf, d->origin_chanhead);
+    d->subscriber = ipc_sub;
+    d->shared_channel_data = head->shared;
+    d->owner_chanhead = head;
+    memstore_chanhead_reserve(head, "interprocess subscribe");
+    
+    ngx_atomic_fetch_add(&head->shared->gc.outside_refcount, 1); //it's awkward to put this refcount here, but necessary.
+    
+    assert(d->shared_channel_data);
+  }
+  
+  if(ipc_sub) {
+    rc = head->spooler.fn->add(&head->spooler, ipc_sub);
+    d->rc = rc;
+  }
+  else {
+    d->rc = NGX_ERROR;
+  }
+  
+  ipc_cmd(subscribe_reply, sender, d);
+  DBG("sent subscribe reply for channel %V to %i", d->shm_chid, sender);
+}
+static void receive_subscribe_reply(ngx_int_t sender, subscribe_data_t *d) {
+  memstore_channel_head_t      *head;
+  store_channel_head_shm_t     *old_shared;
+  DBG("received subscribe reply for channel %V", d->shm_chid);
+  //we have the chanhead address, but are too afraid to use it.
+  
+  if((head = nchan_memstore_get_chanhead_no_ipc_sub(d->shm_chid, d->cf)) == NULL) {
+    ERR("Error regarding an aspect of life or maybe freshly fallen cookie crumbles");
+    str_shm_free(d->shm_chid);
+    return;
+  }
+  
+  if(head != d->origin_chanhead) {    
+    assert(d->owner_chanhead);
+    ipc_cmd(subscribe_chanhead_nevermind_release, sender, d);
+    return;
+  }
+  
+  if(!d->shared_channel_data && !d->subscriber) {
+    //ERR("failed to subscribe");
+    nchan_memstore_publish_generic(head, NULL, NGX_HTTP_INSUFFICIENT_STORAGE, NULL);
+    head->status = NOTREADY;
+    chanhead_gc_add(head, "failed to subscribe to channel owner worker");
+  }
+  else {
+    old_shared = head->shared;
+    if(old_shared) {
+      assert(old_shared == d->shared_channel_data);
+    }
+    DBG("receive subscribe proceed to do ipc_sub stuff");
+    head->shared = d->shared_channel_data;
+    
+    if(old_shared == NULL) {
+      //ERR("%V local sub_count %i, internal_sub_count %i", &head->id,  head->sub_count, head->internal_sub_count);
+      assert(head->sub_count >= head->internal_sub_count);
+      ngx_atomic_fetch_add(&head->shared->sub_count, head->sub_count - head->internal_sub_count);
+      ngx_atomic_fetch_add(&head->shared->internal_sub_count, head->internal_sub_count);
+    }
+    else {
+      ERR("%V sub count already shared, don't update", &head->id);
+    }
+    
+    assert(head->shared != NULL);
+    if(head->foreign_owner_ipc_sub && head->foreign_owner_ipc_sub != d->subscriber) {
+      // we got another subscriber for this chanhead, probably due to some very heavy delays
+      // discard it, keeping the old one.
+      // (It might be nice to discard the _old_ subscriber, but the owner worker may have already deleted it
+      // or may have changed altogether due to a previous worker crash)
+      ERR("Got ipc-subscriber for an already subscribed channel %V", &head->id);
+      memstore_ready_chanhead_unless_stub(head);
+      ipc_cmd(subscribe_chanhead_nevermind_release, sender, d);
+      return;
+    }
+    else {
+      head->foreign_owner_ipc_sub = d->subscriber;
+    }
+    
+    memstore_ready_chanhead_unless_stub(head);
+  }
+  
+  str_shm_free(d->shm_chid);
+  if(d->owner_chanhead) {
+    ipc_cmd(subscribe_chanhead_release, sender, d);
+  }
+}
+
+static void receive_subscribe_chanhead_release(ngx_int_t sender, subscribe_data_t *d) {
+  DBG("release the %V", &d->owner_chanhead->id);
+  memstore_chanhead_release(d->owner_chanhead, "interprocess subscribe");
+}
+static void receive_subscribe_chanhead_nevermind_release(ngx_int_t sender, subscribe_data_t *d) {
+  ERR("release & nevermind the %V", &d->shm_chid);
+  memstore_channel_head_t      *head;
+  head = nchan_memstore_find_chanhead(d->shm_chid);
+  if(head == NULL || head != d->owner_chanhead) {
+    ERR("wrong chanhead on receive_subscribe_chanhead_nevermind_release ( expected %p, got %p)", d->owner_chanhead, head);
+    return;
+  }
+  
+  memstore_ipc_subscriber_unhook(d->subscriber);
+  d->subscriber->fn->respond_status(d->subscriber, NGX_HTTP_GONE, NULL, NULL);
+  
+  memstore_chanhead_release(d->owner_chanhead, "interprocess subscribe");
+  str_shm_free(d->shm_chid);
+}
+
+
+////////// UNSUBSCRIBED ////////////////
+typedef struct {
+  ngx_str_t    *shm_chid;
+  void         *privdata;
+} unsubscribed_data_t;
+
+ngx_int_t memstore_ipc_send_unsubscribed(ngx_int_t dst, ngx_str_t *chid, void* privdata) {
+  unsubscribed_data_t        data = {str_shm_copy(chid), privdata};
+  if(data.shm_chid == NULL) {
+    nchan_log_ooshm_error("sending IPC unsubscribe alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  return ipc_cmd(unsubscribed, dst, &data);
+}
+static void receive_unsubscribed(ngx_int_t sender, unsubscribed_data_t *d) {
+  if(memstore_channel_owner(d->shm_chid) != memstore_slot()) {
+    memstore_channel_head_t    *head;
+    //find channel
+    head = nchan_memstore_find_chanhead(d->shm_chid);
+    if(head == NULL) {
+      //already deleted maybe?
+      return;
+    }
+    head->foreign_owner_ipc_sub = NULL;
+    
+    //gc if no subscribers
+    if(head->sub_count == 0) {
+      chanhead_gc_add(head, "received UNSUBSCRIBED over ipc, sub_count == 0");
+    }
+  }
+  else {
+    ERR("makes no sense...");
+  }
+  str_shm_free(d->shm_chid);
+}
+
+////////// PUBLISH STATUS ////////////////
+typedef struct {
+  ngx_str_t                 *shm_chid;
+  ngx_int_t                  code;
+  const ngx_str_t           *data;
+  callback_pt                callback;
+  void                      *callback_privdata;
+} publish_code_data_t;
+
+ngx_int_t memstore_ipc_send_publish_status(ngx_int_t dst, ngx_str_t *chid, ngx_int_t status_code, const ngx_str_t *status_line, callback_pt callback, void *privdata) {
+  DBG("IPC: send publish status to %i ch %V", dst, chid);
+  publish_code_data_t  data = {str_shm_copy(chid), status_code, status_line, callback, privdata};
+  if(data.shm_chid == NULL) {
+    nchan_log_ooshm_error("sending IPC status alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  return ipc_cmd(publish_status, dst, &data);
+}
+
+static void receive_publish_status(ngx_int_t sender, publish_code_data_t *d) {
+  memstore_channel_head_t       *chead;
+  
+  if((chead = nchan_memstore_find_chanhead(d->shm_chid)) == NULL) {
+    if(ngx_exiting || ngx_quit) {
+      ERR("can't find chanhead for id %V, but it's okay.", d->shm_chid);
+    }
+    else {
+      ERR("Can't find chanhead for id %V while publishing status %i. This is not a big deal if you just reloaded Nchan.", d->shm_chid, d->code);
+    }
+    str_shm_free(d->shm_chid);
+    return;
+  }
+  
+  DBG("IPC: received publish status for channel %V status %i", d->shm_chid, d->code);
+  
+  nchan_memstore_publish_generic(chead, NULL, d->code, d->data);
+  
+  str_shm_free(d->shm_chid);
+  d->shm_chid=NULL;
+}
+
+////////// PUBLISH_NOTICE ////////////////
+ngx_int_t memstore_ipc_send_publish_notice(ngx_int_t dst, ngx_str_t *chid, ngx_int_t notice_code, void *notice_data) {
+  DBG("IPC: send publish notice to %i ch %V", dst, chid);
+  publish_code_data_t  data = {str_shm_copy(chid), notice_code, notice_data, NULL, NULL};
+  if(data.shm_chid == NULL) {
+    nchan_log_ooshm_error("sending IPC notice alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  return ipc_cmd(publish_notice, dst, &data);
+}
+
+static void receive_publish_notice(ngx_int_t sender, publish_code_data_t *d) {
+  memstore_channel_head_t       *chead;
+  if((chead = nchan_memstore_find_chanhead(d->shm_chid)) == NULL) {
+    if(ngx_exiting || ngx_quit) {
+      ERR("can't find chanhead for id %V, but it's okay.", d->shm_chid);
+    }
+    else {
+      ERR("Can't find chanhead for id %V while publishing status %i. This is not a big deal if you just reloaded Nchan.", d->shm_chid, d->code);
+    }
+    str_shm_free(d->shm_chid);
+    return;
+  }
+  
+  DBG("IPC: received publish notice for channel %V notice %i", d->shm_chid, d->code);
+  
+  nchan_memstore_publish_notice(chead, d->code, d->data);
+  
+  str_shm_free(d->shm_chid);
+}
+
+////////// PUBLISH  ////////////////
+typedef struct {
+  ngx_str_t                 *shm_chid;
+  nchan_msg_t               *shm_msg;
+  nchan_loc_conf_t          *cf;
+  callback_pt                callback;
+  void                      *callback_privdata;
+  
+} publish_data_t;
+
+ngx_int_t memstore_ipc_send_publish_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_t *shm_msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  publish_data_t    data; 
+  DEBUG_MEMZERO(&data);
+  
+  DBG("IPC: send publish message to %i ch %V", dst, chid);
+  assert(shm_msg->storage == NCHAN_MSG_SHARED);
+  assert(chid->data != NULL);
+  data.shm_chid = str_shm_copy(chid);
+  if(data.shm_chid == NULL) {
+    nchan_log_ooshm_error("sending IPC publish-message alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  data.shm_msg = shm_msg;
+  data.cf = cf;
+  data.callback = callback;
+  data.callback_privdata = privdata;
+  
+  assert(data.shm_chid->data != NULL);
+  assert(msg_reserve(shm_msg, "publish_message") == NGX_OK);
+  
+  return ipc_cmd(publish_message, dst, &data);
+}
+
+typedef struct {
+  ngx_int_t        sender;
+  publish_data_t  *d;
+  unsigned         allocd:1;
+} publish_callback_data;
+
+static ngx_int_t publish_message_generic_callback(ngx_int_t, void *, void *);
+
+static void receive_publish_message(ngx_int_t sender, publish_data_t *d) {
+  
+  publish_callback_data         cd_data;
+  publish_callback_data        *cd;
+  memstore_channel_head_t      *head;
+
+  assert(d->shm_chid->data != NULL);
+  
+  DBG("IPC: received publish request for channel %V  msg %p", d->shm_chid, d->shm_msg);
+  
+  if(memstore_channel_owner(d->shm_chid) == memstore_slot()) {
+    if(d->cf->redis.enabled) {
+      cd = ngx_alloc(sizeof(*cd) + sizeof(*d), ngx_cycle->log);
+      cd->allocd=1;
+      cd->d = (publish_data_t *)&cd[1];
+      *cd->d = *d;
+    }
+    else {
+      cd = &cd_data;
+      cd->allocd=0;
+      cd->d = d;
+    }
+    
+    cd->sender = sender;
+    
+    nchan_store_publish_message_generic(d->shm_chid, d->shm_msg, 1, d->cf, publish_message_generic_callback, cd);
+    //string will be freed on publish response
+  }
+  else {
+    if((head = nchan_memstore_get_chanhead(d->shm_chid, d->cf))) {
+      nchan_memstore_publish_generic(head, d->shm_msg, 0, NULL);
+    }
+    else {
+      ERR("Unable to get chanhead for publishing");
+    }
+    
+    //don't deallocate shm_msg
+  }
+  
+  msg_release(d->shm_msg, "publish_message");
+  str_shm_free(d->shm_chid);
+  d->shm_chid=NULL;
+}
+
+typedef struct {
+  uint16_t        status;// NCHAN_MESSAGE_RECEIVED or NCHAN_MESSAGE_QUEUED;
+  uint32_t        subscribers;
+  uint16_t        messages;
+  time_t          last_seen;
+  time_t          msg_time;
+  uint16_t        msg_tag;
+  callback_pt     callback;
+  void           *callback_privdata;
+} publish_response_data;
+
+static ngx_int_t publish_message_generic_callback(ngx_int_t status, void *rptr, void *privdata) {
+  DBG("IPC: publish message generic callback");
+  publish_callback_data   *cd = (publish_callback_data *)privdata;
+  publish_response_data    rd; 
+  DEBUG_MEMZERO(&rd);
+  
+  nchan_channel_t *ch = (nchan_channel_t *)rptr;
+  rd.status = status;
+  rd.callback = cd->d->callback;
+  rd.callback_privdata = cd->d->callback_privdata;
+  if(ch != NULL) {
+    rd.last_seen = ch->last_seen;
+    rd.subscribers = ch->subscribers;
+    rd.messages = ch->messages;
+    assert(ch->last_published_msg_id.tagcount == 1);
+    rd.msg_time = ch->last_published_msg_id.time;
+    rd.msg_tag = ch->last_published_msg_id.tag.fixed[0];
+  }
+  ipc_cmd(publish_message_reply, cd->sender, &rd);
+  if(cd->allocd) {
+    ngx_free(cd);
+  }
+  return NGX_OK;
+}
+static void receive_publish_message_reply(ngx_int_t sender, publish_response_data *d) {
+  nchan_channel_t         ch;
+  DBG("IPC: received publish reply");
+  
+  ch.last_seen = d->last_seen;
+  ch.subscribers = d->subscribers;
+  ch.messages = d->messages;
+  ch.last_published_msg_id.time = d->msg_time;
+  ch.last_published_msg_id.tag.fixed[0] = d->msg_tag;
+  ch.last_published_msg_id.tagcount = 1;
+  ch.last_published_msg_id.tagactive = 0;
+  d->callback(d->status, &ch, d->callback_privdata);
+}
+
+
+////////// GET MESSAGE ////////////////
+union getmsg_u {
+  struct req_s {
+    nchan_msg_id_t          msgid;
+  } req;
+  
+  struct resp_s {
+    nchan_msg_status_t      getmsg_code;
+    nchan_msg_t            *shm_msg;
+  } resp; 
+};
+
+typedef struct {
+  ngx_str_t              *shm_chid;
+  void                   *privdata;
+  union getmsg_u          d;
+} getmessage_data_t;
+
+ngx_int_t memstore_ipc_send_get_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_id_t *msgid, void *privdata) {
+  getmessage_data_t      data;
+  
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    nchan_log_ooshm_error("sending IPC get-message alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  data.privdata = privdata;
+  data.d.req.msgid = *msgid;
+  
+  DBG("IPC: send get message from %i ch %V", dst, chid);
+  assert(data.shm_chid->len >= 1);
+  return ipc_cmd(get_message, dst, &data);
+}
+
+
+typedef struct {
+  ngx_int_t            sender;
+  getmessage_data_t    data;
+} getmessage_data_proxy_pd_t;
+
+//for retrieving messages from unready buffers
+static ngx_int_t ipc_getmsg_proxy_callback(ngx_int_t code, nchan_msg_t *msg, getmessage_data_proxy_pd_t *ppd) {
+  ppd->data.d.resp.getmsg_code = code;
+  ppd->data.d.resp.shm_msg = msg;
+  if(msg) {
+    assert(msg_reserve(msg, "get_message_reply") == NGX_OK);
+  }
+  ipc_cmd(get_message_reply, ppd->sender, &ppd->data);
+  ngx_free(ppd);
+  return NGX_OK;
+}
+
+static void receive_get_message(ngx_int_t sender, getmessage_data_t *d) {
+  memstore_channel_head_t     *head;
+  store_message_t             *msg = NULL;
+  
+  
+  assert(d->shm_chid->len >= 1);
+  assert(d->shm_chid->data!=NULL);
+  DBG("IPC: received get_message request for channel %V privdata %p", d->shm_chid, d->privdata);
+  
+  head = nchan_memstore_find_chanhead(d->shm_chid);
+  if(head == NULL) {
+    //no such thing here. reply.
+    d->d.resp.getmsg_code = MSG_NOTFOUND;
+    d->d.resp.shm_msg = NULL;
+  }
+  else if(head->msg_buffer_complete) {
+    msg = chanhead_find_next_message(head, &d->d.req.msgid, &d->d.resp.getmsg_code);
+    d->d.resp.shm_msg = msg == NULL ? NULL : msg->msg;
+  }
+  else {
+    //buffer is not ready. reply when it's ready
+    getmessage_data_proxy_pd_t *ppd = ngx_alloc(sizeof(*ppd), ngx_cycle->log);
+    if(ppd == NULL) {
+      ERR("couldn't allocate getmessage proxy data for ipc get_message");
+      goto err;
+    }
+    ppd->data = *d;
+    ppd->sender = sender;
+    
+    subscriber_t *getmsg_sub = getmsg_proxy_subscriber_create(&d->d.req.msgid, (callback_pt )ipc_getmsg_proxy_callback, ppd);
+    if(!getmsg_sub) {
+      ERR("couldn't allocate getmessage proxy subscriber for ipc get_message");
+      goto err;
+    }
+    if(head->spooler.fn->add(&head->spooler, getmsg_sub) != NGX_OK) {
+      ERR("couldn't enqueue getmsg proxy subscriber for ipc get_message");
+      goto err;
+    }
+    return;
+  }
+  if(d->d.resp.shm_msg) {
+    assert(msg_reserve(d->d.resp.shm_msg, "get_message_reply") == NGX_OK);
+  }
+  DBG("IPC: send get_message_reply for channel %V  msg %p, privdata: %p", d->shm_chid, msg, d->privdata);
+  ipc_cmd(get_message_reply, sender, d);
+  return;
+
+err:
+  d->d.resp.getmsg_code = MSG_ERROR;
+  d->d.resp.shm_msg = NULL;
+  ipc_cmd(get_message_reply, sender, d);
+}
+
+static void receive_get_message_reply(ngx_int_t sender, getmessage_data_t *d) {
+  
+  assert(d->shm_chid->len >= 1);
+  assert(d->shm_chid->data!=NULL);
+  DBG("IPC: received get_message reply for channel %V msg %p privdata %p", d->shm_chid, d->d.resp.shm_msg, d->privdata);
+  nchan_memstore_handle_get_message_reply(d->d.resp.shm_msg, d->d.resp.getmsg_code, d->privdata);
+  if(d->d.resp.shm_msg) {
+    msg_release(d->d.resp.shm_msg, "get_message_reply");
+  }
+  str_shm_free(d->shm_chid);
+}
+
+
+
+
+////////// DELETE ////////////////
+typedef struct {
+  ngx_str_t           *shm_chid;
+  ngx_int_t            sender;
+  nchan_channel_t     *shm_channel_info;
+  ngx_int_t            code;
+  callback_pt          callback;
+  void                *privdata;
+} delete_data_t;
+
+ngx_int_t memstore_ipc_send_delete(ngx_int_t dst, ngx_str_t *chid, callback_pt callback,void *privdata) {
+  delete_data_t  data = {str_shm_copy(chid), 0, NULL, 0, callback, privdata};
+  if(data.shm_chid == NULL) {
+    nchan_log_ooshm_error("sending IPC send-delete alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  DBG("IPC: send delete to %i ch %V", dst, chid);
+  return ipc_cmd(delete, dst, &data);
+}
+
+static ngx_int_t delete_callback_handler(ngx_int_t, nchan_channel_t *, delete_data_t *);
+
+static void receive_delete(ngx_int_t sender, delete_data_t *d) {
+  d->sender = sender;
+  DBG("IPC received delete request for channel %V privdata %p", d->shm_chid, d->privdata);
+  nchan_memstore_force_delete_channel(d->shm_chid, (callback_pt )delete_callback_handler, d);
+}
+
+static ngx_int_t delete_callback_handler(ngx_int_t code, nchan_channel_t *chan, delete_data_t *d) {
+  nchan_channel_t      *chan_info;
+  
+  d->code = code;
+  if (chan) {
+    if((chan_info = shm_alloc(nchan_store_memory_shmem, sizeof(*chan_info), "channel info for delete IPC response")) == NULL) {
+      d->shm_channel_info = NULL;
+      d->code = NGX_HTTP_INSUFFICIENT_STORAGE;
+      nchan_log_ooshm_error("sending IPC delete-reply alert for channel %V", d->shm_chid);
+    }
+    else {
+      d->shm_channel_info= chan_info;
+      chan_info->messages = chan->messages;
+      chan_info->subscribers = chan->subscribers;
+      chan_info->last_seen = chan->last_seen;
+      
+      if(chan->last_published_msg_id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+        //meh, this can't be triggered... can it?...
+        nchan_msg_id_t           zeroid = NCHAN_ZERO_MSGID;
+        chan_info->last_published_msg_id = zeroid;
+      }
+      else {
+        chan_info->last_published_msg_id = chan->last_published_msg_id;
+      }
+    }
+  }
+  else {
+    d->shm_channel_info = NULL;
+  }
+  ipc_cmd(delete_reply, d->sender, d);
+  return NGX_OK;
+}
+static void receive_delete_reply(ngx_int_t sender, delete_data_t *d) {
+  
+  DBG("IPC received delete reply for channel %V privdata %p", d->shm_chid, d->privdata);
+  d->callback(d->code, d->shm_channel_info, d->privdata);
+  
+  if(d->shm_channel_info != NULL) {
+    shm_free(nchan_store_memory_shmem, d->shm_channel_info);
+  }
+  str_shm_free(d->shm_chid);
+}
+
+
+
+
+////////// GET CHANNEL INFO ////////////////
+typedef struct {
+  ngx_str_t                 *shm_chid;
+  nchan_loc_conf_t          *cf;
+  store_channel_head_shm_t  *channel_info;
+  nchan_msg_id_t             last_msgid;
+  callback_pt                callback;
+  void                      *privdata;
+} channel_info_data_t;
+
+ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata) {
+  DBG("send get_channel_info to %i %V", dst, chid);
+  channel_info_data_t        data;
+  DEBUG_MEMZERO(&data);
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    nchan_log_ooshm_error("sending IPC get-channel-info alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+
+  data.channel_info = NULL;
+  data.last_msgid = zero_msgid;
+  data.cf = cf;
+  data.callback = callback;
+  data.privdata = privdata;
+  return ipc_cmd(get_channel_info, dst, &data);
+}
+
+typedef struct {
+  channel_info_data_t   d;
+  ngx_int_t             sender;
+} channel_info_find_chanhead_backup_data_t;
+
+static void receive_get_channel_info_continued(ngx_int_t sender, channel_info_data_t *d, memstore_channel_head_t *head) {
+  assert(memstore_slot() == memstore_channel_owner(d->shm_chid));
+  if(head == NULL) {
+    //already deleted maybe?
+    DBG("channel not for for get_channel_info");
+    d->channel_info = NULL;
+  }
+  else {
+    d->channel_info = head->shared;
+    assert(head->latest_msgid.tagcount <= 1);
+    d->last_msgid = head->latest_msgid;
+  }
+  ipc_cmd(get_channel_info_reply, sender, d);
+}
+
+static ngx_int_t find_chanhead_w_backup_callback(ngx_int_t rc, void *vd, void *pd) {
+  channel_info_find_chanhead_backup_data_t *d = pd;
+  memstore_channel_head_t                  *head = vd;
+  
+  receive_get_channel_info_continued(d->sender, &d->d, head);
+  
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static void receive_get_channel_info(ngx_int_t sender, channel_info_data_t *d) {
+  memstore_channel_head_t    *head;
+  
+  DBG("received get_channel_info request for channel %V privdata %p", d->shm_chid, d->privdata);
+  if(d->cf->redis.enabled && d->cf->redis.storage_mode == REDIS_MODE_BACKUP) {
+    channel_info_find_chanhead_backup_data_t *dd = ngx_alloc(sizeof(*dd), ngx_cycle->log);
+    dd->d = *d;
+    dd->sender = sender;
+    nchan_memstore_find_chanhead_with_backup(d->shm_chid, d->cf, find_chanhead_w_backup_callback, dd);
+  }
+  else {
+    head = nchan_memstore_find_chanhead(d->shm_chid);
+    receive_get_channel_info_continued(sender, d, head);
+  }
+}
+
+static void receive_get_channel_info_reply(ngx_int_t sender, channel_info_data_t *d) {
+  nchan_channel_t            chan;
+  store_channel_head_shm_t  *chinfo = d->channel_info;
+  
+  if(chinfo) {
+    //construct channel
+    chan.subscribers = chinfo->sub_count;
+    chan.last_seen = chinfo->last_seen;
+    chan.id.data = d->shm_chid->data;
+    chan.id.len = d->shm_chid->len;
+    chan.messages = chinfo->stored_message_count;
+    chan.last_published_msg_id = d->last_msgid;
+    d->callback(NGX_OK, &chan, d->privdata);
+  }
+  else {
+    d->callback(NGX_OK, NULL, d->privdata);
+  }
+  str_shm_free(d->shm_chid);
+}
+
+
+////////// CHANNEL AUTHORIZATION DATA ////////////////
+typedef struct {
+  ngx_str_t               *shm_chid;
+  unsigned                 auth_ok:1;
+  unsigned                 channel_must_exist:1;
+  nchan_loc_conf_t        *cf;
+  ngx_int_t                max_subscribers;
+  callback_pt              callback;
+  void                    *privdata;
+} channel_authcheck_data_t;
+
+ngx_int_t memstore_ipc_send_channel_existence_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata) {
+  DBG("send channel_auth_check to %i %V", dst, chid);
+  channel_authcheck_data_t        data;
+  DEBUG_MEMZERO(&data);
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    nchan_log_ooshm_error("sending IPC channel-existence-check alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  data.auth_ok = 0;
+  data.channel_must_exist = cf->subscribe_only_existing_channel;
+  data.cf = cf;
+  data.max_subscribers = cf->max_channel_subscribers;
+  data.callback = callback;
+  data.privdata = privdata;
+  
+  return ipc_cmd(channel_auth_check, dst, &data);
+}
+
+typedef struct {
+  ngx_int_t                 sender;
+  channel_authcheck_data_t  d;
+} channel_authcheck_data_callback_t;
+
+static ngx_int_t redis_receive_channel_auth_check_callback(ngx_int_t status, void *ch, void *d) {
+  nchan_channel_t                     *channel = (nchan_channel_t *)ch;
+  channel_authcheck_data_callback_t   *data = (channel_authcheck_data_callback_t *)d;
+  if(channel == NULL) {
+    data->d.auth_ok = !data->d.channel_must_exist;
+  }
+  else if(data->d.max_subscribers == 0) {
+    data->d.auth_ok = 1;
+  }
+  else {
+    data->d.auth_ok = channel->subscribers < data->d.max_subscribers;
+  }
+  ipc_cmd(channel_auth_check_reply, data->sender, &data->d);
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static void receive_channel_auth_check(ngx_int_t sender, channel_authcheck_data_t *d) {
+  memstore_channel_head_t    *head;
+  
+  DBG("received channel_auth_check request for channel %V privdata %p", d->shm_chid, d->privdata);
+  
+  assert(memstore_slot() == memstore_channel_owner(d->shm_chid));
+  if(!d->cf->redis.enabled) {
+    head = nchan_memstore_find_chanhead(d->shm_chid);
+    if(head == NULL) {
+      d->auth_ok = !d->channel_must_exist;
+    }
+    else if (d->max_subscribers == 0) {
+      d->auth_ok = 1;
+    }
+    else {
+      assert(head->shared);
+      d->auth_ok = head->shared->sub_count < (ngx_uint_t )d->max_subscribers;
+    }
+    ipc_cmd(channel_auth_check_reply, sender, d);
+  }
+  else {
+    channel_authcheck_data_callback_t    *dd = ngx_alloc(sizeof(*dd), ngx_cycle->log);
+    dd->d = *d;
+    dd->sender = sender;
+    nchan_store_redis.find_channel(d->shm_chid, d->cf, redis_receive_channel_auth_check_callback, dd);
+  }
+}
+
+static void receive_channel_auth_check_reply(ngx_int_t sender, channel_authcheck_data_t *d) {
+  d->callback(d->auth_ok, NULL, d->privdata);
+  str_shm_free(d->shm_chid);
+}
+
+/////////// SUBSCRIBER KEEPALIVE ///////////
+typedef enum {
+  KA_REPLY_NORENEW = 0, 
+  KA_REPLY_RENEW,
+  KA_REPLY_UNHOOK_NORENEW,
+} keepalive_reply_action_t;
+
+typedef struct {
+  ngx_str_t                   *shm_chid;
+  subscriber_t                *ipc_sub;
+  memstore_channel_head_t     *originator;
+  keepalive_reply_action_t     reply_action;  
+} sub_keepalive_data_t;
+
+ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch) {
+  sub_keepalive_data_t        data;
+  DEBUG_MEMZERO(&data);
+  if((data.shm_chid = str_shm_copy(chid)) == NULL) {
+    nchan_log_ooshm_error("sending IPC keepalive alert for channel %V", chid);
+    return NGX_DECLINED;
+  }
+  data.ipc_sub = sub;
+  data.originator = ch;
+  
+  data.reply_action = KA_REPLY_NORENEW;
+  
+  sub->fn->reserve(sub);
+  
+  DBG("send SUBSCRIBER KEEPALIVE to %i %V", dst, chid);
+  
+  ipc_cmd(subscriber_keepalive, dst, &data);
+  return NGX_OK;
+}
+static void receive_subscriber_keepalive(ngx_int_t sender, sub_keepalive_data_t *d) {
+  memstore_channel_head_t    *head;
+  DBG("received SUBSCRIBER KEEPALIVE from %i for channel %V", sender, d->shm_chid);
+  head = nchan_memstore_find_chanhead(d->shm_chid);
+  str_shm_free(d->shm_chid);
+  
+  if(head == NULL) {
+    DBG("not subscribed anymore");
+    d->reply_action = KA_REPLY_NORENEW;
+  }
+  else {
+    if(head != d->originator) {
+      ERR("Got keepalive for expired channel %V", &head->id);
+      d->reply_action = KA_REPLY_UNHOOK_NORENEW;
+    }
+    else if(head->status != READY && head->status != STUBBED) {
+      if(head->status == WAITING && head->foreign_owner_ipc_sub == NULL) {
+        //wrong-status head. don't renew, get rid of this chanhead
+        nchan_memstore_publish_generic(head, NULL, NGX_HTTP_SERVICE_UNAVAILABLE, NULL);
+        nchan_memstore_force_delete_channel(d->shm_chid, NULL, NULL);
+        d->reply_action = KA_REPLY_UNHOOK_NORENEW;
+      }
+      else {
+        //something's gone extra weird. 
+        //kick out these subs, delete chanhead... just in case
+        nchan_memstore_publish_generic(head, NULL, NGX_HTTP_SERVICE_UNAVAILABLE, NULL);
+        nchan_memstore_force_delete_channel(d->shm_chid, NULL, NULL);
+        d->reply_action = KA_REPLY_UNHOOK_NORENEW;
+      }
+    }
+    else if(head->foreign_owner_ipc_sub != d->ipc_sub) {
+      // we got another subscriber for this chanhead, probably due to some very heavy delays
+      // discard it, keeping the old one.
+      // (It might be nice to discard the _old_ subscriber, but the owner worker may have already deleted it
+      ERR("Got ipc-subscriber during keepalive for an already subscribed channel %V", &head->id);
+      d->reply_action = KA_REPLY_UNHOOK_NORENEW;
+    }
+    else if(head->sub_count == 0) {
+      if(ngx_time() - head->last_subscribed_local > MEMSTORE_IPC_SUBSCRIBER_TIMEOUT) {
+        d->reply_action = KA_REPLY_NORENEW;
+        DBG("No subscribers lately. Time... to die.");
+      }
+      else {
+        DBG("No subscribers, but there was one %i sec ago. don't unsubscribe.", ngx_time() - head->last_subscribed_local);
+        d->reply_action = KA_REPLY_RENEW;
+      }
+    }
+    else {
+      d->reply_action = KA_REPLY_RENEW;
+    }
+  }
+  ipc_cmd(subscriber_keepalive_reply, sender, d);
+}
+
+static void receive_subscriber_keepalive_reply(ngx_int_t sender, sub_keepalive_data_t *d) {
+  subscriber_t     *sub = d->ipc_sub;
+  switch(d->reply_action) {
+    case KA_REPLY_NORENEW:
+      sub->fn->dequeue(sub);
+      sub->fn->release(sub, 0);
+      break;
+    case KA_REPLY_RENEW:
+      memstore_ipc_subscriber_keepalive_renew(sub);
+      sub->fn->release(sub, 0);
+      break;
+    case KA_REPLY_UNHOOK_NORENEW:
+      memstore_ipc_subscriber_unhook(sub);
+      sub->fn->release(sub, 0);
+      break;
+    default:
+      raise(SIGABRT);
+  }
+}
+
+
+/////////// GROUPS ///////////
+
+ngx_int_t memstore_ipc_send_get_group(ngx_int_t dst, ngx_str_t *group_id) {
+  ngx_str_t         *shm_id = str_shm_copy(group_id);
+  if(shm_id == NULL) {
+    nchan_log_ooshm_error("sending IPC get-group alert for group %V", group_id);
+    return NGX_DECLINED;
+  }
+  DBG("send GET GROUP to %i %p %V", dst, shm_id, shm_id);
+  ipc_cmd(get_group, dst, &shm_id);
+  return NGX_OK;
+}
+
+static void receive_get_group(ngx_int_t sender, ngx_str_t **group_id) {
+  nchan_group_t  *shared_group;
+  int             new_group;
+  DBG("received GET GROUP from %i %p %V", sender, *group_id, *group_id);
+  
+  shared_group = memstore_group_owner_find(nchan_memstore_get_groups(), *group_id, &new_group);
+  if(!new_group) { //new group is automatically broadcast to everyone, this one already exists.
+    ipc_cmd(group, sender, &shared_group);
+  }
+  
+  str_shm_free(*group_id);
+}
+
+ngx_int_t memstore_ipc_broadcast_group(nchan_group_t *shared_group) {
+  DBG("broadcast GROUP %V to everyone but me", &shared_group->name);
+  ipc_broadcast_cmd(group, &shared_group);
+  
+  return NGX_OK;
+}
+
+static void receive_group(ngx_int_t sender, nchan_group_t **shared_group) {
+  DBG("receive GROUP %V", &(*shared_group)->name);
+  
+  memstore_group_receive(nchan_memstore_get_groups(), *shared_group);
+}
+
+ngx_int_t memstore_ipc_broadcast_group_delete(nchan_group_t *shared_group) {
+  DBG("send DELETE GROUP");
+  ipc_broadcast_cmd(group_delete, &shared_group);
+  return NGX_OK;
+}
+
+static void receive_group_delete(ngx_int_t sender, nchan_group_t **shared_group) {
+  DBG("receive GROUP DELETE %V", &(*shared_group)->name);
+  
+  memstore_group_receive_delete(nchan_memstore_get_groups(), *shared_group);
+}
+
+/////////// FLOOD TEST ///////////
+typedef struct {
+  uint64_t          n;
+} flood_data_t;
+
+
+static int  flood_seq = 0;
+ngx_int_t memstore_ipc_send_flood_test(ngx_int_t dst) {
+  flood_data_t        data = {flood_seq++};
+  ipc_cmd(flood_test, dst, &data);
+  return NGX_OK;
+}
+
+
+static void receive_flood_test(ngx_int_t sender, flood_data_t *d) {
+  struct timespec  tv;
+  tv.tv_sec=0;
+  tv.tv_nsec=8000000;
+  ERR("      received FLOOD TEST from %i seq %l", sender, d->n);
+  nanosleep(&tv, NULL);
+}
+
+////////// BENCHMARK INITIALIZE //////////////
+typedef struct {
+  nchan_loc_conf_t *loc_conf;
+  time_t        time;
+  uint32_t      id;
+  nchan_benchmark_shared_t shared;
+} benchmark_initialize_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_initialize(void *bench_pd) {
+  nchan_benchmark_t            *bench = bench_pd;
+  benchmark_initialize_data_t   data;
+  DEBUG_MEMZERO(&data);
+  data.loc_conf = bench->loc_conf;
+  data.id = bench->id;
+  data.time = bench->time.init;
+  data.shared = bench->shared;
+  
+  return ipc_broadcast_cmd(benchmark_initialize, &data);
+}
+static void receive_benchmark_initialize(ngx_int_t sender, benchmark_initialize_data_t *d) {
+  nchan_benchmark_initialize_from_ipc(sender, d->loc_conf, d->time, d->id, &d->shared);
+}
+
+////////// BENCHMARK RUN ////////////////
+typedef struct {
+  nchan_loc_conf_t *loc_conf;
+} benchmark_run_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_run(void) {
+  benchmark_run_data_t        data;
+  DEBUG_MEMZERO(&data);
+  return ipc_broadcast_cmd(benchmark_start, &data);
+}
+static void receive_benchmark_start(ngx_int_t sender, benchmark_run_data_t *d) {
+  nchan_benchmark_run();
+}
+
+////////// BENCHMARK STOP ////////////////
+typedef struct {
+  nchan_loc_conf_t *loc_conf;
+} benchmark_stop_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_stop(void) {
+  benchmark_stop_data_t        data;
+  DEBUG_MEMZERO(&data);
+  return ipc_broadcast_cmd(benchmark_stop, &data);
+}
+static void receive_benchmark_stop(ngx_int_t sender, benchmark_stop_data_t *d) {
+  nchan_benchmark_stop();
+}
+
+////////// BENCHMARK FINISH ////////////////
+typedef struct {
+  nchan_benchmark_data_t data;
+} benchmark_finish_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_finish(void) {
+  benchmark_finish_data_t        data;
+  DEBUG_MEMZERO(&data);
+  return ipc_broadcast_cmd(benchmark_finish, &data);
+}
+static void receive_benchmark_finish(ngx_int_t sender, benchmark_finish_data_t *d) {
+  nchan_benchmark_t        *bench = nchan_benchmark_get_active();
+  benchmark_finish_data_t   data;
+  DEBUG_MEMZERO(&data);
+  nchan_benchmark_dequeue_subscribers();
+  data.data = bench->data;
+  ipc_cmd(benchmark_finish_reply, sender, &data);
+  nchan_benchmark_cleanup();
+}
+
+static void receive_benchmark_finish_reply(ngx_int_t sender, benchmark_finish_data_t *d) {
+  nchan_benchmark_receive_finished_data(&d->data);
+}
+
+////////// BENCHMARK ABORT ////////////////
+typedef struct {
+  nchan_benchmark_data_t data;
+} benchmark_abort_data_t;
+
+ngx_int_t memstore_ipc_broadcast_benchmark_abort(void) {
+  benchmark_abort_data_t        data;
+  DEBUG_MEMZERO(&data);
+  return ipc_broadcast_cmd(benchmark_abort, &data);
+}
+static void receive_benchmark_abort(ngx_int_t sender, benchmark_abort_data_t *d) {
+  nchan_benchmark_abort();
+}
+
+/////////// REDIS STATS ////////////////
+typedef struct {
+  void                       *redis_nodeset;
+  size_t                      stats_count;
+  callback_pt                 cb;
+  void                       *pd;
+  redis_node_command_stats_t *stats;
+} redis_stats_request_data_t;
+
+ngx_int_t memstore_ipc_broadcast_redis_stats_request(void *nodeset, callback_pt cb, void *pd) {
+  redis_stats_request_data_t data;
+  DEBUG_MEMZERO(&data);
+  data.redis_nodeset = nodeset;
+  data.stats_count = 0;
+  data.stats = NULL;
+  data.cb = cb;
+  data.pd = pd;
+  return ipc_broadcast_cmd(redis_stats_request, &data);
+}
+
+
+static void receive_redis_stats_request(ngx_int_t sender, redis_stats_request_data_t *data) {
+  redis_node_command_stats_t *stats, *stats_shm;
+  size_t                      statscount;
+  
+  stats = redis_nodeset_worker_command_stats_alloc(data->redis_nodeset, &statscount);
+  
+  if(!stats) {
+    goto fail;
+  }
+  
+  if((stats_shm = shm_alloc(nchan_store_memory_shmem, sizeof(*stats) * statscount, "redis nodeset stats")) == NULL) {
+    goto fail;
+  }
+  
+  data->stats_count = statscount;
+  data->stats = stats_shm;
+  ngx_memcpy(stats_shm, stats, sizeof(*stats) * statscount);
+  ngx_free(stats);
+  ipc_cmd(redis_stats_reply, sender, data);
+  return;
+  
+  
+fail:
+  if(stats) {
+    ngx_free(stats);
+  }
+  data->stats_count = 0;
+  data->stats = NULL;
+  ipc_cmd(redis_stats_reply, sender, data);
+  return;
+}
+
+static void receive_redis_stats_reply(ngx_int_t sender, redis_stats_request_data_t *data) {
+  data->cb(data->stats_count, data->stats, data->pd);
+  shm_free(nchan_store_memory_shmem, data->stats);
+}
+
+
+#define MAKE_ipc_cmd_handler(val) [offsetof(ipc_handlers_t, val)/sizeof(ipc_handler_pt)] = (ipc_handler_pt )receive_ ## val,
+static ipc_handler_pt ipc_cmd_handler[] = {
+  LIST_IPC_COMMANDS(MAKE_ipc_cmd_handler)
+};
+
+void memstore_ipc_alert_handler(ngx_int_t sender, ngx_uint_t code, void *data) {
+  if(code >= IPC_CMDS) {
+    ERR("received invalid code %ui from sender %i", code, sender);
+    return;
+  }
+  ipc_cmd_handler[code](sender, data);
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.h
new file mode 100644
index 0000000..e22c4a0
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc-handlers.h
@@ -0,0 +1,28 @@
+#include "store-private.h"
+
+typedef void (*ipc_handler_pt)(ngx_int_t, void *);
+
+ngx_int_t memstore_ipc_send_subscribe(ngx_int_t owner, ngx_str_t *shm_chid, memstore_channel_head_t *, nchan_loc_conf_t *);
+ngx_int_t memstore_ipc_send_memstore_subscriber_keepalive(ngx_int_t dst, ngx_str_t *chid, subscriber_t *sub, memstore_channel_head_t *ch);
+ngx_int_t memstore_ipc_send_unsubscribe(ngx_int_t dst, ngx_str_t *chid, void *subscriber, void* privdata);
+ngx_int_t memstore_ipc_send_unsubscribed(ngx_int_t dst, ngx_str_t *chid, void* privdata);
+ngx_int_t memstore_ipc_send_publish_message(ngx_int_t dst, ngx_str_t *chid, nchan_msg_t *shm_msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
+ngx_int_t memstore_ipc_send_publish_status(ngx_int_t dst, ngx_str_t *chid, ngx_int_t status_code, const ngx_str_t *status_line, callback_pt callback, void *privdata);
+ngx_int_t memstore_ipc_send_publish_notice(ngx_int_t dst, ngx_str_t *chid, ngx_int_t notice_code, void *notice_data);
+ngx_int_t memstore_ipc_send_get_message(ngx_int_t owner, ngx_str_t *shm_chid, nchan_msg_id_t *msgid, void * privdata);
+ngx_int_t memstore_ipc_send_delete(ngx_int_t owner, ngx_str_t *shm_chid, callback_pt callback, void *privdata);
+void memstore_ipc_alert_handler(ngx_int_t sender, ngx_uint_t code, void *data);
+ngx_int_t memstore_ipc_send_get_channel_info(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata);
+ngx_int_t memstore_ipc_send_channel_existence_check(ngx_int_t dst, ngx_str_t *chid, nchan_loc_conf_t *cf, callback_pt callback, void* privdata);
+ngx_int_t memstore_ipc_broadcast_group(nchan_group_t *shared_group);
+ngx_int_t memstore_ipc_send_get_group(ngx_int_t dst, ngx_str_t *group_id);
+ngx_int_t memstore_ipc_broadcast_group_delete(nchan_group_t *shared_group);
+ngx_int_t memstore_ipc_send_flood_test(ngx_int_t dst);
+
+ngx_int_t memstore_ipc_broadcast_benchmark_initialize(void *bench);
+ngx_int_t memstore_ipc_broadcast_benchmark_run(void);
+ngx_int_t memstore_ipc_broadcast_benchmark_stop(void);
+ngx_int_t memstore_ipc_broadcast_benchmark_finish(void);
+ngx_int_t memstore_ipc_broadcast_benchmark_abort(void);
+
+ngx_int_t memstore_ipc_broadcast_redis_stats_request(void *nodeset, callback_pt cb, void *pd);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.c
new file mode 100755
index 0000000..0e87cb9
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.c
@@ -0,0 +1,558 @@
+//worker processes of the world, unite.
+#include <nchan_module.h>
+#include <ngx_channel.h>
+#include <assert.h>
+#include "ipc.h"
+#include "groups.h"
+
+#include "store-private.h"
+
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+//#define DEBUG_LEVEL NGX_LOG_WARN
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "IPC:" fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "IPC:" fmt, ##args)
+
+//#define DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC 100
+
+static ngx_event_t  receive_alert_delay_log_timer;
+static ngx_event_t  send_alert_delay_log_timer;
+static void receive_alert_delay_log_timer_handler(ngx_event_t *ev);
+static void send_alert_delay_log_timer_handler(ngx_event_t *ev);
+
+static void ipc_read_handler(ngx_event_t *ev);
+
+ngx_int_t ipc_init(ipc_t *ipc) {
+  int                             i = 0;
+  ipc_process_t                  *proc;
+  
+  nchan_init_timer(&receive_alert_delay_log_timer, receive_alert_delay_log_timer_handler, NULL);
+  nchan_init_timer(&send_alert_delay_log_timer, send_alert_delay_log_timer_handler, NULL);
+  
+  for(i=0; i< NGX_MAX_PROCESSES; i++) {
+    proc = &ipc->process[i];
+    proc->ipc = ipc;
+    proc->pipe[0]=NGX_INVALID_FILE;
+    proc->pipe[1]=NGX_INVALID_FILE;
+    proc->c=NULL;
+    proc->active = 0;
+    ngx_memzero(proc->wbuf.alerts, sizeof(proc->wbuf.alerts));
+    proc->wbuf.first = 0;
+    proc->wbuf.n = 0;
+    proc->wbuf.overflow_first = NULL;
+    proc->wbuf.overflow_last = NULL;
+    proc->wbuf.overflow_n = 0;
+    ipc->worker_slots[i]=NGX_ERROR;
+  }
+  ipc->workers = NGX_ERROR;
+  return NGX_OK;
+}
+
+ngx_int_t ipc_set_handler(ipc_t *ipc, void (*alert_handler)(ngx_int_t, ngx_uint_t, void *)) {
+  ipc->handler=alert_handler;
+  return NGX_OK;
+}
+
+static void ipc_try_close_fd(ngx_socket_t *fd) {
+  if(*fd != NGX_INVALID_FILE) {
+    ngx_close_socket(*fd);
+    *fd=NGX_INVALID_FILE;
+  }
+}
+
+size_t ipc_worker_slots(const ipc_t *ipc, const ngx_int_t **workerslots_array) {
+  *workerslots_array = ipc->worker_slots;
+  return ipc->workers;
+}
+
+ngx_int_t ipc_open(ipc_t *ipc, ngx_cycle_t *cycle, ngx_int_t workers, void (*slot_callback)(int slot, int worker)) {
+//initialize pipes for workers in advance.
+  int                             i, j, s = 0;
+  ngx_int_t                       last_expected_process = ngx_last_process;
+  ipc_process_t                  *proc;
+  ngx_socket_t                   *socks;
+  
+  /* here's the deal: we have no control over fork()ing, nginx's internal 
+    * socketpairs are unusable for our purposes (as of nginx 0.8 -- check the 
+    * code to see why), and the module initialization callbacks occur before
+    * any workers are spawned. Rather than futzing around with existing 
+    * socketpairs, we make our own pipes array. 
+    * Trouble is, ngx_spawn_process() creates them one-by-one, and we need to 
+    * do it all at once. So we must guess all the workers' ngx_process_slots in 
+    * advance. Meaning the spawning logic must be copied to the T.
+    * ... with some allowances for already-opened sockets...
+    */
+  for(i=0; i < workers; i++) {
+    //copypasta from os/unix/ngx_process.c (ngx_spawn_process)
+    while (s < last_expected_process && ngx_processes[s].pid != -1) {
+      //find empty existing slot
+      s++;
+    }
+    
+    if(slot_callback) {
+      slot_callback(s, i);
+    }
+    
+    ipc->worker_slots[i] = s;
+    
+    proc = &ipc->process[s];
+
+    socks = proc->pipe;
+    
+    if(proc->active) {
+      // reinitialize already active pipes. This is done to prevent IPC alerts
+      // from a previous restart that were never read from being received by
+      // a newly restarted worker
+      ipc_try_close_fd(&socks[0]);
+      ipc_try_close_fd(&socks[1]);
+      proc->active = 0;
+    }
+    
+    assert(socks[0] == NGX_INVALID_FILE && socks[1] == NGX_INVALID_FILE);
+    
+    //make-a-pipe
+    if (pipe(socks) == -1) {
+      ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "pipe() failed while initializing nchan IPC");
+      return NGX_ERROR;
+    }
+    //make both ends nonblocking
+    for(j=0; j <= 1; j++) {
+      if (ngx_nonblocking(socks[j]) == -1) {
+	ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_nonblocking_n " failed on pipe socket %i while initializing nchan", j);
+	ipc_try_close_fd(&socks[0]);
+	ipc_try_close_fd(&socks[1]);
+	return NGX_ERROR;
+      }
+    }
+    //It's ALIIIIIVE! ... erm.. active...
+    proc->active = 1;
+    
+    s++; //NEXT!!
+  }
+  ipc->workers = workers;
+  
+  //ERR("ipc_alert_t size %i bytes", sizeof(ipc_alert_t));
+  
+  return NGX_OK;
+}
+
+
+
+ngx_int_t ipc_close(ipc_t *ipc, ngx_cycle_t *cycle) {
+  int i;
+  ipc_process_t            *proc;
+  ipc_writebuf_overflow_t  *of, *of_next;
+  
+  DBG("start closing");
+  
+  for (i=0; i<NGX_MAX_PROCESSES; i++) {
+    proc = &ipc->process[i];
+    if(!proc->active) continue;
+    
+    if(proc->c) {
+      ngx_close_connection(proc->c);
+      proc->c = NULL;
+    }
+    
+    for(of = proc->wbuf.overflow_first; of != NULL; of = of_next) {
+      of_next = of->next;
+      ngx_free(of);
+    }
+    
+    ipc_try_close_fd(&proc->pipe[0]);
+    ipc_try_close_fd(&proc->pipe[1]);
+    ipc->process[i].active = 0;
+  }
+  DBG("done closing");
+  return NGX_OK;
+}
+
+static ngx_uint_t delayed_sent_alerts_count;
+static ngx_uint_t delayed_sent_alerts_delay;
+
+static void send_alert_delay_log_timer_handler(ngx_event_t *ev) {
+  nchan_log_notice("Sending %ui interprocess alert%s delayed by %ui sec.", delayed_sent_alerts_count, delayed_sent_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_sent_alerts_count > 0 ? delayed_sent_alerts_delay / delayed_sent_alerts_count : 0));
+  
+  delayed_sent_alerts_count = 0;
+  delayed_sent_alerts_delay = 0;
+}
+
+static void ipc_record_alert_send_delay(ngx_uint_t delay) {
+  delayed_sent_alerts_count ++;
+  delayed_sent_alerts_delay += delay;
+  nchan_stats_global_incr(total_ipc_send_delay, delay);
+  if(!send_alert_delay_log_timer.timer_set && !ngx_exiting && !ngx_quit) {
+    ngx_add_timer(&send_alert_delay_log_timer, 1000);
+  }
+}
+
+static ngx_int_t ipc_write_alert_fd(ngx_socket_t fd, ipc_alert_t *alert) {
+  int         n;
+  ngx_int_t   err;
+  
+  n = write(fd, alert, sizeof(*alert));
+ 
+  if (n == -1) {
+    err = ngx_errno;
+    if (err == NGX_EAGAIN) {
+      return NGX_AGAIN;
+    }
+    
+    ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, "write() failed");
+    assert(0);
+    return NGX_ERROR;
+  }
+  
+  if(ngx_time() - alert->time_sent >= 2) {
+    ipc_record_alert_send_delay(ngx_time() - alert->time_sent);
+  }
+  return NGX_OK;
+}
+
+static void ipc_write_handler(ngx_event_t *ev) {
+  ngx_connection_t        *c = ev->data;
+  ngx_socket_t             fd = c->fd;
+  
+  ipc_process_t           *proc = (ipc_process_t *) c->data;
+  ipc_alert_t             *alerts = proc->wbuf.alerts;
+  
+  int                      n = proc->wbuf.n;
+  int                      i, first = proc->wbuf.first, last = first + n;
+  uint8_t                  write_aborted = 0;
+  
+  //DBG("%i alerts to write, with %i in overflow", proc->wbuf.n, proc->wbuf.overflow_n);
+  
+  if(!memstore_ready()) {
+#if nginx_version >= 1008000
+    ev->cancelable = 1;
+#endif
+    ngx_add_timer(ev, 1000);
+    return;
+  }
+#if nginx_version >= 1008000
+  else {
+    ev->cancelable = 0;
+  }
+#endif
+  
+  for(i = first; i < last; i++) {
+    //ERR("send alert at %i", i % IPC_WRITEBUF_SIZE );
+    if(ipc_write_alert_fd(fd, &alerts[i % IPC_WRITEBUF_SIZE]) != NGX_OK) {
+      write_aborted = 1;
+      //DBG("write aborted at %i iter. first: %i, n: %i", i - first, first, proc->wbuf.n);
+      break;
+    }
+    /*
+    else {
+      DBG("wrote alert at %i", i % IPC_WRITEBUF_SIZE);
+    }
+    */
+  }
+  
+  if(i==last) { //sent all outstanding alerts
+    //DBG("finished writing %i alerts.", proc->wbuf.n);
+    proc->wbuf.first = 0; // for debugging and stuff
+    proc->wbuf.n = 0;
+  }
+  else {
+    proc->wbuf.first = i;
+    proc->wbuf.n -= (i - first);
+    //DBG("first now at %i, %i alerts remain", i, proc->wbuf.n);
+  }
+  
+  nchan_stats_worker_incr(ipc_queue_size, proc->wbuf.n - n);
+  
+  if(proc->wbuf.overflow_n > 0 && i - first > 0) {
+    ipc_writebuf_overflow_t  *of;
+    first = proc->wbuf.first + proc->wbuf.n;
+    last = first + (IPC_WRITEBUF_SIZE - proc->wbuf.n);
+    //DBG("try to squeeze in overflow between %i and %i", first, last);
+    for(i = first; i < last; i++) {
+      of = proc->wbuf.overflow_first;
+      ///DBG("looking at overflow %p next %p", of, of->next);
+      alerts[i % IPC_WRITEBUF_SIZE] = of->alert;
+      proc->wbuf.overflow_n--;
+      proc->wbuf.n++;
+      assert(proc->wbuf.overflow_n >= 0);
+      
+      proc->wbuf.overflow_first = of->next;
+      
+      ngx_free(of);
+      
+      //DBG("squeezed in overflow at %i, %i overflow remaining", i, proc->wbuf.overflow_n);
+      
+      if(proc->wbuf.overflow_first == NULL) {
+        proc->wbuf.overflow_last = NULL;
+        break;
+      }
+    }
+    
+    if(!write_aborted) {
+      //retry
+      //DBG("retry write after squeezing in overflow");
+      ipc_write_handler(ev);
+      return;
+    }
+    
+  }
+  
+  if(write_aborted) {
+    //DBG("re-add event because the write failed");
+    ngx_handle_write_event(c->write, 0);
+  }
+}
+
+ngx_int_t ipc_register_worker(ipc_t *ipc, ngx_cycle_t *cycle) {
+  int                    i;    
+  ngx_connection_t      *c;
+  ipc_process_t         *proc;
+  
+  for(i=0; i< NGX_MAX_PROCESSES; i++) {
+    
+    proc = &ipc->process[i];
+    
+    if(!proc->active) continue;
+    
+    assert(proc->pipe[0] != NGX_INVALID_FILE);
+    assert(proc->pipe[1] != NGX_INVALID_FILE);
+    
+    if(i==ngx_process_slot) {
+      //set up read connection
+      c = ngx_get_connection(proc->pipe[0], cycle->log);
+      c->data = ipc;
+      
+      c->read->handler = ipc_read_handler;
+      c->read->log = cycle->log;
+      c->write->handler = NULL;
+      
+      ngx_add_event(c->read, NGX_READ_EVENT, 0);
+      proc->c=c;
+    }
+    else {
+      //set up write connection
+      c = ngx_get_connection(proc->pipe[1], cycle->log);
+      
+      c->data = proc;
+      
+      c->read->handler = NULL;
+      c->write->log = cycle->log;
+      c->write->handler = ipc_write_handler;
+      
+      proc->c=c;
+    }
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t ipc_read_socket(ngx_socket_t s, ipc_alert_t *alert, ngx_log_t *log) {
+  DBG("IPC read channel");
+  ssize_t             n;
+  ngx_err_t           err;
+  //static char         buf[sizeof(ipc_alert_t) * 2];
+  //static char        *cur;
+  
+  n = read(s, alert, sizeof(ipc_alert_t));
+ 
+  if (n == -1) {
+    err = ngx_errno;
+    if (err == NGX_EAGAIN) {
+      return NGX_AGAIN;
+    }
+    
+    ngx_log_error(NGX_LOG_ERR, log, err, "nchan IPC: read() failed");
+    return NGX_ERROR;
+  }
+ 
+  if (n == 0) {
+    ngx_log_debug0(NGX_LOG_ERR, log, 0, "nchan IPC: read() returned zero");
+    return NGX_ERROR;
+  }
+ 
+  if ((size_t) n < sizeof(*alert)) {
+    ngx_log_error(NGX_LOG_ERR, log, 0, "nchan IPC: read() returned not enough data: %z", n);
+    return NGX_ERROR;
+  }
+  
+  return n;
+}
+
+static ngx_uint_t delayed_received_alerts_count;
+static ngx_uint_t delayed_received_alerts_delay;
+
+static void receive_alert_delay_log_timer_handler(ngx_event_t *ev) {
+  nchan_log_notice("Received %ui interprocess alert%s delayed by %ui sec.", delayed_received_alerts_count, delayed_received_alerts_count == 1 ? "" : "s", (ngx_uint_t)(delayed_received_alerts_count > 0 ? delayed_received_alerts_delay / delayed_received_alerts_count : 0));
+  
+  delayed_received_alerts_count = 0;
+  delayed_received_alerts_delay = 0;
+}
+
+static void ipc_record_alert_receive_delay(ngx_uint_t delay) {
+  delayed_received_alerts_count ++;
+  delayed_received_alerts_delay += delay;
+  nchan_stats_global_incr(total_ipc_receive_delay, delay);
+  if(!receive_alert_delay_log_timer.timer_set && !ngx_exiting && !ngx_quit) {
+    ngx_add_timer(&receive_alert_delay_log_timer, 1000);
+  }
+}
+
+#if DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC
+typedef struct {
+  ngx_event_t   timer;
+  ipc_alert_t   alert;
+  ipc_t        *ipc;
+} delayed_alert_glob_t;
+static void fake_ipc_alert_delay_handler(ngx_event_t *ev) {
+  delayed_alert_glob_t *glob = (delayed_alert_glob_t *)ev->data;
+  
+  if(ngx_time() - glob->alert.time_sent >= 2) {
+    ipc_record_alert_receive_delay(ngx_time() - glob->alert.time_sent);
+  }
+  
+  glob->ipc->handler(glob->alert.src_slot, glob->alert.code, glob->alert.data);
+  ngx_free(glob);
+}
+#endif
+
+static void ipc_read_handler(ngx_event_t *ev) {
+  DBG("IPC channel handler");
+  //copypasta from os/unix/ngx_process_cycle.c (ngx_channel_handler)
+  ngx_int_t          n;
+  ipc_alert_t        alert;
+  ngx_connection_t  *c;
+  if (ev->timedout) {
+    ev->timedout = 0;
+    return;
+  }
+  c = ev->data;
+  
+  while(1) {
+    n = ipc_read_socket(c->fd, &alert, ev->log);
+    if (n == NGX_ERROR) {
+      ERR("IPC_READ_SOCKET failed: bad connection. This should never have happened, yet here we are...");
+      assert(0);
+      return;
+    }
+    if (n == NGX_AGAIN) {
+      return;
+    }
+    //ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, "nchan: channel command: %d", ch.command);
+    
+    assert(n == sizeof(alert));
+    if(alert.worker_generation < memstore_worker_generation) {
+      ERR("Got IPC alert for previous generation's worker. discarding.");
+    }
+    else {
+#if DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC
+      delayed_alert_glob_t   *glob = ngx_alloc(sizeof(*glob), ngx_cycle->log);
+      if (NULL == glob) {
+          ERR("Couldn't allocate memory for alert glob data.");
+          return;
+      }
+      ngx_memzero(&glob->timer, sizeof(glob->timer));
+      nchan_init_timer(&glob->timer, fake_ipc_alert_delay_handler, glob);
+      
+      glob->alert = alert;
+      glob->ipc = (ipc_t *)c->data;
+      ngx_add_timer(&glob->timer, DEBUG_DELAY_IPC_RECEIVE_ALERT_MSEC);
+#else
+      if(ngx_time() - alert.time_sent >= 2) {
+        ipc_record_alert_receive_delay(ngx_time() - alert.time_sent);
+      }
+      nchan_stats_global_incr(total_ipc_alerts_received, 1);
+      ((ipc_t *)c->data)->handler(alert.src_slot, alert.code, alert.data);
+#endif
+    }
+  }
+}
+
+
+ngx_int_t ipc_broadcast_alert(ipc_t *ipc, ngx_uint_t code, void *data, size_t data_size) {
+  ngx_int_t   i, slot, ret = NGX_OK;
+  ngx_int_t   my_slot = memstore_slot();
+  DBG("broadcast alert");
+  for(i=0; i < ipc->workers; i++) {
+    slot = ipc->worker_slots[i];
+    if(my_slot != slot) {
+      if(ipc_alert(ipc, slot, code, data, data_size) != NGX_OK)  {
+        ERR("Error sending alert to slot %i", slot);
+        ret = NGX_ERROR;
+      }
+    }
+  }
+  return ret;
+}
+
+ngx_int_t ipc_alert(ipc_t *ipc, ngx_int_t slot, ngx_uint_t code, void *data, size_t data_size) {
+  DBG("IPC send alert code %i to slot %i", code, slot);
+  
+  if(data_size > IPC_DATA_SIZE) {
+    ERR("IPC_DATA_SIZE too small. wanted %i, have %i", data_size, IPC_DATA_SIZE);
+    assert(0);
+  }
+  nchan_stats_global_incr(total_ipc_alerts_sent, 1);
+#if (FAKESHARD)
+  
+  ipc_alert_t         alert = {0};
+  
+  alert.src_slot = memstore_slot();
+  alert.time_sent = ngx_time();
+  alert.worker_generation = memstore_worker_generation;
+  alert.code = code;
+  ngx_memcpy(alert.data, data, data_size);
+  
+  //switch to destination
+  memstore_fakeprocess_push(slot);
+  ipc->handler(alert.src_slot, alert.code, alert.data);
+  memstore_fakeprocess_pop();
+  //switch back  
+  
+#else
+  
+  ipc_process_t      *proc = &ipc->process[slot];
+  ipc_writebuf_t     *wb = &proc->wbuf;
+  ipc_alert_t        *alert;
+  
+  assert(proc->active);
+  
+  nchan_stats_worker_incr(ipc_queue_size, 1);
+  
+  if(wb->n < IPC_WRITEBUF_SIZE) {
+    alert = &wb->alerts[(wb->first + wb->n++) % IPC_WRITEBUF_SIZE];
+  }
+  else { //overflow
+    ipc_writebuf_overflow_t  *overflow;
+    DBG("writebuf overflow, allocating memory");
+    if((overflow = ngx_alloc(sizeof(*overflow), ngx_cycle->log)) == NULL) {
+      ERR("can't allocate memory for IPC write buffer overflow");
+      return NGX_ERROR;
+    }
+    overflow->next = NULL;
+    alert= &overflow->alert;
+    
+    if(wb->overflow_first == NULL) {
+      wb->overflow_first = overflow;
+    }
+    if(wb->overflow_last) {
+      wb->overflow_last->next = overflow;
+    }
+    wb->overflow_last = overflow;
+  
+    wb->overflow_n++;
+  }
+  
+  alert->src_slot = ngx_process_slot;
+  alert->time_sent = ngx_time();
+  alert->code = code;
+  alert->worker_generation = memstore_worker_generation;
+  ngx_memcpy(&alert->data, data, data_size);
+  
+  ipc_write_handler(proc->c->write);
+  
+  //ngx_handle_write_event(ipc->c[slot]->write, 0);
+  //ngx_add_event(ipc->c[slot]->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT);
+  
+#endif
+
+  return NGX_OK;
+}
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.h
new file mode 100755
index 0000000..f0dae15
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/ipc.h
@@ -0,0 +1,66 @@
+#ifndef NCHAN_IPC_H
+#define NCHAN_IPC_H
+
+#define IPC_DATA_SIZE 64
+//#define IPC_DATA_SIZE 80
+
+typedef struct {
+  char            data[IPC_DATA_SIZE];
+  time_t          time_sent;
+  int16_t         src_slot;
+  uint16_t        worker_generation;
+  uint8_t         code;
+} ipc_alert_t;
+
+#define IPC_WRITEBUF_SIZE 32
+
+typedef struct ipc_writebuf_overflow_s ipc_writebuf_overflow_t;
+struct ipc_writebuf_overflow_s {
+  ipc_alert_t               alert;
+  ipc_writebuf_overflow_t  *next;
+};
+
+typedef struct ipc_writebuf_s ipc_writebuf_t;
+struct ipc_writebuf_s {
+  //a ring buffer with a linked-list overflow for writing alerts, 
+  uint16_t                  n;
+  uint16_t                  first;
+  int32_t                   overflow_n;
+  ipc_writebuf_overflow_t  *overflow_first;
+  ipc_writebuf_overflow_t  *overflow_last;
+  ipc_alert_t               alerts[IPC_WRITEBUF_SIZE];
+}; //ipc_writebuf_t
+
+typedef struct ipc_s ipc_t;
+
+typedef struct {
+  ipc_t                 *ipc; //useful for write events
+  ngx_socket_t           pipe[2];
+  ngx_connection_t      *c;
+  ipc_writebuf_t         wbuf;
+  unsigned               active:1;
+} ipc_process_t;
+
+struct ipc_s {
+  const char            *name;
+  
+  ipc_process_t         process[NGX_MAX_PROCESSES];
+  
+  void                  (*handler)(ngx_int_t, ngx_uint_t, void*);
+  
+  ngx_int_t             workers;
+  ngx_int_t             worker_slots[NGX_MAX_PROCESSES];
+}; //ipc_t
+
+ngx_int_t ipc_init(ipc_t *ipc);
+ngx_int_t ipc_open(ipc_t *ipc, ngx_cycle_t *cycle, ngx_int_t workers, void (*slot_callback)(int slot, int worker));
+ngx_int_t ipc_set_handler(ipc_t *ipc, void (*alert_handler)(ngx_int_t, ngx_uint_t , void *data));
+ngx_int_t ipc_register_worker(ipc_t *ipc, ngx_cycle_t *cycle);
+ngx_int_t ipc_close(ipc_t *ipc, ngx_cycle_t *cycle);
+
+ngx_int_t ipc_broadcast_alert(ipc_t *ipc, ngx_uint_t code, void *data, size_t data_size);
+ngx_int_t ipc_alert(ipc_t *ipc, ngx_int_t slot, ngx_uint_t code,  void *data, size_t data_size);
+
+size_t ipc_worker_slots(const ipc_t *ipc, const ngx_int_t **workerslots_array);
+
+#endif //NCHAN_IPC_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/memstore.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/memstore.c
new file mode 100755
index 0000000..4243ad6
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/memstore.c
@@ -0,0 +1,3498 @@
+#include <nchan_module.h>
+
+#include <signal.h> 
+#include <assert.h>
+#include "uthash.h"
+#include "store.h"
+#include <util/shmem.h>
+#include "ipc.h"
+#include "ipc-handlers.h"
+#include "store-private.h"
+#include "groups.h"
+#include <store/spool.h>
+
+#include <util/nchan_reaper.h>
+#include <util/nchan_debug.h>
+
+#include <store/redis/store.h>
+#include <store/store_common.h>
+#include <subscribers/memstore_redis.h>
+#include <subscribers/getmsg_proxy.h>
+#include <subscribers/memstore_multi.h>
+
+#define NCHAN_CHANHEAD_EXPIRE_SEC 5
+
+static ngx_int_t redis_fakesub_timer_interval;
+#define REDIS_DEFAULT_FAKESUB_TIMER_INTERVAL 100;
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#if FAKESHARD
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
+#define WARN(fmt, args...) ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "MEMSTORE:(fake)%02i: " fmt, memstore_slot(), ##args)
+
+#else
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
+#define WARN(fmt, args...) ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "MEMSTORE:%02i: " fmt, memstore_slot(), ##args)
+
+#endif
+
+uint16_t  memstore_worker_generation;
+
+
+typedef struct {
+  //memstore_channel_head_t       unbuffered_dummy_chanhead;
+  store_channel_head_shm_t        dummy_shared_chaninfo;
+  memstore_channel_head_t        *hash;
+  nchan_reaper_t                  msg_reaper;
+  nchan_reaper_t                  nobuffer_msg_reaper;
+  nchan_reaper_t                  chanhead_reaper;
+  
+  nchan_reaper_t                  chanhead_churner;
+  
+  ngx_int_t                       workers;
+  
+#if FAKESHARD
+  ngx_int_t                       fake_slot;
+#endif
+} memstore_data_t;
+
+
+ngx_int_t                         memstore_procslot_offset = 0;
+static nchan_loc_conf_t           default_multiconf;
+
+static ngx_int_t nchan_memstore_store_msg_ready_to_reap_generic(store_message_t *smsg, uint8_t respect_expire, uint8_t force) {
+  if(!force) {
+    if(respect_expire && smsg->msg->expires > ngx_time()) {
+      //not time yet
+      return NGX_DECLINED;
+    }
+    
+    if(msg_refcount_invalidate_if_zero(smsg->msg)) {
+      return NGX_OK;
+    }
+    return NGX_DECLINED;
+  }
+  else {
+    if(!msg_refcount_invalidate_if_zero(smsg->msg)) {
+      if(smsg->msg->refcount > 0) {
+        ERR("force-reaping msg with refcount %d", smsg->msg->refcount);
+      }
+      msg_refcount_invalidate(smsg->msg);
+    }
+    return NGX_OK;
+  }
+}
+
+static ngx_int_t nchan_memstore_store_msg_ready_to_reap(store_message_t *smsg, uint8_t force) {
+  return nchan_memstore_store_msg_ready_to_reap_generic(smsg, 0, force);
+}
+
+static ngx_int_t nchan_memstore_store_msg_ready_to_reap_wait_util_expired(store_message_t *smsg, uint8_t force) {
+  return nchan_memstore_store_msg_ready_to_reap_generic(smsg, 1, force);
+}
+
+static void memstore_reap_message( nchan_msg_t *msg );
+static void memstore_reap_store_message( store_message_t *smsg );
+
+static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch);
+
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+static void log_memstore_chanhead_reservations(memstore_channel_head_t *ch) {
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+  nchan_list_el_t  *cur;
+  char            **lbl;
+  DBG("%p %V reservations: %i", ch, &ch->id, ch->reserved.n);
+  for(cur = ch->reserved.head; cur != NULL; cur = cur->next) {
+    lbl = nchan_list_data_from_el(cur);
+    DBG("   %s", *lbl);
+  }
+#else
+  DBG("%p %V reservations: %i", ch, &ch->id, ch->reserved);
+#endif
+}
+#endif
+
+static int memstore_chanhead_reservations(memstore_channel_head_t *ch) {
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+  return ch->reserved.n;
+#else
+  return ch->reserved;
+#endif
+}
+
+void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *lbl) {
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+  char   **label = nchan_list_append(&ch->reserved);
+  *label = (char *)lbl;
+#else
+  ch->reserved++;
+#endif
+}
+
+void memstore_chanhead_release(memstore_channel_head_t *ch, char *label) {
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+  nchan_list_el_t  *cur;
+  char            **lbl;
+  for(cur = ch->reserved.head; cur != NULL; cur = cur->next) {
+    lbl = nchan_list_data_from_el(cur);
+    if(strcmp(label, *lbl) == 0) {
+      nchan_list_remove(&ch->reserved, lbl);
+      return;
+    }
+  }
+  ERR("can't release for channel %p %V reservation %s (total reservations: %i)", ch, &ch->id, label, ch->reserved.n);
+  assert(0);
+#else
+  ch->reserved--;
+#endif
+}
+
+static ngx_int_t memstore_chanhead_reserved_or_in_use(memstore_channel_head_t *ch) {
+  if (ch->sub_count > 0) { //there are subscribers
+    DBG("not ready to reap %V, %i subs left", &ch->id, ch->sub_count);
+    return 1;
+  }
+  
+  if(memstore_chanhead_reservations(ch) > 0) {
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+    DBG("not ready to reap %V, still reserved:", &ch->id);
+    log_memstore_chanhead_reservations(ch);
+#endif
+    return 1;
+  }
+  
+  if(ch->cf && ch->cf->redis.enabled && ch->churn_start_time + ch->redis_idle_cache_ttl < ngx_time()) {
+    // any stored messages are unimportant, they're backed up in redis
+  }
+  else if(ch->shared && ch->shared->stored_message_count > 0) {
+    assert(ch->msg_first != NULL);
+    DBG("not ready to reap %V, %i messages left", &ch->id, ch->shared->stored_message_count);
+    return 1;
+  }
+  
+  if(ch->owner == ch->slot && ch->shared && ch->shared->gc.outside_refcount > 0) {
+    DBG("channel %p %V shared data still used by %i workers.", ch, &ch->id, ch->shared->gc.outside_refcount);
+    return 1;
+  }
+  
+  return 0;
+}
+
+static ngx_int_t nchan_memstore_chanhead_ready_to_reap(memstore_channel_head_t *ch, uint8_t force) {
+  
+  memstore_chanhead_messages_gc(ch);
+  
+  if(force) {
+    //force delete is always ok
+    return NGX_OK;
+  }
+  
+  if(ch->status != INACTIVE) {
+    DBG("not ready to reap %V : status %i", &ch->id, ch->status);
+    return NGX_DECLINED;
+  }
+  
+  if(ch->gc_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
+    DBG("not ready to reap %V, %i sec left", &ch->id, ch->gc_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
+    return NGX_DECLINED;
+  }
+    
+  if(memstore_chanhead_reserved_or_in_use(ch)) {
+    return NGX_DECLINED;
+  }
+    
+  DBG("ok to delete channel %V", &ch->id);
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_memstore_chanhead_ready_to_reap_slowly(memstore_channel_head_t *ch, uint8_t force) {
+  
+  memstore_chanhead_messages_gc(ch);
+  if(force) {
+    return NGX_OK;
+  }
+  
+  if(ch->churn_start_time + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time() > 0) {
+    DBG("not ready to reap %p %V, %i sec left", ch, &ch->id, ch->churn_start_time  + NCHAN_CHANHEAD_EXPIRE_SEC - ngx_time());
+    return NGX_DECLINED;
+  }
+    
+  if(memstore_chanhead_reserved_or_in_use(ch)) {
+    return NGX_DECLINED;
+  }
+  
+  DBG("ok to slow-delete channel %V", &ch->id);
+  return NGX_OK;
+}
+
+static void memstore_reap_chanhead(memstore_channel_head_t *ch);
+static void memstore_reap_churned_chanhead(memstore_channel_head_t *ch) { //different method for some debug tracing
+  memstore_reap_chanhead(ch);
+}
+
+static void init_mpt(memstore_data_t *m) {
+  
+  nchan_reaper_start(&m->msg_reaper, 
+                     "memstore message", 
+                     offsetof(store_message_t, prev), 
+                     offsetof(store_message_t, next), 
+    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_store_msg_ready_to_reap,
+         (void (*)(void *)) memstore_reap_store_message,
+                     5
+  );
+  
+  nchan_reaper_start(&m->nobuffer_msg_reaper, 
+                     "memstore nobuffer message", 
+                     offsetof(store_message_t, prev), 
+                     offsetof(store_message_t, next), 
+    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_store_msg_ready_to_reap_wait_util_expired,
+         (void (*)(void *)) memstore_reap_store_message,
+                     2
+  );
+  m->nobuffer_msg_reaper.strategy = ROTATE;
+  m->nobuffer_msg_reaper.max_notready_ratio = 0.20;
+  
+  nchan_reaper_start(&m->chanhead_reaper, 
+                     "chanhead", 
+                     offsetof(memstore_channel_head_t, gc_prev), 
+                     offsetof(memstore_channel_head_t, gc_next), 
+    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_chanhead_ready_to_reap,
+         (void (*)(void *)) memstore_reap_chanhead,
+                     4
+  );
+  
+  nchan_reaper_start(&m->chanhead_churner, 
+                     "chanhead churner", 
+                     offsetof(memstore_channel_head_t, churn_prev), 
+                     offsetof(memstore_channel_head_t, churn_next), 
+    (ngx_int_t (*)(void *, uint8_t)) nchan_memstore_chanhead_ready_to_reap_slowly,
+         (void (*)(void *)) memstore_reap_churned_chanhead,
+                     10
+  );
+  m->chanhead_churner.strategy = KEEP_PLACE;
+  m->chanhead_churner.max_notready_ratio = 0.10;
+  
+}
+
+static shmem_t         *shm = NULL;
+void                   *nchan_store_memory_shmem = NULL;
+static shm_data_t      *shdata = NULL;
+static ipc_t            ipc_data;
+static ipc_t           *ipc = NULL;
+
+static memstore_groups_t groups_data;
+static memstore_groups_t *groups = NULL;
+
+#if FAKESHARD
+
+static memstore_data_t  mdata[MAX_FAKE_WORKERS];
+static memstore_data_t fake_default_mdata;
+memstore_data_t *mpt = &fake_default_mdata;
+
+ngx_int_t memstore_slot(void) {
+  return mpt->fake_slot;
+}
+
+int memstore_ready(void) {
+  return 1;
+}
+#else
+
+static memstore_data_t  mdata;
+memstore_data_t *mpt = &mdata;
+
+
+ngx_int_t memstore_slot(void) {
+  return ngx_process_slot;
+}
+
+int memstore_ready(void) {
+  if(memstore_worker_generation == shdata->generation && shdata->max_workers <= shdata->current_active_workers) {
+    return 1;
+  }
+  else if(memstore_worker_generation < shdata->generation) {
+    return 1;
+  }
+  return 0;
+}
+#endif
+
+ipc_t *nchan_memstore_get_ipc(void){
+  return ipc;
+}
+
+memstore_groups_t *nchan_memstore_get_groups(void) {
+  return groups;
+}
+
+static ngx_int_t                  shared_loc_conf_count = 0;
+ngx_int_t memstore_reserve_conf_shared_data(nchan_loc_conf_t *cf) {
+  if(cf->shared_data_index == NGX_CONF_UNSET) {
+    cf->shared_data_index = shared_loc_conf_count++;
+  }
+  //DBG("shared_loc_conf_count is %i", shared_loc_conf_count);
+  return NGX_OK;
+}
+
+nchan_loc_conf_shared_data_t *memstore_get_conf_shared_data(nchan_loc_conf_t *cf) {
+  assert(cf->shared_data_index != NGX_CONF_UNSET);
+  return &shdata->conf_data[cf->shared_data_index];
+}
+
+
+#define CHANNEL_HASH_FIND(id_buf, p)    HASH_FIND( hh, mpt->hash, (id_buf)->data, (id_buf)->len, p)
+#define CHANNEL_HASH_ADD(chanhead)      HASH_ADD_KEYPTR( hh, mpt->hash, (chanhead->id).data, (chanhead->id).len, chanhead)
+#define CHANNEL_HASH_DEL(chanhead)      HASH_DEL( mpt->hash, chanhead)
+
+#define NCHAN_NOBUFFER_MSG_EXPIRE_SEC 10
+
+
+#if FAKESHARD
+
+static nchan_llist_timed_t *fakeprocess_top = NULL;
+void memstore_fakeprocess_push(ngx_int_t slot) {
+  assert(slot < MAX_FAKE_WORKERS);
+  nchan_llist_timed_t *link = ngx_calloc(sizeof(*fakeprocess_top), ngx_cycle->log);
+  link->data = (void *)slot;
+  link->time = ngx_time();
+  link->next = fakeprocess_top;
+  if(fakeprocess_top != NULL) {
+    fakeprocess_top->prev = link;
+  }
+  fakeprocess_top = link;
+  //DBG("push fakeprocess %i onto stack", slot);
+  mpt = &mdata[slot];
+}
+
+ngx_int_t memstore_fakeprocess_pop(void) {
+  nchan_llist_timed_t   *next;
+  if(fakeprocess_top == NULL) {
+    DBG("can't pop empty fakeprocess stack");
+    return 0;
+  }
+  next = fakeprocess_top->next;
+  ngx_free(fakeprocess_top);
+  if(next == NULL) {
+    DBG("can't pop last item off of fakeprocess stack");
+    return 0;
+  }
+  //DBG("pop fakeprocess to return to %i", (ngx_int_t)next->data);
+  next->prev = NULL;
+  fakeprocess_top = next;
+  mpt = &mdata[(ngx_int_t )fakeprocess_top->data];
+  return 1;
+}
+
+void memstore_fakeprocess_push_random(void) {
+  return memstore_fakeprocess_push(rand() % MAX_FAKE_WORKERS);
+}
+
+#endif
+
+ngx_int_t memstore_str_owner(ngx_str_t *str) {
+  uint32_t        h;
+  ngx_int_t       workers;
+  
+  workers = shdata->max_workers;
+  h = ngx_crc32_short(str->data, str->len);
+#if FAKESHARD
+  #ifdef ONE_FAKE_CHANNEL_OWNER
+  h++; //just to avoid the unused variable warning
+  return ONE_FAKE_CHANNEL_OWNER;
+  #else
+  return h % MAX_FAKE_WORKERS;
+  #endif
+#else
+  ngx_int_t       i, slot;
+  i = h % workers;
+  assert(i >= 0);
+  slot = shdata->procslot[i + memstore_procslot_offset];
+  //DBG("owner for %V workers=%i (max=%i active=%i) h=%ui m_p_off=%i i=%i slot=%i", str, workers, shdata->max_workers, shdata->total_active_workers, h, memstore_procslot_offset, i, slot);
+  if(slot == NCHAN_INVALID_SLOT) {
+    ERR("something went wrong, the channel owner is invalid. i: %i h: %ui, workers: %i", i, h, workers);
+    assert(0);
+    return NCHAN_INVALID_SLOT;
+  }
+  return slot;
+#endif
+}
+
+ngx_int_t nchan_nginx_worker_procslot(ngx_int_t worker_number) {
+  if( worker_number < 0 || worker_number > shdata->max_workers) {
+    return NGX_ERROR;
+  }
+  return shdata->procslot[worker_number + memstore_procslot_offset];
+}
+
+ngx_int_t memstore_channel_owner(ngx_str_t *id) {
+  return nchan_channel_id_is_multi(id) ? memstore_slot() : memstore_str_owner(id);
+}
+
+#if NCHAN_MSG_LEAK_DEBUG
+
+void msg_debug_add(nchan_msg_t *msg) {
+  //ensure this message is present only once
+  nchan_msg_t      *cur;
+  shmtx_lock(shm);
+  for(cur = shdata->msgdebug_head; cur != NULL; cur = cur->dbg_next) {
+    assert(cur != msg);
+  }
+  
+  if(shdata->msgdebug_head == NULL) {
+    msg->dbg_next = NULL;
+    msg->dbg_prev = NULL;
+  }
+  else {
+    msg->dbg_next = shdata->msgdebug_head;
+    msg->dbg_prev = NULL;
+    assert(shdata->msgdebug_head->dbg_prev == NULL);
+    shdata->msgdebug_head->dbg_prev = msg;
+  }
+  shdata->msgdebug_head = msg;
+  shmtx_unlock(shm);
+}
+void msg_debug_remove(nchan_msg_t *msg) {
+  nchan_msg_t *prev, *next;
+  shmtx_lock(shm);
+  prev = msg->dbg_prev;
+  next = msg->dbg_next;
+  if(shdata->msgdebug_head == msg) {
+    assert(msg->dbg_prev == NULL);
+    if(next) {
+      next->dbg_prev = NULL;
+    }
+    shdata->msgdebug_head = next;
+  }
+  else {
+    if(prev) {
+      prev->dbg_next = next;
+    }
+    if(next) {
+      next->dbg_prev = prev;
+    }
+  }
+  
+  msg->dbg_next = NULL;
+  msg->dbg_prev = NULL;
+  shmtx_unlock(shm);
+}
+void msg_debug_assert_isempty(void) {
+  assert(shdata->msgdebug_head == NULL);
+}
+#endif
+
+
+
+static ngx_int_t chanhead_churner_add(memstore_channel_head_t *ch) {
+  DBG("Chanhead churn add %p %V", ch, &ch->id);
+  
+  //the churner is only allowed to churn self-owned channels
+  assert(ch->owner == ch->slot);
+  
+  if(!ch->shutting_down) {
+    assert(ch->foreign_owner_ipc_sub == NULL); //we don't accept still-subscribed chanheads
+  }
+
+  assert(!ch->in_gc_queue);
+  
+  if(!ch->in_churn_queue) {
+    ch->in_churn_queue = 1;
+    ch->churn_start_time = ngx_time();
+    nchan_reaper_add(&mpt->chanhead_churner, ch);
+  }
+
+  return NGX_OK;
+}
+
+static ngx_int_t chanhead_churner_withdraw(memstore_channel_head_t *ch) {
+  //remove from gc list if we're there
+  DBG("Chanhead churn withdraw %p %V", ch, &ch->id);
+  
+  if(ch->in_churn_queue) {
+    ch->in_churn_queue = 0;
+    nchan_reaper_withdraw(&mpt->chanhead_churner, ch);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
+  shm_data_t         *d;
+  ngx_int_t           i;
+  if(data) { //zone being passed after restart
+    zone->data = data;
+    d = zone->data;
+    DBG("reattached shm data at %p", data);
+    shmtx_lock(shm);
+    d->generation ++;
+    d->current_active_workers = 0;
+    
+    if(d->conf_data) {
+      shm_locked_free(shm, d->conf_data);
+      d->conf_data = NULL;
+    }
+    
+#if nginx_version <= 1011006
+  shm_set_allocd_pages_tracker(shm, &d->shmem_pages_used);
+#endif
+    shmtx_unlock(shm);
+  }
+  else {
+    shm_init(shm);
+    
+    if((d = shm_calloc(shm, sizeof(*d), "root shared data")) == NULL) {
+      return NGX_ERROR;
+    }
+    
+    zone->data = d;
+    shdata = d;
+    shdata->rlch = NULL;
+    shdata->max_workers = NGX_CONF_UNSET;
+    shdata->old_max_workers = NGX_CONF_UNSET;
+    shdata->generation = 0;
+    shdata->subscriber_info_response_id = 1;
+    shdata->total_active_workers = 0;
+    shdata->current_active_workers = 0;
+    shdata->reloading = 0;
+    
+    
+    for(i=0; i< NGX_MAX_PROCESSES; i++) {
+      shdata->procslot[i]=NCHAN_INVALID_SLOT;
+    }
+    
+#if nginx_version <= 1011006
+    shdata->shmem_pages_used=0;
+    shm_set_allocd_pages_tracker(shm, &d->shmem_pages_used);
+#endif
+    DBG("Shm created with data at %p", d);
+#if NCHAN_MSG_LEAK_DEBUG
+    shdata->msgdebug_head = NULL;
+#endif
+  }
+  
+  if(shared_loc_conf_count > 0) {
+    d->conf_data = shm_calloc(shm, sizeof(nchan_loc_conf_shared_data_t) * shared_loc_conf_count, "shared config data");
+    if(d->conf_data == NULL) {
+      return NGX_ERROR;
+    }
+  }
+  return NGX_OK;
+}
+
+size_t nchan_get_used_shmem(void) {
+#if nginx_version <= 1011006
+  return shdata->shmem_pages_used * ngx_pagesize;
+#else
+  return shm_used_pages(shm) * ngx_pagesize;
+#endif
+}
+
+static int send_redis_fakesub_delta(memstore_channel_head_t *head) {
+  if(head->delta_fakesubs != 0) {
+    nchan_store_redis_fakesub_add(&head->id, head->cf, head->delta_fakesubs, head->shutting_down);
+    head->delta_fakesubs = 0;
+    return 1;
+  }
+  return 0;
+}
+
+static void memstore_reap_chanhead(memstore_channel_head_t *ch) {
+  int       i;
+  
+  chanhead_messages_delete(ch);
+  
+  if(ch->sub_count > 0) {
+    ch->spooler.fn->broadcast_status(&ch->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+  }
+  stop_spooler(&ch->spooler, 0);
+  if(ch->cf && ch->cf->redis.enabled && ch->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED && !ch->multi) {
+    send_redis_fakesub_delta(ch);
+    if(ch->delta_fakesubs_timer_ev.timer_set) {
+      ngx_del_timer(&ch->delta_fakesubs_timer_ev);
+    }
+  }
+  if(ch->owner == memstore_slot()) {
+    nchan_stats_worker_incr(channels, -1);
+    if(ch->shared)
+      shm_free(shm, ch->shared);
+  }
+  
+  DBG("chanhead %p (%V) is empty and expired. DELETE.", ch, &ch->id);
+  CHANNEL_HASH_DEL(ch);
+  if(ch->redis_sub) {
+    if(ch->redis_sub->enqueued) {
+      ch->redis_sub->fn->dequeue(ch->redis_sub);
+    }
+    memstore_redis_subscriber_destroy(ch->redis_sub);
+  }
+  
+  if(ch->groupnode) {
+    if(ch->owner == memstore_slot()) {
+      memstore_group_dissociate_own_channel(ch);
+    }
+    memstore_group_remove_channel(ch);
+  }
+  assert(ch->groupnode_prev == NULL);
+  assert(ch->groupnode_next == NULL);
+  
+  
+  if(ch->multi) {
+    for(i=0; i < ch->multi_count; i++) {
+      if(ch->multi[i].sub) {
+        ch->multi[i].sub->fn->dequeue(ch->multi[i].sub);
+      }
+    }
+    ngx_free(ch->multi);
+    nchan_free_msg_id(&ch->latest_msgid);
+    nchan_free_msg_id(&ch->oldest_msgid);
+  }
+  
+  ch->status = DELETED;
+  
+  ngx_free(ch);
+}
+
+static store_message_t *create_shared_message(nchan_msg_t *m, ngx_int_t msg_already_in_shm);
+static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_message_t *msg);
+
+static ngx_int_t nchan_store_init_worker(ngx_cycle_t *cycle) {
+  ngx_core_conf_t    *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  ngx_int_t           workers = ccf->worker_processes;
+  ngx_int_t           i, procslot_found = 0;
+  
+#if FAKESHARD
+  for(i = 0; i < MAX_FAKE_WORKERS; i++) {
+  memstore_fakeprocess_push(i);
+#endif
+  init_mpt(mpt);
+
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+  }
+#endif
+
+  ipc_register_worker(ipc, cycle);
+  
+  DBG("init memstore worker pid:%i slot:%i max workers :%i or %i", ngx_pid, memstore_slot(), shdata->max_workers, workers);
+
+  shmtx_lock(shm);
+  
+  if(shdata->max_workers != workers) {
+    DBG("update number of workers from %i to %i", shdata->max_workers, workers);
+    if(shdata->old_max_workers != shdata->max_workers) {
+      shdata->old_max_workers = shdata->max_workers;
+    }
+    shdata->max_workers = workers;
+  }
+  
+  shdata->total_active_workers++;
+  shdata->current_active_workers++;
+  
+  for(i = memstore_procslot_offset; i < NGX_MAX_PROCESSES - memstore_procslot_offset; i++) {
+    if(shdata->procslot[i] == ngx_process_slot) {
+      DBG("found my procslot (ngx_process_slot %i, procslot %i)", ngx_process_slot, i);
+      procslot_found = 1;
+      break;
+    }
+  }
+  assert(procslot_found == 1);
+  
+  mpt->workers = workers;
+  
+  if(i >= workers) {
+    //we're probably reloading or something
+    DBG("that was a reload just now");
+  }
+  
+  //reload_msgs();
+  
+  DBG("shm: %p, shdata: %p", shm, shdata);
+  shmtx_unlock(shm);
+  
+  return NGX_OK;
+}
+
+#define CHANHEAD_SHARED_OKAY(head) head->status == READY || head->status == STUBBED || (!head->stub && head->cf->redis.enabled == 1 && head->status == WAITING && head->owner == head->slot)
+
+void memstore_fakesub_add(memstore_channel_head_t *head, ngx_int_t n) {
+  assert(head->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED);
+  if(redis_fakesub_timer_interval == 0) {
+    nchan_store_redis_fakesub_add(&head->id, head->cf, n, head->shutting_down);
+  }
+  else {
+    head->delta_fakesubs += n;
+    if(!head->delta_fakesubs_timer_ev.timer_set && !head->shutting_down && !ngx_exiting && !ngx_quit) {
+      //ERR("%V start fakesub timer", &head->id);
+      ngx_add_timer(&head->delta_fakesubs_timer_ev, redis_fakesub_timer_interval);
+    }
+  }
+}
+
+static void memstore_spooler_use_handler(channel_spooler_t *spl, void *d) {
+  memstore_channel_head_t  *head = d;
+  time_t t = ngx_time();
+  //ugh, this is so redundant. TODO: clean this shit up
+  head->last_subscribed_local = t;
+  if(head->shared) {
+    head->shared->last_seen = t;
+  }
+}
+
+static void memstore_spooler_add_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
+  memstore_channel_head_t   *head = (memstore_channel_head_t *)privdata;
+  head->sub_count++;
+  if(sub->type == INTERNAL) {
+    head->internal_sub_count++;
+    if(head->shared) {
+      assert(CHANHEAD_SHARED_OKAY(head));
+      ngx_atomic_fetch_add(&head->shared->internal_sub_count, 1);
+    }
+  }
+  else {
+    if(head->shared) {
+      assert(CHANHEAD_SHARED_OKAY(head));
+      ngx_atomic_fetch_add(&head->shared->sub_count, 1);
+    }
+    if(head->cf && head->cf->redis.enabled && head->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED && !head->multi) {
+      memstore_fakesub_add(head, 1);
+    }
+    nchan_stats_worker_incr(subscribers, 1);
+    if(head->groupnode) {
+      memstore_group_add_subscribers(head->groupnode, 1);
+    }
+    if(head->multi) {
+      ngx_int_t      i, max = head->multi_count;
+      subscriber_t  *msub;
+      for(i = 0; i < max; i++) {
+        msub = head->multi[i].sub;
+        if(msub) {
+          msub->fn->notify(msub, NCHAN_SUB_MULTI_NOTIFY_ADDSUB, (void *)1);
+        }
+      }
+    }
+  }
+  assert(head->sub_count >= head->internal_sub_count);
+}
+
+static void memstore_spooler_bulk_dequeue_handler(channel_spooler_t *spl, subscriber_type_t type, ngx_int_t count, void *privdata) {
+  memstore_channel_head_t   *head = (memstore_channel_head_t *)privdata;
+  if (type == INTERNAL) {
+    //internal subscribers are *special* and don't really count
+    head->internal_sub_count -= count;
+    if(head->shared) {
+      ngx_atomic_fetch_add(&head->shared->internal_sub_count, -count);
+    }
+  }
+  else {
+    if(head->shared){
+      ngx_atomic_fetch_add(&head->shared->sub_count, -count);
+    }
+    if(head->cf && head->cf->redis.enabled && head->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED && !head->multi) {
+      memstore_fakesub_add(head, -count);
+    }
+    
+    nchan_stats_worker_incr(subscribers, -count);
+    
+    if(head->multi) {
+      ngx_int_t     i, max = head->multi_count;
+      subscriber_t *sub;
+      for(i = 0; i < max; i++) {
+        sub = head->multi[i].sub;
+        if(sub) {
+          sub->fn->notify(sub, NCHAN_SUB_MULTI_NOTIFY_ADDSUB, (void *)-count);
+        }
+      }
+    }
+    if(head->groupnode) {
+      memstore_group_add_subscribers(head->groupnode, -(count));
+    }
+  }
+  head->sub_count -= count;
+  assert(head->sub_count >= 0);
+  assert(head->internal_sub_count >= 0);
+  assert(head->sub_count >= head->internal_sub_count);
+  if(head->sub_count == 0 && head->foreign_owner_ipc_sub == NULL) {
+    chanhead_gc_add(head, "sub count == 0 after spooler dequeue");
+  }
+}
+
+
+
+static ngx_int_t start_chanhead_spooler(memstore_channel_head_t *head) {
+  static channel_spooler_handlers_t handlers = {
+    memstore_spooler_add_handler,
+    NULL,
+    memstore_spooler_bulk_dequeue_handler,
+    memstore_spooler_use_handler,
+    NULL,
+    NULL
+  };
+  
+  start_spooler(&head->spooler, &head->id, &head->status, &head->msg_buffer_complete, &nchan_store_memory, head->cf, NCHAN_SPOOL_FETCH, &handlers, head);
+  if(head->meta) {
+    head->spooler.publish_events = 0;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_ready_chanhead_unless_stub(memstore_channel_head_t *head) {
+  if(head->stub) {
+    head->status = STUBBED;
+  }
+  else {
+    head->status = READY;
+    head->spooler.fn->handle_channel_status_change(&head->spooler);
+    if(head->status == INACTIVE) {
+      chanhead_gc_withdraw(head, "rare weird condition after handle_channel_status_change");
+      head->status = READY;
+    }
+  }
+  return NGX_OK;
+}
+
+ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8_t ipc_subscribe_if_needed) {
+  ngx_int_t                      owner;
+  ngx_int_t                      i;
+  if(head == NULL) {
+    return NGX_OK;
+  }
+  assert(!head->stub && head->cf);
+  owner = head->owner;
+  DBG("ensure chanhead ready: chanhead %p, status %i, foreign_ipc_sub:%p", head, (ngx_int_t )head->status, head->foreign_owner_ipc_sub);
+  if(head->in_gc_queue) {//recycled chanhead
+    chanhead_gc_withdraw(head, "readying INACTIVE");
+  }
+  if(head->owner == head->slot && !head->in_churn_queue) {
+    chanhead_churner_add(head);
+  }
+  
+  if(!head->spooler.running) {
+    DBG("ensure chanhead ready: Spooler for channel %p %V wasn't running. start it.", head, &head->id);
+    start_chanhead_spooler(head);
+  }
+  
+  for(i=0; i< head->multi_count; i++) {
+    if(head->multi[i].sub == NULL) {
+      if(memstore_multi_subscriber_create(head, i) == NULL) { //stores and enqueues automatically
+        ERR("can't create multi subscriber for channel");
+        return NGX_ERROR;
+      }
+    }
+  }
+  
+  if(owner != memstore_slot()) {
+    if(head->foreign_owner_ipc_sub == NULL && head->status != WAITING) {
+      head->status = WAITING;
+      if(ipc_subscribe_if_needed) {
+        ngx_int_t       rc;
+        assert(head->cf);
+        DBG("ensure chanhead ready: request for %V from %i to %i", &head->id, memstore_slot(), owner);
+        if((rc = memstore_ipc_send_subscribe(owner, &head->id, head, head->cf)) != NGX_OK) {
+          return rc;
+        }
+      }
+    }
+    else if(head->foreign_owner_ipc_sub != NULL && head->status == WAITING) {
+      DBG("ensure chanhead ready: subscribe request for %V from %i to %i", &head->id, memstore_slot(), owner);
+      memstore_ready_chanhead_unless_stub(head);
+    }
+  }
+  else {
+    if(head->cf && head->cf->redis.enabled && !head->multi && head->status != READY) { //both redis BACKUP and DISTRIBUTED storage modes
+      if(head->redis_sub == NULL) {
+        head->redis_sub = memstore_redis_subscriber_create(head);
+        nchan_store_redis.subscribe(&head->id, head->redis_sub);
+        head->status = WAITING;
+      }
+      else {
+        if(head->redis_sub->enqueued) {
+          memstore_ready_chanhead_unless_stub(head);
+        }
+        else {
+          head->status = WAITING;
+        }
+      }
+    }
+    else if(head->status != READY) {
+      memstore_ready_chanhead_unless_stub(head);
+    }
+  }
+  return NGX_OK;
+}
+
+
+static ngx_int_t parse_multi_id(ngx_str_t *id, ngx_str_t ids[]) {
+  ngx_int_t       n = 0;
+  u_char         *cur = id->data;
+  u_char         *last = cur + id->len;
+  u_char         *sep;
+  
+  if(nchan_channel_id_is_multi(id)) {
+    cur += 3;
+    while((sep = ngx_strlchr(cur, last, NCHAN_MULTI_SEP_CHR)) != NULL) {
+      ids[n].data=cur;
+      ids[n].len = sep - cur;
+      cur = sep + 1;
+      n++;
+    }
+    return n;
+  }
+  return 0;
+}
+
+static int count_channel_id(ngx_str_t *id) {
+  int       n = 0;
+  u_char   *cur = id->data;
+  u_char   *last = cur + id->len;
+  u_char   *sep;
+  
+  if(nchan_channel_id_is_multi(id)) {
+    cur += 3;
+    while((sep = ngx_strlchr(cur, last, NCHAN_MULTI_SEP_CHR)) != NULL) {
+      cur = sep + 1;
+      n++;
+    }
+    return n;
+  }
+  else {
+    return 1;
+  }
+}
+
+static void delta_fakesubs_timer_handler(ngx_event_t *ev) {
+  memstore_channel_head_t *head = (memstore_channel_head_t *)ev->data;
+  if(send_redis_fakesub_delta(head) && !ngx_exiting && !ngx_quit && ev->timedout) {
+    ev->timedout = 0;
+    ngx_add_timer(ev, redis_fakesub_timer_interval);
+  }
+}
+
+static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  memstore_channel_head_t      *head;
+  ngx_int_t                     owner = memstore_channel_owner(channel_id);
+  ngx_str_t                     ids[NCHAN_MULTITAG_MAX];
+  ngx_int_t                     i, n = 0;
+  ngx_str_t                     group_name;
+  group_tree_node_t            *groupnode;
+  
+  head=ngx_calloc(sizeof(*head) + sizeof(u_char)*(channel_id->len), ngx_cycle->log);
+  
+  if(head == NULL) {
+    ERR("can't allocate memory for (new) chanhead");
+    return NULL;
+  }
+  
+  head->slot = memstore_slot();
+  head->owner = owner;
+  head->shutting_down = 0;
+  head->in_gc_queue = 0;
+  head->in_churn_queue = 0;
+  head->gc_queued_times = 0;
+  head->redis_sub = NULL;
+  if(cf) {
+    head->stub = 0;
+    head->cf=cf;
+  }
+  else {
+    head->stub = 1;
+    head->cf = NULL;
+  }
+  
+  if(head->slot == owner) {
+    if((head->shared = shm_alloc(shm, sizeof(*head->shared), "channel shared data")) == NULL) {
+      ngx_free(head);
+      nchan_log_ooshm_error("allocating channel %V", channel_id);
+      return NULL;
+    }
+    head->shared->sub_count = 0;
+    head->shared->internal_sub_count = 0;
+    head->shared->total_message_count = 0;
+    head->shared->stored_message_count = 0;
+    head->shared->last_seen = 0;
+    head->shared->gc.outside_refcount=0;
+    nchan_stats_worker_incr(channels, 1);
+  }
+  else {
+    head->shared = NULL;
+  }
+  
+  //no lock needed, no one else knows about this chanhead yet.
+  head->id.len = channel_id->len;
+  head->id.data = (u_char *)&head[1];
+  ngx_memcpy(head->id.data, channel_id->data, channel_id->len);
+  head->sub_count=0;
+  head->internal_sub_count=0;
+  head->status = NOTREADY;
+  head->msg_last = NULL;
+  head->msg_first = NULL;
+  head->foreign_owner_ipc_sub = NULL;
+  head->last_subscribed_local = 0;
+  
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+  nchan_list_init(&head->reserved, sizeof(char *), "chanhead reserve (debug)");
+#else
+  head->reserved = 0;
+#endif
+  head->multi=NULL;
+  head->multi_count = 0;
+  head->multi_subscribers_pending = 0;
+  
+  head->max_messages = (ngx_int_t) -1;
+  
+  if(head->id.len >= 5 && ngx_strncmp(head->id.data, "meta/", 5) == 0) {
+    head->meta = 1;
+    head->max_messages = NCHAN_META_CHANNEL_MAX_MESSAGES;
+  }
+  else {
+    head->meta = 0;
+  }
+  
+  head->spooler.running=0;
+  
+  if((n = parse_multi_id(&head->id, ids)) > 0) {
+    memstore_multi_t          *multi;
+    int16_t                   *tags_latest, *tags_oldest;
+    
+    if((multi = ngx_calloc(sizeof(*multi) * n, ngx_cycle->log)) == NULL) {
+      ERR("can't allocate multi array for multi-channel %p", head);
+      return NULL;
+    }
+    
+    head->latest_msgid.time = 0;
+    head->latest_msgid.tagcount = n;
+    head->oldest_msgid.time = 0;
+    head->oldest_msgid.tagcount = n;
+    
+    if(n <= NCHAN_FIXED_MULTITAG_MAX) {
+      tags_latest = head->latest_msgid.tag.fixed;
+      tags_oldest = head->oldest_msgid.tag.fixed;
+    }
+    else {
+      head->latest_msgid.tag.allocd = ngx_alloc(sizeof(*head->latest_msgid.tag.allocd) * n, ngx_cycle->log);
+      head->oldest_msgid.tag.allocd = ngx_alloc(sizeof(*head->oldest_msgid.tag.allocd) * n, ngx_cycle->log);
+      if(!head->latest_msgid.tag.allocd  || !head->oldest_msgid.tag.allocd) {
+        ERR("can't allocate multi tag array for multi-channel %p", head);
+        return NULL;
+      }
+      
+      tags_latest = head->latest_msgid.tag.allocd;
+      tags_oldest = head->oldest_msgid.tag.allocd;
+    }
+    
+    for(i=0; i < n; i++) {
+      tags_latest[i] = 0;
+      tags_oldest[i] = 0;
+      multi[i].id = ids[i];
+      multi[i].sub = NULL;
+    }
+    
+    head->multi_count = n;
+    head->multi_subscribers_pending = n;
+    head->multi = multi;
+    head->owner = head->slot; //multis are always self-owned
+  }
+  else {
+    head->multi_count = 0;
+    head->multi_subscribers_pending = n;
+    
+    head->latest_msgid.time = 0;
+    head->latest_msgid.tag.fixed[0] = 0;
+    head->latest_msgid.tagcount = 1;
+    
+    head->oldest_msgid.time = 0;
+    head->oldest_msgid.tag.fixed[0] = 0;
+    head->oldest_msgid.tagcount = 1;
+    
+    head->multi = NULL;
+  }
+  
+  if(head->cf && head->cf->redis.enabled && !head->multi) { // both DISTRIBUTED and BACKUP redis storage modes
+    nchan_init_timer(&head->delta_fakesubs_timer_ev, delta_fakesubs_timer_handler, head);
+    head->delta_fakesubs = 0;
+    head->redis_idle_cache_ttl = cf->redis_idle_channel_cache_timeout;
+    
+    
+    if(head->slot == owner) {
+      head->msg_buffer_complete = 0;
+    }
+    else {
+      head->msg_buffer_complete = 1; //always assume buffer is complete, and let the owner figure out the details
+    }
+  }
+  else {
+    head->redis_idle_cache_ttl = 0;
+    head->msg_buffer_complete = 1;
+  }
+  
+  start_chanhead_spooler(head);
+
+  //get group
+  if(cf && cf->group.enable_accounting) {
+    group_name = nchan_get_group_from_channel_id(&head->id);
+    if((groupnode = memstore_groupnode_get(groups, &group_name)) == NULL) {
+      ERR("couldn't get groupnode %V for chanhead %V", &group_name, &head->id);
+    }
+    else {
+      head->groupnode = groupnode;
+      memstore_group_add_channel(head);
+      if(head->owner == head->slot) {
+        memstore_group_associate_own_channel(head);
+      }
+    }
+  }
+  
+  CHANNEL_HASH_ADD(head);
+  
+  return head;
+}
+
+static ngx_inline memstore_channel_head_t *ensure_chanhead_ready_or_trash_chanhead(memstore_channel_head_t *head, int8_t ipc_sub_if_needed) {
+  if(head != NULL) {
+    if(memstore_ensure_chanhead_is_ready(head, ipc_sub_if_needed) != NGX_OK) {
+      head->status = INACTIVE;
+      chanhead_gc_add(head, "bad chanhead, couldn't ensure readiness");
+      return NULL;
+    }
+  }
+  return head;
+}
+
+memstore_channel_head_t * nchan_memstore_find_chanhead(ngx_str_t *channel_id) {
+  memstore_channel_head_t     *head = NULL;
+  //ERR("channel id %V", channel_id);
+  CHANNEL_HASH_FIND(channel_id, head);
+  return ensure_chanhead_ready_or_trash_chanhead(head, 1);
+}
+
+typedef struct {
+  ngx_str_t        *chid;
+  nchan_loc_conf_t *cf;
+  callback_pt       cb;
+  void             *pd;
+} find_ch_backup_data_t;
+
+
+static ngx_int_t memstore_find_chanhead_with_backup_callback(ngx_int_t rc, void *vd, void *pd) {
+  nchan_channel_t             *chinfo = vd;
+  find_ch_backup_data_t       *d = pd;
+  memstore_channel_head_t     *ch = NULL;
+  if(chinfo) {
+    ch = nchan_memstore_get_chanhead(d->chid, d->cf);
+    d->cb(ch ? NGX_OK : NGX_ERROR, ch, d->pd);
+  }
+  else {
+    d->cb(NGX_OK, NULL, d->pd);
+  }
+  
+  ngx_free(d);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_memstore_find_chanhead_with_backup(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  memstore_channel_head_t     *head = NULL;
+  if((head = nchan_memstore_find_chanhead(channel_id)) == NULL) {
+    find_ch_backup_data_t     *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    if(!d) {
+      ERR("couldn't allocate data for nchan_memstore_find_chanhead_with_backup");
+      cb(NGX_ERROR, NULL, pd);
+      return NGX_ERROR;
+    }
+    d->chid = channel_id;
+    d->cf = cf;
+    d->cb = cb;
+    d->pd = pd;
+    
+    return nchan_store_redis.find_channel(channel_id, cf, memstore_find_chanhead_with_backup_callback, d);
+  }
+  
+  cb(NGX_OK, head, pd);
+  return NGX_OK;
+}
+
+memstore_channel_head_t *nchan_memstore_get_chanhead(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  memstore_channel_head_t          *head;
+  head = nchan_memstore_find_chanhead(channel_id);
+  if(head==NULL) {
+    head = chanhead_memstore_create(channel_id, cf);
+    return ensure_chanhead_ready_or_trash_chanhead(head, 1);
+  }
+  
+  if(cf->pub.http || cf->pub.websocket) {
+    head->cf = cf;
+  }
+  
+  return head;
+}
+
+memstore_channel_head_t *nchan_memstore_get_chanhead_no_ipc_sub(ngx_str_t *channel_id, nchan_loc_conf_t *cf) {
+  memstore_channel_head_t     *head = NULL;
+  CHANNEL_HASH_FIND(channel_id, head);
+  if(head != NULL) {
+    return ensure_chanhead_ready_or_trash_chanhead(head, 0);
+  }
+  else {
+    head = chanhead_memstore_create(channel_id, cf);
+    return ensure_chanhead_ready_or_trash_chanhead(head, 0);
+  }
+  return head;
+}
+
+ngx_int_t chanhead_gc_add(memstore_channel_head_t *ch, const char *reason) {
+  ngx_int_t                   slot = memstore_slot();
+  DBG("Chanhead gc add %p %V: %s", ch, &ch->id, reason);
+  
+  if(!ch->shutting_down) {
+    assert(ch->foreign_owner_ipc_sub == NULL); //we don't accept still-subscribed chanheads
+  }
+  
+  if(ch->slot != ch->owner && ch->shared) {
+    ngx_atomic_fetch_add(&ch->shared->gc.outside_refcount, -1);
+    ch->shared = NULL;
+  }
+  if(ch->status == WAITING && !(ch->cf && ch->cf->redis.enabled) && !(ngx_exiting || ngx_quit)) {
+    ERR("tried adding WAITING chanhead %p %V to chanhead_gc. why?", ch, &ch->id);
+    //don't gc it just yet.
+    return NGX_OK;
+  }
+  
+  assert(ch->slot == slot);
+  
+  if(! ch->in_gc_queue) {
+    ch->gc_start_time = ngx_time();
+    ch->status = INACTIVE;
+    ch->gc_queued_times ++;
+    chanhead_churner_withdraw(ch);
+    ch->in_gc_queue = 1;
+    nchan_reaper_add(&mpt->chanhead_reaper, ch);
+  }
+  else {
+    DBG("gc_add chanhead %V: already added", &ch->id);
+  }
+
+  return NGX_OK;
+}
+
+ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *ch, const char *reason) {
+  //remove from gc list if we're there
+  DBG("Chanhead gc withdraw %p %V: %s", ch, &ch->id, reason);
+  
+  if(ch->in_gc_queue) {
+    nchan_reaper_withdraw(&mpt->chanhead_reaper, ch);
+    ch->in_gc_queue = 0;
+  }
+  if(ch->owner == ch->slot) {
+    chanhead_churner_add(ch);
+  }
+  
+  return NGX_OK;
+}
+
+
+/*
+static ngx_str_t *msg_to_str(nchan_msg_t *msg) {
+  static ngx_str_t str;
+  ngx_buf_t *buf = msg->buf;
+  if(ngx_buf_in_memory(buf)) {
+    str.data = buf->start;
+    str.len = buf->end - buf->start;
+  }
+  else {
+    str.data= (u_char *)"{not in memory}";
+    str.len =  15;
+  }
+  return &str;
+}
+*/
+/*
+static ngx_str_t *chanhead_msg_to_str(store_message_t *msg) {
+  static ngx_str_t str;
+  if (msg == NULL) {
+    str.data=(u_char *)"{NULL}";
+    str.len = 6;
+    return &str;
+  }
+  else {
+    return msg_to_str(msg->msg); //WHOA, shared space!
+  }
+}
+*/
+
+ngx_int_t nchan_memstore_publish_notice(memstore_channel_head_t *head, ngx_int_t notice_code, const void *notice_data) {
+  
+  DBG("tried publishing notice %i to chanhead %p (subs: %i)", notice_code, head, head->sub_count);
+  
+  switch(notice_code) {
+    case NCHAN_NOTICE_BUFFER_LOADED:
+      //DBG("buffer loaded from Redis");
+      if(head->msg_buffer_complete == 0) {
+        head->msg_buffer_complete = 1;
+        ensure_chanhead_ready_or_trash_chanhead(head, 0);
+        head->spooler.fn->handle_channel_status_change(&head->spooler);
+      }
+      break;
+    
+    default:
+      //do nothing
+      break;
+  }
+  
+  return head->spooler.fn->broadcast_notice(&head->spooler, notice_code, (void *)notice_data);
+}
+
+ngx_int_t nchan_memstore_publish_generic(memstore_channel_head_t *head, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line) {
+  
+  ngx_int_t          shared_sub_count = 0;
+
+  if(head==NULL) {
+    /*
+    if(msg) {
+      DBG("tried publishing %V with a NULL chanhead", msgid_to_str(&msg->id));
+    }
+    else {
+      DBG("tried publishing status %i msg with a NULL chanhead", status_code);
+    }
+    */
+    return NCHAN_MESSAGE_QUEUED;
+  }
+  
+  if(head->shared) {
+    if(!(head->cf && head->cf->redis.enabled) && !head->multi) {
+      assert(head->status == READY || head->status == STUBBED);
+    }
+    shared_sub_count = head->shared->sub_count;
+  }
+
+  if(msg) {
+    //DBG("tried publishing %V to chanhead %p (subs: %i)", msgid_to_str(&msg->id), head, head->sub_count);
+    head->spooler.fn->respond_message(&head->spooler, msg);
+    
+    //wait what?...
+    //if(msg->temp_allocd) {
+    //  ngx_free(msg);
+    //}
+  }
+  else {
+    DBG("tried publishing status %i to chanhead %p (subs: %i)", status_code, head, head->sub_count);
+    head->spooler.fn->broadcast_status(&head->spooler, status_code, status_line);
+  }
+    
+  //TODO: be smarter about garbage-collecting chanheads
+  if(head->owner == memstore_slot()) {
+    //the owner is responsible for the chanhead and its interprocess siblings
+    //when removed, said siblings will be notified via IPC
+    chanhead_gc_add(head, "add owner chanhead after publish");
+  }
+  
+  return (shared_sub_count > 0) ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED;
+}
+
+static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch);
+
+static ngx_int_t empty_callback(){
+  return NGX_OK;
+}
+
+typedef struct {
+  ngx_int_t       n;
+  nchan_channel_t chinfo;
+  callback_pt     cb;
+  void           *pd;
+} delete_multi_data_t;
+
+static ngx_int_t delete_multi_callback_handler(ngx_int_t code, nchan_channel_t* chinfo, delete_multi_data_t *d) {
+  assert(d->n >= 1);
+  d->n--;
+  
+  if(chinfo) {
+    d->chinfo.subscribers += chinfo->subscribers;
+    if(d->chinfo.last_seen < chinfo->last_seen) {
+      d->chinfo.last_seen = chinfo->last_seen;
+    }
+  }
+  
+  if(d->n == 0) {
+    if(d->cb) {
+      d->cb(code, &d->chinfo, d->pd);
+    }
+    ngx_free(d);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_delete_single_channel_id(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  ngx_int_t                owner;
+  ngx_int_t                rc;
+  
+  assert(!nchan_channel_id_is_multi(channel_id));
+  owner = memstore_channel_owner(channel_id);
+  
+  if(cf->redis.enabled) {
+    if(cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+      return nchan_store_redis.delete_channel(channel_id, cf, callback, privdata);
+    }
+    else {
+      nchan_store_redis.delete_channel(channel_id, cf, NULL, NULL);
+    }
+  }
+  
+  if(owner == memstore_slot()) {
+    return nchan_memstore_force_delete_channel(channel_id, callback, privdata);
+  }
+  else {
+    rc = memstore_ipc_send_delete(owner, channel_id, callback, privdata);
+    if(rc == NGX_DECLINED) {
+      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+      return NGX_ERROR;
+    }
+    else {
+      return NGX_OK;
+    }
+  }
+}
+
+static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  if(!nchan_channel_id_is_multi(channel_id)) {
+    return nchan_store_delete_single_channel_id(channel_id, cf, callback, privdata);
+  }
+  else {
+    //send the delete to all the individually multiplexed channels
+    ngx_int_t             i, n = 0;
+    ngx_str_t             ids[NCHAN_MULTITAG_MAX];
+    
+    n = parse_multi_id(channel_id, ids);
+    
+
+    
+    delete_multi_data_t   *d = ngx_calloc(sizeof(*d), ngx_cycle->log);
+    assert(d);
+    //everyone might have this multi. broadcast the delete everywhere
+    d->n = n;
+    d->cb = callback;
+    d->pd = privdata;
+
+    for(i=0; i<n; i++) {
+      nchan_store_delete_single_channel_id(&ids[i], cf, (callback_pt )delete_multi_callback_handler, d);
+    }
+    
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t chanhead_delete_message(memstore_channel_head_t *ch, store_message_t *msg);
+
+static void chanhead_copy_channel_info(memstore_channel_head_t *ch, nchan_channel_t *info) {
+  assert(ch->owner == memstore_slot());
+  assert(ch->shared);
+  info->id = ch->id;
+  info->messages = ch->shared->stored_message_count;
+  info->subscribers = ch->shared->sub_count;
+  info->last_seen = ch->shared->last_seen;
+  info->last_published_msg_id = ch->latest_msgid;
+}
+
+static ngx_int_t nchan_memstore_force_delete_chanhead(memstore_channel_head_t *ch, callback_pt callback, void *privdata) {
+  
+  nchan_channel_t                channel_info;
+  store_message_t               *msg = NULL;
+  
+  assert(ch->owner == memstore_slot());
+  assert(ch->shared);
+  if(callback == NULL) {
+    callback = empty_callback;
+  }
+  
+  chanhead_copy_channel_info(ch, &channel_info);
+  nchan_memstore_publish_generic(ch, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+  callback(NGX_OK, &channel_info, privdata);
+  //delete all messages
+  while((msg = ch->msg_first) != NULL) {
+    chanhead_delete_message(ch, msg);
+  }
+  chanhead_gc_add(ch, "forced delete");
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_memstore_force_delete_channel(ngx_str_t *channel_id, callback_pt callback, void *privdata) {
+  memstore_channel_head_t       *ch;
+
+  assert(memstore_channel_owner(channel_id) == memstore_slot());
+  
+  if(callback == NULL) {
+    callback = empty_callback;
+  }
+  if((ch = nchan_memstore_find_chanhead(channel_id))) {
+    nchan_memstore_force_delete_chanhead(ch, callback, privdata);
+  }
+  else {
+    callback(NGX_OK, NULL, privdata);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_find_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  ngx_int_t                    owner = memstore_channel_owner(channel_id);
+  memstore_channel_head_t     *ch;
+  nchan_channel_t              chaninfo;
+  
+  if(cf->redis.enabled && cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+    return nchan_store_redis.find_channel(channel_id, cf, callback, privdata);
+  }
+  else if(memstore_slot() == owner) {
+    ch = nchan_memstore_find_chanhead(channel_id);
+    if(ch == NULL) {
+      if(cf->redis.enabled && cf->redis.storage_mode == REDIS_MODE_BACKUP) {
+        DBG("channel %V not found in backup mode. Try Redis...", channel_id);
+        return nchan_store_redis.find_channel(channel_id, cf, callback, privdata);
+      }
+      else {
+        callback(NGX_OK, NULL, privdata);
+      }
+    }
+    else {
+      chanhead_copy_channel_info(ch, &chaninfo);
+      callback(NGX_OK, &chaninfo, privdata);
+    }
+    
+  }
+  else {
+    if(memstore_ipc_send_get_channel_info(owner, channel_id, cf, callback, privdata) == NGX_DECLINED) {
+      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+    }
+  }
+  return NGX_OK;
+}
+
+static void init_shdata_procslots(int slot, int n) {
+  shmtx_lock(shm);
+  ngx_int_t          offset = memstore_procslot_offset + n;
+  assert(shdata->procslot[offset] == NCHAN_INVALID_SLOT);
+  DBG("set shdata->procslot[%i] = %i", offset, slot);
+  shdata->procslot[offset] = slot;
+  shmtx_unlock(shm);
+}
+
+//initialization
+static ngx_int_t nchan_store_init_module(ngx_cycle_t *cycle) {
+  ngx_int_t          i;
+  shmtx_lock(shm);
+#if FAKESHARD
+
+  shdata->max_workers = MAX_FAKE_WORKERS;
+  
+  
+  memstore_data_t   *cur;
+  for(i = 0; i < MAX_FAKE_WORKERS; i++) {
+    cur = &mdata[i];
+    cur->fake_slot = i;
+  }
+  
+  memstore_fakeprocess_push(0);
+
+#else
+  ngx_int_t           count = 0;
+  ngx_core_conf_t    *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  
+  if(shdata->total_active_workers > 0) {
+    shdata->reloading += shdata->max_workers;
+  }
+  
+  shdata->old_max_workers = shdata->max_workers;
+  shdata->max_workers = ccf->worker_processes;
+  if(shdata->old_max_workers == NCHAN_INVALID_SLOT) {
+    shdata->old_max_workers = shdata->max_workers;
+  }
+  
+  //figure out the memstore_procslot_offset
+  for(i = 0; i < NGX_MAX_PROCESSES; i++) {
+    if(shdata->procslot[i] == NCHAN_INVALID_SLOT) {
+      count++;
+    }
+    else {
+      count = 0;
+    }
+    if(count == shdata->max_workers) {
+      break;
+    }
+  }
+  if(count < shdata->max_workers) {
+    ERR("Not enough free procslots?! Don't know what to do... :'(");
+    return NGX_ERROR;
+  }
+  memstore_procslot_offset = i + 1 - shdata->max_workers;
+
+#endif
+  memstore_worker_generation = shdata->generation;
+  shmtx_unlock(shm);
+  DBG("memstore init_module pid %i. ipc: %p, procslot_offset: %i", ngx_pid, ipc, memstore_procslot_offset);
+
+  //initialize our little IPC
+  if(ipc == NULL) {
+    ipc = &ipc_data;
+    ipc_init(ipc);
+    ipc_set_handler(ipc, memstore_ipc_alert_handler);
+  }
+  ipc_open(ipc, cycle, shdata->max_workers, &init_shdata_procslots);
+
+  if(groups == NULL) {
+    groups = &groups_data;
+    memstore_groups_init(groups);
+  }
+  
+  //initialize default shared multi-channel config
+  ngx_memzero(&default_multiconf, sizeof(default_multiconf));
+  default_multiconf.complex_message_timeout = NULL;
+  default_multiconf.message_timeout = 0;
+  default_multiconf.max_messages = -1;
+  default_multiconf.complex_max_messages = NULL;
+  default_multiconf.max_channel_id_length = NCHAN_MAX_CHANNEL_ID_LENGTH;
+  default_multiconf.max_channel_subscribers = -1;
+  
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
+  nchan_main_conf_t     *conf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
+  ngx_str_t              name = ngx_string("memstore");
+  if(conf->shm_size==NGX_CONF_UNSET_SIZE) {
+    conf->shm_size=NCHAN_DEFAULT_SHM_SIZE;
+  }
+  if(conf->redis_fakesub_timer_interval == NGX_CONF_UNSET_MSEC) {
+    conf->redis_fakesub_timer_interval = REDIS_DEFAULT_FAKESUB_TIMER_INTERVAL;
+  }
+  redis_fakesub_timer_interval = conf->redis_fakesub_timer_interval;
+  
+  shm = shm_create(&name, cf, conf->shm_size, initialize_shm, &ngx_nchan_module);
+  nchan_store_memory_shmem = shm;
+  return NGX_OK;
+}
+
+static void nchan_store_create_main_conf(ngx_conf_t *cf, nchan_main_conf_t *mcf) {
+  mcf->shm_size=NGX_CONF_UNSET_SIZE;
+  mcf->redis_fakesub_timer_interval=NGX_CONF_UNSET_MSEC;
+}
+
+static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
+  memstore_channel_head_t            *cur, *tmp;
+  ngx_int_t                           i, my_procslot_index = NCHAN_INVALID_SLOT;
+    
+  DBG("exit worker %i  (slot %i)", ngx_pid, ngx_process_slot);
+  
+#if FAKESHARD
+  for(i = 0; i < MAX_FAKE_WORKERS; i++) {
+  memstore_fakeprocess_push(i);
+#endif
+  HASH_ITER(hh, mpt->hash, cur, tmp) {
+    cur->shutting_down = 1;
+    
+    //serialize_chanhead_msgs_for_reload(cur);
+    
+    chanhead_gc_add(cur, "exit worker");
+  }
+  
+  nchan_exit_notice_about_remaining_things("channel", "", mpt->chanhead_reaper.count);
+  nchan_exit_notice_about_remaining_things("channel", "in churner ", mpt->chanhead_churner.count);
+  nchan_exit_notice_about_remaining_things("unbuffered message", "", mpt->nobuffer_msg_reaper.count);
+  nchan_exit_notice_about_remaining_things("message", "", mpt->msg_reaper.count);
+  
+  nchan_reaper_stop(&mpt->chanhead_churner);
+  nchan_reaper_stop(&mpt->chanhead_reaper);
+  
+  nchan_reaper_stop(&mpt->nobuffer_msg_reaper);
+  nchan_reaper_stop(&mpt->msg_reaper);
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+  }
+#endif
+  
+  memstore_groups_shutdown(groups);
+  
+  shmtx_lock(shm);
+  
+  if(shdata->old_max_workers == NGX_CONF_UNSET) {
+    shdata->old_max_workers = shdata->max_workers;
+  }
+  
+  shdata->reloading--;
+  
+  //don't care if this is 'inefficient', it only happens once per worker per load
+  for(i = memstore_procslot_offset; i < memstore_procslot_offset + shdata->old_max_workers; i++) {
+    if(ngx_process_slot == shdata->procslot[i]) {
+      my_procslot_index = i;
+      break;
+    }
+  }
+  if(my_procslot_index == NCHAN_INVALID_SLOT) {
+    ERR("my procslot not found! I don't know what to do!");
+    assert(0);
+  }
+  ipc_close(ipc, cycle);
+  
+  if(shdata->reloading == 0) {
+    for(i = memstore_procslot_offset; i < memstore_procslot_offset + shdata->old_max_workers; i++) {
+      shdata->procslot[i] = NCHAN_INVALID_SLOT;
+    }
+  }
+
+  shdata->total_active_workers--;
+  
+  shmtx_unlock(shm);
+  
+#if NCHAN_MSG_LEAK_DEBUG
+  msg_debug_assert_isempty();
+#endif
+  
+  shm_destroy(shm); //just for this worker...
+  
+#if FAKESHARD
+  while(memstore_fakeprocess_pop()) {  };
+#endif
+}
+
+static void nchan_store_exit_master(ngx_cycle_t *cycle) {
+  ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  
+  DBG("exit master from pid %i", ngx_pid);
+  
+  ipc_close(ipc, cycle);
+#if FAKESHARD
+  while(memstore_fakeprocess_pop()) {  };
+ #endif
+  if (ccf->master != 0) {
+    shm_free(shm, shdata);
+    shm_destroy(shm);
+  }
+}
+
+static ngx_int_t validate_chanhead_messages(memstore_channel_head_t *ch) {
+  /*
+  ngx_int_t              count = ch->channel.messages;
+  ngx_int_t              rev_count = count;
+  ngx_int_t              owner = memstore_channel_owner(&ch->id);
+  store_message_t        *cur;
+  
+  if(memstore_slot() == owner) {
+    assert(ch->shared->stored_message_count == ch->channel.messages);
+  }
+  //walk it forwards
+  for(cur = ch->msg_first; cur != NULL; cur=cur->next){
+    count--;
+  }
+  for(cur = ch->msg_last; cur != NULL; cur=cur->prev){
+    rev_count--;
+  }
+  
+  assert(count == 0);
+  assert(rev_count == 0);
+  */
+  return NGX_OK;
+}
+
+static void memstore_reap_message( nchan_msg_t *msg ) {
+  ngx_buf_t         *buf = &msg->buf;
+  ngx_file_t        *f = buf->file;
+  
+  assert(!msg_refcount_valid(msg));
+  
+  if(f != NULL) {
+    if(f->fd != NGX_INVALID_FILE) {
+      DBG("close fd %u ", f->fd);
+      ngx_close_file(f->fd);
+    }
+    else {
+      DBG("reap msg fd invalid");
+    }
+    ngx_delete_file(f->name.data); // assumes string is zero-terminated, which required trickery during allocation
+  }
+  
+  if(msg->compressed && msg->compressed->buf.file) {
+    f = msg->compressed->buf.file;
+    if(f->fd != NGX_INVALID_FILE) {
+      ngx_close_file(f->fd);
+    }
+    ngx_delete_file(f->name.data); // assumes string is zero-terminated, which required trickery during allocation
+  }
+  //DBG("free smsg %p",s msg);
+#if NCHAN_MSG_LEAK_DEBUG  
+  msg_debug_remove(msg);
+#endif
+  
+  //ERR("reap msg %p", msg);
+  nchan_free_msg_id(&msg->id);
+  nchan_free_msg_id(&msg->prev_id);
+  ngx_memset(msg, 0xFA, sizeof(*msg)); //debug stuff
+  shm_free(shm, msg);
+  nchan_stats_worker_incr(messages, -1);
+}
+
+static void memstore_reap_store_message( store_message_t *smsg ) {
+  
+  memstore_reap_message(smsg->msg);
+  
+  ngx_memset(smsg, 0xBC, sizeof(*smsg)); //debug stuff
+  ngx_free(smsg);
+}
+
+
+
+static ngx_int_t chanhead_delete_message(memstore_channel_head_t *ch, store_message_t *msg) {
+  //validate_chanhead_messages(ch);
+  
+  //DBG("withdraw message %V from ch %p %V", msgid_to_str(&msg->msg->id), ch, &ch->id);
+  if(ch->msg_first == msg) {
+    //DBG("first message removed");
+    ch->msg_first = msg->next;
+  }
+  if(ch->msg_last == msg) {
+    //DBG("last message removed");
+    ch->msg_last = msg->prev;
+  }
+  if(msg->next != NULL) {
+    //DBG("set next");
+    msg->next->prev = msg->prev;
+  }
+  if(msg->prev != NULL) {
+    //DBG("set prev");
+    assert(0);
+    msg->prev->next = msg->next;
+  }
+  
+  ngx_atomic_fetch_add(&ch->shared->stored_message_count, -1);
+  
+  if(ch->groupnode) {
+    memstore_group_remove_message(ch->groupnode, msg->msg);
+  }
+  
+  nchan_reaper_add(&mpt->msg_reaper, msg);
+  return NGX_OK;
+}
+
+static ngx_int_t chanhead_messages_gc_custom(memstore_channel_head_t *ch, ngx_int_t max_messages) {
+  if(ch->owner != memstore_slot()) {
+    assert(ch->msg_first == NULL);
+    assert(ch->msg_last == NULL);
+    return NGX_OK;
+  }
+  
+  validate_chanhead_messages(ch);
+  store_message_t   *cur = ch->msg_first;
+  store_message_t   *next = NULL;
+  time_t             now = ngx_time();
+  ngx_int_t          started_count, tried_count, deleted_count;
+  
+  
+  
+  DBG("chanhead_gc max %i count %i", max_messages, ch->shared->stored_message_count);
+  
+  started_count = ch->shared->stored_message_count;
+  tried_count = 0;
+  deleted_count = 0;
+  
+  //is the message queue too big?
+  while(cur != NULL && max_messages >= 0 && ch->shared->stored_message_count > (ngx_uint_t )max_messages) {
+    tried_count++;
+    next = cur->next;
+    chanhead_delete_message(ch, cur);
+    deleted_count++;        
+    cur = next;
+  }
+  
+  //any expired messages?
+  while(cur != NULL && now > cur->msg->expires) {
+    tried_count++;
+    next = cur->next;
+    chanhead_delete_message(ch, cur);
+    cur = next;
+  }
+  DBG("message GC results: started with %i, walked %i, deleted %i msgs", started_count, tried_count, deleted_count);
+  validate_chanhead_messages(ch);
+  return NGX_OK;
+}
+
+ngx_int_t memstore_chanhead_messages_gc(memstore_channel_head_t *ch) {
+  //DBG("messages gc for ch %p %V", ch, &ch->id);
+  return chanhead_messages_gc_custom(ch, ch->max_messages);
+}
+
+static ngx_int_t chanhead_messages_delete(memstore_channel_head_t *ch) {
+  chanhead_messages_gc_custom(ch, 0);
+  return NGX_OK;
+}
+
+store_message_t *chanhead_find_next_message(memstore_channel_head_t *ch, nchan_msg_id_t *msgid, nchan_msg_status_t *status) {
+  store_message_t      *cur, *first;
+  
+  time_t           mid_time; //optimization yeah
+  int16_t          mid_tag; //optimization yeah
+  
+  //DBG("find next message %V", msgid_to_str(msgid));
+  if(ch == NULL) {
+    *status = MSG_NOTFOUND;
+    return NULL;
+  }
+  
+  assert(ch->msg_buffer_complete); //we only deal with complete buffers here
+  assert(ch->owner == memstore_slot());
+  
+  memstore_chanhead_messages_gc(ch);
+  
+  first = ch->msg_first;
+  cur = ch->msg_last;
+  
+  if(cur == NULL) {
+    if(msgid->time == NCHAN_OLDEST_MSGID_TIME || ch->max_messages == 0) {
+      *status = MSG_EXPECTED;
+    }
+    else {
+      *status = MSG_NOTFOUND;
+    }
+    return NULL;
+  }
+  else if(msgid->time == NCHAN_NEWEST_MSGID_TIME) {
+    ERR("wanted 'NCHAN_NEWEST_MSGID_TIME', which is weird...");
+    *status = MSG_EXPECTED; //future message
+    return NULL;
+  }
+  
+  mid_time = msgid->time;
+  mid_tag = msgid->tag.fixed[0];
+  
+  if(mid_time == NCHAN_NTH_MSGID_TIME) {
+    int               direction = mid_tag > 0 ? 1 : -1;
+    int               nth_msg = mid_tag * direction;
+    int               n = nth_msg;
+    store_message_t  *prev = NULL;
+    
+    assert(mid_tag != 0);
+    
+    for(cur = (direction>0 ? ch->msg_first : ch->msg_last); cur != NULL && n > 1; cur = (direction>0 ? cur->next : cur->prev)) {
+      prev = cur;
+      n--;
+    }
+    cur = cur ? cur : prev;
+    if(cur) {
+      *status = MSG_FOUND;
+      return cur;
+    }
+    else {
+      *status = MSG_EXPECTED;
+      return NULL;
+    }
+  }
+  else {
+    assert(msgid->tagcount == 1 && first->msg->id.tagcount == 1);
+    if(msgid == NULL || (mid_time < first->msg->id.time || (mid_time == first->msg->id.time && mid_tag < first->msg->id.tag.fixed[0])) ) {
+      //DBG("found message %V", msgid_to_str(&first->msg->id));
+      *status = MSG_FOUND;
+      return first;
+    }
+    
+    while(cur != NULL) {
+      //assert(cur->msg->id.tagcount == 1);
+      //DBG("cur: (chid: %V)  %V %V", &ch->id, msgid_to_str(&cur->msg->id), chanhead_msg_to_str(cur));
+      
+      if(mid_time > cur->msg->id.time || (mid_time == cur->msg->id.time && mid_tag >= cur->msg->id.tag.fixed[0])){
+        if(cur->next != NULL) {
+          *status = MSG_FOUND;
+          //DBG("found message %V", msgid_to_str(&cur->next->msg->id));
+          return cur->next;
+        }
+        else {
+          *status = MSG_EXPECTED;
+          return NULL;
+        }
+      }
+      cur=cur->prev;
+    }
+    //DBG("looked everywhere, not found");
+    *status = MSG_NOTFOUND;
+    return NULL;
+  }
+}
+
+typedef struct {
+  subscriber_t                *sub;
+  ngx_int_t                    channel_owner;
+  memstore_channel_head_t     *chanhead;
+  ngx_str_t                   *channel_id;
+  nchan_msg_id_t               msg_id;
+  callback_pt                  cb;
+  void                        *cb_privdata;
+  unsigned                     channel_exists:1;
+  unsigned                     group_channel_limit_pass:1;
+  unsigned                     reserved:1;
+  unsigned                     subbed:1;
+  unsigned                     allocd:1;
+} subscribe_data_t;
+
+//static subscribe_data_t        static_subscribe_data;
+
+static subscribe_data_t *subscribe_data_alloc(ngx_int_t owner) {
+  subscribe_data_t            *d;
+  //fuck it, just always allocate. we need to handle multis and shit too
+  d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+  assert(d);
+  d->allocd = 1;
+  /*if(memstore_slot() != owner) {
+    d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    d->allocd = 1;
+  }
+  else {
+    d = &static_subscribe_data;
+    d->allocd = 0;
+  }*/
+  return d;
+}
+
+static void subscribe_data_free(subscribe_data_t *d) {
+  if(d->allocd) {
+    ngx_free(d);
+  }
+}
+
+#define SUB_CHANNEL_UNAUTHORIZED 0
+#define SUB_CHANNEL_AUTHORIZED 1
+#define SUB_CHANNEL_NOTSURE 2
+
+static ngx_int_t nchan_store_subscribe_channel_existence_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d);
+static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d);
+
+static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub) {
+  ngx_int_t                    owner = memstore_channel_owner(channel_id);
+  subscribe_data_t            *d = subscribe_data_alloc(sub->cf->redis.enabled ? -1 : owner);
+  
+  assert(d != NULL);
+  
+  d->channel_owner = owner;
+  d->channel_id = channel_id;
+  d->sub = sub;
+  d->subbed = 0;
+  d->reserved = 0;
+  d->channel_exists = 0;
+  d->group_channel_limit_pass = 0;
+  d->msg_id = sub->last_msgid;
+  
+  if(sub->cf->subscribe_only_existing_channel || sub->cf->max_channel_subscribers > 0) {
+    sub->fn->reserve(sub);
+    d->reserved = 1;
+    if(memstore_slot() != owner) {
+      ngx_int_t rc;
+      rc = memstore_ipc_send_channel_existence_check(owner, channel_id, sub->cf, (callback_pt )nchan_store_subscribe_channel_existence_check_callback, d);
+      if(rc == NGX_DECLINED) { // out of memory
+        nchan_store_subscribe_channel_existence_check_callback(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
+        return NGX_ERROR;
+      }
+    }
+    else {
+      return nchan_store_subscribe_continued(SUB_CHANNEL_NOTSURE, NULL, d);
+    }
+  }
+  else {
+    return nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_subscribe_channel_existence_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
+  if(d->sub->fn->release(d->sub, 0) == NGX_OK) {
+    d->reserved = 0;
+    return nchan_store_subscribe_continued(channel_status, _, d);
+  }
+  else {//don't go any further, the sub has been deleted
+    subscribe_data_free(d);
+    return NGX_OK;
+  }
+}
+
+static ngx_int_t redis_subscribe_channel_existence_callback(ngx_int_t status, void *ch, void *d) {
+  nchan_channel_t    *channel = (nchan_channel_t *)ch;
+  subscribe_data_t   *data = (subscribe_data_t *)d;
+  nchan_loc_conf_t   *cf = data->sub->cf;
+  ngx_int_t           channel_status;
+  
+  data->channel_exists = channel != NULL;
+  
+  if(status == NGX_OK) {
+    if(channel == NULL) {
+      channel_status = cf->subscribe_only_existing_channel ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
+    }
+    /*
+    else if (cf->max_channel_subscribers > 0) {
+      // don't check this anymore -- a total subscribers count check is less
+      // useful as a per-instance check, which is handled in nchan_store_subscribe_continued
+      // shared total subscriber count check can be re-enabled with another config setting
+      channel_status = channel->subscribers >= cf->max_channel_subscribers ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
+    }
+    */
+    else {
+      channel_status = SUB_CHANNEL_AUTHORIZED;
+
+    }
+    nchan_store_subscribe_continued(channel_status, NULL, data);
+  }
+  else {
+    //error!!
+    subscribe_data_free(data);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t group_subscribe_accounting_check(ngx_int_t rc, nchan_group_t *shm_group, subscribe_data_t *d) {
+  
+  memstore_channel_head_t  *ch = ensure_chanhead_ready_or_trash_chanhead(d->chanhead, 0);
+  
+  if(ch && d->sub->status != DEAD) {
+    if(shm_group) {
+      if(!shm_group->limit.subscribers || shm_group->subscribers < shm_group->limit.subscribers) { 
+        //not an atomic comparison but we don't really care
+        d->chanhead->spooler.fn->add(&d->chanhead->spooler, d->sub);
+      }
+      else {
+        d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+      }
+    }
+    else {
+      ERR("coldn't find group for group_subscribe_accounting_check");
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+    }
+  }
+  
+  if(d->reserved) {
+    d->sub->fn->release(d->sub, 0);
+  }
+  memstore_chanhead_release(d->chanhead, "group accounting check");
+  
+  subscribe_data_free(d);
+  return NGX_OK;
+}
+
+
+static ngx_int_t group_subscribe_channel_limit_reached(ngx_int_t rc, nchan_channel_t *chaninfo, subscribe_data_t *d) {
+  //no new hannels!
+  if(d->sub->status != DEAD) {
+    if(chaninfo) {
+      //ok, channel already exists.
+      nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
+    }
+    else {
+      //nope. no channel, no subscribing.
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+      if(d->reserved)  d->sub->fn->release(d->sub, 0);
+      subscribe_data_free(d);
+    }
+  }
+  else {
+    if(d->reserved)  d->sub->fn->release(d->sub, 0);
+    subscribe_data_free(d);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t group_subscribe_channel_limit_check(ngx_int_t _, nchan_group_t *shm_group, subscribe_data_t *d) {
+  ngx_int_t    rc = NGX_OK;
+  DBG("group subscribe limit check");
+  if(d->sub->status != DEAD) {
+    if(shm_group) {
+      if(!shm_group->limit.channels || (shm_group->channels < shm_group->limit.channels)) {
+        d->group_channel_limit_pass = 1;
+        rc = nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
+      }
+      else if (shm_group->limit.channels && shm_group->channels == shm_group->limit.channels){
+        //no new channels!
+        rc = nchan_store_find_channel(d->channel_id, d->sub->cf, (callback_pt )group_subscribe_channel_limit_reached, d);
+      }
+      else {
+        rc = nchan_store_subscribe_continued(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
+      }
+      
+    }
+    else {
+      //well that's unusual...
+      ERR("coldn't find group for group_subscribe_channel_limit_check");
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+      if(d->reserved)  d->sub->fn->release(d->sub, 0);
+      subscribe_data_free(d);
+      rc = NGX_ERROR;
+    }
+  }
+  else {
+    if(d->reserved)  d->sub->fn->release(d->sub, 0);
+    subscribe_data_free(d);
+  }
+  return rc;
+}
+
+static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
+  memstore_channel_head_t       *chanhead = NULL;
+  int                            retry_null_chanhead = 1;
+  //store_message_t             *chmsg;
+  //nchan_msg_status_t           findmsg_status;
+  ngx_int_t                      check_redis = d->sub->cf->redis.enabled; // for BACKUP and DISTRIBUTED mode
+  nchan_loc_conf_t              *cf = d->sub->cf;
+  ngx_int_t                      rc = NGX_OK;
+  nchan_request_ctx_t           *ctx = NULL;
+  
+  if(d->sub->status == DEAD) {
+    if(d->reserved) {
+      d->sub->fn->release(d->sub, 0);
+      d->reserved = 0;
+    }
+    subscribe_data_free(d);
+    return rc;
+  }
+  
+  if(d->sub->request) {
+    ctx = ngx_http_get_module_ctx(d->sub->request, ngx_nchan_module);
+  }
+  
+  switch(channel_status) {
+    case SUB_CHANNEL_AUTHORIZED:
+      if(cf->group.enable_accounting) {
+        //now we dance the careful dance of making sure the group channel limit is not exceeded
+        //it isn't a pretty dance.
+        if(d->group_channel_limit_pass || d->channel_exists) {
+          //already checked, or no need to check
+          chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
+          retry_null_chanhead = 0;
+          if(!chanhead) rc = NGX_ERROR;
+        }
+        else if((chanhead = nchan_memstore_find_chanhead(d->channel_id)) != NULL) {
+          //well, the channel exists already, so using it won't exceed the limit
+          d->group_channel_limit_pass = 1;
+        }
+        else {
+          //can't find the channel. gotta check if it really does exist
+          DBG("can't find the channel. gotta check if it really does exist");
+          if(ctx) {
+            if(!d->reserved) {
+              d->sub->fn->reserve(d->sub);
+              d->reserved = 1;
+            }
+            return memstore_group_find(groups, nchan_get_group_name(d->sub->request, cf, ctx), (callback_pt )group_subscribe_channel_limit_check, d);
+          }
+          else {
+            retry_null_chanhead = 0;
+            rc = NGX_ERROR;
+            chanhead = NULL;
+          }
+        }
+      }
+      else {
+        chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
+        if(!chanhead) rc = NGX_ERROR;
+        retry_null_chanhead = 0;
+      }
+      break;
+    
+    case SUB_CHANNEL_UNAUTHORIZED:
+      chanhead = NULL;
+      break;
+    
+    case SUB_CHANNEL_NOTSURE:
+      if(check_redis) {
+        if(cf->subscribe_only_existing_channel) {
+          //we used to also check if cf->max_channel_subscribers == 0 here, but that's
+          //no longer necessary, as the shared subscriber total check is now disabled
+          if((chanhead = nchan_memstore_find_chanhead(d->channel_id)) != NULL) {
+            break;
+          }
+        }
+        nchan_store_redis.find_channel(d->channel_id, cf, redis_subscribe_channel_existence_callback, d);
+        return rc;
+      }
+      else {
+        chanhead = nchan_memstore_find_chanhead(d->channel_id);
+      }
+      break;
+  }
+  
+
+  if ((channel_status == SUB_CHANNEL_UNAUTHORIZED) || 
+      (!chanhead && cf->subscribe_only_existing_channel) ||
+      (chanhead && cf->max_channel_subscribers > 0 && chanhead->shared && chanhead->shared->sub_count >= (ngx_uint_t )cf->max_channel_subscribers)) {
+    
+    d->sub->fn->respond_status(d->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+    
+    if(d->reserved) {
+      d->sub->fn->release(d->sub, 0);
+      d->reserved = 0;
+    }
+    
+    //sub should be destroyed by now.
+    
+    d->sub = NULL; //debug
+    //d->cb(NGX_HTTP_NOT_FOUND, NULL, d->cb_privdata);
+    subscribe_data_free(d);
+    return rc;
+  }
+  else if(!chanhead && retry_null_chanhead) {
+    chanhead = nchan_memstore_get_chanhead(d->channel_id, cf);
+  }
+  
+  if(!chanhead) { //nchan_memstore_get_chanhead could fail when out of shared memory
+      rc = NGX_ERROR;
+  }
+  
+  d->chanhead = chanhead;
+  
+  if(d->reserved) {
+    d->sub->fn->release(d->sub, 1);
+    d->reserved = 0;
+  }
+  if(chanhead) {
+    
+    //check message id appropriateness
+    if(!nchan_msgid_tagcount_match(&d->sub->last_msgid, chanhead->multi ? chanhead->multi_count : 1)) {
+      d->sub->fn->reserve(d->sub);
+      d->sub->fn->respond_status(d->sub, NGX_HTTP_BAD_REQUEST, NULL, NULL);
+      d->sub->fn->release(d->sub, 0);
+    }
+    else if(cf->group.enable_accounting || chanhead->groupnode) {
+      //per-group max subscriber check
+      DBG("per-group max subscriber check");
+      assert(d->allocd);
+      d->sub->fn->reserve(d->sub);
+      d->reserved = 1;
+      memstore_chanhead_reserve(chanhead, "group accounting check");
+      if(chanhead->groupnode) {
+        DBG("memstore_group_find_from_groupnode(groups, chanhead->groupnode, (callback_pt )group_subscribe_accounting_check, d) sub: %p", d->sub);
+        memstore_group_find_from_groupnode(groups, chanhead->groupnode, (callback_pt )group_subscribe_accounting_check, d);
+      }
+      else {
+        if(ctx) {
+          // this means group accounting was disabled when the channel was created.
+          // that's okay though, we should check it anyway.
+          DBG("memstore_group_find(groups, nchan_get_group_name(d->sub->request, cf, ctx), (callback_pt )group_subscribe_accounting_check, d); sub: %p", d->sub);
+          memstore_group_find(groups, nchan_get_group_name(d->sub->request, cf, ctx), (callback_pt )group_subscribe_accounting_check, d);
+        }
+        else {
+          d->sub->fn->respond_status(d->sub, NGX_HTTP_BAD_REQUEST, NULL, NULL);
+          subscribe_data_free(d);
+          return NGX_ERROR;
+        }
+      }
+      return rc;
+    }
+    else {
+      chanhead->spooler.fn->add(&chanhead->spooler, d->sub);
+    }
+  }
+  else {
+    //out-of-memory condition
+    d->sub->fn->respond_status(d->sub, NGX_HTTP_INSUFFICIENT_STORAGE, NULL, NULL);
+  }
+
+  subscribe_data_free(d);
+
+  return rc;
+}
+
+static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
+
+typedef struct get_multi_message_data_s get_multi_message_data_t;
+struct get_multi_message_data_s {
+  memstore_channel_head_t     *chanhead;
+  nchan_msg_status_t           msg_status;
+  nchan_msg_t                 *msg;
+  ngx_int_t                    n;
+  
+  nchan_msg_id_t               wanted_msgid;
+  ngx_int_t                    getting;
+  ngx_int_t                    multi_count;
+  
+  ngx_event_t                  timer; 
+  
+  time_t                       expired;
+  
+  callback_pt                  cb;
+  void                        *privdata;
+};
+
+typedef struct {
+  ngx_int_t                   n;
+  get_multi_message_data_t   *d;
+} get_multi_message_data_single_t;
+
+typedef struct {
+  get_multi_message_data_t         d;
+  get_multi_message_data_single_t  sd;
+} get_multi_message_data_blob_t;
+
+static ngx_inline void set_multimsg_msg(get_multi_message_data_t *d, get_multi_message_data_single_t *sd, nchan_msg_t *msg, nchan_msg_status_t status) {
+  d->msg_status = status;
+  if(d->msg) msg_release(d->msg, "get multi msg");
+  d->msg = msg;
+  if(msg) assert(msg_reserve(msg, "get multi msg") == NGX_OK);
+  d->n = sd->n;
+  d->msg_status = status;
+}
+
+static ngx_int_t nchan_store_async_get_multi_message_callback(ngx_int_t code, void *d, void *pd);
+
+static ngx_int_t nchan_store_async_get_multi_message_callback_cleanup(get_multi_message_data_t *d) {
+  if(d->getting == 0) {
+    nchan_free_msg_id(&d->wanted_msgid);
+    if(d->timer.timer_set) {
+      ngx_del_timer(&d->timer);
+    }
+    ngx_free(d);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_async_get_multi_message_callback(ngx_int_t code, void *ptr, void *pd) {
+  nchan_msg_status_t          status = code;
+  nchan_msg_t                *msg = ptr;
+  get_multi_message_data_single_t *sd = pd;
+  
+  static int16_t              multi_largetag[NCHAN_MULTITAG_MAX], multi_prevlargetag[NCHAN_MULTITAG_MAX];
+  //ngx_str_t                   empty_id_str = ngx_string("-");
+  get_multi_message_data_t   *d = sd->d;
+  nchan_msg_t                 retmsg;
+  
+  /*
+  switch(status) {
+    case MSG_FOUND:
+      ERR("multi[%i] of %i msg FOUND (getting: %i) %V %p", sd->n, d->multi_count, d->getting, msgid_to_str(&msg->id), msg);
+      break;
+    default: 
+      ERR("multi[%i] of %i msg %s (getting: %i)", sd->n, d->multi_count, nchan_msgstatus_to_str(status), d->getting);
+  }
+  */
+  if(d->expired) {
+    ERR("multimsg callback #%i for %p received after expiring at %ui status %i msg %p", d->n, d, d->expired, status, msg);
+    d->getting--;
+    return nchan_store_async_get_multi_message_callback_cleanup(d);
+  }
+  d->getting--;
+  
+  if(d->msg_status == MSG_PENDING) {
+    set_multimsg_msg(d, sd, msg, status);
+  }
+  else if(msg) {
+    if(d->msg == NULL) {
+      //DBG("first response: %V (n:%i) %p", d->msg ? msgid_to_str(&d->msg->id) : &empty_id_str, d->n, d->msg);
+      set_multimsg_msg(d, sd, msg, status); 
+    }
+    else {
+      //DBG("prev best response: %V (n:%i) %p", d->msg ? msgid_to_str(&d->msg->id) : &empty_id_str, d->n, d->msg);
+      
+      assert(d->wanted_msgid.time <= msg->id.time);
+      
+      if(msg->id.time < d->msg->id.time) {
+        set_multimsg_msg(d, sd, msg, status);
+      }
+      else if((msg->id.time == d->msg->id.time && msg->id.tag.fixed[0] <  d->msg->id.tag.fixed[0]) 
+           || (msg->id.time == d->msg->id.time && msg->id.tag.fixed[0] == d->msg->id.tag.fixed[0] && sd->n < d->n) ) {
+        
+        //DBG("got a better response %V (n:%i), replace.", msgid_to_str(&msg->id), sd->n);
+        set_multimsg_msg(d, sd, msg, status);    
+      }
+      //else {
+      //  DBG("got a worse response %V (n:%i), keep prev.", msgid_to_str(&msg->id), sd->n);
+      //}
+    }
+  }
+  else if(d->msg == NULL && d->msg_status != MSG_EXPECTED) {
+    d->msg_status = status;
+  }
+  
+  if(d->getting == 0) {
+    //got all the messages we wanted
+    memstore_chanhead_release(d->chanhead, "multimsg");
+    if(d->msg) {
+      int16_t      *muhtags;
+      ngx_int_t     n = d->n;
+      
+      assert(d->msg->id.tagcount == 1);
+      
+      nchan_msg_derive_stack(d->msg, &retmsg, NULL);
+      
+      nchan_copy_msg_id(&retmsg.prev_id, &d->wanted_msgid, multi_prevlargetag);
+      
+      //TODO: some kind of missed-message check maybe?
+      
+      if (d->wanted_msgid.time != d->msg->id.time) {
+        nchan_copy_msg_id(&retmsg.id, &d->msg->id, NULL);
+        
+        if(d->multi_count > NCHAN_FIXED_MULTITAG_MAX) {
+          retmsg.id.tag.allocd = multi_largetag;
+          retmsg.id.tag.allocd[0] = d->msg->id.tag.fixed[0];
+        }
+        retmsg.id.tagcount = d->multi_count;
+        nchan_expand_msg_id_multi_tag(&retmsg.id, 0, n, -1);
+      }
+      else {
+        nchan_copy_msg_id(&retmsg.id, &d->wanted_msgid, multi_largetag); 
+      }
+      
+      muhtags = (d->multi_count > NCHAN_FIXED_MULTITAG_MAX) ? retmsg.id.tag.allocd : retmsg.id.tag.fixed;
+      muhtags[n] = d->msg->id.tag.fixed[0];
+      
+      retmsg.id.tagactive = n;
+      
+      //DBG("respond msg id transformed into %p %V", &retmsg.copy, msgid_to_str(&retmsg.copy.id));
+      
+      d->cb(d->msg_status, &retmsg, d->privdata);
+      
+      msg_release(d->msg, "get multi msg");
+    }
+    else {
+      d->cb(d->msg_status, NULL, d->privdata);
+    }
+  }
+
+  return nchan_store_async_get_multi_message_callback_cleanup(d);
+}
+
+static void get_multimsg_timeout(ngx_event_t *ev) {
+  get_multi_message_data_t    *d = (get_multi_message_data_t *)ev->data;
+  WARN("multimsg %p timeout!!", d);
+  d->expired = ngx_time();
+  
+  memstore_chanhead_release(d->chanhead, "multimsg");
+  //don't free it, a multimsg callback might arrive late. ngx_free(d);
+}
+
+static ngx_int_t nchan_store_async_get_multi_message(ngx_str_t *chid, nchan_msg_id_t *msg_id, callback_pt callback, void *privdata) {
+  
+  memstore_channel_head_t     *chead;
+  memstore_multi_t            *multi = NULL;
+  
+  ngx_int_t                    n;
+  uint8_t                      want[NCHAN_MULTITAG_MAX];
+  ngx_str_t                    ids[NCHAN_MULTITAG_MAX];
+  nchan_msg_id_t               req_msgid[NCHAN_MULTITAG_MAX];
+  
+  nchan_msg_id_t              *lastid;
+  ngx_str_t                   *getmsg_chid;
+  ngx_int_t                    getting = 0;
+  
+  ngx_int_t                    i;
+  
+  ngx_memzero(req_msgid, sizeof(req_msgid));
+  
+  if((chead = nchan_memstore_get_chanhead(chid, &default_multiconf)) == NULL) {
+    //probably out of memory
+    callback(MSG_EXPECTED, NULL, privdata); // this is a lie.
+    return NGX_ERROR;
+  }
+  
+  n = chead->multi_count;
+  
+  multi = chead->multi;
+  
+  //init loop
+  for(i = 0; i < n; i++) {
+    want[i] = 0;
+  }
+  
+  //DBG("get multi msg %V (count: %i)", msgid_to_str(msg_id), n);
+  if(msg_id->time == 0) {
+    for(i = 0; i < n; i++) {
+      assert(nchan_extract_from_multi_msgid(msg_id, i, &req_msgid[i]) == NGX_OK);
+      want[i] = 1;
+    }
+    getting = n;
+    //DBG("want all msgs");
+  }
+  else {
+    //what msgids do we want?
+    for(i = 0; i < n; i++) {
+      assert(nchan_extract_from_multi_msgid(msg_id, i, &req_msgid[i]) == NGX_OK);
+      //DBG("might want msgid %V from chan_index %i", msgid_to_str(&req_msgid[i]), i);
+    }
+    
+    //what do we need to fetch?
+    for(i = 0; i < n; i++) {
+      lastid = &multi[i].sub->last_msgid;
+      //DBG("chan index %i last id %V", i, msgid_to_str(lastid));
+      if(lastid->time == 0 
+        || lastid->time == -1
+        || lastid->time > req_msgid[i].time
+        || (lastid->time == req_msgid[i].time && lastid->tag.fixed[0] >= req_msgid[i].tag.fixed[0])) {
+        want[i]=1;
+        getting++;
+        DBG("want %i", i);
+      }
+      else {
+        DBG("Do not want %i", i);
+      }
+    }
+  }
+  
+  if(getting == 0) { //don't need to explicitly fetch messages, we know all the responses will be MSG_EXPECTED
+    DBG("don't need to explicitly fetch messages for %V (msgid %V), we know all the responses will be MSG_EXPECTED", chid, msgid_to_str(msg_id));
+    callback(MSG_EXPECTED, NULL, privdata);
+    return NGX_OK;
+  }
+  
+  memstore_chanhead_reserve(chead, "multimsg");
+  
+  get_multi_message_data_t         *d;
+  get_multi_message_data_single_t  *sd;
+  get_multi_message_data_blob_t    *dblob = ngx_alloc(sizeof(*dblob) + sizeof(*sd)*(getting - 1), ngx_cycle->log);
+  assert(dblob);
+  d = &dblob->d;
+  sd = &dblob->sd;
+  
+  d->cb = callback;
+  d->privdata = privdata;
+  d->multi_count = n;
+  d->msg_status = getting == n ? MSG_PENDING : MSG_EXPECTED;
+  d->msg = NULL;
+  d->n = -1;
+  d->getting = getting;
+  d->chanhead = chead;
+  d->expired = 0;
+  
+  ngx_memzero(&d->timer, sizeof(d->timer));
+  nchan_init_timer(&d->timer, get_multimsg_timeout, d);
+  ngx_add_timer(&d->timer, 20000);
+  
+  nchan_copy_new_msg_id(&d->wanted_msgid, msg_id);
+  
+  //do it.
+  for(i = 0; i < n; i++) {
+    if(want[i]) {
+      ngx_memzero(sd, sizeof(*sd));
+      sd->d = d;
+      sd->n = i;
+      
+      getmsg_chid = (multi == NULL) ? &ids[i] : &multi[i].id;
+      //DBG("get message from %V (n: %i) %V", getmsg_chid, i, msgid_to_str(&req_msgid[i]));
+      nchan_store_async_get_message(getmsg_chid, &req_msgid[i], chead->cf, nchan_store_async_get_multi_message_callback, sd);
+      sd++;
+    }
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t getmsg_proxy_completebuffer_callback(ngx_int_t code, nchan_msg_t *msg, void *data) {
+  return nchan_memstore_handle_get_message_reply(msg, code, data);
+}
+
+static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  store_message_t             *chmsg;
+  ngx_int_t                    owner = memstore_channel_owner(channel_id);
+  subscribe_data_t            *d; 
+  nchan_msg_status_t           findmsg_status;
+  memstore_channel_head_t     *chead;
+  
+  if(callback==NULL) {
+    ERR("no callback given for async get_message. someone's using the API wrong!");
+    return NGX_ERROR;
+  }
+  
+  if(nchan_channel_id_is_multi(channel_id)) {
+    return nchan_store_async_get_multi_message(channel_id, msg_id, callback, privdata);
+  }
+  
+  chead = nchan_memstore_find_chanhead(channel_id);
+  
+  d = subscribe_data_alloc(owner);
+  d->channel_owner = owner;
+  d->channel_id = channel_id;
+  d->cb = callback;
+  d->cb_privdata = privdata;
+  d->sub = NULL;
+  d->msg_id = *msg_id;
+  d->chanhead = chead;
+  
+  if(memstore_slot() != owner) {
+    //check if we need to ask for a message
+    if(memstore_ipc_send_get_message(d->channel_owner, d->channel_id, &d->msg_id, d) == NGX_DECLINED) {
+      subscribe_data_free(d);
+      callback(MSG_ERROR, NULL, privdata);
+      return NGX_ERROR;
+    }
+  }
+  else if(!chead->msg_buffer_complete) {
+    assert(d->allocd == 1); //let's assume subscribe_data_alloc always allocates
+    subscriber_t *getmsg_sub = getmsg_proxy_subscriber_create(msg_id, (callback_pt )getmsg_proxy_completebuffer_callback, d);
+    if(getmsg_sub == NULL) {
+      ERR("Unable to create getmsg proxy sub for async get_message");
+      subscribe_data_free(d);
+      callback(MSG_ERROR, NULL, privdata);
+      return NGX_ERROR;
+    }
+    if(chead->spooler.fn->add(&chead->spooler, getmsg_sub) != NGX_OK) {
+      ERR("Unable to subscribe getmsg sub for async get_message");
+      subscribe_data_free(d);
+      callback(MSG_ERROR, NULL, privdata);
+      return NGX_ERROR;
+    }
+    return NGX_OK;
+  }
+  else {
+    chmsg = chanhead_find_next_message(d->chanhead, &d->msg_id, &findmsg_status);
+    return nchan_memstore_handle_get_message_reply(chmsg == NULL ? NULL : chmsg->msg, findmsg_status, d);
+  }
+  
+  return NGX_OK; //async only now!
+}
+
+ngx_int_t nchan_memstore_handle_get_message_reply(nchan_msg_t *msg, nchan_msg_status_t findmsg_status, void *data) {
+  subscribe_data_t           *d = (subscribe_data_t *)data;
+  //memstore_channel_head_t    *chanhead = d->chanhead;
+  d->cb(findmsg_status, msg, d->cb_privdata);
+  
+  subscribe_data_free(d);
+  return NGX_OK;
+}
+
+static ngx_int_t chanhead_push_message(memstore_channel_head_t *ch, store_message_t *msg) {
+  msg->next = NULL;
+  msg->prev = ch->msg_last;
+  
+  assert(msg->msg->id.tagcount == 1);
+  
+  if(msg->prev != NULL) {
+    msg->prev->next = msg;
+    msg->msg->prev_id = msg->prev->msg->id;
+  }
+  else {
+    msg->msg->prev_id.time = 0;
+    msg->msg->prev_id.tag.fixed[0] = 0;
+    msg->msg->prev_id.tagcount = 1;
+  }
+  
+  //set time and tag
+  if(msg->msg->id.time == 0) {
+    msg->msg->id.time = ngx_time();
+  }
+  if(ch->msg_last && ch->msg_last->msg->id.time == msg->msg->id.time) {
+    msg->msg->id.tag.fixed[0] = ch->msg_last->msg->id.tag.fixed[0] + 1;
+  }
+  else if(!ch->cf->redis.enabled || ch->cf->redis.storage_mode < REDIS_MODE_DISTRIBUTED) { //TODO: check this logic
+    msg->msg->id.tag.fixed[0] = 0;
+  }
+
+  if(ch->msg_first == NULL) {
+    ch->msg_first = msg;
+  }
+  ngx_atomic_fetch_add(&ch->shared->stored_message_count, 1);
+  ngx_atomic_fetch_add(&ch->shared->total_message_count, 1);
+
+  if(ch->groupnode) {
+    memstore_group_add_message(ch->groupnode, msg->msg);
+  }
+  
+  ch->msg_last = msg;
+  
+  //DBG("create %V %V", msgid_to_str(&msg->msg->id), chanhead_msg_to_str(msg));
+  memstore_chanhead_messages_gc(ch);
+  if(ch->msg_last != msg) { //why does this happen?
+    ERR("just-published messages is no longer the last message for some reason... This is unexpected.");
+  }
+  return ch->msg_last == msg ? NGX_OK : NGX_ERROR;
+}
+
+static u_char* copy_preallocated_str_to_cur(ngx_str_t *dst, ngx_str_t *src, u_char *cur) {
+  size_t   sz = src->len;
+  dst->len = sz; 
+  if(sz > 0) {
+    dst->data = cur;
+    ngx_memcpy(dst->data, src->data, sz);
+  }
+  else {
+    dst->data = NULL;
+  }
+  return cur + sz;
+}
+
+static size_t memstore_buf_memsize(ngx_buf_t *buf) {
+  size_t buf_size = 0;
+  if(ngx_buf_in_memory_only(buf)) {
+    buf_size += ngx_buf_size(buf);
+  }
+  if(buf->in_file && buf->file != NULL) {
+    buf_size = sizeof(ngx_file_t) + buf->file->name.len + 1; //+1 to ensure NUL-terminated filename string
+  }
+  return buf_size;
+}
+
+size_t memstore_msg_memsize(nchan_msg_t *m) {
+  size_t                  total_sz, buf_contents_size = 0, content_type_size = 0, eventsource_event_size = 0, compressed_sz = 0;
+  ngx_buf_t              *mbuf = &m->buf;
+  if(m->eventsource_event)
+    eventsource_event_size += m->eventsource_event->len + sizeof(ngx_str_t);
+  if(m->content_type)
+    content_type_size += m->content_type->len + sizeof(ngx_str_t);
+  
+  buf_contents_size = memstore_buf_memsize(mbuf);
+  
+  if(m->compressed) {
+    compressed_sz += sizeof(nchan_compressed_msg_t) + memstore_buf_memsize(&m->compressed->buf);
+  }
+  
+  total_sz = sizeof(nchan_msg_t) + (buf_contents_size + content_type_size + eventsource_event_size + compressed_sz);
+#if NCHAN_MSG_LEAK_DEBUG
+  size_t    debug_sz = m->lbl.len;
+  total_sz += debug_sz;
+#endif
+  
+  return total_sz;
+}
+
+static u_char *copy_buf_contents(ngx_buf_t *in, ngx_buf_t *out, u_char *rest) {
+  size_t buf_mem_body_size = 0;
+  
+  if(in->file!=NULL) {
+    out->file = (ngx_file_t *)rest;
+    *out->file = *in->file;
+    out->file->fd = NGX_INVALID_FILE;
+    out->file->log = ngx_cycle->log;
+    
+    rest = (u_char *)&out->file[1];
+    rest = copy_preallocated_str_to_cur(&out->file->name, &in->file->name, rest);
+    //ensure last char is NUL
+    *(rest++) = '\0';
+  }
+  
+  if(ngx_buf_in_memory_only(in)) {
+    buf_mem_body_size = ngx_buf_size(in);
+  }
+  
+  if(buf_mem_body_size > 0) {
+    ngx_str_t   dst_str, src_str = {buf_mem_body_size, in->pos};
+    
+    rest = copy_preallocated_str_to_cur(&dst_str, &src_str, rest);
+    
+    out->pos = dst_str.data;
+    out->last = out->pos + dst_str.len;
+    out->start = out->pos;
+    out->end = out->last;
+  }
+  
+  return rest;
+}
+
+//#define NCHAN_CREATE_SHM_MSG_DEBUG 1
+
+static nchan_msg_t *create_shm_msg(nchan_msg_t *m) {
+  nchan_msg_t             *msg;
+  ngx_buf_t               *mbuf = NULL;
+  u_char                  *cur;
+  size_t                   memsize = memstore_msg_memsize(m);
+
+#if NCHAN_CREATE_SHM_MSG_DEBUG
+  memsize += 5;
+#endif
+  mbuf = &m->buf;
+    
+  if((msg = shm_alloc(shm, memsize, "message")) == NULL) {
+    nchan_log_ooshm_error("allocating message of size %i", memsize);
+    return NULL;
+  }
+  
+#if NCHAN_CREATE_SHM_MSG_DEBUG
+  cur = (u_char *)msg;
+  cur[memsize+1]='e';
+  cur[memsize+2]='n';
+  cur[memsize+3]='d';
+  cur[memsize+4]='\0';
+#endif
+  
+  cur = (u_char *)&msg[1];
+  assert(m->id.tagcount == 1);
+  
+  *msg = *m;
+  
+  if(m->content_type) {
+    msg->content_type = (ngx_str_t *)cur;
+    cur = (u_char *)(&msg->content_type[1]);
+    cur = copy_preallocated_str_to_cur(msg->content_type, m->content_type, cur);
+  }
+  else {
+    msg->content_type = NULL;
+  }
+  
+  if(m->eventsource_event) {
+    msg->eventsource_event = (ngx_str_t *)cur;
+    cur = (u_char *)(&msg->eventsource_event[1]);
+    cur = copy_preallocated_str_to_cur(msg->eventsource_event, m->eventsource_event, cur);
+  }
+  else {
+    msg->eventsource_event = NULL;
+  }
+  
+  cur = copy_buf_contents(mbuf, &msg->buf, cur);
+  msg->buf.last_buf = 1;
+  
+  msg->storage = NCHAN_MSG_SHARED;
+  msg->parent = NULL;
+  
+  if(m->compressed) {
+    msg->compressed = (nchan_compressed_msg_t *)cur;
+    cur = (u_char *)&msg->compressed[1];
+    *msg->compressed = *m->compressed;    
+    cur = copy_buf_contents(&m->compressed->buf, &msg->compressed->buf, cur);
+    msg->compressed->buf.last_buf = 1;
+  }
+  
+#if NCHAN_MSG_RESERVE_DEBUG
+  msg->rsv = NULL;
+#endif
+#if NCHAN_MSG_LEAK_DEBUG 
+  assert((u_char *)msg + memsize == cur + m->lbl.len);
+  msg->lbl.len = m->lbl.len;
+  msg->lbl.data = cur;
+  ngx_memcpy(msg->lbl.data, m->lbl.data, msg->lbl.len);
+  
+  msg_debug_add(msg);
+#endif
+#if NCHAN_CREATE_SHM_MSG_DEBUG
+  assert(ngx_memcmp(((u_char *)msg) + memsize + 1, "end", 4) == 0);
+#endif
+  return msg;
+}
+
+static store_message_t *create_shared_message(nchan_msg_t *m, ngx_int_t msg_already_in_shm) {
+  store_message_t          *chmsg;
+  nchan_msg_t              *msg;
+  
+  if(msg_already_in_shm) {
+    msg = m;
+  }
+  else {
+    if((msg=create_shm_msg(m)) == NULL ) {
+      return NULL;
+    }
+  }
+  if((chmsg = ngx_alloc(sizeof(*chmsg), ngx_cycle->log)) != NULL) {
+    chmsg->prev = NULL;
+    chmsg->next = NULL;
+    chmsg->msg  = msg;
+  }
+  return chmsg;
+}
+
+typedef struct {
+  uint16_t              n;
+  ngx_int_t             rc;
+  nchan_channel_t       ch;
+  callback_pt           callback;
+  void                 *privdata;
+} publish_multi_data_t;
+
+static ngx_int_t publish_multi_callback(ngx_int_t status, void *rptr, void *privdata) {
+  nchan_channel_t       *ch = rptr;
+  publish_multi_data_t  *pd = privdata;
+  static nchan_msg_id_t  empty_msgid = NCHAN_ZERO_MSGID;
+  
+  if(status == NGX_HTTP_INTERNAL_SERVER_ERROR || (status == NCHAN_MESSAGE_RECEIVED && pd->rc != NGX_HTTP_INTERNAL_SERVER_ERROR)) {
+    pd->rc = status;
+  }
+  
+  if(ch) {
+    if(pd->ch.last_seen < ch->last_seen) {
+      pd->ch.last_seen = ch->last_seen;
+    }
+    
+    if(pd->ch.messages < ch->messages) {
+      pd->ch.messages = ch->messages;
+    }
+    
+    pd->ch.subscribers += ch->subscribers;
+  }
+  
+  pd->n--;
+  
+  if(pd->n == 0) {
+    pd->ch.last_published_msg_id = empty_msgid;
+    pd->callback(pd->rc, &pd->ch, pd->privdata);
+    ngx_free(pd);
+  }
+  
+  return NGX_OK;
+}
+
+typedef struct {
+  ngx_str_t        *chid;
+  ngx_str_t         groupname;
+  nchan_msg_t      *msg;
+  nchan_loc_conf_t *cf;
+  callback_pt       cb;
+  void             *pd;
+} group_publish_accounting_check_data_t;
+
+static ngx_int_t group_publish_accounting_channelcheck(ngx_int_t rc, nchan_channel_t *chaninfo, group_publish_accounting_check_data_t *d) {
+  if(chaninfo) {
+    //channel already exists. we may proceed.
+    nchan_store_publish_message_generic(d->chid, d->msg, 0, d->cf, d->cb, d->pd);
+  }
+  else {
+    char *err = "Group limit reached for number of channels.";
+    nchan_log_warning("%s (group %V)", err, &d->groupname);
+    d->cb(NGX_HTTP_FORBIDDEN, err, d->pd);
+  }
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static ngx_int_t group_publish_accounting_check(ngx_int_t rc, nchan_group_t *shm_group, group_publish_accounting_check_data_t *d) {
+  int     n;
+  int     ok = 0;
+  ssize_t msg_sz;
+  char   *err = "unknown error";
+  
+  
+  if(!shm_group) {
+    ERR("couldn't find group %V for publishing accounting check.", &d->groupname);
+    d->cb(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->pd);
+    ngx_free(d);
+    return NGX_ERROR;
+  }
+  
+  if((ok = !shm_group->limit.messages || shm_group->messages < shm_group->limit.messages) == 0) {
+    err = "Group limit reached for number of messages.";
+  }
+
+  if(ok && shm_group->limit.messages_shmem_bytes) {
+    n = count_channel_id(d->chid);
+    msg_sz = memstore_msg_memsize(d->msg);
+    ok = (shm_group->messages_shmem_bytes + n * msg_sz) <= shm_group->limit.messages_shmem_bytes;
+    if(!ok) err = "Group limit reached for memory used by messages.";
+  }
+  
+  if(ok && shm_group->limit.messages_file_bytes) {
+    ok = shm_group->messages_file_bytes + ngx_buf_size((&d->msg->buf)) <= shm_group->limit.messages_file_bytes;
+    // no need to multiply ngx_buf_size by n because the file is shared for all the messages.
+    if(!ok) err = "Group limit reached for disk space used by messages.";
+  }
+  
+  if(ok && shm_group->limit.channels) {
+    //channel check
+    if(shm_group->channels + 1 == shm_group->limit.channels) {
+      //need to check if publishing will create a channel
+      memstore_channel_head_t *ch;
+      
+      //first try it the easy way
+      ch = nchan_memstore_find_chanhead(d->chid);
+      if(!ch) {
+        //this is going to be kind of costly...
+        nchan_store_find_channel(d->chid, d->cf, (callback_pt )group_publish_accounting_channelcheck, d);
+        return NGX_OK;
+      }
+    }
+    else if(shm_group->channels >= shm_group->limit.channels) {
+      ok = 0;
+      err = "Group limit reached for number of channels.";
+    }
+  }
+  
+  if(ok) {
+    ngx_int_t pub_rc = nchan_store_publish_message_generic(d->chid, d->msg, 0, d->cf, d->cb, d->pd);
+    if(pub_rc == NGX_DECLINED) { //out of memory probably
+      d->cb(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, d->pd);
+    }
+  }
+  else {
+    nchan_log_warning("%s (group %V)", err, &d->groupname);
+    d->cb(NGX_HTTP_FORBIDDEN, err, d->pd);
+  }
+  
+  ngx_free(d);
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t *msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  if(cf->group.enable_accounting) {
+    // it might be better to do this later when a chanhead is available,
+    // so we can avoid the group lookup in the group-tree and use chanhead->groupnode.
+    
+    // but the code is much cleaner doing it the less efficient way, and I don't think
+    // publishing is really going to be a bottleneck. Still, a possible TODO for later.
+    group_publish_accounting_check_data_t  *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+    if(d == NULL) {
+      ERR("Couldn't allocate data for group publishing check");
+      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
+      return NGX_ERROR;
+    }
+    
+    d->chid = channel_id;
+    d->groupname = nchan_get_group_from_channel_id(channel_id);
+    d->msg = msg;
+    d->cf = cf;
+    d->cb = callback;
+    d->pd = privdata;
+    
+    return memstore_group_find(groups, &d->groupname, (callback_pt )group_publish_accounting_check, d);
+  }
+  else {
+    return nchan_store_publish_message_generic(channel_id, msg, 0, cf, callback, privdata);
+  }
+}
+
+static void fill_message_timedata(nchan_msg_t *msg, time_t timeout) {
+  if(msg->id.time == 0) {
+    // cached time is okay to use here, because this is the channel owner.
+    // even if it's a second behind, so will the previous messages. 
+    // monotonicity is still preserved.
+    msg->id.time = ngx_time();
+  }
+  if(msg->expires == 0) {
+    msg->expires = msg->id.time + timeout;
+  }
+}
+
+static ngx_int_t nchan_store_publish_message_to_single_channel_id(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  memstore_channel_head_t  *chead;
+  
+  if(callback == NULL) {
+    callback = empty_callback;
+  }
+  
+  if(cf->redis.enabled) {
+    fill_message_timedata(msg, nchan_loc_conf_message_timeout(cf));
+    
+    if(cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+      assert(!msg_in_shm);
+      return nchan_store_redis.publish(channel_id, msg, cf, callback, privdata);
+    }
+    //BACKUP mode gets published later
+  }
+  
+  if((chead = nchan_memstore_get_chanhead(channel_id, cf)) == NULL) {
+    //ERR("can't get chanhead for id %V", channel_id);
+    //we probably just ran out of shared memory
+    callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+    return NGX_ERROR;
+  }
+  
+  return nchan_store_chanhead_publish_message_generic(chead, msg, msg_in_shm, cf, callback, privdata);
+}
+
+ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  ngx_int_t   rc;
+  if(nchan_channel_id_is_multi(channel_id)) {
+    ngx_int_t             i, n = 0;
+    ngx_str_t             ids[NCHAN_MULTITAG_MAX];
+    ngx_int_t             trc=NGX_OK;
+    publish_multi_data_t *pd;
+    if((pd = ngx_alloc(sizeof(*pd), ngx_cycle->log)) == NULL) {
+      ERR("can't allocate publish multi chanhead data");
+      return NGX_ERROR;
+    }
+    
+    n = parse_multi_id(channel_id, ids);
+    
+    pd->callback = callback;
+    pd->privdata = privdata;
+    pd->n = n;
+    pd->rc = NCHAN_MESSAGE_QUEUED;
+    ngx_memzero(&pd->ch, sizeof(pd->ch));
+    
+    for(i=0; i<n; i++) {
+      rc = nchan_store_publish_message_to_single_channel_id(&ids[i], msg, msg_in_shm, cf, publish_multi_callback, pd);
+      if(rc != NGX_OK) {
+        trc = rc;
+      }
+    }
+    return trc;
+  }
+  else {
+    return nchan_store_publish_message_to_single_channel_id(channel_id, msg, msg_in_shm, cf, callback, privdata);
+  }
+}
+
+ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *chead, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  nchan_channel_t              channel_info;
+  store_message_t             *shmsg_link;
+  nchan_msg_t                 *publish_msg;
+  ngx_int_t                    owner = chead->owner;
+  ngx_int_t                    rc;
+  time_t                       timeout = nchan_loc_conf_message_timeout(cf);
+  
+  if(callback == NULL) {
+    callback = empty_callback;
+  }
+
+  assert(msg->id.tagcount == 1);
+  
+  assert(!cf->redis.enabled || cf->redis.storage_mode == REDIS_MODE_BACKUP);
+  
+  if(memstore_slot() != owner) {
+    if((publish_msg = create_shm_msg(msg)) == NULL) {
+      callback(NGX_HTTP_INSUFFICIENT_STORAGE, NULL, privdata);
+      return NGX_ERROR;
+    }
+    return memstore_ipc_send_publish_message(owner, &chead->id, publish_msg, cf, callback, privdata);
+  }
+  
+  assert(memstore_slot() == owner);
+  assert(chead->shared);
+  
+  if(cf->redis.enabled && cf->redis.storage_mode == REDIS_MODE_BACKUP) {
+    nchan_store_redis.publish(&chead->id, msg, cf, empty_callback, NULL);
+  }
+  
+  fill_message_timedata(msg, timeout);
+  
+  chead->max_messages = nchan_loc_conf_max_messages(cf);
+  
+  
+  if(chead->latest_msgid.time > msg->id.time) {
+    if(cf->redis.enabled) {
+      nchan_log_error("A message from the past has just been published. At least one of your servers running Nchan using Redis does not have its time synchronized.");
+    }
+    else {
+      nchan_log_error("A message from the past has just been published. Unless the system time has been adjusted, this should never happen.");
+    }
+  }
+  
+  memstore_chanhead_messages_gc(chead);
+  if(chead->max_messages == 0) {
+    ///no buffer
+    
+    if((shmsg_link = create_shared_message(msg, msg_in_shm)) == NULL) {
+      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
+      ERR("can't create unbuffered message for channel %V", &chead->id);
+      return NGX_ERROR;
+    }
+    publish_msg= shmsg_link->msg;
+    publish_msg->expires = ngx_time() + NCHAN_NOBUFFER_MSG_EXPIRE_SEC;
+    
+    publish_msg->prev_id.time = 0;
+    publish_msg->prev_id.tag.fixed[0] = 0;
+    publish_msg->prev_id.tagcount = 1;
+    
+    if(chead->latest_msgid.time == publish_msg->id.time) {
+      publish_msg->id.tag.fixed[0] = chead->latest_msgid.tag.fixed[0] + 1;
+    }
+    
+    nchan_reaper_add(&mpt->nobuffer_msg_reaper, shmsg_link);
+  }
+  else {
+    
+    if((shmsg_link = create_shared_message(msg, msg_in_shm)) == NULL) {
+      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
+      ERR("can't create shared message for channel %V", &chead->id);
+      return NGX_ERROR;
+    }
+    
+    if(chanhead_push_message(chead, shmsg_link) != NGX_OK) {
+      callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, privdata);
+      ERR("can't enqueue shared message for channel %V", &chead->id);
+      return NGX_ERROR;
+    }
+    
+    assert(shmsg_link != NULL);
+    assert(chead->msg_last == shmsg_link);
+    publish_msg = shmsg_link->msg;
+  }
+  
+  nchan_copy_msg_id(&chead->latest_msgid, &publish_msg->id, NULL);
+  
+  chanhead_copy_channel_info(chead, &channel_info);
+  
+  //do the actual publishing
+  assert(publish_msg->id.time != publish_msg->prev_id.time || ( publish_msg->id.time == publish_msg->prev_id.time && publish_msg->id.tag.fixed[0] != publish_msg->prev_id.tag.fixed[0]));
+  
+  nchan_stats_worker_incr(messages, 1);
+  
+  rc = nchan_memstore_publish_generic(chead, publish_msg, 0, NULL);
+  
+  callback(rc, &channel_info, privdata);
+
+  return rc;
+}
+
+static ngx_int_t nchan_store_get_group(ngx_str_t *name, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  if(cf->group.enable_accounting) {
+    return memstore_group_find(groups, name, cb, pd);
+  }
+  else {
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_ERROR;
+  }
+}
+
+typedef struct {
+  callback_pt           cb;
+  void                 *pd;
+  nchan_group_limits_t  limits;
+} group_callback_data_pt;
+
+#define APPLY_GROUP_LIMIT_IF_SET(limits, group, limit_name) \
+if((limits).limit_name != -1) (group)->limit.limit_name = (limits).limit_name
+
+static ngx_int_t set_group_limits_callback(ngx_int_t rc, nchan_group_t *group, group_callback_data_pt *ppd) {
+  
+  if(group) {
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, channels);
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, subscribers);
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, messages);
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, messages_shmem_bytes);
+    APPLY_GROUP_LIMIT_IF_SET(ppd->limits, group, messages_file_bytes);
+  }
+  
+  if(ppd->cb) {
+    ppd->cb(rc, group, ppd->pd);
+  }
+  ngx_free(ppd);
+  return NGX_OK;
+}
+
+#define INIT_GROUP_DOUBLE_CALLBACK(double_privdata, callback, privdata) \
+  if((double_privdata = ngx_alloc(sizeof(*double_privdata), ngx_cycle->log)) == NULL) { \
+    callback(NGX_ERROR, NULL, privdata);                                \
+    return NGX_ERROR;                                                   \
+  }                                                                     \
+  double_privdata->cb = callback;                                       \
+  double_privdata->pd = privdata
+
+
+static ngx_int_t nchan_store_set_group_limits(ngx_str_t *name, nchan_loc_conf_t *cf, nchan_group_limits_t *limits, callback_pt cb, void *pd) {
+  group_callback_data_pt   *ppd;
+  
+  if(!cf->group.enable_accounting) {
+    if(cb)
+      cb(NGX_ERROR, NULL, pd);
+    return NGX_OK;
+  }
+  
+  if(cb == NULL) {
+    ngx_atomic_int_t         *limit;
+    int                       limit_set = 0;
+    //do we even have any limits to set?...
+    //because if not, this whole thing can be bypassed, as there's no callback to run afterwards
+    for(limit = (ngx_atomic_int_t *)limits; limit < (ngx_atomic_int_t *)(limits + 1); limit++) {
+      if (*limit != -1) {
+        limit_set ++;
+        break;
+      }
+    }
+    if(limit_set == 0) {
+      return NGX_OK;
+    }
+  }
+  
+  INIT_GROUP_DOUBLE_CALLBACK(ppd, cb, pd);
+  ppd->limits = *limits;
+  
+  return memstore_group_find(groups, name, (callback_pt )set_group_limits_callback, ppd);
+}
+static ngx_int_t nchan_store_delete_group(ngx_str_t *name, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  
+  if(!cf->group.enable_accounting) {
+    cb(NGX_ERROR, NULL, pd);
+    return NGX_OK;
+  }
+  
+  return memstore_group_delete(groups, name, cb, pd);
+}
+
+typedef struct {
+  callback_pt       cb;
+  void             *pd;
+  nchan_loc_conf_t *lcf;
+} get_unique_request_id_data_t;
+
+static void get_unique_request_delay_callback(void *pd);
+static ngx_int_t nchan_store_get_subscriber_info_id(nchan_loc_conf_t *lcf, callback_pt cb, void *pd) {
+  
+  if(lcf->redis.enabled && lcf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+    return nchan_store_redis.get_subscriber_info_id(lcf, cb, pd);
+  }
+  
+  get_unique_request_id_data_t *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+  if(d == NULL) {
+    return NGX_ERROR;
+  }
+  
+  d->cb = cb;
+  d->pd = pd;
+  d->lcf = lcf;
+  
+  if(nchan_add_oneshot_timer(get_unique_request_delay_callback, d, 1) == NULL) {
+    return NGX_ERROR;
+  }
+  
+  return NGX_DONE;
+}
+
+static void get_unique_request_delay_callback(void *pd) {
+  get_unique_request_id_data_t *d = pd;
+  ngx_atomic_int_t id = ngx_atomic_fetch_add(&shdata->subscriber_info_response_id, 1);
+  
+  d->cb(NGX_OK, (void *)(uintptr_t )id, d->pd);
+  ngx_free(d);
+}
+
+static ngx_int_t nchan_store_request_subscriber_info_single_channel(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *lcf, callback_pt cb, void *pd) {
+  memstore_channel_head_t     *ch = nchan_memstore_get_chanhead(channel_id, lcf);
+  if(!ch || !ch->cf) {
+    return NGX_ERROR;
+  }
+  if(ch->cf->redis.enabled && ch->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+    return nchan_store_redis.request_subscriber_info(channel_id, request_id, ch->cf, cb, pd);
+  }
+  else {
+    if(ch->owner == memstore_slot()) {
+      return nchan_memstore_publish_notice(ch, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, (void *)(intptr_t )request_id);
+    }
+    else {
+      return memstore_ipc_send_publish_notice(ch->owner, channel_id, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, (void *)(intptr_t )request_id);
+    }
+  }
+}
+
+static ngx_int_t nchan_store_request_subscriber_info(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *lcf, callback_pt cb, void *pd) {
+  if(!nchan_channel_id_is_multi(channel_id)) {
+    return nchan_store_request_subscriber_info_single_channel(channel_id, request_id, lcf, cb, pd);
+  }
+  else {
+    //send the delete to all the individually multiplexed channels
+    ngx_int_t             i, n = 0;
+    ngx_str_t             ids[NCHAN_MULTITAG_MAX];
+    
+    n = parse_multi_id(channel_id, ids);
+
+    for(i=0; i<n; i++) {
+      ngx_int_t rc = nchan_store_request_subscriber_info_single_channel(channel_id, request_id, lcf, cb, pd);
+      if(rc != NGX_OK && rc != NGX_DONE) {
+        return rc;
+      }
+    }
+    return NGX_OK;
+  }
+}
+
+nchan_store_t  nchan_store_memory = {
+   //init
+  &nchan_store_init_module,
+  &nchan_store_init_worker,
+  &nchan_store_init_postconfig,
+  &nchan_store_create_main_conf,
+  
+  //shutdown
+  &nchan_store_exit_worker,
+  &nchan_store_exit_master,
+  
+  //async-friendly functions with callbacks
+  &nchan_store_async_get_message, //+callback
+  &nchan_store_subscribe, //+callback
+  &nchan_store_publish_message, //+callback
+  
+  &nchan_store_delete_channel, //+callback
+  &nchan_store_find_channel, //+callback
+  
+  &nchan_store_get_group, //+callback
+  &nchan_store_set_group_limits, //+callback
+  &nchan_store_delete_group, //+callback
+  
+  &nchan_store_get_subscriber_info_id, //+callback
+  &nchan_store_request_subscriber_info, //+callback
+};
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/recycloc.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/recycloc.c
new file mode 100644
index 0000000..755ee0b
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/recycloc.c
@@ -0,0 +1,47 @@
+#include <nchan_module.h>
+
+#define DBG(...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, __VA_ARGS__)
+#define ERR(...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, __VA_ARGS__)
+
+typedef struct recycloc_trash_s recycloc_trash_t;
+typedef struct recycloc_s recycloc_t;
+
+struct recycloc_llist_s {
+  void             *data;
+  struct recycloc_page_t  *prev;
+  struct recycloc_page_t  *next;
+};
+
+struct recycloc_s {
+  const char       *name;
+  recycloc_llist_s *head;
+  recycloc_llist_s *tail;
+  recycloc_llist_s *prealloc_start;
+  recycloc_llist_s *prealloc_end;
+}
+
+recycloc_t *recycloc_init(const char *name, recycloc_t *ptr, size_t data_size, size_t prealloc_count) {
+  recycloc_t rec = NULL;
+  if(page_size > ngx_pagesize) {
+    ERR("can't create recycloc: page_size %i > ngx_pagesize %i", page_size, ngx_pagesize);
+    return NULL;
+  }
+  if(!(rec = ngx_alloc(sizeof(recycloc_t) + page_size))){
+    ERR("can't alloc enough (%i) memory for recycloc", sizeof(recycloc_t) + page_size);
+    return NULL;
+  }
+  rec->name=name;
+  rec->data_size = data_size;
+  return rec;
+  
+  
+}
+
+void * recycloc_alloc(recycloc_t *self);
+
+
+
+recycloc_t *recycloc_destroy(recycloc_t *self) {
+  
+  
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/store-private.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/store-private.h
new file mode 100644
index 0000000..611c305
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/store-private.h
@@ -0,0 +1,180 @@
+ #ifndef MEMSTORE_PRIVATE_HEADER
+#define MEMSTORE_PRIVATE_HEADER
+#include <util/shmem.h>
+#include "ipc.h"
+//#define MEMSTORE_CHANHEAD_RESERVE_DEBUG 1
+
+#define NCHAN_NOTICE_BUFFER_LOADED 0x356F
+#define NCHAN_NOTICE_CHANNEL_SUBSCRIBER_INFO_REQUEST 0x1337
+
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+#include <util/nchan_list.h>
+#endif
+#include "uthash.h"
+typedef struct memstore_channel_head_s memstore_channel_head_t;
+typedef struct store_message_s store_message_t;
+size_t memstore_msg_memsize(nchan_msg_t *m);
+
+#include "groups.h"
+
+struct store_message_s {
+  nchan_msg_t               *msg;
+  store_message_t           *prev;
+  store_message_t           *next;
+}; //store_message_t
+
+#include "../spool.h"
+
+typedef struct {
+  ngx_atomic_t                sub_count;
+  ngx_atomic_t                internal_sub_count;
+  ngx_atomic_t                total_message_count;
+  ngx_atomic_t                stored_message_count;
+  ngx_atomic_t                last_seen;
+  struct {
+    ngx_atomic_t                outside_refcount;
+  }                           gc;
+} store_channel_head_shm_t;
+
+typedef struct {
+  ngx_str_t            id;
+  subscriber_t        *sub;
+} memstore_multi_t;
+
+struct memstore_channel_head_s {
+  ngx_str_t                       id; //channel id
+  ngx_int_t                       owner;
+  ngx_int_t                       slot;
+  channel_spooler_t               spooler;
+  chanhead_pubsub_status_t        status;
+  
+  ngx_atomic_int_t                sub_count;
+  ngx_int_t                       internal_sub_count;
+  time_t                          last_subscribed_local;
+
+#if MEMSTORE_CHANHEAD_RESERVE_DEBUG
+  nchan_list_t                    reserved;
+#else
+  uint16_t                        reserved;
+#endif
+  
+  uint8_t                         multi_subscribers_pending;
+  uint8_t                         multi_count;
+  memstore_multi_t               *multi;
+  
+  ngx_int_t                       gc_queued_times; // useful for debugging
+  store_channel_head_shm_t       *shared;
+  
+  ngx_uint_t                      max_messages;
+  store_message_t                *msg_first;
+  store_message_t                *msg_last;
+  ngx_uint_t                      msg_count;
+  nchan_msg_id_t                  latest_msgid;
+  nchan_msg_id_t                  oldest_msgid;
+  
+  subscriber_t                   *foreign_owner_ipc_sub; //points to NULL or inaacceessible memory.
+  time_t                          redis_idle_cache_ttl;
+  unsigned                        stub:1;
+  unsigned                        shutting_down:1;
+  unsigned                        meta:1;
+  
+  uint8_t                         msg_buffer_complete; //must be a byte because we need to reference it in the spooler
+  
+  nchan_loc_conf_t               *cf;
+  
+  group_tree_node_t              *groupnode;
+  memstore_channel_head_t        *groupnode_prev;
+  memstore_channel_head_t        *groupnode_next;
+
+  subscriber_t                   *redis_sub;
+  ngx_int_t                       delta_fakesubs;
+  ngx_event_t                     delta_fakesubs_timer_ev;
+  
+  memstore_channel_head_t        *gc_prev;
+  memstore_channel_head_t        *gc_next;
+  time_t                          gc_start_time;
+  unsigned                        in_gc_queue:1;
+  
+  memstore_channel_head_t        *churn_prev;
+  memstore_channel_head_t        *churn_next;
+  time_t                          churn_start_time;
+  unsigned                        in_churn_queue:1;
+  
+  UT_hash_handle                  hh;
+};
+
+typedef struct nchan_reloading_channel_s nchan_reloading_channel_t;
+
+struct nchan_reloading_channel_s {
+  ngx_str_t                          id;
+  ngx_uint_t                         max_messages;
+  unsigned                           use_redis:1;
+  struct nchan_reloading_channel_s  *prev;
+  struct nchan_reloading_channel_s  *next;
+  nchan_msg_t                       *msgs;
+};
+
+#define NCHAN_INVALID_SLOT           -1
+
+typedef struct {
+  nchan_reloading_channel_t         *rlch;
+  ngx_atomic_int_t                   procslot[NGX_MAX_PROCESSES];
+  ngx_atomic_int_t                   max_workers;
+  ngx_atomic_int_t                   old_max_workers;
+  ngx_atomic_int_t                   total_active_workers;
+  ngx_atomic_int_t                   current_active_workers;
+  ngx_atomic_int_t                   reloading;
+  ngx_atomic_uint_t                  generation;
+  ngx_atomic_uint_t                  subscriber_info_response_id;
+  
+  nchan_loc_conf_shared_data_t      *conf_data;
+
+#if nginx_version <= 1011006
+  ngx_atomic_uint_t                  shmem_pages_used;
+#endif
+
+#if NCHAN_MSG_LEAK_DEBUG
+  nchan_msg_t                       *msgdebug_head;
+#endif
+} shm_data_t;
+
+memstore_channel_head_t *nchan_memstore_find_chanhead(ngx_str_t *channel_id);
+ngx_int_t nchan_memstore_find_chanhead_with_backup(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt cb, void *pd);
+memstore_channel_head_t *nchan_memstore_get_chanhead(ngx_str_t *channel_id, nchan_loc_conf_t *cf);
+memstore_channel_head_t *nchan_memstore_get_chanhead_no_ipc_sub(ngx_str_t *channel_id, nchan_loc_conf_t *cf);
+store_message_t *chanhead_find_next_message(memstore_channel_head_t *ch, nchan_msg_id_t *msgid, nchan_msg_status_t *status);
+ipc_t *nchan_memstore_get_ipc(void);
+memstore_groups_t *nchan_memstore_get_groups(void);
+ngx_int_t nchan_memstore_handle_get_message_reply(nchan_msg_t *msg, nchan_msg_status_t findmsg_status, void *d);
+
+ngx_int_t nchan_store_publish_message_generic(ngx_str_t *channel_id, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
+ngx_int_t nchan_memstore_publish_generic(memstore_channel_head_t *head, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line);
+ngx_int_t nchan_store_chanhead_publish_message_generic(memstore_channel_head_t *chead, nchan_msg_t *msg, ngx_int_t msg_in_shm, nchan_loc_conf_t *cf, callback_pt callback, void *privdata);
+ngx_int_t nchan_memstore_publish_notice(memstore_channel_head_t *head, ngx_int_t notice_code, const void *notice_data);
+ngx_int_t nchan_memstore_force_delete_channel(ngx_str_t *channel_id, callback_pt callback, void *privdata);
+ngx_int_t memstore_ensure_chanhead_is_ready(memstore_channel_head_t *head, uint8_t ipc_subscribe_if_needed);
+ngx_int_t memstore_ready_chanhead_unless_stub(memstore_channel_head_t *head);
+void memstore_fakesub_add(memstore_channel_head_t *head, ngx_int_t n);
+ngx_int_t memstore_chanhead_messages_gc(memstore_channel_head_t *ch);
+
+
+#if FAKESHARD
+void memstore_fakeprocess_push(ngx_int_t slot);
+void memstore_fakeprocess_push_random(void);
+ngx_int_t memstore_fakeprocess_pop(void);
+#endif
+
+ngx_int_t memstore_slot(void);
+ngx_int_t memstore_str_owner(ngx_str_t *str);
+
+int memstore_ready(void);
+ngx_int_t chanhead_gc_add(memstore_channel_head_t *head, const char *);
+ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *chanhead, const char *);
+
+
+void memstore_chanhead_release(memstore_channel_head_t *ch, char *label);
+void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label);
+
+extern uint16_t  memstore_worker_generation; //times nginx has been restarted + 1
+
+#endif /*MEMSTORE_PRIVATE_HEADER*/
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/store.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/store.h
new file mode 100644
index 0000000..c1b9eef
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/memory/store.h
@@ -0,0 +1,13 @@
+#ifndef NCHAN_MEMSTORE_H
+#define NCHAN_MEMSTORE_H
+
+extern nchan_store_t  nchan_store_memory;
+
+ngx_int_t memstore_channel_owner(ngx_str_t *id);
+
+extern void  *nchan_store_memory_shmem;
+
+nchan_loc_conf_shared_data_t *memstore_get_conf_shared_data(nchan_loc_conf_t *cf);
+ngx_int_t memstore_reserve_conf_shared_data(nchan_loc_conf_t *cf);
+ngx_int_t nchan_nginx_worker_procslot(ngx_int_t worker_number);
+#endif //NCHAN_MEMSTORE_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/ngx_rwlock.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/ngx_rwlock.c
new file mode 100644
index 0000000..a8359a3
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/ngx_rwlock.c
@@ -0,0 +1,178 @@
+#include <nchan_module.h>
+#include "ngx_rwlock.h"
+
+#define NGX_RWLOCK_SPIN         2048
+#define NGX_RWLOCK_WRITE        -1
+
+#define DISABLE_RWLOCK 0  //just use a regular mutex for everything
+#define DEBUG_NGX_RWLOCK 1
+
+void ngx_rwlock_init(ngx_rwlock_t *lock) {
+  lock->mutex=1;
+  lock->lock=0;
+  lock->write_pid=0;
+  lock->mutex=0;
+}
+
+static void rwl_lock_mutex(ngx_rwlock_t *lock) {
+  #if (NGX_HAVE_ATOMIC_OPS)
+  ngx_atomic_t  *mutex = &lock->mutex;
+  ngx_uint_t i, n;
+  for(;;) {
+    if(*mutex == 0 && ngx_atomic_cmp_set(mutex, 0, ngx_pid)) {
+      return;
+    }
+    if(ngx_ncpu > 1) {
+      for(n = 1; n < NGX_RWLOCK_SPIN; n <<= 1) {
+        for(i = 0; i < n; i++) {
+          ngx_cpu_pause();
+        }
+        #if (DEBUG_NGX_RWLOCK)
+        ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p mutex wait", lock);
+        #endif
+        if(*mutex == 0 && ngx_atomic_cmp_set(mutex, 0, ngx_pid)) {
+          return;
+        }
+      }
+    }
+    ngx_sched_yield();
+  }
+  #else
+  #if (NGX_THREADS)
+  #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !
+  #endif
+  #endif
+}
+static void rwl_unlock_mutex(ngx_rwlock_t *lock) {
+  #if (NGX_HAVE_ATOMIC_OPS)
+  ngx_atomic_cmp_set(&lock->mutex, ngx_pid, 0);
+  #else
+  #if (NGX_THREADS)
+  #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !
+  #endif
+  #endif
+}
+
+#define NGX_RWLOCK_MUTEX_COND(lock, cond, stmt)   \
+if(cond) {                                          \
+  rwl_lock_mutex(lock);                             \
+  if(cond) {                                        \
+    stmt;                                           \
+    rwl_unlock_mutex(lock);                         \
+    return;                                         \
+  }                                                 \
+  rwl_unlock_mutex(lock);                           \
+}
+
+void ngx_rwlock_reserve_read(ngx_rwlock_t *lock)
+{
+  #if (NGX_HAVE_ATOMIC_OPS)
+  ngx_uint_t i, n;
+  
+  #if (DISABLE_RWLOCK == 1)
+  rwl_lock_mutex(lock);
+  return;
+  #endif
+  
+  for(;;) {
+    NGX_RWLOCK_MUTEX_COND(lock, (lock->lock != NGX_RWLOCK_WRITE), lock->lock++)
+    #if (DEBUG_NGX_RWLOCK == 1)
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p reserve read read (%i)", lock, lock->lock);
+    #endif
+    if(ngx_ncpu > 1) {
+      for(n = 1; n < NGX_RWLOCK_SPIN; n <<= 1) {
+        for(i = 0; i < n; i++) {
+          ngx_cpu_pause();
+        }
+        #if (DEBUG_NGX_RWLOCK == 1)
+        ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p read lock wait", lock);
+        #endif
+        NGX_RWLOCK_MUTEX_COND(lock, (lock->lock != NGX_RWLOCK_WRITE), lock->lock++)
+      }
+    }
+    ngx_sched_yield();
+  }
+  #else
+  #if (NGX_THREADS)
+  #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !
+  #endif
+  #endif
+}
+void ngx_rwlock_release_read(ngx_rwlock_t *lock) {
+  #if (DISABLE_RWLOCK == 1)
+  rwl_unlock_mutex(lock);
+  #else
+  NGX_RWLOCK_MUTEX_COND(lock, lock->lock != NGX_RWLOCK_WRITE && lock->lock != 0, lock->lock--)
+  #endif
+}
+
+static int ngx_rwlock_write_check(ngx_rwlock_t *lock) {
+  if(lock->lock==0) {
+    rwl_lock_mutex(lock);
+    if(lock->lock==0) {
+      lock->lock=NGX_RWLOCK_WRITE;
+      lock->write_pid=ngx_pid;
+      rwl_unlock_mutex(lock);
+      return 1;
+    }
+    rwl_unlock_mutex(lock);
+  }
+  return 0;
+}
+
+void ngx_rwlock_reserve_write(ngx_rwlock_t * lock) {
+  #if (NGX_HAVE_ATOMIC_OPS)
+  ngx_uint_t i, n;
+  
+  #if (DISABLE_RWLOCK == 1)
+  rwl_lock_mutex(lock);
+  return;
+  #endif
+  
+  for(;;) {
+    if(ngx_rwlock_write_check(lock))
+      return;
+    if(ngx_ncpu > 1) {
+      for(n = 1; n < NGX_RWLOCK_SPIN; n <<= 1) {
+        for(i = 0; i < n; i++) {
+          ngx_cpu_pause();
+        }
+        #if (DEBUG_NGX_RWLOCK == 1)
+        ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p write lock wait (reserved by %ui)", lock, lock->write_pid);
+        #endif
+        if(ngx_rwlock_write_check(lock))
+          return;
+      }
+    }
+    ngx_sched_yield();
+  }
+  #else
+  #if (NGX_THREADS)
+  #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !
+  #endif
+  #endif
+}
+
+void ngx_rwlock_release_write(ngx_rwlock_t *lock) {
+  #if (DISABLE_RWLOCK == 1)
+  rwl_unlock_mutex(lock);
+  return;
+  #endif
+  
+  if(lock->lock == NGX_RWLOCK_WRITE) {
+    rwl_lock_mutex(lock);
+    if(lock->lock == NGX_RWLOCK_WRITE) {
+      lock->lock=0;
+      if(lock->write_pid != ngx_pid) {
+        ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p releasing someone else's (pid %ui) write lock.", lock, lock->write_pid);
+      }
+      lock->write_pid = 0;
+      rwl_unlock_mutex(lock);
+      return;
+    }
+    rwl_unlock_mutex(lock);
+  }
+  else {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "rwlock %p tried to release nonexistent write lock, lock=%i.", lock, lock->lock);
+  }
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/ngx_rwlock.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/ngx_rwlock.h
new file mode 100644
index 0000000..be0f28b
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/ngx_rwlock.h
@@ -0,0 +1,5 @@
+void ngx_rwlock_init(ngx_rwlock_t *lock);
+void ngx_rwlock_release_write(ngx_rwlock_t *lock);
+void ngx_rwlock_reserve_write(ngx_rwlock_t *lock);
+void ngx_rwlock_release_read(ngx_rwlock_t *lock);
+void ngx_rwlock_reserve_read(ngx_rwlock_t *lock);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/cmp.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/cmp.c
new file mode 100644
index 0000000..a75bdb1
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/cmp.c
@@ -0,0 +1,3352 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2017 Charles Gunyon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "cmp.h"
+
+static const uint32_t version = 17;
+static const uint32_t mp_version = 5;
+
+enum {
+  POSITIVE_FIXNUM_MARKER = 0x00,
+  FIXMAP_MARKER          = 0x80,
+  FIXARRAY_MARKER        = 0x90,
+  FIXSTR_MARKER          = 0xA0,
+  NIL_MARKER             = 0xC0,
+  FALSE_MARKER           = 0xC2,
+  TRUE_MARKER            = 0xC3,
+  BIN8_MARKER            = 0xC4,
+  BIN16_MARKER           = 0xC5,
+  BIN32_MARKER           = 0xC6,
+  EXT8_MARKER            = 0xC7,
+  EXT16_MARKER           = 0xC8,
+  EXT32_MARKER           = 0xC9,
+  FLOAT_MARKER           = 0xCA,
+  DOUBLE_MARKER          = 0xCB,
+  U8_MARKER              = 0xCC,
+  U16_MARKER             = 0xCD,
+  U32_MARKER             = 0xCE,
+  U64_MARKER             = 0xCF,
+  S8_MARKER              = 0xD0,
+  S16_MARKER             = 0xD1,
+  S32_MARKER             = 0xD2,
+  S64_MARKER             = 0xD3,
+  FIXEXT1_MARKER         = 0xD4,
+  FIXEXT2_MARKER         = 0xD5,
+  FIXEXT4_MARKER         = 0xD6,
+  FIXEXT8_MARKER         = 0xD7,
+  FIXEXT16_MARKER        = 0xD8,
+  STR8_MARKER            = 0xD9,
+  STR16_MARKER           = 0xDA,
+  STR32_MARKER           = 0xDB,
+  ARRAY16_MARKER         = 0xDC,
+  ARRAY32_MARKER         = 0xDD,
+  MAP16_MARKER           = 0xDE,
+  MAP32_MARKER           = 0xDF,
+  NEGATIVE_FIXNUM_MARKER = 0xE0
+};
+
+enum {
+  FIXARRAY_SIZE = 0xF,
+  FIXMAP_SIZE   = 0xF,
+  FIXSTR_SIZE   = 0x1F
+};
+
+enum {
+  ERROR_NONE,
+  STR_DATA_LENGTH_TOO_LONG_ERROR,
+  BIN_DATA_LENGTH_TOO_LONG_ERROR,
+  ARRAY_LENGTH_TOO_LONG_ERROR,
+  MAP_LENGTH_TOO_LONG_ERROR,
+  INPUT_VALUE_TOO_LARGE_ERROR,
+  FIXED_VALUE_WRITING_ERROR,
+  TYPE_MARKER_READING_ERROR,
+  TYPE_MARKER_WRITING_ERROR,
+  DATA_READING_ERROR,
+  DATA_WRITING_ERROR,
+  EXT_TYPE_READING_ERROR,
+  EXT_TYPE_WRITING_ERROR,
+  INVALID_TYPE_ERROR,
+  LENGTH_READING_ERROR,
+  LENGTH_WRITING_ERROR,
+  SKIP_DEPTH_LIMIT_EXCEEDED_ERROR,
+  INTERNAL_ERROR,
+  ERROR_MAX
+};
+
+const char *cmp_error_messages[ERROR_MAX + 1] = {
+  "No Error",
+  "Specified string data length is too long (> 0xFFFFFFFF)",
+  "Specified binary data length is too long (> 0xFFFFFFFF)",
+  "Specified array length is too long (> 0xFFFFFFFF)",
+  "Specified map length is too long (> 0xFFFFFFFF)",
+  "Input value is too large",
+  "Error writing fixed value",
+  "Error reading type marker",
+  "Error writing type marker",
+  "Error reading packed data",
+  "Error writing packed data",
+  "Error reading ext type",
+  "Error writing ext type",
+  "Invalid type",
+  "Error reading size",
+  "Error writing size",
+  "Depth limit exceeded while skipping",
+  "Internal error",
+  "Max Error"
+};
+
+static const int32_t _i = 1;
+#define is_bigendian() ((*(char *)&_i) == 0)
+
+static uint16_t be16(uint16_t x) {
+  char *b = (char *)&x;
+
+  if (!is_bigendian()) {
+    char swap = 0;
+
+    swap = b[0];
+    b[0] = b[1];
+    b[1] = swap;
+  }
+
+  return x;
+}
+
+static uint32_t be32(uint32_t x) {
+  char *b = (char *)&x;
+
+  if (!is_bigendian()) {
+    char swap = 0;
+
+    swap = b[0];
+    b[0] = b[3];
+    b[3] = swap;
+
+    swap = b[1];
+    b[1] = b[2];
+    b[2] = swap;
+  }
+
+  return x;
+}
+
+static uint64_t be64(uint64_t x) {
+  char *b = (char *)&x;
+
+  if (!is_bigendian()) {
+    char swap = 0;
+
+    swap = b[0];
+    b[0] = b[7];
+    b[7] = swap;
+
+    swap = b[1];
+    b[1] = b[6];
+    b[6] = swap;
+
+    swap = b[2];
+    b[2] = b[5];
+    b[5] = swap;
+
+    swap = b[3];
+    b[3] = b[4];
+    b[4] = swap;
+  }
+
+  return x;
+}
+
+static float decode_befloat(char *b) {
+  float f = 0.;
+  char *fb = (char *)&f;
+
+  if (!is_bigendian()) {
+    fb[0] = b[3];
+    fb[1] = b[2];
+    fb[2] = b[1];
+    fb[3] = b[0];
+  }
+
+  return f;
+}
+
+static double decode_bedouble(char *b) {
+  double d = 0.;
+  char *db = (char *)&d;
+
+  if (!is_bigendian()) {
+    db[0] = b[7];
+    db[1] = b[6];
+    db[2] = b[5];
+    db[3] = b[4];
+    db[4] = b[3];
+    db[5] = b[2];
+    db[6] = b[1];
+    db[7] = b[0];
+  }
+
+  return d;
+}
+
+static bool read_byte(cmp_ctx_t *ctx, uint8_t *x) {
+  return ctx->read(ctx, x, sizeof(uint8_t));
+}
+
+static bool write_byte(cmp_ctx_t *ctx, uint8_t x) {
+  return (ctx->write(ctx, &x, sizeof(uint8_t)) == (sizeof(uint8_t)));
+}
+
+static bool skip_bytes(cmp_ctx_t *ctx, size_t count) {
+  if (ctx->skip) {
+    return ctx->skip(ctx, count);
+  }
+  else {
+    uint8_t floor;
+    size_t i;
+
+    for (i = 0; i < count; i++) {
+      if (!ctx->read(ctx, &floor, sizeof(uint8_t))) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+}
+
+static bool read_type_marker(cmp_ctx_t *ctx, uint8_t *marker) {
+  if (read_byte(ctx, marker)) {
+    return true;
+  }
+
+  ctx->error = TYPE_MARKER_READING_ERROR;
+  return false;
+}
+
+static bool write_type_marker(cmp_ctx_t *ctx, uint8_t marker) {
+  if (write_byte(ctx, marker))
+    return true;
+
+  ctx->error = TYPE_MARKER_WRITING_ERROR;
+  return false;
+}
+
+static bool write_fixed_value(cmp_ctx_t *ctx, uint8_t value) {
+  if (write_byte(ctx, value))
+    return true;
+
+  ctx->error = FIXED_VALUE_WRITING_ERROR;
+  return false;
+}
+
+static bool type_marker_to_cmp_type(uint8_t type_marker, uint8_t *cmp_type) {
+  if (type_marker <= 0x7F) {
+    *cmp_type = CMP_TYPE_POSITIVE_FIXNUM;
+    return true;
+  }
+
+  if (type_marker <= 0x8F) {
+    *cmp_type = CMP_TYPE_FIXMAP;
+    return true;
+  }
+
+  if (type_marker <= 0x9F) {
+    *cmp_type = CMP_TYPE_FIXARRAY;
+    return true;
+  }
+
+  if (type_marker <= 0xBF) {
+    *cmp_type = CMP_TYPE_FIXSTR;
+    return true;
+  }
+
+  if (type_marker >= 0xE0) {
+    *cmp_type = CMP_TYPE_NEGATIVE_FIXNUM;
+    return true;
+  }
+
+  switch (type_marker) {
+    case NIL_MARKER:
+      *cmp_type = CMP_TYPE_NIL;
+      return true;
+    case FALSE_MARKER:
+      *cmp_type = CMP_TYPE_BOOLEAN;
+      return true;
+    case TRUE_MARKER:
+      *cmp_type = CMP_TYPE_BOOLEAN;
+      return true;
+    case BIN8_MARKER:
+      *cmp_type = CMP_TYPE_BIN8;
+      return true;
+    case BIN16_MARKER:
+      *cmp_type = CMP_TYPE_BIN16;
+      return true;
+    case BIN32_MARKER:
+      *cmp_type = CMP_TYPE_BIN32;
+      return true;
+    case EXT8_MARKER:
+      *cmp_type = CMP_TYPE_EXT8;
+      return true;
+    case EXT16_MARKER:
+      *cmp_type = CMP_TYPE_EXT16;
+      return true;
+    case EXT32_MARKER:
+      *cmp_type = CMP_TYPE_EXT32;
+      return true;
+    case FLOAT_MARKER:
+      *cmp_type = CMP_TYPE_FLOAT;
+      return true;
+    case DOUBLE_MARKER:
+      *cmp_type = CMP_TYPE_DOUBLE;
+      return true;
+    case U8_MARKER:
+      *cmp_type = CMP_TYPE_UINT8;
+      return true;
+    case U16_MARKER:
+      *cmp_type = CMP_TYPE_UINT16;
+      return true;
+    case U32_MARKER:
+      *cmp_type = CMP_TYPE_UINT32;
+      return true;
+    case U64_MARKER:
+      *cmp_type = CMP_TYPE_UINT64;
+      return true;
+    case S8_MARKER:
+      *cmp_type = CMP_TYPE_SINT8;
+      return true;
+    case S16_MARKER:
+      *cmp_type = CMP_TYPE_SINT16;
+      return true;
+    case S32_MARKER:
+      *cmp_type = CMP_TYPE_SINT32;
+      return true;
+    case S64_MARKER:
+      *cmp_type = CMP_TYPE_SINT64;
+      return true;
+    case FIXEXT1_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT1;
+      return true;
+    case FIXEXT2_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT2;
+      return true;
+    case FIXEXT4_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT4;
+      return true;
+    case FIXEXT8_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT8;
+      return true;
+    case FIXEXT16_MARKER:
+      *cmp_type = CMP_TYPE_FIXEXT16;
+      return true;
+    case STR8_MARKER:
+      *cmp_type = CMP_TYPE_STR8;
+      return true;
+    case STR16_MARKER:
+      *cmp_type = CMP_TYPE_STR16;
+      return true;
+    case STR32_MARKER:
+      *cmp_type = CMP_TYPE_STR32;
+      return true;
+    case ARRAY16_MARKER:
+      *cmp_type = CMP_TYPE_ARRAY16;
+      return true;
+    case ARRAY32_MARKER:
+      *cmp_type = CMP_TYPE_ARRAY32;
+      return true;
+    case MAP16_MARKER:
+      *cmp_type = CMP_TYPE_MAP16;
+      return true;
+    case MAP32_MARKER:
+      *cmp_type = CMP_TYPE_MAP32;
+      return true;
+    default:
+      return false;
+  }
+}
+
+static bool read_type_size(cmp_ctx_t *ctx, uint8_t type_marker,
+                                           uint8_t cmp_type,
+                                           uint32_t *size) {
+  uint8_t u8temp = 0;
+  uint16_t u16temp = 0;
+  uint32_t u32temp = 0;
+
+  switch (cmp_type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+      *size = 0;
+      return true;
+    case CMP_TYPE_FIXMAP:
+      *size = (type_marker & FIXMAP_SIZE);
+      return true;
+    case CMP_TYPE_FIXARRAY:
+      *size = (type_marker & FIXARRAY_SIZE);
+      return true;
+    case CMP_TYPE_FIXSTR:
+      *size = (type_marker & FIXSTR_SIZE);
+      return true;
+    case CMP_TYPE_NIL:
+      *size = 0;
+      return true;
+    case CMP_TYPE_BOOLEAN:
+      *size = 0;
+      return true;
+    case CMP_TYPE_BIN8:
+      if (!ctx->read(ctx, &u8temp, sizeof(uint8_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = u8temp;
+      return true;
+    case CMP_TYPE_BIN16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_BIN32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_EXT8:
+      if (!ctx->read(ctx, &u8temp, sizeof(uint8_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = u8temp;
+      return true;
+    case CMP_TYPE_EXT16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_EXT32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = LENGTH_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_FLOAT:
+      *size = 4;
+      return true;
+    case CMP_TYPE_DOUBLE:
+      *size = 8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *size = 1;
+      return true;
+    case CMP_TYPE_UINT16:
+      *size = 2;
+      return true;
+    case CMP_TYPE_UINT32:
+      *size = 4;
+      return true;
+    case CMP_TYPE_UINT64:
+      *size = 8;
+      return true;
+    case CMP_TYPE_SINT8:
+      *size = 1;
+      return true;
+    case CMP_TYPE_SINT16:
+      *size = 2;
+      return true;
+    case CMP_TYPE_SINT32:
+      *size = 4;
+      return true;
+    case CMP_TYPE_SINT64:
+      *size = 8;
+      return true;
+    case CMP_TYPE_FIXEXT1:
+      *size = 1;
+      return true;
+    case CMP_TYPE_FIXEXT2:
+      *size = 2;
+      return true;
+    case CMP_TYPE_FIXEXT4:
+      *size = 4;
+      return true;
+    case CMP_TYPE_FIXEXT8:
+      *size = 8;
+      return true;
+    case CMP_TYPE_FIXEXT16:
+      *size = 16;
+      return true;
+    case CMP_TYPE_STR8:
+      if (!ctx->read(ctx, &u8temp, sizeof(uint8_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = u8temp;
+      return true;
+    case CMP_TYPE_STR16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_STR32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_ARRAY16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_ARRAY32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_MAP16:
+      if (!ctx->read(ctx, &u16temp, sizeof(uint16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be16(u16temp);
+      return true;
+    case CMP_TYPE_MAP32:
+      if (!ctx->read(ctx, &u32temp, sizeof(uint32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      *size = be32(u32temp);
+      return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      *size = 0;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+static bool read_obj_data(cmp_ctx_t *ctx, uint8_t type_marker,
+                                          cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+      obj->as.u8 = type_marker;
+      return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      obj->as.s8 = type_marker;
+      return true;
+    case CMP_TYPE_NIL:
+      obj->as.u8 = 0;
+      return true;
+    case CMP_TYPE_BOOLEAN:
+      switch (type_marker) {
+        case TRUE_MARKER:
+          obj->as.boolean = true;
+          return true;
+        case FALSE_MARKER:
+          obj->as.boolean = false;
+          return true;
+        default:
+          break;
+      }
+      ctx->error = INTERNAL_ERROR;
+      return false;
+    case CMP_TYPE_UINT8:
+      if (!ctx->read(ctx, &obj->as.u8, sizeof(uint8_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      return true;
+    case CMP_TYPE_UINT16:
+      if (!ctx->read(ctx, &obj->as.u16, sizeof(uint16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.u16 = be16(obj->as.u16);
+      return true;
+    case CMP_TYPE_UINT32:
+      if (!ctx->read(ctx, &obj->as.u32, sizeof(uint32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.u32 = be32(obj->as.u32);
+      return true;
+    case CMP_TYPE_UINT64:
+      if (!ctx->read(ctx, &obj->as.u64, sizeof(uint64_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.u64 = be64(obj->as.u64);
+      return true;
+    case CMP_TYPE_SINT8:
+      if (!ctx->read(ctx, &obj->as.s8, sizeof(int8_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      return true;
+    case CMP_TYPE_SINT16:
+      if (!ctx->read(ctx, &obj->as.s16, sizeof(int16_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.s16 = be16(obj->as.s16);
+      return true;
+    case CMP_TYPE_SINT32:
+      if (!ctx->read(ctx, &obj->as.s32, sizeof(int32_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.s32 = be32(obj->as.s32);
+      return true;
+    case CMP_TYPE_SINT64:
+      if (!ctx->read(ctx, &obj->as.s64, sizeof(int64_t))) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.s64 = be64(obj->as.s64);
+      return true;
+    case CMP_TYPE_FLOAT:
+    {
+      char bytes[4];
+
+      if (!ctx->read(ctx, bytes, 4)) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.flt = decode_befloat(bytes);
+      return true;
+    }
+    case CMP_TYPE_DOUBLE:
+    {
+      char bytes[8];
+
+      if (!ctx->read(ctx, bytes, 8)) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      obj->as.dbl = decode_bedouble(bytes);
+      return true;
+    }
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      return read_type_size(ctx, type_marker, obj->type, &obj->as.bin_size);
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      return read_type_size(ctx, type_marker, obj->type, &obj->as.str_size);
+    case CMP_TYPE_FIXARRAY:
+    case CMP_TYPE_ARRAY16:
+    case CMP_TYPE_ARRAY32:
+      return read_type_size(ctx, type_marker, obj->type, &obj->as.array_size);
+    case CMP_TYPE_FIXMAP:
+    case CMP_TYPE_MAP16:
+    case CMP_TYPE_MAP32:
+      return read_type_size(ctx, type_marker, obj->type, &obj->as.map_size);
+    case CMP_TYPE_FIXEXT1:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 1;
+      return true;
+    case CMP_TYPE_FIXEXT2:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 2;
+      return true;
+    case CMP_TYPE_FIXEXT4:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 4;
+      return true;
+    case CMP_TYPE_FIXEXT8:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 8;
+      return true;
+    case CMP_TYPE_FIXEXT16:
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.size = 16;
+      return true;
+    case CMP_TYPE_EXT8:
+      if (!read_type_size(ctx, type_marker, obj->type, &obj->as.ext.size)) {
+        return false;
+      }
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      return true;
+    case CMP_TYPE_EXT16:
+      if (!read_type_size(ctx, type_marker, obj->type, &obj->as.ext.size)) {
+        return false;
+      }
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.type = obj->as.ext.type;
+      return true;
+    case CMP_TYPE_EXT32:
+      if (!read_type_size(ctx, type_marker, obj->type, &obj->as.ext.size)) {
+        return false;
+      }
+      if (!ctx->read(ctx, &obj->as.ext.type, sizeof(int8_t))) {
+        ctx->error = EXT_TYPE_READING_ERROR;
+        return false;
+      }
+      obj->as.ext.type = obj->as.ext.type;
+      return true;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read,
+                                         cmp_skipper skip,
+                                         cmp_writer write) {
+  ctx->error = ERROR_NONE;
+  ctx->buf = buf;
+  ctx->read = read;
+  ctx->skip = skip;
+  ctx->write = write;
+}
+
+uint32_t cmp_version(void) {
+  return version;
+}
+
+uint32_t cmp_mp_version(void) {
+  return mp_version;
+}
+
+const char* cmp_strerror(cmp_ctx_t *ctx) {
+  if (ctx->error > ERROR_NONE && ctx->error < ERROR_MAX)
+    return cmp_error_messages[ctx->error];
+
+  return "";
+}
+
+bool cmp_write_pfix(cmp_ctx_t *ctx, uint8_t c) {
+  if (c <= 0x7F)
+    return write_fixed_value(ctx, c);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_nfix(cmp_ctx_t *ctx, int8_t c) {
+  if (c >= -32 && c <= -1)
+    return write_fixed_value(ctx, c);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_sfix(cmp_ctx_t *ctx, int8_t c) {
+  if (c >= 0)
+    return cmp_write_pfix(ctx, c);
+  if (c >= -32 && c <= -1)
+    return cmp_write_nfix(ctx, c);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_s8(cmp_ctx_t *ctx, int8_t c) {
+  if (!write_type_marker(ctx, S8_MARKER))
+    return false;
+
+  return ctx->write(ctx, &c, sizeof(int8_t));
+}
+
+bool cmp_write_s16(cmp_ctx_t *ctx, int16_t s) {
+  if (!write_type_marker(ctx, S16_MARKER))
+    return false;
+
+  s = be16(s);
+
+  return ctx->write(ctx, &s, sizeof(int16_t));
+}
+
+bool cmp_write_s32(cmp_ctx_t *ctx, int32_t i) {
+  if (!write_type_marker(ctx, S32_MARKER))
+    return false;
+
+  i = be32(i);
+
+  return ctx->write(ctx, &i, sizeof(int32_t));
+}
+
+bool cmp_write_s64(cmp_ctx_t *ctx, int64_t l) {
+  if (!write_type_marker(ctx, S64_MARKER))
+    return false;
+
+  l = be64(l);
+
+  return ctx->write(ctx, &l, sizeof(int64_t));
+}
+
+bool cmp_write_integer(cmp_ctx_t *ctx, int64_t d) {
+  if (d >= 0)
+    return cmp_write_uinteger(ctx, d);
+  if (d >= -32)
+    return cmp_write_nfix(ctx, (int8_t)d);
+  if (d >= -128)
+    return cmp_write_s8(ctx, (int8_t)d);
+  if (d >= -32768)
+    return cmp_write_s16(ctx, (int16_t)d);
+  if (d >= (-2147483647 - 1))
+    return cmp_write_s32(ctx, (int32_t)d);
+
+  return cmp_write_s64(ctx, d);
+}
+
+bool cmp_write_ufix(cmp_ctx_t *ctx, uint8_t c) {
+  return cmp_write_pfix(ctx, c);
+}
+
+bool cmp_write_u8(cmp_ctx_t *ctx, uint8_t c) {
+  if (!write_type_marker(ctx, U8_MARKER))
+    return false;
+
+  return ctx->write(ctx, &c, sizeof(uint8_t));
+}
+
+bool cmp_write_u16(cmp_ctx_t *ctx, uint16_t s) {
+  if (!write_type_marker(ctx, U16_MARKER))
+    return false;
+
+  s = be16(s);
+
+  return ctx->write(ctx, &s, sizeof(uint16_t));
+}
+
+bool cmp_write_u32(cmp_ctx_t *ctx, uint32_t i) {
+  if (!write_type_marker(ctx, U32_MARKER))
+    return false;
+
+  i = be32(i);
+
+  return ctx->write(ctx, &i, sizeof(uint32_t));
+}
+
+bool cmp_write_u64(cmp_ctx_t *ctx, uint64_t l) {
+  if (!write_type_marker(ctx, U64_MARKER))
+    return false;
+
+  l = be64(l);
+
+  return ctx->write(ctx, &l, sizeof(uint64_t));
+}
+
+bool cmp_write_uinteger(cmp_ctx_t *ctx, uint64_t u) {
+  if (u <= 0x7F)
+    return cmp_write_pfix(ctx, (uint8_t)u);
+  if (u <= 0xFF)
+    return cmp_write_u8(ctx, (uint8_t)u);
+  if (u <= 0xFFFF)
+    return cmp_write_u16(ctx, (uint16_t)u);
+  if (u <= 0xFFFFFFFF)
+    return cmp_write_u32(ctx, (uint32_t)u);
+
+  return cmp_write_u64(ctx, u);
+}
+
+bool cmp_write_float(cmp_ctx_t *ctx, float f) {
+  if (!write_type_marker(ctx, FLOAT_MARKER))
+    return false;
+
+  /*
+   * We may need to swap the float's bytes, but we can't just swap them inside
+   * the float because the swapped bytes may not constitute a valid float.
+   * Therefore, we have to create a buffer and swap the bytes there.
+   */
+  if (!is_bigendian()) {
+    char swapped[sizeof(float)];
+    char *fbuf = (char *)&f;
+    size_t i;
+
+    for (i = 0; i < sizeof(float); i++)
+      swapped[i] = fbuf[sizeof(float) - i - 1];
+
+    return ctx->write(ctx, swapped, sizeof(float));
+  }
+
+  return ctx->write(ctx, &f, sizeof(float));
+}
+
+bool cmp_write_double(cmp_ctx_t *ctx, double d) {
+  if (!write_type_marker(ctx, DOUBLE_MARKER))
+    return false;
+
+  /* Same deal for doubles */
+  if (!is_bigendian()) {
+    char swapped[sizeof(double)];
+    char *dbuf = (char *)&d;
+    size_t i;
+
+    for (i = 0; i < sizeof(double); i++)
+      swapped[i] = dbuf[sizeof(double) - i - 1];
+
+    return ctx->write(ctx, swapped, sizeof(double));
+  }
+
+  return ctx->write(ctx, &d, sizeof(double));
+}
+
+bool cmp_write_decimal(cmp_ctx_t *ctx, double d) {
+  float f = (float)d;
+  double df = (double)f;
+
+  if (df == d)
+    return cmp_write_float(ctx, f);
+  else
+    return cmp_write_double(ctx, d);
+}
+
+bool cmp_write_nil(cmp_ctx_t *ctx) {
+  return write_type_marker(ctx, NIL_MARKER);
+}
+
+bool cmp_write_true(cmp_ctx_t *ctx) {
+  return write_type_marker(ctx, TRUE_MARKER);
+}
+
+bool cmp_write_false(cmp_ctx_t *ctx) {
+  return write_type_marker(ctx, FALSE_MARKER);
+}
+
+bool cmp_write_bool(cmp_ctx_t *ctx, bool b) {
+  if (b)
+    return cmp_write_true(ctx);
+
+  return cmp_write_false(ctx);
+}
+
+bool cmp_write_u8_as_bool(cmp_ctx_t *ctx, uint8_t b) {
+  if (b)
+    return cmp_write_true(ctx);
+
+  return cmp_write_false(ctx);
+}
+
+bool cmp_write_fixstr_marker(cmp_ctx_t *ctx, uint8_t size) {
+  if (size <= FIXSTR_SIZE)
+    return write_fixed_value(ctx, FIXSTR_MARKER | size);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_fixstr(cmp_ctx_t *ctx, const char *data, uint8_t size) {
+  if (!cmp_write_fixstr_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str8_marker(cmp_ctx_t *ctx, uint8_t size) {
+  if (!write_type_marker(ctx, STR8_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &size, sizeof(uint8_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str8(cmp_ctx_t *ctx, const char *data, uint8_t size) {
+  if (!cmp_write_str8_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str16_marker(cmp_ctx_t *ctx, uint16_t size) {
+  if (!write_type_marker(ctx, STR16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint16_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str16(cmp_ctx_t *ctx, const char *data, uint16_t size) {
+  if (!cmp_write_str16_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str32_marker(cmp_ctx_t *ctx, uint32_t size) {
+  if (!write_type_marker(ctx, STR32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint32_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str32(cmp_ctx_t *ctx, const char *data, uint32_t size) {
+  if (!cmp_write_str32_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_str_marker(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= FIXSTR_SIZE)
+    return cmp_write_fixstr_marker(ctx, (uint8_t)size);
+  if (size <= 0xFF)
+    return cmp_write_str8_marker(ctx, (uint8_t)size);
+  if (size <= 0xFFFF)
+    return cmp_write_str16_marker(ctx, (uint16_t)size);
+
+  return cmp_write_str32_marker(ctx, size);
+}
+
+bool cmp_write_str_marker_v4(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= FIXSTR_SIZE)
+    return cmp_write_fixstr_marker(ctx, (uint8_t)size);
+  if (size <= 0xFFFF)
+    return cmp_write_str16_marker(ctx, (uint16_t)size);
+
+  return cmp_write_str32_marker(ctx, size);
+}
+
+bool cmp_write_str(cmp_ctx_t *ctx, const char *data, uint32_t size) {
+  if (size <= FIXSTR_SIZE)
+    return cmp_write_fixstr(ctx, data, (uint8_t)size);
+  if (size <= 0xFF)
+    return cmp_write_str8(ctx, data, (uint8_t)size);
+  if (size <= 0xFFFF)
+    return cmp_write_str16(ctx, data, (uint16_t)size);
+
+  return cmp_write_str32(ctx, data, size);
+}
+
+bool cmp_write_str_v4(cmp_ctx_t *ctx, const char *data, uint32_t size) {
+  if (size <= FIXSTR_SIZE)
+    return cmp_write_fixstr(ctx, data, (uint8_t)size);
+  if (size <= 0xFFFF)
+    return cmp_write_str16(ctx, data, (uint16_t)size);
+
+  return cmp_write_str32(ctx, data, size);
+}
+
+bool cmp_write_bin8_marker(cmp_ctx_t *ctx, uint8_t size) {
+  if (!write_type_marker(ctx, BIN8_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &size, sizeof(uint8_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin8(cmp_ctx_t *ctx, const void *data, uint8_t size) {
+  if (!cmp_write_bin8_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin16_marker(cmp_ctx_t *ctx, uint16_t size) {
+  if (!write_type_marker(ctx, BIN16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint16_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin16(cmp_ctx_t *ctx, const void *data, uint16_t size) {
+  if (!cmp_write_bin16_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin32_marker(cmp_ctx_t *ctx, uint32_t size) {
+  if (!write_type_marker(ctx, BIN32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint32_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin32(cmp_ctx_t *ctx, const void *data, uint32_t size) {
+  if (!cmp_write_bin32_marker(ctx, size))
+    return false;
+
+  if (size == 0)
+    return true;
+
+  if (ctx->write(ctx, data, size))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_bin_marker(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= 0xFF)
+    return cmp_write_bin8_marker(ctx, (uint8_t)size);
+  if (size <= 0xFFFF)
+    return cmp_write_bin16_marker(ctx, (uint16_t)size);
+
+  return cmp_write_bin32_marker(ctx, size);
+}
+
+bool cmp_write_bin(cmp_ctx_t *ctx, const void *data, uint32_t size) {
+  if (size <= 0xFF)
+    return cmp_write_bin8(ctx, data, (uint8_t)size);
+  if (size <= 0xFFFF)
+    return cmp_write_bin16(ctx, data, (uint16_t)size);
+
+  return cmp_write_bin32(ctx, data, size);
+}
+
+bool cmp_write_fixarray(cmp_ctx_t *ctx, uint8_t size) {
+  if (size <= FIXARRAY_SIZE)
+    return write_fixed_value(ctx, FIXARRAY_MARKER | size);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_array16(cmp_ctx_t *ctx, uint16_t size) {
+  if (!write_type_marker(ctx, ARRAY16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint16_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_array32(cmp_ctx_t *ctx, uint32_t size) {
+  if (!write_type_marker(ctx, ARRAY32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint32_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_array(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= FIXARRAY_SIZE)
+    return cmp_write_fixarray(ctx, (uint8_t)size);
+  if (size <= 0xFFFF)
+    return cmp_write_array16(ctx, (uint16_t)size);
+
+  return cmp_write_array32(ctx, size);
+}
+
+bool cmp_write_fixmap(cmp_ctx_t *ctx, uint8_t size) {
+  if (size <= FIXMAP_SIZE)
+    return write_fixed_value(ctx, FIXMAP_MARKER | size);
+
+  ctx->error = INPUT_VALUE_TOO_LARGE_ERROR;
+  return false;
+}
+
+bool cmp_write_map16(cmp_ctx_t *ctx, uint16_t size) {
+  if (!write_type_marker(ctx, MAP16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint16_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_map32(cmp_ctx_t *ctx, uint32_t size) {
+  if (!write_type_marker(ctx, MAP32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (ctx->write(ctx, &size, sizeof(uint32_t)))
+    return true;
+
+  ctx->error = LENGTH_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_map(cmp_ctx_t *ctx, uint32_t size) {
+  if (size <= FIXMAP_SIZE)
+    return cmp_write_fixmap(ctx, (uint8_t)size);
+  if (size <= 0xFFFF)
+    return cmp_write_map16(ctx, (uint16_t)size);
+
+  return cmp_write_map32(ctx, size);
+}
+
+bool cmp_write_fixext1_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT1_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext1(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext1_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 1))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext2_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT2_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext2(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext2_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 2))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext4_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT4_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext4(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext4_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 4))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext8_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT8_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext8(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext8_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 8))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext16_marker(cmp_ctx_t *ctx, int8_t type) {
+  if (!write_type_marker(ctx, FIXEXT16_MARKER))
+    return false;
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_fixext16(cmp_ctx_t *ctx, int8_t type, const void *data) {
+  if (!cmp_write_fixext16_marker(ctx, type))
+    return false;
+
+  if (ctx->write(ctx, data, 16))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext8_marker(cmp_ctx_t *ctx, int8_t type, uint8_t size) {
+  if (!write_type_marker(ctx, EXT8_MARKER))
+    return false;
+
+  if (!ctx->write(ctx, &size, sizeof(uint8_t))) {
+    ctx->error = LENGTH_WRITING_ERROR;
+    return false;
+  }
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext8(cmp_ctx_t *ctx, int8_t tp, uint8_t sz, const void *data) {
+  if (!cmp_write_ext8_marker(ctx, tp, sz))
+    return false;
+
+  if (ctx->write(ctx, data, sz))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext16_marker(cmp_ctx_t *ctx, int8_t type, uint16_t size) {
+  if (!write_type_marker(ctx, EXT16_MARKER))
+    return false;
+
+  size = be16(size);
+
+  if (!ctx->write(ctx, &size, sizeof(uint16_t))) {
+    ctx->error = LENGTH_WRITING_ERROR;
+    return false;
+  }
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext16(cmp_ctx_t *ctx, int8_t tp, uint16_t sz, const void *data) {
+  if (!cmp_write_ext16_marker(ctx, tp, sz))
+    return false;
+
+  if (ctx->write(ctx, data, sz))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext32_marker(cmp_ctx_t *ctx, int8_t type, uint32_t size) {
+  if (!write_type_marker(ctx, EXT32_MARKER))
+    return false;
+
+  size = be32(size);
+
+  if (!ctx->write(ctx, &size, sizeof(uint32_t))) {
+    ctx->error = LENGTH_WRITING_ERROR;
+    return false;
+  }
+
+  if (ctx->write(ctx, &type, sizeof(int8_t)))
+    return true;
+
+  ctx->error = EXT_TYPE_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext32(cmp_ctx_t *ctx, int8_t tp, uint32_t sz, const void *data) {
+  if (!cmp_write_ext32_marker(ctx, tp, sz))
+    return false;
+
+  if (ctx->write(ctx, data, sz))
+    return true;
+
+  ctx->error = DATA_WRITING_ERROR;
+  return false;
+}
+
+bool cmp_write_ext_marker(cmp_ctx_t *ctx, int8_t tp, uint32_t sz) {
+  if (sz == 1)
+    return cmp_write_fixext1_marker(ctx, tp);
+  if (sz == 2)
+    return cmp_write_fixext2_marker(ctx, tp);
+  if (sz == 4)
+    return cmp_write_fixext4_marker(ctx, tp);
+  if (sz == 8)
+    return cmp_write_fixext8_marker(ctx, tp);
+  if (sz == 16)
+    return cmp_write_fixext16_marker(ctx, tp);
+  if (sz <= 0xFF)
+    return cmp_write_ext8_marker(ctx, tp, (uint8_t)sz);
+  if (sz <= 0xFFFF)
+    return cmp_write_ext16_marker(ctx, tp, (uint16_t)sz);
+
+  return cmp_write_ext32_marker(ctx, tp, sz);
+}
+
+bool cmp_write_ext(cmp_ctx_t *ctx, int8_t tp, uint32_t sz, const void *data) {
+  if (sz == 1)
+    return cmp_write_fixext1(ctx, tp, data);
+  if (sz == 2)
+    return cmp_write_fixext2(ctx, tp, data);
+  if (sz == 4)
+    return cmp_write_fixext4(ctx, tp, data);
+  if (sz == 8)
+    return cmp_write_fixext8(ctx, tp, data);
+  if (sz == 16)
+    return cmp_write_fixext16(ctx, tp, data);
+  if (sz <= 0xFF)
+    return cmp_write_ext8(ctx, tp, (uint8_t)sz, data);
+  if (sz <= 0xFFFF)
+    return cmp_write_ext16(ctx, tp, (uint16_t)sz, data);
+
+  return cmp_write_ext32(ctx, tp, sz, data);
+}
+
+bool cmp_write_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
+  switch(obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+      return cmp_write_pfix(ctx, obj->as.u8);
+    case CMP_TYPE_FIXMAP:
+      return cmp_write_fixmap(ctx, (uint8_t)obj->as.map_size);
+    case CMP_TYPE_FIXARRAY:
+      return cmp_write_fixarray(ctx, (uint8_t)obj->as.array_size);
+    case CMP_TYPE_FIXSTR:
+      return cmp_write_fixstr_marker(ctx, (uint8_t)obj->as.str_size);
+    case CMP_TYPE_NIL:
+      return cmp_write_nil(ctx);
+    case CMP_TYPE_BOOLEAN:
+      if (obj->as.boolean)
+        return cmp_write_true(ctx);
+      return cmp_write_false(ctx);
+    case CMP_TYPE_BIN8:
+      return cmp_write_bin8_marker(ctx, (uint8_t)obj->as.bin_size);
+    case CMP_TYPE_BIN16:
+      return cmp_write_bin16_marker(ctx, (uint16_t)obj->as.bin_size);
+    case CMP_TYPE_BIN32:
+      return cmp_write_bin32_marker(ctx, obj->as.bin_size);
+    case CMP_TYPE_EXT8:
+      return cmp_write_ext8_marker(
+        ctx, obj->as.ext.type, (uint8_t)obj->as.ext.size
+      );
+    case CMP_TYPE_EXT16:
+      return cmp_write_ext16_marker(
+        ctx, obj->as.ext.type, (uint16_t)obj->as.ext.size
+      );
+    case CMP_TYPE_EXT32:
+      return cmp_write_ext32_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+    case CMP_TYPE_FLOAT:
+      return cmp_write_float(ctx, obj->as.flt);
+    case CMP_TYPE_DOUBLE:
+      return cmp_write_double(ctx, obj->as.dbl);
+    case CMP_TYPE_UINT8:
+      return cmp_write_u8(ctx, obj->as.u8);
+    case CMP_TYPE_UINT16:
+      return cmp_write_u16(ctx, obj->as.u16);
+    case CMP_TYPE_UINT32:
+      return cmp_write_u32(ctx, obj->as.u32);
+    case CMP_TYPE_UINT64:
+      return cmp_write_u64(ctx, obj->as.u64);
+    case CMP_TYPE_SINT8:
+      return cmp_write_s8(ctx, obj->as.s8);
+    case CMP_TYPE_SINT16:
+      return cmp_write_s16(ctx, obj->as.s16);
+    case CMP_TYPE_SINT32:
+      return cmp_write_s32(ctx, obj->as.s32);
+    case CMP_TYPE_SINT64:
+      return cmp_write_s64(ctx, obj->as.s64);
+    case CMP_TYPE_FIXEXT1:
+      return cmp_write_fixext1_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT2:
+      return cmp_write_fixext2_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT4:
+      return cmp_write_fixext4_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT8:
+      return cmp_write_fixext8_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT16:
+      return cmp_write_fixext16_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_STR8:
+      return cmp_write_str8_marker(ctx, (uint8_t)obj->as.str_size);
+    case CMP_TYPE_STR16:
+      return cmp_write_str16_marker(ctx, (uint16_t)obj->as.str_size);
+    case CMP_TYPE_STR32:
+      return cmp_write_str32_marker(ctx, obj->as.str_size);
+    case CMP_TYPE_ARRAY16:
+      return cmp_write_array16(ctx, (uint16_t)obj->as.array_size);
+    case CMP_TYPE_ARRAY32:
+      return cmp_write_array32(ctx, obj->as.array_size);
+    case CMP_TYPE_MAP16:
+      return cmp_write_map16(ctx, (uint16_t)obj->as.map_size);
+    case CMP_TYPE_MAP32:
+      return cmp_write_map32(ctx, obj->as.map_size);
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      return cmp_write_nfix(ctx, obj->as.s8);
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_write_object_v4(cmp_ctx_t *ctx, cmp_object_t *obj) {
+  switch(obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+      return cmp_write_pfix(ctx, obj->as.u8);
+    case CMP_TYPE_FIXMAP:
+      return cmp_write_fixmap(ctx, (uint8_t)obj->as.map_size);
+    case CMP_TYPE_FIXARRAY:
+      return cmp_write_fixarray(ctx, (uint8_t)obj->as.array_size);
+    case CMP_TYPE_FIXSTR:
+      return cmp_write_fixstr_marker(ctx, (uint8_t)obj->as.str_size);
+    case CMP_TYPE_NIL:
+      return cmp_write_nil(ctx);
+    case CMP_TYPE_BOOLEAN:
+      if (obj->as.boolean)
+        return cmp_write_true(ctx);
+      return cmp_write_false(ctx);
+    case CMP_TYPE_EXT8:
+      return cmp_write_ext8_marker(ctx, obj->as.ext.type, (uint8_t)obj->as.ext.size);
+    case CMP_TYPE_EXT16:
+      return cmp_write_ext16_marker(
+        ctx, obj->as.ext.type, (uint16_t)obj->as.ext.size
+      );
+    case CMP_TYPE_EXT32:
+      return cmp_write_ext32_marker(ctx, obj->as.ext.type, obj->as.ext.size);
+    case CMP_TYPE_FLOAT:
+      return cmp_write_float(ctx, obj->as.flt);
+    case CMP_TYPE_DOUBLE:
+      return cmp_write_double(ctx, obj->as.dbl);
+    case CMP_TYPE_UINT8:
+      return cmp_write_u8(ctx, obj->as.u8);
+    case CMP_TYPE_UINT16:
+      return cmp_write_u16(ctx, obj->as.u16);
+    case CMP_TYPE_UINT32:
+      return cmp_write_u32(ctx, obj->as.u32);
+    case CMP_TYPE_UINT64:
+      return cmp_write_u64(ctx, obj->as.u64);
+    case CMP_TYPE_SINT8:
+      return cmp_write_s8(ctx, obj->as.s8);
+    case CMP_TYPE_SINT16:
+      return cmp_write_s16(ctx, obj->as.s16);
+    case CMP_TYPE_SINT32:
+      return cmp_write_s32(ctx, obj->as.s32);
+    case CMP_TYPE_SINT64:
+      return cmp_write_s64(ctx, obj->as.s64);
+    case CMP_TYPE_FIXEXT1:
+      return cmp_write_fixext1_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT2:
+      return cmp_write_fixext2_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT4:
+      return cmp_write_fixext4_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT8:
+      return cmp_write_fixext8_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_FIXEXT16:
+      return cmp_write_fixext16_marker(ctx, obj->as.ext.type);
+    case CMP_TYPE_STR16:
+      return cmp_write_str16_marker(ctx, (uint16_t)obj->as.str_size);
+    case CMP_TYPE_STR32:
+      return cmp_write_str32_marker(ctx, obj->as.str_size);
+    case CMP_TYPE_ARRAY16:
+      return cmp_write_array16(ctx, (uint16_t)obj->as.array_size);
+    case CMP_TYPE_ARRAY32:
+      return cmp_write_array32(ctx, obj->as.array_size);
+    case CMP_TYPE_MAP16:
+      return cmp_write_map16(ctx, (uint16_t)obj->as.map_size);
+    case CMP_TYPE_MAP32:
+      return cmp_write_map32(ctx, obj->as.map_size);
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      return cmp_write_nfix(ctx, obj->as.s8);
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_pfix(cmp_ctx_t *ctx, uint8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_POSITIVE_FIXNUM) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *c = obj.as.u8;
+  return true;
+}
+
+bool cmp_read_nfix(cmp_ctx_t *ctx, int8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_NEGATIVE_FIXNUM) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *c = obj.as.s8;
+  return true;
+}
+
+bool cmp_read_sfix(cmp_ctx_t *ctx, int8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+      *c = obj.as.s8;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_s8(cmp_ctx_t *ctx, int8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_SINT8) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *c = obj.as.s8;
+  return true;
+}
+
+bool cmp_read_s16(cmp_ctx_t *ctx, int16_t *s) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_SINT16) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *s = obj.as.s16;
+  return true;
+}
+
+bool cmp_read_s32(cmp_ctx_t *ctx, int32_t *i) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_SINT32) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *i = obj.as.s32;
+  return true;
+}
+
+bool cmp_read_s64(cmp_ctx_t *ctx, int64_t *l) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_SINT64) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *l = obj.as.s64;
+  return true;
+}
+
+bool cmp_read_char(cmp_ctx_t *ctx, int8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *c = obj.as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      if (obj.as.u8 <= 127) {
+        *c = obj.as.u8;
+        return true;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_short(cmp_ctx_t *ctx, int16_t *s) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *s = obj.as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *s = obj.as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *s = obj.as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      if (obj.as.u16 <= 32767) {
+        *s = obj.as.u16;
+        return true;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_int(cmp_ctx_t *ctx, int32_t *i) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *i = obj.as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *i = obj.as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *i = obj.as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      *i = obj.as.u16;
+      return true;
+    case CMP_TYPE_SINT32:
+      *i = obj.as.s32;
+      return true;
+    case CMP_TYPE_UINT32:
+      if (obj.as.u32 <= 2147483647) {
+        *i = obj.as.u32;
+        return true;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_long(cmp_ctx_t *ctx, int64_t *d) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *d = obj.as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *d = obj.as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *d = obj.as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      *d = obj.as.u16;
+      return true;
+    case CMP_TYPE_SINT32:
+      *d = obj.as.s32;
+      return true;
+    case CMP_TYPE_UINT32:
+      *d = obj.as.u32;
+      return true;
+    case CMP_TYPE_SINT64:
+      *d = obj.as.s64;
+      return true;
+    case CMP_TYPE_UINT64:
+      if (obj.as.u64 <= 9223372036854775807) {
+        *d = obj.as.u64;
+        return true;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_integer(cmp_ctx_t *ctx, int64_t *d) {
+  return cmp_read_long(ctx, d);
+}
+
+bool cmp_read_ufix(cmp_ctx_t *ctx, uint8_t *c) {
+  return cmp_read_pfix(ctx, c);
+}
+
+bool cmp_read_u8(cmp_ctx_t *ctx, uint8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_UINT8) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *c = obj.as.u8;
+  return true;
+}
+
+bool cmp_read_u16(cmp_ctx_t *ctx, uint16_t *s) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_UINT16) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *s = obj.as.u16;
+  return true;
+}
+
+bool cmp_read_u32(cmp_ctx_t *ctx, uint32_t *i) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_UINT32) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *i = obj.as.u32;
+  return true;
+}
+
+bool cmp_read_u64(cmp_ctx_t *ctx, uint64_t *l) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_UINT64) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *l = obj.as.u64;
+  return true;
+}
+
+bool cmp_read_uchar(cmp_ctx_t *ctx, uint8_t *c) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *c = obj.as.u8;
+      return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      if (obj.as.s8 >= 0) {
+        *c = obj.as.s8;
+        return true;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_ushort(cmp_ctx_t *ctx, uint16_t *s) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *s = obj.as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *s = obj.as.u16;
+      return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      if (obj.as.s8 >= 0) {
+        *s = obj.as.s8;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT16:
+      if (obj.as.s16 >= 0) {
+        *s = obj.as.s16;
+        return true;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_uint(cmp_ctx_t *ctx, uint32_t *i) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *i = obj.as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *i = obj.as.u16;
+      return true;
+    case CMP_TYPE_UINT32:
+      *i = obj.as.u32;
+      return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      if (obj.as.s8 >= 0) {
+        *i = obj.as.s8;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT16:
+      if (obj.as.s16 >= 0) {
+        *i = obj.as.s16;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT32:
+      if (obj.as.s32 >= 0) {
+        *i = obj.as.s32;
+        return true;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_ulong(cmp_ctx_t *ctx, uint64_t *u) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *u = obj.as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *u = obj.as.u16;
+      return true;
+    case CMP_TYPE_UINT32:
+      *u = obj.as.u32;
+      return true;
+    case CMP_TYPE_UINT64:
+      *u = obj.as.u64;
+      return true;
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      if (obj.as.s8 >= 0) {
+        *u = obj.as.s8;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT16:
+      if (obj.as.s16 >= 0) {
+        *u = obj.as.s16;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT32:
+      if (obj.as.s32 >= 0) {
+        *u = obj.as.s32;
+        return true;
+      }
+      break;
+    case CMP_TYPE_SINT64:
+      if (obj.as.s64 >= 0) {
+        *u = obj.as.s64;
+        return true;
+      }
+      break;
+    default:
+      break;
+  }
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_uinteger(cmp_ctx_t *ctx, uint64_t *d) {
+  return cmp_read_ulong(ctx, d);
+}
+
+bool cmp_read_float(cmp_ctx_t *ctx, float *f) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_FLOAT) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *f = obj.as.flt;
+
+  return true;
+}
+
+bool cmp_read_double(cmp_ctx_t *ctx, double *d) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_DOUBLE) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *d = obj.as.dbl;
+
+  return true;
+}
+
+bool cmp_read_decimal(cmp_ctx_t *ctx, double *d) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FLOAT:
+      *d = (double)obj.as.flt;
+      return true;
+    case CMP_TYPE_DOUBLE:
+      *d = obj.as.dbl;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_nil(cmp_ctx_t *ctx) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type == CMP_TYPE_NIL)
+    return true;
+
+  ctx->error = INVALID_TYPE_ERROR;
+  return false;
+}
+
+bool cmp_read_bool(cmp_ctx_t *ctx, bool *b) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_BOOLEAN) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  if (obj.as.boolean)
+    *b = true;
+  else
+    *b = false;
+
+  return true;
+}
+
+bool cmp_read_bool_as_u8(cmp_ctx_t *ctx, uint8_t *b) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_BOOLEAN) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  if (obj.as.boolean)
+    *b = 1;
+  else
+    *b = 0;
+
+  return true;
+}
+
+bool cmp_read_str_size(cmp_ctx_t *ctx, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      *size = obj.as.str_size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_str(cmp_ctx_t *ctx, char *data, uint32_t *size) {
+  uint32_t str_size = 0;
+
+  if (!cmp_read_str_size(ctx, &str_size))
+    return false;
+
+  if ((str_size + 1) > *size) {
+    *size = str_size;
+    ctx->error = STR_DATA_LENGTH_TOO_LONG_ERROR;
+    return false;
+  }
+
+  if (!ctx->read(ctx, data, str_size)) {
+    ctx->error = DATA_READING_ERROR;
+    return false;
+  }
+
+  data[str_size] = 0;
+
+  *size = str_size;
+  return true;
+}
+
+bool cmp_read_bin_size(cmp_ctx_t *ctx, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      *size = obj.as.bin_size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_bin(cmp_ctx_t *ctx, void *data, uint32_t *size) {
+  uint32_t bin_size = 0;
+
+  if (!cmp_read_bin_size(ctx, &bin_size))
+    return false;
+
+  if (bin_size > *size) {
+    ctx->error = BIN_DATA_LENGTH_TOO_LONG_ERROR;
+    return false;
+  }
+
+  if (!ctx->read(ctx, data, bin_size)) {
+    ctx->error = DATA_READING_ERROR;
+    return false;
+  }
+
+  *size = bin_size;
+  return true;
+}
+
+bool cmp_read_array(cmp_ctx_t *ctx, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FIXARRAY:
+    case CMP_TYPE_ARRAY16:
+    case CMP_TYPE_ARRAY32:
+      *size = obj.as.array_size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_map(cmp_ctx_t *ctx, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FIXMAP:
+    case CMP_TYPE_MAP16:
+    case CMP_TYPE_MAP32:
+      *size = obj.as.map_size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_fixext1_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT1) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext1(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext1_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 1))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_fixext2_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT2) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext2(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext2_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 2))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_fixext4_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT4) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext4(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext4_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 4))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_fixext8_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT8) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext8(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext8_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 8))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_fixext16_marker(cmp_ctx_t *ctx, int8_t *type) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+  
+  if (obj.type != CMP_TYPE_FIXEXT16) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  return true;
+}
+
+bool cmp_read_fixext16(cmp_ctx_t *ctx, int8_t *type, void *data) {
+  if (!cmp_read_fixext16_marker(ctx, type))
+    return false;
+
+  if (ctx->read(ctx, data, 16))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_ext8_marker(cmp_ctx_t *ctx, int8_t *type, uint8_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_EXT8) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  *size = (uint8_t)obj.as.ext.size;
+
+  return true;
+}
+
+bool cmp_read_ext8(cmp_ctx_t *ctx, int8_t *type, uint8_t *size, void *data) {
+  if (!cmp_read_ext8_marker(ctx, type, size))
+    return false;
+
+  if (ctx->read(ctx, data, *size))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_ext16_marker(cmp_ctx_t *ctx, int8_t *type, uint16_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_EXT16) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  *size = (uint16_t)obj.as.ext.size;
+
+  return true;
+}
+
+bool cmp_read_ext16(cmp_ctx_t *ctx, int8_t *type, uint16_t *size, void *data) {
+  if (!cmp_read_ext16_marker(ctx, type, size))
+    return false;
+
+  if (ctx->read(ctx, data, *size))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_ext32_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  if (obj.type != CMP_TYPE_EXT32) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  *type = obj.as.ext.type;
+  *size = obj.as.ext.size;
+
+  return true;
+}
+
+bool cmp_read_ext32(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data) {
+  if (!cmp_read_ext32_marker(ctx, type, size))
+    return false;
+
+  if (ctx->read(ctx, data, *size))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_ext_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size) {
+  cmp_object_t obj;
+
+  if (!cmp_read_object(ctx, &obj))
+    return false;
+
+  switch (obj.type) {
+    case CMP_TYPE_FIXEXT1:
+    case CMP_TYPE_FIXEXT2:
+    case CMP_TYPE_FIXEXT4:
+    case CMP_TYPE_FIXEXT8:
+    case CMP_TYPE_FIXEXT16:
+    case CMP_TYPE_EXT8:
+    case CMP_TYPE_EXT16:
+    case CMP_TYPE_EXT32:
+      *type = obj.as.ext.type;
+      *size = obj.as.ext.size;
+      return true;
+    default:
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+  }
+}
+
+bool cmp_read_ext(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data) {
+  if (!cmp_read_ext_marker(ctx, type, size))
+    return false;
+
+  if (ctx->read(ctx, data, *size))
+    return true;
+
+  ctx->error = DATA_READING_ERROR;
+  return false;
+}
+
+bool cmp_read_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
+  uint8_t type_marker = 0;
+
+  if (!read_type_marker(ctx, &type_marker))
+    return false;
+
+  if (!type_marker_to_cmp_type(type_marker, &obj->type)) {
+    ctx->error = INVALID_TYPE_ERROR;
+    return false;
+  }
+
+  return read_obj_data(ctx, type_marker, obj);
+}
+
+bool cmp_skip_object(cmp_ctx_t *ctx, cmp_object_t *obj) {
+  return cmp_skip_object_limit(ctx, obj, 0);
+}
+
+bool cmp_skip_object_limit(cmp_ctx_t *ctx, cmp_object_t *obj, uint32_t limit) {
+  size_t element_count = 1;
+  uint32_t depth = 0;
+
+  while (element_count) {
+    uint8_t type_marker = 0;
+    uint8_t cmp_type;
+    uint32_t size = 0;
+
+    if (!read_type_marker(ctx, &type_marker)) {
+      return false;
+    }
+
+    if (!type_marker_to_cmp_type(type_marker, &cmp_type)) {
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+    }
+
+    switch (cmp_type) {
+      case CMP_TYPE_FIXARRAY:
+      case CMP_TYPE_ARRAY16:
+      case CMP_TYPE_ARRAY32:
+      case CMP_TYPE_FIXMAP:
+      case CMP_TYPE_MAP16:
+      case CMP_TYPE_MAP32:
+        depth++;
+
+        if (depth > limit) {
+          obj->type = cmp_type;
+
+          if (!read_obj_data(ctx, type_marker, obj)) {
+            return false;
+          }
+
+          ctx->error = SKIP_DEPTH_LIMIT_EXCEEDED_ERROR;
+
+          return false;
+        }
+
+        break;
+      default:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+
+        if (size) {
+          switch (cmp_type) {
+            case CMP_TYPE_FIXEXT1:
+            case CMP_TYPE_FIXEXT2:
+            case CMP_TYPE_FIXEXT4:
+            case CMP_TYPE_FIXEXT8:
+            case CMP_TYPE_FIXEXT16:
+            case CMP_TYPE_EXT8:
+            case CMP_TYPE_EXT16:
+            case CMP_TYPE_EXT32:
+              size++;
+            default:
+              break;
+          }
+
+          skip_bytes(ctx, size);
+        }
+    }
+
+    element_count--;
+
+    switch (cmp_type) {
+      case CMP_TYPE_FIXARRAY:
+      case CMP_TYPE_ARRAY16:
+      case CMP_TYPE_ARRAY32:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+        element_count += size;
+        break;
+      case CMP_TYPE_FIXMAP:
+      case CMP_TYPE_MAP16:
+      case CMP_TYPE_MAP32:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+        element_count += ((size_t)size) * 2;
+        break;
+      default:
+        break;
+    }
+  }
+
+  return true;
+}
+
+bool cmp_skip_object_no_limit(cmp_ctx_t *ctx) {
+  size_t element_count = 1;
+
+  while (element_count) {
+    uint8_t type_marker = 0;
+    uint8_t cmp_type = 0;
+    uint32_t size = 0;
+
+    if (!read_type_marker(ctx, &type_marker)) {
+      return false;
+    }
+
+    if (!type_marker_to_cmp_type(type_marker, &cmp_type)) {
+      ctx->error = INVALID_TYPE_ERROR;
+      return false;
+    }
+
+    switch (cmp_type) {
+      case CMP_TYPE_FIXARRAY:
+      case CMP_TYPE_ARRAY16:
+      case CMP_TYPE_ARRAY32:
+      case CMP_TYPE_FIXMAP:
+      case CMP_TYPE_MAP16:
+      case CMP_TYPE_MAP32:
+        break;
+      default:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+
+        if (size) {
+          switch (cmp_type) {
+            case CMP_TYPE_FIXEXT1:
+            case CMP_TYPE_FIXEXT2:
+            case CMP_TYPE_FIXEXT4:
+            case CMP_TYPE_FIXEXT8:
+            case CMP_TYPE_FIXEXT16:
+            case CMP_TYPE_EXT8:
+            case CMP_TYPE_EXT16:
+            case CMP_TYPE_EXT32:
+              size++;
+            default:
+              break;
+          }
+
+          skip_bytes(ctx, size);
+        }
+    }
+
+    element_count--;
+
+    switch (cmp_type) {
+      case CMP_TYPE_FIXARRAY:
+      case CMP_TYPE_ARRAY16:
+      case CMP_TYPE_ARRAY32:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+        element_count += size;
+        break;
+      case CMP_TYPE_FIXMAP:
+      case CMP_TYPE_MAP16:
+      case CMP_TYPE_MAP32:
+        if (!read_type_size(ctx, type_marker, cmp_type, &size)) {
+          return false;
+        }
+        element_count += ((size_t)size) * 2;
+        break;
+      default:
+        break;
+    }
+  }
+
+  return true;
+}
+
+bool cmp_object_is_char(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_short(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+    case CMP_TYPE_SINT16:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_int(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+    case CMP_TYPE_SINT16:
+    case CMP_TYPE_SINT32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_long(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+    case CMP_TYPE_SINT16:
+    case CMP_TYPE_SINT32:
+    case CMP_TYPE_SINT64:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_sinteger(cmp_object_t *obj) {
+  return cmp_object_is_long(obj);
+}
+
+bool cmp_object_is_uchar(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_ushort(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      return true;
+    case CMP_TYPE_UINT16:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_uint(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+    case CMP_TYPE_UINT16:
+    case CMP_TYPE_UINT32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_ulong(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+    case CMP_TYPE_UINT16:
+    case CMP_TYPE_UINT32:
+    case CMP_TYPE_UINT64:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_uinteger(cmp_object_t *obj) {
+  return cmp_object_is_ulong(obj);
+}
+
+bool cmp_object_is_float(cmp_object_t *obj) {
+  if (obj->type == CMP_TYPE_FLOAT)
+    return true;
+
+  return false;
+}
+
+bool cmp_object_is_double(cmp_object_t *obj) {
+  if (obj->type == CMP_TYPE_DOUBLE)
+    return true;
+
+  return false;
+}
+
+bool cmp_object_is_nil(cmp_object_t *obj) {
+  if (obj->type == CMP_TYPE_NIL)
+    return true;
+
+  return false;
+}
+
+bool cmp_object_is_bool(cmp_object_t *obj) {
+  if (obj->type == CMP_TYPE_BOOLEAN)
+    return true;
+
+  return false;
+}
+
+bool cmp_object_is_str(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_bin(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_array(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXARRAY:
+    case CMP_TYPE_ARRAY16:
+    case CMP_TYPE_ARRAY32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_map(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXMAP:
+    case CMP_TYPE_MAP16:
+    case CMP_TYPE_MAP32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_is_ext(cmp_object_t *obj) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXEXT1:
+    case CMP_TYPE_FIXEXT2:
+    case CMP_TYPE_FIXEXT4:
+    case CMP_TYPE_FIXEXT8:
+    case CMP_TYPE_FIXEXT16:
+    case CMP_TYPE_EXT8:
+    case CMP_TYPE_EXT16:
+    case CMP_TYPE_EXT32:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_as_char(cmp_object_t *obj, int8_t *c) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *c = obj->as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      if (obj->as.u8 <= 127) {
+        *c = obj->as.s8;
+        return true;
+      }
+      else {
+        return false;
+      }
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_short(cmp_object_t *obj, int16_t *s) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *s = obj->as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *s = obj->as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *s = obj->as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      if (obj->as.u16 <= 32767) {
+        *s = obj->as.u16;
+        return true;
+      }
+      else {
+        return false;
+      }
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_int(cmp_object_t *obj, int32_t *i) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *i = obj->as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *i = obj->as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *i = obj->as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      *i = obj->as.u16;
+      return true;
+    case CMP_TYPE_SINT32:
+      *i = obj->as.s32;
+      return true;
+    case CMP_TYPE_UINT32:
+      if (obj->as.u32 <= 2147483647) {
+        *i = obj->as.u32;
+        return true;
+      }
+      else {
+        return false;
+      }
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_long(cmp_object_t *obj, int64_t *d) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_NEGATIVE_FIXNUM:
+    case CMP_TYPE_SINT8:
+      *d = obj->as.s8;
+      return true;
+    case CMP_TYPE_UINT8:
+      *d = obj->as.u8;
+      return true;
+    case CMP_TYPE_SINT16:
+      *d = obj->as.s16;
+      return true;
+    case CMP_TYPE_UINT16:
+      *d = obj->as.u16;
+      return true;
+    case CMP_TYPE_SINT32:
+      *d = obj->as.s32;
+      return true;
+    case CMP_TYPE_UINT32:
+      *d = obj->as.u32;
+      return true;
+    case CMP_TYPE_SINT64:
+      *d = obj->as.s64;
+      return true;
+    case CMP_TYPE_UINT64:
+      if (obj->as.u64 <= 9223372036854775807) {
+        *d = obj->as.u64;
+        return true;
+      }
+      else {
+        return false;
+      }
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_sinteger(cmp_object_t *obj, int64_t *d) {
+  return cmp_object_as_long(obj, d);
+}
+
+bool cmp_object_as_uchar(cmp_object_t *obj, uint8_t *c) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *c = obj->as.u8;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_ushort(cmp_object_t *obj, uint16_t *s) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *s = obj->as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *s = obj->as.u16;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_uint(cmp_object_t *obj, uint32_t *i) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *i = obj->as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *i = obj->as.u16;
+      return true;
+    case CMP_TYPE_UINT32:
+      *i = obj->as.u32;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_ulong(cmp_object_t *obj, uint64_t *u) {
+  switch (obj->type) {
+    case CMP_TYPE_POSITIVE_FIXNUM:
+    case CMP_TYPE_UINT8:
+      *u = obj->as.u8;
+      return true;
+    case CMP_TYPE_UINT16:
+      *u = obj->as.u16;
+      return true;
+    case CMP_TYPE_UINT32:
+      *u = obj->as.u32;
+      return true;
+    case CMP_TYPE_UINT64:
+      *u = obj->as.u64;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_uinteger(cmp_object_t *obj, uint64_t *d) {
+  return cmp_object_as_ulong(obj, d);
+}
+
+bool cmp_object_as_float(cmp_object_t *obj, float *f) {
+  if (obj->type == CMP_TYPE_FLOAT) {
+    *f = obj->as.flt;
+    return true;
+  }
+
+  return false;
+}
+
+bool cmp_object_as_double(cmp_object_t *obj, double *d) {
+  if (obj->type == CMP_TYPE_DOUBLE) {
+    *d = obj->as.dbl;
+    return true;
+  }
+
+  return false;
+}
+
+bool cmp_object_as_bool(cmp_object_t *obj, bool *b) {
+  if (obj->type == CMP_TYPE_BOOLEAN) {
+    if (obj->as.boolean)
+      *b = true;
+    else
+      *b = false;
+
+    return true;
+  }
+
+  return false;
+}
+
+bool cmp_object_as_str(cmp_object_t *obj, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      *size = obj->as.str_size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_bin(cmp_object_t *obj, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      *size = obj->as.bin_size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_array(cmp_object_t *obj, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXARRAY:
+    case CMP_TYPE_ARRAY16:
+    case CMP_TYPE_ARRAY32:
+      *size = obj->as.array_size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_map(cmp_object_t *obj, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXMAP:
+    case CMP_TYPE_MAP16:
+    case CMP_TYPE_MAP32:
+      *size = obj->as.map_size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_as_ext(cmp_object_t *obj, int8_t *type, uint32_t *size) {
+  switch (obj->type) {
+    case CMP_TYPE_FIXEXT1:
+    case CMP_TYPE_FIXEXT2:
+    case CMP_TYPE_FIXEXT4:
+    case CMP_TYPE_FIXEXT8:
+    case CMP_TYPE_FIXEXT16:
+    case CMP_TYPE_EXT8:
+    case CMP_TYPE_EXT16:
+    case CMP_TYPE_EXT32:
+      *type = obj->as.ext.type;
+      *size = obj->as.ext.size;
+      return true;
+    default:
+        return false;
+  }
+}
+
+bool cmp_object_to_str(cmp_ctx_t *ctx, cmp_object_t *obj, char *data,
+                                                          uint32_t buf_size) {
+  uint32_t str_size = 0;
+
+  switch (obj->type) {
+    case CMP_TYPE_FIXSTR:
+    case CMP_TYPE_STR8:
+    case CMP_TYPE_STR16:
+    case CMP_TYPE_STR32:
+      str_size = obj->as.str_size;
+      if ((str_size + 1) > buf_size) {
+        ctx->error = STR_DATA_LENGTH_TOO_LONG_ERROR;
+        return false;
+      }
+
+      if (!ctx->read(ctx, data, str_size)) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+
+      data[str_size] = 0;
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool cmp_object_to_bin(cmp_ctx_t *ctx, cmp_object_t *obj, void *data,
+                                                          uint32_t buf_size) {
+  uint32_t bin_size = 0;
+
+  switch (obj->type) {
+    case CMP_TYPE_BIN8:
+    case CMP_TYPE_BIN16:
+    case CMP_TYPE_BIN32:
+      bin_size = obj->as.bin_size;
+      if (bin_size > buf_size) {
+        ctx->error = BIN_DATA_LENGTH_TOO_LONG_ERROR;
+        return false;
+      }
+
+      if (!ctx->read(ctx, data, bin_size)) {
+        ctx->error = DATA_READING_ERROR;
+        return false;
+      }
+      return true;
+    default:
+      return false;
+  }
+}
+
+/* vi: set et ts=2 sw=2: */
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/cmp.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/cmp.h
new file mode 100644
index 0000000..c78b37b
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/cmp.h
@@ -0,0 +1,526 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2017 Charles Gunyon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#ifndef CMP_H__
+#define CMP_H__
+
+struct cmp_ctx_s;
+
+typedef bool   (*cmp_reader)(struct cmp_ctx_s *ctx, void *data, size_t limit);
+typedef bool   (*cmp_skipper)(struct cmp_ctx_s *ctx, size_t count);
+typedef size_t (*cmp_writer)(struct cmp_ctx_s *ctx, const void *data,
+                                                    size_t count);
+
+enum {
+  CMP_TYPE_POSITIVE_FIXNUM, /*  0 */
+  CMP_TYPE_FIXMAP,          /*  1 */
+  CMP_TYPE_FIXARRAY,        /*  2 */
+  CMP_TYPE_FIXSTR,          /*  3 */
+  CMP_TYPE_NIL,             /*  4 */
+  CMP_TYPE_BOOLEAN,         /*  5 */
+  CMP_TYPE_BIN8,            /*  6 */
+  CMP_TYPE_BIN16,           /*  7 */
+  CMP_TYPE_BIN32,           /*  8 */
+  CMP_TYPE_EXT8,            /*  9 */
+  CMP_TYPE_EXT16,           /* 10 */
+  CMP_TYPE_EXT32,           /* 11 */
+  CMP_TYPE_FLOAT,           /* 12 */
+  CMP_TYPE_DOUBLE,          /* 13 */
+  CMP_TYPE_UINT8,           /* 14 */
+  CMP_TYPE_UINT16,          /* 15 */
+  CMP_TYPE_UINT32,          /* 16 */
+  CMP_TYPE_UINT64,          /* 17 */
+  CMP_TYPE_SINT8,           /* 18 */
+  CMP_TYPE_SINT16,          /* 19 */
+  CMP_TYPE_SINT32,          /* 20 */
+  CMP_TYPE_SINT64,          /* 21 */
+  CMP_TYPE_FIXEXT1,         /* 22 */
+  CMP_TYPE_FIXEXT2,         /* 23 */
+  CMP_TYPE_FIXEXT4,         /* 24 */
+  CMP_TYPE_FIXEXT8,         /* 25 */
+  CMP_TYPE_FIXEXT16,        /* 26 */
+  CMP_TYPE_STR8,            /* 27 */
+  CMP_TYPE_STR16,           /* 28 */
+  CMP_TYPE_STR32,           /* 29 */
+  CMP_TYPE_ARRAY16,         /* 30 */
+  CMP_TYPE_ARRAY32,         /* 31 */
+  CMP_TYPE_MAP16,           /* 32 */
+  CMP_TYPE_MAP32,           /* 33 */
+  CMP_TYPE_NEGATIVE_FIXNUM  /* 34 */
+};
+
+typedef struct cmp_ext_s {
+  int8_t type;
+  uint32_t size;
+} cmp_ext_t;
+
+union cmp_object_data_u {
+  bool      boolean;
+  uint8_t   u8;
+  uint16_t  u16;
+  uint32_t  u32;
+  uint64_t  u64;
+  int8_t    s8;
+  int16_t   s16;
+  int32_t   s32;
+  int64_t   s64;
+  float     flt;
+  double    dbl;
+  uint32_t  array_size;
+  uint32_t  map_size;
+  uint32_t  str_size;
+  uint32_t  bin_size;
+  cmp_ext_t ext;
+};
+
+typedef struct cmp_ctx_s {
+  uint8_t      error;
+  void        *buf;
+  cmp_reader   read;
+  cmp_skipper  skip;
+  cmp_writer   write;
+} cmp_ctx_t;
+
+typedef struct cmp_object_s {
+  uint8_t type;
+  union cmp_object_data_u as;
+} cmp_object_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * === Main API
+ * ============================================================================
+ */
+
+/*
+ * Initializes a CMP context
+ *
+ * If you don't intend to read, `read` may be NULL, but calling `*read*`
+ * functions will crash; there is no check.
+ *
+ * `skip` may be NULL, in which case skipping functions will use `read`.
+ *
+ * If you don't intend to write, `write` may be NULL, but calling `*write*`
+ * functions will crash; there is no check.
+ */
+void cmp_init(cmp_ctx_t *ctx, void *buf, cmp_reader read,
+                                         cmp_skipper skip,
+                                         cmp_writer write);
+
+/* Returns CMP's version */
+uint32_t cmp_version(void);
+
+/* Returns the MessagePack version employed by CMP */
+uint32_t cmp_mp_version(void);
+
+/* Returns a string description of a CMP context's error */
+const char* cmp_strerror(cmp_ctx_t *ctx);
+
+/* Writes a signed integer to the backend */
+bool cmp_write_integer(cmp_ctx_t *ctx, int64_t d);
+
+/* Writes an unsigned integer to the backend */
+bool cmp_write_uinteger(cmp_ctx_t *ctx, uint64_t u);
+
+/*
+ * Writes a floating-point value (either single or double-precision) to the
+ * backend
+ */
+bool cmp_write_decimal(cmp_ctx_t *ctx, double d);
+
+/* Writes NULL to the backend */
+bool cmp_write_nil(cmp_ctx_t *ctx);
+
+/* Writes true to the backend */
+bool cmp_write_true(cmp_ctx_t *ctx);
+
+/* Writes false to the backend */
+bool cmp_write_false(cmp_ctx_t *ctx);
+
+/* Writes a boolean value to the backend */
+bool cmp_write_bool(cmp_ctx_t *ctx, bool b);
+
+/*
+ * Writes an unsigned char's value to the backend as a boolean.  This is useful
+ * if you are using a different boolean type in your application.
+ */
+bool cmp_write_u8_as_bool(cmp_ctx_t *ctx, uint8_t b);
+
+/*
+ * Writes a string to the backend; according to the MessagePack spec, this must
+ * be encoded using UTF-8, but CMP leaves that job up to the programmer.
+ */
+bool cmp_write_str(cmp_ctx_t *ctx, const char *data, uint32_t size);
+
+/*
+ * Writes a string to the backend.  This avoids using the STR8 marker, which
+ * is unsupported by MessagePack v4, the version implemented by many other
+ * MessagePack libraries.  No encoding is assumed in this case, not that it
+ * matters.
+ */
+bool cmp_write_str_v4(cmp_ctx_t *ctx, const char *data, uint32_t size);
+
+/*
+ * Writes the string marker to the backend.  This is useful if you are writing
+ * data in chunks instead of a single shot.
+ */
+bool cmp_write_str_marker(cmp_ctx_t *ctx, uint32_t size);
+
+/*
+ * Writes the string marker to the backend.  This is useful if you are writing
+ * data in chunks instead of a single shot.  This avoids using the STR8
+ * marker, which is unsupported by MessagePack v4, the version implemented by
+ * many other MessagePack libraries.  No encoding is assumed in this case, not
+ * that it matters.
+ */
+bool cmp_write_str_marker_v4(cmp_ctx_t *ctx, uint32_t size);
+
+/* Writes binary data to the backend */
+bool cmp_write_bin(cmp_ctx_t *ctx, const void *data, uint32_t size);
+
+/*
+ * Writes the binary data marker to the backend.  This is useful if you are
+ * writing data in chunks instead of a single shot.
+ */
+bool cmp_write_bin_marker(cmp_ctx_t *ctx, uint32_t size);
+
+/* Writes an array to the backend. */
+bool cmp_write_array(cmp_ctx_t *ctx, uint32_t size);
+
+/* Writes a map to the backend. */
+bool cmp_write_map(cmp_ctx_t *ctx, uint32_t size);
+
+/* Writes an extended type to the backend */
+bool cmp_write_ext(cmp_ctx_t *ctx, int8_t type, uint32_t size,
+                                   const void *data);
+
+/*
+ * Writes the extended type marker to the backend.  This is useful if you want
+ * to write the type's data in chunks instead of a single shot.
+ */
+bool cmp_write_ext_marker(cmp_ctx_t *ctx, int8_t type, uint32_t size);
+
+/* Writes an object to the backend */
+bool cmp_write_object(cmp_ctx_t *ctx, cmp_object_t *obj);
+
+/*
+ * Writes an object to the backend. This avoids using the STR8 marker, which
+ * is unsupported by MessagePack v4, the version implemented by many other
+ * MessagePack libraries.
+ */
+bool cmp_write_object_v4(cmp_ctx_t *ctx, cmp_object_t *obj);
+
+/* Reads a signed integer that fits inside a signed char */
+bool cmp_read_char(cmp_ctx_t *ctx, int8_t *c);
+
+/* Reads a signed integer that fits inside a signed short */
+bool cmp_read_short(cmp_ctx_t *ctx, int16_t *s);
+
+/* Reads a signed integer that fits inside a signed int */
+bool cmp_read_int(cmp_ctx_t *ctx, int32_t *i);
+
+/* Reads a signed integer that fits inside a signed long */
+bool cmp_read_long(cmp_ctx_t *ctx, int64_t *d);
+
+/* Reads a signed integer */
+bool cmp_read_integer(cmp_ctx_t *ctx, int64_t *d);
+
+/* Reads an unsigned integer that fits inside an unsigned char */
+bool cmp_read_uchar(cmp_ctx_t *ctx, uint8_t *c);
+
+/* Reads an unsigned integer that fits inside an unsigned short */
+bool cmp_read_ushort(cmp_ctx_t *ctx, uint16_t *s);
+
+/* Reads an unsigned integer that fits inside an unsigned int */
+bool cmp_read_uint(cmp_ctx_t *ctx, uint32_t *i);
+
+/* Reads an unsigned integer that fits inside an unsigned long */
+bool cmp_read_ulong(cmp_ctx_t *ctx, uint64_t *u);
+
+/* Reads an unsigned integer */
+bool cmp_read_uinteger(cmp_ctx_t *ctx, uint64_t *u);
+
+/*
+ * Reads a floating point value (either single or double-precision) from the
+ * backend
+ */
+bool cmp_read_decimal(cmp_ctx_t *ctx, double *d);
+
+/* "Reads" (more like "skips") a NULL value from the backend */
+bool cmp_read_nil(cmp_ctx_t *ctx);
+
+/* Reads a boolean from the backend */
+bool cmp_read_bool(cmp_ctx_t *ctx, bool *b);
+
+/*
+ * Reads a boolean as an unsigned char from the backend; this is useful if your
+ * application uses a different boolean type.
+ */
+bool cmp_read_bool_as_u8(cmp_ctx_t *ctx, uint8_t *b);
+
+/* Reads a string's size from the backend */
+bool cmp_read_str_size(cmp_ctx_t *ctx, uint32_t *size);
+
+/*
+ * Reads a string from the backend; according to the spec, the string's data
+ * ought to be encoded using UTF-8, 
+ */
+bool cmp_read_str(cmp_ctx_t *ctx, char *data, uint32_t *size);
+
+/* Reads the size of packed binary data from the backend */
+bool cmp_read_bin_size(cmp_ctx_t *ctx, uint32_t *size);
+
+/* Reads packed binary data from the backend */
+bool cmp_read_bin(cmp_ctx_t *ctx, void *data, uint32_t *size);
+
+/* Reads an array from the backend */
+bool cmp_read_array(cmp_ctx_t *ctx, uint32_t *size);
+
+/* Reads a map from the backend */
+bool cmp_read_map(cmp_ctx_t *ctx, uint32_t *size);
+
+/* Reads the extended type's marker from the backend */
+bool cmp_read_ext_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size);
+
+/* Reads an extended type from the backend */
+bool cmp_read_ext(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data);
+
+/* Reads an object from the backend */
+bool cmp_read_object(cmp_ctx_t *ctx, cmp_object_t *obj);
+
+/*
+ * Skips the next object from the backend.  If that object is an array or map,
+ * this function will:
+ *   - If `obj` is not `NULL`, fill in `obj` with that object
+ *   - Set `ctx->error` to `SKIP_DEPTH_LIMIT_EXCEEDED_ERROR`
+ *   - Return `false`
+ * Otherwise:
+ *   - (Don't touch `obj`)
+ *   - Return `true`
+ */
+bool cmp_skip_object(cmp_ctx_t *ctx, cmp_object_t *obj);
+
+/*
+ * This is similar to `cmp_skip_object`, except it tolerates up to `limit`
+ * levels of nesting.  For example, in order to skip an array that contains a
+ * map, call `cmp_skip_object_limit(ctx, &obj, 2)`.  Or in other words,
+ * `cmp_skip_object(ctx, &obj)` acts similarly to `cmp_skip_object_limit(ctx,
+ * &obj, 0)`
+ *
+ * Specifically, `limit` refers to depth, not breadth.  So in order to skip an
+ * array that contains two arrays that each contain 3 strings, you would call
+ * `cmp_skip_object_limit(ctx, &obj, 2).  In order to skip an array that
+ * contains 4 arrays that each contain 1 string, you would still call
+ * `cmp_skip_object_limit(ctx, &obj, 2).
+ */
+bool cmp_skip_object_limit(cmp_ctx_t *ctx, cmp_object_t *obj, uint32_t limit);
+
+/*
+ * This is similar to `cmp_skip_object`, except it will continually skip
+ * nested data structures.
+ *
+ * WARNING: This can cause your application to spend an unbounded amount of
+ *          time reading nested data structures.  Unless you completely trust
+ *          the data source, you should strongly consider `cmp_skip_object` or
+ *          `cmp_skip_object_limit`.
+ */
+bool cmp_skip_object_no_limit(cmp_ctx_t *ctx);
+
+/*
+ * ============================================================================
+ * === Specific API
+ * ============================================================================
+ */
+
+bool cmp_write_pfix(cmp_ctx_t *ctx, uint8_t c);
+bool cmp_write_nfix(cmp_ctx_t *ctx, int8_t c);
+
+bool cmp_write_sfix(cmp_ctx_t *ctx, int8_t c);
+bool cmp_write_s8(cmp_ctx_t *ctx, int8_t c);
+bool cmp_write_s16(cmp_ctx_t *ctx, int16_t s);
+bool cmp_write_s32(cmp_ctx_t *ctx, int32_t i);
+bool cmp_write_s64(cmp_ctx_t *ctx, int64_t l);
+
+bool cmp_write_ufix(cmp_ctx_t *ctx, uint8_t c);
+bool cmp_write_u8(cmp_ctx_t *ctx, uint8_t c);
+bool cmp_write_u16(cmp_ctx_t *ctx, uint16_t s);
+bool cmp_write_u32(cmp_ctx_t *ctx, uint32_t i);
+bool cmp_write_u64(cmp_ctx_t *ctx, uint64_t l);
+
+bool cmp_write_float(cmp_ctx_t *ctx, float f);
+bool cmp_write_double(cmp_ctx_t *ctx, double d);
+
+bool cmp_write_fixstr_marker(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_fixstr(cmp_ctx_t *ctx, const char *data, uint8_t size);
+bool cmp_write_str8_marker(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_str8(cmp_ctx_t *ctx, const char *data, uint8_t size);
+bool cmp_write_str16_marker(cmp_ctx_t *ctx, uint16_t size);
+bool cmp_write_str16(cmp_ctx_t *ctx, const char *data, uint16_t size);
+bool cmp_write_str32_marker(cmp_ctx_t *ctx, uint32_t size);
+bool cmp_write_str32(cmp_ctx_t *ctx, const char *data, uint32_t size);
+
+bool cmp_write_bin8_marker(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_bin8(cmp_ctx_t *ctx, const void *data, uint8_t size);
+bool cmp_write_bin16_marker(cmp_ctx_t *ctx, uint16_t size);
+bool cmp_write_bin16(cmp_ctx_t *ctx, const void *data, uint16_t size);
+bool cmp_write_bin32_marker(cmp_ctx_t *ctx, uint32_t size);
+bool cmp_write_bin32(cmp_ctx_t *ctx, const void *data, uint32_t size);
+
+bool cmp_write_fixarray(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_array16(cmp_ctx_t *ctx, uint16_t size);
+bool cmp_write_array32(cmp_ctx_t *ctx, uint32_t size);
+
+bool cmp_write_fixmap(cmp_ctx_t *ctx, uint8_t size);
+bool cmp_write_map16(cmp_ctx_t *ctx, uint16_t size);
+bool cmp_write_map32(cmp_ctx_t *ctx, uint32_t size);
+
+bool cmp_write_fixext1_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext1(cmp_ctx_t *ctx, int8_t type, const void *data);
+bool cmp_write_fixext2_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext2(cmp_ctx_t *ctx, int8_t type, const void *data);
+bool cmp_write_fixext4_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext4(cmp_ctx_t *ctx, int8_t type, const void *data);
+bool cmp_write_fixext8_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext8(cmp_ctx_t *ctx, int8_t type, const void *data);
+bool cmp_write_fixext16_marker(cmp_ctx_t *ctx, int8_t type);
+bool cmp_write_fixext16(cmp_ctx_t *ctx, int8_t type, const void *data);
+
+bool cmp_write_ext8_marker(cmp_ctx_t *ctx, int8_t type, uint8_t size);
+bool cmp_write_ext8(cmp_ctx_t *ctx, int8_t type, uint8_t size,
+                                    const void *data);
+bool cmp_write_ext16_marker(cmp_ctx_t *ctx, int8_t type, uint16_t size);
+bool cmp_write_ext16(cmp_ctx_t *ctx, int8_t type, uint16_t size,
+                                     const void *data);
+bool cmp_write_ext32_marker(cmp_ctx_t *ctx, int8_t type, uint32_t size);
+bool cmp_write_ext32(cmp_ctx_t *ctx, int8_t type, uint32_t size,
+                                     const void *data);
+
+bool cmp_read_pfix(cmp_ctx_t *ctx, uint8_t *c);
+bool cmp_read_nfix(cmp_ctx_t *ctx, int8_t *c);
+
+bool cmp_read_sfix(cmp_ctx_t *ctx, int8_t *c);
+bool cmp_read_s8(cmp_ctx_t *ctx, int8_t *c);
+bool cmp_read_s16(cmp_ctx_t *ctx, int16_t *s);
+bool cmp_read_s32(cmp_ctx_t *ctx, int32_t *i);
+bool cmp_read_s64(cmp_ctx_t *ctx, int64_t *l);
+
+bool cmp_read_ufix(cmp_ctx_t *ctx, uint8_t *c);
+bool cmp_read_u8(cmp_ctx_t *ctx, uint8_t *c);
+bool cmp_read_u16(cmp_ctx_t *ctx, uint16_t *s);
+bool cmp_read_u32(cmp_ctx_t *ctx, uint32_t *i);
+bool cmp_read_u64(cmp_ctx_t *ctx, uint64_t *l);
+
+bool cmp_read_float(cmp_ctx_t *ctx, float *f);
+bool cmp_read_double(cmp_ctx_t *ctx, double *d);
+
+bool cmp_read_fixext1_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext1(cmp_ctx_t *ctx, int8_t *type, void *data);
+bool cmp_read_fixext2_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext2(cmp_ctx_t *ctx, int8_t *type, void *data);
+bool cmp_read_fixext4_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext4(cmp_ctx_t *ctx, int8_t *type, void *data);
+bool cmp_read_fixext8_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext8(cmp_ctx_t *ctx, int8_t *type, void *data);
+bool cmp_read_fixext16_marker(cmp_ctx_t *ctx, int8_t *type);
+bool cmp_read_fixext16(cmp_ctx_t *ctx, int8_t *type, void *data);
+
+bool cmp_read_ext8_marker(cmp_ctx_t *ctx, int8_t *type, uint8_t *size);
+bool cmp_read_ext8(cmp_ctx_t *ctx, int8_t *type, uint8_t *size, void *data);
+bool cmp_read_ext16_marker(cmp_ctx_t *ctx, int8_t *type, uint16_t *size);
+bool cmp_read_ext16(cmp_ctx_t *ctx, int8_t *type, uint16_t *size, void *data);
+bool cmp_read_ext32_marker(cmp_ctx_t *ctx, int8_t *type, uint32_t *size);
+bool cmp_read_ext32(cmp_ctx_t *ctx, int8_t *type, uint32_t *size, void *data);
+
+/*
+ * ============================================================================
+ * === Object API
+ * ============================================================================
+ */
+
+bool cmp_object_is_char(cmp_object_t *obj);
+bool cmp_object_is_short(cmp_object_t *obj);
+bool cmp_object_is_int(cmp_object_t *obj);
+bool cmp_object_is_long(cmp_object_t *obj);
+bool cmp_object_is_sinteger(cmp_object_t *obj);
+bool cmp_object_is_uchar(cmp_object_t *obj);
+bool cmp_object_is_ushort(cmp_object_t *obj);
+bool cmp_object_is_uint(cmp_object_t *obj);
+bool cmp_object_is_ulong(cmp_object_t *obj);
+bool cmp_object_is_uinteger(cmp_object_t *obj);
+bool cmp_object_is_float(cmp_object_t *obj);
+bool cmp_object_is_double(cmp_object_t *obj);
+bool cmp_object_is_nil(cmp_object_t *obj);
+bool cmp_object_is_bool(cmp_object_t *obj);
+bool cmp_object_is_str(cmp_object_t *obj);
+bool cmp_object_is_bin(cmp_object_t *obj);
+bool cmp_object_is_array(cmp_object_t *obj);
+bool cmp_object_is_map(cmp_object_t *obj);
+bool cmp_object_is_ext(cmp_object_t *obj);
+
+bool cmp_object_as_char(cmp_object_t *obj, int8_t *c);
+bool cmp_object_as_short(cmp_object_t *obj, int16_t *s);
+bool cmp_object_as_int(cmp_object_t *obj, int32_t *i);
+bool cmp_object_as_long(cmp_object_t *obj, int64_t *d);
+bool cmp_object_as_sinteger(cmp_object_t *obj, int64_t *d);
+bool cmp_object_as_uchar(cmp_object_t *obj, uint8_t *c);
+bool cmp_object_as_ushort(cmp_object_t *obj, uint16_t *s);
+bool cmp_object_as_uint(cmp_object_t *obj, uint32_t *i);
+bool cmp_object_as_ulong(cmp_object_t *obj, uint64_t *u);
+bool cmp_object_as_uinteger(cmp_object_t *obj, uint64_t *u);
+bool cmp_object_as_float(cmp_object_t *obj, float *f);
+bool cmp_object_as_double(cmp_object_t *obj, double *d);
+bool cmp_object_as_bool(cmp_object_t *obj, bool *b);
+bool cmp_object_as_str(cmp_object_t *obj, uint32_t *size);
+bool cmp_object_as_bin(cmp_object_t *obj, uint32_t *size);
+bool cmp_object_as_array(cmp_object_t *obj, uint32_t *size);
+bool cmp_object_as_map(cmp_object_t *obj, uint32_t *size);
+bool cmp_object_as_ext(cmp_object_t *obj, int8_t *type, uint32_t *size);
+
+bool cmp_object_to_str(cmp_ctx_t *ctx, cmp_object_t *obj, char *data, uint32_t buf_size);
+bool cmp_object_to_bin(cmp_ctx_t *ctx, cmp_object_t *obj, void *data, uint32_t buf_size);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+/*
+ * ============================================================================
+ * === Backwards compatibility defines
+ * ============================================================================
+ */
+
+#define cmp_write_int      cmp_write_integer
+#define cmp_write_sint     cmp_write_integer
+#define cmp_write_sinteger cmp_write_integer
+#define cmp_write_uint     cmp_write_uinteger
+#define cmp_read_sinteger  cmp_read_integer
+
+#endif /* CMP_H__ */
+
+/* vi: set et ts=2 sw=2: */
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/.gitignore b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/.gitignore
new file mode 100644
index 0000000..056959f
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/.gitignore
@@ -0,0 +1,9 @@
+/hiredis-test
+/examples/hiredis-example*
+/*.o
+/*.so
+/*.dylib
+/*.a
+/*.pc
+*.dSYM
+tags
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/.travis.yml b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/.travis.yml
new file mode 100644
index 0000000..f9a9460
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/.travis.yml
@@ -0,0 +1,131 @@
+language: c
+compiler:
+  - gcc
+  - clang
+
+os:
+  - linux
+  - osx
+
+dist: bionic
+
+branches:
+  only:
+    - staging
+    - trying
+    - master
+    - /^release\/.*$/
+
+install:
+    - if [ "$BITS" == "64" ]; then
+        wget https://github.com/redis/redis/archive/6.0.6.tar.gz;
+        tar -xzvf 6.0.6.tar.gz;
+        pushd redis-6.0.6 && BUILD_TLS=yes make && export PATH=$PWD/src:$PATH && popd;
+      fi
+
+before_script:
+    - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+        curl -O https://distfiles.macports.org/MacPorts/MacPorts-2.6.2-10.13-HighSierra.pkg;
+        sudo installer -pkg MacPorts-2.6.2-10.13-HighSierra.pkg -target /;
+        export PATH=$PATH:/opt/local/bin && sudo port -v selfupdate;
+        sudo port -N install openssl redis;
+      fi;
+
+addons:
+  apt:
+    sources:
+    - sourceline: 'ppa:chris-lea/redis-server'
+    packages:
+    - libc6-dbg
+    - libc6-dev
+    - libc6:i386
+    - libc6-dev-i386
+    - libc6-dbg:i386
+    - gcc-multilib
+    - g++-multilib
+    - libssl-dev
+    - libssl-dev:i386
+    - valgrind
+    - redis
+
+env:
+  - BITS="32"
+  - BITS="64"
+
+script:
+  - EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON -DENABLE_SSL:BOOL=ON";
+    if [ "$BITS" == "64" ]; then
+      EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DENABLE_SSL_TESTS:BOOL=ON";
+    fi;
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      if [ "$BITS" == "32" ]; then
+        CFLAGS="-m32 -Werror";
+        CXXFLAGS="-m32 -Werror";
+        LDFLAGS="-m32";
+        EXTRA_CMAKE_OPTS=;
+      else
+        CFLAGS="-Werror";
+        CXXFLAGS="-Werror";
+      fi;
+    else
+      TEST_PREFIX="valgrind --track-origins=yes --leak-check=full";
+      if [ "$BITS" == "32" ]; then
+        CFLAGS="-m32 -Werror";
+        CXXFLAGS="-m32 -Werror";
+        LDFLAGS="-m32";
+        EXTRA_CMAKE_OPTS=;
+      else
+        CFLAGS="-Werror";
+        CXXFLAGS="-Werror";
+      fi;
+    fi;
+    export CFLAGS CXXFLAGS LDFLAGS TEST_PREFIX EXTRA_CMAKE_OPTS
+  - make && make clean;
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      if [ "$BITS" == "64" ]; then
+        OPENSSL_PREFIX="$(ls -d /usr/local/Cellar/openssl@1.1/*)" USE_SSL=1 make;
+      fi;
+    else
+      USE_SSL=1 make;
+    fi;
+  - mkdir build/ && cd build/
+  - cmake .. ${EXTRA_CMAKE_OPTS}
+  - make VERBOSE=1
+  - if [ "$BITS" == "64" ]; then
+      TEST_SSL=1 SKIPS_AS_FAILS=1 ctest -V;
+    else
+      SKIPS_AS_FAILS=1 ctest -V;
+    fi;
+
+jobs:
+  include:
+    # Windows MinGW cross compile on Linux
+    - os: linux
+      dist: xenial
+      compiler: mingw
+      addons:
+        apt:
+          packages:
+            - ninja-build
+            - gcc-mingw-w64-x86-64
+            - g++-mingw-w64-x86-64
+      script:
+        - mkdir build && cd build
+        - CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_WITH_INSTALL_RPATH=on
+        - ninja -v
+
+    # Windows MSVC 2017
+    - os: windows
+      compiler: msvc
+      env:
+        - MATRIX_EVAL="CC=cl.exe && CXX=cl.exe"
+      before_install:
+        - eval "${MATRIX_EVAL}"
+      install:
+        - choco install ninja
+        - choco install -y memurai-developer
+      script:
+        - mkdir build && cd build
+        - cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' amd64 '&&'
+          cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_EXAMPLES=ON '&&' ninja -v
+        - ./hiredis-test.exe
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/CHANGELOG.md b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/CHANGELOG.md
new file mode 100644
index 0000000..2a2bc31
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/CHANGELOG.md
@@ -0,0 +1,364 @@
+## [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2) - (2021-10-07)
+
+Announcing Hiredis v1.0.2, which fixes CVE-2021-32765 but returns the SONAME to the correct value of `1.0.0`.
+
+- [Revert SONAME bump](https://github.com/redis/hiredis/commit/d4e6f109a064690cde64765c654e679fea1d3548)
+  ([Michael Grunder](https://github.com/michael-grunder))
+
+## [1.0.1](https://github.com/redis/hiredis/tree/v1.0.1) - (2021-10-04)
+
+<span style="color:red">This release erroneously bumped the SONAME, please use [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2)</span>
+
+Announcing Hiredis v1.0.1, a security release fixing CVE-2021-32765
+
+- Fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2)
+  [commit](https://github.com/redis/hiredis/commit/76a7b10005c70babee357a7d0f2becf28ec7ed1e)
+  ([Yossi Gottlieb](https://github.com/yossigo))
+
+_Thanks to [Yossi Gottlieb](https://github.com/yossigo) for the security fix and to [Microsoft Security Vulnerability Research](https://www.microsoft.com/en-us/msrc/msvr) for finding the bug._ :sparkling_heart:
+
+## [1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) - (2020-08-03)
+
+Announcing Hiredis v1.0.0, which adds support for RESP3, SSL connections, allocator injection, and better Windows support! :tada:
+
+_A big thanks to everyone who helped with this release.  The following list includes everyone who contributed at least five lines, sorted by lines contributed._ :sparkling_heart:
+
+[Michael Grunder](https://github.com/michael-grunder), [Yossi Gottlieb](https://github.com/yossigo),
+[Mark Nunberg](https://github.com/mnunberg), [Marcus Geelnard](https://github.com/mbitsnbites),
+[Justin Brewer](https://github.com/justinbrewer), [Valentino Geron](https://github.com/valentinogeron),
+[Minun Dragonation](https://github.com/dragonation), [Omri Steiner](https://github.com/OmriSteiner),
+[Sangmoon Yi](https://github.com/jman-krafton), [Jinjiazh](https://github.com/jinjiazhang),
+[Odin Hultgren Van Der Horst](https://github.com/Miniwoffer), [Muhammad Zahalqa](https://github.com/tryfinally),
+[Nick Rivera](https://github.com/heronr), [Qi Yang](https://github.com/movebean),
+[kevin1018](https://github.com/kevin1018)
+
+[Full Changelog](https://github.com/redis/hiredis/compare/v0.14.1...v1.0.0)
+
+**BREAKING CHANGES**:
+
+* `redisOptions` now has two timeout fields.  One for connecting, and one for commands.  If you're presently using `options->timeout` you will need to change it to use `options->connect_timeout`. (See [example](https://github.com/redis/hiredis/commit/38b5ae543f5c99eb4ccabbe277770fc6bc81226f#diff-86ba39d37aa829c8c82624cce4f049fbL36))
+
+* Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now protocol errors. This is consistent
+  with the RESP specification. On 32-bit platforms, the upper bound is lowered to `SIZE_MAX`.
+
+* `redisReplyObjectFunctions.createArray` now takes `size_t` for its length parameter.
+
+**New features:**
+- Support for RESP3
+  [\#697](https://github.com/redis/hiredis/pull/697),
+  [\#805](https://github.com/redis/hiredis/pull/805),
+  [\#819](https://github.com/redis/hiredis/pull/819),
+  [\#841](https://github.com/redis/hiredis/pull/841)
+  ([Yossi Gottlieb](https://github.com/yossigo), [Michael Grunder](https://github.com/michael-grunder))
+- Support for SSL connections
+  [\#645](https://github.com/redis/hiredis/pull/645),
+  [\#699](https://github.com/redis/hiredis/pull/699),
+  [\#702](https://github.com/redis/hiredis/pull/702),
+  [\#708](https://github.com/redis/hiredis/pull/708),
+  [\#711](https://github.com/redis/hiredis/pull/711),
+  [\#821](https://github.com/redis/hiredis/pull/821),
+  [more](https://github.com/redis/hiredis/pulls?q=is%3Apr+is%3Amerged+SSL)
+  ([Mark Nunberg](https://github.com/mnunberg), [Yossi Gottlieb](https://github.com/yossigo))
+- Run-time allocator injection
+  [\#800](https://github.com/redis/hiredis/pull/800)
+  ([Michael Grunder](https://github.com/michael-grunder))
+- Improved Windows support (including MinGW and Windows CI)
+  [\#652](https://github.com/redis/hiredis/pull/652),
+  [\#663](https://github.com/redis/hiredis/pull/663)
+  ([Marcus Geelnard](https://www.bitsnbites.eu/author/m/))
+- Adds support for distinct connect and command timeouts
+  [\#839](https://github.com/redis/hiredis/pull/839),
+  [\#829](https://github.com/redis/hiredis/pull/829)
+  ([Valentino Geron](https://github.com/valentinogeron))
+- Add generic pointer and destructor to `redisContext` that users can use for context.
+  [\#855](https://github.com/redis/hiredis/pull/855)
+  ([Michael Grunder](https://github.com/michael-grunder))
+
+**Closed issues (that involved code changes):**
+
+- Makefile does not install TLS libraries  [\#809](https://github.com/redis/hiredis/issues/809)
+- redisConnectWithOptions should not set command timeout [\#722](https://github.com/redis/hiredis/issues/722), [\#829](https://github.com/redis/hiredis/pull/829) ([valentinogeron](https://github.com/valentinogeron))
+- Fix integer overflow in `sdsrange` [\#827](https://github.com/redis/hiredis/issues/827)
+- INFO & CLUSTER commands failed when using RESP3 [\#802](https://github.com/redis/hiredis/issues/802)
+- Windows compatibility patches [\#687](https://github.com/redis/hiredis/issues/687), [\#838](https://github.com/redis/hiredis/issues/838), [\#842](https://github.com/redis/hiredis/issues/842)
+- RESP3 PUSH messages incorrectly use pending callback [\#825](https://github.com/redis/hiredis/issues/825)
+- Asynchronous PSUBSCRIBE command fails when using RESP3 [\#815](https://github.com/redis/hiredis/issues/815)
+- New SSL API [\#804](https://github.com/redis/hiredis/issues/804), [\#813](https://github.com/redis/hiredis/issues/813)
+- Hard-coded limit of nested reply depth [\#794](https://github.com/redis/hiredis/issues/794)
+- Fix TCP_NODELAY in Windows/OSX [\#679](https://github.com/redis/hiredis/issues/679), [\#690](https://github.com/redis/hiredis/issues/690), [\#779](https://github.com/redis/hiredis/issues/779), [\#785](https://github.com/redis/hiredis/issues/785),
+- Added timers to libev adapter.  [\#778](https://github.com/redis/hiredis/issues/778), [\#795](https://github.com/redis/hiredis/pull/795)
+- Initialization discards const qualifier [\#777](https://github.com/redis/hiredis/issues/777)
+- \[BUG\]\[MinGW64\] Error setting socket timeout  [\#775](https://github.com/redis/hiredis/issues/775)
+- undefined reference to hi_malloc [\#769](https://github.com/redis/hiredis/issues/769)
+- hiredis pkg-config file incorrectly ignores multiarch libdir spec'n [\#767](https://github.com/redis/hiredis/issues/767)
+- Don't use -G to build shared object on Solaris [\#757](https://github.com/redis/hiredis/issues/757)
+- error when make USE\_SSL=1 [\#748](https://github.com/redis/hiredis/issues/748)
+- Allow to change SSL Mode [\#646](https://github.com/redis/hiredis/issues/646)
+- hiredis/adapters/libevent.h memleak [\#618](https://github.com/redis/hiredis/issues/618)
+- redisLibuvPoll crash when server closes the connetion [\#545](https://github.com/redis/hiredis/issues/545)
+- about redisAsyncDisconnect question [\#518](https://github.com/redis/hiredis/issues/518)
+- hiredis adapters libuv error for help [\#508](https://github.com/redis/hiredis/issues/508)
+- API/ABI changes analysis [\#506](https://github.com/redis/hiredis/issues/506)
+- Memory leak patch in Redis [\#502](https://github.com/redis/hiredis/issues/502)
+- Remove the depth limitation [\#421](https://github.com/redis/hiredis/issues/421)
+
+**Merged pull requests:**
+
+- Move SSL management to a distinct private pointer [\#855](https://github.com/redis/hiredis/pull/855) ([michael-grunder](https://github.com/michael-grunder))
+- Move include to sockcompat.h to maintain style [\#850](https://github.com/redis/hiredis/pull/850) ([michael-grunder](https://github.com/michael-grunder))
+- Remove erroneous tag and add license to push example [\#849](https://github.com/redis/hiredis/pull/849) ([michael-grunder](https://github.com/michael-grunder))
+- fix windows compiling with mingw [\#848](https://github.com/redis/hiredis/pull/848) ([rmalizia44](https://github.com/rmalizia44))
+- Some Windows quality of life improvements. [\#846](https://github.com/redis/hiredis/pull/846) ([michael-grunder](https://github.com/michael-grunder))
+- Use \_WIN32 define instead of WIN32 [\#845](https://github.com/redis/hiredis/pull/845) ([michael-grunder](https://github.com/michael-grunder))
+- Non Linux CI fixes [\#844](https://github.com/redis/hiredis/pull/844) ([michael-grunder](https://github.com/michael-grunder))
+- Resp3 oob push support [\#841](https://github.com/redis/hiredis/pull/841) ([michael-grunder](https://github.com/michael-grunder))
+- fix \#785: defer TCP\_NODELAY in async tcp connections [\#836](https://github.com/redis/hiredis/pull/836) ([OmriSteiner](https://github.com/OmriSteiner))
+- sdsrange overflow fix [\#830](https://github.com/redis/hiredis/pull/830) ([michael-grunder](https://github.com/michael-grunder))
+- Use explicit pointer casting for c++ compatibility [\#826](https://github.com/redis/hiredis/pull/826) ([aureus1](https://github.com/aureus1))
+- Document allocator injection and completeness fix in test.c [\#824](https://github.com/redis/hiredis/pull/824) ([michael-grunder](https://github.com/michael-grunder))
+- Use unique names for allocator struct members [\#823](https://github.com/redis/hiredis/pull/823) ([michael-grunder](https://github.com/michael-grunder))
+- New SSL API to replace redisSecureConnection\(\). [\#821](https://github.com/redis/hiredis/pull/821) ([yossigo](https://github.com/yossigo))
+- Add logic to handle RESP3 push messages [\#819](https://github.com/redis/hiredis/pull/819) ([michael-grunder](https://github.com/michael-grunder))
+- Use standrad isxdigit instead of custom helper function. [\#814](https://github.com/redis/hiredis/pull/814) ([tryfinally](https://github.com/tryfinally))
+- Fix missing SSL build/install options. [\#812](https://github.com/redis/hiredis/pull/812) ([yossigo](https://github.com/yossigo))
+- Add link to ABI tracker [\#808](https://github.com/redis/hiredis/pull/808) ([michael-grunder](https://github.com/michael-grunder))
+- Resp3 verbatim string support [\#805](https://github.com/redis/hiredis/pull/805) ([michael-grunder](https://github.com/michael-grunder))
+- Allow users to replace allocator and handle OOM everywhere. [\#800](https://github.com/redis/hiredis/pull/800) ([michael-grunder](https://github.com/michael-grunder))
+- Remove nested depth limitation. [\#797](https://github.com/redis/hiredis/pull/797) ([michael-grunder](https://github.com/michael-grunder))
+- Attempt to fix compilation on Solaris [\#796](https://github.com/redis/hiredis/pull/796) ([michael-grunder](https://github.com/michael-grunder))
+- Support timeouts in libev adapater [\#795](https://github.com/redis/hiredis/pull/795) ([michael-grunder](https://github.com/michael-grunder))
+- Fix pkgconfig when installing to a custom lib dir [\#793](https://github.com/redis/hiredis/pull/793) ([michael-grunder](https://github.com/michael-grunder))
+- Fix USE\_SSL=1 make/cmake on OSX and CMake tests [\#789](https://github.com/redis/hiredis/pull/789) ([michael-grunder](https://github.com/michael-grunder))
+- Use correct libuv call on Windows [\#784](https://github.com/redis/hiredis/pull/784) ([michael-grunder](https://github.com/michael-grunder))
+- Added CMake package config and fixed hiredis\_ssl on Windows [\#783](https://github.com/redis/hiredis/pull/783) ([michael-grunder](https://github.com/michael-grunder))
+- CMake: Set hiredis\_ssl shared object version. [\#780](https://github.com/redis/hiredis/pull/780) ([yossigo](https://github.com/yossigo))
+- Win32 tests and timeout fix [\#776](https://github.com/redis/hiredis/pull/776) ([michael-grunder](https://github.com/michael-grunder))
+- Provides an optional cleanup callback for async data. [\#768](https://github.com/redis/hiredis/pull/768) ([heronr](https://github.com/heronr))
+- Housekeeping fixes [\#764](https://github.com/redis/hiredis/pull/764) ([michael-grunder](https://github.com/michael-grunder))
+- install alloc.h [\#756](https://github.com/redis/hiredis/pull/756) ([ch1aki](https://github.com/ch1aki))
+- fix spelling mistakes [\#746](https://github.com/redis/hiredis/pull/746) ([ShooterIT](https://github.com/ShooterIT))
+- Free the reply in redisGetReply when passed NULL [\#741](https://github.com/redis/hiredis/pull/741) ([michael-grunder](https://github.com/michael-grunder))
+- Fix dead code in sslLogCallback relating to should\_log variable. [\#737](https://github.com/redis/hiredis/pull/737) ([natoscott](https://github.com/natoscott))
+- Fix typo in dict.c. [\#731](https://github.com/redis/hiredis/pull/731) ([Kevin-Xi](https://github.com/Kevin-Xi))
+- Adding an option to DISABLE\_TESTS [\#727](https://github.com/redis/hiredis/pull/727) ([pbotros](https://github.com/pbotros))
+- Update README with SSL support. [\#720](https://github.com/redis/hiredis/pull/720) ([yossigo](https://github.com/yossigo))
+- Fixes leaks in unit tests [\#715](https://github.com/redis/hiredis/pull/715) ([michael-grunder](https://github.com/michael-grunder))
+- SSL Tests [\#711](https://github.com/redis/hiredis/pull/711) ([yossigo](https://github.com/yossigo))
+- SSL Reorganization [\#708](https://github.com/redis/hiredis/pull/708) ([yossigo](https://github.com/yossigo))
+- Fix MSVC build. [\#706](https://github.com/redis/hiredis/pull/706) ([yossigo](https://github.com/yossigo))
+- SSL: Properly report SSL\_connect\(\) errors. [\#702](https://github.com/redis/hiredis/pull/702) ([yossigo](https://github.com/yossigo))
+- Silent SSL trace to stdout by default. [\#699](https://github.com/redis/hiredis/pull/699) ([yossigo](https://github.com/yossigo))
+- Port RESP3 support from Redis. [\#697](https://github.com/redis/hiredis/pull/697) ([yossigo](https://github.com/yossigo))
+- Removed whitespace before newline [\#691](https://github.com/redis/hiredis/pull/691) ([Miniwoffer](https://github.com/Miniwoffer))
+- Add install adapters header files [\#688](https://github.com/redis/hiredis/pull/688) ([kevin1018](https://github.com/kevin1018))
+- Remove unnecessary null check before free [\#684](https://github.com/redis/hiredis/pull/684) ([qlyoung](https://github.com/qlyoung))
+- redisReaderGetReply leak memory [\#671](https://github.com/redis/hiredis/pull/671) ([movebean](https://github.com/movebean))
+- fix timeout code in windows [\#670](https://github.com/redis/hiredis/pull/670) ([jman-krafton](https://github.com/jman-krafton))
+- test: fix errstr matching for musl libc [\#665](https://github.com/redis/hiredis/pull/665) ([ghost](https://github.com/ghost))
+- Windows: MinGW fixes and Windows Travis builders [\#663](https://github.com/redis/hiredis/pull/663) ([mbitsnbites](https://github.com/mbitsnbites))
+- The setsockopt and getsockopt API diffs from BSD socket and WSA one [\#662](https://github.com/redis/hiredis/pull/662) ([dragonation](https://github.com/dragonation))
+- Fix Compile Error On Windows \(Visual Studio\) [\#658](https://github.com/redis/hiredis/pull/658) ([jinjiazhang](https://github.com/jinjiazhang))
+- Fix NXDOMAIN test case [\#653](https://github.com/redis/hiredis/pull/653) ([michael-grunder](https://github.com/michael-grunder))
+- Add MinGW support [\#652](https://github.com/redis/hiredis/pull/652) ([mbitsnbites](https://github.com/mbitsnbites))
+- SSL Support [\#645](https://github.com/redis/hiredis/pull/645) ([mnunberg](https://github.com/mnunberg))
+- Fix Invalid argument after redisAsyncConnectUnix [\#644](https://github.com/redis/hiredis/pull/644) ([codehz](https://github.com/codehz))
+- Makefile: use predefined AR [\#632](https://github.com/redis/hiredis/pull/632) ([Mic92](https://github.com/Mic92))
+- FreeBSD  build fix [\#628](https://github.com/redis/hiredis/pull/628) ([devnexen](https://github.com/devnexen))
+- Fix errors not propagating properly with libuv.h. [\#624](https://github.com/redis/hiredis/pull/624) ([yossigo](https://github.com/yossigo))
+- Update README.md [\#621](https://github.com/redis/hiredis/pull/621) ([Crunsher](https://github.com/Crunsher))
+- Fix redisBufferRead documentation [\#620](https://github.com/redis/hiredis/pull/620) ([hacst](https://github.com/hacst))
+- Add CPPFLAGS to REAL\_CFLAGS [\#614](https://github.com/redis/hiredis/pull/614) ([thomaslee](https://github.com/thomaslee))
+- Update createArray to take size\_t [\#597](https://github.com/redis/hiredis/pull/597) ([justinbrewer](https://github.com/justinbrewer))
+- fix common realloc mistake and add null check more [\#580](https://github.com/redis/hiredis/pull/580) ([charsyam](https://github.com/charsyam))
+- Proper error reporting for connect failures [\#578](https://github.com/redis/hiredis/pull/578) ([mnunberg](https://github.com/mnunberg))
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
+
+## [1.0.0-rc1](https://github.com/redis/hiredis/tree/v1.0.0-rc1) - (2020-07-29)
+
+_Note:  There were no changes to code between v1.0.0-rc1 and v1.0.0 so see v1.0.0 for changelog_
+
+### 0.14.1 (2020-03-13)
+
+* Adds safe allocation wrappers (CVE-2020-7105, #747, #752) (Michael Grunder)
+
+### 0.14.0 (2018-09-25)
+**BREAKING CHANGES**:
+
+* Change `redisReply.len` to `size_t`, as it denotes the the size of a string
+
+  User code should compare this to `size_t` values as well.
+  If it was used to compare to other values, casting might be necessary or can be removed, if casting was applied before.
+
+* Make string2ll static to fix conflict with Redis (Tom Lee [c3188b])
+* Use -dynamiclib instead of -shared for OSX (Ryan Schmidt [a65537])
+* Use string2ll from Redis w/added tests (Michael Grunder [7bef04, 60f622])
+* Makefile - OSX compilation fixes (Ryan Schmidt [881fcb, 0e9af8])
+* Remove redundant NULL checks (Justin Brewer [54acc8, 58e6b8])
+* Fix bulk and multi-bulk length truncation (Justin Brewer [109197])
+* Fix SIGSEGV in OpenBSD by checking for NULL before calling freeaddrinfo (Justin Brewer [546d94])
+* Several POSIX compatibility fixes (Justin Brewer [bbeab8, 49bbaa, d1c1b6])
+* Makefile - Compatibility fixes (Dimitri Vorobiev [3238cf, 12a9d1])
+* Makefile - Fix make install on FreeBSD (Zach Shipko [a2ef2b])
+* Makefile - don't assume $(INSTALL) is cp (Igor Gnatenko [725a96])
+* Separate side-effect causing function from assert and small cleanup (amallia [b46413, 3c3234])
+* Don't send negative values to `__redisAsyncCommand` (Frederik Deweerdt [706129])
+* Fix leak if setsockopt fails (Frederik Deweerdt [e21c9c])
+* Fix libevent leak (zfz [515228])
+* Clean up GCC warning (Ichito Nagata [2ec774])
+* Keep track of errno in `__redisSetErrorFromErrno()` as snprintf may use it (Jin Qing [25cd88])
+* Solaris compilation fix (Donald Whyte [41b07d])
+* Reorder linker arguments when building examples (Tustfarm-heart [06eedd])
+* Keep track of subscriptions in case of rapid subscribe/unsubscribe (Hyungjin Kim [073dc8, be76c5, d46999])
+* libuv use after free fix (Paul Scott [cbb956])
+* Properly close socket fd on reconnect attempt (WSL [64d1ec])
+* Skip valgrind in OSX tests (Jan-Erik Rediger [9deb78])
+* Various updates for Travis testing OSX (Ted Nyman [fa3774, 16a459, bc0ea5])
+* Update libevent (Chris Xin [386802])
+* Change sds.h for building in C++ projects (Ali Volkan ATLI [f5b32e])
+* Use proper format specifier in redisFormatSdsCommandArgv (Paulino Huerta, Jan-Erik Rediger [360a06, 8655a6])
+* Better handling of NULL reply in example code (Jan-Erik Rediger [1b8ed3])
+* Prevent overflow when formatting an error (Jan-Erik Rediger [0335cb])
+* Compatibility fix for strerror_r (Tom Lee [bb1747])
+* Properly detect integer parse/overflow errors (Justin Brewer [93421f])
+* Adds CI for Windows and cygwin fixes (owent, [6c53d6, 6c3e40])
+* Catch a buffer overflow when formatting the error message
+* Import latest upstream sds. This breaks applications that are linked against the old hiredis v0.13
+* Fix warnings, when compiled with -Wshadow
+* Make hiredis compile in Cygwin on Windows, now CI-tested
+* Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
+  protocol errors. This is consistent with the RESP specification. On 32-bit
+  platforms, the upper bound is lowered to `SIZE_MAX`.
+
+* Remove backwards compatibility macro's
+
+This removes the following old function aliases, use the new name now:
+
+| Old                         | New                    |
+| --------------------------- | ---------------------- |
+| redisReplyReaderCreate      | redisReaderCreate      |
+| redisReplyReaderCreate      | redisReaderCreate      |
+| redisReplyReaderFree        | redisReaderFree        |
+| redisReplyReaderFeed        | redisReaderFeed        |
+| redisReplyReaderGetReply    | redisReaderGetReply    |
+| redisReplyReaderSetPrivdata | redisReaderSetPrivdata |
+| redisReplyReaderGetObject   | redisReaderGetObject   |
+| redisReplyReaderGetError    | redisReaderGetError    |
+
+* The `DEBUG` variable in the Makefile was renamed to `DEBUG_FLAGS`
+
+Previously it broke some builds for people that had `DEBUG` set to some arbitrary value,
+due to debugging other software.
+By renaming we avoid unintentional name clashes.
+
+Simply rename `DEBUG` to `DEBUG_FLAGS` in your environment to make it working again.
+
+### 0.13.3 (2015-09-16)
+
+* Revert "Clear `REDIS_CONNECTED` flag when connection is closed".
+* Make tests pass on FreeBSD (Thanks, Giacomo Olgeni)
+
+
+If the `REDIS_CONNECTED` flag is cleared,
+the async onDisconnect callback function will never be called.
+This causes problems as the disconnect is never reported back to the user.
+
+### 0.13.2 (2015-08-25)
+
+* Prevent crash on pending replies in async code (Thanks, @switch-st)
+* Clear `REDIS_CONNECTED` flag when connection is closed (Thanks, Jerry Jacobs)
+* Add MacOS X addapter (Thanks, @dizzus)
+* Add Qt adapter (Thanks, Pietro Cerutti)
+* Add Ivykis adapter (Thanks, Gergely Nagy)
+
+All adapters are provided as is and are only tested where possible.
+
+### 0.13.1 (2015-05-03)
+
+This is a bug fix release.
+The new `reconnect` method introduced new struct members, which clashed with pre-defined names in pre-C99 code.
+Another commit forced C99 compilation just to make it work, but of course this is not desirable for outside projects.
+Other non-C99 code can now use hiredis as usual again.
+Sorry for the inconvenience.
+
+* Fix memory leak in async reply handling (Salvatore Sanfilippo)
+* Rename struct member to avoid name clash with pre-c99 code (Alex Balashov, ncopa)
+
+### 0.13.0 (2015-04-16)
+
+This release adds a minimal Windows compatibility layer.
+The parser, standalone since v0.12.0, can now be compiled on Windows
+(and thus used in other client libraries as well)
+
+* Windows compatibility layer for parser code (tzickel)
+* Properly escape data printed to PKGCONF file (Dan Skorupski)
+* Fix tests when assert() undefined (Keith Bennett, Matt Stancliff)
+* Implement a reconnect method for the client context, this changes the structure of `redisContext` (Aaron Bedra)
+
+### 0.12.1 (2015-01-26)
+
+* Fix `make install`: DESTDIR support, install all required files, install PKGCONF in proper location
+* Fix `make test` as 32 bit build on 64 bit platform
+
+### 0.12.0 (2015-01-22)
+
+* Add optional KeepAlive support
+
+* Try again on EINTR errors
+
+* Add libuv adapter
+
+* Add IPv6 support
+
+* Remove possibility of multiple close on same fd
+
+* Add ability to bind source address on connect
+
+* Add redisConnectFd() and redisFreeKeepFd()
+
+* Fix getaddrinfo() memory leak
+
+* Free string if it is unused (fixes memory leak)
+
+* Improve redisAppendCommandArgv performance 2.5x
+
+* Add support for SO_REUSEADDR
+
+* Fix redisvFormatCommand format parsing
+
+* Add GLib 2.0 adapter
+
+* Refactor reading code into read.c
+
+* Fix errno error buffers to not clobber errors
+
+* Generate pkgconf during build
+
+* Silence _BSD_SOURCE warnings
+
+* Improve digit counting for multibulk creation
+
+
+### 0.11.0
+
+* Increase the maximum multi-bulk reply depth to 7.
+
+* Increase the read buffer size from 2k to 16k.
+
+* Use poll(2) instead of select(2) to support large fds (>= 1024).
+
+### 0.10.1
+
+* Makefile overhaul. Important to check out if you override one or more
+  variables using environment variables or via arguments to the "make" tool.
+
+* Issue #45: Fix potential memory leak for a multi bulk reply with 0 elements
+  being created by the default reply object functions.
+
+* Issue #43: Don't crash in an asynchronous context when Redis returns an error
+  reply after the connection has been made (this happens when the maximum
+  number of connections is reached).
+
+### 0.10.0
+
+* See commit log.
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/COPYING b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/COPYING
new file mode 100644
index 0000000..a5fc973
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/COPYING
@@ -0,0 +1,29 @@
+Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Redis nor the names of its contributors may be used
+  to endorse or promote products derived from this software without specific
+  prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/README.md b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/README.md
new file mode 100644
index 0000000..c544d57
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/README.md
@@ -0,0 +1,664 @@
+[![Build Status](https://travis-ci.org/redis/hiredis.png)](https://travis-ci.org/redis/hiredis)
+
+**This Readme reflects the latest changed in the master branch. See [v1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) for the Readme and documentation for the latest release ([API/ABI history](https://abi-laboratory.pro/?view=timeline&l=hiredis)).**
+
+# HIREDIS
+
+Hiredis is a minimalistic C client library for the [Redis](http://redis.io/) database.
+
+It is minimalistic because it just adds minimal support for the protocol, but
+at the same time it uses a high level printf-alike API in order to make it
+much higher level than otherwise suggested by its minimal code base and the
+lack of explicit bindings for every Redis command.
+
+Apart from supporting sending commands and receiving replies, it comes with
+a reply parser that is decoupled from the I/O layer. It
+is a stream parser designed for easy reusability, which can for instance be used
+in higher level language bindings for efficient reply parsing.
+
+Hiredis only supports the binary-safe Redis protocol, so you can use it with any
+Redis version >= 1.2.0.
+
+The library comes with multiple APIs. There is the
+*synchronous API*, the *asynchronous API* and the *reply parsing API*.
+
+## Upgrading to `1.0.2`
+
+<span style="color:red">NOTE:  v1.0.1 erroneously bumped SONAME, which is why it is skipped here.</span>
+
+Version 1.0.2 is simply 1.0.0 with a fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2).  They are otherwise identical.
+
+## Upgrading to `1.0.0`
+
+Version 1.0.0 marks the first stable release of Hiredis.
+It includes some minor breaking changes, mostly to make the exposed API more uniform and self-explanatory.
+It also bundles the updated `sds` library, to sync up with upstream and Redis.
+For code changes see the [Changelog](CHANGELOG.md).
+
+_Note:  As described below, a few member names have been changed but most applications should be able to upgrade with minor code changes and recompiling._
+
+## IMPORTANT:  Breaking changes from `0.14.1` -> `1.0.0`
+
+* `redisContext` has two additional members (`free_privdata`, and `privctx`).
+* `redisOptions.timeout` has been renamed to `redisOptions.connect_timeout`, and we've added `redisOptions.command_timeout`.
+* `redisReplyObjectFunctions.createArray` now takes `size_t` instead of `int` for its length parameter.
+
+## IMPORTANT:  Breaking changes when upgrading from 0.13.x -> 0.14.x
+
+Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
+protocol errors. This is consistent with the RESP specification. On 32-bit
+platforms, the upper bound is lowered to `SIZE_MAX`.
+
+Change `redisReply.len` to `size_t`, as it denotes the the size of a string
+
+User code should compare this to `size_t` values as well.  If it was used to
+compare to other values, casting might be necessary or can be removed, if
+casting was applied before.
+
+## Upgrading from `<0.9.0`
+
+Version 0.9.0 is a major overhaul of hiredis in every aspect. However, upgrading existing
+code using hiredis should not be a big pain. The key thing to keep in mind when
+upgrading is that hiredis >= 0.9.0 uses a `redisContext*` to keep state, in contrast to
+the stateless 0.0.1 that only has a file descriptor to work with.
+
+## Synchronous API
+
+To consume the synchronous API, there are only a few function calls that need to be introduced:
+
+```c
+redisContext *redisConnect(const char *ip, int port);
+void *redisCommand(redisContext *c, const char *format, ...);
+void freeReplyObject(void *reply);
+```
+
+### Connecting
+
+The function `redisConnect` is used to create a so-called `redisContext`. The
+context is where Hiredis holds state for a connection. The `redisContext`
+struct has an integer `err` field that is non-zero when the connection is in
+an error state. The field `errstr` will contain a string with a description of
+the error. More information on errors can be found in the **Errors** section.
+After trying to connect to Redis using `redisConnect` you should
+check the `err` field to see if establishing the connection was successful:
+```c
+redisContext *c = redisConnect("127.0.0.1", 6379);
+if (c == NULL || c->err) {
+    if (c) {
+        printf("Error: %s\n", c->errstr);
+        // handle error
+    } else {
+        printf("Can't allocate redis context\n");
+    }
+}
+```
+
+*Note: A `redisContext` is not thread-safe.*
+
+### Sending commands
+
+There are several ways to issue commands to Redis. The first that will be introduced is
+`redisCommand`. This function takes a format similar to printf. In the simplest form,
+it is used like this:
+```c
+reply = redisCommand(context, "SET foo bar");
+```
+
+The specifier `%s` interpolates a string in the command, and uses `strlen` to
+determine the length of the string:
+```c
+reply = redisCommand(context, "SET foo %s", value);
+```
+When you need to pass binary safe strings in a command, the `%b` specifier can be
+used. Together with a pointer to the string, it requires a `size_t` length argument
+of the string:
+```c
+reply = redisCommand(context, "SET foo %b", value, (size_t) valuelen);
+```
+Internally, Hiredis splits the command in different arguments and will
+convert it to the protocol used to communicate with Redis.
+One or more spaces separates arguments, so you can use the specifiers
+anywhere in an argument:
+```c
+reply = redisCommand(context, "SET key:%s %s", myid, value);
+```
+
+### Using replies
+
+The return value of `redisCommand` holds a reply when the command was
+successfully executed. When an error occurs, the return value is `NULL` and
+the `err` field in the context will be set (see section on **Errors**).
+Once an error is returned the context cannot be reused and you should set up
+a new connection.
+
+The standard replies that `redisCommand` are of the type `redisReply`. The
+`type` field in the `redisReply` should be used to test what kind of reply
+was received:
+
+### RESP2
+
+* **`REDIS_REPLY_STATUS`**:
+    * The command replied with a status reply. The status string can be accessed using `reply->str`.
+      The length of this string can be accessed using `reply->len`.
+
+* **`REDIS_REPLY_ERROR`**:
+    *  The command replied with an error. The error string can be accessed identical to `REDIS_REPLY_STATUS`.
+
+* **`REDIS_REPLY_INTEGER`**:
+    * The command replied with an integer. The integer value can be accessed using the
+      `reply->integer` field of type `long long`.
+
+* **`REDIS_REPLY_NIL`**:
+    * The command replied with a **nil** object. There is no data to access.
+
+* **`REDIS_REPLY_STRING`**:
+    * A bulk (string) reply. The value of the reply can be accessed using `reply->str`.
+      The length of this string can be accessed using `reply->len`.
+
+* **`REDIS_REPLY_ARRAY`**:
+    * A multi bulk reply. The number of elements in the multi bulk reply is stored in
+      `reply->elements`. Every element in the multi bulk reply is a `redisReply` object as well
+      and can be accessed via `reply->element[..index..]`.
+      Redis may reply with nested arrays but this is fully supported.
+
+### RESP3
+
+Hiredis also supports every new `RESP3` data type which are as follows.  For more information about the protocol see the `RESP3` [specification.](https://github.com/antirez/RESP3/blob/master/spec.md)
+
+* **`REDIS_REPLY_DOUBLE`**:
+    * The command replied with a double-precision floating point number.
+      The value is stored as a string in the `str` member, and can be converted with `strtod` or similar.
+
+* **`REDIS_REPLY_BOOL`**:
+    * A boolean true/false reply.
+      The value is stored in the `integer` member and will be either `0` or `1`.
+
+* **`REDIS_REPLY_MAP`**:
+    * An array with the added invariant that there will always be an even number of elements.
+      The MAP is functionally equivelant to `REDIS_REPLY_ARRAY` except for the previously mentioned invariant.
+
+* **`REDIS_REPLY_SET`**:
+    * An array response where each entry is unique.
+      Like the MAP type, the data is identical to an array response except there are no duplicate values.
+
+* **`REDIS_REPLY_PUSH`**:
+    * An array that can be generated spontaneously by Redis.
+      This array response will always contain at least two subelements.  The first contains the type of `PUSH` message (e.g. `message`, or `invalidate`), and the second being a sub-array with the `PUSH` payload itself.
+
+* **`REDIS_REPLY_ATTR`**:
+    * An array structurally identical to a `MAP` but intended as meta-data about a reply.
+      _As of Redis 6.0.6 this reply type is not used in Redis_
+
+* **`REDIS_REPLY_BIGNUM`**:
+    * A string representing an arbitrarily large signed or unsigned integer value.
+      The number will be encoded as a string in the `str` member of `redisReply`.
+
+* **`REDIS_REPLY_VERB`**:
+    * A verbatim string, intended to be presented to the user without modification.
+      The string payload is stored in the `str` memeber, and type data is stored in the `vtype` member (e.g. `txt` for raw text or `md` for markdown).
+
+Replies should be freed using the `freeReplyObject()` function.
+Note that this function will take care of freeing sub-reply objects
+contained in arrays and nested arrays, so there is no need for the user to
+free the sub replies (it is actually harmful and will corrupt the memory).
+
+**Important:** the current version of hiredis (1.0.0) frees replies when the
+asynchronous API is used. This means you should not call `freeReplyObject` when
+you use this API. The reply is cleaned up by hiredis _after_ the callback
+returns.  We may introduce a flag to make this configurable in future versions of the library.
+
+### Cleaning up
+
+To disconnect and free the context the following function can be used:
+```c
+void redisFree(redisContext *c);
+```
+This function immediately closes the socket and then frees the allocations done in
+creating the context.
+
+### Sending commands (cont'd)
+
+Together with `redisCommand`, the function `redisCommandArgv` can be used to issue commands.
+It has the following prototype:
+```c
+void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+```
+It takes the number of arguments `argc`, an array of strings `argv` and the lengths of the
+arguments `argvlen`. For convenience, `argvlen` may be set to `NULL` and the function will
+use `strlen(3)` on every argument to determine its length. Obviously, when any of the arguments
+need to be binary safe, the entire array of lengths `argvlen` should be provided.
+
+The return value has the same semantic as `redisCommand`.
+
+### Pipelining
+
+To explain how Hiredis supports pipelining in a blocking connection, there needs to be
+understanding of the internal execution flow.
+
+When any of the functions in the `redisCommand` family is called, Hiredis first formats the
+command according to the Redis protocol. The formatted command is then put in the output buffer
+of the context. This output buffer is dynamic, so it can hold any number of commands.
+After the command is put in the output buffer, `redisGetReply` is called. This function has the
+following two execution paths:
+
+1. The input buffer is non-empty:
+    * Try to parse a single reply from the input buffer and return it
+    * If no reply could be parsed, continue at *2*
+2. The input buffer is empty:
+    * Write the **entire** output buffer to the socket
+    * Read from the socket until a single reply could be parsed
+
+The function `redisGetReply` is exported as part of the Hiredis API and can be used when a reply
+is expected on the socket. To pipeline commands, the only things that needs to be done is
+filling up the output buffer. For this cause, two commands can be used that are identical
+to the `redisCommand` family, apart from not returning a reply:
+```c
+void redisAppendCommand(redisContext *c, const char *format, ...);
+void redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+```
+After calling either function one or more times, `redisGetReply` can be used to receive the
+subsequent replies. The return value for this function is either `REDIS_OK` or `REDIS_ERR`, where
+the latter means an error occurred while reading a reply. Just as with the other commands,
+the `err` field in the context can be used to find out what the cause of this error is.
+
+The following examples shows a simple pipeline (resulting in only a single call to `write(2)` and
+a single call to `read(2)`):
+```c
+redisReply *reply;
+redisAppendCommand(context,"SET foo bar");
+redisAppendCommand(context,"GET foo");
+redisGetReply(context,(void *)&reply); // reply for SET
+freeReplyObject(reply);
+redisGetReply(context,(void *)&reply); // reply for GET
+freeReplyObject(reply);
+```
+This API can also be used to implement a blocking subscriber:
+```c
+reply = redisCommand(context,"SUBSCRIBE foo");
+freeReplyObject(reply);
+while(redisGetReply(context,(void *)&reply) == REDIS_OK) {
+    // consume message
+    freeReplyObject(reply);
+}
+```
+### Errors
+
+When a function call is not successful, depending on the function either `NULL` or `REDIS_ERR` is
+returned. The `err` field inside the context will be non-zero and set to one of the
+following constants:
+
+* **`REDIS_ERR_IO`**:
+    There was an I/O error while creating the connection, trying to write
+    to the socket or read from the socket. If you included `errno.h` in your
+    application, you can use the global `errno` variable to find out what is
+    wrong.
+
+* **`REDIS_ERR_EOF`**:
+    The server closed the connection which resulted in an empty read.
+
+* **`REDIS_ERR_PROTOCOL`**:
+    There was an error while parsing the protocol.
+
+* **`REDIS_ERR_OTHER`**:
+    Any other error. Currently, it is only used when a specified hostname to connect
+    to cannot be resolved.
+
+In every case, the `errstr` field in the context will be set to hold a string representation
+of the error.
+
+## Asynchronous API
+
+Hiredis comes with an asynchronous API that works easily with any event library.
+Examples are bundled that show using Hiredis with [libev](http://software.schmorp.de/pkg/libev.html)
+and [libevent](http://monkey.org/~provos/libevent/).
+
+### Connecting
+
+The function `redisAsyncConnect` can be used to establish a non-blocking connection to
+Redis. It returns a pointer to the newly created `redisAsyncContext` struct. The `err` field
+should be checked after creation to see if there were errors creating the connection.
+Because the connection that will be created is non-blocking, the kernel is not able to
+instantly return if the specified host and port is able to accept a connection.
+
+*Note: A `redisAsyncContext` is not thread-safe.*
+
+```c
+redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
+if (c->err) {
+    printf("Error: %s\n", c->errstr);
+    // handle error
+}
+```
+
+The asynchronous context can hold a disconnect callback function that is called when the
+connection is disconnected (either because of an error or per user request). This function should
+have the following prototype:
+```c
+void(const redisAsyncContext *c, int status);
+```
+On a disconnect, the `status` argument is set to `REDIS_OK` when disconnection was initiated by the
+user, or `REDIS_ERR` when the disconnection was caused by an error. When it is `REDIS_ERR`, the `err`
+field in the context can be accessed to find out the cause of the error.
+
+The context object is always freed after the disconnect callback fired. When a reconnect is needed,
+the disconnect callback is a good point to do so.
+
+Setting the disconnect callback can only be done once per context. For subsequent calls it will
+return `REDIS_ERR`. The function to set the disconnect callback has the following prototype:
+```c
+int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
+```
+`ac->data` may be used to pass user data to this callback, the same can be done for redisConnectCallback.
+### Sending commands and their callbacks
+
+In an asynchronous context, commands are automatically pipelined due to the nature of an event loop.
+Therefore, unlike the synchronous API, there is only a single way to send commands.
+Because commands are sent to Redis asynchronously, issuing a command requires a callback function
+that is called when the reply is received. Reply callbacks should have the following prototype:
+```c
+void(redisAsyncContext *c, void *reply, void *privdata);
+```
+The `privdata` argument can be used to curry arbitrary data to the callback from the point where
+the command is initially queued for execution.
+
+The functions that can be used to issue commands in an asynchronous context are:
+```c
+int redisAsyncCommand(
+  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
+  const char *format, ...);
+int redisAsyncCommandArgv(
+  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
+  int argc, const char **argv, const size_t *argvlen);
+```
+Both functions work like their blocking counterparts. The return value is `REDIS_OK` when the command
+was successfully added to the output buffer and `REDIS_ERR` otherwise. Example: when the connection
+is being disconnected per user-request, no new commands may be added to the output buffer and `REDIS_ERR` is
+returned on calls to the `redisAsyncCommand` family.
+
+If the reply for a command with a `NULL` callback is read, it is immediately freed. When the callback
+for a command is non-`NULL`, the memory is freed immediately following the callback: the reply is only
+valid for the duration of the callback.
+
+All pending callbacks are called with a `NULL` reply when the context encountered an error.
+
+### Disconnecting
+
+An asynchronous connection can be terminated using:
+```c
+void redisAsyncDisconnect(redisAsyncContext *ac);
+```
+When this function is called, the connection is **not** immediately terminated. Instead, new
+commands are no longer accepted and the connection is only terminated when all pending commands
+have been written to the socket, their respective replies have been read and their respective
+callbacks have been executed. After this, the disconnection callback is executed with the
+`REDIS_OK` status and the context object is freed.
+
+### Hooking it up to event library *X*
+
+There are a few hooks that need to be set on the context object after it is created.
+See the `adapters/` directory for bindings to *libev* and *libevent*.
+
+## Reply parsing API
+
+Hiredis comes with a reply parsing API that makes it easy for writing higher
+level language bindings.
+
+The reply parsing API consists of the following functions:
+```c
+redisReader *redisReaderCreate(void);
+void redisReaderFree(redisReader *reader);
+int redisReaderFeed(redisReader *reader, const char *buf, size_t len);
+int redisReaderGetReply(redisReader *reader, void **reply);
+```
+The same set of functions are used internally by hiredis when creating a
+normal Redis context, the above API just exposes it to the user for a direct
+usage.
+
+### Usage
+
+The function `redisReaderCreate` creates a `redisReader` structure that holds a
+buffer with unparsed data and state for the protocol parser.
+
+Incoming data -- most likely from a socket -- can be placed in the internal
+buffer of the `redisReader` using `redisReaderFeed`. This function will make a
+copy of the buffer pointed to by `buf` for `len` bytes. This data is parsed
+when `redisReaderGetReply` is called. This function returns an integer status
+and a reply object (as described above) via `void **reply`. The returned status
+can be either `REDIS_OK` or `REDIS_ERR`, where the latter means something went
+wrong (either a protocol error, or an out of memory error).
+
+The parser limits the level of nesting for multi bulk payloads to 7. If the
+multi bulk nesting level is higher than this, the parser returns an error.
+
+### Customizing replies
+
+The function `redisReaderGetReply` creates `redisReply` and makes the function
+argument `reply` point to the created `redisReply` variable. For instance, if
+the response of type `REDIS_REPLY_STATUS` then the `str` field of `redisReply`
+will hold the status as a vanilla C string. However, the functions that are
+responsible for creating instances of the `redisReply` can be customized by
+setting the `fn` field on the `redisReader` struct. This should be done
+immediately after creating the `redisReader`.
+
+For example, [hiredis-rb](https://github.com/pietern/hiredis-rb/blob/master/ext/hiredis_ext/reader.c)
+uses customized reply object functions to create Ruby objects.
+
+### Reader max buffer
+
+Both when using the Reader API directly or when using it indirectly via a
+normal Redis context, the redisReader structure uses a buffer in order to
+accumulate data from the server.
+Usually this buffer is destroyed when it is empty and is larger than 16
+KiB in order to avoid wasting memory in unused buffers
+
+However when working with very big payloads destroying the buffer may slow
+down performances considerably, so it is possible to modify the max size of
+an idle buffer changing the value of the `maxbuf` field of the reader structure
+to the desired value. The special value of 0 means that there is no maximum
+value for an idle buffer, so the buffer will never get freed.
+
+For instance if you have a normal Redis context you can set the maximum idle
+buffer to zero (unlimited) just with:
+```c
+context->reader->maxbuf = 0;
+```
+This should be done only in order to maximize performances when working with
+large payloads. The context should be set back to `REDIS_READER_MAX_BUF` again
+as soon as possible in order to prevent allocation of useless memory.
+
+### Reader max array elements
+
+By default the hiredis reply parser sets the maximum number of multi-bulk elements
+to 2^32 - 1 or 4,294,967,295 entries.  If you need to process multi-bulk replies
+with more than this many elements you can set the value higher or to zero, meaning
+unlimited with:
+```c
+context->reader->maxelements = 0;
+```
+
+## SSL/TLS Support
+
+### Building
+
+SSL/TLS support is not built by default and requires an explicit flag:
+
+    make USE_SSL=1
+
+This requires OpenSSL development package (e.g. including header files to be
+available.
+
+When enabled, SSL/TLS support is built into extra `libhiredis_ssl.a` and
+`libhiredis_ssl.so` static/dynamic libraries. This leaves the original libraries
+unaffected so no additional dependencies are introduced.
+
+### Using it
+
+First, you'll need to make sure you include the SSL header file:
+
+```c
+#include "hiredis.h"
+#include "hiredis_ssl.h"
+```
+
+You will also need to link against `libhiredis_ssl`, **in addition** to
+`libhiredis` and add `-lssl -lcrypto` to satisfy its dependencies.
+
+Hiredis implements SSL/TLS on top of its normal `redisContext` or
+`redisAsyncContext`, so you will need to establish a connection first and then
+initiate an SSL/TLS handshake.
+
+#### Hiredis OpenSSL Wrappers
+
+Before Hiredis can negotiate an SSL/TLS connection, it is necessary to
+initialize OpenSSL and create a context. You can do that in two ways:
+
+1. Work directly with the OpenSSL API to initialize the library's global context
+   and create `SSL_CTX *` and `SSL *` contexts. With an `SSL *` object you can
+   call `redisInitiateSSL()`.
+2. Work with a set of Hiredis-provided wrappers around OpenSSL, create a
+   `redisSSLContext` object to hold configuration and use
+   `redisInitiateSSLWithContext()` to initiate the SSL/TLS handshake.
+
+```c
+/* An Hiredis SSL context. It holds SSL configuration and can be reused across
+ * many contexts.
+ */
+redisSSLContext *ssl;
+
+/* An error variable to indicate what went wrong, if the context fails to
+ * initialize.
+ */
+redisSSLContextError ssl_error;
+
+/* Initialize global OpenSSL state.
+ *
+ * You should call this only once when your app initializes, and only if
+ * you don't explicitly or implicitly initialize OpenSSL it elsewhere.
+ */
+redisInitOpenSSL();
+
+/* Create SSL context */
+ssl = redisCreateSSLContext(
+    "cacertbundle.crt",     /* File name of trusted CA/ca bundle file, optional */
+    "/path/to/certs",       /* Path of trusted certificates, optional */
+    "client_cert.pem",      /* File name of client certificate file, optional */
+    "client_key.pem",       /* File name of client private key, optional */
+    "redis.mydomain.com",   /* Server name to request (SNI), optional */
+    &ssl_error
+    ) != REDIS_OK) {
+        printf("SSL error: %s\n", redisSSLContextGetError(ssl_error);
+        /* Abort... */
+    }
+
+/* Create Redis context and establish connection */
+c = redisConnect("localhost", 6443);
+if (c == NULL || c->err) {
+    /* Handle error and abort... */
+}
+
+/* Negotiate SSL/TLS */
+if (redisInitiateSSLWithContext(c, ssl) != REDIS_OK) {
+    /* Handle error, in c->err / c->errstr */
+}
+```
+
+## RESP3 PUSH replies
+Redis 6.0 introduced PUSH replies with the reply-type `>`.  These messages are generated spontaneously and can arrive at any time, so must be handled using callbacks.
+
+### Default behavior
+Hiredis installs handlers on `redisContext` and `redisAsyncContext` by default, which will intercept and free any PUSH replies detected.  This means existing code will work as-is after upgrading to Redis 6 and switching to `RESP3`.
+
+### Custom PUSH handler prototypes
+The callback prototypes differ between `redisContext` and `redisAsyncContext`.
+
+#### redisContext
+```c
+void my_push_handler(void *privdata, void *reply) {
+    /* Handle the reply */
+
+    /* Note: We need to free the reply in our custom handler for
+             blocking contexts.  This lets us keep the reply if
+             we want. */
+    freeReplyObject(reply);
+}
+```
+
+#### redisAsyncContext
+```c
+void my_async_push_handler(redisAsyncContext *ac, void *reply) {
+    /* Handle the reply */
+
+    /* Note:  Because async hiredis always frees replies, you should
+              not call freeReplyObject in an async push callback. */
+}
+```
+
+### Installing a custom handler
+There are two ways to set your own PUSH handlers.
+
+1. Set `push_cb` or `async_push_cb` in the `redisOptions` struct and connect with `redisConnectWithOptions` or `redisAsyncConnectWithOptions`.
+    ```c
+    redisOptions = {0};
+    REDIS_OPTIONS_SET_TCP(&options, "127.0.0.1", 6379);
+    options->push_cb = my_push_handler;
+    redisContext *context = redisConnectWithOptions(&options);
+    ```
+2.  Call `redisSetPushCallback` or `redisAsyncSetPushCallback` on a connected context.
+    ```c
+    redisContext *context = redisConnect("127.0.0.1", 6379);
+    redisSetPushCallback(context, my_push_handler);
+    ```
+
+    _Note `redisSetPushCallback` and `redisAsyncSetPushCallback` both return any currently configured handler,  making it easy to override and then return to the old value._
+
+### Specifying no handler
+If you have a unique use-case where you don't want hiredis to automatically intercept and free PUSH replies, you will want to configure no handler at all.  This can be done in two ways.
+1.  Set the `REDIS_OPT_NO_PUSH_AUTOFREE` flag in `redisOptions` and leave the callback function pointer `NULL`.
+    ```c
+    redisOptions = {0};
+    REDIS_OPTIONS_SET_TCP(&options, "127.0.0.1", 6379);
+    options->options |= REDIS_OPT_NO_PUSH_AUTOFREE;
+    redisContext *context = redisConnectWithOptions(&options);
+    ```
+3.  Call `redisSetPushCallback` with `NULL` once connected.
+    ```c
+    redisContext *context = redisConnect("127.0.0.1", 6379);
+    redisSetPushCallback(context, NULL);
+    ```
+
+    _Note:  With no handler configured, calls to `redisCommand` may generate more than one reply, so this strategy is only applicable when there's some kind of blocking`redisGetReply()` loop (e.g. `MONITOR` or `SUBSCRIBE` workloads)._
+
+## Allocator injection
+
+Hiredis uses a pass-thru structure of function pointers defined in [alloc.h](https://github.com/redis/hiredis/blob/f5d25850/alloc.h#L41) that contain the currently configured allocation and deallocation functions.  By default they just point to libc (`malloc`, `calloc`, `realloc`, etc).
+
+### Overriding
+
+One can override the allocators like so:
+
+```c
+hiredisAllocFuncs myfuncs = {
+    .mallocFn = my_malloc,
+    .callocFn = my_calloc,
+    .reallocFn = my_realloc,
+    .strdupFn = my_strdup,
+    .freeFn = my_free,
+};
+
+// Override allocators (function returns current allocators if needed)
+hiredisAllocFuncs orig = hiredisSetAllocators(&myfuncs);
+```
+
+To reset the allocators to their default libc function simply call:
+
+```c
+hiredisResetAllocators();
+```
+
+## AUTHORS
+
+Salvatore Sanfilippo (antirez at gmail),\
+Pieter Noordhuis (pcnoordhuis at gmail)\
+Michael Grunder (michael dot grunder at gmail)
+
+_Hiredis is released under the BSD license._
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/alloc.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/alloc.c
new file mode 100644
index 0000000..7fb6b35
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/alloc.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include "alloc.h"
+#include <string.h>
+#include <stdlib.h>
+
+hiredisAllocFuncs hiredisAllocFns = {
+    .mallocFn = malloc,
+    .callocFn = calloc,
+    .reallocFn = realloc,
+    .strdupFn = strdup,
+    .freeFn = free,
+};
+
+/* Override hiredis' allocators with ones supplied by the user */
+hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *override) {
+    hiredisAllocFuncs orig = hiredisAllocFns;
+
+    hiredisAllocFns = *override;
+
+    return orig;
+}
+
+/* Reset allocators to use libc defaults */
+void hiredisResetAllocators(void) {
+    hiredisAllocFns = (hiredisAllocFuncs) {
+        .mallocFn = malloc,
+        .callocFn = calloc,
+        .reallocFn = realloc,
+        .strdupFn = strdup,
+        .freeFn = free,
+    };
+}
+
+#ifdef _WIN32
+
+void *hi_malloc(size_t size) {
+    return hiredisAllocFns.mallocFn(size);
+}
+
+void *hi_calloc(size_t nmemb, size_t size) {
+    return hiredisAllocFns.callocFn(nmemb, size);
+}
+
+void *hi_realloc(void *ptr, size_t size) {
+    return hiredisAllocFns.reallocFn(ptr, size);
+}
+
+char *hi_strdup(const char *str) {
+    return hiredisAllocFns.strdupFn(str);
+}
+
+void hi_free(void *ptr) {
+    hiredisAllocFns.freeFn(ptr);
+}
+
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/alloc.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/alloc.h
new file mode 100644
index 0000000..34a05f4
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/alloc.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef HIREDIS_ALLOC_H
+#define HIREDIS_ALLOC_H
+
+#include <stddef.h> /* for size_t */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Structure pointing to our actually configured allocators */
+typedef struct hiredisAllocFuncs {
+    void *(*mallocFn)(size_t);
+    void *(*callocFn)(size_t,size_t);
+    void *(*reallocFn)(void*,size_t);
+    char *(*strdupFn)(const char*);
+    void (*freeFn)(void*);
+} hiredisAllocFuncs;
+
+hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *ha);
+void hiredisResetAllocators(void);
+
+#ifndef _WIN32
+
+/* Hiredis' configured allocator function pointer struct */
+extern hiredisAllocFuncs hiredisAllocFns;
+
+static inline void *hi_malloc(size_t size) {
+    return hiredisAllocFns.mallocFn(size);
+}
+
+static inline void *hi_calloc(size_t nmemb, size_t size) {
+    return hiredisAllocFns.callocFn(nmemb, size);
+}
+
+static inline void *hi_realloc(void *ptr, size_t size) {
+    return hiredisAllocFns.reallocFn(ptr, size);
+}
+
+static inline char *hi_strdup(const char *str) {
+    return hiredisAllocFns.strdupFn(str);
+}
+
+static inline void hi_free(void *ptr) {
+    hiredisAllocFns.freeFn(ptr);
+}
+
+#else
+
+void *hi_malloc(size_t size);
+void *hi_calloc(size_t nmemb, size_t size);
+void *hi_realloc(void *ptr, size_t size);
+char *hi_strdup(const char *str);
+void hi_free(void *ptr);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HIREDIS_ALLOC_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async.c
new file mode 100644
index 0000000..439d9ee
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async.c
@@ -0,0 +1,890 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include "alloc.h"
+#include <stdlib.h>
+#include <string.h>
+#ifndef _MSC_VER
+#include <strings.h>
+#endif
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include "async.h"
+#include "net.h"
+#include "dict.c"
+#include "sds.h"
+#include "win32.h"
+
+#include "async_private.h"
+
+/* Forward declarations of hiredis.c functions */
+int __redisAppendCommand(redisContext *c, const char *cmd, size_t len);
+void __redisSetError(redisContext *c, int type, const char *str);
+
+/* Functions managing dictionary of callbacks for pub/sub. */
+static unsigned int callbackHash(const void *key) {
+    return dictGenHashFunction((const unsigned char *)key,
+                               sdslen((const sds)key));
+}
+
+static void *callbackValDup(void *privdata, const void *src) {
+    ((void) privdata);
+    redisCallback *dup;
+
+    dup = hi_malloc(sizeof(*dup));
+    if (dup == NULL)
+        return NULL;
+
+    memcpy(dup,src,sizeof(*dup));
+    return dup;
+}
+
+static int callbackKeyCompare(void *privdata, const void *key1, const void *key2) {
+    int l1, l2;
+    ((void) privdata);
+
+    l1 = sdslen((const sds)key1);
+    l2 = sdslen((const sds)key2);
+    if (l1 != l2) return 0;
+    return memcmp(key1,key2,l1) == 0;
+}
+
+static void callbackKeyDestructor(void *privdata, void *key) {
+    ((void) privdata);
+    sdsfree((sds)key);
+}
+
+static void callbackValDestructor(void *privdata, void *val) {
+    ((void) privdata);
+    hi_free(val);
+}
+
+static dictType callbackDict = {
+    callbackHash,
+    NULL,
+    callbackValDup,
+    callbackKeyCompare,
+    callbackKeyDestructor,
+    callbackValDestructor
+};
+
+static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
+    redisAsyncContext *ac;
+    dict *channels = NULL, *patterns = NULL, *sharded_channels = NULL;
+
+    channels = dictCreate(&callbackDict,NULL);
+    if (channels == NULL)
+        goto oom;
+    patterns = dictCreate(&callbackDict,NULL);
+    if (patterns == NULL)
+        goto oom;
+
+    ac = hi_realloc(c,sizeof(redisAsyncContext));
+    if (ac == NULL)
+        goto oom;
+
+    c = &(ac->c);
+
+    /* The regular connect functions will always set the flag REDIS_CONNECTED.
+     * For the async API, we want to wait until the first write event is
+     * received up before setting this flag, so reset it here. */
+    c->flags &= ~REDIS_CONNECTED;
+
+    ac->err = 0;
+    ac->errstr = NULL;
+    ac->data = NULL;
+    ac->dataCleanup = NULL;
+
+    ac->ev.data = NULL;
+    ac->ev.addRead = NULL;
+    ac->ev.delRead = NULL;
+    ac->ev.addWrite = NULL;
+    ac->ev.delWrite = NULL;
+    ac->ev.cleanup = NULL;
+    ac->ev.scheduleTimer = NULL;
+
+    ac->onConnect = NULL;
+    ac->onDisconnect = NULL;
+
+    ac->replies.head = NULL;
+    ac->replies.tail = NULL;
+    ac->sub.invalid.head = NULL;
+    ac->sub.invalid.tail = NULL;
+    ac->sub.channels = channels;
+    ac->sub.patterns = patterns;
+
+    return ac;
+oom:
+    if (channels) dictRelease(channels);
+    if (sharded_channels) dictRelease(sharded_channels);
+    if (patterns) dictRelease(patterns);
+    return NULL;
+}
+
+/* We want the error field to be accessible directly instead of requiring
+ * an indirection to the redisContext struct. */
+static void __redisAsyncCopyError(redisAsyncContext *ac) {
+    if (!ac)
+        return;
+
+    redisContext *c = &(ac->c);
+    ac->err = c->err;
+    ac->errstr = c->errstr;
+}
+
+redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options) {
+    redisOptions myOptions = *options;
+    redisContext *c;
+    redisAsyncContext *ac;
+
+    /* Clear any erroneously set sync callback and flag that we don't want to
+     * use freeReplyObject by default. */
+    myOptions.push_cb = NULL;
+    myOptions.options |= REDIS_OPT_NO_PUSH_AUTOFREE;
+
+    myOptions.options |= REDIS_OPT_NONBLOCK;
+    c = redisConnectWithOptions(&myOptions);
+    if (c == NULL) {
+        return NULL;
+    }
+
+    ac = redisAsyncInitialize(c);
+    if (ac == NULL) {
+        redisFree(c);
+        return NULL;
+    }
+
+    /* Set any configured async push handler */
+    redisAsyncSetPushCallback(ac, myOptions.async_push_cb);
+
+    __redisAsyncCopyError(ac);
+    return ac;
+}
+
+redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    return redisAsyncConnectWithOptions(&options);
+}
+
+redisAsyncContext *redisAsyncConnectBind(const char *ip, int port,
+                                         const char *source_addr) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.endpoint.tcp.source_addr = source_addr;
+    return redisAsyncConnectWithOptions(&options);
+}
+
+redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
+                                                  const char *source_addr) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.options |= REDIS_OPT_REUSEADDR;
+    options.endpoint.tcp.source_addr = source_addr;
+    return redisAsyncConnectWithOptions(&options);
+}
+
+redisAsyncContext *redisAsyncConnectUnix(const char *path) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_UNIX(&options, path);
+    return redisAsyncConnectWithOptions(&options);
+}
+
+int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn) {
+    if (ac->onConnect == NULL) {
+        ac->onConnect = fn;
+
+        /* The common way to detect an established connection is to wait for
+         * the first write event to be fired. This assumes the related event
+         * library functions are already set. */
+        _EL_ADD_WRITE(ac);
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
+int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn) {
+    if (ac->onDisconnect == NULL) {
+        ac->onDisconnect = fn;
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
+/* Helper functions to push/shift callbacks */
+static int __redisPushCallback(redisCallbackList *list, redisCallback *source) {
+    redisCallback *cb;
+
+    /* Copy callback from stack to heap */
+    cb = hi_malloc(sizeof(*cb));
+    if (cb == NULL)
+        return REDIS_ERR_OOM;
+
+    if (source != NULL) {
+        memcpy(cb,source,sizeof(*cb));
+        cb->next = NULL;
+    }
+
+    /* Store callback in list */
+    if (list->head == NULL)
+        list->head = cb;
+    if (list->tail != NULL)
+        list->tail->next = cb;
+    list->tail = cb;
+    return REDIS_OK;
+}
+
+static int __redisShiftCallback(redisCallbackList *list, redisCallback *target) {
+    redisCallback *cb = list->head;
+    if (cb != NULL) {
+        list->head = cb->next;
+        if (cb == list->tail)
+            list->tail = NULL;
+
+        /* Copy callback from heap to stack */
+        if (target != NULL)
+            memcpy(target,cb,sizeof(*cb));
+        hi_free(cb);
+        return REDIS_OK;
+    }
+    return REDIS_ERR;
+}
+
+static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisReply *reply) {
+    redisContext *c = &(ac->c);
+    if (cb->fn != NULL) {
+        c->flags |= REDIS_IN_CALLBACK;
+        cb->fn(ac,reply,cb->privdata);
+        c->flags &= ~REDIS_IN_CALLBACK;
+    }
+}
+
+static void __redisRunPushCallback(redisAsyncContext *ac, redisReply *reply) {
+    if (ac->push_cb != NULL) {
+        ac->c.flags |= REDIS_IN_CALLBACK;
+        ac->push_cb(ac, reply);
+        ac->c.flags &= ~REDIS_IN_CALLBACK;
+    }
+}
+
+/* Helper function to free the context. */
+static void __redisAsyncFree(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisCallback cb;
+    dictIterator *it;
+    dictEntry *de;
+
+    /* Execute pending callbacks with NULL reply. */
+    while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK)
+        __redisRunCallback(ac,&cb,NULL);
+
+    /* Execute callbacks for invalid commands */
+    while (__redisShiftCallback(&ac->sub.invalid,&cb) == REDIS_OK)
+        __redisRunCallback(ac,&cb,NULL);
+
+    /* Run subscription callbacks with NULL reply */
+    if (ac->sub.channels) {
+        it = dictGetIterator(ac->sub.channels);
+        if (it != NULL) {
+            while ((de = dictNext(it)) != NULL)
+                __redisRunCallback(ac,dictGetEntryVal(de),NULL);
+            dictReleaseIterator(it);
+        }
+
+        dictRelease(ac->sub.channels);
+    }
+    
+    if (ac->sub.patterns) {
+        it = dictGetIterator(ac->sub.patterns);
+        if (it != NULL) {
+            while ((de = dictNext(it)) != NULL)
+                __redisRunCallback(ac,dictGetEntryVal(de),NULL);
+            dictReleaseIterator(it);
+        }
+
+        dictRelease(ac->sub.patterns);
+    }
+
+    /* Signal event lib to clean up */
+    _EL_CLEANUP(ac);
+
+    /* Execute disconnect callback. When redisAsyncFree() initiated destroying
+     * this context, the status will always be REDIS_OK. */
+    if (ac->onDisconnect && (c->flags & REDIS_CONNECTED)) {
+        if (c->flags & REDIS_FREEING) {
+            ac->onDisconnect(ac,REDIS_OK);
+        } else {
+            ac->onDisconnect(ac,(ac->err == 0) ? REDIS_OK : REDIS_ERR);
+        }
+    }
+
+    if (ac->dataCleanup) {
+        ac->dataCleanup(ac->data);
+    }
+
+    /* Cleanup self */
+    redisFree(c);
+}
+
+/* Free the async context. When this function is called from a callback,
+ * control needs to be returned to redisProcessCallbacks() before actual
+ * free'ing. To do so, a flag is set on the context which is picked up by
+ * redisProcessCallbacks(). Otherwise, the context is immediately free'd. */
+void redisAsyncFree(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    c->flags |= REDIS_FREEING;
+    if (!(c->flags & REDIS_IN_CALLBACK))
+        __redisAsyncFree(ac);
+}
+
+/* Helper function to make the disconnect happen and clean up. */
+void __redisAsyncDisconnect(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    /* Make sure error is accessible if there is any */
+    __redisAsyncCopyError(ac);
+
+    if (ac->err == 0) {
+        /* For clean disconnects, there should be no pending callbacks. */
+        int ret = __redisShiftCallback(&ac->replies,NULL);
+        assert(ret == REDIS_ERR);
+    } else {
+        /* Disconnection is caused by an error, make sure that pending
+         * callbacks cannot call new commands. */
+        c->flags |= REDIS_DISCONNECTING;
+    }
+
+    /* cleanup event library on disconnect.
+     * this is safe to call multiple times */
+    _EL_CLEANUP(ac);
+
+    /* For non-clean disconnects, __redisAsyncFree() will execute pending
+     * callbacks with a NULL-reply. */
+    if (!(c->flags & REDIS_NO_AUTO_FREE)) {
+      __redisAsyncFree(ac);
+    }
+}
+
+/* Tries to do a clean disconnect from Redis, meaning it stops new commands
+ * from being issued, but tries to flush the output buffer and execute
+ * callbacks for all remaining replies. When this function is called from a
+ * callback, there might be more replies and we can safely defer disconnecting
+ * to redisProcessCallbacks(). Otherwise, we can only disconnect immediately
+ * when there are no pending callbacks. */
+void redisAsyncDisconnect(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    c->flags |= REDIS_DISCONNECTING;
+
+    /** unset the auto-free flag here, because disconnect undoes this */
+    c->flags &= ~REDIS_NO_AUTO_FREE;
+    if (!(c->flags & REDIS_IN_CALLBACK) && ac->replies.head == NULL)
+        __redisAsyncDisconnect(ac);
+}
+
+static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, redisCallback *dstcb) {
+    redisContext *c = &(ac->c);
+    dict *callbacks;
+    redisCallback *cb;
+    dictEntry *de;
+    int pvariant, svariant;
+    char *stype;
+    sds sname;
+
+    /* Custom reply functions are not supported for pub/sub. This will fail
+     * very hard when they are used... */
+    if (reply->type == REDIS_REPLY_ARRAY || reply->type == REDIS_REPLY_PUSH) {
+        assert(reply->elements >= 2);
+        assert(reply->element[0]->type == REDIS_REPLY_STRING);
+        stype = reply->element[0]->str;
+        pvariant = (tolower(stype[0]) == 'p') ? 1 : 0;
+        svariant = (reply->element[0]->len > 3 && (strncasecmp(stype, "ssu"/*bscrscribe*/, 3) == 0 || strncasecmp(stype, "sun"/*subscribe*/, 3) == 0)) ? 1 : 0;
+        if (pvariant)
+            callbacks = ac->sub.patterns;
+        else
+            callbacks = ac->sub.channels;
+
+        /* Locate the right callback */
+        assert(reply->element[1]->type == REDIS_REPLY_STRING);
+        sname = sdsnewlen(reply->element[1]->str,reply->element[1]->len);
+        if (sname == NULL)
+            goto oom;
+
+        de = dictFind(callbacks,sname);
+        if (de != NULL) {
+            cb = dictGetEntryVal(de);
+
+            /* If this is an subscribe reply decrease pending counter. */
+            if (strcasecmp(stype+pvariant+svariant,"subscribe") == 0) {
+                cb->pending_subs -= 1;
+            }
+        
+
+            memcpy(dstcb,cb,sizeof(*dstcb));
+
+            /* If this is an unsubscribe message, remove it. */
+            if (strcasecmp(stype+pvariant+svariant,"unsubscribe") == 0) {
+                if (cb->pending_subs == 0)
+                    dictDelete(callbacks,sname);
+
+                /* If this was the last unsubscribe message, revert to
+                 * non-subscribe mode. */
+                assert(reply->element[2]->type == REDIS_REPLY_INTEGER);
+
+                /* Unset subscribed flag only when no pipelined pending subscribe. */
+                if (reply->element[2]->integer == 0
+                    && dictSize(ac->sub.channels) == 0
+                    && dictSize(ac->sub.patterns) == 0)
+                    c->flags &= ~REDIS_SUBSCRIBED;
+            }
+        }
+        sdsfree(sname);
+    } else {
+        /* Shift callback for invalid commands. */
+        __redisShiftCallback(&ac->sub.invalid,dstcb);
+    }
+    return REDIS_OK;
+oom:
+    __redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
+    return REDIS_ERR;
+}
+
+#define redisIsSpontaneousPushReply(r) \
+    (redisIsPushReply(r) && !redisIsSubscribeReply(r))
+
+static int redisIsSubscribeReply(redisReply *reply) {
+    char *str;
+    size_t len, off;
+
+    /* We will always have at least one string with the subscribe/message type */
+    if (reply->elements < 1 || reply->element[0]->type != REDIS_REPLY_STRING ||
+        reply->element[0]->len < sizeof("message") - 1)
+    {
+        return 0;
+    }
+
+    /* Get the string/len moving past 'p' if needed */
+    off = tolower(reply->element[0]->str[0]) == 'p';
+    str = reply->element[0]->str + off;
+    len = reply->element[0]->len - off;
+
+    return !strncasecmp(str, "subscribe", len) ||
+           !strncasecmp(str, "ssubscribe", len) ||
+           !strncasecmp(str, "message", len);
+
+}
+
+void redisProcessCallbacks(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisCallback cb = {NULL, NULL, 0, NULL};
+    void *reply = NULL;
+    int status;
+
+    while((status = redisGetReply(c,&reply)) == REDIS_OK) {
+        if (reply == NULL) {
+            /* When the connection is being disconnected and there are
+             * no more replies, this is the cue to really disconnect. */
+            if (c->flags & REDIS_DISCONNECTING && sdslen(c->obuf) == 0
+                && ac->replies.head == NULL) {
+                __redisAsyncDisconnect(ac);
+                return;
+            }
+
+            /* If monitor mode, repush callback */
+            if(c->flags & REDIS_MONITORING) {
+                __redisPushCallback(&ac->replies,&cb);
+            }
+
+            /* When the connection is not being disconnected, simply stop
+             * trying to get replies and wait for the next loop tick. */
+            break;
+        }
+
+        /* Send any non-subscribe related PUSH messages to our PUSH handler
+         * while allowing subscribe related PUSH messages to pass through.
+         * This allows existing code to be backward compatible and work in
+         * either RESP2 or RESP3 mode. */
+        if (redisIsSpontaneousPushReply(reply)) {
+            __redisRunPushCallback(ac, reply);
+            c->reader->fn->freeObject(reply);
+            continue;
+        }
+
+        /* Even if the context is subscribed, pending regular
+         * callbacks will get a reply before pub/sub messages arrive. */
+        if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
+            /*
+             * A spontaneous reply in a not-subscribed context can be the error
+             * reply that is sent when a new connection exceeds the maximum
+             * number of allowed connections on the server side.
+             *
+             * This is seen as an error instead of a regular reply because the
+             * server closes the connection after sending it.
+             *
+             * To prevent the error from being overwritten by an EOF error the
+             * connection is closed here. See issue #43.
+             *
+             * Another possibility is that the server is loading its dataset.
+             * In this case we also want to close the connection, and have the
+             * user wait until the server is ready to take our request.
+             */
+            if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
+                c->err = REDIS_ERR_OTHER;
+                snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
+                c->reader->fn->freeObject(reply);
+                __redisAsyncDisconnect(ac);
+                return;
+            }
+            /* No more regular callbacks and no errors, the context *must* be subscribed or monitoring. */
+            assert((c->flags & REDIS_SUBSCRIBED || c->flags & REDIS_MONITORING));
+            if(c->flags & REDIS_SUBSCRIBED)
+                __redisGetSubscribeCallback(ac,reply,&cb);
+        }
+
+        if (cb.fn != NULL) {
+            __redisRunCallback(ac,&cb,reply);
+            c->reader->fn->freeObject(reply);
+
+            /* Proceed with free'ing when redisAsyncFree() was called. */
+            if (c->flags & REDIS_FREEING) {
+                __redisAsyncFree(ac);
+                return;
+            }
+        } else {
+            /* No callback for this reply. This can either be a NULL callback,
+             * or there were no callbacks to begin with. Either way, don't
+             * abort with an error, but simply ignore it because the client
+             * doesn't know what the server will spit out over the wire. */
+            c->reader->fn->freeObject(reply);
+        }
+    }
+
+    /* Disconnect when there was an error reading the reply */
+    if (status != REDIS_OK)
+        __redisAsyncDisconnect(ac);
+}
+
+static void __redisAsyncHandleConnectFailure(redisAsyncContext *ac) {
+    if (ac->onConnect) ac->onConnect(ac, REDIS_ERR);
+    __redisAsyncDisconnect(ac);
+}
+
+/* Internal helper function to detect socket status the first time a read or
+ * write event fires. When connecting was not successful, the connect callback
+ * is called with a REDIS_ERR status and the context is free'd. */
+static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
+    int completed = 0;
+    redisContext *c = &(ac->c);
+
+    if (redisCheckConnectDone(c, &completed) == REDIS_ERR) {
+        /* Error! */
+        redisCheckSocketError(c);
+        __redisAsyncHandleConnectFailure(ac);
+        return REDIS_ERR;
+    } else if (completed == 1) {
+        /* connected! */
+        if (c->connection_type == REDIS_CONN_TCP &&
+            redisSetTcpNoDelay(c) == REDIS_ERR) {
+            __redisAsyncHandleConnectFailure(ac);
+            return REDIS_ERR;
+        }
+
+        if (ac->onConnect) ac->onConnect(ac, REDIS_OK);
+        c->flags |= REDIS_CONNECTED;
+        return REDIS_OK;
+    } else {
+        return REDIS_OK;
+    }
+}
+
+void redisAsyncRead(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    if (redisBufferRead(c) == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+    } else {
+        /* Always re-schedule reads */
+        _EL_ADD_READ(ac);
+        redisProcessCallbacks(ac);
+    }
+}
+
+/* This function should be called when the socket is readable.
+ * It processes all replies that can be read and executes their callbacks.
+ */
+void redisAsyncHandleRead(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    if (!(c->flags & REDIS_CONNECTED)) {
+        /* Abort connect was not successful. */
+        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
+            return;
+        /* Try again later when the context is still not connected. */
+        if (!(c->flags & REDIS_CONNECTED))
+            return;
+    }
+
+    c->funcs->async_read(ac);
+}
+
+void redisAsyncWrite(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    int done = 0;
+
+    if (redisBufferWrite(c,&done) == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+    } else {
+        /* Continue writing when not done, stop writing otherwise */
+        if (!done)
+            _EL_ADD_WRITE(ac);
+        else
+            _EL_DEL_WRITE(ac);
+
+        /* Always schedule reads after writes */
+        _EL_ADD_READ(ac);
+    }
+}
+
+void redisAsyncHandleWrite(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+
+    if (!(c->flags & REDIS_CONNECTED)) {
+        /* Abort connect was not successful. */
+        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
+            return;
+        /* Try again later when the context is still not connected. */
+        if (!(c->flags & REDIS_CONNECTED))
+            return;
+    }
+
+    c->funcs->async_write(ac);
+}
+
+void redisAsyncHandleTimeout(redisAsyncContext *ac) {
+    redisContext *c = &(ac->c);
+    redisCallback cb;
+
+    if ((c->flags & REDIS_CONNECTED) && ac->replies.head == NULL) {
+        /* Nothing to do - just an idle timeout */
+        return;
+    }
+
+    if (!c->err) {
+        __redisSetError(c, REDIS_ERR_TIMEOUT, "Timeout");
+    }
+
+    if (!(c->flags & REDIS_CONNECTED) && ac->onConnect) {
+        ac->onConnect(ac, REDIS_ERR);
+    }
+
+    while (__redisShiftCallback(&ac->replies, &cb) == REDIS_OK) {
+        __redisRunCallback(ac, &cb, NULL);
+    }
+
+    /**
+     * TODO: Don't automatically sever the connection,
+     * rather, allow to ignore <x> responses before the queue is clear
+     */
+    __redisAsyncDisconnect(ac);
+}
+
+/* Sets a pointer to the first argument and its length starting at p. Returns
+ * the number of bytes to skip to get to the following argument. */
+static const char *nextArgument(const char *start, const char **str, size_t *len) {
+    const char *p = start;
+    if (p[0] != '$') {
+        p = strchr(p,'$');
+        if (p == NULL) return NULL;
+    }
+
+    *len = (int)strtol(p+1,NULL,10);
+    p = strchr(p,'\r');
+    assert(p);
+    *str = p+2;
+    return p+2+(*len)+2;
+}
+
+/* Helper function for the redisAsyncCommand* family of functions. Writes a
+ * formatted command to the output buffer and registers the provided callback
+ * function with the context. */
+static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
+    redisContext *c = &(ac->c);
+    redisCallback cb;
+    struct dict *cbdict;
+    dictEntry *de;
+    redisCallback *existcb;
+    int pvariant, svariant, hasnext;
+    const char *cstr, *astr;
+    size_t clen, alen;
+    const char *p;
+    sds sname;
+    int ret;
+
+    /* Don't accept new commands when the connection is about to be closed. */
+    if (c->flags & (REDIS_DISCONNECTING | REDIS_FREEING)) return REDIS_ERR;
+
+    /* Setup callback */
+    cb.fn = fn;
+    cb.privdata = privdata;
+    cb.pending_subs = 1;
+
+    /* Find out which command will be appended. */
+    p = nextArgument(cmd,&cstr,&clen);
+    assert(p != NULL);
+    hasnext = (p[0] == '$');
+    pvariant = (tolower(cstr[0]) == 'p') ? 1 : 0;
+    svariant = clen > 3 && (strncasecmp(cstr, "ssu"/*bscribe*/, 3) == 0 || strncasecmp(cstr, "sun"/*subscribe*/, 3) == 0);
+    cstr += pvariant + svariant;
+    clen -= pvariant + svariant;
+
+    if (hasnext && strncasecmp(cstr,"subscribe\r\n",11) == 0) {
+        c->flags |= REDIS_SUBSCRIBED;
+
+        /* Add every channel/pattern to the list of subscription callbacks. */
+        while ((p = nextArgument(p,&astr,&alen)) != NULL) {
+            sname = sdsnewlen(astr,alen);
+            if (sname == NULL)
+                goto oom;
+
+            if (pvariant)
+                cbdict = ac->sub.patterns;
+            else
+                cbdict = ac->sub.channels;
+
+            de = dictFind(cbdict,sname);
+
+            if (de != NULL) {
+                existcb = dictGetEntryVal(de);
+                cb.pending_subs = existcb->pending_subs + 1;
+            }
+
+            ret = dictReplace(cbdict,sname,&cb);
+
+            if (ret == 0) sdsfree(sname);
+        }
+    } else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) {
+        /* It is only useful to call (P|S)UNSUBSCRIBE when the context is
+         * subscribed to one or more channels or patterns. */
+        if (!(c->flags & REDIS_SUBSCRIBED)) return REDIS_ERR;
+
+        /* (P|S)UNSUBSCRIBE does not have its own response: every channel or
+         * pattern that is unsubscribed will receive a message. This means we
+         * should not append a callback function for this command. */
+     } else if(strncasecmp(cstr,"monitor\r\n",9) == 0) {
+         /* Set monitor flag and push callback */
+         c->flags |= REDIS_MONITORING;
+         __redisPushCallback(&ac->replies,&cb);
+    } else {
+        if (c->flags & REDIS_SUBSCRIBED)
+            /* This will likely result in an error reply, but it needs to be
+             * received and passed to the callback. */
+            __redisPushCallback(&ac->sub.invalid,&cb);
+        else
+            __redisPushCallback(&ac->replies,&cb);
+    }
+
+    __redisAppendCommand(c,cmd,len);
+
+    /* Always schedule a write when the write buffer is non-empty */
+    _EL_ADD_WRITE(ac);
+
+    return REDIS_OK;
+oom:
+    __redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
+    return REDIS_ERR;
+}
+
+int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap) {
+    char *cmd;
+    int len;
+    int status;
+    len = redisvFormatCommand(&cmd,format,ap);
+
+    /* We don't want to pass -1 or -2 to future functions as a length. */
+    if (len < 0)
+        return REDIS_ERR;
+
+    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
+    hi_free(cmd);
+    return status;
+}
+
+int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...) {
+    va_list ap;
+    int status;
+    va_start(ap,format);
+    status = redisvAsyncCommand(ac,fn,privdata,format,ap);
+    va_end(ap);
+    return status;
+}
+
+int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) {
+    sds cmd;
+    int len;
+    int status;
+    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
+    if (len < 0)
+        return REDIS_ERR;
+    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
+    sdsfree(cmd);
+    return status;
+}
+
+int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
+    int status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
+    return status;
+}
+
+redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn) {
+    redisAsyncPushFn *old = ac->push_cb;
+    ac->push_cb = fn;
+    return old;
+}
+
+int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv) {
+    if (!ac->c.command_timeout) {
+        ac->c.command_timeout = hi_calloc(1, sizeof(tv));
+        if (ac->c.command_timeout == NULL) {
+            __redisSetError(&ac->c, REDIS_ERR_OOM, "Out of memory");
+            __redisAsyncCopyError(ac);
+            return REDIS_ERR;
+        }
+    }
+
+    if (tv.tv_sec != ac->c.command_timeout->tv_sec ||
+        tv.tv_usec != ac->c.command_timeout->tv_usec)
+    {
+        *ac->c.command_timeout = tv;
+    }
+
+    return REDIS_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async.h
new file mode 100644
index 0000000..b1d2cb2
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_ASYNC_H
+#define __HIREDIS_ASYNC_H
+#include "hiredis.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
+struct dict; /* dictionary header is included in async.c */
+
+/* Reply callback prototype and container */
+typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
+typedef struct redisCallback {
+    struct redisCallback *next; /* simple singly linked list */
+    redisCallbackFn *fn;
+    int pending_subs;
+    void *privdata;
+} redisCallback;
+
+/* List of callbacks for either regular replies or pub/sub */
+typedef struct redisCallbackList {
+    redisCallback *head, *tail;
+} redisCallbackList;
+
+/* Connection callback prototypes */
+typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
+typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
+typedef void(redisTimerCallback)(void *timer, void *privdata);
+
+/* Context for an async connection to Redis */
+typedef struct redisAsyncContext {
+    /* Hold the regular context, so it can be realloc'ed. */
+    redisContext c;
+
+    /* Setup error flags so they can be used directly. */
+    int err;
+    char *errstr;
+
+    /* Not used by hiredis */
+    void *data;
+    void (*dataCleanup)(void *privdata);
+
+    /* Event library data and hooks */
+    struct {
+        void *data;
+
+        /* Hooks that are called when the library expects to start
+         * reading/writing. These functions should be idempotent. */
+        void (*addRead)(void *privdata);
+        void (*delRead)(void *privdata);
+        void (*addWrite)(void *privdata);
+        void (*delWrite)(void *privdata);
+        void (*cleanup)(void *privdata);
+        void (*scheduleTimer)(void *privdata, struct timeval tv);
+    } ev;
+
+    /* Called when either the connection is terminated due to an error or per
+     * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
+    redisDisconnectCallback *onDisconnect;
+
+    /* Called when the first write event was received. */
+    redisConnectCallback *onConnect;
+
+    /* Regular command callbacks */
+    redisCallbackList replies;
+
+    /* Address used for connect() */
+    struct sockaddr *saddr;
+    size_t addrlen;
+
+    /* Subscription callbacks */
+    struct {
+        redisCallbackList invalid;
+        struct dict *channels;
+        struct dict *patterns;
+    } sub;
+
+    /* Any configured RESP3 PUSH handler */
+    redisAsyncPushFn *push_cb;
+} redisAsyncContext;
+
+/* Functions that proxy to hiredis */
+redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options);
+redisAsyncContext *redisAsyncConnect(const char *ip, int port);
+redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
+redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
+                                                  const char *source_addr);
+redisAsyncContext *redisAsyncConnectUnix(const char *path);
+int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
+int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
+
+redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn);
+int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv);
+void redisAsyncDisconnect(redisAsyncContext *ac);
+void redisAsyncFree(redisAsyncContext *ac);
+
+/* Handle read/write events */
+void redisAsyncHandleRead(redisAsyncContext *ac);
+void redisAsyncHandleWrite(redisAsyncContext *ac);
+void redisAsyncHandleTimeout(redisAsyncContext *ac);
+void redisAsyncRead(redisAsyncContext *ac);
+void redisAsyncWrite(redisAsyncContext *ac);
+
+/* Command functions for an async context. Write the command to the
+ * output buffer and register the provided callback. */
+int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
+int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
+int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
+int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async_private.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async_private.h
new file mode 100644
index 0000000..b9d23ff
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/async_private.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_ASYNC_PRIVATE_H
+#define __HIREDIS_ASYNC_PRIVATE_H
+
+#define _EL_ADD_READ(ctx)                                         \
+    do {                                                          \
+        refreshTimeout(ctx);                                      \
+        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
+    } while (0)
+#define _EL_DEL_READ(ctx) do { \
+        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
+    } while(0)
+#define _EL_ADD_WRITE(ctx)                                          \
+    do {                                                            \
+        refreshTimeout(ctx);                                        \
+        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
+    } while (0)
+#define _EL_DEL_WRITE(ctx) do { \
+        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
+    } while(0)
+#define _EL_CLEANUP(ctx) do { \
+        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
+        ctx->ev.cleanup = NULL; \
+    } while(0);
+
+static inline void refreshTimeout(redisAsyncContext *ctx) {
+    #define REDIS_TIMER_ISSET(tvp) \
+        (tvp && ((tvp)->tv_sec || (tvp)->tv_usec))
+
+    #define REDIS_EL_TIMER(ac, tvp) \
+        if ((ac)->ev.scheduleTimer && REDIS_TIMER_ISSET(tvp)) { \
+            (ac)->ev.scheduleTimer((ac)->ev.data, *(tvp)); \
+        }
+
+    if (ctx->c.flags & REDIS_CONNECTED) {
+        REDIS_EL_TIMER(ctx, ctx->c.command_timeout);
+    } else {
+        REDIS_EL_TIMER(ctx, ctx->c.connect_timeout);
+    }
+}
+
+void __redisAsyncDisconnect(redisAsyncContext *ac);
+void redisProcessCallbacks(redisAsyncContext *ac);
+
+#endif  /* __HIREDIS_ASYNC_PRIVATE_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/dict.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/dict.c
new file mode 100644
index 0000000..74a4633
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/dict.c
@@ -0,0 +1,357 @@
+/* Hash table implementation.
+ *
+ * This file implements in memory hash tables with insert/del/replace/find/
+ * get-random-element operations. Hash tables will auto resize if needed
+ * tables of power of two in size are used, collisions are handled by
+ * chaining. See the source code for more information... :)
+ *
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include "alloc.h"
+#include <stdlib.h>
+#include <assert.h>
+#include <limits.h>
+#include "dict.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+
+/* -------------------------- private prototypes ---------------------------- */
+
+static int _dictExpandIfNeeded(dict *ht);
+static unsigned long _dictNextPower(unsigned long size);
+static int _dictKeyIndex(dict *ht, const void *key);
+static int _dictInit(dict *ht, dictType *type, void *privDataPtr);
+
+/* -------------------------- hash functions -------------------------------- */
+
+/* Generic hash function (a popular one from Bernstein).
+ * I tested a few and this was the best. */
+static unsigned int dictGenHashFunction(const unsigned char *buf, int len) {
+    unsigned int hash = 5381;
+
+    while (len--)
+        hash = ((hash << 5) + hash) + (*buf++); /* hash * 33 + c */
+    return hash;
+}
+
+/* ----------------------------- API implementation ------------------------- */
+
+/* Reset an hashtable already initialized with ht_init().
+ * NOTE: This function should only called by ht_destroy(). */
+static void _dictReset(dict *ht) {
+    ht->table = NULL;
+    ht->size = 0;
+    ht->sizemask = 0;
+    ht->used = 0;
+}
+
+/* Create a new hash table */
+static dict *dictCreate(dictType *type, void *privDataPtr) {
+    dict *ht = hi_malloc(sizeof(*ht));
+    if (ht == NULL)
+        return NULL;
+
+    _dictInit(ht,type,privDataPtr);
+    return ht;
+}
+
+/* Initialize the hash table */
+static int _dictInit(dict *ht, dictType *type, void *privDataPtr) {
+    _dictReset(ht);
+    ht->type = type;
+    ht->privdata = privDataPtr;
+    return DICT_OK;
+}
+
+/* Expand or create the hashtable */
+static int dictExpand(dict *ht, unsigned long size) {
+    dict n; /* the new hashtable */
+    unsigned long realsize = _dictNextPower(size), i;
+
+    /* the size is invalid if it is smaller than the number of
+     * elements already inside the hashtable */
+    if (ht->used > size)
+        return DICT_ERR;
+
+    _dictInit(&n, ht->type, ht->privdata);
+    n.size = realsize;
+    n.sizemask = realsize-1;
+    n.table = hi_calloc(realsize,sizeof(dictEntry*));
+    if (n.table == NULL)
+        return DICT_ERR;
+
+    /* Copy all the elements from the old to the new table:
+     * note that if the old hash table is empty ht->size is zero,
+     * so dictExpand just creates an hash table. */
+    n.used = ht->used;
+    for (i = 0; i < ht->size && ht->used > 0; i++) {
+        dictEntry *he, *nextHe;
+
+        if (ht->table[i] == NULL) continue;
+
+        /* For each hash entry on this slot... */
+        he = ht->table[i];
+        while(he) {
+            unsigned int h;
+
+            nextHe = he->next;
+            /* Get the new element index */
+            h = dictHashKey(ht, he->key) & n.sizemask;
+            he->next = n.table[h];
+            n.table[h] = he;
+            ht->used--;
+            /* Pass to the next element */
+            he = nextHe;
+        }
+    }
+    assert(ht->used == 0);
+    hi_free(ht->table);
+
+    /* Remap the new hashtable in the old */
+    *ht = n;
+    return DICT_OK;
+}
+
+/* Add an element to the target hash table */
+static int dictAdd(dict *ht, void *key, void *val) {
+    int index;
+    dictEntry *entry;
+
+    /* Get the index of the new element, or -1 if
+     * the element already exists. */
+    if ((index = _dictKeyIndex(ht, key)) == -1)
+        return DICT_ERR;
+
+    /* Allocates the memory and stores key */
+    entry = hi_malloc(sizeof(*entry));
+    if (entry == NULL)
+        return DICT_ERR;
+
+    entry->next = ht->table[index];
+    ht->table[index] = entry;
+
+    /* Set the hash entry fields. */
+    dictSetHashKey(ht, entry, key);
+    dictSetHashVal(ht, entry, val);
+    ht->used++;
+    return DICT_OK;
+}
+
+/* Add an element, discarding the old if the key already exists.
+ * Return 1 if the key was added from scratch, 0 if there was already an
+ * element with such key and dictReplace() just performed a value update
+ * operation. */
+static int dictReplace(dict *ht, void *key, void *val) {
+    dictEntry *entry, auxentry;
+
+    /* Try to add the element. If the key
+     * does not exists dictAdd will succeed. */
+    if (dictAdd(ht, key, val) == DICT_OK)
+        return 1;
+    /* It already exists, get the entry */
+    entry = dictFind(ht, key);
+    if (entry == NULL)
+        return 0;
+
+    /* Free the old value and set the new one */
+    /* Set the new value and free the old one. Note that it is important
+     * to do that in this order, as the value may just be exactly the same
+     * as the previous one. In this context, think to reference counting,
+     * you want to increment (set), and then decrement (free), and not the
+     * reverse. */
+    auxentry = *entry;
+    dictSetHashVal(ht, entry, val);
+    dictFreeEntryVal(ht, &auxentry);
+    return 0;
+}
+
+/* Search and remove an element */
+static int dictDelete(dict *ht, const void *key) {
+    unsigned int h;
+    dictEntry *de, *prevde;
+
+    if (ht->size == 0)
+        return DICT_ERR;
+    h = dictHashKey(ht, key) & ht->sizemask;
+    de = ht->table[h];
+
+    prevde = NULL;
+    while(de) {
+        if (dictCompareHashKeys(ht,key,de->key)) {
+            /* Unlink the element from the list */
+            if (prevde)
+                prevde->next = de->next;
+            else
+                ht->table[h] = de->next;
+
+            dictFreeEntryKey(ht,de);
+            dictFreeEntryVal(ht,de);
+            hi_free(de);
+            ht->used--;
+            return DICT_OK;
+        }
+        prevde = de;
+        de = de->next;
+    }
+    return DICT_ERR; /* not found */
+}
+
+/* Destroy an entire hash table */
+static int _dictClear(dict *ht) {
+    unsigned long i;
+
+    /* Free all the elements */
+    for (i = 0; i < ht->size && ht->used > 0; i++) {
+        dictEntry *he, *nextHe;
+
+        if ((he = ht->table[i]) == NULL) continue;
+        while(he) {
+            nextHe = he->next;
+            dictFreeEntryKey(ht, he);
+            dictFreeEntryVal(ht, he);
+            hi_free(he);
+            ht->used--;
+            he = nextHe;
+        }
+    }
+    /* Free the table and the allocated cache structure */
+    hi_free(ht->table);
+    /* Re-initialize the table */
+    _dictReset(ht);
+    return DICT_OK; /* never fails */
+}
+
+/* Clear & Release the hash table */
+static void dictRelease(dict *ht) {
+    _dictClear(ht);
+    hi_free(ht);
+}
+
+static dictEntry *dictFind(dict *ht, const void *key) {
+    dictEntry *he;
+    unsigned int h;
+
+    if (ht->size == 0) return NULL;
+    h = dictHashKey(ht, key) & ht->sizemask;
+    he = ht->table[h];
+    while(he) {
+        if (dictCompareHashKeys(ht, key, he->key))
+            return he;
+        he = he->next;
+    }
+    return NULL;
+}
+
+static dictIterator *dictGetIterator(dict *ht) {
+    dictIterator *iter = hi_malloc(sizeof(*iter));
+    if (iter == NULL)
+        return NULL;
+
+    iter->ht = ht;
+    iter->index = -1;
+    iter->entry = NULL;
+    iter->nextEntry = NULL;
+    return iter;
+}
+
+static dictEntry *dictNext(dictIterator *iter) {
+    while (1) {
+        if (iter->entry == NULL) {
+            iter->index++;
+            if (iter->index >=
+                    (signed)iter->ht->size) break;
+            iter->entry = iter->ht->table[iter->index];
+        } else {
+            iter->entry = iter->nextEntry;
+        }
+        if (iter->entry) {
+            /* We need to save the 'next' here, the iterator user
+             * may delete the entry we are returning. */
+            iter->nextEntry = iter->entry->next;
+            return iter->entry;
+        }
+    }
+    return NULL;
+}
+
+static void dictReleaseIterator(dictIterator *iter) {
+    hi_free(iter);
+}
+
+/* ------------------------- private functions ------------------------------ */
+
+/* Expand the hash table if needed */
+static int _dictExpandIfNeeded(dict *ht) {
+    /* If the hash table is empty expand it to the initial size,
+     * if the table is "full" double its size. */
+    if (ht->size == 0)
+        return dictExpand(ht, DICT_HT_INITIAL_SIZE);
+    if (ht->used == ht->size)
+        return dictExpand(ht, ht->size*2);
+    return DICT_OK;
+}
+
+/* Our hash table capability is a power of two */
+static unsigned long _dictNextPower(unsigned long size) {
+    unsigned long i = DICT_HT_INITIAL_SIZE;
+
+    if (size >= LONG_MAX) return LONG_MAX;
+    while(1) {
+        if (i >= size)
+            return i;
+        i *= 2;
+    }
+}
+
+/* Returns the index of a free slot that can be populated with
+ * an hash entry for the given 'key'.
+ * If the key already exists, -1 is returned. */
+static int _dictKeyIndex(dict *ht, const void *key) {
+    unsigned int h;
+    dictEntry *he;
+
+    /* Expand the hashtable if needed */
+    if (_dictExpandIfNeeded(ht) == DICT_ERR)
+        return -1;
+    /* Compute the key hash value */
+    h = dictHashKey(ht, key) & ht->sizemask;
+    /* Search if this slot does not already contain the given key */
+    he = ht->table[h];
+    while(he) {
+        if (dictCompareHashKeys(ht, key, he->key))
+            return -1;
+        he = he->next;
+    }
+    return h;
+}
+
+
+#pragma GCC diagnostic pop
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/dict.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/dict.h
new file mode 100644
index 0000000..95fcd28
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/dict.h
@@ -0,0 +1,126 @@
+/* Hash table implementation.
+ *
+ * This file implements in memory hash tables with insert/del/replace/find/
+ * get-random-element operations. Hash tables will auto resize if needed
+ * tables of power of two in size are used, collisions are handled by
+ * chaining. See the source code for more information... :)
+ *
+ * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __DICT_H
+#define __DICT_H
+
+#define DICT_OK 0
+#define DICT_ERR 1
+
+/* Unused arguments generate annoying warnings... */
+#define DICT_NOTUSED(V) ((void) V)
+
+typedef struct dictEntry {
+    void *key;
+    void *val;
+    struct dictEntry *next;
+} dictEntry;
+
+typedef struct dictType {
+    unsigned int (*hashFunction)(const void *key);
+    void *(*keyDup)(void *privdata, const void *key);
+    void *(*valDup)(void *privdata, const void *obj);
+    int (*keyCompare)(void *privdata, const void *key1, const void *key2);
+    void (*keyDestructor)(void *privdata, void *key);
+    void (*valDestructor)(void *privdata, void *obj);
+} dictType;
+
+typedef struct dict {
+    dictEntry **table;
+    dictType *type;
+    unsigned long size;
+    unsigned long sizemask;
+    unsigned long used;
+    void *privdata;
+} dict;
+
+typedef struct dictIterator {
+    dict *ht;
+    int index;
+    dictEntry *entry, *nextEntry;
+} dictIterator;
+
+/* This is the initial size of every hash table */
+#define DICT_HT_INITIAL_SIZE     4
+
+/* ------------------------------- Macros ------------------------------------*/
+#define dictFreeEntryVal(ht, entry) \
+    if ((ht)->type->valDestructor) \
+        (ht)->type->valDestructor((ht)->privdata, (entry)->val)
+
+#define dictSetHashVal(ht, entry, _val_) do { \
+    if ((ht)->type->valDup) \
+        entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
+    else \
+        entry->val = (_val_); \
+} while(0)
+
+#define dictFreeEntryKey(ht, entry) \
+    if ((ht)->type->keyDestructor) \
+        (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
+
+#define dictSetHashKey(ht, entry, _key_) do { \
+    if ((ht)->type->keyDup) \
+        entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
+    else \
+        entry->key = (_key_); \
+} while(0)
+
+#define dictCompareHashKeys(ht, key1, key2) \
+    (((ht)->type->keyCompare) ? \
+        (ht)->type->keyCompare((ht)->privdata, key1, key2) : \
+        (key1) == (key2))
+
+#define dictHashKey(ht, key) (ht)->type->hashFunction(key)
+
+#define dictGetEntryKey(he) ((he)->key)
+#define dictGetEntryVal(he) ((he)->val)
+#define dictSlots(ht) ((ht)->size)
+#define dictSize(ht) ((ht)->used)
+
+/* API */
+static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
+static dict *dictCreate(dictType *type, void *privDataPtr);
+static int dictExpand(dict *ht, unsigned long size);
+static int dictAdd(dict *ht, void *key, void *val);
+static int dictReplace(dict *ht, void *key, void *val);
+static int dictDelete(dict *ht, const void *key);
+static void dictRelease(dict *ht);
+static dictEntry * dictFind(dict *ht, const void *key);
+static dictIterator *dictGetIterator(dict *ht);
+static dictEntry *dictNext(dictIterator *iter);
+static void dictReleaseIterator(dictIterator *iter);
+
+#endif /* __DICT_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/fmacros.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/fmacros.h
new file mode 100644
index 0000000..3227faa
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/fmacros.h
@@ -0,0 +1,12 @@
+#ifndef __HIREDIS_FMACRO_H
+#define __HIREDIS_FMACRO_H
+
+#define _XOPEN_SOURCE 600
+#define _POSIX_C_SOURCE 200112L
+
+#if defined(__APPLE__) && defined(__MACH__)
+/* Enable TCP_KEEPALIVE */
+#define _DARWIN_C_SOURCE
+#endif
+
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis.c
new file mode 100644
index 0000000..ab0e398
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis.c
@@ -0,0 +1,1174 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "hiredis.h"
+#include "net.h"
+#include "sds.h"
+#include "async.h"
+#include "win32.h"
+
+extern int redisContextUpdateConnectTimeout(redisContext *c, const struct timeval *timeout);
+extern int redisContextUpdateCommandTimeout(redisContext *c, const struct timeval *timeout);
+
+static redisContextFuncs redisContextDefaultFuncs = {
+    .free_privctx = NULL,
+    .async_read = redisAsyncRead,
+    .async_write = redisAsyncWrite,
+    .read = redisNetRead,
+    .write = redisNetWrite
+};
+
+static redisReply *createReplyObject(int type);
+static void *createStringObject(const redisReadTask *task, char *str, size_t len);
+static void *createArrayObject(const redisReadTask *task, size_t elements);
+static void *createIntegerObject(const redisReadTask *task, long long value);
+static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len);
+static void *createNilObject(const redisReadTask *task);
+static void *createBoolObject(const redisReadTask *task, int bval);
+
+/* Default set of functions to build the reply. Keep in mind that such a
+ * function returning NULL is interpreted as OOM. */
+static redisReplyObjectFunctions defaultFunctions = {
+    createStringObject,
+    createArrayObject,
+    createIntegerObject,
+    createDoubleObject,
+    createNilObject,
+    createBoolObject,
+    freeReplyObject
+};
+
+/* Create a reply object */
+static redisReply *createReplyObject(int type) {
+    redisReply *r = hi_calloc(1,sizeof(*r));
+
+    if (r == NULL)
+        return NULL;
+
+    r->type = type;
+    return r;
+}
+
+/* Free a reply object */
+void freeReplyObject(void *reply) {
+    redisReply *r = reply;
+    size_t j;
+
+    if (r == NULL)
+        return;
+
+    switch(r->type) {
+    case REDIS_REPLY_INTEGER:
+        break; /* Nothing to free */
+    case REDIS_REPLY_ARRAY:
+    case REDIS_REPLY_MAP:
+    case REDIS_REPLY_SET:
+    case REDIS_REPLY_PUSH:
+        if (r->element != NULL) {
+            for (j = 0; j < r->elements; j++)
+                freeReplyObject(r->element[j]);
+            hi_free(r->element);
+        }
+        break;
+    case REDIS_REPLY_ERROR:
+    case REDIS_REPLY_STATUS:
+    case REDIS_REPLY_STRING:
+    case REDIS_REPLY_DOUBLE:
+    case REDIS_REPLY_VERB:
+        hi_free(r->str);
+        break;
+    }
+    hi_free(r);
+}
+
+static void *createStringObject(const redisReadTask *task, char *str, size_t len) {
+    redisReply *r, *parent;
+    char *buf;
+
+    r = createReplyObject(task->type);
+    if (r == NULL)
+        return NULL;
+
+    assert(task->type == REDIS_REPLY_ERROR  ||
+           task->type == REDIS_REPLY_STATUS ||
+           task->type == REDIS_REPLY_STRING ||
+           task->type == REDIS_REPLY_VERB);
+
+    /* Copy string value */
+    if (task->type == REDIS_REPLY_VERB) {
+        buf = hi_malloc(len-4+1); /* Skip 4 bytes of verbatim type header. */
+        if (buf == NULL) goto oom;
+
+        memcpy(r->vtype,str,3);
+        r->vtype[3] = '\0';
+        memcpy(buf,str+4,len-4);
+        buf[len-4] = '\0';
+        r->len = len - 4;
+    } else {
+        buf = hi_malloc(len+1);
+        if (buf == NULL) goto oom;
+
+        memcpy(buf,str,len);
+        buf[len] = '\0';
+        r->len = len;
+    }
+    r->str = buf;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET ||
+               parent->type == REDIS_REPLY_PUSH);
+        parent->element[task->idx] = r;
+    }
+    return r;
+
+oom:
+    freeReplyObject(r);
+    return NULL;
+}
+
+static void *createArrayObject(const redisReadTask *task, size_t elements) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(task->type);
+    if (r == NULL)
+        return NULL;
+
+    if (elements > 0) {
+        if (SIZE_MAX / sizeof(redisReply*) < elements) return NULL;  /* Don't overflow */
+        r->element = hi_calloc(elements,sizeof(redisReply*));
+        if (r->element == NULL) {
+            freeReplyObject(r);
+            return NULL;
+        }
+    }
+
+    r->elements = elements;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET ||
+               parent->type == REDIS_REPLY_PUSH);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createIntegerObject(const redisReadTask *task, long long value) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_INTEGER);
+    if (r == NULL)
+        return NULL;
+
+    r->integer = value;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET ||
+               parent->type == REDIS_REPLY_PUSH);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_DOUBLE);
+    if (r == NULL)
+        return NULL;
+
+    r->dval = value;
+    r->str = hi_malloc(len+1);
+    if (r->str == NULL) {
+        freeReplyObject(r);
+        return NULL;
+    }
+
+    /* The double reply also has the original protocol string representing a
+     * double as a null terminated string. This way the caller does not need
+     * to format back for string conversion, especially since Redis does efforts
+     * to make the string more human readable avoiding the calssical double
+     * decimal string conversion artifacts. */
+    memcpy(r->str, str, len);
+    r->str[len] = '\0';
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createNilObject(const redisReadTask *task) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_NIL);
+    if (r == NULL)
+        return NULL;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+static void *createBoolObject(const redisReadTask *task, int bval) {
+    redisReply *r, *parent;
+
+    r = createReplyObject(REDIS_REPLY_BOOL);
+    if (r == NULL)
+        return NULL;
+
+    r->integer = bval != 0;
+
+    if (task->parent) {
+        parent = task->parent->obj;
+        assert(parent->type == REDIS_REPLY_ARRAY ||
+               parent->type == REDIS_REPLY_MAP ||
+               parent->type == REDIS_REPLY_SET);
+        parent->element[task->idx] = r;
+    }
+    return r;
+}
+
+/* Return the number of digits of 'v' when converted to string in radix 10.
+ * Implementation borrowed from link in redis/src/util.c:string2ll(). */
+static uint32_t countDigits(uint64_t v) {
+  uint32_t result = 1;
+  for (;;) {
+    if (v < 10) return result;
+    if (v < 100) return result + 1;
+    if (v < 1000) return result + 2;
+    if (v < 10000) return result + 3;
+    v /= 10000U;
+    result += 4;
+  }
+}
+
+/* Helper that calculates the bulk length given a certain string length. */
+static size_t bulklen(size_t len) {
+    return 1+countDigits(len)+2+len+2;
+}
+
+int redisvFormatCommand(char **target, const char *format, va_list ap) {
+    const char *c = format;
+    char *cmd = NULL; /* final command */
+    int pos; /* position in final command */
+    sds curarg, newarg; /* current argument */
+    int touched = 0; /* was the current argument touched? */
+    char **curargv = NULL, **newargv = NULL;
+    int argc = 0;
+    int totlen = 0;
+    int error_type = 0; /* 0 = no error; -1 = memory error; -2 = format error */
+    int j;
+
+    /* Abort if there is not target to set */
+    if (target == NULL)
+        return -1;
+
+    /* Build the command string accordingly to protocol */
+    curarg = sdsempty();
+    if (curarg == NULL)
+        return -1;
+
+    while(*c != '\0') {
+        if (*c != '%' || c[1] == '\0') {
+            if (*c == ' ') {
+                if (touched) {
+                    newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
+                    if (newargv == NULL) goto memory_err;
+                    curargv = newargv;
+                    curargv[argc++] = curarg;
+                    totlen += bulklen(sdslen(curarg));
+
+                    /* curarg is put in argv so it can be overwritten. */
+                    curarg = sdsempty();
+                    if (curarg == NULL) goto memory_err;
+                    touched = 0;
+                }
+            } else {
+                newarg = sdscatlen(curarg,c,1);
+                if (newarg == NULL) goto memory_err;
+                curarg = newarg;
+                touched = 1;
+            }
+        } else {
+            char *arg;
+            size_t size;
+
+            /* Set newarg so it can be checked even if it is not touched. */
+            newarg = curarg;
+
+            switch(c[1]) {
+            case 's':
+                arg = va_arg(ap,char*);
+                size = strlen(arg);
+                if (size > 0)
+                    newarg = sdscatlen(curarg,arg,size);
+                break;
+            case 'b':
+                arg = va_arg(ap,char*);
+                size = va_arg(ap,size_t);
+                if (size > 0)
+                    newarg = sdscatlen(curarg,arg,size);
+                break;
+            case '%':
+                newarg = sdscat(curarg,"%");
+                break;
+            default:
+                /* Try to detect printf format */
+                {
+                    static const char intfmts[] = "diouxX";
+                    static const char flags[] = "#0-+ ";
+                    char _format[16];
+                    const char *_p = c+1;
+                    size_t _l = 0;
+                    va_list _cpy;
+
+                    /* Flags */
+                    while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++;
+
+                    /* Field width */
+                    while (*_p != '\0' && isdigit(*_p)) _p++;
+
+                    /* Precision */
+                    if (*_p == '.') {
+                        _p++;
+                        while (*_p != '\0' && isdigit(*_p)) _p++;
+                    }
+
+                    /* Copy va_list before consuming with va_arg */
+                    va_copy(_cpy,ap);
+
+                    /* Integer conversion (without modifiers) */
+                    if (strchr(intfmts,*_p) != NULL) {
+                        va_arg(ap,int);
+                        goto fmt_valid;
+                    }
+
+                    /* Double conversion (without modifiers) */
+                    if (strchr("eEfFgGaA",*_p) != NULL) {
+                        va_arg(ap,double);
+                        goto fmt_valid;
+                    }
+
+                    /* Size: char */
+                    if (_p[0] == 'h' && _p[1] == 'h') {
+                        _p += 2;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,int); /* char gets promoted to int */
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                    /* Size: short */
+                    if (_p[0] == 'h') {
+                        _p += 1;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,int); /* short gets promoted to int */
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                    /* Size: long long */
+                    if (_p[0] == 'l' && _p[1] == 'l') {
+                        _p += 2;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,long long);
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                    /* Size: long */
+                    if (_p[0] == 'l') {
+                        _p += 1;
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
+                            va_arg(ap,long);
+                            goto fmt_valid;
+                        }
+                        goto fmt_invalid;
+                    }
+
+                fmt_invalid:
+                    va_end(_cpy);
+                    goto format_err;
+
+                fmt_valid:
+                    _l = (_p+1)-c;
+                    if (_l < sizeof(_format)-2) {
+                        memcpy(_format,c,_l);
+                        _format[_l] = '\0';
+                        newarg = sdscatvprintf(curarg,_format,_cpy);
+
+                        /* Update current position (note: outer blocks
+                         * increment c twice so compensate here) */
+                        c = _p-1;
+                    }
+
+                    va_end(_cpy);
+                    break;
+                }
+            }
+
+            if (newarg == NULL) goto memory_err;
+            curarg = newarg;
+
+            touched = 1;
+            c++;
+        }
+        c++;
+    }
+
+    /* Add the last argument if needed */
+    if (touched) {
+        newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
+        if (newargv == NULL) goto memory_err;
+        curargv = newargv;
+        curargv[argc++] = curarg;
+        totlen += bulklen(sdslen(curarg));
+    } else {
+        sdsfree(curarg);
+    }
+
+    /* Clear curarg because it was put in curargv or was free'd. */
+    curarg = NULL;
+
+    /* Add bytes needed to hold multi bulk count */
+    totlen += 1+countDigits(argc)+2;
+
+    /* Build the command at protocol level */
+    cmd = hi_malloc(totlen+1);
+    if (cmd == NULL) goto memory_err;
+
+    pos = sprintf(cmd,"*%d\r\n",argc);
+    for (j = 0; j < argc; j++) {
+        pos += sprintf(cmd+pos,"$%zu\r\n",sdslen(curargv[j]));
+        memcpy(cmd+pos,curargv[j],sdslen(curargv[j]));
+        pos += sdslen(curargv[j]);
+        sdsfree(curargv[j]);
+        cmd[pos++] = '\r';
+        cmd[pos++] = '\n';
+    }
+    assert(pos == totlen);
+    cmd[pos] = '\0';
+
+    hi_free(curargv);
+    *target = cmd;
+    return totlen;
+
+format_err:
+    error_type = -2;
+    goto cleanup;
+
+memory_err:
+    error_type = -1;
+    goto cleanup;
+
+cleanup:
+    if (curargv) {
+        while(argc--)
+            sdsfree(curargv[argc]);
+        hi_free(curargv);
+    }
+
+    sdsfree(curarg);
+    hi_free(cmd);
+
+    return error_type;
+}
+
+/* Format a command according to the Redis protocol. This function
+ * takes a format similar to printf:
+ *
+ * %s represents a C null terminated string you want to interpolate
+ * %b represents a binary safe string
+ *
+ * When using %b you need to provide both the pointer to the string
+ * and the length in bytes as a size_t. Examples:
+ *
+ * len = redisFormatCommand(target, "GET %s", mykey);
+ * len = redisFormatCommand(target, "SET %s %b", mykey, myval, myvallen);
+ */
+int redisFormatCommand(char **target, const char *format, ...) {
+    va_list ap;
+    int len;
+    va_start(ap,format);
+    len = redisvFormatCommand(target,format,ap);
+    va_end(ap);
+
+    /* The API says "-1" means bad result, but we now also return "-2" in some
+     * cases.  Force the return value to always be -1. */
+    if (len < 0)
+        len = -1;
+
+    return len;
+}
+
+/* Format a command according to the Redis protocol using an sds string and
+ * sdscatfmt for the processing of arguments. This function takes the
+ * number of arguments, an array with arguments and an array with their
+ * lengths. If the latter is set to NULL, strlen will be used to compute the
+ * argument lengths.
+ */
+int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
+                              const size_t *argvlen)
+{
+    sds cmd, aux;
+    unsigned long long totlen;
+    int j;
+    size_t len;
+
+    /* Abort on a NULL target */
+    if (target == NULL)
+        return -1;
+
+    /* Calculate our total size */
+    totlen = 1+countDigits(argc)+2;
+    for (j = 0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        totlen += bulklen(len);
+    }
+
+    /* Use an SDS string for command construction */
+    cmd = sdsempty();
+    if (cmd == NULL)
+        return -1;
+
+    /* We already know how much storage we need */
+    aux = sdsMakeRoomFor(cmd, totlen);
+    if (aux == NULL) {
+        sdsfree(cmd);
+        return -1;
+    }
+
+    cmd = aux;
+
+    /* Construct command */
+    cmd = sdscatfmt(cmd, "*%i\r\n", argc);
+    for (j=0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        cmd = sdscatfmt(cmd, "$%u\r\n", len);
+        cmd = sdscatlen(cmd, argv[j], len);
+        cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
+    }
+
+    assert(sdslen(cmd)==totlen);
+
+    *target = cmd;
+    return totlen;
+}
+
+void redisFreeSdsCommand(sds cmd) {
+    sdsfree(cmd);
+}
+
+/* Format a command according to the Redis protocol. This function takes the
+ * number of arguments, an array with arguments and an array with their
+ * lengths. If the latter is set to NULL, strlen will be used to compute the
+ * argument lengths.
+ */
+int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen) {
+    char *cmd = NULL; /* final command */
+    int pos; /* position in final command */
+    size_t len;
+    int totlen, j;
+
+    /* Abort on a NULL target */
+    if (target == NULL)
+        return -1;
+
+    /* Calculate number of bytes needed for the command */
+    totlen = 1+countDigits(argc)+2;
+    for (j = 0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        totlen += bulklen(len);
+    }
+
+    /* Build the command at protocol level */
+    cmd = hi_malloc(totlen+1);
+    if (cmd == NULL)
+        return -1;
+
+    pos = sprintf(cmd,"*%d\r\n",argc);
+    for (j = 0; j < argc; j++) {
+        len = argvlen ? argvlen[j] : strlen(argv[j]);
+        pos += sprintf(cmd+pos,"$%zu\r\n",len);
+        memcpy(cmd+pos,argv[j],len);
+        pos += len;
+        cmd[pos++] = '\r';
+        cmd[pos++] = '\n';
+    }
+    assert(pos == totlen);
+    cmd[pos] = '\0';
+
+    *target = cmd;
+    return totlen;
+}
+
+void redisFreeCommand(char *cmd) {
+    hi_free(cmd);
+}
+
+void __redisSetError(redisContext *c, int type, const char *str) {
+    size_t len;
+
+    c->err = type;
+    if (str != NULL) {
+        len = strlen(str);
+        len = len < (sizeof(c->errstr)-1) ? len : (sizeof(c->errstr)-1);
+        memcpy(c->errstr,str,len);
+        c->errstr[len] = '\0';
+    } else {
+        /* Only REDIS_ERR_IO may lack a description! */
+        assert(type == REDIS_ERR_IO);
+        strerror_r(errno, c->errstr, sizeof(c->errstr));
+    }
+}
+
+redisReader *redisReaderCreate(void) {
+    return redisReaderCreateWithFunctions(&defaultFunctions);
+}
+
+static void redisPushAutoFree(void *privdata, void *reply) {
+    (void)privdata;
+    freeReplyObject(reply);
+}
+
+static redisContext *redisContextInit(void) {
+    redisContext *c;
+
+    c = hi_calloc(1, sizeof(*c));
+    if (c == NULL)
+        return NULL;
+
+    c->funcs = &redisContextDefaultFuncs;
+
+    c->obuf = sdsempty();
+    c->reader = redisReaderCreate();
+    c->fd = REDIS_INVALID_FD;
+
+    if (c->obuf == NULL || c->reader == NULL) {
+        redisFree(c);
+        return NULL;
+    }
+
+    return c;
+}
+
+void redisFree(redisContext *c) {
+    if (c == NULL)
+        return;
+    redisNetClose(c);
+
+    sdsfree(c->obuf);
+    redisReaderFree(c->reader);
+    hi_free(c->tcp.host);
+    hi_free(c->tcp.source_addr);
+    hi_free(c->unix_sock.path);
+    hi_free(c->connect_timeout);
+    hi_free(c->command_timeout);
+    hi_free(c->saddr);
+
+    if (c->privdata && c->free_privdata)
+        c->free_privdata(c->privdata);
+
+    if (c->funcs->free_privctx)
+        c->funcs->free_privctx(c->privctx);
+
+    memset(c, 0xff, sizeof(*c));
+    hi_free(c);
+}
+
+redisFD redisFreeKeepFd(redisContext *c) {
+    redisFD fd = c->fd;
+    c->fd = REDIS_INVALID_FD;
+    redisFree(c);
+    return fd;
+}
+
+int redisReconnect(redisContext *c) {
+    c->err = 0;
+    memset(c->errstr, '\0', strlen(c->errstr));
+
+    if (c->privctx && c->funcs->free_privctx) {
+        c->funcs->free_privctx(c->privctx);
+        c->privctx = NULL;
+    }
+
+    redisNetClose(c);
+
+    sdsfree(c->obuf);
+    redisReaderFree(c->reader);
+
+    c->obuf = sdsempty();
+    c->reader = redisReaderCreate();
+
+    if (c->obuf == NULL || c->reader == NULL) {
+        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+        return REDIS_ERR;
+    }
+
+    int ret = REDIS_ERR;
+    if (c->connection_type == REDIS_CONN_TCP) {
+        ret = redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
+               c->connect_timeout, c->tcp.source_addr);
+    } else if (c->connection_type == REDIS_CONN_UNIX) {
+        ret = redisContextConnectUnix(c, c->unix_sock.path, c->connect_timeout);
+    } else {
+        /* Something bad happened here and shouldn't have. There isn't
+           enough information in the context to reconnect. */
+        __redisSetError(c,REDIS_ERR_OTHER,"Not enough information to reconnect");
+        ret = REDIS_ERR;
+    }
+
+    if (c->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
+        redisContextSetTimeout(c, *c->command_timeout);
+    }
+
+    return ret;
+}
+
+redisContext *redisConnectWithOptions(const redisOptions *options) {
+    redisContext *c = redisContextInit();
+    if (c == NULL) {
+        return NULL;
+    }
+    if (!(options->options & REDIS_OPT_NONBLOCK)) {
+        c->flags |= REDIS_BLOCK;
+    }
+    if (options->options & REDIS_OPT_REUSEADDR) {
+        c->flags |= REDIS_REUSEADDR;
+    }
+    if (options->options & REDIS_OPT_NOAUTOFREE) {
+        c->flags |= REDIS_NO_AUTO_FREE;
+    }
+
+    /* Set any user supplied RESP3 PUSH handler or use freeReplyObject
+     * as a default unless specifically flagged that we don't want one. */
+    if (options->push_cb != NULL)
+        redisSetPushCallback(c, options->push_cb);
+    else if (!(options->options & REDIS_OPT_NO_PUSH_AUTOFREE))
+        redisSetPushCallback(c, redisPushAutoFree);
+
+    c->privdata = options->privdata;
+    c->free_privdata = options->free_privdata;
+
+    if (redisContextUpdateConnectTimeout(c, options->connect_timeout) != REDIS_OK ||
+        redisContextUpdateCommandTimeout(c, options->command_timeout) != REDIS_OK) {
+        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+        return c;
+    }
+
+    if (options->type == REDIS_CONN_TCP) {
+        redisContextConnectBindTcp(c, options->endpoint.tcp.ip,
+                                   options->endpoint.tcp.port, options->connect_timeout,
+                                   options->endpoint.tcp.source_addr);
+    } else if (options->type == REDIS_CONN_UNIX) {
+        redisContextConnectUnix(c, options->endpoint.unix_socket,
+                                options->connect_timeout);
+    } else if (options->type == REDIS_CONN_USERFD) {
+        c->fd = options->endpoint.fd;
+        c->flags |= REDIS_CONNECTED;
+    } else {
+        // Unknown type - FIXME - FREE
+        return NULL;
+    }
+
+    if (options->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
+        redisContextSetTimeout(c, *options->command_timeout);
+    }
+
+    return c;
+}
+
+/* Connect to a Redis instance. On error the field error in the returned
+ * context will be set to the return value of the error function.
+ * When no set of reply functions is given, the default set will be used. */
+redisContext *redisConnect(const char *ip, int port) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    return redisConnectWithOptions(&options);
+}
+
+redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.connect_timeout = &tv;
+    return redisConnectWithOptions(&options);
+}
+
+redisContext *redisConnectNonBlock(const char *ip, int port) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.options |= REDIS_OPT_NONBLOCK;
+    return redisConnectWithOptions(&options);
+}
+
+redisContext *redisConnectBindNonBlock(const char *ip, int port,
+                                       const char *source_addr) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.endpoint.tcp.source_addr = source_addr;
+    options.options |= REDIS_OPT_NONBLOCK;
+    return redisConnectWithOptions(&options);
+}
+
+redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
+                                                const char *source_addr) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, ip, port);
+    options.endpoint.tcp.source_addr = source_addr;
+    options.options |= REDIS_OPT_NONBLOCK|REDIS_OPT_REUSEADDR;
+    return redisConnectWithOptions(&options);
+}
+
+redisContext *redisConnectUnix(const char *path) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_UNIX(&options, path);
+    return redisConnectWithOptions(&options);
+}
+
+redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_UNIX(&options, path);
+    options.connect_timeout = &tv;
+    return redisConnectWithOptions(&options);
+}
+
+redisContext *redisConnectUnixNonBlock(const char *path) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_UNIX(&options, path);
+    options.options |= REDIS_OPT_NONBLOCK;
+    return redisConnectWithOptions(&options);
+}
+
+redisContext *redisConnectFd(redisFD fd) {
+    redisOptions options = {0};
+    options.type = REDIS_CONN_USERFD;
+    options.endpoint.fd = fd;
+    return redisConnectWithOptions(&options);
+}
+
+/* Set read/write timeout on a blocking socket. */
+int redisSetTimeout(redisContext *c, const struct timeval tv) {
+    if (c->flags & REDIS_BLOCK)
+        return redisContextSetTimeout(c,tv);
+    return REDIS_ERR;
+}
+
+/* Enable connection KeepAlive. */
+int redisEnableKeepAlive(redisContext *c) {
+    if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
+        return REDIS_ERR;
+    return REDIS_OK;
+}
+
+/* Set a user provided RESP3 PUSH handler and return any old one set. */
+redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn) {
+    redisPushFn *old = c->push_cb;
+    c->push_cb = fn;
+    return old;
+}
+
+/* Use this function to handle a read event on the descriptor. It will try
+ * and read some bytes from the socket and feed them to the reply parser.
+ *
+ * After this function is called, you may use redisGetReplyFromReader to
+ * see if there is a reply available. */
+int redisBufferRead(redisContext *c) {
+    char buf[1024*16];
+    int nread;
+
+    /* Return early when the context has seen an error. */
+    if (c->err)
+        return REDIS_ERR;
+
+    nread = c->funcs->read(c, buf, sizeof(buf));
+    if (nread > 0) {
+        if (redisReaderFeed(c->reader, buf, nread) != REDIS_OK) {
+            __redisSetError(c, c->reader->err, c->reader->errstr);
+            return REDIS_ERR;
+        } else {
+        }
+    } else if (nread < 0) {
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+/* Write the output buffer to the socket.
+ *
+ * Returns REDIS_OK when the buffer is empty, or (a part of) the buffer was
+ * successfully written to the socket. When the buffer is empty after the
+ * write operation, "done" is set to 1 (if given).
+ *
+ * Returns REDIS_ERR if an error occurred trying to write and sets
+ * c->errstr to hold the appropriate error string.
+ */
+int redisBufferWrite(redisContext *c, int *done) {
+
+    /* Return early when the context has seen an error. */
+    if (c->err)
+        return REDIS_ERR;
+
+    if (sdslen(c->obuf) > 0) {
+        ssize_t nwritten = c->funcs->write(c);
+        if (nwritten < 0) {
+            return REDIS_ERR;
+        } else if (nwritten > 0) {
+            if (nwritten == (ssize_t)sdslen(c->obuf)) {
+                sdsfree(c->obuf);
+                c->obuf = sdsempty();
+                if (c->obuf == NULL)
+                    goto oom;
+            } else {
+                if (sdsrange(c->obuf,nwritten,-1) < 0) goto oom;
+            }
+        }
+    }
+    if (done != NULL) *done = (sdslen(c->obuf) == 0);
+    return REDIS_OK;
+
+oom:
+    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+    return REDIS_ERR;
+}
+
+/* Internal helper function to try and get a reply from the reader,
+ * or set an error in the context otherwise. */
+int redisGetReplyFromReader(redisContext *c, void **reply) {
+    if (redisReaderGetReply(c->reader,reply) == REDIS_ERR) {
+        __redisSetError(c,c->reader->err,c->reader->errstr);
+        return REDIS_ERR;
+    }
+
+    return REDIS_OK;
+}
+
+/* Internal helper that returns 1 if the reply was a RESP3 PUSH
+ * message and we handled it with a user-provided callback. */
+static int redisHandledPushReply(redisContext *c, void *reply) {
+    if (reply && c->push_cb && redisIsPushReply(reply)) {
+        c->push_cb(c->privdata, reply);
+        return 1;
+    }
+
+    return 0;
+}
+
+int redisGetReply(redisContext *c, void **reply) {
+    int wdone = 0;
+    void *aux = NULL;
+
+    /* Try to read pending replies */
+    if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
+        return REDIS_ERR;
+
+    /* For the blocking context, flush output buffer and read reply */
+    if (aux == NULL && c->flags & REDIS_BLOCK) {
+        /* Write until done */
+        do {
+            if (redisBufferWrite(c,&wdone) == REDIS_ERR)
+                return REDIS_ERR;
+        } while (!wdone);
+
+        /* Read until there is a reply */
+        do {
+            if (redisBufferRead(c) == REDIS_ERR)
+                return REDIS_ERR;
+
+            /* We loop here in case the user has specified a RESP3
+             * PUSH handler (e.g. for client tracking). */
+            do {
+                if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
+                    return REDIS_ERR;
+            } while (redisHandledPushReply(c, aux));
+        } while (aux == NULL);
+    }
+
+    /* Set reply or free it if we were passed NULL */
+    if (reply != NULL) {
+        *reply = aux;
+    } else {
+        freeReplyObject(aux);
+    }
+
+    return REDIS_OK;
+}
+
+
+/* Helper function for the redisAppendCommand* family of functions.
+ *
+ * Write a formatted command to the output buffer. When this family
+ * is used, you need to call redisGetReply yourself to retrieve
+ * the reply (or replies in pub/sub).
+ */
+int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) {
+    sds newbuf;
+
+    newbuf = sdscatlen(c->obuf,cmd,len);
+    if (newbuf == NULL) {
+        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
+        return REDIS_ERR;
+    }
+
+    c->obuf = newbuf;
+    return REDIS_OK;
+}
+
+int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len) {
+
+    if (__redisAppendCommand(c, cmd, len) != REDIS_OK) {
+        return REDIS_ERR;
+    }
+
+    return REDIS_OK;
+}
+
+int redisvAppendCommand(redisContext *c, const char *format, va_list ap) {
+    char *cmd;
+    int len;
+
+    len = redisvFormatCommand(&cmd,format,ap);
+    if (len == -1) {
+        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
+        return REDIS_ERR;
+    } else if (len == -2) {
+        __redisSetError(c,REDIS_ERR_OTHER,"Invalid format string");
+        return REDIS_ERR;
+    }
+
+    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
+        hi_free(cmd);
+        return REDIS_ERR;
+    }
+
+    hi_free(cmd);
+    return REDIS_OK;
+}
+
+int redisAppendCommand(redisContext *c, const char *format, ...) {
+    va_list ap;
+    int ret;
+
+    va_start(ap,format);
+    ret = redisvAppendCommand(c,format,ap);
+    va_end(ap);
+    return ret;
+}
+
+int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
+    sds cmd;
+    int len;
+
+    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
+    if (len == -1) {
+        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
+        return REDIS_ERR;
+    }
+
+    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
+        sdsfree(cmd);
+        return REDIS_ERR;
+    }
+
+    sdsfree(cmd);
+    return REDIS_OK;
+}
+
+/* Helper function for the redisCommand* family of functions.
+ *
+ * Write a formatted command to the output buffer. If the given context is
+ * blocking, immediately read the reply into the "reply" pointer. When the
+ * context is non-blocking, the "reply" pointer will not be used and the
+ * command is simply appended to the write buffer.
+ *
+ * Returns the reply when a reply was successfully retrieved. Returns NULL
+ * otherwise. When NULL is returned in a blocking context, the error field
+ * in the context will be set.
+ */
+static void *__redisBlockForReply(redisContext *c) {
+    void *reply;
+
+    if (c->flags & REDIS_BLOCK) {
+        if (redisGetReply(c,&reply) != REDIS_OK)
+            return NULL;
+        return reply;
+    }
+    return NULL;
+}
+
+void *redisvCommand(redisContext *c, const char *format, va_list ap) {
+    if (redisvAppendCommand(c,format,ap) != REDIS_OK)
+        return NULL;
+    return __redisBlockForReply(c);
+}
+
+void *redisCommand(redisContext *c, const char *format, ...) {
+    va_list ap;
+    va_start(ap,format);
+    void *reply = redisvCommand(c,format,ap);
+    va_end(ap);
+    return reply;
+}
+
+void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
+    if (redisAppendCommandArgv(c,argc,argv,argvlen) != REDIS_OK)
+        return NULL;
+    return __redisBlockForReply(c);
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis.h
new file mode 100644
index 0000000..21593b6
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis.h
@@ -0,0 +1,339 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_H
+#define __HIREDIS_H
+#include "read.h"
+#include <stdarg.h> /* for va_list */
+#ifndef _MSC_VER
+#include <sys/time.h> /* for struct timeval */
+#else
+struct timeval; /* forward declaration */
+typedef long long ssize_t;
+#endif
+#include <stdint.h> /* uintXX_t, etc */
+#include "sds.h" /* for sds */
+#include "alloc.h" /* for allocation wrappers */
+
+#include <sys/socket.h> /* for struct sockaddr */
+
+#define HIREDIS_MAJOR 1
+#define HIREDIS_MINOR 0
+#define HIREDIS_PATCH 2
+#define HIREDIS_SONAME 1.0.0
+
+/* Connection type can be blocking or non-blocking and is set in the
+ * least significant bit of the flags field in redisContext. */
+#define REDIS_BLOCK 0x1
+
+/* Connection may be disconnected before being free'd. The second bit
+ * in the flags field is set when the context is connected. */
+#define REDIS_CONNECTED 0x2
+
+/* The async API might try to disconnect cleanly and flush the output
+ * buffer and read all subsequent replies before disconnecting.
+ * This flag means no new commands can come in and the connection
+ * should be terminated once all replies have been read. */
+#define REDIS_DISCONNECTING 0x4
+
+/* Flag specific to the async API which means that the context should be clean
+ * up as soon as possible. */
+#define REDIS_FREEING 0x8
+
+/* Flag that is set when an async callback is executed. */
+#define REDIS_IN_CALLBACK 0x10
+
+/* Flag that is set when the async context has one or more subscriptions. */
+#define REDIS_SUBSCRIBED 0x20
+
+/* Flag that is set when monitor mode is active */
+#define REDIS_MONITORING 0x40
+
+/* Flag that is set when we should set SO_REUSEADDR before calling bind() */
+#define REDIS_REUSEADDR 0x80
+
+/**
+ * Flag that indicates the user does not want the context to
+ * be automatically freed upon error
+ */
+#define REDIS_NO_AUTO_FREE 0x200
+
+#define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
+
+/* number of times we retry to connect in the case of EADDRNOTAVAIL and
+ * SO_REUSEADDR is being used. */
+#define REDIS_CONNECT_RETRIES  10
+
+/* Forward declarations for structs defined elsewhere */
+struct redisAsyncContext;
+struct redisContext;
+
+/* RESP3 push helpers and callback prototypes */
+#define redisIsPushReply(r) (((redisReply*)(r))->type == REDIS_REPLY_PUSH)
+typedef void (redisPushFn)(void *, void *);
+typedef void (redisAsyncPushFn)(struct redisAsyncContext *, void *);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This is the reply object returned by redisCommand() */
+typedef struct redisReply {
+    int type; /* REDIS_REPLY_* */
+    long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
+    double dval; /* The double when type is REDIS_REPLY_DOUBLE */
+    size_t len; /* Length of string */
+    char *str; /* Used for REDIS_REPLY_ERROR, REDIS_REPLY_STRING
+                  REDIS_REPLY_VERB, and REDIS_REPLY_DOUBLE (in additional to dval). */
+    char vtype[4]; /* Used for REDIS_REPLY_VERB, contains the null
+                      terminated 3 character content type, such as "txt". */
+    size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
+    struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
+} redisReply;
+
+redisReader *redisReaderCreate(void);
+
+/* Function to free the reply objects hiredis returns by default. */
+void freeReplyObject(void *reply);
+
+/* Functions to format a command according to the protocol. */
+int redisvFormatCommand(char **target, const char *format, va_list ap);
+int redisFormatCommand(char **target, const char *format, ...);
+int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
+int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
+void redisFreeCommand(char *cmd);
+void redisFreeSdsCommand(sds cmd);
+
+enum redisConnectionType {
+    REDIS_CONN_TCP,
+    REDIS_CONN_UNIX,
+    REDIS_CONN_USERFD
+};
+
+struct redisSsl;
+
+#define REDIS_OPT_NONBLOCK 0x01
+#define REDIS_OPT_REUSEADDR 0x02
+
+/**
+ * Don't automatically free the async object on a connection failure,
+ * or other implicit conditions. Only free on an explicit call to disconnect() or free()
+ */
+#define REDIS_OPT_NOAUTOFREE 0x04
+
+/* Don't automatically intercept and free RESP3 PUSH replies. */
+#define REDIS_OPT_NO_PUSH_AUTOFREE 0x08
+
+/* In Unix systems a file descriptor is a regular signed int, with -1
+ * representing an invalid descriptor. In Windows it is a SOCKET
+ * (32- or 64-bit unsigned integer depending on the architecture), where
+ * all bits set (~0) is INVALID_SOCKET.  */
+#ifndef _WIN32
+typedef int redisFD;
+#define REDIS_INVALID_FD -1
+#else
+#ifdef _WIN64
+typedef unsigned long long redisFD; /* SOCKET = 64-bit UINT_PTR */
+#else
+typedef unsigned long redisFD;      /* SOCKET = 32-bit UINT_PTR */
+#endif
+#define REDIS_INVALID_FD ((redisFD)(~0)) /* INVALID_SOCKET */
+#endif
+
+typedef struct {
+    /*
+     * the type of connection to use. This also indicates which
+     * `endpoint` member field to use
+     */
+    int type;
+    /* bit field of REDIS_OPT_xxx */
+    int options;
+    /* timeout value for connect operation. If NULL, no timeout is used */
+    const struct timeval *connect_timeout;
+    /* timeout value for commands. If NULL, no timeout is used.  This can be
+     * updated at runtime with redisSetTimeout/redisAsyncSetTimeout. */
+    const struct timeval *command_timeout;
+    union {
+        /** use this field for tcp/ip connections */
+        struct {
+            const char *source_addr;
+            const char *ip;
+            int port;
+        } tcp;
+        /** use this field for unix domain sockets */
+        const char *unix_socket;
+        /**
+         * use this field to have hiredis operate an already-open
+         * file descriptor */
+        redisFD fd;
+    } endpoint;
+
+    /* Optional user defined data/destructor */
+    void *privdata;
+    void (*free_privdata)(void *);
+
+    /* A user defined PUSH message callback */
+    redisPushFn *push_cb;
+    redisAsyncPushFn *async_push_cb;
+} redisOptions;
+
+/**
+ * Helper macros to initialize options to their specified fields.
+ */
+#define REDIS_OPTIONS_SET_TCP(opts, ip_, port_) \
+    (opts)->type = REDIS_CONN_TCP; \
+    (opts)->endpoint.tcp.ip = ip_; \
+    (opts)->endpoint.tcp.port = port_;
+
+#define REDIS_OPTIONS_SET_UNIX(opts, path) \
+    (opts)->type = REDIS_CONN_UNIX;        \
+    (opts)->endpoint.unix_socket = path;
+
+#define REDIS_OPTIONS_SET_PRIVDATA(opts, data, dtor) \
+    (opts)->privdata = data;                         \
+    (opts)->free_privdata = dtor;                    \
+
+typedef struct redisContextFuncs {
+    void (*free_privctx)(void *);
+    void (*async_read)(struct redisAsyncContext *);
+    void (*async_write)(struct redisAsyncContext *);
+    ssize_t (*read)(struct redisContext *, char *, size_t);
+    ssize_t (*write)(struct redisContext *);
+} redisContextFuncs;
+
+/* Context for a connection to Redis */
+typedef struct redisContext {
+    const redisContextFuncs *funcs;   /* Function table */
+
+    int err; /* Error flags, 0 when there is no error */
+    char errstr[128]; /* String representation of error when applicable */
+    redisFD fd;
+    struct sockaddr sockaddr;
+    int flags;
+    char *obuf; /* Write buffer */
+    redisReader *reader; /* Protocol reader */
+
+    enum redisConnectionType connection_type;
+    struct timeval *connect_timeout;
+    struct timeval *command_timeout;
+
+    struct {
+        char *host;
+        char *source_addr;
+        int port;
+    } tcp;
+
+    struct {
+        char *path;
+    } unix_sock;
+
+    /* For non-blocking connect */
+    struct sockadr *saddr;
+    size_t addrlen;
+
+    /* Optional data and corresponding destructor users can use to provide
+     * context to a given redisContext.  Not used by hiredis. */
+    void *privdata;
+    void (*free_privdata)(void *);
+
+    /* Internal context pointer presently used by hiredis to manage
+     * SSL connections. */
+    void *privctx;
+
+    /* An optional RESP3 PUSH handler */
+    redisPushFn *push_cb;
+} redisContext;
+
+redisContext *redisConnectWithOptions(const redisOptions *options);
+redisContext *redisConnect(const char *ip, int port);
+redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
+redisContext *redisConnectNonBlock(const char *ip, int port);
+redisContext *redisConnectBindNonBlock(const char *ip, int port,
+                                       const char *source_addr);
+redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
+                                                const char *source_addr);
+redisContext *redisConnectUnix(const char *path);
+redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
+redisContext *redisConnectUnixNonBlock(const char *path);
+redisContext *redisConnectFd(redisFD fd);
+
+/**
+ * Reconnect the given context using the saved information.
+ *
+ * This re-uses the exact same connect options as in the initial connection.
+ * host, ip (or path), timeout and bind address are reused,
+ * flags are used unmodified from the existing context.
+ *
+ * Returns REDIS_OK on successful connect or REDIS_ERR otherwise.
+ */
+int redisReconnect(redisContext *c);
+
+redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn);
+int redisSetTimeout(redisContext *c, const struct timeval tv);
+int redisEnableKeepAlive(redisContext *c);
+void redisFree(redisContext *c);
+redisFD redisFreeKeepFd(redisContext *c);
+int redisBufferRead(redisContext *c);
+int redisBufferWrite(redisContext *c, int *done);
+
+/* In a blocking context, this function first checks if there are unconsumed
+ * replies to return and returns one if so. Otherwise, it flushes the output
+ * buffer to the socket and reads until it has a reply. In a non-blocking
+ * context, it will return unconsumed replies until there are no more. */
+int redisGetReply(redisContext *c, void **reply);
+int redisGetReplyFromReader(redisContext *c, void **reply);
+
+/* Write a formatted command to the output buffer. Use these functions in blocking mode
+ * to get a pipeline of commands. */
+int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
+
+/* Write a command to the output buffer. Use these functions in blocking mode
+ * to get a pipeline of commands. */
+int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
+int redisAppendCommand(redisContext *c, const char *format, ...);
+int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+
+/* Issue a command to Redis. In a blocking context, it is identical to calling
+ * redisAppendCommand, followed by redisGetReply. The function will return
+ * NULL if there was an error in performing the request, otherwise it will
+ * return the reply. In a non-blocking context, it is identical to calling
+ * only redisAppendCommand and will always return NULL. */
+void *redisvCommand(redisContext *c, const char *format, va_list ap);
+void *redisCommand(redisContext *c, const char *format, ...);
+void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis_ssl.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis_ssl.h
new file mode 100644
index 0000000..604efe0
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/hiredis_ssl.h
@@ -0,0 +1,127 @@
+
+/*
+ * Copyright (c) 2019, Redis Labs
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __HIREDIS_SSL_H
+#define __HIREDIS_SSL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This is the underlying struct for SSL in ssl.h, which is not included to
+ * keep build dependencies short here.
+ */
+struct ssl_st;
+
+/* A wrapper around OpenSSL SSL_CTX to allow easy SSL use without directly
+ * calling OpenSSL.
+ */
+typedef struct redisSSLContext redisSSLContext;
+
+/**
+ * Initialization errors that redisCreateSSLContext() may return.
+ */
+
+typedef enum {
+    REDIS_SSL_CTX_NONE = 0,                     /* No Error */
+    REDIS_SSL_CTX_CREATE_FAILED,                /* Failed to create OpenSSL SSL_CTX */
+    REDIS_SSL_CTX_CERT_KEY_REQUIRED,            /* Client cert and key must both be specified or skipped */
+    REDIS_SSL_CTX_CA_CERT_LOAD_FAILED,          /* Failed to load CA Certificate or CA Path */
+    REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED,      /* Failed to load client certificate */
+    REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED       /* Failed to load private key */
+} redisSSLContextError;
+
+/**
+ * Return the error message corresponding with the specified error code.
+ */
+
+const char *redisSSLContextGetError(redisSSLContextError error);
+
+/**
+ * Helper function to initialize the OpenSSL library.
+ *
+ * OpenSSL requires one-time initialization before it can be used. Callers should
+ * call this function only once, and only if OpenSSL is not directly initialized
+ * elsewhere.
+ */
+int redisInitOpenSSL(void);
+
+/**
+ * Helper function to initialize an OpenSSL context that can be used
+ * to initiate SSL connections.
+ *
+ * cacert_filename is an optional name of a CA certificate/bundle file to load
+ * and use for validation.
+ *
+ * capath is an optional directory path where trusted CA certificate files are
+ * stored in an OpenSSL-compatible structure.
+ *
+ * cert_filename and private_key_filename are optional names of a client side
+ * certificate and private key files to use for authentication. They need to
+ * be both specified or omitted.
+ *
+ * server_name is an optional and will be used as a server name indication
+ * (SNI) TLS extension.
+ *
+ * If error is non-null, it will be populated in case the context creation fails
+ * (returning a NULL).
+ */
+
+redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
+        const char *cert_filename, const char *private_key_filename,
+        const char *server_name, redisSSLContextError *error);
+
+/**
+ * Free a previously created OpenSSL context.
+ */
+void redisFreeSSLContext(redisSSLContext *redis_ssl_ctx);
+
+/**
+ * Initiate SSL on an existing redisContext.
+ *
+ * This is similar to redisInitiateSSL() but does not require the caller
+ * to directly interact with OpenSSL, and instead uses a redisSSLContext
+ * previously created using redisCreateSSLContext().
+ */
+
+int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx);
+
+/**
+ * Initiate SSL/TLS negotiation on a provided OpenSSL SSL object.
+ */
+
+int redisInitiateSSL(redisContext *c, struct ssl_st *ssl);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __HIREDIS_SSL_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/net.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/net.c
new file mode 100644
index 0000000..3737430
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/net.c
@@ -0,0 +1,615 @@
+/* Extracted from anet.c to work properly with Hiredis error reporting.
+ *
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <sys/types.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#include "net.h"
+#include "sds.h"
+#include "sockcompat.h"
+#include "win32.h"
+
+/* Defined in hiredis.c */
+void __redisSetError(redisContext *c, int type, const char *str);
+
+void redisNetClose(redisContext *c) {
+    if (c && c->fd != REDIS_INVALID_FD) {
+        close(c->fd);
+        c->fd = REDIS_INVALID_FD;
+    }
+}
+
+ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap) {
+    ssize_t nread = recv(c->fd, buf, bufcap, 0);
+    if (nread == -1) {
+        if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
+            /* Try again later */
+            return 0;
+        } else if(errno == ETIMEDOUT && (c->flags & REDIS_BLOCK)) {
+            /* especially in windows */
+            __redisSetError(c, REDIS_ERR_TIMEOUT, "recv timeout");
+            return -1;
+        } else {
+            __redisSetError(c, REDIS_ERR_IO, NULL);
+            return -1;
+        }
+    } else if (nread == 0) {
+        __redisSetError(c, REDIS_ERR_EOF, "Server closed the connection");
+        return -1;
+    } else {
+        return nread;
+    }
+}
+
+ssize_t redisNetWrite(redisContext *c) {
+    ssize_t nwritten = send(c->fd, c->obuf, sdslen(c->obuf), 0);
+    if (nwritten < 0) {
+        if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
+            /* Try again later */
+        } else {
+            __redisSetError(c, REDIS_ERR_IO, NULL);
+            return -1;
+        }
+    }
+    return nwritten;
+}
+
+static void __redisSetErrorFromErrno(redisContext *c, int type, const char *prefix) {
+    int errorno = errno;  /* snprintf() may change errno */
+    char buf[128] = { 0 };
+    size_t len = 0;
+
+    if (prefix != NULL)
+        len = snprintf(buf,sizeof(buf),"%s: ",prefix);
+    strerror_r(errorno, (char *)(buf + len), sizeof(buf) - len);
+    __redisSetError(c,type,buf);
+}
+
+static int redisSetReuseAddr(redisContext *c) {
+    int on = 1;
+    if (setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+        redisNetClose(c);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+static int redisCreateSocket(redisContext *c, int type) {
+    redisFD s;
+    if ((s = socket(type, SOCK_STREAM, 0)) == REDIS_INVALID_FD) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+        return REDIS_ERR;
+    }
+    c->fd = s;
+    if (type == AF_INET) {
+        if (redisSetReuseAddr(c) == REDIS_ERR) {
+            return REDIS_ERR;
+        }
+    }
+    return REDIS_OK;
+}
+
+static int redisSetBlocking(redisContext *c, int blocking) {
+#ifndef _WIN32
+    int flags;
+
+    /* Set the socket nonblocking.
+     * Note that fcntl(2) for F_GETFL and F_SETFL can't be
+     * interrupted by a signal. */
+    if ((flags = fcntl(c->fd, F_GETFL)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_GETFL)");
+        redisNetClose(c);
+        return REDIS_ERR;
+    }
+
+    if (blocking)
+        flags &= ~O_NONBLOCK;
+    else
+        flags |= O_NONBLOCK;
+
+    if (fcntl(c->fd, F_SETFL, flags) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_SETFL)");
+        redisNetClose(c);
+        return REDIS_ERR;
+    }
+#else
+    u_long mode = blocking ? 0 : 1;
+    if (ioctl(c->fd, FIONBIO, &mode) == -1) {
+        __redisSetErrorFromErrno(c, REDIS_ERR_IO, "ioctl(FIONBIO)");
+        redisNetClose(c);
+        return REDIS_ERR;
+    }
+#endif /* _WIN32 */
+    return REDIS_OK;
+}
+
+int redisKeepAlive(redisContext *c, int interval) {
+    int val = 1;
+    redisFD fd = c->fd;
+
+    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == -1){
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = interval;
+
+#if defined(__APPLE__) && defined(__MACH__)
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+#else
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = interval/3;
+    if (val == 0) val = 1;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = 3;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+#endif
+#endif
+
+    return REDIS_OK;
+}
+
+int redisSetTcpNoDelay(redisContext *c) {
+    int yes = 1;
+    if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(TCP_NODELAY)");
+        redisNetClose(c);
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+#define __MAX_MSEC (((LONG_MAX) - 999) / 1000)
+
+static int redisContextTimeoutMsec(redisContext *c, long *result)
+{
+    const struct timeval *timeout = c->connect_timeout;
+    long msec = -1;
+
+    /* Only use timeout when not NULL. */
+    if (timeout != NULL) {
+        if (timeout->tv_usec > 1000000 || timeout->tv_sec > __MAX_MSEC) {
+            *result = msec;
+            return REDIS_ERR;
+        }
+
+        msec = (timeout->tv_sec * 1000) + ((timeout->tv_usec + 999) / 1000);
+
+        if (msec < 0 || msec > INT_MAX) {
+            msec = INT_MAX;
+        }
+    }
+
+    *result = msec;
+    return REDIS_OK;
+}
+
+static int redisContextWaitReady(redisContext *c, long msec) {
+    struct pollfd   wfd[1];
+
+    wfd[0].fd     = c->fd;
+    wfd[0].events = POLLOUT;
+
+    if (errno == EINPROGRESS) {
+        int res;
+
+        if ((res = poll(wfd, 1, msec)) == -1) {
+            __redisSetErrorFromErrno(c, REDIS_ERR_IO, "poll(2)");
+            redisNetClose(c);
+            return REDIS_ERR;
+        } else if (res == 0) {
+            errno = ETIMEDOUT;
+            __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+            redisNetClose(c);
+            return REDIS_ERR;
+        }
+
+        if (redisCheckConnectDone(c, &res) != REDIS_OK || res == 0) {
+            redisCheckSocketError(c);
+            return REDIS_ERR;
+        }
+
+        return REDIS_OK;
+    }
+
+    __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+    redisNetClose(c);
+    return REDIS_ERR;
+}
+
+int redisCheckConnectDone(redisContext *c, int *completed) {
+    int rc = connect(c->fd, (const struct sockaddr *)c->saddr, c->addrlen);
+    if (rc == 0) {
+        *completed = 1;
+        return REDIS_OK;
+    }
+    switch (errno) {
+    case EISCONN:
+        *completed = 1;
+        return REDIS_OK;
+    case EALREADY:
+    case EINPROGRESS:
+    case EWOULDBLOCK:
+        *completed = 0;
+        return REDIS_OK;
+    default:
+        return REDIS_ERR;
+    }
+}
+
+int redisCheckSocketError(redisContext *c) {
+    int err = 0, errno_saved = errno;
+    socklen_t errlen = sizeof(err);
+
+    if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"getsockopt(SO_ERROR)");
+        return REDIS_ERR;
+    }
+
+    if (err == 0) {
+        err = errno_saved;
+    }
+
+    if (err) {
+        errno = err;
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
+        return REDIS_ERR;
+    }
+
+    return REDIS_OK;
+}
+
+int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
+    const void *to_ptr = &tv;
+    size_t to_sz = sizeof(tv);
+
+    if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,to_ptr,to_sz) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_RCVTIMEO)");
+        return REDIS_ERR;
+    }
+    if (setsockopt(c->fd,SOL_SOCKET,SO_SNDTIMEO,to_ptr,to_sz) == -1) {
+        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_SNDTIMEO)");
+        return REDIS_ERR;
+    }
+    return REDIS_OK;
+}
+
+int redisContextUpdateConnectTimeout(redisContext *c, const struct timeval *timeout) {
+    /* Same timeval struct, short circuit */
+    if (c->connect_timeout == timeout)
+        return REDIS_OK;
+
+    /* Allocate context timeval if we need to */
+    if (c->connect_timeout == NULL) {
+        c->connect_timeout = hi_malloc(sizeof(*c->connect_timeout));
+        if (c->connect_timeout == NULL)
+            return REDIS_ERR;
+    }
+
+    memcpy(c->connect_timeout, timeout, sizeof(*c->connect_timeout));
+    return REDIS_OK;
+}
+
+int redisContextUpdateCommandTimeout(redisContext *c, const struct timeval *timeout) {
+    /* Same timeval struct, short circuit */
+    if (c->command_timeout == timeout)
+        return REDIS_OK;
+
+    /* Allocate context timeval if we need to */
+    if (c->command_timeout == NULL) {
+        c->command_timeout = hi_malloc(sizeof(*c->command_timeout));
+        if (c->command_timeout == NULL)
+            return REDIS_ERR;
+    }
+
+    memcpy(c->command_timeout, timeout, sizeof(*c->command_timeout));
+    return REDIS_OK;
+}
+
+static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
+                                   const struct timeval *timeout,
+                                   const char *source_addr) {
+    redisFD s;
+    int rv, n;
+    char _port[6];  /* strlen("65535"); */
+    struct addrinfo hints, *servinfo, *bservinfo, *p, *b;
+    int blocking = (c->flags & REDIS_BLOCK);
+    int reuseaddr = (c->flags & REDIS_REUSEADDR);
+    int reuses = 0;
+    long timeout_msec = -1;
+
+    servinfo = NULL;
+    c->connection_type = REDIS_CONN_TCP;
+    c->tcp.port = port;
+
+    /* We need to take possession of the passed parameters
+     * to make them reusable for a reconnect.
+     * We also carefully check we don't free data we already own,
+     * as in the case of the reconnect method.
+     *
+     * This is a bit ugly, but atleast it works and doesn't leak memory.
+     **/
+    if (c->tcp.host != addr) {
+        hi_free(c->tcp.host);
+
+        c->tcp.host = hi_strdup(addr);
+        if (c->tcp.host == NULL)
+            goto oom;
+    }
+
+    if (timeout) {
+        if (redisContextUpdateConnectTimeout(c, timeout) == REDIS_ERR)
+            goto oom;
+    } else {
+        hi_free(c->connect_timeout);
+        c->connect_timeout = NULL;
+    }
+
+    if (redisContextTimeoutMsec(c, &timeout_msec) != REDIS_OK) {
+        __redisSetError(c, REDIS_ERR_IO, "Invalid timeout specified");
+        goto error;
+    }
+
+    if (source_addr == NULL) {
+        hi_free(c->tcp.source_addr);
+        c->tcp.source_addr = NULL;
+    } else if (c->tcp.source_addr != source_addr) {
+        hi_free(c->tcp.source_addr);
+        c->tcp.source_addr = hi_strdup(source_addr);
+    }
+    c->sockaddr.sa_family = AF_UNSPEC;
+
+    snprintf(_port, 6, "%d", port);
+    memset(&hints,0,sizeof(hints));
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+
+    /* Try with IPv6 if no IPv4 address was found. We do it in this order since
+     * in a Redis client you can't afford to test if you have IPv6 connectivity
+     * as this would add latency to every connect. Otherwise a more sensible
+     * route could be: Use IPv6 if both addresses are available and there is IPv6
+     * connectivity. */
+    if ((rv = getaddrinfo(c->tcp.host,_port,&hints,&servinfo)) != 0) {
+         hints.ai_family = AF_INET6;
+         if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) {
+            __redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv));
+            return REDIS_ERR;
+        }
+    }
+    for (p = servinfo; p != NULL; p = p->ai_next) {
+addrretry:
+        if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == REDIS_INVALID_FD)
+            continue;
+
+        c->fd = s;
+        if (redisSetBlocking(c,0) != REDIS_OK)
+            goto error;
+        if (c->tcp.source_addr) {
+            int bound = 0;
+            /* Using getaddrinfo saves us from self-determining IPv4 vs IPv6 */
+            if ((rv = getaddrinfo(c->tcp.source_addr, NULL, &hints, &bservinfo)) != 0) {
+                char buf[128];
+                snprintf(buf,sizeof(buf),"Can't get addr: %s",gai_strerror(rv));
+                __redisSetError(c,REDIS_ERR_OTHER,buf);
+                goto error;
+            }
+
+            if (reuseaddr) {
+                n = 1;
+                if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*) &n,
+                               sizeof(n)) < 0) {
+                    freeaddrinfo(bservinfo);
+                    goto error;
+                }
+            }
+
+            for (b = bservinfo; b != NULL; b = b->ai_next) {
+                if (bind(s,b->ai_addr,b->ai_addrlen) != -1) {
+                    bound = 1;
+                    break;
+                }
+            }
+            freeaddrinfo(bservinfo);
+            if (!bound) {
+                char buf[128];
+                snprintf(buf,sizeof(buf),"Can't bind socket: %s",strerror(errno));
+                __redisSetError(c,REDIS_ERR_OTHER,buf);
+                goto error;
+            }
+        }
+
+        /* For repeat connection */
+        hi_free(c->saddr);
+        c->saddr = hi_malloc(p->ai_addrlen);
+        if (c->saddr == NULL)
+            goto oom;
+
+        memcpy(c->saddr, p->ai_addr, p->ai_addrlen);
+        c->addrlen = p->ai_addrlen;
+
+        if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
+            if (errno == EHOSTUNREACH) {
+                redisNetClose(c);
+                continue;
+            } else if (errno == EINPROGRESS) {
+                if (blocking) {
+                    goto wait_for_ready;
+                }
+                /* This is ok.
+                 * Note that even when it's in blocking mode, we unset blocking
+                 * for `connect()`
+                 */
+            } else if (errno == EADDRNOTAVAIL && reuseaddr) {
+                if (++reuses >= REDIS_CONNECT_RETRIES) {
+                    goto error;
+                } else {
+                    redisNetClose(c);
+                    goto addrretry;
+                }
+            } else {
+                wait_for_ready:
+                if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
+                    goto error;
+                if (redisSetTcpNoDelay(c) != REDIS_OK)
+                    goto error;
+            }
+        }
+        if (blocking && redisSetBlocking(c,1) != REDIS_OK)
+            goto error;
+
+        c->sockaddr = *p->ai_addr;
+
+        c->flags |= REDIS_CONNECTED;
+        rv = REDIS_OK;
+        goto end;
+    }
+    if (p == NULL) {
+        char buf[128];
+        snprintf(buf,sizeof(buf),"Can't create socket: %s",strerror(errno));
+        __redisSetError(c,REDIS_ERR_OTHER,buf);
+        goto error;
+    }
+
+oom:
+    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+error:
+    rv = REDIS_ERR;
+end:
+    if(servinfo) {
+        freeaddrinfo(servinfo);
+    }
+
+    return rv;  // Need to return REDIS_OK if alright
+}
+
+int redisContextConnectTcp(redisContext *c, const char *addr, int port,
+                           const struct timeval *timeout) {
+    return _redisContextConnectTcp(c, addr, port, timeout, NULL);
+}
+
+int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
+                               const struct timeval *timeout,
+                               const char *source_addr) {
+    return _redisContextConnectTcp(c, addr, port, timeout, source_addr);
+}
+
+int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout) {
+#ifndef _WIN32
+    int blocking = (c->flags & REDIS_BLOCK);
+    struct sockaddr_un *sa;
+    long timeout_msec = -1;
+
+    if (redisCreateSocket(c,AF_UNIX) < 0)
+        return REDIS_ERR;
+    if (redisSetBlocking(c,0) != REDIS_OK)
+        return REDIS_ERR;
+
+    c->connection_type = REDIS_CONN_UNIX;
+    if (c->unix_sock.path != path) {
+        hi_free(c->unix_sock.path);
+
+        c->unix_sock.path = hi_strdup(path);
+        if (c->unix_sock.path == NULL)
+            goto oom;
+    }
+
+    if (timeout) {
+        if (redisContextUpdateConnectTimeout(c, timeout) == REDIS_ERR)
+            goto oom;
+    } else {
+        hi_free(c->connect_timeout);
+        c->connect_timeout = NULL;
+    }
+
+    if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
+        return REDIS_ERR;
+
+    /* Don't leak sockaddr if we're reconnecting */
+    if (c->saddr) hi_free(c->saddr);
+
+    sa = (struct sockaddr_un*)(c->saddr = hi_malloc(sizeof(struct sockaddr_un)));
+    if (sa == NULL)
+        goto oom;
+
+    c->addrlen = sizeof(struct sockaddr_un);
+    sa->sun_family = AF_UNIX;
+    strncpy(sa->sun_path, path, sizeof(sa->sun_path) - 1);
+    if (connect(c->fd, (struct sockaddr*)sa, sizeof(*sa)) == -1) {
+        if (errno == EINPROGRESS && !blocking) {
+            /* This is ok. */
+        } else {
+            if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
+                return REDIS_ERR;
+        }
+    }
+
+    /* Reset socket to be blocking after connect(2). */
+    if (blocking && redisSetBlocking(c,1) != REDIS_OK)
+        return REDIS_ERR;
+
+    c->flags |= REDIS_CONNECTED;
+    return REDIS_OK;
+#else
+    /* We currently do not support Unix sockets for Windows. */
+    /* TODO(m): https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/ */
+    errno = EPROTONOSUPPORT;
+    return REDIS_ERR;
+#endif /* _WIN32 */
+oom:
+    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+    return REDIS_ERR;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/net.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/net.h
new file mode 100644
index 0000000..9f43283
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/net.h
@@ -0,0 +1,56 @@
+/* Extracted from anet.c to work properly with Hiredis error reporting.
+ *
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
+ *                     Jan-Erik Rediger <janerik at fnordig dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __NET_H
+#define __NET_H
+
+#include "hiredis.h"
+
+void redisNetClose(redisContext *c);
+ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap);
+ssize_t redisNetWrite(redisContext *c);
+
+int redisCheckSocketError(redisContext *c);
+int redisContextSetTimeout(redisContext *c, const struct timeval tv);
+int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
+int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
+                               const struct timeval *timeout,
+                               const char *source_addr);
+int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
+int redisKeepAlive(redisContext *c, int interval);
+int redisCheckConnectDone(redisContext *c, int *completed);
+
+int redisSetTcpNoDelay(redisContext *c);
+
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/read.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/read.c
new file mode 100644
index 0000000..0952469
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/read.c
@@ -0,0 +1,739 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <string.h>
+#include <stdlib.h>
+#ifndef _MSC_VER
+#include <unistd.h>
+#include <strings.h>
+#endif
+#include <assert.h>
+#include <errno.h>
+#include <ctype.h>
+#include <limits.h>
+#include <math.h>
+
+#include "alloc.h"
+#include "read.h"
+#include "sds.h"
+#include "win32.h"
+
+/* Initial size of our nested reply stack and how much we grow it when needd */
+#define REDIS_READER_STACK_SIZE 9
+
+static void __redisReaderSetError(redisReader *r, int type, const char *str) {
+    size_t len;
+
+    if (r->reply != NULL && r->fn && r->fn->freeObject) {
+        r->fn->freeObject(r->reply);
+        r->reply = NULL;
+    }
+
+    /* Clear input buffer on errors. */
+    sdsfree(r->buf);
+    r->buf = NULL;
+    r->pos = r->len = 0;
+
+    /* Reset task stack. */
+    r->ridx = -1;
+
+    /* Set error. */
+    r->err = type;
+    len = strlen(str);
+    len = len < (sizeof(r->errstr)-1) ? len : (sizeof(r->errstr)-1);
+    memcpy(r->errstr,str,len);
+    r->errstr[len] = '\0';
+}
+
+static size_t chrtos(char *buf, size_t size, char byte) {
+    size_t len = 0;
+
+    switch(byte) {
+    case '\\':
+    case '"':
+        len = snprintf(buf,size,"\"\\%c\"",byte);
+        break;
+    case '\n': len = snprintf(buf,size,"\"\\n\""); break;
+    case '\r': len = snprintf(buf,size,"\"\\r\""); break;
+    case '\t': len = snprintf(buf,size,"\"\\t\""); break;
+    case '\a': len = snprintf(buf,size,"\"\\a\""); break;
+    case '\b': len = snprintf(buf,size,"\"\\b\""); break;
+    default:
+        if (isprint(byte))
+            len = snprintf(buf,size,"\"%c\"",byte);
+        else
+            len = snprintf(buf,size,"\"\\x%02x\"",(unsigned char)byte);
+        break;
+    }
+
+    return len;
+}
+
+static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte) {
+    char cbuf[8], sbuf[128];
+
+    chrtos(cbuf,sizeof(cbuf),byte);
+    snprintf(sbuf,sizeof(sbuf),
+        "Protocol error, got %s as reply type byte", cbuf);
+    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
+}
+
+static void __redisReaderSetErrorOOM(redisReader *r) {
+    __redisReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
+}
+
+static char *readBytes(redisReader *r, unsigned int bytes) {
+    char *p;
+    if (r->len-r->pos >= bytes) {
+        p = r->buf+r->pos;
+        r->pos += bytes;
+        return p;
+    }
+    return NULL;
+}
+
+/* Find pointer to \r\n. */
+static char *seekNewline(char *s, size_t len) {
+    int pos = 0;
+    int _len = len-1;
+
+    /* Position should be < len-1 because the character at "pos" should be
+     * followed by a \n. Note that strchr cannot be used because it doesn't
+     * allow to search a limited length and the buffer that is being searched
+     * might not have a trailing NULL character. */
+    while (pos < _len) {
+        while(pos < _len && s[pos] != '\r') pos++;
+        if (pos==_len) {
+            /* Not found. */
+            return NULL;
+        } else {
+            if (s[pos+1] == '\n') {
+                /* Found. */
+                return s+pos;
+            } else {
+                /* Continue searching. */
+                pos++;
+            }
+        }
+    }
+    return NULL;
+}
+
+/* Convert a string into a long long. Returns REDIS_OK if the string could be
+ * parsed into a (non-overflowing) long long, REDIS_ERR otherwise. The value
+ * will be set to the parsed value when appropriate.
+ *
+ * Note that this function demands that the string strictly represents
+ * a long long: no spaces or other characters before or after the string
+ * representing the number are accepted, nor zeroes at the start if not
+ * for the string "0" representing the zero number.
+ *
+ * Because of its strictness, it is safe to use this function to check if
+ * you can convert a string into a long long, and obtain back the string
+ * from the number without any loss in the string representation. */
+static int string2ll(const char *s, size_t slen, long long *value) {
+    const char *p = s;
+    size_t plen = 0;
+    int negative = 0;
+    unsigned long long v;
+
+    if (plen == slen)
+        return REDIS_ERR;
+
+    /* Special case: first and only digit is 0. */
+    if (slen == 1 && p[0] == '0') {
+        if (value != NULL) *value = 0;
+        return REDIS_OK;
+    }
+
+    if (p[0] == '-') {
+        negative = 1;
+        p++; plen++;
+
+        /* Abort on only a negative sign. */
+        if (plen == slen)
+            return REDIS_ERR;
+    }
+
+    /* First digit should be 1-9, otherwise the string should just be 0. */
+    if (p[0] >= '1' && p[0] <= '9') {
+        v = p[0]-'0';
+        p++; plen++;
+    } else if (p[0] == '0' && slen == 1) {
+        *value = 0;
+        return REDIS_OK;
+    } else {
+        return REDIS_ERR;
+    }
+
+    while (plen < slen && p[0] >= '0' && p[0] <= '9') {
+        if (v > (ULLONG_MAX / 10)) /* Overflow. */
+            return REDIS_ERR;
+        v *= 10;
+
+        if (v > (ULLONG_MAX - (p[0]-'0'))) /* Overflow. */
+            return REDIS_ERR;
+        v += p[0]-'0';
+
+        p++; plen++;
+    }
+
+    /* Return if not all bytes were used. */
+    if (plen < slen)
+        return REDIS_ERR;
+
+    if (negative) {
+        if (v > ((unsigned long long)(-(LLONG_MIN+1))+1)) /* Overflow. */
+            return REDIS_ERR;
+        if (value != NULL) *value = -v;
+    } else {
+        if (v > LLONG_MAX) /* Overflow. */
+            return REDIS_ERR;
+        if (value != NULL) *value = v;
+    }
+    return REDIS_OK;
+}
+
+static char *readLine(redisReader *r, int *_len) {
+    char *p, *s;
+    int len;
+
+    p = r->buf+r->pos;
+    s = seekNewline(p,(r->len-r->pos));
+    if (s != NULL) {
+        len = s-(r->buf+r->pos);
+        r->pos += len+2; /* skip \r\n */
+        if (_len) *_len = len;
+        return p;
+    }
+    return NULL;
+}
+
+static void moveToNextTask(redisReader *r) {
+    redisReadTask *cur, *prv;
+    while (r->ridx >= 0) {
+        /* Return a.s.a.p. when the stack is now empty. */
+        if (r->ridx == 0) {
+            r->ridx--;
+            return;
+        }
+
+        cur = r->task[r->ridx];
+        prv = r->task[r->ridx-1];
+        assert(prv->type == REDIS_REPLY_ARRAY ||
+               prv->type == REDIS_REPLY_MAP ||
+               prv->type == REDIS_REPLY_SET ||
+               prv->type == REDIS_REPLY_PUSH);
+        if (cur->idx == prv->elements-1) {
+            r->ridx--;
+        } else {
+            /* Reset the type because the next item can be anything */
+            assert(cur->idx < prv->elements);
+            cur->type = -1;
+            cur->elements = -1;
+            cur->idx++;
+            return;
+        }
+    }
+}
+
+static int processLineItem(redisReader *r) {
+    redisReadTask *cur = r->task[r->ridx];
+    void *obj;
+    char *p;
+    int len;
+
+    if ((p = readLine(r,&len)) != NULL) {
+        if (cur->type == REDIS_REPLY_INTEGER) {
+            if (r->fn && r->fn->createInteger) {
+                long long v;
+                if (string2ll(p, len, &v) == REDIS_ERR) {
+                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                            "Bad integer value");
+                    return REDIS_ERR;
+                }
+                obj = r->fn->createInteger(cur,v);
+            } else {
+                obj = (void*)REDIS_REPLY_INTEGER;
+            }
+        } else if (cur->type == REDIS_REPLY_DOUBLE) {
+            if (r->fn && r->fn->createDouble) {
+                char buf[326], *eptr;
+                double d;
+
+                if ((size_t)len >= sizeof(buf)) {
+                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                            "Double value is too large");
+                    return REDIS_ERR;
+                }
+
+                memcpy(buf,p,len);
+                buf[len] = '\0';
+
+                if (strcasecmp(buf,",inf") == 0) {
+                    d = INFINITY; /* Positive infinite. */
+                } else if (strcasecmp(buf,",-inf") == 0) {
+                    d = -INFINITY; /* Negative infinite. */
+                } else {
+                    d = strtod((char*)buf,&eptr);
+                    if (buf[0] == '\0' || eptr[0] != '\0' || isnan(d)) {
+                        __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                                "Bad double value");
+                        return REDIS_ERR;
+                    }
+                }
+                obj = r->fn->createDouble(cur,d,buf,len);
+            } else {
+                obj = (void*)REDIS_REPLY_DOUBLE;
+            }
+        } else if (cur->type == REDIS_REPLY_NIL) {
+            if (r->fn && r->fn->createNil)
+                obj = r->fn->createNil(cur);
+            else
+                obj = (void*)REDIS_REPLY_NIL;
+        } else if (cur->type == REDIS_REPLY_BOOL) {
+            int bval = p[0] == 't' || p[0] == 'T';
+            if (r->fn && r->fn->createBool)
+                obj = r->fn->createBool(cur,bval);
+            else
+                obj = (void*)REDIS_REPLY_BOOL;
+        } else {
+            /* Type will be error or status. */
+            if (r->fn && r->fn->createString)
+                obj = r->fn->createString(cur,p,len);
+            else
+                obj = (void*)(size_t)(cur->type);
+        }
+
+        if (obj == NULL) {
+            __redisReaderSetErrorOOM(r);
+            return REDIS_ERR;
+        }
+
+        /* Set reply if this is the root object. */
+        if (r->ridx == 0) r->reply = obj;
+        moveToNextTask(r);
+        return REDIS_OK;
+    }
+
+    return REDIS_ERR;
+}
+
+static int processBulkItem(redisReader *r) {
+    redisReadTask *cur = r->task[r->ridx];
+    void *obj = NULL;
+    char *p, *s;
+    long long len;
+    unsigned long bytelen;
+    int success = 0;
+
+    p = r->buf+r->pos;
+    s = seekNewline(p,r->len-r->pos);
+    if (s != NULL) {
+        p = r->buf+r->pos;
+        bytelen = s-(r->buf+r->pos)+2; /* include \r\n */
+
+        if (string2ll(p, bytelen - 2, &len) == REDIS_ERR) {
+            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                    "Bad bulk string length");
+            return REDIS_ERR;
+        }
+
+        if (len < -1 || (LLONG_MAX > SIZE_MAX && len > (long long)SIZE_MAX)) {
+            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                    "Bulk string length out of range");
+            return REDIS_ERR;
+        }
+
+        if (len == -1) {
+            /* The nil object can always be created. */
+            if (r->fn && r->fn->createNil)
+                obj = r->fn->createNil(cur);
+            else
+                obj = (void*)REDIS_REPLY_NIL;
+            success = 1;
+        } else {
+            /* Only continue when the buffer contains the entire bulk item. */
+            bytelen += len+2; /* include \r\n */
+            if (r->pos+bytelen <= r->len) {
+                if ((cur->type == REDIS_REPLY_VERB && len < 4) ||
+                    (cur->type == REDIS_REPLY_VERB && s[5] != ':'))
+                {
+                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                            "Verbatim string 4 bytes of content type are "
+                            "missing or incorrectly encoded.");
+                    return REDIS_ERR;
+                }
+                if (r->fn && r->fn->createString)
+                    obj = r->fn->createString(cur,s+2,len);
+                else
+                    obj = (void*)(long)cur->type;
+                success = 1;
+            }
+        }
+
+        /* Proceed when obj was created. */
+        if (success) {
+            if (obj == NULL) {
+                __redisReaderSetErrorOOM(r);
+                return REDIS_ERR;
+            }
+
+            r->pos += bytelen;
+
+            /* Set reply if this is the root object. */
+            if (r->ridx == 0) r->reply = obj;
+            moveToNextTask(r);
+            return REDIS_OK;
+        }
+    }
+
+    return REDIS_ERR;
+}
+
+static int redisReaderGrow(redisReader *r) {
+    redisReadTask **aux;
+    int newlen;
+
+    /* Grow our stack size */
+    newlen = r->tasks + REDIS_READER_STACK_SIZE;
+    aux = hi_realloc(r->task, sizeof(*r->task) * newlen);
+    if (aux == NULL)
+        goto oom;
+
+    r->task = aux;
+
+    /* Allocate new tasks */
+    for (; r->tasks < newlen; r->tasks++) {
+        r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
+        if (r->task[r->tasks] == NULL)
+            goto oom;
+    }
+
+    return REDIS_OK;
+oom:
+    __redisReaderSetErrorOOM(r);
+    return REDIS_ERR;
+}
+
+/* Process the array, map and set types. */
+static int processAggregateItem(redisReader *r) {
+    redisReadTask *cur = r->task[r->ridx];
+    void *obj;
+    char *p;
+    long long elements;
+    int root = 0, len;
+
+    /* Set error for nested multi bulks with depth > 7 */
+    if (r->ridx == r->tasks - 1) {
+        if (redisReaderGrow(r) == REDIS_ERR)
+            return REDIS_ERR;
+    }
+
+    if ((p = readLine(r,&len)) != NULL) {
+        if (string2ll(p, len, &elements) == REDIS_ERR) {
+            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                    "Bad multi-bulk length");
+            return REDIS_ERR;
+        }
+
+        root = (r->ridx == 0);
+
+        if (elements < -1 || (LLONG_MAX > SIZE_MAX && elements > SIZE_MAX) ||
+            (r->maxelements > 0 && elements > r->maxelements))
+        {
+            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
+                    "Multi-bulk length out of range");
+            return REDIS_ERR;
+        }
+
+        if (elements == -1) {
+            if (r->fn && r->fn->createNil)
+                obj = r->fn->createNil(cur);
+            else
+                obj = (void*)REDIS_REPLY_NIL;
+
+            if (obj == NULL) {
+                __redisReaderSetErrorOOM(r);
+                return REDIS_ERR;
+            }
+
+            moveToNextTask(r);
+        } else {
+            if (cur->type == REDIS_REPLY_MAP) elements *= 2;
+
+            if (r->fn && r->fn->createArray)
+                obj = r->fn->createArray(cur,elements);
+            else
+                obj = (void*)(long)cur->type;
+
+            if (obj == NULL) {
+                __redisReaderSetErrorOOM(r);
+                return REDIS_ERR;
+            }
+
+            /* Modify task stack when there are more than 0 elements. */
+            if (elements > 0) {
+                cur->elements = elements;
+                cur->obj = obj;
+                r->ridx++;
+                r->task[r->ridx]->type = -1;
+                r->task[r->ridx]->elements = -1;
+                r->task[r->ridx]->idx = 0;
+                r->task[r->ridx]->obj = NULL;
+                r->task[r->ridx]->parent = cur;
+                r->task[r->ridx]->privdata = r->privdata;
+            } else {
+                moveToNextTask(r);
+            }
+        }
+
+        /* Set reply if this is the root object. */
+        if (root) r->reply = obj;
+        return REDIS_OK;
+    }
+
+    return REDIS_ERR;
+}
+
+static int processItem(redisReader *r) {
+    redisReadTask *cur = r->task[r->ridx];
+    char *p;
+
+    /* check if we need to read type */
+    if (cur->type < 0) {
+        if ((p = readBytes(r,1)) != NULL) {
+            switch (p[0]) {
+            case '-':
+                cur->type = REDIS_REPLY_ERROR;
+                break;
+            case '+':
+                cur->type = REDIS_REPLY_STATUS;
+                break;
+            case ':':
+                cur->type = REDIS_REPLY_INTEGER;
+                break;
+            case ',':
+                cur->type = REDIS_REPLY_DOUBLE;
+                break;
+            case '_':
+                cur->type = REDIS_REPLY_NIL;
+                break;
+            case '$':
+                cur->type = REDIS_REPLY_STRING;
+                break;
+            case '*':
+                cur->type = REDIS_REPLY_ARRAY;
+                break;
+            case '%':
+                cur->type = REDIS_REPLY_MAP;
+                break;
+            case '~':
+                cur->type = REDIS_REPLY_SET;
+                break;
+            case '#':
+                cur->type = REDIS_REPLY_BOOL;
+                break;
+            case '=':
+                cur->type = REDIS_REPLY_VERB;
+                break;
+            case '>':
+                cur->type = REDIS_REPLY_PUSH;
+                break;
+            default:
+                __redisReaderSetErrorProtocolByte(r,*p);
+                return REDIS_ERR;
+            }
+        } else {
+            /* could not consume 1 byte */
+            return REDIS_ERR;
+        }
+    }
+
+    /* process typed item */
+    switch(cur->type) {
+    case REDIS_REPLY_ERROR:
+    case REDIS_REPLY_STATUS:
+    case REDIS_REPLY_INTEGER:
+    case REDIS_REPLY_DOUBLE:
+    case REDIS_REPLY_NIL:
+    case REDIS_REPLY_BOOL:
+        return processLineItem(r);
+    case REDIS_REPLY_STRING:
+    case REDIS_REPLY_VERB:
+        return processBulkItem(r);
+    case REDIS_REPLY_ARRAY:
+    case REDIS_REPLY_MAP:
+    case REDIS_REPLY_SET:
+    case REDIS_REPLY_PUSH:
+        return processAggregateItem(r);
+    default:
+        assert(NULL);
+        return REDIS_ERR; /* Avoid warning. */
+    }
+}
+
+redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
+    redisReader *r;
+
+    r = hi_calloc(1,sizeof(redisReader));
+    if (r == NULL)
+        return NULL;
+
+    r->buf = sdsempty();
+    if (r->buf == NULL)
+        goto oom;
+
+    r->task = hi_calloc(REDIS_READER_STACK_SIZE, sizeof(*r->task));
+    if (r->task == NULL)
+        goto oom;
+
+    for (; r->tasks < REDIS_READER_STACK_SIZE; r->tasks++) {
+        r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
+        if (r->task[r->tasks] == NULL)
+            goto oom;
+    }
+
+    r->fn = fn;
+    r->maxbuf = REDIS_READER_MAX_BUF;
+    r->maxelements = REDIS_READER_MAX_ARRAY_ELEMENTS;
+    r->ridx = -1;
+
+    return r;
+oom:
+    redisReaderFree(r);
+    return NULL;
+}
+
+void redisReaderFree(redisReader *r) {
+    if (r == NULL)
+        return;
+
+    if (r->reply != NULL && r->fn && r->fn->freeObject)
+        r->fn->freeObject(r->reply);
+
+    if (r->task) {
+        /* We know r->task[i] is allocated if i < r->tasks */
+        for (int i = 0; i < r->tasks; i++) {
+            hi_free(r->task[i]);
+        }
+
+        hi_free(r->task);
+    }
+
+    sdsfree(r->buf);
+    hi_free(r);
+}
+
+int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
+    sds newbuf;
+
+    /* Return early when this reader is in an erroneous state. */
+    if (r->err)
+        return REDIS_ERR;
+
+    /* Copy the provided buffer. */
+    if (buf != NULL && len >= 1) {
+        /* Destroy internal buffer when it is empty and is quite large. */
+        if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) {
+            sdsfree(r->buf);
+            r->buf = sdsempty();
+            if (r->buf == 0) goto oom;
+
+            r->pos = 0;
+        }
+
+        newbuf = sdscatlen(r->buf,buf,len);
+        if (newbuf == NULL) goto oom;
+
+        r->buf = newbuf;
+        r->len = sdslen(r->buf);
+    }
+
+    return REDIS_OK;
+oom:
+    __redisReaderSetErrorOOM(r);
+    return REDIS_ERR;
+}
+
+int redisReaderGetReply(redisReader *r, void **reply) {
+    /* Default target pointer to NULL. */
+    if (reply != NULL)
+        *reply = NULL;
+
+    /* Return early when this reader is in an erroneous state. */
+    if (r->err)
+        return REDIS_ERR;
+
+    /* When the buffer is empty, there will never be a reply. */
+    if (r->len == 0)
+        return REDIS_OK;
+
+    /* Set first item to process when the stack is empty. */
+    if (r->ridx == -1) {
+        r->task[0]->type = -1;
+        r->task[0]->elements = -1;
+        r->task[0]->idx = -1;
+        r->task[0]->obj = NULL;
+        r->task[0]->parent = NULL;
+        r->task[0]->privdata = r->privdata;
+        r->ridx = 0;
+    }
+
+    /* Process items in reply. */
+    while (r->ridx >= 0)
+        if (processItem(r) != REDIS_OK)
+            break;
+
+    /* Return ASAP when an error occurred. */
+    if (r->err)
+        return REDIS_ERR;
+
+    /* Discard part of the buffer when we've consumed at least 1k, to avoid
+     * doing unnecessary calls to memmove() in sds.c. */
+    if (r->pos >= 1024) {
+        if (sdsrange(r->buf,r->pos,-1) < 0) return REDIS_ERR;
+        r->pos = 0;
+        r->len = sdslen(r->buf);
+    }
+
+    /* Emit a reply when there is one. */
+    if (r->ridx == -1) {
+        if (reply != NULL) {
+            *reply = r->reply;
+        } else if (r->reply != NULL && r->fn && r->fn->freeObject) {
+            r->fn->freeObject(r->reply);
+        }
+        r->reply = NULL;
+    }
+    return REDIS_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/read.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/read.h
new file mode 100644
index 0000000..2d74d77
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/read.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#ifndef __HIREDIS_READ_H
+#define __HIREDIS_READ_H
+#include <stdio.h> /* for size_t */
+
+#define REDIS_ERR -1
+#define REDIS_OK 0
+
+/* When an error occurs, the err flag in a context is set to hold the type of
+ * error that occurred. REDIS_ERR_IO means there was an I/O error and you
+ * should use the "errno" variable to find out what is wrong.
+ * For other values, the "errstr" field will hold a description. */
+#define REDIS_ERR_IO 1 /* Error in read or write */
+#define REDIS_ERR_EOF 3 /* End of file */
+#define REDIS_ERR_PROTOCOL 4 /* Protocol error */
+#define REDIS_ERR_OOM 5 /* Out of memory */
+#define REDIS_ERR_TIMEOUT 6 /* Timed out */
+#define REDIS_ERR_OTHER 2 /* Everything else... */
+
+#define REDIS_REPLY_STRING 1
+#define REDIS_REPLY_ARRAY 2
+#define REDIS_REPLY_INTEGER 3
+#define REDIS_REPLY_NIL 4
+#define REDIS_REPLY_STATUS 5
+#define REDIS_REPLY_ERROR 6
+#define REDIS_REPLY_DOUBLE 7
+#define REDIS_REPLY_BOOL 8
+#define REDIS_REPLY_MAP 9
+#define REDIS_REPLY_SET 10
+#define REDIS_REPLY_ATTR 11
+#define REDIS_REPLY_PUSH 12
+#define REDIS_REPLY_BIGNUM 13
+#define REDIS_REPLY_VERB 14
+
+/* Default max unused reader buffer. */
+#define REDIS_READER_MAX_BUF (1024*16)
+
+/* Default multi-bulk element limit */
+#define REDIS_READER_MAX_ARRAY_ELEMENTS ((1LL<<32) - 1)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct redisReadTask {
+    int type;
+    long long elements; /* number of elements in multibulk container */
+    int idx; /* index in parent (array) object */
+    void *obj; /* holds user-generated value for a read task */
+    struct redisReadTask *parent; /* parent task */
+    void *privdata; /* user-settable arbitrary field */
+} redisReadTask;
+
+typedef struct redisReplyObjectFunctions {
+    void *(*createString)(const redisReadTask*, char*, size_t);
+    void *(*createArray)(const redisReadTask*, size_t);
+    void *(*createInteger)(const redisReadTask*, long long);
+    void *(*createDouble)(const redisReadTask*, double, char*, size_t);
+    void *(*createNil)(const redisReadTask*);
+    void *(*createBool)(const redisReadTask*, int);
+    void (*freeObject)(void*);
+} redisReplyObjectFunctions;
+
+typedef struct redisReader {
+    int err; /* Error flags, 0 when there is no error */
+    char errstr[128]; /* String representation of error when applicable */
+
+    char *buf; /* Read buffer */
+    size_t pos; /* Buffer cursor */
+    size_t len; /* Buffer length */
+    size_t maxbuf; /* Max length of unused buffer */
+    long long maxelements; /* Max multi-bulk elements */
+
+    redisReadTask **task;
+    int tasks;
+
+    int ridx; /* Index of current read task */
+    void *reply; /* Temporary reply pointer */
+
+    redisReplyObjectFunctions *fn;
+    void *privdata;
+} redisReader;
+
+/* Public API for the protocol parser. */
+redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn);
+void redisReaderFree(redisReader *r);
+int redisReaderFeed(redisReader *r, const char *buf, size_t len);
+int redisReaderGetReply(redisReader *r, void **reply);
+
+#define redisReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
+#define redisReaderGetObject(_r) (((redisReader*)(_r))->reply)
+#define redisReaderGetError(_r) (((redisReader*)(_r))->errstr)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sds.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sds.c
new file mode 100644
index 0000000..feedfe3
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sds.c
@@ -0,0 +1,1294 @@
+/* SDSLib 2.0 -- A C dynamic strings library
+ *
+ * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2015, Oran Agra
+ * Copyright (c) 2015, Redis Labs, Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "fmacros.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+#include <limits.h>
+#include "sds.h"
+#include "sdsalloc.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+
+static inline int sdsHdrSize(char type) {
+    switch(type&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            return sizeof(struct sdshdr5);
+        case SDS_TYPE_8:
+            return sizeof(struct sdshdr8);
+        case SDS_TYPE_16:
+            return sizeof(struct sdshdr16);
+        case SDS_TYPE_32:
+            return sizeof(struct sdshdr32);
+        case SDS_TYPE_64:
+            return sizeof(struct sdshdr64);
+    }
+    return 0;
+}
+
+static inline char sdsReqType(size_t string_size) {
+    if (string_size < 32)
+        return SDS_TYPE_5;
+    if (string_size < 0xff)
+        return SDS_TYPE_8;
+    if (string_size < 0xffff)
+        return SDS_TYPE_16;
+    if (string_size < 0xffffffff)
+        return SDS_TYPE_32;
+    return SDS_TYPE_64;
+}
+
+/* Create a new sds string with the content specified by the 'init' pointer
+ * and 'initlen'.
+ * If NULL is used for 'init' the string is initialized with zero bytes.
+ *
+ * The string is always null-termined (all the sds strings are, always) so
+ * even if you create an sds string with:
+ *
+ * mystring = sdsnewlen("abc",3);
+ *
+ * You can print the string with printf() as there is an implicit \0 at the
+ * end of the string. However the string is binary safe and can contain
+ * \0 characters in the middle, as the length is stored in the sds header. */
+sds sdsnewlen(const void *init, size_t initlen) {
+    void *sh;
+    sds s;
+    char type = sdsReqType(initlen);
+    /* Empty strings are usually created in order to append. Use type 8
+     * since type 5 is not good at this. */
+    if (type == SDS_TYPE_5 && initlen == 0) type = SDS_TYPE_8;
+    int hdrlen = sdsHdrSize(type);
+    unsigned char *fp; /* flags pointer. */
+
+    sh = s_malloc(hdrlen+initlen+1);
+    if (sh == NULL) return NULL;
+    if (!init)
+        memset(sh, 0, hdrlen+initlen+1);
+    s = (char*)sh+hdrlen;
+    fp = ((unsigned char*)s)-1;
+    switch(type) {
+        case SDS_TYPE_5: {
+            *fp = type | (initlen << SDS_TYPE_BITS);
+            break;
+        }
+        case SDS_TYPE_8: {
+            SDS_HDR_VAR(8,s);
+            sh->len = initlen;
+            sh->alloc = initlen;
+            *fp = type;
+            break;
+        }
+        case SDS_TYPE_16: {
+            SDS_HDR_VAR(16,s);
+            sh->len = initlen;
+            sh->alloc = initlen;
+            *fp = type;
+            break;
+        }
+        case SDS_TYPE_32: {
+            SDS_HDR_VAR(32,s);
+            sh->len = initlen;
+            sh->alloc = initlen;
+            *fp = type;
+            break;
+        }
+        case SDS_TYPE_64: {
+            SDS_HDR_VAR(64,s);
+            sh->len = initlen;
+            sh->alloc = initlen;
+            *fp = type;
+            break;
+        }
+    }
+    if (initlen && init)
+        memcpy(s, init, initlen);
+    s[initlen] = '\0';
+    return s;
+}
+
+/* Create an empty (zero length) sds string. Even in this case the string
+ * always has an implicit null term. */
+sds sdsempty(void) {
+    return sdsnewlen("",0);
+}
+
+/* Create a new sds string starting from a null terminated C string. */
+sds sdsnew(const char *init) {
+    size_t initlen = (init == NULL) ? 0 : strlen(init);
+    return sdsnewlen(init, initlen);
+}
+
+/* Duplicate an sds string. */
+sds sdsdup(const sds s) {
+    return sdsnewlen(s, sdslen(s));
+}
+
+/* Free an sds string. No operation is performed if 's' is NULL. */
+void sdsfree(sds s) {
+    if (s == NULL) return;
+    s_free((char*)s-sdsHdrSize(s[-1]));
+}
+
+/* Set the sds string length to the length as obtained with strlen(), so
+ * considering as content only up to the first null term character.
+ *
+ * This function is useful when the sds string is hacked manually in some
+ * way, like in the following example:
+ *
+ * s = sdsnew("foobar");
+ * s[2] = '\0';
+ * sdsupdatelen(s);
+ * printf("%d\n", sdslen(s));
+ *
+ * The output will be "2", but if we comment out the call to sdsupdatelen()
+ * the output will be "6" as the string was modified but the logical length
+ * remains 6 bytes. */
+void sdsupdatelen(sds s) {
+    int reallen = strlen(s);
+    sdssetlen(s, reallen);
+}
+
+/* Modify an sds string in-place to make it empty (zero length).
+ * However all the existing buffer is not discarded but set as free space
+ * so that next append operations will not require allocations up to the
+ * number of bytes previously available. */
+void sdsclear(sds s) {
+    sdssetlen(s, 0);
+    s[0] = '\0';
+}
+
+/* Enlarge the free space at the end of the sds string so that the caller
+ * is sure that after calling this function can overwrite up to addlen
+ * bytes after the end of the string, plus one more byte for nul term.
+ *
+ * Note: this does not change the *length* of the sds string as returned
+ * by sdslen(), but only the free buffer space we have. */
+sds sdsMakeRoomFor(sds s, size_t addlen) {
+    void *sh, *newsh;
+    size_t avail = sdsavail(s);
+    size_t len, newlen;
+    char type, oldtype = s[-1] & SDS_TYPE_MASK;
+    int hdrlen;
+
+    /* Return ASAP if there is enough space left. */
+    if (avail >= addlen) return s;
+
+    len = sdslen(s);
+    sh = (char*)s-sdsHdrSize(oldtype);
+    newlen = (len+addlen);
+    if (newlen < SDS_MAX_PREALLOC)
+        newlen *= 2;
+    else
+        newlen += SDS_MAX_PREALLOC;
+
+    type = sdsReqType(newlen);
+
+    /* Don't use type 5: the user is appending to the string and type 5 is
+     * not able to remember empty space, so sdsMakeRoomFor() must be called
+     * at every appending operation. */
+    if (type == SDS_TYPE_5) type = SDS_TYPE_8;
+
+    hdrlen = sdsHdrSize(type);
+    if (oldtype==type) {
+        newsh = s_realloc(sh, hdrlen+newlen+1);
+        if (newsh == NULL) return NULL;
+        s = (char*)newsh+hdrlen;
+    } else {
+        /* Since the header size changes, need to move the string forward,
+         * and can't use realloc */
+        newsh = s_malloc(hdrlen+newlen+1);
+        if (newsh == NULL) return NULL;
+        memcpy((char*)newsh+hdrlen, s, len+1);
+        s_free(sh);
+        s = (char*)newsh+hdrlen;
+        s[-1] = type;
+        sdssetlen(s, len);
+    }
+    sdssetalloc(s, newlen);
+    return s;
+}
+
+/* Reallocate the sds string so that it has no free space at the end. The
+ * contained string remains not altered, but next concatenation operations
+ * will require a reallocation.
+ *
+ * After the call, the passed sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdsRemoveFreeSpace(sds s) {
+    void *sh, *newsh;
+    char type, oldtype = s[-1] & SDS_TYPE_MASK;
+    int hdrlen;
+    size_t len = sdslen(s);
+    sh = (char*)s-sdsHdrSize(oldtype);
+
+    type = sdsReqType(len);
+    hdrlen = sdsHdrSize(type);
+    if (oldtype==type) {
+        newsh = s_realloc(sh, hdrlen+len+1);
+        if (newsh == NULL) return NULL;
+        s = (char*)newsh+hdrlen;
+    } else {
+        newsh = s_malloc(hdrlen+len+1);
+        if (newsh == NULL) return NULL;
+        memcpy((char*)newsh+hdrlen, s, len+1);
+        s_free(sh);
+        s = (char*)newsh+hdrlen;
+        s[-1] = type;
+        sdssetlen(s, len);
+    }
+    sdssetalloc(s, len);
+    return s;
+}
+
+/* Return the total size of the allocation of the specifed sds string,
+ * including:
+ * 1) The sds header before the pointer.
+ * 2) The string.
+ * 3) The free buffer at the end if any.
+ * 4) The implicit null term.
+ */
+size_t sdsAllocSize(sds s) {
+    size_t alloc = sdsalloc(s);
+    return sdsHdrSize(s[-1])+alloc+1;
+}
+
+/* Return the pointer of the actual SDS allocation (normally SDS strings
+ * are referenced by the start of the string buffer). */
+void *sdsAllocPtr(sds s) {
+    return (void*) (s-sdsHdrSize(s[-1]));
+}
+
+/* Increment the sds length and decrements the left free space at the
+ * end of the string according to 'incr'. Also set the null term
+ * in the new end of the string.
+ *
+ * This function is used in order to fix the string length after the
+ * user calls sdsMakeRoomFor(), writes something after the end of
+ * the current string, and finally needs to set the new length.
+ *
+ * Note: it is possible to use a negative increment in order to
+ * right-trim the string.
+ *
+ * Usage example:
+ *
+ * Using sdsIncrLen() and sdsMakeRoomFor() it is possible to mount the
+ * following schema, to cat bytes coming from the kernel to the end of an
+ * sds string without copying into an intermediate buffer:
+ *
+ * oldlen = sdslen(s);
+ * s = sdsMakeRoomFor(s, BUFFER_SIZE);
+ * nread = read(fd, s+oldlen, BUFFER_SIZE);
+ * ... check for nread <= 0 and handle it ...
+ * sdsIncrLen(s, nread);
+ */
+void sdsIncrLen(sds s, int incr) {
+    unsigned char flags = s[-1];
+    size_t len;
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5: {
+            unsigned char *fp = ((unsigned char*)s)-1;
+            unsigned char oldlen = SDS_TYPE_5_LEN(flags);
+            assert((incr > 0 && oldlen+incr < 32) || (incr < 0 && oldlen >= (unsigned int)(-incr)));
+            *fp = SDS_TYPE_5 | ((oldlen+incr) << SDS_TYPE_BITS);
+            len = oldlen+incr;
+            break;
+        }
+        case SDS_TYPE_8: {
+            SDS_HDR_VAR(8,s);
+            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
+            len = (sh->len += incr);
+            break;
+        }
+        case SDS_TYPE_16: {
+            SDS_HDR_VAR(16,s);
+            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
+            len = (sh->len += incr);
+            break;
+        }
+        case SDS_TYPE_32: {
+            SDS_HDR_VAR(32,s);
+            assert((incr >= 0 && sh->alloc-sh->len >= (unsigned int)incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
+            len = (sh->len += incr);
+            break;
+        }
+        case SDS_TYPE_64: {
+            SDS_HDR_VAR(64,s);
+            assert((incr >= 0 && sh->alloc-sh->len >= (uint64_t)incr) || (incr < 0 && sh->len >= (uint64_t)(-incr)));
+            len = (sh->len += incr);
+            break;
+        }
+        default: len = 0; /* Just to avoid compilation warnings. */
+    }
+    s[len] = '\0';
+}
+
+/* Grow the sds to have the specified length. Bytes that were not part of
+ * the original length of the sds will be set to zero.
+ *
+ * if the specified length is smaller than the current length, no operation
+ * is performed. */
+sds sdsgrowzero(sds s, size_t len) {
+    size_t curlen = sdslen(s);
+
+    if (len <= curlen) return s;
+    s = sdsMakeRoomFor(s,len-curlen);
+    if (s == NULL) return NULL;
+
+    /* Make sure added region doesn't contain garbage */
+    memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */
+    sdssetlen(s, len);
+    return s;
+}
+
+/* Append the specified binary-safe string pointed by 't' of 'len' bytes to the
+ * end of the specified sds string 's'.
+ *
+ * After the call, the passed sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscatlen(sds s, const void *t, size_t len) {
+    size_t curlen = sdslen(s);
+
+    s = sdsMakeRoomFor(s,len);
+    if (s == NULL) return NULL;
+    memcpy(s+curlen, t, len);
+    sdssetlen(s, curlen+len);
+    s[curlen+len] = '\0';
+    return s;
+}
+
+/* Append the specified null termianted C string to the sds string 's'.
+ *
+ * After the call, the passed sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscat(sds s, const char *t) {
+    return sdscatlen(s, t, strlen(t));
+}
+
+/* Append the specified sds 't' to the existing sds 's'.
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscatsds(sds s, const sds t) {
+    return sdscatlen(s, t, sdslen(t));
+}
+
+/* Destructively modify the sds string 's' to hold the specified binary
+ * safe string pointed by 't' of length 'len' bytes. */
+sds sdscpylen(sds s, const char *t, size_t len) {
+    if (sdsalloc(s) < len) {
+        s = sdsMakeRoomFor(s,len-sdslen(s));
+        if (s == NULL) return NULL;
+    }
+    memcpy(s, t, len);
+    s[len] = '\0';
+    sdssetlen(s, len);
+    return s;
+}
+
+/* Like sdscpylen() but 't' must be a null-termined string so that the length
+ * of the string is obtained with strlen(). */
+sds sdscpy(sds s, const char *t) {
+    return sdscpylen(s, t, strlen(t));
+}
+
+/* Helper for sdscatlonglong() doing the actual number -> string
+ * conversion. 's' must point to a string with room for at least
+ * SDS_LLSTR_SIZE bytes.
+ *
+ * The function returns the length of the null-terminated string
+ * representation stored at 's'. */
+#define SDS_LLSTR_SIZE 21
+int sdsll2str(char *s, long long value) {
+    char *p, aux;
+    unsigned long long v;
+    size_t l;
+
+    /* Generate the string representation, this method produces
+     * an reversed string. */
+    v = (value < 0) ? -value : value;
+    p = s;
+    do {
+        *p++ = '0'+(v%10);
+        v /= 10;
+    } while(v);
+    if (value < 0) *p++ = '-';
+
+    /* Compute length and add null term. */
+    l = p-s;
+    *p = '\0';
+
+    /* Reverse the string. */
+    p--;
+    while(s < p) {
+        aux = *s;
+        *s = *p;
+        *p = aux;
+        s++;
+        p--;
+    }
+    return l;
+}
+
+/* Identical sdsll2str(), but for unsigned long long type. */
+int sdsull2str(char *s, unsigned long long v) {
+    char *p, aux;
+    size_t l;
+
+    /* Generate the string representation, this method produces
+     * an reversed string. */
+    p = s;
+    do {
+        *p++ = '0'+(v%10);
+        v /= 10;
+    } while(v);
+
+    /* Compute length and add null term. */
+    l = p-s;
+    *p = '\0';
+
+    /* Reverse the string. */
+    p--;
+    while(s < p) {
+        aux = *s;
+        *s = *p;
+        *p = aux;
+        s++;
+        p--;
+    }
+    return l;
+}
+
+/* Create an sds string from a long long value. It is much faster than:
+ *
+ * sdscatprintf(sdsempty(),"%lld\n", value);
+ */
+sds sdsfromlonglong(long long value) {
+    char buf[SDS_LLSTR_SIZE];
+    int len = sdsll2str(buf,value);
+
+    return sdsnewlen(buf,len);
+}
+
+/* Like sdscatprintf() but gets va_list instead of being variadic. */
+sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
+    va_list cpy;
+    char staticbuf[1024], *buf = staticbuf, *t;
+    size_t buflen = strlen(fmt)*2;
+
+    /* We try to start using a static buffer for speed.
+     * If not possible we revert to heap allocation. */
+    if (buflen > sizeof(staticbuf)) {
+        buf = s_malloc(buflen);
+        if (buf == NULL) return NULL;
+    } else {
+        buflen = sizeof(staticbuf);
+    }
+
+    /* Try with buffers two times bigger every time we fail to
+     * fit the string in the current buffer size. */
+    while(1) {
+        buf[buflen-2] = '\0';
+        va_copy(cpy,ap);
+        vsnprintf(buf, buflen, fmt, cpy);
+        va_end(cpy);
+        if (buf[buflen-2] != '\0') {
+            if (buf != staticbuf) s_free(buf);
+            buflen *= 2;
+            buf = s_malloc(buflen);
+            if (buf == NULL) return NULL;
+            continue;
+        }
+        break;
+    }
+
+    /* Finally concat the obtained string to the SDS string and return it. */
+    t = sdscat(s, buf);
+    if (buf != staticbuf) s_free(buf);
+    return t;
+}
+
+/* Append to the sds string 's' a string obtained using printf-alike format
+ * specifier.
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call.
+ *
+ * Example:
+ *
+ * s = sdsnew("Sum is: ");
+ * s = sdscatprintf(s,"%d+%d = %d",a,b,a+b).
+ *
+ * Often you need to create a string from scratch with the printf-alike
+ * format. When this is the need, just use sdsempty() as the target string:
+ *
+ * s = sdscatprintf(sdsempty(), "... your format ...", args);
+ */
+sds sdscatprintf(sds s, const char *fmt, ...) {
+    va_list ap;
+    char *t;
+    va_start(ap, fmt);
+    t = sdscatvprintf(s,fmt,ap);
+    va_end(ap);
+    return t;
+}
+
+/* This function is similar to sdscatprintf, but much faster as it does
+ * not rely on sprintf() family functions implemented by the libc that
+ * are often very slow. Moreover directly handling the sds string as
+ * new data is concatenated provides a performance improvement.
+ *
+ * However this function only handles an incompatible subset of printf-alike
+ * format specifiers:
+ *
+ * %s - C String
+ * %S - SDS string
+ * %i - signed int
+ * %I - 64 bit signed integer (long long, int64_t)
+ * %u - unsigned int
+ * %U - 64 bit unsigned integer (unsigned long long, uint64_t)
+ * %% - Verbatim "%" character.
+ */
+sds sdscatfmt(sds s, char const *fmt, ...) {
+    const char *f = fmt;
+    int i;
+    va_list ap;
+
+    va_start(ap,fmt);
+    i = sdslen(s); /* Position of the next byte to write to dest str. */
+    while(*f) {
+        char next, *str;
+        size_t l;
+        long long num;
+        unsigned long long unum;
+
+        /* Make sure there is always space for at least 1 char. */
+        if (sdsavail(s)==0) {
+            s = sdsMakeRoomFor(s,1);
+            if (s == NULL) goto fmt_error;
+        }
+
+        switch(*f) {
+        case '%':
+            next = *(f+1);
+            f++;
+            switch(next) {
+            case 's':
+            case 'S':
+                str = va_arg(ap,char*);
+                l = (next == 's') ? strlen(str) : sdslen(str);
+                if (sdsavail(s) < l) {
+                    s = sdsMakeRoomFor(s,l);
+                    if (s == NULL) goto fmt_error;
+                }
+                memcpy(s+i,str,l);
+                sdsinclen(s,l);
+                i += l;
+                break;
+            case 'i':
+            case 'I':
+                if (next == 'i')
+                    num = va_arg(ap,int);
+                else
+                    num = va_arg(ap,long long);
+                {
+                    char buf[SDS_LLSTR_SIZE];
+                    l = sdsll2str(buf,num);
+                    if (sdsavail(s) < l) {
+                        s = sdsMakeRoomFor(s,l);
+                        if (s == NULL) goto fmt_error;
+                    }
+                    memcpy(s+i,buf,l);
+                    sdsinclen(s,l);
+                    i += l;
+                }
+                break;
+            case 'u':
+            case 'U':
+                if (next == 'u')
+                    unum = va_arg(ap,unsigned int);
+                else
+                    unum = va_arg(ap,unsigned long long);
+                {
+                    char buf[SDS_LLSTR_SIZE];
+                    l = sdsull2str(buf,unum);
+                    if (sdsavail(s) < l) {
+                        s = sdsMakeRoomFor(s,l);
+                        if (s == NULL) goto fmt_error;
+                    }
+                    memcpy(s+i,buf,l);
+                    sdsinclen(s,l);
+                    i += l;
+                }
+                break;
+            default: /* Handle %% and generally %<unknown>. */
+                s[i++] = next;
+                sdsinclen(s,1);
+                break;
+            }
+            break;
+        default:
+            s[i++] = *f;
+            sdsinclen(s,1);
+            break;
+        }
+        f++;
+    }
+    va_end(ap);
+
+    /* Add null-term */
+    s[i] = '\0';
+    return s;
+
+fmt_error:
+    va_end(ap);
+    return NULL;
+}
+
+/* Remove the part of the string from left and from right composed just of
+ * contiguous characters found in 'cset', that is a null terminted C string.
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call.
+ *
+ * Example:
+ *
+ * s = sdsnew("AA...AA.a.aa.aHelloWorld     :::");
+ * s = sdstrim(s,"Aa. :");
+ * printf("%s\n", s);
+ *
+ * Output will be just "Hello World".
+ */
+sds sdstrim(sds s, const char *cset) {
+    char *start, *end, *sp, *ep;
+    size_t len;
+
+    sp = start = s;
+    ep = end = s+sdslen(s)-1;
+    while(sp <= end && strchr(cset, *sp)) sp++;
+    while(ep > sp && strchr(cset, *ep)) ep--;
+    len = (sp > ep) ? 0 : ((ep-sp)+1);
+    if (s != sp) memmove(s, sp, len);
+    s[len] = '\0';
+    sdssetlen(s,len);
+    return s;
+}
+
+/* Turn the string into a smaller (or equal) string containing only the
+ * substring specified by the 'start' and 'end' indexes.
+ *
+ * start and end can be negative, where -1 means the last character of the
+ * string, -2 the penultimate character, and so forth.
+ *
+ * The interval is inclusive, so the start and end characters will be part
+ * of the resulting string.
+ *
+ * The string is modified in-place.
+ *
+ * Return value:
+ * -1 (error) if sdslen(s) is larger than maximum positive ssize_t value.
+ *  0 on success.
+ *
+ * Example:
+ *
+ * s = sdsnew("Hello World");
+ * sdsrange(s,1,-1); => "ello World"
+ */
+int sdsrange(sds s, ssize_t start, ssize_t end) {
+    size_t newlen, len = sdslen(s);
+    if (len > SSIZE_MAX) return -1;
+
+    if (len == 0) return 0;
+    if (start < 0) {
+        start = len+start;
+        if (start < 0) start = 0;
+    }
+    if (end < 0) {
+        end = len+end;
+        if (end < 0) end = 0;
+    }
+    newlen = (start > end) ? 0 : (end-start)+1;
+    if (newlen != 0) {
+        if (start >= (ssize_t)len) {
+            newlen = 0;
+        } else if (end >= (ssize_t)len) {
+            end = len-1;
+            newlen = (start > end) ? 0 : (end-start)+1;
+        }
+    } else {
+        start = 0;
+    }
+    if (start && newlen) memmove(s, s+start, newlen);
+    s[newlen] = 0;
+    sdssetlen(s,newlen);
+    return 0;
+}
+
+/* Apply tolower() to every character of the sds string 's'. */
+void sdstolower(sds s) {
+    int len = sdslen(s), j;
+
+    for (j = 0; j < len; j++) s[j] = tolower(s[j]);
+}
+
+/* Apply toupper() to every character of the sds string 's'. */
+void sdstoupper(sds s) {
+    int len = sdslen(s), j;
+
+    for (j = 0; j < len; j++) s[j] = toupper(s[j]);
+}
+
+/* Compare two sds strings s1 and s2 with memcmp().
+ *
+ * Return value:
+ *
+ *     positive if s1 > s2.
+ *     negative if s1 < s2.
+ *     0 if s1 and s2 are exactly the same binary string.
+ *
+ * If two strings share exactly the same prefix, but one of the two has
+ * additional characters, the longer string is considered to be greater than
+ * the smaller one. */
+int sdscmp(const sds s1, const sds s2) {
+    size_t l1, l2, minlen;
+    int cmp;
+
+    l1 = sdslen(s1);
+    l2 = sdslen(s2);
+    minlen = (l1 < l2) ? l1 : l2;
+    cmp = memcmp(s1,s2,minlen);
+    if (cmp == 0) return l1-l2;
+    return cmp;
+}
+
+/* Split 's' with separator in 'sep'. An array
+ * of sds strings is returned. *count will be set
+ * by reference to the number of tokens returned.
+ *
+ * On out of memory, zero length string, zero length
+ * separator, NULL is returned.
+ *
+ * Note that 'sep' is able to split a string using
+ * a multi-character separator. For example
+ * sdssplit("foo_-_bar","_-_"); will return two
+ * elements "foo" and "bar".
+ *
+ * This version of the function is binary-safe but
+ * requires length arguments. sdssplit() is just the
+ * same function but for zero-terminated strings.
+ */
+sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count) {
+    int elements = 0, slots = 5, start = 0, j;
+    sds *tokens;
+
+    if (seplen < 1 || len < 0) return NULL;
+
+    tokens = s_malloc(sizeof(sds)*slots);
+    if (tokens == NULL) return NULL;
+
+    if (len == 0) {
+        *count = 0;
+        return tokens;
+    }
+    for (j = 0; j < (len-(seplen-1)); j++) {
+        /* make sure there is room for the next element and the final one */
+        if (slots < elements+2) {
+            sds *newtokens;
+
+            slots *= 2;
+            newtokens = s_realloc(tokens,sizeof(sds)*slots);
+            if (newtokens == NULL) goto cleanup;
+            tokens = newtokens;
+        }
+        /* search the separator */
+        if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
+            tokens[elements] = sdsnewlen(s+start,j-start);
+            if (tokens[elements] == NULL) goto cleanup;
+            elements++;
+            start = j+seplen;
+            j = j+seplen-1; /* skip the separator */
+        }
+    }
+    /* Add the final element. We are sure there is room in the tokens array. */
+    tokens[elements] = sdsnewlen(s+start,len-start);
+    if (tokens[elements] == NULL) goto cleanup;
+    elements++;
+    *count = elements;
+    return tokens;
+
+cleanup:
+    {
+        int i;
+        for (i = 0; i < elements; i++) sdsfree(tokens[i]);
+        s_free(tokens);
+        *count = 0;
+        return NULL;
+    }
+}
+
+/* Free the result returned by sdssplitlen(), or do nothing if 'tokens' is NULL. */
+void sdsfreesplitres(sds *tokens, int count) {
+    if (!tokens) return;
+    while(count--)
+        sdsfree(tokens[count]);
+    s_free(tokens);
+}
+
+/* Append to the sds string "s" an escaped string representation where
+ * all the non-printable characters (tested with isprint()) are turned into
+ * escapes in the form "\n\r\a...." or "\x<hex-number>".
+ *
+ * After the call, the modified sds string is no longer valid and all the
+ * references must be substituted with the new pointer returned by the call. */
+sds sdscatrepr(sds s, const char *p, size_t len) {
+    s = sdscatlen(s,"\"",1);
+    while(len--) {
+        switch(*p) {
+        case '\\':
+        case '"':
+            s = sdscatprintf(s,"\\%c",*p);
+            break;
+        case '\n': s = sdscatlen(s,"\\n",2); break;
+        case '\r': s = sdscatlen(s,"\\r",2); break;
+        case '\t': s = sdscatlen(s,"\\t",2); break;
+        case '\a': s = sdscatlen(s,"\\a",2); break;
+        case '\b': s = sdscatlen(s,"\\b",2); break;
+        default:
+            if (isprint(*p))
+                s = sdscatprintf(s,"%c",*p);
+            else
+                s = sdscatprintf(s,"\\x%02x",(unsigned char)*p);
+            break;
+        }
+        p++;
+    }
+    return sdscatlen(s,"\"",1);
+}
+
+/* Helper function for sdssplitargs() that converts a hex digit into an
+ * integer from 0 to 15 */
+int hex_digit_to_int(char c) {
+    switch(c) {
+    case '0': return 0;
+    case '1': return 1;
+    case '2': return 2;
+    case '3': return 3;
+    case '4': return 4;
+    case '5': return 5;
+    case '6': return 6;
+    case '7': return 7;
+    case '8': return 8;
+    case '9': return 9;
+    case 'a': case 'A': return 10;
+    case 'b': case 'B': return 11;
+    case 'c': case 'C': return 12;
+    case 'd': case 'D': return 13;
+    case 'e': case 'E': return 14;
+    case 'f': case 'F': return 15;
+    default: return 0;
+    }
+}
+
+/* Split a line into arguments, where every argument can be in the
+ * following programming-language REPL-alike form:
+ *
+ * foo bar "newline are supported\n" and "\xff\x00otherstuff"
+ *
+ * The number of arguments is stored into *argc, and an array
+ * of sds is returned.
+ *
+ * The caller should free the resulting array of sds strings with
+ * sdsfreesplitres().
+ *
+ * Note that sdscatrepr() is able to convert back a string into
+ * a quoted string in the same format sdssplitargs() is able to parse.
+ *
+ * The function returns the allocated tokens on success, even when the
+ * input string is empty, or NULL if the input contains unbalanced
+ * quotes or closed quotes followed by non space characters
+ * as in: "foo"bar or "foo'
+ */
+sds *sdssplitargs(const char *line, int *argc) {
+    const char *p = line;
+    char *current = NULL;
+    char **vector = NULL;
+
+    *argc = 0;
+    while(1) {
+        /* skip blanks */
+        while(*p && isspace(*p)) p++;
+        if (*p) {
+            /* get a token */
+            int inq=0;  /* set to 1 if we are in "quotes" */
+            int insq=0; /* set to 1 if we are in 'single quotes' */
+            int done=0;
+
+            if (current == NULL) current = sdsempty();
+            while(!done) {
+                if (inq) {
+                    if (*p == '\\' && *(p+1) == 'x' &&
+                                             isxdigit(*(p+2)) &&
+                                             isxdigit(*(p+3)))
+                    {
+                        unsigned char byte;
+
+                        byte = (hex_digit_to_int(*(p+2))*16)+
+                                hex_digit_to_int(*(p+3));
+                        current = sdscatlen(current,(char*)&byte,1);
+                        p += 3;
+                    } else if (*p == '\\' && *(p+1)) {
+                        char c;
+
+                        p++;
+                        switch(*p) {
+                        case 'n': c = '\n'; break;
+                        case 'r': c = '\r'; break;
+                        case 't': c = '\t'; break;
+                        case 'b': c = '\b'; break;
+                        case 'a': c = '\a'; break;
+                        default: c = *p; break;
+                        }
+                        current = sdscatlen(current,&c,1);
+                    } else if (*p == '"') {
+                        /* closing quote must be followed by a space or
+                         * nothing at all. */
+                        if (*(p+1) && !isspace(*(p+1))) goto err;
+                        done=1;
+                    } else if (!*p) {
+                        /* unterminated quotes */
+                        goto err;
+                    } else {
+                        current = sdscatlen(current,p,1);
+                    }
+                } else if (insq) {
+                    if (*p == '\\' && *(p+1) == '\'') {
+                        p++;
+                        current = sdscatlen(current,"'",1);
+                    } else if (*p == '\'') {
+                        /* closing quote must be followed by a space or
+                         * nothing at all. */
+                        if (*(p+1) && !isspace(*(p+1))) goto err;
+                        done=1;
+                    } else if (!*p) {
+                        /* unterminated quotes */
+                        goto err;
+                    } else {
+                        current = sdscatlen(current,p,1);
+                    }
+                } else {
+                    switch(*p) {
+                    case ' ':
+                    case '\n':
+                    case '\r':
+                    case '\t':
+                    case '\0':
+                        done=1;
+                        break;
+                    case '"':
+                        inq=1;
+                        break;
+                    case '\'':
+                        insq=1;
+                        break;
+                    default:
+                        current = sdscatlen(current,p,1);
+                        break;
+                    }
+                }
+                if (*p) p++;
+            }
+            /* add the token to the vector */
+            {
+                char **new_vector = s_realloc(vector,((*argc)+1)*sizeof(char*));
+                if (new_vector == NULL) {
+                    s_free(vector);
+                    return NULL;
+                }
+
+                vector = new_vector;
+                vector[*argc] = current;
+                (*argc)++;
+                current = NULL;
+            }
+        } else {
+            /* Even on empty input string return something not NULL. */
+            if (vector == NULL) vector = s_malloc(sizeof(void*));
+            return vector;
+        }
+    }
+
+err:
+    while((*argc)--)
+        sdsfree(vector[*argc]);
+    s_free(vector);
+    if (current) sdsfree(current);
+    *argc = 0;
+    return NULL;
+}
+
+/* Modify the string substituting all the occurrences of the set of
+ * characters specified in the 'from' string to the corresponding character
+ * in the 'to' array.
+ *
+ * For instance: sdsmapchars(mystring, "ho", "01", 2)
+ * will have the effect of turning the string "hello" into "0ell1".
+ *
+ * The function returns the sds string pointer, that is always the same
+ * as the input pointer since no resize is needed. */
+sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) {
+    size_t j, i, l = sdslen(s);
+
+    for (j = 0; j < l; j++) {
+        for (i = 0; i < setlen; i++) {
+            if (s[j] == from[i]) {
+                s[j] = to[i];
+                break;
+            }
+        }
+    }
+    return s;
+}
+
+/* Join an array of C strings using the specified separator (also a C string).
+ * Returns the result as an sds string. */
+sds sdsjoin(char **argv, int argc, char *sep) {
+    sds join = sdsempty();
+    int j;
+
+    for (j = 0; j < argc; j++) {
+        join = sdscat(join, argv[j]);
+        if (j != argc-1) join = sdscat(join,sep);
+    }
+    return join;
+}
+
+/* Like sdsjoin, but joins an array of SDS strings. */
+sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) {
+    sds join = sdsempty();
+    int j;
+
+    for (j = 0; j < argc; j++) {
+        join = sdscatsds(join, argv[j]);
+        if (j != argc-1) join = sdscatlen(join,sep,seplen);
+    }
+    return join;
+}
+
+/* Wrappers to the allocators used by SDS. Note that SDS will actually
+ * just use the macros defined into sdsalloc.h in order to avoid to pay
+ * the overhead of function calls. Here we define these wrappers only for
+ * the programs SDS is linked to, if they want to touch the SDS internals
+ * even if they use a different allocator. */
+void *sds_malloc(size_t size) { return s_malloc(size); }
+void *sds_realloc(void *ptr, size_t size) { return s_realloc(ptr,size); }
+void sds_free(void *ptr) { s_free(ptr); }
+
+#if defined(SDS_TEST_MAIN)
+#include <stdio.h>
+#include "testhelp.h"
+#include "limits.h"
+
+#define UNUSED(x) (void)(x)
+int sdsTest(void) {
+    {
+        sds x = sdsnew("foo"), y;
+
+        test_cond("Create a string and obtain the length",
+            sdslen(x) == 3 && memcmp(x,"foo\0",4) == 0)
+
+        sdsfree(x);
+        x = sdsnewlen("foo",2);
+        test_cond("Create a string with specified length",
+            sdslen(x) == 2 && memcmp(x,"fo\0",3) == 0)
+
+        x = sdscat(x,"bar");
+        test_cond("Strings concatenation",
+            sdslen(x) == 5 && memcmp(x,"fobar\0",6) == 0);
+
+        x = sdscpy(x,"a");
+        test_cond("sdscpy() against an originally longer string",
+            sdslen(x) == 1 && memcmp(x,"a\0",2) == 0)
+
+        x = sdscpy(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk");
+        test_cond("sdscpy() against an originally shorter string",
+            sdslen(x) == 33 &&
+            memcmp(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk\0",33) == 0)
+
+        sdsfree(x);
+        x = sdscatprintf(sdsempty(),"%d",123);
+        test_cond("sdscatprintf() seems working in the base case",
+            sdslen(x) == 3 && memcmp(x,"123\0",4) == 0)
+
+        sdsfree(x);
+        x = sdsnew("--");
+        x = sdscatfmt(x, "Hello %s World %I,%I--", "Hi!", LLONG_MIN,LLONG_MAX);
+        test_cond("sdscatfmt() seems working in the base case",
+            sdslen(x) == 60 &&
+            memcmp(x,"--Hello Hi! World -9223372036854775808,"
+                     "9223372036854775807--",60) == 0)
+        printf("[%s]\n",x);
+
+        sdsfree(x);
+        x = sdsnew("--");
+        x = sdscatfmt(x, "%u,%U--", UINT_MAX, ULLONG_MAX);
+        test_cond("sdscatfmt() seems working with unsigned numbers",
+            sdslen(x) == 35 &&
+            memcmp(x,"--4294967295,18446744073709551615--",35) == 0)
+
+        sdsfree(x);
+        x = sdsnew(" x ");
+        sdstrim(x," x");
+        test_cond("sdstrim() works when all chars match",
+            sdslen(x) == 0)
+
+        sdsfree(x);
+        x = sdsnew(" x ");
+        sdstrim(x," ");
+        test_cond("sdstrim() works when a single char remains",
+            sdslen(x) == 1 && x[0] == 'x')
+
+        sdsfree(x);
+        x = sdsnew("xxciaoyyy");
+        sdstrim(x,"xy");
+        test_cond("sdstrim() correctly trims characters",
+            sdslen(x) == 4 && memcmp(x,"ciao\0",5) == 0)
+
+        y = sdsdup(x);
+        sdsrange(y,1,1);
+        test_cond("sdsrange(...,1,1)",
+            sdslen(y) == 1 && memcmp(y,"i\0",2) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,1,-1);
+        test_cond("sdsrange(...,1,-1)",
+            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,-2,-1);
+        test_cond("sdsrange(...,-2,-1)",
+            sdslen(y) == 2 && memcmp(y,"ao\0",3) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,2,1);
+        test_cond("sdsrange(...,2,1)",
+            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,1,100);
+        test_cond("sdsrange(...,1,100)",
+            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
+
+        sdsfree(y);
+        y = sdsdup(x);
+        sdsrange(y,100,100);
+        test_cond("sdsrange(...,100,100)",
+            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnew("foo");
+        y = sdsnew("foa");
+        test_cond("sdscmp(foo,foa)", sdscmp(x,y) > 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnew("bar");
+        y = sdsnew("bar");
+        test_cond("sdscmp(bar,bar)", sdscmp(x,y) == 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnew("aar");
+        y = sdsnew("bar");
+        test_cond("sdscmp(bar,bar)", sdscmp(x,y) < 0)
+
+        sdsfree(y);
+        sdsfree(x);
+        x = sdsnewlen("\a\n\0foo\r",7);
+        y = sdscatrepr(sdsempty(),x,sdslen(x));
+        test_cond("sdscatrepr(...data...)",
+            memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0)
+
+        {
+            unsigned int oldfree;
+            char *p;
+            int step = 10, j, i;
+
+            sdsfree(x);
+            sdsfree(y);
+            x = sdsnew("0");
+            test_cond("sdsnew() free/len buffers", sdslen(x) == 1 && sdsavail(x) == 0);
+
+            /* Run the test a few times in order to hit the first two
+             * SDS header types. */
+            for (i = 0; i < 10; i++) {
+                int oldlen = sdslen(x);
+                x = sdsMakeRoomFor(x,step);
+                int type = x[-1]&SDS_TYPE_MASK;
+
+                test_cond("sdsMakeRoomFor() len", sdslen(x) == oldlen);
+                if (type != SDS_TYPE_5) {
+                    test_cond("sdsMakeRoomFor() free", sdsavail(x) >= step);
+                    oldfree = sdsavail(x);
+                }
+                p = x+oldlen;
+                for (j = 0; j < step; j++) {
+                    p[j] = 'A'+j;
+                }
+                sdsIncrLen(x,step);
+            }
+            test_cond("sdsMakeRoomFor() content",
+                memcmp("0ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ",x,101) == 0);
+            test_cond("sdsMakeRoomFor() final length",sdslen(x)==101);
+
+            sdsfree(x);
+        }
+    }
+    test_report()
+    return 0;
+}
+#endif
+
+#ifdef SDS_TEST_MAIN
+int main(void) {
+    return sdsTest();
+}
+#endif
+
+#pragma GCC diagnostic pop
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sds.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sds.h
new file mode 100644
index 0000000..eda8833
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sds.h
@@ -0,0 +1,278 @@
+/* SDSLib 2.0 -- A C dynamic strings library
+ *
+ * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2015, Oran Agra
+ * Copyright (c) 2015, Redis Labs, Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __SDS_H
+#define __SDS_H
+
+#define SDS_MAX_PREALLOC (1024*1024)
+#ifdef _MSC_VER
+#define __attribute__(x)
+typedef long long ssize_t;
+#define SSIZE_MAX (LLONG_MAX >> 1)
+#endif
+
+#include <sys/types.h>
+#include <stdarg.h>
+#include <stdint.h>
+
+typedef char *sds;
+
+/* Note: sdshdr5 is never used, we just access the flags byte directly.
+ * However is here to document the layout of type 5 SDS strings. */
+struct __attribute__ ((__packed__)) sdshdr5 {
+    unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr8 {
+    uint8_t len; /* used */
+    uint8_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr16 {
+    uint16_t len; /* used */
+    uint16_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr32 {
+    uint32_t len; /* used */
+    uint32_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+struct __attribute__ ((__packed__)) sdshdr64 {
+    uint64_t len; /* used */
+    uint64_t alloc; /* excluding the header and null terminator */
+    unsigned char flags; /* 3 lsb of type, 5 unused bits */
+    char buf[];
+};
+
+#define SDS_TYPE_5  0
+#define SDS_TYPE_8  1
+#define SDS_TYPE_16 2
+#define SDS_TYPE_32 3
+#define SDS_TYPE_64 4
+#define SDS_TYPE_MASK 7
+#define SDS_TYPE_BITS 3
+#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)));
+#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
+#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
+
+static inline size_t sdslen(const sds s) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            return SDS_TYPE_5_LEN(flags);
+        case SDS_TYPE_8:
+            return SDS_HDR(8,s)->len;
+        case SDS_TYPE_16:
+            return SDS_HDR(16,s)->len;
+        case SDS_TYPE_32:
+            return SDS_HDR(32,s)->len;
+        case SDS_TYPE_64:
+            return SDS_HDR(64,s)->len;
+    }
+    return 0;
+}
+
+static inline size_t sdsavail(const sds s) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5: {
+            return 0;
+        }
+        case SDS_TYPE_8: {
+            SDS_HDR_VAR(8,s);
+            return sh->alloc - sh->len;
+        }
+        case SDS_TYPE_16: {
+            SDS_HDR_VAR(16,s);
+            return sh->alloc - sh->len;
+        }
+        case SDS_TYPE_32: {
+            SDS_HDR_VAR(32,s);
+            return sh->alloc - sh->len;
+        }
+        case SDS_TYPE_64: {
+            SDS_HDR_VAR(64,s);
+            return sh->alloc - sh->len;
+        }
+    }
+    return 0;
+}
+
+static inline void sdssetlen(sds s, size_t newlen) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            {
+                unsigned char *fp = ((unsigned char*)s)-1;
+                *fp = (unsigned char)(SDS_TYPE_5 | (newlen << SDS_TYPE_BITS));
+            }
+            break;
+        case SDS_TYPE_8:
+            SDS_HDR(8,s)->len = (uint8_t)newlen;
+            break;
+        case SDS_TYPE_16:
+            SDS_HDR(16,s)->len = (uint16_t)newlen;
+            break;
+        case SDS_TYPE_32:
+            SDS_HDR(32,s)->len = (uint32_t)newlen;
+            break;
+        case SDS_TYPE_64:
+            SDS_HDR(64,s)->len = (uint64_t)newlen;
+            break;
+    }
+}
+
+static inline void sdsinclen(sds s, size_t inc) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            {
+                unsigned char *fp = ((unsigned char*)s)-1;
+                unsigned char newlen = SDS_TYPE_5_LEN(flags)+(unsigned char)inc;
+                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
+            }
+            break;
+        case SDS_TYPE_8:
+            SDS_HDR(8,s)->len += (uint8_t)inc;
+            break;
+        case SDS_TYPE_16:
+            SDS_HDR(16,s)->len += (uint16_t)inc;
+            break;
+        case SDS_TYPE_32:
+            SDS_HDR(32,s)->len += (uint32_t)inc;
+            break;
+        case SDS_TYPE_64:
+            SDS_HDR(64,s)->len += (uint64_t)inc;
+            break;
+    }
+}
+
+/* sdsalloc() = sdsavail() + sdslen() */
+static inline size_t sdsalloc(const sds s) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            return SDS_TYPE_5_LEN(flags);
+        case SDS_TYPE_8:
+            return SDS_HDR(8,s)->alloc;
+        case SDS_TYPE_16:
+            return SDS_HDR(16,s)->alloc;
+        case SDS_TYPE_32:
+            return SDS_HDR(32,s)->alloc;
+        case SDS_TYPE_64:
+            return SDS_HDR(64,s)->alloc;
+    }
+    return 0;
+}
+
+static inline void sdssetalloc(sds s, size_t newlen) {
+    unsigned char flags = s[-1];
+    switch(flags&SDS_TYPE_MASK) {
+        case SDS_TYPE_5:
+            /* Nothing to do, this type has no total allocation info. */
+            break;
+        case SDS_TYPE_8:
+            SDS_HDR(8,s)->alloc = (uint8_t)newlen;
+            break;
+        case SDS_TYPE_16:
+            SDS_HDR(16,s)->alloc = (uint16_t)newlen;
+            break;
+        case SDS_TYPE_32:
+            SDS_HDR(32,s)->alloc = (uint32_t)newlen;
+            break;
+        case SDS_TYPE_64:
+            SDS_HDR(64,s)->alloc = (uint64_t)newlen;
+            break;
+    }
+}
+
+sds sdsnewlen(const void *init, size_t initlen);
+sds sdsnew(const char *init);
+sds sdsempty(void);
+sds sdsdup(const sds s);
+void sdsfree(sds s);
+sds sdsgrowzero(sds s, size_t len);
+sds sdscatlen(sds s, const void *t, size_t len);
+sds sdscat(sds s, const char *t);
+sds sdscatsds(sds s, const sds t);
+sds sdscpylen(sds s, const char *t, size_t len);
+sds sdscpy(sds s, const char *t);
+
+sds sdscatvprintf(sds s, const char *fmt, va_list ap);
+#ifdef __GNUC__
+sds sdscatprintf(sds s, const char *fmt, ...)
+    __attribute__((format(printf, 2, 3)));
+#else
+sds sdscatprintf(sds s, const char *fmt, ...);
+#endif
+
+sds sdscatfmt(sds s, char const *fmt, ...);
+sds sdstrim(sds s, const char *cset);
+int sdsrange(sds s, ssize_t start, ssize_t end);
+void sdsupdatelen(sds s);
+void sdsclear(sds s);
+int sdscmp(const sds s1, const sds s2);
+sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
+void sdsfreesplitres(sds *tokens, int count);
+void sdstolower(sds s);
+void sdstoupper(sds s);
+sds sdsfromlonglong(long long value);
+sds sdscatrepr(sds s, const char *p, size_t len);
+sds *sdssplitargs(const char *line, int *argc);
+sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
+sds sdsjoin(char **argv, int argc, char *sep);
+sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
+
+/* Low level functions exposed to the user API */
+sds sdsMakeRoomFor(sds s, size_t addlen);
+void sdsIncrLen(sds s, int incr);
+sds sdsRemoveFreeSpace(sds s);
+size_t sdsAllocSize(sds s);
+void *sdsAllocPtr(sds s);
+
+/* Export the allocator used by SDS to the program using SDS.
+ * Sometimes the program SDS is linked to, may use a different set of
+ * allocators, but may want to allocate or free things that SDS will
+ * respectively free or allocate. */
+void *sds_malloc(size_t size);
+void *sds_realloc(void *ptr, size_t size);
+void sds_free(void *ptr);
+
+#ifdef REDIS_TEST
+int sdsTest(int argc, char *argv[]);
+#endif
+
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sdsalloc.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sdsalloc.h
new file mode 100644
index 0000000..5538dd9
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sdsalloc.h
@@ -0,0 +1,44 @@
+/* SDSLib 2.0 -- A C dynamic strings library
+ *
+ * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2015, Oran Agra
+ * Copyright (c) 2015, Redis Labs, Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* SDS allocator selection.
+ *
+ * This file is used in order to change the SDS allocator at compile time.
+ * Just define the following defines to what you want to use. Also add
+ * the include of your alternate allocator if needed (not needed in order
+ * to use the default libc allocator). */
+
+#include "alloc.h"
+
+#define s_malloc hi_malloc
+#define s_realloc hi_realloc
+#define s_free hi_free
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sockcompat.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sockcompat.c
new file mode 100644
index 0000000..f99d14b
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sockcompat.c
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2019, Marcus Geelnard <m at bitsnbites dot eu>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define REDIS_SOCKCOMPAT_IMPLEMENTATION
+#include "sockcompat.h"
+
+#ifdef _WIN32
+static int _wsaErrorToErrno(int err) {
+    switch (err) {
+        case WSAEWOULDBLOCK:
+            return EWOULDBLOCK;
+        case WSAEINPROGRESS:
+            return EINPROGRESS;
+        case WSAEALREADY:
+            return EALREADY;
+        case WSAENOTSOCK:
+            return ENOTSOCK;
+        case WSAEDESTADDRREQ:
+            return EDESTADDRREQ;
+        case WSAEMSGSIZE:
+            return EMSGSIZE;
+        case WSAEPROTOTYPE:
+            return EPROTOTYPE;
+        case WSAENOPROTOOPT:
+            return ENOPROTOOPT;
+        case WSAEPROTONOSUPPORT:
+            return EPROTONOSUPPORT;
+        case WSAEOPNOTSUPP:
+            return EOPNOTSUPP;
+        case WSAEAFNOSUPPORT:
+            return EAFNOSUPPORT;
+        case WSAEADDRINUSE:
+            return EADDRINUSE;
+        case WSAEADDRNOTAVAIL:
+            return EADDRNOTAVAIL;
+        case WSAENETDOWN:
+            return ENETDOWN;
+        case WSAENETUNREACH:
+            return ENETUNREACH;
+        case WSAENETRESET:
+            return ENETRESET;
+        case WSAECONNABORTED:
+            return ECONNABORTED;
+        case WSAECONNRESET:
+            return ECONNRESET;
+        case WSAENOBUFS:
+            return ENOBUFS;
+        case WSAEISCONN:
+            return EISCONN;
+        case WSAENOTCONN:
+            return ENOTCONN;
+        case WSAETIMEDOUT:
+            return ETIMEDOUT;
+        case WSAECONNREFUSED:
+            return ECONNREFUSED;
+        case WSAELOOP:
+            return ELOOP;
+        case WSAENAMETOOLONG:
+            return ENAMETOOLONG;
+        case WSAEHOSTUNREACH:
+            return EHOSTUNREACH;
+        case WSAENOTEMPTY:
+            return ENOTEMPTY;
+        default:
+            /* We just return a generic I/O error if we could not find a relevant error. */
+            return EIO;
+    }
+}
+
+static void _updateErrno(int success) {
+    errno = success ? 0 : _wsaErrorToErrno(WSAGetLastError());
+}
+
+static int _initWinsock() {
+    static int s_initialized = 0;
+    if (!s_initialized) {
+        static WSADATA wsadata;
+        int err = WSAStartup(MAKEWORD(2,2), &wsadata);
+        if (err != 0) {
+            errno = _wsaErrorToErrno(err);
+            return 0;
+        }
+        s_initialized = 1;
+    }
+    return 1;
+}
+
+int win32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) {
+    /* Note: This function is likely to be called before other functions, so run init here. */
+    if (!_initWinsock()) {
+        return EAI_FAIL;
+    }
+
+    switch (getaddrinfo(node, service, hints, res)) {
+        case 0:                     return 0;
+        case WSATRY_AGAIN:          return EAI_AGAIN;
+        case WSAEINVAL:             return EAI_BADFLAGS;
+        case WSAEAFNOSUPPORT:       return EAI_FAMILY;
+        case WSA_NOT_ENOUGH_MEMORY: return EAI_MEMORY;
+        case WSAHOST_NOT_FOUND:     return EAI_NONAME;
+        case WSATYPE_NOT_FOUND:     return EAI_SERVICE;
+        case WSAESOCKTNOSUPPORT:    return EAI_SOCKTYPE;
+        default:                    return EAI_FAIL;     /* Including WSANO_RECOVERY */
+    }
+}
+
+const char *win32_gai_strerror(int errcode) {
+    switch (errcode) {
+        case 0:            errcode = 0;                     break;
+        case EAI_AGAIN:    errcode = WSATRY_AGAIN;          break;
+        case EAI_BADFLAGS: errcode = WSAEINVAL;             break;
+        case EAI_FAMILY:   errcode = WSAEAFNOSUPPORT;       break;
+        case EAI_MEMORY:   errcode = WSA_NOT_ENOUGH_MEMORY; break;
+        case EAI_NONAME:   errcode = WSAHOST_NOT_FOUND;     break;
+        case EAI_SERVICE:  errcode = WSATYPE_NOT_FOUND;     break;
+        case EAI_SOCKTYPE: errcode = WSAESOCKTNOSUPPORT;    break;
+        default:           errcode = WSANO_RECOVERY;        break; /* Including EAI_FAIL */
+    }
+    return gai_strerror(errcode);
+}
+
+void win32_freeaddrinfo(struct addrinfo *res) {
+    freeaddrinfo(res);
+}
+
+SOCKET win32_socket(int domain, int type, int protocol) {
+    SOCKET s;
+
+    /* Note: This function is likely to be called before other functions, so run init here. */
+    if (!_initWinsock()) {
+        return INVALID_SOCKET;
+    }
+
+    _updateErrno((s = socket(domain, type, protocol)) != INVALID_SOCKET);
+    return s;
+}
+
+int win32_ioctl(SOCKET fd, unsigned long request, unsigned long *argp) {
+    int ret = ioctlsocket(fd, (long)request, argp);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_bind(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen) {
+    int ret = bind(sockfd, addr, addrlen);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen) {
+    int ret = connect(sockfd, addr, addrlen);
+    _updateErrno(ret != SOCKET_ERROR);
+
+    /* For Winsock connect(), the WSAEWOULDBLOCK error means the same thing as
+     * EINPROGRESS for POSIX connect(), so we do that translation to keep POSIX
+     * logic consistent. */
+    if (errno == EWOULDBLOCK) {
+        errno = EINPROGRESS;
+    }
+
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, socklen_t *optlen) {
+    int ret = 0;
+    if ((level == SOL_SOCKET) && ((optname == SO_RCVTIMEO) || (optname == SO_SNDTIMEO))) {
+        if (*optlen >= sizeof (struct timeval)) {
+            struct timeval *tv = optval;
+            DWORD timeout = 0;
+            socklen_t dwlen = 0;
+            ret = getsockopt(sockfd, level, optname, (char *)&timeout, &dwlen);
+            tv->tv_sec = timeout / 1000;
+            tv->tv_usec = (timeout * 1000) % 1000000;
+        } else {
+            ret = WSAEFAULT;
+        }
+        *optlen = sizeof (struct timeval);
+    } else {
+        ret = getsockopt(sockfd, level, optname, (char*)optval, optlen);
+    }
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_setsockopt(SOCKET sockfd, int level, int optname, const void *optval, socklen_t optlen) {
+    int ret = 0;
+    if ((level == SOL_SOCKET) && ((optname == SO_RCVTIMEO) || (optname == SO_SNDTIMEO))) {
+        const struct timeval *tv = optval;
+        DWORD timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+        ret = setsockopt(sockfd, level, optname, (const char*)&timeout, sizeof(DWORD));
+    } else {
+        ret = setsockopt(sockfd, level, optname, (const char*)optval, optlen);
+    }
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_close(SOCKET fd) {
+    int ret = closesocket(fd);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+ssize_t win32_recv(SOCKET sockfd, void *buf, size_t len, int flags) {
+    int ret = recv(sockfd, (char*)buf, (int)len, flags);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+ssize_t win32_send(SOCKET sockfd, const void *buf, size_t len, int flags) {
+    int ret = send(sockfd, (const char*)buf, (int)len, flags);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+
+int win32_poll(struct pollfd *fds, nfds_t nfds, int timeout) {
+    int ret = WSAPoll(fds, nfds, timeout);
+    _updateErrno(ret != SOCKET_ERROR);
+    return ret != SOCKET_ERROR ? ret : -1;
+}
+#endif /* _WIN32 */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sockcompat.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sockcompat.h
new file mode 100644
index 0000000..85810e8
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/sockcompat.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2019, Marcus Geelnard <m at bitsnbites dot eu>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __SOCKCOMPAT_H
+#define __SOCKCOMPAT_H
+
+#ifndef _WIN32
+/* For POSIX systems we use the standard BSD socket API. */
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <poll.h>
+#else
+/* For Windows we use winsock. */
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600 /* To get WSAPoll etc. */
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <stddef.h>
+#include <errno.h>
+
+#ifdef _MSC_VER
+typedef long long ssize_t;
+#endif
+
+/* Emulate the parts of the BSD socket API that we need (override the winsock signatures). */
+int win32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
+const char *win32_gai_strerror(int errcode);
+void win32_freeaddrinfo(struct addrinfo *res);
+SOCKET win32_socket(int domain, int type, int protocol);
+int win32_ioctl(SOCKET fd, unsigned long request, unsigned long *argp);
+int win32_bind(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
+int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
+int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, socklen_t *optlen);
+int win32_setsockopt(SOCKET sockfd, int level, int optname, const void *optval, socklen_t optlen);
+int win32_close(SOCKET fd);
+ssize_t win32_recv(SOCKET sockfd, void *buf, size_t len, int flags);
+ssize_t win32_send(SOCKET sockfd, const void *buf, size_t len, int flags);
+typedef ULONG nfds_t;
+int win32_poll(struct pollfd *fds, nfds_t nfds, int timeout);
+
+#ifndef REDIS_SOCKCOMPAT_IMPLEMENTATION
+#define getaddrinfo(node, service, hints, res) win32_getaddrinfo(node, service, hints, res)
+#undef gai_strerror
+#define gai_strerror(errcode) win32_gai_strerror(errcode)
+#define freeaddrinfo(res) win32_freeaddrinfo(res)
+#define socket(domain, type, protocol) win32_socket(domain, type, protocol)
+#define ioctl(fd, request, argp) win32_ioctl(fd, request, argp)
+#define bind(sockfd, addr, addrlen) win32_bind(sockfd, addr, addrlen)
+#define connect(sockfd, addr, addrlen) win32_connect(sockfd, addr, addrlen)
+#define getsockopt(sockfd, level, optname, optval, optlen) win32_getsockopt(sockfd, level, optname, optval, optlen)
+#define setsockopt(sockfd, level, optname, optval, optlen) win32_setsockopt(sockfd, level, optname, optval, optlen)
+#define close(fd) win32_close(fd)
+#define recv(sockfd, buf, len, flags) win32_recv(sockfd, buf, len, flags)
+#define send(sockfd, buf, len, flags) win32_send(sockfd, buf, len, flags)
+#define poll(fds, nfds, timeout) win32_poll(fds, nfds, timeout)
+#endif /* REDIS_SOCKCOMPAT_IMPLEMENTATION */
+#endif /* _WIN32 */
+
+#endif /* __SOCKCOMPAT_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/ssl.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/ssl.c
new file mode 100644
index 0000000..7df58fb
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/ssl.c
@@ -0,0 +1,526 @@
+/*
+ * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2019, Redis Labs
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hiredis.h"
+#include "async.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <pthread.h>
+#endif
+
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+#include "win32.h"
+#include "async_private.h"
+#include "hiredis_ssl.h"
+
+void __redisSetError(redisContext *c, int type, const char *str);
+
+struct redisSSLContext {
+    /* Associated OpenSSL SSL_CTX as created by redisCreateSSLContext() */
+    SSL_CTX *ssl_ctx;
+
+    /* Requested SNI, or NULL */
+    char *server_name;
+};
+
+/* The SSL connection context is attached to SSL/TLS connections as a privdata. */
+typedef struct redisSSL {
+    /**
+     * OpenSSL SSL object.
+     */
+    SSL *ssl;
+
+    /**
+     * SSL_write() requires to be called again with the same arguments it was
+     * previously called with in the event of an SSL_read/SSL_write situation
+     */
+    size_t lastLen;
+
+    /** Whether the SSL layer requires read (possibly before a write) */
+    int wantRead;
+
+    /**
+     * Whether a write was requested prior to a read. If set, the write()
+     * should resume whenever a read takes place, if possible
+     */
+    int pendingWrite;
+} redisSSL;
+
+/* Forward declaration */
+redisContextFuncs redisContextSSLFuncs;
+
+/**
+ * OpenSSL global initialization and locking handling callbacks.
+ * Note that this is only required for OpenSSL < 1.1.0.
+ */
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define HIREDIS_USE_CRYPTO_LOCKS
+#endif
+
+#ifdef HIREDIS_USE_CRYPTO_LOCKS
+#ifdef _WIN32
+typedef CRITICAL_SECTION sslLockType;
+static void sslLockInit(sslLockType* l) {
+    InitializeCriticalSection(l);
+}
+static void sslLockAcquire(sslLockType* l) {
+    EnterCriticalSection(l);
+}
+static void sslLockRelease(sslLockType* l) {
+    LeaveCriticalSection(l);
+}
+#else
+typedef pthread_mutex_t sslLockType;
+static void sslLockInit(sslLockType *l) {
+    pthread_mutex_init(l, NULL);
+}
+static void sslLockAcquire(sslLockType *l) {
+    pthread_mutex_lock(l);
+}
+static void sslLockRelease(sslLockType *l) {
+    pthread_mutex_unlock(l);
+}
+#endif
+
+static sslLockType* ossl_locks;
+
+static void opensslDoLock(int mode, int lkid, const char *f, int line) {
+    sslLockType *l = ossl_locks + lkid;
+
+    if (mode & CRYPTO_LOCK) {
+        sslLockAcquire(l);
+    } else {
+        sslLockRelease(l);
+    }
+
+    (void)f;
+    (void)line;
+}
+
+static int initOpensslLocks(void) {
+    unsigned ii, nlocks;
+    if (CRYPTO_get_locking_callback() != NULL) {
+        /* Someone already set the callback before us. Don't destroy it! */
+        return REDIS_OK;
+    }
+    nlocks = CRYPTO_num_locks();
+    ossl_locks = hi_malloc(sizeof(*ossl_locks) * nlocks);
+    if (ossl_locks == NULL)
+        return REDIS_ERR;
+
+    for (ii = 0; ii < nlocks; ii++) {
+        sslLockInit(ossl_locks + ii);
+    }
+    CRYPTO_set_locking_callback(opensslDoLock);
+    return REDIS_OK;
+}
+#endif /* HIREDIS_USE_CRYPTO_LOCKS */
+
+int redisInitOpenSSL(void)
+{
+    SSL_library_init();
+#ifdef HIREDIS_USE_CRYPTO_LOCKS
+    initOpensslLocks();
+#endif
+
+    return REDIS_OK;
+}
+
+/**
+ * redisSSLContext helper context destruction.
+ */
+
+const char *redisSSLContextGetError(redisSSLContextError error)
+{
+    switch (error) {
+        case REDIS_SSL_CTX_NONE:
+            return "No Error";
+        case REDIS_SSL_CTX_CREATE_FAILED:
+            return "Failed to create OpenSSL SSL_CTX";
+        case REDIS_SSL_CTX_CERT_KEY_REQUIRED:
+            return "Client cert and key must both be specified or skipped";
+        case REDIS_SSL_CTX_CA_CERT_LOAD_FAILED:
+            return "Failed to load CA Certificate or CA Path";
+        case REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED:
+            return "Failed to load client certificate";
+        case REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED:
+            return "Failed to load private key";
+        default:
+            return "Unknown error code";
+    }
+}
+
+void redisFreeSSLContext(redisSSLContext *ctx)
+{
+    if (!ctx)
+        return;
+
+    if (ctx->server_name) {
+        hi_free(ctx->server_name);
+        ctx->server_name = NULL;
+    }
+
+    if (ctx->ssl_ctx) {
+        SSL_CTX_free(ctx->ssl_ctx);
+        ctx->ssl_ctx = NULL;
+    }
+
+    hi_free(ctx);
+}
+
+
+/**
+ * redisSSLContext helper context initialization.
+ */
+
+redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
+        const char *cert_filename, const char *private_key_filename,
+        const char *server_name, redisSSLContextError *error)
+{
+    redisSSLContext *ctx = hi_calloc(1, sizeof(redisSSLContext));
+    if (ctx == NULL)
+        goto error;
+
+    ctx->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+    if (!ctx->ssl_ctx) {
+        if (error) *error = REDIS_SSL_CTX_CREATE_FAILED;
+        goto error;
+    }
+
+    SSL_CTX_set_options(ctx->ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+    SSL_CTX_set_verify(ctx->ssl_ctx, SSL_VERIFY_PEER, NULL);
+
+    if ((cert_filename != NULL && private_key_filename == NULL) ||
+            (private_key_filename != NULL && cert_filename == NULL)) {
+        if (error) *error = REDIS_SSL_CTX_CERT_KEY_REQUIRED;
+        goto error;
+    }
+
+    if (capath || cacert_filename) {
+        if (!SSL_CTX_load_verify_locations(ctx->ssl_ctx, cacert_filename, capath)) {
+            if (error) *error = REDIS_SSL_CTX_CA_CERT_LOAD_FAILED;
+            goto error;
+        }
+    }
+
+    if (cert_filename) {
+        if (!SSL_CTX_use_certificate_chain_file(ctx->ssl_ctx, cert_filename)) {
+            if (error) *error = REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED;
+            goto error;
+        }
+        if (!SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, private_key_filename, SSL_FILETYPE_PEM)) {
+            if (error) *error = REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED;
+            goto error;
+        }
+    }
+
+    if (server_name)
+        ctx->server_name = hi_strdup(server_name);
+
+    return ctx;
+
+error:
+    redisFreeSSLContext(ctx);
+    return NULL;
+}
+
+/**
+ * SSL Connection initialization.
+ */
+
+
+static int redisSSLConnect(redisContext *c, SSL *ssl) {
+    if (c->privctx) {
+        __redisSetError(c, REDIS_ERR_OTHER, "redisContext was already associated");
+        return REDIS_ERR;
+    }
+
+    redisSSL *rssl = hi_calloc(1, sizeof(redisSSL));
+    if (rssl == NULL) {
+        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+        return REDIS_ERR;
+    }
+
+    c->funcs = &redisContextSSLFuncs;
+    rssl->ssl = ssl;
+
+    SSL_set_mode(rssl->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+    SSL_set_fd(rssl->ssl, c->fd);
+    SSL_set_connect_state(rssl->ssl);
+
+    ERR_clear_error();
+    int rv = SSL_connect(rssl->ssl);
+    if (rv == 1) {
+        c->privctx = rssl;
+        return REDIS_OK;
+    }
+
+    rv = SSL_get_error(rssl->ssl, rv);
+    if (((c->flags & REDIS_BLOCK) == 0) &&
+        (rv == SSL_ERROR_WANT_READ || rv == SSL_ERROR_WANT_WRITE)) {
+        c->privctx = rssl;
+        return REDIS_OK;
+    }
+
+    if (c->err == 0) {
+        char err[512];
+        if (rv == SSL_ERROR_SYSCALL)
+            snprintf(err,sizeof(err)-1,"SSL_connect failed: %s",strerror(errno));
+        else {
+            unsigned long e = ERR_peek_last_error();
+            snprintf(err,sizeof(err)-1,"SSL_connect failed: %s",
+                    ERR_reason_error_string(e));
+        }
+        __redisSetError(c, REDIS_ERR_IO, err);
+    }
+
+    hi_free(rssl);
+    return REDIS_ERR;
+}
+
+/**
+ * A wrapper around redisSSLConnect() for users who manage their own context and
+ * create their own SSL object.
+ */
+
+int redisInitiateSSL(redisContext *c, SSL *ssl) {
+    return redisSSLConnect(c, ssl);
+}
+
+/**
+ * A wrapper around redisSSLConnect() for users who use redisSSLContext and don't
+ * manage their own SSL objects.
+ */
+
+int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx)
+{
+    if (!c || !redis_ssl_ctx)
+        return REDIS_ERR;
+
+    /* We want to verify that redisSSLConnect() won't fail on this, as it will
+     * not own the SSL object in that case and we'll end up leaking.
+     */
+    if (c->privctx)
+        return REDIS_ERR;
+
+    SSL *ssl = SSL_new(redis_ssl_ctx->ssl_ctx);
+    if (!ssl) {
+        __redisSetError(c, REDIS_ERR_OTHER, "Couldn't create new SSL instance");
+        goto error;
+    }
+
+    if (redis_ssl_ctx->server_name) {
+        if (!SSL_set_tlsext_host_name(ssl, redis_ssl_ctx->server_name)) {
+            __redisSetError(c, REDIS_ERR_OTHER, "Failed to set server_name/SNI");
+            goto error;
+        }
+    }
+
+    return redisSSLConnect(c, ssl);
+
+error:
+    if (ssl)
+        SSL_free(ssl);
+    return REDIS_ERR;
+}
+
+static int maybeCheckWant(redisSSL *rssl, int rv) {
+    /**
+     * If the error is WANT_READ or WANT_WRITE, the appropriate flags are set
+     * and true is returned. False is returned otherwise
+     */
+    if (rv == SSL_ERROR_WANT_READ) {
+        rssl->wantRead = 1;
+        return 1;
+    } else if (rv == SSL_ERROR_WANT_WRITE) {
+        rssl->pendingWrite = 1;
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+/**
+ * Implementation of redisContextFuncs for SSL connections.
+ */
+
+static void redisSSLFree(void *privctx){
+    redisSSL *rsc = privctx;
+
+    if (!rsc) return;
+    if (rsc->ssl) {
+        SSL_free(rsc->ssl);
+        rsc->ssl = NULL;
+    }
+    hi_free(rsc);
+}
+
+static ssize_t redisSSLRead(redisContext *c, char *buf, size_t bufcap) {
+    redisSSL *rssl = c->privctx;
+
+    int nread = SSL_read(rssl->ssl, buf, bufcap);
+    if (nread > 0) {
+        return nread;
+    } else if (nread == 0) {
+        __redisSetError(c, REDIS_ERR_EOF, "Server closed the connection");
+        return -1;
+    } else {
+        int err = SSL_get_error(rssl->ssl, nread);
+        if (c->flags & REDIS_BLOCK) {
+            /**
+             * In blocking mode, we should never end up in a situation where
+             * we get an error without it being an actual error, except
+             * in the case of EINTR, which can be spuriously received from
+             * debuggers or whatever.
+             */
+            if (errno == EINTR) {
+                return 0;
+            } else {
+                const char *msg = NULL;
+                if (errno == EAGAIN) {
+                    msg = "Resource temporarily unavailable";
+                }
+                __redisSetError(c, REDIS_ERR_IO, msg);
+                return -1;
+            }
+        }
+
+        /**
+         * We can very well get an EWOULDBLOCK/EAGAIN, however
+         */
+        if (maybeCheckWant(rssl, err)) {
+            return 0;
+        } else {
+            __redisSetError(c, REDIS_ERR_IO, NULL);
+            return -1;
+        }
+    }
+}
+
+static ssize_t redisSSLWrite(redisContext *c) {
+    redisSSL *rssl = c->privctx;
+
+    size_t len = rssl->lastLen ? rssl->lastLen : sdslen(c->obuf);
+    int rv = SSL_write(rssl->ssl, c->obuf, len);
+
+    if (rv > 0) {
+        rssl->lastLen = 0;
+    } else if (rv < 0) {
+        rssl->lastLen = len;
+
+        int err = SSL_get_error(rssl->ssl, rv);
+        if ((c->flags & REDIS_BLOCK) == 0 && maybeCheckWant(rssl, err)) {
+            return 0;
+        } else {
+            __redisSetError(c, REDIS_ERR_IO, NULL);
+            return -1;
+        }
+    }
+    return rv;
+}
+
+static void redisSSLAsyncRead(redisAsyncContext *ac) {
+    int rv;
+    redisSSL *rssl = ac->c.privctx;
+    redisContext *c = &ac->c;
+
+    rssl->wantRead = 0;
+
+    if (rssl->pendingWrite) {
+        int done;
+
+        /* This is probably just a write event */
+        rssl->pendingWrite = 0;
+        rv = redisBufferWrite(c, &done);
+        if (rv == REDIS_ERR) {
+            __redisAsyncDisconnect(ac);
+            return;
+        } else if (!done) {
+            _EL_ADD_WRITE(ac);
+        }
+    }
+
+    rv = redisBufferRead(c);
+    if (rv == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+    } else {
+        _EL_ADD_READ(ac);
+        redisProcessCallbacks(ac);
+    }
+}
+
+static void redisSSLAsyncWrite(redisAsyncContext *ac) {
+    int rv, done = 0;
+    redisSSL *rssl = ac->c.privctx;
+    redisContext *c = &ac->c;
+
+    rssl->pendingWrite = 0;
+    rv = redisBufferWrite(c, &done);
+    if (rv == REDIS_ERR) {
+        __redisAsyncDisconnect(ac);
+        return;
+    }
+
+    if (!done) {
+        if (rssl->wantRead) {
+            /* Need to read-before-write */
+            rssl->pendingWrite = 1;
+            _EL_DEL_WRITE(ac);
+        } else {
+            /* No extra reads needed, just need to write more */
+            _EL_ADD_WRITE(ac);
+        }
+    } else {
+        /* Already done! */
+        _EL_DEL_WRITE(ac);
+    }
+
+    /* Always reschedule a read */
+    _EL_ADD_READ(ac);
+}
+
+redisContextFuncs redisContextSSLFuncs = {
+    .free_privctx = redisSSLFree,
+    .async_read = redisSSLAsyncRead,
+    .async_write = redisSSLAsyncWrite,
+    .read = redisSSLRead,
+    .write = redisSSLWrite
+};
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/test.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/test.c
new file mode 100644
index 0000000..c0eeca7
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/test.c
@@ -0,0 +1,1387 @@
+#include "fmacros.h"
+#include "sockcompat.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifndef _WIN32
+#include <strings.h>
+#include <sys/time.h>
+#endif
+#include <assert.h>
+#include <signal.h>
+#include <errno.h>
+#include <limits.h>
+
+#include "hiredis.h"
+#include "async.h"
+#ifdef HIREDIS_TEST_SSL
+#include "hiredis_ssl.h"
+#endif
+#include "net.h"
+#include "win32.h"
+
+enum connection_type {
+    CONN_TCP,
+    CONN_UNIX,
+    CONN_FD,
+    CONN_SSL
+};
+
+struct config {
+    enum connection_type type;
+
+    struct {
+        const char *host;
+        int port;
+        struct timeval timeout;
+    } tcp;
+
+    struct {
+        const char *path;
+    } unix_sock;
+
+    struct {
+        const char *host;
+        int port;
+        const char *ca_cert;
+        const char *cert;
+        const char *key;
+    } ssl;
+};
+
+struct privdata {
+    int dtor_counter;
+};
+
+#ifdef HIREDIS_TEST_SSL
+redisSSLContext *_ssl_ctx = NULL;
+#endif
+
+/* The following lines make up our testing "framework" :) */
+static int tests = 0, fails = 0, skips = 0;
+#define test(_s) { printf("#%02d ", ++tests); printf(_s); }
+#define test_cond(_c) if(_c) printf("\033[0;32mPASSED\033[0;0m\n"); else {printf("\033[0;31mFAILED\033[0;0m\n"); fails++;}
+#define test_skipped() { printf("\033[01;33mSKIPPED\033[0;0m\n"); skips++; }
+
+static long long usec(void) {
+#ifndef _MSC_VER
+    struct timeval tv;
+    gettimeofday(&tv,NULL);
+    return (((long long)tv.tv_sec)*1000000)+tv.tv_usec;
+#else
+    FILETIME ft;
+    GetSystemTimeAsFileTime(&ft);
+    return (((long long)ft.dwHighDateTime << 32) | ft.dwLowDateTime) / 10;
+#endif
+}
+
+/* The assert() calls below have side effects, so we need assert()
+ * even if we are compiling without asserts (-DNDEBUG). */
+#ifdef NDEBUG
+#undef assert
+#define assert(e) (void)(e)
+#endif
+
+/* Helper to extract Redis version information.  Aborts on any failure. */
+#define REDIS_VERSION_FIELD "redis_version:"
+void get_redis_version(redisContext *c, int *majorptr, int *minorptr) {
+    redisReply *reply;
+    char *eptr, *s, *e;
+    int major, minor;
+
+    reply = redisCommand(c, "INFO");
+    if (reply == NULL || c->err || reply->type != REDIS_REPLY_STRING)
+        goto abort;
+    if ((s = strstr(reply->str, REDIS_VERSION_FIELD)) == NULL)
+        goto abort;
+
+    s += strlen(REDIS_VERSION_FIELD);
+
+    /* We need a field terminator and at least 'x.y.z' (5) bytes of data */
+    if ((e = strstr(s, "\r\n")) == NULL || (e - s) < 5)
+        goto abort;
+
+    /* Extract version info */
+    major = strtol(s, &eptr, 10);
+    if (*eptr != '.') goto abort;
+    minor = strtol(eptr+1, NULL, 10);
+
+    /* Push info the caller wants */
+    if (majorptr) *majorptr = major;
+    if (minorptr) *minorptr = minor;
+
+    freeReplyObject(reply);
+    return;
+
+abort:
+    freeReplyObject(reply);
+    fprintf(stderr, "Error:  Cannot determine Redis version, aborting\n");
+    exit(1);
+}
+
+static redisContext *select_database(redisContext *c) {
+    redisReply *reply;
+
+    /* Switch to DB 9 for testing, now that we know we can chat. */
+    reply = redisCommand(c,"SELECT 9");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+
+    /* Make sure the DB is emtpy */
+    reply = redisCommand(c,"DBSIZE");
+    assert(reply != NULL);
+    if (reply->type == REDIS_REPLY_INTEGER && reply->integer == 0) {
+        /* Awesome, DB 9 is empty and we can continue. */
+        freeReplyObject(reply);
+    } else {
+        printf("Database #9 is not empty, test can not continue\n");
+        exit(1);
+    }
+
+    return c;
+}
+
+/* Switch protocol */
+static void send_hello(redisContext *c, int version) {
+    redisReply *reply;
+    int expected;
+
+    reply = redisCommand(c, "HELLO %d", version);
+    expected = version == 3 ? REDIS_REPLY_MAP : REDIS_REPLY_ARRAY;
+    assert(reply != NULL && reply->type == expected);
+    freeReplyObject(reply);
+}
+
+/* Togggle client tracking */
+static void send_client_tracking(redisContext *c, const char *str) {
+    redisReply *reply;
+
+    reply = redisCommand(c, "CLIENT TRACKING %s", str);
+    assert(reply != NULL && reply->type == REDIS_REPLY_STATUS);
+    freeReplyObject(reply);
+}
+
+static int disconnect(redisContext *c, int keep_fd) {
+    redisReply *reply;
+
+    /* Make sure we're on DB 9. */
+    reply = redisCommand(c,"SELECT 9");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+    reply = redisCommand(c,"FLUSHDB");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+
+    /* Free the context as well, but keep the fd if requested. */
+    if (keep_fd)
+        return redisFreeKeepFd(c);
+    redisFree(c);
+    return -1;
+}
+
+static void do_ssl_handshake(redisContext *c) {
+#ifdef HIREDIS_TEST_SSL
+    redisInitiateSSLWithContext(c, _ssl_ctx);
+    if (c->err) {
+        printf("SSL error: %s\n", c->errstr);
+        redisFree(c);
+        exit(1);
+    }
+#else
+    (void) c;
+#endif
+}
+
+static redisContext *do_connect(struct config config) {
+    redisContext *c = NULL;
+
+    if (config.type == CONN_TCP) {
+        c = redisConnect(config.tcp.host, config.tcp.port);
+    } else if (config.type == CONN_SSL) {
+        c = redisConnect(config.ssl.host, config.ssl.port);
+    } else if (config.type == CONN_UNIX) {
+        c = redisConnectUnix(config.unix_sock.path);
+    } else if (config.type == CONN_FD) {
+        /* Create a dummy connection just to get an fd to inherit */
+        redisContext *dummy_ctx = redisConnectUnix(config.unix_sock.path);
+        if (dummy_ctx) {
+            int fd = disconnect(dummy_ctx, 1);
+            printf("Connecting to inherited fd %d\n", fd);
+            c = redisConnectFd(fd);
+        }
+    } else {
+        assert(NULL);
+    }
+
+    if (c == NULL) {
+        printf("Connection error: can't allocate redis context\n");
+        exit(1);
+    } else if (c->err) {
+        printf("Connection error: %s\n", c->errstr);
+        redisFree(c);
+        exit(1);
+    }
+
+    if (config.type == CONN_SSL) {
+        do_ssl_handshake(c);
+    }
+
+    return select_database(c);
+}
+
+static void do_reconnect(redisContext *c, struct config config) {
+    redisReconnect(c);
+
+    if (config.type == CONN_SSL) {
+        do_ssl_handshake(c);
+    }
+}
+
+static void test_format_commands(void) {
+    char *cmd;
+    int len;
+
+    test("Format command without interpolation: ");
+    len = redisFormatCommand(&cmd,"SET foo bar");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    hi_free(cmd);
+
+    test("Format command with %%s string interpolation: ");
+    len = redisFormatCommand(&cmd,"SET %s %s","foo","bar");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    hi_free(cmd);
+
+    test("Format command with %%s and an empty string: ");
+    len = redisFormatCommand(&cmd,"SET %s %s","foo","");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
+    hi_free(cmd);
+
+    test("Format command with an empty string in between proper interpolations: ");
+    len = redisFormatCommand(&cmd,"SET %s %s","","foo");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$0\r\n\r\n$3\r\nfoo\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(0+2)+4+(3+2));
+    hi_free(cmd);
+
+    test("Format command with %%b string interpolation: ");
+    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"b\0r",(size_t)3);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nb\0r\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    hi_free(cmd);
+
+    test("Format command with %%b and an empty string: ");
+    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"",(size_t)0);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
+    hi_free(cmd);
+
+    test("Format command with literal %%: ");
+    len = redisFormatCommand(&cmd,"SET %% %%");
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$1\r\n%\r\n$1\r\n%\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(1+2)+4+(1+2));
+    hi_free(cmd);
+
+    /* Vararg width depends on the type. These tests make sure that the
+     * width is correctly determined using the format and subsequent varargs
+     * can correctly be interpolated. */
+#define INTEGER_WIDTH_TEST(fmt, type) do {                                                \
+    type value = 123;                                                                     \
+    test("Format command with printf-delegation (" #type "): ");                          \
+    len = redisFormatCommand(&cmd,"key:%08" fmt " str:%s", value, "hello");               \
+    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",len) == 0 && \
+        len == 4+5+(12+2)+4+(9+2));                                                       \
+    hi_free(cmd);                                                                         \
+} while(0)
+
+#define FLOAT_WIDTH_TEST(type) do {                                                       \
+    type value = 123.0;                                                                   \
+    test("Format command with printf-delegation (" #type "): ");                          \
+    len = redisFormatCommand(&cmd,"key:%08.3f str:%s", value, "hello");                   \
+    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",len) == 0 && \
+        len == 4+5+(12+2)+4+(9+2));                                                       \
+    hi_free(cmd);                                                                         \
+} while(0)
+
+    INTEGER_WIDTH_TEST("d", int);
+    INTEGER_WIDTH_TEST("hhd", char);
+    INTEGER_WIDTH_TEST("hd", short);
+    INTEGER_WIDTH_TEST("ld", long);
+    INTEGER_WIDTH_TEST("lld", long long);
+    INTEGER_WIDTH_TEST("u", unsigned int);
+    INTEGER_WIDTH_TEST("hhu", unsigned char);
+    INTEGER_WIDTH_TEST("hu", unsigned short);
+    INTEGER_WIDTH_TEST("lu", unsigned long);
+    INTEGER_WIDTH_TEST("llu", unsigned long long);
+    FLOAT_WIDTH_TEST(float);
+    FLOAT_WIDTH_TEST(double);
+
+    test("Format command with invalid printf format: ");
+    len = redisFormatCommand(&cmd,"key:%08p %b",(void*)1234,"foo",(size_t)3);
+    test_cond(len == -1);
+
+    const char *argv[3];
+    argv[0] = "SET";
+    argv[1] = "foo\0xxx";
+    argv[2] = "bar";
+    size_t lens[3] = { 3, 7, 3 };
+    int argc = 3;
+
+    test("Format command by passing argc/argv without lengths: ");
+    len = redisFormatCommandArgv(&cmd,argc,argv,NULL);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    hi_free(cmd);
+
+    test("Format command by passing argc/argv with lengths: ");
+    len = redisFormatCommandArgv(&cmd,argc,argv,lens);
+    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
+    hi_free(cmd);
+
+    sds sds_cmd;
+
+    sds_cmd = NULL;
+    test("Format command into sds by passing argc/argv without lengths: ");
+    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,NULL);
+    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
+    sdsfree(sds_cmd);
+
+    sds_cmd = NULL;
+    test("Format command into sds by passing argc/argv with lengths: ");
+    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,lens);
+    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
+        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
+    sdsfree(sds_cmd);
+}
+
+static void test_append_formatted_commands(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    char *cmd;
+    int len;
+
+    c = do_connect(config);
+
+    test("Append format command: ");
+
+    len = redisFormatCommand(&cmd, "SET foo bar");
+
+    test_cond(redisAppendFormattedCommand(c, cmd, len) == REDIS_OK);
+
+    assert(redisGetReply(c, (void*)&reply) == REDIS_OK);
+
+    hi_free(cmd);
+    freeReplyObject(reply);
+
+    disconnect(c, 0);
+}
+
+static void test_reply_reader(void) {
+    redisReader *reader;
+    void *reply, *root;
+    int ret;
+    int i;
+
+    test("Error handling in reply parser: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"@foo\r\n",6);
+    ret = redisReaderGetReply(reader,NULL);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
+    redisReaderFree(reader);
+
+    /* when the reply already contains multiple items, they must be free'd
+     * on an error. valgrind will bark when this doesn't happen. */
+    test("Memory cleanup in reply parser: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"*2\r\n",4);
+    redisReaderFeed(reader,(char*)"$5\r\nhello\r\n",11);
+    redisReaderFeed(reader,(char*)"@foo\r\n",6);
+    ret = redisReaderGetReply(reader,NULL);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
+    redisReaderFree(reader);
+
+    reader = redisReaderCreate();
+    test("Can handle arbitrarily nested multi-bulks: ");
+    for (i = 0; i < 128; i++) {
+        redisReaderFeed(reader,(char*)"*1\r\n", 4);
+    }
+    redisReaderFeed(reader,(char*)"$6\r\nLOLWUT\r\n",12);
+    ret = redisReaderGetReply(reader,&reply);
+    root = reply; /* Keep track of the root reply */
+    test_cond(ret == REDIS_OK &&
+        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
+        ((redisReply*)reply)->elements == 1);
+
+    test("Can parse arbitrarily nested multi-bulks correctly: ");
+    while(i--) {
+        assert(reply != NULL && ((redisReply*)reply)->type == REDIS_REPLY_ARRAY);
+        reply = ((redisReply*)reply)->element[0];
+    }
+    test_cond(((redisReply*)reply)->type == REDIS_REPLY_STRING &&
+        !memcmp(((redisReply*)reply)->str, "LOLWUT", 6));
+    freeReplyObject(root);
+    redisReaderFree(reader);
+
+    test("Correctly parses LLONG_MAX: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, ":9223372036854775807\r\n",22);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
+            ((redisReply*)reply)->integer == LLONG_MAX);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when > LLONG_MAX: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, ":9223372036854775808\r\n",22);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Bad integer value") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Correctly parses LLONG_MIN: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, ":-9223372036854775808\r\n",23);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
+            ((redisReply*)reply)->integer == LLONG_MIN);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when < LLONG_MIN: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, ":-9223372036854775809\r\n",23);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Bad integer value") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when array < -1: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, "*-2\r\n+asdf\r\n",12);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when bulk < -1: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, "$-2\r\nasdf\r\n",11);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Can configure maximum multi-bulk elements: ");
+    reader = redisReaderCreate();
+    reader->maxelements = 1024;
+    redisReaderFeed(reader, "*1025\r\n", 7);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+              strcasecmp(reader->errstr, "Multi-bulk length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+#if LLONG_MAX > SIZE_MAX
+    test("Set error when array > SIZE_MAX: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, "*9223372036854775807\r\n+asdf\r\n",29);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+            strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    test("Set error when bulk > SIZE_MAX: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader, "$9223372036854775807\r\nasdf\r\n",28);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR &&
+            strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+#endif
+
+    test("Works with NULL functions for reply: ");
+    reader = redisReaderCreate();
+    reader->fn = NULL;
+    redisReaderFeed(reader,(char*)"+OK\r\n",5);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
+    redisReaderFree(reader);
+
+    test("Works when a single newline (\\r\\n) covers two calls to feed: ");
+    reader = redisReaderCreate();
+    reader->fn = NULL;
+    redisReaderFeed(reader,(char*)"+OK\r",4);
+    ret = redisReaderGetReply(reader,&reply);
+    assert(ret == REDIS_OK && reply == NULL);
+    redisReaderFeed(reader,(char*)"\n",1);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
+    redisReaderFree(reader);
+
+    test("Don't reset state after protocol error: ");
+    reader = redisReaderCreate();
+    reader->fn = NULL;
+    redisReaderFeed(reader,(char*)"x",1);
+    ret = redisReaderGetReply(reader,&reply);
+    assert(ret == REDIS_ERR);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_ERR && reply == NULL);
+    redisReaderFree(reader);
+
+    /* Regression test for issue #45 on GitHub. */
+    test("Don't do empty allocation for empty multi bulk: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"*0\r\n",4);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
+        ((redisReply*)reply)->elements == 0);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    /* RESP3 verbatim strings (GitHub issue #802) */
+    test("Can parse RESP3 verbatim strings: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)"=10\r\ntxt:LOLWUT\r\n",17);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+        ((redisReply*)reply)->type == REDIS_REPLY_VERB &&
+         !memcmp(((redisReply*)reply)->str,"LOLWUT", 6));
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+
+    /* RESP3 push messages (Github issue #815) */
+    test("Can parse RESP3 push messages: ");
+    reader = redisReaderCreate();
+    redisReaderFeed(reader,(char*)">2\r\n$6\r\nLOLWUT\r\n:42\r\n",21);
+    ret = redisReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK &&
+        ((redisReply*)reply)->type == REDIS_REPLY_PUSH &&
+        ((redisReply*)reply)->elements == 2 &&
+        ((redisReply*)reply)->element[0]->type == REDIS_REPLY_STRING &&
+        !memcmp(((redisReply*)reply)->element[0]->str,"LOLWUT",6) &&
+        ((redisReply*)reply)->element[1]->type == REDIS_REPLY_INTEGER &&
+        ((redisReply*)reply)->element[1]->integer == 42);
+    freeReplyObject(reply);
+    redisReaderFree(reader);
+}
+
+static void test_free_null(void) {
+    void *redisCtx = NULL;
+    void *reply = NULL;
+
+    test("Don't fail when redisFree is passed a NULL value: ");
+    redisFree(redisCtx);
+    test_cond(redisCtx == NULL);
+
+    test("Don't fail when freeReplyObject is passed a NULL value: ");
+    freeReplyObject(reply);
+    test_cond(reply == NULL);
+}
+
+static void *hi_malloc_fail(size_t size) {
+    (void)size;
+    return NULL;
+}
+
+static void *hi_calloc_fail(size_t nmemb, size_t size) {
+    (void)nmemb;
+    (void)size;
+    return NULL;
+}
+
+static void *hi_realloc_fail(void *ptr, size_t size) {
+    (void)ptr;
+    (void)size;
+    return NULL;
+}
+
+static void test_allocator_injection(void) {
+    hiredisAllocFuncs ha = {
+        .mallocFn = hi_malloc_fail,
+        .callocFn = hi_calloc_fail,
+        .reallocFn = hi_realloc_fail,
+        .strdupFn = strdup,
+        .freeFn = free,
+    };
+
+    // Override hiredis allocators
+    hiredisSetAllocators(&ha);
+
+    test("redisContext uses injected allocators: ");
+    redisContext *c = redisConnect("localhost", 6379);
+    test_cond(c == NULL);
+
+    test("redisReader uses injected allocators: ");
+    redisReader *reader = redisReaderCreate();
+    test_cond(reader == NULL);
+
+    // Return allocators to default
+    hiredisResetAllocators();
+}
+
+#define HIREDIS_BAD_DOMAIN "idontexist-noreally.com"
+static void test_blocking_connection_errors(void) {
+    redisContext *c;
+    struct addrinfo hints = {.ai_family = AF_INET};
+    struct addrinfo *ai_tmp = NULL;
+
+    int rv = getaddrinfo(HIREDIS_BAD_DOMAIN, "6379", &hints, &ai_tmp);
+    if (rv != 0) {
+        // Address does *not* exist
+        test("Returns error when host cannot be resolved: ");
+        // First see if this domain name *actually* resolves to NXDOMAIN
+        c = redisConnect(HIREDIS_BAD_DOMAIN, 6379);
+        test_cond(
+            c->err == REDIS_ERR_OTHER &&
+            (strcmp(c->errstr, "Name or service not known") == 0 ||
+             strcmp(c->errstr, "Can't resolve: " HIREDIS_BAD_DOMAIN) == 0 ||
+             strcmp(c->errstr, "Name does not resolve") == 0 ||
+             strcmp(c->errstr, "nodename nor servname provided, or not known") == 0 ||
+             strcmp(c->errstr, "No address associated with hostname") == 0 ||
+             strcmp(c->errstr, "Temporary failure in name resolution") == 0 ||
+             strcmp(c->errstr, "hostname nor servname provided, or not known") == 0 ||
+             strcmp(c->errstr, "no address associated with name") == 0 ||
+             strcmp(c->errstr, "No such host is known. ") == 0));
+        redisFree(c);
+    } else {
+        printf("Skipping NXDOMAIN test. Found evil ISP!\n");
+        freeaddrinfo(ai_tmp);
+    }
+
+#ifndef _WIN32
+    test("Returns error when the port is not open: ");
+    c = redisConnect((char*)"localhost", 1);
+    test_cond(c->err == REDIS_ERR_IO &&
+        strcmp(c->errstr,"Connection refused") == 0);
+    redisFree(c);
+
+    test("Returns error when the unix_sock socket path doesn't accept connections: ");
+    c = redisConnectUnix((char*)"/tmp/idontexist.sock");
+    test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
+    redisFree(c);
+#endif
+}
+
+/* Dummy push handler */
+void push_handler(void *privdata, void *reply) {
+    int *counter = privdata;
+    freeReplyObject(reply);
+    *counter += 1;
+}
+
+/* Dummy function just to test setting a callback with redisOptions */
+void push_handler_async(redisAsyncContext *ac, void *reply) {
+    (void)ac;
+    (void)reply;
+}
+
+static void test_resp3_push_handler(redisContext *c) {
+    redisPushFn *old = NULL;
+    redisReply *reply;
+    void *privdata;
+    int n = 0;
+
+    /* Switch to RESP3 and turn on client tracking */
+    send_hello(c, 3);
+    send_client_tracking(c, "ON");
+    privdata = c->privdata;
+    c->privdata = &n;
+
+    reply = redisCommand(c, "GET key:0");
+    assert(reply != NULL);
+    freeReplyObject(reply);
+
+    test("RESP3 PUSH messages are handled out of band by default: ");
+    reply = redisCommand(c, "SET key:0 val:0");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS);
+    freeReplyObject(reply);
+
+    assert((reply = redisCommand(c, "GET key:0")) != NULL);
+    freeReplyObject(reply);
+
+    old = redisSetPushCallback(c, push_handler);
+    test("We can set a custom RESP3 PUSH handler: ");
+    reply = redisCommand(c, "SET key:0 val:0");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && n == 1);
+    freeReplyObject(reply);
+
+    /* Unset the push callback and generate an invalidate message making
+     * sure it is not handled out of band. */
+    test("With no handler, PUSH replies come in-band: ");
+    redisSetPushCallback(c, NULL);
+    assert((reply = redisCommand(c, "GET key:0")) != NULL);
+    freeReplyObject(reply);
+    assert((reply = redisCommand(c, "SET key:0 invalid")) != NULL);
+    test_cond(reply->type == REDIS_REPLY_PUSH);
+    freeReplyObject(reply);
+
+    test("With no PUSH handler, no replies are lost: ");
+    assert(redisGetReply(c, (void**)&reply) == REDIS_OK);
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS);
+    freeReplyObject(reply);
+
+    /* Return to the originally set PUSH handler */
+    assert(old != NULL);
+    redisSetPushCallback(c, old);
+
+    /* Switch back to RESP2 and disable tracking */
+    c->privdata = privdata;
+    send_client_tracking(c, "OFF");
+    send_hello(c, 2);
+}
+
+redisOptions get_redis_tcp_options(struct config config) {
+    redisOptions options = {0};
+    REDIS_OPTIONS_SET_TCP(&options, config.tcp.host, config.tcp.port);
+    return options;
+}
+
+static void test_resp3_push_options(struct config config) {
+    redisAsyncContext *ac;
+    redisContext *c;
+    redisOptions options;
+
+    test("We set a default RESP3 handler for redisContext: ");
+    options = get_redis_tcp_options(config);
+    assert((c = redisConnectWithOptions(&options)) != NULL);
+    test_cond(c->push_cb != NULL);
+    redisFree(c);
+
+    test("We don't set a default RESP3 push handler for redisAsyncContext: ");
+    options = get_redis_tcp_options(config);
+    assert((ac = redisAsyncConnectWithOptions(&options)) != NULL);
+    test_cond(ac->c.push_cb == NULL);
+    redisAsyncFree(ac);
+
+    test("Our REDIS_OPT_NO_PUSH_AUTOFREE flag works: ");
+    options = get_redis_tcp_options(config);
+    options.options |= REDIS_OPT_NO_PUSH_AUTOFREE;
+    assert((c = redisConnectWithOptions(&options)) != NULL);
+    test_cond(c->push_cb == NULL);
+    redisFree(c);
+
+    test("We can use redisOptions to set a custom PUSH handler for redisContext: ");
+    options = get_redis_tcp_options(config);
+    options.push_cb = push_handler;
+    assert((c = redisConnectWithOptions(&options)) != NULL);
+    test_cond(c->push_cb == push_handler);
+    redisFree(c);
+
+    test("We can use redisOptions to set a custom PUSH handler for redisAsyncContext: ");
+    options = get_redis_tcp_options(config);
+    options.async_push_cb = push_handler_async;
+    assert((ac = redisAsyncConnectWithOptions(&options)) != NULL);
+    test_cond(ac->push_cb == push_handler_async);
+    redisAsyncFree(ac);
+}
+
+void free_privdata(void *privdata) {
+    struct privdata *data = privdata;
+    data->dtor_counter++;
+}
+
+static void test_privdata_hooks(struct config config) {
+    struct privdata data = {0};
+    redisOptions options;
+    redisContext *c;
+
+    test("We can use redisOptions to set privdata: ");
+    options = get_redis_tcp_options(config);
+    REDIS_OPTIONS_SET_PRIVDATA(&options, &data, free_privdata);
+    assert((c = redisConnectWithOptions(&options)) != NULL);
+    test_cond(c->privdata == &data);
+
+    test("Our privdata destructor fires when we free the context: ");
+    redisFree(c);
+    test_cond(data.dtor_counter == 1);
+}
+
+static void test_blocking_connection(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    int major;
+
+    c = do_connect(config);
+
+    test("Is able to deliver commands: ");
+    reply = redisCommand(c,"PING");
+    test_cond(reply->type == REDIS_REPLY_STATUS &&
+        strcasecmp(reply->str,"pong") == 0)
+    freeReplyObject(reply);
+
+    test("Is a able to send commands verbatim: ");
+    reply = redisCommand(c,"SET foo bar");
+    test_cond (reply->type == REDIS_REPLY_STATUS &&
+        strcasecmp(reply->str,"ok") == 0)
+    freeReplyObject(reply);
+
+    test("%%s String interpolation works: ");
+    reply = redisCommand(c,"SET %s %s","foo","hello world");
+    freeReplyObject(reply);
+    reply = redisCommand(c,"GET foo");
+    test_cond(reply->type == REDIS_REPLY_STRING &&
+        strcmp(reply->str,"hello world") == 0);
+    freeReplyObject(reply);
+
+    test("%%b String interpolation works: ");
+    reply = redisCommand(c,"SET %b %b","foo",(size_t)3,"hello\x00world",(size_t)11);
+    freeReplyObject(reply);
+    reply = redisCommand(c,"GET foo");
+    test_cond(reply->type == REDIS_REPLY_STRING &&
+        memcmp(reply->str,"hello\x00world",11) == 0)
+
+    test("Binary reply length is correct: ");
+    test_cond(reply->len == 11)
+    freeReplyObject(reply);
+
+    test("Can parse nil replies: ");
+    reply = redisCommand(c,"GET nokey");
+    test_cond(reply->type == REDIS_REPLY_NIL)
+    freeReplyObject(reply);
+
+    /* test 7 */
+    test("Can parse integer replies: ");
+    reply = redisCommand(c,"INCR mycounter");
+    test_cond(reply->type == REDIS_REPLY_INTEGER && reply->integer == 1)
+    freeReplyObject(reply);
+
+    test("Can parse multi bulk replies: ");
+    freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
+    freeReplyObject(redisCommand(c,"LPUSH mylist bar"));
+    reply = redisCommand(c,"LRANGE mylist 0 -1");
+    test_cond(reply->type == REDIS_REPLY_ARRAY &&
+              reply->elements == 2 &&
+              !memcmp(reply->element[0]->str,"bar",3) &&
+              !memcmp(reply->element[1]->str,"foo",3))
+    freeReplyObject(reply);
+
+    /* m/e with multi bulk reply *before* other reply.
+     * specifically test ordering of reply items to parse. */
+    test("Can handle nested multi bulk replies: ");
+    freeReplyObject(redisCommand(c,"MULTI"));
+    freeReplyObject(redisCommand(c,"LRANGE mylist 0 -1"));
+    freeReplyObject(redisCommand(c,"PING"));
+    reply = (redisCommand(c,"EXEC"));
+    test_cond(reply->type == REDIS_REPLY_ARRAY &&
+              reply->elements == 2 &&
+              reply->element[0]->type == REDIS_REPLY_ARRAY &&
+              reply->element[0]->elements == 2 &&
+              !memcmp(reply->element[0]->element[0]->str,"bar",3) &&
+              !memcmp(reply->element[0]->element[1]->str,"foo",3) &&
+              reply->element[1]->type == REDIS_REPLY_STATUS &&
+              strcasecmp(reply->element[1]->str,"pong") == 0);
+    freeReplyObject(reply);
+
+    /* Make sure passing NULL to redisGetReply is safe */
+    test("Can pass NULL to redisGetReply: ");
+    assert(redisAppendCommand(c, "PING") == REDIS_OK);
+    test_cond(redisGetReply(c, NULL) == REDIS_OK);
+
+    get_redis_version(c, &major, NULL);
+    if (major >= 6) test_resp3_push_handler(c);
+    test_resp3_push_options(config);
+
+    test_privdata_hooks(config);
+
+    disconnect(c, 0);
+}
+
+/* Send DEBUG SLEEP 0 to detect if we have this command */
+static int detect_debug_sleep(redisContext *c) {
+    int detected;
+    redisReply *reply = redisCommand(c, "DEBUG SLEEP 0\r\n");
+
+    if (reply == NULL || c->err) {
+        const char *cause = c->err ? c->errstr : "(none)";
+        fprintf(stderr, "Error testing for DEBUG SLEEP (Redis error: %s), exiting\n", cause);
+        exit(-1);
+    }
+
+    detected = reply->type == REDIS_REPLY_STATUS;
+    freeReplyObject(reply);
+
+    return detected;
+}
+
+static void test_blocking_connection_timeouts(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    ssize_t s;
+    const char *sleep_cmd = "DEBUG SLEEP 3\r\n";
+    struct timeval tv;
+
+    c = do_connect(config);
+    test("Successfully completes a command when the timeout is not exceeded: ");
+    reply = redisCommand(c,"SET foo fast");
+    freeReplyObject(reply);
+    tv.tv_sec = 0;
+    tv.tv_usec = 10000;
+    redisSetTimeout(c, tv);
+    reply = redisCommand(c, "GET foo");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STRING && memcmp(reply->str, "fast", 4) == 0);
+    freeReplyObject(reply);
+    disconnect(c, 0);
+
+    c = do_connect(config);
+    test("Does not return a reply when the command times out: ");
+    if (detect_debug_sleep(c)) {
+        redisAppendFormattedCommand(c, sleep_cmd, strlen(sleep_cmd));
+        s = c->funcs->write(c);
+        tv.tv_sec = 0;
+        tv.tv_usec = 10000;
+        redisSetTimeout(c, tv);
+        reply = redisCommand(c, "GET foo");
+#ifndef _WIN32
+        test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_IO &&
+                  strcmp(c->errstr, "Resource temporarily unavailable") == 0);
+#else
+        test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_TIMEOUT &&
+                  strcmp(c->errstr, "recv timeout") == 0);
+#endif
+        freeReplyObject(reply);
+    } else {
+        test_skipped();
+    }
+
+    test("Reconnect properly reconnects after a timeout: ");
+    do_reconnect(c, config);
+    reply = redisCommand(c, "PING");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
+    freeReplyObject(reply);
+
+    test("Reconnect properly uses owned parameters: ");
+    config.tcp.host = "foo";
+    config.unix_sock.path = "foo";
+    do_reconnect(c, config);
+    reply = redisCommand(c, "PING");
+    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
+    freeReplyObject(reply);
+
+    disconnect(c, 0);
+}
+
+static void test_blocking_io_errors(struct config config) {
+    redisContext *c;
+    redisReply *reply;
+    void *_reply;
+    int major, minor;
+
+    /* Connect to target given by config. */
+    c = do_connect(config);
+    get_redis_version(c, &major, &minor);
+
+    test("Returns I/O error when the connection is lost: ");
+    reply = redisCommand(c,"QUIT");
+    if (major > 2 || (major == 2 && minor > 0)) {
+        /* > 2.0 returns OK on QUIT and read() should be issued once more
+         * to know the descriptor is at EOF. */
+        test_cond(strcasecmp(reply->str,"OK") == 0 &&
+            redisGetReply(c,&_reply) == REDIS_ERR);
+        freeReplyObject(reply);
+    } else {
+        test_cond(reply == NULL);
+    }
+
+#ifndef _WIN32
+    /* On 2.0, QUIT will cause the connection to be closed immediately and
+     * the read(2) for the reply on QUIT will set the error to EOF.
+     * On >2.0, QUIT will return with OK and another read(2) needed to be
+     * issued to find out the socket was closed by the server. In both
+     * conditions, the error will be set to EOF. */
+    assert(c->err == REDIS_ERR_EOF &&
+        strcmp(c->errstr,"Server closed the connection") == 0);
+#endif
+    redisFree(c);
+
+    c = do_connect(config);
+    test("Returns I/O error on socket timeout: ");
+    struct timeval tv = { 0, 1000 };
+    assert(redisSetTimeout(c,tv) == REDIS_OK);
+    int respcode = redisGetReply(c,&_reply);
+#ifndef _WIN32
+    test_cond(respcode == REDIS_ERR && c->err == REDIS_ERR_IO && errno == EAGAIN);
+#else
+    test_cond(respcode == REDIS_ERR && c->err == REDIS_ERR_TIMEOUT);
+#endif
+    redisFree(c);
+}
+
+static void test_invalid_timeout_errors(struct config config) {
+    redisContext *c;
+
+    test("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: ");
+
+    config.tcp.timeout.tv_sec = 0;
+    config.tcp.timeout.tv_usec = 10000001;
+
+    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
+
+    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
+    redisFree(c);
+
+    test("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
+
+    config.tcp.timeout.tv_sec = (((LONG_MAX) - 999) / 1000) + 1;
+    config.tcp.timeout.tv_usec = 0;
+
+    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
+
+    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
+    redisFree(c);
+}
+
+/* Wrap malloc to abort on failure so OOM checks don't make the test logic
+ * harder to follow. */
+void *hi_malloc_safe(size_t size) {
+    void *ptr = hi_malloc(size);
+    if (ptr == NULL) {
+        fprintf(stderr, "Error:  Out of memory\n");
+        exit(-1);
+    }
+
+    return ptr;
+}
+
+static void test_throughput(struct config config) {
+    redisContext *c = do_connect(config);
+    redisReply **replies;
+    int i, num;
+    long long t1, t2;
+
+    test("Throughput:\n");
+    for (i = 0; i < 500; i++)
+        freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
+
+    num = 1000;
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        replies[i] = redisCommand(c,"PING");
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    hi_free(replies);
+    printf("\t(%dx PING: %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        replies[i] = redisCommand(c,"LRANGE mylist 0 499");
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
+        assert(replies[i] != NULL && replies[i]->elements == 500);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    hi_free(replies);
+    printf("\t(%dx LRANGE with 500 elements: %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        replies[i] = redisCommand(c, "INCRBY incrkey %d", 1000000);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    hi_free(replies);
+    printf("\t(%dx INCRBY: %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    num = 10000;
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
+    for (i = 0; i < num; i++)
+        redisAppendCommand(c,"PING");
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    hi_free(replies);
+    printf("\t(%dx PING (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
+    for (i = 0; i < num; i++)
+        redisAppendCommand(c,"LRANGE mylist 0 499");
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
+        assert(replies[i] != NULL && replies[i]->elements == 500);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    hi_free(replies);
+    printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    replies = hi_malloc_safe(sizeof(redisReply*)*num);
+    for (i = 0; i < num; i++)
+        redisAppendCommand(c,"INCRBY incrkey %d", 1000000);
+    t1 = usec();
+    for (i = 0; i < num; i++) {
+        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
+        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
+    }
+    t2 = usec();
+    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
+    hi_free(replies);
+    printf("\t(%dx INCRBY (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
+
+    disconnect(c, 0);
+}
+
+// static long __test_callback_flags = 0;
+// static void __test_callback(redisContext *c, void *privdata) {
+//     ((void)c);
+//     /* Shift to detect execution order */
+//     __test_callback_flags <<= 8;
+//     __test_callback_flags |= (long)privdata;
+// }
+//
+// static void __test_reply_callback(redisContext *c, redisReply *reply, void *privdata) {
+//     ((void)c);
+//     /* Shift to detect execution order */
+//     __test_callback_flags <<= 8;
+//     __test_callback_flags |= (long)privdata;
+//     if (reply) freeReplyObject(reply);
+// }
+//
+// static redisContext *__connect_nonblock() {
+//     /* Reset callback flags */
+//     __test_callback_flags = 0;
+//     return redisConnectNonBlock("127.0.0.1", port, NULL);
+// }
+//
+// static void test_nonblocking_connection() {
+//     redisContext *c;
+//     int wdone = 0;
+//
+//     test("Calls command callback when command is issued: ");
+//     c = __connect_nonblock();
+//     redisSetCommandCallback(c,__test_callback,(void*)1);
+//     redisCommand(c,"PING");
+//     test_cond(__test_callback_flags == 1);
+//     redisFree(c);
+//
+//     test("Calls disconnect callback on redisDisconnect: ");
+//     c = __connect_nonblock();
+//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
+//     redisDisconnect(c);
+//     test_cond(__test_callback_flags == 2);
+//     redisFree(c);
+//
+//     test("Calls disconnect callback and free callback on redisFree: ");
+//     c = __connect_nonblock();
+//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
+//     redisSetFreeCallback(c,__test_callback,(void*)4);
+//     redisFree(c);
+//     test_cond(__test_callback_flags == ((2 << 8) | 4));
+//
+//     test("redisBufferWrite against empty write buffer: ");
+//     c = __connect_nonblock();
+//     test_cond(redisBufferWrite(c,&wdone) == REDIS_OK && wdone == 1);
+//     redisFree(c);
+//
+//     test("redisBufferWrite against not yet connected fd: ");
+//     c = __connect_nonblock();
+//     redisCommand(c,"PING");
+//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
+//               strncmp(c->error,"write:",6) == 0);
+//     redisFree(c);
+//
+//     test("redisBufferWrite against closed fd: ");
+//     c = __connect_nonblock();
+//     redisCommand(c,"PING");
+//     redisDisconnect(c);
+//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
+//               strncmp(c->error,"write:",6) == 0);
+//     redisFree(c);
+//
+//     test("Process callbacks in the right sequence: ");
+//     c = __connect_nonblock();
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)1,"PING");
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)3,"PING");
+//
+//     /* Write output buffer */
+//     wdone = 0;
+//     while(!wdone) {
+//         usleep(500);
+//         redisBufferWrite(c,&wdone);
+//     }
+//
+//     /* Read until at least one callback is executed (the 3 replies will
+//      * arrive in a single packet, causing all callbacks to be executed in
+//      * a single pass). */
+//     while(__test_callback_flags == 0) {
+//         assert(redisBufferRead(c) == REDIS_OK);
+//         redisProcessCallbacks(c);
+//     }
+//     test_cond(__test_callback_flags == 0x010203);
+//     redisFree(c);
+//
+//     test("redisDisconnect executes pending callbacks with NULL reply: ");
+//     c = __connect_nonblock();
+//     redisSetDisconnectCallback(c,__test_callback,(void*)1);
+//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
+//     redisDisconnect(c);
+//     test_cond(__test_callback_flags == 0x0201);
+//     redisFree(c);
+// }
+
+int main(int argc, char **argv) {
+    struct config cfg = {
+        .tcp = {
+            .host = "127.0.0.1",
+            .port = 6379
+        },
+        .unix_sock = {
+            .path = "/tmp/redis.sock"
+        }
+    };
+    int throughput = 1;
+    int test_inherit_fd = 1;
+    int skips_as_fails = 0;
+    int test_unix_socket;
+
+    /* Parse command line options. */
+    argv++; argc--;
+    while (argc) {
+        if (argc >= 2 && !strcmp(argv[0],"-h")) {
+            argv++; argc--;
+            cfg.tcp.host = argv[0];
+        } else if (argc >= 2 && !strcmp(argv[0],"-p")) {
+            argv++; argc--;
+            cfg.tcp.port = atoi(argv[0]);
+        } else if (argc >= 2 && !strcmp(argv[0],"-s")) {
+            argv++; argc--;
+            cfg.unix_sock.path = argv[0];
+        } else if (argc >= 1 && !strcmp(argv[0],"--skip-throughput")) {
+            throughput = 0;
+        } else if (argc >= 1 && !strcmp(argv[0],"--skip-inherit-fd")) {
+            test_inherit_fd = 0;
+        } else if (argc >= 1 && !strcmp(argv[0],"--skips-as-fails")) {
+            skips_as_fails = 1;
+#ifdef HIREDIS_TEST_SSL
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-port")) {
+            argv++; argc--;
+            cfg.ssl.port = atoi(argv[0]);
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-host")) {
+            argv++; argc--;
+            cfg.ssl.host = argv[0];
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-ca-cert")) {
+            argv++; argc--;
+            cfg.ssl.ca_cert  = argv[0];
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-cert")) {
+            argv++; argc--;
+            cfg.ssl.cert = argv[0];
+        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-key")) {
+            argv++; argc--;
+            cfg.ssl.key = argv[0];
+#endif
+        } else {
+            fprintf(stderr, "Invalid argument: %s\n", argv[0]);
+            exit(1);
+        }
+        argv++; argc--;
+    }
+
+#ifndef _WIN32
+    /* Ignore broken pipe signal (for I/O error tests). */
+    signal(SIGPIPE, SIG_IGN);
+
+    test_unix_socket = access(cfg.unix_sock.path, F_OK) == 0;
+
+#else
+    /* Unix sockets don't exist in Windows */
+    test_unix_socket = 0;
+#endif
+
+    test_allocator_injection();
+
+    test_format_commands();
+    test_reply_reader();
+    test_blocking_connection_errors();
+    test_free_null();
+
+    printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
+    cfg.type = CONN_TCP;
+    test_blocking_connection(cfg);
+    test_blocking_connection_timeouts(cfg);
+    test_blocking_io_errors(cfg);
+    test_invalid_timeout_errors(cfg);
+    test_append_formatted_commands(cfg);
+    if (throughput) test_throughput(cfg);
+
+    printf("\nTesting against Unix socket connection (%s): ", cfg.unix_sock.path);
+    if (test_unix_socket) {
+        printf("\n");
+        cfg.type = CONN_UNIX;
+        test_blocking_connection(cfg);
+        test_blocking_connection_timeouts(cfg);
+        test_blocking_io_errors(cfg);
+        if (throughput) test_throughput(cfg);
+    } else {
+        test_skipped();
+    }
+
+#ifdef HIREDIS_TEST_SSL
+    if (cfg.ssl.port && cfg.ssl.host) {
+
+        redisInitOpenSSL();
+        _ssl_ctx = redisCreateSSLContext(cfg.ssl.ca_cert, NULL, cfg.ssl.cert, cfg.ssl.key, NULL, NULL);
+        assert(_ssl_ctx != NULL);
+
+        printf("\nTesting against SSL connection (%s:%d):\n", cfg.ssl.host, cfg.ssl.port);
+        cfg.type = CONN_SSL;
+
+        test_blocking_connection(cfg);
+        test_blocking_connection_timeouts(cfg);
+        test_blocking_io_errors(cfg);
+        test_invalid_timeout_errors(cfg);
+        test_append_formatted_commands(cfg);
+        if (throughput) test_throughput(cfg);
+
+        redisFreeSSLContext(_ssl_ctx);
+        _ssl_ctx = NULL;
+    }
+#endif
+
+    if (test_inherit_fd) {
+        printf("\nTesting against inherited fd (%s): ", cfg.unix_sock.path);
+        if (test_unix_socket) {
+            printf("\n");
+            cfg.type = CONN_FD;
+            test_blocking_connection(cfg);
+        } else {
+            test_skipped();
+        }
+    }
+
+    if (fails || (skips_as_fails && skips)) {
+        printf("*** %d TESTS FAILED ***\n", fails);
+        if (skips) {
+            printf("*** %d TESTS SKIPPED ***\n", skips);
+        }
+        return 1;
+    }
+
+    printf("ALL TESTS PASSED (%d skipped)\n", skips);
+    return 0;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/win32.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/win32.h
new file mode 100644
index 0000000..04289c6
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/hiredis/win32.h
@@ -0,0 +1,56 @@
+#ifndef _WIN32_HELPER_INCLUDE
+#define _WIN32_HELPER_INCLUDE
+#ifdef _MSC_VER
+
+#include <winsock2.h> /* for struct timeval */
+
+#ifndef inline
+#define inline __inline
+#endif
+
+#ifndef strcasecmp
+#define strcasecmp stricmp
+#endif
+
+#ifndef strncasecmp
+#define strncasecmp strnicmp
+#endif
+
+#ifndef va_copy
+#define va_copy(d,s) ((d) = (s))
+#endif
+
+#ifndef snprintf
+#define snprintf c99_snprintf
+
+__inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
+{
+    int count = -1;
+
+    if (size != 0)
+        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
+    if (count == -1)
+        count = _vscprintf(format, ap);
+
+    return count;
+}
+
+__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
+{
+    int count;
+    va_list ap;
+
+    va_start(ap, format);
+    count = c99_vsnprintf(str, size, format, ap);
+    va_end(ap);
+
+    return count;
+}
+#endif
+#endif /* _MSC_VER */
+
+#ifdef _WIN32
+#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
+#endif /* _WIN32 */
+
+#endif /* _WIN32_HELPER_INCLUDE */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/rdsstore.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/rdsstore.c
new file mode 100755
index 0000000..13e9d8e
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/rdsstore.c
@@ -0,0 +1,2721 @@
+#include <nchan_module.h>
+#include <store/redis/store.h>
+#include <assert.h>
+#include <netinet/ip.h>
+#include "store-private.h"
+
+#include "redis_nginx_adapter.h"
+
+#include <util/nchan_msg.h>
+#include <util/nchan_rbtree.h>
+#include <store/store_common.h>
+
+#include <store/memory/store.h>
+
+#include "redis_nodeset.h"
+#include "redis_lua_commands.h"
+
+#define REDIS_CHANNEL_KEEPALIVE_NOTREADY_RETRY_TIME 5000
+
+#define REDIS_STALL_CHECK_TIME 0 //disable for now
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REDISTORE: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDISTORE: " fmt, ##args)
+
+#define REDIS_CONNECTION_FOR_PUBLISH_WAIT 5000
+
+u_char            redis_subscriber_id[512];
+size_t            redis_subscriber_id_len;
+
+static rdstore_channel_head_t    *chanhead_hash = NULL;
+static size_t                     redis_publish_message_msgkey_size;
+
+#define CHANNEL_HASH_FIND(id_buf, p)    HASH_FIND( hh, chanhead_hash, (id_buf)->data, (id_buf)->len, p)
+#define CHANNEL_HASH_ADD(chanhead)      HASH_ADD_KEYPTR( hh, chanhead_hash, (chanhead->id).data, (chanhead->id).len, chanhead)
+#define CHANNEL_HASH_DEL(chanhead)      HASH_DEL( chanhead_hash, chanhead)
+
+#include <stdbool.h>
+#include "cmp.h"
+
+
+#define redis_subscriber_command(node, cb, pd, fmt, args...)        \
+  do {                                                               \
+    if((node)->state >= REDIS_NODE_READY) {                    \
+      redisAsyncCommand((node)->ctx.pubsub, cb, pd, fmt, ##args);      \
+    } else {                                                         \
+      ERR("Can't run redis command: no connection to redis server.");\
+    }                                                                \
+  }while(0)                                                          \
+  
+  
+  
+#define redis_sync_command(node, fmt, args...)                       \
+  do {                                                               \
+    if((node)->ctx.sync == NULL) {                                   \
+      (node)->ctx.sync = node_connect_sync_context(node);            \
+    }                                                                \
+    if((node)->ctx.sync) {                                           \
+      redisCommand((node)->ctx.sync, fmt, ##args);                   \
+    } else {                                                         \
+      ERR("Can't run redis command: no connection to redis server.");\
+    }                                                                \
+  }while(0)
+
+#define redis_sync_script(script_name, node, fmt, args...)                    \
+  redis_sync_command(node, "EVALSHA %s " fmt, redis_lua_scripts.script_name.hash, ##args)
+
+#define nchan_redis_sync_script(script_name, node, channel_id, fmt, args...)  \
+  redis_sync_script(script_name, node, "0 %b %b " fmt, STR(node->nodeset->settings.namespace), STR(channel_id), ##args)
+
+  
+  
+#define redis_command(node, cb, pd, fmt, args...)                 \
+  do {                                                               \
+    if(node->state >= REDIS_NODE_READY) {                            \
+      if((cb) != NULL) {                                             \
+        /* a reply is expected, so track this command */             \
+        node_command_sent(node);                                     \
+      }                                                              \
+      redisAsyncCommand((node)->ctx.cmd, cb, pd, fmt, ##args);       \
+    } else {                                                         \
+      node_log_error(node, "Can't run redis command: no connection to redis server.");\
+    }                                                                \
+  }while(0)                                                          \
+  
+#define redis_script(script_name, node, cb, pd, fmt, args...)                         \
+  redis_command(node, cb, pd, "EVALSHA %s " fmt, redis_lua_scripts.script_name.hash, ##args)
+
+#define nchan_redis_script(script_name, node, cb, pd, channel_id, fmt, args...)       \
+  redis_script(script_name, node, cb, pd, "0 %b %b " fmt, STR((node)->nodeset->settings.namespace), STR(channel_id), ##args)
+
+  
+#define CHECK_REPLY_STR(reply) ((reply)->type == REDIS_REPLY_STRING)
+#define CHECK_REPLY_STRVAL(reply, v) ( CHECK_REPLY_STR(reply) && ngx_strcmp((reply)->str, v) == 0 )
+#define CHECK_REPLY_STRNVAL(reply, v, n) ( CHECK_REPLY_STR(reply) && ngx_strncmp((reply)->str, v, n) == 0 )
+#define CHECK_REPLY_STATUSVAL(reply, v) ( (reply)->type == REDIS_REPLY_STATUS && ngx_strcmp((reply)->str, v) == 0 )
+#define CHECK_REPLY_INT(reply) ((reply)->type == REDIS_REPLY_INTEGER)
+#define CHECK_REPLY_INTVAL(reply, v) ( CHECK_REPLY_INT(reply) && (reply)->integer == v )
+#define CHECK_REPLY_ARRAY_MIN_SIZE(reply, size) ( (reply)->type == REDIS_REPLY_ARRAY && (reply)->elements >= (unsigned )size )
+#define CHECK_REPLY_NIL(reply) ((reply)->type == REDIS_REPLY_NIL)
+#define CHECK_REPLY_INT_OR_STR(reply) ((reply)->type == REDIS_REPLY_INTEGER || (reply)->type == REDIS_REPLY_STRING)
+  
+static ngx_int_t nchan_store_publish_generic(ngx_str_t *, redis_nodeset_t *, nchan_msg_t *, ngx_int_t, const ngx_str_t *);
+
+static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, redis_nodeset_t *);
+
+const nchan_backoff_settings_t NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL = {
+  .min = NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL_MIN_MSEC,
+  .backoff_multiplier = NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL_BACKOFF_MULTIPLIER,
+  .jitter_multiplier = NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL_JITTER_MULTIPLIER,
+  .max = NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL_MAX_MSEC
+};
+
+static ngx_buf_t *set_buf(ngx_buf_t *buf, u_char *start, off_t len){
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = start;
+  buf->end = start + len;
+  buf->pos = buf->start;
+  buf->last = buf->end;
+  return buf;
+}
+
+static int ngx_strmatch(ngx_str_t *str, char *match) {
+  return ngx_strncmp(str->data, match, str->len) == 0;
+}
+
+static int ngx_str_chop_if_startswith(ngx_str_t *str, char *match) {
+  char *cur, *max = (char *)str->data + str->len;
+  for(cur = (char *)str->data; cur < max; cur++, match++) {
+    if(*match == '\0') {
+      str->len -= (u_char *)cur - str->data;
+      str->data = (u_char *)cur;
+      return 1;
+    }
+    else if(*match != *cur)
+      break;
+  }
+  return 0;
+}
+
+static u_char *fwd_buf(ngx_buf_t *buf, size_t sz) {
+  u_char *ret = buf->pos;
+  buf->pos += sz;
+  return ret;
+}
+
+static void fwd_buf_to_str(ngx_buf_t *buf, size_t sz, ngx_str_t *str) {
+  str->data = fwd_buf(buf, sz);
+  str->len = sz;;
+}
+
+static bool ngx_buf_reader(cmp_ctx_t *ctx, void *data, size_t limit) {
+  ngx_buf_t   *buf=(ngx_buf_t *)ctx->buf;
+  if(buf->pos + limit > buf->last){
+    return false;
+  }
+  ngx_memcpy(data, buf->pos, limit);
+  buf->pos += limit;
+  return true;
+}
+static size_t ngx_buf_writer(cmp_ctx_t *ctx, const void *data, size_t count) {
+  return 0;
+}
+
+int nchan_store_redis_validate_url(ngx_str_t *url) {
+  redis_connect_params_t rcp;
+  return parse_redis_url(url, &rcp) == NGX_OK;
+}
+
+ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp) {
+  u_char                  *cur, *last, *ret;
+  
+  cur = url->data;
+  last = url->data + url->len;
+  
+  
+  //ignore redis://
+  rcp->use_tls = 0;
+  if(ngx_strnstr(cur, "redis://", 8) != NULL) {
+    cur += 8;
+  }
+  else if(ngx_strnstr(cur, "rediss://", 9) != NULL) {
+    cur += 9;
+    rcp->use_tls = 1;
+  }
+  
+  //username:password@
+  if((ret = ngx_strlchr(cur, last, '@')) != NULL) {
+    u_char *split = ngx_strlchr(cur, ret, ':');
+    if(!split) {
+      return NGX_ERROR;
+    }
+    rcp->username.len = (split - cur);
+    rcp->username.data = rcp->username.len == 0 ? NULL : cur;
+    
+    rcp->password.len = (ret - split - 1);
+    rcp->password.data = rcp->password.len == 0 ? NULL : &split[1];
+    
+    cur = ret + 1;
+  }
+  else {
+    rcp->username.len = 0;
+    rcp->username.data = NULL;
+    rcp->password.len = 0;
+    rcp->password.data = NULL;
+  }
+  
+  ///port:host
+  if((ret = ngx_strlchr(cur, last, ':')) == NULL) {
+    //just host
+    rcp->port = 6379;
+    if((ret = ngx_strlchr(cur, last, '/')) == NULL) {
+      ret = last;
+    }
+    rcp->hostname.data = cur;
+    rcp->hostname.len = ret - cur;
+  }
+  else {
+    rcp->hostname.data = cur;
+    rcp->hostname.len = ret - cur;
+    cur = ret + 1;
+    
+    //port
+    if(((ret = ngx_strlchr(cur, last, '/')) == NULL) && ((ret = ngx_strlchr(cur, last, ' ')) == NULL)) {
+      ret = last;
+    }
+    rcp->port = ngx_atoi(cur, ret-cur);
+    if(rcp->port == NGX_ERROR) {
+      return NGX_ERROR;
+    }
+  }
+  cur = ret;
+  
+  if(cur[0] == '/') {
+    cur++;
+    rcp->db = ngx_atoi(cur, last-cur);
+    if(rcp->db == NGX_ERROR) {
+      rcp->db = 0;
+    }
+  }
+  else {
+    rcp->db = 0;
+  }
+  
+  ngx_str_t leftovers;
+  leftovers.len = last - cur;
+  leftovers.data = cur;
+  
+  if(nchan_ngx_str_substr(&leftovers, "master")) {
+    rcp->forced_role = REDIS_FORCED_ROLE_MASTER;
+  }
+  else if(nchan_ngx_str_substr(&leftovers, "slave")) {
+    rcp->forced_role = REDIS_FORCED_ROLE_SLAVE;
+  }
+  else {
+    rcp->forced_role = REDIS_FORCED_ROLE_NONE;
+  }
+  
+  return NGX_OK;
+}
+
+static void redis_store_reap_chanhead(rdstore_channel_head_t *ch) {
+  if(!ch->shutting_down) {
+    assert(ch->sub_count == 0 && ch->fetching_message_count == 0);
+  }
+  
+  DBG("reap channel %V", &ch->id);
+
+  if(ch->pubsub_status == REDIS_PUBSUB_SUBSCRIBED) {
+    redis_node_t *pubsub_node = ch->redis.node.pubsub;
+    assert(ch->redis.nodeset->settings.storage_mode >= REDIS_MODE_DISTRIBUTED);
+    assert(pubsub_node);
+    redis_chanhead_set_pubsub_status(ch, NULL, REDIS_PUBSUB_UNSUBSCRIBED);
+    //node_log_error(pubsub_node, "UNSUBSCRIBE start %V", &ch->redis.pubsub_id);
+    node_pubsub_time_start(pubsub_node, NCHAN_REDIS_CMD_PUBSUB_UNSUBSCRIBE);
+    redis_subscriber_command(pubsub_node, NULL, NULL, "%s %b", pubsub_node->nodeset->use_spublish ? "sunsubscribe" : "unsubscribe", STR(&ch->redis.pubsub_id));
+  }
+
+  DBG("chanhead %p (%V) is empty and expired. unsubscribe, then delete.", ch, &ch->id);
+  
+  if(ch->keepalive_timer.timer_set) {
+    ngx_del_timer(&ch->keepalive_timer);
+  }
+  
+  nodeset_dissociate_chanhead(ch);
+
+  stop_spooler(&ch->spooler, 1);
+  CHANNEL_HASH_DEL(ch);
+  
+  ngx_free(ch);
+}
+
+static ngx_int_t nchan_redis_chanhead_ready_to_reap(rdstore_channel_head_t *ch, uint8_t force) {
+  if(force) {
+    //force delete is always ok
+    return NGX_OK;
+  }
+  
+  if(ch->status != INACTIVE) {
+    return NGX_DECLINED;
+  }
+  
+  if(ch->reserved > 0 ) {
+    DBG("not yet time to reap %V, %i reservations left", &ch->id, ch->reserved);
+    return NGX_DECLINED;
+  }
+  
+  if(ch->gc.time - ngx_time() > 0) {
+    DBG("not yet time to reap %V, %i sec left", &ch->id, ch->gc.time - ngx_time());
+    return NGX_DECLINED;
+  }
+  
+  if (ch->sub_count > 0) { //there are subscribers
+    DBG("not ready to reap %V, %i subs left", &ch->id, ch->sub_count);
+    return NGX_DECLINED;
+  }
+  
+  if (ch->fetching_message_count > 0) { //there are subscribers
+    DBG("not ready to reap %V, fetching %i messages", &ch->id, ch->fetching_message_count);
+    return NGX_DECLINED;
+  }
+  
+  //DBG("ok to delete channel %V", &ch->id);
+  return NGX_OK;
+}
+
+static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privdata);
+
+static ngx_int_t nchan_store_init_worker(ngx_cycle_t *cycle) {
+  ngx_int_t rc = NGX_OK;
+  
+  u_char randbytes[16];
+  u_char randstr[33];
+  int use_randbytes = 0;
+#if (NGX_OPENSSL)
+  if (RAND_bytes(randbytes, 16) == 1) {
+    use_randbytes = 1;
+  }
+#endif
+  if(use_randbytes) {
+    ngx_hex_dump(randstr, randbytes, 16);
+    randstr[32]='\0';
+  }
+  else {
+    ngx_sprintf(randstr, "%xi%Z", ngx_random());
+  }
+  
+  u_char *cur;
+  cur = ngx_snprintf(redis_subscriber_id, 512, "nchan_worker:{%i:time:%i:%s}%Z", ngx_pid, ngx_time(), randstr);
+  redis_subscriber_id_len = cur - redis_subscriber_id;
+  
+  //DBG("worker id %s len %i", redis_subscriber_id, redis_subscriber_id_len);
+  
+  redis_nginx_init();
+  
+  nodeset_initialize((char *)redis_subscriber_id, redis_subscriber_callback);
+  nodeset_connect_all();
+  
+  //OLD
+  //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_connector, &rc);
+  return rc;
+}
+
+void redisCheckErrorCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReplyOk(c, r);
+}
+int redisReplyOk(redisAsyncContext *ac, void *r) {
+  redis_node_t         *node = ac->data;
+  redisReply *reply = (redisReply *)r;
+  if(reply == NULL) { //redis disconnected?...
+    if(ac->err) {
+      node_log_error(node, "connection to redis failed while waiting for reply - %s", ac->errstr);
+    }
+    else {
+      node_log_error(node, "got a NULL redis reply for unknown reason");
+    }
+    return 0;
+  }
+  else if(reply->type == REDIS_REPLY_ERROR) {
+    char *str = reply->str;
+    
+    //is there a script hash inside?
+    redis_lua_script_t  *script;
+    REDIS_LUA_SCRIPTS_EACH(script) {
+      if (ngx_strstr((u_char *)str, script->hash)) {
+        node_log_error(node, "REDIS SCRIPT ERROR: %s.lua : %s", script->name, str);
+        return 0;
+      }
+    }
+    
+    //nope, didn't match a script  
+    node_log_error(node, "REDIS REPLY ERROR: %s", str);
+    return 0;
+  }
+  else {
+    return 1;
+  }
+}
+
+void redisEchoCallback(redisAsyncContext *ac, void *r, void *privdata) {
+  redisReply      *reply = r;
+  redis_node_t    *node = NULL;
+  unsigned    i;
+  //nchan_channel_t * channel = (nchan_channel_t *)privdata;
+  if(ac) {
+    node = ac->data;
+    if(ac->err) {
+      node_log_error(node, "connection to redis failed - %s", ac->errstr);
+      return;
+    }
+  }
+  else {
+    node_log_error(node, "connection to redis was terminated");
+    return;
+  }
+  if(reply == NULL) {
+    node_log_error(node, "REDIS REPLY is NULL");
+    return;
+  }  
+  
+  switch(reply->type) {
+    case REDIS_REPLY_STATUS:
+      node_log_error(node, "REDIS_REPLY_STATUS  %s", reply->str);
+      break;
+      
+    case REDIS_REPLY_ERROR:
+      redisCheckErrorCallback(ac, r, privdata);
+      break;
+      
+    case REDIS_REPLY_INTEGER:
+      node_log_error(node, "REDIS_REPLY_INTEGER: %i", reply->integer);
+      break;
+      
+    case REDIS_REPLY_NIL:
+      node_log_error(node, "REDIS_REPLY_NIL: nil");
+      break;
+      
+    case REDIS_REPLY_STRING:
+      node_log_error(node, "REDIS_REPLY_STRING: %s", reply->str);
+      break;
+      
+    case REDIS_REPLY_ARRAY:
+      node_log_error(node, "REDIS_REPLY_ARRAY: %i", reply->elements);
+      for(i=0; i< reply->elements; i++) {
+        redisEchoCallback(ac, reply->element[i], "  ");
+      }
+      break;
+  }
+  //redis_subscriber_command(NULL, NULL, "UNSUBSCRIBE {channel:%b}:pubsub", str(&(channel->id)));
+}
+
+static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, nchan_compressed_msg_t *cmsg, ngx_str_t *content_type, ngx_str_t *eventsource_event, redisReply *r, uint16_t offset);
+
+#define SLOW_REDIS_REPLY 100 //ms
+
+static ngx_int_t log_redis_reply(char *name, ngx_msec_t t) {
+  ngx_msec_t   dt = ngx_current_msec - t;
+  if(dt >= SLOW_REDIS_REPLY) {
+    DBG("redis command %s took %i msec", name, dt);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t redisReply_to_ngx_int(redisReply *el, ngx_int_t *integer) {
+  if(CHECK_REPLY_INT(el)) {
+    *integer=el->integer;
+  }
+  else if(CHECK_REPLY_STR(el)) {
+    *integer=ngx_atoi((u_char *)el->str, el->len);
+  }
+  else {
+    return NGX_ERROR;
+  }
+  return NGX_OK;
+}
+
+typedef struct {
+  ngx_msec_t                    t;
+  char                         *name;
+  ngx_str_t                     channel_id;
+  nchan_msg_id_t               *msg_id;
+  ngx_str_t                     msg_key;
+} redis_get_message_from_key_data_t;
+
+static void get_msg_from_msgkey_callback(redisAsyncContext *ac, void *r, void *privdata);
+
+static ngx_int_t get_msg_from_msgkey_send(redis_nodeset_t *ns, void *pd) {
+  redis_get_message_from_key_data_t *d = pd;
+  if(nodeset_ready(ns)) {
+    redis_node_t  *node = nodeset_node_find_by_key(ns, &d->msg_key);
+    node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_GET_LARGE_MESSAGE);
+    redis_script(get_message_from_key, node, &get_msg_from_msgkey_callback, d, "1 %b", STR(&d->msg_key));
+  }
+  else {
+    ngx_free(d);
+  }
+  return NGX_OK;
+}
+
+static void get_msg_from_msgkey_callback(redisAsyncContext *ac, void *r, void *privdata) {
+  redis_get_message_from_key_data_t *d = (redis_get_message_from_key_data_t *)privdata;
+  redisReply           *reply = r;
+  nchan_msg_t           msg;
+  nchan_compressed_msg_t cmsg;
+  ngx_str_t             content_type;
+  ngx_str_t             eventsource_event;
+  ngx_str_t            *chid = &d->channel_id;
+  redis_node_t         *node = ac->data;
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_GET_LARGE_MESSAGE);
+  
+  DBG("get_msg_from_msgkey_callback");
+  
+  log_redis_reply(d->name, d->t);
+  
+  if(!nodeset_node_reply_keyslot_ok(node, reply) && nodeset_node_can_retry_commands(node)) {
+    nodeset_callback_on_ready(node->nodeset, get_msg_from_msgkey_send, d);
+    return;
+  }
+  
+  if(reply) {
+    if(chid == NULL) {
+      ERR("get_msg_from_msgkey channel id is NULL");
+      return;
+    }
+    if(msg_from_redis_get_message_reply(&msg, &cmsg, &content_type, &eventsource_event, reply, 0) != NGX_OK) {
+      ERR("invalid message or message absent after get_msg_from_key");
+      return;
+    }
+    nchan_store_publish_generic(chid, node->nodeset, &msg, 0, NULL);
+  }
+  else {
+    //reply is NULL
+  }
+  ngx_free(d);
+}
+
+static bool cmp_err(cmp_ctx_t *cmp) {
+  ERR("msgpack parsing error: %s", cmp_strerror(cmp));
+  return false;
+}
+
+static bool cmp_to_str(cmp_ctx_t *cmp, ngx_str_t *str) {
+  ngx_buf_t      *mpbuf =(ngx_buf_t *)cmp->buf;
+  uint32_t        sz;
+  
+  if(cmp_read_str_size(cmp, &sz)) {
+    fwd_buf_to_str(mpbuf, sz, str);
+    return true;
+  }
+  else {
+    cmp_err(cmp);
+    return false;
+  }
+}
+
+static bool cmp_to_msg(cmp_ctx_t *cmp, nchan_msg_t *msg, nchan_compressed_msg_t *cmsg, ngx_str_t *content_type, ngx_str_t *eventsource_event) {
+  ngx_buf_t  *mpb = (ngx_buf_t *)cmp->buf;
+  uint32_t    sz;
+  uint64_t    msgtag;
+  int32_t     ttl;
+  int32_t     compression;
+  //ttl 
+  if(!cmp_read_int(cmp, &ttl)) {
+    return cmp_err(cmp);
+  }
+  assert(ttl >= 0);
+  if(ttl == 0) {
+    ttl++; // less than a second left for this message... give it a second's lease on life
+  }
+  msg->expires = ngx_time() + ttl;
+  
+  //msg id
+  if(!cmp_read_uinteger(cmp, (uint64_t *)&msg->id.time)) {
+    return cmp_err(cmp);
+  }
+  if(!cmp_read_uinteger(cmp, &msgtag)) {
+    return cmp_err(cmp);
+  }
+  else {
+    msg->id.tag.fixed[0] = msgtag;
+    msg->id.tagactive = 0;
+    msg->id.tagcount = 1;
+  }
+  
+  //msg prev_id
+  if(!cmp_read_uinteger(cmp, (uint64_t *)&msg->prev_id.time)) {
+    return cmp_err(cmp);
+  }
+  if(!cmp_read_uinteger(cmp, &msgtag)) {
+    return cmp_err(cmp);
+  }
+  else {
+    msg->prev_id.tag.fixed[0] = msgtag;
+    msg->prev_id.tagactive = 0;
+    msg->prev_id.tagcount = 1;
+  }
+  
+  //message data
+  if(!cmp_read_str_size(cmp, &sz)) {
+    return cmp_err(cmp);
+  }
+  set_buf(&msg->buf, mpb->pos, sz);
+  fwd_buf(mpb, sz);
+  msg->buf.memory = 1;
+  msg->buf.last_buf = 1;
+  msg->buf.last_in_chain = 1;
+
+  //content-type
+  if(!cmp_read_str_size(cmp, &sz)) {
+    return cmp_err(cmp);
+  }
+  fwd_buf_to_str(mpb, sz, content_type);
+  msg->content_type = sz > 0 ? content_type : NULL;
+  
+  //eventsource_event
+  if(!cmp_read_str_size(cmp, &sz)) {
+    return cmp_err(cmp);
+  }
+  fwd_buf_to_str(mpb, sz, eventsource_event);
+  msg->eventsource_event = sz > 0 ? eventsource_event : NULL;
+  
+  //compression
+  if(!cmp_read_int(cmp, &compression)) {
+    msg->compressed = NULL;
+  }
+  if(compression > 0) {
+    msg->compressed = cmsg;
+    ngx_memzero(&cmsg->buf, sizeof(cmsg->buf));
+    cmsg->compression = compression;
+  }
+  else {
+    msg->compressed = NULL;
+  }
+  
+  return true;
+}
+
+static ngx_int_t get_msg_from_msgkey(ngx_str_t *channel_id, redis_nodeset_t *nodeset, nchan_msg_id_t *msgid, ngx_str_t *msg_redis_hash_key) {
+  rdstore_channel_head_t              *head;
+  redis_get_message_from_key_data_t   *d;
+  DBG("Get message from msgkey %V", msg_redis_hash_key);
+  
+  head = nchan_store_get_chanhead(channel_id, nodeset);
+  if(head->sub_count == 0) {
+    DBG("Nobody wants this message we'll need to grab with an HMGET");
+    return NGX_OK;
+  }
+  
+  if((d=ngx_alloc(sizeof(*d) + (u_char)channel_id->len + (u_char)msg_redis_hash_key->len, ngx_cycle->log)) == 0) {
+    ERR("unable to allocate memory for callback data for message hmget");
+    return NGX_ERROR;
+  }
+  d->channel_id.data = (u_char *)&d[1];
+  nchan_strcpy(&d->channel_id, channel_id, 0);
+  
+  d->msg_key.data = d->channel_id.data + d->channel_id.len;
+  nchan_strcpy(&d->msg_key, msg_redis_hash_key, 0);
+  
+  d->t = ngx_current_msec;
+  
+  d->name = "get_message_from_key";
+  
+  //d->hcln = put_current_subscribers_in_limbo(head);
+  //assert(d->hcln != 0);
+  get_msg_from_msgkey_send(nodeset, d);
+
+  return NGX_OK;
+}
+
+static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub);
+
+static int str_match_redis_subscriber_channel(ngx_str_t *pubsub_channel, ngx_str_t *ns) {
+  ngx_str_t psch = *pubsub_channel;
+  if(pubsub_channel->len != ns->len + redis_subscriber_id_len || psch.len < ns->len) {
+    return 0;
+  }
+  if(ngx_memcmp(psch.data, ns->data, ns->len) != 0) {
+    return 0;
+  }
+  psch.data += ns->len;
+  psch.len -= ns->len;
+  
+  return ngx_strmatch(&psch, (char *)redis_subscriber_id);
+}
+
+static ngx_str_t *get_channel_id_from_pubsub_channel(ngx_str_t *pubsub_channel, ngx_str_t *ns, ngx_str_t *str_in) {
+  if(str_match_redis_subscriber_channel(pubsub_channel, ns)) {
+    return NULL;
+  }
+  str_in->data = pubsub_channel->data + ns->len + 9; //"<namespace>{channel:"
+  str_in->len = pubsub_channel->len - ns->len - 9;
+  str_in->len -= 8;//"}:pubsub"
+  return str_in;
+}
+
+static rdstore_channel_head_t *find_chanhead_for_pubsub_callback(ngx_str_t *chid) {
+  rdstore_channel_head_t *head;
+  CHANNEL_HASH_FIND(chid, head);
+  return head;
+}
+
+ngx_int_t redis_chanhead_set_pubsub_status(rdstore_channel_head_t *chanhead, redis_node_t *node, redis_pubsub_status_t status) {
+  assert(chanhead);
+  
+  switch(status) {
+    case REDIS_PUBSUB_UNSUBSCRIBED:
+      if(chanhead->pubsub_status == REDIS_PUBSUB_UNSUBSCRIBED) {
+        node_log_warning(node, "channel %V got double UNSUBSCRIBED", &chanhead->id);
+      }
+      if(chanhead->pubsub_status == REDIS_PUBSUB_SUBSCRIBING) {
+        node_log_error(node, "channel %V is SUBSCRIBING, but status was set to UNSUBSCRIBED", &chanhead->id);
+      }
+      chanhead->pubsub_status = REDIS_PUBSUB_UNSUBSCRIBED;
+      
+      nodeset_node_dissociate_pubsub_chanhead(chanhead);
+      
+      if(chanhead->redis.slist.in_disconnected_pubsub_list == 0) {
+        nchan_slist_append(&chanhead->redis.nodeset->channels.disconnected_pubsub, chanhead);
+        chanhead->redis.slist.in_disconnected_pubsub_list = 1;
+      }
+      
+      if(chanhead->redis.nodeset->settings.storage_mode == REDIS_MODE_BACKUP && chanhead->status == READY) {
+        chanhead->status = NOTREADY;
+        chanhead->spooler.fn->handle_channel_status_change(&chanhead->spooler);
+      }
+      
+      break;
+    
+    case REDIS_PUBSUB_SUBSCRIBING:
+      if(chanhead->pubsub_status != REDIS_PUBSUB_UNSUBSCRIBED) {
+        nchan_log_error("Redis chanhead %V pubsub status set to SUBSCRIBING when prev status was not UNSUBSCRIBED (%i)", &chanhead->id, chanhead->pubsub_status);
+      }
+      chanhead->pubsub_status = REDIS_PUBSUB_SUBSCRIBING;
+      break;
+    
+    case REDIS_PUBSUB_SUBSCRIBED:
+      assert(node);
+      if(chanhead->pubsub_status != REDIS_PUBSUB_SUBSCRIBING) {
+        node_log_error(node, "expected previous pubsub_status for channel %p (id: %V) to be REDIS_PUBSUB_SUBSCRIBING (%i), was %i", chanhead, &chanhead->id, REDIS_PUBSUB_SUBSCRIBING, chanhead->pubsub_status);
+      }
+      chanhead->pubsub_status = REDIS_PUBSUB_SUBSCRIBED;
+      nodeset_node_associate_pubsub_chanhead(node, chanhead);
+      
+      switch(chanhead->status) {
+        case NOTREADY:
+          chanhead->status = READY;
+          chanhead->spooler.fn->handle_channel_status_change(&chanhead->spooler);
+          break;
+        
+        case READY:
+          break;
+        
+        case INACTIVE:
+          // this is fine, inactive channels can be pubsubbed, they will be garbage collected
+          // later if needed
+          break;
+          
+        default:
+          node_log_error(node, "REDIS: PUB/SUB really unexpected chanhead status %i", chanhead->status);
+          //not sposed to happen
+          raise(SIGABRT);
+          break;
+      }
+      break;
+      
+    
+  }
+  
+  return NGX_OK;
+}
+
+static void redis_subscriber_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply             *reply = r;
+  redisReply             *el = NULL;
+  nchan_msg_t             msg;
+  nchan_compressed_msg_t  cmsg;
+  ngx_str_t               content_type;
+  ngx_str_t               eventsource_event;
+  ngx_str_t               chid_str;
+  ngx_str_t              *chid = NULL;
+  ngx_str_t               pubsub_channel; 
+  ngx_str_t               msg_redis_hash_key = ngx_null_string;
+  ngx_uint_t              subscriber_id;
+  
+  ngx_buf_t               mpbuf;
+  cmp_ctx_t               cmp;
+  
+  rdstore_channel_head_t     *chanhead = NULL;
+  redis_node_t               *node = c->data;
+  redis_nodeset_t            *nodeset = node->nodeset;
+  ngx_str_t                  *namespace = nodeset->settings.namespace;
+  
+  msg.expires = 0;
+  msg.refcount = 0;
+  msg.parent = NULL;
+  msg.storage = NCHAN_MSG_STACK;
+
+  if(reply == NULL) return;
+  
+  if(CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3)
+   && CHECK_REPLY_STR(reply->element[0])
+   && (CHECK_REPLY_STR(reply->element[1]) || CHECK_REPLY_INT(reply->element[1]))) {
+    pubsub_channel.data = (u_char *)reply->element[1]->str;
+    pubsub_channel.len = reply->element[1]->len;
+    chid = get_channel_id_from_pubsub_channel(&pubsub_channel, namespace, &chid_str);
+  }
+  else {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "no PUBSUB message, something else");
+    redisEchoCallback(c,r,privdata);
+    return;
+  }
+  
+  if((
+      CHECK_REPLY_STRVAL(reply->element[0], "message")
+      || CHECK_REPLY_STRVAL(reply->element[0], "smessage")
+     )
+    && CHECK_REPLY_STR(reply->element[2])) {
+    
+    //reply->element[1] is the pubsub channel name
+    el = reply->element[2];
+    
+    if(CHECK_REPLY_STRVAL(el, "ping") && str_match_redis_subscriber_channel(&pubsub_channel, namespace)) {
+      DBG("got pinged");
+    }
+    else if(CHECK_REPLY_STR(el)) {
+      uint32_t    array_sz;
+      unsigned    chid_present = 0;
+      ngx_str_t   extracted_channel_id;
+      unsigned    msgbuf_size_changed = 0;
+      int64_t     msgbuf_size = 0;
+      //maybe a message?
+      set_buf(&mpbuf, (u_char *)el->str, el->len);
+      cmp_init(&cmp, &mpbuf, ngx_buf_reader, NULL, ngx_buf_writer);
+      if(cmp_read_array(&cmp, &array_sz)) {
+        
+        if(array_sz != 0) {
+          uint32_t      sz;
+          ngx_str_t     msg_type;
+          cmp_read_str_size(&cmp ,&sz);
+          fwd_buf_to_str(&mpbuf, sz, &msg_type);
+          
+          if(ngx_str_chop_if_startswith(&msg_type, "max_msgs+")) {
+            if(cmp_read_integer(&cmp, &msgbuf_size))
+              msgbuf_size_changed = 1; 
+            else
+              cmp_err(&cmp);
+          }
+          
+          if(ngx_str_chop_if_startswith(&msg_type, "ch+")) {
+            if(cmp_read_str_size(&cmp, &sz)) {
+              fwd_buf_to_str(&mpbuf, sz, &extracted_channel_id);
+              chid = &extracted_channel_id;
+            }
+            else {
+              cmp_err(&cmp);
+            }
+          }
+          //else {
+          //  chid already set from the pubsub channel name
+          //}
+          
+          if(msgbuf_size_changed && (chanhead = nchan_store_get_chanhead(chid, nodeset)) != NULL) {
+            chanhead->spooler.fn->broadcast_notice(&chanhead->spooler, NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE, (void *)(intptr_t )msgbuf_size);
+          }
+          
+          if(!chanhead) {
+            chanhead = find_chanhead_for_pubsub_callback(chid);
+          }
+          
+          if(ngx_strmatch(&msg_type, "msg")) {
+            assert(array_sz >= 9 + msgbuf_size_changed + chid_present);
+            if(chanhead && cmp_to_msg(&cmp, &msg, &cmsg, &content_type, &eventsource_event)) {
+              //ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "got msg %V", msgid_to_str(&msg));
+              nchan_store_publish_generic(chid, chanhead ? chanhead->redis.nodeset : nodeset, &msg, 0, NULL);
+            }
+            else {
+              node_log_debug(node, "thought there'd be a channel (%V) for msg", chid);
+            }
+          }
+          else if(ngx_strmatch(&msg_type, "msgkey")) {
+            assert(array_sz == 4 + msgbuf_size_changed + chid_present);
+            if(chanhead != NULL) {
+              uint64_t              msgtag;
+              nchan_msg_id_t        msgid;
+              
+              if(!cmp_read_uinteger(&cmp, (uint64_t *)&msgid.time)) {
+                cmp_err(&cmp);
+                return;
+              }
+              
+              if(!cmp_read_uinteger(&cmp, &msgtag)) {
+                cmp_err(&cmp);
+                return;
+              }
+              else {
+                msgid.tag.fixed[0] = msgtag;
+                msgid.tagactive = 0;
+                msgid.tagcount = 1;
+              }
+              
+              if(cmp_to_str(&cmp, &msg_redis_hash_key)) {
+                get_msg_from_msgkey(chid, chanhead ? chanhead->redis.nodeset : node->nodeset, &msgid, &msg_redis_hash_key);
+              }
+            }
+            else {
+              node_log_error(node, "thought there'd be a channel id around for msgkey");
+            }
+          }
+          else if(ngx_strmatch(&msg_type, "alert") && array_sz > 1) {
+            ngx_str_t    alerttype;
+            
+            if(!cmp_to_str(&cmp, &alerttype)) {
+              return;
+            }
+            
+            if(ngx_strmatch(&alerttype, "delete channel") && array_sz > 2) {
+              if(cmp_to_str(&cmp, &extracted_channel_id)) {
+                rdstore_channel_head_t *doomed_channel;
+                nchan_store_publish_generic(&extracted_channel_id, nodeset, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+                doomed_channel = nchan_store_get_chanhead(&extracted_channel_id, nodeset);
+                redis_chanhead_gc_add(doomed_channel, 0, "channel deleted");
+              }
+              else {
+                node_log_error(node, "unexpected \"delete channel\" msgpack message from redis");
+              }
+            }
+            else if(ngx_strmatch(&alerttype, "unsub one") && array_sz > 3) {
+              if(cmp_to_str(&cmp, &extracted_channel_id)) {
+                cmp_to_str(&cmp, &extracted_channel_id);
+                cmp_read_uinteger(&cmp, (uint64_t *)&subscriber_id);
+                //TODO
+              }
+              node_log_error(node, "unsub one not yet implemented");
+            }
+            else if(ngx_strmatch(&alerttype, "unsub all") && array_sz > 1) {
+              if(cmp_to_str(&cmp, &extracted_channel_id)) {
+                nchan_store_publish_generic(&extracted_channel_id, nodeset, NULL, NGX_HTTP_CONFLICT, &NCHAN_HTTP_STATUS_409);
+              }
+            }
+            else if(ngx_strmatch(&alerttype, "unsub all except")) {
+              if(cmp_to_str(&cmp, &extracted_channel_id)) {
+                cmp_read_uinteger(&cmp, (uint64_t *)&subscriber_id);
+                //TODO
+              }
+              node_log_error(node, "unsub all except not yet implemented");
+            }
+            else if(ngx_strmatch(&alerttype, "subscriber info")) {
+              uint64_t request_id;
+              cmp_read_uinteger(&cmp, &request_id);
+              
+              if((chanhead = nchan_store_get_chanhead(chid, nodeset)) == NULL) {
+                node_log_error(node, "received invalid subscriber info notice with bad channel name");
+              }
+              else {
+                chanhead->spooler.fn->broadcast_notice(&chanhead->spooler, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, (void *)(intptr_t )request_id);
+              }
+            }
+            
+            else {
+              node_log_error(node, "unexpected msgpack alert from redis");
+            }
+          }
+          else {
+            node_log_error(node, "unexpected msgpack message from redis");
+          }
+        }
+        else {
+          node_log_error(node, "unexpected msgpack object from redis");
+        }
+      }
+      else {
+        node_log_error(node, "invalid msgpack message from redis: %s", cmp_strerror(&cmp));
+      }
+    }
+
+    else { //not a string
+      redisEchoCallback(c, el, NULL);
+    }
+  }
+
+  else if((CHECK_REPLY_STRVAL(reply->element[0], "subscribe") || CHECK_REPLY_STRVAL(reply->element[0], "ssubscribe")) && CHECK_REPLY_INT(reply->element[2])) {
+    if(chid) {
+      node_pubsub_time_finish_relaxed(node, NCHAN_REDIS_CMD_PUBSUB_SUBSCRIBE);
+      chanhead = find_chanhead_for_pubsub_callback(chid);
+      if(chanhead != NULL) {
+        redis_chanhead_set_pubsub_status(chanhead, node, REDIS_PUBSUB_SUBSCRIBED);
+      }
+      else {
+        node_log_error(node, "received SUBSCRIBE acknowledgement for unknown channel %V", chid);
+      }
+    }
+    else {
+      DBG("subscribed to worker channel %s", redis_subscriber_id);
+    }
+    
+    DBG("REDIS: PUB/SUB subscribed to %s (%i total)", reply->element[1]->str, reply->element[2]->integer);
+  }
+  else if((CHECK_REPLY_STRVAL(reply->element[0], "unsubscribe") || CHECK_REPLY_STRVAL(reply->element[0], "sunsubscribe")) && CHECK_REPLY_INT(reply->element[2])) {
+    
+    if(chid) {
+      DBG("received UNSUBSCRIBE acknowledgement for channel %V", chid);
+      node_pubsub_time_finish_relaxed(node, NCHAN_REDIS_CMD_PUBSUB_UNSUBSCRIBE);
+      chanhead = find_chanhead_for_pubsub_callback(chid);
+      if(chanhead != NULL) {
+        if(chanhead->pubsub_status != REDIS_PUBSUB_UNSUBSCRIBED) {
+          //didn't expect to receive an UNSUBSCRIBE -- but it does happen when a node is going down or being failed over
+          redis_chanhead_set_pubsub_status(chanhead, node, REDIS_PUBSUB_UNSUBSCRIBED);
+        }
+      }
+    }
+    else {
+      DBG("received UNSUBSCRIBE acknowledgement for worker channel %s", redis_subscriber_id);
+    }
+  }
+  
+  else {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "Unexpected PUBSUB message %s", reply->element[0]);
+    redisEchoCallback(c,r,privdata);
+  }
+}
+
+static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub);
+static ngx_int_t redis_subscriber_unregister(rdstore_channel_head_t *chanhead, subscriber_t *sub, uint8_t shutting_down);
+static void spooler_add_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
+  rdstore_channel_head_t *head = (rdstore_channel_head_t *)privdata;
+  head->sub_count++;
+  if(sub->type == INTERNAL) {
+    head->internal_sub_count++;
+  }
+  redis_subscriber_register(head, sub);
+}
+
+static void spooler_dequeue_handler(channel_spooler_t *spl, subscriber_t *sub, void *privdata) {
+  //need individual subscriber
+  //TODO
+  rdstore_channel_head_t *head = (rdstore_channel_head_t *)privdata;
+  
+  head->sub_count--;
+  if(sub->type == INTERNAL) {
+    head->internal_sub_count--;
+  }
+  
+  redis_subscriber_unregister(head, sub, head->shutting_down);
+  
+  if(head->sub_count == 0 && head->fetching_message_count == 0) {
+    redis_chanhead_gc_add(head, 0, "sub count == 0 and fetching_message_count == 0 after spooler dequeue");
+  }
+  
+}
+
+static void spooler_use_handler(channel_spooler_t *spl, void *d) {
+  //nothing. 
+}
+
+static void spooler_get_message_start_handler(channel_spooler_t *spl, void *pd) {
+  ((rdstore_channel_head_t *)pd)->fetching_message_count++;
+}
+
+static void spooler_get_message_finish_handler(channel_spooler_t *spl, void *pd) {
+  ((rdstore_channel_head_t *)pd)->fetching_message_count--;
+  assert(((rdstore_channel_head_t *)pd)->fetching_message_count >= 0);
+}
+
+static ngx_int_t start_chanhead_spooler(rdstore_channel_head_t *head) {
+  static uint8_t channel_buffer_complete = 1;
+  spooler_fetching_strategy_t spooling_strategy;
+  static channel_spooler_handlers_t handlers = {
+    spooler_add_handler,
+    spooler_dequeue_handler,
+    NULL,
+    spooler_use_handler,
+    spooler_get_message_start_handler,
+    spooler_get_message_finish_handler
+  };
+  nchan_loc_conf_t *lcf = head->redis.nodeset->first_loc_conf; //any loc_conf that refers to this nodeset will work. 
+  //the spooler needs it to pass to get_message calls, which in rdstore's case only cares about the nodeset referenced in the loc_conf
+  if(head->redis.nodeset->settings.storage_mode == REDIS_MODE_DISTRIBUTED_NOSTORE) {
+    spooling_strategy = NCHAN_SPOOL_PASSTHROUGH;
+  }
+  else {
+    spooling_strategy = NCHAN_SPOOL_FETCH;
+  }
+  
+  start_spooler(&head->spooler, &head->id, &head->status, &channel_buffer_complete, &nchan_store_redis, lcf, spooling_strategy, &handlers, head);
+  return NGX_OK;
+}
+
+static void redis_update_channel_keepalive_timer(rdstore_channel_head_t *ch, int keepalive_from_redis_msec) {
+  ngx_msec_t new_interval = keepalive_from_redis_msec;
+  if(keepalive_from_redis_msec < 0) {
+    //timer doesn't need to be set
+    return;
+  }
+  
+  // use the TTL provided. it might be the one we gave it, or it might be longer
+  ch->keepalive_interval = new_interval;
+    
+  if(ch->keepalive_timer.timer_set) {
+    ngx_del_timer(&ch->keepalive_timer);
+  }
+  ngx_add_timer(&ch->keepalive_timer, ch->keepalive_interval);
+}
+
+static void redis_subscriber_register_cb(redisAsyncContext *c, void *vr, void *privdata);
+
+typedef struct {
+  rdstore_channel_head_t *chanhead;
+  unsigned                generation;
+  subscriber_t           *sub;
+} redis_subscriber_register_t;
+
+static ngx_int_t redis_subscriber_register_send(redis_nodeset_t *nodeset, void *pd) {
+  redis_subscriber_register_t   *d = pd;
+  if(nodeset_ready(nodeset)) {
+    d->chanhead->reserved++;
+    redis_node_t *node = nodeset_node_find_by_chanhead(d->chanhead);
+    node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_SUBSCRIBE);
+    
+    nchan_redis_script(subscriber_register, node, &redis_subscriber_register_cb, d, &d->chanhead->id,
+                       "- %i %i %i 1",
+                       d->chanhead->keepalive_interval,
+                       nodeset->settings.idle_channel_ttl_safety_margin,
+                       ngx_time()
+                      );
+  }
+  else {
+    d->sub->fn->release(d->sub, 0);
+    ngx_free(d);
+  }
+  return NGX_OK;
+}
+
+
+static ngx_int_t redis_subscriber_register(rdstore_channel_head_t *chanhead, subscriber_t *sub) {
+  redis_subscriber_register_t *sdata=NULL;
+  if((sdata = ngx_alloc(sizeof(*sdata), ngx_cycle->log)) == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "No memory for sdata. Part IV, subparagraph 12 of the Cryptic Error Series.");
+    return NGX_ERROR;
+  }
+  sdata->chanhead = chanhead;
+  sdata->generation = chanhead->generation;
+  sdata->sub = sub;
+  
+  sub->fn->reserve(sub);
+  
+  //input: keys: [], values: [channel_id, subscriber_id, active_ttl]
+  //  'subscriber_id' can be '-' for new id, or an existing id
+  //  'active_ttl' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in sec
+  //output: subscriber_id, num_current_subscribers, next_keepalive_time
+  redis_subscriber_register_send(chanhead->redis.nodeset, sdata);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t redis_subscriber_register_send_retry_wrapper(redis_nodeset_t *nodeset, void *pd) {
+  redis_subscriber_register_t   *d = pd;
+  d->chanhead->reserved--;
+  return redis_subscriber_register_send(nodeset, pd);
+}
+
+static void redis_subscriber_register_cb(redisAsyncContext *c, void *vr, void *privdata) {
+  redis_subscriber_register_t *sdata= (redis_subscriber_register_t *) privdata;
+  redisReply                  *reply = (redisReply *)vr;
+  redis_node_t                *node = c->data;
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_SUBSCRIBE);
+  
+  sdata->chanhead->reserved--;
+  
+  if(!nodeset_node_reply_keyslot_ok(node, reply) && nodeset_node_can_retry_commands(node)) {
+    sdata->chanhead->reserved++;
+    nodeset_callback_on_ready(node->nodeset, redis_subscriber_register_send_retry_wrapper, sdata);
+    return; 
+  }
+  
+  if (!redisReplyOk(c, reply)) {
+    //TODO: fail less silently, maybe retry subscriber registration?
+    sdata->sub->fn->release(sdata->sub, 0);
+    ngx_free(sdata);
+    return;
+  }
+  
+  if(  CHECK_REPLY_ARRAY_MIN_SIZE(reply, 4)
+    && CHECK_REPLY_INT(reply->element[3])
+  ) {
+    //notify about channel buffer size if it's present
+    sdata->sub->fn->notify(sdata->sub, NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE, (void *)(intptr_t )reply->element[3]->integer);
+  }
+  
+  if(sdata->generation == sdata->chanhead->generation) {
+    //is the subscriber     
+    //TODO: set subscriber id
+    //sdata->sub->id = reply->element[1]->integer;
+  }
+  
+  sdata->sub->fn->release(sdata->sub, 0);
+  sdata->sub = NULL; //don't use it anymore, it might have been freed
+  
+  if ( !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 3) || !CHECK_REPLY_INT(reply->element[1]) || !CHECK_REPLY_INT(reply->element[2])) {
+    //no good
+    //TODO: fail less silently, maybe retry subscriber registration?
+    redisEchoCallback(c,reply,privdata);
+    ngx_free(sdata);
+    return;
+  }
+  
+  redis_update_channel_keepalive_timer(sdata->chanhead, reply->element[2]->integer);
+  
+  ngx_free(sdata);
+}
+
+
+typedef struct {
+  ngx_str_t    *channel_id;
+  time_t        channel_timeout;
+  unsigned      allocd:1;
+} subscriber_unregister_data_t;
+
+static void redis_subscriber_unregister_cb(redisAsyncContext *c, void *r, void *privdata);
+static ngx_int_t redis_subscriber_unregister_send(redis_nodeset_t *nodeset, void *pd) {
+  //input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]
+  // 'subscriber_id' is an existing id
+  // 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
+  //output: subscriber_id, num_current_subscribers
+  subscriber_unregister_data_t *d = pd;
+  if(nodeset_ready(nodeset)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, d->channel_id);
+    node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_UNSUBSCRIBE);
+    nchan_redis_script( subscriber_unregister, node, &redis_subscriber_unregister_cb, NULL, 
+      d->channel_id, "%i %i", 
+                       0/*TODO: sub->id*/,
+                       d->channel_timeout
+                      );
+  }
+  if(d->allocd) {
+    ngx_free(d);
+  }
+  return NGX_OK;
+}
+
+static void redis_subscriber_unregister_cb(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply      *reply = r;
+  redis_node_t    *node = c->data;
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_UNSUBSCRIBE);
+  
+  if(reply && reply->type == REDIS_REPLY_ERROR) {
+    ngx_str_t    errstr;
+    ngx_str_t    countstr;
+    ngx_str_t    channel_id;
+    ngx_int_t    channel_timeout;
+    
+    errstr.data = (u_char *)reply->str;
+    errstr.len = strlen(reply->str);
+    
+    if(ngx_str_chop_if_startswith(&errstr, "CLUSTER KEYSLOT ERROR. ")) {
+      nodeset_node_keyslot_changed(node, "CLUSTER KEYSLOT error");
+      nchan_scan_until_chr_on_line(&errstr, &countstr, ' ');
+      channel_timeout = ngx_atoi(countstr.data, countstr.len);
+      channel_id = errstr;
+      
+      subscriber_unregister_data_t  *d = ngx_alloc(sizeof(*d) + sizeof(ngx_str_t) + channel_id.len, ngx_cycle->log);
+      if(!d) {
+        ERR("can't allocate add_fakesub_data for CLUSTER KEYSLOT ERROR retry");
+        return;
+      }
+      d->channel_timeout = channel_timeout;
+      d->channel_id = (ngx_str_t *)&d[1];
+      d->channel_id->data = (u_char *)&d->channel_id[1];
+      d->allocd = 1;
+      nchan_strcpy(d->channel_id, &channel_id, 0);
+      nodeset_callback_on_ready(node->nodeset, redis_subscriber_unregister_send, d);
+      return;
+    }
+    
+  }
+  redisCheckErrorCallback(c, r, privdata);
+}
+
+static ngx_int_t redis_subscriber_unregister(rdstore_channel_head_t *chanhead, subscriber_t *sub, uint8_t shutting_down) {
+  nchan_loc_conf_t  *cf = sub->cf;
+  
+  if(!shutting_down) {
+    subscriber_unregister_data_t d;
+    d.channel_id = &chanhead->id;
+    d.channel_timeout = cf->channel_timeout;
+    d.allocd = 0;
+    redis_subscriber_unregister_send(chanhead->redis.nodeset, &d);
+  }
+  else {
+    if(nodeset_ready(chanhead->redis.nodeset)) {
+      redis_node_t   *node = nodeset_node_find_by_chanhead(chanhead);
+      nchan_redis_sync_script(subscriber_unregister, node, &chanhead->id, "%i %i", 
+                              0/*TODO: sub->id*/,
+                              cf->channel_timeout
+                            );
+    }
+  }
+  return NGX_OK;
+}
+
+
+static void redisChannelKeepaliveCallback(redisAsyncContext *c, void *vr, void *privdata);
+
+static ngx_int_t redisChannelKeepaliveCallback_send(redis_nodeset_t *ns, void *pd) {
+  rdstore_channel_head_t   *head = pd;
+  //TODO: optimize this
+  redis_node_t *node = nodeset_node_find_by_channel_id(head->redis.nodeset, &head->id);
+  if(nodeset_ready(ns)) {
+    head->reserved++;
+    
+    nchan_set_next_backoff(&head->keepalive_interval, &ns->settings.idle_channel_ttl);
+    node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_KEEPALIVE);
+    nchan_redis_script(channel_keepalive, node, &redisChannelKeepaliveCallback, head, &head->id, "%i %i", head->keepalive_interval, ns->settings.idle_channel_ttl_safety_margin);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t redisChannelKeepaliveCallback_retry_wrapper(redis_nodeset_t *ns, void *pd) {
+  rdstore_channel_head_t   *head = pd;
+  head->reserved--;
+  return redisChannelKeepaliveCallback_send(ns, pd);
+}
+
+static void redisChannelKeepaliveCallback(redisAsyncContext *c, void *vr, void *privdata) {
+  rdstore_channel_head_t   *head = (rdstore_channel_head_t *)privdata;
+  redisReply               *reply = (redisReply *)vr;
+  redis_node_t             *node = c->data;
+  
+  head->reserved--;
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_KEEPALIVE);
+  
+  if(!nodeset_node_reply_keyslot_ok(node, reply) && nodeset_node_can_retry_commands(node)) {
+    head->reserved++;
+    nodeset_callback_on_ready(node->nodeset, redisChannelKeepaliveCallback_retry_wrapper, head);
+    return;
+  }
+  
+  if(!redisReplyOk(c, reply)) {
+    node_log_error(node, "bad channel keepalive reply for channel %V", &head->id);
+    if(!head->keepalive_timer.timer_set) {
+      ngx_add_timer(&head->keepalive_timer, head->keepalive_interval);
+    }
+    return;
+  }
+
+  assert(CHECK_REPLY_INT(reply));
+  
+  redis_update_channel_keepalive_timer(head, reply->integer);
+}
+
+static void redis_channel_keepalive_timer_handler(ngx_event_t *ev) {
+  rdstore_channel_head_t   *head = ev->data;
+  if(ev->timedout) {
+    ev->timedout=0;
+    if(head->pubsub_status != REDIS_PUBSUB_SUBSCRIBED || head->status == NOTREADY) {
+      //no use trying to keepalive a not-ready (possibly disconnected) chanhead
+      DBG("Tried sending channel keepalive when channel is not ready");
+      ngx_add_timer(ev, REDIS_CHANNEL_KEEPALIVE_NOTREADY_RETRY_TIME); //retry after reconnect timeout
+    }
+    else {
+      redisChannelKeepaliveCallback_send(head->redis.nodeset, head);
+    }
+  }
+}
+
+ngx_int_t ensure_chanhead_pubsub_subscribed_if_needed(rdstore_channel_head_t *ch) {
+  redis_node_t       *pubsub_node;
+  if( ch->pubsub_status != REDIS_PUBSUB_SUBSCRIBED && ch->pubsub_status != REDIS_PUBSUB_SUBSCRIBING
+   && ch->redis.nodeset->settings.storage_mode >= REDIS_MODE_DISTRIBUTED
+   && nodeset_ready(ch->redis.nodeset)
+  ) {
+    pubsub_node = nodeset_node_pubsub_find_by_chanhead(ch);
+    
+    redis_chanhead_set_pubsub_status(ch, pubsub_node, REDIS_PUBSUB_SUBSCRIBING);
+    node_pubsub_time_start(pubsub_node, NCHAN_REDIS_CMD_PUBSUB_SUBSCRIBE);
+    redis_subscriber_command(pubsub_node, redis_subscriber_callback, pubsub_node, "%s %b", pubsub_node->nodeset->use_spublish ? "SSUBSCRIBE" : "SUBSCRIBE", STR(&ch->redis.pubsub_id));
+  }
+  return NGX_OK;
+}
+
+ngx_int_t redis_chanhead_catch_up_after_reconnect(rdstore_channel_head_t *ch) {
+  return spooler_catch_up(&ch->spooler);
+}
+
+static rdstore_channel_head_t *create_chanhead(ngx_str_t *channel_id, redis_nodeset_t *ns) {
+  rdstore_channel_head_t   *head;
+  
+  size_t pubsub_id_len = strlen("{channel:}:pubsub") + channel_id->len + ns->settings.namespace->len + 1;
+  
+  head=ngx_calloc(sizeof(*head) + sizeof(u_char)*(channel_id->len) + pubsub_id_len, ngx_cycle->log);
+  if(head==NULL) {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "can't allocate memory for (new) channel subscriber head");
+    return NULL;
+  }
+  head->id.len = channel_id->len;
+  head->id.data = (u_char *)&head[1];
+  ngx_memcpy(head->id.data, channel_id->data, channel_id->len);
+  head->redis.pubsub_id.data = &head->id.data[head->id.len];
+  ngx_sprintf(head->redis.pubsub_id.data, "%V{channel:%V}:pubsub%Z", ns->settings.namespace, channel_id);
+  head->redis.pubsub_id.len=pubsub_id_len-1; //sans null
+  head->sub_count=0;
+  head->fetching_message_count=0;
+  head->redis_subscriber_privdata = NULL;
+  head->status = NOTREADY;
+  head->pubsub_status = REDIS_PUBSUB_UNSUBSCRIBED;
+  head->generation = 0;
+  head->last_msgid.time=0;
+  head->last_msgid.tag.fixed[0]=0;
+  head->last_msgid.tagcount = 1;
+  head->last_msgid.tagactive = 0;
+  head->shutting_down = 0;
+  head->reserved = 0;
+  head->keepalive_interval = 0;
+  
+  head->gc.in_reaper = 0;
+  head->gc.time = 0;
+  head->gc.prev = NULL;
+  head->gc.next = NULL;
+  
+  if(head->id.len >= 5 && ngx_strncmp(head->id.data, "meta/", 5) == 0) {
+    head->meta = 1;
+  }
+  else {
+    head->meta = 0;
+  }
+
+  ngx_memzero(&head->keepalive_timer, sizeof(head->keepalive_timer));
+  nchan_init_timer(&head->keepalive_timer, redis_channel_keepalive_timer_handler, head);
+  nchan_set_next_backoff(&head->keepalive_interval, &ns->settings.idle_channel_ttl);
+  if(channel_id->len > 2) { // absolutely no multiplexed channels allowed
+    assert(ngx_strncmp(head->id.data, "m/", 2) != 0);
+  }
+  
+  head->redis.nodeset = ns;
+  head->redis.generation = 0;
+  head->redis.node.cmd = NULL;
+  head->redis.node.pubsub = NULL;
+  ngx_memzero(&head->redis.slist, sizeof(head->redis.slist));
+  
+  if(head->redis.nodeset->settings.storage_mode == REDIS_MODE_BACKUP) {
+    head->status = READY;
+  }
+  
+  head->spooler.running=0;
+  start_chanhead_spooler(head);
+  if(head->meta) {
+    head->spooler.publish_events = 0;
+  }
+  
+  ensure_chanhead_pubsub_subscribed_if_needed(head);
+  CHANNEL_HASH_ADD(head);
+  
+  return head;
+}
+
+static rdstore_channel_head_t * nchan_store_get_chanhead(ngx_str_t *channel_id, redis_nodeset_t *nodeset) {
+  rdstore_channel_head_t    *head;
+  
+  CHANNEL_HASH_FIND(channel_id, head); //BUG: this doesn't account for namespacing!!
+  if(head==NULL) {
+    head = create_chanhead(channel_id, nodeset);
+  }
+  if(head == NULL) {
+    ERR("can't create chanhead for redis store");
+    return NULL;
+  }
+  
+  if (head->status == INACTIVE) { //recycled chanhead
+    ensure_chanhead_pubsub_subscribed_if_needed(head);
+    redis_chanhead_gc_withdraw(head);
+    
+    if(head->redis.nodeset->settings.storage_mode == REDIS_MODE_BACKUP) {
+      head->status = READY;
+    }
+    else {
+      head->status = head->pubsub_status == REDIS_PUBSUB_SUBSCRIBED ? READY : NOTREADY;
+    }
+  }
+
+  if(!head->spooler.running) {
+    DBG("Spooler for channel %p %V wasn't running. start it.", head, &head->id);
+    start_chanhead_spooler(head);
+  }
+  
+  return head;
+}
+
+ngx_int_t redis_chanhead_gc_add(rdstore_channel_head_t *head, ngx_int_t expire, const char *reason) {
+  assert(head->sub_count == 0);
+  nchan_reaper_t *reaper = &head->redis.nodeset->chanhead_reaper;
+  if(!head->gc.in_reaper) {
+    assert(head->status != INACTIVE);
+    head->status = INACTIVE;
+    head->gc.time = ngx_time() + (expire == 0 ? NCHAN_CHANHEAD_EXPIRE_SEC : expire);
+    head->gc.in_reaper = 1;
+    
+    nchan_reaper_add(reaper, head);
+    
+    DBG("gc_add chanhead %V to %s (%s)", &head->id, reaper->name, reason);
+  }
+  else {
+    ERR("gc_add chanhead %V to %s: already added (%s)", &head->id, reaper->name, reason);
+  }
+
+  return NGX_OK;
+}
+
+ngx_int_t redis_chanhead_gc_withdraw(rdstore_channel_head_t *chanhead) {
+  if(chanhead->gc.in_reaper) {
+    nchan_reaper_t *reaper = &chanhead->redis.nodeset->chanhead_reaper;
+    DBG("gc_withdraw chanhead %s from %V", reaper->name, &chanhead->id);
+    assert(chanhead->status == INACTIVE);
+    
+    nchan_reaper_withdraw(reaper, chanhead);
+    chanhead->gc.in_reaper = 0;
+  }
+  else {
+    DBG("gc_withdraw chanhead (%V), but not in gc reaper", &chanhead->id);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_publish_generic(ngx_str_t *channel_id, redis_nodeset_t *nodeset, nchan_msg_t *msg, ngx_int_t status_code, const ngx_str_t *status_line){
+  rdstore_channel_head_t   *head;
+  ngx_int_t                 ret;
+  //redis_channel_head_cleanup_t *hcln;
+  
+  
+  
+  head = nchan_store_get_chanhead(channel_id, nodeset);
+  
+  if(head->sub_count > 0) {
+    if(msg) {
+      assert(msg->id.tagcount == 1);
+      head->last_msgid.time = msg->id.time;
+      head->last_msgid.tag.fixed[0] = msg->id.tag.fixed[0];
+      head->last_msgid.tagcount = 1;
+      head->last_msgid.tagactive = 0;
+      
+      head->spooler.fn->respond_message(&head->spooler, msg);
+    }
+    else {
+      head->spooler.fn->broadcast_status(&head->spooler, status_code, status_line);
+    }
+    ret= NGX_OK;
+  }
+  else {
+    ret= NCHAN_MESSAGE_QUEUED;
+  }
+  return ret;
+}
+
+
+static ngx_int_t redis_array_to_channel(redisReply *r, nchan_channel_t *ch) {
+  ngx_str_t       msgid;
+  nchan_msg_id_t  zeroid = NCHAN_OLDEST_MSGID;
+  
+  if ( CHECK_REPLY_ARRAY_MIN_SIZE(r, 5)
+    && CHECK_REPLY_INT(r->element[0])
+    && CHECK_REPLY_INT(r->element[1])
+    && CHECK_REPLY_INT(r->element[2])
+    && CHECK_REPLY_STR(r->element[3])
+    && CHECK_REPLY_INT(r->element[4])) {
+    
+    //channel info
+    ch->last_seen = r->element[1]->integer;
+    ch->subscribers = r->element[2]->integer;
+  
+    msgid.data = (u_char *)r->element[3]->str;
+    msgid.len = r->element[3]->len;
+      
+    if(msgid.len == 0) {
+      ch->last_published_msg_id = zeroid;
+    }
+    else if(nchan_parse_compound_msgid(&ch->last_published_msg_id, &msgid, 1) != NGX_OK) {
+      ERR("failed to parse last-msgid %V from redis", &msgid);
+    }
+  
+    ch->messages = r->element[4]->integer;
+    
+    //no id?..
+    ch->id.len=0;
+    ch->id.data=NULL;
+    
+    //queued messages
+    if( CHECK_REPLY_ARRAY_MIN_SIZE(r, 6)
+      && CHECK_REPLY_INT(r->element[5])) {
+      
+      ch->messages = r->element[5]->integer;
+    }
+    
+    return NGX_OK;
+  }
+  else if(CHECK_REPLY_NIL(r)) {
+    return NGX_DECLINED;
+  }
+  else {
+    return NGX_ERROR;
+  }
+}
+
+typedef struct {
+  ngx_msec_t           t;
+  char                *name;
+  ngx_str_t           *channel_id;
+  callback_pt          callback;
+  void                *privdata;
+} redis_channel_callback_data_t;
+
+#define CREATE_CALLBACK_DATA(d, nodeset, cf, namestr, channel_id, callback, privdata) \
+  do {                                                                       \
+    if ((d = ngx_alloc(sizeof(*d) + ((nodeset)->cluster.enabled ? (sizeof(*channel_id) + channel_id->len) : 0), ngx_cycle->log)) == NULL) { \
+      ERR("Can't allocate redis %s channel callback data", namestr);         \
+      return NGX_ERROR;                                                      \
+    }                                                                        \
+    d->t = ngx_current_msec;                                                 \
+    d->name = namestr;                                                       \
+    if((nodeset)->cluster.enabled) {                                            \
+      /* might need to use channel id later to retry the command */          \
+      d->channel_id = (ngx_str_t *)&d[1];                                    \
+      d->channel_id->data = (u_char *)&d->channel_id[1];                     \
+      nchan_strcpy(d->channel_id, channel_id, 0);                            \
+    }                                                                        \
+    else {                                                                   \
+      d->channel_id = channel_id;                                            \
+    }                                                                        \
+    d->callback = callback;                                                  \
+    d->privdata = privdata;                                                  \
+  } while(0)
+
+static void redisChannelInfoCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply *reply=r;
+  redis_channel_callback_data_t *d=(redis_channel_callback_data_t *)privdata;
+  nchan_channel_t channel;
+  ngx_memzero(&channel, sizeof(channel)); // for ddebugging. this should be removed later.
+  
+  log_redis_reply(d->name, d->t);
+  
+  if(d->callback) {
+    if(reply) {
+      switch(redis_array_to_channel(reply, &channel)) {
+        case NGX_OK:
+          d->callback(NGX_OK, &channel, d->privdata);
+          break;
+        case NGX_DECLINED: //not found
+          d->callback(NGX_OK, NULL, d->privdata);
+          break;
+        case NGX_ERROR:
+        default:
+          redisEchoCallback(c, r, privdata);
+          d->callback(NGX_ERROR, NULL, d->privdata);
+      }
+    }
+    else {
+      d->callback(NGX_ERROR, NULL, d->privdata);
+    }
+  }
+}
+
+static void redisChannelDeleteCallback(redisAsyncContext *c, void *r, void *privdata);
+
+static ngx_int_t nchan_store_delete_channel_send(redis_nodeset_t *ns, void *pd) {
+  redis_channel_callback_data_t *d = pd;
+  if(nodeset_ready(ns)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(ns, d->channel_id);
+    node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_DELETE);
+    nchan_redis_script(delete, node, &redisChannelDeleteCallback, d, d->channel_id, "%s %i",ns->use_spublish ? "SPUBLISH" : "PUBLISH", ns->settings.accurate_subscriber_count);
+    return NGX_OK;
+  }
+  else {
+    redisChannelDeleteCallback(NULL, NULL, d);
+    return NGX_ERROR;
+  }
+}
+
+static void redisChannelDeleteCallback(redisAsyncContext *ac, void *r, void *privdata) {
+  redis_node_t  *node = ac ? ac->data : NULL;
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_DELETE);
+  if(ac) {
+    if(!nodeset_node_reply_keyslot_ok(node, (redisReply *)r) && nodeset_node_can_retry_commands(node)) {
+      nodeset_callback_on_ready(node->nodeset, nchan_store_delete_channel_send, privdata);
+      return;
+    }
+  }
+  redisChannelInfoCallback(ac, r, privdata);
+  ngx_free(privdata);
+}
+
+static ngx_int_t nchan_store_delete_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  redis_channel_callback_data_t *d;
+  redis_nodeset_t               *ns = nodeset_find(&cf->redis);
+  CREATE_CALLBACK_DATA(d, ns, cf, "delete", channel_id, callback, privdata);
+
+  return nchan_store_delete_channel_send(ns, d);
+}
+
+
+static void redisChannelFindCallback(redisAsyncContext *c, void *r, void *privdata);
+
+static ngx_int_t nchan_store_find_channel_send(redis_nodeset_t *ns, void *pd) {
+  redis_channel_callback_data_t *d = pd;
+  if(nodeset_ready(ns)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(ns, d->channel_id);
+    node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_FIND);
+    nchan_redis_script(find_channel, node, &redisChannelFindCallback, d, d->channel_id, "%i", ns->settings.accurate_subscriber_count);
+  }
+  else {
+    redisChannelFindCallback(NULL, NULL, d);
+  }
+  return NGX_OK;
+}
+
+static void redisChannelFindCallback(redisAsyncContext *ac, void *r, void *privdata) {
+  redis_node_t                 *node = ac ? ac->data : NULL;
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_FIND);
+  
+  if(ac) {
+    node = ac->data;
+    
+    if(!nodeset_node_reply_keyslot_ok(node, (redisReply *)r) && nodeset_node_can_retry_commands(node)) {
+      nodeset_callback_on_ready(node->nodeset, nchan_store_find_channel_send, privdata);
+      return;
+    }
+  }
+  
+  redisChannelInfoCallback(ac, r, privdata);
+  ngx_free(privdata);
+}
+
+static ngx_int_t nchan_store_find_channel(ngx_str_t *channel_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  redis_channel_callback_data_t *d;
+  redis_nodeset_t               *ns = nodeset_find(&cf->redis);
+  CREATE_CALLBACK_DATA(d, ns, cf, "find_channel", channel_id, callback, privdata);
+  
+  nchan_store_find_channel_send(ns, d);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t msg_from_redis_get_message_reply(nchan_msg_t *msg, nchan_compressed_msg_t *cmsg, ngx_str_t *content_type, ngx_str_t *eventsource_event, redisReply *r, uint16_t offset) {
+  
+  redisReply         **els = r->element;
+  size_t               content_type_len = 0, es_event_len = 0;
+  ngx_int_t            time_int = 0, ttl;
+  ngx_int_t            compression;
+  
+  if(CHECK_REPLY_ARRAY_MIN_SIZE(r, offset + 8)
+   && CHECK_REPLY_INT(els[offset])            //msg TTL
+   && CHECK_REPLY_INT_OR_STR(els[offset+1])   //id - time
+   && CHECK_REPLY_INT_OR_STR(els[offset+2])   //id - tag
+   && CHECK_REPLY_INT_OR_STR(els[offset+3])   //prev_id - time
+   && CHECK_REPLY_INT_OR_STR(els[offset+4])   //prev_id - tag
+   && CHECK_REPLY_STR(els[offset+5])   //message
+   && CHECK_REPLY_STR(els[offset+6])   //content-type
+   && CHECK_REPLY_STR(els[offset+7])  //eventsource event
+  ) {
+  
+    content_type_len=els[offset+6]->len;
+    es_event_len = els[offset+7]->len;
+    
+    ngx_memzero(msg, sizeof(*msg));
+    
+    msg->buf.start = msg->buf.pos = (u_char *)els[offset+5]->str;
+    msg->buf.end = msg->buf.last = msg->buf.start + els[offset+5]->len;
+    msg->buf.memory = 1;
+    msg->buf.last_buf = 1;
+    msg->buf.last_in_chain = 1;
+    
+    if(redisReply_to_ngx_int(els[offset], &ttl) != NGX_OK) {
+      ERR("invalid ttl integer value in msg response from redis");
+      return NGX_ERROR;
+    }
+    assert(ttl >= 0);
+    if(ttl == 0)
+      ttl++; // less than a second left for this message... give it a second's lease on life
+    
+    msg->expires = ngx_time() + ttl;
+    
+    msg->compressed = NULL;
+    if(r->elements >= (uint16_t )(offset + 8)) {
+      if(!CHECK_REPLY_INT_OR_STR(els[offset+8]) || redisReply_to_ngx_int(els[offset+8], &compression) != NGX_OK) {
+        ERR("invalid compression type integer value in msg response from redis");
+        return NGX_ERROR;
+      }
+      if((nchan_msg_compression_type_t )compression != NCHAN_MSG_COMPRESSION_INVALID && (nchan_msg_compression_type_t )compression != NCHAN_MSG_NO_COMPRESSION) {
+        msg->compressed = cmsg;
+        ngx_memzero(&cmsg->buf, sizeof(cmsg->buf));
+        cmsg->compression = (nchan_msg_compression_type_t )compression;
+      }
+    }
+    
+    if(content_type_len > 0) {
+      msg->content_type = content_type;
+      msg->content_type->len=content_type_len;
+      msg->content_type->data=(u_char *)els[offset+6]->str;
+    }
+    else {
+      msg->content_type = NULL;
+    }
+    
+    if(es_event_len > 0) {
+      msg->eventsource_event = eventsource_event;
+      msg->eventsource_event->len=es_event_len;
+      msg->eventsource_event->data=(u_char *)els[offset+7]->str;
+    }
+    else {
+      msg->eventsource_event = NULL;
+    }
+    
+    if(redisReply_to_ngx_int(els[offset+1], &time_int) == NGX_OK) {
+      msg->id.time = time_int;
+    }
+    else {
+      msg->id.time = 0;
+      ERR("invalid msg time from redis");
+    }
+    
+    redisReply_to_ngx_int(els[offset+2], (ngx_int_t *)&msg->id.tag.fixed[0]); // tag is a uint, meh.
+    msg->id.tagcount = 1;
+    msg->id.tagactive = 0;
+    
+    redisReply_to_ngx_int(els[offset+3], &time_int);
+    msg->prev_id.time = time_int;
+    redisReply_to_ngx_int(els[offset+4], (ngx_int_t *)&msg->prev_id.tag.fixed[0]);
+    msg->prev_id.tagcount = 1;
+    msg->prev_id.tagactive = 0;
+    
+    return NGX_OK;
+  }
+  else {
+    ERR("invalid message redis reply");
+    return NGX_ERROR;
+  }
+}
+
+typedef struct {
+  ngx_msec_t              t;
+  char                   *name;
+  ngx_str_t              *channel_id;
+  nchan_msg_tiny_id_t     msg_id;
+  callback_pt             callback;
+  void                   *privdata;
+} redis_get_message_data_t;
+
+static void redis_get_message_callback(redisAsyncContext *c, void *r, void *privdata);
+
+static ngx_int_t nchan_store_async_get_message_send(redis_nodeset_t *ns, void *pd) {
+  redis_get_message_data_t           *d = pd;
+  //input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
+  //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, channel_subscriber_count
+  if(nodeset_ready(ns)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(ns, d->channel_id);
+    node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_GET_MESSAGE);
+    nchan_redis_script(get_message, node, &redis_get_message_callback, d, d->channel_id, "%i %i FILO 0", 
+                       d->msg_id.time, 
+                       d->msg_id.tag
+                      );
+  }
+  else {
+    //TODO: pass on a get_msg error status maybe?
+    ngx_free(d);
+  }
+  return NGX_OK;
+}
+
+static void redis_get_message_callback(redisAsyncContext *ac, void *r, void *privdata) {
+  redisReply                *reply= r;
+  redis_get_message_data_t  *d= (redis_get_message_data_t *)privdata;
+  nchan_msg_t                msg;
+  nchan_compressed_msg_t     cmsg;
+  ngx_str_t                  content_type;
+  ngx_str_t                  eventsource_event;
+  redis_node_t              *node = ac ? ac->data : NULL;
+
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_GET_MESSAGE);
+  
+  if(d == NULL) {
+    ERR("redis_get_mesage_callback has NULL userdata");
+    return;
+  }
+  
+  if(ac) {
+    if(!nodeset_ready(node->nodeset) || (!nodeset_node_reply_keyslot_ok(node, reply) && nodeset_node_can_retry_commands(node))) {
+      nodeset_callback_on_ready(node->nodeset, nchan_store_async_get_message_send, privdata);
+      return;
+    }
+  
+    log_redis_reply(d->name, d->t);
+  
+    //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count
+    // result_code can be: 200 - ok, 403 - channel not found, 404 - not found, 410 - gone, 418 - not yet available
+  
+    if (!redisReplyOk(ac, r) || !CHECK_REPLY_ARRAY_MIN_SIZE(reply, 1) || !CHECK_REPLY_INT(reply->element[0]) ) {
+      //no good
+      ngx_free(d);
+      return;
+    }
+  
+    switch(reply->element[0]->integer) {
+      case 200: //ok
+        if(msg_from_redis_get_message_reply(&msg, &cmsg, &content_type, &eventsource_event, reply, 1) == NGX_OK) {
+          d->callback(MSG_FOUND, &msg, d->privdata);
+        }
+        break;
+      case 403: //channel not found
+      case 404: //not found
+        d->callback(MSG_NOTFOUND, NULL, d->privdata);
+        break;
+      case 410: //gone
+        d->callback(MSG_EXPIRED, NULL, d->privdata);
+        break;
+      case 418: //not yet available
+        d->callback(MSG_EXPECTED, NULL, d->privdata);
+        break;
+    }
+  }
+  else {
+    ERR("redisAsyncContext NULL for redis_get_message_callback");
+  }
+  
+  ngx_free(d);
+}
+
+static ngx_int_t nchan_store_async_get_message(ngx_str_t *channel_id, nchan_msg_id_t *msg_id, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  redis_get_message_data_t      *d;
+  redis_nodeset_t               *ns = nodeset_find(&cf->redis);
+  if(callback==NULL) {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "no callback given for async get_message. someone's using the API wrong!");
+    return NGX_ERROR;
+  }
+  
+  assert(msg_id->tagcount == 1);
+  
+  CREATE_CALLBACK_DATA(d, ns, cf, "get_message", channel_id, callback, privdata);
+  d->msg_id.time = msg_id->time;
+  d->msg_id.tag = msg_id->tag.fixed[0];
+  
+  nchan_store_async_get_message_send(ns, d);
+  return NGX_OK; //async only now!
+}
+
+
+typedef struct nchan_redis_conf_ll_s nchan_redis_conf_ll_t;
+struct nchan_redis_conf_ll_s {
+  nchan_loc_conf_t       *lcf;
+  nchan_redis_conf_ll_t  *next;
+};
+
+nchan_redis_conf_ll_t   *redis_conf_head;
+
+ngx_int_t nchan_store_redis_add_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf) {
+  nchan_redis_conf_ll_t  *rcf_ll = ngx_palloc(cf->pool, sizeof(*rcf_ll));
+  rcf_ll->lcf = loc_conf;
+  rcf_ll->next = redis_conf_head;
+  redis_conf_head = rcf_ll;
+  return NGX_OK;
+}
+
+ngx_int_t nchan_store_redis_remove_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf) {
+  nchan_redis_conf_ll_t  *cur, *prev;
+  
+  for(cur = redis_conf_head, prev = NULL; cur != NULL; prev = cur, cur = cur->next) {
+    if(cur->lcf == loc_conf) { //found it
+      if(prev == NULL) {
+        redis_conf_head = cur->next;
+      }
+      else {
+        prev->next = cur->next;
+      }
+      //don't need to ngx_pfree
+      return NGX_OK;
+    }
+  }
+  return NGX_OK;
+}
+
+//initialization
+static ngx_int_t nchan_store_init_module(ngx_cycle_t *cycle) {
+  ngx_core_conf_t                *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+  nchan_worker_processes = ccf->worker_processes;
+  return NGX_OK;
+}
+
+
+ngx_int_t rdstore_initialize_chanhead_reaper(nchan_reaper_t *reaper, char *name) {
+  
+  nchan_reaper_start(reaper, 
+              name, 
+              offsetof(rdstore_channel_head_t, gc.prev), 
+              offsetof(rdstore_channel_head_t, gc.next), 
+  (ngx_int_t (*)(void *, uint8_t)) nchan_redis_chanhead_ready_to_reap,
+  (void (*)(void *)) redis_store_reap_chanhead,
+              4
+  );
+    
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_init_redis_loc_conf_postconfig(nchan_loc_conf_t *lcf) {
+  nchan_redis_conf_t    *rcf = &lcf->redis;
+  
+  assert(rcf->enabled);
+  
+  //server-scope loc_conf may have some undefined values (because it was never merged with a prev)
+  //thus we must reduntantly check for unset values
+  if(rcf->ping_interval == NGX_CONF_UNSET) {
+    rcf->ping_interval = NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME;
+  }
+  if(rcf->storage_mode == REDIS_MODE_CONF_UNSET) {
+    rcf->storage_mode = REDIS_MODE_DISTRIBUTED;
+  }
+  if(rcf->nostore_fastpublish == NGX_CONF_UNSET) {
+    rcf->nostore_fastpublish = 0;
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_init_postconfig(ngx_conf_t *cf) {
+  nchan_loc_conf_t      *lcf;
+  nchan_redis_conf_ll_t *cur;
+  nchan_main_conf_t     *mcf = ngx_http_conf_get_module_main_conf(cf, ngx_nchan_module);
+  redis_nodeset_t       *nodeset;
+  
+  if(mcf->redis_publish_message_msgkey_size == NGX_CONF_UNSET_SIZE) {
+    mcf->redis_publish_message_msgkey_size = NCHAN_REDIS_DEFAULT_PUBSUB_MESSAGE_MSGKEY_SIZE;
+  }
+  redis_publish_message_msgkey_size = mcf->redis_publish_message_msgkey_size;
+  
+  for(cur = redis_conf_head; cur != NULL; cur = cur->next) {
+    lcf = cur->lcf;
+    nchan_store_init_redis_loc_conf_postconfig(lcf);
+    
+    if((nodeset = nodeset_find(&lcf->redis)) == NULL) {
+      nodeset = nodeset_create(lcf);
+    }
+    if(!nodeset) {
+      return NGX_ERROR;
+    }
+    rdstore_initialize_chanhead_reaper(&nodeset->chanhead_reaper, "Redis channel reaper");
+  }
+  
+  return NGX_OK;
+}
+
+static void nchan_store_create_main_conf(ngx_conf_t *cf, nchan_main_conf_t *mcf) {
+  mcf->redis_publish_message_msgkey_size=NGX_CONF_UNSET_SIZE;
+  
+  //reset redis_conf_head for reloads
+  redis_conf_head = NULL;
+  nodeset_destroy_all(); //reset all nodesets before loading config
+}
+
+void redis_store_prepare_to_exit_worker() {
+  rdstore_channel_head_t    *cur, *tmp;
+  HASH_ITER(hh, chanhead_hash, cur, tmp) {
+    cur->shutting_down = 1;
+  }
+}
+
+static void nodeset_exiter_stage1(redis_nodeset_t *ns, void *pd) {
+  nodeset_abort_on_ready_callbacks(ns);
+}
+static void nodeset_exiter_stage2(redis_nodeset_t *ns, void *pd) {
+  unsigned *chanheads = pd;
+  *chanheads += ns->chanhead_reaper.count;
+  nchan_reaper_stop(&ns->chanhead_reaper);
+}
+
+static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
+  rdstore_channel_head_t     *cur, *tmp;
+  unsigned                    chanheads = 0;
+  DBG("redis exit worker");
+  
+  //old
+  //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage1, NULL);
+  
+  nodeset_each(nodeset_exiter_stage1, NULL);
+  
+  HASH_ITER(hh, chanhead_hash, cur, tmp) {
+    cur->shutting_down = 1;
+    if(!cur->gc.in_reaper) {
+      cur->spooler.fn->broadcast_status(&cur->spooler, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+      redis_chanhead_gc_add(cur, 0, "exit worker");
+    }
+  }
+  
+  nodeset_each(nodeset_exiter_stage2, &chanheads);
+  
+  //OLD
+  //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage2, &chanheads);
+  nodeset_destroy_all();
+  
+  //OLD
+  //rbtree_empty(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage3, NULL);
+  
+  nchan_exit_notice_about_remaining_things("redis channel", "", chanheads);
+}
+
+static void nchan_store_exit_master(ngx_cycle_t *cycle) {
+  nodeset_destroy_all();
+}
+
+typedef struct {
+  ngx_str_t                   *channel_id;
+  subscriber_t                *sub;
+  unsigned                     allocd:1;
+} redis_subscribe_data_t;
+
+static ngx_int_t nchan_store_subscribe_continued(redis_subscribe_data_t *d);
+
+static ngx_int_t subscribe_existing_channel_callback(ngx_int_t status, void *ch, void *d) {
+  nchan_channel_t              *channel = (nchan_channel_t *)ch;
+  redis_subscribe_data_t       *data = (redis_subscribe_data_t *)d;
+  
+  if(channel == NULL) {
+    data->sub->fn->respond_status(data->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+    data->sub->fn->release(data->sub, 0);
+  }
+  else {
+    nchan_store_subscribe_continued(d);
+  }
+  assert(data->allocd);
+  ngx_free(data);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub) {
+  redis_subscribe_data_t        d_data;
+  redis_subscribe_data_t       *d = NULL;
+
+  assert(sub->last_msgid.tagcount == 1);
+  
+  if(!sub->cf->subscribe_only_existing_channel) {
+    d_data.allocd = 0;
+    d_data.channel_id = channel_id;
+    d_data.sub = sub;
+    nchan_store_subscribe_continued(&d_data);
+  }
+  else {
+    if((d=ngx_alloc(sizeof(*d) + sizeof(ngx_str_t) + channel_id->len, ngx_cycle->log))==NULL) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "can't allocate redis get_message callback data");
+      return NGX_ERROR;
+    }
+    d->allocd = 1;
+    d->channel_id=(ngx_str_t *)&d[1];
+    d->channel_id->len = channel_id->len;
+    d->channel_id->data = (u_char *)&(d->channel_id)[1];
+    ngx_memcpy(d->channel_id->data, channel_id->data, channel_id->len);
+    d->sub = sub;
+    nchan_store_find_channel(channel_id, sub->cf, subscribe_existing_channel_callback, d);
+  }
+
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_subscribe_continued(redis_subscribe_data_t *d) {
+  //nchan_loc_conf_t           *cf = d->sub->cf;
+  rdstore_channel_head_t       *ch;
+  //ngx_int_t                   create_channel_ttl = cf->subscribe_only_existing_channel==1 ? 0 : cf->channel_timeout;
+  assert(d->sub->cf->redis.enabled);
+  redis_nodeset_t              *nodeset = nodeset_find(&d->sub->cf->redis);
+  ngx_int_t                     rc;
+  
+  ch = nchan_store_get_chanhead(d->channel_id, nodeset);
+  
+  assert(ch != NULL);
+  
+  rc = ch->spooler.fn->add(&ch->spooler, d->sub);
+  //redisAsyncCommand(rds_ctx(), &redis_getmessage_callback, (void *)d, "EVALSHA %s 0 %b %i %i %s %i", redis_lua_scripts.get_message.hash, STR(d->channel_id), d->msg_id->time, d->msg_id->tag[0], "FILO", create_channel_ttl);
+  return rc;
+}
+
+typedef struct {
+  ngx_msec_t            t;
+  char                 *name;
+  ngx_str_t            *channel_id;
+  time_t                msg_time;
+  nchan_msg_t          *msg;
+  unsigned              shared_msg:1;
+  unsigned              cluster_move_error:1;
+  time_t                message_timeout;
+  ngx_int_t             max_messages;
+  nchan_msg_compression_type_t compression;
+  ngx_int_t             msglen;
+  callback_pt           callback;
+  void                 *privdata;
+  uint8_t               retry;
+} redis_publish_callback_data_t;
+
+static void redisPublishCallback(redisAsyncContext *, void *, void *);
+static void redisPublishNostoreCallback(redisAsyncContext *, void *, void *);
+static void redisPublishNostoreQueuedCheckCallback(redisAsyncContext *, void *, void *);
+static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd);
+
+static ngx_int_t redis_publish_message_nodeset_maybe_retry(redis_nodeset_t *ns, redis_publish_callback_data_t *d) {
+  //retry maybe
+  if(d->retry < REDIS_NODESET_NOT_READY_MAX_RETRIES) {
+    d->retry++;
+    nodeset_callback_on_ready(ns, redis_publish_message_send, d);
+  }
+  else {
+    d->callback(NGX_HTTP_SERVICE_UNAVAILABLE, NULL, d->privdata);
+    ngx_free(d);
+  }
+  return NGX_DECLINED;
+}
+
+static ngx_int_t redis_publish_message_send(redis_nodeset_t *nodeset, void *pd) {
+  redis_publish_callback_data_t  *d = pd;
+  ngx_int_t                       mmapped = 0;
+  ngx_buf_t                      *buf;
+  ngx_str_t                       msgstr;
+  nchan_msg_t                    *msg = d->msg;
+  const ngx_str_t                 empty=ngx_string("");
+  
+  if(!nodeset_ready(nodeset)) {
+    return redis_publish_message_nodeset_maybe_retry(nodeset, d);
+  }
+  
+  redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, d->channel_id);
+  
+  buf = &msg->buf;
+  if(ngx_buf_in_memory(buf)) {
+    msgstr.data = buf->pos;
+    msgstr.len = buf->last - msgstr.data;
+  }
+  else { //in a file
+    ngx_fd_t fd = buf->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&buf->file->name) : buf->file->fd;
+    
+    msgstr.len = buf->file_last - buf->file_pos;
+    msgstr.data = mmap(NULL, msgstr.len, PROT_READ, MAP_SHARED, fd, 0);
+    if (msgstr.data != MAP_FAILED) {
+      mmapped = 1;
+    }
+    else {
+      msgstr.data = NULL;
+      msgstr.len = 0;
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno, "Redis store: Couldn't mmap file %V", &buf->file->name);
+    }
+  }
+  d->msglen = msgstr.len;
+  
+  node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_PUBLISH);
+  
+  if(nodeset->settings.storage_mode == REDIS_MODE_DISTRIBUTED_NOSTORE) {
+    //hand-roll the msgpacked message
+    /*
+    9A A3"msg" CE<ttl> CE<time> 00 00 00 DB<len><str> D9<len><str> D9<len><str> 0X
+    |  |       |       |        |  |  |  |            |            |            |
+    |  |       |       |        |  |  |  |            |            |    fixint0/1 compression
+    |  |       |       |        |  |  |  |            |    bin8 <uint8 len> eventsource-event
+    |  |       |       |        |  |  |  |     bin8 <uint8 len> content type
+    |  |       |       |        |  |  |  bin32 <uint32 BE len> msg data
+    |  |       |       |      fixint=0 tag=0, prev_time=0, prev_tag=0
+    |  |       |    uint32 (BE) message time
+    |  |     uint32 (BE) message ttl
+    |  fixstr[3]
+    fixarray[10]
+    */
+    
+    uint32_t ttl, time;
+    uint32_t msglen;
+    uint8_t  content_type_len, eventsource_event_len, compression;
+    char     zero='\0';
+    int      fastpublish = nodeset->settings.nostore_fastpublish;
+    void   (*publish_callback)(redisAsyncContext *, void *, void *) = NULL;
+    
+    
+    ttl = htonl(d->message_timeout);
+    time = htonl(msg->id.time);
+    msglen = htonl(d->msglen);
+    content_type_len = msg->content_type ? (msg->content_type->len > 255 ? 255 : msg->content_type->len) : 0;
+    eventsource_event_len = msg->eventsource_event ? (msg->eventsource_event->len > 255 ? 255 : msg->eventsource_event->len) : 0;
+    compression = d->compression;
+    
+    if(!fastpublish) {
+      redis_command(node, NULL, d, "MULTI");
+      publish_callback = redisPublishNostoreQueuedCheckCallback;
+    }
+    else {
+      publish_callback = redisPublishNostoreCallback;
+    }
+    
+    redis_command(node, publish_callback, d,
+      //can't use the prebaked pubsub channel id because we don't have the chanhead here, just its id
+      "%s %b{channel:%b}:pubsub "
+      "\x9A\xA3msg\xCE%b\xCE%b%b%b%b\xDB%b%b\xD9%b%b\xD9%b%b%b",
+      
+      nodeset->use_spublish ? "SPUBLISH" : "PUBLISH",
+      STR(nodeset->settings.namespace),
+      STR(d->channel_id),
+      
+      (char *)&ttl, (size_t )4,
+      (char *)&time, (size_t )4,
+      (char *)&zero, (size_t )1,
+      (char *)&zero, (size_t )1,
+      (char *)&zero, (size_t )1,
+      (char *)&msglen, (size_t )4,
+      STR(&msgstr),
+      (char *)&content_type_len, (size_t )1,
+      STR((msg->content_type ? msg->content_type : &empty)),
+      (char *)&eventsource_event_len, (size_t )1,
+      STR((msg->eventsource_event ? msg->eventsource_event : &empty)),
+      (char *)&compression, (size_t )1
+    );
+    if(!fastpublish) {
+      nchan_redis_script(nostore_publish_multiexec_channel_info, node, publish_callback, d, d->channel_id, "%i", nodeset->settings.accurate_subscriber_count);
+      redis_command(node, &redisPublishNostoreCallback, d, "EXEC");
+    }
+  }
+  else {  
+    //input:  keys: [], values: [namespace, channel_id, time, message, content_type, eventsource_event, compression, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, , optimize_target, publish_command, use_accurate_subscriber_count]
+    //output: message_time, message_tag, channel_hash {ttl, time_last_seen, subscribers, messages}
+    nchan_redis_script(publish, node, &redisPublishCallback, d, d->channel_id, 
+                      "%b %b %b %i %i %i %i %s %i",
+                      STR(&msgstr), 
+                      STR((msg->content_type ? msg->content_type : &empty)), 
+                      STR((msg->eventsource_event ? msg->eventsource_event : &empty)), 
+                      d->compression,
+                      d->message_timeout, 
+                      d->max_messages, 
+                      redis_publish_message_msgkey_size,
+                      nodeset->use_spublish ? "SPUBLISH" : "PUBLISH",
+                      nodeset->settings.accurate_subscriber_count
+                      );
+  }
+  if(mmapped && munmap(msgstr.data, msgstr.len) == -1) {
+    ERR("munmap was a problem");
+    return NGX_ERROR;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_store_publish_message(ngx_str_t *channel_id, nchan_msg_t *msg, nchan_loc_conf_t *cf, callback_pt callback, void *privdata) {
+  redis_publish_callback_data_t  *d=NULL;
+  redis_nodeset_t                *ns = nodeset_find(&cf->redis);
+  assert(callback != NULL);
+
+  CREATE_CALLBACK_DATA(d, ns, cf, "publish_message", channel_id, callback, privdata);
+  
+  d->msg_time=msg->id.time;
+  if(d->msg_time == 0) {
+    d->msg_time = ngx_time();
+  }
+  d->msg = msg;
+  d->shared_msg = msg->storage == NCHAN_MSG_SHARED;
+  d->message_timeout = nchan_loc_conf_message_timeout(cf);
+  d->max_messages = nchan_loc_conf_max_messages(cf);
+  d->compression = cf->message_compression;
+  d->retry = 0;
+  d->cluster_move_error = 0;
+  
+  assert(msg->id.tagcount == 1);
+  
+  if(d->shared_msg) {
+    msg_reserve(d->msg, "redis publish");
+  }
+  redis_publish_message_send(ns, d);
+  
+  return NGX_OK;
+}
+
+static int64_t redisReply_to_int(redisReply *reply, int nil_value, int wrong_datatype_value) {
+  switch(reply->type) {
+    case REDIS_REPLY_INTEGER:
+      return reply->integer;
+    case REDIS_REPLY_STRING:
+      return atol(reply->str);
+    case REDIS_REPLY_NIL:
+      return nil_value;
+    default:
+      return wrong_datatype_value;
+  }
+}
+
+static void redisPublishNostoreCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
+  redisReply                    *reply=r;
+  redisReply                   **els;
+  nchan_channel_t                ch;
+  
+  redis_node_t                 *node = c->data;
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_PUBLISH);
+  
+  if(d->shared_msg) {
+    msg_release(d->msg, "redis publish");
+  }
+  
+  ngx_memzero(&ch, sizeof(ch)); //for debugging basically. should be removed in the future and zeroed as-needed
+  if(d->cluster_move_error) {
+    nodeset_node_keyslot_changed(node, "CLUSTER MOVE error");
+    d->callback(NGX_HTTP_SERVICE_UNAVAILABLE, NULL, d->privdata);
+  }
+  else if(reply) {
+    if(reply->type == REDIS_REPLY_ARRAY && reply->elements == 2 && reply->element[1]->type == REDIS_REPLY_ARRAY && reply->element[1]->elements == 2) {
+      els = reply->element[1]->element;
+      ch.last_seen = redisReply_to_int(els[0], 0, 0);
+      ch.subscribers = redisReply_to_int(els[1], 0, 0);
+      d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
+    }
+    else if(reply->type == REDIS_REPLY_INTEGER) {
+      ch.last_seen = 0;
+      ch.subscribers = redisReply_to_int(reply, 0, 0);
+      d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
+    }
+    else {
+      redisEchoCallback(c, r, privdata);
+      d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
+    }
+  }
+  else {
+    redisEchoCallback(c, r, privdata);
+    d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
+  }
+  
+  ngx_free(d);
+}
+
+static void redisPublishNostoreQueuedCheckCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
+  redisReply                    *reply=r;
+  
+  redis_node_t                 *node = c->data;
+  node_command_received(node);
+  
+  if(reply && !CHECK_REPLY_STATUSVAL(reply, "QUEUED")) {
+    if(!nodeset_node_reply_keyslot_ok(node, reply) && nodeset_node_can_retry_commands(node)) {
+      d->cluster_move_error = 1;
+    }
+    else {
+      redisEchoCallback(c, r, privdata);
+    }
+  }
+}
+
+static void redisPublishCallback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_publish_callback_data_t *d=(redis_publish_callback_data_t *)privdata;
+  redisReply                    *reply=r;
+  redisReply                    *cur;
+  nchan_channel_t                ch;
+  
+  redis_node_t                 *node = c->data;
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_PUBLISH);
+  if(!nodeset_node_reply_keyslot_ok(node, reply) && nodeset_node_can_retry_commands(node)) {
+    if(d->shared_msg) {
+      redis_publish_message_nodeset_maybe_retry(node->nodeset, d);
+    }
+    else {
+      //message probably isn't available anymore...
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis store received cluster MOVE/ASK error while publishing, and can't retry publishing after reconfiguring cluster.");
+      d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
+      ngx_free(d);
+    }
+    return;
+  }
+  
+  if(d->shared_msg) {
+    msg_release(d->msg, "redis publish");
+  }
+  
+  ngx_memzero(&ch, sizeof(ch)); //for debugging basically. should be removed in the future and zeroed as-needed
+  
+  if(reply && CHECK_REPLY_ARRAY_MIN_SIZE(reply, 2)) {
+    cur=reply->element[0];
+    switch(redis_array_to_channel(cur, &ch)) {
+      case NGX_OK:
+        d->callback(ch.subscribers > 0 ? NCHAN_MESSAGE_RECEIVED : NCHAN_MESSAGE_QUEUED, &ch, d->privdata);
+        break;
+      case NGX_DECLINED: //not found
+        d->callback(NGX_OK, NULL, d->privdata);
+        break;
+      case NGX_ERROR:
+      default:
+        redisEchoCallback(c, r, privdata);
+        d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
+    }
+  }
+  else {
+    redisEchoCallback(c, r, privdata);
+    d->callback(NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, d->privdata);
+  }
+  ngx_free(d);
+}
+
+
+
+typedef struct {
+  ngx_str_t      *channel_id;
+  ngx_int_t       count;
+} add_fakesub_data_t;
+
+
+static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r, void *privdata);
+static ngx_int_t nchan_store_redis_add_fakesub_send(redis_nodeset_t *nodeset, void *pd) {
+  add_fakesub_data_t *d = pd;
+  if(nodeset_ready(nodeset)) {
+    redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, d->channel_id);
+    node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_CHANGE_SUBSCRIBER_COUNT);
+    nchan_redis_script(add_fakesub, node, &nchan_store_redis_add_fakesub_callback, NULL, 
+                       d->channel_id,
+                       "%i %i %s",
+                       d->count,
+                       ngx_time(),
+                       redis_subscriber_id
+                      );
+    return NGX_OK;
+  }
+  else {
+    return NGX_ERROR;
+  }
+}
+
+static ngx_int_t nchan_store_redis_add_fakesub_send_retry_wrapper(redis_nodeset_t *nodeset, void *pd) {
+  add_fakesub_data_t *d = pd;
+  ngx_int_t rc = nchan_store_redis_add_fakesub_send(nodeset, pd);
+  ngx_free(d);
+  return rc;
+}
+
+static void nchan_store_redis_add_fakesub_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redisReply      *reply = r;
+  redis_node_t    *node = c->data;
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_CHANGE_SUBSCRIBER_COUNT);
+  
+  if(reply && reply->type == REDIS_REPLY_ERROR) {
+    ngx_str_t    errstr;
+    ngx_str_t    countstr;
+    ngx_str_t    channel_id;
+    intptr_t     count;
+    
+    errstr.data = (u_char *)reply->str;
+    errstr.len = strlen(reply->str);
+    
+    if(ngx_str_chop_if_startswith(&errstr, "CLUSTER KEYSLOT ERROR. ")) {
+      nodeset_node_keyslot_changed(node, "CLUSTER KEYSLOT error");
+      nchan_scan_until_chr_on_line(&errstr, &countstr, ' ');
+      count = ngx_atoi(countstr.data, countstr.len);
+      channel_id = errstr;
+      
+      add_fakesub_data_t  *d = ngx_alloc(sizeof(*d) + sizeof(ngx_str_t) + channel_id.len, ngx_cycle->log);
+      if(!d) {
+        ERR("can't allocate add_fakesub_data for CLUSTER KEYSLOT ERROR retry");
+        return;
+      }
+      d->count = count;
+      d->channel_id = (ngx_str_t *)&d[1];
+      d->channel_id->data = (u_char *)&d->channel_id[1];
+      nchan_strcpy(d->channel_id, &channel_id, 0);
+      nodeset_callback_on_ready(node->nodeset, nchan_store_redis_add_fakesub_send_retry_wrapper, d);
+      
+      return;
+    }
+    
+  }
+  redisCheckErrorCallback(c, r, privdata);
+}
+
+ngx_int_t nchan_store_redis_fakesub_add(ngx_str_t *channel_id, nchan_loc_conf_t *cf, ngx_int_t count, uint8_t shutting_down) {
+  redis_nodeset_t  *nodeset = nodeset_find(&cf->redis);
+  
+  if(!shutting_down) {
+    add_fakesub_data_t   data = {channel_id, count};
+    nchan_store_redis_add_fakesub_send(nodeset, &data);
+  }
+  else {
+    if(nodeset_ready(nodeset)) {
+      redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, channel_id);
+      redis_sync_command(node, "EVALSHA %s 0 %b %i", redis_lua_scripts.add_fakesub.hash, STR(channel_id), count);
+    }
+  }
+  return NGX_OK;
+}
+
+int nchan_store_redis_ready(nchan_loc_conf_t *cf) {
+  redis_nodeset_t   *nodeset = nodeset_find(&cf->redis);
+  return nodeset && nodeset_ready(nodeset);
+}
+
+
+typedef struct {
+  callback_pt  cb;
+  void        *pd;
+} redis_subscriber_info_id_data_t;
+
+static void get_subscriber_info_id_callback(redisAsyncContext *c, void *r, void *privdata);
+
+static ngx_int_t nchan_store_get_subscriber_info_id(nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  redis_nodeset_t  *nodeset = nodeset_find(&cf->redis);
+  
+  if(!nodeset_ready(nodeset)) {
+    return NGX_ERROR;
+  }
+  
+  ngx_str_t request_id_key = ngx_string(NCHAN_REDIS_UNIQUE_REQUEST_ID_KEY);
+  redis_node_t  *node = nodeset_node_find_by_key(nodeset, &request_id_key);
+  if(!node) {
+    return NGX_ERROR;
+  }
+  
+  redis_subscriber_info_id_data_t *d = ngx_alloc(sizeof(*d), ngx_cycle->log);
+  if(d == NULL) {
+    return NGX_ERROR;
+  }
+  
+  d->cb = cb;
+  d->pd = pd;
+  
+  node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_GET_SUBSCRIBER_INFO_ID);
+  redis_script(get_subscriber_info_id, node, &get_subscriber_info_id_callback, d, "1 %b", STR(&request_id_key));
+  
+  return NGX_DONE;
+}
+
+static void get_subscriber_info_id_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_subscriber_info_id_data_t *d = privdata;
+  redisReply                    *reply = r;
+  
+  redis_node_t                 *node = c->data;
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_GET_SUBSCRIBER_INFO_ID);
+  
+  callback_pt  cb = d->cb;
+  void        *cb_pd = d->pd;
+  
+  ngx_free(d);
+  
+  if (!redisReplyOk(c, reply)) {
+    cb(NGX_ERROR, NULL, cb_pd);
+    return;
+  }
+  
+  int64_t new_id = redisReply_to_int(reply, 0, 0);
+  cb(NGX_OK, (void *)(uintptr_t )new_id, cb_pd);
+}
+
+static void redis_request_subscriber_info_callback(redisAsyncContext *c, void *r, void *privdata) {
+  redis_node_t                 *node = c->data;
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CHANNEL_REQUEST_SUBSCRIBER_INFO);
+  redisReplyOk(c, r);
+}
+
+static ngx_int_t nchan_store_request_subscriber_info(ngx_str_t *channel_id, ngx_int_t request_id, nchan_loc_conf_t *cf, callback_pt cb, void *pd) {
+  if(nchan_channel_id_is_multi(channel_id)) {
+    ERR("redis nchan_store_request_subscriber_info can't handle multi-channel ids");
+    return NGX_ERROR;
+  }
+  
+  redis_nodeset_t               *nodeset = nodeset_find(&cf->redis);
+  if(!nodeset) {
+    ERR("redis nodeset not found for nchan_store_request_subscriber_info");
+    return NGX_ERROR;
+  }
+  
+  if(!nodeset_ready(nodeset)) {
+    ERR("redis nodeset not ready for nchan_store_request_subscriber_info");
+    return NGX_ERROR;
+  }
+  
+  redis_node_t *node = nodeset_node_find_by_channel_id(nodeset, channel_id);
+  if(!node) {
+    ERR("couldn't find Redis node for nchan_store_request_subscriber_info");
+    return NGX_ERROR;
+  }
+  
+  node_command_time_start(node, NCHAN_REDIS_CMD_CHANNEL_REQUEST_SUBSCRIBER_INFO);
+  nchan_redis_script(request_subscriber_info, node, &redis_request_subscriber_info_callback, NULL, channel_id, "%i", (int )request_id);
+  
+  return NGX_DONE;
+}
+
+nchan_store_t nchan_store_redis = {
+  //init
+  &nchan_store_init_module,
+  &nchan_store_init_worker,
+  &nchan_store_init_postconfig,
+  &nchan_store_create_main_conf,
+  
+  //shutdown
+  &nchan_store_exit_worker,
+  &nchan_store_exit_master,
+  
+  //async-friendly functions with callbacks
+  &nchan_store_async_get_message, //+callback
+  &nchan_store_subscribe, //+callback
+  &nchan_store_publish_message, //+callback
+  
+  &nchan_store_delete_channel, //+callback
+  &nchan_store_find_channel, //+callback
+  
+  NULL, //get_group
+  NULL, //set group
+  NULL, //delete group
+  
+  &nchan_store_get_subscriber_info_id, //+callback
+  &nchan_store_request_subscriber_info //+callback
+  
+};
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/.gitignore b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/.gitignore
new file mode 100644
index 0000000..b844b14
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/.gitignore
@@ -0,0 +1 @@
+Gemfile.lock
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/Gemfile b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/Gemfile
new file mode 100644
index 0000000..b792720
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/Gemfile
@@ -0,0 +1,11 @@
+#!/usr/bin/ruby
+source 'https://rubygems.org'
+gem 'pry'
+gem 'pry-debundle'
+gem 'pry-rescue'
+
+gem 'minitest'
+gem 'minitest-reporters'
+
+gem "redis"
+gem "hsss"
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/add_fakesub.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/add_fakesub.lua
new file mode 100644
index 0000000..bdb2a9d
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/add_fakesub.lua
@@ -0,0 +1,52 @@
+--input:  keys: [], values: [namespace, channel_id, number, time, nginx_worker_id]
+--output: -none-
+  
+redis.call('echo', ' ####### ADD_FAKESUBS ####### ')
+local ns = ARGV[1]
+local id = ARGV[2]
+local num = tonumber(ARGV[3])
+local time = tonumber(ARGV[4])
+local ngx_worker_id = ARGV[5]
+
+if num==nil then
+  return {err="fakesub number not given"}
+end
+
+local chan_key = ('%s{channel:%s}'):format(ns, id)
+local subs_key = ('%s{channel:%s}:subscriber_counts'):format(ns, id)
+
+local res = redis.pcall('EXISTS', chan_key)
+if type(res) == "table" and res["err"] then
+  return {err = ("CLUSTER KEYSLOT ERROR. %i %s"):format(num, id)}
+end
+
+local exists = res == 1
+
+local old_current_count = 0
+
+if exists or (not exists and num > 0) then
+  old_current_count = redis.call('HINCRBY', chan_key, 'fake_subscribers', num)
+  if time then
+    redis.call('HSET', chan_key, 'last_seen_fake_subscriber', time)
+  end
+  if not exists then
+    redis.call('EXPIRE', chan_key, 5) --something small
+  end
+end
+
+local res = redis.pcall('EXISTS', subs_key)
+if type(res) == "table" and res["err"] then
+  return {err = ("CLUSTER KEYSLOT ERROR. %i %s"):format(num, id)}
+end
+redis.call('HINCRBY', subs_key, ngx_worker_id, num)
+local subs_key_pttl = tonumber(redis.call('PTTL',  subs_key))
+if subs_key_pttl < 0 then
+  subs_key_pttl = redis.call('PTTL', chan_key)
+  if subs_key_pttl <= 0 then
+    --60 seconds to get your shit together
+    subs_key_pttl = 60
+  end
+  redis.call('PEXPIRE', subs_key, subs_key_pttl)
+end
+
+return nil
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/channel_keepalive.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/channel_keepalive.lua
new file mode 100644
index 0000000..7217d88
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/channel_keepalive.lua
@@ -0,0 +1,45 @@
+--input:  keys: [], values: [namespace, channel_id, ttl_msec, ttl_safety_margin_msec]
+-- ttl_msec is for when there are no messages but at least 1 subscriber.
+--output: seconds until next keepalive is expected, or -1 for "let it disappear"
+redis.call('ECHO', ' ####### CHANNEL KEEPALIVE ####### ')
+local ns=ARGV[1]
+local id=ARGV[2]
+local ttl=tonumber(ARGV[3])
+local ttl_safety_margin=tonumber(ARGV[4])
+if not ttl then
+  return {err="Invalid channel keepalive TTL (3rd arg)"}
+end
+
+--safe ttl is a bit greater than the expected ttl, so that Nchan can update it before it expires
+local safe_ttl = ttl + ttl_safety_margin
+
+local ch = ('%s{channel:%s}'):format(ns, id)
+local key= {
+  channel=   ch, --hash
+  messages=  ch..':messages', --list
+  subscribers = ch..':subscribers', --list
+  subscriber_counts = ch..':subscriber_counts' --hash
+}
+
+local subs_count = tonumber(redis.call('HGET', key.channel, "subscribers")) or 0
+local msgs_count = tonumber(redis.call('LLEN', key.messages)) or 0
+local actual_ttl = tonumber(redis.call('PTTL',  key.channel))
+
+
+if subs_count <= 0 then
+  return -1
+end
+
+if msgs_count > 0 and actual_ttl > safe_ttl then
+  local return_ttl =  actual_ttl - ttl_safety_margin > 0 and actual_ttl - ttl_safety_margin or math.ceil(actual_ttl / 2)
+  return return_ttl
+end
+
+--refresh ttl
+redis.call('PEXPIRE', key.channel, safe_ttl);
+redis.call('PEXPIRE', key.messages, safe_ttl);
+redis.call('PEXPIRE', key.subscribers, safe_ttl);
+redis.call('PEXPIRE', key.subscriber_counts, safe_ttl);
+
+return ttl
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/delete.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/delete.lua
new file mode 100644
index 0000000..d52d747
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/delete.lua
@@ -0,0 +1,91 @@
+--input: keys: [],  values: [ namespace, channel_id, publish_command, use_accurate_subscriber_count ]
+--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
+-- delete this channel and all its messages
+local ns = ARGV[1]
+local id = ARGV[2]
+local publish_command = ARGV[3]
+local use_accurate_subscriber_count = tonumber(ARGV[4])~=0
+local ch = ('%s{channel:%s}'):format(ns, id)
+local key_msg=    ch..':msg:%s' --not finished yet
+local key_channel=ch
+local messages=   ch..':messages'
+local subscribers=ch..':subscribers'
+local pubsub=     ch..':pubsub'
+local subscriber_counts = ch..':subscriber_counts'
+
+redis.replicate_commands()
+
+redis.call('echo', ' ####### DELETE #######')
+local num_messages = 0
+--delete all the messages right now mister!
+local msg
+while true do
+  msg = redis.call('LPOP', messages)
+  if msg then
+    num_messages = num_messages + 1
+    redis.call('DEL', key_msg:format(msg))
+  else
+    break
+  end
+end
+
+local del_msgpack =cmsgpack.pack({"alert", "delete channel", id})
+for k,channel_key in pairs(redis.call('SMEMBERS', subscribers)) do
+  redis.call('PUBLISH', channel_key, del_msgpack)
+end
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+
+local channel = nil
+local subscriber_count = nil
+if redis.call('EXISTS', key_channel) ~= 0 then
+  channel = tohash(redis.call('hgetall', key_channel))
+  --leave some crumbs behind showing this channel was just deleted
+  redis.call('setex', ch..":deleted", 5, 1)
+  
+  if use_accurate_subscriber_count then
+    local sub_counts = tohash(redis.call("HGETALL", subscriber_counts))
+    subscriber_count = 0
+    for k, v in pairs(sub_counts) do
+      v = tonumber(v)
+      local res = redis.call("PUBSUB", "NUMSUB", k)
+      if tonumber(res[2]) >= 1 and v > 0 then
+        subscriber_count = subscriber_count + tonumber(v)
+      else
+        redis.call("HDEL", subscriber_counts, k)
+      end
+    end
+  else
+    subscriber_count = tonumber(channel.fake_subscribers) or tonumber(channel.subscribers)
+  end
+  
+end
+
+redis.call('DEL', key_channel, messages, subscribers, subscriber_counts)
+redis.call('PUBLISH', pubsub, del_msgpack)
+
+if channel then
+  return {
+    tonumber(channel.ttl) or 0,
+    tonumber(channel.last_seen_fake_subscriber) or 0,
+    subscriber_count or 0,
+    channel.current_message or "",
+    tonumber(num_messages)
+  }
+else
+  return nil
+end
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/find_channel.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/find_channel.lua
new file mode 100644
index 0000000..2a39a10
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/find_channel.lua
@@ -0,0 +1,92 @@
+--input: keys: [],  values: [ namespace, channel_id, use_accurate_subscriber_count ]
+--output: channel_hash {ttl, time_last_seen, subscribers, last_channel_id, messages} or nil
+-- finds and return the info hash of a channel, or nil of channel not found
+local ns = ARGV[1]
+local id = ARGV[2]
+local use_accurate_subscriber_count = tonumber(ARGV[3]) ~= 0
+
+local channel_key = ('%s{channel:%s}'):format(ns, id)
+local messages_key = channel_key..':messages'
+local subscriber_counts = channel_key..':subscriber_counts'
+
+redis.replicate_commands()
+
+redis.call('echo', ' #######  FIND_CHANNEL ######## ')
+
+--check old entries
+local oldestmsg=function(list_key, old_fmt)
+  local old, oldkey
+  local n, del=0,0
+  while true do
+    n=n+1
+    old=redis.call('lindex', list_key, -1)
+    if old then
+      oldkey=old_fmt:format(old)
+      local ex=redis.call('exists', oldkey)
+      if ex==1 then
+        return oldkey
+      else
+        redis.call('rpop', list_key)
+        del=del+1
+      end
+    else
+      break
+    end
+  end
+end
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      --dbg(k.."="..v)
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+
+if redis.call('EXISTS', channel_key) ~= 0 then
+  local ch = tohash(redis.call('hgetall', channel_key))
+    
+  local msgs_count
+  if redis.call("TYPE", messages_key)['ok'] == 'list' then
+    oldestmsg(messages_key, channel_key ..':msg:%s')
+    msgs_count = tonumber(redis.call('llen', messages_key))
+  else
+    msgs_count = 0
+  end
+  
+  local subscriber_count
+  if use_accurate_subscriber_count then
+    local sub_counts = tohash(redis.call("HGETALL", subscriber_counts))
+    subscriber_count = 0
+    for k, v in pairs(sub_counts) do
+      v = tonumber(v)
+      local res = redis.call("PUBSUB", "NUMSUB", k)
+      if tonumber(res[2]) >= 1 and v > 0 then
+        subscriber_count = subscriber_count + tonumber(v)
+      else
+        redis.call("HDEL", subscriber_counts, k)
+      end
+    end
+  else
+    subscriber_count = tonumber(ch.fake_subscribers) or tonumber(ch.subscribers)
+  end
+  
+  return {
+    tonumber(ch.ttl) or 0,
+    tonumber(ch.last_seen_fake_subscriber) or 0,
+    subscriber_count or 0,
+    ch.current_message or "",
+    msgs_count
+  }
+else
+  return nil
+end
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_message.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_message.lua
new file mode 100644
index 0000000..986368f
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_message.lua
@@ -0,0 +1,155 @@
+--input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
+--output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count
+-- no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent
+-- create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.
+-- result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available
+local ns, id, time, tag, subscribe_if_current = ARGV[1], ARGV[2], tonumber(ARGV[3]), tonumber(ARGV[4])
+local no_msgid_order=ARGV[5]
+local create_channel_ttl=tonumber(ARGV[6]) or 0
+local msg_id
+if time and time ~= 0 and tag then
+  msg_id=("%s:%s"):format(time, tag)
+end
+
+if redis.replicate_commands then
+  redis.replicate_commands()
+end
+
+-- This script has gotten big and ugly, but there are a few good reasons 
+-- to keep it big and ugly. It needs to do a lot of stuff atomically, and 
+-- redis doesn't do includes. It could be generated pre-insertion into redis, 
+-- but then error messages become less useful, complicating debugging. If you 
+-- have a solution to this, please help.
+local ch=('%s{channel:%s}'):format(ns, id)
+local msgkey_fmt=ch..':msg:%s'
+local key={
+  next_message= msgkey_fmt, --hash
+  message=      msgkey_fmt, --hash
+  channel=      ch, --hash
+  messages=     ch..':messages', --list
+--  pubsub=       ch..':subscribers:', --set
+}
+
+--local dbg = function(...) redis.call('echo', table.concat({...})); end
+
+redis.call('echo', ' #######  GET_MESSAGE ######## ')
+
+local oldestmsg=function(list_key, old_fmt)
+  local old, oldkey
+  local n, del=0,0
+  while true do
+    n=n+1
+    old=redis.call('lindex', list_key, -1)
+    if old then
+      oldkey=old_fmt:format(old)
+      local ex=redis.call('exists', oldkey)
+      if ex==1 then
+        return oldkey
+      else
+        redis.call('rpop', list_key)
+        del=del+1
+      end 
+    else
+      --dbg(list_key, " is empty")
+      break
+    end
+  end
+end
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      --dbg(k.."="..v)
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+
+if no_msgid_order ~= 'FIFO' then
+  no_msgid_order = 'FILO'
+end
+
+local channel = tohash(redis.call('HGETALL', key.channel))
+local new_channel = false
+if next(channel) == nil then
+  if create_channel_ttl==0 then
+    return {404, nil}
+  end
+  redis.call('HSET', key.channel, 'time', time)
+  redis.call('EXPIRE', key.channel, create_channel_ttl)
+  channel = {time=time}
+  new_channel = true
+end
+
+local subs_count = tonumber(channel.subscribers)
+
+if msg_id==nil then
+  local found_msg_key
+  if new_channel then
+    --dbg("new channel")
+    return {418, "", "", "", "", subs_count}
+  else
+    --dbg("no msg id given, ord="..no_msgid_order)
+    
+    if no_msgid_order == 'FIFO' then --most recent message
+      --dbg("get most recent")
+      found_msg_key=channel.current_message
+    elseif no_msgid_order == 'FILO' then --oldest message
+      --dbg("get oldest")
+      found_msg_key=oldestmsg(key.messages, msgkey_fmt)
+    end
+    
+    if found_msg_key == nil then
+      --we await a message
+      return {418, "", "", "", "", subs_count}
+    else
+      local msg=tohash(redis.call('HGETALL', found_msg_key))
+      if not next(msg) then --empty
+        return {404, "", "", "", "", subs_count}
+      else
+        --dbg(("found msg %s:%s  after %s:%s"):format(tostring(msg.time), tostring(msg.tag), tostring(time), tostring(tag)))
+        local ttl = redis.call('TTL', found_msg_key)
+        return {200, ttl, tonumber(msg.time) or "", tonumber(msg.tag) or "", tonumber(msg.prev_time) or "", tonumber(msg.prev_tag) or "", msg.data or "", msg.content_type or "", msg.eventsource_event or "", tonumber(msg.compression or 0), subs_count}
+      end
+    end
+  end
+else
+  if msg_id and channel.current_message == msg_id
+   or not channel.current_message then
+    return {418, "", "", "", "", subs_count}
+  end
+
+  key.message=key.message:format(msg_id)
+  local msg=tohash(redis.call('HGETALL', key.message))
+
+  if next(msg) == nil then -- no such message. it might've expired, or maybe it was never there
+    --dbg("MESSAGE NOT FOUND")
+    return {404, nil}
+  end
+
+  local next_msg, next_msgtime, next_msgtag
+  if not msg.next then --this should have been taken care of by the channel.current_message check
+    --dbg("NEXT MESSAGE KEY NOT PRESENT. ERROR, ERROR!")
+    return {404, nil}
+  else
+    --dbg("NEXT MESSAGE KEY PRESENT: " .. msg.next)
+    key.next_message=key.next_message:format(msg.next)
+    if redis.call('EXISTS', key.next_message)~=0 then
+      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event, ncompression=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))
+      local ttl = redis.call('TTL', key.next_message)
+      --dbg(("found msg2 %i:%i  after %i:%i"):format(ntime, ntag, time, tag))
+      return {200, ttl, tonumber(ntime) or "", tonumber(ntag) or "", tonumber(prev_time) or "", tonumber(prev_tag) or "", ndata or "", ncontenttype or "", neventsource_event or "", ncompression or 0, subs_count}
+    else
+      --dbg("NEXT MESSAGE NOT FOUND")
+      return {404, nil}
+    end
+  end
+end
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_message_from_key.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_message_from_key.lua
new file mode 100644
index 0000000..ad0d742
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_message_from_key.lua
@@ -0,0 +1,8 @@
+--input:  keys: [message_key], values: []
+--output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count
+local key = KEYS[1]
+
+local ttl = redis.call('TTL', key)
+local time, tag, prev_time, prev_tag, data, content_type, es_event, compression = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))
+
+return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or "", content_type or "", es_event or "", tonumber(compression or 0)}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua
new file mode 100644
index 0000000..54cac88
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/get_subscriber_info_id.lua
@@ -0,0 +1,18 @@
+--input:  keys: [unique_request_id_key], values: []
+--output: next_unique_request_id_integer
+local key = KEYS[1]
+
+redis.call("ECHO", "###### GET SUBSCRIBER INFO ID ##########")
+
+local resp = redis.pcall("INCR", key)
+local val
+if type(resp) ~= "number" then
+  redis.call("SET", key, "0")
+  val = redis.call("INCR", key)
+else
+  val = resp
+end
+
+redis.call("ECHO", "val: " .. val)
+
+return val
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/nostore_publish_multiexec_channel_info.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/nostore_publish_multiexec_channel_info.lua
new file mode 100644
index 0000000..6a114ad
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/nostore_publish_multiexec_channel_info.lua
@@ -0,0 +1,56 @@
+--input: keys: [],  values: [ namespace, channel_id, use_accurate_subscriber_count ]
+--output: {subscribers_count, last_subscriber_seed}, or nil of channel not found
+
+local ns = ARGV[1]
+local id = ARGV[2]
+local use_accurate_subscriber_count = tonumber(ARGV[3]) ~= 0
+
+local channel_key = ('%s{channel:%s}'):format(ns, id)
+local subscriber_counts = channel_key..':subscriber_counts'
+
+redis.replicate_commands()
+
+redis.call('echo', ' #######  NOSTORE_PUBLISH_MULTIEXEC_CHANNEL_INFO ######## ')
+
+if redis.call('exists', channel_key) ~= 1 then
+  return {0, 0}
+end
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      --dbg(k.."="..v)
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+
+local last_seen = tonumber(redis.call('HGET', channel_key, 'last_seen_fake_subscriber'))
+
+local subscriber_count
+if use_accurate_subscriber_count then
+  local sub_counts = tohash(redis.call("HGETALL", subscriber_counts))
+  subscriber_count = 0
+  for k, v in pairs(sub_counts) do
+    v = tonumber(v)
+    local res = redis.call("PUBSUB", "NUMSUB", k)
+    if tonumber(res[2]) >= 1 and v > 0 then
+      subscriber_count = subscriber_count + tonumber(v)
+    else
+      redis.call("HDEL", subscriber_counts, k)
+    end
+  end
+else
+  subscriber_count = tonumber(redis.call('HGET', channel_key, 'fake_subscribers'))
+end
+
+
+return {last_seen or 0, subscriber_count or 0}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/publish.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/publish.lua
new file mode 100644
index 0000000..4fd58d6
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/publish.lua
@@ -0,0 +1,296 @@
+--input:  keys: [], values: [namespace, channel_id, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, publish_command, use_accurate_subscriber_count]
+--output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?
+
+redis.replicate_commands()
+
+local ns, id=ARGV[1], ARGV[2]
+
+local msg = {
+  data =ARGV[3],
+  content_type = ARGV[4],
+  eventsource_event = ARGV[5],
+  compression = tonumber(ARGV[6]),
+  ttl= tonumber(ARGV[7]),
+  time = tonumber(redis.call('TIME')[1]),
+  tag = 0
+}
+local store_at_most_n_messages = tonumber(ARGV[8])
+if store_at_most_n_messages == nil or store_at_most_n_messages == "" then
+  return {err="Argument 9, max_msg_buf_size, can't be empty"}
+end
+if store_at_most_n_messages == 0 then
+  msg.unbuffered = 1
+end
+
+local msgpacked_pubsub_cutoff = tonumber(ARGV[9])
+
+local publish_command = ARGV[10]
+local use_accurate_subscriber_count = tonumber(ARGV[11]) ~= 0
+
+
+if msg.ttl == 0 then
+  msg.ttl = 126144000 --4 years
+end
+
+--[[local dbg = function(...)
+  local arg = {...}
+  for i = 1, #arg do
+    arg[i]=tostring(arg[i])
+  end
+  redis.call('echo', table.concat(arg, ", "))
+end]]
+
+if type(msg.content_type)=='string' and msg.content_type:find(':') then
+  return {err='Message content-type cannot contain ":" character.'}
+end
+
+redis.call('echo', ' #######  PUBLISH   ######## ')
+
+-- sets all fields for a hash from a dictionary
+local hmset = function (key, dict)
+  if next(dict) == nil then return nil end
+  local bulk = {}
+  for k, v in pairs(dict) do
+    table.insert(bulk, k)
+    table.insert(bulk, v)
+  end
+  return redis.call('HMSET', key, unpack(bulk))
+end
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+
+local ch = ('%s{channel:%s}'):format(ns, id)
+local msg_fmt = ch..':msg:%s'
+local key={
+  last_message= msg_fmt, --not finished yet
+  message=      msg_fmt, --not finished yet
+  channel=      ch,
+  messages=     ch..':messages',
+  subscribers=  ch..':subscribers',
+  subscriber_counts=  ch..':subscriber_counts'
+}
+local channel_pubsub = ch..':pubsub'
+
+local new_channel
+local channel
+if redis.call('EXISTS', key.channel) ~= 0 then
+  channel=tohash(redis.call('HGETALL', key.channel))
+  channel.max_stored_messages = tonumber(channel.max_stored_messages)
+end
+
+if channel~=nil then
+  --dbg("channel present")
+  if channel.current_message ~= nil then
+    --dbg("channel current_message present")
+    key.last_message=key.last_message:format(channel.current_message, id)
+  else
+    --dbg("channel current_message absent")
+    key.last_message=nil
+  end
+  new_channel=false
+else
+  --dbg("channel missing")
+  channel={}
+  new_channel=true
+  key.last_message=nil
+end
+
+--set new message id
+local lastmsg, lasttime, lasttag
+if key.last_message then
+  lastmsg = redis.call('HMGET', key.last_message, 'time', 'tag')
+  lasttime, lasttag = tonumber(lastmsg[1]), tonumber(lastmsg[2])
+  --dbg("New message id: last_time ", lasttime, " last_tag ", lasttag, " msg_time ", msg.time)
+  if lasttime and tonumber(lasttime) > tonumber(msg.time) then
+    redis.log(redis.LOG_WARNING, "Nchan: message for " .. id .. " arrived a little late and may be delivered out of order. Redis must be very busy, or the Nginx servers do not have their times synchronized.")
+    msg.time = lasttime
+  end
+  if lasttime and lasttime==msg.time then
+    msg.tag=lasttag+1
+  end
+  msg.prev_time = lasttime
+  msg.prev_tag = lasttag
+else
+  msg.prev_time = 0
+  msg.prev_tag = 0
+end
+msg.id=('%i:%i'):format(msg.time, msg.tag)
+
+key.message=key.message:format(msg.id)
+if redis.call('EXISTS', key.message) ~= 0 then
+  local hash_tostr=function(h)
+    local tt = {}
+    for k, v in pairs(h) do
+      table.insert(tt, ("%s: %s"):format(k, v))
+    end
+    return "{" .. table.concat(tt,", ") .. "}"
+  end
+  local existing_msg = tohash(redis.call('HGETALL', key.message))
+  local errmsg = "Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s. dbg: channel: %s, messages_key: %s, msglist: %s, msg: %s, msg_expire: %s."
+  errmsg = errmsg:format(key.message, id, msg.id or "-", msg.time or "-", lasttime or "-", lasttag or "-", hash_tostr(channel), key.messages, "["..table.concat(redis.call('LRANGE', key.messages, 0, -1), ", ").."]", hash_tostr(existing_msg), redis.call('TTL', key.message))
+  return {err=errmsg}
+end
+
+msg.prev=channel.current_message
+if key.last_message and redis.call('exists', key.last_message) == 1 then
+  redis.call('HSET', key.last_message, 'next', msg.id)
+end
+
+--update channel
+redis.call('HSET', key.channel, 'current_message', msg.id)
+if msg.prev then
+  redis.call('HSET', key.channel, 'prev_message', msg.prev)
+end
+if msg.time then
+  redis.call('HSET', key.channel, 'time', msg.time)
+end
+
+local message_len_changed = false
+if channel.max_stored_messages ~= store_at_most_n_messages then
+  channel.max_stored_messages = store_at_most_n_messages
+  message_len_changed = true
+  redis.call('HSET', key.channel, 'max_stored_messages', store_at_most_n_messages)
+  --dbg("channel.max_stored_messages was not set, but is now ", store_at_most_n_messages)
+end
+
+--write message
+hmset(key.message, msg)
+
+
+--check old entries
+local oldestmsg=function(list_key, old_fmt)
+  local old, oldkey
+  local n, del=0,0
+  while true do
+    n=n+1
+    old=redis.call('lindex', list_key, -1)
+    if old then
+      oldkey=old_fmt:format(old)
+      local ex=redis.call('exists', oldkey)
+      if ex==1 then
+        return oldkey
+      else
+        redis.call('rpop', list_key)
+        del=del+1
+      end
+    else
+      break
+    end
+  end
+end
+
+local max_stored_msgs = channel.max_stored_messages or -1
+
+if max_stored_msgs < 0 then --no limit
+  oldestmsg(key.messages, msg_fmt)
+  redis.call('LPUSH', key.messages, msg.id)
+elseif max_stored_msgs > 0 then
+  local stored_messages = tonumber(redis.call('LLEN', key.messages))
+  redis.call('LPUSH', key.messages, msg.id)
+  -- Reduce the message length if necessary
+  local dump_message_ids = redis.call('LRANGE', key.messages, max_stored_msgs, stored_messages);
+  if dump_message_ids then
+    for _, msgid in ipairs(dump_message_ids) do
+      redis.call('DEL', msg_fmt:format(msgid))
+    end
+  end
+  redis.call('LTRIM', key.messages, 0, max_stored_msgs - 1)
+  oldestmsg(key.messages, msg_fmt)
+end
+
+
+--set expiration times for all the things
+local channel_ttl = tonumber(redis.call('TTL',  key.channel))
+redis.call('EXPIRE', key.message, msg.ttl)
+if msg.ttl + 1 > channel_ttl then -- a little extra time for failover weirdness for 1-second TTL messages
+  redis.call('EXPIRE', key.channel, msg.ttl + 1)
+  redis.call('EXPIRE', key.messages, msg.ttl + 1)
+  redis.call('EXPIRE', key.subscribers, msg.ttl + 1)
+  redis.call('EXPIRE', key.subscriber_counts, msg.ttl + 1)
+end
+
+--publish message
+local unpacked
+
+if msg.unbuffered or #msg.data < msgpacked_pubsub_cutoff then
+  unpacked= {
+    "msg",
+    msg.ttl or 0,
+    msg.time,
+    tonumber(msg.tag) or 0,
+    (msg.unbuffered and 0 or msg.prev_time) or 0,
+    (msg.unbuffered and 0 or msg.prev_tag) or 0,
+    msg.data or "",
+    msg.content_type or "",
+    msg.eventsource_event or "",
+    msg.compression or 0
+  }
+else
+  unpacked= {
+    "msgkey",
+    msg.time,
+    tonumber(msg.tag) or 0,
+    key.message
+  }
+end
+
+if message_len_changed then
+  unpacked[1] = "max_msgs+" .. unpacked[1]
+  table.insert(unpacked, 2, tonumber(channel.max_stored_messages))
+end
+
+local msgpacked
+
+--dbg(("Stored message with id %i:%i => %s"):format(msg.time, msg.tag, msg.data))
+
+--we used to publish conditionally on subscribers on the Redis pubsub channel
+--but now that we're subscribing to slaves this is not possible
+--so just PUBLISH always.
+msgpacked = cmsgpack.pack(unpacked)
+
+redis.call(publish_command, channel_pubsub, msgpacked)
+
+local num_messages = redis.call('llen', key.messages)
+
+local subscriber_count
+if use_accurate_subscriber_count then
+  local sub_counts = tohash(redis.call("HGETALL", key.subscriber_counts))
+  subscriber_count = 0
+  for k, v in pairs(sub_counts) do
+    v = tonumber(v)
+    local res = redis.call("PUBSUB", "NUMSUB", k)
+    if tonumber(res[2]) >= 1 and v > 0 then
+      subscriber_count = subscriber_count + tonumber(v)
+    else
+      redis.call("HDEL", key.subscriber_counts, k)
+    end
+  end
+else
+  subscriber_count = tonumber(channel.fake_subscribers) or tonumber(channel.subscribers)
+end
+
+
+--dbg("channel ", id, " ttl: ",channel.ttl, ", subscribers: ", channel.subscribers, "(fake: ", channel.fake_subscribers or "nil", "), messages: ", num_messages)
+local ch = {
+  tonumber(channel.ttl or msg.ttl),
+  tonumber(channel.last_seen_fake_subscriber) or 0,
+  subscriber_count or 0,
+  msg.time and msg.time and ("%i:%i"):format(msg.time, msg.tag) or "",
+  tonumber(num_messages)
+}
+
+return {ch, new_channel}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/request_subscriber_info.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/request_subscriber_info.lua
new file mode 100644
index 0000000..afe4090
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/request_subscriber_info.lua
@@ -0,0 +1,15 @@
+--input: keys: [],  values: [ namespace, channel_id, info_response_id ]
+--output: -nothing-
+
+local ns = ARGV[1]
+local channel_id = ARGV[2]
+local response_id = tonumber(ARGV[3])
+local pubsub = ('%s{channel:%s}:pubsub'):format(ns, channel_id)
+
+redis.call('echo', ' ####### REQUEST_SUBSCRIBER_INFO #######')
+
+local alert_msgpack =cmsgpack.pack({"alert", "subscriber info", response_id})
+
+redis.call('PUBLISH', pubsub, alert_msgpack)
+
+return true
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/rsck.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/rsck.lua
new file mode 100644
index 0000000..9d351bc
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/rsck.lua
@@ -0,0 +1,216 @@
+--redis-store consistency check
+local ns = ARGV[1]
+if ns and #ns > 0 then
+  ns = ns..":"
+end
+
+local concat = function(...)
+  local arg = {...}
+  for i = 1, #arg do
+    arg[i]=tostring(arg[i])
+  end
+  return table.concat(arg, " ")
+end
+local dbg =function(...) redis.call('echo', concat(...)); end
+local errors={}
+local err = function(...)
+  local msg = concat(...)
+  dbg(msg)
+  table.insert(errors, msg)
+end
+
+local tp=function(t, max_n)
+  local tt={}
+  for i, v in pairs(t) do
+    local val = tostring(v)
+    if max_n and #val > max_n then
+      val = val:sub(1, max_n) .. "[...]"
+    end
+    table.insert(tt, tostring(i) .. ": " .. val)
+  end
+  return "{" .. table.concat(tt, ", ") .. "}"
+end
+
+local tohash=function(arr)
+  if type(arr)~="table" then
+    return nil
+  end
+  local h = {}
+  local k=nil
+  for i, v in ipairs(arr) do
+    if k == nil then
+      k=v
+    else
+      h[k]=v; k=nil
+    end
+  end
+  return h
+end
+local type_is = function(key, _type, description)
+  local t = redis.call("TYPE", key)['ok']
+  local type_ok = true
+  if type(_type) == "table" then
+    type_ok = false
+    for i, v in pairs(_type) do
+      if v == _type then
+        type_ok = true
+        break
+      end
+    end
+  elseif t ~= _type then
+    err((description or ""), key, "should be type " .. _type .. ", is", t)
+    type_ok = false
+  end
+  return type_ok, t
+end
+
+local known_msgs_count=0
+local known_msgkeys = {}
+local known_channel_keys = {}
+
+
+local k = {
+  channel = function(chid)
+    return ("%s{channel:%s}"):format(chid)
+  end,
+  msg = function (chid, msgid)
+    return ("%s:msg:%s"):format(k.channel(chid), msgid)
+  end,
+  messages = function(chid)
+    return k.channel(chid) .. ":messages"
+  end
+}
+
+local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)
+  description = description and "msg (" .. description ..")" or "msg"
+  local msgkey = k.msg(chid, msgid)
+  if not known_msgkeys[msgkey] then
+    known_msgs_count = known_msgs_count + 1
+  end
+  known_msgkeys[msgkey]=true
+  local ok, t = type_is(msgkey, {"hash", "none"}, "message hash")
+  if t == "none" then
+    --message is missing, but maybe it expired under normal circumstances. 
+    --check if any earlier messages are present
+    local msgids = redis.call('LRANGE', k.messages(chid), 0, -1)
+    local founds = 0
+    for i=#msgids, 1, -1 do
+      if msgids[i] == msgid then 
+        break
+      end
+      local thismsgkey = k.msg(chid, msgids[i])
+      local ttt = redis.call('type', thismsgkey)['ok']
+      redis.breakpoint()
+      if ttt == "hash" then
+        founds = founds + 1
+      end
+    end
+    
+    if founds > 0 then
+      err("message", msgkey, "missing, with", founds, "prev. msgs in msg list")
+    end
+    
+  end
+  local msg = tohash(redis.call('HGETALL', msgkey))
+  local ttl = tonumber(redis.call('TTL', msgkey))
+  local n = tonumber(redis.call("HLEN", msgkey))
+  if n > 0 and (msg.data == nil or msg.id == nil or msg.time == nil or msg.tag == nil)then
+    err("incomplete " .. description .."(ttl "..ttl..")", msgkey, tp(msg))
+    return false
+  end
+  if t == "hash" and tonumber(ttl) < 0 then
+    err("message", msgkey, "ttl =", ttl)
+  end
+  if ttl ~= -2 then
+    if prev_msgid ~= false and msg.prev ~= prev_msgid then
+      err(description, chid, msgid, "prev_message wrong. expected", prev_msgid, "got", msg.prev)
+    end
+    if next_msgid ~= false and msg.next ~= next_msgid then
+      err(description, chid, msgid, "next_message wrong. expected", next_msgid, "got", msg.next)
+    end
+  end
+end
+
+local check_channel = function(id)
+  local key={
+    ch = k.channel(id),
+    msgs = k.messages(id)
+  }
+  
+  local ok, chkey_type = type_is(key.ch, "hash", "channel hash")
+  if not ok then
+    if chkey_type ~= "none" then
+      err("unecpected channel key", key.ch, "type:", chkey_type);
+    end
+    return false
+  end
+  local _, msgs_list_type = type_is(key.msgs, {"list", "none"}, "channel messages list")
+  
+  local ch = tohash(redis.call('HGETALL', key.ch))
+  local len = tonumber(redis.call("HLEN", key.ch))
+  local ttl = tonumber(redis.call('TTL',  key.ch))
+  if not ch.current_message or not ch.time then
+    if msgs_list_type == "list" then
+      err("incomplete channel (ttl " .. ttl ..")", key.ch, tp(ch))
+    end  
+  elseif (ch.current_message or ch.prev_message) and msgs_list_type ~= "list" then
+    err("channel", key.ch, "has a current_message but no message list")
+  end
+  
+  local msgids = redis.call('LRANGE', key.msgs, 0, -1)
+  for i, msgid in ipairs(msgids) do
+    check_msg(id, msgid, msgids[i+1], msgids[i-1], "msglist")
+  end
+  
+  if ch.prev_message then
+    if redis.call('LINDEX', key.msgs, 1) ~= ch.prev_message then
+      err("channel", key.ch, "prev_message doesn't correspond to", key.msgs, "second list element")
+    end
+    check_msg(id, ch.prev_message, false, ch.current_message, "channel prev_message")
+  end
+  if ch.current_message then
+    if redis.call('LINDEX', key.msgs, 0) ~= ch.current_message then
+      err("channel", key.ch, "current_message doesn't correspond to", key.msgs, "first list element")
+    end
+    check_msg(id, ch.current_message, ch.prev_message, false, "channel current_message")
+  end
+  
+end
+
+local channel_ids = {}
+
+for i, chkey in ipairs(redis.call("KEYS", k.channel("*"))) do
+  local msgs_chid_match = chkey:match("^"..k.messages("*"))
+  if msgs_chid_match then
+    type_is(k.channel(msgs_chid_match), "hash", "channel messages' corresponding hash key")
+  elseif not chkey:match(":msg$") then
+    table.insert(channel_ids, chkey);
+    known_channel_keys[chkey] = true
+  end
+end
+
+dbg("found", #channel_ids, "channels")
+for i, chkey in ipairs(channel_ids) do
+  local chid = chkey:match("^" .. k.channel(".*"))
+  check_channel(chid)
+end
+
+for i, msgkey in ipairs(redis.call("KEYS", k.channel("*")..":msg")) do
+  if not known_msgkeys[msgkey] then
+    local ok, t = type_is(msgkey, "hash")
+    if ok then
+      if not redis.call('HGET', msgkey, 'unbuffered') then
+        err("orphan message", msgkey, "(ttl: " .. redis.call('TTL', msgkey) .. ")", tp(tohash(redis.call('HGETALL', msgkey)), 15))
+      end
+    else
+      err("orphan message", msgkey, "wrong type", t) 
+    end
+  end
+end
+
+if errors then
+  table.insert(errors, 1, concat(#channel_ids, "channels,",known_msgs_count,"messages found", #errors, "problems"))
+  return errors
+else
+  return concat(#channel_ids, "channels,", known_msgs_count, "messages, all ok")
+end
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_register.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_register.lua
new file mode 100644
index 0000000..5a24fa6
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_register.lua
@@ -0,0 +1,61 @@
+--input: keys: [], values: [namespace, channel_id, subscriber_id, active_ttl_msec, ttl_safety_margin_msec, time, want_channel_settings]
+--  'subscriber_id' can be '-' for new id, or an existing id
+--  'active_ttl_msec' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in msec
+--  'ttl_safety_margin_msec' is number of seconds before TTL that Nchan issues a keepalive recheck
+--output: subscriber_id, num_current_subscribers, next_keepalive_time, channel_buffer_length
+--  'channel_buffer_length' is returned only if want_channel_settings is 1
+
+local ns, id, sub_id, active_ttl, ttl_safety_margin, time = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]), tonumber(ARGV[5]), tonumber(ARGV[6])
+local want_channel_settings = tonumber(ARGV[6]) == 1
+
+--local dbg = function(...) redis.call('echo', table.concat({...})); end
+
+redis.call('echo', ' ######## SUBSCRIBER REGISTER SCRIPT ####### ')
+local ch=("%s{channel:%s}"):format(ns, id)
+local keys = {
+  channel =     ch,
+  messages =    ch..':messages',
+  subscribers = ch..':subscribers',
+  subscriber_counts = ch..':subscriber_counts'
+}
+
+local setkeyttl=function(ttl)
+  for i,v in pairs(keys) do
+    if ttl > 0 then
+      redis.call('PEXPIRE', v, ttl)
+    else
+      redis.call('PERSIST', v)
+    end
+  end
+end
+
+local sub_count
+
+if sub_id == "-" then
+  sub_id = tonumber(redis.call('HINCRBY', keys.channel, "last_subscriber_id", 1))
+  sub_count=tonumber(redis.call('hincrby', keys.channel, 'subscribers', 1))
+else
+  sub_count=tonumber(redis.call('hget', keys.channel, 'subscribers'))
+end
+if time then
+  redis.call('hset', keys.channel, "last_seen_subscriber", time)
+end
+
+local next_keepalive
+local actual_ttl = tonumber(redis.call('PTTL', keys.channel))
+local safe_ttl = active_ttl + ttl_safety_margin
+if actual_ttl < safe_ttl then
+  setkeyttl(safe_ttl)
+  next_keepalive = active_ttl
+else
+  next_keepalive = (actual_ttl - ttl_safety_margin > 0) and (actual_ttl - ttl_safety_margin) or math.ceil(actual_ttl / 2)
+end
+
+
+local ret = {sub_id, sub_count, next_keepalive}
+if want_channel_settings then
+  local max_messages = tonumber(redis.call('hget', keys.channel, 'max_stored_messages'))
+  table.insert(ret, max_messages)
+end
+
+return ret
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_unregister.lua b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
new file mode 100644
index 0000000..2ca5c3e
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/subscriber_unregister.lua
@@ -0,0 +1,50 @@
+--input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]
+-- 'subscriber_id' is an existing id
+-- 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
+--output: subscriber_id, num_current_subscribers
+
+local ns, id, sub_id, empty_ttl = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20
+
+--local dbg = function(...) redis.call('echo', table.concat({...})); end
+
+redis.call('echo', ' ######## SUBSCRIBER UNREGISTER SCRIPT ####### ')
+local ch=('%s{channel:%s}'):format(ns, id)
+local keys = {
+  channel =     ch,
+  messages =    ch..':messages',
+  subscribers = ch..':subscribers',
+  subscriber_counts = ch..':subscriber_counts'
+}
+
+local setkeyttl=function(ttl)
+  for i,v in pairs(keys) do
+    if ttl > 0 then
+      redis.call('expire', v, ttl)
+    elseif ttl < 0 then
+      redis.call('persist', v)
+    else
+      redis.call('del', v)
+    end
+  end
+end
+
+local sub_count = 0
+
+local res = redis.pcall('EXISTS', keys.channel)
+if type(res) == "table" and res["err"] then
+  return {err = ("CLUSTER KEYSLOT ERROR. %i %s"):format(empty_ttl, id)}
+end
+
+if res ~= 0 then
+   sub_count = redis.call('hincrby', keys.channel, 'subscribers', -1)
+
+  if sub_count == 0 and tonumber(redis.call('LLEN', keys.messages)) == 0 then
+    setkeyttl(empty_ttl)
+  elseif sub_count < 0 then
+    return {err="Subscriber count for channel " .. id .. " less than zero: " .. sub_count}
+  end
+else
+  --dbg("channel ", id, " already gone")
+end
+
+return {sub_id, sub_count}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/testscripts.rb b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/testscripts.rb
new file mode 100755
index 0000000..6cda77c
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis-lua-scripts/testscripts.rb
@@ -0,0 +1,269 @@
+#!/usr/bin/ruby
+require 'digest/sha1'
+require "redis"
+require 'open3'
+require 'minitest'
+require 'minitest/reporters'
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new(:color => true)]
+require "minitest/autorun"
+require 'securerandom'
+require "pry"
+
+REDIS_HOST="127.0.0.1"
+REDIS_PORT=8537
+REDIS_DB=1
+NAMESPACE="nchan:"
+
+class PubSubTest < Minitest::Test
+  @@redis=nil
+  @@scripts= {}
+  @@files=   {}
+  @@scripts= {}
+  @@hashes=  {}
+  
+  def self.test_order
+    :alpha
+  end
+  
+  def self.luac
+    if @@scripts
+      @@scripts.each do |name, script|
+        Open3.popen2e('luac', "-p", @@files[name]) do |stdin, stdouterr, process|
+          raise stdouterr.read unless process.value.success?
+        end
+      end
+    else
+      raise "scripts not loaded yet"
+    end
+  end
+  
+  def self.loadscripts
+    @@scripts.each do |name, script|
+      begin
+        h=@@redis.script :load, script
+        @@hashes[name]=h
+      rescue Redis::CommandError => e
+        e.message.gsub!(/:\s+(user_script):(\d+):/, ": \n#{name}.lua:\\2:")
+        def e.backtrace; []; end
+        raise e
+      end
+    end
+  end
+  
+  def setup
+    unless @@redis
+      @@redis=Redis.new(:host => REDIS_HOST, :port => REDIS_PORT, :db => REDIS_DB)
+
+      Dir[ "#{File.dirname(__FILE__)}/*.lua" ].each do |f|
+        scriptname=File.basename(f, ".lua").to_sym
+        @@scripts[scriptname]=IO.read f
+        @@files[scriptname]=f
+      end
+      self.class.luac
+      self.class.loadscripts
+    end
+  end
+
+  def redis; @@redis; end
+  def hashes; @@hashes; end
+
+  class Msg
+    attr_accessor :data, :chid, :time, :tag, :id, :content_type, :channel_info, :ttl, :max_buf_size, :eventsource_event
+    def _empty_is_nil(v)
+      v == "" ? nil : v
+    end
+    def initialize(channel_id, arg={})
+      @chid= _empty_is_nil channel_id
+      id(arg[:id]) if arg[:id]
+      @time= _empty_is_nil arg[:time]
+      @tag= _empty_is_nil arg[:tag]
+      @data= _empty_is_nil arg[:data]
+      if @data && @time.nil?
+        @time=Time.now.utc.to_i
+      end
+      @ttl=_empty_is_nil arg[:ttl]
+      @eventsource_event = _empty_is_nil arg[:eventsource_event]
+      @max_buf_size = _empty_is_nil arg[:max_buf_size] || 100
+      @content_type=_empty_is_nil arg[:content_type]
+    end
+    def ==(m)
+      self.to_s==m.to_s
+    end
+    
+    def to_s
+      "[#{@chid}]#{id}<#{@content_type}> #{@data}"
+    end
+    
+    def id(msgid=nil)
+      if msgid
+        @id=msgid
+        @time, @tag =@id.split(":")
+      else
+        @id||= "#{time}:#{tag}" unless time.nil? || tag.nil?
+      end
+      @id
+    end
+    def time=(t)
+      @time=t
+      id
+    end
+    def tag=(t)
+      @tag=t
+      id
+    end
+  end
+
+  def publish(*arg)
+    if arg.length==1
+      msg = arg.first
+      msg=Msg.new(msg[:channel_id] || msg[:chid], msg) if Hash === msg
+    elsif arg.length==2
+      msg=Msg.new(arg.first, arg.last)
+    end
+
+    msg.time= Time.now.utc.to_i unless msg.time
+    msg_tag, channel_info=redis.evalsha hashes[:publish], [], [NAMESPACE, msg.chid, msg.time, msg.data, msg.content_type, msg.eventsource_event, msg.ttl, msg.max_buf_size, 'publish', 1]
+    msg.tag=msg_tag
+    msg.channel_info=channel_info
+    return msg
+  end
+
+  def delete(ch_id)
+    redis.evalsha hashes[:delete], [], [NAMESPACE, ch_id]
+  end
+
+  def getmsg(msg, opt={})
+    if String===opt
+      ch_id=msg
+      msg_id=opt
+      msg_time, msg_tag = msg_id.split(":")
+    elsif Msg === msg
+      msg_id, msg_time, msg_tag = msg.id, msg.time, msg.tag
+      ch_id=msg.chid
+    else
+      msg_time, msg_tag = msg.split(":")
+      msg_id=msg
+    end
+    traverse_order=((Hash === opt) && opt[:getfirst]) ? 'FIFO' : 'FILO'
+    msg_tag=0 if msg_time && msg_tag.nil?
+    #binding.pry
+    status, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, msg_data, msg_content_type, msg_eventsource_event, subscriber_count = redis.evalsha hashes[:get_message], [], [NAMESPACE, ch_id, msg_time || 0, msg_tag || 0, traverse_order, 15 ]
+    if status == 404
+      return nil
+    elsif status == 418 #not ready
+      return false
+    elsif status == 200
+      return Msg.new ch_id, time: msg_time, tag: msg_tag, data: msg_data, content_type: msg_content_type, eventsource_event: msg_eventsource_event, ttl: msg_ttl
+    end
+  end
+
+  def randid
+    SecureRandom.hex
+  end
+
+  def test_connection
+    assert_equal "PONG", redis.ping
+  end
+
+  #now for the real tests
+  def test_publish
+    msg_id, channel = publish chid: randid, data: "hello what is this", ttl: 10, content_type: "X-fruit/banana"
+  end
+  
+  def test_nomessage
+    id = randid
+    publish chid: id, data:"whatever this is", ttl: 100
+    msg = getmsg randid, "1200:0"
+    refute msg, "message should be absent"
+  end
+  
+  def test_simple
+    id=randid
+    msg2_data = "what is this i don't even"
+    m=[]
+    m << Msg.new(id, data: "whatever",ttl: 100, content_type: "X-fruit/banana")
+    m << Msg.new(id, data: msg2_data, ttl: 100, content_type: "X-fruit/banana")
+    m.each do |msg|
+      publish msg
+    end
+    refute_equal m[0], m[1], "two different messages should have different message ids"
+    msg = getmsg m[0]
+
+    assert_equal m[1], msg, "retrieved message doesn't match"
+  end
+  
+  def test_publish_invalid_content_type
+    e = assert_raises Redis::CommandError do
+      publish randid, data: "this message has an invalid content-type", content_type: "foo:bar", ttl: 10
+    end
+    assert_match /cannot contain ":"/, e.message
+  end
+  
+  def test_walk_buffer
+    id=randid
+    sent=[]
+    %w( foobar1 whatthe-somethng-of isnot-even-meaning -has-you-evenr-as-sofar-as-to -even-move-zig).each do |w|
+      sent << Msg.new(id, data: w, ttl: 100)
+      sleep rand(0..1.1)
+    end
+    sent.each do |m|
+      publish m
+    end
+    
+    cur=Msg.new(id)
+    while sent.length>0
+      #binding.pry
+      cur=getmsg cur
+      n=sent.shift
+      assert_equal cur, n
+      cur=n
+    end
+    assert_equal false, getmsg(cur), "Last message should return 'false'"
+  end
+  
+  def test_timeout
+    id=randid
+    sent=[]
+    sent << publish(Msg.new(id, data: "fee", ttl: 3))
+    sleep 2
+    sent << publish(Msg.new(id, data: "foo", ttl: 3))
+    sent << publish(Msg.new(id, data: "fie", ttl: 3))
+    sleep 1.5
+    cur=getmsg id, ""
+    assert_equal cur, sent[1]
+    sleep 1.6
+    cur=getmsg id, ""
+    assert_equal false, cur
+    #nice!
+  end
+  
+  def test_largemsg
+    id=randid
+    sent= publish(Msg.new id, data: "0" * 100000 * 1024, ttl: 20)
+    cur = getmsg id, ""
+    assert_equal cur, sent
+  end
+  
+  def test_delete
+    id=randid
+    sent=[]
+    sent << publish(Msg.new(id, data: "fee", ttl: 30))
+    sent << publish(Msg.new(id, data: "foo", ttl: 30))
+    sent << publish(Msg.new(id, data: "foo2", ttl: 30))
+    
+    cur=getmsg id, ""
+    assert_equal sent[0], cur
+    
+    cur=getmsg cur
+    assert_equal sent[1], cur
+    
+    cur=getmsg cur
+    assert_equal sent[2], cur
+    
+    delete id
+    
+    cur=getmsg Msg.new(id), sub: 'foobar'
+    assert_equal false, cur
+  end
+  
+end
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.c
new file mode 100644
index 0000000..81ad514
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.c
@@ -0,0 +1,1185 @@
+#include "redis_lua_commands.h"
+
+redis_lua_scripts_t redis_lua_scripts = {
+  {"add_fakesub", "f3b5cc02b9902e94db37949cf0eba6b3fb30376f",
+   "--input:  keys: [], values: [namespace, channel_id, number, time, nginx_worker_id]\n"
+   "--output: -none-\n"
+   "  \n"
+   "redis.call('echo', ' ####### ADD_FAKESUBS ####### ')\n"
+   "local ns = ARGV[1]\n"
+   "local id = ARGV[2]\n"
+   "local num = tonumber(ARGV[3])\n"
+   "local time = tonumber(ARGV[4])\n"
+   "local ngx_worker_id = ARGV[5]\n"
+   "\n"
+   "if num==nil then\n"
+   "  return {err=\"fakesub number not given\"}\n"
+   "end\n"
+   "\n"
+   "local chan_key = ('%s{channel:%s}'):format(ns, id)\n"
+   "local subs_key = ('%s{channel:%s}:subscriber_counts'):format(ns, id)\n"
+   "\n"
+   "local res = redis.pcall('EXISTS', chan_key)\n"
+   "if type(res) == \"table\" and res[\"err\"] then\n"
+   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(num, id)}\n"
+   "end\n"
+   "\n"
+   "local exists = res == 1\n"
+   "\n"
+   "local old_current_count = 0\n"
+   "\n"
+   "if exists or (not exists and num > 0) then\n"
+   "  old_current_count = redis.call('HINCRBY', chan_key, 'fake_subscribers', num)\n"
+   "  if time then\n"
+   "    redis.call('HSET', chan_key, 'last_seen_fake_subscriber', time)\n"
+   "  end\n"
+   "  if not exists then\n"
+   "    redis.call('EXPIRE', chan_key, 5) --something small\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local res = redis.pcall('EXISTS', subs_key)\n"
+   "if type(res) == \"table\" and res[\"err\"] then\n"
+   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(num, id)}\n"
+   "end\n"
+   "redis.call('HINCRBY', subs_key, ngx_worker_id, num)\n"
+   "local subs_key_pttl = tonumber(redis.call('PTTL',  subs_key))\n"
+   "if subs_key_pttl < 0 then\n"
+   "  subs_key_pttl = redis.call('PTTL', chan_key)\n"
+   "  if subs_key_pttl <= 0 then\n"
+   "    --60 seconds to get your shit together\n"
+   "    subs_key_pttl = 60\n"
+   "  end\n"
+   "  redis.call('PEXPIRE', subs_key, subs_key_pttl)\n"
+   "end\n"
+   "\n"
+   "return nil\n"},
+
+  {"channel_keepalive", "7bfe076302b20eeb2e5b0a325599325c96fabc80",
+   "--input:  keys: [], values: [namespace, channel_id, ttl_msec, ttl_safety_margin_msec]\n"
+   "-- ttl_msec is for when there are no messages but at least 1 subscriber.\n"
+   "--output: seconds until next keepalive is expected, or -1 for \"let it disappear\"\n"
+   "redis.call('ECHO', ' ####### CHANNEL KEEPALIVE ####### ')\n"
+   "local ns=ARGV[1]\n"
+   "local id=ARGV[2]\n"
+   "local ttl=tonumber(ARGV[3])\n"
+   "local ttl_safety_margin=tonumber(ARGV[4])\n"
+   "if not ttl then\n"
+   "  return {err=\"Invalid channel keepalive TTL (3rd arg)\"}\n"
+   "end\n"
+   "\n"
+   "--safe ttl is a bit greater than the expected ttl, so that Nchan can update it before it expires\n"
+   "local safe_ttl = ttl + ttl_safety_margin\n"
+   "\n"
+   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
+   "local key= {\n"
+   "  channel=   ch, --hash\n"
+   "  messages=  ch..':messages', --list\n"
+   "  subscribers = ch..':subscribers', --list\n"
+   "  subscriber_counts = ch..':subscriber_counts' --hash\n"
+   "}\n"
+   "\n"
+   "local subs_count = tonumber(redis.call('HGET', key.channel, \"subscribers\")) or 0\n"
+   "local msgs_count = tonumber(redis.call('LLEN', key.messages)) or 0\n"
+   "local actual_ttl = tonumber(redis.call('PTTL',  key.channel))\n"
+   "\n"
+   "\n"
+   "if subs_count <= 0 then\n"
+   "  return -1\n"
+   "end\n"
+   "\n"
+   "if msgs_count > 0 and actual_ttl > safe_ttl then\n"
+   "  local return_ttl =  actual_ttl - ttl_safety_margin > 0 and actual_ttl - ttl_safety_margin or math.ceil(actual_ttl / 2)\n"
+   "  return return_ttl\n"
+   "end\n"
+   "\n"
+   "--refresh ttl\n"
+   "redis.call('PEXPIRE', key.channel, safe_ttl);\n"
+   "redis.call('PEXPIRE', key.messages, safe_ttl);\n"
+   "redis.call('PEXPIRE', key.subscribers, safe_ttl);\n"
+   "redis.call('PEXPIRE', key.subscriber_counts, safe_ttl);\n"
+   "\n"
+   "return ttl\n"
+   "\n"},
+
+  {"delete", "a928e8b91abe4c7be327b4ed79a7e0b4a6a13236",
+   "--input: keys: [],  values: [ namespace, channel_id, publish_command, use_accurate_subscriber_count ]\n"
+   "--output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil\n"
+   "-- delete this channel and all its messages\n"
+   "local ns = ARGV[1]\n"
+   "local id = ARGV[2]\n"
+   "local publish_command = ARGV[3]\n"
+   "local use_accurate_subscriber_count = tonumber(ARGV[4])~=0\n"
+   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
+   "local key_msg=    ch..':msg:%s' --not finished yet\n"
+   "local key_channel=ch\n"
+   "local messages=   ch..':messages'\n"
+   "local subscribers=ch..':subscribers'\n"
+   "local pubsub=     ch..':pubsub'\n"
+   "local subscriber_counts = ch..':subscriber_counts'\n"
+   "\n"
+   "redis.replicate_commands()\n"
+   "\n"
+   "redis.call('echo', ' ####### DELETE #######')\n"
+   "local num_messages = 0\n"
+   "--delete all the messages right now mister!\n"
+   "local msg\n"
+   "while true do\n"
+   "  msg = redis.call('LPOP', messages)\n"
+   "  if msg then\n"
+   "    num_messages = num_messages + 1\n"
+   "    redis.call('DEL', key_msg:format(msg))\n"
+   "  else\n"
+   "    break\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local del_msgpack =cmsgpack.pack({\"alert\", \"delete channel\", id})\n"
+   "for k,channel_key in pairs(redis.call('SMEMBERS', subscribers)) do\n"
+   "  redis.call('PUBLISH', channel_key, del_msgpack)\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "local channel = nil\n"
+   "local subscriber_count = nil\n"
+   "if redis.call('EXISTS', key_channel) ~= 0 then\n"
+   "  channel = tohash(redis.call('hgetall', key_channel))\n"
+   "  --leave some crumbs behind showing this channel was just deleted\n"
+   "  redis.call('setex', ch..\":deleted\", 5, 1)\n"
+   "  \n"
+   "  if use_accurate_subscriber_count then\n"
+   "    local sub_counts = tohash(redis.call(\"HGETALL\", subscriber_counts))\n"
+   "    subscriber_count = 0\n"
+   "    for k, v in pairs(sub_counts) do\n"
+   "      v = tonumber(v)\n"
+   "      local res = redis.call(\"PUBSUB\", \"NUMSUB\", k)\n"
+   "      if tonumber(res[2]) >= 1 and v > 0 then\n"
+   "        subscriber_count = subscriber_count + tonumber(v)\n"
+   "      else\n"
+   "        redis.call(\"HDEL\", subscriber_counts, k)\n"
+   "      end\n"
+   "    end\n"
+   "  else\n"
+   "    subscriber_count = tonumber(channel.fake_subscribers) or tonumber(channel.subscribers)\n"
+   "  end\n"
+   "  \n"
+   "end\n"
+   "\n"
+   "redis.call('DEL', key_channel, messages, subscribers, subscriber_counts)\n"
+   "redis.call('PUBLISH', pubsub, del_msgpack)\n"
+   "\n"
+   "if channel then\n"
+   "  return {\n"
+   "    tonumber(channel.ttl) or 0,\n"
+   "    tonumber(channel.last_seen_fake_subscriber) or 0,\n"
+   "    subscriber_count or 0,\n"
+   "    channel.current_message or \"\",\n"
+   "    tonumber(num_messages)\n"
+   "  }\n"
+   "else\n"
+   "  return nil\n"
+   "end\n"},
+
+  {"find_channel", "a2c935167edd17b4a9c850f31dd8d2beb706b1c5",
+   "--input: keys: [],  values: [ namespace, channel_id, use_accurate_subscriber_count ]\n"
+   "--output: channel_hash {ttl, time_last_seen, subscribers, last_channel_id, messages} or nil\n"
+   "-- finds and return the info hash of a channel, or nil of channel not found\n"
+   "local ns = ARGV[1]\n"
+   "local id = ARGV[2]\n"
+   "local use_accurate_subscriber_count = tonumber(ARGV[3]) ~= 0\n"
+   "\n"
+   "local channel_key = ('%s{channel:%s}'):format(ns, id)\n"
+   "local messages_key = channel_key..':messages'\n"
+   "local subscriber_counts = channel_key..':subscriber_counts'\n"
+   "\n"
+   "redis.replicate_commands()\n"
+   "\n"
+   "redis.call('echo', ' #######  FIND_CHANNEL ######## ')\n"
+   "\n"
+   "--check old entries\n"
+   "local oldestmsg=function(list_key, old_fmt)\n"
+   "  local old, oldkey\n"
+   "  local n, del=0,0\n"
+   "  while true do\n"
+   "    n=n+1\n"
+   "    old=redis.call('lindex', list_key, -1)\n"
+   "    if old then\n"
+   "      oldkey=old_fmt:format(old)\n"
+   "      local ex=redis.call('exists', oldkey)\n"
+   "      if ex==1 then\n"
+   "        return oldkey\n"
+   "      else\n"
+   "        redis.call('rpop', list_key)\n"
+   "        del=del+1\n"
+   "      end\n"
+   "    else\n"
+   "      break\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      --dbg(k..\"=\"..v)\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "if redis.call('EXISTS', channel_key) ~= 0 then\n"
+   "  local ch = tohash(redis.call('hgetall', channel_key))\n"
+   "    \n"
+   "  local msgs_count\n"
+   "  if redis.call(\"TYPE\", messages_key)['ok'] == 'list' then\n"
+   "    oldestmsg(messages_key, channel_key ..':msg:%s')\n"
+   "    msgs_count = tonumber(redis.call('llen', messages_key))\n"
+   "  else\n"
+   "    msgs_count = 0\n"
+   "  end\n"
+   "  \n"
+   "  local subscriber_count\n"
+   "  if use_accurate_subscriber_count then\n"
+   "    local sub_counts = tohash(redis.call(\"HGETALL\", subscriber_counts))\n"
+   "    subscriber_count = 0\n"
+   "    for k, v in pairs(sub_counts) do\n"
+   "      v = tonumber(v)\n"
+   "      local res = redis.call(\"PUBSUB\", \"NUMSUB\", k)\n"
+   "      if tonumber(res[2]) >= 1 and v > 0 then\n"
+   "        subscriber_count = subscriber_count + tonumber(v)\n"
+   "      else\n"
+   "        redis.call(\"HDEL\", subscriber_counts, k)\n"
+   "      end\n"
+   "    end\n"
+   "  else\n"
+   "    subscriber_count = tonumber(ch.fake_subscribers) or tonumber(ch.subscribers)\n"
+   "  end\n"
+   "  \n"
+   "  return {\n"
+   "    tonumber(ch.ttl) or 0,\n"
+   "    tonumber(ch.last_seen_fake_subscriber) or 0,\n"
+   "    subscriber_count or 0,\n"
+   "    ch.current_message or \"\",\n"
+   "    msgs_count\n"
+   "  }\n"
+   "else\n"
+   "  return nil\n"
+   "end\n"},
+
+  {"get_message", "fb9c46d33b3798a11d4eca6e0f7a3f92beba8685",
+   "--input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]\n"
+   "--output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count\n"
+   "-- no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent\n"
+   "-- create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.\n"
+   "-- result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available\n"
+   "local ns, id, time, tag, subscribe_if_current = ARGV[1], ARGV[2], tonumber(ARGV[3]), tonumber(ARGV[4])\n"
+   "local no_msgid_order=ARGV[5]\n"
+   "local create_channel_ttl=tonumber(ARGV[6]) or 0\n"
+   "local msg_id\n"
+   "if time and time ~= 0 and tag then\n"
+   "  msg_id=(\"%s:%s\"):format(time, tag)\n"
+   "end\n"
+   "\n"
+   "if redis.replicate_commands then\n"
+   "  redis.replicate_commands()\n"
+   "end\n"
+   "\n"
+   "-- This script has gotten big and ugly, but there are a few good reasons \n"
+   "-- to keep it big and ugly. It needs to do a lot of stuff atomically, and \n"
+   "-- redis doesn't do includes. It could be generated pre-insertion into redis, \n"
+   "-- but then error messages become less useful, complicating debugging. If you \n"
+   "-- have a solution to this, please help.\n"
+   "local ch=('%s{channel:%s}'):format(ns, id)\n"
+   "local msgkey_fmt=ch..':msg:%s'\n"
+   "local key={\n"
+   "  next_message= msgkey_fmt, --hash\n"
+   "  message=      msgkey_fmt, --hash\n"
+   "  channel=      ch, --hash\n"
+   "  messages=     ch..':messages', --list\n"
+   "--  pubsub=       ch..':subscribers:', --set\n"
+   "}\n"
+   "\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "\n"
+   "redis.call('echo', ' #######  GET_MESSAGE ######## ')\n"
+   "\n"
+   "local oldestmsg=function(list_key, old_fmt)\n"
+   "  local old, oldkey\n"
+   "  local n, del=0,0\n"
+   "  while true do\n"
+   "    n=n+1\n"
+   "    old=redis.call('lindex', list_key, -1)\n"
+   "    if old then\n"
+   "      oldkey=old_fmt:format(old)\n"
+   "      local ex=redis.call('exists', oldkey)\n"
+   "      if ex==1 then\n"
+   "        return oldkey\n"
+   "      else\n"
+   "        redis.call('rpop', list_key)\n"
+   "        del=del+1\n"
+   "      end \n"
+   "    else\n"
+   "      --dbg(list_key, \" is empty\")\n"
+   "      break\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      --dbg(k..\"=\"..v)\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "if no_msgid_order ~= 'FIFO' then\n"
+   "  no_msgid_order = 'FILO'\n"
+   "end\n"
+   "\n"
+   "local channel = tohash(redis.call('HGETALL', key.channel))\n"
+   "local new_channel = false\n"
+   "if next(channel) == nil then\n"
+   "  if create_channel_ttl==0 then\n"
+   "    return {404, nil}\n"
+   "  end\n"
+   "  redis.call('HSET', key.channel, 'time', time)\n"
+   "  redis.call('EXPIRE', key.channel, create_channel_ttl)\n"
+   "  channel = {time=time}\n"
+   "  new_channel = true\n"
+   "end\n"
+   "\n"
+   "local subs_count = tonumber(channel.subscribers)\n"
+   "\n"
+   "if msg_id==nil then\n"
+   "  local found_msg_key\n"
+   "  if new_channel then\n"
+   "    --dbg(\"new channel\")\n"
+   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
+   "  else\n"
+   "    --dbg(\"no msg id given, ord=\"..no_msgid_order)\n"
+   "    \n"
+   "    if no_msgid_order == 'FIFO' then --most recent message\n"
+   "      --dbg(\"get most recent\")\n"
+   "      found_msg_key=channel.current_message\n"
+   "    elseif no_msgid_order == 'FILO' then --oldest message\n"
+   "      --dbg(\"get oldest\")\n"
+   "      found_msg_key=oldestmsg(key.messages, msgkey_fmt)\n"
+   "    end\n"
+   "    \n"
+   "    if found_msg_key == nil then\n"
+   "      --we await a message\n"
+   "      return {418, \"\", \"\", \"\", \"\", subs_count}\n"
+   "    else\n"
+   "      local msg=tohash(redis.call('HGETALL', found_msg_key))\n"
+   "      if not next(msg) then --empty\n"
+   "        return {404, \"\", \"\", \"\", \"\", subs_count}\n"
+   "      else\n"
+   "        --dbg((\"found msg %s:%s  after %s:%s\"):format(tostring(msg.time), tostring(msg.tag), tostring(time), tostring(tag)))\n"
+   "        local ttl = redis.call('TTL', found_msg_key)\n"
+   "        return {200, ttl, tonumber(msg.time) or \"\", tonumber(msg.tag) or \"\", tonumber(msg.prev_time) or \"\", tonumber(msg.prev_tag) or \"\", msg.data or \"\", msg.content_type or \"\", msg.eventsource_event or \"\", tonumber(msg.compression or 0), subs_count}\n"
+   "      end\n"
+   "    end\n"
+   "  end\n"
+   "else\n"
+   "  if msg_id and channel.current_message == msg_id\n"
+   "   or not channel.current_message then\n"
+   "    return {418, \"\", \"\", \"\", \"\", subs_count}\n"
+   "  end\n"
+   "\n"
+   "  key.message=key.message:format(msg_id)\n"
+   "  local msg=tohash(redis.call('HGETALL', key.message))\n"
+   "\n"
+   "  if next(msg) == nil then -- no such message. it might've expired, or maybe it was never there\n"
+   "    --dbg(\"MESSAGE NOT FOUND\")\n"
+   "    return {404, nil}\n"
+   "  end\n"
+   "\n"
+   "  local next_msg, next_msgtime, next_msgtag\n"
+   "  if not msg.next then --this should have been taken care of by the channel.current_message check\n"
+   "    --dbg(\"NEXT MESSAGE KEY NOT PRESENT. ERROR, ERROR!\")\n"
+   "    return {404, nil}\n"
+   "  else\n"
+   "    --dbg(\"NEXT MESSAGE KEY PRESENT: \" .. msg.next)\n"
+   "    key.next_message=key.next_message:format(msg.next)\n"
+   "    if redis.call('EXISTS', key.next_message)~=0 then\n"
+   "      local ntime, ntag, prev_time, prev_tag, ndata, ncontenttype, neventsource_event, ncompression=unpack(redis.call('HMGET', key.next_message, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))\n"
+   "      local ttl = redis.call('TTL', key.next_message)\n"
+   "      --dbg((\"found msg2 %i:%i  after %i:%i\"):format(ntime, ntag, time, tag))\n"
+   "      return {200, ttl, tonumber(ntime) or \"\", tonumber(ntag) or \"\", tonumber(prev_time) or \"\", tonumber(prev_tag) or \"\", ndata or \"\", ncontenttype or \"\", neventsource_event or \"\", ncompression or 0, subs_count}\n"
+   "    else\n"
+   "      --dbg(\"NEXT MESSAGE NOT FOUND\")\n"
+   "      return {404, nil}\n"
+   "    end\n"
+   "  end\n"
+   "end\n"},
+
+  {"get_message_from_key", "304efcd42590f99e0016686572530defd3de1383",
+   "--input:  keys: [message_key], values: []\n"
+   "--output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count\n"
+   "local key = KEYS[1]\n"
+   "\n"
+   "local ttl = redis.call('TTL', key)\n"
+   "local time, tag, prev_time, prev_tag, data, content_type, es_event, compression = unpack(redis.call('HMGET', key, 'time', 'tag', 'prev_time', 'prev_tag', 'data', 'content_type', 'eventsource_event', 'compression'))\n"
+   "\n"
+   "return {ttl, time, tag, prev_time or 0, prev_tag or 0, data or \"\", content_type or \"\", es_event or \"\", tonumber(compression or 0)}\n"},
+
+  {"get_subscriber_info_id", "3490d5bc3fdc7ed065d9d54b4a0cb8ad6b62c180",
+   "--input:  keys: [unique_request_id_key], values: []\n"
+   "--output: next_unique_request_id_integer\n"
+   "local key = KEYS[1]\n"
+   "\n"
+   "redis.call(\"ECHO\", \"###### GET SUBSCRIBER INFO ID ##########\")\n"
+   "\n"
+   "local resp = redis.pcall(\"INCR\", key)\n"
+   "local val\n"
+   "if type(resp) ~= \"number\" then\n"
+   "  redis.call(\"SET\", key, \"0\")\n"
+   "  val = redis.call(\"INCR\", key)\n"
+   "else\n"
+   "  val = resp\n"
+   "end\n"
+   "\n"
+   "redis.call(\"ECHO\", \"val: \" .. val)\n"
+   "\n"
+   "return val\n"},
+
+  {"nostore_publish_multiexec_channel_info", "35696def4f2ec62f9b91a72fa17bba7a4e4cb6cf",
+   "--input: keys: [],  values: [ namespace, channel_id, use_accurate_subscriber_count ]\n"
+   "--output: {subscribers_count, last_subscriber_seed}, or nil of channel not found\n"
+   "\n"
+   "local ns = ARGV[1]\n"
+   "local id = ARGV[2]\n"
+   "local use_accurate_subscriber_count = tonumber(ARGV[3]) ~= 0\n"
+   "\n"
+   "local channel_key = ('%s{channel:%s}'):format(ns, id)\n"
+   "local subscriber_counts = channel_key..':subscriber_counts'\n"
+   "\n"
+   "redis.replicate_commands()\n"
+   "\n"
+   "redis.call('echo', ' #######  NOSTORE_PUBLISH_MULTIEXEC_CHANNEL_INFO ######## ')\n"
+   "\n"
+   "if redis.call('exists', channel_key) ~= 1 then\n"
+   "  return {0, 0}\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      --dbg(k..\"=\"..v)\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "local last_seen = tonumber(redis.call('HGET', channel_key, 'last_seen_fake_subscriber'))\n"
+   "\n"
+   "local subscriber_count\n"
+   "if use_accurate_subscriber_count then\n"
+   "  local sub_counts = tohash(redis.call(\"HGETALL\", subscriber_counts))\n"
+   "  subscriber_count = 0\n"
+   "  for k, v in pairs(sub_counts) do\n"
+   "    v = tonumber(v)\n"
+   "    local res = redis.call(\"PUBSUB\", \"NUMSUB\", k)\n"
+   "    if tonumber(res[2]) >= 1 and v > 0 then\n"
+   "      subscriber_count = subscriber_count + tonumber(v)\n"
+   "    else\n"
+   "      redis.call(\"HDEL\", subscriber_counts, k)\n"
+   "    end\n"
+   "  end\n"
+   "else\n"
+   "  subscriber_count = tonumber(redis.call('HGET', channel_key, 'fake_subscribers'))\n"
+   "end\n"
+   "\n"
+   "\n"
+   "return {last_seen or 0, subscriber_count or 0}\n"},
+
+  {"publish", "1c68d9e05fe55e2992a917c41255f23e1330b255",
+   "--input:  keys: [], values: [namespace, channel_id, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, publish_command, use_accurate_subscriber_count]\n"
+   "--output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?\n"
+   "\n"
+   "redis.replicate_commands()\n"
+   "\n"
+   "local ns, id=ARGV[1], ARGV[2]\n"
+   "\n"
+   "local msg = {\n"
+   "  data =ARGV[3],\n"
+   "  content_type = ARGV[4],\n"
+   "  eventsource_event = ARGV[5],\n"
+   "  compression = tonumber(ARGV[6]),\n"
+   "  ttl= tonumber(ARGV[7]),\n"
+   "  time = tonumber(redis.call('TIME')[1]),\n"
+   "  tag = 0\n"
+   "}\n"
+   "local store_at_most_n_messages = tonumber(ARGV[8])\n"
+   "if store_at_most_n_messages == nil or store_at_most_n_messages == \"\" then\n"
+   "  return {err=\"Argument 9, max_msg_buf_size, can't be empty\"}\n"
+   "end\n"
+   "if store_at_most_n_messages == 0 then\n"
+   "  msg.unbuffered = 1\n"
+   "end\n"
+   "\n"
+   "local msgpacked_pubsub_cutoff = tonumber(ARGV[9])\n"
+   "\n"
+   "local publish_command = ARGV[10]\n"
+   "local use_accurate_subscriber_count = tonumber(ARGV[11]) ~= 0\n"
+   "\n"
+   "\n"
+   "if msg.ttl == 0 then\n"
+   "  msg.ttl = 126144000 --4 years\n"
+   "end\n"
+   "\n"
+   "--[[local dbg = function(...)\n"
+   "  local arg = {...}\n"
+   "  for i = 1, #arg do\n"
+   "    arg[i]=tostring(arg[i])\n"
+   "  end\n"
+   "  redis.call('echo', table.concat(arg, \", \"))\n"
+   "end]]\n"
+   "\n"
+   "if type(msg.content_type)=='string' and msg.content_type:find(':') then\n"
+   "  return {err='Message content-type cannot contain \":\" character.'}\n"
+   "end\n"
+   "\n"
+   "redis.call('echo', ' #######  PUBLISH   ######## ')\n"
+   "\n"
+   "-- sets all fields for a hash from a dictionary\n"
+   "local hmset = function (key, dict)\n"
+   "  if next(dict) == nil then return nil end\n"
+   "  local bulk = {}\n"
+   "  for k, v in pairs(dict) do\n"
+   "    table.insert(bulk, k)\n"
+   "    table.insert(bulk, v)\n"
+   "  end\n"
+   "  return redis.call('HMSET', key, unpack(bulk))\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "\n"
+   "local ch = ('%s{channel:%s}'):format(ns, id)\n"
+   "local msg_fmt = ch..':msg:%s'\n"
+   "local key={\n"
+   "  last_message= msg_fmt, --not finished yet\n"
+   "  message=      msg_fmt, --not finished yet\n"
+   "  channel=      ch,\n"
+   "  messages=     ch..':messages',\n"
+   "  subscribers=  ch..':subscribers',\n"
+   "  subscriber_counts=  ch..':subscriber_counts'\n"
+   "}\n"
+   "local channel_pubsub = ch..':pubsub'\n"
+   "\n"
+   "local new_channel\n"
+   "local channel\n"
+   "if redis.call('EXISTS', key.channel) ~= 0 then\n"
+   "  channel=tohash(redis.call('HGETALL', key.channel))\n"
+   "  channel.max_stored_messages = tonumber(channel.max_stored_messages)\n"
+   "end\n"
+   "\n"
+   "if channel~=nil then\n"
+   "  --dbg(\"channel present\")\n"
+   "  if channel.current_message ~= nil then\n"
+   "    --dbg(\"channel current_message present\")\n"
+   "    key.last_message=key.last_message:format(channel.current_message, id)\n"
+   "  else\n"
+   "    --dbg(\"channel current_message absent\")\n"
+   "    key.last_message=nil\n"
+   "  end\n"
+   "  new_channel=false\n"
+   "else\n"
+   "  --dbg(\"channel missing\")\n"
+   "  channel={}\n"
+   "  new_channel=true\n"
+   "  key.last_message=nil\n"
+   "end\n"
+   "\n"
+   "--set new message id\n"
+   "local lastmsg, lasttime, lasttag\n"
+   "if key.last_message then\n"
+   "  lastmsg = redis.call('HMGET', key.last_message, 'time', 'tag')\n"
+   "  lasttime, lasttag = tonumber(lastmsg[1]), tonumber(lastmsg[2])\n"
+   "  --dbg(\"New message id: last_time \", lasttime, \" last_tag \", lasttag, \" msg_time \", msg.time)\n"
+   "  if lasttime and tonumber(lasttime) > tonumber(msg.time) then\n"
+   "    redis.log(redis.LOG_WARNING, \"Nchan: message for \" .. id .. \" arrived a little late and may be delivered out of order. Redis must be very busy, or the Nginx servers do not have their times synchronized.\")\n"
+   "    msg.time = lasttime\n"
+   "  end\n"
+   "  if lasttime and lasttime==msg.time then\n"
+   "    msg.tag=lasttag+1\n"
+   "  end\n"
+   "  msg.prev_time = lasttime\n"
+   "  msg.prev_tag = lasttag\n"
+   "else\n"
+   "  msg.prev_time = 0\n"
+   "  msg.prev_tag = 0\n"
+   "end\n"
+   "msg.id=('%i:%i'):format(msg.time, msg.tag)\n"
+   "\n"
+   "key.message=key.message:format(msg.id)\n"
+   "if redis.call('EXISTS', key.message) ~= 0 then\n"
+   "  local hash_tostr=function(h)\n"
+   "    local tt = {}\n"
+   "    for k, v in pairs(h) do\n"
+   "      table.insert(tt, (\"%s: %s\"):format(k, v))\n"
+   "    end\n"
+   "    return \"{\" .. table.concat(tt,\", \") .. \"}\"\n"
+   "  end\n"
+   "  local existing_msg = tohash(redis.call('HGETALL', key.message))\n"
+   "  local errmsg = \"Message %s for channel %s id %s already exists. time: %s lasttime: %s lasttag: %s. dbg: channel: %s, messages_key: %s, msglist: %s, msg: %s, msg_expire: %s.\"\n"
+   "  errmsg = errmsg:format(key.message, id, msg.id or \"-\", msg.time or \"-\", lasttime or \"-\", lasttag or \"-\", hash_tostr(channel), key.messages, \"[\"..table.concat(redis.call('LRANGE', key.messages, 0, -1), \", \")..\"]\", hash_tostr(existing_msg), redis.call('TTL', key.message))\n"
+   "  return {err=errmsg}\n"
+   "end\n"
+   "\n"
+   "msg.prev=channel.current_message\n"
+   "if key.last_message and redis.call('exists', key.last_message) == 1 then\n"
+   "  redis.call('HSET', key.last_message, 'next', msg.id)\n"
+   "end\n"
+   "\n"
+   "--update channel\n"
+   "redis.call('HSET', key.channel, 'current_message', msg.id)\n"
+   "if msg.prev then\n"
+   "  redis.call('HSET', key.channel, 'prev_message', msg.prev)\n"
+   "end\n"
+   "if msg.time then\n"
+   "  redis.call('HSET', key.channel, 'time', msg.time)\n"
+   "end\n"
+   "\n"
+   "local message_len_changed = false\n"
+   "if channel.max_stored_messages ~= store_at_most_n_messages then\n"
+   "  channel.max_stored_messages = store_at_most_n_messages\n"
+   "  message_len_changed = true\n"
+   "  redis.call('HSET', key.channel, 'max_stored_messages', store_at_most_n_messages)\n"
+   "  --dbg(\"channel.max_stored_messages was not set, but is now \", store_at_most_n_messages)\n"
+   "end\n"
+   "\n"
+   "--write message\n"
+   "hmset(key.message, msg)\n"
+   "\n"
+   "\n"
+   "--check old entries\n"
+   "local oldestmsg=function(list_key, old_fmt)\n"
+   "  local old, oldkey\n"
+   "  local n, del=0,0\n"
+   "  while true do\n"
+   "    n=n+1\n"
+   "    old=redis.call('lindex', list_key, -1)\n"
+   "    if old then\n"
+   "      oldkey=old_fmt:format(old)\n"
+   "      local ex=redis.call('exists', oldkey)\n"
+   "      if ex==1 then\n"
+   "        return oldkey\n"
+   "      else\n"
+   "        redis.call('rpop', list_key)\n"
+   "        del=del+1\n"
+   "      end\n"
+   "    else\n"
+   "      break\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local max_stored_msgs = channel.max_stored_messages or -1\n"
+   "\n"
+   "if max_stored_msgs < 0 then --no limit\n"
+   "  oldestmsg(key.messages, msg_fmt)\n"
+   "  redis.call('LPUSH', key.messages, msg.id)\n"
+   "elseif max_stored_msgs > 0 then\n"
+   "  local stored_messages = tonumber(redis.call('LLEN', key.messages))\n"
+   "  redis.call('LPUSH', key.messages, msg.id)\n"
+   "  -- Reduce the message length if necessary\n"
+   "  local dump_message_ids = redis.call('LRANGE', key.messages, max_stored_msgs, stored_messages);\n"
+   "  if dump_message_ids then\n"
+   "    for _, msgid in ipairs(dump_message_ids) do\n"
+   "      redis.call('DEL', msg_fmt:format(msgid))\n"
+   "    end\n"
+   "  end\n"
+   "  redis.call('LTRIM', key.messages, 0, max_stored_msgs - 1)\n"
+   "  oldestmsg(key.messages, msg_fmt)\n"
+   "end\n"
+   "\n"
+   "\n"
+   "--set expiration times for all the things\n"
+   "local channel_ttl = tonumber(redis.call('TTL',  key.channel))\n"
+   "redis.call('EXPIRE', key.message, msg.ttl)\n"
+   "if msg.ttl + 1 > channel_ttl then -- a little extra time for failover weirdness for 1-second TTL messages\n"
+   "  redis.call('EXPIRE', key.channel, msg.ttl + 1)\n"
+   "  redis.call('EXPIRE', key.messages, msg.ttl + 1)\n"
+   "  redis.call('EXPIRE', key.subscribers, msg.ttl + 1)\n"
+   "  redis.call('EXPIRE', key.subscriber_counts, msg.ttl + 1)\n"
+   "end\n"
+   "\n"
+   "--publish message\n"
+   "local unpacked\n"
+   "\n"
+   "if msg.unbuffered or #msg.data < msgpacked_pubsub_cutoff then\n"
+   "  unpacked= {\n"
+   "    \"msg\",\n"
+   "    msg.ttl or 0,\n"
+   "    msg.time,\n"
+   "    tonumber(msg.tag) or 0,\n"
+   "    (msg.unbuffered and 0 or msg.prev_time) or 0,\n"
+   "    (msg.unbuffered and 0 or msg.prev_tag) or 0,\n"
+   "    msg.data or \"\",\n"
+   "    msg.content_type or \"\",\n"
+   "    msg.eventsource_event or \"\",\n"
+   "    msg.compression or 0\n"
+   "  }\n"
+   "else\n"
+   "  unpacked= {\n"
+   "    \"msgkey\",\n"
+   "    msg.time,\n"
+   "    tonumber(msg.tag) or 0,\n"
+   "    key.message\n"
+   "  }\n"
+   "end\n"
+   "\n"
+   "if message_len_changed then\n"
+   "  unpacked[1] = \"max_msgs+\" .. unpacked[1]\n"
+   "  table.insert(unpacked, 2, tonumber(channel.max_stored_messages))\n"
+   "end\n"
+   "\n"
+   "local msgpacked\n"
+   "\n"
+   "--dbg((\"Stored message with id %i:%i => %s\"):format(msg.time, msg.tag, msg.data))\n"
+   "\n"
+   "--we used to publish conditionally on subscribers on the Redis pubsub channel\n"
+   "--but now that we're subscribing to slaves this is not possible\n"
+   "--so just PUBLISH always.\n"
+   "msgpacked = cmsgpack.pack(unpacked)\n"
+   "\n"
+   "redis.call(publish_command, channel_pubsub, msgpacked)\n"
+   "\n"
+   "local num_messages = redis.call('llen', key.messages)\n"
+   "\n"
+   "local subscriber_count\n"
+   "if use_accurate_subscriber_count then\n"
+   "  local sub_counts = tohash(redis.call(\"HGETALL\", key.subscriber_counts))\n"
+   "  subscriber_count = 0\n"
+   "  for k, v in pairs(sub_counts) do\n"
+   "    v = tonumber(v)\n"
+   "    local res = redis.call(\"PUBSUB\", \"NUMSUB\", k)\n"
+   "    if tonumber(res[2]) >= 1 and v > 0 then\n"
+   "      subscriber_count = subscriber_count + tonumber(v)\n"
+   "    else\n"
+   "      redis.call(\"HDEL\", key.subscriber_counts, k)\n"
+   "    end\n"
+   "  end\n"
+   "else\n"
+   "  subscriber_count = tonumber(channel.fake_subscribers) or tonumber(channel.subscribers)\n"
+   "end\n"
+   "\n"
+   "\n"
+   "--dbg(\"channel \", id, \" ttl: \",channel.ttl, \", subscribers: \", channel.subscribers, \"(fake: \", channel.fake_subscribers or \"nil\", \"), messages: \", num_messages)\n"
+   "local ch = {\n"
+   "  tonumber(channel.ttl or msg.ttl),\n"
+   "  tonumber(channel.last_seen_fake_subscriber) or 0,\n"
+   "  subscriber_count or 0,\n"
+   "  msg.time and msg.time and (\"%i:%i\"):format(msg.time, msg.tag) or \"\",\n"
+   "  tonumber(num_messages)\n"
+   "}\n"
+   "\n"
+   "return {ch, new_channel}\n"},
+
+  {"request_subscriber_info", "93c500e094dfc5364251854eeac8d4331a0223c0",
+   "--input: keys: [],  values: [ namespace, channel_id, info_response_id ]\n"
+   "--output: -nothing-\n"
+   "\n"
+   "local ns = ARGV[1]\n"
+   "local channel_id = ARGV[2]\n"
+   "local response_id = tonumber(ARGV[3])\n"
+   "local pubsub = ('%s{channel:%s}:pubsub'):format(ns, channel_id)\n"
+   "\n"
+   "redis.call('echo', ' ####### REQUEST_SUBSCRIBER_INFO #######')\n"
+   "\n"
+   "local alert_msgpack =cmsgpack.pack({\"alert\", \"subscriber info\", response_id})\n"
+   "\n"
+   "redis.call('PUBLISH', pubsub, alert_msgpack)\n"
+   "\n"
+   "return true\n"},
+
+  {"rsck", "2fca046fa783d6cc25e493c993c407e59998e6e8",
+   "--redis-store consistency check\n"
+   "local ns = ARGV[1]\n"
+   "if ns and #ns > 0 then\n"
+   "  ns = ns..\":\"\n"
+   "end\n"
+   "\n"
+   "local concat = function(...)\n"
+   "  local arg = {...}\n"
+   "  for i = 1, #arg do\n"
+   "    arg[i]=tostring(arg[i])\n"
+   "  end\n"
+   "  return table.concat(arg, \" \")\n"
+   "end\n"
+   "local dbg =function(...) redis.call('echo', concat(...)); end\n"
+   "local errors={}\n"
+   "local err = function(...)\n"
+   "  local msg = concat(...)\n"
+   "  dbg(msg)\n"
+   "  table.insert(errors, msg)\n"
+   "end\n"
+   "\n"
+   "local tp=function(t, max_n)\n"
+   "  local tt={}\n"
+   "  for i, v in pairs(t) do\n"
+   "    local val = tostring(v)\n"
+   "    if max_n and #val > max_n then\n"
+   "      val = val:sub(1, max_n) .. \"[...]\"\n"
+   "    end\n"
+   "    table.insert(tt, tostring(i) .. \": \" .. val)\n"
+   "  end\n"
+   "  return \"{\" .. table.concat(tt, \", \") .. \"}\"\n"
+   "end\n"
+   "\n"
+   "local tohash=function(arr)\n"
+   "  if type(arr)~=\"table\" then\n"
+   "    return nil\n"
+   "  end\n"
+   "  local h = {}\n"
+   "  local k=nil\n"
+   "  for i, v in ipairs(arr) do\n"
+   "    if k == nil then\n"
+   "      k=v\n"
+   "    else\n"
+   "      h[k]=v; k=nil\n"
+   "    end\n"
+   "  end\n"
+   "  return h\n"
+   "end\n"
+   "local type_is = function(key, _type, description)\n"
+   "  local t = redis.call(\"TYPE\", key)['ok']\n"
+   "  local type_ok = true\n"
+   "  if type(_type) == \"table\" then\n"
+   "    type_ok = false\n"
+   "    for i, v in pairs(_type) do\n"
+   "      if v == _type then\n"
+   "        type_ok = true\n"
+   "        break\n"
+   "      end\n"
+   "    end\n"
+   "  elseif t ~= _type then\n"
+   "    err((description or \"\"), key, \"should be type \" .. _type .. \", is\", t)\n"
+   "    type_ok = false\n"
+   "  end\n"
+   "  return type_ok, t\n"
+   "end\n"
+   "\n"
+   "local known_msgs_count=0\n"
+   "local known_msgkeys = {}\n"
+   "local known_channel_keys = {}\n"
+   "\n"
+   "\n"
+   "local k = {\n"
+   "  channel = function(chid)\n"
+   "    return (\"%s{channel:%s}\"):format(chid)\n"
+   "  end,\n"
+   "  msg = function (chid, msgid)\n"
+   "    return (\"%s:msg:%s\"):format(k.channel(chid), msgid)\n"
+   "  end,\n"
+   "  messages = function(chid)\n"
+   "    return k.channel(chid) .. \":messages\"\n"
+   "  end\n"
+   "}\n"
+   "\n"
+   "local check_msg = function(chid, msgid, prev_msgid, next_msgid, description)\n"
+   "  description = description and \"msg (\" .. description ..\")\" or \"msg\"\n"
+   "  local msgkey = k.msg(chid, msgid)\n"
+   "  if not known_msgkeys[msgkey] then\n"
+   "    known_msgs_count = known_msgs_count + 1\n"
+   "  end\n"
+   "  known_msgkeys[msgkey]=true\n"
+   "  local ok, t = type_is(msgkey, {\"hash\", \"none\"}, \"message hash\")\n"
+   "  if t == \"none\" then\n"
+   "    --message is missing, but maybe it expired under normal circumstances. \n"
+   "    --check if any earlier messages are present\n"
+   "    local msgids = redis.call('LRANGE', k.messages(chid), 0, -1)\n"
+   "    local founds = 0\n"
+   "    for i=#msgids, 1, -1 do\n"
+   "      if msgids[i] == msgid then \n"
+   "        break\n"
+   "      end\n"
+   "      local thismsgkey = k.msg(chid, msgids[i])\n"
+   "      local ttt = redis.call('type', thismsgkey)['ok']\n"
+   "      redis.breakpoint()\n"
+   "      if ttt == \"hash\" then\n"
+   "        founds = founds + 1\n"
+   "      end\n"
+   "    end\n"
+   "    \n"
+   "    if founds > 0 then\n"
+   "      err(\"message\", msgkey, \"missing, with\", founds, \"prev. msgs in msg list\")\n"
+   "    end\n"
+   "    \n"
+   "  end\n"
+   "  local msg = tohash(redis.call('HGETALL', msgkey))\n"
+   "  local ttl = tonumber(redis.call('TTL', msgkey))\n"
+   "  local n = tonumber(redis.call(\"HLEN\", msgkey))\n"
+   "  if n > 0 and (msg.data == nil or msg.id == nil or msg.time == nil or msg.tag == nil)then\n"
+   "    err(\"incomplete \" .. description ..\"(ttl \"..ttl..\")\", msgkey, tp(msg))\n"
+   "    return false\n"
+   "  end\n"
+   "  if t == \"hash\" and tonumber(ttl) < 0 then\n"
+   "    err(\"message\", msgkey, \"ttl =\", ttl)\n"
+   "  end\n"
+   "  if ttl ~= -2 then\n"
+   "    if prev_msgid ~= false and msg.prev ~= prev_msgid then\n"
+   "      err(description, chid, msgid, \"prev_message wrong. expected\", prev_msgid, \"got\", msg.prev)\n"
+   "    end\n"
+   "    if next_msgid ~= false and msg.next ~= next_msgid then\n"
+   "      err(description, chid, msgid, \"next_message wrong. expected\", next_msgid, \"got\", msg.next)\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local check_channel = function(id)\n"
+   "  local key={\n"
+   "    ch = k.channel(id),\n"
+   "    msgs = k.messages(id)\n"
+   "  }\n"
+   "  \n"
+   "  local ok, chkey_type = type_is(key.ch, \"hash\", \"channel hash\")\n"
+   "  if not ok then\n"
+   "    if chkey_type ~= \"none\" then\n"
+   "      err(\"unecpected channel key\", key.ch, \"type:\", chkey_type);\n"
+   "    end\n"
+   "    return false\n"
+   "  end\n"
+   "  local _, msgs_list_type = type_is(key.msgs, {\"list\", \"none\"}, \"channel messages list\")\n"
+   "  \n"
+   "  local ch = tohash(redis.call('HGETALL', key.ch))\n"
+   "  local len = tonumber(redis.call(\"HLEN\", key.ch))\n"
+   "  local ttl = tonumber(redis.call('TTL',  key.ch))\n"
+   "  if not ch.current_message or not ch.time then\n"
+   "    if msgs_list_type == \"list\" then\n"
+   "      err(\"incomplete channel (ttl \" .. ttl ..\")\", key.ch, tp(ch))\n"
+   "    end  \n"
+   "  elseif (ch.current_message or ch.prev_message) and msgs_list_type ~= \"list\" then\n"
+   "    err(\"channel\", key.ch, \"has a current_message but no message list\")\n"
+   "  end\n"
+   "  \n"
+   "  local msgids = redis.call('LRANGE', key.msgs, 0, -1)\n"
+   "  for i, msgid in ipairs(msgids) do\n"
+   "    check_msg(id, msgid, msgids[i+1], msgids[i-1], \"msglist\")\n"
+   "  end\n"
+   "  \n"
+   "  if ch.prev_message then\n"
+   "    if redis.call('LINDEX', key.msgs, 1) ~= ch.prev_message then\n"
+   "      err(\"channel\", key.ch, \"prev_message doesn't correspond to\", key.msgs, \"second list element\")\n"
+   "    end\n"
+   "    check_msg(id, ch.prev_message, false, ch.current_message, \"channel prev_message\")\n"
+   "  end\n"
+   "  if ch.current_message then\n"
+   "    if redis.call('LINDEX', key.msgs, 0) ~= ch.current_message then\n"
+   "      err(\"channel\", key.ch, \"current_message doesn't correspond to\", key.msgs, \"first list element\")\n"
+   "    end\n"
+   "    check_msg(id, ch.current_message, ch.prev_message, false, \"channel current_message\")\n"
+   "  end\n"
+   "  \n"
+   "end\n"
+   "\n"
+   "local channel_ids = {}\n"
+   "\n"
+   "for i, chkey in ipairs(redis.call(\"KEYS\", k.channel(\"*\"))) do\n"
+   "  local msgs_chid_match = chkey:match(\"^\"..k.messages(\"*\"))\n"
+   "  if msgs_chid_match then\n"
+   "    type_is(k.channel(msgs_chid_match), \"hash\", \"channel messages' corresponding hash key\")\n"
+   "  elseif not chkey:match(\":msg$\") then\n"
+   "    table.insert(channel_ids, chkey);\n"
+   "    known_channel_keys[chkey] = true\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "dbg(\"found\", #channel_ids, \"channels\")\n"
+   "for i, chkey in ipairs(channel_ids) do\n"
+   "  local chid = chkey:match(\"^\" .. k.channel(\".*\"))\n"
+   "  check_channel(chid)\n"
+   "end\n"
+   "\n"
+   "for i, msgkey in ipairs(redis.call(\"KEYS\", k.channel(\"*\")..\":msg\")) do\n"
+   "  if not known_msgkeys[msgkey] then\n"
+   "    local ok, t = type_is(msgkey, \"hash\")\n"
+   "    if ok then\n"
+   "      if not redis.call('HGET', msgkey, 'unbuffered') then\n"
+   "        err(\"orphan message\", msgkey, \"(ttl: \" .. redis.call('TTL', msgkey) .. \")\", tp(tohash(redis.call('HGETALL', msgkey)), 15))\n"
+   "      end\n"
+   "    else\n"
+   "      err(\"orphan message\", msgkey, \"wrong type\", t) \n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "if errors then\n"
+   "  table.insert(errors, 1, concat(#channel_ids, \"channels,\",known_msgs_count,\"messages found\", #errors, \"problems\"))\n"
+   "  return errors\n"
+   "else\n"
+   "  return concat(#channel_ids, \"channels,\", known_msgs_count, \"messages, all ok\")\n"
+   "end\n"},
+
+  {"subscriber_register", "24643f71942769759df94b4ddfea15925612f595",
+   "--input: keys: [], values: [namespace, channel_id, subscriber_id, active_ttl_msec, ttl_safety_margin_msec, time, want_channel_settings]\n"
+   "--  'subscriber_id' can be '-' for new id, or an existing id\n"
+   "--  'active_ttl_msec' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in msec\n"
+   "--  'ttl_safety_margin_msec' is number of seconds before TTL that Nchan issues a keepalive recheck\n"
+   "--output: subscriber_id, num_current_subscribers, next_keepalive_time, channel_buffer_length\n"
+   "--  'channel_buffer_length' is returned only if want_channel_settings is 1\n"
+   "\n"
+   "local ns, id, sub_id, active_ttl, ttl_safety_margin, time = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]), tonumber(ARGV[5]), tonumber(ARGV[6])\n"
+   "local want_channel_settings = tonumber(ARGV[6]) == 1\n"
+   "\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "\n"
+   "redis.call('echo', ' ######## SUBSCRIBER REGISTER SCRIPT ####### ')\n"
+   "local ch=(\"%s{channel:%s}\"):format(ns, id)\n"
+   "local keys = {\n"
+   "  channel =     ch,\n"
+   "  messages =    ch..':messages',\n"
+   "  subscribers = ch..':subscribers',\n"
+   "  subscriber_counts = ch..':subscriber_counts'\n"
+   "}\n"
+   "\n"
+   "local setkeyttl=function(ttl)\n"
+   "  for i,v in pairs(keys) do\n"
+   "    if ttl > 0 then\n"
+   "      redis.call('PEXPIRE', v, ttl)\n"
+   "    else\n"
+   "      redis.call('PERSIST', v)\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local sub_count\n"
+   "\n"
+   "if sub_id == \"-\" then\n"
+   "  sub_id = tonumber(redis.call('HINCRBY', keys.channel, \"last_subscriber_id\", 1))\n"
+   "  sub_count=tonumber(redis.call('hincrby', keys.channel, 'subscribers', 1))\n"
+   "else\n"
+   "  sub_count=tonumber(redis.call('hget', keys.channel, 'subscribers'))\n"
+   "end\n"
+   "if time then\n"
+   "  redis.call('hset', keys.channel, \"last_seen_subscriber\", time)\n"
+   "end\n"
+   "\n"
+   "local next_keepalive\n"
+   "local actual_ttl = tonumber(redis.call('PTTL', keys.channel))\n"
+   "local safe_ttl = active_ttl + ttl_safety_margin\n"
+   "if actual_ttl < safe_ttl then\n"
+   "  setkeyttl(safe_ttl)\n"
+   "  next_keepalive = active_ttl\n"
+   "else\n"
+   "  next_keepalive = (actual_ttl - ttl_safety_margin > 0) and (actual_ttl - ttl_safety_margin) or math.ceil(actual_ttl / 2)\n"
+   "end\n"
+   "\n"
+   "\n"
+   "local ret = {sub_id, sub_count, next_keepalive}\n"
+   "if want_channel_settings then\n"
+   "  local max_messages = tonumber(redis.call('hget', keys.channel, 'max_stored_messages'))\n"
+   "  table.insert(ret, max_messages)\n"
+   "end\n"
+   "\n"
+   "return ret\n"},
+
+  {"subscriber_unregister", "51f4b6919ec97d42f5a9a7a10ee7742579b6a8f4",
+   "--input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]\n"
+   "-- 'subscriber_id' is an existing id\n"
+   "-- 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec\n"
+   "--output: subscriber_id, num_current_subscribers\n"
+   "\n"
+   "local ns, id, sub_id, empty_ttl = ARGV[1], ARGV[2], ARGV[3], tonumber(ARGV[4]) or 20\n"
+   "\n"
+   "--local dbg = function(...) redis.call('echo', table.concat({...})); end\n"
+   "\n"
+   "redis.call('echo', ' ######## SUBSCRIBER UNREGISTER SCRIPT ####### ')\n"
+   "local ch=('%s{channel:%s}'):format(ns, id)\n"
+   "local keys = {\n"
+   "  channel =     ch,\n"
+   "  messages =    ch..':messages',\n"
+   "  subscribers = ch..':subscribers',\n"
+   "  subscriber_counts = ch..':subscriber_counts'\n"
+   "}\n"
+   "\n"
+   "local setkeyttl=function(ttl)\n"
+   "  for i,v in pairs(keys) do\n"
+   "    if ttl > 0 then\n"
+   "      redis.call('expire', v, ttl)\n"
+   "    elseif ttl < 0 then\n"
+   "      redis.call('persist', v)\n"
+   "    else\n"
+   "      redis.call('del', v)\n"
+   "    end\n"
+   "  end\n"
+   "end\n"
+   "\n"
+   "local sub_count = 0\n"
+   "\n"
+   "local res = redis.pcall('EXISTS', keys.channel)\n"
+   "if type(res) == \"table\" and res[\"err\"] then\n"
+   "  return {err = (\"CLUSTER KEYSLOT ERROR. %i %s\"):format(empty_ttl, id)}\n"
+   "end\n"
+   "\n"
+   "if res ~= 0 then\n"
+   "   sub_count = redis.call('hincrby', keys.channel, 'subscribers', -1)\n"
+   "\n"
+   "  if sub_count == 0 and tonumber(redis.call('LLEN', keys.messages)) == 0 then\n"
+   "    setkeyttl(empty_ttl)\n"
+   "  elseif sub_count < 0 then\n"
+   "    return {err=\"Subscriber count for channel \" .. id .. \" less than zero: \" .. sub_count}\n"
+   "  end\n"
+   "else\n"
+   "  --dbg(\"channel \", id, \" already gone\")\n"
+   "end\n"
+   "\n"
+   "return {sub_id, sub_count}\n"}
+};
+const int redis_lua_scripts_count=13;
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.h
new file mode 100644
index 0000000..f67b9e6
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_lua_commands.h
@@ -0,0 +1,83 @@
+#ifndef NCHAN_REDIS_LUA_SCRIPTS_H
+#define NCHAN_REDIS_LUA_SCRIPTS_H
+// don't edit this please, it was auto-generated by hsss
+// https://github.com/slact/hsss
+
+typedef struct {
+  char *name;
+  char *hash;
+  char *script;
+} redis_lua_script_t;
+
+typedef struct {
+  //input:  keys: [], values: [namespace, channel_id, number, time, nginx_worker_id]
+  //output: -none-
+  redis_lua_script_t add_fakesub;
+
+  //input:  keys: [], values: [namespace, channel_id, ttl_msec, ttl_safety_margin_msec]
+  // ttl_msec is for when there are no messages but at least 1 subscriber.
+  //output: seconds until next keepalive is expected, or -1 for "let it disappear"
+  redis_lua_script_t channel_keepalive;
+
+  //input: keys: [],  values: [ namespace, channel_id, publish_command, use_accurate_subscriber_count ]
+  //output: channel_hash {ttl, time_last_seen, subscribers, messages} or nil
+  // delete this channel and all its messages
+  redis_lua_script_t delete;
+
+  //input: keys: [],  values: [ namespace, channel_id, use_accurate_subscriber_count ]
+  //output: channel_hash {ttl, time_last_seen, subscribers, last_channel_id, messages} or nil
+  // finds and return the info hash of a channel, or nil of channel not found
+  redis_lua_script_t find_channel;
+
+  //input:  keys: [], values: [namespace, channel_id, msg_time, msg_tag, no_msgid_order, create_channel_ttl]
+  //output: result_code, msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression_type, channel_subscriber_count
+  // no_msgid_order: 'FILO' for oldest message, 'FIFO' for most recent
+  // create_channel_ttl - make new channel if it's absent, with ttl set to this. 0 to disable.
+  // result_code can be: 200 - ok, 404 - not found, 410 - gone, 418 - not yet available
+  redis_lua_script_t get_message;
+
+  //input:  keys: [message_key], values: []
+  //output: msg_ttl, msg_time, msg_tag, prev_msg_time, prev_msg_tag, message, content_type, eventsource_event, compression, channel_subscriber_count
+  redis_lua_script_t get_message_from_key;
+
+  //input:  keys: [unique_request_id_key], values: []
+  //output: next_unique_request_id_integer
+  redis_lua_script_t get_subscriber_info_id;
+
+  //input: keys: [],  values: [ namespace, channel_id, use_accurate_subscriber_count ]
+  //output: {subscribers_count, last_subscriber_seed}, or nil of channel not found
+  redis_lua_script_t nostore_publish_multiexec_channel_info;
+
+  //input:  keys: [], values: [namespace, channel_id, message, content_type, eventsource_event, compression_setting, msg_ttl, max_msg_buf_size, pubsub_msgpacked_size_cutoff, publish_command, use_accurate_subscriber_count]
+  //output: channel_hash {ttl, time_last_subscriber_seen, subscribers, last_message_id, messages}, channel_created_just_now?
+  redis_lua_script_t publish;
+
+  //input: keys: [],  values: [ namespace, channel_id, info_response_id ]
+  //output: -nothing-
+  redis_lua_script_t request_subscriber_info;
+
+  //redis-store consistency check
+  redis_lua_script_t rsck;
+
+  //input: keys: [], values: [namespace, channel_id, subscriber_id, active_ttl_msec, ttl_safety_margin_msec, time, want_channel_settings]
+  //  'subscriber_id' can be '-' for new id, or an existing id
+  //  'active_ttl_msec' is channel ttl with non-zero subscribers. -1 to persist, >0 ttl in msec
+  //  'ttl_safety_margin_msec' is number of seconds before TTL that Nchan issues a keepalive recheck
+  //output: subscriber_id, num_current_subscribers, next_keepalive_time, channel_buffer_length
+  //  'channel_buffer_length' is returned only if want_channel_settings is 1
+  redis_lua_script_t subscriber_register;
+
+  //input: keys: [], values: [namespace, channel_id, subscriber_id, empty_ttl]
+  // 'subscriber_id' is an existing id
+  // 'empty_ttl' is channel ttl when without subscribers. 0 to delete immediately, -1 to persist, >0 ttl in sec
+  //output: subscriber_id, num_current_subscribers
+  redis_lua_script_t subscriber_unregister;
+
+} redis_lua_scripts_t;
+extern redis_lua_scripts_t redis_lua_scripts;
+extern const int redis_lua_scripts_count;
+#define REDIS_LUA_SCRIPTS_ALL_HASHES "f3b5cc02b9902e94db37949cf0eba6b3fb30376f 7bfe076302b20eeb2e5b0a325599325c96fabc80 a928e8b91abe4c7be327b4ed79a7e0b4a6a13236 a2c935167edd17b4a9c850f31dd8d2beb706b1c5 fb9c46d33b3798a11d4eca6e0f7a3f92beba8685 304efcd42590f99e0016686572530defd3de1383 3490d5bc3fdc7ed065d9d54b4a0cb8ad6b62c180 35696def4f2ec62f9b91a72fa17bba7a4e4cb6cf 1c68d9e05fe55e2992a917c41255f23e1330b255 93c500e094dfc5364251854eeac8d4331a0223c0 2fca046fa783d6cc25e493c993c407e59998e6e8 24643f71942769759df94b4ddfea15925612f595 51f4b6919ec97d42f5a9a7a10ee7742579b6a8f4"
+#define REDIS_LUA_SCRIPTS_COUNT 13
+#define REDIS_LUA_SCRIPTS_EACH(script) \
+for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++) 
+#endif //NCHAN_REDIS_LUA_SCRIPTS_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nginx_adapter.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nginx_adapter.c
new file mode 100644
index 0000000..41b98b7
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nginx_adapter.c
@@ -0,0 +1,165 @@
+//Copyright (c) 2014 Wandenberg Peixoto under the MIT Licence'
+//additional code from Alexander Lyalin's redis_nginx_module (New BSD licence)
+//edited by slact 2015-2021
+
+#include <ngx_event.h>
+#include <ngx_connection.h>
+#include <signal.h>
+#include "redis_nginx_adapter.h"
+
+#include <nchan_module.h>
+#include <store/redis/store.h>
+
+#include <assert.h>
+
+#define PING_DATABASE_COMMAND "PING"
+
+#define EVENT_FLAGS ((ngx_event_flags & NGX_USE_CLEAR_EVENT) ?  NGX_CLEAR_EVENT : NGX_LEVEL_EVENT)
+
+#define REDIS_MAX_BUFFERED_READ_SIZE 1024*18 //hardcoded into hiredis
+
+//NGX_CLEAR_EVENT for kqueue, epoll
+//NGX_LEVEL_EVENT for select, poll, /dev/poll
+
+void redis_nginx_cleanup(void *privdata);
+
+void redis_nginx_init(void) {
+  signal(SIGPIPE, SIG_IGN);
+}
+
+
+void redis_nginx_force_close_context(redisAsyncContext **context) {
+  if ((context != NULL) && (*context != NULL)) {
+    redisAsyncContext *ac = *context;
+    if (!ac->err) {
+      redisAsyncDisconnect(ac);
+    }
+    *context = NULL;
+  }
+}
+
+static void redis_nginx_read_event(ngx_event_t *ev) {
+  redisAsyncContext *ac = ((ngx_connection_t *)ev->data)->data;
+  int                fd = ac->c.fd; //because redisAsyncHandleRead might free the redisAsyncContext
+  int                bytes_left = 0;
+  redisAsyncHandleRead(ac);
+  
+  // we need to do this because hiredis, in its infinite wisdom, will read at 
+  // most 16Kb of data, and there's no reliable way to tell if it read that 
+  // whole amount in one gulp. Otherwise, we could just check if 16Kb have 
+  //been read and try again. But no, apparently that's not an option.
+  
+  ioctl(fd, FIONREAD, &bytes_left);
+  if (bytes_left > 0 && !ac->err) {
+    //ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "again!");
+    redis_nginx_read_event(ev);
+  }
+}
+
+static void redis_nginx_write_event(ngx_event_t *ev) {
+  ngx_connection_t *connection = (ngx_connection_t *) ev->data;
+  redisAsyncHandleWrite(connection->data);
+}
+
+
+static int redis_nginx_fd_is_valid(int fd) {
+  return (fd > 0) && ((fcntl(fd, F_GETFL) != -1) || (errno != EBADF));
+}
+
+static void redis_nginx_add_read(void *privdata) {
+  ngx_connection_t *connection = (ngx_connection_t *) privdata;
+  ngx_int_t         flags = EVENT_FLAGS;
+  if (!connection->read->active && redis_nginx_fd_is_valid(connection->fd)) {
+    connection->read->handler = redis_nginx_read_event;
+    connection->read->log = connection->log;
+    if (ngx_add_event(connection->read, NGX_READ_EVENT, flags) == NGX_ERROR) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not add read event to redis");
+    }
+  }
+}
+
+static void redis_nginx_del_read(void *privdata) {
+  ngx_connection_t *connection = (ngx_connection_t *) privdata;
+  ngx_int_t         flags = EVENT_FLAGS;
+  if (connection->read->active && redis_nginx_fd_is_valid(connection->fd)) {
+    if (ngx_del_event(connection->read, NGX_READ_EVENT, flags) == NGX_ERROR) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not delete read event to redis");
+    }
+  }
+  else {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: didn't delete read event %p", connection->read);
+  }
+}
+
+static void redis_nginx_add_write(void *privdata) {
+  ngx_connection_t *connection = (ngx_connection_t *) privdata;
+  ngx_int_t         flags = EVENT_FLAGS;
+  if (!connection->write->active && redis_nginx_fd_is_valid(connection->fd)) {
+    connection->write->handler = redis_nginx_write_event;
+    connection->write->log = connection->log;
+    if (ngx_add_event(connection->write, NGX_WRITE_EVENT, flags) == NGX_ERROR) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not add write event to redis");
+    }
+  }
+}
+
+static void redis_nginx_del_write(void *privdata) {
+  ngx_connection_t *connection = (ngx_connection_t *) privdata;
+  ngx_int_t         flags = EVENT_FLAGS;
+  if (connection->write->active && redis_nginx_fd_is_valid(connection->fd)) {
+    if (ngx_del_event(connection->write, NGX_WRITE_EVENT, flags) == NGX_ERROR) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not delete write event to redis");
+    }
+  }
+}
+
+void redis_nginx_cleanup(void *privdata) {
+  if (privdata) {
+    ngx_connection_t *connection = (ngx_connection_t *) privdata;
+    redisAsyncContext *ac = (redisAsyncContext *) connection->data;
+    // don't care why the connection is being cleaned up. if there's an error, close the fd. if an fd was being shared between
+    // workers or connections -- tough luck
+    
+    if ((connection->fd != NGX_INVALID_FILE)) {
+      if(connection->read->active) {
+        redis_nginx_del_read(privdata);
+      }
+      if(connection->write->active) {
+        redis_nginx_del_write(privdata);
+      }
+      ngx_close_connection(connection);
+    } else {
+      ngx_free_connection(connection);
+    }
+    
+    ac->ev.data = NULL;
+  }
+}
+
+int redis_nginx_event_attach(redisAsyncContext *ac) {
+  ngx_connection_t *connection;
+  redisContext *c = &(ac->c);
+  
+  /* Nothing should be attached when something is already attached */
+  if (ac->ev.data != NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: context already attached");
+    return REDIS_ERR;
+  }
+  
+  connection = ngx_get_connection(c->fd, ngx_cycle->log);
+  if (connection == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "redis_nginx_adapter: could not get a connection for fd #%d", c->fd);
+    return REDIS_ERR;
+  }
+  
+  /* Register functions to start/stop listening for events */
+  ac->ev.addRead = redis_nginx_add_read;
+  ac->ev.delRead = redis_nginx_del_read;
+  ac->ev.addWrite = redis_nginx_add_write;
+  ac->ev.delWrite = redis_nginx_del_write;
+  ac->ev.cleanup = redis_nginx_cleanup;
+  ac->ev.data = connection;
+  connection->data = ac;
+  
+  return REDIS_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nginx_adapter.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nginx_adapter.h
new file mode 100644
index 0000000..a3a956b
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nginx_adapter.h
@@ -0,0 +1,22 @@
+//Copyright (c) 2014 Wandenberg Peixoto under the MIT Licence
+//Coptright (c) 2015-2021 slact
+#ifndef __REDIS_NGINX_ADAPTER_H
+#define __REDIS_NGINX_ADAPTER_H
+
+#if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
+#include <hiredis/hiredis.h>
+#include <hiredis/async.h>
+#else
+#include <store/redis/hiredis/hiredis.h>
+#include <store/redis/hiredis/async.h>
+#endif
+
+#include <nchan_module.h>
+#include <store/redis/redis_nodeset.h>
+
+void redis_nginx_init(void);
+int redis_nginx_event_attach(redisAsyncContext *ac);
+void redis_nginx_force_close_context(redisAsyncContext **context);
+void redis_nginx_close_context(redisAsyncContext **context);
+
+#endif // __REDIS_NGINX_ADAPTER_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.c
new file mode 100644
index 0000000..cc551bb
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.c
@@ -0,0 +1,3824 @@
+#include "redis_nodeset.h"
+
+#include <assert.h>
+#include "store-private.h"
+#include <store/store_common.h>
+#include "store.h"
+#include "redis_nginx_adapter.h"
+#include "redis_nodeset_parser.h"
+#include "redis_lua_commands.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REDIS NODESET: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REDIS NODESET: " fmt, ##args)
+
+const nchan_backoff_settings_t NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL = {
+  .min = NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_MIN_MSEC,
+  .backoff_multiplier = NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_BACKOFF_MULTIPLIER,
+  .jitter_multiplier = NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_JITTER_MULTIPLIER,
+  .max = NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL_MAX_MSEC
+};
+
+const nchan_backoff_settings_t NCHAN_REDIS_DEFAULT_RECONNECT_DELAY = {
+  .min = NCHAN_REDIS_DEFAULT_RECONNECT_DELAY_MIN_MSEC,
+  .backoff_multiplier = NCHAN_REDIS_DEFAULT_RECONNECT_DELAY_BACKOFF_MULTIPLIER,
+  .jitter_multiplier = NCHAN_REDIS_DEFAULT_RECONNECT_DELAY_JITTER_MULTIPLIER,
+  .max = NCHAN_REDIS_DEFAULT_RECONNECT_DELAY_MAX_MSEC
+};
+
+const nchan_backoff_settings_t NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY = {
+  .min = NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY_MIN_MSEC,
+  .backoff_multiplier = NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY_BACKOFF_MULTIPLIER,
+  .jitter_multiplier = NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY_JITTER_MULTIPLIER,
+  .max = NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY_MAX_MSEC
+};
+
+
+redis_nodeset_t  redis_nodeset[NCHAN_MAX_NODESETS];
+int              redis_nodeset_count = 0;
+char            *redis_worker_id = NULL;
+char            *nchan_redis_blankname = "";
+static redisCallbackFn *redis_subscribe_callback = NULL;
+
+typedef struct {
+  ngx_event_t      ev;
+  ngx_int_t      (*cb)(redis_nodeset_t *, void *);
+  void            *pd;
+  redis_nodeset_t *ns;
+} nodeset_onready_callback_t;
+
+
+static ngx_str_t       default_redis_url = ngx_string(NCHAN_REDIS_DEFAULT_URL);
+
+static void node_connector_callback(redisAsyncContext *ac, void *rep, void *privdata);
+static int nodeset_cluster_keyslot_space_complete(redis_nodeset_t *ns, int min_node_state);
+static nchan_redis_ip_range_t *node_ip_blacklisted(redis_nodeset_t *ns, redis_connect_params_t *rcp);
+static int nodeset_recover_cluster(redis_nodeset_t *ns);
+static int nodeset_reset_cluster_node_info(redis_nodeset_t *ns);
+static void nodeset_cluster_check_event(ngx_event_t *ev);
+static void nodeset_check_status_event(ngx_event_t *ev);
+static void nodeset_check_spublish_availability(redis_nodeset_t *ns);
+static int nodeset_set_name_alloc(redis_nodeset_t *nodeset);
+static int nodeset_link_cluster_node_roles(redis_nodeset_t *nodeset);
+static int nodeset_cluster_node_is_outdated(redis_nodeset_t *ns, cluster_nodes_line_t *l);
+static int node_discover_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l, redis_node_t **known_node);
+static int node_skip_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l, int log_action, int skip_self);
+static int node_set_cluster_slots(redis_node_t *node, cluster_nodes_line_t *l, char *errbuf, size_t max_err_len);
+static int node_unset_cluster_slots(redis_node_t *node);
+static void node_make_ready(redis_node_t *node);
+
+static char *node_role_cstr(redis_node_role_t role) {
+  switch(role) {
+    case REDIS_NODE_ROLE_ANY:
+      return "any_role";
+    case REDIS_NODE_ROLE_MASTER:
+      return "master";
+    case REDIS_NODE_ROLE_SLAVE:
+      return "slave";
+    case REDIS_NODE_ROLE_UNKNOWN:
+      return "unknown_role";
+  }
+  return "???";
+}
+static char *node_state_cstr(int state) {
+  switch(state) {
+    case REDIS_NODE_DEDUPLICATED:
+      return "DEDUPLICATED";
+    case REDIS_NODE_CONNECTION_TIMED_OUT:
+      return "CONNECTION_TIMED_OUT";
+    case REDIS_NODE_FAILED:
+      return "FAILED";
+    case REDIS_NODE_DISCONNECTED:
+      return "DISCONNECTED";
+    case REDIS_NODE_CMD_CONNECTING:
+      return "CMD_CONNECTING";
+    case REDIS_NODE_PUBSUB_CONNECTING:
+      return "PUBSUB_CONNECTING";
+    case REDIS_NODE_CMD_CHECKING_CONNECTION:
+      return "CMD_CHECKING_CONNECTION";
+    case REDIS_NODE_CMD_CHECKED_CONNECTION:
+      return "CMD_CHECKED_CONNECTION";
+    case REDIS_NODE_PUBSUB_CHECKING_CONNECTION:
+      return "PUBSUB_CHECKING_CONNECTION";
+    case REDIS_NODE_PUBSUB_CHECKED_CONNECTION:
+      return "PUBSUB_CHECKED_CONNECTION";
+    case REDIS_NODE_CONNECTED:
+      return "CONNECTED";
+    case REDIS_NODE_CMD_AUTHENTICATING:
+      return "CMD_AUTHENTICATING";
+    case REDIS_NODE_PUBSUB_AUTHENTICATING:
+      return "PUBSUB_AUTHENTICATING";
+    case REDIS_NODE_SELECT_DB:
+      return "SELECT_DB";
+    case REDIS_NODE_CMD_SELECTING_DB:
+      return "CMD_SELECTING_DB";
+    case REDIS_NODE_PUBSUB_SELECTING_DB:
+      return "PUBSUB_SELECTING_DB";
+    case REDIS_NODE_SCRIPTS_LOAD:
+      return "SCRIPTS_LOAD";
+    case REDIS_NODE_SCRIPTS_LOADED_CHECK:
+      return "SCRIPTS_LOADED_CHECK";
+    case REDIS_NODE_SCRIPTS_LOADING:
+      return "SCRIPTS_LOADING";
+    case REDIS_NODE_GET_INFO:
+      return "GET_INFO";
+    case REDIS_NODE_GETTING_INFO:
+      return "GETTING_INFO";
+    case REDIS_NODE_PUBSUB_GET_INFO:
+      return "PUBSUB_GET_INFO";
+    case REDIS_NODE_PUBSUB_GETTING_INFO:
+      return "PUBSUB_GETTING_INFO";
+    case REDIS_NODE_SUBSCRIBE_WORKER:
+      return "SUBSCRIBE_WORKER";
+    case REDIS_NODE_SUBSCRIBING_WORKER:
+      return "SUBSCRIBING_WORKER";
+    case REDIS_NODE_GET_CLUSTERINFO:
+      return "GET_CLUSTERINFO";
+    case REDIS_NODE_GETTING_CLUSTERINFO:
+      return "GETTING_CLUSTERINFO";
+    case REDIS_NODE_GET_SHARDED_PUBSUB_SUPPORT:
+      return "GET_SHARDED_PUBSUB_SUPPORT";
+    case REDIS_NODE_GETTING_SHARDED_PUBSUB_SUPPORT:
+      return "GETTING_SHARDED_PUBSUB_SUPPORT";
+    case REDIS_NODE_GET_CLUSTER_NODES:
+      return "GET_CLUSTER_NODES";
+    case REDIS_NODE_GETTING_CLUSTER_NODES:
+      return "GETTING_CLUSTER_NODES";
+    case REDIS_NODE_READY:
+      return "READY";
+  }
+  return "(?)";
+}
+
+static void *rbtree_cluster_keyslots_node_id(void *data) {
+  return &((redis_nodeset_slot_range_node_t *)data)->range;
+}
+static uint32_t rbtree_cluster_keyslots_bucketer(void *vid) {
+  return 1; //no buckets
+}
+static ngx_int_t rbtree_cluster_keyslots_compare(void *v1, void *v2) {
+  redis_slot_range_t   *r1 = v1;
+  redis_slot_range_t   *r2 = v2;
+  
+  if(r1->max < r2->min) //r1 is strictly left of r2
+    return -1;
+  else if(r1->min > r2->max) //r1 is strictly right of r2
+    return 1;
+  else //there's an overlap
+    return 0;
+}
+
+static int reply_str_ok(redisReply *reply) {
+  return (reply != NULL && reply->type != REDIS_REPLY_ERROR && reply->type == REDIS_REPLY_STRING);
+}
+static int reply_array_ok(redisReply *reply) {
+  return (reply != NULL && reply->type == REDIS_REPLY_ARRAY);
+}
+static int reply_integer_ok(redisReply *reply) {
+  return (reply != NULL && reply->type == REDIS_REPLY_INTEGER);
+}
+static int reply_status_ok(redisReply *reply) {
+  return (
+    reply != NULL 
+    && reply->type != REDIS_REPLY_ERROR
+    && reply->type == REDIS_REPLY_STATUS
+    && reply->str
+    && strcmp(reply->str, "OK") == 0
+  );
+}
+
+static int nodeset_cluster_node_index_keyslot_ranges(redis_node_t *node) {
+  unsigned                         i, j;
+  ngx_rbtree_node_t               *rbtree_node;
+  redis_nodeset_slot_range_node_t *keyslot_tree_node;
+  rbtree_seed_t                   *tree = &node->nodeset->cluster.keyslots;
+  if(node->cluster.slot_range.indexed) {
+    node_log_error(node, "cluster keyslot range already indexed");
+    return 0;
+  }
+  
+  for(i=0; i<node->cluster.slot_range.n; i++) {
+    if(nodeset_node_find_by_range(node->nodeset, &node->cluster.slot_range.range[i])) { //overlap!
+      return 0;
+    }
+  }
+  
+  for(i=0; i<node->cluster.slot_range.n; i++) {
+    rbtree_node = rbtree_create_node(tree, sizeof(*keyslot_tree_node));
+    keyslot_tree_node = rbtree_data_from_node(rbtree_node);
+    keyslot_tree_node->range = node->cluster.slot_range.range[i];
+    keyslot_tree_node->node = node;
+    if(rbtree_insert_node(tree, rbtree_node) != NGX_OK) {
+      for(j=0; j<i; j++) {
+        //undo insertion so far
+        rbtree_node = rbtree_find_node(tree, &node->cluster.slot_range.range[i]);
+        if(rbtree_node) {
+          rbtree_remove_node(tree, rbtree_node);
+          rbtree_destroy_node(tree, rbtree_node);
+        }
+      }
+      node_log_error(node, "couldn't insert keyslot node range %d-%d", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
+      rbtree_destroy_node(tree, rbtree_node);
+      return 0;
+    }
+    else {
+      node_log_debug(node, "inserted keyslot node range %d-%d", keyslot_tree_node->range.min, keyslot_tree_node->range.max);
+    }
+  }
+  node->cluster.slot_range.indexed = 1;
+  return 1;
+}
+
+char *node_dbg_sprint(redis_node_t *node, char *buf, size_t maxlen) {
+  char           slotsline[256];
+  char          *slots;
+  slots = (char *)ngx_sprintf((u_char *)slotsline, "(%d)", node->cluster.slot_range.n);
+  if(node->cluster.slot_range.n) {
+    unsigned i;
+    for(i=0; i<node->cluster.slot_range.n; i++) {
+      slots+= sprintf(slots, "%d-%d,", node->cluster.slot_range.range[i].min, node->cluster.slot_range.range[i].max);
+    }
+    slots--;
+    
+    sprintf(slots, " idx:%d", node->cluster.slot_range.indexed);
+  }
+  else {
+    sprintf(slots, "-");
+  }
+  
+  char masterstr[256];
+  ngx_sprintf((u_char *)masterstr, "%s%Z", node->peers.master ? node_nickname_cstr(node->peers.master) : "-");
+  
+  if(node->cluster.enabled) {
+    ngx_snprintf((u_char *)buf, maxlen, "%p %s <%s> (cluster) r:%s id:%V m:[%V]%s s:[%s]%Z", node, node_nickname_cstr(node), node_state_cstr(node->state), node_role_cstr(node->role), &node->cluster.id, &node->cluster.master_id, masterstr, slotsline);
+  }
+  else {
+    ngx_snprintf((u_char *)buf, maxlen, "%p %s <%s> %s %V%Z", node, node_nickname_cstr(node), node_state_cstr(node->state), node_role_cstr(node->role), &node->run_id);
+  }
+  return buf;
+}
+
+void nodeset_dbg_log_nodes(redis_nodeset_t *ns, unsigned loglevel) {
+  int             n = 0;
+  redis_node_t   *cur;
+  char            nodestr[1024];
+  
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    n++;
+  }
+  
+  nodeset_log(ns, loglevel, "Redis upstream%s nodes (%d):", ns->cluster.enabled ? " cluster" : "", n); 
+  
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    ngx_log_error(loglevel, ngx_cycle->log, 0, "    %s", node_dbg_sprint(cur, nodestr, sizeof(nodestr)));
+  }
+}
+
+void nodeset_dbg_log_nodes_and_clusternodes_lines(redis_nodeset_t *ns, unsigned loglevel, void *l, size_t line_count) {
+  cluster_nodes_line_t *lines = l;
+  nodeset_dbg_log_nodes(ns, NGX_LOG_NOTICE);
+  if(lines && line_count > 0) {
+    unsigned i;
+    ngx_log_error(loglevel, ngx_cycle->log, 0, "CLUSTER NODES reply:");
+    for(i=0; i<line_count; i++) {
+      ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,   "%V", &lines[i].line);
+    }
+  }
+}
+
+/*
+static ngx_int_t print_slot_range_node(rbtree_seed_t *tree, void *node_data, void *privdata) {
+  redis_nodeset_slot_range_node_t        *rangenode = node_data;
+  node_log_notice(rangenode->node, "slots [%d - %d]", rangenode->range.min, rangenode->range.max);
+  return NGX_OK;
+}
+*/
+static int nodeset_cluster_node_unindex_keyslot_ranges(redis_node_t *node) {
+  ngx_rbtree_node_t               *rbtree_node;
+  redis_slot_range_t              *range;
+  rbtree_seed_t                   *tree = &node->nodeset->cluster.keyslots;
+  unsigned                         i;
+  if(!node->cluster.slot_range.indexed) {
+    //node_log_notice(node, "already unindexed");
+    return 1;
+  }
+  //node_log_notice(node, "unindex keyslot ranges");
+  
+  //rbtree_walk_incr(tree, print_slot_range_node, NULL);
+  
+  for(i=0; i<node->cluster.slot_range.n; i++) {
+    range = &node->cluster.slot_range.range[i];
+    //node_log_notice(node, "unindexing range [%d - %d]", range->min, range->max);
+    if((rbtree_node = rbtree_find_node(tree, range)) != NULL) {
+      rbtree_remove_node(tree, rbtree_node);
+      rbtree_destroy_node(tree, rbtree_node);
+    }
+    else {
+      node_log_error(node, "unable to unindex keyslot range %d-%d: range not found in tree", range->min, range->max);
+      raise(SIGABRT);
+    }
+  }
+  node->cluster.slot_range.indexed = 0;
+  return 1;
+}
+
+#if REDIS_NODESET_DBG
+
+
+static ngx_int_t nodeset_debug_rangetree_collector(rbtree_seed_t *tree, void *node_data, void *privdata) {
+  redis_nodeset_slot_range_node_t     *rangenode = node_data;
+  redis_nodeset_dbg_range_tree_t      *dbg = privdata;
+  dbg->node[dbg->n].range = rangenode->range;
+  dbg->node[dbg->n].node = rangenode->node;
+  dbg->n++;
+  return NGX_OK;
+}
+
+static redis_node_dbg_list_t *nodeset_update_debuginfo(redis_nodeset_t *nodeset) {
+  rbtree_seed_t         *tree = &nodeset->cluster.keyslots;
+  redis_node_dbg_list_t *node_dbg = &nodeset->dbg.nodes;
+  redis_node_t  *cur;
+  ngx_memzero(&nodeset->dbg, sizeof(nodeset->dbg));
+  for(cur = nchan_list_first(&nodeset->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    node_dbg->node[node_dbg->n++]=cur;
+  }
+  nodeset->dbg.keyspace_complete = nodeset_cluster_keyslot_space_complete(nodeset, REDIS_NODE_READY);
+  rbtree_walk_incr(tree, nodeset_debug_rangetree_collector, &nodeset->dbg.ranges);
+  return NGX_OK;
+}
+#endif
+
+static const char *rcp_cstr(redis_connect_params_t *rcp) {
+  static char    buf[512];
+  ngx_snprintf((u_char *)buf, 512, "%V:%d%Z", rcp->peername.len > 0 ? &rcp->peername : &rcp->hostname, rcp->port);
+  return buf;
+}
+static const char *node_cstr(redis_node_t *node) {
+  return rcp_cstr(&node->connect_params);
+}
+
+#define MAX_RUN_ID_LENGTH 64
+#define MAX_CLUSTER_ID_LENGTH 64
+#define MAX_VERSION_LENGTH 16
+typedef struct {
+  redis_node_t    node;
+  u_char          peername[INET6_ADDRSTRLEN + 2];
+  u_char          run_id[MAX_RUN_ID_LENGTH];
+  u_char          cluster_id[MAX_CLUSTER_ID_LENGTH];
+  u_char          cluster_master_id[MAX_CLUSTER_ID_LENGTH];
+  u_char          version[MAX_VERSION_LENGTH];
+} node_blob_t;
+
+int nodeset_ready(redis_nodeset_t *nodeset) {
+  return nodeset && nodeset->status == REDIS_NODESET_READY;
+}
+
+ngx_int_t nodeset_initialize(char *worker_id, redisCallbackFn *subscribe_handler) {
+  redis_worker_id = worker_id;
+  redis_subscribe_callback = subscribe_handler;
+  return NGX_OK;
+}
+
+
+#if (NGX_OPENSSL)
+static ngx_int_t nodeset_create_ssl_ctx(redis_nodeset_t *ns, char **err) {
+  char        *ca_cert =  ns->settings.tls.trusted_certificate.len > 0 ? 
+                            (char *)ns->settings.tls.trusted_certificate.data
+                            : NULL;
+  char        *ca_path = ns->settings.tls.trusted_certificate_path.len > 0 ?
+                            (char *)ns->settings.tls.trusted_certificate_path.data
+                            : NULL;
+  char        *client_cert_filename = ns->settings.tls.client_certificate.len > 0 ?
+                            (char *)ns->settings.tls.client_certificate.data
+                            : NULL;
+  char        *client_cert_key_filename = ns->settings.tls.client_certificate_key.len > 0 ?
+                            (char *)ns->settings.tls.client_certificate_key.data
+                            : NULL;
+  char        *ciphers = ns->settings.tls.ciphers.len > 0 ?
+                            (char *)ns->settings.tls.ciphers.data
+                            : NULL;
+  int          verify_cert = ns->settings.tls.verify_certificate;
+  
+  SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+  if(!ssl_ctx) {
+    *err = "failed to create SSL_CTX";
+    return 0;
+  }
+  SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+  SSL_CTX_set_verify(ssl_ctx, verify_cert ? SSL_VERIFY_NONE : SSL_VERIFY_PEER, NULL);
+  
+  if(ca_cert || ca_path) {
+    if (!SSL_CTX_load_verify_locations(ssl_ctx, ca_cert, ca_path)) {
+      *err = "Invalid CA Certificate File/Directory";
+      SSL_CTX_free(ssl_ctx);
+      return 0;
+    }
+  }
+  else {
+    if (!SSL_CTX_set_default_verify_paths(ssl_ctx)) {
+      *err = "Failed to use default CA paths";
+      SSL_CTX_free(ssl_ctx);
+      return 0;
+    }
+  }
+  
+  if (client_cert_filename && !SSL_CTX_use_certificate_chain_file(ssl_ctx, client_cert_filename)) {
+    *err = "Invalid client certificate";
+    SSL_CTX_free(ssl_ctx);
+    return 0;
+  }
+  
+  if (client_cert_key_filename && !SSL_CTX_use_PrivateKey_file(ssl_ctx, client_cert_key_filename, SSL_FILETYPE_PEM)) {
+    *err = "Invalid private key";
+    SSL_CTX_free(ssl_ctx);
+    return 0;
+  }
+#ifdef TLS1_3_VERSION
+  if (ciphers && !SSL_CTX_set_cipher_list(ssl_ctx, ciphers)) {
+    *err = "Error while configuring ciphers";
+    SSL_CTX_free(ssl_ctx);
+    return 0;
+  }
+#endif
+
+  ns->ssl_context = ssl_ctx;
+  return 1;
+}
+#else
+static ngx_int_t nodeset_create_ssl_ctx(redis_nodeset_t *ns, char **err) {
+  *err = "Can't create Redis SSL context: Nginx was built without SSL support";
+  return 0;
+}
+#endif
+
+redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf) {
+  nchan_redis_conf_t  *rcf = &lcf->redis;
+  redis_nodeset_t     *ns = &redis_nodeset[redis_nodeset_count]; //incremented once everything is ok
+  assert(rcf->enabled);
+  assert(!rcf->nodeset);
+  
+  ns->first_loc_conf = lcf;
+  
+  if(redis_nodeset_count >= NCHAN_MAX_NODESETS) {
+    nchan_log_error("Cannot create more than %d Redis nodesets", NCHAN_MAX_NODESETS);
+    return NULL;
+  }
+  
+  assert(!nodeset_find(rcf)); //must be unique
+  
+  nchan_list_init(&ns->urls, sizeof(ngx_str_t *), "redis urls");
+  nchan_list_init(&ns->nodes, sizeof(node_blob_t), "redis nodes");
+  nchan_list_init(&ns->onready_callbacks, sizeof(nodeset_onready_callback_t), "nodeset onReady callbacks");
+  
+  nchan_slist_init(&ns->channels.all, rdstore_channel_head_t, redis.slist.nodeset.prev, redis.slist.nodeset.next);
+  nchan_slist_init(&ns->channels.disconnected_cmd, rdstore_channel_head_t, redis.slist.node_cmd.prev, redis.slist.node_cmd.next);
+  nchan_slist_init(&ns->channels.disconnected_pubsub, rdstore_channel_head_t, redis.slist.node_pubsub.prev, redis.slist.node_pubsub.next);
+  
+  ns->current_status_times_checked = 0;
+  ns->current_status_start.sec = 0;
+  ns->current_status_start.msec = 0;
+  ns->current_status_start.gmtoff = 0;
+  ns->last_cluster_recovery_check_time.sec=0;
+  ns->last_cluster_recovery_check_time.msec=0;
+  ns->last_cluster_recovery_check_time.gmtoff=0;
+  ns->generation = 0;
+  ns->settings.namespace = &rcf->namespace;
+  ns->settings.storage_mode = rcf->storage_mode;
+  ns->settings.nostore_fastpublish = rcf->nostore_fastpublish;
+  
+  ns->settings.ping_interval = rcf->ping_interval;
+  
+  ns->status = REDIS_NODESET_DISCONNECTED;
+  ngx_memzero(&ns->status_check_ev, sizeof(ns->status_check_ev));
+  ns->status_msg[0] = '\0';
+  nchan_init_timer(&ns->status_check_ev, nodeset_check_status_event, ns);
+  
+  //init cluster stuff
+  ns->cluster.enabled = 0;
+  ns->cluster.recovering_on_node = NULL;
+  ns->cluster.current_check_interval = 0;
+  ngx_memzero(&ns->cluster.check_ev, sizeof(ns->cluster.check_ev));
+  nchan_init_timer(&ns->cluster.check_ev, nodeset_cluster_check_event, ns);
+  ns->cluster.current_epoch = 0;
+  rbtree_init(&ns->cluster.keyslots, "redis cluster node (by keyslot) data", rbtree_cluster_keyslots_node_id, rbtree_cluster_keyslots_bucketer, rbtree_cluster_keyslots_compare);
+  
+  ns->use_spublish = 0;
+  
+  //various upstream settings
+  if(rcf->upstream) {
+    nchan_srv_conf_t           *scf = NULL;
+    scf = ngx_http_conf_upstream_srv_conf(rcf->upstream, ngx_nchan_module);
+    
+    ngx_uint_t                   i;
+    ngx_array_t                 *servers = rcf->upstream->servers;
+    ngx_http_upstream_server_t  *usrv = servers->elts;
+    ngx_str_t                   *upstream_url, **urlref;
+    ns->upstream = rcf->upstream;
+    
+    ns->settings.retry_commands = scf->redis.retry_commands == NGX_CONF_UNSET ? NCHAN_DEFAULT_REDIS_CAN_RETRY_COMMANDS : scf->redis.retry_commands;
+    
+    ns->settings.retry_commands_max_wait = scf->redis.retry_commands_max_wait == NGX_CONF_UNSET_MSEC ? NCHAN_DEFAULT_REDIS_RETRY_COMMANDS_MAX_WAIT_MSEC : scf->redis.retry_commands_max_wait;
+    
+    ns->settings.command_timeout = scf->redis.command_timeout == NGX_CONF_UNSET_MSEC ? NCHAN_DEFAULT_REDIS_COMMAND_TIMEOUT_MSEC : scf->redis.command_timeout;
+    ns->settings.node_connect_timeout = scf->redis.node_connect_timeout == NGX_CONF_UNSET_MSEC ? NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC : scf->redis.node_connect_timeout;
+    ns->settings.cluster_connect_timeout = scf->redis.cluster_connect_timeout == NGX_CONF_UNSET_MSEC ? NCHAN_DEFAULT_REDIS_CLUSTER_CONNECT_TIMEOUT_MSEC : scf->redis.cluster_connect_timeout;
+    ns->settings.cluster_max_failing_msec = scf->redis.cluster_max_failing_msec == NGX_CONF_UNSET_MSEC ? NCHAN_DEFAULT_REDIS_CLUSTER_MAX_FAILING_TIME_MSEC : scf->redis.cluster_max_failing_msec;
+    ns->settings.load_scripts_unconditionally = scf->redis.load_scripts_unconditionally == NGX_CONF_UNSET ? 0 : scf->redis.load_scripts_unconditionally;
+    
+    ns->settings.reconnect_delay = NCHAN_CONF_UNSEC_BACKOFF;
+    nchan_conf_merge_backoff_value(&ns->settings.reconnect_delay, &scf->redis.reconnect_delay, &NCHAN_REDIS_DEFAULT_RECONNECT_DELAY);
+    
+    ns->settings.cluster_recovery_delay = NCHAN_CONF_UNSEC_BACKOFF;
+    nchan_conf_merge_backoff_value(&ns->settings.cluster_recovery_delay, &scf->redis.cluster_recovery_delay, &NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY);
+    
+    ns->settings.cluster_check_interval = NCHAN_CONF_UNSEC_BACKOFF;
+    nchan_conf_merge_backoff_value(&ns->settings.cluster_check_interval, &scf->redis.cluster_check_interval, &NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL);
+    
+    ns->settings.idle_channel_ttl = NCHAN_CONF_UNSEC_BACKOFF;
+    nchan_conf_merge_backoff_value(&ns->settings.idle_channel_ttl, &scf->redis.idle_channel_ttl, &NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL);
+  
+    ns->settings.idle_channel_ttl_safety_margin = scf->redis.idle_channel_ttl_safety_margin == NGX_CONF_UNSET_MSEC ? NCHAN_REDIS_IDLE_CHANNEL_TTL_SAFETY_MARGIN_MSEC : scf->redis.idle_channel_ttl_safety_margin;
+    
+    ns->settings.node_weight.master = scf->redis.master_weight == NGX_CONF_UNSET ? 1 : scf->redis.master_weight;
+    ns->settings.node_weight.slave = scf->redis.slave_weight == NGX_CONF_UNSET ? 1 : scf->redis.slave_weight;
+    
+    ns->settings.accurate_subscriber_count = scf->redis.accurate_subscriber_count == NGX_CONF_UNSET ? 0 : scf->redis.accurate_subscriber_count;
+    
+    ns->settings.node_stats.enabled = scf->redis.stats.enabled == NGX_CONF_UNSET ? nchan_redis_stats_enabled : scf->redis.stats.enabled;
+    
+    ns->settings.node_stats.max_detached_time_sec = scf->redis.stats.max_detached_time_sec == NGX_CONF_UNSET ? NCHAN_REDIS_DEFAULT_STATS_MAX_DETACHED_TIME_SEC : scf->redis.stats.max_detached_time_sec;
+    
+    ns->settings.blacklist.count = scf->redis.blacklist_count;
+    ns->settings.blacklist.list = scf->redis.blacklist;
+    
+    ns->settings.username = scf->redis.username;
+    ns->settings.password = scf->redis.password;
+    
+    ns->settings.tls = scf->redis.tls;
+    //clean up unset values
+    if(ns->settings.tls.enabled == NGX_CONF_UNSET) {
+      ns->settings.tls.enabled = 0;
+    }
+    if(ns->settings.tls.verify_certificate == NGX_CONF_UNSET) {
+      ns->settings.tls.verify_certificate = 1;
+    }
+    
+    for(i=0; i < servers->nelts; i++) {
+#if nginx_version >= 1007002
+      upstream_url = &usrv[i].name;
+#else
+      upstream_url = &usrv[i].addrs->name;
+#endif
+      urlref = nchan_list_append(&ns->urls);
+      *urlref = upstream_url;
+    }
+  }
+  else {
+    ns->upstream = NULL;
+    ns->settings.node_connect_timeout = NCHAN_DEFAULT_REDIS_NODE_CONNECT_TIMEOUT_MSEC;
+    ns->settings.cluster_connect_timeout = NCHAN_DEFAULT_REDIS_CLUSTER_CONNECT_TIMEOUT_MSEC;
+    ns->settings.node_weight.master = 1;
+    ns->settings.node_weight.slave = 1;
+    ns->settings.blacklist.count = 0;
+    ns->settings.blacklist.list = NULL;
+    ngx_str_t **urlref = nchan_list_append(&ns->urls);
+    *urlref = rcf->url.len > 0 ? &rcf->url : &default_redis_url;
+  }
+  ns->current_reconnect_delay = 0;
+  ns->current_cluster_recovery_delay = 0;
+  ns->cluster.current_check_interval = 0;
+  DBG("nodeset created");
+  
+  nodeset_set_name_alloc(ns);
+  
+  redis_nodeset_stats_init(ns);
+  
+  if(ns->settings.tls.enabled) {
+    //if all the URLs are rediss://, then turn on SSL for the nodeset
+    redis_connect_params_t    rcp;
+    int                       use_tls = 1;
+    ngx_str_t               **url;
+    
+    for(url = nchan_list_first(&ns->urls); url != NULL; url = nchan_list_next(url)) {
+      parse_redis_url(*url, &rcp);
+      use_tls &= rcp.use_tls;
+    }
+    if(use_tls) {
+      ns->settings.tls.enabled = 1;
+    }
+    
+    char *err = NULL;
+    if(!nodeset_create_ssl_ctx(ns, &err)) {
+      nodeset_log_error(ns, "Error creating Redis SSL context: %s", err ? err : "unknown error");
+      return NULL;
+    }
+  }
+  redis_nodeset_count++;
+  rcf->nodeset = ns;
+
+  return ns;
+}
+
+redis_nodeset_t *nodeset_find(nchan_redis_conf_t *rcf) {
+  if(rcf->nodeset) {
+    return rcf->nodeset;
+  }
+  else {
+    int              i;
+    redis_nodeset_t *ns;
+    for(i=0; i<redis_nodeset_count; i++) {
+      ns = &redis_nodeset[i];
+      if(nchan_ngx_str_match(&rcf->namespace, ns->settings.namespace) && rcf->storage_mode == ns->settings.storage_mode) {
+        if(rcf->upstream) {
+          if(ns->upstream == rcf->upstream)
+            return ns;
+        }
+        else {
+          ngx_str_t *search_url = rcf->url.len > 0 ? &rcf->url : &default_redis_url;
+          ngx_str_t **first_url = nchan_list_first(&ns->urls);
+          
+          if(first_url && nchan_ngx_str_match(search_url, *first_url)) {
+            //cache it
+            rcf->nodeset = ns;
+            if(rcf->ping_interval > 0 && ns->settings.ping_interval > rcf->ping_interval) {
+              //use the smallest ping interval found in the settings
+              ns->settings.ping_interval = rcf->ping_interval;
+            }
+            return ns;
+          }
+        }
+      }
+    }
+    return NULL;
+  }
+}
+
+static int node_transfer_slaves(redis_node_t *src, redis_node_t *dst) {
+  int transferred = 0;
+  redis_node_t  **cur;
+  for(cur = nchan_list_first(&src->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
+    node_set_master_slave_relationship(dst, *cur);
+    transferred++;
+  }
+  return transferred;
+}
+
+static int equal_redis_connect_params(void *d1, void *d2) {
+  redis_connect_params_t *cp1 = d1;
+  redis_connect_params_t *cp2 = d2;
+  if(cp1->port != cp2->port || cp1->db != cp2->db) {
+    return 0;  
+  }
+  if( nchan_ngx_str_nonzero_match(&cp1->hostname, &cp2->hostname)
+   || nchan_ngx_str_nonzero_match(&cp1->peername, &cp2->peername)
+   || nchan_ngx_str_nonzero_match(&cp1->peername, &cp2->hostname)
+   || nchan_ngx_str_nonzero_match(&cp1->hostname, &cp2->peername)) {
+    return 1;
+  }
+  else {
+    return 0;
+  }
+}
+
+static int equal_nonzero_strings(void *s1, void *s2) {
+  return ((ngx_str_t *)s1)->len > 0 && ((ngx_str_t *)s2)->len > 0 && 
+    nchan_ngx_str_match((ngx_str_t *)s1, (ngx_str_t *)s2);
+}
+
+typedef struct {
+  char          *name;
+  off_t          offset;
+  int          (*match)(void *, void *);
+} node_match_t;
+
+static struct {
+  node_match_t    run_id;
+  node_match_t    cluster_id;
+  node_match_t    connect_params;
+} _node_match = {
+  .run_id =          {"run_id",      offsetof(redis_node_t, run_id),          equal_nonzero_strings},
+  .cluster_id =      {"cluster_id",  offsetof(redis_node_t, cluster.id),      equal_nonzero_strings},
+  .connect_params =  {"url",         offsetof(redis_node_t, connect_params),  equal_redis_connect_params}
+};
+
+static int nodeset_node_deduplicate_by(redis_node_t *node, node_match_t *match) {
+  redis_node_t   *cur;
+  void *d1, *d2;
+  d1 = &((char *)node)[match->offset];
+  for(cur = nchan_list_first(&node->nodeset->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    d2 = &((char *)cur)[match->offset];
+    if(cur != node && match->match(d1, d2)) {
+      node_log_notice(node, "deduplicated by %s", match->name);
+      node_transfer_slaves(node, cur); //node->cur
+      nodeset_node_destroy(node);
+      return 1;
+    }
+  }
+  return 0;
+}
+
+int nodeset_node_deduplicate_by_connect_params(redis_node_t *node) {
+  return nodeset_node_deduplicate_by(node, &_node_match.connect_params);
+}
+int nodeset_node_deduplicate_by_run_id(redis_node_t *node) {
+  return nodeset_node_deduplicate_by(node, &_node_match.run_id);
+}
+int nodeset_node_deduplicate_by_cluster_id(redis_node_t *node) {
+  return nodeset_node_deduplicate_by(node, &_node_match.cluster_id);
+}
+
+static redis_node_t *nodeset_node_find_by(redis_nodeset_t *ns, node_match_t *match, void *data) {
+  redis_node_t *cur;
+  void *d2;
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    d2 = &((char *)cur)[match->offset];
+    if(match->match(data, d2)) {
+      return cur;
+    }
+  }
+  return NULL;
+}
+redis_node_t *nodeset_node_find_by_connect_params(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
+  return nodeset_node_find_by(ns, &_node_match.connect_params, rcp);
+}
+redis_node_t *nodeset_node_find_by_run_id(redis_nodeset_t *ns, ngx_str_t *run_id) {
+  return nodeset_node_find_by(ns, &_node_match.run_id, run_id);
+}
+redis_node_t *nodeset_node_find_by_cluster_id(redis_nodeset_t *ns, ngx_str_t *cluster_id) {
+  return nodeset_node_find_by(ns, &_node_match.cluster_id, cluster_id);
+}
+
+static int keyslot_ranges_overlap(redis_slot_range_t *r1, redis_slot_range_t *r2) {
+  return rbtree_cluster_keyslots_compare(r1, r2) == 0;
+}
+
+redis_node_t *nodeset_node_find_by_range(redis_nodeset_t *ns, redis_slot_range_t *range) {
+  ngx_rbtree_node_t                   *rbtree_node;
+  redis_nodeset_slot_range_node_t     *keyslot_tree_node;
+  
+  if((rbtree_node = rbtree_find_node(&ns->cluster.keyslots, range)) != NULL) {
+    keyslot_tree_node = rbtree_data_from_node(rbtree_node);
+    assert(keyslot_ranges_overlap(range, &keyslot_tree_node->range));
+    return keyslot_tree_node->node;
+  }
+  else {
+    return NULL;
+  }
+}
+
+redis_node_t *nodeset_node_find_by_slot(redis_nodeset_t *ns, uint16_t slot) {
+  redis_slot_range_t range;
+  range.min = slot;
+  range.max = slot;
+  return nodeset_node_find_by_range(ns, &range);
+}
+redis_node_t *nodeset_node_find_any_ready_master(redis_nodeset_t *ns) {
+  redis_node_t *cur;
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    if(cur->state >= REDIS_NODE_READY && cur->role == REDIS_NODE_ROLE_MASTER) {
+      return cur;
+    }
+  }
+  return NULL;
+}
+
+int node_channel_in_keyspace(redis_node_t *node, void *chanhead) {
+  rdstore_channel_head_t *ch = chanhead;  
+  if(!node->cluster.enabled) {
+    return 1;
+  }
+  uint16_t slot = redis_keyslot_from_channel_id(&ch->id);
+  redis_slot_range_t  slot_as_range = {slot, slot};
+  size_t              i;
+  for(i=0; i<node->cluster.slot_range.n; i++) {
+    if(keyslot_ranges_overlap(&node->cluster.slot_range.range[i], &slot_as_range)) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+uint16_t redis_keyslot_from_channel_id(ngx_str_t *chid) {
+  static uint16_t    prefix_crc = 0;
+  if(prefix_crc == 0) {
+    prefix_crc = redis_crc16(0, "channel:", 8);
+  }
+  return redis_crc16(prefix_crc, (const char *)chid->data, chid->len) % 16384;
+}
+
+redis_node_t *nodeset_node_find_by_channel_id(redis_nodeset_t *ns, ngx_str_t *channel_id) {
+  redis_node_t      *node;
+  uint16_t           slot;
+  
+  if(!ns->cluster.enabled) {
+    node = nodeset_node_find_any_ready_master(ns);
+  }
+  else {
+    slot = redis_keyslot_from_channel_id(channel_id);
+    node = nodeset_node_find_by_slot(ns, slot);
+  }
+  
+#if REDIS_NODESET_DBG
+  if(node == NULL) {
+    nodeset_update_debuginfo(ns);
+    raise(SIGABRT);
+  }
+#endif
+  
+  return node;
+}
+
+redis_node_t *nodeset_node_find_by_key(redis_nodeset_t *ns, ngx_str_t *key) {
+  if(!ns->cluster.enabled) {
+    return nodeset_node_find_any_ready_master(ns);
+  }
+  
+  char        *start, *end;
+  ngx_str_t    hashable;
+  uint16_t     slot;
+  
+  if(((start = memchr(key->data, '{', key->len))) != NULL) {
+    start++;
+    end = memchr(start, '}', key->len - ((u_char *)start - key->data));
+    if(end && end - start > 1) {
+      hashable.data = (u_char *)start;
+      hashable.len = (end - start);
+    }
+    else {
+      hashable = *key;
+      // not quite right -- need to ignore zero-length {} and scan to the next {
+      // but it's good enough for the keys we're using
+    }
+  }
+  else {
+    hashable = *key;
+  }
+  slot = redis_crc16(0, (const char *)hashable.data, hashable.len) % 16384;
+  
+  return nodeset_node_find_by_slot(ns, slot);
+}
+
+static int nodeset_link_cluster_node_roles(redis_nodeset_t *ns) {
+  redis_node_t   *cur, *master;
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    if(cur->role == REDIS_NODE_ROLE_SLAVE) {
+      if(cur->cluster.master_id.len == 0 || cur->cluster.master_id.data == NULL) {
+        nodeset_log_warning(ns, "cluster slave node %s has no master_id", node_nickname_cstr(cur));
+        return 0;
+      }
+      
+      if((master = nodeset_node_find_by_cluster_id(ns, &cur->cluster.master_id)) == NULL) {
+        nodeset_log_warning(ns, "no master node with cluster_id %V found for slave node %s", &cur->cluster.master_id, node_nickname_cstr(cur));
+        return 0;
+      }
+      
+      node_set_master_slave_relationship(master, cur);
+    }
+  }
+  return 1;
+}
+
+static void ping_command_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                 *reply = rep;
+  redis_node_t               *node = privdata;
+  if(!reply || reply->type == REDIS_REPLY_ERROR || !ac || ac->err) {
+    node_log_error(node, "node ping failed");
+    return;
+  }
+  node_log_debug(node, "node ping command reply ok");
+}
+
+static void node_ping_event(ngx_event_t *ev) {
+  redis_node_t       *node = ev->data;
+  redis_nodeset_t    *ns = node->nodeset;
+  if(!ev->timedout || ngx_exiting || ngx_quit)
+    return;
+  
+  node_log_debug(node, "node ping event");
+  
+  ev->timedout = 0;
+  if(node->state == REDIS_NODE_READY) {
+    assert(node->ctx.cmd);
+    
+    //we want to do this on EVERY node to anounce our presence. definitely don't use SPUBLISH here
+    if(node->role == REDIS_NODE_ROLE_MASTER) {
+      redisAsyncCommand(node->ctx.cmd, ping_command_callback, node, "PUBLISH %s ping", redis_worker_id);
+    }
+    else {
+      redisAsyncCommand(node->ctx.cmd, ping_command_callback, node, "PING");
+    }
+    
+    if(ns->settings.ping_interval > 0) {
+      ngx_add_timer(ev, ns->settings.ping_interval * 1000);
+    }
+  }
+}
+
+static void node_command_timeout_check_event(ngx_event_t *ev) {
+  redis_node_t       *node = ev->data;
+  redis_nodeset_t    *ns = node->nodeset;
+  if(!ev->timedout || ngx_exiting || ngx_quit)
+    return;
+  
+  long long prev_sent = node->timeout.prev_sent;
+  long long cur_received = node->timeout.received;
+  node->timeout.prev_sent = node->timeout.sent;
+  
+  if(cur_received < prev_sent) {
+    //TIMED OUT!
+    node_log_warning(node, "%d command%s took longer than the timeout limit of %ds. Marking node as failed", prev_sent - cur_received, prev_sent - cur_received == 1 ? "" : "s", ns->settings.command_timeout/1000);
+    node_disconnect(node, REDIS_NODE_FAILED);
+    nodeset_examine(node->nodeset);
+    return;
+  }
+  
+  if(node->timeout.sent == node->timeout.received) {
+    node_log_debug(node, "NO timeout. RESETTING. sent: %d, received: %d, prev_sent: %d", node->timeout.sent, cur_received, prev_sent);
+    node->timeout.sent = 0;
+    node->timeout.received = 0;
+    node->timeout.prev_sent = 0;
+  }
+  else {
+    node_log_debug(node, "NO timeout. sent: %d, received: %d, prev_sent: %d", node->timeout.sent, cur_received, prev_sent);
+  }
+  
+  ngx_add_timer(ev, ns->settings.command_timeout);
+}
+
+static void nodeset_stop_cluster_check_timer(redis_nodeset_t *ns) {
+  ns->cluster.current_check_interval = 0;
+  if(ns->cluster.check_ev.timer_set) {
+    ngx_del_timer(&ns->cluster.check_ev);
+  }
+}
+
+static void nodeset_start_cluster_check_timer(redis_nodeset_t *ns) {
+  if(ns->cluster.enabled) {
+    if(!ns->cluster.check_ev.timer_set && ns->settings.cluster_check_interval.min > 0) {
+      nchan_set_next_backoff(&ns->cluster.current_check_interval, &ns->settings.cluster_check_interval);
+      ngx_add_timer(&ns->cluster.check_ev, ns->cluster.current_check_interval);
+    }
+  }
+}
+
+static int nodeset_node_remove_failed(redis_nodeset_t *ns, ngx_str_t *cluster_node_id) {
+  redis_node_t *failed_node = nodeset_node_find_by_cluster_id(ns, cluster_node_id);
+  if(!failed_node) {
+    return 0;
+  }
+  nodeset_log_notice(ns, "removed failed node %s", node_nickname_cstr(failed_node));
+  node_disconnect(failed_node, REDIS_NODE_FAILED);
+  nodeset_node_destroy(failed_node);
+  return 1;
+}
+
+static void nodeset_cluster_check_event_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                 *reply = rep;
+  redis_node_t               *node = privdata;
+  redis_nodeset_t            *ns = node->nodeset;
+  ngx_str_t                   epoch_str;
+  int                         epoch;
+  const char                 *err = NULL;
+  
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CLUSTER_CHECK);
+  node_command_received(node);
+  
+  if(reply == NULL) {
+    //Node should have already disconnected
+    return;
+  }
+  
+  if(reply->type == REDIS_REPLY_ERROR) {
+    err = reply->str ? reply->str : "error in reply";
+    goto error;
+  }
+  
+  if(reply->type != REDIS_REPLY_ARRAY || reply->elements != 2) {
+    err = "reply not an array of size 2";
+    goto error;
+  }
+  redisReply *info = reply->element[0];
+  redisReply *cluster_nodes = reply->element[1];
+  
+  //parse CLUSTER INFO reply
+  if(!reply_str_ok(info)) {
+    err = info->str ? info->str : "error in CLUSTER INFO reply";
+    goto error;
+  }
+  if(!nchan_cstr_match_line(info->str, "cluster_state:ok")) {
+    char errstr[512];
+    ngx_snprintf((u_char *)errstr, 512, "cluster_state not ok on node %s.%Z", node_nickname_cstr(node));
+    nodeset_set_status(ns, REDIS_NODESET_CLUSTER_FAILING, errstr);
+    return;
+  }
+  if(!nchan_get_rest_of_line_in_cstr(info->str, "cluster_current_epoch:", &epoch_str)) {
+    err = "Cluster check failed: CLUSTER info command is missing 'cluster_current_epoch'";
+    goto error;
+  }
+  if((epoch = ngx_atoi(epoch_str.data, epoch_str.len)) == NGX_ERROR) {
+    err = "failed to parse current config epoch number";
+    //why would this happen? dunno, fail node just in case
+    goto error;
+  }
+  
+  int epoch_changed = 0, prev_epoch = 0;
+  if(ns->cluster.current_epoch < epoch) {
+    epoch_changed = 1;
+    prev_epoch = node->cluster.current_epoch;
+    node->cluster.current_epoch = epoch;
+    ns->cluster.current_epoch = epoch;
+  }
+  
+  //parse CLUSTER NODES reply
+  if(cluster_nodes->type != REDIS_REPLY_STRING) {
+    err = "CLUSTER NODES reply is not a string";
+    goto error;
+  }
+  size_t                  i, n;
+  cluster_nodes_line_t   *lines;
+  cluster_nodes_line_t   *l;
+  redis_node_t           *peer;
+  
+  if(!(lines = parse_cluster_nodes(node, cluster_nodes->str, &n))) {
+    err = "parsing CLUSTER NODES reply failed";
+    goto error;
+  }
+  
+  int outdated_nodes = 0, failed_nodes = 0;
+  
+  for(i=0; i<n; i++) {
+    l = &lines[i];
+    if(l->maybe_failed) {
+      nodeset_log_warning(ns, "Ignoring 'fail?' state reported by %V:%d for node %V", &node->connect_params.hostname, node->connect_params.port, &l->address);
+    }
+    if(l->failed && nodeset_node_remove_failed(ns, &l->id)) {
+      failed_nodes++;
+      continue;
+    }
+    if(node_skip_cluster_peer(node, l, 0, 0)) {
+      continue;
+    }
+    
+    node_discover_cluster_peer(node, l, &peer);
+    
+    if(nodeset_cluster_node_is_outdated(ns, l)) {
+      outdated_nodes++;
+    }
+  }
+  
+  if(outdated_nodes) {
+    char errbuf[512];
+    ngx_snprintf((u_char *)errbuf, 512, "%d node%s role or keyslot assignment has changed.%s%Z", outdated_nodes, outdated_nodes == 1 ? "" : "s", epoch_changed ? " Also, the config epoch has changed." : "");
+    nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, errbuf);
+    return;
+  }
+  
+  if(epoch_changed) {
+    if(nodeset_cluster_keyslot_space_complete(ns, REDIS_NODE_READY)) {
+      nodeset_log_warning(ns, "config epoch has changed from %d to %d on node %s. Node roles remain unchanged and the cluster is still healthy.", prev_epoch, epoch, node_nickname_cstr(node));
+    }
+    else {
+      nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, "Config epoch has changed and the keyslot space is incomplete");
+      return;
+    }
+  }
+  
+  if(failed_nodes) {
+    if(nodeset_cluster_keyslot_space_complete(ns, REDIS_NODE_READY)) {
+      nodeset_log_warning(ns, "%d failed node%s removed, but the keyspace is still complete. The cluster is healthy.", failed_nodes, failed_nodes == 1 ? " was" : "s were");
+    }
+    else {
+      char errbuf[512];
+      ngx_snprintf((u_char *)errbuf, 512, "%d failed node%s removed, and the keyspace is now incomplete%Z", failed_nodes, failed_nodes == 1 ? " was" : "s were");
+      nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, errbuf);
+    }
+  }
+  
+  nodeset_start_cluster_check_timer(ns);
+  return;
+
+error:
+  nodeset_log_error(ns, "Cluster check failed on node %s: %s", node_nickname_cstr(node), err ? err : "unkown error");
+  nodeset_start_cluster_check_timer(ns);
+  if(node->state >= REDIS_NODE_READY) {
+    node_disconnect(node, REDIS_NODE_FAILED);
+    nodeset_examine(node->nodeset);
+  }
+}
+
+static void nodeset_cluster_check_event(ngx_event_t *ev) {
+  if(!ev->timedout || ngx_exiting || ngx_quit)
+    return;
+  
+  redis_nodeset_t    *ns = ev->data;
+  ev->timedout = 0;
+  
+  redis_node_t *node = nodeset_random_node(ns, REDIS_NODE_GET_CLUSTERINFO, REDIS_NODE_ROLE_ANY);
+  
+  if(!node) {
+    nodeset_log_error(ns, "no suitable node to run cluster check. when idle, Nchan may not be aware of cluster changes!");
+    nodeset_start_cluster_check_timer(ns);
+    return;
+  }
+  
+  node_command_sent(node);
+  node_command_time_start(node, NCHAN_REDIS_CMD_CLUSTER_CHECK);
+  
+  nodeset_log_debug(ns, "cluster_check event on node %s", node_nickname_cstr(node));
+  redisAsyncCommand(node->ctx.cmd, NULL, NULL, "MULTI");
+  redisAsyncCommand(node->ctx.cmd, NULL, NULL, "CLUSTER INFO");
+  redisAsyncCommand(node->ctx.cmd, NULL, NULL, "CLUSTER NODES");
+  redisAsyncCommand(node->ctx.cmd, nodeset_cluster_check_event_callback, node, "EXEC");
+}
+
+static int nodeset_reset_cluster_node_info(redis_nodeset_t *ns) {
+  redis_node_t   *node;
+  for(node = nchan_list_first(&ns->nodes); node != NULL; node = nchan_list_next(node)) {
+    node->recovering = 0;
+    if(node->cluster.enabled) {
+      node->cluster.ok = 0;
+      node->cluster.master_id.len = 0;
+      
+      //don't clear the cluster node id though, that's not supposed to change.
+      //we'll use it to find known nodes
+      
+      node_unset_cluster_slots(node);
+      
+      node_set_role(node, REDIS_NODE_ROLE_UNKNOWN);
+      if(node->state > REDIS_NODE_GET_CLUSTERINFO) {
+        node->state = REDIS_NODE_GET_CLUSTERINFO;
+      }
+    }
+  }
+  
+  return 1;
+}
+
+static void nodeset_recover_cluster_handler(redisAsyncContext *ac, void *rep, void *privdata);
+static int nodeset_recover_cluster(redis_nodeset_t *ns) {
+  if(ns->cluster.recovering_on_node) {
+    nodeset_log_error(ns, "already recoving cluster state");
+    return 0;
+  }
+  ns->last_cluster_recovery_check_time = *ngx_timeofday();
+  nodeset_reset_cluster_node_info(ns);
+  
+  //pick a random node
+  redis_node_t *node = nodeset_random_node(ns, REDIS_NODE_GET_CLUSTERINFO, REDIS_NODE_ROLE_ANY);
+  if(!node) {
+    nodeset_log_error(ns, "cluster unrecoverable: no connected node found to recover on");
+    return 0;
+  };
+  
+  redis_node_t   *cur;
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    if(!node->connecting && node->state >= REDIS_NODE_DISCONNECTED) {
+      cur->recovering = 1;
+    }
+  }
+  ns->cluster.recovering_on_node = node;
+  nodeset_log_notice(ns, "Recovering cluster though node %s", node_nickname_cstr(node));
+  
+  node_command_sent(node);
+  node_command_time_start(node, NCHAN_REDIS_CMD_CLUSTER_RECOVER);
+  
+  redisAsyncCommand(node->ctx.cmd, NULL, NULL, "MULTI");
+  redisAsyncCommand(node->ctx.cmd, NULL, NULL, "CLUSTER INFO");
+  redisAsyncCommand(node->ctx.cmd, NULL, NULL, "CLUSTER NODES");
+  redisAsyncCommand(node->ctx.cmd, NULL, NULL, "COMMAND INFO SPUBLISH");
+  redisAsyncCommand(node->ctx.cmd, nodeset_recover_cluster_handler, node, "EXEC");
+
+  return 1;
+}
+
+static void nodeset_recover_cluster_handler(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                 *reply = rep;
+  redis_node_t               *node = privdata;
+  redis_nodeset_t            *ns = node->nodeset;
+  int                         current_epoch;
+  u_char                      errbuf[1024];
+  
+  node_command_received(node);
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CLUSTER_RECOVER);
+  
+  ngx_snprintf(errbuf, 1024, "unknown reason%Z");
+  
+  if(ns->cluster.recovering_on_node != node) {
+    ngx_snprintf(errbuf, 1024, "got a response from a different node than where recovery was attempted%Z");
+    goto fail;
+  }
+  ns->cluster.recovering_on_node = NULL;
+  
+  if(!redisReplyOk(ac, reply)) {
+    ngx_snprintf(errbuf, 1024, "reply not ok%Z");
+    goto fail;
+  }
+  if(reply->type != REDIS_REPLY_ARRAY || reply->elements != 3) {
+    ngx_snprintf(errbuf, 1024, "got something other than an array of size 2%Z");
+    goto fail;
+  }
+  
+  //parse CLUSTER INFO reply
+  redisReply        *cluster_info_reply = reply->element[0];
+  ngx_str_t          rest;
+  if(cluster_info_reply->type != REDIS_REPLY_STRING) {
+    ngx_snprintf(errbuf, 1024, "CLUSTER INFO reply is not a string%Z");
+    goto fail;
+  }
+  
+  if(!nchan_cstr_match_line(cluster_info_reply->str, "cluster_state:ok")) {
+    node->cluster.ok=0;
+    ngx_snprintf(errbuf, 1024, "cluster_state not ok on node %s.%Z", node_nickname_cstr(node));
+    goto fail;
+  }
+  if(!nchan_get_rest_of_line_in_cstr(cluster_info_reply->str, "cluster_current_epoch:", &rest)) {
+    ngx_snprintf(errbuf, 1024, "CLUSTER INFO failed to get current epoch%Z");
+    goto fail;
+  }
+  if((current_epoch = ngx_atoi(rest.data, rest.len)) == NGX_ERROR) {
+    ngx_snprintf(errbuf, 1024, "CLUSTER INFO command failed to parse current epoch number%Z");
+    goto fail;
+  }
+  
+  redisReply        *cluster_nodes_reply = reply->element[1];
+  if(cluster_nodes_reply->type != REDIS_REPLY_STRING) {
+    ngx_snprintf(errbuf, 1024, "CLUSTER NODES reply is not a string%Z");
+    goto fail;
+  }
+  //parse CLUSTER NODES
+  size_t                  i, n;
+  int                     discovered = 0;
+  cluster_nodes_line_t   *lines;
+  cluster_nodes_line_t   *l;
+  redis_node_t           *peer;
+  
+  if(!(lines = parse_cluster_nodes(node, cluster_nodes_reply->str, &n))) {
+    ngx_snprintf(errbuf, 1024, "parsing CLUSTER NODES command failed%Z");
+    goto fail;
+  }
+  for(i=0; i<n; i++) {
+    l = &lines[i];
+    if(l->failed && nodeset_node_remove_failed(ns, &l->id)) {
+      continue;
+    }
+    
+    if(node_skip_cluster_peer(node, l, 0, 0)) {
+      continue;
+    }
+    
+    if(node_discover_cluster_peer(node, l, &peer)) {
+      discovered++;
+      continue;
+    }
+    
+    if(!peer) {
+      ngx_snprintf(errbuf, 1024, "did not discover a peer, and didn't match existing node%Z");
+      goto fail;
+    }
+    
+    //found existing peer. update it
+    
+    if(l->master) {
+      node_set_role(peer, REDIS_NODE_ROLE_MASTER);
+      char sloterrbuf[256];
+      if(l->slot_ranges_count > 0 && !node_set_cluster_slots(peer, l, sloterrbuf, sizeof(sloterrbuf))) {
+        ngx_snprintf(errbuf, 1024, "couldn't set cluster slots for node %s: %s%Z", node_nickname_cstr(peer), sloterrbuf);
+        nodeset_dbg_log_nodes_and_clusternodes_lines(ns, NGX_LOG_NOTICE, lines, n);
+        goto fail;
+      }
+    }
+    else {
+      node_set_role(peer, REDIS_NODE_ROLE_SLAVE);
+      nchan_strcpy(&peer->cluster.master_id, &l->master_id, MAX_CLUSTER_ID_LENGTH);
+    }
+    //we will set actual master-slave associations later.
+  }
+  
+  DBG("discovered %i nodes", discovered);
+  
+  //does this node have SPUBLISH support?
+  node->have_spublish = reply->element[2]->type == REDIS_REPLY_ARRAY;
+  
+  //connect the disconnected
+  redis_node_t      *cur;
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    if(cur->state <= REDIS_NODE_DISCONNECTED && !cur->connecting) {
+      node_connect(cur);
+    }
+  }
+  /* proceed if we have the whole keyspace -- Even though a cluster 
+     might be healthy, when failing over Redis may not report some 
+     assigned keyslots for some masters until consensus is reached
+   */
+  if(!nodeset_cluster_keyslot_space_complete(ns, REDIS_NODE_GET_CLUSTERINFO)) {
+    ngx_snprintf(errbuf, 1024, "incomplete keyslot information%Z");
+    goto fail;
+  }
+  
+  //set all masters and slaves
+  if(!nodeset_link_cluster_node_roles(ns)) {
+    ngx_snprintf(errbuf, 1024, "failed to link cluster node masters and slaved%Z");
+    goto fail;
+  }
+  
+  //check 'em over
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    if(cur->connecting) {
+      continue;
+    }
+    
+    assert(cur->ctx.cmd);
+    assert(cur->ctx.pubsub);
+    ns->cluster.current_epoch = current_epoch;
+    cur->cluster.current_epoch = current_epoch;
+    cur->cluster.ok = 1;
+    node_make_ready(cur);
+    cur->recovering = 0;
+  }
+  
+  //success?...
+  nodeset_examine(ns);
+  if(ns->status != REDIS_NODESET_READY) {
+    ngx_snprintf(errbuf, 1024, "%s%Z", ns->status_msg[0] == '\0' ? "(unknown reason)" : ns->status_msg);
+    goto fail;
+  }
+  ns->last_cluster_recovery_check_time.sec = 0;
+  ns->last_cluster_recovery_check_time.msec = 0;
+  
+  return;
+  
+fail:
+  nchan_set_next_backoff(&ns->current_cluster_recovery_delay, &ns->settings.cluster_recovery_delay);
+  nodeset_reset_cluster_node_info(ns);
+  ns->last_cluster_recovery_check_time = *ngx_timeofday();
+  nodeset_log_warning(ns, "Cluster recovery failed: %s. Will retry in %.3f sec", (char *)errbuf, ns->current_cluster_recovery_delay/1000.0);
+}
+
+static redis_node_t *nodeset_node_create_with_space(redis_nodeset_t *ns, redis_connect_params_t *rcp, size_t extra_space, void **extraspace_ptr) {
+  assert(!nodeset_node_find_by_connect_params(ns, rcp));
+  node_blob_t      *node_blob;
+  if(extra_space == 0) {
+    assert(extraspace_ptr == NULL);
+    node_blob = nchan_list_append(&ns->nodes);
+  }
+  else {
+    assert(extraspace_ptr);
+    node_blob = nchan_list_append_sized(&ns->nodes, sizeof(*node_blob)+extra_space);
+    if(extra_space) {
+      *extraspace_ptr = (void *)(&node_blob[1]);
+    }
+  }
+  redis_node_t     *node = &node_blob->node;
+  
+  assert((void *)node_blob == (void *)node);
+  assert(node);
+  node->role = REDIS_NODE_ROLE_UNKNOWN,
+  node->state = REDIS_NODE_DISCONNECTED;
+  node->discovered = 0;
+  node->connecting = 0;
+  node->recovering = 0;
+  node->have_spublish = 0;
+  node->connect_timeout = NULL;
+  node->connect_params = *rcp;
+  node->connect_params.peername.data = node_blob->peername;
+  node->connect_params.peername.len = 0;
+  node->cluster.id.len = 0;
+  node->cluster.id.data = node_blob->cluster_id;
+  node->cluster.master_id.len = 0;
+  node->cluster.master_id.data = node_blob->cluster_master_id;
+  node->cluster.enabled = 0;
+  node->cluster.ok = 0;
+  node->cluster.slot_range.indexed = 0;
+  node->cluster.slot_range.n = 0;
+  node->cluster.slot_range.range = NULL;
+  node->pending_commands = 0;
+  node->run_id.len = 0;
+  node->run_id.data = node_blob->run_id;
+  node->nodeset = ns;
+  node->generation = 0;
+  
+  if(rcp->password.len == 0 && ns->settings.password.len > 0) {
+    node->connect_params.password = ns->settings.password;
+  }
+  if(rcp->username.len == 0 && ns->settings.username.len > 0) {
+    node->connect_params.username = ns->settings.username;
+  }
+  
+  nchan_slist_init(&node->channels.cmd, rdstore_channel_head_t, redis.slist.node_cmd.prev, redis.slist.node_cmd.next);
+  nchan_slist_init(&node->channels.pubsub, rdstore_channel_head_t, redis.slist.node_pubsub.prev, redis.slist.node_pubsub.next);
+  
+  node->peers.master = NULL;
+  nchan_list_init(&node->peers.slaves, sizeof(redis_node_t *), "node slaves");
+  
+  ngx_memzero(&node->ping_timer, sizeof(node->ping_timer));
+  nchan_init_timer(&node->ping_timer, node_ping_event, node);
+  
+  node->timeout.sent = 0;
+  node->timeout.received = 0;
+  node->timeout.prev_sent = 0;
+  ngx_memzero(&node->timeout.ev, sizeof(node->timeout.ev));
+  nchan_init_timer(&node->timeout.ev, node_command_timeout_check_event, node);
+  
+  node->ctx.cmd = NULL;
+  node->ctx.pubsub = NULL;
+  node->ctx.sync = NULL;
+  
+  redis_node_stats_init(node);
+  
+  assert(nodeset_node_find_by_connect_params(ns, rcp));
+  return node;
+}
+
+redis_node_t *nodeset_node_create(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
+  return nodeset_node_create_with_space(ns, rcp, 0, NULL);
+}
+
+static redis_node_t *nodeset_node_create_with_connect_params(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
+  redis_node_t  *node;
+  u_char        *space;
+  size_t         sz = rcp->hostname.len + rcp->password.len;
+  node = nodeset_node_create_with_space(ns, rcp, sz, (void **)&space);
+  assert(node);
+  node->connect_params.hostname.data = space;
+  node->connect_params.hostname.len = 0;
+  nchan_strcpy(&node->connect_params.hostname, &rcp->hostname, 0);
+  node->connect_params.password.data = &space[rcp->hostname.len];
+  nchan_strcpy(&node->connect_params.password, &rcp->password, 0);
+  
+  return node;
+}
+
+static void node_remove_peer(redis_node_t *node, redis_node_t *peer) {
+  redis_node_t  **cur;
+  if(node->peers.master == peer) {
+    node->peers.master = NULL;
+  }
+  
+  for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
+    if(*cur == peer) {
+      nchan_list_remove(&node->peers.slaves, cur);
+      return;
+    }
+  }
+}
+
+ngx_int_t nodeset_node_destroy(redis_node_t *node) {
+  redisAsyncContext *ac;
+  redisContext      *c;
+  node_set_role(node, REDIS_NODE_ROLE_UNKNOWN); //removes from all peer lists, and clears own slave list
+  if((ac = node->ctx.cmd) != NULL) {
+    node->ctx.cmd = NULL;
+    redisAsyncFree(ac);
+  }
+  if((ac = node->ctx.pubsub) != NULL) { 
+    node->ctx.pubsub = NULL;
+    redisAsyncFree(ac);
+  }
+  if((c = node->ctx.sync) != NULL) {
+    node->ctx.sync = NULL;
+    redisFree(c);
+  }
+  if(node->connect_timeout) {
+    nchan_abort_oneshot_timer(node->connect_timeout);
+    node->connect_timeout = NULL;
+  }
+  
+  redis_node_stats_destroy(node);
+  nchan_list_remove(&node->nodeset->nodes, node);
+  
+  return NGX_OK;
+}
+
+static void node_discover(redis_node_t *source, redis_connect_params_t *rcp, redis_node_role_t role) {
+  assert(role == REDIS_NODE_ROLE_SLAVE || role == REDIS_NODE_ROLE_MASTER);
+  
+  nchan_redis_ip_range_t    *matched;
+  redis_node_t              *discovered_node = NULL;
+  
+  if ((matched = node_ip_blacklisted(source->nodeset, rcp)) != NULL) {
+    node_log_notice(source, "skipping discovered %s %V blacklisted by %V", node_role_cstr(role), &rcp->hostname, &matched->str);
+    return;
+  }
+  
+  if((discovered_node = nodeset_node_find_by_connect_params(source->nodeset, rcp))!= NULL) {
+    //we know about it already
+    if(discovered_node->role != role && discovered_node->state > REDIS_NODE_GET_INFO) {
+      node_log_notice(discovered_node, "Node appears to have changed to %s -- need to update", node_role_cstr(role));
+      node_set_role(discovered_node, REDIS_NODE_ROLE_UNKNOWN);
+      node_disconnect(discovered_node, REDIS_NODE_FAILED);
+      node_connect(discovered_node);
+    }
+  }
+  else {
+    discovered_node = nodeset_node_create_with_connect_params(source->nodeset, rcp);
+    discovered_node->discovered = 1;
+    node_set_role(discovered_node, role);
+    node_log_notice(source, "Discovering own %s %s", node_role_cstr(role), rcp_cstr(rcp));
+  }
+  
+  if(role == REDIS_NODE_ROLE_MASTER) {
+    node_set_master_slave_relationship(discovered_node, source);
+  }
+  else {
+    node_set_master_slave_relationship(source, discovered_node);
+  }
+  
+    //try to connect
+  if(discovered_node->state <= REDIS_NODE_DISCONNECTED && !discovered_node->connecting) {
+    node_connect(discovered_node);
+  }
+}
+
+static int node_skip_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l, int log_action, int skip_self) {
+  redis_connect_params_t   rcp;
+  char                    *description = "";
+  char                    *detail = "";
+  char                     detail_buf[64];
+  char                    *role = NULL;
+  ngx_uint_t               loglevel = NGX_LOG_NOTICE;
+  nchan_redis_ip_range_t  *matched;
+  rcp.hostname = l->hostname;
+  rcp.port = l->port;
+  rcp.peername.len = 0;
+  rcp.db = node->connect_params.db;
+  rcp.password = node->connect_params.password;
+  
+  if(l->noaddr) {
+    role = "node";
+    description = "no-address";
+    return 1;
+  }
+  else if(l->handshake) {
+    role = "node";
+    description = "handshaking";
+  }
+  else if(l->hostname.len == 0) {
+    role = "node";
+    description = "empty hostname";
+  }
+  else if(l->failed) {
+    description = "failed";
+  }
+  else if(!l->connected) {
+    description = "disconnected";
+  }
+  else if(l->self && skip_self) {
+    description = "self";
+    loglevel = NGX_LOG_INFO;
+  }
+  else if((matched = node_ip_blacklisted(node->nodeset, &rcp)) != NULL) {
+    description = "blacklisted";
+    detail = detail_buf;
+    ngx_snprintf((u_char *)detail_buf, 64, " (matched blacklist entry %V)%Z", &matched->str);
+  }
+  else {
+    return 0;
+  }
+  if(!role) role = l->master ? "master" : "slave";
+  if(log_action) {
+    nodeset_log(node->nodeset, loglevel, "Skipping %s %s %s%s", description, role, rcp_cstr(&rcp), detail);
+  }
+  return 1;
+}
+
+static int nodeset_cluster_node_is_outdated(redis_nodeset_t *ns, cluster_nodes_line_t *l) {
+  redis_node_t *node = nodeset_node_find_by_cluster_id(ns, &l->id);
+  
+  if(!node) {
+    return 0;
+  }
+  
+  int role = l->master ? REDIS_NODE_ROLE_MASTER : REDIS_NODE_ROLE_SLAVE;
+  
+  if(node->role != role) {
+    nodeset_log_notice(ns, "Node %s has changed from %s to %s", node_nickname_cstr(node), node_role_cstr(node->role), node_role_cstr(role));
+    return 1;
+  }
+  
+  if(node->cluster.slot_range.n != (size_t )l->slot_ranges_count) {
+    nodeset_log_notice(ns, "Node %s slot range count has changed from %d to %d.", node_nickname_cstr(node), node->cluster.slot_range.n, l->slot_ranges_count);
+    return 1;
+  }
+  
+  redis_slot_range_t *range = ngx_alloc(sizeof(redis_slot_range_t) * node->cluster.slot_range.n, ngx_cycle->log);
+  if(range == NULL) {
+    nodeset_log_error(ns, "Out of memory: failed to allocate slot range during cluster check");
+    return 1;
+  }
+  if(!parse_cluster_node_slots(l, range)) {
+    ngx_free(range);
+    nodeset_log_error(ns, "failed parsing cluster slots range");
+    return 1;
+  }
+  
+  int i;
+  for(i=0; i<l->slot_ranges_count; i++) {
+    if((node->cluster.slot_range.range[i].min != range[i].min) 
+    || (node->cluster.slot_range.range[i].max != range[i].max)) {
+      nodeset_log_notice(ns, "Node %s slot range has changed", node_nickname_cstr(node));
+      ngx_free(range);
+      return 1;
+    }
+  }
+  
+  ngx_free(range);
+  return 0;
+}
+
+static int node_discover_cluster_peer(redis_node_t *node, cluster_nodes_line_t *l, redis_node_t **known_node) {
+  redis_connect_params_t   rcp;
+  redis_node_t            *peer;
+  int                      newly_discovered = 0;
+  if(l->failed || !l->connected || l->noaddr || l->self) {
+    if(known_node && l->self) {
+      *known_node = node;
+    }
+    return 0;
+  }
+  rcp.hostname = l->hostname;
+  rcp.port = l->port;
+  rcp.peername.len = 0;
+  rcp.db = node->connect_params.db;
+  rcp.password = node->connect_params.password;
+  rcp.username = node->connect_params.username;
+  rcp.use_tls = node->nodeset->settings.tls.enabled;
+  
+  if( ((peer = nodeset_node_find_by_connect_params(node->nodeset, &rcp)) != NULL)
+   || ((peer = nodeset_node_find_by_cluster_id(node->nodeset, &l->id)) != NULL)
+  ) {
+    //node_log_notice(node, "Discovering cluster node %s... already known", rcp_cstr(&rcp));
+    if(known_node) {
+      *known_node = peer;
+    }
+  }
+  else {
+    newly_discovered=1;
+    nodeset_log_notice(node->nodeset, "Discovered cluster %s %s", (l->master ? "master" : "slave"), rcp_cstr(&rcp));
+    peer = nodeset_node_create_with_connect_params(node->nodeset, &rcp);
+    peer->discovered = 1;
+  }
+  
+  
+  peer->cluster.enabled = 1;
+  if(!l->master && l->master_id.len > 0 && peer->cluster.master_id.len == 0) {
+    nchan_strcpy(&peer->cluster.master_id, &l->master_id, MAX_CLUSTER_ID_LENGTH);
+  }
+  nchan_strcpy(&peer->cluster.id, &l->id, MAX_CLUSTER_ID_LENGTH);
+  
+  node_set_role(peer, l->master ? REDIS_NODE_ROLE_MASTER : REDIS_NODE_ROLE_SLAVE);
+  //ignore all the other things for now
+  
+  if(newly_discovered) {
+    node_connect(peer);
+  }
+  return newly_discovered;
+}
+
+static ngx_int_t set_preallocated_peername(redisAsyncContext *ctx, ngx_str_t *dst);
+
+static void node_connector_fail(redis_node_t *node, const char *err) {
+  const char  *ctxerr = NULL;
+  node->connecting = 0;
+  node_command_time_finish(node, NCHAN_REDIS_CMD_CONNECT);
+  if(node->ctx.cmd && node->ctx.cmd->err) {
+    ctxerr = node->ctx.cmd->errstr;
+  }
+  else if(node->ctx.pubsub && node->ctx.pubsub->err) {
+    ctxerr = node->ctx.pubsub->errstr;
+  }
+  else if(node->ctx.sync && node->ctx.sync->err) {
+    ctxerr = node->ctx.sync->errstr;
+  }
+  if(node->state == REDIS_NODE_CONNECTION_TIMED_OUT) {
+    node_log_error(node, "connection failed: %s", err == NULL ? "timeout" : err);
+  }
+  else if(ctxerr) {
+    if(err) {
+      node_log_error(node, "connection failed: %s (%s)", err, ctxerr);
+    }
+    else {
+      node_log_error(node, "connection failed: %s", ctxerr);
+    }
+  }
+  else if(err) {
+    node_log_error(node, "connection failed: %s", err);
+  }
+  else {
+    node_log_error(node, "connection failed");
+  }
+  node_disconnect(node, REDIS_NODE_FAILED);
+}
+
+int node_connect(redis_node_t *node) {
+  assert(node->state <= REDIS_NODE_DISCONNECTED);
+  node->connecting = 1;
+  node_connector_callback(NULL, NULL, node);
+  return 1;
+}
+
+int node_disconnect(redis_node_t *node, int disconnected_state) {
+  ngx_int_t prev_state = node->state;
+  node->state = disconnected_state;
+  node->connecting = 0;
+  redisAsyncContext *ac;
+  redisContext      *c;
+  if(node->connect_timeout) {
+    nchan_abort_oneshot_timer(node->connect_timeout);
+    node->connect_timeout = NULL;
+  }
+  
+  if((ac = node->ctx.cmd) != NULL) {
+    node->ctx.cmd->onDisconnect = NULL;
+    node->ctx.cmd = NULL;
+    //redisAsyncSetDisconnectCallback(ac, NULL); //this only sets the callback if it's currently null...
+    redisAsyncFree(ac);
+    node_log_debug(node, "redisAsyncFree %p", ac);
+    node_log_notice(node, "disconnected");
+  }
+  if((ac = node->ctx.pubsub) != NULL) {
+    node->ctx.pubsub->onDisconnect = NULL;
+    node->ctx.pubsub = NULL;
+    //redisAsyncSetDisconnectCallback(ac, NULL);  //this only sets the callback if it's currently null...
+    redisAsyncFree(ac);
+    node_log_debug(node, "redisAsyncFree pubsub %p", ac);
+  }
+  if((c = node->ctx.sync) != NULL) {
+    node->ctx.sync = NULL;
+    redisFree(c);
+  }
+
+  if(prev_state >= REDIS_NODE_GET_CLUSTERINFO) {
+    nchan_stats_worker_incr(redis_connected_servers, -1);
+  }
+  if(node->cluster.enabled) {
+    node_unset_cluster_slots(node);
+  }
+  
+  if(node->ping_timer.timer_set) {
+    ngx_del_timer(&node->ping_timer);
+  }
+  
+  if(node->timeout.ev.timer_set) {
+    ngx_del_timer(&node->timeout.ev);
+  }
+  
+  //reset timeout values.
+  //this isn't stricrlt necessary for correct operation -- after redisAsyncFree, all outstanding commands will have been received (with an error, but that's beside the point)
+  //this is just to stay clean and restart from 0
+  node->timeout.sent = 0;
+  node->timeout.received = 0;
+  node->timeout.prev_sent = 0;
+  
+  node->pending_commands = 0;
+  
+  node->scripts_load_state.loading = 0;
+  node->scripts_load_state.current = 0;
+  int i;
+  for(i=0; i<REDIS_LUA_SCRIPTS_COUNT; i++) {
+    node->scripts_load_state.loaded[i]=0;
+  }
+  
+  rdstore_channel_head_t *cur;
+  nchan_slist_t *cmd = &node->channels.cmd;
+  nchan_slist_t *pubsub = &node->channels.pubsub;
+  nchan_slist_t *disconnected_cmd = &node->nodeset->channels.disconnected_cmd;
+  
+  for(cur = nchan_slist_first(cmd); cur != NULL; cur = nchan_slist_first(cmd)) {
+    nodeset_node_dissociate_chanhead(cur);
+    nchan_slist_append(disconnected_cmd, cur);
+    cur->redis.slist.in_disconnected_cmd_list = 1;
+    if(cur->status == READY) {
+      cur->status = NOTREADY;
+    }
+  }
+  for(cur = nchan_slist_first(pubsub); cur != NULL; cur = nchan_slist_first(pubsub)) {
+    redis_chanhead_set_pubsub_status(cur, NULL, REDIS_PUBSUB_UNSUBSCRIBED);
+  }
+  
+  redis_node_stats_detach(node);
+  
+  return 1;
+}
+
+void node_set_role(redis_node_t *node, redis_node_role_t role) {
+  if(node->role == role) {
+    return;
+  }
+  node->role = role;
+  redis_node_t  **cur;
+  switch(node->role) {
+    case REDIS_NODE_ROLE_ANY:
+      node_log_error(node, "tried setting role to REDIS_NODE_ROLE_ANY. That's not allowed");
+      //invalid role should never be called.
+      raise(SIGABRT);
+      break;
+    case REDIS_NODE_ROLE_UNKNOWN:
+      if(node->peers.master) {
+        node_remove_peer(node->peers.master, node);
+        DBG("removed %p from peers of %p", node->peers.master, node);
+        node->peers.master = NULL;
+      }
+      for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
+        node_remove_peer(*cur, node);
+      }
+      nchan_list_empty(&node->peers.slaves);
+      break;
+    
+    case REDIS_NODE_ROLE_MASTER:
+      if(node->peers.master) {
+        node_remove_peer(node->peers.master, node);
+        node->peers.master = NULL;
+      }
+      break;
+    
+    case REDIS_NODE_ROLE_SLAVE:
+      //do nothing
+      break;
+      
+  }
+}
+
+redis_node_t *node_find_slave_node(redis_node_t *node, redis_node_t *slave) {
+  redis_node_t **cur;
+  for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
+    if (*cur == slave) {
+      return slave;
+    }
+  }
+  return NULL;
+}
+
+int node_set_master_slave_relationship(redis_node_t *master, redis_node_t *slave) {
+  
+  //set the slave's master
+  if(slave->peers.master && slave->peers.master != master) {
+    node_remove_slave_node(master, slave);
+  }
+  slave->peers.master = master;
+  
+  //add slave to master's list of slaves. idempotently, of course
+  if(!node_find_slave_node(master, slave)) {
+    redis_node_t **slaveref;
+    slaveref = nchan_list_append(&master->peers.slaves);
+    *slaveref = slave;
+  }
+  
+  return 1;
+}
+
+int node_remove_slave_node(redis_node_t *node, redis_node_t *slave) {
+  if(!node_find_slave_node(node, slave)) {
+    nchan_list_remove(&node->peers.slaves, slave);
+  }
+  return 1;
+}
+
+static int node_parseinfo_set_preallocd_str(redis_node_t *node, ngx_str_t *target, const char *info, const char *linestart, size_t maxlen) {
+  ngx_str_t found;
+  if(nchan_get_rest_of_line_in_cstr(info, linestart, &found)) {
+    if(found.len > maxlen) {
+      node_log_error(node, "\"%s\" is too long", linestart);
+      return 0;
+    }
+    else {
+      target->len = found.len;
+      ngx_memcpy(target->data, found.data, found.len);
+      return 1;
+    }
+  }
+  return 0;
+}
+
+static int node_parseinfo_set_run_id(redis_node_t *node, const char *info) {
+  return node_parseinfo_set_preallocd_str(node, &node->run_id, info, "run_id:", MAX_RUN_ID_LENGTH);
+}
+
+static int node_connector_loadscript_reply_ok(redis_node_t *node, redis_lua_script_t *script, redisReply *reply) {
+  if (reply == NULL) {
+    node_log_error(node, "missing reply after loading Redis Lua script %s", script->name);
+    return 0;
+  }
+  switch(reply->type) {
+    case REDIS_REPLY_ERROR:
+      node_log_error(node, "failed loading Redis Lua script %s: %s", script->name, reply->str);
+      return 0;
+    
+    case REDIS_REPLY_STRING:
+      if(ngx_strncmp(reply->str, script->hash, REDIS_LUA_HASH_LENGTH)!=0) {
+        node_log_error(node, "Lua script %s has unexpected hash %s (expected %s)", script->name, reply->str, script->hash);
+        return 0;
+      }
+      else {
+        return 1;
+      }
+      break;
+      
+    default:
+      node_log_error(node, "unexpected reply type while loading Redis Lua script %s", script->name);
+      return 0;
+  }
+}
+
+static void redis_nginx_unexpected_disconnect_event_handler(const redisAsyncContext *ac, int status) {
+  redis_node_t    *node = ac->data;
+  //char            *which_ctx;
+  //DBG("unexpected disconnect event handler ac %p", ac);
+  if(node) {
+    if(node->ctx.cmd == ac) {
+      //which_ctx = "cmd";
+      node->ctx.cmd = NULL;
+    }
+    else if(node->ctx.pubsub == ac) {
+      node->ctx.pubsub = NULL;
+      //which_ctx = "pubsub";
+    }
+    else {
+      node_log_error(node, "unknown redisAsyncContext disconnected");
+      //which_ctx = "unknown";
+    }
+    
+    if(node->state >= REDIS_NODE_READY && !ngx_exiting && !ngx_quit) {
+      if(ac->err) {
+        node_log_error(node, "connection lost: %s.", ac->errstr);
+      }
+      else {
+        node_log_error(node, "connection lost");
+      }
+    }
+    node_disconnect(node, REDIS_NODE_FAILED);
+    nodeset_examine(node->nodeset);
+  }
+}
+
+static void redis_nginx_connect_event_handler(const redisAsyncContext *ac, int status) {
+  node_connector_callback((redisAsyncContext *)ac, NULL, ac->data);
+}
+
+static redisAsyncContext *node_connect_context(redis_node_t *node) {
+  redisAsyncContext       *ac = NULL;
+  redis_connect_params_t  *rcp = &node->connect_params;
+  u_char                   hostchr[1024] = {0};
+    if(rcp->hostname.len >= 1023) {
+    node_log_error(node, "redis hostname is too long");
+    return NULL;
+  }
+  ngx_memcpy(hostchr, rcp->hostname.data, rcp->hostname.len);
+  ac = redisAsyncConnect((const char *)hostchr, rcp->port);
+  if (ac == NULL) {
+    node_log_error(node, "count not allocate Redis context");
+    return NULL;
+  }
+  if(ac->err) {
+    node_log_error(node, "could not create Redis context: %s", ac->errstr);
+    redisAsyncFree(ac);
+    return NULL;
+  }
+  
+#if (NGX_OPENSSL)
+  if(node->nodeset->settings.tls.enabled) {
+    SSL *ssl = SSL_new(node->nodeset->ssl_context);
+    if (!ssl) {
+      redisAsyncFree(ac);
+      node_log_error(node, "Failed to create SSL object");
+      return NULL;
+    }
+    
+    if (node->nodeset->settings.tls.server_name.len > 0 && !SSL_set_tlsext_host_name(ssl, (char *)node->nodeset->settings.tls.server_name.data)) {
+        node_log_error(node, "Failed to configure SSL server name");
+        SSL_free(ssl);
+        redisAsyncFree(ac);
+        return NULL;
+    }
+    
+    if(redisInitiateSSL(&ac->c, ssl) != REDIS_OK) {
+      node_log_error(node, "could not initialize Redis SSL context: %s", (ac->errstr ? ac->errstr : "unknown error"));
+      redisAsyncFree(ac);
+      return NULL;
+    }
+  }
+#endif
+  
+  if(redis_nginx_event_attach(ac) != REDIS_OK) {
+    node_log_error(node, "could not attach Nginx events");
+    redisAsyncFree(ac);
+    return NULL;
+  }
+    
+  ac->data = node;
+  
+  redisAsyncSetConnectCallback(ac, redis_nginx_connect_event_handler);
+  redisAsyncSetDisconnectCallback(ac, redis_nginx_unexpected_disconnect_event_handler);
+  return ac;
+}
+
+redisContext *node_connect_sync_context(redis_node_t *node) {
+  redisReply              *reply;
+  redisContext            *c;
+  redis_connect_params_t  *rcp = &node->connect_params;
+  u_char                   hostchr[1024] = {0};
+    if(rcp->hostname.len >= 1023) {
+    node_log_error(node, "redis hostname is too long");
+    return NULL;
+  }
+  ngx_memcpy(hostchr, rcp->hostname.data, rcp->hostname.len);
+  
+  c = redisConnect((const char *)hostchr, rcp->port);
+  if(c == NULL) {
+    node_log_error(node, "could not connect synchronously to Redis");
+    return NULL;
+  }
+  else if(c->err) {
+    node_log_error(node, "could not connect synchronously to Redis: %s", c->errstr);
+    redisFree(c);
+    return NULL;
+  }
+  
+#if (NGX_OPENSSL)
+  if(node->nodeset->settings.tls.enabled) {
+    
+    SSL *ssl = SSL_new(node->nodeset->ssl_context);
+    if (!ssl) {
+      redisFree(c);
+      node_log_error(node, "could not connect synchronously to Redis: Failed to create SSL object");
+      return NULL;
+    }
+    
+    if (node->nodeset->settings.tls.server_name.len > 0 && !SSL_set_tlsext_host_name(ssl, (char *)node->nodeset->settings.tls.server_name.data)) {
+      node_log_error(node, "could not connect synchronously to Redis: Failed to configure SSL server name");
+      SSL_free(ssl);
+      redisFree(c);
+      return NULL;
+    }
+    
+    if(redisInitiateSSL(c, ssl) != REDIS_OK) {
+      node_log_error(node, "could not initialize Redis SSL context: %s", c->errstr);
+      SSL_free(ssl);
+      redisFree(c);
+      return NULL;
+    }
+  }
+#endif
+
+  if(rcp->password.len > 0) {
+    if(rcp->username.len > 0) {
+      reply = redisCommand(c, "AUTH %b %b", rcp->username.data, rcp->username.len, rcp->password.data, rcp->password.len);
+    }
+    else {
+      reply = redisCommand(c, "AUTH %b", rcp->password.data, rcp->password.len);
+    }
+    if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+      node_log_error(node, "could not connect synchronously to Redis: bad password");
+      redisFree(c);
+      return NULL;
+    }
+  }
+  if(rcp->db != -1) {
+    reply = redisCommand(c, "SELECT %d", rcp->db);
+    if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+      node_log_error(node, "could not connect synchronously to Redis: bad database number");
+      redisFree(c);
+      return NULL;
+    }
+  }
+  
+  return c;
+}
+
+static nchan_redis_ip_range_t *node_ip_blacklisted(redis_nodeset_t *ns, redis_connect_params_t *rcp) {
+  struct addrinfo *res;
+  char hostname_buf[128];
+  ngx_memzero(hostname_buf, sizeof(hostname_buf));
+  ngx_memcpy(hostname_buf, rcp->hostname.data, rcp->hostname.len);
+  
+  if(getaddrinfo(hostname_buf, NULL, NULL, &res) != 0) {
+    nodeset_log_error(ns, "Failed to getaddrinfo for hostname %V while deciding if IP is blacklisted");
+    return NULL;
+  }
+  int fam = res->ai_family;
+  union {
+    struct in_addr  ipv4;
+#ifdef AF_INET6
+    struct in6_addr ipv6;
+#endif
+  } addr;
+  
+  if(res->ai_family == AF_INET) {
+    addr.ipv4 = ((struct sockaddr_in *)res->ai_addr)->sin_addr;
+  }
+#ifdef AF_INET6
+  else if(res->ai_family == AF_INET6) {
+    addr.ipv6 = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
+  }
+#endif
+  freeaddrinfo(res);
+  int i;
+  for(i=0; i < ns->settings.blacklist.count; i++) {
+    nchan_redis_ip_range_t *entry = &ns->settings.blacklist.list[i];
+    if(entry->family != fam) {
+      continue;
+    }
+    if(fam == AF_INET) {
+      if(entry->addr_block.ipv4.s_addr == (addr.ipv4.s_addr & entry->mask.ipv4.s_addr)) {
+        return entry;
+      }
+    }
+#ifdef AF_INET6
+    else if(fam == AF_INET6) {
+      unsigned           j;
+      struct in6_addr    buf = addr.ipv6;
+      uint8_t           *masked_addr = entry->addr_block.ipv6.s6_addr;
+      uint8_t           *mask = entry->mask.ipv6.s6_addr;
+      
+      for(j=0; j<sizeof(entry->addr_block.ipv6.s6_addr); j++) {
+        masked_addr[j] &= mask[j];
+      }
+      
+      if(memcmp(entry->addr_block.ipv6.s6_addr, &buf, sizeof(buf)) == 0) {
+        return entry;
+      }
+    }
+#endif
+  }
+  
+  return NULL;
+}
+
+static int node_discover_slaves_from_info_reply(redis_node_t *node, redisReply *reply) {
+  redis_connect_params_t   *rcp;
+  size_t                    i, n;
+  if(!(rcp = parse_info_slaves(node, reply->str, &n))) {
+    return 0;
+  }
+  for(i=0; i<n; i++) {
+    nchan_redis_ip_range_t *matched = node_ip_blacklisted(node->nodeset, &rcp[i]);
+    if(matched) {
+      nodeset_log_notice(node->nodeset, "Skipping slave node %V blacklisted by %V", &rcp->hostname, &matched->str);
+    }
+    else {
+      node_discover(node, &rcp[i], REDIS_NODE_ROLE_SLAVE);
+    }
+  }
+  return 1;
+}
+
+int nodeset_node_keyslot_changed(redis_node_t *node, const char *reason) {
+  
+  char errstr[512];
+  if(reason) {
+    ngx_snprintf((u_char *)errstr, 512, "cluster keyspace needs to be updated as reported by node %V:%d (%s)%Z", &(node)->connect_params.hostname, node->connect_params.port, reason);
+  }
+  else {
+    ngx_snprintf((u_char *)errstr, 512, "cluster keyspace needs to be updated as reported by node %V:%d%Z", &(node)->connect_params.hostname, node->connect_params.port);
+  }
+  nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, errstr);
+  return 1;
+}
+
+int nodeset_node_reply_keyslot_ok(redis_node_t *node, redisReply *reply) {
+  if(reply && reply->type == REDIS_REPLY_ERROR) {
+    char    *script_nonlocal_key_error = "Lua script attempted to access a non local key in a cluster node";
+    char    *script_nonlocal_key_error_redis_7 = "ERR Script attempted to access a non local key in a cluster node";
+    char    *script_error_start = "ERR Error running script";
+    char    *command_move_error = "MOVED ";
+    char    *command_ask_error = "ASK ";
+    
+    if((nchan_cstr_startswith(reply->str, script_error_start) && nchan_strstrn(reply->str, script_nonlocal_key_error))
+     || nchan_cstr_startswith(reply->str, script_nonlocal_key_error_redis_7)
+     || nchan_cstr_startswith(reply->str, command_move_error)
+     || nchan_cstr_startswith(reply->str, command_ask_error)) {
+      if(!node) {
+        nchan_log_error("Got a keyslot error from Redis on a NULL node");
+      }
+      else if(!node->cluster.enabled) {
+        node_log_error(node, "got a cluster error on a non-cluster redis connection: %s", reply->str);
+        node_disconnect(node, REDIS_NODE_FAILED);
+        nodeset_set_status(node->nodeset, REDIS_NODESET_CLUSTER_FAILING, "Strange response from node");
+      }
+      else {
+        nodeset_node_keyslot_changed(node, "keyslot error in response");
+      }
+      return 0;
+    }
+  }
+  return 1;
+}
+
+int nodeset_node_can_retry_commands(redis_node_t *node) {
+  if(!node) {
+    return 0;
+  }
+  
+  return node->nodeset->settings.retry_commands;
+}
+
+static void node_subscribe_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                 *reply = rep;
+  redis_node_t               *node = privdata;
+  if(node->state == REDIS_NODE_SUBSCRIBING_WORKER) {
+    node_connector_callback(ac, rep, privdata);
+  }
+  else if(reply && reply->type == REDIS_REPLY_ARRAY && reply->elements == 3
+   && reply->element[0]->type == REDIS_REPLY_STRING 
+   && reply->element[1]->type == REDIS_REPLY_STRING
+   && reply->element[2]->type == REDIS_REPLY_STRING
+   && strcmp(reply->element[0]->str, "message") == 0
+   && strcmp(reply->element[1]->str, redis_worker_id) == 0
+   && strcmp(reply->element[2]->str, "ping") == 0
+  ) {
+    node_log_debug(node, "received PUBSUB ping message");
+  }
+  else {
+    redis_subscribe_callback(ac, rep, privdata);
+  }
+}
+
+static int node_unset_cluster_slots(redis_node_t *node) {
+  int success = 1;
+  if(node->cluster.slot_range.indexed) {
+    success &= nodeset_cluster_node_unindex_keyslot_ranges(node);
+  }
+  if(node->cluster.slot_range.range) {
+    ngx_free(node->cluster.slot_range.range);
+  }
+  node->cluster.slot_range.range = NULL;
+  node->cluster.slot_range.n = 0;
+  return success;
+}
+
+static int node_set_cluster_slots(redis_node_t *node, cluster_nodes_line_t *l, char *errbuf, size_t max_err_len) {
+  redis_node_t       *conflict_node;
+  
+  node_unset_cluster_slots(node);
+  
+  size_t                 j;
+  if(l->slot_ranges_count == 0) {
+    ngx_snprintf((u_char *)errbuf, max_err_len, "Tried to set cluster slots with 0 slots assigned for node %s%Z", node_cstr(node));
+    goto fail;
+  }
+  
+  node->cluster.slot_range.n = l->slot_ranges_count;
+  node->cluster.slot_range.range = ngx_alloc(sizeof(redis_slot_range_t) * node->cluster.slot_range.n, ngx_cycle->log);
+  if(!node->cluster.slot_range.range) {
+    ngx_snprintf((u_char *)errbuf, max_err_len, "failed allocating cluster slots range%Z");
+    goto fail;
+  }
+  if(!parse_cluster_node_slots(l, node->cluster.slot_range.range)) {
+    ngx_snprintf((u_char *)errbuf, max_err_len, "failed parsing cluster slots range");
+    goto fail;
+  }
+  
+  for(j = 0; j<node->cluster.slot_range.n; j++) {
+    redis_slot_range_t r = node->cluster.slot_range.range[j];
+    if((conflict_node = nodeset_node_find_by_range(node->nodeset, &r)) != NULL) {
+      if(node == conflict_node) {
+        ngx_snprintf((u_char *)errbuf, max_err_len, "keyslot range conflicts with itself. This is very strange indeed.");
+      }
+      else {
+        
+        ngx_snprintf((u_char *)errbuf, max_err_len, "keyslot range [%d-%d] conflict with node %s. These nodes are probably from different clusters.%Z", r.min, r.max, node_cstr(conflict_node));
+      }
+      goto fail;
+    }
+  }
+  
+  if(!nodeset_cluster_node_index_keyslot_ranges(node)) {
+    ngx_snprintf((u_char *)errbuf, max_err_len, "indexing keyslot ranges failed");
+    goto fail;
+  }
+  
+  return 1;
+  
+fail:
+  if(node->cluster.slot_range.range) {
+    ngx_free(node->cluster.slot_range.range);
+    node->cluster.slot_range.range = NULL;
+  }
+  return 0;
+}
+
+static int node_redis_version_ok(char *info_reply, char *err, size_t maxerrlen) {
+  ngx_str_t versionstart = ngx_string("redis_version:");
+  char *cur = info_reply;
+  if(!nchan_strscanstr((u_char **)&cur, &versionstart, (u_char *)&cur[strlen(cur)])) {
+    ngx_snprintf((u_char *)err, maxerrlen, "INFO reply missing redis_version");
+    return 0;
+  }  
+  return 1;
+}
+
+static void node_connector_connect_timeout(void *pd) {
+  redis_node_t  *node = pd;
+  node->connect_timeout = NULL;
+  if(node->state == REDIS_NODE_CMD_CONNECTING || node->state == REDIS_NODE_PUBSUB_CONNECTING) {
+    //onConnect won't be fired, so the connector must be called manually
+    node->state = REDIS_NODE_CONNECTION_TIMED_OUT;
+    node_connector_callback(NULL, NULL, node);
+  }
+  else {
+    node_disconnect(node, REDIS_NODE_CONNECTION_TIMED_OUT);
+  }
+}
+
+static void node_connector_callback(redisAsyncContext *ac, void *rep, void *privdata) {
+  redisReply                 *reply = rep;
+  redis_node_t               *node = privdata;
+  redis_nodeset_t            *nodeset = node->nodeset;
+  char                        errstr[1024];
+  redis_connect_params_t     *cp = &node->connect_params;
+  node_log_debug(node, "node_connector_callback state %d", node->state);
+  ngx_str_t                   rest;
+  redis_lua_script_t         *scripts = (redis_lua_script_t *)&redis_lua_scripts;
+  
+  switch(node->state) {
+    case REDIS_NODE_CONNECTION_TIMED_OUT:
+      return node_connector_fail(node, "connection timed out");
+      break;
+    case REDIS_NODE_FAILED:
+    case REDIS_NODE_DISCONNECTED:
+      node_command_time_start(node, NCHAN_REDIS_CMD_CONNECT);
+      assert(!node->connect_timeout);
+      if((node->ctx.cmd = node_connect_context(node)) == NULL) { //always connect the cmd ctx to the hostname
+        return node_connector_fail(node, "failed to open redis async context for cmd");
+      }
+      else if(cp->peername.len == 0) { //don't know peername yet
+        set_preallocated_peername(node->ctx.cmd, &cp->peername);
+      }
+      node->connect_timeout = nchan_add_oneshot_timer(node_connector_connect_timeout, node, nodeset->settings.node_connect_timeout);
+      node->state = REDIS_NODE_CMD_CONNECTING;
+      break; //wait until the onConnect callback brings us back
+      
+    case REDIS_NODE_CMD_CONNECTING:
+      if(ac->err || ac->c.err) {
+        node->ctx.cmd = NULL; //to avoid calling redisAsyncFree on the ctx during node_disconnect()
+        //(it will be called automatically when this function returns control back to hiredis
+        return node_connector_fail(node, ac->errstr);
+      }
+      if((node->ctx.pubsub = node_connect_context(node)) == NULL) {
+        return node_connector_fail(node, "failed to open redis async context for pubsub");
+      }
+      node->state++;
+      break; //wait until the onConnect callback brings us back
+    
+    case REDIS_NODE_PUBSUB_CONNECTING:
+      if(ac->err || ac->c.err) {
+        node->ctx.pubsub = NULL; //to avoid calling redisAsyncFree on the ctx during node_disconnect()
+        //(it will be called automatically when this function returns control back to hiredis
+        ngx_snprintf((u_char *)errstr, 1024, "(pubsub) %s%Z", ac->errstr);
+        return node_connector_fail(node, errstr);
+      }
+      //connection established. move on...   
+      node->state++;
+      /* fall through */
+      
+    case REDIS_NODE_CMD_CHECKING_CONNECTION:
+      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "PING");
+      node->state++;
+      break;
+      
+    case REDIS_NODE_CMD_CHECKED_CONNECTION:
+      //Was the ping ok? it's alright if there was an AUTH error, as long as we have a response
+      if(!reply || ac->err) {
+        return node_connector_fail(node, NULL);
+      }
+      if(reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")  && cp->password.len == 0) {
+        return node_connector_fail(node, "server expects a password, but none was configured");
+      }
+      node->state++;
+      /* fall through */
+      
+    case REDIS_NODE_PUBSUB_CHECKING_CONNECTION:
+      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "PING");
+      node->state++;
+      break;
+      
+    case REDIS_NODE_PUBSUB_CHECKED_CONNECTION:
+      if(!reply || ac->err) {
+        return node_connector_fail(node, NULL);
+      }
+      if(reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")  && cp->password.len == 0) {
+        return node_connector_fail(node, "server expects a password, but none was configured");
+      }
+      node->state++;
+      /* fall through */
+      
+    case REDIS_NODE_CONNECTED:
+      //now we need to authenticate maybe?
+      if(cp->password.len > 0) {
+        if(!node->ctx.cmd) {
+          return node_connector_fail(node, "cmd connection missing, can't send AUTH command");
+        }
+        if(cp->username.len > 0) {
+          redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "AUTH %b %b", STR(&cp->username), STR(&cp->password));
+        }
+        else {
+          redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "AUTH %b", STR(&cp->password));
+        }
+        node->state++;
+      }
+      else {
+        node->state = REDIS_NODE_SELECT_DB;
+        return node_connector_callback(NULL, NULL, node); //continue as if authenticated
+      }
+      break;
+      
+    case REDIS_NODE_CMD_AUTHENTICATING:
+      if(!reply_status_ok(reply)) {
+        return node_connector_fail(node, "AUTH command failed");
+      }
+      if(!node->ctx.pubsub) {
+        return node_connector_fail(node, "pubsub connection missing, can't send AUTH command");
+      }
+      //now authenticate pubsub ctx
+      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "AUTH %b", STR(&cp->password));
+      node->state++;
+      break;
+    
+    case REDIS_NODE_PUBSUB_AUTHENTICATING:
+      if(!reply_status_ok(reply)) {
+        return node_connector_fail(node, "AUTH command failed");
+      }
+      node->state++;
+      /* fall through */
+    case REDIS_NODE_SELECT_DB:
+      if(cp->db > 0) {
+        if(!node->ctx.cmd) {
+          return node_connector_fail(node, "cmd connection missing, SELECT command");
+        }
+        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "SELECT %d", cp->db);
+        node->state++;
+      }
+      else {
+        node->state = REDIS_NODE_SCRIPTS_LOAD;
+        return node_connector_callback(NULL, NULL, node);
+      }
+      break;
+    
+    case REDIS_NODE_CMD_SELECTING_DB:
+      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "Redis SELECT command failed,");
+      }
+      if(!node->ctx.cmd) {
+        return node_connector_fail(node, "pubsub connection missing, can't send SELECT command");
+      }
+      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "SELECT %d", cp->db);
+      node->state++;
+      break;
+    
+    case REDIS_NODE_PUBSUB_SELECTING_DB:
+      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "Redis SELECT command failed,");
+      }
+      node->state++; // fallthru
+      /* fall through */
+    case REDIS_NODE_SCRIPTS_LOAD:
+      if(!node->ctx.cmd) {
+        return node_connector_fail(node, "cmd connection missing, can't send SCRIPT EXISTS command");
+      }
+      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "SCRIPT EXISTS " REDIS_LUA_SCRIPTS_ALL_HASHES);
+      node->state++;
+      break;
+    
+    case REDIS_NODE_SCRIPTS_LOADED_CHECK: {
+      int   i;
+      if(!reply_array_ok(reply)) {
+        return node_connector_fail(node, "SCRIPT EXISTS failed,");
+      }
+      if(reply->elements != REDIS_LUA_SCRIPTS_COUNT) {
+        return node_connector_fail(node, "SCRIPT EXISTS returned wrong number of elements");
+      }
+      for(i=0; i<REDIS_LUA_SCRIPTS_COUNT; i++) {
+        if(!reply_integer_ok(reply->element[i])) {
+          return node_connector_fail(node, "SCRIPT EXISTS returned non-integer element type");
+        }
+        if(nodeset->settings.load_scripts_unconditionally) {
+          node->scripts_load_state.loaded[i]=0;
+        }
+        else {
+          node->scripts_load_state.loaded[i]=reply->element[i]->integer;
+        }
+      }
+      node->scripts_load_state.loading = 0;
+      node->scripts_load_state.current = 0;
+      node->state++;//fallthru
+    }
+    /* fall through */
+    case REDIS_NODE_SCRIPTS_LOADING: {
+      uint8_t             *current = &node->scripts_load_state.current;
+      if(node->scripts_load_state.loading) {
+        //already loading. check response from previous load
+        if(!node_connector_loadscript_reply_ok(node, &scripts[*current], reply)) {
+          return node_connector_fail(node, "SCRIPT LOAD failed,");
+        }
+        assert(node->scripts_load_state.loaded[*current] == 0);
+        node->scripts_load_state.loaded[*current] = 1;
+        (*current)++;
+      }
+      
+      node->scripts_load_state.loading = 1;
+      
+      //skip to next non-loaded script
+      while(*current < REDIS_LUA_SCRIPTS_COUNT) {
+        if(!node->scripts_load_state.loaded[*current]) {
+          break;
+        }
+        (*current)++;
+      }
+      
+      if(*current < REDIS_LUA_SCRIPTS_COUNT) {
+        if(!node->ctx.cmd) {
+          return node_connector_fail(node, "cmd connection missing, can't send SCRIPT LOAD command");
+        }
+        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "SCRIPT LOAD %s", scripts[*current].script);
+        break;
+      }
+      else {
+        //we're done here
+        node->scripts_load_state.loading = 0;
+        node_log_debug(node, "all scripts loaded");
+        node->state++;
+      }
+    }
+    /* fall through */
+    case REDIS_NODE_GET_INFO:
+      //getinfo time
+      if(!node->ctx.cmd) {
+        return node_connector_fail(node, "cmd connection missing, can't send INFO ALL command");
+      }
+      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "INFO ALL");
+      node->state++;
+      break;
+      
+    case REDIS_NODE_GETTING_INFO:
+      if(reply && reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")) {
+        return node_connector_fail(node, "authentication required");
+      }
+      else if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "INFO command failed");
+      }
+      else if(!node_parseinfo_set_run_id(node, reply->str)) {
+        return node_connector_fail(node, "failed to set node run_id");
+      }
+      else if(nodeset_node_deduplicate_by_run_id(node)) {
+        // this node already exists
+        // the deduplication has deleted it; we're done here.
+        // commence rejoicing.
+        return;
+      }
+      
+      
+      if(!node_redis_version_ok(reply->str, errstr, sizeof(errstr))) {
+        return node_connector_fail(node, errstr);
+      }
+      
+      if(nchan_cstr_match_line(reply->str, "loading:1")) {
+        return node_connector_fail(node, "is busy loading data...");
+      }
+      
+      if(nchan_cstr_match_line(reply->str, "cluster_enabled:1")) {
+        node->cluster.enabled = 1;
+      }
+      
+      ngx_str_t found_role;
+      nchan_get_rest_of_line_in_cstr(reply->str, "role:", &found_role);
+      if(cp->forced_role == REDIS_FORCED_ROLE_MASTER) {
+        if(!nchan_strmatch(&found_role, 1, "master")) {
+          node_log_notice(node, "overriding redis role to \"master\" instead of \"%V\"", &found_role);
+        }
+        else {
+          node_log_notice(node, "setting redis role to \"master\"");
+        }
+        node_set_role(node, REDIS_NODE_ROLE_MASTER);
+      }
+      else if(cp->forced_role == REDIS_FORCED_ROLE_SLAVE) {
+        if(!nchan_strmatch(&found_role, 1, "slave")) {
+          node_log_notice(node, "overriding redis role to \"slave\" instead of \"%V\"", &found_role);
+        }
+        else {
+          node_log_notice(node, "setting redis role to \"slave\"");
+        }
+        node_set_role(node, REDIS_NODE_ROLE_SLAVE);
+      }
+      else {
+        if(nchan_strmatch(&found_role, 1, "master")) {
+          node_set_role(node, REDIS_NODE_ROLE_MASTER);
+          
+        }
+        else if(nchan_strmatch(&found_role, 1, "slave")) {
+          node_set_role(node, REDIS_NODE_ROLE_SLAVE);
+        }
+        else {
+          return node_connector_fail(node, "can't tell if node is master or slave");
+        }
+      }
+      
+      if(node->role == REDIS_NODE_ROLE_MASTER) {
+        if(!node->cluster.enabled && !node_discover_slaves_from_info_reply(node, reply)) {
+          return node_connector_fail(node, "failed parsing slaves from INFO");
+        }
+      }
+      else if(node->role == REDIS_NODE_ROLE_SLAVE) {
+          redis_connect_params_t   *rcp;
+        if(!(rcp = parse_info_master(node, reply->str))) {
+          return node_connector_fail(node, "failed parsing master from INFO");
+        }
+        if(!node->cluster.enabled) {
+          node_discover(node, rcp, REDIS_NODE_ROLE_MASTER);
+        }
+      }
+      
+      node->state++;
+      /* fall through */
+    case REDIS_NODE_PUBSUB_GET_INFO:
+      if(!node->ctx.pubsub) {
+        return node_connector_fail(node, "cmd connection missing, can't send INFO SERVER command");
+      }
+      redisAsyncCommand(node->ctx.pubsub, node_connector_callback, node, "INFO SERVER");
+      node->state++;
+      break;
+      
+    case REDIS_NODE_PUBSUB_GETTING_INFO:
+      if(reply && reply->type == REDIS_REPLY_ERROR && nchan_cstr_startswith(reply->str, "NOAUTH")) {
+        return node_connector_fail(node, "authentication required");
+      }
+      else if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "INFO command failed");
+      }
+      else {
+        u_char    idbuf[MAX_RUN_ID_LENGTH];
+        ngx_str_t pubsub_run_id = {0, idbuf};
+        node_parseinfo_set_preallocd_str(node, &pubsub_run_id, reply->str, "run_id:", MAX_RUN_ID_LENGTH);
+        if(!nchan_ngx_str_match(&node->run_id, &pubsub_run_id)) {
+          return node_connector_fail(node, "IP address connects to more than one server. Is Redis behind a proxy?");
+        }
+        node->state++;
+      }
+      /* fall through */
+    case REDIS_NODE_SUBSCRIBE_WORKER:
+      if(!node->ctx.pubsub) {
+        return node_connector_fail(node, "pubsub connection missing, can't send worker SUBSCRIBE command");
+      }
+      redisAsyncCommand(node->ctx.pubsub, node_subscribe_callback, node, "SUBSCRIBE %s", redis_worker_id);
+      node->state++;
+      break;
+    
+    case REDIS_NODE_SUBSCRIBING_WORKER: 
+      if(!reply) {
+        return node_connector_fail(node, "disconnected while subscribing to worker PUBSUB channel");
+      }
+      if( reply->type != REDIS_REPLY_ARRAY || reply->elements != 3 
+       || reply->element[0]->type != REDIS_REPLY_STRING || reply->element[1]->type != REDIS_REPLY_STRING
+       || strcmp(reply->element[0]->str, "subscribe") != 0
+       || strcmp(reply->element[1]->str, redis_worker_id) != 0
+      ) {
+        return node_connector_fail(node, "failed to subscribe to worker PUBSUB channel");
+      }
+      nchan_stats_worker_incr(redis_connected_servers, 1);
+      
+      node->state++;
+      /* fall through */
+    case REDIS_NODE_GET_CLUSTERINFO:
+      if(!node->cluster.enabled) {
+        node->state = REDIS_NODE_READY;
+        return node_connector_callback(NULL, NULL, node);
+      }
+      else {
+        if(!node->ctx.cmd) {
+          return node_connector_fail(node, "cmd connection missing, can't send CLUSTER INFO command");
+        }
+        redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "CLUSTER INFO");
+        node->state++;
+      }
+      break;
+//     
+    case REDIS_NODE_GETTING_CLUSTERINFO:
+      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "CLUSTER INFO command failed");
+      }
+      if(!nchan_cstr_match_line(reply->str, "cluster_state:ok")) {
+        node->cluster.ok=0;
+        return node_connector_fail(node, "cluster_state not ok");
+      }
+      
+      if(!nchan_get_rest_of_line_in_cstr(reply->str, "cluster_current_epoch:", &rest)) {
+        return node_connector_fail(node, "CLUSTER INFO command failed to get current epoch");
+      }
+      if((node->cluster.current_epoch = ngx_atoi(rest.data, rest.len)) == NGX_ERROR) {
+        return node_connector_fail(node, "CLUSTER INFO command failed to parse current epoch number");
+      }
+      
+      //assuming this node's epoch is the cluster's epoch. we will do this for all nodes. if it turns out the epoch is wrong,
+      //Redis will mark the cluster as failing or will update the epoch for all other nodes.
+      nodeset->cluster.current_epoch = node->cluster.current_epoch;
+      node->cluster.ok=1;
+      node->state++;
+      /* fall through */
+      
+    case REDIS_NODE_GET_SHARDED_PUBSUB_SUPPORT:
+      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "COMMAND INFO SPUBLISH");
+      node->state++;
+      break;
+      
+    case REDIS_NODE_GETTING_SHARDED_PUBSUB_SUPPORT:
+      if(reply == NULL || reply->type == REDIS_REPLY_ERROR) {
+        return node_connector_fail(node, "COMMAND INFO reply not ok");
+      }
+      node->have_spublish = reply->element[0]->type == REDIS_REPLY_ARRAY;
+      node->state++;
+      /* fall through */
+      
+    case REDIS_NODE_GET_CLUSTER_NODES:
+      if(!node->ctx.cmd) {
+        return node_connector_fail(node, "cmd connection missing, can't send CLUSTER NODES command");
+      }
+      redisAsyncCommand(node->ctx.cmd, node_connector_callback, node, "CLUSTER NODES");
+      node->state++;
+      break;
+    
+    case REDIS_NODE_GETTING_CLUSTER_NODES:
+      if(!reply_str_ok(reply)) {
+        return node_connector_fail(node, "CLUSTER NODES command failed");
+      }
+      else {
+        size_t                  i, n;
+        cluster_nodes_line_t   *lines, *l;
+        if(!(lines = parse_cluster_nodes(node, reply->str, &n))) {
+          return node_connector_fail(node, "parsing CLUSTER NODES command failed");
+        }
+        for(i=0, l = lines; i<n; i++, l++) {
+          if(l->self) {
+            nchan_strcpy(&node->cluster.id, &l->id, MAX_CLUSTER_ID_LENGTH);
+            if(l->master) {
+              if(l->slot_ranges_count == 0) {
+                node_log_notice(node, "is a master cluster node with no keyslots");
+              }
+              else if(!node_set_cluster_slots(node, l, errstr, sizeof(errstr))) {
+                nodeset_dbg_log_nodes_and_clusternodes_lines(nodeset, NGX_LOG_NOTICE, lines, n);
+                return node_connector_fail(node, errstr);
+              }
+            }
+            else {
+              nchan_strcpy(&node->cluster.master_id, &l->master_id, MAX_CLUSTER_ID_LENGTH);
+            }
+          }
+          else if(!node_skip_cluster_peer(node, l, 1, 1)) {
+            node_discover_cluster_peer(node, l, NULL);
+          }
+        }
+      }
+      if(!nodeset_link_cluster_node_roles(nodeset)) {
+        return node_connector_fail(node, "failed to link all discovered cluster masters and slaves");
+      }
+      node->state = REDIS_NODE_READY;
+      //intentional fall-through is affirmatively consensual
+      //yes, i consent to being fallen through.
+      //                               Signed, 
+      //                                 REDIS_NODE_GETTING_CLUSTER_NODES
+      //NOTE: consent required each time a fallthrough is imposed
+      /* fall through */
+    case REDIS_NODE_READY:
+      node_command_time_finish(node, NCHAN_REDIS_CMD_CONNECT);
+      node_make_ready(node);
+      node->connecting = 0;
+      nodeset_examine(nodeset);
+      break;
+  }
+}
+
+
+void node_batch_command_init(node_batch_command_t *batch, redis_node_t *node, redis_node_ctx_type_t ctxtype, redisCallbackFn *fn, void *privdata, unsigned cmdc, ...) {
+  batch->node = node;
+  batch->callback = fn;
+  batch->privdata = privdata;
+  batch->cmdc = cmdc;
+  batch->argc = cmdc;
+  batch->ctxtype = ctxtype;
+  batch->commands_sent = 0;
+  
+  va_list argp;
+  va_start(argp, cmdc);
+  
+  unsigned i;
+  for(i=0; i<cmdc; i++) {
+    batch->argv[i]=va_arg(argp, const char *);
+    batch->argvlen[i]=strlen(batch->argv[i]);
+  }
+  
+  va_end(argp);
+}
+
+void node_batch_command_send(node_batch_command_t *batch) {
+  if(batch->argc <= batch->cmdc) {
+    return;
+  }
+  redisAsyncContext *redis = NULL;
+  switch(batch->ctxtype) {
+    case REDIS_NODE_CTX_COMMAND:
+      redis = batch->node->ctx.cmd;
+      break;
+    case REDIS_NODE_CTX_PUBSUB:
+      redis = batch->node->ctx.pubsub;
+      break;
+  }
+  batch->commands_sent++;
+  redisAsyncCommandArgv(redis, batch->callback, batch->privdata, batch->argc, batch->argv, batch->argvlen);
+  batch->argc=batch->cmdc;
+}
+
+int node_batch_command_add_ngx_str(node_batch_command_t *batch, const ngx_str_t *arg) {
+  return node_batch_command_add(batch, (char *)arg->data, arg->len);
+}
+
+int node_batch_command_add(node_batch_command_t *batch, const char *arg, size_t arglen) {
+  unsigned c = batch->argc++;
+  batch->argv[c]=arg;
+  batch->argvlen[c]=arglen;
+  
+  if(c+1==REDIS_NODE_BATCH_COMMAND_MAX_ARGS) {
+    node_batch_command_send(batch);
+    return 1;
+  }
+  return 0;
+}
+
+unsigned node_batch_command_times_sent(node_batch_command_t *batch) {
+  return batch->commands_sent;
+}
+
+static void node_make_ready(redis_node_t *node) {
+  node->state = REDIS_NODE_READY;
+  if(node->connect_timeout) {
+    nchan_abort_oneshot_timer(node->connect_timeout);
+    node->connect_timeout = NULL;
+  }
+  if(!node->ping_timer.timer_set && node->nodeset->settings.ping_interval > 0) {
+    ngx_add_timer(&node->ping_timer, node->nodeset->settings.ping_interval * 1000);
+  }
+  
+  if(!node->timeout.ev.timer_set && node->nodeset->settings.command_timeout > 0) {
+    ngx_add_timer(&node->timeout.ev, node->nodeset->settings.command_timeout);
+  }
+  
+  //do we have any channels that don't belong here?
+  if(node->cluster.enabled) {
+    
+    rdstore_channel_head_t *cur, *next;
+    nchan_slist_t *cmd = &node->channels.cmd;
+    nchan_slist_t *pubsub = &node->channels.pubsub;
+    
+    nchan_slist_t *disconnected_cmd = &node->nodeset->channels.disconnected_cmd;
+    int uncommanded_count = 0;
+    for(cur = nchan_slist_first(cmd); cur != NULL; cur = next) {
+      next = nchan_slist_next(cmd, cur);
+      if(node_channel_in_keyspace(node, cur)) {
+        //all good
+        continue;
+      }
+      
+      nodeset_node_dissociate_chanhead(cur);
+      nchan_slist_append(disconnected_cmd, cur);
+      cur->redis.slist.in_disconnected_cmd_list = 1;
+      if(cur->status && cur->status == READY) {
+        cur->status = NOTREADY;
+      }
+      uncommanded_count++;
+    }
+    
+    node_batch_command_t unsub;
+    /* we don't actually care about the response. if it succeeds, good. if not, it means
+      that the node had already disconnected or the subscription had become
+      invalid on the server for unknown reasons.
+      So, the response handler is NULL
+    */
+    node_batch_command_init(&unsub, node, REDIS_NODE_CTX_PUBSUB, NULL, NULL, 1, node->nodeset->use_spublish ? "SUNSUBSCRIBE" : "UNSUBSCRIBE");
+    
+    int unsubbed_count = 0;
+    for(cur = nchan_slist_first(pubsub); cur != NULL; cur = next) {
+      next = nchan_slist_next(pubsub, cur);
+      if(node_channel_in_keyspace(node, cur)) {
+        //all good
+        continue;
+      }
+      if(cur->pubsub_status == REDIS_PUBSUB_UNSUBSCRIBED) {
+        continue;
+      }
+      redis_chanhead_set_pubsub_status(cur, NULL, REDIS_PUBSUB_UNSUBSCRIBED);
+      unsubbed_count++;
+      
+      node_batch_command_add_ngx_str(&unsub, &cur->redis.pubsub_id);
+    }
+    if(unsubbed_count > 0) {
+      node_batch_command_send(&unsub);
+    }
+    int times_sent = node_batch_command_times_sent(&unsub);
+    int i;
+    for(i=0; i< times_sent; i++) {
+      node_pubsub_time_start(node, NCHAN_REDIS_CMD_PUBSUB_UNSUBSCRIBE);
+    }
+    
+    if(unsubbed_count + uncommanded_count > 0) {
+      const char *reason = "";
+      if(node->role == REDIS_NODE_ROLE_SLAVE) {
+        reason = " (the node is now a slave)";
+      }
+      else if(node->role == REDIS_NODE_ROLE_MASTER) {
+        if(node->cluster.slot_range.n == 0) {
+          reason = " (slotless master, probably on its way to becoming a slave)";
+        }
+        else {
+          reason = " (no longer in this node's keyspace)";
+        }
+      }
+      node_log_notice(node, "paused subscription on %d and publication on %d channels%s.", unsubbed_count, uncommanded_count, reason);
+    }
+  }
+  
+  if(node->recovering) {
+    node_log_notice(node, "recovered");
+  }
+  else {
+    node_log_notice(node, "%s", node->generation == 0 ? "connected" : "reconnected");
+  }
+  node->generation++;
+  node->connecting=0;
+  node->recovering=0;
+}
+
+static int nodeset_cluster_keyslot_space_complete(redis_nodeset_t *ns, int min_node_state) {
+  ngx_rbtree_node_t                  *node;
+  redis_slot_range_t                  range = {0, 0};
+  redis_nodeset_slot_range_node_t    *rangenode;
+  
+  while(range.min <= 16383) {
+    if((node = rbtree_find_node(&ns->cluster.keyslots, &range)) == NULL) {
+      DBG("cluster slots range incomplete: can't find slot %i", range.min);
+      return 0;
+    }
+    rangenode = rbtree_data_from_node(node);
+    
+    if(rangenode->node->state < min_node_state) {
+      node_log_notice(rangenode->node, "cluster node for range %d - %d not connected", rangenode->range.min, rangenode->range.max);
+      return 0;
+    }
+    if(rangenode->node->role != REDIS_NODE_ROLE_MASTER) {
+      node_log_notice(rangenode->node, "cluster node for range %d - %d is not a master. That's weird.", rangenode->range.min, rangenode->range.max);
+      return 0;
+    }
+    
+    range.min = rangenode->range.max + 1;
+    range.max = range.min;
+  }
+  DBG("cluster range complete");
+  //print_cluster_slots(cluster);
+  return 1;
+}
+
+static int nodeset_status_timer_interval(redis_nodeset_status_t status) {
+  switch(status) {
+    case REDIS_NODESET_FAILED:
+    case REDIS_NODESET_INVALID:
+    case REDIS_NODESET_DISCONNECTED:
+      return 500;
+    case REDIS_NODESET_FAILING:
+    case REDIS_NODESET_CLUSTER_FAILING:
+      return 300;
+    case REDIS_NODESET_CONNECTING:
+      return 1000;
+    case REDIS_NODESET_READY:
+      return 10000;
+  }
+  return 500; //default?
+}
+
+static void nodeset_onready_expire_event(ngx_event_t *ev) {
+  nodeset_onready_callback_t *rcb = ev->data;
+  rcb->cb(rcb->ns, rcb->pd);
+  nchan_list_remove(&rcb->ns->onready_callbacks, rcb);
+}
+
+ngx_int_t nodeset_callback_on_ready(redis_nodeset_t *ns, ngx_int_t (*cb)(redis_nodeset_t *, void *), void *pd) {
+  nodeset_onready_callback_t *ncb;
+  
+  ngx_msec_t max_wait = ns->settings.retry_commands_max_wait;
+  
+  if(ns->status == REDIS_NODESET_READY) {
+    cb(ns, pd);
+    return NGX_OK;
+  }
+  
+  ncb = nchan_list_append(&ns->onready_callbacks);
+  if(ncb == NULL) {
+    ERR("failed to add to onready_callback list");
+    return NGX_ERROR;
+  }
+  
+  ncb->cb = cb;
+  ncb->pd = pd;
+  ncb->ns = ns;
+  ngx_memzero(&ncb->ev, sizeof(ncb->ev));
+  if(max_wait > 0) {
+    nchan_init_timer(&ncb->ev, nodeset_onready_expire_event, ncb);
+    ngx_add_timer(&ncb->ev, max_wait);
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nodeset_run_on_ready_callbacks(redis_nodeset_t *ns) {
+  nodeset_onready_callback_t *rcb;
+  for(rcb = nchan_list_first(&ns->onready_callbacks); rcb != NULL; rcb = nchan_list_next(rcb)) {
+    if(rcb->ev.timer_set) {
+      ngx_del_timer(&rcb->ev);
+    }
+    rcb->cb(ns, rcb->pd);
+  }
+  nchan_list_empty(&ns->onready_callbacks);
+  return NGX_OK;
+}
+
+ngx_int_t nodeset_abort_on_ready_callbacks(redis_nodeset_t *ns) {
+  nodeset_onready_callback_t *rcb;
+  for(rcb = nchan_list_first(&ns->onready_callbacks); rcb != NULL; rcb = nchan_list_next(rcb)) {
+    if(rcb->ev.timer_set) {
+      ngx_del_timer(&rcb->ev);
+    }
+    rcb->cb(ns, rcb->pd);
+  }
+  nchan_list_empty(&ns->onready_callbacks);
+  return NGX_OK;
+}
+
+static ngx_int_t update_chanhead_status_on_reconnect(rdstore_channel_head_t *ch) {
+  if(ch->redis.node.cmd && ch->redis.node.pubsub && ch->pubsub_status == REDIS_PUBSUB_SUBSCRIBED && ch->status == NOTREADY) {
+    ch->status = READY;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nodeset_reconnect_disconnected_channels(redis_nodeset_t *ns) {
+  rdstore_channel_head_t *cur;
+  nchan_slist_t *disconnected_cmd = &ns->channels.disconnected_cmd;
+  nchan_slist_t *disconnected_pubsub = &ns->channels.disconnected_pubsub;
+  assert(nodeset_ready(ns));
+  int cmd_count=0, pubsub_count=0;
+  while((cur = nchan_slist_pop(disconnected_cmd)) != NULL) {
+    cmd_count++;
+    assert(cur->redis.node.cmd == NULL);
+    cur->redis.slist.in_disconnected_cmd_list = 0;
+    assert(nodeset_node_find_by_chanhead(cur)); // this reuses the linked-list fields
+    update_chanhead_status_on_reconnect(cur);
+  }
+  
+  while((cur = nchan_slist_pop(disconnected_pubsub)) != NULL) {
+    pubsub_count++;
+    assert(cur->redis.node.pubsub == NULL);
+    cur->redis.slist.in_disconnected_pubsub_list = 0;
+    assert(nodeset_node_pubsub_find_by_chanhead(cur)); // this reuses the linked-list fields
+    redis_chanhead_catch_up_after_reconnect(cur);
+    ensure_chanhead_pubsub_subscribed_if_needed(cur);
+    update_chanhead_status_on_reconnect(cur);
+  }
+  
+  if(cmd_count + pubsub_count > 0) {
+    nodeset_log_notice(ns, "resume subscription on %d and publication on %d channels", pubsub_count, cmd_count);
+  }
+  return NGX_OK;
+}
+
+static int nodeset_set_name_alloc(redis_nodeset_t *nodeset) {
+  ngx_str_t  *name = NULL;
+  if(nodeset->upstream) {
+    nodeset->name_type = "upstream";
+    name = &nodeset->upstream->host;
+  }
+  else {
+    nodeset->name_type = "host";
+    ngx_str_t **url = nchan_list_first(&nodeset->urls);
+    if(url && *url) {
+      name = *url;
+    }
+  }
+  
+  if(name == NULL || name->len == 0) {
+    nodeset->name = nchan_redis_blankname;
+    return 1;
+  }
+  
+  char *namebuf = ngx_alloc(name->len+1, ngx_cycle->log);
+  if(!namebuf) {
+    return 0;
+  }
+  
+  ngx_snprintf((u_char *)namebuf, name->len+1, "%V%Z", name);
+  nodeset->name = namebuf;
+  
+  return 1;
+}
+
+const char *node_nickname_cstr(redis_node_t *node) {
+  if(node) {
+    return node_cstr(node);
+  }
+  else {
+    return "???";
+  }
+}
+
+ngx_int_t nodeset_set_status(redis_nodeset_t *nodeset, redis_nodeset_status_t status, const char *msg) {
+  ngx_snprintf((u_char *)nodeset->status_msg, NODESET_MAX_STATUS_MSG_LENGTH, "%s%Z", msg ? msg : "");
+  if(nodeset->status != status) {
+    if(msg) {
+      ngx_uint_t  lvl;
+      if(status == REDIS_NODESET_INVALID) {
+        lvl = NGX_LOG_ERR;
+      }
+      else if(status == REDIS_NODESET_DISCONNECTED
+        ||    status == REDIS_NODESET_CLUSTER_FAILING
+        ||    status == REDIS_NODESET_FAILED
+      ) {
+        lvl = NGX_LOG_WARN;
+      }
+      else {
+        lvl = NGX_LOG_NOTICE;
+      }
+      nodeset_log(nodeset, lvl, "%s", msg);
+    }
+    
+    if(status == REDIS_NODESET_READY) {
+      nchan_stats_worker_incr(redis_unhealthy_upstreams, -1);
+    }
+    else if(nodeset->status == REDIS_NODESET_READY) {
+      nchan_stats_worker_incr(redis_unhealthy_upstreams, 1);
+    }
+    
+    nodeset->current_status_start = *ngx_timeofday();
+    nodeset->current_status_times_checked = 0;
+    nodeset->status = status;
+    
+    if(nodeset->status_check_ev.timer_set) {
+      ngx_del_timer(&nodeset->status_check_ev);
+    }
+    
+    switch(status) {
+      case REDIS_NODESET_FAILED:
+      case REDIS_NODESET_DISCONNECTED:
+      case REDIS_NODESET_INVALID:
+        nodeset_stop_cluster_check_timer(nodeset);
+        nodeset_disconnect(nodeset);
+        break;
+      case REDIS_NODESET_CLUSTER_FAILING:
+        nodeset_stop_cluster_check_timer(nodeset);
+        nodeset_reset_cluster_node_info(nodeset);
+        //but don't disconnect! we don't want to start a connection storm just because a single node got replaced
+        if(!nodeset_recover_cluster(nodeset)) {
+          nodeset_set_status(nodeset, REDIS_NODESET_FAILED, "failed to recover cluster");
+        }
+        break;
+      case REDIS_NODESET_FAILING:
+        nodeset_stop_cluster_check_timer(nodeset);
+        nodeset_connect(nodeset);
+        break;
+      case REDIS_NODESET_CONNECTING:
+        //no special actions
+        break;
+      case REDIS_NODESET_READY:
+        if(nodeset->cluster.enabled) {
+          nodeset_start_cluster_check_timer(nodeset);
+        }
+        nodeset_check_spublish_availability(nodeset);
+        nodeset->current_reconnect_delay = 0;
+        nodeset_reconnect_disconnected_channels(nodeset);
+        nodeset_run_on_ready_callbacks(nodeset);
+        break;
+    }
+  }
+  
+  if(!nodeset->status_check_ev.timer_set) {
+    ngx_add_timer(&nodeset->status_check_ev, nodeset_status_timer_interval(status));
+  }
+  return NGX_OK;
+}
+
+static void nodeset_check_spublish_availability(redis_nodeset_t *ns) {
+  if(!ns->cluster.enabled) {
+    //no cluster? we don't care.
+    return;
+  }
+  
+  redis_node_t *cur;
+  
+  int no_spublish = 0;
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    if(cur->state == REDIS_NODE_READY && !cur->have_spublish) {
+      no_spublish ++;
+    }
+  }
+  ns->use_spublish = no_spublish == 0;
+  
+  if(no_spublish) {
+    nodeset_log_warning(ns, "This cluster has nodes running Redis version < 7. Nchan is forced to use non-sharded pubsub commands that scale inversely to the cluster size. Upgrade to Redis >= 7 for much better scalability.");
+  }
+  
+}
+
+static void node_find_slaves_callback(redisAsyncContext *ac, void *rep, void *pd) {
+  redis_node_t   *node = pd;
+  redisReply     *reply = rep;
+  if(!reply) {
+    node_log_debug(node, "INFO REPLICATION aborted reply");
+    return;
+  }
+  node_discover_slaves_from_info_reply(node, reply);
+}
+
+ngx_int_t nodeset_examine(redis_nodeset_t *nodeset) {
+  redis_node_t *cur, *next;
+  int cluster = 0, masters = 0, slaves = 0, total = 0, connecting = 0, ready = 0, disconnected = 0;
+  int discovered = 0, failed_masters=0, failed_slaves = 0, failed_unknowns = 0;
+  int ready_cluster = 0, ready_non_cluster = 0, connecting_masters = 0;
+  redis_nodeset_status_t current_status = nodeset->status;
+  //ERR("check nodeset %p", nodeset);
+  
+  for(cur = nchan_list_first(&nodeset->nodes); cur != NULL; cur = next) {
+    next = nchan_list_next(cur);
+    total++;
+    if(cur->cluster.enabled == 1) {
+      cluster++;
+    }
+    if(cur->discovered)
+      discovered++;
+    if(cur->role == REDIS_NODE_ROLE_MASTER) {
+      masters++;
+      if(cur->state > REDIS_NODE_DISCONNECTED && cur->state < REDIS_NODE_READY) {
+        connecting_masters++;
+      }
+    }
+    if(cur->role == REDIS_NODE_ROLE_SLAVE)
+      slaves++;
+    if(cur->state <= REDIS_NODE_DISCONNECTED)
+      disconnected++;
+    if(cur->state > REDIS_NODE_DISCONNECTED && cur->state < REDIS_NODE_READY)
+      connecting++;
+    if(cur->state == REDIS_NODE_READY) {
+      ready++;
+      if(cur->cluster.enabled == 1)
+        ready_cluster++;
+      else
+        ready_non_cluster++;
+    }
+    if(cur->state == REDIS_NODE_FAILED) {
+      if(cur->role == REDIS_NODE_ROLE_MASTER) {
+        failed_masters++;
+      }
+      else if(cur->role == REDIS_NODE_ROLE_SLAVE) {
+        failed_slaves++;
+        if(cur->peers.master && cur->peers.master->state >= REDIS_NODE_READY && cur->nodeset->status == REDIS_NODESET_READY) {
+          //rediscover slaves
+          redisAsyncCommand(cur->peers.master->ctx.cmd, node_find_slaves_callback, cur->peers.master, "INFO REPLICATION");
+        }
+        //remove failed slave
+        node_log_notice(cur, "removed failed slave node");
+        node_disconnect(cur, REDIS_NODE_FAILED);
+        nodeset_node_destroy(cur);
+        total--;
+      }
+      else {
+        failed_unknowns++;
+      }
+    }
+  }
+  
+  nodeset->cluster.enabled = cluster > 0;
+  
+  DBG("nodeset examination results: cluster: %d, masters: %i, slaves: %i, total: %i, connecting: %i, ready: %i, disconnected: %i, discovered: %i, failed_masters: %i, failed_slaves: %i, failed_unknowns: %i, ready_cluster: %i, ready_non_cluster: %i, connecting_masters: %i", cluster, masters, slaves, total, connecting, ready, disconnected, discovered, failed_masters, failed_slaves, failed_unknowns, ready_cluster, ready_non_cluster, connecting_masters);
+  
+  if(current_status == REDIS_NODESET_CONNECTING && connecting > 0) {
+    //still connecting, with a few nodws yet to try to connect
+    return NGX_OK;
+  }
+  if(ready == 0 && total == 0) {
+    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "no reachable servers");
+  }
+  else if(cluster == 0 && masters > 1) {
+    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "invalid config, more than one master in non-cluster");
+  }
+  else if(ready_cluster > 0 && ready_non_cluster > 0) {
+    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "invalid config, cluster and non-cluster servers present");
+  }
+  else if(connecting > 0) {
+    if(current_status != REDIS_NODESET_CLUSTER_FAILING) {
+      nodeset_set_status(nodeset, REDIS_NODESET_CONNECTING, NULL);
+    }
+  }
+  else if(failed_masters > 0) {
+    if(current_status == REDIS_NODESET_READY) {
+      if(nodeset->cluster.enabled) {
+        nodeset_set_status(nodeset, REDIS_NODESET_CLUSTER_FAILING, "a master node has disconnected");
+      }
+      else {
+        nodeset_set_status(nodeset, REDIS_NODESET_FAILING, NULL);
+      }
+    }
+    else {
+      nodeset_set_status(nodeset, REDIS_NODESET_FAILED, NULL);
+    }
+  }
+  else if (masters == 0) {
+    //this prevents slave-of-slave-of-master lookups
+    nodeset_set_status(nodeset, REDIS_NODESET_INVALID, "no reachable masters");
+  }
+  else if(cluster > 0 && !nodeset_cluster_keyslot_space_complete(nodeset, REDIS_NODE_READY)) {
+      nodeset_set_status(nodeset, current_status, "keyslot space incomplete");
+  }
+  else if(current_status == REDIS_NODESET_READY && (ready == 0 || ready < total)) {
+    nodeset_set_status(nodeset, REDIS_NODESET_FAILING, NULL);
+  }
+  else if(ready == 0) {
+    nodeset_set_status(nodeset, REDIS_NODESET_DISCONNECTED, "no connected servers");
+  }
+  else {
+    nodeset_set_status(nodeset, REDIS_NODESET_READY, "ready");
+  } 
+  
+  return NGX_OK;
+}
+
+static int nodeset_time_exceeded(ngx_time_t *t, ngx_msec_t msec_time) {
+  if(t->sec == 0) {
+    return 1;
+  }
+  ngx_time_t *now = ngx_timeofday();
+  return (now->sec - t->sec) * 1000 + (now->msec - t->msec) > msec_time;
+}
+
+static void nodeset_check_status_event(ngx_event_t *ev) {
+  redis_nodeset_t *ns = ev->data;
+  
+  if(!ev->timedout) {
+    return;
+  }
+  DBG("nodeset %p status check event", ns);
+  ev->timedout = 0;
+  
+  switch(ns->status) {
+    case REDIS_NODESET_FAILED:
+      if(nodeset_time_exceeded(&ns->current_status_start, ns->current_reconnect_delay)) {
+        nchan_set_next_backoff(&ns->current_reconnect_delay, &ns->settings.reconnect_delay);
+        nodeset_log_notice(ns, "reconnecting...");
+        nodeset_connect(ns);
+      }
+      break;
+    
+    case REDIS_NODESET_INVALID:
+    case REDIS_NODESET_DISCONNECTED:
+      if(nodeset_time_exceeded(&ns->current_status_start, ns->current_reconnect_delay)) {
+        nodeset_log_notice(ns, "connecting...");
+        //connect whatever needs to be connected
+        nodeset_connect(ns);
+      }
+      break;
+    
+    case REDIS_NODESET_CONNECTING:
+      //wait it out
+      if(nodeset_time_exceeded(&ns->current_status_start, ns->settings.cluster_connect_timeout)) {
+        nodeset_set_status(ns, REDIS_NODESET_DISCONNECTED, "Redis node set took too long to connect");
+      }
+      else {
+        nodeset_examine(ns); // full status check
+        if(ns->status == REDIS_NODESET_FAILED || ns->status == REDIS_NODESET_DISCONNECTED || ns->status == REDIS_NODESET_INVALID) {
+          nchan_set_next_backoff(&ns->current_reconnect_delay, &ns->settings.reconnect_delay);
+          nodeset_log_notice(ns, "will reconnect in %.3f sec", (ns->current_reconnect_delay/1000.0));
+        }
+      }
+      break;
+    
+    case REDIS_NODESET_CLUSTER_FAILING:
+      if(!ns->cluster.enabled) {
+        nodeset_log_error(ns, "this is not a cluster, but it's been marked as a failing cluster. that's really weird");
+      }
+      else if(nodeset_time_exceeded(&ns->current_status_start, ns->settings.cluster_max_failing_msec)) {
+        nodeset_set_status(ns, REDIS_NODESET_FAILED, "Cluster could not be recovered in time. Disconnecting.");
+      }
+      else if(!ns->cluster.recovering_on_node) {
+        if(nodeset_time_exceeded(&ns->last_cluster_recovery_check_time, ns->current_cluster_recovery_delay)) {
+          if(!nodeset_recover_cluster(ns)) {
+            nodeset_set_status(ns, REDIS_NODESET_CLUSTER_FAILING, "failed to recover cluster");
+          }
+        }
+      }
+      break;
+    
+    case REDIS_NODESET_FAILING:
+      if(nodeset_time_exceeded(&ns->current_status_start, ns->settings.cluster_max_failing_msec)) {
+        nodeset_set_status(ns, REDIS_NODESET_FAILED, "Redis node set has failed");
+      }
+      break;
+    
+    case REDIS_NODESET_READY:
+      nodeset_reconnect_disconnected_channels(ns); //in case there are any waiting around
+      nodeset_run_on_ready_callbacks(ns); //in case there are any that got left behind
+      break;
+  }
+  
+  //check again soon!
+  if(!ev->timer_set) {
+    ngx_add_timer(ev, nodeset_status_timer_interval(ns->status));
+  }
+}
+
+int nodeset_connect(redis_nodeset_t *ns) {
+  redis_node_t             *node;
+  ngx_str_t               **url;
+  redis_connect_params_t    rcp;
+  
+  for(url = nchan_list_first(&ns->urls); url != NULL; url = nchan_list_next(url)) {
+    parse_redis_url(*url, &rcp);
+    if((node = nodeset_node_find_by_connect_params(ns, &rcp)) == NULL) {
+      node = nodeset_node_create(ns, &rcp);
+      node_log_debug(node, "created");
+    }
+    assert(node);
+  }
+  for(node = nchan_list_first(&ns->nodes); node != NULL; node = nchan_list_next(node)) {
+    if(node->state <= REDIS_NODE_DISCONNECTED) {
+      node_log_debug(node, "start connecting");
+      node_connect(node);
+    }
+  }
+  nodeset_set_status(ns, REDIS_NODESET_CONNECTING, NULL);
+  return 1;
+}
+
+int nodeset_disconnect(redis_nodeset_t *ns) {
+  nodeset_stop_cluster_check_timer(ns);
+  
+  redis_node_t *node;
+  for(node = nchan_list_first(&ns->nodes); node != NULL; node = nchan_list_first(&ns->nodes)) {
+    node_log_debug(node, "destroy %p", node);
+    if(node->state > REDIS_NODE_DISCONNECTED) {
+      node_log_debug(node, "intiating disconnect");
+      node_disconnect(node, REDIS_NODE_DISCONNECTED);
+    }
+    nodeset_node_destroy(node);
+  }
+  
+  return 1;
+}
+
+
+ngx_int_t nodeset_connect_all(void) {
+  int                      i;
+  redis_nodeset_t         *ns;
+  DBG("connect all");
+  nchan_stats_worker_incr(redis_unhealthy_upstreams, redis_nodeset_count);
+  for(i=0; i<redis_nodeset_count; i++) {
+    ns = &redis_nodeset[i];
+    nodeset_connect(ns);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nodeset_destroy_all(void) {
+  int                      i;
+  redis_nodeset_t         *ns;
+  DBG("nodeset destroy all");
+  for(i=0; i<redis_nodeset_count; i++) {
+    ns = &redis_nodeset[i];
+    nodeset_disconnect(ns);
+    redis_nodeset_stats_destroy(ns);
+    if(ns->name && ns->name != nchan_redis_blankname) {
+      ngx_free(ns->name);
+    }
+#if (NGX_OPENSSL)
+    if(ns->ssl_context) {
+      SSL_CTX_free(ns->ssl_context);
+      ns->ssl_context = NULL;
+    }
+#endif
+    nchan_list_empty(&ns->urls);
+  }
+  redis_nodeset_count = 0;
+  return NGX_OK;
+}
+
+ngx_int_t nodeset_each(void (*cb)(redis_nodeset_t *, void *), void *privdata) {
+  int                      i;
+  redis_nodeset_t         *ns;
+  for(i=0; i<redis_nodeset_count; i++) {
+    ns = &redis_nodeset[i];
+    cb(ns, privdata);
+  }
+  return NGX_OK;
+}
+ngx_int_t nodeset_each_node(redis_nodeset_t *ns, void (*cb)(redis_node_t *, void *), void *privdata) {
+  redis_node_t             *node, *next;
+  for(node = nchan_list_first(&ns->nodes); node != NULL; node = next) {
+    next = nchan_list_next(node);
+    cb(node, privdata);
+  }
+  return NGX_OK;
+}
+
+int redis_node_role_match(redis_node_t *node, redis_node_role_t role) {
+  if(role == REDIS_NODE_ROLE_ANY) {
+    return 1;
+  }
+  return node->role == role;
+}
+
+redis_node_t *nodeset_random_node(redis_nodeset_t *ns, int min_state, redis_node_role_t role) {
+  int n = 0, chosen;
+  redis_node_t *cur;
+  for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+    if(cur->state >= min_state && redis_node_role_match(cur, role)) {
+      n++;
+    }
+  }
+  if(n > 0) {
+    chosen = ngx_random() % n;
+    n = 0;
+    for(cur = nchan_list_first(&ns->nodes); cur != NULL; cur = nchan_list_next(cur)) {
+      if(cur->state >= min_state && redis_node_role_match(cur, role)) {
+        if(n == chosen) {
+          return cur;
+        }
+        n++;
+      }
+    }
+  }
+  return NULL;
+}
+
+static ngx_int_t set_preallocated_peername(redisAsyncContext *ctx, ngx_str_t *dst) {
+  char                  *ipstr = (char *)dst->data;
+  struct sockaddr_in    *s4;
+  struct sockaddr_in6   *s6;
+  // deal with both IPv4 and IPv6:
+  switch(ctx->c.sockaddr.sa_family) {
+    case AF_INET:
+      s4 = (struct sockaddr_in *)&ctx->c.sockaddr;
+      inet_ntop(AF_INET, &s4->sin_addr, ipstr, INET6_ADDRSTRLEN);
+      break;
+#ifdef AF_INET6
+    case AF_INET6:
+      s6 = (struct sockaddr_in6 *)&ctx->c.sockaddr;
+      inet_ntop(AF_INET6, &s6->sin6_addr, ipstr, INET6_ADDRSTRLEN);
+      break;
+#endif
+    case AF_UNSPEC:
+    default:
+      DBG("couldn't get sockaddr");
+      return NGX_ERROR;
+  }
+  dst->len = strlen(ipstr);
+  return NGX_OK;
+}
+
+
+//sneaky channel stuff
+ngx_int_t nodeset_associate_chanhead(redis_nodeset_t *ns, void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  if(ch->redis.nodeset && ch->redis.nodeset != ns) {
+    nodeset_dissociate_chanhead(ch);
+  }
+  ngx_memzero(&ch->redis.slist, sizeof(ch->redis.slist));
+  ch->redis.nodeset = ns;
+  nchan_slist_append(&ns->channels.all, ch);
+  return NGX_OK;
+}
+ngx_int_t nodeset_dissociate_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  redis_nodeset_t *ns = ch->redis.nodeset;
+  
+  if(ns) {
+    if(ch->redis.node.cmd) {
+      assert(!ch->redis.slist.in_disconnected_cmd_list);
+      nodeset_node_dissociate_chanhead(ch);
+    }
+    else if(ch->redis.slist.in_disconnected_cmd_list) {
+      ch->redis.slist.in_disconnected_cmd_list = 0;
+      nchan_slist_remove(&ns->channels.disconnected_cmd, ch);
+    }
+    
+    if(ch->redis.node.pubsub) {
+      assert(!ch->redis.slist.in_disconnected_pubsub_list);
+      nodeset_node_dissociate_pubsub_chanhead(ch);
+    }
+    else if(ch->redis.slist.in_disconnected_pubsub_list) {
+      ch->redis.slist.in_disconnected_pubsub_list = 0;
+      nchan_slist_remove(&ns->channels.disconnected_pubsub, ch);
+    }
+    
+    ch->redis.nodeset = NULL;
+    nchan_slist_remove(&ns->channels.all, ch);
+  }
+  return NGX_OK;
+}
+ngx_int_t nodeset_node_associate_chanhead(redis_node_t *node, void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  assert(ch->redis.node.cmd == NULL);
+  assert(node->nodeset == ch->redis.nodeset);
+  assert(ch->redis.slist.in_disconnected_cmd_list == 0);
+  if(ch->redis.node.cmd != node) { //dat idempotence tho
+    nchan_slist_append(&node->channels.cmd, ch);
+  }
+  ch->redis.node.cmd = node;
+  return NGX_OK;
+}
+ngx_int_t nodeset_node_associate_pubsub_chanhead(redis_node_t *node, void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  
+  if(ch->redis.node.pubsub == node) {
+    //already associated
+    return NGX_OK;
+  }
+  assert(ch->redis.node.pubsub == NULL);
+  assert(node->nodeset == ch->redis.nodeset);
+  assert(ch->redis.slist.in_disconnected_pubsub_list == 0);
+  if(ch->redis.node.pubsub != node) { //dat idempotence tho
+    nchan_slist_append(&node->channels.pubsub, ch);
+  }
+  ch->redis.node.pubsub = node;
+  return NGX_OK;
+}
+ngx_int_t nodeset_node_dissociate_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  if(ch->redis.node.cmd) {
+    nchan_slist_remove(&ch->redis.node.cmd->channels.cmd, ch);
+  }
+  ch->redis.node.cmd = NULL;
+  return NGX_OK;
+}
+ngx_int_t nodeset_node_dissociate_pubsub_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  
+  if(ch->redis.node.pubsub == NULL) {
+    //already dissociated
+    return NGX_OK;
+  }
+  nchan_slist_remove(&ch->redis.node.pubsub->channels.pubsub, ch);
+  ch->redis.node.pubsub = NULL; 
+  return NGX_OK;
+}
+
+void node_command_sent(redis_node_t *node) {
+  if(node) {
+    node->timeout.sent++;
+    node->pending_commands++;
+  }
+  nchan_stats_worker_incr(redis_pending_commands, 1); 
+  nchan_stats_global_incr(total_redis_commands_sent, 1); 
+}
+void node_command_received(redis_node_t *node) {
+  if(node) {
+    node->timeout.received++;
+    node->pending_commands--;
+  }
+  nchan_stats_worker_incr(redis_pending_commands, -1); 
+}
+
+static redis_node_t *nodeset_node_random_master_or_slave(redis_node_t *master) {
+  redis_nodeset_t *ns = master->nodeset;
+  int master_total = ns->settings.node_weight.master;
+  int slave_total = master->peers.slaves.n * ns->settings.node_weight.slave;
+  int n;
+  
+  assert(master->role == REDIS_NODE_ROLE_MASTER);
+  
+  if(master_total + slave_total == 0) {
+    return master;
+  }
+  
+  n = ngx_random() % (slave_total + master_total);
+  if(n < master_total) {
+    return master;
+  }
+  else {
+    int           i = 0;
+    n = ngx_random() % master->peers.slaves.n; //random slave
+    redis_node_t **nodeptr;
+    for(nodeptr = nchan_list_first(&master->peers.slaves); nodeptr != NULL && i < n; nodeptr = nchan_list_next(nodeptr)) {
+      i++;
+    }
+    if(nodeptr == NULL || (*nodeptr)->state < REDIS_NODE_READY) {
+      //not ready? play it safe.
+      //node_log_error(*nodeptr, "got slave, but it's not ready. return master instead");
+      return master;
+    }
+    else {
+      //node_log_error(*nodeptr, "got slave");
+      return *nodeptr;
+    }
+  }
+}
+
+redis_node_t *nodeset_node_find_by_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  redis_node_t           *node;
+  if(ch->redis.node.cmd) {
+    return ch->redis.node.cmd;
+  }
+  node = nodeset_node_find_by_channel_id(ch->redis.nodeset, &ch->id);
+  nodeset_node_associate_chanhead(node, ch);
+  return node;
+}
+redis_node_t *nodeset_node_pubsub_find_by_chanhead(void *chan) {
+  rdstore_channel_head_t *ch = chan;
+  redis_node_t           *node;
+  if(ch->redis.node.pubsub) {
+    return ch->redis.node.pubsub;
+  }
+  node = nodeset_node_find_by_channel_id(ch->redis.nodeset, &ch->id);
+  node = nodeset_node_random_master_or_slave(node);
+  nodeset_node_associate_pubsub_chanhead(node, ch);
+  return ch->redis.node.pubsub;
+}
+
+
+
+/*
+ * Copyright 2001-2010 Georges Menie (www.menie.org)
+ * Copyright 2010 Salvatore Sanfilippo (adapted to Redis coding style)
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the University of California, Berkeley nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* CRC16 implementation according to CCITT standards.
+ *
+ * Note by @antirez: this is actually the XMODEM CRC 16 algorithm, using the
+ * following parameters:
+ *
+ * Name                       : "XMODEM", also known as "ZMODEM", "CRC-16/ACORN"
+ * Width                      : 16 bit
+ * Poly                       : 1021 (That is actually x^16 + x^12 + x^5 + 1)
+ * Initialization             : 0000
+ * Reflect Input byte         : False
+ * Reflect Output CRC         : False
+ * Xor constant to output CRC : 0000
+ * Output for "123456789"     : 31C3
+ */
+
+static const uint16_t crc16tab[256]= {
+    0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
+    0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
+    0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
+    0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
+    0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
+    0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
+    0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
+    0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
+    0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
+    0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
+    0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
+    0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
+    0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
+    0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
+    0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
+    0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
+    0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
+    0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
+    0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
+    0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
+    0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
+    0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
+    0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
+    0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
+    0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
+    0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
+    0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
+    0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
+    0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
+    0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
+    0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
+    0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0
+};
+
+uint16_t redis_crc16(uint16_t crc, const char *buf, int len) {
+    int counter;
+    for (counter = 0; counter < len; counter++)
+            crc = (crc<<8) ^ crc16tab[((crc>>8) ^ *buf++)&0x00FF];
+    return crc;
+}
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.h
new file mode 100644
index 0000000..127b71d
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset.h
@@ -0,0 +1,469 @@
+#ifndef NCHAN_REDIS_NODESET_H
+#define NCHAN_REDIS_NODESET_H
+
+#include <nchan_module.h>
+#if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
+#include <hiredis/hiredis.h>
+#include <hiredis/async.h>
+#if (NGX_OPENSSL)
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <hiredis/hiredis_ssl.h>
+#endif
+#else
+#include <store/redis/hiredis/hiredis.h>
+#include <store/redis/hiredis/async.h>
+#if (NGX_OPENSSL)
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <store/redis/hiredis/hiredis_ssl.h>
+#endif
+#endif
+#include <util/nchan_reaper.h>
+#include <util/nchan_rbtree.h>
+#include <util/nchan_list.h>
+#include <util/nchan_slist.h>
+#include <util/nchan_accumulator.h>
+#include <util/nchan_timequeue.h>
+
+#include "redis_lua_commands.h"
+//#include "store-private.h"
+
+//#define REDIS_NODESET_DBG 1
+
+#define node_log(node, lvl, fmt, args...) \
+  ngx_log_error(lvl, ngx_cycle->log, 0, "nchan: Redis %snode %s " fmt, (node->role == REDIS_NODE_ROLE_MASTER ? "master " : (node->role == REDIS_NODE_ROLE_SLAVE ? "slave " : "")), node_nickname_cstr(node), ##args)
+#define node_log_error(node, fmt, args...)    node_log((node), NGX_LOG_ERR, fmt, ##args)
+#define node_log_warning(node, fmt, args...)  node_log((node), NGX_LOG_WARN, fmt, ##args)
+#define node_log_notice(node, fmt, args...)   node_log((node), NGX_LOG_NOTICE, fmt, ##args)
+#define node_log_info(node, fmt, args...)     node_log((node), NGX_LOG_INFO, fmt, ##args)
+#define node_log_debug(node, fmt, args...)    node_log((node), NGX_LOG_DEBUG, fmt, ##args)
+  
+#define nodeset_log(nodeset, lvl, fmt, args...) \
+  ngx_log_error(lvl, ngx_cycle->log, 0, "nchan: Redis %s %s: " fmt, (nodeset)->name_type, (nodeset)->name, ##args)
+#define nodeset_log_error(nodeset, fmt, args...)    nodeset_log((nodeset), NGX_LOG_ERR, fmt, ##args)
+#define nodeset_log_warning(nodeset, fmt, args...)  nodeset_log((nodeset), NGX_LOG_WARN, fmt, ##args)
+#define nodeset_log_notice(nodeset, fmt, args...)   nodeset_log((nodeset), NGX_LOG_NOTICE, fmt, ##args)
+#define nodeset_log_info(nodeset, fmt, args...)     nodeset_log((nodeset), NGX_LOG_INFO, fmt, ##args)
+#define nodeset_log_debug(nodeset, fmt, args...)    nodeset_log((nodeset), NGX_LOG_DEBUG, fmt, ##args)
+
+#define NCHAN_MAX_NODESETS 128
+#define REDIS_NODESET_STATUS_CHECK_TIME_MSEC 4000
+
+#define REDIS_NODE_DEDUPLICATED         -100
+#define REDIS_NODE_CONNECTION_TIMED_OUT   -2
+#define REDIS_NODE_FAILED                 -1
+#define REDIS_NODE_DISCONNECTED            0
+#define REDIS_NODE_CMD_CONNECTING          1
+#define REDIS_NODE_PUBSUB_CONNECTING       2
+#define REDIS_NODE_CMD_CHECKING_CONNECTION 3
+#define REDIS_NODE_CMD_CHECKED_CONNECTION  4
+#define REDIS_NODE_PUBSUB_CHECKING_CONNECTION 5
+#define REDIS_NODE_PUBSUB_CHECKED_CONNECTION 6
+#define REDIS_NODE_CONNECTED               7
+#define REDIS_NODE_CMD_AUTHENTICATING      8
+#define REDIS_NODE_PUBSUB_AUTHENTICATING   9
+#define REDIS_NODE_SELECT_DB              10
+#define REDIS_NODE_CMD_SELECTING_DB       11
+#define REDIS_NODE_PUBSUB_SELECTING_DB    12
+#define REDIS_NODE_SCRIPTS_LOAD           13
+#define REDIS_NODE_SCRIPTS_LOADED_CHECK   14  
+#define REDIS_NODE_SCRIPTS_LOADING        15
+#define REDIS_NODE_GET_INFO               16
+#define REDIS_NODE_GETTING_INFO           17
+#define REDIS_NODE_PUBSUB_GET_INFO        18
+#define REDIS_NODE_PUBSUB_GETTING_INFO    19
+#define REDIS_NODE_SUBSCRIBE_WORKER       20
+#define REDIS_NODE_SUBSCRIBING_WORKER     21
+#define REDIS_NODE_GET_CLUSTERINFO        22
+#define REDIS_NODE_GETTING_CLUSTERINFO    23
+#define REDIS_NODE_GET_SHARDED_PUBSUB_SUPPORT 24
+#define REDIS_NODE_GETTING_SHARDED_PUBSUB_SUPPORT 25
+#define REDIS_NODE_GET_CLUSTER_NODES      26
+#define REDIS_NODE_GETTING_CLUSTER_NODES  27
+#define REDIS_NODE_READY                  100
+  
+typedef struct redis_nodeset_s redis_nodeset_t;
+typedef struct redis_node_s redis_node_t;
+
+typedef struct { //redis_nodeset_cluster_t
+  unsigned                    enabled:1;
+  rbtree_seed_t               keyslots; //cluster rbtree seed
+  redis_node_t               *recovering_on_node;
+  int                         current_epoch;
+  ngx_msec_t                  current_check_interval;
+  ngx_event_t                 check_ev;
+} redis_nodeset_cluster_t;
+
+typedef struct {
+  unsigned         min:16;
+  unsigned         max:16;
+} redis_slot_range_t;
+
+typedef enum {
+  REDIS_NODE_ROLE_ANY=-1,
+  REDIS_NODE_ROLE_UNKNOWN = 0,
+  REDIS_NODE_ROLE_MASTER,
+  REDIS_NODE_ROLE_SLAVE
+} redis_node_role_t;
+
+typedef enum {
+  REDIS_NODESET_FAILED = -4,
+  REDIS_NODESET_CLUSTER_FAILING = -3,
+  REDIS_NODESET_FAILING = -2,
+  REDIS_NODESET_INVALID = -1,
+  REDIS_NODESET_DISCONNECTED = 0,
+  REDIS_NODESET_CONNECTING,
+  REDIS_NODESET_READY
+} redis_nodeset_status_t;
+
+#if REDIS_NODESET_DBG
+typedef struct {
+  int  n;
+  redis_node_t *node[128];
+} redis_node_dbg_list_t;
+typedef struct {
+  redis_slot_range_t range;
+  redis_node_t       *node;
+} redis_node_range_dbg_t;
+typedef struct {
+  int  n;
+  redis_node_range_dbg_t node[128];
+} redis_nodeset_dbg_range_tree_t;
+#endif
+
+typedef enum {
+  //command codes whose totals are tracked must start at 0
+  
+  //ANY is a catch-all group and not a particular command, so it can be <0
+  NCHAN_REDIS_CMD_ANY                             = -1,
+  
+  //trackable command codes begin
+  NCHAN_REDIS_CMD_CONNECT                         = 0,
+  NCHAN_REDIS_CMD_PUBSUB_SUBSCRIBE,
+  NCHAN_REDIS_CMD_PUBSUB_UNSUBSCRIBE,
+  NCHAN_REDIS_CMD_CHANNEL_CHANGE_SUBSCRIBER_COUNT,
+  NCHAN_REDIS_CMD_CHANNEL_DELETE,
+  NCHAN_REDIS_CMD_CHANNEL_FIND,
+  NCHAN_REDIS_CMD_CHANNEL_GET_MESSAGE,
+  NCHAN_REDIS_CMD_CHANNEL_GET_LARGE_MESSAGE,
+  NCHAN_REDIS_CMD_CHANNEL_PUBLISH,
+  NCHAN_REDIS_CMD_CHANNEL_REQUEST_SUBSCRIBER_INFO,
+  NCHAN_REDIS_CMD_CHANNEL_GET_SUBSCRIBER_INFO_ID,
+  NCHAN_REDIS_CMD_CHANNEL_SUBSCRIBE,
+  NCHAN_REDIS_CMD_CHANNEL_UNSUBSCRIBE,
+  NCHAN_REDIS_CMD_CHANNEL_KEEPALIVE,
+  NCHAN_REDIS_CMD_CLUSTER_CHECK,
+  NCHAN_REDIS_CMD_CLUSTER_RECOVER,
+  NCHAN_REDIS_CMD_OTHER,
+  NCHAN_REDIS_CMD_ENUM_LAST
+  //NCHAN_REDIS_CMD_ENUM_LAST must be last in this enum. It's the number of commands to track
+} redis_node_cmd_tag_t;
+
+#define NODE_STATS_MAX_NAME_STR_LENGTH 128
+#define NODE_STATS_MAX_ID_STR_LENGTH 65
+
+typedef struct {
+  char                         name[NODE_STATS_MAX_NAME_STR_LENGTH];
+  char                         id[NODE_STATS_MAX_ID_STR_LENGTH];
+  unsigned                     attached:1;
+  time_t                       detached_time; //when did you first stop using?
+  nchan_accumulator_t          timings[NCHAN_REDIS_CMD_ENUM_LAST];
+} redis_node_command_stats_t;
+
+#define NODESET_MAX_STATUS_MSG_LENGTH 512
+struct redis_nodeset_s {
+  //a set of redis nodes
+  //  maybe just 1 master
+  //  maybe a master and its slaves
+  //  maybe a cluster of masters and their slaves
+  //slaves of slaves not included
+  char                       *name;
+  char                       *name_type;
+  redis_nodeset_status_t      status;
+  ngx_event_t                 status_check_ev;
+  ngx_time_t                  current_status_start;
+  ngx_int_t                   current_status_times_checked;
+  ngx_msec_t                  current_reconnect_delay;
+  ngx_time_t                  last_cluster_recovery_check_time;
+  ngx_msec_t                  current_cluster_recovery_delay;
+  ngx_int_t                   generation;
+  nchan_list_t                urls;
+  nchan_loc_conf_t           *first_loc_conf;
+  ngx_http_upstream_srv_conf_t *upstream;
+  nchan_list_t                nodes;
+  redis_nodeset_cluster_t     cluster;
+  struct {
+    unsigned                    active:1;
+    ngx_event_t                 cleanup_timer;
+    nchan_list_t                list;
+  }                           node_stats;
+  unsigned                    use_spublish:1;
+  struct {                    //settings
+    nchan_redis_storage_mode_t  storage_mode;
+    ngx_int_t                   nostore_fastpublish;
+    ngx_int_t                   accurate_subscriber_count;
+    struct {                    //pubsub_subscribe_weight
+      ngx_int_t                   master;
+      ngx_int_t                   slave;
+    }                           node_weight;
+    unsigned                    retry_commands:1;
+    ngx_msec_t                  retry_commands_max_wait;
+    time_t                      ping_interval;
+    ngx_str_t                  *namespace;
+    ngx_msec_t                  node_connect_timeout;
+    ngx_msec_t                  cluster_connect_timeout;
+    ngx_msec_t                  command_timeout;
+    
+    nchan_backoff_settings_t    reconnect_delay;
+    nchan_backoff_settings_t    cluster_recovery_delay;
+    nchan_backoff_settings_t    cluster_check_interval;
+    
+    nchan_backoff_settings_t    idle_channel_ttl;
+    ngx_msec_t                  idle_channel_ttl_safety_margin;
+    
+    ngx_msec_t                  cluster_max_failing_msec;
+    ngx_int_t                   load_scripts_unconditionally;
+    struct {
+      time_t                      max_detached_time_sec;
+      ngx_int_t                   enabled;
+    }                           node_stats;
+    struct {
+      int                         count;
+      nchan_redis_ip_range_t     *list;
+    }                           blacklist;
+    nchan_redis_tls_settings_t  tls;
+    ngx_str_t                   username;
+    ngx_str_t                   password;
+  }                           settings;
+  
+  #if (NGX_OPENSSL)
+  SSL_CTX                    *ssl_context;
+  #endif
+  
+  struct {
+    nchan_slist_t               all;
+    nchan_slist_t               disconnected_cmd;
+    nchan_slist_t               disconnected_pubsub;
+  }                           channels;
+  
+  nchan_reaper_t              chanhead_reaper;
+  nchan_list_t                onready_callbacks;
+  char                        status_msg[NODESET_MAX_STATUS_MSG_LENGTH];
+#if REDIS_NODESET_DBG
+  struct {
+    redis_node_dbg_list_t       nodes;
+    redis_nodeset_dbg_range_tree_t ranges;
+    int                         keyspace_complete;
+  }                           dbg;
+#endif
+  
+}; //redis_nodeset_t
+
+struct redis_node_s {
+  int8_t                    state;
+  unsigned                  connecting:1;
+  unsigned                  recovering:1;
+  unsigned                  discovered:1;
+  unsigned                  have_spublish:1;
+  redis_node_role_t         role;
+  redis_connect_params_t    connect_params;
+  void                     *connect_timeout;
+  redis_nodeset_t          *nodeset;
+  ngx_str_t                 run_id;
+  ngx_str_t                 version;
+  int                       generation;
+  ngx_event_t               ping_timer;
+  struct {
+    unsigned                  enabled:1;
+    unsigned                  ok:1;
+    ngx_str_t                 id;
+    ngx_str_t                 master_id;
+    int                       current_epoch; //as reported on this node
+    struct {
+      redis_slot_range_t         *range;
+      size_t                      n;
+      unsigned                    indexed:1;
+    }                         slot_range; 
+  }                         cluster;
+  struct {
+    redis_node_t              *master;
+    nchan_list_t               slaves;
+  }                         peers;
+  struct {
+    redisAsyncContext         *cmd;
+    redisAsyncContext         *pubsub;
+    redisContext              *sync;
+  }                         ctx;
+  struct {
+    redis_node_command_stats_t *data;
+    struct {         
+      nchan_timequeue_t       cmd;
+      nchan_timequeue_t       pubsub;
+    }                       timequeue;
+  }                         stats;
+  int                       pending_commands;
+  struct {
+    long long                 sent;
+    long long                 received;
+    long long                 prev_sent;
+    ngx_event_t               ev;
+  }                         timeout;
+  struct {
+  nchan_slist_t               cmd;
+  nchan_slist_t               pubsub;
+  }                         channels;
+  struct {
+    uint8_t                   loaded[REDIS_LUA_SCRIPTS_COUNT];
+    uint8_t                   current;
+    unsigned                  loading:1;
+  }                         scripts_load_state;
+}; //redis_node_t
+
+typedef struct {
+  redis_slot_range_t      range;
+  redis_node_t           *node;
+} redis_nodeset_slot_range_node_t;
+
+redis_nodeset_t *nodeset_create(nchan_loc_conf_t *lcf);
+ngx_int_t nodeset_initialize(char *worker_id, redisCallbackFn *subscribe_handler);
+redis_nodeset_t *nodeset_find(nchan_redis_conf_t *rcf);
+ngx_int_t nodeset_examine(redis_nodeset_t *nodeset);
+
+ngx_int_t nodeset_node_destroy(redis_node_t *node);
+redis_node_t *nodeset_random_node(redis_nodeset_t *ns, int min_state, redis_node_role_t role);
+
+int node_disconnect(redis_node_t *node, int disconnected_state);
+int node_connect(redis_node_t *node);
+redisContext *node_connect_sync_context(redis_node_t *node);
+void node_set_role(redis_node_t *node, redis_node_role_t role);
+
+int node_set_master_slave_relationship(redis_node_t *master, redis_node_t *slave);
+redis_node_t *node_find_slave_node(redis_node_t *node, redis_node_t *slave);
+int node_remove_slave_node(redis_node_t *node, redis_node_t *slave);
+
+void node_command_sent(redis_node_t *node);
+void node_command_received(redis_node_t *node);
+
+void node_command_time_start(redis_node_t *node, redis_node_cmd_tag_t cmdtag);
+void node_command_time_finish(redis_node_t *node, redis_node_cmd_tag_t cmdtag);
+
+ngx_int_t nodeset_connect_all(void);
+int nodeset_connect(redis_nodeset_t *ns);
+int nodeset_node_keyslot_changed(redis_node_t *node, const char *reason);
+int nodeset_disconnect(redis_nodeset_t *ns);
+ngx_int_t nodeset_destroy_all(void);
+ngx_int_t nodeset_each(void (*)(redis_nodeset_t *, void *), void *privdata);
+ngx_int_t nodeset_each_node(redis_nodeset_t *, void (*)(redis_node_t *, void *), void *privdata);
+ngx_int_t nodeset_callback_on_ready(redis_nodeset_t *ns,  ngx_int_t (*cb)(redis_nodeset_t *, void *), void *pd);
+ngx_int_t nodeset_abort_on_ready_callbacks(redis_nodeset_t *ns);
+ngx_int_t nodeset_run_on_ready_callbacks(redis_nodeset_t *ns);
+
+ngx_int_t nodeset_set_status(redis_nodeset_t *nodeset, redis_nodeset_status_t status, const char *msg);
+
+
+char *node_dbg_sprint(redis_node_t *node, char *buf, size_t maxlen);
+void nodeset_dbg_log_nodes(redis_nodeset_t *ns, unsigned loglevel);
+void nodeset_dbg_log_nodes_and_clusternodes_lines(redis_nodeset_t *ns, unsigned loglevel, void *lines, size_t line_count);
+
+int nodeset_node_deduplicate_by_connect_params(redis_node_t *node);
+int nodeset_node_deduplicate_by_run_id(redis_node_t *node);
+int nodeset_node_deduplicate_by_cluster_id(redis_node_t *node);
+
+redis_node_t *nodeset_node_find_by_connect_params(redis_nodeset_t *ns, redis_connect_params_t *rcp);
+redis_node_t *nodeset_node_find_by_run_id(redis_nodeset_t *ns, ngx_str_t *run_id);
+redis_node_t *nodeset_node_find_by_cluster_id(redis_nodeset_t *ns, ngx_str_t *cluster_id);
+redis_node_t *nodeset_node_find_by_range(redis_nodeset_t *ns, redis_slot_range_t *range);
+redis_node_t *nodeset_node_find_by_slot(redis_nodeset_t *ns, uint16_t slot);
+redis_node_t *nodeset_node_find_by_channel_id(redis_nodeset_t *ns, ngx_str_t *channel_id);
+redis_node_t *nodeset_node_find_by_key(redis_nodeset_t *ns, ngx_str_t *key);
+redis_node_t *nodeset_node_find_any_ready_master(redis_nodeset_t *ns);
+int nodeset_node_reply_keyslot_ok(redis_node_t *node, redisReply *r);
+int nodeset_node_can_retry_commands(redis_node_t *node);
+int nodeset_ready(redis_nodeset_t *nodeset);
+
+//chanheads are (void *) here to avoid circular typedef dependency with store-private.h
+//it's terrible, and dirty -- but quick
+ngx_int_t nodeset_associate_chanhead(redis_nodeset_t *, void *chanhead);
+ngx_int_t nodeset_dissociate_chanhead(void *chanhead);
+
+ngx_int_t nodeset_node_associate_chanhead(redis_node_t *, void *chanhead);
+ngx_int_t nodeset_node_associate_pubsub_chanhead(redis_node_t *, void *chanhead);
+ngx_int_t nodeset_node_dissociate_chanhead(void *chanhead);
+ngx_int_t nodeset_node_dissociate_pubsub_chanhead(void *chanhead);
+
+redis_node_t *nodeset_node_find_by_chanhead(void *chanhead);
+redis_node_t *nodeset_node_pubsub_find_by_chanhead(void *chanhead);
+int node_channel_in_keyspace(redis_node_t *node, void *chanhead);
+
+typedef enum {
+  REDIS_NODE_CTX_COMMAND,
+  REDIS_NODE_CTX_PUBSUB
+} redis_node_ctx_type_t;
+
+#define REDIS_NODE_BATCH_COMMAND_MAX_ARGS 256
+typedef struct {
+  redis_node_t    *node;
+  redis_node_ctx_type_t ctxtype;
+  redisCallbackFn *callback;
+  void            *privdata;
+  size_t           cmdc;
+  size_t           argc;
+  const char      *argv[REDIS_NODE_BATCH_COMMAND_MAX_ARGS];
+  size_t           argvlen[REDIS_NODE_BATCH_COMMAND_MAX_ARGS];
+  unsigned         commands_sent;
+} node_batch_command_t;
+
+void node_batch_command_init(node_batch_command_t *batch, redis_node_t *node, redis_node_ctx_type_t ctxtype, redisCallbackFn *fn, void *privdata, unsigned cmd_count, ...);
+void node_batch_command_send(node_batch_command_t *batch);
+int node_batch_command_add_ngx_str(node_batch_command_t *batch, const ngx_str_t *arg);
+int node_batch_command_add(node_batch_command_t *batch, const char *arg, size_t arglen);
+unsigned node_batch_command_times_sent(node_batch_command_t *batch);
+
+
+
+redis_node_t *nodeset_node_create(redis_nodeset_t *ns, redis_connect_params_t *rcp);
+
+uint16_t redis_keyslot_from_channel_id(ngx_str_t *chid);
+
+uint16_t redis_crc16(uint16_t crc, const char *buf, int len);
+
+const char *node_nickname_cstr(redis_node_t *node);
+
+
+#define REDIS_NODE_CMD_TIMEQUEUE_LENGTH 64
+#define REDIS_NODE_PUBSUB_TIMEQUEUE_LENGTH 64
+
+typedef struct {
+  char                        *error;
+  char                        *name;
+  size_t                       count;
+  redis_node_command_stats_t  *stats;
+} redis_nodeset_command_stats_t;
+
+redis_node_command_stats_t *redis_nodeset_worker_command_stats_alloc(redis_nodeset_t *ns, size_t *node_stats_count);
+ngx_int_t redis_nodeset_global_command_stats_palloc_async(ngx_str_t *nodeset_name, ngx_pool_t *pool, callback_pt cb, void *pd);
+
+
+int redis_nodeset_stats_init(redis_nodeset_t *ns);
+void redis_nodeset_stats_destroy(redis_nodeset_t *ns);
+void redis_node_stats_init(redis_node_t *node);
+redis_node_command_stats_t *redis_node_stats_attach(redis_node_t *node);
+void redis_node_stats_detach(redis_node_t *node);
+void redis_node_stats_destroy(redis_node_t *node);
+redis_node_command_stats_t *redis_node_get_stats(redis_node_t *node);
+
+
+void node_command_time_start(redis_node_t *node, redis_node_cmd_tag_t cmdtag);
+void node_command_time_finish(redis_node_t *node, redis_node_cmd_tag_t cmdtag);
+void node_command_time_finish_relaxed(redis_node_t *node, redis_node_cmd_tag_t cmdtag);
+
+void node_pubsub_time_start(redis_node_t *node, redis_node_cmd_tag_t cmdtag);
+void node_pubsub_time_finish(redis_node_t *node, redis_node_cmd_tag_t cmdtag);
+void node_pubsub_time_finish_relaxed(redis_node_t *node, redis_node_cmd_tag_t cmdtag);
+
+void node_time_record(redis_node_t *node, redis_node_cmd_tag_t cmdtag, ngx_msec_t t);
+
+ngx_chain_t *redis_nodeset_stats_response_body_chain_palloc(redis_nodeset_command_stats_t *nstats , ngx_pool_t *pool);
+  
+#endif /* NCHAN_REDIS_NODESET_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_parser.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_parser.c
new file mode 100644
index 0000000..e3052dc
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_parser.c
@@ -0,0 +1,248 @@
+#include <nchan_module.h>
+#include <assert.h>
+
+#include "redis_nginx_adapter.h"
+
+#include <util/nchan_util.h>
+#include <util/nchan_msg.h>
+#include <store/store_common.h>
+#include "redis_nodeset_parser.h"
+#include "redis_nodeset.h"
+
+#define nchan_scan_str(str_src, cur, chr, str)\
+  (str)->data = (u_char *)memchr(cur, chr, (str_src)->len - (cur - (str_src)->data));\
+  if(!(str)->data)                            \
+    (str)->data = (str_src)->data + (str_src)->len;\
+  if((str)->data) {                           \
+    (str)->len = (str)->data - cur;           \
+    (str)->data = cur;                        \
+    cur+=(str)->len+1;                        \
+  }                                           \
+  else                                        \
+    goto fail
+
+
+static cluster_nodes_line_t   cluster_node_parsed_lines[MAX_CLUSTER_NODE_PARSED_LINES];
+static redis_connect_params_t parsed_connect_params[MAX_NODE_SLAVES_PARSED];
+
+static u_char *nodeset_parser_scan_cluster_nodes_slots_string(ngx_str_t *str, u_char *cur, redis_slot_range_t *r) {
+  ngx_str_t       slot_min_str, slot_max_str, slot;
+  ngx_int_t       slot_min,     slot_max;
+  u_char         *dash;
+  
+  if(cur == NULL) {
+    cur = str->data;
+  }
+  else if(cur >= str->data + str->len) {
+    return NULL;
+  }
+  if(str->len == 0) {
+    return NULL;
+  }
+  
+  nchan_scan_str(str, cur, ' ', &slot);
+  if(slot.data[0] == '[') {
+    //transitional special slot. ignore it.
+    return nodeset_parser_scan_cluster_nodes_slots_string(str, cur, r);
+  }
+  
+  dash = (u_char *)memchr(slot.data, '-', slot.len);
+  if(dash) {
+    slot_min_str.data = slot.data;
+    slot_min_str.len = dash - slot.data;
+    
+    slot_max_str.data = dash + 1;
+    slot_max_str.len = slot.len - (slot_max_str.data - slot.data);
+  }
+  else {
+    slot_min_str = slot;
+    slot_max_str = slot;
+  }
+  
+  slot_min = ngx_atoi(slot_min_str.data, slot_min_str.len);
+  slot_max = ngx_atoi(slot_max_str.data, slot_max_str.len);
+  
+  //DBG("slots: %i - %i", slot_min, slot_max);
+  
+  r->min = slot_min;
+  r->max = slot_max;
+  
+  return cur;
+  
+fail:
+  return NULL;
+}
+
+int parse_cluster_node_slots(cluster_nodes_line_t *l, redis_slot_range_t *ranges) {
+  //assumes the correct amount of ranges has already been allocated
+int                    i = 0;
+  redis_slot_range_t   range;
+  u_char              *cur = NULL;
+  while((cur = nodeset_parser_scan_cluster_nodes_slots_string(&l->slots, cur, &range)) != NULL) {
+    if(i > l->slot_ranges_count) {
+      return 0; //parsing more slot ranges than was expected
+    }
+    ranges[i]=range;
+    i++;
+  }
+  if(i !=l->slot_ranges_count) {
+    return 0; //parsed the wrong amount of slot ranges
+  }
+  return 1;
+}
+
+static char *nodeset_parser_scan_cluster_nodes_line(const char *line, cluster_nodes_line_t *l) {
+  u_char     *cur = (u_char *)line;
+  u_char     *max = cur;
+  u_char     *tmp;
+  ngx_str_t   rest_line;
+  
+  if(cur[0]=='\0')
+    return NULL;
+  
+  nchan_scan_split_by_chr(&max, strlen((char *)max), &rest_line, '\n');
+  l->line = rest_line;
+  
+  nchan_scan_until_chr_on_line(&rest_line, &l->id,           ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->address,      ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->flags,        ' ');
+  
+  nchan_scan_until_chr_on_line(&rest_line, &l->master_id,    ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->ping_sent,    ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->pong_recv,    ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->config_epoch, ' ');
+  nchan_scan_until_chr_on_line(&rest_line, &l->link_state,   ' ');
+  
+  if(nchan_ngx_str_substr((&l->flags), "master")) {
+    l->slots = rest_line;
+    l->master = 1;
+    
+    //how many slot ranges?
+    int                  i = 0;
+    redis_slot_range_t   range;
+    cur = NULL;
+    while((cur = nodeset_parser_scan_cluster_nodes_slots_string(&l->slots, cur, &range)) != NULL) {
+      i++;
+    }
+    l->slot_ranges_count = i;
+  }
+  else {
+    l->slots.data = NULL;
+    l->slots.len = 0;
+    l->slot_ranges_count = 0;
+    l->master = 0;
+  }
+  l->maybe_failed = nchan_ngx_str_substr((&l->flags), "fail?");
+  if(!l->maybe_failed)
+    l->failed = nchan_ngx_str_substr((&l->flags), "fail");
+
+  l->self = nchan_ngx_str_substr((&l->flags), "myself");
+  l->noaddr = nchan_ngx_str_substr((&l->flags), "noaddr");
+  l->handshake = nchan_ngx_str_substr((&l->flags), "handshake");
+  
+  l->connected = l->link_state.data[0]=='c' ? 1 : 0; //[c]onnected
+  
+  //redis >= 4.0 CLUSTER NODES format compatibility
+  if((tmp = memrchr(l->address.data, '@', l->address.len)) != NULL) {
+    l->address.len = tmp - l->address.data;
+  }
+  
+  if((tmp = memrchr(l->address.data, ':', l->address.len)) != NULL) {
+    //hostname and port from address
+    ngx_str_t   port;
+    l->hostname.data = l->address.data;
+    l->hostname.len = tmp - l->address.data;
+    port.len = l->address.len - l->hostname.len - 1;
+    port.data = &tmp[1];
+    l->port = ngx_atoi(port.data, port.len);
+  }
+  
+  cur = max;
+  if(&cur[-1] > (u_char *)line && cur[-1] == '\0')
+    cur--;
+  return (char *)cur;
+}
+
+redis_connect_params_t *parse_info_slaves(redis_node_t *node, const char *info, size_t *count) {
+  char                   slavebuf[20]="slave0:";
+  int                    i = 0, skipped = 0;
+  redis_connect_params_t rcp;
+  ngx_str_t              line;
+  while(nchan_get_rest_of_line_in_cstr(info, slavebuf, &line)) {
+    //ip=localhost,port=8537,state=online,offset=420,lag=1
+    ngx_str_t hostname, port;
+    nchan_scan_until_chr_on_line(&line, NULL,      '='); //ip=
+    nchan_scan_until_chr_on_line(&line, &hostname, ','); //ip=([^,]*),
+    nchan_scan_until_chr_on_line(&line, NULL,      '='); //port=
+    nchan_scan_until_chr_on_line(&line, &port,     ','); //port=([^,]*),
+    //don't care about the rest
+    rcp.hostname = hostname;
+    rcp.port = ngx_atoi(port.data, port.len);
+    rcp.password = node->connect_params.password;
+    
+    rcp.username.len = 0;
+    rcp.username.data = NULL;
+    
+    rcp.peername.len = 0;
+    rcp.db = node->connect_params.db;
+    
+    if(i < MAX_NODE_SLAVES_PARSED) {
+      parsed_connect_params[i]=rcp;
+    }
+    else {
+      node_log_error(node, "too many slaves, skipping slave %d", i+1);
+    }
+    i++;
+    ngx_sprintf((u_char *)slavebuf, "slave%d:", i);
+    
+    
+  }
+  *count = i - skipped;
+  return parsed_connect_params;
+}
+
+redis_connect_params_t *parse_info_master(redis_node_t *node, const char *info) {
+  redis_connect_params_t    rcp;
+  ngx_str_t                 port;
+  if(!nchan_get_rest_of_line_in_cstr(info, "master_host:", &rcp.hostname)) {
+    node_log_error(node, "failed to find master_host while discovering master");
+    return 0;
+  }
+  
+  if(!nchan_get_rest_of_line_in_cstr(info, "master_port:", &port)) {
+    node_log_error(node, "failed to find master_port while discovering master");
+    return 0;
+  }
+  rcp.port = ngx_atoi(port.data, port.len);
+  if(rcp.port == NGX_ERROR) {
+    node_log_error(node, "failed to parse master_port while discovering master");
+    return 0;
+  }
+  rcp.db = node->connect_params.db;
+  rcp.password = node->connect_params.password;
+
+  rcp.peername.data = NULL;
+  rcp.peername.len = 0;
+  
+  parsed_connect_params[0]=rcp;
+  return &parsed_connect_params[0];
+}
+
+cluster_nodes_line_t *parse_cluster_nodes(redis_node_t *node, const char *clusternodes, size_t *count) {
+  
+  const char           *line = clusternodes;
+  size_t                n = 0, discarded = 0;
+  cluster_nodes_line_t  l;
+  while((line = nodeset_parser_scan_cluster_nodes_line(line, &l)) != NULL) {
+    if(n > MAX_CLUSTER_NODE_PARSED_LINES) {
+      node_log_error(node, "too many cluster nodes, discarding line %d", n + discarded);
+      discarded++;
+    }
+    else {
+      cluster_node_parsed_lines[n]=l;
+      n++;
+    }
+  }
+  *count = n;
+  return cluster_node_parsed_lines;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_parser.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_parser.h
new file mode 100644
index 0000000..a14ae14
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_parser.h
@@ -0,0 +1,40 @@
+#ifndef REDIS_NODESET_PARSER_H
+#define REDIS_NODESET_PARSER_H
+
+#define MAX_CLUSTER_NODE_PARSED_LINES 512
+#define MAX_NODE_SLAVES_PARSED 512
+
+#include <nchan_module.h>
+#include "store-private.h"
+
+typedef struct {
+  ngx_str_t      line;
+  ngx_str_t      id;         //node id
+  ngx_str_t      address;    //address as known by redis
+  ngx_str_t      hostname;
+  ngx_int_t      port;
+  ngx_str_t      flags;
+  
+  ngx_str_t      master_id;  //if slave
+  ngx_str_t      ping_sent;
+  ngx_str_t      pong_recv;
+  ngx_str_t      config_epoch;
+  ngx_str_t      link_state; //connected or disconnected
+  
+  ngx_str_t      slots;
+  ngx_int_t      slot_ranges_count;
+  
+  unsigned       connected:1;
+  unsigned       master:1;
+  unsigned       noaddr:1;
+  unsigned       failed:1;
+  unsigned       maybe_failed:1;
+  unsigned       handshake:1;
+  unsigned       self:1;
+} cluster_nodes_line_t;
+
+redis_connect_params_t *parse_info_slaves(redis_node_t *node, const char *info, size_t *count);
+redis_connect_params_t *parse_info_master(redis_node_t *node, const char *info);
+cluster_nodes_line_t *parse_cluster_nodes(redis_node_t *node, const char *clusternodes, size_t *count);
+int parse_cluster_node_slots(cluster_nodes_line_t *l, redis_slot_range_t *ranges);
+#endif /*REDIS_NODESET_PARSER_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_stats.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_stats.c
new file mode 100644
index 0000000..d599ca7
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/redis_nodeset_stats.c
@@ -0,0 +1,578 @@
+#include "redis_nodeset.h"
+#include <assert.h>
+#include "store-private.h"
+#include <store/store_common.h>
+#include "store.h"
+
+#include <store/memory/store.h>
+#include <store/memory/store-private.h>
+#include <store/memory/ipc-handlers.h>
+
+redis_node_command_stats_t *redis_nodeset_worker_command_stats_alloc(redis_nodeset_t *ns, size_t *node_stats_count) {
+  if(!ns->node_stats.active) {
+    *node_stats_count = 0;
+    return NULL;
+  }
+  int numstats = nchan_list_count(&ns->node_stats.list);
+  *node_stats_count = numstats;
+  redis_node_command_stats_t *stats = ngx_alloc(sizeof(*stats) * numstats, ngx_cycle->log);
+  if(!stats) {
+    return NULL;
+  }
+    
+  int i=0;
+  redis_node_command_stats_t *cur;
+  for(cur = nchan_list_first(&ns->node_stats.list); cur != NULL; cur = nchan_list_next(cur)) {
+    assert(i<numstats);
+    stats[i] = *cur;
+    i++;
+  }
+  
+  return stats;
+}
+
+static void redis_node_merge_stats(redis_node_command_stats_t *dst, redis_node_command_stats_t *src) {
+  unsigned i;
+  for(i=0; i<NCHAN_REDIS_CMD_ENUM_LAST; i++) {
+    nchan_accumulator_merge(&dst->timings[i], &src->timings[i]);
+  }
+}
+
+typedef struct {
+  redis_nodeset_t               *ns;
+  ngx_pool_t                    *pool;
+  int                            waiting_for_reply_count;
+  redis_nodeset_command_stats_t  stats;
+  callback_pt                    cb;
+  void                          *pd;
+} nodeset_global_command_stats_state_t;
+
+
+static ngx_int_t redis_stats_request_callback(ngx_int_t statscount, void *d, void *pd);
+
+static void stats_request_to_self(void *pd) {
+  nodeset_global_command_stats_state_t  *state = pd;
+  size_t                                 stats_count;
+  redis_node_command_stats_t            *stats = redis_nodeset_worker_command_stats_alloc(state->ns, &stats_count);
+  
+  redis_stats_request_callback(stats_count, stats, pd);
+  ngx_free(stats);
+}
+
+ngx_int_t redis_nodeset_global_command_stats_palloc_async(ngx_str_t *nodeset_name, ngx_pool_t *pool, callback_pt cb, void *pd) {
+  redis_nodeset_t  *ns = NULL;
+  int i;
+  for(i=0; i < redis_nodeset_count; i++) {
+    if(nchan_strmatch(nodeset_name, 1, redis_nodeset[i].name)) {
+      ns = &redis_nodeset[i];
+      break;
+    }
+  }
+  
+  if(ns == NULL) {
+    return NGX_DECLINED;
+  }
+  
+  nodeset_global_command_stats_state_t *state = ngx_palloc(pool, sizeof(*state));
+  if(!state) {
+    return NGX_ERROR;
+  }
+  
+  ipc_t *ipc = nchan_memstore_get_ipc();
+  
+  state->waiting_for_reply_count = ipc->workers;
+  state->stats.stats = NULL;
+  state->stats.count = 0;
+  state->stats.error = NULL;
+  state->stats.name = ns->name;
+  state->ns = ns;
+  state->pool = pool;
+  state->cb = cb;
+  state->pd = pd;
+  
+  if(memstore_ipc_broadcast_redis_stats_request(ns, redis_stats_request_callback, state) != NGX_OK) {
+    //ask other workers about it
+    return NGX_ERROR;
+  }
+  
+  nchan_add_oneshot_timer(stats_request_to_self, state, 0);
+  return NGX_DONE;
+}
+
+static ngx_int_t redis_stats_request_callback(ngx_int_t statscount, void *d, void *pd) {
+  size_t                                 stats_count = statscount;
+  redis_node_command_stats_t            *stats = d;
+  nodeset_global_command_stats_state_t  *state = pd;
+  
+  state->waiting_for_reply_count--;
+  
+  unsigned i, j;
+  redis_node_command_stats_t *src, *dst;
+  
+  if(stats == NULL && stats_count > 0) {
+    state->stats.error = "Unable to allocate memory for redis server stats";
+    state->stats.count = 0;
+    stats_count = 0;
+  }
+  
+  for(i=0; i < stats_count; i++) {
+    src = &stats[i];
+    dst = NULL;
+    for(j=0; j < state->stats.count; j++) {
+      if(strlen(stats[i].id) == 0) {
+        if(strcmp(stats[i].name, state->stats.stats[j].name) == 0) {
+          //no id, but the names match
+          dst = &state->stats.stats[j];
+          break;
+        }
+      }
+      else if(strcmp(stats[i].id, state->stats.stats[j].id) == 0) {
+        dst = &state->stats.stats[j];
+        break;
+      }
+    }
+    
+    if(!dst) {
+      state->stats.stats = realloc(state->stats.stats, sizeof(*state->stats.stats) * (state->stats.count + 1));
+      if(!state->stats.stats) {
+        state->stats.error = "Unable to allcoate memory for redis server stats";
+        state->stats.count = 0;
+        break;
+      }
+      state->stats.count++;
+      dst = &state->stats.stats[j];
+      *dst = *src;
+    }
+    else {
+      redis_node_merge_stats(dst, src);
+    }
+  }
+  
+  if(state->waiting_for_reply_count <= 0) {
+    //we're done here
+    if(state->stats.stats && state->stats.count > 0) {
+      //move stats data to request's pool
+      redis_node_command_stats_t            *stats_in_pool = ngx_palloc(state->pool, sizeof(*stats_in_pool) * state->stats.count);
+      if(!stats_in_pool) {
+        state->stats.error = "Unable to allocate memory for redis server stats response";
+        state->stats.count = 0;
+        free(state->stats.stats);
+        state->stats.stats = NULL;
+      }
+      else {
+        memcpy(stats_in_pool, state->stats.stats, sizeof(*stats_in_pool) * state->stats.count);
+        free(state->stats.stats);
+        state->stats.stats = stats_in_pool;
+      }
+    }
+    
+    state->cb(state->stats.error ? NGX_ERROR : NGX_OK, &state->stats, state->pd);
+  }
+  
+  return NGX_OK;
+}
+
+typedef struct {
+  ngx_chain_t  chain;
+  ngx_buf_t    buf;
+  char         data[1];
+} bufchain_blob_t;
+
+static int bufchain_add(ngx_pool_t *pool, ngx_chain_t **first, ngx_chain_t **last, char *data) {
+  size_t datalen = strlen(data);
+  
+  bufchain_blob_t *bb = ngx_palloc(pool, sizeof(*bb) + datalen); // the +1 for the NUL byte is already in the struct as data[1];
+  if(!bb) {
+    return 0;
+  }
+  
+  strcpy(bb->data, data);
+  ngx_memzero(&bb->buf, sizeof(bb->buf));
+  bb->buf.memory = 1;
+  bb->buf.start = (u_char *)bb->data;
+  bb->buf.pos =  (u_char *)bb->data;
+  bb->buf.end =  (u_char *)bb->data + datalen;
+  bb->buf.last = bb->buf.end;
+  
+  bb->chain.buf = &bb->buf;
+  bb->chain.next = NULL;
+  
+  if(*first == NULL) {
+    *first = &bb->chain;
+  }
+  if(*last) {
+    (*last)->next = &bb->chain;
+  }
+  *last = &bb->chain;
+  
+  return 1;
+}
+
+static int compare_nodestats_by_name(const void *v1, const void *v2) {
+  const redis_node_command_stats_t *s1 = v1, *s2 = v2;
+  int ret = strcmp(s1->name, s2->name);
+  if(ret == 0) {
+    ret = strcmp(s1->id, s2->id);
+  }
+  return ret;
+}
+
+#define REDIS_NODE_STAT_FMT_ARGS(stat, cmdtag) \
+  ((int )nchan_accumulator_value(&stat->timings[NCHAN_REDIS_CMD_ ## cmdtag])), \
+  ((int )nchan_accumulator_weight(&stat->timings[NCHAN_REDIS_CMD_ ## cmdtag]))
+
+ngx_chain_t *redis_nodeset_stats_response_body_chain_palloc(redis_nodeset_command_stats_t *nstats , ngx_pool_t *pool) {
+  ngx_chain_t *first = NULL, *last = NULL;
+  
+  
+  char cstrbuf[4096];
+  cstrbuf[4095]='\0'; //just in case the sprintf output is 4095 chars long
+  
+  char *open_fmtstr = "{\n"
+                      "  \"upstream\": \"%s\",\n"
+                      "  \"nodes\": [\n";
+  
+  snprintf(cstrbuf, 4095, open_fmtstr, nstats->name);
+  if(!bufchain_add(pool, &first, &last, cstrbuf)) {
+    return NULL;
+  } 
+  
+  qsort(nstats->stats, nstats->count, sizeof(*nstats->stats), compare_nodestats_by_name);
+  
+  char *nodestat_fmtstr = "    {\n"
+                          "      \"address\"        : \"%s\",\n"
+                          "      \"id\"             : \"%s\",\n"
+                          "      \"command_totals\" : {\n"
+                          "        \"connect\"    : {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"pubsub_subscribe\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"pubsub_unsubsribe\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_change_subscriber_count\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_delete\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_find\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_get_message\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_get_large_message\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_publish_message\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_request_subscriber_info\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_get_subscriber_info_id\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_subscribe\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_unsubscribe\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"channel_keepalive\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"cluster_check\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"cluster_recover\": {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        },\n"
+                          "        \"other\"      : {\n"
+                          "          \"msec\"     : %u,\n"
+                          "          \"times\"    : %u\n"
+                          "        }\n"
+                          "      }\n"
+                          "    }%s\n";
+  unsigned i;
+  for(i=0; i < nstats->count; i++) {
+    redis_node_command_stats_t *stat = &nstats->stats[i];
+    snprintf(cstrbuf, 4095, nodestat_fmtstr, stat->name, stat->id,
+             REDIS_NODE_STAT_FMT_ARGS(stat, CONNECT),
+             REDIS_NODE_STAT_FMT_ARGS(stat, PUBSUB_SUBSCRIBE),
+             REDIS_NODE_STAT_FMT_ARGS(stat, PUBSUB_UNSUBSCRIBE),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_CHANGE_SUBSCRIBER_COUNT),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_DELETE),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_FIND),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_GET_MESSAGE),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_GET_LARGE_MESSAGE),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_PUBLISH),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_REQUEST_SUBSCRIBER_INFO),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_GET_SUBSCRIBER_INFO_ID),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_SUBSCRIBE),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_UNSUBSCRIBE),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CHANNEL_KEEPALIVE),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CLUSTER_CHECK),
+             REDIS_NODE_STAT_FMT_ARGS(stat, CLUSTER_RECOVER),
+             REDIS_NODE_STAT_FMT_ARGS(stat, OTHER),
+             i + 1 < nstats->count ? "," : ""
+    );
+    if(!bufchain_add(pool, &first, &last, cstrbuf)) {
+      return NULL;
+    } 
+  }
+  
+  if(!bufchain_add(pool, &first, &last, "  ]\n}\n")) {
+    return NULL;
+  }
+  
+  last->buf->last_in_chain = 1;
+  last->buf->last_buf = 1;
+  last->buf->flush = 1;
+  return first;
+}
+
+static void nodeset_node_stats_cleanup_handler(ngx_event_t *ev) {
+  redis_nodeset_t *ns = ev->data;
+  
+  if(!ev->timedout) {
+    return;
+  }
+  int pending_removal = 0;
+  redis_node_command_stats_t *stats, *next;
+  for(stats = nchan_list_first(&ns->node_stats.list); stats != NULL; stats = next) {
+    next = nchan_list_next(stats);
+    if(stats->attached) {
+      continue;
+    }
+    if(ngx_time() - stats->detached_time > ns->settings.node_stats.max_detached_time_sec) {
+      nchan_list_remove(&ns->node_stats.list, stats);
+    }
+    else {
+      pending_removal++;
+    }
+  }
+  
+  if(pending_removal > 0) {
+    ngx_add_timer(ev, ns->settings.node_stats.max_detached_time_sec*1000);
+  }
+}
+
+int redis_nodeset_stats_init(redis_nodeset_t *ns) {
+  if(!ns->settings.node_stats.enabled) {
+    //nothing to init, no errors either
+    ns->node_stats.active = 0;
+    return 1;
+  }
+  if(nchan_list_init(&ns->node_stats.list, sizeof(redis_node_command_stats_t), "node stats") != NGX_OK) {
+    return 0;
+  }
+  if(nchan_init_timer(&ns->node_stats.cleanup_timer, nodeset_node_stats_cleanup_handler, ns) != NGX_OK) {
+    return 0;
+  }
+  ns->node_stats.active = 1;
+  return 1;
+}
+
+void redis_nodeset_stats_destroy(redis_nodeset_t *ns) {
+  if(!ns->node_stats.active) {
+    return;
+  }
+  if(ns->node_stats.cleanup_timer.timer_set) {
+    ngx_del_timer(&ns->node_stats.cleanup_timer);
+  }
+  nchan_list_empty(&ns->node_stats.list);
+}
+
+void redis_node_stats_init(redis_node_t *node) {
+  nchan_timequeue_init(&node->stats.timequeue.cmd, REDIS_NODE_CMD_TIMEQUEUE_LENGTH, NCHAN_REDIS_CMD_ANY);
+  nchan_timequeue_init(&node->stats.timequeue.pubsub, REDIS_NODE_PUBSUB_TIMEQUEUE_LENGTH, NCHAN_REDIS_CMD_ANY);
+  node->stats.data = NULL;
+}
+
+void redis_node_stats_destroy(redis_node_t *node) {
+  nchan_timequeue_destroy(&node->stats.timequeue.cmd);
+  nchan_timequeue_destroy(&node->stats.timequeue.pubsub);
+}
+
+redis_node_command_stats_t *redis_node_stats_attach(redis_node_t *node) {
+  redis_nodeset_t *ns = node->nodeset;
+  if(!ns->node_stats.active) {
+    return NULL;
+  }
+  if(node->stats.data) {
+    //already attached
+    return node->stats.data;
+  }
+  
+  const char    *name = node_nickname_cstr(node);
+  ngx_str_t     *id = node->cluster.enabled ? &node->cluster.id : &node->run_id;
+  
+  redis_node_command_stats_t *stats;
+  for(stats = nchan_list_first(&ns->node_stats.list); stats != NULL; stats = nchan_list_next(stats)) {
+    if(stats->attached) {
+      continue;
+    }
+    size_t stats_id_len = strlen(stats->id);
+    
+    if(strcmp(name, stats->name) == 0) {
+      //match by name  
+      if(id->len > 0 && stats_id_len > 0 && !nchan_strmatch(id, 1, stats->id)) {
+          //ids present for both, and they don't match
+        continue;
+      }
+      else {
+        //either ids match, or at least one is missing. When don't have a definite id mismatch, 
+        //we assume the stats are for the same node based on its name (address:port)
+        if(stats_id_len == 0 && id->len > 0) {
+          //stats has no id. assume it's a match by name (addr:port), and copy the id
+          ngx_snprintf((u_char *)stats->id, sizeof(stats->id), "%V%Z", id);
+          break;
+        }
+        
+        break;
+      }
+    }
+  }
+  
+  if(!stats) {
+    //create new stats entry
+    stats = nchan_list_append(&ns->node_stats.list);
+    if(!stats) {
+      node_log_error(node, "Failed to create stats data");
+      return NULL;
+    }
+    ngx_snprintf((u_char *)stats->id, sizeof(stats->id), "%V%Z", id);
+    ngx_snprintf((u_char *)stats->name, sizeof(stats->name), "%s%Z", name);
+    //no buffer overflows pls
+    stats->id[sizeof(stats->id)-1]='\0';
+    stats->name[sizeof(stats->name)-1]='\0';
+    
+    stats->attached = 0;
+    stats->detached_time = 0;
+    
+    int i;
+    for(i=0; i<NCHAN_REDIS_CMD_ENUM_LAST; i++) {
+      nchan_accumulator_init(&stats->timings[i], ACCUMULATOR_SUM, 0);
+    }
+  }
+  
+  assert(!stats->attached);
+  stats->attached = 1;
+  node->stats.data = stats;
+  return stats;
+}
+
+void redis_node_stats_detach(redis_node_t *node) {
+  redis_node_command_stats_t *stats = node->stats.data;
+  redis_nodeset_t            *ns = node->nodeset;
+  if (!ns->node_stats.active || stats == NULL) {
+    //not attached
+    return;
+  }
+  
+  node->stats.data = NULL;
+  
+  stats->attached = 0;
+  stats->detached_time = ngx_time();
+  
+  if(!ns->node_stats.cleanup_timer.timer_set) {
+    ngx_add_timer(&ns->node_stats.cleanup_timer, ns->settings.node_stats.max_detached_time_sec*1000);
+  }
+}
+
+redis_node_command_stats_t *redis_node_get_stats(redis_node_t *node) {
+  if(node->stats.data) {
+    return node->stats.data;
+  }
+  
+  return redis_node_stats_attach(node);
+}
+
+void node_time_record(redis_node_t *node, redis_node_cmd_tag_t cmdtag, ngx_msec_t t) {
+  if(!node->nodeset->node_stats.active) {
+    return;
+  }
+  
+  redis_node_command_stats_t *stats = redis_node_get_stats(node);
+  if(stats == NULL) {
+    node_log_error(node, "Unable to find stats data for node. cannot record command timing");
+    return;
+  }
+  nchan_accumulator_update(&stats->timings[cmdtag], t);
+}
+
+static void node_time_start(redis_node_t *node, nchan_timequeue_t *tq, redis_node_cmd_tag_t cmdtag) {
+  if(!node->nodeset->node_stats.active) {
+    return;
+  }
+  
+  assert(&node->stats.timequeue.cmd == tq || &node->stats.timequeue.pubsub == tq);
+  nchan_timequeue_queue(tq, cmdtag);
+}
+
+void node_command_time_start(redis_node_t *node, redis_node_cmd_tag_t cmdtag) {
+  node_time_start(node, &node->stats.timequeue.cmd, cmdtag);
+}
+
+void node_pubsub_time_start(redis_node_t *node, redis_node_cmd_tag_t cmdtag) {
+  node_time_start(node, &node->stats.timequeue.pubsub, cmdtag);
+}
+
+static void node_time_finish(redis_node_t *node, nchan_timequeue_t *tq, redis_node_cmd_tag_t cmdtag, int strict_mode) {
+  if(!node->nodeset->node_stats.active) {
+    return;
+  }
+  
+  assert(&node->stats.timequeue.cmd == tq || &node->stats.timequeue.pubsub == tq);
+  nchan_timequeue_time_t    tqtime;
+  
+  if(!nchan_timequeue_dequeue(tq, strict_mode ? cmdtag : NCHAN_REDIS_CMD_ANY, &tqtime)) {
+    if(strict_mode) {
+      node_log_error(node, "timequeue dequeue error (expected_tag: %i, retrieved: %i)", cmdtag, tqtime.tag);
+      return;
+    }
+    else if(tqtime.time_start == 0) {
+      //fudge the time to make it seem like a o-time command
+      tqtime.time_start = ngx_current_msec;
+    }
+  }
+  ngx_msec_t t = ngx_current_msec - tqtime.time_start;
+  
+  assert(cmdtag >= 0 && cmdtag < NCHAN_REDIS_CMD_ENUM_LAST);
+  node_time_record(node, cmdtag, t);
+}
+
+void node_command_time_finish(redis_node_t *node, redis_node_cmd_tag_t cmdtag) {
+  node_time_finish(node, &node->stats.timequeue.cmd, cmdtag, 1);
+}
+
+void node_pubsub_time_finish(redis_node_t *node, redis_node_cmd_tag_t cmdtag) {
+  node_time_finish(node, &node->stats.timequeue.pubsub, cmdtag, 1);
+}
+
+void node_command_time_finish_relaxed(redis_node_t *node, redis_node_cmd_tag_t cmdtag) {
+  node_time_finish(node, &node->stats.timequeue.cmd, cmdtag, 0);
+}
+void node_pubsub_time_finish_relaxed(redis_node_t *node, redis_node_cmd_tag_t cmdtag) {
+  node_time_finish(node, &node->stats.timequeue.pubsub, cmdtag, 0);
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store-private.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store-private.h
new file mode 100644
index 0000000..6c830c0
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store-private.h
@@ -0,0 +1,114 @@
+#ifndef NCHAN_REDIS_STORE_PRIVATE_H
+#define NCHAN_REDIS_STORE_PRIVATE_H
+
+#define NCHAN_CHANHEAD_EXPIRE_SEC 1
+#define NCHAN_CHANHEAD_CLUSTER_ORPHAN_EXPIRE_SEC 15
+#define NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE 0xB00F
+
+#define NCHAN_REDIS_UNIQUE_REQUEST_ID_KEY "nchan:unique_request_id"
+
+#include <nchan_module.h>
+#include "uthash.h"
+#if NCHAN_HAVE_HIREDIS_WITH_SOCKADDR
+#include <hiredis/hiredis.h>
+#include <hiredis/async.h>
+#else
+#include <store/redis/hiredis/hiredis.h>
+#include <store/redis/hiredis/async.h>
+#endif
+#include <util/nchan_reaper.h>
+#include <util/nchan_rbtree.h>
+#include <util/nchan_list.h>
+#include <store/spool.h>
+
+#include "redis_nodeset.h"
+#define REDIS_LUA_HASH_LENGTH 40
+#define REDIS_NODESET_NOT_READY_MAX_RETRIES 2
+
+extern redis_nodeset_t  redis_nodeset[NCHAN_MAX_NODESETS];
+extern int              redis_nodeset_count;
+extern char            *redis_worker_id;
+extern char            *nchan_redis_blankname;
+
+
+typedef struct rdstore_channel_head_s rdstore_channel_head_t;
+
+typedef enum {REDIS_PUBSUB_SUBSCRIBING, REDIS_PUBSUB_SUBSCRIBED, REDIS_PUBSUB_UNSUBSCRIBED} redis_pubsub_status_t;
+
+struct rdstore_channel_head_s {
+  ngx_str_t                    id; //channel id
+  channel_spooler_t            spooler;
+  ngx_uint_t                   generation; //subscriber pool generation.
+  chanhead_pubsub_status_t     status;
+  ngx_uint_t                   sub_count;
+  ngx_int_t                    fetching_message_count;
+  ngx_uint_t                   internal_sub_count;
+  ngx_event_t                  keepalive_timer;
+  ngx_msec_t                   keepalive_interval;
+  nchan_msg_id_t               last_msgid;
+  
+  void                        *redis_subscriber_privdata;
+  //rdstore_channel_head_cluster_data_t cluster;
+  
+  ngx_int_t                    reserved;
+  
+  struct {                   //redis
+    int                          generation;
+    ngx_str_t                    pubsub_id; //NULL-terminated, btw
+    redis_nodeset_t             *nodeset;
+    struct {                   //node
+      redis_node_t                *cmd;
+      redis_node_t                *pubsub;
+    }                            node;
+    
+    struct {                  //linked list links
+      struct {
+        rdstore_channel_head_t      *prev;
+        rdstore_channel_head_t      *next;
+      }                            nodeset;
+      struct {
+        rdstore_channel_head_t      *prev;
+        rdstore_channel_head_t      *next;
+      }                            node_cmd;
+      struct {
+        rdstore_channel_head_t      *prev;
+        rdstore_channel_head_t      *next;
+      }                            node_pubsub;
+      unsigned                     in_disconnected_cmd_list:1;
+      unsigned                     in_disconnected_pubsub_list:1;
+    }                            slist;
+    
+  }                            redis;
+  
+  struct {                   //gc
+    rdstore_channel_head_t      *prev;
+    rdstore_channel_head_t      *next;
+    time_t                       time;
+    unsigned                     in_reaper:1;
+  }                            gc;
+  
+  
+  
+  redis_pubsub_status_t        pubsub_status;
+  unsigned                     meta:1;
+  unsigned                     shutting_down:1;
+  UT_hash_handle               hh;
+};
+
+
+void redisCheckErrorCallback(redisAsyncContext *ac, void *r, void *privdata);
+void redisEchoCallback(redisAsyncContext *ac, void *r, void *privdata);
+int redisReplyOk(redisAsyncContext *c, void *r);
+ngx_int_t parse_redis_url(ngx_str_t *url, redis_connect_params_t *rcp);
+ngx_int_t rdstore_initialize_chanhead_reaper(nchan_reaper_t *reaper, char *name);
+
+ngx_int_t redis_chanhead_gc_add(rdstore_channel_head_t *head, ngx_int_t expire, const char *reason);
+ngx_int_t redis_chanhead_gc_withdraw(rdstore_channel_head_t *head);
+ngx_int_t redis_chanhead_catch_up_after_reconnect(rdstore_channel_head_t *ch);
+ngx_int_t redis_chanhead_set_pubsub_status(rdstore_channel_head_t *head, redis_node_t *node,  redis_pubsub_status_t status);
+
+
+ngx_int_t ensure_chanhead_pubsub_subscribed_if_needed(rdstore_channel_head_t *ch);
+
+
+#endif //NCHAN_REDIS_STORE_PRIVATE_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store.h
new file mode 100755
index 0000000..23d05f2
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/redis/store.h
@@ -0,0 +1,26 @@
+#ifndef NCHAN_REDIS_STORE_H
+#define NCHAN_REDIS_STORE_H
+
+#define NCHAN_REDIS_DEFAULT_PING_INTERVAL_TIME 4*60
+#define NCHAN_REDIS_DEFAULT_PUBSUB_MESSAGE_MSGKEY_SIZE 1024*5
+extern const nchan_backoff_settings_t NCHAN_REDIS_DEFAULT_CLUSTER_CHECK_INTERVAL;
+extern const nchan_backoff_settings_t NCHAN_REDIS_DEFAULT_RECONNECT_DELAY;
+extern const nchan_backoff_settings_t NCHAN_REDIS_DEFAULT_CLUSTER_RECOVERY_DELAY;
+extern const nchan_backoff_settings_t NCHAN_REDIS_DEFAULT_IDLE_CHANNEL_TTL;
+
+extern nchan_store_t  nchan_store_redis;
+
+ngx_int_t nchan_store_redis_fakesub_add(ngx_str_t *channel_id, nchan_loc_conf_t *cf, ngx_int_t count, uint8_t shutting_down);
+void redis_store_prepare_to_exit_worker(); // hark! a hack!!
+
+ngx_int_t nchan_store_redis_add_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf);
+ngx_int_t nchan_store_redis_remove_active_loc_conf(ngx_conf_t *cf, nchan_loc_conf_t *loc_conf);
+
+int nchan_store_redis_ready(nchan_loc_conf_t *cf);
+int nchan_store_redis_validate_url(ngx_str_t *url);
+
+
+
+ngx_int_t redis_store_callback_on_connected(nchan_loc_conf_t *cf, ngx_msec_t max_wait, callback_pt cb, void *privdata);
+
+#endif // NCHAN_REDIS_STORE_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/spool.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/spool.c
new file mode 100755
index 0000000..5dcd466
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/spool.c
@@ -0,0 +1,1293 @@
+#include <nchan_module.h>
+#include "spool.h"
+#include <assert.h>
+
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+//#define DEBUG_LEVEL NGX_LOG_WARN
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SPOOL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SPOOL:" fmt, ##arg)
+
+#define NCHAN_SPOOL_FETCHMSG_MAX_TIMES 20
+
+//////// SPOOLs -- Subscriber Pools  /////////
+
+static ngx_int_t spool_remove_subscriber(subscriber_pool_t *, spooled_subscriber_t *);
+static void spool_bubbleup_dequeue_handler(subscriber_pool_t *spool, subscriber_t *sub, channel_spooler_t *spl);
+//static void spool_bubbleup_bulk_dequeue_handler(subscriber_pool_t *spool, subscriber_type_t type, ngx_int_t count, channel_spooler_t *spl);
+static ngx_int_t spool_respond_general(subscriber_pool_t *self, nchan_msg_t *msg, ngx_int_t status_code, void *code_data, unsigned notice);
+static ngx_int_t spool_transfer_subscribers(subscriber_pool_t *spool, subscriber_pool_t *newspool, uint8_t update_subscriber_last_msgid);
+static ngx_int_t destroy_spool(subscriber_pool_t *spool);
+static ngx_int_t remove_spool(subscriber_pool_t *spool);
+static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool);
+
+static nchan_msg_id_t     latest_msg_id = NCHAN_NEWEST_MSGID;
+static nchan_msg_id_t     oldest_msg_id = NCHAN_OLDEST_MSGID;
+
+static subscriber_pool_t *find_spool(channel_spooler_t *spl, nchan_msg_id_t *id) {
+  rbtree_seed_t      *seed = &spl->spoolseed;
+  ngx_rbtree_node_t  *node;
+  subscriber_pool_t  *spool = NULL;
+  
+  if(id->time == NCHAN_NEWEST_MSGID_TIME || spl->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
+    spool = &spl->current_msg_spool;
+    spool->msg_status = MSG_EXPECTED;
+  }
+  else if((node = rbtree_find_node(seed, id)) != NULL) {
+    spool = rbtree_data_from_node(node);
+  }
+  
+  return spool;
+}
+/*
+typedef struct {
+  int                  n;
+  subscriber_pool_t   *msg_expected_spool;
+  
+  int                  err;
+} spool_verify_data_t;
+
+
+static void log_spool_err(spool_verify_data_t *d, subscriber_pool_t *spool, char *str) {
+  ERR("%p %s [%s]", spool, msg_status_to_chr(spool->msg_status), str);
+  d->err = 1;
+}
+
+static int validate_spooler_walker(rbtree_seed_t *seed, subscriber_pool_t *spool, spool_verify_data_t *d) {
+  if(spool->msg_status == MSG_EXPECTED) {
+    if(d->msg_expected_spool) {
+      log_spool_err(d, spool, "Found more than 1 spool with MSG_EXPECTED status");
+    }
+    else {
+      d->msg_expected_spool = spool;
+    }
+  }
+  else {
+    if(spool->sub_count == 0) {
+      log_spool_err(d, spool, "empty spool (not MSG_EXPECTED)");
+    }
+  }
+  d->n++;
+
+  return NGX_OK;
+}
+
+static int validate_spooler(channel_spooler_t *spl, char *str) {
+  spool_verify_data_t  d;
+  ngx_memzero(&d, sizeof(d));
+  rbtree_walk(&spl->spoolseed, (rbtree_walk_callback_pt )validate_spooler_walker, &d);
+  if(d.err == 0) {
+    ERR("%s: validated %i spools in channel spooler %V", str, d.n, spl->chid);
+  }
+  else {
+    ERR("%s: validating %i spools  FAILED in channel spooler %V; %i error(s).", str, d.n, spl->chid, d.err);
+  }
+  return d.err == 0;
+}
+*/
+
+static void spool_reserve(subscriber_pool_t *spool) {
+  spool->reserved++;
+}
+static void spool_release(subscriber_pool_t *spool) {
+  spool->reserved--;
+  ngx_int_t immortal_spool = spool->id.time == NCHAN_NEWEST_MSGID_TIME;
+  if(!immortal_spool && spool->reserved == 0 && spool->sub_count == 0) {
+    destroy_spool(spool);
+  }
+}
+
+static int msg_ids_equal(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
+  int           i, max;
+  int16_t      *tags1, *tags2;
+  
+  if(id1->time != id2->time || id1->tagcount != id2->tagcount) return 0;
+  max = id1->tagcount;
+  if(max <= NCHAN_FIXED_MULTITAG_MAX) {
+    tags1 = id1->tag.fixed;
+    tags2 = id2->tag.fixed;
+  }
+  else {
+    tags1 = id1->tag.allocd;
+    tags2 = id2->tag.allocd;
+  }
+  
+  
+  for(i=0; i < max; i++) {
+    if(tags1[i] != tags2[i]) return 0;
+  }
+  return 1;
+}
+
+static void spooler_timer_handler(ngx_event_t *ev) {
+  spooler_event_ll_t *spl_ev = container_of(ev, spooler_event_ll_t, ev);
+  spl_ev->callback(ev->data);
+  if(spl_ev->prev) {
+    spl_ev->prev->next = spl_ev->next;
+  }
+  if(spl_ev->next) {
+    spl_ev->next->prev = spl_ev->prev;
+  }
+  if(spl_ev->spooler->spooler_dependent_events == spl_ev) {
+    spl_ev->spooler->spooler_dependent_events = spl_ev->next;
+  }
+  ngx_free(spl_ev);
+}
+
+ngx_event_t *spooler_add_timer(channel_spooler_t *spl, ngx_msec_t timeout, void (*cb)(void *), void (*cancel)(void *), void *pd) {
+  spooler_event_ll_t  *spl_ev = ngx_alloc(sizeof(*spl_ev), ngx_cycle->log);
+  ngx_memzero(&spl_ev->ev, sizeof(spl_ev->ev));
+  nchan_init_timer(&spl_ev->ev, spooler_timer_handler, pd);
+  
+  spl_ev->callback = cb;
+  spl_ev->cancel = cancel;
+  
+  spl_ev->spooler = spl;
+  spl_ev->next = spl->spooler_dependent_events;
+  spl_ev->prev = NULL;
+  if(spl->spooler_dependent_events) {
+    spl->spooler_dependent_events->prev = spl_ev;
+  }
+  spl->spooler_dependent_events = spl_ev;
+  
+  ngx_add_timer(&spl_ev->ev, timeout);
+  return &spl_ev->ev;
+}
+
+static void fetchmsg_ev_handler(ngx_event_t *ev) {
+  subscriber_pool_t *spool = (subscriber_pool_t *)ev->data;
+  DBG("stack-overflow-buster fetchmsg event for spool %p", spool);
+  if(spool->msg_status == MSG_INVALID) {
+    spool_fetch_msg(spool);
+  }
+}
+
+static ngx_inline void init_spool(channel_spooler_t *spl, subscriber_pool_t *spool, nchan_msg_id_t *id) {
+  nchan_copy_new_msg_id(&spool->id, id);
+  spool->msg = NULL;
+  spool->msg_status = MSG_INVALID;
+  
+  spool->first = NULL;
+  spool->sub_count = 0;
+  spool->non_internal_sub_count = 0;
+  //spool->generation = 0;
+  //spool->responded_count = 0;
+  spool->reserved = 0;
+  ngx_memzero(&spool->fetchmsg_ev, sizeof(spool->fetchmsg_ev));
+  nchan_init_timer(&spool->fetchmsg_ev, fetchmsg_ev_handler, spool);
+  spool->fetchmsg_current_count=0;
+  spool->fetchmsg_prev_msec=0;
+  
+  spool->spooler = spl;
+}
+
+static subscriber_pool_t *get_spool(channel_spooler_t *spl, nchan_msg_id_t *id) {
+  rbtree_seed_t      *seed = &spl->spoolseed;
+  ngx_rbtree_node_t  *node;
+  subscriber_pool_t *spool;
+  
+  
+  if(id->time == NCHAN_NEWEST_MSGID_TIME || spl->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
+    spool = &spl->current_msg_spool;
+    spool->msg_status = MSG_EXPECTED;
+    return &spl->current_msg_spool;
+  }
+  
+  if((node = rbtree_find_node(seed, id)) == NULL) {
+    
+    if((node = rbtree_create_node(seed, sizeof(*spool))) == NULL) {
+      ERR("can't create rbtree node for spool");
+      return NULL;
+    }
+    
+   // DBG("CREATED spool node %p for msgid %V", node, msgid_to_str(id));
+    spool = (subscriber_pool_t *)rbtree_data_from_node(node);
+    
+    init_spool(spl, spool, id);
+    
+    if(rbtree_insert_node(seed, node) != NGX_OK) {
+      ERR("couldn't insert spool node");
+      rbtree_destroy_node(seed, node);
+      return NULL;
+    }
+  }
+  else {
+    spool = (subscriber_pool_t *)rbtree_data_from_node(node);
+    DBG("found spool node %p with msgid %V", node, msgid_to_str(id));
+    assert(spool->id.time == id->time);
+  }
+  return spool;
+}
+
+static ngx_int_t spool_nextmsg(subscriber_pool_t *spool, nchan_msg_id_t *new_last_id) {
+  subscriber_pool_t      *newspool;
+  channel_spooler_t      *spl = spool->spooler;
+  
+  ngx_int_t               immortal_spool = spool->id.time == NCHAN_NEWEST_MSGID_TIME;
+  int16_t                 largetags[NCHAN_MULTITAG_MAX];
+  nchan_msg_id_t          new_id = NCHAN_ZERO_MSGID;
+  
+  if(spl->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
+    if(immortal_spool) {
+      return NGX_OK; //nothing to do, already on the newest spool
+    }
+    else {
+      new_last_id = &latest_msg_id;
+    }
+  }
+  
+  nchan_copy_msg_id(&new_id, &spool->id, largetags);
+  nchan_update_multi_msgid(&new_id, new_last_id, largetags);
+  
+  //ERR("spool %p nextmsg (%V) --", spool, msgid_to_str(&spool->id));
+  //ERR(" --  update with               (%V) --", msgid_to_str(new_last_id));
+  //ERR(" -- newid                       %V", msgid_to_str(&new_id));
+  
+  if(msg_ids_equal(&spool->id, &new_id)) {
+    ERR("nextmsg id same as curmsg (%V)", msgid_to_str(&spool->id));
+    assert(0);
+  }
+  else {
+    newspool = !immortal_spool ? find_spool(spl, &new_id) : get_spool(spl, &new_id);
+    
+    if(newspool != NULL) {
+      //move subs to next, already existing spool
+      assert(spool != newspool);
+      spool_transfer_subscribers(spool, newspool, 0);
+      if(!immortal_spool && spool->reserved == 0) destroy_spool(spool);
+    }
+    else {
+      //next spool doesn't exist. reuse this one as the next
+      ngx_rbtree_node_t       *node;
+      assert(!immortal_spool);
+      node = rbtree_node_from_data(spool);
+      rbtree_remove_node(&spl->spoolseed, node);
+      nchan_copy_msg_id(&spool->id, &new_id, NULL);
+      rbtree_insert_node(&spl->spoolseed, node);
+      spool->msg_status = MSG_INVALID;
+      spool->msg = NULL;
+      newspool = spool;
+      
+      /*
+      newspool = get_spool(spl, &new_id);
+      assert(spool != newspool);
+      spool_transfer_subscribers(spool, newspool, 0);
+      destroy_spool(spool);
+      */
+    }
+
+    
+    if(newspool->non_internal_sub_count > 0 && spl->handlers->use != NULL) {
+      spl->handlers->use(spl, spl->handlers_privdata);
+    }
+    
+    if(newspool->sub_count > 0) {
+      switch(newspool->msg_status) {
+        case MSG_CHANNEL_NOTREADY:
+          newspool->msg_status = MSG_INVALID;
+          /*fallthrough*/
+        case MSG_INVALID:
+          spool_fetch_msg(newspool);
+          break;
+        case MSG_EXPECTED:
+          spool_respond_general(newspool, NULL, NGX_HTTP_NO_CONTENT, NULL, 0);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t spool_fetch_msg_callback(ngx_int_t code, nchan_msg_t *msg, fetchmsg_data_t *data) {
+  nchan_msg_status_t    findmsg_status = code;
+  nchan_msg_status_t    prev_status;
+  subscriber_pool_t    *spool, *nuspool;
+  channel_spooler_t    *spl = data->spooler;
+  int                   free_msg_id = 1;
+  
+  assert(spl->fetching_strategy != NCHAN_SPOOL_PASSTHROUGH);
+  
+  if(spl && data == spl->fetchmsg_cb_data_list) {
+    spl->fetchmsg_cb_data_list = data->next;
+  }
+  if(data->next) {
+    data->next->prev = data->prev;
+  }
+  if(data->prev) {
+    data->prev->next = data->next;
+  }
+  
+  if(spl == NULL) { //channel already deleted
+    nchan_free_msg_id(&data->msgid);
+    ngx_free(data);
+    return NGX_OK;
+  }
+  
+  if(spl->handlers->get_message_finish) {
+    spl->handlers->get_message_finish(spl, spl->handlers_privdata);
+  }
+  
+  if((spool = find_spool(spl, &data->msgid)) == NULL) {
+    DBG("spool for msgid %V not found. discarding getmsg callback response.", msgid_to_str(&data->msgid));
+    nchan_free_msg_id(&data->msgid);
+    ngx_free(data);
+    return NGX_ERROR;
+  }
+  
+  prev_status = spool->msg_status;
+  
+  switch(findmsg_status) {
+    case MSG_FOUND:
+      spool->msg_status = findmsg_status;
+      DBG("fetchmsg callback for spool %p msg FOUND %p %V", spool, msg, msgid_to_str(&msg->id));
+      assert(msg != NULL);
+      spool->msg = msg;
+      spool_respond_general(spool, spool->msg, 0, NULL, 0);
+      
+      spool_nextmsg(spool, &msg->id);      
+      break;
+    
+    case MSG_EXPECTED:
+      // ♫ It's gonna be the future soon ♫
+      if(spool->id.time == NCHAN_NTH_MSGID_TIME) {
+        //wait for message in the NEWEST_ID spool
+        spool_nextmsg(spool, &latest_msg_id); 
+      }
+      else {
+        spool->msg_status = findmsg_status;
+        DBG("fetchmsg callback for spool %p msg EXPECTED", spool);
+        spool_respond_general(spool, NULL, NGX_HTTP_NO_CONTENT, NULL, 0);
+        assert(msg == NULL);
+        spool->msg = NULL;
+      }
+      break;
+    
+    case MSG_CHANNEL_NOTREADY:
+      //just wait it out
+      spool->msg = NULL;
+      spool->msg_status = findmsg_status;
+      break;
+      
+    case MSG_NOTFOUND:
+      if(spl->fetching_strategy == NCHAN_SPOOL_FETCH_IGNORE_MSG_NOTFOUND) {
+        spool->msg_status = prev_status;
+        break;
+      }
+      /*fallthrough*/
+    case MSG_EXPIRED:
+      //is this right?
+      //TODO: maybe message-expired notification
+      spool->msg_status = findmsg_status;
+      spool_respond_general(spool, NULL, NGX_HTTP_NO_CONTENT, NULL, 0);
+      nuspool = get_spool(spool->spooler, &oldest_msg_id);
+      if(spool != nuspool) {
+        spool_transfer_subscribers(spool, nuspool, 1);
+        if(spool->reserved == 0) {
+          destroy_spool(spool);
+        }
+        spool_fetch_msg(nuspool);
+      }
+      else if(spool->id.tagcount == 1 && nchan_compare_msgids(&spool->id, &oldest_msg_id) == 0) {
+        // oldest msgid not found or expired. that means there are no messages in this channel, 
+        // so move these subscribers over to the current_msg_spool
+        nuspool = get_spool(spool->spooler, &latest_msg_id);
+        assert(spool != nuspool);
+        spool_transfer_subscribers(spool, nuspool, 1);
+        if(spool->reserved == 0) {
+          destroy_spool(spool);
+        }
+      }
+      else if(spool == &spool->spooler->current_msg_spool) {
+        //sit there and wait, i guess
+        spool->msg_status = MSG_EXPECTED;
+      }
+      else {
+        ERR("Unexpected spool == nuspool during spool fetch_msg_callback. This is weird, please report this to the developers. findmsg_status: %i", findmsg_status);
+        assert(0);
+      }
+      break;
+    
+    case MSG_PENDING:
+      ERR("spool %p set status to MSG_PENDING", spool);
+      break;
+      
+    case MSG_ERROR:
+      spool_respond_general(spool, NULL, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, 0);
+      break;
+      
+    case MSG_INVALID:
+      assert(0); //should never happen
+      break;
+  }
+  
+  if(free_msg_id) {
+    nchan_free_msg_id(&data->msgid);
+  }
+  ngx_free(data);
+  return NGX_OK;
+}
+
+static ngx_int_t spool_fetch_msg(subscriber_pool_t *spool) {
+  fetchmsg_data_t        *data;
+  channel_spooler_t      *spl = spool->spooler;
+  
+  
+  //stack overflow protector
+  //ERR("spool->fetchmsg_prev_msec %i (ngx_timeofday())->msec %i spool->fetchmsg_current_count %i", spool->fetchmsg_prev_msec, (ngx_timeofday())->msec, spool->fetchmsg_current_count);
+  if(spool->fetchmsg_prev_msec == (ngx_timeofday())->msec) {
+    if(spool->fetchmsg_current_count > NCHAN_SPOOL_FETCHMSG_MAX_TIMES) {
+      ngx_add_timer(&spool->fetchmsg_ev, 0);
+      spool->fetchmsg_current_count = 0;
+      return NGX_DONE;
+    }
+    else {
+      spool->fetchmsg_current_count++;
+    }
+  }
+  else {
+    spool->fetchmsg_current_count = 0;
+    spool->fetchmsg_prev_msec = (ngx_timeofday())->msec;
+  }
+  
+  if(*spl->channel_status != READY || !*spl->channel_buffer_complete) {
+    //DBG("%p wanted to fetch msg %V, but channel %V not ready or buffer not complete", spool, msgid_to_str(&spool->id), spl->chid);
+    spool->msg_status = MSG_CHANNEL_NOTREADY;
+    //these will be fetch when channel is ready or when buffer is complete
+    return NGX_DECLINED;
+  }
+  
+  DBG("%p fetch msg %V for channel %V", spool, msgid_to_str(&spool->id), spl->chid);
+  data = ngx_alloc(sizeof(*data), ngx_cycle->log); //correctness over efficiency (at first).
+  //TODO: optimize this alloc away
+  
+  assert(data);
+  
+  data->next = spl->fetchmsg_cb_data_list;
+  if(data->next) {
+    data->next->prev = data;
+  }
+  spl->fetchmsg_cb_data_list = data;
+  data->prev = NULL;
+  
+  nchan_copy_new_msg_id(&data->msgid, &spool->id);
+  data->spooler = spool->spooler;
+  
+  assert(spool->msg == NULL);
+  assert(spool->msg_status == MSG_INVALID);
+  spool->msg_status = MSG_PENDING;
+  if(spl->handlers->get_message_start) {
+    spl->handlers->get_message_start(spl, spl->handlers_privdata);
+  }
+  switch(spl->fetching_strategy) {
+    case NCHAN_SPOOL_FETCH:
+    case NCHAN_SPOOL_FETCH_IGNORE_MSG_NOTFOUND:
+      spool->spooler->store->get_message(spool->spooler->chid, &spool->id, spool->spooler->cf, (callback_pt )spool_fetch_msg_callback, data);
+      break;
+    case NCHAN_SPOOL_PASSTHROUGH:
+      spool_fetch_msg_callback(MSG_EXPECTED, NULL, data);
+      break;
+  }
+  return NGX_OK;
+}
+
+static void spool_sub_dequeue_callback(subscriber_t *sub, void *data) {
+  spooled_subscriber_cleanup_t  *d = (spooled_subscriber_cleanup_t *)data;
+  subscriber_pool_t             *spool = d->spool;
+  
+  DBG("sub %p dequeue callback", sub);
+  
+  assert(sub == d->ssub->sub);
+  spool_remove_subscriber(spool, d->ssub);
+  spool_bubbleup_dequeue_handler(spool, sub, spool->spooler);
+  
+  if(sub->type != INTERNAL && spool->spooler->publish_events) {
+    nchan_maybe_send_channel_event_message(sub->request, SUB_DEQUEUE);
+  }
+}
+
+static ngx_int_t spool_add_subscriber(subscriber_pool_t *self, subscriber_t *sub, uint8_t enqueue) {
+  spooled_subscriber_t       *ssub;
+  ngx_int_t                   rc;
+  ngx_int_t                   internal_sub = sub->type == INTERNAL;
+  
+  ssub = ngx_calloc(sizeof(*ssub), ngx_cycle->log);
+  //DBG("add sub %p to spool %p", sub, self);
+  
+  if(ssub == NULL) {
+    ERR("failed to allocate new sub for spool");
+    return NGX_ERROR;
+  }
+  
+  ssub->next = self->first;
+  ssub->prev = NULL;
+  if(self->first != NULL) {
+    self->first->prev = ssub;
+  }
+  self->first = ssub;
+  self->sub_count++;
+  if(!internal_sub) {
+    self->non_internal_sub_count++;
+  }
+  ssub->dequeue_callback_data.ssub = ssub;
+  ssub->dequeue_callback_data.spool = self;
+  
+  if(enqueue) {
+    if((rc = sub->fn->enqueue(sub)) != NGX_OK) {
+      //enqueue failed. undo everything and get out!
+      self->sub_count --;
+      self->first = ssub->next;
+      if(self->first) {
+        assert(self->first->prev == ssub);
+        self->first->prev = NULL;
+      }
+      if(!internal_sub) {
+        self->non_internal_sub_count--;
+      }
+      ngx_free(ssub);
+      return rc;
+    }
+    else if(sub->type != INTERNAL && self->spooler->publish_events) {
+      nchan_maybe_send_channel_event_message(sub->request, SUB_ENQUEUE);
+    }
+  }
+  
+  sub->fn->set_dequeue_callback(sub, spool_sub_dequeue_callback, &ssub->dequeue_callback_data);
+  ssub->sub = sub;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t spool_remove_subscriber(subscriber_pool_t *self, spooled_subscriber_t *ssub) {
+  assert(ssub->next != ssub);
+  assert(ssub->prev != ssub);
+  spooled_subscriber_t   *prev, *next;
+  prev = ssub->prev;
+  next = ssub->next;
+  if(next) {
+    next->prev = prev;
+  }
+  if(prev) {
+    prev->next = next;
+  }
+  if(self->first == ssub) {
+    self->first = next;
+  }
+  
+  if(ssub->sub->type != INTERNAL) {
+    self->non_internal_sub_count--;
+  }
+  
+  ngx_free(ssub);
+
+  assert(self->sub_count > 0);
+  self->sub_count--;
+  return NGX_OK;
+}
+
+static ngx_int_t spool_respond_general(subscriber_pool_t *self, nchan_msg_t *msg, ngx_int_t code, void *code_data, unsigned notice) {
+  ngx_uint_t                  numsubs[SUBSCRIBER_TYPES];
+  spooled_subscriber_t       *nsub, *nnext;
+  subscriber_t               *sub;
+  
+  //channel_spooler_t          *spl = self->spooler;
+  //validate_spooler(spl, "before respond_general");
+  //nchan_msg_id_t             unid;
+  //nchan_msg_id_t             unprevid;
+  //int8_t                     i, max;
+  
+  ngx_memzero(numsubs, sizeof(numsubs));
+  //self->generation++;
+  
+  DBG("spool %p (%V) (subs: %i) respond with msg %p or code %i", self, msgid_to_str(&self->id), self->sub_count, msg, code);
+  if(msg) {
+    DBG("msgid: %V", msgid_to_str(&msg->id));
+    DBG("prev: %V", msgid_to_str(&msg->prev_id));
+  }
+  
+  /*
+  if(msg && msg->prev_id.time > 0 && msg->id.tagcount > 1) {
+    assert(msg->shared == 0);
+    max = msg->id.tagcount;
+    for(i=0; i< max; i++) {
+      unid.tag[i] =     msg->id.tag[i];
+      unprevid.tag[i] = msg->prev_id.tag[i];
+      if(unid.tag[i] == -1)     msg->id.tag[i]   =    self->id.tag[i];
+      if(unprevid.tag[i] == -1) msg->prev_id.tag[i] = self->id.tag[i];
+    }
+  }
+  */
+  
+  //uint8_t publish_events = self->spooler->publish_events;
+  
+  for(nsub = self->first; nsub != NULL; nsub = nnext) {
+    sub = nsub->sub;
+    nnext = nsub->next;
+    
+    if(msg) {
+      //self->responded_count++;
+      sub->fn->respond_message(sub, msg);
+    }
+    else if(!notice) {
+      //self->responded_count++;
+      sub->fn->respond_status(sub, code, code_data, NULL);
+    }
+    else {
+      sub->fn->notify(sub, code, code_data);
+    }
+  }
+  
+  //if(!notice && code != NGX_HTTP_NO_CONTENT) self->responded_count++;
+  //assert(validate_spooler(spl, "after respond_general"));
+  return NGX_OK;
+}
+
+/////////// SPOOLER - container of several spools //////////
+
+static void spool_bubbleup_dequeue_handler(subscriber_pool_t *spool, subscriber_t *sub, channel_spooler_t *spl) {
+  //bubble on up, yeah
+  channel_spooler_handlers_t *h = spl->handlers;
+  if(h->dequeue) {
+    h->dequeue(spl, sub, spl->handlers_privdata);
+  }
+  else if (h->bulk_dequeue){
+    h->bulk_dequeue(spl, sub->type, 1, spl->handlers_privdata);
+  }
+  else {
+    ERR("Neither dequeue_handler not bulk_dequeue_handler present in spooler for spool sub dequeue");
+  }
+}
+
+/*
+static void spool_bubbleup_bulk_dequeue_handler(subscriber_pool_t *spool, subscriber_type_t type, ngx_int_t count, channel_spooler_t *spl) {
+  //bubble on up, yeah
+  if(spl->handlers->bulk_dequeue) {
+    spl->handlers->bulk_dequeue(spl, type, count, spl->handlers_privdata);
+  }
+}
+*/
+
+static ngx_int_t spooler_add_subscriber(channel_spooler_t *self, subscriber_t *sub) {
+  nchan_msg_id_t          *msgid = &sub->last_msgid;
+  subscriber_pool_t       *spool;
+  subscriber_type_t        subtype;
+  ngx_int_t                rc;
+  
+  if(self->want_to_stop) {
+    ERR("Not accepting new subscribers right now. want to stop.");
+    return NGX_ERROR;
+  }
+  
+  //validate_spooler(self, "before add_subscriber");
+  
+  spool = get_spool(self, msgid);
+  
+  if(self->fetching_strategy == NCHAN_SPOOL_PASSTHROUGH) {
+    assert(spool->id.time == NCHAN_NEWEST_MSGID_TIME);
+  }
+  
+  if(spool == NULL) {
+    return NGX_ERROR;
+  }
+
+  subtype = sub->type;
+  
+  if((rc = spool_add_subscriber(spool, sub, 1)) != NGX_OK) {
+    DBG("couldn't add subscriber to spool %p", spool);
+    return rc;
+  }
+  self->handlers->add(self, sub, self->handlers_privdata);
+  
+  switch(spool->msg_status) {
+    case MSG_FOUND:
+      assert(spool->msg);
+      spool_respond_general(spool, spool->msg, 0, NULL, 0);
+      break;
+    
+    case MSG_INVALID:
+      assert(spool->msg == NULL);
+      spool_fetch_msg(spool);
+      break;
+    
+    case MSG_CHANNEL_NOTREADY:
+    case MSG_PENDING:
+      //nothing to do
+      break;
+      
+    case MSG_EXPECTED:
+      //notify subscriber
+      sub->fn->respond_status(sub, NGX_HTTP_NO_CONTENT, NULL, NULL);
+      break;
+      
+    case MSG_EXPIRED:
+    case MSG_NOTFOUND:
+    case MSG_ERROR:
+      //shouldn't happen
+      
+      assert(0);
+  }
+  
+  if(self->handlers->use != NULL && subtype != INTERNAL) {
+    self->handlers->use(self, self->handlers_privdata);
+  }
+  
+  //validate_spooler(self, "after add_subscriber");
+  
+  return NGX_OK;
+}
+
+
+static ngx_int_t spool_transfer_subscribers(subscriber_pool_t *spool, subscriber_pool_t *newspool, uint8_t update_subscriber_last_msgid) {
+  ngx_int_t               count = 0;
+  subscriber_t           *sub;
+  spooled_subscriber_t   *cur;
+  channel_spooler_t      *spl = spool->spooler;
+  
+  assert(spl == newspool->spooler);
+  
+  if(spool == NULL || newspool == NULL) {
+    ERR("failed to transfer spool subscribers");
+    return 0;
+  }
+  for(cur = spool->first; cur != NULL; cur = spool->first) {
+    sub = cur->sub;
+    spool_remove_subscriber(spool, cur);
+    if(update_subscriber_last_msgid) {
+      sub->last_msgid=newspool->id;
+    }
+    if(spool_add_subscriber(newspool, sub, 0) == NGX_OK) {
+      count++;
+    }
+  }
+  
+  return count;
+}
+
+typedef struct spool_collect_overflow_s spool_collect_overflow_t;
+struct spool_collect_overflow_s {
+  subscriber_pool_t                *spool;
+  struct spool_collect_overflow_s  *next;
+};// spool_collect_overflow_t;
+
+#define SPOOLER_RESPOND_SPOOLARRAY_SIZE 32
+
+typedef struct {
+  nchan_msg_id_t             min;
+  nchan_msg_id_t             max;
+  uint8_t                    multi;
+  ngx_int_t                  n;
+  nchan_msg_t               *msg;
+  subscriber_pool_t         *spools[SPOOLER_RESPOND_SPOOLARRAY_SIZE];
+  spool_collect_overflow_t  *overflow;
+} spooler_respond_data_t;
+
+
+static rbtree_walk_direction_t compare_msgid_onetag_range(nchan_msg_id_t *min, nchan_msg_id_t *max, nchan_msg_id_t *id) {
+  
+  assert(min->tagcount == max->tagcount);
+  assert(max->tagcount == id->tagcount);
+  assert(id->tagcount == 1);
+  
+  if(min->time < id->time || (min->time == id->time && min->tag.fixed[0] <= id->tag.fixed[0])) {
+    if(max->time > id->time || (max->time == id->time && max->tag.fixed[0] > id->tag.fixed[0])) {
+      //inrange
+      return RBTREE_WALK_LEFT_RIGHT;
+    }
+    else {
+      //too large
+      return RBTREE_WALK_LEFT;
+    }
+  }
+  else {
+    //too small
+    return RBTREE_WALK_RIGHT;
+  } 
+}
+
+static int8_t compare_msgid_time(nchan_msg_id_t *min, nchan_msg_id_t *max, nchan_msg_id_t *cur) {
+  if(min->time <= cur->time) {
+    if(max->time >= cur->time) {
+      return 0;
+    }
+    else {
+      return 1;
+    }
+  }
+  else {
+    return -1;
+  }
+}
+
+
+static void spoolcollector_addspool(spooler_respond_data_t *data, subscriber_pool_t *spool) {
+  spool_collect_overflow_t  *overflow;
+  if(data->n < SPOOLER_RESPOND_SPOOLARRAY_SIZE) {
+    data->spools[data->n] = spool;
+  }
+  else {
+    if((overflow = ngx_alloc(sizeof(*overflow), ngx_cycle->log)) == NULL) {
+      ERR("can't allocate spoolcollector overflow");
+      return;
+    }
+    overflow->next = data->overflow;
+    overflow->spool = spool;
+    data->overflow = overflow;
+  }
+  data->n++;
+}
+
+static subscriber_pool_t *spoolcollector_unwind_nextspool(spooler_respond_data_t *data) {
+  spool_collect_overflow_t  *overflow;
+  subscriber_pool_t         *spool;
+  if(data->n > SPOOLER_RESPOND_SPOOLARRAY_SIZE) {
+    overflow = data->overflow;
+    spool = overflow->spool;
+    data->overflow = overflow->next;
+    ngx_free(overflow);
+    data->n--;
+    return spool;
+  }
+  else if(data->n > 0) {
+    return data->spools[--data->n];
+  }
+  else {
+    return NULL;
+  }
+}
+
+
+static rbtree_walk_direction_t collect_spool_range_callback(rbtree_seed_t *seed, subscriber_pool_t *spool, spooler_respond_data_t *data) {
+  rbtree_walk_direction_t  dir;
+  uint8_t multi_count = data->multi;
+  
+  if(multi_count <= 1) {
+    dir = compare_msgid_onetag_range(&data->min, &data->max, &spool->id);
+    if(dir == RBTREE_WALK_LEFT_RIGHT) {
+      spoolcollector_addspool(data, spool);
+    }
+    return dir;
+  }
+  else {
+    int tc = compare_msgid_time(&data->min, &data->max, &spool->id);
+    if(tc < 0) {
+      return RBTREE_WALK_RIGHT;
+    }
+    else if(tc > 0) {
+      return RBTREE_WALK_LEFT;
+    }
+    else {
+      time_t      timmin = data->min.time, timmax = data->max.time, timcur = spool->id.time;
+      
+      int         max_cmp = -1, min_cmp = -1;
+      
+      if( timcur > timmin && timcur < timmax) {
+        spoolcollector_addspool(data, spool);
+      }
+      else if(timcur == timmax && timcur == timmin) {
+        if( nchan_compare_msgid_tags(&spool->id, &data->max) < 0
+         && nchan_compare_msgid_tags(&spool->id, &data->min) >= 0 ) 
+        {
+          spoolcollector_addspool(data, spool);
+        } 
+      }
+      else if((timcur == timmax && (max_cmp = nchan_compare_msgid_tags(&spool->id, &data->max)) < 0) 
+           || (timcur == timmin && (min_cmp = nchan_compare_msgid_tags(&spool->id, &data->min)) >= 0))
+      {
+        spoolcollector_addspool(data, spool);
+      }
+      else if( timcur > timmin && timcur < timmax) {
+        spoolcollector_addspool(data, spool);
+      }
+      /*
+      else {
+        ERR("time_min: %i, time_cur: %i, time_max: %i", timmin, timcur, timmax);
+      }
+      */
+      
+      return RBTREE_WALK_LEFT_RIGHT;
+    }
+  }
+}
+
+static ngx_int_t spooler_respond_status(channel_spooler_t *self, nchan_msg_id_t *id, ngx_int_t status_code, ngx_str_t *status_line) {
+  subscriber_pool_t         *spool = find_spool(self, id);
+  //validate_spooler(self, "before respond_status");
+  if(spool) {
+    if(status_code == NGX_HTTP_NO_CONTENT) {
+      spool->msg_status = MSG_EXPECTED;
+    }
+    spool_respond_general(spool, NULL, status_code, status_line, 0);
+    destroy_spool(spool);
+  }
+  //validate_spooler(self, "after respond_status");
+  return NGX_OK;
+}
+
+static ngx_int_t spooler_respond_message(channel_spooler_t *self, nchan_msg_t *msg) {
+  spooler_respond_data_t     srdata;
+  subscriber_pool_t         *spool;
+  //ngx_int_t                  responded_subs = 0;
+  
+  
+  if(self->fetching_strategy != NCHAN_SPOOL_PASSTHROUGH) {
+    srdata.min = msg->prev_id;
+    srdata.max = msg->id;
+    srdata.multi = msg->id.tagcount;
+    srdata.overflow = NULL;
+    srdata.msg = msg;
+    srdata.n = 0;
+    
+    //spooler_print_contents(self);
+    
+    //find all spools between msg->prev_id and msg->id
+    rbtree_conditional_walk(&self->spoolseed, (rbtree_walk_conditional_callback_pt )collect_spool_range_callback, &srdata);
+    /*
+    if(srdata.n == 0) {
+      DBG("no spools in range %V -- ", msgid_to_str(&msg->prev_id));
+      DBG(" -- %V", msgid_to_str(&msg->id));
+    }
+    */
+    while((spool = spoolcollector_unwind_nextspool(&srdata)) != NULL) {
+      //responded_subs += spool->sub_count;
+      if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+        assert(spool->id.tag.allocd != msg->id.tag.allocd);
+      }
+      spool_respond_general(spool, msg, 0, NULL, 0);
+      if(msg->id.tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+        assert(spool->id.tag.allocd != msg->id.tag.allocd);
+      }
+      spool_nextmsg(spool, &msg->id);
+    }
+  }
+  spool = get_spool(self, &latest_msg_id);
+  if(spool->sub_count > 0 && *self->channel_buffer_complete) {
+    spool_respond_general(spool, msg, 0, NULL, 0);
+    spool_nextmsg(spool, &msg->id);
+  }
+
+  nchan_copy_msg_id(&self->prev_msg_id, &msg->id, NULL);
+  
+  return NGX_OK;
+}
+
+typedef struct {
+  channel_spooler_t *spl;
+  nchan_msg_t       *msg;
+  ngx_int_t          code;
+  void              *code_data;
+  unsigned           notice:1;
+} spooler_respond_generic_data_t;
+
+static ngx_int_t spooler_respond_rbtree_node_spool(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
+  spooler_respond_generic_data_t  *d = data;
+  
+  return spool_respond_general(spool, d->msg, d->code, d->code_data, d->notice);
+}
+
+static ngx_int_t spooler_respond_generic(channel_spooler_t *self, nchan_msg_t *msg, ngx_int_t code, void *code_data, unsigned notice) {
+  spooler_respond_generic_data_t  data = {self, msg, code, code_data, notice};
+  rbtree_walk(&self->spoolseed, (rbtree_walk_callback_pt )spooler_respond_rbtree_node_spool, &data);
+  spool_respond_general(&self->current_msg_spool, data.msg, data.code, data.code_data, notice);
+  return NGX_OK;
+}
+
+static ngx_int_t spooler_broadcast_status(channel_spooler_t *self, ngx_int_t code, const ngx_str_t *line) {
+  return spooler_respond_generic(self, NULL, code, (void *)line, 0);
+}
+
+static ngx_int_t spooler_broadcast_notice(channel_spooler_t *self, ngx_int_t code, void *data) {
+  return spooler_respond_generic(self, NULL, code, data, 1);
+}
+
+static ngx_int_t spooler_spool_dequeue_all(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
+  spooled_subscriber_t *cur;
+  
+  for(cur = spool->first; cur != NULL; cur = cur->next) {
+    cur->sub->dequeue_after_response = 1;  
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t spooler_prepare_to_stop(channel_spooler_t *spl) {
+  rbtree_walk(&spl->spoolseed, (rbtree_walk_callback_pt )spooler_spool_dequeue_all, (void *)spl);
+  spl->want_to_stop = 1;
+  return NGX_OK;
+}
+
+
+
+static void *spool_rbtree_node_id(void *data) {
+  return &((subscriber_pool_t *)data)->id;
+}
+
+static uint32_t spool_rbtree_bucketer(void *vid) {
+  nchan_msg_id_t   *id = (nchan_msg_id_t *)vid;
+  return (uint32_t )id->time;
+}
+
+static ngx_int_t spool_rbtree_compare(void *v1, void *v2) {
+  nchan_msg_id_t   *id1 = (nchan_msg_id_t *)v1;
+  nchan_msg_id_t   *id2 = (nchan_msg_id_t *)v2;
+  time_t            t1 = id1->time;
+  time_t            t2 = id2->time;
+  ngx_int_t         tag1;
+  ngx_int_t         tag2;
+  
+  if(t1 > t2) {
+    return 1;
+  }
+  else if (t1 < t2) {
+    return -1;
+  }
+  else {
+    uint16_t   i, max1 = id1->tagcount, max2 = id2->tagcount;
+    uint16_t   max = max1 > max2 ? max1 : max2;
+    int16_t   *tags1, *tags2;
+    
+    tags1 = max1 <= NCHAN_FIXED_MULTITAG_MAX ? id1->tag.fixed : id1->tag.allocd;
+    tags2 = max2 <= NCHAN_FIXED_MULTITAG_MAX ? id2->tag.fixed : id2->tag.allocd;
+    
+    for(i=0; i < max; i++) {
+      tag1 = i < max1 ? tags1[i] : -1;
+      tag2 = i < max2 ? tags2[i] : -1;
+      if(tag1 > tag2) {
+        return 1;
+      }
+      else if(tag1 < tag2) {
+        return -1;
+      }
+    }
+    return 0;
+  }
+}
+
+static int its_time_for_a_spooling_filter(void *data) {
+  subscriber_pool_t *spool = data;
+  if(spool->msg_status == MSG_CHANNEL_NOTREADY || spool->msg_status == MSG_INVALID) {
+    spool_reserve(spool);
+    return 1;
+  }
+  else {
+    return 0;
+  }
+}
+
+static ngx_int_t its_time_for_a_spooling(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
+  ngx_int_t       rc = NGX_OK;
+  //validate_spool(spool);
+  if(spool->msg_status == MSG_CHANNEL_NOTREADY || spool->msg_status == MSG_INVALID) {
+    //TODO: maybe don't fetch spool with zero subs?
+    spool->msg_status = MSG_INVALID;
+    rc = spool_fetch_msg(spool);
+    assert(rc == NGX_OK || rc == NGX_DONE || NGX_DECLINED);
+  }
+  spool_release(spool);
+  return rc;
+}
+
+static ngx_int_t spooler_channel_status_changed(channel_spooler_t *self) {
+  switch(*self->channel_status) {
+    case READY:
+      rbtree_walk_writesafe(&self->spoolseed, its_time_for_a_spooling_filter, (rbtree_walk_callback_pt )its_time_for_a_spooling, NULL); 
+      break;
+      
+    default:
+      //do nothing
+      break;
+  };
+  return NGX_OK;
+}
+
+
+static ngx_int_t spooler_print_contents_callback(rbtree_seed_t *seed, subscriber_pool_t *spool, channel_spooler_t *spl) {
+  spooled_subscriber_t       *cur;
+  
+  ERR("  spool %p id %V", spool, msgid_to_str(&spool->id));
+  for(cur = spool->first; cur != NULL; cur = cur->next) {
+    ERR("    %V", cur->sub->name);
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t spooler_print_contents(channel_spooler_t *spl) {
+  ERR("spooler for channel %V", spl->chid);
+  spooler_print_contents_callback(NULL, &spl->current_msg_spool, spl);
+  rbtree_walk_incr(&spl->spoolseed, (rbtree_walk_callback_pt )spooler_print_contents_callback, spl);
+  return NGX_OK;
+}
+
+
+
+static int spooler_catch_up_filter(void *data) {
+  nchan_msg_status_t  status =  ((subscriber_pool_t *)data)->msg_status;
+  return status == MSG_EXPECTED || status == MSG_PENDING;
+}
+
+static ngx_int_t spooler_catch_up_callback(rbtree_seed_t *seed, subscriber_pool_t *spool, void *data) {
+  spool->msg_status = MSG_INVALID;
+  spool_fetch_msg(spool);
+  return NGX_OK;
+}
+
+ngx_int_t spooler_catch_up(channel_spooler_t *spl) {
+  rbtree_walk_writesafe(&spl->spoolseed, spooler_catch_up_filter, (rbtree_walk_callback_pt )spooler_catch_up_callback, NULL); 
+  return NGX_OK;
+}
+
+
+static channel_spooler_fn_t  spooler_fn = {
+  spooler_add_subscriber,
+  spooler_channel_status_changed,
+  spooler_respond_message,
+  spooler_respond_status,
+  spooler_broadcast_status,
+  spooler_broadcast_notice,
+  spooler_prepare_to_stop
+};
+
+channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, uint8_t *channel_buffer_complete, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata) {
+  if(!spl->running) {
+    ngx_memzero(spl, sizeof(*spl));
+    rbtree_init(&spl->spoolseed, "spooler msg_id tree", spool_rbtree_node_id, spool_rbtree_bucketer, spool_rbtree_compare);
+    
+    spl->fn=&spooler_fn;
+    //spl->prev_msg_id.time=0;
+    //spl->prev_msg_id.tag=0;
+    
+    DBG("start SPOOLER %p", *spl);
+    
+    spl->chid = chid;
+    spl->store = store;
+    
+    spl->channel_status = channel_status;
+    spl->channel_buffer_complete = channel_buffer_complete;
+    
+    spl->running = 1;
+    //spl->want_to_stop = 0;
+    spl->publish_events = 1;
+    spl->fetching_strategy = fetching_strategy;
+    
+    init_spool(spl, &spl->current_msg_spool, &latest_msg_id);
+    spl->current_msg_spool.msg_status = MSG_EXPECTED;
+    
+    spl->handlers = handlers;
+    spl->handlers_privdata = handlers_privdata;
+    
+    spl->cf = cf;
+    
+    return spl;
+  }
+  else {
+    ERR("looks like spooler is already running. make sure spooler->running=0 before starting.");
+    assert(0);
+    return NULL;
+  }
+}
+
+static ngx_int_t remove_spool(subscriber_pool_t *spool) {
+  channel_spooler_t    *spl = spool->spooler;
+  ngx_rbtree_node_t    *node = rbtree_node_from_data(spool);
+  
+  assert(spool->reserved == 0);
+  DBG("remove spool node %p", node);
+  
+  assert(spool->spooler->running);
+  
+  if(spool->fetchmsg_ev.timer_set) {
+    ngx_del_timer(&spool->fetchmsg_ev);
+  }
+  
+  nchan_free_msg_id(&spool->id);
+  rbtree_remove_node(&spl->spoolseed, rbtree_node_from_data(spool));
+  
+  //assert((node = rbtree_find_node(&spl->spoolseed, &spool->id)) == NULL);
+  //double-check that it's gone 
+  
+  return NGX_OK;
+}
+
+static ngx_int_t destroy_spool(subscriber_pool_t *spool) {
+  rbtree_seed_t         *seed = &spool->spooler->spoolseed;
+  spooled_subscriber_t  *ssub, *ssub_next;
+  subscriber_t          *sub;
+  ngx_rbtree_node_t     *node = rbtree_node_from_data(spool);
+  
+  remove_spool(spool);
+  
+  DBG("destroy spool node %p", node);
+  
+  for(ssub = spool->first; ssub!=NULL; ssub = ssub_next) {
+    sub = ssub->sub;
+    ssub_next = ssub->next;
+    //DBG("dequeue sub %p in spool %p", sub, spool);
+    sub->fn->dequeue(sub);
+  }
+  assert(spool->sub_count == 0);
+  assert(spool->first == NULL);
+  
+  //ngx_memset(spool, 0x42, sizeof(*spool)); //debug
+  
+  rbtree_destroy_node(seed, node);
+  return NGX_OK;
+}
+
+ngx_int_t stop_spooler(channel_spooler_t *spl, uint8_t dequeue_subscribers) {
+  ngx_rbtree_node_t    *cur, *sentinel;
+  spooler_event_ll_t   *ecur, *ecur_next;
+  subscriber_pool_t    *spool;
+  rbtree_seed_t        *seed = &spl->spoolseed;
+  ngx_rbtree_t         *tree = &seed->tree;
+  ngx_int_t             n=0;
+  sentinel = tree->sentinel;
+  
+  fetchmsg_data_t      *dcur;
+#if NCHAN_RBTREE_DBG
+  ngx_int_t active_before = seed->active_nodes, allocd_before = seed->active_nodes;
+#endif
+  if(spl->running) {
+    
+    for(ecur = spl->spooler_dependent_events; ecur != NULL; ecur = ecur_next) {
+      ecur_next = ecur->next;
+      if(ecur->cancel) {
+        ecur->cancel(ecur->ev.data);
+      }
+      ngx_event_del_timer(&ecur->ev);
+      
+      ngx_free(ecur);
+    }
+    
+    for(cur = tree->root; cur != NULL && cur != sentinel; cur = tree->root) {
+      spool = (subscriber_pool_t *)rbtree_data_from_node(cur);
+      if(dequeue_subscribers) {
+        destroy_spool(spool);
+      }
+      else {
+        remove_spool(spool);
+        rbtree_destroy_node(seed, cur);
+      }
+      n++;
+    }
+    
+    for(dcur = spl->fetchmsg_cb_data_list; dcur != NULL; dcur = dcur->next) {
+      dcur->spooler = NULL;
+    }
+    
+    DBG("stopped %i spools in SPOOLER %p", n, *spl);
+  }
+  else {
+    DBG("SPOOLER %p not running", *spl);
+  }
+#if NCHAN_RBTREE_DBG
+  assert(active_before - n == 0);
+  assert(allocd_before - n == 0);
+  assert(seed->active_nodes == 0);
+  assert(seed->allocd_nodes == 0);
+#endif
+  nchan_free_msg_id(&spl->prev_msg_id);
+  spl->running = 0;
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/spool.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/spool.h
new file mode 100644
index 0000000..88e8d1a
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/spool.h
@@ -0,0 +1,117 @@
+#ifndef SPOOL_HEADER
+#define SPOOL_HEADER
+
+#include <util/nchan_rbtree.h>
+
+typedef struct spooled_subscriber_s spooled_subscriber_t;
+typedef struct subscriber_pool_s subscriber_pool_t;
+
+typedef struct {
+  spooled_subscriber_t  *ssub;
+  subscriber_pool_t     *spool;
+} spooled_subscriber_cleanup_t;
+  
+struct spooled_subscriber_s {
+  ngx_uint_t                    id; //could be useful later
+  subscriber_t                 *sub;
+  spooled_subscriber_cleanup_t  dequeue_callback_data;
+  spooled_subscriber_t         *next;
+  spooled_subscriber_t         *prev;
+}; //spooled_subscriber_t
+
+
+struct subscriber_pool_s {
+  nchan_msg_id_t              id;
+  nchan_msg_t                *msg;
+  nchan_msg_status_t          msg_status;
+  spooled_subscriber_t       *first;
+  
+  //stack overflow prevention
+  ngx_uint_t                  fetchmsg_prev_msec;
+  ngx_int_t                   fetchmsg_current_count;
+  ngx_event_t                 fetchmsg_ev;
+  
+  ngx_uint_t                  sub_count;
+  ngx_uint_t                  non_internal_sub_count;
+  //ngx_uint_t                  generation;
+  //ngx_uint_t                  responded_count;
+  uint8_t                     reserved;
+  struct channel_spooler_s   *spooler;
+}; // subscriber_pool_t
+
+typedef struct channel_spooler_s channel_spooler_t; //holds many different spools
+typedef struct channel_spooler_handlers_s channel_spooler_handlers_t; //spooler callbacks table
+
+typedef struct {
+  ngx_int_t            (*add)(channel_spooler_t *self, subscriber_t *sub);
+  ngx_int_t            (*handle_channel_status_change)(channel_spooler_t *self);
+  ngx_int_t            (*respond_message)(channel_spooler_t *self, nchan_msg_t *msg);
+  ngx_int_t            (*respond_status)(channel_spooler_t *self, nchan_msg_id_t *id, ngx_int_t status_code, ngx_str_t *status_line);
+  ngx_int_t            (*broadcast_status)(channel_spooler_t *self, ngx_int_t status_code, const ngx_str_t *status_line);
+  ngx_int_t            (*broadcast_notice)(channel_spooler_t *self, ngx_int_t notice_code, void *data);
+  ngx_int_t            (*prepare_to_stop)(channel_spooler_t *self);
+} channel_spooler_fn_t;
+
+typedef enum {NCHAN_SPOOL_FETCH, NCHAN_SPOOL_FETCH_IGNORE_MSG_NOTFOUND, NCHAN_SPOOL_PASSTHROUGH} spooler_fetching_strategy_t;
+
+
+typedef struct fetchmsg_data_s fetchmsg_data_t;
+struct fetchmsg_data_s {
+  channel_spooler_t   *spooler;
+  nchan_msg_id_t       msgid;
+  fetchmsg_data_t     *next;
+  fetchmsg_data_t     *prev;
+};
+
+typedef struct spooler_event_ll_s spooler_event_ll_t;
+struct spooler_event_ll_s {
+  spooler_event_ll_t   *prev;
+  ngx_event_t           ev;
+  void                (*callback)(void *);
+  void                (*cancel)(void *);
+  channel_spooler_t    *spooler;
+  spooler_event_ll_t   *next;
+};
+
+struct channel_spooler_s {
+  rbtree_seed_t               spoolseed;
+  subscriber_pool_t           current_msg_spool;
+  nchan_msg_id_t              prev_msg_id;
+  ngx_uint_t                  responded_count;
+  ngx_str_t                  *chid;
+  chanhead_pubsub_status_t   *channel_status;
+  uint8_t                    *channel_buffer_complete;
+  nchan_store_t              *store;
+  nchan_loc_conf_t           *cf;
+  channel_spooler_fn_t       *fn;
+  channel_spooler_handlers_t *handlers;
+  void                       *handlers_privdata;
+  fetchmsg_data_t            *fetchmsg_cb_data_list;
+  spooler_event_ll_t         *spooler_dependent_events;
+  spooler_fetching_strategy_t fetching_strategy;
+  unsigned                    publish_events:1;
+  unsigned                    running:1;
+  unsigned                    want_to_stop:1;
+  
+};
+
+struct channel_spooler_handlers_s {
+  void                        (*add)(channel_spooler_t *, subscriber_t *, void *);
+  void                        (*dequeue)(channel_spooler_t *, subscriber_t *, void *);
+  void                        (*bulk_dequeue)(channel_spooler_t *, subscriber_type_t, ngx_int_t, void *); //called after dequeueing 1 or many subs
+  void                        (*use)(channel_spooler_t *, void *);
+  void                        (*get_message_start)(channel_spooler_t *, void *);
+  void                        (*get_message_finish)(channel_spooler_t *, void *);
+};
+
+channel_spooler_t *start_spooler(channel_spooler_t *spl, ngx_str_t *chid, chanhead_pubsub_status_t *channel_status, uint8_t *channel_buffer_complete, nchan_store_t *store, nchan_loc_conf_t *cf, spooler_fetching_strategy_t fetching_strategy, channel_spooler_handlers_t *handlers, void *handlers_privdata);
+ngx_int_t stop_spooler(channel_spooler_t *spl, uint8_t dequeue_subscribers);
+
+ngx_int_t spooler_catch_up(channel_spooler_t *spl);
+
+ngx_int_t spooler_print_contents(channel_spooler_t *spl);
+
+ngx_event_t *spooler_add_timer(channel_spooler_t *spl, ngx_msec_t timeout, void (*cb)(void *), void (*cancel)(void *), void *pd);
+
+
+#endif  /*SPOOL_HEADER*/
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/store_common.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/store_common.c
new file mode 100644
index 0000000..849426e
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/store_common.c
@@ -0,0 +1,8 @@
+#include <nchan_module.h>
+#include "store_common.h"
+
+void nchan_exit_notice_about_remaining_things(char *thing, char *where, ngx_int_t num) {
+  if(num > 0) {
+    nchan_log_notice("%i %s%s remain%s %sat exit", num, thing, num == 1 ? "" : "s", num == 1 ? "s" : "", where == NULL ? "" : where);
+  }
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/store_common.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/store_common.h
new file mode 100644
index 0000000..c5335de
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/store/store_common.h
@@ -0,0 +1,12 @@
+#undef uthash_malloc
+#undef uthash_free
+#define uthash_malloc(sz) ngx_alloc(sz, ngx_cycle->log)
+#define uthash_free(ptr,sz) ngx_free(ptr)
+
+#define STR(buf) (buf)->data, (buf)->len
+#define BUF(buf) (buf)->pos, ((buf)->last - (buf)->pos)
+
+#define NCHAN_DEFAULT_SUBSCRIBER_POOL_SIZE (5 * 1024)
+#define NCHAN_DEFAULT_CHANHEAD_CLEANUP_INTERVAL 1000
+
+void nchan_exit_notice_about_remaining_things(char *thing, char *where, ngx_int_t num);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/benchmark.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/benchmark.c
new file mode 100644
index 0000000..ab439f5
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/benchmark.c
@@ -0,0 +1,72 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "internal.h"
+#include "benchmark.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:BENCHMARK:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:BENCHMARK:" fmt, ##arg)
+
+typedef struct {
+  subscriber_t        *sub;
+  nchan_benchmark_t   *bench;
+} sub_data_t;
+
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
+  if(nchan_benchmark_active()) {
+    ngx_atomic_fetch_add(d->bench->shared.subscribers_enqueued, 1);
+  }
+  nchan_stats_worker_incr(subscribers, 1); //needs to be done manually for INTERNAL subs
+  return NGX_OK;
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  if(nchan_benchmark_active()) {
+    ngx_atomic_fetch_add(d->bench->shared.subscribers_dequeued, 1);
+  }
+  nchan_stats_worker_incr(subscribers, -1); //needs to be done manually for INTERNAL subs
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
+  nchan_msg_t *msg = ptr;
+  uint64_t msec = nchan_benchmark_message_delivery_msec(msg);
+  if(nchan_benchmark_active()) {
+    hdr_record_value(d->bench->data.msg_delivery_latency, msec);
+    d->bench->data.msg_received++;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_notice(ngx_int_t notice, void *ptr, sub_data_t *d) {
+  return NGX_OK;
+}
+
+static ngx_str_t  sub_name = ngx_string("benchmark");
+
+subscriber_t *benchmark_subscriber_create(nchan_benchmark_t *bench) {
+  static  nchan_msg_id_t      newest_msgid = NCHAN_NEWEST_MSGID;
+  sub_data_t                 *d;
+  subscriber_t               *sub;
+  nchan_loc_conf_t           *cf = bench->loc_conf;
+  struct timeval tv;
+  
+  sub = internal_subscriber_create_init(&sub_name, cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_respond_notice, NULL);
+  
+  sub->last_msgid = newest_msgid;
+  sub->destroy_after_dequeue = 1;
+  d->sub = sub;
+  d->bench = bench;
+  ngx_gettimeofday(&tv);
+  
+  
+  DBG("%p benchmark subscriber created with privdata %p", sub, d);
+  return sub;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/benchmark.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/benchmark.h
new file mode 100644
index 0000000..dcb52c9
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/benchmark.h
@@ -0,0 +1,3 @@
+#include <util/nchan_benchmark.h>
+
+subscriber_t *benchmark_subscriber_create(nchan_benchmark_t *bench);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/common.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/common.c
new file mode 100644
index 0000000..c165334
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/common.c
@@ -0,0 +1,456 @@
+#include <nchan_module.h>
+#include <assert.h>
+#include "common.h"
+//#include <util/nchan_fake_request.h>
+#include <util/nchan_subrequest.h>
+
+#include <util/nchan_fake_request.h>
+
+#if FAKESHARD
+#include <store/memory/store.h>
+#endif
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:COMMON:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:COMMON:" fmt, ##arg)
+
+typedef struct {
+  subscriber_t       *sub;
+  ngx_str_t          *ch_id;
+  nchan_fakereq_subrequest_data_t *subrequest;
+} nchan_subscribe_auth_request_data_t;
+
+static ngx_int_t subscriber_authorize_callback(ngx_int_t rc, ngx_http_request_t *sr, void *data) {
+  nchan_subscribe_auth_request_data_t *d = data;
+  subscriber_t                        *sub = d->sub;
+  
+  if(sub->status == DEAD) {
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    sub->fn->release(d->sub, 0);
+  }
+  else if (rc == NGX_HTTP_CLIENT_CLOSED_REQUEST) {
+    //this shouldn't happen, but if it does, no big deal
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    sub->fn->release(d->sub, 1);
+    sub->fn->respond_status(sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL); //couldn't reach upstream
+  }
+  else if(rc == NGX_OK) {
+    ngx_int_t        code = sr->headers_out.status;
+    sub->fn->release(sub, 1);
+    if(code >= 200 && code <299) {
+      nchan_requestmachine_request_cleanup_manual(d->subrequest);
+      nchan_subscriber_subscribe(sub, d->ch_id);
+    }
+    else {
+      //forbidden, but with some data to forward to the subscriber
+      ngx_http_request_t       *r = d->sub->request;
+      ngx_str_t                *content_type;
+      ngx_int_t                 content_length;
+      ngx_chain_t              *request_chain = NULL;
+      content_type = (sr->upstream->headers_in.content_type ? &sr->upstream->headers_in.content_type->value : NULL);
+      content_length = nchan_subrequest_content_length(sr);
+      if(content_length > 0) {
+#if nginx_version >= 1013010
+        request_chain = sr->out;
+#else
+        request_chain = sr->upstream->out_bufs;
+#endif
+      }
+      //copy headers
+      ngx_uint_t                       i;
+      ngx_list_part_t                 *part = &sr->headers_out.headers.part;
+      ngx_table_elt_t                 *header= part->elts;
+      for (i = 0; /* void */ ; i++) {
+        if (i >= part->nelts) {
+          if (part->next == NULL) {
+            break;
+          }
+          part = part->next;
+          header = part->elts;
+          i = 0;
+        }
+        if (!nchan_strmatch(&header[i].key, 4, "Content-Type", "Server", "Content-Length", "Connection")) {
+          //copy header to main request's response
+          nchan_add_response_header(r, &header[i].key, &header[i].value);
+        }
+      }
+      
+      if(content_type) {
+        r->headers_out.content_type = *content_type;
+      }
+      r->headers_out.content_length_n = content_length;
+      nchan_requestmachine_request_cleanup_on_request_finalize(d->subrequest, r);
+      sub->fn->respond_status(sub, code, NULL, request_chain); //auto-closes subscriber
+    }
+  }
+  else if(rc >= 500 && rc < 600) {
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    sub->fn->release(d->sub, 1);
+    sub->fn->respond_status(sub, rc, NULL, NULL); //auto-closes subscriber
+  }
+  else {
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    sub->fn->release(d->sub, 1);
+    d->sub->fn->respond_status(d->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL); //auto-closes subscriber
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_subscriber_authorize_subscribe_request(subscriber_t *sub, ngx_str_t *ch_id) {
+  
+  ngx_http_complex_value_t  *authorize_request_url_ccv = sub->cf->authorize_request_url;
+  //DBG("%p (req %p) nchan_subscriber_authorize_subscribe_request", sub, sub->request);
+  
+  if(!authorize_request_url_ccv) {
+    return nchan_subscriber_subscribe(sub, ch_id);
+  }
+  else {
+    nchan_requestmachine_request_params_t param;
+    param.url.cv = authorize_request_url_ccv;
+    param.url_complex = 1;
+    param.pool = ngx_create_pool(1024, ngx_cycle->log);
+    param.body = NULL;
+    param.response_headers_only = 0;
+    param.manual_cleanup = 1;
+    
+    nchan_subscribe_auth_request_data_t  *d = ngx_palloc(param.pool, sizeof(*d));
+    if(!d) {
+      ngx_destroy_pool(param.pool);
+      return NGX_ERROR;
+    }
+    param.cb = (callback_pt )subscriber_authorize_callback;
+    param.pd = d;
+    
+    d->sub = sub;
+    d->ch_id = ch_id;
+    d->subrequest = nchan_subscriber_subrequest(sub, &param);
+    if(d->subrequest != NULL) {
+      sub->fn->reserve(sub);
+      return NGX_OK;
+    }
+    else {
+      ngx_destroy_pool(param.pool);
+      return NGX_ERROR;
+    }
+  }
+}
+
+static ngx_int_t nchan_subscriber_subrequest_fire_and_forget(subscriber_t *sub, ngx_http_complex_value_t *url_cv) {
+  //DBG("%p (req %p) nchan_subscriber_unsubscribe_request", sub, sub->request);
+    
+  nchan_requestmachine_request_params_t param;
+  param.url.cv = url_cv;
+  param.url_complex = 1;
+  param.cb = NULL;
+  param.pd = NULL;
+  param.pool = NULL;
+  param.body = NULL;
+  param.response_headers_only = 1;
+  param.manual_cleanup = 0;
+  
+  return nchan_subscriber_subrequest(sub, &param) == NULL ? NGX_ERROR : NGX_OK;
+}
+
+ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub) {
+  nchan_request_ctx_t         *ctx;
+  //DBG("%p (req %p) nchan_subscriber_unsubscribe_request", sub, sub->request);
+  
+  if(!sub->enable_sub_unsub_callbacks) {
+    return NGX_OK;
+  }
+  
+  ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  if(ctx->sent_unsubscribe_request) {
+    return NGX_OK;
+  }
+  
+  ctx->sent_unsubscribe_request = 1;
+  return nchan_subscriber_subrequest_fire_and_forget(sub, sub->cf->unsubscribe_request_url);
+}
+
+ngx_int_t nchan_subscriber_subscribe_request(subscriber_t *sub) {
+  if(!sub->enable_sub_unsub_callbacks) {
+    return NGX_OK;
+  }
+  return nchan_subscriber_subrequest_fire_and_forget(sub, sub->cf->subscribe_request_url);
+}
+
+
+
+ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id) {
+  ngx_int_t             ret;
+  nchan_request_ctx_t  *ctx;
+  nchan_loc_conf_t     *cf = sub->cf;
+  int                   enable_sub_unsub_callbacks = sub->enable_sub_unsub_callbacks;
+  
+  //DBG("%p (req %p) nchan_subscriber_subscribe", sub, sub->request);
+  
+  ctx = sub->request ? ngx_http_get_module_ctx(sub->request, ngx_nchan_module) : NULL;
+  ret = sub->cf->storage_engine->subscribe(ch_id, sub);
+  //don't access sub directly, it might have already been freed
+  if(ret == NGX_OK && enable_sub_unsub_callbacks && cf->subscribe_request_url && ctx && ctx->sub == sub) {
+    nchan_subscriber_subscribe_request(sub);
+  }
+  return ret;
+}
+
+ngx_int_t nchan_cleverly_output_headers_only_for_later_response(ngx_http_request_t *r) {
+  ngx_int_t                rc;
+  static const ngx_str_t   everything_ok = ngx_string("200 OK");
+  
+  r->headers_out.status_line = everything_ok; //but in reality, we're returning a 200 OK
+#if (NGX_HTTP_V2)
+  if(r->stream) {
+    r->headers_out.status=NGX_HTTP_OK; //no need to fool chunking module
+    r->header_only = 0;
+  }
+  else {
+    r->headers_out.status=NGX_HTTP_NO_CONTENT; //fake it to fool the chunking module (mostly);  
+    r->header_only = 1;
+  }
+#elif (NGX_HTTP_SPDY)
+   if(r->spdy_stream) {
+    r->headers_out.status=NGX_HTTP_OK; //no need to fool chunking module
+    r->header_only = 0;
+  }
+  else {
+    r->headers_out.status=NGX_HTTP_NO_CONTENT; //fake it to fool the chunking module (mostly);  
+    r->header_only = 1;
+  }
+#else
+  r->headers_out.status=NGX_HTTP_NO_CONTENT; //fake it to fool the chunking module (mostly);  
+  r->header_only = 1;
+#endif
+  nchan_include_access_control_if_needed(r, NULL);
+  rc = ngx_http_send_header(r);
+  
+  if(r->headers_out.status == NGX_HTTP_OK) {
+    r->keepalive = 1;
+  }
+  
+  return rc;
+}
+
+
+static void nchan_generate_random_boundary(u_char *buf, int sz) {
+  //use the shitty-ass LFSR-based ngx_random. we're not looking for cryptographic randomness, 
+  //just something unlikely
+  static u_char   itoa64[] ="./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+  int             i;
+  u_char         *p = buf;
+  
+  for(i=0; i < sz; i++) {
+    *p++ = itoa64[ngx_random() % 64];
+  }
+}
+
+ngx_str_t *nchan_request_multipart_boundary(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
+  if(ctx) {
+    if(!ctx->multipart_boundary) {
+      if((ctx->multipart_boundary = ngx_palloc(r->pool, sizeof(ngx_str_t) + 32)) == NULL) {
+        //unable to allocate multipart boundary;
+        return NULL;
+      }
+      ctx->multipart_boundary->data=(u_char *)&ctx->multipart_boundary[1];
+      ctx->multipart_boundary->len = 32;
+      nchan_generate_random_boundary(ctx->multipart_boundary->data, 32);
+    }
+    return ctx->multipart_boundary;
+  }
+  else {
+    return NULL;
+  }
+}
+
+ngx_int_t nchan_request_set_content_type_multipart_boundary_header(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
+  u_char                        *cur;
+  u_char                        *cbuf;
+  ngx_str_t                      val;
+  
+  if((cbuf = ngx_palloc(r->pool, sizeof(u_char)*100)) == NULL) {
+    return NGX_ERROR;
+  }
+  
+  val.data = cbuf;
+  cur = ngx_snprintf(cbuf, 100, "multipart/mixed; boundary=%V", nchan_request_multipart_boundary(r, ctx));
+  val.len = cur - cbuf;
+  
+  r->headers_out.content_type = val;
+  
+  return NGX_OK;
+}
+
+void nchan_subscriber_timeout_ev_handler(ngx_event_t *ev) {
+  subscriber_t *sub = (subscriber_t *)ev->data;
+#if FAKESHARD
+  memstore_fakeprocess_push(sub->owner);
+#endif
+  sub->dequeue_after_response = 1;
+  sub->fn->respond_status(sub, NGX_HTTP_REQUEST_TIMEOUT, &NCHAN_HTTP_STATUS_408, NULL);
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+#endif
+}
+
+
+void nchan_subscriber_init_timeout_timer(subscriber_t *sub, ngx_event_t *ev) {
+  ngx_memzero(ev, sizeof(*ev));
+  nchan_init_timer(ev, nchan_subscriber_timeout_ev_handler, sub);
+}
+
+nchan_fakereq_subrequest_data_t *nchan_subscriber_subrequest(subscriber_t *sub, nchan_requestmachine_request_params_t *params) {
+  if(sub->upstream_requestmachine == NULL) {
+    sub->upstream_requestmachine = ngx_calloc(sizeof(nchan_requestmachine_t), ngx_cycle->log);
+    if(sub->upstream_requestmachine == NULL) {
+      nchan_log_error("failed to allocate upstream_requestmachine for subscriber %p", sub);
+      return NULL;
+    }
+    else {
+      nchan_requestmachine_initialize(sub->upstream_requestmachine, sub->request);
+    }
+  }
+  
+  return nchan_requestmachine_request(sub->upstream_requestmachine, params);
+}
+
+ngx_int_t nchan_subscriber_subrequest_cleanup(subscriber_t *sub) {
+  if(sub->upstream_requestmachine != NULL) {
+    nchan_requestmachine_shutdown(sub->upstream_requestmachine);
+    ngx_free(sub->upstream_requestmachine);
+    sub->upstream_requestmachine = NULL;
+  }
+  return NGX_OK;
+}
+
+void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http_request_t *r, nchan_msg_id_t *msgid) {
+  nchan_request_ctx_t  *ctx = NULL;
+  *sub = *tmpl;
+  sub->request = r;
+  sub->upstream_requestmachine = NULL;
+  if(r) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+    sub->cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  }
+  sub->reserved = 0;
+  sub->enqueued = 0;
+  sub->status = ALIVE;
+  
+  if(msgid) {
+    nchan_copy_new_msg_id(&sub->last_msgid, msgid);
+  }
+  else {
+    sub->last_msgid.time = 0;
+    sub->last_msgid.tag.fixed[0] = 0;
+    sub->last_msgid.tagcount = 1;
+  }
+  
+  if(ctx) {
+    ctx->prev_msg_id = sub->last_msgid;
+    ctx->sub = sub;
+    ctx->subscriber_type = sub->name;
+  }
+  
+#if FAKESHARD
+  sub->owner = memstore_slot();
+#endif
+  
+}
+
+void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t enable_sub_unsub_callbacks, ngx_int_t dequeue_after_response) {
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  sub->type = type;
+  sub->name = name;
+  sub->fn = fn;
+  sub->enable_sub_unsub_callbacks = enable_sub_unsub_callbacks;
+  sub->dequeue_after_response = dequeue_after_response;
+  if(ctx) {
+    ctx->subscriber_type = sub->name;
+  }
+}
+
+ngx_int_t nchan_subscriber_receive_notice(subscriber_t *self, ngx_int_t code, void *data) {
+  if(code == NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST) {
+    nchan_loc_conf_t     *cf = self->cf;
+    ngx_str_t             result;
+    int                   result_allocd = 0;
+    ngx_str_t             content_type = ngx_string("text/plain");
+    ngx_str_t             bad_info_string = ngx_string("bad subscriber info string");
+    intptr_t              response_id = (intptr_t )data;
+    if(!cf->subscriber_info_string) {
+      result = bad_info_string;
+    }
+    else {
+      if(ngx_http_complex_value_alloc(self->request, cf->subscriber_info_string, &result, 4096) == NGX_ERROR) {
+        result = bad_info_string;
+      }
+      else {
+        result_allocd = 1;
+      }
+    }
+    
+    ngx_str_t *response_channel_id = nchan_get_subscriber_info_response_channel_id(self->request, response_id);
+    
+    nchan_msg_t             msg;
+    ngx_memzero(&msg, sizeof(msg));
+    msg.id.time = 0;
+    msg.id.tag.fixed[0]=0;
+    msg.id.tagcount=1;
+    msg.id.tagactive=0;
+    
+    msg.content_type=&content_type;
+    
+    msg.storage = NCHAN_MSG_STACK;
+    
+    msg.buf.temporary = 1;
+    msg.buf.memory = 1;
+    msg.buf.last_buf = 1;
+    msg.buf.pos = result.data;
+    msg.buf.last = result.data + result.len;
+    msg.buf.start = msg.buf.pos;
+    msg.buf.end = msg.buf.last;
+    
+    cf->storage_engine->publish(response_channel_id, &msg, cf, NULL, NULL);
+    
+    if(result_allocd) {
+      ngx_http_complex_value_free(&result);
+    }
+  }
+  return NGX_OK;
+}
+
+
+#define MSGID_BUF_LEN (10*255)
+typedef struct msgidbuf_s msgidbuf_t;
+struct msgidbuf_s {
+  u_char       chr[MSGID_BUF_LEN];
+  msgidbuf_t  *prev;
+  msgidbuf_t  *next;
+};
+
+static void *msgidbuf_alloc(void *pd) {
+  return ngx_palloc((ngx_pool_t *)pd, sizeof(msgidbuf_t));
+}
+
+ngx_int_t nchan_subscriber_init_msgid_reusepool(nchan_request_ctx_t *ctx, ngx_pool_t *request_pool) {
+  ctx->output_str_queue = ngx_palloc(request_pool, sizeof(*ctx->output_str_queue));
+  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(msgidbuf_t, prev), offsetof(msgidbuf_t, next), msgidbuf_alloc, NULL, request_pool);
+  return NGX_OK;
+}
+
+ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid) {
+  ngx_str_t               ret;
+  msgidbuf_t             *msgidbuf;
+  
+  msgidbuf = nchan_reuse_queue_push(ctx->output_str_queue);
+  ret.data = &msgidbuf->chr[0];
+  
+  nchan_strcpy(&ret, msgid_to_str(msgid), MSGID_BUF_LEN);
+  
+  return ret;
+}
+
+ngx_int_t nchan_subscriber_publish_info(subscriber_t *sub, uintptr_t destination_channel_id_number) {
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/common.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/common.h
new file mode 100644
index 0000000..03edec4
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/common.h
@@ -0,0 +1,27 @@
+ngx_int_t nchan_subscriber_subscribe(subscriber_t *sub, ngx_str_t *ch_id);
+
+ngx_int_t nchan_subscriber_authorize_subscribe_request(subscriber_t *sub, ngx_str_t *ch_id);
+ngx_int_t nchan_subscriber_subscribe_request(subscriber_t *sub);
+ngx_int_t nchan_subscriber_unsubscribe_request(subscriber_t *sub);
+ngx_int_t nchan_subscriber_subrequest_cleanup(subscriber_t *sub);
+
+ngx_int_t nchan_cleverly_output_headers_only_for_later_response(ngx_http_request_t *r);
+
+ngx_str_t *nchan_request_multipart_boundary(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
+
+ngx_int_t nchan_request_set_content_type_multipart_boundary_header(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
+
+ngx_int_t nchan_subscriber_receive_notice(subscriber_t *, ngx_int_t code, void *data);
+
+
+nchan_fakereq_subrequest_data_t *nchan_subscriber_subrequest(subscriber_t *sub, nchan_requestmachine_request_params_t *params);
+
+
+void nchan_subscriber_timeout_ev_handler(ngx_event_t *ev);
+void nchan_subscriber_init(subscriber_t *sub, const subscriber_t *tmpl, ngx_http_request_t *r, nchan_msg_id_t *msgid);
+void nchan_subscriber_init_timeout_timer(subscriber_t *sub, ngx_event_t *ev);
+void nchan_subscriber_common_setup(subscriber_t *sub, subscriber_type_t type, ngx_str_t *name, subscriber_fn_t *fn, ngx_int_t enable_sub_unsub_callbacks, ngx_int_t dequeue_after_response);
+ngx_int_t nchan_subscriber_init_msgid_reusepool(nchan_request_ctx_t *ctx, ngx_pool_t *request_pool);
+ngx_str_t nchan_subscriber_set_recyclable_msgid_str(nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
+
+ngx_int_t nchan_subscriber_publish_info(subscriber_t *sub, uintptr_t channel_id_number);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/eventsource.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/eventsource.c
new file mode 100644
index 0000000..a598101
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/eventsource.c
@@ -0,0 +1,414 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <util/nchan_bufchainpool.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+#include "eventsource.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:EVENTSOURCE:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:EVENTSOURCE:" fmt, ##arg)
+#include <assert.h> 
+
+static nchan_bufchain_pool_t *fsub_bcp(full_subscriber_t *fsub) {
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  return ctx->bcp;
+}
+
+/*static ngx_inline void str_to_buf(ngx_buf_t *buf, ngx_str_t *str) {
+  buf->start = str->data;
+  buf->pos = str->data;
+  buf->end = str->data + str->len;
+  buf->last = buf->end;
+  buf->memory = 1;
+}
+*/
+
+static void es_ensure_headers_sent(full_subscriber_t *fsub) {
+  static const ngx_str_t   content_type = ngx_string("text/event-stream; charset=utf-8");
+  static const ngx_str_t   hello = ngx_string(": hi\n\n");
+  ngx_http_request_t             *r = fsub->sub.request;
+  ngx_http_core_loc_conf_t       *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+  
+  nchan_buf_and_chain_t          *bc;
+  
+  if(!fsub->data.shook_hands) {
+    bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 1);
+    clcf->chunked_transfer_encoding = 0;
+    
+    r->headers_out.content_type.len = content_type.len;
+    r->headers_out.content_type.data = content_type.data;
+    r->headers_out.content_length_n = -1;
+    //send headers
+    
+    nchan_cleverly_output_headers_only_for_later_response(r);
+    
+    //send a ":hi" comment
+    ngx_init_set_membuf(&bc->buf, hello.data, hello.data + hello.len);
+    
+    bc->buf.last_buf = 0;
+    bc->buf.flush = 1;
+    
+    r->chunked = 0;
+    r->header_only = 0;
+    
+    nchan_output_filter(fsub->sub.request, &bc->chain);
+    
+    fsub->data.shook_hands = 1; 
+  }
+}
+
+static ngx_int_t create_dataline_bufchain(full_subscriber_t *fsub, ngx_chain_t **first_chain, ngx_chain_t **last_chain, ngx_buf_t *databuf) {
+  static ngx_str_t        data_prefix=ngx_string("data: ");
+  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), ngx_buf_size(databuf) == 0 ? 1 : 2);
+  ngx_chain_t            *chain = &bc->chain;
+  
+  if(*last_chain) {
+    (*last_chain)->next = chain;
+  }
+  
+  ngx_init_set_membuf(chain->buf, data_prefix.data, data_prefix.data + data_prefix.len);
+  
+  if(*first_chain == NULL) {
+    *first_chain = chain;
+  }
+  
+  if(ngx_buf_size(databuf) > 0) {
+    chain = chain->next;
+    *chain->buf = *databuf;
+    chain->buf->last_buf = 0;
+    chain->buf->last_in_chain = 0;
+  }
+  *last_chain = chain;
+
+  return NGX_OK;
+}
+
+static void prepend_es_response_line(full_subscriber_t *fsub, ngx_str_t *lbl, ngx_chain_t **first_chain, ngx_str_t *str) {
+  static ngx_str_t        nl = ngx_string("\n");
+  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 3);
+  ngx_chain_t            *chain;
+
+  chain = &bc->chain;
+  ngx_init_set_membuf(chain->buf, lbl->data, lbl->data + lbl->len);
+  chain = chain->next;
+  ngx_init_set_membuf(chain->buf, str->data, str->data + str->len);
+  chain = chain->next;
+  ngx_init_set_membuf(chain->buf, nl.data, nl.data + 1);
+  
+  assert(chain->next == NULL);
+  chain->next = *first_chain;
+  *first_chain = &bc->chain;
+}
+
+static ngx_int_t es_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
+  static ngx_str_t        terminal_newlines=ngx_string("\n\n");
+  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
+  u_char                 *cur = NULL, *last = NULL;
+  ngx_buf_t              *msg_buf = &msg->buf;
+  ngx_buf_t               databuf;
+  nchan_buf_and_chain_t  *bc;
+  ngx_chain_t            *first_link = NULL, *last_link = NULL;
+  ngx_str_t               msgid;
+  static ngx_str_t        id_line = ngx_string("id: ");
+  static ngx_str_t        event_line = ngx_string("event: ");
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  
+  
+  ctx->prev_msg_id = fsub->sub.last_msgid;
+  update_subscriber_last_msg_id(sub, msg);
+  ctx->msg_id = fsub->sub.last_msgid;
+  
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
+  }
+  
+  es_ensure_headers_sent(fsub);
+  
+  DBG("%p output msg to subscriber", sub);
+  
+  ngx_memcpy(&databuf, msg_buf, sizeof(*msg_buf));
+  databuf.last_buf = 0;
+  
+  if(!databuf.in_file) {
+    cur = msg_buf->start;
+    last = msg_buf->end;
+    do {
+      databuf.start = cur;
+      databuf.pos = cur;
+      databuf.end = last;
+      databuf.last = last;
+      
+      cur = ngx_strlchr(cur, last, '\n');
+      if(cur == NULL) {
+        //sweet, no newlines!
+        //let's get out of this hellish loop
+        databuf.end = last;
+        databuf.last = last;
+        cur = last + 1;
+      }
+      else {
+        cur++; //include the newline
+        databuf.end = cur;
+        databuf.last = cur;
+      }
+      
+      create_dataline_bufchain(fsub, &first_link, &last_link, &databuf);
+      
+    } while(cur <= last);
+  } 
+  else {
+    //great, we've gotta scan this whole damn file for line breaks.
+    //EventStream really isn't designed for large chunks of data
+    off_t       fcur, flast;
+    //int         chr_int;
+    FILE       *stream;
+    ngx_file_t *msgfile =  nchan_bufchain_pool_reserve_file(ctx->bcp);
+    
+    nchan_msg_buf_open_fd_if_needed(&databuf, msgfile, NULL);
+
+    if(msgfile->fd == NGX_INVALID_FILE) {
+      msgfile->fd = nchan_fdcache_get(&msgfile->name);
+    }
+    stream = fdopen(dup(msgfile->fd), "r");
+    
+    fcur = databuf.file_pos;
+    flast = databuf.file_last;
+    
+    fseek(stream, fcur, SEEK_SET);
+    
+    do {
+      databuf.file_pos = fcur;
+      databuf.file_last = flast;
+      
+      //getc that shit
+      /*for(;;) {
+        chr_int = getc(stream);
+        if(chr_int == EOF) {
+          break;
+        }
+        else if(chr_int == (int )'\n') {
+          fcur++;
+          break;
+        }
+        fcur++;
+      }*/
+      
+      if(fscanf(stream,"%*[^\n]\n") != EOF) {
+        fcur = ftell(stream);
+      }
+      else {
+        fcur = flast;
+      }
+      
+      databuf.file_last = fcur;
+      create_dataline_bufchain(fsub, &first_link, &last_link, &databuf);
+      
+    } while(fcur < flast);
+    
+    fclose(stream);
+  }
+  
+  //now 2 newlines at the end
+  if(last_link) {
+    bc = nchan_bufchain_pool_reserve(ctx->bcp, 1);
+    last_link->next=&bc->chain;
+    ngx_init_set_membuf(&bc->buf, terminal_newlines.data, terminal_newlines.data + terminal_newlines.len);
+    
+    bc->buf.flush = 1;
+    bc->buf.last_buf = 0;
+    
+    bc->chain.next = NULL;
+    bc->chain.buf = &bc->buf;
+    
+    last_link = &bc->chain;
+  }
+  //okay, this crazy data chain is finished. 
+    
+  //now how about the mesage tag?
+  
+  msgid = nchan_subscriber_set_recyclable_msgid_str(ctx, &sub->last_msgid);
+  prepend_es_response_line(fsub, &id_line, &first_link, &msgid);
+  
+  //and maybe the event type?
+  if(sub->cf->eventsource_event.len > 0) {
+    prepend_es_response_line(fsub, &event_line, &first_link, &sub->cf->eventsource_event);
+  }
+  else if(msg->eventsource_event) {
+    prepend_es_response_line(fsub, &event_line, &first_link, msg->eventsource_event);
+  }
+  
+  return nchan_output_msg_filter(fsub->sub.request, msg, first_link);
+}
+
+static void empty_handler(void) {}
+
+static ngx_int_t es_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line,  ngx_chain_t *status_body){
+  
+  static ngx_str_t          empty_line = ngx_string("");
+  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
+  u_char                    resp_buf[256];
+  nchan_buf_and_chain_t     bc;
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //ignore
+    return NGX_OK;
+  }
+  
+  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
+  }
+  
+  es_ensure_headers_sent(fsub);
+  
+  DBG("%p output status to subscriber", sub);
+  
+  bc.chain.buf = &bc.buf;
+  bc.chain.next = NULL;
+  ngx_init_set_membuf(&bc.buf, resp_buf, ngx_snprintf(resp_buf, 256, ":%i: %V\n\n", status_code, status_line ? status_line : &empty_line));
+  bc.buf.flush = 1;
+  bc.buf.last_buf = 1;
+  
+  nchan_output_filter(fsub->sub.request, &bc.chain);
+  
+  if((status_code >=400 && status_code <599) || status_code == NGX_HTTP_NOT_MODIFIED) {
+    fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
+    fsub->sub.request->keepalive=0;
+    sub->request->headers_out.status = status_code;
+    fsub->data.finalize_request=1;
+    sub->fn->dequeue(sub);
+  }
+
+  return NGX_OK;
+}
+
+static void ping_ev_handler(ngx_event_t *ev) {
+  full_subscriber_t    *fsub = (full_subscriber_t *)ev->data;
+  nchan_loc_conf_t     *cf = fsub->sub.cf;
+  
+  if(!ev->timedout) {
+    return;
+  }
+
+  struct {
+    ngx_str_t   prefix;
+    ngx_str_t  *value;
+  } line[3] = {
+    {ngx_string(":"),         &cf->eventsource_ping.comment},
+    {ngx_string("event: "),   &cf->eventsource_ping.event},
+    {ngx_string("data: "),    &cf->eventsource_ping.data}
+  };
+  
+  int chaincount = 1;
+  int i;
+  for(i=0; i<3; i++) {
+    chaincount += line[i].value->len > 0 ? 3 : 0;
+  }
+
+  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), chaincount);
+  ngx_chain_t            *chain = NULL;
+    
+  for(i=0; i<3; i++) {
+    if(line[i].value->len > 0) {
+      chain = chain ? chain->next : &bc->chain;
+      ngx_init_set_membuf_str(chain->buf, &line[i].prefix);
+      
+      chain = chain->next;
+      ngx_init_set_membuf_str(chain->buf, line[i].value);
+      
+      chain = chain->next;
+      ngx_init_set_membuf_char(chain->buf, "\n");
+    }
+  }
+  chain = chain ? chain->next : &bc->chain;
+  if(chaincount > 1) {
+    ngx_init_set_membuf_char(chain->buf, "\n");
+  }
+  else {
+    //everything's empty.
+    //rather than sending a single newline (which is probably a valid event-stream protocol token)
+    //send an empty comment (definitely valid)
+    ngx_init_set_membuf_char(chain->buf, ":\n\n");
+  }
+  chain->buf->last_in_chain = 1;
+  chain->buf->flush = 1;
+  chain->next = NULL;
+  
+  nchan_output_filter(fsub->sub.request, &bc->chain);
+  
+  ev->timedout=0;
+  ngx_add_timer(&fsub->data.ping_ev, fsub->sub.cf->eventsource_ping.interval * 1000);
+}
+
+static ngx_int_t es_enqueue(subscriber_t *sub) {
+  ngx_int_t           rc;
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  DBG("%p output status to subscriber", sub);
+  rc = longpoll_enqueue(sub);
+  if(rc == NGX_OK) {
+    if(sub->cf->eventsource_ping.interval > 0) {
+      nchan_init_timer(&fsub->data.ping_ev, ping_ev_handler, fsub);
+      ngx_add_timer(&fsub->data.ping_ev, sub->cf->eventsource_ping.interval * 1000);
+    }
+  }
+  
+  fsub->data.finalize_request = 0;
+  es_ensure_headers_sent(fsub);
+  sub->enqueued = 1;
+  return rc;
+}
+
+static ngx_int_t es_dequeue(subscriber_t *sub) {
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  if(fsub->data.ping_ev.timer_set) {
+    ngx_del_timer(&fsub->data.ping_ev);
+  }
+  return longpoll_dequeue(sub);
+}
+
+static       subscriber_fn_t  eventsource_fn_data;
+static       subscriber_fn_t *eventsource_fn = NULL;
+
+static       ngx_str_t   sub_name = ngx_string("eventsource");
+
+
+subscriber_t *eventsource_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
+  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  if(eventsource_fn == NULL) {
+    eventsource_fn = &eventsource_fn_data;
+    *eventsource_fn = *sub->fn;
+    eventsource_fn->enqueue = es_enqueue;
+    eventsource_fn->dequeue = es_dequeue;
+    eventsource_fn->respond_message= es_respond_message;
+    eventsource_fn->respond_status = es_respond_status;
+  }
+  
+  ngx_memzero(&fsub->data.ping_ev, sizeof(fsub->data.ping_ev));
+  
+  fsub->data.shook_hands = 0;
+  
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  //msgid bufs -- unique per response
+  nchan_subscriber_init_msgid_reusepool(ctx, r->pool);
+  
+  nchan_subscriber_common_setup(sub, EVENTSOURCE, &sub_name, eventsource_fn, 1, 0);
+  return sub;
+}
+
+ngx_int_t nchan_detect_eventsource_request(ngx_http_request_t *r) {
+  ngx_str_t       *accept_header = nchan_get_accept_header_value(r);
+
+  if(accept_header && ngx_strnstr(accept_header->data, "text/event-stream", accept_header->len)) {
+    return 1;
+  }
+  
+  return 0;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/eventsource.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/eventsource.h
new file mode 100644
index 0000000..424a7c7
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/eventsource.h
@@ -0,0 +1,4 @@
+subscriber_t *eventsource_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+//ngx_int_t eventsource_subscriber_destroy(subscriber_t *sub);
+
+ngx_int_t nchan_detect_eventsource_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/getmsg_proxy.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/getmsg_proxy.c
new file mode 100644
index 0000000..fb77b55
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/getmsg_proxy.c
@@ -0,0 +1,106 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "internal.h"
+#include "getmsg_proxy.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:PROXY:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:PROXY:" fmt, ##arg)
+
+
+typedef struct sub_data_s sub_data_t;
+
+struct sub_data_s {
+  subscriber_t                 *sub;
+  ngx_str_t                    *chid;
+  ngx_event_t                   timeout_ev;
+  callback_pt                   cb;
+  void                         *pd;
+}; //sub_data_t
+
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
+  DBG("%p enqueued ok", d->sub);
+  return NGX_OK;
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)d->sub;
+  DBG("%p dequeue:", d->sub);
+
+  //TODO: make sure proxy target is already taken care of
+  
+  if(fsub->sub.reserved > 0) {
+    DBG("%p  not ready to destroy (reserved for %i)", fsub, fsub->sub.reserved);
+    fsub->awaiting_destruction = 1;
+  }
+  else {
+    DBG("%p destroy", fsub);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
+  DBG("%p forwarding msg", d->sub);
+  nchan_msg_t            *msg = (nchan_msg_t *) ptr;
+  d->cb(MSG_FOUND, msg, d->pd);
+  d->cb = NULL;
+  //TODO : dequeue
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  assert(d->cb);
+  if(!ptr) {
+    switch(status) {
+      case NGX_HTTP_GONE: //delete
+        DBG("%p forwarding MSG_EXPIRED", d->sub);
+        d->cb(MSG_EXPIRED, NULL, d->pd);
+        d->cb = NULL;
+        break;
+      case NGX_HTTP_CONFLICT:
+      case NGX_HTTP_CLOSE: //delete
+      case NGX_HTTP_FORBIDDEN:
+      case NGX_HTTP_NOT_FOUND:
+      case NGX_HTTP_REQUEST_TIMEOUT:
+        DBG("%p forwarding MSG_NOTFOUND", d->sub);
+        d->cb(MSG_NOTFOUND, NULL, d->pd);
+        d->cb = NULL;
+        break;
+      case NGX_HTTP_NO_CONTENT:
+        //translate back to MSG request status code
+        DBG("%p forwarding MSG_EXPECTED", d->sub);
+        d->cb(MSG_EXPECTED, NULL, d->pd);
+        d->cb = NULL;
+        break;
+      case NGX_HTTP_NOT_MODIFIED: //does this even ever happen? I don't think so.
+        assert(0);
+        break;
+      default:
+        ERR("unknown status %i", status);
+    }
+  }
+  return NGX_OK;
+}
+
+static ngx_str_t sub_name = ngx_string("getmsg-proxy");
+
+subscriber_t *getmsg_proxy_subscriber_create(nchan_msg_id_t *msgid, callback_pt cb, void *pd) {
+  sub_data_t                 *d;
+  subscriber_t               *sub;
+  
+  sub = internal_subscriber_create_init(&sub_name, NULL /*no config*/, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, NULL, NULL);
+  
+  
+  DBG("created new getmsg_proxy sub %p", sub);
+  nchan_copy_new_msg_id(&sub->last_msgid, msgid);
+  sub->destroy_after_dequeue = 1;
+  sub->dequeue_after_response = 1;
+  d->sub = sub;
+  d->cb = cb;
+  d->pd = pd;
+  return sub;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/getmsg_proxy.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/getmsg_proxy.h
new file mode 100644
index 0000000..48a9834
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/getmsg_proxy.h
@@ -0,0 +1 @@
+subscriber_t *getmsg_proxy_subscriber_create(nchan_msg_id_t *msgid, callback_pt cb, void *pd);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-chunked.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-chunked.c
new file mode 100644
index 0000000..e652841
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-chunked.c
@@ -0,0 +1,259 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+#include "http-chunked.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:CHUNKED:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:CHUNKED:" fmt, ##arg)
+#include <assert.h> 
+
+#define CHUNKSIZE_BUF_LEN 20
+
+typedef struct chunksizebuf_s chunksizebuf_t;
+struct chunksizebuf_s {
+  u_char           chr[CHUNKSIZE_BUF_LEN];
+  chunksizebuf_t  *prev;
+  chunksizebuf_t  *next;
+};
+
+static void chunked_ensure_headers_sent(full_subscriber_t *fsub) {
+  static ngx_str_t         transfer_encoding_header = ngx_string("Transfer-Encoding");
+  static ngx_str_t         transfer_encoding = ngx_string("chunked");
+  
+  ngx_http_request_t             *r = fsub->sub.request;
+  ngx_http_core_loc_conf_t       *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+  if(!fsub->data.shook_hands) {
+    
+    clcf->chunked_transfer_encoding = 0;
+    
+    //r->headers_out.content_type.len = content_type.len;
+    //r->headers_out.content_type.data = content_type.data;
+    
+    nchan_add_response_header(r, &transfer_encoding_header, &transfer_encoding);
+    
+    nchan_cleverly_output_headers_only_for_later_response(r);
+    
+    fsub->data.shook_hands = 1; 
+    r->chunked = 0;
+    r->header_only = 0;
+  }
+}
+
+static ngx_int_t chunked_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
+  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  chunksizebuf_t         *chunksizebuf = nchan_reuse_queue_push(ctx->output_str_queue);
+  u_char                 *chunk_start = &chunksizebuf->chr[0];
+  static u_char          *chunk_end=(u_char *)"\r\n";
+  ngx_file_t             *file_copy;
+  nchan_buf_and_chain_t  *bc = nchan_bufchain_pool_reserve(ctx->bcp, 3);
+  ngx_chain_t            *chain;
+  ngx_buf_t              *buf, *msg_buf = &msg->buf;
+  ngx_int_t               rc;
+  
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
+  }
+  
+  ctx->prev_msg_id = fsub->sub.last_msgid;
+  update_subscriber_last_msg_id(sub, msg);
+  ctx->msg_id = fsub->sub.last_msgid;
+  
+  if (ngx_buf_size(msg_buf) == 0) {
+    //empty messages are skipped, because a zero-length chunk finalizes the request
+    return NGX_OK;
+  }
+  
+  //chunk size
+  chain = &bc->chain;
+  buf = chain->buf;
+  ngx_memzero(buf, sizeof(*buf));
+  buf->memory = 1;
+  buf->start = chunk_start;
+  buf->pos = chunk_start;
+  buf->end = ngx_snprintf(chunk_start, 15, "%xi\r\n", ngx_buf_size(msg_buf));
+  buf->last = buf->end;
+  
+  //message
+  chain = chain->next;
+  buf = chain->buf;
+  *buf = *msg_buf;
+  if(buf->file) {
+    file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
+    nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
+  }
+  buf->last_buf = 0;
+  buf->last_in_chain = 0;
+  buf->flush = 0;
+  
+  //trailing newlines
+  chain = chain->next;
+  buf = chain->buf;
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = chunk_end;
+  buf->pos = chunk_end;
+  buf->end = chunk_end + 2;
+  buf->last = buf->end;
+  buf->memory = 1;
+  buf->last_buf = 0;
+  buf->last_in_chain = 1;
+  buf->flush = 1;
+  
+  chunked_ensure_headers_sent(fsub);
+  
+  DBG("%p output msg to subscriber", sub);
+  
+  rc = nchan_output_msg_filter(fsub->sub.request, msg, &bc->chain);
+  
+  return rc;
+}
+
+static ngx_int_t chunked_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line,  ngx_chain_t *status_body){
+  nchan_buf_and_chain_t     bc;
+  ngx_chain_t              *chain = NULL;
+  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
+  
+  if(chain == NULL) {
+    bc.chain.buf=&bc.buf;
+    bc.chain.next=NULL;
+    ngx_memzero(&bc.buf, sizeof(ngx_buf_t));
+    bc.buf.last_buf = 1;
+    bc.buf.last_in_chain = 1;
+    bc.buf.flush = 1;
+    bc.buf.memory = 1;
+    chain = &bc.chain;
+  }
+  
+  bc.buf.start = (u_char *)"0\r\n\r\n";
+  bc.buf.end = bc.buf.start + 5;
+  bc.buf.pos = bc.buf.start;
+  bc.buf.last = bc.buf.end;
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //ignore
+    return NGX_OK;
+  }
+  
+  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code < 600) {
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
+  }
+  
+  chunked_ensure_headers_sent(fsub);
+  
+  nchan_output_filter(fsub->sub.request, chain);
+  
+  subscriber_maybe_dequeue_after_status_response(fsub, status_code);
+
+  return NGX_OK;
+}
+
+static void *chunksizebuf_alloc(void *pd) {
+  return ngx_palloc((ngx_pool_t *)pd, sizeof(chunksizebuf_t));
+}
+
+static ngx_int_t chunked_enqueue(subscriber_t *sub) {
+  ngx_int_t           rc;
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  DBG("%p output status to subscriber", sub);
+  rc = longpoll_enqueue(sub);
+  fsub->data.finalize_request = 0;
+  chunked_ensure_headers_sent(fsub);
+  sub->enqueued = 1;
+  return rc;
+}
+
+static       subscriber_fn_t  chunked_fn_data;
+static       subscriber_fn_t *chunked_fn = NULL;
+
+static       ngx_str_t   sub_name = ngx_string("http-chunked");
+
+subscriber_t *http_chunked_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
+  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(sub->request, ngx_nchan_module);
+  if(chunked_fn == NULL) {
+    chunked_fn = &chunked_fn_data;
+    *chunked_fn = *sub->fn;
+    chunked_fn->enqueue = chunked_enqueue;
+    chunked_fn->respond_message = chunked_respond_message;
+    chunked_fn->respond_status = chunked_respond_status;
+  }
+  
+  fsub->data.shook_hands = 0;
+  
+  ctx->output_str_queue = ngx_palloc(r->pool, sizeof(*ctx->output_str_queue));
+  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(chunksizebuf_t, prev), offsetof(chunksizebuf_t, next), chunksizebuf_alloc, NULL, r->pool);
+  
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  nchan_subscriber_common_setup(sub, HTTP_CHUNKED, &sub_name, chunked_fn, 1, 0);
+  return sub;
+}
+
+
+
+ngx_int_t nchan_detect_chunked_subscriber_request(ngx_http_request_t *r) {
+  static ngx_str_t   TE_HEADER = ngx_string("TE");
+  ngx_str_t         *tmp;
+  u_char            *cur, *last;
+  
+  if(r->method != NGX_HTTP_GET) {
+    return 0;
+  }
+  
+  if((tmp = nchan_get_header_value(r, TE_HEADER)) != NULL) {
+    last = tmp->data + tmp->len;
+    cur = ngx_strlcasestrn(tmp->data, last, (u_char *)"chunked", 7 - 1);
+    
+    if(cur == NULL) {
+      return 0;
+    }
+    
+    //see if there's a qvalue
+    cur += 7;
+    if((cur + 1 <= last) && cur[0]==' ') { 
+      //no qvalue. assume non-zero, meaning it's legit
+      return 1;
+    }
+    else if((cur + 4) < last) {
+      //maybe there is...
+      if(cur[0]==';' && cur[1]=='q' && cur[2]=='=') {
+        //parse the freaking qvalue
+        cur += 3;
+        ngx_int_t qval_fp;
+        qval_fp = ngx_atofp(cur, last - cur, 2);
+        if(qval_fp == NGX_ERROR) {
+          DBG("invalid qval. reject.");
+          return 0;
+        }
+        else if(qval_fp > 0) {
+          //got nonzero qval. accept
+          return 1;
+        }
+        else {
+          //qval=0. reject
+          return 0;
+        }
+      }
+      else {
+        //we're looking at  "chunkedsomething", not "chunked;q=<...>". reject.
+        return 0;
+      }
+    }
+    else if (cur == last){
+      //last thing in the header. "chunked". accept
+      return 1;
+    }
+    else {
+      //too small to have a qvalue, not followed by a space. must be "chunkedsomething"
+      return 0;
+    }
+  }
+  else return 0;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-chunked.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-chunked.h
new file mode 100644
index 0000000..efb5197
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-chunked.h
@@ -0,0 +1,4 @@
+subscriber_t *http_chunked_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+//ngx_int_t http_chunked_subscriber_destroy(subscriber_t *sub);
+
+ngx_int_t nchan_detect_chunked_subscriber_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-multipart-mixed.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-multipart-mixed.c
new file mode 100644
index 0000000..fc0955d
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-multipart-mixed.c
@@ -0,0 +1,291 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <util/nchan_bufchainpool.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+#include "http-multipart-mixed.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MULTIPART:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MULTIPART:" fmt, ##arg)
+#include <assert.h> 
+
+typedef struct {
+  u_char                 boundary[50];
+  u_char                *boundary_end;
+} multipart_privdata_t;
+
+typedef struct {
+  u_char       charbuf[58 + 10*NCHAN_FIXED_MULTITAG_MAX];
+  void        *prev;
+  void        *next;
+} headerbuf_t;
+
+static nchan_bufchain_pool_t *fsub_bcp(full_subscriber_t *fsub) {
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  return ctx->bcp;
+}
+
+static void multipart_ensure_headers_sent(full_subscriber_t *fsub) {
+  nchan_buf_and_chain_t          *bc;
+  
+  ngx_http_request_t             *r = fsub->sub.request;
+  ngx_http_core_loc_conf_t       *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  multipart_privdata_t           *mpd = (multipart_privdata_t *)fsub->privdata;
+  
+  if(!fsub->data.shook_hands) {
+    clcf->chunked_transfer_encoding = 0;
+    nchan_request_set_content_type_multipart_boundary_header(r, ctx);
+    
+    nchan_cleverly_output_headers_only_for_later_response(r);
+    
+    //set preamble in the request ctx. it would be nicer to store in in the subscriber data, 
+    //but that would mean not reusing longpoll's fsub directly
+    
+    r->header_only = 0;
+    r->chunked = 0;
+    
+    if((bc = nchan_bufchain_pool_reserve(ctx->bcp, 1)) == NULL) {
+      ERR("can't reserve bufchain for multipart headers");
+      nchan_respond_status(fsub->sub.request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 1);
+      return;
+    }
+    
+    ngx_memzero(&bc->buf, sizeof(ngx_buf_t));
+    bc->buf.start = mpd->boundary + 2;
+    bc->buf.pos = bc->buf.start;
+    bc->buf.end = mpd->boundary_end;
+    bc->buf.last = bc->buf.end;
+    bc->buf.memory = 1;
+    bc->buf.last_buf = 0;
+    bc->buf.last_in_chain = 1;
+    bc->buf.flush = 1;
+    
+    nchan_output_filter(r, &bc->chain);
+    
+    fsub->data.shook_hands = 1; 
+  }
+}
+static void *headerbuf_alloc(void *pd) {
+  return ngx_palloc((ngx_pool_t *)pd, sizeof(headerbuf_t));
+}
+
+static ngx_int_t multipart_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
+  
+  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
+  ngx_buf_t              *buf, *msg_buf = &msg->buf, *msgid_buf;
+  ngx_int_t               rc;
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(fsub->sub.request, ngx_nchan_module);
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  ngx_int_t               n;
+  nchan_buf_and_chain_t  *bc;
+  ngx_chain_t            *chain;
+  ngx_file_t             *file_copy;
+  multipart_privdata_t   *mpd = (multipart_privdata_t *)fsub->privdata;
+  
+  headerbuf_t            *headerbuf = nchan_reuse_queue_push(ctx->output_str_queue);
+  u_char                 *cur = headerbuf->charbuf;
+  
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
+  }
+  
+  //generate the headers
+  if(!cf->msg_in_etag_only) {
+    //msgtime
+    cur = ngx_cpymem(cur, "\r\nLast-Modified: ", sizeof("\r\nLast-Modified: ") - 1);
+    cur = ngx_http_time(cur, msg->id.time);
+    *cur++ = CR; *cur++ = LF;
+    //msgtag
+    cur = ngx_cpymem(cur, "Etag: ", sizeof("Etag: ") - 1);
+    cur += msgtag_to_strptr(&msg->id, (char *)cur);
+    *cur++ = CR; *cur++ = LF;
+  }
+  else {
+    ngx_str_t   *tmp_etag = msgid_to_str(&msg->id);
+    cur = ngx_snprintf(cur, 58 + 10*NCHAN_FIXED_MULTITAG_MAX, "\r\nEtag: %V\r\n", tmp_etag);
+  }
+  
+  n=4;
+  if(!msg->content_type) {
+    //don't need content_type buf'n'chain
+    n--;
+  }
+  if(ngx_buf_size(msg_buf) == 0) {
+    //don't need msgbuf
+    n --;
+  }
+  if((bc = nchan_bufchain_pool_reserve(ctx->bcp, n)) == NULL) {
+    ERR("can't allocate buf-and-chains for multipart/mixed client output");
+    return NGX_ERROR;
+  }
+  
+  chain = &bc->chain;
+  msgid_buf = chain->buf;
+  
+  //message id
+  ngx_memzero(chain->buf, sizeof(ngx_buf_t));
+  chain->buf->memory = 1;
+  chain->buf->start = headerbuf->charbuf;
+  chain->buf->pos = headerbuf->charbuf;
+  
+  //content_type maybe
+  if(msg->content_type) {
+    chain = chain->next;
+    buf = chain->buf;
+    
+    msgid_buf->last = cur;
+    msgid_buf->end = cur;
+    
+    ngx_memzero(buf, sizeof(ngx_buf_t));
+    buf->memory = 1;
+    buf->start = cur;
+    buf->pos = cur;
+    buf->last = ngx_snprintf(cur, 255, "Content-Type: %V\r\n\r\n", msg->content_type);
+    buf->end = buf->last;
+  }
+  else {
+    *cur++ = CR; *cur++ = LF;
+    msgid_buf->last = cur;
+    msgid_buf->end = cur;
+  }
+  
+  //msgbuf
+  if(ngx_buf_size(msg_buf) > 0) {
+    chain = chain->next;
+    buf = chain->buf;
+    ngx_memcpy(buf, msg_buf, sizeof(*msg_buf));
+    if(msg_buf->file) {
+      file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
+      nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
+    }
+    buf->last_buf = 0;
+    buf->last_in_chain = 0;
+    buf->flush = 0;
+  }
+  
+  chain = chain->next;
+  buf = chain->buf;
+  ngx_memzero(buf, sizeof(ngx_buf_t));
+  buf->start = &mpd->boundary[0];
+  buf->pos = buf->start;
+  buf->end = mpd->boundary_end;
+  buf->last = buf->end;
+  buf->memory = 1;
+  buf->last_buf = 0;
+  buf->last_in_chain = 1;
+  buf->flush = 1;
+  
+  ctx->prev_msg_id = fsub->sub.last_msgid;
+  update_subscriber_last_msg_id(sub, msg);
+  ctx->msg_id = fsub->sub.last_msgid;
+  
+  multipart_ensure_headers_sent(fsub);
+  
+  DBG("%p output msg to subscriber", sub);
+  
+  rc = nchan_output_msg_filter(fsub->sub.request, msg, &bc->chain);
+  
+  return rc;
+}
+
+static ngx_int_t multipart_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body){
+  nchan_buf_and_chain_t    *bc;
+  static u_char            *end_boundary=(u_char *)"--\r\n";
+  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
+  //nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //ignore
+    return NGX_OK;
+  }
+  
+  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code <600) {
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
+  }
+  
+  multipart_ensure_headers_sent(fsub);
+  
+  if((bc = nchan_bufchain_pool_reserve(fsub_bcp(fsub), 1)) == NULL) {
+    nchan_respond_status(sub->request, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 1);
+    return NGX_ERROR;
+  }
+  
+  ngx_memzero(&bc->buf, sizeof(ngx_buf_t));
+  bc->buf.memory = 1;
+  bc->buf.last_buf = 1;
+  bc->buf.last_in_chain = 1;
+  bc->buf.flush = 1;
+  bc->buf.start = end_boundary;
+  bc->buf.pos = end_boundary;
+  bc->buf.end = end_boundary + 4;
+  bc->buf.last = bc->buf.end;
+  
+  nchan_output_filter(fsub->sub.request, &bc->chain);
+  
+  subscriber_maybe_dequeue_after_status_response(fsub, status_code);
+
+  return NGX_OK;
+}
+
+static ngx_int_t multipart_enqueue(subscriber_t *sub) {
+  ngx_int_t           rc;
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  DBG("%p output status to subscriber", sub);
+  rc = longpoll_enqueue(sub);
+  fsub->data.finalize_request = 0;
+  multipart_ensure_headers_sent(fsub);
+  sub->enqueued = 1;
+  return rc;
+}
+
+static       subscriber_fn_t  multipart_fn_data;
+static       subscriber_fn_t *multipart_fn = NULL;
+
+static       ngx_str_t   sub_name = ngx_string("http-multipart");
+
+
+subscriber_t *http_multipart_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
+  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
+  multipart_privdata_t *multipart_data;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  
+  if(multipart_fn == NULL) {
+    multipart_fn = &multipart_fn_data;
+    *multipart_fn = *sub->fn;
+    multipart_fn->enqueue = multipart_enqueue;
+    multipart_fn->respond_message = multipart_respond_message;
+    multipart_fn->respond_status = multipart_respond_status;
+  }
+  
+  fsub->data.shook_hands = 0;
+  
+  fsub->privdata = ngx_palloc(sub->request->pool, sizeof(multipart_privdata_t));
+  multipart_data = (multipart_privdata_t *)fsub->privdata;
+  multipart_data->boundary_end = ngx_snprintf(multipart_data->boundary, 50, "\r\n--%V", nchan_request_multipart_boundary(fsub->sub.request, ctx));
+  
+  //header bufs -- unique per response
+  ctx->output_str_queue = ngx_palloc(r->pool, sizeof(*ctx->output_str_queue));
+  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(headerbuf_t, prev), offsetof(headerbuf_t, next), headerbuf_alloc, NULL, sub->request->pool);
+  
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  nchan_subscriber_common_setup(sub, HTTP_MULTIPART, &sub_name, multipart_fn, 1, 0);
+  return sub;
+}
+
+ngx_int_t nchan_detect_multipart_subscriber_request(ngx_http_request_t *r) {
+  ngx_str_t       *accept_header = nchan_get_accept_header_value(r);
+
+  if(accept_header && ngx_strnstr(accept_header->data, "multipart/mixed", accept_header->len)) {
+    return 1;
+  }
+  
+  return 0;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-multipart-mixed.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-multipart-mixed.h
new file mode 100644
index 0000000..6a0e097
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-multipart-mixed.h
@@ -0,0 +1,3 @@
+subscriber_t *http_multipart_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+
+ngx_int_t nchan_detect_multipart_subscriber_request(ngx_http_request_t *r);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-raw-stream.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-raw-stream.c
new file mode 100644
index 0000000..1babf20
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-raw-stream.c
@@ -0,0 +1,157 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <util/nchan_bufchainpool.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+#include "http-raw-stream.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:RAWSTREAM:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:RAWSTREAM:" fmt, ##arg)
+#include <assert.h> 
+
+static void rawstream_ensure_headers_sent(full_subscriber_t *fsub) {
+  ngx_http_request_t             *r = fsub->sub.request;
+  //nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  if(!fsub->data.shook_hands) {
+    nchan_cleverly_output_headers_only_for_later_response(r);
+    fsub->data.shook_hands = 1; 
+    r->header_only = 0;
+    r->chunked = 0;
+  }
+}
+
+static ngx_int_t rawstream_respond_message(subscriber_t *sub,  nchan_msg_t *msg) {
+  
+  full_subscriber_t      *fsub = (full_subscriber_t  *)sub;
+  ngx_buf_t              *buf = NULL, *msg_buf = &msg->buf;
+  ngx_int_t               rc;
+  nchan_loc_conf_t       *cf = ngx_http_get_module_loc_conf(fsub->sub.request, ngx_nchan_module);
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  nchan_buf_and_chain_t  *bc;
+  ngx_chain_t            *chain;
+  ngx_file_t             *file_copy;
+  
+  size_t                  separator_len = cf->subscriber_http_raw_stream_separator.len;
+  size_t                  msg_len = ngx_buf_size(msg_buf);
+  
+  
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+    ngx_add_timer(&fsub->data.timeout_ev, sub->cf->subscriber_timeout * 1000);
+  }
+  
+  if(msg_len + separator_len == 0) {
+    //nothing to output
+    return NGX_OK;
+  }
+  
+  if((bc = nchan_bufchain_pool_reserve(ctx->bcp, ((separator_len > 0 ? 1 : 0) + (msg_len > 0 ? 1: 0)))) == NULL) {
+    ERR("can't allocate buf-and-chains for http-raw-stream client output");
+    return NGX_ERROR;
+  }
+  
+  chain = &bc->chain;
+  
+  //message
+  if(msg_len > 0) {
+    buf = chain->buf;
+    *buf = *msg_buf;
+    if(buf->file) {
+      file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
+      nchan_msg_buf_open_fd_if_needed(buf, file_copy, NULL);
+    }
+    buf->last_buf = 0;
+    buf->last_in_chain = 0;
+    buf->flush = 0;
+    
+    chain = chain->next;
+  }
+  
+  //separator 
+  if(separator_len) {
+    buf = chain->buf;
+    ngx_memzero(buf, sizeof(ngx_buf_t));
+    buf->start = cf->subscriber_http_raw_stream_separator.data;
+    buf->pos = buf->start;
+    buf->end = buf->start + separator_len;
+    buf->last = buf->end;
+    buf->memory = 1;
+  }
+
+  if(buf) {
+    buf->last_buf = 0;
+    buf->last_in_chain = 1;
+    buf->flush = 1;
+  }
+  
+  rawstream_ensure_headers_sent(fsub);
+  
+  DBG("%p output msg to subscriber", sub);
+  
+  rc = nchan_output_msg_filter(fsub->sub.request, msg, &bc->chain);
+  
+  return rc;
+}
+
+static ngx_int_t rawstream_respond_status(subscriber_t *sub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body){
+  full_subscriber_t        *fsub = (full_subscriber_t  *)sub;
+  //nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //ignore
+    return NGX_OK;
+  }
+  
+  if(fsub->data.shook_hands == 0 && status_code >= 400 && status_code < 600) {
+    return subscriber_respond_unqueued_status(fsub, status_code, status_line, status_body);
+  }
+  
+  subscriber_maybe_dequeue_after_status_response(fsub, status_code);
+
+  return NGX_OK;
+}
+
+static ngx_int_t rawstream_enqueue(subscriber_t *sub) {
+  ngx_int_t           rc;
+  full_subscriber_t  *fsub = (full_subscriber_t *)sub;
+  DBG("%p output status to subscriber", sub);
+  rc = longpoll_enqueue(sub);
+  fsub->data.finalize_request = 0;
+  rawstream_ensure_headers_sent(fsub);
+  sub->enqueued = 1;
+  return rc;
+}
+
+static       subscriber_fn_t  rawstream_fn_data;
+static       subscriber_fn_t *rawstream_fn = NULL;
+
+static       ngx_str_t   sub_name = ngx_string("http-raw-stream");
+
+
+subscriber_t *http_raw_stream_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub = longpoll_subscriber_create(r, msg_id);
+  full_subscriber_t    *fsub = (full_subscriber_t *)sub;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(fsub->sub.request, ngx_nchan_module);
+  
+  if(rawstream_fn == NULL) {
+    rawstream_fn = &rawstream_fn_data;
+    *rawstream_fn = *sub->fn;
+    rawstream_fn->enqueue = rawstream_enqueue;
+    rawstream_fn->respond_message = rawstream_respond_message;
+    rawstream_fn->respond_status = rawstream_respond_status;
+  }
+  
+  fsub->data.shook_hands = 0;
+  r->keepalive=0;
+  
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  nchan_subscriber_common_setup(sub, HTTP_RAW_STREAM, &sub_name, rawstream_fn, 1, 0);
+  return sub;
+}
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-raw-stream.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-raw-stream.h
new file mode 100644
index 0000000..b85530b
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/http-raw-stream.h
@@ -0,0 +1 @@
+subscriber_t *http_raw_stream_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/internal.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/internal.c
new file mode 100644
index 0000000..aba5bbc
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/internal.c
@@ -0,0 +1,298 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "internal.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:INTERNAL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:INTERNAL:" fmt, ##arg)
+
+static const subscriber_t new_internal_sub;
+
+static ngx_int_t empty_callback(ngx_int_t code, void *ptr, void *d) {
+  return NGX_OK;
+}
+
+ngx_int_t internal_subscriber_set_enqueue_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->enqueue = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_dequeue_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->dequeue = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_notify_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->notify = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_respond_message_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->respond_message = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_respond_status_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->respond_status = handler;
+  return NGX_OK;
+}
+ngx_int_t internal_subscriber_set_destroy_handler(subscriber_t *sub, callback_pt handler) {
+  ((internal_subscriber_t *)sub)->destroy = handler;
+  return NGX_OK;
+}
+
+static ngx_str_t     subscriber_name = ngx_string("internal");
+
+subscriber_t *internal_subscriber_create(ngx_str_t *name, nchan_loc_conf_t *cf, size_t pd_size, void **pd) {
+  internal_subscriber_t               *fsub;
+  
+  if((fsub = ngx_alloc(sizeof(*fsub) + pd_size, ngx_cycle->log)) == NULL) {
+    ERR("Unable to allocate");
+    return NULL;
+  }
+  if(pd) {
+    *pd = pd_size > 0 ? &fsub[1] : NULL;
+  }
+  
+  nchan_subscriber_init(&fsub->sub, &new_internal_sub, NULL, NULL);
+  nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->timeout_ev);
+  fsub->sub.cf = cf;
+  fsub->sub.name= (name == NULL ? &subscriber_name : name);
+  
+  fsub->enqueue = empty_callback;
+  fsub->dequeue = empty_callback;
+  fsub->respond_message = empty_callback;
+  fsub->respond_status = empty_callback;
+  fsub->notify = empty_callback;
+  fsub->destroy = empty_callback;
+  
+  DBG("%p create %V with privdata %p", fsub, fsub->sub.name, *pd);
+  fsub->privdata = pd_size == 0 ? NULL : *pd;
+  
+  fsub->already_dequeued = 0;
+  fsub->awaiting_destruction = 0;
+  
+  fsub->enqueue_callback = NULL;
+  fsub->enqueue_callback_data = NULL;
+  
+  fsub->dequeue_callback = NULL;
+  fsub->dequeue_callback_data = NULL;
+  
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  subscriber_debug_add(&fsub->sub);
+#endif
+  
+  return &fsub->sub;
+}
+
+subscriber_t *internal_subscriber_create_init(ngx_str_t *sub_name, nchan_loc_conf_t *cf, size_t pd_sz, void **pd, callback_pt enqueue, callback_pt dequeue, callback_pt respond_message, callback_pt respond_status, callback_pt notify_handler, callback_pt destroy_handler) {
+  subscriber_t          *sub;
+  
+  if(pd == NULL) {
+    ERR("nowhere to allocate %V subscriber data", sub_name);
+    return NULL;
+  }
+  
+  sub = internal_subscriber_create(sub_name, cf, pd_sz, pd);
+  if(enqueue)
+    internal_subscriber_set_enqueue_handler(sub, enqueue);
+  if(dequeue)
+    internal_subscriber_set_dequeue_handler(sub, dequeue);
+  if(respond_message)
+    internal_subscriber_set_respond_message_handler(sub, respond_message);
+  if(respond_status)
+    internal_subscriber_set_respond_status_handler(sub, respond_status);
+  if(notify_handler)
+    internal_subscriber_set_notify_handler(sub, notify_handler);
+  if(destroy_handler) 
+    internal_subscriber_set_destroy_handler(sub, destroy_handler);
+  return sub;
+}
+
+ngx_int_t internal_subscriber_destroy(subscriber_t *sub) {
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)sub;
+  if(sub->reserved > 0) {
+    DBG("%p not ready to destroy (reserved for %i)", sub, sub->reserved);
+    fsub->awaiting_destruction = 1;
+  }
+  else {
+    DBG("%p (%V) destroy", sub, fsub->sub.name);
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+    subscriber_debug_remove(sub);
+#endif
+    fsub->destroy(NGX_OK, NULL, fsub->privdata);
+    nchan_free_msg_id(&sub->last_msgid);
+    ngx_free(fsub);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t internal_reserve(subscriber_t *self) {
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)self;
+  DBG("%p ) (%V) reserve", self, fsub->sub.name);
+  self->reserved++;
+  return NGX_OK;
+}
+static ngx_int_t internal_release(subscriber_t *sub, uint8_t nodestroy) {
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)sub;
+  DBG("%p (%V) release", sub, fsub->sub.name);
+  sub->reserved--;
+  if(nodestroy == 0 && fsub->awaiting_destruction == 1 && sub->reserved == 0) {
+    DBG("%p (%V) free", sub, fsub->sub.name);
+    fsub->destroy(NGX_OK, NULL, fsub->privdata);
+    nchan_free_msg_id(&sub->last_msgid);
+    ngx_free(fsub);
+    return NGX_ABORT;
+  }
+  else {
+    return NGX_OK;
+  }
+}
+
+void *internal_subscriber_get_privdata(subscriber_t *sub) {
+  internal_subscriber_t               *fsub = (internal_subscriber_t *)sub;
+  return fsub->privdata;
+}
+
+static void reset_timer(internal_subscriber_t *f) {
+  if(f->sub.cf && f->sub.cf->subscriber_timeout > 0) {
+    if(f->timeout_ev.timer_set) {
+      ngx_del_timer(&f->timeout_ev);
+    }
+    ngx_add_timer(&f->timeout_ev, f->sub.cf->subscriber_timeout * 1000);
+  }
+}
+
+static ngx_int_t internal_enqueue(subscriber_t *self) {
+  internal_subscriber_t   *fsub = (internal_subscriber_t *)self;
+  DBG("%p (%V) enqueue", self, fsub->sub.name);
+  if(self->cf && self->cf->subscriber_timeout > 0 && !fsub->timeout_ev.timer_set) {
+    //add timeout timer
+    reset_timer(fsub);
+  }
+  fsub->enqueue(NGX_OK, NULL, fsub->privdata);
+  if(fsub->enqueue_callback) {
+    fsub->enqueue_callback(self, fsub->enqueue_callback_data);
+  }
+  self->enqueued = 1;
+  return NGX_OK;
+}
+
+static ngx_int_t internal_dequeue(subscriber_t *self) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  if (f->already_dequeued) {
+    return NGX_OK; //it's ok to be dequeued more than once,
+    //because a subscriber may linger a bit before being deleted
+  }
+  f->already_dequeued = 1;
+  DBG("%p (%V) dequeue sub", self, f->sub.name);
+  f->dequeue(NGX_OK, NULL, f->privdata);
+  if(f->dequeue_callback) {
+    f->dequeue_callback(self, f->dequeue_callback_data);
+  }
+  if(self->cf && self->cf->subscriber_timeout > 0 && f->timeout_ev.timer_set) {
+    ngx_del_timer(&f->timeout_ev);
+  }
+  self->enqueued = 0;
+  if(self->destroy_after_dequeue) {
+    internal_subscriber_destroy(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t dequeue_maybe(subscriber_t *self) {
+  if(self->dequeue_after_response) {
+    self->fn->dequeue(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t internal_respond_message(subscriber_t *self, nchan_msg_t *msg) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  
+  update_subscriber_last_msg_id(self, msg);
+  
+  DBG("%p (%V) respond msg %p", self, f->sub.name, msg);
+  f->respond_message(NGX_OK, msg, f->privdata);
+  reset_timer(f);
+  return dequeue_maybe(self);
+}
+
+static ngx_int_t internal_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  DBG("%p status %i", self, status_code);
+  if(status_code == NGX_HTTP_GONE) {
+    self->dequeue_after_response = 1;
+  }
+  f->respond_status(status_code, (void *)status_line, f->privdata);
+  reset_timer(f);
+  return dequeue_maybe(self);
+}
+
+static ngx_int_t internal_set_enqueue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  if(cb != NULL) {
+    DBG("%p set enqueue callback to %p", self, cb);
+    f->dequeue_callback = cb;
+  }
+  if(privdata != NULL) {
+    DBG("%p set enqueue callback data to %p", self, cb);
+    f->dequeue_callback_data = privdata;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t internal_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  internal_subscriber_t   *f = (internal_subscriber_t *)self;
+  if(cb != NULL) {
+    DBG("%p set dequeue callback to %p", self, cb);
+    f->dequeue_callback = cb;
+  }
+  if(privdata != NULL) {
+    DBG("%p set dequeue callback data to %p", self, cb);
+    f->dequeue_callback_data = privdata;
+  }
+  return NGX_OK;
+}
+
+
+ngx_int_t internal_subscriber_set_name(subscriber_t *self, ngx_str_t *name) {
+  self->name = name;
+  return NGX_OK;
+}
+
+static ngx_int_t internal_notify(subscriber_t *self, ngx_int_t code, void *data) {
+  internal_subscriber_t   *fsub = (internal_subscriber_t *)self;
+  return fsub->notify(code, data, fsub->privdata);
+}
+
+static const subscriber_fn_t internal_sub_fn = {
+  &internal_enqueue,
+  &internal_dequeue,
+  &internal_respond_message,
+  &internal_respond_status,
+  &internal_set_enqueue_callback,
+  &internal_set_dequeue_callback,
+  &internal_reserve,
+  &internal_release,
+  &internal_notify,
+  &nchan_subscriber_subscribe
+};
+
+static const subscriber_t new_internal_sub = {
+  &subscriber_name,
+  INTERNAL,
+  &internal_sub_fn,
+  UNKNOWN,
+  NCHAN_ZERO_MSGID,
+  NULL,
+  NULL,
+  NULL,
+  0, //reserved
+  0, //enable sub/unsub callbacks
+  0, //stick around after response
+  1, //destroy after dequeue
+  0, //enqueued
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  NULL, NULL, NULL
+#endif
+};
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/internal.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/internal.h
new file mode 100644
index 0000000..0c9e609
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/internal.h
@@ -0,0 +1,32 @@
+#define NCHAN_DEFAULT_INTERNAL_SUBSCRIBER_POOL_SIZE 1024
+
+typedef struct {
+  subscriber_t            sub;
+  callback_pt             enqueue;
+  callback_pt             dequeue;
+  callback_pt             respond_message;
+  callback_pt             respond_status;
+  callback_pt             notify;
+  callback_pt             destroy;
+  ngx_event_t             timeout_ev;
+  subscriber_callback_pt  enqueue_callback;
+  void                   *enqueue_callback_data;
+  subscriber_callback_pt  dequeue_callback;
+  void                   *dequeue_callback_data;
+  void                   *privdata;
+  unsigned                already_dequeued:1;
+  unsigned                awaiting_destruction:1;
+} internal_subscriber_t;
+
+extern subscriber_t *internal_subscriber_create(ngx_str_t *, nchan_loc_conf_t *cf, size_t pd_sz, void **pd);
+extern ngx_int_t internal_subscriber_destroy(subscriber_t *sub);
+
+subscriber_t *internal_subscriber_create_init(ngx_str_t *sub_name, nchan_loc_conf_t *cf, size_t pd_sz, void **pd, callback_pt enqueue, callback_pt dequeue, callback_pt respond_message, callback_pt respond_status, callback_pt notify_handler, callback_pt destroy_handler);
+ngx_int_t internal_subscriber_set_name(subscriber_t *sub, ngx_str_t *name);
+ngx_int_t internal_subscriber_set_enqueue_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_dequeue_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_notify_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_respond_message_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_respond_status_handler(subscriber_t *sub, callback_pt handler);
+ngx_int_t internal_subscriber_set_destroy_handler(subscriber_t *sub, callback_pt handler);
+void *internal_subscriber_get_privdata(subscriber_t *sub);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/intervalpoll.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/intervalpoll.c
new file mode 100644
index 0000000..c77c628
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/intervalpoll.c
@@ -0,0 +1,33 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+#include "intervalpoll.h"
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:INTERVALPOLL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:INTERVALPOLL:" fmt, ##arg)
+#include <assert.h> 
+
+static       ngx_str_t   sub_name = ngx_string("intervalpoll");
+
+subscriber_t *intervalpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  subscriber_t         *sub;
+  full_subscriber_t    *fsub;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  sub = longpoll_subscriber_create(r, msg_id);
+  
+  fsub = (full_subscriber_t *)sub;
+  
+  fsub->data.act_as_intervalpoll = 1;
+  
+  sub->name = &sub_name;
+  sub->type = INTERVALPOLL;
+  
+  if(ctx) {
+    ctx->subscriber_type = sub->name;
+  }
+  return sub;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/intervalpoll.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/intervalpoll.h
new file mode 100644
index 0000000..c493730
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/intervalpoll.h
@@ -0,0 +1 @@
+subscriber_t *intervalpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll-private.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll-private.h
new file mode 100644
index 0000000..cd9d85c
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll-private.h
@@ -0,0 +1,38 @@
+typedef struct nchan_longpoll_multimsg_s nchan_longpoll_multimsg_t;
+struct nchan_longpoll_multimsg_s {
+  nchan_msg_t                   *msg;
+  nchan_longpoll_multimsg_t     *next;
+};
+
+typedef struct {
+  ngx_http_cleanup_t      *cln;
+  subscriber_callback_pt  enqueue_callback;
+  void                   *enqueue_callback_data;
+  subscriber_callback_pt  dequeue_callback;
+  void                   *dequeue_callback_data;
+  ngx_event_t             timeout_ev;
+  ngx_event_t             ping_ev;
+  
+  nchan_longpoll_multimsg_t *multimsg_first;
+  nchan_longpoll_multimsg_t *multimsg_last;
+  
+  unsigned                act_as_intervalpoll:1;
+  unsigned                holding:1;
+  unsigned                finalize_request:1;
+  unsigned                already_responded:1;
+  unsigned                awaiting_destruction:1;
+  unsigned                shook_hands:1;
+} subscriber_data_t;
+
+typedef struct {
+  subscriber_t       sub;
+  subscriber_data_t  data;
+  void              *privdata;
+} full_subscriber_t;
+
+ngx_int_t longpoll_enqueue(subscriber_t *self);
+ngx_int_t longpoll_dequeue(subscriber_t *self);
+
+void subscriber_maybe_dequeue_after_status_response(full_subscriber_t *fsub, ngx_int_t status_code);
+
+ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t  *status_body);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll.c
new file mode 100644
index 0000000..71400c6
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll.c
@@ -0,0 +1,551 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:LONGPOLL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:LONGPOLL:" fmt, ##arg)
+#include <assert.h>
+#include "longpoll.h"
+#include "longpoll-private.h"
+
+#include <store/memory/store.h>
+
+void memstore_fakeprocess_push(ngx_int_t slot);
+void memstore_fakeprocess_push_random(void);
+void memstore_fakeprocess_pop(void);
+ngx_int_t memstore_slot(void);
+
+static const subscriber_t new_longpoll_sub;
+
+static void empty_handler() { }
+
+static void sudden_abort_handler(subscriber_t *sub) {
+  if(sub->request && sub->status != DEAD) {
+    sub->request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
+  }
+#if FAKESHARD
+  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
+  memstore_fakeprocess_push(fsub->sub.owner);
+#endif
+  sub->status = DEAD;
+  sub->fn->dequeue(sub);
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+#endif
+}
+
+//void verify_unique_response(ngx_str_t *uri, nchan_msg_id_t *msgid, nchan_msg_t *msg, subscriber_t *sub);
+
+subscriber_t *longpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  DBG("create for req %p", r);
+  full_subscriber_t      *fsub;
+
+  //TODO: allocate from pool (but not the request's pool)
+  if((fsub = ngx_alloc(sizeof(*fsub), ngx_cycle->log)) == NULL) {
+    ERR("Unable to allocate");
+    assert(0);
+    return NULL;
+  }
+  
+  nchan_subscriber_init(&fsub->sub, &new_longpoll_sub, r, msg_id);
+  fsub->privdata = NULL;
+  fsub->data.cln = NULL;
+  fsub->data.finalize_request = 1;
+  fsub->data.holding = 0;
+  fsub->data.act_as_intervalpoll = 0;
+  
+  nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->data.timeout_ev);
+  
+  fsub->data.enqueue_callback = empty_handler;
+  fsub->data.enqueue_callback_data = NULL;
+  
+  fsub->data.dequeue_callback = empty_handler;
+  fsub->data.dequeue_callback_data = NULL;
+  
+  fsub->data.already_responded = 0;
+  fsub->data.awaiting_destruction = 0;
+  
+  if(fsub->sub.cf->longpoll_multimsg) {
+    nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+    fsub->sub.dequeue_after_response = 0;
+    ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+    nchan_bufchain_pool_init(ctx->bcp, r->pool);
+
+  }
+  
+  fsub->data.multimsg_first = NULL;
+  fsub->data.multimsg_last = NULL;
+  
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  subscriber_debug_add(&fsub->sub);
+#endif
+  
+  //http request sudden close cleanup
+  if((fsub->data.cln = ngx_http_cleanup_add(r, 0)) == NULL) {
+    ERR("Unable to add request cleanup for longpoll subscriber");
+    assert(0);
+    return NULL;
+  }
+  fsub->data.cln->data = fsub;
+  fsub->data.cln->handler = (ngx_http_cleanup_pt )sudden_abort_handler;
+  DBG("%p created for request %p", &fsub->sub, r);
+  
+  
+  return &fsub->sub;
+}
+
+ngx_int_t longpoll_subscriber_destroy(subscriber_t *sub) {
+  full_subscriber_t   *fsub = (full_subscriber_t  *)sub;
+  
+  if(sub->reserved > 0) {
+    DBG("%p not ready to destroy (reserved for %i) for req %p", sub, sub->reserved, fsub->sub.request);
+    fsub->data.awaiting_destruction = 1;
+  }
+  else {
+    DBG("%p destroy for req %p", sub, fsub->sub.request);
+    nchan_free_msg_id(&fsub->sub.last_msgid);
+    assert(sub->status == DEAD);
+    nchan_subscriber_subrequest_cleanup(sub);
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+    subscriber_debug_remove(sub);
+    ngx_memset(fsub, 0xB9, sizeof(*fsub)); //debug
+#endif
+    ngx_free(fsub);
+  }
+  return NGX_OK;
+}
+
+static void finalize_request_handler(ngx_http_request_t *r) {
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  if(ctx->sub == NULL) {
+    ngx_http_test_reading(r);
+    return;
+  }
+  subscriber_t *sub = ctx->sub;
+  #if FAKESHARD
+    memstore_fakeprocess_push(sub->owner);
+  #endif
+    
+    ngx_connection_t *c = r->connection;
+    ngx_event_t      *rev = c->read;
+  
+  
+    if (c->error || c->timedout || c->close || c->destroyed || rev->closed || rev->eof || rev->pending_eof) {
+      ngx_http_test_reading(r);
+      return;
+    }
+    
+    sub->dequeue_after_response = 1;
+    sub->fn->respond_status(sub, NGX_HTTP_BAD_REQUEST, &NCHAN_HTTP_STATUS_400, NULL);
+  #if FAKESHARD
+    memstore_fakeprocess_pop();
+  #endif
+}
+
+static void ensure_request_hold(full_subscriber_t *fsub) {
+  if(fsub->data.holding == 0) {
+    DBG("hodl request %p", fsub->sub.request);
+    fsub->data.holding = 1;
+    fsub->sub.request->read_event_handler = finalize_request_handler;
+    fsub->sub.request->write_event_handler = ngx_http_request_empty_handler;
+    fsub->sub.request->main->count++; //this is the right way to hold and finalize the request... maybe
+  }
+}
+
+static ngx_int_t longpoll_reserve(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  ensure_request_hold(fsub);
+  self->reserved++;
+  DBG("%p reserve for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
+  return NGX_OK;
+}
+static ngx_int_t longpoll_release(subscriber_t *self, uint8_t nodestroy) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  assert(self->reserved > 0);
+  self->reserved--;
+  DBG("%p release for req %p. reservations: %i", self, fsub->sub.request, self->reserved);
+  if(nodestroy == 0 && fsub->data.awaiting_destruction == 1 && self->reserved == 0) {
+    longpoll_subscriber_destroy(self);
+    return NGX_ABORT;
+  }
+  else {
+    return NGX_OK;
+  }
+}
+
+ngx_int_t longpoll_enqueue(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  assert(fsub->sub.enqueued == 0);
+  DBG("%p enqueue", self);
+  
+  fsub->data.finalize_request = 1;
+  
+  fsub->sub.enqueued = 1;
+  ensure_request_hold(fsub);
+  if(self->cf->subscriber_timeout > 0) {
+    //add timeout timer
+    ngx_add_timer(&fsub->data.timeout_ev, self->cf->subscriber_timeout * 1000);
+  }
+  
+  if(fsub->data.enqueue_callback) {
+    fsub->data.enqueue_callback(self, fsub->data.enqueue_callback_data);
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t longpoll_dequeue(subscriber_t *self) {
+  full_subscriber_t    *fsub = (full_subscriber_t  *)self;
+  ngx_http_request_t   *r = fsub->sub.request;
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  int                   finalize_now = fsub->data.finalize_request;
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+  }
+  DBG("%p dequeue", self);
+  if(fsub->data.dequeue_callback) {
+    fsub->data.dequeue_callback(self, fsub->data.dequeue_callback_data);
+  }
+  
+  if(self->enqueued && self->enable_sub_unsub_callbacks && self->cf->unsubscribe_request_url) {
+    nchan_subscriber_unsubscribe_request(self);
+  }
+  
+  self->enqueued = 0;
+  
+  ctx->sub = NULL;
+  
+  if(finalize_now) {
+    DBG("finalize request %p", r);
+    nchan_http_finalize_request(r, NGX_OK);
+    self->status = DEAD;
+  }
+  
+  if(self->destroy_after_dequeue) {
+    longpoll_subscriber_destroy(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t dequeue_maybe(subscriber_t *self) {
+  if(self->dequeue_after_response) {
+    self->fn->dequeue(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t abort_response(subscriber_t *sub, char *errmsg) {
+  if(sub->request) {
+    nchan_log_request_warning(sub->request, "%V subscriber: %s", sub->name, errmsg ? errmsg : "weird response error");
+  }
+  else {
+    nchan_log_warning("%V subscriber: %s", sub->name, errmsg ? errmsg : "weird response error");
+  }
+  sub->fn->dequeue(sub);
+  return NGX_ERROR;
+}
+
+static ngx_int_t longpoll_multipart_add(full_subscriber_t *fsub, nchan_msg_t *msg, char **err) {
+  
+  nchan_longpoll_multimsg_t     *mmsg;
+  
+  if((mmsg = ngx_palloc(fsub->sub.request->pool, sizeof(*mmsg))) == NULL) {
+    *err = "can't allocate multipart msg link";
+    return NGX_ERROR;
+  }
+  
+  if(msg->storage != NCHAN_MSG_SHARED) {
+    if((msg = nchan_msg_derive_palloc(msg, fsub->sub.request->pool)) == NULL) {
+      *err = "can't allocate derived msg in request pool";
+      return NGX_ERROR;
+    }
+  }
+  msg_reserve(msg, "longpoll multipart");
+  assert(msg->refcount > 0);
+  
+  mmsg->msg = msg;
+  mmsg->next = NULL;
+  if(fsub->data.multimsg_first == NULL) {
+    fsub->data.multimsg_first = mmsg;
+  }
+  if(fsub->data.multimsg_last) {
+    fsub->data.multimsg_last->next = mmsg;
+  }
+  fsub->data.multimsg_last = mmsg;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t longpoll_respond_message(subscriber_t *self, nchan_msg_t *msg) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  ngx_int_t                  rc;
+  char                      *err = NULL;
+  ngx_http_request_t        *r = fsub->sub.request;
+  nchan_request_ctx_t       *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  nchan_loc_conf_t          *cf = fsub->sub.cf;
+  
+  DBG("%p respond req %p msg %p", self, r, msg);
+  
+  ctx->prev_msg_id = self->last_msgid;
+  update_subscriber_last_msg_id(self, msg);
+  ctx->msg_id = self->last_msgid;
+
+  //verify_unique_response(&fsub->data.request->uri, &self->last_msgid, msg, self);
+  if(fsub->data.timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->data.timeout_ev);
+  }
+  if(!cf->longpoll_multimsg) {
+    //disable abort handler
+    fsub->data.cln->handler = empty_handler;
+    
+    assert(fsub->data.already_responded != 1);
+    fsub->data.already_responded = 1;
+    if((rc = nchan_respond_msg(r, msg, &self->last_msgid, 0, &err)) != NGX_OK) {
+      return abort_response(self, err);
+    }
+  }
+  else {
+    if((rc = longpoll_multipart_add(fsub, msg, &err)) != NGX_OK) {
+      return abort_response(self, err);
+    }
+  }
+  dequeue_maybe(self);
+  return rc;
+}
+
+static void multipart_request_cleanup_handler(nchan_longpoll_multimsg_t *first) {
+  nchan_longpoll_multimsg_t    *cur;
+  for(cur = first; cur != NULL; cur = cur->next) {
+    msg_release(cur->msg, "longpoll multipart");
+  }
+}
+
+static ngx_int_t longpoll_multipart_respond(full_subscriber_t *fsub) {
+  ngx_http_request_t    *r = fsub->sub.request;
+  nchan_request_ctx_t   *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  char                  *err;
+  ngx_int_t              rc;
+  u_char                *char_boundary = NULL;
+  u_char                *char_boundary_last;
+  
+  struct {
+    ngx_buf_t            first;
+    ngx_buf_t            mid;
+    ngx_buf_t            last;
+  }                      boundary;
+  
+  ngx_buf_t              double_newline_buf;
+  ngx_str_t             *content_type;
+  nchan_loc_conf_t      *cf = fsub->sub.cf;
+  int                    use_raw_stream_separator = cf->longpoll_multimsg_use_raw_stream_separator;
+  
+  ngx_init_set_membuf_char(&double_newline_buf, "\r\n\r\n");
+  
+  nchan_longpoll_multimsg_t *first, *cur;
+  
+  //disable abort handler
+  fsub->data.cln->handler = empty_handler;
+  
+  first = fsub->data.multimsg_first;
+  
+  fsub->sub.dequeue_after_response = 1;
+  
+  //cleanup to release msgs
+  fsub->data.cln = ngx_http_cleanup_add(fsub->sub.request, 0);
+  fsub->data.cln->data = first;
+  fsub->data.cln->handler = (ngx_http_cleanup_pt )multipart_request_cleanup_handler;
+  
+  if(fsub->data.multimsg_first == fsub->data.multimsg_last) {
+    //just one message.
+    if((rc = nchan_respond_msg(r, fsub->data.multimsg_first->msg, &fsub->sub.last_msgid, 0, &err)) != NGX_OK) {
+      return abort_response(&fsub->sub, err);
+    }
+    return NGX_OK;
+  }
+  
+  //multi messages
+  if(!use_raw_stream_separator) {
+    nchan_request_set_content_type_multipart_boundary_header(r, ctx);
+    char_boundary = ngx_palloc(r->pool, 50);
+    char_boundary_last = ngx_snprintf(char_boundary, 50, ("\r\n--%V--\r\n"), nchan_request_multipart_boundary(r, ctx));
+    
+    //set up the boundaries
+    ngx_init_set_membuf(&boundary.first, &char_boundary[2], &char_boundary_last[-4]);
+    ngx_init_set_membuf(&boundary.mid, &char_boundary[0], &char_boundary_last[-4]);
+    ngx_init_set_membuf(&boundary.last, &char_boundary[0], char_boundary_last);
+  }
+  
+  for(cur = first; cur != NULL; cur = cur->next) {
+    if(!use_raw_stream_separator) {
+      // each buffer needs to be unique for the purpose of dealing with nginx output guts
+      // (something about max. 64 iovecs per write call and counting the number of bytes already sent)
+      
+      nchan_bufchain_append_buf(ctx->bcp, cur == first ? &boundary.first : &boundary.mid);
+      
+      content_type = cur->msg->content_type;
+      if (content_type) {
+        nchan_bufchain_append_cstr(ctx->bcp, "\r\nContent-Type: ");
+        nchan_bufchain_append_str(ctx->bcp, content_type);
+      }
+      nchan_bufchain_append_cstr(ctx->bcp, "\r\n\r\n");
+    }
+    
+    if(ngx_buf_size((&cur->msg->buf)) > 0) {
+      ngx_buf_t             msgbuf = cur->msg->buf;
+      
+      if(msgbuf.file) {
+        ngx_file_t  *file_copy = nchan_bufchain_pool_reserve_file(ctx->bcp);
+        nchan_msg_buf_open_fd_if_needed(&msgbuf, file_copy, NULL);
+      }
+      nchan_bufchain_append_buf(ctx->bcp, &msgbuf);
+    }
+    
+    if(use_raw_stream_separator) {
+      nchan_bufchain_append_str(ctx->bcp, &cf->subscriber_http_raw_stream_separator);
+    }
+    else if(cur->next == NULL) { //lastmsg
+      nchan_bufchain_append_buf(ctx->bcp, &boundary.last);
+    }
+  }
+  
+  r->headers_out.status = NGX_HTTP_OK;
+  r->headers_out.content_length_n = nchan_bufchain_length(ctx->bcp);
+  nchan_set_msgid_http_response_headers(r, ctx, &fsub->data.multimsg_last->msg->id);
+  nchan_include_access_control_if_needed(r, ctx);
+  if(ngx_http_send_header(r) != NGX_OK) {
+    return abort_response(&fsub->sub, "failed to send longpoll-multipart headers");
+  }
+  if(nchan_output_filter(r, nchan_bufchain_first_chain(ctx->bcp)) != NGX_OK) {
+    return abort_response(&fsub->sub, "failed to send longpoll-multipart body");
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t longpoll_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
+  full_subscriber_t     *fsub = (full_subscriber_t *)self;
+  ngx_http_request_t    *r = fsub->sub.request;
+  nchan_loc_conf_t      *cf = fsub->sub.cf;
+  
+  if(fsub->data.act_as_intervalpoll) {
+    if(status_code == NGX_HTTP_NO_CONTENT || status_code == NGX_HTTP_NOT_MODIFIED || status_code == NGX_HTTP_NOT_FOUND ) {
+      status_code = NGX_HTTP_NOT_MODIFIED;
+    }
+  }
+  else if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    if(cf->longpoll_multimsg) {
+      if(fsub->data.multimsg_first != NULL) {
+        if(longpoll_multipart_respond(fsub) == NGX_OK) {
+          dequeue_maybe(self);
+        }
+        else {
+          DBG("%p should have been dequeued through abort_response");
+        }
+      }
+      return NGX_OK;
+    }
+    else { 
+      //don't care, ignore
+      return NGX_OK;
+    }
+  }
+  
+  DBG("%p respond req %p status %i", self, r, status_code);
+  
+  fsub->sub.dequeue_after_response = 1;
+  
+  nchan_set_msgid_http_response_headers(r, NULL, &self->last_msgid);
+  
+  //disable abort handler
+  fsub->data.cln->handler = empty_handler;
+  
+  nchan_respond_status(r, status_code, status_line, status_body, 0);
+
+  dequeue_maybe(self);
+  return NGX_OK;
+}
+
+ngx_int_t subscriber_respond_unqueued_status(full_subscriber_t *fsub, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
+  ngx_http_request_t     *r = fsub->sub.request;
+  nchan_loc_conf_t       *cf = fsub->sub.cf;
+  nchan_request_ctx_t    *ctx;
+  
+  fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
+  fsub->data.finalize_request = 0;
+  fsub->sub.status = DEAD;
+  fsub->sub.fn->dequeue(&fsub->sub);
+  if(cf->unsubscribe_request_url || cf->subscribe_request_url) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+    ctx->sent_unsubscribe_request = 1; //lie about having sent the unsub request already to avoid sending it
+  }
+  return nchan_respond_status(r, status_code, status_line, status_body, 1);
+}
+
+void subscriber_maybe_dequeue_after_status_response(full_subscriber_t *fsub, ngx_int_t status_code) {
+  if((status_code >=400 && status_code < 600) || status_code == NGX_HTTP_NOT_MODIFIED) {
+    fsub->data.cln->handler = (ngx_http_cleanup_pt )empty_handler;
+    fsub->sub.request->keepalive=0;
+    fsub->data.finalize_request=1;
+    fsub->sub.request->headers_out.status = status_code;
+    fsub->sub.fn->dequeue(&fsub->sub);
+  }
+}
+
+static void request_cleanup_handler(subscriber_t *sub) {
+
+}
+
+
+static ngx_int_t longpoll_set_enqueue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  fsub->data.enqueue_callback = cb;
+  fsub->data.enqueue_callback_data = privdata;
+  return NGX_OK;
+}
+
+static ngx_int_t longpoll_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  if(fsub->data.cln == NULL) {
+    fsub->data.cln = ngx_http_cleanup_add(fsub->sub.request, 0);
+    fsub->data.cln->data = self;
+    fsub->data.cln->handler = (ngx_http_cleanup_pt )request_cleanup_handler;
+  }
+  fsub->data.dequeue_callback = cb;
+  fsub->data.dequeue_callback_data = privdata;
+  return NGX_OK;
+}
+
+static const subscriber_fn_t longpoll_fn = {
+  &longpoll_enqueue,
+  &longpoll_dequeue,
+  &longpoll_respond_message,
+  &longpoll_respond_status,
+  &longpoll_set_enqueue_callback,
+  &longpoll_set_dequeue_callback,
+  &longpoll_reserve,
+  &longpoll_release,
+  &nchan_subscriber_receive_notice,
+  &nchan_subscriber_authorize_subscribe_request
+};
+
+static ngx_str_t  sub_name = ngx_string("longpoll");
+
+static const subscriber_t new_longpoll_sub = {
+  &sub_name,
+  LONGPOLL,
+  &longpoll_fn,
+  UNKNOWN,
+  NCHAN_ZERO_MSGID,
+  NULL,
+  NULL,
+  NULL,
+  0, //reservations
+  0, //enable sub/unsub callbacks
+  1, //deque after response
+  1, //destroy after dequeue
+  0, //enqueued
+  
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  NULL, NULL, NULL
+#endif
+};
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll.h
new file mode 100644
index 0000000..65509ed
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/longpoll.h
@@ -0,0 +1,2 @@
+subscriber_t *longpoll_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+ngx_int_t longpoll_subscriber_destroy(subscriber_t *sub);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_ipc.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_ipc.c
new file mode 100644
index 0000000..a0a2579
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_ipc.c
@@ -0,0 +1,197 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <store/memory/ipc.h>
+#include <store/memory/store-private.h>
+#include <store/memory/ipc-handlers.h>
+#include "internal.h"
+#include "memstore_ipc.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MEM-IPC:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-IPC:" fmt, ##arg)
+
+
+typedef struct sub_data_s sub_data_t;
+
+struct sub_data_s {
+  subscriber_t                 *sub;
+  ngx_str_t                    *chid;
+  ngx_int_t                     originator;
+  ngx_int_t                     unhooked;
+  ngx_int_t                     owner;
+  void                         *foreign_chanhead;
+  ngx_event_t                   timeout_ev;
+}; //sub_data_t
+
+static ngx_int_t empty_callback(){
+  return NGX_OK;
+}
+
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
+  DBG("%p (%V) memstore subsriber enqueued ok", d->sub, d->chid);
+  return NGX_OK;
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  ngx_int_t           ret;
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)d->sub;
+  DBG("%p (%V) memstore subscriber dequeue: notify owner", d->sub, d->chid);
+  if(d->timeout_ev.timer_set) {
+    ngx_del_timer(&d->timeout_ev);
+  }
+  if(!d->unhooked) {
+    ret = memstore_ipc_send_unsubscribed(d->originator, d->chid, NULL);
+  }
+  else {
+    ret = NGX_OK;
+  }
+  
+  if(fsub->sub.reserved > 0) {
+    DBG("%p (%V) not ready to destroy (reserved for %i)", fsub, d->chid, fsub->sub.reserved);
+    fsub->awaiting_destruction = 1;
+  }
+  else {
+    DBG("%p (%V) destroy", fsub, d->chid);
+  }
+  
+  return ret;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
+  ngx_int_t               rc;
+  nchan_msg_t            *msg = (nchan_msg_t *) ptr;
+  internal_subscriber_t  *fsub = (internal_subscriber_t  *)d->sub;
+  
+  //DBG("%p (%V) memstore subscriber (lastid %V) respond with message %V (lastid %V)", d->sub, d->chid, msgid_to_str(&d->sub->last_msg_id), msgid_to_str(&msg->id), msgid_to_str(&msg->prev_id));
+  
+  //update_subscriber_last_msg_id(d->sub, msg);
+  if(!d->unhooked) {
+    rc = memstore_ipc_send_publish_message(d->originator, d->chid, msg, d->sub->cf, empty_callback, NULL);
+  }
+  else {
+    rc = NGX_OK;
+  }
+  //no multi-ids allowed here
+  assert(msg->id.tagcount == 1);
+    
+  fsub->sub.last_msgid = msg->id;
+  
+  return rc;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  const ngx_str_t   *status_line = (const ngx_str_t *)ptr;
+  if((status == NGX_HTTP_NO_CONTENT || status == NGX_HTTP_NOT_MODIFIED) && !status_line) {
+    //don't care, ignore
+    return NGX_OK;
+  }
+  
+  if(!ptr) {
+    switch(status) {
+      case NGX_HTTP_GONE: //delete
+        status_line = &NCHAN_HTTP_STATUS_410;
+        break;
+      case NGX_HTTP_CONFLICT:
+        status_line = &NCHAN_HTTP_STATUS_409;
+        break;
+      case NGX_HTTP_NO_CONTENT:
+        assert(0);
+        break;
+      case NGX_HTTP_CLOSE: //delete
+        break;
+      case NGX_HTTP_NOT_MODIFIED: //timeout?
+        break;
+      case NGX_HTTP_FORBIDDEN:
+        break;
+      default:
+        ERR("unknown status %i", status);
+    }
+  }
+  if(!d->unhooked) {
+    return memstore_ipc_send_publish_status(d->originator, d->chid, status, status_line, empty_callback, NULL);
+  }
+  else {
+    return NGX_OK;
+  }
+}
+
+static ngx_int_t sub_respond_notice(ngx_int_t notice, void *ptr, sub_data_t *d) {
+  
+  if(!d->unhooked) {
+    return memstore_ipc_send_publish_notice(d->originator, d->chid, notice, ptr);
+  }
+  else {
+    return NGX_OK;
+  }
+}
+
+static void reset_timer(sub_data_t *data) {
+  if(data->timeout_ev.timer_set) {
+    ngx_del_timer(&data->timeout_ev);
+  }
+  ngx_add_timer(&data->timeout_ev, MEMSTORE_IPC_SUBSCRIBER_TIMEOUT * 1000);
+}
+
+ngx_int_t memstore_ipc_subscriber_keepalive_renew(subscriber_t *sub) {
+  sub_data_t *d = internal_subscriber_get_privdata(sub);
+  reset_timer(d);
+  return NGX_OK;
+}
+
+static void timeout_ev_handler(ngx_event_t *ev) {
+  sub_data_t *d = (sub_data_t *)ev->data;
+  
+  if(!ev->timedout) {
+    return;
+  }
+  ev->timedout = 0;
+  
+#if FAKESHARD
+  memstore_fakeprocess_push(d->owner);
+#endif
+  DBG("%p (%V), timeout event. Ping originator to see if still needed.", d->sub, d->chid);
+  if(!d->unhooked) {
+    memstore_ipc_send_memstore_subscriber_keepalive(d->originator, d->chid, d->sub, d->foreign_chanhead);
+  }
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+#endif
+}
+
+static ngx_str_t  sub_name = ngx_string("memstore-ipc");
+
+subscriber_t *memstore_ipc_subscriber_create(ngx_int_t originator_slot, ngx_str_t *chid, nchan_loc_conf_t *cf, void* foreign_chanhead) { //, nchan_channel_head_t *local_chanhead) {
+  static  nchan_msg_id_t      newest_msgid = NCHAN_NEWEST_MSGID;
+  sub_data_t                 *d;
+  subscriber_t               *sub;
+  
+  assert(originator_slot != memstore_slot());
+  sub = internal_subscriber_create_init(&sub_name, cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_respond_notice, NULL);
+  
+  sub->last_msgid = newest_msgid;
+  sub->destroy_after_dequeue = 1;
+  d->sub = sub;
+  d->chid = chid;
+  d->originator = originator_slot;
+  d->unhooked = 0;
+  assert(foreign_chanhead != NULL);
+  d->foreign_chanhead = foreign_chanhead;
+  //d->chanhead = local_chanhead;
+  d->owner = memstore_slot();
+
+  ngx_memzero(&d->timeout_ev, sizeof(d->timeout_ev));
+  nchan_init_timer(&d->timeout_ev, timeout_ev_handler, d);
+
+  reset_timer(d);
+  DBG("%p (%V) memstore-ipc subscriber created with privdata %p", d->sub, d->chid, d);
+  return sub;
+}
+
+ngx_int_t memstore_ipc_subscriber_unhook(subscriber_t *sub) {
+  sub_data_t *d = internal_subscriber_get_privdata(sub);
+  d->unhooked = 1;
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_ipc.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_ipc.h
new file mode 100644
index 0000000..15d58e8
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_ipc.h
@@ -0,0 +1,5 @@
+#define MEMSTORE_IPC_SUBSCRIBER_TIMEOUT 5
+subscriber_t *memstore_ipc_subscriber_create(ngx_int_t originator_slot, ngx_str_t *chid, nchan_loc_conf_t *cf, void* foreign_chanhead);
+
+ngx_int_t memstore_ipc_subscriber_unhook(subscriber_t *sub);
+ngx_int_t memstore_ipc_subscriber_keepalive_renew(subscriber_t *sub);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_multi.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_multi.c
new file mode 100644
index 0000000..056197f
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_multi.c
@@ -0,0 +1,174 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <store/memory/ipc.h>
+#include <store/memory/store-private.h>
+#include <store/memory/ipc-handlers.h>
+
+#include <store/memory/store.h>
+#include <store/redis/store.h>
+
+#include "internal.h"
+#include "memstore_multi.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MEM-MULTI:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-MULTI:" fmt, ##arg)
+
+
+typedef struct {
+  memstore_channel_head_t      *target_chanhead;
+  memstore_channel_head_t      *multi_chanhead;
+  memstore_multi_t             *multi;
+  ngx_int_t                     n;
+} sub_data_t;
+
+/*
+static ngx_int_t empty_callback(){
+  return NGX_OK;
+}
+*/
+
+static void change_sub_count(memstore_channel_head_t *ch, ngx_int_t n) {
+  ch->sub_count += n;
+  if(ch->shared) {
+    ngx_atomic_fetch_add(&ch->shared->sub_count, n);
+  }
+  if(ch->cf->redis.enabled && ch->cf->redis.storage_mode >= REDIS_MODE_DISTRIBUTED) {
+    memstore_fakesub_add(ch, n);
+  }
+}
+
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
+  DBG("%p enqueued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  assert(d->multi_chanhead->multi_subscribers_pending > 0);
+  d->multi_chanhead->multi_subscribers_pending --;
+  if(d->multi_chanhead->multi_subscribers_pending == 0) {
+    memstore_ready_chanhead_unless_stub(d->multi_chanhead);
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  DBG("%p dequeued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  d->multi_chanhead->status = WAITING;
+  d->multi_chanhead->multi_subscribers_pending++;
+  d->multi->sub = NULL;
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, nchan_msg_t *msg, sub_data_t* d) {
+  nchan_msg_t       remsg;
+  ngx_int_t         mcount;
+  
+  int16_t          tags[NCHAN_MULTITAG_MAX], prevtags[NCHAN_MULTITAG_MAX];
+  
+  //remsg = ngx_alloc(sizeof(*remsg), ngx_cycle->log);
+  //assert(remsg);
+  
+  assert( msg->id.tagcount == 1 );
+  assert( msg->prev_id.tagcount == 1 );
+  nchan_msg_derive_stack(msg, &remsg, tags);
+  
+  mcount = d->multi_chanhead->multi_count;
+  
+  remsg.prev_id.tagcount = mcount;
+  remsg.prev_id.tagactive = d->n;
+  
+  remsg.id.tagcount = mcount;
+  remsg.id.tagactive = d->n;
+  
+  if(mcount > NCHAN_FIXED_MULTITAG_MAX) {
+    remsg.id.tag.allocd = tags;
+    tags[0]=msg->id.tag.fixed[0];
+    remsg.prev_id.tag.allocd = prevtags;
+    prevtags[0]=msg->prev_id.tag.fixed[0];
+  }
+  
+  nchan_expand_msg_id_multi_tag(&remsg.prev_id, 0, d->n, -1);
+  nchan_expand_msg_id_multi_tag(&remsg.id, 0, d->n, -1);
+  
+  memstore_ensure_chanhead_is_ready(d->multi_chanhead, 1);
+  
+  DBG("%p respond with transformed message %p %V (%p %V %i) %V", d->multi->sub, &remsg, msgid_to_str(&remsg.id), d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  
+  nchan_memstore_publish_generic(d->multi_chanhead, &remsg, 0, NULL);
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  DBG("%p subscriber respond with status %i (%p %V %i) %V", d->multi->sub, status, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
+  switch(status) {
+    case NGX_HTTP_GONE: //delete
+    case NGX_HTTP_CLOSE: //delete
+      nchan_memstore_publish_generic(d->multi_chanhead, NULL, NGX_HTTP_GONE, &NCHAN_HTTP_STATUS_410);
+      //nchan_store_memory.delete_channel(d->chid, NULL, NULL);
+      break;
+    
+    case NGX_HTTP_CONFLICT:
+      nchan_memstore_publish_generic(d->multi_chanhead, NULL, NGX_HTTP_CONFLICT, &NCHAN_HTTP_STATUS_410);
+      break;
+    
+    default:
+      //meh, no big deal.
+      break;
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_notify_handler(ngx_int_t code, void *data, sub_data_t *d) {
+  if(code == NCHAN_SUB_MULTI_NOTIFY_ADDSUB) {
+    change_sub_count(d->target_chanhead, (ngx_int_t )data);
+  }
+  else if(code == NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST) {
+    nchan_memstore_publish_notice(d->multi_chanhead, code, data);
+  }
+  return NGX_OK;
+}
+
+static ngx_str_t  sub_name = ngx_string("memstore-multi");
+
+subscriber_t *memstore_multi_subscriber_create(memstore_channel_head_t *chanhead, uint8_t n) {
+  static nchan_msg_id_t        latest_msgid = NCHAN_NEWEST_MSGID;
+  sub_data_t                  *d;
+  memstore_channel_head_t     *target_ch;
+  ngx_int_t                    multi_subs;
+  subscriber_t                *sub;
+  
+  if((target_ch = nchan_memstore_get_chanhead(&chanhead->multi[n].id, chanhead->cf))==NULL) {
+    return NULL;
+  }
+  
+  assert(chanhead->cf);
+  
+  sub = internal_subscriber_create_init(&sub_name, chanhead->cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_notify_handler, NULL);
+  
+  sub->last_msgid = latest_msgid;
+  
+  sub->destroy_after_dequeue = 1;
+  sub->dequeue_after_response = 0;
+
+  //DBG("create multi sub for %V (n=%i) pending=%i", &chanhead->multi[n].id, n, chanhead->multi_subscribers_pending);
+  d->multi = &chanhead->multi[n];
+  d->multi->sub = sub;
+  d->multi_chanhead = chanhead;
+  d->n = n;
+  d->target_chanhead = target_ch;
+  
+  assert(chanhead->multi_subscribers_pending > 0);
+
+  target_ch->spooler.fn->add(&target_ch->spooler, sub);
+  
+  multi_subs = chanhead->shared->sub_count;
+
+  change_sub_count(target_ch, multi_subs);
+  
+  DBG("%p created with privdata %p", d->multi->sub, d);
+  return sub;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_multi.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_multi.h
new file mode 100644
index 0000000..d735598
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_multi.h
@@ -0,0 +1,2 @@
+#define NCHAN_SUB_MULTI_NOTIFY_ADDSUB 0
+subscriber_t *memstore_multi_subscriber_create(memstore_channel_head_t *chanhead, uint8_t n);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_redis.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_redis.c
new file mode 100644
index 0000000..f0b4b1d
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_redis.c
@@ -0,0 +1,261 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+
+#include <store/memory/ipc.h>
+#include <store/memory/store-private.h>
+#include <store/memory/ipc-handlers.h>
+#include <store/memory/store.h>
+
+#include <store/redis/store.h>
+#include <store/redis/store-private.h>
+#include <store/redis/redis_nodeset.h>
+
+#include <util/nchan_msg.h>
+#include "internal.h"
+#include "memstore_redis.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:MEM-REDIS:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:MEM-REDIS:" fmt, ##arg)
+
+
+typedef struct sub_data_s sub_data_t;
+
+struct sub_data_s {
+  subscriber_t                 *sub;
+  memstore_channel_head_t      *chanhead;
+  ngx_str_t                    *chid;
+  ngx_event_t                   timeout_ev;
+  nchan_msg_status_t            last_msg_status;
+  sub_data_t                  **onconnect_callback_pd;
+}; //sub_data_t
+
+/*
+static ngx_int_t empty_callback(){
+  return NGX_OK;
+}
+*/
+
+static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
+  DBG("%p memstore-redis subsriber enqueued ok", d->sub);
+  if(d->chanhead) {
+    d->chanhead->status = READY;
+    d->chanhead->spooler.fn->handle_channel_status_change(&d->chanhead->spooler);
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t memstore_redis_subscriber_destroy(subscriber_t *sub) {
+  DBG("%p destroy", sub);
+  sub_data_t  *d = internal_subscriber_get_privdata(sub);
+  d->chanhead = NULL; //memstore chanhead should be presumed missing
+  return internal_subscriber_destroy(sub);
+}
+
+static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
+  DBG("%p dequeue", d->sub);
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_message(ngx_int_t status, void *ptr, sub_data_t* d) {
+  nchan_msg_t       *msg = (nchan_msg_t *) ptr;
+  nchan_loc_conf_t   cf;
+  nchan_msg_id_t    *lastid;
+  ngx_pool_t        *deflate_pool = NULL;
+  int                nostore_mode;
+  if(!d->chanhead) {
+    DBG("memstore chanhead gone");
+    return NGX_DECLINED;
+  }
+  nostore_mode = d->chanhead->cf->redis.storage_mode == REDIS_MODE_DISTRIBUTED_NOSTORE;
+  DBG("%p memstore-redis subscriber respond with message", d->sub);
+
+  cf.max_messages = d->chanhead->max_messages;
+  cf.redis.enabled = 0;
+  cf.message_timeout = msg->expires - ngx_time();
+  cf.complex_max_messages = NULL;
+  cf.complex_message_timeout = NULL;
+  cf.message_compression = msg->compressed ? msg->compressed->compression : NCHAN_MSG_NO_COMPRESSION;
+  
+  if(cf.message_compression != NCHAN_MSG_NO_COMPRESSION) {
+    deflate_pool = ngx_create_pool(NGX_DEFAULT_POOL_SIZE / 2, ngx_cycle->log);
+    if(!deflate_pool) {
+      ERR("unable to create deflatepool");
+      return NGX_ERROR;
+    }
+    nchan_deflate_message_if_needed(msg, &cf, NULL, deflate_pool);
+  }
+  else {
+    msg->compressed = NULL;
+  }
+  
+  lastid = &d->chanhead->latest_msgid;
+  
+  assert(lastid->tagcount == 1 && msg->id.tagcount == 1);
+  if(nostore_mode || lastid->time < msg->id.time || 
+    (lastid->time == msg->id.time && lastid->tag.fixed[0] < msg->id.tag.fixed[0])) {
+    if(nostore_mode) {
+      //out of order messages are ok, we don't care. publish them like they just got here. we can't lose messages due to network lag
+      msg->expires = 0;
+      msg->id.time = 0;
+    }
+    memstore_ensure_chanhead_is_ready(d->chanhead, 1);
+    nchan_store_chanhead_publish_message_generic(d->chanhead, msg, 0, &cf, NULL, NULL);
+  }
+  else {
+    //meh, this message has already been delivered probably hopefully
+  }
+  if(deflate_pool) {
+    ngx_destroy_pool(deflate_pool);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t sub_destroy_handler(ngx_int_t status, void *d, sub_data_t *pd) {
+  DBG("%p sub_destroy_handler", pd->sub);
+  if(pd->onconnect_callback_pd)
+    (*pd->onconnect_callback_pd) = NULL;
+  return NGX_OK;
+}
+
+static ngx_int_t reconnect_callback(redis_nodeset_t *ns, void *pd) {
+  sub_data_t *sd = *((sub_data_t **) pd);
+  if(!sd->chanhead || !nodeset_ready(ns)) {
+    return NGX_ERROR;
+  }
+  if(sd) {
+    DBG("%reconnect callback");
+    assert(sd->chanhead->redis_sub == sd->sub);
+    assert(&sd->chanhead->id == sd->chid);
+    nchan_store_redis.subscribe(sd->chid, sd->chanhead->redis_sub);
+    sd->onconnect_callback_pd = NULL;
+    sd->sub->dequeue_after_response = 0;
+    ((internal_subscriber_t *)sd->sub)->already_dequeued = 0;
+    ngx_free(pd);
+  }
+  else {
+    DBG("%reconnect callback skipped"); //probably because the channel was deleted while we were waiting
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t sub_respond_status(ngx_int_t status, void *ptr, sub_data_t *d) {
+  nchan_loc_conf_t  fake_cf;
+  redis_nodeset_t   *nodeset;
+  if(!d->chanhead) {
+    return NGX_DECLINED;
+  }
+  
+  DBG("%p memstore-redis subscriber respond with status %i", d->sub, status);
+  switch(status) {
+    case NGX_HTTP_GONE: //delete
+    case NGX_HTTP_CLOSE: //delete
+      fake_cf = *d->sub->cf;
+      fake_cf.redis.enabled = 0;
+      d->sub->destroy_after_dequeue = 1;
+      nchan_store_memory.delete_channel(d->chid, &fake_cf, NULL, NULL);
+      //now the chanhead will be in the garbage collector
+      d->chanhead->redis_sub = NULL;
+      
+      nodeset = nodeset_find(&d->sub->cf->redis);
+      if(!nodeset_ready(nodeset) && d->onconnect_callback_pd == NULL) {
+        sub_data_t **dd = ngx_alloc(sizeof(*d), ngx_cycle->log);
+        *dd = d;
+        d->onconnect_callback_pd = dd;
+        nodeset_callback_on_ready(nodeset, reconnect_callback, dd);
+      }
+      break;
+      
+    case NGX_HTTP_NO_CONTENT:
+      if(d->last_msg_status != MSG_EXPECTED) {
+        //the message buffer has just been walked start to finish
+        nchan_memstore_publish_notice(d->chanhead, NCHAN_NOTICE_BUFFER_LOADED, NULL);
+      }
+      d->last_msg_status = MSG_EXPECTED;
+      //TODO: stuff about REDIS_MODE_BACKUP
+      
+      break;
+      
+    default:
+      //meh, no big deal.
+      break;
+  }
+  
+  return NGX_OK;
+}
+
+static ngx_int_t sub_notify_handler(ngx_int_t code, void *data, sub_data_t *d) {
+  intptr_t  max_messages;
+  if(!d->chanhead) {
+    return NGX_DECLINED;
+  }
+  switch(code) {
+    case NCHAN_NOTICE_REDIS_CHANNEL_MESSAGE_BUFFER_SIZE_CHANGE:
+      max_messages = (intptr_t )data;
+      d->chanhead->max_messages = max_messages;
+      memstore_chanhead_messages_gc(d->chanhead);
+      break;
+      
+    case NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST:
+      nchan_memstore_publish_notice(d->chanhead, NCHAN_NOTICE_SUBSCRIBER_INFO_REQUEST, data);
+      break;
+  }
+  return NGX_OK;
+}
+
+/*
+static void reset_timer(sub_data_t *data) {
+  if(data->timeout_ev.timer_set) {
+    ngx_del_timer(&data->timeout_ev);
+  }
+  ngx_add_timer(&data->timeout_ev, MEMSTORE_REDIS_SUBSCRIBER_TIMEOUT * 1000);
+}
+*/
+/*
+static ngx_int_t keepalive_reply_handler(ngx_int_t renew, void *_, void* pd) {
+  sub_data_t *d = (sub_data_t *)pd;
+  if(d->sub->release(d->sub) == NGX_OK) {
+    if(renew) {
+      reset_timer(d);
+    }
+    else{
+      d->sub->dequeue(d->sub);
+    }
+  }
+  return NGX_OK;
+}
+*/
+
+static ngx_str_t   sub_name = ngx_string("memstore-redis");
+
+subscriber_t *memstore_redis_subscriber_create(memstore_channel_head_t *chanhead) {
+  subscriber_t               *sub;
+  sub_data_t                 *d;
+  
+  assert(chanhead->cf);
+  
+  sub = internal_subscriber_create_init(&sub_name, chanhead->cf, sizeof(*d), (void **)&d, (callback_pt )sub_enqueue, (callback_pt )sub_dequeue, (callback_pt )sub_respond_message, (callback_pt )sub_respond_status, (callback_pt )sub_notify_handler, (callback_pt )sub_destroy_handler);
+  
+  
+  sub->destroy_after_dequeue = 0;
+  sub->dequeue_after_response = 0;
+  
+  d->sub = sub;
+  d->chanhead = chanhead;
+  d->chid = &chanhead->id;
+  d->last_msg_status = MSG_PENDING;
+  d->onconnect_callback_pd = NULL;
+
+  
+  /*
+  ngx_memzero(&d->timeout_ev, sizeof(d->timeout_ev));
+  nchan_init_timer(&d->timeout_ev, timeout_ev_handler, d)
+  reset_timer(d);
+  */
+  DBG("%p created memstore-redis subscriber with privdata %p", d->sub, d);
+  return sub;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_redis.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_redis.h
new file mode 100644
index 0000000..5c8d0e4
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/memstore_redis.h
@@ -0,0 +1,3 @@
+#define MEMSTORE_REDIS_SUBSCRIBER_TIMEOUT 10
+subscriber_t *memstore_redis_subscriber_create(memstore_channel_head_t *chanhead);
+ngx_int_t memstore_redis_subscriber_destroy(subscriber_t *sub);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/websocket.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/websocket.c
new file mode 100644
index 0000000..f8e8e0e
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/websocket.c
@@ -0,0 +1,2065 @@
+#include <nchan_module.h>
+#include <subscribers/common.h>
+#include <util/nchan_subrequest.h>
+#include <util/nchan_fake_request.h>
+#include <util/nchan_util.h>
+#if nginx_version >= 1000003
+#include <ngx_crypt.h>
+#endif
+#include <ngx_sha1.h>
+#include <nginx.h>
+#include "websocket.h"
+
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
+
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SUB:WEBSOCKET:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SUB:WEBSOCKET:" fmt, ##arg)
+#include <assert.h>
+
+#if 0 //debug WS optimized xor
+  #define WEBSOCKET_OPTIMIZED_UNMASK 1
+  #define WEBSOCKET_FAKEOPTIMIZED_UNMASK 1
+  #define __vector_size_bytes 32
+#elif __AVX2__
+  #include <immintrin.h>                     // AVX2 intrinsics
+  #define WEBSOCKET_OPTIMIZED_UNMASK 1
+  
+  #define __vector_size_bytes 32
+  #define __vector_type __m256i
+  #define __vector_load_intrinsic _mm256_load_si256
+  #define __vector_xor_intrinsic _mm256_xor_si256
+  #define __vector_store_intrinsic _mm256_store_si256
+    
+#elif __SSE2__
+  #define WEBSOCKET_OPTIMIZED_UNMASK 1
+  #include <emmintrin.h>                     // SSE2 intrinsics
+  
+  #define __vector_size_bytes 16
+  #define __vector_type __m128i
+  #define __vector_load_intrinsic _mm_load_si128
+  #define __vector_xor_intrinsic _mm_xor_si128
+  #define __vector_store_intrinsic _mm_store_si128
+#endif
+
+#define WEBSOCKET_LAST_FRAME                0x8
+#define WEBSOCKET_LAST_FRAME_RSV1           0xC
+
+#define WEBSOCKET_OPCODE_TEXT               0x1
+#define WEBSOCKET_OPCODE_BINARY             0x2
+#define WEBSOCKET_OPCODE_CLOSE              0x8
+#define WEBSOCKET_OPCODE_PING               0x9
+#define WEBSOCKET_OPCODE_PONG               0xA
+  
+#define WEBSOCKET_READ_START_STEP           0
+#define WEBSOCKET_READ_GET_REAL_SIZE_STEP   1
+#define WEBSOCKET_READ_GET_MASK_KEY_STEP    2
+#define WEBSOCKET_READ_GET_PAYLOAD_STEP     3
+
+
+#define WEBSOCKET_FRAME_HEADER_MAX_LENGTH   146 //144 + 2 for possible close status code
+
+#define WEBSOCKET_CLOSING_TIMEOUT           250 //ms
+
+#define DEFLATE_MAX_WINDOW_BITS             15
+#define DEFLATE_MIN_WINDOW_BITS             9 //it should be 8, but zlib doesn't support window size of 8 these days
+#define DEFLATE_DEFAULT_CLIENT_WINDOW_BITS  15
+
+/**
+ * here's what a websocket frame looks like
+ * 
+   0                   1                   2                   3
+   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+  +-+-+-+-+-------+-+-------------+-------------------------------+
+  |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
+  |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
+  |N|V|V|V|       |S|             |   (if payload len==126/127)   |
+  | |1|2|3|       |K|             |                               |
+  +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
+  |     Extended payload length continued, if payload len == 127  |
+  + - - - - - - - - - - - - - - - +-------------------------------+
+  |                               |Masking-key, if MASK set to 1  |
+  +-------------------------------+-------------------------------+
+  | Masking-key (continued)       |          Payload Data         |
+  +-------------------------------- - - - - - - - - - - - - - - - +
+  :                     Payload Data continued ...                :
+  + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+  |                     Payload Data continued ...                |
+  +---------------------------------------------------------------+
+ */
+
+#define CLOSE_NORMAL                 1000
+#define CLOSE_GOING_AWAY             1001
+#define CLOSE_PROTOCOL_ERROR         1002
+#define CLOSE_UNSUPPORTED_DATA       1003
+#define CLOSE_INVALID_PAYLOAD        1007
+#define CLOSE_POLICY_VIOLATION       1008
+#define CLOSE_MESSAGE_TOO_BIG        1009
+#define CLOSE_EXTENSION_MISSING      1010
+#define CLOSE_INTERNAL_SERVER_ERROR  1011
+
+#define REQUEST_PCALLOC(r, what) what = ngx_pcalloc((r)->pool, sizeof(*(what)))
+#define REQUEST_PALLOC(r, what) what = ngx_palloc((r)->pool, sizeof(*(what)))
+
+static const u_char WEBSOCKET_PAYLOAD_LEN_16_BYTE = 126;
+static const u_char WEBSOCKET_PAYLOAD_LEN_64_BYTE = 127;
+
+static const u_char WEBSOCKET_TEXT_LAST_FRAME_BYTE =  WEBSOCKET_OPCODE_TEXT  | (WEBSOCKET_LAST_FRAME << 4);
+static const u_char WEBSOCKET_TEXT_DEFLATED_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_TEXT | (WEBSOCKET_LAST_FRAME_RSV1 << 4);
+
+static const u_char WEBSOCKET_BINARY_LAST_FRAME_BYTE =  WEBSOCKET_OPCODE_BINARY  | (WEBSOCKET_LAST_FRAME << 4);
+static const u_char WEBSOCKET_BINARY_DEFLATED_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_BINARY  | (WEBSOCKET_LAST_FRAME_RSV1 << 4);
+
+static const u_char WEBSOCKET_CLOSE_LAST_FRAME_BYTE = WEBSOCKET_OPCODE_CLOSE | (WEBSOCKET_LAST_FRAME << 4);
+static const u_char WEBSOCKET_PONG_LAST_FRAME_BYTE  = WEBSOCKET_OPCODE_PONG  | (WEBSOCKET_LAST_FRAME << 4);
+static const u_char WEBSOCKET_PING_LAST_FRAME_BYTE  = WEBSOCKET_OPCODE_PING  | (WEBSOCKET_LAST_FRAME << 4);
+
+static ngx_str_t   binary_mimetype = ngx_string("application/octet-stream");
+
+#define NCHAN_WS_TMP_POOL_SIZE (4*1024)
+
+
+typedef struct framebuf_s framebuf_t;
+struct framebuf_s {
+  u_char        chr[WEBSOCKET_FRAME_HEADER_MAX_LENGTH + 10]; // +10 for the reservoir tip. just to be safe.
+  framebuf_t   *prev;
+  framebuf_t   *next;
+};
+
+
+#if FAKESHARD
+//debugstuff
+void memstore_fakeprocess_push(ngx_int_t slot);
+void memstore_fakeprocess_push_random(void);
+void memstore_fakeprocess_pop();
+ngx_int_t memstore_slot();
+#endif
+
+static const subscriber_t new_websocket_sub;
+
+typedef struct {
+  u_char fin:1;
+  u_char rsv1:1;
+  u_char rsv2:1;
+  u_char rsv3:1;
+  u_char opcode:4;
+  u_char mask:1;
+  u_char mask_key[4];
+  uint64_t payload_len;
+  u_char  header[8];
+  u_char *payload;
+  u_char *last;
+  ngx_uint_t step;
+} ws_frame_t;
+
+typedef struct full_subscriber_s full_subscriber_t;
+
+typedef struct nchan_pub_upstream_request_data_s nchan_pub_upstream_request_data_t;
+struct nchan_pub_upstream_request_data_s {
+  ngx_http_request_t                 *sr;
+  ngx_buf_t                           body_buf;
+  full_subscriber_t                  *fsub;
+  nchan_pub_upstream_request_data_t  *next;
+  unsigned                            sent:1;
+  unsigned                            binary:1;
+};
+
+typedef struct {
+#if (NGX_ZLIB)
+  z_stream               *zstream_in;
+#endif
+  int8_t                  server_max_window_bits;
+  int8_t                  client_max_window_bits;
+  unsigned                server_no_context_takeover:1;
+  unsigned                client_no_context_takeover:1;
+  unsigned                enabled:1;
+} permessage_deflate_t;
+
+struct full_subscriber_s {
+  subscriber_t            sub;
+  ngx_http_cleanup_t     *cln;
+  nchan_request_ctx_t    *ctx;
+  subscriber_callback_pt  enqueue_callback;
+  void                   *enqueue_callback_data;
+  subscriber_callback_pt  dequeue_callback;
+  void                   *dequeue_callback_data;
+  ngx_event_t             timeout_ev;
+  ngx_event_t             closing_ev;
+  ws_frame_t              frame;
+  
+  ngx_event_t             ping_ev;
+  
+  permessage_deflate_t    deflate;
+  
+  struct {
+    ngx_str_t               *channel_id;
+    ngx_str_t               *upstream_request_url;
+    ngx_pool_t              *msg_pool;
+    void                   (*intercept)(subscriber_t *, nchan_msg_t *);
+  }                       publisher;
+  
+  unsigned                awaiting_pong:1;
+  unsigned                ws_meta_subprotocol:1;
+  unsigned                holding:1; //make sure the request doesn't close right away
+  unsigned                shook_hands:1;
+  unsigned                sent_close_frame:1;
+  unsigned                received_close_frame:1;
+  unsigned                finalize_request:1;
+  unsigned                awaiting_destruction:1;
+};// full_subscriber_t
+
+static void empty_handler() { }
+
+static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *chain);
+static void set_buf_to_str(ngx_buf_t *buf, const ngx_str_t *str);
+static ngx_chain_t *websocket_frame_header_chain(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *chain);
+static ngx_flag_t is_utf8(ngx_buf_t *);
+static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err);
+static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err);
+static ngx_int_t websocket_send_close_frame_cstr(full_subscriber_t *fsub, uint16_t code, const char *err);
+static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body);
+
+static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, int binary);
+
+static ngx_int_t websocket_reserve(subscriber_t *self);
+static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy);
+
+static void websocket_delete_timers(full_subscriber_t *fsub);
+static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg_t *msg);
+
+/*
+ngx_int_t ws_reserve_tmp_pool(full_subscriber_t *fsub) {
+  if(!fsub->tmp_pool) {
+    fsub->tmp_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, fsub->sub.request->connection->log);
+  }
+  if(!fsub->tmp_pool) {
+    ERR("unable to create temp pool for websocket sub %p", fsub);
+    return NGX_ERROR;
+  }
+  fsub->tmp_pool_use_count++;
+  return NGX_OK;
+}
+
+ngx_int_t ws_release_tmp_pool(full_subscriber_t *fsub) {
+  if(!fsub->tmp_pool) {
+    ERR("attempted to release tmp_pool when it's NULL");
+    return NGX_ERROR;
+  }
+  if(--fsub->tmp_pool_use_count == 0) {
+    ngx_destroy_pool(fsub->tmp_pool);
+    fsub->tmp_pool = NULL;
+  } else {
+  }
+
+  return NGX_OK;
+}
+*/
+
+static ngx_pool_t *ws_get_msgpool(full_subscriber_t *fsub) {
+  if(!fsub->publisher.msg_pool) {
+    fsub->publisher.msg_pool = ngx_create_pool(NCHAN_WS_TMP_POOL_SIZE, fsub->sub.request->connection->log);
+  }
+  return fsub->publisher.msg_pool;
+}
+static ngx_int_t ws_destroy_msgpool(full_subscriber_t *fsub) {
+  if(fsub->publisher.msg_pool) {
+    ngx_destroy_pool(fsub->publisher.msg_pool);
+    fsub->publisher.msg_pool = NULL;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t websocket_finalize_request(full_subscriber_t *fsub) {
+  subscriber_t       *sub = &fsub->sub;
+  ngx_http_request_t *r = sub->request;
+  
+  if(fsub->cln) {
+    fsub->cln->handler = (ngx_http_cleanup_pt )empty_handler;
+  }
+  
+  if(sub->cf->unsubscribe_request_url && sub->enqueued) {
+    nchan_subscriber_unsubscribe_request(sub);
+  }
+  nchan_subscriber_subrequest_cleanup(sub);
+  
+  sub->status = DEAD;
+  if(sub->enqueued) {
+    sub->fn->dequeue(sub);
+  }
+  nchan_http_finalize_request(r, NGX_HTTP_OK);
+  return NGX_OK;
+}
+
+static void aborted_ws_close_request_rev_handler(ngx_http_request_t *r) {
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
+  if(fsub) {
+    ctx->sub->status = DEAD;
+    fsub->sub.request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
+    websocket_finalize_request(fsub);
+  }
+}
+
+static void sudden_abort_handler(subscriber_t *sub) {
+  //DBG("sudden abort handler for sub %p request %p", sub, sub->request);
+  if(!sub) {
+    //DBG("%p already freed apparently?...", sub);
+    return; //websocket subscriber already freed
+  }
+#if FAKESHARD
+  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
+  memstore_fakeprocess_push(fsub->sub.owner);
+#endif
+  sub->request->read_event_handler = aborted_ws_close_request_rev_handler;
+  sub->fn->dequeue(sub);
+#if FAKESHARD
+  memstore_fakeprocess_pop();
+#endif
+}
+
+static void ws_request_empty_handler(ngx_http_request_t *r) {
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;  
+  
+  if(r->connection->read->eof) {
+    //sudden disconnect
+    nchan_add_oneshot_timer((void (*)(void *))sudden_abort_handler, &fsub->sub, 0);
+  }
+}
+
+/*
+static void sudden_upstream_request_abort_handler(full_subscriber_t *fsub) {
+  
+}
+*/
+
+static void init_buf(ngx_buf_t *buf, int8_t last);
+static void init_msg_buf(ngx_buf_t *buf);
+
+#if WEBSOCKET_OPTIMIZED_UNMASK
+static void websocket_unmask_frame(ws_frame_t *frame) {
+  //stupid overcomplicated websockets and their masks
+  
+  uint64_t   i, j, payload_len = frame->payload_len;
+  u_char    *payload = frame->payload;
+  u_char    *mask_key = frame->mask_key;
+  uint64_t   preamble_len = payload_len <= __vector_size_bytes ? payload_len : (uintptr_t )payload % __vector_size_bytes;
+  uint64_t   fastlen;
+  u_char     extended_mask[__vector_size_bytes];  
+  
+  //preamble -- for alignment or msglen < __vector_size_bytes
+  for (i = 0; i < preamble_len && i < payload_len; i++) {
+    payload[i] ^= mask_key[i % 4];
+  }
+  //are we done?
+  if(payload_len < __vector_size_bytes) {
+    return;
+  }
+  
+  if((uintptr_t )(&payload[i]) % __vector_size_bytes != 0) { //didn't get alignment right for some reason
+    fastlen = 0;
+  }
+  else {
+    fastlen = ((payload_len - i) / __vector_size_bytes) * __vector_size_bytes;
+  }
+    
+#if WEBSOCKET_FAKEOPTIMIZED_UNMASK
+  for (/*void*/; i < fastlen + preamble_len; i++) {
+    payload[i] ^= mask_key[i % 4];
+  }
+#else
+  __vector_type    w, w_mask;
+  
+  if (fastlen > 0) {
+    for(j=0; j<__vector_size_bytes; j+=4) {
+      ngx_memcpy(&extended_mask[j], mask_key, 4);
+    }
+    w_mask = __vector_load_intrinsic((__vector_type *)extended_mask);
+    for (/*void*/; i < fastlen + preamble_len; i += __vector_size_bytes) {
+      w = __vector_load_intrinsic((__vector_type *)&payload[i]);       // load [__vector_size_bytes] bytes
+      w = __vector_xor_intrinsic(w, w_mask);           // XOR with mask
+      __vector_store_intrinsic((__vector_type *)&payload[i], w);   // store [__vector_size_bytes] masked bytes
+    }
+  }
+#endif
+  
+  //leftovers
+  for (/*void*/; i < payload_len; i++) {
+    payload[i] ^= mask_key[i % 4];
+  }
+  
+}
+#else
+static void websocket_unmask_frame(ws_frame_t *frame) {
+  //stupid overcomplicated websockets and their masks
+  uint64_t   i, mpayload_len = frame->payload_len;
+  u_char    *mpayload = frame->payload;
+  u_char    *mask_key = frame->mask_key;
+  
+  for (i = 0; i < mpayload_len; i++) {
+    mpayload[i] ^= mask_key[i % 4];
+  }
+}
+#endif
+
+static ngx_int_t ws_output_filter(full_subscriber_t *fsub, ngx_chain_t *chain) {
+  /*if(fsub->publish_upstream && fsub->sub.request->pool == fsub->publish_upstream->temp_request_pool) {
+    ngx_int_t rc;
+    fsub->sub.request->pool = fsub->publish_upstream->real_request_pool;
+    rc = nchan_output_filter(fsub->sub.request, chain);
+    fsub->sub.request->pool = fsub->publish_upstream->temp_request_pool;
+    return rc;
+  }
+  else {
+    return nchan_output_filter(fsub->sub.request, chain);
+  }*/
+  //placate google's devious ngx_pagespeed by not using the header_only hack
+  ngx_http_request_t *r = fsub->sub.request;
+  r->header_only = 0;
+  r->chunked = 0;
+  return nchan_output_filter(r, chain);
+}
+
+static ngx_int_t ws_output_msg_filter(full_subscriber_t *fsub, nchan_msg_t *msg) {
+  /*if(fsub->publish_upstream && fsub->sub.request->pool != fsub->publish_upstream->real_request_pool) {
+    ngx_int_t rc;
+    ngx_pool_t *fake_pool = fsub->sub.request->pool;
+    fsub->sub.request->pool = fsub->publish_upstream->real_request_pool;
+    rc = nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
+    fsub->sub.request->pool = fake_pool;
+    return rc;
+  }
+  else {
+    return nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
+  }*/
+  return nchan_output_msg_filter(fsub->sub.request, msg, websocket_msg_frame_chain(fsub, msg));
+}
+
+typedef struct {
+  full_subscriber_t *fsub;
+  ngx_pool_t        *pool;
+  ngx_buf_t         *msgbuf;
+  nchan_fakereq_subrequest_data_t *subrequest;
+  unsigned           binary:1;
+  nchan_msg_t        msg;
+} ws_publish_data_t;
+
+
+static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *ch, ws_publish_data_t *d) {
+  time_t                 last_seen = 0;
+  ngx_uint_t             subscribers = 0;
+  ngx_uint_t             messages = 0;
+  full_subscriber_t     *fsub = d->fsub;
+  nchan_msg_id_t        *msgid = NULL;
+  ngx_http_request_t    *r = fsub->sub.request;
+  ngx_str_t             *accept_header = NULL;
+  ngx_buf_t             *tmp_buf;
+  nchan_buf_and_chain_t *bc;
+  if(ch) {
+    subscribers = ch->subscribers;
+    last_seen = ch->last_seen;
+    messages  = ch->messages;
+    msgid = &ch->last_published_msg_id;
+    fsub->ctx->channel_subscriber_last_seen = last_seen;
+    fsub->ctx->channel_subscriber_count = subscribers;
+    fsub->ctx->channel_message_count = messages;
+  }
+  if(d->subrequest) {
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+  }
+  else {
+    ngx_destroy_pool(d->pool);
+  }
+  d = NULL;
+  
+  if(websocket_release(&fsub->sub, 0) == NGX_ABORT || fsub->sub.status == DEAD) {
+    //zombie publisher
+    //nothing more to do, we're finished here
+    return NGX_OK;
+  }
+  
+  switch(status) {
+    case NCHAN_MESSAGE_QUEUED:
+    case NCHAN_MESSAGE_RECEIVED:
+      nchan_maybe_send_channel_event_message(fsub->sub.request, CHAN_PUBLISH);
+      if(fsub->sub.cf->sub.websocket) {
+        //don't reply with status info, this websocket is used for subscribing too,
+        //so it should only be receiving messages
+        return NGX_OK;
+      }
+      accept_header = nchan_get_accept_header_value(r);
+      bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+      tmp_buf = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, NULL);
+      ngx_memcpy(&bc->buf, tmp_buf, sizeof(*tmp_buf));
+      bc->buf.last_buf=1;
+      
+      ws_output_filter(fsub, websocket_frame_header_chain(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, ngx_buf_size((&bc->buf)), &bc->chain));
+      break;
+    case NGX_HTTP_INSUFFICIENT_STORAGE:
+      websocket_respond_status(&fsub->sub, NGX_HTTP_INSUFFICIENT_STORAGE, NULL, NULL);
+      break;
+    case NGX_ERROR:
+    case NGX_HTTP_INTERNAL_SERVER_ERROR:
+      websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL);
+      break;
+  }
+  return NGX_OK;
+}
+
+static void websocket_publish_continue(ws_publish_data_t *d) {
+  nchan_msg_t             *msg = &d->msg;
+  struct timeval           tv;
+  full_subscriber_t       *fsub = d->fsub;
+  ngx_http_request_t      *r = d->fsub->sub.request;
+  
+  ngx_memzero(msg, sizeof(*msg));
+  
+  msg->buf=*d->msgbuf;
+  if(r->headers_in.content_type) {
+    msg->content_type = &r->headers_in.content_type->value;
+  }
+  
+  ngx_gettimeofday(&tv);
+  msg->id.time = tv.tv_sec;
+  msg->id.tag.fixed[0]=0;
+  msg->id.tagcount=1;
+  msg->id.tagactive=0;
+  
+  if(d->binary) {
+    msg->content_type = &binary_mimetype;
+  }
+  //ERR("%p pool sz %d", fsub, r->pool->total_allocd);
+  msg->storage = NCHAN_MSG_POOL;
+  
+  if(nchan_need_to_deflate_message(fsub->sub.cf)) {
+    nchan_deflate_message_if_needed(msg, fsub->sub.cf, r, d->pool);
+  }
+  
+  if(fsub->publisher.intercept) {
+    fsub->publisher.intercept(&fsub->sub, msg);
+    ngx_destroy_pool(d->pool);
+  }
+  else {
+    websocket_reserve(&fsub->sub);
+    fsub->sub.cf->storage_engine->publish(fsub->publisher.channel_id, msg, fsub->sub.cf, (callback_pt )websocket_publish_callback, d); 
+    nchan_stats_global_incr(total_published_messages, 1);
+  }
+  
+}
+
+
+static ngx_int_t websocket_heartbeat(full_subscriber_t *fsub, ngx_buf_t *buf) {
+  ngx_str_t      str_in;
+  if(!fsub->sub.cf->websocket_heartbeat.enabled) {
+    return NGX_DECLINED;
+  }
+  
+  str_in.data = buf->pos;
+  str_in.len = buf->last - buf->pos;
+  if(nchan_ngx_str_match(fsub->sub.cf->websocket_heartbeat.in, &str_in)) {
+    nchan_buf_and_chain_t *bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+    init_buf(&bc->buf, 1);
+    set_buf_to_str(&bc->buf, fsub->sub.cf->websocket_heartbeat.out);
+    websocket_send_frame(fsub, WEBSOCKET_TEXT_LAST_FRAME_BYTE, fsub->sub.cf->websocket_heartbeat.out->len, &bc->chain);
+    return NGX_OK;
+  }
+  else {
+    return NGX_DECLINED;
+  }
+}
+
+static ngx_int_t websocket_publish_upstream_handler(ngx_int_t rc, ngx_http_request_t *sr, void *pd) {
+  ws_publish_data_t       *d = pd;
+  full_subscriber_t       *fsub = d->fsub;
+  
+  assert(d->subrequest);
+  
+  if(websocket_release(&fsub->sub, 0) == NGX_ABORT || rc == NGX_ABORT) {
+    //websocket client disappered, or subrequest got canceled some other way
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    return NGX_OK;
+  }
+  
+  if(rc == NGX_OK) {
+    ngx_int_t                        code = sr->headers_out.status;
+    ngx_int_t                        content_length;
+    ngx_chain_t                     *request_chain;
+    
+    switch(code) {
+      case NGX_HTTP_OK:
+      case NGX_HTTP_CREATED:
+      case NGX_HTTP_ACCEPTED:
+        if(sr->upstream) {
+          ngx_buf_t    *buf;
+          
+          content_length = nchan_subrequest_content_length(sr);
+#if nginx_version >= 1013010
+          request_chain = sr->out;
+#else
+          request_chain = sr->upstream->out_bufs;
+#endif
+          if(content_length > 0 && request_chain) {
+            if (request_chain->next != NULL) {
+              buf = nchan_chain_to_single_buffer(d->pool, request_chain, content_length);
+            }
+            else {
+              buf = request_chain->buf;
+              if(buf->memory) {
+                buf->start = buf->pos;
+                buf->end = buf->last;
+                buf->last_in_chain = 1;
+                buf->last_buf = 1;
+              }
+            }
+          }
+          else {
+            buf = ngx_pcalloc(d->pool, sizeof(*buf));
+            buf->memory=1;
+            buf->last_in_chain=1;
+            buf->last_buf=1;
+          }
+          d->msgbuf = buf;
+          websocket_publish_continue(d);
+        }
+        else {
+          request_chain = NULL;
+          ERR("upstream missing from upstream subrequest");
+        }
+        
+        break;
+      
+      case NGX_HTTP_NOT_MODIFIED:
+        websocket_publish_continue(d);
+        //cleaned up later
+        break;
+        
+      case NGX_HTTP_NO_CONTENT:
+        //cancel publishing
+        nchan_requestmachine_request_cleanup_manual(d->subrequest);
+        break;
+      
+      default:
+        nchan_requestmachine_request_cleanup_manual(d->subrequest);
+        websocket_respond_status(&fsub->sub, NGX_HTTP_FORBIDDEN, NULL, NULL);
+        break;
+    }
+  }
+  else {
+    nchan_requestmachine_request_cleanup_manual(d->subrequest);
+    websocket_respond_status(&fsub->sub, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL);
+  }
+  
+  
+  
+  return NGX_OK;
+}
+static ngx_int_t websocket_publish(full_subscriber_t *fsub, ngx_buf_t *buf, int binary) {
+#if (NGX_DEBUG_POOL)
+  ERR("ws request pool size: %V", ngx_http_debug_pool_str(fsub->sub.request->pool));
+#endif
+  
+  ngx_int_t          rc = NGX_OK;
+  ws_publish_data_t *d = ngx_palloc(ws_get_msgpool(fsub), sizeof(*d));
+  if(d == NULL) {
+    return NGX_ERROR;
+  }
+  d->fsub = fsub;
+  d->binary = binary;
+  //move the msg pool
+  d->pool = fsub->publisher.msg_pool;
+  d->msgbuf = buf;
+  fsub->publisher.msg_pool = NULL;
+  
+  if(fsub->publisher.intercept || fsub->publisher.upstream_request_url == NULL) { // don't need to send request upstream
+    d->subrequest = NULL;
+    websocket_publish_continue(d);
+  }
+  else {
+    nchan_requestmachine_request_params_t param;
+    param.url.str = fsub->publisher.upstream_request_url;
+    param.url_complex = 0;
+    param.pool = d->pool;
+    param.body = buf;
+    param.response_headers_only = 0;
+    param.cb = (callback_pt )websocket_publish_upstream_handler;
+    param.pd = d;
+    param.manual_cleanup = 1;
+    
+    websocket_reserve(&d->fsub->sub);
+    
+    d->subrequest = nchan_subscriber_subrequest(&fsub->sub, &param);
+    
+    rc = d->subrequest == NULL ? NGX_ERROR : NGX_OK;
+  }
+  
+  return rc;
+}
+
+static void websocket_init_frame(ws_frame_t *frame) {
+  ngx_memzero(frame, sizeof(*frame)); 
+  frame->step = WEBSOCKET_READ_START_STEP;
+  frame->last = NULL;
+  frame->payload = NULL;
+}
+
+static void *framebuf_alloc(void *pd) {
+  return ngx_palloc((ngx_pool_t *)pd, sizeof(framebuf_t));
+}
+
+static void closing_ev_handler(ngx_event_t *ev) {
+  full_subscriber_t *fsub = (full_subscriber_t *)ev->data;
+  DBG("closing_ev timer handler for %p, delayed", fsub);
+  //fsub->sub.status = DEAD;
+  websocket_finalize_request(fsub);
+}
+
+subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id) {
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  char                 *err;
+  
+  DBG("create for req %p", r);
+  full_subscriber_t  *fsub = NULL;
+  if((fsub = ngx_alloc(sizeof(*fsub), ngx_cycle->log)) == NULL) {
+    err="Unable to allocate";
+    goto fail;
+  }
+  
+  nchan_subscriber_init(&fsub->sub, &new_websocket_sub, r, msg_id);
+  fsub->cln = NULL;
+  fsub->ctx = ctx;
+  fsub->ws_meta_subprotocol = 0;
+  fsub->finalize_request = 0;
+  fsub->holding = 0;
+  fsub->shook_hands = 0;
+  fsub->awaiting_pong = 0;
+  fsub->sent_close_frame = 0;
+  fsub->received_close_frame = 0;
+  ngx_memzero(&fsub->ping_ev, sizeof(fsub->ping_ev));
+  
+  nchan_subscriber_init_timeout_timer(&fsub->sub, &fsub->timeout_ev);
+  
+  ngx_memzero(&fsub->deflate, sizeof(fsub->deflate));
+  
+  fsub->enqueue_callback = empty_handler;
+  fsub->enqueue_callback_data = NULL;
+  
+  fsub->dequeue_callback = empty_handler;
+  fsub->dequeue_callback_data = NULL;
+  fsub->awaiting_destruction = 0;
+  
+  ngx_memzero(&fsub->closing_ev, sizeof(fsub->closing_ev));
+  nchan_init_timer(&fsub->closing_ev, closing_ev_handler, fsub);
+  
+  //what should the buffers look like?
+  
+  /*
+  //mesage buf
+  b->last_buf = 1;
+  b->last_in_chain = 1;
+  b->flush = 1;
+  b->memory = 1;
+  b->temporary = 0;
+  */
+  
+  ngx_memzero(&fsub->publisher, sizeof(fsub->publisher));
+  
+  
+  if(fsub->sub.cf->pub.websocket) {
+    fsub->publisher.channel_id = nchan_get_channel_id(r, PUB, 0);
+  }
+  
+  if(fsub->sub.cf->publisher_upstream_request_url) {
+    ngx_str_t *url = ngx_palloc(r->pool, sizeof(*url));
+    if(url == NULL) {
+      err="Unable to allocate websocket upstream url";
+      goto fail;
+    }
+    ngx_http_complex_value(r, fsub->sub.cf->publisher_upstream_request_url, url);
+    fsub->publisher.upstream_request_url = url;
+  }
+  else {
+    fsub->publisher.upstream_request_url = NULL;
+  }
+  
+  websocket_init_frame(&fsub->frame);
+  
+  //http request sudden close cleanup
+  if((fsub->cln = ngx_http_cleanup_add(r, 0)) == NULL) {
+    err = "Unable to add request cleanup for websocket subscriber";
+    goto fail;
+  }
+  fsub->cln->data = fsub;
+  fsub->cln->handler = (ngx_http_cleanup_pt )sudden_abort_handler;
+  DBG("%p created for request %p", &fsub->sub, r);
+  
+  assert(ctx != NULL);
+  ctx->sub = &fsub->sub; //gonna need this for recv
+  ctx->subscriber_type = fsub->sub.name;
+  
+  #if NCHAN_SUBSCRIBER_LEAK_DEBUG
+    subscriber_debug_add(&fsub->sub);
+  #endif
+
+  //send-frame buffer
+  ctx->output_str_queue = ngx_palloc(r->pool, sizeof(*ctx->output_str_queue));
+  nchan_reuse_queue_init(ctx->output_str_queue, offsetof(framebuf_t, prev), offsetof(framebuf_t, next), framebuf_alloc, NULL, r->pool);
+  
+  //bufchain pool
+  ctx->bcp = ngx_palloc(r->pool, sizeof(nchan_bufchain_pool_t));
+  nchan_bufchain_pool_init(ctx->bcp, r->pool);
+  
+  return &fsub->sub;
+  
+  
+fail: 
+  if(fsub) {
+    if(fsub->cln) {
+      fsub->cln->data = NULL;
+    }
+    ngx_free(fsub);
+  }
+  ERR("%s", (u_char *)err);
+  return NULL;
+}
+
+ngx_int_t websocket_subscriber_destroy(subscriber_t *sub) {
+  full_subscriber_t            *fsub = (full_subscriber_t  *)sub;
+  
+  if(!fsub->awaiting_destruction) {
+    fsub->ctx->sub = NULL;
+  }
+   
+  if(sub->reserved > 0) {
+    DBG("%p not ready to destroy (reserved for %i) for req %p", sub, sub->reserved, fsub->sub.request);
+    fsub->awaiting_destruction = 1;
+    sub->status = DEAD;
+  }
+  else {
+    DBG("%p destroy for req %p", sub, fsub->sub.request);
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+    subscriber_debug_remove(&fsub->sub);
+#endif
+
+    websocket_delete_timers(fsub);
+    nchan_free_msg_id(&sub->last_msgid);
+    //ngx_memset(fsub, 0x13, sizeof(*fsub));
+    ws_destroy_msgpool(fsub);
+    if(fsub->deflate.zstream_in) {
+      inflateEnd(fsub->deflate.zstream_in);
+      ngx_free(fsub->deflate.zstream_in);
+      fsub->deflate.zstream_in = NULL;
+    }
+    
+    nchan_subscriber_subrequest_cleanup(sub);
+    ngx_free(fsub);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t extract_deflate_window_bits(full_subscriber_t *fsub, u_char *lcur, u_char *lend, const char* setting_name, int8_t *bits_out) {
+  ngx_int_t bits;
+  u_char    *ltmp;
+  if((ltmp = ngx_strnstr(lcur, (char *)setting_name, lend - lcur)) != NULL) {
+    ltmp += strlen(setting_name); //strlen
+    if(*ltmp == '=') ltmp++;
+    if(*ltmp == '"') ltmp++;
+    u_char    *nend = ltmp;
+    while(nend <= lend && *nend >='0' && *nend <='9') nend++;
+    if(nend - ltmp == 0) {
+      //no value, don't set
+      return NGX_OK;
+    }
+    bits = ngx_atoi(ltmp, nend - ltmp);
+    switch (bits) {
+      case NGX_ERROR: //bad value
+        return NGX_ERROR;
+      case DEFLATE_MIN_WINDOW_BITS ... DEFLATE_MAX_WINDOW_BITS:
+        *bits_out = bits;
+        return NGX_OK;
+      default:
+        return NGX_ERROR; //out of range
+    }
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t respond_with_error(full_subscriber_t *fsub, const char* msg) {
+  fsub->sub.dequeue_after_response = 1;
+  fsub->sub.request->header_only = 0;
+  nchan_respond_sprintf(fsub->sub.request, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, 1, "%s", msg);
+  return NGX_ERROR;
+}
+  
+static ngx_int_t websocket_perform_handshake(full_subscriber_t *fsub) {
+  static ngx_str_t    magic = ngx_string("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
+  ngx_str_t           ws_accept_key, sha1_str;
+  u_char              buf_sha1[21];
+  u_char              buf[255];
+  u_char              permessage_deflate_buf[128];
+  ngx_str_t          *tmp, *ws_key, *subprotocols;
+  ngx_int_t           ws_version;
+  ngx_http_request_t *r = fsub->sub.request;
+  
+  nchan_main_conf_t  *mcf = ngx_http_get_module_main_conf(r, ngx_nchan_module);
+  int server_window_bits = mcf->zlib_params.windowBits;
+  
+  ngx_str_t          *which_deflate_extension = NULL;
+  static ngx_str_t permessage_deflate = ngx_string("permessage-deflate");
+  static ngx_str_t perframe_deflate = ngx_string("deflate-frame");
+  static ngx_str_t webkit_perframe_deflate = ngx_string("x-webkit-deflate-frame");
+  
+  permessage_deflate_t pmd;
+#if (NGX_ZLIB)
+  pmd.zstream_in = NULL;
+#endif
+  pmd.server_max_window_bits = NGX_CONF_UNSET;
+  pmd.client_max_window_bits = NGX_CONF_UNSET;
+  pmd.server_no_context_takeover = 0;
+  pmd.client_no_context_takeover = 0;
+  pmd.enabled = 0;
+  
+  ngx_sha1_t          sha1;
+  
+  ws_accept_key.data = buf;
+  
+  r->headers_out.content_length_n = 0;
+  r->chunked = 0;
+  r->header_only = 1;
+  
+  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_VERSION)) == NULL) {
+    fsub->sub.dequeue_after_response=1;
+    r->header_only = 0;
+    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "No Sec-Websocket-Version header present", 1);
+    return NGX_ERROR;
+  }
+  else {
+    ws_version=ngx_atoi(tmp->data, tmp->len);
+    if(ws_version != 13) {
+      //only websocket version 13 (RFC 6455) is supported
+      fsub->sub.dequeue_after_response=1;
+      r->header_only = 0;
+      nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "Unsupported websocket protocol version (only version 13 is supported)", 1);
+      return NGX_ERROR;
+    }
+  }
+  
+  if((ws_key = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_KEY)) == NULL) {
+    fsub->sub.dequeue_after_response=1;
+    r->header_only = 0;
+    nchan_respond_cstring(r, NGX_HTTP_BAD_REQUEST, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "No Sec-Websocket-Key header present", 1);
+    return NGX_ERROR;
+  }
+  
+  if((subprotocols = nchan_get_header_value(r, NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL)) != NULL) {
+    static ngx_str_t     ws_meta = ngx_string("ws+meta.nchan");
+    if(subprotocols->len >= ws_meta.len && ngx_strncmp(subprotocols->data, ws_meta.data, ws_meta.len) == 0) {
+      fsub->ws_meta_subprotocol = 1;
+      nchan_add_response_header(r, &NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL, &ws_meta);
+      
+      //init meta headers str reuse queue
+      nchan_subscriber_init_msgid_reusepool(fsub->ctx, r->pool);
+    }
+    else {
+      nchan_add_response_header(r, &NCHAN_HEADERS_SEC_WEBSOCKET_PROTOCOL, NULL);
+    }
+  }
+  
+  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS)) != NULL) {
+    
+    u_char      *cur = tmp->data, *end = tmp->data + tmp->len;
+    u_char      *lcur, *lend;
+    
+    if(nchan_strscanstr(&cur, &permessage_deflate, end)) {
+      which_deflate_extension = &permessage_deflate;
+    }
+    else if(nchan_strscanstr(&cur, &webkit_perframe_deflate, end)) {
+      which_deflate_extension = &webkit_perframe_deflate;
+    }
+    else if(nchan_strscanstr(&cur, &perframe_deflate, end)) {
+      which_deflate_extension = &perframe_deflate;
+    }
+
+    if(which_deflate_extension) {
+      lcur = cur;
+      lend = memchr(lcur, ',', end - lcur); 
+      if(lend == NULL) lend = end;
+      
+      pmd.enabled = 1;
+      
+      pmd.client_no_context_takeover = ngx_strnstr(lcur, "client_no_context_takeover", lend - lcur) != NULL ? 1 : 0;
+      pmd.server_no_context_takeover = ngx_strnstr(lcur, "server_no_context_takeover", lend - lcur) != NULL ? 1 : 0;
+      
+      if(which_deflate_extension == &permessage_deflate) {
+        if(extract_deflate_window_bits(fsub, lcur, lend, "client_max_window_bits", &pmd.client_max_window_bits) != NGX_OK) {
+          return respond_with_error(fsub, "invalid client_max_window_bits permessage-deflate setting");
+        }
+        if(extract_deflate_window_bits(fsub, lcur, lend, "server_max_window_bits", &pmd.server_max_window_bits) != NGX_OK) {
+          return respond_with_error(fsub, "invalid server_max_window_bits permessage-deflate setting");
+        }
+      }
+      else if(which_deflate_extension == &webkit_perframe_deflate || which_deflate_extension == &perframe_deflate) {
+        if(extract_deflate_window_bits(fsub, lcur, lend, "max_window_bits", &pmd.server_max_window_bits) == NGX_OK) {
+          pmd.client_max_window_bits = pmd.server_max_window_bits;
+        }
+        else {
+          return respond_with_error(fsub, "invalid max_window_bits perframe-deflate setting");
+        }
+      }
+    }
+  }
+  
+  //generate permessage-deflate headers
+  if(pmd.enabled) {
+    u_char *ws_ext_end;
+    ngx_str_t ws_extensions;
+    ws_extensions.data = permessage_deflate_buf;
+    
+    if(which_deflate_extension == &webkit_perframe_deflate || which_deflate_extension == &perframe_deflate) {
+      ws_ext_end = ngx_snprintf(permessage_deflate_buf, 128, "%V; ", which_deflate_extension);
+      if (pmd.server_max_window_bits != NGX_CONF_UNSET) {
+        if(pmd.server_max_window_bits < server_window_bits) {
+          return respond_with_error(fsub, "max_window_bits perframe-deflate is too small");
+        }
+        pmd.server_max_window_bits = server_window_bits; //always the configured window bits
+        ws_ext_end = ngx_snprintf(ws_ext_end, (permessage_deflate_buf + 128 - ws_ext_end),
+                                  "max_window_bits=%i; ",
+                                  pmd.server_max_window_bits);
+      }
+      else {
+        pmd.server_max_window_bits = pmd.client_max_window_bits = server_window_bits;
+      }
+    }
+    else {
+      ws_ext_end = ngx_snprintf(permessage_deflate_buf, 128, "%V; %s%s", 
+                                which_deflate_extension,
+                                pmd.server_no_context_takeover ? "server_no_context_takeover; " : "",
+                                pmd.client_no_context_takeover ? "client_no_context_takeover; " : "");
+      if (pmd.server_max_window_bits != NGX_CONF_UNSET) {
+        if(pmd.server_max_window_bits < server_window_bits) {
+          return respond_with_error(fsub, "server_max_window_bits perframe-deflate is too small");
+        }
+        pmd.server_max_window_bits = server_window_bits; //always the configured window bits
+        ws_ext_end = ngx_snprintf(ws_ext_end, (permessage_deflate_buf + 128 - ws_ext_end), "server_max_window_bits=%i; ", pmd.server_max_window_bits);
+      }
+      else {
+        pmd.server_max_window_bits = server_window_bits;
+      }
+      
+      if (pmd.client_max_window_bits != NGX_CONF_UNSET) {
+        ws_ext_end = ngx_snprintf(ws_ext_end, (permessage_deflate_buf + 128 - ws_ext_end), "client_max_window_bits=%i; ", pmd.client_max_window_bits);
+      }
+      else {
+        pmd.client_max_window_bits = DEFLATE_DEFAULT_CLIENT_WINDOW_BITS;
+      }
+    }
+    ws_extensions.len = ws_ext_end - permessage_deflate_buf - 2; //-2 for the trailing "; "
+    nchan_add_response_header(r, &NCHAN_HEADER_SEC_WEBSOCKET_EXTENSIONS, &ws_extensions);
+  }
+  fsub->deflate = pmd;
+
+  //generate accept key
+  ngx_sha1_init(&sha1);
+  ngx_sha1_update(&sha1, ws_key->data, ws_key->len);
+  ngx_sha1_update(&sha1, magic.data, magic.len);
+  ngx_sha1_final(buf_sha1, &sha1);
+  sha1_str.len=20;
+  sha1_str.data=buf_sha1;
+  
+  ws_accept_key.len=ngx_base64_encoded_length(sha1_str.len);
+  assert(ws_accept_key.len < 255);
+  ngx_encode_base64(&ws_accept_key, &sha1_str);
+  
+  nchan_include_access_control_if_needed(r, fsub->ctx);
+  nchan_add_response_header(r, &NCHAN_HEADER_SEC_WEBSOCKET_ACCEPT, &ws_accept_key);
+  nchan_add_response_header(r, &NCHAN_HEADER_UPGRADE, &NCHAN_WEBSOCKET);
+#if nginx_version < 1003013
+  nchan_add_response_header(r, &NCHAN_HEADER_CONNECTION, &NCHAN_UPGRADE);
+#endif
+  r->headers_out.status_line = NCHAN_HTTP_STATUS_101;
+  r->headers_out.status = NGX_HTTP_SWITCHING_PROTOCOLS;
+  
+  r->keepalive=0; //apparently, websocket must not use keepalive.
+  
+  ngx_http_send_header(r);
+  return NGX_OK;
+}
+
+static void websocket_reading(ngx_http_request_t *r);
+
+static ngx_buf_t *websocket_inflate_message(full_subscriber_t *fsub, ngx_buf_t *msgbuf, ngx_pool_t *pool) {
+#if (NGX_ZLIB)
+  z_stream      *strm;
+  int            rc;
+  ngx_buf_t     *outbuf;
+  
+  if(fsub->deflate.zstream_in == NULL) {
+    if((fsub->deflate.zstream_in = ngx_calloc(sizeof(*strm), ngx_cycle->log)) == NULL) {
+      nchan_log_error("couldn't allocate deflate stream.");
+      return NULL;
+    }
+    strm = fsub->deflate.zstream_in;
+    
+    strm->zalloc = Z_NULL;
+    strm->zfree = Z_NULL;
+    strm->opaque = Z_NULL;
+    
+    rc = inflateInit2(strm, -fsub->deflate.client_max_window_bits);
+    
+    if(rc != Z_OK) {
+      nchan_log_error("couldn't initialize inflate stream.");
+      ngx_free(strm);
+      fsub->deflate.zstream_in = NULL;
+      return NULL;
+    }
+  }
+  
+  strm = fsub->deflate.zstream_in;
+  
+  outbuf = nchan_inflate(strm, msgbuf, fsub->sub.request, pool);
+  return outbuf;
+#else
+  return NULL;
+#endif
+}
+
+static void ensure_request_hold(full_subscriber_t *fsub) {
+  if(fsub->holding == 0) {
+    fsub->sub.request->read_event_handler = websocket_reading;
+    fsub->sub.request->write_event_handler = ws_request_empty_handler;
+    fsub->sub.request->main->count++; //this is the right way to hold and finalize the
+    fsub->holding = 1;
+  }
+}
+
+static ngx_int_t ensure_handshake(full_subscriber_t *fsub) {
+  if(fsub->shook_hands == 0) {
+    ensure_request_hold(fsub);
+    if(websocket_perform_handshake(fsub) == NGX_OK) {
+      fsub->shook_hands = 1;
+      return NGX_OK;
+    }
+    else {
+      return NGX_ERROR;
+    }
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t websocket_reserve(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  ensure_request_hold(fsub);
+  self->reserved++;
+  //DBG("%p reserve for req %p. reservations: %i", self, fsub->sub.request, self->reserved);
+  return NGX_OK;
+}
+static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  //DBG("%p release for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
+  assert(self->reserved > 0);
+  self->reserved--;
+  if(nodestroy == 0 && fsub->awaiting_destruction == 1 && self->reserved == 0) {
+    websocket_subscriber_destroy(self);
+    return NGX_ABORT;
+  }
+  else {
+    return NGX_OK;
+  }
+}
+
+static void ping_ev_handler(ngx_event_t *ev) {
+  full_subscriber_t *fsub = (full_subscriber_t *)ev->data;
+  if(ev->timedout) {
+    ev->timedout=0;
+    if(fsub->awaiting_pong) {
+      //never got a PONG back
+      //NGX_HTTP_CLIENT_CLOSED_REQUEST?
+      websocket_finalize_request(fsub);
+    }
+    else {
+      fsub->awaiting_pong = 1;
+      websocket_send_frame(fsub, WEBSOCKET_PING_LAST_FRAME_BYTE, 0, NULL); 
+      ngx_add_timer(&fsub->ping_ev, fsub->sub.cf->websocket_ping_interval * 1000);
+    }
+  }
+}
+
+static ngx_int_t websocket_enqueue(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  ngx_int_t           rc;
+  if((rc = ensure_handshake(fsub)) != NGX_OK) {
+    return rc;
+  }
+  self->enqueued = 1;
+  
+  if(fsub->enqueue_callback) {
+    fsub->enqueue_callback(&fsub->sub, fsub->enqueue_callback_data);
+  }
+  
+  if(self->cf->websocket_ping_interval > 0) {
+    //add timeout timer
+    //nextsub->ev should be zeroed;
+    nchan_init_timer(&fsub->ping_ev, ping_ev_handler, fsub);
+    ngx_add_timer(&fsub->ping_ev, self->cf->websocket_ping_interval * 1000);
+  }
+  
+  if(self->cf->subscriber_timeout > 0) {
+    //add timeout timer
+    ngx_add_timer(&fsub->timeout_ev, self->cf->subscriber_timeout * 1000);
+  }
+  
+  return NGX_OK;
+}
+
+static void websocket_delete_timers(full_subscriber_t *fsub) {
+  if(fsub->ping_ev.timer_set) {
+    ngx_del_timer(&fsub->ping_ev);
+  }
+  
+  if(fsub->closing_ev.timer_set) {
+    ngx_del_timer(&fsub->closing_ev);
+  }
+  
+  if(fsub->timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->timeout_ev);
+  }
+}
+
+static ngx_int_t websocket_dequeue(subscriber_t *self) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  DBG("%p dequeue", self);
+  if(fsub->dequeue_callback) {
+    fsub->dequeue_callback(&fsub->sub, fsub->dequeue_callback_data);
+  }
+  
+  self->enqueued = 0;
+  
+  if(!fsub->sent_close_frame && fsub->shook_hands) {
+    websocket_send_close_frame_cstr(fsub, CLOSE_NORMAL, "410 Gone");
+  }
+  
+  websocket_delete_timers(fsub);
+  
+  if(self->destroy_after_dequeue) {
+    websocket_subscriber_destroy(self);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t websocket_set_enqueue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  fsub->enqueue_callback = cb;
+  fsub->enqueue_callback_data = privdata;
+  return NGX_OK;
+}
+
+static ngx_int_t websocket_set_dequeue_callback(subscriber_t *self, subscriber_callback_pt cb, void *privdata) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  fsub->dequeue_callback = cb;
+  fsub->dequeue_callback_data = privdata;
+  return NGX_OK;
+}
+
+static ngx_int_t ws_recv(ngx_connection_t *c, ngx_event_t *rev, ngx_buf_t *buf, ssize_t len) {
+  ssize_t         n;
+  n = c->recv(c, buf->last, (ssize_t) len - (buf->last - buf->start));
+
+  if (n == NGX_AGAIN) {
+    return NGX_AGAIN;
+  }
+  else if (n == NGX_ERROR || rev->eof) {
+    return NGX_ERROR;
+  }
+  else if (n == 0) {
+    return NGX_DONE;
+  }
+  
+  buf->pos = buf->last;
+  buf->last += n;
+
+  if ((buf->last - buf->start) < len) {
+    return NGX_AGAIN;
+  }
+
+  return NGX_OK;
+}
+
+static void set_buffer(ngx_buf_t *buf, u_char *start, u_char *last, ssize_t len) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = start;
+  buf->pos = buf->start;
+  buf->last = (last != NULL) ? last : start;
+  buf->end = buf->start + len;
+  buf->temporary = 0;
+  buf->memory = 1;
+}
+
+static void websocket_reading_finalize(ngx_http_request_t *r) {
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  full_subscriber_t          *fsub = (full_subscriber_t *)ctx->sub;
+  
+  //fsub->sub.status = DEAD;
+  if(fsub) {
+    websocket_delete_timers(fsub);
+    websocket_finalize_request(fsub);
+  }
+}
+  
+/* based on code from push stream module, written by
+ * Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * thanks, guys!
+*/
+static void websocket_reading(ngx_http_request_t *r) {
+  nchan_request_ctx_t        *ctx;
+  full_subscriber_t          *fsub;
+  ws_frame_t                 *frame;
+  ngx_int_t                   rc;
+  ngx_event_t                *rev;
+  ngx_connection_t           *c;
+  ngx_buf_t                  *msgbuf, buf;
+  //ngx_str_t                 msg_in_str;
+retry:
+  ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  fsub = (full_subscriber_t *)ctx->sub;
+  frame = &fsub->frame;
+  rc = NGX_OK;
+
+  c = r->connection;
+  rev = c->read;
+  
+  if(!fsub) {
+    nchan_http_finalize_request(r, NGX_OK);
+    return;
+  }
+  
+  set_buffer(&buf, frame->header, frame->last, 8);
+
+  //DBG("websocket_reading fsub: %p, frame: %p", fsub, frame);
+  
+
+
+  for (;;) {
+    if (c->error || c->timedout || c->close || c->destroyed || rev->closed || rev->eof || rev->pending_eof) {
+      //ERR("c->error %i c->timedout %i c->close %i c->destroyed %i rev->closed %i rev->eof %i", c->error, c->timedout, c->close, c->destroyed, rev->closed, rev->eof);
+      fsub->sub.request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
+      return websocket_reading_finalize(r);
+    }
+    
+    switch (frame->step) {
+      case WEBSOCKET_READ_START_STEP:
+        //reading frame header
+        if ((rc = ws_recv(c, rev, &buf, 2)) != NGX_OK) {
+          fsub->sub.request->headers_out.status = NGX_HTTP_CLIENT_CLOSED_REQUEST;
+          goto exit;
+        }
+        
+        frame->fin  = (frame->header[0] >> 7) & 1;
+        frame->rsv1 = (frame->header[0] >> 6) & 1;
+        frame->rsv2 = (frame->header[0] >> 5) & 1;
+        frame->rsv3 = (frame->header[0] >> 4) & 1;
+        frame->opcode = frame->header[0] & 0xf;
+        
+        frame->mask = (frame->header[1] >> 7) & 1;
+        frame->payload_len = frame->header[1] & 0x7f;
+        
+        frame->step = WEBSOCKET_READ_GET_REAL_SIZE_STEP;
+        break;
+      
+      case WEBSOCKET_READ_GET_REAL_SIZE_STEP:
+        switch(frame->payload_len) {
+          uint64_t len;
+          case 126:
+            if ((rc = ws_recv(c, rev, &buf, 2)) != NGX_OK) {
+              goto exit;
+            }
+            ngx_memcpy(&len, frame->header, 2);
+            frame->payload_len = ntohs(len);
+            break;
+            
+          case 127:
+            if ((rc = ws_recv(c, rev, &buf, 8)) != NGX_OK) {
+              goto exit;
+            }
+            ngx_memcpy(&len, frame->header, 8);
+            frame->payload_len = nchan_ntohll(len);
+            break;
+        }
+        
+        frame->step = WEBSOCKET_READ_GET_MASK_KEY_STEP;
+        break;
+      
+      case WEBSOCKET_READ_GET_MASK_KEY_STEP:
+        if (frame->mask) {
+          if ((rc = ws_recv(c, rev, &buf, 4)) != NGX_OK) {
+            goto exit;
+          }
+          ngx_memcpy(frame->mask_key, buf.start, 4);
+        }
+        
+        frame->step = WEBSOCKET_READ_GET_PAYLOAD_STEP;
+        break;
+      
+      case WEBSOCKET_READ_GET_PAYLOAD_STEP:
+        
+        switch(frame->opcode) {
+          case WEBSOCKET_OPCODE_PING:
+          case WEBSOCKET_OPCODE_PONG:
+          case WEBSOCKET_OPCODE_CLOSE:
+            { //block-scope these vars
+              u_char                  payloadbuf[1024];
+              int                     close_code;
+              ngx_str_t               payload_str;
+              nchan_buf_and_chain_t  *bc;
+              
+              if (frame->payload_len == 0) {
+                frame->payload = NULL;
+              }
+              else if(frame->payload_len < 1024) {
+                frame->payload = payloadbuf;
+                frame->last = frame->payload;
+                set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
+                if ((rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
+                  ERR("ws_recv NOT OK when receiving payload");
+                  goto exit;
+                }
+                if (frame->mask) {
+                  websocket_unmask_frame(frame);
+                }
+              }
+              else {
+                //ERROR: frame too big
+                websocket_send_close_frame(fsub, CLOSE_MESSAGE_TOO_BIG, NULL);
+                return websocket_reading_finalize(r);
+              }
+              
+              switch(frame->opcode) {
+                case WEBSOCKET_OPCODE_PING:
+                  bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+                  DBG("%p got pinged", fsub);
+                  init_buf(&bc->buf, 1);
+                  payload_str.data = frame->payload;
+                  payload_str.len = frame->payload_len;
+                  set_buf_to_str(&bc->buf, &payload_str);
+                  websocket_send_frame(fsub, WEBSOCKET_PONG_LAST_FRAME_BYTE, frame->payload_len, &bc->chain);
+                  break;
+                
+                case WEBSOCKET_OPCODE_PONG:
+                  DBG("%p Got ponged", fsub);
+                  if(fsub->awaiting_pong) {
+                    fsub->awaiting_pong = 0;
+                  }
+                  // unsolicited pongs are ok too as per 
+                  // https://tools.ietf.org/html/rfc6455#page-37
+                  break;
+                
+                case WEBSOCKET_OPCODE_CLOSE:
+                  fsub->received_close_frame = 1;
+                  if(frame->payload_len >= 2) {
+                    ngx_memcpy(&close_code, frame->payload, 2);
+                    close_code = ntohs(close_code);
+                    payload_str.data = frame->payload + 2;
+                    payload_str.len = frame->payload_len - 2;
+                  }
+                  else {
+                    close_code = 0;
+                    payload_str.data = (u_char *)"";
+                    payload_str.len = 0;
+                  }
+                  DBG("%p wants to close (code %i reason \"%V\")", fsub, close_code, &payload_str);
+                  if(!fsub->sent_close_frame) {
+                    websocket_send_close_frame(fsub, close_code, &payload_str);
+                  }
+                  return websocket_reading_finalize(r);
+                  break; //good practice?
+              }
+            }
+            break;
+          case WEBSOCKET_OPCODE_TEXT:
+          case WEBSOCKET_OPCODE_BINARY:
+            
+            if(!fsub->sub.cf->pub.websocket) {
+              websocket_send_close_frame_cstr(fsub, CLOSE_POLICY_VIOLATION, "Publishing not allowed.");
+              return websocket_reading_finalize(r);
+            }
+            
+            //TODO: check max websocket message length
+            if(frame->payload == NULL) {
+              if(ws_get_msgpool(fsub) == NULL) {
+                ERR("failed to get msgpool");
+                websocket_send_close_frame(fsub, CLOSE_INTERNAL_SERVER_ERROR, NULL);
+                return websocket_reading_finalize(r);
+              }
+              if((frame->payload = ngx_palloc(ws_get_msgpool(fsub), frame->payload_len == 0 ? 1 : frame->payload_len)) == NULL) {
+                ERR("failed to reserve payload len in tmp pool");
+                websocket_send_close_frame(fsub, CLOSE_INTERNAL_SERVER_ERROR, NULL);
+                ws_destroy_msgpool(fsub);
+                fsub->publisher.msg_pool = NULL;
+                return websocket_reading_finalize(r);
+              }
+              frame->last = frame->payload;
+            }
+            
+            set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
+            
+            if (frame->payload_len > 0 && (rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
+              DBG("ws_recv NOT OK when receiving payload, but that's ok");
+              goto exit;
+            }
+            
+            if (frame->mask) {
+              websocket_unmask_frame(frame);
+            }
+            
+            if((msgbuf = ngx_palloc(ws_get_msgpool(fsub), sizeof(*msgbuf))) == NULL) {
+              ERR("failed to reserve payload msgbuf in tmp pool");
+              websocket_send_close_frame(fsub, CLOSE_INTERNAL_SERVER_ERROR, NULL);
+              ws_destroy_msgpool(fsub);
+              fsub->publisher.msg_pool = NULL;
+              return websocket_reading_finalize(r);
+            }
+            
+            init_msg_buf(msgbuf);
+            
+            msgbuf->start = frame->payload;
+            msgbuf->pos = msgbuf->start;
+            msgbuf->end = msgbuf->start + frame->payload_len;
+            msgbuf->last = msgbuf->end;
+            
+            //inflate message if needed
+            if(fsub->deflate.enabled && frame->rsv1) {
+              if((msgbuf = websocket_inflate_message(fsub, msgbuf, ws_get_msgpool(fsub))) == NULL) {
+                websocket_send_close_frame_cstr(fsub, CLOSE_INVALID_PAYLOAD, "Invalid permessage-deflate data");
+                ws_destroy_msgpool(fsub);
+                return websocket_reading_finalize(r);
+              }
+            }
+            
+            if (frame->opcode == WEBSOCKET_OPCODE_TEXT && !is_utf8(msgbuf)) {
+              ws_destroy_msgpool(fsub);
+              websocket_send_close_frame_cstr(fsub, CLOSE_INVALID_PAYLOAD, "Invalid text frame (not UTF8).");
+              return websocket_reading_finalize(r);
+            }
+            
+            if(websocket_heartbeat(fsub, msgbuf) != NGX_OK) {
+              websocket_publish(fsub, msgbuf, frame->opcode == WEBSOCKET_OPCODE_BINARY);
+            }
+            else {
+              ws_destroy_msgpool(fsub);
+            }
+            break;
+          default:
+            //invalid frame or something
+            websocket_send_frame(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL); //TODO: more specific close frame plz
+            return websocket_reading_finalize(r);
+            break;
+        }
+        
+        frame->step = WEBSOCKET_READ_START_STEP; //restart loop
+        frame->last = NULL;
+        frame->payload = NULL;
+        goto retry; //I know, Dijkstra, I know.
+        break;
+        
+      default:
+        nchan_log(NGX_LOG_ERR, c->log, 0, "unknown websocket step (%d)", frame->step);
+        return websocket_reading_finalize(r);
+    }
+    
+    set_buffer(&buf, frame->header, NULL, 8);
+  }
+
+exit:
+  
+  if (rc == NGX_AGAIN) {
+    frame->last = buf.last;
+    if (!c->read->ready) {
+      if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+        nchan_log(NGX_LOG_INFO, c->log, ngx_socket_errno, "websocket client: failed to restore read events");
+        return websocket_reading_finalize(r);
+      }
+    }
+  }
+
+  if (rc == NGX_ERROR) {
+    rev->eof = 1;
+    c->error = 1;
+    nchan_log(NGX_LOG_INFO, c->log, ngx_socket_errno, "websocket client prematurely closed connection");
+    return websocket_reading_finalize(r);
+  }
+}
+
+
+static ngx_flag_t is_utf8(ngx_buf_t *buf) {
+  
+  u_char *p;
+  size_t n;
+  
+  u_char  c, *last;
+  int     mmapped = 0;
+  
+  if(ngx_buf_in_memory(buf)) {
+    n = ngx_buf_size(buf);
+    p = buf->pos;
+  }
+  else {
+    ngx_fd_t fd = buf->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&buf->file->name) : buf->file->fd;
+    n = buf->file_last - buf->file_pos;
+    p = mmap(NULL, n, PROT_READ, MAP_SHARED, fd, buf->file_pos);
+    if (p == MAP_FAILED) {
+      return 0;
+    }
+    mmapped = 1;
+  }
+  
+  last = p + n;
+  
+  while (p < last) {
+    c = *p;
+    
+    if (c < 0x80) {
+      p++;
+      continue;
+    }
+    
+    if (ngx_utf8_decode(&p, last - p) > 0x10ffff) {
+      /* invalid UTF-8 */
+      if(mmapped) {
+        munmap(p, n);
+      }
+      return 0;
+    }
+  }
+  if(mmapped) {
+    munmap(p, n);
+  }
+  return 1;
+}
+
+static void init_buf(ngx_buf_t *buf, int8_t last){
+  ngx_memzero(buf, sizeof(*buf));
+  buf->memory = 1;
+  if(last) {
+    buf->last_buf = 1;
+    buf->last_in_chain = 1;
+    buf->flush = 1;
+  }
+}
+
+static void init_header_buf(ngx_buf_t *buf) {
+  init_buf(buf, 0);
+}
+
+static void init_msg_buf(ngx_buf_t *buf) {
+  init_buf(buf, 1);
+}
+
+static ngx_int_t websocket_frame_header(full_subscriber_t *fsub, ngx_buf_t *buf, const u_char opcode, off_t len) {
+  
+  framebuf_t           *framebuf = nchan_reuse_queue_push(fsub->ctx->output_str_queue);
+  u_char               *last = framebuf->chr;
+  uint64_t              len_net;
+  init_header_buf(buf);
+  buf->start = last;
+  *last = opcode;
+  last++;
+  if (len <= 125) {
+    last = ngx_copy(last, &len, 1);
+    buf->end++;
+  }
+  else if (len < (1 << 16)) {
+    last = ngx_copy(last, &WEBSOCKET_PAYLOAD_LEN_16_BYTE, sizeof(WEBSOCKET_PAYLOAD_LEN_16_BYTE));
+    len_net = htons(len);
+    last = ngx_copy(last, &len_net, 2);
+  }
+  else {
+    last = ngx_copy(last, &WEBSOCKET_PAYLOAD_LEN_64_BYTE, sizeof(WEBSOCKET_PAYLOAD_LEN_64_BYTE));
+    len_net = nchan_htonll(len);
+    last = ngx_copy(last, &len_net, 8);
+  }
+  buf->end=last;
+  buf->last=last;
+  buf->last_buf= len == 0;
+  buf->pos=buf->start;
+  return NGX_OK;
+}
+
+/*static ngx_int_t websocket_msg_frame_header(ngx_buf_t *buf, off_t len) {
+  return websocket_frame_header(buf, WEBSOCKET_TEXT_LAST_FRAME_BYTE, len);
+}
+*/
+
+static void set_buf_to_str(ngx_buf_t *buf, const ngx_str_t *str) {
+  buf->start=str->data;
+  buf->end=str->data + str->len;
+  buf->pos = buf->start;
+  buf->last = buf->end;
+}
+
+static ngx_chain_t *websocket_frame_header_chain(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *msg_chain) {
+  
+  nchan_buf_and_chain_t   *bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+
+  init_header_buf(&bc->buf);
+  
+  websocket_frame_header(fsub, &bc->buf, opcode, len);
+  
+  if(len == 0) {
+    bc->buf.last_buf=1;
+  }
+  else {
+    bc->buf.last_buf=0;
+    assert(msg_chain != NULL);
+    bc->chain.next = msg_chain;
+  }
+  bc->buf.pos=bc->buf.start;
+
+  return &bc->chain;
+}
+
+static ngx_int_t websocket_send_frame(full_subscriber_t *fsub, const u_char opcode, off_t len, ngx_chain_t *msg_chain) {
+  return ws_output_filter(fsub, websocket_frame_header_chain(fsub, opcode, len, msg_chain));
+}
+
+static ngx_chain_t *websocket_msg_frame_chain(full_subscriber_t *fsub, nchan_msg_t *msg) {
+  nchan_buf_and_chain_t *bc;
+  ngx_file_t            *file_copy;
+  ngx_buf_t             *chained_msgbuf = NULL;
+  size_t                 sz;
+  u_char                 frame_opcode;
+  int                    compressed;
+  ngx_buf_t             *msgbuf;
+  compressed = fsub->deflate.enabled && msg->compressed && msg->compressed->compression == NCHAN_MSG_COMPRESSION_WEBSOCKET_PERMESSAGE_DEFLATE;
+
+  msgbuf = compressed ? &msg->compressed->buf : &msg->buf;
+  sz = ngx_buf_size(msgbuf);
+  
+  if(msg->content_type && nchan_ngx_str_match(msg->content_type, &binary_mimetype)) {
+    frame_opcode = compressed ? WEBSOCKET_BINARY_DEFLATED_LAST_FRAME_BYTE : WEBSOCKET_BINARY_LAST_FRAME_BYTE;
+  }
+  else {
+    frame_opcode = compressed ? WEBSOCKET_TEXT_DEFLATED_LAST_FRAME_BYTE : WEBSOCKET_TEXT_LAST_FRAME_BYTE;
+  }
+  
+  if(fsub->ws_meta_subprotocol) {
+    if(!compressed) {
+      static ngx_str_t          id_line = ngx_string("id: ");
+      static ngx_str_t          content_type_line = ngx_string("\ncontent-type: ");
+      static ngx_str_t          two_newlines = ngx_string("\n\n");
+      ngx_chain_t              *cur;
+      ngx_str_t                 msgid;
+      bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 4 + (msg->content_type ? 2 : 0));
+      cur = &bc->chain;
+      
+      // id: 
+      ngx_init_set_membuf(cur->buf, id_line.data, id_line.data + id_line.len);
+      sz += id_line.len;
+      cur = cur->next;
+      
+      //msgid value
+      msgid = nchan_subscriber_set_recyclable_msgid_str(fsub->ctx, &fsub->sub.last_msgid);
+      ngx_init_set_membuf(cur->buf, msgid.data, msgid.data + msgid.len);
+      sz += msgid.len;
+      cur = cur->next;
+      
+      if(msg->content_type) {
+        // content-type: 
+        ngx_init_set_membuf(cur->buf, content_type_line.data, content_type_line.data + content_type_line.len);
+        sz += content_type_line.len;
+        cur = cur->next;
+        
+        //content-type value
+        ngx_init_set_membuf(cur->buf, msg->content_type->data, msg->content_type->data + msg->content_type->len);
+        sz += msg->content_type->len;
+        cur = cur->next;
+      }
+      
+      // \n\n
+      ngx_init_set_membuf(cur->buf, two_newlines.data, two_newlines.data + two_newlines.len);
+      sz += two_newlines.len;
+    
+    
+      if(ngx_buf_size(msgbuf) > 0) {
+        cur = cur->next;
+        //now the message
+        *cur->buf = *msgbuf;
+        chained_msgbuf = cur->buf;
+        assert(cur->next == NULL);
+      }
+      else {
+        cur->next = NULL;
+        cur->buf->last_in_chain = 1;
+        cur->buf->last_buf = 1;
+      }
+    }
+    else {
+#if (NGX_ZLIB)
+      u_char        ws_meta_header[512];
+      static u_char ws_meta_header_deflated[512];
+      ngx_chain_t  *cur;
+      u_char       *end;
+      ngx_str_t     ws_meta_header_str_in;
+      ngx_str_t     ws_meta_header_str_out;
+      
+      ws_meta_header_str_out.data = ws_meta_header_deflated;
+      ws_meta_header_str_out.len = 512;
+      
+      ngx_str_t     msgid = nchan_subscriber_set_recyclable_msgid_str(fsub->ctx, &fsub->sub.last_msgid);
+      if(msg->content_type) {
+        end = ngx_snprintf(ws_meta_header, 512, "id: %V\ncontent-type: %V\n\n", &msgid, msg->content_type);
+      }
+      else {
+        end = ngx_snprintf(ws_meta_header, 512, "id: %V\n\n", &msgid);
+      }
+      
+      ws_meta_header_str_in.data = ws_meta_header;
+      ws_meta_header_str_in.len = end - ws_meta_header;
+      
+      bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 2);
+      cur = &bc->chain;
+      
+      nchan_common_simple_deflate_raw_block(&ws_meta_header_str_in, &ws_meta_header_str_out);
+      
+      ngx_init_set_membuf(cur->buf, ws_meta_header_str_out.data, ws_meta_header_str_out.data + ws_meta_header_str_out.len);
+      sz += ws_meta_header_str_out.len;
+      cur = cur->next;
+      
+      //now the message
+      *cur->buf = *msgbuf;
+      chained_msgbuf = cur->buf;
+#endif
+    }
+  }
+  else {
+    bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+    //message first
+    chained_msgbuf = &bc->buf;
+    bc->buf = *msgbuf;
+  }
+  
+  if(chained_msgbuf && msgbuf->file) {
+    file_copy = nchan_bufchain_pool_reserve_file(fsub->ctx->bcp);
+    nchan_msg_buf_open_fd_if_needed(chained_msgbuf, file_copy, NULL);
+  }
+  
+  //DBG("opcode: %i, orig sz: %i compressed sz: %i", frame_opcode, ngx_buf_size((&msg->buf)), compressed ? ngx_buf_size(msgbuf) : 0);
+  //now the header
+  return websocket_frame_header_chain(fsub, frame_opcode, sz, &bc->chain);
+}
+
+static ngx_int_t websocket_send_close_frame_cstr(full_subscriber_t *fsub, uint16_t code, const char *err) {
+  ngx_str_t errstr=ngx_string(err);
+  return websocket_send_close_frame(fsub, code, &errstr);
+}
+
+static ngx_int_t websocket_send_close_frame(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err) {
+  if(fsub->sent_close_frame == 1) {
+    DBG("%p already sent close frame");
+    websocket_finalize_request(fsub);
+  }
+  else {
+    ws_output_filter(fsub, websocket_close_frame_chain(fsub, code, err));
+    fsub->sent_close_frame = 1;
+    ngx_add_timer(&fsub->closing_ev, fsub->received_close_frame ? 0 : WEBSOCKET_CLOSING_TIMEOUT);
+  }
+  return NGX_OK;
+}
+
+static ngx_chain_t *websocket_close_frame_chain(full_subscriber_t *fsub, uint16_t code, ngx_str_t *err) {
+  nchan_buf_and_chain_t *bc; 
+  ngx_chain_t    *hdr_chain;
+  ngx_buf_t      *code_buf, *msg_buf;
+  ngx_str_t       alt_err;
+  static uint16_t code_net;
+  
+  if(err) {
+    alt_err.data=err->data;
+    alt_err.len=err->len;
+  }
+  else {
+    alt_err.data=NULL;
+    alt_err.len=0;
+  }
+  err = &alt_err;
+  
+  if(code == 0) {
+    return websocket_frame_header_chain(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, 0, NULL);
+  }
+  
+  if(code < 1000 || code == 1005 || code == 1006 || code >= 5000) {
+    ERR("invalid websocket close status code %i", code);
+    code=CLOSE_NORMAL;
+  }  
+  bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, err->len > 0 ? 2 : 1);
+  
+  code_buf = &bc->buf;
+  
+  init_buf(code_buf, err->len == 0);
+  code_net=htons(code);
+  code_buf->start = code_buf->pos = (u_char *)&code_net;
+  code_buf->last = code_buf->end = ngx_copy(code_buf->pos, &code_net, 2);
+  
+  if(err->len > 0) {
+    if(err->len > 123) {
+      ERR("websocket close frame reason string is too long (length %i)", err->len);
+      err->len = 123;
+    }
+    msg_buf = bc->chain.next->buf;
+    init_msg_buf(msg_buf);
+    set_buf_to_str(msg_buf, err);
+  }
+
+  
+  hdr_chain = websocket_frame_header_chain(fsub, WEBSOCKET_CLOSE_LAST_FRAME_BYTE, err->len + 2, &bc->chain);
+  return hdr_chain;
+}
+
+
+static ngx_int_t websocket_respond_message(subscriber_t *self, nchan_msg_t *msg) {
+  ngx_int_t            rc;
+  full_subscriber_t   *fsub = (full_subscriber_t *)self;
+  if((rc = ensure_handshake(fsub)) != NGX_OK) {
+    return rc;
+  }
+  ngx_http_request_t *r = self->request;
+  r->header_only = 0;
+  
+  if(fsub->timeout_ev.timer_set) {
+    ngx_del_timer(&fsub->timeout_ev);
+    ngx_add_timer(&fsub->timeout_ev, fsub->sub.cf->subscriber_timeout * 1000);
+  }
+  
+  fsub->ctx->prev_msg_id = self->last_msgid;
+  update_subscriber_last_msg_id(self, msg);
+  fsub->ctx->msg_id = self->last_msgid;
+  
+  rc = ws_output_msg_filter(fsub, msg);
+  
+  return rc;
+}
+
+static ngx_int_t websocket_respond_status(subscriber_t *self, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body) {
+  static const ngx_str_t    STATUS_410=ngx_string("410 Channel Deleted");
+  static const ngx_str_t    STATUS_403=ngx_string("403 Forbidden");
+  static const ngx_str_t    STATUS_500=ngx_string("500 Internal Server Error");
+  static const ngx_str_t    STATUS_507=ngx_string("507 Insufficient Storage");
+  static const ngx_str_t    empty=ngx_string("");
+  u_char                    msgbuf[50];
+  ngx_str_t                 custom_close_msg;
+  ngx_str_t                *close_msg = NULL;
+  uint16_t                  close_code = 0;
+  full_subscriber_t        *fsub = (full_subscriber_t *)self;
+  
+  if(status_code == NGX_HTTP_NO_CONTENT || (status_code == NGX_HTTP_NOT_MODIFIED && !status_line)) {
+    //don't care, ignore
+    return NGX_OK;
+  }
+  
+  if(!fsub->shook_hands) {
+    //still in HTTP land
+    fsub->cln = NULL;
+    return nchan_respond_status(fsub->sub.request, status_code, status_line, status_body, 1);
+  }
+  
+  switch(status_code) {
+    case 410:
+      close_code = CLOSE_GOING_AWAY;
+      fsub->sub.request->headers_out.status = NGX_HTTP_GONE;
+      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_410);
+      break;
+    case 403:
+      close_code = CLOSE_POLICY_VIOLATION;
+      fsub->sub.request->headers_out.status = NGX_HTTP_FORBIDDEN;
+      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_403);
+      break;
+    case 500: 
+      close_code = CLOSE_INTERNAL_SERVER_ERROR;
+      fsub->sub.request->headers_out.status = NGX_HTTP_INTERNAL_SERVER_ERROR;
+      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_500);
+      break;
+    case 507: 
+      close_code = CLOSE_INTERNAL_SERVER_ERROR;
+      fsub->sub.request->headers_out.status = NGX_HTTP_INSUFFICIENT_STORAGE;
+      close_msg = (ngx_str_t *)(status_line ? status_line : &STATUS_507);
+      break;
+    default:
+      if((status_code >= 400 && status_code < 600) || status_code == NGX_HTTP_NOT_MODIFIED) {
+        custom_close_msg.data=msgbuf;
+        fsub->sub.request->headers_out.status = status_code;
+        custom_close_msg.len = ngx_sprintf(msgbuf,"%i %v", status_code, (status_line ? status_line : &empty)) - msgbuf;
+        close_msg = &custom_close_msg;
+        close_code = status_code >=500 && status_code <= 599 ? CLOSE_INTERNAL_SERVER_ERROR : CLOSE_NORMAL;
+      }
+      else {
+        ERR("unhandled code %i, %v", status_code, (status_line ? status_line : &empty));
+        assert(0);
+      }
+  }
+  websocket_send_close_frame(fsub, close_code, close_msg);
+  
+  return NGX_OK;
+}
+
+
+ngx_int_t nchan_detect_websocket_request(ngx_http_request_t *r) {
+  ngx_str_t       *tmp;
+  
+  if(r->method != NGX_HTTP_GET) {
+    return 0;
+  }
+  
+  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_CONNECTION))) {
+    if(ngx_strlcasestrn(tmp->data, tmp->data + tmp->len, NCHAN_UPGRADE.data, NCHAN_UPGRADE.len - 1) == NULL) return 0;
+  }
+  else return 0;
+  
+  if((tmp = nchan_get_header_value(r, NCHAN_HEADER_UPGRADE))) {
+    if(tmp->len != NCHAN_WEBSOCKET.len || ngx_strncasecmp(tmp->data, NCHAN_WEBSOCKET.data, NCHAN_WEBSOCKET.len) != 0) return 0;
+  }
+  else return 0;
+
+  return 1;
+}
+
+ngx_int_t websocket_intercept_published_message(subscriber_t *sub, void (*interceptor)(subscriber_t *, nchan_msg_t *)) {
+  full_subscriber_t  *fsub = (full_subscriber_t  *)sub;
+  fsub->publisher.intercept = interceptor;
+  return NGX_OK;
+}
+
+static const subscriber_fn_t websocket_fn = {
+  &websocket_enqueue,
+  &websocket_dequeue,
+  &websocket_respond_message,
+  &websocket_respond_status,
+  &websocket_set_enqueue_callback,
+  &websocket_set_dequeue_callback,
+  &websocket_reserve,
+  &websocket_release,
+  &nchan_subscriber_receive_notice,
+  &nchan_subscriber_authorize_subscribe_request
+};
+
+static ngx_str_t     sub_name = ngx_string("websocket");
+
+static const subscriber_t new_websocket_sub = {
+  &sub_name,
+  WEBSOCKET,
+  &websocket_fn,
+  UNKNOWN,
+  NCHAN_ZERO_MSGID,
+  NULL,
+  NULL,
+  NULL,
+  0, //reserved
+  1, //enable sub/unsub callbacks
+  0, //deque after response
+  1, //destroy after dequeue
+  0, //enqueued
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+  NULL, NULL, NULL
+#endif
+};
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/websocket.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/websocket.h
new file mode 100644
index 0000000..034b0b5
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/subscribers/websocket.h
@@ -0,0 +1,5 @@
+subscriber_t *websocket_subscriber_create(ngx_http_request_t *r, nchan_msg_id_t *msg_id);
+ngx_int_t websocket_subscriber_destroy(subscriber_t *sub);
+ngx_int_t websocket_intercept_published_message(subscriber_t *sub, void (*)(subscriber_t *, nchan_msg_t *));
+
+ngx_int_t nchan_detect_websocket_request(ngx_http_request_t *r);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/uthash.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/uthash.h
new file mode 100644
index 0000000..91db592
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/uthash.h
@@ -0,0 +1,1208 @@
+/*
+Copyright (c) 2003-2017, Troy D. Hanson     http://troydhanson.github.com/uthash/
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef UTHASH_H
+#define UTHASH_H
+
+#define UTHASH_VERSION 2.0.2
+
+#include <string.h>   /* memcmp, memset, strlen */
+#include <stddef.h>   /* ptrdiff_t */
+#include <stdlib.h>   /* exit */
+
+/* These macros use decltype or the earlier __typeof GNU extension.
+   As decltype is only available in newer compilers (VS2010 or gcc 4.3+
+   when compiling c++ source) this code uses whatever method is needed
+   or, for VS2008 where neither is available, uses casting workarounds. */
+#if !defined(DECLTYPE) && !defined(NO_DECLTYPE)
+#if defined(_MSC_VER)   /* MS compiler */
+#if _MSC_VER >= 1600 && defined(__cplusplus)  /* VS2010 or newer in C++ mode */
+#define DECLTYPE(x) (decltype(x))
+#else                   /* VS2008 or older (or VS2010 in C mode) */
+#define NO_DECLTYPE
+#endif
+#elif defined(__BORLANDC__) || defined(__ICCARM__) || defined(__LCC__) || defined(__WATCOMC__)
+#define NO_DECLTYPE
+#else                   /* GNU, Sun and other compilers */
+#define DECLTYPE(x) (__typeof(x))
+#endif
+#endif
+
+#ifdef NO_DECLTYPE
+#define DECLTYPE(x)
+#define DECLTYPE_ASSIGN(dst,src)                                                 \
+do {                                                                             \
+  char **_da_dst = (char**)(&(dst));                                             \
+  *_da_dst = (char*)(src);                                                       \
+} while (0)
+#else
+#define DECLTYPE_ASSIGN(dst,src)                                                 \
+do {                                                                             \
+  (dst) = DECLTYPE(dst)(src);                                                    \
+} while (0)
+#endif
+
+/* a number of the hash function use uint32_t which isn't defined on Pre VS2010 */
+#if defined(_WIN32)
+#if defined(_MSC_VER) && _MSC_VER >= 1600
+#include <stdint.h>
+#elif defined(__WATCOMC__) || defined(__MINGW32__) || defined(__CYGWIN__)
+#include <stdint.h>
+#else
+typedef unsigned int uint32_t;
+typedef unsigned char uint8_t;
+#endif
+#elif defined(__GNUC__) && !defined(__VXWORKS__)
+#include <stdint.h>
+#else
+typedef unsigned int uint32_t;
+typedef unsigned char uint8_t;
+#endif
+
+#ifndef uthash_malloc
+#define uthash_malloc(sz) malloc(sz)      /* malloc fcn                      */
+#endif
+#ifndef uthash_free
+#define uthash_free(ptr,sz) free(ptr)     /* free fcn                        */
+#endif
+#ifndef uthash_bzero
+#define uthash_bzero(a,n) memset(a,'\0',n)
+#endif
+#ifndef uthash_memcmp
+#define uthash_memcmp(a,b,n) memcmp(a,b,n)
+#endif
+#ifndef uthash_strlen
+#define uthash_strlen(s) strlen(s)
+#endif
+
+#ifndef uthash_noexpand_fyi
+#define uthash_noexpand_fyi(tbl)          /* can be defined to log noexpand  */
+#endif
+#ifndef uthash_expand_fyi
+#define uthash_expand_fyi(tbl)            /* can be defined to log expands   */
+#endif
+
+#ifndef HASH_NONFATAL_OOM
+#define HASH_NONFATAL_OOM 0
+#endif
+
+#if HASH_NONFATAL_OOM
+/* malloc failures can be recovered from */
+
+#ifndef uthash_nonfatal_oom
+#define uthash_nonfatal_oom(obj) do {} while (0)    /* non-fatal OOM error */
+#endif
+
+#define HASH_RECORD_OOM(oomed) do { (oomed) = 1; } while (0)
+#define IF_HASH_NONFATAL_OOM(x) x
+
+#else
+/* malloc failures result in lost memory, hash tables are unusable */
+
+#ifndef uthash_fatal
+#define uthash_fatal(msg) exit(-1)        /* fatal OOM error */
+#endif
+
+#define HASH_RECORD_OOM(oomed) uthash_fatal("out of memory")
+#define IF_HASH_NONFATAL_OOM(x)
+
+#endif
+
+/* initial number of buckets */
+#define HASH_INITIAL_NUM_BUCKETS 32U     /* initial number of buckets        */
+#define HASH_INITIAL_NUM_BUCKETS_LOG2 5U /* lg2 of initial number of buckets */
+#define HASH_BKT_CAPACITY_THRESH 10U     /* expand when bucket count reaches */
+
+/* calculate the element whose hash handle address is hhp */
+#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho)))
+/* calculate the hash handle from element address elp */
+#define HH_FROM_ELMT(tbl,elp) ((UT_hash_handle *)(((char*)(elp)) + ((tbl)->hho)))
+
+#define HASH_ROLLBACK_BKT(hh, head, itemptrhh)                                   \
+do {                                                                             \
+  struct UT_hash_handle *_hd_hh_item = (itemptrhh);                              \
+  unsigned _hd_bkt;                                                              \
+  HASH_TO_BKT(_hd_hh_item->hashv, (head)->hh.tbl->num_buckets, _hd_bkt);         \
+  (head)->hh.tbl->buckets[_hd_bkt].count++;                                      \
+  _hd_hh_item->hh_next = NULL;                                                   \
+  _hd_hh_item->hh_prev = NULL;                                                   \
+} while (0)
+
+#define HASH_VALUE(keyptr,keylen,hashv)                                          \
+do {                                                                             \
+  HASH_FCN(keyptr, keylen, hashv);                                               \
+} while (0)
+
+#define HASH_FIND_BYHASHVALUE(hh,head,keyptr,keylen,hashval,out)                 \
+do {                                                                             \
+  (out) = NULL;                                                                  \
+  if (head) {                                                                    \
+    unsigned _hf_bkt;                                                            \
+    HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _hf_bkt);                  \
+    if (HASH_BLOOM_TEST((head)->hh.tbl, hashval) != 0) {                         \
+      HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ], keyptr, keylen, hashval, out); \
+    }                                                                            \
+  }                                                                              \
+} while (0)
+
+#define HASH_FIND(hh,head,keyptr,keylen,out)                                     \
+do {                                                                             \
+  unsigned _hf_hashv;                                                            \
+  HASH_VALUE(keyptr, keylen, _hf_hashv);                                         \
+  HASH_FIND_BYHASHVALUE(hh, head, keyptr, keylen, _hf_hashv, out);               \
+} while (0)
+
+#ifdef HASH_BLOOM
+#define HASH_BLOOM_BITLEN (1UL << HASH_BLOOM)
+#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8UL) + (((HASH_BLOOM_BITLEN%8UL)!=0UL) ? 1UL : 0UL)
+#define HASH_BLOOM_MAKE(tbl,oomed)                                               \
+do {                                                                             \
+  (tbl)->bloom_nbits = HASH_BLOOM;                                               \
+  (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN);                 \
+  if (!(tbl)->bloom_bv) {                                                        \
+    HASH_RECORD_OOM(oomed);                                                      \
+  } else {                                                                       \
+    uthash_bzero((tbl)->bloom_bv, HASH_BLOOM_BYTELEN);                           \
+    (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE;                                     \
+  }                                                                              \
+} while (0)
+
+#define HASH_BLOOM_FREE(tbl)                                                     \
+do {                                                                             \
+  uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN);                              \
+} while (0)
+
+#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8U] |= (1U << ((idx)%8U)))
+#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8U] & (1U << ((idx)%8U)))
+
+#define HASH_BLOOM_ADD(tbl,hashv)                                                \
+  HASH_BLOOM_BITSET((tbl)->bloom_bv, (hashv & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U)))
+
+#define HASH_BLOOM_TEST(tbl,hashv)                                               \
+  HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U)))
+
+#else
+#define HASH_BLOOM_MAKE(tbl,oomed)
+#define HASH_BLOOM_FREE(tbl)
+#define HASH_BLOOM_ADD(tbl,hashv)
+#define HASH_BLOOM_TEST(tbl,hashv) (1)
+#define HASH_BLOOM_BYTELEN 0U
+#endif
+
+#define HASH_MAKE_TABLE(hh,head,oomed)                                           \
+do {                                                                             \
+  (head)->hh.tbl = (UT_hash_table*)uthash_malloc(sizeof(UT_hash_table));         \
+  if (!(head)->hh.tbl) {                                                         \
+    HASH_RECORD_OOM(oomed);                                                      \
+  } else {                                                                       \
+    uthash_bzero((head)->hh.tbl, sizeof(UT_hash_table));                         \
+    (head)->hh.tbl->tail = &((head)->hh);                                        \
+    (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS;                      \
+    (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2;            \
+    (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head);                  \
+    (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc(                    \
+        HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket));               \
+    (head)->hh.tbl->signature = HASH_SIGNATURE;                                  \
+    if (!(head)->hh.tbl->buckets) {                                              \
+      HASH_RECORD_OOM(oomed);                                                    \
+      uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                        \
+    } else {                                                                     \
+      uthash_bzero((head)->hh.tbl->buckets,                                      \
+          HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket));             \
+      HASH_BLOOM_MAKE((head)->hh.tbl, oomed);                                    \
+      IF_HASH_NONFATAL_OOM(                                                      \
+        if (oomed) {                                                             \
+          uthash_free((head)->hh.tbl->buckets,                                   \
+              HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));           \
+          uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                    \
+        }                                                                        \
+      )                                                                          \
+    }                                                                            \
+  }                                                                              \
+} while (0)
+
+#define HASH_REPLACE_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,replaced,cmpfcn) \
+do {                                                                             \
+  (replaced) = NULL;                                                             \
+  HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \
+  if (replaced) {                                                                \
+    HASH_DELETE(hh, head, replaced);                                             \
+  }                                                                              \
+  HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn); \
+} while (0)
+
+#define HASH_REPLACE_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add,replaced) \
+do {                                                                             \
+  (replaced) = NULL;                                                             \
+  HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \
+  if (replaced) {                                                                \
+    HASH_DELETE(hh, head, replaced);                                             \
+  }                                                                              \
+  HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add); \
+} while (0)
+
+#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced)                   \
+do {                                                                             \
+  unsigned _hr_hashv;                                                            \
+  HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv);                         \
+  HASH_REPLACE_BYHASHVALUE(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced); \
+} while (0)
+
+#define HASH_REPLACE_INORDER(hh,head,fieldname,keylen_in,add,replaced,cmpfcn)    \
+do {                                                                             \
+  unsigned _hr_hashv;                                                            \
+  HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv);                         \
+  HASH_REPLACE_BYHASHVALUE_INORDER(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced, cmpfcn); \
+} while (0)
+
+#define HASH_APPEND_LIST(hh, head, add)                                          \
+do {                                                                             \
+  (add)->hh.next = NULL;                                                         \
+  (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail);           \
+  (head)->hh.tbl->tail->next = (add);                                            \
+  (head)->hh.tbl->tail = &((add)->hh);                                           \
+} while (0)
+
+#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn)                                 \
+do {                                                                             \
+  do {                                                                           \
+    if (cmpfcn(DECLTYPE(head)(_hs_iter), add) > 0) {                             \
+      break;                                                                     \
+    }                                                                            \
+  } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next));           \
+} while (0)
+
+#ifdef NO_DECLTYPE
+#undef HASH_AKBI_INNER_LOOP
+#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn)                                 \
+do {                                                                             \
+  char *_hs_saved_head = (char*)(head);                                          \
+  do {                                                                           \
+    DECLTYPE_ASSIGN(head, _hs_iter);                                             \
+    if (cmpfcn(head, add) > 0) {                                                 \
+      DECLTYPE_ASSIGN(head, _hs_saved_head);                                     \
+      break;                                                                     \
+    }                                                                            \
+    DECLTYPE_ASSIGN(head, _hs_saved_head);                                       \
+  } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next));           \
+} while (0)
+#endif
+
+#if HASH_NONFATAL_OOM
+
+#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed)            \
+do {                                                                             \
+  if (!(oomed)) {                                                                \
+    unsigned _ha_bkt;                                                            \
+    (head)->hh.tbl->num_items++;                                                 \
+    HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt);                  \
+    HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed);    \
+    if (oomed) {                                                                 \
+      HASH_ROLLBACK_BKT(hh, head, &(add)->hh);                                   \
+      HASH_DELETE_HH(hh, head, &(add)->hh);                                      \
+      (add)->hh.tbl = NULL;                                                      \
+      uthash_nonfatal_oom(add);                                                  \
+    } else {                                                                     \
+      HASH_BLOOM_ADD((head)->hh.tbl, hashval);                                   \
+      HASH_EMIT_KEY(hh, head, keyptr, keylen_in);                                \
+    }                                                                            \
+  } else {                                                                       \
+    (add)->hh.tbl = NULL;                                                        \
+    uthash_nonfatal_oom(add);                                                    \
+  }                                                                              \
+} while (0)
+
+#else
+
+#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed)            \
+do {                                                                             \
+  unsigned _ha_bkt;                                                              \
+  (head)->hh.tbl->num_items++;                                                   \
+  HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt);                    \
+  HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed);      \
+  HASH_BLOOM_ADD((head)->hh.tbl, hashval);                                       \
+  HASH_EMIT_KEY(hh, head, keyptr, keylen_in);                                    \
+} while (0)
+
+#endif
+
+
+#define HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh,head,keyptr,keylen_in,hashval,add,cmpfcn) \
+do {                                                                             \
+  IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; )                                     \
+  (add)->hh.hashv = (hashval);                                                   \
+  (add)->hh.key = (char*) (keyptr);                                              \
+  (add)->hh.keylen = (unsigned) (keylen_in);                                     \
+  if (!(head)) {                                                                 \
+    (add)->hh.next = NULL;                                                       \
+    (add)->hh.prev = NULL;                                                       \
+    HASH_MAKE_TABLE(hh, add, _ha_oomed);                                         \
+    IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { )                                    \
+      (head) = (add);                                                            \
+    IF_HASH_NONFATAL_OOM( } )                                                    \
+  } else {                                                                       \
+    void *_hs_iter = (head);                                                     \
+    (add)->hh.tbl = (head)->hh.tbl;                                              \
+    HASH_AKBI_INNER_LOOP(hh, head, add, cmpfcn);                                 \
+    if (_hs_iter) {                                                              \
+      (add)->hh.next = _hs_iter;                                                 \
+      if (((add)->hh.prev = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev)) {     \
+        HH_FROM_ELMT((head)->hh.tbl, (add)->hh.prev)->next = (add);              \
+      } else {                                                                   \
+        (head) = (add);                                                          \
+      }                                                                          \
+      HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev = (add);                      \
+    } else {                                                                     \
+      HASH_APPEND_LIST(hh, head, add);                                           \
+    }                                                                            \
+  }                                                                              \
+  HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed);       \
+  HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE_INORDER");                    \
+} while (0)
+
+#define HASH_ADD_KEYPTR_INORDER(hh,head,keyptr,keylen_in,add,cmpfcn)             \
+do {                                                                             \
+  unsigned _hs_hashv;                                                            \
+  HASH_VALUE(keyptr, keylen_in, _hs_hashv);                                      \
+  HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, keyptr, keylen_in, _hs_hashv, add, cmpfcn); \
+} while (0)
+
+#define HASH_ADD_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,cmpfcn) \
+  HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn)
+
+#define HASH_ADD_INORDER(hh,head,fieldname,keylen_in,add,cmpfcn)                 \
+  HASH_ADD_KEYPTR_INORDER(hh, head, &((add)->fieldname), keylen_in, add, cmpfcn)
+
+#define HASH_ADD_KEYPTR_BYHASHVALUE(hh,head,keyptr,keylen_in,hashval,add)        \
+do {                                                                             \
+  IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; )                                     \
+  (add)->hh.hashv = (hashval);                                                   \
+  (add)->hh.key = (char*) (keyptr);                                              \
+  (add)->hh.keylen = (unsigned) (keylen_in);                                     \
+  if (!(head)) {                                                                 \
+    (add)->hh.next = NULL;                                                       \
+    (add)->hh.prev = NULL;                                                       \
+    HASH_MAKE_TABLE(hh, add, _ha_oomed);                                         \
+    IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { )                                    \
+      (head) = (add);                                                            \
+    IF_HASH_NONFATAL_OOM( } )                                                    \
+  } else {                                                                       \
+    (add)->hh.tbl = (head)->hh.tbl;                                              \
+    HASH_APPEND_LIST(hh, head, add);                                             \
+  }                                                                              \
+  HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed);       \
+  HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE");                            \
+} while (0)
+
+#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add)                            \
+do {                                                                             \
+  unsigned _ha_hashv;                                                            \
+  HASH_VALUE(keyptr, keylen_in, _ha_hashv);                                      \
+  HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, keyptr, keylen_in, _ha_hashv, add);      \
+} while (0)
+
+#define HASH_ADD_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add)            \
+  HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add)
+
+#define HASH_ADD(hh,head,fieldname,keylen_in,add)                                \
+  HASH_ADD_KEYPTR(hh, head, &((add)->fieldname), keylen_in, add)
+
+#define HASH_TO_BKT(hashv,num_bkts,bkt)                                          \
+do {                                                                             \
+  bkt = ((hashv) & ((num_bkts) - 1U));                                           \
+} while (0)
+
+/* delete "delptr" from the hash table.
+ * "the usual" patch-up process for the app-order doubly-linked-list.
+ * The use of _hd_hh_del below deserves special explanation.
+ * These used to be expressed using (delptr) but that led to a bug
+ * if someone used the same symbol for the head and deletee, like
+ *  HASH_DELETE(hh,users,users);
+ * We want that to work, but by changing the head (users) below
+ * we were forfeiting our ability to further refer to the deletee (users)
+ * in the patch-up process. Solution: use scratch space to
+ * copy the deletee pointer, then the latter references are via that
+ * scratch pointer rather than through the repointed (users) symbol.
+ */
+#define HASH_DELETE(hh,head,delptr)                                              \
+    HASH_DELETE_HH(hh, head, &(delptr)->hh)
+
+#define HASH_DELETE_HH(hh,head,delptrhh)                                         \
+do {                                                                             \
+  struct UT_hash_handle *_hd_hh_del = (delptrhh);                                \
+  if ((_hd_hh_del->prev == NULL) && (_hd_hh_del->next == NULL)) {                \
+    HASH_BLOOM_FREE((head)->hh.tbl);                                             \
+    uthash_free((head)->hh.tbl->buckets,                                         \
+                (head)->hh.tbl->num_buckets * sizeof(struct UT_hash_bucket));    \
+    uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                          \
+    (head) = NULL;                                                               \
+  } else {                                                                       \
+    unsigned _hd_bkt;                                                            \
+    if (_hd_hh_del == (head)->hh.tbl->tail) {                                    \
+      (head)->hh.tbl->tail = HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev);     \
+    }                                                                            \
+    if (_hd_hh_del->prev != NULL) {                                              \
+      HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev)->next = _hd_hh_del->next;   \
+    } else {                                                                     \
+      DECLTYPE_ASSIGN(head, _hd_hh_del->next);                                   \
+    }                                                                            \
+    if (_hd_hh_del->next != NULL) {                                              \
+      HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->next)->prev = _hd_hh_del->prev;   \
+    }                                                                            \
+    HASH_TO_BKT(_hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt);        \
+    HASH_DEL_IN_BKT((head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del);               \
+    (head)->hh.tbl->num_items--;                                                 \
+  }                                                                              \
+  HASH_FSCK(hh, head, "HASH_DELETE_HH");                                         \
+} while (0)
+
+/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
+#define HASH_FIND_STR(head,findstr,out)                                          \
+    HASH_FIND(hh,head,findstr,(unsigned)uthash_strlen(findstr),out)
+#define HASH_ADD_STR(head,strfield,add)                                          \
+    HASH_ADD(hh,head,strfield[0],(unsigned)uthash_strlen(add->strfield),add)
+#define HASH_REPLACE_STR(head,strfield,add,replaced)                             \
+    HASH_REPLACE(hh,head,strfield[0],(unsigned)uthash_strlen(add->strfield),add,replaced)
+#define HASH_FIND_INT(head,findint,out)                                          \
+    HASH_FIND(hh,head,findint,sizeof(int),out)
+#define HASH_ADD_INT(head,intfield,add)                                          \
+    HASH_ADD(hh,head,intfield,sizeof(int),add)
+#define HASH_REPLACE_INT(head,intfield,add,replaced)                             \
+    HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced)
+#define HASH_FIND_PTR(head,findptr,out)                                          \
+    HASH_FIND(hh,head,findptr,sizeof(void *),out)
+#define HASH_ADD_PTR(head,ptrfield,add)                                          \
+    HASH_ADD(hh,head,ptrfield,sizeof(void *),add)
+#define HASH_REPLACE_PTR(head,ptrfield,add,replaced)                             \
+    HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced)
+#define HASH_DEL(head,delptr)                                                    \
+    HASH_DELETE(hh,head,delptr)
+
+/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined.
+ * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined.
+ */
+#ifdef HASH_DEBUG
+#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
+#define HASH_FSCK(hh,head,where)                                                 \
+do {                                                                             \
+  struct UT_hash_handle *_thh;                                                   \
+  if (head) {                                                                    \
+    unsigned _bkt_i;                                                             \
+    unsigned _count = 0;                                                         \
+    char *_prev;                                                                 \
+    for (_bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; ++_bkt_i) {           \
+      unsigned _bkt_count = 0;                                                   \
+      _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head;                            \
+      _prev = NULL;                                                              \
+      while (_thh) {                                                             \
+        if (_prev != (char*)(_thh->hh_prev)) {                                   \
+          HASH_OOPS("%s: invalid hh_prev %p, actual %p\n",                       \
+              (where), (void*)_thh->hh_prev, (void*)_prev);                      \
+        }                                                                        \
+        _bkt_count++;                                                            \
+        _prev = (char*)(_thh);                                                   \
+        _thh = _thh->hh_next;                                                    \
+      }                                                                          \
+      _count += _bkt_count;                                                      \
+      if ((head)->hh.tbl->buckets[_bkt_i].count !=  _bkt_count) {                \
+        HASH_OOPS("%s: invalid bucket count %u, actual %u\n",                    \
+            (where), (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count);         \
+      }                                                                          \
+    }                                                                            \
+    if (_count != (head)->hh.tbl->num_items) {                                   \
+      HASH_OOPS("%s: invalid hh item count %u, actual %u\n",                     \
+          (where), (head)->hh.tbl->num_items, _count);                           \
+    }                                                                            \
+    _count = 0;                                                                  \
+    _prev = NULL;                                                                \
+    _thh =  &(head)->hh;                                                         \
+    while (_thh) {                                                               \
+      _count++;                                                                  \
+      if (_prev != (char*)_thh->prev) {                                          \
+        HASH_OOPS("%s: invalid prev %p, actual %p\n",                            \
+            (where), (void*)_thh->prev, (void*)_prev);                           \
+      }                                                                          \
+      _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh);                         \
+      _thh = (_thh->next ? HH_FROM_ELMT((head)->hh.tbl, _thh->next) : NULL);     \
+    }                                                                            \
+    if (_count != (head)->hh.tbl->num_items) {                                   \
+      HASH_OOPS("%s: invalid app item count %u, actual %u\n",                    \
+          (where), (head)->hh.tbl->num_items, _count);                           \
+    }                                                                            \
+  }                                                                              \
+} while (0)
+#else
+#define HASH_FSCK(hh,head,where)
+#endif
+
+/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to
+ * the descriptor to which this macro is defined for tuning the hash function.
+ * The app can #include <unistd.h> to get the prototype for write(2). */
+#ifdef HASH_EMIT_KEYS
+#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                                   \
+do {                                                                             \
+  unsigned _klen = fieldlen;                                                     \
+  write(HASH_EMIT_KEYS, &_klen, sizeof(_klen));                                  \
+  write(HASH_EMIT_KEYS, keyptr, (unsigned long)fieldlen);                        \
+} while (0)
+#else
+#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)
+#endif
+
+/* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */
+#ifdef HASH_FUNCTION
+#define HASH_FCN HASH_FUNCTION
+#else
+#define HASH_FCN HASH_JEN
+#endif
+
+/* The Bernstein hash function, used in Perl prior to v5.6. Note (x<<5+x)=x*33. */
+#define HASH_BER(key,keylen,hashv)                                               \
+do {                                                                             \
+  unsigned _hb_keylen = (unsigned)keylen;                                        \
+  const unsigned char *_hb_key = (const unsigned char*)(key);                    \
+  (hashv) = 0;                                                                   \
+  while (_hb_keylen-- != 0U) {                                                   \
+    (hashv) = (((hashv) << 5) + (hashv)) + *_hb_key++;                           \
+  }                                                                              \
+} while (0)
+
+
+/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at
+ * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */
+#define HASH_SAX(key,keylen,hashv)                                               \
+do {                                                                             \
+  unsigned _sx_i;                                                                \
+  const unsigned char *_hs_key = (const unsigned char*)(key);                    \
+  hashv = 0;                                                                     \
+  for (_sx_i=0; _sx_i < keylen; _sx_i++) {                                       \
+    hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i];                       \
+  }                                                                              \
+} while (0)
+/* FNV-1a variation */
+#define HASH_FNV(key,keylen,hashv)                                               \
+do {                                                                             \
+  unsigned _fn_i;                                                                \
+  const unsigned char *_hf_key = (const unsigned char*)(key);                    \
+  (hashv) = 2166136261U;                                                         \
+  for (_fn_i=0; _fn_i < keylen; _fn_i++) {                                       \
+    hashv = hashv ^ _hf_key[_fn_i];                                              \
+    hashv = hashv * 16777619U;                                                   \
+  }                                                                              \
+} while (0)
+
+#define HASH_OAT(key,keylen,hashv)                                               \
+do {                                                                             \
+  unsigned _ho_i;                                                                \
+  const unsigned char *_ho_key=(const unsigned char*)(key);                      \
+  hashv = 0;                                                                     \
+  for(_ho_i=0; _ho_i < keylen; _ho_i++) {                                        \
+      hashv += _ho_key[_ho_i];                                                   \
+      hashv += (hashv << 10);                                                    \
+      hashv ^= (hashv >> 6);                                                     \
+  }                                                                              \
+  hashv += (hashv << 3);                                                         \
+  hashv ^= (hashv >> 11);                                                        \
+  hashv += (hashv << 15);                                                        \
+} while (0)
+
+#define HASH_JEN_MIX(a,b,c)                                                      \
+do {                                                                             \
+  a -= b; a -= c; a ^= ( c >> 13 );                                              \
+  b -= c; b -= a; b ^= ( a << 8 );                                               \
+  c -= a; c -= b; c ^= ( b >> 13 );                                              \
+  a -= b; a -= c; a ^= ( c >> 12 );                                              \
+  b -= c; b -= a; b ^= ( a << 16 );                                              \
+  c -= a; c -= b; c ^= ( b >> 5 );                                               \
+  a -= b; a -= c; a ^= ( c >> 3 );                                               \
+  b -= c; b -= a; b ^= ( a << 10 );                                              \
+  c -= a; c -= b; c ^= ( b >> 15 );                                              \
+} while (0)
+
+#define HASH_JEN(key,keylen,hashv)                                               \
+do {                                                                             \
+  unsigned _hj_i,_hj_j,_hj_k;                                                    \
+  unsigned const char *_hj_key=(unsigned const char*)(key);                      \
+  hashv = 0xfeedbeefu;                                                           \
+  _hj_i = _hj_j = 0x9e3779b9u;                                                   \
+  _hj_k = (unsigned)(keylen);                                                    \
+  while (_hj_k >= 12U) {                                                         \
+    _hj_i +=    (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 )                      \
+        + ( (unsigned)_hj_key[2] << 16 )                                         \
+        + ( (unsigned)_hj_key[3] << 24 ) );                                      \
+    _hj_j +=    (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 )                      \
+        + ( (unsigned)_hj_key[6] << 16 )                                         \
+        + ( (unsigned)_hj_key[7] << 24 ) );                                      \
+    hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 )                         \
+        + ( (unsigned)_hj_key[10] << 16 )                                        \
+        + ( (unsigned)_hj_key[11] << 24 ) );                                     \
+                                                                                 \
+     HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                          \
+                                                                                 \
+     _hj_key += 12;                                                              \
+     _hj_k -= 12U;                                                               \
+  }                                                                              \
+  hashv += (unsigned)(keylen);                                                   \
+  switch ( _hj_k ) {                                                             \
+    case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); /* FALLTHROUGH */         \
+    case 10: hashv += ( (unsigned)_hj_key[9] << 16 );  /* FALLTHROUGH */         \
+    case 9:  hashv += ( (unsigned)_hj_key[8] << 8 );   /* FALLTHROUGH */         \
+    case 8:  _hj_j += ( (unsigned)_hj_key[7] << 24 );  /* FALLTHROUGH */         \
+    case 7:  _hj_j += ( (unsigned)_hj_key[6] << 16 );  /* FALLTHROUGH */         \
+    case 6:  _hj_j += ( (unsigned)_hj_key[5] << 8 );   /* FALLTHROUGH */         \
+    case 5:  _hj_j += _hj_key[4];                      /* FALLTHROUGH */         \
+    case 4:  _hj_i += ( (unsigned)_hj_key[3] << 24 );  /* FALLTHROUGH */         \
+    case 3:  _hj_i += ( (unsigned)_hj_key[2] << 16 );  /* FALLTHROUGH */         \
+    case 2:  _hj_i += ( (unsigned)_hj_key[1] << 8 );   /* FALLTHROUGH */         \
+    case 1:  _hj_i += _hj_key[0];                                                \
+  }                                                                              \
+  HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                             \
+} while (0)
+
+/* The Paul Hsieh hash function */
+#undef get16bits
+#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__)             \
+  || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
+#define get16bits(d) (*((const uint16_t *) (d)))
+#endif
+
+#if !defined (get16bits)
+#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)             \
+                       +(uint32_t)(((const uint8_t *)(d))[0]) )
+#endif
+#define HASH_SFH(key,keylen,hashv)                                               \
+do {                                                                             \
+  unsigned const char *_sfh_key=(unsigned const char*)(key);                     \
+  uint32_t _sfh_tmp, _sfh_len = (uint32_t)keylen;                                \
+                                                                                 \
+  unsigned _sfh_rem = _sfh_len & 3U;                                             \
+  _sfh_len >>= 2;                                                                \
+  hashv = 0xcafebabeu;                                                           \
+                                                                                 \
+  /* Main loop */                                                                \
+  for (;_sfh_len > 0U; _sfh_len--) {                                             \
+    hashv    += get16bits (_sfh_key);                                            \
+    _sfh_tmp  = ((uint32_t)(get16bits (_sfh_key+2)) << 11) ^ hashv;              \
+    hashv     = (hashv << 16) ^ _sfh_tmp;                                        \
+    _sfh_key += 2U*sizeof (uint16_t);                                            \
+    hashv    += hashv >> 11;                                                     \
+  }                                                                              \
+                                                                                 \
+  /* Handle end cases */                                                         \
+  switch (_sfh_rem) {                                                            \
+    case 3: hashv += get16bits (_sfh_key);                                       \
+            hashv ^= hashv << 16;                                                \
+            hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)]) << 18;              \
+            hashv += hashv >> 11;                                                \
+            break;                                                               \
+    case 2: hashv += get16bits (_sfh_key);                                       \
+            hashv ^= hashv << 11;                                                \
+            hashv += hashv >> 17;                                                \
+            break;                                                               \
+    case 1: hashv += *_sfh_key;                                                  \
+            hashv ^= hashv << 10;                                                \
+            hashv += hashv >> 1;                                                 \
+  }                                                                              \
+                                                                                 \
+  /* Force "avalanching" of final 127 bits */                                    \
+  hashv ^= hashv << 3;                                                           \
+  hashv += hashv >> 5;                                                           \
+  hashv ^= hashv << 4;                                                           \
+  hashv += hashv >> 17;                                                          \
+  hashv ^= hashv << 25;                                                          \
+  hashv += hashv >> 6;                                                           \
+} while (0)
+
+#ifdef HASH_USING_NO_STRICT_ALIASING
+/* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads.
+ * For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error.
+ * MurmurHash uses the faster approach only on CPU's where we know it's safe.
+ *
+ * Note the preprocessor built-in defines can be emitted using:
+ *
+ *   gcc -m64 -dM -E - < /dev/null                  (on gcc)
+ *   cc -## a.c (where a.c is a simple test file)   (Sun Studio)
+ */
+#if (defined(__i386__) || defined(__x86_64__)  || defined(_M_IX86))
+#define MUR_GETBLOCK(p,i) p[i]
+#else /* non intel */
+#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 3UL) == 0UL)
+#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 3UL) == 1UL)
+#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 3UL) == 2UL)
+#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 3UL) == 3UL)
+#define WP(p) ((uint32_t*)((unsigned long)(p) & ~3UL))
+#if (defined(__BIG_ENDIAN__) || defined(SPARC) || defined(__ppc__) || defined(__ppc64__))
+#define MUR_THREE_ONE(p) ((((*WP(p))&0x00ffffff) << 8) | (((*(WP(p)+1))&0xff000000) >> 24))
+#define MUR_TWO_TWO(p)   ((((*WP(p))&0x0000ffff) <<16) | (((*(WP(p)+1))&0xffff0000) >> 16))
+#define MUR_ONE_THREE(p) ((((*WP(p))&0x000000ff) <<24) | (((*(WP(p)+1))&0xffffff00) >>  8))
+#else /* assume little endian non-intel */
+#define MUR_THREE_ONE(p) ((((*WP(p))&0xffffff00) >> 8) | (((*(WP(p)+1))&0x000000ff) << 24))
+#define MUR_TWO_TWO(p)   ((((*WP(p))&0xffff0000) >>16) | (((*(WP(p)+1))&0x0000ffff) << 16))
+#define MUR_ONE_THREE(p) ((((*WP(p))&0xff000000) >>24) | (((*(WP(p)+1))&0x00ffffff) <<  8))
+#endif
+#define MUR_GETBLOCK(p,i) (MUR_PLUS0_ALIGNED(p) ? ((p)[i]) :           \
+                            (MUR_PLUS1_ALIGNED(p) ? MUR_THREE_ONE(p) : \
+                             (MUR_PLUS2_ALIGNED(p) ? MUR_TWO_TWO(p) :  \
+                                                      MUR_ONE_THREE(p))))
+#endif
+#define MUR_ROTL32(x,r) (((x) << (r)) | ((x) >> (32 - (r))))
+#define MUR_FMIX(_h) \
+do {                 \
+  _h ^= _h >> 16;    \
+  _h *= 0x85ebca6bu; \
+  _h ^= _h >> 13;    \
+  _h *= 0xc2b2ae35u; \
+  _h ^= _h >> 16;    \
+} while (0)
+
+#define HASH_MUR(key,keylen,hashv)                                     \
+do {                                                                   \
+  const uint8_t *_mur_data = (const uint8_t*)(key);                    \
+  const int _mur_nblocks = (int)(keylen) / 4;                          \
+  uint32_t _mur_h1 = 0xf88D5353u;                                      \
+  uint32_t _mur_c1 = 0xcc9e2d51u;                                      \
+  uint32_t _mur_c2 = 0x1b873593u;                                      \
+  uint32_t _mur_k1 = 0;                                                \
+  const uint8_t *_mur_tail;                                            \
+  const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+(_mur_nblocks*4)); \
+  int _mur_i;                                                          \
+  for (_mur_i = -_mur_nblocks; _mur_i != 0; _mur_i++) {                \
+    _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i);                        \
+    _mur_k1 *= _mur_c1;                                                \
+    _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
+    _mur_k1 *= _mur_c2;                                                \
+                                                                       \
+    _mur_h1 ^= _mur_k1;                                                \
+    _mur_h1 = MUR_ROTL32(_mur_h1,13);                                  \
+    _mur_h1 = (_mur_h1*5U) + 0xe6546b64u;                              \
+  }                                                                    \
+  _mur_tail = (const uint8_t*)(_mur_data + (_mur_nblocks*4));          \
+  _mur_k1=0;                                                           \
+  switch ((keylen) & 3U) {                                             \
+    case 0: break;                                                     \
+    case 3: _mur_k1 ^= (uint32_t)_mur_tail[2] << 16; /* FALLTHROUGH */ \
+    case 2: _mur_k1 ^= (uint32_t)_mur_tail[1] << 8;  /* FALLTHROUGH */ \
+    case 1: _mur_k1 ^= (uint32_t)_mur_tail[0];                         \
+    _mur_k1 *= _mur_c1;                                                \
+    _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
+    _mur_k1 *= _mur_c2;                                                \
+    _mur_h1 ^= _mur_k1;                                                \
+  }                                                                    \
+  _mur_h1 ^= (uint32_t)(keylen);                                       \
+  MUR_FMIX(_mur_h1);                                                   \
+  hashv = _mur_h1;                                                     \
+} while (0)
+#endif  /* HASH_USING_NO_STRICT_ALIASING */
+
+/* iterate over items in a known bucket to find desired item */
+#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,hashval,out)               \
+do {                                                                             \
+  if ((head).hh_head != NULL) {                                                  \
+    DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (head).hh_head));                     \
+  } else {                                                                       \
+    (out) = NULL;                                                                \
+  }                                                                              \
+  while ((out) != NULL) {                                                        \
+    if ((out)->hh.hashv == (hashval) && (out)->hh.keylen == (keylen_in)) {       \
+      if (uthash_memcmp((out)->hh.key, keyptr, keylen_in) == 0) {                \
+        break;                                                                   \
+      }                                                                          \
+    }                                                                            \
+    if ((out)->hh.hh_next != NULL) {                                             \
+      DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (out)->hh.hh_next));                \
+    } else {                                                                     \
+      (out) = NULL;                                                              \
+    }                                                                            \
+  }                                                                              \
+} while (0)
+
+/* add an item to a bucket  */
+#define HASH_ADD_TO_BKT(head,hh,addhh,oomed)                                     \
+do {                                                                             \
+  UT_hash_bucket *_ha_head = &(head);                                            \
+  _ha_head->count++;                                                             \
+  (addhh)->hh_next = _ha_head->hh_head;                                          \
+  (addhh)->hh_prev = NULL;                                                       \
+  if (_ha_head->hh_head != NULL) {                                               \
+    _ha_head->hh_head->hh_prev = (addhh);                                        \
+  }                                                                              \
+  _ha_head->hh_head = (addhh);                                                   \
+  if ((_ha_head->count >= ((_ha_head->expand_mult + 1U) * HASH_BKT_CAPACITY_THRESH)) \
+      && !(addhh)->tbl->noexpand) {                                              \
+    HASH_EXPAND_BUCKETS(addhh,(addhh)->tbl, oomed);                              \
+    IF_HASH_NONFATAL_OOM(                                                        \
+      if (oomed) {                                                               \
+        HASH_DEL_IN_BKT(head,addhh);                                             \
+      }                                                                          \
+    )                                                                            \
+  }                                                                              \
+} while (0)
+
+/* remove an item from a given bucket */
+#define HASH_DEL_IN_BKT(head,delhh)                                              \
+do {                                                                             \
+  UT_hash_bucket *_hd_head = &(head);                                            \
+  _hd_head->count--;                                                             \
+  if (_hd_head->hh_head == (delhh)) {                                            \
+    _hd_head->hh_head = (delhh)->hh_next;                                        \
+  }                                                                              \
+  if ((delhh)->hh_prev) {                                                        \
+    (delhh)->hh_prev->hh_next = (delhh)->hh_next;                                \
+  }                                                                              \
+  if ((delhh)->hh_next) {                                                        \
+    (delhh)->hh_next->hh_prev = (delhh)->hh_prev;                                \
+  }                                                                              \
+} while (0)
+
+/* Bucket expansion has the effect of doubling the number of buckets
+ * and redistributing the items into the new buckets. Ideally the
+ * items will distribute more or less evenly into the new buckets
+ * (the extent to which this is true is a measure of the quality of
+ * the hash function as it applies to the key domain).
+ *
+ * With the items distributed into more buckets, the chain length
+ * (item count) in each bucket is reduced. Thus by expanding buckets
+ * the hash keeps a bound on the chain length. This bounded chain
+ * length is the essence of how a hash provides constant time lookup.
+ *
+ * The calculation of tbl->ideal_chain_maxlen below deserves some
+ * explanation. First, keep in mind that we're calculating the ideal
+ * maximum chain length based on the *new* (doubled) bucket count.
+ * In fractions this is just n/b (n=number of items,b=new num buckets).
+ * Since the ideal chain length is an integer, we want to calculate
+ * ceil(n/b). We don't depend on floating point arithmetic in this
+ * hash, so to calculate ceil(n/b) with integers we could write
+ *
+ *      ceil(n/b) = (n/b) + ((n%b)?1:0)
+ *
+ * and in fact a previous version of this hash did just that.
+ * But now we have improved things a bit by recognizing that b is
+ * always a power of two. We keep its base 2 log handy (call it lb),
+ * so now we can write this with a bit shift and logical AND:
+ *
+ *      ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0)
+ *
+ */
+#define HASH_EXPAND_BUCKETS(hh,tbl,oomed)                                        \
+do {                                                                             \
+  unsigned _he_bkt;                                                              \
+  unsigned _he_bkt_i;                                                            \
+  struct UT_hash_handle *_he_thh, *_he_hh_nxt;                                   \
+  UT_hash_bucket *_he_new_buckets, *_he_newbkt;                                  \
+  _he_new_buckets = (UT_hash_bucket*)uthash_malloc(                              \
+           2UL * (tbl)->num_buckets * sizeof(struct UT_hash_bucket));            \
+  if (!_he_new_buckets) {                                                        \
+    HASH_RECORD_OOM(oomed);                                                      \
+  } else {                                                                       \
+    uthash_bzero(_he_new_buckets,                                                \
+        2UL * (tbl)->num_buckets * sizeof(struct UT_hash_bucket));               \
+    (tbl)->ideal_chain_maxlen =                                                  \
+       ((tbl)->num_items >> ((tbl)->log2_num_buckets+1U)) +                      \
+       ((((tbl)->num_items & (((tbl)->num_buckets*2U)-1U)) != 0U) ? 1U : 0U);    \
+    (tbl)->nonideal_items = 0;                                                   \
+    for (_he_bkt_i = 0; _he_bkt_i < (tbl)->num_buckets; _he_bkt_i++) {           \
+      _he_thh = (tbl)->buckets[ _he_bkt_i ].hh_head;                             \
+      while (_he_thh != NULL) {                                                  \
+        _he_hh_nxt = _he_thh->hh_next;                                           \
+        HASH_TO_BKT(_he_thh->hashv, (tbl)->num_buckets * 2U, _he_bkt);           \
+        _he_newbkt = &(_he_new_buckets[_he_bkt]);                                \
+        if (++(_he_newbkt->count) > (tbl)->ideal_chain_maxlen) {                 \
+          (tbl)->nonideal_items++;                                               \
+          _he_newbkt->expand_mult = _he_newbkt->count / (tbl)->ideal_chain_maxlen; \
+        }                                                                        \
+        _he_thh->hh_prev = NULL;                                                 \
+        _he_thh->hh_next = _he_newbkt->hh_head;                                  \
+        if (_he_newbkt->hh_head != NULL) {                                       \
+          _he_newbkt->hh_head->hh_prev = _he_thh;                                \
+        }                                                                        \
+        _he_newbkt->hh_head = _he_thh;                                           \
+        _he_thh = _he_hh_nxt;                                                    \
+      }                                                                          \
+    }                                                                            \
+    uthash_free((tbl)->buckets, (tbl)->num_buckets * sizeof(struct UT_hash_bucket)); \
+    (tbl)->num_buckets *= 2U;                                                    \
+    (tbl)->log2_num_buckets++;                                                   \
+    (tbl)->buckets = _he_new_buckets;                                            \
+    (tbl)->ineff_expands = ((tbl)->nonideal_items > ((tbl)->num_items >> 1)) ?   \
+        ((tbl)->ineff_expands+1U) : 0U;                                          \
+    if ((tbl)->ineff_expands > 1U) {                                             \
+      (tbl)->noexpand = 1;                                                       \
+      uthash_noexpand_fyi(tbl);                                                  \
+    }                                                                            \
+    uthash_expand_fyi(tbl);                                                      \
+  }                                                                              \
+} while (0)
+
+
+/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
+/* Note that HASH_SORT assumes the hash handle name to be hh.
+ * HASH_SRT was added to allow the hash handle name to be passed in. */
+#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn)
+#define HASH_SRT(hh,head,cmpfcn)                                                 \
+do {                                                                             \
+  unsigned _hs_i;                                                                \
+  unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize;               \
+  struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail;            \
+  if (head != NULL) {                                                            \
+    _hs_insize = 1;                                                              \
+    _hs_looping = 1;                                                             \
+    _hs_list = &((head)->hh);                                                    \
+    while (_hs_looping != 0U) {                                                  \
+      _hs_p = _hs_list;                                                          \
+      _hs_list = NULL;                                                           \
+      _hs_tail = NULL;                                                           \
+      _hs_nmerges = 0;                                                           \
+      while (_hs_p != NULL) {                                                    \
+        _hs_nmerges++;                                                           \
+        _hs_q = _hs_p;                                                           \
+        _hs_psize = 0;                                                           \
+        for (_hs_i = 0; _hs_i < _hs_insize; ++_hs_i) {                           \
+          _hs_psize++;                                                           \
+          _hs_q = ((_hs_q->next != NULL) ?                                       \
+            HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL);                   \
+          if (_hs_q == NULL) {                                                   \
+            break;                                                               \
+          }                                                                      \
+        }                                                                        \
+        _hs_qsize = _hs_insize;                                                  \
+        while ((_hs_psize != 0U) || ((_hs_qsize != 0U) && (_hs_q != NULL))) {    \
+          if (_hs_psize == 0U) {                                                 \
+            _hs_e = _hs_q;                                                       \
+            _hs_q = ((_hs_q->next != NULL) ?                                     \
+              HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL);                 \
+            _hs_qsize--;                                                         \
+          } else if ((_hs_qsize == 0U) || (_hs_q == NULL)) {                     \
+            _hs_e = _hs_p;                                                       \
+            if (_hs_p != NULL) {                                                 \
+              _hs_p = ((_hs_p->next != NULL) ?                                   \
+                HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL);               \
+            }                                                                    \
+            _hs_psize--;                                                         \
+          } else if ((cmpfcn(                                                    \
+                DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_p)),             \
+                DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_q))              \
+                )) <= 0) {                                                       \
+            _hs_e = _hs_p;                                                       \
+            if (_hs_p != NULL) {                                                 \
+              _hs_p = ((_hs_p->next != NULL) ?                                   \
+                HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL);               \
+            }                                                                    \
+            _hs_psize--;                                                         \
+          } else {                                                               \
+            _hs_e = _hs_q;                                                       \
+            _hs_q = ((_hs_q->next != NULL) ?                                     \
+              HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL);                 \
+            _hs_qsize--;                                                         \
+          }                                                                      \
+          if ( _hs_tail != NULL ) {                                              \
+            _hs_tail->next = ((_hs_e != NULL) ?                                  \
+              ELMT_FROM_HH((head)->hh.tbl, _hs_e) : NULL);                       \
+          } else {                                                               \
+            _hs_list = _hs_e;                                                    \
+          }                                                                      \
+          if (_hs_e != NULL) {                                                   \
+            _hs_e->prev = ((_hs_tail != NULL) ?                                  \
+              ELMT_FROM_HH((head)->hh.tbl, _hs_tail) : NULL);                    \
+          }                                                                      \
+          _hs_tail = _hs_e;                                                      \
+        }                                                                        \
+        _hs_p = _hs_q;                                                           \
+      }                                                                          \
+      if (_hs_tail != NULL) {                                                    \
+        _hs_tail->next = NULL;                                                   \
+      }                                                                          \
+      if (_hs_nmerges <= 1U) {                                                   \
+        _hs_looping = 0;                                                         \
+        (head)->hh.tbl->tail = _hs_tail;                                         \
+        DECLTYPE_ASSIGN(head, ELMT_FROM_HH((head)->hh.tbl, _hs_list));           \
+      }                                                                          \
+      _hs_insize *= 2U;                                                          \
+    }                                                                            \
+    HASH_FSCK(hh, head, "HASH_SRT");                                             \
+  }                                                                              \
+} while (0)
+
+/* This function selects items from one hash into another hash.
+ * The end result is that the selected items have dual presence
+ * in both hashes. There is no copy of the items made; rather
+ * they are added into the new hash through a secondary hash
+ * hash handle that must be present in the structure. */
+#define HASH_SELECT(hh_dst, dst, hh_src, src, cond)                              \
+do {                                                                             \
+  unsigned _src_bkt, _dst_bkt;                                                   \
+  void *_last_elt = NULL, *_elt;                                                 \
+  UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL;                         \
+  ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst));                 \
+  if ((src) != NULL) {                                                           \
+    for (_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) {    \
+      for (_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head;               \
+        _src_hh != NULL;                                                         \
+        _src_hh = _src_hh->hh_next) {                                            \
+        _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh);                         \
+        if (cond(_elt)) {                                                        \
+          IF_HASH_NONFATAL_OOM( int _hs_oomed = 0; )                             \
+          _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho);                 \
+          _dst_hh->key = _src_hh->key;                                           \
+          _dst_hh->keylen = _src_hh->keylen;                                     \
+          _dst_hh->hashv = _src_hh->hashv;                                       \
+          _dst_hh->prev = _last_elt;                                             \
+          _dst_hh->next = NULL;                                                  \
+          if (_last_elt_hh != NULL) {                                            \
+            _last_elt_hh->next = _elt;                                           \
+          }                                                                      \
+          if ((dst) == NULL) {                                                   \
+            DECLTYPE_ASSIGN(dst, _elt);                                          \
+            HASH_MAKE_TABLE(hh_dst, dst, _hs_oomed);                             \
+            IF_HASH_NONFATAL_OOM(                                                \
+              if (_hs_oomed) {                                                   \
+                uthash_nonfatal_oom(_elt);                                       \
+                (dst) = NULL;                                                    \
+                continue;                                                        \
+              }                                                                  \
+            )                                                                    \
+          } else {                                                               \
+            _dst_hh->tbl = (dst)->hh_dst.tbl;                                    \
+          }                                                                      \
+          HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt);      \
+          HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt], hh_dst, _dst_hh, _hs_oomed); \
+          (dst)->hh_dst.tbl->num_items++;                                        \
+          IF_HASH_NONFATAL_OOM(                                                  \
+            if (_hs_oomed) {                                                     \
+              HASH_ROLLBACK_BKT(hh_dst, dst, _dst_hh);                           \
+              HASH_DELETE_HH(hh_dst, dst, _dst_hh);                              \
+              _dst_hh->tbl = NULL;                                               \
+              uthash_nonfatal_oom(_elt);                                         \
+              continue;                                                          \
+            }                                                                    \
+          )                                                                      \
+          HASH_BLOOM_ADD(_dst_hh->tbl, _dst_hh->hashv);                          \
+          _last_elt = _elt;                                                      \
+          _last_elt_hh = _dst_hh;                                                \
+        }                                                                        \
+      }                                                                          \
+    }                                                                            \
+  }                                                                              \
+  HASH_FSCK(hh_dst, dst, "HASH_SELECT");                                         \
+} while (0)
+
+#define HASH_CLEAR(hh,head)                                                      \
+do {                                                                             \
+  if ((head) != NULL) {                                                          \
+    HASH_BLOOM_FREE((head)->hh.tbl);                                             \
+    uthash_free((head)->hh.tbl->buckets,                                         \
+                (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket));      \
+    uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                          \
+    (head) = NULL;                                                               \
+  }                                                                              \
+} while (0)
+
+#define HASH_OVERHEAD(hh,head)                                                   \
+ (((head) != NULL) ? (                                                           \
+ (size_t)(((head)->hh.tbl->num_items   * sizeof(UT_hash_handle))   +             \
+          ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket))   +             \
+           sizeof(UT_hash_table)                                   +             \
+           (HASH_BLOOM_BYTELEN))) : 0U)
+
+#ifdef NO_DECLTYPE
+#define HASH_ITER(hh,head,el,tmp)                                                \
+for(((el)=(head)), ((*(char**)(&(tmp)))=(char*)((head!=NULL)?(head)->hh.next:NULL)); \
+  (el) != NULL; ((el)=(tmp)), ((*(char**)(&(tmp)))=(char*)((tmp!=NULL)?(tmp)->hh.next:NULL)))
+#else
+#define HASH_ITER(hh,head,el,tmp)                                                \
+for(((el)=(head)), ((tmp)=DECLTYPE(el)((head!=NULL)?(head)->hh.next:NULL));      \
+  (el) != NULL; ((el)=(tmp)), ((tmp)=DECLTYPE(el)((tmp!=NULL)?(tmp)->hh.next:NULL)))
+#endif
+
+/* obtain a count of items in the hash */
+#define HASH_COUNT(head) HASH_CNT(hh,head)
+#define HASH_CNT(hh,head) ((head != NULL)?((head)->hh.tbl->num_items):0U)
+
+typedef struct UT_hash_bucket {
+   struct UT_hash_handle *hh_head;
+   unsigned count;
+
+   /* expand_mult is normally set to 0. In this situation, the max chain length
+    * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If
+    * the bucket's chain exceeds this length, bucket expansion is triggered).
+    * However, setting expand_mult to a non-zero value delays bucket expansion
+    * (that would be triggered by additions to this particular bucket)
+    * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH.
+    * (The multiplier is simply expand_mult+1). The whole idea of this
+    * multiplier is to reduce bucket expansions, since they are expensive, in
+    * situations where we know that a particular bucket tends to be overused.
+    * It is better to let its chain length grow to a longer yet-still-bounded
+    * value, than to do an O(n) bucket expansion too often.
+    */
+   unsigned expand_mult;
+
+} UT_hash_bucket;
+
+/* random signature used only to find hash tables in external analysis */
+#define HASH_SIGNATURE 0xa0111fe1u
+#define HASH_BLOOM_SIGNATURE 0xb12220f2u
+
+typedef struct UT_hash_table {
+   UT_hash_bucket *buckets;
+   unsigned num_buckets, log2_num_buckets;
+   unsigned num_items;
+   struct UT_hash_handle *tail; /* tail hh in app order, for fast append    */
+   ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */
+
+   /* in an ideal situation (all buckets used equally), no bucket would have
+    * more than ceil(#items/#buckets) items. that's the ideal chain length. */
+   unsigned ideal_chain_maxlen;
+
+   /* nonideal_items is the number of items in the hash whose chain position
+    * exceeds the ideal chain maxlen. these items pay the penalty for an uneven
+    * hash distribution; reaching them in a chain traversal takes >ideal steps */
+   unsigned nonideal_items;
+
+   /* ineffective expands occur when a bucket doubling was performed, but
+    * afterward, more than half the items in the hash had nonideal chain
+    * positions. If this happens on two consecutive expansions we inhibit any
+    * further expansion, as it's not helping; this happens when the hash
+    * function isn't a good fit for the key domain. When expansion is inhibited
+    * the hash will still work, albeit no longer in constant time. */
+   unsigned ineff_expands, noexpand;
+
+   uint32_t signature; /* used only to find hash tables in external analysis */
+#ifdef HASH_BLOOM
+   uint32_t bloom_sig; /* used only to test bloom exists in external analysis */
+   uint8_t *bloom_bv;
+   uint8_t bloom_nbits;
+#endif
+
+} UT_hash_table;
+
+typedef struct UT_hash_handle {
+   struct UT_hash_table *tbl;
+   void *prev;                       /* prev element in app order      */
+   void *next;                       /* next element in app order      */
+   struct UT_hash_handle *hh_prev;   /* previous hh in bucket order    */
+   struct UT_hash_handle *hh_next;   /* next hh in bucket order        */
+   void *key;                        /* ptr to enclosing struct's key  */
+   unsigned keylen;                  /* enclosing struct's key len     */
+   unsigned hashv;                   /* result of hash-fcn(key)        */
+} UT_hash_handle;
+
+#endif /* UTHASH_H */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/hdr_histogram.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/hdr_histogram.c
new file mode 100644
index 0000000..e113470
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/hdr_histogram.c
@@ -0,0 +1,1015 @@
+/**
+ * hdr_histogram.c
+ * Written by Michael Barker and released to the public domain,
+ * as explained at http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+#include <nchan_module.h>
+#include <util/shmem.h>
+#include <store/memory/store.h>
+
+#include <math.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#include "hdr_histogram.h"
+
+//  ######   #######  ##     ## ##    ## ########  ######
+// ##    ## ##     ## ##     ## ###   ##    ##    ##    ##
+// ##       ##     ## ##     ## ####  ##    ##    ##
+// ##       ##     ## ##     ## ## ## ##    ##     ######
+// ##       ##     ## ##     ## ##  ####    ##          ##
+// ##    ## ##     ## ##     ## ##   ###    ##    ##    ##
+//  ######   #######   #######  ##    ##    ##     ######
+
+static int32_t normalize_index(const struct hdr_histogram* h, int32_t index)
+{
+    if (h->normalizing_index_offset == 0)
+    {
+        return index;
+    }
+
+    int32_t normalized_index = index - h->normalizing_index_offset;
+    int32_t adjustment = 0;
+
+    if (normalized_index < 0)
+    {
+        adjustment = h->counts_len;
+    }
+    else if (normalized_index >= h->counts_len)
+    {
+        adjustment = -h->counts_len;
+    }
+
+    return normalized_index + adjustment;
+}
+
+static int64_t counts_get_direct(const struct hdr_histogram* h, int32_t index)
+{
+    return h->counts[index];
+}
+
+static int64_t counts_get_normalised(const struct hdr_histogram* h, int32_t index)
+{
+    return counts_get_direct(h, normalize_index(h, index));
+}
+
+static void counts_inc_normalised(
+    struct hdr_histogram* h, int32_t index, int64_t value)
+{
+    int32_t normalised_index = normalize_index(h, index);
+    h->counts[normalised_index] += value;
+    h->total_count += value;
+}
+
+static void update_min_max(struct hdr_histogram* h, int64_t value)
+{
+    h->min_value = (value < h->min_value && value != 0) ? value : h->min_value;
+    h->max_value = (value > h->max_value) ? value : h->max_value;
+}
+
+// ##     ## ######## #### ##       #### ######## ##    ##
+// ##     ##    ##     ##  ##        ##     ##     ##  ##
+// ##     ##    ##     ##  ##        ##     ##      ####
+// ##     ##    ##     ##  ##        ##     ##       ##
+// ##     ##    ##     ##  ##        ##     ##       ##
+// ##     ##    ##     ##  ##        ##     ##       ##
+//  #######     ##    #### ######## ####    ##       ##
+
+static int64_t power(int64_t base, int64_t exp)
+{
+    int64_t result = 1;
+    while(exp)
+    {
+        result *= base; exp--;
+    }
+    return result;
+}
+
+#if defined(_MSC_VER)
+#pragma intrinsic(_BitScanReverse64)
+#endif
+
+static int32_t get_bucket_index(const struct hdr_histogram* h, int64_t value)
+{
+#if defined(_MSC_VER)
+    uint32_t leading_zero = 0;
+    _BitScanReverse64(&leading_zero, value | h->sub_bucket_mask);
+    int32_t pow2ceiling = 64 - (63 - leading_zero); // smallest power of 2 containing value
+#else
+    int32_t pow2ceiling = 64 - __builtin_clzll(value | h->sub_bucket_mask); // smallest power of 2 containing value
+#endif
+    return pow2ceiling - h->unit_magnitude - (h->sub_bucket_half_count_magnitude + 1);
+}
+
+static int32_t get_sub_bucket_index(int64_t value, int32_t bucket_index, int32_t unit_magnitude)
+{
+    return (int32_t)(value >> (bucket_index + unit_magnitude));
+}
+
+static int32_t counts_index(const struct hdr_histogram* h, int32_t bucket_index, int32_t sub_bucket_index)
+{
+    // Calculate the index for the first entry in the bucket:
+    // (The following is the equivalent of ((bucket_index + 1) * subBucketHalfCount) ):
+    int32_t bucket_base_index = (bucket_index + 1) << h->sub_bucket_half_count_magnitude;
+    // Calculate the offset in the bucket:
+    int32_t offset_in_bucket = sub_bucket_index - h->sub_bucket_half_count;
+    // The following is the equivalent of ((sub_bucket_index  - subBucketHalfCount) + bucketBaseIndex;
+    return bucket_base_index + offset_in_bucket;
+}
+
+static int64_t value_from_index(int32_t bucket_index, int32_t sub_bucket_index, int32_t unit_magnitude)
+{
+    return ((int64_t) sub_bucket_index) << (bucket_index + unit_magnitude);
+}
+
+static int32_t counts_index_for(const struct hdr_histogram* h, int64_t value)
+{
+    int32_t bucket_index     = get_bucket_index(h, value);
+    int32_t sub_bucket_index = get_sub_bucket_index(value, bucket_index, h->unit_magnitude);
+
+    return counts_index(h, bucket_index, sub_bucket_index);
+}
+
+int64_t hdr_value_at_index(const struct hdr_histogram *h, int32_t index)
+{
+    int32_t bucket_index = (index >> h->sub_bucket_half_count_magnitude) - 1;
+    int32_t sub_bucket_index = (index & (h->sub_bucket_half_count - 1)) + h->sub_bucket_half_count;
+
+    if (bucket_index < 0)
+    {
+        sub_bucket_index -= h->sub_bucket_half_count;
+        bucket_index = 0;
+    }
+
+    return value_from_index(bucket_index, sub_bucket_index, h->unit_magnitude);
+}
+
+int64_t hdr_size_of_equivalent_value_range(const struct hdr_histogram* h, int64_t value)
+{
+    int32_t bucket_index     = get_bucket_index(h, value);
+    int32_t sub_bucket_index = get_sub_bucket_index(value, bucket_index, h->unit_magnitude);
+    int32_t adjusted_bucket  = (sub_bucket_index >= h->sub_bucket_count) ? (bucket_index + 1) : bucket_index;
+    return INT64_C(1) << (h->unit_magnitude + adjusted_bucket);
+}
+
+static int64_t lowest_equivalent_value(const struct hdr_histogram* h, int64_t value)
+{
+    int32_t bucket_index     = get_bucket_index(h, value);
+    int32_t sub_bucket_index = get_sub_bucket_index(value, bucket_index, h->unit_magnitude);
+    return value_from_index(bucket_index, sub_bucket_index, h->unit_magnitude);
+}
+
+int64_t hdr_next_non_equivalent_value(const struct hdr_histogram *h, int64_t value)
+{
+    return lowest_equivalent_value(h, value) + hdr_size_of_equivalent_value_range(h, value);
+}
+
+static int64_t highest_equivalent_value(const struct hdr_histogram* h, int64_t value)
+{
+    return hdr_next_non_equivalent_value(h, value) - 1;
+}
+
+int64_t hdr_median_equivalent_value(const struct hdr_histogram *h, int64_t value)
+{
+    return lowest_equivalent_value(h, value) + (hdr_size_of_equivalent_value_range(h, value) >> 1);
+}
+
+static int64_t non_zero_min(const struct hdr_histogram* h)
+{
+    if (INT64_MAX == h->min_value)
+    {
+        return INT64_MAX;
+    }
+
+    return lowest_equivalent_value(h, h->min_value);
+}
+
+void hdr_reset_internal_counters(struct hdr_histogram* h)
+{
+    int min_non_zero_index = -1;
+    int max_index = -1;
+    int64_t observed_total_count = 0;
+    int i;
+
+    for (i = 0; i < h->counts_len; i++)
+    {
+        int64_t count_at_index;
+
+        if ((count_at_index = counts_get_direct(h, i)) > 0)
+        {
+            observed_total_count += count_at_index;
+            max_index = i;
+            if (min_non_zero_index == -1 && i != 0)
+            {
+                min_non_zero_index = i;
+            }
+        }
+    }
+
+    if (max_index == -1)
+    {
+        h->max_value = 0;
+    }
+    else
+    {
+        int64_t max_value = hdr_value_at_index(h, max_index);
+        h->max_value = highest_equivalent_value(h, max_value);
+    }
+
+    if (min_non_zero_index == -1)
+    {
+        h->min_value = INT64_MAX;
+    }
+    else
+    {
+        h->min_value = hdr_value_at_index(h, min_non_zero_index);
+    }
+
+    h->total_count = observed_total_count;
+}
+
+static int32_t buckets_needed_to_cover_value(int64_t value, int32_t sub_bucket_count, int32_t unit_magnitude)
+{
+    int64_t smallest_untrackable_value = ((int64_t) sub_bucket_count) << unit_magnitude;
+    int32_t buckets_needed = 1;
+    while (smallest_untrackable_value <= value)
+    {
+        if (smallest_untrackable_value > INT64_MAX / 2)
+        {
+            return buckets_needed + 1;
+        }
+        smallest_untrackable_value <<= 1;
+        buckets_needed++;
+    }
+
+    return buckets_needed;
+}
+
+// ##     ## ######## ##     ##  #######  ########  ##    ##
+// ###   ### ##       ###   ### ##     ## ##     ##  ##  ##
+// #### #### ##       #### #### ##     ## ##     ##   ####
+// ## ### ## ######   ## ### ## ##     ## ########     ##
+// ##     ## ##       ##     ## ##     ## ##   ##      ##
+// ##     ## ##       ##     ## ##     ## ##    ##     ##
+// ##     ## ######## ##     ##  #######  ##     ##    ##
+
+int hdr_calculate_bucket_config(
+        int64_t lowest_trackable_value,
+        int64_t highest_trackable_value,
+        int significant_figures,
+        struct hdr_histogram_bucket_config* cfg)
+{
+    if (lowest_trackable_value < 1 ||
+            significant_figures < 1 || 5 < significant_figures)
+    {
+        return EINVAL;
+    }
+    else if (lowest_trackable_value * 2 > highest_trackable_value)
+    {
+        return EINVAL;
+    }
+
+    cfg->lowest_trackable_value = lowest_trackable_value;
+    cfg->significant_figures = significant_figures;
+    cfg->highest_trackable_value = highest_trackable_value;
+
+    int64_t largest_value_with_single_unit_resolution = 2 * power(10, significant_figures);
+    int32_t sub_bucket_count_magnitude = (int32_t) ceil(log((double)largest_value_with_single_unit_resolution) / log(2));
+    cfg->sub_bucket_half_count_magnitude = ((sub_bucket_count_magnitude > 1) ? sub_bucket_count_magnitude : 1) - 1;
+
+    cfg->unit_magnitude = (int32_t) floor(log((double)lowest_trackable_value) / log(2));
+
+    cfg->sub_bucket_count      = (int32_t) pow(2, (cfg->sub_bucket_half_count_magnitude + 1));
+    cfg->sub_bucket_half_count = cfg->sub_bucket_count / 2;
+    cfg->sub_bucket_mask       = ((int64_t) cfg->sub_bucket_count - 1) << cfg->unit_magnitude;
+
+    if (cfg->unit_magnitude + cfg->sub_bucket_half_count_magnitude > 61)
+    {
+        return EINVAL;
+    }
+
+    cfg->bucket_count = buckets_needed_to_cover_value(highest_trackable_value, cfg->sub_bucket_count, (int32_t)cfg->unit_magnitude);
+    cfg->counts_len = (cfg->bucket_count + 1) * (cfg->sub_bucket_count / 2);
+
+    return 0;
+}
+
+void hdr_init_preallocated(struct hdr_histogram* h, struct hdr_histogram_bucket_config* cfg)
+{
+    h->lowest_trackable_value          = cfg->lowest_trackable_value;
+    h->highest_trackable_value         = cfg->highest_trackable_value;
+    h->unit_magnitude                  = (int32_t)cfg->unit_magnitude;
+    h->significant_figures             = (int32_t)cfg->significant_figures;
+    h->sub_bucket_half_count_magnitude = cfg->sub_bucket_half_count_magnitude;
+    h->sub_bucket_half_count           = cfg->sub_bucket_half_count;
+    h->sub_bucket_mask                 = cfg->sub_bucket_mask;
+    h->sub_bucket_count                = cfg->sub_bucket_count;
+    h->min_value                       = INT64_MAX;
+    h->max_value                       = 0;
+    h->normalizing_index_offset        = 0;
+    h->conversion_ratio                = 1.0;
+    h->bucket_count                    = cfg->bucket_count;
+    h->counts_len                      = cfg->counts_len;
+    h->total_count                     = 0;
+}
+
+int hdr_init_nchan_shm(
+        int64_t lowest_trackable_value,
+        int64_t highest_trackable_value,
+        int significant_figures,
+        struct hdr_histogram** result)
+{
+    struct hdr_histogram_bucket_config cfg;
+
+    int r = hdr_calculate_bucket_config(lowest_trackable_value, highest_trackable_value, significant_figures, &cfg);
+    if (r)
+    {
+        return r;
+    }
+
+    int64_t* counts = shm_calloc(nchan_store_memory_shmem, (size_t) cfg.counts_len * sizeof(int64_t), "hdrhistogram counts");
+    struct hdr_histogram* histogram = shm_calloc(nchan_store_memory_shmem, sizeof(struct hdr_histogram), "hdrhistogram");
+
+    if (!counts || !histogram)
+    {
+        return ENOMEM;
+    }
+
+    histogram->counts = counts;
+
+    hdr_init_preallocated(histogram, &cfg);
+    *result = histogram;
+
+    return 0;
+}
+
+void hdr_close_nchan_shm(struct hdr_histogram* h)
+{
+    shm_free(nchan_store_memory_shmem, h->counts);
+    shm_free(nchan_store_memory_shmem, h);
+}
+
+// reset a histogram to zero.
+void hdr_reset(struct hdr_histogram *h)
+{
+     h->total_count=0;
+     h->min_value = INT64_MAX;
+     h->max_value = 0;
+     memset(h->counts, 0, (sizeof(int64_t) * h->counts_len));
+}
+
+size_t hdr_get_memory_size(struct hdr_histogram *h)
+{
+    return sizeof(struct hdr_histogram) + h->counts_len * sizeof(int64_t);
+}
+
+// ##     ## ########  ########     ###    ######## ########  ######
+// ##     ## ##     ## ##     ##   ## ##      ##    ##       ##    ##
+// ##     ## ##     ## ##     ##  ##   ##     ##    ##       ##
+// ##     ## ########  ##     ## ##     ##    ##    ######    ######
+// ##     ## ##        ##     ## #########    ##    ##             ##
+// ##     ## ##        ##     ## ##     ##    ##    ##       ##    ##
+//  #######  ##        ########  ##     ##    ##    ########  ######
+
+
+bool hdr_record_value(struct hdr_histogram* h, int64_t value)
+{
+    return hdr_record_values(h, value, 1);
+}
+
+bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count)
+{
+    if (value < 0)
+    {
+        return false;
+    }
+
+    int32_t counts_index = counts_index_for(h, value);
+
+    if (counts_index < 0 || h->counts_len <= counts_index)
+    {
+        return false;
+    }
+
+    counts_inc_normalised(h, counts_index, count);
+    update_min_max(h, value);
+
+    return true;
+}
+
+bool hdr_record_corrected_value(struct hdr_histogram* h, int64_t value, int64_t expected_interval)
+{
+    return hdr_record_corrected_values(h, value, 1, expected_interval);
+}
+
+
+bool hdr_record_corrected_values(struct hdr_histogram* h, int64_t value, int64_t count, int64_t expected_interval)
+{
+    if (!hdr_record_values(h, value, count))
+    {
+        return false;
+    }
+
+    if (expected_interval <= 0 || value <= expected_interval)
+    {
+        return true;
+    }
+
+    int64_t missing_value = value - expected_interval;
+    for (; missing_value >= expected_interval; missing_value -= expected_interval)
+    {
+        if (!hdr_record_values(h, missing_value, count))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+int64_t hdr_add(struct hdr_histogram* h, const struct hdr_histogram* from)
+{
+    struct hdr_iter iter;
+    hdr_iter_recorded_init(&iter, from);
+    int64_t dropped = 0;
+
+    while (hdr_iter_next(&iter))
+    {
+        int64_t value = iter.value;
+        int64_t count = iter.count;
+
+        if (!hdr_record_values(h, value, count))
+        {
+            dropped += count;
+        }
+    }
+
+    return dropped;
+}
+
+int64_t hdr_add_while_correcting_for_coordinated_omission(
+        struct hdr_histogram* h, struct hdr_histogram* from, int64_t expected_interval)
+{
+    struct hdr_iter iter;
+    hdr_iter_recorded_init(&iter, from);
+    int64_t dropped = 0;
+
+    while (hdr_iter_next(&iter))
+    {
+        int64_t value = iter.value;
+        int64_t count = iter.count;
+
+        if (!hdr_record_corrected_values(h, value, count, expected_interval))
+        {
+            dropped += count;
+        }
+    }
+
+    return dropped;
+}
+
+
+
+// ##     ##    ###    ##       ##     ## ########  ######
+// ##     ##   ## ##   ##       ##     ## ##       ##    ##
+// ##     ##  ##   ##  ##       ##     ## ##       ##
+// ##     ## ##     ## ##       ##     ## ######    ######
+//  ##   ##  ######### ##       ##     ## ##             ##
+//   ## ##   ##     ## ##       ##     ## ##       ##    ##
+//    ###    ##     ## ########  #######  ########  ######
+
+
+int64_t hdr_max(const struct hdr_histogram* h)
+{
+    if (0 == h->max_value)
+    {
+        return 0;
+    }
+
+    return highest_equivalent_value(h, h->max_value);
+}
+
+int64_t hdr_min(const struct hdr_histogram* h)
+{
+    if (0 < hdr_count_at_index(h, 0))
+    {
+        return 0;
+    }
+
+    return non_zero_min(h);
+}
+
+int64_t hdr_value_at_percentile(const struct hdr_histogram* h, double percentile)
+{
+    struct hdr_iter iter;
+    hdr_iter_init(&iter, h);
+
+    double requested_percentile = percentile < 100.0 ? percentile : 100.0;
+    int64_t count_at_percentile =
+        (int64_t) (((requested_percentile / 100) * h->total_count) + 0.5);
+    count_at_percentile = count_at_percentile > 1 ? count_at_percentile : 1;
+    int64_t total = 0;
+
+    while (hdr_iter_next(&iter))
+    {
+        total += iter.count;
+
+        if (total >= count_at_percentile)
+        {
+            int64_t value_from_index = iter.value;
+            return highest_equivalent_value(h, value_from_index);
+        }
+    }
+
+    return 0;
+}
+
+double hdr_mean(const struct hdr_histogram* h)
+{
+    struct hdr_iter iter;
+    int64_t total = 0;
+
+    hdr_iter_init(&iter, h);
+
+    while (hdr_iter_next(&iter))
+    {
+        if (0 != iter.count)
+        {
+            total += iter.count * hdr_median_equivalent_value(h, iter.value);
+        }
+    }
+
+    return (total * 1.0) / h->total_count;
+}
+
+double hdr_stddev(const struct hdr_histogram* h)
+{
+    double mean = hdr_mean(h);
+    double geometric_dev_total = 0.0;
+
+    struct hdr_iter iter;
+    hdr_iter_init(&iter, h);
+
+    while (hdr_iter_next(&iter))
+    {
+        if (0 != iter.count)
+        {
+            double dev = (hdr_median_equivalent_value(h, iter.value) * 1.0) - mean;
+            geometric_dev_total += (dev * dev) * iter.count;
+        }
+    }
+
+    return sqrt(geometric_dev_total / h->total_count);
+}
+
+bool hdr_values_are_equivalent(const struct hdr_histogram* h, int64_t a, int64_t b)
+{
+    return lowest_equivalent_value(h, a) == lowest_equivalent_value(h, b);
+}
+
+int64_t hdr_lowest_equivalent_value(const struct hdr_histogram* h, int64_t value)
+{
+    return lowest_equivalent_value(h, value);
+}
+
+int64_t hdr_count_at_value(const struct hdr_histogram* h, int64_t value)
+{
+    return counts_get_normalised(h, counts_index_for(h, value));
+}
+
+int64_t hdr_count_at_index(const struct hdr_histogram* h, int32_t index)
+{
+    return counts_get_normalised(h, index);
+}
+
+
+// #### ######## ######## ########     ###    ########  #######  ########   ######
+//  ##     ##    ##       ##     ##   ## ##      ##    ##     ## ##     ## ##    ##
+//  ##     ##    ##       ##     ##  ##   ##     ##    ##     ## ##     ## ##
+//  ##     ##    ######   ########  ##     ##    ##    ##     ## ########   ######
+//  ##     ##    ##       ##   ##   #########    ##    ##     ## ##   ##         ##
+//  ##     ##    ##       ##    ##  ##     ##    ##    ##     ## ##    ##  ##    ##
+// ####    ##    ######## ##     ## ##     ##    ##     #######  ##     ##  ######
+
+
+static bool has_buckets(struct hdr_iter* iter)
+{
+    return iter->counts_index < iter->h->counts_len;
+}
+
+static bool has_next(struct hdr_iter* iter)
+{
+    return iter->cumulative_count < iter->total_count;
+}
+
+static bool move_next(struct hdr_iter* iter)
+{
+    iter->counts_index++;
+
+    if (!has_buckets(iter))
+    {
+        return false;
+    }
+
+    iter->count = counts_get_normalised(iter->h, iter->counts_index);
+    iter->cumulative_count += iter->count;
+
+    iter->value = hdr_value_at_index(iter->h, iter->counts_index);
+    iter->highest_equivalent_value = highest_equivalent_value(iter->h, iter->value);
+    iter->lowest_equivalent_value = lowest_equivalent_value(iter->h, iter->value);
+    iter->median_equivalent_value = hdr_median_equivalent_value(iter->h, iter->value);
+
+    return true;
+}
+
+static int64_t peek_next_value_from_index(struct hdr_iter* iter)
+{
+    return hdr_value_at_index(iter->h, iter->counts_index + 1);
+}
+
+static bool next_value_greater_than_reporting_level_upper_bound(
+    struct hdr_iter *iter, int64_t reporting_level_upper_bound)
+{
+    if (iter->counts_index >= iter->h->counts_len)
+    {
+        return false;
+    }
+
+    return peek_next_value_from_index(iter) > reporting_level_upper_bound;
+}
+
+static bool _basic_iter_next(struct hdr_iter *iter)
+{
+    if (!has_next(iter) || iter->counts_index >= iter->h->counts_len)
+    {
+        return false;
+    }
+
+    move_next(iter);
+
+    return true;
+}
+
+static void _update_iterated_values(struct hdr_iter* iter, int64_t new_value_iterated_to)
+{
+    iter->value_iterated_from = iter->value_iterated_to;
+    iter->value_iterated_to = new_value_iterated_to;
+}
+
+static bool _all_values_iter_next(struct hdr_iter* iter)
+{
+    bool result = move_next(iter);
+
+    if (result)
+    {
+        _update_iterated_values(iter, iter->value);
+    }
+
+    return result;
+}
+
+void hdr_iter_init(struct hdr_iter* iter, const struct hdr_histogram* h)
+{
+    iter->h = h;
+
+    iter->counts_index = -1;
+    iter->total_count = h->total_count;
+    iter->count = 0;
+    iter->cumulative_count = 0;
+    iter->value = 0;
+    iter->highest_equivalent_value = 0;
+    iter->value_iterated_from = 0;
+    iter->value_iterated_to = 0;
+
+    iter->_next_fp = _all_values_iter_next;
+}
+
+bool hdr_iter_next(struct hdr_iter* iter)
+{
+    return iter->_next_fp(iter);
+}
+
+// ########  ######## ########   ######  ######## ##    ## ######## #### ##       ########  ######
+// ##     ## ##       ##     ## ##    ## ##       ###   ##    ##     ##  ##       ##       ##    ##
+// ##     ## ##       ##     ## ##       ##       ####  ##    ##     ##  ##       ##       ##
+// ########  ######   ########  ##       ######   ## ## ##    ##     ##  ##       ######    ######
+// ##        ##       ##   ##   ##       ##       ##  ####    ##     ##  ##       ##             ##
+// ##        ##       ##    ##  ##    ## ##       ##   ###    ##     ##  ##       ##       ##    ##
+// ##        ######## ##     ##  ######  ######## ##    ##    ##    #### ######## ########  ######
+
+static bool _percentile_iter_next(struct hdr_iter* iter)
+{
+    struct hdr_iter_percentiles* percentiles = &iter->specifics.percentiles;
+
+    if (!has_next(iter))
+    {
+        if (percentiles->seen_last_value)
+        {
+            return false;
+        }
+
+        percentiles->seen_last_value = true;
+        percentiles->percentile = 100.0;
+
+        return true;
+    }
+
+    if (iter->counts_index == -1 && !_basic_iter_next(iter))
+    {
+        return false;
+    }
+
+    do
+    {
+        double current_percentile = (100.0 * (double) iter->cumulative_count) / iter->h->total_count;
+        if (iter->count != 0 &&
+                percentiles->percentile_to_iterate_to <= current_percentile)
+        {
+            _update_iterated_values(iter, highest_equivalent_value(iter->h, iter->value));
+
+            percentiles->percentile = percentiles->percentile_to_iterate_to;
+            int64_t temp = (int64_t)(log(100 / (100.0 - (percentiles->percentile_to_iterate_to))) / log(2)) + 1;
+            int64_t half_distance = (int64_t) pow(2, (double) temp);
+            int64_t percentile_reporting_ticks = percentiles->ticks_per_half_distance * half_distance;
+            percentiles->percentile_to_iterate_to += 100.0 / percentile_reporting_ticks;
+
+            return true;
+        }
+    }
+    while (_basic_iter_next(iter));
+
+    return true;
+}
+
+void hdr_iter_percentile_init(struct hdr_iter* iter, const struct hdr_histogram* h, int32_t ticks_per_half_distance)
+{
+    iter->h = h;
+
+    hdr_iter_init(iter, h);
+
+    iter->specifics.percentiles.seen_last_value          = false;
+    iter->specifics.percentiles.ticks_per_half_distance  = ticks_per_half_distance;
+    iter->specifics.percentiles.percentile_to_iterate_to = 0.0;
+    iter->specifics.percentiles.percentile               = 0.0;
+
+    iter->_next_fp = _percentile_iter_next;
+}
+
+static void format_line_string(char* str, size_t len, int significant_figures, format_type format)
+{
+#if defined(_MSC_VER)
+#define snprintf _snprintf
+#pragma warning(push)
+#pragma warning(disable: 4996)
+#endif
+    const char* format_str = "%s%d%s";
+
+    switch (format)
+    {
+        case CSV:
+            snprintf(str, len, format_str, "%.", significant_figures, "f,%f,%d,%.2f\n");
+            break;
+        case CLASSIC:
+            snprintf(str, len, format_str, "%12.", significant_figures, "f %12f %12d %12.2f\n");
+            break;
+        default:
+            snprintf(str, len, format_str, "%12.", significant_figures, "f %12f %12d %12.2f\n");
+    }
+#if defined(_MSC_VER)
+#undef snprintf
+#pragma warning(pop)
+#endif
+}
+
+
+// ########  ########  ######   #######  ########  ########  ######## ########
+// ##     ## ##       ##    ## ##     ## ##     ## ##     ## ##       ##     ##
+// ##     ## ##       ##       ##     ## ##     ## ##     ## ##       ##     ##
+// ########  ######   ##       ##     ## ########  ##     ## ######   ##     ##
+// ##   ##   ##       ##       ##     ## ##   ##   ##     ## ##       ##     ##
+// ##    ##  ##       ##    ## ##     ## ##    ##  ##     ## ##       ##     ##
+// ##     ## ########  ######   #######  ##     ## ########  ######## ########
+
+
+static bool _recorded_iter_next(struct hdr_iter* iter)
+{
+    while (_basic_iter_next(iter))
+    {
+        if (iter->count != 0)
+        {
+            _update_iterated_values(iter, iter->value);
+
+            iter->specifics.recorded.count_added_in_this_iteration_step = iter->count;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void hdr_iter_recorded_init(struct hdr_iter* iter, const struct hdr_histogram* h)
+{
+    hdr_iter_init(iter, h);
+
+    iter->specifics.recorded.count_added_in_this_iteration_step = 0;
+
+    iter->_next_fp = _recorded_iter_next;
+}
+
+// ##       #### ##    ## ########    ###    ########
+// ##        ##  ###   ## ##         ## ##   ##     ##
+// ##        ##  ####  ## ##        ##   ##  ##     ##
+// ##        ##  ## ## ## ######   ##     ## ########
+// ##        ##  ##  #### ##       ######### ##   ##
+// ##        ##  ##   ### ##       ##     ## ##    ##
+// ######## #### ##    ## ######## ##     ## ##     ##
+
+
+static bool _iter_linear_next(struct hdr_iter* iter)
+{
+    struct hdr_iter_linear* linear = &iter->specifics.linear;
+
+    linear->count_added_in_this_iteration_step = 0;
+
+    if (has_next(iter) ||
+        next_value_greater_than_reporting_level_upper_bound(
+            iter, linear->next_value_reporting_level_lowest_equivalent))
+    {
+        do
+        {
+            if (iter->value >= linear->next_value_reporting_level_lowest_equivalent)
+            {
+                _update_iterated_values(iter, linear->next_value_reporting_level);
+
+                linear->next_value_reporting_level += linear->value_units_per_bucket;
+                linear->next_value_reporting_level_lowest_equivalent =
+                    lowest_equivalent_value(iter->h, linear->next_value_reporting_level);
+
+                return true;
+            }
+
+            if (!move_next(iter))
+            {
+                return true;
+            }
+
+            linear->count_added_in_this_iteration_step += iter->count;
+        }
+        while (true);
+    }
+
+    return false;
+}
+
+
+void hdr_iter_linear_init(struct hdr_iter* iter, const struct hdr_histogram* h, int64_t value_units_per_bucket)
+{
+    hdr_iter_init(iter, h);
+
+    iter->specifics.linear.count_added_in_this_iteration_step = 0;
+    iter->specifics.linear.value_units_per_bucket = value_units_per_bucket;
+    iter->specifics.linear.next_value_reporting_level = value_units_per_bucket;
+    iter->specifics.linear.next_value_reporting_level_lowest_equivalent = lowest_equivalent_value(h, value_units_per_bucket);
+
+    iter->_next_fp = _iter_linear_next;
+}
+
+// ##        #######   ######      ###    ########  #### ######## ##     ## ##     ## ####  ######
+// ##       ##     ## ##    ##    ## ##   ##     ##  ##     ##    ##     ## ###   ###  ##  ##    ##
+// ##       ##     ## ##         ##   ##  ##     ##  ##     ##    ##     ## #### ####  ##  ##
+// ##       ##     ## ##   #### ##     ## ########   ##     ##    ######### ## ### ##  ##  ##
+// ##       ##     ## ##    ##  ######### ##   ##    ##     ##    ##     ## ##     ##  ##  ##
+// ##       ##     ## ##    ##  ##     ## ##    ##   ##     ##    ##     ## ##     ##  ##  ##    ##
+// ########  #######   ######   ##     ## ##     ## ####    ##    ##     ## ##     ## ####  ######
+
+static bool _log_iter_next(struct hdr_iter *iter)
+{
+    struct hdr_iter_log* logarithmic = &iter->specifics.log;
+
+    logarithmic->count_added_in_this_iteration_step = 0;
+
+    if (has_next(iter) ||
+        next_value_greater_than_reporting_level_upper_bound(
+            iter, logarithmic->next_value_reporting_level_lowest_equivalent))
+    {
+        do
+        {
+            if (iter->value >= logarithmic->next_value_reporting_level_lowest_equivalent)
+            {
+                _update_iterated_values(iter, logarithmic->next_value_reporting_level);
+
+                logarithmic->next_value_reporting_level *= (int64_t)logarithmic->log_base;
+                logarithmic->next_value_reporting_level_lowest_equivalent = lowest_equivalent_value(iter->h, logarithmic->next_value_reporting_level);
+
+                return true;
+            }
+
+            if (!move_next(iter))
+            {
+                return true;
+            }
+
+            logarithmic->count_added_in_this_iteration_step += iter->count;
+        }
+        while (true);
+    }
+
+    return false;
+}
+
+void hdr_iter_log_init(
+        struct hdr_iter* iter,
+        const struct hdr_histogram* h,
+        int64_t value_units_first_bucket,
+        double log_base)
+{
+    hdr_iter_init(iter, h);
+    iter->specifics.log.count_added_in_this_iteration_step = 0;
+    iter->specifics.log.log_base = log_base;
+    iter->specifics.log.next_value_reporting_level = value_units_first_bucket;
+    iter->specifics.log.next_value_reporting_level_lowest_equivalent = lowest_equivalent_value(h, value_units_first_bucket);
+
+    iter->_next_fp = _log_iter_next;
+}
+
+// Printing.
+
+static const char* format_head_string(format_type format)
+{
+    switch (format)
+    {
+        case CSV:
+            return "%s,%s,%s,%s\n";
+        case CLASSIC:
+            return "%12s %12s %12s %12s\n\n";
+        default:
+            return "%12s %12s %12s %12s\n\n";
+    }
+}
+
+static const char CLASSIC_FOOTER[] =
+    "#[Mean    = %12.3f, StdDeviation   = %12.3f]\n"
+    "#[Max     = %12.3f, Total count    = %12" PRIu64 "]\n"
+    "#[Buckets = %12d, SubBuckets     = %12d]\n";
+
+int hdr_percentiles_print(
+        struct hdr_histogram* h, FILE* stream, int32_t ticks_per_half_distance,
+        double value_scale, format_type format)
+{
+    char line_format[25];
+    format_line_string(line_format, 25, h->significant_figures, format);
+    const char* head_format = format_head_string(format);
+    int rc = 0;
+
+    struct hdr_iter iter;
+    hdr_iter_percentile_init(&iter, h, ticks_per_half_distance);
+
+    if (fprintf(
+            stream, head_format,
+            "Value", "Percentile", "TotalCount", "1/(1-Percentile)") < 0)
+    {
+        rc = EIO;
+        goto cleanup;
+    }
+
+    struct hdr_iter_percentiles * percentiles = &iter.specifics.percentiles;
+    while (hdr_iter_next(&iter))
+    {
+        double  value               = iter.highest_equivalent_value / value_scale;
+        double  percentile          = percentiles->percentile / 100.0;
+        int64_t total_count         = iter.cumulative_count;
+        double  inverted_percentile = (1.0 / (1.0 - percentile));
+
+        if (fprintf(
+                stream, line_format, value, percentile, total_count, inverted_percentile) < 0)
+        {
+            rc = EIO;
+            goto cleanup;
+        }
+    }
+
+    if (CLASSIC == format)
+    {
+        double mean   = hdr_mean(h)   / value_scale;
+        double stddev = hdr_stddev(h) / value_scale;
+        double max    = hdr_max(h)    / value_scale;
+
+        if (fprintf(
+                stream, CLASSIC_FOOTER,  mean, stddev, max,
+                h->total_count, h->bucket_count, h->sub_bucket_count) < 0)
+        {
+            rc = EIO;
+            goto cleanup;
+        }
+    }
+
+    cleanup:
+    return rc;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/hdr_histogram.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/hdr_histogram.h
new file mode 100644
index 0000000..010a4b8
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/hdr_histogram.h
@@ -0,0 +1,427 @@
+/**
+ * hdr_histogram.h
+ * Written by Michael Barker and released to the public domain,
+ * as explained at http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * The source for the hdr_histogram utilises a few C99 constructs, specifically
+ * the use of stdint/stdbool and inline variable declaration.
+ */
+
+#ifndef HDR_HISTOGRAM_H
+#define HDR_HISTOGRAM_H 1
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+struct hdr_histogram
+{
+    int64_t lowest_trackable_value;
+    int64_t highest_trackable_value;
+    int32_t unit_magnitude;
+    int32_t significant_figures;
+    int32_t sub_bucket_half_count_magnitude;
+    int32_t sub_bucket_half_count;
+    int64_t sub_bucket_mask;
+    int32_t sub_bucket_count;
+    int32_t bucket_count;
+    int64_t min_value;
+    int64_t max_value;
+    int32_t normalizing_index_offset;
+    double conversion_ratio;
+    int32_t counts_len;
+    int64_t total_count;
+    int64_t* counts;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Allocate the memory and initialise the hdr_histogram.
+ *
+ * Due to the size of the histogram being the result of some reasonably
+ * involved math on the input parameters this function it is tricky to stack allocate.
+ * The histogram is allocated in a single contigious block so can be delete via free,
+ * without any structure specific destructor.
+ *
+ * @param lowest_trackable_value The smallest possible value to be put into the
+ * histogram.
+ * @param highest_trackable_value The largest possible value to be put into the
+ * histogram.
+ * @param significant_figures The level of precision for this histogram, i.e. the number
+ * of figures in a decimal number that will be maintained.  E.g. a value of 3 will mean
+ * the results from the histogram will be accurate up to the first three digits.  Must
+ * be a value between 1 and 5 (inclusive).
+ * @param result Output parameter to capture allocated histogram.
+ * @return 0 on success, EINVAL if lowest_trackable_value is < 1 or the
+ * significant_figure value is outside of the allowed range, ENOMEM if malloc
+ * failed.
+ */
+int hdr_init_nchan_shm(
+    int64_t lowest_trackable_value,
+    int64_t highest_trackable_value,
+    int significant_figures,
+    struct hdr_histogram** result);
+
+/**
+ * Free the memory and close the hdr_histogram.
+ *
+ * @param h The histogram you want to close.
+ */
+void hdr_close_nchan_shm(struct hdr_histogram* h);
+
+
+/**
+ * Reset a histogram to zero - empty out a histogram and re-initialise it
+ *
+ * If you want to re-use an existing histogram, but reset everything back to zero, this
+ * is the routine to use.
+ *
+ * @param h The histogram you want to reset to empty.
+ *
+ */
+void hdr_reset(struct hdr_histogram* h);
+
+/**
+ * Get the memory size of the hdr_histogram.
+ *
+ * @param h "This" pointer
+ * @return The amount of memory used by the hdr_histogram in bytes
+ */
+size_t hdr_get_memory_size(struct hdr_histogram* h);
+
+/**
+ * Records a value in the histogram, will round this value of to a precision at or better
+ * than the significant_figure specified at construction time.
+ *
+ * @param h "This" pointer
+ * @param value Value to add to the histogram
+ * @return false if the value is larger than the highest_trackable_value and can't be recorded,
+ * true otherwise.
+ */
+bool hdr_record_value(struct hdr_histogram* h, int64_t value);
+
+/**
+ * Records count values in the histogram, will round this value of to a
+ * precision at or better than the significant_figure specified at construction
+ * time.
+ *
+ * @param h "This" pointer
+ * @param value Value to add to the histogram
+ * @param count Number of 'value's to add to the histogram
+ * @return false if any value is larger than the highest_trackable_value and can't be recorded,
+ * true otherwise.
+ */
+bool hdr_record_values(struct hdr_histogram* h, int64_t value, int64_t count);
+
+
+/**
+ * Record a value in the histogram and backfill based on an expected interval.
+ *
+ * Records a value in the histogram, will round this value of to a precision at or better
+ * than the significant_figure specified at contruction time.  This is specifically used
+ * for recording latency.  If the value is larger than the expected_interval then the
+ * latency recording system has experienced co-ordinated omission.  This method fills in the
+ * values that would have occured had the client providing the load not been blocked.
+
+ * @param h "This" pointer
+ * @param value Value to add to the histogram
+ * @param expected_interval The delay between recording values.
+ * @return false if the value is larger than the highest_trackable_value and can't be recorded,
+ * true otherwise.
+ */
+bool hdr_record_corrected_value(struct hdr_histogram* h, int64_t value, int64_t expexcted_interval);
+/**
+ * Record a value in the histogram 'count' times.  Applies the same correcting logic
+ * as 'hdr_record_corrected_value'.
+ *
+ * @param h "This" pointer
+ * @param value Value to add to the histogram
+ * @param count Number of 'value's to add to the histogram
+ * @param expected_interval The delay between recording values.
+ * @return false if the value is larger than the highest_trackable_value and can't be recorded,
+ * true otherwise.
+ */
+bool hdr_record_corrected_values(struct hdr_histogram* h, int64_t value, int64_t count, int64_t expected_interval);
+
+/**
+ * Adds all of the values from 'from' to 'this' histogram.  Will return the
+ * number of values that are dropped when copying.  Values will be dropped
+ * if they around outside of h.lowest_trackable_value and
+ * h.highest_trackable_value.
+ *
+ * @param h "This" pointer
+ * @param from Histogram to copy values from.
+ * @return The number of values dropped when copying.
+ */
+int64_t hdr_add(struct hdr_histogram* h, const struct hdr_histogram* from);
+
+/**
+ * Adds all of the values from 'from' to 'this' histogram.  Will return the
+ * number of values that are dropped when copying.  Values will be dropped
+ * if they around outside of h.lowest_trackable_value and
+ * h.highest_trackable_value.
+ *
+ * @param h "This" pointer
+ * @param from Histogram to copy values from.
+ * @return The number of values dropped when copying.
+ */
+int64_t hdr_add_while_correcting_for_coordinated_omission(
+    struct hdr_histogram* h, struct hdr_histogram* from, int64_t expected_interval);
+
+/**
+ * Get minimum value from the histogram.  Will return 2^63-1 if the histogram
+ * is empty.
+ *
+ * @param h "This" pointer
+ */
+int64_t hdr_min(const struct hdr_histogram* h);
+
+/**
+ * Get maximum value from the histogram.  Will return 0 if the histogram
+ * is empty.
+ *
+ * @param h "This" pointer
+ */
+int64_t hdr_max(const struct hdr_histogram* h);
+
+/**
+ * Get the value at a specific percentile.
+ *
+ * @param h "This" pointer.
+ * @param percentile The percentile to get the value for
+ */
+int64_t hdr_value_at_percentile(const struct hdr_histogram* h, double percentile);
+
+/**
+ * Gets the standard deviation for the values in the histogram.
+ *
+ * @param h "This" pointer
+ * @return The standard deviation
+ */
+double hdr_stddev(const struct hdr_histogram* h);
+
+/**
+ * Gets the mean for the values in the histogram.
+ *
+ * @param h "This" pointer
+ * @return The mean
+ */
+double hdr_mean(const struct hdr_histogram* h);
+
+/**
+ * Determine if two values are equivalent with the histogram's resolution.
+ * Where "equivalent" means that value samples recorded for any two
+ * equivalent values are counted in a common total count.
+ *
+ * @param h "This" pointer
+ * @param a first value to compare
+ * @param b second value to compare
+ * @return 'true' if values are equivalent with the histogram's resolution.
+ */
+bool hdr_values_are_equivalent(const struct hdr_histogram* h, int64_t a, int64_t b);
+
+/**
+ * Get the lowest value that is equivalent to the given value within the histogram's resolution.
+ * Where "equivalent" means that value samples recorded for any two
+ * equivalent values are counted in a common total count.
+ *
+ * @param h "This" pointer
+ * @param value The given value
+ * @return The lowest value that is equivalent to the given value within the histogram's resolution.
+ */
+int64_t hdr_lowest_equivalent_value(const struct hdr_histogram* h, int64_t value);
+
+/**
+ * Get the count of recorded values at a specific value
+ * (to within the histogram resolution at the value level).
+ *
+ * @param h "This" pointer
+ * @param value The value for which to provide the recorded count
+ * @return The total count of values recorded in the histogram within the value range that is
+ * {@literal >=} lowestEquivalentValue(<i>value</i>) and {@literal <=} highestEquivalentValue(<i>value</i>)
+ */
+int64_t hdr_count_at_value(const struct hdr_histogram* h, int64_t value);
+
+int64_t hdr_count_at_index(const struct hdr_histogram* h, int32_t index);
+
+int64_t hdr_value_at_index(const struct hdr_histogram* h, int32_t index);
+
+struct hdr_iter_percentiles
+{
+    bool seen_last_value;
+    int32_t ticks_per_half_distance;
+    double percentile_to_iterate_to;
+    double percentile;
+};
+
+struct hdr_iter_recorded
+{
+    int64_t count_added_in_this_iteration_step;
+};
+
+struct hdr_iter_linear
+{
+    int64_t value_units_per_bucket;
+    int64_t count_added_in_this_iteration_step;
+    int64_t next_value_reporting_level;
+    int64_t next_value_reporting_level_lowest_equivalent;
+};
+
+struct hdr_iter_log
+{
+    double log_base;
+    int64_t count_added_in_this_iteration_step;
+    int64_t next_value_reporting_level;
+    int64_t next_value_reporting_level_lowest_equivalent;
+};
+
+/**
+ * The basic iterator.  This is a generic structure
+ * that supports all of the types of iteration.  Use
+ * the appropriate initialiser to get the desired
+ * iteration.
+ *
+ * @
+ */
+struct hdr_iter
+{
+    const struct hdr_histogram* h;
+    /** raw index into the counts array */
+    int32_t counts_index;
+    /** snapshot of the length at the time the iterator is created */
+    int32_t total_count;
+    /** value directly from array for the current counts_index */
+    int64_t count;
+    /** sum of all of the counts up to and including the count at this index */
+    int64_t cumulative_count;
+    /** The current value based on counts_index */
+    int64_t value;
+    int64_t highest_equivalent_value;
+    int64_t lowest_equivalent_value;
+    int64_t median_equivalent_value;
+    int64_t value_iterated_from;
+    int64_t value_iterated_to;
+
+    union
+    {
+        struct hdr_iter_percentiles percentiles;
+        struct hdr_iter_recorded recorded;
+        struct hdr_iter_linear linear;
+        struct hdr_iter_log log;
+    } specifics;
+
+    bool (* _next_fp)(struct hdr_iter* iter);
+
+};
+
+/**
+ * Initalises the basic iterator.
+ *
+ * @param itr 'This' pointer
+ * @param h The histogram to iterate over
+ */
+void hdr_iter_init(struct hdr_iter* iter, const struct hdr_histogram* h);
+
+/**
+ * Initialise the iterator for use with percentiles.
+ */
+void hdr_iter_percentile_init(struct hdr_iter* iter, const struct hdr_histogram* h, int32_t ticks_per_half_distance);
+
+/**
+ * Initialise the iterator for use with recorded values.
+ */
+void hdr_iter_recorded_init(struct hdr_iter* iter, const struct hdr_histogram* h);
+
+/**
+ * Initialise the iterator for use with linear values.
+ */
+void hdr_iter_linear_init(
+    struct hdr_iter* iter,
+    const struct hdr_histogram* h,
+    int64_t value_units_per_bucket);
+
+/**
+ * Initialise the iterator for use with logarithmic values
+ */
+void hdr_iter_log_init(
+    struct hdr_iter* iter,
+    const struct hdr_histogram* h,
+    int64_t value_units_first_bucket,
+    double log_base);
+
+/**
+ * Iterate to the next value for the iterator.  If there are no more values
+ * available return faluse.
+ *
+ * @param itr 'This' pointer
+ * @return 'false' if there are no values remaining for this iterator.
+ */
+bool hdr_iter_next(struct hdr_iter* iter);
+
+typedef enum
+{
+    CLASSIC,
+    CSV
+} format_type;
+
+/**
+ * Print out a percentile based histogram to the supplied stream.  Note that
+ * this call will not flush the FILE, this is left up to the user.
+ *
+ * @param h 'This' pointer
+ * @param stream The FILE to write the output to
+ * @param ticks_per_half_distance The number of iteration steps per half-distance to 100%
+ * @param value_scale Scale the output values by this amount
+ * @param format_type Format to use, e.g. CSV.
+ * @return 0 on success, error code on failure.  EIO if an error occurs writing
+ * the output.
+ */
+int hdr_percentiles_print(
+    struct hdr_histogram* h, FILE* stream, int32_t ticks_per_half_distance,
+    double value_scale, format_type format);
+
+/**
+* Internal allocation methods, used by hdr_dbl_histogram.
+*/
+struct hdr_histogram_bucket_config
+{
+    int64_t lowest_trackable_value;
+    int64_t highest_trackable_value;
+    int64_t unit_magnitude;
+    int64_t significant_figures;
+    int32_t sub_bucket_half_count_magnitude;
+    int32_t sub_bucket_half_count;
+    int64_t sub_bucket_mask;
+    int32_t sub_bucket_count;
+    int32_t bucket_count;
+    int32_t counts_len;
+};
+
+int hdr_calculate_bucket_config(
+    int64_t lowest_trackable_value,
+    int64_t highest_trackable_value,
+    int significant_figures,
+    struct hdr_histogram_bucket_config* cfg);
+
+void hdr_init_preallocated(struct hdr_histogram* h, struct hdr_histogram_bucket_config* cfg);
+
+int64_t hdr_size_of_equivalent_value_range(const struct hdr_histogram* h, int64_t value);
+
+int64_t hdr_next_non_equivalent_value(const struct hdr_histogram* h, int64_t value);
+
+int64_t hdr_median_equivalent_value(const struct hdr_histogram* h, int64_t value);
+
+/**
+ * Used to reset counters after importing data manuallying into the histogram, used by the logging code
+ * and other custom serialisation tools.
+ */
+void hdr_reset_internal_counters(struct hdr_histogram* h);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.c
new file mode 100644
index 0000000..c01bbec
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.c
@@ -0,0 +1,212 @@
+#include <nchan_module.h>
+#include <math.h>
+
+#include "nchan_accumulator.h"
+
+// based on work done for Queris (c) 2011-2017 Leo Ponomarev
+// https://github.com/slact/queris/blob/master/lib/queris/indices.rb#L661-L712
+// licensed under the MIT license, same as Nchan
+
+int nchan_accumulator_init(nchan_accumulator_t *acc, nchan_accumulator_type_t type, double halflife) {
+  switch(type) {
+    case ACCUMULATOR_EXP_DECAY_FLOAT:
+      if(halflife <= 0) {
+        return 0;
+      }
+      acc->data.ed_float.value = 0;
+      acc->data.ed_float.weight = 0;
+      acc->data.ed_float.lambda = (double)1 / halflife;
+      break;
+    
+    case ACCUMULATOR_SUM:
+      acc->data.sum.value = 0;
+      acc->data.sum.weight = 0;
+      break;
+      
+    default:
+      return 0;
+  }
+  ngx_memzero(&acc->last_update, sizeof(acc->last_update));
+  acc->type = type;
+  
+  return 1;
+}
+
+static double ngx_time_t_diff(ngx_time_t *t0, ngx_time_t *t1) {
+  if(t1->sec == t0->sec && t1->msec == t0->msec) {
+    return 0;
+  }
+  return ((double)t1->sec - t0->sec)*1000 + ((ngx_int_t)(t1->msec) - (ngx_int_t)(t0->msec));
+}
+
+static void nchan_accumulator_rebase_to_time(nchan_accumulator_t *acc, ngx_time_t *t1) {
+  double         diff   = ngx_time_t_diff(&acc->last_update, t1);
+  double         pow_mult;
+  
+  if(diff == 0) {
+    return;
+  }
+  
+  acc->last_update = *t1;
+  switch(acc->type) {
+    case ACCUMULATOR_EXP_DECAY_FLOAT:
+      //the accurate way
+      pow_mult = pow(2, -1 * acc->data.ed_float.lambda * diff);
+      acc->data.ed_float.value = acc->data.ed_float.value * pow_mult;
+      acc->data.ed_float.weight= acc->data.ed_float.weight * pow_mult;
+      break;
+    default:
+      //not supported yet
+      break;
+  }
+}
+
+static void nchan_accumulator_rebase_to_now(nchan_accumulator_t *acc) {
+  ngx_time_t    *t1     = ngx_timeofday();
+  nchan_accumulator_rebase_to_time(acc, t1);
+}
+
+
+int nchan_accumulator_update(nchan_accumulator_t *acc, double val) {
+  switch(acc->type) {
+    case ACCUMULATOR_EXP_DECAY_FLOAT:
+      //the accurate way
+      nchan_accumulator_rebase_to_now(acc);
+      acc->data.ed_float.value += val;
+      acc->data.ed_float.weight += 1;
+      break;
+    case ACCUMULATOR_SUM:
+      acc->data.sum.value += val;
+      acc->data.sum.weight += 1;
+      break;
+    default:
+      //not supported yet
+      return 0;
+  }
+  return 1;
+}
+
+int nchan_accumulator_atomic_update(nchan_accumulator_t *acc, double val) {
+  
+  int intval;
+  switch(acc->type) {
+    case ACCUMULATOR_EXP_DECAY_FLOAT:
+      //not possible for now
+      return 0;
+    
+    case ACCUMULATOR_SUM:
+      intval = val;
+      ngx_atomic_fetch_add((ngx_atomic_uint_t *)(&acc->data.ed_float.value), intval);
+      ngx_atomic_fetch_add((ngx_atomic_uint_t *)(&acc->data.ed_float.weight), 1);
+      return 1;
+    
+    default:
+      //not supported yet
+      return 0;
+  }
+}
+
+
+
+double nchan_accumulator_average(nchan_accumulator_t *acc) {
+  switch(acc->type) {
+    case ACCUMULATOR_EXP_DECAY_FLOAT:
+      if(acc->data.ed_float.weight == 0) {
+        return 0;
+      }
+      return acc->data.ed_float.value / acc->data.ed_float.weight;
+    
+    case ACCUMULATOR_SUM:
+      if(acc->data.sum.weight == 0) {
+        return 0;
+      }
+      return acc->data.sum.value / acc->data.sum.weight;
+    
+    default:
+      //not implemented
+      return -1;
+  }
+}
+
+double nchan_accumulator_value(nchan_accumulator_t *acc) {
+  switch(acc->type) {
+    case ACCUMULATOR_EXP_DECAY_FLOAT:
+      nchan_accumulator_rebase_to_now(acc);
+      return acc->data.ed_float.value;
+    
+    case ACCUMULATOR_SUM:
+      return acc->data.sum.value;
+      
+    default:
+      //not implemented
+      return -1;
+  }
+}
+
+double nchan_accumulator_weight(nchan_accumulator_t *acc) {
+  switch(acc->type) {
+    case ACCUMULATOR_EXP_DECAY_FLOAT:
+      nchan_accumulator_rebase_to_now(acc);
+      return acc->data.ed_float.weight;
+      
+    case ACCUMULATOR_SUM:
+      return acc->data.sum.weight;
+    
+    default:
+      //not implemented
+      return -1;
+  }
+}
+
+
+int nchan_accumulator_merge(nchan_accumulator_t *dst, nchan_accumulator_t *src) {
+  if(dst->type != src->type) {
+    //refuse to merge different-type averagers
+    return 0;
+  }
+  
+  nchan_accumulator_t tmp;
+  
+  switch(dst->type) {
+    case ACCUMULATOR_EXP_DECAY_FLOAT:
+      tmp = *src;
+      nchan_accumulator_rebase_to_now(dst);
+      nchan_accumulator_rebase_to_now(&tmp);
+      if(tmp.data.ed_float.lambda != dst->data.ed_float.lambda) {
+        if(tmp.data.ed_float.weight + dst->data.ed_float.weight == 0) {
+          return 0;
+        }
+        dst->data.ed_float.lambda = (dst->data.ed_float.lambda * dst->data.ed_float.weight + tmp.data.ed_float.lambda * tmp.data.ed_float.weight) / (dst->data.ed_float.weight + tmp.data.ed_float.weight);
+      }
+      dst->data.ed_float.value += tmp.data.ed_float.value;
+      dst->data.ed_float.weight += tmp.data.ed_float.weight;
+      return 1;
+    
+    case ACCUMULATOR_SUM:
+      dst->data.sum.value += src->data.sum.value;
+      dst->data.sum.weight += src->data.sum.weight;
+      return 1;
+    
+    default:
+      return 0;
+  }
+}
+
+void nchan_accumulator_reset(nchan_accumulator_t *acc) {
+  switch(acc->type) {
+    case ACCUMULATOR_EXP_DECAY_FLOAT:
+      acc->data.ed_float.value = 0;
+      acc->data.ed_float.weight = 0;
+      break;
+    
+    case ACCUMULATOR_SUM:
+      acc->data.sum.value = 0;
+      acc->data.sum.weight = 0;
+      break;
+      
+    default:
+      //do nothing
+      break;
+  }
+}
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.h
new file mode 100644
index 0000000..1469fe8
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_accumulator.h
@@ -0,0 +1,45 @@
+#ifndef NCHAN_ACCUMULATOR_H
+#define NCHAN_ACCUMULATOR_H
+
+#include <stddef.h>
+#include <nginx.h>
+
+typedef enum {
+  ACCUMULATOR_EXP_DECAY_FLOAT,
+  ACCUMULATOR_SUM
+} nchan_accumulator_type_t;
+  
+
+typedef struct {
+  double value;
+  double weight;
+  double lambda;
+} nchan_accumulator_float_exponentially_decayed_data_t;
+
+typedef struct {
+  ngx_atomic_int_t value;
+  ngx_atomic_int_t weight;
+} nchan_accumulator_sum_data_t;
+
+typedef struct {
+  union {
+    nchan_accumulator_float_exponentially_decayed_data_t  ed_float;
+    nchan_accumulator_sum_data_t                          sum;
+  }     data;
+  
+  ngx_time_t last_update; 
+  
+  nchan_accumulator_type_t type;
+} nchan_accumulator_t;
+
+int nchan_accumulator_update(nchan_accumulator_t *acc, double val);
+int nchan_accumulator_atomic_update(nchan_accumulator_t *acc, double val);
+
+double nchan_accumulator_value(nchan_accumulator_t *acc);
+double nchan_accumulator_weight(nchan_accumulator_t *acc);
+double nchan_accumulator_value(nchan_accumulator_t *acc);
+int nchan_accumulator_init(nchan_accumulator_t *acc, nchan_accumulator_type_t type, double halflife);
+int nchan_accumulator_merge(nchan_accumulator_t *merge_dst, nchan_accumulator_t *merge_src);
+void nchan_accumulator_reset(nchan_accumulator_t *acc);
+
+#endif //NCHAN_ACCUMULATOR_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_benchmark.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_benchmark.c
new file mode 100644
index 0000000..c2ab34d
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_benchmark.c
@@ -0,0 +1,804 @@
+#include "nchan_benchmark.h"
+#include <subscribers/benchmark.h>
+#include <subscribers/websocket.h>
+#include <util/shmem.h>
+#include <store/memory/store.h>
+#include <store/memory/ipc-handlers.h>
+#include <assert.h>
+#include <sys/time.h> /* for struct timeval */
+#include <inttypes.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "BENCHMARK: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "BENCHMARK: " fmt, ##args)
+
+nchan_benchmark_t    bench;
+
+ngx_atomic_int_t    *worker_counter = NULL;
+ngx_int_t            bench_worker_number = 0;
+
+int nchan_benchmark_active(void) {
+  return bench.state && *bench.state > NCHAN_BENCHMARK_INACTIVE;
+}
+
+static ngx_int_t benchmark_client_respond(char *cstr) {
+  if(!bench.client) {
+    return NGX_ERROR;
+  }
+  nchan_msg_t    msg;
+  nchan_msg_id_t msgid = NCHAN_NEWEST_MSGID;
+  ngx_memzero(&msg, sizeof(msg));
+  msg.storage = NCHAN_MSG_STACK;
+  msg.id = msgid;
+  ngx_init_set_membuf(&msg.buf, (u_char *)cstr, (u_char *)&cstr[strlen(cstr)]);
+  msg.buf.last_buf = 1;
+  msg.buf.last_in_chain = 1;
+  bench.client->fn->respond_message(bench.client, &msg);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_init_module(ngx_cycle_t *cycle) {
+  bench.state = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_int_t), "benchmark state");
+  worker_counter = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_int_t), "benchmark worker counter");
+  bench.config = shm_calloc(nchan_store_memory_shmem, sizeof(*bench.config), "benchmark config (shared)");
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_init_worker(ngx_cycle_t *cycle) {
+  DBG("init worker");
+  bench_worker_number = ngx_atomic_fetch_add((ngx_atomic_uint_t *)worker_counter, 1);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_exit_master(ngx_cycle_t *cycle) {
+  shm_free(nchan_store_memory_shmem, bench.state);
+  shm_free(nchan_store_memory_shmem, worker_counter);
+  shm_free(nchan_store_memory_shmem, bench.config);
+  bench.state = NULL;
+  bench.config = NULL;
+  worker_counter = NULL;
+  return NGX_OK;
+}
+
+static ngx_int_t benchmark_publish_callback(ngx_int_t status, void *data, void *pd) {
+  struct      timeval tv;
+  uint64_t    t1;
+  uintptr_t   t0 = (uintptr_t )pd;
+  if(nchan_benchmark_active()) {
+    ngx_gettimeofday(&tv);
+    t1 = (tv.tv_sec - bench.time.init) * (uint64_t)1000000 + tv.tv_usec;
+    switch(status) {
+      case NCHAN_MESSAGE_QUEUED:
+      case NCHAN_MESSAGE_RECEIVED:
+        bench.data.msg_send_confirmed++;
+        break;
+      default:
+        bench.data.msg_send_failed++;
+    }
+    hdr_record_value(bench.data.msg_publishing_latency, t1-t0);
+  }
+  return NGX_OK;
+}
+
+static void benchmark_publish_message(nchan_benchmark_channel_t *chan) {
+  struct      timeval tv;
+  uint64_t    now;
+  u_char     *last;
+  uint64_t    msgnum;
+  nchan_msg_t msg;
+  ngx_str_t   channel_id;
+  
+  nchan_benchmark_channel_id(chan->n, &channel_id);
+  
+  msgnum = ngx_atomic_fetch_add(&chan->msg_count, 1);
+  
+  ngx_gettimeofday(&tv);
+  now = (tv.tv_sec - bench.time.init) * (uint64_t)1000000 + tv.tv_usec;
+  
+  last = ngx_snprintf(bench.msgbuf, 64, "%D %D zzzzzzzz", now, msgnum);
+  
+  //DBG("publish to channel %V msg #%D (t: %D)", &channel_id, msgnum, now);
+  
+  ngx_memzero(&msg, sizeof(msg));
+  msg.buf.temporary = 1;
+  msg.buf.memory = 1;
+  msg.buf.last_buf = 1;
+  msg.buf.pos = msg.buf.start = bench.msgbuf;
+  msg.buf.last = msg.buf.end = &last[bench.config->msg_padding];
+  msg.id.time = 0;
+  msg.id.tag.fixed[0] = 0;
+  msg.id.tagactive = 0;
+  msg.id.tagcount = 1;
+  msg.storage = NCHAN_MSG_STACK;
+  
+  msg.content_type = (ngx_str_t *)&NCHAN_CONTENT_TYPE_TEXT_PLAIN;
+  
+  bench.loc_conf->storage_engine->publish(&channel_id, &msg, bench.loc_conf, (callback_pt )benchmark_publish_callback, (void *)(uintptr_t)now);
+  bench.data.msg_sent++;
+}
+
+static ngx_int_t benchmark_publish_message_interval_timer(void *pd) {  
+  nchan_benchmark_channel_t *chan = pd;
+  if(!nchan_benchmark_active()) {
+    DBG("benchmark not running. stop trying to publish");
+    bench.timer.publishers[chan->n] = NULL;
+    return NGX_ABORT; //we're done here
+  }
+  
+  benchmark_publish_message(chan);
+  
+  return bench.base_msg_period;
+}
+
+static void benchmark_timer_running_stop(void *pd);
+static void benchmark_timer_finishing_check(void *pd);
+
+ngx_int_t nchan_benchmark_initialize(void) {
+  int           c, i;
+  subscriber_t **sub;
+  ngx_str_t     channel_id;
+  ngx_int_t     subs_per_channel;
+      
+  assert(bench.subs.array == NULL);
+  assert(bench.subs.n == 0);
+  
+  if(bench.config->subscriber_distribution == NCHAN_BENCHMARK_SUBSCRIBER_DISTRIBUTION_RANDOM) {
+    ngx_int_t divided_subs = bench.config->subscribers_per_channel / nchan_worker_processes;
+    ngx_int_t leftover_subs = bench.config->subscribers_per_channel % nchan_worker_processes;
+    for(c=0; c<bench.config->channels; c++) {
+      bench.subs.n += divided_subs;
+      if (c%nchan_worker_processes == bench_worker_number) {
+        bench.subs.n += leftover_subs;
+      }
+    }
+    DBG("bench.subs.n = %d", bench.subs.n);
+    bench.subs.array = ngx_alloc(sizeof(subscriber_t *) * bench.subs.n, ngx_cycle->log);
+    sub = &bench.subs.array[0];
+    
+    for(c=0; c<bench.config->channels; c++) {
+      subs_per_channel = divided_subs + (((c % nchan_worker_processes) == bench_worker_number) ? leftover_subs : 0);
+      //DBG("worker number %d channel %d subs %d", bench_worker_number, c, subs_per_channel);
+      nchan_benchmark_channel_id(c, &channel_id);
+      for(i=0; i<subs_per_channel; i++) {
+        *sub = benchmark_subscriber_create(&bench);
+        if((*sub)->fn->subscribe(*sub, &channel_id) != NGX_OK) {
+          return NGX_ERROR;
+        }
+        sub++;
+      }
+    }
+  }
+  else {
+    subs_per_channel = bench.config->subscribers_per_channel;
+    for(c=0; c<bench.config->channels; c++) {
+      nchan_benchmark_channel_id(c, &channel_id);
+      if(memstore_channel_owner(&channel_id) == ngx_process_slot) {
+        bench.subs.n += subs_per_channel;
+      }
+    }
+    bench.subs.array = ngx_alloc(sizeof(subscriber_t *) * bench.subs.n, ngx_cycle->log);
+    sub = &bench.subs.array[0];
+    
+    for(c=0; c<bench.config->channels; c++) {
+      nchan_benchmark_channel_id(c, &channel_id);
+      if(memstore_channel_owner(&channel_id) == ngx_process_slot) {
+        for(i=0; i<subs_per_channel; i++) {
+          *sub = benchmark_subscriber_create(&bench);
+          if((*sub)->fn->subscribe(*sub, &channel_id) != NGX_OK) {
+            return NGX_ERROR;
+          }
+          sub++;
+        }
+      }
+    }
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_run(void) {
+  uint64_t required_subs = bench.config->subscribers_per_channel * bench.config->channels;
+  assert(*bench.shared.subscribers_enqueued == required_subs);
+  int       i;
+  size_t msgbuf_maxlen = bench.config->msg_padding + 64;
+  unsigned pubstart;
+  //int64_t total_offset = 0;
+  bench.msgbuf = ngx_alloc(msgbuf_maxlen, ngx_cycle->log);
+  ngx_memset(bench.msgbuf, 'z', msgbuf_maxlen);
+  
+  bench.base_msg_period = 1000.0/((double)bench.config->msgs_per_minute / 60.0);
+  assert(bench.timer.publishers == NULL);
+  bench.timer.publishers = ngx_alloc(sizeof(void *) * bench.config->channels, ngx_cycle->log);
+  if(bench.config->publisher_distribution == NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_RANDOM) {
+    bench.base_msg_period *= nchan_worker_processes;
+    for(i=0; i < bench.config->channels; i++) {
+      pubstart = (rand() / (RAND_MAX / bench.base_msg_period));
+      //total_offset += pubstart;
+      bench.timer.publishers[i] = nchan_add_interval_timer(benchmark_publish_message_interval_timer, &bench.shared.channels[i], pubstart);
+    }
+  }
+  else if(bench.config->publisher_distribution == NCHAN_BENCHMARK_PUBLISHER_DISTRIBUTION_OPTIMAL) {
+    ngx_str_t channel_id;
+    for(i=0; i < bench.config->channels; i++) {
+      nchan_benchmark_channel_id(i, &channel_id);
+      if(memstore_channel_owner(&channel_id) == ngx_process_slot) {
+        pubstart = (rand() / (RAND_MAX / bench.base_msg_period));
+        //total_offset += pubstart;
+        bench.timer.publishers[i] = nchan_add_interval_timer(benchmark_publish_message_interval_timer, &bench.shared.channels[i], pubstart);
+      }
+      else {
+        bench.timer.publishers[i] = NULL;
+      }
+    }
+  }
+  
+  return NGX_OK;
+}
+
+
+ngx_int_t nchan_benchmark_dequeue_subscribers(void) {
+  unsigned i;
+  for(i=0; i < bench.subs.n; i++) {
+    bench.subs.array[i]->fn->dequeue(bench.subs.array[i]);
+  }
+  ngx_free(bench.subs.array);
+  bench.subs.array = NULL;
+  bench.subs.n = 0;
+  return NGX_OK;
+}
+
+static void benchmark_timer_running_stop(void *pd) {
+  bench.timer.running = NULL;
+  bench.time.end = ngx_time();
+  memstore_ipc_broadcast_benchmark_stop();
+  nchan_benchmark_stop();
+  bench.timer.finishing = nchan_add_oneshot_timer(benchmark_timer_finishing_check, NULL, 3000);
+}
+static void benchmark_timer_finishing_check(void *pd) {
+  bench.timer.finishing = NULL;
+  nchan_benchmark_dequeue_subscribers();
+  bench.waiting_for_results = nchan_worker_processes - 1;
+  if(bench.waiting_for_results == 0) {
+    nchan_benchmark_finish_response();
+    nchan_benchmark_finish();
+  }
+  else {
+    memstore_ipc_broadcast_benchmark_finish();
+  }
+}
+
+ngx_int_t nchan_benchmark_receive_finished_data(nchan_benchmark_data_t *data) {
+  DBG("received benchmark data");
+  assert(bench.waiting_for_results > 0);
+  bench.waiting_for_results  --;
+  bench.data.msg_sent += data->msg_sent;
+  bench.data.msg_send_confirmed += data->msg_send_confirmed;
+  bench.data.msg_send_failed += data->msg_send_failed;
+  bench.data.msg_received += data->msg_received;
+  hdr_add(bench.data.msg_delivery_latency, data->msg_delivery_latency);
+  hdr_close_nchan_shm(data->msg_delivery_latency);
+  hdr_add(bench.data.msg_publishing_latency, data->msg_publishing_latency);
+  hdr_close_nchan_shm(data->msg_publishing_latency);
+  hdr_add(bench.data.subscriber_readiness_latency, data->subscriber_readiness_latency);
+  hdr_close_nchan_shm(data->subscriber_readiness_latency);
+  
+  if(bench.waiting_for_results  == 0) {
+    nchan_benchmark_finish_response();
+    nchan_benchmark_finish();
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_finish_response(void) {
+  u_char                *str;
+  ngx_http_request_t    *r = bench.client->request;
+  ngx_str_t             *accept_header = nchan_get_accept_header_value(r);
+  const char            *fmt;
+  char stats[2048];
+  fmt = 
+    "  \"start_time\":           %d,\n"
+    "  \"run_time_sec\":         %d,\n"
+    "  \"channels\":             %d,\n"
+    "  \"subscribers\":          %d,\n"
+    "  \"message_length\":       %d,\n"
+    "  \"messages\": {\n"
+    "    \"sent\":               %d,\n"
+    "    \"send_confirmed\":     %d,\n"
+    "    \"send_unconfirmed\":   %d,\n"
+    "    \"send_failed\":        %d,\n"
+    "    \"received\":           %d,\n"
+    "    \"unreceived\":         %d\n"
+    "  },\n"
+    "  \"message_publishing_latency\": {\n"
+    "    \"min\":               \"%.3fms\",\n"
+    "    \"avg\":               \"%.3fms\",\n"
+    "    \"99th_percentile\":   \"%.3fms\",\n"
+    "    \"max\":               \"%.3fms\",\n"
+    "    \"stddev\":            \"%.3fms\",\n"
+    "    \"samples\":            %D\n"
+    "  },\n"
+    "  \"message_delivery_latency\": {\n"
+    "    \"min\":               \"%.3fms\",\n"
+    "    \"avg\":               \"%.3fms\",\n"
+    "    \"99th_percentile\":   \"%.3fms\",\n"
+    "    \"max\":               \"%.3fms\",\n"
+    "    \"stddev\":            \"%.3fms\",\n"
+    "    \"samples\":            %D\n"
+    "  }%Z";
+    
+  ngx_snprintf((u_char *)stats, 2048, fmt, 
+    bench.time.start,
+    bench.time.end - bench.time.start,
+    bench.config->channels,
+    *bench.shared.subscribers_enqueued,
+    bench.config->msg_padding + 5,
+    bench.data.msg_sent,
+    bench.data.msg_send_confirmed,
+    bench.data.msg_sent - bench.data.msg_send_confirmed,
+    bench.data.msg_send_failed,
+    bench.data.msg_received,
+    bench.data.msg_sent * bench.config->subscribers_per_channel - bench.data.msg_received,
+    (double )hdr_min(bench.data.msg_publishing_latency)/1000.0,
+    (double )hdr_mean(bench.data.msg_publishing_latency)/1000.0,
+    (double )hdr_value_at_percentile(bench.data.msg_publishing_latency, 99.0)/1000.0,
+    (double )hdr_max(bench.data.msg_publishing_latency)/1000.0,
+    (double )hdr_stddev(bench.data.msg_publishing_latency)/1000.0,
+    bench.data.msg_publishing_latency->total_count,
+    
+    (double )hdr_min(bench.data.msg_delivery_latency)/1000.0,
+    (double )hdr_mean(bench.data.msg_delivery_latency)/1000.0,
+    (double )hdr_value_at_percentile(bench.data.msg_delivery_latency, 99.0)/1000.0,
+    (double )hdr_max(bench.data.msg_delivery_latency)/1000.0,
+    (double )hdr_stddev(bench.data.msg_delivery_latency)/1000.0,
+    bench.data.msg_delivery_latency->total_count
+  );
+  if(accept_header && ngx_strnstr(accept_header->data, "text/x-json-hdrhistogram", accept_header->len)) {
+    ngx_str_t *serialized_publishing_histogram, *serialized_delivery_histogram;
+    size_t sz;
+    fmt = 
+      "RESULTS\n"
+      "{\n"
+      "%s,\n"
+      "  \"message_publishing_histogram\":\n"
+      "    \"%V\",\n"
+      "  \"message_delivery_histogram\":\n"
+      "    \"%V\"\n"
+      "}\n"
+      "%Z";
+    sz = strlen(stats) + strlen(fmt);
+    serialized_publishing_histogram = nchan_hdrhistogram_serialize(bench.data.msg_publishing_latency, r->pool);
+    serialized_delivery_histogram = nchan_hdrhistogram_serialize(bench.data.msg_delivery_latency, r->pool);
+    
+    sz += serialized_publishing_histogram->len;
+    sz += serialized_delivery_histogram->len;
+    str = ngx_palloc(r->pool, sz);
+    if(str == NULL) {
+      benchmark_client_respond("ERROR: unable to create results response");
+      return NGX_ERROR;
+    }
+    
+    ngx_snprintf(str, sz, fmt, 
+      stats,
+      serialized_publishing_histogram,
+      serialized_delivery_histogram
+    );
+  }
+  else {
+        fmt = 
+      "RESULTS\n"
+      "{\n"
+      "%s\n"
+      "}\n"
+      "%Z";
+    str = ngx_palloc(r->pool, strlen(stats) + strlen(fmt));
+    ngx_sprintf(str, fmt, stats);
+  } 
+  
+  benchmark_client_respond((char *)str);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_abort(void) {
+  int active = nchan_benchmark_active();
+  
+  nchan_benchmark_dequeue_subscribers();
+  nchan_benchmark_stop();
+  nchan_benchmark_cleanup();
+  
+  return active ? NGX_OK : NGX_DECLINED;
+}
+
+ngx_int_t nchan_benchmark_stop(void) {
+  int i;
+  DBG("stop benchmark");
+  if(bench.timer.publishers) {
+    for(i=0; i< bench.config->channels; i++) {
+      if(bench.timer.publishers[i]) {
+        nchan_abort_interval_timer(bench.timer.publishers[i]);
+      }
+    }
+    ngx_free(bench.timer.publishers);
+    bench.timer.publishers = NULL;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_finish(void) {
+  //free all the things
+  shm_free(nchan_store_memory_shmem, (void *)bench.shared.subscribers_enqueued);
+  shm_free(nchan_store_memory_shmem, (void *)bench.shared.subscribers_dequeued);
+  shm_free(nchan_store_memory_shmem, bench.shared.channels);
+  hdr_close_nchan_shm(bench.data.msg_publishing_latency);
+  hdr_close_nchan_shm(bench.data.msg_delivery_latency);
+  hdr_close_nchan_shm(bench.data.subscriber_readiness_latency);
+  bench.client->fn->respond_status(bench.client, NGX_HTTP_GONE, NULL, NULL);
+  nchan_benchmark_cleanup();
+  DBG("benchmark finished");
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_cleanup(void) {
+  DBG("benchmark cleanup");
+  bench.client = NULL;
+  assert(bench.timer.publishers == NULL);
+  assert(bench.subs.array == NULL);
+  assert(bench.subs.n == 0);
+  bench.id = 0;
+  if(bench.msgbuf) {
+    ngx_free(bench.msgbuf);
+    bench.msgbuf = NULL;
+  }
+  
+  ngx_memzero(&bench.time, sizeof(bench.time));
+  *bench.state = NCHAN_BENCHMARK_INACTIVE;
+  bench.waiting_for_results = 0;
+  
+  if(bench.timer.ready) {
+    nchan_abort_interval_timer(bench.timer.ready);
+    bench.timer.ready = NULL;
+  }
+  if(bench.timer.running) {
+    nchan_abort_oneshot_timer(bench.timer.running);
+    bench.timer.running = NULL;
+  }
+  if(bench.timer.finishing) {
+    nchan_abort_oneshot_timer(bench.timer.finishing);
+    bench.timer.finishing = NULL;
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_benchmark_channel_id(int n, ngx_str_t *chid) {
+  static u_char  id[255];
+  u_char        *last;
+  chid->data = id;
+  last = ngx_snprintf(id, 255, "/benchmark.%T-%D.%D", bench.time.init, bench.id, n);
+  chid->len = last - id;
+  return NGX_OK;
+}
+
+uint64_t nchan_benchmark_message_delivery_msec(nchan_msg_t *msg) {
+  struct timeval tv;
+  ngx_gettimeofday(&tv);
+  
+  uint64_t now = (tv.tv_sec - bench.time.init) * (uint64_t)1000000 + tv.tv_usec;
+  int then;
+  
+  if(ngx_buf_in_memory((&msg->buf))) {
+    then = atoi((char *)msg->buf.start);
+  }
+  else {
+    //not supported yet
+    then = now;
+    raise(SIGABRT);
+  }
+  
+  return now - then;
+}
+
+nchan_benchmark_t *nchan_benchmark_get_active(void) {
+  return &bench;
+}
+
+char throwaway_buf[128];
+static void serialize_int64_t(int write, char **cur, int64_t val) {
+  char  *buf;
+  buf = write ? *cur : throwaway_buf;
+  *cur += sprintf(buf, "%" PRId64 " ", val);
+}
+static void serialize_int32_t(int write, char **cur, int32_t val) {
+  char  *buf;
+  buf = write ? *cur : throwaway_buf;
+  *cur += sprintf(buf, "%" PRId32 " ", val);
+}
+static void serialize_double(int write, char **cur, double val) {
+  char  *buf;
+  buf = write ? *cur : throwaway_buf;
+  *cur += sprintf(buf, "%lf ", val);
+}
+static void serialize_numrun(int write, char **cur, int num, int runcount) {
+  char  *numrun="~!@#$%^&*";
+  char  *buf;
+  assert((size_t)num < strlen(numrun));
+  buf = write ? *cur : throwaway_buf;
+  if(runcount == 0) {
+    *cur += sprintf(buf, "%i ", num);
+  }
+  else {
+    *cur += sprintf(buf, "%c%i ", numrun[num], runcount);
+  }
+}
+
+static size_t hdrhistogram_serialize(int write, char *start, const struct hdr_histogram* hdr) {
+  int    i;
+  char  *fakestart = NULL;
+  char **cur;
+  if(start == NULL) {
+    start = fakestart;
+  }
+  cur = &start;
+  char *first = start;
+  
+  serialize_int64_t(write, cur, hdr->lowest_trackable_value);
+  serialize_int64_t(write, cur, hdr->highest_trackable_value);
+  serialize_int32_t(write, cur, hdr->unit_magnitude);
+  serialize_int32_t(write, cur, hdr->significant_figures);
+  serialize_int32_t(write, cur, hdr->sub_bucket_half_count_magnitude);
+  serialize_int32_t(write, cur, hdr->sub_bucket_half_count);
+  serialize_int64_t(write, cur, hdr->sub_bucket_mask);
+  serialize_int32_t(write, cur, hdr->sub_bucket_count);
+  serialize_int32_t(write, cur, hdr->bucket_count);
+  serialize_int64_t(write, cur, hdr->min_value);
+  serialize_int64_t(write, cur, hdr->max_value);
+  serialize_int32_t(write, cur, hdr->normalizing_index_offset);
+  serialize_double (write, cur, hdr->conversion_ratio);
+  serialize_int32_t(write, cur, hdr->counts_len);
+  serialize_int64_t(write, cur, hdr->total_count);
+  
+  if(write) {
+    **cur='[';
+  }
+  (*cur)++;
+  
+  int runcount=0;
+  int64_t ncur=0, nprev=0;
+  for(i=1, nprev=hdr->counts[0]; i<hdr->counts_len; i++) {
+    ncur = hdr->counts[i];
+    nprev = hdr->counts[i-1];
+    if(ncur <= 8 && ncur == nprev) {
+      runcount++;
+    }
+    else {
+      if(runcount > 0) {
+        serialize_numrun(write, cur, nprev, runcount+1);
+        runcount = 0;
+      }
+      else {
+        serialize_int64_t(write, cur, nprev);
+      }
+    }
+  }
+  if(runcount > 0) {
+    serialize_numrun(write, cur, ncur, runcount+1);
+  }
+  else {
+    serialize_int64_t(write, cur, ncur);
+  }
+  
+  if(write) {
+    **cur=']';
+  }
+  (*cur)++;
+  
+  return *cur - first;
+}
+
+
+ngx_str_t *nchan_hdrhistogram_serialize(const struct hdr_histogram* hdr, ngx_pool_t *pool) {
+  char *start=NULL;
+  ngx_str_t *str = ngx_palloc(pool, sizeof(*str));
+  size_t sz = hdrhistogram_serialize(0, NULL, hdr);
+  start = ngx_palloc(pool, sz);
+  hdrhistogram_serialize(1, start, hdr);
+  str->data = (u_char *)start;
+  str->len = sz;
+  return str;
+}
+
+static ngx_int_t benchmark_timer_ready_check(void *pd) {
+  uint64_t required_subs = bench.config->subscribers_per_channel * bench.config->channels;
+  if(*bench.shared.subscribers_enqueued == required_subs) {
+    char     ready_reply[512];
+    assert(*bench.state == NCHAN_BENCHMARK_INITIALIZING);
+    *bench.state = NCHAN_BENCHMARK_READY;
+    ngx_snprintf((u_char *)ready_reply, 512, "READY\n"
+      "{\n"
+      "  \"init_time\":                        %T,\n"
+      "  \"time\":                             %T,\n"
+      "  \"messages_per_channel_per_minute\":  %d,\n"
+      "  \"message_padding_bytes\":            %d,\n"
+      "  \"channels\":                         %d,\n"
+      "  \"subscribers_per_channel\":          %d\n"
+      "}\n%Z",
+      bench.time.init,
+      bench.config->time,
+      bench.config->msgs_per_minute,
+      bench.config->msg_padding,
+      bench.config->channels,
+      bench.config->subscribers_per_channel);
+    
+    benchmark_client_respond(ready_reply);
+    bench.timer.ready = NULL;
+    return NGX_DONE;
+  }
+  else {
+    return NGX_AGAIN;
+  }
+}
+
+ngx_int_t nchan_benchmark_initialize_from_ipc(ngx_int_t initiating_worker_slot, nchan_loc_conf_t *cf, time_t init_time, uint32_t id, nchan_benchmark_shared_t *shared_data) {
+  DBG("init benchmark via IPC (time %d src %d)", init_time, initiating_worker_slot);
+  bench.loc_conf = cf;
+  bench.time.init = init_time;
+  bench.id = id;
+  bench.shared = *shared_data;
+  ngx_memzero(&bench.data, sizeof(bench.data));
+  hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_delivery_latency);
+  hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_publishing_latency);
+  hdr_init_nchan_shm(1, 10000000, 3, &bench.data.subscriber_readiness_latency);
+  
+  nchan_benchmark_initialize();
+  
+  return NGX_OK;
+}
+
+static ngx_int_t init_command_get_config_value(const char *config, ngx_str_t *cmd, ngx_int_t *val) {
+  ngx_str_t find;
+  u_char   *cur = cmd->data, *end = cmd->data + cmd->len, *vend;
+  find.data = (u_char *)config;
+  find.len = strlen(config);
+  if(nchan_strscanstr(&cur, &find, end)) {
+    if((vend = memchr(cur, ' ', end - cur)) == NULL) {
+      vend = end;
+    }
+    if((*val = ngx_atoi(cur, vend - cur)) == NGX_ERROR) {
+      return 0;
+    }
+    else {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+static void benchmark_controller(subscriber_t *sub, nchan_msg_t *msg) {
+  ngx_str_t            cmd = {msg->buf.last - msg->buf.pos, msg->buf.pos};
+  ngx_http_request_t  *r = sub->request;
+  nchan_loc_conf_t   *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  
+  if(nchan_str_startswith(&cmd, "init")) {
+    int       i;
+    ngx_int_t val;
+    
+    if(!ngx_atomic_cmp_set((ngx_atomic_uint_t *)bench.state, NCHAN_BENCHMARK_INACTIVE, NCHAN_BENCHMARK_INITIALIZING)) {
+      benchmark_client_respond("ERROR: a benchmark is already initialized");
+      return;
+    }
+    
+    DBG("init benchmark");
+    benchmark_client_respond("INITIALIZING");
+    
+    bench.loc_conf = cf;
+    *bench.config = cf->benchmark;
+    
+    if(init_command_get_config_value(" time=", &cmd, &val)) {
+      bench.config->time = val;
+    }
+    if(init_command_get_config_value(" messages_per_channel_per_minute=", &cmd, &val)) {
+      bench.config->msgs_per_minute = val;
+    }
+    if(init_command_get_config_value(" message_padding_bytes=", &cmd, &val)) {
+      bench.config->msg_padding = val;
+    }
+    if(init_command_get_config_value(" channels=", &cmd, &val)) {
+      bench.config->channels = val;
+    }
+    if(init_command_get_config_value(" subscribers_per_channel=", &cmd, &val)) {
+      bench.config->subscribers_per_channel = val;
+    }
+    
+    bench.time.init = ngx_time();
+    bench.id = rand();
+    bench.client = sub;
+    ngx_memzero(&bench.data, sizeof(bench.data));
+    
+    bench.shared.subscribers_enqueued = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_t), "hdrhistogram subscribers_enqueued count");
+    bench.shared.subscribers_dequeued = shm_calloc(nchan_store_memory_shmem, sizeof(ngx_atomic_t), "hdrhistogram subscribers_dequeued count");
+    bench.shared.channels = shm_calloc(nchan_store_memory_shmem, sizeof(nchan_benchmark_channel_t) * bench.config->channels, "benchmark channel states");
+    hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_delivery_latency);
+    hdr_init_nchan_shm(1, 10000000, 3, &bench.data.msg_publishing_latency);
+    hdr_init_nchan_shm(1, 10000000, 3, &bench.data.subscriber_readiness_latency);
+    
+    for(i=0; i<bench.config->channels; i++) {
+      bench.shared.channels[i].n=i;
+      bench.shared.channels[i].msg_count=0;
+    }
+    
+    bench.msgbuf = NULL;
+    
+    //broadcast workload to other workers
+    memstore_ipc_broadcast_benchmark_initialize(&bench);
+    
+    nchan_benchmark_initialize();
+    
+    bench.timer.ready = nchan_add_interval_timer(benchmark_timer_ready_check, NULL, 250);
+  }
+  else if(nchan_strmatch(&cmd, 2, "run", "start")) {
+    if(!ngx_atomic_cmp_set((ngx_atomic_uint_t *)bench.state, NCHAN_BENCHMARK_READY, NCHAN_BENCHMARK_RUNNING)) {
+      benchmark_client_respond(*bench.state < NCHAN_BENCHMARK_READY ? "ERROR: not ready" : "ERROR: already running");
+      return;
+    }
+    
+    bench.time.start = ngx_time();
+    benchmark_client_respond("RUNNING");
+    
+    memstore_ipc_broadcast_benchmark_run();
+    nchan_benchmark_run();
+    
+    bench.timer.running = nchan_add_oneshot_timer(benchmark_timer_running_stop, NULL, bench.config->time * 1000);
+  }
+  else if(nchan_strmatch(&cmd, 2, "finish", "end")) {
+    //benchmark_finish();
+  }
+  else if(nchan_strmatch(&cmd, 1, "abort"))  {
+    if(nchan_benchmark_abort() == NGX_OK) {
+      memstore_ipc_broadcast_benchmark_abort();
+      benchmark_client_respond("ABORTED");
+    }
+    else {
+      benchmark_client_respond("ERROR: no active benchmark to abort");
+    }
+  }
+  else {
+    benchmark_client_respond("ERROR: unknown command");
+  }
+}
+
+static void benchmark_request_cleanup_handler(void *pd) {
+  if(nchan_benchmark_abort() == NGX_OK) {
+    memstore_ipc_broadcast_benchmark_abort();
+  }
+  bench.client = NULL;
+}
+
+ngx_int_t nchan_benchmark_ws_initialize(ngx_http_request_t *r) {
+  nchan_msg_id_t          newest_msgid = NCHAN_NEWEST_MSGID;
+  ngx_http_cleanup_t     *cln;
+  if(!nchan_detect_websocket_request(r)) {
+    return NGX_HTTP_BAD_REQUEST;
+  }
+  
+  if(nchan_benchmark_active()) {
+    return nchan_respond_cstring(r, NGX_HTTP_CONFLICT, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "benchmark already running", 0);
+  }
+  if(bench.client) {
+    return nchan_respond_cstring(r, NGX_HTTP_CONFLICT, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, "benchmark client already running", 0);
+  }
+  if((cln = ngx_http_cleanup_add(r, 0)) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  cln->data = NULL;
+  cln->handler = benchmark_request_cleanup_handler;
+  if((bench.client = websocket_subscriber_create(r, &newest_msgid)) == NULL) {
+    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+  }
+  websocket_intercept_published_message(bench.client, &benchmark_controller);
+  bench.client->fn->enqueue(bench.client);
+  
+  
+  return NGX_DONE;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_benchmark.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_benchmark.h
new file mode 100644
index 0000000..c9bab81
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_benchmark.h
@@ -0,0 +1,91 @@
+#ifndef NCHAN_BENCHMARK_H
+#define NCHAN_BENCHMARK_H
+
+#include <nchan_module.h>
+#include <util/hdr_histogram.h>
+
+typedef struct {
+  struct hdr_histogram* msg_publishing_latency;
+  struct hdr_histogram* msg_delivery_latency;
+  struct hdr_histogram* subscriber_readiness_latency;
+  uint64_t              msg_sent;
+  uint64_t              msg_send_confirmed;
+  uint64_t              msg_send_failed;
+  uint64_t              msg_received;
+} nchan_benchmark_data_t;
+
+typedef struct {
+  uint64_t              n;
+  ngx_atomic_t          msg_count;
+  u_char               *msgbuf;
+} nchan_benchmark_channel_t;
+
+typedef struct {
+  ngx_atomic_t              *subscribers_enqueued;
+  ngx_atomic_t              *subscribers_dequeued;
+  nchan_benchmark_channel_t *channels;
+} nchan_benchmark_shared_t;
+
+
+#define NCHAN_BENCHMARK_INACTIVE      0
+#define NCHAN_BENCHMARK_INITIALIZING  1
+#define NCHAN_BENCHMARK_READY         2
+#define NCHAN_BENCHMARK_RUNNING       3
+#define NCHAN_BENCHMARK_FINISHED      4
+
+typedef struct nchan_benchmark_s nchan_benchmark_t;
+struct nchan_benchmark_s {
+  subscriber_t       *client;
+  nchan_benchmark_conf_t   *config;
+  nchan_loc_conf_t   *loc_conf;
+  uint32_t            id;
+  struct {
+    time_t              init;
+    time_t              start;
+    time_t              end;
+  }                   time;
+  struct {
+    void             *ready;
+    void             *running;
+    void             *finishing;
+    void            **publishers;
+  }                   timer;
+  u_char             *msgbuf;
+  ngx_atomic_int_t   *state;
+  struct {
+    size_t              n;
+    subscriber_t      **array;
+  }                   subs;
+  unsigned            base_msg_period;
+  int                 waiting_for_results;
+  nchan_benchmark_shared_t shared;
+  nchan_benchmark_data_t data;
+  
+}; //nchan_benchmark_t
+
+int nchan_benchmark_active(void);
+  
+ngx_int_t nchan_benchmark_init_module(ngx_cycle_t *cycle);
+ngx_int_t nchan_benchmark_init_worker(ngx_cycle_t *cycle);
+ngx_int_t nchan_benchmark_exit_master(ngx_cycle_t *cycle);
+
+ngx_int_t nchan_benchmark_initialize(void);
+ngx_int_t nchan_benchmark_initialize_from_ipc(ngx_int_t initiating_worker_slot, nchan_loc_conf_t *cf, time_t time_start, uint32_t id, nchan_benchmark_shared_t *shared_data);
+ngx_int_t nchan_benchmark_run(void);
+
+ngx_int_t nchan_benchmark_stop(void);
+ngx_int_t nchan_benchmark_dequeue_subscribers(void);
+ngx_int_t nchan_benchmark_finish_response(void);
+ngx_str_t *nchan_hdrhistogram_serialize(const struct hdr_histogram* hdr, ngx_pool_t *pool);
+ngx_int_t nchan_benchmark_receive_finished_data(nchan_benchmark_data_t *data);
+ngx_int_t nchan_benchmark_finish(void);
+ngx_int_t nchan_benchmark_abort(void);
+ngx_int_t nchan_benchmark_cleanup(void);
+
+ngx_int_t nchan_benchmark_channel_id(int n, ngx_str_t *chid);
+uint64_t nchan_benchmark_message_delivery_msec(nchan_msg_t *msg);
+nchan_benchmark_t *nchan_benchmark_get_active(void);
+
+
+ngx_int_t nchan_benchmark_ws_initialize(ngx_http_request_t *r);
+#endif //NCHAN_BENCHMARK_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_bufchainpool.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_bufchainpool.c
new file mode 100644
index 0000000..2148c11
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_bufchainpool.c
@@ -0,0 +1,237 @@
+#include <nchan_module.h>
+#include <util/nchan_output.h>
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "BUFCHAINPOOL:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "BUFCHAINPOOL:" fmt, ##arg)
+/*
+static void validate_stuff(nchan_bufchain_pool_t *bcp) {
+  nchan_bufchain_link_t      *cur;
+  nchan_file_link_t          *fcur;
+  int                         bcs=0, rbcs = 0, files=0, rfiles = 0;
+  for(cur = bcp->bc_head; cur != NULL; cur = cur->next) {
+    bcs++;
+  }
+  assert(bcs == bcp->bc_count);
+  for(cur = bcp->bc_recycle_head; cur != NULL; cur = cur->next) {
+    rbcs++;
+  }
+  assert(rbcs == bcp->bc_recycle_count);
+  for(fcur = bcp->file_head; fcur != NULL; fcur = fcur->next) {
+    files++;
+  }
+  assert(files == bcp->file_count);
+  for(fcur = bcp->file_recycle_head; fcur != NULL; fcur = fcur->next) {
+    rfiles++;
+  }
+  assert(rfiles == bcp->file_recycle_count);
+}
+*/
+
+
+
+nchan_buf_and_chain_t *nchan_bufchain_pool_reserve(nchan_bufchain_pool_t *bcp, ngx_int_t count) {
+  nchan_bufchain_link_t      *cur = NULL, *last = NULL, *first = NULL;
+  nchan_bufchain_link_t      **rhead = &bcp->bc_recycle_head;
+  //validate_stuff(bcp);
+  if(count <= 0) {
+    return NULL;
+  }
+  while(count > 0) {
+    if(*rhead) {
+      cur = *rhead;
+      *rhead = cur->next;
+      bcp->bc_recycle_count --;
+    } else {
+      cur = ngx_palloc(bcp->pool, sizeof(*cur));
+      cur->bc.chain.buf = &cur->bc.buf;
+    }
+    if(!first) {
+      first = cur;
+    }
+    if(last) {
+      last->next = cur;
+      last->bc.chain.next = &cur->bc.chain;
+    }
+    last = cur;
+    count --;
+    bcp->bc_count++;
+  }
+  last->next = bcp->bc_head;
+  last->bc.chain.next=NULL;
+  bcp->bc_head = first;
+  DBG("%p bcs %i (rec. %i), files %i (rec. %i)", bcp, bcp->bc_count, bcp->bc_recycle_count, bcp->file_count, bcp->file_recycle_count);
+  //validate_stuff(bcp);
+  return &first->bc;
+}
+
+static ngx_buf_t *nchan_bufchain_append(nchan_bufchain_pool_t *bcp) {
+  static ngx_buf_t            throwaway;
+  ngx_chain_t                *chain;
+  ngx_chain_t               **rhead = &bcp->bc.recycle_head;
+  
+  if(*rhead) {
+    chain = *rhead;
+    *rhead = chain->next;
+    bcp->bc.recycle_count --;
+  } 
+  else {
+    nchan_buf_and_chain_t *bufchain = ngx_palloc(bcp->pool, sizeof(*bufchain));
+    if(bufchain == NULL) {
+      nchan_log_error("unable to palloc bufchain");
+      return &throwaway;
+    }
+    chain = &bufchain->chain;
+    chain->buf = &bufchain->buf;
+  }
+  
+  chain->buf->last_buf = 1;
+  chain->buf->last_in_chain = 1;
+  chain->next = NULL;
+  
+  if(!bcp->bc.head) {
+    bcp->bc.head = chain;
+  }
+  
+  if(bcp->bc.tail) {
+    ngx_buf_t *tbuf = bcp->bc.tail->buf;
+    tbuf->last_buf = 0;
+    tbuf->last_in_chain = 0;
+    bcp->bc.tail->next = chain;
+  }
+  bcp->bc.tail = chain;
+  bcp->bc.count++;
+  return chain->buf;
+}
+
+ngx_int_t nchan_bufchain_append_buf(nchan_bufchain_pool_t *bcp, ngx_buf_t *inbuf) {
+  ngx_buf_t *buf = nchan_bufchain_append(bcp);
+  *buf = *inbuf;
+  buf->last_buf = 1;
+  buf->last_in_chain = 1;
+  bcp->bc.length += ngx_buf_size(inbuf);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_bufchain_append_str(nchan_bufchain_pool_t *bcp, ngx_str_t *str) {
+  ngx_buf_t *buf = nchan_bufchain_append(bcp);
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = str->data;
+  buf->pos = buf->start;
+  buf->end = str->data + str->len;
+  buf->last = buf->end;
+  buf->memory = 1;
+  buf->last_buf = 1;
+  buf->last_in_chain = 1;
+  bcp->bc.length += str->len;
+  return NGX_OK;
+}
+ngx_int_t nchan_bufchain_append_cstr(nchan_bufchain_pool_t *bcp, char *cstr) {
+  ngx_str_t str;
+  str.data = (u_char *)cstr;
+  str.len = strlen(cstr);
+  return nchan_bufchain_append_str(bcp, &str);
+}
+
+size_t nchan_bufchain_length(nchan_bufchain_pool_t *bcp) {
+  return bcp->bc.length;
+}
+ngx_chain_t *nchan_bufchain_first_chain(nchan_bufchain_pool_t *bcp) {
+  return bcp->bc.head;
+}
+
+
+ngx_file_t *nchan_bufchain_pool_reserve_file(nchan_bufchain_pool_t *bcp) {
+  nchan_file_link_t    *cur;
+  //validate_stuff(bcp);
+  if(bcp->file_recycle_head) {
+    cur = bcp->file_recycle_head;
+    bcp->file_recycle_head = cur->next;
+    bcp->file_recycle_count --;
+  }
+  else {
+    cur = ngx_palloc(bcp->pool, sizeof(*cur));
+  }
+  cur->next = bcp->file_head;
+  bcp->file_head = cur;
+  bcp->file_count++;
+  DBG("%p bcs %i (rec. %i), files %i (rec. %i)", bcp, bcp->bc_count, bcp->bc_recycle_count, bcp->file_count, bcp->file_recycle_count);
+  //validate_stuff(bcp);
+  return &cur->file;
+}
+
+void nchan_bufchain_pool_refresh_files(nchan_bufchain_pool_t *bcp) {
+  nchan_file_link_t    *cur;
+  //validate_stuff(bcp);
+  for(cur = bcp->file_head; cur != NULL; cur = cur->next) {
+    cur->file.fd = nchan_fdcache_get(&cur->file.name);
+  }
+}
+
+ngx_int_t nchan_bufchain_pool_init(nchan_bufchain_pool_t *bcp, ngx_pool_t *pool) {
+  bcp->bc_count = 0;
+  bcp->file_count = 0;
+  
+  bcp->bc_recycle_count = 0;
+  bcp->file_recycle_count = 0;
+  
+  bcp->bc_head = NULL;
+  bcp->bc_recycle_head = NULL;
+  
+  bcp->bc.head = NULL;
+  bcp->bc.tail = NULL;
+  bcp->bc.recycle_head = NULL;
+  bcp->bc.count = 0;
+  bcp->bc.recycle_count = 0;
+  bcp->bc.length = 0;
+  
+  bcp->file_head = NULL;
+  bcp->file_recycle_head = NULL;
+  
+  bcp->pool = pool;
+  //validate_stuff(bcp);
+  return NGX_OK;
+}
+
+void nchan_bufchain_pool_flush(nchan_bufchain_pool_t *bcp) {
+  nchan_bufchain_link_t      *cur;
+  nchan_file_link_t          *fcur, **fhead = &bcp->file_head, **rfhead = &bcp->file_recycle_head;
+  //validate_stuff(bcp);
+  
+  if(bcp->bc.tail) {
+    bcp->bc.tail->next = bcp->bc.recycle_head; //link just-used and recycled-in-waiting chains
+  }
+  bcp->bc.recycle_head = bcp->bc.head;
+  bcp->bc.recycle_count += bcp->bc.count;
+  bcp->bc.count = 0;
+  bcp->bc.length = 0;
+  bcp->bc.tail = NULL;
+  bcp->bc.head = NULL;
+  
+  while(bcp->bc_head != NULL) {
+    cur = bcp->bc_head;
+    bcp->bc_head = cur->next;
+    
+    cur->next = bcp->bc_recycle_head;
+    bcp->bc_recycle_head = cur;
+    bcp->bc_count--;
+    bcp->bc_recycle_count ++;
+  }
+  assert(bcp->bc_count == 0);
+  //validate_stuff(bcp);
+  while(*fhead) {
+    fcur = *fhead;
+    *fhead = fcur->next;
+    
+    fcur->next = *rfhead;
+    *rfhead = fcur;
+    bcp->file_count--;
+    bcp->file_recycle_count ++;
+  }
+  assert(bcp->file_count == 0);
+  //validate_stuff(bcp);
+  DBG("%p bcs %i (rec. %i), files %i (rec. %i)", bcp, bcp->bc_count, bcp->bc_recycle_count, bcp->file_count, bcp->file_recycle_count);
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_bufchainpool.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_bufchainpool.h
new file mode 100644
index 0000000..fa12299
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_bufchainpool.h
@@ -0,0 +1,56 @@
+#ifndef NCHAN_BUFCHAINPOOL_H
+#define NCHAN_BUFCHAINPOOL_H
+#include <nchan_module.h>
+
+typedef struct {
+  ngx_chain_t     chain;
+  ngx_buf_t       buf;
+} nchan_buf_and_chain_t;
+
+typedef struct nchan_bufchain_link_s nchan_bufchain_link_t;
+struct nchan_bufchain_link_s {
+  nchan_bufchain_link_t    *next;
+  nchan_buf_and_chain_t     bc;
+};
+
+typedef struct nchan_file_link_s nchan_file_link_t;
+struct nchan_file_link_s{
+  nchan_file_link_t        *next;
+  ngx_file_t                file;
+};
+
+typedef struct {
+  ngx_int_t                  bc_count;
+  ngx_int_t                  file_count;
+  ngx_int_t                  bc_recycle_count;
+  ngx_int_t                  file_recycle_count;
+  nchan_bufchain_link_t     *bc_head;
+  nchan_bufchain_link_t     *bc_recycle_head;
+  nchan_file_link_t         *file_head;
+  nchan_file_link_t         *file_recycle_head;
+  ngx_pool_t                *pool;
+  
+  struct {
+    size_t                     length;
+    ngx_int_t                  count;
+    ngx_chain_t               *head;
+    ngx_chain_t               *tail;
+    
+    ngx_int_t                  recycle_count;
+    ngx_chain_t               *recycle_head;
+  }                          bc;
+} nchan_bufchain_pool_t;
+
+ngx_int_t nchan_bufchain_pool_init(nchan_bufchain_pool_t *bcp, ngx_pool_t *pool);
+nchan_buf_and_chain_t *nchan_bufchain_pool_reserve(nchan_bufchain_pool_t *bcp, ngx_int_t count);
+ngx_file_t *nchan_bufchain_pool_reserve_file(nchan_bufchain_pool_t *bcp);
+void nchan_bufchain_pool_refresh_files(nchan_bufchain_pool_t *bcp);
+void nchan_bufchain_pool_flush(nchan_bufchain_pool_t *bcp);
+
+ngx_chain_t *nchan_bufchain_first_chain(nchan_bufchain_pool_t *bcp);
+size_t nchan_bufchain_length(nchan_bufchain_pool_t *bcp);
+ngx_int_t nchan_bufchain_append_buf(nchan_bufchain_pool_t *bcp, ngx_buf_t *buf);
+ngx_int_t nchan_bufchain_append_str(nchan_bufchain_pool_t *bcp, ngx_str_t *str);
+ngx_int_t nchan_bufchain_append_cstr(nchan_bufchain_pool_t *bcp, char *cstr);
+
+#endif //NCHAN_BUFCHAINPOOL_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_channel_id.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_channel_id.c
new file mode 100644
index 0000000..1c761e1
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_channel_id.c
@@ -0,0 +1,316 @@
+#include <nchan_module.h>
+#include <assert.h>
+
+static ngx_int_t validate_id(ngx_http_request_t *r, ngx_str_t *id, nchan_loc_conf_t *cf) {
+  if(id->len > (unsigned )cf->max_channel_id_length) {
+    nchan_log_request_warning(r, "channel id is too long: should be at most %i, is %i.", cf->max_channel_id_length, id->len);
+    return NGX_ERROR;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_channel_id_is_multi(ngx_str_t *id) {
+  u_char         *cur = id->data;
+  return (id->len >= 3 && cur[0] == 'm' && cur[1] == '/' && cur[2] == NCHAN_MULTI_SEP_CHR);
+}
+
+
+
+static ngx_int_t nchan_process_multi_channel_id(ngx_http_request_t *r, nchan_complex_value_arr_t *idcf, nchan_loc_conf_t *cf, ngx_str_t **ret_id) {
+  ngx_int_t                   i, n = idcf->n, n_out = 0;
+  ngx_str_t                   id[NCHAN_MULTITAG_MAX];
+  ngx_str_t                  *id_out;
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_str_t                  *group = nchan_get_group_name(r, cf, ctx);
+  if(group == NULL) {
+    return NGX_ERROR;
+  }
+  size_t                      sz = 0, grouplen = group->len;
+  u_char                     *cur;
+  
+  //static ngx_str_t            empty_string = ngx_string("");
+  
+  for(i=0; i < n && n_out < NCHAN_MULTITAG_MAX; i++) {
+    ngx_http_complex_value(r, idcf->cv[i], &id[n_out]);
+    if(validate_id(r, &id[n_out], cf) != NGX_OK) {
+      *ret_id = NULL;
+      return NGX_DECLINED;
+    }
+    
+    if(cf->channel_id_split_delimiter.len > 0) {
+      ngx_str_t  *delim = &cf->channel_id_split_delimiter;
+      u_char     *cur_last, *last;
+      cur = id[n_out].data;
+      last = cur + id[n_out].len;
+      
+      u_char     *cur_first = cur;
+      while ((cur_last = nchan_strsplit(&cur, delim, last)) != NULL) {
+        if(n_out >= NCHAN_MULTITAG_MAX) {
+          nchan_log_warning("can't exceed %d channels on a single multiplexed location", NCHAN_MULTITAG_MAX);
+          *ret_id = NULL;
+          return NGX_DECLINED;
+        }
+        id[n_out].data = cur_first;
+        id[n_out].len = cur_last - cur_first;
+        cur_first = cur;
+        sz += id[n_out].len + 1 + grouplen; // "group/<channel-id>"
+        if(n_out < NCHAN_MULTITAG_REQUEST_CTX_MAX) {
+          ctx->channel_id[n_out] = id[n_out];
+        }
+        n_out++;
+      }
+      
+    }
+    else {
+      if(n_out >= NCHAN_MULTITAG_MAX) {
+        nchan_log_warning("can't exceed %d channels on a single multiplexed location", NCHAN_MULTITAG_MAX);
+        *ret_id = NULL;
+        return NGX_DECLINED;
+      }
+      sz += id[n_out].len + 1 + grouplen; // "group/<channel-id>"
+      if(n_out < NCHAN_MULTITAG_REQUEST_CTX_MAX) {
+        ctx->channel_id[n_out] = id[n_out];
+      }
+      n_out++;
+    }
+  }
+  if(n_out>1) {
+    sz += 3 + n_out; //space for null-separators and "m/<SEP>" prefix for multi-chid
+  }
+  if(ctx) {
+    ctx->channel_id_count = n_out;
+    //for(; i < NCHAN_MULTITAG_REQUEST_CTX_MAX; i++) {
+    //  ctx->channel_id[i] = empty_string;
+    //}
+  }
+
+  if((id_out = ngx_palloc(r->pool, sizeof(*id_out) + sz)) == NULL) {
+    nchan_log_warning("can't allocate space for channel id");
+    *ret_id = NULL;
+    return NGX_ERROR;
+  }
+  id_out->len = sz;
+  id_out->data = (u_char *)&id_out[1];
+  cur = id_out->data;
+  
+  if(n_out > 1) {
+    cur[0]='m';
+    cur[1]='/';
+    cur[2]=NCHAN_MULTI_SEP_CHR;
+    cur+=3;
+  }
+  
+  for(i = 0; i < n_out; i++) {
+    ngx_memcpy(cur, group->data, grouplen);
+    cur += grouplen;
+    cur[0] = '/';
+    cur++;
+    ngx_memcpy(cur, id[i].data, id[i].len);
+    cur += id[i].len;
+    if(n_out>1) {
+      cur[0] = NCHAN_MULTI_SEP_CHR;
+      cur++;
+    }
+  }
+  *ret_id = id_out;
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_process_legacy_channel_id(ngx_http_request_t *r, nchan_loc_conf_t *cf, ngx_str_t **ret_id) {
+  static ngx_str_t            channel_id_var_name = ngx_string("push_channel_id");
+  ngx_uint_t                  key = ngx_hash_key(channel_id_var_name.data, channel_id_var_name.len);
+  ngx_http_variable_value_t  *vv = NULL;
+  nchan_request_ctx_t        *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_str_t                  *group = nchan_get_group_name(r, cf, ctx);
+  ngx_str_t                   tmpid;
+  ngx_str_t                  *id;
+  size_t                      sz;
+  u_char                     *cur;
+  
+  
+  ctx->channel_id_count = 0;
+  
+  vv = ngx_http_get_variable(r, &channel_id_var_name, key);
+  if (vv == NULL || vv->not_found || vv->len == 0) {
+    //nchan_log_warning("the legacy $push_channel_id variable is not set");
+    return NGX_ABORT;
+  }
+  else {
+    tmpid.len = vv->len;
+    tmpid.data = vv->data;
+  }
+  
+  if(validate_id(r, &tmpid, cf) != NGX_OK) {
+    *ret_id = NULL;
+    return NGX_DECLINED;
+  }
+  
+  sz = group->len + 1 + tmpid.len;
+  if((id = ngx_palloc(r->pool, sizeof(*id) + sz)) == NULL) {
+    nchan_log_error("can't allocate space for legacy channel id");
+    *ret_id = NULL;
+    return NGX_ERROR;
+  }
+  id->len = sz;
+  id->data = (u_char *)&id[1];
+  cur = id->data;
+  
+  ngx_memcpy(cur, group->data, group->len);
+  cur += group->len;
+  cur[0]='/';
+  cur++;
+  ngx_memcpy(cur, tmpid.data, tmpid.len);
+  
+  ctx->channel_id_count = 1;
+  ctx->channel_id[0] = *id;
+  
+  *ret_id = id;
+  return NGX_OK;
+}
+
+ngx_str_t nchan_get_group_from_channel_id(ngx_str_t *id) {
+  ngx_str_t group;
+  u_char *cur, *end;
+  size_t  len;
+  if(nchan_channel_id_is_multi(id)) {
+    cur = &id->data[3];
+    len = id->len - 3;
+  }
+  else {
+    cur = id->data;
+    len = id->len;
+  }
+  end = memchr(cur, '/', len);
+  
+  assert(end); //if slash wasn't found, we have a malformed id string. 
+  //this is crashworthy to investigate how it happened.
+  
+  group.data = cur;
+  group.len = (end - cur);
+  
+  return group;
+}
+
+ngx_str_t *nchan_get_group_name(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx) {
+  if(!ctx->channel_group_name) {
+    if((ctx->channel_group_name = ngx_palloc(r->pool, sizeof(*ctx->channel_group_name))) == NULL) {
+      nchan_log_request_error(r, "couldn't allocate a tiny little channel group string.");
+      return NULL;
+    }
+    
+    if(cf->channel_group == NULL) {
+      ctx->channel_group_name->len = 0;
+      ctx->channel_group_name->data = NULL;
+    }
+    else {
+      ngx_http_complex_value(r, cf->channel_group, ctx->channel_group_name);
+    }
+  }
+  
+  return ctx->channel_group_name;
+}
+
+ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_int_t fail_hard) {
+  static const ngx_str_t          NO_CHANNEL_ID_MESSAGE = ngx_string("No channel id provided.");
+  nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  ngx_int_t                       rc;
+  ngx_str_t                      *id = NULL;
+  nchan_complex_value_arr_t      *chid_conf;
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_str_t                      *group = nchan_get_group_name(r, cf, ctx);
+  
+  //validate group
+  if(group->len == 1 && group->data[0]=='m') {
+    nchan_log_request_warning(r, "channel group \"m\" is reserved and cannot be used in a request.");
+    rc = NGX_DECLINED;
+    goto done;
+  }
+  else if(memchr(group->data, '/', group->len)) {
+    nchan_log_request_warning(r, "character \"/\" not allowed in channel group.");
+    rc = NGX_DECLINED;
+    goto done;
+  }
+  
+  chid_conf = what == PUB ? &cf->pub_chid : &cf->sub_chid;
+  if(chid_conf->n == 0) {
+    chid_conf = &cf->pubsub_chid;
+  }
+  
+  if(chid_conf->n > 0) {
+    rc = nchan_process_multi_channel_id(r, chid_conf, cf, &id);
+  }
+  else {
+    //fallback to legacy $push_channel_id
+    rc = nchan_process_legacy_channel_id(r, cf, &id);
+  }
+  
+  if(cf->redis.enabled && id) {
+    // make sure all closing curlybrace '}' are silently and unambiguously replaced by \31
+    // that's because failing to do so will mess up cluster sharding {channel key strings}
+    // it's not pretty, but it _is_ good enough.
+    ngx_str_t id_cur = *id;
+    char     *cur;
+    if(memchr(id_cur.data, '\31', id_cur.len)) {
+      nchan_log_request_warning(r, "character \\31 not allowed in channel id when using Redis.");
+      id = NULL;
+      rc = NGX_DECLINED;
+      goto done;
+    }
+    
+    while((cur = memchr(id_cur.data, '}', id_cur.len)) != NULL) {
+      *cur='\31';
+      id_cur.len -= (cur - (char *)id_cur.data + 1);
+      id_cur.data = (u_char *)cur + 1;
+    }
+  }
+
+done:
+  if(id == NULL && fail_hard) {
+    assert(rc != NGX_OK);
+    switch(rc) {
+      case NGX_ERROR:
+        nchan_respond_status(r, NGX_HTTP_INTERNAL_SERVER_ERROR, NULL, NULL, 0);
+        break;
+      
+      case NGX_DECLINED:
+        nchan_respond_status(r, NGX_HTTP_FORBIDDEN, NULL, NULL, 0);
+        break;
+      
+      case NGX_ABORT:
+        nchan_respond_string(r, NGX_HTTP_NOT_FOUND, &NCHAN_CONTENT_TYPE_TEXT_PLAIN, &NO_CHANNEL_ID_MESSAGE, 0);
+        break;
+    }
+    //DBG("%s channel id NULL", what == PUB ? "pub" : "sub");
+  }
+  else {
+    //DBG("%s channel id %V", what == PUB ? "pub" : "sub", id);
+  }
+  
+  return id;
+}
+
+
+ngx_str_t *nchan_get_subscriber_info_response_channel_id(ngx_http_request_t *r, uintptr_t request_id) {
+  nchan_request_ctx_t    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  ngx_str_t *chid = ctx->subscriber_info_response_channel_id;
+  if(!chid) {
+    chid = ngx_palloc(r->pool, sizeof(ngx_str_t));
+    if(chid == NULL) {
+      return NULL;
+    }
+    ctx->subscriber_info_response_channel_id = chid;
+    
+    chid->data = ngx_palloc(r->pool, NCHAN_SUBSCRIBER_INFO_CHANNEL_ID_BUFFER_SIZE);
+    if(chid->data == NULL) {
+      ctx->subscriber_info_response_channel_id = NULL;
+      return NULL;
+    }
+  }
+    
+  u_char *end = ngx_snprintf(chid->data, NCHAN_SUBSCRIBER_INFO_CHANNEL_ID_BUFFER_SIZE, "meta/sr%d", (ngx_int_t )request_id);
+  chid->len = end - chid->data;
+  
+  return chid;
+  
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_channel_id.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_channel_id.h
new file mode 100644
index 0000000..0276227
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_channel_id.h
@@ -0,0 +1,6 @@
+ngx_str_t *nchan_get_channel_id(ngx_http_request_t *r, pub_or_sub_t what, ngx_int_t fail_hard);
+ngx_int_t nchan_channel_id_is_multi(ngx_str_t *id);
+ngx_str_t *nchan_get_group_name(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
+ngx_str_t nchan_get_group_from_channel_id(ngx_str_t *id);
+
+ngx_str_t *nchan_get_subscriber_info_response_channel_id(ngx_http_request_t *r, uintptr_t request_id);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_debug.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_debug.c
new file mode 100644
index 0000000..0092c51
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_debug.c
@@ -0,0 +1,81 @@
+#include "nchan_debug.h"
+#include <assert.h>
+
+#define STRINGIFY_ENUM(val) \
+  case val:                 \
+    return #val;
+
+char *nchan_msg_status_to_cstr(nchan_msg_status_t status) {
+  switch(status) {
+    STRINGIFY_ENUM(MSG_CHANNEL_NOTREADY)
+    STRINGIFY_ENUM(MSG_INVALID)
+    STRINGIFY_ENUM(MSG_PENDING)
+    STRINGIFY_ENUM(MSG_NOTFOUND)
+    STRINGIFY_ENUM(MSG_FOUND)
+    STRINGIFY_ENUM(MSG_EXPECTED)
+    STRINGIFY_ENUM(MSG_EXPIRED)
+    STRINGIFY_ENUM(MSG_ERROR)
+  }
+  return "???";
+}
+
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+
+subscriber_t *subdebug_head = NULL;
+
+void subscriber_debug_add(subscriber_t *sub) {
+  if(subdebug_head == NULL) {
+    sub->dbg_next = NULL;
+    sub->dbg_prev = NULL;
+  }
+  else {
+    sub->dbg_next = subdebug_head;
+    sub->dbg_prev = NULL;
+    assert(subdebug_head->dbg_prev == NULL);
+    subdebug_head->dbg_prev = sub;
+  }
+  if(sub->request) {
+    sub->lbl = ngx_calloc(sub->request->uri.len+1, ngx_cycle->log);
+    ngx_memcpy(sub->lbl, sub->request->uri.data, sub->request->uri.len);
+  }
+  else {
+    sub->lbl = NULL;
+  }
+  
+  subdebug_head = sub;
+}
+void subscriber_debug_remove(subscriber_t *sub) {
+  subscriber_t *prev, *next;
+  prev = sub->dbg_prev;
+  next = sub->dbg_next;
+  if(subdebug_head == sub) {
+    assert(sub->dbg_prev == NULL);
+    if(next) {
+      next->dbg_prev = NULL;
+    }
+    subdebug_head = next;
+  }
+  else {
+    if(prev) {
+      prev->dbg_next = next;
+    }
+    if(next) {
+      next->dbg_prev = prev;
+    }
+  }
+  
+  sub->dbg_next = NULL;
+  sub->dbg_prev = NULL;
+  ngx_free(sub->lbl);
+  sub->lbl = NULL;
+}
+void subscriber_debug_assert_isempty(void) {
+  if(subdebug_head != NULL) {
+    subscriber_t *cur;
+    for(cur = subdebug_head; cur != NULL; cur = cur->dbg_next) {
+      nchan_log_error("  LEFTOVER: %V sub (req. %p (pool %p) cf %p rsv: %d) lbl %s", cur->name, cur->request, cur->request ? cur->request->pool : NULL, cur->cf, cur->reserved, cur->lbl ? cur->lbl : (u_char *)"nolbl");
+    }
+    raise(SIGABRT);
+  }
+}
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_debug.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_debug.h
new file mode 100644
index 0000000..640870a
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_debug.h
@@ -0,0 +1,13 @@
+#ifndef NCHAN_DEBUG_H
+#define NCHAN_DEBUG_H
+#include <nchan_module.h>
+
+char *nchan_msg_status_to_cstr(nchan_msg_status_t status);
+
+#if NCHAN_SUBSCRIBER_LEAK_DEBUG
+void subscriber_debug_add(subscriber_t *);
+void subscriber_debug_remove(subscriber_t *);
+void subscriber_debug_assert_isempty(void);
+#endif
+
+#endif //NCHAN_DEBUG_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_fake_request.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_fake_request.c
new file mode 100644
index 0000000..7019416
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_fake_request.c
@@ -0,0 +1,524 @@
+#include "nchan_fake_request.h"
+#include <util/nchan_subrequest.h>
+#include <assert.h>
+//fake request and connection code adapted from lua-nginx-module by agentzh
+
+static void nchan_close_fake_request(ngx_http_request_t *r);
+static void nchan_close_fake_connection(ngx_connection_t *c);
+
+static ngx_connection_t *nchan_create_fake_connection(ngx_pool_t *pool) {
+  ngx_log_t               *log;
+  ngx_connection_t        *c;
+  ngx_connection_t        *saved_c = NULL;
+  assert(pool);
+
+  /* (we temporarily use a valid fd (0) to make ngx_get_connection happy) */
+  if (ngx_cycle->files) {
+      saved_c = ngx_cycle->files[0];
+  }
+
+  c = ngx_get_connection(0, ngx_cycle->log);
+
+  if (ngx_cycle->files) {
+    ngx_cycle->files[0] = saved_c;
+  }
+
+  if (c == NULL) {
+    return NULL;
+  }
+
+  c->fd = (ngx_socket_t) -1;
+  c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+
+  c->pool = pool;
+
+  log = ngx_pcalloc(c->pool, sizeof(ngx_log_t));
+  if (log == NULL) {
+      goto failed;
+  }
+
+  c->write->active = 1;
+  
+  c->log = log;
+  c->log->connection = c->number;
+  c->log->action = NULL;
+  c->log->data = NULL;
+  c->log->data = ngx_pcalloc(c->pool, sizeof(ngx_http_log_ctx_t));
+  if(c->log->data == NULL) {
+    goto failed;
+  }
+  c->read->log = log;
+  c->write->log = log;
+#if nginx_version >= 1019009
+  c->read->active = 1;
+#endif  
+  c->log_error = NGX_ERROR_INFO;
+
+  c->error = 0;
+
+  return c;
+
+failed:
+
+  nchan_close_fake_connection(c);
+  return NULL;
+}
+
+static void nchan_close_fake_connection(ngx_connection_t *c) {
+  ngx_pool_t          *pool;
+  ngx_connection_t    *saved_c = NULL;
+
+  ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                  "http close fake http connection %p", c);
+
+  c->destroyed = 1;
+
+  pool = c->pool;
+
+  if (c->read->timer_set) {
+    ngx_del_timer(c->read);
+  }
+
+  if (c->write->timer_set) {
+    ngx_del_timer(c->write);
+  }
+
+  c->read->closed = 1;
+  c->write->active = 0;
+  c->write->closed = 1;
+
+  /* we temporarily use a valid fd (0) to make ngx_free_connection happy */
+
+  c->fd = 0;
+
+  if (ngx_cycle->files) {
+    saved_c = ngx_cycle->files[0];
+  }
+
+  ngx_free_connection(c);
+
+  c->fd = (ngx_socket_t) -1;
+
+  if (ngx_cycle->files) {
+    ngx_cycle->files[0] = saved_c;
+  }
+
+  if (pool) {
+    ngx_destroy_pool(pool);
+  }
+}
+
+static ngx_http_request_t *nchan_new_fake_request(ngx_connection_t *c) {
+  ngx_http_request_t *r = ngx_palloc(c->pool, sizeof(ngx_http_request_t));
+  assert(c->data == NULL);
+  if (r == NULL) {
+    return NULL;
+  }
+
+  c->requests++;
+
+  c->data = r;
+  return r;
+}
+/*
+static ngx_int_t nchan_initialize_fake_request(ngx_http_request_t *r, ngx_connection_t *c) {
+  ngx_memzero(r, sizeof(*r));
+  r->pool = c->pool;
+  assert(c->data == r);
+  
+  #if 0
+  hc = ngx_pcalloc(c->pool, sizeof(ngx_http_connection_t));
+  if (hc == NULL) {
+      goto failed;
+  }
+
+  r->header_in = c->buffer;
+  r->header_end = c->buffer->start;
+
+  if (ngx_list_init(&r->headers_out.headers, r->pool, 0,
+                    sizeof(ngx_table_elt_t))
+      != NGX_OK)
+  {
+      goto failed;
+  }
+
+  if (ngx_list_init(&r->headers_in.headers, r->pool, 0,
+                    sizeof(ngx_table_elt_t))
+      != NGX_OK)
+  {
+      goto failed;
+  }
+#endif
+
+  r->ctx = ngx_pcalloc(c->pool, sizeof(void *) * ngx_http_max_module);
+  if (r->ctx == NULL) {
+      return NGX_ERROR;
+  }
+
+#if 0
+  cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+  r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts
+                              * sizeof(ngx_http_variable_value_t));
+  if (r->variables == NULL) {
+      goto failed;
+  }
+#endif
+  
+  r->connection = c;
+
+  r->headers_in.content_length_n = 0;
+  c->data = r;
+#if 0
+  hc->request = r;
+  r->http_connection = hc;
+#endif
+  r->signature = NGX_HTTP_MODULE;
+  r->main = r;
+  r->count = 1;
+
+  r->method = NGX_HTTP_UNKNOWN;
+
+  r->headers_in.keep_alive_n = -1;
+  r->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
+  r->subrequests = NGX_HTTP_MAX_SUBREQUESTS + 1;
+
+  r->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
+  r->discard_body = 1;
+  return NGX_OK;
+}
+*/
+static void empty_handler(ngx_http_request_t *r) {
+  //do nothing
+}
+
+ngx_http_request_t *nchan_create_derivative_fake_request(ngx_connection_t *c, ngx_http_request_t *rsrc) {
+  ngx_http_request_t      *fr = nchan_new_fake_request(c);
+  if(fr == NULL) {
+    return NULL;
+  }
+  
+  *fr = *rsrc;
+  fr->read_event_handler = empty_handler;
+  fr->write_event_handler = empty_handler;
+  fr->connection = c;
+  fr->main = fr;
+  fr->pool = c->pool;
+  fr->parent = NULL;
+  fr->cleanup = NULL;
+  fr->http_state = NGX_HTTP_PROCESS_REQUEST_STATE;
+  fr->signature = NGX_HTTP_MODULE;
+  fr->count = 1;
+  
+  return fr;
+}
+
+void nchan_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc) {
+  ngx_connection_t          *c;
+#if (NGX_HTTP_SSL)
+  ngx_ssl_conn_t            *ssl_conn;
+#endif
+
+  c = r->connection;
+
+  ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                  "http finalize fake request: %d, a:%d, c:%d",
+                  rc, r == c->data, r->main->count);
+
+  if (rc == NGX_DONE) {
+      nchan_close_fake_request(r);
+      return;
+  }
+
+  if (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+
+#if (NGX_HTTP_SSL)
+
+    if (r->connection->ssl) {
+        ssl_conn = r->connection->ssl->connection;
+        if (ssl_conn) {
+          c = ngx_ssl_get_connection(ssl_conn);
+        }
+    }
+
+#endif
+
+    nchan_close_fake_request(r);
+    return;
+  }
+
+  if (c->read->timer_set) {
+    ngx_del_timer(c->read);
+  }
+
+  if (c->write->timer_set) {
+    c->write->delayed = 0;
+    ngx_del_timer(c->write);
+  }
+
+  nchan_close_fake_request(r);
+}
+
+static void nchan_close_fake_request(ngx_http_request_t *r) {
+  ngx_connection_t  *c;
+
+  r = r->main;
+  c = r->connection;
+
+  ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                  "http fake request count:%d", r->count);
+
+  if (r->count == 0) {
+    ngx_log_error(NGX_LOG_ALERT, c->log, 0, "http fake request count is zero");
+  }
+
+  r->count--;
+
+  if (r->count) {
+    return;
+  }
+
+  nchan_free_fake_request(r);
+  nchan_close_fake_connection(c);
+}
+
+void nchan_free_fake_request(ngx_http_request_t *r) {
+  ngx_log_t                 *log;
+  ngx_http_cleanup_t        *cln;
+
+  log = r->connection->log;
+
+  ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "http close fake request");
+
+  if (r->pool == NULL) {
+    ngx_log_error(NGX_LOG_ALERT, log, 0, "http fake request already closed");
+    return;
+  }
+
+  cln = r->cleanup;
+  r->cleanup = NULL;
+
+  while (cln) {
+    if (cln->handler) {
+      cln->handler(cln->data);
+    }
+
+    cln = cln->next;
+  }
+
+  r->request_line.len = 0;
+
+  r->connection->destroyed = 1;
+}
+
+
+
+ngx_int_t nchan_requestmachine_initialize(nchan_requestmachine_t *rm, ngx_http_request_t *template_request) {
+  rm->template_request = template_request;
+  nchan_slist_init(&rm->request_queue, nchan_fakereq_subrequest_data_t, slist.prev, slist.next);
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_requestmachine_run(nchan_requestmachine_t *rm) {
+  nchan_fakereq_subrequest_data_t *head = nchan_slist_first(&rm->request_queue);
+  if(head && !head->running) {
+    head->running = 1;
+    ngx_http_run_posted_requests(head->r->connection);
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t nchan_requestmachine_subrequest_handler(ngx_http_request_t *sr, void *pd, ngx_int_t code) {
+  nchan_fakereq_subrequest_data_t *d = pd;
+  d->running = 0;
+  if(d->rm) {
+    assert(d->rm->request_queue.head == d);
+    if(d->cb) {
+      d->cb(code, sr, d->pd);
+    }
+    if(d->rm) {
+      nchan_slist_remove(&d->rm->request_queue, d);
+      nchan_requestmachine_run(d->rm);
+    }
+  }
+  else if(d->cb) {
+    d->cb(NGX_ABORT, sr, d->pd);
+  }
+  if(!d->manual_cleanup && !d->cleanup_timer.timer_set) {
+    ngx_add_timer(&d->cleanup_timer, 0);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_requestmachine_request_cleanup_manual(nchan_fakereq_subrequest_data_t *d) {
+  if(!d->cleanup_timer.timer_set) {
+    ngx_add_timer(&d->cleanup_timer, 0);
+  }
+  return NGX_OK;
+}
+
+static void nchan_requestmachine_request_cleanup_on_request_finalize_cln_handler(void *d) {
+  nchan_requestmachine_request_cleanup_manual(d);
+}
+
+ngx_int_t nchan_requestmachine_request_cleanup_on_request_finalize(nchan_fakereq_subrequest_data_t *d, ngx_http_request_t *r) {
+  ngx_http_cleanup_t     *cln = ngx_http_cleanup_add(r, 0);
+  if(cln == NULL) {
+    return NGX_ERROR;
+  }
+  cln->data = d;
+  cln->handler = nchan_requestmachine_request_cleanup_on_request_finalize_cln_handler;
+  return NGX_OK;
+}
+
+static void fakerequest_cleanup_timer_handler(ngx_event_t *ev) {
+  nchan_fakereq_subrequest_data_t *d = ev->data;
+  d->r->main->count--;
+  assert(d->r->main->count == 1);
+  nchan_finalize_fake_request(d->r, NGX_OK);
+}
+
+nchan_fakereq_subrequest_data_t *nchan_requestmachine_request(nchan_requestmachine_t *rm, nchan_requestmachine_request_params_t *params) {
+  nchan_fakereq_subrequest_data_t *d;
+  ngx_pool_t *pool = params->pool;
+  int         created_pool = 0;
+  ngx_str_t url;
+  
+  if(!pool) {
+    if((pool = ngx_create_pool(1024, ngx_cycle->log)) == NULL) {
+      nchan_log_error("failed to create requestmachine pool");
+      return NULL;
+    }
+    created_pool = 1;
+  }
+  
+  if(params->url_complex) {
+    if(ngx_http_complex_value_custom_pool(rm->template_request, params->url.cv, &url, pool) != NGX_OK) {
+      if(created_pool) {
+        ngx_destroy_pool(pool);
+      }
+      nchan_log_error("failed to create subrequest url");
+      return NULL;
+    }
+    params->url.str = &url;
+  }
+  
+  ngx_connection_t            *fc = nchan_create_fake_connection(pool);
+  if(fc == NULL) {
+    if(created_pool) {
+      ngx_destroy_pool(pool);
+    }
+    return NULL;
+  }
+  ngx_http_request_t          *fr = nchan_create_derivative_fake_request(fc, rm->template_request);
+  ngx_http_request_t          *sr;
+  
+  d = ngx_palloc(pool, sizeof(*d));
+  ngx_http_post_subrequest_t  *psr = ngx_pcalloc(pool, sizeof(*psr));
+  if(fr == NULL || d == NULL || psr == NULL) {
+    if(created_pool) {
+      ngx_destroy_pool(pool);
+    }
+    return NULL;
+  }
+  
+  fr->main_conf = rm->template_request->main_conf;
+  fr->srv_conf = rm->template_request->srv_conf;
+  fr->loc_conf = rm->template_request->loc_conf;
+  
+  d->pd = params->pd;
+  d->cb = params->cb;
+  d->running = 0;
+  d->r = fr;
+  d->rm = rm;
+  d->manual_cleanup = params->manual_cleanup;
+  ngx_memzero(&d->cleanup_timer, sizeof(d->cleanup_timer));
+  nchan_init_timer(&d->cleanup_timer, fakerequest_cleanup_timer_handler, d);
+  
+  fr->main->count++; //make sure the fake request doesn't auto-finalize on subrequest completion
+  
+  psr->handler = nchan_requestmachine_subrequest_handler;
+  psr->data = d;
+  
+  ngx_http_subrequest(fr, params->url.str, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
+  if(sr == NULL) {
+    if(created_pool) {
+      ngx_destroy_pool(pool);
+    }
+    return NULL;
+  }
+  d->sr = sr;
+  
+  if((sr->request_body = ngx_pcalloc(pool, sizeof(*sr->request_body))) == NULL) { //dummy request body 
+    if(created_pool) {
+      ngx_destroy_pool(pool);
+    }
+    return NULL;
+  }
+  
+  if(params->body && ngx_buf_size(params->body) > 0) {
+    static ngx_str_t                   POST_REQUEST_STRING = {4, (u_char *)"POST "};
+    size_t                             sz = ngx_buf_size(params->body);;
+    ngx_http_request_body_t           *sr_body = sr->request_body;
+    ngx_chain_t                       *fakebody_chain;
+    ngx_buf_t                         *fakebody_buf;
+    
+    fakebody_chain = ngx_palloc(pool, sizeof(*fakebody_chain));
+    fakebody_buf = ngx_pcalloc(pool, sizeof(*fakebody_buf));
+    sr_body->bufs = fakebody_chain;
+    fakebody_chain->next = NULL;
+    fakebody_chain->buf = fakebody_buf;
+    *fakebody_buf = *params->body;
+    fakebody_buf->last_buf = 1;
+    fakebody_buf->last_in_chain = 1;
+    fakebody_buf->flush = 1;
+    fakebody_buf->memory = 1;
+    
+    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, sr_body, sz);
+  }
+  else {
+    nchan_set_content_length_header(sr, 0);
+  }
+  
+  sr->header_only = params->response_headers_only;
+  
+  sr->args = fr->args;
+  
+  nchan_slist_append(&rm->request_queue, d);
+  
+  nchan_requestmachine_run(rm);
+  return d;
+}
+ngx_int_t nchan_requestmachine_shutdown(nchan_requestmachine_t *rm) {
+  return nchan_requestmachine_abort(rm);
+}
+
+ngx_int_t nchan_requestmachine_abort(nchan_requestmachine_t *rm) {
+  nchan_fakereq_subrequest_data_t *cur;
+  ngx_http_request_t              *r;
+  ngx_http_core_main_conf_t       *cmcf;
+  while((cur = nchan_slist_pop(&rm->request_queue)) != NULL) {
+    cur->rm = NULL; //no requestmachine ref means the machine stopped.
+    r = cur->r;
+    //clear stuff that might be used after the upstream request finishes
+    /*
+    if (ngx_list_init(&r->headers_out.headers, r->pool, 0, sizeof(ngx_table_elt_t)) != NGX_OK) {
+      nchan_log_error("couldn't create headers_out for requestmachine request");
+    }
+    if (ngx_list_init(&r->headers_in.headers, r->pool, 0,sizeof(ngx_table_elt_t)) != NGX_OK) {
+      nchan_log_error("couldn't create headers_in for requestmachine request");
+    }
+    */
+
+    r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
+    if (r->ctx == NULL) {
+      nchan_log_error("couldn't create ctx for requestmachine request");
+    }
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+    r->variables = ngx_pcalloc(r->pool, cmcf->variables.nelts * sizeof(ngx_http_variable_value_t));
+    if (r->variables == NULL) {
+      nchan_log_error("couldn't create vars for requestmachine request");
+    }
+  }
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_fake_request.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_fake_request.h
new file mode 100644
index 0000000..eab1de9
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_fake_request.h
@@ -0,0 +1,58 @@
+#ifndef NCHAN_FAKE_REQUEST_H
+#define NCHAN_FAKE_REQUEST_H
+
+#include <nchan_module.h>
+#include <util/nchan_slist.h>
+
+ngx_http_request_t *nchan_create_derivative_fake_request(ngx_connection_t *c, ngx_http_request_t *rsrc);
+void nchan_finalize_fake_request(ngx_http_request_t *r, ngx_int_t rc);
+void nchan_free_fake_request(ngx_http_request_t *r);
+
+typedef struct nchan_fakereq_subrequest_data_s nchan_fakereq_subrequest_data_t;
+typedef struct nchan_requestmachine_s nchan_requestmachine_t;
+
+struct nchan_fakereq_subrequest_data_s {
+  ngx_http_request_t *r;
+  ngx_http_request_t *sr;
+  void          *pd;
+  callback_pt    cb;
+  nchan_requestmachine_t *rm;
+  ngx_event_t    cleanup_timer;
+  unsigned       manual_cleanup:1;
+  unsigned       running:1;
+  unsigned       aborted:1;
+  struct {
+    nchan_fakereq_subrequest_data_t *prev;
+    nchan_fakereq_subrequest_data_t *next;
+  }              slist;
+};// nchan_fakereq_subrequest_data_t
+
+struct nchan_requestmachine_s {
+  ngx_http_request_t *template_request;
+  nchan_slist_t       request_queue;
+  unsigned            shutdown_when_finished;
+};// nchan_requestmachine_t;
+
+typedef struct {
+  union {
+    ngx_str_t                 *str;
+    ngx_http_complex_value_t  *cv;
+  }                          url;
+  ngx_pool_t                *pool;
+  ngx_buf_t                 *body;
+  
+  callback_pt                cb;
+  void                      *pd;
+  unsigned                   manual_cleanup:1;
+  unsigned                   response_headers_only:1;
+  unsigned                   url_complex:1;
+} nchan_requestmachine_request_params_t;
+
+ngx_int_t nchan_requestmachine_initialize(nchan_requestmachine_t *rm, ngx_http_request_t *template_request);
+nchan_fakereq_subrequest_data_t *nchan_requestmachine_request(nchan_requestmachine_t *rm, nchan_requestmachine_request_params_t *params);
+ngx_int_t nchan_requestmachine_request_cleanup_manual(nchan_fakereq_subrequest_data_t *d);
+ngx_int_t nchan_requestmachine_request_cleanup_on_request_finalize(nchan_fakereq_subrequest_data_t *d, ngx_http_request_t *r);
+ngx_int_t nchan_requestmachine_abort(nchan_requestmachine_t *rm);
+ngx_int_t nchan_requestmachine_shutdown(nchan_requestmachine_t *rm);
+
+#endif //NCHAN_FAKE_REQUEST_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.c
new file mode 100644
index 0000000..45fd4f2
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.c
@@ -0,0 +1,175 @@
+#include "nchan_list.h"
+
+ /*
+  * Regular boring unoptimized doubly linked list.
+  * Allocates elements from heap.
+  * Should not be used in tight loops.
+  */
+
+ngx_int_t nchan_list_init(nchan_list_t *list, size_t data_sz, char *name) {
+  return nchan_list_pool_init(list, data_sz, 0, name);
+}
+
+ngx_int_t nchan_list_pool_init(nchan_list_t *list, size_t data_sz, size_t pool_sz, char *name) {
+#if NCHAN_LIST_DEBUG
+  list->name = name;
+#endif
+  list->head = NULL;
+  list->tail = NULL;
+  list->data_sz = data_sz;
+  list->n = 0;
+  list->pool = NULL;
+  list->pool_sz = pool_sz;
+  return NGX_OK;
+}
+
+ngx_pool_t *nchan_list_get_pool(nchan_list_t *list) {
+  if(!list->pool && list->pool_sz) {
+    list->pool = ngx_create_pool(list->pool_sz, ngx_cycle->log);
+  }
+  return list->pool;
+}
+
+void *nchan_list_append(nchan_list_t *list) {
+ return nchan_list_append_sized(list, list->data_sz);
+}
+
+void *nchan_list_first(nchan_list_t *list) {
+  if(list->head) {
+    return nchan_list_data_from_el(list->head);
+  }
+  else {
+    return NULL;
+  }
+}
+void *nchan_list_last(nchan_list_t *list) {
+  if(list->tail) {
+    return nchan_list_data_from_el(list->tail);
+  }
+  else {
+    return NULL;
+  }
+}
+
+void *nchan_list_prev(void *data) {
+  nchan_list_el_t  *el = nchan_list_el_from_data(data)->prev;
+  return el == NULL ? NULL : nchan_list_data_from_el(el);
+}
+void *nchan_list_next(void *data) {
+  nchan_list_el_t  *el = nchan_list_el_from_data(data)->next;
+  return el == NULL ? NULL : nchan_list_data_from_el(el);
+}
+
+void *nchan_list_append_sized(nchan_list_t *list, size_t sz) {
+  nchan_list_el_t  *el, *tail = list->tail;
+  if(list->pool_sz > 0) {
+    el = ngx_palloc(nchan_list_get_pool(list), sizeof(*el) + sz);
+  }
+  else {
+    el = ngx_alloc(sizeof(*el) + sz, ngx_cycle->log);
+  }
+  if(tail)
+    tail->next = el;
+  
+  el->prev = tail;
+  el->next = NULL;
+  
+  if(!list->head)
+    list->head = el;
+  
+  list->tail = el;
+  list->n++;
+  return (void *)&el[1];
+}
+
+
+void *nchan_list_prepend(nchan_list_t *list) {
+  return nchan_list_prepend_sized(list, list->data_sz);
+}
+
+void *nchan_list_prepend_sized(nchan_list_t *list, size_t sz) {
+nchan_list_el_t  *el, *head = list->head;
+  el = ngx_alloc(sizeof(*el) + sz, ngx_cycle->log);
+  if(head)
+    head->prev = el;
+  
+  el->prev = NULL;
+  el->next = head;
+  
+  list->head = el;
+  
+  if(!list->tail)
+    list->head = el;
+  list->n++;
+  return (void *)&el[1];
+}
+
+ngx_int_t nchan_list_remove(nchan_list_t *list, void *el_data) {
+  
+  nchan_list_el_t  *el = (nchan_list_el_t *)el_data - 1;
+  
+  if(el->prev) 
+    el->prev->next = el->next;
+  
+  if(el->next)
+    el->next->prev = el->prev;
+  
+  if(list->head == el)
+    list->head = el->next;
+  
+  if(list->tail == el)
+    list->tail = el->prev;
+  list->n--;
+  
+  if(list->pool)
+    ngx_pfree(list->pool, el);
+  else
+    ngx_free(el);
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_list_empty(nchan_list_t *list) {
+  nchan_list_el_t  *el, *next;
+  if(list->pool) {
+    ngx_destroy_pool(list->pool);
+    list->pool = NULL;
+  }
+  else {
+    for(el = list->head; el != NULL; el = next) {
+      next = el->next;
+      ngx_free(el);
+    }
+  }
+  list->head = NULL;
+  list->tail = NULL;
+  list->n = 0;
+  return NGX_OK;
+}
+
+size_t nchan_list_count(nchan_list_t *list) {
+  return list->n;
+}
+
+ngx_int_t nchan_list_traverse_and_empty(nchan_list_t *list, void (*cb)(void *data, void *pd), void *pd) {
+  nchan_list_el_t  *head = list->head, *el, *next;
+  ngx_pool_t       *pool = list->pool;
+  
+  list->head = NULL;
+  list->tail = NULL;
+  list->n = 0;
+  list->pool = NULL;
+  
+  for(el = head; el != NULL; el = next) {
+    cb(nchan_list_data_from_el(el), pd);
+    next = el->next;
+    if(!pool) {
+      ngx_free(el);
+    }
+  }
+  
+  if(pool)
+    ngx_destroy_pool(pool);
+  
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.h
new file mode 100644
index 0000000..6c3e7d9
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_list.h
@@ -0,0 +1,54 @@
+#ifndef NCHAN_LIST_H
+#define NCHAN_LIST_H
+
+#define NCHAN_LIST_DEBUG 1
+
+#include <nginx.h>
+#include <ngx_http.h>
+
+typedef struct nchan_list_el_s nchan_list_el_t;
+
+struct nchan_list_el_s {
+  nchan_list_el_t  *prev;
+  nchan_list_el_t  *next;
+};
+
+typedef struct {
+#if NCHAN_LIST_DEBUG
+  char            *name;
+#endif
+  nchan_list_el_t *head;
+  nchan_list_el_t *tail;
+  ngx_uint_t       n;
+  size_t           data_sz;
+  ngx_pool_t      *pool;
+  size_t           pool_sz;
+} nchan_list_t;
+
+ngx_int_t nchan_list_init(nchan_list_t *list, size_t data_sz, char *name);
+ngx_int_t nchan_list_pool_init(nchan_list_t *list, size_t data_sz, size_t pool_sz, char *name);
+ngx_pool_t *nchan_list_get_pool(nchan_list_t *list);
+
+void *nchan_list_append(nchan_list_t *list);
+void *nchan_list_prepend(nchan_list_t *list);
+
+void *nchan_list_first(nchan_list_t *list);
+void *nchan_list_last(nchan_list_t *list);
+void *nchan_list_prev(void *data);
+void *nchan_list_next(void *data);
+
+size_t nchan_list_count(nchan_list_t *list);
+
+void *nchan_list_prepend_sized(nchan_list_t *list, size_t sz);
+void *nchan_list_append_sized(nchan_list_t *list, size_t sz);
+
+ngx_int_t nchan_list_remove(nchan_list_t *list, void *el_data);
+ngx_int_t nchan_list_empty(nchan_list_t *list);
+ngx_int_t nchan_list_traverse_and_empty(nchan_list_t *list, void (*)(void *data, void *pd), void *pd);
+
+#define nchan_list_el_from_data(el_data) \
+  ((nchan_list_el_t *)el_data - 1)
+#define nchan_list_data_from_el(el) \
+  ((void *)&el[1])
+
+#endif //NCHAN_LIST_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_msg.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_msg.c
new file mode 100644
index 0000000..c1fe850
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_msg.c
@@ -0,0 +1,773 @@
+#include <nchan_module.h>
+#include <assert.h>
+#include <store/memory/store.h>
+#include <util/shmem.h>
+
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "NCHAN MSG:" fmt, ##args)
+
+#define MSG_REFCOUNT_INVALID -9000
+
+#if NCHAN_MSG_RESERVE_DEBUG  
+static void nchan_msg_reserve_debug(nchan_msg_t *msg, char *lbl) {
+  msg_rsv_dbg_t     *rsv;
+  int shared = msg->storage == NCHAN_MSG_SHARED;
+  
+  if(shared) 
+    shmtx_lock(nchan_store_memory_shmem);  
+  
+  if(shared) 
+    rsv=shm_locked_calloc(nchan_store_memory_shmem, sizeof(*rsv) + ngx_strlen(lbl) + 1, "msgdebug");
+  else
+    rsv=ngx_calloc(sizeof(*rsv) + ngx_strlen(lbl) + 1, ngx_cycle->log);
+    
+  rsv->lbl = (char *)(&rsv[1]);
+  ngx_memcpy(rsv->lbl, lbl, ngx_strlen(lbl));
+  if(msg->rsv == NULL) {
+    msg->rsv = rsv;
+    rsv->prev = NULL;
+    rsv->next = NULL;
+  }
+  else {
+    msg->rsv->prev = rsv;
+    rsv->next = msg->rsv;
+    rsv->prev = NULL;
+    msg->rsv = rsv;
+  }
+  
+  if(shared)
+    shmtx_unlock(nchan_store_memory_shmem);
+}
+
+static void nchan_msg_release_debug(nchan_msg_t *msg, char *lbl) {
+  msg_rsv_dbg_t     *cur, *prev, *next;
+  size_t             sz = ngx_strlen(lbl);
+  ngx_int_t          rsv_found=0;
+  int shared = msg->storage == NCHAN_MSG_SHARED;
+  
+  if(shared)
+    shmtx_lock(nchan_store_memory_shmem);
+  
+  assert(msg->refcount > 0);
+  for(cur = msg->rsv; cur != NULL; cur = cur->next) {
+    if(ngx_memcmp(lbl, cur->lbl, sz) == 0) {
+      prev = cur->prev;
+      next = cur->next;
+      if(prev) {
+        prev->next = next;
+      }
+      if(next) {
+        next->prev = prev;
+      }
+      if(cur == msg->rsv) {
+        msg->rsv = next;
+      }
+      
+      if(shared)
+        shm_locked_free(nchan_store_memory_shmem, cur);
+      else
+        ngx_free(cur);
+      
+      rsv_found = 1;
+      break;
+    }
+  }
+  assert(rsv_found);
+  if(shared)
+    shmtx_unlock(nchan_store_memory_shmem);
+}
+#endif
+
+int msg_refcount_valid(nchan_msg_t *msg) {
+  return msg->refcount >= 0;
+}
+
+int msg_refcount_invalidate_if_zero(nchan_msg_t *msg) {
+  return ngx_atomic_cmp_set((ngx_atomic_uint_t *)&msg->refcount, 0, MSG_REFCOUNT_INVALID);
+}
+void msg_refcount_invalidate(nchan_msg_t *msg) {
+  msg->refcount = MSG_REFCOUNT_INVALID;
+}
+
+
+ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl) {
+  if(msg->parent) {
+    assert(msg->storage != NCHAN_MSG_SHARED);
+    msg->refcount++;
+#if NCHAN_MSG_RESERVE_DEBUG
+    nchan_msg_reserve_debug(msg, lbl);
+#endif
+    return msg_reserve(msg->parent, lbl);
+  }
+  assert(!msg->parent);
+  
+  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, 1);
+  assert(msg->refcount >= 0);
+  if(msg->refcount < 0) {
+    msg->refcount = MSG_REFCOUNT_INVALID;
+    return NGX_ERROR;
+  }
+#if NCHAN_MSG_RESERVE_DEBUG  
+  nchan_msg_reserve_debug(msg, lbl);
+#endif
+
+  //DBG("msg %p reserved (%i) %s", msg, msg->refcount, lbl);
+  return NGX_OK;
+}
+
+ngx_int_t msg_release(nchan_msg_t *msg, char *lbl) {
+  nchan_msg_t    *parent = msg->parent;
+  if(parent) {
+    assert(msg->storage != NCHAN_MSG_SHARED);
+#if NCHAN_MSG_RESERVE_DEBUG
+    nchan_msg_release_debug(msg, lbl);
+#endif
+    msg->refcount--;
+    assert(msg->refcount >= 0);
+    
+    if(msg->refcount == 0) {
+      switch(msg->storage) {
+        case NCHAN_MSG_POOL:
+          //free the id, the rest of the msg will be cleaned with the pool
+          nchan_free_msg_id(&msg->id);
+          break;
+          
+        case NCHAN_MSG_HEAP:
+          nchan_free_msg_id(&msg->id);
+          ngx_free(msg);
+          break;
+          
+        default:
+          break;
+          //do nothing for NCHAN_MSG_STACK. NCHAN_MSG_SHARED should never be seen here.
+      }
+    }
+    return msg_release(parent, lbl);
+  }
+  assert(!parent);
+  
+#if NCHAN_MSG_RESERVE_DEBUG
+  nchan_msg_release_debug(msg, lbl);
+#endif
+  assert(msg->refcount > 0);
+  ngx_atomic_fetch_add((ngx_atomic_uint_t *)&msg->refcount, -1);
+  //DBG("msg %p released (%i) %s", msg, msg->refcount, lbl);
+  return NGX_OK;
+}
+
+
+int nchan_msgid_tagcount_match(nchan_msg_id_t *id, int count) {
+  switch(id->time) {
+    case NCHAN_OLDEST_MSGID_TIME:
+    case NCHAN_NEWEST_MSGID_TIME:
+    case NCHAN_NTH_MSGID_TIME:
+      if(id->tagcount == 1 && id->tagactive == 0)
+        return 1;
+      break;
+    default:
+      if(id->tagcount == count && id->tagactive >= 0 && id->tagactive < count)
+        return 1;
+      break;
+  }
+  return 0;
+}
+
+void nchan_expand_msg_id_multi_tag(nchan_msg_id_t *id, uint8_t in_n, uint8_t out_n, int16_t fill) {
+  int16_t v, n = id->tagcount;
+  int16_t *tags = n <= NCHAN_FIXED_MULTITAG_MAX ? id->tag.fixed : id->tag.allocd;
+  uint8_t i;
+  assert(n > in_n && n > out_n);
+  v = tags[in_n];
+  
+  for(i=0; i < n; i++) {
+    tags[i] = (i == out_n) ? v : fill;
+  }
+}
+
+void nchan_expand_tiny_msgid(nchan_msg_tiny_id_t *tinyid, nchan_msg_id_t *id) {
+  id->time = tinyid->time;
+  id->tag.fixed[0]=tinyid->tag;
+  id->tagcount = 1;
+  id->tagactive = 1;
+}
+
+void nchan_shrink_normal_msgid(nchan_msg_id_t *id, nchan_msg_tiny_id_t *tinyid) {
+  assert(id->tagcount <= 1);
+  tinyid->time = id->time;
+  tinyid->tag = id->tag.fixed[0];
+}
+
+ngx_int_t nchan_copy_new_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src) {
+  ngx_memcpy(dst, src, sizeof(*src));
+  if(src->tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+    size_t sz = sizeof(*src->tag.allocd) * src->tagcount;
+    if((dst->tag.allocd = ngx_alloc(sz, ngx_cycle->log)) == NULL) {
+      return NGX_ERROR;
+    }
+    ngx_memcpy(dst->tag.allocd, src->tag.allocd, sz);
+  }
+  return NGX_OK; 
+}
+ngx_int_t nchan_copy_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src, int16_t *largetags) {
+  uint16_t dst_n = dst->tagcount, src_n = src->tagcount;
+  dst->time = src->time;
+  
+  if(dst_n > NCHAN_FIXED_MULTITAG_MAX && dst_n != src_n) {
+    ngx_free(dst->tag.allocd);
+    dst_n = NCHAN_FIXED_MULTITAG_MAX;
+  }
+  
+  dst->tagcount = src->tagcount;
+  dst->tagactive = src->tagactive;
+  
+  if(src_n <= NCHAN_FIXED_MULTITAG_MAX) {
+    dst->tag = src->tag;
+  }
+  else {
+    if(dst_n != src_n) {
+      if(!largetags) {
+        if((largetags = ngx_alloc(sizeof(*largetags) * src_n, ngx_cycle->log)) == NULL) {
+          return NGX_ERROR;
+        }
+      }
+      dst->tag.allocd = largetags;
+    }
+    
+    ngx_memcpy(dst->tag.allocd, src->tag.allocd, sizeof(*src->tag.allocd) * src_n);
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_free_msg_id(nchan_msg_id_t *id) {
+  if(id->tagcount > NCHAN_FIXED_MULTITAG_MAX) {
+    ngx_free(id->tag.allocd);
+    id->tag.allocd = NULL;
+  }
+  return NGX_OK;
+}
+
+static ngx_int_t verify_msg_id(nchan_msg_id_t *id1, nchan_msg_id_t *id2, nchan_msg_id_t *msgid, char **err) {
+  int16_t  *tags1 = id1->tagcount <= NCHAN_FIXED_MULTITAG_MAX ? id1->tag.fixed : id1->tag.allocd;
+  int16_t  *tags2 = id2->tagcount <= NCHAN_FIXED_MULTITAG_MAX ? id2->tag.fixed : id2->tag.allocd;
+  if(id1->time > 0 && id2->time > 0) {
+    if(id1->time != id2->time) {
+      //is this a missed message, or just a multi msg?
+      
+      if(id2->tagcount > 1) {
+        int       i = -1, j, max = id2->tagcount;  
+        int16_t  *msgidtags = msgid->tagcount <= NCHAN_FIXED_MULTITAG_MAX ? msgid->tag.fixed : msgid->tag.allocd;
+        
+        for(j=0; j < max; j++) {
+          if(tags2[j] != -1) {
+            if( i != -1) {
+              *err = "more than one tag set to something besides -1. that means this isn't a single channel's forwarded multi msg";
+              return NGX_ERROR;
+            }
+            else {
+              i = j;
+            }
+          }
+        }
+        if(msgidtags[i] != 0) {
+          *err = "only the first message in a given second is ok. anything else means a missed message.";
+          return NGX_ERROR;
+        }
+        //ok, it's just the first-per-second message of a channel from a multi-channel
+        //this is a rather convoluted description... but basically this is ok.
+        return NGX_OK;
+      }
+      else {
+        *err = "previous message id times don't match";
+        return NGX_ERROR;
+      }
+    }
+    
+    if(id1->tagcount == 1) {
+      if(tags1[0] != tags2[0]){
+        *err = "previous message id tags don't match";
+        return NGX_ERROR;
+      }
+    }
+    else {
+      int   i, max = id1->tagcount;
+      for(i=0; i < max; i++) {
+        if(tags2[i] != -1 && tags1[i] != tags2[i]) {
+          *err = "previous message multitag mismatch";
+          return NGX_ERROR;
+        }
+      }
+    }
+  }
+  return NGX_OK;
+}
+
+void nchan_update_multi_msgid(nchan_msg_id_t *oldid, nchan_msg_id_t *newid, int16_t *largetags) {
+  if(newid->tagcount == 1) {
+    //nice and simple
+    *oldid = *newid;
+  }
+  else {
+    //DBG("======= updating multi_msgid ======");
+    //DBG("======= old: %V", msgid_to_str(oldid));
+    //DBG("======= new: %V", msgid_to_str(newid));
+    uint16_t         newcount = newid->tagcount, oldcount = oldid->tagcount;
+    if(newcount > NCHAN_FIXED_MULTITAG_MAX && oldcount < newcount) {
+      int16_t       *oldtags, *old_largetags = NULL;
+      int            i;
+      size_t         sz = sizeof(*oldid->tag.allocd) * newcount;
+      if(oldcount > NCHAN_FIXED_MULTITAG_MAX) {
+        old_largetags = oldid->tag.allocd;
+        oldtags = old_largetags;
+      }
+      else {
+        oldtags = oldid->tag.fixed;
+      }
+      if(largetags == NULL) {
+        largetags = ngx_alloc(sz, ngx_cycle->log);
+      }
+      oldid->tag.allocd = largetags;
+      for(i=0; i < newcount; i++) {
+        oldid->tag.allocd[i] = (i < oldcount) ? oldtags[i] : -1;
+      }
+      if(old_largetags) {
+        ngx_free(old_largetags);
+      }
+      oldid->tagcount = newcount;
+    }
+    
+    if(oldid->time != newid->time) {
+      nchan_copy_msg_id(oldid, newid, NULL);
+    }
+    else {
+      int i, max = newcount;
+      int16_t  *oldtags = oldcount <= NCHAN_FIXED_MULTITAG_MAX ? oldid->tag.fixed : oldid->tag.allocd;
+      int16_t  *newtags = oldcount <= NCHAN_FIXED_MULTITAG_MAX ? newid->tag.fixed : newid->tag.allocd;
+      
+      assert(max == oldcount);
+      
+      for(i=0; i< max; i++) {
+        
+        //DEBUG CHECK -- REMOVE BEFORE RELEASE
+        if(newid->tagactive == i && newtags[i] != -1 && oldtags[i] != -1) {
+          assert(newtags[i] > oldtags[i]);
+        }
+        
+        
+        if (newtags[i] != -1) {
+          oldtags[i] = newtags[i];
+        }
+      }
+      oldid->tagactive = newid->tagactive;
+    }
+    //DBG("=== updated: %V", msgid_to_str(oldid));
+  }
+}
+
+ngx_int_t update_subscriber_last_msg_id(subscriber_t *sub, nchan_msg_t *msg) {
+  if(msg) {
+    char *err, *huh;
+    if(verify_msg_id(&sub->last_msgid, &msg->prev_id, &msg->id, &err) == NGX_ERROR) {
+      struct timeval    tv;
+      time_t            time;
+      int               ttl = msg->expires - msg->id.time;
+      ngx_gettimeofday(&tv);
+      time = tv.tv_sec;
+      
+      if(sub->last_msgid.time + ttl <= time) {
+        huh = "The message probably expired.";
+      }
+      else {
+        huh = "Try increasing the message buffer length.";
+      }
+      
+      if(sub->type == INTERNAL) {
+        nchan_log_warning("Missed message for internal %V subscriber: %s. %s", sub->name, err, huh);
+      }
+      else {
+        nchan_log_request_warning(sub->request, "Missed message for %V subscriber: %s. %s", sub->name, err, huh);
+      }
+    }
+    
+    nchan_update_multi_msgid(&sub->last_msgid, &msg->id, NULL);
+  }
+  
+  return NGX_OK;
+}
+
+
+
+
+
+
+static ngx_int_t nchan_parse_msg_tag(u_char *first, u_char *last, nchan_msg_id_t *mid, ngx_int_t expected_tag_count) {
+  u_char           *cur = first;
+  u_char            c;
+  int16_t           i = 0;
+  int8_t            sign = 1;
+  int16_t           val = 0;
+  static int16_t    tags[NCHAN_MULTITAG_MAX];
+  int brace_open_total = 0;
+  int brace_close_total = 0;
+  int tagactive = NGX_ERROR;
+  
+  while(first != NULL && last != NULL && cur <= last && i < NCHAN_MULTITAG_MAX) {
+    if(cur == last) {
+      tags[i]=(val == 0 && sign == -1) ? -1 : val * sign; //shorthand "-" for "-1";
+      i++;
+      break;
+    }
+    
+    c = *cur;
+    if(c == '-') {
+      sign = -1;
+    }
+    else if (c >= '0' && c <= '9') {
+      val = 10 * val + (c - '0');
+    }
+    else if (c == '[') {
+      if(++brace_open_total > 1) {
+        return NGX_ERROR;
+      }
+      tagactive = i;
+    }
+    else if (c == ']') {
+      if(++brace_close_total > 1 || brace_open_total - brace_close_total != 0) {
+        return NGX_ERROR;
+      }
+    }
+    else if (c == ',') {
+      tags[i]=(val == 0 && sign == -1) ? -1 : val * sign; //shorthand "-" for "-1"
+      sign=1;
+      val=0;
+      i++;
+    }
+    cur++;
+  }
+  
+  if (i == 0) {
+    mid->tagactive = -1; // No tags, so no active tag
+  }
+  if(tagactive == NGX_ERROR) {
+    if(i==1) {
+      //single message tag, so it's active by defaiult
+      mid->tagactive = 0;
+    }
+    else {
+      //got a multitag with no tag braced as [active]. That's invalid.
+      return NGX_ERROR;
+    }
+  }
+  else {
+    mid->tagactive = tagactive;
+  }
+  
+  // We fill the rest of the tag needed with value '-1'
+  while (i < expected_tag_count) {
+    tags[i] = -1;
+    i++;
+  }
+  
+  mid->tagcount = i;
+  
+  if(i <= NCHAN_FIXED_MULTITAG_MAX) {
+    ngx_memcpy(mid->tag.fixed, tags, sizeof(mid->tag.fixed));
+  }
+  else {
+    mid->tag.allocd = tags;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t nchan_extract_from_multi_msgid(nchan_msg_id_t *src, uint16_t n, nchan_msg_id_t *dst) {
+  uint8_t count = src->tagcount;
+  int16_t *tags;
+  
+  if(src->time == NCHAN_OLDEST_MSGID_TIME || src->time == NCHAN_NEWEST_MSGID_TIME) {
+    dst->time = src->time;
+    dst->tag.fixed[0] = 0;
+    dst->tagcount = 1;
+    dst->tagactive = 0;
+    return NGX_OK;
+  }
+  else if(src->time == NCHAN_NTH_MSGID_TIME) {
+    dst->time = src->time;
+    dst->tag.fixed[0] = src->tag.fixed[0];
+    dst->tagcount = 1;
+    dst->tagactive = 0;
+    return NGX_OK; 
+  }
+  
+  if(n >= count) {
+    ERR("can't extract msgid %i from multi-msg of count %i", n, count);
+    return NGX_ERROR;
+  }
+  tags = (count <= NCHAN_FIXED_MULTITAG_MAX) ? src->tag.fixed : src->tag.allocd;
+  
+  dst->time = src->time;
+  if(tags[n] == -1) {
+    dst->time --;
+    dst->tag.fixed[0] = 32767; //eeeeeh this is bad. but it's good enough.
+  }
+  else {
+    dst->tag.fixed[0] = tags[n];
+  }
+  dst->tagcount = 1;
+  dst->tagactive = 0;
+  
+  return NGX_OK; 
+}
+
+static ngx_str_t *nchan_subscriber_get_etag(ngx_http_request_t * r) {
+#if nginx_version >= 1008000
+  return r->headers_in.if_none_match ? &r->headers_in.if_none_match->value : NULL;
+#else
+  ngx_uint_t                       i;
+  ngx_list_part_t                 *part = &r->headers_in.headers.part;
+  ngx_table_elt_t                 *header= part->elts;
+  for (i = 0;  ; i++) {
+    if (i >= part->nelts) {
+      if (part->next == NULL) {
+        break;
+      }
+      part = part->next;
+      header = part->elts;
+      i = 0;
+    }
+    if (header[i].key.len == NCHAN_HEADER_IF_NONE_MATCH.len
+      && ngx_strncasecmp(header[i].key.data, NCHAN_HEADER_IF_NONE_MATCH.data, header[i].key.len) == 0) {
+      return &header[i].value;
+    }
+  }
+  return NULL;
+#endif
+}
+
+ngx_int_t nchan_parse_compound_msgid(nchan_msg_id_t *id, ngx_str_t *str, ngx_int_t expected_tag_count) {
+  //parse url-unescaped compound msgid
+  u_char       *split, *last;
+  ngx_int_t     time;
+  uint8_t       len;
+  //"<msg_time>:<msg_tag>"
+  last = str->data + str->len;
+  if((split = ngx_strlchr(str->data, last, ':')) != NULL) {
+    len = 1;
+  }
+  else {
+    len = 0; //placate dumb GCC warning
+  }
+  if(split) {
+    time = ngx_atoi(str->data, split - str->data);
+    split += len;
+    if(time != NGX_ERROR) {
+      id->time = time;
+      return nchan_parse_msg_tag(split, last, id, expected_tag_count);
+    }
+    else {
+      return NGX_ERROR;
+    }
+  }
+  return NGX_DECLINED;
+}
+
+
+
+static ngx_int_t set_default_id(nchan_loc_conf_t *cf, nchan_msg_id_t *id) {
+  static nchan_msg_id_t           nth_msg_id = NCHAN_NTH_MSGID;
+  static nchan_msg_id_t           oldest_msg_id = NCHAN_OLDEST_MSGID;
+  static nchan_msg_id_t           newest_msg_id = NCHAN_NEWEST_MSGID;
+  switch(cf->subscriber_first_message) {
+    case 1:
+      *id = oldest_msg_id;
+      break;
+    case 0: 
+      *id = newest_msg_id;
+      break;
+    default:
+      *id = nth_msg_id;
+      id->tag.fixed[0] = cf->subscriber_first_message;
+      break;
+  }
+  return NGX_OK;
+}
+
+nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r) {
+  static nchan_msg_id_t           id = NCHAN_ZERO_MSGID;
+  
+  ngx_str_t                      *if_none_match;
+  nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  nchan_request_ctx_t            *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  int                             i;
+  ngx_int_t                       rc;
+  
+  if_none_match = nchan_subscriber_get_etag(r);
+  
+  if(!cf->msg_in_etag_only && r->headers_in.if_modified_since != NULL) {
+    id.time=ngx_http_parse_time(r->headers_in.if_modified_since->value.data, r->headers_in.if_modified_since->value.len);
+    
+    if(id.time <= 0) { //anything before 1-1-1970 is reserved and treated as no msgid provided
+      set_default_id(cf, &id);
+      return &id;
+    }
+
+    u_char *first = NULL, *last = NULL;
+    if(if_none_match != NULL) {
+      first = if_none_match->data;
+      last = if_none_match->data + if_none_match->len;
+    }
+
+    if(nchan_parse_msg_tag(first, last, &id, ctx->channel_id_count) == NGX_ERROR) {
+      return NULL;
+    }
+
+    return &id;
+  }
+  else if((cf->msg_in_etag_only || r->headers_in.if_modified_since == NULL) && if_none_match) {
+    rc = nchan_parse_compound_msgid(&id, if_none_match, ctx->channel_id_count);
+    if(rc == NGX_OK) {
+      return &id;
+    }
+    else if(rc == NGX_ERROR) {
+      return NULL;
+    }
+  }
+  else {
+    nchan_complex_value_arr_t   *alt_msgid_cv_arr = &cf->last_message_id;
+    u_char                       buf[128];
+    ngx_str_t                    str;
+    int                          n = alt_msgid_cv_arr->n;
+    ngx_int_t                    rc2;
+    
+    str.len = 0;
+    str.data = buf;
+    
+    for(i=0; i < n; i++) {
+      rc = ngx_http_complex_value_noalloc(r, alt_msgid_cv_arr->cv[i], &str, 128);
+      if(str.len > 0 && rc == NGX_OK) {
+        rc2 = nchan_parse_compound_msgid(&id, nchan_urldecode_str(r, &str), ctx->channel_id_count);
+        if(rc2 == NGX_OK) {
+          return &id;
+        }
+        else if(rc2 == NGX_ERROR) {
+          return NULL;
+        }
+      }
+    }
+  }
+  
+  set_default_id(cf, &id);
+  return &id;
+}
+
+
+int8_t nchan_compare_msgid_tags(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
+  uint8_t active = id2->tagactive;
+  int16_t *tags1, *tags2;
+  int16_t t1, t2;
+  
+  tags1 = (id1->tagcount <= NCHAN_FIXED_MULTITAG_MAX) ? id1->tag.fixed : id1->tag.allocd;
+  tags2 = (id2->tagcount <= NCHAN_FIXED_MULTITAG_MAX) ? id2->tag.fixed : id2->tag.allocd;
+  
+  //debugstuff that prevents this function from getting inlined
+  assert(id1->time == id2->time);
+  int i, nonnegs = 0;
+  for (i=0; i < id2->tagcount; i++) {
+    if(tags2[i] >= 0) nonnegs++;
+  }
+  assert(nonnegs == 1);
+  
+  if(id1->time == 0 && id2->time == 0) return 0; //always equal on zero-time
+  
+  t1 = (active < id1->tagcount) ? tags1[active] : -1;
+  t2 = tags2[active];
+  
+  //ERR("Comparing msgids: id1: %V --", msgid_to_str(id1));
+  //ERR("  --- id2: %V --", msgid_to_str(id2));
+  
+  if(t1 < t2){ 
+    //ERR("id1 is smaller. -1");
+    return -1;
+  }
+  if(t1 > t2){
+    //ERR("id1 is larger. 1");
+    return  1;
+  }
+  //ERR("id1 equals id2. 0");
+  return 0;
+}
+
+int8_t nchan_compare_msgids(nchan_msg_id_t *id1, nchan_msg_id_t *id2) {
+  assert(id1->tagcount == id2->tagcount);
+  if(id1->time < id2->time) {
+    return -1;
+  }
+  else if(id1->time > id2->time) {
+    return 1;
+  }
+  else {
+    assert(id1->tagcount == id2->tagcount);
+    if(id1->tagcount == 1) {
+      if(id1->tag.fixed[0] < id2->tag.fixed[0]) {
+        return -1;
+      }
+      else if(id1->tag.fixed[0] > id2->tag.fixed[0]) {
+        return 1;
+      }
+      else {
+        return 0;
+      }
+    }
+    else {
+      return nchan_compare_msgid_tags(id1, id2);
+    }
+  }
+}
+
+
+static nchan_msg_t *get_shared_msg(nchan_msg_t *msg) {
+  if(msg->storage == NCHAN_MSG_SHARED) {
+    assert(msg->parent == NULL);
+    return msg;
+  }
+  else {
+    assert(msg->parent);
+    assert(msg->parent->storage == NCHAN_MSG_SHARED);
+    return msg->parent;
+  }
+}
+
+static ngx_inline nchan_msg_t *msg_derive_init(nchan_msg_t *parent, nchan_msg_t *msg, nchan_msg_storage_t storage_type) {
+  nchan_msg_t    *shared = get_shared_msg(parent);
+  if(!msg) { return NULL; }
+  *msg = *shared;
+  msg->id.tagcount=1;
+  msg->parent = shared;
+  msg->storage = storage_type;
+#if NCHAN_MSG_RESERVE_DEBUG
+  msg->rsv = NULL;
+#endif
+  msg->refcount = 0;
+  return msg;
+}
+
+nchan_msg_t *nchan_msg_derive_alloc(nchan_msg_t *parent) {
+  nchan_msg_t *msg = msg_derive_init(parent, ngx_alloc(sizeof(nchan_msg_t), ngx_cycle->log), NCHAN_MSG_HEAP);
+  if(!msg || nchan_copy_new_msg_id(&msg->id, &parent->id) != NGX_OK) {
+    ngx_free(msg);
+    return NULL;
+  }
+  return msg;
+}
+nchan_msg_t *nchan_msg_derive_palloc(nchan_msg_t *parent, ngx_pool_t *pool) {
+  nchan_msg_t *msg = msg_derive_init(parent, ngx_palloc(pool, sizeof(nchan_msg_t)), NCHAN_MSG_POOL);
+  if(!msg || nchan_copy_new_msg_id(&msg->id, &parent->id) != NGX_OK) {
+    return NULL;
+  }
+  return msg;
+}
+nchan_msg_t *nchan_msg_derive_stack(nchan_msg_t *parent, nchan_msg_t *child, int16_t *largetags) {
+  nchan_msg_t *msg = msg_derive_init(parent, child, NCHAN_MSG_STACK);
+  if(!msg || nchan_copy_msg_id(&msg->id, &parent->id, largetags) != NGX_OK) {
+    return NULL;
+  }
+  return msg;
+}
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_msg.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_msg.h
new file mode 100644
index 0000000..99d35d8
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_msg.h
@@ -0,0 +1,35 @@
+#ifndef NCHAN_MSG_H
+#define NCHAN_MSG_H
+ngx_int_t msg_reserve(nchan_msg_t *msg, char *lbl);
+ngx_int_t msg_release(nchan_msg_t *msg, char *lbl);
+int msg_refcount_valid(nchan_msg_t *msg);
+int msg_refcount_invalidate_if_zero(nchan_msg_t *msg);
+void msg_refcount_invalidate(nchan_msg_t *msg);
+
+void nchan_expand_msg_id_multi_tag(nchan_msg_id_t *id, uint8_t in_n, uint8_t out_n, int16_t fill);
+ngx_int_t nchan_copy_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src, int16_t *largetags);
+ngx_int_t nchan_copy_new_msg_id(nchan_msg_id_t *dst, nchan_msg_id_t *src);
+ngx_int_t nchan_free_msg_id(nchan_msg_id_t *id);
+
+ngx_int_t nchan_parse_compound_msgid(nchan_msg_id_t *id, ngx_str_t *str, ngx_int_t expected_tag_count);
+void nchan_update_multi_msgid(nchan_msg_id_t *oldid, nchan_msg_id_t *newid, int16_t *largetags);
+ngx_int_t update_subscriber_last_msg_id(subscriber_t *sub, nchan_msg_t *msg);
+nchan_msg_id_t *nchan_subscriber_get_msg_id(ngx_http_request_t *r);
+ngx_int_t nchan_extract_from_multi_msgid(nchan_msg_id_t *src, uint16_t n, nchan_msg_id_t *dst);
+
+int8_t nchan_compare_msgid_tags(nchan_msg_id_t *id1, nchan_msg_id_t *id2);
+int8_t nchan_compare_msgids(nchan_msg_id_t *id1, nchan_msg_id_t *id2);
+
+int nchan_msgid_tagcount_match(nchan_msg_id_t *id, int count);
+
+void nchan_expand_tiny_msgid(nchan_msg_tiny_id_t *tinyid, nchan_msg_id_t *id);
+void nchan_shrink_normal_msgid(nchan_msg_id_t *id, nchan_msg_tiny_id_t *tinyid);
+
+
+nchan_msg_t *nchan_msg_derive_alloc(nchan_msg_t *parent);
+nchan_msg_t *nchan_msg_derive_palloc(nchan_msg_t *parent, ngx_pool_t *pool);
+nchan_msg_t *nchan_msg_derive_stack(nchan_msg_t *parent, nchan_msg_t *child, int16_t *largetags);
+
+
+
+#endif //NCHAN_MSG_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output.c
new file mode 100644
index 0000000..1f62028
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output.c
@@ -0,0 +1,670 @@
+#include <ngx_http.h>
+#include <nchan_module.h>
+#include "nchan_output.h"
+#include <util/nchan_thingcache.h>
+#include <util/nchan_bufchainpool.h>
+#include <store/memory/store.h>
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "OUTPUT:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "OUTPUT:" fmt, ##arg)
+
+#define REQUEST_PCALLOC(r, what) what = ngx_pcalloc((r)->pool, sizeof(*(what)))
+#define REQUEST_PALLOC(r, what) what = ngx_palloc((r)->pool, sizeof(*(what)))
+
+//file descriptor cache
+static void *fd_cache = NULL;
+
+static void *fd_open(ngx_str_t *filename) {
+  static u_char   fn_buf[512];
+  u_char         *fname, *last;
+  ngx_fd_t        fd;
+  off_t           len = filename->len;
+  last = filename->data + len;
+  if(*last == '\0' || (len > 0 && *(last - 1) == '\0')) {
+    fname = filename->data;
+  }
+  else if(filename->len < 512) {
+    DBG("non-null-terminated filename. gotta copy.");
+    ngx_memcpy(&fn_buf, filename->data, filename->len);
+    fn_buf[filename->len]='\0';
+    fname = fn_buf;
+  }
+  else{
+    DBG("filaname too long: %V", filename);
+    return (void *)NGX_INVALID_FILE;
+  }
+  if(fname == NULL) {
+    //static analyzer pointed this out. This is a damn unlikely condition, but
+    //ALL HAIL CLANG'S STATIC ANALYZER
+    return (void *)NGX_INVALID_FILE;
+  }
+  
+  
+  fd = ngx_open_file(fname, NGX_FILE_RDONLY, NGX_FILE_OPEN, NGX_FILE_OWNER_ACCESS);
+  return (void *)(uintptr_t)fd;
+}
+
+static ngx_int_t fd_close(ngx_str_t *id, void *fdv) {
+  ngx_fd_t     fd = (ngx_fd_t )(uintptr_t )fdv;
+  
+  DBG("fdcache close fd %i", fd);
+  
+  ngx_close_file(fd);
+  return 1;
+}
+
+ngx_fd_t nchan_fdcache_get(ngx_str_t *filename) {
+  ngx_fd_t    fd;
+  fd = (ngx_fd_t)(uintptr_t )nchan_thingcache_get(fd_cache, filename);
+  DBG("fdcache fd %i", fd);
+  return fd;
+}
+
+ngx_int_t nchan_msg_buf_open_fd_if_needed(ngx_buf_t *buf, ngx_file_t *file, ngx_http_request_t *r) {
+  if(buf->in_file) {
+    //open file fd if necessary
+    if(!file) {
+      if(r) {
+        if((file = ngx_pcalloc(r->pool, sizeof(*file))) == NULL) {
+          ERR("couldn't allocate memory for file struct while responding with msg");
+          return NGX_ERROR;
+        }
+      }
+      else {
+        //no file given, can't allocate from NULL pool
+        return NGX_ERROR;
+      }
+    }
+    
+    ngx_memcpy(file, buf->file, sizeof(*file));
+    if(file->fd == NGX_INVALID_FILE) {
+      file->fd = nchan_fdcache_get(&file->name);
+      if(file->fd == NGX_INVALID_FILE) {
+        ERR("can't create output chain, file in buffer won't open");
+        return NGX_ERROR;
+      }
+    }
+    buf->file = file;
+  }
+  return NGX_OK;
+}
+
+
+void nchan_output_init(void) {
+  fd_cache = nchan_thingcache_init("fd_cache", fd_open, fd_close, 5);
+  
+}
+
+void nchan_output_shutdown(void) {
+  nchan_thingcache_shutdown(fd_cache);
+}
+
+typedef struct rsvmsg_queue_s rsvmsg_queue_t;
+struct rsvmsg_queue_s {
+  nchan_msg_t                  *msg;
+  rsvmsg_queue_t               *prev;
+  rsvmsg_queue_t               *next;
+};
+
+static void *rsvmsg_queue_palloc(void *pd) {
+  return ngx_palloc(((ngx_http_request_t *)pd)->pool, sizeof(rsvmsg_queue_t));
+}
+
+static ngx_int_t rsvmsg_queue_release(void *pd, void *thing) {
+  //ERR("release msg %p", ((rsvmsg_queue_t *)thing)->msg);
+  msg_release(((rsvmsg_queue_t *)thing)->msg, "output reservation");
+  return NGX_OK;
+}
+
+static void nchan_push_release_entire_message_queue(nchan_request_ctx_t *ctx) {
+  if(ctx->reserved_msg_queue) {
+    nchan_reuse_queue_flush(ctx->reserved_msg_queue);
+  }
+}
+
+static void nchan_reserve_msg_cleanup(void *pd) {
+  nchan_push_release_entire_message_queue((nchan_request_ctx_t *)pd);
+}
+
+static void nchan_output_reserve_message_queue(ngx_http_request_t *r, nchan_msg_t *msg) {
+  nchan_request_ctx_t  *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  ngx_http_cleanup_t   *cln;
+  
+  if(msg->storage != NCHAN_MSG_SHARED) {
+    if((msg = nchan_msg_derive_alloc(msg)) == NULL) {
+      ERR("Coudln't alloc derived msg for output_reserve_message_queue");
+      return;
+    }
+  }
+  
+  if(!ctx->reserved_msg_queue) {
+    if((ctx->reserved_msg_queue = ngx_palloc(r->pool, sizeof(*ctx->reserved_msg_queue))) == NULL) {
+      ERR("Coudln't palloc reserved_msg_queue");
+      return;
+    }
+    nchan_reuse_queue_init(ctx->reserved_msg_queue, offsetof(rsvmsg_queue_t, prev), offsetof(rsvmsg_queue_t, next), rsvmsg_queue_palloc, rsvmsg_queue_release, r);
+    
+    if((cln = ngx_http_cleanup_add(r, 0)) == NULL) {
+      ERR("Unable to add request cleanup for reserved_msg_queue queue");
+      assert(0);
+      return;
+    }
+    
+    cln->data = ctx;
+    cln->handler = nchan_reserve_msg_cleanup;
+  }
+  
+  rsvmsg_queue_t   *qmsg = nchan_reuse_queue_push(ctx->reserved_msg_queue);
+  qmsg->msg = msg;
+  msg_reserve(msg, "output reservation");
+}
+
+//general request-output functions and the iraq and the asian countries and dated references and the, uh, such
+
+void nchan_flush_pending_output(ngx_http_request_t *r) {
+  int                        rc;
+  ngx_event_t               *wev;
+  ngx_connection_t          *c;
+  ngx_http_core_loc_conf_t  *clcf;
+  
+  c = r->connection;
+  wev = c->write;
+  
+  //ngx_log_debug2(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer handler: \"%V?%V\"", &r->uri, &r->args);
+
+  clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
+
+  if (wev->timedout) {
+    if (!wev->delayed) {
+      ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "request timed out");
+      c->timedout = 1;
+      nchan_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
+      return;
+    }
+    wev->timedout = 0;
+    wev->delayed = 0;
+
+    if (!wev->ready) {
+      ngx_add_timer(wev, clcf->send_timeout);
+      if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
+        nchan_http_finalize_request(r, 0);
+      }
+      return;
+    }
+  }
+  
+  if (wev->delayed || r->aio) {
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer delayed");
+    if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
+      nchan_http_finalize_request(r, 0);
+    }
+    return;
+  }
+  
+  rc = nchan_output_filter(r, NULL);
+
+  //ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, "http writer output filter: %d, \"%V?%V\"", rc, &r->uri, &r->args);
+
+  if (rc == NGX_ERROR) {
+    nchan_http_finalize_request(r, rc);
+    return;
+  }
+
+  if (r->buffered || r->postponed || (r == r->main && c->buffered)) {
+    if (!wev->delayed) {
+      ngx_add_timer(wev, clcf->send_timeout);
+    }
+    if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
+      nchan_http_finalize_request(r, 0);
+      return;
+    }
+  }
+  //ngx_log_debug2(NGX_LOG_DEBUG_HTTP, wev->log, 0, "http writer done: \"%V?%V\"", &r->uri, &r->args);
+  if(r->out == NULL) {
+    r->write_event_handler = ngx_http_request_empty_handler;
+  }
+}
+
+static void flush_all_the_reserved_things(nchan_request_ctx_t *ctx) {
+  nchan_push_release_entire_message_queue(ctx);
+  if(ctx->bcp) {
+    nchan_bufchain_pool_flush(ctx->bcp);
+  }
+  if(ctx->output_str_queue) {
+    nchan_reuse_queue_flush(ctx->output_str_queue);
+  }
+}
+
+static ngx_int_t nchan_output_filter_generic(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in) {
+/* from push stream module, written by
+ * Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * thanks, guys!
+ * modified to fit the needs of websockets and eventsources and multipartses and so on
+*/
+  ngx_http_core_loc_conf_t               *clcf;
+  ngx_int_t                               rc;
+  ngx_event_t                            *wev;
+  ngx_connection_t                       *c;
+  nchan_request_ctx_t                    *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  c = r->connection;
+  wev = c->write;
+
+  if(ctx && ctx->bcp) {
+    nchan_bufchain_pool_refresh_files(ctx->bcp);
+  }
+  
+  rc = ngx_http_output_filter(r, in);
+  //ERR("outpuit filter plz");
+
+  if (c->buffered & NGX_HTTP_LOWLEVEL_BUFFERED) {
+    //ERR("what's the deal with this NGX_HTTP_LOWLEVEL_BUFFERED thing?");
+    clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
+    r->write_event_handler = nchan_flush_pending_output;
+    if(msg) {
+      nchan_output_reserve_message_queue(r, msg);
+    }
+    if (!wev->delayed) {
+      //ERR("delay output by %ims", clcf->send_timeout);
+      ngx_add_timer(wev, clcf->send_timeout);
+    }
+    if ((ngx_handle_write_event(wev, clcf->send_lowat)) != NGX_OK) {
+      if(ctx) {
+        flush_all_the_reserved_things(ctx);
+      }
+      return NGX_ERROR;
+    }
+    return NGX_OK;
+  } 
+  else {
+    if (wev->timer_set) {
+      //ERR("nevermind timer");
+      ngx_del_timer(wev);
+    }
+  }
+  
+  if(r->out == NULL) {
+    if(ctx) {
+      flush_all_the_reserved_things(ctx);
+    }
+  }
+  
+  return rc;
+}
+
+ngx_int_t nchan_output_filter(ngx_http_request_t *r, ngx_chain_t *in) {
+  return nchan_output_filter_generic(r, NULL, in);
+}
+ngx_int_t nchan_output_msg_filter(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in) {
+  return nchan_output_filter_generic(r, msg, in);
+}
+
+void nchan_include_access_control_if_needed(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
+  ngx_str_t          *origin;
+  ngx_str_t          *allow_origin_val;
+  static ngx_str_t    true_string = ngx_string("true");
+  nchan_loc_conf_t   *cf;
+  if(!ctx) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  }
+  if(!ctx) {
+    return;
+  }
+  
+  if((origin = nchan_get_header_value_origin(r, ctx)) != NULL) {
+    cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+    
+    if(cf->allow_credentials) {
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS, &true_string);
+    }
+    allow_origin_val = nchan_get_allow_origin_value(r, cf, ctx);
+    if(allow_origin_val && allow_origin_val->len == 1 && allow_origin_val->data[0]=='*') {
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, allow_origin_val);
+    }
+    else { //otherwise echo the origin
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, origin);
+    }
+  }
+}
+
+ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *status_body, ngx_int_t finalize) {
+  ngx_int_t    rc = NGX_OK;
+  r->headers_out.status=status_code;
+  if(status_line!=NULL) {
+    r->headers_out.status_line.len =status_line->len;
+    r->headers_out.status_line.data=status_line->data;
+  }
+  if(status_body == NULL) {
+    r->headers_out.content_length_n = 0;
+    r->header_only = 1;
+  }
+  
+  nchan_include_access_control_if_needed(r, NULL);
+  
+  rc= ngx_http_send_header(r);
+  if(status_body) {
+    rc = ngx_http_output_filter(r, status_body);
+  }
+  if(finalize) {
+    nchan_http_finalize_request(r, rc);
+  }
+  return rc;
+}
+
+ngx_int_t nchan_respond_cstring(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, char *body, ngx_int_t finalize) {
+  ngx_str_t str;
+  str.data = (u_char *)body;
+  str.len=strlen(body);
+  return nchan_respond_string(r, status_code, content_type, &str, finalize);
+}
+
+ngx_int_t nchan_respond_sprintf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_int_t finalize, char *fmt, ...) {
+  u_char *p;
+  ngx_str_t str;
+  va_list   args;
+    
+  str.len = 1024;
+  str.data = ngx_palloc(r->pool, 1024);
+  if(str.data == NULL) {
+    return nchan_respond_status(r, status_code, NULL, NULL, finalize);
+    return NGX_ERROR;
+  }
+
+  va_start(args, fmt);
+  p = ngx_vslprintf(str.data, str.data + str.len, fmt, args);
+  va_end(args);
+  
+  str.len = p - str.data;
+  return nchan_respond_string(r, status_code, content_type, &str, finalize);
+}
+
+ngx_int_t nchan_respond_membuf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, ngx_buf_t *body, ngx_int_t finalize) {
+  ngx_str_t str;
+  str.len = ngx_buf_size(body);
+  str.data = body->start;
+  return nchan_respond_string(r, status_code, content_type, &str, finalize);
+}
+/*
+static size_t etag_maxlen(nchan_msg_id_t *id) {
+  return 7 * id->multi_count;
+}
+*/
+
+
+static ngx_str_t msgtag_str;
+static char msgtag_str_buf[10*255 + 30];
+
+size_t msgtag_to_strptr(nchan_msg_id_t *id, char *ch) {
+
+  uint8_t   max = id->tagcount;
+  int16_t  *t = max <= NCHAN_FIXED_MULTITAG_MAX ? id->tag.fixed : id->tag.allocd;
+  
+  uint8_t   i;
+  char     *cur;
+  
+  static char* inactive="%i,";
+  static char*  active="[%i],";
+  if(max == 1) {
+    return sprintf(ch, "%i", t[0]);
+  }
+  else {
+    cur = ch;
+    for(i=0; i < max; i++) {
+      
+      assert(t[i] >= -2);
+      
+      if(t[i] != -1) {
+        cur += sprintf(cur, id->tagactive != i ? inactive : active, t[i]);
+      }
+      else { //shorthand
+        assert(id->tagactive != i);
+        *cur++='-';
+        *cur++=',';
+      }
+    }
+    cur[-1]='\0';
+    return cur - ch - 1;
+  }  
+}
+
+ngx_str_t *msgtag_to_str(nchan_msg_id_t *id) {
+  size_t len;
+  len = msgtag_to_strptr(id, msgtag_str_buf);
+  msgtag_str.len = len;
+  msgtag_str.data = (u_char *)msgtag_str_buf;
+  return &msgtag_str;
+}
+
+ngx_str_t *msgid_to_str(nchan_msg_id_t *id) {
+  int   l1, l2;
+  char *cur;
+  l1 = sprintf(msgtag_str_buf, "%li:", id->time);
+  cur = &msgtag_str_buf[l1];
+  l2 = msgtag_to_strptr(id, cur);
+  msgtag_str.len = l1 + l2;
+  msgtag_str.data = (u_char *)msgtag_str_buf;
+  return &msgtag_str;
+}
+
+ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid) {
+  ngx_str_t                 *etag, *tmp_etag;
+  nchan_loc_conf_t          *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  int8_t                     output_etag = 1;
+  ngx_str_t                 *origin_header;
+  
+  if(!ctx) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  }
+  origin_header = ctx ? nchan_get_header_value_origin(r, ctx) : NULL; 
+
+  if(!cf->msg_in_etag_only) {
+    //last-modified
+    if(msgid->time > 0) {
+      r->headers_out.last_modified_time = msgid->time;
+    }
+    else {
+      output_etag = 0;
+    }
+    tmp_etag = msgtag_to_str(msgid);
+  }
+  else {
+    tmp_etag = msgid_to_str(msgid);
+  }
+  
+  if((etag = ngx_palloc(r->pool, sizeof(*etag) + tmp_etag->len))==NULL) {
+    return NGX_ERROR;
+  }
+  etag->data = (u_char *)(etag+1);
+  etag->len = tmp_etag->len;
+  ngx_memcpy(etag->data, tmp_etag->data, tmp_etag->len);
+
+  if(cf->custom_msgtag_header.len == 0) {
+    if(output_etag) {
+      nchan_add_response_header(r, &NCHAN_HEADER_ETAG, etag);
+    }
+    if(origin_header) {
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS, &NCHAN_MSG_RESPONSE_ALLOWED_HEADERS);
+    }
+  }
+  else {
+    if(output_etag) {
+      nchan_add_response_header(r, &cf->custom_msgtag_header, etag);
+    }
+    if(origin_header) {
+      u_char        *cur = ngx_palloc(r->pool, 255);
+      if(cur == NULL) {
+        return NGX_ERROR;
+      }
+      ngx_str_t      allowed;
+      allowed.data = cur;
+      cur = ngx_snprintf(cur, 255, NCHAN_MSG_RESPONSE_ALLOWED_CUSTOM_ETAG_HEADERS_STRF, &cf->custom_msgtag_header);
+      allowed.len = cur - allowed.data;
+      nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_EXPOSE_HEADERS, &allowed);
+     }
+  }
+  
+  //Vary header needed for proper HTTP caching.
+  nchan_add_response_header(r, &NCHAN_HEADER_VARY, &NCHAN_VARY_HEADER_VALUE);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_id_t *msgid, ngx_int_t finalize, char **err) {
+  ngx_buf_t                 *buffer = &msg->buf;
+  nchan_buf_and_chain_t     *cb;
+  ngx_int_t                  rc;
+  ngx_chain_t               *rchain = NULL;
+  ngx_buf_t                 *rbuffer;
+  nchan_request_ctx_t       *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  if(ngx_buf_size(buffer) > 0) {
+    cb = ngx_palloc(r->pool, sizeof(*cb));
+    if (!cb) {
+      if(err) *err = "couldn't allocate memory for buf-and-chain while responding with msg";
+      return NGX_ERROR;
+    }
+    rchain = &cb->chain;
+    rbuffer = &cb->buf;
+    
+    rchain->next = NULL;
+    rchain->buf = rbuffer;
+    
+    ngx_memcpy(rbuffer, buffer, sizeof(*buffer));
+    nchan_msg_buf_open_fd_if_needed(rbuffer, NULL, r);
+    
+    r->headers_out.content_length_n=ngx_buf_size(rbuffer);
+  }
+  else {
+    r->headers_out.content_length_n = 0;
+    r->header_only = 1;
+  }
+
+  if (msg->content_type) {
+    r->headers_out.content_type = *msg->content_type;
+  }
+  
+  if(msgid == NULL) {
+    msgid = &msg->id;
+  }
+  
+  if(nchan_set_msgid_http_response_headers(r, ctx, msgid) != NGX_OK) {
+    if(err) *err = "can't set msgid headers";
+    return NGX_ERROR;
+  }
+  
+  r->headers_out.status=NGX_HTTP_OK;
+  
+  nchan_include_access_control_if_needed(r, ctx);
+  
+  //we know the entity length, and we're using just one buffer. so no chunking please.
+  if((rc = ngx_http_send_header(r)) >= NGX_HTTP_SPECIAL_RESPONSE) {
+    ERR("request %p, send_header response %i", r, rc);
+    if(err) *err="WTF just happened to request?";
+    return NGX_ERROR;
+  }
+  
+  if(rchain) {
+    rc= nchan_output_filter(r, rchain);
+    if(rc != NGX_OK && err) *err="failed to write data to connection socket, probably because the connection got closed";
+  }
+  
+  if(finalize) {
+    nchan_http_finalize_request(r, rc);
+  }
+  return rc;
+}
+
+ngx_int_t nchan_respond_string(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_str_t *body, ngx_int_t finalize) {
+  ngx_int_t    rc = NGX_OK;
+  ngx_buf_t   *b = REQUEST_PCALLOC(r, b);
+  ngx_chain_t *chain = REQUEST_PALLOC(r, chain);
+  
+  //assume both were alloc'd fine
+  
+  r->headers_out.status=status_code;
+  r->headers_out.content_length_n = body->len;
+  
+  if(content_type) {
+    r->headers_out.content_type.len = content_type->len;
+    r->headers_out.content_type.data = content_type->data;
+  }
+  
+  nchan_include_access_control_if_needed(r, NULL);
+  
+  if ((!b) || (!chain)) {
+    ERR("Couldn't allocate ngx buf or chain.");
+    r->headers_out.status=NGX_HTTP_INTERNAL_SERVER_ERROR;
+    r->headers_out.content_length_n = 0;
+    r->header_only = 1;
+    ngx_http_send_header(r);
+    rc=NGX_ERROR;
+  }
+  else {
+    chain->buf=b;
+    chain->next=NULL;
+    
+    b->last_buf = 1;
+    b->last_in_chain = 1;
+    b->flush = 1; //flush just to be sure, although I should perhaps rethink this
+    b->memory = 1;
+    b->start = body->data;
+    b->pos = body->data;
+    b->end = body->data + body->len;
+    b->last = b->end;
+    
+    if ((rc = ngx_http_send_header(r)) == NGX_OK) {
+      rc= nchan_output_filter(r, chain);
+    }
+  }
+  
+  if(finalize) {
+    nchan_http_finalize_request(r, rc);
+  }
+  return rc;
+}
+
+ngx_table_elt_t * nchan_add_response_header(ngx_http_request_t *r, const ngx_str_t *header_name, const ngx_str_t *header_value) {
+  ngx_table_elt_t                *h = ngx_list_push(&r->headers_out.headers);
+  if (h == NULL) {
+    return NULL;
+  }
+  h->hash = 1;
+  h->key.len = header_name->len;
+  h->key.data = header_name->data;
+  if(header_value) {
+    h->value.len = header_value->len;
+    h->value.data = header_value->data;
+  }
+  else {
+    h->value.len = 0;
+    h->value.data = NULL;
+  }
+  return h;
+}
+
+ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods) {
+  nchan_request_ctx_t      *ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  
+  nchan_add_response_header(r, &NCHAN_HEADER_ALLOW, allowed_methods);
+  
+  if(ctx && nchan_get_header_value_origin(r, ctx)) {
+    //Access-Control-Allow-Origin is included later
+    nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_HEADERS, allowed_headers);
+    nchan_add_response_header(r, &NCHAN_HEADER_ACCESS_CONTROL_ALLOW_METHODS, allowed_methods);
+  }
+  return nchan_respond_status(r, NGX_HTTP_OK, NULL, NULL, 0);
+}
+
+void nchan_http_finalize_request(ngx_http_request_t *r, ngx_int_t code) {
+  if(r->connection && r->connection->write->error) {
+    r->write_event_handler = NULL;
+    //this will close the connection when request is finalized
+    ngx_http_finalize_request(r, NGX_ERROR);
+  }
+  else {
+    ngx_http_finalize_request(r, code);
+  }
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output.h
new file mode 100644
index 0000000..d465de8
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output.h
@@ -0,0 +1,30 @@
+#include <nchan_defs.h>
+#include <nchan_types.h>
+
+void nchan_output_init(void);
+void nchan_output_shutdown(void);
+
+ngx_int_t nchan_output_filter(ngx_http_request_t *r, ngx_chain_t *in);
+ngx_int_t nchan_output_msg_filter(ngx_http_request_t *r, nchan_msg_t *msg, ngx_chain_t *in);
+
+ngx_int_t nchan_respond_status(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *status_line, ngx_chain_t *body, ngx_int_t finalize);
+ngx_int_t nchan_respond_string(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_str_t *body, ngx_int_t finalize);
+ngx_int_t nchan_respond_sprintf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, const ngx_int_t finalize, char *fmt, ...);
+ngx_int_t nchan_respond_cstring(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, char *body, ngx_int_t finalize);
+ngx_int_t nchan_respond_membuf(ngx_http_request_t *r, ngx_int_t status_code, const ngx_str_t *content_type, ngx_buf_t *body, ngx_int_t finalize);
+ngx_table_elt_t * nchan_add_response_header(ngx_http_request_t *r, const ngx_str_t *header_name, const ngx_str_t *header_value);
+ngx_int_t nchan_set_msgid_http_response_headers(ngx_http_request_t *r, nchan_request_ctx_t *ctx, nchan_msg_id_t *msgid);
+ngx_int_t nchan_OPTIONS_respond(ngx_http_request_t *r, const ngx_str_t *allowed_headers, const ngx_str_t *allowed_methods);
+ngx_int_t nchan_respond_msg(ngx_http_request_t *r, nchan_msg_t *msg, nchan_msg_id_t *msgid, ngx_int_t finalize, char **err);
+void nchan_include_access_control_if_needed(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
+void nchan_flush_pending_output(ngx_http_request_t *r);
+
+void nchan_http_finalize_request(ngx_http_request_t *r, ngx_int_t code);
+
+ngx_fd_t nchan_fdcache_get(ngx_str_t *filename);
+
+ngx_int_t nchan_msg_buf_open_fd_if_needed(ngx_buf_t *buf, ngx_file_t *file, ngx_http_request_t *r);
+
+ngx_str_t *msgtag_to_str(nchan_msg_id_t *id);
+ngx_str_t *msgid_to_str(nchan_msg_id_t *id);
+size_t msgtag_to_strptr(nchan_msg_id_t *id, char *ch);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output_info.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output_info.c
new file mode 100644
index 0000000..c58bfc7
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output_info.c
@@ -0,0 +1,284 @@
+#include <nchan_module.h>
+
+typedef struct {
+  ngx_str_t            subtype;
+  nchan_content_type_t ct;
+} nchan_content_subtype_t;
+
+static nchan_content_type_t nchan_output_info_type(ngx_str_t *accept) {
+  nchan_content_subtype_t subtypes[] = {
+    { ngx_string("plain"),    NCHAN_CONTENT_TYPE_PLAIN },
+    { ngx_string("json"),     NCHAN_CONTENT_TYPE_JSON },
+    { ngx_string("x-json"),   NCHAN_CONTENT_TYPE_JSON },
+    { ngx_string("yaml"),     NCHAN_CONTENT_TYPE_YAML },
+    { ngx_string("x-yaml"),   NCHAN_CONTENT_TYPE_YAML },
+    { ngx_string("xml"),      NCHAN_CONTENT_TYPE_XML }
+  };
+  
+  ngx_str_t  text_ = ngx_string("text/");
+  ngx_str_t  application_ = ngx_string("application/");
+  
+  if(!accept) {
+    return NCHAN_CONTENT_TYPE_PLAIN;
+  }
+  
+  unsigned i;
+  size_t len;
+  u_char *cur, *last, *curend;
+  
+  for(cur = accept->data, last = accept->data + accept->len; cur < last; cur = curend) {
+    if((curend = memchr(cur, ',', last - cur)) != NULL) {
+      curend++;
+    }
+    else {
+      curend = last;
+    }
+    
+    if(nchan_strscanstr(&cur, &text_, curend) || nchan_strscanstr(&cur, &application_, curend)) {
+      len = curend - cur;
+      for(i=0; i<(sizeof(subtypes)/sizeof(nchan_content_subtype_t)); i++) {
+        if(len >= subtypes[i].subtype.len && ngx_memcmp(cur, subtypes[i].subtype.data, subtypes[i].subtype.len) == 0) {
+          return subtypes[i].ct;
+        }
+      }
+    }
+    else {
+      continue;
+    }
+  }
+  
+  return NCHAN_CONTENT_TYPE_PLAIN;
+}
+
+#define NCHAN_CHANNEL_INFO_MAX_LEN 512
+ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type) {
+  static ngx_buf_t                channel_info_buf;
+  static u_char                   channel_info_buf_str[NCHAN_CHANNEL_INFO_MAX_LEN]; //big enough
+  
+  ngx_buf_t                      *b = &channel_info_buf;
+  ngx_uint_t                      len;
+  const ngx_str_t                *format;
+  time_t                          time_elapsed = ngx_time() - last_seen;
+  static nchan_msg_id_t           zero_msgid = NCHAN_ZERO_MSGID;
+  nchan_content_type_t            ct;
+  
+  static struct {
+    ngx_str_t        content_type;
+    const ngx_str_t *format_string;
+  } content_type_map[] = {
+    [NCHAN_CONTENT_TYPE_PLAIN]    = { ngx_string("text/plain"), &NCHAN_CHANNEL_INFO_PLAIN }, 
+    [NCHAN_CONTENT_TYPE_JSON]     = { ngx_string("text/json"), &NCHAN_CHANNEL_INFO_JSON },
+    [NCHAN_CONTENT_TYPE_YAML]     = { ngx_string("text/yaml"), &NCHAN_CHANNEL_INFO_YAML },
+    [NCHAN_CONTENT_TYPE_XML]      = { ngx_string("text/xml"), &NCHAN_CHANNEL_INFO_XML }
+  };
+  
+  if(!last_msgid) {
+    last_msgid = &zero_msgid;
+  }
+ 
+  b->start = channel_info_buf_str;
+  b->pos = b->start;
+  b->last_buf = 1;
+  b->last_in_chain = 1;
+  b->flush = 1;
+  b->memory = 1;
+  
+  ct = nchan_output_info_type(accept_header);
+
+  if(generated_content_type) {
+    *generated_content_type = &content_type_map[ct].content_type;
+  }
+  
+  format = content_type_map[ct].format_string;
+  
+  len = format->len - 8 - 1 + 3*NGX_INT_T_LEN; //minus 8 sprintf
+  
+  if(len > NCHAN_CHANNEL_INFO_MAX_LEN) {
+    nchan_log_error("Channel info string too long: max: %i, is: %i", NCHAN_CHANNEL_INFO_MAX_LEN, len);
+  }
+  
+  b->last = ngx_snprintf(b->start, NCHAN_CHANNEL_INFO_MAX_LEN, (char *)format->data, messages, last_seen==0 ? -1 : (ngx_int_t) time_elapsed, subscribers, msgid_to_str(last_msgid));
+  b->end = b->last;
+  
+  return b;
+}
+
+
+#define NCHAN_GROUP_INFO_MAX_LEN 1024
+static ngx_buf_t *nchan_group_info_buf(ngx_str_t *accept_header, const nchan_group_t *group, ngx_str_t **generated_content_type) {
+  static ngx_buf_t                info_buf;
+  static u_char                   info_buf_str[NCHAN_GROUP_INFO_MAX_LEN]; //big enough
+  
+  ngx_buf_t                      *b = &info_buf;
+  ngx_uint_t                      len;
+  const ngx_str_t                *format;
+  nchan_content_type_t            ct;
+  
+  static struct {
+    ngx_str_t        content_type;
+    const ngx_str_t  format_string;
+  } content_type_map[] = {
+    [NCHAN_CONTENT_TYPE_PLAIN]    = { ngx_string("text/plain"), ngx_string(
+      "channels: %ui" CRLF
+      "subscribers: %ui" CRLF
+      "messages: %ui" CRLF
+      "shared memory used by messages: %ui bytes" CRLF
+      "disk space used by messages: %ui bytes" CRLF
+      "limits:" CRLF
+      "  max channels: %ui" CRLF
+      "  max subscribers: %ui" CRLF
+      "  max messages: %ui" CRLF
+      "  max messages shared memory: %ui" CRLF
+      "  max messages disk space: %ui" CRLF
+    )}, 
+    [NCHAN_CONTENT_TYPE_JSON]     = { ngx_string("text/json"), ngx_string(
+      "{" CRLF
+      "  \"channels\": %ui," CRLF
+      "  \"subscribers\": %ui," CRLF
+      "  \"messages\": %ui," CRLF
+      "  \"messages_memory\": %ui," CRLF
+      "  \"messages_disk\": %ui," CRLF
+      "  \"limits\": {" CRLF
+      "    \"channels\": %ui," CRLF
+      "    \"subscribers\": %ui," CRLF
+      "    \"messages\": %ui," CRLF
+      "    \"messages_memory\": %ui,"CRLF
+      "    \"messages_disk\": %ui" CRLF  
+      "  }" CRLF
+      "}"
+    )},
+    [NCHAN_CONTENT_TYPE_YAML]     = { ngx_string("text/yaml"), ngx_string(
+      "---" CRLF
+      "channels: %ui" CRLF
+      "subscribers: %ui" CRLF
+      "messages: %ui" CRLF
+      "messages_memory: %ui" CRLF
+      "messages_disk: %ui" CRLF
+      "limits:" CRLF
+      "  channels: %ui" CRLF
+      "  subscribers: %ui" CRLF
+      "  messages: %ui" CRLF
+      "  messages_memory: %ui" CRLF
+      "  messages_disk: %ui" CRLF
+      CRLF
+    )},
+    [NCHAN_CONTENT_TYPE_XML]      = { ngx_string("text/xml"), ngx_string(
+      "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" CRLF
+      "<group>" CRLF
+      "  <channels>%ui</channels>" CRLF
+      "  <subscribers>%ui</subscribers>" CRLF
+      "  <messages>%ui</messages>" CRLF
+      "  <messages_memory>%ui</messages_memory>" CRLF
+      "  <messages_disk>%ui</messages_disk>" CRLF
+      "  <limits>" CRLF
+      "    <channels>%ui</channels>" CRLF
+      "    <subscribers>%ui</subscribers>" CRLF
+      "    <messages>%ui</messages>" CRLF
+      "    <messages_memory>%ui</messages_memory>" CRLF
+      "    <messages_disk>%ui</messages_disk>" CRLF
+      "  </limits>" CRLF
+      "</group>"
+    )}
+  };
+ 
+  b->start = info_buf_str;
+  b->pos = b->start;
+  b->last_buf = 1;
+  b->last_in_chain = 1;
+  b->flush = 1;
+  b->memory = 1;
+  
+  ct = nchan_output_info_type(accept_header);
+
+  if(generated_content_type) {
+    *generated_content_type = &content_type_map[ct].content_type;
+  }
+  
+  format = &content_type_map[ct].format_string;
+  
+  len = format->len + 5*NGX_INT_T_LEN; //minus 8 sprintf
+  
+  if(len > NCHAN_GROUP_INFO_MAX_LEN) {
+    nchan_log_error("Group info string too long: max: %i, is: %i", NCHAN_GROUP_INFO_MAX_LEN, len);
+  }
+  
+  b->last = ngx_snprintf(b->start, NCHAN_GROUP_INFO_MAX_LEN, (char *)format->data, 
+                         group->channels, 
+                         group->subscribers, 
+                         group->messages, 
+                         group->messages_shmem_bytes, 
+                         group->messages_file_bytes, 
+                         //now limits
+                         group->limit.channels, 
+                         group->limit.subscribers,
+                         group->limit.messages,
+                         group->limit.messages_shmem_bytes,
+                         group->limit.messages_file_bytes
+                        );
+  b->end = b->last;
+  
+  return b;
+}
+
+//print information about a group
+ngx_int_t nchan_group_info(ngx_http_request_t *r, const nchan_group_t *group) {
+  ngx_buf_t                      *b;
+  ngx_str_t                      *content_type;
+  ngx_str_t                      *accept_header = nchan_get_accept_header_value(r);
+
+  b = nchan_group_info_buf(accept_header, group, &content_type);
+  
+  return nchan_respond_membuf(r, NGX_HTTP_OK, content_type, b, 0);
+}
+
+//print information about a channel
+ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_int_t status_code, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid) {
+  ngx_buf_t                      *b;
+  ngx_str_t                      *content_type;
+  ngx_str_t                      *accept_header = nchan_get_accept_header_value(r);
+
+  b = nchan_channel_info_buf(accept_header, messages, subscribers, last_seen, msgid, &content_type);
+  
+  return nchan_respond_membuf(r, status_code, content_type, b, 0);
+}
+
+ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code) {
+  static const ngx_str_t CREATED_LINE = ngx_string("201 Created");
+  static const ngx_str_t ACCEPTED_LINE = ngx_string("202 Accepted");
+  
+  time_t                last_seen = 0;
+  ngx_uint_t            subscribers = 0;
+  ngx_uint_t            messages = 0;
+  nchan_msg_id_t       *msgid = NULL;
+  nchan_request_ctx_t  *ctx;
+  
+  if(channel!=NULL) {
+    subscribers = channel->subscribers;
+    last_seen = channel->last_seen;
+    messages  = channel->messages;
+    msgid = &channel->last_published_msg_id;
+    r->headers_out.status = status_code == NGX_OK ? NGX_HTTP_OK : status_code;
+    if (status_code == NGX_HTTP_CREATED) {
+      ngx_memcpy(&r->headers_out.status_line, &CREATED_LINE, sizeof(ngx_str_t));
+    }
+    else if (status_code == NGX_HTTP_ACCEPTED) {
+      ngx_memcpy(&r->headers_out.status_line, &ACCEPTED_LINE, sizeof(ngx_str_t));
+    }
+    
+    //set request context values for vars that could be used for logging
+    //does this really belong here? nope.
+    //it's getting refactored out soon though, so these noodles are, for now, acceptable
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+    if(ctx) {
+      ctx->channel_subscriber_last_seen = last_seen;
+      ctx->channel_subscriber_count = subscribers;
+      ctx->channel_message_count = messages;
+    }
+    
+    return nchan_channel_info(r, r->headers_out.status, messages, subscribers, last_seen, msgid);
+  }
+  else {
+    //404!
+    return nchan_respond_status(r, NGX_HTTP_NOT_FOUND, NULL, NULL, 0);
+  }
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output_info.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output_info.h
new file mode 100644
index 0000000..36c5152
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_output_info.h
@@ -0,0 +1,6 @@
+ngx_buf_t *nchan_channel_info_buf(ngx_str_t *accept_header, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *last_msgid, ngx_str_t **generated_content_type);
+
+ngx_int_t nchan_channel_info(ngx_http_request_t *r, ngx_int_t status_code, ngx_uint_t messages, ngx_uint_t subscribers, time_t last_seen, nchan_msg_id_t *msgid);
+ngx_int_t nchan_group_info(ngx_http_request_t *r, const nchan_group_t *group);
+
+ngx_int_t nchan_response_channel_ptr_info(nchan_channel_t *channel, ngx_http_request_t *r, ngx_int_t status_code);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_rbtree.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_rbtree.c
new file mode 100644
index 0000000..5614979
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_rbtree.c
@@ -0,0 +1,379 @@
+#include <nchan_module.h>
+#include "nchan_rbtree.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "RBTREE:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "RBTREE:" fmt, ##arg)
+
+static uint32_t rbtree_hash_crc32(void *str) {
+  return ngx_crc32_short(((ngx_str_t *)str)->data, ((ngx_str_t *)str)->len);
+}
+static ngx_int_t rbtree_compare_str(void *id1, void *id2) {
+  return ngx_memn2cmp(((ngx_str_t *)id1)->data, ((ngx_str_t *)id2)->data, ((ngx_str_t *)id1)->len, ((ngx_str_t *)id2)->len);
+}
+
+/*
+static ngx_int_t rbtree_validate_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
+  if (node == &seed->sentinel) {
+    return 1;
+  }
+  
+  ngx_int_t    i, max, valid;
+  ngx_rbtree_node_t *cur;
+  valid = 0;
+  max = sizeof(seed->actives)/sizeof(cur);
+  
+  for(i=0; i<max; i++){
+    if(seed->actives[i] == node) {
+      valid = 1;
+      break;
+    }
+  }
+  return valid;
+  
+}
+*/
+
+/*
+static ngx_int_t rbtree_validate_nodes_reachable(rbtree_seed_t *seed) {
+  ngx_int_t    i, max;
+  ngx_rbtree_node_t *cur, *match;
+  max = sizeof(seed->actives)/sizeof(cur);
+  
+  for(i=0; i<max; i++){
+    cur = seed->actives[i];
+    if(cur != NULL) {
+      match = rbtree_find_node(seed, seed->id(rbtree_data_from_node(cur)));
+      assert(match == cur);
+    }
+  }
+  return 1;
+}
+*/
+
+static ngx_rbtree_node_t * rbtree_find_node_generic(rbtree_seed_t *seed, void *id, uint32_t hash, ngx_rbtree_node_t **last_parent, ngx_int_t *last_compare) {
+  ngx_rbtree_node_t              *root = seed->tree.root;
+  ngx_rbtree_node_t              *node = root;
+  ngx_rbtree_node_t              *sentinel = seed->tree.sentinel;
+  ngx_int_t                       rc;
+
+  while (node != sentinel) {
+    if (hash < node->key) {
+      node = node->left;
+      continue;
+    }
+    if (hash > node->key) {
+      node = node->right;
+      continue;
+    }
+
+    /* hash == node->key */
+    rc = seed->compare(id, seed->id(rbtree_data_from_node(node)));
+    if (rc == 0) {
+      return node;
+    }
+    node = (rc < 0) ? node->left : node->right;
+  }
+  /* not found */
+
+  return NULL;
+}
+
+ngx_rbtree_node_t *rbtree_find_node(rbtree_seed_t *seed, void *id) {
+  ngx_rbtree_node_t *found;
+  found = rbtree_find_node_generic(seed, id, seed->hash(id), NULL, NULL);
+  if(found) {
+    DBG("found node %p", found);
+  }
+  else {
+    DBG("node not found");
+  }
+  return found;
+}
+
+static void rbtree_insert_generic(ngx_rbtree_node_t *temp, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) {
+  ngx_int_t         offset = offsetof(rbtree_seed_t, sentinel);
+  rbtree_seed_t    *seed = (rbtree_seed_t *)((char *)sentinel - offset);
+  ngx_int_t         rc;
+  void             *id = seed->id(rbtree_data_from_node(node));
+  
+  ngx_rbtree_node_t  **p;
+ 
+  for ( ;; ) {
+    
+    if (node->key != temp->key) {
+      p = (node->key < temp->key) ? &temp->left : &temp->right;
+    }
+    else {
+      rc = seed->compare(id, seed->id(rbtree_data_from_node(temp)));
+      p = (rc < 0) ? &temp->left : &temp->right;
+    }
+    
+    if (*p == sentinel) {
+      break;
+    }
+    
+    temp = *p;
+  }
+
+  *p = node;
+  node->parent = temp;
+  node->left = sentinel;
+  node->right = sentinel;
+  ngx_rbt_red(node);
+}
+
+ngx_rbtree_node_t *rbtree_create_node(rbtree_seed_t *seed, size_t data) {
+  ngx_rbtree_node_t *node = ngx_alloc(sizeof(ngx_rbtree_node_t) + data, ngx_cycle->log);
+  if(node) {
+    node->left = NULL;
+    node->right = NULL;
+    node->parent = NULL;
+    seed->allocd_nodes++;
+  }
+  DBG("created node %p", node);
+  return node;
+}
+
+ngx_int_t rbtree_destroy_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
+  seed->allocd_nodes--;
+#if NCHAN_RBTREE_DBG
+  ngx_memset(node, 0x67, sizeof(*node));
+#endif
+  DBG("Destroyed node %p", node);
+  ngx_free(node);
+  
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_insert_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
+  void  *id = seed->id(rbtree_data_from_node(node));
+  node->key = seed->hash(id);
+  ngx_rbtree_insert(&seed->tree, node);
+  seed->active_nodes++;
+  
+#if NCHAN_RBTREE_DBG
+  
+  //assert(rbtree_find_node(seed, seed->id(rbtree_data_from_node(node))) == node);
+  
+  //super-heavy debugging
+  /*
+  ngx_int_t    i, max, inserted = 0;
+  ngx_rbtree_node_t *cur;
+  max = sizeof(seed->actives)/sizeof(cur);
+  
+  assert(seed->active_nodes < max);
+  
+  for(i=0; i<max; i++){
+    if(seed->actives[i] == NULL) {
+      seed->actives[i]=node;
+      inserted = 1;
+      break;
+    }
+  }
+  assert(inserted);
+  */
+  
+#endif
+  DBG("inserted node %p", node);
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_remove_node(rbtree_seed_t *seed, ngx_rbtree_node_t *node) {
+  
+  ngx_rbtree_delete(&seed->tree, node);
+  DBG("Removed node %p", node);
+  seed->active_nodes--;
+  
+#if NCHAN_RBTREE_DBG
+  //assert(rbtree_find_node(seed, seed->id(rbtree_data_from_node(node))) == NULL);
+  ngx_memset(node, 0x65, sizeof(*node));
+  
+  
+  //super-heavy debugging
+  /*
+  ngx_int_t    i, max, removed = 0;
+  ngx_rbtree_node_t *cur;
+  max = sizeof(seed->actives)/sizeof(cur);
+  
+  assert(seed->active_nodes < max);
+  
+  for(i=0; i<max; i++){
+    if(seed->actives[i] == node) {
+      seed->actives[i]=NULL;
+      removed = 1;
+      break;
+    }
+  }
+  assert(removed);
+  
+  */
+  
+#endif
+  return NGX_OK;
+}
+
+static ngx_inline void rbtree_walk_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_callback_pt callback, void *data) {
+  ngx_rbtree_node_t  *left, *right;
+  if(node == sentinel || node == NULL) {
+    return;
+  }
+  left = node->left;
+  right = node->right;
+  rbtree_walk_real(seed, left, sentinel, callback, data);
+  rbtree_walk_real(seed, right, sentinel, callback, data);
+  callback(seed, rbtree_data_from_node(node), data);
+}
+
+static ngx_inline void rbtree_walk_ordered_incr_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_callback_pt callback, void *data) {
+  ngx_rbtree_node_t  *left, *right;
+  if(node == sentinel || node == NULL) {
+    return;
+  }
+  left = node->left;
+  right = node->right;
+  rbtree_walk_real(seed, left, sentinel, callback, data);
+  callback(seed, rbtree_data_from_node(node), data);
+  rbtree_walk_real(seed, right, sentinel, callback, data);
+}
+
+static ngx_inline void rbtree_walk_ordered_decr_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_callback_pt callback, void *data) {
+  ngx_rbtree_node_t  *left, *right;
+  if(node == sentinel || node == NULL) {
+    return;
+  }
+  left = node->left;
+  right = node->right;
+  rbtree_walk_real(seed, right, sentinel, callback, data);
+  callback(seed, rbtree_data_from_node(node), data);
+  rbtree_walk_real(seed, left, sentinel, callback, data);
+}
+
+ngx_int_t rbtree_walk(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
+  rbtree_walk_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_walk_incr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
+  rbtree_walk_ordered_incr_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
+  return NGX_OK;
+}
+ngx_int_t rbtree_walk_decr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
+  rbtree_walk_ordered_decr_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
+  return NGX_OK;
+}
+
+typedef struct {
+  void                **els;
+  int                 (*include)(void *);
+  int                   n;
+} rbtree_walk_writesafe_data_t;
+
+static ngx_int_t rbtree_walk_writesafe_callback(rbtree_seed_t *seed, void *node_data, rbtree_walk_writesafe_data_t *d) {
+  if(d->include(node_data)) {
+    d->els[d->n++]=node_data;
+  }
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_walk_writesafe(rbtree_seed_t *seed, int (*include)(void *), rbtree_walk_callback_pt callback, void *data) {
+  void                         *els_static[32];
+  int                           allocd;
+  int                           i;
+  rbtree_walk_writesafe_data_t  d;
+  if(seed->active_nodes > 32) {
+    d.els = ngx_alloc(sizeof(void *) * seed->active_nodes, ngx_cycle->log);
+    allocd = 1;
+  }
+  else {
+    d.els = els_static;
+    allocd = 0;
+  }
+  d.include = include;
+  d.n = 0;
+  rbtree_walk(seed, (rbtree_walk_callback_pt )rbtree_walk_writesafe_callback, &d);
+  
+  for(i=0; i<d.n; i++) {
+    callback(seed, d.els[i], data);
+  }
+  
+  if(allocd) ngx_free(d.els);
+  return NGX_OK;
+}
+
+unsigned rbtree_empty(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data) {
+  ngx_rbtree_t         *tree = &seed->tree;
+  ngx_rbtree_node_t    *cur, *sentinel = tree->sentinel;
+  unsigned int          n = 0;
+  
+  for(cur = tree->root; cur != NULL && cur != sentinel; cur = tree->root) {
+    if(callback) {
+      callback(seed, rbtree_data_from_node(cur), data);
+    }
+    rbtree_remove_node(seed, cur);
+    rbtree_destroy_node(seed, cur);
+    n++;
+  }
+  return n;
+}
+
+
+static ngx_inline void rbtree_conditional_walk_real(rbtree_seed_t *seed, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel, rbtree_walk_conditional_callback_pt callback, void *data) {
+  rbtree_walk_direction_t    direction;
+  
+  if(node == sentinel || node == NULL) {
+    return;
+  }
+  
+  direction = callback(seed, rbtree_data_from_node(node), data);
+  switch(direction) {
+    case RBTREE_WALK_LEFT:
+      rbtree_conditional_walk_real(seed, node->left, sentinel, callback, data);
+      break;
+    
+    case RBTREE_WALK_RIGHT:
+      rbtree_conditional_walk_real(seed, node->right, sentinel, callback, data);
+      break;
+    
+    case RBTREE_WALK_LEFT_RIGHT:
+      rbtree_conditional_walk_real(seed, node->left, sentinel, callback, data);
+      rbtree_conditional_walk_real(seed, node->right, sentinel, callback, data);
+      break;
+    
+    case RBTREE_WALK_STOP:
+      //no more
+      break;
+  }
+}
+
+ngx_int_t rbtree_conditional_walk(rbtree_seed_t *seed, rbtree_walk_conditional_callback_pt callback, void *data) {
+  rbtree_conditional_walk_real(seed, seed->tree.root, seed->tree.sentinel, callback, data);
+  return NGX_OK;
+}
+
+ngx_int_t rbtree_init(rbtree_seed_t *seed, char *name, void *(*id)(void *), uint32_t (*hash)(void *), ngx_int_t (*compare)(void *, void *)) {
+  seed->name=name;
+  assert(id != NULL);
+  if(hash==NULL) {
+    hash = &rbtree_hash_crc32;
+  }
+  if(compare == NULL) {
+    compare = &rbtree_compare_str;
+  }
+  seed->id = id;
+  seed->hash = hash;
+  seed->compare = compare;
+  seed->active_nodes = 0;
+  seed->allocd_nodes = 0;
+#if NCHAN_RBTREE_DBG
+  /*
+  //super-heavy debugging setup
+  ngx_int_t max = sizeof(seed->actives);
+  ngx_memzero(seed->actives, sizeof(seed->actives));
+  */
+#endif
+  ngx_rbtree_init(&seed->tree, &seed->sentinel, &rbtree_insert_generic);
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_rbtree.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_rbtree.h
new file mode 100644
index 0000000..f67ad3b
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_rbtree.h
@@ -0,0 +1,64 @@
+#ifndef NCHAN_RBTREE_UTIL_HEADER
+#define NCHAN_RBTREE_UTIL_HEADER
+
+#define NCHAN_RBTREE_DBG 0
+
+typedef struct {
+  char              *name;
+  ngx_rbtree_t       tree;
+  ngx_rbtree_node_t  sentinel;
+  ngx_uint_t         allocd_nodes;
+  ngx_uint_t         active_nodes;
+  void              *(*id)(void *node);
+  uint32_t           (*hash)(void *);
+  ngx_int_t          (*compare)(void *, void *);
+  #if NCHAN_RBTREE_DBG   
+  //ngx_rbtree_node_t *actives[4096]; //super-heavy debugging
+#endif
+} rbtree_seed_t;
+
+
+#if NCHAN_RBTREE_DBG 
+typedef struct ngx_rbtree_debug_node_s ngx_rbtree_debug_node_t;
+
+typedef struct {
+  struct ngx_rbtree_debug_node_s  *prev;
+  struct ngx_rbtree_debug_node_s  *next;
+} ngx_rbtree_debug_node_link_t;
+
+struct ngx_rbtree_debug_node_s {
+  ngx_rbtree_node_t              node;
+  ngx_rbtree_debug_node_link_t   allocd;
+  ngx_rbtree_debug_node_link_t   active;
+}; //ngx_rbtree_debug_node_t;
+#endif
+
+typedef enum {RBTREE_WALK_LEFT, RBTREE_WALK_RIGHT, RBTREE_WALK_LEFT_RIGHT, RBTREE_WALK_STOP} rbtree_walk_direction_t;
+
+typedef ngx_int_t (*rbtree_walk_callback_pt)(rbtree_seed_t *, void *node_data, void *privdata);
+typedef rbtree_walk_direction_t (*rbtree_walk_conditional_callback_pt)(rbtree_seed_t *, void *, void *);
+
+ngx_int_t rbtree_init(rbtree_seed_t *seed, char *name, void *(*id)(void *), uint32_t (*hash)(void *), ngx_int_t (*compare)(void *, void *));
+unsigned             rbtree_empty(rbtree_seed_t *, rbtree_walk_callback_pt, void *data);
+
+ngx_rbtree_node_t   *rbtree_create_node(rbtree_seed_t *, size_t data_size);
+ngx_int_t            rbtree_insert_node(rbtree_seed_t *, ngx_rbtree_node_t *);
+ngx_int_t            rbtree_remove_node(rbtree_seed_t *, ngx_rbtree_node_t *);
+ngx_int_t            rbtree_destroy_node(rbtree_seed_t *, ngx_rbtree_node_t *);
+
+ngx_rbtree_node_t   *rbtree_find_node(rbtree_seed_t *, void *id);
+
+ngx_int_t            rbtree_walk(rbtree_seed_t *seed, rbtree_walk_callback_pt, void *data);
+ngx_int_t            rbtree_walk_incr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data);
+ngx_int_t            rbtree_walk_decr(rbtree_seed_t *seed, rbtree_walk_callback_pt callback, void *data);
+ngx_int_t            rbtree_walk_writesafe(rbtree_seed_t *seed, int (*include)(void *), rbtree_walk_callback_pt callback, void *data);
+
+ngx_int_t            rbtree_conditional_walk(rbtree_seed_t *seed, rbtree_walk_conditional_callback_pt, void *data);
+
+ngx_rbtree_node_t   *rbtree_node_from_data(void *);
+
+
+#define rbtree_data_from_node(node) ((void *)(&node[1]))
+#define rbtree_node_from_data(data) (ngx_rbtree_node_t *)((u_char *)data - sizeof(ngx_rbtree_node_t))
+
+#endif /*NCHAN_RBTREE_UTIL_HEADER*/
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reaper.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reaper.c
new file mode 100644
index 0000000..25604ab
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reaper.c
@@ -0,0 +1,320 @@
+#include <nchan_module.h>
+#include "nchan_reaper.h"
+#include <assert.h>
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REAPER: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REAPER: " fmt, ##args)
+
+static void reaper_timer_handler(ngx_event_t *ev);
+void verify_reaper_list(nchan_reaper_t *rp, void *thing);
+
+ngx_int_t nchan_reaper_start(nchan_reaper_t *rp, char *name, int prev, int next, ngx_int_t (*ready)(void *, uint8_t), void (*reap)(void *), int tick_sec) {
+  rp->name = name;
+  rp->count = 0;
+  rp->next_ptr_offset = next;
+  rp->prev_ptr_offset = prev;
+  rp->last = NULL;
+  rp->first = NULL;
+  rp->ready = ready;
+  rp->reap = reap;
+  ngx_memzero(&rp->timer, sizeof(rp->timer));
+  nchan_init_timer(&rp->timer, reaper_timer_handler, rp);
+  
+  rp->tick_usec = tick_sec * 1000;
+  rp->strategy = RESCAN;
+  rp->max_notready_ratio = 0; //disabled
+  rp->position = NULL;
+  
+  DBG("start reaper %s with tick time of %i sec", name, tick_sec);
+  verify_reaper_list(rp, NULL);
+  return NGX_OK;
+}
+
+static void its_reaping_time(nchan_reaper_t *rp, uint8_t force);
+
+ngx_int_t nchan_reaper_flush(nchan_reaper_t *rp) {
+  its_reaping_time(rp, 1);
+  return NGX_OK;
+}
+
+ngx_int_t nchan_reaper_stop(nchan_reaper_t *rp) {
+  nchan_reaper_flush(rp);
+  if(rp->timer.timer_set) {
+    ngx_del_timer(&rp->timer);
+  }
+  DBG("stopped reaper %s", rp->name);
+  return NGX_OK;
+}
+
+static ngx_inline void **thing_next_ptr(nchan_reaper_t *rp, void *thing) {
+  return (void *)((char *)thing + rp->next_ptr_offset);
+}
+static ngx_inline void *thing_next(nchan_reaper_t *rp, void *thing) {
+  return *thing_next_ptr(rp, thing);
+}
+
+static ngx_inline void **thing_prev_ptr(nchan_reaper_t *rp, void *thing) {
+  return (void *)((char *)thing + rp->prev_ptr_offset);
+}
+static ngx_inline void *thing_prev(nchan_reaper_t *rp, void *thing) {
+  return *thing_prev_ptr(rp, thing);
+}
+
+void nchan_reaper_each(nchan_reaper_t *rp, void (*cb)(void *thing, void *pd), void *pd) {
+  void                *cur;
+  for(cur = rp->first; cur != NULL; cur = thing_next(rp, cur)) {
+    cb(cur, pd);
+  }
+}
+
+ngx_inline void verify_reaper_list(nchan_reaper_t *rp, void *thing) {
+  /*
+  if(rp->first == NULL) {
+    assert(rp->count == 0 && rp->last == NULL);
+  }
+  else {
+    assert(rp->count > 0 && rp->last != NULL);
+  }
+  
+  if(rp->last == NULL) {
+    assert(rp->count == 0 && rp->first == NULL);
+  }
+  else {
+    assert(rp->count > 0 && rp->first != NULL);
+  }
+  
+  if(rp->count == 0) {
+    assert(rp->last == NULL && rp->first == NULL);
+  }
+  else {
+    assert(rp->last != NULL && rp->first != NULL);
+  }
+  
+  int i=0;
+  void *cur;
+  for(cur = rp->first; cur != NULL; cur = thing_next(rp, cur)) {
+    i++;
+    if(thing) assert(cur != thing);
+  }
+  assert(i == rp->count);
+  */
+}
+
+static ngx_inline void reaper_reset_timer(nchan_reaper_t *rp) {
+  verify_reaper_list(rp, NULL);
+  if (!ngx_exiting && !ngx_quit && rp->count > 0 && !rp->timer.timer_set) {
+    DBG("reap %s again later (remaining: %i)", rp->name, rp->count);
+    ngx_add_timer(&rp->timer, rp->tick_usec);
+  }
+  
+}
+
+ngx_int_t nchan_reaper_add(nchan_reaper_t *rp, void *thing) {
+  verify_reaper_list(rp, thing);
+  
+  if(rp->ready(thing, 0) == NGX_OK) {
+    rp->reap(thing);
+    return NGX_OK;
+  }
+  
+  void    **next = thing_next_ptr(rp, thing);
+  void    **prev = thing_prev_ptr(rp, thing);
+  
+  if(rp->last) {
+    *thing_next_ptr(rp, rp->last) = thing;
+  }
+  *prev = rp->last;
+  *next = NULL;
+  rp->last = thing;
+  
+  if(rp->first == NULL) {
+    rp->first = thing;
+  }
+  
+  assert(rp->count >= 0);
+  rp->count++;
+  
+  DBG("reap %s %p later (waiting to be reaped: %i)", rp->name, thing, rp->count);
+  verify_reaper_list(rp, NULL);
+  reaper_reset_timer(rp);
+  return NGX_OK;
+}
+
+
+//this is not a safe function -- it doesn't check if the thing is actually being reaped.
+ngx_int_t nchan_reaper_withdraw(nchan_reaper_t *rp, void *thing) {
+  void *prev, *next;
+  
+  prev = thing_prev(rp, thing);
+  next = thing_next(rp, thing);
+  
+  if(prev) *thing_next_ptr(rp, prev) = next;
+  if(next) *thing_prev_ptr(rp, next) = prev;
+  
+  if(thing == rp->first) rp->first = next;
+  if(thing == rp->last)  rp->last  = prev;
+  
+  assert(rp->count > 0);
+  rp->count--;
+  
+  if(rp->strategy == KEEP_PLACE && rp->position == thing) {
+    rp->position = next;
+  }
+  
+  *thing_next_ptr(rp, thing) = NULL;
+  *thing_prev_ptr(rp, thing) = NULL;
+
+  verify_reaper_list(rp, thing);
+  
+  DBG("withdraw %s %p", rp->name, thing);
+  return NGX_OK;
+}
+
+static ngx_inline void reap_ready_thing(nchan_reaper_t *rp, void *cur, void *next) {
+  void   *prev;
+  prev = thing_prev(rp, cur);
+  if(prev != NULL && next != NULL) {
+    assert(prev != next);
+  }
+  assert(cur != prev);
+  assert(cur != next);
+  if(prev) *thing_next_ptr(rp, prev) = next;
+  if(next) *thing_prev_ptr(rp, next) = prev;
+  if(cur == rp->first) rp->first = next;
+  if(cur == rp->last)  rp->last = prev;
+  if(rp->strategy == KEEP_PLACE && rp->position == cur) {
+    rp->position = next;
+  }
+  rp->count--;
+  
+  rp->reap(cur);
+  
+  assert(rp->count >= 0);
+  verify_reaper_list(rp, cur);
+  DBG("reaped %s %p (waiting to be reaped: %i)", rp->name, cur, rp->count);
+}
+
+static void its_reaping_time(nchan_reaper_t *rp, uint8_t force) {
+  void                *cur = rp->first, *next;
+  int                  max_notready, notready = 0; 
+  
+  max_notready = rp->max_notready_ratio * rp->count;
+  
+  DBG("%s scan max notready %i", rp->name, max_notready);
+  
+  while(cur != NULL && notready <= max_notready) {
+    next = thing_next(rp, cur);
+    if(rp->ready(cur, force) == NGX_OK) {
+      reap_ready_thing(rp, cur, next);
+      verify_reaper_list(rp, cur);
+    }
+    else if(max_notready > 0){
+      DBG("not ready to reap %s %p", rp->name, cur);
+      notready++;
+      verify_reaper_list(rp, NULL);
+    }
+    cur = next;
+  } 
+}
+
+static void its_reaping_time_keep_place(nchan_reaper_t *rp, uint8_t force) {
+  void                *cur, *next;
+  int                  max_notready, notready = 0; 
+  int                  n = 0;
+  max_notready = rp->max_notready_ratio * rp->count;
+  cur = rp->position == NULL ? rp->first : rp->position;
+  
+  DBG("%s keep_place max notready %i, cur %p", rp->name, max_notready, cur);
+  
+  while(n < rp->count && notready <= max_notready) {
+    n++;
+    next = thing_next(rp, cur);
+    if(rp->ready(cur, force) == NGX_OK) {
+      reap_ready_thing(rp, cur, next);
+      verify_reaper_list(rp, cur);
+    }
+    else if(max_notready > 0) {
+      DBG("not ready to reap %s %p", rp->name, cur);
+      notready++;
+      verify_reaper_list(rp, NULL);
+    }
+    cur = (next == NULL ? rp->first : next);
+  }
+  rp->position = cur;
+}
+
+static void its_reaping_rotating_time(nchan_reaper_t *rp, uint8_t force) {
+  void                *cur = rp->first, *next, *prev;
+  void                *firstmoved = NULL;
+  void               **next_ptr, **prev_ptr;
+  int                  max_notready, notready = 0; 
+  
+  max_notready = rp->max_notready_ratio * rp->count;
+  
+  DBG("%s rotatey max notready %i", rp->name, max_notready);
+  
+  while(cur != NULL && cur != firstmoved && notready <= max_notready) {
+    next = thing_next(rp, cur);
+    if(rp->ready(cur, force) == NGX_OK) {
+      reap_ready_thing(rp, cur, next);
+    }
+    else {
+      //move to the end of the list
+      //TODO: bulk move
+      if(max_notready > 0) {
+        DBG("not ready to reap %s %p", rp->name, cur);
+        notready++;
+        verify_reaper_list(rp, NULL);
+      }
+      
+      if(!firstmoved) firstmoved = cur;
+      
+      if(rp->last != cur) {
+        prev = thing_prev(rp, cur);
+        
+        if(prev) *thing_next_ptr(rp, prev) = next;
+        if(next) *thing_prev_ptr(rp, next) = prev;
+        
+        next_ptr = thing_next_ptr(rp, cur);
+        prev_ptr = thing_prev_ptr(rp, cur);
+        
+        if(rp->last) {
+          *thing_next_ptr(rp, rp->last) = cur;
+        }
+        
+        *prev_ptr = rp->last;
+        *next_ptr = NULL;
+        rp->last = cur;
+        
+        if(rp->first == NULL) {
+          rp->first = cur;
+        }
+        else if(rp->first == cur) {
+          rp->first = next;
+        }
+      }
+      verify_reaper_list(rp, NULL);
+    }
+    cur = next;
+  } 
+}
+
+static void reaper_timer_handler(ngx_event_t *ev) {
+  nchan_reaper_t      *rp = ev->data;
+  switch (rp->strategy) {
+    case RESCAN:
+      its_reaping_time(rp, 0);
+      reaper_reset_timer(rp);
+      return;
+    case ROTATE:
+      its_reaping_rotating_time(rp, 0);
+      reaper_reset_timer(rp);
+      return;
+    case KEEP_PLACE:
+      its_reaping_time_keep_place(rp, 0);
+      reaper_reset_timer(rp);
+      return;
+  }
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reaper.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reaper.h
new file mode 100644
index 0000000..f737874
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reaper.h
@@ -0,0 +1,33 @@
+#ifndef NCHAN_REAPER_H
+#define NCHAN_REAPER_H
+
+typedef enum {RESCAN, ROTATE, KEEP_PLACE} nchan_reaper_strategy_t;
+
+typedef struct {
+  char                      *name;
+  ngx_int_t                  count;
+  int                        next_ptr_offset;
+  int                        prev_ptr_offset;
+  void                      *last;
+  void                      *first;
+  ngx_int_t                  (*ready)(void *, uint8_t force); //ready to be reaped?
+  void                       (*reap)(void *); //reap it
+  ngx_event_t                timer;
+  int                        tick_usec;
+  nchan_reaper_strategy_t    strategy;
+  float                      max_notready_ratio;
+  void                      *position;
+
+} nchan_reaper_t;
+
+ngx_int_t nchan_reaper_start(nchan_reaper_t *rp, char *name, int prev, int next, ngx_int_t (*ready)(void *, uint8_t force), void (*reap)(void *), int tick_sec);
+
+ngx_int_t nchan_reaper_flush(nchan_reaper_t *rp);
+ngx_int_t nchan_reaper_stop(nchan_reaper_t *rp);
+void nchan_reaper_each(nchan_reaper_t *rp, void (*cb)(void *thing, void *pd), void *pd);
+
+
+ngx_int_t nchan_reaper_add(nchan_reaper_t *rp, void *thing);
+ngx_int_t nchan_reaper_withdraw(nchan_reaper_t *rp, void *thing);
+
+#endif /*NCHAN_REAPER_H*/
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reuse_queue.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reuse_queue.c
new file mode 100644
index 0000000..c79ceb0
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reuse_queue.c
@@ -0,0 +1,151 @@
+#include <nchan_module.h>
+#include "nchan_reuse_queue.h"
+#include <assert.h>
+#define DEBUG_LEVEL NGX_LOG_WARN
+//#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, arg...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "REUSEQUEUE:" fmt, ##arg)
+#define ERR(fmt, arg...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "REUSEQUEUE:" fmt, ##arg)
+
+ngx_int_t nchan_reuse_queue_init(nchan_reuse_queue_t *rq, int prev, int next, void *(*alloc)(void *), ngx_int_t (*free)(void *, void*), void *privdata) {
+  rq->size = 0;
+  rq->prev_ptr_offset = prev;
+    rq->next_ptr_offset = next;
+  rq->first = NULL;
+  rq->last = NULL;
+  rq->reserve = NULL;
+  rq->alloc = alloc;
+  rq->free = free;
+  rq->pd = privdata;
+  
+  return NGX_OK;
+}
+
+static ngx_inline void **thing_next_ptr(nchan_reuse_queue_t *rq, void *thing) {
+  return (void *)((char *)thing + rq->next_ptr_offset);
+}
+static ngx_inline void *thing_next(nchan_reuse_queue_t *rq, void *thing) {
+  return *thing_next_ptr(rq, thing);
+}
+
+static ngx_inline void **thing_prev_ptr(nchan_reuse_queue_t *rq, void *thing) {
+  return (void *)((char *)thing + rq->prev_ptr_offset);
+}
+
+/*static ngx_inline void *thing_prev(nchan_reuse_queue_t *rq, void *thing) {
+  return *thing_prev_ptr(rq, thing);
+}
+
+
+static void check_queue(nchan_reuse_queue_t *rq) {
+  void *cur;
+  for(cur = rq->first; cur != NULL; cur = thing_next(rq, cur)) {
+    if(thing_prev_ptr(rq, rq->first)) {
+      assert(thing_prev(rq, rq->first) != rq->first);
+    }
+    if(thing_next_ptr(rq, rq->first)) {
+      assert(thing_next(rq, rq->first) != rq->first);
+    }
+  }
+}
+*/
+
+ngx_int_t nchan_reuse_queue_flush(nchan_reuse_queue_t *rq) {
+  void *pd = rq->pd;
+  void *thing, *next;
+  ngx_int_t     i=0;
+  next = rq->first;
+  while((thing = next) != NULL) {
+    i++;
+    next = thing_next(rq, thing);
+    if(rq->free) rq->free(pd, thing);
+  }
+  rq->reserve = rq->first;
+  rq->first = NULL;
+  rq->last = NULL;
+  return i;
+}
+
+ngx_int_t nchan_reuse_queue_shutdown(nchan_reuse_queue_t *rq) {
+  if(rq->free) {
+    void *pd = rq->pd;
+    void *thing, *next;
+    next = rq->first;
+    while((thing = next) != NULL) {
+      next = thing_next(rq, thing);
+      rq->free(pd, thing);
+    }
+    next = rq->reserve;
+    while((thing = next) != NULL) {
+      next = thing_next(rq, thing);
+      rq->free(pd, thing);
+    }
+  }
+  
+  if(rq->last) {
+    *thing_next_ptr(rq, rq->last) = rq->reserve;
+  }
+  rq->first = NULL;
+  rq->last = NULL;
+  
+  if(rq->first) {
+    rq->reserve = rq->first;
+  }
+  return NGX_OK;
+}
+
+void *nchan_reuse_queue_push(nchan_reuse_queue_t *rq) {
+  void     *q;
+  //check_queue(rq);
+  if(rq->reserve) {
+    q = rq->reserve;
+    rq->reserve = thing_next(rq, q);
+  }
+  else {
+    q = rq->alloc(rq->pd);
+    rq->size++;
+  }
+  *thing_next_ptr(rq, q) = NULL;
+  *thing_prev_ptr(rq, q) = rq->last;
+  if(rq->last) {
+    *thing_next_ptr(rq, rq->last) = q;
+  }
+  rq->last = q;
+  if(!rq->first) {
+    rq->first = q;
+  }
+  //check_queue(rq);
+  return q;
+}
+
+
+
+void *nchan_reuse_queue_first(nchan_reuse_queue_t *rq) {
+  return rq->first;
+}
+
+void nchan_reuse_queue_each(nchan_reuse_queue_t *rq, void (*callback)(void *)) {
+  void      *cur;
+  for(cur = rq->first; cur != NULL; cur = thing_next(rq, cur)) {
+    callback(cur);
+  }
+}
+
+ngx_int_t nchan_reuse_queue_pop(nchan_reuse_queue_t *rq) {
+  void      *q = rq->first;
+  //check_queue(rq);
+  if(q) {
+    rq->first = thing_next(rq, q);
+    if(rq->first) {
+      *thing_prev_ptr(rq, rq->first) = NULL;
+    }
+    if(rq->last == q) {
+      rq->last = NULL;
+    }
+    *thing_prev_ptr(rq, q) = NULL;
+    *thing_next_ptr(rq, q) = rq->reserve;
+    rq->reserve = q;
+  }
+  //check_queue(rq);
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reuse_queue.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reuse_queue.h
new file mode 100644
index 0000000..660f8e0
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_reuse_queue.h
@@ -0,0 +1,24 @@
+#ifndef NCHAN_REUSE_QUEUE_H
+#define NCHAN_REUSE_QUEUE_H
+
+typedef struct {
+  int                        size;
+  int                        next_ptr_offset;
+  int                        prev_ptr_offset;
+  void                      *first;
+  void                      *last;
+  void                      *reserve;
+  void                      *(*alloc)(void *privdata);
+  ngx_int_t                  (*free)(void *privdata, void *thing);
+  void                      *pd;
+} nchan_reuse_queue_t;
+
+ngx_int_t nchan_reuse_queue_init(nchan_reuse_queue_t *rq, int prev, int next, void *(*alloc)(void *), ngx_int_t (*free)(void *, void*), void *privdata);
+ngx_int_t nchan_reuse_queue_shutdown(nchan_reuse_queue_t *rq);
+ngx_int_t nchan_reuse_queue_flush(nchan_reuse_queue_t *rq);
+void nchan_reuse_queue_each(nchan_reuse_queue_t *rq, void (*calback)(void *));
+void *nchan_reuse_queue_first(nchan_reuse_queue_t *rq);
+void *nchan_reuse_queue_push(nchan_reuse_queue_t *rq);
+ngx_int_t nchan_reuse_queue_pop(nchan_reuse_queue_t *rq);
+
+#endif /*NCHAN_REUSE_QUEUE_H*/
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_slist.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_slist.c
new file mode 100644
index 0000000..8d67318
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_slist.c
@@ -0,0 +1,164 @@
+#include "nchan_slist.h"
+#include <assert.h>
+
+ /*
+  * Boring non-allocating doubly-linked "static" list.
+  *uses preset offsets for the prev and next fields on pre-allocated data
+  */
+ 
+ngx_int_t __nchan_slist_init(nchan_slist_t *list, off_t offset_prev, off_t offset_next) {
+  list->offset.prev = offset_prev;
+  list->offset.next = offset_next;
+  return nchan_slist_reset(list);
+}
+
+ngx_int_t nchan_slist_reset(nchan_slist_t *list) {
+  list->head = NULL;
+  list->tail = NULL;
+  list->n = 0;
+  return NGX_OK;
+}
+
+void *nchan_slist_first(nchan_slist_t *list) {
+  return list->head;
+}
+void *nchan_slist_last(nchan_slist_t *list) {
+  return list->tail;
+}
+static void **nchan_slist_next_ptr(nchan_slist_t *list, void *el) {
+  return (void **)&(((char *)el)[list->offset.next]);
+}
+static void **nchan_slist_prev_ptr(nchan_slist_t *list, void *el) {
+  return (void **)&(((char *)el)[list->offset.prev]);
+}
+
+void *nchan_slist_next(nchan_slist_t *list, void *el) {
+  void **ptr = nchan_slist_next_ptr(list, el);
+  return *ptr;
+}
+void *nchan_slist_prev(nchan_slist_t *list, void *el) {
+  void **ptr = nchan_slist_prev_ptr(list, el);
+  return *ptr;
+}
+
+ngx_int_t nchan_slist_append(nchan_slist_t *list, void *el) {
+  void **el_prev_ptr = nchan_slist_prev_ptr(list, el);
+  void **el_next_ptr = nchan_slist_next_ptr(list, el);
+  if(list->head == NULL) {
+    list->head = el;
+  }
+  if(list->tail == NULL) {
+    *el_prev_ptr = NULL;
+  }
+  else {
+    void **tail_next = nchan_slist_next_ptr(list, list->tail);
+    *el_prev_ptr = list->tail;
+    *tail_next = el;
+  }
+  list->tail = el;
+  *el_next_ptr = NULL;
+  list->n++;
+  return NGX_OK;
+}
+ngx_int_t nchan_slist_prepend(nchan_slist_t *list, void *el) {
+  void **el_prev_ptr = nchan_slist_prev_ptr(list, el);
+  void **el_next_ptr = nchan_slist_next_ptr(list, el);
+  if(list->tail == NULL) {
+    list->tail = el;
+  }
+  if(list->head == NULL) {
+    *el_next_ptr = NULL;
+  }
+  else {
+    void **head_prev_ptr = nchan_slist_prev_ptr(list, list->head);
+    *el_next_ptr = list->head;
+    *head_prev_ptr = el;
+  }
+  list->head = el;
+  *el_prev_ptr = NULL;
+  list->n++;
+  return NGX_OK;
+}
+ngx_int_t nchan_slist_remove(nchan_slist_t *list, void *el) {
+  void **el_prev_ptr = nchan_slist_prev_ptr(list, el);
+  void **el_next_ptr = nchan_slist_next_ptr(list, el);
+  void *el_prev = *el_prev_ptr, *el_next = *el_next_ptr;
+  if(list->head == el) {
+    list->head = el_next;
+  }
+  if(list->tail == el) {
+    list->tail = el_prev;
+  }
+  if(el_prev) {
+    void **el_prev_next_ptr = nchan_slist_next_ptr(list, el_prev);
+    *el_prev_next_ptr = el_next;
+  }
+  if(el_next) {
+    void **el_next_prev_ptr = nchan_slist_prev_ptr(list, el_next);
+    *el_next_prev_ptr = el_prev;
+  }
+  list->n--;
+  *el_prev_ptr = NULL;
+  *el_next_ptr = NULL;
+  return NGX_OK;
+}
+
+ngx_int_t nchan_slist_transfer(nchan_slist_t *dst, nchan_slist_t *src) {
+  assert(dst->offset.prev == src->offset.prev); //same-ish slists
+  assert(dst->offset.next == src->offset.next); //same-ish slists
+  void **src_head_prev_ptr = nchan_slist_prev_ptr(src, src->head);
+  void **dst_tail_next_ptr = nchan_slist_next_ptr(dst, src->tail);
+  
+  if(src->n == 0) {
+    assert(src->head == NULL);
+    assert(src->tail == NULL);
+    return NGX_OK; //nothing to do
+  }
+  
+  *src_head_prev_ptr = dst->tail;
+  if(dst->tail) {
+    *dst_tail_next_ptr = src->head;
+  }
+  dst->tail = src->tail;
+  
+  if(dst->head == NULL) {
+    dst->head = src->head;
+  }
+  dst->tail = src->tail;
+  dst->n += src->n;
+  
+  src->n = 0;
+  src->head = NULL;
+  src->tail = NULL;
+  
+  return NGX_OK;
+}
+
+void *nchan_slist_shift(nchan_slist_t *list) {
+  void *head = list->head;
+  if(head) {
+    nchan_slist_remove(list, head);
+  }
+  return head;
+}
+
+void *nchan_slist_pop(nchan_slist_t *list) {
+  void *tail = list->tail;
+  if(tail) {
+    nchan_slist_remove(list, tail);
+  }
+  return tail;
+}
+
+int nchan_slist_is_empty(nchan_slist_t *list) {
+  if(list->n == 0) {
+    assert(list->head == NULL);
+    assert(list->tail == NULL);
+    return 1;
+  }
+  else {
+    assert(list->head != NULL);
+    assert(list->tail != NULL);
+    return 0;
+  }
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_slist.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_slist.h
new file mode 100644
index 0000000..df8dcb9
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_slist.h
@@ -0,0 +1,41 @@
+#ifndef NCHAN_SLIST_H
+#define NCHAN_SLIST_H
+
+#define NCHAN_SLIST_DEBUG 0
+
+#include <nginx.h>
+#include <ngx_http.h>
+
+typedef struct {
+  off_t           prev;
+  off_t           next;
+} nchan_slist_offsets_t;
+
+typedef struct {
+  void                 *head;
+  void                 *tail;
+  ngx_uint_t            n;
+  nchan_slist_offsets_t offset;
+} nchan_slist_t;
+
+
+
+#define nchan_slist_init(slist, data_type, prev_field, next_field) \
+  __nchan_slist_init(slist, offsetof(data_type, prev_field), offsetof(data_type, next_field))
+ngx_int_t __nchan_slist_init(nchan_slist_t *list, off_t offset_prev, off_t offset_next);
+void *nchan_slist_first(nchan_slist_t *list);
+void *nchan_slist_last(nchan_slist_t *list);
+void *nchan_slist_next(nchan_slist_t *list, void *el);
+void *nchan_slist_prev(nchan_slist_t *list, void *el);
+ngx_int_t nchan_slist_append(nchan_slist_t *list, void *el);
+ngx_int_t nchan_slist_prepend(nchan_slist_t *list, void *el);
+ngx_int_t nchan_slist_remove(nchan_slist_t *list, void *el);
+
+ngx_int_t nchan_slist_reset(nchan_slist_t *list);
+ngx_int_t nchan_slist_transfer(nchan_slist_t *dst, nchan_slist_t *src);
+void *nchan_slist_pop(nchan_slist_t *list);
+void *nchan_slist_shift(nchan_slist_t *list);
+
+int nchan_slist_is_empty(nchan_slist_t *list);
+
+#endif /*NCHAN_SLIST_H*/
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.c
new file mode 100644
index 0000000..1d5b857
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.c
@@ -0,0 +1,103 @@
+#include <nchan_module.h>
+#include <util/shmem.h>
+#include <store/memory/store.h>
+#include <store/memory/store-private.h>
+#include <store/memory/ipc.h>
+
+
+static shmem_t                        *shm = NULL;
+static nchan_stats_t                  *shstats = NULL;
+static int                             stats_enabled = 0;
+
+static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data);
+
+ngx_int_t nchan_stats_init_postconfig(ngx_conf_t *cf, int enable) {
+  ngx_str_t              name = ngx_string("nchan_worker_stats");
+  shm = shm_create(&name, cf, sizeof(*shstats)*2, initialize_shm, &ngx_nchan_module);
+  stats_enabled = enable;
+  return NGX_OK;
+}
+
+ngx_int_t nchan_stats_init_worker(ngx_cycle_t *cycle) {
+  nchan_stats_worker_t *wstats = &shstats->worker[ngx_process_slot];
+  
+  ngx_memzero(wstats, sizeof(*wstats));
+  
+  return NGX_OK;
+}
+
+void nchan_stats_exit_worker(ngx_cycle_t *cycle) {
+  shm_destroy(shm); //just for this worker...
+}
+
+void nchan_stats_exit_master(ngx_cycle_t *cycle) {
+  shm_destroy(shm);
+}
+
+static ngx_int_t initialize_shm(ngx_shm_zone_t *zone, void *data) {
+  if(data) { //zone being passed after restart
+    zone->data = data;
+    shstats = zone->data;
+  }
+  else {
+    shm_init(shm);
+    
+    if((shstats = shm_calloc(shm, sizeof(*shstats), "root shared data")) == NULL) {
+      return NGX_ERROR;
+    }
+    zone->data = shstats;
+  }
+  
+  return NGX_OK;
+}
+
+void __nchan_stats_global_incr(off_t offset, int count) {
+  if(!stats_enabled || !shstats) {
+    return;
+  }
+  ngx_atomic_fetch_add((ngx_atomic_uint_t *)((char *)&shstats->global + offset), count);
+}
+void __nchan_stats_worker_incr(off_t offset, int count) {
+  if(!stats_enabled || !shstats) {
+    return;
+  }
+  ngx_atomic_fetch_add((ngx_atomic_uint_t *)((char *)&shstats->worker[ngx_process_slot] + offset), count);
+}
+
+ngx_int_t nchan_stats_get_all(nchan_stats_worker_t *worker, nchan_stats_global_t *global) {
+  if(!stats_enabled) {
+    if(worker) {
+      ngx_memzero(worker, sizeof(*worker));
+    }
+    if(global) {
+      ngx_memzero(global, sizeof(*global));
+    }
+    return NGX_OK;
+  }
+  
+  ipc_t *ipc = nchan_memstore_get_ipc();
+  if(!ipc) {
+    return NGX_ERROR;
+  }
+  
+  if(worker) {
+    ngx_memzero(worker, sizeof(*worker));
+    ngx_atomic_uint_t *worker_sum_stats_array = (ngx_atomic_uint_t *)worker;
+    
+    const ngx_int_t *slots;
+    size_t worker_count = ipc_worker_slots(ipc, &slots);
+    unsigned i;
+    for(i=0; i<worker_count; i++) {
+      ngx_atomic_uint_t *worker_stats_array = (ngx_atomic_uint_t *)&shstats->worker[slots[i]];
+      unsigned j;
+      for(j=0; j<sizeof(nchan_stats_worker_t)/sizeof(ngx_atomic_uint_t); j++) {
+        worker_sum_stats_array[j]+=worker_stats_array[j];
+      }
+    }
+  }
+  
+  if(global) {
+    *global = shstats->global;
+  }
+  return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.h
new file mode 100644
index 0000000..986530d
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_stats.h
@@ -0,0 +1,48 @@
+#ifndef NCHAN_STATS_H
+#define NCHAN_STATS_H
+#include <nchan_module.h>
+
+#define nchan_stats_global_incr(counter_name, count) \
+  __nchan_stats_global_incr(offsetof(nchan_stats_global_t, counter_name), count)
+  
+#define nchan_stats_worker_incr(counter_name, count) \
+  __nchan_stats_worker_incr(offsetof(nchan_stats_worker_t, counter_name), count)
+
+void __nchan_stats_global_incr(off_t offset, int count);
+void __nchan_stats_worker_incr(off_t offset, int count);
+  
+typedef struct {
+  //These must all be ngx_atomic_uint_t
+  ngx_atomic_uint_t       channels;
+  ngx_atomic_uint_t       subscribers;
+  ngx_atomic_uint_t       messages;
+  ngx_atomic_uint_t       redis_pending_commands;
+  ngx_atomic_uint_t       redis_connected_servers;
+  ngx_atomic_uint_t       redis_unhealthy_upstreams;
+  ngx_atomic_uint_t       ipc_queue_size;
+} nchan_stats_worker_t;
+
+typedef struct {
+  ngx_atomic_uint_t      total_published_messages;
+  ngx_atomic_uint_t      total_ipc_alerts_sent;
+  ngx_atomic_uint_t      total_ipc_alerts_received;
+  ngx_atomic_uint_t      total_ipc_send_delay;
+  ngx_atomic_uint_t      total_ipc_receive_delay;
+  ngx_atomic_uint_t      total_redis_commands_sent;
+} nchan_stats_global_t;
+
+typedef struct {
+  nchan_stats_worker_t worker[NGX_MAX_PROCESSES];
+  nchan_stats_global_t global;
+} nchan_stats_t;
+
+ngx_int_t nchan_stats_init_postconfig(ngx_conf_t *cf, int enable);
+ngx_int_t nchan_stats_init_worker(ngx_cycle_t *cycle);
+void nchan_stats_exit_worker(ngx_cycle_t *cycle);
+void nchan_stats_exit_master(ngx_cycle_t *cycle);
+
+ngx_int_t nchan_stats_get_all(nchan_stats_worker_t *worker, nchan_stats_global_t *global);
+
+
+#endif //NCHAN_STATS_H
+
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_subrequest.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_subrequest.c
new file mode 100644
index 0000000..8042f04
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_subrequest.c
@@ -0,0 +1,325 @@
+// Taken from agenzh's echo nginx module
+// https://github.com/openresty/echo-nginx-module
+// Thanks, agenzh!
+
+/*
+Copyright (C) 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#include <nchan_module.h>
+#include <util/nchan_subrequest.h>
+
+ngx_str_t  nchan_content_length_header_key = ngx_string("Content-Length");
+
+static ngx_inline ngx_uint_t nchan_hash_str(u_char *src, size_t n) {
+  ngx_uint_t  key;
+  key = 0;
+  while (n--) {
+    key = ngx_hash(key, *src);
+    src++;
+  }
+  return key;
+}
+#define nchan_hash_literal(s)                                        \
+  nchan_hash_str((u_char *) s, sizeof(s) - 1)
+
+ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t len) {
+  ngx_table_elt_t                 *h, *header;
+  ngx_list_part_t                 *part;
+  ngx_http_request_t              *pr;
+  ngx_uint_t                       i;
+  u_char                          *p;
+  static ngx_uint_t                nchan_content_length_hash = 0;
+  if(nchan_content_length_hash == 0) {
+    nchan_content_length_hash = nchan_hash_literal("content-length");
+  }
+  
+  r->headers_in.content_length_n = len;
+  
+  if (ngx_list_init(&r->headers_in.headers, r->pool, 20, sizeof(ngx_table_elt_t)) != NGX_OK) {
+    return NGX_ERROR;
+  }
+
+  h = ngx_list_push(&r->headers_in.headers);
+  if (h == NULL) {
+    return NGX_ERROR;
+  }
+
+  h->key = nchan_content_length_header_key;
+  h->lowcase_key= (u_char *)"content-length";
+
+  r->headers_in.content_length = h;
+  p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+  if (p == NULL) {
+    return NGX_ERROR;
+  }
+
+  h->value.data = p;
+  h->value.len = ngx_sprintf(h->value.data, "%O", len) - h->value.data;
+
+  h->hash = nchan_content_length_hash;
+
+  pr = r->parent;
+
+  if (pr == NULL) {
+    return NGX_OK;
+  }
+
+  /* forward the parent request's all other request headers */
+
+  part = &pr->headers_in.headers.part;
+  header = part->elts;
+
+  for (i = 0; /* void */; i++) {
+    
+    if (i >= part->nelts) {
+      if (part->next == NULL) {
+        break;
+      }
+      part = part->next;
+      header = part->elts;
+      i = 0;
+    }
+    if (header[i].key.len == sizeof("Content-Length") - 1 
+        && ngx_strncasecmp(header[i].key.data, (u_char *) "Content-Length", sizeof("Content-Length") - 1) == 0) {
+      continue;
+    }
+    h = ngx_list_push(&r->headers_in.headers);
+    if (h == NULL) {
+      return NGX_ERROR;
+    }
+    *h = header[i];
+  }
+
+  /* XXX maybe we should set those built-in header slot in
+    * ngx_http_headers_in_t too? */
+
+  return NGX_OK;
+}
+
+ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n) {
+  //ngx_http_core_main_conf_t  *cmcf;
+  ngx_http_request_t         *r;
+  ngx_http_request_body_t    *body;
+  ngx_int_t                   rc;
+
+  sr->method = method;
+  sr->method_name = *method_name;
+
+  if (sr->method == NGX_HTTP_HEAD) {
+    sr->header_only = 1;
+  }
+  r = sr->parent;
+
+  sr->header_in = r->header_in;
+
+  /* XXX work-around a bug in ngx_http_subrequest */
+  if (r->headers_in.headers.last == &r->headers_in.headers.part) {
+    sr->headers_in.headers.last = &sr->headers_in.headers.part;
+  }
+
+  
+  /* we do not inherit the parent request's variables */
+  //scratch that, let's inherit those vars
+  //cmcf = ngx_http_get_module_main_conf(sr, ngx_http_core_module);
+  //sr->variables = ngx_pcalloc(sr->pool, cmcf->variables.nelts * sizeof(ngx_http_variable_value_t));
+
+  if (sr->variables == NULL) {
+    return NGX_ERROR;
+  }
+
+  if ((body = request_body)!=NULL) {
+    sr->request_body = body;
+
+    rc = nchan_set_content_length_header(sr, content_length_n);
+    
+    if (rc != NGX_OK) {
+      return NGX_ERROR;
+    }
+  }
+
+  //dd("subrequest body: %p", sr->request_body);
+
+  return NGX_OK;
+}
+#if (NGX_HTTP_V2) || (NGX_HTTP_SPDY)
+static void nchan_recover_upstream_hacky_request_method(ngx_http_request_t *r) {
+  ngx_uint_t           i;
+  ngx_buf_t            request_buf;
+  u_char              *str;
+  ngx_int_t            len;
+  
+  static const struct {
+    int8_t            len;
+    const u_char      method[11];
+    uint32_t          code;
+  } tests[] = {
+    { 3, "GET ",       NGX_HTTP_GET },
+    { 4, "POST ",      NGX_HTTP_POST },
+    { 4, "HEAD ",      NGX_HTTP_HEAD },
+    { 7, "OPTIONS ",   NGX_HTTP_OPTIONS },
+    { 8, "PROPFIND ",  NGX_HTTP_PROPFIND },
+    { 3, "PUT ",       NGX_HTTP_PUT },
+    { 5, "MKCOL ",     NGX_HTTP_MKCOL },
+    { 6, "DELETE ",    NGX_HTTP_DELETE },
+    { 4, "COPY ",      NGX_HTTP_COPY },
+    { 4, "MOVE ",      NGX_HTTP_MOVE },
+    { 9, "PROPPATCH ", NGX_HTTP_PROPPATCH },
+    { 4, "LOCK ",      NGX_HTTP_LOCK },
+    { 6, "UNLOCK ",    NGX_HTTP_UNLOCK },
+    { 5, "PATCH ",     NGX_HTTP_PATCH },
+    { 5, "TRACE ",     NGX_HTTP_TRACE }
+  };
+  
+  request_buf = *r->upstream->request_bufs->buf;
+  str= request_buf.start;
+  len = request_buf.end - request_buf.start;
+  
+  for(i=0; i < sizeof(tests) / sizeof(tests[0]); i++) {
+    if(len >= tests[i].len + 1 && ngx_strncmp(str, tests[i].method, tests[i].len + 1) == 0) {
+      r->method = tests[i].code;
+      r->method_name.len = tests[i].len;
+      r->method_name.data = (u_char *)tests[i].method;
+      break;
+    }
+  }
+}
+#endif
+
+
+static void nchan_recover_http_request_method(ngx_http_request_t *r) {
+  ngx_http_request_t       rdummy;
+  ngx_buf_t                header_in_buf = *r->header_in;
+  ngx_int_t                rc;
+  
+  header_in_buf.pos = header_in_buf.start;
+  ngx_memzero(&rdummy, sizeof(rdummy));
+  rdummy.request_line = r->request_line;
+  
+  rc = ngx_http_parse_request_line(&rdummy, &header_in_buf);
+
+  if (rc == NGX_OK) {
+    r->method_name.len = rdummy.method_end - rdummy.request_start + 1;
+    r->method_name.data = rdummy.request_line.data;
+    r->method = rdummy.method;
+  }
+}
+
+ngx_int_t nchan_recover_x_accel_redirected_request_method(ngx_http_request_t *r) {
+#if (NGX_HTTP_V2)
+  if(r->stream) {
+    nchan_recover_upstream_hacky_request_method(r);
+  }
+  else {
+    nchan_recover_http_request_method(r);
+  }
+#elif (NGX_HTTP_SPDY)
+  if(r->spdy_stream) {
+    nchan_recover_upstream_hacky_request_method(r);
+  }
+  else {
+    nchan_recover_http_request_method(r);
+  }
+#else
+  nchan_recover_http_request_method(r);
+#endif
+  return NGX_OK;
+}
+
+size_t nchan_subrequest_content_length(ngx_http_request_t *sr) {
+  size_t                            len = 0;
+  ngx_http_upstream_headers_in_t   *headers_in = &sr->upstream->headers_in;
+  ngx_chain_t                      *chain;
+  ngx_chain_t                      *body_chain;
+#if nginx_version >= 1013010
+  body_chain = sr->out;
+#else
+  body_chain = sr->upstream->out_bufs;
+#endif
+  
+  
+  if(headers_in->chunked || headers_in->content_length_n == -1) {
+    //count it
+    for(chain = body_chain; chain != NULL; chain = chain->next) {
+      len += ngx_buf_size((chain->buf));
+    }
+  }
+  else {
+    len = headers_in->content_length_n > 0 ? headers_in->content_length_n : 0;
+  }
+  
+  return len;
+}
+
+
+ngx_http_request_t *nchan_create_subrequest(ngx_http_request_t *r, ngx_str_t *url, ngx_buf_t *body, ngx_http_post_subrequest_pt cb, void *pd) {
+  ngx_http_post_subrequest_t    *psr = ngx_pcalloc(r->pool, sizeof(*psr));
+  ngx_http_request_t            *sr;
+  
+  psr->handler = cb;
+  psr->data = pd;
+  
+  ngx_http_subrequest(r, url, NULL, &sr, psr, NGX_HTTP_SUBREQUEST_IN_MEMORY);
+  
+  if((sr->request_body = ngx_pcalloc(r->pool, sizeof(*sr->request_body))) == NULL) { //dummy request body 
+    return NULL;
+  }
+  
+  if(body && ngx_buf_size(body) > 0) {
+    static ngx_str_t                   POST_REQUEST_STRING = {4, (u_char *)"POST "};
+    size_t                             sz;
+    ngx_http_request_body_t           *sr_body = sr->request_body;
+    ngx_chain_t                       *fakebody_chain;
+    ngx_buf_t                         *fakebody_buf;
+    
+    fakebody_chain = ngx_palloc(r->pool, sizeof(*fakebody_chain));
+    fakebody_buf = ngx_pcalloc(r->pool, sizeof(*fakebody_buf));
+    sr_body->bufs = fakebody_chain;
+    fakebody_chain->next = NULL;
+    fakebody_chain->buf = fakebody_buf;
+    fakebody_buf->last_buf = 1;
+    fakebody_buf->last_in_chain = 1;
+    fakebody_buf->flush = 1;
+    fakebody_buf->memory = 1;
+    
+    //just copy the buffer contents. it's inefficient but I don't care at the moment.
+    //this can and should be optimized later
+    sz = ngx_buf_size(body);
+    fakebody_buf->start = ngx_palloc(r->pool, sz); //huuh?
+    ngx_memcpy(fakebody_buf->start, body->start, sz);
+    fakebody_buf->end = fakebody_buf->start + sz;
+    fakebody_buf->pos = fakebody_buf->start;
+    fakebody_buf->last = fakebody_buf->end;
+    
+    nchan_adjust_subrequest(sr, NGX_HTTP_POST, &POST_REQUEST_STRING, sr_body, sz);
+  }
+  else {
+    sr->header_only = 1;
+  }
+  sr->args = r->args;
+  
+  return sr;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_subrequest.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_subrequest.h
new file mode 100644
index 0000000..b96b78d
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_subrequest.h
@@ -0,0 +1,6 @@
+ngx_int_t nchan_set_content_length_header(ngx_http_request_t *r, off_t len);
+ngx_int_t nchan_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method, ngx_str_t *method_name, ngx_http_request_body_t *request_body, size_t content_length_n);
+size_t nchan_subrequest_content_length(ngx_http_request_t *sr);
+ngx_int_t nchan_recover_x_accel_redirected_request_method(ngx_http_request_t *r);
+
+ngx_http_request_t *nchan_create_subrequest(ngx_http_request_t *r, ngx_str_t *url, ngx_buf_t *body, ngx_http_post_subrequest_pt cb, void *pd);
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_thingcache.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_thingcache.c
new file mode 100644
index 0000000..8c14008
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_thingcache.c
@@ -0,0 +1,209 @@
+#include <nchan_module.h>
+#include <util/nchan_thingcache.h>
+#include <uthash.h>
+#define THING_HASH_FIND(tc, id_str, p)    HASH_FIND( hh, tc->things, (id_str)->data, (id_str)->len, p)
+#define THING_HASH_ADD(tc, thing)      HASH_ADD_KEYPTR( hh, tc->things, (thing->id).data, (thing->id).len, thing)
+#define THING_HASH_DEL(tc, thing)      HASH_DEL(tc->things, thing)
+
+#undef uthash_malloc
+#undef uthash_free
+#define uthash_malloc(sz) ngx_alloc(sz, ngx_cycle->log)
+#define uthash_free(ptr,sz) ngx_free(ptr)
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "THINGCACHE: " fmt, ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "THINGCACHE: " fmt, ##args)
+
+typedef struct {
+  ngx_str_t            id;
+  nchan_llist_timed_t  ll;
+  UT_hash_handle       hh;
+} thing_t;
+
+typedef struct {
+  void *               (*create)(ngx_str_t *id);
+  ngx_int_t            (*destroy)(ngx_str_t *id, void *);
+  char                  *name;
+  ngx_uint_t             ttl;
+  thing_t               *things;
+  nchan_llist_timed_t   *thing_head;
+  nchan_llist_timed_t   *thing_tail;
+  ngx_event_t            gc_timer;
+} nchan_thing_cache_t;
+
+/*
+static ngx_int_t walk_tc(nchan_thing_cache_t *tc) {
+  nchan_llist_timed_t    *cur;
+  int                     head_to_tail = 0, tail_to_head = 0;
+  for(cur = tc->thing_head; cur != NULL; cur = cur->next) {
+    head_to_tail++;
+  }
+  for(cur = tc->thing_tail; cur != NULL; cur = cur->prev) {
+    tail_to_head++;
+  }
+  
+  assert(head_to_tail == tail_to_head);
+  return tail_to_head;
+}
+
+static void verify_tc(nchan_thing_cache_t *tc) {
+  thing_t                *thing, *ttmp;
+  int                    hash = 0;
+  HASH_ITER(hh, (tc->things), thing, ttmp) {  
+    hash++;
+  }
+  assert(walk_tc(tc) == hash);
+}
+*/
+
+static void enqueue_llist_thing(nchan_thing_cache_t *tc, nchan_llist_timed_t *cur) {
+  //verify_tc(tc);
+  if(tc->thing_head == NULL) {
+    cur->prev = NULL;
+    tc->thing_head = cur;
+  }
+  if(tc->thing_tail) {
+    tc->thing_tail->next = cur;
+  }
+  cur->prev = tc->thing_tail;
+  cur->next = NULL;
+  cur->time = ngx_time() + tc->ttl;
+  tc->thing_tail = cur;
+  
+  //start the clock
+  if(! tc->gc_timer.timer_set) {
+    ngx_add_timer(&tc->gc_timer, tc->ttl * 1000);
+  }
+  //walk_tc(tc);
+}
+
+static void nchan_thingcache_gc_timer_handler(ngx_event_t *ev) {
+  nchan_llist_timed_t    *cur, *next;
+  nchan_thing_cache_t    *tc = (nchan_thing_cache_t *)ev->data;
+  time_t                  time = ngx_time();
+  thing_t                *thing;
+  cur = tc->thing_head;
+  while(cur != NULL) {
+    //verify_tc(tc);
+    next = cur->next;
+    if(cur->time <= time) {
+      if(cur->prev) {
+        cur->prev->next = next;
+      }
+      if(next) {
+        next->prev = cur->prev;
+      }
+      thing = container_of(cur, thing_t, ll);
+      if(!tc->destroy(&thing->id, thing->ll.data)) {
+        //time extended!
+        enqueue_llist_thing(tc, cur);
+      }
+      else {
+        if(tc->thing_head == cur) {
+          tc->thing_head = cur->next;
+        }
+        if(tc->thing_tail == cur) {
+          tc->thing_tail = cur->prev;
+        }
+        THING_HASH_DEL(tc, thing);
+        //verify_tc(tc);
+        ngx_free(thing);
+      }
+    }
+    else {
+      break;
+    }
+    cur = next;
+  }
+  
+  if(tc->thing_head != NULL) {
+    ngx_add_timer(&tc->gc_timer, tc->ttl * 1000);
+  }
+  //verify_tc(tc);
+}
+
+void *nchan_thingcache_init(char *name, void *(*create)(ngx_str_t *), ngx_int_t(*destroy)(ngx_str_t *, void *), ngx_uint_t ttl) {
+  nchan_thing_cache_t *tc;
+  if((tc = ngx_alloc(sizeof(*tc), ngx_cycle->log)) == NULL) {
+    return NULL;
+  }
+  DBG("init %s %p", name, tc);
+  
+  tc->name = name;
+  tc->create = create;
+  tc->destroy = destroy;
+  tc->ttl = ttl;
+  tc->thing_head = NULL;
+  tc->thing_tail = NULL;
+  tc->things = NULL;
+  ngx_memzero(&tc->gc_timer, sizeof(tc->gc_timer));
+  nchan_init_timer(&tc->gc_timer, nchan_thingcache_gc_timer_handler, tc);
+  return (void *)tc;
+}
+
+ngx_int_t nchan_thingcache_shutdown(void *tcv) {
+  nchan_thing_cache_t   *tc = (nchan_thing_cache_t *)tcv;
+  nchan_llist_timed_t   *cur = tc->thing_head;
+  thing_t               *thing;
+  nchan_llist_timed_t   *next; 
+  DBG("shutdown %s %p", tc->name, tc);
+  
+  while(cur != NULL) {
+    thing = container_of(cur, thing_t, ll);
+    next = cur->next;
+    tc->destroy(&thing->id, cur->data);
+    THING_HASH_DEL(tc, thing);
+    ngx_free(thing);
+    cur = next;
+  }
+  
+  if(tc->gc_timer.timer_set) {
+    ngx_del_timer(&tc->gc_timer);
+  }
+  
+  ngx_free(tc);
+  return NGX_OK;
+}
+
+void *nchan_thingcache_find(void *tcv, ngx_str_t *id) {
+  nchan_thing_cache_t   *tc = (nchan_thing_cache_t *)tcv;
+  thing_t               *thing;
+  
+  //verify_tc(tc);
+  THING_HASH_FIND(tc, id, thing);
+  return thing ? thing->ll.data : NULL;
+}
+
+void *nchan_thingcache_get(void *tcv, ngx_str_t *id) {
+  nchan_thing_cache_t   *tc = (nchan_thing_cache_t *)tcv;
+  nchan_llist_timed_t   *cur;
+  thing_t               *thing;
+  
+  //verify_tc(tc);
+  
+  THING_HASH_FIND(tc, id, thing);
+  if(thing == NULL) {
+    DBG("not found in %s %p", tc->name, tc);
+    
+    if((thing = ngx_alloc(sizeof(*thing) + id->len, ngx_cycle->log)) == NULL) {
+      ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "nchan thingcache %p: can't allocate memory for thing with id %V", tc, id);
+      return NULL;
+    }
+    cur = &thing->ll;
+    cur->data = thing;
+    thing->id.len = id->len;
+    thing->id.data = (u_char *)(&thing[1]);
+    ngx_memcpy(thing->id.data, id->data, id->len);
+    
+    thing->ll.data = tc->create(id);
+    
+    enqueue_llist_thing(tc, cur);
+    THING_HASH_ADD(tc, thing);
+  }
+  
+  //verify_tc(tc);
+  
+  return thing->ll.data;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_thingcache.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_thingcache.h
new file mode 100644
index 0000000..2b0b8bd
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_thingcache.h
@@ -0,0 +1,4 @@
+void *nchan_thingcache_init(char *name, void *(*create)(ngx_str_t *), ngx_int_t(*destroy)(ngx_str_t *, void *), ngx_uint_t ttl);
+ngx_int_t nchan_thingcache_shutdown(void *tcv);
+void *nchan_thingcache_get(void *tcv, ngx_str_t *id);
+void *nchan_thingcache_find(void *tcv, ngx_str_t *id);
\ No newline at end of file
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.c
new file mode 100644
index 0000000..0b44060
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.c
@@ -0,0 +1,137 @@
+#include <nchan_module.h>
+#include <stddef.h>
+#include "nchan_timequeue.h"
+#include <assert.h>
+
+static void timequeue_page_reset(nchan_timequeue_page_t *page) {
+  page->next = NULL;
+  page->start = 0;
+  page->end =  0;
+}
+
+static nchan_timequeue_page_t *timequeue_page_alloc(nchan_timequeue_t *pq) {
+  nchan_timequeue_page_t *page = ngx_alloc(sizeof(*page) + sizeof(nchan_timequeue_time_t) * pq->items_per_page - 1, ngx_cycle->log);
+  if(!page) {
+    return NULL;
+  }
+  timequeue_page_reset(page);
+  return page;
+}
+
+static nchan_timequeue_page_t *timequeue_page_enqueue(nchan_timequeue_t *pq) {
+  nchan_timequeue_page_t *nextpage;
+  if(pq->standby) {
+    nextpage = pq->standby;
+    pq->standby = nextpage->next;
+  }
+  else {
+    nextpage = timequeue_page_alloc(pq);
+    if(!nextpage) {
+      return NULL;
+    }
+  }
+  if(pq->last) {
+    pq->last->next = nextpage;
+    nextpage->next = NULL;
+  }
+  if(!pq->first) {
+    pq->first = nextpage;
+  }
+  pq->last = nextpage;
+  
+  return nextpage;
+}
+
+int nchan_timequeue_init(nchan_timequeue_t *pq, size_t items_per_page, int anytag) {
+  pq->items_per_page = items_per_page;
+  
+  pq->first = timequeue_page_alloc(pq);
+  if(pq->first == NULL) {
+    return 0;
+  }
+  pq->last = pq->first;
+  pq->standby = NULL;
+  pq->anytag = anytag;
+  
+  return 1;
+}
+
+static nchan_timequeue_page_t *timequeue_get_nonfull_page(nchan_timequeue_t *pq) {
+  nchan_timequeue_page_t *page = pq->last;
+  if(page->end >= pq->items_per_page) {
+    return timequeue_page_enqueue(pq);
+  }
+  else {
+    return page;
+  }
+}
+
+int nchan_timequeue_queue(nchan_timequeue_t *pq, int tag) {
+  nchan_timequeue_page_t *page = timequeue_get_nonfull_page(pq);
+  if(!page) {
+    nchan_log_error("timequque %p ENQUEUE tag %d: ERROR: can't get page", pq, tag);
+    return 0;
+  }
+  nchan_timequeue_time_t    *data = &page->data[page->end];
+  data->tag = tag;
+  data->time_start = ngx_current_msec;
+  page->end++;
+  return 1;
+}
+
+int nchan_timequeue_dequeue(nchan_timequeue_t *pq, int expected_tag, nchan_timequeue_time_t *dequeued) {
+  nchan_timequeue_page_t *page = pq->first;
+  if(!page ||
+    (page->start == page->end && page->start == 0)) {
+    if(dequeued) {
+      dequeued->time_start = 0;
+      dequeued->tag = pq->anytag;
+    }
+    return 0;
+  }
+  nchan_timequeue_time_t    *data = &page->data[page->start];
+  
+  if(dequeued) {
+    *dequeued = *data;
+  }
+  
+  if(expected_tag != data->tag && expected_tag != pq->anytag) {
+    return 0;
+  }
+  
+  page->start++;
+  
+  if(page->start >= page->end) {
+    if(pq->last == page) {
+      assert(page->next == NULL);
+      assert(pq->first == page);
+      timequeue_page_reset(page);
+    }
+    else {
+      assert(page->next != NULL);
+      assert(pq->last != page);
+      pq->first = page->next;
+      timequeue_page_reset(page);
+      //add to standby list
+      page->next = pq->standby;
+      pq->standby = page;
+    }
+  }
+  
+  return 1;
+}
+
+void nchan_timequeue_destroy(nchan_timequeue_t *pq) {
+  nchan_timequeue_page_t *cur, *next;
+  for(cur = pq->first; cur != NULL; cur = next) {
+    next = cur->next;
+    ngx_free(cur);
+  }
+  for(cur = pq->standby; cur != NULL; cur = next) {
+    next = cur->next;
+    ngx_free(cur);
+  }
+  pq->first = NULL;
+  pq->last = NULL;
+  pq->standby = NULL;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.h
new file mode 100644
index 0000000..ce3cca1
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_timequeue.h
@@ -0,0 +1,37 @@
+#ifndef NCHAN_TIMEQUEUE_H
+#define NCHAN_TIMEQUEUE_H
+
+#include <stddef.h>
+#include <nginx.h>
+
+typedef struct {
+  ngx_msec_t  time_start;
+  int         tag;
+} nchan_timequeue_time_t;
+
+struct nchan_timequeue_page_s {
+  struct nchan_timequeue_page_s *next;
+  uint16_t                       start;
+  uint16_t                       end;
+  nchan_timequeue_time_t         data[1];
+};
+
+typedef struct nchan_timequeue_page_s nchan_timequeue_page_t;
+
+typedef struct {
+  size_t                  items_per_page;
+  int                     anytag;
+  nchan_timequeue_page_t *first;
+  nchan_timequeue_page_t *last;
+  nchan_timequeue_page_t *standby;
+  
+} nchan_timequeue_t;
+
+
+
+int nchan_timequeue_init(nchan_timequeue_t *pq, size_t items_per_page, int anytag);
+int nchan_timequeue_queue(nchan_timequeue_t *pq, int tag);
+int nchan_timequeue_dequeue(nchan_timequeue_t *pq, int expected_tag, nchan_timequeue_time_t *dequeued);
+void nchan_timequeue_destroy(nchan_timequeue_t *pq);
+
+#endif //NCHAN_TIMEQUEUE_H
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.c
new file mode 100644
index 0000000..963d085
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.c
@@ -0,0 +1,1334 @@
+#include <nchan_module.h>
+#include <assert.h>
+
+#if (NGX_ZLIB)
+#include <zlib.h>
+#endif
+
+#ifndef NCHAN_HAVE_MEMRCHR
+void *memrchr(const void *s, int c, size_t n) {
+  const char *start = s;
+  const char *end = &start[n]; //one too much on purpose
+  while(--end >= start) { //and this is why
+    if(c == *end) {
+      return (void *)end;
+    }
+  }
+  return NULL;
+}
+#endif
+
+int nchan_ngx_str_match(ngx_str_t *str1, ngx_str_t *str2) {
+  if(str1 == str2) {
+    return 1;
+  }
+  if(str1->len != str2->len) {
+    return 0;
+  }
+  if(str1->len == 0) {
+    return 1;
+  }
+  return memcmp(str1->data, str2->data, str1->len) == 0;
+}
+
+
+int nchan_ngx_str_nonzero_match(ngx_str_t *str1, ngx_str_t *str2) {
+  if(str1->len == 0) {
+    return 0;
+  }
+  else {
+    return nchan_ngx_str_match(str1, str2);
+  }
+}
+
+int nchan_strscanstr(u_char **cur, ngx_str_t *find, u_char *last) {
+  //inspired by ngx_strnstr
+  char   *s2 = (char *)find->data;
+  u_char *s1 = *cur;
+  size_t  len = last - s1;
+  u_char  c1, c2;
+  size_t  n;
+  c2 = *(u_char *) s2++;
+  n = find->len - 1;
+  do {
+    do {
+      if (len-- == 0) {
+        return 0;
+      }
+      c1 = *s1++;
+      if (c1 == 0) {
+        return 0;
+      }
+    } while (c1 != c2);
+    if (n > len) {
+      return 0;
+    }
+  } while (ngx_strncmp(s1, (u_char *) s2, n) != 0);
+  *cur = s1 + n;
+  return 1;
+}
+
+ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen) {
+  size_t                        len;
+  ngx_http_script_code_pt       code;
+  ngx_http_script_len_code_pt   lcode;
+  ngx_http_script_engine_t      e;
+
+  if (val->lengths == NULL) {
+    *value = val->value;
+    return NGX_OK;
+  }
+
+  ngx_http_script_flush_complex_value(r, val);
+
+  ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
+
+  e.ip = val->lengths;
+  e.request = r;
+  e.flushed = 1;
+
+  len = 0;
+
+  while (*(uintptr_t *) e.ip) {
+    lcode = *(ngx_http_script_len_code_pt *) e.ip;
+    len += lcode(&e);
+  }
+  
+  if(len > maxlen) {
+    return NGX_ERROR;
+  }
+  
+  value->len = len;
+
+  e.ip = val->values;
+  e.pos = value->data;
+  e.buf = *value;
+
+  while (*(uintptr_t *) e.ip) {
+    code = *(ngx_http_script_code_pt *) e.ip;
+    code((ngx_http_script_engine_t *) &e);
+  }
+
+  *value = e.buf;
+
+  return NGX_OK;
+}
+
+ngx_int_t ngx_http_complex_value_alloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen) {
+  size_t                        len;
+  ngx_http_script_code_pt       code;
+  ngx_http_script_len_code_pt   lcode;
+  ngx_http_script_engine_t      e;
+
+  if (val->lengths == NULL) {
+    *value = val->value;
+    return NGX_OK;
+  }
+
+  ngx_http_script_flush_complex_value(r, val);
+
+  ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
+
+  e.ip = val->lengths;
+  e.request = r;
+  e.flushed = 1;
+
+  len = 0;
+
+  while (*(uintptr_t *) e.ip) {
+    lcode = *(ngx_http_script_len_code_pt *) e.ip;
+    len += lcode(&e);
+  }
+  
+  if(len > maxlen) {
+    return NGX_ERROR;
+  }
+  
+  if((value->data = ngx_alloc(len, r->connection->log)) == NULL) {
+    return NGX_ERROR;
+  }
+  
+  value->len = len;
+
+  e.ip = val->values;
+  e.pos = value->data;
+  e.buf = *value;
+
+  while (*(uintptr_t *) e.ip) {
+    code = *(ngx_http_script_code_pt *) e.ip;
+    code((ngx_http_script_engine_t *) &e);
+  }
+
+  *value = e.buf;
+
+  return NGX_OK;
+}
+
+ngx_int_t ngx_http_complex_value_free(ngx_str_t *value) {
+  ngx_free(value->data);
+  value->data = NULL;
+  value->len = 0;
+  return NGX_OK;
+}
+
+ngx_int_t ngx_http_complex_value_custom_pool(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, ngx_pool_t *pool) {
+  size_t                        len;
+  ngx_http_script_code_pt       code;
+  ngx_http_script_len_code_pt   lcode;
+  ngx_http_script_engine_t      e;
+
+  if (val->lengths == NULL) {
+    *value = val->value;
+    return NGX_OK;
+  }
+
+  ngx_http_script_flush_complex_value(r, val);
+
+  ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
+
+  e.ip = val->lengths;
+  e.request = r;
+  e.flushed = 1;
+
+  len = 0;
+
+  while (*(uintptr_t *) e.ip) {
+    lcode = *(ngx_http_script_len_code_pt *) e.ip;
+    len += lcode(&e);
+  }
+  
+  value->data = ngx_palloc(pool, len);
+  if(value->data == NULL) {
+    nchan_log_error("couldn't palloc for ngx_http_complex_value_custom_pool");
+    return NGX_ERROR;
+  }
+  value->len = len;
+
+  e.ip = val->values;
+  e.pos = value->data;
+  e.buf = *value;
+
+  while (*(uintptr_t *) e.ip) {
+    code = *(ngx_http_script_code_pt *) e.ip;
+    code((ngx_http_script_engine_t *) &e);
+  }
+
+  *value = e.buf;
+
+  return NGX_OK;
+}
+
+u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char) {
+  u_char   *delim = sub->data;
+  size_t    delim_sz = sub->len;
+  u_char   *last = last_char - delim_sz;
+  u_char   *cur;
+  
+  for(cur = *s1; cur < last; cur++) {
+    if(ngx_strncmp(cur, delim, delim_sz) == 0) {
+      *s1 = cur + delim_sz;
+      return cur;
+    }
+  }
+  *s1 = last_char;
+  if(cur == last) {
+    return last_char;
+  }
+  else if(cur > last) {
+    return NULL;
+  }
+  assert(0);
+  return NULL;
+}
+
+ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name) {
+  ngx_uint_t                       i;
+  ngx_list_part_t                 *part = &r->headers_in.headers.part;
+  ngx_table_elt_t                 *header= part->elts;
+  
+  for (i = 0; /* void */ ; i++) {
+    if (i >= part->nelts) {
+      if (part->next == NULL) {
+        break;
+      }
+      part = part->next;
+      header = part->elts;
+      i = 0;
+    }
+    if (header[i].key.len == header_name.len
+      && ngx_strncasecmp(header[i].key.data, header_name.data, header[i].key.len) == 0) {
+      return &header[i].value;
+      }
+  }
+  return NULL;
+}
+
+ngx_str_t *nchan_get_header_value_origin(ngx_http_request_t *r, nchan_request_ctx_t *ctx) {
+  ngx_str_t         *origin_header;
+  static ngx_str_t   empty_str = ngx_string("");
+  if(!ctx) {
+    ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  }
+  
+  if(!ctx->request_origin_header) {
+    if((origin_header = nchan_get_header_value(r, NCHAN_HEADER_ORIGIN)) != NULL) {
+      ctx->request_origin_header = origin_header;
+    }
+    else {
+      ctx->request_origin_header = &empty_str;
+    }
+  }
+  
+  return ctx->request_origin_header == &empty_str ? NULL : ctx->request_origin_header;
+}
+
+ngx_str_t *nchan_get_accept_header_value(ngx_http_request_t *r) {
+#if (NGX_HTTP_HEADERS)  
+  if(r->headers_in.accept == NULL) {
+    return NULL;
+  }
+  else {
+    return &r->headers_in.accept->value;
+  }
+#else
+  ngx_str_t             accept_header_name = ngx_string("Accept");
+  return nchan_get_header_value(r, accept_header_name);
+#endif
+}
+
+static int nchan_strmatch_va_list(ngx_str_t *val, ngx_int_t n, va_list args) {
+  u_char   *match;
+  ngx_int_t i;
+  for(i=0; i<n; i++) {
+    match = va_arg(args, u_char *);
+    if(val->len == 0 && strlen((char *)match) > 0) {
+      return 0;
+    }
+    if(ngx_strncasecmp(val->data, match, val->len)==0) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+int nchan_strmatch(ngx_str_t *val, ngx_int_t n, ...) {
+  int      rc;
+  va_list  args;
+  va_start(args, n);  
+  rc = nchan_strmatch_va_list(val, n, args);
+  va_end(args);
+  return rc;
+}
+
+int nchan_cstrmatch(char *cstr, ngx_int_t n, ...) {
+  int       rc;
+  va_list   args;
+  ngx_str_t str;
+  str.data = (u_char *)cstr;
+  str.len = strlen(cstr);
+  va_start(args, n);  
+  rc = nchan_strmatch_va_list(&str, n, args);
+  va_end(args);
+  return rc;
+}
+
+int nchan_cstr_startswith(const char *cstr, const char *match) {
+  for(/*void*/; *match != '\0'; cstr++, match++) {
+    if(*cstr == '\0' || *cstr != *match)
+      return 0;
+  }
+  return 1;
+}
+int nchan_str_startswith(ngx_str_t *str, const char *match) {
+  size_t sz = strlen(match);
+  if(sz > str->len) {
+    return 0;
+  }
+  if(memcmp(str->data, match, sz) == 0) {
+    return 1;
+  }
+  return 0;
+}
+
+int nchan_str_after(ngx_str_t **str, const char *match) {
+  if(nchan_str_startswith(*str, match)) {
+    size_t sz = strlen(match);
+    (*str)->data+=sz;
+    (*str)->len-=sz;
+    return 1;
+  }
+  else {
+    return 0;
+  }
+}
+
+
+void nchan_scan_split_by_chr(u_char **cur, size_t max_len, ngx_str_t *str, u_char chr) {
+  u_char   *shortest = NULL;
+  u_char   *start = *cur;
+  u_char   *tmp_cur;
+  
+  for(tmp_cur = *cur; shortest == NULL && (tmp_cur == *cur || tmp_cur - start < (ssize_t )max_len); tmp_cur++) {
+    if(*tmp_cur == chr) {
+      shortest = tmp_cur;
+    }
+  }
+  if(shortest) {
+    str->data = (u_char *)*cur;
+    str->len = shortest - *cur;
+    *cur = shortest + 1;
+  }
+  else if(tmp_cur - start == (ssize_t )max_len) {
+    str->data = start;
+    str->len = max_len;
+    *cur = start + max_len;
+  }
+  else {
+    str->data = NULL;
+    str->len = 0;
+  }
+}
+
+void nchan_scan_until_chr_on_line(ngx_str_t *line, ngx_str_t *str, u_char chr) {
+  u_char     *cur;
+  //ERR("rest_line: \"%V\"", line);
+  cur = (u_char *)memchr(line->data, chr, line->len);
+  if(!cur) {
+    if(str) {
+      *str = *line;
+    }
+    line->data += line->len;
+    line->len = 0;
+  }
+  else {
+    if(str) {
+      str->data = line->data;
+      str->len = (cur - line->data);
+    }
+    line->len -= (cur - line->data) + 1;
+    line->data += (cur - line->data) + 1;
+  }
+  //ERR("str: \"%V\"", str);
+}
+
+void nchan_strcpy(ngx_str_t *dst, ngx_str_t *src, size_t maxlen) {
+  size_t len = src->len > maxlen && maxlen > 0 ? maxlen : src->len;
+  memcpy(dst->data, src->data, len);
+  dst->len = len;
+}
+
+static ngx_buf_t *ensure_last_buf(ngx_pool_t *pool, ngx_buf_t *buf) {
+  ngx_buf_t *cbuf;
+  if(buf->last_buf == 1) {
+    return buf;
+  }
+  else {
+    cbuf = ngx_create_temp_buf(pool,sizeof(*cbuf));
+    *cbuf = *buf;
+    cbuf->last_buf = 1;
+    return cbuf;
+  }
+}
+
+ngx_str_t *nchan_get_allow_origin_value(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx) {
+  if(!ctx) ctx = ngx_http_get_module_ctx(r, ngx_nchan_module);
+  if(!cf)  cf  = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+  if(!ctx->allow_origin && cf->allow_origin) {
+    ngx_str_t                 *allow_origin = ngx_palloc(r->pool, sizeof(*allow_origin));
+    ngx_http_complex_value(r, cf->allow_origin, allow_origin);
+    ctx->allow_origin = allow_origin;
+  }
+  
+  return ctx->allow_origin;
+}
+
+int nchan_match_origin_header(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx) {
+  ngx_str_t                 *origin_header;
+  ngx_str_t                 *allow_origin;
+  ngx_str_t                  curstr;
+  u_char                    *cur, *end;
+  
+  if(cf->allow_origin == NULL) { //default is to always match
+    return 1;
+  }
+  
+  if((origin_header = nchan_get_header_value_origin(r, ctx)) == NULL) {
+    return 1;
+  }
+
+  allow_origin = nchan_get_allow_origin_value(r, cf, ctx);
+  
+  cur = allow_origin->data;
+  end = cur + allow_origin->len;
+  
+  while(cur < end) {
+    nchan_scan_split_by_chr(&cur, end - cur, &curstr, ' ');
+    if(curstr.len == 1 && curstr.data[0] == '*') {
+      return 1;
+    }
+    if(nchan_ngx_str_match(&curstr, origin_header)) {
+      return 1;
+    }
+  }
+  
+  return 0;
+}
+
+// this function adapted from push stream module. thanks Wandenberg Peixoto <wandenberg@gmail.com> and Rogério Carvalho Schneider <stockrt@gmail.com>
+ngx_buf_t * nchan_chain_to_single_buffer(ngx_pool_t *pool, ngx_chain_t *chain, size_t content_length) {
+  ngx_buf_t *buf = NULL;
+  ssize_t n;
+  size_t len;
+
+  if (chain->next == NULL) {
+    return ensure_last_buf(pool, chain->buf);
+  }
+  //nchan_log_error("multiple buffers in request, need memcpy :(");
+  if (chain->buf->in_file) {
+    if (ngx_buf_in_memory(chain->buf)) {
+      nchan_log_error("can't handle a buffer in a temp file and in memory ");
+    }
+    if (chain->next != NULL) {
+      nchan_log_error("error reading request body with multiple ");
+    }
+    return ensure_last_buf(pool, chain->buf);
+  }
+  buf = ngx_create_temp_buf(pool, content_length + 1);
+  if (buf != NULL) {
+    ngx_memset(buf->start, '\0', content_length + 1);
+    while ((chain != NULL) && (chain->buf != NULL)) {
+      len = ngx_buf_size(chain->buf);
+      // if buffer is equal to content length all the content is in this buffer
+      if (len >= content_length) {
+        buf->start = buf->pos;
+        buf->last = buf->pos;
+        len = content_length;
+      }
+      if (chain->buf->in_file) {
+        n = ngx_read_file(chain->buf->file, buf->start, len, 0);
+        if (n == NGX_FILE_ERROR) {
+          nchan_log_error("cannot read file with request body");
+          return NULL;
+        }
+        buf->last = buf->last + len;
+        ngx_delete_file(chain->buf->file->name.data);
+        chain->buf->file->fd = NGX_INVALID_FILE;
+      } else {
+        buf->last = ngx_copy(buf->start, chain->buf->pos, len);
+      }
+      
+      chain = chain->next;
+      buf->start = buf->last;
+    }
+    buf->last_buf = 1;
+  }
+  return buf;
+}
+
+ngx_int_t nchan_init_timer(ngx_event_t *ev, void (*cb)(ngx_event_t *), void *pd) {
+#if nginx_version >= 1008000
+  ev->cancelable = 1;
+#endif
+  ev->handler = cb;
+  ev->data = pd;
+  ev->log = ngx_cycle->log;
+  return NGX_OK;
+}
+
+
+typedef struct {
+  ngx_event_t    ev;
+  void          (*cb)(void *pd);
+} oneshot_timer_t;
+
+static void oneshot_timer_callback(ngx_event_t *ev) {
+  oneshot_timer_t  *timer = container_of(ev, oneshot_timer_t, ev);
+  timer->cb(ev->data);
+  ngx_free(timer);
+ }
+
+void *nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay) {
+  oneshot_timer_t *timer = ngx_alloc(sizeof(*timer), ngx_cycle->log);
+  ngx_memzero(&timer->ev, sizeof(timer->ev));
+  timer->cb = cb;
+  nchan_init_timer(&timer->ev, oneshot_timer_callback, pd);
+  ngx_add_timer(&timer->ev, delay);
+  return timer;
+}
+
+void nchan_abort_oneshot_timer(void *t) {
+  oneshot_timer_t *timer = t;
+  if(timer->ev.timer_set) {
+    ngx_del_timer(&timer->ev);
+  }
+  ngx_free(timer);
+}
+
+typedef struct {
+  ngx_event_t    ev;
+  ngx_msec_t     wait;
+  ngx_int_t    (*cb)(void *pd);
+} interval_timer_t;
+
+static void interval_timer_callback(ngx_event_t *ev) {
+  interval_timer_t  *timer = container_of(ev, interval_timer_t, ev);
+  ngx_int_t rc = timer->cb(ev->data);
+  if((rc == NGX_OK || rc == NGX_AGAIN) && ev->timedout) {
+    ev->timedout=0;
+    ngx_add_timer(&timer->ev, timer->wait);
+  }
+  else if(rc > NGX_OK && ev->timedout) {
+    timer->wait = rc;
+    ev->timedout=0;
+    ngx_add_timer(&timer->ev, timer->wait);
+  }
+  else { //rc < 0, != NGX_EAGAIN
+    //NGX_DONE, for example, or NGX_ABORT
+    ngx_free(timer);
+  }
+}
+
+void *nchan_add_interval_timer(ngx_int_t (*cb)(void *), void *pd, ngx_msec_t interval) {
+  interval_timer_t *timer = ngx_alloc(sizeof(*timer), ngx_cycle->log);
+  ngx_memzero(&timer->ev, sizeof(timer->ev));
+  timer->cb = cb;
+  timer->wait = interval;
+  nchan_init_timer(&timer->ev, interval_timer_callback, pd);
+  ngx_add_timer(&timer->ev, interval);
+  return timer;
+}
+void nchan_abort_interval_timer(void *t) {
+  interval_timer_t *timer = t;
+  if(timer->ev.timer_set) {
+    ngx_del_timer(&timer->ev);
+  }
+  ngx_free(timer);
+}
+
+
+ngx_str_t *nchan_urldecode_str(ngx_http_request_t *r, ngx_str_t *str) {
+  ngx_str_t   *out;
+  u_char      *dst, *src;
+  if(memchr(str->data, '%', str->len) == NULL) {
+    return str;
+  }
+  
+  out = ngx_palloc(r->pool, sizeof(*out) + str->len);
+  out->data = (u_char *)&out[1];
+  
+  dst = out->data;
+  src = str->data;
+  
+  ngx_unescape_uri(&dst, &src, str->len, 0);
+  out->len = dst - out->data;
+  
+  return out;
+}
+
+int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz) {
+  //naive non-null-terminated string matcher. don't use it in tight loops!
+  char   *cur = (char *)str->data;
+  size_t  len;
+  for(len = str->len; len >= sz; cur++, len--) {
+    if(strncmp(cur, substr, sz) == 0) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+int nchan_cstr_match_line(const char *cstr, const char *line) {
+  ngx_str_t rest;
+  if(nchan_get_rest_of_line_in_cstr(cstr, line, &rest)) {
+    return rest.len == 0 ? 1 : 0;
+  }
+  return 0;
+}
+
+int nchan_get_rest_of_line_in_cstr(const char *cstr, const char *line_start, ngx_str_t *rest) {
+  const char *cur = cstr;
+  const char *end = cur + strlen(cur);
+  
+  while(cur && cur < end) {
+    char *first = strstr(cstr, line_start);
+    if(!first) { //not found at all
+      if(rest) rest->len = 0;
+      return 0;
+    }
+    
+    if(first == cstr || first[-1]=='\n') { //start of line or start of string
+      const char *last = strchr(first, '\n');
+      if(!last) { // end of string
+        last = end;
+      }
+      else if(last > first && last[-1]=='\r') {
+        last--;
+      }
+      if(rest) {
+        rest->len = last - first - strlen(line_start);
+        rest->data = (u_char *)first + strlen(line_start);
+      }
+      return 1;
+    }
+    else {
+      //we found a match in the middle of the string
+      cur = strchr(cur, '\n'); //move on, redo
+    }
+  }
+  return 0;
+}
+
+//converts string to positive double float
+double nchan_atof(u_char *line, ssize_t n) {
+  ssize_t cutoff, cutlim;
+  double  value = 0;
+  
+  u_char *decimal, *cur, *last = line + n;
+  
+  if (n == 0) {
+    return NGX_ERROR;
+  }
+
+  cutoff = NGX_MAX_SIZE_T_VALUE / 10;
+  cutlim = NGX_MAX_SIZE_T_VALUE % 10;
+  
+  decimal = memchr(line, '.', n);
+  
+  if(decimal == NULL) {
+    decimal = line + n;
+  }
+  
+  for (n = decimal - line; n-- > 0; line++) {
+    if (*line < '0' || *line > '9') {
+      return NGX_ERROR;
+    }
+
+    if (value >= cutoff && (value > cutoff || (*line - '0') > cutlim)) {
+      return NGX_ERROR;
+    }
+
+    value = value * 10 + (*line - '0');
+  }
+  
+  double decval = 0;
+  
+  
+  
+  for(cur = (decimal - last) > 10 ? decimal + 10 : last-1; cur > decimal && cur < last; cur--) {
+    if (*cur < '0' || *cur > '9') {
+      return NGX_ERROR;
+    }
+    decval = decval / 10 + (*cur - '0');
+  }
+  value = value + decval/10;
+  
+  return value;
+}
+
+ssize_t nchan_parse_size(ngx_str_t *line) {
+  u_char   unit;
+  size_t   len;
+  ssize_t  size, scale, max;
+  double   floaty;
+  
+  len = line->len;
+  unit = line->data[len - 1];
+
+  switch (unit) {
+  case 'K':
+  case 'k':
+      len--;
+      max = NGX_MAX_SIZE_T_VALUE / 1024;
+      scale = 1024;
+      break;
+
+  case 'M':
+  case 'm':
+      len--;
+      max = NGX_MAX_SIZE_T_VALUE / (1024 * 1024);
+      scale = 1024 * 1024;
+      break;
+  
+  case 'G':
+  case 'g':
+      len--;
+      max = NGX_MAX_SIZE_T_VALUE / (1024 * 1024 * 1024);
+      scale = 1024 * 1024 * 1024;
+      break;
+
+  default:
+      max = NGX_MAX_SIZE_T_VALUE;
+      scale = 1;
+  }
+
+  floaty = nchan_atof(line->data, len);
+  
+  if (floaty == NGX_ERROR || floaty > max) {
+      return NGX_ERROR;
+  }
+
+  size = floaty * scale;
+
+  return size;
+}
+
+char *nchan_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+  char  *p = conf;
+
+  size_t           *sp;
+  ngx_str_t        *value;
+  ngx_conf_post_t  *post;
+
+
+  sp = (size_t *) (p + cmd->offset);
+  if (*sp != NGX_CONF_UNSET_SIZE) {
+      return "is duplicate";
+  }
+
+  value = cf->args->elts;
+
+  *sp = nchan_parse_size(&value[1]);
+  if (*sp == (size_t) NGX_ERROR) {
+    return "invalid value";
+  }
+
+  if (cmd->post) {
+    post = cmd->post;
+    return post->post_handler(cf, post, sp);
+  }
+
+  return NGX_CONF_OK;
+}
+
+void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = start;
+  buf->pos = start;
+  buf->end = end;
+  buf->last = end;
+  buf->memory = 1;
+}
+
+void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str) {
+  ngx_memzero(buf, sizeof(*buf));
+  buf->start = str->data;
+  buf->pos = str->data;
+  buf->end = str->data + str->len;
+  buf->last = buf->end;
+  buf->memory = 1;
+}
+
+
+#if (NGX_ZLIB)
+static z_stream        *deflate_zstream = NULL;
+static z_stream        *deflate_dummy_zstream = NULL;
+
+static ngx_path_t      *message_temp_path = NULL;
+
+ngx_int_t nchan_common_deflate_init(nchan_main_conf_t  *mcf) {
+  int rc;
+  int windowBits;
+  message_temp_path = mcf->message_temp_path;
+  
+  if((deflate_zstream = ngx_calloc(sizeof(*deflate_zstream), ngx_cycle->log)) == NULL) {
+    nchan_log_error("couldn't allocate deflate stream.");
+    return NGX_ERROR;
+  }
+  
+  windowBits = -mcf->zlib_params.windowBits; //negative to disable headers and use a raw stream
+  
+  deflate_zstream->zalloc = Z_NULL;
+  deflate_zstream->zfree = Z_NULL;
+  deflate_zstream->opaque = Z_NULL;
+  
+  rc = deflateInit2(deflate_zstream, (int) mcf->zlib_params.level, Z_DEFLATED, windowBits, mcf->zlib_params.memLevel, mcf->zlib_params.strategy);
+  if(rc != Z_OK) {
+    nchan_log_error("couldn't initialize deflate stream.");
+    deflate_zstream = NULL;
+    return NGX_ERROR;
+  }
+  
+  if((deflate_dummy_zstream = ngx_calloc(sizeof(*deflate_dummy_zstream), ngx_cycle->log)) == NULL) {
+    nchan_log_error("couldn't allocate dummy deflate stream.");
+    return NGX_ERROR;
+  }
+  
+  deflate_dummy_zstream->zalloc = Z_NULL;
+  deflate_dummy_zstream->zfree = Z_NULL;
+  deflate_dummy_zstream->opaque = Z_NULL;
+  
+  rc = deflateInit2(deflate_dummy_zstream, 0, Z_DEFLATED, -9, 1, Z_DEFAULT_STRATEGY);
+  if(rc != Z_OK) {
+    nchan_log_error("couldn't initialize deflate stream.");
+    deflate_dummy_zstream = NULL;
+    return NGX_ERROR;
+  }
+  
+  return NGX_OK;
+}
+
+ngx_int_t nchan_common_deflate_shutdown(void) {
+  if(deflate_zstream) {
+    deflateEnd(deflate_zstream);
+    ngx_free(deflate_zstream);
+    deflate_zstream = NULL;
+  }
+  
+  if(deflate_dummy_zstream) {
+    deflateEnd(deflate_dummy_zstream);
+    ngx_free(deflate_dummy_zstream);
+    deflate_dummy_zstream = NULL;
+  }
+  return NGX_OK;
+}
+
+#define ZLIB_CHUNK 16384
+
+static ngx_temp_file_t *make_temp_file(ngx_http_request_t *r, ngx_pool_t *pool) {
+  ngx_temp_file_t           *tf;
+  ngx_path_t                *temp_path;
+  if(r) {
+    ngx_http_core_loc_conf_t  *clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+    temp_path = clcf->client_body_temp_path;
+  }
+  else {
+    temp_path = message_temp_path;
+  }
+  tf = ngx_pcalloc(pool, sizeof(*tf));
+  if(!tf) {
+    if(r) {
+      nchan_log_request_error(r, "failed to allocate space for temp_file struct.");
+    } else {
+      nchan_log_error("failed to allocate space for temp_file struct.");
+    }
+    return NULL;
+  }
+  tf->file.fd = NGX_INVALID_FILE;
+  if(r) {
+    tf->file.log = r->connection->log;
+  }
+  else if(pool && pool->log) {
+    tf->file.log = pool->log;
+  }
+  else {
+    tf->file.log = ngx_cycle->log;
+  }
+  tf->path = temp_path;
+  tf->pool = pool;
+  tf->persistent = 1;
+  tf->clean = 0; //this will close the file on pool cleanup
+  tf->access = 0;
+  if(ngx_create_temp_file(&tf->file, tf->path, tf->pool, tf->persistent, tf->clean, tf->access) != NGX_OK) {
+    if(r) {
+      nchan_log_request_error(r, "failed to create temp file for deflated message");
+    } else {
+      nchan_log_error("failed to create temp file for deflated message");
+    }
+    return NULL;
+  }
+  return tf;
+}
+
+ngx_buf_t *nchan_common_deflate(ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool) {
+  ngx_str_t           mm_instr;
+  int                 mmapped = 0;
+  ngx_temp_file_t    *tf = NULL;
+  
+  int                 rc;
+  ngx_buf_t          *out = NULL;
+  u_char              outbuf[ZLIB_CHUNK];
+  unsigned            have = 0;
+  off_t               written = 0;
+  
+  //input
+  
+  if(ngx_buf_in_memory(in)) {
+    deflate_zstream->avail_in = ngx_buf_size(in);
+    deflate_zstream->next_in = in->pos;
+  }
+  else {
+    ngx_fd_t fd = in->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&in->file->name) : in->file->fd;
+    mm_instr.len = in->file_last - in->file_pos;
+    mm_instr.data = mmap(NULL, mm_instr.len, PROT_READ, MAP_SHARED, fd, in->file_pos);
+    if (mm_instr.data == MAP_FAILED) {
+      nchan_log_request_error(r, "failed to mmap input file for deflated message");
+      return NULL;
+    }
+    deflate_zstream->avail_in = mm_instr.len;
+    deflate_zstream->next_in = mm_instr.data;
+    mmapped = 1;
+  }
+
+  //output
+  
+  do {
+    deflate_zstream->avail_out = ZLIB_CHUNK;
+    deflate_zstream->next_out = outbuf;
+    
+    rc = deflate(deflate_zstream, Z_SYNC_FLUSH);
+    assert(rc != Z_STREAM_ERROR);
+    
+    have = ZLIB_CHUNK - deflate_zstream->avail_out;
+    
+    if(deflate_zstream->avail_out == 0 && tf == NULL) {
+      //if we filled up the buffer, let's start dumping to a file.
+      tf = make_temp_file(r, pool);
+      if(tf == NULL) { //couldn't make temp file for some reason
+        nchan_log_request_error(r, "failed to allocate output buf for deflated message");
+        deflateReset(deflate_zstream);
+        return NULL;
+      }
+    }
+    if(tf) {
+      ngx_write_file(&tf->file, outbuf, have, written);
+    }
+    
+    written += have;
+  } while(rc != Z_BUF_ERROR);
+  
+  if(mmapped) {
+    munmap(mm_instr.data, mm_instr.len);
+  }
+  
+  if((out = ngx_palloc(pool, sizeof(*out))) == NULL) {
+    nchan_log_request_error(r, "failed to allocate output buf for deflated message");
+    deflateReset(deflate_zstream);
+    return NULL;
+  }
+  
+  if(written > 4) { //there will be a 00 00 FF FF chunk at the end. remove it as the permessage-deflate spec demands
+    written -= 4;
+  }
+  
+  if(tf) { //using a tempfile
+    //thanks to tf->clean = 0, file will be closed on pool cleanup
+    ngx_memzero(out, sizeof(*out));
+    out->file_pos = 0;
+    out->file_last = written;
+    out->in_file = 1;
+    out->file = &tf->file;
+  }
+  else {
+    u_char  *outpooled = ngx_palloc(pool, written);
+    if(!outpooled) {
+      nchan_log_request_error(r, "failed to allocate output data for deflated message");
+      deflateReset(deflate_zstream);
+      return NULL;
+    }
+    ngx_memcpy(outpooled, outbuf, written);
+    ngx_init_set_membuf(out, outpooled, outpooled + written);
+  }
+  out->last_buf = 1;
+  
+  deflateReset(deflate_zstream);
+  return out;
+}
+
+ngx_buf_t *nchan_inflate(z_stream *stream, ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool) {
+  ngx_str_t           mm_instr = {0, NULL};
+  int                 mmapped = 0;
+  ngx_temp_file_t    *tf = NULL;
+  
+  int                 rc;
+  ngx_buf_t          *out = NULL;
+  u_char              outbuf[ZLIB_CHUNK];
+  unsigned            have = 0;
+  off_t               written = 0;
+  int                 trailer_appended = 0;
+  
+  //input
+  if(ngx_buf_in_memory(in)) {
+    stream->avail_in = ngx_buf_size(in);
+    stream->next_in = in->pos;
+  }
+  else {
+    ngx_fd_t fd = in->file->fd == NGX_INVALID_FILE ? nchan_fdcache_get(&in->file->name) : in->file->fd;
+    mm_instr.len = in->file_last - in->file_pos;
+    mm_instr.data = mmap(NULL, mm_instr.len, PROT_READ, MAP_SHARED, fd, in->file_pos);
+    if (mm_instr.data == MAP_FAILED) {
+      nchan_log_request_error(r, "failed to mmap input file for deflated message");
+      return NULL;
+    }
+    stream->avail_in = mm_instr.len;
+    stream->next_in = mm_instr.data;
+    mmapped = 1;
+  }
+
+  //output
+  
+  do {
+    stream->avail_out = ZLIB_CHUNK;
+    stream->next_out = outbuf;
+    
+    if(stream->avail_in == 0 && !trailer_appended) {
+      stream->avail_in = 4;
+      stream->next_in = (u_char *)"\x00\x00\xFF\xFF";
+      trailer_appended = 1;
+    }
+    rc = inflate(stream, trailer_appended ? Z_SYNC_FLUSH : Z_NO_FLUSH);
+    assert(rc != Z_STREAM_ERROR);
+    switch (rc) {
+      case Z_DATA_ERROR:
+        nchan_log_request_error(r, "inflate error %d: %s", rc, stream->msg);
+        break;
+      case Z_NEED_DICT:
+      case Z_MEM_ERROR:
+        nchan_log_request_error(r, "inflate error %d", rc);
+        break;
+    }
+
+    have = ZLIB_CHUNK - stream->avail_out;
+    
+    if(stream->avail_out == 0 && tf == NULL) {
+      //if we filled up the buffer, let's start dumping to a file.
+      tf = make_temp_file(r, pool);
+    }
+    if(tf) {
+      ngx_write_file(&tf->file, outbuf, have, written);
+    }
+    written += have;
+  } while(rc == Z_OK);
+  
+  if(mmapped) {
+    munmap(mm_instr.data, mm_instr.len);
+  }
+  
+  if((out = ngx_palloc(pool, sizeof(*out))) == NULL) {
+    nchan_log_request_error(r, "failed to allocate output buf for deflated message");
+    deflateReset(deflate_zstream);
+    return NULL;
+  }
+  
+  if(tf) { //using a tempfile
+    //thanks to tf->clean = 0, file will be closed on pool cleanup
+    ngx_memzero(out, sizeof(*out));
+    out->file_pos = 0;
+    out->file_last = written;
+    out->in_file = 1;
+    out->file = &tf->file;
+  }
+  else {
+    u_char  *outpooled = ngx_palloc(pool, written);
+    if(!outpooled) {
+      nchan_log_request_error(r, "failed to allocate output data for deflated message");
+      deflateReset(deflate_zstream);
+      return NULL;
+    }
+    ngx_memcpy(outpooled, outbuf, written);
+    ngx_init_set_membuf(out, outpooled, outpooled + written);
+  }
+  out->last_buf = 1;
+  
+  deflateReset(deflate_zstream);
+  return out;
+}
+
+
+static ngx_int_t nchan_common_simple_deflate_internal(z_stream *strm, ngx_str_t *in, ngx_str_t *out) {
+  int rc;
+  strm->avail_in = in->len;
+  strm->next_in = in->data;
+
+  //output
+  strm->avail_out = out->len;
+  strm->next_out = out->data;
+
+  rc = deflate(strm, Z_SYNC_FLUSH);
+  if(rc != Z_STREAM_ERROR) {
+    out->len = strm->total_out;
+  }
+  
+  deflateReset(strm);
+  
+  return rc != Z_STREAM_ERROR ? NGX_OK : NGX_ERROR;
+}
+
+ngx_int_t nchan_common_simple_deflate(ngx_str_t *in, ngx_str_t *out) {
+  return nchan_common_simple_deflate_internal(deflate_zstream, in, out);
+}
+
+ngx_int_t nchan_common_simple_deflate_raw_block(ngx_str_t *in, ngx_str_t *out) {
+  return nchan_common_simple_deflate_internal(deflate_dummy_zstream, in, out);
+}
+  
+#endif
+
+ngx_flag_t nchan_need_to_deflate_message(nchan_loc_conf_t *cf) {
+#if (NGX_ZLIB)
+  if(cf->redis.enabled && cf->redis.storage_mode != REDIS_MODE_BACKUP) {
+    //redis mode ns non-backup storage mode gets the messages deflated later on
+    return 0;
+  }  
+  return cf->message_compression == NCHAN_MSG_COMPRESSION_WEBSOCKET_PERMESSAGE_DEFLATE;
+#else
+  return 0;
+#endif
+}
+
+
+static void nchan_conf_set_backoff_unsets(nchan_backoff_settings_t *cur, const nchan_backoff_settings_t *prev) {
+  if(cur->min == NGX_CONF_UNSET_MSEC) {
+    cur->min = prev->min;
+  }
+  if(cur->jitter_multiplier == NGX_CONF_UNSET) {
+    cur->jitter_multiplier = prev->jitter_multiplier;
+  }
+  if(cur->backoff_multiplier == NGX_CONF_UNSET) {
+    cur->backoff_multiplier = prev->backoff_multiplier;
+  }
+  if(cur->max == NGX_CONF_UNSET_MSEC) {
+    cur->max = prev->max;
+  }
+}
+
+void nchan_conf_merge_backoff_value(nchan_backoff_settings_t *cur, const nchan_backoff_settings_t *prev, const nchan_backoff_settings_t *defaults) {
+  if(prev) {
+    nchan_conf_set_backoff_unsets(cur, prev);
+  }
+  if(defaults) {
+    nchan_conf_set_backoff_unsets(cur, defaults);
+  }
+}
+
+const nchan_backoff_settings_t NCHAN_CONF_UNSEC_BACKOFF = {
+  .min = NGX_CONF_UNSET_MSEC,
+  .backoff_multiplier = NGX_CONF_UNSET,
+  .jitter_multiplier = NGX_CONF_UNSET,
+  .max = NGX_CONF_UNSET_MSEC
+};
+
+ngx_msec_t nchan_set_next_backoff(ngx_msec_t *backoff, nchan_backoff_settings_t *settings) {
+  double next_backoff = *backoff;
+  if(next_backoff == 0 || settings->backoff_multiplier == 0) {
+    next_backoff = settings->min;
+  }
+  else if(settings->backoff_multiplier > 0) {
+    next_backoff *= (settings->backoff_multiplier + 1.0);
+  }
+  if(settings->max > 0 && next_backoff > settings->max) {
+    next_backoff = settings->max;
+  }
+  
+  if(settings->jitter_multiplier > 0) {
+    double max_jitter = (double )next_backoff * settings->jitter_multiplier;
+    next_backoff = next_backoff - (ngx_msec_t)(max_jitter/2.0) + (ngx_random() % (ngx_msec_t )(max_jitter));
+  }
+  if(settings->max > 0 && next_backoff > settings->max) {
+    next_backoff = settings->max;
+  }
+  if(next_backoff <= 0) { //maybe as the result of large jitter and floating point precision error?
+    next_backoff = 1; //1ms pls
+  }
+  *backoff = next_backoff;
+  return next_backoff;
+}
+
+ngx_int_t nchan_deflate_message_if_needed(nchan_msg_t *msg, nchan_loc_conf_t *cf, ngx_http_request_t *r, ngx_pool_t  *pool) {
+#if (NGX_ZLIB)
+  if(nchan_need_to_deflate_message(cf)) {
+    msg->compressed = ngx_pcalloc(pool, sizeof(*msg->compressed));
+    if(!msg->compressed) {
+      if(r) {
+        nchan_log_request_error(r, "no memory to compress message");
+      }
+      else {
+        nchan_log_error("no memory to compress message");
+      }
+    }
+    else {
+      ngx_buf_t  *compressed_buf = nchan_common_deflate(&msg->buf, r, pool);
+      if(!compressed_buf) {
+        if(r) {
+          nchan_log_request_error(r, "failed to compress message");
+        }
+        else {
+          nchan_log_error("failed to compress message");
+        }
+      }
+      else {
+        msg->compressed->compression = cf->message_compression;
+        msg->compressed->buf = *compressed_buf;
+      }
+    }
+  }
+  return NGX_OK;
+#else
+  return NGX_DECLINED;
+#endif
+}
+
+static uint64_t flip_uint64_if_little_endian(uint64_t value) {
+int num = 42;
+  if (*(char *)&num == 42) {
+    uint32_t high_part = htonl((uint32_t)(value >> 32));
+    uint32_t low_part = htonl((uint32_t)(value & 0xFFFFFFFFLL));
+    return (((uint64_t)low_part) << 32) | high_part;
+  } else {
+    return value;
+  }
+}
+
+uint64_t nchan_htonll(uint64_t value) {
+  return flip_uint64_if_little_endian(value); 
+}
+uint64_t nchan_ntohll(uint64_t value) {
+  return flip_uint64_if_little_endian(value);
+}
+
+#if (NGX_DEBUG_POOL)
+//Copyright (C) 2015 Alibaba Group Holding Limited
+static ngx_str_t            debug_pool_str;
+ngx_str_t *ngx_http_debug_pool_str(ngx_pool_t *pool) {
+  u_char              *p, *unit;
+  size_t               s, n, cn, ln;
+  ngx_uint_t           i;
+  ngx_pool_stat_t     *stat;
+  static u_char        charbuf[512];
+  
+  debug_pool_str.len = 0;
+  debug_pool_str.data = charbuf;
+  
+#define NGX_POOL_PID_SIZE       (NGX_TIME_T_LEN + sizeof("pid:\n") - 1)     /* sizeof pid_t equals time_t */
+#define NGX_POOL_PID_FORMAT     "pid:%P\n"
+#define NGX_POOL_ENTRY_SIZE     (48 /* func */ + 12 * 4 + sizeof("size: num: cnum: lnum: \n") - 1)
+#define NGX_POOL_ENTRY_FORMAT   "size:%12z num:%12z cnum:%12z lnum:%12z %s\n"
+#define NGX_POOL_SUMMARY_SIZE   (12 * 4 + sizeof("size: num: cnum: lnum: [SUMMARY]\n") - 1)
+#define NGX_POOL_SUMMARY_FORMAT "size:%10z%2s num:%12z cnum:%12z lnum:%12z [SUMMARY]\n"
+
+  p = charbuf;
+  p = ngx_sprintf(p, NGX_POOL_PID_FORMAT, ngx_pid);
+
+  /* lines of entry */
+
+  s = n = cn = ln = 0;
+
+  for (i = 0; i < NGX_POOL_STATS_MAX; i++) {
+      for (stat = ngx_pool_stats[i]; stat != NULL; stat = stat->next) {
+          p = ngx_snprintf(p, NGX_POOL_ENTRY_SIZE, NGX_POOL_ENTRY_FORMAT,
+                            stat->size, stat->num, stat->cnum, stat->lnum,
+                            stat->func);
+          s += stat->size;
+          n += stat->num;
+          cn += stat->cnum;
+          ln += stat->lnum;
+      }
+  }
+
+  /* summary line */
+
+  unit = (u_char *) " B";
+  if (s > 1024 * 1024) {
+    s = s / (1024 * 1024);
+    unit = (u_char *) "MB";
+  } else if (s > 1024) {
+    s = s / 1024;
+    unit = (u_char *) "KB";
+  }
+
+  p = ngx_snprintf(p, NGX_POOL_SUMMARY_SIZE, NGX_POOL_SUMMARY_FORMAT, s, unit, n, cn, ln);
+
+  debug_pool_str.len = p - debug_pool_str.data;
+  
+  return &debug_pool_str;
+}
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.h
new file mode 100644
index 0000000..54311ef
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/nchan_util.h
@@ -0,0 +1,86 @@
+#include <string.h>
+#include <stddef.h>
+#ifndef NCHAN_HAVE_MEMRCHR
+void *memrchr(const void *s, int c, size_t n);
+#endif
+ngx_int_t ngx_http_complex_value_noalloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen);
+ngx_int_t ngx_http_complex_value_alloc(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, size_t maxlen);
+ngx_int_t ngx_http_complex_value_free(ngx_str_t *value);
+
+ngx_int_t ngx_http_complex_value_custom_pool(ngx_http_request_t *r, ngx_http_complex_value_t *val, ngx_str_t *value, ngx_pool_t *pool);
+u_char *nchan_strsplit(u_char **s1, ngx_str_t *sub, u_char *last_char);
+ngx_str_t *nchan_get_header_value(ngx_http_request_t * r, ngx_str_t header_name);
+ngx_str_t *nchan_get_header_value_origin(ngx_http_request_t *r, nchan_request_ctx_t *ctx);
+
+int nchan_match_origin_header(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
+ngx_str_t *nchan_get_allow_origin_value(ngx_http_request_t *r, nchan_loc_conf_t *cf, nchan_request_ctx_t *ctx);
+
+ngx_str_t *nchan_get_accept_header_value(ngx_http_request_t *r);
+ngx_buf_t *nchan_chain_to_single_buffer(ngx_pool_t *pool, ngx_chain_t *chain, size_t content_length);
+ngx_str_t *ngx_http_debug_pool_str(ngx_pool_t *pool);
+int nchan_strmatch(ngx_str_t *val, ngx_int_t n, ...);
+int nchan_cstrmatch(char *cstr, ngx_int_t n, ...);
+int nchan_cstr_startswith(const char *cstr, const char *match);
+int nchan_str_startswith(ngx_str_t *str, const char *match);
+int nchan_str_after(ngx_str_t **str, const char *match);
+
+ngx_msec_t nchan_set_next_backoff(ngx_msec_t *backoff, nchan_backoff_settings_t *settings);
+void nchan_conf_merge_backoff_value(nchan_backoff_settings_t *cur, const nchan_backoff_settings_t *prev, const nchan_backoff_settings_t *defaults);
+extern const nchan_backoff_settings_t NCHAN_CONF_UNSEC_BACKOFF;
+
+double nchan_atof(u_char *line, ssize_t n);
+
+void nchan_scan_split_by_chr(u_char **cur, size_t max_len, ngx_str_t *str, u_char chr);
+void nchan_scan_until_chr_on_line(ngx_str_t *line, ngx_str_t *str, u_char chr);
+int nchan_get_rest_of_line_in_cstr(const char *cstr, const char *line_start, ngx_str_t *rest);
+
+int nchan_ngx_str_match(ngx_str_t *str1, ngx_str_t *str2);
+int nchan_ngx_str_nonzero_match(ngx_str_t *str1, ngx_str_t *str2);
+int nchan_cstr_match_line(const char *cstr, const char *line);
+
+void nchan_strcpy(ngx_str_t *dst, ngx_str_t *src, size_t maxlen);
+ngx_int_t nchan_init_timer(ngx_event_t *ev, void (*cb)(ngx_event_t *), void *pd);
+void *nchan_add_oneshot_timer(void (*cb)(void *), void *pd, ngx_msec_t delay);
+void nchan_abort_oneshot_timer(void *timer);
+
+void *nchan_add_interval_timer(ngx_int_t (*cb)(void *), void *pd, ngx_msec_t interval);
+void nchan_abort_interval_timer(void *t);
+int nchan_strscanstr(u_char **cur, ngx_str_t *find, u_char *last);
+
+char *nchan_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+ssize_t nchan_parse_size(ngx_str_t *line);
+
+void ngx_init_set_membuf(ngx_buf_t *buf, u_char *start, u_char *end);
+void ngx_init_set_membuf_str(ngx_buf_t *buf, ngx_str_t *str);
+#define ngx_init_set_membuf_char(buf, str) \
+  ngx_init_set_membuf(buf, (u_char *)str, ((u_char *)str) + sizeof(str)-1)
+
+ngx_str_t *nchan_urldecode_str(ngx_http_request_t *r, ngx_str_t *str);
+
+int nchan_ngx_str_char_substr(ngx_str_t *str, char *substr, size_t sz);
+#define nchan_ngx_str_substr(str, substr) \
+  nchan_ngx_str_char_substr(str, substr, sizeof(substr)-1)
+  
+#define nchan_strstrn(haystack, needle) ngx_strstrn((u_char *)(haystack), (needle), sizeof(needle) - 2)
+
+#ifndef container_of
+
+#define container_of(ptr, type, member) ({                      \
+        const __typeof__( ((type *)0)->member ) *__mptr = (ptr);    \
+        (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
+
+ngx_flag_t nchan_need_to_deflate_message(nchan_loc_conf_t *cf);
+ngx_int_t nchan_deflate_message_if_needed(nchan_msg_t *msg, nchan_loc_conf_t *cf, ngx_http_request_t *r, ngx_pool_t  *pool);
+#if (NGX_ZLIB)
+#include <zlib.h>
+ngx_int_t nchan_common_deflate_shutdown(void);
+ngx_int_t nchan_common_deflate_init(nchan_main_conf_t  *mcf);
+ngx_buf_t *nchan_common_deflate(ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool);
+ngx_int_t nchan_common_simple_deflate_raw_block(ngx_str_t *in, ngx_str_t *out);
+ngx_int_t nchan_common_simple_deflate(ngx_str_t *in, ngx_str_t *out);
+ngx_buf_t *nchan_inflate(z_stream *stream, ngx_buf_t *in, ngx_http_request_t *r, ngx_pool_t *pool);
+
+uint64_t nchan_htonll(uint64_t value);
+uint64_t nchan_ntohll(uint64_t value);
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/ngx_nchan_hacked_slab.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/ngx_nchan_hacked_slab.c
new file mode 100644
index 0000000..5670b73
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/ngx_nchan_hacked_slab.c
@@ -0,0 +1,770 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+#if nginx_version <= 1011006
+
+#include "ngx_nchan_hacked_slab.h"
+
+#define NGX_SLAB_PAGE_MASK   3
+#define NGX_SLAB_PAGE        0
+#define NGX_SLAB_BIG         1
+#define NGX_SLAB_EXACT       2
+#define NGX_SLAB_SMALL       3
+
+#if (NGX_PTR_SIZE == 4)
+
+#define NGX_SLAB_PAGE_FREE   0
+#define NGX_SLAB_PAGE_BUSY   0xffffffff
+#define NGX_SLAB_PAGE_START  0x80000000
+
+#define NGX_SLAB_SHIFT_MASK  0x0000000f
+#define NGX_SLAB_MAP_MASK    0xffff0000
+#define NGX_SLAB_MAP_SHIFT   16
+
+#define NGX_SLAB_BUSY        0xffffffff
+
+#else /* (NGX_PTR_SIZE == 8) */
+
+#define NGX_SLAB_PAGE_FREE   0
+#define NGX_SLAB_PAGE_BUSY   0xffffffffffffffff
+#define NGX_SLAB_PAGE_START  0x8000000000000000
+
+#define NGX_SLAB_SHIFT_MASK  0x000000000000000f
+#define NGX_SLAB_MAP_MASK    0xffffffff00000000
+#define NGX_SLAB_MAP_SHIFT   32
+
+#define NGX_SLAB_BUSY        0xffffffffffffffff
+
+#endif
+
+
+#if (NGX_DEBUG_MALLOC)
+
+#define ngx_slab_junk(p, size)     ngx_memset(p, 0xA5, size)
+
+#elif (NGX_HAVE_DEBUG_MALLOC)
+
+#define ngx_slab_junk(p, size)                                                \
+    if (ngx_debug_malloc)          ngx_memset(p, 0xA5, size)
+
+#else
+
+#define ngx_slab_junk(p, size)
+
+#endif
+
+static ngx_slab_page_t *nchan_slab_alloc_pages(ngx_slab_pool_t *pool,
+    ngx_uint_t pages);
+static void nchan_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
+    ngx_uint_t pages);
+static void ngx_slab_error(ngx_slab_pool_t *pool, ngx_uint_t level,
+    char *text);
+
+
+static ngx_uint_t  ngx_slab_max_size;
+static ngx_uint_t  ngx_slab_exact_size;
+static ngx_uint_t  ngx_slab_exact_shift;
+
+static ngx_atomic_uint_t *nchan_slab_reserved_pagecount;
+static ngx_int_t          nchan_slab_reserved_pagecount_temp;
+
+
+void
+nchan_slab_init(ngx_slab_pool_t *pool)
+{
+  ngx_uint_t        n;
+
+  /* STUB */
+  if (ngx_slab_max_size == 0) {
+    ngx_slab_max_size = ngx_pagesize / 2;
+    ngx_slab_exact_size = ngx_pagesize / (8 * sizeof(uintptr_t));
+    for (n = ngx_slab_exact_size; n >>= 1; ngx_slab_exact_shift++) {
+      /* void */
+    }
+  }
+  /**/
+}
+
+
+static void nchan_track_slab_reserved_pages(ngx_slab_pool_t *pool, ngx_int_t pages) {
+  if(nchan_slab_reserved_pagecount) {
+    ngx_atomic_fetch_add(nchan_slab_reserved_pagecount, pages);
+  }
+  else {
+    nchan_slab_reserved_pagecount_temp += pages;
+  }
+}
+
+void nchan_slab_set_reserved_pages_tracker(ngx_slab_pool_t *pool, ngx_atomic_uint_t *ref) {
+  nchan_slab_reserved_pagecount = ref;
+  nchan_track_slab_reserved_pages(pool, nchan_slab_reserved_pagecount_temp);
+  nchan_slab_reserved_pagecount_temp = 0;
+}
+
+void *
+nchan_slab_alloc(ngx_slab_pool_t *pool, size_t size)
+{
+    void  *p;
+
+    ngx_shmtx_lock(&pool->mutex);
+
+    p = nchan_slab_alloc_locked(pool, size);
+
+    ngx_shmtx_unlock(&pool->mutex);
+
+    return p;
+}
+
+
+void *
+nchan_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
+{
+    size_t            s;
+    uintptr_t         p, n, m, mask, *bitmap;
+    ngx_uint_t        i, slot, shift, map;
+    ngx_slab_page_t  *page, *prev, *slots;
+
+    if (size > ngx_slab_max_size) {
+
+        ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
+                       "slab alloc: %uz", size);
+
+        page = nchan_slab_alloc_pages(pool, (size >> ngx_pagesize_shift)
+                                          + ((size % ngx_pagesize) ? 1 : 0));
+        if (page) {
+            p = (page - pool->pages) << ngx_pagesize_shift;
+            p += (uintptr_t) pool->start;
+
+        } else {
+            p = 0;
+        }
+
+        goto done;
+    }
+
+    if (size > pool->min_size) {
+        shift = 1;
+        for (s = size - 1; s >>= 1; shift++) { /* void */ }
+        slot = shift - pool->min_shift;
+
+    } else {
+        size = pool->min_size;
+        shift = pool->min_shift;
+        slot = 0;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
+                   "slab alloc: %uz slot: %ui", size, slot);
+
+    slots = (ngx_slab_page_t *) ((u_char *) pool + sizeof(ngx_slab_pool_t));
+    page = slots[slot].next;
+
+    if (page->next != page) {
+
+        if (shift < ngx_slab_exact_shift) {
+
+            do {
+                p = (page - pool->pages) << ngx_pagesize_shift;
+                bitmap = (uintptr_t *) (pool->start + p);
+
+                map = (1 << (ngx_pagesize_shift - shift))
+                          / (sizeof(uintptr_t) * 8);
+
+                for (n = 0; n < map; n++) {
+
+                    if (bitmap[n] != NGX_SLAB_BUSY) {
+
+                        for (m = 1, i = 0; m; m <<= 1, i++) {
+                            if ((bitmap[n] & m)) {
+                                continue;
+                            }
+
+                            bitmap[n] |= m;
+
+                            i = ((n * sizeof(uintptr_t) * 8) << shift)
+                                + (i << shift);
+
+                            if (bitmap[n] == NGX_SLAB_BUSY) {
+                                for (n = n + 1; n < map; n++) {
+                                    if (bitmap[n] != NGX_SLAB_BUSY) {
+                                        p = (uintptr_t) bitmap + i;
+
+                                        goto done;
+                                    }
+                                }
+
+                                prev = (ngx_slab_page_t *)
+                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
+                                prev->next = page->next;
+                                page->next->prev = page->prev;
+
+                                page->next = NULL;
+                                page->prev = NGX_SLAB_SMALL;
+                            }
+
+                            p = (uintptr_t) bitmap + i;
+
+                            goto done;
+                        }
+                    }
+                }
+
+                page = page->next;
+
+            } while (page);
+
+        } else if (shift == ngx_slab_exact_shift) {
+
+            do {
+                if (page->slab != NGX_SLAB_BUSY) {
+
+                    for (m = 1, i = 0; m; m <<= 1, i++) {
+                        if ((page->slab & m)) {
+                            continue;
+                        }
+
+                        page->slab |= m;
+
+                        if (page->slab == NGX_SLAB_BUSY) {
+                            prev = (ngx_slab_page_t *)
+                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
+                            prev->next = page->next;
+                            page->next->prev = page->prev;
+
+                            page->next = NULL;
+                            page->prev = NGX_SLAB_EXACT;
+                        }
+
+                        p = (page - pool->pages) << ngx_pagesize_shift;
+                        p += i << shift;
+                        p += (uintptr_t) pool->start;
+
+                        goto done;
+                    }
+                }
+
+                page = page->next;
+
+            } while (page);
+
+        } else { /* shift > ngx_slab_exact_shift */
+
+            n = ngx_pagesize_shift - (page->slab & NGX_SLAB_SHIFT_MASK);
+            n = 1 << n;
+            n = ((uintptr_t) 1 << n) - 1;
+            mask = n << NGX_SLAB_MAP_SHIFT;
+
+            do {
+                if ((page->slab & NGX_SLAB_MAP_MASK) != mask) {
+
+                    for (m = (uintptr_t) 1 << NGX_SLAB_MAP_SHIFT, i = 0;
+                         m & mask;
+                         m <<= 1, i++)
+                    {
+                        if ((page->slab & m)) {
+                            continue;
+                        }
+
+                        page->slab |= m;
+
+                        if ((page->slab & NGX_SLAB_MAP_MASK) == mask) {
+                            prev = (ngx_slab_page_t *)
+                                            (page->prev & ~NGX_SLAB_PAGE_MASK);
+                            prev->next = page->next;
+                            page->next->prev = page->prev;
+
+                            page->next = NULL;
+                            page->prev = NGX_SLAB_BIG;
+                        }
+
+                        p = (page - pool->pages) << ngx_pagesize_shift;
+                        p += i << shift;
+                        p += (uintptr_t) pool->start;
+
+                        goto done;
+                    }
+                }
+
+                page = page->next;
+
+            } while (page);
+        }
+    }
+
+    page = nchan_slab_alloc_pages(pool, 1);
+
+    if (page) {
+        if (shift < ngx_slab_exact_shift) {
+            p = (page - pool->pages) << ngx_pagesize_shift;
+            bitmap = (uintptr_t *) (pool->start + p);
+
+            s = 1 << shift;
+            n = (1 << (ngx_pagesize_shift - shift)) / 8 / s;
+
+            if (n == 0) {
+                n = 1;
+            }
+
+            bitmap[0] = (2 << n) - 1;
+
+            map = (1 << (ngx_pagesize_shift - shift)) / (sizeof(uintptr_t) * 8);
+
+            for (i = 1; i < map; i++) {
+                bitmap[i] = 0;
+            }
+
+            page->slab = shift;
+            page->next = &slots[slot];
+            page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_SMALL;
+
+            slots[slot].next = page;
+
+            p = ((page - pool->pages) << ngx_pagesize_shift) + s * n;
+            p += (uintptr_t) pool->start;
+
+            goto done;
+
+        } else if (shift == ngx_slab_exact_shift) {
+
+            page->slab = 1;
+            page->next = &slots[slot];
+            page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_EXACT;
+
+            slots[slot].next = page;
+
+            p = (page - pool->pages) << ngx_pagesize_shift;
+            p += (uintptr_t) pool->start;
+
+            goto done;
+
+        } else { /* shift > ngx_slab_exact_shift */
+
+            page->slab = ((uintptr_t) 1 << NGX_SLAB_MAP_SHIFT) | shift;
+            page->next = &slots[slot];
+            page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_BIG;
+
+            slots[slot].next = page;
+
+            p = (page - pool->pages) << ngx_pagesize_shift;
+            p += (uintptr_t) pool->start;
+
+            goto done;
+        }
+    }
+
+    p = 0;
+
+done:
+
+    ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
+                   "slab alloc: %p", (void *) p);
+
+    return (void *) p;
+}
+
+
+void *
+nchan_slab_calloc(ngx_slab_pool_t *pool, size_t size)
+{
+    void  *p;
+
+    ngx_shmtx_lock(&pool->mutex);
+
+    p = nchan_slab_calloc_locked(pool, size);
+
+    ngx_shmtx_unlock(&pool->mutex);
+
+    return p;
+}
+
+
+void *
+nchan_slab_calloc_locked(ngx_slab_pool_t *pool, size_t size)
+{
+    void  *p;
+
+    p = nchan_slab_alloc_locked(pool, size);
+    if (p) {
+        ngx_memzero(p, size);
+    }
+
+    return p;
+}
+
+
+void
+nchan_slab_free(ngx_slab_pool_t *pool, void *p)
+{
+    ngx_shmtx_lock(&pool->mutex);
+
+    nchan_slab_free_locked(pool, p);
+
+    ngx_shmtx_unlock(&pool->mutex);
+}
+
+
+void
+nchan_slab_free_locked(ngx_slab_pool_t *pool, void *p)
+{
+    size_t            size;
+    uintptr_t         slab, m, *bitmap;
+    ngx_uint_t        n, type, slot, shift, map;
+    ngx_slab_page_t  *slots, *page;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0, "slab free: %p", p);
+
+    if ((u_char *) p < pool->start || (u_char *) p > pool->end) {
+        ngx_slab_error(pool, NGX_LOG_ALERT, "ngx_slab_free(): outside of pool");
+        goto fail;
+    }
+
+    n = ((u_char *) p - pool->start) >> ngx_pagesize_shift;
+    page = &pool->pages[n];
+    slab = page->slab;
+    type = page->prev & NGX_SLAB_PAGE_MASK;
+
+    switch (type) {
+
+    case NGX_SLAB_SMALL:
+
+        shift = slab & NGX_SLAB_SHIFT_MASK;
+        size = 1 << shift;
+
+        if ((uintptr_t) p & (size - 1)) {
+            goto wrong_chunk;
+        }
+
+        n = ((uintptr_t) p & (ngx_pagesize - 1)) >> shift;
+        m = (uintptr_t) 1 << (n & (sizeof(uintptr_t) * 8 - 1));
+        n /= (sizeof(uintptr_t) * 8);
+        bitmap = (uintptr_t *)
+                             ((uintptr_t) p & ~((uintptr_t) ngx_pagesize - 1));
+
+        if (bitmap[n] & m) {
+
+            if (page->next == NULL) {
+                slots = (ngx_slab_page_t *)
+                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
+                slot = shift - pool->min_shift;
+
+                page->next = slots[slot].next;
+                slots[slot].next = page;
+
+                page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_SMALL;
+                page->next->prev = (uintptr_t) page | NGX_SLAB_SMALL;
+            }
+
+            bitmap[n] &= ~m;
+
+            n = (1 << (ngx_pagesize_shift - shift)) / 8 / (1 << shift);
+
+            if (n == 0) {
+                n = 1;
+            }
+
+            if (bitmap[0] & ~(((uintptr_t) 1 << n) - 1)) {
+                goto done;
+            }
+
+            map = (1 << (ngx_pagesize_shift - shift)) / (sizeof(uintptr_t) * 8);
+
+            for (n = 1; n < map; n++) {
+                if (bitmap[n]) {
+                    goto done;
+                }
+            }
+
+            nchan_slab_free_pages(pool, page, 1);
+
+            goto done;
+        }
+
+        goto chunk_already_free;
+
+    case NGX_SLAB_EXACT:
+
+        m = (uintptr_t) 1 <<
+                (((uintptr_t) p & (ngx_pagesize - 1)) >> ngx_slab_exact_shift);
+        size = ngx_slab_exact_size;
+
+        if ((uintptr_t) p & (size - 1)) {
+            goto wrong_chunk;
+        }
+
+        if (slab & m) {
+            if (slab == NGX_SLAB_BUSY) {
+                slots = (ngx_slab_page_t *)
+                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
+                slot = ngx_slab_exact_shift - pool->min_shift;
+
+                page->next = slots[slot].next;
+                slots[slot].next = page;
+
+                page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_EXACT;
+                page->next->prev = (uintptr_t) page | NGX_SLAB_EXACT;
+            }
+
+            page->slab &= ~m;
+
+            if (page->slab) {
+                goto done;
+            }
+
+            nchan_slab_free_pages(pool, page, 1);
+
+            goto done;
+        }
+
+        goto chunk_already_free;
+
+    case NGX_SLAB_BIG:
+
+        shift = slab & NGX_SLAB_SHIFT_MASK;
+        size = 1 << shift;
+
+        if ((uintptr_t) p & (size - 1)) {
+            goto wrong_chunk;
+        }
+
+        m = (uintptr_t) 1 << ((((uintptr_t) p & (ngx_pagesize - 1)) >> shift)
+                              + NGX_SLAB_MAP_SHIFT);
+
+        if (slab & m) {
+
+            if (page->next == NULL) {
+                slots = (ngx_slab_page_t *)
+                                   ((u_char *) pool + sizeof(ngx_slab_pool_t));
+                slot = shift - pool->min_shift;
+
+                page->next = slots[slot].next;
+                slots[slot].next = page;
+
+                page->prev = (uintptr_t) &slots[slot] | NGX_SLAB_BIG;
+                page->next->prev = (uintptr_t) page | NGX_SLAB_BIG;
+            }
+
+            page->slab &= ~m;
+
+            if (page->slab & NGX_SLAB_MAP_MASK) {
+                goto done;
+            }
+
+            nchan_slab_free_pages(pool, page, 1);
+
+            goto done;
+        }
+
+        goto chunk_already_free;
+
+    case NGX_SLAB_PAGE:
+
+        if ((uintptr_t) p & (ngx_pagesize - 1)) {
+            goto wrong_chunk;
+        }
+
+        if (slab == NGX_SLAB_PAGE_FREE) {
+            ngx_slab_error(pool, NGX_LOG_ALERT,
+                           "ngx_slab_free(): page is already free");
+            goto fail;
+        }
+
+        if (slab == NGX_SLAB_PAGE_BUSY) {
+            ngx_slab_error(pool, NGX_LOG_ALERT,
+                           "ngx_slab_free(): pointer to wrong page");
+            goto fail;
+        }
+
+        n = ((u_char *) p - pool->start) >> ngx_pagesize_shift;
+        size = slab & ~NGX_SLAB_PAGE_START;
+
+        nchan_slab_free_pages(pool, &pool->pages[n], size);
+
+        ngx_slab_junk(p, size << ngx_pagesize_shift);
+
+        return;
+    }
+
+    /* not reached */
+
+    return;
+
+done:
+
+    ngx_slab_junk(p, size);
+
+    return;
+
+wrong_chunk:
+
+    ngx_slab_error(pool, NGX_LOG_ALERT,
+                   "ngx_slab_free(): pointer to wrong chunk");
+
+    goto fail;
+
+chunk_already_free:
+
+    ngx_slab_error(pool, NGX_LOG_ALERT,
+                   "ngx_slab_free(): chunk is already free");
+
+fail:
+
+    return;
+}
+
+
+static ngx_slab_page_t *
+nchan_slab_alloc_pages(ngx_slab_pool_t *pool, ngx_uint_t pages)
+{
+    ngx_slab_page_t  *page, *p;
+    ngx_uint_t        need_pages = pages;
+
+    
+    for (page = pool->free.next; page != &pool->free; page = page->next) {
+
+        if (page->slab >= pages) {
+
+            if (page->slab > pages) {
+                page[page->slab - 1].prev = (uintptr_t) &page[pages];
+
+                page[pages].slab = page->slab - pages;
+                page[pages].next = page->next;
+                page[pages].prev = page->prev;
+
+                p = (ngx_slab_page_t *) page->prev;
+                p->next = &page[pages];
+                page->next->prev = (uintptr_t) &page[pages];
+
+            } else {
+                p = (ngx_slab_page_t *) page->prev;
+                p->next = page->next;
+                page->next->prev = page->prev;
+            }
+
+            page->slab = pages | NGX_SLAB_PAGE_START;
+            page->next = NULL;
+            page->prev = NGX_SLAB_PAGE;
+
+            if (--pages == 0) {
+                nchan_track_slab_reserved_pages(pool, need_pages);
+                return page;
+            }
+
+            for (p = page + 1; pages; pages--) {
+                p->slab = NGX_SLAB_PAGE_BUSY;
+                p->next = NULL;
+                p->prev = NGX_SLAB_PAGE;
+                p++;
+            }
+            
+            nchan_track_slab_reserved_pages(pool, need_pages);
+            return page;
+        }
+    }
+#if nginx_version >= 1005003
+    if (pool->log_nomem) {
+        ngx_slab_error(pool, NGX_LOG_CRIT,
+                       "ngx_slab_alloc() failed: no memory");
+    }
+#endif
+    return NULL;
+}
+
+
+static void
+nchan_slab_free_pages(ngx_slab_pool_t *pool, ngx_slab_page_t *page,
+    ngx_uint_t pages)
+{
+#if nginx_version >= 1007002
+    ngx_uint_t        type;
+    ngx_slab_page_t  *prev, *join;
+#else
+    ngx_slab_page_t  *prev;
+#endif
+    nchan_track_slab_reserved_pages(pool, -pages);
+    
+    page->slab = pages--;
+    
+    if (pages) {
+        ngx_memzero(&page[1], pages * sizeof(ngx_slab_page_t));
+    }
+
+    if (page->next) {
+        prev = (ngx_slab_page_t *) (page->prev & ~NGX_SLAB_PAGE_MASK);
+        prev->next = page->next;
+        page->next->prev = page->prev;
+    }
+#if nginx_version >= 1007002
+
+    join = page + page->slab;
+
+    if (join < pool->last) {
+        type = join->prev & NGX_SLAB_PAGE_MASK;
+
+        if (type == NGX_SLAB_PAGE) {
+
+            if (join->next != NULL) {
+                pages += join->slab;
+                page->slab += join->slab;
+
+                prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
+                prev->next = join->next;
+                join->next->prev = join->prev;
+
+                join->slab = NGX_SLAB_PAGE_FREE;
+                join->next = NULL;
+                join->prev = NGX_SLAB_PAGE;
+            }
+        }
+    }
+
+    if (page > pool->pages) {
+        join = page - 1;
+        type = join->prev & NGX_SLAB_PAGE_MASK;
+
+        if (type == NGX_SLAB_PAGE) {
+
+            if (join->slab == NGX_SLAB_PAGE_FREE) {
+                join = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
+            }
+
+            if (join->next != NULL) {
+                pages += join->slab;
+                join->slab += page->slab;
+
+                prev = (ngx_slab_page_t *) (join->prev & ~NGX_SLAB_PAGE_MASK);
+                prev->next = join->next;
+                join->next->prev = join->prev;
+
+                page->slab = NGX_SLAB_PAGE_FREE;
+                page->next = NULL;
+                page->prev = NGX_SLAB_PAGE;
+
+                page = join;
+            }
+        }
+    }
+
+    if (pages) {
+        page[pages].prev = (uintptr_t) page;
+    }
+#endif
+
+    page->prev = (uintptr_t) &pool->free;
+    page->next = pool->free.next;
+
+    page->next->prev = (uintptr_t) page;
+
+    pool->free.next = page;
+}
+
+
+static void
+ngx_slab_error(ngx_slab_pool_t *pool, ngx_uint_t level, char *text)
+{
+    ngx_log_error(level, ngx_cycle->log, 0, "%s%s", text, pool->log_ctx);
+}
+
+#endif
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/ngx_nchan_hacked_slab.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/ngx_nchan_hacked_slab.h
new file mode 100644
index 0000000..87b8f05
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/ngx_nchan_hacked_slab.h
@@ -0,0 +1,26 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
+ */
+
+
+#ifndef _NCHAN_HACKED_SLAB_H_INCLUDED_
+#define _NCHAN_HACKED_SLAB_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+void nchan_slab_init(ngx_slab_pool_t *pool);
+void *nchan_slab_alloc(ngx_slab_pool_t *pool, size_t size);
+void *nchan_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size);
+void *nchan_slab_calloc(ngx_slab_pool_t *pool, size_t size);
+void *nchan_slab_calloc_locked(ngx_slab_pool_t *pool, size_t size);
+void nchan_slab_free(ngx_slab_pool_t *pool, void *p);
+void nchan_slab_free_locked(ngx_slab_pool_t *pool, void *p);
+
+void nchan_slab_set_reserved_pages_tracker(ngx_slab_pool_t *pool, ngx_atomic_uint_t *ref);
+
+#endif /* _NCHAN_HACKED_SLAB_H_INCLUDED_ */
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/shmem.c b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/shmem.c
new file mode 100644
index 0000000..817579d
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/shmem.c
@@ -0,0 +1,223 @@
+#include <nchan_module.h>
+#include "shmem.h"
+#include "assert.h"
+
+#if nginx_version <= 1011006
+//old ugly slab-hack to track alloc'd pages
+#include <util/ngx_nchan_hacked_slab.h>
+#endif
+
+#define DEBUG_SHM_ALLOC 0
+
+#define SHPOOL(shmem) ((ngx_slab_pool_t *)(shmem)->zone->shm.addr)
+
+//#define DEBUG_LEVEL NGX_LOG_WARN
+#define DEBUG_LEVEL NGX_LOG_DEBUG
+
+#define DBG(fmt, args...) ngx_log_error(DEBUG_LEVEL, ngx_cycle->log, 0, "SHMEM(%i):" fmt, memstore_slot(), ##args)
+#define ERR(fmt, args...) ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "SHMEM(%i):" fmt, memstore_slot(), ##args)
+
+//#include <valgrind/memcheck.h>
+
+//shared memory
+shmem_t *shm_create(ngx_str_t *name, ngx_conf_t *cf, size_t shm_size, ngx_int_t (*init)(ngx_shm_zone_t *, void *), void *privdata) {
+
+  ngx_shm_zone_t    *zone;
+  shmem_t           *shm;
+
+  shm_size = ngx_align(shm_size, ngx_pagesize);
+  if (shm_size < 8 * ngx_pagesize) {
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "The push_max_reserved_memory value must be at least %udKiB", (8 * ngx_pagesize) >> 10);
+    shm_size = 8 * ngx_pagesize;
+  }
+  /*
+  if(nchan_shm_zone && nchan_shm_zone->shm.size != shm_size) {
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "Cannot change memory area size without restart, ignoring change");
+  }
+  */
+  ngx_conf_log_error(NGX_LOG_INFO, cf, 0, "Using %udKiB of shared memory for nchan", shm_size >> 10);
+
+  shm = ngx_alloc(sizeof(*shm), ngx_cycle->log);
+  zone = ngx_shared_memory_add(cf, name, shm_size, &ngx_nchan_module);
+  if (zone == NULL || shm == NULL) {
+    return NULL;
+  }
+  shm->zone = zone;
+
+  zone->init = init;
+  zone->data = (void *) 1;
+  return shm;
+}
+
+#if nginx_version <= 1011006
+void shm_set_allocd_pages_tracker(shmem_t *shm, ngx_atomic_uint_t *ptr) {
+  nchan_slab_set_reserved_pages_tracker(SHPOOL(shm), ptr);
+}
+#else
+size_t shm_used_pages(shmem_t *shm) {
+  ngx_slab_pool_t    *shpool = SHPOOL(shm);
+  ngx_slab_page_t    *slots = (ngx_slab_page_t *) ((u_char *) (shpool) + sizeof(ngx_slab_pool_t));
+  size_t              size = shpool->end - (u_char *) slots;
+  
+  ngx_uint_t          max = (ngx_uint_t) (size / (ngx_pagesize + sizeof(ngx_slab_page_t)));
+  return max - shpool->pfree;
+}
+#endif
+
+ngx_int_t shm_init(shmem_t *shm) {
+  ngx_slab_pool_t    *shpool = SHPOOL(shm);
+  #if (DEBUG_SHM_ALLOC == 1)
+  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "nchan_shpool start %p size %i", shpool->start, (u_char *)shpool->end - (u_char *)shpool->start);
+  #endif
+#if nginx_version <= 1011006
+  nchan_slab_init(shpool);
+#else
+  ngx_slab_init(shpool);
+#endif  
+  
+  return NGX_OK;
+}
+
+ngx_int_t shm_reinit(shmem_t *shm) {
+  ngx_slab_pool_t    *shpool = SHPOOL(shm);
+#if nginx_version <= 1011006
+  nchan_slab_init(shpool);
+#else
+  ngx_slab_init(shpool);
+#endif  
+  
+  return NGX_OK;
+}
+
+void shmtx_lock(shmem_t *shm) {
+  ngx_shmtx_lock(&SHPOOL(shm)->mutex);
+}
+void shmtx_unlock(shmem_t *shm) {
+  ngx_shmtx_unlock(&SHPOOL(shm)->mutex);
+}
+
+ngx_int_t shm_destroy(shmem_t *shm) {
+  //VALGRIND_DESTROY_MEMPOOL(SHPOOL(shm));
+  ngx_free(shm);
+  
+  return NGX_OK;
+}
+void *shm_alloc(shmem_t *shm, size_t size, const char *label) {
+  void         *p;
+#if (FAKESHARD || FAKE_SHMEM)
+  p = ngx_alloc(size, ngx_cycle->log);
+#else
+  #if nginx_version <= 1011006
+  p = nchan_slab_alloc(SHPOOL(shm), size);  
+  #else
+  p = ngx_slab_alloc(SHPOOL(shm), size);
+  #endif
+#endif
+  if(p == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "shpool alloc failed");
+  }
+
+  #if (DEBUG_SHM_ALLOC == 1)
+  if (p != NULL) {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool alloc addr %p size %ui label %s", p, size, label == NULL ? "none" : label);
+  }
+  #endif
+  return p;
+}
+
+void *shm_calloc(shmem_t *shm, size_t size, const char *label) {
+  void *p = shm_alloc(shm, size, label);
+  if(p != NULL) {
+    ngx_memzero(p, size);
+  }
+  return p;
+}
+
+void shm_free(shmem_t *shm, void *p) {
+#if (FAKESHARD || FAKE_SHMEM)
+  ngx_free(p);
+#else
+  #if nginx_version <= 1011006
+  nchan_slab_free(SHPOOL(shm), p);
+  #else
+  ngx_slab_free(SHPOOL(shm), p);
+  #endif
+#endif
+#if (DEBUG_SHM_ALLOC == 1)
+  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool free addr %p", p);
+#endif
+}
+
+
+
+//copypasta because these should only be used for debugging
+
+void *shm_locked_alloc(shmem_t *shm, size_t size, const char *label) {
+  void         *p;
+#if (FAKESHARD || FAKE_SHMEM)
+  p = ngx_alloc(size, ngx_cycle->log);
+#else
+  #if nginx_version <= 1011006
+  p = nchan_slab_alloc_locked(SHPOOL(shm), size);
+  #else 
+  p = ngx_slab_alloc_locked(SHPOOL(shm), size);
+  #endif
+#endif
+  if(p == NULL) {
+    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0, "shpool alloc failed");
+  }
+
+  #if (DEBUG_SHM_ALLOC == 1)
+  if (p != NULL) {
+    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool alloc addr %p size %ui label %s", p, size, label == NULL ? "none" : label);
+  }
+  #endif
+  return p;
+}
+
+void *shm_locked_calloc(shmem_t *shm, size_t size, const char *label) {
+  void *p = shm_locked_alloc(shm, size, label);
+  if(p != NULL) {
+    ngx_memzero(p, size);
+  }
+  return p;
+}
+
+void shm_locked_free(shmem_t *shm, void *p) {
+#if (FAKESHARD || FAKE_SHMEM)
+  ngx_free(p);
+#else
+  #if nginx_version <= 1011006
+  nchan_slab_free_locked(SHPOOL(shm), p);
+  #else
+  ngx_slab_free_locked(SHPOOL(shm), p);
+  #endif
+#endif
+#if (DEBUG_SHM_ALLOC == 1)
+  ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0, "shpool free addr %p", p);
+#endif
+}
+
+void shm_verify_immutable_string(shmem_t *shm, ngx_str_t *str) {
+ /* u_char    *pt=(u_char *)str-1;
+  assert(pt[0]=='<');
+  pt=str->data;
+  assert(pt[str->len]=='>');
+  */
+}
+
+void shm_free_immutable_string(shmem_t *shm, ngx_str_t *str) {
+  shm_free(shm, (void *)str);
+}
+
+ngx_str_t *shm_copy_immutable_string(shmem_t *shm, ngx_str_t *str_in) {
+  ngx_str_t    *str;
+  size_t        sz = sizeof(*str) + str_in->len;
+  if((str = shm_alloc(shm, sz, "string")) == NULL) {
+    return NULL;
+  }
+  str->data=(u_char *)&str[1];
+  str->len=str_in->len;
+  ngx_memcpy(str->data, str_in->data, str_in->len);
+  return str;
+}
diff --git a/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/shmem.h b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/shmem.h
new file mode 100644
index 0000000..52417dc
--- /dev/null
+++ b/modules_deb/libnginx-mod-nchan-1.3.7+dfsg/src/util/shmem.h
@@ -0,0 +1,33 @@
+#ifndef NCHAN_SHMEM_H
+#define NCHAN_SHMEM_H
+typedef struct {
+  ngx_shm_zone_t        *zone;
+} shmem_t;
+
+shmem_t          *shm_create(ngx_str_t *name, ngx_conf_t *cf, size_t shm_size, ngx_int_t (*init)(ngx_shm_zone_t *, void *), void *privdata);
+ngx_int_t         shm_init(shmem_t *shm);
+ngx_int_t         shm_reinit(shmem_t *shm);
+ngx_int_t         shm_destroy(shmem_t *shm);
+void             *shm_alloc(shmem_t *shm, size_t size, const char *label);
+void             *shm_calloc(shmem_t *shm, size_t size, const char *label);
+void              shm_free(shmem_t *shm, void *p);
+
+void             *shm_locked_alloc(shmem_t *shm, size_t size, const char *label);
+void             *shm_locked_calloc(shmem_t *shm, size_t size, const char *label);
+void              shm_locked_free(shmem_t *shm, void *p);
+
+void              shmtx_lock(shmem_t *shm);
+void              shmtx_unlock(shmem_t *shm);
+
+ngx_str_t        *shm_copy_immutable_string(shmem_t *shm, ngx_str_t *str);
+void              shm_free_immutable_string(shmem_t *shm, ngx_str_t *str);
+void              shm_verify_immutable_string(shmem_t *shm, ngx_str_t *str);
+
+#if nginx_version <= 1011006
+void shm_set_allocd_pages_tracker(shmem_t *shm, ngx_atomic_uint_t *ptr);
+#else
+ngx_uint_t shm_used_pages(shmem_t *shm);
+#endif
+
+
+#endif //NCHAN_SHMEM_H
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 0deb27b..23edb59 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -340,14 +340,21 @@ main(int argc, char *const *argv)
         ngx_process = NGX_PROCESS_MASTER;
     }
 
+    /* tell-tale to detect if this is parent or child process */
+    ngx_int_t child_pid = NGX_BUSY;
+
 #if !(NGX_WIN32)
 
     if (ngx_init_signals(cycle->log) != NGX_OK) {
         return 1;
     }
 
+    /* tell-tale that this code has been executed */
+    child_pid--;
+
     if (!ngx_inherited && ccf->daemon) {
-        if (ngx_daemon(cycle->log) != NGX_OK) {
+        child_pid = ngx_daemon(cycle->log);
+        if (child_pid == NGX_ERROR) {
             return 1;
         }
 
@@ -360,8 +367,19 @@ main(int argc, char *const *argv)
 
 #endif
 
-    if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
-        return 1;
+    /* If ngx_daemon() returned the child's PID in the parent process
+     * after the fork() set ngx_pid to the child_pid, which gets
+     * written to the PID file, then exit.
+     * For NGX_WIN32 always write the PID file
+     * For others, only write it from the parent process */
+    if (child_pid < NGX_OK || child_pid > NGX_OK) {
+	ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid;
+        if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
+            return 1;
+	}
+    }
+    if (child_pid > NGX_OK) {
+        exit(0);
     }
 
     if (ngx_log_redirect_stderr(cycle) != NGX_OK) {
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 89f277f..f12c4b8 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1914,6 +1914,23 @@ ngx_ssl_handshake(ngx_connection_t *c)
         return NGX_AGAIN;
     }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+    if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
+        c->read->handler = ngx_ssl_handshake_handler;
+        c->write->handler = ngx_ssl_handshake_handler;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        return NGX_AGAIN;
+    }
+#endif
+
     err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
 
     c->ssl->no_wait_shutdown = 1;
@@ -2061,6 +2078,21 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
         return NGX_AGAIN;
     }
 
+    if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
+        c->read->handler = ngx_ssl_handshake_handler;
+        c->write->handler = ngx_ssl_handshake_handler;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        return NGX_AGAIN;
+    }
+
     err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
 
     c->ssl->no_wait_shutdown = 1;
diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
index 385c49b..3719854 100644
--- a/src/os/unix/ngx_daemon.c
+++ b/src/os/unix/ngx_daemon.c
@@ -7,14 +7,17 @@
 
 #include <ngx_config.h>
 #include <ngx_core.h>
+#include <unistd.h>
 
 
 ngx_int_t
 ngx_daemon(ngx_log_t *log)
 {
     int  fd;
+    /* retain the return value for passing back to caller */
+    pid_t pid_child = fork();
 
-    switch (fork()) {
+    switch (pid_child) {
     case -1:
         ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed");
         return NGX_ERROR;
@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log)
         break;
 
     default:
-        exit(0);
+        /* let caller do the exit() */
+        return pid_child;
     }
 
     ngx_parent = ngx_pid;
diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h
index 2a8c413..3a5c765 100644
--- a/src/os/unix/ngx_posix_config.h
+++ b/src/os/unix/ngx_posix_config.h
@@ -21,10 +21,13 @@
 #endif
 
 
-#if (NGX_GNU_HURD)
+#if defined(NGX_GNU_HURD) || defined(__GLIBC__)
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE             /* accept4() */
 #endif
+#endif
+
+#if (NGX_GNU_HURD)
 #define _FILE_OFFSET_BITS       64
 #endif
 

From b1188d637726d0e05d8a5fe613d5b0fd7e50c316 Mon Sep 17 00:00:00 2001
From: wrapper <wrapper@system.system>
Date: Tue, 15 Jul 2025 15:17:17 +0700
Subject: [PATCH 598/600] dyn rec

---
 modules/nginx-secure-token-module       |  1 +
 modules/nginx-stream-preread-str-module |  1 +
 modules/njs                             |  1 +
 modules/quickjs                         |  1 +
 src/event/ngx_event_openssl.c           | 39 +++++++++++++
 src/event/ngx_event_openssl.h           | 15 ++++-
 src/http/modules/ngx_http_ssl_module.c  | 76 +++++++++++++++++++++++++
 src/http/modules/ngx_http_ssl_module.h  |  6 ++
 8 files changed, 139 insertions(+), 1 deletion(-)
 create mode 160000 modules/nginx-secure-token-module
 create mode 160000 modules/nginx-stream-preread-str-module
 create mode 160000 modules/njs
 create mode 160000 modules/quickjs

diff --git a/modules/nginx-secure-token-module b/modules/nginx-secure-token-module
new file mode 160000
index 0000000..24f7b99
--- /dev/null
+++ b/modules/nginx-secure-token-module
@@ -0,0 +1 @@
+Subproject commit 24f7b99d9b665e11c92e585d6645ed6f45f7d310
diff --git a/modules/nginx-stream-preread-str-module b/modules/nginx-stream-preread-str-module
new file mode 160000
index 0000000..7326626
--- /dev/null
+++ b/modules/nginx-stream-preread-str-module
@@ -0,0 +1 @@
+Subproject commit 7326626fce5d6ec31ac892377e0a734e503d40e6
diff --git a/modules/njs b/modules/njs
new file mode 160000
index 0000000..4fd3ff9
--- /dev/null
+++ b/modules/njs
@@ -0,0 +1 @@
+Subproject commit 4fd3ff98e413ede57c88456cf84b116a8382061a
diff --git a/modules/quickjs b/modules/quickjs
new file mode 160000
index 0000000..1fdc768
--- /dev/null
+++ b/modules/quickjs
@@ -0,0 +1 @@
+Subproject commit 1fdc768fdc8571300755cdd3e4654ce99c0255ce
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index f12c4b8..04485cc 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1712,6 +1712,7 @@ ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags)
 
     sc->buffer = ((flags & NGX_SSL_BUFFER) != 0);
     sc->buffer_size = ssl->buffer_size;
+    sc->dyn_rec = ssl->dyn_rec;
 
     sc->session_ctx = ssl->ctx;
 
@@ -2715,6 +2716,41 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
     for ( ;; ) {
 
+        /* Dynamic record resizing:
+           We want the initial records to fit into one TCP segment
+           so we don't get TCP HoL blocking due to TCP Slow Start.
+           A connection always starts with small records, but after
+           a given amount of records sent, we make the records larger
+           to reduce header overhead.
+           After a connection has idled for a given timeout, begin
+           the process from the start. The actual parameters are
+           configurable. If dyn_rec_timeout is 0, we assume dyn_rec is off. */
+
+        if (c->ssl->dyn_rec.timeout > 0 ) {
+
+            if (ngx_current_msec - c->ssl->dyn_rec_last_write >
+                c->ssl->dyn_rec.timeout)
+            {
+                buf->end = buf->start + c->ssl->dyn_rec.size_lo;
+                c->ssl->dyn_rec_records_sent = 0;
+
+            } else {
+                if (c->ssl->dyn_rec_records_sent >
+                    c->ssl->dyn_rec.threshold * 2)
+                {
+                    buf->end = buf->start + c->ssl->buffer_size;
+
+                } else if (c->ssl->dyn_rec_records_sent >
+                           c->ssl->dyn_rec.threshold)
+                {
+                    buf->end = buf->start + c->ssl->dyn_rec.size_hi;
+
+                } else {
+                    buf->end = buf->start + c->ssl->dyn_rec.size_lo;
+                }
+            }
+        }
+
         while (in && buf->last < buf->end && send < limit) {
             if (in->buf->last_buf || in->buf->flush) {
                 flush = 1;
@@ -2854,6 +2890,9 @@ ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size)
 
     if (n > 0) {
 
+        c->ssl->dyn_rec_records_sent++;
+        c->ssl->dyn_rec_last_write = ngx_current_msec;
+
         if (c->ssl->saved_read_handler) {
 
             c->read->handler = c->ssl->saved_read_handler;
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
index ebb2c35..97fde1d 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -86,10 +86,19 @@
 typedef struct ngx_ssl_ocsp_s  ngx_ssl_ocsp_t;
 
 
+typedef struct {
+    ngx_msec_t                  timeout;
+    ngx_uint_t                  threshold;
+    size_t                      size_lo;
+    size_t                      size_hi;
+} ngx_ssl_dyn_rec_t;
+
+
 struct ngx_ssl_s {
     SSL_CTX                    *ctx;
     ngx_log_t                  *log;
     size_t                      buffer_size;
+    ngx_ssl_dyn_rec_t           dyn_rec;
 };
 
 
@@ -128,6 +137,10 @@ struct ngx_ssl_connection_s {
     unsigned                    in_ocsp:1;
     unsigned                    early_preread:1;
     unsigned                    write_blocked:1;
+
+    ngx_ssl_dyn_rec_t           dyn_rec;
+    ngx_msec_t                  dyn_rec_last_write;
+    ngx_uint_t                  dyn_rec_records_sent;
 };
 
 
@@ -137,7 +150,7 @@ struct ngx_ssl_connection_s {
 #define NGX_SSL_DFLT_BUILTIN_SCACHE  -5
 
 
-#define NGX_SSL_MAX_SESSION_SIZE  4096
+#define NGX_SSL_MAX_SESSION_SIZE  16384
 
 typedef struct ngx_ssl_sess_id_s  ngx_ssl_sess_id_t;
 
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 1c92d9f..f32ae33 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -290,6 +290,41 @@ static ngx_command_t  ngx_http_ssl_commands[] = {
       offsetof(ngx_http_ssl_srv_conf_t, reject_handshake),
       NULL },
 
+    { ngx_string("ssl_dyn_rec_enable"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_enable),
+      NULL },
+
+    { ngx_string("ssl_dyn_rec_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_timeout),
+      NULL },
+
+    { ngx_string("ssl_dyn_rec_size_lo"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_size_lo),
+      NULL },
+
+    { ngx_string("ssl_dyn_rec_size_hi"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_size_hi),
+      NULL },
+
+    { ngx_string("ssl_dyn_rec_threshold"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_SRV_CONF_OFFSET,
+      offsetof(ngx_http_ssl_srv_conf_t, dyn_rec_threshold),
+      NULL },
+
       ngx_null_command
 };
 
@@ -629,6 +664,11 @@ ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
     sscf->ocsp_cache_zone = NGX_CONF_UNSET_PTR;
     sscf->stapling = NGX_CONF_UNSET;
     sscf->stapling_verify = NGX_CONF_UNSET;
+    sscf->dyn_rec_enable = NGX_CONF_UNSET;
+    sscf->dyn_rec_timeout = NGX_CONF_UNSET_MSEC;
+    sscf->dyn_rec_size_lo = NGX_CONF_UNSET_SIZE;
+    sscf->dyn_rec_size_hi = NGX_CONF_UNSET_SIZE;
+    sscf->dyn_rec_threshold = NGX_CONF_UNSET_UINT;
 
     return sscf;
 }
@@ -694,6 +734,20 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_str_value(conf->stapling_responder,
                          prev->stapling_responder, "");
 
+    ngx_conf_merge_value(conf->dyn_rec_enable, prev->dyn_rec_enable, 0);
+    ngx_conf_merge_msec_value(conf->dyn_rec_timeout, prev->dyn_rec_timeout,
+                             1000);
+    /* Default sizes for the dynamic record sizes are defined to fit maximal
+       TLS + IPv6 overhead in a single TCP segment for lo and 3 segments for hi:
+       1369 = 1500 - 40 (IP) - 20 (TCP) - 10 (Time) - 61 (Max TLS overhead) */
+    ngx_conf_merge_size_value(conf->dyn_rec_size_lo, prev->dyn_rec_size_lo,
+                             1369);
+    /* 4229 = (1500 - 40 - 20 - 10) * 3  - 61 */
+    ngx_conf_merge_size_value(conf->dyn_rec_size_hi, prev->dyn_rec_size_hi,
+                             4229);
+    ngx_conf_merge_uint_value(conf->dyn_rec_threshold, prev->dyn_rec_threshold,
+                             40);
+
     conf->ssl.log = cf->log;
 
     if (conf->certificates) {
@@ -890,6 +944,28 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
+    if (conf->dyn_rec_enable) {
+        conf->ssl.dyn_rec.timeout = conf->dyn_rec_timeout;
+        conf->ssl.dyn_rec.threshold = conf->dyn_rec_threshold;
+
+        if (conf->buffer_size > conf->dyn_rec_size_lo) {
+            conf->ssl.dyn_rec.size_lo = conf->dyn_rec_size_lo;
+
+        } else {
+            conf->ssl.dyn_rec.size_lo = conf->buffer_size;
+        }
+
+        if (conf->buffer_size > conf->dyn_rec_size_hi) {
+            conf->ssl.dyn_rec.size_hi = conf->dyn_rec_size_hi;
+
+        } else {
+            conf->ssl.dyn_rec.size_hi = conf->buffer_size;
+        }
+
+    } else {
+        conf->ssl.dyn_rec.timeout = 0;
+    }
+
     return NGX_CONF_OK;
 }
 
diff --git a/src/http/modules/ngx_http_ssl_module.h b/src/http/modules/ngx_http_ssl_module.h
index c69c8ff..1d7e63e 100644
--- a/src/http/modules/ngx_http_ssl_module.h
+++ b/src/http/modules/ngx_http_ssl_module.h
@@ -62,6 +62,12 @@ typedef struct {
     ngx_flag_t                      stapling_verify;
     ngx_str_t                       stapling_file;
     ngx_str_t                       stapling_responder;
+
+    ngx_flag_t                      dyn_rec_enable;
+    ngx_msec_t                      dyn_rec_timeout;
+    size_t                          dyn_rec_size_lo;
+    size_t                          dyn_rec_size_hi;
+    ngx_uint_t                      dyn_rec_threshold;
 } ngx_http_ssl_srv_conf_t;
 
 

From ce21ceb30b9a86cded68f68d7386aeac4ee83307 Mon Sep 17 00:00:00 2001
From: wrapper <wrapper@system.system>
Date: Tue, 15 Jul 2025 15:22:39 +0700
Subject: [PATCH 599/600] forgot memc

---
 configure.docker.sh                           |   10 +-
 configure.sh                                  |   10 +-
 .../.gitmodules                               |    3 -
 .../.gitattributes                            |    1 +
 .../libnginx-mod-http-memc-0.20/.gitignore    |   54 +
 .../libnginx-mod-http-memc-0.20/.travis.yml   |   62 +
 .../README.markdown                           |  813 +++++++
 .../libnginx-mod-http-memc-0.20/config        |   31 +
 .../debian/changelog                          |   51 +
 .../debian/control                            |   26 +
 .../debian/copyright                          |   62 +
 .../debian/fix.scanned.copyright              |    2 +
 .../debian/gbp.conf                           |   12 +
 .../libnginx-mod-http-memc-0.20/debian/rules  |   15 +
 .../debian/source/format                      |    1 +
 .../debian/tests/control                      |   14 +
 .../debian/tests/flush                        |   34 +
 .../debian/tests/generic                      |   73 +
 .../debian/upstream/metadata                  |    4 +
 .../libnginx-mod-http-memc-0.20/debian/watch  |    6 +
 .../libnginx-mod-http-memc-0.20/src/ddebug.h  |   75 +
 .../src/memc_common.rl                        |   44 +
 .../src/memc_delete.rl                        |   17 +
 .../src/memc_flush_all.rl                     |   16 +
 .../src/memc_incr_decr.rl                     |   20 +
 .../src/memc_stats.rl                         |   22 +
 .../src/memc_storage.rl                       |   17 +
 .../src/memc_version.rl                       |   19 +
 .../src/ngx_http_memc_handler.c               |  612 ++++++
 .../src/ngx_http_memc_handler.h               |   13 +
 .../src/ngx_http_memc_module.c                |  404 ++++
 .../src/ngx_http_memc_module.h                |   98 +
 .../src/ngx_http_memc_request.c               |  571 +++++
 .../src/ngx_http_memc_request.h               |   27 +
 .../src/ngx_http_memc_response.c              | 1914 +++++++++++++++++
 .../src/ngx_http_memc_response.h              |   28 +
 .../src/ngx_http_memc_response.rl             |  663 ++++++
 .../src/ngx_http_memc_util.c                  |  161 ++
 .../src/ngx_http_memc_util.h                  |   33 +
 .../libnginx-mod-http-memc-0.20/t/bugs.t      |  240 +++
 .../libnginx-mod-http-memc-0.20/t/cmd.t       |  144 ++
 .../libnginx-mod-http-memc-0.20/t/core-bugs.t |   55 +
 .../libnginx-mod-http-memc-0.20/t/delete.t    |  140 ++
 .../libnginx-mod-http-memc-0.20/t/errors.t    |   45 +
 .../libnginx-mod-http-memc-0.20/t/eval.t      |  118 +
 .../libnginx-mod-http-memc-0.20/t/exptime.t   |  166 ++
 .../libnginx-mod-http-memc-0.20/t/flags.t     |  263 +++
 .../libnginx-mod-http-memc-0.20/t/flush-all.t |  120 ++
 .../libnginx-mod-http-memc-0.20/t/if.t        |   30 +
 .../libnginx-mod-http-memc-0.20/t/incr-decr.t |  292 +++
 .../libnginx-mod-http-memc-0.20/t/keepalive.t |   41 +
 .../t/keepalive/incr-decr.t                   |  306 +++
 .../t/keepalive/storage.t                     |  749 +++++++
 .../libnginx-mod-http-memc-0.20/t/stats.t     |   45 +
 .../libnginx-mod-http-memc-0.20/t/storage.t   |  740 +++++++
 .../libnginx-mod-http-memc-0.20/t/upstream.t  |   78 +
 .../libnginx-mod-http-memc-0.20/t/used.t      |   67 +
 .../libnginx-mod-http-memc-0.20/t/version.t   |   25 +
 .../libnginx-mod-http-memc-0.20/util/build.sh |   42 +
 .../util/fix-clang-warnings                   |   53 +
 .../util/update-readme.sh                     |    6 +
 .../util/wiki2pod.pl                          |  131 ++
 .../valgrind.suppress                         |   93 +
 63 files changed, 10014 insertions(+), 13 deletions(-)
 delete mode 100644 modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.gitmodules
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/.gitattributes
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/.gitignore
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/.travis.yml
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/README.markdown
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/config
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/changelog
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/control
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/copyright
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/fix.scanned.copyright
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/gbp.conf
 create mode 100755 modules_deb/libnginx-mod-http-memc-0.20/debian/rules
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/source/format
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/tests/control
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/tests/flush
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/tests/generic
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/upstream/metadata
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/debian/watch
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ddebug.h
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/memc_common.rl
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/memc_delete.rl
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/memc_flush_all.rl
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/memc_incr_decr.rl
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/memc_stats.rl
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/memc_storage.rl
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/memc_version.rl
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.c
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.h
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.c
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.h
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.c
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.h
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.c
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.h
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.rl
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.c
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.h
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/bugs.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/cmd.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/core-bugs.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/delete.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/errors.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/eval.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/exptime.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/flags.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/flush-all.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/if.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/incr-decr.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/keepalive.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/incr-decr.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/storage.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/stats.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/storage.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/upstream.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/used.t
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/t/version.t
 create mode 100755 modules_deb/libnginx-mod-http-memc-0.20/util/build.sh
 create mode 100755 modules_deb/libnginx-mod-http-memc-0.20/util/fix-clang-warnings
 create mode 100755 modules_deb/libnginx-mod-http-memc-0.20/util/update-readme.sh
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/util/wiki2pod.pl
 create mode 100644 modules_deb/libnginx-mod-http-memc-0.20/valgrind.suppress

diff --git a/configure.docker.sh b/configure.docker.sh
index f99417d..2e7558f 100755
--- a/configure.docker.sh
+++ b/configure.docker.sh
@@ -39,18 +39,18 @@
     --with-mail=dynamic \
     --with-stream=dynamic \
     --with-stream_geoip_module=dynamic \
-    --add-module=./modules_deb/libnginx-mod-http-ndk-0.3.2 \
+    --add-module=./modules_deb/libnginx-mod-http-ndk-0.3.4 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-brotli-1.0.0~rc \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.3 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.5.3 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-echo-0.63 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-geoip2-3.4 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.34\
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.19 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.38 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.20 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-set-misc-0.33 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-srcache-filter-0.33 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-subs-filter-0.6.4 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.6+dfsg \
+    --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.7+dfsg \
     --add-dynamic-module=./modules/njs/nginx \
     --add-module=./modules/media-framework/nginx-common \
     --add-dynamic-module=./modules/nginx-stream-preread-str-module \
diff --git a/configure.sh b/configure.sh
index 6d76886..ed704de 100755
--- a/configure.sh
+++ b/configure.sh
@@ -36,18 +36,18 @@
     --with-mail=dynamic \
     --with-stream=dynamic \
     --with-stream_geoip_module=dynamic \
-    --add-module=./modules_deb/libnginx-mod-http-ndk-0.3.2 \
+    --add-module=./modules_deb/libnginx-mod-http-ndk-0.3.4 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-brotli-1.0.0~rc \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.3 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.5.3 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-echo-0.63 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-geoip2-3.4 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.34\
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.19 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.38 \
+    --add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.20 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-set-misc-0.33 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-srcache-filter-0.33 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-subs-filter-0.6.4 \
     --add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.6+dfsg \
+    --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.7+dfsg \
     --add-dynamic-module=./modules/njs/nginx \
     --add-module=./modules/media-framework/nginx-common \
     --add-dynamic-module=./modules/nginx-stream-preread-str-module \
diff --git a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.gitmodules b/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.gitmodules
deleted file mode 100644
index 694f088..0000000
--- a/modules_deb/libnginx-mod-http-brotli-1.0.0~rc/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "deps/brotli"]
-	path = deps/brotli
-	url = https://github.com/google/brotli.git
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/.gitattributes b/modules_deb/libnginx-mod-http-memc-0.20/.gitattributes
new file mode 100644
index 0000000..6fe6f35
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/.gitattributes
@@ -0,0 +1 @@
+*.t linguist-language=Text
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/.gitignore b/modules_deb/libnginx-mod-http-memc-0.20/.gitignore
new file mode 100644
index 0000000..ed5f748
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/.gitignore
@@ -0,0 +1,54 @@
+.libs
+*.t_
+*.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_
+genmobi.sh
+*.mobi
+misc/chunked
+reindex
+src/response.c
+src/handler.h
+src/util.c
+src/module.c
+src/handler.c
+src/response.rl
+src/response.h
+src/module.h
+src/util.h
+src/request.h
+src/request.c
+ctags
+nginx
+*.html
+t/servroot/
+all
+Changes
+build1[0-9]
+go
+buildroot/
+analyze
+*.plist
+Makefile
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/.travis.yml b/modules_deb/libnginx-mod-http-memc-0.20/.travis.yml
new file mode 100644
index 0000000..e695941
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/.travis.yml
@@ -0,0 +1,62 @@
+sudo: required
+dist: bionic
+
+os: linux
+
+language: c
+
+compiler:
+  - gcc
+
+addons:
+  apt:
+    packages: [ axel, cpanminus, libtest-base-perl, libtext-diff-perl, liburi-perl, libwww-perl, libtest-longstring-perl, liblist-moreutils-perl ]
+
+cache:
+  apt: true
+
+env:
+  global:
+    - LUAJIT_PREFIX=/opt/luajit21
+    - LUAJIT_LIB=$LUAJIT_PREFIX/lib
+    - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
+    - LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
+    - LUA_INCLUDE_DIR=$LUAJIT_INC
+    - LUA_CMODULE_DIR=/lib
+    - JOBS=3
+    - NGX_BUILD_JOBS=$JOBS
+  matrix:
+    - NGINX_VERSION=1.17.8
+    - NGINX_VERSION=1.19.9
+
+services:
+ - memcache
+
+install:
+  - git clone https://github.com/openresty/nginx-devel-utils.git
+  - git clone https://github.com/openresty/openresty.git ../openresty
+  - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
+  - git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
+  - git clone https://github.com/openresty/test-nginx.git
+  - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git
+  - git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
+  - git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core
+  - git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
+  - git clone https://github.com/openresty/nginx-eval-module.git ../eval-nginx-module
+  - git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
+  - git clone https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module
+
+script:
+  - sudo iptables -I OUTPUT -p tcp --dst 127.0.0.2 --dport 12345 -j DROP
+  - sudo iptables -I OUTPUT -p udp --dst 127.0.0.2 --dport 12345 -j DROP
+  - cd luajit2
+  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT' > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ..
+  - perlbrew off && cd test-nginx && sudo cpanm . && cd ..
+  - export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH
+  - export NGX_BUILD_CC=$CC
+  - sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
+  - nginx -V
+  - ldd `which nginx`|grep luajit
+  - prove -I. -r t
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/README.markdown b/modules_deb/libnginx-mod-http-memc-0.20/README.markdown
new file mode 100644
index 0000000..7f82bd1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/README.markdown
@@ -0,0 +1,813 @@
+Name
+====
+
+**ngx_memc** - An extended version of the standard memcached module that supports set, add, delete, and many more memcached commands.
+
+*This module is not distributed with the Nginx source.* See [the installation instructions](#installation).
+
+Table of Contents
+=================
+
+* [Version](#version)
+* [Synopsis](#synopsis)
+* [Description](#description)
+    * [Keep-alive connections to memcached servers](#keep-alive-connections-to-memcached-servers)
+    * [How it works](#how-it-works)
+* [Memcached commands supported](#memcached-commands-supported)
+    * [get $memc_key](#get-memc_key)
+    * [set $memc_key $memc_flags $memc_exptime $memc_value](#set-memc_key-memc_flags-memc_exptime-memc_value)
+    * [add $memc_key $memc_flags $memc_exptime $memc_value](#add-memc_key-memc_flags-memc_exptime-memc_value)
+    * [replace $memc_key $memc_flags $memc_exptime $memc_value](#replace-memc_key-memc_flags-memc_exptime-memc_value)
+    * [append $memc_key $memc_flags $memc_exptime $memc_value](#append-memc_key-memc_flags-memc_exptime-memc_value)
+    * [prepend $memc_key $memc_flags $memc_exptime $memc_value](#prepend-memc_key-memc_flags-memc_exptime-memc_value)
+    * [delete $memc_key](#delete-memc_key)
+    * [delete $memc_key $memc_exptime](#delete-memc_key-memc_exptime)
+    * [incr $memc_key $memc_value](#incr-memc_key-memc_value)
+    * [decr $memc_key $memc_value](#decr-memc_key-memc_value)
+    * [flush_all](#flush_all)
+    * [flush_all $memc_exptime](#flush_all-memc_exptime)
+    * [stats](#stats)
+    * [version](#version)
+* [Directives](#directives)
+    * [memc_pass](#memc_pass)
+    * [memc_cmds_allowed](#memc_cmds_allowed)
+    * [memc_flags_to_last_modified](#memc_flags_to_last_modified)
+    * [memc_connect_timeout](#memc_connect_timeout)
+    * [memc_send_timeout](#memc_send_timeout)
+    * [memc_read_timeout](#memc_read_timeout)
+    * [memc_buffer_size](#memc_buffer_size)
+    * [memc_ignore_client_abort](#memc_ignore_client_abort)
+* [Installation](#installation)
+    * [For Developers](#for-developers)
+* [Compatibility](#compatibility)
+* [Community](#community)
+    * [English Mailing List](#english-mailing-list)
+    * [Chinese Mailing List](#chinese-mailing-list)
+* [Report Bugs](#report-bugs)
+* [Source Repository](#source-repository)
+* [Changes](#changes)
+* [Test Suite](#test-suite)
+* [TODO](#todo)
+* [Getting involved](#getting-involved)
+* [Author](#author)
+* [Copyright & License](#copyright--license)
+* [See Also](#see-also)
+
+Version
+=======
+
+This document describes ngx_memc [v0.19](http://github.com/openresty/memc-nginx-module/tags) released on 19 April 2018.
+
+Synopsis
+========
+
+```nginx
+
+ # GET /foo?key=dog
+ #
+ # POST /foo?key=cat
+ # Cat's value...
+ #
+ # PUT /foo?key=bird
+ # Bird's value...
+ #
+ # DELETE /foo?key=Tiger
+ location /foo {
+     set $memc_key $arg_key;
+
+     # $memc_cmd defaults to get for GET,
+     #   add for POST, set for PUT, and
+     #   delete for the DELETE request method.
+
+     memc_pass 127.0.0.1:11211;
+ }
+```
+
+```nginx
+
+ # GET /bar?cmd=get&key=cat
+ #
+ # POST /bar?cmd=set&key=dog
+ # My value for the "dog" key...
+ #
+ # DELETE /bar?cmd=delete&key=dog
+ # GET /bar?cmd=delete&key=dog
+ location /bar {
+     set $memc_cmd $arg_cmd;
+     set $memc_key $arg_key;
+     set $memc_flags $arg_flags; # defaults to 0
+     set $memc_exptime $arg_exptime; # defaults to 0
+
+     memc_pass 127.0.0.1:11211;
+ }
+```
+
+```nginx
+
+ # GET /bar?cmd=get&key=cat
+ # GET /bar?cmd=set&key=dog&val=animal&flags=1234&exptime=2
+ # GET /bar?cmd=delete&key=dog
+ # GET /bar?cmd=flush_all
+ location /bar {
+     set $memc_cmd $arg_cmd;
+     set $memc_key $arg_key;
+     set $memc_value $arg_val;
+     set $memc_flags $arg_flags; # defaults to 0
+     set $memc_exptime $arg_exptime; # defaults to 0
+
+     memc_cmds_allowed get set add delete flush_all;
+
+     memc_pass 127.0.0.1:11211;
+ }
+```
+
+```nginx
+
+   http {
+     ...
+     upstream backend {
+        server 127.0.0.1:11984;
+        server 127.0.0.1:11985;
+     }
+     server {
+         location /stats {
+             set $memc_cmd stats;
+             memc_pass backend;
+         }
+         ...
+     }
+   }
+   ...
+```
+
+```nginx
+
+ # read the memcached flags into the Last-Modified header
+ # to respond 304 to conditional GET
+ location /memc {
+     set $memc_key $arg_key;
+
+     memc_pass 127.0.0.1:11984;
+
+     memc_flags_to_last_modified on;
+ }
+```
+
+```nginx
+
+ location /memc {
+     set $memc_key foo;
+     set $memc_cmd get;
+
+     # access the unix domain socket listend by memcached
+     memc_pass unix:/tmp/memcached.sock;
+ }
+```
+
+Description
+===========
+
+This module extends the standard [memcached module](http://nginx.org/en/docs/http/ngx_http_memcached_module.html) to support almost the whole [memcached ascii protocol](http://code.sixapart.com/svn/memcached/trunk/server/doc/protocol.txt).
+
+It allows you to define a custom [REST](http://en.wikipedia.org/wiki/REST) interface to your memcached servers or access memcached in a very efficient way from within the nginx server by means of subrequests or [independent fake requests](http://github.com/srlindsay/nginx-independent-subrequest).
+
+This module is not supposed to be merged into the Nginx core because I've used [Ragel](http://www.complang.org/ragel/) to generate the memcached response parsers (in C) for joy :)
+
+If you are going to use this module to cache location responses out of the box, try [srcache-nginx-module](http://github.com/openresty/srcache-nginx-module) with this module to achieve that.
+
+When used in conjunction with [lua-nginx-module](http://github.com/openresty/lua-nginx-module), it is recommended to use the [lua-resty-memcached](http://github.com/openresty/lua-resty-memcached) library instead of this module though, because the former is much more flexible and memory-efficient.
+
+[Back to TOC](#table-of-contents)
+
+Keep-alive connections to memcached servers
+-------------------------------------------
+
+You need [HttpUpstreamKeepaliveModule](http://wiki.nginx.org/HttpUpstreamKeepaliveModule) together with this module for keep-alive TCP connections to your backend memcached servers.
+
+Here's a sample configuration:
+
+```nginx
+
+   http {
+     upstream backend {
+       server 127.0.0.1:11211;
+
+       # a pool with at most 1024 connections
+       # and do not distinguish the servers:
+       keepalive 1024;
+     }
+
+     server {
+         ...
+         location /memc {
+             set $memc_cmd get;
+             set $memc_key $arg_key;
+             memc_pass backend;
+         }
+     }
+   }
+```
+
+[Back to TOC](#table-of-contents)
+
+How it works
+------------
+
+It implements the memcached TCP protocol all by itself, based upon the `upstream` mechanism. Everything involving I/O is non-blocking.
+
+The module itself does not keep TCP connections to the upstream memcached servers across requests, just like other upstream modules. For a working solution, see section [Keep-alive connections to memcached servers](#keep-alive-connections-to-memcached-servers).
+
+[Back to TOC](#table-of-contents)
+
+Memcached commands supported
+============================
+
+The memcached storage commands [set](#set-memc_key-memc_flags-memc_exptime-memc_value), [add](#add-memc_key-memc_flags-memc_exptime-memc_value), [replace](#replace-memc_key-memc_flags-memc_exptime-memc_value), [prepend](#prepend-memc_key-memc_flags-memc_exptime-memc_value), and [append](#append-memc_key-memc_flags-memc_exptime-memc_value) uses the `$memc_key` as the key, `$memc_exptime` as the expiration time (or delay) (defaults to 0), `$memc_flags` as the flags (defaults to 0), to build the corresponding memcached queries.
+
+If `$memc_value` is not defined at all, then the request body will be used as the value of the `$memc_value` except for the [incr](#incr-memc_key-memc_value) and [decr](#decr-memc_key-memc_value) commands. Note that if `$memc_value` is defined as an empty string (`""`), that empty string will still be used as the value as is.
+
+The following memcached commands have been implemented and tested (with their parameters marked by corresponding
+nginx variables defined by this module):
+
+[Back to TOC](#table-of-contents)
+
+get $memc_key
+-------------
+
+Retrieves the value using a key.
+
+```nginx
+
+   location /foo {
+       set $memc_cmd 'get';
+       set $memc_key 'my_key';
+
+       memc_pass 127.0.0.1:11211;
+
+       add_header X-Memc-Flags $memc_flags;
+   }
+```
+
+Returns `200 OK` with the value put into the response body if the key is found, or `404 Not Found` otherwise. The `flags` number will be set into the `$memc_flags` variable so it's often desired to put that info into the response headers by means of the standard [add_header directive](http://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header).
+
+It returns `502` for `ERROR`, `CLIENT_ERROR`, or `SERVER_ERROR`.
+
+[Back to TOC](#table-of-contents)
+
+set $memc_key $memc_flags $memc_exptime $memc_value
+---------------------------------------------------
+
+To use the request body as the memcached value, just avoid setting the `$memc_value` variable:
+
+```nginx
+
+   # POST /foo
+   # my value...
+   location /foo {
+       set $memc_cmd 'set';
+       set $memc_key 'my_key';
+       set $memc_flags 12345;
+       set $memc_exptime 24;
+
+       memc_pass 127.0.0.1:11211;
+   }
+```
+
+Or let the `$memc_value` hold the value:
+
+```nginx
+
+   location /foo {
+       set $memc_cmd 'set';
+       set $memc_key 'my_key';
+       set $memc_flags 12345;
+       set $memc_exptime 24;
+       set $memc_value 'my_value';
+
+       memc_pass 127.0.0.1:11211;
+   }
+```
+
+Returns `201 Created` if the upstream memcached server replies `STORED`, `200` for `NOT_STORED`, `404` for `NOT_FOUND`, `502` for `ERROR`, `CLIENT_ERROR`, or `SERVER_ERROR`.
+
+The original memcached responses are returned as the response body except for `404 NOT FOUND`.
+
+[Back to TOC](#table-of-contents)
+
+add $memc_key $memc_flags $memc_exptime $memc_value
+---------------------------------------------------
+
+Similar to the [set command](#set-memc_key-memc_flags-memc_exptime-memc_value).
+
+[Back to TOC](#table-of-contents)
+
+replace $memc_key $memc_flags $memc_exptime $memc_value
+-------------------------------------------------------
+
+Similar to the [set command](#set-memc_key-memc_flags-memc_exptime-memc_value).
+
+[Back to TOC](#table-of-contents)
+
+append $memc_key $memc_flags $memc_exptime $memc_value
+------------------------------------------------------
+
+Similar to the [set command](#set-memc_key-memc_flags-memc_exptime-memc_value).
+
+Note that at least memcached version 1.2.2 does not support the "append" and "prepend" commands. At least 1.2.4 and later versions seem to supports these two commands.
+
+[Back to TOC](#table-of-contents)
+
+prepend $memc_key $memc_flags $memc_exptime $memc_value
+-------------------------------------------------------
+
+Similar to the [append command](#append-memc_key-memc_flags-memc_exptime-memc_value).
+
+[Back to TOC](#table-of-contents)
+
+delete $memc_key
+----------------
+
+Deletes the memcached entry using a key.
+
+```nginx
+
+   location /foo
+       set $memc_cmd delete;
+       set $memc_key my_key;
+
+       memc_pass 127.0.0.1:11211;
+   }
+```
+
+Returns `200 OK` if deleted successfully, `404 Not Found` for `NOT_FOUND`, or `502` for `ERROR`, `CLIENT_ERROR`, or `SERVER_ERROR`.
+
+The original memcached responses are returned as the response body except for `404 NOT FOUND`.
+
+[Back to TOC](#table-of-contents)
+
+delete $memc_key $memc_exptime
+------------------------------
+
+Similar to the [delete $memc_key](#delete-memc_key) command except it accepts an optional `expiration` time specified by the `$memc_exptime` variable.
+
+This command is no longer available in the latest memcached version 1.4.4.
+
+[Back to TOC](#table-of-contents)
+
+incr $memc_key $memc_value
+--------------------------
+
+Increments the existing value of `$memc_key` by the amount specified by `$memc_value`:
+
+```nginx
+
+   location /foo {
+       set $memc_cmd incr;
+       set $memc_key my_key;
+       set $memc_value 2;
+       memc_pass 127.0.0.1:11211;
+   }
+```
+
+In the preceding example, every time we access `/foo` will cause the value of `my_key` increments by `2`.
+
+Returns `200 OK` with the new value associated with that key as the response body if successful, or `404 Not Found` if the key is not found.
+
+It returns `502` for `ERROR`, `CLIENT_ERROR`, or `SERVER_ERROR`.
+
+[Back to TOC](#table-of-contents)
+
+decr $memc_key $memc_value
+--------------------------
+
+Similar to [incr $memc_key $memc_value](#incr-memc_key-memc_value).
+
+[Back to TOC](#table-of-contents)
+
+flush_all
+---------
+
+Mark all the keys on the memcached server as expired:
+
+```nginx
+
+   location /foo {
+       set $memc_cmd flush_all;
+       memc_pass 127.0.0.1:11211;
+   }
+```
+
+[Back to TOC](#table-of-contents)
+
+flush_all $memc_exptime
+-----------------------
+
+Just like [flush_all](#flush_all) but also accepts an expiration time specified by the `$memc_exptime` variable.
+
+[Back to TOC](#table-of-contents)
+
+stats
+-----
+
+Causes the memcached server to output general-purpose statistics and settings
+
+```nginx
+
+   location /foo {
+       set $memc_cmd stats;
+       memc_pass 127.0.0.1:11211;
+   }
+```
+
+Returns `200 OK` if the request succeeds, or 502 for `ERROR`, `CLIENT_ERROR`, or `SERVER_ERROR`.
+
+The raw `stats` command output from the upstream memcached server will be put into the response body. 
+
+[Back to TOC](#table-of-contents)
+
+version
+-------
+
+Queries the memcached server's version number:
+
+```nginx
+
+   location /foo {
+       set $memc_cmd version;
+       memc_pass 127.0.0.1:11211;
+   }
+```
+
+Returns `200 OK` if the request succeeds, or 502 for `ERROR`, `CLIENT_ERROR`, or `SERVER_ERROR`.
+
+The raw `version` command output from the upstream memcached server will be put into the response body.
+
+[Back to TOC](#table-of-contents)
+
+Directives
+==========
+
+All the standard [memcached module](http://nginx.org/en/docs/http/ngx_http_memcached_module.html) directives in nginx 0.8.28 are directly inherited, with the `memcached_` prefixes replaced by `memc_`. For example, the `memcached_pass` directive is spelled `memc_pass`.
+
+Here we only document the most important two directives (the latter is a new directive introduced by this module).
+
+[Back to TOC](#table-of-contents)
+
+memc_pass
+---------
+
+**syntax:** *memc_pass &lt;memcached server IP address&gt;:&lt;memcached server port&gt;*
+
+**syntax:** *memc_pass &lt;memcached server hostname&gt;:&lt;memcached server port&gt;*
+
+**syntax:** *memc_pass &lt;upstream_backend_name&gt;*
+
+**syntax:** *memc_pass unix:&lt;path_to_unix_domain_socket&gt;*
+
+**default:** *none*
+
+**context:** *http, server, location, if*
+
+**phase:** *content*
+
+Specify the memcached server backend.
+
+[Back to TOC](#table-of-contents)
+
+memc_cmds_allowed
+-----------------
+**syntax:** *memc_cmds_allowed &lt;cmd&gt;...*
+
+**default:** *none*
+
+**context:** *http, server, location, if*
+
+Lists memcached commands that are allowed to access. By default, all the memcached commands supported by this module are accessible.
+An example is
+
+```nginx
+
+    location /foo {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:11211;
+
+        memc_cmds_allowed get;
+    }
+```
+
+[Back to TOC](#table-of-contents)
+
+memc_flags_to_last_modified
+---------------------------
+**syntax:** *memc_flags_to_last_modified on|off*
+
+**default:** *off*
+
+**context:** *http, server, location, if*
+
+Read the memcached flags as epoch seconds and set it as the value of the `Last-Modified` header. For conditional GET, it will signal nginx to return `304 Not Modified` response to save bandwidth.
+
+[Back to TOC](#table-of-contents)
+
+memc_connect_timeout
+--------------------
+**syntax:** *memc_connect_timeout &lt;time&gt;*
+
+**default:** *60s*
+
+**context:** *http, server, location*
+
+The timeout for connecting to the memcached server, in seconds by default.
+
+It's wise to always explicitly specify the time unit to avoid confusion. Time units supported are "s"(seconds), "ms"(milliseconds), "y"(years), "M"(months), "w"(weeks), "d"(days), "h"(hours), and "m"(minutes).
+
+This time must be less than 597 hours.
+
+[Back to TOC](#table-of-contents)
+
+memc_send_timeout
+-----------------
+**syntax:** *memc_send_timeout &lt;time&gt;*
+
+**default:** *60s*
+
+**context:** *http, server, location*
+
+The timeout for sending TCP requests to the memcached server, in seconds by default.
+
+It is wise to always explicitly specify the time unit to avoid confusion. Time units supported are "s"(seconds), "ms"(milliseconds), "y"(years), "M"(months), "w"(weeks), "d"(days), "h"(hours), and "m"(minutes).
+
+This time must be less than 597 hours.
+
+[Back to TOC](#table-of-contents)
+
+memc_read_timeout
+-----------------
+**syntax:** *memc_read_timeout &lt;time&gt;*
+
+**default:** *60s*
+
+**context:** *http, server, location*
+
+The timeout for reading TCP responses from the memcached server, in seconds by default.
+
+It's wise to always explicitly specify the time unit to avoid confusion. Time units supported are "s"(seconds), "ms"(milliseconds), "y"(years), "M"(months), "w"(weeks), "d"(days), "h"(hours), and "m"(minutes).
+
+This time must be less than 597 hours.
+
+[Back to TOC](#table-of-contents)
+
+memc_buffer_size
+----------------
+**syntax:** *memc_buffer_size &lt;size&gt;*
+
+**default:** *4k/8k*
+
+**context:** *http, server, location*
+
+This buffer size is used for the memory buffer to hold
+
+* the complete response for memcached commands other than `get`,
+* the complete response header (i.e., the first line of the response) for the `get` memcached command.
+
+This default size is the page size, may be `4k` or `8k`.
+
+[Back to TOC](#table-of-contents)
+
+memc_ignore_client_abort
+------------------------
+**syntax:** *memc_ignore_client_abort on|off*
+
+**default:** *off*
+
+**context:** *location*
+
+Determines whether the connection with a memcache server should be closed when a client closes a connection without waiting for a response.
+
+This directive was first added in the `v0.14` release.
+
+[Back to TOC](#table-of-contents)
+
+Installation
+============
+
+You're recommended to install this module (as well as the Nginx core and many other goodies) via the [OpenResty bundle](http://openresty.org). See the [installation steps](http://openresty.org/#Installation) for `OpenResty`.
+
+Alternatively, you can compile this module into the standard Nginx source distribution by hand:
+
+Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
+the version 1.13.6 (see [nginx compatibility](#compatibility)), and then build the source with this module:
+
+```bash
+
+ wget 'http://nginx.org/download/nginx-1.13.6.tar.gz'
+ tar -xzvf nginx-1.13.6.tar.gz
+ cd nginx-1.13.6/
+
+ # Here we assume you would install you nginx under /opt/nginx/.
+ ./configure --prefix=/opt/nginx \
+     --add-module=/path/to/memc-nginx-module
+
+ make -j2
+ make install
+```
+
+Download the latest version of the release tarball of this module from [memc-nginx-module file list](http://github.com/openresty/memc-nginx-module/tags).
+
+Starting from NGINX 1.9.11, you can also compile this module as a dynamic module, by using the `--add-dynamic-module=PATH` option instead of `--add-module=PATH` on the
+`./configure` command line above. And then you can explicitly load the module in your `nginx.conf` via the [load_module](http://nginx.org/en/docs/ngx_core_module.html#load_module)
+directive, for example,
+
+```nginx
+load_module /path/to/modules/ngx_http_memc_module.so;
+```
+
+[Back to TOC](#table-of-contents)
+
+For Developers
+--------------
+
+The memached response parsers were generated by [Ragel](http://www.complang.org/ragel/). If you want to
+regenerate the parser's C file, i.e., [src/ngx_http_memc_response.c](http://github.com/openresty/memc-nginx-module/blob/master/src/ngx_http_memc_response.c), use the following command from the root of the memc module's source tree:
+
+```bash
+
+ $ ragel -G2 src/ngx_http_memc_response.rl
+```
+
+[Back to TOC](#table-of-contents)
+
+Compatibility
+=============
+
+The following versions of Nginx should work with this module:
+
+
+* **1.17.x**                      (last tested: 1.17.4)
+* **1.16.x**
+* **1.15.x**                      (last tested: 1.15.8)
+* **1.14.x**
+* **1.13.x**                      (last tested: 1.13.6)
+* **1.12.x**
+* **1.11.x**                      (last tested: 1.11.2)
+* **1.10.x**
+* **1.9.x**                       (last tested: 1.9.15)
+* **1.8.x**
+* **1.7.x**                       (last tested: 1.7.10)
+* **1.6.x**
+* **1.5.x**                       (last tested: 1.5.12)
+* **1.4.x**                       (last tested: 1.4.4)
+* **1.2.x**                       (last tested: 1.2.9)
+* **1.1.x**                       (last tested: 1.1.5)
+* **1.0.x**                       (last tested: 1.0.10)
+* **0.9.x**                       (last tested: 0.9.4)
+* **0.8.x**                       (last tested: 0.8.54)
+* **0.7.x >= 0.7.46**             (last tested: 0.7.68)
+
+It's worth mentioning that some 0.7.x versions older than 0.7.46 might also work, but I can't easily test them because the test suite makes extensive use of the [echo module](http://github.com/openresty/echo-nginx-module)'s [echo_location directive](http://github.com/openresty/echo-nginx-module#echo_location), which requires at least nginx 0.7.46 :)
+
+Earlier versions of Nginx like 0.6.x and 0.5.x will *not* work.
+
+If you find that any particular version of Nginx above 0.7.46 does not work with this module, please consider [reporting a bug](#report-bugs).
+
+[Back to TOC](#table-of-contents)
+
+Community
+=========
+
+[Back to TOC](#table-of-contents)
+
+English Mailing List
+--------------------
+
+The [openresty-en](https://groups.google.com/group/openresty-en) mailing list is for English speakers.
+
+[Back to TOC](#table-of-contents)
+
+Chinese Mailing List
+--------------------
+
+The [openresty](https://groups.google.com/group/openresty) mailing list is for Chinese speakers.
+
+[Back to TOC](#table-of-contents)
+
+Report Bugs
+===========
+
+Although a lot of effort has been put into testing and code tuning, there must be some serious bugs lurking somewhere in this module. So whenever you are bitten by any quirks, please don't hesitate to
+
+1. create a ticket on the [issue tracking interface](http://github.com/openresty/memc-nginx-module/issues) provided by GitHub,
+1. or send a bug report or even patches to the [nginx mailing list](http://mailman.nginx.org/mailman/listinfo/nginx).
+
+[Back to TOC](#table-of-contents)
+
+Source Repository
+=================
+
+Available on github at [openresty/memc-nginx-module](http://github.com/openresty/memc-nginx-module).
+
+[Back to TOC](#table-of-contents)
+
+Changes
+=======
+
+The changes of every release of this module can be obtained from the OpenResty bundle's change logs:
+
+<http://openresty.org/#Changes>
+
+[Back to TOC](#table-of-contents)
+
+Test Suite
+==========
+
+This module comes with a Perl-driven test suite. The [test cases](http://github.com/openresty/memc-nginx-module/tree/master/t/) are
+[declarative](http://github.com/openresty/memc-nginx-module/blob/master/t/storage.t) too. Thanks to the [Test::Base](http://search.cpan.org/perldoc?Test::Base) module in the Perl world.
+
+To run it on your side:
+
+```bash
+
+ $ PATH=/path/to/your/nginx-with-memc-module:$PATH prove -r t
+```
+
+You need to terminate any Nginx processes before running the test suite if you have changed the Nginx server binary.
+
+Either [LWP::UserAgent](http://search.cpan.org/perldoc?LWP::UserAgent) or [IO::Socket](http://search.cpan.org/perldoc?IO::Socket) is used by the [test scaffold](http://github.com/openresty/memc-nginx-module/blob/master/test/lib/Test/Nginx/LWP.pm).
+
+Because a single nginx server (by default, `localhost:1984`) is used across all the test scripts (`.t` files), it's meaningless to run the test suite in parallel by specifying `-jN` when invoking the `prove` utility.
+
+You should also keep a memcached server listening on the `11211` port at localhost before running the test suite.
+
+Some parts of the test suite requires modules [rewrite](http://nginx.org/en/docs/http/ngx_http_rewrite_module.html) and [echo](http://github.com/openresty/echo-nginx-module) to be enabled as well when building Nginx.
+
+[Back to TOC](#table-of-contents)
+
+TODO
+====
+
+* add support for the memcached commands `cas`, `gets` and `stats $memc_value`.
+* add support for the `noreply` option.
+
+[Back to TOC](#table-of-contents)
+
+Getting involved
+================
+
+You'll be very welcomed to submit patches to the [author](#author) or just ask for a commit bit to the [source repository](#source-repository) on GitHub.
+
+[Back to TOC](#table-of-contents)
+
+Author
+======
+
+Yichun "agentzh" Zhang (章亦春) *&lt;agentzh@gmail.com&gt;*, OpenResty Inc.
+
+This wiki page is also maintained by the author himself, and everybody is encouraged to improve this page as well.
+
+[Back to TOC](#table-of-contents)
+
+Copyright & License
+===================
+
+The code base is borrowed directly from the standard [memcached module](http://nginx.org/en/docs/http/ngx_http_memcached_module.html) in the Nginx core. This part of code is copyrighted by Igor Sysoev and Nginx Inc.
+
+Copyright (c) 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+
+This module is licensed under the terms of the BSD license.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[Back to TOC](#table-of-contents)
+
+See Also
+========
+
+* The original announcement email on the nginx mailing list: [ngx_memc: "an extended version of ngx_memcached that supports set, add, delete, and many more commands"](http://forum.nginx.org/read.php?2,28359)
+* My slides demonstrating various ngx_memc usage: <http://agentzh.org/misc/slides/nginx-conf-scripting/nginx-conf-scripting.html#34> (use the arrow or pageup/pagedown keys on the keyboard to swith pages)
+* The latest [memcached TCP protocol](http://code.sixapart.com/svn/memcached/trunk/server/doc/protocol.txt).
+* The [ngx_srcache](http://github.com/openresty/srcache-nginx-module) module
+* The [lua-resty-memcached](https://github.com/openresty/lua-resty-memcached) library based on the [lua-nginx-module](http://github.com/openresty/lua-nginx-module) cosocket API.
+* The standard [memcached](http://nginx.org/en/docs/http/ngx_http_memcached_module.html) module.
+* The [echo module](http://github.com/openresty/echo-nginx-module) for Nginx module's automated testing.
+* The standard [headers](http://nginx.org/en/docs/http/ngx_http_headers_module.html) module and the 3rd-parth [headers-more](http://github.com/openresty/headers-more-nginx-module) module.
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/config b/modules_deb/libnginx-mod-http-memc-0.20/config
new file mode 100644
index 0000000..7e4bfd6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/config
@@ -0,0 +1,31 @@
+ngx_addon_name=ngx_http_memc_module
+
+MEMC_SRCS="                                                                 \
+        $ngx_addon_dir/src/ngx_http_memc_module.c                           \
+        $ngx_addon_dir/src/ngx_http_memc_request.c                          \
+        $ngx_addon_dir/src/ngx_http_memc_response.c                         \
+        $ngx_addon_dir/src/ngx_http_memc_util.c                             \
+        $ngx_addon_dir/src/ngx_http_memc_handler.c                          \
+        "
+
+MEMC_DEPS="                                                                 \
+        $ngx_addon_dir/src/ddebug.h                                         \
+        $ngx_addon_dir/src/ngx_http_memc_module.h                           \
+        $ngx_addon_dir/src/ngx_http_memc_request.h                          \
+        $ngx_addon_dir/src/ngx_http_memc_response.h                         \
+        $ngx_addon_dir/src/ngx_http_memc_util.h                             \
+        $ngx_addon_dir/src/ngx_http_memc_handler.h                          \
+        "
+
+if [ -n "$ngx_module_link" ]; then
+    ngx_module_type=HTTP
+    ngx_module_name=$ngx_addon_name
+    ngx_module_srcs="$MEMC_SRCS"
+    ngx_module_deps="$MEMC_DEPS"
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $MEMC_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $MEMC_DEPS"
+fi
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/changelog b/modules_deb/libnginx-mod-http-memc-0.20/debian/changelog
new file mode 100644
index 0000000..57faeca
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/changelog
@@ -0,0 +1,51 @@
+libnginx-mod-http-memc (0.20-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/control: bump Standards-Version: 4.7.2, no changes
+  * d/watch: use more generic template
+  * d/copyright: bump debian/* copyright year
+
+ -- Jan Mojžíš <janmojzis@debian.org>  Sat, 12 Apr 2025 09:05:46 +0200
+
+libnginx-mod-http-memc (0.20-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream version 0.20
+  * d/rules: Rebuild ngx_http_memc_response.c using ragel (Closes: 1025810)
+  * d/copyright: bump debian/* copyright year
+  * d/watch: use new recommended github template
+  * d/gbp.conf: add [pull] track-missing = True
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 08 Jan 2024 11:33:58 +0100
+
+libnginx-mod-http-memc (0.19-4) unstable; urgency=medium
+
+  * Team upload
+  * d/control: remove Build-Depends nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Sat, 07 Oct 2023 17:50:21 +0200
+
+libnginx-mod-http-memc (0.19-3) unstable; urgency=medium
+
+  * Team upload
+  * NEW ABI: rebuild with nginx-abi-1.24.0-1
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 28 Jun 2023 00:01:44 +0200
+
+libnginx-mod-http-memc (0.19-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/t/generic rework. The test now checks module after
+    installation/reload/restart.
+  * d/control: bump Standards-Version: 4.6.2, no changes
+  * d/copyright: reformat text to be compatible with 'cme update dpkg-copyright'
+  * d/fix.scanned.copyright: added, fixes upstream author name parsing
+  * NEW ABI: rebuild with nginx-abi-1.22.1-7
+
+ -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 12:56:30 +0100
+
+libnginx-mod-http-memc (0.19-1) unstable; urgency=medium
+
+  * Initial release. (Closes: #1025289)
+
+ -- Jérémy Lal <kapouer@melix.org>  Fri, 02 Dec 2022 00:32:56 +0100
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/control b/modules_deb/libnginx-mod-http-memc-0.20/debian/control
new file mode 100644
index 0000000..3b34393
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/control
@@ -0,0 +1,26 @@
+Source: libnginx-mod-http-memc
+Section: httpd
+Priority: optional
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
+Uploaders: Jérémy Lal <kapouer@melix.org>,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-nginx,
+               ragel,
+Standards-Version: 4.7.2
+Homepage: https://github.com/openresty/memc-nginx-module
+Vcs-Git: https://salsa.debian.org/nginx-team/libnginx-mod-http-memc.git
+Vcs-Browser: https://salsa.debian.org/nginx-team/libnginx-mod-http-memc
+Rules-Requires-Root: no
+
+Package: libnginx-mod-http-memc
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: nginx,
+Description: Extended memcached commands module for Nginx
+ This module supports almost the whole memcached ascii protocol,
+ and provides many more commands than the embedded memcached
+ module in Nginx.
+ The libnginx-mod-http-srcache-filter module can be configured to
+ use that module to cache responses.
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/copyright b/modules_deb/libnginx-mod-http-memc-0.20/debian/copyright
new file mode 100644
index 0000000..a2e9e2e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/copyright
@@ -0,0 +1,62 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: memc-nginx-module
+Upstream-Contact: Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>
+Source: https://github.com/openresty/memc-nginx-module
+
+Files: *
+Copyright: 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: config
+Copyright: 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2022-2024, Jérémy Lal <kapouer@melix.org>,
+ 2022-2025, Jan Mojzis <janmojzis@debian.org>
+License: BSD-2-clause
+
+Files: src/*
+Copyright: Yichun Zhang (agentzh)
+License: BSD-2-clause
+
+Files: src/ddebug.h
+  src/ngx_http_memc_handler.h
+Copyright: 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: src/ngx_http_memc_module.c
+Copyright: Zhang "agentzh" Yichun
+ Igor Sysoev
+License: BSD-2-clause
+
+Files: t/*
+Copyright: 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+Files: util/*
+Copyright: 2009-2018, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, OpenResty Inc.
+License: BSD-2-clause
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/fix.scanned.copyright b/modules_deb/libnginx-mod-http-memc-0.20/debian/fix.scanned.copyright
new file mode 100644
index 0000000..b25e244
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/fix.scanned.copyright
@@ -0,0 +1,2 @@
+# fixes upstream author name parsing
+! copyright Files:~/.*/ Copyright=~"s/(Zhang)\s\(.*x\{6625\}\)/$1\ (章亦春)/"
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/gbp.conf b/modules_deb/libnginx-mod-http-memc-0.20/debian/gbp.conf
new file mode 100644
index 0000000..97cd209
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/gbp.conf
@@ -0,0 +1,12 @@
+[DEFAULT]
+debian-branch = main
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+merge-mode = replace
+
+[pull]
+track-missing = True
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/rules b/modules_deb/libnginx-mod-http-memc-0.20/debian/rules
new file mode 100755
index 0000000..ec9b918
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+execute_before_dh_auto_build:
+	# rebuild ngx_http_memc_response.c using ragel
+	[ -f src/ngx_http_memc_response.c.orig ] || cp src/ngx_http_memc_response.c src/ngx_http_memc_response.c.orig
+	ragel -G2 src/ngx_http_memc_response.rl || mv -f src/ngx_http_memc_response.c.orig src/ngx_http_memc_response.c
+	diff -u src/ngx_http_memc_response.c.orig src/ngx_http_memc_response.c || :
+
+execute_after_dh_auto_build:
+	mv -f src/ngx_http_memc_response.c.orig src/ngx_http_memc_response.c
+
+%:
+	dh $@
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/source/format b/modules_deb/libnginx-mod-http-memc-0.20/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/control b/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/control
new file mode 100644
index 0000000..3c57b8b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/control
@@ -0,0 +1,14 @@
+Tests: generic
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         nginx,
+         nginx-core,
+         @,
+
+Tests: flush
+Restrictions: allow-stderr isolation-container needs-root
+Depends: curl,
+         memcached,
+         nginx,
+         nginx-core,
+         @,
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/flush b/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/flush
new file mode 100644
index 0000000..a194656
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/flush
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+cat <<EOF > "/etc/nginx/sites-enabled/default"
+server {
+  listen 80 default_server;
+
+  location /flush {
+    set \$memc_cmd flush_all;
+    memc_pass 127.0.0.1:11211;
+  }
+}
+EOF
+
+exp="OK
+response_code: 200"
+
+nginx -t
+invoke-rc.d nginx restart || { journalctl -n all -xu nginx.service; exit 1; }
+
+out=`curl --fail -w "response_code: %{http_code}\n" http://127.0.0.1/flush`
+out=`echo "${out}" | sed 's/\r//'`
+
+if [ x"${out}" != x"${exp}" ]; then
+  echo "output:"
+  echo "====================="
+  echo "${out}"
+  echo "====================="
+  echo "expected output:"
+  echo "====================="
+  echo "${exp}"
+  echo "====================="
+  exit 1
+fi
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/generic b/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/generic
new file mode 100644
index 0000000..a14fc80
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/tests/generic
@@ -0,0 +1,73 @@
+#!/bin/sh
+# version 20221215
+
+# generic test that only verifies that nginx is running with the given
+# libnginx-... module
+# - after installation
+# - after nginx reload
+# - after nginx restart
+
+EX=0
+CURL_CMD="curl --max-time 60 --silent --fail -o /dev/null"
+
+#change directory to $AUTOPKGTEST_TMP
+cd "${AUTOPKGTEST_TMP}"
+
+echo -n "curl after installation: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx reload ... "
+if invoke-rc.d nginx reload; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+
+echo -n "curl after reload: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+echo -n "nginx restart ... "
+if invoke-rc.d nginx restart; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+sleep 5
+
+echo -n "curl after restart: http status="
+if $CURL_CMD -w "response_code: %{http_code}, ... " http://127.0.0.1/; then
+  echo "OK"
+else
+  EX=1
+  echo "FAILED"
+fi
+
+if [ ${EX} -ne 0 ]; then
+  echo "=== journalctl ==="
+  journalctl -n all -xu nginx.service || :
+
+  echo "=== error.log ==="
+  if [ `wc -l /var/log/nginx/error.log | cut -d ' ' -f1` -gt 100 ]; then
+    head -n 50 /var/log/nginx/error.log
+    echo '...'
+    tail -n 50 /var/log/nginx/error.log
+  else
+    cat /var/log/nginx/error.log
+  fi
+fi
+
+exit ${EX}
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/upstream/metadata b/modules_deb/libnginx-mod-http-memc-0.20/debian/upstream/metadata
new file mode 100644
index 0000000..1f4a243
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/openresty/memc-nginx-module/issues
+Bug-Submit: https://github.com/openresty/memc-nginx-module/issues/new
+Repository-Browse: https://github.com/openresty/memc-nginx-module
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/debian/watch b/modules_deb/libnginx-mod-http-memc-0.20/debian/watch
new file mode 100644
index 0000000..81f077a
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/debian/watch
@@ -0,0 +1,6 @@
+version=4
+opts="\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|a|b)\d*)$/$1~$2/,\
+" \
+https://github.com/openresty/memc-nginx-module/tags \
+(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ddebug.h b/modules_deb/libnginx-mod-http-memc-0.20/src/ddebug.h
new file mode 100644
index 0000000..36e810e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ddebug.h
@@ -0,0 +1,75 @@
+#ifndef DDEBUG_H
+#define DDEBUG_H
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...) fprintf(stderr, "memc *** "); \
+            fprintf(stderr, __VA_ARGS__); \
+            fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
+
+#   else
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char* fmt, ...) {
+}
+
+#    endif
+
+#else
+
+#   if (NGX_HAVE_VARIADIC_MACROS)
+
+#       define dd(...)
+
+#   else
+
+#include <stdarg.h>
+
+static ngx_inline void
+dd(const char* fmt, ...) {
+}
+
+#   endif
+
+#endif
+
+#if defined(DDEBUG) && (DDEBUG)
+
+#define dd_check_read_event_handler(r)   \
+    dd("r->read_event_handler = %s", \
+        r->read_event_handler == ngx_http_block_reading ? \
+            "ngx_http_block_reading" : \
+        r->read_event_handler == ngx_http_test_reading ? \
+            "ngx_http_test_reading" : \
+        r->read_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#define dd_check_write_event_handler(r)   \
+    dd("r->write_event_handler = %s", \
+        r->write_event_handler == ngx_http_handler ? \
+            "ngx_http_handler" : \
+        r->write_event_handler == ngx_http_core_run_phases ? \
+            "ngx_http_core_run_phases" : \
+        r->write_event_handler == ngx_http_request_empty_handler ? \
+            "ngx_http_request_empty_handler" : "UNKNOWN")
+
+#else
+
+#define dd_check_read_event_handler(r)
+#define dd_check_write_event_handler(r)
+
+#endif
+
+#endif /* DDEBUG_H */
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_common.rl b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_common.rl
new file mode 100644
index 0000000..eeb61c1
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_common.rl
@@ -0,0 +1,44 @@
+%%{
+    machine memc_common;
+
+    action catch_err {
+        dd("caught error...");
+        dd("machine state: %d", cs);
+
+        *status_addr = NGX_HTTP_BAD_GATEWAY;
+    }
+
+    msg = any* -- "\r\n";
+
+    error_helper = "ERROR\r\n"
+                 | "CLIENT_ERROR " msg "\r\n"
+                 | "SERVER_ERROR " msg "\r\n"
+                 ;
+
+    error = error_helper @catch_err
+          ;
+
+    action finalize {
+        dd("done it!");
+        *done_addr = 1;
+    }
+
+    action check {
+        dd("state %d, left %d, reading char '%c'", cs,
+        (int) (pe - p), *p);
+    }
+
+    action handle_stored {
+        dd("status set to 201");
+
+        *status_addr = NGX_HTTP_CREATED;
+    }
+
+    action handle_not_found {
+        dd("status set to 404");
+
+        *status_addr = NGX_HTTP_NOT_FOUND;
+    }
+
+}%%
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_delete.rl b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_delete.rl
new file mode 100644
index 0000000..1e01b05
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_delete.rl
@@ -0,0 +1,17 @@
+%%{
+    machine memc_delete;
+
+    alphtype short;
+
+    include memc_common "memc_common.rl";
+
+    response = "DELETED\r\n"
+             | "NOT_FOUND\r\n" @handle_not_found
+             | error
+             ;
+
+    main := response @finalize
+         ;
+
+}%%
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_flush_all.rl b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_flush_all.rl
new file mode 100644
index 0000000..74c7288
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_flush_all.rl
@@ -0,0 +1,16 @@
+%%{
+    machine memc_flush_all;
+
+    alphtype short;
+
+    include memc_common "memc_common.rl";
+
+    response = "OK\r\n"
+             | error
+             ;
+
+    main := response @finalize
+         ;
+
+}%%
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_incr_decr.rl b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_incr_decr.rl
new file mode 100644
index 0000000..b4b13a5
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_incr_decr.rl
@@ -0,0 +1,20 @@
+%%{
+    machine memc_incr_decr;
+
+    alphtype short;
+
+    include memc_common "memc_common.rl";
+
+    value = digit+
+          ;
+
+    response = value " "* "\r\n" @handle_stored
+             | "NOT_FOUND\r\n" @handle_not_found
+             | error
+             ;
+
+    main := response @finalize $check
+         ;
+
+}%%
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_stats.rl b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_stats.rl
new file mode 100644
index 0000000..9526b77
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_stats.rl
@@ -0,0 +1,22 @@
+%%{
+    machine memc_stats;
+
+    alphtype short;
+
+    include memc_common "memc_common.rl";
+
+    content = any+ - "\r\n"
+            ;
+
+    stat_line = "STAT " content "\r\n"
+              ;
+
+    response = stat_line* "END\r\n"
+             | error
+             ;
+
+    main := response @finalize
+         ;
+
+}%%
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_storage.rl b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_storage.rl
new file mode 100644
index 0000000..b64a441
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_storage.rl
@@ -0,0 +1,17 @@
+%%{
+    machine memc_storage;
+
+    include memc_common "memc_common.rl";
+
+    response = "STORED\r\n" @handle_stored
+             | "NOT_STORED\r\n"
+             | "EXISTS\r\n"
+             | "NOT_FOUND\r\n" @handle_not_found
+             | error
+             ;
+
+    main := response @finalize
+         ;
+
+}%%
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/memc_version.rl b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_version.rl
new file mode 100644
index 0000000..3a85b59
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/memc_version.rl
@@ -0,0 +1,19 @@
+%%{
+    machine memc_version;
+
+    alphtype short;
+
+    include memc_common "memc_common.rl";
+
+    version = any+ - "\r\n"
+            ;
+
+    response = "VERSION " version "\r\n"
+             | error
+             ;
+
+    main := response @finalize
+         ;
+
+}%%
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.c b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.c
new file mode 100644
index 0000000..0236242
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.c
@@ -0,0 +1,612 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_memc_handler.h"
+#include "ngx_http_memc_module.h"
+#include "ngx_http_memc_request.h"
+#include "ngx_http_memc_response.h"
+#include "ngx_http_memc_util.h"
+
+
+static ngx_int_t ngx_http_memc_flags_as_http_time_variable(
+    ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data);
+
+
+static ngx_http_variable_t ngx_http_memc_variables[] = {
+
+    { ngx_string("memc_flags_as_http_time"), NULL,
+      ngx_http_memc_flags_as_http_time_variable, 0,
+      0, 0 },
+
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
+};
+
+
+static ngx_str_t  ngx_http_memc_key = ngx_string("memc_key");
+static ngx_str_t  ngx_http_memc_cmd = ngx_string("memc_cmd");
+static ngx_str_t  ngx_http_memc_value = ngx_string("memc_value");
+static ngx_str_t  ngx_http_memc_flags = ngx_string("memc_flags");
+static ngx_str_t  ngx_http_memc_exptime = ngx_string("memc_exptime");
+
+
+static ngx_int_t ngx_http_memc_add_more_variables(ngx_conf_t *cf);
+static ngx_int_t ngx_http_memc_variable_not_found(ngx_http_request_t *r,
+        ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_memc_add_variable(ngx_conf_t *cf, ngx_str_t *name);
+static ngx_flag_t ngx_http_memc_in_cmds_allowed(ngx_http_memc_loc_conf_t *mlcf,
+        ngx_http_memc_cmd_t memc_cmd);
+static ngx_int_t ngx_http_memc_reinit_request(ngx_http_request_t *r);
+static void ngx_http_memc_abort_request(ngx_http_request_t *r);
+static void ngx_http_memc_finalize_request(ngx_http_request_t *r,
+    ngx_int_t rc);
+static ngx_flag_t ngx_http_memc_valid_uint32_str(u_char *data, size_t len);
+static ngx_flag_t ngx_http_memc_valid_uint64_str(u_char *data, size_t len);
+
+
+ngx_int_t
+ngx_http_memc_handler(ngx_http_request_t *r)
+{
+    ngx_int_t                       rc;
+    ngx_http_upstream_t            *u;
+    ngx_http_memc_ctx_t            *ctx;
+    ngx_http_memc_loc_conf_t       *mlcf;
+    ngx_http_memc_main_conf_t      *mmcf;
+    ngx_str_t                       target;
+    ngx_url_t                       url;
+
+    ngx_http_variable_value_t      *cmd_vv;
+    ngx_http_variable_value_t      *key_vv;
+    ngx_http_variable_value_t      *value_vv;
+    ngx_http_variable_value_t      *flags_vv;
+    ngx_http_variable_value_t      *exptime_vv;
+
+    ngx_http_memc_cmd_t             memc_cmd;
+    ngx_flag_t                      is_storage_cmd = 0;
+
+    dd("memc handler");
+
+    mmcf = ngx_http_get_module_main_conf(r, ngx_http_memc_module);
+
+    key_vv = ngx_http_get_indexed_variable(r, mmcf->key_index);
+    if (key_vv == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    cmd_vv = ngx_http_get_indexed_variable(r, mmcf->cmd_index);
+    if (cmd_vv == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    if (cmd_vv->not_found || cmd_vv->len == 0) {
+        dd("variable $memc_cmd not found");
+        cmd_vv->not_found = 0;
+        cmd_vv->valid = 1;
+        cmd_vv->no_cacheable = 0;
+
+        if (r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD)) {
+            cmd_vv->len = sizeof("get") - 1;
+            cmd_vv->data = (u_char *) "get";
+            memc_cmd = ngx_http_memc_cmd_get;
+
+        } else if (r->method == NGX_HTTP_POST) {
+            cmd_vv->len = sizeof("add") - 1;
+            cmd_vv->data = (u_char *) "add";
+            memc_cmd = ngx_http_memc_cmd_add;
+            is_storage_cmd = 1;
+
+        } else if (r->method == NGX_HTTP_PUT) {
+            cmd_vv->len = sizeof("set") - 1;
+            cmd_vv->data = (u_char *) "set";
+            memc_cmd = ngx_http_memc_cmd_set;
+            is_storage_cmd = 1;
+
+        } else if (r->method == NGX_HTTP_DELETE) {
+            cmd_vv->len = sizeof("delete") - 1;
+            cmd_vv->data = (u_char *) "delete";
+            memc_cmd = ngx_http_memc_cmd_delete;
+
+        } else {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "ngx_memc: $memc_cmd variable not found for HTTP "
+                          "%V requests", &r->method_name);
+
+            return NGX_HTTP_BAD_REQUEST;
+        }
+
+    } else {
+
+        memc_cmd = ngx_http_memc_parse_cmd(cmd_vv->data, cmd_vv->len,
+                                           &is_storage_cmd);
+
+        if (memc_cmd == ngx_http_memc_cmd_unknown) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "ngx_memc: unknown $memc_cmd \"%v\"", cmd_vv);
+            return NGX_HTTP_BAD_REQUEST;
+        }
+    }
+
+    mlcf = ngx_http_get_module_loc_conf(r, ngx_http_memc_module);
+
+    dd("XXX connect timeout %d", (int) mlcf->upstream.connect_timeout);
+
+    if (!ngx_http_memc_in_cmds_allowed(mlcf, memc_cmd)) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "ngx_memc: memcached command \"%v\" not allowed",
+                      cmd_vv);
+
+        return NGX_HTTP_FORBIDDEN;
+    }
+
+    if (ngx_http_set_content_type(r) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+#if defined(nginx_version) &&                                                \
+    ((nginx_version >= 7063 && nginx_version < 8000)                         \
+     || nginx_version >= 8007)
+
+    if (ngx_http_upstream_create(r) != NGX_OK) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    u = r->upstream;
+
+#else /* 0.7.x < 0.7.63, 0.8.x < 0.8.7 */
+
+    u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));
+    if (u == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    u->peer.log = r->connection->log;
+    u->peer.log_error = NGX_ERROR_ERR;
+#  if (NGX_THREADS)
+    u->peer.lock = &r->connection->lock;
+#  endif
+
+    r->upstream = u;
+
+#endif
+
+    if (mlcf->complex_target) {
+        /* variables used in the memc_pass directive */
+        if (ngx_http_complex_value(r, mlcf->complex_target, &target)
+            != NGX_OK)
+        {
+            dd("failed to compile");
+            return NGX_ERROR;
+        }
+
+        if (target.len == 0) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "memc: handler: empty \"memc_pass\" target");
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        url.host = target;
+        url.port = 0;
+        url.no_resolve = 1;
+
+        mlcf->upstream.upstream = ngx_http_memc_upstream_add(r, &url);
+
+        if (mlcf->upstream.upstream == NULL) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "memc: upstream \"%V\" not found", &target);
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+    }
+
+    u->schema.len = sizeof("memcached://") - 1;
+    u->schema.data = (u_char *) "memcached://";
+
+    u->output.tag = (ngx_buf_tag_t) &ngx_http_memc_module;
+
+    u->conf = &mlcf->upstream;
+
+    ctx = ngx_palloc(r->pool, sizeof(ngx_http_memc_ctx_t));
+    if (ctx == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    ctx->body_length = 0;
+    ctx->memc_key_vv = key_vv;
+    ctx->memc_value_vv = NULL;
+    ctx->memc_flags_vv = NULL;
+
+    ctx->parser_state = NGX_ERROR;
+
+    ctx->rest = NGX_HTTP_MEMC_END;
+    ctx->request = r;
+
+    ctx->cmd_str.data = cmd_vv->data;
+    ctx->cmd_str.len  = cmd_vv->len;
+
+    ctx->cmd = memc_cmd;
+
+    ctx->is_storage_cmd = is_storage_cmd;
+
+    ngx_http_set_ctx(r, ctx, ngx_http_memc_module);
+
+    if (is_storage_cmd) {
+        u->create_request = ngx_http_memc_create_storage_cmd_request;
+        u->process_header = ngx_http_memc_process_simple_header;
+
+        u->input_filter_init = ngx_http_memc_empty_filter_init;
+        u->input_filter = ngx_http_memc_empty_filter;
+
+    } else if (memc_cmd == ngx_http_memc_cmd_get) {
+        u->create_request = ngx_http_memc_create_get_cmd_request;
+        u->process_header = ngx_http_memc_process_get_cmd_header;
+
+        u->input_filter_init = ngx_http_memc_get_cmd_filter_init;
+        u->input_filter = ngx_http_memc_get_cmd_filter;
+
+    } else if (memc_cmd == ngx_http_memc_cmd_flush_all) {
+        u->create_request = ngx_http_memc_create_flush_all_cmd_request;
+        u->process_header = ngx_http_memc_process_simple_header;
+
+        u->input_filter_init = ngx_http_memc_empty_filter_init;
+        u->input_filter = ngx_http_memc_empty_filter;
+
+    } else if (memc_cmd == ngx_http_memc_cmd_version
+               || memc_cmd == ngx_http_memc_cmd_stats)
+    {
+        u->create_request = ngx_http_memc_create_noarg_cmd_request;
+        u->process_header = ngx_http_memc_process_simple_header;
+
+        u->input_filter_init = ngx_http_memc_empty_filter_init;
+        u->input_filter = ngx_http_memc_empty_filter;
+
+    } else if (memc_cmd == ngx_http_memc_cmd_delete) {
+        u->create_request = ngx_http_memc_create_delete_cmd_request;
+        u->process_header = ngx_http_memc_process_simple_header;
+
+        u->input_filter_init = ngx_http_memc_empty_filter_init;
+        u->input_filter = ngx_http_memc_empty_filter;
+
+    } else if (memc_cmd == ngx_http_memc_cmd_incr
+               || memc_cmd == ngx_http_memc_cmd_decr)
+    {
+        u->create_request = ngx_http_memc_create_incr_decr_cmd_request;
+        u->process_header = ngx_http_memc_process_simple_header;
+
+        u->input_filter_init = ngx_http_memc_empty_filter_init;
+        u->input_filter = ngx_http_memc_empty_filter;
+
+    } else {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "assertion failed: command \"%v\" does not have proper "
+                      "handlers.", cmd_vv);
+
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    u->reinit_request = ngx_http_memc_reinit_request;
+    u->abort_request = ngx_http_memc_abort_request;
+    u->finalize_request = ngx_http_memc_finalize_request;
+
+    u->input_filter_ctx = ctx;
+
+    if (is_storage_cmd
+        || memc_cmd == ngx_http_memc_cmd_flush_all
+        || memc_cmd == ngx_http_memc_cmd_delete)
+    {
+        exptime_vv = ngx_http_get_indexed_variable(r, mmcf->exptime_index);
+
+        if (exptime_vv == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        ctx->memc_exptime_vv = exptime_vv;
+
+        if (!exptime_vv->not_found
+            && exptime_vv->len
+            && !ngx_http_memc_valid_uint32_str(exptime_vv->data,
+                                               exptime_vv->len))
+        {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "variable \"$memc_exptime\" takes invalid value: %v",
+                          exptime_vv);
+
+            return NGX_HTTP_BAD_REQUEST;
+        }
+    }
+
+    if (is_storage_cmd || memc_cmd == ngx_http_memc_cmd_get) {
+        flags_vv = ngx_http_get_indexed_variable(r, mmcf->flags_index);
+        if (flags_vv == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        ctx->memc_flags_vv = flags_vv;
+
+        if (is_storage_cmd
+            && !flags_vv->not_found
+            && flags_vv->len
+            && !ngx_http_memc_valid_uint32_str(flags_vv->data, flags_vv->len))
+        {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "variable \"$memc_flags\" takes invalid value: %v",
+                          flags_vv);
+
+            return NGX_HTTP_BAD_REQUEST;
+        }
+    }
+
+    if (is_storage_cmd
+        || memc_cmd == ngx_http_memc_cmd_incr
+        || memc_cmd == ngx_http_memc_cmd_decr)
+    {
+        value_vv = ngx_http_get_indexed_variable(r, mmcf->value_index);
+        if (value_vv == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        if (memc_cmd == ngx_http_memc_cmd_incr
+            || memc_cmd == ngx_http_memc_cmd_decr)
+        {
+            if (value_vv->not_found || value_vv->len == 0) {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "the \"$memc_value\" variable is required for "
+                              "command \"%V\"", &ctx->cmd_str);
+
+                return NGX_HTTP_BAD_REQUEST;
+            }
+
+            if (!ngx_http_memc_valid_uint64_str(value_vv->data,
+                                                value_vv->len))
+            {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "variable \"$memc_value\" is invalid for "
+                              "incr/decr: %v", value_vv);
+
+                return NGX_HTTP_BAD_REQUEST;
+            }
+        }
+
+        ctx->memc_value_vv = value_vv;
+    }
+
+    rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init);
+
+    if (rc == NGX_ERROR || rc > NGX_OK) {
+        return rc;
+    }
+
+    return NGX_DONE;
+}
+
+
+static ngx_int_t
+ngx_http_memc_reinit_request(ngx_http_request_t *r)
+{
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_memc_abort_request(ngx_http_request_t *r)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "abort http memcached request");
+    return;
+}
+
+
+static void
+ngx_http_memc_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
+{
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "finalize http memcached request");
+    return;
+}
+
+
+static ngx_flag_t
+ngx_http_memc_in_cmds_allowed(ngx_http_memc_loc_conf_t *mlcf,
+    ngx_http_memc_cmd_t memc_cmd)
+{
+    ngx_uint_t                   i;
+    ngx_http_memc_cmd_t         *value;
+
+    if (mlcf->cmds_allowed == NULL || mlcf->cmds_allowed->nelts == 0) {
+        /* by default, all the memcached commands supported are allowed. */
+        return 1;
+    }
+
+    value = mlcf->cmds_allowed->elts;
+
+    for (i = 0; i < mlcf->cmds_allowed->nelts; i++) {
+        if (memc_cmd == value[i]) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+
+static ngx_flag_t
+ngx_http_memc_valid_uint32_str(u_char *data, size_t len)
+{
+    u_char              *p, *last;
+
+    if (len > NGX_UINT32_LEN) {
+        return 0;
+    }
+
+    last = data + len;
+    for (p = data; p != last; p++) {
+        if (*p < '0' || *p > '9') {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+
+static ngx_flag_t
+ngx_http_memc_valid_uint64_str(u_char *data, size_t len)
+{
+    u_char              *p, *last;
+
+    if (len > NGX_UINT64_LEN) {
+        return 0;
+    }
+
+    last = data + len;
+    for (p = data; p != last; p++) {
+        if (*p < '0' || *p > '9') {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+
+ngx_int_t
+ngx_http_memc_init(ngx_conf_t *cf)
+{
+    ngx_http_memc_main_conf_t       *mmcf;
+
+    mmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_memc_module);
+
+    if (!mmcf->module_used) {
+        return NGX_OK;
+    }
+
+    mmcf->key_index = ngx_http_memc_add_variable(cf, &ngx_http_memc_key);
+    if (mmcf->key_index == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    mmcf->cmd_index = ngx_http_memc_add_variable(cf, &ngx_http_memc_cmd);
+    if (mmcf->cmd_index == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    mmcf->flags_index = ngx_http_memc_add_variable(cf, &ngx_http_memc_flags);
+    if (mmcf->flags_index == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    mmcf->exptime_index = ngx_http_memc_add_variable(cf,
+                                                     &ngx_http_memc_exptime);
+    if (mmcf->exptime_index == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    mmcf->value_index = ngx_http_memc_add_variable(cf, &ngx_http_memc_value);
+    if (mmcf->value_index == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    return ngx_http_memc_add_more_variables(cf);
+}
+
+
+static ngx_int_t
+ngx_http_memc_add_variable(ngx_conf_t *cf, ngx_str_t *name)
+{
+    ngx_http_variable_t         *v;
+
+    v = ngx_http_add_variable(cf, name, NGX_HTTP_VAR_CHANGEABLE);
+    if (v == NULL) {
+        return NGX_ERROR;
+    }
+
+    v->get_handler = ngx_http_memc_variable_not_found;
+    return ngx_http_get_variable_index(cf, name);
+}
+
+
+static ngx_int_t
+ngx_http_memc_variable_not_found(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    v->not_found = 1;
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_memc_add_more_variables(ngx_conf_t *cf)
+{
+    ngx_http_variable_t *var, *v;
+    for (v = ngx_http_memc_variables; v->name.len; v++) {
+        var = ngx_http_add_variable(cf, &v->name, v->flags);
+        if (var == NULL) {
+            return NGX_ERROR;
+        }
+        var->get_handler = v->get_handler;
+        var->data = v->data;
+    }
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_memc_flags_as_http_time_variable(
+    ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data)
+{
+    u_char                      *p;
+    size_t                       len;
+    time_t                       flags_time = 0;
+    ngx_http_memc_ctx_t         *ctx;
+
+    ngx_http_variable_value_t   *flags_vv;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    flags_vv = ctx->memc_flags_vv;
+    if (flags_vv == NULL) {
+        goto not_found;
+    }
+
+    if (flags_vv->not_found || flags_vv->len == 0) {
+        goto not_found;
+    }
+
+    flags_time = ngx_atotm(flags_vv->data, flags_vv->len);
+    if (flags_time == NGX_ERROR) {
+        return NGX_ERROR;
+    }
+
+    len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1;
+
+    p = ngx_pnalloc(r->pool, len);
+    if (p == NULL) {
+        return NGX_ERROR;
+    }
+
+    ngx_http_time(p, flags_time);
+
+    v->len = len;
+    v->data = p;
+
+    v->valid = 1;
+    v->not_found = 0;
+    v->no_cacheable = 0;
+
+    return NGX_OK;
+
+not_found:
+
+    v->len = 0;
+    v->data = NULL;
+    v->valid = 1;
+    v->not_found = 1;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.h b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.h
new file mode 100644
index 0000000..cd63c4c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_handler.h
@@ -0,0 +1,13 @@
+#ifndef NGX_HTTP_MEMC_HANDLER_H
+#define NGX_HTTP_MEMC_HANDLER_H
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+ngx_int_t ngx_http_memc_handler(ngx_http_request_t *r);
+ngx_int_t ngx_http_memc_init(ngx_conf_t *cf);
+
+
+#endif /* NGX_HTTP_MEMC_HANDLER_H */
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.c b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.c
new file mode 100644
index 0000000..5b534d2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.c
@@ -0,0 +1,404 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) Zhang "agentzh" Yichun
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+
+#include "ddebug.h"
+#include "ngx_http_memc_module.h"
+#include "ngx_http_memc_handler.h"
+#include "ngx_http_memc_util.h"
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+static void *ngx_http_memc_create_loc_conf(ngx_conf_t *cf);
+static char *ngx_http_memc_merge_loc_conf(ngx_conf_t *cf, void *parent,
+    void *child);
+static char *ngx_http_memc_cmds_allowed(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_http_memc_pass(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
+static char *ngx_http_memc_upstream_max_fails_unsupported(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static char *ngx_http_memc_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf);
+static void *ngx_http_memc_create_main_conf(ngx_conf_t *cf);
+
+
+static ngx_conf_bitmask_t  ngx_http_memc_next_upstream_masks[] = {
+    { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
+    { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
+    { ngx_string("invalid_response"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
+    { ngx_string("not_found"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
+    { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
+    { ngx_null_string, 0 }
+};
+
+
+static ngx_command_t  ngx_http_memc_commands[] = {
+
+    { ngx_string("memc_cmds_allowed"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF
+          |NGX_HTTP_LIF_CONF|NGX_CONF_1MORE,
+      ngx_http_memc_cmds_allowed,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("memc_pass"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+      ngx_http_memc_pass,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("memc_connect_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_memc_loc_conf_t, upstream.connect_timeout),
+      NULL },
+
+    { ngx_string("memc_send_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_memc_loc_conf_t, upstream.send_timeout),
+      NULL },
+
+    { ngx_string("memc_read_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_memc_loc_conf_t, upstream.read_timeout),
+      NULL },
+
+    { ngx_string("memc_buffer_size"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_memc_loc_conf_t, upstream.buffer_size),
+      NULL },
+
+    { ngx_string("memc_next_upstream"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_conf_set_bitmask_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_memc_loc_conf_t, upstream.next_upstream),
+      &ngx_http_memc_next_upstream_masks },
+
+    { ngx_string("memc_upstream_max_fails"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_memc_upstream_max_fails_unsupported,
+      0,
+      0,
+      NULL },
+
+    { ngx_string("memc_upstream_fail_timeout"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_http_memc_upstream_fail_timeout_unsupported,
+      0,
+      0,
+      NULL },
+
+    { ngx_string("memc_flags_to_last_modified"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_memc_loc_conf_t, flags_to_last_modified),
+      NULL },
+
+    { ngx_string("memc_ignore_client_abort"),
+      NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_memc_loc_conf_t, upstream.ignore_client_abort),
+      NULL },
+
+      ngx_null_command
+};
+
+
+static ngx_http_module_t  ngx_http_memc_module_ctx = {
+    NULL,                                  /* preconfiguration */
+    ngx_http_memc_init,                    /* postconfiguration */
+
+    ngx_http_memc_create_main_conf,        /* create main configuration */
+    NULL,                                  /* init main configuration */
+
+    NULL,                                  /* create server configuration */
+    NULL,                                  /* merge server configuration */
+
+    ngx_http_memc_create_loc_conf,    /* create location configration */
+    ngx_http_memc_merge_loc_conf      /* merge location configration */
+};
+
+
+ngx_module_t  ngx_http_memc_module = {
+    NGX_MODULE_V1,
+    &ngx_http_memc_module_ctx,        /* module context */
+    ngx_http_memc_commands,           /* module directives */
+    NGX_HTTP_MODULE,                       /* module type */
+    NULL,                                  /* init master */
+    NULL,                                  /* init module */
+    NULL,                                  /* init process */
+    NULL,                                  /* init thread */
+    NULL,                                  /* exit thread */
+    NULL,                                  /* exit process */
+    NULL,                                  /* exit master */
+    NGX_MODULE_V1_PADDING
+};
+
+
+static void *
+ngx_http_memc_create_loc_conf(ngx_conf_t *cf)
+{
+    ngx_http_memc_loc_conf_t  *conf;
+
+    conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_memc_loc_conf_t));
+    if (conf == NULL) {
+        return NULL;
+    }
+
+    /*
+     * set by ngx_pcalloc():
+     *
+     *     conf->cmds_allowed = NULL;
+     *     conf->upstream.bufs.num = 0;
+     *     conf->upstream.next_upstream = 0;
+     *     conf->upstream.temp_path = NULL;
+     *     conf->upstream.uri = { 0, NULL };
+     *     conf->upstream.location = NULL;
+     */
+
+    conf->flags_to_last_modified = NGX_CONF_UNSET;
+
+    conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
+    conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
+    conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
+
+    conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE;
+
+    conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
+
+    /* the hardcoded values */
+    conf->upstream.cyclic_temp_file = 0;
+    conf->upstream.buffering = 0;
+    conf->upstream.send_lowat = 0;
+    conf->upstream.bufs.num = 0;
+    conf->upstream.busy_buffers_size = 0;
+    conf->upstream.max_temp_file_size = 0;
+    conf->upstream.temp_file_write_size = 0;
+    conf->upstream.intercept_errors = 1;
+    conf->upstream.intercept_404 = 1;
+    conf->upstream.pass_request_headers = 0;
+    conf->upstream.pass_request_body = 0;
+
+    return conf;
+}
+
+
+static char *
+ngx_http_memc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
+{
+    ngx_http_memc_loc_conf_t *prev = parent;
+    ngx_http_memc_loc_conf_t *conf = child;
+
+    ngx_conf_merge_value(conf->flags_to_last_modified,
+                         prev->flags_to_last_modified, 0);
+
+    ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
+                              prev->upstream.connect_timeout, 60000);
+
+    ngx_conf_merge_msec_value(conf->upstream.send_timeout,
+                              prev->upstream.send_timeout, 60000);
+
+    ngx_conf_merge_msec_value(conf->upstream.read_timeout,
+                              prev->upstream.read_timeout, 60000);
+
+    ngx_conf_merge_size_value(conf->upstream.buffer_size,
+                              prev->upstream.buffer_size,
+                              (size_t) ngx_pagesize);
+
+    ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
+                                 prev->upstream.next_upstream,
+                                 (NGX_CONF_BITMASK_SET
+                                  |NGX_HTTP_UPSTREAM_FT_ERROR
+                                  |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
+
+    if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
+        conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
+                                       |NGX_HTTP_UPSTREAM_FT_OFF;
+    }
+
+    if (conf->upstream.upstream == NULL) {
+        conf->upstream.upstream = prev->upstream.upstream;
+    }
+
+    if (conf->cmds_allowed == NULL) {
+        conf->cmds_allowed = prev->cmds_allowed;
+    }
+
+    ngx_conf_merge_value(conf->upstream.ignore_client_abort,
+                         prev->upstream.ignore_client_abort, 0);
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_memc_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_memc_loc_conf_t    *mlcf = conf;
+    ngx_http_memc_main_conf_t   *mmcf;
+
+    ngx_str_t                 *value;
+    ngx_url_t                  url;
+    ngx_http_core_loc_conf_t  *clcf;
+    ngx_uint_t                 n;
+
+    ngx_http_compile_complex_value_t         ccv;
+
+    if (mlcf->upstream.upstream) {
+        return "is duplicate";
+    }
+
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
+    clcf->handler = ngx_http_memc_handler;
+
+    if (clcf->name.data[clcf->name.len - 1] == '/') {
+        clcf->auto_redirect = 1;
+    }
+
+    mmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_memc_module);
+    mmcf->module_used = 1;
+
+    value = cf->args->elts;
+
+    n = ngx_http_script_variables_count(&value[1]);
+    if (n) {
+        mlcf->complex_target = ngx_palloc(cf->pool,
+                                          sizeof(ngx_http_complex_value_t));
+        if (mlcf->complex_target == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+        ccv.cf = cf;
+        ccv.value = &value[1];
+        ccv.complex_value = mlcf->complex_target;
+
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
+
+        return NGX_CONF_OK;
+    }
+
+    mlcf->complex_target = NULL;
+
+    ngx_memzero(&url, sizeof(ngx_url_t));
+
+    url.url = value[1];
+    url.no_resolve = 1;
+
+    mlcf->upstream.upstream = ngx_http_upstream_add(cf, &url, 0);
+    if (mlcf->upstream.upstream == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static char *
+ngx_http_memc_upstream_max_fails_unsupported(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf)
+{
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "\"memc_upstream_max_fails\" is not supported, "
+                       "use the \"max_fails\" parameter of the \"server\" "
+                       "directive inside the \"upstream\" block");
+
+    return NGX_CONF_ERROR;
+}
+
+
+static char *
+ngx_http_memc_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
+    ngx_command_t *cmd, void *conf)
+{
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                       "\"memc_upstream_fail_timeout\" is not supported, "
+                       "use the \"fail_timeout\" parameter of the \"server\" "
+                       "directive inside the \"upstream\" block");
+
+    return NGX_CONF_ERROR;
+}
+
+static char *
+ngx_http_memc_cmds_allowed(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_http_memc_loc_conf_t *mlcf = conf;
+
+    ngx_uint_t                 i;
+    ngx_str_t                 *value;
+    ngx_http_memc_cmd_t        memc_cmd;
+    ngx_http_memc_cmd_t       *c;
+    ngx_flag_t                 is_storage_cmd;
+
+    value = cf->args->elts;
+
+    mlcf->cmds_allowed = ngx_array_create(cf->pool, cf->args->nelts - 1,
+                                          sizeof(ngx_http_memc_cmd_t));
+
+    if (mlcf->cmds_allowed == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    for (i = 1; i < cf->args->nelts; i++) {
+        memc_cmd = ngx_http_memc_parse_cmd(value[i].data, value[i].len,
+                                           &is_storage_cmd);
+
+        if (memc_cmd == ngx_http_memc_cmd_unknown) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "Unknown memcached command \"%V\" used in "
+                               "\"memc_cmds_allowed\"", &value[i]);
+
+            return NGX_CONF_ERROR;
+        }
+
+        c = ngx_array_push(mlcf->cmds_allowed);
+        if (c == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        *c = memc_cmd;
+    }
+
+    return NGX_CONF_OK;
+}
+
+
+static void *
+ngx_http_memc_create_main_conf(ngx_conf_t *cf)
+{
+    ngx_http_memc_main_conf_t    *mmcf;
+
+    mmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_memc_main_conf_t));
+    if (mmcf == NULL) {
+        return NULL;
+    }
+
+    return mmcf;
+}
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.h b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.h
new file mode 100644
index 0000000..bea4578
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_module.h
@@ -0,0 +1,98 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_MEMC_MODULE_H
+#define NGX_HTTP_MEMC_MODULE_H
+
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include <nginx.h>
+
+
+typedef enum {
+    ngx_http_memc_cmd_set,
+    ngx_http_memc_cmd_add,
+    ngx_http_memc_cmd_replace,
+    ngx_http_memc_cmd_append,
+    ngx_http_memc_cmd_prepend,
+    /* ngx_http_memc_cmd_cas, */
+
+    ngx_http_memc_cmd_get,
+    /* ngx_http_memc_cmd_gets, */
+
+    ngx_http_memc_cmd_delete,
+
+    ngx_http_memc_cmd_incr,
+    ngx_http_memc_cmd_decr,
+
+    ngx_http_memc_cmd_stats,
+
+    ngx_http_memc_cmd_flush_all,
+    ngx_http_memc_cmd_version,
+    /* ngx_http_memc_cmd_verbosity, */
+
+    /* we do not want to support the "quit" command here */
+    /* ngx_http_memc_cmd_quit, */
+
+    ngx_http_memc_cmd_unknown
+} ngx_http_memc_cmd_t;
+
+
+typedef struct {
+    ngx_flag_t                       flags_to_last_modified;
+    ngx_http_upstream_conf_t         upstream;
+    ngx_array_t                     *cmds_allowed;
+    ngx_http_complex_value_t        *complex_target;
+
+} ngx_http_memc_loc_conf_t;
+
+
+typedef struct {
+    ngx_int_t       key_index;
+    ngx_int_t       cmd_index;
+    ngx_int_t       value_index;
+    ngx_int_t       flags_index;
+    ngx_int_t       exptime_index;
+    ngx_int_t       module_used;
+} ngx_http_memc_main_conf_t;
+
+
+typedef struct {
+#if defined(nginx_version) && nginx_version >= 1001004
+    off_t                      rest;
+#else
+    size_t                     rest;
+#endif
+
+    ngx_http_request_t        *request;
+    ngx_str_t                  key;
+
+    ngx_str_t                  cmd_str;
+    ngx_http_memc_cmd_t        cmd;
+
+    ngx_http_variable_value_t  *memc_value_vv;
+    ngx_http_variable_value_t  *memc_key_vv;
+    ngx_http_variable_value_t  *memc_flags_vv;
+    ngx_http_variable_value_t  *memc_exptime_vv;
+
+    ngx_flag_t                 is_storage_cmd;
+
+    int                        parser_state;
+
+    /* just for the subrequests in memory support */
+    size_t                     body_length;
+
+} ngx_http_memc_ctx_t;
+
+
+extern ngx_module_t  ngx_http_memc_module;
+
+
+#define NGX_HTTP_MEMC_END   (sizeof(CRLF "END" CRLF) - 1)
+
+
+#endif /* NGX_HTTP_MEMC_MODULE_H */
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.c b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.c
new file mode 100644
index 0000000..482a001
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.c
@@ -0,0 +1,571 @@
+
+/*
+ * Copyright (c) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_memc_request.h"
+#include "ngx_http_memc_module.h"
+#include "ngx_http_memc_util.h"
+
+
+ngx_int_t
+ngx_http_memc_create_storage_cmd_request(ngx_http_request_t *r)
+{
+    size_t                          len;
+    off_t                           bytes;
+    size_t                          bytes_len;
+    uintptr_t                       escape;
+    ngx_buf_t                      *b;
+    ngx_chain_t                    *cl, *in;
+    ngx_chain_t                   **ll;
+    ngx_http_memc_ctx_t            *ctx;
+
+    ngx_http_variable_value_t      *key_vv;
+    ngx_http_variable_value_t      *flags_vv;
+    ngx_http_variable_value_t      *exptime_vv;
+    ngx_http_variable_value_t      *memc_value_vv;
+
+    u_char                          bytes_buf[NGX_UINT32_LEN];
+
+    /* TODO add support for the "cas" command */
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    /* prepare the "key" argument */
+
+    key_vv = ctx->memc_key_vv;
+
+    if (key_vv == NULL || key_vv->not_found || key_vv->len == 0) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "the \"$memc_key\" variable is not set");
+        return NGX_ERROR;
+    }
+
+    escape = 2 * ngx_escape_uri(NULL, key_vv->data, key_vv->len,
+                                NGX_ESCAPE_MEMCACHED);
+
+    /* prepare the "bytes" argument */
+
+    if (ctx->memc_value_vv && !ctx->memc_value_vv->not_found) {
+        dd("found variable $memc_value");
+
+        memc_value_vv = ctx->memc_value_vv;
+
+        bytes = memc_value_vv->len;
+
+    } else if (r->request_body == NULL || r->request_body->bufs == NULL) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "neither the \"$memc_value\" variable "
+                      "nor the request body is available");
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+
+    } else {
+        memc_value_vv = NULL;
+
+        bytes = 0;
+        for (cl = r->request_body->bufs; cl; cl = cl->next) {
+            bytes += ngx_buf_size(cl->buf);
+        }
+    }
+
+    bytes_len = ngx_snprintf(bytes_buf, sizeof(bytes_buf), "%O", bytes)
+        - bytes_buf;
+
+    /* prepare the "flags" argument */
+
+    flags_vv = ctx->memc_flags_vv;
+
+    if (flags_vv == NULL) {
+        return NGX_ERROR;
+    }
+
+    if (flags_vv->not_found) {
+        flags_vv->not_found = 0;
+        flags_vv->valid = 1;
+        flags_vv->no_cacheable = 0;
+        flags_vv->len = sizeof("0") - 1;
+        flags_vv->data = (u_char *) "0";
+    } else if (flags_vv->len == 0) {
+        flags_vv->len = sizeof("0") - 1;
+        flags_vv->data = (u_char *) "0";
+    }
+
+    /* prepare the "exptime" argument */
+
+    exptime_vv = ctx->memc_exptime_vv;
+
+    if (exptime_vv == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    if (exptime_vv->not_found || exptime_vv->len == 0) {
+        dd("setting exptime to its default value 0...");
+
+        exptime_vv->not_found = 0;
+        exptime_vv->valid = 1;
+        exptime_vv->no_cacheable = 0;
+        exptime_vv->len = sizeof("0") - 1;
+        exptime_vv->data = (u_char *) "0";
+    }
+
+    /* calculate the total length of the command */
+
+    len = ctx->cmd_str.len + sizeof(" ") - 1
+        + key_vv->len + escape + sizeof(" ") - 1
+        + flags_vv->len + sizeof(" ") - 1
+        + exptime_vv->len + sizeof(" ") - 1
+        + bytes_len
+        + sizeof(CRLF) - 1;
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    ll = &cl->next;
+
+    r->upstream->request_bufs = cl;
+
+    /* copy the memcached command over */
+
+    b->last = ngx_copy(b->last, ctx->cmd_str.data, ctx->cmd_str.len);
+
+    *b->last++ = ' ';
+
+    /* copy the memcached key over */
+
+    ctx->key.data = b->last;
+
+    if (escape == 0) {
+        b->last = ngx_copy(b->last, key_vv->data, key_vv->len);
+
+    } else {
+        b->last = (u_char *) ngx_escape_uri(b->last, key_vv->data, key_vv->len,
+                                            NGX_ESCAPE_MEMCACHED);
+    }
+
+    ctx->key.len = b->last - ctx->key.data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http memcached request: \"%V\"", &ctx->key);
+
+    *b->last++ = ' ';
+
+    /* copy the memcached flags over */
+
+    b->last = ngx_copy(b->last, flags_vv->data, flags_vv->len);
+
+    *b->last++ = ' ';
+
+    /* copy the memcached exptime over */
+
+    b->last = ngx_copy(b->last, exptime_vv->data, exptime_vv->len);
+
+    *b->last++ = ' ';
+
+    /* copy the memcached bytes over */
+
+    b->last = ngx_copy(b->last, bytes_buf, bytes_len);
+
+    *b->last++ = CR; *b->last++ = LF;
+
+    if (memc_value_vv) {
+        if (memc_value_vv->len) {
+            dd("copy $memc_value to the request");
+            b = ngx_calloc_buf(r->pool);
+
+            if (b == NULL) {
+                return NGX_ERROR;
+            }
+
+            b->memory = 1;
+
+            b->start = b->pos = memc_value_vv->data;
+            b->last  = b->end = b->start + memc_value_vv->len;
+
+            cl = ngx_alloc_chain_link(r->pool);
+            if (cl == NULL) {
+                return NGX_ERROR;
+            }
+
+            cl->buf = b;
+            cl->next = NULL;
+
+            *ll = cl;
+            ll = &cl->next;
+        }
+
+    } else {
+        /* to preserve the r->request_body->bufs untouched */
+
+        in = r->request_body->bufs;
+
+        while (in) {
+            cl = ngx_alloc_chain_link(r->pool);
+            if (cl == NULL) {
+                return NGX_ERROR;
+            }
+
+            cl->buf = ngx_calloc_buf(r->pool);
+            if (cl->buf == NULL) {
+                return NGX_ERROR;
+            }
+
+            cl->buf->memory = 1;
+            *cl->buf = *in->buf;
+
+            *ll = cl;
+            ll = &cl->next;
+            in = in->next;
+        }
+    }
+
+    /* append the trailing CRLF */
+
+    b = ngx_calloc_buf(r->pool);
+
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    b->start = b->pos = (u_char *) CRLF;
+    b->last  = b->end = b->start + sizeof(CRLF) - 1;
+
+    b->memory = 1;
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    *ll = cl;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_create_get_cmd_request(ngx_http_request_t *r)
+{
+    size_t                          len;
+    uintptr_t                       escape;
+    ngx_buf_t                      *b;
+    ngx_chain_t                    *cl;
+    ngx_http_memc_ctx_t            *ctx;
+    ngx_http_variable_value_t      *vv;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    vv = ctx->memc_key_vv;
+
+    if (vv == NULL || vv->not_found || vv->len == 0) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "the \"$memc_key\" variable is not set");
+        return NGX_ERROR;
+    }
+
+    escape = 2 * ngx_escape_uri(NULL, vv->data, vv->len, NGX_ESCAPE_MEMCACHED);
+
+    len = sizeof("get ") - 1 + vv->len + escape + sizeof(CRLF) - 1;
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    r->upstream->request_bufs = cl;
+
+    *b->last++ = 'g'; *b->last++ = 'e'; *b->last++ = 't'; *b->last++ = ' ';
+
+    ctx->key.data = b->last;
+
+    if (escape == 0) {
+        b->last = ngx_copy(b->last, vv->data, vv->len);
+
+    } else {
+        b->last = (u_char *) ngx_escape_uri(b->last, vv->data, vv->len,
+                                            NGX_ESCAPE_MEMCACHED);
+    }
+
+    ctx->key.len = b->last - ctx->key.data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http memcached request: \"%V\"", &ctx->key);
+
+    *b->last++ = CR; *b->last++ = LF;
+
+    ctx->parser_state = NGX_ERROR;
+
+    return NGX_OK;
+}
+
+ngx_int_t
+ngx_http_memc_create_noarg_cmd_request(ngx_http_request_t *r)
+{
+    size_t                          len;
+    ngx_buf_t                      *b;
+    ngx_http_memc_ctx_t            *ctx;
+    ngx_chain_t                    *cl;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    len = ctx->cmd_str.len + sizeof(CRLF) - 1;
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    r->upstream->request_bufs = cl;
+
+    b->last = ngx_copy(b->last, ctx->cmd_str.data, ctx->cmd_str.len);
+
+    *b->last++ = CR; *b->last++ = LF;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_create_flush_all_cmd_request(ngx_http_request_t *r)
+{
+    size_t                          len;
+    ngx_buf_t                      *b;
+    ngx_http_memc_ctx_t            *ctx;
+    ngx_chain_t                    *cl;
+    ngx_http_variable_value_t      *exptime_vv;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    /* prepare the (optional) "exptime" argument */
+
+    exptime_vv = ctx->memc_exptime_vv;
+
+    if (exptime_vv == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    len = ctx->cmd_str.len;
+
+    if (!exptime_vv->not_found && exptime_vv->len) {
+        dd("found exptime: %s", exptime_vv->data);
+
+        len += sizeof(" ") - 1 + exptime_vv->len;
+    }
+
+    len += sizeof(CRLF) - 1;
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    r->upstream->request_bufs = cl;
+
+    b->last = ngx_copy(b->last, ctx->cmd_str.data, ctx->cmd_str.len);
+
+    if (!exptime_vv->not_found && exptime_vv->len) {
+        *b->last++ = ' ';
+        b->last = ngx_copy(b->last, exptime_vv->data, exptime_vv->len);
+    }
+
+    *b->last++ = CR; *b->last++ = LF;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_create_delete_cmd_request(ngx_http_request_t *r)
+{
+    size_t                          len;
+    ngx_buf_t                      *b;
+    ngx_http_memc_ctx_t            *ctx;
+    ngx_chain_t                    *cl;
+    uintptr_t                       escape;
+    ngx_http_variable_value_t      *key_vv;
+    ngx_http_variable_value_t      *exptime_vv;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    /* prepare the "key" argument */
+
+    key_vv = ctx->memc_key_vv;
+
+    if (key_vv == NULL || key_vv->not_found || key_vv->len == 0) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "the \"$memc_key\" variable is not set");
+        return NGX_ERROR;
+    }
+
+    escape = 2 * ngx_escape_uri(NULL, key_vv->data, key_vv->len,
+                                NGX_ESCAPE_MEMCACHED);
+
+    /* prepare the (optional) "exptime" argument */
+
+    exptime_vv = ctx->memc_exptime_vv;
+
+    if (exptime_vv == NULL) {
+        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    len = ctx->cmd_str.len + sizeof(" ") - 1 + key_vv->len + escape;
+
+    if (!exptime_vv->not_found && exptime_vv->len) {
+        dd("found exptime: %s", exptime_vv->data);
+
+        len += sizeof(" ") - 1 + exptime_vv->len;
+    }
+
+    len += sizeof(CRLF) - 1;
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    r->upstream->request_bufs = cl;
+
+    b->last = ngx_copy(b->last, ctx->cmd_str.data, ctx->cmd_str.len);
+
+    *b->last++ = ' ';
+
+    if (escape == 0) {
+        b->last = ngx_copy(b->last, key_vv->data, key_vv->len);
+
+    } else {
+        b->last = (u_char *) ngx_escape_uri(b->last, key_vv->data, key_vv->len,
+                                            NGX_ESCAPE_MEMCACHED);
+    }
+
+    if (!exptime_vv->not_found && exptime_vv->len) {
+        *b->last++ = ' ';
+        b->last = ngx_copy(b->last, exptime_vv->data, exptime_vv->len);
+    }
+
+    *b->last++ = CR; *b->last++ = LF;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_create_incr_decr_cmd_request(ngx_http_request_t *r)
+{
+    size_t                          len;
+    ngx_buf_t                      *b;
+    ngx_http_memc_ctx_t            *ctx;
+    ngx_chain_t                    *cl;
+    uintptr_t                       escape;
+    ngx_http_variable_value_t      *key_vv;
+    ngx_http_variable_value_t      *value_vv;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    /* prepare the "key" argument */
+
+    key_vv = ctx->memc_key_vv;
+
+    if (key_vv == NULL || key_vv->not_found || key_vv->len == 0) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "the \"$memc_key\" variable is not set");
+        return NGX_ERROR;
+    }
+
+    escape = 2 * ngx_escape_uri(NULL, key_vv->data, key_vv->len,
+                                NGX_ESCAPE_MEMCACHED);
+
+    /* prepare the "value" argument */
+
+    value_vv = ctx->memc_value_vv;
+
+    /* XXX validate if $memc_value_vv is a valid uint64 string */
+
+    len = ctx->cmd_str.len + sizeof(" ") - 1 + key_vv->len + escape
+        + sizeof(" ") - 1 + value_vv->len + sizeof(CRLF) - 1;
+
+    b = ngx_create_temp_buf(r->pool, len);
+    if (b == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl = ngx_alloc_chain_link(r->pool);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf = b;
+    cl->next = NULL;
+
+    r->upstream->request_bufs = cl;
+
+    b->last = ngx_copy(b->last, ctx->cmd_str.data, ctx->cmd_str.len);
+
+    *b->last++ = ' ';
+
+    if (escape == 0) {
+        b->last = ngx_copy(b->last, key_vv->data, key_vv->len);
+
+    } else {
+        b->last = (u_char *) ngx_escape_uri(b->last, key_vv->data, key_vv->len,
+                                            NGX_ESCAPE_MEMCACHED);
+    }
+
+    *b->last++ = ' ';
+
+    b->last = ngx_copy(b->last, value_vv->data, value_vv->len);
+
+    *b->last++ = CR; *b->last++ = LF;
+
+    return NGX_OK;
+}
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.h b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.h
new file mode 100644
index 0000000..10e74c6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_request.h
@@ -0,0 +1,27 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_MEMC_REQUEST_H
+#define NGX_HTTP_MEMC_REQUEST_H
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+ngx_int_t ngx_http_memc_create_get_cmd_request(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_memc_create_storage_cmd_request(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_memc_create_noarg_cmd_request(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_memc_create_flush_all_cmd_request(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_memc_create_delete_cmd_request(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_memc_create_incr_decr_cmd_request(ngx_http_request_t *r);
+
+
+#endif /* NGX_HTTP_MEMC_REQUEST_H */
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.c b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.c
new file mode 100644
index 0000000..5f702e7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.c
@@ -0,0 +1,1914 @@
+
+#line 1 "src/ngx_http_memc_response.rl"
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_memc_response.h"
+#include "ngx_http_memc_module.h"
+
+
+#ifdef s_char
+#undef s_char
+#endif
+
+#define s_char signed char
+
+
+
+#line 24 "src/ngx_http_memc_response.rl"
+
+#line 29 "src/ngx_http_memc_response.c"
+static const char _memc_storage_key_offsets[] = {
+	0, 0, 4, 5, 6, 7, 8, 9, 
+	10, 11, 12, 13, 14, 15, 16, 17, 
+	19, 21, 22, 23, 24, 25, 26, 27, 
+	28, 29, 30, 31, 32, 33, 34, 35, 
+	37, 38, 39, 40, 41, 42, 43, 44, 
+	45, 46, 47, 48, 50, 51, 52, 53, 
+	54, 55, 56, 57, 58, 59, 60
+};
+
+static const char _memc_storage_trans_keys[] = {
+	67, 69, 78, 83, 76, 73, 69, 78, 
+	84, 95, 69, 82, 82, 79, 82, 32, 
+	13, 10, 13, 82, 88, 82, 79, 82, 
+	13, 10, 73, 83, 84, 83, 13, 10, 
+	79, 84, 95, 70, 83, 79, 85, 78, 
+	68, 13, 10, 84, 79, 82, 69, 68, 
+	69, 84, 82, 86, 69, 82, 79, 82, 
+	69, 68, 13, 10, 0
+};
+
+static const char _memc_storage_single_lengths[] = {
+	0, 4, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 2, 
+	2, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 2, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 2, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 0
+};
+
+static const char _memc_storage_range_lengths[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0
+};
+
+static const unsigned char _memc_storage_index_offsets[] = {
+	0, 0, 5, 7, 9, 11, 13, 15, 
+	17, 19, 21, 23, 25, 27, 29, 31, 
+	34, 37, 39, 41, 43, 45, 47, 49, 
+	51, 53, 55, 57, 59, 61, 63, 65, 
+	68, 70, 72, 74, 76, 78, 80, 82, 
+	84, 86, 88, 90, 93, 95, 97, 99, 
+	101, 103, 105, 107, 109, 111, 113
+};
+
+static const char _memc_storage_trans_targs[] = {
+	2, 16, 28, 43, 0, 3, 0, 4, 
+	0, 5, 0, 6, 0, 7, 0, 8, 
+	0, 9, 0, 10, 0, 11, 0, 12, 
+	0, 13, 0, 14, 0, 15, 14, 54, 
+	15, 14, 17, 22, 0, 18, 0, 19, 
+	0, 20, 0, 21, 0, 54, 0, 23, 
+	0, 24, 0, 25, 0, 26, 0, 27, 
+	0, 54, 0, 29, 0, 30, 0, 31, 
+	0, 32, 38, 0, 33, 0, 34, 0, 
+	35, 0, 36, 0, 37, 0, 54, 0, 
+	39, 0, 40, 0, 41, 0, 42, 0, 
+	26, 0, 44, 48, 0, 45, 0, 46, 
+	0, 47, 0, 7, 0, 49, 0, 50, 
+	0, 51, 0, 52, 0, 53, 0, 54, 
+	0, 0, 0
+};
+
+static const char _memc_storage_trans_actions[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 1, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 1, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 2, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 3, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 4, 
+	0, 0, 0
+};
+
+static const int memc_storage_start = 1;
+static const int memc_storage_first_final = 54;
+static const int memc_storage_error = 0;
+
+
+
+#line 25 "src/ngx_http_memc_response.rl"
+
+
+#line 27 "src/ngx_http_memc_response.rl"
+
+#line 129 "src/ngx_http_memc_response.c"
+static const char _memc_flush_all_key_offsets[] = {
+	0, 0, 4, 5, 6, 7, 8, 9, 
+	10, 11, 12, 13, 14, 15, 16, 17, 
+	19, 20, 21, 22, 23, 24, 25, 26, 
+	27, 28, 29, 30, 31, 32, 33
+};
+
+static const short _memc_flush_all_trans_keys[] = {
+	67, 69, 79, 83, 76, 73, 69, 78, 
+	84, 95, 69, 82, 82, 79, 82, 32, 
+	13, 10, 13, 82, 82, 79, 82, 13, 
+	10, 75, 13, 10, 69, 82, 86, 69, 
+	82, 0
+};
+
+static const char _memc_flush_all_single_lengths[] = {
+	0, 4, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 2, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 0
+};
+
+static const char _memc_flush_all_range_lengths[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0
+};
+
+static const char _memc_flush_all_index_offsets[] = {
+	0, 0, 5, 7, 9, 11, 13, 15, 
+	17, 19, 21, 23, 25, 27, 29, 31, 
+	34, 36, 38, 40, 42, 44, 46, 48, 
+	50, 52, 54, 56, 58, 60, 62
+};
+
+static const char _memc_flush_all_indicies[] = {
+	0, 2, 3, 4, 1, 5, 1, 6, 
+	1, 7, 1, 8, 1, 9, 1, 10, 
+	1, 11, 1, 12, 1, 13, 1, 14, 
+	1, 15, 1, 16, 1, 17, 16, 18, 
+	17, 16, 19, 1, 20, 1, 21, 1, 
+	22, 1, 23, 1, 18, 1, 24, 1, 
+	25, 1, 26, 1, 27, 1, 28, 1, 
+	29, 1, 30, 1, 9, 1, 1, 0
+};
+
+static const char _memc_flush_all_trans_targs[] = {
+	2, 0, 16, 22, 25, 3, 4, 5, 
+	6, 7, 8, 9, 10, 11, 12, 13, 
+	14, 15, 30, 17, 18, 19, 20, 21, 
+	23, 24, 30, 26, 27, 28, 29
+};
+
+static const char _memc_flush_all_trans_actions[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 1, 0, 0, 0, 0, 0, 
+	0, 0, 2, 0, 0, 0, 0
+};
+
+static const int memc_flush_all_start = 1;
+static const int memc_flush_all_first_final = 30;
+static const int memc_flush_all_error = 0;
+
+
+
+#line 28 "src/ngx_http_memc_response.rl"
+
+
+#line 30 "src/ngx_http_memc_response.rl"
+
+#line 203 "src/ngx_http_memc_response.c"
+static const char _memc_version_key_offsets[] = {
+	0, 0, 4, 5, 6, 7, 8, 9, 
+	10, 11, 12, 13, 14, 15, 16, 17, 
+	19, 20, 21, 22, 23, 24, 25, 26, 
+	27, 28, 29, 30, 31, 32, 33, 34, 
+	35, 36, 37, 38, 39, 41, 43, 43, 
+	43
+};
+
+static const short _memc_version_trans_keys[] = {
+	67, 69, 83, 86, 76, 73, 69, 78, 
+	84, 95, 69, 82, 82, 79, 82, 32, 
+	13, 10, 13, 82, 82, 79, 82, 13, 
+	10, 69, 82, 86, 69, 82, 69, 82, 
+	83, 73, 79, 78, 32, 13, 13, 10, 
+	13, 10, 13, 13, 0
+};
+
+static const char _memc_version_single_lengths[] = {
+	0, 4, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 2, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 2, 2, 0, 0, 
+	1
+};
+
+static const char _memc_version_range_lengths[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0
+};
+
+static const char _memc_version_index_offsets[] = {
+	0, 0, 5, 7, 9, 11, 13, 15, 
+	17, 19, 21, 23, 25, 27, 29, 31, 
+	34, 36, 38, 40, 42, 44, 46, 48, 
+	50, 52, 54, 56, 58, 60, 62, 64, 
+	66, 68, 70, 72, 74, 77, 80, 81, 
+	82
+};
+
+static const char _memc_version_indicies[] = {
+	0, 2, 3, 4, 1, 5, 1, 6, 
+	1, 7, 1, 8, 1, 9, 1, 10, 
+	1, 11, 1, 12, 1, 13, 1, 14, 
+	1, 15, 1, 16, 1, 17, 16, 18, 
+	17, 16, 19, 1, 20, 1, 21, 1, 
+	22, 1, 23, 1, 18, 1, 24, 1, 
+	25, 1, 26, 1, 27, 1, 9, 1, 
+	28, 1, 29, 1, 30, 1, 31, 1, 
+	32, 1, 33, 1, 34, 1, 36, 35, 
+	37, 35, 38, 37, 35, 39, 37, 35, 
+	35, 1, 37, 35, 0
+};
+
+static const char _memc_version_trans_targs[] = {
+	2, 0, 16, 22, 27, 3, 4, 5, 
+	6, 7, 8, 9, 10, 11, 12, 13, 
+	14, 15, 39, 17, 18, 19, 20, 21, 
+	23, 24, 25, 26, 28, 29, 30, 31, 
+	32, 33, 34, 35, 37, 36, 40, 38
+};
+
+static const char _memc_version_trans_actions[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 1, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 2, 0
+};
+
+static const int memc_version_start = 1;
+static const int memc_version_first_final = 39;
+static const int memc_version_error = 0;
+
+
+
+#line 31 "src/ngx_http_memc_response.rl"
+
+
+#line 33 "src/ngx_http_memc_response.rl"
+
+#line 291 "src/ngx_http_memc_response.c"
+static const char _memc_stats_key_offsets[] = {
+	0, 0, 3, 4, 5, 6, 7, 8, 
+	9, 10, 11, 12, 13, 14, 15, 16, 
+	18, 20, 21, 22, 23, 24, 25, 26, 
+	27, 28, 30, 31, 32, 33, 34, 35, 
+	36, 37, 38, 39, 41, 43, 45, 47, 
+	48, 50, 52, 52, 52
+};
+
+static const short _memc_stats_trans_keys[] = {
+	67, 69, 83, 76, 73, 69, 78, 84, 
+	95, 69, 82, 82, 79, 82, 32, 13, 
+	10, 13, 78, 82, 68, 13, 10, 82, 
+	79, 82, 13, 10, 69, 84, 82, 86, 
+	69, 82, 65, 84, 32, 13, 13, 10, 
+	13, 13, 69, 13, 78, 13, 68, 13, 
+	10, 13, 10, 13, 13, 69, 0
+};
+
+static const char _memc_stats_single_lengths[] = {
+	0, 3, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 2, 
+	2, 1, 1, 1, 1, 1, 1, 1, 
+	1, 2, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 2, 2, 2, 2, 1, 
+	2, 2, 0, 0, 2
+};
+
+static const char _memc_stats_range_lengths[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0
+};
+
+static const unsigned char _memc_stats_index_offsets[] = {
+	0, 0, 4, 6, 8, 10, 12, 14, 
+	16, 18, 20, 22, 24, 26, 28, 30, 
+	33, 36, 38, 40, 42, 44, 46, 48, 
+	50, 52, 55, 57, 59, 61, 63, 65, 
+	67, 69, 71, 73, 76, 79, 82, 85, 
+	87, 90, 93, 94, 95
+};
+
+static const char _memc_stats_indicies[] = {
+	0, 2, 3, 1, 4, 1, 5, 1, 
+	6, 1, 7, 1, 8, 1, 9, 1, 
+	10, 1, 11, 1, 12, 1, 13, 1, 
+	14, 1, 15, 1, 16, 15, 17, 16, 
+	15, 18, 19, 1, 20, 1, 21, 1, 
+	22, 1, 23, 1, 24, 1, 25, 1, 
+	26, 1, 17, 1, 27, 28, 1, 29, 
+	1, 30, 1, 31, 1, 8, 1, 32, 
+	1, 33, 1, 34, 1, 36, 35, 37, 
+	35, 38, 37, 35, 37, 39, 35, 37, 
+	40, 35, 37, 41, 35, 42, 35, 43, 
+	37, 35, 44, 37, 35, 35, 1, 37, 
+	39, 35, 0
+};
+
+static const char _memc_stats_trans_targs[] = {
+	2, 0, 16, 25, 3, 4, 5, 6, 
+	7, 8, 9, 10, 11, 12, 13, 14, 
+	15, 43, 17, 20, 18, 19, 43, 21, 
+	22, 23, 24, 26, 30, 27, 28, 29, 
+	31, 32, 33, 34, 41, 35, 36, 37, 
+	38, 39, 40, 44, 42
+};
+
+static const char _memc_stats_trans_actions[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 1, 0, 0, 0, 0, 2, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 2, 0
+};
+
+static const int memc_stats_start = 1;
+static const int memc_stats_first_final = 43;
+static const int memc_stats_error = 0;
+
+
+
+#line 34 "src/ngx_http_memc_response.rl"
+
+
+#line 36 "src/ngx_http_memc_response.rl"
+
+#line 384 "src/ngx_http_memc_response.c"
+static const char _memc_delete_key_offsets[] = {
+	0, 0, 5, 6, 7, 8, 9, 10, 
+	11, 12, 13, 14, 15, 16, 17, 18, 
+	20, 21, 22, 23, 24, 25, 26, 27, 
+	28, 29, 30, 31, 32, 33, 34, 35, 
+	36, 37, 38, 39, 40, 41, 42, 43, 
+	44, 45, 46, 47, 48, 49
+};
+
+static const short _memc_delete_trans_keys[] = {
+	67, 68, 69, 78, 83, 76, 73, 69, 
+	78, 84, 95, 69, 82, 82, 79, 82, 
+	32, 13, 10, 13, 69, 76, 69, 84, 
+	69, 68, 13, 10, 82, 82, 79, 82, 
+	13, 10, 79, 84, 95, 70, 79, 85, 
+	78, 68, 13, 10, 69, 82, 86, 69, 
+	82, 0
+};
+
+static const char _memc_delete_single_lengths[] = {
+	0, 5, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 2, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 0
+};
+
+static const char _memc_delete_range_lengths[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0
+};
+
+static const unsigned char _memc_delete_index_offsets[] = {
+	0, 0, 6, 8, 10, 12, 14, 16, 
+	18, 20, 22, 24, 26, 28, 30, 32, 
+	35, 37, 39, 41, 43, 45, 47, 49, 
+	51, 53, 55, 57, 59, 61, 63, 65, 
+	67, 69, 71, 73, 75, 77, 79, 81, 
+	83, 85, 87, 89, 91, 93
+};
+
+static const char _memc_delete_trans_targs[] = {
+	2, 16, 24, 30, 40, 0, 3, 0, 
+	4, 0, 5, 0, 6, 0, 7, 0, 
+	8, 0, 9, 0, 10, 0, 11, 0, 
+	12, 0, 13, 0, 14, 0, 15, 14, 
+	45, 15, 14, 17, 0, 18, 0, 19, 
+	0, 20, 0, 21, 0, 22, 0, 23, 
+	0, 45, 0, 25, 0, 26, 0, 27, 
+	0, 28, 0, 29, 0, 45, 0, 31, 
+	0, 32, 0, 33, 0, 34, 0, 35, 
+	0, 36, 0, 37, 0, 38, 0, 39, 
+	0, 45, 0, 41, 0, 42, 0, 43, 
+	0, 44, 0, 7, 0, 0, 0
+};
+
+static const char _memc_delete_trans_actions[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	1, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 2, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 1, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 3, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0
+};
+
+static const int memc_delete_start = 1;
+static const int memc_delete_first_final = 45;
+static const int memc_delete_error = 0;
+
+
+
+#line 37 "src/ngx_http_memc_response.rl"
+
+
+#line 39 "src/ngx_http_memc_response.rl"
+
+#line 473 "src/ngx_http_memc_response.c"
+static const char _memc_incr_decr_key_offsets[] = {
+	0, 0, 6, 10, 11, 13, 14, 15, 
+	16, 17, 18, 19, 20, 21, 22, 23, 
+	24, 25, 26, 28, 29, 30, 31, 32, 
+	33, 34, 35, 36, 37, 38, 39, 40, 
+	41, 42, 43, 44, 45, 46, 47, 48, 
+	49
+};
+
+static const short _memc_incr_decr_trans_keys[] = {
+	67, 69, 78, 83, 48, 57, 13, 32, 
+	48, 57, 10, 13, 32, 76, 73, 69, 
+	78, 84, 95, 69, 82, 82, 79, 82, 
+	32, 13, 10, 13, 82, 82, 79, 82, 
+	13, 10, 79, 84, 95, 70, 79, 85, 
+	78, 68, 13, 10, 69, 82, 86, 69, 
+	82, 0
+};
+
+static const char _memc_incr_decr_single_lengths[] = {
+	0, 4, 2, 1, 2, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 2, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	0
+};
+
+static const char _memc_incr_decr_range_lengths[] = {
+	0, 1, 1, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0
+};
+
+static const char _memc_incr_decr_index_offsets[] = {
+	0, 0, 6, 10, 12, 15, 17, 19, 
+	21, 23, 25, 27, 29, 31, 33, 35, 
+	37, 39, 41, 44, 46, 48, 50, 52, 
+	54, 56, 58, 60, 62, 64, 66, 68, 
+	70, 72, 74, 76, 78, 80, 82, 84, 
+	86
+};
+
+static const char _memc_incr_decr_indicies[] = {
+	2, 3, 4, 5, 0, 1, 6, 7, 
+	0, 1, 8, 1, 6, 7, 1, 9, 
+	1, 10, 1, 11, 1, 12, 1, 13, 
+	1, 14, 1, 15, 1, 16, 1, 17, 
+	1, 18, 1, 19, 1, 20, 1, 21, 
+	20, 22, 21, 20, 23, 1, 24, 1, 
+	25, 1, 26, 1, 27, 1, 22, 1, 
+	28, 1, 29, 1, 30, 1, 31, 1, 
+	32, 1, 33, 1, 34, 1, 35, 1, 
+	36, 1, 37, 1, 38, 1, 39, 1, 
+	40, 1, 41, 1, 13, 1, 1, 0
+};
+
+static const char _memc_incr_decr_trans_targs[] = {
+	2, 0, 5, 19, 25, 35, 3, 4, 
+	40, 6, 7, 8, 9, 10, 11, 12, 
+	13, 14, 15, 16, 17, 18, 40, 20, 
+	21, 22, 23, 24, 26, 27, 28, 29, 
+	30, 31, 32, 33, 34, 40, 36, 37, 
+	38, 39
+};
+
+static const char _memc_incr_decr_trans_actions[] = {
+	1, 0, 1, 1, 1, 1, 1, 1, 
+	2, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 3, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 4, 1, 1, 
+	1, 1
+};
+
+static const int memc_incr_decr_start = 1;
+static const int memc_incr_decr_first_final = 40;
+static const int memc_incr_decr_error = 0;
+
+
+
+#line 40 "src/ngx_http_memc_response.rl"
+
+
+u_char  ngx_http_memc_end[] = CRLF "END" CRLF;
+
+
+static u_char *parse_memc_storage(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_flush_all(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_version(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_stats(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_delete(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_incr_decr(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static ngx_int_t ngx_http_memc_write_simple_response(ngx_http_request_t *r,
+        ngx_http_upstream_t *u, ngx_http_memc_ctx_t *ctx,
+        ngx_uint_t status, ngx_str_t *resp);
+
+
+ngx_int_t
+ngx_http_memc_process_simple_header(ngx_http_request_t *r)
+{
+    ngx_int_t                rc;
+    int                      cs;
+    s_char                  *p;
+    s_char                  *pe;
+    s_char                  *orig;
+    ngx_str_t                resp;
+    ngx_http_upstream_t     *u;
+    ngx_http_memc_ctx_t     *ctx;
+    ngx_uint_t               status;
+    unsigned                 done = 0;
+    int                      error_state;
+    int                      final_state;
+
+    status = NGX_HTTP_OK;
+
+    dd("process simple cmd header");
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    if (ctx->parser_state == NGX_ERROR) {
+        dd("reinit state");
+
+        if (ctx->is_storage_cmd) {
+            dd("init memc_storage machine...");
+
+            
+#line 91 "src/ngx_http_memc_response.rl"
+            
+#line 613 "src/ngx_http_memc_response.c"
+	{
+	cs = memc_storage_start;
+	}
+
+#line 92 "src/ngx_http_memc_response.rl"
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_flush_all) {
+            dd("init memc_flush_all machine...");
+
+            
+#line 97 "src/ngx_http_memc_response.rl"
+            
+#line 626 "src/ngx_http_memc_response.c"
+	{
+	cs = memc_flush_all_start;
+	}
+
+#line 98 "src/ngx_http_memc_response.rl"
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_version) {
+            dd("init memc_version machine...");
+
+            
+#line 103 "src/ngx_http_memc_response.rl"
+            
+#line 639 "src/ngx_http_memc_response.c"
+	{
+	cs = memc_version_start;
+	}
+
+#line 104 "src/ngx_http_memc_response.rl"
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_stats) {
+            dd("init memc_stats machine...");
+
+            
+#line 109 "src/ngx_http_memc_response.rl"
+            
+#line 652 "src/ngx_http_memc_response.c"
+	{
+	cs = memc_stats_start;
+	}
+
+#line 110 "src/ngx_http_memc_response.rl"
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_delete) {
+            dd("init memc_delete machine...");
+
+            
+#line 115 "src/ngx_http_memc_response.rl"
+            
+#line 665 "src/ngx_http_memc_response.c"
+	{
+	cs = memc_delete_start;
+	}
+
+#line 116 "src/ngx_http_memc_response.rl"
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_incr
+                || ctx->cmd == ngx_http_memc_cmd_decr)
+        {
+            dd("init memc_incr_decr machine...");
+
+            
+#line 123 "src/ngx_http_memc_response.rl"
+            
+#line 680 "src/ngx_http_memc_response.c"
+	{
+	cs = memc_incr_decr_start;
+	}
+
+#line 124 "src/ngx_http_memc_response.rl"
+
+        } else {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+              "unrecognized memcached command in "
+              "ngx_http_memc_process_simple_header: \"%V\"",
+              &ctx->cmd_str);
+
+            return NGX_ERROR; /* this results in 500 status */
+        }
+
+    } else {
+        cs = ctx->parser_state;
+    }
+
+    u = r->upstream;
+
+    orig = (s_char *) u->buffer.pos;
+
+    p  = (s_char *) u->buffer.pos;
+    pe = (s_char *) u->buffer.last;
+
+    dd("buffer len: %d", (int) (pe - p));
+
+    if (ctx->is_storage_cmd) {
+        error_state = memc_storage_error;
+        final_state = memc_storage_first_final;
+
+        p = (s_char *) parse_memc_storage(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_flush_all) {
+        error_state = memc_flush_all_error;
+        final_state = memc_flush_all_first_final;
+
+        p = (s_char *) parse_memc_flush_all(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_version) {
+        error_state = memc_version_error;
+        final_state = memc_version_first_final;
+
+        p = (s_char *) parse_memc_version(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_stats) {
+        error_state = memc_stats_error;
+        final_state = memc_stats_first_final;
+
+        p = (s_char *) parse_memc_stats(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_delete) {
+        error_state = memc_delete_error;
+        final_state = memc_delete_first_final;
+
+        p = (s_char *) parse_memc_delete(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_incr
+            || ctx->cmd == ngx_http_memc_cmd_decr)
+    {
+        error_state = memc_incr_decr_error;
+        final_state = memc_incr_decr_first_final;
+
+        p = (s_char *) parse_memc_incr_decr(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+          "unrecognized memcached command in "
+          "ngx_http_memc_process_simple_header: \"%V\"",
+          &ctx->cmd_str);
+
+        return NGX_ERROR; /* this results in 500 status */
+    }
+
+    ctx->parser_state = cs;
+
+    resp.data = u->buffer.start;
+    resp.len  = (u_char *) p - resp.data;
+
+    u->buffer.pos = (u_char *) p;
+
+    dd("machine state: %d (done: %d)", cs, done);
+    dd("memcached response: (len: %d) %s", (int) resp.len, resp.data);
+
+    if (done || cs >= final_state) {
+        dd("memcached response parsed (resp.len: %d)", (int) resp.len);
+
+        rc = ngx_http_memc_write_simple_response(r, u, ctx, status, &resp);
+
+        return rc;
+    }
+
+    if (cs == error_state) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                  "memcached sent invalid response for command \"%V\" "
+                  "at pos %O: %V", &ctx->cmd_str, (off_t) (p - orig), &resp);
+
+        status = NGX_HTTP_BAD_GATEWAY;
+        u->headers_in.status_n = status;
+        u->state->status = status;
+
+        /* u->headers_in.status_n will be the final status */
+        return NGX_OK;
+    }
+
+    dd("we need more data to proceed (returned NGX_AGAIN)");
+
+    return NGX_AGAIN;
+}
+
+
+ngx_int_t
+ngx_http_memc_empty_filter_init(void *data)
+{
+    ngx_http_memc_ctx_t  *ctx = data;
+    ngx_http_upstream_t  *u;
+
+    u = ctx->request->upstream;
+
+    u->length = 0;
+
+    /* to persuade ngx_http_upstream_keepalive (if any)
+       to cache the connection if the status is neither
+       200 nor 404. */
+    if (u->headers_in.status_n == NGX_HTTP_CREATED) {
+        u->headers_in.status_n = NGX_HTTP_OK;
+    }
+
+    return NGX_OK;
+}
+
+ngx_int_t
+ngx_http_memc_empty_filter(void *data, ssize_t bytes)
+{
+    ngx_http_memc_ctx_t  *ctx = data;
+    ngx_http_upstream_t  *u;
+
+    u = ctx->request->upstream;
+
+    /* recover the buffer for subrequests in memory */
+    u->buffer.last += ctx->body_length;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_get_cmd_filter_init(void *data)
+{
+    ngx_http_memc_ctx_t  *ctx = data;
+
+    ngx_http_upstream_t  *u;
+
+    u = ctx->request->upstream;
+
+    dd("filter init: u->length: %d", (int) u->length);
+
+    u->length = u->headers_in.content_length_n + NGX_HTTP_MEMC_END;
+
+    dd("filter init (2): u->length: %d", (int) u->length);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_get_cmd_filter(void *data, ssize_t bytes)
+{
+    ngx_http_memc_ctx_t  *ctx = data;
+
+    u_char               *last;
+    ngx_buf_t            *b;
+    ngx_chain_t          *cl, **ll;
+    ngx_http_upstream_t  *u;
+
+    u = ctx->request->upstream;
+    b = &u->buffer;
+
+    if (u->length == ctx->rest) {
+
+        if (ngx_strncmp(b->last,
+                        ngx_http_memc_end + NGX_HTTP_MEMC_END - ctx->rest,
+                        bytes) != 0)
+        {
+            ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0,
+                          "memcached sent invalid trailer");
+
+            u->length = 0;
+            ctx->rest = 0;
+
+            return NGX_OK;
+        }
+
+        u->length -= bytes;
+        ctx->rest -= bytes;
+
+#if defined(nginx_version) && nginx_version >= 1001004
+        if (u->length == 0) {
+            u->keepalive = 1;
+        }
+#endif
+
+        return NGX_OK;
+    }
+
+    for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
+        ll = &cl->next;
+    }
+
+    cl = ngx_chain_get_free_buf(ctx->request->pool, &u->free_bufs);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf->flush = 1;
+    cl->buf->memory = 1;
+
+    *ll = cl;
+
+    last = b->last;
+    cl->buf->pos = last;
+    b->last += bytes;
+    cl->buf->last = b->last;
+    cl->buf->tag = u->output.tag;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
+                   "memcached filter bytes:%z size:%z length:%z rest:%z",
+                   bytes, b->last - b->pos, u->length, ctx->rest);
+
+    if (bytes <= (ssize_t) (u->length - NGX_HTTP_MEMC_END)) {
+        u->length -= bytes;
+        return NGX_OK;
+    }
+
+    last += u->length - NGX_HTTP_MEMC_END;
+
+    if (ngx_strncmp(last, ngx_http_memc_end, b->last - last) != 0) {
+        ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0,
+                      "memcached sent invalid trailer");
+
+#if defined(nginx_version) && nginx_version >= 1001004
+        b->last = last;
+        cl->buf->last = last;
+        u->length = 0;
+        ctx->rest = 0;
+
+        return NGX_OK;
+#endif
+    }
+
+    ctx->rest -= b->last - last;
+    b->last = last;
+    cl->buf->last = last;
+    u->length = ctx->rest;
+
+#if defined(nginx_version) && nginx_version >= 1001004
+    if (u->length == 0) {
+        u->keepalive = 1;
+    }
+#endif
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_process_get_cmd_header(ngx_http_request_t *r)
+{
+    ngx_http_memc_loc_conf_t        *conf;
+    u_char                          *p, *len;
+    ngx_str_t                        line;
+    ngx_http_upstream_t             *u;
+    ngx_http_memc_ctx_t             *ctx;
+    ngx_http_variable_value_t       *flags_vv;
+
+    u = r->upstream;
+
+    dd("process header: u->length: %u", (unsigned) u->length);
+
+    for (p = u->buffer.pos; p < u->buffer.last; p++) {
+        if (*p == LF) {
+            goto found;
+        }
+    }
+
+    return NGX_AGAIN;
+
+found:
+
+    *p = '\0';
+
+    line.len = p - u->buffer.pos - 1;
+    line.data = u->buffer.pos;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "memcached: \"%V\"", &line);
+
+    p = u->buffer.pos;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    if (ngx_strncmp(p, "VALUE ", sizeof("VALUE ") - 1) == 0) {
+
+        p += sizeof("VALUE ") - 1;
+
+        if (ngx_strncmp(p, ctx->key.data, ctx->key.len) != 0) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "memcached sent invalid key in response \"%V\" "
+                          "for key \"%V\"",
+                          &line, &ctx->key);
+
+            return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+        }
+
+        p += ctx->key.len;
+
+        if (*p++ != ' ') {
+            goto no_valid;
+        }
+
+        /* save flags */
+
+        flags_vv = ctx->memc_flags_vv;
+
+        if (flags_vv == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (flags_vv->not_found) {
+            flags_vv->not_found = 0;
+            flags_vv->valid = 1;
+            flags_vv->no_cacheable = 0;
+        }
+
+        flags_vv->data = p;
+
+        while (*p) {
+            if (*p++ == ' ') {
+                flags_vv->len = p - 1 - flags_vv->data;
+                conf = ngx_http_get_module_loc_conf(r, ngx_http_memc_module);
+
+                if (conf->flags_to_last_modified) {
+                    r->headers_out.last_modified_time =
+                            ngx_atotm(flags_vv->data, flags_vv->len);
+                }
+
+                goto length;
+            }
+        }
+
+        goto no_valid;
+
+    length:
+
+        len = p;
+
+        while (*p && *p++ != CR) { /* void */ }
+
+#if defined(nginx_version) && nginx_version >= 1001004
+        u->headers_in.content_length_n = ngx_atoof(len, p - len - 1);
+        if (u->headers_in.content_length_n == -1) {
+#else
+        r->headers_out.content_length_n = ngx_atoof(len, p - len - 1);
+        if (r->headers_out.content_length_n == -1) {
+#endif
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "memcached sent invalid length in response \"%V\" "
+                          "for key \"%V\"",
+                          &line, &ctx->key);
+            return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+        }
+
+        u->headers_in.status_n = NGX_HTTP_OK;
+        u->state->status = NGX_HTTP_OK;
+        u->buffer.pos = p + 1;
+
+        return NGX_OK;
+    }
+
+    if (ngx_strcmp(p, "END\x0d") == 0) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "key: \"%V\" was not found by memcached", &ctx->key);
+
+        u->headers_in.status_n = NGX_HTTP_NOT_FOUND;
+        u->state->status = NGX_HTTP_NOT_FOUND;
+
+#if defined(nginx_version) && nginx_version >= 1001004
+        u->keepalive = 1;
+#endif
+
+        return NGX_OK;
+    }
+
+no_valid:
+
+    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                  "memcached sent invalid response: \"%V\"", &line);
+
+    return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+}
+
+
+static ngx_int_t
+ngx_http_memc_write_simple_response(ngx_http_request_t *r,
+    ngx_http_upstream_t *u, ngx_http_memc_ctx_t *ctx, ngx_uint_t status,
+    ngx_str_t *resp)
+{
+    ngx_chain_t             *cl, **ll;
+
+    for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
+        ll = &cl->next;
+    }
+
+    cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf->flush = 1;
+    cl->buf->memory = 1;
+    cl->buf->pos = resp->data;
+    cl->buf->last = cl->buf->pos + resp->len;
+
+    *ll = cl;
+
+    /* for subrequests in memory */
+    u->buffer.pos = resp->data;
+    u->buffer.last = resp->data + resp->len;
+    ctx->body_length = resp->len;
+
+#if defined(nginx_version) && nginx_version >= 1001004
+    u->headers_in.content_length_n = resp->len;
+    u->keepalive = 1;
+#else
+    r->headers_out.content_length_n = resp->len;
+#endif
+
+    u->headers_in.status_n = status;
+    u->state->status = status;
+
+    return NGX_OK;
+}
+
+
+static u_char *
+parse_memc_storage(int *cs_addr, u_char *p, u_char *pe,
+    ngx_uint_t *status_addr, unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    
+#line 577 "src/ngx_http_memc_response.rl"
+    
+#line 578 "src/ngx_http_memc_response.rl"
+    
+#line 1143 "src/ngx_http_memc_response.c"
+	{
+	int _klen;
+	const char *_keys;
+	int _trans;
+
+	if ( p == pe )
+		goto _test_eof;
+	if ( cs == 0 )
+		goto _out;
+_resume:
+	_keys = _memc_storage_trans_keys + _memc_storage_key_offsets[cs];
+	_trans = _memc_storage_index_offsets[cs];
+
+	_klen = _memc_storage_single_lengths[cs];
+	if ( _klen > 0 ) {
+		const char *_lower = _keys;
+		const char *_mid;
+		const char *_upper = _keys + _klen - 1;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( (*p) < *_mid )
+				_upper = _mid - 1;
+			else if ( (*p) > *_mid )
+				_lower = _mid + 1;
+			else {
+				_trans += (unsigned int)(_mid - _keys);
+				goto _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _memc_storage_range_lengths[cs];
+	if ( _klen > 0 ) {
+		const char *_lower = _keys;
+		const char *_mid;
+		const char *_upper = _keys + (_klen<<1) - 2;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( (*p) < _mid[0] )
+				_upper = _mid - 2;
+			else if ( (*p) > _mid[1] )
+				_lower = _mid + 2;
+			else {
+				_trans += (unsigned int)((_mid - _keys)>>1);
+				goto _match;
+			}
+		}
+		_trans += _klen;
+	}
+
+_match:
+	cs = _memc_storage_trans_targs[_trans];
+
+	if ( _memc_storage_trans_actions[_trans] == 0 )
+		goto _again;
+
+	switch ( _memc_storage_trans_actions[_trans] ) {
+	case 2:
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+	case 1:
+#line 4 "src/memc_common.rl"
+	{
+        dd("caught error...");
+        dd("machine state: %d", cs);
+
+        *status_addr = NGX_HTTP_BAD_GATEWAY;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+	case 4:
+#line 31 "src/memc_common.rl"
+	{
+        dd("status set to 201");
+
+        *status_addr = NGX_HTTP_CREATED;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+	case 3:
+#line 37 "src/memc_common.rl"
+	{
+        dd("status set to 404");
+
+        *status_addr = NGX_HTTP_NOT_FOUND;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+#line 1256 "src/ngx_http_memc_response.c"
+	}
+
+_again:
+	if ( cs == 0 )
+		goto _out;
+	if ( ++p != pe )
+		goto _resume;
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 579 "src/ngx_http_memc_response.rl"
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_flush_all(int *cs_addr, u_char *p, u_char *pe,
+    ngx_uint_t *status_addr, unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    
+#line 593 "src/ngx_http_memc_response.rl"
+    
+#line 594 "src/ngx_http_memc_response.rl"
+    
+#line 1287 "src/ngx_http_memc_response.c"
+	{
+	int _klen;
+	const short *_keys;
+	int _trans;
+
+	if ( p == pe )
+		goto _test_eof;
+	if ( cs == 0 )
+		goto _out;
+_resume:
+	_keys = _memc_flush_all_trans_keys + _memc_flush_all_key_offsets[cs];
+	_trans = _memc_flush_all_index_offsets[cs];
+
+	_klen = _memc_flush_all_single_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + _klen - 1;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( (*p) < *_mid )
+				_upper = _mid - 1;
+			else if ( (*p) > *_mid )
+				_lower = _mid + 1;
+			else {
+				_trans += (unsigned int)(_mid - _keys);
+				goto _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _memc_flush_all_range_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + (_klen<<1) - 2;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( (*p) < _mid[0] )
+				_upper = _mid - 2;
+			else if ( (*p) > _mid[1] )
+				_lower = _mid + 2;
+			else {
+				_trans += (unsigned int)((_mid - _keys)>>1);
+				goto _match;
+			}
+		}
+		_trans += _klen;
+	}
+
+_match:
+	_trans = _memc_flush_all_indicies[_trans];
+	cs = _memc_flush_all_trans_targs[_trans];
+
+	if ( _memc_flush_all_trans_actions[_trans] == 0 )
+		goto _again;
+
+	switch ( _memc_flush_all_trans_actions[_trans] ) {
+	case 2:
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+	case 1:
+#line 4 "src/memc_common.rl"
+	{
+        dd("caught error...");
+        dd("machine state: %d", cs);
+
+        *status_addr = NGX_HTTP_BAD_GATEWAY;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+#line 1375 "src/ngx_http_memc_response.c"
+	}
+
+_again:
+	if ( cs == 0 )
+		goto _out;
+	if ( ++p != pe )
+		goto _resume;
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 595 "src/ngx_http_memc_response.rl"
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_version(int *cs_addr, u_char *p, u_char *pe,
+    ngx_uint_t *status_addr, unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    
+#line 609 "src/ngx_http_memc_response.rl"
+    
+#line 610 "src/ngx_http_memc_response.rl"
+    
+#line 1406 "src/ngx_http_memc_response.c"
+	{
+	int _klen;
+	const short *_keys;
+	int _trans;
+
+	if ( p == pe )
+		goto _test_eof;
+	if ( cs == 0 )
+		goto _out;
+_resume:
+	_keys = _memc_version_trans_keys + _memc_version_key_offsets[cs];
+	_trans = _memc_version_index_offsets[cs];
+
+	_klen = _memc_version_single_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + _klen - 1;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( (*p) < *_mid )
+				_upper = _mid - 1;
+			else if ( (*p) > *_mid )
+				_lower = _mid + 1;
+			else {
+				_trans += (unsigned int)(_mid - _keys);
+				goto _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _memc_version_range_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + (_klen<<1) - 2;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( (*p) < _mid[0] )
+				_upper = _mid - 2;
+			else if ( (*p) > _mid[1] )
+				_lower = _mid + 2;
+			else {
+				_trans += (unsigned int)((_mid - _keys)>>1);
+				goto _match;
+			}
+		}
+		_trans += _klen;
+	}
+
+_match:
+	_trans = _memc_version_indicies[_trans];
+	cs = _memc_version_trans_targs[_trans];
+
+	if ( _memc_version_trans_actions[_trans] == 0 )
+		goto _again;
+
+	switch ( _memc_version_trans_actions[_trans] ) {
+	case 2:
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+	case 1:
+#line 4 "src/memc_common.rl"
+	{
+        dd("caught error...");
+        dd("machine state: %d", cs);
+
+        *status_addr = NGX_HTTP_BAD_GATEWAY;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+#line 1494 "src/ngx_http_memc_response.c"
+	}
+
+_again:
+	if ( cs == 0 )
+		goto _out;
+	if ( ++p != pe )
+		goto _resume;
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 611 "src/ngx_http_memc_response.rl"
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_stats(int *cs_addr, u_char *p, u_char *pe, ngx_uint_t *status_addr,
+    unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    
+#line 625 "src/ngx_http_memc_response.rl"
+    
+#line 626 "src/ngx_http_memc_response.rl"
+    
+#line 1525 "src/ngx_http_memc_response.c"
+	{
+	int _klen;
+	const short *_keys;
+	int _trans;
+
+	if ( p == pe )
+		goto _test_eof;
+	if ( cs == 0 )
+		goto _out;
+_resume:
+	_keys = _memc_stats_trans_keys + _memc_stats_key_offsets[cs];
+	_trans = _memc_stats_index_offsets[cs];
+
+	_klen = _memc_stats_single_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + _klen - 1;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( (*p) < *_mid )
+				_upper = _mid - 1;
+			else if ( (*p) > *_mid )
+				_lower = _mid + 1;
+			else {
+				_trans += (unsigned int)(_mid - _keys);
+				goto _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _memc_stats_range_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + (_klen<<1) - 2;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( (*p) < _mid[0] )
+				_upper = _mid - 2;
+			else if ( (*p) > _mid[1] )
+				_lower = _mid + 2;
+			else {
+				_trans += (unsigned int)((_mid - _keys)>>1);
+				goto _match;
+			}
+		}
+		_trans += _klen;
+	}
+
+_match:
+	_trans = _memc_stats_indicies[_trans];
+	cs = _memc_stats_trans_targs[_trans];
+
+	if ( _memc_stats_trans_actions[_trans] == 0 )
+		goto _again;
+
+	switch ( _memc_stats_trans_actions[_trans] ) {
+	case 2:
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+	case 1:
+#line 4 "src/memc_common.rl"
+	{
+        dd("caught error...");
+        dd("machine state: %d", cs);
+
+        *status_addr = NGX_HTTP_BAD_GATEWAY;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+#line 1613 "src/ngx_http_memc_response.c"
+	}
+
+_again:
+	if ( cs == 0 )
+		goto _out;
+	if ( ++p != pe )
+		goto _resume;
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 627 "src/ngx_http_memc_response.rl"
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_delete(int *cs_addr, u_char *p, u_char *pe, ngx_uint_t *status_addr,
+    unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    
+#line 641 "src/ngx_http_memc_response.rl"
+    
+#line 642 "src/ngx_http_memc_response.rl"
+    
+#line 1644 "src/ngx_http_memc_response.c"
+	{
+	int _klen;
+	const short *_keys;
+	int _trans;
+
+	if ( p == pe )
+		goto _test_eof;
+	if ( cs == 0 )
+		goto _out;
+_resume:
+	_keys = _memc_delete_trans_keys + _memc_delete_key_offsets[cs];
+	_trans = _memc_delete_index_offsets[cs];
+
+	_klen = _memc_delete_single_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + _klen - 1;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( (*p) < *_mid )
+				_upper = _mid - 1;
+			else if ( (*p) > *_mid )
+				_lower = _mid + 1;
+			else {
+				_trans += (unsigned int)(_mid - _keys);
+				goto _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _memc_delete_range_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + (_klen<<1) - 2;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( (*p) < _mid[0] )
+				_upper = _mid - 2;
+			else if ( (*p) > _mid[1] )
+				_lower = _mid + 2;
+			else {
+				_trans += (unsigned int)((_mid - _keys)>>1);
+				goto _match;
+			}
+		}
+		_trans += _klen;
+	}
+
+_match:
+	cs = _memc_delete_trans_targs[_trans];
+
+	if ( _memc_delete_trans_actions[_trans] == 0 )
+		goto _again;
+
+	switch ( _memc_delete_trans_actions[_trans] ) {
+	case 2:
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+	case 1:
+#line 4 "src/memc_common.rl"
+	{
+        dd("caught error...");
+        dd("machine state: %d", cs);
+
+        *status_addr = NGX_HTTP_BAD_GATEWAY;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+	case 3:
+#line 37 "src/memc_common.rl"
+	{
+        dd("status set to 404");
+
+        *status_addr = NGX_HTTP_NOT_FOUND;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+	break;
+#line 1744 "src/ngx_http_memc_response.c"
+	}
+
+_again:
+	if ( cs == 0 )
+		goto _out;
+	if ( ++p != pe )
+		goto _resume;
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 643 "src/ngx_http_memc_response.rl"
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_incr_decr(int *cs_addr, u_char *p, u_char *pe,
+    ngx_uint_t *status_addr, unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    
+#line 657 "src/ngx_http_memc_response.rl"
+    
+#line 658 "src/ngx_http_memc_response.rl"
+    
+#line 1775 "src/ngx_http_memc_response.c"
+	{
+	int _klen;
+	const short *_keys;
+	int _trans;
+
+	if ( p == pe )
+		goto _test_eof;
+	if ( cs == 0 )
+		goto _out;
+_resume:
+	_keys = _memc_incr_decr_trans_keys + _memc_incr_decr_key_offsets[cs];
+	_trans = _memc_incr_decr_index_offsets[cs];
+
+	_klen = _memc_incr_decr_single_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + _klen - 1;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( (*p) < *_mid )
+				_upper = _mid - 1;
+			else if ( (*p) > *_mid )
+				_lower = _mid + 1;
+			else {
+				_trans += (unsigned int)(_mid - _keys);
+				goto _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _memc_incr_decr_range_lengths[cs];
+	if ( _klen > 0 ) {
+		const short *_lower = _keys;
+		const short *_mid;
+		const short *_upper = _keys + (_klen<<1) - 2;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( (*p) < _mid[0] )
+				_upper = _mid - 2;
+			else if ( (*p) > _mid[1] )
+				_lower = _mid + 2;
+			else {
+				_trans += (unsigned int)((_mid - _keys)>>1);
+				goto _match;
+			}
+		}
+		_trans += _klen;
+	}
+
+_match:
+	_trans = _memc_incr_decr_indicies[_trans];
+	cs = _memc_incr_decr_trans_targs[_trans];
+
+	if ( _memc_incr_decr_trans_actions[_trans] == 0 )
+		goto _again;
+
+	switch ( _memc_incr_decr_trans_actions[_trans] ) {
+	case 1:
+#line 26 "src/memc_common.rl"
+	{
+        dd("state %d, left %d, reading char '%c'", cs,
+        (int) (pe - p), *p);
+    }
+	break;
+	case 3:
+#line 4 "src/memc_common.rl"
+	{
+        dd("caught error...");
+        dd("machine state: %d", cs);
+
+        *status_addr = NGX_HTTP_BAD_GATEWAY;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+#line 26 "src/memc_common.rl"
+	{
+        dd("state %d, left %d, reading char '%c'", cs,
+        (int) (pe - p), *p);
+    }
+	break;
+	case 2:
+#line 31 "src/memc_common.rl"
+	{
+        dd("status set to 201");
+
+        *status_addr = NGX_HTTP_CREATED;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+#line 26 "src/memc_common.rl"
+	{
+        dd("state %d, left %d, reading char '%c'", cs,
+        (int) (pe - p), *p);
+    }
+	break;
+	case 4:
+#line 37 "src/memc_common.rl"
+	{
+        dd("status set to 404");
+
+        *status_addr = NGX_HTTP_NOT_FOUND;
+    }
+#line 21 "src/memc_common.rl"
+	{
+        dd("done it!");
+        *done_addr = 1;
+    }
+#line 26 "src/memc_common.rl"
+	{
+        dd("state %d, left %d, reading char '%c'", cs,
+        (int) (pe - p), *p);
+    }
+	break;
+#line 1904 "src/ngx_http_memc_response.c"
+	}
+
+_again:
+	if ( cs == 0 )
+		goto _out;
+	if ( ++p != pe )
+		goto _resume;
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 659 "src/ngx_http_memc_response.rl"
+
+    *cs_addr = cs;
+
+    return p;
+}
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.h b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.h
new file mode 100644
index 0000000..aec26dc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.h
@@ -0,0 +1,28 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_MEMC_RESPONSE_H
+#define NGX_HTTP_MEMC_RESPONSE_H
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+ngx_int_t ngx_http_memc_process_get_cmd_header(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_memc_get_cmd_filter_init(void *data);
+
+ngx_int_t ngx_http_memc_get_cmd_filter(void *data, ssize_t bytes);
+
+ngx_int_t ngx_http_memc_process_simple_header(ngx_http_request_t *r);
+
+ngx_int_t ngx_http_memc_empty_filter_init(void *data);
+
+ngx_int_t ngx_http_memc_empty_filter(void *data, ssize_t bytes);
+
+ngx_int_t ngx_http_memc_process_flush_all_cmd_header(ngx_http_request_t *r);
+
+#endif /* NGX_HTTP_MEMC_RESPONSE_H */
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.rl b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.rl
new file mode 100644
index 0000000..31f7c83
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_response.rl
@@ -0,0 +1,663 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_memc_response.h"
+#include "ngx_http_memc_module.h"
+
+
+#ifdef s_char
+#undef s_char
+#endif
+
+#define s_char signed char
+
+
+%% machine memc_storage;
+%% write data;
+
+%% machine memc_flush_all;
+%% write data;
+
+%% machine memc_version;
+%% write data;
+
+%% machine memc_stats;
+%% write data;
+
+%% machine memc_delete;
+%% write data;
+
+%% machine memc_incr_decr;
+%% write data;
+
+
+u_char  ngx_http_memc_end[] = CRLF "END" CRLF;
+
+
+static u_char *parse_memc_storage(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_flush_all(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_version(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_stats(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_delete(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static u_char *parse_memc_incr_decr(int *cs_addr, u_char *p, u_char *pe,
+        ngx_uint_t *status_addr, unsigned *done_addr);
+static ngx_int_t ngx_http_memc_write_simple_response(ngx_http_request_t *r,
+        ngx_http_upstream_t *u, ngx_http_memc_ctx_t *ctx,
+        ngx_uint_t status, ngx_str_t *resp);
+
+
+ngx_int_t
+ngx_http_memc_process_simple_header(ngx_http_request_t *r)
+{
+    ngx_int_t                rc;
+    int                      cs;
+    s_char                  *p;
+    s_char                  *pe;
+    s_char                  *orig;
+    ngx_str_t                resp;
+    ngx_http_upstream_t     *u;
+    ngx_http_memc_ctx_t     *ctx;
+    ngx_uint_t               status;
+    unsigned                 done = 0;
+    int                      error_state;
+    int                      final_state;
+
+    status = NGX_HTTP_OK;
+
+    dd("process simple cmd header");
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    if (ctx->parser_state == NGX_ERROR) {
+        dd("reinit state");
+
+        if (ctx->is_storage_cmd) {
+            dd("init memc_storage machine...");
+
+            %% machine memc_storage;
+            %% write init;
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_flush_all) {
+            dd("init memc_flush_all machine...");
+
+            %% machine memc_flush_all;
+            %% write init;
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_version) {
+            dd("init memc_version machine...");
+
+            %% machine memc_version;
+            %% write init;
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_stats) {
+            dd("init memc_stats machine...");
+
+            %% machine memc_stats;
+            %% write init;
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_delete) {
+            dd("init memc_delete machine...");
+
+            %% machine memc_delete;
+            %% write init;
+
+        } else if (ctx->cmd == ngx_http_memc_cmd_incr
+                || ctx->cmd == ngx_http_memc_cmd_decr)
+        {
+            dd("init memc_incr_decr machine...");
+
+            %% machine memc_incr_decr;
+            %% write init;
+
+        } else {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+              "unrecognized memcached command in "
+              "ngx_http_memc_process_simple_header: \"%V\"",
+              &ctx->cmd_str);
+
+            return NGX_ERROR; /* this results in 500 status */
+        }
+
+    } else {
+        cs = ctx->parser_state;
+    }
+
+    u = r->upstream;
+
+    orig = (s_char *) u->buffer.pos;
+
+    p  = (s_char *) u->buffer.pos;
+    pe = (s_char *) u->buffer.last;
+
+    dd("buffer len: %d", (int) (pe - p));
+
+    if (ctx->is_storage_cmd) {
+        error_state = memc_storage_error;
+        final_state = memc_storage_first_final;
+
+        p = (s_char *) parse_memc_storage(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_flush_all) {
+        error_state = memc_flush_all_error;
+        final_state = memc_flush_all_first_final;
+
+        p = (s_char *) parse_memc_flush_all(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_version) {
+        error_state = memc_version_error;
+        final_state = memc_version_first_final;
+
+        p = (s_char *) parse_memc_version(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_stats) {
+        error_state = memc_stats_error;
+        final_state = memc_stats_first_final;
+
+        p = (s_char *) parse_memc_stats(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_delete) {
+        error_state = memc_delete_error;
+        final_state = memc_delete_first_final;
+
+        p = (s_char *) parse_memc_delete(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else if (ctx->cmd == ngx_http_memc_cmd_incr
+            || ctx->cmd == ngx_http_memc_cmd_decr)
+    {
+        error_state = memc_incr_decr_error;
+        final_state = memc_incr_decr_first_final;
+
+        p = (s_char *) parse_memc_incr_decr(&cs, (u_char *) p, (u_char *) pe,
+                &status, &done);
+
+    } else {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+          "unrecognized memcached command in "
+          "ngx_http_memc_process_simple_header: \"%V\"",
+          &ctx->cmd_str);
+
+        return NGX_ERROR; /* this results in 500 status */
+    }
+
+    ctx->parser_state = cs;
+
+    resp.data = u->buffer.start;
+    resp.len  = (u_char *) p - resp.data;
+
+    u->buffer.pos = (u_char *) p;
+
+    dd("machine state: %d (done: %d)", cs, done);
+    dd("memcached response: (len: %d) %s", (int) resp.len, resp.data);
+
+    if (done || cs >= final_state) {
+        dd("memcached response parsed (resp.len: %d)", (int) resp.len);
+
+        rc = ngx_http_memc_write_simple_response(r, u, ctx, status, &resp);
+
+        return rc;
+    }
+
+    if (cs == error_state) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                  "memcached sent invalid response for command \"%V\" "
+                  "at pos %O: %V", &ctx->cmd_str, (off_t) (p - orig), &resp);
+
+        status = NGX_HTTP_BAD_GATEWAY;
+        u->headers_in.status_n = status;
+        u->state->status = status;
+
+        /* u->headers_in.status_n will be the final status */
+        return NGX_OK;
+    }
+
+    dd("we need more data to proceed (returned NGX_AGAIN)");
+
+    return NGX_AGAIN;
+}
+
+
+ngx_int_t
+ngx_http_memc_empty_filter_init(void *data)
+{
+    ngx_http_memc_ctx_t  *ctx = data;
+    ngx_http_upstream_t  *u;
+
+    u = ctx->request->upstream;
+
+    u->length = 0;
+
+    /* to persuade ngx_http_upstream_keepalive (if any)
+       to cache the connection if the status is neither
+       200 nor 404. */
+    if (u->headers_in.status_n == NGX_HTTP_CREATED) {
+        u->headers_in.status_n = NGX_HTTP_OK;
+    }
+
+    return NGX_OK;
+}
+
+ngx_int_t
+ngx_http_memc_empty_filter(void *data, ssize_t bytes)
+{
+    ngx_http_memc_ctx_t  *ctx = data;
+    ngx_http_upstream_t  *u;
+
+    u = ctx->request->upstream;
+
+    /* recover the buffer for subrequests in memory */
+    u->buffer.last += ctx->body_length;
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_get_cmd_filter_init(void *data)
+{
+    ngx_http_memc_ctx_t  *ctx = data;
+
+    ngx_http_upstream_t  *u;
+
+    u = ctx->request->upstream;
+
+    dd("filter init: u->length: %d", (int) u->length);
+
+    u->length = u->headers_in.content_length_n + NGX_HTTP_MEMC_END;
+
+    dd("filter init (2): u->length: %d", (int) u->length);
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_get_cmd_filter(void *data, ssize_t bytes)
+{
+    ngx_http_memc_ctx_t  *ctx = data;
+
+    u_char               *last;
+    ngx_buf_t            *b;
+    ngx_chain_t          *cl, **ll;
+    ngx_http_upstream_t  *u;
+
+    u = ctx->request->upstream;
+    b = &u->buffer;
+
+    if (u->length == ctx->rest) {
+
+        if (ngx_strncmp(b->last,
+                        ngx_http_memc_end + NGX_HTTP_MEMC_END - ctx->rest,
+                        bytes) != 0)
+        {
+            ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0,
+                          "memcached sent invalid trailer");
+
+            u->length = 0;
+            ctx->rest = 0;
+
+            return NGX_OK;
+        }
+
+        u->length -= bytes;
+        ctx->rest -= bytes;
+
+#if defined(nginx_version) && nginx_version >= 1001004
+        if (u->length == 0) {
+            u->keepalive = 1;
+        }
+#endif
+
+        return NGX_OK;
+    }
+
+    for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
+        ll = &cl->next;
+    }
+
+    cl = ngx_chain_get_free_buf(ctx->request->pool, &u->free_bufs);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf->flush = 1;
+    cl->buf->memory = 1;
+
+    *ll = cl;
+
+    last = b->last;
+    cl->buf->pos = last;
+    b->last += bytes;
+    cl->buf->last = b->last;
+    cl->buf->tag = u->output.tag;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
+                   "memcached filter bytes:%z size:%z length:%z rest:%z",
+                   bytes, b->last - b->pos, u->length, ctx->rest);
+
+    if (bytes <= (ssize_t) (u->length - NGX_HTTP_MEMC_END)) {
+        u->length -= bytes;
+        return NGX_OK;
+    }
+
+    last += u->length - NGX_HTTP_MEMC_END;
+
+    if (ngx_strncmp(last, ngx_http_memc_end, b->last - last) != 0) {
+        ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0,
+                      "memcached sent invalid trailer");
+
+#if defined(nginx_version) && nginx_version >= 1001004
+        b->last = last;
+        cl->buf->last = last;
+        u->length = 0;
+        ctx->rest = 0;
+
+        return NGX_OK;
+#endif
+    }
+
+    ctx->rest -= b->last - last;
+    b->last = last;
+    cl->buf->last = last;
+    u->length = ctx->rest;
+
+#if defined(nginx_version) && nginx_version >= 1001004
+    if (u->length == 0) {
+        u->keepalive = 1;
+    }
+#endif
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
+ngx_http_memc_process_get_cmd_header(ngx_http_request_t *r)
+{
+    ngx_http_memc_loc_conf_t        *conf;
+    u_char                          *p, *len;
+    ngx_str_t                        line;
+    ngx_http_upstream_t             *u;
+    ngx_http_memc_ctx_t             *ctx;
+    ngx_http_variable_value_t       *flags_vv;
+
+    u = r->upstream;
+
+    dd("process header: u->length: %u", (unsigned) u->length);
+
+    for (p = u->buffer.pos; p < u->buffer.last; p++) {
+        if (*p == LF) {
+            goto found;
+        }
+    }
+
+    return NGX_AGAIN;
+
+found:
+
+    *p = '\0';
+
+    line.len = p - u->buffer.pos - 1;
+    line.data = u->buffer.pos;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "memcached: \"%V\"", &line);
+
+    p = u->buffer.pos;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_memc_module);
+
+    if (ngx_strncmp(p, "VALUE ", sizeof("VALUE ") - 1) == 0) {
+
+        p += sizeof("VALUE ") - 1;
+
+        if (ngx_strncmp(p, ctx->key.data, ctx->key.len) != 0) {
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "memcached sent invalid key in response \"%V\" "
+                          "for key \"%V\"",
+                          &line, &ctx->key);
+
+            return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+        }
+
+        p += ctx->key.len;
+
+        if (*p++ != ' ') {
+            goto no_valid;
+        }
+
+        /* save flags */
+
+        flags_vv = ctx->memc_flags_vv;
+
+        if (flags_vv == NULL) {
+            return NGX_ERROR;
+        }
+
+        if (flags_vv->not_found) {
+            flags_vv->not_found = 0;
+            flags_vv->valid = 1;
+            flags_vv->no_cacheable = 0;
+        }
+
+        flags_vv->data = p;
+
+        while (*p) {
+            if (*p++ == ' ') {
+                flags_vv->len = p - 1 - flags_vv->data;
+                conf = ngx_http_get_module_loc_conf(r, ngx_http_memc_module);
+
+                if (conf->flags_to_last_modified) {
+                    r->headers_out.last_modified_time =
+                            ngx_atotm(flags_vv->data, flags_vv->len);
+                }
+
+                goto length;
+            }
+        }
+
+        goto no_valid;
+
+    length:
+
+        len = p;
+
+        while (*p && *p++ != CR) { /* void */ }
+
+#if defined(nginx_version) && nginx_version >= 1001004
+        u->headers_in.content_length_n = ngx_atoof(len, p - len - 1);
+        if (u->headers_in.content_length_n == -1) {
+#else
+        r->headers_out.content_length_n = ngx_atoof(len, p - len - 1);
+        if (r->headers_out.content_length_n == -1) {
+#endif
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                          "memcached sent invalid length in response \"%V\" "
+                          "for key \"%V\"",
+                          &line, &ctx->key);
+            return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+        }
+
+        u->headers_in.status_n = NGX_HTTP_OK;
+        u->state->status = NGX_HTTP_OK;
+        u->buffer.pos = p + 1;
+
+        return NGX_OK;
+    }
+
+    if (ngx_strcmp(p, "END\x0d") == 0) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "key: \"%V\" was not found by memcached", &ctx->key);
+
+        u->headers_in.status_n = NGX_HTTP_NOT_FOUND;
+        u->state->status = NGX_HTTP_NOT_FOUND;
+
+#if defined(nginx_version) && nginx_version >= 1001004
+        u->keepalive = 1;
+#endif
+
+        return NGX_OK;
+    }
+
+no_valid:
+
+    ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                  "memcached sent invalid response: \"%V\"", &line);
+
+    return NGX_HTTP_UPSTREAM_INVALID_HEADER;
+}
+
+
+static ngx_int_t
+ngx_http_memc_write_simple_response(ngx_http_request_t *r,
+    ngx_http_upstream_t *u, ngx_http_memc_ctx_t *ctx, ngx_uint_t status,
+    ngx_str_t *resp)
+{
+    ngx_chain_t             *cl, **ll;
+
+    for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) {
+        ll = &cl->next;
+    }
+
+    cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs);
+    if (cl == NULL) {
+        return NGX_ERROR;
+    }
+
+    cl->buf->flush = 1;
+    cl->buf->memory = 1;
+    cl->buf->pos = resp->data;
+    cl->buf->last = cl->buf->pos + resp->len;
+
+    *ll = cl;
+
+    /* for subrequests in memory */
+    u->buffer.pos = resp->data;
+    u->buffer.last = resp->data + resp->len;
+    ctx->body_length = resp->len;
+
+#if defined(nginx_version) && nginx_version >= 1001004
+    u->headers_in.content_length_n = resp->len;
+    u->keepalive = 1;
+#else
+    r->headers_out.content_length_n = resp->len;
+#endif
+
+    u->headers_in.status_n = status;
+    u->state->status = status;
+
+    return NGX_OK;
+}
+
+
+static u_char *
+parse_memc_storage(int *cs_addr, u_char *p, u_char *pe,
+    ngx_uint_t *status_addr, unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    %% machine memc_storage;
+    %% include "memc_storage.rl";
+    %% write exec;
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_flush_all(int *cs_addr, u_char *p, u_char *pe,
+    ngx_uint_t *status_addr, unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    %% machine memc_flush_all;
+    %% include "memc_flush_all.rl";
+    %% write exec;
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_version(int *cs_addr, u_char *p, u_char *pe,
+    ngx_uint_t *status_addr, unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    %% machine memc_version;
+    %% include "memc_version.rl";
+    %% write exec;
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_stats(int *cs_addr, u_char *p, u_char *pe, ngx_uint_t *status_addr,
+    unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    %% machine memc_stats;
+    %% include "memc_stats.rl";
+    %% write exec;
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_delete(int *cs_addr, u_char *p, u_char *pe, ngx_uint_t *status_addr,
+    unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    %% machine memc_delete;
+    %% include "memc_delete.rl";
+    %% write exec;
+
+    *cs_addr = cs;
+
+    return p;
+}
+
+
+static u_char *
+parse_memc_incr_decr(int *cs_addr, u_char *p, u_char *pe,
+    ngx_uint_t *status_addr, unsigned *done_addr)
+{
+    int cs = *cs_addr;
+
+    %% machine memc_incr_decr;
+    %% include "memc_incr_decr.rl";
+    %% write exec;
+
+    *cs_addr = cs;
+
+    return p;
+}
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.c b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.c
new file mode 100644
index 0000000..dd19643
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.c
@@ -0,0 +1,161 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+#include "ngx_http_memc_util.h"
+
+ngx_http_memc_cmd_t
+ngx_http_memc_parse_cmd(u_char *data, size_t len, ngx_flag_t *is_storage_cmd)
+{
+    switch (len) {
+
+    case 3:
+        if (ngx_http_memc_strcmp_const(data, "set") == 0) {
+            *is_storage_cmd = 1;
+            return ngx_http_memc_cmd_set;
+        }
+
+        if (ngx_http_memc_strcmp_const(data, "add") == 0) {
+            *is_storage_cmd = 1;
+            return ngx_http_memc_cmd_add;
+        }
+
+        /*
+        if (ngx_str3cmp(data, 'c', 'a', 's')) {
+            *is_storage_cmd = 1;
+            return ngx_http_memc_cmd_cas;
+        }
+        */
+
+        if (ngx_http_memc_strcmp_const(data, "get") == 0) {
+            return ngx_http_memc_cmd_get;
+        }
+
+        break;
+
+    case 4:
+        /*
+        if (ngx_str4cmp(data, 'g', 'e', 't', 's')) {
+            return ngx_http_memc_cmd_gets;
+        }
+        */
+
+        if (ngx_http_memc_strcmp_const(data, "incr") == 0) {
+            return ngx_http_memc_cmd_incr;
+        }
+
+        if (ngx_http_memc_strcmp_const(data, "decr") == 0) {
+            return ngx_http_memc_cmd_decr;
+        }
+
+        break;
+
+    case 5:
+        if (ngx_http_memc_strcmp_const(data, "stats") == 0) {
+            return ngx_http_memc_cmd_stats;
+        }
+
+        break;
+
+    case 6:
+        if (ngx_http_memc_strcmp_const(data, "append") == 0) {
+            *is_storage_cmd = 1;
+            return ngx_http_memc_cmd_append;
+        }
+
+        if (ngx_http_memc_strcmp_const(data, "delete") == 0) {
+            return ngx_http_memc_cmd_delete;
+        }
+
+        break;
+
+    case 7:
+        if (ngx_http_memc_strcmp_const(data, "replace") == 0) {
+            *is_storage_cmd = 1;
+            return ngx_http_memc_cmd_replace;
+        }
+
+        if (ngx_http_memc_strcmp_const(data, "prepend") == 0) {
+            *is_storage_cmd = 1;
+            return ngx_http_memc_cmd_prepend;
+        }
+
+        if (ngx_http_memc_strcmp_const(data, "version") == 0) {
+            return ngx_http_memc_cmd_version;
+        }
+
+        break;
+
+    case 9:
+        if (ngx_http_memc_strcmp_const(data, "flush_all") == 0) {
+            return ngx_http_memc_cmd_flush_all;
+        }
+
+        /*
+        if (ngx_str9cmp(data, 'v', 'e', 'r', 'b', 'o', 's', 'i', 't', 'y'))
+        {
+            return ngx_http_memc_cmd_verbosity;
+        }
+        */
+
+        break;
+
+    default:
+        break;
+    }
+
+    return ngx_http_memc_cmd_unknown;
+}
+
+
+ngx_http_upstream_srv_conf_t *
+ngx_http_memc_upstream_add(ngx_http_request_t *r, ngx_url_t *url)
+{
+    ngx_http_upstream_main_conf_t  *umcf;
+    ngx_http_upstream_srv_conf_t  **uscfp;
+    ngx_uint_t                      i;
+
+    umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
+
+    uscfp = umcf->upstreams.elts;
+
+    for (i = 0; i < umcf->upstreams.nelts; i++) {
+
+        if (uscfp[i]->host.len != url->host.len
+            || ngx_strncasecmp(uscfp[i]->host.data, url->host.data,
+                               url->host.len) != 0)
+        {
+            dd("upstream_add: host not match");
+            continue;
+        }
+
+        if (uscfp[i]->port != url->port) {
+            dd("upstream_add: port not match: %d != %d",
+               (int) uscfp[i]->port, (int) url->port);
+            continue;
+        }
+
+#if (nginx_version < 1011006)
+        if (uscfp[i]->default_port && url->default_port
+            && uscfp[i]->default_port != url->default_port)
+        {
+            dd("upstream_add: default_port not match");
+            continue;
+        }
+#endif
+
+        return uscfp[i];
+    }
+
+    dd("No upstream found: %.*s", (int) url->host.len, url->host.data);
+
+    return NULL;
+}
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.h b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.h
new file mode 100644
index 0000000..e83fbbb
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/src/ngx_http_memc_util.h
@@ -0,0 +1,33 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef NGX_HTTP_MEMC_UTIL_H
+#define NGX_HTTP_MEMC_UTIL_H
+
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include "ngx_http_memc_module.h"
+
+#ifndef NGX_UINT32_LEN
+#define NGX_UINT32_LEN (NGX_INT32_LEN - 1)
+#endif
+
+#ifndef NGX_UINT64_LEN
+#define NGX_UINT64_LEN (NGX_INT64_LEN - 1)
+#endif
+
+#define ngx_http_memc_strcmp_const(a, b)                                     \
+    ngx_strncmp(a, b, sizeof(b) - 1)
+
+ngx_http_memc_cmd_t ngx_http_memc_parse_cmd(u_char *data, size_t len,
+        ngx_flag_t *is_storage_cmd);
+
+ngx_http_upstream_srv_conf_t *ngx_http_memc_upstream_add(
+        ngx_http_request_t *r, ngx_url_t *url);
+
+
+#endif /* NGX_HTTP_MEMC_UTIL_H */
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/bugs.t b/modules_deb/libnginx-mod-http-memc-0.20/t/bugs.t
new file mode 100644
index 0000000..a39260d
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/bugs.t
@@ -0,0 +1,240 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+no_shuffle();
+no_long_string();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set only
+--- http_config
+   upstream mc {
+        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+   }
+
+--- config
+   location = "/set" {
+       set $memc_cmd 'set';
+       set $memc_key 'jalla';
+       set $memc_value 'myvalue';
+       set $memc_exptime 24;
+       memc_pass mc;
+   }
+
+
+   location = "/get" {
+       set $memc_cmd 'get';
+       set $memc_key 'jalla';
+       memc_pass mc;
+   }
+
+   location = "/delete" {
+       set $memc_cmd 'delete';
+       set $memc_key 'jalla';
+       memc_pass mc;
+   }
+   location = "/flush" {
+       echo_location /get;
+       #echo "";
+       echo_location /delete;
+   }
+--- request
+    GET /flush
+--- response_body eval
+"STORED\r\n"
+--- error_code: 201
+--- SKIP
+
+
+
+=== TEST 2: set in a subrequest issued from an output filter
+--- config
+    location /memc {
+        set $memc_cmd 'set';
+        set $memc_key 'foo';
+        set $memc_value 'blah';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+    location /main {
+        default_type 'text/html';
+        add_before_body '/memc';
+        echo '~~';
+        add_after_body '/memc';
+    }
+--- request
+GET /main
+--- response_body eval
+"STORED\r
+~~
+STORED\r
+"
+
+
+
+=== TEST 3: reuse request body
+--- config
+    location /main {
+        echo_read_request_body;
+
+        echo 'flush_all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'set foo';
+        echo_subrequest POST '/memc?key=foo&cmd=set';
+
+        echo 'set bar';
+        echo_subrequest POST '/memc?key=bar&cmd=set';
+
+        echo 'get bar';
+        echo_location '/memc?key=bar&cmd=get';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        #set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /main
+Hello
+--- response_body eval
+"flush_all
+status: 200
+exptime: 
+OK\r
+set foo
+status: 201
+exptime: 0
+STORED\r
+set bar
+status: 201
+exptime: 0
+STORED\r
+get bar
+status: 200
+exptime: 
+Helloget foo
+status: 200
+exptime: 
+Hello"
+
+
+
+=== TEST 4: zero buf when $memc_value is empty
+http://github.com/agentzh/memc-nginx-module/issues#issue/2
+--- config
+    location /memc {
+        set $memc_cmd 'set';
+        set $memc_key 'foo';
+        set $memc_value '';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_body eval
+"STORED\r
+"
+--- error_code: 201
+
+
+
+=== TEST 5: zero buf when $memc_value is empty
+http://github.com/agentzh/memc-nginx-module/issues#issue/2
+--- config
+    location /memc {
+        set $memc_cmd 'set';
+        set $memc_key 'foo';
+        set $memc_value '';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_body eval
+"STORED\r
+"
+--- error_code: 201
+
+
+
+=== TEST 6: set too long keys
+--- config
+    location /memc {
+        set $memc_cmd 'set';
+        set $memc_key 'foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo';
+        set $memc_value 'hi';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_body eval
+"CLIENT_ERROR bad command line format\r
+"
+--- error_code: 502
+
+
+
+=== TEST 7: get too long keys
+--- config
+    location /memc {
+        set $memc_cmd 'get';
+        set $memc_key 'foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_body_like: 502 Bad Gateway
+--- error_code: 502
+
+
+
+=== TEST 8: set only
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $echo_request_body;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /memc?key=foo&cmd=set
+hello, world
+--- response_body eval
+"STORED\r\n"
+--- error_code: 201
+--- SKIP
+
+
+
+=== TEST 9: get
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc?key=foo&cmd=get
+--- response_body
+hello, world
+--- error_code: 200
+--- SKIP
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/cmd.t b/modules_deb/libnginx-mod-http-memc-0.20/t/cmd.t
new file mode 100644
index 0000000..327a0c7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/cmd.t
@@ -0,0 +1,144 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => repeat_each() * (2 * blocks() + 3);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: bad cmd
+--- config
+    location /foo {
+        set $memc_cmd blah;
+        set $memc_key foo;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+--- error_log
+ngx_memc: unknown $memc_cmd "blah"
+
+
+
+=== TEST 2: no default value for $memc_cmd for method COPY
+--- config
+    location /foo {
+        set $memc_key foo;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    COPY /foo
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+--- error_log
+ngx_memc: $memc_cmd variable not found for HTTP COPY requests
+
+
+
+=== TEST 3: bad cmd (case sensitive)
+--- config
+    location /foo {
+        set $memc_cmd GET;
+        set $memc_key foo;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
+
+
+=== TEST 4: explicit $memc_cmd in non-empty cmds_allowed list
+--- config
+    location /allow {
+        set $memc_cmd version;
+        memc_cmds_allowed get version;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: ^VERSION \d+(\.\d+)+.*?\r\n$
+
+
+
+=== TEST 5: explicit $memc_cmd in non-empty cmds_allowed list (in first)
+--- config
+    location /allow {
+        set $memc_cmd version;
+        memc_cmds_allowed version get;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: ^VERSION \d+(\.\d+)+.*?\r\n$
+
+
+
+=== TEST 6: explicit $memc_cmd NOT in non-empty cmds_allowed list
+--- config
+    location /allow {
+        set $memc_cmd version;
+        memc_cmds_allowed set get add delete;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: 403 Forbidden
+--- error_code: 403
+--- error_log
+ngx_memc: memcached command "version" not allowed
+
+
+
+=== TEST 7: implicit $memc_cmd NOT in non-empty cmds_allowed list
+--- config
+    location /allow {
+        memc_cmds_allowed set add delete version;
+
+        set $memcached_key foo;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: 403 Forbidden
+--- error_code: 403
+
+
+
+=== TEST 8: $memc_cmd has its default values when it's an empty string
+--- config
+    location /main {
+        echo_read_request_body;
+        echo 'set big2';
+        echo_subrequest PUT '/memc?key=big2';
+
+        echo 'get big2';
+        echo_location '/memc?key=big2&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /main
+nice to meet you!
+--- response_body eval
+"set big2
+STORED\r
+get big2
+nice to meet you!"
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/core-bugs.t b/modules_deb/libnginx-mod-http-memc-0.20/t/core-bugs.t
new file mode 100644
index 0000000..a9a580c
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/core-bugs.t
@@ -0,0 +1,55 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_shuffle();
+
+#no_diff;
+#no_long_string();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: bug in nginx core? (1)
+--- http_config
+    upstream foo {
+        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- config
+    location /set {
+        set $memc_key foo;
+        set $memc_cmd set;
+        set $memc_value '[["mafiaclans.eu", 12], ["picfu.net", 5], ["www.test.com", 0], ["www.ayom.com", 0], ["www.21dezember2012.org", 0], ["the-indie.ch", 0], ["spiele-check.de", 0], ["online-right-now.net", 0], ["google.com", 0]]';
+        memc_pass foo;
+    }
+--- request
+GET /set
+--- response_body eval
+"STORED\r\n"
+--- error_code: 201
+
+
+
+=== TEST 2: bug in nginx core? (2)
+--- http_config
+    upstream foo {
+        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- config
+    location /get {
+        set $memcached_key foo;
+        memcached_pass foo;
+    }
+--- request
+GET /get
+--- response_body eval
+qq{[["mafiaclans.eu", 12], ["picfu.net", 5], ["www.test.com", 0], ["www.ayom.com", 0], ["www.21dezember2012.org", 0], ["the-indie.ch", 0], ["spiele-check.de", 0], ["online-right-now.net", 0], ["google.com", 0]]}
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/delete.t b/modules_deb/libnginx-mod-http-memc-0.20/t/delete.t
new file mode 100644
index 0000000..9fccf37
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/delete.t
@@ -0,0 +1,140 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: delete non-existent item
+--- config
+    location /main {
+        echo 'flush_all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'delete foo';
+        echo_location '/memc?key=foo&cmd=delete';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body_like
+^flush_all
+status: 200
+exptime: 
+OK\r
+delete foo
+status: 404
+exptime: 
+<html>.*?404 Not Found.*$
+
+
+
+=== TEST 2: set and delete and set
+--- config
+    location /main {
+        echo 'set foo bar';
+        echo_location '/memc?cmd=set&key=foo&val=bar';
+
+        echo 'delete foo';
+        echo_location '/memc?key=foo&cmd=delete';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body_like
+^set foo bar
+status: 201
+exptime: 0
+STORED\r
+delete foo
+status: 200
+exptime: 
+DELETED\r
+get foo
+status: 404
+exptime: 
+<html>.*?404 Not Found.*$
+
+
+
+=== TEST 3: set and delete and set (with exptime)
+--- config
+    location /main {
+        echo 'set foo bar';
+        echo_location '/memc?cmd=set&key=foo&val=bar';
+
+        echo 'delete foo 1';
+        echo_location '/memc?key=foo&cmd=delete&exptime=1';
+
+        echo 'add foo cat';
+        echo_location '/memc?key=foo&cmd=add&val=cat';
+
+        echo_blocking_sleep 1.6;
+
+        echo 'add foo cat - 2nd';
+        echo_location '/memc?key=foo&cmd=add&val=cat';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo bar
+status: 201
+exptime: 0
+STORED\r
+delete foo 1
+status: 200
+exptime: 1
+DELETED\r
+add foo cat
+status: 200
+exptime: 0
+NOT_STORED\r
+add foo cat - 2nd
+status: 201
+exptime: 0
+STORED\r
+"
+--- SKIP
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/errors.t b/modules_deb/libnginx-mod-http-memc-0.20/t/errors.t
new file mode 100644
index 0000000..1cda000
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/errors.t
@@ -0,0 +1,45 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: empty pass
+little-endian systems only
+
+--- config
+    location /memc {
+        set $memc_key foo;
+        set $backend "not-exist";
+        memc_pass $backend;
+    }
+--- request
+GET /memc
+--- error_code: 500
+--- response_body_like: 500 Internal Server Error
+
+
+
+=== TEST 2: connection refused
+little-endian systems only
+
+--- config
+    location /memc {
+        set $memc_key foo;
+        set $backend "not-exist";
+        memc_pass 127.0.0.1:1;
+    }
+--- request
+GET /memc
+--- error_code: 502
+--- response_body_like: 502 Bad Gateway
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/eval.t b/modules_deb/libnginx-mod-http-memc-0.20/t/eval.t
new file mode 100644
index 0000000..8736de7
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/eval.t
@@ -0,0 +1,118 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket; # skip_all => 'ngx_memc storage commands do not work with the ngx_eval module';
+
+repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+no_long_string();
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set in eval (NO subrequest in memory)
+--- http_config
+   upstream mc {
+        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+   }
+
+--- config
+    location = /main {
+        echo_location /eval;
+        echo_location /eval;
+    }
+   location = /eval {
+       eval_subrequest_in_memory off;
+       eval_override_content_type text/plain;
+       eval $res {
+           default_type 'text/plain';
+           set $memc_cmd 'set';
+           set $memc_key 'foo';
+           set $memc_value 'myvalue';
+           set $memc_exptime 24;
+           memc_pass mc;
+       }
+       echo [$res];
+   }
+
+--- request
+    GET /eval
+--- response_body
+[STORED]
+--- timeout: 30
+--- error_code: 200
+
+
+
+=== TEST 2: set in eval (subrequest in memory)
+--- http_config
+   upstream mc {
+        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+   }
+
+--- config
+    location = /main {
+        echo_location /eval;
+        echo_location /eval;
+    }
+   location = /eval {
+       eval_subrequest_in_memory on;
+       eval_override_content_type text/plain;
+       eval $res {
+           default_type 'text/plain';
+           set $memc_cmd 'set';
+           set $memc_key 'foo';
+           set $memc_value 'myvalue';
+           set $memc_exptime 24;
+           memc_pass mc;
+       }
+       echo [$res];
+   }
+
+--- request
+    GET /eval
+--- response_body
+[STORED]
+--- timeout: 30
+--- error_code: 200
+
+
+
+=== TEST 3: set in eval (subrequest in memory)
+--- http_config
+   upstream mc {
+        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+   }
+
+--- config
+    location = /main {
+        echo_location /get;
+        echo_location /del?foo;
+    }
+    location = /get {
+        set $memc_cmd get;
+        set $memc_key foo;
+        memc_pass mc;
+    }
+    location = /del {
+       eval $res {
+           set $memc_cmd delete;
+           set $memc_key $query_string;
+           memc_pass mc;
+       }
+       return 200;
+   }
+--- request
+    GET /main
+--- response_body
+[STORED]
+--- timeout: 30
+--- error_code: 200
+--- SKIP
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/exptime.t b/modules_deb/libnginx-mod-http-memc-0.20/t/exptime.t
new file mode 100644
index 0000000..0a62190
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/exptime.t
@@ -0,0 +1,166 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 1);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set exptime
+--- config
+    location /exptime {
+        echo 'flush_all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'set foo BAR';
+        echo_subrequest PUT '/memc?key=foo&exptime=1' -b BAR;
+
+        echo 'get foo - 0 sec';
+        echo_location '/memc?key=foo';
+        echo;
+
+        echo_blocking_sleep 1.1;
+
+        echo 'get foo - 1.1 sec';
+        echo_location '/memc?key=foo';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /exptime
+--- response_body_like
+^flush_all
+status: 200
+exptime: 
+OK\r
+set foo BAR
+status: 201
+exptime: 1
+STORED\r
+get foo - 0 sec
+status: 200
+exptime: 
+BAR
+get foo - 1\.1 sec
+status: 404
+exptime: 
+<html>.*?404 Not Found.*$
+
+
+
+=== TEST 2: test empty flags (default to 0)
+--- config
+    location /flags {
+        echo 'set foo BAR (exptime: EMPTY)';
+        echo_subrequest PUT '/memc?key=foo' -b BAR;
+
+        echo_blocking_sleep 1;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+    }
+
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_key $arg_key;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /flags
+--- response_body eval
+"set foo BAR (exptime: EMPTY)
+status: 201
+exptime: 0
+STORED\r
+get foo
+status: 200
+exptime: 
+BAR"
+
+
+
+=== TEST 3: invalid exptime in set
+--- config
+    location /allow {
+        set $memc_cmd 'set';
+        set $memc_key 'foo';
+        set $memc_value 'nice';
+        set $memc_exptime 'my invalid';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+--- error_log
+variable "$memc_exptime" takes invalid value: my invalid,
+
+
+
+=== TEST 4: invalid exptime in flush_all
+--- config
+    location /allow {
+        set $memc_cmd 'flush_all';
+        set $memc_key 'foo';
+        set $memc_value 'nice';
+        set $memc_exptime 'invalid';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
+
+
+=== TEST 5: invalid exptime in delete
+--- config
+    location /allow {
+        set $memc_cmd 'delete';
+        set $memc_key 'foo';
+        set $memc_value 'nice';
+        set $memc_exptime 'invalid';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
+
+
+=== TEST 6: set negative exptime
+--- config
+    location /allow {
+        set $memc_cmd 'set';
+        set $memc_key 'sun';
+        set $memc_value 'tree';
+        set $memc_exptime '-1';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/flags.t b/modules_deb/libnginx-mod-http-memc-0.20/t/flags.t
new file mode 100644
index 0000000..aa2b29b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/flags.t
@@ -0,0 +1,263 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 3);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+no_shuffle;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set flags and get flags
+--- config
+    location /flags {
+        echo 'set foo BAR (flag: 1234567890)';
+        echo_subrequest PUT '/memc?key=foo&flags=1234567890' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "flags: $memc_flags";
+
+        set $memc_key $arg_key;
+        set $memc_flags $arg_flags;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /flags
+--- response_body eval
+"set foo BAR (flag: 1234567890)
+status: 201
+flags: 1234567890
+STORED\r
+get foo
+status: 200
+flags: 1234567890
+BAR"
+
+
+
+=== TEST 2: test empty flags (default to 0)
+--- config
+    location /flags {
+        echo 'set foo BAR (flag: EMPTY)';
+        echo_subrequest PUT '/memc?key=foo' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+    }
+
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "flags: $memc_flags";
+
+        set $memc_key $arg_key;
+        set $memc_flags $arg_flags;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /flags
+--- response_body eval
+"set foo BAR (flag: EMPTY)
+status: 201
+flags: 0
+STORED\r
+get foo
+status: 200
+flags: 0
+BAR"
+
+
+
+=== TEST 3: test empty flags (default to 0) (another form)
+--- config
+    location /flags {
+        echo 'set foo BAR (flag: EMPTY)';
+        echo_subrequest PUT '/memc?key=foo&flags=' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+    }
+
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "flags: $memc_flags";
+
+        set $memc_key $arg_key;
+        set $memc_flags $arg_flags;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /flags
+--- response_body eval
+"set foo BAR (flag: EMPTY)
+status: 201
+flags: 0
+STORED\r
+get foo
+status: 200
+flags: 0
+BAR"
+
+
+
+=== TEST 4: add flags and get flags
+--- config
+    location /flags {
+        echo 'flush_all';
+        echo_subrequest GET '/memc?cmd=flush_all';
+
+        echo 'add foo BAR (flag: 54321)';
+        echo_subrequest POST '/memc?key=foo&flags=54321' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "flags: $memc_flags";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_flags $arg_flags;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /flags
+--- response_body eval
+"flush_all
+status: 200
+flags: 
+OK\r
+add foo BAR (flag: 54321)
+status: 201
+flags: 54321
+STORED\r
+get foo
+status: 200
+flags: 54321
+BAR"
+
+
+
+=== TEST 5: set invalid flags
+--- config
+    location /allow {
+        set $memc_cmd 'set';
+        set $memc_key 'foo';
+        set $memc_value 'nice';
+        set $memc_flags 'invalid';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+--- error_log
+variable "$memc_flags" takes invalid value: invalid,
+
+
+
+=== TEST 6: set negative flags
+--- config
+    location /allow {
+        set $memc_cmd 'set';
+        set $memc_key 'sun';
+        set $memc_value 'tree';
+        set $memc_flags '-1';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /allow
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
+
+
+=== TEST 7: set flags and get flags in http time
+--- config
+    location /flags {
+        echo 'set foo BAR (flag: 1264680563)';
+        echo_subrequest PUT '/memc?key=foo&flags=1264680563' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "flags: $memc_flags $memc_flags_as_http_time";
+
+        set $memc_key $arg_key;
+        set $memc_flags $arg_flags;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /flags
+--- response_body eval
+"set foo BAR (flag: 1264680563)
+status: 201
+flags: 1264680563 Thu, 28 Jan 2010 12:09:23 GMT
+STORED\r
+get foo
+status: 200
+flags: 1264680563 Thu, 28 Jan 2010 12:09:23 GMT
+BAR"
+
+
+
+=== TEST 8: last-modified (conditional GET)
+--- SKIP
+--- config
+    location /memc {
+        set $memc_key $arg_key;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+
+        memc_flags_to_last_modified on;
+        add_header X-Flags $memc_flags;
+    }
+--- request
+    GET /memc?key=foo
+--- more_headers
+If-Modified-Since: Thu, 28 Jan 2010 12:09:23 GMT
+--- response_headers
+Last-Modified: Thu, 28 Jan 2010 12:09:23 GMT
+X-Flags: 1264680563
+--- error_code: 304
+--- response_body:
+
+
+
+=== TEST 9: last-modified (unconditional GET)
+--- config
+    location /memc {
+        set $memc_key $arg_key;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+
+        memc_flags_to_last_modified on;
+        add_header X-Flags $memc_flags;
+    }
+--- request
+    GET /memc?key=foo
+--- response_headers
+Last-Modified: Thu, 28 Jan 2010 12:09:23 GMT
+X-Flags: 1264680563
+--- error_code: 200
+--- response_body: BAR
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/flush-all.t b/modules_deb/libnginx-mod-http-memc-0.20/t/flush-all.t
new file mode 100644
index 0000000..aeea8dc
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/flush-all.t
@@ -0,0 +1,120 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: flush_all
+--- config
+    location /flush {
+        set $memc_cmd flush_all;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /flush
+--- response_body eval
+"OK\r
+"
+
+
+
+=== TEST 2: set and flush and get
+--- config
+    location /main {
+        echo 'set foo blah';
+        echo_location '/memc?key=foo&cmd=set&val=blah';
+
+        echo 'flush_all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body_like
+^set foo blah
+status: 201
+STORED\r
+flush_all
+status: 200
+OK\r
+get foo
+status: 404.*?404 Not Found.*$
+
+
+
+=== TEST 3: set exptime
+--- config
+    location /exptime {
+        echo 'flush_all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'set foo BAR';
+        echo_subrequest PUT '/memc?key=foo' -b BAR;
+
+        echo 'flush_all exptime=2';
+        echo_location '/memc?cmd=flush_all&exptime=2';
+
+        echo 'get foo - 0 sec';
+        echo_location '/memc?key=foo';
+        echo;
+
+        echo_blocking_sleep 2;
+
+        echo 'get foo - 2 sec';
+        echo_location '/memc?key=foo';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /exptime
+--- response_body_like
+flush_all
+status: 200
+exptime: 
+OK\r
+set foo BAR
+status: 201
+exptime: 0
+STORED\r
+flush_all exptime=2
+status: 200
+exptime: 2
+OK\r
+get foo - 0 sec
+status: 200
+exptime: 
+BAR
+get foo - 2 sec
+status: 404
+exptime: 
+<html>.*?404 Not Found.*$
+--- timeout: 3
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/if.t b/modules_deb/libnginx-mod-http-memc-0.20/t/if.t
new file mode 100644
index 0000000..89c5859
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/if.t
@@ -0,0 +1,30 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => repeat_each() * (3 * blocks());
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: bad cmd
+--- config
+    location /foo {
+        if ($uri ~* 'foo') {
+            set $memc_cmd flush_all;
+        }
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /foo
+--- response_body eval
+"OK\r\n"
+--- no_error_log
+[error]
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/incr-decr.t b/modules_deb/libnginx-mod-http-memc-0.20/t/incr-decr.t
new file mode 100644
index 0000000..8412ec9
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/incr-decr.t
@@ -0,0 +1,292 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() + 1);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: value required for incr
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc?cmd=incr&key=foo
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
+
+
+=== TEST 2: invalid value for incr
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc?cmd=incr&key=foo&val=nice
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+--- error_log
+variable "$memc_value" is invalid for incr/decr: nice,
+
+
+
+=== TEST 3: invalid value (negative intenger) for incr
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc?cmd=incr&key=foo&val=-5
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
+
+
+=== TEST 4: key required for incr
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc?cmd=incr&val=2
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+--- SKIP
+--- TODO
+
+
+
+=== TEST 5: incr
+--- config
+    location /main {
+        echo 'set foo 32';
+        echo_location '/memc?cmd=set&key=foo&val=32';
+
+        echo 'incr 51';
+        echo_location '/memc?key=foo&cmd=incr&val=51';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo 32
+status: 201
+exptime: 0
+STORED\r
+incr 51
+status: 201
+exptime: 
+83\r
+get foo
+status: 200
+exptime: 
+83"
+
+
+
+=== TEST 6: decr
+--- config
+    location /main {
+        echo 'set foo 32';
+        echo_location '/memc?cmd=set&key=foo&val=32';
+
+        echo 'decr 13';
+        echo_location '/memc?key=foo&cmd=decr&val=13';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo 32
+status: 201
+exptime: 0
+STORED\r
+decr 13
+status: 201
+exptime: 
+19\r
+get foo
+status: 200
+exptime: 
+19"
+
+
+
+=== TEST 7: incr an non-existent key
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'incr 51';
+        echo_location '/memc?key=foo&cmd=incr&val=51';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body_like
+^flush all
+status: 200
+exptime: 
+OK\r
+incr 51
+status: 404
+exptime: 
+<html>.*?404 Not Found.*$
+
+
+
+=== TEST 8: decr
+--- config
+    location /main {
+        echo 'set foo 32';
+        echo_location '/memc?cmd=set&key=foo&val=32';
+
+        echo 'decr 13';
+        echo_location '/memc?key=foo&cmd=decr&val=13';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo 32
+status: 201
+exptime: 0
+STORED\r
+decr 13
+status: 201
+exptime: 
+19\r
+get foo
+status: 200
+exptime: 
+19"
+
+
+
+=== TEST 9: incr an non-existent key (with fallback)
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'incr 51';
+        echo_location '/memc?key=foo&cmd=incr&val=51';
+    }
+
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+
+        error_page 404 = /set_and_incr?$query_string;
+    }
+
+    location /set_and_incr {
+        internal;
+
+        echo_location /memc?cmd=add&key=$arg_key&val=0;
+        echo_location /memc?$query_string;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+exptime: 
+OK\r
+incr 51
+status: 201
+exptime: 0
+STORED\r
+status: 201
+exptime: 
+51\r
+"
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive.t b/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive.t
new file mode 100644
index 0000000..e1292e6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive.t
@@ -0,0 +1,41 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(3);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: keepalive
+--- http_config
+    upstream backend {
+      server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+      #server 127.0.0.1:11985;
+      #server 127.0.0.1:11986;
+      keepalive 2;
+      #hash $arg_key;
+    }
+
+--- config
+    location /memc {
+        set $memc_cmd set;
+        set $memc_key $arg_key;
+        set $memc_value 'value';
+        memc_pass backend;
+    }
+--- request
+    GET /memc?key=dog
+--- response_body eval
+"STORED\r
+"
+--- error_code: 201
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/incr-decr.t b/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/incr-decr.t
new file mode 100644
index 0000000..b03f1e8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/incr-decr.t
@@ -0,0 +1,306 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+our $http_config = <<'_EOC_';
+    upstream foo {
+        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        keepalive 1;
+    }
+_EOC_
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: value required for incr
+--- http_config eval: $::http_config
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+    }
+--- request
+    GET /memc?cmd=incr&key=foo
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
+
+
+=== TEST 2: invalid value for incr
+--- http_config eval: $::http_config
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+    }
+--- request
+    GET /memc?cmd=incr&key=foo&val=nice
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
+
+
+=== TEST 3: invalid value (negative intenger) for incr
+--- http_config eval: $::http_config
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+    }
+--- request
+    GET /memc?cmd=incr&key=foo&val=-5
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+
+
+
+=== TEST 4: key required for incr
+--- http_config eval: $::http_config
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+    }
+--- request
+    GET /memc?cmd=incr&val=2
+--- response_body_like: 400 Bad Request
+--- error_code: 400
+--- SKIP
+--- TODO
+
+
+
+=== TEST 5: incr
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'set foo 32';
+        echo_location '/memc?cmd=set&key=foo&val=32';
+
+        echo 'incr 51';
+        echo_location '/memc?key=foo&cmd=incr&val=51';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo 32
+status: 201
+exptime: 0
+STORED\r
+incr 51
+status: 201
+exptime: 
+83\r
+get foo
+status: 200
+exptime: 
+83"
+
+
+
+=== TEST 6: decr
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'set foo 32';
+        echo_location '/memc?cmd=set&key=foo&val=32';
+
+        echo 'decr 13';
+        echo_location '/memc?key=foo&cmd=decr&val=13';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo 32
+status: 201
+exptime: 0
+STORED\r
+decr 13
+status: 201
+exptime: 
+19\r
+get foo
+status: 200
+exptime: 
+19"
+
+
+
+=== TEST 7: incr an non-existent key
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'incr 51';
+        echo_location '/memc?key=foo&cmd=incr&val=51';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body_like
+^flush all
+status: 200
+exptime: 
+OK\r
+incr 51
+status: 404
+exptime: 
+<html>.*?404 Not Found.*$
+
+
+
+=== TEST 8: decr
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'set foo 32';
+        echo_location '/memc?cmd=set&key=foo&val=32';
+
+        echo 'decr 13';
+        echo_location '/memc?key=foo&cmd=decr&val=13';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo 32
+status: 201
+exptime: 0
+STORED\r
+decr 13
+status: 201
+exptime: 
+19\r
+get foo
+status: 200
+exptime: 
+19"
+
+
+
+=== TEST 9: incr an non-existent key (with fallback)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'incr 51';
+        echo_location '/memc?key=foo&cmd=incr&val=51';
+    }
+
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+
+        error_page 404 = /set_and_incr?$query_string;
+    }
+
+    location /set_and_incr {
+        internal;
+
+        echo_location /memc?cmd=add&key=$arg_key&val=0;
+        echo_location /memc?$query_string;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+exptime: 
+OK\r
+incr 51
+status: 201
+exptime: 0
+STORED\r
+status: 201
+exptime: 
+51\r
+"
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/storage.t b/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/storage.t
new file mode 100644
index 0000000..69c2116
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/keepalive/storage.t
@@ -0,0 +1,749 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * (2 * blocks() - 1);
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+our $http_config = <<'_EOC_';
+    upstream foo {
+        server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+        keepalive 1;
+    }
+_EOC_
+
+#no_shuffle();
+
+#no_diff;
+
+log_level('warn');
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set only
+--- http_config eval: $::http_config
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        memc_pass foo;
+    }
+--- request
+    GET /memc?key=foo&cmd=set&val=blah
+--- response_body eval
+"STORED\r\n"
+--- error_code: 201
+
+
+
+=== TEST 2: set and get
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'set foo blah';
+        echo_location '/memc?key=foo&cmd=set&val=blah';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo blah
+STORED\r
+get foo
+blah"
+
+
+
+=== TEST 3: set UTF-8 and get UTF-8
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'set foo 你好';
+        echo_location '/memc?key=foo&cmd=set&val=你好';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo 你好
+STORED\r
+get foo
+你好"
+
+
+
+=== TEST 4: set and get empty values
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'set foo blah';
+        echo_location '/memc?key=foo&cmd=set&val=';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+OK\r
+set foo blah
+STORED\r
+get foo
+"
+
+
+
+=== TEST 5: add
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'add foo blah';
+        echo_location '/memc?key=foo&cmd=add&val=added';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo blah
+status: 201
+STORED\r
+get foo
+status: 200
+added"
+
+
+
+=== TEST 6: set using POST
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo_read_request_body;
+
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'set foo';
+        echo_subrequest POST '/memc?key=foo&cmd=set';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        #set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+POST /main
+hello, world
+--- response_body eval
+"flush all
+status: 200
+OK\r
+set foo
+status: 201
+STORED\r
+get foo
+status: 200
+hello, world"
+
+
+
+=== TEST 7: default REST interface when no $memc_cmd is set
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo_read_request_body;
+
+        echo 'set foo FOO';
+        echo_subrequest PUT '/memc?key=foo' -b FOO;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+
+        echo 'set foo BAR';
+        echo_subrequest PUT '/memc?key=foo' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_key $arg_key;
+        #set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+GET /main
+--- response_body eval
+"set foo FOO
+status: 201
+STORED\r
+get foo
+status: 200
+FOO
+set foo BAR
+status: 201
+STORED\r
+get foo
+status: 200
+BAR
+"
+
+
+
+=== TEST 8: default REST interface when no $memc_cmd is set (read client req body)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo_read_request_body;
+
+        echo 'set foo <client req body>';
+        echo_subrequest PUT '/memc?key=foo';
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+
+        echo 'set foo BAR';
+        echo_subrequest PUT '/memc?key=foo' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_key $arg_key;
+        #set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+POST /main
+rock
+--- response_body eval
+"set foo <client req body>
+status: 201
+STORED\r
+get foo
+status: 200
+rock
+set foo BAR
+status: 201
+STORED\r
+get foo
+status: 200
+BAR
+"
+
+
+
+=== TEST 9: default REST interface when no $memc_cmd is set (read client req body)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo_read_request_body;
+
+        echo 'set foo <client req body>';
+        echo_subrequest PUT '/memc?key=foo';
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+
+        echo 'add foo BAR';
+        echo_subrequest POST '/memc?key=foo' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_key $arg_key;
+        #set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+POST /main
+howdy
+--- response_body eval
+"set foo <client req body>
+status: 201
+STORED\r
+get foo
+status: 200
+howdy
+add foo BAR
+status: 200
+NOT_STORED\r
+get foo
+status: 200
+howdy
+"
+
+
+
+=== TEST 10: test replace (stored) (without sleep)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+        #echo_sleep 0.001;
+
+        echo 'add foo blah';
+        echo_location '/memc?key=foo&cmd=add&val=added';
+
+        echo 'replace foo bah';
+        echo_location '/memc?key=foo&cmd=replace&val=bah';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo blah
+status: 201
+STORED\r
+replace foo bah
+status: 201
+STORED\r
+get foo
+status: 200
+bah"
+
+
+
+=== TEST 11: test replace (stored) (with sleep)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+        echo_blocking_sleep 0.001;
+
+        echo 'add foo blah';
+        echo_location '/memc?key=foo&cmd=add&val=added';
+        #echo_sleep 0.001;
+
+        echo 'replace foo bah';
+        echo_location '/memc?key=foo&cmd=replace&val=bah';
+        #echo_sleep 0.001;
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo blah
+status: 201
+STORED\r
+replace foo bah
+status: 201
+STORED\r
+get foo
+status: 200
+bah"
+
+
+
+=== TEST 12: test replace (not stored)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'replace foo bah';
+        echo_location '/memc?key=foo&cmd=replace&val=bah';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body_like
+flush all
+status: 200
+OK\r
+replace foo bah
+status: 200
+NOT_STORED\r
+get foo
+status: 404.*?404 Not Found.*$
+
+
+
+=== TEST 13: test append (stored)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'add foo hello';
+        echo_location '/memc?key=foo&cmd=add&val=hello';
+
+        echo 'append foo ,world';
+        echo_location '/memc?key=foo&cmd=append&val=,world';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo hello
+status: 201
+STORED\r
+append foo ,world
+status: 201
+STORED\r
+get foo
+status: 200
+hello,world"
+
+
+
+=== TEST 14: test append (not stored)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'append foo ,world';
+        echo_location '/memc?key=foo&cmd=append&val=,world';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body_like
+flush all
+status: 200
+OK\r
+append foo ,world
+status: 200
+NOT_STORED\r
+get foo
+status: 404.*?404 Not Found.*$
+
+
+
+=== TEST 15: test prepend (stored)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'add foo hello';
+        echo_location '/memc?key=foo&cmd=add&val=hello';
+
+        echo 'prepend foo world,';
+        echo_location '/memc?key=foo&cmd=prepend&val=world,';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo hello
+status: 201
+STORED\r
+prepend foo world,
+status: 201
+STORED\r
+get foo
+status: 200
+world,hello"
+
+
+
+=== TEST 16: test prepend (not stored)
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'prepend foo world,';
+        echo_location '/memc?key=foo&cmd=prepend&val=world,';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body_like
+flush all
+status: 200
+OK\r
+prepend foo world,
+status: 200
+NOT_STORED\r
+get foo
+status: 404.*?404 Not Found.*$
+
+
+
+=== TEST 17: set and get big value
+--- http_config eval: $::http_config
+--- config
+    location /big {
+        echo_read_request_body;
+
+        client_body_buffer_size 1k;
+        client_max_body_size 100k;
+
+        echo 'set big';
+        echo_subrequest POST '/memc?key=big&cmd=set';
+
+        echo 'get big';
+        echo_location '/memc?key=big&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        memc_pass foo;
+    }
+--- request eval
+"POST /big\n" .
+ 'a' x (1024 * 1) . 'efg'
+
+--- response_body eval
+"set big
+STORED\r
+get big
+" . 'a' x (1024 * 1) . 'efg'
+--- timeout: 5
+
+
+
+=== TEST 18: set and get too big values
+--- http_config eval: $::http_config
+--- config
+    location /big {
+        client_body_buffer_size 1k;
+        client_max_body_size 100k;
+
+        echo 'set big';
+        echo_subrequest POST '/memc?key=big&cmd=set';
+
+        echo 'get big';
+        echo_location '/memc?key=big&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        memc_pass foo;
+    }
+--- request eval
+"POST /big\n" .
+ 'a' x (1024 * 100) . 'efg'
+--- ignore_response
+--- error_log
+client intended to send too large body: 102403 bytes
+--- timeout: 5
+
+
+
+=== TEST 19: replace non-existent item
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        echo 'flush_all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'replace foo bar';
+        echo_location '/memc?key=foo&cmd=replace&val=bar';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass foo;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush_all
+status: 200
+exptime: 
+OK\r
+replace foo bar
+status: 200
+exptime: 0
+NOT_STORED\r
+"
+
+
+
+=== TEST 20: eval + memc
+--- http_config eval: $::http_config
+--- config
+    location /main {
+        eval $data {
+            proxy_pass $scheme://127.0.0.1:$server_port/foo;
+        }
+        set $memc_cmd set;
+        set $memc_key /foo;
+        set $memc_value $data;
+        memc_pass foo;
+    }
+    location /foo {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+--- SKIP
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/stats.t b/modules_deb/libnginx-mod-http-memc-0.20/t/stats.t
new file mode 100644
index 0000000..f412b42
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/stats.t
@@ -0,0 +1,45 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(1);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+log_level('error');
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- timeout: 5
+--- config
+    location /stats {
+        set $memc_cmd stats;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /stats
+--- response_body_like: ^(?:STAT [^\r]*\r\n)*END\r\n$
+
+
+
+=== TEST 2: timeout
+--- config
+    memc_connect_timeout 10ms;
+    memc_send_timeout 10ms;
+    location /stats {
+        set $memc_cmd stats;
+        memc_pass 127.0.0.2:12345;
+    }
+--- request
+    GET /stats
+--- response_body_like: 504 Gateway Time-out
+--- timeout: 1
+--- error_code: 504
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/storage.t b/modules_deb/libnginx-mod-http-memc-0.20/t/storage.t
new file mode 100644
index 0000000..ee0706b
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/storage.t
@@ -0,0 +1,740 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_shuffle();
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set only
+--- config
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /memc?key=foo&cmd=set&val=blah
+--- response_body eval
+"STORED\r\n"
+--- error_code: 201
+
+
+
+=== TEST 2: set and get
+--- config
+    location /main {
+        echo 'set foo blah';
+        echo_location '/memc?key=foo&cmd=set&val=blah';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo blah
+STORED\r
+get foo
+blah"
+
+
+
+=== TEST 3: set UTF-8 and get UTF-8
+--- config
+    location /main {
+        echo 'set foo 你好';
+        echo_location '/memc?key=foo&cmd=set&val=你好';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo 你好
+STORED\r
+get foo
+你好"
+
+
+
+=== TEST 4: set and get empty values
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'set foo blah';
+        echo_location '/memc?key=foo&cmd=set&val=';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+OK\r
+set foo blah
+STORED\r
+get foo
+"
+
+
+
+=== TEST 5: add
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'add foo blah';
+        echo_location '/memc?key=foo&cmd=add&val=added';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo blah
+status: 201
+STORED\r
+get foo
+status: 200
+added"
+
+
+
+=== TEST 6: set using POST
+--- config
+    location /main {
+        echo_read_request_body;
+
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'set foo';
+        echo_subrequest POST '/memc?key=foo&cmd=set';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        #set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /main
+hello, world
+--- response_body eval
+"flush all
+status: 200
+OK\r
+set foo
+status: 201
+STORED\r
+get foo
+status: 200
+hello, world"
+
+
+
+=== TEST 7: default REST interface when no $memc_cmd is set
+--- config
+    location /main {
+        echo 'set foo FOO';
+        echo_subrequest PUT '/memc?key=foo' -b FOO;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+
+        echo 'set foo BAR';
+        echo_subrequest PUT '/memc?key=foo' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_key $arg_key;
+        #set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /main
+--- response_body eval
+"set foo FOO
+status: 201
+STORED\r
+get foo
+status: 200
+FOO
+set foo BAR
+status: 201
+STORED\r
+get foo
+status: 200
+BAR
+"
+
+
+
+=== TEST 8: default REST interface when no $memc_cmd is set (read client req body)
+--- config
+    location /main {
+        echo_read_request_body;
+        echo 'set foo <client req body>';
+        echo_subrequest PUT '/memc?key=foo';
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+
+        echo 'set foo BAR';
+        echo_subrequest PUT '/memc?key=foo' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_key $arg_key;
+        #set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /main
+rock
+--- response_body eval
+"set foo <client req body>
+status: 201
+STORED\r
+get foo
+status: 200
+rock
+set foo BAR
+status: 201
+STORED\r
+get foo
+status: 200
+BAR
+"
+
+
+
+=== TEST 9: default REST interface when no $memc_cmd is set (read client req body)
+--- config
+    location /main {
+        echo_read_request_body;
+        echo 'set foo <client req body>';
+        echo_subrequest PUT '/memc?key=foo';
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+
+        echo 'add foo BAR';
+        echo_subrequest POST '/memc?key=foo' -b BAR;
+
+        echo 'get foo';
+        echo_subrequest GET '/memc?key=foo';
+        echo;
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_key $arg_key;
+        #set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+POST /main
+howdy
+--- response_body eval
+"set foo <client req body>
+status: 201
+STORED\r
+get foo
+status: 200
+howdy
+add foo BAR
+status: 200
+NOT_STORED\r
+get foo
+status: 200
+howdy
+"
+
+
+
+=== TEST 10: test replace (stored) (without sleep)
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+        #echo_sleep 0.001;
+
+        echo 'add foo blah';
+        echo_location '/memc?key=foo&cmd=add&val=added';
+
+        echo 'replace foo bah';
+        echo_location '/memc?key=foo&cmd=replace&val=bah';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo blah
+status: 201
+STORED\r
+replace foo bah
+status: 201
+STORED\r
+get foo
+status: 200
+bah"
+
+
+
+=== TEST 11: test replace (stored) (with sleep)
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+        echo_blocking_sleep 0.001;
+
+        echo 'add foo blah';
+        echo_location '/memc?key=foo&cmd=add&val=added';
+        #echo_sleep 0.001;
+
+        echo 'replace foo bah';
+        echo_location '/memc?key=foo&cmd=replace&val=bah';
+        #echo_sleep 0.001;
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo blah
+status: 201
+STORED\r
+replace foo bah
+status: 201
+STORED\r
+get foo
+status: 200
+bah"
+
+
+
+=== TEST 12: test replace (not stored)
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'replace foo bah';
+        echo_location '/memc?key=foo&cmd=replace&val=bah';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body_like
+flush all
+status: 200
+OK\r
+replace foo bah
+status: 200
+NOT_STORED\r
+get foo
+status: 404.*?404 Not Found.*$
+
+
+
+=== TEST 13: test append (stored)
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'add foo hello';
+        echo_location '/memc?key=foo&cmd=add&val=hello';
+
+        echo 'append foo ,world';
+        echo_location '/memc?key=foo&cmd=append&val=,world';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo hello
+status: 201
+STORED\r
+append foo ,world
+status: 201
+STORED\r
+get foo
+status: 200
+hello,world"
+
+
+
+=== TEST 14: test append (not stored)
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'append foo ,world';
+        echo_location '/memc?key=foo&cmd=append&val=,world';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body_like
+flush all
+status: 200
+OK\r
+append foo ,world
+status: 200
+NOT_STORED\r
+get foo
+status: 404.*?404 Not Found.*$
+
+
+
+=== TEST 15: test prepend (stored)
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'add foo hello';
+        echo_location '/memc?key=foo&cmd=add&val=hello';
+
+        echo 'prepend foo world,';
+        echo_location '/memc?key=foo&cmd=prepend&val=world,';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush all
+status: 200
+OK\r
+add foo hello
+status: 201
+STORED\r
+prepend foo world,
+status: 201
+STORED\r
+get foo
+status: 200
+world,hello"
+
+
+
+=== TEST 16: test prepend (not stored)
+--- config
+    location /main {
+        echo 'flush all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'prepend foo world,';
+        echo_location '/memc?key=foo&cmd=prepend&val=world,';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body_like
+flush all
+status: 200
+OK\r
+prepend foo world,
+status: 200
+NOT_STORED\r
+get foo
+status: 404.*?404 Not Found.*$
+
+
+
+=== TEST 17: set and get big value
+--- config
+    location /big {
+        client_body_buffer_size 1k;
+        client_max_body_size 100k;
+
+        echo_read_request_body;
+        echo 'set big';
+        echo_subrequest POST '/memc?key=big&cmd=set';
+
+        echo 'get big';
+        echo_location '/memc?key=big&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request eval
+"POST /big\n" .
+ 'a' x (1024 * 1) . 'efg'
+
+--- response_body eval
+"set big
+STORED\r
+get big
+" . 'a' x (1024 * 1) . 'efg'
+--- timeout: 2
+
+
+
+=== TEST 18: set and get too big values
+--- config
+    location /big {
+        client_body_buffer_size 1k;
+        client_max_body_size 100k;
+
+        echo 'set big';
+        echo_subrequest POST '/memc?key=big&cmd=set';
+
+        echo 'get big';
+        echo_location '/memc?key=big&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request eval
+"POST /big\n" .
+ 'a' x (1024 * 100) . 'efg'
+
+--- response_body_like: 413 Request Entity Too Large
+--- error_code: 413
+--- timeout: 10
+
+
+
+=== TEST 19: replace non-existent item
+--- config
+    location /main {
+        echo 'flush_all';
+        echo_location '/memc?cmd=flush_all';
+
+        echo 'replace foo bar';
+        echo_location '/memc?key=foo&cmd=replace&val=bar';
+    }
+    location /memc {
+        echo_before_body "status: $echo_response_status";
+        echo_before_body "exptime: $memc_exptime";
+
+        set $memc_cmd $arg_cmd;
+        set $memc_key $arg_key;
+        set $memc_value $arg_val;
+        set $memc_exptime $arg_exptime;
+
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"flush_all
+status: 200
+exptime: 
+OK\r
+replace foo bar
+status: 200
+exptime: 0
+NOT_STORED\r
+"
+
+
+
+=== TEST 20: eval + memc
+--- config
+    location /main {
+        eval $data {
+            proxy_pass $scheme://127.0.0.1:$server_port/foo;
+        }
+        set $memc_cmd set;
+        set $memc_key /foo;
+        set $memc_value $data;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+    location /foo {
+        echo hello;
+    }
+--- request
+    GET /main
+--- response_body
+--- SKIP
+
+
+
+=== TEST 21: set and get (binary data containing \0)
+--- config
+    location /main {
+        echo 'set foo blah';
+        echo_location '/memc?key=foo&cmd=set&val=blah%00blah';
+
+        echo 'get foo';
+        echo_location '/memc?key=foo&cmd=get';
+    }
+    location /memc {
+        set $memc_cmd $arg_cmd;
+        set_unescape_uri $memc_key $arg_key;
+        set_unescape_uri $memc_value $arg_val;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /main
+--- response_body eval
+"set foo blah
+STORED\r
+get foo
+blah\0blah"
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/upstream.t b/modules_deb/libnginx-mod-http-memc-0.20/t/upstream.t
new file mode 100644
index 0000000..a50fcac
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/upstream.t
@@ -0,0 +1,78 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+repeat_each(2);
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: sanity
+--- http_config
+    upstream backend {
+      server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+      server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+--- config
+    location /stats {
+        set $memc_cmd stats;
+        memc_pass backend;
+    }
+--- request
+    GET /stats
+--- response_body_like: ^(?:STAT [^\r]*\r\n)*END\r\n$
+--- timeout: 3
+
+
+
+=== TEST 2: sanity
+--- http_config
+    upstream backend {
+      server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+      server 127.0.0.1:11985;
+      server 127.0.0.1:11986;
+      #keepalive 2;
+      #hash $arg_key;
+    }
+
+--- config
+    location /memc {
+        set $memc_cmd set;
+        set $memc_key $arg_key;
+        set $memc_value 'value';
+        memc_pass backend;
+    }
+--- request
+    GET /memc?key=dog
+--- response_body
+--- error_code: 201
+--- timeout: 3
+--- SKIP
+
+
+
+=== TEST 3: sanity with dynamic backend
+--- http_config
+    upstream backend {
+      server 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+
+--- config
+    location /stats {
+        set $memc_cmd stats;
+        memc_pass $arg_target;
+    }
+--- request
+    GET /stats?target=backend
+--- response_body_like: ^(?:STAT [^\r]*\r\n)*END\r\n$
+--- timeout: 3
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/used.t b/modules_deb/libnginx-mod-http-memc-0.20/t/used.t
new file mode 100644
index 0000000..4e7b2ae
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/used.t
@@ -0,0 +1,67 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => repeat_each() * (4 * blocks());
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: module not used
+--- config
+    location /t {
+        content_by_lua '
+            local v = ngx.var
+            ngx.say(v.memc_cmd, v.memc_exptime, v.memc_value, v.memc_key, v.memc_flags)
+        ';
+    }
+--- request
+    GET /t
+--- stap
+F(ngx_http_memc_add_variable) {
+    printf("memc add variable \"%s\"\n", user_string_n($name->data, $name->len))
+}
+--- stap_out
+--- response_body
+nilnilnilnilnil
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: module used
+--- config
+    location /t {
+        content_by_lua '
+            local v = ngx.var
+            ngx.say(v.memc_cmd, v.memc_exptime, v.memc_value, v.memc_key, v.memc_flags)
+        ';
+    }
+    location /bah {
+        set $memc_key foo;
+        memc_pass 127.0.0.1:11211;
+    }
+--- request
+    GET /t
+--- stap
+F(ngx_http_memc_add_variable) {
+    printf("memc add variable \"%s\"\n", user_string_n($name->data, $name->len))
+}
+--- stap_out
+memc add variable "memc_key"
+memc add variable "memc_cmd"
+memc add variable "memc_flags"
+memc add variable "memc_exptime"
+memc add variable "memc_value"
+
+--- response_body
+nilnilnilnilnil
+--- no_error_log
+[error]
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/t/version.t b/modules_deb/libnginx-mod-http-memc-0.20/t/version.t
new file mode 100644
index 0000000..ae26ec8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/t/version.t
@@ -0,0 +1,25 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: the "version" command
+--- config
+    location /ver {
+        set $memc_cmd version;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+    GET /ver
+--- response_body_like: ^VERSION \d+(\.\d+)+.*?\r\n$
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/util/build.sh b/modules_deb/libnginx-mod-http-memc-0.20/util/build.sh
new file mode 100755
index 0000000..7defa6e
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/util/build.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# this file is mostly meant to be used by the author himself.
+
+ragel -I src -T1 src/ngx_http_memc_response.rl || exit 1
+util/fix-clang-warnings
+
+if [ $? != 0 ]; then
+    echo 'Failed to generate the memcached response parser.' 1>&2
+    exit 1;
+fi
+
+root=`pwd`
+version=$1
+home=~
+force=$2
+
+ngx-build $force $version \
+    --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:/usr/local/lib" \
+    --with-cc-opt="-O2" \
+    --with-http_addition_module \
+    --without-mail_pop3_module \
+    --without-mail_imap_module \
+    --without-mail_smtp_module \
+    --without-http_upstream_ip_hash_module \
+    --without-http_empty_gif_module \
+    --without-http_referer_module \
+    --without-http_autoindex_module \
+    --without-http_auth_basic_module \
+    --without-http_userid_module \
+    --add-module=$root $opts \
+    --add-module=$root/../ndk-nginx-module \
+    --add-module=$root/../eval-nginx-module \
+    --add-module=$root/../echo-nginx-module \
+    --add-module=$root/../set-misc-nginx-module \
+    --add-module=$root/../lua-nginx-module \
+          --with-select_module \
+          --with-poll_module \
+    --with-debug
+    #--add-module=$home/work/nginx/nginx_upstream_hash-0.3 \
+  #--without-http_ssi_module  # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/util/fix-clang-warnings b/modules_deb/libnginx-mod-http-memc-0.20/util/fix-clang-warnings
new file mode 100755
index 0000000..6b1bda6
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/util/fix-clang-warnings
@@ -0,0 +1,53 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use File::Temp 'tempfile';
+
+my $infile = "src/ngx_http_memc_response.c";
+my ($out, $outfile) = tempfile();
+open my $in, $infile
+    or die "Cannot open $infile for reading: $!\n";
+my $hits = 0;
+while (<$in>) {
+    if (/ \b memc_ (?: storage | flush_all | version | stats | delete | incr_decr )
+             _en_main \b /x)
+     {
+        #warn "HIT!";
+        $hits++;
+        next;
+    }
+    print $out $_;
+}
+close $in;
+close $out;
+if ($hits) {
+    my $cmd = "cp $outfile $infile";
+    system($cmd) == 0
+        or die "Cannot run command \"$cmd\": $!";
+}
+#die;
+
+__END__
+
+This script is to fix the following clang warnings when using Ragel 6.8/6.9/etc:
+
+src/ngx_http_memc_response.c:33:18: error: unused variable 'memc_storage_en_main' [-Werror,-Wunused-const-variable]
+static const int memc_storage_en_main = 1;
+                 ^
+src/ngx_http_memc_response.c:46:18: error: unused variable 'memc_flush_all_en_main' [-Werror,-Wunused-const-variable]
+static const int memc_flush_all_en_main = 1;
+                 ^
+src/ngx_http_memc_response.c:59:18: error: unused variable 'memc_version_en_main' [-Werror,-Wunused-const-variable]
+static const int memc_version_en_main = 1;
+                 ^
+src/ngx_http_memc_response.c:72:18: error: unused variable 'memc_stats_en_main' [-Werror,-Wunused-const-variable]
+static const int memc_stats_en_main = 1;
+                 ^
+src/ngx_http_memc_response.c:85:18: error: unused variable 'memc_delete_en_main' [-Werror,-Wunused-const-variable]
+static const int memc_delete_en_main = 1;
+                 ^
+src/ngx_http_memc_response.c:98:18: error: unused variable 'memc_incr_decr_en_main' [-Werror,-Wunused-const-variable]
+static const int memc_incr_decr_en_main = 1;
+                 ^
+6 errors generated.
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/util/update-readme.sh b/modules_deb/libnginx-mod-http-memc-0.20/util/update-readme.sh
new file mode 100755
index 0000000..fd9c9d8
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/util/update-readme.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+perl util/wiki2pod.pl doc/readme.wiki > /tmp/a.pod \
+    && pod2text /tmp/a.pod > README \
+    && perl -i -pe 's{(https?://.*?)>}{$1 >}g' README
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/util/wiki2pod.pl b/modules_deb/libnginx-mod-http-memc-0.20/util/wiki2pod.pl
new file mode 100644
index 0000000..cdd33a2
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/util/wiki2pod.pl
@@ -0,0 +1,131 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use bytes;
+
+my @nl_counts;
+my $last_nl_count_level;
+
+my @bl_counts;
+my $last_bl_count_level;
+
+sub fmt_pos ($) {
+    (my $s = $_[0]) =~ s{\#(.*)}{/"$1"};
+    $s;
+}
+
+sub fmt_mark ($$) {
+    my ($tag, $s) = @_;
+    my $max_level = 0;
+    while ($s =~ /([<>])\1*/g) {
+        my $level = length $&;
+        if ($level > $max_level) {
+            $max_level = $level;
+        }
+    }
+
+    my $times = $max_level + 1;
+    if ($times > 1) {
+        $s = " $s ";
+    }
+    return $tag . ('<' x $times) . $s . ('>' x $times);
+}
+
+print "=encoding utf-8\n\n";
+
+while (<>) {
+    if ($. == 1) {
+        # strip the leading U+FEFF byte in MS-DOS text files
+        my $first = ord(substr($_, 0, 1));
+        #printf STDERR "0x%x", $first;
+        #my $second = ord(substr($_, 2, 1));
+        #printf STDERR "0x%x", $second;
+        if ($first == 0xEF) {
+            substr($_, 0, 1, '');
+            #warn "Hit!";
+        }
+    }
+    s{\[(http[^ \]]+) ([^\]]*)\]}{$2 (L<$1>)}gi;
+    s{ \[\[ ( [^\]\|]+ ) \| ([^\]]*) \]\] }{"L<$2|" . fmt_pos($1) . ">"}gixe;
+    s{<code>(.*?)</code>}{fmt_mark('C', $1)}gie;
+    s{'''(.*?)'''}{fmt_mark('B', $1)}ge;
+    s{''(.*?)''}{fmt_mark('I', $1)}ge;
+    if (s{^\s*<[^>]+>\s*$}{}) {
+        next;
+    }
+
+    if (/^\s*$/) {
+        print "\n";
+        next;
+    }
+
+=begin cmt
+
+    if ($. == 1) {
+        warn $_;
+        for my $i (0..length($_) - 1) {
+            my $chr = substr($_, $i, 1);
+            warn "chr ord($i): ".ord($chr)." \"$chr\"\n";
+        }
+    }
+
+=end cmt
+=cut
+
+    if (/(=+) (.*) \1$/) {
+        #warn "HERE! $_" if $. == 1;
+        my ($level, $title) = (length $1, $2);
+        collapse_lists();
+
+        print "\n=head$level $title\n\n";
+    } elsif (/^(\#+) (.*)/) {
+        my ($level, $txt) = (length($1) - 1, $2);
+        if (defined $last_nl_count_level && $level != $last_nl_count_level) {
+            print "\n=back\n\n";
+        }
+        $last_nl_count_level = $level;
+        $nl_counts[$level] ||= 0;
+        if ($nl_counts[$level] == 0) {
+            print "\n=over\n\n";
+        }
+        $nl_counts[$level]++;
+        print "\n=item $nl_counts[$level].\n\n";
+        print "$txt\n";
+    } elsif (/^(\*+) (.*)/) {
+        my ($level, $txt) = (length($1) - 1, $2);
+        if (defined $last_bl_count_level && $level != $last_bl_count_level) {
+            print "\n=back\n\n";
+        }
+        $last_bl_count_level = $level;
+        $bl_counts[$level] ||= 0;
+        if ($bl_counts[$level] == 0) {
+            print "\n=over\n\n";
+        }
+        $bl_counts[$level]++;
+        print "\n=item *\n\n";
+        print "$txt\n";
+    } else {
+        collapse_lists();
+        print;
+    }
+}
+
+collapse_lists();
+
+sub collapse_lists {
+    while (defined $last_nl_count_level && $last_nl_count_level >= 0) {
+        print "\n=back\n\n";
+        $last_nl_count_level--;
+    }
+    undef $last_nl_count_level;
+    undef @nl_counts;
+
+    while (defined $last_bl_count_level && $last_bl_count_level >= 0) {
+        print "\n=back\n\n";
+        $last_bl_count_level--;
+    }
+    undef $last_bl_count_level;
+    undef @bl_counts;
+}
+
diff --git a/modules_deb/libnginx-mod-http-memc-0.20/valgrind.suppress b/modules_deb/libnginx-mod-http-memc-0.20/valgrind.suppress
new file mode 100644
index 0000000..a10fd57
--- /dev/null
+++ b/modules_deb/libnginx-mod-http-memc-0.20/valgrind.suppress
@@ -0,0 +1,93 @@
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_event_process_init
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_ctl(event)
+   fun:epoll_ctl
+   fun:ngx_epoll_add_event
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_ctl(event)
+   fun:epoll_ctl
+   fun:ngx_epoll_add_connection
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:index
+   fun:expand_dynamic_string_token
+   fun:_dl_map_object
+   fun:map_doit
+   fun:_dl_catch_error
+   fun:do_preload
+   fun:dl_main
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_ctl(event)
+   fun:epoll_ctl
+   fun:ngx_epoll_init
+   fun:ngx_event_process_init
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_ctl(event)
+   fun:epoll_ctl
+   fun:ngx_epoll_notify_init
+   fun:ngx_epoll_init
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_ctl(event)
+   fun:epoll_ctl
+   fun:ngx_epoll_test_rdhup
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_single_process_cycle
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_set_environment
+   fun:ngx_worker_process_init
+   fun:ngx_worker_process_cycle
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_pwait(sigmask)
+   fun:epoll_pwait
+   fun:epoll_wait
+   fun:ngx_epoll_process_events
+   fun:ngx_process_events_and_timers
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   epoll_pwait(sigmask)
+   fun:epoll_pwait
+   fun:epoll_wait
+   fun:ngx_epoll_test_rdhup
+   fun:ngx_epoll_init
+   fun:ngx_event_process_init
+}

From 84b036218320f255f971c78bbadd8154ee17a299 Mon Sep 17 00:00:00 2001
From: wrapper <wrapper@system.system>
Date: Wed, 16 Jul 2025 10:47:23 +0700
Subject: [PATCH 600/600] allow vod and pckg to compile together

---
 .gitignore          |  3 ++-
 auto/make           | 13 +++++++++----
 configure.docker.sh |  2 +-
 configure.sh        |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f04d13..7665f8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ modules/media-framework/
 modules/nginx-srt-module/
 modules/nginx-vod-module/
 Makefile
-*.orig
\ No newline at end of file
+*.orig
+*.txt
\ No newline at end of file
diff --git a/auto/make b/auto/make
index 25ee3fb..fad0844 100644
--- a/auto/make
+++ b/auto/make
@@ -2,6 +2,11 @@
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
+basename_last2() {
+    local basename_1=`basename \`dirname $1\``
+    local basename_2=$(basename "$1")
+    echo $(printf "$basename_1/$basename_2" | sed 's/\.\.\///')
+}
 
 echo "creating $NGX_MAKEFILE"
 
@@ -174,7 +179,7 @@ ngx_all_srcs=`echo $ngx_all_srcs | sed -e "s/\//$ngx_regex_dirsep/g"`
 
 for ngx_src in $NGX_ADDON_SRCS
 do
-    ngx_obj="addon/`basename \`dirname $ngx_src\``"
+    ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
 
     test -d $NGX_OBJS/$ngx_obj || mkdir -p $NGX_OBJS/$ngx_obj
 
@@ -413,7 +418,7 @@ if test -n "$NGX_ADDON_SRCS"; then
 
     for ngx_src in $NGX_ADDON_SRCS
     do
-        ngx_obj="addon/`basename \`dirname $ngx_src\``"
+        ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
 
         ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \
             | sed -e "s/\//$ngx_regex_dirsep/g"`
@@ -576,7 +581,7 @@ END
                 ngx_obj=$ngx_src
                 ;;
             *)
-                ngx_obj="addon/`basename \`dirname $ngx_src\``"
+                ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
                 mkdir -p $NGX_OBJS/$ngx_obj
                 ngx_obj="$ngx_obj/`basename $ngx_src`"
                 ;;
@@ -638,7 +643,7 @@ END
                 ngx_obj=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"`
                 ;;
             *)
-                ngx_obj="addon/`basename \`dirname $ngx_source\``"
+                ngx_obj="addon/`basename_last2 \`dirname $ngx_source\``"
                 ngx_obj=`echo $ngx_obj/\`basename $ngx_source\` \
                     | sed -e "s/\//$ngx_regex_dirsep/g"`
                 ;;
diff --git a/configure.docker.sh b/configure.docker.sh
index 2e7558f..4131c20 100755
--- a/configure.docker.sh
+++ b/configure.docker.sh
@@ -52,6 +52,7 @@
     --add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
     --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.7+dfsg \
     --add-dynamic-module=./modules/njs/nginx \
+    --add-dynamic-module=./modules/nginx-vod-module \
     --add-module=./modules/media-framework/nginx-common \
     --add-dynamic-module=./modules/nginx-stream-preread-str-module \
     --add-dynamic-module=./modules/media-framework/nginx-kmp-in-module \
@@ -65,5 +66,4 @@
     --add-dynamic-module=./modules/media-framework/nginx-live-module \
     --add-dynamic-module=./modules/nginx-srt-module \
     --add-dynamic-module=./modules/media-framework/nginx-pckg-module \
-    --add-dynamic-module=./modules/nginx-vod-module \
     --add-dynamic-module=./modules/nginx-secure-token-module
\ No newline at end of file
diff --git a/configure.sh b/configure.sh
index ed704de..3d780fe 100755
--- a/configure.sh
+++ b/configure.sh
@@ -49,6 +49,7 @@
     --add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
     --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.7+dfsg \
     --add-dynamic-module=./modules/njs/nginx \
+    --add-dynamic-module=./modules/nginx-vod-module \
     --add-module=./modules/media-framework/nginx-common \
     --add-dynamic-module=./modules/nginx-stream-preread-str-module \
     --add-dynamic-module=./modules/media-framework/nginx-kmp-in-module \
@@ -62,5 +63,4 @@
     --add-dynamic-module=./modules/media-framework/nginx-live-module \
     --add-dynamic-module=./modules/nginx-srt-module \
     --add-dynamic-module=./modules/media-framework/nginx-pckg-module \
-    --add-dynamic-module=./modules/nginx-vod-module \
     --add-dynamic-module=./modules/nginx-secure-token-module
\ No newline at end of file